From 2fb9b30485db8bbf4ff24302ce3fa9780d89af09 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Wed, 23 Apr 2008 02:20:01 +0000
Subject: [PATCH 001/252] Creating GSoC branch for mxcurioni

---
 release/datafiles/splash.jpg    |  Bin 79258 -> 72804 bytes
 source/blender/src/splash.jpg.c | 4756 +++++++++++++++----------------
 2 files changed, 2277 insertions(+), 2479 deletions(-)

diff --git a/release/datafiles/splash.jpg b/release/datafiles/splash.jpg
index da88c0b8eaa25949fcb6fb74401fb7fc7b67ff19..0d328ee4b7ccf066eb69d138884cbeebe3d4d44f 100644
GIT binary patch
literal 72804
zcmd3NWpJE9&)AtMF+<GE6f-lPnHge?nVB6kGbd(dJTo&pW;io*%rVz_zqZp~?X<tD
zXYS@^SEJJkR=bj(_vQC30IG~6P!a$E2>_UWJb?Ez0Gha~iM1yH0ssvF0MtK*E&#|P
zruN2W0Mnk25s3FSKrjFj;val`Lqb7*e4rpd0P4R33>5SSK*7Mkz{0}9z`()5!^6QL
z{)12d6CghDp`oDRKBf`j;o$$5ng5CMzyI;x13-g^z=ODhf<Oa6qCr5RLA(zD765<`
zK0Y}6VD!HL1{N9)00j?;@G%Af^N;EOF#~}5ST-~aEF3%nDgfexcStDc4~9Pg9`0jF
z&}cBQ08(@oI1vnZWg{|7$G`+ua)i7(Q8o&!UKL{}cI@BVKb$!@|0Ig3;&9~$iMvoD
zUe))h1t&M+nk1RdODu4s0U)41D1FEQ>f?d?U;u#jLHL8H2#m6kBL-|>0vRjZpS-%>
zS<K&}<l8EVY*;u>^<r1XKU7WF^C`sDD6!$4-&X;jpddch2!#d^0zBUpCQec$d)HS3
zn?}{sNi`kjLg@@CI1RQuV3IF~Q|RRpU!N)KnpwVYz2vlF$7Jnx-nY2zfY&;m{Gd+b
z+Vrb07$)Er_{mcF7a&;qP1*N^75h{|g=H(}@<Y@wd9MsI?l8ED_s8)oB$^%r%<oY$
z1$GUw&es)>hj3H}Vil#6j;|9h&xIJ;W3!RUug)R|Q?-{zSjub_>PMv=BUn;XK#e&@
z3Y`V`R2|_+^zq4NrQ}MQ5qmo;aYof6>0`X8VyMMOM@a06+W%IPYDv)mq|5{|%mU35
zW&b}IJh)Vi7qA_@5Q{qhR6lL+QyfgO2990*(SpJ@brVKb?OMcHB=B@Stzq<(2(EW1
zhGD>s7P)j^*jyf8=%mazE_Vb>26FMZqm#F0N!nYNLkV4OR&=dw2#v3}X_IE{Na#n-
zhu3f~NJypQ!9|eV@|})*O_#Pk$Tp0%Q(PWE=SyGNAuaH7mGHu;)l3%PZ|%vMq52R<
zhTqek)XaClFVQ!k*L=k*-;v2o#bZ~>+iHR?4Z61+mb`;2Ess9LRe;jUu#Ia;WqhD~
zYdF4C(4`So4xUOxTW9t_CcYHsa|J6ZWk<16WsFo!H-}F+)iXMOHXbS2P-UV{RM{dT
zKZO%N{v})SBsjxV`KZD>@KW-IP5^aJid62hk#LF^QQUhlU`bjS_99$Ieuj9?AT*B+
zmv!&<-Sdpj@$_>WMaInz3H5=t8Yj|4y-GgD1O(`o&tBda|M;RxQM(v>#wEelljz%D
z<}6>SS*D|Ag^HnCloFPaIN~!}``^t~U4u_2=LMa!XKE34+QuWC$5+*L>gaNoKuhGZ
zrot3THJRao5L&@kmsj0_^|`9+^Y7n38A^=Z+BHk5RZJG9!bF9VlnCCtmoy7z^BK8a
z61$aTeYdxX$$L)T8lO&$Z&n#oOe3V%E>DK-SO5CwY^+vO%TqQ$ldZvepj=~Bhh;~j
zYtVfOL{#`}Xmd&Zok?iY+uI$v9C~N`_jq9160WPAsM3xFXr2qQ)64S4;cTFB;hUvY
z`15S<R0V74nzDy%;C(audU^Tk|1fUgJ@e9G$))nIcfe#Pk6Y{UY=aGibxb@k2~Bys
zSXN~TVG&oi97!jB*SwHCf)HV`%U!%1J@TS1*k-%Ba_SVP<nG01B8sMJqT;df+r>on
zq$y)jCXkfp-Zk>RAFjiloHsqo59eD5)s@@NEtSLpX`6DfDa>3fA{rn&AZd#}|F>NA
zPb0u}0s#3sD8YxOT0^eU7=gOQ(U3Ro@y@-w%^i2?61b67&#=^peV95{Q!T*AEWIsS
z7+N(`#J>9Xa)5Um3kxdm5+%Ph7k+PF6obF<W#k3&rtWki`iEIm1Rp)Y-O@U`;B}kO
z_07xgcAm$8o;Gb8w-v1#4;xIb37Lz+mQ(qZM?Ys2N*ZJk!Cx#jQlQ3|Gz`U->!pJJ
z?1Wr+GG(9G&6(gk0BhFEeF5{%h!oYx)MMa{<c6S?=mM#PW2!pCJW(d-F6}Y+-v4*C
ze9-+Rm92a1@%LsAY+d<Kj1k*KW7+iZSg<Lrh#sy@dBkcp{kB4{jKU`HNaL_?bXZyw
z9e4?`?EXfyAGqi%rl|PKb$sVnA^>7pmgj=l^S<8yK;$u3x0~7h54=nt<v}ySqozil
zRP&Ua6t2^1sWd!1gJ22faXO?hVBTX%qf_9xe*q?J0u`&F#gBOdH$&}?t87@B1BGGP
z#?2Uv-_qVz0C)I%LzGT{!94lx<?<b{aQginFnjb4xTJsXR_T8SJaojpjcs<{R==GK
zy1WCN`K*nn_t&x;<vP~3!5dAoH94P0m1mv`T1RR4v*>oL5?YQp`uEi6>Xl%Y<6kR1
zs^0;4yS9!QpG+Z4M*ExVz8=w>{$FpQ$+FoZM)kA^9g}fr3Thxq{xu0<*AiBGnG@x}
zG{A9$Sviw#<kSf9K%U-?K#GKAt5a2sw3*Y2(dK&FF0HbTQVk56SP937lp{>LC&l&(
z>O4j%E|F%`_8(=JaXV#Ow<SV5dM74U-00bCmn+-a=H%oQnll(H9}aF!+SG802Pz6=
zI=|dsqFD*Miz}AR;O|3m0xmR0536F4i0qg$;Z!BX#iV2ekQsehrPLomBf5RzS9`z5
zY2u24@C}o^6@n|I=x%)@`)-*<wi$wMxJ)t(gc4loJP6zEH(S-L=}-uv(*bvCJ_r%)
zx&WO=i=U`g6)*=lUg~81uYjX^f#P1L2m71q)G<DEYe3n~woi&(IAoB2v5XZ!D=i~J
z;rfTY`X?OFanrM#gU`4|<!fxOmfd5q3fA?+rs-&!d6Q?69_A@aKK7<#GG4;S58>x^
zgte0VU+tBQXU~3C$v04qVr8*!rk~bq5*Q6f_cm)7q)g@78xrKq=`TaW(m{UmjWAqe
zje-L1rxjSYpI0+1w_i)0rtM^2ZY@tT*G{Z@y%W&+!>`Zkabr(RX;E_FRu091HWWOA
zmO6eEA&B+{ZDZ3t+yhoy6>5eD$cRS^(60Lr%aMJ1qdL0Lt1@86KJ?@wvcg0+z-LJn
zH0Z=0T1hH#071&=TdA+Fr$YByb}!GN9;Q0BhVb$MWL%H(C;O3iz>DHj*SbeqWmgFf
z_d0(^Y^aH$DW8w;dIi`Q_qJOkWnN6&ip1s8^WMYz8HfG8fEah!^BntAldP+1NwDH$
zV*bw3NSTqD?t-||l7Z&&PqeHBs|wPo;}^w&hD4NzPns1^1>D;%SyjVEAYvp3<Q}vw
zq>$mwpO+Qg%63oVqwPp`9eR#_^F~Z8mi1b;D#Sm=CtoV;eNOWd<5(22oPZn<>`;cq
zevwD%P2c*ASy<!eYv+=XhYV9UI!;&I?vUu&l1(sjortrtXVp(1sl382QOY)!-G$~9
zeJ@zA4K}oFX-8O|C$|Sj{pMKsd(2pg%Ky^Gu@_d@(G?GzPQ5jGnIN7aV4z{pjE80p
zaHoX}Mc(G*`IS$Vl#1K2q9tqJ%}PZ3z;E%e9udp5E{sinyCA|kpjoN*7~B!fEZZS6
z#)v>H5tdOC5!|jx@e8}d?JpfCe8Xk$%oq0EdhPYKzgsF1^<_8Z8pMgKSEjxozod^5
zqOK8tD-<xicP9G|ck#O0OjyyRx0t$Rf~0FV*4m0y#QhS&dP<Q;1CIctYM+aX17}yC
zs(mxW$>)?Cj&6nH{fy%Em;Sde5_ReBw4Hc)rEIWgD&8+C_j{VhhYDtO-;VR8((ZBD
z`7V_UR}5lMSB1oz@%&4w0Z5;WCXQ#UO~*6kdS@p>Gz0>C)Ob5#Z8JEPkIzLY#VGRJ
zd$tqeuQ6U;*_D$Z#Af4?CIJ5&e!dltcAC|heppgH>c!oA`S4S-aXesumnI{msNbgr
zxB0lIaXPt>7HFH=D+3vz60xs?s7HvMVVICYGo<Pko;HTZvU{$kXwb#|w<SI~&tNGb
zZo)uidyB`d#QJ;r)Tx*Dr64)jUSetE#ITON1ApRb>OgmYB#idQ4rGuKog-W(;=>N+
z4+uE5IE5P4jD8wbTz}d?KwR@i4RV>?=ew0q`((qNn1FbxHE<2n!h`A!%*%j)%|p)Y
zU_pmFgIFCW(&TcIRSa516zZ4uc03C1>H5%Y;qCf)O&tm-edGPPpxN5GYyLn!YP5k=
zH|V4RMljz~nAY^@&}(mqQo<G#Xa@i%wp*^*BOv2d_EP?8>#jJrsQ63IJ0(D?&hn7}
zn^ha#P^O4%F)EpwyKOhpR>b-myp@ZY`3qFk5t|dU=up<8L7!Yq=626Vyo1GWSCley
zQ<JZOZ-h4ydbl&i&xb^w9qP;d^!74Y%a>LW-9OJM7G*#=mAnuMlkzb4IgPA3Ma_-a
ztauISub8FOIu^CB=BckDQlSn@UJNb(Drwl@UhwXFu1n=xlk#{2odd<MT!*>V9;jAl
zcT-=*r@&iP=Q}R2gr2Vdd_x+iBW?4&(s)&~N1A6U)wC@?l<7j6j3Ay9$y~oaw!3^m
z=}&2{TTlj<14P&c4%^&QwUiuggL|_>gusEsG+5hn$h*e7`<_F8JO#{jD|B*o|Fc!N
zMK|;3U7(XsA1LDn>dnX&2*4`I<3J!$YHHcx!RPOA6lM^yoxIpxe<-P-n8u&DVO0=8
zhKIAhCh%~79h<z!IT(D5-)whW!G~o@m>g(tc6Zv1+Ek}n$E`W2UulsrCKy)c<PG0j
z+hWKCs39zTGL&~YT1lW4S3t9b<%dF-3~RO6f2t{)>aZA+#0Ku@eU=SCF6i`Cc<Fj&
zaA%v-G_P(+^K8gi9~`ZhjatF#JN7wf%3E<L7;@u<n&S1z)uIFBtnz*KOw&1Wm~2sK
z8*~i+2IolmXkC8i7c~1l5Ezn*Z$@iJ@eqKYo#}f5?tRu=6Pz=y-1#d}Oqlk$8B{nF
zgpgVw5j{gW2u%v0q%EU(ZJPicud~r6(Gq=E(P&~{5{D*%Hs*%NMcR+smmutV^|R~z
zb0@zB`%*nYc{)H-zYCdaPIv5PJ90`0aibgAJkO6H?-k>vSRQxor6I`v4w#tv`<3~^
z%|Q3)>ba{fCB^X3E9~48_8~y#>9B^ypth`ApQx!__eiSt=6M|K4)uVc#eE)86g<+d
zx45FJyvEM2LZh}bl8=r6o*}f0`h9+)8JV}E`0e}+Ds$*`-L5(<*0v!Iz>~D{qDa!k
z@X*}sSA5}D#D{;1zYyINd*~j;Xtj$s1e#xN(y2<LHymY6rj=nVY-WnEc#)QoV$~>8
zU97#n>b6aai4{crHoYpH^!Ly1bZT^m2^R|egI24j)Na@C+Us%<_MhGU_}z+X&^zGZ
z(^yptv#S8T`9mT1e)gnWm%dpuE~!0jdQv4T!RNww#7GqjIy%?!C*&ksTn7TPFL55}
z`tI|xAv|AH`N?T9&c4zv!GF*}ysg9M3<-7*YtE3wGEFTc6S%m<=AB)$Hbi|1KhpAK
zj6<Jsc#bX8J|c)?7^@&<<$-#D>fac9HB_$a=tZ)wuk}oLNEqxO^hF(F_PCdg>mR8D
zGE58|)`LgbNUNA?pHWD-*J7%mi-0Q9BtfDa{R*(q1EJ)Rw_oHG$ds9obIYD0{~zwX
zH{&<I&h_5`E$cVuCRJ<H()}3?=4f_Y+}so3yi$8$K<ZA&K-lmV_5<qbSXgQ~k62&k
zxd3xKeet?jhn5|huj~BlYX?u|*)o5@`QAx%f2CjNvwcX^p<Nw868<<w<hOf*6eUsx
z{e>({zTo>kCc5PD*kaKvId|;P89g&3vH)tG#cAXf_CwsybL2`>!rzy|h;}Llw9#_O
zg?~NUJHPbu{c>#IPV2Z43=7d=@hN{b?i2>;ohMSuHm7bji+f4zKq-zWI}U=>l1c5L
zujFaVn}-o|DM+=cl%cs9P|$m7UlPb{Qe!<Zp}0mm^&axq%tAJc8y+(%oV~vb4w}T7
z{@ma^!<2}=TlKjl<3h=hoAMc(PfS4v6pwN!4do_jrb21$4;?N9ECtbwOc}CW|52_-
zzI?M<G_U9TwRoB_aM6krTH|r+O?aS&?ICo~mtgH!Dn!yR7Kxg|c|9JeRx;S$k6$8d
z0SU{?;(+48+bTGTfxA|NqfZ|95rCpPccxi2?PAOxJ3dKaw(2qyjtrhZSYljQyFD<7
zhESwOOEA=oi?(o<!;qBP&_@X7X{G?yjK7nJn~I?X^WY`E0|s@lWE~H*9Es?q?D={(
z3GmyOnWU*6V9$@Yi_gy=C?`_;eNrf+BjtbGN1(07T#G7O$e})l;;Vjc?V*Sj$LYqa
zpi8$J%se+1)Qqh@J9}{@os)EecC_<j(D*4ta%Y>oHP^7Vu*n>ew7clHq0cY_<y6qj
z<T_5<!s0I1Qej>XA37&8v<NRMO#vlJv}_`3Od?Wfj^cp!X*jidkR~Jk>1Z=jUPF0P
zZC}IY=^TeMXZ`U@%+xR#;o8J>#@J+u*0VF}0H)I+ukxi`u6`$y1cufopjx!!&U(DW
zGW;v*#wR}&Q)r5*!>D(Fci;mJ|F1i@rP$0kP`IGH-6cpq!gNK!&1ro7T+6^aY9}he
zxU(!OGk-&s722|nddT$}2e+@0%CaJ`F$4=U9;jCqUGU`$$_HWIvH%^PakwF<G=U6(
zxu*h(e?mZydu_tFnSVR>tkbDu-~v+>(#n>z!l~Xoy^+V<b$N)I91D28fNO`<bU?cr
zFI^(9wK+lB6uK^!)U3bSO|-a>fv%E6?dSK3>+(<}{kWcSv1`;CJzmu}YCK-3Tj!ZU
z9ygMFUNnwX@32cHd~jo|dRatQR)lE%XXcwL27;$kI3S(JZizgM5uj1-uytSJceK~Q
z;v;dKx=10@+E&Oq@9k`~A`4VEV8|^asbYjFRhuo)9vMYy)>`|uK5D*~5lk`E$G}Rl
zV&gG>EHksT?P))nn5Y&;<cUn9>42{eL1|sK`5l>#;drn^7Sx$Pv|!&?iAq8x{HQg<
zcx6&|!^GeygEfE{v}^cTa=gUI6WvE88rlO^59S1=-XOzPf1#z>vI*Ft7vGo_rF>A7
zC8i0G$&r&jwloAN7Z36URaXF3t?|R}uU<6FcKD*`Yp#zk1o5NHRNHZ)SG5{@TG-F8
zij8UaDFjEvWNI>t;`M|nAVmJ4!&vKG)WtDUT|ScU$T^rT<MnE$;GA|NUMhI5jr+zm
z5o|P8J;2;!x<lD@t;oo7Pz318{Ai_W&-CUvG*o`lR6hAqTZ5tm+<-8aj2UdiYx!dk
zce_@8yOEQ^=gb}tWklM;+YL8=G(5=UrEx1}*DJ<T;uxQytubzyNC)<cjesk=uQ;3O
z#JauDj)z%dzkDv(-rT&9yz8EqZEIzp`BQM27U%BXspMDrteS8S)pcpA@fF07v{!y-
zk{SF$<Is9gmFrHBrG0!>(rh4h8XMy;b`tsomQ>k9aKmxp7kSR`hRgGsBy=xAWH6zT
zGTmLp4g5oX>B83uG915I()nhZUCTo2(B5hv3&t|_xZbdI(zbRfGUuJmhoB0y)Wkb;
zJ<I;^_a~@(m$PP9r-ObM;5otYn)*&x?K|KR{9V7R4j+yT7#(oNALaWa2#V}>`*^bn
z2YK*`bx5yv=OIXT|H6^(7Y~64W(uPnw<q;BrPZ<;fWDgRgnCi7?aryVYLa9~BJ}5g
z@D>W&pj)^6Ta@bY<IpLz0p)=4;m)2J`9Q4Lk0xI<FZYgv^lHU~DIsdSJDV({W@$$l
zJ@I19+3a0qwQI6uzL`_8qb0Fy`om>Gb2NexXmlS0019NOujOg&I8@1^pC&7RAV~nf
zFhve(8S>zptWY|2LA$`9VDj_rWa_TFK2se52o2$ulwZe{#$^P-l|yL{Lr2xuSNqrL
zCx%C;gqRj&ywgXEE~%bdNq>ciFDtroEir9=UIo88UV@#d_*B8igmcsK&-24h1#}c0
zZ7%La;`Y4G&U+O<)^7-Or?{>dW#Ebc8@b(!&(#%X-d3e8;ruQ}<C13@EU!?YsE%=W
zeG3yZZYzX?{gL?^&CL<kt9QVU^=3o+hQ{5Ea&L>Y0+Dg!0mHHBSUW{<LD3>oh_oub
zuLvFVJUTpCvem2Yt98fNgR1?P?#}?;W=@$+;dg*!4%2$GdTu-(ArMc9S_9?VE6kfo
zwEOko`n0ORwfZzsZJzQFUyP_Z0e%o2sf;*iT-s7ZMtaXDzYQe>cv^XO(GXyfqGkf0
z;m;nGuswZgw_h^%grkg$)=W+_BK2teg_y|D`5}1!X!Ckyw3Fd!`eL}Ob%h+qn%aq4
zp>-I<hUT~gE!W!a@VU&&(a1;arxl=zzWmj&CK{|`foe|!xEu^XoR+v<>6z#znRd?v
znwvW*+LhwCzXNEMH<%}w?oLj>b`58&zQm4QFuM*+d`EpM=>CqK2A@cf%U&LW28xp^
z|ICdx6s)5hAD?uOvlW<dOzN+ks<!uu5(5K!&ls$)`r7uA<NvirhV|kvT*1^^7K-sD
zx+bL~WiPVaH=aLOxtLY8mjDP|v$pupu&axscjm|@iq!b70giBDui1AoQAZnjKmH7k
ztts=v&->eZn32!D1Kt7519J3)7w-1Y)0y<-gM5K#p#=)YwC1~zE<mgFf!Ss~S9%9V
zL+ni~=_A)qm-;d*bG)ak*3?-);Ej1KBIe$*`_lFGLH04ZRudvHy*sW-44WzT2kI+t
zE97-wYD&{Vh6?eRNNkxw*Uj7sK^qpft>R($icA60Q2oWLDcMEG4{L|AIIbm~y@JHc
zd4@$^*#ZV~&YZJ+>4CfB8<p<>4dP^X$4+T;!qh3l>HejzCDLHM{q?P)m9!GP?1=^b
z-GtOR3zd$1!R^!C%8Rs<aAQp$7{h~h79&FVgVzexiYFOQ(C)JBVycr^1`Ax08`DX1
zZOe>yY<E{MB~|teZMA^g_~AR?FzD2tX7H;0doGFsrSq%AgD{s}YZHXJ-{(x@H^b4=
zT(P9j$|`=?KjtmfD)g5M+W0BSGyGE2OZ`m!Q3lhppLVOJSYnX{L2G$-%DnzpzP-<B
zB7V9XQI7r+f<LPW8=9ay6KREn{9B=~)Yh_&6tnN2gCn6yJV?o!IH-S}b{hCfQE7~a
z0r=oZAG7b~p8WIsi*|<6PdrBMN3Mk8FZAIH2C#^Nd`+sF{@k>7p557Rz612Cyo&Gm
zj>lVYneFRBXurVOXVq`y_kk#pLmJN#&v3-57f6R`;<2~n{h%rF?h)%)SZcfNCDoOZ
zyF4!<s9UV?Yu%8qPY3KKCda06dA_(!p+1s=gpvFF&<``t1$yH*Cu)|sTslSEoogSl
zRhQ4Qnj31P21f5I6olsoq(}6<T&s48Q2j8VtEgC&Jc`V#sqIpjOL!@{8%-r~QEL@Q
z&~Xb2n|QM~E?|%r2)$l9qAeBiT+^lFDUimsj)=$`y2A~%pV2q)PoWzBGW$Lcuf<(I
zI8{ZYF)dh)<rR&0h8z;9Y4SIXnU(0MmYN~4%UE&W<?>#Gdl~o`ird|VYpJM#&U?}f
zr%Mje&K1?qmTO=45KtodTLZ+Jx5{#+RT~H!M*W#SO*3@$8Sx-9wCm3fIyllG4<(+j
zvSU#;RX84iuCvJ6=RE?eYQ*;xx(f7+U6OwAiD5jjRWcjwEZNJ|t3YfG5cO^OZq>s*
z0-vgSpWTme>i#OaGYty#jGM|2v1A#GxT#LEcxDjsg<zF`vE!458B``WjTwRNDmiXw
z79vxR3;j&yX^pDbnAD3j>#Kp~a;Bxr9Bcn2)=Ng%8$h6`XZ)7O=bYv4_PXLDv2=mU
z$ux&FVlHJQxd|zkT(tPDmEt#DVsR=VV?i3`MHfXOkujK_zMOM3APspIj`Pfy7~Iy@
za0)tB$Dtx-*+bZSt*US$P&U|cSHwF1QORh!$y$cXxIx5dX$~#5-?DdH<~ZOi=Te$i
z$T<sk98{(el}Q$cKKb%@w%u*<ud%5fDClMnjx{1F4UzN0KT?!5=)|9qAX`Ke)z`~S
z@*QB-pzq+pgAL@pv$CeQn~U2`(@y)6YKhF)a$_zfCL)(FVrv#$vFih=Bhy1+A)Bv{
zLCW@}ZuLMI(lfxbSx_vCVfpTf`b#>($QWO`cp{kxI=<BY#5Ihb^2OpYy;(9Z29ubm
ztnvm-$+)+VM4G4`W+^o059DEA)AV?dc<+6c{{e&l5AfsBo35Xdqk*#v&<BQNWXbN^
zj~x5Zobfax`2(p&#_?9&%yh=75nC?EAAgNxr5!+@5&tF`ko>)!cT0774r(}Q<VrND
zp{23%F=Mo{Y=rLmO{aQvqa&RMt|CU43I|&m=(Qsn*?5ZzkNRremtb6E{mSX!a>4c1
z<o74m$!wB$W1cX*+8=3dp&*5+AAO`&+6}m}bwMnWtkIl3|7Gyawu*c}sBgN&E-#Fw
z_xswyN%bbp1^9{pi9gWRo1G+EDzbs&XXE1kvF<9<affswgmJrW-DK!&p|Yn{9jj+t
ztcD4yoe#$bx;L^HmI0Mjk3vD22(Z<dafJGPy{SMl3U2$3zz4qUJw8U%o$`oxK&HJ3
z<2{gvKGl0X727D{_l7x}0uSx&P@Rk)zFeN!>@z}l(*a4LBO~9d{H;{U1qB@PJD|c4
zs<Am-<Q43<F}+g)d>L<NvF{>Vac)}2Yn*7~FmG5_3cr+SVRb@^`5|{8tAORx;cVk3
z7FpzzhzX}e!i!bNP1@tcCx|M1#RM1Wzb<vYGv+3La>&x5-OiTf=1t&q`2E6c$eVc7
zoClkKIF}<9%vATwN~}5*ACV=?BT-%B1VBe(g>}0;u#QhLRLimV9Kh>%ut7UHyiMZx
zhFDSSXXi$Ikb!=gewG5tsE~-A*{!X*9E`CUI(M$F1g6klQXbQ`C@`{zcKyv;M*M~Q
zWYef47Fwb@qyiC!`h~}ZG@WDate1!DF=yL)cy;P$pMA{z$u8Zi+3*Fu+cJe-bt?6n
z;eHav^bH<L^+$32DnAer0aLl+El^<1eb@nzP#tjNw$PsZ4shYFGlhJ7{AJLt3f5bK
zyJRBTv%X8U`q{if3T6yEU`$|Hlb;e*r(K$zFH`7rgh|bWEL)CORk3hEb0MWW%)?9N
zmn-Dv4B#v*{aID`LvR8s#^!F_tn2>z27F3{>*<Xd=KBsHUnX*0Q<dp90FS_OkE3O=
z%2ts&VJ2#l!tZ3BS<uVqlMETd8cnzp@qTV^nro>04J#IAXZuiZkoK6O{Y}3<+FaA#
zer(Jk70;bMdLW7}GlWcjRwAFllzXocCx!GtNtXtwhy$T50slKpltTP5!Sc^;bwE<T
zB!Lg6zw5AAKIoZr<FRwKb>Cy~9YB;2W1jBX$B}tupF+hj;8}m}c=@TSWQP{0B8#3?
zBl=k?w87~LhKv;*OhG^>1t}%?Cq_RjN74*sKK0uL*7p!+pq@FgTsVCzWG&eEBtspu
z@GP<RM|^>d9YonY3mK(=>arG{b(6rUB%|rC<ULg;Mw5qQSoKJliv5}0t1O$ZW?ij7
zdTCE!Ik&1^6GzeM*U4*-qaTdR96HXMN|Mjt<ENm_R<3g>Eh607zy#@Hk&4Lt`iSuK
zK$>#t=Y{893hv_#Rp}S`QI>AEAc<-0jdk}plF{t`vzEf$L<wzkXB6rLqu%<!M}O8v
zK{{HvD%UQjZ)6nGfO0`?H+|0||Jn7+hOc(Gn~w2tj&_Chss5i{8o!C;UXKOP<zklQ
z;$JAVUKC|AS_~XNRxID1&tK_7Ri;>)(bpaSYrBXi+I5>ox&U!r(EjYTvn^Wh(aK*_
zr@>ww#7sf4;8^rmJ=S^^El~f15pn(^vV-EGL&#jd=W-e{FV|<1{sO-x<)}B8`lfk5
zd`Nr7M()H8gRU|$g#MH$5NN6EUuZq%>=$FApeTPGaK?iEyg|QM+tp~ggxwZCaUb#J
zb&^8!Bd3=-MH&azX*qa+S&x!I`sDbTHUG081tjnZp}4V)Yu4ryFk+qDksvnVKH&14
zq5f%UVdACbiz=El|4{us`s5jMn@n$<j$@XITNE3uF%l476cvE^Q4Xk43I1qZ`ieAm
z$i@m}lF2Hgsr+A?OHyD?)<AxxPStzH7|#gtV<5M;v%=lZUbBp1-Ys42pOf2M_#UOS
z$-9o5&1KT%Wt8+s3zAFnqeIoLk9DwOT9yNKpS+vU-vND693cyiPL-f;DpTQO0qvj&
zJHq{Fm$yIsX*`N&4+jOVZ3l9C*SgQF2YTC_D<C=0P#_cd!WmMhP>1pzz^(fGlP<nJ
z2s8oz_DvahqnDr3!scZoj)yiwM3RV-Mly^4rDHj$O&*LR=)hYU6USps+7keOLuNqj
z9UAn5Q{s6VWBv9ltcpHc1njrDCAYWKwW??H)nu28Ac!n9bu|a#)TC-SI7IK4>aqKX
zuOc5O8}d@7Yz=7-`X`1n>7lY|Q*#P;2#lVK`4?WcP&5jMSqdwkx120meZ+x%D73~5
zWOBQp9i}tA5%H@<;p2vmFI)$*T%6NOYh^f%<5@`T@~Jxu7mJfIN9c9#CMI8P9TrGY
z23uKN7+TK4bZmtXr+*ffQZhy)%ni_Qkmm)(lsHFxK9EQs80-OL>wKK}U1_!LQ_V{2
zVz-;3;RC|m(b0{80LQ;k6^3&Q%?s}4EDA?#DgEu{-DGFpIkx8y?E|<N)e;^9)Mnz3
z$IK|Su$MRR!1!ELE_vml)>e>-sX|quNG}EnHZhuUkM*BsWI=jW$c{=2{T3M;kpNcc
zoF7aCzXZAP{_GbpXQaCqZBDf#+!=Y_r7$<eGk4x}w9+n&k1%=Mf=DyiMbLEZPL_qm
zNLXX0vER^Y#79m#vB6q9k3$@TjgTU1&D-bm4>fFq$An%#N6jA5QWAa5Xt4dJqd7B?
z&vE3o^q)Sm&6r*LUmef7o3#exuu~hb)z@KX4oC6^FcAoF+og4atVqQvi;@)EysUq9
z<L8P(_pOY?LhUTI?-PgXa|#-kQM2GKzz<w86Y{+|_xF@AkM6?0On<eh;gzaxFPgHW
zWn7fc6qI$bI;W7AjbbGX-?i)9m!zSEfDqv*!HhXoUC0pN{B3v+fOh=W+bRSnWUM|d
zxpOBY-`$x&@{8btc_Ky@`O-muuidP35UXWOCQe1NWpJGd^JP<j$o+C&(N}=a{8!9S
z_fO-$68Emd^oihc7sbTbyS}MsYnsewS*Oy-;{u>EftOn3y+PW^^567FC6Js=IND4a
zBU6uV_)d$xri;%{@K4|z;qPkGaiuT(D6GVRTPHm)y(WI9EfaG1yf57t*6EY+Q#=OD
zE~*Inn+NE#CWR4JX8CJI^wd%3ttvFqr3=UbUXB={=G(2H5vQFOg3~S0-*;b5zAf<+
zmRMgz*hj3i)Ed=%)g*g(hJ88mXUDg#s3W}SuY9dK({<MR<(+^wG@85%Tc#Qlk+{dV
z|3huf5?(|fF+~Z{tCFEB?so(zV{8pK%pDB4<W1eeA<YR{;@yhj5@nyikiB{y73dd!
zQT%RZ>KC)`cGxJ8aIX2CF;qPXVvK>!j;U<<oPWJ~-7d4gUXQ5^W)Q~^QAJrDiy=N!
zQ!hkcb+UnMTmd91zau>d7TjN5pXD#FD=*}?`e_&jfcJY<+^E<Xc+$FqSa}C1|M|XR
z+g!>>&oW*=G0l>YK&BuNzic0sLxss%Ib<D6rfWA6H7OIms#Kg>*wW>~b<_3>XE$C>
z@pk*mu(b?p?2N*}cHW!u1^cIlT3!uFL1_|ce-)?XW_~kVI}+RV8%UFvyz~=&xA{|!
z@;_v)?$O{dqqc}T*%6s>R@B7cmdINrM6!aOUrq@bQFS}*xWd4nd{(Uuyyrrme2n1g
z?a4C`u0yxmbIZp8icc?^=-9Ynouxe`5-Jt6LfbhSx-?prJ2nGSYs!=8-H#Vp5>rs;
z!CGWYkFH40aY#T%XMV{&9gc!3uE^*{KeM*w&@jU%$6htTz(C!c5MG_^9a)l48o6yg
zH8|baSaFAI;l8|KSVB)&i@?$A8u(iL=9{h&{>RA`T<x5^{<uQS-b#RL5^OdMzH!y#
zsN~HiumqtdNg5ADY!)Pb>+u1wSs94x2dT$;X}HuBJ4cPdmc*}A0I1ufb}82bEYk0P
zVRtR~X(Q|YA%L9BcB>w0ZzP)B`%<kG@kxtVd2-Wh>7}Esu}WkG!Ilk@;zwaF777c0
zh=ykA#`q`3B>Y{Pmrd${H>mx&9P@}e0j7m{YB@cVG1f=_iNCr7FOy6<r{!TES`}V@
zuzR+1?{?!4-3Bk3tvX42?&tg4FAlhf)Ja)lXUu(PKM)&4W-nD}!d>`!YNhgHZd51R
zP_Mx9+6)br+!EV4;coyj-0POKgNrTdpI4!T7SG=qSrPWIop|Ki6me{+vk<G2HRZ(X
zapUbBbhp3O>?YlIK^n`RHhy3ps}Vb`7X~!V(v_Vmhb)m6y~}+Wam937YrQC|H0lXa
z8SLQT3h}|yJHL~)@0R3~4hUIac(%wVTY>q*N@}dHJnrXo<!!?8Wf72_eM1ChOo{`&
zd%L3C)ei$-*VsVb8WIUB<PF)$;;mDDs%Qk6>yw<n?RBdKM;&PQ>eYH3={0-RLNHIm
zKsyI432UVX6PNvUcXkV#b8<SY$&%*?TNjhVO^xo`;0z9Z?f-K_C}sBXy?^uiQG@Q)
z+injIl0^NX-N+7W5hE#Em6IwR?=&P21tYtP!Wi@q8W$g*j2U2{u?SKBprix(PKxbY
zj4!XQ+3NoAaF%j|!KG&~>@UY9Jc)4<%SCDiP!nbuqSyc>w4(&Z05Z9T*#a}ki=Hw0
zSsV<6oHtK*r?~yhW^w3M1<}8Qx%sf;a~G1eY$64tMWZ2Vvb?RVN@Q|V@L3ZPkWL-G
zY`%M;W}Vh<Q3YL){D(am1C+z3X2VXrd*f&H-=FC^bQ9vL$y2dbYMQORQ|AyTDxi$X
zcKAcslRjIC_Q4~S(UnolBbV3!x7_(!V89m(!&Z{vIp1Hy^=q!*0k@N}+!-GFpzXK~
zrNXj`Vga8H-S42d{RCTNPRfD!ut-8<e9E38B0CChe~g{^{YCq<3Gpx^KrF={@&wBE
z#;tUd0f*o6DM$8mHfL1Kc8A&q{%B!zkIr$pr@;@{89Zn%Q_j=6MLYQ=YK1g4iCChE
z@Nmk6I#+C8T}hCk9zCe9$tLd?B;$^RYG*E-oVXSC<jj-wy~M#G(KX~&mn6V2Y@~BO
zo>rqfPS7^XA1q}`1lk?p`8ds%06}a5&|phaZ&t=b@oR_o>%O8?{zfl3c2;mWTld)9
z&kV*9|H+F0E+*S!9>k)?+&?-LTpXlB>oTqR$*?JSVNXSC!9Tg}!~*bj!(ewX9?{I7
z-SXU-MPHMHLd>z{c)`eu={ns>`qUps_9YgUp~KO(CNkqU%Q9IP+2p1))N2hv)D%E+
zfb^ZU+?J_JghLPP3@jcOL~jO5K7(#1^|9=n@8;Zk1yxGQCU~U526U2jK4l%%!W}x!
z`S*TEM=VWSm6AD1c~<79$Av|Fa&RF^>EWj!!n(CDp#*%uJ;32|b|#1~&DBD$%I$PO
zLb$Cq0yXU+%aar+_(V*o6df%atU~B)@7qcK0CQHm$;Ypq5Hl)WRjvv6Rwd-Y+Dv5O
zDI<gmEQ8Lpm9a5)g&$%h8*6GzbP@G7JSu5P`&k#UzI$D;i-t)or&Uzmk~iarUqfWL
zN{2}Z;||?jCN8zjq-G@ItEny)g1kwHMgmGLAf**W4FDj>h^h$Y(pHiIcdA*}ivM+6
zA2JC&wtHo_KIZU!8&Vyl1YU2i!&uPo@}CZtKgDGU?boa`&j<0uH?I40U8;Rv@lV&e
zdNCaZLWmq`s#BlI{qa{Q_RBwjx?cK7f+}`YDG71;YjVMt`c}GQACyB1N?tw*{f!L~
zD$`DQ(|MhJ1xkwNE58Fcax~4Jq=#8@(*DqdxWSclZMmwws!Y7?`yKlg3Lgz9PO{Bg
z{j@Dh<@cmlDlbDm5RBBYoT0u`<@cvFIQDB?Eo(NMgz5%eBf04!W(h7g<DFS<vx$W*
z*cCAERje~F79uX@Orp#~Zf5`+wCGg_e2T_z-vRjfDCNEqYi9pQq_%t{CWy=6Quec8
z0$RKr!<^m$&+D|W>eF%8>KAFJK%9`rsHd#>6-Th&06IXkA9+tmZ!VX(Li=Kk_CfZp
zOp*!nr}fRJJ6aFbSlQa;-&jq5=)`5i+4mJ!(_N~c8s^C+5q)Q0ty~vc%Kp3qzB0Wk
zdeR#IHvOzpp&Y|Mca~NtSaC<DrKv3RXZ)@L4wDpTdcuF6F!SuZ)9t4Z=vTa)Zj7~#
z{fl{w)Pi8a_x~^@n(`^I{W0^YT)b!L+Qwu*f}IL$DTQC?{#BP)jSXK*^Fs@wU!~6d
z)9p*k{;2aj`?3B=m=SGtEqQybe95WsT*wJ+`%r`B03187)Pe2^VV45gN(?5+6-9rm
zFY)WMoM6@Wgg5<v0tyz*&Y7_9o+d?Zuo_OySuK=}lhL%_b)|XLI{CQzlxVgYRtYzh
z;-VacY_#K{$L(WdP{hm{gK6j1zgp~`gsBLP{zGArP4eeLek#^6>Z>#9@(L7+K;Q8Z
zn3Ifo+rPv1P4O;znu9D7d0BjZ*+o*TfaND9<Q8uUd@@hU^KT;*d;W(oAE3k3okd()
zS_NfOXJW3*PU>)Bs`{GIFA+C?_U7<U-}xfS`F_@Z)f*-U1jCMT%=ebC=iO@#^JaIl
zT*-7F>Y}x!4I_S;c@@zkziwY~yzM-*BOF0|2Q;yt#7Zs179nFTd?;N!=35xeE%8K7
zd*ZgU(~2oNLM}1AP~6ImSG8aDozP30@7$|Jww^Yw_YK@so``tZH|;qVLl5}to_D|<
z$15+UU(KD0|9Hs@+pDFg!=<vxo3X%hD;zXDr=SIvw4UWqao4el#5=&9H+NUv;P|ac
zh>ZG&TI-wXTR9n>X#R3tv(l)ROfXW}3L&uY5{1xa$5(Nxg{QjPrCSA|u<IwLNB4)#
zx{m|Z)9`OJa#JY8TK^W(%>8{u-z>|h!xR077Z50yIz18AS)m%yuFD`_hJXmsvINon
ztcu)V`&2O>Fx%GoVE_Sg9@8~M=cd@rCB>hU8OzVoZ!DYV=+zjWdgr%?+Wh;47K<90
zhhM$i&G8|{vwVMo+{#TR-!gP6n5zWju&<Bb0iWIhIwaLJdeakJ9aSB{gU!qHW2bEe
ziqu6ulqZw^T2INLO$!$}r^?rTgb8n^0ymAU6cV6i%%yYB1UtApIlLyRg{eHYD%XED
z;A!-^+0Rm7yS2)u$)>hw9?C$uWVZXwS<`==DeracAIs6GVg4LK%Ev7{xb2ec#VT%Z
z=!at|?|{uF(mN@k|5(Z#Ja2r?B=LOEU^m@#OmJy@ercKz$~%Ct=<VpE+Tv8>(ygP5
zIDUB$cOtlGNi-eH?R&-ay?>qCiufW<`ECE7-5&s$hu;D0IVy%^^Wpb$?vu&|KlAlQ
zi1<_-W<OGGUQwrr-Tlmq1tcRGFEe~I3oT=QD@L;0{Naz*A@m;=9d@2q^%L^9U;k(Y
z=s4y~vUN0nPn>@?3nZ0{V3ce@d28&?ojw^>+1EGR&N)><i(_|sevEhbnw>SY+cZ&S
zhf$9aY@}Xi{-{B^^On4+|HG31lk5DkZ4zBdS}L&F)+WNJVBu}~tM!(lROqX|1DI<5
zOy3o9=KU7pczbH=Qe1W18oDji4d?S^bG7kRJ28CxC**lqGVGj5xb9|&mO^bCDqg>n
zB<$VW%NO$^=JJdyyuN?Zk&}5%dQ5-HuqZpI{PL7f5t)<RsuA`M7&?JFnR0m3`A~$F
zF5(s3jmX{SuPv}bCVy2&srT*Jsow!p7PU_$+5V~j$V6c>c29nvuTV`w_YEQv*3K=I
zO&9RJX`=O2J^^rte8{GW6jGI=;D+)J#&NGnyOOkUw!;`~{bX*H@YFOf^~(G4M;68L
zkS}9GY}J=0wV5ufXQ8UW$aHanS(zTP)ltOdzH)JiIUnmTJ&Ocy9@wu-<rm58oDInY
zDibsF#eML+pegOEauW9TOXx#_%4DQat$x<Nd(GfExJUV5kURoQHP(mQW`2FjoA16p
z`7r1YzM;+cA5-0%Du{1%UCRfWX_ZojTF{=TK1;p+KKXX~p|Ow1&?qByV{rG?fE1hG
zeuNMh=29c`(a8Ub`l@sS_4seIDa{8NPU6o~u5za`ez{CU!E%gnDt$ITVS6f?C)52G
zewtV?t?nM<9-g47O2iwN)n<>!f9eM2k@qFRmW!PnDzUEB{}Us1a{fnDN_T(dYyxsx
zBcyZ5i0j5--1+SLD`fg>I`2}g{M%y5m4K~=2X`l8UmODtgksB(X(&zhE>Zx`w0s&@
zZ)L9d9-{w<5#*1X5>KIY*^kOlXjLM7yQ7VAg1eoVzj(@6Abt5rBZvA|iSz{}zd3!p
zrqTesX1phG9r%kwrZ-yh%oZA9INw!7@=W(1F~vhzG`u;z6?{*+(R$+y6jdFfoN;;j
zPRRVgT;}go^AXUBNFZN`f1&ty+)1iO5g-@-?QgS#YxsN4{gg7F^`8)(4^JC}_p<Rk
z>5&e$OtnTt?~D-F4c|z)N_W{kQB)!S4^n!nWcTa5_uxV5Wd0Bw1*K5GBACAH9e`8*
z4!H1Fbz9N=YxXqvBO+&FslCt1=p8^;KVMt&4(L}r!GsYS^uFz0M=p9D`{%G3OPIR0
zY4qx&%0CIx;dhEWH1%MSh2vf3BF%;vK)NwS2Ya*>Ay~B3{r$=#AW0osRLqFxXjS6K
znYiKfl0}gPo+X=PJs7IrU_SA1Ye!N#74_PZZuM?64s!EIv4@r=DKyg19wi9&B7RpL
zhxp%jVw=m6tLbrqTWhNE{N<FAT~9~f(g#k8a2YQqhV%Hdyy6k(-G~j+wRy-TMev#o
z94kJ*(Q9JQ?YF^gKn<%o<=OOyFn?wB$^pxXr1=@pTU<-ypDTV3E!T{2T;ONGD-bB;
z%-*5WVELxYxULd10dpfck4I8QsSjg)uX(ftoO$I-nzu)dV{YCqZ;sHe7fI1SDOs3e
zJg%)lKbO;>*q@TJZJ(t~E$nw}mBZx5Q-T0$$z#K7oxsrR`_dmPikcYrC@gmjTce(q
z)|7+?>>8fS3H0<_bZ*^l8{LUSNg%Y5AwiME_6eiZuS(-U2hPuhJD^;85IPez-TqP{
zZW)S#f9c=6@{<~1$S#SgSKxUaOE<nf7EYnnMGU;R9y`?9!p6+i7YWH2V>N6Bo#Pev
zwN=<c#P4IVVY1eI-6vf@$5%-)EH4lyBe4jDVjkiPd8yX<cKyO6!9l&u!E5cS8eXN%
z@Yh|o94R?JY4qdOq0lxy)Oe9%@kZREcuq$?-?lpaus~H?G;dbp;0{WZ&Nh?<vD|Ud
za7acJoaRo#_NX4%Q!#@qdhJIZ3Rr|N%(ER9ZcdN$QmU}nTcR=REH2%Se0<0`<lZ<w
z*H3xCYdwWc<=^|h(di>J4_UsEW2cOd5eW1$3UBL*MB^0N$<RN-($=D%gFfkEYot)e
z%g|XtT6uYgHd?~OhG!8ASJS)OdFviKH*Nln+qipqb99a*1nrKpt3pf<zUbepgkdK7
z9hGA7-d)OjeOcGD>0lub`zFwNYF%Q?1D5=7%e0lmG&^5aw`xBl2REB9L(6-T1<jaE
zz0G@_%#kmRr9QOqw0wW5eW%)=eDP!SJ^^+>lrfM<C=Gdj`Bz}E=GP~0+@4vi=zc4@
zm-&iBecdZn>P&eButvgdPz~vwrhF`?T16P3<@61GVyt4^xrXkLZA=pxGWkQ^(_)w(
zzO!8V+IZO?9>R%_Y=1?Say4J{`@vBuW#oLiEs3bEjK4gaBDQPNXnhXaMl~2r*`eF2
z$@4jMQ<)w*IOer+VdVBNG@GUCW7?i4^s`s~F!iL6`w<=`_n!!f2wH_TdIpd@ohu@Y
zWJ!&TwMd0I!kv^2ZI(k@nVC2ZB}wEn?@3bv)Q@CSQB!F*ek@*TdYh$lz9YFoZYIq$
z+=NTV_$!jP(V97V+;m<Eg*I#>2`3Vb+tOzaz0t8ql@>bZD=?k=A0X}Nou%YRJ0@7O
z!d!sv6Z^E;Nib@I*xk`q57mNV$0n8D7W1e!BPB8R-BoqO-jGf)X`+&w-ecteGF=q=
z+DchwK4!40a|^{$)v#-yPe@=(O>6`6M6fIj&7yirKnd}%Lo4eAJ8RNd$}`90{)$=R
zZ{0vNL^qBUtrDG%2wFf}LF>JyXbN^BhG(x=w`qD)Y5GhbRELFhafF2CXBne!>KDNH
zHLAKB#^kUJjy>KuLaX2S=xm?59b$K-jb$=b`ts?@_!cuk77oESN;lro)`R`yuKobh
zq1P0JLrv>IC00?}N7?gnHB%Z-+aC#+3(LYVIIj6}ns!SR6WS!2W%HCIPqff}emax+
zGqx65y1}aUetGOaa0SoO&H_sV5Mt*MUCW5@tOkG!Ebw7=;^Stv81fqB3`@%ru9_^N
zc{HuGlb+C)wHP)kNrRYWOMKP?Et*D{OVK8vh}1mBJBs-L7^%5RoA$H4a1ufq_bAx9
zURmeV;3{ZHxTWf_xllKvL3}#L{7U~+T{GQ11zUc75n3CRvl!O`l|dzbl_$r;nww0c
z!jv)gwYwwEWfIICeOB#up+tFyyznu^@7vDyZe>Jy@HeX0K#7gpbB^JxcE-fiLDAu*
zu8Q%h0SnA-JJm`<MTOovF3vTAs)cwfxER`UwmU-8S_b7%T++p|UyT_=TNB#0nA{$B
zcsNgWskx;xsk+EK)Gu3EQpDlI%KI147Tw*c>m$05RV=3``=f6BgMQ=zk<T16!^C4-
z0ZqF{5}j<_1TW&}hA8HhNIiQARWpyA<G#oDy$-)Q1YCwmAE`J(m{FU1f>;K)WzuEZ
zh#h7wYU2yOLNYSb$Ju0};X*fZ&t^`gk|r#CUdoDdqgdOcUEs{CMZmoOEYtN9K^d$R
z{yLE2)KU8gO+h$%pU7_Y6)IslhW4w3Gq_%VY8&hCz(Qk?@{Gl1Q?wXn0gi5EhS}nw
zJqv_N5u*sgjypvrK(L{tIy?rjqg(*w$2oKm5T3eywP@M;YQDI$&8Vjlf(C@BP04lP
zu$8cQI6YF7^KvlS6_1}I!PwEvb&2+vA;(^5y3$L^eqg=H+CylS*LJ8fG1*G23K5)i
z{qt8csyN2zZPV`VeyMIzm+JG8Kgw`De9s#3aDH#Xm&I~By>DTO!g<7@J7G)J{yyJr
z3K&fo;q}xP9v{ZY1M~#4-G<%)-$pOAyr<MPR#?g4k_?za^=Xi)x)1?qx2K18MVe>z
zCE`tA6C&=h_4ca}&^AWDzXOmiCjz;-#bVJDZvR@PtkgoJAf(Zr67^mzzot#{Rf}3w
z8NJ=|{;0T#BAgv6A=09E&QL0utMbtcAEAb?Dl@<O91)J`S@>J{?pR*C5gFLydT?%;
zI8J$pg7cF);8mvvy-=1~kF{^|gu-<)A9I=i^%>=O(ZEkUFIWB}Zj21&_sM4<BkKh`
zyT;3hX~;TA*noUYC@tGDP9gpz4Ewc}fB(ibI<=@$&p=tBp0WMe$BtnhRCDSPbZ;$&
zxRf^7D-I`}0Sn_h#!xvDLh>@JhGGzGEk*QKa&}i-k)gWzHs{!CDP)U<ZxoCJ9d#An
zoG;~W%Be4vN^j7OP_k5GbX!wgF%r<`xSNY)h%TsBfObP9@No?_-e%S#Dz^VMd;van
zaUZKhqY#W$|Es>=qFW;aA#yus|Jj>e+~|*l8(P7(pICs}8(NNMb=UJLBkuxgIbA0@
zg7oHU=91(NB1G&g`Tcx#YA+kTy+ga;;9Yo}P}c4qnNOp#w0@N(ysf>*wQV2TM^-1t
zd_(aLsR#kyRNP08@^8@JN`=<Ix)LJ9%IR%zO)~<Dj+^e!2%;0~Da(2m(j{g(po|A6
zZsMxle*;xOs=v;q&HTj@udk-BS(^sYS2Qwyg7VcJcJ~1b0)QWOx%--WqC_xcJ(&(!
z?#XS&$YhgMQ&q?^3MWOfPHpB+Q@l@>(zp64zKK>V#nAyrh2iXgiEvn`N+?nXQ$eAc
znDJ5)Wd&20YnF#pl84q!Qb)f>V95n0**fcRogsxJrZ0)#>CmSTkStUv*Hv2Q3v&u3
zvPnO$QZ8bmz1?pz?s5uatd{^48}z1wpiQ;ZYiceM;XcdCA;j11rF5hsHBKTz*=+v+
zG(k!uNhjo<97TSb>eNkUJ?MWEsWwP6;7WcxwSx_0?tO<syCgz7Bf>AmHelFBH9h3K
zq6lu3C$6zFGpr$%kr;(xT@{ObgLc#@CB{cD4-K_}{aH!NqE6T{{eH=fO~hPf3IW$D
z2fX#u*JYcNJXh<urY&!=MQSp~&4lkyqgplDH{qfbqZM9Vah1ppN-hvovXN8ZRsM}@
zM&R5KO=wNWx9>-`ypr$4=p=rv9vMJ#NI`0_cKli3AUNSJFOjdhnvlP8pOhE5cx=0j
zo)J`3wCq00YGWyr8p4Sqw{xwML$2<x5Ix;=!!vS1u#M!FR6w=IaU+V9Dxy8K)51zo
z0VKuzN8fRO5|W}5UG^FzigLjcwzj#_n`xo=i1?1H&RbCC0yxY`p-xCmeq^MiAEQiU
z2-OdQM7`vBEv9qP(a5WjDFff4LlP6>oLF60-L1_p(pZgeoJvxo@e+JE>V{qfIVayF
z?Uop`t)(;7$)QdsRH%`wNa%|Tk7`}C<5+^(`Es%5EoQa$SA860T9Ak;d>bYwWV|Zn
z7l`r&cBbe4gHV+0uree}Vw-WE?&HlZ^4ln)f#g6Hr8Sdw1%&ZLIe;nAyOnCZujJz;
zC6@(A+JMtcdTfFnnSF{Kv%ZblUUtf|3K~&J2A&&@2F{Dk7CE{tH$Lpy@>d*nKqg}&
zl1QfX-$$#b80e+@h|7vb{{Y2t{$dwyACJ2qS1M~?_8$u>er~Fr!!5V_#r0A+DG5L&
zNl>R=n(T>-D)M$-=SRGZjmvr}8dIE2E70w#P+(M@9&XJN(BG2s{{RqxrF((g>aB#f
zh-Sq%8n-a1Zn@SfM>G2LILMwUyued7I*d+JDv<h6r#TVvb?Z%2zRLudAsbn3$n5xp
zhkV`$@>>-5ZL1WU8A>)f2PV^qu>~?32}+NMr;e?|ctze3i%p{#lLbqBr-O+F1pQ-F
z?v;+1%mrR$H%ORFS@&3vd=U~>HybGYDC_;TCtiu@K8Y;bg_9o)2tRLf+35J@`vDw^
z<}U7M*Bs*i04j9nNw~{($%|cgD{+2lue_75p=<+d4hz1)tin!4t@xmwt8U|b%&pcn
z0OaX2qqNc&urzQQYLQ?FTauC5Bm(=3>PxthY#oLX>`kc+st-75H2gNz7z!F}ID=28
zT(&V1w0N#>6BvUjo+m}keZkIcx1W~Co%m->iwaV!_lbG~P7-=nr0d5%pkWyGi`$t8
z{81A8O5l3Dg?Gqz{z*n>a_v!JH3~w2d~sOmUF)tY%n3-iSk~UkVDAJ;76#Z-hcCJ-
z?X7=Sv(HZ;s`1JpCgu4OWXo;Gz$`ghR-HUGa~~YUtF>FXLVcN0nM|ldgGPl^>Fhe!
z2TfI|MR~~+dbq`o`wFOQinjM}p;g5x1?E3-u9l`&!Kxif2;1n<e_<OAt2Wt@CRL;T
z(93T56Xq~ln`v|;R+SpPKAl`*%3l*JFShxe>P_w~!RHj&KozdtMMkl6F(Ft)jEM@-
z$n(`pjvszU#+1;|^*uG4<$!bw-B2ixWTD(LjIITdrIkgJ@=Jr*-!4k~0M`EiPU)i}
z_(8apr-MhCWI^Hl7g_q6?i|kF_Hf0rf*OZ!oKsEG+TlTVYf3cn3uPzj*U|o;qBY1w
z50WLli>AlKj_F8_B!30*>mq(bmscb<JlfODaeMDhMDNtpgRT0)*tCxXt!iRvL-E>J
zL_=Ee6jvpy^`4rX!QeTl2|?Vxi>Q4D=2q(-M*b(2Il~UfV#vpDO5H^e=A+6}$?@dU
zf?X8esn%Cg$Bslza~}+W2f<Gx7C9Kwj}ydq5dQ$jRAWEw)SlYs*E}xvx=evGO}M&t
z3q)s2VZ@IVxPBmggWs>5bMa-1Z0eU7NQ3Mwyy{WWMrz2^5bU_?^F5zOO=tOqRIoA!
zGUnRut)@DE5}+=g{j@EmG-8cqR+a;7mfNem0+cEJn(3UyD8bU*h7>gy8+D#eEo2?F
zE%HVcg<)fhwOO2Huz-}ElnD0fy`o2g6!a@)>eXkx+?J%JBY_J^18;7j2+b|(U7jV4
z*WQEzK~g{`{hc8hf}l&F@^E`gGv&%vIX2l+0YBN*&}3rDJQ7P67&iA@lTJzmg?(FU
z71m^=3W(-OAySL5(fA4?r|Ijd%N@d)nj+RwDr?QD-~@Jt-(@uz(!oC9f#(@D)(mp&
zdXzcPr$vS^mlQc3#k;rpt?Jumkupk@kVnE5?iKOTrPJb2<s!>_oxr=g*UpCz;sPi=
z=T)WC;t)iMDU!>dUT4CMACU=0<X5dVoG_vtSzhxF;oo3Mj;Nf95&}s2wWAzJ?M<qa
zH#c$XQzEo~WiRR#(Ek8v$b^<d4r4y%$y!%dhT0jRJ0^0r-g3Dph|(e&xk^xb^h)Rn
z#ERdAWs;hCPRT!sUmw${OB@u&WlhL?iTp>FC_n(L`^o<RPNh~7h`B?(X3bvUH*X37
z;j!F%H`HyUz<`Yjb1D^@$eWy>kYI$m1ypPAuBEVmp*gzNr-g#=@{F&Plkl2-JL&v`
zFosTvsx8%(*jFGZdB_A4<5RYQEN_WP^huW%lQC(K<vFQEN<P32uR@^^h6zNV$e#{N
zOJIP(6hR&})oUOb5fI3)mkBH)0$$?sXjQ+vRI0}toTSJBMeT|0{G*CfTXIk*>DA**
zKu8uw%$c7qv~nsWd`ENBO<hq)$<PNclI&@HNDA`6PzQejO%PQX6%rk7!1L)an^dVP
zAXkb(>%OHdaG-dtc@wwANpklTD6;3pQC;@XwnUav1wgRgF7M0o+)|R^2B7=(BTPbX
zF_BL-1(2`W1l0ckXrJ|IwkO^Zo6F4E?>{kaY$1mLtp~X3!~h{)DQ@`W)LmM*GS|eV
zq@KHv9R>jcaYH+WaJ(hom}Ls$w1kRR#2skY2s0{^rb;!FB)r77I?+mli%*E_wwTcb
zFDgNL$L8M~N>Z{%BUAM9CqR`@1<`+Q>FXV^-7i=y`A?Jc72w%DdVjA|-vCi#Lj)Tn
z!SWawqb`*nH-JB2(S@-GRVmWS0K47V#aIHNZ3<M^!02aWq!bQ0AyA#;?j6o;#$}MY
zQw_DY`{<}YjE4Br+fWYr`YY2tDi|1%i)$@U<h=vaeK^$vE()N%UW#NYQ$v!)Xe(M*
zZ|K&!p6&~?jyQoXbzU%BzIBf>w_jo_jlwLJWTdK~4lX2sbs=8hr(;GezPb00y3XZZ
zn=H51ic@pC#Ez6SIFyyT+FWr0qyPe2ByHjE*CUS|w>M!y6+8;&T+6v_{{WY<XUm|e
z`&3|Q?P13vQ2WQ1u1D9HLV5DDwlF^EL@y)t6-|>rXW*-D;r9Y+vWToiSt%{lfnNZ9
zn&l|L8&@%83XL1N7hjkW$0D9cNgMA@gnR!0Ub1sAL`RB^RPHIuySbvEV-}gLE8|*4
zN>5syXX0X=<PpJGj7$n-?e1<eJbbk%>=9ahRMpFI#8uc>=$)qGnDCx`)m5YeKz+cC
zQI%UtF6U4oNVQ~sYs;W;rkj6unwc_*42Q4+pyPJC93@ENl$Dj9XKtYBSt&^qM8t@;
z`0cI8fFaP6N^P(jt87ez6eAZZ4bJ5%Rk=Z>d_eW~(CVcWx!01@tOjLr`cb_u*OaDv
z=l3mfLb}mKWBN7dK9t3KjfeSSS54{MUDp%bRjcbmKmKQeNwz?IdB4hUjwuQ8DzrY)
zC$8yAl})wmT?ifKU7-F8pt`YEo#A}6m5@AVp$Sn)QiFR_!^iaNb|H#Z{G|Q0Sk#9a
zlF{Tt3#!r+*N|6Jw}pMWJ1P;9wY@*wS8U1|k_cBdritFX2;W&b?gOrmrBo;IodW3J
zTDIA@I2cEA?a1Q&&fMj;=Axoj<l9q;Npy~sQx3EN_Jgk~^_Bn<h2VU_kBI*Ou&+Gz
z79W$9CizLxR~R+I<u)?gkSd}IY4vN*ZLAf|*%Io1ZSeKnGD&Y-c4f5!nvd$MO=Vz3
zL`a0qc~llADYr<fTjNttZmG__!$jiNO4$X%+l^ZhaYz*_H6oo!)wpA5r{^s;d&#^)
zcH&k7Ql3c~MxCfcx{mI8h>C6^Pw`G|U#pIaY5*o*n5K5NvsSII5K!Q%jYhy|W{n+2
zL2J%4*ILXZveTSm6mSB&9U8jyL)3)3i@uATiLEc<MM)o7(iF0N%(b(7VH1~a*dZdd
z`cJn`D|GRiJ8X#6(l?gD8<SEGvrXk9DXmzcTpMoJB86#P6i={fjn5OJVprx*4#{q_
zJsq%+mbNsfvqq*;ZB$H<3}p}}Ky7A)AzVk$4v0Zy;gN_kS!V0y#i3~g15c+^1T@t)
z<tF7Ji4%&K_Y=7vpy=_`1tBdE8-?C7@BaWMh5iGG01dV^q1EVt#UU-h9JOQaMzQ&<
zRbZ^vo9(LBhAy9S^Ec(-OGEN#5R?@VdUYFURRbjMhCO&fWx8YRg%VIlyGPlyC=%gD
zdO{Ivl_BN+G2C)K!BL_{)FGij>=#wPdIYSLr>6eFq8J0k6qNB6W0tvVl^x1F;sR0u
z@uhS*$3+#l7PLKgyP{;n_{*sk_UJOa4HUIR=h-CKVar7I(Y2bkJ=Lhyb1l+voTaAI
zB1{KX55v*3s}Y|flvM0;ORqD^TBw-7C==tM%mj<54_(dMC{SrtX-V)tI$;n3aG0#p
zBiiA*CMXrF?gQ`DTck)%7v-}14Tru}L@C#l03OPn4xuRoq`^qZSC7U~f@oF}3ad`1
zf7hZ{T!D1SGUF08STV>*Qo`sDzeMv(q{;1f+e>x<4nRmyKnW(DM@>Z4E+{1Gg<sgU
z+oCgfW`Ro^k?+x?T%@5r7m)$4^75{K_BBhqz59>XqIpHx50kG~x$RA0@K@s_h@kM*
zIFc6OkYq<8jTIQRzUt5$0GAKGhfk|0KBxuUiT0x*04OqdJ$!W`BJ7+<D0j04HMI{m
z04k@%K9DqBSw85LE!)#^hmxP)ZAxh3vSNcNvbQh^WZ+F9#DJ#=aYWPJYIOl#h!VF|
zD>9uPO{U)*(vJKePzIWFSqfrqT~+<m$gS8vY;L)Wt@DFyd4}F;B_V4|&ZV_*uZRjN
z`nA@2E2aMLs8$GghbO=SN8Z6*!>rE0JJ%CR%Vb^WKXaI>$du!fUFG7p7FMCZ)32cI
zmeRw5^;`=70H>g4AH~pV^4l^<Y=RVOlkDEQjd0p@Rws7&yYWOjTZzxiyM-FbZEQO8
zt8bG=wNNUef@$m?!J}C*SS457W*L1n&hW`Nf2CU;z2vy#)^^Jdu_0vzvRhe2Q~^m(
zASilLgIr;^c0nVW(8nJE1#-V^tyiw(V&V*yDN4trsv1<VLX;%dVNHLsSNe60^%lWg
zX`eF|@#FshV)HJ)P@LT~LhU?n^J5QOlgTACs)*PSM~=L<In!nUzk=qC2<-mS*&w#^
zqqE84v=+z}p$C^;EQ}n>Kt5cE@Fh%Qk;w(_PCboW?6Kh8q=@gf0*ZZ<HLk$Yq*Lko
z_0V)LO6O*2<(T)7!|(f#<eXud@dyNN@^;s^7PoDWzFl;(uPxw`2wGM5Rs~3?`#!z8
z%YKyR%0R}*5#!7F_a>exir&|$F3{bu!lo{2k8&s~TMsngP&<=CkV1g*rm^z=ne|#G
z!V#F{K_2EPMv27+#QT$Mi*XGxJ*A;(Qqjf1LWLe7Uf@qk>z~Q=)@CvOr81AR?C4Vx
z2;HkCeTJvY<zL0-ni`HO=tVV~EM0gYiwFp`4&b{hCuZL5e793VKB9F9;)3cvaZ)oJ
zu@)#ROmkJ01sZR}DxG{jtyHH8=3j!*uI&|p>CZTRYc9(w;@DCf3MQ2)-9o3_pmpAQ
zT8*%_U8}nEi8e@{#LM2S=0)NZ*eQHEKb75C3a?&Pmzt$Vg;%dm=v>yXRQPNU&2Y87
z^~sipT<cP5YB%an>DNFa3LT_~mf(v(E=vh?{4D|-LXS|BUH+0rq+;rwWu(f|?65*_
z5TZ0sp4o5BTKe){;1li|$m%7yE}x{1FU@veb!`mYy)lJ6hSx6FIuy2CEtNc!NNLEf
zB`O;w3Q<8-dXSxY=c+3<VW0c52k{>5S3m0-Lq^Wu%qn-ckge!p$r4Q@ppnG;E3Yn;
zU2qbRQ*F1%FrAkA767d_`e~p|*;SbdKPtLkXFQ<@@^R9xJNPJSRLBhq8HV76=4+ED
z6-)_6k{cu_9<{ACYF0Lh;}kmAa+wa!t6W<7%h-JYQ%EJX*Q<@1OVgvgqeYa`quO-N
zosp|<2K-CoH&UXdEhpmkP*YMQA?+z+KeJq(zZpzd%c%yQ&@`YzTS|+L!^&(Bo|OAX
z%6H-AL+sS8oLxl3psz%|Hi;KQT2PVg0*6moiBVz^?$Bn7deZWrRbOwG-$sf+iA)J7
zmA59mKX7x&2C7-#e;rYj;WFxGB}2(A*?s7|lyVF>cI)g1O)KFY6AH@AQy9ptkzI`8
zB}oLQua5d_G9na&5ll&$aqh0fxTuF*1<Icd^&f^oOK3&8hTyvM!ls-`zJpBzYbCWT
z#eo?&MO=Av0;N0sdOW6hA_zKdvgOY~v;444Sy`Y_`*bU22xSojuaZxja$ATlaTNCZ
zciU2o_Grlvk7C&TS<$0&P*cGqtMq6VWD-*l08#TSNC=8kYv9+#UHyW(HFIF;wx#<V
z2zFQsnDGjEW}EfY=V3e)qYx9`EoW--!ey+{hL8zSKI-bNmdPy^%N5KwaB^cR9z!bf
z+XJCJ27t^GTl<-jDd=fOE=!_$Z_=YiuB{S6ZZevKVQb}w#l#h#eJiKhT}ms)2M$I_
z9$P>Zwi0*VoAlD0N^$}RYO!A6WiPNk>S|F_;r{^9t5ukgp(vFm<S!1atwe^9cOLrF
z^=cM~kijtpYqi;O7bP=xN=ZObDIWg-4Jvj=M2cC??wO=)tAnUllA<e0>^f@fV*&~s
z$qGYP8{DOWlqp3300*|3%MlyYwPmtQoUZ0uO%#@z6<=Qgttps@poer)<vQzour&#?
zYL9^ZTWUD-j?$H&zKEE+-#_s2Sm{am-f2iX*N+ol(@hi1haTk}g^;H*#u0cdsaqOU
zeO1<UXe<i4Y|$Uda+1yfrqZgXkSX_Xsm7O45_JO(ohtL&+nls+<7T7}uR@(|U`SZ&
z#l{`R^Mxi<Cd!nW13_KE_iE6HNJ%X-4&b|yT%c0gTi73O{RXT687UI1`#wzNuNXu}
z701nI@V>#f>CvjF6-vV=L$3L=({5JVIteaCY`DGrO?v6=tVJ5KRV(WACA}lGQzNz%
zEw0XvCQ&QmQ^=InX*36r@f!5srquyC$c`Yf)A+yKxB5Ga0q<O+8t$dI0@b%o_36=u
z=`Te&8zAfP`O8zl6;Ok)-1X6A1}Jr1x;_f!^qFgx-*RpDrdST8w;FlQNhL`LbK+1b
z1w*JHjZ@Aq0u{Vc`tn~y{aIyFZl0dv-fU|^Ly;83l<pAoD{hKPgLNt5t}00#H>XN#
zlES3<tW~S75P?0ble>R+m4o4zY>}C9+Y{eqz}P-%K|_2Bl%#A=8UsV&Uv{;+-$bLS
z`EaxriG4JFI(BhAg>e~Gi@5SZr}w7f`j*SrR@SD~^DPG!y6{P<MN%ohfFs?lTt1tP
zjSwoV4`#oBS(5@K4$AwNK6-(Hc`?GnYD*<5bq%PBC=w3a^xxf0XvW6m0*O6~&4T-9
zUCG;Z)<aTK`+&IH;1qM?$dm<?@UO5CJ=N1n$r9l_W(I{<ed+AYrJI6oIJBekiwas9
zLe}C<YE!^0sX;XGQK;3bvPle3<p8T>%e&%CJsNEn2o$Bp*54vpLh7X&Dw}Q%1vFu4
z<c7=_jI%7a++wiZkOi>PP_#OM%DV)RMQcu~1H<(mtK>M8I{-WvtQ);qjxQu8423MY
z#4QgvqJ>jn7L^^q*a{I%Q0jdb3qA%m);ov*5$;swNS7tiUApfLn<2WldA-FjoG42{
z#{U2nAesW9M9>m_rh~7B{!i7uo!yLOIwj^rY5@#<IlFtx46v2YXT|YO;aismG}!Je
z0=^AA+lmIiwM7$C@7I{$Mn*X@wh|rW5$<q?VwZCKvL|U9gM-6&$+=5c%#{K`;#3jT
ze`IUWy(^AogXSOR{EIJ0^ov(p{{VSxv1YE^zH)8l1vdCL$thShSDND5P#X=tHLIq*
z52RP2Pu46xbV8vm?l|+Sc=bU$5(PJ<2Tv1CY7?q7WHz^IFKcA76q0#7wIu`DULbO>
z(oUQm5{M29Xf^xFwtF1_oRz*R3PP5WSIWDMtGC&#jOD%4NC9^B_AHU<qWy3~esj(I
zghVATp_h2LTye!DIbLBQ391qaAoy#9^#qN078c?_@9lrPv0-}7`0b1b9Z$JY5JU*k
zmvKXsQq%W+<WpWv8I|U;)h|r)MaeN3R?-bszm035%H3H4QAVs5xa+wka(?Scr?}HY
zkaVI52o8N=RF{zRU%7pBARp}?^k|i7#YvPYv0AjqDQ&8V&5lQJ5I@(cm*Sgp6%!=+
z`=VM}NNqcXQ*O1>!X%W^v$Zf>bLQ-mS+}f@H-^>vHDJ(Fd8iDmqCAKqO+j?Izt`9G
zXhyOWJm5-efs|TqJ-L#(ETu~%r34QWY5f`vv=Uv^;~-G0#k$oK0h=|%k2A|51IO;_
z7_u@hr68-$)<A9qw8MD@kCL^2v}>!GGjXDfLn{K)ZHo@_ra19QHBU{&4zcTZWg?uM
zO{yk0<~#s#DXCW7Xh-yDbC%=agDDqKF?Gh9V3Brk4hg8OJ@nF(sLYo@t<9qEe|};`
z8D%O`h}+?%b#EAyqD!raNW9u+GjC5NDJn_;_JdE?qFFDD1VZU=3BdAuvyKi5NMqr0
zwek2)tjfqmI3?EXiph{$>|ZSyemgGFW86lC8z4%3P)XS4M{#yMxauLI09f4hIyU$e
zfFvg@A056~@9nX0B~Vlb{=j$Dc?j-9vL!<A_Cl)+0?ay)rF=Yk?rL_`xYi^<P%<DY
zT7Pn`hFn`=NeU_)l55wluN)u(QM8q4J>5_8w{I3uNS@+%9z8Wf_MpirNRo#3*FSzu
zjZ)>-g+;?!@6_p8h&P1BdZ{<ux^2eF)YaFNi3v!rf_YQ*Xu^;Ycj%oXK#_gN+i8^k
z8-N0@X4N{)w!jHwL85rZZMJMr3R!3mpH+F0*0dS`nUYSc_b(D($`tckuW?Uk16DR@
zrYEA;ala)=TaKrSLWo%X2UCqoDVqq$Voi>SpaPJg$LZBuV#SnQdCy_nVoo<%2uh=p
z5Oy0>{{XL2*i*WRhFjstn)D`6lH!M$gG&4K#<CRjM6Q+w8@8VzAUy3-vIk8w9toHw
zaSeF-+Hqhh1!W{2l`7KMk%}Z9kZuKDP@qV1p5tHiXm6s6DstT=%kD_RQ&1KtNdE4+
zA0$RPsym4RKPtmEMYYR3im8I3$LQ8&mjGBR^-@_oc6%9O*JGV+mYN}8iYvyWRBg9$
zaHksePgo`;Ym1349Fz)`8dP{xkLl8tl0=LEN?pUj?Xl#hR8)k=3GmvzbcOO{`#~rT
z>Htcukq_OaLH^F#wN^<3!8Ga)w@=2c@UH^s(EL|Y8yak!!#L=aX#k|ZR6V@1<Xy3q
zWRoGt#m1EDZpY-ZT~EdbmXLW=fKN`9uDee_b&GMcBLD`;7L&gM8;h{*{FS<F@}vk{
z5Y|04sfvc{ZV3oi1pt~6O}9zuucPCP4xp}*9Z1S4g45dE#`hsCTi`z-vMb3AET|5>
z5-Yd5x*hQm3f48mmkXi&HTL@>$C+|s?eg7vI*{)uh+3q!l<mz3MO?1kLQdWqz{;?h
zGU=!=6}z!kM}Pf5TXIVSI0e3B@obGrQjY|&M*uZP1*gnP$=y^!YIOMcdnLP?z{||@
z2G!0PK5Hia+o*&dh=heDYMCIp%_*%u2Airu{`R$MrOTCpc0*_qW!h!^<)TEwq(efI
z<4RXGB!l;Yc^#|N9bJV%mUQhdnC&-Fa<!sSc`iKG$y?5c92-#3lmkz3ItipYabZyB
z-^+;)F(E<Z6t?q)3l!o$8WI5T(PL0iHYbkHU!vXTD%|?K$-x1()D$@$L^ni|K%z%Y
z2FNz3wN293dNFV0vu>EX&n?DM>J+g=fU!cf5D4q>8t>z!Ow_C#l|V5I^_t|XIZD?R
zTa^HyO30~B<ER9RYS6I*X&No+#~g0rn`*}uot-?Ao*cFbK4!z~(~AmkEm(Hgck4B&
z2F$jW!W32(gtnEdkN_ZZQn@5k#Tpr~Iy6R$UKf&OQF0MK8DZF&9}+{59c`gQu_|da
z<ZJH(P`;Y7A-33w4)Ex5s2)h4b33t;-!hwAyvb@esE9;FK3h@)+*i#!xT#{k1cEh^
zdIdPx<}?P2lG-+;llZNEk)PyQ7#<(RU08h8-0_Q(5R?EgLf(9kgtC;1sVO!6qH0c?
zrB(2kT3uex>w*s;s!Jrv4F|vpTxQf9729rftqJj^2CYTW1b`ZGMlG^jxCP5`&nc$D
zQs076w#qf}p`g^{2@Z)}qOu}2?N=wJbVr|lZY``XQ*Ani{Nw^coF;%Ibtb28(X4Em
z-%cx_$Gpc=qUw(NX0w>aVD_TM^Kv1Si8rOP+-HHf6<6SWJe*GiQL+MpO)5oo<bJd2
zqGV&jK*lFlZazF$oAtc2lX)Y8rsUf%EXQ)3kkSfJ5}{6>I^pMZBC&)C3(7I+ZeJrT
ztdB6H0z3|?PT*3E6IJ5O?V-fLbzCGXs=Rj^2b@s^0*8EdEOw*8d0d}K_<j9!tGv2@
zC@mJ~OiPmdc|xx}Ku5bzJc4uzKey3k%eGNnwi!0c2iiQBPPFmSYRKA$JZDH5RtI#u
zUfa7ivRP0Fr?dW*)`$9tAgF%TmfN3i-+<$AcL?BCedLV{<Y?$88&q!7i^#Ou*nn!N
zvItU#vWB`5$lMWpouz(X+G=D(+g++7DQQ7T=s@eXny-Lpmd84wbK_gAS2VcT2?<Cb
z{{VMVB*{k26f0g)ChdK7^#1Jvh&~#O=@1T3Vo54bbF%sHv3T)fl3jfGbv4y&3OABU
zRu*0{tm*c9VLBT?szXQO`gcFmtJB6B1Q}0MbGOqUlZ6)&(fQfR@{0UucG8>$NcD{o
zEEXi3Uh?F56i`nsk4?pEsy544M-`{c3UpY|WqIjHenQo_8||>wIk_p#WiMP{i|y6e
z%%|Z}i6DElw-|>=R#BUGZ(A)#VYCl9TaizrN~=lLFo9Ftw8e*ZY75l)fQ2bQ`?OOh
zOKDa9d5>FeGn4$q0d0pkq#l(gZCH)6646I$Lb>*i!yhR(R}zvEKM5ZFYku&uh=@g7
z?R}=_YI5Z=i-r#x9)R_xs?Q*Tq#_o!F#9#W&ZgJ_3<`h;jdYGl+?&e<2f4<Cxbdyb
z?1t6NHTKq{PaEWTq$|~1cq=X2@YF6%Dy`FBpdDph5-oKuC_L<~lOfoA{{RU<)O-3@
zS1YZQcCS6Z!lYj(J9!82P*kM*#We}c#H4{`&Bbo)w$wsfab*O1#@aL`A`xK_SMDU@
zZI>k}wSNkg1fO6e5vW=nih+))pDAsN?VadoP(05tYtw4z(USzi3-bnUJ)Yo+%2iO1
z8a_IdJ|LV2L~qZ{wn=s>#aUXs){nNkYDN(xD3w`enJmcfw%P$GOoVf%u&aF%b;Xhd
zt1Ut|B+lD`fTu|Q&?%;}6nAK=JSQ7ztNP?hXUjt>;Mk$*(^}KX(M;46YvD1nX5*m$
z01s4<2e9idaU{C1EMUos;e2M>c2&IqB!<JAc<6Z5nW5P|QO0v77iEnmGQ}&wKzN>?
z(WA~gWXa-52wmFti=rJ$)D(v5MLaYU7epgO4(Ri9;<q`Wv|+#<IM6bljHSCFx0q$e
zH|0Q`y}dLQFhbLlc@8+1U8zz4O411%AE4JoqS;q1!-{alP@Vhqmg_$=+#cLWkgM7J
zRYW0|P`cEVr3y`Iev_|m^pDh0r5OM>B0n`^zlVZX^!w^&*@0&4V!gu0Qkkum()wOX
zn37Zt0SQ4ItKc`+sAN<!p}M)aJ`141&x{Ym7hw0B)?N*dc4^6dx`g~&{FYLN_&?<;
zJF7vXfH>G)0Tn*qZm{U-auaziY_6*rN8w*Rvb?h_$}i8p)b`afQF2|)_e)L%D2`=B
zG*quJnx6x%hB1j;#g-Kg(8cX?R~7`c!?$^f<ssC%nzp2kxRMYLLB5Y26)Evdu`z63
zIdx7vkLHWwutSIrIJ4lSaaA_2v+2}jVF|P-ZQ0vJpqAbEUT^UjEVQxHbIm+SJ9yTb
zh_I-V5OlZv_F0Q=Ql4dLtB*9>iAXB(30Ml{srkLAKsj9(>ATZ>i)<s8U06(5%y~*n
zPtm2i&myI-bI6T|ud=?%>pLerI15W36skMamvEun^SSpMctRHQ{Lqp26UAXEDF(X)
zq;0G8L7=PKH<A-^${}4?i0V%_Bc-;RTV{dPax3!`5-G}yp!zH0sYEEsVG&{`J8yVN
zn1vZhqWs0IEN~r0`*E*@H`L_nB0&(p_afeH4p{9awwMJbM1-lw7NY9tlmf6o9I3FN
z(yoUtp=M6hv0!uOuJ2EI=R|n?np5Ryj?&5rRSJ|smD9qYQ%03V0vRZc=RAvffhH_y
zk>*B90R?JPoHyF4eDP5Sa6mNFs*7lOqxr9@V(s5?(f<I4H^iYxRoOAtlt4>#QV@f;
z7R737;&vTK(;P1;_V6m?GYygi^3fpLdxI)-3T+0Df9)&fQW6O~Dt^PihO3H692S?I
z5PMTqlI<fgmm1HHG+$&8*h^ttLW$U#?YGycSpWh(Gi^^b+@6tfSiO|S8O`!AfqyNR
zEm2g$-11gy{7a#|!u${qPPDBl$aVg^M^1yw=R5;HwFf(>>9!}@nIF8&zfLzPzm0Ky
z-fB?^PSvMGg#N93>6@7>i;T&2fjK(Uofwg=kH}>lc!5#<t!0TB%&PN~1fhvsT)E`1
znph<Y;;x-2b#8S46+<$a`>yNmWDH4c{3%TqK7?vsNFgwpbd7pd(o?XcvXZ5#WjlR3
zssj{g%(^<_mkv}%PzjoT7c|U>BvA`yNLsl+2}FdsQSQ;jVbr&jHy@VF<;=G#ih4SV
zk_XfNtu*4vjf>To$jh=JYEb-DB}pWYx(50w9}0+?$<K>qmh8*>?2-vS6jt@n_Nm5U
zXuDV)k#J0e9#K$`;UlGJG;Qso8d1sONt*MHp#-p+qm?>pLc|G&E8Z!HqBCloYr(<9
z4{rLQnU+XoTI%LgrRM{-s~cu?=E9#T;=t?1zv|JkuQkLd`A$@8FK%r14&O-+fVtA$
zsRykI>8mr#GEx}e6jsj?-H%!$sc8s=$SXDJ&#2I6VVWR-1t>_((z()IR_?f>5PgHE
z>eGsyLUK<yL*F|Ux7KLWO&6E+kx`+_r2b}!hZD2KZY$SG6c4(-Ee~-ceNwRQ&?p&z
zh}&=Rpk)#k>W9lkXl#A7u82m^qzbR{49!nukKXxwCatyyzin8m8aitW1RC_YcV;8J
z(yH=a3Q+c^bE`D4CD6!z3Lar^mW#YMVvb?sLI;I(V>p!p8F-k@&eMckEGZ<<OWtBf
zi3ddnC6I_H6EW{ENM<ykLn_>luS{Yc5ITi>woJD+xg{sbZDWFmjSi=`MDCoUWlqh-
z7>L)xu$l^e6wqf#CDRhhzQ}Hq?XqMz@>B|k!Ss`>HC7Z1%PXI?S4j{th>^ldUwy7r
zJ~abWZ->N&W?56c%)DGqYMXjePnP*os6C{Ar&sB(MJUXo)>KPn*I>I}G1pMyPxeOV
zLYzY>f?X1gbGbS531AZxa!6mkoizIcGLR)h$8Oh|vYNFr73P)iU+kSI#01eLI$iQ7
zFSlrR;wYvY2~j;tld6-J(xei$S!Q9U6t~B~wWQbkRRctf%))0)1>$dF#l1ul57JN+
zKUSBK$qjqF+hfUGm!PAFMHC1c%&ZlnLxdPaxVf02F4agZf}f;+^y@|>NHV5FEg6;T
z$-2h6s3{@jDmu2<Ejo@AT0|8a3xJ`-$ro?MklX5`zG2w=&%a9ey!1qj_Nf-^lp_+I
zF~xo_nZz3O2U7AF1o4}%ao?2HhBSATPnlntTK>&zp-QzQW{A9Nhn>OH3dd%Y_Ec@E
z-dmL3Vv92D-NNjdl>|9Ntaw+hh-%SJHnK4W^3;5t7Rdx~Pzp*<jW^p+ln6!_1y6e6
z?KU4Z=6jW5i6xur*3?&~Fx-SzhMWtJ1U8XPfJrCVJV&y9GwOK;!%U{|0l@fwEq>&B
z@70nfQkafltlJ>n(;<KaZVNz4`EdY*x~Cj*O5duIC^}T@*G!3*1*;M^rMz>uR;D4o
z)UoGIQbH8lrEA=LM2;#z@jH=UVD=R8RpgpGPub~R$jF)P+;uKo_ZEp$9oa0!WlsW?
zDMdW0cIbajfsv3ZiILF`x(%{n#aVsK?$@G^Pxpb_96HG-xgF_@g(^*}8bDJKA8B4w
zh<-s|l;0JQ7sM@TCW-)%4>vs9ZZ0&BX<c1CGano^u4Z`-DI$MrJx6+#z|VI(ZP^=D
z&k9*v3tfXYgu8<dG(lS~H99n8CB)ZsDPaA&jC#asmf1^Q@UyJNg@MEfAMpqG5U9L2
zxo-Bexb9(jb~7r&lf_eR%dutg3@OdFwfSj~l@e0(WQuca@%nn}S{X6AFA}JnaUEj)
z;OIy3T?^eGRG1HKdv7xC`q1s><jU>nW-`T67J!hD94a&k-0YE0sA;Ifos-oP%$UMD
zE)c(WGHz{@IgmWEreAQZHr+V3-y*IcBmuCX*GMbc8DJY+y4!BdE-^ADA;}79mfdZX
za{a0vAkb|<k*3;_n=2!_H}<XglzfiP$t<moF3N0Frl|x3kLwB&N$Fp)LMk>*n5te*
zeK!0XU9_pkkUYlSXd3(@;#j469}%Nhp;hN6M=iN!#x=p27bwVD5E7RNbxj7=M->GY
zwn?VLmijubN`HZu+}pOvirO1xVJbk0D5>N+()>e<Af)>b9Sp!CM#6;Qlh<#$B13#u
z>q-h!L41RVCZ(k-p9LjDZYH|1T-!p43rH@n%n!F+i<t$h^c6bfxr99AH;`UiZY=RB
zP)!j*O@I_0%~7{_CAcj}<-|8?xqDlT<8}*!SC}@$qR|YbHWtHmQ-sv{oQ-H{;F^1D
zt|Qc*q_3vHxp|SGM87<Ut5*L2+&Ot!O#70MmSd?cG}~Yx0b0}Hpg(55dh1<U?CU|W
zllQ78B$QU`a!x&Nk3O`KB8vq00G(r3qlF0C=pIRwD&dZ$wXUwnUqR!z8n0fHDl(Sj
zXSY_kB5E9QAT73%qOW1=qe?{}LYds@5#72l(+V6OPsFcghmUa}r}$Y3Y1?JJF=HBe
zs9jT9R+ZE0L#4b06C#%p5M8*(SmwgH_4geZ2MMDfhrphRjhli91U9Eh`oGnp3dkx(
z&Pqpa*^ZmQx>J*HrNXa%p2Rr^Oc)iBZ(d|%@qQK<cjM#ip#*-NPjC@rH$c0UEr&8`
zGokE-D5XE`b<mM(9jUhxVkC@E`RS|9pf(hLta@k?I-~6c56J9xyF^u3-bzfDP!vwv
z8fp=dLoq=Y9f+1lY@q%+9`e?G)$6A6+__c=03$!mS($5o-(EsGfF9vNqX;0906^#5
z=1Y#!Tc~BHIC1ux?f#t@R>4PesJ+O$EihWNw5kSB7T_I9h|`#ex)_s{RzSSTx#Yjf
z;|i=0kEosXez<%Ng+3);IQ#6|F$Kp!qwlQ@1%G4#T~x@@Dm+mu)<D&oFj|%PO(LlS
z`owCrbZGskMrG1dxo@8V*-CKy+sY+CAKBDrTgjD(%S4|mB2@d!FquDxTC3<A>sl1F
zP~|r$?XvUatK|U(Qk7BeO*LNXm^xM1nJxDSFI?dXG*<jgd<g#lUaIUQB5zU~L?zxI
zxIW(|0;p0)S_+LRIAp}=qGf{C${}9ifyL#NDLn|L+9Q`lj|4vY?WW}wt2A&A8oc6&
z@FKsjM;9<r5kj$q!*U~*w+I9|_-ZGh2D&ep+NRsd6UuCsTcfcUb*ji85~wz!e1Arx
zE4viDu#3UTEsV<yv_f2l&`Uu+C#I{3lO&~9h<vP4&v%^WK{Wt85=bY+kzE>D1|<x|
zmW*~3E4{)~@xVVL9aX2deL0?qNpDS^h}H&UqKR?$g;n&O3(Pu{qB~S(;>NIMO(h#F
zC^o87s<zZb%!8!MFHc9dXC^vL17n(xyo%}MbVzVoa>ciHx!a+1YD1_}zv}~{)h(%n
z9Un_9f1Fo$ukik2Ew$VJ?L$QKd8qB=iQ8IkMY2O|k@E;uC~3WXHI7Qs+PvA}M=~W{
zB~U)V4ew2lvr>%6)edn5FZTi@2d)1ACqY!X=Op-rA7-aq$djZf1SBl3EAJtwk#|~;
zIu8Ih)#@htm0tSR%vQ@b_l(>viX|#53Q6~;{{W*_<slQQjANo{O|kiji)dEQvdvTU
z(wYU*163A8F}qBbimcZJ5M8QH-ueTeM1iW1tf2SnB>YzD(-IPVg{+jQ`#OyhG7>6A
z3>04FWGrHL+df|{(9NrWFE~l36oFlUB${{uU1(!q%OXNBiIj<82Q&E~5_kn!_cu4b
zcbfcf?6&JTY$YG%Q5`8k3R(hG^MOZ*Ta=(5cn!Ywb??5I^wc^<EOoM9G5m*e*~G`%
z9PwUlous?UwnT|GFbbHpDO7j|O4KRIz$g+EP)|*@(n`)HX+{Kq7VGz5a?E|`_IQ<C
zM@Vs}+j1+czM9Y)p=W=meL@*Akaa2JkeEBNjGNOpq>QEfSu$gHdo6j3Bq`K!hvUWx
zLQ0yG$B-!wEkS5M2>^;ySef_vk^_^izLSr)bhsFY{J%F``IblTpQmePE8BlX)`pjE
zzCdnvXWWTV;>!MMHOB{=9r;rEw-PHH5>n79*w^AwQk78MSqFD6O1@2bHOvY|hf^;1
z=iEOv_CxZy^l9CW$>9CMzW3JD)s4)CTo~5-6H8&%!L~5tZ_i1Nw_D>O$7q5SNlF3e
zMzb^eeEgmB(1W6(o7H1w(G`1FC4P22hQP9Z)!i>CVW#seX}K5s9Q1%5W!P;hLyUza
zinjA<C{j<tNeUvV6kQ<6mG3Za1onmT`@ET*-{c#!0^{*nSyPXw5~Wm8Ufw&CQRCyj
zy&I>8i>_}w;UomDg=A5Zq_F4!(~Wlr;@I@|jc83~S0J0B$&GbK&dPU$prn*kjzWTi
z$NHnkLkO}e-0Y8VvFY|Zo&%5%n-iGgu1HIq5*y-@lhq|5HK^a|(CmSC3Ib1}p)Ydc
z!@Jz!_VV2Q*3AtLIp@c1L_|x999>hN4-}Q22D?;|TGVQ($=XrBWK3O6k=$8W-<5T}
z+oZv5#t<%z&S}*|<gu|+sRgPkfk{w4KHXW4Xy8>dk0Hr1TD!Fp{U$71B&K;RB@eXX
zT`EZ_ttfeXDo*2KE7RR-yF~aQ$_6J?>kjK;wub`SZQGJkpPEBJ7Q;>sM5HN5CZ54U
zJ)Ja0NJ(5ijunpQcSrD>dylayI*hQ(k14XGtW<!y{6lJwudcGaL)1TIg*$+A7VhFv
z>KmlGjdp3Ut?RSJ92-aq@YoM{*UEiUtXZFQt+4Y}EU1!;+VOO%-*1P=l|Jv7vV1_^
zy2p*1q^j&HUwH0oMXEBRpTcQAT4~at0jCjrJW~OpRkX`-`)pay5?V_5pm=f}bqQA1
z6#M{IUNHOZSYErwO+u)Gq3qZlLT$7s+DadPc{f=|T2=73@Aqn~AV5zrKtXSjZcCP%
zl7RuVf{;2>{)bltfC+>N2xdTERe{DqAxlYdM}K~eSp`T#L=yzO%8_T44fPbfhKgG!
zp$Bj2)$tI7Q#LPjHj6TOs*+ox5<SMEx~Y*+WX_-PyP{&?Gf=_)HOD;D?I4X-m~aS6
zCsdBg6_Mp%$=)ZL`7H<9M*5V4YOF><F*B37VaAmYkPBtdqyEaN{TdW2+^6Pff#&&7
zop4pt%&1#oVyE4r%AL9>iyW<1OWQY$dO=wLf|aFy#R4=))SgxqmTQ-nd3GbK;?%?>
zBB%C%uAgWn22xTcNMVZ%si;2`b%L-w2=V<Ilw+$X39?qsZVwr1kd<-{wwDI|MKm%r
zJ;_E)lJR$%iIkh7Nb^=g0RGWCYV9N70Vx+M<F#HNTyqrv0N5lcBEPn2T~*4C-~wpL
z3C{AD<V_guIKI<i(tK4>QKFq0Hq`~&Ly=jE5(y77ryM>5QG^EPMV5h*eVx@cb#mzV
zA+@+!ZoMd-wWS%v9lX#8(5)8Ss%rB>9r#*tN}%>7BW*0Y+9*_oVdL|ehYB73a4Jfl
zT2u7Y>Wpe&$b^?o`1%>R*d$$^ASF+l51?)OwOZI}rurm4;9j19`XYbXB&o!YWloq!
zk~L)tv0UU!m(6M^^L_-6Xr_x~7$yaHcH#VrTdWgD0;@uI-%*e(q;ys<k|!|=?9S;C
z>Z*A170}{ToRp;NOa5c$w0<=!jXtxdjCFM<MzYJng9<z}8aNZhKpoE1(B%T?a?qh2
zrMrB*`{QmZzF-LepLKk7a@zg`5_Lpxw}hrUEQQf+s5wgXAnLOaixPueZ|ie0jQY(&
z)*bf!-S^S!uSFB6LvHu?uDJ!y?pOP@g#BD;r<6Vvi43$}^Dz!Zsl_aLiC8tSfI2Ny
zx??RC^!Gf~XUr7&<T+aY*9B>LTBy2vwqF+*M~IbvB&U*3UV~Y(rIAJIH2kE;n=O#4
z7i3bK`$mf#WX9ANHNUA$q0+6^=MlN^8kdsVDfzlBc9z(cXm0*!RDiMZbRcO;J9O<$
z8NU>Nw(i^BvCW!<fZL|D_8z(w@*tyD$moj@-6PxrfMg^j`{*<yX*^SiB9moA`R3hd
z3ZXSg8m%jt8e9;*@+vf&MZQW^{7(Yol-i$J)yz_4bm#Wr#Gz=*ns1%hm){JPj@{xV
zrQ`O8RKu4gEGd_tuN9P%0a6<q0Fk-gw5Gm_^hc&f1wXjBA2M74;s@Wy$B;`FktsU4
z*v0U^+1Oca5|=9O34L5+spGO}Qi{~_si)l(27nJ9rc*LKfp5YBAuhSxxmeuSu5%IQ
zOj+|=VlqnjrAY*HuN5TjDgg)Gr634oXu7z)J$E~^z1hCRYr8)b#z&Ic97C?B`pM+7
z+LQ`uU54J>XXMu^hr+H_M3esjsw`Ut%OKfa?F`6QJg*#`9`^<`w?bekaNk74GUC1=
z!NoV_xI!z%M`KEB4){)RBVH?C0#(AoCR#Fy2fIx^_Vy?5PY`_%cHT-mi*W5Vs?(j9
zT9{sWapkiXUe0oi%da~fl_g)a$`UKRbPRdhQF%m2j?l3)v23y98yYI*?r*NleHKTP
zWnt$B4>GZvQ}sa=1QvM$Deuwm%AQC0g@=dP)hup{D9CLNd`ITKXMSPX-*Y?C#N1K@
zV*=B2ZP>CVyz5JF$8-kWLk%*e9%^kxJeR;GyoV#UuHfzdS1SGeI&_z`f!qiu?r^v-
zx&EIcFqheCt~$cVLYyHjta2(*BVqo(4R+Xb*co%T)wsVk&6&-yIPOTeP>JMdw$Oo6
z0ap+<=}lYS>oQcBluFNWb=08_l_&0mkdik(1o-sS9Vr3=e#R{?D%AX_O9?U%P~ilj
zK&1-XV12cy(F`6X1_h)RuS|@3tYZPpBv~U{2dBFPt6j%9jd6O@9#hQTR^&L(FdbTF
zN=qe<1ToAr$Q1<hB;d)TuX@*~BHjB(%6{Be(9cR9iEnrR07Ukj`@2?ul>Y!Qy*fpn
zJk~t5y=GGQFtxVm1fj(RsTCWbgV5_H{K6&xR*XS*Tv6+5(i}fd*)%TX;0pOHG1<&T
zkre=jEpp^J<udzxX~rv#5ZkR*fl5k~zS`Huw6Ks=WYhQ$u?TkDtY$cydOs;}lG}fP
zg_W$Lm8)wz8gKBfwHpInZ`U(0vTcUapM4_bf90O~LY+P;oPxvAjI|Z>QwV)kQ7Jr6
z!jPhPlc04>LzRVfLyV*NYxyZvHY>fZca*Urb5tBD<?pcqr(YW6)i@IghL9!n)xr0x
z(y>i)^A(t|R?6tKG)N=gwyVMf6gZGdACO#QUNJ_N`l_bgC_eg~9f*)UiV+Aa5q?h{
zLrm@jfTR!aD}7jx#9cwyD=OVRxHweE2|RgFroCzfPN~YS2}Wr&U)^fhB>+^Su$`;8
zCYmSh^iL_cO|m7&m2F~5s9FsKtb6HAQjj3Bgl5TWG=)oRt;HkaY_I7}H>Rv(=^}_M
zaFy|BtSZC7XN#-l!G6=$n$i;04MmfYtw><A_u5~Q@_n@0x@nJuph{hd&IVXuL5nf9
ze-Bg5BcUG6Q+HsNpp@Gd-DZc8LChGSgzF1+KzJ+ugGQ7I440Uzyr%e7ben5gp)Pri
z@6{?b)7MVYnl?FP7X0*w+WubACFCS2HSq*!_CuPGcUrN##H)5SbBdr#$sDP@N54n_
zN+gOe3Tkf2w#kUE$4Udr_l|^UMk7#=)eyO^OlX%IYKihE(M_wa=lyz|2y`jLx`CEr
z*JyZ@OOk;uHhhwNc%GUZnbhMHnUUi+3p86*_Bbg_hk{f+r;sC8DcVAe!A(abyIZd8
ztAY7fC{@<A08|}AXp)Ewh&<TJ^Vcq{kA(<A3Vb%zY?HJEXoT4!H_hAKgxCgYqYWf@
za!oeX3v6PMcT1TcZ{LB41_DRVu<#0?@lv!rY?CaX5T-}Mk!9kOo6Fvmgb@{#p|D5w
zh^f~_ZM)zC2#YHc>RYyA5E*;{9hG^C{_z^CDRK$IW9_oz&a%UR^Oa(A>!=l|-)&Zx
z6()3_-peVr%0i!_e-Ux3@9;WmoXI$n1B>|~Y|3zoFiH>8U0a-AMB9?af08Hs&Kzvf
zwSWyh+IZ5zG^Q29+ndrZ7&Bxlszn>AJ{u1mR)t!W=1E&MxeEqY6^>tm^%g0$O-765
zXi|*S$f$EFxFTXcCK_Lsev&rps9hbgQzvmrOkbqqIsA)JJVUA+lhan=@m8x$u~Tlh
z=Wa7)MvSV+Lc&w@S3#9YM%4o}yFX&M#C-kqqJ;0%==4_U=VL7mTvr<rdUL<xCM>KU
z8Vyd!a#4+ny2x@{gU`p@klK#^%AHxqtR*?A4c?tLSDfU0(KVFQdhW}L{*6D9H+vBL
z#cNu#MXNZ2YjJ<O<ah8RR3$_5Li1Ki$dM~9L}t~^E0R@F{gJ+`{@9`kpk2<)5XH^7
zO{?K=nvc`dP>lqsO3f6D4p`^@5IZ3X<sd0VAb0{!hh;w-BEo+PIofNy(T^fitNbMu
z2NCS1sO8nFJu^<%3ybjV=zEnJT6v)FQ$xS%)^tL$>&2rWa^$qFv-pK0icgI?=r+e|
zsPEhrP5F>|iH+JG&&IaEbB0%tpOA{7TC*J>srN-cXo@91^Ir{mN7Elqj-j0!XRUSo
zUL<fH_9wxRH<e9#5xdC0hprNWoVq-w(QURsNTOQ=g(*}g-R(bV*U?=@TR;H-l0a?0
zZS=_Ls_P8-`+g^gs^-juxskYr+mhm(NpvKvq&AW{EU0{2R1apyT>Vm%rpJQZkP(iG
zqPe?pxkTob`Axb~5`yxU;VRfEW`Q7)?$zWcEQ;cH%icQ<MS-`T;3(N^%yf#-CZ!<L
zYJaOkvI0s_n=1nu%I=b^N=%2!PyzA<5*5WKdIePjbL}4OS2eL@=TM{EGi%)W0u+BY
z<#{Qw$x3tLN#uOAsO~`6k@|E&Pzt=HSBYKO&hg7yXZ|`;=irqPDjWEdP?QiU#;1Ry
z-KZRR%`mc2Rn~Lr1WCI2_jImG2%#<&kG!>3r=aKw+g2&V0BDCSlISe%)LT23Yd05K
zQZ3RNN~5^Xm>W+ml4@(ppdH8?`}R6@T^R8}H5uv`CwK4CZdYKwIefA*^vfgf5$19H
zMJ*)k-Dqfd?0hw3+9a#b9F0;1v$nZixy47i!g-{ud8ta0IFLxE0tx%1anf+BSy5$V
zSTQMh&M;iLvbN*BxbpxD3nGAkqtc&UHEy8mKEMLCeHeGEwLYJ-l;;_zY%y%{<jF&*
zZ!5Nmt7XQA@1yciN?Zg3RkrBbp&-=jA3qMmE!C}@3uv|i784nEkIXL7?uX{fZuJSy
zeaR*y;sbvuXai!D2|!PP>9`ul9WK&dK)>6uPS{4U)ygvP<L)bvJ$d&k$(!~r^@+|Y
z{%w0P;M?On`^CIvwCGw>){O+03FrcKpei-Ro4HiQgr{gNpwz0vyVEhdy^|cfNREY;
zZOz1%%8>FFx0pwi3f!PgDoGXk>#^4UHDm>slOSYUwJLVAAY#XQkrjdE+~fj62{rQ4
z!A~SOl@JwDdX9vTqeB)=E(#G{zuK<i&+bQT+`LKTZ&v2njdO8krD-WXQ^bn>@SV@M
z>DPe$Q1pzka*l0!*J*RzE(h37z9meZ5sOY%%7ZF>&%+I=Dc{|%DHQ9$L`_9!Ds_01
zwLgYrQM2?NPE@jSG{=l&aHYhEA5h|52p;wLY9^uviT5X5hTw?PQ)1jarunTStyDEy
z(X=OvAotkO?D&HyT1auiRFZno>OyV;Fo;Dl>48|ocGm?%i%CN3xE?wb;mr=p+^F|S
zKQ|6dtPV>;6w(|X+8qX=s45_8l<hY4+wAgVOI0Kx#I88^E5lkdkOM_J;^k;KgY3_0
z;4AXdYPEylpfuuOgek+~bkmGlK7B3YvQtNrwK|@g(DeH?pL0aImelU6dk`!vS>7Q}
zaas{y*$N-&(PMaYGh67ZERqvq=>}8D{8YK}&Yx%spwXvrJQQIBYU_ov?o!N{d&fRn
z7CpobMmM-1qU=O6j^0IyadK_F1IjJ@w1kfuj#d3Ss~d<!loIWR&mI#+q#h4O`@Zy^
zqfa{tDdPlw#Q}LGo>Ct`^R2}^mF*R-nsyPYmcWnX&PJVTRe=c#^4LSQ_ko}ZmQEwd
zFEMF{l-ilHxPitxgRNJnQg_j-w1}a|CG60qJft<oj*vk9@ESfW%4q;r?%Z6ORJY|U
zfkcEW>C@zbLn&yTaQ9<Mzc(et4Une=PwghO)@89SnCe!@S4g+1FU5S04oIyJ_o@9F
zoi%Nf^H7=5L&>bRrapcI0v9*U3#g{l1nW`~B(i`hAGo*WHGwU*ekmbb6bFS3H5!Y|
zq*NRSKX%uCvcW@@Wu;X^!ly<xZYgeLSJcJ*%a$C)?l`0D$_jR#%Jn}{)Ul~)k=m;H
zufbOxzR4WB+~h$*s@jN9-^7hvom(UmiyS1Z`u6)5mlE&q8CsA@_Z?dl{5~ooZmoXN
zWy(FhVoOV@G7^(R;C{VO6)`F0GLH9N();PQ-N34waBe@T*G&QOF-j6Fnf*K_HSZs}
zw<3k)%ltFrx3fdft87)eONCH(t^~^;bmU)L1V=BWhQRS5BDy{x1`XVWU~=nMZsf_A
zmL^2xks0R{O?*HbYBmtenlMaV!nU(<WrtQOk3Y%e2Z7r{szxOeP;j7Raa$H>_LOyu
z3O<oa>E%6CJiZAdJhex*V`!Mde-+0Pm8<%{6#&(oIs8eij);nI)F%gB&?oq{6iOre
zttlh)D^mT($M-0CT+=DRF1GB}Rq4vAIBCU3Q1K?U`!xP&Ay=Iw0-|=~7`x2PV@H=>
zXy*Egy3mp<t1`YIB1WRhE^FJ1jn?Bn{MRE9mwsId1FtTpKp8QLB&c;K7r^fpTp9T4
z1xPC>Bk4M=W=u?-6Ure<!s1<R*F@P|s#2l~hV<NOt;8Ks;T3LY78z*8VcXbG<2Hb`
zuYHoQZn25@&tjZO0H78)kHE+y$3Q+?C@NX@)M_$2oG6!ob@QY1S?`pd<@%3n1Gl=`
z?D(n#Fxx5PNh|zEyvG)PB?_b(029)csn^qgOnNB9>F~9V`!(aq`F0IGssmMS`W0g7
zf%g5Zo=-H&nBh}CV4-ca0G+|{Q6)mV?XI_|{BmW{^wF{|d8_xfcS~jEPvjXIiD9)m
z+i7srm4x|e+kL=QO@58FnQ1X#7L`O0<rcBu@VR#|!cyNBR^#q0(4hsdys(i_C{Krv
zyy|8WZYhP4bsr(kF$F??U9GPz3kAfJK;nwk#Q{Yp;ooykzo$wS$=NAf6nU9_t^@>4
zF07ZDLL248QN>Xsk1vE$gcC!*+ou(m;D;+f2z(5-L}+H^a*z_*Duxukp*1F<AnoxA
z@79_jtP~SrQD$eYT_d**o-9RLQ&qUFi)|8Cc!RL;6dvBXLZA~H-Bum?zuO;5)otLJ
zKv8Ze8hkxcIQsxQ_?=mzJ*X3tm1+K8x3~`D6B)TM{F}RNzKDo?yc%f<=Cu#RB?gNm
z005z-LDdeVBo2#Pr)@tny)5>=#%Jxli)2Yvj`qbAm~)g8RHUPanvjYG4~Wv0BD>J*
z7x&lKEkg8ax+hM)fMG4in{f)I?~kVp3lg>b&7$WWR`jr_=?F?3DME-+i3<fnr8W9a
zwefnKkIWVZPo*ia{1YQZ#r^!x{%&I3Qqp2XO5>qzDLzZCwo(C2I+8aht$w|AxYmOg
z3(7O7Fqw%i#VX)fPIZvl8J_E^jLAV-d=hzlK_;}^`#stm>~fyENsFMFZI>vt+ydmf
zrOH@QQ+tvr@l*Bq=&?hv5Qnqey!y!B$RSQkwg69(LY+-1xG7L0L~wp!=|=fSfkx%$
z*UZg^t@2QY6jB>;E}?CLKIz;LM#7yaeVVmgB1VM{M{<{fTHD93%u2id8(fN#rV`N!
zsXGS{6HrA(chLo86u>Uz^!1H1o#RToU{@r@$;5BvlWpyg49JQDl6cigSHvsDUNk!$
zSLzth%%XJJ!a=^?1z3e*L6ltI2hFf4Pg}1na3}yY>H?CL^6Buabe*>z-kSN7)Lx&L
zOUM;S4$wyesM%SJknFMfR!a@0+}GSy9e><O@zyVr2~ZB0u)BPwtq_!wRQb6x#D8F_
zx>KYGl%pkNe;Il2(2A9R2-9u0uz$7JSXohMBMCZj?p7Yv%JVMC1QQ0>&!4}xm7)6e
zMyW7HjFO9gI}09;=Hfv-(m%7J&TNY#qMu@HA`<60@i;=(YyE0;)l)Z6WEyRXe2*r3
zr|@2JI{{6Cv~MsnBQiITHl*XCGaw1Ayq+L+2|FD^Gf|95QEt)hc*NMZRx9R|2NZlc
z9W;jJA{NW8TP{zPE#-6ssCx-D(A$!66dLbvYJ9k8BjQ|!+$4L5I-CjIf}5@vW)R~K
zH9+HvO+fbq=;j>JBf&OIZ7#rZZgrC1nknE=ntw*B$ZDjkxNub>ZNaww`dbd9kEc&0
z@+=c}0|gOcU05kR<}`-|eaX_B5|c8Hwj5h7OCNbn1e4=HX{bmrQ5;rw{@T=s(Iq2v
z`O2a3BD-kSGwPK7REM6TZOhGiDr)mjo&b9SsC8<Vg07?X_Qi5kdy3S898!G5j|z=i
zEJ93F{8ihE(IQb%NQttK)4r(P03;Oa4(c_Y@h!ZFc_yqC`HCmN=?I5(@{WnR3lGZ4
zq@W$0WlKpuDyF4Xnx^uKhdTs=BF`O}f{A%fsbuseH9D!d#zcf)EHXoXw^MEFa`@d+
z%y|e~WLBJOtr~JQ1qyXKv-1wzMal3N(gj<3KQ#N+Q>7fAh#ta$8a9%tF5Gs;?Ps_q
z-~kPnLu#+J3Z*{HTe~nx3{b%(cfS#t4<wq<O&nU3@<6YR4z)3E5`t2xZ}io5l_MUP
zW{`du&X)i`+0*5~4N$f+w=(><&h3c0(yzznY2!+eHA>3b$b{AKB^>nMbB}GZyEWGW
zT5$@P;z8)6QU;@+9oj2YmI+V1a^U5Y;rUc4T&_l*KM~(mDv^mOjK6O1B1FpV7VC0C
zW2KcXTzp6ylcg6g;*cqd!;U8*w!LeT4<^WcC;Meve!ULj$3);dSkI$1Xqr-`d`+J%
zUuKj6DHH;IjhvFwxG7Ll7UN1ndhf_;aha}8pKj#vY>>sYS$K~uv_*b|f!FKMJj2Jm
zL6dEcEvik`_;N^DZJIY)P^f|x`n1xtja7|-mfUL>x3_See`z5qLXi!xpq<a#q1}*K
zN~-izvO5*N$jplp5DSEdomSPU16Ay{MNYVCw4)w|-YmJxNahmbiEqHuq0>dmmeA+~
z3j}G5MZN+9saKfk@jOn$Rsnqy00m`9Ll-5r5zrOMgqJD36H3!nr&|;<$u1N?7jwHL
ze}<?{YCuTZr-&y{U2h@cn$YoI8@tmj`~Lu`jHe-nw5^m}-b*j33QAH##;OTBjwfMX
zr>^??{{Yjpd3`>ZxAG6cR;)1#r~5aV{{WZp7!A1Sc(Rl7%<L0Fc{t+gYwZ63q15k&
z=`M>N&9O!gc4R4u4K%Wb9`jvo0aQ>)M<PeF$K9qBx?X8SEt!1RkkfDhNGz7tQcvF`
zl&5XgxaGOhF-^Fy*?q}}W^sm86nvr!X;Bnf_;D_-y+|7mqfRL$F|~>suIZ-zd}dY2
z#TFv3%uIFxQoaI0RI;Lkfm2?i*|w(|j6xi(b?W=vXsk$Wq^0+zI!REDq@<^j;*<&{
z!BRX1`cb7ctYtdP^Z8u$S*63dL!IT1DmomC=9DB<5Q%0vG*0A`Pac{anmotf{iy;<
z8=hEuRT4iN?sVK2!b?binBUCgDSQHWg<9NokgxAJo&0q5+cUy0J;U$U?ohA+#zXD)
z?N<+@%lB`@25}5GA-r5?mdol#@&vYs?Kbz4mlTv-90*BY?JKW|)oh5^3(6zk{fhoI
zk=vnk;on#|4Cvv9rJI$xf}bI3NslZcv&m|0=+2X0F<*YW_!@1djYi0{;y&KQdh+a|
zd!Zr<PF5j|T%aZ_Te8%_NL-nBYqMbyn^Mw(qGv6(f2~8vnho_lY)HmV-`c02*D@@I
z*-KAyp*y+QKGxjw`)z{jp0_^Z8P~pM4mE3$a+Z*V2^;zD#$kU7xRQqmsMgW4O{81I
zu1x$z$xm3S{W3?jwE)b>-*z(A9$MquqBw<a&&0`F;8dDZ%<<JSEPhJxmWU2Xnf6{a
z(Ek9G>}YmiD~`DrXb!z46eLxr6LA~~6x<HFu?WwZ`~Lv3SCMr~Wr&A#yPq~EnBr7g
zc)Rl|=mL_V=0546N%rc{Rb;nB#w|gx8-&A7ajM%%k_t%ux_Oi#Nj@GrBxXX2_cjxW
zaWPn0P>@0&LW-O~Q38rdRelvGf45hwx%i|C=s!rAP169%;N7iU8MuU@xeS^(+JeaP
zoKGML-l;XO*Q0F&BUdKXcJ0-;o#ufK9qKDj$aySEi2lLkqz+D{B_I_favLjp3eat@
zH~N{<jz$Q!Fx@)O9&ARwI*tg}w8E^i9?G<DGwioC{u2R8ZoV8kYv%~&vnqxxzcFkh
z<?=XDng0L;lnF^5#kcL%pWcrwzZC;mb+r;qUhbQug!yl+)<TL+0)kBe)f=WI7Dz#r
zg(mz-$!;=59+IHK3F<*k+N&zSVwwb`3+7oB*s)`wJWEOPID1WW)>h%sw<)up7VKRT
z5KSF?0Z;0Ys`W*}VI<luk=KVqbt11J#8QH_B<?j<CG6U*o(KiXQ)2G6!g@LatJ8g2
z+oEU|QoEln8+O-F%{;|<NN&CW4gUa6kYJ)^#U;3h*KBFkf>N$QUr{vFG<4CDg=RwM
zN;BFeOfyuJ{{U4(V02O%NubQP-11`0)(n1ob8RPmx21J-LBbi66=6ioqPV-DaaA!8
zgt7@f&FQLkR>c%dG9TNi@op04OIfN`)kyYJK(H23GSNOi9lKMo(v;9S8D&)Q+M_~_
zr4lj>mSS8QEh&|4<|L+`!Oum!GG}17;j@{6baFY_wp>>J9}ua~`wEOpf`?hH5pOv>
z*oghtH9RZOZ(UAvDdGbs8$K~=uwUWDc_ZarSC;h$ip59i(JQ!^sQ}?3-C?tjWEnm_
zr13n;8n3)^AEQP(h?F|`ke0BE1nZkuP*eD<HkTVG>96!^QehY5kOe%Jzn8>|J$pzk
zq*v(_I-^9lOrsqF{h2gfEYYpZr})O!w*c`eI~^QB%#<fG$_k%pc-*@po2tsHDnDf>
zQ8C(<=K(e1_ehd$v8>JtG?V41f3sag#D^*tN%$e~aR%A`V;L>{QIE{9k=B)|(^&31
z(6?yHlJB*MzucIL^3Te;&>QqM2V0o4+XhTaqz=$pmyh0Z2&)uIe8&^?6J2Xei7{2k
zB%|{#zJ4w&FDu|%N^wc{?_CBk-D9fqJ6Eh@H**#3)2=OCUzookt^WXLaiwH8OrnXf
zK_O)dUCJ8|s;WzzhWf1<QuB)|DXTT&WyUS}*2*CvgGH;QI{yGhlxqPh?R4SW>Fu`6
ziEAGSPnu7*hKbcV)aa41RNdp9b8_mi5JQhVNEAIOqR|xzOzNWIV&KCtR=W9ZC_eps
z0an@_(R6C2O14XIm3IUG0B1~cqG|nL6hHd9t+(RZrurb?&mC^&<I&Allf^uIYIHkB
zihGl$B|S2dY|qsyaHaPYJUE_OuUucn98E&W^9JwP9M>bNo_FB4{{X8W)1vurqHi^n
z>`H2KYy50QE2>ou!m(f4H1N{fwkk5U0gZKOyW6<K8>N>#kO%dFr|Z+eXz91=oGw>{
z<8g~FI1IHQrN!4^Na?6#zJWYWg>YxCFU$`6jkR^`Z)m2f9G8@)uUCj}B)d+9mX-nI
z?<rM$HSZpV^c7Hu$;kpmz8IbZyua{Jm4vQj?2aDxYc)Pi6t%2;3k6GAC$Aq9?K<_#
zq#+)_iH~0SE4~~9kKCMT#t+N1kc9^Y6SZ~#kUTfmU6S0jz+|0&$|76ucMp?zyoJ>v
zWb&z1Q^h{O0sf5^AhH>l1u)~C!I>O+mZy0zTv=sKaj0&IM->5Ih?>{k_G$dEQu8|z
zD9|qVyN~h5%#^Q<k~byAD1vxUlSI@2buGdw0pzt!#a^_uo0D=Q#Au}aa(@x}qN*p#
zZ7wM%*~}yzCnZ8rWF~Ftr(io7rAe7pqzMzAb~|M>9Egt@%7s_Nx}?)?I)5zqAsPEr
zdyY$)UedcAxhh<l2trd16G>r?Bkrk9u$J2<f~90v#Gf5XRmLI8kC;kr#XCWd$5d$<
zN=5$uk1<ZdjPjFiX~KjAd9oU!-XPYfV4);XhfhrccAf)8C`Yvy$gkbVuq~OGqc8lG
zwUxU9(PL>XMm|(`H~|@+C|jx|QECNbnv!<adu)UQpMMgyFln;sZGduzW8L?-Uz=O+
z+&Rcslx9bC@O6^YfhH>2a8<GgBA{q_A7+9wVt6YCgA&qkM{*mP`i{l#_uu3!+)|9a
zO@@Re6XmvvDN<cg^3h7w1ID7D&;m7g4<HiDKQ@gV7fZJ|d7Yy7Z_M&%o`2>OBH&wa
zhgqR31Qa-)BB===Q(`@*R=mM27Iwk|rVDR%?vvVGmoI81&84`tGF?w4)d?;oEJ$vS
zAv-34BqaMhG~%xH6Fn4bna5o7FII&)5_8K#s%`#GvX=hsQtL_F)O08m9ZrZMP|T2w
ziqR$`uC34v166#|ekRVq5|<E42uUF9PxNSxgy>z%BDaf6PBgNc({usmk2chSN>-Kj
zgQrOXx8#q_ND^q5k`$4|8j_Q+KF@}qXTL^?WR<PkY=qkE5pHd*XyOvKTv0VBD<Yte
zWd^TSODA>N9+|t<CEJCi7iUT>GMh_FD>UMSsbHxj)`V}Ubu1WWW7$OhS%xT;$@EuN
zXxMq#*IkS1QDVDRgJW82;vS=qEL$a6;}S=^wGFjomc*asm-}N&6ibO%<?Tt;P)Uk&
zqF>L#W9QM^V`qU$uh(5j6SYbqHD0Bv^>BX00EE7x%bR$b3fEATzY1-LHf`I#{y58s
zJR498H1KgfMxkCyK!p1p6Ui<9MXn1fZ}??|6<5JPjr7r*D8q^%GKEFPjkxiroC<1p
z00Be#G#cUYx-{jYSzL(?%Wy7=b#4g_*Ti`0<VzM&5?gY)iN09RltGe|EkQm!hf$$z
z(0HP|ggXS28uf2t9F+hYbINclz#T@=L3I$$qvKE!ZNJ^^u8t%rM~{I)+$en`R-|=|
zkYgs%CAgVM$&%EMh{t^@9d}0bI=>B6CQ~$9%3Pm3FuM7vA;Dh|Dl`jz6RJ^@sXdmw
zIO^xNqwxlhAELC=TSzJ%XC-TQQu+L%WvnFeNrY6R;ZiB8qK#CeW~!~m^4G368SV0`
zaT-$VUkcYnx&u!2DM*lr!OPl<EpisI!AVPs-`Xjm`C2C5qGasTio4_&6|{ajei{DF
zYo;(@q339eO3BvlR>Mm*Y`TySfZ#yT>4(CNU7S{*QOv@%X6;?A<S5-)ZE8Yys?wTh
z(uv@SM7XV8w~ZOdb7!`XjzMZI0N4-O(@EF`XGQ0^lOsV(ZMM2cNb;Hq@hQ+Nti-rY
zG6Ic+6idh(xXC}lGL)rVX<Ah3aB(Eg69vA>4&s-mtOU0vN|2xTbgA1+3&}y2VlWwU
z?imCJ#FNAyU>Yrha)279i=x@I<?TGWd2-{eg`>a~3J<Qj5QFK=A(**UZgqsB{{WoE
zw+-Bijv-#sDru`i?W!@0s-EGANrRC*SR5OYr(w9Rl{~inTGSTqfKV${#~n<IYNZ75
zeJ*^8Pl4LHKb_^vxkt(p4uIsigy|S`N6>|N5#=cXJN#569VlcC$`Y(_S`Tinqcn=*
z3I15H&_N&fhwl%oN*4nbPvnJj-i(-7!`74&@fMkESEUcce$7%Ad`_0e38S~xJA9jL
zgrw07Eu=nALN+uS1(vi_<5&UGjzx+=$g=6v-T=govX&A*tP(f<8jLMyry<mgI}Nuv
zW4z9No-tZw31sypWd8t0rgdc)mMFjS_Jz022>f#w$RqZs1p)eKPMQ8UQsl`x$81^@
z<>lY-<z8AV^!596IYGja?M*FR;N$iS#m!&h653g9N3SE-O;v1C+^d+m7oU;E5taC8
zCC3zfolcKkE>Mk{rvCs>cjGg<mn@xs4Ym|#)S8{X6xa3YQlv8|&T21fqdj=L9G&s_
zms^6Fj6JCi5~IJnL)bmY&XB!+_vS}v@Y(Y04VB%Td2u4R=M=Ps0mVxAkHkk_AQSG_
zSLts}j;EPeC8H7v?;mX+l4!}o`Au@V%gM4QUzSwtmz`6OKH;HS)}o~-f#K`}Ur<Cw
zA)+)+x<}FeIR(p;a@&0|t*oUcY^A1$k1f!ZE1_3IPJ>i4W_GgF!G|@_IRrZfRUi3<
zh2$Gc?y0aH32knrH9~mSiU6Mvi*06B@!~aFQ)zHjjoZ@n+=lMrZRJa4PJSQBg0$3~
z%951=05l)bt6#f_8mh+_$q!#??|r>2HF%2QLQga{5mW^92jKuzs8o}^28kQvJ_)>o
z4GNnBAh<gnZlEa%OQF`6LMy?_fw11S(r`+Xb||7P+bxodd<M!}0ZLkwD^(<NB7<-e
z5;Rd@j;IErREZtEy-a1bI@gw!tPh1elv_no4Lml~e{m3^amtm6VAmg-R6i_oDpRTk
zpNKrZT$Z7_xYD3jf}J<hS$IS8nOQgnJnE%0Yl7OoWx_)s0zf4~t{tj+>^;D0jHdde
zAmjz!KAC?ld!6qEg?x3Y-62R9Hyl{6om5dk)1aow3Z(|QKBd%*rM5g5VbSc49E9Xq
z(_g5c%EQptdTnXEcXt<QoV7eW+40(X9K{q4G*qZcLxnW(DkD`Pl0XbdE4RBVA1MC-
zR;WrnuG060KYHSyP~L~VFZM$DYR5Ypjxi0TzLiOs=bb6#vV{d7G3g3hiX4(Ut6Tjx
zW=C;%3zzj3nAO$g(-_73IQ#hh=?A=>vXOGIrr!K^(LUYH4YyDf<aL#KYDgdwLUum=
zYeyxd>x`XF8FRjGVqQIadNr^FDFBv3NuW?k<WQuFRMNisQkvMNdw?r0>h`S`m*g;o
zy&1&Fj9BxWL2*H7<aZr*Af|_H{Ceubtb)7T3AXE5k875-TZ)2YF|`-X38%tqS_M;y
zsQnsdbdt1r+^^3x!$~n6pih@n1yw~!JU;JF1cAP!0%B2nG(h9tWR-a@E~PINtQPA~
zu41YiRQoz;pe7|)I9^i`yE(929tu)F6^D^T{3+t1f$tltp6y$%L6RD)o3dG(?%kn9
zhNS$U^AZrgO5g7#DW^^M)yNkLVRmh%_L<g6ji~_#f)zle5TX)3A;_M!`aPQXkJWl-
z<NzD`lI{NSNF7uxx;%GsJ5&hZCBYaddwEnSjblVK5_PKmh8xw&Wx_D!IS39!_Ma&n
zl}$!7;1t1Ppx9$wAm8F&l!~D%LZnyNJU*>fujY_OIt0U;<j`c@5Ew{GQlgcQVKgI6
zRev{PfRfjdN=?GY{HaO)C6$FCUL+`OO%MhF3z|T>y>dupWRU!IC^$W#C;b|?5CQQ`
zsR~3piXDL-a?ixut3Xlys>e+=@E~ZRT-+ftuWv%1^Qowgl_?J=*<T$f0(9+G0nvE3
zCF>2@PRCJIo_7}+b9x06x_+G=RRR@xSVWUTlDTq|e?a~%up>xFA9*Sp9Sxo!b|^~C
zQf5&J*uhtp#_YISSs&G|tW_suS8#+{8M?8SyoM527E?ZAI*?Qb<44H?%KO3{aUiFT
z+F4TwTy9C(pOsqE?pQm6s`!@qkz>Rt+g7Q&y!SZsa9B6=8m(~9(`Vi`r|8klbydM)
zsSIxQGT9>Nf-2;u($am@6(dHrphQZw5=!52nLZpxAAX=Mv;-%A9W-mz2s;&R`f#|)
zGcHSMKOA^Gi9HI+dT*-MR)h-;P>befZOyRbzYO&_Tu?oCJv9hc%H2nwYJ-zy7Yv5^
z2~W6Ob)m^7wW5?L0Mn4#qC!EHp@?}H{vh0Ce0K#8F+<p;{n4u6Zc-L1@3>hbYPdHU
z)$=gIioobxS)d<QjVLfrDY|0AT}myC4pjJgJbkNH^wm)Ya+u8+w_coP;>EGmQMS2B
zaX!TR{;fP9pUlx}z;3Qj%jI7}ifyc|N(5Gfjm<Q19TOQclXl9Smpyl9R7*j?869^j
z+d(0<O&O4bO3Kw2xn(LfEd;pX_bD_w9@m5RrxIkfoVgix_g5Js=9`wMISO<;>q5VT
zZ7Kk%Dz`wDg~pS@k`}L<SwGfE)QtB!PO~A8ZjW#Ibhba2CBHlcbn_hB_2^YQCX}4I
zU6FCNB3-^C9|B{n^Cy3bm9B{`&Ym+wa!kHE(d!j85x`rA`ox-P_Pkj@@msrh++lBe
z;~Gnqf|iTLHLu6vrt(|>Qk2<wwO`}20hv!I^L^JIdYx#h&}dWAKqUGmp4!|Pyjd4*
zM#y})NI%(D!%k$<LgKw9N<YoZv3}1aFc1E%M@-z*w<T-b(2Gn<ZLoh2Qu@Fj5diI9
zuU2CnKq>9{QeJ(PKF%cjZaGICd*b)gR;#EPs=i|czZDa07_5ubil*ZvC8iRu4>SE*
zwju;cN+9U0F4xC;+1u;P$byojw%jzU{pa54tjXBGm3B3`OjgIO_@fr75J#G;G&dxv
zgsCVVV#o!@7O#Z}6{#xg;0mY<VpeA#AF~eg{k#%9S$xR#sokrec6+ZW=+m6I+o7q*
z(VXV5AgyZT>Z3P65ZPA3zYzkeB=4`LeHqffVS^B3wo=sg>)YS>a8nUf#4Biszdwaf
zBBiNfg+`kI6ncAg)hPhV+wE1#^<-o+<kt}a(1+h<I$GeQuj5KoRx7`b$3U_>mD*%t
z6{CjavKzY@D|G?IBa2~mPm&1-;A?aeJ;@q`s|=4DHCCo2li%$8T*qd%rvWMv<(FDX
z*aB1n(04ohI-_+_BZ9k8kUAA`+L^Lvn6zjYt9TOINNL6S5<WF4N?B4DAOwcMB!UV3
zG}b(zYmp&pfxK#fUA-RIr97MUxGX6_&>AJga%qk$D(10X1xwz7z8ai*jQABF*+i&T
z4%s_lWs7Z=3Y&_e8<Oj2{6$qI#cpU)4#Wy{>s?RJ-Ko_#?VEx=?{6+HFzS;5WUx|#
zt{^B5I|5g*sUAM<v@vF((m47p7+0qZviWml2*oW0CAB!NLx^;76(m-GS8>-yyC6h&
zs-LtabXQ`%En4yWrM-73!N%Niw7)5QLvE>RDhcLlY3>8-)?P+wF(}nxfJ3jT{gT08
z;&?18d}ReA%1u&)@oZOrg)|?heP;CRF=;X-WOZDlD;b%Q{Er01GFat{^fsilp~R)c
zgV$O)JvO+9b}E$_*4OfqxzE(^q3+k^HnDwy6%ELYk{WNz3!tIc9gQk=nlfjOSREF|
zHU9v)EitP3*Xn1r3`3UnkqG4Uba{=Zfj<Lh;y_X8q@C&g8rGuIFzVfv?a^@OezB<+
z2iSTtQr1BgC@M$<7d*Oz0-m6dc>P-FaHpcj%z~kA^DgitD&cHtNoCe3p}6=|o$3G`
zKm>dBtR%7sO3uK)p~SZ-r8WT}MI-M7l>$vY;+=dw+MBXvv`>(QCC`^peKZR}P+Cb(
zA{3QZdQemSI&&n<iA>DHttqu2iNJAM>Gy)brF<$hgqbE@?HP=O%R`aSq(@a-OHK|+
zRY?l#xbX1NAtc-vM|xdiWz!{&RNJgFl%>KJe-54`mpKAHo|?G}nHIRYU9a2R+XTH_
zf5{fxn`^kblolEI5=l<VY!s8ddIR-q$9|=HGFkPU%y_-A`G@z1Zmp=(p9klnw=8f*
ziLuKIl5!PXWFbg?2vU$1lA3~!G~Zu6WI}X}lMH(g+h1a+A*yA?;>B+5XpZ;q0}se_
z{{Vb(0N35BA>AnIR{V1og>aKD)<7=DeMM<Bua=~3`gH;bB&#|d5+`sm_Tb&5NUdQN
zwuN|cR}eI6PT-tDmy3dnH?rF6!^&WSdL6bpHL?DliV%x&QSR1@a@lrh0<I&>r@!u<
z4x&pQ#7MvgNjR)=DeHzUAyjdthgtsWw@$P&LE0o1eNk-`{Id^KOLg7%1w58oTEX^{
zO6V|?kc!QsN5`^PhBPhmmB}UYSSR*Wli{s11Ohcylr$;G4P7FRQPmYLI+5Z*rn9B+
zg!Wac9dxt&<}EMfz+3VjLPAf4e)0P?8s^eP5z#bum$s4TmgUGmNNlYQDMP5?(|t<I
z2neu<L0pb3Hv6_OY^izVxKgvZDJOIEYE(z!-lH~KZ`LR8I8Cm~wbd}Ap~sc)<x)P)
zXge`k=CipWT5w0N858iLwoCk0;N##{Hm;QH&;@EEML)clq>CP9VZfuKl=Z`D`DH)%
zsuZWysaGd?AxbV8HDVH?VL4o!b%zJbK#%hmXG#0ZQftFdkSJC~v{c4Jmfdr_#o4hx
z3f$w$Ok|G+(5h|q=;omTsw7H&#O=sxdL58?sfMabzpYVHe!XYO<m{kiU6USb+*sI+
zh&YEi+*eS9jmcTqQ|KBcRA{FeYRaIy=1$!%%|>dfeb)k)zU5@>HD}1tN>kO9!X~F0
zZr5XZK+Z}M{FMIyZDW-W&^1z3K8kyg*YZhhWA_ZP<yPf&k@7Hyu_NInKJ83W!6!}j
z=8=tHkmIyy>#0+c6iqfgNzg7lf_aWfZo`l!>bK^}R~uYzZi@6FzM2+98UPL|Ah}5v
zyw&@TLv*~kRXZRn%1`z|+eSG500csjmaAL$*`7?MBq-HfR0*&3b#BUd6<AD(Cd<Y{
z<YKL}A7=c7AvEzM)aY=B6pZyN$968x$L-?L8);0m%Z?G(k6jX~z92hPMBP-s=Lruo
zZV5jQ%POxz1rCooUQDMMC@*(Sacxu5^0!+jjeVf%#dywBPHR_hGTHZ-Z}}(VeHBu@
z!0)4+a1hDdj^nx0*JdAJ5>XxA1N)@V9cJZY?JkKKxlfpOY^-A<7UV1N)4@Wg!Of5B
z)nilYn|7(mwqz?ic7G$}A#F(I?^_NopJH^jd?{|#4(-EexR%|WyYIBJgq^|}LVoww
zbQ@;H)xtDnn|#BDN1H*i{p(zC<L{@y(y9dN-%h`ClB(HH1-m)N-H{^SYANH$eBt&}
zj@12HEbsVCQA7YvU9q#uy4k<W?Vb_U&RgUV3Q*YM2|Lhgm68M^!0M^5TAkFocIUJb
z?D(Ne0^;zuE!wRvKBZThstrm~p0(>w>eMT{^ao9jUUYZswj}osA8+ks;ySJci)xpC
zy1g;9gAu))eS0MdD&xsSkO5H}3e@Z9qFX?Z5b7pXY>tV6rd;yUl24qm_krJStJAMd
zJW7nhBV(C1E1*JHOQ|7hSUgEPpV;U}*QaFSMLgme3%1rvw~xl2suXexsHXh51tzLL
zMxtWs#Zv88Z)2`3<`)*=!d$QB0)cPvj-ZPBONy@_Z57kN>nkj6TNtIv`jzOr(?mva
z$QeFbAjp`e)TG@4)#oX-xD;Cqh6O6!K%wGKw_J{9P%>caVlNTit)+G&3AoArQ)gwi
z+K!_XlNCN{M1jfH>XfLZDk-S0{{Tl#S2mC}L=$Bqf1>W*2yRG?#yaObr&LgaJ}N4n
zDI`$RlpjWdGUgMDK`h8kpV96sWQ_cGQkf}|r4`0NdX6j13ForG<SGEEAOq9d=Qc`2
z#Y)FLFu<}ye%|yhEH+TvDJdapZ2&1L>P>c`*mThB%a<N$d?iB6FiDoeg<IKM3xXSW
z<<OM*iAZrIxwgrz4J)|!>7i@!)zfY4S66C%Q)BPh;@Phcp}WybNfGztl@ujQB>mlr
zsY?E>O1mtpK(aGBWNnt=#PL=<KJH_eRISL51x7+j%7LvC4<1II-4a=Hm&~(&(xehM
zbGx*gds31dLg5y|xpLhFM1flBJ4DLT$Ho=-t_byMmfLTcWIMH$0di1QB%mF*DLhxq
zCwddgmDbiKK7|_F8FS}-dliXf*5Q*Ot`Z~!tjKDCN^MCb3XP2vYIf_Z_;(ncs;*TV
zgRW-EdohUGF3C!XZYXp24<${ImetJ^By{LLt#lQVLcz8SQfm7}ZkRl&Pc%vrrO;HK
zUSBc=M?$qKyVrW?!O%=Xh&?{4@j5hE%<<ww%T#0zW`n?Oy-2Rx)9BJRHxz{iTo>#=
zNq3i0x1MFmNO8cTwYHR|g*#B6XCgXjyy4o4F$%Fe8|eEGjdWsWL2C|4ZDG(Il9i;>
zf8C|B03djp>b>{MA%RwC#E<hXgULHbj>E>dS?pz|RDh2@%@<&hc1dxts+y158mUH2
zfa@pmD@J(rwvlB{-Yi*O8+1(f9(6H_xJ7nK98!{?YAU3J(EUf~*6levg3pu;ORk;t
z``#IOy@~vHCy?35-AWYHmw`$o6eo|CXq53$PQg_lPQ0VnzK0o7IWz*~d{F=pSZGLa
z&%wsJaYD$g!-U^y$RabD&28rv%&1`yl*5RskWfA$UPH&-uLi#kFq0BN96<y4tmu|>
za}diQ#_mM*CBmj%x2fj}k`e;Yc#euzt4|zlBp<u`RE*h*Rn8=frM78rXC%AxDj(Ge
zO$MvsR>Xp=PI@{6ak?(?g+;xvs$AG$u_*)ZQMFYI`YEeT@Q|T7>a<<&>T4N|aHk|V
zq@iE>!Ty~#4Nnu|nA(<Xif&cu+vIb`Ky6JeKiX+k)y8qOs^qq+(911M-CcGPM-<&H
zZ7QDC@c#f#t46)E2!3{pnPjsj(T$%!XIPf#KG0ICS6c^C6v@%mi`(4o<m0ZxkVRMl
zw*m2O;Xr<)to)i$H@Hr+WW|e)H9uh$C=RJ!)fy(60Hw-k$v$G4G;1~}^3(n$3<R>D
z5U0lK`!up(&?F*OT(Uv4sujm4eq)O%jM_d?MO_HpWa@N8>;t(p#;eo`>yv1c4Wde<
zxm44^q^pfIaVJV~0459~-3G~jnES{HaV{`cd`eQDTz=hExSbRa1rsM~CEqWTn#w>g
zM@p8Jky;_Yii7Lbm|3<gm<3;BnDy%a0FB=7GOPT`@g?U9{6i^CN7YSBCnQ9~DD89)
z7QtiM?l9R;#M5jz;?@14Y6gpC;$=!TvUY)vJt7>1uniqsEU9Vt{AcxPpvXqQiB}fO
zb;CKAe7?>K`71k5IE1RSNlJ<n^_pt@nk)iU*2;HeyI70D-OVmXmAcyCp6?;l6rLmP
z)Xab&D9$>jNf7Q=D~j@$>-<{}KFB@=XM#u6HBzX8Q<O0=<xRQSZL$ad01bl4c>r`%
zrF5>I>4Bo0LUYMyKRmUMw5}{X0s@DK3I702vz$n}ClnrKu@UX5utWG?nA@#w?Luq%
zbqc;R=aO<6C}G&=$=}x8y^xgg;(QcN`noI}6hKCMrHw_1xJkCqA!y>^AGWcn%I6G+
zI^R^!XT{@PaLa$q4~xzDbMygSRh7FnOe<0|{3Ta7bKtXImUXt;K|j=O9L}c<moAz$
zYO1?$XQj!4<7r15ODI<*Q}4LH535#2Q#t0JVhfXY4cA|64Wl%|Qn9@h>x$TF%^ATj
zC=_$Iot0KKk4s_ShDrV$E7{L;s(F1u<{3O{M*DZ^{i|%Jqd2Z+K|{qO_E6X)kGDh0
z&E9+hURx+xMja{^TN*S<mlOE1Tpr$E3VxxXLm&ty6}r3zFB|05XFxyBf0w3niv6!Q
z$tgmA{$DLn{o!Zin_zT@V0kuHt^t!n6`>U;*;MX6y*$X7Wpvh1`y{qmwttx2P!GK0
zv64S&NTm%ma+vvXZfX`sR4PT{P3~*bW-6(U8jRh4Wwf53W~XL@y$q{MvFt_|oU7!3
zpO~DrMrg02Y&TUcUq;%eWVUFf61XSU?{;mu&u|^KMo@CeYFo%@vS@|4qeUq|9{?%#
z{Tli=>F1`;PsZ~n^VkE9!NtD>YU9mS7?vL*?;Tf%+~XM|%xNh|4W%T|01^NduR*Tv
z>i{b4Rk(BmBF56<)`rTIhQ`h)RD4FDQoU$Ki&1c^+Z7JfP}<9DQ1WTOEfnOn_!NrM
zr%t*kLf{l<uAe6$rM;@6fQ1rkzUGMQshH@Y8EU#m(f#VzZM?&|T>vnO(4zCKGLSfv
zN-5x^jrJdgPP4M;GLD>9<}JV#^)IuYr;#SgEr^_?#38;ZNpPg4qrDWrX&q=jjdIuE
z5M7qlcZqOUpKtroVsR?HNNG>F=ql#ZjxIoOC=LE14I3)y@A|VZ$2^gEt6Lbq+B2J4
z5o2%`T}yAax2aURq^rWTAdWSlr`9z>K*X|v8%wA;7xOC)Ljp4fh)Z8Gwo)pdK!UOl
zUxi*3_Ki$HNIIM*Bnowc@?Mz4wbn~b1-i91NU1eKxe@Gkpp5{<RGV!eY4-jJXE(;J
zQSvrfmXRtefwcs>3XqEYLAN+4av+}_iPH$H7}uHCsOEoy3nS9jC4FJr#lA1gPV+p~
zC6tEHrJern$E5`cJw5u6vOz|9ag2bHS;@O4-0VW$^lU<TA2gN5N?Z&3ifk1XP*4hk
zO}095WAO-(vJ>D^K26vj`Q}ldW);bXW3pRJs(GRHmf9#s6!B0g;sU-SQgvpms^VRW
zl;AizTE_h)$HwfkGAxzE+^%jFs;(fbfIku92?nCSW~|xNB{mV!JTapauBx5yoa;6}
z727=!hLAX<q#+Hc>_If9=U_*>+pE}BN_vzWiHL>9{o}o+<#r86Whsz@$c6JG+qWv3
zeKgl$iBX7LzGZ-vqiMFnex7qctf+G1Uxid2BAfdTuI*H#Fq|-iLxp$@%517HB2a=>
zD3CrND12*Oj)84^m745jZ($H|)yes|Do>rmfDiHwx)hp}DMNbo0P8x)5U&Zkv2koJ
z$2qo{l!dh6D)Q8jmm5-2b_AWp0Hsn!+NEWZiZnn+uJ|J5wBs@#EW`WWdIDr6X$F)~
zcp6aXF_y2z7|T}Rl{=;B)>X$3azkG#^U=~>ZPr%XZUl|@L#gCGr2+5J=*tn93KNFt
zsv8rvqY%iNnEPcs903kCuQc_kAwU!V0Hv;;n*@TV63X+RY=<F;nYFrG(h)6aOtroe
zeqF?*1fgn1{79flBW{(Zyi@95rJ;;QMQ^r5zhLLb@O7V;K!Xv@FAS<w9F@k>;Y;o(
z%2_)eHLW${u&taGQo+GXi++<V+~0X$fYfy>uHSTlpwnAQNrbdY7(Q6*Gb2Ngc|(~Q
zaTcF?i33&)7!?Umu`$VxhOzWm-6pN8%;oG2s=NJK79k8rdTD5@hcabaF82t{sQFFE
zS5A~z2Ab5BUl8v@5_byqzT~NL*NJ3M$MEtZC4fh@2XKC^0?JxSu{ssbx$V$CFEDuV
zQf91#`<ANe)N5%4W-|CkdLM}1=RbN}bd&PVM_ODS_KiW)-&oq}KoYH4v+ghUrYsth
zHN_>xr1kQWK^4^z5G2J<P!;QH^u6kDxE83FtRD@!$hFCW!As6YRCbo6rj<(M@Cy2l
zv=67VvTJ(jkq5cI7FHplLT7qG^+$y=>hjDc?H1m!x8zN3Dx@;dZ5)R;BXde??;}#5
zr?au(_ER7mi$CD$66G)Ydb0ljo3h5O%Slr$EHdSNi9TYh_G=&I30Wry>+odE%I@%D
zkHiyH%18E5Qcu~cSs;KA!BDcNSXsDvR73!Vps`QdG^)?rp~^-+<lw0`=+^rd1vSzF
zUT!HU9yM9x`n5_@HfmCRRa<blwGq<eKX>KI>OK2v%@aG3iP1UWS5>{*`Oi1J@ZeKm
zjp(EiU#nVDmeLSP%QhbpFKKdjSU?i4Mlb+uYEpTAo%Ge^y!Q4ay>@Qc$N4txiVy=u
zhC{1A*&f|2yv?>nM2Atkiiq|pQEhSl79+RiEhE?wQTp^~SVW3wAq-k#MQ+VBx%g?0
z^UL3<=13Ziwi6_YL|wK!D$#1b#Hy7YN-mMP;<K^P3|c8}(MM*EWM*T-;f7YPcg4P*
zp|?df)m?|~-fP-FNj6-QwQ}0FTyFUV^)qCMaHKfvOtBSBpsG_&Y?7nXUbpFNiBZ#|
zC}>RN<%eKYGq06kZ7l0m+r4(~?89m|e{l;QV+p~@a$JPfvgU!}SetDPEeGiYd$oTe
zRb+;~sL#EcUhu_IhfthOx~l8cuWN9g%J(6T+2D(kym+n+)r4GDha@tKghu80N?U12
zR}V9YG_5+<uDrw5T{gT7qg8HV!0X3Q>s-yiD0g@pgNoYWM@<F7byAd$p(-GLt#kB;
zQydb;MPo)SioB^`0+yahN!xWD5b6sh5|L+J+A$-#?Krrk0q-rE>EiJUM}jW&w4%!q
z^-wBvigt&^K+!4CL^X86S|fJHzm$hOl>;?xhEwh*snE-gDHW-lPBLXG<vxTZX)00i
zq2xyTs3u7vG>(X%zBr4Sztnuojt98c{=v4(9Dc>>Jee|$n|3!U#Tats9y_nvWIW`_
zZqlkrDLhj^H%RvDugvJ;sTtL%ZXd(7cKQ7Vb!!0OSCMVrY=p&OB()7Jvf4ZgvJ?UL
zYc6&<3!R=i9__7hjmF-eib7-*D35V8{W^@S;H#Q>r+dZiSO;(3#+Y$2<ueV*5@xu5
z2+XYmlFq~vzrvr|R^2LfEF6E_<Oc+Y3<op$c%cZeUom@wF&CTEmB*=N*A}qj)Z|iC
zvX9g@A4k)#uW>8#>x@X?2jGqdfGbwa-Ga&5*zwePNn`~$;n=tWYr(Yp)(9t5<*e46
zKoC^kU6P5CpL`J852&dCQ~*?yP>?C%u-2_{V6!corMX!=80%9^8ac?J0ltV7uP+Ln
z5FkoGsOo+1nL{lKK4=n<Dk<0OuIJmLh`JvI&|QtVMYS^?^L=~fE-NK0H0s9$r6aG!
zUk?C2-6K-58<})Q3Ep#WEWW=iKBZBz0ZB?a5(0Lm4%O8wv3D!f<+8ePPf)TXrA(PB
zF^YJk@}M<4fGN19+x?oy$iM@V)uS!fVR}XHC6)V&PRV>c(+trGZ;?rKtxMpLXh|Zq
z+n`UsT*iF{9KOu799b4!BOOd#@}?JXWeSKbZ>=j*sus1pl@|I_aDBVfYd3^YYz6~P
z)ixGO9v%e5n__q+dzZ)xDrqd2l~dtIXcSMsuBElhAR4z?PY^#IAA%oc%&hrTG+rEK
z#Kl9>K4;BG#H6qTX>nm)5*DCFq-!xnoD4X3BDWlhJ(2)Qq=y=gqQiy1i*%_-QJ|+v
zQl8z8hvhniYu;VBsTbJx>x3p@zUzsO`+j45IiXabUlbaW2~9_jL#4A-8i@tjR~NP9
zn4G6gq#?^|gh~x5ODB&K2~Z@SgKfM%jZ8u_T5&JMD0fC+ooQwGjwu0W<BwX>qM=D6
zWdrT&t61>Wk}H?{^@t+$)8&vAET?5Cq=fu66$jm3y4=H_)>QH!;I2RJ2Wlq7x(G_D
z92F>D;U=e{KJRFzy3BjTgN{p>$f=7ZiFjPwa@EbF<~R3%Aewu<zizDwhEzypy3ow<
z`*I>E6^*#7sNS752{M#q$@2-FIveWqL93K5xBE2*aw*XGk8Y~l9Tlipth-iMbg?0&
zu)a`<4uq?44~f|BDeTr{=-gGv+QD7@vdrukmXeo}mZmKr2G_bmfv(C>=zh&)<kKiC
zb=W4FW=Y1cNp>40O-cc2^4g-3pcA@HdK&l|*0j?=NHc`{yB8jJy4z{8<x}nKM+vyH
zvO{f^r7Ar^2~njFyIn_31jW@0?-435XuF*f;4WCCa8(XudY}?N4c2}%l9vJ7V_F?A
zSK<r$Ws%c>I`CC&w{%EQZgX9SnE5YOi7P#SWNbgxuaZO>B~T&Hu@r|sNw!J1Kpt%A
zz%<H7QlA|{xco{oj*4y<gE0>B>(VNwVI`*!ll^mF)OANEB#sD>sgpO!F>;G?T2JGp
zr+EJWc&9<CW+f276qz5l(Jr>9F3x}@I@bp_>gp;1`t^3q!r>3eVpF0arUn^c#-uEH
zmex}tM4jrY)M;6kWJyir1hMI7(@P$$d)1U<*E`}d+*;2Leo1h+E-RB3V%wD8nub_y
zNap7k3V<pb1LL;3o{7@Vb%MRyS|&uZ=o^6TP%Hr_fLG=@*snm{ylqWE#xiWd*4rWJ
z*SpMnLRZUmd2Cx)aHS{1lF9b#u8&0N@C-!f;#=?vjJk*%BCNKrexADpKcA&*Yjd&-
zjV2tQB4INm+K}S;HE)8{w5hZf5k#%h6r~#PN^0FWSeOKwBf3Xj($vSW2jJbjN`_BR
z<pdh(-HzpDb0sS-$SxD4wvtE8%Xvv2KMFZ<NUwkcPj+3i)X4kRbnTS5l2i`Z_g}f#
z-PlaW@(YATHWpOdGT#lVqN9>IaZs;;8l72Iz_^k3r5j})1chXFyE4H$<9kaT$%PKj
z-N_Cum^q!bhN2>4>iANNqYMPLzGQ*tBn2mG?Ojvq9WNiM2AB}Hl*W#K?+$O<#4QYb
z{of4z>XObeOoz2y(7#x6xW+C)9ocJng>EWS@U0|lQlyZik<=RN%Q}t~nAb|H14<`V
zpj;|vE6iMzae-q-$#Gt3BdV0MP4!N7?uk*9n1GmaYr&Upx!IUMkL9-7N4WrmKzqLp
z)c&0YjC~xXz0QiAy<db#vejSQ#7a-Nlc`rgG9D<~-X$}3n>%gGaE=xHIczqu?>lPF
zZCgPq5tjvL+vYZmZe)7@01gnh!2aS5HP6vu{mXZM1aLHTw}{>iuM)aWZB$&8C+tp%
z)ZAHLc^`^ui;}ay;4=o*kg}mkkXu^+0K5_fb+;($tJZ!Lu<hNcxP_)d6+#N5tb^gX
z8hJ&^kSfLO3RuZ)pUdWN9rV7=`~BU4`i`Mw2#Q;SB|OgL)rw8(BWLkY${FSDRZ2<y
z8h8f|q$KL{?FHd7KQG%9!fN9gRq_%^_PGWVpVO~W^yq$?JFJ)B7H3pC1qU3s2X4`<
zh~4JeaZ0DRs2b7{(bhPUIqOC;rTY1mjw|Ab#7hNJ{ZyjO7@GZ>;yr6#?xjBAANfM)
ztdlTRcXY4M=3U;$pfgho=Uk}jJf>(h%^Dgfy-$9Ld(|&;8FMF2F$F+0g>z6(f<U51
zhAL<xi7LJ>Qj4wrC8Zy^j%at-o~KVb$cuKSoY_8Qw+4<+isLOGhBIrKAP)+itD=72
zYyxP@ML!O{w|UE)ac7ifxw%U1P-vZ0zNU(KO)~d#`x?+<T4N3gQd{OlDpcphqpZ5>
zc@*1&q}65(e>h8gzW_F->HU(ljS$p$De_-OJ8@&MUG1$wzOdVcLxS6MCWH~;U3U|n
ztJ`xWD1yqg@1LQ(Q4?IwyHmju(CC{k&`LsGQ)x8e>^uE>qmzg&)M+l>UeLLGj1Sxg
z18lzI{1*mZf6O?xO?`uvM0O3#DMiMg1W`rJh$4WGdQP%uL5IRdtC-8GRY=A`iV5Ca
zk?GyK$R?pdPp&tT2-qZXqKZ?{8VYhXAawR?qV$bl{Nw@P<MI1wvrL!H{DUzLWDQ&P
zQ48d%cyarn{hd5D^%x8kx4BIdyN@*6K2LJ`QkD`&M5QDRhfTVj08^{0M%Ife-r;b1
z;CMDjN>3E3yV9y3t5%g66)ww<M^O2xDOq)U012mu#G~K_{{T?b#8fz`uC`*$^Olew
zs*->}sY*>Mbz-#wkJxidoCo~Xr1?aK8%nnu(N#Y0c8F4R=ZyDKZN70_mwdpYDw>d*
zjkxupr?d2G5(x<_ZvgLnK_!(sRHUell1h0R??8M29?A_=vZq(5xtCXVAHJ(i*4Es2
zRK>ML33;|0{8X}50SQuQ0*_kOzec(2>_9<VxYzItxG^60&6);DG2pea&e+omP%Tnh
zE=X-V&=5GJ3X$RM*DWk&(P}%Ve2cjXy<;|ub&*Rl(Jjkl#H7?E4!E8waSJ=8Whn#^
zQD0%u;a=Gn>`@TZp4GDXY{(e9Gjo8D{wDJ>AAPj!<cC5FtTIh%IIH5J8<D=H83H@q
zNdv??iI}3%YM+0MBHEHu4nxUUbzX9sRE4d=O;4Dma_DL)<EhS}s}z|Z9rm`~XWcCK
zR~Cq{{E4yD$`2$1MUdSI3LFzrQSJ8AQSt}?s79b4y&1dbFzy#7A<Aq8At5ntX#lq3
zT;o(FN5qlHb?Hxbf#ngZoMHlA?n@Ta8az`SO(kkC2OHffUm_d@Bkqs7stvm6l(^M9
zs#iP1T6*Z@IbVf6XbEmWrw1!uB$4)4TC~`~3c%~1dz*x_ZkWvJC?0PmH2ZE2Bao^{
zP!$5c(X}Xbv5j$J%O?86>Z^RG3Sr0m=37cy>qHL)ZaQmPoAdyzi|R^p@iyYW<}<QX
zYO0El^&MIgbx_5MBL*RDhF00&@=q5k58Xd>{TdlkMeX-1gK?a+zM_?+^I)CARyQ;~
zXhG0Sb#);k%!|Oz?-;Z*Jh9F?LF7<Q)H{@^KXlY|IvnW|Q?BC_t!edzHr;oAD&H#r
zIP*(NxU5i$f}Oz}ej!mxYE!`so;gGpNg0=O?;Xg^Q#pr_r6mdl*3eQ^lAd5FZb92_
zy*x&*;LstW9oBCtg9DXzb0%72i0kCTvILF|w51_UnuU?@*Ql?w`}JSe86uvWX*|Fm
zXVdN4g(ASF$8n}^7MPh!yE^L(#Bg*WY9xcdzh5HRV+QO(g7=R{PCuMSku(1QXC*03
zJXDZ$9nKvVEzLaLSdDAHO+;b}CA66=f#Mb``VOdFQFlxwsuM12b{w^E3aJW9O_A*6
z@Sz`Wn`Y?urMb03@_U)HSsH^FQAO1)RO>*hS5%{B%YZx)-Qt6H3o4M)@#e=_@*Qn0
z)OdJ~pGLH(t3%>}xm&-Mf@53#O=GzGL<Vx`xdo<auY|i)grFb&Vo|Q!(ii^#`3lD(
zB_DiG=E@cgz>d_wi3xSPi$GAcl?ooTPP;YBuTapa_GYFee^F`w0BKqoDkV;Ey7ZT4
zC--t22?P5_uj<rfbVw*R84f^`DMMnWocg>qD4i6O7j9ztGT1I3g`_zle^A@?=wf=P
zrta`E=X(1I54o<@-1`iD80F>utCMHA1ttT|sP0tD<I1myP^s2OtFb?GiyV>j)<k9B
z6TqJXr?qWh+vY`&CCZ(*?B{X2x!sFxj|Z~NyUmCc<g`GJ<H4jhXcXd*D1cS4Dj;iz
z!NI#I7}WzK+#OhuB=@VTU!adv>00Ni!x^j8w-(ufCii1%Ky6(=4aq?A_jT7rU!!`5
zmd3U{o1*^!iiBgd@e7r`S9UwSo}I0?MfYbJxLBE-`Hu=r$m<cF4X2eFkczUu_EdF9
z^jwTX5p)cEMxOo%fDj9$4$5TiIcAXh$rV`RU+n6yRICV~*DXTmoO<XdV^6-dPzcK9
zzqK^iAB$7u60S;31g~hhEmk=ej$80jM*icb>d)rZdk9a7s3myswo3Coj>jZOSMiNB
zV=VaWE3T@#x0gVX+7UlZo|(Jl>PNMO{@+_dEfFQ9Q?K`Tn}KSEjx|wsT!Im>BB@6u
zZ_`>h9SbKm(kqX`ILPS{?fizRqJ9<B9gg&k+K$_~65p41iqQS}hg?gM>^8fV$}*O|
zsZ6B#X*>Aw*HC>G0vdS{2f8Hv?iF*DSkrgnl>43edgR%y&gpdQR%c|*A9?p2RgIUG
zZM)Kh(YVw2rF?g-7hhmHqmk&Vq8^#X&f%f=AL5Ty(4WddU!ASOvo76w7JmosEw)Xo
zE423-=N0Hz23%p}C3y4)l1d!_(1TEV9-~|R7Kzh<VK|tPY0&6?P^tA1@Q)Nbwn#*-
z=Kv4DIaa>HonMgnRw8Nju`w2(U0uh>m;V6x=yq0`C)%uf8vg*NT&Jq5exq;xANgXs
z3y;V4>{P@z(P?3<>f!g9ZPLn*UQT>RuDSVC;gH0aIrkU1Y07(pCVCtsmGBk*$kc76
zg0lkUZ|wsspM6ZpO86OZ(&~xuNv?ym8G+!ZIOv&~%+qncUbAP9@bQ~4;+pNY+iLC9
zI|LClW3!jiJlEEL71bned@EC|j-?H;DZIxkXLNIQO~}%fImkCtQhX99HAf2=h&kd@
zS!2iqoBm~cm-7mrB(H$q_C}V^>bG*f+ApD)f2b(4Z0-53k1-%A3kHfFJ$2e!i6C@d
z@C;?DTJBe?Yt5QjEIvnp-`Tf;)y!_5C&gE`=++fI+<xQYUFD3p`D8%js}vHMJRd==
zK}!Cg1FQ4sv78wFygL^^ojS6jV=(>wo(r12Qe)W$8QSa2ivzA)F}D#%*BJ^j8%HjV
zpl%WeRRK?J2HLslUV$2OM5aRxM=!BlW?xE`Qr#1}KYID~k6RUeyGXt|popQxd3E-3
z*bl2-;ULR00rgYw7Z|bRt)>)Il#eY&z9OWbtp2SuLY$<f;`owpPbZQ}+<neS;a$%v
zf2UJJ19EYj2HV@~DkR=dng~!0p(Q10K&Ml%si6Aw!cM2LhN%)3PYUZfa-<<C^8%`r
z)FlW>H3GZ%9rb3pXsezpYxlcy<DsQ1iVBN^kKP~({{TqQi3LJS(-M(!mX{!?)FzF$
zP<}19{W_M{P~eE$vWw0)b_w5#K%$mZpnaY`IuzoK87`IdvFZW1_h^u^chKXmD10hN
zpyqfdV^V%102_Fd(^+|xZjOsz682|bL%Rnx7yAsWw1-scWq%XoIDQJa*OmxLr3z6*
z*T9W(S!Ig_(9@`OZuXxfnI`t*(i{!E%jqfeg$l};L}CFu8kU7U`*j=BxCTd8#j7H6
zWFMC*LdYq70Ez&%m#`q$uf#Q+W4BcMP)wTJD$?U|EzyxH8zCY^v;p{xavyLii6sF<
zf#RLLnmuy`GJ|i$tytt2=Ei9XQ%ViV;y)M$!az0gR}slI2dBSJ<`R+sCfp}oq}$<4
z58BD|Vug=^G$5yr`vm}Y-h>Zesq}49OxZ+<6YWWG0rPx0@#{ibNjn~?3gig(XfOa2
zk|s?pnehY49E}1JPu@*wKtUZssr72qP^MK2>Jkg9xiKOc;+6gzjVM=eKmk<n-&+_b
zwPoa&RkL>R`^b;PC0`SDJwkb?fNAXMtsTv(&X%cTEwr}7YIU#*2|rJ~ja#Npsn{6^
zwX(LRB`%M^DO+l<N_3~`u8$&u7P-#Lv<Ay61;&pKl>h=$<LnxYHB3_OQJ*zvfhot7
zwjV5)3R0oPU<xRT)F^H$2(3N76WE}+e(jsC7426-vfQ6AmP&;a#YIU{RDY^cr4O%H
zOg<G5Rh8S!+Zq084(P!M^AY8{(4izGtAeTGHzP_BAi69_=B|F!<oIq$ZMwihlHNqy
zP8I@wAhrPb(e{o&j=eR_eMQ2vE2Yb47?Cd#!2T*0hmMJcP3@ar9II55RJ|348c_Y0
zTXSPipzGyH>Psj?Ko{%sRd$-Ik~feLhr&mRK%$4)r>-m$i6&TggK>jypVmZmn9h^p
z+1)>8p<r-;W$_>#(Vn+do4j#J4J*qu_M(d)r8<Q%Z4u6)62191=n(EqC-7a1=BM6H
z<ZC0SRAk_B;t?^*0e#2B%w9w^kYzPM)p~^_avz}T_65dOMn{h{rxqnUdL+mfjC!2y
zeeFk!f6r~OU#a__H8Hr$KlN61(E4uunY5q%Nd4uMRn3-Ti^sc#lv&(Q6i2#FfydaE
z<~YyvYtyq1%Lwl)mYiBdEk+t1wZwp(m&~w7y(-&OB_>Q0?jhL_aM76eLj7;UaOd3f
zEwXPaTBOZON8?;*jDqUWo`qBceXFC$S5;!m?2U0eABpfBO1DlF?AL%^lj-Wkm@#m;
zb~iA#X3s}L)hg9)4@SB+-`*}F9FP{`6SYbzcj>9)nleHCwXv{{LrHs%s&?Q`0mi9P
z($b-+<PcK&SuGHHgW^9%sshVAgzwlKlMcqN7duCB(&L@JzuG22xV0bmrA<;xK3`BA
z^IJ$sI|6EU)y!j6kezpYlZger;k)00w~KJ9PIxjCkoWf_x<_6YfJSQ(?PF+p3|K5x
zVYMs}Jjrh+j!1Pt4oYyEo#-@L@&qgL>4>fafR3K?#Gdk_epKx42^wcP5TOyjmg1a0
z)1irItB|Ka?-pl^M|%;uHqJ@fE0arR@rPsx6D>2CQh_Key~sAbs+FRO1Ox8X>axsW
zBQJ_4LJtILFO_FQr(&o3!})qh#qV~Er_z<aee<)q)1pQ@Y-lcI`&_W2^Ol(fJd~py
zLaA|IdA-RzRHMcEo1#uOL&%AgEZ_#D9$@%>9t&!qCO1V{*w^Lf-Z&V;_RPO0#4*g7
z<_k))-ts8z&TY@?EisbwVEacswV#FPOt_ON%DBt0%U`$=_olKzn{Xc0QfD5N{X+IC
z@SCr4><=}DH~^1-x2?JMnE^+NN+v`rXcZobQ405KoApmX%EJKJ0wPHGhOy(?G)BRR
zh%TFZMd^bQ@7<PWVctnELG<;6maaF$7?eo5Jm>g(R7LH@$J8jL15_t{i3D}Nl<5O5
zQk9xl4n6(B2H5}%j|BDH-tA-=%s80iQQ5L~&e|GdAH^*x4BM^I(tZ@7v;Y>p>ZcSr
zDEqe8ac#y-A{rxvM*y&I$d!j)9f}q^EBRgCGtG1lrAr6GyBz`+Jec+&80e>&3ugZS
zEdbHg$SyWTK?D$?LNqxZVLWt3JHOuU;pSNNtF_s5({aY&%1p?v$^~*+P-Scu{Nie)
z5Wb436ciwBt8>k=%JxXRA8I_Vl%gU_q%1Xuthv;w2sPr}Q}kC*l)!?ovy#32UV2H)
zJB{iyJkPRA&ASfmearbUjeNg6L6~D$;jr>y#%GhS6e%PffUQMp4ytv2fp%7Pwh|!^
zg^B0zjsuBZ6~Z9Aiz@HB-iWMOw{DS%_EWkROO9TOxeDKSVr7vM)=@yqQYCV4nvTf|
zpeMw2)j0Z7`<F&Xu!0ab*F7U3{^j$-EbPB?`$^n4u@39mrCBpbuDaa&boR?`w&G79
zLES1s(m_g+N>n!ljdLAFsZ%LJVTe2mvl^L6!EXz)BJUk0t8q_;>DQ6))j?a#6iy+O
zTfOP)UKwq%v?(HdgonMqdZxc-wasAasq8MBuxyE|NLeb~uxUf%tSq{G$tvWKQqD=0
zy>q=O44zLouPGzxJL+(xLOQ8e5@f#>dxmdF#lrp+#aU6W{i2*r59m6_6_+-5k9MnL
zxmg(3cCxHSmivN>u>}&B75zH(>oDUZ!FrT4B>~zLi~j&|zszltr5<O-wb3ZW*oA&(
z;D=i8QX)B3Dy`O_jb7NZOwmafaXl#^L=(|KnuGL>3Q^_BP7+jSdVL~ed0P+OyK>t$
zY^7YDEg>8r$aP1RTti^+Q8he}C{E;8eRLf^uTHbJ&x${IS=n7WGY<_9+_={$z_Yv)
zBy$<gpgRWkrStOMr5!<0NLm(}rD)r#O*Pr$WJ36EfpEFIX_aNAqQAQlfWtQE^VXj+
zPZ}bkp#egbB>P1wefn0|+!dN2mpxV^<Zi;+g>sF>O^WOSQbLFW-bmCaE}JMYRL!c`
zUr-H>2uej;9Rg@+UwPYC;1vav;14I~R7y})#3&yQAxB3VC`k{;@>6NMp(<AfgNRC!
zo}?u1EB5LF)+#LO#6-(|`DvDx{{Vy_`AGzTO$jPA1QWiAIf2CzF;BgX#&7d7cAmDw
zc5f94Eun_ix|C7Gk`g)qI{OZ?@-B#dR*o$N*U+B9_d@4}xf0Wp!*(EYI}es*B(}Dj
zQ24^az$qrFUj6{<naY5fc<Q=5a$*>(`yb9*l!;H;h~T29m|aCwTR(^gycAdII?a?-
zuvLqX_jTB^V_XpEELFJk5PB$@gp{8SK<)23t2&+00Zvi7uHHZx#}JCjLPD8+JSeoU
z?vcd!6qJxR2aPHL&;@O(MR~|>&9e$ihz~b$ayyK=8YpwlN&s6#5@@Ayp+WK39TK@}
z6cv4E%^!8>my1%^P;E{!rS8+55}=1!a8iegk`$9lflpwq-Js}H304$*z8%un4Y$?-
zD0L_xfKa5Uw6vZ*2&wmMbz5U3WRxzqG{&1E1cVS28GCvPIYN>}KeQ-)`ZxrkN=mBl
z)3H|(*{C6CWomIsKE}Mp%}>1Ttt>YMmUZM6N?dY4%(Bv#!S|fxz5eP-0+qSxK%w^Q
zUNLa8=O!o(>m|3(l$D`l<kTtvJ8qFsK7w^(pg>jZAwjvn@~HFMI~DW&LZ4kUc$Yzt
zWSNxatgze85&}V28gIWqKHVA+)eM(ZM|L~hZqd_aj)b`lO@QK+_nJ@@2?yUoH~V(g
zxK<rNmCyN~aEzwgg&oRpBq>U%P$6Vc`$tU@a&XEiy8*ho+SrDtgK?g53VM}I6e&Yp
z#{E8>PCQeBub#}ucFCF9?h_tTZEs6rD%}-L8-38xDjv!cU!zvCC>K*W9tI^%T-k$n
z8++~AE-B+KF?IvU1SoltpDmgZvD|ER@qbds@-MO<+>svQR6x~{3`*kS?+kITl7MUU
z6TY*I_Qljl)j48TSzjr3TYtG_NpZhn{6Gl*0IEi!{{RYx$1aEFR)_9Zd&7(-rZ{F=
z4LmEwW9-o3Emerc)b83xZs(1~w<!EgrNpP)l>$?s+pLlr6cPK1%(t6Y-Q+@#_L80|
z{aRJmwhTK_Bpf;;+DRz0cLv*$An}6=?QXe8P}m^1B@QT8+(mVxgFi0X<=G+lp)R}i
zCk3m2d-CRxkU8C_yuWgteNO}R*Iv8TLu60Hu4^a!$#|5Tj4mzDD6>V7t}!HBA~N~@
zs$F?4sQ#T+s<AnUo&<#$@lpL}-0xC-Q{}0@JI2!;OR?D_bZRshDEW5UX&n-f6Uu|d
zMEL8=eNUBUM^n5{`D9}e$VNH<KOYjhk^qQhT=ttJ$Z&U{=lIOE#mV7G5@JYb(P(kB
z8hs$AVh+S?cGgBNO_=tH)^^Gz!Aw_4`jKYb&vM<$t&FBLJci$G$V_w!CAX)-ZcD%q
zdel$XuWZjd<R;C&F_U+Y3H#SQnGqWcB&9ywaLT$yakqH=D@RYaRADAnR<73e`fhoA
zxk!~Ui#`o$WLz)#1;CWWx5lp!rFf}pKMQTAb)AQa7qRLD8A?Jhh;t*r54Qo$8k!BH
z0GP15&!OJnU6<R;KP|sT$<xWW_uJ*ZD>i3bCyHv6E9M(PQ6Cb(2^*bMr>=C%XXVCo
z1n49{+W!EE_JyQ+U?W4SQO$5W<`0;!3CfuAFK`y)GTJ7faH-^yHYre|l1ETM)!VC;
zM{Kx-mnfK$4;15o_ai>SyFGKmF)Nd>toLUW?371QOMys93i8%BN0^EQ@!dfnbf`0r
zP__{;iC|O4=|mWVp;eoXsiqLR^j{NS9!95B>mL#DLLo8WUER(5SuNp>N)F@mRps1l
zlhP#HX0){NTXG`1R@M}qt4jL_)r#_`4F<6~5OoK{a8sh`RluhX<z?Ni$-6@X0PO{!
z<M@IMi_Ol{$!kh)GTkA-m8hO=w$o`#N5KZ38n<NWsxgHT+ZQq;y#D|J!?_bHE6oA4
z{wk=I3`w-HB9tvW(?tIOW}Bb4K#Y|l9XdelPGa@Btm7h`X~giEi~a)VnB8I7*_Km7
zRs^L5tZ%Uiq4wy97{m$AQG`zeA|n0{uTzUThXX`IH0=ImgFkP}Zw<$piOqGB4)tl0
z%<FWTfD{oTGL(w!O$`Yf(wb{%F^G^NQ9KAPJ>d%Mc~(9kmNQ#2B;~VX54h4=eFSu&
zI<38!poBFEjK%&`qABJ!5<gMX*(ZwyG7}GUvmC=Vyi3V5Y3|%FQd>$8^Q2J-rBa5_
znk5My0U!-dSyQ%eBJQPR%*&oDS%V)Y#8Q=~;9GuDl7D4L8=WZF(nA4h?@lEn)Q6^f
zm6s;0&g}NeB65sk=CBNz81oM$tEIi?PsFq^+QaQuq;Vh+n(D7uqxbkyk^cZPpy2b`
zID_HDEsP7yz7xxW;u|k-+?Sdul_Sb;=Q%uq{ZKh2L+R*s=TXdHJQj}KR=eH`ZW)Yr
z8fi<08j&s<sqlwTqS;T<Dh{+V^R`z8=A#$_mT!#QF-wDxr2;Avzo|g~0Haf`LSfY@
zRq+%8D&<<HNV-Yg2nWfpij~m*oi)TxAOu?Bvs5t=uVQPtDN4NKDW(AN@`FoBKlRAa
zw!?1KYgN>FUJDkxq;o%YN$amq5?+ENknZ?n*2g^fhJw8Y!oNn13mG({xp|9oY9f4z
z$Blj(k)k+~0jz~S8ki(16M;?jDFhuvg)tt)UNh0&M<+n#<5~?2#W-}a+`iZ09m%ts
zMo$U3a6u|)sBv|N3TfstvGFBC+7A98jkJ7R%Q5A;B!vrUjiIC+Rx`VOeC&0BcL)hp
z&kcmZWvMNv@!2cbt@I#J6R-;#eH!dBdaN?O6QsL29|e;<Nm1SxICr-z{{T7UF5H$!
z$ucR;Ak&v65(irKC+r&9#)Acymt&*>c!vfm<JXJsbTlTUfwtc5Tm%J4(C1Ncnq2c8
z;s+J^bS9uA3j4MmIw*%V0#rCytc&dN9umS{J01s_JNOT7+K-jFAXWF+Uduwg-B8@O
zyw}3RX^2mlu%opVQV^Z%u|G)~r;>JXT3EHe74<Xn{p`*Q+jwR@%0o-Mygb#VNsgz|
zk-Y*?x_~RT#8-NaalKA*nPt;rSF|qe#(f<2x4oUOl;3jf@#nR0Y$`m}$7oGtr6EXl
zr-%+ER3M7f8g2+CxzRF-_)i5}FECdj70dpheJ*DHoM%6I#XRe`Y`$d5jU{VAmk~g%
zDsAMBB}ga<_>vF5+D{yqSbNr`P?W=ft1EYQqB7)?w<`uhm}7-$L^@JiBi@ov*`k_L
z1FCGoySov@A=ys;2$~##v>qytAtVY^Z$d)Sd?<a|9O)_DUI!+$X3(S}(7rNTWXWNM
zR*>pSRreEJi9&(lU5>!)bwU8eojFuraxby1vl?7SD66wFoQZH`sS7gWvQ`>Wb^%mv
zNg#qp5n6z2u|!GsehQ`20I5Bj?wpLOJX=JmNfKI)($GZ*CkG!jAPu-J3PDKreVU$4
z8(gaO+)A;pmqr^*i>vDj<Hau%{YMe=8`JwpI;kEkr!H%od#&6j(*-t3B$Ub$CA>i=
zoORrsNFQG<ZsS%T!DU@CKvY&&mQRr`OAAr*{OJKIuToY=*jwM~*1RADeTy=4E`l+X
zE9VqkQ3zU`OLaf@Y2o_QqHSa&Em26l%Y`_*ZBqF!pTkq`1dppsD`KSS3gKYxS8=1v
zk%C)Zk!6hWi!yRhr8L@>LKC>!q@Aioe#*$?!Uc)d8muYIZfzGlcN+!n9v>=Wc`dzR
zrKrdA80M1OuGMW476-y<N*WsLP7xCt6<W%SOBGy1?Ur!W(b>}BIO_>gp8*4NLA_GF
z{=j-^e%4^1kdNcg?rzFMaETJYPvIz(tQ4zs@ibRmNW)aaRoGpNuu8~nQSteND&&AA
zGSjqB3Iw_+Q`2;vkB+Vl2Z|!Jd$SRE-LA!Oke(0RWJpnL^7vGRj%Wo(aq$8@fR7z~
zgX)}JnVB7ebNo;Jz6v8rDY&Ep&~frNOJsrm@Y7sflm40@8ml_ggjjoh8gumdneHv6
zpKlc*BlT#t%W`OrC{{NqnK*pu(&&C+QeqxnA*874aEHdGB*-UeE@_BkM_2V!%Du`!
zCck0Sytk1<B_~{Nuf<jEPo0@@)U;2DDy4qSSTJT!88}2D<Sp5;81VM_@|LA7Ud5?h
zKkCy=BE>T8-&m7VZ}k_Hp+CBjB`Z~Zi;UB#KVjFibzt|;?Z_^7EPqh=s=FR~M2V_t
zrIb(?TUhFqAoBztan%T&x}XxQPgdQS%{@#+w|a!^L>1pMcbaTvxaGKoTp`OWrKeqP
zHF>zpibzsRV49OqDYrA~e@)$)dCSI*{lnvk`GmQa<_{e?y6G`;BW!!pcc+g?edWF)
za(lUFn}hcH1enfDzGV@ew;?gOA2>&DT2kY#5m1DoCaR{fust1@k!)pT4NwGbG7Q7G
z9ZBr(M4ZGyCxUeEpKvX`&CTzb1~`J&ILT@arJ^{L!-~>kGC1!;!3iXLb?BM%jO=*)
zya#{`7dL&rWXVb_Om=QKmcQ-ek`jHoq+rLzR|i&3w`?o78IPt5CMlKYk?|{JtMrV6
zC4~+%mkYJQsH`R|80le!Bqgw-;)0z}NL2^~jjd$#*ydrzsahc&#LGt|v;n`0*TlLN
zSE<yXxSl`gHw4IBhmYb}CH_OLt+yxNZ%slg3Qbi;ZSC;@({1ajmHKz3!Y#6M@soZE
zXQ=_eFCF#oelOiF;aO$lR)?(dt@fz)2b-5K=Use8N}6fqyriW{UzSpmRk^0Na%_dM
ziHINwfvIz+dd|tn7RlL`yb&{Re<zJV9Oue)xa_z6XIxlqBkQiS;Zc;p9MCxErT3q|
zzMQ>0WK%m^Z0-Abo3;t6wPaVz#nNmyB}`#nT%i%TzY8dB(4-|sq|<PEoUWnjoO~>q
zQ3`kL(o!-Z$k2cX4SB8D;a3r;a-imxF5l-k9k;)|g>m!R$@3LxxZ3UtO6FMZ?6>DC
z8_Q11ZEcXYm*Sn3L)T`jDaoK;OYJ3yJYsu4fmylO-d3Z5Lts3J&NmrGjjR_|K9F=M
zomCD=qti|+j`s_@(5yL93%INVO1xYmpj60W-yL$xRNB1MfRpYgSMV#0toXP9N%m^3
zV$>%v3g$mh9mC4|@!X01%+6)0+m*>>rXqzOA`Es^LlI-Aq8ma@00Z84B<sq0w^Oq+
z(`?I=_YOdJ1<}GTRq@zv_1gPAKHZAvO~|-*ZvOyg5ps)EVwJDWj+GWA$3u!rQu|8@
zAype~?4dn9>M!)`3~h5vw2&Wh9pI&9LSTcyt9ttr)AnE4ysJFzUB2v_wWU@_;^TjL
zj&360^3p<ChJ3L^x4AXzw!I4jKNCKSWlUx^ZPrcv#PS+)Sy?!ct_~egvt<X}bIbeb
zSg9V$(?|vjHCuh^&%0OYf;<cz>`p#s+@F<;aJ)~yJ0X}&GcA-z3`Alpi6n$LkX%`)
zJq0!uI@eySrC2GALdmc)GU2Fp0C#g+nD`Lb47DYG<(BLQ;fGo~ui4g|i`(p>nF~d#
zQ-$Ykv*0=yn;1B%sYo1>q$ut|)!}VfHNzsHL}vPS5uqQ!XXfLIrKbY4dTqBR@87#V
zH8bM0-QwOX5|DZ=srI=H(2o(xK>b>?(#GpNv%+AHcq$l2`hjx`_+xhd;LcB%#GgCM
z+oMs^8VdT<4!jEdgB^PpO&Dm3*}G95(~npeH9y7AdQ7&tbtqL=PoRJ`EUutzh-DbV
zR#mTedwp-3<crHKa(Qj?jEa8KisAwO>8`XX>N`wgm{jhPvQExAo4vByp+-~WE&aao
zoNy|d(5E|aKGZW)vfevzk1((hJdpTF6xxQQYParmcSPB$xh@7B-VY?x&q(`5y`&Y~
zI$w6t9$HIkO>6b)Y269A_T`&`50;Vwwx}A2vuY%DN;iB4{fx=^jtcSt*+3Eq`n77i
z#JH$RvZY%iDs>kf!rY<NrEV4U6Q+>nke6yI);%WR*A%Fs@%tx1Do)GPOI+J?<}}vo
z+Qk*(2<f=-(~pOOfjgBI>Oau5EUlB0cATONvQ)ViQ}D!lol4Zv6!MmO0rx+<TI;9j
zeSE>8W}~;Cx3yzt^xf|$XnPk9W%$-fiDWXZH^^^9od~6w4M|Bt!-@*xsviSQh}iY<
z*J(|WvOA(&70%fc0>m+2mN@gKLi1LzuQ7aGt$7M<PqS7;v_l%Fj55;1MF8`B(l*+l
z@vT7s>}l@@P~4`j{?TL*@dpjc-x&zG3IiduASfhm3PA(|UbGskbayNG^JUh4nmgYH
z@0i+P+^0Oql_{8xxgBjG)p?5G5~VjvCw=wLbt+6CNDH9p)(O}FIxnqO4*p}<wl2&I
zY{tY0Y&OJHCB&4`E%6`}riXGWb;3^~T-QW>I~!yRar<_qOuxFeY|a9rx#T+?@<XU{
zgeVH6jrQFnj+&)Bi5?tRO@q;eJ-v(O_pVGX>Db)4jIPe&6@cH~LZLRpA(X^hRdH;r
zBX7IQiRwpQmDgX<a>h(HpO|r2KA`D`7JI<>58Qs=iz?r>9on8#4g}R7;wE|OsjU{L
zQ0k8Uz?yw}+P02sl=GKCcB8tI?fE=g+j0qI#-5KUr5)5Bj$8-bP8IrfnSB7oyZ-<*
zNMEa}hq_(bee3<s#{1vHv3F)uYbrHu#iixAq*tI)R!~6jpzzkVB@GaJl?$%ah3~W3
z^vg8sRpJWxwuP;^JO0ZrI^QAwz&~%hM!vBp1qKsfuX_)87kt54dQ-f<VidCJSN-D<
z!3XIDXIUp7Z2iBQv*x&5@!ibzE#6`_@c3e|%T?a1ZB7Tkr}v50)-^8^;<InDh*d6I
zls`T}xJ7h%0p}72v?8E?NY<1z45-gifn|9Uka5U&6fB2>rZTD2sc9y^Xs_3%1&WCY
zdlSv=Ft5d{<BL>X#|8-tQ_59RD@~H2)Q`Je4*LkwJXQQGP37gmbe1#TtWw*F#KJKP
zLssj1DsZ~oWP%=A+&mQPl=B@>1PZUINZP$=!wi`j60civh}r^HU6h=K*wWcbtTNNZ
zG2|qzBm-T7YM=#4uk_bi^-E}Qv8|aWRJ+{lCd-UUQ_nKVwY;=88*CT+qO@^PZDlRE
z0H^IHquX6-QIWY<nPpwa?d7&b_(PoMloiBAb&e}rZW0ufS8hU^8ua(-!D%Q3eR_Gq
zZu6%#aD>}yoFpz2g};TemJ%D}l0BqQk9~C@rX4W)j=8Su+#FvMrCV|_lB39qI@*9r
zx9d?<n)_?vua-T3UzMMiAMZ#vi4iaDLw28nlZ@ZmQY9=<HdK_P`;$|)yyDsp&=MA=
z{_o_-vSK*Jtp<-Jkul*~5M5Dof6=F^qviqJq$lvY058r(?bWUuN~7`~eo~ETv#Q*m
zt5@r&IZ!q+W#b5N+u+@<YuGYeE!V*+P!;<0j6Nj5?g>ieH8<Ov%s2ahqWp?`D_VVe
zoP%nK9Rl}gXZhY)3f(M$Z)w2n!{8f0=115mpm(VbE4qDXytn;B-{gM6nzOi(?NgRW
zu70&^**bv!vF`)$3j;I!*?qYsOdAcoPea)g3@v!wytf)`w2GmpUrLsQuAMoAC?>sV
zbxKe>44Xw&i#n5iyG^#Zo1L-uBRJBi)2uB`ttv>VqL4uwY5<s*8We$KEu7ydy-0rJ
ze7Q=T>0q?q&d7EC2i@i<)9TfUSt;ovN_i4^t(ImkEn}kZ<v49z{Ffx~SCk%cC22ul
zPDCV-D_yl-V3@mbESLqp#)2Iyb7+nz5Iw`LnqUxwBk?*jbB)<f+4hwBgYRGSOQnuQ
z-TZ3Vj$`R%g8Y_aCTH<eA5rp}C|B$ttJ$etlTH;P>x8AcOaSd?)ba~Y9~L%8ao`no
zb^Ok3)*HNN{jTihA8xn3M29j4W?$vDk?ej$jEd98hOwjT85i>CghzYG`}A5P9=Py`
zO<j)ldEd_e0D6Fj+gojq1IKYjtyc_|`F~a!9&hsa7TCr^uK7XKsX(Zq0CF3sYTu{5
zLzmQugI661CuV>S=TMv>86Si&9g6aW>Wc)m$96Pq;~;fN{o=5^V;095Sg%C6Au?p7
zeFnPeXKa~`^Zx+B7)S90s)s(f@CVocRUdP4PefUxS6TT?4B0cMKC6uDgiF1p*)Bfv
z{MQ{KOj43mqg7X2{hplZ*4k!#-Nnf}hd*L(^*Hciyx@1wOWmvNPG8!t%uUJXTrz3a
ztC}0jn6-xDxdBQ_%WhlT+^x0H)gA*{nAkY@G)}tAj`9wzqj(|Y=EBOz4wvLz8De;G
zN8m#QZ|+TXQcziuIxo)4_j>Qzj^o<<lW0m^lNHsiaojXR%q$k2X<c?(YALNYuCCEx
zreZ^qu}y{&1ae+GiRh`G=U*PpeJkJXQ}Bz7rCf$Fd$>ik-R$Lm8ltHamWJJF1o1<N
zS*YvMr<Cd*kCnC=;+U8p<t2=Jwc-aN>!7bH6AtRn!MlIkuTG6b%loY&(U*69FrSHO
z#p5ZvrKS;hQOP$4llV?4D5_G@3EbAb3S-heH4dLSU6ZoO@QglahvzOtw=b|A`LTd#
zmne=~>Jzv3j?3Nf`xYM)8@^thg(dkG6)g~4`3F?Aq{eYXH9)mffi>txx|+^Cbxt+Z
zAZE|Efo|?xPX(WLVX_-YR9%*06zZIG)eGdMe@205R6;ZPm)+gB_s&G58X?O~i7EOO
zXpF7C&2hf8i}e|Q!yoxV>EkbecqT7T_lF+zGi10*B>5R_`VtB74nT(C8~*@my6AcY
zKm2GNmP_ypFRDqzQ}?CjgTA9M_u3Rmn5W1-2=Z3ie$sWV(x&-w@l|njoP1S3mSTxU
zb$p!p0*Dso02>85QnOFA>*u_`l#XR|;G+G_F%ywOn9>3*7C1<1GDh5-;8Xgy(4kuq
z*qjwoAV#}LwWdl%9gw#GJ}3$#eO1%U%XvM6_#(u7E>s0YZu65(nZy{-To0>lf+M9z
zf3I42P6KwJlEnu3J~*HAvY+A>@5}*D*+Ad)sA;!r?MB<8($&UHZ-u~p$^`4)*Jmh#
zy+*zW@`KKbwok=POcXiAJmE4eHwThk0JeG)wSJuj(V{Ig+Et#e*kYMIr-*F|QBSj3
zle%y#QUWsyozMFU?lU=4Y=e|=O3N$Uf3kXwXi=NHimP@za6#>{8V8EnAxZn(zVd#L
zZmk)*skOMNR~t(bMHB~>Prja`?9+)T?FcWMG78kwh%Pb>0@639ylFQy#wxk*@276s
zcjp~;HR3v2zNHKDB{TvaY^en`N~ynE(9~DMS{NNt+(Pj>9!G)x)mI}D7lx4b^IRp}
z-%c5)V(&_J?iD7=@`@8Jw5T-i9)(pWis`uo@8C!WUWI|wtIChUSo0rlE0@Z{od;eW
zs8&6dHo}n>MHGaZC19y4+uO&-+p*QsRZv-3_|4(?@RM<dlsw7(v=E_FwF-Iz^#iCK
z5o0AOuI^p&e2y*R+s-A;rGkeLl(uVMY4INOs#!IOM1`k?d4$32E3-Q<>soe6gs~mz
zN?WQx33b(;T$9$I@3&2Hc|9}<73uh$L|G73`Pv@#w|j^!&&VG(r391$3FLZo+orJc
z@b-n!W99>@f!#~JgVdF_``DREZ8PCVazk=eN;M_0qRmy~@c~^&2X-~Fvy-CdnB`+i
z069O8BDlK~gK>p)VTnmCKLHB!P=4}VE)=X9c!dgU(&Pb%BbxDB9x@>4Rke-FxIvu6
zwp4tCCBo-jlBmT1{aT?a!5XIAP#n9pcT4r{%!XBIC1K|iPuoGIe@3p=aD+fWon}SU
zn_f9L9k;m&#FV%S=xIt9(C7aEX<CHr+*55JB6duU^BWJ3U~MW(turkOQmbAvxFCIC
zCYp@kHxu^amg1B9g%0C*yE!B_N*LmRXm>+&DL-h{s%9b;OCn0FF4lXaQ9~(7NmrOT
z5wK8ntbV;*-U<(vQh#)Al44=91IpnswY2La+Vg7QiVq!?xYQ*k)e^c4<RX^v3}#YG
zcbkfq{OLt2UnLL+A<$F6ZB0~_j#pDoIDln!V$H3FnMfqQD71NpenZ69Z_%aumO?m!
zM7p*h!Lr<YU3<9Rq=uTbMvpEsfen;-mk7}uqLivshkm+fxOopE7H3n#*#}iM?Z`P7
zmg^EwYqFHv%Tkm8s3VD?8~BZewjm(7mng;$+t|1J%vL;-AToT#?ozj$QaTQlpdZqA
z)u>p=fI7Lmb(Pz!R;U;T9N0zH6vw8{kg`ggdDSuIAs)~IK%nbNjavm7)DHPs%Xdq6
zaMq$!)K{&KgYj^Xmps~nDk!jdS6%`2bET1dFOLbZJ|jo>0HJScTEy-SPkE?}pWi4a
z=_(_U`*r1JmnCJ+##8(Am^pFD9Ej2QP+7M|K=5sr!c<4spwU~+`<0-66*D7o;ryD$
zgT^~(X~_!q067HxXI84LZtzVlORbr0@BF)n1U7iRJ#H<*;u&E)huW<M(DPQS3=mG*
zM0wm*cZoyzx$mI}uU<QvevJ<<Oj%9=$|rDV{I`s`DWU%W#;!$c9@L<(%TG^m&?E6^
zl$UaP!U_KX$GeW(A{C8lC&fm?5PqSrW$GX1`y>AVC|Fse`iJewIr=-wZdkS#+*a+d
zV%=^I*$w43i<(N~%}uG#HP#A2sZyD7VKnG>p{AP~CUn(yz$8RBG2nLb9?<Nk)7Z#^
zz=dCAx&Hv8EdC5TulcHXZe`C~ibb0DY?pY5mrA}gu`=1s&I6)Lt%FXw!^Z3VJ0xy0
zl}E6HA?zcUh*m7=f&LQ6GZ`<U92VmqHS0dO=2O<;Z8mID%PI(QNlz*{Hu2>pDE_wu
zDAT6;u`aXI>(p3mJ&}nYe3>xmt@9N9+fMx3{a9mn{{T;xYaBdc$ka&LUvI2%KM`s+
zx1CJnI{L?${FmamS5r^9)2T7(KBE5sRGpM<5Df4Gx!+!7gZCrk;}0#OIBKh@QdRuG
z!-gosHDMI+QjX;4yH*+|hj1?EcKZJS>3_Lb1lg=N!xHh2WKW?^N3`Ez1-8?Vr5lD{
zX=-W33Y3FiX$H3v8JO~-Wt@W(*&+E6p;s{P5O|&iQ}aJ7k5}kIf0o!HT&;k*<9P%d
z&7oG3*a<>i`IX2>2%#$YfK@yzwz)t508-D4j6@uEgBJI?)~t=LNLMU;8wm8(+H0l>
zhFv4%UFFIciEYdB8&NB_!GRG$-{p`WPzra=cm+J*qEr$SL*dc%KA8@cj%(Z}Y`$VR
z0Q>>x-d28oOl0woJ}E~4$0c7~Zp{r%w>o@=ps?hnhM7v<aV@1zEn6iZoyqB~1~ZTY
zn#znHMAhCN>UwYVvyohTTXn=HcPF~m{!wo-F0$lVY|-SPQBB2Zlo<~sABURwrC)hF
z5v<;$>KtyLX{c6goJ$f;&<}9pe$2J2>Ck}qgP*x*x?~-;%{?#S{nlS?qW1H<S#{a>
ztv2X48;rj@8;aRrOmVr20UmsnQM#kzLU|=rI^M4M<YPwD0RtnZr-y2(pG|Ox5e!e@
zntd_byLjEpJI(vO33I!Dj^nf4xJ8bXspWjb%|;$qG5}afQ9-DpsA@DUduyT=TWEMf
zB$Pg#NU~%e43PW3*$Lgaw8P6W8A-qPe(KU+$MUF2CN!p8Um%BkT74sBwz?2O(2QbY
zEQExsmkACB_#V)e_|mBB!?i)N*q?66E@J3bmWPy|a{dy3PO84BEQR+9^t(OoJ)x6D
zu**%Kq^FX<UYd$r6W*A~lN0!kRIbXmpScOtV(FTjf6uKvT3fC*r356Jav&tum8Xu3
zDU)t*hx1d~S=&Upjv<?c#6@pt$=zqzgbJNT!Kxg1DPNicsB<{PF6ukp@yvGR%i4rn
zLux<uo2Iz$R>k^&m-nlO@Le1w@JGNWoHo=k&&&50O8}%hlw9UHUZqb$jw|+^bX^6%
zVBh+Z{{WUNJE?|@d{vR@bqI^!EKT=zTZ@X?KCnsEj*I^Qx`&DeIsT-4Rdd}#4$qdo
zZgQW@LK&SPe^tWK0DXeG@d@LZSbG60qcUKt&gSM{KMh_<qh+xfCc7zQ1e5h>c2pll
z5LIa}C~iJa^DH0WZRtx50nn%loj;YKRs^3!!G|==e%NK%bfpe&M=_bNK&83~`ps#p
z6vV`YtY8pTwI}%tR^T=k_hu1IfG?pS{=G}e(fibV)vjC=HtE<D_z!ly+iLAMl?Cf)
zK`L*ju<4mT=U#1h*%k)^n<TOgNIQ|KjZ>JbBM0wS%K+PsR2`^Jfp##GB{!IHO!tiT
z-+G9A$`Ya1Z)G)1V-Qu(+zAC*WaKe7=HVzH*MAUxom{LC6?u?Ws5cZz_}Kw3iUqWG
z3i>Oe1TwtOOm`9UQU3sXDinov_v&rU3skjpOLN;%Lq!sk_exC;ld_azLR-mk8$NSs
ze;dmpH!2J0EjZMK)hh?z?)LQ>u|?9RLQy(}8zCD365zOF)nBGugVW`~%$~>{o7-2E
z63gpJad4gRYC!|;o{3*W(C^o}>78OZF=;T6``0U-)6FHv%Bt*dy;o}i4M6ipns_+S
zB|%B2xco!@l-97Z`7H36SD#$2ZkX;QH2nZmayYF!P;JOpsi%cH_-ZC5NcG#bJobYk
znPR*~jd4<w3P+goLKJ=vEkP!LorQIon^@(=be%6W?IHLpHwo|FV`T2ytk$<y)vZR1
zJ<O7)fD2e6yHG6$>((wtI5FIKF0ThWc`+xDRt5>({KK|hs}mCb=R0mm4HAf{Qn|HG
zNhhJ?6bSkbvaiJw8@m?fA6ASBgYr$;D-kZa#me_@Y_%G5zHgSHLZ37x-k$Xmb<^P5
ze4y*k`s{?V42Sb;_^Sf|v$Z-CN^k`_>tO=D0aDaA`n1;Bv^va=s>Ej;fic+ZriL@s
zp!b&*U+L9jX>SBk5Tj&xGzDJTj_N>aLL%`r=&or1pQ&1$EIO2>0ERCDf|N<~n+Xi5
zrvRq>98Vfo=^8Py(Dpi#*Jh(iTk+P9iD^P>PXgT%e$ib7<g%1$a;xm8v30S!;cxi1
zN`jCDIXJ?~Y4n!&`gLNwmON7ZxMfS`y^eD4ZC+h>kIxRa)P;S}?4BHVJ|P?Ze@3Bp
zc;B(tNz(cml^$`?&Yl5Qot}*wxL0}RBZ0Vf!sBQv6iSO^iVtr}Y6AY$_Sd(PvFwl@
zVP0AaTyZDNDkh`@LDQ~^BpKCW6faZR)EpzW_WVLcz{9!UrLw6J+ucsv;-zl5T?#yS
zdBLJNZB*B&)y|qVGUTy(^`JmQnJ%lmM<|VWn%oRw)h&b+^Gie$I(0MyVNI#*9^Gw0
z%H@n5Th{*R+IwGP4Kxa}xuMwb0=_>fA+oomEoaAcr9Vj{rmj*Hz+^`YxVvk=L%LgB
zpekkLEdKyroCrTo<LlM*>f7$qjbHmv`{+pzxh6Pq00BUvpiKu&>GkW({-)Er5;Ein
z{8X(E6sg$UK2_f%LQ+44g&oO{ERBImt3&l~ub*tULb6Q`Qa$?Myo<gK!Cih>IJZ)b
z_Gu@TPxrd&SoLkMaaQ)|$?ov-u6evWGh0TF7~G{3)k;-D6Z9kvLaBiA?I_zAAvtHA
zk<F=9A*muPZ)XreT8Go1*(NGuf@#AVi6+pgYzkSeMYJ>H%}H&1kJh8AxjLTm$qf`K
zG8w%z*UWwJdDQqI8Ye>z0w5ZN)t8UVe&vy6b{O)zVTfEZYqL?)E@k2@`HmK2wur2$
zN%@2(zDr}nUBUIeq(75cBS#>f?$in6!bQl`r%W^R4a#kCuXkG}1B6?yme{V4>>D(e
z2@anqp+yqHh)^^j5nWW5ukve`!%aHr@}Jb4Q3#y?b;#YyitMX}p4%NX5qK3PH6b2r
zod+UMN)67q+GWKaT$Y=*Ec6TO(i#+cCAs%dx_|8xT}vqX!Z~Qd;RqhmQjl`24%ufH
zUeotQ8D=K1&Hn%zwy^cB)e3}3szBsA5ULQN;wm&O467)zHo&oroE1H;S#<219y#h_
zI{Sy&rkRi2_ghT-w*_T?#4{o0!rYf`O1F81sZ}XWRDx+r5wBV4-A1mjA2O{h{%CXY
zk7z#dv2$=tNiozaiuI1Io5+uFZB0o-zDv!#l7*!Vjw%Hzp#+_@Vn`+VEW;I%Y)iYc
zi0MzprJfCq$^1Z|03P9~iL!>(Z+7d_{#SU%<GY;5jfq?CQWDjn%!OYr?ZQi-A(msX
zsyIT{QaKO+2D|h#7<(Jckgs-;+*p!$02SKs=VrVWdz4{!97g$Z#I8&#Ey6R)WyTy7
zQ)L5^tE$s7f!i$z;;I<!aGb7v(ZX{Etoa9da2q~ho!U_z6dV1;a~XZqGfyZ_ZZnB)
zR{#L~P-;5()$g7?<WA~iImdx69lKjedsWzHN+Gza_bk3;{n+lr?Bg|bJ8<(FW+N>i
zHy$iVr^{uA8c)K8(l!8l$*Cmh_GZe{ul9HaPT3m?B|7%|C5hW>jp@9S+MB)!m0Q(n
zzuMH|*jtgFqKReHRH4MERVIh}K;e80X9<naklIIa?C(;=u+t~)OczTd9+W$EWy-q?
zak$-W8RyHvZ?^fpwTp{0BN;wgA9<LL0HUIxhRPdCmYwTCO><d7T>{F^EwY!L{{Tu+
z1;=iOw?M!XuDULYvMqy=r+WR)a&FaOmi0Z{{?uRbmYz}=^DLJE@-InB3%*l-%otym
zt-p3wNFMEJ%hVCBz4;ikuU<z-_KiFh8?b8!pRrV#?{@|be2Jal{+VyLi(H1IT|dq}
zz?VLCo+M||mk|5VZIPK}Z4{|ATaNJG->nICgH;B~@ubY}Cn1kL2M=md!Gue*_^Xfq
z02gxJ^mYMw*Qk73Et3K1>|U&ocJ{*vz-An1u0{;7i4QV>*izNM#CF|UA5H5w<Wgmm
zU6K-zG1(BnGic;~ekj+_ERNm*SC}>5(Y#LD9_vN{dKiW0f!tw&O?g(Bmr2&k3r$Fn
z4OWI+M5UmpZ(Zx|)H1s66e|`OU9^@3qR-gwsQ&<`z;i0Q_4Afuz18ks1%lyLySxb2
zoO%tZwd8HEi4Q}0<;{-x5s67knSWzJQA%r)^*>UtB6Zmq$|5iW;%6gL4xO&8*AOHk
zIV+PX?nh^PQR&M7?U#G;{FP$+bDJ*2=02z~o0Jw>Nmn_@SW-}sit!Z{)|W%;HR0ey
zWL0AmDFPS?KV$K26tXCdqyp;1v*q28?N@g!Vf;@sjh4k~9Q!<JDuATRLe^VngCUf-
z=QSj!;XBaNS{S{1A0F5fk91~rh%DqD1O|OjV}}Sx7cQt?>ET`4o863)CcESJ7*<=H
z*>UZT%3)!(EkHKJa<tU}!^`egy>{0R)Ouyqyv=fmku2l1=sbIssYtr6JwsS8SZ-sE
z_G;S^=^5LBxUSpTZEBFYt9#1wQrc>wvgg7DDo)zWrv}44h9`ToHm|{(wbHU&l}64X
z-HVmZ1)3&5aC-NDkuEKoBXONmlcYtEV!qsTfmNxu5>TL;(28o<>2{e$A_e4FX~mAM
z;Ef4$S1x_pKI!(muz2l*FtSXx%D&G0WlLekk{k$A$Z17GsR<^Y<EP8%cVkC=kTDM0
zhEd*SB@wmThF110czmjvXCF$aKX{l9I8A@vk@f1gkai~C9guhJ!b)~g3-*JrXkECP
z@~Z;fM%ypIjWU+xI({zdYN8EKh~M;S0*EA+WkZ*1dacwVyAjg5m@X6XQ=;Wp2u+S;
zt)bv_!Y-m*DNbZ4oZl+dG~T*nT3gE367>a_(%h59v$rpIzf8(pQ71!-Z<$Y+$=MH}
z>_@QbAgP0*{fS|fAtlJBpmj+Vr_rfsQZi+|j8MFihtt2Zo;`G!g$YRn%{yyo$n7$0
z7s%+7YL?pL$d39#kn3&^DoF=o2-K^vz=8`9n6!fs?!J3^r1U|Nb~^s<bA~qT?$?JF
z;<$2K*0#z;67MRhNh>Fc{(!CbJ-<ro@xS4ok_(y5>E@#2P*N-$ZRT&M%pPRLJhm2+
z0V;5;0te7Pr&~1K@!WY2$<|u7V&FxqtOz_m783$gh1ZWFw5mguBcS3^k?+=2Zx+=#
z9&%ys4fm^f`7)@I6#Od>xJvFloy)lLn{g5(t;KZn9a0vfQ{Vs}ZmMTaAP7f*`+h5X
zrR5X8Qay^t?ggSwK{76TkCn-C#Vxm?EwQ`ImcB)Ftv(tlP67RqsyD@&u4F&w_#nfn
z{{ZtOzK2C=K)5RY+ZhD_Q-(WT2&v(~RDC0TS;4nM9>lt(gUt+FF#OY|1$q{_Y{YZ{
z<t+{nclc3Ktq&sSsn7R-`_&rn0XyK?FqbtcaQrdK-$DM*I#d4uOF)gDWXK<F0zG#*
zQln(e-tPx`sf4hEl7H^hgZ&!Nh|u_zA#0WiuH|iJSb4-Ga#{k&1HlfY57AvpI(@s5
z43ovC#}-4;U!bGWT3M%w99#bY?bBJ7&9qjlA<(Yi;qYSG=S*-V4YZRXYa{NIq%BG#
z=tlZsaSH7<Z<I%A1Hsod`uK$lw;h+TcJ|9D2$Ob*C&^`+ejAR}=M+!3;-;wdqH--V
zJ*&Cv8F0qM5gHH}d%ue39?amFwXd=fGP`7i42I;lUV0OJzX?iRN4yH2hgw^uD>jY}
zvZW|Ojdfwiy=SFtzAjOEzRkLS9SIX9LxOA2GU;F|;Q&zaBzv`b>d5$Fe%ue<upu)j
z37t9nIQ|JI)UC1>ZQM7eT?(Cyw$lz7RS(Ow(NbuN0ZOi``cArxY6WqOR}q<zZJ8wt
z?3`#Y;D0E$FqW<iJM$cAPnc!q!dz)Y?@_vvbzzxR+?;Q?(-CCGlBY}UEIs6hO-d5u
zb*BFSPOak<;aGjXw@ig&Zs#O<j3hSVkZZa_fSP>(^3}jpz*ja-@5td!%6ZOER;Hf;
zLy%IFRRBTgPWtojsWxrt#k)s`5%&BP&jeq#PQ}GLRVOHMiYD@*Xs9(%O5I6XtM5o7
zUpUwyDF7ew{vVpJF`}s<;!<th*t+DilekQhl#kgJ2|`Ev0BYT{9!}7oYG+g+yyi+-
zsBy??VJrU6%l`nTx}bg-$Hh#SD1GMKW8sjdMX#N2ORYRTq0>|y2x@ihQ{)j#G?8TN
zgD)si*I4H7y>2>b`ZU(X>`)q|n~mAlracj@oL7{>LVcwJr`x93<JzVUsly$*3wL?{
z0Ghrz$Ff^_Z_p_b!V)+7^s9rw_^6YjbhNbmTuSIUl|6Ws9U%K!E9QQ!{{Tj+8lKMt
z;Of5;hAx?D3LK*$gE?*<hlxu_A4O_(FbD+qsXnS!Wi^!B(=|W8p8B{`{_ZiNK>EQt
zuQE*Au}B?KoB3;O&bmq_u0Q3qU+z!=`t^3I{{W`SLQNv9EI$7LdB<Q5;#lRo2PADN
zMYe2Jsi&KKsSKrUtpq3@yMy7Xm0LP(5`iF%K^ig+=TCS40L)jsQJs%$?j5Tg&Ls0p
zRv*f&?Yk`vg>fKAg1FBA0M;kpU3T>P*D^8wpoNS-nmYT#CNx5PLOWyi_1s7qE0Azp
zV;05b#YrlkWU~V>EomZ&df@DWp1aTuLSDGcIzkoJdt)7c_=!&(YU8L0KI_~(%P{T?
zJEw4NvToTNxS+c#bIWncrS55`Bk+M;fS?{4<ocFfxn$1C8AzTa>%~uYiql7{+!rl<
zn?I>L6SpgjXzl#ITVQdvF9DE+At;jD{{Vp}VL+u6s-7pVyDUFgk18?Dftv>39VhL5
zCF7!}el#uA=v4IG{T<E4nz}Wc-V<zP<S55ofGSO02Z{=lC(Ew=YfWm;)IBe0Cdv40
z*YRacbnSj`xox+4mF&-Lq<qI|Foj-ivXk<cYrbIc`N=V41vKn<%)>rZZdCjATBvu{
zY`u3)QUe;D!<m`Xj$i?#e0A_wDZ+$7=A>tR?exWq<MDHha}c}V?kn<LYSnhQ$8Orn
zmsEo4qc!I`hSk+1j$H}gR!6LGgm*%jnRZBxp!+o_aKNk{Yky_C)phR1U6W;5rOAlh
z!j*5h+OdgiQX$5JHcSx2W@D*jC4s;#rp<OzhV?Z#eIu$_m!D<U$O~s&qXKjSOu!D!
z91io^v?N$COC7q#GhW}@JBfeqt+G{@1G(AbTcKO;Ot~F%?@6A@;XfItf>hv+5aN{L
zK}bm=zZRB0HJBK=G02I8Y=Z$U45s600P$@}BS1V*xR*k^tD5%Xwf*g}_cqgNpK$Jb
zSUsA^%H5wGt2=S-n1fIpQ}NLqPP`J*!Sc(g1z;NOO>J4#D#e{-0&FxuaT|544MRC#
zcs~@!K!Nw8xA%_Y;XSy%Svy;P&62D=hTFbaWy)?VFRtf4j4iezK9aO^3pH3YP}|2=
z^RW$-Qq)e*>44yt8l5;4AWnrC?dAUf7_)j|?WbaMmypMAa=AGKIg*#s*>YlJcWw6r
zO~7f@6uIqbYaMB<>T@AHN+_`Z08ZWRf4V`A*?S3N{{VE9$AX9IKM9p>^&bM)dTk%(
z3tlye+GHWMrNp%Kdm|0Ll&u7$(L$9Pq3VojLfF=L#=61r5dlBTs%q}naQjV@cPqCY
zzV8&ov4dGLdme9(xQ5($PTZhgu8^kN6Xb<(`RJTSB?<+!ijXU<%!{%7iYUCaMRAbt
zB2swwZXb9GP%JkT?UHwSIS+eqc=u_oM(&1L+q<LInTuLlLpMnm3B|Of#Sj`RZEm#L
zBvDF8+gIgjw%Y8G0?Ff$4+fNsz1+a|Aa8a(p(gra?Wb^iS2MXe2X}3<tXS4Sl}EQ*
z?<~0$Q>Mq9)A1J>m%>!%mBnlG5(r9bzWd=r4$NvU7evMqg8)N3oEWe?TT<hI@l8=6
z>Xto6-|ZOYM=$diMELGXu-P5Pp<Dda83^te{sJ<~B-e<F@VL}|(`0K_sKmr)lksh4
z{{YqbUA#U&6!SXn`#P^ZBTstynEFGE+PuYl=34Zxi{c4I_2m+;WqtZDPJrKs+-3g&
zF+_~C3Fp4JJez)PXq_v!_k3d($J-HDyj`A<xNo@QN?4BCUXIdv(G{p!*d4XabxxjP
z5PX?dABiM`-M}H#TUKR9IhNah&P`)UQh%NEcKWw!E9d;nYC>z*?s6Kb<st9pi$a)+
z@>u{1RQPMu$X&=Pas$(;$7BuB#=bfPmD+VuUxfS70#esGT{_Scpqm)7v?*}uHv4UI
zJe4^xQAc8sG-#Cq5OBjwQK6@W4v3=4d<<;5o^9@f?DpxzlnRS`#~e#!^#iB4=`vv@
z=NrA;EDo5`Q|DV(_tL8DJ=%c^XHcCjHwdJq=!)eTThP*}({~_{QT7~+>tmUrJqYpB
zIzmb{!qy*6SGo_6^o=r-Ov&x6Jhexf*i$O178EL#B|?NN+6dHyh(!@_x$C+fi7n{M
zV`kVn4dd!sjO%TGbLSFVb)|J9;v}T*Hm2JRvDXcFvx5^R4eVz3E_*wt?0Lh7Fos%j
zG+k$^Q|RLL_2oX&f9`FqER>V|^rw*b4Hx&qkTv*fi6_2C;`^3EfTmk8==YiC<>dl~
z66#napZih;DbUal(XC7Z1P0-&KfCy=6&V4cXX2~~_+u6>)w+caGS?{)niTOZ5kd47
zopLvIVLqT{cnF`l&)}-cUlKEH#$+$$ttr|^;w+y6q`aYD{Sb9`52%P&Ws*9U2(daT
z*2{a-Zdbdz2`P^ihl^<*-U&*6)2uA6t+t>K9l-nbRi$A7BM=@{jyqzc$qaz^ys3U+
zANnI!eLJ1z?|<f(+~4-A6j{Yfz>@p(<hnlRFTL+tf@nV4Yik3j`KDdO{pAvglP6Zi
zj!R3H3e8(oauxIkI{mcPt&<NC+O-6oAHwg;xn&I5nLmdbBAikFugB&O(ttj_WMtU+
z5r=c1dMqcaDZS0fA)?<RG@=7iSzK?30y(8cNvJgIS{+$5?$f*SS`_5@QjCWp54n8#
z^+R>Zv!38C72W>;m~JxB8ILPwyp#%YNF?}=uU!X7>5<2;O<z?Gwbty-n~=b82p?^2
zR|r_=`D#QU)2zMCG6g8)a^Z2H06)|qAAX*UA}-u`DtTQ?`Wr#iuqm?+?PeX@rxdJi
zFpAyDZaFH7Spjb;by7l!38~(LZC@Dh5+$`+HfLI6vGiqCXZDcI@iHX}IMac^l?sKn
z(4vRbO?9Icns}iYZLO<S=54uvK4DGy@mwQ%G@{u9?LqpqP*P2E?e9LrQyJZ~Boc%7
zkfke$uhvM>sw`B;1!Ce;61;rco1j_~<N^KPgrBseYT!hQwR6#Kf!i13hmxsoc}d`}
z>xBgcr|I8bZS@nVRr@<BJai-2NAOdT(Mq!1VqEZie-L3@nqkyGDI@yCfImk1`Q{;q
z9%vhNN>{7wNm;}8@@XRI`r@RHh~R7g0NJL9L;I7IU2Hbx@zo%4lG9<6UZj@ks`eL<
z34)6r0k~rF*i9Aq%ohRhX}0$?`gHB5wN5G}<OyA|muqNMxT|HP)4(A>{-dV;XG5=n
zK^wIRd8{{3pW$k^)=y7`NlF3wYo`)ur71Ec8Q|rUD9B0vB3q5y+dec?feQTtO%u08
z5_C={BKceiyR*iLO3=dt+FJxD{+$N+5vrYPe0z#5I15*21tm>xG*ExB=9SXFR)S#V
zl%!b<yX380ABSyh@)qci$WR~Gc$!!3(0reWp4A9V(k1%fxbH`_M+H*WmYsC}0A1II
zB&2(QKW?tqU&HNEl$Eu1p1Ue+*h&pwiqFkRru17)71aF-U4E@+!o9{`DXY*rM83)L
zb9B#?D-r`gHbRcY)u)<k^^kRRL*e_Bfk!)ae-2*Tkud%{<xV+My?B$TLJaBUCJBw~
zl~Ox|WiojpD?ya|zh_m19wY6|4rk#(`=OJ3zEeG>&do6u8y^(5LH$~lmAq3#uiF-8
zf5-wdRbMcrWY_-bVxOZ_@~YLlQ^!=_WX#%U1rE5XmAKN8?^<2te?Zi$p{MLp+`$!v
zkVKJ=T<vOISQLIZJ_&Q;r_`aVf}NzG3ljD(oiyRN+Fw-}kn&PRcCRlFw@NhpAxPMu
zoQ3Rl7rP6_kFBr|(v@=u>jzMs8;CuLp<)>yCqvhU<Fo)=#)94h#as#x>aL9lZE}#C
zsTejl64l!}&QCj}8E-n@J=NvOSHuN<n;k;yjfak{`6KOQHOqvBhMHLAIJrb1bt)+|
z8li_THsS{W6pUCVJUaB&35eV;Qk>xPEEO%!>bSI%_Jgjj6=}Iuv^xb;c6%aK_qr>(
zI(bKp=16s9*KnVQPhLLa=h&L!;evkbh2BPW-V3H*AytUlRSAVx;Rr!B1MAj}wSgZ6
zR@m);S4VDdF`KzvE{xGIVIgd`eXDTQN9-ELraokkid%Mt!`<e|QI+>ID$FGwR$F_H
zll@m6NC-kc)2$4Fwo!z5m13%&RQu@O#+*XWbMF25G<G`+EOYQ$fFKI!&C9V4<m-v#
zF2%(sWfv7z>v)h>3W=>0qOWh&p!r(4P^rqP+sj`)%X=jAKNT|BWD5Sun{(m)8YA=M
ziR6}Lct-ugy7c|8r^jBC$#*={J}dW8*ZsbqUaQ!zSH(8P>OXhm_d4{}eAcC05_fSw
z?LT$n^!-{b2sZKLt66`%{jc^q>g-i?#fyEx``(^E)2SfXrd>K8>HeKE3F3fA{rUTz
z9eQa=SPE`C{v-DMKIh%g)Fhf&{{RX;{{Ua<@Y94cjK}`~40`x|{<>u4F693JeEr|{
zw2`2+TR-97Z{F#rC|2+)i^#w8GVlAp_;CLK4g0U~hx|YGf7hXAf9-$qj}BaWmm87u
zA0Av5VL##8`@Mdz-7o%wU2OPS;C~UrxmfK_S-1SZVCnw=6i@rV55MpBYs_K(e7q0f
zRSsyxPx$kFKJ&dg{nhmTooavd=Z_KjqViI3FZgx$?*8q+z5eij(CY`P{{WVM{{TVw
z6;AF5eDCqje|2Afr%}`THL2-;mPoYlMzCM_asL2#kGa?P{yzTz^=n6>e3yU3KQ(h7
z^G~+#@k8%_g<swKzq~r@zv|cE7LekKcDMd`x&8kD@W}h0d+(#BvcLNI_<nqnr{^j^
ze*XaB-?#oOe(&f<Pj<R2ZYs@-j&slX!WZuU0B`U0`>Xr@{{Z#trN;RdW#2L@kACsb
z-2VWFYp?ec)8DAq#SYX%CjS5f8}EMcA9v}|qs3EIS9AXW#3Sx~=|6w(bUl6E-+rvc
z4Jczj^AunAZ+-s1bsc@)-4ZF2YyBks@7?`hd}!6F#X4aB0Kfg7ul@f3_s#zR&}!h|
zi4@`7{{Z-UzkAW1zjw!`zH;@~{`!A6w}%u%@}s@4{{V|O*X}3p^!u9gsQzjLf<k})
z05s$M{{Zps{qDUN_kI4|S{xK7!C4Cb0GwUv)g3?G`0Av-Vx!GM?f3X=r~c@_zxR56
zy%Nqykl>&|{{WM3{{Zh(_qu&rgt&zm@GD)L_apB9@t&W&{n~neXWQ@8d8kcCKly(D
z08jDj`<*|0uf6Z~X@AxpAChTsL^4nL4<Gyg0K9+h{_CLo-u*s*$uDQ*iArJa2mV@P
zy?=Pm?!NEb@z7z!rnBWrn8*Bn^Y_1YkKXnBho`&QsZW4a>g1rx{{YRqH{AXFAKrfN
z_f7TwjTRpwEsDjz{{ZIg>#z7pAHDki=eyhP)f{df(x3T#iAz8K0F7P$0N<ngy%X2_
zI<hz?mn9bl{{Wf4?LTX;PM@=<JQG{NGU9*pJkPz=zutBG`mR1uqd$=Z?w|a}cl+H_
z*RS0=enZ7Pc>5N-d;U~U-u=qHj=Ba%`HFB%k$>ciZ|^^N=iTYk$KRsI=21M+YiIZb
ze)IPYec$)0``+zYlB$($Kk->#z5V$6pWYob{{YIDG{N1E`KCut@Qi)Wz5BEG{r>>!
z(8tQ2JW}o*{{TB$y8XvLdG~bZflfImk<v%r{hzt}uBq$q)d+Da^uAD*Er0X1v#0o<
z+xwq!f2UQtSNW1i@<aQz{{WNMAK!nAKe_AS_x}L1uExKRcp%%y+K@dze}cY!@3_Ca
z`_H?pw0y&Y0sPgS>2Lm3ne@H;pWglR*Wc~cZm0fCxcd~R^M4g*VjuZ^bNl}Qec!qF
z{^0xG{bqE3v#8|pTw9cX<(=E^{{Y5U)9?QHe*Xa7tJi<;zwq<%RtLzgyMO-x^LLN$
z6aEwKf9pNkvyaAVu15g8PyYav?cconi2dK)``#Y^0B)ye<fV+Ngnx^3{{VV#``>YY
Nr$9d_`*tfU|Jiw=2~Ge2

literal 79258
zcmb4qbx<79*X2Nf;0Xk`U_+1q2^KuT-5Feh!@%GS79b(GyE_cb;68YQyAL|J1(%?K
zkZgXn_0_jq`^WB{?!K?9`_z4>x?a7iEB$xz?*`zxvb>T!00RR9p!n|q{M`gl$oV+f
z0sv}i08Rh^fcx+Ihreim%zs$_S72gdVEj8VF#ikxeTVrUC;y9s|Bd!v^#AMl_d9?D
z7vmYm^%D$c0452>6B3NSeSnt$0LBySf6o7>+<z7e@D%?EHV!TxCI-Pjg5C3fgeRC-
zPq1*Xo)Tc=5#eEAKEcAqAptzaC1ra1LP`sdjM)O8-0e%^ISXH5Hw7h?blvnOH4Q5}
zzp#?F<^F}Dy+Z_?LqJ4E*T5&O9>^xEqwf(Mo}AG%G$Uka<(||sH^1<2BKm(4aGw0P
zj(<`x|LJ&&frX3r@3kfg022cf>pwc4Vm}2u#RL3D2MGY1lnLj>TdAkaT4WY(=eR6<
zUkazmrL`05x@TDVEsHksWOQ`hgD(VxWkH@Pv;Wk2d`(JjZ2G$lApAEOCdm^Lz<WUc
zKw4T_7!E~RT9>t7{GiN}m!6|5;<8Rn75?(*@;@8X9LSh5Y8$ff&I=`*Uv#jD%W^e2
zU1iVI(BjnAXN_B}vmtpF>G>?EKo%3H?e|}~5<w5~K0<S(N5^`=Z~Cn#DVK`nGD#Z*
z$y!C9Matwju~p*d_I|3EG4rM9<#D>bqIJzDX7lbAe@FQOr8QP%h!rNoJpFk<KUg@b
zBMB4mGyN@s&)o*&b3+IFX5Q1SHK0>`oN$^mWocz-TAWXxrBK!DBGx=5P?GS_>rdTS
zF<77Wqd6oJA$_7DRZT#9%^__?#;=z&x77savx5@o#tG?$cdQz1PEdMTp;A#3zn!Kf
zDIy9qF9SGNqT2i?@$*XyAouIfX-#M}&u!B!&KJxdja+XkQozwti?d9k^iumGXt(#3
zqX&A@XanV`0_h~;<n!77>K7L>Jc86fjRxDs5h6YFx0t0lS8QlJi@Ewqdeq8Ol3|~o
zJhnTz{w@kz>3s3ho19Wu1Z<26YX%ipVD3S<>}}85KtLL%c)~Pt)!5i%w^h|MGcz;w
z{r}M}5Cs(fSs}{X2tLoRpU2KQ{pC`{oks4dg|5nW9zqYk>aq01T@d^p<ylrfcP*Pv
z@)uCSSQo-~pxPGl>KBdiyiD)X<O^H8)E!S=bEAzq5NDz0bAq8$5X%Qe?A*_-_&j46
zmRme*Lw6e7pU@HfWTW<4!8jksCQjTDboMk#bf48z^h7}!pUeBaxl}Yiy;sVQ{i>_e
zYbR_*ru`EY6?AUrMWptctfJQe6twNpW87^6RC%66hJn$TJSKYk{S^{z+XC;bddyj?
zU_53!SS8(_frw@~<D3#TcR0F)6baHtjkUP3E;k*x>(YG1H`X>tIFN-NI%Zt?OpJTf
zJiWVQDg3uqM)XS4a#e;L_Tp?~KeXD$kTBuDvy9sO@Y<;$=R-X&ZHMR<VGmt(x(L{)
zEe-EEB1}<Rfo-IM<q1s#EjB411uJK8AE6?PikW6(6^9Y7wl0Pez0}h&dcQe~Xh#AS
z6*GFTW@EP>IWnq^p~6Si9PE(hsU%p-7V3jErW9-PXB_n~9Ek(R7`pfVX2++m9t*tF
z@z4@ZGhFERb_TcfYPmnu^o;Azxat=wG!b)hXx;hkQjz-K;NIi@G!rkKz^dDM%F}wo
zCqJ6d%U^>0g`Yi(tZVL>Uh(Katb#y9b9$9Ce_(%j)zJ}Vo7c)39sYyoYv$2gfn_bo
z;rkI(GsDv@hlUko*f)ir4LQpgT7-Ox5x(*qY}li3NRT|QfOHkX0;z<M2$MC&^Ad51
ztPA}E9;jThx<gr>@J^y{k$nO4n{p%Fy^$!^7``{6sZr6}jWkAKl(&=F4}SsK4AVhJ
zrrUo3`!j!jT?PeRS}pTFI(7s-(qshP(r>-{a}fQHRQeZiX!+tVV2hyV?D6{DUjR`5
zFJPu`(zB`b_mc||!>zx7(A<jkqbM|N88mvIX_%{p+^@G8gU#lanhK6Qf%GN|`_wQw
zX=k~~1xT-I(gWsqz?Id-@X-oKzWYX!IZYK-J~-3oq*v@4Z&;sGE4HvQ6rd??%uUs@
zG&T2hovn+<ETVief?>s(6tX}A9Bt4S#?K1UyrD1{tjfgM!ok78{^S3bb$kMM=Ef2K
z<>{wF?%#~WK7(efG;vge2=Pp+;r->Hv{D4hL8gZhDdgl8T(Zl^PESZ^mt|yMdPdF`
zZ(N4<CPMg6b6scXyqY?|gX!@2&V_Mo<_GE!8Z?#H1&4K5q_aI#aPFA1MDOVF#+wTY
z1?Rdzym3_Jr|6)@uZ`Hbk*i=eQPA4T5|^^Oic`PaoK<S`d_Ac=4jnzW!9FFB^hd<;
z2<w%qvv@euxP{s`(f}b3VP2g>)Nt%Owp7gz+W3n}v+5<>tOeMZE?HDmM*r|%*2*Uy
z?(D^HSAAeCML$eA6gBGk7vK#kD<_n5m$64E!uZbFp`{UWTSJTqHIaZ8l4>&Xb!t*`
z-@%2hQ$?L9oe`7h_MA2tX?@L1AX3PSHI$Y8c>%5jE(_!1@>CwX@Ib8)sPzU`Op)$=
z>L8tIB7{nZ&$m~o%Uu5=<hp9mNlEE}NKLf*I+dmH=8Ai6bkUAkMaKx&^nDur>fTXK
zEZwalOrpkCmf-%exs?;vmGqpSPd?;8*LG0R=h?uDTDr=+r>^N?t#&lFnU%k9^2#x7
z!X(}f_|C4&dM1)oQqGkB6pZFC-;Q4pT<;6bJpI;#F7rC+73;edn0HJk!yYEG>eJyK
zN=fDB-~=SRO^*3t&}%%{;cf~Ed-uxKT70X=$fhE%?I`YbekePHZ`i0|5ujd|J#f`_
zOS+lvZrT*tw7e=eJ;|&+^3~xLk!)CxYeXVR4pZq&3M-VFHFvdxmpk#s-nH%Qh1jaR
z>5~6^eyCDI6)ret4!qsYS!b51-gH0;Y_3x*tE1qbM3tq@Q#*@=0C&p;ynUbc<UjKn
z9at0354)p`;0HS;QL3Oos9|pDlGq~P+g?^Jfy?^#*B0}_i6$Lmb!pCh7mj_-_~-ne
z8Mgu@H-8tEiDuG0NB{*~XZhs|_bgbaM>%J|S4Pc{IRK%t+T;$H)y0a-oonSqa)F?5
z{|QwjC6AigGLhCc(_o}=61~qL5Uib|q;;w!Itn!oddC}{o$6k7K>7k>7?%<|Uyqcw
z6g9K7tLex0T^B!CD<K?>(RZV1Y@=3@2I4J=A7DwhDA$4_Ef7M%z|aO;2^SMVVjp(%
zUJBFi6``#>lBKm2M^c4j$_dLjq+-6k>CeSpp7?Iw?{_#oC`&G0ur%#Qjjw`%H?XSK
z8H?e-j4RG)r{=b~e9&_{X1+BDAJb4ov&qvQ;^D)|=YgNs*zOdP<DdJ8MS<BS`GTsK
zig;$|$389Q*gM2-<8i8K@YjYJen>hQTB8eU<m&lG&ELB@N#)ukZph$v&B!-GVoA?R
zqWaCCHd=A~MYk3{iyE1#6(f}P<6UGO@_w1zA1qxsw+Spgn%|i#(B1!;qyE8-LpYhp
zhU+|E;roWv(^Lne7vQZ|(QEWA>dpg+eQdkhHxoEp^PFU~dKJczx~6O(^>mWVS;JiI
zuh{brL`7UD6@4kq#(Ij%QD0~_YzLh~J*;l^!aWCd!)U%}-IxC;#ZJL%^fo6sOjviK
z<JfCesj_3@?Uy>n6)u~BmJd{&KlBJ{v%mudPDVOe>yN<rkomO+#Hr90nJ5PkAM2$|
zh5ml}pzGbW1cgkW_vqyzUaUk=L#Xtj!(JLbe0pw9q=ulRZZXtnT|Ly302J`XhbE|a
zm%*yfM1b<`kfViBPKR!qYYgYdsG=l&dHLj&WR`x$kA|%Add&)Kn)4F3wx>1-*)Hh)
zk0LWYuTku_T+Cf0n54YXsPCzA(n?!^G)t7T4z{A^o^-^B;wkRDA^d}D%}M9#W7uZC
zt&jg^aj3&Xr}lC-jiBhSHm*ujK?8fZm}IfUl@7a*fQ<-g&SDZEl~Y^yXX{Yhq5|K&
zV7J}Oo7#8j?%a=sTmImz#iOXbiUyaNnk;TxIr#z0PVSp6=~9y^uD8pXjzT;AK4w=)
z8$NUmqaw*Nfv<!}j?epnOz#8bEGPK9rlt~i<M<O)mZ$CR*wq13f@93n8M3DMCHhu7
zmW%e!m+z;^QVm;*#v0f+pXv(YDRY{>$i&p`uw)rcjPZ-!Z+WoYdc3c21NL6yJUBX5
z7|%8fR1NvTG>Z8xCp+y)oRQ!;8@?=4L9$n6c$~RR+E!skM3*h*iXX&#c{Le7OJR{D
zC|C+&=JDyyep96Re2IZi>?YNlysxd9AKA^^ZLEHCmxIlnP`y#|+>Z#VAOFlnR`TVo
z;VHF`&T`nhA3pnDRP&vqM&)99iH<sFuPCVe#*lEmwO4C`d#u7}ZCzBvaUBOiR3cNK
zu(9!*^D=(urh$*=a2Cq$7uc5nQpB}iwep1?!Y~-O+aJf0x*71InPgPlVkA+xt2naH
zSAv&#uihr*cbE0dTwD5V5m5Vt1*=sTTi2ukql+~Z29I9pTK)?FyAYjdo^^4w&?6DF
zhDLC?sGUve_7lqIW!+w6H#{sx2>D`Ajt#Monl5u{WpkyFvhGt5&pITYh~fu!GcQd_
zh3#$o2^Z4!;6cZrp1m|`eAC*Tj~%qUa}VlSmG*b?QRSENNSseA1ZIU8620p6{8_hf
z=g{BC!s`Ry8h5x9>CB^smop(E%j(3FE?RMKaJsL8r2t8|eP4MljK6YCSSRbNC8KuV
zJgA;8%xWm{&8`r;#>rxDw{wqx8J{Zx*6CAbP$o#0gO^2@1=9zgs9g(N+KXHHncs_U
zfA!HRPd<PqzaDW*%eXIg>C5!SUyY;n?8tnR`7xjHZUm?}a3^#xmkxR8nx7xKaIDwc
zTPZzl{kY`DbHuGrE{N9qff!Sh%%?ePa?a#qPz9pQ;(Dv=AJpY|!YS$dLam(c6b37#
zKxV&q;;r<&KaW3cjF`D~10)RTTk0C?eDT!7GMDw4-JG=*@b&aPNJi&c#TDqF{FxF@
zO8GUdNWv}w1NT;JGkggUE_xrgfhEXbu92}r3HKnKA)XAR5U65=@&ht4CVl$6K>S#;
zhF;Cx&^r*5uvvcQqW6nAn;2$N_|`y<bf(r2G3ac=kzHQ9Vz-uV6!@aDE9;Y9@HB&p
z#(Q8qN%P8{TFq6Qa7f&W-`b<A@wMK#Nz6A5(5f}tHB8x7LN473$&;zmzSXW)-ST-u
z(^`ynfG7nvKfH&#YewPL<(8(ica<pzFCT#WCQFeeBPemGb`njmiDoS-4XV1aYI1zO
zeWzxFXeG`6@UAWvwcC}_63{*IClRQV-w#!vY~9TcpOL~;K${PK!);$`Plk%wzw4P=
z=^QAXI@BkU&$Jce=~N9>Eg6s0$U~kQXo1v8jnjoh2{=;9lnj}$fU=N31uw3Goc#mm
zw>{iyXil`biBZUAE;k<KIopDgzOPEi15k8enIufamsvoM@y$^+Lm{61?LeDd>w86=
z0A#Wc+X-dELg)aJySYToGSPMIc{ToSzuWgRQSIwN1{88n)^?$Y8-tSouHsqP1k<=9
z7TFYJ-7?4ZpfO{s9QLu7FvT%c!MYaoa__~`qLxXrPHeR=9#JkpZD1-fk}|JwY?~Px
z_N0j1lGkh5iZt2CNpRDX>7dl!gcM*3r)RQcw-El2CIx-K`fL*pgXf_0))`*6xUZ`C
zyF3>DW_^de;=KI|^g2?{HZ3sG+&>$Z^{%*TgV-X3@_lEw*<XvIMBG;PloX=30LyKL
z1NzOg;S9t_v?@5ow(DXQ@@uBGWvBgxUIwJ>FSUo7!A;bSci8fE65#=xfm=xYPj83P
zNmD;>XzP$woX^HMRJh->*Vkn<gX4h$DGf5>FDj*fQtc^BDHDw((V#!e-(^huRDHkp
z6iNNGR5!Bl%4fSGsvZw<$g!+b%41EO^PTRPT88_EmA-DN%C*?_F_i9|d4~h)uBd9H
zV!^4st=P1SHz1>CBv-#+9%)nqiq(eh_%-mj!-ku7lmZ+0Y)Gy}s69*_8ihHqJqt$8
zznyfg<ni78K&#~~(+4NJxOSQ*dUv<n;_t%d%k|Scr<*5ES`XsJ;WO6d@nC_IQH4?k
zXR$Dy>c(FTZ@hMxT3;5L3@NvJ067OsKZq)qGrT=tZbHx?ek%XoilNr#(8`hG8v4S@
zZk+nYekn8}O)QvNg(MWgwh=_OPtoMSGWqj3sU@N$i&9tcd5N<b6Qj=S*Y)MuU&)%8
zQiH#S1*X^fD=0V8)^43V7LDgc1a5KLRxOL^ZA56&zLg_tv1E@Q0_+gEZ&*>GusRz}
zL?G+<Iew<i)#Kk|9hSYh5w@qHe9MK2#QC;!6@LK+a)?=Y%wRW6S`hr=a=Ug(nK`Q7
zFea^7s8{Vz1i4X_P^bz*?}&eM27cx9f-}_!CM~1IsN>LhcdC*r>4cn5k&hVDGj$uJ
zC<tL{;*bTXe-n{psc}qSE<E9D0YZ-W`sjC8M$}@FU0lR1<qQi(n#GzHE0-2r_%Uc`
zD6v;y!GIEEi7z3k=tcIc@2{$(CASEd{mR0b3knmD=$B&Tmgc5f*!p`E1hS3|I9ob%
zzUl?A%<^W3`?#=`l_<4@^Nq2@g_7thlV~M<2mwg*4`caZ;2S0^AGk?O5O@=Jw$rhn
zpS4n|L_v4DpgNAu_m>rnRU`eQR#QhHL3r47lI{4X{4Ww3hh?=(kMG1(tY?~kIG+%(
zg_21XE#F)-td~eX&5(s@AubM3``rfAM165H{?F!SW6PQA6>Tfav+^X>#OuYF14sBt
z|9wz!g5<HM9HCCPoC3CL$9;xnENc+j>jV9_(~lbKp>UYLcR=~+v~kV(t6s0~N9pux
z#9BV#UF^>;+m*xLaya;lxTr=IHO<4AdUz;lINoL$v2UusXDc0(IJp^r(B3%LXs&iT
zody+-ZiRcY$31Fqs{{Xq$w?DAWrg2b1cgX(1#f?IIB8l5YfJ3HQ28o#g}BMBrpFOC
zW^>^A)WLzj020(v!zq4MmB%Wr#D`Xjouvqne6l3?)^hhn64H8wbpCL)#Aj4H%UQa-
z8hhA}pw5~2$>woGcs=TZGKOhEfgp4Qp4EL+UbB;~^bOVby*>#Ss2V~pYv}Nj#3x;7
z%V}PNP?$N;)N?w0f@^-4orC*F2w&p$PXzu5E+bzbt^<AH%zE+cUqA@KUjRbo@-JZU
zIM$QvK>05qWy9((AZyF`FTnAm;H3Hg0|{)Kf8X!=<1YaF)nC9=O}|+3zsx~zzxnS^
zL4N^-Y1?IM!xIcQ>Q@`IVTX^?P1ymal@sXwiScrf6B=5mnRYf0VokSEO;`UHrtB&!
z@S)TJN7Zpbtbgc&evvJoJxVqG^Ft1oIiC3W;0UHAKtjWbp?i1B{wyESZxJ_9H)l?p
zTJJ;1ZU|e=O`6<5`=jNiho3q&{sOR)j>)+jOU1245-O8zJ6rOm|4`g=2-T3hDEBW@
zEYM}??zn09bz0PeJgQiw!iHtJ!pJeP_2Nz6s(>9pdWUbjB)w$yBlO|wZkzAP_m=X4
zjFT?}vAtAuQIp47`ige4zL|+sSi2=@HrmxAQD_fQ%kH7yHXFawIW|WK&qDcMw<U5o
ze7rfRzv~wprX#6n%l$OW($;_@>q{+PZC-Lxr6RdpcR&KC$fd}1nPvhygew(yN2`^|
z%EVRuAfX`>N|?pdnGmjjo`9dD9j~okZ~B%_(Cr114&>As-Q};Z2@S{(n88+l;f{8Q
z%H^>leOWfo4$2to*kYdl2-;E)=WZ0<b_gW>{m#^>uwU~2$2}a(Q4Z!f+_o>@@KyqK
z6W4Q*d%1cOQaxW-yX_K{Px3P=R|aQskb*@crZ;_t*r!FqViRJc_!4wuE9Gh%{~=81
z&3}eB|7_ED7kli708Qcel>zR@IfNk|QmD-Nlom?hpYCVGw^A7$m6xel&;1Z!3+(rN
zkEgBO%!Xqq>q285#Spj1E5e}uYt>4tWD7@^7mjdQkZt<%v?5sj25_vtxPX9@O<&?4
zQa05%_x%OD_Wq%wb!8Vtzl(0`+F~0+yt9^BIc2`(zMoqPkSZBZwx574LM6<;fKldc
z*8N4slS=7&IhhP%2<=$Gt3F86yKwi5fo~M#j?esWMaj>aH93Au^lsjOj8;pQ>YVWd
z{+#Y}(v!lOSJ^5htG`?qv5sjM3v6oJgjsftLV(U<NbEgHd7}&wclYnFCx{WOiV4r*
zH*;JeI6KB;%ew2hgah>5@-5#!hyo09hxUtpxVW|sdJ8nYL>EU9Ewtahhty>12avV~
zE>Whx(6;|AKFd8UaFC{O&fHyHv{bedKf7iseUPY|tl|{5qPXW495HI4?9tP{Ebe)s
zV3v=hczo|FR9f@i%lno6iM_|JCgk9n;O)_-R~7`Es@KeIwC@#V3}VqR4*atNE(1zH
z@}#%s6ILiQap&fXXhTq&(bdV-a!l%9D>0}cQ2d_X4U8BO)G?wFoU2aURsmnG(H@Ro
z^e1uG2ad_p>uX#*>7D)+`f%f0?(UDL$Buf%Eu=L>W8pOG{MqPizuneN2$pX}0fBTX
z&Tf^S3aL%Ptd<!sgI@5pXJ-H7xP48)2FlyAug$($ed+Z0F@J?x6LPOBG1duDad8GW
z8l2O80Y2yPixJB^ubM7VfMGQONAMo;8Ds{HUOwg`68-|LGdUq2ov2K!sF|E-KLVwn
z>?g!3q}y1M-88;j<52l6>WqEw$B_O6a!YmSoYv|a;6~eZ6HC0c5(V;0HILL-rT>oR
z)I+!1%iW4dhxazkwW0hfQvK{f%BHF&DB&s}B1E%U%+E~ouzJ?Qj-Y@Fz4^^k0*b-s
zx{me5zOS4<(ND_8B9Kms2gN7X2PWmSV8OOALxGW3EYVTTR&OzFjC8b6J?AZFO4RXT
z6|B-d_J0Nnoh>Mdqeccl5R?cNdE?BR>RA?6u;46f7(-9-un5iq^G<J;AH!xADB-`Q
zPpkYgP9B9WLC!xaR5zn83y()hZM$v#=g`bwn5!h0Loq8OtCoNAG>*nx>1iInvYDG&
znPu7uX*<@u3tx>+I$3TfonP~}z5LS3e>1d#4s~8?UP%|aseu~OPP(s%1@;-7N?>Od
z1$|CYC~VM?X%Z$X{0pe0%}7rmb?~vQ2SWJ=?bCIV$1t3tPFiFFn5qJro=bxrzl2uB
zMqp@Um#N({dY|2SH;X1$$U)ncn-AO_$uk|oF?mB$TQ@r%COVl=3elu=isMyFv+F5G
z+;8bqxPPqq5($L1G?p}rzc-^K`qc=n8uc2972OO#C#CAbWy4lQvSOmaN7ZO%*eM|#
zNwh?yh4vjlKhn?zC^-Q!IEW<oUFMe!^aWRqI*%^wbcN<w*1w;8E4@T<B^|<xX7=W*
zK{IG4EM2nbBy1u49bvT7yE85bD)N-$HQ)F1Np3NN;TQF^o^44)k<APAinLw>GqpB)
z^i)qCZU<Kn*1%2qDrLIWho;gqbwA`<jy&Lv%7xh-NMO6YR=RPGe6c3`kX9+9jxItw
zmDIR?F<M=RATXcPk<%`sz2Ss;E7|+#eg8V{!>7(Xbc@Av_SyqfpUFe6ZfP2-%(hjv
zky#DA>g7&>NgdApOrVL|c`QJo#;KVSQr#Ym&|S-24`@sM<u7$>Gb3(|vKNxeW_`MG
z5?Y&zIhs<MRGL>c4ta7^UcjYiDHk>?#&5rvruIe6Io8TZXf9tF!XfQ&GftW<8yOOa
zFecj{hxL1jXn)aSO;UQLz63EdPZLi9Y5qw>P)rf9$BM3NH@cg)8Glr;ETKI_^=fI7
zv*a&ruWJF)B)Bc9okZ8+w<HlY5SU8@4~4VQ<3q>0u2ZS4SI})GiVm*%D${4>i+kzx
zf&>FZhJ!RvCvPeQTeuu>f3o_;oOjTf?1wq7^r+4sDF>#b-)>jz@Kg5VZni)Uj2~0U
z`88s7t${2xvhTjceRk|J(Sqd7yRpc$IGv2xigRHO6r(tA$?s<0W>;wfkt4sMRm<7a
zt2!FxUV;VNYOIJI8DGZwp9hm7J%<X<R$dvYK)Thwd1HPu`?!)`h;DYWyG$T$CHJm2
z1X~vazHC$si+|Pm9WDeLD@b$T>j$@FaERCTte2BCVpGt|h-N2wcb<2fDshXIb1UuC
zw$N0%)UrmetT%mGG<GzmC%>_F<83oO3UI~}D>6}8n=diEitz00OX`K_ugc++Y^%xU
z>e!T&@5KGSzcwv3OCt;kddgsA>V{O(x4rI{#Jv>*LmS*E?TngPRWKQjKyXiLqQOd(
zBe6c$^kT+%C(~IV9;7_k!Cgh=`C=5h&Xh+I9Y(9H;3$Z-Wgp_(*w5Zi=8kQn2_SOY
zb0tfqbd1J?KyF)kGaV^lD&rG2Ew4NrJ!wDt8Jry*{HO2%|MTv=kzTqGGa1KJ9l^&f
znu{q`UpkTX;8r9X(?bxin9Q_`RX?JcO8zepz)_mcLgfiI-~R=ybjBjk?a-rWM3Z6Z
z95^K`k5J4_i;-VoxTvw|d8(+b7>=?g46s>-bD0V-Xvr6-8W#2!9sjvfuKM#EcWIiv
z1M{DsMY7VPq>C@0EJYO}l(?1i+K)ZIK*YX%hHM&{d(%6Hfi^mX{CX;ntK#m$`l;0*
zr-Ex+U7Y?^y<>r|QRenoZG-bd6#Z&`MC|E>b4Y9sWBx;;Ysfsr^ELK|sOoQ<Q5e@H
ze?qxEUH5I5oN}+*!;l8014&Up26FWZgBDw%%khpY#Yr{jYa8}U4R~9lg#jyL>%`U<
zMlNfi7hgtC@2Z;KxpR0_8AE9gE*xAovpPZl@|D&<*&jmQ17GKpf7om+lVtXHw1vPb
ztkF)!0$^Eo&v^?fW)?!GmV>zFQAc~Br<x@QlfE4|Je5>Qbeo6fJiG51?d8{jKW|VP
zDb|RZ#rko+5B(ZTx?kejl#Rbstv{G58Xp2G7f;mLE<AeIpYU0H|3joBm1E~lCb(2u
z0{@_}YzNmWs)i#VxcN&QDkLQdQ(LbET8VlQv#^dhsO4lN6N+IJ5=qpuh5HM}8gL)f
z`ArNX@Zwpw*~sbX)NGmQ6(qf-+}mbBwy^g2;HaSnAB!r^R8=~LtW|Z^yiATyniST+
zP<j>oL{+?Gb}Pt+Q;fc?soe`A*$#z2%w?+=H4lMJnT<!x+rmYpL2O*3y51kUA8GVI
zr<1B6do^eTSJO+Qna@kw{UBQ@8?huj%~_p9NEA%b78CXoA0nY_G<SNMg2e%5cjEwJ
zr|)-e9S6yOBlGB}i8<&DPuHPQ;wt8oli-!)=CddKGpU2En)NEyT<Wbd*}&N0#Z~#a
zyGF@v$S)qNZZESHAS`t|lAe4w7(P2j!(*X)lVx~Nyr99NFotOmjYqCkppS5Vq*Z@;
zOFXQ8b0O&SA>Z+&YSKyjB-%(0R94X7E?cacYErXuk#MIGDIY}>O`j>u-LVs?1X1WV
z^D{S$KTd9S20BaFg^hPXub~R_ylpqbnso5@T6-6&;qw`02W)oH3j=O)pH_XF!p_#I
zxw;_ULcI=<{H;r8I*aFEDw52~dBiaw43UTZ{)!Czj#-<W9wuC-jY-jn9GmH+zGy!<
z*|c7HlA-DPXd+T-l_}pGjGu8>;;m;$$~25^A)lz9DR4q<&>IrE!}&DJ>`73=Y`>od
ziTlcA#6jsO-%7Ro{jY-(SS-n0v2S)>_nucQIvrbdh(SAaPce0P7QI$M+UmR71johw
zs@Lk6%I=`-`ypDij8iozBtHB~ouzD2O##`hGl^yLw6t)`XTP-~Qj*8F2m7nixpqNy
zL74Q@)vCnBsw%|k-u4v4$4R{0CuQvLcO#Qri)X}Xp|(hlVh@8)Nd3Hj)rQ+hD#^@C
z2g(MVmyORHg}hy6+q9v%Vmhv%QylZJb_(qzdgOireu}|X?QS}uBCktD^-^K#q1a?(
zgxHP=K}%-@J2_t2clmvMf;e(oZ_9{TpoXl|TCAsu1Jp~FzLv4d6-3&i>q9rk-)>^s
zE}n+B>W6+3B;6C2(Ez~TX0qtTN!kdw%KuaxikcZDo2iBBlnO7e8>HI?1iL~x5#J?O
zvY*_EKF$)$`F1YGlJ(!;OWf`H!A;$FA+P#XCbUV^b%7%1<(LL43b>jiRX6uUIr@$2
z8+O)oMehxqM;fSCu9wy2pl?@ee9Nh0TTTS!npQXpITuvdbhg<nO=M$~Rla+%ZQl!d
zcNS`tC@u2vIQy$NK2m4d>}REt!j!_zv*MpC!oRyOw341kzJP0Ed|_F~BunMy8_}bc
zx$JhC-bPm?tvCijy??ltoPow6y35sCRg(xUxq23T7V*sIhpABDSSsg!Kqj8bIMeQ6
zoGIWN{dvwyO+IJV^M6J3yRrzM`}~-)3EQ!Lt!Q4d<UxM%pLhZ)0{ME=g_<m{pJUGq
zj<p$&bX<o1R@z!4*~}*f`_SYwf8`Vib{d<XRl$Ubn{-*fQMj&P31j;J8-{?zYpQ%~
z+P1bC7S~=Tx*<?&M5j-2#unzd`bb~6H-RDkpclOTBOxWIq#v>43w_GNN3%x0_0Y5j
zy}K*ubnQFh)FwKa_wD|XYA`eXPiX~6jc>9Kkx`WjHX3CkDj;8%M=R=t=9Dt?w6ugz
z3Z#VJ-bF7a(z>_Ylw34X2HMSl)K+5KR#;C)pg&pRyLy=Wj&h79d*=`-gmlDbvs=v4
zfL&Rpp2Yl)pa<NW@aXJ4y_=J!6RpM7z4ANK>ddP)9Z-e(X}K(<@vRX;ON)=?sv-hb
znsmIM^x3;dC0@?!kDbcA@zw&a3<W4{T#qHHh9xY@cbqj@P6<R)yF2=%=s`|o?~MgR
zBLu%}q(3!U;M^`23>?2yw2w*FyuiA?y4q@H2UZoQ7K;y+vm|zA75Z{&j*fcGkKr`o
zu2gR+1W!8J7(0|Lujsf<HcZ|4og${H4(gCXmnBnG<xRFWa^a9eOS|EE1MW$XTv*z)
z3|w1cRlQ0H(o`kt)vu3{{rJ7Cq5i1gba&8Zp(=K0E7`W%QG&wM$V-pK3s=mp{k;5g
z%>=Gmz$Pa#!VZCW+(kwvRcpq27RDEM_wnq^!O8wG`=Hxhve{PM8fOpG23xDCFD%M%
z-GTI@BRhVAU9dMI+J`Jdxb))Waao7R7lA|VFFy&hE}s%O1q{?c0$@%0O%y+i^<T~A
zt$;hOXW$DU9$C&W<qI1XeaXxR$w24kLt_W6-q-Swq!gj~Jm#HNLH%c13VkThFGqa^
zEwe@uE-fiiS<rT>A%sh<Tu={>Fe@R!5cBitjE{NVkCYsh45gmbUr=!7r<5gsTk4++
zx@xT5Ns75f=Or}OQ0Yqr*!Pb$l^Kgc#golKp!Z*Bu;)m>Vzgav`kHysCc#<w&*mI-
z?|V_@L0w9?1il$pcjH1MWXeYP=8V{muR<l4NBzDy`G165&v4W^K<1`<SE02QjbVh#
z$*ICq`EW_&CwW?->S4hR7bMgo5`w(Eb~R5`Hax<kgDheXPyR$<D|c$CjXV;yyA9j6
z>iU(G#&VRGO!XM?x<5H1;Kbb%o)9cB@qQp*-sXyq(jXgNN6d>|?b8NeEyY4m;0FQ<
z)>}58Z)UB&ecGxeuV1CFKKraQp8jQr#F=W_DeP<CDbJR8FTc;vm?eI!FlUof6E#i&
zz(8FlnZ4G>eN1e?K`mAKg$v+<!fNw9wriJhN=fFt>MzGh+_YRQ2o_HhA*%xgo9N;p
z`>{zK3uw5{>|e_b*7k#KMbuWTW+FI<3%s44jdTfS=Lmc3=N<*CSx+e1-ErS5(+nGs
zbdILvPl2K6zW}w(5lVvWY%!m7o7f}|C$6}apGO)xYM7w56QUo~s=z8Ux=eMJ@AsW=
ze_ke$)5&1}oNwJc!M_0>uha1tIGghA<u_*kAdbd~)$Kr#!LQ2&e-NjV$(1snB2Ck&
zM&NIHoodJSSnKaugu={JOPAupT8ph7X;<g-HDSi><NZy}?M<G(Og9h$qihqUfW``@
z42Kr3xSj%p48p4=NjHZKMlIg!FE(*U8OI^4AuuM~>`Ym`IbvUs6{D^3mW{d0l%?N(
zI;Sc%BZ*AjR2P={jd4g^>iiEfralK5ys>pi%wCaIguiW!1;G2FMepSPm8A%$z34Lm
zwKRVuPY2mXFwn2i@nVu<Ty}RZy}R>~S<KBhRZy4x-Nd>^YjRqcB1I**&YxbKRU|)L
z)HNWT*0F!$$0_7ddIS9lQkAt5Vw6w<n%2)JCDQxRj4p3RW|sJm<GAPBzP{>p|KP+}
zBD$QKa+87tF!Z+BVTqy5S2>JlPLH*!xk$fRs5czZdf<d&AKC<(Jl&<PPxV5*kjRIA
z-KYv3#P#B%oNzloGH>~OFCu__YH~8W@ep_l3CU)LKN{saN{|Lflh?2rrEMQC>zmRv
zkiry7VJb`+XLybfe0EY_Ozl^5dEBn10p2fm6ZhP@m9hs_udbWONKvyM#c~Q^MQMuj
z@>-+Pm71_6w03=U`Br#$oY<)QAJTD~5$il8Yg)Bv7LCaOr*gGyJ^!Etw~4j@ct>$_
zA%kHk3Y40y@!lun#?4>p_T~r;Dcg#UiH+*0sh{&}Z-UZa1b!%8^{`Sh70P#2Z{|om
z5uO1P3GaYCoSDS`aD?bCQ=U$8RK2`GILYsxPs(p3TY9?}E0nLb2lUQC(|#WkMv@-L
zM{_~X46lUiN=7Zp=m}+$jKzl(H5io@*lAA9#vU1Hb{<hBr)3m5YG&w3?GlZz!r#l@
zo0e&mS7&WNX+g$^O{S?js$^BT_+Vx$vC)K;=Ew=;`(>?TyU4*mn<ue<Vt?j0zwe(w
z*CCxWw-;4ShjJMt++l{cMPO~`JN&rXtf)+GirhUy;3Op{$E=X?7E~tH?HRGQt{YIo
zSt=c<+91KBdF3jj!>T<HjVVu~udvtr4WR{p%Cj6*eCn|Ij>L{mu%Enfg$pFp=UbUl
z+e>fjMeikhl{iiqH}{M~(aPr+*XaGvWnQXS&#-{Qn}Fkq^%Fb1Y=RFBRrdjGPsA*&
zQ6?nCLL+;i!}$}TGJ{H0?HB2X+K1ZKiUD)hRfCh(Atf$vsHo_}rAkL_kAWwFiw5m}
zts{tRJ`}RbO<M;q3UN@N%`}rNsFifs=Ovo)#iq6?g#2eHJ7F3@y!zYYI2>U}r}xCk
zEjZMY<-I1Pv*ZYdtO*#XP)Pnwhnya2ta?rg|H-CnDzz7{1{?LQMQWneJ$%EE?<W~(
z1pV%h*I*%5?ms(bXi1IzlNK!JYg-)wZYWDX2HMU2AJx{Q^}o{+Rl`3fDiD5ng8{7%
ztuJ5O>y~0AbfY}Le~=4`Mhl<wH>OS!->itL8s$CCIh<}jI69Yem&&oY^d8q_Nf>Q>
zkd69k4O1+HHPb;BufLb}-@lif9DGg7eadso6IbfOJz2uWu>2jaVDu6Ro&K?$!sXzw
z^9(;AP}V+)#sHr=nUrS9m8}ri=|;Qs7tkxY{h-ydT)m#%&sXSyCNeo(m3V9e0_T^j
z-|N6znNzJ~-==&4fPf0_T&jGfi8!&!>8BlG0=DV*q|41GqH~3_@DzArK~Gs<JgK-r
z43a?r%F>vY8BZUk{d^P`!lC>;fi$HA$OsVha(lFS1#pE?h8e!@zU1sTirMl!Jl-^r
z2`rFEA92#lWY(LT@Splat2uv{I3W1vwcV6}FNi=wNJ;e}MD}&5zbBg*GQ&hrH>o~#
zhmjgzn=~OM2J186>Pf+Zq(lkB6n)oCfRpTMcXcUwZ!1#SZtBLx*(AX@@U$&6ZaD|8
zn=p!iN@S~$7AaOJNlD@QW;j)<W|MQSx8<tm%9ZJIkw=Aasxc?ygOm}v2xUtm(QNhL
z-lWpWd?B4kFddtfz)@V=R#Mp1a#|BsumWC7_2${<bqMy6U0=OVTc}YxlqS)$+w@zb
zzF@v)GIOQ}YCrGMAQ>O2m~^e2f?5_}%g%k8MPUo%^iuZ9LH%ZtOP$Qop1U9;C+Zd8
zuC7;PPWn)+LRFlYs2-a2p{}k40&Gn9z`V0<()+G-m~;Qm($8kAquWz+P)k6I!g2(d
zB$ycfwjeS~&Y15AM2MeFweHF#x0J`-0&Dky-9%lmG<%l&QyP0qD6g-K4y=}-Zne*i
zvJy$Lvi)=rszeR2UNEiMewsnpB}A^I2clU#=8ze%Vm2LQmm|^Awl84DD;(f;dqQ(X
z<!0r~-Da8yJQOcwsU5XXzu;Eqz*GKks0&!&3hGSS{MQMa9((-TiT5u6<z?9>87tqd
z38@HcnYedRnV5!qfh*KRoiy+kIL=?Dg{|x~cAuk4KL|5!<j@^%Z{_^xIejzE!FhPs
z@D^59Xs`t<35x(q2soD5$Ew;cM+J|03*o<xh+<!RHuT$c<5N+6T=ZAIk&&$1B=E@a
z(e)fiaXHf0M3J|EA4{vY{cU@D!$taHK!?A6U58Wlx{u3)KBVf|R@!Ar5bha%pE8i;
zNTexS?k+*%#xYW%Qy3+pEX|*aL-ygjXb$kA!G!%{6nw(7xpFhVdIqa;1TBAqrd{;;
zT?+}oT1HHB<q)zyY=sI**FrBlWn4Qk!3SC~@H0*>>=uAOe~Vb7&-Rv*KZ~Eq0(Y6>
zAKp`yR&ry_nNW>&`zEfy7bL0wGF>W?hs}p)<bUGxGfUjzgkSFo&Rgr|C-JiBo7$hM
zw^`3|Kw|}kLTe=V($y@H=6+)2Mu*!lcx5eWB%y4eTv5ku8B4xQ{Ne+ojN<L~@Th}u
zUe-6>u|tb3H!|gm0`|mN_dUA4%-74yyYyZG!Oq+<kMxuRRhyh0?R+B+cAIQ@wo2Aq
ztVy6qj!BLU|LRbHsEF|;=Hd$B`$jZ0Q8@~wn2;f(#>B2jRARwF1ptT=V!-DESWjtQ
zm)ATKbL$)Dj3lPmSQLv?s;v-=7_#J_Q^EXMrnjofnTX8^=b@idFXntMzQ@OT`HPhF
zp`6qOi=kl0FIM5j0jG-`($O`s84WzU$m#Sph9bP5kj0ZU0JFJV5P}Y%@|h`-lo{+n
z{l;R!gwJQ4L+pmP-p|X?J!RGA&wZ>G3GmDcp3VkraIT!sA9mzguS06k6g4p%>EFU~
zjPGSRLOCMiLCtXDyvfo>+S~$e<l5>v>XDjzumT13h@h`cXSziQ#qDZ3`>8m?Ia;E+
zxSM41Y2I>j%1BCNgh%_}5~~_Vj;y*KYKulsPG_TyQeRr#wtMU;K*f!Jcoa-IfW45K
zY~Sl3^JJ|TD42UY)tqyAj<a>iONxx2WW^(xHblif^$zGhbq;~~-ODLj&plk`7XiPg
z?mKV0#i@-_&j&-WO@DPw?3mZEqf{*(TG=GtZ#Fgm=ck4_?`W}q4fQHAPYCpWz^@|t
z(D}^i>Vf{s4iGgzLOYwrW-_vo?4;(XsS<X~Br<%(q3*ds6+^7p?z-ELmTPTl+yk&d
z_iPQf$TR=GJ$+)ntV~7@f@h-;wJn*IlV;yE{QA!x2?D()=<C|%RKHfcm1|KiwmM>%
zWTZjqIMNzMYS!4iC3L`*8MtAbkDblEf7)-LJymvrFKPXGzWJ3=P1_3dN%fhDe&?wB
zNOgncug0oudH0V>7R?8B_V2Ka#+AKZ^;yWjKI|0DmWQF{lF|>Z!VGt*SkHF%LQ5?&
zMqj&<FZNq@U$bKc6ZKRr#zxKn7}0ntWB7!eurH4;D)ixl7Ps4*TlwL-!sW$t=H8WT
zL}-Is2Z{htMWXa*wsg@vX+%`1e{U)_&vq$pRT)=G&x%`~ZKi9<{VS3cNfUBWQ_)1N
zSmsu<bPLqhY-pJ#xV${|m+J!eDAZ(tt~9hC&aYPj3b+{b)yHUp9pFQr6)HEch%-V0
zhW!_KTdVbG%k|%JLEdpMj!DqJVH!t+b)!^tsotWx361CE%XD+fYek2le(7UmVbPxZ
zCNClXw%X~lD3j$Q!4ZZn=eTWYHw{^@#P=SEx`PR=`PsS%5Pkxj40%8Zjk*>g7-?N2
z7EbJ4sn-J+@<e}DPM}pUWEj4Y2{5a9IDyp0-*n21gu0w{);L}txd?V0-F{D}B%7a0
z^*OyRbTvvf@`swPJ1=`?CjpsZ%yTs+`f-cK-c9(}gQm6s%V?c!y~-?O_Pqq<L=p`|
zGM^}=b?HTXt+O%ocXpcih#$!1%~jv*aa+Ipa;eFL!StC})L`*sq>}zT$Y=g4bHvEN
zuE*<*wHz_0v2(xLR#}gr<OY1c#H78h#cRZLQm^*3qBP{U3bTMp)GfM#V!3{w(nkK1
ziq;FGBx|F_tcnXOCCeA7xWm1;(UbIJhSg7m_UH_Cmrdtfbr2w2BBUfAq^coPH?SO1
z${jh!=7M)4mOAoD>Gh!O;KxA(l1j}u6i@Y?X;{-Xoq&~;z|8AH7L*mAL2WGP*oaSt
za(;eBZ@wWq0bk8#7=&eVjZ|6jln4zy^S==uc2?&Wnu%9vm!p~J0#mN$<DXTl)s{eZ
z-E&QghMFKW*gcPad(s6YE>kNdYkK9f*BmOwpzmSEUXYGu49Dm-29Bu$wq{h;M=eX{
z5}o6yD!q{11EqLOHNBaFkuvSHUE7T^5m5Gd9bK@47uK7mZ!|JWLucw_`?sdsE$K~S
zZfEVHHEquw$;9f&a3IuLY{sA?nx4AD6xO$H#yT=Y)k3S9J4Gs=lBuAojkOQ<KJFF@
zU+7zHRl;&T^$$=Bjwh>e-))!Bl!rVkj+rz8^3pXNdVEJiFr}Oo1VM0A5sl1c+H+ai
zQpP@+uraMm+pKpVsVj{(8)H=h4Jq`xVq^P9`LYRdZpP(DN}kl!KEy9~ZP%22bp2t{
zA?5U#b3zU}1dgkD35}@~1$99B-36+;>Q`F-0=}jk1^<j?%Rt|xl6wsRISRHdzR&Tg
ze#3q}=!V+f-<q{1Cr4bhN&M2b7=Z--zCg5VL1FC3s%t85wR^f$c^h7>qTvJ<2??06
znV*uaNJ6!1cIr{jqtKsZNwpyNTMU&}$Z(qA?+8RAt=uK@u*(tI#4v?Oukt2Wjn<$f
z*Gucm@+%s3&wh(i^j%U`EfIKt^_(2hOgB_Pk}FkXwL+WqPp9;Gz;kGYVg<jcj<VTT
zrGntEybwqGO1{js`=5DbJjt3CEu~_-m1EDOf#M>BD;YcR1T~iD{rR%sLW4tF`)~FJ
z81A}N-`%_2Pjm}27@0oQV(w(eekMA&`?^Tz?0CI+yf{;xZTo_s>JOoEt9^oUV6|;f
zv?{a)J6+1jKR>PsIic*EWTu_MN8GsJ2}36^&NVL_;tTqfafWlILRaVH=Mm(NVI3p8
zdSFtlkLc<Y6l-`wGNaH)0u`j>9eqLWV7Q|QMR&AyX;HzkqeQd;D9fr>(=ChBfw>4}
zBU&xz@v2`Le}eeMnEz3N*z^m}G8GT!Lje!RIUe*(zST<lnCP(*YM#R@e2(<fJ#Spb
zrPXAGBJLO5;TW`<n2}4CGO9GCQ?;7L7YwF9W0u9!bmqZp8b%|HPrB~Jj}IfBrXbBn
z>G79hkHg(gLbI78?akgj{rVwZ!x=&vaU6x!O7?M=&6uS6=?)HS+t?zhRma(TmL%r3
zQr#nENdK<a=nuCYEjCqJ56vcoG)pi<uh6(`wER2d)HY<`KtS+4Q_Jh5(6ImvZ7cZ;
z^Jog4DqxdGbJ@RY@E4r?X0(PmbhYkypL=SfGz0bOg^;Xyut`f&iJVU2!5?-Vw_Zm@
zw`SS&r!fy1kaFYPmN{4`h_|9Xh-pv7y<(1%<vwRnH~(2O^$^GI?vRAQP7b#Y6VDtT
zA*7|na$bT*s19j*a~2C7BY{pChMRt;ybZW(zmWL$yn@Wfn9Ev>jhk;hd)v7<9@cD!
zLK1V>j}=VZS{nQ1Y8Y8@r1Bvxx)wuPctkJ-UggYSbFfRV7)sMZIE_}!zoQ)#N7A-X
zuFFrgl^6kHxAS8f%MRjdG8Lyn6K&ToUD>O25Q58uRG!GpRRXu*6@EWsRS-oQjVet^
zQZFAJzRtzyk;`D%4!3O@WdoO6wOz6LN?Rqq&Xez6_N|9Oz0@Zhj3w2AHHtdA_VMoI
zNhN70vaZ$vtOlN{QNElmQD19i{jYX<7KnUH697R=Kvb=<10%!{Co2LB22;<e7T!M>
zdQ!`}h$%`Eh?M;OMw|;0pb_LfzYNW5eZ5R!-3ubmP_L?``odJQz@x}-sK3AB_I;H(
z<tJaYuZPXMae8|XZS`5|I<Y6V$K>sN(N3*AFv%*WOu_PNC6YuT_o7C_aFVp5#uOP?
zZK%XXt;h&Du%Dwp)mqZ;s~Zlu7534-=6H&LiMc<rxs(Oo`7am)QLf}jXwGEWM+BYG
ztvqx-y?lkr;r@p=+uj7`xLD8SrS_#3R=EiYb!4~&lhF235+m9e??2C}asPY9@4rxY
zqkeA`hkh6Gj6@Bg%^_&8%MD_mZ54UJlh0am=Qw~lRZzOBxa)>bHAw!>{B!4St<7-Y
za>U$&luGp56764BdbD<|g?tCv6e6p5-$#kX#$$dKix)}V|7>LXuH6Xxc#98+N0%q}
z1z`(Q_HCsa?$V|BjwzFHA*e0kQ<5V}2s4i9AYBz&K7xoPjCaTmp^I<v;=KB>p$e<Y
zVVL`wlwK9LP{U201W(fUlluV<a+AfO>JN<ub9D~`=rzpdw%-K!JAVN;M)k&%=?9&&
z$uA|Hyw1udo$grIj8CmS^kG3y9Pr&F#mj3iz`)8l7w^(HmEmu5d`7Ja?W*5ci#nuS
zGguJ?`~T>rVS*p?y_r>Oe!ryna!OFgdR^x1*}kK8nZSex-DwuzvxWvaEElUAYac7p
zREb|MBv%&E9-{YFccJDoKps%i?h?J~=XiTiT9ItagI385)mP$`p<VOy9LKb7*KNDw
z0K67~h{ENsEAhJEq+oiut_@K5nX(Tfu_k^n?FXV}JY2=$SJqdJO{i8g{dDWh05(v{
z^uOMrMs}7ksuWhYf_-xNRcEEcF_pKh$#I}@50g=`G4Q3+TC?gPUyTRr>{$O!;-vPN
z_rb@fa+>5H0Dyn(ZcX39e*b4d5EA~M*8bV^baN`9GZKFtI|!jJN=OAN*UU@1h)yy3
z+D_Hk*kWUX4x!{!)dof%j-;y<%miFSh0isKdPc_F;Te7S;l&kk2KE{>Y<2L$7eI5$
zcCIWR@zrUB*QL*ap^G2d?vk1z`2A*m@D*Anjpo}Y5T@ghiqc|(3PG<`aLBGCy&{U^
zf>jAj_f<E9mu?t;&?#nHSJj|jPA+XE-eYuO^gawmCN8I@gyp8vivqcj_KC!krrE~H
zTb@$!HMd;JA7Tbu84@ik{hEH=8^(DAX3gRO))dF-r)137;#RPN3t2daMn_YWIN!e3
z&zg>A_57Vj>LRq`R(<bNzclH$rZ!=__)jvT85v9Pu^b9(*Q?gzF|D?3hotK_d0qsp
zdkr16?}{-`RO|0UbW#PV(mM7NwmN-R*MOY`&ATVxrkun??-8TOsxG$N2B*dBC!lhJ
zMo0CD#jLsh-qNkbhmtIox?3wR9`4O($ZV;R+u@6K8PI{7zKgWL&UoqyKZR)On4y#=
z6;>IX;p?n9p<-Vsg)t{R#xC`fS(W~NvWVK^^Ig^>(psj(*E8a}7mcBMZ_1UvW?*tA
zOnmBB4K{V~k*`~}i;v>^=xeIT#TruSz^#g)vQ5qXOiovCZKoX}{v|}7o^E6Q*OpL|
z&Kmk%#49e)g|*p@BdvFk-pzGvSE7$GrR^A`>DCwmN41b3=F->~u7{yh|AVowjEbuX
zwjG?{AwX~^Ft`UMxDPG^1ot4p21$Z@kl^kPgIjQd1%mtF65QRL-1+Xh@Bdrt{5`$8
zx~r?ZtM=ageDFph&kapFy=Xj&Ne(EsU{_5gVgpq(DpbFNZ1~%M>YqNGeFyIjt)nRA
zOn`E-{{y(TG>PK(Hxl(;>%N1}8@^2!35-F{OngZkfG&*DC1(gr+k%f{dEjvAHWmMi
zh?TIOAEMLsXm4(_oX)B#tFf&wp*Un{0@?;rwQ_~2n<4e|O6<1eA-Wk#Zwk>Q8Oi{~
z^NySN_&GoB9P!9XHWXVyjA=zlU3ykos4<M(Ll^NQu?Ok`gku&_naPH}ZcpOlHyvj`
zogf?z{)?*YU#3EIDnw06dkW5apeimtMt5<vRrW12?bS(i*I~})jlrc;-=}5?61Vl{
zO}4$R0>m$T`NbbANB#j`L`!#{HI)AW1}yw;z%P|tWx$+!9H*B-@tM*}waBZagkf#H
z^)VG~ZJy~1FctzGv67X~-tSnL0EZKROprg@*lrZ&pUaCB6#CmL<Y#S0y}i*OR4)S^
z0Vp<@GF+dheR+J+enF3`Zu|bGedy+_HdR=9AlY&lY8+Z`tB4@h40ri^lT|-_GfJgR
zG#a3oK94Egr?rfL;n3^DtL(j~gp4+lC_Nptk5!l2`<9lx><+F6+u~f7XB%7=0<e<k
zS1UC>=@ZI2GD1O>8ouUckLk#(R-D2-Dn+kJHpC@JOnYK-(D^uAaoFMjmfqL0W!j=C
zk>B%qL&F)H6B$_&F8k8+&RwcfST{!ULql0gN`<nr0%ckmig)1hN-PR9QVK;3cmaXI
zajA_BAm>x@z-jHYPIPPSCp8ljgWqiADM<~3x`So$RfHEm-$n%uX$&QE5$0EOe6KU0
ze8DzmKD@I*AhGXT<oq0K9lB!ZjY2(p!+NHQ6zfk|&I{yiofP8e4rKZk%)T3dwW>M(
zFaZ@MH4}3IjE9_4475S>SD;b`SBioFmtdM@rys>KgbaCtc$m){^TGHvu<y|fjXBXl
zE{-|)j|+{-dy8zdsh=MM8gysUWFLmK9ml_Ld^j|S4kC;3gO=1mmc*FD>ieCG80lo(
zxt2zI-cvrF2vT3JM^nkI*EZ^D|0s57GhNnXL0}D+J>p3naZeQ@QY<(tmdV-WNCU3z
zVXSdErDIx9Y}FJk`rxkMP!Y>ME6#-YH3{tTrF=+m1yLnXQ_VRSQye;zl=>|vO&40p
zOc7a@#AZuR5XOkl&g2HBc;iw*S{R9hF=YRB&o1-lZ{>2XHP*jK_8V1-<O`8I`Mj}X
z)m1<uY_>e@Z;7#z)0~3yVPq4cWz>tuC56n6pPj$5=IOxd)4jo7aXnrM)u~`L{!f}m
zEjmGXGus&I6{6~P7AKX=z0k1&m86ueul4Xnvvzhz&VK-j<ub+3?-=!Oj!#3#wX4a0
zIB_4W*kxIL<m&T3jFpe!8E^&?-MPg+g;KiTb%6ew?4chcM?bVI2T&<qpTVE?c}2yD
z)E@t`aafFE0$zlsgTD=>c}}bK7~&?K-8evs^vhUgGVKmDbcFm@M~l)XYS1Q+Ey%^t
zIxMehpt@ngoo_6s9jg*uhK54bBu=J=ROd7YN@+EvK*o1-9Yl97b<KJUZ1|tph2)qz
zEhh@53ON31E0-v0E~n{MLNXPQ7AqcprNNniKt*DDuaJ5=$`aK9TU)!7l9KEykApHR
z+XGgk!npaBtmWiS=3m)Iz|1W|?fa#rd;5sbOy5%<@^Lc?Er~%ED=gQZ7y`gB{a@sG
z^xOYWHH`msGiC+c7j9-wrOTI^Wa){GlME1?ObBUw&u6GJE7T~IqtOJo8(lX%=2D5q
zDix-wppK!(nOsL&il!2F!i|Yx&dJkTei*WHzBKeyhKAM}@(<uBxEXEGL|V_Li>9|I
zl}S%&5a>WsHDy#@<4*zYC$*isM=9fCDZS+p^5%DHKhy}9t~AhYz7nqHpMLN=1J&BX
zcljFtdR5EBo&`fH*sX>AX1JVEuh%O7)HRWM{Q~L7!-%vi6r+$olr-iWxPCS)5nOHF
z`#O(X^Vj8W*iabTH^Ud>em!d;Dl_-!x-LRnM1Z$R07uxk^1J5HPREq6{tx0B@ormo
z#?sddQ~)Nsq1gi14<#jy{o>?&-E?bSFkK7tt|<s0h+@|GK1rL1^#|+Ke<M2eQ4k>j
zgOGutb$WhudM5L`8T$ut$A!?Sz(m{AvL5}SogPaL&<Dvx<<;ihq%aIObB~{?Iz{V;
zW|EM5jCYqillkxKeCO80+11FzRZ<Xa4)m{!e#zEOkHF8Xw?`&d*8c!YT+h?jsHn&o
zCgNPHWu;`It)34w8kbYPOIrT`Z_Z4HNp}YQ8k)MyzZUG*Sd-q^P#3`Nwmo)9{{aNV
z9!kX0*BPpR%F}RdC%qh`2eL|zOV3UJ1DH;}IzbX1mxA8+h0R<`n=!>av)x;WEO4~>
zqFnTzV8C?;`)~OX3Hxzo1Y#z>s-t|r+$GSj1(uU?F@P}ANK*FIVNQzL_-;ozsw;lV
z_}unBoLqT__=~vFi}p(<(=p-o+#UY#n<6#19vC&}Q<>I&HgD+oi(MxN;T&B3{LSd|
zsIj`2U$mI(KY*2kq>!{_388<%YRl;b+3~8bAbfZT0Qf@1vz;AuGG)zEN%HX0xvsX~
zhbz;bfhZ3!E9Ml(tNDHE<Z`;V@cajuvCx)>%Z@(?${Y9Jn_u-;-&fdShXdkr#MS!G
zCV?2kfG@(wF)F4z+MVZ}LpktBFXh#y|N58x@{IiwRsCr0*E-f7Q|uRue=B&NbHDx%
z&^ntt5sP`?b=80TyvWE*<^AxLs@*Mal&v2zEEmjePeT3mqYjI`UZLCJgE7T!Y7g)6
zou1Cx{1!eN_rrylJAZzq;(PgK;^cR3u)n14Bo*o;@`6D+iFx9qaJowKb+<9XRsZ>=
zWA+~a%TE>in9q&(<HJ6}G;*=DVrTiELBhw;+~O;)#-VT?VZh`2^UTdBXTGJE^7NqJ
znsVF{dwel;7f<|BJlUP5SN{OfVXpQ)F07mwcW)lJO+M$`Am~9)wL+3t!}vKrLusx%
z$NvG6Ry<#xs*C+v{@lcD`z^s=loo@roUvSTUr}L{i2A{dFJl!>JT0%r$7P?nQvU%)
z{NlwCLvAGT58!dfwH@B>=d1S*AW!fQaO$^x`0}~cWHs4u@(+T!^bc@rG))^Qr>d3d
z5xogBJFE_1W;D&-+`_MN6Ia?1zogkhOrB^}K{fBoA)=+ue*j+{XSG|QHVg4hzr%S1
z1L`F9!OC(A-}=>n&_BS3^Oziyt@aX0$~S}Axi~)U@<!fULZYDP{<%5ns}57Yo0tpc
zt4;c{f?rvpJr})e<PTP??zU1s87GyB`UKzSH@019+#NYM>PNmEJ2&gnBlta-4)w@Q
zlu#B4R(0|?pC8ARZFXLt%?y|FdI~;RG|!1vB5$=ewnr_$x2qu2mI>FWOphA*GL~*9
zaCf!4o*rZi;|;5ueUe*_XGod5fAk{!rUr9zB6PWJeJtS7Ui?d1Fy$ohJJbJKZ0oOL
zK{ZurQ<iDPD|@ZKLF&y`{8hn|z;!*PUNT#4M`kOqZyxYZmC|Xc%a8JN@za|8$1)v{
zEJ;16GzLQ{Dxs?;^fr9qL`|2(AYq4|Jgl!JQ&x@c?TR{koDlk7bGNKCPe*wR9|{rN
zymJ(;>WwPie9xnJd2S5}#$>$Da<j=USEocF?tdALBpoYMhB;bW=jugMekiC;u?X$(
zCirkAF{z|T?!KUzDZJVqyx67UJ3D;$qhCEfH?E-@%|@x@A7FJzRiC*>a~8J{`<q*#
zX>^{X@wYi9v+2$LB-K|buWjR5*&Mc-v!#+#P4js)L_)Ul3A~NKWL<skexYCcLbMyw
z4O91cDO=Y#R6<I=$En!me$OP^I-d$-Gx#hrTGFqt&ijk}?ptTS!K&EbHG_o`PYS1h
zfC8`4rl!iKCb>Bu@+U6%^N*nU*OW2sjy7|z3#+~ecsac`QCD4CqWTom7wh94<e;da
zs2%sM$hHp>ioxp;9l}`%qxs~lDiGJRF`(#<%i1H&SP1+>(SnUj3<Up9c%sHK#-#iM
zq(!r4F7|LmK7+{-sn@rC-);fNQGHLoumWdMOPGC6W!-VV7JZW%S;)-FibQJ*FVZGB
ztleT77=6!O#uW%JjV-Be{hg&Oj2mz^jBRrn$(&H42$2}-`SVxEqS2QF+Eh0gWR4+a
z`+U3a>gbOWar^#^A%LZac>PO&!sj>I#$PpmFU?TImsgw0r+Q;Uk3lyxj-5ZVmuucD
zVxXY-HqxJXWY{4Xq`I$F_1=8xhZc35PT!24+BVf(ccU+tODl@Osv-iSIPEBl2V>Cn
zBGSA)#Fc*q!56wP_otx&Ti*WwqponHvo?F|w;t>ib2d$4)36hgMMu#lgWA(!soV)|
z&b3@^bL3~ynLLjmZlU}uumZh|@bulqCP!161Ndq8+s=*MX%o7Lrtz|vmi=h=ih)KW
z?)gvMnKql{_lz04Hg*?<Sj4Ku>A1jCti7VvrRnrT@6xT3DP3A5YD<@LwIC6N5!W!L
zqER+vU9Bi7X-b9oJkg2(fugRud0qmDV2bOYFYrwIEJR;-+g?ru(k=C-G}rY;=R{vB
z#tG=6;Lt!N!JhdK(8+Zme=8&}nRD57eT>jVTJe5)>iP$GYzF!52RwGh@8szj*KoCI
zxV(0szfG#LDDO#lVrVG8BI<KZ^<O$HhkwKsf?&SVK#i5a_~@mml=DUwuaFo}&%wz^
z6i@WZK?WJ$`)2x{Z?WZlbc3N+u=O1$E52j$4IjX1BBb-A;ao`LYB>D#XuXSS5TU>{
z_fp<^=bQG83jb$l_3)3EoR|wl;FHhhes#Dy^4$657mPWtyI<>qF=wU7@Ban9?)I|$
z)xQY;RzO5#q^sdUA?h)_&Ic33CUerkwx5dX@7L0kqb}5WAhvprXfE2@|Mbr7^6`2N
z8R7~@Y4vm$cN)mTpSq8E>c4;U0L`(>d0|GJ8dR|#FU}GF{<-yId+BTnS>ZYz?o)dn
zV+h!Ns&4f`aAe!y>VZ<ABpg>a)Ew~~r!j#u*v1$rI+Us%wC9^L;<qC{kOL1mcBg6j
zFTQu+7n{Cfc+6z97(wI^ju0f!V=o%zW=g;1jnhoOs9TudJ(nE;>3E9$?Nz^_uXn?h
zd)J<*cvErczIXqN#Z%lrfGW?i_FEdg|61#eDgLPTAmn+y|5S}w+E2Qkhx>>S|MkXs
zQ~a{?@Xn8EMd}So2QPwdH<OdxaZ7vuwVUj@!|3Y&HjJ1DXVJ0(grS|u?@oNvpfr1H
zLf0?4ch5P4UyDoG_S0U!L_I}riVveu8~x|->fyARnE<}%HN@iex}HI!eeKVe{p=?m
zSMicE!tPg(7=IZ*c;qAGAK-tte#DxY4ul@9Fk{f{2HgDv3_6+M!{0MB{rpCq_75P!
zwea%U=NjYMpD!TfYagB%0{4ei5qU-Bd38<W<a9ilB3ON@<@FB`APytDDShnxZ$9Wu
zl(%5d6fM-9!`RQW*9y;k%aneuuHx6f5oe}q70LPAeSc^Y^(M8SQ}QnYXBWV@A>Q5n
z)!v7_O@V4!YCn@R*wxyh2G3jG|BhiB+E)|8ev=Jxhfg*C04vszakw<YGlh64Y3E68
zi7*F)P<J=gQzwnd!Neh0c!wG>;RTAE*7|;{eo5jm!1QQSMs>6A$IS2tThf7-oql_Z
zCn%!B3l@->tEqdx$?BYkP2bb4>JomSsDc<`XOAuc3W*h3)A)k+HhC-m0iygKwH}~x
z8o<4O0RN|2;h$G<=+Z)E!v0e&qCY0a_;B?;zZ1Kgi<ghjelIf(=xEV}3ERtV1CR1%
za7Z#bU(QeXjm;)^#p0#$^HufLrr6~B;}?WwyW?<eTI<JjkN&3%=s&==E+pw{R^cB&
zE?NF1O|<i<w1lHn=y>Ti#-vl4-JJoY+R&zlyS(E95dailJ_=<kJ-0pgteo`j&t1*k
z<G<kI#F%U+A%a0pRS8Y;kZ_CqPoW$U1c|jH=Vyr6Ltw(_r5nTeFf2#ediddrHBDq?
z0HrBeY%Dwdqt5iakHbH}vB@y{F1RV@j5Mq1_NX^9=95jo<F8L^yKtI8d4!#|+owk(
z{m-tQEAr~{nt(CBiA|XC-*hrt1q_BN?+eeT%Nv_RJz<LB&Mx1N{UDX5_UE2Azh0i3
zULrdmt^HcRC+B`s7l{^kI-Qz){y(S29Zk6DM7p;)kOZLIALhs7OL$$;WZFf@sSS@`
z-s}bA<ov8&&9WtF=~Qz2{jCZ~v>keXZ&w2__3(Ik){^tQ8eqiPZQ2D@#p1bU2Z{14
z<9I15f)9A^5r;wy<%gFMyFgxf!?o<R!`0p0=X7BG4aRWk({rn2)aZFoO=mG%0afUq
z7`2>*{Mg9oAe8ar=UvF_i7S+9AEL<T)lM06*{<J=26vlN80KnPJDyk1&-Du3DC2Ng
zj^kosT*8g}<g4RIe<Z|YuP%XkTK4TNhzSAR-G{59=ll6uk$71m-@QA(loYzsEZw>t
z=c{KIz$6dz6U<zfP_N!19H@W%!Msf30%bd2^HtaV*ZZgIFHIcffhQGOmBTur+RZ2A
z^@Y8K>NfoQ?w&LH76EoLAP3Iu;h3@b!aPg5dX|gEA_8Ra%-=Q(<HpPsb0b0bIeSIZ
zL~-iP#>0AMeSK9TN)^rQIp7Y4zJmxGZFrFe8+HhzUBj`Ld(-E&2gdFCd_f-IPa&;B
z3gbVOg%lqbZyWFW)MLH;F~=pBGw(gKbmYY7Vt&q@K8ZX2q9x>Az(ZQj1G~aoB!!Oi
zDZn})e;*7#6H%+MRo_m(9`c7E>>$5yrx7J!q5Wwb>JEv6pFV2#{*ox2D~|%#EJq;g
z4$tS#HtpC*wo;VwEf;)~g~Br)2s3N<-iLsI#K<q>>(z?(*QggUTpIh;xk=WfScnY&
z<!-ff6>=Tl4!4&_PS4FDX@5@@OOeo+_H<@+*2~DvTw)<IZ^7!x;l(AWVr`Jh(=$4Y
zFES^^$gm_4)ZPPuX|T8rMSZIMm^uTB0~blAX_sr45fTyfVyUpAa4M9J>4#xjeV^U<
zISK0F%}@S<Ro=pE%54yWyld9*BG`2LC(Y<gSc2LPrHapARAB$3wCo&&!b<3zN)OYP
z<)nzXA|TRQlX>lS?*fX}%05}`%i;L#3FvSw$)RjMUD6fq>NM(0KLt}?A~9)yhZ_u2
zj|tIESxF_VljTaa&?H;%MfJ&Erj>KLt6kriZL1oBIFGDM{0;6~E}tItu)$F{KM_n(
zDS#Jp2w5+eo~Jt~ZmVfZe7B}_O|-I#Bb^y()5Dv)jeT`TVKBWhzt)M?{1}bnl)U}!
zd$c-cb|DceA;2<nVcxiB#G<9<Eh9?V%P=Q7r%KTp^QZm#VRNtd#%H0oQ@63(yqc6r
ztoN@w1J#*Jo43{egqZ$rO1HGM_~Q;{V$;w$&^;PH2_B*2Tq&cC_`$((iEeH|R1_ZL
z)$>z?o<j2M9$#3Eb@p|j0)s`yD(k^Y*pSul7^(7RTW7d3S}@$IfzqqqQeIQ*q(oDF
z^OZCh6HhSMtez;4iP?wspu8-N-a92|tn3Y~ps>|=)IfLzw{Qm&=3j~;kuql1S6B|L
z4B3}@HkWn}t@rOThjos2ZH9hiCFyD(Az^hm2KMbBt|$Q|cTEA!pWm$y;ZYZ4a1Gd6
zsJzqjh<BNjiT{9kR7axgfut$hU;@S<*U&E&RV$f*jTo>umnD{HNnuCHd8@)841835
zQi0f*9wkML@eM#cc4C&bkCujYkS8Dx=zHnWDv{7@8iQ<_nMpei?fmI?0;keB%fJ6x
zmcL>GI&p+BeVaWwA&zr&JQlEtB218M%bnSPY$&nwr>n>nI1SvUo*hnXy1=@ictm9E
zg&!z8H-tjt#-dym&t&C(fHsVbvshE!EtF3dbP_5l7@Wi4pA&Tsalb{a<Hxus3@p}U
zf4L~kRy}7O^03{J<z$M`+BOwrHWk38;O<-yO}?eIC}_qO7`m%VSJ(==^0k#JOMoj3
zExz6+Hzvfyr+Djz*G7-7_gcD4a7^>0r8c)uc{>ev!ch^m?~q+6$zRrv0hmFDImpSh
zUzvuqVIVRLWUg6VDPNj9VX0%C*~coF+;6~)e&+&tbZil1n54n|V-TShGnPCpeBu3W
zn*ahnn;B8!jX`Ac3iXH@N;ub3$aCZ!B=MTJomMxB1%PWm6D3^Kg7u-`0h{LdsxR?s
zR@H-}OCuSd{Oiem2q}}zdu*}rv<-jouq#4kbET5#%^5*NT0?b*HbN-mKI>)QV7qhL
zQO<B%87X_R0dpjV5#)d`v_DqB@bZs^BF-h=Ww3Vxb=C@e?8m!F#Tw5uyjW@#SkkP6
z?A5IPz9st7HJTLcS>6UZ1r<{)lXOzfjY-^FF{rJVL$Tk(<ay;k^z^blYxsM_2)>$m
z<<-fPcKx1V%%Q|>9|}CGEOH(8wNEDXm7*_7Dx?L@6*TUvk`!m?$8g)n6=^G_Gs)#~
z7A{?86g8RTYXL`^n`pkhL+RkK+8f?wQFhhh^;0A&jB#eUctvAwsHPU68aa&Z5pk_B
zXVt>f%bfj&keIP38{%5fYkT14#{MJ{Q{i%dV0(Od@Npw0$rM6wL^4O^kBZU|)ihsH
z+frO`Rvadca~&rDIRT^<*P4zH>b{T7XqAg+<Cy<Ejr765v(x}4*SgvKXBaC;x1b$M
zR(rNQQC}8X%pfNe7OrtH(wt&hIa@ejgZ@JLLf%bHH(Pt+hb%TmO+S(H6&8d?Q^r@W
zESFr?jyw@!X+)5k8ES}MyjO!OsAyFbD!fc5Yj)3E+65ptnlee_jPBu{9zTmvF8g&G
zt212;oc#FOAz@(Q%mBKBrQ@GpY+ht)Huy@l?m<@azBV;^>smlH>hvIo1-|Ta(EiEG
zf24TILrpGKkHtmbqXk>CxPNcOqkZ5fYpRi<(oRF@A>oK@>gN?DWQ7CSDo#9F5y|y;
z((0dXGFwceC0ZrP=h@I%(34iOra6<1WMv%Pf`I)j?|1jAotazt_mi?IZezX)xm8uB
z5z<dp3CG?B{{E!cl0?ow@D?jy$FxSLF))6{=uch~5+-xfI{^_#FQoQ-Ln4XtznV82
zTm)W{O85$XZr^-WG*5|!Tv<4)+?Sf1BxQZ)%rN&ZOMieU6ct;FU7{@>2q!rkn$~2X
zpZM)Q*D?(#>)Aq~i$Y&;-dpiv?Yz~|W}2HIfptl%l**3z*pJqFg=++FshsVorQ2SW
z$yCUdaj;*$-5&KX3h85&b`+_piCxyoP|B=s)?~VOBGHyuWM$+`J}lR{t!ZsRtKiy-
z?BirtIPggLA;N4}lUCv`6WO;YAB$ohAu*j}4T+ou(Be=AdHeF(_7TSuAt%QKZy^Go
z!|b%=ouT6I_`*!0QYKbFP|;G}0f-Q^<^3XWQtVV;F#q~D2F=+CNB830v?KXlWo)?S
z*tQ<OAX!Zla_bTcl&2}wsZ`NU06e$4rF8A-)Ha*SOLRB}K^9%`%l-!-%_KUf>-v5=
zwm|((@WkiGmqz$C+m~W^j{bsIxPt%_G^4HY;LxhR)>S=mL&6QPJiuALa==5cKuuO#
z_cWWs9nKgPnv;iqpt`H_$PHN0?;rZ(PCIK`c0gXyDoF*gk`&af#hRnVjfzM<!t1|Q
za*ER3!%$u2Y&|PX$fQJ>LyfyXtd<FgZpToz=uGjUm1Gu`S7wZ~hCR9MN2%Tw6Ta#<
z^o%h%IIYfOe7G8*Hge7Gj4t!=E5CD_>y1SkO32)W8E);FI>iJC(diA6?Oa~W6}qFw
zgp!H6K8jQM>_@(g%|BhwP0romAT4`5Kl5{gylTS6Wv=&kqYJHX>;jkiUR{XFd0(mG
zfg(MS<#=wMI;$b$jzP>f*5cECu#e~nF{a2hrrfoA>$&FflBe5=G6}#gBca#BQ-^-D
z@Mw0kC}_9C2jp=*aYB2si|W1y+N~Zwnw8x1w4lviQRVo9#7uil#gm=dU-gS<myyzg
zGUw;`*(59YfCxkF+AH4ISGua?0*A%Yq8M;_n7yl1+I$#PLcip2dFj-H!h$lL5OC+y
znky$K&L9V55TZ^KXUD~<j|HQ^ZhXgDHPq}$=iT1E$OD=Iv~FXbISX?%+3ESYsvt}2
z>gtsOqJ$lcmHF%kGQGhaA?BuWIL+59TSKG?6KDX5zl%iw!2Ls{jXOgzI@0Nl^}y9+
z#F(Vec<#kSf9b%ui6P#K_?IM%TxQs~N%ox}ny&JeHQ94cn^c9{7{2QKbK%u7T&}`0
zI`wdw`WcbL5%VPL-O98?n%Hbq+p@XieK7DdG??>u#sf3M@~FJ_TvtmDvpbt@`rpKA
z!Nq*rMa6M()a6uNeDK#-L3*BM8lO?7=BaEi$;LwT6_}gS9>rFZ-E7GoTOX{qeD%p}
z$G`((zCItGAGFmBvT9`KW4|^%n9_4Y5qNemGeh+ne|;4`ba{UBfG1{ul7$pyckc4m
z&c6>GiH2cS8$R;EpJ#tn6tqwH1!Z?7a-&Y<0dZ~6o?L#;YWEZGglNRj&5az?p?mJu
z9^YTQR1#!`cc5dcIy=i@c*pc!UGC>o9Qd9d%%J+T|LXK@CzQ~^!=&~>8b>6vKQ+vU
zbgQmK_hSgU!bK4mHD3$aLOg#0FZ`6FnfCa7Mb$UaX^+n0<?`=W^F1Re*KY3j>F0jS
zSFsg|N(%3JS#-jVCtm@gOYg0jtE(5vBnai>_IG!@cDKv+1{mF_LWfH(#jG1^z@lEJ
zFyhHfqzSy9^UHgiM3ni=tu^Zhcgb7@DiF$U0l|OH2Zw_@tH<pvKF2kTfpU&q>KW(0
zt=63s8+v>ftQ+sFzUNJ6m9)B>X13w)O?f@jz-eU~94mPzX02J4@Kvpx-(nVrB2Z|+
zkS#p{T>S@1n`GLc9d@EMSL`C{PVHoFgo`t_;drmEXcX{i;Y$LxC`p1|#b_B=3Ig)4
zm$G?%G3ThQCq}QRN|;Yrr;4mVdif+Uo=rE)|4UlLU@=~(0R1Hw+}UwK@P0o=x+C&Q
znDp!~R*RV)I#gFz7zYWJJunp+vmpW=vl?jtZB}1f_0;#f`?KET6s4-DNZE3PZt2iI
zHI(!Z@S7~dfuoVy4X@b+)Xl(1<#OmN8n%~4ZPoKz^#D6skr1X)|DmfHLJ_y-`)+-S
zA^;Z{pzZxq?x1GJx-5itrmAKX<;&-omtv%#IrBiA;Gds!QIYAU)MXlT?LX^aMgP-B
z*L*4Y7uX$Ceu$|A{RrLa2+U1H55)LgQ!t&4;2GF&FiHQ>d(me9ENOV*?=a+75&0M>
za20fru2MxDa&8M%^M4_SI^ZhbH%gLdsT0&z6=H+=z5KpS$>j^%d#T13J(R8zgmm6)
zJT8{ER+>4g6gkf~6`^hO=rlUoxlRvN$fB`es4o>HTQUVC7jnZsx{JSYWT7(K@4h6Z
zdWdOuo7;=&5F6o0*f4RVU!v64UYDqZ)1xlva$t0Mx!DWjG5o>pu4oK8<^NrASATD{
zS3dY#y@JI~JL`!1##oQX6g%08;6sZ#n--x_$zRB$U=DCL<J?dqK%zLLm(g8Ox@_Fu
zZLD%g{58vL^!w3$Tw>>iP2H%_7Jp7EY4@oi#jEL?nP{SM-xzNbysx4(=mSDMjPGqe
z%eZJEf9U5d8IhB%eHgI(mgT()0f(Ee2g-SnU>*;Jm_AT$DwNOyK=IH>8u66B0-`%U
z@g0N8ViW5xPrCjK&UcU9Un>8gGN)ctVpF-oY2CZwvaQD5Io4>mO7GGCF1Ov*mPI2V
z1k)7BQQlL`a*DBAjT`-K`+r5=Vk7lpXkH)+z^rE}(OR`C8=Oj7TtJQP+V>ap08VfV
zNz>{{2iajq%nR#wt(UAWURgP@I!PWjpD+>xIoBv0#YH@t0jW#vXNKS1Q%BLn%~T5c
z^3syN3{Okj<kz1ZS?x>BQ_h>tTf$UyOZiuE6lv-#>cT~${zoZvy;$+@Du2tP8PYzA
zI`sL4W6R$;wSDJmHO!PTnb@CE87}=*Jhi;TQ8Pu<w_+gjmo-7PAP+B?pp^F$3()cr
zS#HJt@85|p453TrQH^aDP3kKo&!uQ*l-1vc9NgKm*D6X_WxJu%#SG~VI$-xx&yPyW
z6(mb?_{`1>LuvH(ue1oZE@0HKQRzu5ky{p};oy*F0&7?FnUQYyru#rJ1Db#?(YGLj
zbO;zM)0Z6%#*$p=n>}rK_}+4WDGFVn#(5?J@-~-VW^;tNDqpd?xE$$YIef8_#c+^y
zlqtTYy)r=a<TM&jac<Fs3?6IurdBn7Jb!!o2Qxn4)Oo6BAx6_|`FqM4Mq=)crUa`!
zCw3YCKs2lUwo*D7mj7eTvaHx{;ax5`fS!#uQO%)~*ec1auTYSYKMAe*jak^E`}C`E
zuD?oJBXY%k4v^uxBpy>T%Hz7=VoIq77{{+z$O0EfLqT5uZe7WVsB~2kFSX26gq181
zp=CyzUQH<TmTZ84?O0$;j|FJ8O}L3Io%UIKE6Lb;_G4|s;v-K--_jf3-~FH6Kj1A7
z3AqCEEQ`N$N)|5nld2D)Cs|NU80ifBe3$5eGn&iznNc^TEU$=j6$(pHEn{U%T>KFe
zA~Jo&YZ*42d=VP<AVN~u=N#MghDsS!!~tk=4l@3tbt(gNjDt98i>fF&)EO7gmD*rR
zPj39e{6ZO4EgK(@uvrg_4a^0T9xEmS>zmKl2fnN|?8=9kL-KN{n;ey_#yzb<rGL;P
zB=alt6x_@Wwf#qeMY_)k+54>^+D~lGwX6_SeiQy{)SnPoE~iMr5JWS)GW#n78zXN$
zFc+Bw!0pmoSF8RWUUwp~>hk44Zlm|0BiH$XW$(Zom#SVtF%%TQ7yVHM+L@#rBBdNH
z$P><aHt1U4<^j!dhAEc#elKKJBEIQTP9{yY`hcEG@>uwmM2EhVNdl<SI_Hv^%=UxL
ztW<l^$~K=&cFE3={~(9Y&gH{Qn>n_NX={E!2*{R8-e9Xp(RoVioG>0c)Na;XwF3N!
zt+r6Q+1Bk|xw#OP^~2fQYx4|f$^;M7e3jHk%?FNwfuV2(^1NQnd-mf_7cZ5etxjBC
z`<f;SC5IWHRvs9Gm6d5{$!Sd<s2QLjM6Ou}SFbU3r_-efl*IS?@xb=_Hl*f5`Xj^6
zHZ{Ff17tGY!xgP0JpbKaz0$2XhT6AqTt!y@zvh#4Mz<W}xGovio`Mf~bhE|}a|c5|
zoLmJDU%9)|LC9|1^B7x|%A+?7X@g5K50D?O>h@ANwYAMS>lag_fGt>>@gYLGJfW0I
zV}kygNsUP^iBDh_Rx<I*p~|A9Yl;uHOd)-CN}T=JX@eU=KV?R&_{Ks|6PqJECAPQs
z<5q-3HCmMTD00*tfIh8>q^AN*^`VA#{9)x#)gqZlCW2Kx)J#|p8Fl&DQIYLIsXuvM
z^2Q?}ncMPw&;!h;i}^1U=R6PfNiX(Ou{ek98+c_GEx!O7xM=}U0W<A=HhSFDD{~8X
z1t!;jJmufY@b6eEx8(>Xg7{omIhr|iiQuE7mI5(Gtyod1Ef2ZPEt|?5-m3(V3+Su7
z%aJIObtw9Ppt;iMkM^r0#mapAp@_oX2yj<lw7h&vq;XwF<iFi1yi2%QUq)=KRkmx3
z3kL!N-u&jMS5!#N&o3$`)z2{SkU->j^d{_h65e@5cCgNU7!^kas$lH7-Kj9I=x?KN
zh%A#~d#Dta)(@v6*VUKv3cbIu<0|laL};-w`}x16O=yzSf9fMC_+%aJiqBudtiZ)2
z6B6|CM{k@=9S^G@>bq>a*S-mOS&H#9^s{!kC~<EUj3j5%6GS*>C(4r>Hd*38HK9a+
zk1X<?+PonI{VXH<NecuTigq)wUSP3|k?7*k(BA?r#`>WG@ii^5<{{rCwKx!`l;ds{
zb*5BNU%(%3#j08O-XT;k0jOBeo7#Z9jThWoYU={|eaM7AQ#7pjH#!zmso5=_?9fZa
zSAaZ+_iuqFy>8hgeSZ<$yf==OpTev$QMoi`?CTW=8u3e<A}0t&07I7N`!Tz0LtG)r
zbRs(l`l|W<E&YpzA4{#K;9KtW2VquX+rohIGNLGRT|n#$_+1(MLBN}jHSwx?^wvMi
z^Hs7m3S+zqFu^V&LU=-CX@;5<640H19JlF%s3K~Hz2qc%@(5{$p6woq+`PGh*=<pm
z?k^~WrLhNYS6a3+V1L%K{HuBaNG13Oze|sc!s|&~&OigHC-vCE;Qi!JKlIA-L9Eyg
z$eF)&R_GcY8{V-lN~=_v`K77O8sZ^$Qk~*9ioI8#680E_Dy9kgwPOxTN3J)=XfJ#H
zh3k6!$^W3f7h$^I%d~5>o1N`lxlv5mgarLyGlsD+T|6tu?9*M_+}<&WycFQ-z$oE5
z1hNZ>3+m^qaH3dFh7bzVHXObC`l$`MqVhT-Z_}04L7+(wngUlUg7MInFH`FiU5;uM
z(pf6$ws&-R5EDMga~m7jDzSMe?rd{dzxAedo;k)|P%Q2~XR`k3u5NT25mMl)W&FAc
z+n&?1XdcSNMty_>bfbuBf)5eKHaCz=n2-G6BwV%$rCwJS(y*Nl;Re=k%jJ*xzB4pW
z9Fr>SE-vJ-Egz7H{5H&F#wAkaauusiRnA&Oox#J$)S#gjjNj6ml5*fe&3*@j+MwQ@
zG$(e{H!J?)ZzMQK*8q7ByS^%AMi$1gxzVg3A1P3ve`e=5G&oAa32|r=JGXu%tD&OB
zKatE%Ar<GrDBi#{Hu4Z4>Q*|f7sNJrZ{wx-oRP79G`xZJX~c0zJXpu4FCxj$vgvyU
zlJjxpQtkSXv{EWuWLO3L7Une~__<!Y8Ad1e=)zDYD+mE|x(+bH$PPrpMdcSR`Z^6e
zZA_3UERMO>HE-7s-6sB^cXGWKoOEP+O_2my<bW6b`KCW-B~*@`gexbtK5Ob)L`<%&
zXed=YyQ%j6UgDH<?BqRuMq5k9>$Yh$1B!zB_gQwoJ8X)q=FiLBgsBOO;Y<W*azTQG
z8)`5`ISp1cRsLW?O7f<<*6s2D2)K0mD}#0b;CsWbAq6!5DaS&OAM~!i7RiIjsuQ(y
z#7C7r28$0$z71{fp&d8u1}3420htL2qti68S16#%q3mE&k1q#&tFY7=NN}vybgbv@
zgS?T)Hb%*qD9CzudVk*cf_pV&$m<g4%lL4UlPE2o@9RjsJpJn-K>s1Ki%6$q2O9nl
z;XzuL=lRpT)2@AcFXsGE)poI-n|r%3ELCT)x+ru<Oyb4!pqNl=$kV!cTqBTY^=Ph2
z9sSi{KbI3{yZo?TmpFx~08$bSPh?CJ9D?O(otncl;tJp1e{L0ahy(yw8S+Gbg^#b~
z>44(qzx082sg2yY#j}x|O}B2uzYar)mnp3nat|-AX+A~hlXxiX@$KI3-rBe`i-M3p
znBLnQNOb1*Nxr{DRB`cgc}2oW$3WJ@qM(ELQ146+i(DGMrK2Y|@EDIj-|p_CmtElG
zd~_;pj(Cp}UNgjaj!Nyp^!=N;R~Q{?#n9<2toq$5z9s5{9Z~OVXJbqTq5fphi@4cD
z72}PXYVgDEaCPo+QDO#m)EUy-ntlJo>}SvHuG=wRUn4ixB~f3x=sPO^6N$%q^FW2e
zSl37k<~h+0eJWca+NWsmj@2FzX!Yd9gc-fdPJy(4y!4t{Keq;5&2Y0R?*7ZYO%Y5q
zQB}<7<<to0=Q4GcNT2J)y`N)pcj8SKtNOTv>kfv=uZOQQ#5k4~;y-uulLMA<tc4jm
zZ)~iPF*LI88LIr66q&tQ+5!Tm#bi7meEK18BV!ERXWZY+HKXoUOQ~Jk1wKY+BkJd0
zlBhgQNa_1FKl`5MWX}^t5`NfJGSPnMS5m_55)ugby8>OKp_lVPFLQNAWsG-@mwytI
zh6oF1Dt2%N!F<~l`tTya3V?g-DzDqizJ@{O_D*&R1iGOxAOJ3YbiIEGqBUb+jHHp=
zy}94Bya*w{Qw3#bVZ?%%P#Gy<85kv}tBnclU#XyxI<G#e(@7^rw}TS4SDSnYDDW7W
zz+-sw(ET|`yvqku4_|2h5}hcK=jO0z=$0+tXD2x7yA|~34qwuW;9wY87Y!%uWHPG6
zCHScoQ5y%n29na2#Jl=`$oW|nVNd8fJdYDJ2e7V+MdS-uH*?1g-N(dM=`JQ&e%Gi;
zc(-1QcAOr~5Flw#Nn9M?Ur%xbq9Yw|K@%Q7*jQkkcjK;E;$`PF$<X<DID1+%x|5AN
zEtO#&XW~4#jW6VgTIm#(LjTSzYFFD#9Hdb78>WwfVx;pW;<U<Uti`Hy^1B0GHwZIr
zs2SogQd<$ks>UYEL>XlT(mR3$0Z7x?U8Z=ymvU6Mj?E6h^IwHdO=_F@`$o^{A2j2b
zmWG|u-7d`(BO~~?^B6rCg^Dc1{64k%fa*$$*3RtfH|;nsOF~eV)_~6znUvlQfnIE)
zX<oZEH=H}l8&a}w94t;Mygq5S+lp#_%5&9H5#R#4I0~JU7!(g`sWAaffvOA`nL%)a
zrZy2`-TA_y^7;4dY!z_z7WypQ7jTF@EDh`kn)X(P4SXGIsg8s%xjsC!dL-NF0zc`X
zE?CHlnbb>|${w4e=hb3R=lW3d8Nyi4c0+g#&qfnJVX>lAoGC{98XEk|J2r%DCntBQ
z-`%uIPN&!QP6%EJ)|B~9g{bPX^_<5S1yH-Ps%aiTG>Jq7ma|E0pf|4OrMglD^*bA@
z+&Nj-`3nwn`;b8V@6!S>R*OHXkOtUBzqtT4R>8I4fm3hn(4=OulDb2<f|e@JyANpz
zYVlJKMZOG{rkkX5eqSOk3LV9|9J1_^xTv?41^?*1PL^r4(s|2gXJ&)J5%_lD<B&V$
z7b1<fVYX>~BcLBi?J-UqN0KinRA~JzHraSo!-eV#Rw_DWAx4w+{bfX^c;{{COnyd*
z9AOO?cH670H8h?EhuAJ`mEvrvrTsZEp=lhK)K-^``8jQKAAgrSu=0~+*lvSM#7Kt6
z&^Y>*c!rt8Xav3GR$twP8gf-tT$m|_2qqtf8KxeCp7d}z41aL)E`=!)y}F|W(#D8&
zc>dBNEEK%3l9zO0CkYl{acQGgI(@4tsc^6+Dd*$iPOZyP5m1tyaqJuF3U6;a5)<-^
z4h)P)=TRg5_Whu&+pFHxpcG4r5I;r5A9Z6_KGM!{IM#%nH;C2no>M4qsFyZuFpAWa
zv7>45H(wGlrTc7~)2GJ<x=TBaEm1rsI<vq>USeu-KHJ}^=5~piCK>}GJ=YP@M0js}
z{wh7FF3z7U)t5%IwrL|?Z!!4nfY-!pr_)Gk3v&*sEE!@`-%;!55TcU?ZEdw}KLjsu
zDM{Cvf-bZ~3xzf&HYOUX`+PWISqvNQGHj_Vw6rXdRyQCpVM2VUGTi?n?sHjfYu~Hm
zhtcMi`NgGu=Mx2?Ch^jdZOW&Z&>|j97KXzz!ePddO4FfWQghs<c&RT!i=GYF8ZL26
zjw055X5&6Z5E`{0{eq4qGc0><@>iu&`s$lp{^|{MBc-fr^l`BiCyYZXoTBpa*#;`~
z>H+E=y<JI6pQR5TzVFzY!dGod4M$5=K>k{BkwE<@rK(Dm$B|d;Wtq!0OIK@!14U}?
zO+?KRO1YJbmS6PflvsAaCdQf=?|v@2+cKo5h!(=>dFvHDS`&^(3y4MXsT>(b3Yq3l
zxa+^i-=WpFU+%%h3`?E!w<uN|yga-J930m<+2>lt`tvT9J2DxeE?mP7pYsp8;&#co
zY8^Y2C~zg?!bz7SG%a;t(%RZ+3&et2<Y@*mK*(aHO7)v80!vj`bF^)#X({I=(8i;V
zWR-p><LyIaI8j7mgpVfC!LyL8C&Lxu;VibR{#0kWKO$SEIh7m1ybuqlKv7MoCQSaf
zzy%Su2c(#xFXJ65Q|TLE^d#$>^`d<-da~#Zb!zDAEUBcY-a^88O^7S(UE-*3>L!ob
z^1E^k9RnHiHrzWrSu-()n21bg5-T7+A;|{T@35Vn{qKIP=uBh%?pACKtuggV$c|uB
zH2)e__AC`jqy~ANVxgYgkj-RzEN+p3BDsY4l7bO=4(&wbZnA<NnA5Dza7Ax8M{7n^
z9u^EdEVgMJ2H&F_%GLDiIuRuOi1m#LX(EX&B_*w~teD=`oveW+PwjV(fa*#ja^TgF
z7<T1wNpIv-?dh){YQOjsW5~#$Ia874m@sl}W62<fL+no*fx0}w+{F|b^e|E)9*qzt
zjTG`SeP<eC?_W=4xPuDd!4cae#Vp~01jl#jKM18qd(vFxZ1~hNwB+6rYik4Y<l-;x
zkyVv_t^AiN{Sy!A)q4TET82o=`Xg9z&VUwHB;+H641Cxh2jTDf392HOl|^Am_}uMt
zi8|*)9Yz|d--{A)v4<`gN*(VUYYC)Tvu*s#h~`LsM>$5<1d#=;3u1>rdh0C;2{oS>
zLC9eJhRg8qQsX59%*dh~>hl<g)Q`-eGt(|H!c5IEZ&kg>fZ=muYUMWt4t5ra!vS-7
zBuR2*j2!mmG;0EAm!Ji!Ikj#wwH7*BW~8DHDc(?gjyA7NPMB^TM<2QCe>jHOSaO5R
zfpYT1FOWEz6f8_wA2upY=%4XJCT7J!A)=q$%gDKU;S}79kA{nD6!wh`$L;zv&i#K{
zn54vc$u+O(T8WW?R7taIKs`Tg2|z|bVM&jN-BcD2LA|usitXFr6!RF&kcL<L$hj`T
zNx;-06?K3o(OO94o2s~ZZIY@VAa^3zKY$y@++vgAGq>9ZsS^26NdBNfI31^}R*|xm
zsTI(W-Fm>zJ<hSzc^4n4*Q*DThEqqB2sEaAw=wWF%krB^Q3R6nR=kT#US;bNrd*s(
za`-C_x$Fq#_lfh84jjoksi*$Jk~m7+2cGLQiC2>@Uv0`!{e28ybURHQyRuhpkR95i
zXWRdHZG3XYvq}l9E`tGm-2^`@lQsa~UK$xon$`L+=L$6%63MExtWQlW;&{}~URwoM
zClC#cm#RqP<Vm!h;=LyYX*w6y>}}KT8dIsrMuf;wQ58^E9g*TFme({=84+fwbB1DB
zRFF*S_|j9}>L}jpv+_<SF%^c0CMoioR@v`vCW39`%<1*_9;5lIB&o$YDR+GJ2fvbu
zL_j6h+cldiQxh{j)eR5J%oQuRG?`>>RwhBp`KT2sq;V=4`G+-@K8eT##tu6aF@}7L
znC_-gnT}PU?|Y=UX2(yTMc-LFZA?NTCWI=pNuuzE&+_1~gt~iBO=iolDzS2gjo4$x
z1uJ&PDkv$=2oiHB8{8}!|9IU^sY8Xw={hleFRda0Q-~#MNebPl&$fyi>S57}irpMQ
zz9ydMH@q{I%hP(YHvbccpXsXVz$2CAfaExu3L~igDmgqBSg|e3`c}Jn=AE0T3J>+A
zGk2$FW;Ng&|6<Un8KIq4d=lz!Wk9^a$MZrfpu?|bEMNM02q1jsAR`HUl&h><STk+o
z)|cFb5k$ypv<>TfmVG;`oRlIg-!qWqAWNrtDH2kDP;>Wi1^;ZYp#X<D|7w_2&Yc<g
zV+SxL{i&uoqQK`7>yLGBp0v15nWRUNI%*ude6K#KRxW2i)X*Gi7{#lA2T}g=hLOIO
zEQL7YYn#g(Vi_Fw<fP!_nPfrp<uHO@UkjwI(4f7x3PmlNU;m)_-fg)o#qLMRN!!>7
zX?km_g)M%3W&1Jn_HU`?W+%tq^dh#Zy!nTiJSa0ni8BpXxq@T+k|~tR=CPjN$`O6)
zD6v!#Cn8cYjhAnXu2#7){{y%jtYD*B^2cY_TO6I+;ZyX0$N}ZHrV+-KjV-gmxowmM
z(@SX&w*KsLtN?Y&{yehS#<+$WlY{_La<XM?Kw)g0Fr7O9{3+{CY<~RUc8dW<NPoeA
zm0DkroSkx$7Ts%>>0%Mm^Y#M@t6Mv54_v+ol~*0w^q}|!&6b(<#?2vnx~l>{>R?<?
zgpl7DtZvbcSnGA4Efm2C2^@x`a(gU0gGA(FmlW`Z5O3Njg}ZMTGKCaF_60`?Q(09N
z6fNI5$Ym+PYOLlQTR2LZ$cZ_EK_vScWL#hlIjdK!9$QS5MGH-|W98bmNe@MuNq9=e
zIE%7XFmfZ-u*QDA@+`WU&;tSS*OqO<KpQ$1%;-f@MURzI9TJ7^=~2@mPHFCD5*n+(
zkY?16JPZmA^E#9oNN&ksveJw7QK@Zkd|`pD&17Ih5I{LpNhan?(pH>#fJp@7{!nT}
zlu>DvtUC23+7;Vh%_7E2#Cn_n+U0Ki)zqRaHD|#B>n{(=@V_KGA;+$_{mh<h!wQD0
z%@k>V!4D@Rx|vE;GKlQB88C5Yq;(YrVtuN17>f4<67JcvtbhMr{93+3sj}&Xa%e5=
zjnC?G`|&Lk@lU2%4Rw!BBo2b&KpI;*J0;~Lp@Om6fl+8wPY7R>D$ZTPdU8$ThqqrF
zi+382h4IajZBruUbhT?f5AaevqtrTqj5>K5D1perBHfAu*_KJ4NTxaw3hu*RpOGIR
zuYbNSV`BV>&QXIDDspbDKK184FF!1v;$2d0)Ypf0c23-vC4#^1sLRW%7X&~ofQK~$
zl{iCHEFeB$chB?b@#bR2+I9xSKX|48B->RrQ6@l6?1JJSYO1pbr!LmsKXEk;snz@e
zEV3R=sHQ^^R{M>o>fJwlH2th#N~W4ChX^V2%QVVbkGCX3=h2dLx#P+)4BMAes%o(c
z%nz+`(Tfj?VPt)-69LQK*SC!E-kl3qN4}%hew`@P3IjXaV;~Rw{<%l@BQ%<8g$s-h
zu~p@LmylSO!s|W^NdzowuEWqzXw902s}nB0vL6t^Chwhz-;1}>dNomwg3?(mF^B+_
z9_&p66G(#PZ526NzZ=jJQ2G2OgyY=*dYGAHQDD;(QeZA_mG9}SV~ciVwCF8gq7c=p
zJ0>$rA^&x2t}i$i^zOs9_&R@M`T3|+T_S%qL9qy$E2A0PP(qeRIk5DIDUt2H>_Pup
z{#K52-zXE6k@v3%ay_<pR62~-w4RNzZZTdTz0OC_A~P9xsh&dDydU@60eEsq7#K}C
z!{f#7wchGytG>=z?M<^ij-PqpU*`n`O~*4-ASpI81FmcRrIS@kUzD3iT6kBp)Do9!
zv!KP(ij-2ZM2iho!w1|LIcmoL08Uy__FBV~1Mz)}1+mDW=#Jd^)n(bUjDAMKVVnW;
zY!XYi54?3*?1hNJnB;9FPA-Vh6X*F^{HJtz$$%&*@_ut1hG3(KS5CZMg$<JpJ_*Q5
zAVojB-r!4D#@b6>^~r7e^uKVE2V7IOw?_J`JzP(ecMXzZ`~%o{TFW-eDF`EUTB*ES
zeQAD5afuaBXM5bcO$~wH3IXgz1-pj2ySq_u$J{{uIn~np`MQVOk)EaxPgkIT!GVEC
zXwZ_-WPjhhAo@puC3E#KZ1<6$Er^*BS>gzhWf3LWRkpkud=&W}tWN!F#m}bu`jNjZ
zWA(EE8ObU#I}V{7&(gH}ah~qw0lpJEjp6<M-k(V8`@ep+kLV$;q(@#iSEsAnMG06x
zD7-p+eV=fC-SjJ4i>1Cqr{j*@532HIMj{a2oDV#|kv*?2$5Ygd^rvBo`9!=q^x1a|
z%~w;Y$hYtJxIdI@YA<K**7mFYRDy)-X$DAiiM~4V@yg=B&N2Md1IIv$+v3@AovTiJ
zyw(QxOHL!8KshR!sxBCD<7y16!^h-IfL&3Z-K7hGK%_pXb|DipDU}@Gj+e(?K;|_K
zCRO+0{_bi=X#rIY$Q^_H%HslAlSt%YExP^jW=a`ww~B(sOvM-f;pxoFx++3q43mMT
z>1@J5P)=19e3%f6u8Ph#Cs!c6ADz`dyq!;hcvy7U`*mB!+V``(%-t%9LpYUqp-pf}
zj0j#o>E-pk-~RxkKwQ68sGwkH&&%`njSz(3<n;%xKcMH=Ne~77-zNziR!4t6-;d`y
zECJklW1ztNG&)iT+mFxg)mHMNJce*NjsWv2K7b79rv+iQ=WJy*m9JgA?kXj#Y*J^}
zt}BkI3X4Rd(%4+8g;J?dc`@NYhQnZ&A93ZRcEUzfNC2HqH`&AN>$Erp+laTl<pz&(
z@nv|@koCoIy2DdrZDl5NDRCA}n5R-gDhWc9^@P*_<F0~)kkUXpLF_Q#PLa2kTO4!l
z<ryzs7Yb$5cz>f*qoqls(>YfjrMNCI;z>-&1TDC0BPeAhX(3K$UCyh|s7;>o*6O8r
z&MoloIa9pLB>X;|3Gb>i#4a#tC6g+kmrM|nC17o-fg4<QQ_y!HwU3d9aD5rP4UaYu
zao-bCi4m;y5J)_#oqeU%zg_k*e!>v<)c#y%uV0%|E}~?Y(Cn8~R)?Kak1b%5UXHaK
zl^^FPJ@rD3bIpl4uL1W<Oe4cglqpDkE+s>iGEhHRvU+6p9rg9vJCmd>PCnN%%9Ms>
z{)O~Dk&Lvwd<!_}M?<Sql<6_54ZipIEcLcpXgH9TCm}xyntemz@f4oQ^}+MiIBHmu
z!OLmu?>iH}$;W@57s}e5>5>@iQHW430V`{dF0O*bw*#rvFJ>2tEsmz%5GotDY|~K+
z=%YsWo4T6~u2Wou00^q3hQJ1MCk1Lq%ZOG<>88(v&Cqjfu32`4&g!GsJCddpsVY*4
zp<PY<F)ASh;kMVzl)2axt3AfL8*XxhrZq*BJ04mW8D;FNnk&ih--RR*@gtE+<tL%n
zKkogfk!tR3!EUh|nx1E-rAKYhOF@Uvyh3%A<NTi~<muZ3OSMA0Z5y3P-96vOV|&}&
zLECIIz*y2%<Tb8LbZ8!($+_ht00I+z;FC)w?`0tk)kXSea!?9ptu8vG$8ogOqqv`q
z5+<~e8<yLM{{Se$+QIbdGz~SFOjYDdeoL=Y+HlmW3vV2%hfRd3PV#dP(XTD?kD2Us
z<6-AjtCS{fo12<j6!_?Vi&R&~CL&da-=j)Wy15)EevMzv2OdL3Zhax!6K!`otXe`{
zbV8=n*5N;(`qokdsX*!RmK$&<r~{imSUU8O^J?jo3&kUVdx34u_U;D9xa(|3D!7~2
z^1Q~HqF?Q_(CCZ{T0-oItiAOEppn!NdihD?pAox>GUvW!KN4`{jQpao9zF`>Nm8U1
zUr0X!TM9xJa0pUDxqciSPmxhjs47I&KMW<jKP`gMfP|cu8cWMbO8zGbid;i{q~$6Z
z8M@u|BUiaA5}R7%O@5^Nj|YKvGrY13c#xFxhg;}JG74NIBq!5Yi`9cob;Q&g5ZhDS
z;l!yg(`BJY!V6r51g;4}%V}}9k?{Dze9CNsCL%kt9f^JY=Jr2-rTPuJ3)=YMY`Q$3
zB+6(ZQ14F?2IwR#Y|dENtA=JeiM_$-x3)8iYsIG{ks!iLi7le4%z+v^tN=L>`dBJM
zt*9)7Az^7zS;E1<4;8l}UA+;7t;E$>mW90UGc3oI9W9Pl(o%;4CPZ+Mkd&w?Cm@9Y
z0$IpVnssfu)MUqtP-P7v*iOfCGwvlyTTZ<jl(Oegq^yDoDaq~*v-%5D<F>+@kpiI^
z)VnOiLe&y{Zv|^)rWBN^#?uUQubC=JP)1HpGp4%0tg;4eh}?C(z2kMU9-td{>5C4Y
zq9=|3WkOwm3in3Xf^62XU~ED2U$46x2XE3FsJ7E|$Cpk^=x$Tdsj(V;3VldhkGmow
zjv}l8fq;Z9Nk|DRI8e@`%DC8l-x{8p;W$uoj<iLVqOz9bE<HYK$V`EfN?Vc~S2ja=
zNz)}op9xbFDz74|4Qfi`nw(U~Pq}z(<%b!mQPuiju!hipK|uI|k&QZZO55y|pRZw7
zA+)v>R}pN-skGQzYA;WMfIao*&~ePqBG;Uh_tajh8KZ5KOpFEfDcb&y2-RzJEH7c@
zH^$9NRUJqF07*nuV6vp2Z(_=`N9AHghJwmX?f_F@?^0`2YNVLW))4g(OZR0KD*@<J
zY0HSEGUZ|-m&y_1J<5^FvM{2Oj{4a9X@I&Us$|m^Lrt*JdOX&dkshZCLGae3q@GU=
zNiB0F;I$!mQRYu7gF8hKYRQW-K!I0|^P!fKP}8VdM~0L(>=^@=D}e=N<tbdpqBDYU
z_0a5y4m4P$KQfCVGsX5|Gw%*l*jtNnc}z)etUBK?NDZKdhj5Svn!-jGb>)wN*z8A8
zFJN}K1m5Rz1}WYw&1nQl9L+5UEy1z+)Qy$9A1sM$kbJCdX1H|$^E*<Wnp#+=$d0wr
zq^Y$=QCX1fJ)~g>j$c_>a-8FU29G+F%DIxPp-Cw^=A*k(zN5aR5AYAFVGQ+8FSw~L
zDXzf|sc($up(w_B<5>j~1F)Kp2Byjh0ZETNu5`zBV+(#Sh7wf4<q9PVCA8r{C>#xB
zsHS-J*$;(ysFK`Q+b$fd1~hP<fZ;r^Mpwnnj3^LrK-Mb3T4f4;)2X=Wdmp@RNZbQ`
z&qIngG0vOY>MDeR*u@|&50S$%0_(q4P*wU8M&nkdIhCDlvXr;rM*+7Z$d1`48Axr^
z$x^u#dXS}_WS)Sl8OAdG(I|*Zi8xvi^k$3LJmp-j6rc{^JMrN@X~^`}Gi$?arI!$r
z78HdP0!l!6Jc>bAOkj1-atQMSPX#r$l0Z4ZZ;>OiR8Zm^=%s$5vD+W&6WnRvEQEPj
z-%ZB-`gcD4_xy27aUOR(uOI~Zy6?YR{5G)O*0{f}GFcSEQIANFw5?BuRN}A$&I*GH
zF`Rgn47LLyWFIBGN$w7;E>R@cYEFn!4KAM@^sU;AVgr*_f|M$sPi54UxLQ&Pb@D(b
zowim$Ct0J81kxIDYH$*%Xl)IYAeR)|313y5qbpbiKoA3+GD+9RD=k4&aa#_dh>;mo
z#Kr;V7F$XbmfLF~Ds-F@r4Tt(I*x-<R*j5-P!3}%9r|5>Ct^45K<Q)F+hVYSy1G3=
znFGiSikASaYp&$jf*6acs33qz+V&#}pGT+Bp?DPd?81g*%UiM?U%LCt%32(iQFct%
zkGv<uO3IfZVI!ND#3)F^B~-3SsZ^S3flU%=F$(2Golx=GW~U(FH&j{~Z{B9c4+Z<0
zKy3@<F0|(-ArFO0J9YNG>ZtNxh}6d<$F|yOr)lx|N|MvHmt09TR|1vJmI+KY-9S)n
z#ULwKy<U|DE6u-F=J(l$-J;Xjj;f5ge9f&bMuQ4Ed}@s1OMIXJ$}$L25;?})NZ^Lj
zEwH~}dSB26z0TX%9rwh~A+Cm*o7+{ZtDG?0yIIduU_(nFTiwACE!eLxGP2-QN-Ub}
zxNS&r>g{x;#j!S0kGaB%q`3JIY4MLNXV7^vq>|$Bw%m6F>m{T?nOsnbYDSAveV3%g
zn_Z}T#CtB5`v~y-5$-4|xvJhGn^27qmRROXa%D4ujc0Lo-c;nre&}EDYKRcmz1mjm
z$u+q&+>%jpT<l>nT5y0Q!lnU|wKVL<ic~d|Rh3D$T!9APZBePu#*<H@Qz_^LQc)d|
zm~6DAHd}_%oXBy~650d7XPILsWs#*-kS8(I(15$z`;s~}hO1uJ1X!(;ui|*BXZCsq
z6_qR-La4ngB|{emL?I+LI?_6S?8>XHrIiek3rz~&r&=$|nO&ME%XPBlR^gczD+*fK
zVQj6GNo~T#B8ruOVz8c85}>posl^hj^9)D4Cn~PZJrXTQsVy{+wNf6Q?pC<7+lHXp
zqf(Nf;cX5&+p-i)hxrm)Z8+nw8JSCoQMsnL)J{afrBNX`6vI^~3JX%DFu^ZZ>WT2t
z%7C6os76~tO4jhZ(V`iX9q~}}6eumZ73yn}IjZxL>#VZl6Mf-?B*a_ADnxLX98z9T
zane2wI?`%Fw@V`tsC8j&#^exh)a}0DTE%e}tY>wezDl-}Fi>M@K+_5VWzkNkV<u~9
zjWiJyMBQ$pHxATM601o?HkVMU!MEjy=T$0|DKAftQ1=ux%MfDa@P4RssvmtPmC(u>
z3Ml91ap(_3i&v&K8a&2cdNV{vl=_qzXFsA-<tZs+B}FWtB|OPzn1Rj|8;2_hjTV^#
z+-@AJuBwJvj+v=KBhgrFt~q{CePi5Uhg)%6jiDjO8%t$e*dp-)H9nYzWg?+5>CUN%
zbvUw|TIVhGz8!Fa*T<g`32_QQNbrJCQd87SX&>3%89?S}2yUX_0cPJ-!DIHUw_r(U
zFJ)0w=2Xoz5~PMmqnyekjNPPmVpXM<)@>(BqDb~f<pn_+i=WHS+f%U2@ZarE<0Ee=
z%tebsukKLZJ7Odz!*QX|x1yB?aD+6rkOO6^)n>NWDCm^1p52EqNhD-oW4Jx~_SBy~
zmMw_}-u8!V{@_AGiF<W8Uboz+hZfOF=2%y?*FtS=p|k?gH2SOnu%#_Tr9D6aA}~PY
z6%r5oIP7!NRwV<gQbZT*Mp`wt!%S?^gKt6><GqN!_s2ZuF_^2WQ2nC8kGRO9LO$(Q
z{{T#QDb6sUagmPM&z28;djR8<4qS9U(f9P%+$R|$zf<N%pM6(tvhtFKMqF25tRw`0
zRHZFPqEG-Nl5haY>8-=k<l5i68eOh-$A(&U)gh+PryN?jP=o@dD4xIpuBGrH?4#lf
zjfKOzp|u}uHaWSfW}&>-lnE}<DvFHiQ8t~n*7Hs^Cvht1>V-bbj8Wpcr2EZ5L@kYP
zf3lm|3kP-R^d2U-uA$3oXXp48ZLQi#zVS||?=uakshhU)<XR+A_K3QJ?vT=2mvM&6
zt6LP6B+Hhy0whTBDYVLcJ_Rb3N`nrSM50onMyAoIw5V+*m^8{=G80H*n@?goLRw*#
z(A#MkLQ|$0^9d>>Fw;LOJJ`r9OIp_vgK!61y8<?{t6Z{Kd@H~bW-&#XXG-wU$OA<J
zof1r@#5|3&MH3IQ7ScF6gGRbp^vi^gW)}$DCC8=Du(sYM?YQvTN4)PQ>O`mAH_NgJ
z1;=PGosacpjS#pwn~zJ1(%B^DQ{?lWmqnnvF@7Y4I_rTWE<9G^k6weBMD`d1$adAr
zhf4Sx9E7N(DMtf5r?QFf%zF<&H0aal_)0)PBOOPQN$Zkv)L{P2Yg#Bva>k!lChTqd
zOi3o&{i1EqTNdI`Q_#Sav~=l5PQ4N}R9@SVw!0qeZq3x2;v~OGgN3*b?f%B`YeuFe
zs?7?l_Q&oF=2}QI=+y>gTswa<deSoE@uxFahT7GhR;C8Q00F3UsVN~R%=PWpC(HYF
z`cnIEw&I_9doTE&MAWy<XVL9#z@|8)mH0I~V(O+XrMKUaN@8S$XZ=-?+h3a5Jpcp(
zN`?qM2QkJp<C97M0Hs0?*l@$#Bmke@;mO~r#UaPEiA}^UA^-(+5lTh+zNd(rZDPV8
z-u5K-z|M3yBd!6@?)|zMK|S--_VWiCHNXJJH&fi6z5ZX0gjiQofI;n!n83j}$F868
z55O)GGD3Xu_T#zv=wdpP*!=q^>>gS*&o940Izi8`ZoT>t4m7g#9{d#A{-4jb1#sgh
zzB7)4A9%-3nh`|u^B<om`+k0!B}hH_iN<<)cJ6xh)ditMWDvh1e23@v=;OD~{xENb
z1u7&EM|^VUwmp7&9Ykjt>H+8m0PE$VRFjd{_H+Phg77|h?d6Wy`+T&bjfJ-#KRvOK
z0X~<&ib)yeImtQy0B7*f-TUap0y0Jb>zp3rJu*FXGQb^y^(V{h{B){y`P&L81a!B^
z#kuDB$0;htMp8Ow8SY1xbTf^(0qe>FaF75bkDsTWt||Z?gr51&u7r8Aq@Go&2PYW*
zciZYSrLb<E>*C&0l>Y#fB$L!*)6n$qrLRS`wg6I;;XO&f>GJQTp=0Tc<I)FQ`48#*
zofLvGf#13N^+6!u40Y;16aN4WRzU82$4q)?U|^J|1Fu4V9Dd{dTBy<h$T&UEPo6sG
z^WRj`N$HM*rhf0+qFYHh>EGASrju|tJ^ujlfsbH$;Gf5#`?Om>7jeti8SZ-xQ*9%l
z>({T}jS`fD&~)jZ-)57+O^xn$!AMWodUpBx<IB%gk^wk9Ju&+SZ4TJx#(gq+V?>|=
zK*oJP;iOu?kUn~099A6;I*fUrKAyVTt_yg1pT!pvdsnlOf|F0VZYa*&vO-Br8%ma>
z&$#8RkJSdA%G(G1X(L*!0nTxdJCC3B>PP;;t+Ha0jrHOpr4~QDQmK%3>eH6`LY`t>
zQxofsM#%jd{ombNDi}S+m^ha*IaW<uRIR2^x=@axn`@7Hf?NLFOgIOIPZ)8ILBrZh
zLti@ct^WW5FlCrrbk!OZ2eUB5m1ov1%VvvBvu%j1Q|*g3l>*nc;6Vv$B|eczj)+X9
zF_Y5;Eo70@=O<Qn>ne}P<1Z!B>Jk`Je5VC?B?l*|Cm)WQ7VGikt<?u&yp`povgzbm
zQo0^xdKGIYry;er%vDBlZ3hCwq0FhLG87Vm55zq+$yIW@&g{*1l#_4W@BDgO@b>3~
zG8zoOE2gE69#l}MT_6oQRa9xQumNqbTLaT$hls?HCNyc%OnFbb3QTpWEyzJ1s-QvX
zjA(?%LXe?8GTm#GmX@UWsBJ?bN>&C($b+CM(cm~^%5+E%GTB1jeM>;V7yzTqBiH4u
zq9bfL+I`+=VR^wSQE@U7qDcX@b^|&^$CQ*p<7@QT?Y`T891^Ni2`lEZ9-&GExi$-=
zwSXI6O~^ZoVNt2d_lD#{S|>*&HzE_q4+g;)TUqL$2W?i|-M>XzRkd?OU@k-kj0cL7
zm6lSVrqH~Ms3#{G^695KiASc%j>5@~)Y!xZ<uZ8-nLR-Rp~ufo&+vW8^rFL!rD{P#
z?7Z0cTv{+nR0m>Hkbd22nB-)UEI?%z-?+C=jjiiqZ;HE!c!^`Hf@L}$CS+|^Qp&?l
z<XAW$jqI#C5N&*0wpzhux0q5Rr5^amaX~2wPmEGI#xc{F_4`hn-)K!C`&);4jL6C?
zDn-XlZA%F!#rJqs2ODY723CNulabq(I6B;ouBSB}=-5U&4w&eLkJd;Z%^G3-s+5lx
zg;wQ8E@ivQ4>)N#Sxc0fqEt^#zpIa2pIu8bT4>EG%ck;1Z}Gi{^Y819e9X9-Y54yD
zA)$BEOI1?@WOlHVR{rgU{uqb_LE|P;k;>vHDQ>uzxt#GEE)kWq(ih13OQ~%jEh<3k
z&&sa!;Z)TIMMK}=y;Pp3gK^J+9hTUNP?WZr)bN)R0QiM|@U-)Im``qi2R)`=N?lWv
zUH55RuSsRTMMr5$%9#pmg4B*=qbOMBB!Zw*$}~+HMCj!n8&7+<B~Q(!#AQ`<wn;}L
zY)D!}rra(BIJ6g3(FI`#1C`;{>U)9M{oU_zuonZa+h3=lboB$svE84dgs@?@<w+ZW
zH4ERf0k9_yJ+p2xS6qsuNs{TZrIrxmR7EN>UTq3TM_{NHC7*?9OTh_Kgs3TB4xUOa
z8taoHOt|!ht0-v9Q<5pKM50WL8g)#eGwIJC0CS<0r9KLWIalfooi>z;dj(O2pC)W4
z7Q^!AL_(OI0z`n&Q?5A$_XCg;jE-q3TWeWaPli;UZET&Ks{H~OZcPD7L24YAYBV`b
z&V=lC{{TpqpQouQl-tU5C48#!5~UC_3W(HhzF7cfTRAogtzdmE_Llds*;tG9xwylL
z&7@=^nPaJvD-K-BQbKm-YCcIBM@xopDHlcr0q&HFTTinBqbi|mE8W?V4Hq;8(;Q61
zl)fYLyx)N(yraWu#$Exz)Fnh|$Bk^%XFQpb=}=^(NpUKkhNFN&(tzJP!LnLcC>>Ht
zxldH*uCwbQs$Eh|L7I~hE=;npDOD(pEohMVKuQfhb7^xaWiF(-;j54zgpQebXq#JS
zI>di=r8{iNmeVqfi&m#orM%G!LJ<*g7W0fe5J*wyVQF)dnO*f3lB|ZbiqS|q^f$e(
zN7*CPk2d>@9<8<fbq-eV9Pmv@;Zb!eEVeQ&+^ZIXRQoDO9PL^`RXRfB0kZ7a5rLG#
zs&sjhPrN2wCSQdLQrS*h5*X!jJjAEMSB4yE3Uie~M+X|(YkqB73Zj~Xm=z%)H-#|C
zrPLZwAwLvmpK+(&QbAIJ3u#Fw;m0nlv@Nl(#&PE9mvugTVzQLCT(^+Ki3w5o%4bp>
zL2XIGk`x%_N|l~ds+XNw7TQ~Ni@R|VNwut-Rfc8PZnf28{Y^+>M24Y8537|D49BHE
z9y=^B(~{&m@Jk4Al@O#*^E~%5KF58>!ATd}V||ZO0Pj%oClyD;mC;jD)UIn$P~te^
zQ0AgWlj`D%Au>l$?(P+1iVb?0s(`}74;*@vq9|$fI)o+P5(DSL>he|`ayz9f9vb=9
zq~w6xyvoYCz}504QI{T%CB-@7Fas+q2@5Q^u4bK6U(Q+<LPkKyR(y#K6}@m$E(>y(
za$9xScNMR3Qz2I9b$ITsOlqwfQbUntLVdssjV%O%l7OTsCAT?TLec}1a{H6bE;duj
zvH}$1P=ujisYwbXc&&lVjFZe1K*l?kq9t`I1%|@?Y(dy=eMd_R`do`uEelIiRY=ja
zGsMn}tQi>?9S)Ks0MWQ0hEgsV5;q!7@LJU$(1KP81QLQsN##%~=4^hk$1ZR|8P8oh
z(I<isk)PI4Je@(pNC0x2o`7HurAHos>Mq&b)R}b3?ZI%@Y1YNDY(RdiTd&n6rZp~?
zPlys^Opz%=^h_r$qm%_H#}<Z~3sTaPd9gUs;f&oB%22s0wC5{T1kvpKj_|dm+cs@(
z;Cu8m#_830Z#b5uzb7IHn%qX;k;{dJawSqMpD3=Lj90P<s8j7oNG8ff$XndoVSR=A
zk%&!a3vmu&`LkraJ6)d)pkAS=X{DMtiB4cwmNjHk%N)jAmRNz5u7xCS<#JDe%{r8Y
z9~u;7J1soKgw!V#%6c+XMpPRLj@rC|ZAs2X1&PTHE<Yn~tR7<Qi9CoaLeN1;1;pWR
za;v6E<p~+V16W_z$ey<zL(VBHbok13Yv)q=k3LqVWlJk6<^%!>S2xBEvL;+&Lm(9U
z$p~2R5R#-RL$bg@!jqBM=L*JsbmEKcGns8=*e!{$RRAa^+xbBATlTsFMj&xe`z%o`
zgHwW8je)x{)Wn0eixNO4z*^*tG#5t_n;W+Gg%@qF-R9ekw7Bj_(d5yo_tnDO3bj@g
z$xcCsK0Ifm`>ZA<OJ++^q}C)tj{2Efjj7g>RCgYeLZwi{lPTyXrt54Om3c}``mI4S
z8bgh^CH!6_BErzN+Kf>Yv{G3LZAn>!542-(AHI0m;%WC4B{1#1!FtJr+~*rw*te`Y
zGz(%SD7KX;35?R=$_%HQm1&luv7VaVk7YNso^646TU;jb0d`cSY{kh_g+tmq!m(6!
z18MF$f{_-HX4fiCsJ=FWr!~f7w1Dq{L7O3&C`u{MOhOW)%o1v;X=jKmagwPe&4-u^
zH$WAM`(oNb0f8EvcV~&;K@8@bz}^?}LxFgXqdCu}%4u_4^CEaq$s|+KM_D<`UM(+C
zB@&XYMLx4xq35KLClJw3D9Yu|%Q9T2($H%X`4R8pEO+V=;I^aAw<HK?SB)h^1tpcK
zA-<f%bV(I7=}&vZiKil-x`J6{>eWqA>Q^H`s419;rz0)K>5zoFw4t7#p(;7ncGGQA
zkYl1edTUXVxYA+<(HRV_rKl;n4YZM!rQqOMIX%HWHH|-VA?XWM76PgUDpb_DE_hI=
z$#qSXwpg5?wMl&hqbX?%ASjaJ6hPFmDEVmGh+Q24_wGmQT<z#O5;nE`=cTA(f-Jg*
z$ruHuc{XEkS6=A~g37v4`G`)C!O1LCdIcsNR_bw_kg3g~)HzbB$xO*DJfoS3amBWu
zagWM^6x#qHAt5BK0O%#xT$K8mwZm~3%v1a*kh0v`bktzYO}xvg#FDkB2HkKemW$lY
zr9~i%EQo7yYI?IV*JLp9aTNIKak^^;Mii!-h#cm93RwV`LX@PWl^(bl{l|Jjr7!B3
z&{0^bJcX%-mn9Kdj<%4X!-{kexUX}P8ssCG0+0$uwqZaHqvdhmt@icYjqEOW>CljH
z?@N|XT{5DU&1Y>yYX0Uly0yuWs>rA}9Kx{xSxP!F!-B;wmq(9ToQN_I;*;+!+>+)?
zTeTMChE*;#K`L~q*BeoE6_1EGuv6bf(PhGRXn54TX(@EJ@)=Xkl{VVeptZX4!h@)6
zwo}de$ZP|X@acwrQ;xM2>!8&XiD_+!^#LK3MT1sJO5~yv;V;5sLa>j8&>cx6g)D$H
z?OPF@Tai@ssgJbdL={VIh4UeAffPz|IPoX8RIXA+6s4_2Iq#=<Wh(K;29h_mirapq
z4!aNq^$-QgEpvr4Or@zP<(jI!s%DnsSS68yDydlAjGDJosYfU)?1~1P!{g~|uA3)_
zz6u^;Yj&hKf80i%lAsXTgq!w{$kLi4o8AP!cqK;(QdSB;>!_H7<Q$}=6W8aDO-Y;S
zPhZSe`0&}ixkA~KFKKvhq?(krol}Z_M&jM|y4+Tlg_2N|Q)rOXp7|2GlYyw}?e^c^
z8>M&KmKB9=R<7H+?W{zgTXxmGPkO0au2v^3A~iah0f0;IE8<erN?T>LE$5coNLtfk
z<xk4XmRVdPt4vsvupGxXx!4PDx%@H4JWPxFe!U<Z#b$&qk#fYt5C8xHEJ?M11h&=(
zY+%7ESx7>1M`WcWm1D2~cRKB-vD4Yt1B%_nsqZ%N(p4*mEt{*tO?s60Q*3Ug<0TDL
zsT*FEj1}9FV=65BkxiVbhoVxskh#wU_9ua_qr0^hMJ|oFTy)l?-&c8Mx{Qs4v8!&=
zY+4a14kDR--xRf?b>%z*$to>1*i_)5$d}~=l`FAKTN`n;^ca>7(pWa8*zLW%xgSy3
z)+HJh2HmC^Zu3i!%ovS?u50e$$r2qaenWvOdDj<$8}ls9q^Bzy7@;S2W2M}73cqPo
zotU<kwaRr?6P^<A?zU>$TI})#ik3S#raotpg|rDr*;Kg<$V(QshfoU)WJ;Q;^00(9
z%WXEpEJuvXQQ}649i+1g1W4?qEyIS?W?M^bwv@KpOrZ!$P!f>nT5tmSU3D2klF>&(
z7NVnu@zeE|v7eYaYG`p>QoJV?IiGcFkgRfs(2x}CP5JUAJ{w^9oS%@{J3gKlA)=s?
z8bds&?13TChJuDL0vaP9Gt*79E_5`<;5M)xfDYCjhTGd>4li*|6-WbDd;ac+-hS{q
zTMnHTo*HSStOck9^Pkn{d3}-4V;)^Rfzyi`BW*S@g%R8kPgCeT`t~2YR*GaqrAY|o
zQI0?=R&ci#kQIUtRU{Mg9NNp;PBHMQDMms{dZk2;s?VS~Nc;X+*bZ9e`w#T_{(Ugh
zSEe@71<i%~d%*AO_XE>oj#GPS>X0Zt%uX%UIIIeu-@&0oZKl@h-l)}XYAkp$(%Wg~
zDpR3n{g8v?HTjfEqgElZADv04L}5uK4@-#jW|o3-3LSN@m3Q(d2c~uU<nI+Wi*Zq+
zTNUa}I=cd=HMvtMHK<W4kR(T^5aVV<35_kMk|nLOlBBBz8R$luC$@uWE0mE$t?gFX
zR;cDW;)-2X!?kA9lNf`{!ehTnDQ&zH+pk`P9=gpPZ1lAi4GeL}vS<fWFgIK6vaqq$
za(6e{#@ECviFgL1h~}rwmoZv3NERT50{XPeD{3vxODQfuvY)ek@3-Xo<7GU&;Eaxd
z^v{sTsKzjUdKJI`1Dhi`>DSk$zd=qfeSzE)@f8B6TH2~3{4j1~>5%+N&4V4vhTha?
ztP+G=J9jnmhGQ+<b306WE2$YNZCK?n=Hr9ex5WPd0e2&CcaqH$Y)Z8EA=&%EXqT%y
zX?BpM_$)D44F%ivqJ-sC>WU-ENyuzEk<4WD*`!jk$1)me2>@K(82T&vp232#?4%3g
zq|UfoILJYgt^q9|+n*6H7~aEO!n}LfUDP2YD!UwW<<g#`sTe+Bcm4kW*PzrwyQdiF
zI{9?QG25<<bpx1%<tI2P$549XL3m-MsY%Hz?ha2W>ykY*^bWuQwj-b)Tn^_TNlLos
z%NYBK^w4DklprXjIqW>i(S<)6x~S*LN8ug2c@0rkGI|hm_6&TnqmJI}X9Fk$(;d1V
zz46yM(90Mk4?~Rn$Ir_}FVJVEbLEqP*FL%#K=kGve2=ej*VO4%y@B=X^YF$+tbTnk
zDuKZsf0LnA_M8#d%mN6<*`ky>k`#Jp&!?YLp<F8K>E=hDU+B_{*R8Osk6)dzGR_Z7
zA5cf&e%xqPsN)>HeLa58nk8gs1IV28^ZDp?<2mc;^82*5GJZBV8Dp=XQRn6I($})A
zcgXa{4u2m#EhsNx<-f@P08g9XemJ6#Kpwx3o~olheTnFE-1=&t?A1jhoP*3qrawQN
z={DP-++!o-Y!rjg4&-@b=lgU}I3u|E`e+t8k_b`iJ0DOy^Y`e{*mcj(MBh!w^!`{F
zEf~*S=gUPS&$sW;t$fd1et&j~K<H21`TY55ED(;q`wx+VP&#MV`t(9EjDgqG_s{ie
zk}x?>mIwTFK*8uS-ydPpEKghPf7AUinYUqzfG7oL(BOCLse5}VXmG7g0<C#ThNs-W
zZ;PI{P;_Aq0UAMr9Vy3>TaExah-yK>1dQOE<I}HAOK;huamTFi3AgEK=aRct@w+Yg
zg@ca?)lPCtVZ?a?+o&L(;Plmb;z5)293c&q&bq(;IW3NZ`Y}fgo+{Cac4eZeDc0fn
zl;YyV8|f|6wfkdsfKzhT(wUOnbdc+P3e<tkkQAYu`Dx&^WT7%68G=esIaSUSuo~vZ
z7Nj2i#+fL!G4AMGdc!YCQqt2=WG9twxUy2(0X_V*_}lVpP~M_Pn@wV=J-~csBRGOv
zZ2qcVNd9g*_18AlM#0&b*_48Bw%c{-aDN<o376NbRB^)Wq_x-W=yG)4_K*vX<le&g
z*g90whgp&1F;Q%|8VtRJgtU7Vk~;ZkP8~7Wk)1BejQ}#GW0|6t01E#AP!8D7T{jl}
zI&}FCw7NvXqT_BUC}b9zNbJxl?mwqa?K0kJ#WK>M%LOa=(e8^<5Ul>HR0a<~d-l;`
ziDWu?WECdcfqnh^pUZqgGs=oJ4XMiAcM8jJy+_z!0UL|yvG065HhWh5#Gx&sGMnWG
zs!9rh?gmG2bo|q3@X;M9jIKl!<TcOC*%;~*=&t%{ZAw#c(HJ=xMh+|p$e0+2r_OME
zB*<Dzy+`wN>8Gxg!^}zdWwy2ytP<PpDIr71p+n24?Wc%x=4HDJ{0+drLVf=LmN}D)
z>cdpZV5xG7O90Lq;A~BX+jlnD?Qw%`=>nB7r9`D3CP4?W&N>sU3y%6|yZA`GoMiLK
zpwzAE(;+2G05>$mc${<y<eAi-gBsS3G&snj@Um#Ol@iUWZXWMlkVN}x)~B;2$dRHr
z@QTd(pSm=s9ZKb44YblqmO;r#8P^zY{{U^)>{+#`dq2d^)Y0MC+lwJKg?X5a$fH*5
z&#YfVEY(~x9a<dsC)|$n@#LW;Z7`q~g%F_ameNg19yu5UlpQKJdwS^rn*;o?zD?kl
z9&xP|2OH#cH1Wfim8^(V)xk|QTo6d2Nhzb1fn+QUYb1s^-b*66CmisrQCt%154|!|
z54QWw^1%Uz3#`23f!A7eDG#TZH-MmjSH5wp#k%`c#~W_vTMGznX=bF;%$Q3Ac+E1V
zT|<sDA;MIXlD<^{QnEW|yU$=$sGEmeq?G%pi%@n-Wiigfa~e~n#K>W!q@^sZpeZLf
zQ*I=X0M#wGrTetuIo2uD=Po;jAe%XfOD{O3F#FF36xd<Y&m0!gdDN54l=9?hdWjWc
zF2?s300D4z00Y|Ime|~#_s3ghS*<-zS4~tTCMt*(*Fm(lU>sSR%X^)*9`*%()*cI9
z&vNB;$?Zj?%6P?(HdRucCAX6nJL_yghNVWr;636YEs*CoFT~=}m2}%{CvI!cp_(f-
zMZjs?J1sNdGgd&C;)j@M$UsBWS_c?PUMX)0<^buOu(rufsS>J*bKfe#m~dlT^PZ0*
z$4ZdmBubMFz=@Dh-~^WfiBiHqB{&<|W?I*UDKQ&`RAQw$;Gd4Y1(F(ZBbn@&ift~b
zMHyF#g^YD15;Y31k;?^&P;JmKI}u<AzMy;d0BjT+TMRk(5ejN_hJwDDPFYZ##8&~q
zTOMH&qnOR^#X$zzSQczr?d`po>bYN}S@qK7l{ocMYc)z__9HZ;rSln0hjYyGMtL1d
zvD1`bD^DG}VqdH}Y7wMRLoGNAN^M4D+3-~utC=iCadA@YH53Gu6)8mpCn;72vwL=(
zT#X$NoVTINb*U{WRS3048*MMG)cEX2YE)x{uOuXe@?_ye1dTfJC8;E}QKHVHqr^*X
zt@W`Y14Sp8z3;IKlHplT=+J;k!huLVb*WEAXD65fvv%q|=GW8G#DQW!9gXo%XWV6(
z9&$#IRVxAw<Vg;KKsq7j0)_m*>5LV*0D?$tZjTPX2)rlJQ0g8*bNmLY5!6RX2bCy9
z#+z}#N<lq|C$D_#gMQe}_n2>uzTv`>^RVf5jS8E(*W?i)rHY01cQ*8ECKS-p)K=9p
z$p%wREdGK`-15N+2_i&dr$uq^b7G>=mgA{pq%!&*j+qKWXfL60xt03a!RiNmbvlHn
zv<q^bzc|n0ZtGjz!F#`VQlY0K4bp8n&Du1EP_9AxHtF{KX3{V)miqTPlTqbm5Qx+<
zYj19s_utoRk?tMNEkB|5Sef^Wm7GtT&<N?cFD{m@Aj>9`Sy1s()4im3UnCOM$el_{
z9C8aXf;*k;tlb#b=M5JnlTmgVsO-J{E|}U~ke6jOX5Wp!bX&d?YaG#GN32D<m_hwe
zr39x38ro}~<e|Sk+I=xz^(d?*(#n)WDhuUNb>KNXat~Yrpp_0}<mxee0`KKdZa3+h
zP3r3DbS>?IjkT@FazbN9YPBwCpJGpS!js`N-OCY}t8fv9t8R{93CxOYx-#PULFQf(
z(&~!ZbSOBG$^9zi0+3SZeJ7inxfsWzMsZ6$HA2%Ez-CbTt+522fb4B+8}#%y*m(8B
z)Lb*-cNFnFQ!~)<MBk(-U<9fxvnu;<HHO8#uuUnAY^su=Vg<Ef9827_8YaloX!k`*
z>$kS5vA+933w3U54xb9Mbz8Pe&)iP8QiTqv1W&8jx|z2XDN@p6Bq<4VE~+|C#JTMB
z;M%)uJ9FHeNAG^*?X3ceyQ*tc<}FKB1;IgWhvhW<TaMpqQq@LsL%_yrBPg2l@>`6T
zTX6Jn>Gcr~EO@Ro%ZyBDvn{s}hZ%Y_f{u97n{^~S%ZWe*wWUc|2RZ09gKrdiwYRqy
zWwmMeG>QdEOiKHd`gCCd5Z<ReYA;5mH5E;@2A?VPw)B=mWH{_}xC#o~Dp_ARhc1o^
zCyH26w8|z9N~DJ3NQyG3l0C>tR!HBWRk77uaQ^^{++j@yS;L$)#1%Xi&zMa-^3aMj
z6-!c-kd}ESqMELrvIK#-bu{%UsU%QQUIcbv=)3d0G&(i67PE0wsWrq=p!@YH$v*V;
zB_0?NX|)LodC>Jum<f!TC2l(5l9!b0i*PAw*}a$JF8zac+qC-pdVR@HcBK(=mZTW6
z*rvsG57Z<nZTv2g4V98qoDh<u(>mo6YwtetlO@L=Th8*j@pZtZI&;$}o0ZaeP7ie}
zp~kQE?a+m^dri3;wNt~d(<uyX^_vmJr4Lm%FLhsCm2FZmm87Z0qDih)R$1zXZTA$u
zTyqp6p{|OiBS|!|Nh1p?u_LkjCg6c?<FMERi$5{pe4jdrsH-x1LsOf`u*YbYC0VNE
z5kwV%)`%pLKqZM(P*{_EaW{1LMn(O*`=xyN&IY#waWC7==6q)zY&COND-|f}FRYU2
zOA=ZMCnpUj3Fr>24%V4?Ft<)zm^qyaB`a;G8V$IX&rpNTu&f@b2?ZD+X`7KvpHHzj
z*7$m3W)9ZwB{svSA@nV^&yd{()yymv5SNNr@uc)1r^Y~1Kq<&I8;vM-lS~gSsXh!D
z^8!{B>JY^~6G5e<b>;V`ib*{dvC0QRMXLu4(=d%hVZ<sTcChn(L{b~=<{D){O}9H<
z-F+s=yiCh-$~L8rLlksD76{q5L|XdHwiO5Lt2~)><N`*NI?9H+57A%Q)w`8`BseVC
z{m#3t8l7(Ae%gM)x|Q(9RGXu1C%<J>C(M127f_Wll}n>cdFNHi<MkJm4?5MYz^S!4
zxambcOA*<1lr|Zi2q{gt6gd)A6~rhvlq9DiYU`f48scZLlIW{R;AzTQYc%*VVQ;qR
zw;8#S-IVX?sdglnTT0)Mi0mv%E-5H%sYI=1N#<6&DKVPb(akEYG&HoON<>CtMRc|a
zDpL=ZR8p+1E93xV1LusUs#cm6YqOvVSnh71i<5Fq{yXk^<HOGx_;QzrykzkkEX$q>
zJf537%o>iIMW#4uo~h)57^7HuL1BrKH6W8@1&ztJ1zttw3SN;ep8HQNXq40j7Y<6>
z<qR#hBs$?Gm0=m@Q+WrMm~&@XtC6U5^oC)=bKdaVj?(ICks4z`)6w?cl1iU+5I`w$
zU4l^HJvEZt5-O=jy+N-R;48##WQw#jNsSbQmfLyBF_P1aAh<#lR0u&zNyc@GR~(e;
zq9VIWb-;$hjaA)z%%w^~KnQ9fX#sK6;Zar}LNU$VLkrfuj;k=a?QOc+-TPkK+;sqU
z#=cq2<Wr$&;)v?hwBW+WKm-Sji200wosfwYNNedfIV}}$GVg%Yr<-bH?KLt5QaY+|
zf)<7Na^lHS6jZ`gqDxPO6qd@6w2(%g+eVii=bLssXv`Kr!QPIS6sZc5%fdR)!@fW0
z+*AJm8XG_ir3nh=2_R{dqFaq2_)}SaV=(5n6tu>c^np)tJiMx9nW}T%Agv``mGEPg
ze5napZMga3Vjl(E74N?h56Fm{mesPR()RW{NsR<nH#YC&wd^WW2wJ%xeB2c%vdR*b
zkku{RWhqvj=+U*Q3S@667dx>wwSgA|k~#s@++1P{#&y)x)bl#k6ip1$Hj*@i9&KP9
z^s1Y?IVu2P#ZAlv{jA%|FN<GkuM)Rqu*{0}J&nkXvlbF530+oQW|Ov}F5c3ZrZX55
zK5W~L9Z;}_)0bB{00K@-sJ)XO%{zC2jlGGv+mT17)OfMKs7P+%mhXc(otw5QXl?Pg
zHoSy_maFc!;hOzLq89t$z-eM6avkP>u%Cc6Opv}j_r{pzUZ!f5CpID#YC2RaS9FJ;
zP0_s5qCAW`;}V~i#T{n}6D3NTjFy=qQ0RH*R$juF&Qzu4SyP0Zm1O?_JE`t<G}f+=
zzz_CnODciVNfTys{uE$zU#s1$G@~^O!2B?3s%GNM&K)&5lf1N%F#hT(31yV+VD6^T
ze#BN`yq;Ut$67IHPk`<oka-C`z`)50_450*u1Ca_@xV&k_m3H6Wmr>fo@5}8=bsd}
zjOX=q=iaje?6SfVpq@kUpVsF;2*~y32li_ax9O{W+>|L^8o^RXI35@(83(pqQh)xR
zkkdtBYKoZSQ?ULf-tLzC4^fLwHAF5*uv2S%I{o**^Tu&((-Y&V!q-2B%VPyy8)cFf
z_6|NJE%FEd07qLlXj8;k$XksSKH`1h#E!|3=>fK~q0j-y2c8meG}_t}A`3`TFsB_t
zR-y?dsN=?SB>Aai51xK{*h*bErLdqdP@v{dVCuo-7|&3a`t|cV*pb47g*$qC_v!pS
zI(x9Iym7^;&4%B8)))Kw*!mOS7q~4gEu{K_l2L-CI#0%-&C|_CCmn~`tMXEz%90L3
zKu=r}a1w+N2U16uZl|tKK;bdW21=9&!aSFb%TNIH&N4n<Zmn0vT~taDOl9)as;gZ-
znlt`Qei<^RIF$7WW;sz#JGitB0{pm(ox+Zur*Gna*AeX!S64+#2n{Vm=^ldnl7GUW
z7H>ca>4sjvJl3u`vYSv`Sc>|xB9ci<&Ba;wg|*l9S17D0UAbExU3GC~vXmqgr#!hK
zAai_u@_Qf=>*P9TItH5sG1&nFDM&~wP|Ev!4W~Kh=2vu%yvoY8dUu_q^0t65a!S%2
zQk1Uel>`oOdSIL+4CqpV6c)A5Q}OHke}*P?@y3XdLOhWuL4LMS1<kvjr@wu%Ymw17
zI4Zy&2Qr9JC-rg$ago>5k3PC>w-Up$w>rzYcI$F2N)7d5UG%vWd$P>A;ImYr*D2D_
zT2nIPypPe!LJu=C8ZF9<>QMA|TUtRb6orJ95_v*WlAfpI0|^V~>CJ^4bm{Qt=c@##
zf|5paf(I$)0lr~{jHq|!8CNf-LUVxRq%!Fs6(gY+2jUM=>MicXPO1Rffn7-V3<wq=
zjll<E3fvHGEpT?&{(nB#Z)F8*flIBO(AwXvE`Am-s@bO76-kS7p<mkDnqnQ4&fMQq
zLO;S7TTQ?9Em2rZ_G6YE#Kx2y;tR^a&-%H}LHq~Lx8twXV|jMFZ+EwC?|q})OL8^W
zw;PE<lWtwq2}wePs1in5n*qff)9cXYA&GSPNGV)tahh6G2QpRpvT@<U4eP--5!dd;
zUGBe7r&6CqZ*T7M$!;zCwspn2^`&*h>C5j+irV7T8W>c1jXFz8N<c?5?p0R6iaD6D
z-<Hg7NF7m$>dV-lGcN6RR%1bNj|{F$GS^Wl8D&#xE7y@O?VuZfbmHbRe#urtVawH~
z9ywW7GC4n6Bd>0n`g5F+dinnU0G_^tW1&9|2QD+rdU^Efb@fQ)9Wrt1at43mH2yAj
z#3Ty~bij@%=b#uJ&#&jEhf;~|K<Iq&kF!K96Vn*&oMWK%AAU44fa}zGfKD;j&-Q6V
zJ6qERwf$}T@H>D3@T;zRd3pBFpY~{F^vLrg_5qWk6^tB={&As{a0u(yIPLg-npJSH
zy@)3Rr~nU<K4Z*}Bl+^s%jN6q)AD}dqF0P{`QUn=o`+cJ=l6E|{_QL}j`+dtw?p&y
zU_}fcx3AfyudBv!jDG(ByYbS}%1wpE&)tJ#%5X>r@^xGfBY-@<L;Cea11Ibm(J1fs
z56|1AkFTx<Dx`cs4uhr-&+PN^(IeM5#y;G9zdm}Tk2BE!07&coAJwX$WaBvLk@Nii
z?GdkSy59o?pp54}UC&QV7J@O4Kk5548b}^MkF&Sgq5(>hNIgOPbB>>%T_cPzxa({b
zj1mFwo`=it(WwWf4o{K&x&fYq5tR<a6O4TG`?PvUPfU^1py`vO2_)R%HXX;#*dYYq
zj+q@*+qb5qN$hUiAFcLpeYUDZuMPWZy+psMvB$)>AynfS6#|C(<tdjDIU_&i26Y|A
z{IigH0p?HJ(_Jj~Rc_=Buj1Cyq}Syb_QvYKsO_C!<K%2ht{^*ayx=DUCal9~1orox
zMtHi1+wvOdg6fhb<}TOW4yOMAAYu37#_)rP<KbTtI9E2Ev{QRPr<Cns9Y`?T-)k$n
zIsX8r_>v?ZWxPztT%eS`#N-ZA+Hwk92=Z55Y|V&>UOZ{gs#6-53BMgu-b$TZ=RgO;
zT2Da0^z<5MKZBKMbsCgJxWjEz<gJF$ECS-n7E%zhPwH~=pR-TZl_7ChO+9cMdFA+O
zl{zOWWt0=uKOj#+KJ9Ze)0TM#o7=BjZMB8{;@f-i>r3$qPfWat3ou=kS#}L;mstU@
z3)BN*PfObyL$|d`^w#G%<w~B1CMgaQpr)Kk5S%0+c0oR$zgfQVaSLv6zp&TN^<M@Q
z$~}=vT#98a5`tu0_e9i|D0D`-##COMq<Dk_%F}KrcE*X@rBjPcg-{$?a?;fBZ3^*9
z4@{^1UY~w-$}gl9T&_johh`wrsj{G2wSCx_<<7K62#%-VQ45r2B(1T8j}gf#LRHX|
zoOK#;%cui7oi=A7eRd>X#O>bW)waV%Sx-g9Tw9QE^?g04E9wEA{IQc1F+9&2l{)oH
z98D6HH(gg7i{pZOzs9c+8~3<1EzrMrM(0&pqbbMfw3<C?buNW#(^U5~8ci0N5#%Bi
zb{i;2S1&m!C2A@p>!%zK`)zk?Vrq1I2Z*V&cWY)JafnE)N?K*#)>BI%v`(eeT|Cuz
zZI6j@pHhmF*$u4=#-on9>ukKFsnw-<H~^356O<4-@{yk|x(02`+*Ft4NlQ$nMGd;O
zd<~WSL8laYAS<saJu}c8oEbb^KTst@0WlNMfxV5k{{R*CxHkv5IP8ufm&1(z0EOR$
z_>+ccDl!UK#BrjmaC;a<(y~)Zfn=nS2lsCqCrdV@ET{Bh+<o-gZO^qVUDMjzhT6L-
zS2ZLvMcfKA5oAn7zay2`C{mws1?n{9Inl;e8+n%yq4O*z+weQXZTGt}ciVRC$orXg
zOR7PwL$<DVnwe+Ps}Q^(#acx@z)fahQw=FzHd`chN`X3uUk1Eu-~26ZD>Uges+G%N
z-V|lmQ)fK-zOK9D!3D=ATaPT1#ICZ?dzDD)r6nm>GE_#UU%^Kc`#HqE-BPzBW^V|0
zB@N)y6{<VVrJI`1s)5NOk8)Cqx#GIp!AMKE@ZAZ@Ro5DZ=eb6EOP(faDv?LZSfi3M
zS{)J)#aLX0cakRC^^9!3W=0FfTuZ_bcwY@^;LP^0E^if86xB-aPg%&0N_ifNrDF)u
z@=|I>Ss>-ZG&L|y7*wc48fonZ*%LtAnb#Cp(wv1@ktTdkcV$JR5~hIjZ6zoHETO3>
zb*^OfN*PK30|Qz!MX}<oiahGfdQ~RffhjX*)1k0lZd=g$a#YNeb2!qLdBQ<P77|G#
zQb^(|(x7g2pv9u7a~-_ZN~l&X2~9zMObVQMei5tC<xXilu&0((m*SzqJY`35w#Zo;
z;!-x^QY-a1HxrVjQmC!HHR^hK+o!HvH5H-PqOGhvlpz>WNmy}Qxyi{Jb!_zU!WvKn
z$gi;l)UhFuf%aICO6t>bxboqLfcTQGpDK?mtaC{Dcn=hkBR?{jNZJ|{U8J+DkgdrG
z>O*O>3>~)gh`#KLqASxZ+6a*9==C@Y5$hF(oOGBJhETAiIMGNekI07>g=I={Io9s&
zyZeI6OhcDQr&MBvs$116l<5piiojBo+tNgF%BqUn!C6T|YDg+5$oRG1g$Mj5Jzl8n
zFxn!<YTkL*3@Qb&Nl0zVgDf_s1g5O)gYgA`7u%ba0Vi!XsV~-_jZQEsH48~<eq)ZU
z^u&>Osl>LXWXV*g1Bs%c!boHW%9;sMkA^%l!#Z;rd5Qu81^S!p0*2V!U#RX4g}O;|
z+}PDnO3zCTOh|z0kZLg~P@!X$N;H)OjmEWCaCDAZyO)C0sohn;QAeUhj}hsyLh99d
z(j9I2Xj6zU(__Vsl`1+L4TNN&Dg-1B>ej$gsLuvuNRsn&By%O-cvC_shL)Gew&6o(
z;BCJXn2*+9Va=w>-LK1fWGZzI8!%uk*=@UBkc3I3l|c(}$kYg`P!*NnB`J9FMhXfE
zQ=nr`D|G0R5~A%^sWvN5G=)DZthS>nQ@$X0rKS+l8%se&vJ##^qEa$Zoo`V@6@dsA
z<7K_=du?(7x$JG|FKgn7;*Cuy9?KqA6rNzH8hMHnZ>)B9vl5@(i4<6FmQ}$uNs;2J
zE@i|_q_`aL42GFsD+)@RF162)dBO)i2~v+QZ0ZC)(mF`no;tXjw<RdI9qr-0>MS}r
zf5_amBX!0l2sq_-pIJ(P@>fHHolcIbic`^^MIJN;pf==)axNxgGPTZ<h4@ZGrbuxm
zQV^AuCC7$aLh>35SXz@1&!hvg>Y;H3xBIP0r-o=dy<yU*RS7iH$m}cMZK5XHsJSWU
z6^RuWs7A_|fLG!;Twm*Qt1}#(VwS!LWNrYjKv2J2Q{7L;Men(>u^SJ7y^bwEqkj?9
zaDNnW9W^GoYV(}2#8Enh=G0PEQ&cQ$sjQ$hrmJD8qXS!V$Qa@Tn#A<mYTQ^7Bzxx7
z?sYnsxO8}KxYVe2bwW%O#JZ5QE1igu>I}tOl2L?4a#KqyOKxOJm)Xz8)hCHI?mdOw
z3bZPJ6?;gh+o{2lsPS6givlcmsx&RnvO-ExP`FsPrqhkbOlO^HAvNfM*wSXA6g#2U
zdFoLsR9mXCXWq;$t77qrn{uI9MM{*kJ5G;WdY2KGQ*cs*MYzPsfrUFJ8GVJY^NqBX
z^jC!54fu?>FUu!!czLVGzwTYRVm143Tl-^Grq{1mDex-so2AyanlHa8Tajqf>MB!Q
zlxI^_qsMhr`o$rL;bFPXal(0RWg9JhP@}5?Ut=aId4_YMPC}4{CXI^C%2Z~Sc;}0j
zhFWN&o=e2}j%nhw)LC|2rK5_fib~wdO6<7NP|(QlK`voe8`VcuNc^_T7d3_9hAIrh
zDXP-bMViZ1md&Q)r9B1(HepJf65~Z~BaF1AsrgczLk&lY+Ewwn;<(yd9|=;{GJ5n2
za&H@QgSPv}BL4u0nl1OR^*R>XZx-0KQIA!)E#1SsS+}8C6e?t&bzoeSyN$cT-*$ym
zW;=1JNPb9ZDRK;?H%nu8df=`z^#>E%S#WUIy4*b6kgq-0O~GteuI-<fWz*tKy&-O`
zmtCSpkec0&QB0&iP^CQanN393NOEKdlOKnYaYwg1XChn;{ch{6Zl%q*u&v6IkHOtr
zR$ML7znr>gJAt)U&Byf=c`#;ewXb{DAXaEnD775W(G4^;zb1!PWo_0IROP%iO3$C6
zp{K8wI97R#annO&H#2Kxok@~Nw2=!csFRtZ#gd}QIB?Q&jV@2b6!j7{I;~VgE?;VD
z^+_qJ0?^MGH1$wcP$fvEmY#B2da4PB)R$M|6lg717*$r<@hX%@ZY!$OOw=@%glhGd
za#d{$qJdOssQZ;_op8}Aapf?)I@;roY#~jlS{3bHsNNQZ-^2dO3SClNv9v3<x0>vv
zQ52byV(xwANr79V)vt6kzZNw@9lZUmN2gIaOqPY!QI#Q4+?3NwmbT&ATrzO?!=;%`
zrCQr{V_TLyE3Wje-!W|)hUD7H&Hn&v)Rhu+`}1;W&&jAWc}Uy`(<Z46xO1x4`}EoL
zSnfufC8;ra6x3b0cHZGG%i-T*w-<Q*p!{@HH+FT^zgyo(_eI;=X}A~NVif)?=IzWX
z?22tFRN2(~nRXG7T{Mbik5#X(I{Z3)Lr?x3HeH$4u5nKkd4()txo`=VX=F($R$g2t
zBNeABQ5`v{kSr9AC8}kbF-B@{?hdGziTHE$&lA$uWpt3#jJks`hLR+ti#w!wYuh!<
z8nxx4izc9=$?GJ|sa5OheVV=`j0vKeT1ctYE&b4Tmtk64wI&UxXI|IUX6LRqG1nig
z?oIa**mn-(Eivio2~92)LPeiODTaq*!Hm;Xw8-aXQkxQ+Q-gR_Z`+y!GHH~l6QIGM
z)~a#BXVzlV<*2tlpGZQoS(8)_n63OR_zgC)RF#vdg?m7~l2-o!4ZCf&yOBWK_}jS-
z*Rtw#4cgu+l-U9`D!9xR;_Y>V4$g$|a>C)>ol`Z6m1?0K4oRz4Dyx}Ue5vMnBC)nx
zL3D2}^TgWytM~iPw{+ENlH_hJO}1Hxi*_88#kzM1HuEnAZEH4|j~Xo|Ba8n41&s+#
zzEvscjH+`}R@C(wj1|;BqUWKFBz-H&rY$3^(@6?Hn5ihR29?~p!+4@-?jpaq4?f`h
z+k~>tGvU51JWIi5uD&;@uC)22bh&Lb`Bq&^nN-6d_GgW2D|4PwW%){$&EuB0F{iC|
z{UbDwV!Z`6pR@CAO=V&P-Ne3kM{rtZwG{}9Tcp&kShmCpj8!-i+wk1}3CJmPAxh^`
zl9Jk+D(bt@8>6`GT1coWg2?ctK#wL;o}jHt4GC1XoqR4`IZ0Xym`N*StSO+hb09Gr
z2~DwWU5nX^V{hX~kGIy=+1hrkqXw;+6Ig?6(qqtNL9T~Wl+>M{PnPtx6qI|+<two{
za?pGcIm%NGsw4%8RSG1zOH?;t%10`Mc&l-0@!NEg+pP}^x>b~@a>9g&$gLlqHc&wW
zs3PEj=t0%E+;kVm0CAROHx%)I6mb*lr5W{oRYS(aY_n9hn7M_4Ns(D14&2K~2xsM%
zR`*eETQR3jq1PqU+i}&U+EqpH^csXVfeSI@wH+=(sEqYXoWXpdw;LSER=!c2eQ1Xw
z407CgDJWu{HRP%zaunuP-5OBHrzojso;#@s%5Z>#kUZ0)N0_(fQ{}$|g{hfLhO<1z
zS#9VJ)Zso>-9Zhxl%>RFP9XCo(Sj41(2|BxDH97Z)>asKrLv_(s3;$Y0YIrPl_?}B
z{*VPElDuRlhA<hJjjS$Bh};|cjs4!@dV;}OP${XTi%61GD{#nF>{KXMQ~_Sw6_8!@
zn-)c7(S5h5(P6&&%tn|6K*)@ymdmhL@t0nRpt6SAS>{rJ%5tKlWCArDZ)-d|`;R|p
z7YlyPsslA@F3D}JH5>l`y>+Jf*oj(`F%oI4%0iN^M`BSeW@<4QD#10Iz2%?<#YxwD
zFOAb;j;F1gS-~ph8EQ<Fr7uUcTW|$<wHFRkBDOlNEE1x$E0y_Nt)(b&xS-m0^D~~k
z+o3>R<f=Mti8o`h(&fVax@SFBT`omc#Q3hlRa!);DnV8h^Xpmaai>haNhF#iLISSL
z#Mr1{R_kHAj;nFA08d~mPAABx&!|AGsW8Jlu=683nW@!*kqNjcvVbGK$#~iBNFkU?
zEx&Hs6bc2OXi}q4Z7VX7PPVOz6eJ~>bjl?rIw3)b+h`aVVX&nuy4IyFSyGACLclCI
zGC)HA095u$7OuRf=1*;TTyj_9g!2UuqLG{}K1De0q38B$?*cj<ZEcJ#1fJ)rK^;0D
zG5fVCU6#l+D%b_=p+Eou>8ER7YY%n?goPA^@-2Y?SOK+w9R<4%mfN7l4_u77bBaJJ
zN5C*Ml=Ui62kpo0#<NRGf}*Z&Kzu?leAU;Rl|YX9Bk<RhQ#?t0p(LDyXTEtyKz)4v
z^R0lf?XiZIriKS9y5Ns240#TkL&~7ZZ!y~c06%~4#CX*JTJ3eYH~a7I`TQ@o#kt_M
z;*=yg%9I6^<foVgI!{kb4xO~(2!8C#XyrWWCn*4^kf0Q@Kp(Bkf%49>id`F#lm#Q<
zBPTu72gFW1`vH$Vdyx~FMMVTDY6wD8)Z-u}AZNZipH+N@kg?r~`R{+>hH8xDO)-s6
z)y99*^ET~^RCZZy4m~N<MvD!HCCrqt64Yp{B)H?wDE4e6IQfzXp0)b3R(|iS$g8EL
zF-~bHg+^uXfiNj;tKnDxev(t_%ZoiZLV|p;ryldF3YRsl4Spp)Gp)H^bs6NFF{K9>
zq?Z%^QX@(TFC=tRfgq9r8pP2Jn80|wNF?}epg0161wW%tTxSC(pzJ#7Jw~CzrtwC1
zKeWT+*?$)JDa5abpjtTO%qK!?YL?L{2JymdOIu^ETLZt@i~+wkMZiol8*dFZNk9op
zi&C2aE2%7i2|isw!9C7_m|rPUiqIB8NDQPPr2r(9qnMD{>XVV*B;;TXU7u5~XO$o*
zwthD=&V-T4@Sz7IK4Tz(p83`{Ez~7oDJgiTm;jUjft9Bxl;I%Y_dQ3Zbl{#_ZMhrU
z=ly?m@a-eBl1-V9{l~X+u;1Z}OYWnSkQFFkj&zQsrAMmXQoA3B1dQ_m<=0sJw?Rk?
zQc8Xh2pqUlNC`q#yb=<8us&qqom?k4;8Kzo%%ZMe2?<X(Q}8IMK>Q&j{9K^*z}77>
z(2j5w@vEvqPE~+1Qc8j4JfM%esp>Vbhp%uC^B=pf$-^yD4fpH(KK}r_w*9Y*RQFP#
zqk;)1B&VOR#0rW+uoKt6kvSRH20gr7BSqp9gvndSZc@X$p~DJhUGW@@z<zymX{s+U
z*5ccaxPVsjAuPkK#6Zs?;7sy#>$<Yu7$qrD?T}KS6fjf(1ER-LI`toaM*6=`q}O0n
zC{@_4PoUReR46s*4z`yg%c0g{JxQ%Xd8Kr9hiP-BHb;I{;2ieY4$EmHKUo<JzY$_D
z?mZ8<k+3_(^IW<t){3t#oZ2e1DRKvqi3KFLtZo)T(&cUL$K`-h0*UXBG1MQJ$9|gl
ztdZNMGn4zj4L!U{?L+$q#1{2z)W#JRTW7gfb)gl7sI5q(Q!4TW0YOKq!ssqjTng)u
z=5lkA#;Iyp1S^}SM@)D19=e&+%Cp4`%6zh@Ve4W6{&?nhj!2#2m2^uHD&x`A>1F$v
z5sEGlMl<W29Ao=*DzT2klxH4&yOZ<Pb*LWT437BDPuZbY&>uXUe*Xa7t-ve*^uQgy
zI2~ER>Hh!@{WKzuao^9l1Mtyn?cW_o=kw{IoFD=-ljn}VKAKerd@3w=z^fz6KYnrN
z<aI@Tvy=Y-A6-{pH=Z%&`SsB2$Im`qpMI4B<YOHG1Lyw$7!_x)*fF17EhYZ9-P21-
zi+}(hjt!5f#!r0X?#EBtqLGYt>*jI${>=#AQ<IU<^!xGGMI*86=iB$_jcYG#3=)pV
zr{C-O{rah%-THj~eqNfSjP>c$*Y|w&?Ib9W4`YMhq0&w^_+Vq-jE?yj0B0G>PK#`n
zfz$we@z<#7)9?M75VQd}03_s}Pb`!3{=HUhK_m{i#sZJa)cx8(n{~j!?I)K5uR?ow
zKR=Ms2wyXaNlrO)@gChgvVM99JdBirRoLKlSD$?Sr|{7~3yJu;9Q-4w&)fLv7V2?>
z>+|W0yFe?Vh(9rt>*@Du_eQDIXjNKuZjmX-HCjaYbvj(elu+zijXq0K;Yw{os#J+A
zw6D00SeOdsPhc=PvD+i3Purr?oG5l4N4WX*^68?G7!_e~b|CMB55%b+n-E8EM?;Ch
z@aee}J}h{A+dc57Oh>;|X^c@f4x0r)Nu}SEHk*f8i!}&2XT^EH85#X#NI?XHt)aBi
z^(eOrEHwBItC{yCD3;LEWDvEh$z2CeQ>dYPDEQ)u!q)A-VQx&v2E=a^%5^I5acWYV
zv#wH85{G-Tl7B@RDsc=>$Nnpo)1E`Aj4s@0w$FgL(r8bz#YUe{fZ`-Zt3i^4y%Jn`
zO{k^#t~9pP3P}f>R3{Md>C1B&V_3<8L#iX#sXZ^;t@NAs^ATnk?~e;SP;MvT+E{C6
z518eukkuh#Jn8^h>^CBHU1HmF1I7r^hf>6^)Y@@{##D7CM<7E^Wdyd4od^E_7JYpG
z01bKKlVPdcWb7^b!~ND^Q(3rRH#*(8oJWc+i_(|RBHXE=UBq!D_)>A*i3{|`taLtR
zWVIcjJ?E7?j$`0ur1k?HfEnqnfTT(iW5!8zw;8o^JhC}Vmk=_dq7HmKf%fZCo&u$I
z(#v8k*!8~KUi}B(i$ZMHdO7H`OtBJ{wvE<kX7e#gBO%fB+^gAzw6N0V;k=i}=F`Mh
z(C#-6o0)m-7Uxl9+t=NXQk74rM}2B;H0D@ZgnFGWYJg12e2CnSM|nRBjk=NuB#moY
z?upW4@>Ien(B$()oTX(l5YZ!?xDnJio{B=oNaY&+6Mdk5&K;@tg;;Rn*4u$(Zw0>+
zL|YSd+k_mH+$PYqH9@*#v_h)3>31F(C&r3ar80R+kYOFf-?Q6_?hdO}Djx1_Mauo2
ziIN(nUzX)P%H@??hTDZHn-Z-Jr3PD4FswPswC4pHv$87sIpIiZl~$=r=`3{I9j_a9
zd)S58f;*0q`kpGS;@3*dzP+;Ar-jzGjc*_lj`Bp?RM5(zMR)qgL^>uBwVqaD&0_Vq
zo3r-5g>_LY)J4r*Yj3N`_q5y=eM_p{k4>yYMkzDYLX+V>w8N5lm~|;qk(noZ4mfnW
zcB6<ncZ*x+wNhzyIMY?TJ5e&Onl9m1DUP!2M_^GbCz=mWsfvo4lBtZT#+vZTl6eT$
zoO=`YqLaAW^|jWmN}Y0B)I?sfE(urBq*5cMnAIp6la!b>`3$y)p-o(NqrB9X-B&BC
zND5ym)WZ1L;5%UN%hPVSouk~_cf*e0?7dnw$8heAwAD6)R=BNNQ1PCk%xQ@%ME8=|
zcqUVbQn_DSY7QiXX)3W*Uq!@JwCfEm4Lb<sKU8Fy<ShQtW#tI89W5d`cxGbmR5tjr
zb1op@ZWycKjvC^6*~WLr85K-)_3}quT|<yVQ%Ko*(3&Qas!INPiDApDP<wt>4Ki}(
zhBPZ^pl&p3<x=n33Z=y=k6fE@KTo!8s;pKjH7e9dZl+TaQzjCLriC)3tUOilk>q<^
z_?h8ab&C$)y4jG_xc3bu+4br&9z>eFFLnj>nGGZbRN?qQEpiZr1b79v(vgQ3su6gm
z_IlFq2>bO(-70L#eKu8Y42X0YZYrewwYs+?RAfh;$n&t&`(Y@WfE!R(Dga5>9QgS5
zitgVZ8_{G9y}qwKuGtNRxTyDT+%DIsNVY37uNoJKhORn=LMaZ_U_FqJag<dN#(A4{
zm8C=;PVkp0tIMeP){Bht+LJveE|QwCN?tm1M(*uyX41m#F-m2pu$XG{NB!v$cn9Kd
ziM&<Aw0<3M{Jb}oM@aQqlV^}NTMOn55<%?L?2uGW%G|iBC6LECi4~ko$CU&1US*jM
zTMKq-JSHkKV)!)Z{{Y}j(y6f07dk^rORB`zL0Uq{Qieu3d3wHdN?khOaWrU&br!TH
zDeP3H$#wdFy~K*jr9VxFJ=Fz9fTqF>#}bgGjGz#Lv!<J6H>!oZ)~43nH$xOk7U$oV
zOk1{9wE=}fpx5WcpHigEs#;LpC-f?Inz=92n^|%yq_5qO<Wwia*h+jzYeURDh0Q|U
zOqq=M$Y~X7qSTPXYkep5bmSENl^}dcN)S?@l?6%2DB%bpg^HcFQUhN}wTakt)D7-#
zF<R!QH{ra`GU2@KWTee<3c8AB3PVD*6txdaG?6$VW(y<^vCat&R68BKu2eg%a9xj8
zgB76Vax6M6nL-Q)8;eR?h-Ipa%_Edk*ja5aub?f)VU`h<D1n*3A&M<7ObVSzHR{~?
zEmP^!9BnL8;v#Z`5-TWyADJ*=MlU3~wRo;N@>0=XGSm{#NmEcz%*TJiRTc72yEv$-
zsnp$UGFyu3!SLg<f*55v<!mWSR!S5Ji>ykeI`w|6+*ytqgR$bof>z2NeVTf`#+wnR
z00^eWmG4eG?oW${A5cq+Mz_*P&?T4-gKM4k*nziAhTV;~Hp2|LWL1&E)Qf#Yc}12<
zBt{&l)s5XyCi3rj8Jn4QH;KZoR4J5Iw?LwJ6$w<hF_9fEEl)tDKyEUGnx#e7lv2Xn
zN{W*lW#^XYz(NUDxe@Io*chBoY%N=AoskiDlBzWOqi*YS)|Ml{zq2MhH!3fn69U_)
z(;ar5IHVLZ%Hzueo(f6m-06?Or?ksbL((O{kyxq}G?wNz{aSc&DR-4cCUffn47LZs
z83|Ikf>L#_cZ*fp*`4)yLMo5dAh4RMxg3v0O9FGUYD$gzuNE0>_zWWmTaGrh`~`Yg
z)yo`_OHSn_r(q(u?35vt-(W?>x3E8E*4R4mzC?2R^OzSC#|U!rNJ!@vyll;|Wr@|D
zil8NxgL(A=V5_$jiF+Tvm0K@+=v5m&T?Vxx+`jFb)`Ys;ShLxd+(&?wOMQx!sai|R
zVAF0YTaU1%xWeVbemlu|Q-9d6X2!try}(Y>U6-vwg9~|X8+vU{%Hn5+nDnY0{{U)B
zO;CRalXl3rs!^#MiF`q36eg=R1Q>43@e<;sd*cnt(<QomA#6_&Lepn)wzi9QRILY`
zrr5V*z(czr%3n0f?C0)S$u8Bc*1=QDg)uT?t@ZOX%L{X#T>{}Me(CVJX;f@VEnjRa
zJ0nG5`i%;T=Gj{NFpCN4FRfFjTo;A0RYfkg)bud7R^-@l-z$n=@g3&m6RJ)r$#V?a
znzuH~<U;h%PdQVrFm}@<af>tTwvfoh(OCpaLK0-$N5mQZFNd&YJSoLvAkT7K<YqLA
z!gQ#b86uJ?sn(@Lw6Mn{(gu1192C_p9FJ2aRPG{=N_bh}Z+Z7`dG1-8;kevV?T-6!
zlKm0S<?jy2yeO8(5L-25%WB`D+dHvo?i>h>zqnL-d%W#dLS1INL5Dq?lASh0bycbz
z1@?sPOsihkwKnT#w&P>%+cJ}6-IsN`{U)0xk8)a91ZvbZ-12tv!nB~XOQumLRO@g=
z*^E8nGSv4LS#~2$>r=SO_Q!B<M%#L|2CHmA;^%#7)q2cJ3vBEgg8YrJcAH`XA;GWi
z)%y)mV&62y&P&d_N2MmJ#HjI`id6}3E@Ct<Z@s*?CDCmPXAu?xZf(Mn<BEfJ+xDY$
z3u1)pXEb_CcKw|uO;B19(q*#vbk255Q`8(~uK|^!E#kgLx#s}OmE?JQ=b6T7TO8(C
z5F~KZMw-+ZCzYiVO2$Z8BWYv|Dd(PWIgyFy3S?e0@mCjcZywWdG?^wz;qnSve48?o
zDs*ElG;s5>+L;U$RWz$A%~;g6$xD^dC0kKslrvFFF){|(t+$)JRCcYNAgt?Gb~dK7
zx0TC=-r@2d*HGy;m+_@!)oS&6oQmD!0-%;IDx~Xzp*dFjgfmU4K&`H)COcIGI2r?O
zc6)~@{9tZ}7xiua-Myu#+pSxBVOQAuzOT32Rb$)Kn|{%^*@?FbgF>lHsm-wAMy0}2
zv~+z~+pm<e^RLHCtvek(`S#B4UgYgP)3uv*VKU7=_imRCw{kg0m1Z|@(<qUleM;3C
zHjUonw934KsZtjnmpO<K+EZ*uGA0>7azkz}{pGN(3eCr7?)~j!Rql71dgq->uGdQL
z2N^Dy&(_?XI!UTZZ4w?!ZoVCPv@E463FsB@qL(<~E)b6-&9Ye5x`MFIwKCMsC8&*I
z<Rw2Y3CUU|U}ugQn@aN<one+C?NiHgf1<~Y+*Z6xRhRL79|ETr!BdttTTf1=m}OOM
zOHoxlJ3L~Ro~EvPI!G#NmWXCEdkR&}m`N)v5YBtrJ;Z+uJL|DEE*+^>y*G&JZP!?)
z8pS3x>2z(z-&@AsP^;1EcLm);q#2hA1yzV4nq4s^5)bKQ%3+p^gM|B6v-?l8!r+r-
z*!0Q;TIHV+ca_sfZbdHmZlfL9D}h3*PkMBxBU(&IlO@>fCD&rhb$<0NGGubP-i6yd
zO>q$1W*vKo3)ZSu!rA7O<t}0r(|~g_eg2ZZWaM<n1RkRYyO&7f>iMNeX?LwQk$1;i
zX^JY*sqn4K)+}Va)3OlFZkW)Aa4@jf#R{tpZG1&-$YEa?*5ZCH%=m*fsr@3)8a0qd
z1Wy$>5rr1zmghMd0WTuE0xUGfs*5tpeu924cyGXM!u&a!<=jD(3C(o0iJI05x~ifI
ziEUd&N0!Fx844B|siR~?X?>=2Mt<$^t-SK-5@hXN>nc3TZE{?SzTDl>#AuYYOiB={
zot0c^ZiLb+@=6mbo}_cep6Vnpj|M`J()Y1d%6wHRG8gXZV5{6zgUL~+y7EHYXTorF
zh^H~k+J`1`l_ZW*ju>st`DAZxyqb-vS9yd*l^L3a3`S-n^s1uD<kREVpsSolTHI~L
z#&A3tmWEbhJo3RxHbxc8xrs3;(KjaYwdB(p5uJf9aw@cWOoxE*&(?69l!jIkOHVN&
zGNYw<_>wtEX=<O78V4m5c}n?#9mi3yCcu-hunXlU9C5^4IZ>2n75Q#?MJ`2~QOL<x
zNj!2xEE6u9>x)5kE~QBe9)qt?`nf>IN~-sDyKht1UaQNAL5EL6kFKH5DGff14-iur
zX{RMr98pq&<3(xpEk`LrzgtX&SA46xf*q&XOx5lCYC^ruccL6(CC65d5Tdy@>kKJs
zwW0DYW5;)zqA*ZV5T2U0%|3NjvfV=Nmr<tHoKoXLs7b3$tHzj8ytM2ak=|c(B$V<-
zQHY=&I75mZHY&=qnTsWwk1UE^T5}DvDpWUA<T`?yAh9B+Omz5Dq@Gn3Izk=7%2e`(
zHNQ$FsFWgHi|>BB+kJ(W<dQF9H?skVR%bq2MF=FBY6v{GZ#pR0oi<`50P6FrIs;|p
zYO^bgXj?`sc(B<mI~9_oGU!Jug>Q9Q=46okl_-@d(n^-K6)csjCt;w`#7bg{)64;7
zCn@NlR8U)1dIfdQ*{fZrO6G08cH@^a5<^K)WzW<KEw;X?K_CzgNIf!fojcCcfTy_E
zhE&>%LkY@=2~p36PwN~J^ZaqCr8PLFM6e@B7xf(lx4%xC{ur+6s|`$wlAYvlG1y+@
zZ`-ZO7Pb2Ng3monQ%-@&h|V5n)<5w|J=;<8Pf?9rAyW$rD@sOB>wqwlpI^6GyD$*=
zalTGuf>NNcK_DCjW7nwsH9^>-B9h1JCm#aH!RgnK=TA}2q;={1ef{v&S<X`Nu=5VS
zgmnkwZoQ9Qx5b8=2@Xw3BcO91Y3zH9cGl0?&|5<-0u$6E3=X5zoQ{Y0>4&353Y(r^
zhs4MLXF16HbFGTERF)FfPcJG`K*-3z89yR3t!8V1wf_K~AvNmB1mJAK_WRGzuY5V^
zZL~AWNce(rj`&UhA0zAb>A$=x&O&U#r-c1yDYXDc{{RAvu7*h?^;{<*9(n8KtBqRZ
zY6~DVQ0%u!3`PXyN(UY*m_Gw49aMW9;AHCs4XwpFE<=ia`7U^pUs(NhoM9*@^;-bp
zBd{H`j<ZnQsLhpr(+}UI5PJHa!_bk2Y@01~m1}C!@hQ5Y{{VQx-AC*%f7&BYO;)f%
zqX^C6#Va@^X+bz7{7X{QuB&jB9GvyfT@NkT@i~$?8#u^Fz*$ZYRj8kUV<+N2A>UaP
zr*eV{f>22K8Xq1(01%}E(C4l_JvD*Uyfg<CQr1pNl;XOi<Puc1XC(CQdLErMxf(2L
zs-OYx>^A+@`S;GLWO|ty>LmL|py||l*nI4F#gcTyE1VY;>aapn7%VapPeSX2r=LAC
zG7<^S4^yl<bfqOg1h(2q$2*G(Qb|I(Aq^g0V6JTB=cvYei;T*HPaZ~;<L)6!L1rsq
z#5R-D;!!C|fdFUXIP69<tWI*|^93uxWOMT*c!o>K!hkAAHWAD`&PsB65_E9Z(mUVr
z+wi{P`*i!B$*>9+Nj;BWjkY~H5U1jH#TVQdDpJam`ZDT*lG!aJsD&+FN3X@#t})-P
zvFS3<LW5~N)<Qr|azG&TJsT<{WFAle9s20GXhJa|#}$^`D?*-Ho(Wz^<w{hvr6jFC
z>XMw22CZ@wP_(5;P;eBH&ZH?^iveJ^kgPa@6b>=~CphViE{$R~^!{HR_r`@xTF$0A
zuj#VwVebB2z1OnLDj{7!D)@*|IqQ?rU(G!;oOR{zjB5~{2P%`!N{UtStCSIpV3F8h
z41N6uvgug?Dp>&Fj3^M2v&^J7$=E!enH_RFWOl`B3ePAbs!8S~a+PPBp$S)3@ssD(
zSiw46G1}jUZlAl|?)}(jkpLpwd%Ap&lZXxba_xrgk7+LQNevc->1}O&_~XR^D1JqD
z$EL-Uw)p_@0D6+HWgm#Bo?=dQ$ilR!eu-sR@9Fkyw|__&w6ADmo*SXp6T|+^CH8^;
z03x)*xO_B}5thoBEw8D`3kLvWTt-uA$5D*-<?{I*OR}4_4JkX>ZPTzMbnDyl$20LV
zEPO?tBA+j{)F1x<bgaks5^+qZD0E02J}*DKb<pc07|&ev{@qq6BR-hVU+DXEGlfH_
zPDfGm`}FJv!rd^=pdGE#q5asRv*nM!)34d83jpJ=_4UWE&!9T=y#BGtQhdCz=k^^@
zCnq{xM#9}co)j3Q<~)e#Nc1PSZ49yrJ@Pwx9^ck<O7Vh80|%$}_0_%b>WJ{vlwn^M
zMoNI}I{E2D>x=__o8!SGoc?j8uL?iyWA4s$w0%Cdzt6uJ$F!0UL7$hdtEF9zI*#K#
zMu#7G{*n82TwwJce=hnZyuS~_=jVJ3R`C;@b?fJjpMHpM3c*Ud9Ag;CKEH_kH9-jg
zgWUA{I_RX~J+cR0-Tv(M(o7hOeEi=T+wa9ips080-Ca%wG1z^&A*6F8DEA#gN1*BJ
zsz8Mg&vDm9B=X?&^drz|A^<18F^_0vD(*Q|*Qmxw`@HmfXh=vH$xlwdyQYLeC*nvM
z^e3m7`?OjXkO5c2ljr>G`h4`67ucSk>5LJ49M(E=^cX!pUB9PBAPi?G<~)hVUYZTE
z7uTpA{X1j&^<4`|UoUb#e`bGYmXpFK-M$TMfsu^l5THg<q@IN&d4dVZ)P?<(9@Z$k
zLdCzsClvLm5A5rYq7K|{jMcq1qqWmyxDg(Qayp`=%dwQ=@YAG~LCzJHMpGVk@(y}=
ze$Lt<CnZGVsO2DlQbFiJ2e>%x=bblZS#36FPS8{(`>P9TR_sUcAnZp`(+>F-dzo<N
zV-{zX&B~rXD=S>bEM$VwN}!EM)*Zts0g$TzN9nyzqsNs71$K!tpID(*VY4!kaM9$m
zQKZ%&%0gXgWj>)9N^RDb(vng_x^rp9rPACjHk<&`5`qw%kc6Ouaq6SjKW4u_jtxDi
zyjpNrBU`(9ce8hGYNa;0dsDap+SRPXN^lt;!ROv^ziv9D72q(i*D(jf#&tU_q2hv-
zd~KbBemiL*8NO{QHN?2_9uLNf?M@?7AB@wd_1i++DF?n2s;4;1rO0KBRh4Mw)yrkQ
zn@*eDby5Q^#^ZY{wTZ`K_<7<4JZl_~QPVUThF+-i!yyf&Sm_TGmjXo82p3d!xYU3f
zovx<SirQ{OrpgTBh_Qj_rr1dMlvAJ8DFZsk_hpE4EXuvVIyF9}OOp-g{{U4~;YO&z
zd=}IJTsdv6DjCmQYX@HUQr;|hF(o#pnLZm~qO`Y@)Dz@-^!qiYJW}zCMcd0_MK+AI
zR`(w2mWx8kw;7ck>FT*E#72gxaobt<Mw(lpYc6u~gk<#2nayFS0-gjcWZQj*Ku+Y_
z-bwV{-L6c7Bh0gW+Jc8Iq%&2@<4kHk&i?>y+kRR`zGsn$R9#L;7r!v~dvP{vVrr6U
z3A8B{d!mg{mp++pTjWt`)Y`I~@ghyBNP^-^0y*VcTSs3L89gzsX79HU8}-EXKvHh2
zwzV$VU<M=F)QK}7+ib>ZT**~M#~uczq<{+CaF9s*HP*@>va+LgI-1twZp8YH<z8Cq
z*HY;4S*S*)RH_8Ns402*08CmPcb7N`_(>VolFHj#GibP>Z)i6HWm9rC#=^g;O>RWp
zv7|p$uh#8Y@zYY1OpQ)}7F$=2mSW9HRfPDf_>MKLmQz$y%TX+ji=Z0<py>m0br1}V
ze@0LVBYpAd?}91dCT9(GHba@s;#VASzF#eUT+&lkyYk{HvaV2-aiuIl<z$8gjh1?i
zQ8P)R?H;Ja;nHn`w6~u7UAC=SO@m-rwM+7?R$?(`3AZT{V^Y;UsgoRR8gtd@&?)hY
zNm-jRSYkO+kl{xxt!^)_Yp(uc4LbQ%27_0tC)_OYwe*>^rXU5CntCdt;}c7zfJeMI
zvaWN?Qjvfp1MTbI>fYCIH@4d!R$@K1yWDVJ(6@g5v|%>f6>Yx_n^_@oHeYJmr7{vI
zl$Ph3YsNP!L-HxJU2!ULN>-v_u`tmmaiKau4b$OElrxMZrM^^;pFyijhq9<^@>;Cc
zv@<*E5QY)Hg+LTHo;CtTlHrH|uAM7kx${5iKlJDELZ8HD;SUZoCE&b|gb9wJa-7dM
zrFxpvw8>Lnl;&A<wbazW2;c>l8IHQXRDAV{8Fg)q=AFsmFJrE_lTju6D!I8EZSQpI
zZ9?061e;R#s#RflO+Qk3#wsmSZfZgIwj`wvxZ;+=83}O%Znl?;ebl#vXcvodHxh{$
zAu6lNmWoa13OZ1fDc5RgWpVBo0sw6WV<~^&0KQanu37ssZnkf2q2dE&Bs$ZTiWOek
z-pfuS%26&-=f_2Xe!-`-KV8;m!n3L}Fb^tc6{r!Du7cUNF*BN5vAkxGq&g#zzw)UW
zW1p0KNC)E2P%+Pg*i&3ZMI8oXUr8eC2>O)l2@Vm(iiHB#(sbEwq+4NWcZNP8(D;|(
zc3H$6Q5;qI)mzoQSz{!R?T=F_sdbWBrKtvKi%Y6W<dOA;mPrXLdSPyF-IaJlrM)_#
zBG$=ihUqtyMN<nh-CA5kDAh=A$cHXTDQv3_r}b2VLCDjlUaM4QGcUrAS%V1$xbSIJ
zD3jVs-Y8jN;{rp8VNU!7{%%!rgeM6|An9EW$$CML7M#>YR%9+LhbB3PA=|X)7V1+x
zp}-2NstAxFvPbD19`e7?wS~X7eSsE<7`WRIY4mz@<ru8QjN>zEQYEYaT$$n}`PDg7
z7Nrv5Qr>YzN(o2mL<!Kw(O%oy<PTGDLAXBSZoO@?sXkK$+LiewwJOF}Sy0FQ*;YnI
zV$2khS;fg^7UnzhDc40!Nr3D_5;~`visw88W}cQ%Qi9r@b1lYYu2iJ~L~=BOoMTxn
zBGiWDNf46b&9wo^PED&OD%y|ZkOavL$#Wz}3?QW|1LFA9kP4DDezdIVNt&9}sLEZ%
zP+^E@jMMUDz@o%$!lo(E-ISxrhZo~M=uTgMBmmkQ0q&q$imHfkBE))h7_%B-;K@Rl
zTb>qq8VGO#xQLsD93EK@AOXyTb=-;>WJQf3Dqp#|By2#~DFb~>cVIT^);cx$+zU?V
zj*!BD7i9qkuhu?iaNGG(#Z>NW5pFb#b}t>c;n!{|yREp)&qz>Jr?<8w39UxBZ)(6o
zs&w0GlH<rwq%!LYO+vp^bqZ>kPvlAQB(5ZPxD~!T^SPWwRG+HuO?~OqK;UwjU{IZv
zO50m;sK^P6Podhazv0aHc7hUT&k|}9Tnc^X!q!lii`qTJ3tPv;#qAcAQB<A1+2y~q
zwgOlS5oAQ5)KuN?aI(?~@n+U<;WU>pRH&4wOrc6`w4ih6iR))}IDeC9**Bc~Yj3aX
zvfPbzR&7g~dvWd^x1(1AS8CJmN-~y_K)vde=N+D!B$ckEOQ)tZio6(#pB07dQ*ivb
zw5bTG6tL<55?BYYCt1^ScLYYgETNPZzMo6HE8))!zKot0<vuZZu?x?~d{0U%V5W+S
zT*o%1r+8zTGW@27C3&KjC?tvVn&;#}ODwFpjdeW?G0H%=ZFgscwMv0chQfy{zU>vi
z9b{l7D0N9vV<RAZSSmlNHR9ddHky#qpOCn2yuS%=GJ>$4ZctSFtIB`@T}kB`I3)m#
z>6_Q??6Ohy2Ij=LCP;O1lFSO75`5l7H}2&Pz*RmotBZ!uBPopO=gN|kkab|D@8<hk
zPO3D!nq=-puf~sGp;KxSnq^O==a_Y*LxnAd)KXi*oCPf`qyj=zn<A5i^CYDdblJQk
zm+pRH1pcvoMDNp5->s|w7^kx@_Nsjz=<{eFi+mX4jvk?@W{#6GtjjWaDdj3f+5;YT
z@yY=6$SGc>ffg!Q<D+!T5eT_mw`$P*Cf!T#MN*X1V&YcWb}Xf*2|;DwJd}{NV5lnq
z{H|NpwYLg&R<kmhNv2c6*8J&H(Hbi(qCkw>&N}MSaO=MdKx8cR1gMd$dt!IGy||Qi
zjYgEkGQV%nLdmD0`84_QD%9l%%nyD-Ty6u5p-FZV%28o#l%dBPTTW|MckbBTE9U(A
zwhcPBE|W$LCImQixwE20F0|i`QI5EbDU&I3RPsx!QdGiQNajFV*0mwX$*L<^UeFkT
z52ivC*aL8HU|4QWpLUzvW1u`@`eSg<hW`LZE*<(ncvHhN_^Fif^+g_CkikPwQyfy)
zRlRzdb0BG&vW6OIsAZ#)oYTEaW`ZoOL~>2fM{W-iJ3SKnw=L?lYw5cI`l}J{>(<qz
zQ>ynh7LxZnaw`^<ja8o!cVvb?MCzlvA`+xE&X|gI^r5#p!B^oAhwGZorCqy6#wFLf
z5Uxs8YQ?ww2iY5kb3*BFh4@l#SQ~7)5-eikirGv`uwtmw&>s#%aR4aCicLD(+cNZN
z$%S%W3^?Ob;VJfN6l;D;0SXmqksVW49cj0RT4N3vY^dg;A<~f*d4|RDoy4aNcg(x*
zW%pj>v}aXaO740a?+b#&zFA5GL5ufq>S{E*m?eS8%fXn_Vm1SCWyNd+h3hyv3glPH
zN3xiP@=JFU8{XkqmLL9LHX_!I)qx&OKl@6)k{mz8^%Y(z@ljfeiSBr3hv;%zGm)nH
zq0B1t9KSeoP^=Lo$!Z>}F{NWV*VkoLw8t)+rBwRP=WwUGRLbQ#R4J3Gh4}8puUmIr
z65YG#l2qWR+P8hHdQhp7MLt_irNuI~$GXZ|CB=Q2OrhOLLuR41x*JPj?uC_0t~GDp
zR?}B)Hr2T!O_J>qi4Mr8RH;o?7Z|?OXjM3J*<wgb@t<X;<Ny%x3F6Mxdwuqr{kIyk
z_{-sa%8M?tsI%+)Xyq3F0JEkvQlu&O_S18oZlOh%w3Uwzn^cyD(yTVL`RvZsdqq8u
z*6i3-dwX*??!%_TdNsupY%Us45G?Hd8sdQZ--A_+w^Zu9=xVLUTGUyNi4RjzkbTi*
zDCCVV3TCvGR+^j`TpetIhnnKd0xXGhZ#LroUA7pLc)9ev@OSA4!}&I6T@m1)5pp5R
zYSAqvTzRbsM<SN0I+n;~rj{w(JuHg_OmM5!M-+%B1a<};x`x6Vl*7S3EJV8%YGza(
zMpey@P@Y%GQ3sj80KiZ{)0IM{w9AM?Xz&|af`Sp^C8m_30Ygb%LR0+Xj3+0c*CQ_9
zZeO#q+iB_a+rxM->5Ex#L$-EizfJd*6>}-X)vqb^$nj8Bj*H2{i3!h5bDxO+0HogK
zi5{a5hQ1BtRhbD_)mx>%SInm^D6TC`w#=zk4%o(J<o^JL%5AdL+lhoJ!jzt1w1Xwe
z_;$8hg^DV6x!rYzONAgE*r>U^><*)CfdJc&^FI){T9!9ybLc9iAE`|$)UhBAf)e83
z05v%P*zPyP!!1M>)6J5wg*KNIgb#(~=a4AiB?Unzmz$Ilo|x;WFilI%rXvdRB%VN|
zG(1lU3C}Q7pmLRGlwfDJN!R8FE8ENMPo2K@=KVdywA4$rUYyl4W$Cuv7T@90MFObf
z3#r<*eW#+Z)Oyqz2#(r*u$uI$(?kbYsJ7}-vDM3`=?rnx$A#;*yf*M-u;XR!`~D>^
zhf%lo)^Wb~UvMucVkOIgHl4>-h{F~&jKOMK{Na_%ViQYtRJ5fB5~;FEszoz6NzoTk
z(%>rFbIdXYZ6e#1R|9j~5G3(OAj}q3r;4N741pkkCFGc~0d!c{T=r`b+UCO(eXCsd
z%^q4HRIBu;l?4zz%~M(Tw3FC4+8300_r|h%eHI0BD4L3z7Se`LW3;z$PojtcUv_)z
znA{P2KlcM??HWzn#Z~_RGjeyXpvo#0S`13Gs+F~9%6KKk)84B|QF7(0wzVifC0Jy*
zm3S%S!jDUtWiYv0Yng_d0SIlSDJe=o0U!k6V*^lUPBYA9ow>9*6$+9fQ52OExa`hf
zl(B=@Xb*0vr))gYwtG4Dim8%?TXl{mX_$Z4D_Izk`w9o~#Z;Pg4qHePlOry2VQ5op
zDkm8L`TldKLJQ?hc#QzR(G?*X<?&QfN>h?MXIkA}O;Tlcnv{a{R^7_v{{TEEpygTq
zcgXkC%Lb%aX_i6kl!KGiI2g`8-7UlIna(SzGj~a3q<tbt(?DThZUMhh^VZS~(ux=<
zC}vqXvehAJ0U-1sZ(uEb_S@ZyjA1Z3?3#lvnJ$u7%#u=s5Atm!r>BGlJ9o~$$f{(7
zpcN@N0VIafg=Cy^p2NT4s-~*bY50}Y{{TBUB%EXqKymi#7^~IdJPM9HRP;-U=%i=$
zK~hIhI%IVRPtj8HlSMmp^&6jE`fu>-@xydgkWDx;!{r-!dMFkG%6kF+A@}0tCQ8)O
zil0kh0s>hBoRUbuE_U+j2C#~Q(1MRUX^^z@VRBTrN=J1bReUK(AZMV->JL&iWU1Dr
zG}?nswp#}U<#Q`3K4l60Rbw4<fO-%$giffw`tqrXS0My28c=Tl9IS+|;y46=qDP-i
zAnhVHnE_Ti@AqyG^Z47{D5RoURLK=Wh`+;ddUPNQkAqs>PQ)Btsx?;JEw<Kq!8l78
z%0Ha1@^}bO!ZDN3tc+_Mkhu<}#Pc?Q<7;0i0r!*&QlOM1a-p0Ol72N~2jRgQ70IRF
z(W+M~MZ}Td$88`Lj#MQ?lZP@%JqPP!J+vy82~%z@$H791TT`5^vN=?h6oe!MF9e?I
zAxa0-Ya&%7Tdu=zyAA>bh*(%M?{W#){6Oz(gVOzPU}}d6@mpG$n&43ib+<y6goGf3
z$668+(>@u>h~-vLM>kHiR?~`F+HKN=ttu$PVd9{?l9fHm5g7aj1e1W2l5(?;qDVp%
zT~b>h^Opb(xZ-(N`Zm(o134)8a8xk7cj<7BR_Yx~e669L>u`lKOPsDa_Ckj+0}2WN
zfItca9c)JWcE98Nx9x6*-+iy6P>kJ+4_?C7`?~wh?~HD2QkK2sA=EbE3XUCYD5wF^
zC_z619H|8=$iZJwM|=*b64F)`%gR!q2mq-m7zt54xL3rb;0zob=f0fE%PV9&w7V`-
zj(}Q3rxZp?l#r(Z>y;y&NBP)D03|(}YMM-$DTtK>spq4_Ldt;&b@d^hVxVwGh~OZe
zgnk-SFar99-|4@8oqhdq*zpp|p+Pqt0N(bshwdGI{6J&de{i*MdrG&hrW{iL0D{)e
z)LF7putHj&L$GNtOG8AH%-4xh7$eLcn&hg^GuY>*I%DnoHMcx@?mS)G<70}w$b{*7
zopNu5^qO+{mb99E2B@oE8ECBJGFhRaNF9P)0CXDEW%f8dJ7D8K@znP#jHLw<u(Jq|
zka~ht5<VcC9CDU<GF4}}#X=oX&sR{&dlfS|QV+dse*6fs4^K?!b@e2Uz~KD9vsKov
z{)x}$_Go3`9Ot3y`02=g{AdB(ZGqk9$6=1Wy))N8pFIvh0ATkWen&*9Sw49D_0Y=h
zPt5(ATx<pKFgn1>heOx%=lRBkQ3E;o;CJoiq8ulw`T2f*G#beJ$A7a*Eym-1*vS3(
zpt3SL1Jlnxxc$0X@S~HT!|c-1xEQahs68>)r{SRxaC)3{)nWK&q5CtW*jnSRt^WW#
zWc4Q2z79z^0FIdNk@s}fLa+x?td7|E_RrolI#g5B9S3jhI`UAWu4OL>J%G+f-UqI9
zgWlfkWkvpfmM)E`U;sIZ&Po1}^T5~DEUifhCkZ%Ld}sId{*6#+yz-K+QJ#QxJu%lA
z^wG_yIl#_;q;>82?WC+v&!#YK+Z9?kBO@S>F5NwS4}BatNKc?Xf6e<oee^PUZ~*-M
zzM3VlRgS=XhxF&qrm<mr;~2QI4@{p@Kcn~RxEMJY$vFofhufhLuOsK%`Z1!CaoqLj
zLB>1w$FKJ378WF7GP~TH-{=1TI3+6x$2z*7AUpK=Xp-(mag6!;<F}tp1aXkQnLjM!
zxXAo9Q6zLA=N-xWeFv73Vmja9g4^ADb-^ij82I@>AmHP#UZ8sP&Zj5rrrdV-bAg?u
zl>C%Qt5`~@?e$$DNiH_JEQKZkaXm^wgyeo)<0GilDt6awZoSjFV%t`=F;nMB1?9Tq
ziHlCB!a{(NRjpKAPlrmRxBT~<>Y_p#L#~vd%NN-K*4J?HYVK~)*LP-*BDGhS0`I6y
ztV?c-Y&A8A$%P^nv+wQ&xY|<M3yXJ^*AK*7LVghh;|XY|j+%+&2B}|Gn_o&5U`w8e
z3k3sF8jix|_P9J6eAb7Er_3p7WPGw%B&VKGEP;thBLJVY!PEj25`pg8K^N=R=S!~J
zJ5#t7>s^-~xZqop4I9B|yzFVR5+f#}hEg)>qaoG20MAxNwX0@$2)EhZn{#|FJBl^s
zY0zw1dsY<+Lf@Mzvw7DcrbW|y-O^v`^wTZpQyH;<*v5LKYipwKmct;FIlQ}W>A_2l
zBIBn#f|4+_Eg|9*2qz=Y8V=&)2ZkNDwrjTxt;nO*srIxNC(WZ-jeT=gRA#!YQ>l=F
zRE2-CfPU>k;f|J`QsSZ^sdNBYZ*oP*7dxGWw>^hjW3%$UKH?mQA<c5kp{2`4ZO!(|
zgi;<#SBg0KO!{?3u?3q<i0X7zR4svJVUW+@vuEzLIJZ%I(4Lt3o}BfmecTjuJnPCT
zdBre^Dngb?Jh)B(IP}n4fpYM1?55ben{w+E%5}FD<;j^vqP-=G-t2D;=;KOM8XZ1u
zO-hw4IQJ)v=_rd4r77od0M8rvfcipm;!>(Kz7V)`zAF<04m6F)+?#5yDOC4xLS)0Y
zDbZHBPM{889&rdb__}9NkKzl6o%iB@a%Aov{q8M(^t_&F)}qI)KB&!6sqQGO)2LS8
zz}*I#G6yS6pr`@PwVt|v%Q$?`E};_BBK@W|4hGk>XUrJ)GAe<yS;f~B?;HIj_=ofj
zM+{JLUSY%(vuP#=sHkkbGJkgShhViPB5xF6I;q?|WM3F3v~!95$>R5as{7x%QXBpd
zUP^X+8Z1{_cAIHiQF)?UHjN*|KMgt!I|=5%FFy0q7xB7vuUt9AVan~(Inc8FDk75@
z0n;v(1rj{{2Ce(#=QZ0MfI;^v3<ggr$OTCRf!DvTvJM*9c3pbrhRS)Q%%?<)9SQEY
z-*>`gDbJa4Xdiy8)Qu^4e8m{i8X|x$b{xQWJCnCkNhhf!?~XM!bro~gR#i&V)l{^y
zNauEED$Gf+?t1_L=l~mHZ9hlffa-nA!w(RgO5F6Wd&hEP$lC3jku9-^bbDf4THV=G
zhLxw`RZ_bW9XPrV#U7ZX4vIP0sP++|)gO-JbuwC#>tPD!OW_DO<a4=0spTo<@62!r
zI_#GK+hY%6xJ=>iYiV&)5xZk;ZRe-7l!Pf&ilip$wP_A?9L}zM$H^zId+Dg+7lx~r
zU2fvsTP8g^p+S)U0M?SIEIzg??aq|&_n0)O31^b0&o#w5$^(c$rcho2K{S^W(Kcfo
zS&AmAgLZ#Xj&&$KH;GE1_YLpY9g*R*((q<k21O*o7%HPlWYpGQX=Pq+<n5`h7XE;2
z00UBN>Qr<zhSJF?lOZx42=L2~x&i=G+{w>6LnsF%0273qYh!3M2-00*be7U2!ErA^
z4T0gu%VmegPwPr?g((VI1t1WV@~0%KR}VYOM^Y5#-%ON%hL_DsnM<f4X~IA!6Of_+
zB}XX)V;sHo@!ES+x=$&zBW>=56mo?vaiS$X4jf9|a%f0TQIpv9#-dSV)k;8;l0sXy
zhV&Nb4ei&{($*NVPJKqY<!r_n?XhN_AOJQ55?f$E1KtI(aiP!*h7i*VS|X3~%5&hC
zF`ni!9ZHk#>=K{~zga+XBLPZQva6$T?d_gbxnHW#@9N9)CWKPsZPwV{`<Ws$)ZoOh
z{c4$G(d90cPe9}?DbU%Fuvm_js3-@P(bz51o}@W8l}WeRP~|Sw>P<*-DFBXta;CQG
ziikf5=R$n?ch-peZ)$s&!Vj}obhle)_fp}qw^27X-&+uGD|x8Y`P9l~$#Ag-u@;Eq
zsC95^FUBiFbGiNHkV=?SOTvVvlZUf6r;@Q~+6bdDgDk6MQt~8eWhGs%?f}vaiPgBi
zA{obtd>fW98J$_rX<|v5T1pwwWtl`y#YI;pq6o<<3v&^P7eE%_mNR^G?mo`&U3uL#
zeT!oLx3{M3t<^4j5{tf0TWjCVw~up5omCrz{@KwY$ceD@lsP+^-<5W~BL1ib!_>+p
z0kY*~5!|>gdxq?;Rc>pBw^z7sI^^kfD&@&toc&6_TBy!_awkoxRAjhT>+eWf*5Cvs
zN>%~5F-OiwCnVY`wMmtVrAoD2ojRvjtkk7eD>Z7A*;Oj7VzW?l#-CTK)aJUk>XkR1
zB~HkF#~pC>T8;*QZDnp@BnGqbfJZStx$+vYavmR}$sw{1bxgl%LIuUbjS2fGG=LW6
zh*j3kRY;`#c=}0ro%DdrsU+hZ?qkE*JaI!smWic!5h=k~W~+B%)z!mOzqC#Da7jHt
zpn{4S<b{Y@l<GNM33&-nT3e8mypXVRm8A{>65vn-C}4sz2s+HEn~!nP(-o<1z`3AA
z3lZqItu?!<n#NL6J<a*93Do5e{{Vw9Hb3~I(->gn3RuZ02cn7e?ms!zHKZ#f4!Owu
zpO&8|rh=g~O$y4Rrl1Xp?hUS|-YiFBif@N_r-=AUs%pL)&Z;tLD!@vGhC;B_L=E{h
zl;-sHwB-G&YPhC>{{UV#7<A|Fz3!G-g+Trf?ffM8&U=l6O)wpoA?DK2mr$xy!_K(+
z8bIX;N;068Eo%sE2(hbmcM5C=sj9th&#IqF(ET|T$*o6mE}<xpg-J@pr8ekJTyNey
zC6%a@d`iv$rrYKrcqDbseEW~vuc}*0S`*LlAQQ-w@SOVo%_SWbBp`*SKp5Zbf^W9u
zk#a|3NjBQ}oMyf{c+s8mW32I4K7x{(lu*S-MVZxQnQRmyDB(0zxmH;v9$QOB@kEOy
zEiEKe^5_jLY{apw<GjHoT&YWG2yK?o5Zi5o(G8&hCA8#|fCo}fa&<_Oqs@Vg4pG>Q
zfu6YS-(FO)p4bH7A0SEX_G{@0P){;}#!tdPBiB8C&23+AFKxZps#OB%TWJag-2eli
z9-f1xvE|f-po4&Ya5K~F^U!Gv<~+#=ZNH1+_)bTk&--+G6cjQCk;pyAmtVg_sU$a-
zG1sBV1pJ8r_UWOsZ`%g32HpF9{{Z8PZhN}GQi7HU$ihhjwn-m7OXKL*aKmHY+aty%
z<8Fn6Y3>cLxXQQqeO;}2P#|13{dUhqEz7F*r%r=ZVQsEFiPd@|PK5HSFc6@mt+Xga
z7?qC*HlB(~lg*HjwPP3q9S?0yd)a5WXJ@^S_PcZjq*1GTmAc#GRjtiWG-;}&Qm&}h
zi%!Row5P+5Fj8GZPoSv^W*X9mIf}VroMW58l4VI*Pz;JC3bBg@mO`z`jS1*Xp$Q}q
zh#ANsNX3ESepYjCFQTMKxzdQ_We0V;6ol&Z8f9<3*54e#-#=kb1ar8;xzV#5@3}Uw
z4s?f>FI}ahQ)!jD?Z0}>LZqU^+U?i5ACTOeBrx+nJc-aJ&!;$~MU3S^PI%032Gsi+
zeVcoII@q~w%QuLMZsSlT#(LP?8aEYp-LHAu^~kZpk#bS0R+TCOX%(i_JW%5(OD(K~
zhL+#LY#T>$%bi=eD#apElX_hhM<R11E>f7P3S?5X^MIC`5md3r1`BCXPyssLn@Z(&
zqb8(zT8PvL%u^z?%7bp6VkA_bQ(+veEh}4XB}nF9D@p{UkTpkV++)VCI>_1eL@<N^
z#RKvd-3Tn2WRs~~Q@pNL+MJMY)Z9<uPYL8sWTDC7Spuw&AyQeSvV!Ufv}?>dl_OP9
zoi`3~)Z1f->f~x=5}Q{-E30ZF6z1mDR;5;IQR$J}kM*5iqRLVy)t(4S<Vf(4AAQxi
z;h?LRPPM(e7LDTQjNFf@>PvIMZXEX;OHy9!8;K|$M;1uvlggrc08Y749`x`eRSRKD
zk3xpcCM1w@m#S{IWJ_QKtD=zVqoqM0^-8h`8VWtzDToov?;m`Q%$l694bq-ph&0J;
zj;TH}lzv6OmXyl4$2O<XC8;%P2bpE_8vvsEkC+?kJCXpl#})XFx`IRyNz4{o#U;o(
zl*j--X>7U|W3wI9^c(4Fad)<tw-mSM3Km*lxNgm^vsHC&E!7d$T(_<2sD3jh%tFED
zky~jpnfHPRBTf?5O46)sg6oK5ooZO-IT+4<9=IKPV<WD(@4@|<v>Ri@*5q#V5h~id
z_=K}z+qGyYkjb>>-bt*krzYaV>n^~r)zHIeeIZ`#<g^#UTXIT)=zYy`Dl*+baY-pk
zlgK_5rD-QT$vut&vOZe1xN5X!)Nea55<G-504{>cLXbE2hCN5$Y1bJ`!d22_t-+Ag
z)6p(lM3sW9-eZ~w?_PGiVk0R60TJc$LY<hn4wXvyZL&v*0(+=)0uBy2x^^JsA3nb=
zVKXmc7ndDZhNT`=43J4U2_zhIjDRvQzS;8DzEtkDc&;_h3W^l_c~SV#4jgYjnIor>
zUa^#2yxC~4m?<QsE(~)Z4~ZEh60~4{waSpMT}oqtP;72~KM&pc{Bahiq*%toS4;jE
z@7Lq}jy9FMp)Q_exC&Lvo@E4-oRE3K$G~zG<&9b@a-LgjkxU42&<fQNN-d$(WaUgL
zAdukdu1=v`pAHmprV=I9$;w=KC;&NJBq>2BI76V3k`GLtm^mO5oo0}31h3&z&oV|x
z1eA3-$j?)d20-o0^XipFI!>A-7xX>B>~HJS`HXHuQ7sgrXbtVLQ*y39WyaSY{fNE6
zQ@$^4*JZiLg5+kxTv|({I_D~qN##&+BRsu|i1<o?RyykH)W_WcPRLjxL=cW<8&Va7
z@+dcwQgAyFg(o3E=U5HKw+jZTPYGMh0=aC0u$8rhmB~kk`p%)WlHz-<0G^8-ap<+_
zt{kaNfR0BSEva}@D^E8vd5`%(RFl)87{SVhV$&;8%wn1LYuMOWgKh3R`rq*e_?=L^
zd8I1UQzAsb+0>D#7<KEp>vbcqy2V4|7C;I-ji~d03X)3HTR|WtN+~K^AmjX)>Iu&=
zBUhDFT#VUT8A?2L1R*b_)yKohDs7;FmBx_bjuXx?lklUI^J$)oQc{Wmaa@iQ%OSU%
z<wjS`%Wd+wqaChg;UOH$Qk0aG=Ob6dRMv)yyh$i<m)TR%%Wbr@r2JkY7NWOgXB^+C
zQ-YL_h@CGS!@j^+U-x(Gx4!qWzfJTi;L&nlUAO3Wx5V`wI}kq%vZqpYW!9c_j|CW7
z7tV*Ul^&}cm_vn>B}9TqQi$o;YHt*~$4l5wAGf=EYYqboYc{g;yTV#Ic121ZCFpkJ
z5m2=c8bg;YMvU51pZsFFd1?KbRxbw$b08}%DSX~A$XGrnQ^=o;bvY`)>F22B{ULrN
z(PeP=x12LkrWD+J{dSAK>S+#gy%TFTs%tL}Wj3rB^-aK)OpK;n<>qSNeL*AzV|JYy
zs(N}fCsj)TeL{719X`qiJ9>1!#wnjyrc;yVS)&k!iY8>ex0ryCsU3XMvMJwSN!t+g
zT$xgq?8<|o>WufFolt!sVd{j}mnLiAV02ukURTeXLac++&pmVYe{P6#sU3%Np;zXv
znDy`2dH#I0X`lcLY(Fiw$09214b9K4{SF3JGI9AoFP4W<3i80~pP$V7XodQM6iEE^
z8Wl&OK7CK$r4$lI6~O8sb@||D=k|QGGlMzm0R;8YS`oqydiOcU%jc!XQGtO~)2C8T
zbMo}ZrgSRE&un$a+t<%Tx$^D@pKo8^pq5X5m_5PsJ%2xTltE$A_xb+-Tnthq0(yb>
z{{H|yEm2?Vck=u`U!Pqq9|LSw9s6hHqBJU3+dU7F$4rCes)0nFUTk#FZ=YViz4S){
z-E2k<!>ztQ!v{8d6@A}7L!t*?BldadCh$6Blk@!d{;d|3_4GboeqUyi!8&v}DWS{M
zoMXuR^Vn$C$nyaG_$NT6SslL-=jVf+R%{e3sH_mI0iQ3k?$T}PZHMy4ac~O30Ye1&
zf#2;T^VdYD1E|O+p&h?wdUnvMQ6LNqjCbvf0gR74=zy$boMd3+V3YP^<^4KO7{QIG
zcRg{_@9Bg1XoMW#^*HPE>FbXz0EK4*s08{B{{U&#eryqiDLK#T`u_mKNH<=$#x48s
zV8YZv&JSapW2aN!rm|~Rg)Zc-Q>awtgYxIgW-BRK!$sE=dcNTQ03{s_rEWN{=C;y^
z>x|-!m8_H~@}!LO0CVN%r&DWc$)ndBW;>{Ap-@Dq5v8aOc>eUtd6eHbcht*nr9U;F
zEaytGq>7qpA^^yWNcj4nlebOq=aSIFndcc^TTwZtr>>qDoyS#Ibyh2VwGeE#+ff(V
z_}+?T&2Mcryo(Ob23)ynVcVXi6d|d#+LLMJOVi~itZHjYDoj}U<!P~$rB12EsLC`t
zy~!<WnEQq+i18YTg*en;NzN8hptrmK062l4=IN}pZRcf8ajsxgmka7zk2==wa;3Pn
z9Ia|6x$1M%r%i1=qZTX{8(WD}t4e@U0nh55yvaBn{{Ro@tt)1Zm^oJF&nKCf^<r(g
z+wLBNVX(07T!)8XprwMInv2=#sludCDA^QSt@mapcVcxj63j~yah+HjO$MU#3R^9$
z(h<yt`M^(5Ki2K``3-b?VzxR2O3fapPl&@62=W_kZiEFXNmuKqD+D-#jO1X0&|_NR
zwkSi6Fc6fm(~E4S4Wuc=k^ul50D5Q0<6S}8y3Ma^!WS*eIvp0;wqQuE+?A?>?Xeb{
zN~OnCxzlCHbcD9jBQ)}kPH>z6P6n$C?yc(HSmd0fY6&CPpaR3OJ-s?y;Agq!X_g?T
zr)C<#QU|5C2HRTO0lqlR#b>q8f2|G6xOUfts*N9LY|9eksoQdHCapViuXx^7iVVjo
zwVIrnHJW?z=#+(2qe^Z(R#;NpX|Ut&lD<Ufw&{C7xQ*YMJemgiIkkJIPLfpP5^K9d
zVo`1?bfo~1BA<2Ilz4Jua^s_ADn?Xu<*ioTo2otMxf_LfMM4BCuKT<$XeE}E(pOHn
zE^4h-nBp2=R*IlZj8v2HB}yQGK^nr!iW^8mLXxEUli2#_&sRks2k_vIhN`0>rEJOt
zMiaCVnuL%6y3MDWgd5vSE}n~J*l{j##2J=lnAO!wSkt7ExkVvL1k`i@Ep3*<{Y|dK
zl1>>N;tn}^&2i|01CG<-xFey``#hc)!kKYOC&K73Gw}A)_3Zni!nyd5vn_d36BYW^
z%WJg>rAKyGzq-|C8-fE-m_n5E?<py10~iJFWqc_*W%r?<7PUpFCn|1j4W_~BFywqB
zr1kHSu7UdruDS)K?Ly({%Z8atsk2>r=(lNRs~x#b(`)q`a-sE2S`%)9lvJ5{l?GNu
zQeGuL5ClwWk*49w*rRh3nsxw<^bxkNFmJPK*n`u2H}Lf`W_j%$B<>+f+JKBe8*>e;
zy+9`RTY>`-a7NhuJZ#IVJto?tMXA!)275H93@Q>HN|g;Q#cdt}i0D+DV2;BW)2(C8
zhhIaZ!&2C3;;u)0l$8QA>w%4FEL!8Q%WgWKJnE6i<BL{th2ct3$?Tk;yXUGL1aUI<
z{@lDy(;KI*okQ9E$YREzKH^lB)tYWQhE+jIP{AfcE`X7oB&Rset977)ih5z~QqIx>
zq)Nf{=>X~~0;-UIWC6Xc>D6>OUT2u)S@vd()e+>$46{ijfI1245}7n8wxZHVw+H}L
z1&x3h>QokCzM#{Lpe0EOB`237%LH~kHFB9wnMZ5uC=NX`p58oIXe7GNY%8Jon;kzL
zVHC;AFK3u^>&j1lo?fTr^3%(1$oGy`x-Bali%Q2uB#bB=j=9t5jvAHHe2@C9HX!!t
z)O(L?S2@9`%UDW&x*o2KZWtS1bGo;q3t0QMCR&w~QD-Z0DkNno1YtkygZ64UpGv=U
zVp{&sJ11?u<qg!gYkn-~twst@iz1h2!m8XAB_RalwwF@_n1R#8Pf?z-9%hnl+mR_?
zC_$+!#g38D2z5jU83XN5Ab+)}82u@}Drvj1#x~jT;cit?HjBe$ks^K8n9c`dwYa;0
zwk10We5%L2#kXQplCXNAQwTarI?9m|$z>X5sH%fl^jc{at)Abo;suDCTJs?4z+wTO
zM@)-VUr)Uxuo9bF%`oKX>-Ljdy|*Wn#>4_~7ikROj$CqpIdkSb!5^O5rrdO3l&2%P
z03L_ugWE<rTX5u)f!oM|)b$#p?*XEuwmJ|3lrVet>G<kJdu~q0{V`wez+1K{xZ09%
z0#%XCfOGKZb+4uZxm0?Pd;F3xI{AJY_NBMY&*JhaL;#YYIlQ`!2<)V`_zFT#D8Lx%
zPBYE+>jk#5gN*4t&ORk2WP((WRTTI83D?9l+7=va7ZgbfNgxn9bpsuBZ&S;X_bGIt
zzF?w^^*~Q?_V>}PhTL#Eg04iI6=0`09gcju>lY^C*6nN<00`gbY*flnwJl2}3hayy
zR1?q@6Zy`O@LO3U1gHYFCnN!nKhN8*4z&1Nhv6(N6U*jtp2{P>lSoUvxC&vkr<Go1
zM0CN(>)S(du<Abj{{ZofSR0<l_ha9RfUpos%D~7#>ND7%m#&aFaH#(P;?hAU)2YE8
zzuTe7TVZ7j<sp2jaHL^F87aXXKHU<P9zYx^Q;Nw^>C1!D2d7`2vY>(P_+tbM+tY8K
zyBAw}*skA~Evsi+9x$z57cBzQp{a&^Wv01x)}Y&TM-t9INR-v8u*!#SRGjK`yhd79
z*2wLRzr+2J7A+dY*~=c(+dFoQ*bg*mwpBFJ+>qpw2fR5tyAG{UdDUgdWLDjE)djCn
z1@?L=mw4ylF{Lf18Ako>tBP$z28x)uBS=Czq<}nDQH+lG7}Te@uDR7vl7&ewy()BN
zu=A^Qh|Z;4wHWdpLV7r_iS!JBu4c+}$`h(n#R+Ao&bVtXB=Td|Ik6kCA$JG%0P>&l
zk+*)7`Z(pV&7D`~Bm*>3LlW(}DvohrPTq1B{qBlE#)j<OeK6xy<})F-6fTRwPDhdp
ztgSI?)h8C(ut8`owGr?f=L$K%*5F%LI5fI^S0y~d5gT%~R;V<kA<)z4REHz9Qmie)
zl{wBn5#hC*l@qRRSQWo_a`dIQ%0nBQcE?vbvIJQ&VARmCjCCFa&=LlEFQ^#7*p%Gq
z5fcbH>VCPH!*kZ!&|Xb34YKrw_{0F;!5y?ABy>cD^73UzQTn{OY7awkWAC?X_2>z=
zYun&D<3FX2zMe2mp8jGt*>)rj_65iXa6lF#rrXjlxl-v+gKKg;*;5{$HvwS^eq)b2
z$XzES_)j$0N|II3l^o+&I+o=_n#u%VBS@=FZY)V;B(&u^ors8AhzjO!oxvs75zuAy
zsN{9lwLrU`dR<au4>tQH)|r4Gbx3K)C$ZrdlBAq4!W4&{TY!uyl=EZ}oKkh>+_`Qp
zmg>w_($yvs&qT8J6vEx;IiD>>LxoF72uj%m^BikIa)unh6G)cV*mT(U9gpxM*A(_=
zk}UO3{IIU=t57!32o6IYwgjmFf(VV4*Bfl5Qt&}rf;{53gr{Y|mmTg?85G5MQJzZL
zSN-rFN}L5aC{mC{PBiUWUenGW?mgF64g0%z)AnP1*rwYx8!krS)v2_tyx-a#eiU@m
z?h6k7b=Kh9w{q(OrA?h~*OvwV0IVsG8hq)=Uxe2$>zjuCF{z1*AraXPcyLk=G4LZS
zqr-5iApCB4WDfrT22@UU#cyeb-0ofHLEA0&r)|~6TG{(Ln{w@y;kpoMW~pz{ZyJTp
z?cWC6x+O#|IY&xqb$IW`eq&6-TI#B0nF@Ulwu=LRvf~bM$YwFcUXm#qx;hSIOaV4#
z1Ttyw&1*1i@fqT3I^G@On(XG9m{m4d(XogrJlNW0iNPuu#^{f)Rf?#Ii(N?uaJMB+
zqXJ9NmWQF#QrMXhsg13du%^STb28`|j`J$OSojo&L#a}d0oERFX5|K?CFS@Jr<o2F
zr^kaWl_|2?!RUo0(CQS04vI>Wp~$R=HSmM&YT}=T7*sno+S@ztvNVOTA#FbC)hcsW
zZd1||&l_yF6@|N2uvuCV-eRFs=<5mi=}ONqk>3se)b0<sn4eCf(J!|)cKNTo+Yaqs
z`AVeP^(9<SsWD?4KXBM^TeqZXYD!SzRQ)D<Yf}z=UZS@`Y`V<1Fs5deM?Rb$si^55
zuAgZD7Y@KOs4Mk@O~hY^_}7Q?^o}SheUmUh`#knZ2_LGB{oJJNP$O$*RvfThLF<(^
z<L6TRVvl%l9x?-&3QF>nzRzEcl>ytyK%kzTTna6CDM%hF($j%FiX<n(C^!kp$085H
zQhi4+Vl%ByIVuE};Yvh^RT#`BLK~FAnOlrJaMHXrr7B!U5|BY30>>+jDP0N7==Iet
zDZo-37!L*YLwy18(~s6ABw<~Y2sj5i)LAtxn|_=6^u71ogVw{|2T&wa0B>!NLN~DK
z+pzTX=yA5tXDMw0f(RU{3I`ZS8N!<*s)DoF5Odc9I&Uiqa*sJa2vc<Tik@gAD)$F6
zOYI{h;yzc-5%CZegp42oeYWScs7yKuC{%QUg&tys1q7s!k<}e~gVj9%BpnTQ2Az(j
zq@hYegNY;%ONk4{LOKEAg>?t9$4qInG^Z65&J<o)yvz3vpZ5)~+hdK)ioE6Z>8#$G
zq=b-rk4N8NRGaiWYF>wbRNAp92yIQPm=&$Cqu{AWnMi#KN$8+QP<rH(jNt1fW}pgE
zq`8DGIZD^cm0;v01zkxVK}2(4fJy0wVx1`sI7?1t9v~^mJd15=AFkg|i6kDq&rFPU
z)=1rDEw-YiBp_t-DN9jCbIbts!Ry;Ropl(7L#F<N;nv^7@VP$;jd})lRXXqYT=u`e
z)c*jcGaBX3N1;-y75e>F6$;*<(yBGu^=_i1w@#tZXt3l}D|MO9ElCN95|<KN?&RS}
zj-Z~UIsEbX?Bd3+#*Y)bi@ws+A|<CbLpFxdP$VdoTf0MQJ1QNS9pF+w_f~sO%dAut
zfTK3xbqeUxb=!|_Hy^0?3EU0sEp=*{JVBep^>&#dN&32!fflE3Y<n`=Sj_pZ2(>$%
zw4P>TF#?eHD&Csdj5^6GS2tYs81g<{GtgsJ7Yb#rsB=n%v&^Al1a2d^CQttWQ*A%s
z0f8b+bBBu@OC3c-d^1HZsHk6ETPe6{z_LSr{DmaQH~QAlKzMhg;?F_`I%7Tke{QHK
zk`7Oi1F-6K?5`k<clG|Q4ze-_rgQr>HpMsw!`I)B8X4ZBzHonMU&p?PPy`(Lb?NfZ
ztL#4Cze=i*Hy->O1FQ@a>D%!d6~cOCU=K2SW2ehREm#Mr#(xZV&(A0JXeSOq?t1jk
zTy^u&@G(ikdY*@;PTjxZpw>n)=6|nM)_k+}{_PB+bAyBC56eoZumk7+05}+=p`3g<
z`|+i(Dp3T0dueF+J=dY?J;MnE5rd45-=DWtLBR+9IMC@hIsA209QE?;^Uw8Y5Dwk2
zbFi@3_WP}Zka5&?AJLQhG(b@Y13AZB4CC$4sUw#-?c93fuB)M8KwuH+_aEubkRyHj
z;W7`}wYq;S9N9gI&rjRaMWAy8<a1!;4CA+Mzm9=Iu%wSQ0rqv#h&{)rQKFCyw%Y~4
z=s3weyJzR=s+~E2$?e;|dY;2Q^g0ekRoms<{!WQb1_}6%Iv&U6*GaG-`>-)pvQS4c
z7#*{KdY|gfs-fhp;{`u6&}xE#IV21#_6%qGHT5AW9H}R$$S0}uKAP8YZq~rTMN3dA
z3n)nPPwOmo#tx2(RKZHnwWZKfq^vBZ*3^Xsw&QD0R5+CYQb%lhbk(>ObRY~Q5U*T$
zWAHjD3sS(wGMoXPpO4Q;kO&~|4h6^{gJK9E`^Mw<9Beg>zSV1NhAXtTtIT{U6C*r`
zRT7ba3(c<$x}ZGLq?H_;4Q!3I#WvhVQpG}-bi;W_%97nNxozbj^h=FPJl)4%U319<
zq<mhz&r%1d{kkQvLXZ|zq>iZ|<Du*b^Yr`m9IoNKuC<w@iK1ug%W|Ofzn66%a*SJf
zH;vqVlhemaYpL^C;ZUk;Db`sui(2xbj#neGcXMv|>xI9^&f428G^%}_cGl%Ll7za5
zl&00m+w`+$;1WmrsskOg#PJ2kR_JfV0s9Ct-IKPDIMdVZIy|RjO1Yej;$Di?*H=?*
z`{g~iklUW(!)T1-jiGOs`BIUh1C)YX1;7*(l;@N;)Z+vWx;>&+u#(|WIOM`{$=jjN
z>vTBNbuR^Q^%Ycg$wkkqgoa0z+D!}yA(ctxhEguAqf(KnNFW?F@ehi;VZ?OvQq@$$
zMNLo&$h5F5Mb!0EBN-+N+lEz<RlzF2sUV(*OY89zrSqJEmE_~U>ioa2MK$6SsgemQ
zP**aB08dZAcF>M2G=fyGi8%O@F^@ocb?K^+-cdqAN%*o!S5i-G4E7y0Bt14AK1M5E
zw<CL7ug&p@?vysBTNL_>STE70sypdV{!IS>P^@F1<|ptv#&~DlIlCFemdEb&6^350
zH$Kv@y0sh+aF17xijq`u*;LnMC;tGYr*+zFYRx{eL|Ot}olkhBNA*O8QdZjY<a_=-
z^`})P3vIm8hv}GGjJTkBc#+gok&gcWtNV4kLK0}IDJ1(6>Qny!M54t0{ayRx6qQnC
z`GqZHTS)|w%Dq0+Y_2~LG5WOA?#T5eL#xxA55lfNfmx?51QfjrtreM()`fYXvhsTQ
z=f1S>*;%~us2pW+-@`RZr4{(`Zpb^AX)u&F)RtpaLK&+@TGNF{2zkbp*Ciu8f!2y}
z@$C||_V?LU!^aml-ML)6S8l4_*qfe*MscWBN`=)zn(elU(d5(uTK7>B40o2YtSBg@
zB&=gxOyR@YD{ySTv_$cvSBW*+4b^#74f}0Hbx%9|UEI<=)>S!_j0v-;@C;X482ux#
z&nH!k)n3V8Sy@psL|El1EKOl@(}^K6MuPjXjTj4l(t>>0>Rk7WvTh!ShgKT!tDMwD
zHAG+%Mp--#5?L-Sp=M~N02247YXAoS0Hy^hXE{Mqxj-O=_riuc9R0tyPrauof`t!=
zf)6myT=eQbf4^GSw$*wq`D|J@#ji0{3tsr3({5XGdy(YBT&hh{GjgLT=rdYv=&pv`
z0HwqwLmjoX7Ofz#+7_$;I*<=ABcbRs)3%kR%mC8*wqOW1*n?{k>Ikt1(BBOFYV^@X
zEKlWdSxTOugQb*?p@RYl>Ifj%i(^#1rd&y0TqN*EzC1{6{i=(;^V<7S%C!cV_dmJC
zmo@fjh^$ls2QuJ8RJ6!-BLt<40-odYd)y7dytiidyEjJv0ItfpuYJL|YIk+nUz*`u
znx$&9AyTEtJ%2{ZN`e|d_*-qXAs{6qU$AEpTR~6a17J6sWNJxh!`&UUyey)p!V59v
z*JzU=L6WebM=MhtVb76kI{bcbt+%diW#4k`&B*f(SFCG>w`f)s6~w<E>l=2XBAF>{
zK8}wvwZ|$-hx+*P)6EMP&1b2oxss}$E>oXGW?F<p)5=9F%6hjlC1QDLYF9T(#>wgD
zjZf(6Im}WJ285nfGE<owuBl^6feJU3L=&`jFDW=fWT>l`n>|loJbDj3BZ8#!E5pd>
zRgje)zGtB8qlyYql%YKVInTra?d8`xvq?#00U)VuuL^91bwNEqBh$X5AxBQQiUthb
zY=6`FW6RAFypoip9-VS>G1Pi_>*MV$)B*=or?@%h`~Lve(rLu!;mJr&a7UrR@A>PZ
zqc-E`3FT%u8CHHJ5;~5ani@dgrLmLKb8tHR{NEPUMs=2wu*p$a<|iYV0sTF5pZI8~
zl91=<%KrdWI4I=+9-U5n^>R}MK}ZYAdX9qx9>n#~DTv%RIf782tmR4tM;JN4J-q(_
z4Q9ix3Jv!4+vn%=!b@sGii^s5K1nAjK=k?R!>^?s5Tt?E1F#D8?eaPe_f{05((%pP
z3CB!!IsE+eIeE7h5~6YlE+nU>dLD#&lb``Tdf?h^useMG^ub9!D*4i&pau#$1oL(6
z*RH9`bdZ#z2_q@!a7iN?^x~D_EHv6v$}$FUNdu-7Ji2PgCO8(K87V4Ch~*<E?dAs=
z8U32gtWRT%fphTwczn2Xy`0*u^V$8xjN+Pd$=w~jx}A^$9874GTgr((s_Ky9k_r<?
zYNSp`!0YAKS^QK_hbE<4r$CT>-W6I?)WQkNlxJqjl}nQy;^)T4hNZMtu2cFjQjyGc
z42C2iI$4n0jYO0jVb>XOhkPjwmL3h1oVLFW#o&&h;E!ENYQf$Kd)>pH)ovwJ1>CW%
zkz?Je30hM1(_tZtLb~f}aVZj6kliMiP;Jhs@v2V)g{4H*ejw$A^9+MEQRIlt1D&s_
z)g+7GYey*b1&2~?j*|K}<}t^f=Gk1$rKXN5n8$CcV+^hFywvOe0Cn%>vDXSMbklb$
zaOtWgw&qN?E3ptTLygpE%coRS(pCD%_qr!4hfJw|5y=^TDYfM#UiO0Hi&J8rhSId4
zhKq!$2;}NHojk;MA)q<~tv1|hqUgJmK&>Ev-Ey5)wq>XSaO`4kI!7u1$Wok(RcxpX
zB`*$R*IDf<@p>v*d6jsNMDXNCL&0Gxa1{7xQj!i)l_V=Yf|bfoO*Wch$xkp{ofp^j
zK#czKxAy~a*4XN~YgJmlnaF2`NeH>M#Es7Ydf8u1$EG$Cp<b6ykM7A@oJtFj!$U2n
z-emH*DQizJM4^DwUJ(S3i|y7SUc940rZB=^TXi<dkc2j+fVW@AyttyDg&_=bCj+=~
zV?J7JZhgp`Il%MnHiu#*L1}2XQzk>IN}Y9TQbFe{DkPqy9A~zeTeEQ%%TgbZ<BhQ$
zg*@}TigkV)%H>angp94#y5K<OBOLislANe*Q&6;pMw^58`dh92*XetYz8{(9D0J#x
zOq&Z0$8h?H05G+|9;A-f4i(XP&0DO-fF;%?%a;<9N1{bao}XK-R3A)AJthiLIh8I<
z$I^r(bWe@UdJRZ#XSSLBjM+OoY3imc_0}koX6{R+i1Vq{OXl%-RxdUr)8?|{6&g!5
zHyWoH&$R4!BhnBS+LCn@TVshjhQMz&({4<9R4TQ_WZm|z;LWF0*b}MLdqO2yDwj=R
zwI{=$a!-KN^{Ma{)NgcY4dF#Pn629EDzj`?=?=R6F0}@oa8e$4IMeRYZVG&A%mqH%
zfGH9^!fQOiKrAf;9=dgEccU=8vHe`=bRXKW8nzt(1#EUK7?HJ(BXZ|-RqvQ(l(nK<
z!z+>_R}zQ34JsCZ7b+uSLdX~+If>Aup&rV3DaE(3lVCT(byD@=`lAbmeZ`)s4$ijN
zrc0^pU2?vh_>H}6#9F59sd>b;`f4bXPaZLJQQJ;+8Xh6|THlTq?loHb>$eq4O{tRP
zLZV#g4Oe#h@9-A!OP0OqP79~j3YlZZ5zCFtZMC6KMQD&UK04AHj_dCghZzi@PHZ58
z0u+|ooY!nTl&vXP2P#1r9LX8MuFHCZblcU7Zt=G0H?5&?MpP@R&$_8p>ixHI)0k~x
zE>vjsRveD)Mmq)K#DIjzLKe1~eUebL$+F%is;AQ(NA}28-)P!J9RXLdy}IdO)*e+T
z0640+kHeggJQ7qz7wDY9_Y%UOM(wxvu-#OWPuo))ZXL^#Z4Dk5J)<0C@Y^PpYwfn=
zNxkfpI+ohnJ=jB+-H4`;(i!k62B|GI3pGMIIZ(Px_+h?cpxTb4ZL*%$?WeCnp?@iD
zwZHgEu2s~;NcW9)pH{uNcDN=u^T<OK&CR1hT)SuVZ1aXHaV2;vc`0(BP*ioN+)4Wr
zw(|Fu_1VH5+^wRzr7gL%?XbJ1*6SN{Rhsh4jWucAsrQQ2gCTD^JQ(v6RfO756XV85
z!>tF}zBzcI_Id7gYlki>HuluseYQf^Ox)d-zJ;4}zfrcOs#Gabt((S@)Yvkg@SAza
z@#`#1Va`y8n2fTQT6wCHEZz|=PfZnNT9DF2(i&Qg7aE-yB(X^1;N8JOJf>tPYUXLU
z_ko@itdM3IIADTF3r!8INL6wK(6B%5+{OS5!CKqRYi~Ce-nngRP0MLq)ElbNtheLQ
zE_+(DPq{6++b^IjH%_lm=06$Nf)o_vNOZi;KzXzijc2b{%!ZVOFPM~kDq4q8$^cI)
zjyZtopY}i}IXa3j5F1B$a9?86J)~aC4bQIGd@}AGyJl`i<?!=&y((3kO`_iQNDwJ?
z7HpfT=UTXJ2kS1PmpYj9%dgO7g7pTgI*?hB5=5H=f7bV#Vs>+Q=UZ)Ba`$6w?5)C)
zY_U^KS}nZ&+e3?2dXo;M^S&(jEx9FPJC9}Z!kZEgya!2-*2E*HimC~@)YCI1nRH7W
zfGIIc9nF|us+Lo++Ut8OhI7@=+DN^P>8h#KU6kF?k&cyk+$g=su>>g_00_Cp*KL&+
zCEIXIr%9z;6~A`3ZW_ZBYgOb#u2iK`Y0k=GELU8j)G(zjw5h<Dj;NsoBqZfyKse&x
zP21YbO7pO|Z-ZpixPxlaYP`0t?Z&WZ>}+)!ziaL-=R==zQ|>CfHQYPPF3H+`&Z*lr
zl4GW1q}Y<`662u)odT!K4n94qd&k3u_3sxAyJ=>^wxv_{?yG53w^23ps`ZIi+-ohj
z>2<p{DW*w<K#xrN*@uFhL(}Cw6s0mCprq@Tn}5gU0@|kB5igCKxbMl;8z*XMw0hKi
z<@$!I*5hqX$8YAyM82;1m2I`GyLnP-5IBLjDw8Q;+I;0tx8Nk#)f~%iM$SdUkX1zm
zMq-+2%NJBq36WR=yvr*c7T-W?o7sX3hSTFe63$ywS(ao|nR5jK38rLlDP>JdGQ+Hm
zQ!AEJCoe*kx;(d1jc(!aC&b;GQNQQjjak(<?O6Bq&41mi-mSH{J>u}TuU73_y3?Oo
zV(f9s_Vr7?YSEZ(+GIU&R3y|KTM!o9X{w8VpX~D9x=kAIrdQ~2>DSe_b6RS4yf+(a
zT-lmEfb9c`$9D>`a^Fqei%T_nHQ&QE{Yh{~@nW?$$gES{adY3JGdbpy#|5{$w#O8U
zymsl!VxLsHw{wYGA~YNBRI0o^?A%@;EX%8GDD6vYZeNX9piq%tx=mq;%~Kh!)1tg%
zR4A1+K#wk+OWIRqO}c3lqU<gCY}!;S{>I!oZ6ed+4x0k)6RpeFjZMe8t=ac|V`8ch
zs<wS@=;Kc8r@I181=Oa~wcDXoS6G)(nOhbrtvc8OLT&S~`S;_WysX8UwHMryNhF@V
zw>R#0zf*=!g<cvqqjxA5^$&8~zmDS7IE&%qg}tS$?X~$~n;zZ2ck+Y8V5eP|tS9XH
z$~QjHX7So<HGqmGeu9-#Yc&bXROS&8y*Jdp1Nf4x)1cI;*1feMx{lk^_cknF;||1X
zqPl%zwX(E2Ev9MDTnTt?WZ4`>Y-_P?zE7>)V{<9XOkQCn5%O(`;`Y<oX#1m4e`P+q
zx~seEw7f=a((UW{7F~(7+nKXe-SvrOH(j$AW7Otu4Vw;r^hcQ<n-;fjI)^NXtiL)`
zX-~43+E=w&^fYa^F>D&7tG{k73m%yQwR3J$mD^#f#>Cw&3AYXve&4ZT*-)6bZHW=M
zC$`v?N%yI9UY&l_Ca%1yZ9b7gh-48JT}R9>)8pLRb8o}pYyoQv{QU2RYCp5bbA_9I
z*Q>jSvv%#pYHpUvZOsbbnYs2f`W5*PdaOOyy{Q*ft$WgLSK?Knq207aG9wV0ne~N6
zWmYGT5@o+KE3G|)!Cw0Aj`40b$XSrAY4?`bUO&bC(KdeOSeE^q_2%{Nox7!5cFpH-
zSEAFe8r4eb53@;&OMYC6voNGfr?)06E;^m8YuZO@ySU9=mj=piCB<&huN{WItoA4I
z4F&znpj|vZZHE$e)r)XR+zO7!Nu^Y(v3Ea+2p2p?+O*-)*^jpIC~~QF15le*3<nAP
zS=f9u-}e>AT-nQ?b8Sbr8)|o6$hX?v*j8Q5Zr)oZxQ6-L_byw+ZCzG1<3}-NRH4=5
zvqhvkJ=qORizb?uRT1@V71UnB=KXqh?fgG>Gv(Xo`C-buJ)4`ycJFn$x0@|*+c2q@
z{iU_{9gxNU0J>I1nz^yBr#8QC=`|^pE84vYxNO(=zWJL)pfc*x{XzOQO~|Y&pGuc4
zrsIYl9d>_s_PW0=^gEQs<y~8%#?fs>V%EDYdR38a+><t&aBtd0LjM4?s{4IVoq1Aa
z+?KTxn((LBXf9KtRV36C^^>eO1?`@;y{dL^@vpc0vASF`)h~+Gg+tgIaZ0tfx(?q|
zu6i#Ecdp9cI~@+<s=u=Jl+1FT=G)#hS<*e!N}X-p^h#uR>Cf7X&#P&#4?I@eI}^7T
zCAl|iD%YL%#q^EJ+MB(-#D{L$_EqTK+upl%8l!kvj&0>eM&U(>i@;SOM~_~hAvFpl
zbj>vgD}Eb?0xe2!<!j#H`>osK>-_PbFJtrn0E}(r(ZD^6L;f}mH-;WK?w{iKhP|cT
zn^;os8ajWCI)>mKxc(7tg|+VdB}(Mk$|vx?rSB1A{baw;G2`74xm@veE{C$aBT*b5
z)gQOFx~m_0tewnV@n+iBotHZ4ymvOtxNlop&Y<m`US`@gA8zP31<6UZVLs(j71aF^
zs+`J*HID_Vdg<=}02Q_s`$^p<Z9SvAtt#g8ZO+Wu*S$jG-MTgFN@lyX4_L}-;k78#
z&7h$@N2Je<W^yW<GJQ?x%c*#Rrutd%op0@}{IOF;*^5JR_Ib^~vbMs<-RmZ^PKA6k
zYuBra-3q<UU8h|(t#VzJRgYy|6e_KD3-FzjPOe6I+D2cC;l5jKLQ>}6JCAp!G6=W>
z=YNN$F-|IWqKmPdMDF&`P(OrCQ?~Z<s9Q>=UGG7eb=!3)DP&fx+m@+IroxF{uTd*1
zpGcQeg$f)hoQflr2vH)%lG6>XSh#`RlfGNQdhUWK3bmqKlIg6{ZRcw*T$3pD3wDP~
ywe8q7OO8Y+s<>-Np;2kx{X9g5iIWTRT7?a_Q5B`E6*oFY-MVzaw5i|MAOG2PSm-YR

diff --git a/source/blender/src/splash.jpg.c b/source/blender/src/splash.jpg.c
index c1ca8b575e6..440f4f763e6 100644
--- a/source/blender/src/splash.jpg.c
+++ b/source/blender/src/splash.jpg.c
@@ -1,2483 +1,2281 @@
 /* DataToC output of file <splash_jpg> */
 
-int datatoc_splash_jpg_size= 79258;
+int datatoc_splash_jpg_size= 72804;
 char datatoc_splash_jpg[]= {
-255,216,255,224,  0, 16, 74, 70, 73, 70,  0,  1,  1,  1,  0, 72,  0, 72,  0,  0,255,225,  0, 22, 69,120,
-105,102,  0,  0, 77, 77,  0, 42,  0,  0,  0,  8,  0,  0,  0,  0,  0,  0,255,219,  0, 67,  0,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  2,  2,  1,  1,  2,
-  1,  1,  1,  2,  2,  2,  2,  2,  2,  2,  2,  2,  1,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,255,219,  0, 67,  1,  1,  1,  1,  1,
-  1,  1,  1,  1,  1,  1,  2,  1,  1,  1,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,255,192,  0, 17,
-  8,  1, 15,  1,245,  3,  1, 34,  0,  2, 17,  1,  3, 17,  1,255,196,  0, 31,  0,  0,  1,  3,  5,  1,  1,  1,  0,  0,  0,  0,  0,
-  0,  0,  0,  0,  4,  0,  7, 10,  3,  5,  6,  8,  9,  2,  1, 11,255,196,  0,103, 16,  0,  1,  3,  3,  2,  4,  3,  4,  6,  4,  7,
- 11,  5,  9, 13,  9,  1,  2,  3,  4,  5,  6, 17,  0,  7,  8, 18, 33, 49, 19, 65, 81,  9, 20, 34, 97, 10, 21,113,129,145,240, 35,
- 50,161,193, 22, 23, 24, 66,177,209,225, 25, 26, 36, 40, 51, 56, 73, 82, 98,232,241, 72,104,105,136,168, 41, 52, 57, 67, 84, 88,
-120,150,178, 37, 38, 68, 83, 87,115,130,135,147,152,181,200,210, 54, 89, 99,114,146,184,213,214,215,255,196,  0, 29,  1,  0,  0,
-  6,  3,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  2,  3,  5,  6,  7,  1,  4,  8,  9,255,196,  0, 80, 17,  0,  2,  1,
-  2,  4,  4,  3,  4,  6,  7,  5,  7,  0,  7,  9,  0,  1,  2,  3,  4, 17,  0,  5, 18, 33,  6, 19, 49, 65,  7, 34, 81, 20, 97,113,
-240,  8, 35, 50,129,161,209, 21, 66, 82,145,177,193,210, 36, 51, 98,162,225,  9, 67, 83, 84,114,130,241, 52, 56, 68, 85,116,148,
-211, 22, 23, 24,115,131,146,147,180,181,255,218,  0, 12,  3,  1,  0,  2, 17,  3, 17,  0, 63,  0,159,198,150,150,150,134,  6, 22,
-150,150,190,100,122,143,199, 67,  3, 31,116,203,220, 60, 68,108,181,171,123, 70,219,170,254,224,209, 41,183,140,167, 25,101, 20,
-135,189,241, 73,101,249, 28,165,136,243,170, 77, 69, 84, 74,116,149,133,163,149,185, 15,180,226,185,211,132,158, 97,151,159, 35,
-212,126, 35, 92,108,227, 63,131, 43,145, 85,251,143,120, 54,213, 18,235,236, 86, 37,191, 87,185,237,148,243, 72,170, 67,146,224,
- 11,147, 81,162,128, 57,167, 69, 42,  5, 75,143,213,230,242, 75, 94, 34, 50,148, 86,158, 42,113, 39, 27,112,159, 14, 38,119,193,
- 60, 55, 23, 19,212, 81,204,173, 89,  4,134, 67, 34,209,128,198, 87,130, 56,138,188,146,  2,  0,242,151, 49,169, 50,114,101,  1,
-128,179,188, 40,225,158,  7,226,222, 37,108,143,142, 56,150,110, 23,166,172,133,150,142,120,196, 98, 54,173, 44,162, 36,158, 73,
- 85,146, 56,200, 44,124,193,  4,140,  4,124,232,139, 41, 61,145,109,196, 58,132,173,181, 37,104, 80,200, 82, 72, 32,131,243, 26,
-247,174, 11,240,211,199, 61,219,180,206, 66,179, 55, 36, 79,186,108,118, 29, 68, 54,166, 58, 92,122,228,181,217, 65, 13, 22,219,
- 47, 30,106,157, 61,174, 95,242, 14, 16,243, 97, 37, 45, 44,128,150,181,219,219, 46,247,181,247,  6,129,  2,231,180, 43, 48,171,
-148,106,139, 65,216,211, 33, 58, 29, 65,232, 57,219,113, 63,172,203,233, 86, 66,219, 88, 74,208,160, 66,146, 14,147,240,211,197,
-174, 19,241, 67, 46, 53, 25, 37, 79,179,102,180,202, 13, 86, 95, 49,  2,166,156,244, 38,219,  9, 97,213,178,207, 29,212,220,  7,
- 17,201,120,194,158, 38,248, 69,197,190, 22,102, 66,159, 60,166,246,156,166,165,136,165,204, 33,  4,210,212,142,160, 95,115, 12,
-218,119,104, 36,179, 11, 18,134, 72,237, 33,202,244,180,180,181,103,226,173,194,210,210,210,208,192,194,210,210,210,208,192,194,
-210,210,210,208,192,194,210,210,210,208,192,194,210,210,210,208,192,194,210,210,210,208,192,194,210,210,210,208,192,194,210,210,
-215, 13,125,163,254,220, 13,158,224,130,240,159,178,214,  5,156,238,249,111,173, 45,150, 21,116, 81,219,173,155,110,200,219,199,
- 39,194, 98,116,  8,215, 53,192,138,116,167,170,213,245, 68,151, 17,255,  0,171, 32,177,132, 50,233, 76,186,132, 39,249, 26, 91,
-214, 67,195,217,207, 19,102,  9,149,228,116, 47, 95, 90,224,177, 85, 42,161, 80, 16, 11,200,238, 85, 35, 64, 72,  5,157,128,185,
- 10, 46,204,  1, 98,226, 46, 38,200,248, 79, 45,124,219,136, 51, 20,203,104, 81,130,  6, 96,204,206,237,114,169, 28,104, 26, 73,
- 28,128, 78,148, 86, 58, 85,152,128,170,196,119, 43, 75, 80,124, 63, 73,159,141,131, 84, 83,195,103, 56, 94, 20, 82,242,212,138,
-127,240,103,117, 13, 77, 44, 20,171,195,105, 85,127,227,115,194, 91,193,101, 37, 75, 16,146, 20,  1,  1,180,147,204, 58,247,192,
- 39,183,219,102,184,168,189,173,253,156,222,171, 32,236, 38,233,221, 18,227,210,109, 58,154,110,  6,238, 13,182,188,107,111,132,
-162, 53, 29,138,204,184,113, 36,218,181,233,114, 84, 26,131, 10, 91, 82, 88,144,233, 68,118,234,107,152,244,120,206,205,115,175,
-  7,248,243, 35,161,151, 49,169,202, 86,166,150,157, 75,200,105,230,142,102,141, 64,185,102,140, 17, 33, 10, 55, 98,138,225, 64,
- 44,108,160,156, 64,178, 47, 27,188, 58,226, 12,194, 28,174,151, 57,106, 90,186,150,  9, 16,169,134, 72, 82, 71, 38,202,171, 35,
-  3, 26,179, 27,  5, 18, 50, 22, 36, 42,130,196, 12, 72, 35, 75, 94, 80,180,173, 41, 90,  8, 82, 84,  1, 73, 29, 65,  7,204, 29,
-122,213, 97,139,107, 11, 75, 75, 94, 29,117,182, 91,113,231,156, 67, 76,180,133, 56,235,174, 41, 40,109,182,208,146,165,184,226,
-212, 64, 66,  2, 65, 36,147,128,  6, 78,134,  6, 61,233,107,140, 28, 63,123, 94,236,238, 39,253,160,119,151,  9,219, 61,108,210,
- 43,219, 63,103, 88,247, 29, 77,157,231, 77, 86, 91,178,239, 43,178,215,171, 80,169,213, 69,219, 84,214,227,166, 57,178,252,106,
-195,236,197,150, 92,117, 83,126,173,247,214, 23,238,178, 89,  3,231,181,219,218,129,127,123, 56, 15, 15,137,177,182,194,209,220,
-115,188,169,221, 85, 85, 13,213, 86,172,210,254,165,254, 47, 78,219,136, 94,225,245, 74, 79,188,123,199,240,222, 95,139,226,126,
-167,184,183,201,250,202,212,182, 30,  7,226,105,179,220,183,134,191, 71,242,179,156,218,  1, 81, 12, 50, 72,136,121, 70, 41, 38,
-  5,203, 48, 17,183, 46, 39, 37, 28,171,130, 52,149, 12,109,136, 92,222, 32,240,164, 60, 61,154,241, 87,233, 46,118, 69,147, 78,
-105,167,158, 56,228,145,121,162,104,160, 34, 48,170, 90, 84,230,202,138, 36,140, 50, 48, 58,149,138,139,227,180, 26, 90,134, 23,
-247,207,155,251,255,  0,155, 30,209,127,235, 93,227,255,  0,232,210,254,249,243,127,127,243, 99,218, 47,253,107,188,127,253, 26,
-152,127,247, 29,226, 55,254,233,139,255,  0,155,166,255,  0,234, 98, 19,255,  0,226, 11,194,239,253,245, 55,255,  0, 37, 87,255,
-  0,210,196,207,116,181,166,252,  3,241, 57, 89,226,255,  0,133,157,171,223,235,138,219,165,218, 85,203,250,153, 89,157, 81,183,
-232,178,101,204,165,211,157,166, 93, 53,202,  3,109,195,147, 56,120,175, 33,108, 82,154,113, 69,125, 66,221, 80, 29,  0,214,228,
-106,172,174,163,168,203,171,107, 50,250,180, 17,213, 80, 75, 36, 50,168, 33,128,146, 39, 40,224, 48, 36, 16, 25, 72,184, 36, 30,
-160,219, 22,246, 95, 93, 77,154, 80, 80,230, 84,110,100,163,204, 97,138,120,152,130,165,163,153, 22, 68, 37, 88,  6, 82, 85,129,
- 32,128, 71, 66, 47,133,165,165,165,173, 92,110, 97,105,105,105,104, 96, 97,105,105,105,104, 96, 97,105,105,105,104, 96, 97,105,
-105,105,104, 96, 97,105,105,105,104, 96, 97,105,105,105,104, 96, 97,105,105,105,104, 96, 97,105,105,105,104, 96, 97,105,105,107,
-  3,168,110, 45,  6, 60,249,116,122, 75, 21,123,182,183,  5,239,118,155, 75,181, 41,174, 85, 12,  9, 92,174,168,197,170, 85,150,
-166,169,212,105, 67,194, 32,183, 54,108,117,130,164,229, 32, 40, 29, 12, 12,103,154, 90,104,166,239, 21, 38,143, 91,167,219,119,
- 13,169,123,209, 43,245,152, 83, 39,208,233,  9,165, 83, 46,121,213,134, 41,225,159,126, 83, 12, 88,181,170,177,130,134,188, 97,
-151, 38,251,171, 42,228, 95, 35,139,228, 86, 47,143, 95, 53, 54,130,157,111,109,119,  6, 76, 70,208, 28,118, 91, 44, 90, 40, 45,
-183,221,106, 77, 58, 85,222,220,217, 43, 74,114, 75,108,197,113,213, 99,149,182,214,178, 18, 70,  6, 28, 29, 45, 88,232, 23, 37,
- 18,231,136,236,202, 36,244, 76,110, 60,135, 33,205, 97, 77,191, 18,125, 54,115, 56, 47, 83,234,212,201,141, 55, 38,149, 80, 64,
- 82, 10,216,146,211, 78,164, 45, 36,160,  5,  2,111,154, 24, 24, 90, 90, 90, 90, 24, 24, 90, 90, 90, 90, 24, 24, 99,120,143,168,
-110,117, 51,103,174,233, 91, 65, 29,201, 23,200,138,203,116,255,  0,119,109,167,170, 12, 69,114, 67,104,169, 72,165, 50,240, 40,
-118,166,136, 69,226,200, 32,144,175,137,  0,184, 17,174, 20, 60,223, 25, 18, 95,121,199,215,190,238, 72, 83,138, 83,202, 92,139,
-187,156,186,165, 18,178,175,210,126,183, 54,117, 36,133, 36, 40, 16,160,  8, 61,  8, 35, 32,253,218,208,158, 40, 56,198,176, 54,
- 85,185,246,165,163, 22,151,119,238,105, 66,153, 92, 54,212,151,168,214,187,171, 78, 67,245,249, 12, 43,244,179, 83,148,148,194,
-109, 65,206,185,121,108,167,148, 47,157, 60,116,224,190, 27,204, 99,139,140, 56,175,196,124,203,131,114,188,170, 14, 66,193, 75,
- 56, 17, 77, 38,167,144,114, 96,182,185, 42,165,190,146, 16, 51, 50, 70,132,233, 84,102,199, 72,120, 15,198,220, 77,151, 75, 55,
-  7,112,151,134,185,103, 26,102,153,172,252,246,158,170,  2,101,134, 61, 49,198,121,211,223, 68,116,145, 17,172, 23,210,170,242,
- 53,139, 51,170,227,143,215, 53,223,196,133,153,238,191,194,219,167,117,237,195, 59,196,247, 52,214,107,151, 20,  5,201, 13, 99,
-196, 83, 45,200,148,149, 45, 41, 42,  0,144, 49,147,140,231, 88,195, 91,199,188,114, 93,109,134, 55, 39,112,100, 60,226,194, 90,
-101,171,158,186,235,142, 44,159,133, 40,109, 50,201, 90,179,216,  0, 78,177,155,198,244,186,247, 18,225,151,114, 93,181,137,181,
-218,221, 69,209,207, 34, 82,202,131,105, 39, 13, 68,134,194,112,136,145, 17,156, 33,166,210,148, 36,118, 25, 36,157,221,188, 47,
- 45,145,246,104,112,186,239, 19, 59,221, 70, 93,217,123,214,159,133, 73,179,173,  8,106,140,213,106,227,187, 42,177, 94,153, 78,
-181,233, 18, 37,182,177, 72,167,177, 22, 51,207,212,167,150,214, 25,110, 59,132, 37,229,170, 52,119,121,  7,194,159, 15,120,203,
-198,222, 60,159,134,248, 23,136, 51,106,108,146, 23, 75,212, 85,212,201, 45, 66,164,141,162, 37, 49,195, 36, 81, 52,243,178,187,
- 44, 97,214, 56,145, 92,188,204,177,150,110,196,241,107,196,110, 10,240, 51,128, 32,226,126, 62,225,252,162,167, 58,153, 28,251,
- 61, 37, 52,112,211, 51, 70,161,230, 97, 36,209,203, 42,211,192,172,138,210, 20,105, 37,118,141, 82, 21,105,  2,174,163, 72,218,
-189,222,170,162, 69,126, 85,135,123,206, 76,183, 23, 46, 77, 77,218, 13, 81,227, 33,199,137, 91,146, 29,120,199, 37,106, 82,148,
- 73, 81,238, 73, 58,203,118, 91,127, 55, 47,135,155,149,114,173,233, 18, 19,  1,201,  8, 23,  5,159, 86, 18, 27,166,212,210,217,
-229, 80,122, 50,192, 84, 10,130, 81,144,135,219,  1,196,246, 80, 91,101, 77,171,150, 85, 47,164,143,198, 35,151, 97,170, 81,118,
-183, 97,169, 54,130, 37,133,179,102, 61,111, 92, 53, 14,120, 40, 95,195, 22, 93,192,171,133,185, 46, 62,166,176, 22,235, 65,161,
-204, 74,144,218,  6, 18, 59,121,195,151, 16, 59, 31,237,121,225,250,232,188,108,251, 74, 62,216,241, 35,181,232,138,205,221,106,
- 37,246,165,173,185,210, 97,201,126,152,244, 42,139,108,182,186,213,159, 85, 16,103, 34, 50,222,109, 50, 33,200,136,182, 92,  7,
-194, 14,201,234,207, 16,126,128,222, 38,248, 71,147,143, 16,120, 59,138,106, 38,207, 50,127,174,217,162, 46,210, 29,204,124,216,
-156,104,105,141,227,  9, 42, 77, 79, 51,176,134, 89, 64,146,237,200,222, 28,127,180, 43,194,191, 25, 51,195,225,207, 24,112,181,
- 60, 89, 30,113,245, 32, 50,202, 17, 98, 29, 36, 17, 76,191, 88,176,139, 72,205, 19,193, 81, 10, 35, 77, 20, 76, 99, 32,118, 27,
- 96,248,137,177,183,250,218, 21,123,106, 66,161,213,225, 37,166,235,214,228,213,160, 84,232,242,156, 78, 64,113, 41, 56,147, 13,
-101, 43,240,159, 71,192,224, 65,  7,149,105, 90, 19,106,226, 39,139,222, 29,184, 78,110,198,145,196, 38,229, 82,246,206,  6,226,
-214, 42, 20, 27, 86,171, 91,137, 84, 93, 38, 85, 78,151, 17,153,211, 89,157, 82,131,  5,214,105, 13,162, 43,237,171,196,148,182,
- 91, 86, 72, 74,138,129, 26,224,102,199,110,133,115, 99,247, 86,135,116,199, 84,134, 26,129, 81,250,170,231,166,  5,148,  9,180,
-119, 95, 17,234,144,223,108, 28, 41,230,185, 75,173,103, 33, 47,197, 65,236,  8, 56,167,210,118,170,198,173,240,251,194, 53, 82,
- 35,168,126, 52,237,202,189, 36,178,235,106, 10,109,214,222,179,169,238, 54,226, 20, 58, 41, 37, 10,  4, 31, 67,171, 87,232,151,
-199,112,248,245, 61, 22, 67,196,119,203,243,234,  9,141, 61,127,179,133, 66,234,105,230,150, 10,168,209,213,213, 57,175, 11,164,
-177,216,133,120,223, 78,133,116, 11, 85,125, 48,120, 26,127,163,229, 30, 99,196, 92, 52, 23, 49,200,107, 97, 90,156,188, 84,150,
-112,140, 42, 96,138,162,146, 87, 70, 70,147,148,147, 35,197, 32, 96, 89, 36,143, 86,182, 71, 38, 80,214, 61,247,102,238,101,169,
- 68,190,118,250,231,162, 94, 86,117,203,  5,186,157,  2,229,183,106, 17,170,180, 90,196,  7, 74,146,220,186,125, 66, 35,138,110,
- 83,  5, 72, 80,230, 66,136,202, 72,238,  8,214, 89,168, 64,112,175,237,189,221,253,134,225,159,102,120,123,225,163,133,105,251,
-189, 82,218,155, 26, 53, 58,249,186, 43,172, 93, 53, 88,104,168, 59, 62,163, 61,244, 83, 40, 54, 52,101, 57, 18,156,216,146,  0,
-149, 42, 82, 84,242,185,200,142,216, 71, 50,250, 53,193,103,210, 48,176, 55,151,114, 45,253,161,226,123,106,154,216,235,138,230,
-171,179,111,210,175,154, 45,102, 69, 70,198, 98,189, 45,246,226, 66,166, 92,208, 43, 49,218,153,107, 54,228,197,120, 94,244,183,
-101, 50,219,175, 32, 72, 17,218, 11,121, 61, 57,156,120, 63,198,153,119,233, 74,154,108,168,214, 80, 80, 73, 45,180,205,  3,212,
-154,116,102,229,204,244,233, 33,144,107,140,  7,210, 20,181,143,217, 29,185,103, 35,241,187,128,243, 63,209, 20,149, 89,184,162,
-204,179, 40,225,  7, 84, 53,  9, 74, 42, 93, 19,153,  2, 84,188, 98, 35,203,145,140,122,139,232,184,251,102,226,253,250,171,113,
- 37,195,245,  6,251,107,107,171, 91,211,182, 52,173,200,122,165, 79,163, 51, 98,207,189,104, 17,110,183,106,213,101, 50,154, 93,
- 53, 20, 39,167,  9, 42,157, 33, 82, 99,134, 90, 13,243,184, 95, 72, 64, 60,195, 47, 80, 32,128, 65,  4, 17,144, 71, 98, 53,  2,
-158, 50, 84,211,191, 72, 26,128,243,  1, 10, 14,113, 65,195,147,232, 82, 80,159,137,193, 34,193, 91, 78,246,248,156,  5, 45,144,
-174,224,164, 16,122, 13,118, 87,143, 15,111, 68, 62, 31,247, 89,238, 25,120, 83,218,134, 55,231,120,232,117, 24,214,189,203, 90,
-170, 59, 86,145,107, 83,239, 39, 22, 24,122,204,183,168, 86,222, 39,222, 53,230, 36, 56,219, 82, 84,212,136,236,177, 41, 11,138,
-145, 33,196, 56, 91, 91, 48,240,167, 51,118,225, 88,120,116,201,154,212,103,249,106,102, 51,243, 57,112,197, 76,172, 19, 86,169,
- 89,130,  8,193,123,  6, 98, 25,182,  0, 19,182, 17,203, 60, 97,202,145, 56,190,163,137,196,121, 61, 47, 14,230,178,101,148,252,
-190,100,210,213,186,151,211,162, 37, 82,237, 35,  4,185, 84,  5, 84, 92,179,  1,190, 36,133,165,168,139,220,190,218,255,  0,106,
-111, 13,237, 80,239,190, 41,184, 29,183,169, 27, 89, 90,168, 69,138,228,225, 66,187,237, 23, 16,167,193,117, 20,246, 46, 35, 90,
-169, 70,163, 85,156,101, 14,120, 77, 84, 34,149,172,182,172, 54, 74, 84,  7, 85, 46,223,109,143, 13, 22,231,  5,182, 47, 26,148,
-171,102,247,187,237, 43,183,112,233,251, 83, 88,178, 40,166,138,205,225,100, 95, 50, 40, 85,218,228,250, 85,194,221, 66,123,108,
-120, 76, 51, 65,115,145,214,150,161, 37,154,132, 89, 13, 39,195,116,242,177,215,248,105,197,180, 35, 47,120,168,226,205,105,243,
- 57,189,158, 25,168,170, 33,169,137,167,177, 60,146,241,185,  8,246,  6,193,244,130, 65,  0,146,  8,196,131, 46,241, 91,131, 43,
-206,100,147, 87, 77,147,212,229, 48,251, 76,240,215,211, 79, 73, 50,211,220, 14,112,142, 68,  5,227,187, 45,202,106, 32, 16, 72,
-  0,223, 29,148,210,212, 92,183, 35,233, 31,162,243,160,209,233,124, 25,112,161,184,187,163,185, 51, 34, 63, 58,227,131,120, 83,
-170,147,233,118,147, 44,202,113,150,152,250,163,111,196,153,119, 10,221,142, 27,116,188,153, 48,153, 96,159, 12,248,202, 37, 72,
-198,248, 54,250, 69,151,109,251,190,214,214,200,241,107,178, 86,230,220,166,238,185, 96,217,113, 46,235, 45, 87, 21, 53,219, 86,
-231,169,204, 77, 62,159, 26,239,181,110,153, 50, 30, 76, 37,212, 94,142,195,174,178,251, 78, 69, 46,135, 23, 29,196,133, 99,108,
-248, 71,199,171, 65, 85, 94,249, 46,143, 99, 86,119,128,205,  7,180,136,210,247,113,  0,144,200, 87, 98, 84, 91, 83,129,116, 86,
-  4, 95, 68,120,211,225,211,102, 52,121,116,121,233,147,219,157, 99,142,160, 83,212,123, 33,145,237,166, 51, 80, 99, 17,134,243,
-  0,198,250, 99, 38,210, 50,144,109, 43, 29,120,113,198,217,109,199,157, 90, 91,105,164, 45,199, 28, 89,  9, 67,109,161, 37, 75,
- 90,212,122, 37, 33, 32,146,124,128,215, 14,253,164,222,219,221,157,224, 86,233, 59, 61,101,218, 15,111, 86,249, 34,155, 14,165,
- 92,161, 49, 88, 69, 18,210,176, 89,169,199,110,101, 41,155,170,176,220,103,222,151, 90,126, 19,172,190,154,124, 86,130,209, 30,
- 75, 79, 63, 37,143, 17,182,220,230, 77,175,244,142, 56,132,142,220,122,222,253,112, 91,245, 86,205, 92,140,191, 79, 85,221,100,
- 38,245,165, 74,102, 61, 69,151, 99,183, 46,153, 83,187,226,187, 77,174,184,128,224, 80,100, 59, 27,198, 13,148,165,214,201,230,
-  8,229, 94, 22,113,190,113,150, 83,230,244,153, 69,168,170,198,168,121,147, 65, 20,147,169, 23,  6, 24,228,145, 93,245, 13,211,
- 97,172, 88,173,193,  4,175,156,120,191,192, 25, 38,109, 81,146,214,231,119,174,163, 58,103,229, 65, 81, 52, 84,237,123, 17, 52,
-177, 70,232,133, 78,207,185,229,155,135,210, 65,  2, 71,219, 95,199,191,  8,187,217,187,147,118, 59,104, 55,194,208,220,189,198,
-166,208,234, 87, 13, 70,153,102, 59, 46,189, 76,133, 76,164,205,137, 79,158,183,238, 88, 81, 85, 78, 18, 91,151, 54, 58, 11, 41,
-148,167, 73, 89, 33,  4, 37, 68,109,254,160, 19,244,127,110,123,126,214,227,115,113,175, 26,237, 82, 45, 14,212,183,182, 43,113,
- 46, 74,213,102,160,164,196,131, 73,183,233, 85,139,126,167, 62,165, 57,121, 34, 52, 86, 32, 48,235,174, 30,161,  9,104,247,198,
-186,103,185, 63, 72, 83,125,183,147,120, 38,237, 23,179,215,133,198,183, 45,182,164, 77, 98,145,112,222, 16,174, 10,229,197,113,
-192,167, 58, 82,245,199, 30,212,183,230, 68,102,215,162, 45,  1, 42, 11,168, 75,116,161,181,165, 79,248, 14, 57,225, 53, 36,226,
- 95,  8,115, 26, 94, 38,172,201,120,104, 61, 93,  6, 89, 75,  4,245, 53,117,114,195,  4, 81, 25, 67,146,100,145,185,104,163,202,
- 74,160,212,224,  2, 73, 32, 18, 34,220, 41,227, 94, 89, 89,194,148, 57,247, 21,178, 81,102, 57,181,101, 69, 61, 45, 29, 20, 83,
-212, 77, 48,132,160,  2, 56,151,153, 35,155,184, 12,231, 66, 18, 85, 64,  4,128,101,135,165,168,156,219,158,223, 30, 44,184,114,
-221, 75,123,111,253,161,252, 36, 55,183,244, 42,247,131, 37,117,235, 78,155, 93,160, 92, 80,232,239,201, 68,119,171,244,186,109,
-102,169, 54,159,121,211,227, 40, 44, 58,212, 57,113,220,230, 73, 71,139,226,  0,218,186, 89,198, 87,182,211,135, 30, 14,235, 27,
- 75,  6,163,102,223, 59,171, 70,222, 93,176,167,238,197,161,117, 88, 18, 40, 31, 82,200,182,106,181, 25,180,248,  5, 70,177, 61,
-135,125,225,126,226,183, 10,124, 49,200,151, 18,149,128,224, 82, 83, 20,171,240,211,140,105,171,114,250, 40,178,177,152,182,106,
-143, 37, 52,148,179, 67, 60, 19,172, 66,242, 24,230, 71,208, 74, 13,202,146, 26,219,128, 70,248,152,209,120,173,192,245,116, 57,
-149,124,217,177,202,215, 39,120,227,171,138,178,  9,169,234, 41,218, 83,166, 46,100, 14,156,192, 28,236, 25, 67, 45,246, 36, 29,
-177,217,173,112,163,112,253,133, 28, 55, 95,188,105,212,248,162,173,202,171,215,108,187,186,163, 93,190, 47,125,152,175,202,157,
- 87,160,214,183, 90,175, 85,141, 82,118,228,122,179, 46,114,165,201,181,228, 73,126,179, 50,101, 17,245, 57, 25,115, 93,105,180,
- 56, 41,  5,116,160,202,240,191,237,190,220,158, 50,248,231,219, 77,158,218, 29,130,147,111,112,189, 93,145,119,193,184,247, 10,
-229,165,214,170, 87,151,189,209,182,206,237,185,233,142,205,168,210,100,170,143,106, 52,237,203, 71,166, 71,110, 59,134, 83,174,
-180,249, 30, 48,117,228, 33,185, 31,161, 92,200, 74,187,115, 37, 42,199,166, 64, 58, 74,170, 30, 49,240,218,181,169, 26,169,242,
- 74,252,226,140, 25, 82, 41, 81,156, 65, 43,200,129, 36, 40, 91,149, 48,104,217,133,136,150, 59,130, 25, 75, 17,133,169, 38,224,
-127, 20,232, 22,181,105, 35,207,242,236,146,184,136,164,154, 23, 84, 53, 16,164,110, 94, 33, 32, 83, 44, 44,178,170,155,131, 20,
-182, 33,149,130,131,134,126,151,176,123, 71, 74,180, 27,176,226,237,253,162,205,158,136,126,226, 45,102,173,218, 59, 86,224,136,
- 80, 27, 49, 69, 13,184, 98, 40,143,200,  0,228, 13,114,224, 99, 24,212,  4,189,180, 92, 57,109,223, 10,156,122, 93,182,174,205,
-192,141,105,218,119, 45,169,102,238,133, 50,218,161,145, 14,159,102,213,171,255,  0, 88, 69,169,211,168,140,199,193,165, 66, 53,
-106, 19,243,227,176,217, 74, 34,138,178, 89,140,150,163, 54,195, 77,254,136, 21, 90,173, 54,133, 75,169, 86,235, 51,225,210,168,
-244,120, 19, 42,149, 90,165, 66, 67, 81, 32, 83,105,180,248,238, 75,157, 62,108,183,214,148, 70,136,204, 86, 93,113,199, 22,160,
-132, 33,181, 41, 68,  0, 78,191, 57, 62, 35,175,107,151,218,161,237, 50,184, 37,109,235, 50,196, 29,229,220,202, 77,141,183,190,
- 43, 14,184,170, 30,215, 90, 80,163, 80, 97,220,243, 97, 43, 10,140,219,118,133, 14,117,126,160,198, 73,109,217, 50,144,146,162,
- 19,155, 39,192, 39,174,139, 62,226, 12,218,122,167,135, 34,160,161,145,235, 29,217,140, 69,217,213,208,184, 38,197,194, 71, 52,
-154,236, 88, 42,184,189,156,131, 86,125, 35,211, 47,155,135,120,111, 38,167,164, 73,184,135, 50,204, 35,142,133, 17, 84, 74, 17,
- 81,146, 64,132,  0, 66, 51,201,  4,122,  1, 10, 89,144,218,233,113, 61,206, 11,119, 14,189,187, 28, 40,240,239,185, 23, 75,138,
-118,228,190,118, 83,107,110,250,243,171, 32,173,202,197,203, 99,208,235, 85, 53,168,134,209,146,102,205,124,159,129, 61, 79,234,
-167,176,217,253, 55, 59, 75,100,210,182,231,110,237, 11, 38,133, 20, 65,162,218,246,245, 30,223,164, 66,  7,152, 68,165, 81,169,
-241,233,212,232,193, 88, 25, 13,196,142,210,123, 15,213,211,141,170, 34,178, 72,102,172,170,154,158, 62, 77, 60,178, 59, 34,126,
-202, 51, 18,171,255,  0,106,144, 62,236,116, 69, 12, 83,193, 69, 71,  5, 76,188,250,152, 98,141, 36,127,219,117, 64, 29,191,238,
- 96, 79,223,133,168,165,123,119,125,170,238,209, 91,175,240, 39,195,117,192,235,151, 29, 77, 14, 81,120,135,190, 40, 15,243,187,
- 74,135, 49, 41,105,123, 57,111, 76,138,162,181,214,165, 33,194, 46, 23, 26, 41, 49,152, 90, 40,225, 78, 63, 38,166,204, 61,237,
-246,205,251, 82,224,240, 79,182,174,108,238,209, 85,161,203,226,135,116, 40,142,253, 82,227, 78, 37,255,  0,226,146,206,156,167,
-161,191,184, 53, 54, 18,  8, 53,247,252, 41,108, 80, 99, 56, 82, 61,229,165,212,159, 75,177,161,  8,147,185, 93,236,136,246, 94,
-213,106,214,149,199,198,255,  0, 17,212,217,179,238, 10,173,173,115,221, 27, 61, 64,185, 22,228,217,136, 85, 70,147, 62,106,247,
- 98,229, 19,146,183,100,220, 18,214,234,221,164,120,203, 82,154,110, 66,170,174,  5,201,122, 11,177,110, 14,  3,225,236,179,135,
-178,212,241, 23,140, 33,215, 71, 11,133,202,168,154,193,235,170,175,228,151, 73,191,212,196,192,178,146,  8, 37, 76,132, 21, 68,
- 89,105, 31, 17,120,151, 54,226,108,214, 79, 12, 56, 34,126, 93,116,209,151,206, 43,214,229, 40, 41, 45,231,132, 50,145,245,242,
-169, 10,202,  8, 32, 50,196,  8,105, 29,161,210,223,163,211,255,  0,132, 11,255,  0,169, 75,243,255,  0,199,236,141,116, 43,233,
- 74,255,  0,148,224, 99,255,  0,154,226, 91,255,  0,107, 96, 53,207, 95,163,211,255,  0,132, 11,255,  0,169, 75,243,255,  0,199,
-236,141,116, 43,233, 74,255,  0,148,224, 99,255,  0,154,226, 91,255,  0,107, 96, 53,106,102,159,250,197,112,231,255,  0,  5, 39,
-255,  0,208,175,197, 59,147,255,  0,234,195,197, 95,252,124,127,255,  0,161,150,227,167,222,201,206, 30,246, 78,244,224, 27,134,
-234,253,209,181,155,125, 93,172,206,219,232,206,205,170, 85,108,219,118,161, 80,150,239,214, 85, 36,151,101, 76,151, 78, 91,146,
- 29,229, 74, 71, 50,212, 78,  0,235,174,142,127, 36,254, 28,127,249, 20,218,239,253, 65,181,127,255,  0, 21,168, 67,236,206,242,
-251,107,106, 27, 11,183,118,135, 14,118,230,248,218,123, 35, 96,219, 49,169,246,138,246,239,108,225, 81, 63,132, 20,246, 12,185,
- 95, 92,181,113, 85,232,203,170, 93,234,124,188,224,255,  0,  4,146,236, 21, 45,180,166, 60,100, 57,144,172,147,102,189,184,158,
-209,254, 22,247, 41, 54,175, 17, 19,170,123,167, 72,160, 84, 35,193,188,246,187,121,108,216, 86,109,253, 75, 99,149,165,201, 68,
- 43,134, 21,  2,  5, 86,143, 93, 49, 75,106,105, 85, 86,234, 49,190, 62,117, 68, 87,136, 87,168, 78,113,225, 63, 21,230,217,158,
-127, 91,147,241, 53,  5,117, 75, 84,212,207,236, 81, 87, 72,103, 68,121,153,145, 24,  4,229,164,150,101, 82,174,202,138,219,115,
- 58, 98,193,200,252,101,224,252,151, 41,225,202, 12,239,133, 51, 44,186,145, 41,105, 96,246,233,178,248,197, 59,201, 28, 17,171,
-186,157,124,201, 35,186,179,  6, 68,121, 25, 70,174, 95,164,237,173, 75, 62,218,177,233, 17,168, 22,157, 22,153,111,209, 33, 37,
-105,135, 73,163,193,139, 77,167, 68, 67,142,173,231, 17, 26, 20, 54,144,211,  9, 83,206, 56,178, 16,144, 10,156, 82,143, 82, 78,
-178, 93, 49, 28, 53,113, 19,183, 28, 85,108,189,139,190,123, 87, 80,118,125,159,125,210,  5, 74, 19,114,219,105,138,157, 46, 99,
- 18, 31,167,214, 40, 85,152,204,188,226, 34,214, 96, 85,226, 78,135, 45,180, 56,227,105,126, 18,252, 55, 93,108,161,197, 62,250,
-231,250,168,106, 41,170,106, 41,234,227,104,170,224,119, 73, 85,193, 14,178, 43, 21,117,112,119, 12, 24, 16,215,222,247,190, 58,
- 70,146,122, 90,170, 74,106,154, 41, 18,106, 58,136,209,225,120,200, 40,209, 58,134,141,144,141,138, 50,144, 84,141,172, 69,176,
-180,180,180,180,134, 54, 48,180,180,180,180, 48, 48,180,180,181,192,111,104,  5,251,125, 80, 56,143,220,198, 45,253,213,169, 89,
-  9,183, 54,167,110,238, 27,118, 11,123,151,122, 90, 50,220,172,139,138,158,153, 72,178, 45,251,125,102, 37,197,116, 63,  9, 82,
- 82,182, 38,  6, 89, 68,111, 26, 95,138, 30,142,216, 47, 57, 30, 78,249,221, 99, 81,164,226,  6, 84, 47,168,169,111,215, 68,181,
-129,  7,171,130, 78,246,  0,236, 78,216,215,169,168, 20,209,243, 10,234, 23,181,175,110,196,255,  0, 44,119,231, 75, 81,244,103,
-138, 29,229,219,186,190,226, 38,204,169, 55,100, 67,220,238, 34,247, 45,250,213,217,125, 65,164,205,147,104,206,165,216,118, 61,
- 94,129,106,212, 95,186,100,197,162, 91,207, 73,151, 86,156,153, 30, 59,169, 82,141, 53,244,196,109,181, 55,135,114,241,198,191,
- 22, 21,107, 15,123,247, 58, 21,239,182, 80, 41,252, 61,195,225,246, 85, 90,221,164,217,177,110, 10,125,254,238,232, 42, 29, 18,
-168, 34,221, 38,172, 62,174,129,245,162, 36,204, 82,163, 52,225, 82,101,134, 98,190,203,109, 37,110, 59,183,  5,230, 62, 70, 90,
-152, 57,114,114,192, 44,206, 14,169, 36, 72,144, 16,168,246,213, 43,132,  6,228, 91,204,218, 84,223,  8, 12,198, 29,193, 70,184,
-191, 64, 58,  0, 88,157,200,232,162,231,111,112,185,199,119, 52,181, 31,219,163,138, 13,215,187,247, 63,109,175,153, 87,125, 18,
-185,126,217, 23,151, 19, 82,104,252, 60,211, 45,201, 52,233,150, 71,240, 34,193,174,162,217,167,220,143,211,222, 93, 66,233,145,
- 84,147, 75,108,134,220, 72,230,113,130,136,203, 97, 74,115,194,187,218, 60,116,241, 71, 94,159,183, 22,253, 63,112, 54,166,175,
- 63,117,119, 39,104,237,104,115,229, 80,109,233,245, 11, 49,235,225,117,154,109,106,149, 86,182, 45, 90,232,117,138, 91, 85, 35,
- 79, 91,126,254,228,106,167, 37, 61,109,158, 66,226,214,144,220, 23,153,  8,213,214,162, 27,132,212,225,139,174,147,174, 69, 33,
- 78,131,172,  1, 25,109,118, 10,194,252,179, 32,  1,136, 25,140, 58,136, 42,221,108, 45, 99,125,129,245,219,115,107,117, 29,237,
-142,245,233,107,147,209,223,222, 43, 46,151,189,123,171, 87,168, 91,247, 45,193, 96,238,236,107, 86,163,184, 18,175, 13,204,135,
- 26,223, 51,155,219,155,122,229,185,225,109,  4,121,171,160, 11, 66,149,  6,229,173, 86, 75, 18,101,144,211, 81, 94, 47, 30, 86,
-130,245,116,153,197,253,205,104,175,125,224,212,119, 98,196,186,104,182, 78,217,238,236,253,159,220, 25, 80,109,250, 84, 61,204,
-189,109, 75,111,110,106,180, 88,240, 28,129, 37, 16, 46,122,140, 59,158,240,173,209,164, 71,165,  4,181, 37,202,  9,253, 10, 30,
- 67,199, 90, 31,253,157,169,144,255,  0,100,153, 42,109, 96,108, 24, 93,173, 25, 33,108, 27, 96, 37, 66,  3,232,144,141, 71,151,
-101, 98, 20,246,180, 31,222, 41, 75,252, 58,110,  5,250,122, 30,151,  3,109,247, 24,234,110,150,185,121,125,113, 27,190,246,141,
- 14,226,220,138, 85,122,149, 95,137, 79,221, 29,192,219, 42, 86,219,187,104, 69,247, 57, 66,135,195,181,213,186,212,122,171,149,
-122,104, 85, 74, 93, 76, 92,212, 56,173,120, 13,169,182, 94,140,242,153, 95,134,178, 36,161,188,127,125,171, 86,214,225,238, 11,
- 22,199, 16, 84,107,178,163,121, 39,108,124, 29,207, 68,141,169,183,108, 72,233,163,237,245,233, 92,170,211,106, 53,186,204, 89,
- 52,202, 39, 35,139,138,182, 99, 49,  2,101, 90, 83, 81,212,194,240,184,239, 73, 25,143,134,171, 36, 66,194,104,254,198,161,110,
- 97, 23, 14,138,202,199, 64, 11,164, 54,162,119,  6,214, 93, 86, 98,161,171, 35,  6,218, 79, 91,118,238,  9,  4, 11,239,126,158,
-238,246,218,253,134,210,215, 23,168,252, 66,238,173,122,152,237,253, 54,243, 85,110,231,171, 76,225,138,243,161,236,203, 18,102,
-193,102,123,213,219, 34,129, 34,173, 62,218,133,  2,172,137,173,218,242, 46,180,203,140,244, 86, 80,236, 39,101,213,208,220,211,
- 33,228,132,186,236, 80,248,135,221,139,146,237,218,187, 18,214,222,123,102,243,129,185, 51,246,200,220,219,133,110,217,182,220,
-151, 54,246,175,118, 89, 27,207,114,220, 59,126,196, 88,238, 61,  5,154,162,127,128,148, 71,161,179, 83, 67,181, 56, 13,161,255,
-  0,172, 27,152,151,144, 18,105,120, 98,178, 37,118, 51,199,104,151, 83,147,204,  1,108,138,237,184, 67,125, 33,173,125,181, 16,
- 66,106,107,129,133,173,141,136,  1, 79,155,167, 77,247, 32,119,239,248,119,182, 58,147,171, 69,118,187, 74,182,233,114,107, 21,
-153,105,135,  2, 47,132,149,185,225,188,251,206,189, 33,212, 71,139, 18, 28, 72,205,173,217,211,223,148,235, 45, 49, 29,148, 45,
-231,222,121, 13, 52,133,184,180,164,182, 60, 63, 94, 23, 13,249,180,118,173,203,117,202,141, 58,225,125,219,146,149, 84,168, 68,
-134,221, 57,154,140,139,106,235,174,219, 34,165,238, 12,168,183, 13,217, 13, 81,219,121,198,219,253, 26, 28,125, 73,108, 37,  1,
- 41, 13, 62,232,111,214,218, 88, 87, 53,221, 90,189,235,241,103, 84, 54,214, 35,223,192,237,191,166,243,212, 43,146,234,168,162,
-210,230,214,174, 85,210,219,108,  4, 84, 20,139,146,  5, 54, 10,228, 56,219,108, 55,239, 43,109,212,137,238, 41, 44, 50,192,240,
-207, 45, 59, 88,201, 19,178, 27,116,186,146, 13,137,182,215, 29, 72, 27,117,198,210,176,101, 86, 29, 24,  3,251,247,199,221,233,
-222,106,181,159, 75,167, 84,174,234, 93, 66,210,177,231, 69,184,235,115,168,180, 74,161,155,188,183, 37,187,104, 81,151, 91,175,
- 70,163, 80, 40,200, 81,166, 32, 83, 84,169, 82,149, 18, 91,178,216,139, 78, 83, 11,126,159, 42,107, 42,103,136,187,179,237, 34,
-226,147,119,235, 63,197,223,  8,251,124,189,158,219,184, 97, 16, 40,176,233,212,196, 92,251,157, 84,166,150,212,167,102,185, 76,
-180, 34, 77,106,221,117,114, 22,  2, 25,135, 45, 15, 52,181, 45,110,204,125, 71,175,108,182, 23,109,174,187,130,169, 84,222,157,
-223,125,186,149,249,123, 65,247,101,210, 60,100,212,104, 54, 69,155, 36,  7,224,237,133,176,149,  2,203,148,166,146,166,158,173,
-205,109,  3,235,170,160, 43, 86, 98, 69,134,211, 59, 51,104,216,150, 77,129, 77,110,141, 99, 90, 54,213,159, 74,109, 41, 66,105,
-246,205, 18,155, 68,137,132,126,169, 91, 20,232,205,165,197,117, 57, 82,129, 81, 36,146, 73, 39, 78,217,109, 94, 95,150, 60,146,
- 85, 80,254,145,169, 22,208, 11, 40,141, 58,223, 82,180,114, 93,186, 91, 96, 71, 98,164, 27,234,212,195, 81, 80, 21, 35,159,217,
-227,223, 81,  0,150, 61, 45, 98, 25,108, 58,223,168,247, 17,136,175,109,165,111,136, 46, 22,110, 90,253,251,188, 55,190,238, 65,
-226, 39,118,227, 73, 22,188, 43,214,173, 93, 15,170,216,230,151, 29, 53, 11,198, 13, 89,199, 26,118,108,119, 24,169, 38,135, 69,
- 37,232,207,174, 19,213,119,127,239, 68, 64,213, 43,151,138,189,231,148,233, 93,203,191,247,220,103, 10,148,232,142,246,226, 85,
-105, 32, 96,149, 21, 51, 79,141, 84,100, 37, 35,175, 68, 55,129,142,128,107,190, 92, 81,109,158,214,113, 35, 67,184,108,237,202,
-102, 60, 43,  2,198,163,212, 42,247, 21,248,211, 49,155,173, 80, 37,183,202,252,118,173,218,155,209,221, 83, 79,170,117, 53,160,
-227, 77, 36,169,228, 67,121, 32,178,242,233,207, 57,194,234, 71, 15,220, 39, 90, 75,109,193, 77,191,119,  2,124, 94, 96,220,151,
-161,219,182,108,103,243,144, 18,185, 21,119,174, 89,106,100,163,  0,129,224,171,201, 60,131, 83,252,135, 54,165,204,160,150,105,
- 50,197,106,184,152, 41, 60,176,194,223,170, 17,180,  5, 22, 29, 67, 58,155,146,119,189,240,193, 93, 73, 45, 59,170, 45, 73,228,
-176,184, 26,172,111,176, 36,139,220,223,181,129,216, 91,107, 91, 29, 21,246,100,113, 47,186, 91,235,125,110,  4, 59,162, 92, 75,
-222,214,164, 89,244,136,116,189,196,146,195,109, 87,221, 69,  6,164,227, 77, 68,157, 83,101,164,170,228,142,252,250,245, 93,166,
- 94,150, 12,132,127,  7, 30, 90, 93,113,183, 73, 87,102,245,197, 62,  8,247, 59,106,118,179,113, 23,103, 90,182, 36, 75,  2, 30,
-235, 85,168,116, 25, 13,199,172,212,107, 14, 87, 43,209,216,152,205,189, 33,239,126,  9,109,170,147,105,114, 75, 75, 16,216,138,
-219,177, 93, 46, 62,219,134, 27, 74, 71,107, 53,  4,226,104,132,121,180,197, 40,197, 20,114,  5,101, 80,  0, 13,113,230,112, 20,
-149, 23,107,139,  2,109,109,247,185, 47,153,107, 22,165, 75,205,206,101,184, 39,115,107,116, 27,128,122, 88,239,235,233,133,165,
-165,165,168,254, 55,240,180, 29, 66,161,  2,147,  6, 93, 78,169, 50, 45, 58,157,  2, 59,178,166,206,154,251,113,162, 68,140,194,
- 11,143, 72,147, 33,229,  4,178,202, 80,149, 21, 41, 68,  0,  6, 73,209,154,212,158, 53,182,250,255,  0,220,189,141,169,219,187,
-118,235,139,169,181, 89,166,213,106,148,134,158, 12, 59,113, 81, 32, 51, 52,201,162,180,181, 16,149, 58,102, 59,  6, 74, 80,165,
-  0,225,167,  6,243,149,  0, 88,184,159, 52,173,201, 56,123, 58,205,242,220,170, 76,242,191, 45,166,150,104,105, 34,254,242,162,
- 68, 66,203, 18,216, 19,118, 35,162,171, 57, 23,  8,172,214, 82,253,194,249, 85, 14,121,196, 89, 38, 79,153,230,209,228, 89,126,
-101, 83, 12, 51, 86, 75,253,221, 60,114, 56, 87,149,174, 85,108,160,245,102, 84,  6,197,221, 86,236, 52,131,138, 95,104,  4,186,
-199,214, 54, 22,197, 77,122, 13, 40,151,161,213,183,  5, 41, 91, 51,234, 13,245,109,214,109,116, 44,  5, 64,138,174,191,225,138,
-  1,245,164,254,133, 45,116,112,232,102,217,108,157,245,187,134,183, 88,166,198,146,138, 37, 30, 21, 78,171, 88,184,102, 54,243,
-205,188,244, 72,207, 77,118, 44,101, 40,243, 79,168,186,180, 97, 88, 36, 32,185,206,226,129, 32, 43,100, 54, 19,129,203,238,248,
-173,181, 55,114, 41,115,173, 91,118, 27,233,241,105,111,225,154,189, 85, 72, 80,230,100,242, 40,251,132, 63, 37, 44,159, 21, 64,
-225,180,167, 62, 34,123,107,102,109,165,171,100,219,108, 91, 52,106, 68, 40,116,214, 97, 24, 34, 35, 12, 33,184,233,142,182,203,
-107,104, 54,  7, 80,164,169, 92,196,228,168,168,149, 18, 73, 58,227, 46, 26,240,155,196, 15, 27,243,131,198,254, 48,212, 79,148,
-100,169,175,216,178,205, 50, 64,197, 79,217, 84,129,142,186, 74, 91,129,173,223,251, 93, 72, 91,234,  0,172,216,237, 78, 38,241,
-115,195,223,  3, 50, 97,192,254, 13, 83, 65,156,103,114, 20, 53,217,166,164,168, 64, 71,218,103,168, 81,162,174,168,169,109,  8,
-159,217, 41, 75, 17,164,144,208,226, 44, 52,185, 13,195,169,211,165,188,142,118, 98,207,137, 33,212, 30,203,109,137, 13,184,226,
-  8,249,165, 36,125,250,127,189,191, 59,  1,126,241, 15,193, 94,202,238,238,208,211,167, 93,244,109,151,184,170,119,101,215, 68,
-161,176,236,233,235,179,175, 10,  4, 24,142, 93, 76, 66,140, 20,185, 76,211, 95,167, 69, 50, 66, 18,165,179, 30,166,244,130,  3,
- 76, 60,164,211,226,127,101, 42, 59, 29,186,181,187,117,109, 62,187,118,168,251,213,155, 78,162,182,200,106, 93, 34, 91,202, 95,
-186,135, 57, 66, 85, 38, 43,203, 84,119, 64,193,253, 26, 87,128,151, 18, 75,183,195, 79, 26, 53,221,151,166,139, 34,240,164,187,
-122,109,226,148,224,141, 17, 46,182,154,189, 13,183,212,165, 72,102,  2,165, 31, 10,109, 61, 74, 90,213,238,238,148,  4, 41,106,
- 40,113, 41, 37,  5,151,232,189,226,236,127, 70,191, 20,115,188,175,140,233,189,135,151, 83, 26, 73, 43,163, 50, 69, 61, 47, 62,
- 45, 50,104, 12,254,207, 83,  5, 76,154, 39,141, 95, 65, 49, 74, 20,198,204,234,241,244,170,240,114, 79,164,247,132,249, 46, 99,
-193,117, 94,220, 37,165,149,227,137, 29, 21,229,130,168,211,204, 26, 46, 97, 84,246,154, 89,233,163,215, 79, 35, 71,204,  2, 88,
-139,  9, 21, 81,160, 87,169,110,253, 27, 78, 31,247, 14,201, 78,246,241, 53,120, 64,159,107,237,173,207,108, 82,237,139, 90, 69,
- 85,167,160,179,114, 68,163, 76,149, 92,175,220,241,144,248, 79,137, 70,138, 26,139, 29,153, 56, 45,188,228,137, 73,109, 71,193,
- 94,122, 95, 89,143,236,147,185,110, 37,110, 61,103,134,205,190,118,245,118, 71,214, 47,186,246,201, 80, 28,168, 63, 81,230,241,
- 76,135,214,152, 94,233, 38,103,139,215,198,113, 69,124,221,121,181,134,239,223, 25, 43,190,109,119, 54,195,105,109,159,226,243,
-110, 28, 97, 16,106, 24, 17,153,172,214,169,236,  0,134,169,158,  5, 63,244, 20,106, 55, 34, 82, 21, 29,165, 56,167, 82,  2, 22,
-180,183,204,210,189, 25,241,187,233,237,225,100,220,  3,152, 80,112,253, 92, 57,166, 99,153, 70,182,130, 10,152,234,164,119, 86,
- 89, 18, 33,201,  5, 97, 70,145, 87,153, 52,237, 25, 88,195,132,133,228, 42,  7,154, 94,  3,127,179,211,197,122, 79, 17,114,220,
-207,136,233,166,203, 50,220,174, 70,250,249,233,164,165,141, 17,213,163,121,155,158,193,230,117,141,219,151,  5, 58,200, 30, 82,
-133,230, 72,149,201,211,219,222,171, 18,185,121,221,181,168,  8,  8,131, 86,185,107,149, 40,105, 74,121, 64,139, 58,167, 42, 76,
-127,132,143,135,244, 78, 35,167,207, 77, 71,183,193, 83,207,  4, 92,  7,166,161,226,120,232,185,171,137, 62, 46,121,194,  5,131,
- 73,240, 82,160,174,160,134, 66,  7,221,173,145,216,173,173,169,238,230,227,208,109,120,108, 60,170,120,148,204,234,252,180, 33,
- 69,184,116,136,238,161, 82, 57,156, 72,194, 30,120,132,178,214,123,173,224,113,202,149, 17,210, 31,105, 23,179,  6, 31,180, 15,
-107, 54,119,111,211,186, 82,118,157, 59, 83,112, 85,238,  6, 95,131,103, 71,187, 17, 86, 21,122, 52,122, 72,130, 99,187,113, 83,
-133, 57, 44,166, 58, 86,149,165, 78,133,  5, 20, 20, 12,  5,107,144,127,217,239, 11,228,156,117,155,248,159,196, 50, 53,  6, 69,
- 81, 49,167, 14, 35,118, 89, 36,209, 81, 36,238,145,198, 25,217, 98,121, 98,141, 74,171, 13, 82, 58,223,200,246,236,191,246,140,
-186,241,  7,135,185, 87,133,124, 53, 18,230, 60, 67, 79,  0,168, 49,153, 35, 86,142, 62,101, 52,112, 70,242, 72,200,138,210,199,
- 20,210,176,118, 83,166, 56,218,223, 88,151,102,125,130,112,118, 42,169,192, 62,220,155,  3,248, 58,253,211, 14, 69,121,189,216,
-141, 20,197,250,250, 61,248,229,122,168, 93,114,229,109, 39,197, 75,206, 82, 17, 78, 84, 37, 57,240,170,  2, 88, 75, 71,  8, 80,
- 17,173,246,250, 13,156, 87,180, 78,224,103,100, 28,162, 63, 88,110,202,179, 25,220,245,218, 78, 69,118, 49,221,175,121,170, 25,
-141,184,237, 53, 69,181,220, 41,161, 42,215, 76,222, 83,227, 38, 98, 92, 68,140, 74, 75,192,117, 38,227,250, 54,119,189,161, 79,
-164, 73,216, 46, 46,110,123, 78,180,253, 25,154,101,232,154,149, 18,165, 73,135, 95,154,143, 16, 72,168,192,114,215,185, 18,237,
- 62, 19,168, 82,  1,129, 35,223,  2, 20,149, 45, 50,202, 86, 27, 67,243,193,111,209,227,219,173,146,220,107,127,118,119,231,112,
-164,239, 85,205,109, 84,218,174, 81,173,207,169, 81, 69,178, 35, 87, 35, 60,153, 16,234,149,118, 37,204,149, 42,232,125,153,  9,
- 75,205, 33,229,199,142, 93,  0,191, 29,240,156, 31, 80, 50,110, 36,240,255,  0,133,248,167,136,120,250,159,140,167,206,102,204,
-197, 81,139, 47, 20,147,199, 51, 60,242,  9, 52, 75, 52,159, 86,209,161, 80, 35, 44, 16,  5,210,199,204,186, 91,202,188,243,133,
-252, 73,226,222, 17,225,159, 14,106,120, 26,159, 34,131, 42, 52,130,108,204,214,211, 75,  2,165, 60, 92,190,100, 48, 71,245,171,
- 35,134, 38, 64,165,201,109,106, 60,175,173,120,101,186,226,227, 30,216,222, 31,145,113,169,212,222, 13,238,  7,  6,204,215,213,
- 43,196, 18, 19,114,181,106,109,123, 85, 19, 47,197,202,132,164,212,146,231,141,205,215,196, 74,201,235,211, 90,121,178,118,150,
-251, 86,248,244,118,209,176, 55, 14,149,181, 28, 67, 63,187,123,137, 77,165, 94, 87,124,150,160,183, 79,191, 68,251,137,138,172,
- 71,101, 79,167,202, 75, 85,121,111,253, 99, 25,144,182,148,167, 95,150,150,144,124, 71, 18, 12,191, 55,139,216,145, 27,114,184,
-246,164,241,181, 23,126,103,210, 85, 77,220,141,186,220, 36,237,202,118,242, 36,168,229, 86,  2,232,107, 69, 32, 92,230,240,109,
- 65,169, 66,136,128, 94,247,  2,166,125,229, 68, 33,194,145,159,188,127,251,  8,246,135,139,155,230, 86,246,237,181,237, 81,216,
-221,230,170,248, 18,174,153,244,186, 83, 85,171, 78,238,170, 68,109,180, 49, 90,169, 81, 81, 50, 35,244,171,136,165,166,146,236,
-232,146,128,119,194, 75,143, 69,117,254,103, 75,214, 91,226,215,  8, 67, 22, 85,150,205, 86, 35,138,175, 35,134,138,121,205, 36,
-147, 69, 73, 85, 26,176,229,203,  3,162,251, 69, 57,230, 48, 97, 30,180,109, 10,167,202,197,149,139, 52,240,103,141,106, 37,205,
-243, 72,104,140,147, 80,241,  4,245,244,244,226,182, 40, 37,173,163,149,163, 60,200,170, 35,145,189,154,161,121, 42, 80,203,203,
-117,214,204,  6,181,  8,220,174,226, 71,130,207,107,101, 91,105,167,218,220, 83,113,207,179,208,246,122,238,169,208,173,233,177,
-183, 54,243,164,208,173,170,181,102,101, 69,135,109,234, 98,103,201,178, 88, 45,207, 85, 69,134,150,209, 67,168, 82, 61,221, 78,
-173, 73,109,181,173, 58,117,197, 87,  1,155,253,192,167,179,178,235,160,238,229,199,101,215,173,141,200,226,147,102,174,107, 61,
- 22, 93, 90,117, 86, 35,117,  8, 59,103,187,240,170,243,222, 92,168, 76,160, 38, 69, 61,202, 40,109,109,115,248,137,137,146,174,
- 80,141,116,161,143,163,193,196, 46,228,213,168, 20,254, 34,120,219,187,111,155, 38,221,113,180,211,233, 77,199,185,174, 25,241,
- 97,167,  8,114, 37, 29,203,202,228,122, 53,190,165, 48, 57, 82,234, 35,200,  8, 29, 60, 21,142,154,234,183, 19,126,200,187, 31,
-124, 56, 36,218,238, 11,108,125,198,175,109,125,165,181, 87,181, 22,242,163, 87, 39,211,158,220,106,188,245,210,168,215, 85, 46,
- 68, 42,129,170,215,224,171,196,147, 34,233,147, 37,110,182,234, 91,105, 81,195, 44, 70,109,146,148, 54,214,158, 34,228,185, 53,
- 87, 15, 81, 71,196,212, 85,249,107, 87, 71, 81, 94,180, 57, 43, 81, 65, 18, 68, 85,227,149, 89,109, 43, 77,170, 53, 86,  9, 12,
-154,144,144, 89,  2,128,238,210,120, 95,158,231,148,156, 75,152, 73,194,149,249,118,106,153,124,148,217,123,102, 25,242,215, 84,
- 77, 36,193,146, 72,157, 90,240,164, 26,100,118, 66,243, 71,165,192, 96,175,172,152,216,127,163,207,182, 54, 85, 63,129, 26,  5,
-213, 18,131,  1,186,245,225,121, 94,117, 27,146,168, 35, 51,239,213,105, 84,250,195,212,170,127,190, 73,  8, 11,121,152,244,248,
-205, 54,202, 20, 74, 90, 10, 95, 32,  5,107, 39,133, 62,218,203,122,129,108,123, 96,109,245,210, 41,177,105,109,213,209,195,221,
-118,176, 97,180,134, 12,218,147,149, 56,208,159,168, 62, 91,  3,158, 81,133, 78,134,130,179,241, 17, 25, 57, 61, 53, 47, 47,103,
-175,  7, 75,224,115,135,139,127, 97,141,234,237,254,138,  5, 74,189, 81, 77,202,253, 13,187,113,201,102,185, 84,122,164,166,141,
- 41,170,164,208,194, 90, 47,114,  3,239, 11, 42,  8,230, 56,206, 53,160, 92,119,251, 21,218,227, 43,139,138, 79, 20,201,223,169,
-214, 59,244,232, 27,125,  4,217,141,109,212,106,251, 11, 22, 36,247, 38,120,191, 94,185,121,196, 82, 76,164, 44, 39,151,221, 15,
-128, 83,205,151,129,228, 17,110, 24,227,108,134,131,196,238, 46,226, 60,195, 51,120,242,140,217, 51,  4,134,110, 92,238, 92, 77,
- 42, 52,  0,198,177,153, 20,104, 81, 96,232,  2,  5,  0,233,176, 24,151,241,111,  0,241, 22, 99,225, 63,  5,112,190, 91,148,164,
-153,214, 76,249,107,207,  8,150,157,  4,109,  4, 46,181, 12, 36,105, 22, 38, 58,216,234, 40,236, 92,177, 35, 85,201,196, 94,166,
-255,  0,  4,227,251,102,171,138,226,141, 80,145,106,127, 43,106,227,151,155,183,111,130, 40, 41,134,253,197, 45,203,106, 77,100,
-206, 72,103,248, 45,250, 74, 26,201, 88, 17,189,203,148,159,208,106,118,219,255,  0, 77,225,202, 23, 11,155,155, 59,120,151,101,
-141,146,115,108, 43,142,220,242,235, 79, 83, 77,  2, 85,186,237, 13,231, 25, 76, 37,173, 94, 28,153, 78, 35,192,250,189, 49,242,
-243,146, 21, 28, 67,  5,242,214,185,225,237, 10,246, 37,236,223, 28, 51,160,110, 93, 50,230,159,180,155,231, 14,139,  6,141, 84,
-188,169, 20,168,245,170, 53,231, 14,149, 20, 69,166, 34,238,183, 93,151, 24,202,168, 48,195,108,176,204,230, 36,178,250, 35, 54,
-134, 94, 76,166,217,142,134,185,163, 99,253, 27,221,214,159, 80,165, 91,187,205,197,181,110,187,181,116,121, 33,246,109, 11, 90,
-155, 92, 73,125,180,171, 33,152,105,184, 43,142,194,160,169, 67,169,117,184,146, 84,156, 20,165, 25, 60,195,123, 59,206,248, 23,
-142, 41, 56, 79, 52,204, 56,182,110, 23,174,225,202,104,160,154,140, 82, 79, 49, 38, 34,167, 93, 35,197,104,209,156,173,149,152,
-146, 20, 70, 93, 84,165,153,191, 32,200, 60, 65,240,254,183,140,178,156,183,130,224,226,234, 14, 40,171,154,162, 10,227, 91,  4,
-  0,  9,129, 81, 29,108,114,131, 35,162,  6,187,162,128, 11, 25, 66, 51,137, 46,188, 20,224,130, 37,122,161,107,241,207, 22,205,
- 68,229,213,151,193,189,253, 34, 59,113,121,149, 53, 84, 40, 55,206,223, 79,185,147,150,134, 72, 22,172,106,177,123, 29, 60, 36,
- 57,159,135, 58,112,125,151, 27,107,197,206,231,238,109,253, 66,224,219,124,109,173,154,220,132, 90,144,164, 85,209, 87,159, 18,
- 13, 86,231,182,219,170,182,183,153,164,123,205,  6,114,159,102, 44,244,195,114, 64,108, 32,164, 58,218,149,148,246,148,183,  0,
- 30,195,186,103,  4, 59,219, 95,221, 41, 91,210,238,236, 81,174, 43, 18,191, 97, 78,179,235, 27,115,  6,133,  5,234,101,126, 92,
-  7,229, 25,178,149,117,212, 19, 61,159,118,131,224,173,133,199,  8,117, 50, 23,206,113,240,235, 95,184,128,250, 57, 52,  5,238,
- 92,237,211,224,251,126,238,109,132,155, 34,168,253, 90,157,107, 61, 18,125, 66, 21,175, 38, 90,150,227,236,218, 87, 93, 26,179,
- 18,165, 71,166,165, 75, 33,152,239,  9,107,109, 10, 40, 18,121,  2, 82, 39,213,158, 45,112, 93,125,119, 19,229,145,230,113,193,
- 73,155,199, 76,244,245,181, 20, 18,212,211,115,163, 69, 71,134,162,150, 72,214, 70, 81,203, 66,172, 80,165,217,219, 82,178,174,
-170,226,135,193,142, 59,203,114,254, 18,205,101,202,100,158,183, 36,150,174, 58,154, 26, 92,198, 42, 74,174, 68,178, 51,199, 61,
- 45, 92, 82, 52,106,228, 72,225,215,152, 30,200,138, 85,149,155, 79, 63,120,152,246,113,123, 73,247,246,235,219,109,167,226,139,
-140,141,138,188,175,178,213,122,187,181,118, 29,241,126, 64,166,221,115, 99, 73, 93, 54,159,112, 78,182, 41,145,237, 56,210,106,
- 13, 56,228,106,115,110, 33, 60,254, 41,132, 84,218, 23,238,207, 41,173, 31,246,169,108, 70,229,240,207, 70,224,147, 98,119,114,
-163, 71,170,222,187,125,195,213,118,150,252,234, 12,137, 18,233, 70,139, 43,118,239, 89,244, 56,177,164,203, 97,167, 29, 12, 68,
-146, 91, 60,200, 72, 79, 32, 74, 71, 40, 26,238, 94,204,253, 30, 26,228,253,212,164,238,167, 22,156, 77, 94,219,207, 82,164, 79,
-131, 56,192,167, 63, 93,167, 79,170,174,154,224,118, 27, 85, 91,234,181, 93,149, 83, 76, 20,173,  8, 10,106, 34, 99, 59,203,144,
-220,182,137,206,183, 63,218, 81,236,103,137,199,254,225,237,141,254,141,242,159,182, 63,197,206,219,177,183,108, 80,227,216, 76,
- 93,200,157, 30, 61,114,165, 89,102,162,106, 82,110,248, 10,142,176,154,138,153, 45, 22,157,230, 12, 37,207, 23, 42, 41,211, 54,
- 91,226,118, 67,149,113, 15, 14, 82, 84,113, 37, 61,110, 65,151, 37, 76,179, 61, 46, 80,244,112, 67, 83, 36, 82,198,139,  2, 70,
- 26, 87, 71,230,182,191,169, 81,168,  7, 46,218,138,163,238,105,225, 55, 17,103, 28, 53,197, 21,180,220, 43, 85, 67,196,121,172,
-148,176,195, 29,102,117, 29,117, 68,244,145,205, 12,142,213, 15, 41, 72, 99,120,249, 43,203,250,242,218, 47, 24,141,116,134,125,
-234,246,125,236,206,223,237,103,  9,155, 11, 64,179,173,250,125, 38,  3, 59, 97,100,212, 92, 17,163, 54,202,230, 85,234,214,237,
- 54,167, 88,172, 76, 82, 19,151,234, 82,234, 82,100, 72,125,213,100,173,199,207,100,132,164,111, 48, 24, 24, 29,135, 65,166,203,
-102,236, 37,237,126,216, 88,187,122,185,202,169,155, 50,212,183,173,113, 82, 83,  9,138,169,233,160, 82, 33,210,147, 53, 81,146,
-234,196,117, 58,152,129,101,176,181,132, 21,242,133, 40, 12,150, 11,143, 78, 49,236,142,  6, 56,109,189,119,206,237,247,106,133,
- 98, 35, 63, 80,109,189,164,235,165,183,175,125,198,171, 71,147,252, 28,183,209,200,180,173, 16, 18,168,242, 38, 84, 93, 65,230,
-143, 77,165,203,121,176,183, 80,219, 78,115,121,134,183, 63,207, 30, 26, 53,122,250,236,222,165,132, 99,114,242,188,210, 27, 18,
- 91,123,146,215, 98,214,176,185,107,  0,113,212, 98,122, 30, 27,225,232,231,174,100,203,178,252,150,145, 76,135, 96,145, 71, 12,
- 64, 48,  1,118,178,133,178,170,222,230,193, 65, 36, 12,113, 23,233, 10,251, 69,127,139,219, 56,240, 51,180,149,207, 14,246,220,
- 58, 76, 90,158,253,213,105,238,225,251,107,110,170, 45,166, 69, 35,111,195,236,175,154, 61, 90,224, 64, 68,138,131,100,165, 72,
-161,165,182, 28,109,216,245,192,166,197,250, 63, 62,207,199, 44, 27, 45,238, 46,247, 46,142,166,111, 45,207,164, 38, 30,218,192,
-168, 71, 90, 31,183,118,209,231,218,148, 43,105,105,228, 15, 10,125,126, 68,104,146, 26, 88, 10, 34,147, 18, 26,217,112, 38,161,
- 37,189,113, 27,217,255,  0,195, 62,227,251, 81,184,218,174,223,155,197, 50,161,115,219, 13, 92,234,221, 61,253,186, 37, 37,214,
-218,174, 63, 83,168,185, 34,149, 99, 68, 49,148,129,  0, 85, 37, 71,114, 43, 76, 50,166,145,  6,141, 74,151,238,188,134, 52,102,
-151,250, 18,218,182,237, 58,213,161,211,168,148,168,145,160,194,167,196,143, 18, 60, 88,140,183, 30, 52,118, 35,180,150,153,143,
- 29,134, 82, 16,203,  8,109, 41, 74, 16,144, 18,148,164, 37, 32,  0, 53,117,113,253,101, 39,  0,112,165, 23,134, 89, 44,193,243,
- 42,197, 90,140,226,116,234,236,225, 88, 67,126,160, 61,151,202,108, 86,153, 34, 86,213,206,123,208,254, 27, 80,214,248,145,198,
- 53,254, 44,103,208, 52,121, 85, 11, 61, 54, 73, 76,251,132, 68, 44,166,123,116, 38, 59,183,152, 92, 53, 84,146,178,149,228, 32,
- 25, 10, 82, 18,144,148,140,  4,128,  0,244,  3,160,215, 62, 61,164, 30,208, 29,190,246,125,108, 68,221,193,174,166, 21,195,185,
-183, 74,103,208,246,111,110, 92,144, 91,126,238,186,153,142,218,156,168, 84,144,203,169,118, 61,155, 75, 18,162, 72,171, 73, 65,
- 65,  8,121,152,108,172, 76,155, 21, 42,223,186,157, 78,157, 69,167, 84, 43, 21,138,132, 42, 77, 34,147, 10, 85, 74,169, 84,169,
- 74, 98, 13, 58,155, 78,130,195,146,166,207,159, 54, 83,137,106, 28, 38, 99, 52,235,142,186,226,146,134,208,218,150,181,  4,130,
- 71,  9,184,174,225,239,128,223,109,  5,235,103,196,178,120,186,133, 90,187,118, 26,145,116,193, 93,191,180, 87, 53,159, 80,147,
- 34,153,115,212,232,158,253, 88,147, 10,183, 72,146,245, 74,148,212,218, 52, 38,155,157,  7,154, 22,102, 37, 42,117, 74,117,156,
-212,252, 35, 69,149,207,156, 82,213,241, 20, 21, 13,195, 52, 45,174,178, 72, 34,146, 64,163, 75, 24,163,145,145, 78,133,154, 64,
-177,177,184,109, 37,180,144, 64, 34,228,227, 92,195, 55,166,201, 42,232,248, 98,122,101,226,188,193,116, 80,199, 81, 52, 81, 22,
- 98,202, 37,146, 53,145,135, 49,160,137,154, 69, 91, 50,235, 85, 12, 10,155, 24,223,112, 43, 69,217,158, 45,184,165,187,120,165,
-246,138,241, 35,182,116,170,123, 23, 91,119, 61, 74,223,220,203,198,221,164,212,247, 82,240, 90,154,145, 18,  4,155,122, 83,169,
- 76, 13,179,165,195,106, 27, 94,232,150, 88,134,243,109, 69,164,194,109, 80,163,204,105,153,125,220, 94,209,127,103,156, 61,184,
-186,232, 52, 94, 47, 56,125,117,247,237, 26,244, 24,113, 99,110, 45,186, 93,145, 37,234, 60,166, 35,176,203,104,151,241, 45, 78,
- 41,  9, 74, 64,234, 84,  0,215, 43,127,189,146,225,251,255,  0,151,141,236,252,108, 47,255,  0,212,117, 98,186, 62,141, 70,193,
- 80,109,171,134,184,206,250,111, 75,206,209,168,117,106,171, 77, 58,108, 79,  9,215, 41,240, 31,150,134,220,228,180,193,240,212,
-166, 64, 56, 32,224,156, 28,234,227,226,156,231,194,238, 48,205, 41, 42,234,248,179, 49,165,167,161, 88,226,165,164,134,136, 37,
- 61, 52,107,164,104,141, 76,102,218,138,130,204,119, 54, 10, 44,136,138, 40,222, 15,200,252, 93,224,124,162,178,142,139,131, 50,
-202,202,154,247,146,106,202,201,235,245,213, 85, 72,218,137,121, 92, 72, 47,160, 51,  4, 81,176,187, 49,187,187,179,241,151,216,
-125,188,123, 87,177,188,108,155,223,120,111,251, 87,109,173, 15,226,150,243,164,127,  8,239, 10,196, 74, 37, 35,235, 57,181,155,
- 69,248,144, 61,246,107,137, 71,189, 56,212, 57, 74, 66, 51,149,  6, 20, 64,192, 58,156, 37,241,179, 92, 40,241,203,106,237, 46,
-225,220,246,214,221,239,165,175,107, 85,218,191,118,150,241,196,122,245, 54, 52,165,184,202, 93,157, 69,169, 68,120, 38,161, 71,
-146,245, 54, 31,189, 67,112,189,  2,106,233, 81,140,168,239, 42, 43,  5,184,  0,123, 51,184, 59,180,120,227,226, 73,123, 35,122,
- 92,215, 45,167, 72,254, 47,238, 75,185, 21, 91, 80,210,133, 79,223,104,181, 43,126, 19, 17,149,245,197, 62, 75, 62,234,182,234,
-239, 21,254,143,159,153,164,114,168, 12,131,250, 11,240,185,177,214,207,  9,155, 29,181,187,  7, 78,186,100,213, 41,118,141, 53,
- 54,133,175, 62,230,151, 77, 98,183, 95,122, 59, 21, 90,234,227,165,168,172,176,212,202,144,167,198,170, 72, 83,113,218,  4, 70,
-167, 60,241, 64,109,167, 22, 49,227,201,203,105, 56,158,154,191, 47,204,234, 97,226,113, 20, 74,241,160, 40,145,211,114,230, 28,
-196,153, 44,218,218,229, 29,117,125,130,110, 45,140,253, 29, 23, 52,173,225, 42,188,187, 50,202,105,103,225, 38,158,102, 73,100,
- 43, 36,146, 85,137, 41,207, 41,224,123,174,133,  0, 58, 57, 91,243,  2,216,220, 12, 63,180,219,118,145, 74,138,212, 72,144,152,
- 67, 77, 33, 40, 72, 13,164, 97, 41, 24,  0,  0, 58, 12,  1,168,214,125, 36,238, 26, 44,170,175, 15, 59,113,196,205, 42,137, 14,
- 22,224,216, 59,137, 73,176,171, 53,136,200, 98, 51,213, 75,  2,242,167, 86,221, 76, 42,145,  5, 42,168, 46, 29,213, 78,163, 42,
- 16, 60,230, 50, 42,243,249, 18, 18,251,170, 18,111,  4, 30,160,228,122,141, 71, 19,233, 42,111, 69,183,107,112,145,182,219, 37,
-239,241,156,189,119, 91,118,169,119,  3, 20,143, 17,179, 37,155, 43,111,169, 53,105, 85,170,210,208, 57,148,210,  5,199, 87,180,
-163, 53,144,128,239,189,200, 40, 89,247,119, 16,170,219,194,167,174, 95, 16,120, 99,216, 11,  9, 94,160,  7,211,125,224, 42,220,
-240,214,234,188,157,100,223,109,175,219, 22,175,140, 41,151,191,134,156, 91,250, 68, 41,133, 41,137,143, 85,182,168, 14,158,207,
-166,253, 27,157,160, 45,183,222,221,240,212,253, 25, 45,199,171,212,118,115,136, 29,176,151, 33,247,169, 54,142,229, 80,110,122,
- 75,110,168, 41,184,138,190, 45,181, 67,159, 26, 49, 42, 42, 67, 62, 61,152,135,139,120,  8, 14, 76, 91,137,202,221,112,234, 82,
- 58,139,207,209,155,219, 90,149, 31, 99,247,187,115,230, 71,118, 60, 91,231,115,160,208,105,106,117,183, 80, 38,192,177,109,214,
- 20,185,241,212,165,114,187, 24,213,110,170,156,110,100,164, 31, 22,152,242, 20,163,202,  2,101, 13,163,120,178,105,219,196, 78,
- 41, 52,214,229,243,208, 27,116,230,  8, 34, 19,125,252,208,250,189,247,193, 60, 25, 90,149,240,199,132,  5, 93,249,190,206,228,
- 95,175, 40,212, 76, 97,251,185, 38, 61, 63,225,181,182,194,210,210,210,213,119,139, 59, 11, 75, 75, 75, 67,  3, 11, 86,231,168,
-244,137, 50,219,159, 34,151, 78,126,123, 74,105,109, 77,122, 12,103,101,180,182, 20, 20,202,155,146,182,138,208,164, 40,  2,146,
- 20, 10, 72,200,193,213,199, 75, 89,  4,141,193,177,247, 96, 98,222,186, 77, 45,198,165,199,114,155, 79,113,137,239,123,196,230,
- 87, 14, 50,154,153, 32, 41, 11, 15,203,109, 77,226, 67,220,237,182,121,150, 10,178,128,115,144, 52,195, 92,219,245,176,182,149,
-122,185,103,220,245, 58,117, 38,177, 14,165, 62,137, 88,166,205,183,100,165, 18, 94,180,182,226, 54,233, 43,153,126,224, 91,159,
-  5,155, 45,232,238,197, 88, 82,208,167,241, 10, 62,100,128,214,182, 39, 90,175,186,220, 34,237,174,239, 92, 87,189,203,114,202,
-174,179, 62,249,180,173,155, 70,114, 96, 73, 97,182,233,177,104, 55,  4, 90,205, 74,117, 39,196, 97, 70, 44,234,189, 58,155, 70,
-165,212,213,146,151,233,244,134, 89,229, 24, 36,239,229,230,133,166, 97,152,203, 44,112, 21,216,197, 98,193,245, 40,  4,130, 13,
-194,173,216,141,137,210,  0, 32,219,  9, 75,204, 10, 12, 42,165,129,253,111, 75, 29,135,199, 97,247,227,225,226,159,135, 84, 56,
-170,163,213, 95,119,172, 38, 13,219, 88,247,105, 22,125, 85,171,145, 66,203,155, 66,162,214, 18,136,138,166,123,195,149,  5, 46,
-227,166,  8,173,167, 43,148,194,220,113,158,102,153,112,164,250, 39, 17,220, 62, 92, 21, 58, 93, 58,145, 81,141, 34,185, 94,151,
- 97,212,226,211,133,167, 80,106,170,170,149,249,112,215, 45,203,118, 92,198, 28,166,133,197,168, 51, 86,164, 85,125,241,199,121,
- 87,  1,181,165,233, 10,109, 15,161, 74,182,220, 60, 32,109,125,201,123,215, 47,185,174, 86, 27,170, 87, 55, 43,109, 55, 45,216,
-204, 61, 29, 48, 33,205,219,106, 84,138, 75, 84, 24, 49,212,193, 12, 91,213, 70,167, 84,156,170,176, 58,201,118,122,151,204, 20,
-134,139,116,232, 92, 31,109,165,187,120,209,239,138, 92,218,235, 53,202, 30,226,110,142,227, 66,113, 79, 68,117,145, 63,115,169,
-177,233,206, 81,214,211,177,136, 85, 10,144,168, 20,183,233, 12,118,138,245, 57, 11,202,185,222, 14, 56,145,195,220,178, 86,106,
-161, 46,139,128, 74,144, 27, 78,161, 30,201,246, 67,125, 94,175,251,237,109,176,143,246,189, 67,202,133,111,239,189,175,107,245,
-235,111, 53,190,235,247,192,151, 23, 20,214,213,149,120,238,245,161,112, 90,149, 90,123,118, 93,223,110,218,116,155,146, 37, 34,
-165, 34,213,175, 92, 87,142,216, 91,119,181, 10,  5,199, 93,102,  0, 98,139, 83,155, 86,172,154, 91, 40,230,144, 74,145, 17, 79,
-169,147, 50, 58, 23,100,166,241,143,176,110, 91,118,252,155,150, 60,202,122, 85,111, 48,244,196,211,236,186,197,114,218,166, 92,
-206, 88,209,239, 59,138,199,163,207,137, 73, 87,214, 85,120,214,244,153,202, 90, 88,103,194,117, 48,100, 69, 14, 42, 91,110,197,
- 77,226,167,194, 53, 62,224,168,214,164, 92,187,177,184,117,202, 93,207, 86,176,238,171,166,132,252, 75, 34, 52, 75,138,247,219,
-171, 22,218,178,232, 23,101, 70,124, 75, 81, 19, 90,146,100, 90,180,154,171,241, 99, 73, 98, 19,149,  8,201,195,  8,139,207, 29,
-204, 89,174,  3, 54,230, 28, 89, 84,218, 93,213,112, 83,169, 85,  8, 13,183, 62, 50,109,173,179,153, 84,126,170,109,166, 45,137,
-213, 38,111,  9,246, 59,149,202,124, 73, 44,199, 68,199, 96,199,169,183, 24, 77, 91,133,  9, 76, 55, 93,134,181,227, 28, 52, 99,
- 65, 52,210, 44,161, 35,212, 99, 50, 88,176,141, 85,236, 90, 50, 67, 23,214,214,210, 86,214,179,139,144, 10, 77,101,201, 85,  4,
- 92,245,183, 75,220,116, 61,133,133,239,123,246, 56,201,110, 78, 45, 54,210,143, 71,187, 69, 26,206,190,106, 23,221,159, 10,239,
-174, 77,176,164,109,229,114,157, 93,162,200,181,109, 26,  5,194,253,122,230, 66,160, 17,111,208,220,164,222, 86,170, 68,245, 41,
- 75, 91, 85,192,134, 91,117,109,188,218,  1,107,139,222, 30, 41,208,160, 38,182,212,154, 96, 81, 98, 34,164, 83,236,138,173, 86,
-132,229,233, 73,143,  2, 77, 86,210,160,202,167, 82,150,229,102,224,167, 57, 85,155,240,177, 28,130,105,117,  4, 48,181,191, 26,
- 67, 73,200,239, 78, 20,232,247, 93,227,184,151,181, 59,113,239,187, 58,175,186, 16,107, 20, 59,177, 20,  6,109, 25, 81, 38, 91,
- 85,235, 26,194,177,234,148, 36, 49,113, 91, 83, 67, 13,174, 54,221, 80,228,162, 75,124,147, 24,118, 76,180,176,251,104,120,114,
- 97, 71,129, 29,185,102, 75,134,157,116, 87,233,212,215,107,237,221,142,192,102,217,219, 23,234, 46,220,107,153, 26,125, 70, 66,
-175, 41, 86, 50,235,200,165, 73,156,220,169, 11,130,138,162, 26, 67,243,150, 16, 68, 68,166, 32,196, 67,134,204, 81,243,102,154,
- 55, 96, 25,172, 90,225,180,141, 75,126, 89, 22, 86,190,141,141,197,203, 50,155, 12,  6,246,205, 70,202,164,  3,177,176,251,143,
-218,190,227,175,167, 96,112,231, 92,188, 65,108,253,156,237, 21, 85,234, 37,205, 77,117, 54,204, 75,162,127,188,109,197,114, 52,
-173,190,178,220,185,255,  0,131,148,235,130,242,141, 38,152,219,246,149, 21,117,198, 37, 41,160,227, 97,192,213, 50, 76,191,  5,
- 44,199,113,212,227,232,226,211,100, 21, 21,169,244,186, 61,249, 82, 97,202,109,126,252,241,169,187, 81,118,165, 40,183,173,245,
- 24,119, 77,250, 28,149, 70,101, 47, 81,162,201,144, 35, 61, 61,165, 56, 94,122, 73,102, 57,144,174,112,155,149,235,194,253, 54,
-254,147, 62, 77,127,114,247,  1, 75,185,109,201,150, 53,252,136,169,180, 27, 69,243,183,234,190,107,183,181, 30,208,169,151,173,
-119, 21, 76,139, 79, 23, 21, 86,150,196,154,122,162,203,114,155, 49,212, 72,121,217, 74, 76,164, 52,251,165,194,237,235, 26,209,
-179,173,109,147,172, 76,141, 81,133,182, 87,238,208, 87, 46,106,213,219, 71,163, 71,122,208,188,167,211, 39,166, 53,106,131, 47,
-109,107,104,172, 50,153,222,250,242,158,167, 46,147, 80, 97,184,166, 59, 47,172,204, 15, 66, 37, 60, 57, 12,220,152,228,168,144,
- 77, 35, 16,197,159, 68,106,161, 88,234,102,104,191,104, 88,  1,114, 84,173,192,114,193,114,237, 84,161,152, 32, 33, 64,176,  2,
-228,155,141,128, 13,233,248,131,216, 12,110,107,245,216,236,216,210,174,155,102, 19, 51, 24,254, 12, 74,185,104,144, 74,126,174,
-102,127,139, 76,118,175,  5,151, 65,108,123,159,142,181,183,206, 74,121,146, 94, 82,148, 50, 14,180,215,116,165,219,144, 32,213,
-182,215,234, 10, 53,122,167, 42,135, 42,149,118,221,213, 70,214,169, 21,107,134,188,202,229, 86,106, 18,  4, 96,219,174,148,212,
- 36,135,144,147, 32, 54,202,144, 24,109,164, 55, 29,160,157,199,135,107, 57, 22,193,139,100,166,162,160,236,107, 61,139, 88, 85,
-154, 99,195, 80,113,154, 42,105, 34,162,212,101, 58,174, 69,115, 39,197, 74, 10,206, 14, 19,204,123,235,144, 59,209, 19,116,167,
- 75,115,110,234, 52,115,107,213, 46,219,210,159, 99,220,151,204, 58,236, 73,212,214, 41,117,135,213, 18,124,250, 47,142,152,243,
- 99,207,171, 72,  8,129,  8,201,140,219, 77, 59, 90,111,154, 74,212,166,148,189, 76,174, 26,121,106,106, 29,239, 34, 68,  9, 80,
-110, 46,  9,181,201,219,183, 91,237,190,248, 60,236,234,136,  7,148,183, 95,203, 29, 10,217,141,236,135,113,237,133,155, 34,137,
-104, 94, 55,  7,131, 64,143, 79,110,109, 18,136,236,138,  4,185, 20, 96,229, 38, 91, 17,174,  7,228,  6, 36,186,204,216, 18, 99,
-188,239, 63, 35,146, 34,186,166, 84,235, 74,109,197,229,117,203,231,113,228, 81, 38, 76, 27,115, 80,181,169, 66, 35,130,109, 86,
-161, 91,167,203,170,192,109,238,102,132,198,233, 52, 53, 63, 33,184, 44,146,133,204,125,  1, 82, 99, 70,241, 95,139, 22, 83,173,
- 37,181,115,182,167,188,183, 37,129,  6,159,182,219, 79, 95,118,221,177,236,232, 45,208,224,166,152,212, 39, 19, 54, 68, 95,130,
- 92,184,146,164, 69, 83,145,233,254, 40, 83,113,195,107, 72,113,182, 68,151,  7,140,251,152,109,170, 91,157,184,213,165,133, 85,
- 47,171,178,127, 33,230, 75,114,171,213, 23, 35,250,156,199, 84,159, 15,147, 25,200, 41,229,229,200, 61, 52,228,156, 45, 83, 33,
- 46,213,  9, 12,109,184,184, 98,214, 61, 46, 54,177,183, 93,246,239,141,118,204, 17,118,208, 89,135, 93,192, 23,247,125,248,187,
-241, 61,191, 16,171, 20,120, 91, 43,100, 59, 38, 45, 50,223,155,227,110,163,143,165,182,103,212,183, 14, 41,104,204,160,206,247,
- 98, 91,122,157, 79, 90, 99, 41,149, 50,183, 97,190,216,132,184, 46, 57,  2, 52, 39,156,210,  5, 41, 40, 66,220, 89, 66, 27,109,
- 42, 90,220, 95,192,219,105, 72,202,150,226,212,112,218,  7, 82, 73, 32,  0, 59,247,214,204, 79,218,105, 60, 77, 67,171,238, 54,
-206,186,245, 31,112, 40,173, 83,169, 53,218, 12, 24,116,183,153,221, 11,113,130,220, 51,122, 91, 76, 85, 22,150, 26, 76, 26,164,
-146,195, 50, 28, 10, 83,241,203,235,111,199,134,228, 45,102,150, 23,179, 43,113,174,103,163, 78,220,186,172, 10, 83,  3,192,117,
-104,185,234,127,195, 25,237, 41, 32,164,174, 53,175, 72, 83, 84,104,143,114, 21,146,164,150,212, 20,190,185,198,  4,179, 46,173,
-203, 50,156,190, 58,121,100, 74, 87,131,103, 86, 97,169,159, 98, 92,  0, 11,184,125,138,176, 91,105, 32,109,107,  6,154,136,106,
-106,106, 25,213, 76,161,250, 16, 54,  3,176, 36,216,  2, 58, 17,126,183, 62,252, 48, 60, 43,109,125, 79,127,119,214,218,118,158,
-185, 44,218, 22,100,195, 85, 21,152, 78,173,176, 24,129, 33,164,215, 46, 72, 51, 89, 87,232,220,113,192,221, 34,148,242, 50,174,
-121,115,101, 55,205, 29,104,115, 82, 78,211, 25,177, 59,  3,102,236, 21,187, 50,139,108,185, 46,165, 62,173, 33,153, 53,170,245,
- 73, 17,145, 54,114,162,180, 89,135, 17,150,162,180,148, 67,165,176,133, 61,224,176, 57,202, 21, 37,197, 41,197,149,100, 62,122,
-131,113,  6,106,185,165, 96,104,175,236,208, 11, 33, 34,197,137,182,166, 35,168,189,128,  0,244, 85, 23,220,156, 61, 80,210,154,
-104,136,127,239, 28,220,251,189,  7,243, 39,212,156, 45, 45, 45, 45, 48,227,119, 11, 95,  8,  4, 16, 70, 65,232, 65,215,221, 45,
- 12, 12, 83, 67, 45, 53,146,219,104, 65, 61,202, 82,  1, 63,128,213, 77, 45, 45, 12, 12, 51,123,215,177,246, 78,250, 90,142,219,
- 55,132, 15, 17, 77,169, 82, 41, 53, 88,229, 45, 85, 40,211,185, 57, 19, 46,159, 36,164,248,107,198,  2,208,160,166,221, 72,229,
-113, 10, 24,199, 21, 55, 95,128,189,229,176,101,201,126,218,136,213,251, 65, 75,139, 49,164, 82,249, 99, 86, 27,103, 36,161, 50,
-233, 82, 22, 57,221,  9,192,203, 14, 59,205,140,242,163, 60,162, 65,250,242,180, 33,192, 82,180,165, 96,247, 10,  0,143,219,170,
-147,196,127,  5, 56, 23,196,226,149, 89,229, 28,148,121,204, 74, 17, 43,169, 25, 98,168,208, 62,202, 73,169, 94, 41,209,127, 84,
- 75, 27, 50, 11,136,217,  1, 55,183,188, 54,241,191,143, 60, 47, 87,165,200,171, 99,172,201,165,114,239, 65, 86,173, 45, 54,179,
-246,158, 61, 46,146,192,237,250,198, 41, 21, 92,216,200,174, 64,180, 88,213,177,251,198,219,222,  2,182,186,252, 11, 10,228,255,
-  0,246, 90,178, 91,207,151,233,189,211,147, 31, 62,108,117,239,167,207,108,248, 36,222, 91,238,100,115, 87,165,127,  3,105, 10,
-113, 62, 60,170,176,241,106, 37,172,142,111,119,166, 48,172,135, 49,156,120,203,100, 12,103,174, 48,100, 58,105,148,245, 30, 99,
- 13,130,123,231,195, 26, 33,168,236, 50, 48,211, 77,182, 63,217, 72, 31,208, 53, 83,100,223, 67,239, 15,232,107, 82,167, 52,206,
-115, 28,238,154, 50, 15,179,179, 69,  4,111, 99,246,100,120, 99, 18,149, 61,249,111, 17,244, 97,139,115, 58,250, 99,248,133, 95,
- 67, 37, 46, 85,146,229,217, 29, 76,128,143,104, 85,150,162, 68,184,251, 81,164,210, 24,131, 14,220,200,229, 95,240,156,107,150,
-193,112,227,103,236,125,  9,184, 52,136,161,218,131,220,143, 84,106,146,130, 29,168, 84,101, 37, 56, 15, 74,120, 32, 14, 80, 10,
-130, 27, 64, 13,182,  9,  8, 72,201, 39,100,244,180,181,212,185, 94, 87,151,100,153,125, 38, 85,148,209, 71,151,101,180, 40, 35,
-134, 24,148, 36,113,160,232, 21, 70,221,110, 73,234,204, 75, 49, 36,147,142, 85,205,115, 92,203, 59,204,106,243,108,222,182, 76,
-199, 50,175,115, 36,211,204,197,228,145,207, 82,204,119,233, 96,  7, 69, 80, 21, 64,  0,  0,180,180,180,181,191,134,252, 45, 45,
- 45, 45, 12, 12, 45, 45, 45, 45, 12, 12, 45, 45, 45, 45, 12, 12, 45, 45, 45, 45, 12, 12,104, 15, 16,151, 95, 24, 54,239, 17,123,
- 83,103,109, 12, 84,212, 54, 75,118, 69,182, 47, 27,216,219,148, 90,131,187, 24,189,180,184,101, 92,219,132, 23, 42, 76, 82, 37,
-139,234,202,151, 77,160,210,125,241,138,135,213,181, 58,116,137,140,248,  9, 90, 64,231,117, 43,136,239,106,117,199, 89,185,105,
-117, 10, 52,219, 42, 68,189,220,218,235, 50,177, 79,135,177,151,213,106,118,216, 64,186,248,146,182,109, 10,197, 94,196,168,220,
- 27, 33, 79,182,247,  3,109, 33,236,132,171,166,163, 88,171, 53,117,221,106,132,229, 62, 29, 72,212, 41,241, 36, 73,106, 28,131,
- 84,132, 47, 28,201, 10,199,108,140,227, 84, 76, 88,197, 69, 69,150,202,143,115,203,215,203,250,134,165, 20, 60, 69, 77, 73,  4,
-113, 75,195,212, 85,111, 18,196, 57,143, 18,150,102,142, 70, 98,238, 24, 50,182,184,244, 70,234,  2,130, 99, 89, 13,218, 73,249,
-209, 44,195,134, 42,235,106, 36,154, 46, 37,175,163,142, 87,148,152,210,102,  8,171, 36,106,161, 35, 42,200,203,203,148, 73, 42,
- 49, 44, 87,154,209,139, 36,116,252,158, 18,111, 54,228,113,174,250,120,178,217,207,122,222, 77,206,102,216,218,235, 50,169,182,
-183,141, 11, 96,170,118,165,187, 86,174, 81, 46, 93,174,102,187,109,151, 87,181,116,241,125,223,117,200,235,187,229, 59, 34,206,
-174, 87,232,109, 83,149, 52, 24,150,188,232,144,226,189,121,221,222, 37,189,160,182,229,237,191,208,108, 59, 58,250,169,203,183,
-173,190, 38,157,179,108,216,155,  3, 85,170, 88,180,107, 78,206,216,154,213,197,195,166,226,216,251,164,154, 35,177,247, 99,117,
- 46, 45,225,139,109,211,166, 90,113,234, 19,223, 67, 85,233,113, 87,111, 66, 52,228,205,149,220, 51, 22, 58,149,204, 89, 65, 80,
- 24,  4,167,168, 30,131,211, 95, 12, 72,196,133, 22, 91, 42, 29,  1,229, 25,  3,211, 75,197,197, 20,136,176,163,240,229, 36,235,
- 18,176, 33,145, 44,210, 60, 84,241,180,133, 86, 48,170, 73,131,152,  2, 42,144,206,124,197, 76,130, 93,105,120, 70,177,218,103,
-143,138, 43, 96,121, 93, 72, 43, 36,132,172,105, 45, 76,169, 24,102,149,157,128, 21, 28,178,100,103, 82,136, 60,129,132, 70, 29,
- 28,224,214,249,226, 54,181, 83,222,219, 55,136, 39, 43, 85,241,100, 94,246,107, 27,119,127, 86,246,245,141,190,145,120, 91, 23,
-102,204,109,181,247, 91,109,168,212,184, 17,169,213,150, 40,215,245,201,118,208,253,234, 19, 64,161,116,  5, 67,154,165,207,141,
- 37, 70, 41, 62,217,106,175, 29, 60,104,113, 79, 93,164, 80,248, 84,226,128,108,102,199,212,235,214, 38,211,193,135,178, 27,169,
- 46,147,113, 46, 44,255,  0,115,185,183, 61, 15,199,182, 20,196,245, 87, 38,211,216, 92, 23,154, 60,130,143,  6,156,148,254,148,
-200,113,217,206, 33,150,155, 57, 67,105, 73,237,144, 49,211,211, 67,187, 77,128,242,138,221,136,195,139, 61,212,180,  5, 19,247,
-157,111,240,175, 28,175, 11,103,243,113, 12, 25,  5, 53, 85, 91, 66,177, 70,164,152,227,133,180, 34, 75, 44,105, 26,133, 87,155,
- 75, 19,164,  5, 65, 35,170,  0,166,216,110,227, 15, 15,159,139,248,110, 14, 25,168,226, 74,186, 58, 36,153,165,149,192, 89,101,
-157,  4,143, 36, 48,202,242,146,204,144,234, 80, 53, 18,206, 99,141,156,150, 92,126,116,252, 63,207,246,190,240,179,111, 84, 45,
-109,128,218, 78, 44,118,210,133, 86,172, 61, 95,169,195,163,240,195,113, 77,114,125, 93,248,145, 32,174,108,185,213,189,175,149,
- 33,245,136,112, 98,182,132,169,210,134,210,214, 16,148,229, 89,216, 95,229,123,244,129, 63,242,126, 52, 63,251,173,204,255,  0,
-254, 61,169,231,253, 81, 76,255,  0,200, 99,127,246, 73,254,173, 47,170, 41,159,249, 12,111,254,201, 63,213,169,173, 79,140,244,
-149,147,203, 85, 89,225,206, 77, 85, 85, 49,212,242, 73, 10,188,142,118,221,157,162, 44,199,110,164,147,211,211, 16, 58, 95,  2,
-107,104,105,226,164,162,241, 71, 60,163,164,128,105, 72,162,157,227,141, 23,246, 81, 18, 80,170, 58,236,  0, 27,226, 37,155,115,
-253,212,126, 49,125,153,188,113,237,174,247,198,222,153, 59,193, 46,175, 96, 72,219,250, 22,228,109,202,182,202,225,187,172,138,
- 21, 82,137,114,222,246,157,180,203,246,205, 29, 85, 20,205,129, 74,154,216,  8, 67,198, 83,220,180,197, 40, 34, 90,211,174,108,
-123, 29, 56, 93,226,149, 28,122,109, 85,237, 78,219,189,198,219,219,123,106,234,245,201,187,145,114,220,214,181,114,217,129, 10,
-149, 34,223,173, 81,102, 90, 18, 69,110, 36,113, 58,173, 81,126, 98, 97,251,154,  2,223,101, 46, 57, 49, 77,165, 17, 22,226, 63,
- 64, 22, 96,195,143,159,  6, 51, 45,115, 12, 43,145,  0,100,124,245, 69,170, 85, 61,151,140,134,162, 50,135,137, 36,184,148, 36,
- 40,147,243,198,154,161,241,114,174,151, 42,226,204,162,135,135, 40,168,169, 56,157,157,130, 68,186, 35,166,230,211, 71, 75, 40,
- 72,213, 66, 72,165, 35, 14,129,130,132,145,152,182,181, 58,112,239, 63,130,212, 85,153,191,  6,103, 85,252, 79, 95, 95, 91,194,
- 43, 26,151,149,181,201, 87,201,170,146,174, 18,242,179, 23,141,131,202, 81,202,150, 47, 18,162,175, 45,134,178, 91, 28,254, 11,
- 94, 39,235,248,104,231,255,  0,249,185, 70,127,110,177,109,192,143, 34, 93,135,122,196,136,195,210,165, 74,180,238, 40,241,163,
- 71,105,111, 72,145, 33,234, 68,198,217, 97,134, 91, 73, 83,175, 45,197, 37, 41, 74, 65, 82,148,160,  0, 36,235, 46,210, 35, 32,
-131,216,244, 58,169, 35,115, 27,163,129,114,132, 31,220,111,139,166, 68, 18, 35,161, 54, 14,  8,253,226,216,132, 15,176,167,134,
-142, 35,182,159,142,131,114,110,159, 15,251,217,182,150,232,218, 43,214,152,107,251,129,181, 87,213,153, 69,250,202, 85,110,207,
-118, 45, 59,235, 91,142,131, 25,143,127,113,168,178, 84,219, 62, 39,136,180,199,112,165, 36, 33, 68,117, 47,219,205,195, 55, 28,
-251,238, 54, 30,243,225,142, 29, 70,225,177,182, 89, 85,139,166,109,187, 96,220, 82, 40,155,167, 77,220,121,146, 24,110, 13,239,
- 72,138,151, 99, 46,172,220, 26, 44, 70, 24,129,245,108,167, 42,145,159,169,206, 83,113, 11, 78,151, 83, 34,132,192,132,135, 60,
-100,198,101, 46,147,146,224, 64, 11,207,219,162, 84,132,172, 20,173, 41, 82, 79,112,160,  8, 63,113,213,149,152,120,159,153, 87,
-113,173, 39, 27,140,170,149, 43,105, 34, 16,136, 36, 15, 44, 37,116, 73, 27, 19,114,172, 24,164,140,  1,  7,202,108,119,232,106,
-156,179,194, 76,171, 47,224, 42,222,  1,108,226,174, 74, 26,217,140,230,162, 50,144,206,175,174, 41, 20, 11, 43,161, 85,120,148,
-144, 65,212, 46, 54,216,136, 25,208, 61,170, 30,218,237,168,164, 39,110,107,112,119, 42,161, 86,167,180,154,124, 73,123,145,195,
-123,147,175,152, 73, 79, 52,102, 82,236,185, 86,131, 14,213,229,  7, 80,172, 61, 80,106, 99,238,173, 39,196,113,206,163, 77,149,
-151,192,119,180,211,218, 97,189, 44,110, 46,255,  0, 64,220,170, 74,107, 38, 36, 90,246,237,239,133, 26, 85,175, 26,139,111, 48,
-234,221,106,157,101, 88, 47,198,128,235,144, 71,143, 49,200,112, 41, 20,248,116,144,252,135, 28,117,248,190, 58,222, 95,232,  6,
-237,  2,142,250,185,220,129, 29, 74,245,240,211,253, 90, 50, 61, 62, 20, 79,251,222, 43, 45, 99,205,  8,  0,254, 56,212,132,120,
-202,153,122,212, 79,195, 92, 13,149,240,246,109, 84,165, 90,170, 40,213,156,106,234, 81, 86, 56,128,223,205,165,153,208,176,  5,
-209,237, 99, 26, 62,  5,190,100,244,176,113, 87,136, 57,191, 19,100,212,110,174,148,114,202,202,135, 79, 64,238,210,202, 78,215,
- 82,200,169, 32, 82, 66, 58, 94,248,215,190, 20,248,114,178,184, 89,217, 43, 15,102, 44, 56, 70, 37,191,100,208,163,210,163, 45,
-222, 85, 76,168, 74, 82,220,153, 87,173, 84,156, 72,  1,218,172,250,188,153,211, 37, 41, 41, 74, 21, 34,123,133,180, 33, 28,168,
- 78,200,105,105,106,151,168,168,158,174,121,234,170,101,105,234, 42, 93,164,145,216,221,157,220,150,102, 98,119, 44,204, 73, 39,
-185, 56,189,233,169,169,232,233,169,232,233, 97, 90,122, 90, 84, 88,227,141,  5,149, 35, 69, 10,136,160,108, 21, 84,  0,  7, 96,
- 48,180,180,180,180,142, 23,194,210,210,210,208,192,194,210,210,210,208,192,194,210,210,210,208,192,194,210,210,210,208,192,194,
-210,210,210,208,192,194,210,210,210,208,192,194,210,210,210,208,192,194,214, 53,117,217,246,213,239, 67,171,219,183, 69, 34, 21,
- 94,149, 91,165, 79,163, 84, 24,146,195,107,113,112, 42,113, 93,135, 45,182, 95, 41,231,142,178,203,206,114,173,  5, 42, 66,136,
- 82, 72, 80,  7, 89, 46,150,178, 24,169,  5, 77,136,238, 48,  8,  7, 98, 46, 49,196,171,235,133,221,241,219,202,252,170,  5,  5,
-186,133,255,  0,110, 54,227,142, 91,183, 24,180, 43, 87,  5, 89,218, 66,156, 34, 28, 91,130,109, 22,174,210, 93,171,176,128, 27,
-113,199, 24,105,215,249,  3,170, 47, 40,169,247, 49, 56,124, 52,111,189,235, 81,137, 67,173, 91, 85,184,244, 57,175, 52,212,250,
-127,240, 58,177,105,211,231, 52,181,  0, 89,174,220, 21,122,163,202, 77, 11,186,164,199, 97, 13, 46, 66, 17,224,173,197,178,183,
- 24,123,188, 58, 90,146,167, 20, 85,172, 74,141,  2, 59,168,182,162, 91,115,107, 92,168, 54,223,184,232,119,216, 13,176,222,114,
-248,203, 92, 57, 11,126,155,126,  7,249,225,157,217,141,156,160,236,245,178,138, 85, 60, 53, 50,183, 53, 12, 57, 94,173,134, 82,
-202,230,190,210, 57, 90,139, 21,176, 63,193,105, 44, 36,169, 17,217, 29,  0, 37,106,202,214,163,167,139, 75, 75, 81,233,166,150,
-162, 87,154,103, 50, 73, 33,185, 39,231, 96, 58,  0, 54,  3, 97,182, 55,149, 85, 20, 42,139, 42,244,194,210,210,210,210, 88, 54,
- 22,150,150,150,134,  6, 32,111,253,251,111,253, 25,127,246,206,255,  0,117, 13, 84, 31, 77,167, 61,189,153,157,251,127,142,111,
-251,168,234,  6,201, 25, 61, 71, 79,216,116, 66,  7, 92,227,160,237,253, 29,191, 61,180,202,213,149,  2,195, 94,231,220,191,150,
- 52,249,178,126,215,224, 63, 44, 79, 25, 63, 77,151, 39,255,  0,  6,119,218,127,150,103,111,251, 41,107,223,247,236, 95,244,103,
-255,  0,219, 47,253,212,245,  4,  4,  2,  7, 95, 63, 47,223,170,169, 25, 61,186,122,250, 31, 81,243,210,126,219, 83,255,  0, 19,
-240, 95,203, 24,230,201,127,181,183,192, 98,119,163,233,176,103, 24,246,104, 30,163,167,248,229,121,231, 24,255,  0, 53, 62,250,
-168, 62,154,225, 35,175,179, 71, 31, 47,229,149,254,234,154,130, 42, 65,207, 67,215,212,255,  0, 96,209,  9,238,  1, 57,207, 66,
-113,249,198,136,213,245, 67, 97, 37,143,253, 43,249, 99, 60,217, 45,187,126,  3,242,196,238,  7,211, 87,201,199,247, 52,251,255,
-  0,207, 39,240,255,  0,146,174,190,171,233,171,114,130,127,185,167,159,151,242,200,255,  0,117, 93, 65, 69,  9,235,159,151, 79,
-207,231,190,171,  4,115, 15,151,207,215,229,233,211, 26, 76,230, 21,118, 63, 93,254, 85,254,156, 37,237, 18,245,215,248, 15,203,
- 19,165, 79,211, 89, 73,  4,159,102,170, 83,233,158, 50,135,207,254,106,191, 45, 18,215,211, 80,241, 19,205,253,205, 94, 80,123,
-127,142, 62,115,255,  0,101,109, 65, 56, 67,100,168, 18,128,163,223,185,239,242, 25,237,223, 87, 54,211,203,202,  0,  0,118, 29,
- 49,229,158,131,238,210,103, 49,173, 22,250,254,191,225, 79,233,198, 13, 68,189,155,240, 31,150, 39, 74,159,166,146, 79,127,102,
-191, 47,111,249, 99,122,255,  0,213, 99, 85, 71,211, 69,207,250, 54, 71, 94,199,249, 98,244,199,175,249,172,106, 11,137,  0,145,
-159, 63, 79,199,240,209, 41,  7,203,  0,118, 57,237,143, 77, 96,230, 85,191,241,191,202,159,211,140,123, 76,223,183,248, 15,203,
- 19,158,254,253, 11,254,141,175,251, 98,127,186,206,189,143,166,127,144, 15,247, 54,241,159,249,225,255,  0,186,214,160,208,144,
-  8,234,123,244,199,237,253,218, 36, 39, 29,124,250,119, 29,189,116,145,205, 43,199,251,255,  0,242, 39,187,252, 56,199,180,205,
-109,218,196,123,135,229,137,201,143,166,116, 79,250, 55, 15,111,252,240,187,127,217,107, 94,199,211, 56, 39,191,179,119, 29, 51,
-254,120, 95,111,127,241, 91,233,219, 80,111, 66,135,111, 60,254,  7, 24,209,  8,238,125, 72,239,223, 31,119,231,182,138,115, 90,
-253,254,190,214,255,  0, 10,127, 78, 11,237, 51,116, 50, 88,250,233, 31,150, 39, 26, 62,153,166,112, 71,179,131, 57,237,142, 48,
- 63,221,115, 94,135,211, 49, 57,  0,251, 55,241,156,227,252,112, 51,219,254,171,154,131,194, 82, 70, 48, 64,232, 51,143, 33,242,
-252, 52, 66, 49,158,191, 96,244,255,  0,142,136,115,108,195,114, 42, 46,  7,248, 19,250, 48, 95,107,159,246,255,  0,  5,252,177,
- 56, 65,244,203, 15,159,179,135, 31,245,191,207,255,  0,149,221,122,254,252,175,166,127,185,197,246,143,229,127,219,211,254, 75,
-218,132, 10,112, 10,114,160,  9, 29,  7,168, 61,127,167, 94,243,144, 72,238,122,100,244,207,207, 69,253, 47,152,255,  0,204,127,
-146, 63,233,198, 13, 93, 64,255,  0,121,248, 47,229,137,189,127,126, 89,255,  0, 71, 16,255,  0,239,127,229,235,254,107,186, 95,
-223,150,127,209,197,255,  0,107,255,  0,247, 93,212, 32,130, 70, 78, 83,156,121,142,227,167, 97,235,175,129, 39, 36, 96,158,227,
-228, 15,174,116, 63, 75,230, 63,243, 31,228, 79,233,198, 61,174,163,175, 50,254,235, 47,229,137,191,255,  0,126, 86,112, 79,247,
- 56,187, 99, 63,227,127,235,216,255,  0,154,238,144,250,101,100,228, 15,103,  9,200, 56,255,  0, 59,241,143,159, 95,228,189,168,
- 65, 28, 19,201,158,160, 12,125,189, 71, 93,124,228, 56, 61, 58,142,199,215,215, 67,244,190, 96,127,246,143,242, 39,244,227, 34,
-170,163,188,157, 61,195,242,196,224, 26,250,101, 42,117,105, 66,125,155,238,173, 74, 90, 16,134,216,226,229,114, 31,117,110, 45,
- 45,180,204,120,237,112,184, 87, 34, 67,142,173,  8,109,180,  2,183, 28,113, 40, 64, 42, 80, 26,145,125,139,237, 28,187,106,123,
-107, 97, 92,219,161,195,163, 59, 99,184,215, 61,173,  2,228,186,182,189,141,220, 55,106,172, 25, 85, 68,137, 81,173,154,141,204,
-118,206,154,106, 53,248,244,231,225,154,131,105,167, 50,136,178,214,252, 70,220,146, 35,151,215,249,251,123, 18,120, 79,167,111,
-111, 18,114,247,186,251,163, 49, 85,218,222, 24,163,210,111, 53,194,156,128,245, 62,228,222, 74,163,175, 29,169,183,157, 96,172,
-  9,108, 83,222,131, 80,184,101, 52,174,132,209, 41,225, 89, 75,196, 25,105, 85,110, 39,101, 73,126,161, 41,197,174, 75,239,169,
-114,139,171,241, 63,239,176,162,251,170, 86,121,157, 65, 89,113, 67,  7, 35,169,  4, 18,115, 82,113,247,137,217,238, 79, 87, 22,
- 91,147,230, 34, 26,136,198,185,156, 69, 79, 33, 23,221, 80, 44,145, 56,  6,222, 98,116,157,153,122,110, 71, 99,125, 27, 60, 13,
-161,241,  3, 47,175,226,174, 50,162,122,236,146, 71, 48, 81, 64, 36,150, 14,107, 70,214,150,114,244,239, 20,133,117,222, 36, 93,
- 65,110,172, 77,203, 45,186,186,215,180, 61,151,139, 72, 78,210, 40, 56,230, 50,147,125, 47,149, 37, 77,151, 65,231,254,  5, 97,
- 72,  9,229,201,242,231, 29, 51,240,235, 38,139,199, 80,146,160,145,181,193,  5,104, 75,168,255,  0,223,202, 78, 90, 39,195, 82,
-214, 13,164, 11,120,116,164, 96,142,161, 65, 94,120,215, 37, 97,212,227,199,149, 78,  9,151, 17,105,146, 42, 43,109,228,184,158,
- 66,150,152, 96,162, 49, 81, 60,133,229, 15, 16,124, 93, 73, 25,192,198,117,127,135,119,198,133, 85,181,154, 92,152,232, 50, 28,
-186,224, 45, 77,133,168,134,145, 77,106,160,134,156, 25,228,241,210,136, 43, 91,107, 60,205,168,199, 90, 80, 50,188, 26,248,120,
-191,199, 91,223, 62,222,224, 91,217,168,122, 27,111,255,  0,163,123,205,183,183,173,183,183, 70,215,125, 26,252, 47,211,253,139,
-131,216, 17, 28,143,189,110,104,215, 17,164,174,118, 53,123,111, 17, 95, 80, 78,224,219, 29,102,143,198,144,125,124,131,109, 74,
- 72, 74, 85,145,120,165,105,198, 84,135,  7, 50,109,142,133, 46,164,167, 31,102,112, 78, 53,145,195,226,200, 74,117, 13, 42,195,
- 67, 36,164, 41,197, 27,185, 11, 13, 21, 41, 73,194,147,252, 30, 10, 94,  8, 28,197, 41, 32,  5,103, 39,166,121,115,  2,240,167,
- 70, 20, 80,180,187,134,229,185, 73,145, 29,134,150,242,101, 73,157, 30, 64, 97,134,152, 42,230,117,245, 61, 19,152,140,164, 39,
- 42, 42,  1, 32,105,211,165, 85, 16,235,177,228, 37,200,205, 55, 48,170, 47,130,211,169,144,168,175,186,194,157, 76, 57, 13,129,
-240,203, 11,104,243,140, 39,147,168, 74, 84, 64,202,195,197,222, 56, 99,182,126, 45,113,183,178,209,131, 98,  7, 66,105,253,247,
-233,115,110,128,  3,138,247, 55,240, 35,129, 40,195, 21,225,118,129, 72,107, 19, 85, 94,119, 82,194,219,213, 27,146,171,175, 96,
- 71,152,124, 11,113,237, 58,246,213,110,191,179,158,220,176, 55, 74,  7,  3,  3,126,182, 34,238,121,155,106,229,220,202, 87, 17,
- 78, 89, 19,118,199,113,165,190,239,212,246,205,239,105,183,176,245,193,  6,220,171, 67, 74, 62,167,174,138,129,141, 46,106, 28,
-166,201,143,  6, 89,138,153,124,121, 63, 76,188,131,211,217,192,  8,233,212,113,129,228,124,255,  0,205,115,211, 93,240,187,108,
- 11, 23,121, 44, 27,215,104,183, 62,212,167,238, 22,218,110, 61,183, 91,177,239,203, 66,160,208, 85, 46,224,160, 85, 98,  2,253,
- 61,213,161,121,131, 48, 56,162,244, 73, 72, 34, 68, 57,212,248,242,227, 45,183,153,109, 73,252,231,120,230,246,106,239,183,  6,
- 60, 82, 94,220, 62, 83,108,205,193,221, 91, 81,182, 13,241,179, 87,213,187,104,220, 55, 36,155,231,104,106,242,164, 10, 21, 78,
-166,154, 13, 41,239, 10,232,165,186,219,212,154,235,124,169,228,168,210, 87, 32,  1, 30,100,114,171, 79,131, 60, 72,204,115,136,
- 37,165,205, 43,  2, 87, 83,141, 66, 67, 28, 72,146,161, 61,172,129, 53,165,192,178,216, 50, 16, 84, 54,151,115,201,126, 41,240,
- 67,240,133, 90, 87,229,108, 70, 77, 84,193, 66, 19,169,160,115,246, 86,238, 90, 66,143,111, 41,114, 72,109,181, 29, 64, 44,156,
-255,  0,191, 47,234, 71,247, 56, 71, 65,159,243,192,245,237,255,  0, 37,221,124,254,252,192,255,  0,251,184, 58,127,233,129,251,
-191,146,230,161, 89, 94,176, 47,187, 81,114, 17,117,216,247,149,174, 99,171,195,147,252, 35,181,171,244, 20,198,115,152,128,219,
-235,171,211, 88, 13, 56, 84,  8,  9, 81,  4,144, 64,  7, 88,123, 74, 75,159, 19, 69, 14,164, 21,  0,180, 45, 46, 36, 20,146, 20,
-  9,109, 68,  2, 15,124,246,212,249, 51,218,185, 55,142,181, 92,123,132,103,248, 46, 42, 15,110,150,246, 51,  0,111,208,133,191,
-238,181,241, 56, 81,244,203,137,239,236,225,192, 29,201,226,255,  0,215,254,171,186,248,126,153,120, 29, 15,179,135,175,203,139,
-254,159,143,242, 93,212, 32, 71,158, 48,  9,235,223,204,253,191,118,188,167, 39,161,193,199, 83,242, 36,159,221,165,127, 75,230,
- 63,243, 31,228, 79,233,193,189,170,162,223,222,111,255,  0, 72,252,177, 56,  1,244,203,201, 56, 30,206, 14,191,250, 95,255,  0,
-186,238,190, 43,233,152,  4,128,127,185,195,159, 80, 56,191,234, 62,223,241, 93,212, 32,142,124,128,239,248,116,243,251,245,224,
-  2, 84,115,211,  3,186,122,117, 63,111,200,157, 15,210,249,143,252,199,249, 19,250,113,159,106,159,254, 39,224, 63, 44, 78, 11,
-251,242,241,128,127,185,197,247,127, 43,254,191,183,133,221, 47,239,203,198, 79,253,206, 35,129,231,252,175,186,125,255,  0,226,
-187,211, 80,130, 66, 58,149, 12,115,116,  4,159, 63,159,111,206, 53,240,167,226,206, 58,142,135, 29,189, 58,232,126,151,204,127,
-230, 63,200,159,211,129,237,117, 31,183,248, 47,229,137,190, 15,166, 96,  9, 35,251,156, 36, 99,204,241,125,223,236,255,  0, 21,
-237,123, 31, 76,184, 28,127,220,226,239,156,127,141,247,167,127,249, 47,106, 16, 24,207,151,108,247,244,199, 92,126,124,181,244,
-117,192,232, 61, 63,183,166,135,233,124,199,254, 99,252,145,255,  0, 78, 49,237, 85, 23, 31, 89,248, 47,229,137,191,143,166, 88,
- 79,250, 56,122,245,233,252,175,255,  0,163,252, 87,122,235,233,250,101,100,119,246,112,227, 63,243,191,235,248,127, 37,221, 66,
- 19,  3,190, 50, 71, 94,159,213,159,150,190,247, 32,249,119,193, 25,253,190, 93,244, 63, 75,230, 63,243, 31,228,143,250,112, 61,
-170,163,254, 39,224,191,150, 38,238,126,153,113, 31,232,224, 56,245,254, 87,248,253,159,201,119,166,169, 43,233,153, 17,254,141,
-252,140,227, 63,203,  3, 30, 93,255,  0,205,115, 80,137, 32,156,156,  0, 51,142,224,117,245, 61,123,245,213,  5, 32, 17,128, 51,
-158,253,127, 63,145,172,254,151,204, 44,127,180,111,255,  0, 68,127,211,140,251, 84,255,  0,183,248, 15,203, 19,121, 63, 76,212,
-130,113,236,221, 39,  7, 31,231,129,248,255,  0,201,111, 95, 15,211, 55, 35,183,179,120, 30,153,255,  0, 60, 47,217,254,107,125,
-245,  7,245,128, 51,129,133,119,198, 14, 62,255,  0, 77, 10,172,140,244, 29,122,244,245, 31,111,111,237,209,151, 54,175,239, 83,
-123,255,  0,129, 63,167, 25,246,169,251,191,224, 63, 44, 78, 33, 95, 76,228,167,253, 27,185, 30,191,203, 11,253,214,245, 72,253,
- 51,220, 28,127,115,115, 63,245,194,255,  0,117,175, 77, 65,216,247,233,128,113,149, 30,227, 30,127,111,150,188, 16,112,114,  0,
-207, 92, 14,248,249,244,232, 59,232,227, 53,175, 32, 30,127, 95,240,167,244,224,235, 81, 49, 23, 50,126,  3,242,196,226, 85,244,
-208, 57,127,209,181,145,235,252,176,255,  0,221,103, 84,207,211, 67, 35,253, 27, 63,135, 24,191,238,177,168, 57, 45, 35, 56,193,
-193, 29,252,191, 31, 95,234,208,235, 73, 57,230, 30,125,255,  0,163, 74, 46,103, 90,127,223,127,149, 63,167,  0,212,205,183,155,
-175,184,126, 88,156,137,250,105, 24,200,254,230,199,108, 99,252,113,123,255,  0,217, 99, 84,213,244,210,249,127,209,175,159,250,
-227,126,239,228,175,168, 52, 41, 61, 72, 62, 89,255,  0,142,168, 41, 56, 62,164,103, 31,126, 58,232,227, 50,173,255,  0,141,127,
-251, 83,250,113,145, 81, 41,232,255,  0,128,252,177, 57,179,244,211,113,219,217,173,147,233,252,177,255,  0,221, 95, 94, 15,211,
- 80,198,127,238,106,246,242,254, 88,253,127,254,213,181,  6,  5,142,164,147,229,220,116,200,251, 71, 97,211, 84,150,  6, 51,159,
-179,211,246,104,227, 48,172,218,243, 94,253,244,175,244,227, 62,209, 55,237,254,  3,242,196,231,207,211, 85, 32,103,251,154,121,
-199,252,242,113,255,  0,229, 87, 84,149,244,214, 72,255,  0, 70,150, 71,254,153, 61,191,236,169,168, 45,169, 56,237,219,247,143,
- 95,191, 67, 44,117, 35,  3,175, 92,104,195, 48,171,190,242,237,255,  0, 74,254, 88, 56,158, 75,253,187,253,195,221,238,196,233,
-215,244,215,249, 15,254, 13, 12,143, 95,229,149,251,191,146,159,174,168, 31,166,202, 57,185, 71,179, 56,159, 60,255,  0, 44,190,
-159,179,133, 62,250,130,147,205,243,116, 35,207,203,167,159, 76,103,203,250,244, 42,153, 60,221,200,  3,183,150, 62,206,158,154,
- 88, 86,212,216,125,109,255,  0,237, 95,203,  6,231, 73,183,159,240, 24,157,183,247,236,196,140,143,102,104,199,110,188,102,224,
-231,211, 31,201, 71, 94, 15,211,105,229,239,236,204,199,253,115,191,221, 71, 80, 71, 82,  0,206, 51,208,227,167, 94,222,154, 25,
-105, 72,  7, 35,174,124,242,122,252,243,246,104,235, 89, 57, 27,203,191,192,126, 88,199, 58, 77,183,189,253,195, 19,188,254,253,
-183,254,140,191,251,103,127,186,134,150,160,120, 80, 60,142, 63,111,239,210,209,253,170,163,254, 39,224,191,150, 13,205,147,246,
-191,  1,249, 99,234, 65,  0,  3,249,235,162,146, 15, 64,123,244, 31,156,106,138, 70, 79,203,207,243,246,232,132, 12,159,179,175,
-223,157,105, 22,185,191, 75,116,194,120,174,  1, 61,189,113,249,249,106,176,  0, 96,121,121,254,253, 83, 70,122,244,200, 36, 12,
-231,183,231, 58,174,144, 14,115,158,131, 61, 52, 76, 12,123, 74, 74, 73,234, 49,249,252, 52, 66,  7, 76,250,254,204,106,130, 50,
- 71, 92,224,158,153,235,223,231,231,253,154, 41,180,246,  7,203,169,252,253,186, 65,141,205,241,131,176,191,166, 43,163, 29,135,
-197,143, 79,159,217,162,144,140,142,131,  3,207,237,253,231, 84, 17,208,244,  3,175,125, 20,140,253,223,191, 68, 98, 69,192,194,
- 36, 91,248,227,210,  7, 98, 79, 83,230,122,244,253,253,180, 72,193,  3,207,211,167,159,110,218,164,145,147,246,117,209,  9,237,
-140,128,  1,200,251, 71,223,219, 73, 49,185,233,108, 99, 21, 18,  0,193,193,235,223, 61,241,233,162, 83,140, 14,157, 60,134,124,
-191,118,168,164,115, 31,219,247,116,237,162, 80,158,163,167, 65,235,162,147, 97,115,219,  4,244, 23,177,255,  0,199,207,250, 98,
-170, 64,242,  3,229,162, 82,  9,192,249,119,249,252,245,118,183, 45,171,130,238,172, 83,173,203, 86,135, 85,184,238, 26,180,164,
-196,164, 80,104, 52,233,117,122,213, 90, 99,129,106, 68, 58,109, 46,158,203,143,206,146,164,161,100, 33,180, 40,242,182,165, 16,
-  2, 73,213,222,187, 99, 94,182,156,151, 98, 93, 54,117,215,108, 74, 96,148, 63, 30,227,182,235,180, 39, 90, 90, 78, 20, 28, 77,
- 82,158,215, 41,230,  7, 90,109, 60, 43, 32,137,165, 81, 43, 11,133, 36,106,181,237,123,117,183,107,224,250, 36,229,180,162, 54,
- 49, 41,179, 56, 83,164, 27, 94,197,173,164, 27, 88,218,247,182,248,198, 80,144,123,128,  8,207, 65,220,156,249,122,157, 86, 70,
- 62, 33,143,179,215,239,252, 63,110,188, 32, 18, 50,217, 14,  1,220,161, 73,115,211,185, 65, 56,237,162, 27, 73, 86, 58,128,125,
-  7,127, 95, 61,101,136,223,126,191,127,195, 26,250,131, 11,131,127,120,239,138,168, 73, 56,233,212, 12, 30,190, 64,234,179,125,
- 79,108,128, 65,  3,191,221,251, 53,245, 40,236, 58,103,190,122,253,191,187, 85,144,140, 43,169,  3,207,228,114, 15, 95,217,164,
-240, 49, 84, 39, 42,193,232, 59,129,129,148,140,118,207,225,175, 74,108,245,  4,242,143, 47, 81,233,175,160,149,103, 24, 10,245,
- 30, 99,243,231,175, 67,174,  2,178, 51,230, 48,123,121,159,195,246,235, 24,199,195,174, 40,165, 56,206, 85,212,156,142,157,254,
-204,246,215,148,164,  2, 50,163,223,238,235,242,243, 58,172,224,201, 29,122,122,142,157, 51,140,159,151, 93, 92,168,148, 58,189,
-195, 84,167, 81, 40,116,202,141,102,177, 88,152,213, 58,145, 73,165, 65,153, 85,171, 85,170, 18, 20, 16,196, 10, 77, 42,  3, 46,
- 72,169,206, 90,136,  8,101,134,214,226,179,209, 58,195, 50,162,150,118, 10,171,185, 39, 96, 48, 91,133,  2,231, 97,181,254, 54,
-183,239,197,153, 93,240, 57, 64, 30,106,  3,174, 51,128, 61, 53,233, 88, 67, 69,215, 84, 27,101, 56,241, 29, 89,  8,105, 40,238,
-165, 21,172,129,140,103, 82, 39,224,247,232,242,113,  5,186, 44,209,175,126, 45,110,120,252, 41,109,245, 65, 45, 76, 98,212,168,
-192,137,115,111,205,126, 34,210,167, 80,219, 22, 95,189, 38, 13,132,167, 80,143,133, 85,151,221,152, 18,178, 69, 47,152, 99, 82,
- 25,217,126,  4,125,158,220, 32, 70,111,248,177,225,226,214,187,174,202, 84,112,204,221,208,222,132,198,220,171,212,205,121,104,
- 12, 72,241,238, 54,151, 77,163,211,164, 45, 56,103,220,169,241,154,109, 74,229, 79, 82, 64,134,103, 28,115,148,101,101,145, 24,
-213,204,187, 89, 14,215,247,144,  9,248, 27, 91,212,226,216,224,191,  5,184,251,142, 12,111,150,229, 38,134,142, 80,  8,158,164,
- 20,  4, 18,  0,100,140,217,216, 94,195,204, 99,185,176, 23, 36,  3,170,254,203, 46, 26, 46, 77,165,224, 39,102,233,180,203, 98,
-123, 55, 94,240,135,247,210,247,144,229, 50, 82, 28,149, 42,249, 17,191,130, 80, 39,169,184,229, 79,197,133, 96,194,183,154,100,
-100, 99,197,117, 73, 37, 43, 81, 86,234, 87,236,203,238,132,204, 33, 46,221,170, 32,138,139, 45, 45,243,  6, 98, 99, 20,165,137,
-143,123,195,179, 60, 34, 27, 65,240,249, 15, 57, 79, 42,214, 17,130, 72, 35, 99,155,223, 42,234,221,136,202,101,194,143, 66,171,
-184,105,112,211, 76,  5,132,211,101,181, 28,123,180,100, 71, 82, 83,238,168, 82, 80,227,  9, 67, 73,  8, 14, 54,132, 97,180, 20,
-130, 37, 39,125, 42,234,171,170,153, 34,124,151,131,206,170, 19, 32, 54, 57,101,207,141,200,137,172, 48, 57,190, 37,  8,222, 27,
-165, 60,170, 39, 42,  9, 10,109, 42, 35,158,243, 89,104,243,106,250,186,249, 38,156,203, 86,236,231,104,202,139,157,149, 87, 85,
-236,  1, 10,190,110,130,198,230,248,244,231,129,168,248,183,129,184,107, 38,225,202, 14, 30,163,155, 47,200,105, 99, 77, 38, 89,
-121,146,114,215, 68,146, 59,  8,236,178, 22, 87,121,  1, 82, 69,181, 95, 73,  7, 26, 81, 90,169, 61, 79,168,208,167,204, 91, 44,
-184,170,148,168, 83, 66, 11,141, 70,124, 78,167, 84, 35, 51, 29,198, 66,130, 11,  8,121,168,165, 36,146,181, 41, 14, 44, 21, 40,
-224, 88,100, 92,178, 84,252, 41, 12, 58,134,169,236,223, 20, 56, 17, 31, 91,158, 31,213,209,106, 45, 85,162,212, 38, 53,239, 67,
-159,220,194,222,100,171,  9, 37, 41,111, 45,133, 37,120,214,238,238, 21,145,110,110,237, 53,104,141, 18,147, 65,187,160,213,226,
- 84,226, 75, 44, 52,154, 77, 70,163,111,200,247,152,240,235,208,227,114,167,192,113, 14, 20, 25, 44,164, 59, 28,191,226, 56,135,
-145,206,141,115, 74,240, 69, 70,139, 58,226, 93, 94,157, 42,151, 38,217,171,209,163,191, 18, 75, 72, 91,241,167,211,107,148, 86,
-235, 13,120,141,225, 15,143,117,147,200,218,176,158,118,242,164,158, 78,241, 42,202,121,105,230, 69, 46, 37,138, 83,229, 96, 54,
- 39, 96, 53, 11, 27, 48,191,217, 61,150,247, 32, 99,163,184, 11, 53,202,248,178,154, 72,228,131,244,126,105, 66,170,147,211, 72,
-202,218, 17,229, 26, 94, 18,  8, 15, 27, 23,116, 14,187, 34,  6, 89, 17, 67,170, 54,206, 82,238,185,177,160,198, 76,229,153, 13,
-208,110, 74,  4,198,235, 44, 56,149,128, 69,106, 35, 41,155, 33,  8,201, 46, 37,233,173,153,  1,226, 91, 60,203, 41, 39,176,223,
-221,171,219,215,238, 40,178, 42,213,233, 10,163,209,233,181,  8,142, 38,114, 84,251,110,185, 54, 35,209, 31, 13,197, 91,138, 79,
-143,206,150,212, 57,242,124, 38,229, 16, 84, 73,240,213,204, 75, 50,143, 87,173, 84,164, 89, 20,181,168, 46,225,151, 26,159, 71,
-109, 65, 14,184,229,111,223,226,166, 53, 41,224,179,148, 64,114, 79,132, 90,113, 73,200,104,184,146,174,118,146, 79,101,175,201,
-205,219,204,155,102,128,180, 26,125, 18, 28,150, 98,195,105, 10, 14, 85, 92,139, 49, 44, 74,113, 69,160, 66,149, 34, 98, 36, 58,
- 20, 83,202,178,235,104, 56,  3, 26,125,225,170,120,167,231,215, 85,141,112,211,105, 68, 66,108, 25,200, 98,  1, 35,204,  2,129,
-118, 32,139,221, 73,211,171, 88,164, 60,112,168,124,170,167, 38,200,178,103, 72, 51, 44,237,231,149,166, 81,253,213, 50, 10, 79,
-172, 10, 67, 42,201, 44,175, 42,128,126,168, 90, 67,176, 82, 27, 44,157,124, 91, 86,163,172,210, 40,209, 33, 66,112,182,149, 48,
-228,143,  4,186,243,202,144,134,136, 71, 50, 71, 59,195,196, 43,253, 81,128,121,143, 54,  9,213,  9,123,191, 49,153,245, 55, 35,
-206,109,168,116,233,113, 41,236,173,165,115,203,126,108,150, 24,126, 66, 34,165,149,164, 32, 41,215,163,182,233, 78, 22,166,155,
- 90,143, 48,108,145,165, 85, 75,154, 37, 70,161, 46,164,219,243,155,165,183, 95,162, 83, 41,204,184,183, 31,120, 38,  3,190, 45,
-101,232,203,231, 40, 76,115, 83, 50,127, 74, 20,164,143,112, 40,242,  9, 31, 98, 92, 79, 79,129, 78,140,203, 11,121,138,245, 72,
-215,101,185, 49,196, 39,158, 19, 18, 21, 36,165,158, 84,115,163,196,105,234,116,116, 44,252, 60,143,172,114,249,234,105,237,243,
-234, 88,226,151,149, 96, 84, 34, 93, 22,215, 29,128,  4,  3,181,141,183,216,168,177,185,166,163,240,166,136, 67, 12,245,145, 53,
- 84,238,  0,153,166,177, 96,204, 18, 87, 55,144,155,186, 70,146, 43, 45,216,107,212,  1, 59, 91,122,169, 91,167, 70,186,227,184,
-197,203, 10,131, 87,163,189, 10, 69, 85,214,171,148, 90, 69,113,166, 35, 70, 56,136,137, 81,234,204,184,151,100,173,214,164,200,
-104,  6,254, 24,254, 26,193, 30, 33,214,177,238,127,  2, 62,206, 30, 34,208,151,119,167,131, 14, 31,170, 51,171, 76, 70,150,170,
-189,  2,208,133,100, 93, 16,152,156,135, 92, 15,166,232,176, 13, 54, 74,101,165,135, 57,220, 33, 69, 97,249, 39,169,192,  0, 26,
- 93,210, 95,153, 46,142,195, 48,212,207,240,138, 76,170,188,247,144, 86,212,166, 41,209, 88, 17,109,147,200,217,240, 91,113,230,
- 10, 86,128,162,166, 98,165, 96, 97,201,  9, 78,178,250, 69, 65,249,177,152,150,228,245, 53, 78,141,239,234,159, 40,211,220,125,
-234,189,102,123,128,204,166,210,121, 79, 70,152, 89, 40,114, 90,121,185, 11, 65,166,199,232,221,121,189,200,179, 42,152, 93, 92,
- 75,230,181,135,235, 18,204, 69,152,107,221, 75,  2, 72,234, 69,174, 46, 14, 32, 60, 65,225, 38, 67, 80,102,246,156,185, 96,142,
- 64,186, 65, 26,216, 43,  6, 40,  6,149,221,157,212, 46,150, 93, 69, 68,110,116,131, 41,199, 40, 55,231,232,175,112, 39,186, 52,
-233,149,158, 27,247,143,120, 56,116,174,173,153, 18, 34,210,174, 57,144,247,130,194,102, 74,185,149, 26, 52,200, 23, 10,162, 86,
- 96,176, 86,182,130,146,213, 93,197,161,183,  1,  8, 39,149, 38, 53, 60,110,123,  1,189,162, 92, 20, 64,171,222, 82,246,226, 47,
- 16,123, 65, 75, 15, 72,127,116,120,126, 77, 82,239, 20,202,115, 40, 46,174,117,219,183,111, 65, 69,126,215, 97,  8,232,243,169,
-139, 58, 27, 74, 74,185,166,114,142, 99,250, 18,209, 46,181,183,224, 68,113,102, 52,106,107,177, 37,200, 76, 89,105,113,113,218,
- 56,118, 12, 55,101, 50, 10,230, 23, 86, 85, 37,215,208, 22,167,192, 67, 77,169, 69,206,125,108,205,177,123,137, 81,132,228, 77,
-240,230, 79,154,105,244,170, 68,172, 70,170, 45, 44,243, 23,229,205,128,165,133,198, 42, 67,110, 60,176,176,144,220, 86,155, 75,
-156,175,184, 82, 37,249,111, 22, 85, 64,218, 42, 36, 46,150,235,171, 86,247,176,186,185,  5,172, 47,228,140,198, 46, 44, 72,234,
-121,147,139, 60, 39, 92,176,153,168,117, 68,140,198,218, 71,144,  3, 98,138, 64,212,159,103, 84,140,214,  0, 32, 12, 28,131,124,
-126, 50,105,198, 21,146, 20,  2,150,143,132,228,  7, 26, 81,109,214,212, 65,248, 92, 74,194,146,164,156, 20,169, 37, 42,  0,131,
-165,219,161,234, 58, 18, 58,228,124,254, 71, 95,166,111,180,163,216, 17,194,  7, 31,240,238, 45,193,218,248,212,110, 26,248,173,
-144,137, 82,206,229, 89, 52, 54, 25,176,183,  2,186,219, 40,113, 49,183,135,111,169, 74,106, 53, 73,215,223,228, 75,245,122,111,
-187,214,152, 50, 20,235,206, 84,  2, 61,217,127,158,255,  0, 24,156, 20,241, 33,192,134,239,206,217, 30, 38, 54,238,125,139,118,
-182,211,245, 43,118,166,211,159, 90,217,123,137,109, 53, 37,113,155,187,182,234,235,101,180,177,115, 80,148,226, 64,116,  0,220,
-200, 46,171,221,234, 49, 34, 72, 30, 25,177,178,252,214,159, 48,137, 36,141,135,159,161,  6,234, 78,231, 77,251, 48,  0,221, 90,
-199,202,197,117, 32,214,105,170,234, 26,172,186, 65, 29, 84,101, 65, 54, 87,177, 10,215, 32, 13,141,138,150,236, 14,199,245, 75,
-111,141, 87,232,  7, 78,223, 46,186,240,164,147,156, 28,  3,215,  4,145,249,235,175, 68,129,142,189,  7, 76, 99,191,151,125, 32,
- 65, 39, 61, 71, 76, 36,140,103,167,252,116,233,141, 78,248,166, 18,  9,199, 92,122,143, 95,234,239,175,161, 36,250,244,200, 30,
- 93,115,158,191,142,170,121,127,171,248,116,215,196,144,  1,202,147,156,231,167, 92,228,232, 96,111,143,129, 56, 33, 89,201, 25,
-230,243,242,215,164,117,  4,143,135, 25, 61,115,251, 63, 29,125,233,140,254,206,216,252,245,215,209,215,246, 12,  1,220,121,253,
-253, 52, 48, 58,123,176,136,207, 68,245,233,231,142,164,103,246,106,130,219,198,  9,242, 61, 70,124,244, 78, 14, 58,140,121,  2,
- 70, 49,246,252,191,175, 84,207,110,131, 39,246,103, 63,212,127,167, 88,  6,255,  0, 17,140,224, 37,160,224,249,103,215,184,207,
-168,252,247,208,170, 64,  0,231, 36, 18,123,250,252,190, 90,184, 57,205,158,184, 61, 58,231,190,125, 58,121,245,208,238, 32,242,
-231,  4,117,232, 58,231,175,203,236,214, 65,232,122, 99, 32,158,221, 78, 45,197,  1, 39, 32,245, 29, 49,158,152,199,174,188, 20,
-231, 36, 28,121, 28,159,179,207,240,209, 42, 73,234, 20,  7, 79,245,123,146,126,126, 67,174,168,242, 12, 40,100, 99,166,  0,243,
-235,158,231, 75,169,184,235,131,168, 34,219,109,243,243,111,195,  3, 40,  3,212,147,129,248,125,186,160, 70, 70, 63, 35, 70, 41,
- 35, 56, 30,153, 63, 44, 13, 12,180,144, 73,  3,167,246,126,206,186, 81, 79,108, 24,216,116, 23,254, 71,  0,184,  0, 32,116,206,
-122,159,217,215, 31,158,154,162,160, 78, 58,100,103,175,175,221,163, 20,147,230,  7,221,216,158,250, 25, 89,201,230, 56, 39,183,
-207,211, 31,119,244,105, 92,  1,208, 95,113,129, 22,128,114, 64,199,200,249,250,140,104,117, 35,166,  6,  1,239,246,103,200,244,
-209,138,206, 65, 56,207,160,242,208,199,169,200,207, 95, 92, 14,221, 63,118,149,  7,160, 39,167,207, 95,158,248, 54,  5, 87, 76,
-228,103, 25,253,159,187, 66,172,116,206, 15, 78,216,253,164,244,237,211, 70,172,100,142,152,235,220, 30,253,124,255,  0, 62,122,
- 25,196,228,156,100,  1,208,227,182, 79,228,104,248, 50,250, 91,127, 92, 91,215,128,112, 14, 73, 39,167,161, 29,123,232,115,223,
-168,235,158,191,184,104,199, 19,144, 83,211, 62,126,189, 61, 63, 13, 12, 80, 70, 78,114,125, 15,225,223, 58, 89,122, 97, 81,107,
-  3,210,216, 29,105,243, 25,206,133, 90, 72, 39,183,153,251, 62,223,150,116,105, 25,251,186,250,103,228,126, 90, 25,105,206, 73,
-200, 62,126,125, 59,253,250, 85, 79, 91,157,176, 69,216,144,119,183,250, 96, 34, 48,113,165,175,107, 73, 39, 35,175,224, 52,180,
-174, 15,113,220,216,227,234, 49,143,233,209, 40, 24,  3,231,215,243,247,106,128,198,  6,  1, 31, 35,223, 85,211,204, 59,128, 49,
-233,223, 61, 58,233, 18,118,  3,231,221,140,226,178, 60,250,253,223,191, 85,209,220,253,157,189,127, 63,191, 84, 81,143, 33,215,
-204,234,178,  6,122,231,177,237,249,242,254,173, 16,157,137,190,  6,  8, 78,112,112, 70,  7,124,143,196,244,243,233,162, 27,234,
-126,239,234,213,  4,125,189,188,191,126,189, 18, 64, 86, 14,  8, 30,125,  1,207,244,255,  0,102,181,216,133,193, 78,224,142,199,
-  7, 54,115,211, 61, 62,206,158,126, 99, 69,164, 14,128, 16,123, 15,151,236,213,189,146,233, 74, 78, 19,142,153,251,112, 63,171,
- 71, 55,223,162,122,140, 28,224,246,249,233, 34,215,194, 71,174, 43,165, 61, 65, 57,232,123, 99,191,167,237,209,  9,  0,142,169,
-249,103, 39,175,175,217,170, 64, 18, 71,145,233,231,230,123,231,229,170,232,200, 36,116, 29,135,203,168,243, 62,103,182,176, 73,
- 61,123, 96,167, 21,209,156,  1,208, 14,195,241,243,249,104,148,  3,216,156,228,224,103,250,117, 65,160, 72, 29, 58,  3,231,163,
- 16, 58,231,175,203,211,211, 73,191,175,207,108, 99,107,145,181,206, 58,159,236,114,180, 36,215,120,223,178,238,166, 92,121,134,
- 54,178,207,191,175,249, 50,154, 42, 65,101,248,212, 39,104, 52,196,151, 17,213,181, 46,101, 96,132,144, 65,248, 62,103, 82,170,
-147,119, 79,171, 52, 99,214, 12, 27,130, 56,200, 92, 43,154,147, 73,175,197,113, 32,149, 96,181, 85,136,238, 83,215,166,114, 61,
-117, 30,111, 98, 93, 13, 12,206,226,110,249, 80, 74, 93,129,102,217,118,147, 11, 61, 22,147, 89,172,205,170, 73, 66, 84, 58,128,
-180, 66,104, 17,242,215,110, 85, 89, 62, 34, 74, 78, 18,162, 18,178, 78,  2, 72, 24,243,252, 53,207,158, 33,214, 52,188, 67, 60,
- 91,218,146, 56,163,  6,254,160, 73,191,190,242, 16, 55,233,143, 67,190,140,252, 57, 24,240,222, 10,185, 97, 89,  6,113, 87, 87,
- 57, 12,  1,  4, 44,130,152,  2,  8,181,138,211,143,223,140, 91,113,184, 80,224,223,122, 90,127,248,197,225,195,111,141, 78, 74,
- 74, 28,185,236,  6,100,109,189,210,202,149,255,  0,194, 25,155,109, 45,182, 30,116, 14,184,114, 58,193, 35, 36, 29,114,235,126,
- 61,136,232,153, 30,101,195,194, 78,234, 11,142, 74, 18,167, 81,180, 59,192,184, 84, 27,145,224,126, 38,225,219, 27,129, 13, 41,
-129, 85,124,254,171,109, 79,106, 42,220, 56,  5,240, 78, 79, 93,141,126, 51,110,161,151, 93, 72, 82,213,250, 21,147,128,162,159,
-242,172,156,116, 75,192, 96,143,245,128,214,109,101, 34,179,125, 87, 98,219,150,188, 73,117, 58,171,235,  8, 75,113, 88,113,228,
-190,130,160,148,  6,130,  7,194,176,163,212,158,137, 41,207,108,226, 37, 67,197, 89,254, 85, 44,107, 65, 92,242,128,109,202,127,
-172,140,251,130, 53,244,131,234,154, 77,174, 21,133,241,105,113, 79,128,254, 26,113,109, 13, 76,249,182, 65, 22, 83, 80, 16,177,
-174,164, 11, 73, 52,123,127,120,210, 70,162, 57,108,123, 78,146,165,250,169,223, 16,133,191,246,226,251,218,171,186,173, 97,110,
- 77,165,112,216,183,165,  5,229, 49, 86,182,110,106,115,212,202,172, 69,  5, 40,  7, 80,219,163,150,100, 37,129,150,164, 48,167,
- 88,117, 63, 19,110, 40, 29, 97,233,193,243, 24, 29,250,143,184,116,215,232,143,190, 62,204, 45,147,226, 95,110, 34,219, 28, 90,
- 85,225, 64,173,211, 34,  4,217, 87, 45,  7,192,123,116,108, 57, 14, 35,197, 13,193,172,182,131,239, 52,194,172,248,180,249,101,
-232,171,201,194, 80,172, 40,106, 85,157,236, 48,246, 94, 89, 49, 96, 11,150,111, 16, 59,185, 80, 43, 83, 18, 93,168,222, 84,251,
- 54,159, 41,214,155,241, 92, 81,129, 64,166,133,196, 36,117, 74, 67,170,207,108,116,206,173,202, 63, 17, 40,214,142, 55,205,233,
- 13, 21,112,217,227, 87,141,135,185,128, 46, 29, 67,117,210,202, 74,244,212,246,213,142, 20,207,126,143,124, 95, 14,119, 61, 31,
-  6,200, 56,195, 36, 55,104,107, 68,114, 83,  2, 59,199, 46,168,204, 70, 69,177,250,200,100,120,157,124,223, 84, 73,137, 96,225,
-130, 70,121, 22,  8,237,202,133, 96,250, 28,227, 72,168, 32,  0, 58,146,113,140, 31, 63,151,222, 53, 61,230,125,146,190,201, 76,
- 62,208,225,254,252, 87,128,217,112,248,251,193,118,173,197,  4, 39,152,242,173, 11, 29,115,211, 32,117,193,211, 69,186, 94,193,
-159,103,  5,247, 75, 55,  6,222,220,187,247,177,170,142,168,178, 84,212, 27,150,141,124,210, 39, 70, 74,144,228,182,226,199,187,
-233,222, 60, 23, 11,  1,196,  7, 82,242,195,107,113, 42,240,151,142, 83,177, 77,226, 46, 75, 83, 47, 41, 81,193,177, 55,242,216,
-  0, 46, 73,185, 22,183,223,238,190, 25,235,190,143,254, 42,229,177,123, 69, 87, 14,170,171, 21, 80, 22,161, 11, 51, 57,  1, 84,
-  2,160, 93,137,  3,114, 63,142, 35,  1,192, 79,179,155,127,248,252,190,165,208,246,210,151, 26,220,219,219, 90, 68, 49,185,187,
-209,119,179, 45,157,189,219,184,210,112,227,112,228, 57, 29, 33,219,162,244,145, 27,153, 80, 40, 80, 57,165, 61,128,236,151, 33,
-196, 10,146, 38,173,194, 71,  5, 92, 32,251, 61,109,198,127,137, 11, 71,248,111,187,134, 47,186, 92,156, 68, 95,208,233,213, 77,
-203,169,188,166,210,220,230, 45,176,210, 20,198,221, 91, 60,222, 42,147, 78,163,161, 14,132, 16,169, 50,102, 40, 41,100,251,  2,
- 70,221,108,222,222,208,118, 35,135,219, 98,141,182,187, 99,183, 80,221, 22,253,169,  5,240, 28,175,120,202,109,117, 43,158,224,
-172,168, 42, 69,193,113,212,166, 35,154,109, 86, 73,117,239,122, 88, 75,220,172, 22,219, 70, 15, 39,112, 35,202,153, 34,108,  9,
- 83, 16,228,242,167, 30,167,205, 67,209,101, 60,247, 40, 75,203,132,133,184, 16,103,115,  6,213,204,193,117,183,249,130, 73, 35,
-  5, 53, 87, 20,120,131, 91,154, 84, 73, 73, 68,198,158,137, 73, 10, 65,221,198,214,239,181,250,134,185,234,  8, 61,113,217, 30,
- 12,253, 20, 41, 50,184,169,243,158, 45,133,115, 76,244, 44,114,114,236, 90, 10,109,118,101, 69,  7,109, 69,110, 68,166,247, 32,
-244, 91,  5,122, 46, 93,207,151,112,185, 82, 84,201,237, 85,196,152,174,184, 88,241, 23,239,197,  8,146,129,239,112,210,195,217,
-143, 82, 97,220,134,151,240,  7,148,160,230, 82, 64, 42,108, 46, 11,170, 52,200,142, 42,108,229, 75,154, 25, 10,128,251,176,220,
- 69, 62,231,164,248,160, 73,129, 34, 43, 32,148, 79,109,191, 21,101,149, 97,198,164, 54, 36, 52,149,  5,184, 19, 97,136,251,117,
-212,  9,207, 47,222, 75, 83,204, 70,166,198,109, 84,203,178,149, 49, 96, 25, 28,237,178,132,166, 28, 66,181,167, 45,188,144, 84,
-217, 47, 45,181,163,161,199,231,178,168,238, 61, 67,174,165, 50, 30, 68,210,138,101, 69, 41, 66,226,214, 24,154,175, 18, 68, 23,
- 25,200, 16, 43,237, 53,206, 89, 40, 41,101,229, 18,227, 11, 67,153,107, 85,228,149, 94,103,214, 88,177,181,218,251, 49,190,198,
-219, 19,126,194,199,107,117, 59, 14,220,202, 56,115, 41,161,100,166,134, 46, 65,164,220,199, 24, 80,202,  6,149, 99, 29,208, 93,
- 86,200,179, 38,148,109, 12,205,160, 36,107, 36, 87,151,170,161,165, 46,223,113,167,151, 78,170, 42, 43,148,218,139,143,133, 60,
-212,244, 50,100,136,203,150,242,135,136,250, 60, 22,164,198,112,144,183, 19, 29, 76, 58,165, 45,  0,185,112,131, 94,118, 83,239,
- 68, 41,110,145, 84,110, 85, 61, 77, 75,109,178, 94,166,215,169,104,  8, 67,209,226,188,  8,118, 28,136,175, 69,146,129,147,227,
-180,167,144,130,160, 73, 24,237, 74,148, 41,180,184,241,225,200,118,224,181,231, 71,136, 98, 84,161,159, 30,183,110, 75,101,207,
-122,101,135, 67,139, 34,171, 78, 67,173,161, 72,116, 98, 92, 85,128,204,132, 60,193,241, 18, 44,199,101, 84, 85,252, 43,112,177,
- 42, 84,  4, 52, 95, 52,245,  4,179, 84,167,160, 46, 60,163,202, 84, 82,137,173,158,119, 35, 43, 36, 50,180, 41,160,  2, 22,  0,
- 48,114,196,178,177, 80, 55,211,178,238, 64,223,114,118,234, 70,226,196,234,190,160,112,250, 40,232,234, 98, 13, 29,180, 72, 74,
-135, 58,129, 51,142, 88, 77,113,191,149, 76,133, 66, 76,142, 54, 49,137, 46,240,201,115,180,187,121,113,159,112,167, 74,168,126,
-134,164, 39, 75, 21,246,192, 76,150, 24,152,101, 59,  6,160, 22,251,164, 23, 22, 86, 34,169, 37, 64, 41, 77,186,215,114,156,150,
- 43,139, 43, 97,169, 85,218,101,105,162, 25, 69,219,106, 92, 52,234,159, 51,106,114, 59,213,187, 98, 11,114, 96,186,162,129,133,
- 58,105, 47, 71, 91,228,165, 74,112,210, 83,241, 18,146, 11,135,106,214, 98, 78,172, 73,102, 43,177,164, 67,184,105,116,249, 76,
-184,164,  4, 42, 59,240, 23,245, 98,155,113,151,208, 49, 37,216,174, 66, 88, 82,250, 45,200,200,202,137, 72, 26,161,196, 82,249,
- 44,237,191,114,123, 77,202,228,191, 13, 50,108,176,183, 27, 75,109,213, 41, 83,161, 73,  7, 42, 42, 37,230,219,111,224, 71, 41,
- 82,129, 72, 56, 26, 82,178,211, 80,176, 96,117, 33, 87, 27,130, 65, 15,123,139,250, 43, 17,247,133,176, 59,154,251, 35,230,229,
- 30, 34,101,181, 84,209,154,121,115,  5,168,137,162, 38,222, 89,169,228,145, 35,177, 23,211, 13, 74, 42,128,222, 98,209, 33, 93,
-247, 45,207, 13,114,155,103,122, 54,250,161, 33,214, 94,250,215,234,202,139,111,115, 54,235,  9,117,115, 33, 84, 25,247,117,161,
- 36,186, 75,171,142,226, 92, 32,132,169,  8,234,  2,250,244,178,232,151, 46, 85, 85, 97, 46,180,218,152,141, 41,185, 10, 82,146,
-133, 56, 87, 49,135, 28, 75,206, 54,128, 82,149,182,149,114,148,252, 73, 40, 42, 25, 63,173,202,173,165,149,245, 27, 59,105, 37,
-133,198,106, 75, 46,199, 11,153,201,226, 56,179, 68,204,101, 51,206,133,  4,148,184,138,122, 64,229,229,233,145,221, 56, 61, 81,
-185, 75, 51, 27,159, 80,109, 41,125,186,148, 24,239, 53, 37,180,135, 92,106, 52,136,171,113, 78,165, 68,140, 37, 16,223, 89,  4,
-156,167,195, 25, 30,171,240,236,165,105,234,169,128, 26,161,150,226,251, 18, 25,116,220,216,131,250,167,125,192, 39,222,113, 12,
-241,161,  4,252, 89,144,102,166, 63, 45, 69, 19,211,173,192, 32, 52, 53,  5, 73,183,217,  0,172,167, 96,196,253, 93,251,227, 89,
-170,116,137,115, 41,150,180, 88,239, 52,228,155,128,190,219,171,105, 45,132, 20, 84,125,242,101,110, 97,109,192, 60, 15,  6,  4,
-169, 41,  7,205,101, 42,  4, 30,100,235, 48, 98,100,183,170,109, 55, 77,129, 26, 53, 90, 77, 38,159, 64,165, 69,109,165, 59, 30,
- 52,118, 31, 90,205,199, 80,  1,144, 68, 88,139, 74,  3, 44,182,  0,117, 80,218,100,243, 23, 20, 81,245,170, 20,128,229,191, 57,
-231, 18,227,180,170, 21, 94, 83,170,231,105, 13,211, 41, 41,129, 19,194, 45,180, 74, 72,152,162,162,165,171, 24, 90,155, 91,121,
- 64,  1, 10,190, 89,208,106, 49,147, 38,123,140,190, 42,215, 59,205, 63,  4, 41, 77,  7,232,116,248, 77, 39,221, 90,229,  3, 45,
- 60,220, 25, 11,121, 77,164,169,180,203,154,  2,178,180,171, 50, 56, 55,242,106, 47,163,123,251,137,182,215, 39,127,128, 23, 32,
-147,183, 70, 90,252,198, 22,163,102,103,142,115, 15, 52,168, 39, 72, 47, 37, 68,133,131, 88,139,196,145, 68,178, 49, 42, 54,  4,
- 38,158,106, 17,126,147, 14,157, 74,146,213, 34,214,106,160,  3,145, 23, 72, 93, 65,214,154,147, 60, 45,214,208,171,150,181,227,
- 40,145, 58,176,135, 20,  0, 88, 40, 71,191, 85, 50,133, 16,199, 40,204,233,149,217, 16, 81, 74,106,213,167,196, 41,166, 68, 93,
- 61,218,202,202,222,163, 83, 36,180,202,163, 63,224, 83, 73, 82,235, 51,209, 30, 63, 41, 12,169, 45,248,223,  4,213,169, 74, 90,
- 53,128,211,101, 42, 82,164, 55,109,135, 89,147, 41, 74,163,196,152,181,  2,229, 14,132,196,169,105,114, 84,194,235, 37, 15,213,
-165,203, 74,222,142,144,  8, 75,184,116,146, 25,235,123, 77,126, 53, 26,159, 50,222,163, 82, 34, 87,170,209, 34,199,165,211, 98,
-196,145, 42, 52, 27, 97,182,148, 76,169,143,206,119,244, 45,  5, 21,254,145, 74, 46, 58,167, 16,167,  2, 71, 51,139,214,220,104,
- 21,172, 65, 37,238, 69,201, 58,119, 82, 55, 23, 34,254, 81,127, 40,177, 82, 54, 23, 48,154,250, 57, 42, 21,105,164,129,171,170,
- 20,141, 98, 87,  0,144,254, 73, 38,170, 44,234,129, 19, 88,176,146, 78, 89, 34,103,179,171,162, 77,157, 81,164,143,123,163,  8,
- 73,114, 60, 56, 14, 56, 25,153, 92, 82, 27, 64,113,230,129,159,116,212,234,141,165, 30, 35,232,150,149, 34, 26,138, 67, 35,195,
-229,195, 64,160,161,215,163,214,229, 61,114,193,118,  3, 18,169,144,234,116,244, 83,105,213, 73,128, 42,170,162,244,180, 53, 84,
-173, 73,139, 52,114,195,114, 72, 17,209, 13, 46,130, 91, 66,252, 80,144,164,132,233,150,102,139, 89,170,162, 58, 42, 11,109,  2,
-156,194, 86,221, 33,181,251,181, 38, 42,218, 67, 77,174, 97,127,153, 78,214, 92, 14,  2,191, 29,239, 13,182, 62, 55, 80,210, 57,
-121,206,113, 74,153, 54,127,189,  8,203, 67,140,225,184,143, 85,220,123,222,211, 87,121,197,162, 59, 80,232,138, 96,225,196, 37,
-231, 93,231,158,158,124,173,226,166, 18,183,  1,113, 59,104,206,  7,217,212,166,214, 54, 39,125,193,177,184,189,190,201,  2,219,
-129,115,109, 36, 64,115,202, 58,106,133,145,131,199, 51,172,111, 27,220,150, 84, 18, 57, 32,181,236, 38,119,102,187,  2,172,173,
-245,138,161,227,115, 42,109, 53,183, 89,113,151,211, 75,165,167, 49, 32,171,220, 30, 90, 20,243,205, 83,164, 33,100, 75, 87,189,
-190,190,121, 21, 18,250, 71, 48, 94, 91,105, 75, 43,121, 74,230,229, 45,103, 23,124, 32,112,213,237, 11,217, 74,166,193,241, 37,
-103,179,117, 80, 93,247,138,133,163,115, 83, 94, 17,183, 11,108, 46,100,165,216,113, 47, 43, 30,236, 12, 41,116, 27,141,183,211,
-202, 18,144,184,181, 22,208, 98,204,139, 46, 18,220,104,135, 30,225, 76, 56, 81,105,212,133, 48, 41,180,229, 70,162,206,126, 38,
- 92, 98,148,206, 66,164,193,166,164, 45,105,171,200, 68,140,120,203, 37, 97, 47, 60,174,114,244,144, 80, 29,171, 42,165, 30,155,
- 49, 51, 37,181, 81, 79,132, 15,185,196,151,151,234,114, 30, 44,248, 41,113,104,  4,248,238,184,148,190,180,184, 74,188, 52,182,
- 16,234,154, 81, 58,124,203,115,  9,169, 39,  2, 57, 12,104,246, 82,172, 26,204,163, 72, 34,253, 44, 52, 92, 91,236,149, 12,133,
-109,183, 62,241,103,  9, 69, 81, 77, 83, 52,208,150, 44, 27, 66,145,121, 36, 63,181, 37,206,204,250,129, 61,116,169,212, 89,131,
- 43,201,249,104,123, 74,253,155,155,225,236,203,226, 10,102,204,110,202, 63,132, 86,125,198,138,149,127,100,183,134,155,  1,112,
-237,173,219,177,225,202, 67, 75,152,211, 60,203, 77,  6,247,167,123,204, 54,107,180, 85,184,167, 33, 62,251,114, 35,170, 69, 54,
- 84, 73, 46,115,200, 36,167, 25,234, 60,137, 61, 71,217,242,198,191, 92,191,104, 95,  2, 27, 99,237, 47,225, 82,247,225,235,116,
-208,197,  6,191, 47, 55, 54,209,110, 43, 17, 27,149, 84,218, 45,211,165,197,120, 90,215,101, 56,171, 11,149, 13, 70, 66,225,214,
- 96,115,165, 21, 26, 85, 74, 92, 66,166,214,227, 79, 55,249, 64,239, 46,206,238, 55, 15,155,187,185,155, 17,187,212,  5, 91, 27,
-163,180, 55,157,106,194,190,104,165,101,216,241,171,116, 57, 30, 18,166,211, 37, 16,  5, 70,131, 54, 18,226, 79,167, 74, 70, 81,
- 42,  5, 78, 52,132, 18, 28, 26,183,178,186,229,171,129, 84, 73,169,212,119, 35, 85,129,  0,134,181,188,202, 72,  5,128,210,110,
-164,121,139, 34,115,126, 99,150,201,150, 78,208,177,215, 21,236,173,125, 91,218,250, 75,126,181,187, 55,113,190,246, 44, 91, 95,
-135,148,129,156,147,147,205,212, 31,144,244,  3, 58,243,202,158,132, 96,121,118,234, 51,223,167,152,213, 84,132,144, 83,212,144,
-122,231,250, 71, 93,121,229,  7,168,206, 61, 58,103,231,212,233,216,126,242, 48,223,133,202,123,243, 12,118,207,203,183,111, 61,
- 32, 14,126, 17,140, 14,161, 90,245,202,  0,199,235,  2,114, 60,191,110,190,  5, 15,139, 57,201, 32,114,253,216,239,161,239,192,
-233,108,123, 39,162,135, 78,189, 62,195,246,249,106,136, 10, 78,112, 73, 80, 61,113,230, 62, 64,254,122,234,166, 18, 83,202,122,
-103,184,207, 81,130, 49,223,236,215,174, 80,  6,  9,201,199, 47,111, 46,189, 71,203, 89,192, 63, 27, 96, 53,  1,149, 31, 49,140,
-143,183,211, 84, 10,122,103,152,159, 49,204,115,211,229,233,253,186, 57,109,140,  0,  0, 42, 35,161, 61,188,137,207,221,161, 86,
- 58,145,216,118,198, 58,231, 30, 93,116, 48, 63,158,  1,112, 96,228,246, 63,119,203, 84, 21,220, 28,101, 35,160,235,242,245, 31,
-102,138, 90, 22,121, 72,232, 51,231,247,231,247,104,117, 39, 61, 58,  2, 59, 96,249,104,234, 64,191,160,198, 65, 55,247,255,  0,
- 60, 14,160, 50, 60,137, 24,206, 58,103,203, 61, 58,234,146,135,124,156,121, 99,160, 31, 51,219,236,252,116, 73,206, 49,128, 51,
-231,231,251,123,106,130,209,216,142,152, 32,159, 63,195, 75, 14,184, 84, 94,215, 29, 79,250, 96, 55, 19,215,  9,  7,190, 79,166,
-113,212,157, 10,180,231,174, 51,219, 30,163,230, 61,124,245,112, 94,  8, 35, 56,199,150, 58,254, 63, 97,208,174, 36,246, 79, 78,
-132,250,231,203,175,160,237,165,148,155, 11,141,240,  1, 23,176,233,128,148,158,253,122,158,192,247,206,126,126, 93,116, 42,219,
- 61,126, 33,142,248, 29,128,238, 64,251,180, 98,130, 72,235,144,115,140, 99, 39,215, 61,190, 90, 29,105, 56, 32,252,142,124,190,
-223,195, 58, 58,223,238,254, 95, 39,  6,192,106, 72, 24,199,207,169,245, 30, 90,160,176,  6, 79, 92,227,183,145,249,118,249,104,
-165,167, 61,148, 78, 62, 93,254,239, 93, 12,179,220, 30,157, 60,198,115,242,249,127,110,150,193,148,246,192, 42, 80,207, 64,115,
-230,  7, 95,188,250,119,213, 21, 12,100, 99, 63,179,231,162,150,129,220, 12,103, 57, 35,191,246,104,101,  2,  7, 81,158,249, 35,
-174,127,183, 74, 39,124, 40,187,129,129,212, 62, 68,122,250,125,199, 84, 23,140,143, 92,117,213,117, 19,215,184,  4,231,175, 66,
- 79,245,106,130,251,142,158, 93,255,  0,118,149, 29,122, 95, 24, 34,198,227,107,126,239,159,158,216, 20,140, 18, 59,227, 75, 95,
- 85,250,199, 75, 75, 13,192, 56, 53,129,222,221,113,224, 31, 34, 70,125,  6,170,115,117,  4, 36,146,112,146, 71,252, 62, 67, 84,
- 57, 57,156, 74,190, 46,131,167,126,189, 72,198, 14,138, 73, 72,  0,249,103,174,123,247,243,198,181,201, 39,189,191, 44, 27,238,
-190, 43,164,129,129,211, 63,236,245,233,243, 58, 32, 97, 35, 36,140, 31, 65,231,246,249,232,100,242,133, 16, 14, 78, 58,158,157,
-  7,144, 58, 37,  4, 36, 28,167,155,  7,168,239,223,182,147, 44,119, 29,113,140, 86,  9, 88, 80, 33, 67,148,142,189, 58,147,229,
-223,183,125, 16, 27, 14, 36, 37, 73,206, 14, 71,113,233,215, 84,146,114, 59, 96,121,126,113,162,219, 33, 61, 20,122,227,203, 61,
-135,228,105, 51,107,111,211,  4, 38,221,  6,253,190,126, 24,172,132,132,167, 25,192, 31, 46,167,238,209,141,168,114,132,252,186,
- 31, 95,234, 58, 17, 41, 24, 32,168,146,115,128, 59,159,179,174,138,108, 18,115,203,216, 12,131,215,  0,103,174,144,194, 71,174,
- 42,227,160,207, 92,117,206, 62,223, 33,242,209, 40,194,176, 79, 64,124,186,245, 61,190,239,236,213, 16,  1, 81, 29, 64,242,237,
-249,245,209, 45,130,  6,  1,237,228,113,147,251, 59,104, 99,  7,241,193, 13,224,100, 14,158,159,183, 68, 33,125,121,112,122,103,
- 36,117, 25,207,111,219,170,  8,237,156, 12,250,116,207,217,159, 61,101, 86,165,169,113,222,213,218, 85,175,104,208,234,151, 29,
-199, 92,154,205, 58,143, 67,162, 64,145, 83,170,213,103, 62,174, 86,162,193,129, 17,181, 57, 37,226, 79, 92, 12, 36, 30,101, 16,
-144, 78,144,150, 68,141, 93,157,130, 34,110, 73, 54,  0,  1,212,158,192, 96, 14,194,219,159, 78,228,237, 97,234, 73,216,119, 56,
-239, 95,177,184, 52,198,205,241, 34,250, 82,145, 37,219,203,111,154,116,243, 97, 74,140,138, 52,229,161, 36,121, 36, 56,165, 99,
- 62,127,102,186,125, 58,178,168,165,224,240,108,180,227,106, 45,243,168,133,  3,219,224, 41,253, 99,156, 28,124,181,130,123, 43,
- 61,153,123,231,176,246, 46,230, 76,226, 66, 69, 19,109, 99,238,172,123,102, 85,189,105, 61, 82,102,161,115, 83, 77, 53, 47, 41,
-114,110, 56,241, 22, 91,166,201, 83, 79, 37, 41, 96, 41, 78, 35,  7,156,131,211, 91,183,187, 60, 21, 87,216,164,202,171,216, 55,
- 44, 43,172,211, 80,185, 34,157, 13,254, 73,133,108,167,153, 73,110, 58,212,124, 76,167,200,119,206,185,175,140,211,219,115,250,
-250,186,121,150,106, 87, 41,102, 86,  4,217, 99, 69, 62, 95,180, 64, 96, 69,237, 98,  6,161,177,  7, 30,160,125, 30, 51, 92,167,
- 42,240,231,133, 50, 92,240,205,148,102, 10, 42,  3,172,240, 74,138,188,202,201,222, 50,206,202,  2,106, 70, 70,243, 90,193,183,
-223, 26, 33, 89,187, 38, 56,211,173, 73, 82, 68,134, 29,100, 33,180, 43,195,241,146,165,129, 30,115, 42, 79, 82,234, 84, 82, 20,
- 61, 53,220,158, 22,104,113,246,115, 98,169, 87, 66,163,180,230,226,223, 48,159,157,245,162,217,109,215,233, 84,130, 15,134,212,
- 53,167, 42, 99,197, 78, 84,181,167,226,199, 98, 53, 30, 10,163,245, 54,234,111,196,144,202,209, 82,166, 75, 80,109,137, 72, 83,
- 78, 49, 38, 59,153,147, 79,146,210,250,165,126, 35,100, 96,227, 24,215,127,118,138,242,164,110, 62,192,109,157,106,149, 47, 30,
-229, 76, 54,197, 89, 17,150, 68,186,101, 86, 23, 51,106, 97,104,  7, 45,130, 23,217, 88,202,117, 28,118, 20, 81, 23,136,105,153,
-198,204, 58,139,149,189,143,111, 45,236, 65,254,  3, 29,  5,199,185,104,158, 14, 29,203,164, 80,217,101, 77, 86,170,133, 93,209,
-180,199,170, 20, 96, 14,241,187,  6, 37,127, 93,148, 45,136,181,242,106,229,223, 42,176, 31,122, 91,235, 11,114, 43,173, 63, 43,
-152,169,199,159,143,135,153, 45,243, 30,101,243,182,162,159,187,215, 88,194,171,109, 42, 52, 22,155,105,229, 73,168, 62, 22,203,
-206,  5, 45,198,219, 49,203, 37, 62, 31, 54,124, 70,223,  9,248,135, 92, 47,174,172,242, 97, 74,133, 54,150,235,136, 92,152,237,
- 58,252, 89, 13, 45, 92,139, 46, 50,219,136, 74, 20,  9,248, 28, 41, 32,143, 62,190,122,188, 83, 18,164, 54,242,101, 71, 65,114,
- 44, 22,132, 53, 40,114,187, 30, 75,239, 23, 82, 65, 72,234,224, 65, 70,125,121,117, 30, 87, 45,172,129,168,158,155,237,126,135,
-115,211,189,187,236, 62, 56,127,142,130,130,138,154, 49, 79, 24,120,134,234,170,193,123,180, 96, 91,169, 10, 66, 18, 15,151, 77,
-128,  4,226,231, 71,140,106,110,203,144, 95, 44, 50,131, 42, 92,249, 46, 56,161,202,196, 32,136,201,141, 24, 96, 36,190,183,201,
-194, 51,149, 21, 28,117,214,187,111,102,251,181, 33,243,106, 81,228, 61, 14, 37, 33, 97,130,251, 50, 21, 30, 63, 51,105,194,152,
- 98,106,148, 82, 95, 81,200, 60,195,245,138,142, 20, 14, 19,125,222, 75,250, 78,218,216,238,219,180,169,142, 42,187, 85,231,169,
-204, 91,107,109, 14,183, 50,106, 86,182, 24,105,167,112,133,173,168,202, 43, 80,230, 79,199, 45, 56, 33, 67, 58,228,228,187,229,
-250,132,217, 47, 75, 67,178, 96, 58,242, 83, 61,164, 56,226,208,226,208,181,175,198,125, 46,167,157, 35,226,117, 68, 43,152, 40,
- 32, 32, 40,140,101,246, 58, 73, 18,147,146,135, 76,211,128,242,145,107,170,177,186,198,  9,237,250,205,184,185,216,218,219,233,
-112,238, 72, 56,183, 63,169,204,229, 28,252,143,135,165, 49, 82, 40, 35,235,170, 18,203, 36,204,173, 96,202,132, 24, 98, 13,183,
-146, 66,118, 56,218,122,181,245, 81,114,145, 37,110, 60,103,198, 97,207,125,165, 84, 31, 79,131, 90,163,190,219, 97, 10,108, 48,
- 26,  9,169, 66, 90, 80,227, 47,128, 80,181, 33,204,169, 42, 79, 34,145,144, 27,238, 36,202, 77, 46, 61, 71,146,158, 91, 77, 34,
- 80,129, 80,121,196,192,149, 37,107, 67,234,250,134,230,105, 96,211,223,104,169, 92,205,169, 77, 58,128, 83,145,140, 41, 90,141,
- 75,174,173, 77,251,204,  9, 44,170,156,220,176,219,244,224,164,200,165, 79,117,183, 20,184,138, 75,160,173,218,100,118, 89, 33,
- 75, 40,230, 73, 95, 94, 82,  7, 38,179,218,117,105, 35,154,151, 61,164,211, 34, 50,180, 74,121,186,147,237,205,163, 21, 60,162,
- 29,110, 35,204,164, 37,216,238, 48,180,134,146,248,  5,180,189,243,232,211, 62, 92,169,112,162,228, 27,221,109,123,121,123, 16,
-109,110,225, 46, 44,215,186, 62,199,161,242,220,190,156, 36,113,114, 47,203,109,107,162,234,192,145,231, 26, 47,177,110,190, 75,
- 27, 13, 65,145,137, 24,220,138, 82,100, 86,167, 67, 85, 85,  5,217, 21, 54, 83, 26,153, 91,143, 41, 84,218,173, 77,175, 19,157,
- 16,100, 78,167,184,142,105,169, 96,169, 46,243, 41,104,121,178, 22,223, 34,202,155, 23,250,140,137, 20,138,148,138,125, 82, 20,
-234,253, 56, 69,122, 35,244,247, 86,135, 43,244,199,152,112, 33,197, 60,228, 96,159,173,226,132, 50, 84,121,113, 53,165,176,135,
- 82,167, 71,194, 53,242, 20, 11,121, 84,166, 35,198,155, 38,  4, 37,169, 19, 41,142,209, 42, 19,225,165,233, 62, 34, 25,142,226,
- 80, 30,113, 17,157, 66,149,252,196,164, 18,216, 82, 84,115,167, 38,148,205,126,152,227, 49, 97,220, 38,171, 81, 86, 91, 68, 26,
-187, 13,248, 14, 69, 97, 62, 35,143,138,156,112, 22,101, 41, 15, 18, 22,226, 10,194,136,230,230,233,134,127, 42,  6, 37,206,199,
-117,101, 43,181,186,143,180, 75,  2,110, 73, 96,  5,128,176, 42, 44,157, 77, 28,  1,181, 71, 86,166, 56,195,160,133,227,150, 34,
- 10, 48, 60,200,165, 70,147,146,168,163,204, 71, 45, 85,148,  2,193, 25,163,195,167,111,214, 86,203,172,196,137, 45,186,155,174,
-161, 10,167, 73,203, 62,227, 94,136,211,232, 33,202,160, 82,127,192,238, 54, 24, 88, 10,120, 37,  1,208,149, 43,151,151,153,182,
-170,166, 34,105,117, 25,181, 40,161, 79,194,159, 53, 78,221,148,  2,130,244,202, 62, 11,173,203,168,196,140,210,177,239,188,139,
- 79,188, 52,148,143, 25, 25,113,159,210,140,171,  8,167, 26, 85, 94, 65,131, 35,235, 11,102,226,130, 87, 49,132, 48,166, 27,155,
- 34,167, 24, 20, 49, 81,133, 37, 81,151, 26,170, 90,112, 31, 21,124,188,252,170, 13,201, 72, 73,201,204,105,149, 74,157, 57,200,
-147,110, 38,154,139, 18, 67,205,195,153,115, 70,104, 51, 79,155, 83, 70, 23, 21, 85, 85,  0,161, 70,146,242,249,  2, 78, 76,126,
-101,128,219,173,128,148,235, 34, 80,196,  0,231, 83, 92,  1,220, 90,204, 10,145,112,  0,185, 42,  1,  2,236,108, 45, 99,136,197,
-109, 57,134, 90,147, 78, 60,243,173,165,136,149, 15, 48,189,215,148, 86,241,202,190, 93, 81,152,134,165,148, 13, 11,202,242, 35,
-169,110,248,110,177, 16, 67, 42,158,104,128,170, 20,215, 22,194,141,110,142,176,131, 25,131,225, 54, 11,133, 84,196,180, 99,164,
- 18, 82,252, 36, 58,  2, 73, 90,181,243,137,137,169, 94,219, 91,  8,140,165,159, 30,241,143, 84, 66,139,156,202,240, 96,192, 62,
- 18,156, 82,206,124, 78, 89,140,129,203,241, 21, 30, 76, 19,163,109,106, 99,148,203,129,215,161, 22,149, 70,170, 36, 45,108,171,
- 31,224, 53,  5,243, 58,217,101,215, 79,193, 25, 79,185, 33, 32, 39,  1,165,190, 66, 50,135, 15, 45,187,123,227, 46,167, 87,178,
- 45,198, 26,115,194,143, 66,171,214,144, 26, 91,156,200,171, 26,148,118, 84,145, 31,151, 10,  8,167,198, 11,  4, 31,135,197,207,
-235, 37, 39, 74,201, 56, 20,179, 48,220,  2,160, 89,137, 27, 48,218,251, 92,218,224, 27,108,182,181,237,189, 90,213,112,199,197,
-185, 37, 66, 63, 50, 26, 82,245, 33,186, 21,  2, 41, 29,149,214,224, 41, 89,127, 85, 64,  0,155,129,164,168,195,121,106,210,157,
- 49, 16,180, 67,123,221,105, 23,132,151, 98,143,  8,133,181,  9,233,  2,160,114,132,149, 41,152,202, 77, 80,  0,122, 20,224,133,
-140, 19,174,145,216, 85, 22,174,139, 58,117, 20,167,255,  0,116, 45,215,218,183, 92,253, 48,116, 59, 66,168, 71,135, 84,162,201,
- 91,137, 33, 46,115, 83,165, 76,101, 96,101, 41, 92, 44,103,200,106,117,145,110,169,112,231, 15,  1,196,123,195, 84,153, 12,178,
- 20,148, 41, 94, 28, 38,226,200,119,157,100,120, 95,165,138,  1,112,228,146,114,114,161,173,186,219,  8, 70,145, 86,150,137,  9,
- 45, 70,158,138, 76, 55,148,216, 65,109, 45,150, 86,152,239,128, 57, 65, 12, 75,229,234,122,225,213,148,244,209,114,119,104,171,
-  4,128,125, 92,254, 87,191, 96,110,192,158,223,104,  2,109,189,142,214,189,197,123,226,102,115, 14,101,151,130,175,170,167, 41,
-126,116, 54, 59,220, 24,181, 41, 23,243, 93, 94, 65, 97,177,125, 39,160, 56,182, 92, 20, 69, 77,185,225,210,208,218, 12,121,177,
-214,245,101,132,175,147, 20,200,207,169, 77, 67, 12,161, 64,187,239, 14, 55, 24, 58, 82,112,164,176,232,229, 32,231, 94, 29, 77,
- 69,138,133, 70, 29, 29,163, 30,174,236, 24, 12, 74,171,176,182, 29, 93, 18,157, 80, 46,135, 10, 99,172, 22,209, 86,126, 34, 28,
-247, 86, 74,249, 90, 42, 50,212,149, 37,164,133, 61,149, 74, 50, 96,174,108,231,227,148, 73,104, 70, 98, 34, 90,232,251,142, 52,
-174, 65, 30, 63, 46, 28,230,126, 90,201,119, 25, 60,138,113, 64,225,189, 82,183,173,152,148,155,102,178,203,203, 68,215,166, 72,
-114,183, 95,156,227,173,149, 84,171, 51, 30, 74, 27, 67, 12,173, 36, 52,203, 81,219,102, 60, 68,130,144,203,109,165, 36,133,120,
-138,212,193, 31, 77,212,144, 72, 34,198,251, 27,245, 44, 15,154,214,  6,230,224,239,182,149,  3, 21, 18,113, 76, 43, 65,  3, 50,
-137,214, 49, 12, 40,135,117,121, 29,209,158, 71,223, 75, 42, 46,136,204,108,  8,145,132, 74,193,144, 72, 75, 74,213, 54, 21, 45,
- 76, 91,246,218, 94,139, 17,193, 28, 86, 29, 14, 46,115,208,212,249, 67, 77, 64,167, 72,144, 20,185,149,135,226,180,158,101,145,
-202,195, 40, 83,141,144,227,200,  2,245, 21,216, 52, 92,248, 96, 70,161, 83,252,103, 98,197,145, 15,156,115, 78,109, 49, 66,157,
-109,  1,110,205,152,167, 16,175,119, 65,203,206,130,172,229, 69, 42, 23, 85,184,213, 38,116,122, 77, 49, 30,243,112, 48,191,122,
-156,175,  0,120, 52,218,131,205, 97, 18,106, 83,146,149,  4,194, 76,  0,146, 91, 88,241,164,101, 41,109,188,184, 10,126, 34,216,
- 84,  0,137,213,234,155,149, 73,236,160, 76, 76,164,176,212,104,116,198,150,183,  7,131, 18, 42, 93,229,167,198,253, 69, 23,214,
- 76,149,151, 57, 71,195,200,157,109, 69, 33, 82,243, 60,133,180,234,176,248,250,244,211,107, 91,226, 72,211,167,112,188,181,209,
- 76,160,213,204,197,106,  0, 96, 24,179, 79, 82,204, 72, 51,121,144,128, 10,249, 98,149,218,225, 28,149, 89, 27,152,205, 94,144,
-220,249, 80,209, 79,171, 70, 91, 20,181,184,135, 92,141, 50, 72, 14, 84, 76,118, 19, 36, 34,177, 25,151, 21,138,119,187,114, 19,
- 21, 68, 12,117,150,149,132,150,213,150, 54, 98,220,136, 16,188,119,163, 67,101,  5,113,196,105, 72,165,185, 82,119,197,  5,126,
-248,228,114,219,144,233,141, 70, 67,104,106, 56, 82,124, 82, 79,136,218, 88,  9,105, 88,156,247,222,169, 82,227,191, 45,232,212,
-218, 11, 78, 71, 98, 59,143,161,113, 39, 84, 75, 46,153, 13, 76,172, 45,229,243, 37,135, 29,104,251,180, 52,101,110,  6,210,236,
-148,169, 74, 12,138,140, 74,153, 50, 51,206, 33,177, 76,164,162, 59, 73,171, 73, 72,104, 78,168,197,125,231,124, 63,  6, 48,109,
-102,142,200, 60,234, 28,229, 82, 93,  7,244,104,105, 39, 91,241,105,141, 99, 37,254,169,195, 11, 90,214,220,144, 53, 30,151,233,
-216,  2, 62,226,207, 81, 79, 37, 64, 53,  1,150,150,100,144,129,164,144,145, 57, 33,117,  0, 73,102,157,197,144,162,146,201,229,
-185, 91,  7,133,199,163,200,101, 79,198,131, 70,106, 76,183, 83, 33, 17, 40,212,166, 60, 24,241,189,234, 27,101,247,106, 85,121,
- 13, 51,138, 77,  9,190, 85, 34, 58,146,217, 82,185,213,225,182,227,202,108, 33,244,163, 51, 30,132, 13,122,179, 61, 46,206,167,
-178,218,106, 21, 83, 17,198,105,113, 16,255,  0,130,203, 84,152, 48,121,220,112, 58, 60, 70,144,219, 72, 14,202,154,226, 91, 75,
-137,117,229,164, 37,133,166, 84,233, 54,205, 18,152, 42, 78, 72, 74,100, 38,109, 70,157, 75,167,176,101,215,110,185, 45,168,183,
- 26, 21, 45,132, 58, 22,233, 81, 25, 47, 73, 45, 70,101,  9, 42,121,228, 37, 28,165,217,183, 32,206,171, 85,105,149,250,165, 82,
-149, 14, 75, 94, 12,218, 69,174,167, 26, 93, 42,136,182,199, 51,171,157, 33,213,135,234, 53, 63, 17,100,187, 57, 41,104, 33, 40,
-  8,142,218, 24, 74,121,221,169, 86, 22, 72,193,212,205, 96,202, 46, 67, 48,184, 22, 31,101,130,133,184,  4, 88, 49, 35, 72,181,
-216, 86, 28, 81,  1,116,150, 73, 25,169,242,225,205, 66,229, 73,146,164,163,105,104,209,130,181,131,  0, 76,135, 75, 68,143,118,
-149,228,145, 98,129, 95,138, 36,233,202,152,138,141, 93,169,141, 69, 80, 30,227,  5,244, 43,222, 82,165, 36,243, 74,171,176,208,
- 41,106,160,226,222, 82, 83, 28,169, 98, 40, 10, 73, 90,220,201, 68, 52,254,150,111,  2,144,225,187,179,158,209,187, 10,132,211,
- 79,213,165, 82,118, 15,137, 25, 20,246,210,148, 75, 91,140,190,246,200, 95,117, 36, 32,115, 57, 41, 10,102,175,109,202,146,122,
- 41, 18,232,108, 40,225,134,134,166, 17, 71,172, 75,173,183,254, 28,202,224,136, 19,125,223,220,189,237,247, 37, 21,179, 37,214,
- 81, 80,121,191,  1, 45, 16,166,130, 31,105, 33,106, 75, 76,149, 56,163,206,177,200,205,113,141,195,133, 51,141, 78, 12,248,147,
-225,150,176,148, 59, 23,119,182,166,230,182,237, 57, 15, 97,150,105,151,140, 70, 87, 85,176,107,200, 50, 27,253,  3,177,111, 58,
- 93,191, 49,181, 28, 41,  2, 57, 60,193, 74,200,158,100,149,102, 22,210,191, 88,166,198,203,123,107,  2,250, 84, 17,179, 17,170,
- 37, 36, 88,  6, 45,176,  1,135, 60,241, 94, 80,210,197, 55, 50, 52,167,146, 27, 38,149,177,141,119,250,189, 44, 46, 13,254,219,
- 16,222,117,  4,220,220,223,242, 16, 41, 10,  0,121,103, 35, 29, 63, 35,174,144,  0,146,129,231,232,122,252,251,246,242,213,103,
-105,213, 58, 52,201,244, 90,252, 69,192,174,208,170, 53, 26, 21,114,  3,128,135, 96, 86,232,211, 30,166, 85,233,238,115, 96,133,
-177, 82,139, 41,165,103,205,147,175, 33,  3, 57, 79,194, 14, 78,124,199,203,236,212,253, 72, 96, 25, 78,160, 70,198,251, 27,216,
-220, 31, 76, 83,251,247, 22, 56,241,142, 65,215,160,207, 76,143, 35,229,243,210, 78, 79,144, 72, 39,250,186,145,142,218,250, 74,
-136, 25,198,115,208,129,220,124,245,247, 36,146,124,191,217,244,236,126,205,103,127,191,  3, 30, 72,200,230,229,206, 58,121, 15,
-199,215,251,117,236,  5, 31,245, 72,242,  7,190, 62,223, 76,233,114,133,144,114,164,245,198,  7, 65,219,215,238,215,190, 92,127,
- 56,224,103, 31, 47,191,211, 67,221,233,129,138, 43, 71,124,156, 15,196, 14,221,186,244,208,171,  3,  3,191,166, 64,201,249,119,
-249,234,232,212, 41,147, 22,132, 71,105, 74, 46,186,134, 91, 32, 16, 29,125,194, 18,211, 12,249,188,250,213,209, 40, 72, 43, 89,
- 56, 72, 39,166,186, 71,195,191,178, 43,142,110, 36, 99,196,171,219, 27, 61, 83,178,237, 25, 97,151, 26,188,247, 98, 90, 54,206,
-131, 38, 59,229, 63,225, 52,182,171,241,205, 66,178,148, 52,175, 16,166, 60,  5,115, 36, 97, 43,202,147,157,121,171, 41,169,236,
- 37,148, 43, 55, 69,234,199,224,162,228,159,112,198,205, 37, 29, 93,124,188,138, 26, 89, 43, 38, 29, 86, 36,103, 32,122,182,144,
-116,143,123, 88,123,241,204,  5,140,156, 36,231, 29,252,135,224,124,251,232,117,  0, 14, 70,  1,  7,  7,183,159,203,207,166,117,
-177,124, 80,240,223,126,112,157,189,183,214,195,110,107, 49,211,119,216, 53, 54, 96,207,155, 77, 84,151,104,213,200,115,224,199,
-169,209,174, 75,118, 76,184,204,185, 50,223,157, 79,148,219,177,157,113,166,212, 74, 28, 66,144, 20,218,181,174,203,234, 48,  7,
-159, 79, 94,255,  0,111, 83,141,108, 83,203, 28,200,146,198,218,163,144,  2, 58,142,190,160,216,223,220, 69,240,155,199, 36, 18,
-203, 12,200, 98,158, 22,100,116, 59, 50,178,157, 44,164, 14,132, 16, 65,247,140, 12,160, 58, 18,122, 12,253,253, 63,179, 67,171,
-168,200, 61, 58,140,249,227,207,167,231,182,138, 63,173,208, 17,223,167,203, 25,201,252, 53, 69, 64,  1,142,253,115,246, 15, 67,
-173,144,108, 65,244,198, 70,227,125,199,254, 48, 26,129,245, 28,189,186,140,125,224,250,245,208,171,192,201, 25,  7,255,  0,104,
-122,103, 69,184, 70, 72, 57,  0, 30,195, 29,124,186,126, 31,179, 66, 47, 62,163, 30,158,121,249,116,210,202, 73, 23, 56,  0,108,
- 61, 54,192,202,193,193,193,  4,247,206,116, 58,199,159,175, 67,233,162, 87,235,229,140,122, 96,250,252,244, 58,129,201,200,200,
-251,113,131,219, 56,209,199,198,216, 54,  6, 88,  0,100, 39,175,203,167,231,251, 52, 43,131, 39, 36,  2, 64,236, 58,254, 63, 61,
- 22,231, 76,100,244,201,251, 60,134,132, 80, 30,188,221,127,104,193,245,251, 52,170,155,223,107, 91, 25, 22,223,  2, 44, 12, 18,
- 70, 49,219,212,117,237,161, 87,243,234, 15,111, 44, 31, 92,249,249,232,197,140,103,249,222,127,105,251,  6,133,115, 24,236,123,
-246,244,239,223,229,165,147, 10,139, 27,123,190,126,126,252, 12,188,246,199, 76,103, 62,152,254,142,154, 13,206,249,201, 78, 51,
-156,140,231,211, 31, 46,250, 49,194,  2,122,244,243,207,151, 79, 93, 90,212,167,148,162, 20, 50,159, 34,158,248, 35,184,244,210,
-152,  2,247, 55,232, 48, 59,171, 82, 85,220,156,231,177,199, 79,179, 75, 84,137, 89, 82,129, 64,192, 61,  9,238,125,123,157, 45,
- 11,159, 92,102,195,211,  7,  1,145,228, 49,230,115,215,175,153,251,245, 85, 41,199, 65,212,158,255,  0,159, 77, 82, 78,114,  7,
-145,207, 79, 35,223,203,237, 26, 37,  0,231, 61, 49,231,219,242, 53,130,  1,198,113, 85,164, 37, 39, 24, 29, 70, 51,230,123,121,
-232,129,156,245, 31,  8, 29,193,235,233,231,223,190,169,163, 29,176, 58,117,  7, 26,244,121,242,  2, 82, 20, 60,250,224,142,189,
-251,246,210, 76,  0,248,223,  3,  5, 39, 29, 51,146, 59,252,240,123,103,174,138, 64,206,  8, 35, 31,183,240,208,109, 54, 70, 78,
- 78, 73,235,147,144,  6, 78,  6, 51,215, 70,163, 57,233,142,157,199,203,229,162, 27,218,255,  0,203,124, 17,187,155,224,134,240,
-161,156,231,174, 64,235,211, 29, 63,164,104,132,168,143, 60, 14,199, 24,243,245,249,127, 86,168,160, 96,103,207,203,243,246,141,
- 16,132,224,228,245,  7,174, 63,160,231,215, 73, 16,  5,253,223, 39,  9, 28, 86, 71,127, 62,223,143,231, 58, 44,  1,220,122, 99,
-160,192,252, 52, 58, 82,  7,219,143,207,238,213, 86,242,162, 60,134,112, 57,142,  0,243, 42, 62,128, 12,232,167,  5, 97,182,231,
-108,101, 54,149,175, 93,188,238, 42, 37,171,108, 82,103,215,174, 43,142,169, 10,139, 68,162,210,216, 92,170,133, 82,169, 80,121,
- 49,225, 64,134,195, 96,151, 31,113,229,164,118,194, 70, 84, 72,  0,157, 78, 55,217,195,236,235,180, 56,  5,219,136,183,189,229,
-  6,143,114,241,101,120,210,144,245,197,112,186,195, 83, 99,109,101, 38,115, 41,113, 22, 77,152,167, 82, 66, 42,  9, 66,147,245,
-132,212,  0,227,174,130,132,144,210, 64, 58, 65,236, 48,224, 78,145,183,150, 91, 28,115,238,229, 25, 47, 93, 23, 10,101,211,120,
-127,163, 84,163,165, 73,163,211, 57, 87, 30,165,184, 46, 48,226, 73, 76,201,  4, 45,184,107, 35, 40,101, 37,105, 33, 78,103, 93,
-206,171,207,168, 77,158,242,214,234,165,120,206, 45,240,239, 57, 83,188,203, 36,252, 62,157,  9,239,170, 51,196, 46, 48,105, 37,
-147, 42,160,151, 76, 16,146, 37, 96,109,169,129, 27, 92,118, 83,208,119, 32,181,143,145,135,112,125, 25,188, 13,143, 54, 16,113,
-223, 19, 82,137, 17,172,244, 16, 72, 60,170,157,125,165,213,191, 93,246, 49,126,194, 16,247,212,254, 92,102,175, 95,155, 82, 46,
-162,100,151,208,236,151, 84, 86,135,157, 83,143, 45, 96,146, 94,142,181, 28,149, 31,231, 39, 61,245, 66,141,115,205,137, 57,175,
-  1,247, 75, 76, 35,195, 76,148, 41, 72,125, 46, 37, 67,149, 50, 80, 63, 89,178,122,100,246, 29,245,245,218, 59,147,164, 45, 78,
- 62,215, 50,202,148,134,101,254,133,244, 62,145,140,180,188,124, 11, 56,232, 71, 67,171, 83,148,233, 49,170, 13,190,247,248, 44,
-245,182, 90,104, 56,144,150, 39, 33, 63, 10,154,125, 67,225,241, 20,158,202,245,193,243,213, 56,106, 88,146,193,203,105,235,239,
- 59, 19,191,201,199,127,158, 23,202,218,157,233,146, 24,236, 81,136, 80, 46,  1, 43,107,143, 46,174,130,197,183,  3,169,212, 47,
-102, 23,138, 45,142,166,222, 16, 42, 27,183,108,211, 81, 10,232,163, 70,247,155,186,155, 13,174, 83, 92,132,  0,  8,170,165,134,
-192,  6,115, 39,  5,106, 72,203,136, 86, 73,233,166,207,131,205,208,115,108,174, 89,118,133,206,234,163,216, 59,146,166, 20,169,
- 42, 82,136,161, 93, 77,252, 49, 42, 33,  4,225,182,215,204,148,185,216, 20,171, 61,198,186, 27,110,114,132,166, 53, 69,148, 59,
- 30, 90, 23, 25,101,236,171,154, 43,201,240,223,133, 36, 17,241, 35,145, 74,229, 39,161,215, 63,238,253,167,145,106,238,109,193,
-110,177, 27,154,158,103,166,165, 71,109,208, 75, 65,135,207,188, 66,117,149,227,252,159, 41,228,233,219,  3, 75,181, 66,188,109,
- 27,157, 72,221, 61,223,199, 99,123,219,220, 65,219,108, 51,192, 88,210, 85,228, 53,174, 76,116,104, 30,157,201,185,229, 35,  0,
-  2, 19,125,224,147, 75, 37,239,101, 33, 13,213, 69,250,103,114, 80, 10,102,173, 46, 58,164,199,113,180,212,163,184,159,141, 18,
- 38,180,144, 27,150,219,136,255,  0, 40,194,218,193,244,234, 52, 13, 53,152, 76, 85,228, 75,126, 75,175, 83,218,112,212,170, 11,
-111, 28,170,135, 77,132,169, 78,242,115, 15,209,175, 45,242,143,153,236,117,227, 97,231, 85,171,148, 38,109,155,155,154, 91, 20,
-248,232,126,139, 84, 87,199, 38, 34, 85,134,223,163, 74, 82,186,185, 28, 40,126,141, 95,205,  7, 30, 67, 69,110,125, 33,219, 19,
-109,119, 58,172, 90, 66, 93,116, 66,166,211,214,225, 63,160,250,214, 82,  3,169, 64,233,241,150, 27,112, 39,168,  3,155, 62, 88,
- 58,244,144,243,106,233,148, 11,197, 35,128,123,129,109,205,246,238,  6,199,184,235,108, 71, 42,184,155,216,242,188,198,154,162,
- 95,237,180,208,232,140, 11, 90, 66,236,136,172,189,245,  3,160,145,212, 16,122,249, 73,227,159, 17,187,137, 50,231,190,101, 63,
- 18,112,228,140,252,162,176, 30, 62, 10,228, 73, 82,164, 22, 95, 72, 63,  2, 91, 10, 66, 22,112,  8, 82, 66,185,126, 28, 29, 79,
-145, 81, 80,168, 42, 68,213, 63, 12, 37,188, 63, 45,130,209,128,132,156,150, 26, 75,203, 73, 74,254, 39, 10,138, 92, 67,124,164,
-229, 42, 25, 25,186,221,245, 35, 87,185, 43, 18,155, 90,227, 77,126,164,251,143,  7,129,118, 51,188,178, 11,120,144,148,242,135,
- 91,232, 71, 50, 10, 92, 36, 36, 39,211, 88,139,213,131, 77,117,196,212, 27, 16,219, 83,220,225,196,169, 47,211,101,161, 71,194,
- 11, 92,133,  4,174,  9, 66,203,105,113,183,145,240,248,193,124,202,108,130, 38, 34, 59,179, 29,137,125,253,230,246, 63,127,165,
-250, 13,186, 11,218,248,225,108,186, 60,159, 36,202,104, 33, 80,239, 79, 18,  6,232, 36, 44,108,206, 88,216,171,134,102, 58,137,
-189,193,232,183,182, 51,138,107,197,167, 35,145, 32,194, 75,137, 45,162,170,204,129, 26, 59,172,  0, 57, 16,250, 88, 42, 67,173,
-168, 44,132, 33, 97,105, 81, 89,194,193,192, 15, 21,183, 34, 93,189, 17,133,173,196,213, 88,150,133,188,239, 51, 44,199,149, 29,
- 45,142, 86,210, 82,135,  2, 38, 68,112,144,144,148,168, 41, 39, 32,133,  0,  2, 89,200, 80,154,117,109,186,212,100,199,139, 80,
-101, 13, 33,216, 78,199,114, 51,238, 37, 74, 91, 78,189, 27,148,178,231, 80,164,172,130,  9, 41,201,238, 14,179,250, 11, 83,227,
-182,194,154,145,  2,161, 25,212,187, 44,196, 66,213, 18,124,111,  5,107,100,166, 20,148,169,198,211, 12,115,175,153, 42, 74, 80,
- 70, 78, 78, 51,166,186,192,172,178,  6,109,136,220,117,189,189,227,117,177, 30,160, 27,119,233,139, 14,158,162, 39,142,  0,101,
- 66, 93,128, 10,247, 70,216,130,108,214,176, 96,108, 65,243, 95,175,187, 27,  7,111,210, 27,168,182,211,116,199,151, 78, 75,232,
-110, 83,209,169,177, 26,125, 10,125, 72, 91,143,187, 34, 34,142, 34,172,  0,129,128,132, 45, 73, 72,  9, 43, 56, 80,206,163,202,
-184,216,125,223, 26,158,154,225, 56, 80,114,142,180, 69,150,162,178,150,227, 46, 61, 62,106,200, 76,129,146, 74, 91,146, 28, 87,
- 54, 67,121, 73,211, 37, 69,159,  9, 83, 19, 42,175, 34,171, 13,106, 74,227,154,156, 84,200, 79,185,120,108,229,135, 25,169, 81,
-213,250, 96,176,134,208,128, 65, 64,248,130,145,141, 58,116, 74,219,236,148,159,175, 97, 86, 33,180,182, 20, 87, 17,108,199,169,
-180,216, 91,106, 47, 79,130,128, 61,245,230,208,113,204,207, 34,215,156,148,247,212, 94,170, 25,163,109,148, 76,140,  5,245, 41,
-218,254,142,  8,213,107,116, 44, 47, 97,229, 55,198,205, 75, 85, 29, 71,255,  0, 73, 68, 85, 96,178,164,159,111, 98,202,179, 71,
-229, 98, 69,134,130,202, 77,238,  0, 83, 96,239, 82,107, 84,106,164,152,205,214, 16,245, 17, 75,247,101, 22, 43,  1,232, 83,105,
-203,136,165, 50,229, 98, 34,151,202, 17,226, 61,202,145,202,178, 48,162,146,142,250,216,251,105,128,186, 36,170,100,211, 22, 67,
- 77,176,209,122, 60,214,153,145, 30,167, 10, 65,240,214,164,164,158, 79, 13, 73, 45,115, 37,224,181, 33,120, 81,230, 79, 42,131,
- 59, 69, 16,106,201,139, 50, 64,129, 87,142,243,161,150,146, 80,211,168, 90, 71,134,148, 54,236, 25,  3,150, 43,129,  5,101,229,
- 41, 92,199,162, 51,130,112,245,208,236,136, 14, 52, 88,165, 63, 50,139, 34, 51,197,246, 98, 51,239, 14, 83,216, 91,139,113,121,
- 76, 73,110,172, 58,223, 48, 72, 13,160,134,135,112,144,  6,154,194, 70, 23,117,229,143,129,216,236, 71, 80, 47, 96,118,184,  4,
-222,231,114,  6, 41,222, 44,205,105,  4, 73, 28,205, 45,  7, 45,193,177,250,212,141,149,187, 31, 44,137,107,144,124,172,109,102,
-184,117,  1,243, 59, 82,158,154, 90, 88,167,200,142,181,210,164,169,181, 70, 81, 89,144,237, 61,164, 97,  8,142, 95, 89, 89,114,
-156,227,128,  6,143, 58,148,202,185,146,172,161, 73, 41, 58,230,163,187, 82,190,163,190,164, 15,240, 15,170, 97, 12,245, 79, 47,
-184,169, 46, 41,174,193, 14,169,111,140,231,161, 40,198,122,227, 89,  5, 18,  3,176,154,143,  6,166,202,  9,  1, 73,143, 61,174,
-116,199,117, 99, 11,126, 47,134, 18, 84,193,229, 10, 37, 10, 37,180,225, 64, 40, 28, 13,100,168,166,120,245,217, 15,133,120,168,
-146,220, 87,219, 46, 28,171,  6, 52,112,158,128,225, 60,175, 70, 87,197,205,140, 40, 16,112, 64,214, 42,193, 90,101, 10,126,211,
-169,184,233,123, 31,188,110, 72,220,  3,125,207, 67,138, 55, 49,206,155,219,234, 42,132,129,216,197, 32, 46, 15,145,195, 50,  2,
-235,191, 86, 80, 85,250, 18, 70,227, 86,166, 57,149,157,109,178,148,183,224, 71,  1,183, 35,200,142,217, 40, 25, 72,109,212,201,
- 82,185, 20,122,144,165,158,100,158,128,171, 25,198, 50,253,209, 40,136, 75,137, 56, 90, 16,244,102,139,216, 60,229, 92,174, 20,
-160, 14,224, 59,241,225, 62,105,200,244,214, 51,107,195,108,165,151, 16,146, 22, 20,133, 20,  2, 74, 64,121, 60,138, 65, 87, 76,
- 96,117,207,114,  8,243,  3, 79,  5, 53,182,146, 64, 57,193,111,145, 35,178, 84, 80,226, 28,232,165,126,162,177,219, 31,234, 19,
-220,105,223, 44,132,121, 88,223, 77,198,253,250,119, 62,253,247,252,113, 75,113, 30,119, 60,175, 32,  4,249,186,239,191, 91,252,
- 54,176,222,214,184,191,174, 50, 89, 20,195, 81,143, 72,144,180,173, 79,134, 84,226,176,  3,206, 10,131, 10, 49,156,120,149, 12,
-182,  3, 33,100, 31, 37,188, 73,238, 14,172, 46, 81, 36,215,106, 78,136, 82, 13, 46,159, 29,244,173,218,140, 98,  3,147, 86,130,
-148, 42,159, 79,101,212,148,184, 90, 82,  9,117,242, 64, 39,157,182, 86, 64, 39, 89,163,142,  4,210, 26,113,106,112, 18,169,104,
-109, 13,148, 32,151, 20,219,  9, 95, 85,156,163, 43, 88,  5, 64, 16,  3,157, 50, 73,215,199, 43, 45, 65, 83,113, 91, 14,161,136,
-145, 25, 84,196,198,  1,231, 22, 91, 74, 20,150,219,107, 33, 42,116,156, 18,165, 16, 57, 84, 58,142,131, 82, 86,141,140,129, 80,
- 14, 99, 42, 29,250, 93,128, 39, 98, 55,238, 64,233, 99,214,219, 98,176,130,186,186, 61, 66,153,  3,200, 12,138,151,  0,172,107,
-174,228,216,130, 24,139,170,168, 32,128, 73,218,246, 35,  9,159, 71,167,209,161,120, 20,248,236,194,134,100,203, 91,178, 29, 95,
-186,251,203,202, 90, 28,149, 81,118, 76,215,143,188, 39,196, 74,202,151, 33, 97, 35,155,151,196, 40, 72,195, 37, 84,174, 73,169,
- 84,154,106,129, 77, 18,105, 49, 10,229, 68,157, 80,241,218,102,167, 32,224, 55, 84, 90, 25,111,222,102,198, 15,  5,251,154, 64,
-109, 11,229, 46,180,231, 39, 33, 15,133, 74, 59,117,246,189,234,168,242, 95,136,212,199, 36,199,182,218,105,167,105,241,249, 74,
-146,211,181,151, 92, 73, 53, 87,  2,149,206,150,  9, 76, 54,221, 64, 80,109,197, 32, 43, 88,189, 94,149,  6, 43,205,191, 86,230,
-247,217,135,221,162,211,216,142,170,140,185,124,205,173, 45, 70,131, 10, 58,124,106,140,226, 75,124,160,  0,202, 50,  8, 82, 18,
- 57,198,220, 72,224,134,210, 45,176,191, 96,122, 95,208,  6,189,206,219,216, 29,247,196,207, 33,174,134,153,155,219, 85,171,171,
-156, 48,220,187, 89,207, 83, 96, 67, 75, 32, 91,221,193, 17, 45,216,175, 48, 50,178,224, 84, 74, 44,154,236,184,109, 72,113,234,
-237,116,165,197,177, 54, 82,143,185,194,138,164,184,249, 16,105,241,143, 44,103,208,121, 50,164,146,226,240,182,220,119,  4,235,
- 37,164, 65,153, 92, 80,137,106, 70,139, 82,125,151,164,197,155, 93,168,123,196,123, 46,150,251,  8,240,252, 17,238, 40, 42,185,
-170,222, 34,155, 80,141, 16,150, 88,230, 75,114,101, 51,130,141,103,113,118,222, 84,228,199,126,232, 95,240,106,136, 16,215,189,
-218, 86,235,201, 53,185, 52,220,146, 81,114, 92,236, 97, 49, 90,112,128, 36,194,166,  1,146,181, 52,236,199,138, 84, 53,147, 85,
-149, 73,182, 92,129,  6,223,109, 81,169,207,198,147, 79,163, 83, 41,232,  5, 82, 81, 29,145,152,108,180,165, 54, 91,134,211,156,
-200,113,210, 18,218,  3,193,103,153, 99, 39,101,145,165, 85,144, 39, 49,211,208,128,187,218,251,146, 58, 53,134,171, 94,215,  4,
- 88,173,147,175,226,120,170,103,246,122,  6, 21,149, 44, 27, 66,168,189, 44, 37, 67, 23,  6, 68, 33, 36, 54, 58,210, 58,127,236,
-202,171,173,165,149, 12,145, 11, 77, 10,223,167, 90, 47,203,153, 93,154, 39,203,117,178,229, 86,225,153, 22, 43, 10, 90,217, 97,
-108,173,148, 73,109,194,197, 34,138,149,128, 98,176,158, 86, 18,160,180, 32,169,197, 18,171,243, 12, 71,188, 39, 42,174,205, 61,
- 18, 45, 72,169, 45, 52,144,181, 82, 30,158,238, 86,184,179,219,134,160,218,163, 82,146,160,225,109, 14, 58,219,178, 20, 76,135,
-249, 18, 91,109, 56,227,176, 25,153, 75,137, 81,185,166,184,212, 78, 68,193,165, 81, 33, 56, 20,195, 85, 39, 10, 11, 82,165, 48,
-193, 47, 87,234,137,240,209,202,128,158, 72,168, 70, 91, 66, 74,214,240,187,209,162, 25,147, 29,241, 80,243, 20, 40, 45,185, 21,
-234,107,146, 57,170,243,146,235,172,178,227, 19,125,225,132, 36,196, 91,197, 42, 68,112,151, 28, 82, 94, 80,113,210, 62, 13, 58,
-210,106, 66,183, 75, 35, 17,168,117, 97,109,198,228, 16,111,212,237,190,224, 90,197,113, 23,172,103,117,158,190, 74,182,147, 48,
- 80, 99,105, 64,211, 10,  1,101,209, 78,168, 99, 38,107,105,141, 52, 17, 20, 68,221,110,162, 55, 14,212, 81, 18,171, 73, 69, 54,
-151, 80,170,193,183,229,135,231, 85, 42,149, 41, 47, 79,143, 80,247, 20, 52,203, 16, 98,229,240,126,168,115,170, 31,125, 39,149,
-208,202, 26, 10, 40,231,230,113,232, 15, 68,139, 87,166, 53, 26, 60,198, 94,122, 51, 68, 71,148,250,148, 25,103, 63,162, 83,229,
- 41, 41, 99, 37, 69, 44,160, 37, 60,201,103,152,129,206, 20, 27,135, 43,  8,141, 22,153,  2,220,110, 28,171,174,170,134, 89,142,
-153,169, 66, 35,209, 88,108,174, 57,126, 80,125, 99,220, 96,135, 91,113, 92,141,161, 33,199, 27, 75,101, 92,216, 34,241,  2, 53,
- 62,152,134,101, 34,161, 49,233,206,169,137,117, 56,178,156, 90,231, 45,245,190, 29,112,130,215,199,159, 17,  9,113, 10, 64, 72,
-240,130, 80, 82, 83,212, 76,105, 31,217,222, 25, 64,230,104,  8,110,162,224,  1,102,223, 85,193, 99,246,172,183, 96, 73,103, 47,
-101, 81, 84,230, 84,205, 52, 18,164,134, 72,163,156,202, 35,140,221,164,118, 98, 85,165,150,214,109, 39, 74,162, 72,246, 71,229,
-  5, 65, 26,139,159,203,207,219, 83,176,204,240,223,237, 79,227, 35,111, 41,204, 69,139, 67,175,238, 80,222, 59, 98, 36, 38,195,
-113,161,208,183,162,149,  7,112,132, 52,182,144,  3,101,170,213,102,182,215, 40,232,148,176,158,221,135, 48, 73, 36,100, 96, 99,
-184, 61,250,246,212,159, 62,150, 45,137,  6,222,246,135,108,254,224, 66, 67,137,123,117, 56, 94,183,220,168,135, 22,209, 74,230,
- 88, 87,181,215, 66,109,109,161,180,  2,209, 52,250,172,  0,176,165, 45, 68,165, 61, 64,  1, 34, 48, 64,228, 21, 18, 15,251, 56,
-236,115,211, 86, 37,  3,171, 82, 68, 23,236, 70, 90, 53,182,195, 76,108,209,131,111, 66, 22,227,189,136,190,247,199, 60,230, 49,
-152,171,170, 80,253,162,193,143,184,200,162, 66, 62,237, 86,255,  0, 76,120, 41,206, 48,160,113,145,142,217,207,150, 15,125,123,
-  0,227,148, 14, 92,116, 63,209,247,244,215,220, 39, 25, 35,191, 83,230, 71,159,125, 87,109,178,242,146,134, 70, 92, 87, 96,172,
- 36,  4,128, 84,165, 45, 71,162, 80,  0, 36,146,112,  0,201,233,173,195,210,228,218,223,187, 26, 93,174,118,199,134, 90,117,213,
- 33,166,208,167, 28, 90,185, 80,132,  2,165, 40,158,192,  1,174,165,240, 33,236,163,226, 11,141,133,195,187,161,181, 31,108, 54,
- 57,185,170,102,161,188,215,148,  9, 46,210, 42,138,140,234, 81, 54,157,182,214,243, 78, 53, 39,113, 42,232,234,133, 62,203,140,
- 81,226,186,164,251,205, 65, 68, 45,141,111,127,178,155,217, 11,  7,117,232,244, 30, 38,184,174,161,203,107,103,231,248, 21,109,
-173,218, 73,190,241, 78,168,239, 51, 13,168,169,155,182,242,228, 90, 36, 81,246,136,186,131,238,144,210, 90,151,113,134,203,171,
- 91, 20,149, 36,203,150,181,  2, 36, 72,241, 41,180,202,125, 62,  5, 42,149, 74,131, 14,149, 68,162, 82,162, 70,166,209,168,180,
-168,109, 37,152, 52,202, 93, 50, 19, 72, 98,155, 79, 98, 58, 66, 90, 97,150,208,219,105, 24, 66, 83,166, 25,243,  9, 42, 36, 48,
-211, 63, 42, 59,216,200, 44, 75, 90,215, 17,131,112,  7, 91,187,  2, 54,178,171, 92,178, 89,124, 43,192, 18,102, 49, 69,153,103,
- 74,240,208,200,  3, 69,  2,157, 18, 76,166,196, 60,141,179, 69, 19, 15,178, 22,210, 56, 58,131, 70,186, 89,244,203,132,143,102,
- 23,  8,220, 37,199,165,207,176,182,222, 37,237,184,240,218, 71,188,239, 38,234, 68,167,221, 55,203,178,  8,  5,199,104, 48,157,
-143,245,101,141, 16,184, 57,155,143, 75,138,210,217, 36,230, 83,228,243,158,151, 69,160,187, 49,126, 36,133, 58,235,129, 35, 46,
- 60, 86,226,143, 94,131,153, 68,246, 24,  3,200,118,213,202,135, 74,248, 27, 28,132,168,164, 41, 71,  3, 60,167,178,137,239,204,
-123, 15, 64, 52,232,211,232,248, 74, 64, 64, 35, 29, 71,146, 73,235,146,113,212, 96,254,205,107, 90, 40, 75,114,198,159, 86, 38,
-236,109,251, 76, 73, 38,219,253,162,109,208, 91, 22,226, 81, 83,208,192,148,180,116,233, 71, 78,189, 18, 53, 84, 94,219,144,182,
-187, 30,236,110,205,212,155,226, 36,191, 73,131,133,184, 14,237,254,198,241,107, 70,166, 37,170,205, 10,172,246,199,238, 12,230,
- 90, 72, 51,232,213,  6,101, 92, 59,127, 50,122,210, 50,227,241,167, 51, 87,134,218,213,158, 86,166,  6,193,  0,  1,168,116,169,
- 41, 33, 39,204,245,237,215, 39,203,251,117,250, 82,251,111,182,226,159,122,123, 47,248,158, 68,212,183,205,103,209,237,109,192,
-166, 56,164,149,248, 53, 59, 98,234,166, 45,165,183,223,145, 74, 98,100,132,103,253, 85,145,219, 95,154,217, 61,  0,  4,  2, 74,
-134,  8, 61,  7, 49,198, 52,227,147, 73,255,  0,165, 66, 15,216,112,195,220, 36,  0,159,222,225,201,223,169,197, 33,199,180,137,
- 77,196, 45, 34,  0,  5,116, 17, 74, 69,250,190,167,136,155,109, 98,194, 32,222,246, 36,247,192,206,116, 56, 35,174,  1,207,238,
-253,186, 25, 65, 61,243,212,246,243,  7, 26, 53,192,  0,199, 55, 83,220,158,189,254, 95,142,132, 88, 87, 83,128, 65,237,142,152,
-192,193, 56,199,174,159,241, 15,192, 46, 18, 50, 66,124,241,246,227,185,249,232, 98, 58,147,216,252,251, 39,236, 30, 90, 53,207,
- 47,191, 65, 58, 65,207,175,110,189,250, 16, 14, 52,178,244, 30,252, 20,218,254,159,207,182,  5,112,227, 39,190, 51,142,131, 31,
-120,199, 78,154, 17, 68,242,243, 31,159, 40,251,126,126,154, 37, 72, 61,249,137,198,122,121,118,238,122,245,213,  5,161, 68,100,
- 16,191, 34,124,135,231,247,232,227,183,207,254, 48,111,134,  5, 42, 36, 16, 71,124,114,231,182, 61,126,122, 29, 68,103, 25,234,
-  1,232,  6,  0,235,229,162, 84,147,145,215,246,116,  0,106,130,240, 62,121,237,229,142,217,251,124,180,162,141,133,183, 31, 63,
- 61,177,144,  1, 62,151,192,138, 73, 25,229, 57,201, 57,255,  0,103,240,208,221,251,232,197,  2, 50, 70,  0,235,156, 30,227, 61,
- 50, 61,116, 50,192, 29,129,245, 39,203,236,252,116,170,117,249,219, 10, 40,  4,116,183,200,197,185,230,249,199, 41, 42,198, 70,
- 82, 58,103, 25,238, 71,150,116, 51,141,184,  1,235,202,  2,112,144,  0, 36,143,159,167,158,174, 42,  0, 30,132,158,249,207,174,
-132,121,178,164,158, 85,169,  7, 39, 24,254,119,219,234, 51,165,176,110,158,235,226,222, 82,148,255,  0,148, 36,147,212, 99,211,
-208,244,239,165,175, 69,181,182,  0, 82,148,225, 61, 73,192,233,242,239,165,161, 99,233,140,227,210,  7, 92,249, 15,233,252,157,
- 20,130, 49,129,223,185,251,245, 65, 32,224, 12,117,234, 63, 19,255,  0, 13, 86, 64,238,124,199, 76,122,104, 96, 96,148,167,  3,
-175, 66,127, 28,126,227,253, 90,168,210,  0,200, 56, 61,207, 79,158, 58,231,243,223, 84,210, 73,233,142,131,166,126,239,219,162,
- 91, 73, 57,233,223,215,207,166,147,112, 55, 61,255,  0,241,129,143, 96,121,224,159,199,161,251,180, 91, 63, 23,113,203,215, 25,
-238,123, 13, 83,109, 35,160,235,215,175,223,141, 18,148,131,208,116,233,158,223,102,147,193, 77,141,238,118,193, 72, 79,216,122,
-118,249,250,227,203,207, 85,146,  1, 56, 61, 61, 49,251,  7,109, 14,216,230,198,125, 50,122, 99, 68,160,  2, 64,198,125, 63,225,
-164, 90,192,144, 62,122, 97, 28, 86, 29, 14, 58,140,121,159, 62,158,186,218,174, 11,120,121,159,197, 23, 18,123, 87,179,145,130,
-147, 79,185,110, 40,206,220,178, 66, 73, 76, 27, 74,150,164,207,184,229,172,143,213,  6,158,202,219,  7,253,105, 35, 90,172,  1,
-206,113,144, 59,143,159,245,234, 71,254,193,173,178, 98,146,141,245,226, 34,165, 22, 63,188, 82,169,144,118,234,211,150,250, 66,
-158, 98, 93, 83, 19,235,142, 70,200,253, 26,253,223,221, 91, 42, 24, 61,198,152, 56,151, 50, 57, 86, 77, 91, 84,173,166, 80,186,
- 80,142,161,155,107,143,122,130, 91,254,220, 76, 56,  7,134, 79, 24,113,142, 65,195,218, 75, 67, 95, 58,243,173,255,  0,  2, 48,
-101,152, 92,116,213, 26, 20,  7,179, 48,196,149,103,214, 45,203,102,139, 77,179,109,136,172, 83,237,139, 54,149,  2,215,182,224,
- 65,  9,106, 37, 62,145, 72,142,136, 76,165, 49,147,211,  5, 45,100,145,212,231, 39, 86,118,235, 42,143,200,227, 47, 37,210,234,
- 18, 24, 83,124,167,  5,120, 37,  7, 39,169, 39, 31,142,154, 22,235,241,228,173,213,  7, 98,188,149,229,164,178,233,228, 89, 82,
-186, 30,101,122, 21,107, 39,167, 33,181,182,204, 85, 70,113,109,  7,  2,195,161,204,169,167, 50, 20, 18,130, 15,196, 61, 53,201,
- 85,114,187,206,236,205,119,148,147,111,221,239,252,122, 91,240,246,231,132, 50, 26, 12,191, 43,166,165,142, 30, 84, 80,168, 93,
- 32, 13, 58, 85, 84,105,177,176,  1,109,176, 91,  3,211, 99,135,136,196,145, 38, 52,105,210, 76,121, 79,186, 10, 76,117,169, 45,
-200, 65, 31,170,160, 65,233,140,104,132,199, 66,144,161, 62, 50,221,107,148,150,150,164,248,168,109, 67, 33, 74, 86,  6, 71,200,
-131,160, 41,209,224, 56, 99,202,116, 72, 15, 50,217, 66,222,125, 75, 64,192, 24,  0,163,205, 35,215,229,172,162, 35,108, 56,218,
-125,222,104, 97,121,193, 42, 81,113, 50, 18,162, 73,  1,181,118,  3, 58, 69,199,148,148, 66,227,107,244,216,237,190,219,127, 28,
- 18,170, 83,  9, 43,230,178, 30,161, 74,  4,185, 54, 11,164,181,128, 27, 95, 77,200, 59,139, 97, 81,169,202,247,134,228, 67, 90,
- 39, 71, 36, 55, 34, 19,199, 15,  6,193, 24, 91, 89,234,160,  7,109, 86,220,221,191, 69, 90, 85,181,115, 68, 96, 46, 68,  6,140,
-  7,138,147,149,150, 82,160,166,208,188,140,168, 39, 39, 25,242,233,167, 58,137, 71,166,201,142,194,201,142,212,216,196,  6,229,
- 50,121, 11,153, 61, 65,  3,161,199,207, 78,207,240,125,201,244,162,195,141,165,106, 65, 67,236,188,216,248, 92, 90, 48, 74, 84,
-  7, 98, 83,144,126,221,106,152,228,100,145, 44, 64,101, 22,223,184,183, 79,141,173,235, 98,111,138,187,136,120,137, 99,171,130,
-101, 58, 30, 38,100,109, 86, 82,202,195, 78,228, 88, 56, 32,141,236,172, 58, 16,109,124, 91,182, 90,193,101,183,152, 82, 35,165,
- 30,248,200,113, 65, 41,  9, 79,140, 82, 57,198, 49,211,152,245,251, 78,155,223,104, 77, 33,251, 91,135,122,140,200,202, 44, 42,
- 69,199, 77,109, 75,  9, 39,197,247,120, 85,  7, 27,105,208,  6, 86,128,176,147,145,219,151, 56, 58,220,141,174,167, 53, 29,232,
-216, 70, 58, 14,152,232,133,143,214, 72, 31,205, 26, 97,253,170,148,143, 23,133, 86,229, 70, 46,101,187,202, 15, 56,105, 57, 89,
- 75,148,154,162, 84, 79, 78,191,171,143, 92,159, 93, 75, 50, 90,104,205, 42,203,166,242, 70,111,241,189,135,243,239,235,142,124,
-204,184,154,105,248,255,  0, 33,161,119,211, 75, 85, 83,  4,100,118,176,147, 86,254,237,133,254, 24,136,  5, 65,227, 38, 82,145,
-202,226, 39, 41,110,184,151,185,156,241, 27, 46, 17,149,180,210, 23,200,250, 75,169,109, 32, 45, 42, 64,235,207,202,174,244,225,
- 84,213,  6, 69, 67,223,225,189, 84,158,167,131,113,207,129, 29,150,216,138, 80,148,182,153,212,240,151, 19,  0,248,133,126,240,
-180,243,120,152, 79,110,128,  7, 61,166, 95, 74, 93, 83,147, 93,247,105, 92,175, 73,101,190, 69, 71,105, 74,202,153, 10,108,130,
-212,142,100,163, 40, 88,230, 36,130,160, 83,202, 52, 77, 26, 68,232,229, 30, 27, 79,123,184, 37, 79,205,166,196,101, 85,116,182,
- 73, 71, 35,108, 72, 90, 68,166,220, 46,  4, 56,180, 23, 84,209,  5, 97,  7,  3,149,225,214,234,123,129,216,253,221,239,113,176,
- 23,  3,174,219, 95,167,161,116,245,  3,200,177,221,159,162,132,176, 97,182,229, 73, 27,128, 53, 11,223,179,  1,176, 39, 14, 61,
-179,110, 49, 87, 92,138,164, 73,146,233,178,165,150, 16,227, 84, 69, 42, 50, 94,109, 10, 71, 71, 96,168, 22, 37,159,133,105, 75,
-193,  9, 83,132,168, 41, 95, 14,158, 74, 45, 26,235,147, 34, 76,184,244,134,171, 40,104,204, 83,146, 41,175, 68,162, 76,140, 26,
-117, 76,161, 51,233,207, 31,  0,115,161,149,165, 62, 10,135, 57, 87,234, 12,157, 54,148,138,123,  5, 81,133,159, 38,108, 39, 22,
-195,242,231, 68, 66,152,157,  2, 68,128,208, 83,174, 57,  5,247,  3,144, 18,140,142,105, 41, 91,107, 89, 89, 79,134, 84,158,109,
-108,157,156,170,253,  2, 24,110, 77,  1, 74, 65,106, 28,151,106, 52, 57, 77,206,132,236,118,255,  0, 72,150,159,167,169, 41,148,
-219,202,116, 37,124,170,241, 18,165, 16, 50, 10,136,212,110,190, 89,  0,102, 91, 57, 54, 10,173, 96,125, 45,246,150,247,176,217,
- 88,139,245,185,184,195,137,205,164,100, 34,153, 99,169,146, 43, 14, 92,202, 82, 66,118,230,106, 62, 73, 25, 71, 75,134,111, 41,
- 23, 70,  4,  1,238,148,138, 91, 79,179,  2,163, 42,161,107, 43,221,217,145, 13, 23, 52,  5,211, 28, 76,196,148,190, 35,243,188,
-223,129, 37,188,163,195,105,198, 94,  1,193,212, 37, 68,105,199,141,108,212,103, 60,153,146,233, 80,100,164, 73,113, 42,158,134,
-163,128, 66,210,128,223, 59,193,178, 90, 87, 40, 29, 82, 74,185, 79, 84,231,174,179,235, 33,170, 93, 82, 77, 65,154,147, 17, 46,
- 76,178,176, 41, 85, 40,140, 45,104,144,248, 64, 74, 13, 62,115,105,115, 41,101, 46,164,185,225,171,144, 31,132,142,153,120,104,
-155, 91,103, 58,196,127,118,165, 59,108,201,150,211, 50,140,139, 86,167, 83,165,188,209, 10, 66, 17, 17,112, 22,243,140, 60, 16,
- 72, 81,231, 97,105,115,147,153, 93,245, 22,146,172,134,180,138,209, 72, 58,244, 55,189,174, 71,217, 35,212,143, 54,251,139, 30,
-173,181,252,117, 14, 86,239, 28,240, 77, 72,225, 81,117, 42, 44,182, 50, 45,220,171, 22,130, 84,251, 42, 72, 28,237, 90, 65, 85,
- 58, 66,227,  1,178,236,216, 17,129,148,194,170,116,121,146, 79,188, 38, 93, 38, 95,133, 10, 82,217, 78, 91, 18, 24,229,114, 60,
-196,167,194, 87,134, 28,105, 10,115,149, 65, 71,  7, 26,218,107,126,109, 90, 10,162,154,132,152, 21, 33, 32, 55,133, 48,201,165,
-212, 26, 80, 33, 63, 20,102,159,113,167,222, 82, 65, 82,130, 11,105, 73, 39,225,199, 46,172,180, 45,177,175,198,113,230,233,151,
-117, 62,124, 98,178,148,183, 92,183,144,196,137,  9, 81,248,202,103, 82, 28, 65,109, 73,194,146, 20, 24,229, 74,149,158, 83,170,
-151,157, 90, 22,218, 91,117,139,187,113, 17, 73,181,172,155, 85,134,101,215,110,181,213, 99,253, 77, 72, 98, 68,134,161, 70, 15,
-171,149, 18, 12,199,165, 63, 30, 59, 44, 48,211,146,228, 58,240, 75,  8,112,149, 16,164, 80,243, 60,247, 50, 62,199,125,199,193,
- 73, 23,219, 99,125,143, 82,  0,239, 80,241, 39, 21, 71,196,149,209, 83, 82,212,174,107, 81, 80,226, 56,226, 80,230,162, 70,147,
-234,226,138, 33, 50, 71, 80,238,238, 21, 99,138, 13,122,152,170,128,194,195, 15, 28,122,147,162, 40,105,244, 58,132, 37,223, 18,
-  3,231,194,234,242, 86, 28,114, 59,165, 43, 30, 26,249,214,164,228,128,219,188,202,202,185,192,213,242, 37, 81,151, 30,143, 37,
-197, 57,226, 48,  3, 43, 43,  9, 11, 44,184,174,102,157, 83, 95,206, 90, 22, 66, 70, 64,200, 86,124,137, 13, 21,189,112, 82, 46,
- 11,114,151,114, 91,117,216,119, 21,175,113, 83, 33, 86,232,117,120,238,174, 76,106,173, 26, 82, 67,145,101, 66,125,192, 11,141,
- 45,  4,130,146,128,164, 41, 37,183, 57, 92, 66,210,  3,147,114,251,147,205, 46, 54, 83,202,178,  2, 20,226, 80,132,161, 96,169,
- 73, 10, 36,120,173,129,204,140,147,204, 20, 64,198, 59,150,162, 37,117, 42,  5,134,194,253,108, 65,216,110,125, 71, 75, 11,250,
- 92,139, 85, 45, 11, 75, 83, 85, 72,209,180, 51,196,206,140,172, 25, 25, 24, 29, 14,146, 35,  0,209,184, 32,134, 82, 46, 24, 18,
- 55, 26, 78,240, 90,213, 31,208,130, 86,  9,  4, 18,130, 72, 73,229, 80, 42,230,108,126,177,199, 46,112, 65, 25,207, 93, 58,209,
- 39,130, 16,145,159,214, 81, 60,157, 65,194, 72,  0,114,156,158,128, 96, 14,165, 71, 30,128,234, 46,217,220,212,153,116,202,237,
-193,112,215,105,214,197,177,108, 64,126,171, 91,175,213, 37,166, 53, 46,151, 79,136, 18,100, 76,145, 41, 67,244, 76, 39, 45,163,
-148,  5, 41,199, 22,134,154, 11, 82,210,147,121,177, 56,210,225,140,221, 20,202, 80,185, 43,180,231, 43, 85,  4,209,236,251,142,
-240,181,165,219, 54,109,110,224,123,244, 52,198,233,213,121,111, 56,150,164,191, 39, 34,  8,154,220, 70,223,145,203,133,133,114,
- 37, 82, 44,159, 40,174,158,140, 87,178,  8,168, 83,237, 72, 72, 38,202, 69,200, 91,220,219, 97,125,133,250,145,136, 77,103, 11,
-113, 14, 98,249,179,100,188, 59, 93,159, 12,160, 94,161,169,105,165,154, 56,137, 78, 96, 87,150, 53,100, 83,203, 28,198, 91,150,
- 88,129,148,174,133, 36,110,229,114, 79,128,205, 58,148,133, 31, 26, 20,100, 59, 45, 60,196,132,212, 39, 20,202,122, 50, 84, 70,
- 84, 27, 10,142,218,188,129,109, 73,206, 70,  5,137,201, 14, 46, 63, 35,110,172, 30, 98,236,137, 60,136, 43, 66,208, 65, 73,  5,
-196,225,111,114,171,166, 73,229,  9, 25,193,  3, 88, 95,215,200,158,183, 30, 67,206, 41, 43,116,248,202,117,107,231, 82,249,143,
- 62, 86,165,101, 75, 43, 42,230,  4,  2,  9, 87, 55,198, 14,178, 38, 92, 98, 67, 32, 20,251,201,  8, 88,240, 16,146,164, 41, 67,
-178,192, 65,194,147,145,216,231, 10,198,125,116,226,139,237, 51,153,109,101,216, 45,137,176, 85,  0, 40, 38,219,249, 64,243, 91,
-246,186,  2, 70, 32,113, 80,251, 44, 81, 44,131, 83,130, 89,141,129,187, 49,212,196,131,181,139, 18, 64, 38,192, 90,228,140, 52,
- 23, 71, 18,155, 27,182,247,133, 23,109,175,221,230,219,141,180,184,238, 72,209,228,209,169,247,213,194,220, 10,181, 86, 20,201,
- 78, 65,135, 62, 60,103,163,251,172, 38, 37, 75,102, 75, 81,164,214, 36, 66,142,250,153, 91,141,169,214,146, 84,119, 30,147, 66,
-165, 80,195,147, 41,232, 38,166,235,108, 25,149,121, 74, 76,250,173, 65, 50, 26, 67,141,184, 37,252, 94, 36, 34,194,208,182,218,
-140, 81, 20,180, 82, 89, 10,109, 73, 89,131, 15,180, 99,113, 31,190,120,217,226,105,247, 21, 37, 48,237,189,193,122,201,132,220,
-231, 27, 90,216,183,172, 58, 52, 11, 98, 37, 40,182,149, 41,  9,140,210,225,202, 12,167,155,149,105,150,162,177,158,154,222,143,
-101, 55,180,158,109,129,120, 91, 92, 38,241,  1,118, 84,165,108,197,201, 83,133, 67,218, 59,194,177, 84,117,  3,105,238, 58,130,
-145, 22,145,102,215, 42, 78,168,190, 54,130,167, 53,198, 99,180,128,239,129, 65,155, 33,153, 40, 74, 41,207, 76, 66, 18,163,204,
- 18,106,169,105,103,136, 44,113,146,169, 37,205,135,152, 11, 55, 64, 21,137,251, 98,218, 65,  1,129, 26,156,119,103,137,223, 65,
- 12,230,155,192,222, 23,241, 67,129,120,142,163, 57,207,166,202,105,115, 92,243, 34,120, 80,201, 36, 83,210, 71, 89, 57,203, 94,
- 45, 47, 81, 37, 18,146,173, 69, 62,179, 89,161,231,164,145, 39, 16,209, 79, 40,202,229,206,203, 50, 92,167,210,208,107, 18,249,
- 17,239,226, 44,119,234, 17,224,182,163,206,183, 36,  8,104, 87,141, 37, 68,  5, 37,149,169, 33,190,156,196,116, 73, 21, 52,233,
- 79,123,195,137,167, 34,158,186,130, 89,101,234,213, 77, 81,234, 87, 35, 64,168, 41,152,136,167, 35, 45,198,233,144,132,186,180,
-161,158,159,161, 42, 57,214,118,211,109, 82,144, 99,162, 60,122,107, 81,146,184,210, 98,  6,209, 25, 12,173,165,168, 41,185, 13,
-180,145,149,165,224,224, 89, 57, 61,193, 61, 53,141, 63,114, 33,233, 11, 85, 22,  2,170,  6, 42, 84,212,185, 46,120, 80,168,201,
-117, 77,148,182, 88,156,160,181, 73,125,  4,163, 41,105, 11, 32, 40,146,226, 20, 64,212,177, 40,249,104,218,136, 93, 29,  1,247,
-238, 71,235, 92,237,232, 58, 18, 54,181,252,231,165,168, 98,130, 44,186,134,201, 24,  5,166,121, 54, 99,112, 87, 94,233, 10,130,
-202,186, 81,249,136, 78,144,193,201, 44, 84,122,  5, 38, 28, 86,234,113,156,144,169,205,161,212, 57, 82,170,201, 76,201, 45, 60,
-163,153,137,113,197,182,159,113,143,202,130, 20,219,  0, 33, 33, 33, 36,173,  0,232, 37,215, 92,148,250,153,181,195,113, 24,204,
- 83,252, 40,144,178,220,218,116,212, 96,205, 77,188,203,169,196,146,181,168,  6,221,112, 41,150,139,220,205,165, 69, 32,139, 44,
-136,107,113,106,122,179, 49,215,100, 48,241,113, 20,248,234,113,186,107,  6, 70, 20,166,155,136, 28,230,125, 10, 89,  0,151, 66,
-148,164,164,149, 30,184, 24,253,199,122, 66,165, 47,234,152,208, 81, 88,170, 60,133,169,134,151, 37, 17, 89,142,182,144,160,195,
-138,116, 16,184,175,115,146, 26,228, 35,152,  2,144, 10, 70,182, 97, 64, 14,163,229,113,223,173,246,245,220,141,236, 46,119,233,
-208,144,112,239, 75,150, 79, 93, 50,162,150,205,103,109, 68,106,254,230, 52,186,181,201,144,170,200,168, 55, 28,194,177,  0, 89,
- 74, 58, 49,195,130,197, 46,151, 71,143, 89,156,136, 50, 16,226,147,239, 45,220,146,230, 75, 91,181, 22,228,134, 85, 46, 53, 65,
- 42,116,169,215, 27, 81,116, 21,143,136, 56,176, 83,223, 69,209,101,194,118,104,120,212,188,105, 41,116,182,242, 25, 83,206,149,
- 54,218,214,160,181,186,242,194,131,168,108,182, 83,205,250,200,108,  3,147,240,233,134,126, 83,142,181, 21,235,160,213, 20,137,
-105,109,136,245,  1, 33,149, 69,131, 86, 73, 74,228,162, 18,225, 47,194, 98, 66,176,143,133,208, 29, 73, 36,133, 44,128, 52,237,
- 91, 17,157, 91,145, 84,244,169,143,180,227, 68, 21, 75,109,133,243, 33,111,129, 20, 74,114, 56,241, 39,182, 84,174, 82, 70, 20,
-165,173, 69, 57,239,167,120,101, 42,241,198,  6,146, 55,181,138,219,126,164, 14,187, 16,  5,245, 16,  5,201, 45,115,133, 51, 76,
-165,169, 40,229,154,170,189,170,102,150,227, 88, 37,145,130, 42,169, 88,221,140,154,183, 83,169, 71, 40, 43,236,138,  6,155,195,
-227,233,107,174,155, 39,136,190, 10, 30, 97,107,118,164, 56,127,220, 70,158,146,160, 16,217,132,155,246,143,200,210,154, 35,155,
-222,  4,191,120, 37, 71,  9, 82, 86, 10, 64,235,168,152,132,228, 28,164,164, 19,215,231,143, 77, 73,155,233, 79, 95,204, 87,248,
-240,217,189,185, 66,217,147, 47,105,120,111,164,154,148,182,157, 83,138,126, 70,226,221,245,186,220, 86,150,133,146, 80,148, 83,
-104,144,212,158,249, 18,186,147,129,168,234,237,246,223,222, 27,165,119,219,150, 21,133,110, 86,174,219,186,237,172, 68,160, 91,
-118,213,189, 79,122,169, 91,174, 86, 39, 44, 34, 53, 58,153,  1,128, 75,239, 43,226, 82,212, 74, 91,101,180, 45,231,150,219, 72,
- 90,211, 98,229, 79,202,203,150, 89, 92, 34,171, 76, 88,147,176, 28,199, 55,185,216, 11,111,185,252, 49,198, 60, 76,139,250,126,
-189, 32, 28,197,102,132, 46,145,114,196,195, 16,  0,  0,  1, 44, 73,181,128,  4,182,214,  7,108, 96,193, 42, 89, 72, 66,114, 71,
-100,165, 36,149, 99,176,  0,119, 58,237,167,177,211,217,215,  3,138,221,197,169,239, 54,241,210, 85, 43,135, 45,155,171,194, 77,
-122,148,248, 83,108,110,166,227, 37, 13, 84,169, 27, 94,149,140, 21,219,145, 99, 42, 44,251,145, 77,156,169,135,162, 82,185,144,
-185,207,  4,246, 39,129,175,163,187,181, 22, 69, 46,141,184, 92,116,214,164,223, 87,121,101,186,140,141,132,177,171,110,211,108,
- 90, 17, 41, 14, 34,153,125,223, 20,181,162,117,229, 60,  3,201, 42, 45, 53,216, 84,224,161,200,151,229,  4,149, 43,177, 76, 91,
- 27,113,181,244, 24,150, 14,210, 88, 54,166,216,237,189,188,185, 31, 81,216,214, 37, 26, 21,  6,221,166, 25,110,243, 75,144,204,
- 24,141,132,174,107,238,225,201, 18, 29, 43,126, 67,129, 42,121,215, 23,130, 27,243, 44,205,164,167, 43, 26, 24,161, 39,118, 99,
-165,220,118, 10,191,105, 84,157,152,182,150,181,202,117, 86, 19,158, 18,240,238,182,106,218, 90,236,242,  5,138,150, 59, 56,166,
- 62,103,145,133,180,  9, 71,217, 84,185, 12,200, 75, 22,182,135, 80, 11, 12,100, 74,154,169,242,176,132, 54,203,109, 54,195, 44,
- 71,140,203, 81,226, 70,137, 29,164,179, 10,  4, 72,236,165, 45,195,134,212,102, 91, 75,109,182,148,182,219, 76,161,  8, 74, 80,
- 18,144,232, 90,112,  2,249, 93,117, 25, 66,146,209, 71, 66, 22,162,163,134,241,211,245,150,177,159,152, 58,106,104,113, 92, 82,
-188, 39, 22, 57,159,117,107,144,172,114,134,208,144, 20,235, 77,249,242, 37, 62, 27, 96,249,156,159,144,217, 59, 62,158, 23, 33,
-162,160,146, 26, 67, 60,168,236,129, 33,209,134,130,134, 48,  2, 26, 35, 31, 51,211, 77,180, 46,116, 52,199,224, 54,176, 30,128,
- 14,214, 29,134,219,219, 98, 14, 47,113, 78, 21, 72,  3, 87,123,254,238,135,222,126,240, 59, 91, 14,157, 22,158, 26,105,164,172,
-  5,168,  4,243,159,213,231,121,125,145,208, 99, 30, 93, 60,129,211,139, 26, 35,109, 54, 49,133, 17,220, 16, 79, 83,232, 60,250,
-246, 31,187, 86,138,100, 68,165, 73,  8,229, 81,142, 64, 42, 86,112,183, 22,144, 21,130, 15, 85, 36, 19,242, 28,218,203,218, 78,
- 49,240,169, 41, 70, 66, 74,122,165, 68,142,170,207,160, 57, 72,251,254, 88,216, 14, 90,230,251, 15,244,249,254,125, 48,211, 87,
-166, 54,210,  5,205,133,251,123,192,239,235,247,  3,211, 99,142, 83,123,105,234,144, 40, 62,204, 78, 45,213, 56,172, 10,158,223,
-193,161, 68,109,166,214,234,222,168,213,110,106, 44,120, 49,210,219,105,230, 42, 83,161,103,253,144,131,228, 53,249,148, 74,163,
- 86, 33,178, 31,157, 73,168, 68, 97, 73, 37, 15, 75,136,244,102,150,130,114, 10, 29,117,176,149,119,242, 39,  7,166,117,250,228,
-239, 21, 54,139,113, 81,162, 91, 21,234, 77, 58,187,  2,167, 53,185, 83, 41, 53,168, 81, 42,144, 36, 71,167, 16,227,102, 68,  9,
-141, 45,167,146, 37,173,178,146,164,171,  5, 25,232, 70,154, 39,182,131,105, 43,148,145, 68,173,237, 86,217, 86,168,230, 58,226,
-138, 93, 86,195,181,102,211,147, 24,131,204,194, 99,191, 75, 41,109,188, 19,219,175, 94,132, 30,186,205, 29,108,244,181, 21, 13,
- 12,113,200,178,104,  7, 83, 48, 55, 91,237,178,176,177,213,114,119, 55,218,198,215,196, 43,137,120,  6,163,136,230,167,205,151,
- 49, 90, 53, 72, 22, 32,134,  2,250,180,203, 43,106, 45,205, 75, 41, 46, 64,178,159,179,125,239,183,228,250,227,101, 60,188,224,
-140,142,128,244,207,144,199,168,198, 48,126,122, 21,192,  0,  3,155, 35, 57,233,215,215,166,191, 65, 78, 47,125,129,220, 19,241,
- 21,  2,167, 90,218,170, 35,252, 48,110, 99,233,144,252, 74,205,131, 29,202,134,222,212,103,172, 18,132, 92, 59,119, 53,242,134,
- 99, 45,220,115, 59, 76,122, 43,169, 25, 41,109, 88,229, 48,230,227,131,217,183,196,255,  0,  1,119, 35,112,119,146,205, 19,108,
- 74,180,247, 33,217,251,193,104,151,171, 59,105,118,144,165,248, 44, 49, 88, 13,  5,219,245,162,132,229, 84,234,138, 35,202, 73,
-200,108, 58,145,204,100,244,217,164, 82,178,199, 50, 26,105,  9,  0, 92,221, 24,250, 43,250,158,193,130,177,236,164, 11,226,164,
-206,184, 91, 56,200, 65,146,174,  1, 45, 32,219,159, 17, 47, 24,222,195, 93,194,188,123,216, 93,212, 33, 36, 42,187, 28,115,229,
-210,158,163,169, 24, 62, 96,119,253,255,  0,215,160,212, 66,187,167, 24,232, 58,249,116,198, 49,219,174,141,117,  3,152,133,229,
- 39, 56, 41,199, 80,122,227, 65,120, 97,165,169, 73,201, 43,238, 14, 79, 41,235,146, 61, 52,244, 14,192,  1,182, 35,160, 31, 92,
- 14,231, 32, 73, 74,186,231,203, 24,251,137,244,208,101,  3,148, 32, 40,165, 57,236, 60,201,209,133, 63, 26,186,168,231,201, 71,
-225, 29,187,121, 13, 81, 86, 50,122, 16,115,246, 12,124,177,163,142,222,236,103,  3, 40,  3,211, 29,186, 30,189,241,215, 57,208,
-203, 24, 36, 15, 67,140,252,199,207,203, 69, 47,208,103,166,115,229,147,129,215, 62,186, 25, 64,244,230, 29,124,143,175,113,215,
-212,233, 85,189,129,245,235,243,240,198, 69,172,126,125, 48, 42,129,193, 30,127,147,161, 85,246,156, 17,215,204,  2,  8,199,217,
-162,148, 58,146, 20,122,103,207,167,159, 83,161, 92, 42,235,233,230, 71,159, 95,232,210,139,215,173,176,170,143, 95,157,176, 50,
-206, 15, 76, 31, 80, 71,224,126,220,104, 85,168,227, 28,189,125, 61,126,206,154, 37,100,103,  3,200,156,244,243,249,232,117,227,
- 57,235,233,242,251,180,182, 50,126, 54, 56, 25, 99,175,159, 81,231,229,242,210,215,178,172,119,200,244,198, 14,127, 31, 61, 45,
- 40, 47, 97,229,191,200,255,  0, 79,155,224,126, 56,162,144, 64, 30,191,143,158,170,163, 62,125,137,232,115,220,250,106,159,236,
-213, 69, 35,156,131,204, 71,166, 63, 63,156,233, 54,219,160,220, 99, 35,227,108, 20,131,208, 14,228,121, 99,231,251,116, 80, 56,
- 35,184,249,250,104, 22, 57,146,  8, 81,234, 59, 31, 80, 60,243,247,232,209,216,117,207,207, 68,223, 77,200,244,254, 88, 24, 45,
- 24,207, 92,231,203, 69, 35,207,183,239,208,173,124,207, 92,126,127,118,138, 64,232, 79,221,249,252,249,105, 44, 16,142,190,251,
- 15,145,130, 80, 58,103,215,250,244, 66, 49,140,129,215,212,247,207,245,106,146, 48, 57, 79,150,  7,252,116, 64,193,232, 49,223,
- 31, 97,210, 44, 79, 91,236,127,211,253, 48,153,183, 97,138,128, 40,  5,103,208,224,119,235,169,123,123, 41,104,112,173, 78,  2,
-173,121, 73,134,167,220,191,111,139,158,183, 80,116, 97, 14,  1, 26, 65,131, 29, 41,199,146, 91,142,  0, 58,136,106, 65,193,  4,
-140,224,156,227,211,175, 77, 75,111,217,163,113,199,172,240,  9,183,233,105,231,146,187, 86,241,187, 45,249,133,131,143,  9,213,
- 78,114, 75, 97,196,121,  2,219,168, 32,158,224,244,213,121,226, 65,147,244, 28, 33, 13,148,206,186,191,254, 57, 45,142,131,250,
- 49, 71, 12,158, 42,209,137,118,101,162,169, 41,214,225,249,148,226,226,196, 27,233, 45,211,181,251, 99,118,128, 83,114,214,210,
-153,146,220,116,144,235,125, 10,212,129,205,144, 20,161,156,249,105,224,180,100,161, 50, 35, 25,130, 74, 80, 57, 85,206, 20,176,
- 26,230,198, 22,164, 30,253,198,153, 40,181, 49,238,232, 92,122,195, 47, 73, 82,210,211, 81,100, 39,149,110,184,178, 82,218,  1,
- 61,252,180,248,219,242,107, 80,222,162, 71,155, 77, 98,169, 61,192,124,102, 35, 56,130, 91,108,254,170, 94, 72,254,110, 58,245,
-215, 54,213, 70,193,217,152,217,148,130,111,182,219,117,233,112,127, 28,123,  9,151,215,172, 84,113,194,236,164,181,215,237,232,
-114,116,222,246,144, 11,142,228,222,194,248,216, 58, 84,210,135, 89,145,227, 49, 81,108,184, 26, 12,189,132,132,180,123, 21,146,
- 58,249,103, 78, 29, 49,216,145,157, 46,202,141,  0, 50,165, 99,153,162,151,  0, 10,255,  0, 80, 14,216,207, 93, 55, 22,253, 58,
-116,249, 14,180,186, 68,194,162,227,110, 41, 40,100, 22,154, 72,236,208, 41,238, 63,167, 78,237, 50,222,105,197, 50,210,160,203,
-  5, 43,248,209,238,139, 82, 16,172,254,170, 84,  6, 15, 64,123,246,209, 97,137,100, 58,121,100, 21, 38,219,129,125,253,251,159,
-203,124, 66, 51,202,138, 53, 13,169,202,221,119, 10,203,112,189, 71,216, 96,  1, 27,139,233,177,239,124, 60, 54,123, 86,252,196,
-161, 45,162, 50,155,229,  7,170, 74, 10,129,238,  6, 71,112,116,252,211,104,240,209, 29, 41,140,174, 68, 20,228, 53,207,204,217,
- 24,234, 19,232,174,250,105,109, 74, 83,112,209, 24, 57, 24, 70, 14, 44,  8,200,152, 24,136,167,206,112,124, 36,200, 90, 75,189,
- 71,243,115,233,167,174,148,195,204, 73,247,101,182,182, 20,172, 18,219,237, 41, 33, 67,200,161, 67,203,168,237,167,136,114,230,
-101,187, 11,252, 13,192,191, 66,125,255,  0,150, 57,147,139,234,195, 84,202, 96,169,114,138, 75,  0,206, 26,224,108, 77,134,219,
-119, 54,216,237,113,131,109,233,  2,149, 48,165, 68,165, 30, 38, 65,  7,177,206, 58, 19,172, 11,142,250,104,187,248, 72,189,156,
-100,243,201,160,212,173,234,211, 33, 37, 75,  0, 55, 52,196,120,156,116,  8,228,153,212,158,131, 26,214,142, 52, 56,200,162,240,
-178,104,182,149, 18,205,170,110, 30,239, 93,144, 68,251,106,214,167,179, 37,200,145,162, 56,240,138,204,250,159,186, 52,167, 29,
- 74,229, 97, 13,180,210, 74,150, 65,201, 72, 25,215, 24,110,255,  0,109,214,236, 89,181,169,123, 63,196,206,212,209,225,216,219,
-139, 33, 54,133,121,152,140,200,163, 86,236,207,172, 95, 67, 44,213, 92, 50, 29, 90, 28,247, 39,220,142,243,241,228,161, 37,109,
- 48,160, 22,133, 16,160,237,150,210, 77, 74, 30, 57, 24,  4,148, 29, 42, 55,123,122,233,  0,155,  3,252,176,190, 77,224,151, 30,
-113,173, 21,  7, 27,228,116, 52,241,195,151,149,172,136, 84,213,193, 77, 53, 92, 16, 72,162, 73, 41,163,149,129,100, 44, 12,107,
- 36,134, 56,222, 75, 34,185, 39, 28,240,171, 81, 92, 18,235, 15,189, 50, 83, 15,182,251,205,242,193,  1,135, 11,172,188,227,129,
-215, 90,116, 41, 15,167,152, 55,128,160,127, 87,190,113,171,197,186,251, 84,199, 27,110,231, 91, 11,  8,109,105,102,164,211,204,
-152, 75,  4,120,205, 50,166, 93, 67,142, 51, 33,194, 84,147,146,190, 85,  0, 82,178, 59,103,187,207, 96, 84,168,155,135, 92,164,
-148,251,168,139, 80,118, 74,101, 49,206,195,115, 26, 83,165,196,200, 97,164,164,165, 44,172,160, 41, 39, 56, 83,110, 36,144,  0,
-213, 45,183,165,251,180,225, 57,214, 41,211,231, 46, 59,134, 32,155, 57,137, 75, 47, 56,165, 48,251,207,  7, 20,216, 97,211,207,
- 28, 22,210,121,212,147,204,148,242,228,105,122,137, 21, 98, 46,198,247, 22,  0,  1,112,118,  0,  3,218,222,150,216,220,157,247,
-199, 91,101, 89,173, 61, 78, 87, 77, 84, 36, 38, 42,136, 21,215, 65,180,182, 96, 28, 89,154,203,123,157,181, 30,246,  5,126,214,
- 30, 11, 94,207,114,229,117,201,237, 69,164,202,120,197,143, 54, 85, 82,157, 37,183,147, 22, 59,235,108, 65,134,165, 70,194,224,
- 61,226, 33, 45,144,231, 55, 47,196,226,209,149,116,219,107, 39,110,107,207,161,154, 43, 53, 69,192,105,220, 59, 45, 51,224, 51,
- 86, 64,151,226,135,152,104,200, 64, 67,211, 90,  7, 24, 74, 94, 41,111,  9,230,  0,233,156,176,182,201, 77,169, 18,170,137,115,
-223, 42,193,152,112, 99, 91,243,158,143, 35,199, 74,144,226, 36, 74,147, 13,192,137,144, 80,224,  4,151,  2,137, 82,194, 64, 37,
- 56, 27,217,102, 90,215,133, 41, 49, 27,133, 84, 98,165, 57,224,159,142,189,  5,146, 26,113, 35,153,236,152,138,109, 46,169, 69,
- 25, 87,137,133,140,117, 36, 18, 53, 10,175,145,203,  5,138, 80,109,208, 48, 59, 17, 96,  8,190,160,123,246,  0,108, 20, 27, 91,
- 12, 57,247, 17, 10,106,116,134,130,190,154, 78, 89, 80,156,196, 87,  1,193, 91, 30, 97, 18,163,152,205,238,197, 65,  6,218, 88,
- 22,108, 90,237,237,189,152,234,185, 95,164, 89,245,210,228,149, 56,245, 82,107, 53, 74,100,246, 35, 52,164,165,243, 25, 77,135,
-115,204,242, 70,121, 29, 74,177,211,148, 96, 43, 79, 29,187, 98, 95,172, 58,106, 17,164, 80, 67, 45, 56, 12, 74,109, 70,100,217,
-240, 85, 24,171,153, 44, 69,113,113, 82,236, 53, 20,  4,149, 21, 41, 69,  5, 39, 41, 86,  6,179,123,118,157, 92,141, 29, 16,156,
-183,161,203,117,169, 45, 41, 85,  8,181, 70, 27,109, 47,173,212,248,236, 71,106, 84, 99,132,175, 36, 36,133,242,100,225, 68,  4,
-141, 58,241, 37,169, 36,181, 81,162,206,163,163,196, 75,109,173,245,177, 34,  3, 69, 39,152,189,239,177, 10,146,225, 89, 79,232,
-208,128, 73,194,129, 72, 61,117,169, 79, 70,103, 39,152,  2,179,118,234, 61,230,215,211,210,196,129, 98, 64, 29,141,241, 79,103,
-220,101,153, 30,114, 70,144, 85, 43,  2, 13,228, 73, 14,130, 64, 58, 33,230,  2,133,252,192,233,140, 21,185,  0,130, 72,108,110,
-143, 14,191,  8,188, 39,209, 80,234, 30, 65,115,252,  6,171, 17,212, 71, 73,  7,149, 40, 68,198,155,113,192, 74, 65, 61,137, 39,
-175,124,235,131,126,216,205,247,152,111,141,190,225,194,146,243,176,233,118,141, 10,155,186,215,228, 17, 33,165,138,133,245,119,
- 54,244,107, 38, 20,208,210,212, 86,213, 50,201,  6, 83, 77, 44,254,130, 77,220,242,193, 10,  9, 34, 68, 98,167, 69,113,239,115,
- 98,162,209,150,227,169,100,164, 50,250, 30,142,153, 10, 67,104, 47,161,113,185,149,250,217,193,234,  7,124,117, 58,132,167,180,
- 11,114,157,191, 56,207,226,110,235, 91,220,193,123,191,119, 82,161,167, 35, 13,210,109, 57,205,218, 52,134, 80,174, 65,250, 54,
-233,246,252,102,210, 48, 48,150,250,247, 58,147, 81,229,101, 16,136,212, 49,107,111,110,151,247,223,215,107,145,238, 29,206, 45,
- 63,161,246, 88,153,247,139,149,156, 79,155,208,  8,233,184, 47, 46,150,174, 32,203, 38,147, 89, 80,241, 82,211,189,164,119, 95,
- 36, 18,213,200,157, 74, 75, 28,114, 11, 50,130, 59,157,236,172,221, 24,215,231, 13, 23, 37,147, 81,118, 25,168,236,189,253, 46,
-152,218, 93,144,151,101, 53,102,223,141,191,116, 91,190, 19,107, 28,209, 97, 71,172, 69,186,152, 65,253, 80,165,  4,167,  7, 26,
-218,107,158,228,161,191, 61,218,125, 49, 94,245, 40,172, 37,210,202,148, 67, 42, 11,229, 81,117,224, 57, 60,114, 15, 92,  2,160,
-149, 14,100,228,234, 49,124,  2,239,229, 79,110, 55,233,155, 77,234,234,233,116, 45,237,130,141,181,173,200,114, 66, 99, 70,106,
-181, 46,104,159, 98, 79,117,194,147,225, 52,221,203, 17,152,171,112, 17,134,171,110,142, 96,  9,204,138,108,186, 50,226,248, 65,
-230, 94, 18,210,234,138,218,116, 40, 56,144,201,253, 42,228,  2,144, 82,232,125, 39,155,155,185, 24,199,163, 70,113, 75, 61, 53,
- 66,211, 24,192,102, 80,250,173,177,  4,158,128,236,109,107, 27,244,244, 55,216,120,245,195,212, 92, 51,226,119, 20,241, 60, 83,
- 51,208,241, 68,223,164, 41, 96,  4,170, 44,179, 42,251,111, 53,134,197,189,176, 77, 41,141,108,170,146,160, 98,  5,181, 97, 28,
- 75,220,181, 26, 38,200,211,104,247, 69, 74,235,183,182,170,177,190,251, 65, 11,117,110,107, 14,159, 10,179,117, 91,182, 75,207,
-220, 78,183, 82,133, 14,168,  4, 79,171,216,186,153,183, 21, 41, 82,210, 98, 36, 41,  9,115, 46,170, 58, 78,196,185,236,244,224,
-218,187,107, 59,115,220,156, 71,239,126,228,237,173,  2,138,187,170,107, 84,230, 45, 75, 86,  5,193, 65,109,135,229, 52,252, 91,
-142,223,106, 82,213, 70,114, 67,192,198,106, 35, 40,154,243,242, 91,140,151, 91,112,244,112,233,245, 17, 14, 44,120,174, 52,203,
-140, 76,104,179, 45,183, 16,135, 25,122, 52,130,142,120,210,155,117, 36, 60,203,137, 64,  5,181,165, 73, 88,  7, 57,232, 53,131,
-111, 20,122,181,183,183, 23,101,181,105,248, 52,138,  5, 74, 76, 74,251,148,250,116, 97,  1, 16,222,167, 60,106, 47, 70,165, 53,
- 21, 77,181,  6,159, 41,244,182,244,150, 67,100, 56,236,116,184, 10, 10,220, 42, 89, 95, 56,135, 46,142, 10, 39,138, 88, 81,180,
-202, 38, 14, 74,164,134,226, 72,138, 50,168,146, 61,200, 73, 86, 72,223,161, 85,177,213, 91,112,255,  0,139,220, 97, 77,  6, 89,
-195,156, 53,196, 21, 60, 22,207,152, 77, 60,242,208,138, 52, 21, 75, 82,148,144,150,121, 38,162,154,174,158,178,  4,129,185,117,
- 52,245, 41,169, 36, 80, 81, 94,  4,118, 96,232,187,243,188, 52, 58, 53,183, 22,179,113, 84,169, 53,196, 81,160,251,245, 41,201,
- 62,244,245, 37, 30, 24, 17,105,181,  9, 10,121,208,245, 77,152,  9,140,153, 37,110, 58,225,146,151,148,235,139,112, 41,106,217,
-189,151,227, 46,253,131,118,219,180,250,252,122,125,201, 79,118,165, 17,114,150,164, 24,178,216,166,197,117, 15,212, 36, 41,109,
-252, 46,145, 13,149,146, 84,156, 16,146,163,211, 58,229, 18,107,239, 62,242,147, 37,199, 31, 91,206,242,186,241,117,192,165, 58,
-115,211, 39,155,149,210,121, 78, 15,117, 43,161,198,175,245,237,208,133,180,123, 77,185, 27,181, 83,195,175,211, 41, 12,109,245,
-155, 17,197,165, 15, 85, 55, 47,117, 95, 93,149,109, 82, 48,149,164,169,198,162, 73,174, 84, 86, 89,234,134,109,247, 20,190, 92,
-115, 20, 34,161,174,138,166, 35, 73, 52,177, 73, 35, 11, 42,177, 35,177,251, 38,224,129,110,227,176,216,  3,139, 63, 49,225,124,
-159, 58,137,168,171, 50,122, 67, 83,155,200,176,199,104,150, 37, 89,170,228, 17, 68, 21,129,214,136, 36,145, 64, 37,137, 84, 80,
- 88,147,124,113, 55,116,247, 70, 69,253,187,251,165,124,248,206,  6,183,  3,113, 47,219,205,230,124,103, 29,108, 53,115, 87, 43,
- 21, 40,234, 47,172,146,232, 75, 18, 90,  9, 39, 39, 13, 39,  9,232, 14,172, 14,214,153,120, 48,183, 78, 92,152, 57,157, 10, 37,
- 43,109,167, 26, 13,184,150,207, 80,131,206,176,172, 30,169,  9,  5, 24, 32,105,155,145, 77,159, 79,177, 55,214,248,122, 99,102,
- 14,214,238, 37, 54,195,167, 33,244, 45,181,207,144,221,  5,213,204, 44, 21, 16,151,138, 88,241,164,244, 32,167,198, 64, 82, 64,
- 41,200, 53, 27,141, 40,118,147, 76, 15, 45,169, 62, 12, 25,243,  2, 86, 20,234, 16,197, 62, 19, 65,165,164,117,229,247,167,138,
- 73, 61, 22,177,202,  7, 66, 69,171,  7, 12,211, 48,141, 68, 97,196, 42, 34,118,176,243,125, 68, 82, 27,237,230, 26,101, 64, 77,
-183, 59, 94,221,125, 38,200,188, 76,203,114,202, 54,165,142, 67, 20,116, 65, 22,  8,217,183, 68, 90,250,204,182, 21,  7,236,171,
- 60,153,116,228,  2, 70,148, 58,202,134,186, 15,209, 95,217,213,187,149,126, 36, 56, 44,216,253,206,187,174, 26,157,110,227,126,
-218,126,193,186,149,240,199, 84,155,163,109, 39,191,101, 84, 39,204,125,144, 23, 80,149, 50,149, 75,163, 76,121,231, 85,202,227,
-245, 23,148, 15, 58,213,173,192,169,181, 57,184,233, 69, 62, 75, 17,217,117,148, 54, 25,157,  8, 41, 77,184, 20, 57, 18, 85, 21,
-196, 40, 55,148, 36,167, 33,106,235,158,185, 26,226,103,176,146,232,171, 73,224,105,202, 90,107, 52,248, 49, 97,111,182,232,183,
- 25,185,145,221,148,239,233,169,118, 36,151, 91, 74,223,144,136,236, 44, 74, 46, 41, 40,108,169, 68,173,101, 73,230, 86,187, 41,
- 49,154,218,209,205, 42,173, 52, 52,180,165, 74, 68, 70, 98, 69,116,182,  9, 42, 83, 15,150, 84, 82,172,173, 43,228,  0,100,  3,
-231,140,166,170, 86,154, 21,107,179,160, 10, 88,238,110,160,139,147,114, 77,254, 59,238,122,227,195,207, 25,248,114,151,135,188,
-100,241, 27, 44,203,158, 10, 60,158,155, 59,204, 26,142,156, 69,166, 56,105,158,169,228,130, 24,163, 88,121, 65, 97,137,146, 53,
- 32,147,100,  5,141,201,182,  5, 94, 69,230, 10, 94,145, 46,158,251, 79, 45,104,148,212,  6, 23, 14, 74,219,229, 12, 45,182, 36,
- 58,225, 37,149, 97, 25,231, 83,121,  7,151,152,115,103, 88,171,145,168,116,244,134, 97,194,115,222,240,219,142,210,234,106,145,
- 26, 99, 65,211,209,246,222,146, 74,159,116, 16, 64, 41,113, 93,130, 80,224, 61, 53,146,220, 18, 42,169, 71,189, 65,175, 23,224,
- 43,196,110,100,138,180, 52, 73,141, 20,132,150,219,121,201, 49,146,211,140, 32,184, 66, 20, 84,  8, 65, 74, 73,198,117,138, 87,
- 28,148,234,162, 34,187, 74,117,192,134,195,141, 85,221,124,204,165, 74, 66, 64,  8,106, 33,105,  1,113,212,225, 81, 86, 31, 66,
- 49,205,221, 67, 11,214,189,142,171, 48,185,237,109,186,218,221,251, 94,219,220,117,  0,118,198,190, 89,205,228, 83,161,104,226,
-136,234,212,180,224,194,199, 64,  4,  7,140,136,249,140,128,157,144,137, 21, 72,107,233, 54, 57, 45, 21,111, 50,239,128,212,167,
-155,106, 99,237, 53, 50,  5, 82, 58,170,112,130, 22,133,248,114,226,201, 82, 20, 84,194, 84,162, 75, 79,133, 20,150,202,144,180,
-144, 70,158,219, 70,151, 29,231,155,118, 60,104,204, 22, 63,193,222,142,151, 20,169, 10,146,203,194, 58,208,195,190, 63,232,220,
- 83,255,  0, 26, 27, 64, 12,165,  9, 10,230,  9, 32,105,148,162, 91,141, 33,248, 83, 89,126, 99, 48,230,182, 20,180,198,150,244,
-129, 79,113, 60,188,170,101,153,170,115,222, 32,173, 37, 93,149,240, 99,149,124,169,  9, 89,109,184,249,226, 98, 31,  5,220, 21,
-239,191, 17, 15,200,136,155,150,213,178,166,210,246,246, 59, 73,141,  4, 86, 55, 54,239,228,181,236, 42, 83,  8, 90,185, 31,124,
-220, 21, 40,178,202, 18,149,144,213, 45,220,101, 41, 86,157,232,209,181,169, 10,100,111, 40, 23, 59,177, 54,181,129, 23,  4,146,
- 58,  1,212,220, 92, 98, 11,198,117,212,212,212,243, 58,213, 20, 77, 12,210, 54,146, 52,132, 30,109, 96, 29,244,170,155,187, 57,
- 42,  0, 96,197, 77,204,  4,253,172,219,203, 47,139, 95,105,175, 18,183,101,176,204,138,245, 61,141,200,141,179, 22, 18, 41,  9,
- 93, 86, 93,102,147,182,162, 46,222,210,152,166, 51, 24, 19, 62,108,219,142, 29, 80,176,134,211,151, 87, 57,  0,  2, 78, 76,168,
-189,147, 30,205, 59,119,129,141,189,137,185,219,145, 71,167,212,120,177,191,168, 72,110,225,150,239,131, 57,157,155,182, 42,104,
-109,241,183, 54,188,132,130,150,171,238,183,225,154,253, 69,162, 22,251,224,192,105, 98, 36,114, 29,230,127,176,159,128, 53, 76,
-144,190, 60,247,198,152,229, 94,166,106,149, 39, 54, 34, 21,106, 58, 84, 43, 87,116,135,159, 77,209,188,211,162, 60,140, 58,227,
- 18,159,150,197, 29,103,  9, 19, 37, 74,154,140,150,153, 34, 80,232,121,231, 86, 94,194,151,206, 84,165,229, 89, 83,132,156,149,
-100,255,  0, 59,169,238,117, 52,214,174,144,192, 15,246,106, 75, 42,129,210, 73, 19,102,115,254, 20, 96,116, 95,171,221,172, 52,
-163, 53, 11,192,252, 48,106,170,102,226,204,206, 29, 53, 57,147,188,180,145, 48,254,234, 41,  9,101,148,237, 96,238,166,209,126,
-196, 86, 97,188,158, 91,213,199, 90, 49,104, 79,128,238, 30,144,121,  9, 61,192,192,201, 10,245,242,251,181,174, 71,196,148,241,
-192, 74,219,247,143, 25,101,101, 88, 83,109,158,100, 32,143,231,159, 20,183,140,231,245,116,231,222,179,  3,236,178,194, 18,160,
-158, 67,240,159,214,231, 63,  8,200,245,230,  7,246,107, 16,183,233,171,125,220,148, 41, 94, 26,193, 82, 72, 56, 30, 24, 42, 25,
-  7,182, 93, 82,127,254,159,144,211, 69, 97,106,138,152,227, 83,176,254, 38,222,238,150,252, 15, 81,139, 78, 53, 68, 46, 72,176,
- 83,107,124, 58,253,247,191,243,198,113,108,211, 19,227,169,194,215, 63,134,203, 99,  5, 93, 27,101,146, 22,246, 14, 62, 37, 45,
-242,  7,255,  0, 71, 91, 55,104, 83,196, 88,200, 91,141, 21, 62,226,125,225,196,142,201,144,233,  1,182,178,161,208,  1,200,  7,
-158, 18,112, 52,218,218, 20, 34, 11, 72, 82, 48,167, 29, 66, 86,162,  9, 37,168,227,198,115, 36,249,169,100, 15,158,126,122,216,
- 74, 93, 56,165,176,160, 48, 80,160,230, 79, 96,234,193,228, 24,207, 80,150,250,245,243, 58,216,145,194,132,133, 59,122,123,247,
-233,252, 61, 58,123,176,171,188,113,197,169,205,134,223,126,214, 23,251,250,216,250, 19,223, 23,184, 45, 45, 45,164,250,130,146,
- 81,130,165, 58, 79,198,161,205,211,205, 71, 39, 29,135,217,171,242, 82,161,202,146, 14, 66, 64, 79, 92, 18,112, 18,132, 16,  7,
- 82, 71,151,110,167,174, 79, 64,225, 49,204,  6, 74,148,  8,194, 60,151,142,203, 80,  0,244,206, 50, 62, 95,110,173, 87,197, 93,
- 84, 74, 17, 76,101,242,212,170,171, 93, 62,154, 51,254, 77,126, 25, 50,166, 56,148,245,  8,102, 57, 81, 78, 59,184,180, 13,  2,
-252,184,139,157,194,142,158,167,111,226,127,215, 17,237, 18, 87, 87, 69, 75,  8, 13, 45, 67,233, 30,130,251,146,127,194,160, 22,
-111, 64,  9,233,134, 94,191, 60,214,174, 57,178,155, 80, 92, 88,138,250,178, 34,146, 73, 75,205,197, 89,247,133,181,215,245, 87,
- 40,172, 41, 93,185, 91, 30, 93,117,113,101,178,148, 36, 20,167, 60,185, 33, 32,115,124,125,242,123, 32, 17,235,228, 58,103, 58,
-  6,155,  5, 49,217,  1,  3, 41, 72, 72, 43, 80,202,251,124, 13,167, 57,231,230, 87,116,142,188,202,202,181,122,119,157,164,242,
-182,128, 48,114, 74,210, 29, 82,148,174,231,149,  4, 14,112,122, 96,156, 36, 12,232, 82,130, 20, 22,181,207, 83,241,235,252,127,
-134, 38,117,241,198,136,144, 66, 60,145, 40, 65,126,182, 80,  5,205,187,158,167,191,125,177,107,145,209, 56, 56, 42,192, 31,  7,
- 50,136, 81, 39,245,114,  6,113,145,215,212,143, 62,186,109,183, 18,195,178,183, 58,203,185,118,235,114, 45, 74, 13,245, 98, 93,
-244,185, 20,123,178,204,185,224,179, 84,161,215, 41,210,208, 90, 83, 50,227,188,143,209,202, 66, 15, 51, 50, 26, 45,202,140,234,
- 80,244,119, 91, 90, 65, 46, 20,133,132,149, 18,121, 66, 82,146,158,167,227,  3,  9, 11,231,233,205,133, 28,116,233,240,231,231,
-171,  4,167,130,146, 70,115,130,  7, 41,230,  1,190, 97,133,140,168,119,230, 25, 87, 47,167, 66,115,128,228,164, 50,233, 32, 21,
- 35,161, 23,  7,226, 15, 81,234, 45,238,196, 78,170,  0,218,129, 93, 72,247, 12,  8, 22, 32,141,193,  7, 98, 10,220, 16,110, 45,
-112,118,216,254,127, 62,215,111,101,  5,107,129, 75,173,157,208,218,223,173, 46,126, 22, 47,170,217,166,219, 21, 73,139,114,161,
- 95,218,219,154, 98, 29,148,206,220,223, 83, 66, 63,194, 24, 91, 77,191,245, 45, 81, 88, 76,246, 99,150, 29,196,198,148, 28,226,
- 11,202,192,207,250,185,206, 65,252,  7,207,183,227,175,213, 99,121,118,187,111,119,183,109,239,125,163,221, 75,114, 53,215,183,
- 27,137, 66,147,110, 93,212,  9, 73, 66,132,168, 18, 70, 89,155,  1,197, 28,211,235,208,230, 33,137,116,249, 72, 41, 92,105,113,
-154, 90, 84,  7, 50, 85,249,178,113,225,194, 13,235,193, 55, 17,215,238,197, 93,238,191, 80,167, 82,159, 69,111,111,238,242,201,
-110, 45,251,182,117,197,186,245,165,117,196,233,203,239, 75,138,218,226,212, 26, 24, 84,122,141, 58, 75, 74, 74, 64, 71, 51,238,
- 85, 86,192,138, 57,152,176,223,150,204,110, 72, 29, 81,137,234,203,216,159, 51, 46,237,118, 86, 99, 65,113,143, 12,174, 75, 50,
-215, 81, 41, 25,101, 83,105, 43,215,145, 46,237,160, 27,127,116,226,230, 50,126,201, 86, 67, 97,203,213,166, 30, 57, 89, 86, 50,
- 57, 63, 91, 35,175,110,154,250,115,156,144,122,249,254,255,  0,158,190,132, 99,161, 63, 14,  7, 46, 51,204,122,121,244,234,117,
-245, 72,229, 29, 50,113,234,114,  6,127,226, 52,254, 46,118,196, 36, 11, 11,116,192,142, 40,231,160, 24, 29,207,175,231,166,135,
- 82,137,238, 64,232,124,241,143,179, 68, 44, 19,211, 24,237,156, 99,160,245, 31,126, 52, 50,128,235,212,121,128, 78, 49,215,207,
-246,105, 68, 59, 91,211,  6,181,253,109,251,240, 59,128,  1,240,171,174,122,121,121,246,207,159,246,104,101,244,200,243, 35,246,
-  1,147,162, 21,140, 28,140,254,113,161,148,112,  8,235,215, 56,237,248,125,154, 85,112,176,189,136, 39,  3,168,  0, 15,145, 62,
- 99,204,143, 35,249,242,208,203,229,235,235,211,242,126,225,162, 87,140,117,249,224,122,159,158,135, 88,233,231,247,118,251,254,
-237, 44, 58,142,248,193,237,183, 67,243,247, 96, 69, 12, 31,183,175,217,165,175,171,198,113,140,126,255,  0,187,241,210,210,202,
- 77,133,197,207,221,131, 99,202,112, 72,  7,242,117, 92, 15, 35,128, 60,190, 67,250,245, 69,  3, 39,236, 25,209, 40,239,246, 15,
-207,219,164,143,175,174,  6, 42,164,124, 64, 14,131,166, 15,207,236,243,242,209, 35,215, 56,198, 62,220,124,191, 62,122,164,143,
- 51,208,255,  0, 72,235,253, 31,213,170,160,100,227, 56,233,145,243,252,254,237, 17,175,109,186,223,  3,  4,160,140,231, 62, 93,
-207, 79, 77, 22,130, 49,143, 63,233,251, 52, 26, 72, 30, 64,143,179,183,217,162,  1, 74,146, 72, 61, 65,252,115,142,159,159, 93,
- 35,140, 48,184,235,108, 20,140, 18,  1,239,158,135,203,239,209,169,  7,166, 14, 79,145,253,186,  1,158,132, 17,149, 14,196, 19,
-140,124,243,251,180,122, 72, 79, 76,145,211,160,233,147,164,  9, 36,220,225, 54, 29,199,206,216, 33,  4,224,142,153, 29, 85,219,
-183,166,164, 73,236,110,220, 31,173,246,111,125,182,170, 68,175, 13,251,106,189, 68,191,169,177,199,196,183, 33, 84,227, 24, 21,
-  2,134,250,229, 41,151, 17, 57, 35, 63,229,  6,117, 29,198,252,179,144,122,  1,230, 79,219,211, 93, 44,246, 85,110,228, 13,175,
-226,214,210,164,215,229, 24,246,198,234,192,168,237,157, 95,227,228,108, 75,174, 32, 59,111,188,224, 39,  4, 38,172,195,104,  4,
-246,247,157, 70,120,186,135,219,242, 26,232,130,234,146, 37,230, 46,215,221, 14,166,255,  0, 32, 97,247,226,198,240,131,136,227,
-225, 95, 18, 56, 87, 54,157,180, 83,123, 64,167,148,237, 97, 29, 72, 48,220,223,107, 43,186, 57,255,  0,166,248,146, 36, 30,101,
-188, 76,200, 92,160,148,190,196,228, 14, 82,218,114, 10, 92,  8,242, 87, 93,108,205,136,136, 94, 60,105,208,170, 83, 26,151,  9,
-191, 29, 82,222, 74,157, 92,231, 64,  7,195, 90, 79, 64,192,244,244, 26,103, 63,131,149,104,117, 26,148, 68,184,195,109, 83,228,
-173,134,209, 44,  2,226,202, 22, 82, 16,178, 79,234,114,242,159,179, 79,213,149, 33,113, 88, 77, 61,112, 27,121,229,248,106,149,
- 58, 39, 41,101,148, 19,213, 63, 32, 79, 66, 62,237,115, 51,211,150,121,  6,155,219,175, 91,109,181,133,253,226,219,123,241,235,
- 75,241, 11, 79, 76,188,137, 11, 48, 93,149, 89,118, 13,107,151, 89,  1,176, 11,212,  3, 98, 79, 75,219, 27, 67,183,181, 74,244,
-214,231, 56,229, 74,158,135, 38, 41, 14, 18,160,166,156, 74, 16,156, 36, 32,118, 65, 62,159,191, 89,190,241,113, 11,110,112,191,
-176,215,206,245, 95,  6, 20,202, 61,145, 74, 92,138,101, 45, 18,130,100, 92,247, 68,212,150, 40,116, 70,185,198, 84, 94,156,164,
-120,132,  3,202,211,110, 40,118,198,137,219,165, 83,139, 76,133, 80, 28, 90,114,210,212,240,109, 10,241, 74, 15, 76,167,253, 94,
-159,126,117,202, 47,164, 21, 92,174, 69,225,135,102, 32,209,169,178,160, 90,181,125,216,152,229,206,180, 71,  8,142,167,224, 81,
- 11,148,102, 36,173,177,132,143, 17,201, 42, 66, 85,208,148,156,117, 26,113,203,168,  3, 58,157, 54,103, 33,125,118, 36, 94,196,
-237,222,227,213,182,195, 70, 89, 79, 69,197, 92, 91,144,112,245,125, 61,168, 43,234,  1,157,252,177,147, 20, 49, 60,207, 26,149,
- 58,245, 75, 28, 77, 18,149, 55, 93, 87, 27,139,227,130,123,191,198,175, 16, 27,247,184, 53, 45,208,191,119, 70,231, 85, 90,163,
- 41,199,233,180,154, 61,106,117, 46,133,107,211, 84,247, 52, 26, 77, 22,153, 17,228, 34, 20,118, 27, 40, 72, 87, 47, 57, 41, 37,
-106, 42, 36,235,167, 28, 15,251,109,119,107, 98,106,116,123,  7,136,169,179,119,107,102, 31,113,136, 72,172, 74, 90,101,223,214,
- 83, 75, 33,180, 78,165,212, 93, 60,213,120,109,143,137,113,159, 82,138,146,217, 13,173, 11,198,163,142,186,235,108,188,164,169,
-213,165,121, 56,  0,143,231, 19,148, 16, 58,242,145,159, 46,186,  6,109,204,220, 84,151,229, 73, 75, 76,165, 69, 13,186,181,124,
- 13,149,252, 65,167, 20,122, 32, 43,175, 41, 61, 51,208, 28,156, 25, 60, 92, 63, 80, 37, 67,  1, 49, 19,208,129,189,141,182,255,
-  0, 21,246,184, 55,  7,184, 56,236,142, 32,151,195,140,255,  0,133,223,133,248,147,134,104, 42, 50, 10, 88,196,113,162,172,112,
-123, 24, 69,210,178, 83, 74,129,100,164,145,  7,247,111, 27, 39, 75, 54,164, 44,167,244, 98,220,125,244,218,109,207,181, 44, 93,
-211,218,219,134,218,187, 42, 87, 53, 36, 51, 69,220, 10, 51, 17,100, 76, 69,191, 35,149,215, 40, 82,159,113,  5,234, 52,228, 57,
-209,198, 86, 27,121,151, 16,161,243, 44, 38,219,240, 59,195,109,247,187, 50,119,219,118,236,200,251,153,118, 75,170, 65,173, 67,
-182,174,118,154,153,103,210,171, 16,188, 32,197, 90, 69, 61,192, 77,102, 97, 83, 13, 41, 94, 54, 91, 36,117, 74,129, 58,135, 95,
-  6,188,107,223,252, 45,110, 43, 52,233, 52,170,149,203, 96,222, 20,101,215, 83,103, 60,250,190,174,187,227,193,  5,199, 38, 91,
-143, 44,148,196,174,178,208,123,149, 72,234,165, 37, 41, 87, 50, 84, 70,166, 95,193, 71, 19,251, 57,196,190,221, 82,183, 35,102,
-111,  8,119, 37, 13,224,211, 21,170, 59,206,165,155,154,207,170,129,201, 34,143,114, 82,138,185,226,186,219,193, 72, 75,184,240,
-221,  9,202, 85,215, 26,134,231,185, 70,123, 75,158, 38,105, 42,145, 71,202, 88,163,146, 50, 90, 29, 18, 16,197, 88, 92,133,119,
-146, 38,219,245,140,108,190,102, 70, 11,198, 92, 75,194, 16,120, 95, 13,105,224,204,246,176, 46,111, 21, 85, 20,213, 74,239, 79,
- 89,200,142, 74,121, 30,138,165, 99,  8,209,242, 82,106, 70, 89, 32,229,195, 52, 53, 48, 77, 24, 84,168, 68, 26,105,237,  7,217,
- 19, 64,220,153,215, 20, 88,210,156,133, 88,145, 38,124, 79,119,101, 69,163, 18,166,128,243,109, 37, 40,  1, 44,161,169, 41,117,
-174,100,245, 74, 25, 74,  0,  3,  3, 90, 51, 69,177,226,173,138, 60,234,204,122, 85, 38,221,129, 41, 51,103,211,161,176, 94,110,
- 91,208,250,114, 84,204,148,115, 56,210,150,121,194, 65, 70, 22, 18, 73, 35, 82, 72,226, 42,210,160,110,117,160,197,162,168,115,
- 29,188,213, 74,168, 86, 45,  9, 77, 65,126, 76, 10,156,120,126, 17,171,208,229, 78,105, 60,176,167,150, 84,151,226,161,194, 60,
-101, 71,113,182,200, 89, 26,226, 82, 54,226, 82, 43,245, 56, 55, 19,146,165, 82,168,173,189, 53,234,122,121,219,167,174, 92, 53,
- 21,161,215,162,173,172, 60,148, 33, 24, 82, 73, 88,113, 92,185,201,201, 27,117,108,244,241,194, 26, 80,  4,200,175,177,  5,212,
-177, 33,144,129,246, 88,144, 74,234,211,113,184,242,225,135,128,248,146,174,159, 42,143, 44,172,115, 72,249,120, 15, 20,146, 35,
- 63, 50,152, 72,218, 26, 20, 93,164,179,172,144,173,201,  8,234, 67,105,179, 12, 29,182,244,136,190,236,139,162, 43,211, 44,218,
-  8,144,234,232,245, 56, 11, 17,235, 21,134,156,116,152, 20,134, 80,176,164, 56,209, 72, 43,143,200,135, 22,133,101, 74,113, 57,
-214,238,237,187,251,130,203, 76, 67,151, 72,167, 84, 98,133,170, 91,213, 42,148,233, 12, 76,138,192, 82,148,219,210, 68,113,202,
-170,138,219,193, 89, 73, 67,106, 72, 42, 40,200,248,181,222,133,  7,252, 38, 61, 94,168,236, 48,218, 34,198,106,222,121,215, 12,
- 42,  5,177, 73, 72,109,202,131, 44, 54,165,  4,166,172,236,131,241,  5,128, 23,219,155,149,  1, 39,109, 54,169, 47,214,159,141,
- 78, 48, 42, 53, 11, 73,106,126, 99,142,173,244,196,145,119,169,196,182,166,100,201, 84,167,  3,137,162,161,194, 72,100,  6,202,
-154,  9, 82,143,134, 60, 50,195, 58,115, 25,121,138,  2,  2,  5,250,155,236,  2,134,216,220, 95,168,238, 13,133,186, 73,115,220,
-216,213, 80, 74,207, 75, 13, 76, 72,128,234,144,106, 49, 40, 80,161, 99,149, 74, 52,149,  4,141,198,181, 87,112,116,142, 90,187,
-151,130,212,169,221, 85,192, 81, 71,162, 69,143, 17,233,177, 66,234,213,121,210, 29,109,249,104, 83,136, 47,211, 99,197,142,149,
- 42, 58, 27, 13,132,100,161, 42,  4, 36, 14,234,214,192, 82,168,207,  6,100, 72,146,243,115, 36,115, 37,223,120, 83, 66, 40,134,
-150,151,200,182,225, 67,103,224,109,191, 19,152,143,214, 95, 97,205,166,202,221,175,203,122,100, 42,117, 14, 27, 48, 96, 45,217,
-109,187, 93,144,132, 73,164,149, 65, 11,113,200,212,  8,170, 80, 21,149,224, 37, 41,120,242, 70, 10, 10,  9, 83,160, 99, 78, 43,
-116,232,146, 18,162,237, 86,169, 54, 43, 79, 52,133, 63, 42,172,182,163, 42, 83,190, 32,120,165,166, 16,210, 27, 75, 65, 69,178,
- 18,158, 64,162, 82, 50, 81,157,111, 81, 68, 21,129,  8, 22,227,101,189,237,123,109,114,  1,185,236,109,232, 47,107,226,137,226,
-141, 77, 41, 30,203, 30, 87, 20,158, 96,168, 26,121,138, 19,111,172,118,118,179, 18,159,221,137, 20, 88,110,150, 85,193, 53, 73,
-145,226,170, 46,101,196, 76,164,184, 28,240, 12,134,153, 95, 43, 10, 74,155, 46,181,207,144,121,194,  7, 62,  9, 82,143, 47,108,
-234,  4, 62,210, 58, 72,219,158, 58,184,155,183, 37, 40,183, 29,237,225,189,234, 44, 58, 57,127,200,220,181, 35,117,198, 37,  8,
- 56,229,118,159, 89, 74,128,242, 87, 67,131,157, 78,142,170,138, 83,209,158, 69, 30, 52,  6,160, 54,228,136,114, 46, 38, 99, 50,
-181,206,146,133,248, 78, 67,166, 72,113, 37, 82, 16,149,149, 37,199,134, 91, 66,242, 26, 11, 88, 90,147, 16,207,164,  3,178,234,
-161,113,  5,183,251,173, 73,167,134,104, 59,189, 97,210,168, 85,  9, 52,211,200,236, 43,223,109,162, 38,218,168,185, 41,231, 21,
-137, 21, 23,168, 70,202,152,128, 87,226, 56, 92, 95,235,114,171, 51, 28,157, 98,150,190,  8,100,110, 92, 83,221, 79,199, 69,239,
-185,177,177, 27, 15,128,189,142, 45, 63,163,127, 17,212,112,127, 20,113, 29, 53, 38,185,106,243,156,177,196, 81, 58,133,230,212,
- 82, 85, 83, 84, 44,108,169,172,160, 52,166,171, 97,169,163,  3, 91,114,200, 24,226,  4,154,196,244,219,106,220, 88, 18, 36,123,
-230,213,238,117, 58,151,184,116,120,110,184,212,168,118,117, 66, 76, 20,196,186,144,180, 43,157,136,145,234, 12,197, 91,146, 81,
-132, 70,114, 83, 75, 43, 75,110,100, 74,151,217,207,198,213, 39,137, 54,238, 61,133,221, 10,180, 42,127, 21,123, 72,167,219,169,
-193,146,168,241, 90,223,139,  2, 44,118,170, 52, 45,207,178, 66, 74, 81, 80,184, 88,183,166,211,141,199, 76,103,157,106, 33, 53,
-232,129,216,210,102,162, 20, 59,161,215,121,234, 81, 43, 84, 91,170,177,103,222,204, 45,171, 98,241,138,155,114,161, 89, 69, 74,
-148,180, 59, 78,143, 92,122,151, 17,151, 83,112, 82,132, 69,184,196,200,129,133, 59, 38, 25,125,133,176,243,141,180,149,244, 87,
-132,222, 13,248,140,184, 47,203, 39,113,120,121,171,199,191,238, 93,185, 98, 53,251,111, 91,251, 99, 85,166,215,175, 87, 41,240,
- 42,241,155,165,214,182,154, 47,191, 41, 91,145,104,211,234, 42, 83, 92,148,103, 83, 85,163,199,117, 84,250,197, 33,136,225, 97,
-185,206,113,194,121,109,101, 27, 45,125, 80,163,171,  2, 95, 99, 38, 41,121,134,115,162, 78, 66,144,133, 38,141,138,205,202, 84,
-102,150,120,231,139,150,134, 90,104,163,158, 75,196,249,142,105,226,180,212, 89,118, 93,165,163,138,170,138, 74,220,202, 74,236,
-184,209, 80,208,200,239, 65, 46, 97, 87, 27,213, 71, 85, 72,252,182,203, 23, 53,133,225,134, 42, 12,195, 41,170,210,211, 69,154,
-203, 85,150,205,166,227,165, 61,  6,  5, 54, 97, 74,156, 18,227, 69,110, 35,140,180,165,169,249, 82,156, 67, 13, 71,138,218, 85,
-241,185,226,184,218, 91, 31,  9, 82,214, 50,122,244, 11,114,111, 27,114,131,182,251,199, 34,255,  0,136,154, 45,247,176,245, 58,
- 22,218,111, 22,216,181, 81,143, 85,184, 45,221,195,188, 89,183,161, 89, 20, 42,100,159,117, 96, 92,148,187,141,187,194,223,118,
-133, 84,102, 59,113,170, 72,126, 72,105, 41,114, 12,164, 55, 75, 99,119,122,224,174, 51,245,  7, 19,219, 89,112,112,215,186,220,
- 60,220,144,175, 61,215, 77,193,108, 87,174,237,159,151,101,211,226, 77,189, 33,110,173,151, 93,162, 70,144,154,221,142, 81, 76,
-164, 63, 80,165, 60,241,153, 77, 68,215, 72,114,100,  8,147, 31,135,146,113, 71,183, 59,103, 34, 92, 13,253,110,235,173,110,165,
-205,184,176,173,202,147,143,193,221, 91, 86, 92, 45,209,191,156,186,104, 59,129,181, 86,205,199,245, 20,121, 48,102,109,181,175,
-123,214, 32, 86,104, 82, 40,181, 28,208,209, 13, 52, 53,191, 38,135, 86,101,109,214, 19, 84,229,188, 53, 74,207,159,161,161,167,
-175,150, 56, 86,121,140,113,211, 67,100, 55, 51,107,101,157, 73,146, 72,180,145, 11, 42,168,147,153,162,197,146,162,201, 56,112,
-210,113,141, 46, 79,196, 20,245, 18, 53, 58,173, 84, 67, 46, 95,106,106,245, 73, 41,170,  2,208,207, 24, 52,245, 80, 86, 80, 37,
- 72,165,150,158,114, 90,122,170,  9,135,212,151, 87,227, 20,104, 45, 87, 24, 85, 86,218,241, 42,148, 71,110, 43,170,211, 76,212,
- 52,150,132,106,245,151,114, 85,109, 11,162,129, 84,104,168,251,149,106,157,112,209, 42,113,229, 48,188, 58,218,227,142,108, 33,
- 77,169, 90, 21,237, 94,168,222, 22,133,223,195,254,202, 10, 93, 82, 93,177,180, 43,183,183,154,236,164, 81, 20,153,146, 98,238,
-125,229, 73,129, 91,163,213,175,116, 52,191, 22, 53, 66, 29,188,253,173, 71,167, 81, 57, 76,150,133,213, 81,149, 33, 81,220,148,
-211, 74,150,182,225,218, 92, 50,112,247,195,165,153, 77,165, 90,219,117, 99, 91,150, 60, 43,174,244,174,223, 49,109, 27,134,228,
-218,202,205,255,  0,107,212,149, 18,116,251,243,114,104,207,201,168, 51,121, 72,220,  7,211, 38,169, 13,184,115,170,215,251,244,
-217,244, 88,238, 70,155, 37,169, 49,121, 20,212, 93,185,118,222,225, 46,203,225,223, 98,183, 23,120,253,160,252,116, 84, 55,118,
-117,213,191, 91,223, 72,247, 69,219,219,105,184, 23,221, 98, 20,254, 44,230,237,204, 42,236,138,109, 42, 84,217,212,251,153,118,
- 17,144, 93, 52,138,101,143, 85,175,174, 58,252, 58,125, 67, 79,254, 28, 54, 93,153,214,174,113, 79, 20,121,133, 44, 97,185,112,
-  9,150,105,100, 73, 41, 86, 94, 92, 38, 35, 21,167, 43, 81, 29, 57,169,144, 44, 20,142, 37,170,101,154, 49, 70,106,111,238, 14,
-168,151,137,248,115,244,207, 19,210,215,101,116,144,212,140,186,131, 48,134,146, 36,164,139, 59,164,121,107,219, 53,204, 26,181,
-229,163,139, 38,160,162,201,235, 36,205,169, 85,235,234,125,154,190, 36,140,  9,162,154, 90, 72,169,213, 45,253,208,118,151, 97,
- 90, 91,181, 38, 13,167,103, 94,215,213,102,231,174, 55, 49,215, 31,172,238, 77,247, 17,216,119, 14,228, 45, 49,233,233,  9, 77,
- 46, 21, 66, 69,159, 70, 41,134,135, 99,193,140,211, 84,180,200,231,102, 82,155, 18,155, 83,131,120, 85,111,219,154,  3, 50,105,
-148,169, 19,160,193,160,214,170,113,194,103,214, 98,211,229,168,183, 62,159, 72, 66,178, 89,147, 84, 14,152,173,252, 45,248, 13,
- 54,178, 84,149,147,169,133,123, 64,189,146, 86,255,  0, 13,187,109,182,187,145, 64,219,248,219,185, 14,215,178,234,116, 13,218,
-222, 42,148,217,  2, 53, 42,184,204, 22,226,237,117,131, 14,206,132,240,114,194,225,222,157, 83, 53,138,149,106,161, 29, 14, 73,
-171, 86, 42,171,153, 89,124,169,230,121, 34,177,182, 91, 65,116,111, 46,243,196,218,253,171,247,251,206,183,116,213,106,146,228,
-110, 45, 77,182, 89,136,139,118, 28,148,197,186,119,  9, 54,243, 47,  6,109,107, 54,152,143, 26, 45, 38, 35,139,255,  0,  5,141,
-  9, 78,190, 85, 41,232,140,170,115, 83, 86,212,245, 25,140, 21,212, 63,162,231,161,141, 36,125, 43,202,166, 45, 35,172,211, 73,
- 10, 63,152,169, 40,176,  6,149,220,186,195,120,162,104,238, 34,191,184, 15, 62,224,252,219,132,178,206, 51,225,190, 45, 60, 75,
-193,102,174,190, 55,168,174,180,249,164,116,185,109, 52,249, 86, 93, 75,153, 84,195, 32,246,103,141,107, 43,115,158, 82,101,249,
- 74,150,205,227,150,183, 49,167,173,118,253, 35, 52,143, 98,189,  5, 54,159,179,243,109, 77,101, 98,  4,221,196,190,119, 71,112,
- 90,102,181, 21,  8,139, 91,164,212,174, 88,182,196, 10,140, 85, 56, 18,219,240,220,254,  9,200, 41,115, 33, 74,231, 82,146,146,
-218,155, 42,234,187,209, 27,163,184,237, 90, 72,168, 42,130,200,240,165, 64,143, 38, 82,158,160,173, 74, 13,  9, 84,182,157,124,
- 46, 93, 57, 73, 90, 10,152, 73, 43,100,172, 41,160,180,115, 32, 49, 27,  9, 77,177,109, 93,139,217,139, 99,111,227, 72,143,183,
-214,214,217,218,118,173,163,  6,173,153, 19, 88,131,108,210, 99,208,101, 65,174,135, 83,148,212,157,159, 79,150,244,181, 20,148,
-123,204,229, 43,177, 57,114,208,124, 17, 57,202, 83, 14,170, 36,  5,137, 85, 10, 36,185, 75, 84, 55, 96,202, 71, 42,132,120,171,
-113,106,241,219,116,146,219,173, 15, 11,186, 85,148,168,114,194,132,136,200,173, 31,158, 54, 80, 65,  3,168, 34,224,129,232, 65,
-213,184,220,116, 23,199,  0,113,150,101, 55, 20,241,127, 20,113, 19,235,165, 25,245,125, 85, 67,198,196,108,179, 84,182,152,185,
-133,129, 73,145, 89, 34, 14,220,203, 72,  8,103,229,150, 86,247, 81,110, 91, 49,167, 78,161,215, 37,212,219,113,213,165,218, 85,
- 69,240,244, 26,132, 54,129, 11, 49,228,181, 29, 46, 66,168,140,245, 75,156,193,124,161,183, 27, 28,201, 86,190, 81,155,125,104,
-135, 34, 12,114,220,121, 41, 40, 98,157, 53,228,170, 35,114, 20,230, 86,221, 26, 80,200,167, 40,169,103,158, 59,169,  8,202,112,
-128,131,144, 60,211,163, 71,152,183,230, 83,229,191,  4,133,169,153, 76,134,179, 60,198, 89,109,232, 14,212,225, 62, 86,221, 65,
- 13,185,148,165,196,101, 78, 32,243, 37,209,130, 19,153,208,146,134, 81, 41, 19, 11, 49,214, 86, 24,121,165,178,165, 69,168, 40,
- 31,135,  1, 64,169, 46,149, 41, 36, 40,254,144,  5, 36,146,188,100, 38,134, 48, 25,152,141,172, 46, 77,136,220, 27,250,141,253,
-222,226,122,130,193, 89, 80, 41,169,164,139, 72,146, 84, 43,112,200, 85,236, 84, 40, 87, 84,  1, 94,219, 21,144, 93,244,155, 22,
- 69,101,209,125,183,168,209, 97,190,250,204, 70,152,  5, 64,200,140,166,150,203,176, 87,241,151, 94,136,160,178,134,218, 89,230,
- 82,128,202,114,162,164,100,  2, 53, 28,111,107, 60, 59,251,143, 63,104, 23, 11,126,205,170,  3, 53,106, 46,201,109,173, 53, 27,
-255,  0,189,117,166,249,216,137, 90,147, 49, 18,105,172,202, 66,146,174, 71, 98, 81, 45,102,106, 49, 24, 42,193, 53,155,189,229,
-160,  5,197, 73,215,123, 47,141,211, 98,142,167,173,155, 89,193, 42,229, 25,106, 76,148,165, 47, 71,180, 91,112,  5,120,181, 23,
- 14, 83, 34,182, 58,174, 44, 18,162,180, 43,149,249, 92,173,165, 40,113,184,160,218,118,243, 51,158,189,219,161, 64, 93,228,170,
- 58,109,137, 55, 99,177,210,229,194,253,186,103, 61, 86, 93, 46, 69, 85,196,248,174,194, 85, 90, 68,169, 42, 65, 86, 20,243,235,
- 89,234,113,167, 76,190, 73, 36,154, 36, 66,  2,174,204,196,216,168, 96, 86,235, 97,187,142,171,113,179,  0, 79, 96, 43, 78, 39,
-200,167,207,168, 64,172,169, 48,195, 60,176,243, 35, 59,153,169,213,129,145,  9,184, 40,178,128, 35,189,201,120,217,238, 72, 33,
-152, 74, 45,191,110,218, 20, 10,  5,159,104, 82,163, 80,109, 43, 50,145, 78,182,173,138, 20, 36, 37,152,116,202, 37, 38, 58, 33,
- 65,136,219,104, 24, 24, 97,176,165, 43,186,214,165, 45, 89, 82,137,214, 66,192, 44, 56, 50, 64, 66,255,  0, 84,246, 74, 22,174,
-188,167,230, 79,109,121, 92,114, 87,226,132,243,  5, 16,162,145,156, 45, 62, 69, 56,238,161,231,246,106,239,  2, 58, 29,109,109,
-140, 45,  4,158,231,170, 65, 29, 58, 31, 49,251,181, 41, 93,150,200, 52, 42,216,  5,236,161, 64,  0,  1,233,167,107, 95,107, 15,
-118,  6,132,133, 20,133,242, 45,129,  0, 88,  1,181,128, 29,  5,187, 14,150,219,160,198, 15, 92,140,185,115,138, 64, 42, 71,192,
- 48, 51,148,245, 42, 81,  7,237,199,237,198,179, 75, 74,130,162,174,110, 64,124, 66, 48,124,213,215,155,149, 64,142,249, 35,240,
-215,148, 83, 60, 73,124,161, 36,156,132,103,190,121, 71, 64,125,124,254,243,173,128,177,237,177,134,150,166,134,  7, 42,186,224,
-143, 44, 12,121, 14,154, 67,202,160,201,111, 49,218,255,  0, 63,127,239,196,120,213,  0, 90,237,117,185, 55,251,239,238,249,252,
- 47,182,197,185,224,181,226,148, 36, 57,202,148,  5,148,228,167,152,  5, 58, 79, 79, 76, 14,157,180,226,  8,126,236,203,104,229,
- 60,234, 39, 41,  0,168,144,160, 20,178, 64, 31,173,203,129,242,206,178,138, 93, 27,145,148,  5, 35,225, 35, 39, 61,212,  7,196,
- 78, 60,251,  1,143, 61,123,145, 19,153, 69, 69,  4, 41,106,  8, 66, 83,212,227, 32, 37, 32,103,190, 59,159, 85,124,134,144,177,
-221,137,249,239,127,225,134,106,140,228, 77, 49,141, 79,213,198,127,211,243, 54,237,139, 84,118, 89,109, 14, 61, 41,212, 70,139,
- 13,135, 37,204,148,176, 18,212,104,172, 36,184,227,206, 40,246,108, 37, 56,249,146,  7,158,181,250,179, 86,126,239,172,200,171,
-165,165, 49, 78,105, 40,133, 70,101,239,129, 48, 41,109,171,225, 88,  0,126,146, 83,234,203,139, 61, 57, 66,130,124,177,167, 30,
-243,170, 10,151, 53,173, 13,126, 37, 62, 51,173,185, 94,117, 25,228,155, 49,165,  7, 24,164,151, 19,254, 82, 35, 74,  8, 47, 36,
-116, 83,129, 32,146,  1, 26,196,209, 13,152,192,120,189, 72, 36,248,109,160, 56,  2,128,  5, 63,163, 79, 92,103,  3, 39,160,236,
- 58,233, 61, 70,161,194,166,241, 70,119, 63,180,195,227,217,127, 22,248, 41,196,175,135,160, 90, 56,228,204, 39, 66,107,106,150,
-209, 41,  6,241,194,108, 75, 91, 99,174, 91,  3,191,217,140,  1,191, 54, 69,192, 76, 50, 27,111, 13, 54, 73, 64,  9, 75,139, 82,
-155,  0, 43,169, 44,128,  9, 62, 93, 64,193, 61,206,129,152, 95, 41, 82,138,208, 22, 65, 72, 12,164, 32,165,  0, 36,148,163,152,
-144,217,234,147,145,223, 36,228, 96, 13, 93,159, 83,174,103,149, 32, 40,182,126, 55, 51,206,132,145,201,240,161,  7, 35, 62, 99,
- 32,129,158,249,214, 55, 45,212, 37, 96, 41, 41,120,167,152,  0,148,  0,129,149,167, 39,148,225, 32,224,247, 61, 71,166,116,224,
-158, 91,109,185, 27,219,231,253,127,117,240,237, 35,179,146, 77,153,143,253,199,183,115,176,223,225,139, 75,238,163,147,144, 21,
- 40, 96,142,116,142,164,165, 71,170,222, 82,187, 31,136,  4,140,243,  1,229,215, 88,252,183, 65, 72, 11, 82, 74,126, 16,  8, 28,
-184, 82, 72,  9, 66, 86,188, 18, 18,124,176, 62,100,224,157, 92, 39, 56,224, 82,146, 23,204,162,174, 95,  9,  9, 79, 55, 83,240,
- 40,169, 64,252, 33, 36,252, 92,160,245,192,214, 45, 49,208,142,112, 21,241,171,170, 65, 78, 85,128, 50, 82, 74,129,229, 60,160,
-143,187,169,234, 53,176,135,175,112, 15,243, 31,187,175,201,195, 45, 82, 13,247,235,252, 62,255,  0,187,182,253,175,139, 84,247,
- 82,160,163,130,  9, 39, 36,167,159,175,196, 10,138, 66,176, 19,215,191,145, 57, 25,215,  6, 61,188, 92, 35, 69,226, 19,132,201,
- 91,199,110, 82,195,187,161,195, 10,102, 93,241, 28,140,192,126,125,115,105,170, 47, 48,214,226,219,142,184,128, 86,242, 33, 44,
-195,173,196, 64,207, 34,224, 76,242,116,235,186,178,222, 24, 37, 41, 81,237,144, 82,160, 20, 48, 84,  0,  3,162,199, 82, 58,245,
- 31,127, 70,250,191, 79,164,215, 96, 84, 40, 85,216,173, 79,160,215, 96, 84, 40, 53,232, 14,182,151, 35,203,161,214, 98, 61, 73,
-173, 66,121,165,116,117,135,105,115,166, 54, 71,126, 85,224, 28,246,216, 14,203,105, 35, 63, 89, 25, 12,191, 17, 98, 47,238, 61,
- 15,184,145,176, 59,197,243, 92,186, 44,214,138,175, 46,156,218, 42,180, 41,114,  7,145,137,  5, 36,183,172,110, 22, 65,210,229,
-109,238,199,229,128, 82,  2,137,239,143, 49,212, 31,152,199,126,154,248,172,145,219,166, 51,147,251,191, 13, 61,188, 74,237, 67,
-251,  7,196, 22,245,108,212,198, 21, 21, 91,103,185, 87,117,161, 21,133,168,173, 72,164, 83, 42,242,  5,  1, 65, 71,170,194,232,
- 46, 83, 92, 10,235,144,230,114,115,146,198,169,106, 88,  4, 43,155,166, 71, 76,119,245, 30,186,153,211,202,179,197, 12,202,124,
-178,168, 97,235, 98,  1,254,120,230,119,142, 72,157,226,149,116, 75, 17, 42,227,209,212,233,101,251,152, 17,138, 46, 16, 70, 51,
-235,156, 28, 99,251,116, 42,177,142,195,148,103, 30,125,187,147,243,213,117,168, 30,224, 12,142,248,206, 79,217,161, 87,208, 31,
- 60,156,126,255,  0,221,173,192, 44,  0,244,192, 29,190, 56, 29, 89,193,233,255,  0, 14,253, 52, 34,142,113,223,207,184,  3,240,
-209,107,237,223, 29, 71,231,243,233,161,156, 32,  2, 51,147,231,142,191, 62,154, 85,  7,124, 42, 44,119,192,171, 35,203, 63,126,
-113,231,228,117, 69,125,179,147,255,  0, 31, 93, 87, 95, 55,158, 49,229,249,245,208,235,199,207, 62, 94,159,126,149,  2,228, 99,
- 29,  0,  3,231,255,  0, 24, 21,103,175,216, 49,159, 93, 45, 37,254,183,221,211, 75, 74,139,128,  0, 31,142, 13,143,168,198, 79,
-124,227,238,199, 79,219,162,145,140,118,235,230,113,251,254,205,  8,223, 83,147,145,208,244,251,241,215, 69, 35,177,235,231,219,
-247,232,141,107, 47,108, 12, 18,142,199,167,223,235,249,253,250,169,158,221,250,124,254,126, 94,154,164,140,245,233,211,215,247,
-124,245,237, 36, 40,144, 15, 99,131,223,161,210, 78, 54,248, 96, 99,223,140,142,249, 24,  0,103, 25,202, 78,139,108,149,129,212,
-  0,124,241,215,168,233,211,239,253,154, 16,180,  1, 56,  0, 36,228,159, 79, 44,147,243,254,189, 86,109, 65, 36, 14,184,198,  2,
-143,203,212,253,218, 64,155,117,192,193,237, 39,151,  3,175, 66,123,119, 63, 63,144,209,  8, 95, 51,137, 73, 78, 57,115,241, 30,
-221, 60,178,126,122,  8, 60,140,148,130, 85,216,224,117, 87,159,124,253,167,240,209, 63, 11,137,248,186, 28,252, 35,168,207,219,
-248,233, 22,234,113,131,235,243,233,139,187, 64, 43,162,136, 63, 49,147,235,233,247,106,247, 70,169,212,104, 85, 90,117,110,145,
- 41,200, 53, 90, 68,248,117, 58, 92,198,148, 80,236, 90,141, 62, 75, 82,225, 74,109, 67,170, 84,137, 44,180,175,184,141, 88,152,
- 10,229, 79, 96, 48, 57,177,219, 35,167, 79,219,162,211,156, 40,118, 30, 71,184,249,245,242,233,162,144, 24, 21, 97,112,118, 32,
-239,132, 15,196,169, 30,155, 16, 71,112, 71, 67,137,193,240,233,185, 20, 62, 44,120,124,219, 61,240,167, 76, 71,191, 84,105,140,
- 81, 55, 14,155,  5, 64, 73,165,223,148, 54,155,135, 89,139, 53,  8, 57,103,197,121,191, 25, 25,253,100, 72, 65,  4,131,173,161,
-180,210,245, 40,183, 10, 44, 52,248, 14,171,153,247, 36, 40,150,208,211,100, 16,181,171,201, 93,  7, 79, 83,168,161,123, 40,248,
-226,137,194,214,237,191, 97,110, 76,199,  6,196,111, 20,202,117, 42,239,113,106, 82,155,179,174, 82, 83, 18,135,123,178,146,127,
- 69, 25, 42,113, 12, 78,199,254, 43,149,211,158, 67,169,140, 46,220,104,182,207,128,184,210,104, 79,178,197, 70,159, 80,128,226,
- 36, 70,171, 65,146,132,189, 18, 92,121, 77,168,165,248,174, 52,182,212, 10, 73,  7,155, 84, 39, 16,240,233,203,115, 25, 99, 88,
-201,130, 67,170, 35,216,169, 61, 47,220,173,244,155,247,243, 17,102, 24,239,143, 11, 60, 80,110, 39,225,218, 88,107,103, 15,152,
-229,170,144,213, 33, 98, 60,234,  0, 89,236, 55, 34,117, 93, 98,219,115,  3,198,  8,209,135, 82,196,175,212,218,113,133,198, 84,
-117, 38, 71, 32, 67, 78,101,  4,182,142,157,  7,255,  0, 22,125,124,255,  0, 13,121,226,147, 97,169,220,100,236, 45,251,195,253,
-214, 96, 83, 89,184, 96, 55, 58,221,184,156, 71,138, 45,139,210,151,207, 34,220,169,161, 93,196,113, 36,248, 82,113,221,137, 11,
-244,198,172,116, 62,102,100,181, 29,160, 61,231,149, 60,142, 99,224,101,164,246,  3, 29,128, 25,233,173,128,164, 74, 18, 99,198,
- 73,116,183, 25,181,114, 60,178, 57, 76,151, 16, 50,162,162, 14,124, 60,129,246,235, 82,158,  2,165,118,210,203, 98, 45,216,245,
-190,219, 94,253,  7,223,139, 66,108,214,122, 57,232,179, 76,177, 18,150,182,141,214,104,102,243, 49, 73, 35, 33,209,244,220,171,
-217,133,180,176,210,230,225,188,151,199,230,211,196, 86,208,238, 55, 15,155,153,121,237, 22,231, 81,100,219,215,221,143, 82,149,
- 79,168, 71,125,106,110, 52,230, 88, 90,132,122,157, 46,106,128, 76,202,124,136,220,143, 71,121, 63, 11,141,186,146,  8, 36,141,
-107, 90,238,137,210, 99,242, 84,194, 39,208,228,243, 69,156,165,101, 50, 16,209, 35,156,184, 17,212, 56,158,138, 66,198, 72,229,
- 26,253, 19,125,160,126,206, 29,169,246,133, 88,112,226,214,219,129,100,111,  5,191, 18, 68, 91, 19,116,219,132, 28,148,220, 38,
-208,181, 53, 65,186, 99,180, 66,170,182,233,119, 30, 25, 39,198,138, 86,165, 50,121, 74,144, 97, 29,196,223,179,219,138,238, 14,
-171, 85, 42, 30,238,109, 69,202,253,158,137,146, 26,165, 95,150,229, 61,202,229,149, 91,134,219,133, 41,155, 18,173, 13,165,  6,
- 91, 82, 48,172, 57,202,180,231,  5, 26,179,178, 42,250, 57,225, 72,106,149, 86,169, 74,233, 44,116,220, 29,175, 27,118,123,216,
-133,216,130, 59,142,146,250,158, 42,173,226,215, 74,204,190,189,178,218,167,133,214,182,141,111, 32, 18,142,242, 68,219, 84,208,
-202,162, 69,119,250,199, 68, 58, 38, 17,181,158, 86, 98,205, 98,245,184,155,179,246,190,133,117, 81, 43,212, 69,205, 93,107,111,
-171,201,247,180,220, 22,125, 75,170,221,143, 77,172, 67, 70, 41, 51,212, 66,147,225, 62,180,195,146,121,152,117, 41, 82,145,153,
- 39,123, 14, 56,116,186,118,163,136, 57,119,139, 91,231,181, 82,105,117, 56,211, 85,187, 59, 81, 50,174,154, 46,225, 86, 41,142,
-178,236, 71, 96, 81, 44, 39,154, 15, 79,169,138,138,154,146,169,140,169,198,154,240,202,146,121,  8,214,156,123, 19,246,162,147,
-184,219,245,181,214,173, 74,157,114, 91,212, 68, 94,177, 46,  9, 87,209,164, 82, 35,166,152,213, 40, 26,147,148,152, 53,249, 12,
-182,135,161, 77, 92,118,163,188,212,150,221, 87, 43,171, 72, 10, 95, 41,212,194,248,217,224, 59, 96,239,203,211,110,184,157,163,
-220,219,119,195,142,224,236,189, 90, 53,199,112,238,141,180,213, 54,131, 86,184,173, 90, 80,241,158,162,204,105,137, 44, 68,247,
-146,216,120, 38, 83,136, 82,185, 95, 91,106, 14, 36,132,105, 42,177, 85, 95, 69,196, 84,180,235, 13, 45, 13, 59,  8,229, 63, 84,
-100,153,228, 44,254,209,101,229,  8,180, 29, 45, 34, 57,120,102, 98,238, 84, 54,248,177,115, 46, 32,224,110, 24,171,225,142, 26,
-226,122,217,198,119,199, 25, 21, 76,116,245,242, 71, 93, 93, 67,144, 67, 83, 72,217,122,208,154, 38,146,170, 74,254,122,137, 97,
-203,171, 80,123,126, 86, 13, 50,114,230,134, 52, 43,104,160,110, 52,106,229, 82,239,218, 10,165,197, 42,143, 92,155,112, 63, 79,
-182,109,170,172, 86, 42, 53, 42,212, 72,110,166, 83, 17, 83, 38, 18,137,166,133, 50,164,172, 60, 85,240,145,228,123, 92,248,153,
-225, 90,117,139, 14,223,186,217,144,212,184,247, 13, 37,217,245,234, 50, 30, 68,154,188, 47,118,  5,245,153, 13, 36,  5, 84,225,
-248, 64, 45,114, 16,133,  4,120,  5,183,210,145,135, 23,170, 17,120,166,246,122,210,239,  8,251,245, 73,221, 42,108,202,125, 54,
- 85,110, 12,136,116, 25,110, 42,164,252,181,186,183, 36, 84,100, 71,157,200,243,176,212,251, 97, 40,154,128, 27, 80, 87, 42,  0,
- 73,215, 28,248,248,246,138,238,223, 31, 27,209,100, 13,189,190,175, 61,174,217, 13,133,184,168,247,110,220, 46,215,168, 72,182,
- 43, 50,175, 26, 23,136,134,174, 58,133, 66, 41, 14,213, 96, 61,144,143,113,148, 85, 17,198,121,155,117,149,165, 68, 30, 78,240,
-151, 41,171,203,168,248,214,139,140,242,218,147, 61, 39, 46,146,154,176, 74, 94, 58,115, 70,238,237,110,102,210,194,237, 49, 74,
-101,167,176,152,106,242, 71,253,233, 17,120,  7,226,111,137,188, 85,195,180,126, 29,112,252,188, 55,150, 71, 72,245, 89,147,103,
-144, 54, 91, 11,230, 13, 18, 65,236,212,236,144, 84, 78,202,220,184,170, 37,144,199, 57,137, 21,156, 76,199,149,  3,245, 94,101,
-153, 14, 91, 11,118,106, 60, 38, 42, 50, 98,248, 52,232,255,  0,224, 76,210,169,176,210, 23, 58, 67, 75, 75,170,196,215, 65, 90,
- 66,200, 82,134, 70, 57,121,122,190,116, 74, 93, 58,224,113, 52,104,137,117, 22,180, 38, 41,236, 84,166,201,117,250,127,189,196,
-138,202,165, 63, 77,135, 61,213,  5, 70,128,166,194, 12,199, 18,144,165,140,160, 16,130,179,166,155,101, 55,170,133,187,214,166,
-214,220, 55, 67, 20, 74, 22,231,223,150, 76, 91,182, 85,181,  1,133, 66,160,215,231,197,159, 82,164,204,170, 90, 80,221, 39,244,
- 42,118,154,185, 47,211,155, 89,114, 42,164,175,221,144,228, 84, 39,195,216, 74,124, 72,107, 67,204, 60,133,205, 66,221, 76,153,
-140,248,200,105, 21,106,162,212,144,195,107,125, 39,244,116,228, 20,254,149, 32,124, 73, 74, 16, 82,160,149,  5, 73,200, 40,225,
-  8, 33,133,138,157,182, 82,  3, 95, 73,181,137,216,116,212, 13,238,110, 49, 90,230,167, 55,225,188,207, 50,225,188,237,100,164,
-205,114, 10,186,138,102, 10, 67, 66,181, 20,181, 15, 75, 52,145, 56, 33,102, 11, 36, 14,177,206,  9, 14, 84, 59, 29,188,174, 84,
- 59,173,112, 93,143, 85,131, 21,160,229,114, 44, 58, 45,153, 66, 12,  7, 27,139, 74, 91,136,101,170,139,205, 35,148, 83,216, 89,
-109, 47,175,160, 45,198, 97,150, 17,149, 40,129,153,191, 33,138, 45, 46, 76, 10,157, 73, 53,234,220,249, 45, 83,233,211, 28,109,
- 44, 82,226, 34,114,131, 18, 43, 40,129, 31,153, 48, 97, 70, 47, 36,186,181,120,174, 58,242, 82,209, 95, 50,212, 18,208, 73, 83,
- 80, 80,204,199,127,194, 85, 21,242, 79,187, 56,168,170,169,212,221,108, 50, 91,138,234,193,240,227,178,130, 24,101, 57,229,108,
- 41, 75, 86, 74, 20,  9,139,172, 74,165, 58,245,126,172,220, 89,142, 26,131,177,226,196,130, 86,202, 30,125,154,122,189,198,155,
- 17,167,  0,  8,166,198,149,239, 78, 60,238, 79,139,135, 31, 80, 75,139, 70,183,210, 72,208, 37,152, 14,131,107,157,246,216,129,
-183, 77,134,221,141,183, 54,195, 12,185,100, 85,145,194,212,139,125, 68,121, 69,150, 73, 36, 70, 28,168,213,141,221, 80, 38,242,
-239,121, 25,155,153,118, 55,137,194,174, 84, 41,148, 85,183, 64,162,120, 21,  9, 84,184, 49,145, 29, 46, 45, 79, 64,165, 64,110,
- 50,132,154,165, 69,214,148, 82,194,220, 74,138,147, 28,101,231,150,232,192, 66,  9, 86,185, 17,237, 36,216, 24,156, 79,108, 45,
- 91,106,157,145, 17,119,146,170, 52,251,163,110,235,115,214,150, 35,192,191,179, 38, 60, 55, 42, 47,160, 19,  2,219,168,211, 29,
-118,157, 56,164, 20, 50,202,227,203,  3,158, 10, 73,232,220,233,143,193,167,180,203, 82, 67,210, 37,192,145, 88,170, 20, 52,150,
-230, 54,253, 90,120,113, 41,119,149, 69, 38,115,235,  1, 12,182,  7,193, 25,  9, 82,185,130, 82,117,175,119,139, 85,218,217,157,
-245,121, 66, 42,143,213, 32,176,154,170,185, 28,143, 69, 75,  2,115,178,106, 74,141,250,175, 22, 25,108,248, 12, 35,  8, 91,142,
- 54,181,252,  5,122, 88,213,203, 28,145, 75, 78,229, 37,167, 97, 34,183,236,148, 33,148,223, 96, 69,197,183,176, 63,102,214,216,
- 58,240,190, 68,114,250,243,152, 23, 19,199,  8,114,242, 72, 72,231, 22,188,108,205,176,101,137,213,157,138,160, 37,149,131,121,
-245,  2, 96,171,183, 20,137,123, 31,191,149, 91, 47,123,232, 85, 27, 62, 93,  6,181, 34,220,190,237,155,214,132,186,220, 88,179,
-217,150,220, 71,128,149, 75,125,138,149,169, 90, 75,203, 96,211,110, 42, 91,143,176,165,184,194,229,195,126, 59,201,121, 83,127,
-216,175,102,198,192,241,189,192, 78,211, 93,151,173, 66,131, 11,121,110, 27,122,109, 78,202,226,103,134,152,244,170, 29,255,  0,
-106, 75, 77, 80,127,  7,147,118,200,183,170, 81,169, 27,137,124, 65,102, 20, 38,171, 53,  4, 24,110,205,241, 18,226,164,123,227,
- 13,202,211, 37,186,124, 33,108, 79, 16, 66,211,103,113,182,182,139,118, 84,173,  7,156,166,216,183, 99,192, 67,187, 32,202, 95,
- 52,202,236,231,238, 88,201, 46,213,173,214,193, 83,203,133, 49, 50, 99,173,245,243, 52,203, 11,115,159, 93,  2,225, 42,126,233,
-240,185,105, 84,108, 74, 45, 95,108, 43, 59, 35, 69, 97,250,141, 10,138,230,217, 90,251, 48,139,  9,233, 47,173, 83,167, 92, 23,
-133,177, 85, 69, 46,182,212,244, 48,183, 86,228,216,112,223, 43,138, 95,241, 29,230,228, 19,170, 78, 41,201,115, 12,218,154,183,
- 54,203,228, 66,244,207, 79, 57, 83,174, 48,118,211, 36,113,139, 51,236,182,144,200,197,209, 89,  4, 74, 66, 18,100,220, 71,196,
- 25,253, 47,135,176,101, 60, 41,197, 99, 32,207,114, 92,228,102, 52,138,194,116,168,154, 25, 34,146, 41,169,214,165, 68,180,176,
-199, 36,210,  6,122,  3, 28, 20,213, 45, 28,143, 83, 37, 84,238, 34,143, 74,120, 89,225,111,121,247,111,121,238, 89,155,225,184,
-220, 82,237,142,251,112,146,253, 17,207,229,239, 14,200,188, 40,150,199, 16, 91, 53,100,203,106,223,161,219, 59,177,105,238, 28,
-  8,141,191,184, 84,122,123,188,237, 86, 66, 93,102,187, 65,135, 61,155,146,157, 54, 68,117, 85,170, 29,  5,246,132,237, 76,171,
- 94,215,181, 54,235,103,182,227, 99,237,219, 50,147,100,221,151,117,186,253, 38,155, 38,143,114, 90, 87,  4,106,212, 53,220,242,
-118,242,194,180,160,179, 75,166, 81, 39, 84,235,112, 68,217,140, 61,226, 50,212,247, 22, 89,118, 35, 77,235, 83,184,202,246,199,
-112,111, 70,219,122,181,  6,171,108, 65,226,231,125,105,213,122,204, 75, 11,108,236, 27,130,252,141,176,118,155, 98,  2, 33,193,
-175,238,213,251, 13, 81, 98,223, 52,197,206, 75,206,187, 71,165, 38,170,196,168,241,155,138, 85,  9,111, 46, 98, 52, 47,111,189,
-188,183, 37,209,109, 10,103, 17, 22,  2,110,109,194,146,227,138,131,118,219,246,163,116, 11, 98,132,235,103, 52,122, 75,118,253,
-157, 38, 77, 80, 90, 17,210,101,178,248,116,206,118, 75, 83,212, 28,101,175,  1,149,162, 45,226,190, 70,185,231,  0,203,149,228,
-121,123,231,153,198,105, 91, 28,230, 88, 16, 36,112,211, 70,154,212, 24, 39,149,165, 18, 74,198, 72, 89, 35,105,100, 12, 41,231,
-158,112, 57,145,137,231, 10,100, 94, 51,241, 87, 23,112,111, 30,211,112, 52,153, 38, 73,225,242, 10, 90,124,155, 50,146, 42,116,
- 99, 45, 52,112,243,178,218,153, 12, 21, 85, 52,171, 42,205, 88,212,181,201, 75,149,209, 37, 91, 81,100,148, 51, 81, 75, 49, 50,
-  6,217,173,183,155,188, 84,118,173,158, 32,172,235, 87,118, 54,166,179,183,149,203,134,222,225,242, 30,215, 80,233, 54,151,241,
-165,100,213,106,245,122,156,138,221,227,  2,160,150, 46, 42,164,235,130,161, 57, 86,251,132, 51, 77,169, 64,173,174,167, 38, 59,
- 85,  4, 56, 26,  3,109,118,123,135, 41,252, 96,110,135, 23,245,109,254,221,189,165,168,219,173, 91,123, 97, 87,216,251,190,175,
-183,219, 85, 99,219,212,155,126,209,183,217,137,183, 10,131, 66,169, 76,169,205,176,225, 70,165,194, 83,180,116,125, 88,219,175,
-148,178,243,175,199, 75,173, 59, 29, 61,249,246,206,238, 94,228,237, 61,211,181,155,117, 97, 50,205, 62,247,110,151, 14,183,114,
- 57, 71,149,102, 55,111,211, 40,145,161,125, 74,213, 25, 54,141,222,227,180,202,188,130,169, 82, 23, 30,151, 57,136, 16,218, 83,
-108, 72, 50, 38, 25, 64,114, 67,110, 47,253,229,176,174, 10,205,199,103,238,253,237, 99, 85,238,119,154,122,231,157, 75,174,215,
- 74,238,  7, 25, 46,152,207,214,220,157, 58, 73,170, 74,109, 18, 30, 75,110,190, 29,121,180, 44,165, 42,  9,232, 21,240,162,151,
- 56,225, 46, 16,143, 36,205,178, 88,214,186,130,176,206,181, 50,212,206, 37,168,141, 97,228, 37, 63, 46,  9,201, 90, 37, 96,103,
-142, 25,155, 74,243, 26,157, 97,150, 33,237, 83,203,114,127,162,199,141,220, 86,188, 75, 85,151,241,125, 31,  2,167, 23,193, 83,
-150, 54, 91, 79, 78,166,152,101, 85,109, 75, 81, 85, 61, 59, 60, 98,150,158,166,174,122, 58, 72, 42,106,150,136,102, 51,123, 10,
- 85,205,152, 73, 43, 44, 16,206,123,218, 61,196,127, 12, 59,235,177, 53, 46, 29,169, 86,189, 55,136,234,109,215, 88,166, 26,197,
- 38, 53,233,116,109,198,223, 91,198,222, 80,171,209,234,119,  5,221, 67,164, 25,151, 10,  5, 85,136, 33,154, 93, 49, 37, 18, 15,
-233,100,202, 97,150,139,131,132,251, 87,179,251, 79,179,194,224,147,101,216,244,202,  5, 90,229,159, 17,119,149,211, 72,110, 69,
- 46,248,110,163, 29,217, 43,129, 66,171, 79,122,116,167, 35, 90, 76, 72,147, 37,216,236, 37,215, 98,203,117,126,245, 45, 50,100,
-114,186,222,133,219, 60, 77,113, 16,220,102, 29,123,136, 11,214,170, 86,194,217,230,148,229, 46, 98, 20,211,128,115, 50,125,254,
-146,190,100,228,116,200,  4, 30,163,  7,187,151, 72,226,234,249,165, 72,105,119,173, 54,145,119,199, 91,105,138, 42,209,169,240,
-173,203,214, 44,100,188,211,178, 16,205,110,152,208,135,112, 48,176,215,197, 10,171, 13,109,124, 69,109,200, 97, 95, 24,214,226,
-126, 46,204,248,131, 53,169,253, 34,207, 26, 53,144, 71,  4, 79, 21, 56, 17,133, 22,229,150,231, 57, 26,  1, 47, 34,187,  2, 44,
- 52,198,170,139, 50,202,126,130,126, 47,120,111,192,109,194,252, 57,154,229,220, 65,148,  9,205,116,180,137,154,214, 10,186,170,
-162, 10,137,109, 91, 69, 71,150,198,235, 25, 10, 22, 25,169,163,100, 69,105,125,166,116, 70,126,237,240,173,188,242,233, 18,100,
-237, 93,235, 42, 60,202,109,114, 92,138,190,220,221,209,196,104,148,181, 76, 74, 16,170,157,149, 92,105,110,132,210, 43,242, 74,
- 19, 42,158,164,115,198,158,234, 36, 48,143,  6, 66,144,210,247,177, 85,202,124, 85, 41, 50, 23,238,234, 96,171,220, 84,131,201,
- 81,167,186,242, 66,220,103,194,112,116,136,167, 49,204,218,135, 38,114,149, 36,142, 82,142, 24,109,205,249,100,111,109,188,154,
-141,169, 87,121,132, 69,149, 25,154,133, 12, 70,102, 35,244,170,162,202,228,211,227,215,160,171,156, 70, 90,220,109,197,198,112,
- 60, 25,150,134, 86, 98, 60,242,193, 74, 54, 70, 21,203,185,137, 49, 41,209, 55, 38,242,181,228,211, 26, 17,157,129, 46,114, 42,
-180,121, 76,135,128,240,207,214,112,156,148,134, 86, 18, 75, 79, 49, 33, 50,163,165,120,248,146, 57, 73,105,106,159,147, 26,  7,
- 37, 20,121, 74,249,129, 29,199, 81,176, 38,192,147,176,176, 11,229, 39, 28,113,196, 92, 57, 81,148,103, 21,249,110,121, 69, 46,
- 69,155, 81,200,201, 87, 73, 60,114, 67, 44, 19, 46,155,235,139, 65,117, 46,165, 73, 11, 30,131,175, 80,250,185, 64,199, 74,170,
-247,117,187,111, 83,215, 94,171,203,137, 65,135, 79, 67,143,174,161,207, 41, 13, 62,140, 15, 16, 83, 24,105,167, 37, 84, 28, 81,
- 82,130,227, 69,105,245, 45, 71, 41, 66,191, 91, 76,133, 87,124,171,187,130, 29,167,217, 76,213,237,251,106, 66,189,205,119,162,
- 28, 98, 37,199, 86,142, 16,162,185, 54,235, 12, 41,106,181,161,242, 45, 99,199,119,154,162, 48, 80, 81, 16,158,154,182,205, 62,
-117, 86,178,221, 66,238,151, 81,166,214,156, 82,227, 66,168, 73,171, 77,171,198,152, 82,188,180,236, 27,145,222, 95,115, 36,148,
-242, 70, 81,136,160, 29, 56, 67,138, 29, 54, 42,202,179,153,139, 37,154,143, 44,138, 93, 90,115, 13,179, 42, 84, 55, 84,228, 58,
-130,154, 32,177, 34,167, 76,116,248, 83,164,158, 85, 21, 58, 66, 29,194,202, 84,242,134, 53,191, 74, 37,168,148, 34, 92,139,239,
-126,187,219,125,133,150,228,146, 47, 98, 55,179,  1,136, 86,103, 62, 91, 69,  8, 36,153,106,  8, 60,182,111, 58, 40,216,157, 54,
- 98, 36,  0,234,243,171, 58,  3,101,229,106,179, 43,139,104, 91, 70, 44,120,176,217, 45, 59, 21,146,164, 50,232, 71, 43,133,111,
-117, 90,230,100,144,252,149, 40,149, 41,210, 74,150,181, 21, 44,149,171, 39, 97,160,209,196, 74, 98,138,211,204,  1,101, 39, 41,
-232,160, 84, 80, 91, 86,122,  5,117,207,217,171, 93,167, 74,230,109,190,118,227,151, 50, 18, 67, 73, 80,101,207,212, 10, 45,182,
-190,169, 65, 32, 16, 14, 72, 61, 50,113,157, 59,206,211,128,167,184,215,134, 84,218,139, 67,  9,202,136,  9, 81,207,134, 79,235,
- 28, 17,243,252,113,169,165, 53, 56,166, 68,176, 35, 72, 23,245, 29,  5,183,191, 78,155,254, 24,174,234,171, 13, 76,138,146,157,
-228,111, 49,216, 94,228,111,219,173,201, 22,181,250,250,130,207, 61, 76, 83, 78,129,201,136,206, 30,102,214, 63,241, 74, 61,219,
- 81,242, 79, 81,141, 92, 33, 83, 11, 11, 43, 74, 70, 79,235,128, 48,146,159, 95,183, 89,187, 48, 16,248,113,190, 78,100,130, 82,
-160,176, 65, 32, 28,  5, 99,215,168,252, 53, 65,216,162, 34,146,199,235, 39, 31,  2,200,193,233,215,144,231, 79, 81,206,164,117,
-233,252,125,253,240,213, 89,206, 82,241,176,243, 14,190,132,117,  7,227,110,189,143, 94,183,197,134,155,  9, 14, 77, 73, 35,160,
-115, 31,105,236,123,140,118,214,207,217,208, 91, 67, 45,  2, 19,212, 36, 12, 14,163,212,156,142,135,247,233,135,163, 69, 10,155,
-158, 95,135,196,200,  0,103, 57,200,252,115,173,138,183, 84,150, 18,214, 79, 47, 42, 82, 64,200,200,192, 25, 63, 34, 51,173,102,
-107,129,181,255,  0,158, 33, 53,234,201,  4,224,108,194,246,251,207,207,175,124, 57,232,109,180, 51,202, 72,248,130,113,142,248,
- 78,  0, 31, 35,235,246,233,191,188, 42,206, 66,108,193,167,132,253,103, 41,181,  0, 71,255,  0,  2,140,174,134, 73, 35,245, 92,
- 39, 33, 30,121,235,229,171,141, 90,228,106, 11, 32, 52, 80,236,183, 73, 12, 70,  4,229, 74,  7, 30, 43,152, 63,  3, 41, 29, 84,
-123, 28,224,100,235,  5, 13,173,197, 57, 46, 67,138,125,249, 46,120,146, 95, 88,253,117,156, 97, 40, 39,245, 91,  0,225, 35,176,
- 29,180,142,179, 80,220,168,205,149,126,211, 15,223,164, 16,122,250,158,195,208,145,134,108,155, 45,116,149,107,106,210,241, 41,
-186,161,255,  0,120,194,221, 71,236, 47,127,218, 35, 79, 77, 86,176, 66,163,  8,205,225,197, 43, 56, 37,105, 65, 56, 36,252, 75,
- 82,212,174,171,112,149, 28,156,245,207, 93, 15, 45,216,241, 57,146, 57, 27, 56,200, 72,192, 89, 78, 15, 85,168,159,128, 99, 39,
-226, 63, 33,223, 89, 20,167,114,130, 10,130, 80, 72,248, 26, 31, 30, 65,  0, 16,165,  3,208,231,174, 61, 61, 53,129,212,188, 52,
-  7, 20, 82,214, 78, 74,148,226,186,164,228, 18, 84,181,103, 36,244,238,122, 30,157, 53,185, 26, 44,106,170,160,  1,238,236, 54,
-253,214,249,247,206,169,100,122,153, 25,234, 36,251, 71,160,233,212,122,216,124,236,119,197,146,116,196, 43,156, 23, 20,234,176,
- 66, 83, 24, 44, 50, 18, 79, 66,235,132,167,159, 61, 50, 50, 18,  9,206, 15, 83,172, 58,116,165, 37, 64,  4,182,218, 73,199, 59,
-139, 10, 82, 73, 66,186, 33, 13, 30, 94, 96,174,108,228,231,168,198,123,139,140,202,131, 79, 30, 70,148,227,238, 33, 74, 65,102,
- 43, 97,196, 54,147,211,226, 81, 41, 74,129,  0,103,226, 56,236, 70, 51,172, 78,114,228,243,  5, 43,193,100,115,243, 36,120,134,
- 75,201,194,128, 42, 71, 54, 17,204, 60,206, 74,114,122, 18,116,112,214,210, 59,223,241,219,240,190,226,251,116,251,158,201,176,
- 10, 23, 73, 61,143, 95,141,182, 61, 58, 16,167,226,118,197, 23,220, 24, 42, 82,202,147,250, 50,234,130,146,217, 45, 36,168,133,
- 45, 94, 71,175,197,215,174, 49,223,174,177,233, 50,208, 66,131,105, 61,214, 66, 64, 78,114, 64, 32,244, 61, 27, 42, 36,100, 30,
- 80,  0, 29,250,232,185,104, 66, 49, 33,199, 21,150,220, 43, 66,158, 90,158,  9, 94, 72,229, 74, 84,180,165, 36,173, 63,234,146,
-156,146,  6,173,114, 20, 80,180,165, 72, 80,112, 20,145,206,164, 41, 92,139,  1, 96,182,144,172, 56,130, 20, 14, 50,  0, 39, 56,
-233,141, 46,141, 98, 54,244,254, 95, 29,247,198,133, 76, 90,206,166, 58,175,233,178,237, 97,238,254, 93,189,215,178,204, 42, 33,
- 93, 64, 42,248,136, 81, 57,235,147,209, 95,205, 61, 51,156,117,229,239,140,107, 16,158,  7, 42,147,206, 74,138, 85,241,171,148,
- 17,140, 96,145,216, 96, 12,125,253,  6,178,233, 89,  1, 42, 89,  0,224,140, 40, 16,146,179,204,164, 55,201,216, 60,158,153, 29,
-114, 59,100,118,197,106, 10,207, 40, 35,170, 73,230, 36,114,149,103,155,161,  9, 87, 86,241,147,231,213, 88,193, 58, 92, 49,218,
-223,135,110,159,187,221,238,253,216,103,145,  0, 34,219,123,186,124,143,147,136, 13,251,114,237,134,237,143,105, 46,242, 73, 13,
- 22,133,233,109,109,125,248,227,197,  1, 40,126, 69,118,199,166,197,148,182,249,  0,241,  0,122,146,174,101, 31,136,168,158, 98,
- 78,117,200,194,180,168,126,137,101, 88,239,233,246,107,183,127, 72, 24,180,175,104, 99,158, 27,161,215, 19,195,254,205, 37,246,
-129,255,  0, 34,180,195,184,124, 52,148, 17,150,202,152, 45,175,169,201, 11,  7,  0, 99, 92, 70, 83,105,199, 81,140,246,229,242,
-249, 29, 75,178,155,181, 13, 41, 59,217,109,211,176, 36,116,235,219,242,199, 51,241, 50, 44,124, 69,158, 34,159, 47,181,212, 31,
-255,  0,116,172,199,247, 18,113, 76,168, 40,116, 72, 29, 62, 47, 63,188,117,208,235, 35, 24,207, 92,244,254,221, 86, 40, 35, 62,
-152,207, 95,232,251,116, 51,133, 67,168, 78, 71, 81,243,251,244,236,  6,194,221, 48,206,160, 29,173,211,161,253,216,162,179,229,
-143,191,211,175,217,170, 11,  0,227,176,245,245,199,175,207,160, 58,244,188,254,177,201, 82,124,188,177,231,246, 29, 81, 39, 39,
- 58, 93, 70,194,221, 63,158, 20, 24,164,230, 60,136,232, 72,244, 39,183,109, 12,178,  9, 61,242, 59,122, 30,223,214,116, 74,241,
-130, 73,  3,  7,167,246,245,213,189,240,234,136,240,212,148, 97, 95, 22, 70, 74,128,236, 58,249,233, 68,235,140,  3,126,155,227,
-193, 36,156,254,113,165,175, 10, 63,237, 99,238,206,116,180,125, 62,182,191,207,191, 25,199,180,146, 15, 65,159,151,174,171,165,
- 93,142, 58,142,227, 61, 70,135, 31,120,254,145,251,117, 92, 96,245, 30,127, 46,250, 37,188,191, 15,195,231,231,124, 12, 86,241,
- 19,156,117,235,231,142,159,126,136,111, 10,193, 74,187, 28, 99, 24,201, 62,191,136,252, 53, 65,  9,  0,131,220,244,251, 58,232,
-164,225, 61,178,  7, 94,221,254,236,246,210, 76, 24,139,124,252,223, 25,219,239,197, 69,160,168,119,233,221, 93, 78,  6, 49,216,
-125,186, 33,164,115, 36, 40,247, 29, 66, 71,160,233,235,170, 64,133, 15,207,113,215, 69, 36,242,224,244,244, 35,208,105, 34,  0,
- 39,190, 49,143,104,101, 42,238, 57, 85,215,168,198, 72,251,188,244,123,104, 72, 72, 24,201, 79, 78,191,187,166,132, 65, 39,226,
- 72, 25,244, 39,167,152,251,180, 90, 22,144,  1, 87,195,147,231,252,236,250,124,244,153, 23,216,158,159,233,140, 17,124, 28,214,
- 58,114,244, 24, 61, 62, 93,191,167, 70, 32, 12,103, 39,230, 60,137,199, 94,154, 13,178, 23,215,168, 29,253, 59, 99,250,245, 93,
- 11, 73, 95, 47,114, 62,127,102,127,103,150,147,194, 39,221,190, 13,108,129,145,140,228, 16,160, 70, 82,164,158,133, 36,121,130,
-  9,200,212,133,253,149, 30,214, 40,187, 66,197,191,195, 39, 20,245,169, 15,236,235,143,162, 14,220,110,140,213,189, 54,163,181,
-211,100,184, 17, 30,135,114, 58,162,165,203,177,148,226,240,211,164,149, 65,206, 21,150, 70, 83, 30,118,242, 14,122,121,126,206,
-218, 33, 39, 37, 68,227,168,229, 32,128, 82, 65,232, 65,  7,184, 56,237,231,157, 55,102, 89,109, 54,103, 78,208, 84, 37,251,171,
- 11,106, 86,236, 71,240, 32,236, 71, 81,211, 14,249, 22,123,153,112,230, 99, 22,103,149,205,202,158, 63, 43, 43, 92,199, 44,100,
-130,209, 74,160,141, 72,214, 29,195, 41,  1,144,171,  0, 71,233,189, 78,163,199,149,  6,  5,118,137, 50,159, 88,161, 86, 97,179,
- 50,145,112,209,228,179, 81,164,214, 32,202, 66, 93,106,101, 62,161, 25, 74,109,214,150,210,146, 82, 66,186,115,105,198,165,210,
-220, 45, 54,156,  0,210, 18,130, 16,156,144,132,160,130,113,234,163,215, 63,102,191, 63,142, 13, 61,168,188, 90,112, 88, 35, 91,
-187,121,119,179,119,109,106,165, 54,185,123, 83,184,  1,218,213,172,195, 74,112, 25, 31,193,231,222,112,191,110, 58,164, 21,224,
- 48,176,215, 49,  7,195,198,117, 59, 45,161,226,130,149,124,109,157,131,126, 59,105, 34, 25,190,109, 42, 53,196,184,241, 30, 15,
-198,138,237, 78, 35, 82, 31,140,211,167,245,219, 66,220, 41,  7,190, 19,170,167, 56,203,165,200,101,140, 85,149,104,230,213,203,
-101,189,155, 78,155,220,117, 82,  3, 46,198,227,123, 43,181,137,199, 98,248,121,226,  4, 60,107, 28,144, 81,211, 52, 25,134, 94,
-168,243,195, 33, 13,165, 88,233, 15, 20,151,  2, 68,212,  8, 23, 84,117,184,212,128, 27,157,174,166,211,138,218,110, 68,166,202,
- 12,226,136,177,129,232,166,216, 72,248,148, 83,159,213, 41,  3, 58,199,247,101,136,115, 44,202,189,191, 58, 53, 62,165, 75,147,
- 13,232,255,  0, 85, 84,225, 70,168,193,124, 22,212,  1, 92, 57,109,173, 42, 25,207, 92,107,  7, 94,247, 82,222, 44,120, 49, 37,
- 54,166,153, 62, 27, 97,162,180,183,147,212, 19,228,122,244,251, 53,166, 60, 82,241,139, 69,219,203, 98, 69, 54,140,180, 86,247,
- 30,234,150,139, 66,201,183, 25,149, 29,233,234,185, 42,196, 70,134,169,113,219, 89,247, 70,154, 91,161,107, 46,114,242,132,100,
-244,206,153,205, 97,168,  2,158,  4, 44,100,219,125,135, 64, 78,228,219,222, 73,244,222,221,174, 76,131, 35,204,179,124,218,130,
-135, 45,164, 51, 85,202,227, 76,106, 62,206,255,  0,109,219,126, 90, 70,190,103,145,136, 84, 93, 78, 72, 23,191, 48,247,123,113,
- 54,107, 98,106,146,105,  9,180, 41, 21,123,162,141, 80,151, 62,153,110, 91,228, 81,105,212,218,178,156,241, 34, 77,169, 72,130,
-226, 75,  2, 57,229, 90, 91, 71, 95, 19, 25, 61, 49,174,102,239,183, 16, 27,245,196,245, 64, 82,110,171,182,181, 46,217, 96,  6,
- 35,218,212,137, 51, 32,219,108,198,105, 92,201, 85, 69,199, 30,  6,166,164,128, 10,220,112,144, 72,251, 53,214,202, 31,178,178,
-163,118, 58,154,214,227,110,196,250,141,229, 94, 90,234,215, 82,232,240, 89,168, 70,166, 84,170,  4,190,168, 41,121,249,  0, 76,
- 90, 29,119,151, 56,  9,248, 73, 25,214,146,202,219, 91, 51,104,184,161,111,104, 55,  2,101, 83,114, 54,198,194,191,169, 77,110,
- 68,221,177,164, 63, 85,175,214,237, 88,241,211, 82,147, 76,141, 78,128, 22, 91, 87,142,150, 98,205, 74, 85,132,248,171,248,142,
- 53,173,150, 83, 84, 83,203, 81, 44,142,139,160, 27,  2,160,233,  3,114,117, 16, 12,141,127, 70, 80,  9, 35,125,241,233,239,130,
- 41,224, 38,103, 13,117, 54, 67,153,205,226, 87, 28,112,190, 95, 45,125, 92,210, 83, 86,187,242,226, 42,178,174, 80,149,113,165,
- 44, 65,229,100,134,  4,141,150,122,141, 81, 51, 73,162,237, 30,168,196,225,210,109,131,180,183,158,251, 93,182,173, 90, 77,131,
- 96, 89,181, 75,242,173, 86, 98, 49,102,  9,183, 41, 18, 99, 82,213, 61,169,147, 28,108, 26,115,213,233,208, 41,241,139, 73, 89,
-155, 50, 88, 98, 57, 82,144,225, 71, 44,173,110, 47,174,107,174,254, 98, 13, 58,249, 85,  6,131, 87,171, 39,220, 44,241,181,244,
-153,180,166, 32,  5,149,154,122, 42,162,227, 19, 75,165,128, 71,188, 56,178,174,115,204, 82,145,128, 36,  3,237,235,223,234,222,
-215,112, 55,182,219, 31, 86, 98, 61,181,187,220,112, 95,208,183,126,253,180, 97, 54,220, 21,109,191, 13,155, 89, 33,113, 54, 95,
-106,218,165, 50, 18, 40,148,150,231,154,107,198, 55, 42, 67,242, 41,179, 93,113, 42,113, 74, 86,162, 97,177, 48,209, 39,113,161,
- 58, 64, 13,211,225, 75,148, 51,140, 36,165,190, 84,143,159, 65,171, 75,135,178,168,107,242, 90,172,214,180, 51, 59,234, 16,134,
- 17,190,133, 64, 20, 55,158, 54,  2, 70,146,225,136,  0,174,157, 43, 97,185,243, 63,233, 63,244,231,241, 66,159,196,102,225, 15,
- 14, 51, 37,224,188,143,132,  9,142,161,114,156,207, 55,165,122,154,211,180,201, 83, 95,148,230, 89,116,181,212,212,192,  8,224,
-  5,150, 25,142,186,190, 84,124,245,138, 25,117,109,141,230,157,201,225, 47, 99,174,184,147, 81, 37,251, 42,185,185, 27,109,239,
-116,234,109, 66,219,122,  4,155, 82,247,170, 85, 97,120, 77, 63, 82,121,198, 42, 45, 83,110,106, 65,247,182, 36,165, 14,184,226,
-150,194, 25,  9,113,  3,110,182,151,139,125,212,183,132,104, 23,139,113, 55, 18,137, 24, 33, 42,171,202,150,138, 77,231, 10, 58,
- 80,148, 41,215,106,105,101,113,238, 23,  2,  0,109,  6, 99, 41,127,224,  0,190, 84,115,174, 89,251, 50,110,182,111,109,161,226,
-  3,101, 36, 58,211,149,138, 21, 94,218,222,203, 78, 35,202, 81, 46, 82,231,199, 69,129,126,193,167,180, 63, 93,214,103,194,179,
-170, 50, 48, 15, 42,103, 21,168, 17,147,174,130,217,182, 49, 51,154, 91,177,188,102,144,164, 58, 35,144,191,242,169, 25, 99,159,
-148,124, 72,  7,226,207, 80, 49,207,131,216, 83, 92, 69, 69, 29,  6, 99, 95, 73, 34,235,  8,250,148,236,  9, 14, 17,197,138,133,
-  2,215,210,116,217,110,164, 91, 97,105,119,134, 62, 33,208,248,151,225,118, 89,196, 28, 81, 28, 85,249,213, 91,213,189, 89, 99,
- 36,143,237,143, 83, 41,169,117,146, 89,165,169,  6,105,139, 75,170, 73,228,145,245,134,150, 73,  9, 44,122, 97,110,111,221,149,
-120, 67,165,189, 58,161, 34,214,201,105,134,233, 55,148, 69, 83, 11, 50,221, 90, 92, 68, 40,213, 72,110,200,135, 46, 73, 41,108,
-171, 14,167,245, 84,130, 65,200,211,166, 94,171, 84,102, 51, 47,194,143, 89,131,  9,  5,184,240,105, 85, 40,147,218, 74,222, 40,
- 89, 97,227,  2, 67,137, 97, 78,252,  5,254,110, 85,114,132, 39,  9, 72, 32,233, 93, 14,201,122, 65,143, 22,156,212, 69, 86,100,
- 46, 44,135, 38, 57,135, 33,219,180,231, 22,234, 83, 60,161,192, 10,170,170,  8,144, 33,178, 71,233, 29, 30,242,191,208,181,133,
-191,182,125,129, 22,137, 24,184,219, 16,105,244,122,116,229, 24,172,196,140,227, 51,106, 82, 37,172,  0, 92,153,226, 37,249,213,
- 57, 83, 22,165, 18,225, 82,222,113, 69, 74,  9, 71,234, 68,  9,208,198,209, 94,219,218,228, 15, 83,112, 65,184, 62,227,110,189,
-109,178,169, 62, 83,  5,218,149,249, 37,181, 42,198, 87, 89, 80,199,253,217, 86, 70, 70, 98,204, 20,146, 89,197,201,101, 22,230,
- 59,242, 41,215, 69, 77, 73,128,236, 67, 18, 58,167,154,138,231, 60,  4,102,158,150, 80, 82,130,218,157,115, 45,198,101,174, 84,
-165,  1, 68,114, 52,130,156, 99, 89, 45, 34,212,134,228, 73, 16,146,227,205,181,  1,201, 78, 77,171, 38, 42,218,143,227,144,  4,
-201, 12,201,115, 36, 71, 12, 32,165, 43,  3,226,248,212,144, 10,146, 53,126,180,172,233, 73,154,154,212,168,202, 93,197, 80, 97,
-136,104,140,211,242,100,192,162,196,109,194,166, 41,208,221,148,163,201,135, 23,227, 62,232, 78, 95,127, 36,  0,218, 27,  1,238,
-160, 90,138,170,136,112, 34,196,122,116, 24,179, 26, 97,224,201, 66,151, 91,158, 22,121, 26,  8,112,  2,184,136,155,133, 28, 30,
- 89, 15, 32,  1,204,132,117,220,138, 25,100, 69,141, 33, 42, 95,185,185, 36,108, 64,216, 41,  3,125, 76,119, 96, 54,234,214, 58,
- 53,249,220, 11, 78,232,142,144,194,128, 23,101,  1,  6,175,214, 62,103,112,219,249, 82,197, 84,238,108, 17,110, 52,139,118, 47,
- 29,184,225,215,110, 42,187,173,184,204,207, 72, 80, 85,167,183,182, 36,  9,173, 70,184,111,106,192, 66,170,116,219,106,146,227,
-200, 80,164, 50,235, 10, 77, 66,191, 84,117, 10,106,153, 79,228, 73,241, 36,174, 36,119,184, 21,190, 59,243,185,156, 69, 84,159,
-170,238, 77,125,233,212, 64,224,114,153, 96, 80,157,149, 74,219, 91,113,168,200,  9,139, 79,161,218,173,191,225,204,247,118,130,
- 18,103,207, 18,106, 18, 92, 10,125,231,194,214, 80,151,139,218, 61,196, 11, 91,199,196,197,237, 22,149, 81, 84,157,189,217,229,
-191,180,182,  2, 88, 11, 17,100, 68,160,212, 84,221,239,112,178,210,  9,241,102,214,111,225, 52,151, 48, 84,168,148,168, 76,161,
- 74,109,180,160,115,231,137,235,103,118, 56,127,147,104,217, 55,156,251,107,111,175,235,178,220,141,117, 86,109, 75,154,123,113,
-238, 29,183,163, 87,  2, 87,106,211,239, 74, 50,150,145, 64,189,234,148,231, 29,158,154, 36,149,174,165, 75,167,166, 52,138,188,
- 24,138,159, 21,133,236, 83,112,252,185,180,169,  8,169, 20,176,234,  0, 18, 88,  7,176, 39, 89,211,114,119,  4, 70,189, 44,161,
-148, 22,190,159, 75,188, 43,225,207, 12,190,140,158, 22,229, 62, 49,120,177, 11,207,199,124, 79, 74, 43, 96,166,138,138, 92,199,
- 54,166,167,120, 99,153, 50,252,166,134, 37,121,162,150, 40, 36,137,243,154,231,228, 65, 75, 44,172,185,141,117, 61, 12, 49,202,
- 64,184,109,119,103,132,181, 74,129, 79,134,194,135, 43,190,237, 21,191, 29,100, 96, 37, 40,117, 73, 82, 99, 35, 32,124, 88, 42,
- 63,170, 53,226,221,219, 54,154,144,210,159,144,184,110,188,191,  9,111, 50,130,176,158,110, 80, 84,251,171,202,128,  1, 93, 73,
-229, 25, 56, 37,  0,140,233,155,215,238,236,178, 81,245,  6,230,196,184, 38, 72,117,114,146,204, 10,157, 18,124,222, 68, 55,238,
-229, 13,192, 85, 62, 51,171,139,134,207, 35, 41,140,233,231,202,146,147,144,117, 96,166,239,230,251, 91, 78,170, 52,187,154,100,
-238, 69,175,198,143, 95,161, 83,106, 18,154,101, 79,165,231,152,117,164, 67,133, 45,134,212, 82, 91,194,156,  5, 45, 44,164,  2,
- 66, 84,155, 34,147,133,243, 36,165, 20,116,217,188, 35,151,238,126, 97,  4,254,177,125, 68,239,211, 82,223,173,172,  0, 24,167,
-179, 47,246,170,125, 30,232,243,104, 31,139,124, 24,227,142, 30,161,169,102,142,147, 50,172,203, 50,121, 41,229, 42, 69,218,  3,
- 30,118,241,202,  0,243,200, 41, 94,165,129, 22, 42, 88,227,163,116,203, 17,  8,185, 93,183,106,208,252, 38,221, 75,239, 69, 82,
-148,212, 98,226, 86,217,118, 44,165,167,  9, 65,101,223, 60,148,144,181, 96,168, 43,  0,252,174, 91,214,181,183, 10,117, 86,179,
- 50,153, 73,166, 83,194,214,252,233, 83,209, 26, 43, 44,162, 64,140,219,206, 58,234,210,112,235,191, 11, 64,100, 44,244,  4,168,
-145,172,123, 98,119,186,189,184,148,118,141, 70,148,197, 50,191,111,207, 66,201,167,161,249, 52,249,241, 42,212,229,  7,204, 15,
-126, 66, 92,110,  3,140,161, 73,118, 19,202, 81, 97,108,148,161,199, 27, 91, 78,107, 86,119,238,216,221, 43,230,252,250,182, 13,
- 58,183, 46,147, 70, 13, 38,  4, 56,116,185,179,162, 69, 46,180,223,141, 81,142,184,140, 41,147, 41,114, 84,242, 75,171, 82, 84,
-194, 91, 72,230, 64, 90,214,181, 33,200,201,170, 43, 89, 94,208, 24,128, 15,166, 66, 20,216,  3,112,111, 96, 88,110, 78,159,118,
-155,220, 99,160, 60, 98,250, 99,112,207,134,255,  0, 71, 46, 29,250, 64,120, 83,195, 50,248,169,148,241,245, 69, 30, 93,144,193,
- 67, 79, 83, 28, 82,215, 85,189,122,153,115, 32,105,154,178,134, 26,105,168,101,163,146,156,211,189, 75,102,130, 44,173, 68,114,
- 77,207, 71,110, 15, 18, 59, 61, 18,251,183, 45,234,180,107,233,187,  1,250,171, 17,238,235,214,213,164, 83,170,247, 53, 22,146,
-247, 59,114, 43, 22,149,141, 85,159, 17,119,100,134, 63, 68,234,163,187, 34, 18,164, 53,206,152,138,117,244,161,183, 58,193, 87,
-225, 15,135,235,154,206,165, 93,187, 71,198, 37,215,186, 16,174, 74, 84,106,197,183,252,  7,217, 27,135,115, 66,233,111,133,248,
- 82,110, 88, 27,108,185, 18, 44, 98,226,138,217, 76, 74,176, 98,168,211,208, 31, 14, 67,113,  0, 40,199,138, 77, 58,219,219, 50,
-244,105,201,133,114, 94, 12, 56,227, 82,225, 41,246,106, 20,107,126, 74,  1, 10, 21,105,145, 29, 83, 87, 29,105,183,135, 90, 99,
- 14, 24,108,168,230,161, 33,210,145, 21,121,134,197,241,157,196,167, 13,119,204,187,239,101,247, 94,228,180,103, 85, 93, 74,238,
-122, 27,239, 11,130,196,190, 89, 74,  3, 65,139,247,111,234,106, 52,187,152, 37,129,200,203,193,152,211, 98, 54,  3,112,101,197,
-108,  4,133,235, 56, 58, 10,228, 87,202, 71,178,152,134,242, 75,119, 19, 27,222,225, 88,150, 31,254, 96, 54, 34,214,141,213,129,
- 30, 77, 63,251, 74,190,146, 28, 63,196,245, 21, 94, 41,241, 81, 90,138,137,238,120,103,135,232,114, 90, 51,145,166,250,161,204,
- 42,243, 28,191, 56,115, 80,172, 17, 36,201,106, 30,171, 49,165, 99, 58,215,215,101, 85,180,199, 46,155,165, 84,250,206,231,112,
-167,186, 84,202,229, 58, 84, 41,147,169,133,248,238,197,175, 91,119, 93, 18,221,187,232,146, 84,224,168,218,183,125,171,122, 80,
-169,146, 69, 62, 91, 77,165,197, 50,182,199,186,202, 90, 37,197,125,153, 76,161,221, 73, 67,102,161,181,186, 27, 75, 97,238,133,
-149, 75,174, 53,111,223, 86,211, 87,109, 54,213,185, 35, 77,146,237, 17,137, 14,200,167, 84,169, 77, 86, 23, 24,190,212,104, 85,
- 56,114,217, 98, 72, 75,241,159,101,166,228,  0, 16,240,  9,226,206,213,123,125,246,154,253,183, 26,179,248,203,225,125,202,139,
- 46,178,168,179,235,251,104,229, 22,255,  0,179,166, 52, 82,164, 41,247,246,211,115,158,110,161, 69,150,180,149,143, 14,155, 84,
-150,134,210,172, 54,180,249,236,206,213,123, 69, 61,143,214,236,216, 85,123,123,115, 55,238,195,166,195,122, 53,197, 19,108, 46,
- 26, 79, 16, 44,236,253, 26,226,128,250,223,131, 85,141,183, 84,234,188,232,106,173,199, 90,212, 89,142,137, 15, 83, 81,144,125,
-209,101, 40,228,141, 47, 10,102,180,149, 86,154,156, 24, 92, 29,108,129,135,154,226,204,  2, 44,137,115,111, 54,226,254, 93,182,
- 24,147,120,185,244,188,240,119,233,  7,195,249, 54,103, 93, 17,224,159, 17,114, 33,203,106,209, 45, 37, 92,121,173,  8, 71, 34,
-150,170, 58,150,200,101,166,150, 41,220, 61, 44,139,  5, 76,112,171,213, 71, 20,136, 39,  4,118,  6, 29,186,134,194, 27,148,195,
-193, 62, 44, 68,187, 21,106,102, 84, 30, 70, 85,205,142, 80,158, 87,201, 81,  7,153,192,  0,192, 80, 64,211,149, 66,165,180,203,
-136, 67,104,240, 27, 90,130,130, 17,226, 37,166,148,162,  1, 67, 73, 94, 66, 83,252,227,140, 39, 39,160,215, 35, 46,223,110, 95,
-179,178,219,105,233,244,219,195,120, 47,233,139, 89,112, 67,182,118,102,191, 77,247,149, 21,115, 41,196,213,175, 41,244,200,241,
- 80, 85,142,139,201,194,137,  9,207, 77,115,159,136,255,  0,164,222,229,137, 30,163, 15,134,190, 13,228, 85,153,  9, 87,213, 91,
-165,191, 87,204,167, 45, 40,174, 45, 76,182,204,169, 86, 14,216,198,101,228,255,  0,133,202,109,178,212,219,137,132, 41,194,148,
-158, 96,180,131, 37,202,248,118,182, 90,133,138, 42,118,185,221,117,133, 75,133, 32, 29,216,168,185,189,236, 14,163,109,129,  0,
-219,143,243, 63, 16,184, 90,150, 55,105,115,232, 42,165, 31,169, 77, 42,212,177, 32, 14,130, 18,226,224,  0, 53, 57,  0,216,238,
- 55,196,195, 45, 68, 22,211,205,146,176,133, 54,151, 20,132, 15,133,229,231,144, 40,224, 37,  5, 65, 39,151,155,148, 18,158,152,
-235,167, 48, 77, 75,205,166, 35, 10,241, 36,158, 64,164, 52, 60, 79,  9,  9,207, 48, 83,160,114,149,103,148, 96,103,182, 73,215,
-230,  7, 43,219,203,237, 79,157,190,246,230,253, 61,196,180,212, 75,181, 94,156,213, 51,101,233,182,221, 22,223,225,210, 69,  2,
-168,227, 11,169,218,181,125,167,162,176,212,122,212, 25,  8,142,218,126,176,154,244,170,211, 68,  7, 88,168,182,234, 82,177,213,
-203,167,233, 12,113,211,199,133,235,182,188, 54,240, 99,176,227,101,238,251,254, 37, 46,135, 81,183,246,214,113,190,247, 95,112,
- 47, 39, 98, 37,203,129, 54,157,199, 86,136,195, 22, 53,140,193,106, 91,252,225,149,204, 98, 19, 75,118, 84,180,165,  7, 18,169,
-178, 74,170, 69, 51, 56, 73,209, 23, 81,210,224, 42,219,115,204, 50,  5,109, 34,219,149, 87,  3,115,219, 16, 36,241, 71, 32,204,
- 22, 85,167,138,163,219, 12,129, 32,128, 37,228,152,177,  1,116, 88,216, 92,246,107, 17,218,230,195, 19,125,171, 92,246,205, 30,
- 90, 32, 84,171,244,168,149,  5, 16, 61,205, 83, 89,247,180,147,216, 56,218, 23,148,121,247,198,178,122,125, 22,  5,114, 40,154,
-138,154, 22,210,134, 80, 99,180,183,112, 79,162,136,  1, 95,118,123,235,152,220, 17,123, 63,247,  3,103,237, 26, 77,219,197, 85,
-255,  0, 51,114,119,174,160,202, 42, 21, 90, 12, 74,180,170,149,181,104,202,120, 37,197,211,222,171, 73, 81,114,229,171,182,181,
- 40, 63, 37, 88,100,184,149,120, 41,228,194,143, 75,153,101, 48,185, 91,107,153,134,155,  1,  8,109,165, 41, 41, 74, 64,  1, 32,
-  4,224, 99,  3, 80,103, 78, 51,204,101,157,185,180, 57, 21, 10,146, 34, 81, 20,149, 19,184,236,206, 95,148,177,131,216,104, 15,
-110,168,167,108, 60,209,182,123, 57,246,138,169,146,133, 91,117,142, 38,105,152,127,215, 43, 89, 24,145,251, 10,  7,241,197, 84,
-154,117, 14, 91, 72, 18,147, 35, 46,114, 97,104, 83,107, 42, 39, 25,  0,249,254,115,167, 66, 11,229, 77,120,141,  0,191,209, 21,
- 33, 25,229,241, 84, 82, 74, 83,146, 59,103, 90,221, 94, 77, 82,101,118,154,148,130,244, 86,221,202,228,255,  0, 60, 39,160,229,
- 89,254,119,200,247,211,203,  6,164, 88,105,150, 65,236,148,131,147,213, 56, 24,206, 62,221, 45,195,237,153,206, 43,169, 51,119,
- 73,100,164,125, 34, 72,211, 64, 97, 96,110,  1,191, 81,243,214,210, 12,210,138, 24, 41, 40,102, 89, 57,178,213, 33,105,  1, 32,
-244, 32,111, 96, 45,125,246,219,221,139,140, 97, 48, 58,236,154,131, 46,153, 46,146, 87,204,146, 82,132, 15,242,109, 36,167,167,
-132,  6, 59,119,206,190,200,170,100,132,160, 21, 41, 56,  1, 36,134,210,133,100,156,114,158,195,191,225,170,166,170,211,105,248,
-149,212,255,  0, 59, 56, 36,156,100, 15, 64,113,246,235, 24,171,213,226, 60, 10,142, 60, 84,244, 75,137,232,164,103,245, 65, 82,
- 71, 80, 58,100,117,  7, 79,209, 82,242,147, 69, 59,116,245, 27,159, 93,250,111,240,235,241,195,116, 85,144, 77, 56, 50,195,229,
- 27,121,122, 40, 22,  2,202,123,  1,254, 33,247,226,229, 38, 74,212,210,138,159, 75, 96,  2,  2, 89,  3,156,146, 72,192, 46,118,
-242,234,  6,176,138,131,208,130,143, 59,105,144,180,243, 97,114, 84,183, 74, 71,117, 30, 85,124, 41, 72, 32,103,160,201,234, 15,
- 82, 53,100,169,214,165, 52,218,131, 78,182, 91,  7,  5,229,115, 43, 41, 62,101,  9,253, 85, 99, 29,115,128,122, 16, 53,132, 78,
-168,190,250,242,169,137, 87, 33,  4, 48, 26, 80,111,  0, 28,172,132,175,226, 56,  4,128,162, 71,159, 77, 32,237, 34, 54,153,  1,
- 86, 59,239,247,110, 15,243,248,219,221, 40,164,162, 89, 84,201, 21, 66,136,191,195,112,122,116, 32, 11,143,131, 90,221, 78,196,
- 28, 93,170, 53, 86,220, 45,182,214,121,193, 56, 75, 24,202, 63,156,175,242,120,  8, 79,194, 49,147,208,172,140,107, 28,144,185,
- 14,165,196,243, 54,128,227,107, 95, 40,  1,247,148, 10, 82,160,148, 36,114,161,156, 18,146,126, 53, 99,  7,225,193, 26, 21,201,
-165,223,209,170, 87, 43, 69,196,145,224,199,109, 32, 21,142, 84, 37, 68,147,135, 50, 73, 61,  7,235, 99, 61,180, 42,150,  9, 83,
-110, 45,199,193, 66,138, 91, 83,156,173,178, 57, 84,149, 20,132, 36,  4, 47,  4,158,234, 33, 74,  7,212,107, 34, 85, 36, 91,174,
-195,111,187, 14,  2,  4,136, 88, 88, 50,239,114,  9,216,252, 64,239,107,131,210,253,111, 96,106,135,  9,241, 91, 90,152,154,224,
- 81, 10,117,183, 66,150,132,132, 32,132,199, 90, 18, 18,211, 62, 25,202,136,229, 86, 80, 71, 55, 78,180, 86,211,138, 90,218,109,
-210,132,173, 42, 40,195, 97,226,160,188,146,149, 61,202, 17, 24,252,  7,  4,147,128,148,146,114,179,143,162, 72, 66, 20, 93, 82,
- 91, 32,243,151,  0, 13,184,226,121, 87,250, 54,210,216,  3, 57, 40,248,112, 84, 48,188,119,233,112,142, 86,234, 29, 75,124,173,
-161,158,235,112,133, 50, 75,156,174, 56,246, 66,135, 48,  3, 10, 10,  0,128, 64, 10,  4, 29,108, 70,250,118,191,227,252,183,237,
-110,134,223,125,175,163, 80,140,221,139, 15, 94,194,214,251,186,251,205,239,140,110,108, 82,150,189,228, 33,212, 54,225, 10,142,
- 29,108, 40,168,  1,209, 40, 65, 63,  3, 28,169,  5, 42,200,193, 95, 80, 71,124, 14,168, 18,210, 86, 21,203,202, 82,160,  8,  0,
-169, 41, 24,  9, 81, 60,184, 87,196,165,224, 12, 28, 28,231,190,156,202,203, 43,100, 60,180,187, 46, 83,142,128, 90, 68,167, 20,
- 70, 74,148,144,167,  1,235,149, 35,157, 71,249,216, 72,  0, 37, 61,155,106,154, 76,153, 41,136,149,  4,169,231,163,196, 66,202,
-129,  9,117,245, 33,158, 98,160,112, 71,136,224, 32,158,132,126, 26, 84, 48,  2,250,134,223,233,191,126,157,125,253,112,216,241,
- 18,202,161, 65, 55, 29,  0,222,246,181,135,238, 29,126,252, 64, 99,219,127,112,181,112,123, 74,183,173,166, 28, 82,255,  0,130,
-214,206,212, 89,178, 82,176, 66, 90,159, 67,176,105, 47, 75, 67, 68,147,204,215,137, 82, 24, 35,204, 30,154,228,170,206, 51,216,
-231,166, 58, 99,237,251, 53,183, 60,121,238, 60, 93,220,227, 99,138,189,200,132,233,122,157,114,111,133,244,154,114,249,150,180,
-154,125,  6,168,171, 94, 25,104,172,228, 50, 89,161,161, 72, 29,130, 92,  0,116, 26,212,101,246, 56, 61, 59, 96,227, 63,241,212,
-247, 43,140,165,  5, 18,176,179,  8,144,144,122,130, 84, 18, 62, 32,155, 28,114,150,121, 50, 85,103,185,197, 66, 29, 81,207, 87,
- 80,202,123, 21, 51, 57, 82, 15,189,108,126,252,  8,178, 15, 79, 76,232,117,245, 36,142,192,224,252,191,179, 85,214,174,254,137,
-207,231,246,104,101,224, 28,231,161,235,248,233,200,126,252,104,  1,220,109,129,221,230,199, 97,142,189,189, 51,215, 63,159, 61,
- 14, 64,  0, 96,247, 29,126, 71, 68,169, 89, 62,120,252,245,208,202,238, 79,204,253,154, 92,108,  5,240, 48, 58,192,202,135, 67,
-215,243,231,249,198,133, 81,  3, 57,249,224,119,237,229,162, 28, 39,169,249,249,126,125, 52, 26,200,251,199,127,179, 74, 45,198,
-227,126,216,200,253,248,160,178, 50, 58,  3,211,207, 63,184,253,186, 90,240,163,147,159,195,236,210,210,184, 24,175,170,168, 61,
- 49,215,167,225,161, 16,112,122,156,116,213, 97,248,103,161,251, 51,164,216, 90,227,174,173,255,  0, 60,100,245, 38,214,190, 14,
- 73, 56,  0,142,152,239,145,247,116,213, 66,176,  7, 82,172,142,216,249,246,207,222, 52, 58, 84, 83,211, 29,  7,111,236, 58,242,
- 80,162,174,101, 47,  8, 61,128,206, 71,222,  7,174,116,131,222,222,236,101, 69,254,127,150, 46,141,168, 96,  0, 57,137,206, 73,
-254,145,243,192,215,213, 44,173, 73,  8, 39,  9, 56, 87,124,103,247,245,254,141, 80,105,188,242,146,174, 81,158,128,117, 61, 49,
-215, 25,244,209,205,167, 57,192,206,127,164,117,237,249,237,164,172, 79,207,166, 48,109,219, 21, 90, 56, 35, 35, 32,143, 46,221,
- 61,125, 15,125, 28, 57, 72, 79,160, 62,127,205,251, 62,125,244, 50,121,112,  0,252,253,190,154, 37,176, 85,142,192,124,135,244,
-231,207,166,177, 97,123,227, 24,184,178, 15, 76,159, 82, 63,163,247,234,184, 24, 57, 24,201, 57,  7, 31,135,219,161, 16,175, 35,
-231,219,250, 49,162,146,113,220,245,232, 65,198, 59,246,199,175,246,233, 22, 22, 36, 97, 50,187,220,155,223,231,255,  0, 56, 37,
- 43,  8,199, 58,186,159, 32, 59,244,249,104,146,238, 70,113,140,249,250,227,183,159, 77,  4,113,144,190,153, 63, 44,227,184,200,
-252, 53, 81, 36,116, 32,231, 29,201,251,125,  7,150,146, 98, 58,223,225,130,219,221,123,117,193, 41,119, 24,248,249, 64, 32,224,
-227,175, 94,160,122,244,206,167, 39,236,166,220,118,247,115,129,157,165,148,252,148, 73,171, 88, 74,169,237,245, 93, 33, 73, 46,
- 54,186, 44,133, 38,  1,113, 61, 74, 65,132,228,126, 92,227, 35,168,212, 42,118,215,108,110,189,211,185, 98,219, 86,181, 49, 83,
-231, 73,  5,229,186,227,137,139, 78,167,194, 66,128,145, 85,173, 84, 93, 79,135, 74,164,183,252,247,156,234,162, 66, 26, 67,174,
-148,160,203, 23,217,  2,214,215,112,241,106,238,110,209,215,119,102,143, 34,181, 87,151,  2,239,168, 76,172, 75,110,139,108, 53,
- 53,136,201,133, 34, 21,179,239,238,  5,184,218, 82,218, 11,139,119,149,215, 15,196, 91, 66,126, 17,  4,227,  9,104,167,142,154,
-137,228,  6,169, 95, 86,155, 95, 74, 21, 96, 75,158,136, 11,  5,  3, 81, 26,142,194,230,246,184, 60, 26,124,214,135,136,167,204,
- 41,105,100,124,178, 88, 36,167,158, 80, 44,129,137, 73, 35,  0,159,180,193,212,  2, 20, 18,129,238,218, 65, 23,235,214,231, 75,
-174,219, 59, 83,184, 21,235, 93,151, 30,184,224, 91,147, 13, 27,193,104,188,236,105,178, 18, 35, 38,162,134, 82, 50,234,163, 33,
-213,188,  0,207, 86, 70,181,171,102,120,  8,183,217,222,155,115,124, 46, 59,138, 53,229,105,208,108, 90,123, 86, 21, 10, 66,223,
-155, 42,179,121,215, 33,166, 69,211,124,221,210, 95,234,244,211, 45,231, 83, 25,177,128,216,198,122,164,107,107,162,239,150,195,
- 32,148, 57,188,187,110,233,193, 75,141, 34,227,167, 60,130,146, 48,180, 45, 33,226, 20,  8, 39, 35,207, 26, 14,226,227,  7,134,
- 29,183,182,107,183, 12,173,200,163,213,169,246,180, 23, 39,205,163, 89,141,125,115, 86, 84,102,186,172, 83,169,144,129, 84,133,
-127,178,128,126,237, 65,225,142,150,158, 82,226,162, 33,169,116,  0, 89,111,114, 69,200, 23, 59,157,133,183, 61,135, 91, 99,179,
-242,190, 62,226, 28,135, 33,205,114,204,161,165,203, 70,109,205,246,202,132, 82, 30, 74, 87,138, 56,249, 76,250,117, 70,177,  5,
-155, 76,136,234,116, 85, 84, 45,129,101, 97,144,207,224,179,103,238,181, 56,183, 81,123,208,158,152,250,158,156,245,169,125,220,
- 20,116, 60,235,202, 42,121,197, 48,137, 42, 66,150, 73, 60,184, 78,  0, 56,244,208, 91,129,114,240,113,236,166,216,187,155,114,
-235, 20,202,117,183, 21,229,201,153, 69,162,189, 37,138,222,236,111, 13,232,227, 74, 84, 26, 29, 62,109, 77, 74,149, 44, 56,247,
- 39,140,233, 40,139, 17,165, 41,231,112,  0,207, 27,248,128,250, 66,114,226, 82,170, 52,190, 16,184,115,190, 43, 19,  3, 14, 52,
-141,201,220,155,106,174, 41, 84,247,112, 66,100,195,183, 41,209, 86,185, 78,160, 14, 96, 30,113,  8, 56,248,186,103, 81,143,226,
- 11,136,157,247,226,127,114,100,238, 30,253,238, 45,126,244,188,158,105,214,162,199,173, 62,168,205, 81,169,238, 40,172,211,168,
- 86,223,192,221,  6,154, 50,  7, 43, 76,160,168,  1,206,181,158,186,127,203, 56,124,207, 46,161, 18,211, 34,253,166, 54, 14,  6,
-215,180,103,204, 24,247, 50, 42,129,179, 89,197,215, 20,239, 27,253, 36,248,135,244, 13, 71, 12, 80,113, 94, 97,196, 20,179,105,
- 38,  7,168,168,108,188, 50,127,118,243,135, 96,181, 38, 34,111, 20, 96, 58,169,220, 60,100, 95, 24, 39,180,115,137,253,201,226,
-247,127,170,251,223,186, 82, 27,254, 16, 94, 74,118,124, 26, 44, 87, 92,118,155,105, 91, 81,121,162, 91, 54,141, 31,196, 63, 13,
- 58, 13, 59,  9,230,192, 47, 62,243,210, 23,241,186,117,175, 92, 57,196, 97,202,237,211, 57,208,178,252, 42, 34,147, 24,  1,211,
- 46,149,  5, 18, 60,253,  6,173,251,228,231, 53,219, 29,128, 65,247, 42, 12,  6, 79, 41,200,  5, 73,  4,129,215,191,174,178, 14,
- 26,216,118, 93,122,230,134,202,121,164,204,167, 68,139, 29,  9,238,183,223,119,194,101, 41,207,153,113,104, 31,126,172,212,141,
- 41,120,124,197, 24,209, 26, 34,128, 46,118, 28,192,119, 59,147,183, 82, 73, 39,169, 36,239,142, 53, 53,117, 21,115,214, 86, 85,
- 74,211,213, 84,180,178, 72,231,118,103, 42,204, 73,176,238,123,  0,  0,232,  0, 27, 98,109, 63, 71,223,128,234,125,203,195, 15,
- 16,156, 74,220,244,174,123,199,114, 99,200,218,237,155,145, 45,177,136,116,123, 98, 92, 90,221,217, 83,134,149,167,225, 85, 82,
-187, 18, 29, 56,186, 15,197, 30,152,164, 14,138, 57,216,168,246, 17,161,213, 31,142,228,117, 50, 90,146,235, 97, 10,230, 75,225,
-  8, 56,228,115,185, 67,169,229, 41,229,239,204,112,  8, 58,236,151,  0,219, 99, 15, 98,184, 76,225,239,107,105,113, 83, 17,187,
- 99,109,109,231,167,180,148,132, 41, 85,138,164, 38,234,181,105, 14,116, 28,206,174,124,199,201, 39,174,123,233,168,226, 23,134,
-171,150, 93,110,226,220, 91, 38, 61, 58,161, 65,144,255,  0,214,146,168, 44, 62,182, 43,237,206,148,240,247,152, 52,168,  9,103,
-146,167,207, 53,197, 58,202,  3,136, 63,166, 80, 94,  2, 65, 52,151, 19,209, 54, 99, 28, 89,138, 38,170,131,118,127, 82,142,117,
- 40, 61, 55,137, 74,160,247, 13,239,215, 29,145,225,180,210,240,102, 89,  6, 69, 36,194, 24, 42,163, 73,100,212,214, 95,105,101,
- 94,110,228,237,169,174, 22,254,128,108,  0,  3, 82,108,234, 84,116, 52,134,210,201, 41,147, 33, 50, 29,  8,240,203,143,186,  2,
-  0, 83,220,201,207, 58, 67, 40,  7, 36,  0, 19,132,156,107, 99,104, 52,  8,210, 93, 98,116,150,210, 36,193,113, 47, 65, 13,129,
-225,199,203,101,135,198, 79,235, 74,113,133, 41, 10, 89,  5, 32, 16,148,242,167, 36,170, 87, 15, 59,203, 71, 82, 20,230,223, 76,
-148,128,134,151,205, 74,153, 75,168, 33,105,194, 64, 39, 19,144,162,  0, 37, 71, 41,  4, 99, 28,189,244,241,218,123, 83,186, 79,
- 41,180, 35,109,238,133, 20,114,133, 45,113,162, 37, 61, 14, 28, 74,221,114,104, 72, 79, 81,147,216,245,198,162, 81,100,213, 74,
- 64,146,146, 66, 91,182,134,244, 22,232, 13,237,215,211,210,214, 24,178, 78,125, 70,186,229,108,198, 24,237,177,102,158, 32,  0,
- 54,  4, 18, 91, 96, 64,  3,222,  5,177,113,161,208, 12,134, 16,211, 10, 90, 34,143,242,202,115,224,151, 49,158,230, 50, 29, 74,
-147,238,236, 18,160, 10,191, 89, 64,114, 35,  1, 74, 86,178,171,163,112,237,237,158, 85,185, 95,170,208,239,234,203,242, 38,132,
- 82,227,109,214,216,222,251,153, 34, 51,212,224,196,176,253,106,153, 99,209,229, 46,149, 79, 64,228, 45, 41,208,217,144,176, 88,
-142,149,168, 40,  7,150,209,216, 45,211,158,164, 57, 54,149, 73,183,217, 80,229, 46,213,234, 77, 72,113, 41,  0,142,127,114,166,
-182,234,138,136, 63,  8,231, 66,124,250,119,214,136,251,111,106,123,151,194, 15,179, 87,116,183, 91,103,247, 82,225,178,183, 81,
- 55, 54,223, 91, 16,111, 43,121,168,212,249,212,202,101,201,112,177,  6,177, 22,136,227,168,117,112,106, 47,198, 43, 67,115,185,
-253,229,144, 74,152, 83, 75,194,132,166,147,135,179, 55,167,146,177,104,218,  8,163, 49,131, 44,171,101, 82,242, 36,105,101, 37,
- 93,174,238,  0,210, 13,137,213,184,190, 34, 25,199,137,124, 27,150, 48, 25,157, 89,207,105, 98, 73,154, 90, 74, 25,209,101,153,
- 68, 78,197, 69, 87, 38,162,  8,201, 42, 11,115, 17,137, 23, 64, 22,225,150, 51,124,116,238, 62,206,240, 93,121,221, 53,125,139,
- 98,254,183,183,166,236,173,213, 46,123, 18,139,190, 78, 91,107,223,205,183,143,115, 74,157, 85, 27,132,254,217,209, 34,200,137,
-176,244,148, 57, 59,154,223,149,118,189, 34,254,168,  6,195,212,202, 37,  1,178,229,101, 17,220,184, 46,123,134,236,174, 85,110,
-107,134,183, 87,184,110, 58,228,233,117, 42,229,201, 93,156,253, 74,191, 90,168,206,125,114, 39, 77,169, 84,100,184, 86,235,239,
- 72, 90,214,224,  4, 37, 74, 86, 72, 39, 36,218, 42,181, 73,149,138,165, 74,181, 92,157, 58,167, 88,172,212,165, 86, 43, 53,106,
-148,217, 85, 42,173, 98,179, 80,115,198,159, 87,171,212,230,186,183,234,149, 55,158, 37, 78,200,125,199, 29,112,245, 90,142,  6,
-128,109,101,110, 97, 36,  6,179,241,128, 71, 49, 62,185,242, 26,176,114, 30, 31,163,201, 33,178, 14,117, 76,191,106, 66,  5,197,
-194,141,  9,251, 40, 52,128, 22,229,136, 85,214,206, 85, 72,164,252,120,250, 73,120,157,244,128,204,169, 36,227, 28,238, 99,195,
-217, 60,113, 67, 69,150,137,165,120, 17, 41,193, 88,102,171,119, 98,213,213,195, 83,191,180, 77,245,112, 73, 61, 64,160,130,138,
- 25,228,133,136, 90,148,234, 57, 93,  9,121,  9, 80, 90, 91,144,148,188,144,176,114,149,165, 14,  2, 18,224, 80,  4, 40, 96,130,
- 50,  8, 58,204,169,155,143,113,209,211, 21,169,110,192,185,160, 68, 11, 17,232,183,173, 53,187,170,154,198, 82, 82, 61,205,249,
-174,  9,212,229, 15,255,  0,131, 48, 54, 63,248,163,211, 24, 96,228, 10, 88,201, 41,  7,162,137,244,238, 63, 57,213, 53,164, 43,
- 36, 14,185,200,252,159,150,159, 39,166,130,161, 52, 77, 10,202,163,166,160, 13,137,238, 13,174,167,222, 44, 71, 99,138,111,135,
-120,167,136,248, 74,170,106,190, 27,206,170, 50,105, 42,192, 74,133,134, 66,176,213, 68, 13,249, 53,148,230,244,245,180,228,253,
-170,106,184,166,129,255,  0, 94, 54, 24,116,231,239,189,238,150, 89,133, 64,254, 15,237,252, 36,248,206,123,141,131, 77, 48, 29,
-151, 33,230,210,209,151, 80,170, 84,195,206,184,250, 26, 64,229,  8, 74, 50,160,149, 45,107,  8,109,  8,177,171,117,119, 10,108,
-  7,169,170,189,110,207,170,159, 74,208,253, 57, 21,201,173, 71,113, 46,161, 40,144,133, 73, 74,196,165, 54,232, 78, 92,111,222,
- 60, 37,149,168,148,124, 74,206,  0,166,219,230, 33,120, 36,117,206,124,251,143,219,175,170, 91, 74, 90, 19,207,241, 32, 19,200,
-147,240,156,250,254,205, 37, 29, 21, 36, 32,133,167, 64, 24,223,236,130,111,182,228,145,114, 71, 98, 73, 54,218,248,156,102,190,
- 58,120,209,157,242, 99,172,241, 87, 62,130,146,154,148, 80,197, 71, 69,153,213,101,153,108, 20, 34, 40,225, 52, 84,185, 86, 89,
- 37, 30, 91, 75, 70,241, 68,139, 37, 45, 45, 36, 84,242,232, 13, 44,108,196,177,172,227,188,193, 37, 92,169, 75,105,  8,109,150,
-208, 16,219,109,131,209, 13,161,  0, 37,180,228,147,128,  7, 82, 79,114,117, 72,146,163,205,129,140, 14, 81,216,140,129,158,184,
-237,223, 94, 84,177,158,216,  4,224, 31, 32, 73,237,246,107,233,  9, 80, 79, 50,129,198, 79,194, 64, 35,215, 61,126,205,109, 95,
-111, 47,109,189,216,170, 85,  2,233, 91,105, 10,  6,221,  0,  3,160, 30,158,131,165,177,229,212,133,160,131,128,125,112, 51,211,
-236,243,208,105, 11,230, 60,201,  8,109,191,139,226,248, 78, 71,159,207,251,116,122, 20, 20, 50,  7,145,200, 61,199,151, 95,191,
- 67,169, 36, 55,151, 49,215,161,201,  4,252,137,  0,246,233,161,179,111,219,  6,177,  6,221,251,126,255,  0,227,138,110,123,186,
-192, 82,130,150,  8,200,194, 73,  3,182, 73, 31, 61, 75,227,232,215,112,195, 99,223,219, 35,198, 38,227,110,133,131,105,238, 13,
-175,184,202,183,248,125, 93,173,121, 80, 32, 92, 54,253,118,207, 69, 45,203,170,246,167, 78,131, 84, 97,109,174, 60,137,213,122,
- 35, 78,132,242,171, 48, 16,160,164,173,180, 40, 68, 24,149,143,  8, 54,158,138, 74,147,205,144,144,181, 99, 24,  3, 29, 15,109,
- 77,123,217,103,184,103,103,189,143,246,187,116,  6,164, 81,171,123,149,186,219,227, 85,173,205, 79, 52,105,170,164, 82,174,168,
-214,139, 78,199,144,180,167,195,143, 48, 82, 93, 67, 79,160,169, 10,102, 26,210,135, 57,138,185, 98,156, 99,155,193,146,101, 73,
- 89, 80, 12,138, 37, 10,177,139,  6,150, 66,173,201,141,  9,232, 76,161,  9, 36, 16,136, 25,200, 33, 72,197,129,225,126, 86,115,
-110, 47,162,164, 72,185,210,136,228,101,  7,117,187, 20,132,234,244, 26,101,111,190,214,223, 28,193,223, 63, 97, 79,  4,115,184,
-194,185,209,179, 27,239,185, 54,175, 14,116,135,150, 47, 93,165,163, 83,105,149,186,237,191,122,205, 66,164,162,196,218,237,215,
-185, 31,144,220,155, 36, 48,243, 62, 60,137,208, 39,207,167, 56,164, 69,140,229, 65, 78,120,204,111,  6,212,251, 26,125,155,123,
-125, 58,216,185,109,203, 55,136,138,110,227, 80, 37,198,122,216,220, 26, 55, 21,119,221,175,121,219,245,200,177,194,145,114, 81,
-170, 86,149, 42,  2,105, 21,166,212, 60, 80,227, 40, 75, 45,172,132,134,150,223,194,108, 27, 71,113,203,157, 91,184, 42,197, 34,
- 81,147,122, 93, 21, 71, 34,115, 36, 46, 82,152,170, 10,100, 82,181,243,128,150,154, 17, 84,177,200,  6, 11,105, 81, 80,  1, 58,
-222,155, 74,229,118,163, 38,164,121, 90,136,212,  8,204, 83, 34,180,202,131,110,158, 98, 36, 84,159, 83, 97, 28,172, 45, 43, 91,
-109, 37, 72,230, 95, 43, 74,  4,164,144, 53, 71,103,220, 99,198,175, 58,200,217,245, 68, 48,132,  0,197,  3,242, 22,221,  8, 44,
-154,100,147,169, 93, 83,188,174, 86,218,156,144,111,212,220, 79,225, 79,  9,228, 78,100,161,201,225, 89,  2,172,143, 33, 82, 89,
-164,178,130,234,  9,180,107,204, 58,149, 35, 85, 80,157, 55, 14,113,212,219, 99,136,234,228,106,101, 18,155, 87, 66, 43,171,106,
- 35, 20,230,230,213, 86,165, 86,106, 81,233,145,219,143,245,157, 94,162,202, 82, 39,213,158,  8, 74,228, 72,240,144, 31,125,213,
-185,225,160,171,151, 78,181,189,187, 22,141,226,232,140,220,143,169,234, 75,115,193,110, 28,247, 27, 75, 82, 94,236, 27,137, 40,
- 30, 71, 22, 72,232,147,202,162,122,  0, 78,185, 81, 30,244,240, 36, 85, 11, 97, 75,143, 66,134,205, 38, 36,144,114,151,170,110,
-182,100, 75, 96,  4,171,162,144,234,163,165, 65, 32,245, 74,178,  8, 26, 10, 61,219, 41,136, 17,203,239, 31,124,142,204,154,156,
-175, 13,210,158, 95,136, 52,201,108,142,169, 62, 50,148,126, 69,191,150,148,202,184,199, 54,167,208, 37,169, 53,106,  7,153,101,
-243, 27,  0,162,250,143,152, 27,234, 59,146,  0,182,199, 21,248,142,186,130, 68, 16, 73,204, 22, 91,197, 37,200, 58,148,200,  0,
- 63,105,108,186, 23, 99,179, 29,212,244, 27,233,106,113,119,182,151,183, 20,183,231, 10, 22, 90, 95,184,110,205,174,179, 85,117,
-110, 45,213, 17,214, 92,183,173,234,168,126, 51, 38,204, 66,193,230,145, 91,105, 50,153,247,130,  7, 35, 78, 18,214, 74,210,172,
-108,130,235,136, 99,157,106, 88,230, 57, 24,206,126, 30,184, 29,122, 99, 35,174,184,239,193,253,153,180, 27, 99,196,214,228,110,
-244, 17, 42,218,187,248,132,179, 97,219,181,104, 40,144,201,180,230,222, 73,172,174,167, 38,226,195,235, 46,192,175,213,208,195,
-104,125, 33, 94,236,228,180, 23,194, 91,114, 74,129,232,125,205,113, 42, 50,221, 64,113, 73, 41, 74,147,200, 62, 21,165,105, 39,
- 60,201, 61,142,  2,178, 62, 90,181,184,106,180,102,212,111, 59, 48, 18, 60,132, 50,  0, 46,130,202, 66,144, 55,247,134, 61, 71,
-223,105,215, 25, 75,194, 85,210,100,173,193,144,212,211,209, 46, 91, 68,149,130,172,222, 99,154,  8,239, 94,118,188, 98, 35, 41,
-  2,  1, 17,229,242, 66,157,152,184, 14,149, 74,248,109,178, 71,136,  2,123,168,115,  2, 14, 14, 57,186,118, 32,228, 31, 62,191,
- 45, 97, 51, 47, 98, 23,151, 29, 87,134,165, 30, 85, 12,144, 73, 56,  9, 36, 28,115,140,128, 50, 48,190,217,242,214,190, 84,238,
-181,120,174, 53,206, 10,138, 20,251,121, 81,248,208, 14, 28,111, 62,153, 35,167,145, 94,177,148, 93,188,217,104,175,152, 41, 36,
-165, 46, 12,115, 32, 15,137, 25, 36, 18,180, 96,127,181,202,144,175, 93, 74, 99,129, 80,108,110,126, 63, 15,221,249,252,113, 22,
-167,164, 88,198,195, 87, 75,254, 23,239,215,227,252,142, 54,149,187,161, 46,158,100,184, 10, 85,203,158,101,  4,148,156,144,121,
-194,199,192,114, 21,229,141, 90, 42,114,158, 91,107,145, 76,  8,113,208, 10,213, 17, 74, 45,161,212,100,229, 76, 41, 32,144,224,
-234,174, 78,161, 92,159, 14, 20,113,166, 18, 37,213,201,202, 92,120, 40,  0, 57, 92, 36, 41, 65, 39, 56, 67,160,145,146, 15, 76,
-158,152, 57, 32, 19,157,102,144,110,  4,175,225, 82,207, 50, 70, 72,  4,148,117, 57,200,207, 83,144,  6, 64,237,203,243,234,149,
- 69, 58, 78,154, 36, 23,244, 61,193,236,111,235,211,249,140,110, 67, 81, 45, 20,162,104, 13,237,177, 83,114,174, 63,101,198,215,
- 30,253,136,189,193, 83,190, 47,109,215,101,185,200,130,228,102,194, 92, 90, 75,164, 58,231, 42,146, 73,229, 80,113, 35, 60,189,
-138,136,248, 74,128, 86, 58,234,234,212,199,221,  1, 78,200, 88, 33, 68, 16,142,102, 27, 82, 21,132,242, 40, 55,146, 82,112, 59,
- 17,133, 39, 33, 64,231, 88, 13,198,183, 11,  6,169, 79,  9, 91,204,  2,185,108,130,176,149,181,132,149,201, 71,135,250,206,161,
-180,146,226,123,173,  0,158,139, 29,113,232,181,233,174, 28,169, 77,128,142, 71, 27, 45,169,120, 83, 43, 79, 55, 50,121,143,249,
- 64, 84,147,211,161, 24,193,202,134, 98,211, 43, 81,204, 98,153,246,107,216,216, 88,131,109,238, 59,250,223,241,  6,248,157, 80,
-188,121,165, 42,212, 83, 34, 68,192,217,212,145,169, 24,117,235,185,235,117, 35,175,186,197, 67,227, 22, 64, 10, 60,141,168,243,
-128, 10,146, 74,212, 91, 65, 32, 37, 74, 41, 42, 91, 32,227,252,152,234,  9,207, 49, 35, 87,149, 84, 92,140,217, 90, 25, 74, 60,
-117,  4, 33, 47,165,213,199,195,201, 42,109,160,129,149,198,144,226,142, 19,206, 49,147,240,163,148,243,105,158,139, 82, 82,138,
-  1,113, 92,142, 19,203, 33,183,156,229, 70, 87,204,203,109,242,184,163, 29,174,101,225, 33, 28,203, 82,148,148,148,231, 35, 87,
-196, 84,214,134,138,188, 73, 40,112,151,217, 83,209,203,109,180,180,164,252, 94, 34, 22,162,183,100,103, 28,223,168, 83,130,148,
-143,136,157, 47, 28,195,190,192, 88, 95,247,119,235,183,190,247,177,191, 77,244, 42,224,209,114, 95, 93,183,232,119,183,196,245,
- 29, 59, 16, 63, 12,178,167, 82,117,101,214,158,116,143,  5, 24, 90, 23,206,135,176,149, 30,171, 28,152, 67,133,148, 37, 68,130,
- 72, 82,136,233,216,106,111, 20,187,199, 75,216, 78, 31,183,187,123,107, 14,  3, 11,107, 54,178,243,187,194, 90, 57,118, 69, 74,
- 29, 37,232,118,227, 17, 80,181, 15, 26, 67,151, 45, 70,140,218, 83,159,252, 98,186,121,105,253,153, 86, 47,  7,  9,115, 32, 43,
- 45, 41,124,222, 48,200, 88, 62, 39, 83,200,159,140,117, 57, 42,192,233,231,168,229,253, 33,126, 36,209,101,112,247,183,156, 51,
- 81,166, 20,220,123,253,118,139,190,234,105, 14,114,189, 19,107, 54,170,107, 47, 14,101, 54,172, 24,245, 77,192,149, 76,140,166,
- 92,229,230,106,223,125, 65, 36,  5, 99,118,157, 26,170,122,122, 52, 39, 85, 75,  0,125, 66,117,118, 29, 62,202,  6, 59,122,116,
-190,198, 41,159, 87,166, 83,147,230, 89,163, 16,134,138, 38,100,189,183,152,128,144,169, 29,124,210,178, 41,223, 96, 73,219, 16,
-244, 92,153, 82,150,236,202,131,161,234,140,247,159,157, 80,125, 32, 97,234,132,215,151, 38,107,224, 96,116, 92,167, 94, 87,207,
-155, 66,172,131,211,207, 61,115,246,127,110,136,115,169, 29,135,115,161, 87,230,174,152,245,239,216,121,254,124,181,105,160,  0,
- 11,108, 63, 45,182,199, 34, 42,236, 13,205,207,174,253, 14,  6, 86, 50,113,249, 63, 47,150,135, 81, 10,242,192,235,159,159,204,
-250,104,133,250,130, 20, 72,252,244, 26, 21, 71,161, 62,125, 79,223,165, 20, 18, 70, 21,192,234, 32,117,249,224,103,231,246,124,
-180, 51,131, 57,234,  1,  4,245,209, 90, 17,194, 14,122,247, 57,199,203,231,165,199, 81,129,129, 85,211,167, 82, 79,115,242,244,
-199,166,116, 42,200,207,108,117,199,219,215,207, 68,185,242,238,  7,159,111, 95,223,160,150, 79,126,152, 61,193,243, 61,127, 63,
-118,148, 65, 97,210,247,249,255,  0, 92, 12, 82, 36,  2,122,129,247,254,255,  0, 61, 45, 81, 95,235,119,242,252, 62, 95,159, 93,
- 45, 31,  3,108, 86, 29,251,103,229,162, 52, 42, 87,219, 61, 15,145,199, 76,131,229,170,129, 68,158, 94,108,116,207,111,159, 94,
-190,189,244, 71,  2,221,108, 70, 14,195,173,190, 63,195,  7, 54,123, 21,125,223, 63, 67,162,  7, 95, 35,246,121,232, 38,240, 58,
-100,147,243,252,247,254,173, 22,149,245,244, 62, 94,126, 95,102,146,193, 58,116, 56, 41,161,203,212,156, 99,200,252,243,216,104,
-214,200,243,  0,253,248, 39, 64,165, 89, 29,191, 17,231,231,131,157, 86,108, 20, 44,168,172, 16,172,  1,159, 47,179,238,210,109,
-233,109,135,242,198,113,112, 10,193,  1, 67,  4,249,129,223,237, 35,243,215, 68,167,  3,168,200, 39,161, 29,191,102,122,118,208,
-169, 81, 32, 12, 12,140,119,237,140,  1,140,143, 60,232,128,172,100,156,100, 96,228, 96,147,246, 99,229,253, 58, 79, 24,193,141,
-168,119, 61,113,211,239,233,131,248,104,132, 28,224,245, 56,235,243,233,235,143, 45,  0,133,103,  3,168,  4,250, 14,255,  0,105,
-213,126,108, 17,133, 41, 57,207,234,250,255,  0,195, 72, 55, 94,183,198, 45,251,240, 96,194,212, 65,206, 15, 99,156, 99,167, 83,
-223,166,178,107, 86,133, 46,228,174, 83,168, 84,230,131,242,231,203,102, 43, 41, 89,195, 69,215, 20,122,190,224,255,  0, 37, 29,
- 13,165,110, 56,175,230,182,210,136,235,140,226,141,149,172,148, 40,242,164,140,243,  0,115,229,231,167, 83,107,106,201,163,215,
- 27,102, 59,168,106,161, 80, 68,168, 17,165,168, 14,120,254,244,202,121,148,223, 55,119,212,203,110,165, 63, 53,159, 44,231, 74,
-177,164,138,154,105, 34,  0,200,138, 72,248,250,159,147,183, 77,240,231,146,208,195,153,231, 25, 94, 91, 81, 57,166,167,174,158,
- 24,157,199, 85, 87,117, 86, 43,125,181, 16,108,183,219, 81, 23,218,248,222,138,101,205,111,109, 53,188,139, 14,206,  6, 92,185,
-106, 97,219,158,165, 20, 33,169,181,218,147,105,229, 75,211,229, 39,172,106,107, 74, 42, 76, 88,249,229,105,177,148,165, 78,169,
-197,168,202, 52, 58,189,201, 45,107,152,251,134, 43,136,241, 26,136,133, 56,212, 96, 73,206, 22, 82,160,183,187,255,  0, 56,129,
-159,230,233,172,181,109,231,101, 77,113,174, 96, 84,151, 11,234, 90,143, 58,214,238,114,165,184,181, 28,173,106, 39,185,234,115,
-211,167, 77,109, 61,163, 22, 44, 22, 27, 91,137, 83,171, 74,128, 82,  1,207,234,158,188,201, 56, 29,255,  0, 15,232,173, 43,102,
-142,152, 57, 86,230,207, 39,153,152,245, 98,109,185,219,238, 30,131, 97,176,176,238, 92,135,135, 96,160,165,130,158,154,139,217,
-233,169,194,164, 80, 40,217, 20, 91,173,247,102, 39,119, 98,117, 51, 18,204, 75, 18,113,157, 88, 27, 77,  6,162,243, 10, 91, 45,
-173,210, 17,204,134,249,192, 79, 80, 63,214,237,246,249, 13,116,123, 98,182, 58,  4, 74,205, 30,167, 79,136,195, 21,  8,242, 27,
-109,110,132,  5, 41, 73, 87,235,167, 43,  4, 56,130,140,228, 96,131,208, 99, 90,225,182, 40, 67,142, 48, 16,148,176,211,139,108,
-165, 13,164, 41,196,146,  1,  0, 28,  0,122,103,200,227, 93, 65,218,186,205,175,107,194, 23, 45,203, 58, 29, 22,218,182, 96, 72,
-174,220,149,170,131,237,177, 22,155, 74,165,199, 84,185,211,101,200,116,132,182,210, 35, 52,242,142, 78,112,156,  0, 78,  6,171,
- 12,238,173,234,222, 88,228,156,164,106,  9, 35,215,160,  2,195,177, 61,189, 58, 92,224,103,185,230,105,150, 32,167,167,102, 26,
-193, 82,  7,165,183,  6,219, 90,219,  1,190, 56,205,197,103,181,207,127,173, 13,203,184,118,215,133,170,141, 31,104,108,203, 18,
-227,169,219,114,110, 38,173, 59,114,175,120,222, 85,138, 12,199, 41,181,154,156,153, 53,154,123,241,232,148,133, 84,163, 74,110,
- 60, 86, 88, 82,220,105,176,227,238,146,190, 68,232,182,233,123, 64,184,141,223,154, 60,154,  6,249, 57,181,123,167, 78,146, 84,
-227, 18,107,187, 67, 98, 81,110, 42,116,165,  0,145, 34,159,117,218,148,120,114, 99,114,227,163,101, 42, 70, 84,115,229,173, 86,
-221,155,170, 61,231,185, 27,133,121, 69, 66,  4, 43,174,251,188, 46,104, 37,150,148,210, 87, 78,184, 46,106,173, 86,152,226, 26,
- 95, 86,138,160, 76,140, 84,147,241, 37, 74, 32,128, 65, 26,194,202,138, 27, 72, 66, 66,146,164,249,147,216,250,231,207, 87, 69,
- 31,  7,240,224,142,134,170,163, 33,165,108,202,  5, 70, 19,180, 17,154,132,144,  1,186,205,167,154,132, 27,219, 75, 46,158,139,
-101,216,113, 46,113,196, 25,150,101,152,213,213, 75, 88,211,164,146,185, 69, 33, 74,  4,212,116,  0, 45,109,150,194,253, 77,174,
-196,146, 78, 25, 29,226, 14, 57,121,205,113,232,130,  3,142,211,225,184, 35,161,210,251, 60,158, 24,194,153,113, 74, 39,194,232,
- 48, 51,240,246,211,245,236,251,162,194,185,248,143,179, 45,121, 83, 19, 21,250,213,203,107,181,  9,165, 71,118, 87,191,186,213,
-102, 27,130,  3, 81,152, 66,148,243,239, 41, 41,105,  3, 24,  5,238,101,124, 41, 58,101,247,161,159, 22,181, 69,168, 39, 42,110,
-109, 13,166,193,234, 48,228,124, 36,164,245,239,145,174,129,251,  9,174,186,  5,165,237, 66,225,233,203,134,153, 75,169,179, 93,
-122,232,183,105,102,171, 29,185, 77,211,107,245, 27,114,161,245, 77, 90, 19,110,130,148, 84,153,121,149,  6, 86, 70, 82, 94, 37,
- 63, 16,  4, 76,106,145,166,225,202,216,163,115, 19,154,118,  0,141,244, 17,182,175, 48,111,179,107,216,131,211,124, 55,240,245,
- 50,102,121,237, 29, 36,238, 33, 74,218,128,140, 64, 27,115, 13,172,189, 64, 38,246, 91,130,  3, 17,112, 70,216,253, 60,108,203,
-170, 61, 38,218,163, 69,169,210,215,  6,123, 52,168, 12, 42, 18, 30, 74,149, 13, 45,197,109, 30,  2,136,232, 84,156, 96,142,195,
- 24,211,173, 99,205,135, 95, 67,163,195, 82,216,105,226,174, 71,124,148,149,  2, 51,235,129,141,105, 44, 90,227,175,203,110, 58,
-159, 60,234,145,200,227,139, 86,113,133,225, 74, 81,201,236,156,159,187,231,170, 28,  4,113, 50,246,254,220,188, 78,211, 27,167,
-174,157, 67,217,253,200, 98,198,160, 62,226, 84,149,213,154,110, 59,134, 85, 65, 74, 80,193, 38, 67, 46,128,145,156, 36,167, 56,
-206,171,117,160,130,138,122, 97,237, 82,206,210,  2,164, 74,193,245,233,  0,234, 42,  2,170,144,127,100,  1,189,173,233,213,116,
- 57, 94,103,152,229, 89,246,102,140,213, 17,228,201, 12,179, 73, 36,128, 58,  9,234, 18,153, 52, 40,182,162,210, 72,183,  8,  0,
- 85,  5,141,128, 24,234, 84, 22, 97,190,160,211,140,160, 37, 73,  9, 37, 39,151, 35,203,  4,118, 61, 53,114,153, 78,153, 71,107,
-235, 40, 14, 61, 50,158,222, 60, 88,104, 36,186,207,108, 43,161,248,155, 29, 63, 29, 97, 20,201,202, 47,103,152,116,235,202, 79,
-126,158, 94,167,229,242,211,203,110,200,247,142, 86,186, 45, 43, 28,139, 74,199, 69, 36,140, 40, 28,142,185,211,232,142, 26,149,
-210,124,143,250,172, 54, 32,246,233,212,123,143,108, 87, 57,193,168,203, 88, 74,126,186, 30,174,140,110, 24, 27, 95,115,186,183,
-163, 11, 88,251,182, 38, 90,149,147, 81,103, 43,113, 42, 36,101, 41,  4, 97, 63,236,131,246,106, 57,159, 74,191,116, 98, 90,254,
-207, 59, 39,109,189,229, 13,212,183,107,126, 44,232,173, 70, 10, 79,139, 34,151,103,194,170,220, 21, 37, 33,  4,228,182,151, 83,
-  3,152,129,211,196, 79, 81,158,178, 30,102,146,109,219,145, 41, 96, 40, 65,169, 43,197,142,145,209,  8,117, 68,  7, 25,  3,237,
- 80, 32,127,181,168, 24,253, 41,190, 42,105,187,177,198, 54,217,240,225,110, 85, 81, 54,139,195,101,145, 34,125,214,152,206,  7,
- 99,181,184,187,128,182, 37, 59,  9,124,170,199,189,197,183, 98, 83,146,176,122,161, 83,  8, 58, 74, 58,202,145, 17,201,101, 26,
-102,168,170,131, 88,244, 90,105, 22,173,158,223,176,226,  5,136,155, 90,243, 32,234,192, 98,  1,158, 71, 76,139, 85, 95, 79,189,
- 36,176, 18,155, 91,205, 48,228,232,235,246,147, 91,189,183, 39,148,198,196,  2,113, 23,105, 12,224,142, 92,114,128, 57,115,230,
- 60,193, 31,158,218,166,220,116, 96,148,167, 35,185,  0, 30,135,231,131,219, 70, 58, 91,112,228,147,129,219,200,129,212,245, 26,
-163,239,  1,162,164,182, 58, 16,  2,148, 48,123,246,233,248,234, 69,123,110, 78,199,253, 49, 95,238,192, 91,182, 41,184,218,146,
-112,  2, 85,145,205,128,115,240,232,117,175,166,  2,185, 84,122,144,123,252,146, 48, 58,249,126, 26,246,165,183,205,207,226,242,
- 41, 68,  0,146,160, 57,188,186,141,  8,236,164,182,248, 10, 66, 79, 40,192, 24,234, 78, 51,205,246,235,  5,182,178,131,140,233,
- 61,206, 62, 37, 37,100,130, 84,143, 85, 20,247,251,  9,215,196, 52,218, 22, 28,108, 23, 20, 73, 10, 73, 32, 16, 58,117,  3, 29,
-117,111, 83,203,146,247, 41,116,161,190, 96,162,140,245, 64, 79,113,246,247,209,173,134,220,112, 58,130,174, 68,156, 21, 96,167,
- 56, 29,142,124,186,235, 23, 38,226,214,237,108, 24,  0,  8,223,231,108, 84,202, 80,181, 45, 75, 37, 10,236,140, 14, 84, 19,208,
- 21, 19,249,206,145,240, 91, 89, 35,  4,168,  2,181, 39, 36,  1,143, 63,207,219,175, 14,180,248, 91,135,225, 44, 44, 19,203,230,
-113,158,202, 35,190,147, 72, 75,188,184, 10, 97,180,167,149, 94,101, 68,116,193,200,235,219, 67,113,176,234, 62,253,255,  0,241,
-140, 88, 27,158,199,247, 99,223,138,128,176, 16, 74,202,192,200, 64,234, 51,216,159,151,174,144, 56,112,168,255,  0,226,210, 65,
- 39,211,169,193, 30,191,219,161,201, 91, 97,101, 11,229, 33,124,169,112,164, 97, 67, 25, 41,193, 29, 62,221, 18,149, 30, 64, 28,
- 41, 83,138,201, 81,233,203,131,211,  7,167, 95,158,178,160,129,238,248, 99,  4, 11,219,211,111,159,187, 23, 91,122,216,174,223,
-151, 45,171,103, 91, 30, 48,173, 94, 23, 45,  2,211,161,169,134,124,101,166,185,117,214,160,219,116, 71, 18,206, 63, 72,148,213,
-170,176,202,135,110, 84,156,234,116,188, 70, 90, 86,214,200,237,141,191,195,253,145, 22, 45, 26,196,217,203, 30,212,219, 59,118,
-140,216, 15, 52,105,182, 85, 52,210,220,144,228,146,  7,188, 57, 58,187, 14,173, 81,121,213,101,199,100, 86,221,117,213,  5,175,
- 81,  5,246,122, 41,151,120,231,225, 49,165, 45,167, 25, 70,253,237,171,138,109, 68,  6,138,152,185, 35, 72, 66, 58,164,128, 60,
- 86, 81,140,142,248, 24,212,167,184,174,185,213, 80,146,133, 73, 46,189, 42,116,101,176,243,171,116,136,206,165, 92,181, 24,242,
- 29, 66,122, 56,175,137,244, 12,128,174,102,202,115,202, 19,170, 83,197,  9,101,168,206,184,107, 46, 36,242, 99,215, 57,177, 27,
-176, 33,119,  7,246,  0,242,159,241,145,183,126,148,250, 56,229,176,205,157, 87,230, 36,  3, 52, 82, 67, 18,237,186, 42,142,113,
- 96, 78,222,114, 22,253,238,138, 65,198,134,236,221,125, 48,227, 85,230, 51, 33,182, 20, 46,139,193, 78, 71,146, 11,172,173, 49,
-107,213, 39, 22,218,176, 65,104, 45,181, 17,240, 28,231, 10, 57,192,214,224, 91, 87, 56, 52,186,124, 87, 37, 60,195, 17, 27,114,
-181, 86,168, 52,165, 33,208,211,232, 84,135, 35,180, 82,172, 45,194,149, 57,206, 62, 17,225,181,156,149, 19,174,110, 88, 21,191,
-119,114,244,165,183,202, 67, 27,155,118,199, 87, 58,178,  4, 89, 50, 96,212,208,176,140,117, 30,  4,208, 18,  6,122, 47,168, 24,
-193,216,148,220,233, 17, 19,  8, 58,234,126,185,152,195,115,214,218,208, 94, 77, 49, 13,178,244,133,248,196,  0,223,193, 29,180,
- 33, 36,116, 68,133,242,242,101, 71, 81,250,188,185,106, 15, 67,113, 99,239,183,107,245,232,  9,183,107,219,224, 58,227, 63,165,
-142,190,158, 48, 77,158,254, 98, 55,217,118, 36, 14,246,  5,200,  7,112, 64, 22, 35,166,219,210, 47,185, 82,233, 80,131,107,114,
- 60,217, 83, 30,159, 55,  1, 97, 10,126, 99,143, 59,200, 93, 39, 36,248, 79, 52,216, 74,146, 85,208,149, 28,227, 87, 58,150,229,
- 67,154,202,  4, 96, 35, 72,171, 77,110, 44, 73,100, 36,180,229, 58,157,136,136, 91,136, 10,230,111,157,193, 37,215, 17,208,101,
-244,168,228,117,214,181, 64,187,158,122, 93, 82, 99, 15, 54,251, 37,214,153,128, 31,117, 72,105,199, 39,177,225, 23,146,164,156,
- 48,194, 20,135,157, 91,128,140, 41,148,243,100, 17,156, 82,117,230,220,185,110, 46,150,234,204, 86,210,213, 38, 18,207, 68,178,
-246, 20,194,221,232, 57,159, 45, 69, 67,133, 75, 72,  8, 74,217,  4,243, 28,107, 65,114,134, 28,192, 19, 72,150,215,216,116,216,
-247, 29,143,240, 35,215, 20,246,103,146, 44,245, 78,252,176,174,237,171, 80, 54,208,  8, 14, 67, 30,182,  4,169,  0,130,  8,141,
-150,215, 27,108,165, 82,240, 65, 91,130, 60,226,182,132,167,101,192,151, 29,238, 83, 25, 20,197,120, 81,158, 74,218, 87,253,240,
- 30, 74,156,  5, 56, 40, 82,144, 70, 78, 52,237, 90, 94,211,206, 31,238, 61,215, 87, 13,251,187,120,211,246, 99,125,216,166,219,
- 53, 27, 46, 70,225,213,169,180,173,188,223,218, 29,126, 20,116,211,238, 11, 14,254,117,214,224,219,183,114,235,  2,165, 77,157,
-110,215,151,  5,255,  0,172, 41,143, 26,124,233,201, 95,132,215, 47,235,155,134,253, 49,169,137,139, 33, 17,217, 13,120,112, 82,
- 15, 49,240, 35, 44,163,195,112,169, 32,252,110,120,100, 14,255,  0,  6, 84, 78,117,197,111,105,134,220,238, 93,231, 65,219, 45,
-247,167,109,213,197, 90,217,251, 58,155,114,237,149,225,186, 16,105,102,169,111,209,111, 26,133,206,237,223,  6,220,186, 37, 68,
- 46, 57, 71, 74,105,117,120,239,199,126, 99, 76,195, 90,234,170,101,153, 10,125, 14,182,139,  3,128,178,227, 14,113,200,102, 49,
-197, 94,146, 41, 26,186, 58, 14,100, 76,  1, 54,102,  4, 50,105,239,205,107, 48,109,241, 25,226,106, 58,222, 29,225,154,236,230,
-154,152, 85, 54, 88,209,177,136, 41, 60,216,218,101,137,193, 42, 24,198,232,143,175, 85,138,168,137,139, 93, 73,  6,112,183, 37,
- 78,163,  2, 75,208,150,135,161,212, 82,216,153, 17,169,141,173,151,176,166,195,172,115, 50,232, 25,142,243, 42,192, 88,248, 20,
-135, 67,169, 82,146,  1,214, 30,110,102,229,  6,164, 37,229,248, 15,167,153, 14, 21,167,199,131, 45,149, 41,178,218,193,232,133,
- 37,208,234, 20,133, 14,138, 74,146,161,200,172,136, 53,240,131,237,106,226,159,133, 24, 84, 59, 53,218,219, 59,239,178, 52,133,
-176, 33,109, 62,233,213, 42,115, 87,110, 83,210, 19,207, 27,108,183, 21,133,187, 86,176, 89, 90, 16,222, 98,161, 83,232,235,  9,
-248,233, 74,207, 48,145,223, 13,254,212,238, 15,184,152,159, 78,162,209, 47,183, 54,118,249,175,188,219, 14,237, 94,249, 74,164,
-218,245, 37, 92, 79,169, 49, 99, 27, 63,112,216,112, 91,183,164,105,106, 74, 80,226, 84,253, 38,123,107, 83, 14,125, 94,162,183,
- 66,108,186,204,183, 48,166,102,149, 71, 62,156, 30,169,168,233, 30,174,159,105,  0, 23, 14,192, 50,168, 43,245,131, 77,196, 95,
-135,248,215,135,243,244,142, 40, 42,125,147, 48, 63,251, 60,246, 73,  9, 31,170,141,253,220,164,236, 80, 35,107,102, 86, 28,176,
- 93, 65,235,149, 54,227,231, 82,252, 98,143,120,111, 30, 50,  3,153, 10, 74,242,148,190,207, 95,141,149,  1,219,201, 64,160,158,
-157, 92, 10, 45,120, 41, 72, 30, 42,210,211,129, 60,138, 36, 39,194, 40, 56,  9,201,199, 34, 15,194, 82,125, 71, 47, 98, 51,173,
- 78, 57, 42,  4,150,225, 74, 68,136, 85, 24,204, 38, 66, 27,148,194,153, 91,140, 60,112,210,188, 53,165, 42, 92, 71, 18,144, 65,
- 31,  2,199, 43,141, 41, 93,  9,204,232,245,213, 45, 41,192, 82, 28, 24, 15,  5,245, 67,125,  1,240,211,143,214, 37, 36, 97, 93,
-148,  8, 56,  7, 58,212, 89, 53, 45,155,126,155,250,244,189,247,220,131,214,195,222,  7, 80, 36, 83,  0,111,109,143, 66, 55,176,
-233,219,176,244,244,232,113,182,208,103, 41,109,  2,130,  8, 28,170, 10,  7, 24, 72, 25,194,155, 35,170,130,179,216, 16,115,215,
-  3, 58,111, 43, 10,114,143, 57, 62,  8, 83,116,247,138,158,104, 35, 42,247,  7, 50, 75,237, 35, 36,226, 62, 87,206, 17,241, 16,
- 21,132,140, 32,  1,125,182,231,180,168, 76, 58,  9, 40, 84,116,130,133, 30, 98,133,  5,  4,164,144,145,213, 29,122,131,213, 61,
-  0, 36, 29, 13,118,  6,157,142,165,164,161, 74, 66,131,137, 36, 16, 75,137, 11,198, 66, 58,  1,225,133,117,  7,177,199, 76,105,
-179, 52,167, 21, 20,206, 20, 94, 88,188,203,247, 14,159,247, 13,175,219, 99,141,204,138,188,229,245,233,172,222,154,164,132,144,
-123,143, 71,223, 96, 84,155,244, 59,106, 94,135,127, 84,218,177, 40,  8,109, 77,171,152, 21,173,176,163,224,169, 71,153, 72,125,
- 10, 73,232,160, 71, 80,122,228,147,140,224,235, 37,102,160, 10, 82,164,185,132, 45, 57, 74,215,202,149, 96,228, 37,  5, 93, 73,
- 30, 65, 68,115, 96,128, 73,233,134, 98,157, 41, 13, 56, 75, 78,101, 30, 32, 41,200, 60,139,109,106, 31,174,223, 79,137, 36, 30,
-189,207, 76,140,117,214, 72,221,101, 45,182,162,165, 36, 32,100,243, 41, 75, 81, 70,115,204,  0,245,193,235,219, 60,157,117, 24,
-134, 67,166,254,131,225,214,223,195,240,185, 63,  9,141,122,  6,118, 85, 58,239,247, 92,246,191,191,212,255,  0,166, 51, 26,229,
-207, 71,161, 82,171, 21,250,253, 86, 21, 10,222,160,210,170, 53,218,245,110,162,164,183, 78,161,208,104,176,228, 85, 43,117,153,
-206, 45, 73,  9,137, 18,151, 18, 91,238,228,225, 72,142,160,158,165, 57,252,241,248,236,226,198,175,198,143, 19,187,139,190,210,
-211, 34, 37,167, 54, 67, 54,134,209, 80, 36, 40,149, 91,187, 67,106, 59, 42, 29,153, 29,224, 82, 63,247, 86,123, 78,203,172, 84,
- 21,128,163, 54,224,117, 10,232,210,117,219,143,110, 55, 31,168,247,  9,220, 13,237, 45,117,106,153, 60, 65,155,196,245,118,153,
- 33, 73,250,186,148,129, 22,167,110,108,123, 50,218, 88,204,249,174,  8,181, 59,157,180,158,102, 99, 49,  2,144,247, 42,222,154,
-216,140, 58,201, 42, 87, 55, 92,245, 24,242, 62, 93, 51,208, 99, 86, 23, 10,101,174,168,115, 74,133,179,204,161, 98,  4,110, 35,
-184, 38, 79,255,  0, 83,109, 63,224,  1,129, 34, 76,115,135,139, 28, 75, 29, 69, 68,124, 51, 69, 46,168,168, 95, 93, 91, 41,184,
-105,192,178, 67,126,252,133, 36,200, 55,250,214,208, 64,120,119,164,226,207, 66,  6, 58, 99, 61,253,127,110,168, 40,146, 14, 79,
-145,  3,176,234,117,236,175, 32,140,119,245,254,173, 14,178, 50,  7,166,115,251, 53, 54,197, 56,  6,195,215,223,143, 26, 25,222,
-163,190,112,127,103, 95,199,190,136, 80,  4, 28,249,117,233,242,208,171,236, 62,223,191, 74,170,144, 55, 30,252, 27,  3,172, 12,
- 19,233,219,241, 26, 21,194,122,100, 96, 15, 50,122, 99,167,203, 68, 45, 88,  7,168,198,127, 12,119,207,207, 39,246,104, 39, 14,
- 65,238,122,244,207, 92,117,243,209,240, 49, 73,194,122,158,135,167, 78,221,191,225,160,214, 70, 49,230,127,175, 85,214,124,179,
-246,254,237, 12,162,115,131,131,230, 15,203, 74,168,176,  3,231,255,  0, 56, 24,164,161,156,124, 57,251,241,165,175, 42, 81,  4,
-128,123,105,104,248, 61,215,161,234, 61,195,  9,  4, 17,131,140,142,223,159,183, 85, 65,193,  7,254, 56,208,233, 56, 57,252,117,
- 84, 28,245,242,237,243,207,245,104, 16, 14,221,176,115,176,176,216,246,251,173,130,144,113,212,117, 31,209,147,251, 52, 64, 81,
-  7,  3, 57,199, 92, 12,227,237,208,169, 35,151, 56,237,220,122,227,174,171,161, 97, 64, 96, 17,233,247, 31,233,206,144, 35,125,
-251,225, 50, 15,218,181,186,127, 44, 28,217, 61,137,207, 79,219,211, 69,160,115,  4,228,115, 96,228, 12,227,183,110,191,142,129,
- 66,176,164,143, 53,  1,246,117,209,136, 61,199,167, 81,162,144, 13,182,219,  5,193,232, 56,201, 61,187,103,231,233,170,157, 57,
-128,201,237,219,190,122,158,195, 61,244, 58, 14, 70, 85,219,229,220,254, 78,137, 78,  6,  9,248,142, 58, 30,199,229,215, 73,176,
- 32,251,176, 49, 85,178, 80, 71, 49, 24, 29,179,128,122,159,234,206,170,161,228,172,227,  5, 63, 51,208,106,130,129, 57, 36, 12,
- 43,246, 12,103,250, 53,245, 33, 41, 28,169, 39,168,200, 39,169,243, 62,154,215,113,110,214,192,193, 69, 75, 80, 41, 11, 40, 72,
-242, 79,235, 44,117,198, 14,142,138, 84,193, 74,208,181,165,208, 82,164,172, 44,165,214,212,133,  5,182,227,107, 79, 84, 56,149,
-  0, 82, 71,108,122,116,213,184, 21,116, 32, 12, 36, 16,175, 92,121, 99,240, 58, 41, 11, 82,192,198, 50,156,  1,158,159,143,207,
- 73,144,  8, 32,238, 14,  5,200, 32,131, 98,  8, 32,251,198,227,247, 28,108, 53,141,190,213,107,108,134, 43,180,182,171,204,124,
- 41, 19, 35, 60,136, 85, 18,145,128, 11,205,175, 13,186,160, 60,210,164,149, 28,156, 13,108,141,181,197, 54,220, 70, 82,197, 66,
-151,116,195,121, 72,202,146,221, 49,185,109,229, 32,244, 75,141, 75, 60,221,199, 95, 93,115,201,  4,164,124, 94,189,207, 82,  7,
-168,253,186, 37,176, 66,144, 22, 84,164,142,169, 32,227,161,236,  8,243,244,251,245, 28,174,225,188,174,181,153,164,137,162,103,
-235,203,114,160,244,191,151,117, 31,114,140, 91,121, 55,141,220,125,147,211,199, 74,107,169,243, 88,225, 80,170,107, 41,214, 89,
- 52,139, 90,242,161,142, 87, 35,177,119,115,110,248,235,133,191,199,206,218,219, 45, 52,170,125,157,118,214,229, 55,146,132,186,
-136,148,166,213,201,219,244,179,102,224, 18, 71,250,170,  3, 29,180,196,241,  5,199, 86,232,111,197,  1,251,  8, 50,221,147,182,
-143, 56,211,211,237, 58, 60,167,100, 74,185,156,140,226, 94,138,213,215, 87, 83,109,251,229, 61,183,144,219,158,226,195,104,140,
-227,141,161,111,151,249, 82,145,162,  3,148,130, 92,  5,192, 20, 20,148,231,148, 55,212,227,  4, 14,186, 61,162, 86,176,146,225,
- 80, 56,228,194,113,201,219,161,207,235,116, 56,211,117, 47,  5,112,245, 21, 84,117,201, 69,207,170,132,134, 71,149,218, 77, 12,
-  8, 33,149, 73,229,134, 82, 46,173,163, 82,145,169, 72, 32, 28, 53,241, 15,138,188, 97,196,116,243, 82,213, 84,195, 69, 77, 80,
- 10,200,180,176, 44, 69,212,245, 83, 35, 25, 38, 10,219,134, 85,145, 85,193, 42,192,169, 32,158,135, 75,235,241, 20,165,243,156,
-130,149,228,227,191,234,252,191,175, 69, 53,226, 20,169,146,  9, 42, 80, 87, 50,134,  0, 79, 79,192,118,208,142, 44, 52,130, 84,
-175,137, 56,248,146, 49,143, 64,122,117,233,170,145,222, 81, 66, 66, 73,248,178, 73, 87, 82, 79,108, 12,246, 29, 53, 36, 61, 54,
- 29, 62, 70, 43, 94,183, 35,123, 91,175,205,241,136,238,148, 54,166, 91, 20,250,139, 88, 47,209,166,170, 59,233, 79,254, 76,255,
-  0, 80,172, 99,160,230, 39,240, 58,198,120,103,221, 57,187, 25,196,150,199,238,244, 21,134, 94,176, 55, 62,210,175,186,181, 28,
- 15,112,143, 87,142,138,146, 84,113,217, 84,215,101, 39,255,  0,165,167,117,218,108,106,205, 62,177, 68, 90,  2, 93,157, 79,120,
-165, 71,245, 68,134, 82, 86,218,243,228,123,254, 61,245,167, 85, 38, 11,109,188,210,135,233,152, 91,140,184,160,122,120,145,212,
- 83,145,142,255,  0,171,251,117,187, 66, 18,104,170, 41, 36,251, 18,234, 83,255,  0, 68,162,196,254,253, 93,251,227, 20,149, 82,
-101,249,133, 45,100, 91, 73,  4,145,202,189, 62,212,108,174, 63, 16, 49,250,180,211,238,200,245, 37, 67,171,211,156, 15,194,174,
- 65,129, 89,167, 45,  4, 20,189, 10,173, 21,153,145,214,133,121,160,178,242,122,249,231,190,180,239,217, 89,188,242,168, 28,101,
-113,223,195, 53, 74,165, 21,248,241,110,200, 59,151,105, 48,148, 54,212,150, 99, 85, 66, 25,171, 70, 90,211,133, 72,  8,121,198,
-149,215, 37, 35, 61,129,214,138,112,241,237, 18,181,246,247,217, 85,195,199, 23, 55,221,185, 92,188, 87,110,170,222,216,155,158,
-135, 70,113,168, 85, 74,133,213, 66,154,237,182,137,209,228,212,  2, 90,247, 81, 18, 12,119,150,178,172, 40, 40,165, 36,172, 99,
- 92, 76,225,195,218, 43,112,108,191,180, 68,241,163, 87,137, 53,218, 13,213,121, 85, 13,251,109, 69,117, 79, 59,252, 93,220,210,
- 61,214, 85, 57,148,140,  9,179,169,240, 12, 87, 90, 24,253, 35,176,207, 39, 85,140,213, 94,201, 95, 89, 89, 81, 50, 68, 88,229,
- 41, 44, 77, 97,114,211,137, 33, 50, 70,130,251,177,141, 24, 11,126,210,130,124,216,234, 92,247,139,178,110, 30,135,135, 86, 26,
-240,171,156,212, 69, 53, 68, 96, 18, 70, 89, 60, 14, 18, 89, 46, 45,161,102,104,166,  0, 18,247,167,107,  0,  6,255,  0,166,  5,
- 42,103, 57, 65, 82,185, 64, 32,133,247,194,134, 58, 28,253,191,183, 79,189,167, 40,130,133, 15,136,130, 15, 48,207, 92,244,234,
- 62,127,191, 90,215,182,213,122, 45,249,108, 90, 55,197,175, 49, 85, 11, 94,248,160,211,110, 91,114,123,145,228,195, 92,170, 77,
- 82, 51,114,163, 41,232, 51, 90,109,232,174,134,220,  0,165,196, 37, 67, 29,181,181, 22,173, 32,176,218, 22,172,  0, 58,144, 15,
- 48, 35,161,232, 51,211,182,149,165,204,  0,210,250,182, 96,  8, 55,216,131,107, 17,234,  8,177,  7,208,223, 12,252,106,244,209,
- 69, 44, 79,229,112, 89, 74,158,160,131,165,148,142,161,131,  2,  8,234,  8, 32,216,139, 99, 84,189,166, 92, 73, 94, 92, 36,240,
- 71,190, 60, 72,109,253,170,139,190,243,218,251, 81,202,181,  6,152,247, 63,185,197,151, 53,246,105,136,172, 84,  2,  7, 50,224,
- 67, 84,180,200,117, 35,  4,165,140,  2,158,227,242,123,220, 13,193,188,183,102,246,187, 55, 70,255,  0,174,202,185,175,125,193,
-184,106,119,117,217, 95,154,225, 92,154,165,106,179, 33, 82,165,200, 61,127, 70,202, 74,130, 26, 64,248, 91,109,180, 33, 32, 37,
- 35, 95,176,103, 17, 91, 65, 79,226,  3, 96, 55,155,100,106, 73,104,195,221, 29,180,188, 44,162,167,194, 11, 49,228,215,104,147,
- 33, 65,146,176,160, 71, 43, 83, 28, 97,207,145,107, 58,252,126,111,173,183,174,109,101,223,114,237,205,200,243, 14, 87,172,107,
-134,183,104, 86, 21, 21,196,191, 31,235, 27,118,163, 34,153, 41,108, 62,142,143, 50,181,199, 42, 74,135,250,248,242,211,205, 11,
- 23,205,103,169,168,185,146,170,158, 46, 83,159, 68,102, 90,132, 67,211,202, 69, 43,202,122,183, 50, 37, 98,121,105,106, 87, 55,
- 74,198,201,233,231,141, 79,232,234, 57,204, 82, 16,  6,132,158, 85, 50, 83,153, 27,174,169, 99, 74,129, 10, 55,149, 68, 19,180,
-118, 47, 41, 56, 67,100,168,171,151,155, 61, 79, 95, 60,122, 15, 61, 35,130,164,243, 43,195,200,232, 85,144,149, 30,190,103,160,
-235,163,138, 10, 81,148,161, 61,  1, 57,207,196,  1,237,229,215, 58,179, 73, 73,100,  1, 32,169,109,175, 10,108,133,117, 65, 61,
- 64, 35,211,190,164, 33, 71, 78,184,138,  6, 12,221,108,127,211,249, 99,203,205, 18,188,146,148,164, 30,157,114,114, 49,212,122,
-121,235,227,237, 45,212,  2,  7, 84,167,184, 57,230,251,255,  0,214,210,105,196,231,225,201, 72, 78,112, 71,161,193,239,249,235,
-162,163, 54,227,231,  9,229,102, 56, 25, 86,126, 37, 18, 58,142,158,154, 26, 64,223,165,177,147,211,115,112, 58,252,252,223, 22,
-213, 70,117,150,146,176,201, 81, 88,230, 39, 35,152,  1,253, 61,115,159,248,104,168,146,144,231,232,202,255,  0, 85, 56, 40,229,
-  0, 30,157, 78,124,245,114, 83,  5, 65, 72, 11,202,122,142,131,  4, 30,196,245,208, 41,136,220, 55, 57,130, 80,160,172,229, 74,
-  5, 71, 24, 57,192, 61,188,255,  0, 13,102,195,174, 10, 13,246,245,219,231,231,243,194, 75,106, 66,138,139,202,121, 62, 73, 39,
- 41, 64,244,249,235,195,175,165, 29, 16,164,129,215,  3,176, 10,244,237,242, 58, 13,247, 86, 20,162,210,241,205,219,  9,199, 76,
-118, 57,252,252,244, 57,121,183, 22, 18,162,114,  8, 46, 36,167,166,122, 30,132,122,147,160,  1, 61,122,224,218,109,176, 59,124,
-252,244,193, 73, 62, 42,249,210,160,160,  6, 10, 58,  4,243,117,237,215,174,169,202,116,144,148,163,  9, 35, 41,232,112, 73, 35,
- 26,244,226,149,225, 44, 52,218, 83,202, 50,  6,112, 73,  3,166, 20, 60,186,106,200, 38, 56, 22,159, 25, 41, 42, 74,136,229, 35,
- 39,237,230,  7, 25, 25,253,154,205,172, 79, 99,140,129,115,240,254,120,124,184,115,189,156,218,173,243,217,253,196,140,226,154,
-114,201,221, 29,189,186,157,144,  2, 28, 76,104,148, 91,202,137, 62,170,234,144,226,146, 10, 19, 71,106,164, 78, 72,192,235,229,
-214, 89,252, 84, 79,135, 38,165, 91,167, 64,144,125,222, 21, 90, 83,212,194,  9,203,148,103,102,202,149, 75,147, 29,226,231,198,
-199,134,165,180, 86,174, 83,250, 48, 82,145,204,117, 12,134, 36, 32, 58, 89,144,219,141, 68,148, 28, 97,215, 25,112,135,124, 41,
- 13,150, 30, 13,148,156,182,191, 13,197,224,142,160,224,143, 93, 73,106,193,222,  9,123,221,195,158,213,110, 37, 84,  5,220,177,
-173,145, 99,221,170,  9, 90, 82,245,211, 97, 33,139, 66,186,235,106,113, 41, 18, 89,144,221, 38,151, 80,109,206,169,241,170, 79,
-  3,133,165, 68,213,126, 32,229,133,243, 12,131, 53, 81,228,136,205,  3,157,175,169,213, 36,139,223,107, 71, 40,244,  5,135, 82,
-109,142,146,250, 55,230, 49,199,158,230,217, 92,205,165,166,142, 42,152,199,111,171, 99, 12,173,241,188,212,235,255,  0,117,239,
-229,177,215, 10, 45,116,211,119, 43,112,233,170, 37,182,230, 76,183, 43,177, 16, 48, 67,141,212,104,203,167, 84, 84,210, 85,250,
-200,247,186, 39, 42,135, 76,169,127, 17,201, 25,126, 41,181,229, 37, 94,246,130,227,139, 83, 98,158,134,210,180,160,134,139,132,
-169,  8,228,234, 57,157, 60,196,119, 33,160, 58,  3,173, 54,220,106,162,232,187,147, 64,173, 32,128,221,114,157, 86,182,101,168,
-  2,112,236, 98,110, 58, 71, 42,  0,200, 82,156,139, 85,108,168, 12, 37, 47, 14, 99,215, 89,237, 42,241,122, 42, 89,121,149,120,
-143, 68,240,228, 71, 67,193, 97, 42,112, 20,248,104, 82,146, 14, 81,149, 36, 43, 61,130,149,202, 79, 77, 54,154, 98,201, 79, 48,
- 93,157, 23,215,245, 64,140,254,242,183,247,  3,113,214,216,234,185,107, 85, 90,190,153,200,103,134, 73,  8,185,181,196,141,207,
-  0,122,217, 95, 77,199,166, 54, 18,161, 94,151, 79,143,238,201, 90,156, 74, 11,144,195, 67, 45,167,222,100,242,185, 41,107, 79,
- 47, 68,161,128,211, 94, 17,  4,143,139,237,214, 33, 94,188,163, 65,166, 48,194, 95, 91,117, 54,202,144,132, 54,165,128,183, 95,
-199,188,184,162,159,133, 33, 12,114, 39,  3,184,113, 99, 62, 90,108,110,125,200,155, 57,192,243,237, 54,135, 98, 37, 65,105,104,
-184, 83, 38, 67,170, 74,157,117,106, 82, 65,231, 43, 42, 36,158,164, 28,103,182,152, 91,179,113, 22,203, 82, 31,144,227,141,177,
- 29,133, 60,243,188,138,117,126, 27,202,229, 79,134,132,140,173,213,186,224, 64,230, 35, 28,249, 82,146,156,168,109, 83, 80,180,
-133, 70,155,131,247,250, 91,173,253,215,233,123,143,190, 31,153,230, 40,116,234, 94, 76,155, 11, 13,199,112,250,136,  0, 48,181,
-193, 30,164,142,215, 14, 21,209,121,205, 91,172,198,128, 37,214, 37,203,151, 18,147, 71,162, 69, 74,158,159, 91,173, 84, 31, 76,
- 74, 61, 38, 10, 82, 57,149, 46, 76,199,210,132, 36,116, 79,141,204,122, 13, 72,111,103,182,153,253,140,217, 59, 59,105,234,166,
- 43,245,214, 40,146,102,238, 75,165,136,243,169,213, 75,230,241,120, 86, 47, 54, 36,211,230,178,227, 21, 26, 75, 53, 55, 26,167,
- 24,207,180,236,119, 35,210, 16, 22,218,146,117, 21, 91, 99,137, 58,134,192,111, 54,211,110, 76,122, 84, 42,181,197,100,221,246,
-174,224,205,167, 84,216, 19,169,212,123, 66, 37, 89, 42,151, 77, 97,181, 39,195,159,114, 79,128,212,245,169,240, 22,212,111,116,
-105, 13,225, 69, 58,152,173,218,236, 42,179,108, 87,233, 14,186,253, 46,181,  6,157,112, 82, 30,120, 56,211,238,209,110, 10,124,
-106,204,  5, 62,219,128, 41, 18, 61,194,107, 60,193, 64, 44, 45,  4, 30,186,117,106,119,163, 48,188,177,253, 92,232,116, 31,218,
-177, 26,182, 29,  0,  5,108,118, 44, 24,145,181,142, 35,114,231,116, 85,239,152,101,148,181,162, 92,195, 43,146, 35, 87, 18,135,
-188, 13, 42, 22,128, 23, 42, 35, 98, 66,200, 24, 35, 57,137,208,164,161, 30,202,120, 41,197,183,177,147, 96, 55,194,117, 82,245,
-225,250,163, 11,134,125,197,158,169, 14,206,182,216,166, 75,169,236, 93,114,190,156,248,141,189,108,196, 90,166,237,169,121,196,
-181,250,106, 40,147, 79, 30, 49,116, 81,219, 78,117, 26, 30, 33,248, 90,223,142, 22,238, 53, 90,251,235,183, 21, 75, 77,169,146,
-228, 66,162, 92,232, 13, 87,118,250,239,240, 22,241, 75,150,189,233, 78, 11,167,214, 10,153, 99,198, 17,203,141,204,109,181,161,
- 79, 69,104,144, 53, 62, 58,210, 27,142,235,239, 21,135, 25, 12,160, 78,108, 32,130,  2, 20,150,218,156,215,108, 60,148,173, 41,
- 88,  7, 42, 65, 24, 28,201, 25,193,174,203,122,131,116,219,213,139,110,241,182,232, 55,173,161,112, 70, 84, 43,170,207,186,169,
- 84,234,253,183,113,211,152,109, 97, 46, 84,104,245, 86, 28,142,237, 70, 59,  5,226,196,128,132,200, 66, 22,182,154,125,146, 80,
-180,201,178,222, 38,170,167,211, 29, 71,246,200, 86,223,104,218, 69, 29,  1, 87,177,189,186,233, 96,214, 30, 85, 40,  0, 56,170,
-184,143,195,156,143, 60, 18, 84, 69, 23,232,156,193,247, 18,194,160, 70,237,183,247,176,221, 84,146, 79,219, 83, 27,110, 29,203,
-146,109, 13, 30, 23, 61,163, 28,100,240,219, 38,149,107,237,182,228, 73,189,236,148, 58,150,218,218, 61,216, 67,151,221,136,166,
-144,210, 25,240, 41,  6,169, 45, 53, 11, 53, 66, 58, 57, 80,186, 76,248, 97,190, 98,160,218,142,164,109,178,158,214,237,167,175,
- 65,161,127, 41,109,181,191,248, 74,174, 85,212,196, 72,247,141,118,159, 86,189,184,118,184, 38, 56,243,200, 67, 20,205,205,163,
- 65, 92,187,103,244,108,243,134, 42,113, 37,120, 42,121, 41,114,160, 80, 84,117,167,220, 73,251, 19,182,242,247,150,245,217,194,
- 29,220,173,162,186,165, 45,185,180,237,176,187,166,214,235, 27,115, 85,154,242,203,141, 53,105,221,169,247,138,213,131, 33,111,
- 58, 60, 24,243, 19, 85,132,218, 80, 19,227,198, 71,195,173,  7,218,190, 57,120,161,246,121,238,117,107,135, 46, 42, 54,246,212,
-222,125,182, 66,215, 76,220,221,149,190,133,155,115,191, 81,182,165,170, 84, 41, 82,173,155,198,146,212,216, 50,159,240,155,121,
-200,241,235, 44, 76, 97,206, 80,135,152,140,178,151, 90,121,170,146, 44,222, 17, 46, 79, 77, 21,101, 90,144,210, 68,210, 26, 90,
-141, 23, 26,157, 24, 36,177, 72,226,224,221,193, 66, 60,166,100, 39,106,230,105,184,247,129,158, 20,172,144,102, 25, 56, 96,130,
- 73, 11, 77, 13,172, 72, 85,114,  4,208,176, 63,238,220,198,  0, 12,193, 90,219,205,107,111, 55, 22,222,185,109,106, 77,203,105,
- 92,212, 27,170,209,172,183,227,209, 46,123, 90,179, 79,185, 45,186,219, 47,160, 44, 55, 78,175, 80,230, 63, 25,215,130, 20, 20,
-227, 72,116,188,206, 64,121,180, 19,141,103,175, 87,204,134,148,133, 47,152,148,124, 42, 90,135, 81,202,  0, 79, 42,142, 57,128,
-233,159,246, 64, 39, 57, 58,138, 47, 16, 27, 71,120,112, 95, 98,211, 61,164, 94,203, 13,207,174,217,124, 50,238, 29,187,102,110,
- 70,229,240,243,119,189, 42, 85,155, 77,162,222,245, 72, 16, 41,117, 22,108,155,169,231, 90,184,109,  7,235, 46,162,151, 58,152,
-243,203,175,208,101,130,245,  6,171, 58,144, 89,145, 18, 68,155,  3,127,214,247,155, 98,118,115,120,231, 91,109, 90,114,247, 99,
-108,236,173,194,145,108,177, 83, 77, 90, 45,188,253,219, 67,139, 87,122,147, 14,164,243,190, 44,248, 45,185, 37, 98, 59,143,101,
-242,194,155, 18, 15,188,  7, 73,143,214,196, 35,167,138,170,  9,185,212,211, 51, 37,153,116, 75, 28,128, 41, 49, 75, 29,205,152,
- 95,170,150, 83,177,218,235,123, 43,134,115,213,207,218, 72,189,141,233,170,169,213, 93,148,221,209,145,142,149,120,220, 40,189,
-200,177,  4, 41, 27,  0,  8,185,198,215,109,149, 22, 37,219,112, 75,167, 73,165, 92, 21,191,118,183,110, 26,195, 20,107, 85,228,
- 68,174, 84,165, 82,105,206,202, 98, 44, 87, 92,162,212, 48,165, 45,180,169,192,152,142,168,161,  4, 36, 36,229, 99, 64, 56,226,
-223, 77,219,218,203, 74,243,176,184,111,131,100,212,184,131,106,210,106,188,182,174,237,198,176,104,236,108,117, 26,191,107,238,
- 45,231, 67,159,114, 83,238, 42,188, 53,220, 59,203, 46,201,218,125,206,169,219, 54,146, 99,166,100,164,216,146,234, 18,227,161,
-  2,157,  2,167,204, 14, 62, 61,170,123,199,195,134,245,239, 23, 13,187,105,102,194,182,165, 83,246,238,171,105, 84,183, 81, 53,
-244,170,245,137, 87,220,107, 45,183,233,117,187, 54, 41,166, 73,133, 64,143, 76,250,217,135,130,156, 67,211,229, 61, 20,165, 50,
- 32,160,164,235,150,155,127,199,229,  2,218,166,220, 17, 47,141,155,184,239,201,213, 27, 39,106,105,180,122,212,125,229,250,134,
-170,214,227,109, 78,199,111,230,200, 68,190,174,249,149,109,181,172,187,121, 82,106, 16, 56,129,184, 42,147, 41, 97,218,124,229,
- 79,183,224, 36,215,213, 28,203,110, 70,206, 69,195,144, 85, 69,  5, 70, 98,154,105,203, 23, 84, 82,  9,145, 88,  2,188,203, 43,
- 29, 22,223, 64,107,155,217,130, 11,134,211,227, 63, 18,206, 91, 83, 89,150,100, 83,153,115,  5,  2,  9,166,100,112, 41,101, 77,
- 75, 50,195,172,141, 83, 43,150, 83, 39, 47, 66,149,186, 60,183, 82,141,110,225,240, 39,196,221,155, 81,191,231,222,141, 89,213,
- 55,237, 88,247,245,205,127,221,171,222,173,181,185, 61,226,240,182,175, 86,237, 91,186,211,159, 89, 98,236,113,202,246,245, 75,
-190,106,209,152,110,218,100, 61,112, 84, 36,212, 28, 91, 16, 22,220,105,170,139,127,159,236,242,222,186, 77, 26,239,166, 87,232,
-112,233,215,213,183,115, 90,106,118,188, 55, 27,106, 92,217,154, 61,128,237,  3,137,199,119, 10,177,114,223, 77,221,139, 75, 53,
-122, 53,223,195, 53,253, 73,112, 71,241, 98,181, 54,200,172, 83,221,113,115,223,163, 51, 57,230,147,199,  5,183,187,182,199, 20,
-139,188,118,233,203, 98,159, 84,186,183,115,137, 91, 34, 52, 27,238, 84,170,188, 61,236,220, 94, 32, 44,203,171,108, 40,237, 75,
-107,110, 95,141, 88,160, 80,145, 95,186, 77, 97,137,205, 83, 25,174,211,162,188, 99, 84, 40,149, 52, 64,143, 46,157, 75,218, 83,
-101, 77,186,105, 19,162,236, 45,249,108,218, 84, 43,254,198,220, 58,109, 34,211,226, 14,155,  2,237, 19,173,203,215,141, 77,199,
-186,173,217,247,125, 99, 98,170, 16,170,182,125,110,232,227, 78,236,167,187,  2, 77,  5,212,166,211,181,219,161, 84, 87, 88,151,
- 81,153, 91, 22, 42,173, 58,216,  2, 66,109,243,176,249,247,227,159,188,172,197,153,181, 23,220,146, 73, 36,158,189,183, 55,238,
-119,191, 83,134, 79,133, 94, 26, 54,163,119, 40, 23,245, 15,114,220,191,142,226,213, 56,139,225,227,133,189,165,172,237,181,249,
- 97,155, 30,221,191,119,242,131,196, 96,167, 93,151,172, 39,236,250,202, 55, 62,208,102,241,218,107, 53,128,138, 37,126,130,149,
- 83,107, 53,  9,204, 84,230, 17, 17,189, 55,212,190,  3,248,146,172,211,160,212,169,214,189,181, 33,186,142,219,211,247, 54, 44,
- 95,227, 14,196,106,162,186,125, 98,181,178,180, 58, 45,166,105,207, 92,  9,120,110,100,217, 28, 70,108,107,177,109,190, 79,173,
-221, 99,115, 41,203, 76, 94, 97, 37, 17,242,109,137,226,246,211,217,104,251,163, 81,127,101, 62,187,186,171,187,235,180,188, 70,
-108,210,237,235,249, 22, 93,137,180,219,153,179, 84,221,245,137,101, 55, 93,179, 23, 99,212,230,110, 13,155, 14,126,244, 71,153,
- 30,155, 22,183,110, 58,135, 44,136,172,191, 58, 84,105, 79,178,151,218, 87,181, 90,244, 52,109,183, 49,108, 26,164,171,191,110,
- 45, 11, 30,153,  2,181,115,110, 83,149,219, 97,171,198,196,221, 46,  9,183, 14, 21,126,223,177, 98,217, 80,152,183,109,137, 17,
-184, 39,182,216,149, 73,247,169,115, 94,157,126,212, 38,174,188,170,109, 62,145, 66,136,100, 17, 21, 93, 71,204, 47,211,227,220,
-219,115,111,195,225,108,  1,107, 11,252,252,239,134,106, 63,179,199,115,133,155,125,215,171,187,135,179,118,237,197,106,110,150,
-201,109,205, 10,223,153,185,246, 52,250, 21,249, 15,122,172, 61,215,189,169, 23, 85,173,123,210,110, 87,226, 85,161,161,221,180,
- 69, 50, 35, 16,154,153,245,133, 70,101, 86, 39,143, 18,101,191, 50, 43,173, 61,131,193, 94,250,238,142,241,110, 54,200, 89,144,
-172,105,247,150,215, 94, 63,197,253,209, 54,126,230, 88,150,253,156,245,230,245,238,157,187,165, 91,118,205,231,112, 87,162,211,
-175, 26,213, 74,234, 15,179, 73,139, 75,126, 92,138,179, 48,164, 75,167,183, 38, 43, 46, 58,157,172,107,218, 71,106,187,184,205,
- 93,151,  6,202,110, 37,197,110,209,175, 29,134,190,172,246, 39,241, 13,  5,253,203,160, 93, 60, 62,109,135, 18,118,213,139,112,
- 73,220, 10,142,200, 73,165, 84,170,177,119, 63,136,  8, 23, 60, 70,218,180,225,210,217,143,182,241, 40,114,169,117,  3, 80,155,
- 86, 12,  7,  9,252, 89,216,124, 52,223,247, 21,199, 92,217,203,159,115,109, 71,183, 27,106,119, 94,200,183,218,221,216, 86, 93,
-205,110,222, 91, 37,184,134,249,219,247, 46, 91,196,109, 93, 86, 53,227, 71, 49,101, 84,161,213,227,179, 69,164, 59, 61,217, 13,
- 76,139, 38,154,150, 85, 17,245,109, 21,212, 94,194,230,253,122,118,237,252, 63,118, 51,229,219,231,249, 97,202,188, 61,155,155,
-199,118,239,117,185,183,155, 45,111,219, 48,169,151,253,165,181,247, 29,144,197,255,  0,186, 86, 69,154,185,177,175,167, 54,191,
-110,233, 53, 41,149, 43,218,189,  9,184,108,215,247,190,249,155, 69,160, 50,234,210,253, 65,250, 53, 77,200,172, 42,159, 74,151,
- 45,166,227,134, 30, 29,118,127,120,246,186,191, 46,244, 59,148,198,229, 93, 91,162,198,209,109, 69, 98,214,187, 45,122, 85,145,
-109,220,147, 54,155,112,111,218, 69, 66,255,  0,180,170,251,125, 80,157,121, 82,101,220,150,181, 18,154,240,167,215,104, 46, 83,
-162, 85, 36,212, 19,245,147,172, 55,  5,237,158,182,189,170,118,111,241,175,183,251,177,186, 92, 50,213, 47,138,213,133, 67,216,
- 27,113, 74,181,183,186, 14,223, 84,174,122, 47, 11,119,174,202,223, 59, 29, 14,226,170,191,178,245,148,204,114,158,230,219,222,
- 52, 89,210, 61,212, 74,157,109,221,244, 74,100,119,233,207,218,140,207,171,105,175, 15, 60, 86,219, 59, 19,183, 23, 37,185, 55,
-107, 42,215,157,246,197,244,141,202,218,155,189,189,196,135,110,218,246, 85,232,222,219,222,187,117, 26,163,120, 88,142,109,229,
- 70, 70,225, 69,136,139,192, 85, 33, 71,143, 94,160, 33, 53, 10, 36,116,205, 53,  8, 43,126, 27,135,  2, 45, 74,111,229,107,222,
-224,251,173,219,227,235,252,241,159, 47, 99,243,255,  0,140,109,229,209,192, 61,139, 67,254, 54, 13, 55,134, 30, 56,238,159,226,
-247,134,189,165,221,155, 88, 82,239, 26, 58,127,141, 58,134,224, 29,184,254, 17,110,133,181,238,252, 37, 74,228,217,202, 39,240,
-190,165,239, 17, 99,253,100,191,208, 49,227,221, 17,185, 92,241,117, 46,135,178,187, 35, 81, 28, 31,213, 31,183,183,186,171, 31,
-122,172,157,204, 93,241,102,218,215,157,151, 58,233,188,119, 54,204,184,111, 91, 90,206,160,237,157, 94,102,218, 53, 31,110,232,
- 55,  5,201, 73,181, 97, 62,229, 82, 21,212,253, 17,170,156,202,136, 53,143,  5,170,122,233,238,255,  0, 21,182, 21,251, 73,221,
- 38,109, 61,163,187,173, 42,230,243,109,206,204,217,215,189, 66,226,221,186, 53,235, 74,102,187,180, 15, 88,202,106,225,181, 40,
-212,205,160,161, 61, 71,164,207,141,102,114, 42,155, 50,125, 77,232,203,169,120,130,166,250, 89,240,157,111,237,173,252,177, 83,
- 70,217,139, 67,114,246,121,205,192,178,182,194,199,221,235, 38,179, 78,133,124, 51,107,215,171,138,221, 10,189,205, 93,167, 93,
- 54,173,114, 93,149, 85,143,101, 93, 20, 42,173,118, 11,240,157,147, 78,174, 70,121,218, 70, 95,139,225,190, 91,109, 66, 82,230,
-223, 59,143,119,166, 50,  8,184,  3,231,127,135,166, 49, 78, 42,118,162,139,177,156, 68,238,246,208, 80, 63,132, 77, 83,182,246,
-242,168, 91, 74,166, 93,239, 65,153,117,219,117, 40, 41,100, 86,172,219,150,169, 75,166,194,137, 94,175, 81, 43, 42,159, 72,151,
- 83,133, 10, 28, 42,156,138, 35,149,  8, 81, 34,197,146,211, 13,173, 88,184,129,221,147,190, 91,193,122,238,130, 40, 10,181,162,
- 92,146,233,172,210,109,231,107, 47, 92,147, 40,244, 11,118,135, 75,181,237,216, 53, 75,142, 68, 40,170,184,107, 72,161, 81,105,
-222,253, 60, 68,134,137,147, 11,242, 90,133, 13,183, 81, 21,165,172, 21, 55, 58, 70,221,186,116,193,180,169,223,215, 31,255,217,
+255,216,255,224,
+  0, 16, 74, 70, 73, 70,  0,  1,  2,  0,  0,100,  0,100,  0,  0,255,236,  0, 17, 68,117, 99,107,121,  0,  1,  0,  4,  0,  0,  0,
+ 85,  0,  0,255,238,  0, 14, 65,100,111, 98,101,  0,100,192,  0,  0,  0,  1,255,219,  0,132,  0,  2,  1,  1,  1,  1,  1,  2,  1,
+  1,  2,  3,  2,  1,  2,  3,  3,  2,  2,  2,  2,  3,  3,  3,  3,  3,  3,  3,  3,  5,  3,  4,  4,  4,  4,  3,  5,  5,  5,  6,  6,
+  6,  5,  5,  7,  7,  8,  8,  7,  7, 10, 10, 10, 10, 10, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,  1,  2,  2,  2,  4,  3,  4,  7,
+  5,  5,  7, 10,  8,  7,  8, 10, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
+ 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,255,192,  0, 17,  8,  1, 26,
+  1,245,  3,  1, 17,  0,  2, 17,  1,  3, 17,  1,255,196,  0,213,  0,  0,  2,  2,  3,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  5,  6,  4,  7,  0,  3,  8,  2,  9,  1,  1,  0,  1,  5,  1,  1,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  3,  0,  1,  2,
+  4,  5,  6,  7,  8,  9, 16,  0,  1,  3,  3,  3,  2,  3,  4,  6,  6,  6,  6,  6,  6,  8,  7,  1,  2,  3,  4, 17,  5,  6,  0, 33,
+ 18, 49,  7, 65, 19,  8, 81, 97, 34, 20,113,129,145, 50, 35,  9,161,177, 66, 51, 36, 21,193, 82, 98,114, 52, 22,209,225,130,115,
+ 53, 54,240,146, 67, 83, 23, 55,162,131, 68,116, 37, 10,241,178,194, 84,132,148,180, 25, 99,147,100,212, 69,213, 56, 17,  0,  1,
+  4,  1,  2,  3,  5,  5,  6,  3,  6,  3,  6,  7,  1,  0,  1,  0, 17,  2,  3,  4, 33, 18, 49, 65,  5, 81, 97,113, 19,  6,129,145,
+ 34, 50,  7,240,161,177,193,210, 20,209, 66, 35,225, 82,146, 51, 21, 23,114,178, 67,241, 98,130, 83, 99, 52,162, 36, 68, 84, 37,
+ 22,  8,115,255,218,  0, 12,  3,  1,  0,  2, 17,  3, 17,  0, 63,  0,251,245,164,146,205, 36,148,123,178,174, 73,181,201, 85,152,
+ 33, 87,112,211,134, 42, 95, 36, 54, 94,224,120,  5,148,239,199,149, 43, 77, 10,253,251, 37,177,183, 49,103,224,252,159,185, 22,
+141,155,227,189,246,184,118,226,220,219,189,114,126,  3,235,143,186, 93,174,238, 44,204,  7,213, 60, 34,150, 60,213,  1, 50, 60,
+100, 52,228, 64, 79,194, 82,134, 64, 75,172,211,162,133, 85,239, 58,241, 94,153,245, 19, 55,166,229,203, 27,171, 69,181,249,128,
+102,246, 15,154, 61,227, 95, 21,237,221, 79,233,198, 23, 83,196,142, 79, 72,147,233,242,146,239,237, 63, 44,187,142,158, 11,170,
+241,236,138,197,150, 89,216,200, 49,169,109, 78,178,201, 72,113,137, 49,150,149,182,180,159, 97, 78,189,163, 27, 38,188,136, 11,
+ 43,144,148,101,168, 35, 80, 87,137,228,226,217,143, 97,174,200,152,202, 58, 16, 67, 16,166,232,232, 11, 52,146, 89,164,146,205,
+ 36,150,105, 36,179, 73, 37,154, 73, 44,210, 73,102,146, 75, 52,146, 89,164,146,205, 36,150,105, 36,179, 73, 37,154, 73, 44,210,
+ 73,102,146, 75, 52,146, 89,164,146,205, 36,150,105, 36,179, 73, 37,154, 73, 44,210, 73,102,146, 75, 52,146, 89,164,146,205, 36,
+150,105, 36,179, 73, 37,154, 73, 44,210, 73,102,146, 75, 52,146, 89,164,146,205, 36,150,105, 36,179, 73, 37,154, 73, 44,210, 73,
+102,146, 75, 52,146, 89,164,146,205, 36,150,105, 36,179, 73, 37,154, 73, 44,210, 73,102,146, 75, 52,146, 89,164,146,205, 36,150,
+105, 36,179, 73, 37,154, 73, 44,210, 73,102,146, 75, 52,146, 89,164,146,230,239, 83,144, 61,109,201,238, 67,139,237, 12,178,207,
+111,124,166,132, 36,219,220,142,218,130,184, 15, 51,206,243,135, 34,174,117,165, 54,165, 61,250,242,207, 86, 97,250,146,220,178,
+112,166,  5, 44, 25,140, 65,239,119,213,223,216,203,213,189, 37,153,233,170,113,  0,205,129, 55, 57,119, 18, 35,185,155, 70,111,
+107,170,  3, 63,239,223,171,190,217,222, 63,203,217,118, 89, 33,155,226, 69, 93,138,212,136,175, 56,213, 69, 71,152, 26,  7,137,
+ 32,244, 59,235,203,122,207,168,186,247, 75,179,202,187, 36,239,230,  4,162, 72,241,110, 11,213, 58, 55,167, 58,  7, 84,175,205,
+163, 27,224,228, 76,101, 16,124, 31,138,136,246, 41,234,175,212,188,  8,215, 43,179, 18,175, 48, 26,170,226, 74,154,150, 26, 52,
+ 80,161,224,181,  4,168,131,246,105,199, 70,245,  7,168,170,140,231, 25, 78,  3, 88,153,109,143,184,150, 45,247, 37,254,179,233,
+239, 78, 91, 40, 66, 81,132,206,146, 17,221, 47,120, 14, 31,239, 68, 59,117,220, 79, 80,158,139, 50, 38,153,200,173,207,183,136,
+204,114,178, 45,115, 13, 98,200,167,222, 83, 46, 39,146, 82,224, 30, 35,235,  7, 68,233,157, 75,171,250, 62,208, 46,172,249, 82,
+ 58,196,252,167,254, 18, 28,  3,246, 33, 11,170,116,222,145,235, 26,137,166,193,230,196,105, 33,164,135,252, 64,177, 35,236, 10,
+237, 44, 63,212, 22,  7,155,246,118,103,121,236, 42,113,235, 13,186, 36,153,243,226, 32, 39,230, 89, 84, 54, 11,238,178, 82,162,
+ 19,204,  1,182,244, 59,111, 77,125, 27,233,238,173, 79, 89,166, 22,208,116,145,109,121, 30, 96,248, 47,155,125, 71,210, 46,232,
+183, 78,171,198,176, 15,167, 49,200,143, 31,236, 41,111,209,183,173,190,197,250,234,237,163,189,210,236, 84,137,110, 89, 98,200,
+ 54,233,241,174,177, 85, 18, 76,105, 73,105, 14,169,181,164,149, 37, 84, 74,199,196,133, 41, 62,253,116,253, 91,163,221,211,173,
+242,237,103,103, 12, 95, 69,202,244,110,183, 71, 84,171,205,164,150,  5,139,134, 32,167, 62,246,119,167,183, 62,158, 59, 97,118,
+239, 31,118,167,155,103,111,108,141,161,251,148,224,203,207,150,144,183, 82,202, 79,151, 29, 43, 89,170,148,  6,195, 85, 48,240,
+236,202,176, 87, 88,121, 75,128, 87, 51,179,107,196,170, 86,218, 90, 49,226, 86,190,197,119,215,182, 30,164,251, 95,108,239, 39,
+103, 46, 63,205,123,123,119, 14,170,  4,226,203,209,203,129,151,215, 25,117,110, 66, 80,226,104,182,212, 55,  2,189,122,105,243,
+112,236,196,180,213, 96,105, 71,136,251,210,193,206,171, 50,168,219, 81,120, 75,129,246,183, 52,221,170,170,218,205, 36,150,105,
+ 36,179, 73, 37, 73,246, 47,215,231,167,239, 81,157,255,  0,205,189, 57,118,185,233,210,179,108,  1,107,141,144, 73,147, 17, 81,
+225,166, 75, 82,215,  9,214, 25, 91,170, 11, 90,144,227,102,164, 35,137, 29,  9,214,190,119, 68,191, 18,138,238,177,132,108,225,
+174,172,206,235, 23,167,245,252,124,204,139, 40,173,204,171,249,180, 96,238,204,174,205,100, 45,165,154, 73, 33, 57,246,117,138,
+246,195,  7,188,119, 35, 58,152,155,126, 23, 96,133, 38,241,118,156,224, 82,146,196, 72,108,170, 67,206, 20,160, 21, 30, 40, 73,
+ 52,  0,147,224, 43,162,209, 76,174,156, 97,  0,242,145,  0, 14,242,131,145,124, 40,174, 86, 76,180, 98,  9, 39,184,113, 95, 58,
+151,249,245,119,191,186,119, 25,215,239, 73,222,155,178, 44,215,180, 22,231,150,202,175,174, 61, 45, 47, 72,225, 66,164,134,173,
+208,165, 52,218,248,239,196, 58,225, 21, 21,  3,161,239, 15,162,168,160,  8,228,229, 66, 19, 60,180,252,200,252,  2,243,177,235,
+204,140,130,101,139,137, 59, 43, 28,245,215,221, 18, 62,242,186, 63,242,243,252,209,187, 57,249,128,192,186, 89,108,118,217, 88,
+175,120,108, 20, 55,204, 74,238,164,184,235, 77,149,249,126,115, 15, 37, 40, 14,182, 28,248, 21, 84, 33, 73, 86,202, 72,  5, 36,
+224,117,239, 78, 93,210,204, 76,136,148, 37,194, 67,243,236, 62,255,  0, 21,210,122,119,213, 20,245, 97, 33, 16, 97,100,120,196,
+254, 32,243, 28,185, 30,238, 11,167, 53,206,174,153,102,146, 74,131,245,151,249,132,246,127,209,174, 77,131,246,239, 38,109,119,
+142,233,103,183,120, 22, 91, 77,134, 19,200,109,214, 98, 75,152,136,142,220,100, 41, 65, 92, 25,108,170,137,218,174, 43,225, 78,
+193, 74, 78,223, 73,232, 86,231,194,201,199, 72, 87, 18, 73,239,  1,216,119,254, 30,229,129,214,125, 67, 79, 79,157,117,203,226,
+157,146,  0,  1,216, 75, 57,238, 31,121,246,178,127,230, 65,249,160, 91,191, 47,119,240,  8, 74,194, 37,230,183, 28,249, 87, 86,
+161, 71,183,206, 76, 71, 25,114,218,168, 72,  8,  8, 44, 62,167, 20,233,152,  2, 64,  0,212,120,215, 86,189, 61,233,195,213,  5,
+135,204, 16, 21,179,184,126, 47,222, 25,153, 84,245, 55,169,199, 72, 53, 15, 44,216,108,118, 98,220, 27,184,187,186,163,  7,231,
+209,222, 66, 42, 61, 44,102,148,254,252,239,255,  0,213,235,103,255,  0,210,232,255,  0,239, 43,251,191, 82,195,255,  0,247,188,
+143,254,202,223,191,244,174,254,237, 62,116,255,  0,115, 59,107, 98,207,229,219,158,180, 76,188,219,225,220,222,181, 75,175,159,
+ 13,201, 81,208,250,163,185,201, 40, 60,155, 42,226,106,145,184,232, 53,195,228, 84, 42,178, 80,  5,216,144,253,172,120,174,255,
+  0, 26,227,109,113,153, 12,100,  1, 99,201,195,183,177, 48,232, 40,235, 52,146, 89,164,146,205, 36,150,105, 36,179, 73, 37,154,
+ 73, 44,210, 73,102,146, 75, 52,146, 89,164,146,205, 36,150,105, 36,179, 73, 37,154, 73, 44,210, 73,102,146, 75, 52,146, 89,164,
+146,205, 36,148, 75,158, 65, 97,178, 41,  9,188,205,143, 17, 78, 84,182, 37, 60,219, 69, 64,117,167, 50, 43, 74,234, 81,129,151,
+  0,233,137,101,170, 46, 91,138,206,200, 31,196,161, 92,226, 61,149, 69,105,185,114,173,141, 72,101,114,217, 97,223,221,186,227,
+ 41, 81, 90, 80,175,  5, 17, 67,167, 53,200, 71,113,  5,187,121, 36,225,217, 16,212, 19,168, 25, 30, 87,139,225,240, 81,116,203,
+110, 81,109,118,215, 29,110, 43,114, 46, 50, 25,140,210,158,116,241,109,176,183,148,148,149, 40,236,  5,106,124, 53, 56, 87, 41,
+150,136, 36,247, 38, 36, 14, 42,126,160,157, 66,155,145,227,214,217,105,183,220,103,198,143, 61,116, 40, 97,247,218, 67,138, 10,
+ 52, 20, 74,136, 38,167,166,166, 33, 34, 28,  2,153,194,155,168, 39, 89,164,146,140,187,213,157,187,195,120,235,146,217, 78, 64,
+243, 46, 77,106,  9,117,  2, 66,227,178,180, 52,227,169,104,158,101,  9, 91,136, 74,148,  5,  1, 80,  7,168,212,182, 22,118,209,
+ 51,173,210,100,198,133, 29,114,230, 56,150,162,182, 10,220,117,213,  4,161, 41, 27,146, 84,173,128,211,  0,233,215,189, 50, 75,
+ 52,146, 89,164,146, 83,238, 15,119,177, 92,  6,209, 38,235,113,144,134,224,196, 81,110,109,194, 71, 52, 64,133,197, 60,214,169,
+ 50,  0, 41, 72, 74, 65, 36,117,240, 52,174,156,  7, 73,113,223,121,191, 53, 59, 98,175, 82, 48,142,193, 88,110,249,166, 82, 21,
+242,204,223,100,201,151,102,181,121,165, 92, 20,235, 49,162, 22,223,113,148, 26,145,200,130, 64,251,221,  9,219,167,162,157,187,
+172, 45,236,251,126,106,148,243,  3,180, 67,169,142,254,100, 12,219,108,145, 45, 95,201,228,223,175, 44, 71,100, 76,187,179,145,
+ 76,102, 43,239,134,135,152,182,126, 77,180,  5, 55,202,180, 62, 61,119,235,171, 21,244, 13,218,153,105,225,253,168,114,207,110,
+ 74,252,244,105,234,154,219,234,106,193,123,145, 18, 60,136,242,236,178, 25,142,234,100, 41, 15,160,  7,217,231, 68, 73,108, 36,
+ 57,197,105, 90,126, 36,133, 10,111, 94,186,202,207,192, 56,196,106,224,171, 84, 95,230, 14, 10,232,213,  4,117,229,247,216,138,
+194,228,201, 90, 91,140,218, 74,220,113,194, 18,148,165, 34,164,146,118,  0, 13, 70, 82, 17,  4,146,192, 41, 70, 38, 68,  0, 28,
+149,201,254,168,125,125,121, 78,191,219,158,193, 57,231, 92, 20, 85, 22, 86, 64,216,230,  2,143,192, 81, 12,111,200,255,  0,252,
+ 79,250,190,221,120,151,172,190,167, 23, 56,221, 60,188,142,134, 99, 95,100, 59,124,125,221,171,220,125, 25,244,191, 65,149,212,
+ 67, 68,106, 32,116,239,121,246,120,123,251, 23, 52,246,163, 31, 25,199,121,237, 22, 12,181, 75,117, 83,167,132, 79,249,146,162,
+226,215,200,169, 97,101, 91,213, 68, 80,215, 94, 87,233,156, 17,155,213,106,171, 33,206,233,252, 79,196,179,146, 15,137, 12, 87,
+171,250,163, 56,225,116,155,173,199, 97,182, 31, 11,112, 14,192, 17,224, 11,133,199,223,156,239,171,191, 81,110,250,203,201,187,
+ 11,110,188, 92,113,126,212, 97, 46, 49,105,178, 88,109, 82, 31,130,203,205,252,171,111,124,235,161,146,143, 49, 79, 21,114, 73,
+ 53,  1, 52,  3, 95,166,126,138,232,152,181, 96,194, 98, 49, 50,144,212,176,211,147, 14,198, 95,150,222,188,235,217,118,245, 11,
+ 43, 51,148, 99, 19,160,114, 31,155,158,210, 85,235,249, 38,122,135,239, 15,169,222,216,119, 63,211, 79,125,238, 50,242, 94,222,
+ 88,109, 41,200, 49,251,205,225,197,201,126,211, 49, 60,192,101, 50, 30,170,248, 43,143, 52,164,171,110, 42,166,196,235,206,254,
+181,122, 99, 10,236,  9, 19, 17, 19, 40,203,134,154,196, 56,151,136, 63,138,244,159,161,126,170,206,167,168, 68,110, 50, 17,148,
+ 89,245,210, 69,140,124,  8,224, 57, 50,232, 31, 74,185,213,202,205, 96,238, 30, 21,230, 40,217,174,120,197,226, 66,154,169,226,
+ 30, 98, 19,137, 10,167, 64, 74, 84, 65, 62,225,175,149,126,135,245, 25,195,168,203, 29,254, 25, 52,189,162, 64,125,224,253,193,
+125,111,245,215,167, 66,125, 52,100, 55,197, 23,143,178, 81, 39,238, 35,239, 43,141, 63, 39,175, 68,254,164, 61, 95,246,115, 34,
+103,  7,238,253,227,183, 29,171,181, 92,214,150,224, 99, 11, 91,110,202,185,185, 21,165, 56,252,133, 50,235, 36,161, 40,  8,  9,
+ 73, 38,187,211,143,143,220,158,174,235, 84, 96, 95, 23,162, 54, 76,199,140,185,  7, 58, 13, 15,122,248, 43,209,125, 11, 39,168,
+227,207,110, 68,170,172, 75,132,121,150, 26,157, 71,119,246, 40,249,247,171, 47, 85,125,188,237,215,168,191,203, 75,212,190, 82,
+238,117, 19, 31,182,190,171, 69,254, 98,212,252,150, 94,182, 93, 34, 40,143, 57,202,186, 90,121,149,242,226,226,137, 66,133,  1,
+220,232,180,244,204,107,108,197,206,162, 27, 55, 29, 71, 45, 65,251,193,236,226,133,127, 86,203,170,172,190,159,145, 63, 51,108,
+116,151, 61,  8,251,136,237,224,144, 17,235,155,189,152,231,167,174,201,122, 56,193,239,247,156, 87,180,203,128,229,227, 40,153,
+133,165,195,124,184, 25,183,233,192,180,207,148,164, 41, 73,109,150,193, 74,  2,128, 82,137,229, 90, 10, 92, 29, 22,153, 95,145,
+149, 40,198, 83,118,136,151,202, 26, 49,227,237, 84, 79, 94,190, 56,248,184,144,148,161, 94,215,145,143,204, 94, 82,225,224, 57,
+118,167,107,103,170,206,235,122, 89,239, 62, 35,220,111, 69,215,222,234, 95,177, 52,188, 27,204,241,206,230, 91,229,200,135, 41,
+130,226,  2,131, 97, 42,113,  7,154, 10,247,226, 20,130,  1,  7, 84,143, 78,175, 50,153,195, 40, 83, 25,127, 41,129,  0,143,183,
+222,175, 14,169,110, 13,245,217,134,111,148, 95,226,141,128,144, 71,219,220,175, 46,213,247, 83,243,  5,252,196, 61,108,247,159,
+210,197,163,188,119, 44, 67,177, 54, 11,205,216,147,106,141, 17,171,139, 16, 24,187,187, 26, 36, 56,207,178,134,158, 64,225,178,
+212, 87, 90, 36,  3, 93, 98,229,211,131,210,176,177,242, 60,129, 59, 39, 17,196,150,118,  4,147,196, 45,220, 59,250,135, 88,207,
+201,198,253,193,133, 80,145,224,  3,182,226,  0,  7, 67,227,170, 87,192, 61, 74,122,169,252,170,253,109,119, 79,211,214, 79,157,
+ 92,123,149,128, 88,177,105,249, 28, 22, 50, 89, 18, 95, 74,165, 34,214,139,148, 39, 56,186,227,138,109, 65,107,242,220,224,160,
+ 20,154,157,182,165,188,142,159,141,214,112,169,184, 86, 43,148,166, 34,118,246, 59, 31,226, 21, 60,110,165,149,208,243,175,162,
+ 86, 27, 97, 26,204,134,231,226,206, 60, 59, 11, 35,158,134,125, 56,250,254,252,205,176, 59,151,171,140,195,212, 54, 67,139, 94,
+ 37,206,148,213,138,  5,149,247,211, 13,151, 34,174,149, 84,118, 31,101,166,219, 11,248, 67,105, 71,221, 21, 39,125, 87,235,125,
+ 79, 11,164, 90, 49,161,141, 25,  0,  3,147,199, 94,246, 62,245,103,160,116,172,254,181, 81,203,179, 42,112, 36,157,160,112,211,
+185,192,  3,185,115,119,100,125, 79,250,129,244, 83,115,245, 55,220, 69, 92, 91,127,212,179,151, 54,113, 41,183,246, 80,203,173,
+183,120,151,121,150, 38,207,109, 60,  3,100,213,151, 74, 62, 26,114, 32,211,195, 93, 22,119, 77,163,168,156, 72, 55,244,182,153,
+ 55,112,  1,135,222, 23, 51,211,250,174, 71, 76, 25,179,119,183,112,137, 61,230, 69,207,220, 89,121,198,123,175,123,191,246, 53,
+ 93,203,149,220, 46,244, 63,234,241,246,156,185, 64,184, 91,154,156,245,129,114,124,194,182,153,243,  3,254, 97,109, 73,  0, 21,
+167,161, 53,  9, 32, 80,181,184,226, 57, 27, 60,188,113, 64, 44, 65,109,205,238,227,221,247,167,171, 36,207, 27,204,243, 50, 78,
+ 65, 14,  8,  7,107,242, 28,120,119,253,202,205,238,159,230,197,249,144,223,187,113,217, 27,  6, 49,145,205,196,187,183,119,114,
+227,139,223, 85, 38,221, 25,175,230,178,217,184, 69, 98, 28,199, 81, 54, 58,136,228,219,224, 44,160,  0, 84,  9,213, 12, 95, 77,
+116,232,217,145, 41, 68, 78, 17,105,  6, 60,  3, 18, 70,135,185,104,229,250,175,169,206,188,104,198, 70, 22, 73,226, 92, 13, 75,
+128, 14,163,189,125, 78,252,190,253, 44,119, 51,211, 87,102,174,184,151,121,179,153,221,197,201,178, 75,139,217, 21,194,233,124,
+230,181,161,217,112,163,198,118, 58,  3,206, 58,124,160, 88, 42,  0,159,218, 59, 13,121,151, 90,234,112,205,184, 78,186,197,113,
+136, 96,  7,113, 37,249,107,170,245,126,131,210,103,129, 73,133,150, 27,101, 41,110, 36,247,128, 27,158,154,125,234,220,193,251,
+ 87,219, 62,211, 98,172,226,248, 69,166, 29,151, 13,183,182,164,198,131,  9,150,163, 69,140,208, 37,197,  4, 33,  0, 37, 41,169,
+ 36,253,186,204,182,233,221, 51, 41,147, 41, 30,103, 82, 86,181, 52,215, 68,  4, 32,  4, 98, 56,  1,160, 11,229,143,229, 69, 29,
+190,253,126,110,189,240,245, 77,219,  6,252,174,204, 37,235,196, 40,178,227,  2,150,102, 42,233,118,109,200,235, 29,  1,243, 91,
+138,183,212, 60,  9, 77,122,141,122, 79,170,143,237,122, 86, 62, 52,255,  0,204,208,248, 48, 47,238,118, 94, 91,232,241,251,190,
+177,149,149, 95,249,122,135,237,121,  6,247,128, 74,250,231,175, 49, 94,176,169,191, 93, 30,181,187, 91,232, 71,176,243,251,203,
+220,119,  3,247, 19, 88, 56,237,137,165,132,200,187, 92,214,217, 83, 81,219, 52, 60, 82, 40, 84,226,200,162, 18,  9,220,208, 29,
+110,139,209,237,234, 87,138,161,226, 79, 96,237,254,  3,154,198,235,221,110,174,151,142,109,179,143,  0, 57,147,217,252, 79, 32,
+190, 44,247,183,183,126,166,238,126,165, 59, 27,235, 27,213,140,181,142,231,119,139, 45,106,227, 26,198,182,212,216,181, 90,173,
+151, 43, 95,201, 50,148, 41, 74, 45,164,183, 46,137,104,252, 72, 74, 71, 50, 86,165, 83,214,176,242,241,191,109,147,141,142, 62,
+ 10, 96,207,218, 72,147,248,240,227,207,150,140,188, 99, 55, 15, 43,247, 88,185,121, 71,227,190,199,219,253,216,131, 22,240,227,
+195,144,227,171,174,182,255,  0,230, 12,202,173,184, 47,117, 61, 43,102,247,164, 56,229,158,205,118,190, 93,101,183, 25, 33,111,
+ 41,152,147,172, 50, 28, 13,164,144, 10,138, 82,104, 42, 42,117,203,250, 14,147,109, 25,112, 28,101, 24,143,120,152, 93,119,212,
+ 75,133, 57, 24, 83, 60, 35, 41, 19,236, 48, 41,215,  8,255,  0,230, 10,244,177, 27, 54,133,132,119,135,183,153, 70, 21,100,150,
+164, 34, 61,238,239, 22, 58,210,219,107, 95, 16,252,136,232, 88,121, 45,143, 18,208,112,251,142,169, 89,232, 28,143, 44,202,171,
+ 33, 50, 57,  3,247,  3,195,222,202,253, 95, 81,177,188,193, 11,107,178,176,121,145,247,145,197,188, 29,125, 16,198, 47,120,246,
+ 75,143,195,200,177, 73, 44,204,198,231,178,220,200, 51, 33,173, 46,176,251, 15, 32, 56,219,141,173,  4,165, 73, 82, 72, 32,131,
+ 66, 53,195, 78,  6,  4,196,134, 35,138,244, 24, 76, 78, 34, 81, 46, 14,160,169,250,138,146,205, 36,150,105, 36,179, 73, 37,154,
+ 73, 44,210, 73,102,146, 75, 52,146, 89,164,146,205, 36,150,105, 36,179, 73, 37,154, 73, 44,210, 73,102,146, 75, 52,146, 89,164,
+146,205, 36,150,105, 36,179, 73, 37,243,203,243,157,237, 93,255,  0,184,221,243,237, 99,173,219, 39, 72,195,153,179,102, 17,110,
+ 55, 56, 56,204,220,161,168,111, 73,128,150,226,133,196,135,199,241, 22,247, 16,218,202,135,150,170, 57, 67,194,154,237, 61, 47,
+144, 43,166,221, 67,188, 88,110, 17,125,117,212,253,253,188, 57,172,236,216, 60,163,237,228,234,140,195,172,126,189,251,111,133,
+139,231,110,177, 28,147, 27,203, 19,138, 96,246, 28,149, 80, 33, 78, 93,213,155, 20, 59,132,246,228, 46, 42,148,203,142,166, 66,
+155, 76,119, 22,134,208, 92,101, 11, 34,128, 39, 90,214,207, 14,217, 52,231, 25, 13,211, 35, 80,206, 64,103,215,135, 30,226,171,
+196, 89, 17,160, 35, 64,157,251,111,115,252,193, 59,157,113,187,225,151,188,243, 62,135,133, 90, 49,124,170,253, 98,189, 64,182,
+ 92,237,146, 39, 75,183,150,223,183, 68,122, 69,226,  3, 79,200, 81,113,197,182, 84,148, 33,110,  4,241, 77, 41,170,183,199, 10,
+160, 36, 33, 89, 38, 81,  4, 56, 44, 15, 18,192,176,252,145, 34,108,150,142,120, 20,  3, 55,200,189, 92,247,162,219,101,133,223,
+166,179,249,153,171,115,123,103, 62,197, 99,143,100,156,222, 54,236, 20, 69,140,245,218,124,239, 34, 55, 15,153, 76,206,124,202,
+212,146,149, 18,  0,166,201, 53, 80,198,160,147, 87,150,  3, 88,229,198,231,213,128,215,131, 40,200,206, 95, 51,242,240, 81,178,
+ 14,239,254,106,214,102,178, 59,157,214,235,153,196,238,185, 23,134,175,120,244,123, 29,230, 84, 22,120, 63,230,194,145,107,113,
+168, 63, 32,195, 67,138, 16,149, 54,242,203,129, 84,167,197,187,195, 27,167, 75,104,  2,  6, 58, 49,112, 15,120, 58,185, 62,205,
+ 19, 25,219,175, 23, 93, 35,143,122, 89,239,139,189,226,207, 50, 87,110,141,101,249,188, 12, 71, 20,185, 91, 47, 29,200,197,237,
+247,105, 19,238,107,118,247, 44, 66,133, 36,152,140, 69, 44,175,203, 66,184, 54,170,  5, 32,168,108, 43,137, 62,161, 87,149,  0,
+219, 98,103, 32, 68,100, 67, 15,132, 57, 26,146,255,  0,197, 90, 21, 75,113,230, 88,113, 30, 43, 71,111, 59,193,223, 28, 27,187,
+216, 46, 72, 38,247,  6,237,233,225,166,237,237,247, 37,204,150,195,124,149, 37,140,138, 77,130,246,137, 17,218,141,242, 66, 81,
+104, 76, 16,249,134, 27, 83, 13,185,192, 36,142, 68, 23,191, 26,171, 42,152,106,197,154,237, 98, 62, 87,142,174,236,236,252,117,
+ 33,211, 70,114,  4,113,110,126, 44, 86,156, 63, 32,245,109,148,224,211,179,219,213,223, 47,137,147,227,214,126,222, 93, 44,208,
+  3,114,163,183, 46,117,203, 41,184, 49,119, 76,184,171,102,178,  8,134,211, 65,198,214,  8, 66, 72, 36,  3, 66, 30,216, 99, 66,
+ 98, 32, 65,164,102, 15,112, 17, 12,199,150,174,197, 40,153,144,250,232,223,138, 77, 86, 81,223, 84,229, 86,108,250,237, 23, 54,
+159,221,249, 24,141,206,199,220,  9,242, 99,100,208, 98, 99,215, 41,121,189,139,230,  5,189,112,161,172,252,187, 76,178,226,138,
+ 32,  5, 41,108,128,174, 66,188,245,107,203,167,105,136, 48, 16,222, 12,126, 82,100,  4, 36,206,231,139,255,  0,123,129,247, 40,
+ 60,157,245,118,215,142,154,143,182,136, 62, 77,110,239,182, 77,137,100,217, 78,118,114,203,221,237, 88, 94,123,139,226,139,145,
+ 98,189,169,139,154,162,222, 83, 50,  4,105,177, 39,198,117,242, 23, 25,194,180, 38,105,171,129,180,133, 21, 20,144, 73, 92,169,
+140,163, 24,236,  3,124,  9,212,105,163, 18,  8, 45,199,179,131,168,145, 34,  9, 47,192,171,  3, 60,204, 61, 92, 56,219,204, 98,
+183, 60,225,142,236,189,114,188,196,238, 20, 83,  2,106,109, 54,171,114,178,102,152,180, 57,102,117,216,198, 39, 35, 21, 73,242,
+213, 25,110, 21,181,230, 41,218,144, 72,167, 77, 88,223,204, 33,181,134,221, 67,147,183, 93,218,191, 30,214,213,153, 18, 82,159,
+ 39,126,126,253, 25,116,247,165, 72,249,221,153,238,227, 97,185,140,203,173,194,201, 98,203,164, 91,177,121,153, 35,143,200,148,
+237,165,203, 21,178,112,227, 38, 64,230,243, 98, 83,239,165, 42,169,165, 10,107,240,208, 96,117, 19,  9,121,114,136,  0,152, 57,
+110,215, 35,135, 45,  0, 86,170,112,224,246,167,126,232,228,179, 49,124, 69,233,150,214, 36, 74,185,186,164, 50,212,123,115, 97,
+217, 75, 73, 85, 94, 44,160,169, 32,173, 45,  5,168, 84,210,163, 89,200,201, 11,183, 88,219,157,221,201,102,228,153,132, 36,198,
+194, 44, 50, 36,217,108,120,203,233, 74,208,215,225,121,111,201,146,146, 84,135, 30,121, 14, 40, 87,112, 27, 85,  1, 37,107,169,
+223,103, 14, 42, 44,233,197,188, 75,182,189,162,198,213,111,194,172, 16, 32, 38, 64,249, 88,208, 45,241, 99,177,243, 46, 44,113,
+ 74, 21,196, 10,131,227, 95, 13, 70,203,167, 97,121, 18,124, 82,140,  4,120,  6, 92,  5,234, 15,178, 94,153,109, 93,213,184,183,
+105,181, 73,184, 92,144,180,155,139, 81,230,165,155, 67, 87,  0, 74,159, 76, 72,233,105, 95,  0, 81,166,197, 59,131,174,171,  0,
+218,107, 27,136,246,241,252, 86,101,226, 59,139, 43,175,242,233,238, 62, 27,139,101, 83,187, 23,140,218, 88,180,192,184, 52,237,
+241,166, 98, 41,229, 36, 62,200, 67, 74,175,154,165,144, 92, 64, 36,  1, 65,240, 18,  5,107, 92,238,177,143, 45, 38,239,249, 35,
+226, 76,112,101,216, 26,193, 87,149, 23,235,191, 10,239, 78,121,219,203,125,143,181, 28,222,180,173,247,  5,246, 20,119,  3,110,
+190,217, 74, 75, 53, 36,128, 91, 74,130,185, 38,187,154,123, 53,231, 95, 81,250, 87, 81,234, 24,176,175, 15, 80, 73,222,  1, 98,
+ 70,141,197,180, 26,184,240, 94,143,244,219,170,244,222,159,149, 59,115, 52,144,  3, 97, 33,192, 58,191,  7,212,232,199,197, 46,
+122, 86,244, 67,110,193, 67, 57,167,113,144,153, 89, 86,203,105,146, 42,220,122,142,137,  7,169,246,171,236,208,189, 21,244,246,
+158,144,  5,215, 52,239,251,163,225,223,223,238, 70,245,191,212, 75,186,185, 52,208,240,163,239,151,143,119,119,189, 80,126,172,
+251, 83,145,246,  3,190,239,100, 86, 48,182, 44,147,228,170,245, 99,154,132,252, 40,112,185,230,173,160,119, 28,155, 89,233,236,
+167,183, 94, 67,235,142,141,127, 67,234,134,250,220, 70, 82,223,  9,118, 23,114, 60, 65,251,153,123,  7,161,122,205, 29,119,165,
+ 10, 44, 99, 40, 71,100,227,218, 25,129,240, 35,239,116, 59,189,182, 95,203,243,215, 90, 96,100,158,176, 49, 41,112,187,185,111,
+142,220, 21,100,120,242,222,105,114, 89,107,116,165,102, 58,210,162,  1, 38,129,105, 87, 26,236,117,236,158,146,255,  0,250,  3,
+246,116,236,183,117,114,230,195,116, 73,237, 28,199,219, 85,226,190,176,255,  0,249,220,103, 93,190,177, 27,  7, 34, 73,140,128,
+236, 60,139,125,130,131,  3, 34,244,225,233,223,181, 23, 14,197,250, 50,198, 92,176,226,247,131, 75,229,238,113, 42,157, 57, 28,
+120, 20,149, 45,110, 56,121, 39,225, 37,106,216, 84,  0, 43,174, 55,234, 39,214, 75,186,245,114,166,173,205, 32,198, 69,134,156,
+196, 64,224, 15, 51,197,118,191, 77,254,139, 83,233,249,198,235,  4, 94, 37,196, 98,231,226,228,101, 35,196,142, 67,130,181,125,
+ 17,122,119,188,230,152,174, 79,145,206, 63, 39, 26,245,108,155, 97,183, 72,113,  5, 92, 68,166, 20,210,158,227, 81, 84,242, 34,
+148, 59,208,235, 67,232,215, 67,158, 43,231,216, 62,102, 17, 28,200,  4, 18,124,  9,  0, 15,  2,168,125,105,235,176,203,  3,167,
+214,126, 87, 50, 60,129, 32,128, 60, 64, 36,159, 16,169, 14,197,254, 75, 63,152, 39,163,187, 61,197, 62,148,251,244,205,150,227,
+119, 93, 46,177, 28,182, 17,  9,244, 33, 60, 90,117, 40,116,200,  9,117, 53, 80,228, 19, 90, 83,125,125, 89,157,235, 12, 44,249,
+  3,145,141,184, 14, 26,235,249,104,190, 71,192,244, 70,127, 78,137, 24,217, 91, 76,184,141,186,126,122,163,157,188,252,132,114,
+ 38, 59, 83,220,233, 29,211,207, 77,251,212,199,114,163, 42, 36,188,186,116,119, 30, 68,111, 58,115,115,228,171,130,221,243, 28,
+ 91,206, 55,241, 45, 74,  7,165,  0,222,160,191,214,251,174,171,101,123,106,168,184,136, 60,116, 97,203, 70,236, 86, 49,253,  3,
+182,139,188,203,119, 93,104, 99, 34, 56,106,  9,230,229,200,212,175, 87,223,200, 50,241,255,  0,130,221,183, 95,111,179,180,227,
+222,170,123,104,151,163, 65,203, 98,196, 95,202,207,142,110, 79,220,163,165,214, 11,133, 72, 83, 43,125, 65, 42,  4,212, 18,  8,
+ 34,148,106,253,109,253,107,188,202,247, 83,111, 24,191, 13,  0, 58,183, 54, 74,223, 64,255,  0, 70,159, 46,221,183, 85,160,144,
+ 26, 29, 73, 26, 63, 39, 86, 15, 96,253,  5,254, 99,140,119,242,197,221,207, 83, 61,242, 85,207, 30,176,161, 81,198, 59,141, 66,
+102, 28, 27,131, 42, 33, 74, 68,182,203, 72,105, 65, 74, 72,228,124,162,186, 15,133, 73,235,172,236,238,179,128,104,149, 84, 99,
+  8,153,127, 52,139,145,225,207,239,110,229,167,211,250, 23, 81, 25, 17,183, 35, 40,200, 71,249, 98, 24, 31, 30, 95,115,247,132,
+229,232,223,242,217,201,189, 44,250,207,238,199,169,185,217, 35, 23,107, 39,114, 39, 78,185,199,182, 51, 17,113,215,  4, 76,185,
+187,112, 13,169,106,113, 97,124, 67,156,106,  0,173, 43,170,253, 95,175,140,220, 90,104, 16,111, 40,  0,239,197,128, 10,207, 69,
+244,217,192,204,191, 32,207,119,154, 73,102,102,114, 79,110,168, 23,119,255,  0, 41, 81,222, 47,204, 46,245,234,235, 48,190,199,
+153,218,252,142,202,238, 47,117,196,204,103, 16,250,163,191,103, 22,151,  8,146, 28,160, 52,170,133, 17,182,143, 71,170, 13, 56,
+ 17,198,132, 90, 81,144,144,147,246, 23,224,129,145,233, 33,127, 81,150, 84,228, 12, 37, 19, 19, 22,228, 98,220, 93, 83,253,186,
+252,159,127, 48,175, 74, 50,238,248,  7,163,206,254,155, 15, 98,239, 18, 87, 37,113, 37,193, 14, 76, 96, 57,240, 21,160, 20,173,
+176,239,  0,  1, 91,101,186,144, 13,  6,218,214,201,245,102, 14, 99, 79, 39, 27,117,128,113,  7, 67,253,158,245,141,139,232,222,
+161,130,240,197,202,219, 81, 60,  8,212,127,111,120,101, 35,211,255,  0,255,  0, 47,196, 76, 43, 29,238,119,111,251,207,154, 43,
+ 35,197, 59,129, 17,134,163, 78, 98, 41,102,227,  2,116, 73,106,152,196,210,183, 92,117, 43,112, 45, 95, 22,223, 21, 72,232,117,
+ 12,239, 93, 74,217,211, 58,235,218,107, 39,155,130,  8, 98, 57,104,137,211,254,158,194,152, 93, 93,182,111,141,160,106,204, 65,
+  5,193,226,117, 80, 44,223,149,111,230, 85,217,254,217, 35,177, 24,175,168,152,182, 95, 78,144, 20, 11, 51,154,131,242,183, 56,
+145,131,222,104,109,185, 68,135, 27, 79, 46,128, 72,  3,195,166,218,149,158,165,233,247,219,231, 75, 23,117,167,189,193, 62, 31,
+216,161, 95,165,122,158, 61, 94, 76,115, 54,210, 59,152,129,227,203,222,172,255,  0, 86, 31,148,119,113,189, 72,102, 29,150,206,
+ 95,207,195,215,190,215, 33,132, 92,229,221,224,165,217,151,167, 26,158,204,213, 60,227,145,150,211,104, 82,188,162, 62,225,235,
+227,172,238,151,234,136, 98, 87,124,  5, 95,230,187, 49, 97, 29,  8,230,253,171, 83,171,250, 74,121,182,227,216,109,214,150,114,
+ 67,153, 49,  7,147,118, 46,234,183,176,184,208, 89,142,191,190,132, 37, 38,158,208, 41,174, 61,118,203,231,255,  0,231,131,235,
+111, 40,197,241,187,103,160, 15, 78, 37,115,253, 69,247, 64, 55,110,185,181,  1, 85,126, 13,154, 98,254, 95,201,168,160, 67,147,
+ 13, 81, 82,126, 22,130,212,105, 84,171, 93,215,163,186, 60, 37, 35,153,126,149, 85,168,126,100,127, 15,197,151,158,250,227,173,
+206, 49,142, 14, 62,182,219,161,110, 81, 58,127,241,125,193,251,151, 65,126, 91,222,139,113,127, 69, 62,156,173, 29,179,181,  4,
+189,146, 41, 63, 63,127,185,  4,241, 84,219,155,232, 79,158,246,251,132,138,  4, 32,120, 33, 34,181, 53, 39,157,235,189, 94,125,
+ 71, 38, 86,203,135,  0, 59,  7, 33,249,158,245,211,250,127,162,195,165,226,198,152,234,120,200,246,200,241, 63,144,238, 93,  8,
+163,196, 21, 30,131,125, 99,173,181,240,243,185,189,236,245,111,223,255,  0, 92,173,122,166,245, 59,233,203,184, 25, 47,111,177,
+133, 41, 24,  7,111,155,178,222,162,194,182, 37, 14,133,180,236,146,236, 23, 67,174,213, 33,199, 40,144, 22,224, 77,126,  4, 37,
+ 26,246, 10,177, 49, 49,176,191,111, 70, 85, 80,148,190,121,238,137, 39,184,106, 27,176,118, 14,242,235,196,110,204,205,202,207,
+ 25, 57, 24,118,206, 16,249, 33,182, 64, 14,194,126, 18,231,153,237, 61,193,144,223,204,175,215, 55,116,189, 65,119,115,176,249,
+ 22, 83,216,236,155,183,179,176,139,196,201,246,171, 78, 64,212,196, 72,200, 93,122,117,173,227, 30, 16,126, 19,  4,173, 38, 50,
+ 80,120,165,102,174, 39,110,149, 47,167, 58, 37, 56,180,100, 70, 25, 16,176, 78, 32, 18, 25,163,164,181, 58,158,222,238,  5, 11,
+213, 29,122,252,188,140,105, 79, 26,117,152, 72,144, 36, 11,203, 88,232, 30, 35,179,191,136, 95, 89,251, 18,222, 27,235,  3,180,
+248, 47,125,251,199,219,143,242,247,114,173,137,151, 46,213,106,202,161,165,203,189,133,231, 30, 84, 87, 60,181,202,101,167, 90,
+ 83,168,101, 11, 52, 74,106, 56,245,160, 58,242,220,193, 44, 59, 44,166,187,119, 64,176, 38, 39, 73,115,228, 72, 44,235,215,112,
+140,115,171,174,251,105,219, 48,228,  9, 15,138, 60,185,128, 67,183,224,169,159,207, 83,179, 29,179,201,127, 46, 12,207, 44,190,
+194, 97, 57, 14, 44,187, 93,210,197,112,113, 40, 14,198,146,237,218, 52, 21, 37,181,171,113,230,182,242,155, 34,187,212,120,129,
+173,175, 68,228, 78,190,163, 92, 98,116,147,130, 59, 67, 19,247, 51,172, 47, 94,226,215,111, 76,178, 82,  1,224,196, 30,194,224,
+125,224,178,  7,249, 73,250,173,193,251,119,232, 23,177,248, 79,119, 46,197, 61,192,203,100, 77,198, 49,155, 98, 65,118, 83,205,
+ 49,121,153, 30, 59,133, 21,170, 24,110, 59, 72,  5,197, 81, 35,100,141,200,  4,190,167,233,179,183, 63, 34, 85,143,134, 13, 34,
+121,107, 16, 79,180,147,193, 11,210,125, 86, 21,116,236, 88, 91, 47,142,111, 24,142,122, 74, 64,123,  0, 28, 87, 92, 98,254,161,
+ 59,115,155,119,118,253,217,124, 69,215,238, 25, 54, 46,211, 11,200,102, 71, 97, 70,223,  2, 76,148,165,214, 96,185, 36,209, 42,
+146,166,150, 29, 45,163,151, 20,238,190, 36,164, 30, 98,220, 43, 43,170, 54,201,128,151, 14,210,  7, 54,236,125, 31,220,186,186,
+179,235,182,233, 85, 23, 38, 31, 49,228,  9,228,253,173,171,114, 28, 81, 94,226,119, 79, 21,237,130,172, 45,100,223, 50,169, 25,
+ 45,222, 30, 45,105,102,  4, 71,229,184,228,233,169,113,196,115, 76,116,168,161,164, 54,210,220,113,197, 81, 40, 66, 74,148, 64,
+  4,234, 24,248,210,187,118,214,248, 98,100, 92,182,131,243,228,  7, 50,137,147,151, 10, 54,238,127,138, 66, 33,131,234,127, 45,
+ 28,158, 65, 87, 16,125,122,118, 70,255,  0,101,179, 93,112,120, 57, 22, 73, 58,245,106,107, 43,110,211,143,227,151, 89,151, 24,
+150,105, 14, 45,184,243,102, 71, 67, 65, 76,162, 65,109,101,132,171,227,124,  2, 90, 74,192, 36,104, 75,162, 93, 19, 33, 51, 24,
+177,218,230, 64,  2,121,128,121,183, 62, 67,155, 44,216,245,250, 39, 24,152,  9,200,202, 59,152, 68,146, 34,120, 18, 27, 71,229,
+204,242,  5, 92, 81,238,214,233, 43,101,148, 58, 19, 46, 67, 66, 75, 81,222,  5,167,203,123,124, 69,151, 66, 92, 20,168,  4, 20,
+130, 14,199,125,100,152,144,182, 68,193,246,173,127,230, 44,127,130,220,249,232,254, 91,126, 80,113, 94,115,116, 73,124,  5, 53,
+200,215,110, 96,130,159,111,134,159,203,151, 97, 77,230, 71,180, 45,203,185, 91,154,152, 45,206,200,109, 55,  2,130,248, 97, 75,
+ 72,112,182, 13, 10,248,147, 94, 32,248,244,212,118,150,116,251,131,179,234,180, 55,146, 99,175, 41, 40,106,124,101, 45,106,105,
+180,  4,190,209, 42, 83,232,243, 90, 72,161,220,173, 31, 18, 71,136,220,106, 94, 92,187, 10, 97,108,123, 66, 64,201,125, 88,246,
+167, 19,238,155,157,159,188, 55,116, 25,123, 87, 60,127, 31, 90,154,181, 77,118, 47,204,100,241,229,200,183,184, 36, 33,  5,178,
+201,249, 39, 80,227,128,241,109,116, 10,165, 70,175, 87,210,237,157, 94, 96,109,173, 35,196, 63,194,207,167,110,161,135, 49,193,
+103,219,213,234,174,223, 40,238,220,241, 28, 11, 60,129,109,123, 52, 32,158, 71,138,179, 53,156,180,214,105, 36,179, 73, 37,154,
+ 73, 44,210, 73,102,146, 75, 52,146, 89,164,146,205, 36,150,105, 36,179, 73, 37,154, 73, 44,210, 73,102,146, 74,188,245, 11,234,
+ 63, 19,244,221,107,181, 95,115,104, 82,228, 88,174,142, 92, 98,166, 84, 20,182,176,212,136, 22, 73,119,180, 52,164,169, 73, 81,
+ 83,232,134,182,154,  9,  6,174, 20,143, 29, 93,194,193,150, 73, 34, 36, 56,111,188,129,247, 59,158,228, 59, 45, 16,226,170,137,
+255,  0,154,111, 99, 45,246, 73, 57, 43,150,123,203,150, 22, 97,137,209,222,102, 51, 78, 57, 41,244,198,177, 74,126, 27, 76,161,
+101,210,251,  9,191,181,230, 32,164,113, 45, 59,253, 77,244, 71,167,238, 36,  7, 14,255,  0,171, 95,  3,180,183,136, 65,253,220,
+126,222,207,226,167, 73,252,203,187, 49,111,190, 34,217,115,181,221, 26,180,204,186, 53,102,179,221, 80,136,239, 69,184, 50,114,
+ 11,141,130, 76,230, 75, 78, 21,124,188,115,108,118, 67,138,165,124,146, 20,  7, 80, 32, 58, 21,164, 56, 33,192,114, 59, 62, 16,
+ 64,241, 46,  7,138,127,221, 71,237,226,202,118, 77,234,231, 49,188, 89,187, 51,155,118,123, 28,114,231,103,238,101,198,123, 31,
+201,102, 57, 22, 60,199,160, 53,142,220, 46,177,157,106, 67,174,134, 27, 10, 49,155,120,146, 85, 86,234,  0, 42, 32,106, 21,244,
+216,196,221, 27, 36,198,176, 53,228,251,128, 58,113,230,222, 41,205,199,225, 32,113,254, 10,171,176,126,110,118, 31,230,153, 18,
+239,152,236,149,182,153,171, 69,142,208,227,176,173,239,197,141,108,198,237,115,174,172, 73,149, 41,239, 37,233, 41,184, 78, 45,
+ 52,134,190,248,161,216, 10,157, 25,250,108,180, 90, 67,134,167, 83,198, 82,  1,135, 16, 24, 57,116, 33,152, 53,211,236,193, 57,
+ 55,249,159,225,107,199,218,206,156,194,111,141,246,234,227, 42,253,101,199,238, 43,118,216, 36, 92,174,150, 39,254, 95,229,147,
+ 19,207,243, 26, 15,174,169,109, 78,241,162,129, 10,  9, 20, 81,171,254,129, 61,219,119,199,112,  0,145,174,128,243,118,213,187,
+148,255,  0,116, 56,177,100,  2,249,249,157, 94,187, 83,220, 92,215,  7,239, 46, 30,228,107,245,150,106,156,183,217, 33,220, 45,
+129,230, 45,145, 49,219, 77,206, 66, 85, 41,215,210,212,169, 78,189,113,  5,150,154,  2,169,216,144, 83, 82,104,116, 17,116, 33,
+ 42,231,161, 26,150, 60, 76,164, 56, 54,128, 54,164,168,156,173,164,130, 62,204, 21,141,108,245,221,101,190,246,242,243,220,235,
+ 30, 25,121,123, 20,135,125,255,  0, 35,216, 30,117,219, 83, 74,191, 94,220,200,  6, 56,203, 17,155, 50, 75,173, 33,114, 20,146,
+ 87, 33,  8,226,154,236,104, 43, 74, 93, 32,198, 98,  6, 97,204,119, 30, 58, 13,187,181,211,179,177,209,  6, 67,135,110,109,247,
+178, 94,151,249,149, 89, 96, 93,178,140,102, 87,111,111,202,202,112,150, 26,119, 43,140,196,139, 42,154,133, 34, 77,210, 69,162,
+ 44,100, 56,228,180, 23,149, 33,230, 80, 91, 40, 73, 79, 23,  1, 89, 69,  8,209,135, 66, 36, 68,249,145,105,240,227,174,128,147,
+195, 70, 28,124, 20,127,117,199, 67,162,182,251, 33,222,249,189,218,185,229,120,197,255,  0, 30,145,141,102,152,117,194, 53,154,
+241,111,149, 38, 44,196,121,178,237,113,239, 12,173,167,226, 41, 73, 82, 75, 18,155,175, 66, 13, 71,134,179,114,241,  5, 34, 50,
+ 18,220, 36, 28, 29, 71,  2, 71, 62,240,141, 93,155,159, 70,101, 15,212,150, 96,238, 21,103,133,115, 73, 92,102, 31, 76,136, 43,
+185,  2,176,220, 98,234,153, 85, 20,164,236,146,176,130,144,163, 74,110,  1,169,212, 49, 34, 37, 61, 83,216, 88, 42,107,181, 61,
+235, 70, 45,100,157,148,228, 83, 46, 45, 99,247,233,  6, 85,138,  5,171,229,208,227,241,155,108, 48,101,190,185, 73, 43, 72,121,
+ 73,170, 56, 83,110,181, 53,165,235, 48,205,242,120,232,130, 45,216, 53, 90,115,223, 80, 70,251,103,144,206,  4,101,217,242,159,
+ 37,104,137,118,186,220, 28,152, 67,138, 79, 14, 60, 93, 10,  8, 43, 73, 40,170, 72,251,213,251,193, 36, 56,233,222, 83, 72,252,
+ 77,201, 49,191,118,131, 69,207, 22,222,221,119,143, 32,201,158,195,236,184,164,227,146, 69, 89,102,115, 15, 39,145, 97,193,178,
+129,249,127, 50,180, 62, 42, 41,  7,173,117,190,114, 96, 34, 36, 72,  0,170, 62, 89,118, 93,121,232,127,210,221,239,179, 48,110,
+ 25,223,113,144,  7,113,110,164,178,150,127, 12,252,180, 96, 65,160,242,202,128, 42,160, 20,169,160, 27,238, 78,185,238,165,154,
+ 45,104,196,233,249,171,216,244,237,212,241, 93,  3,172,149,105,101, 43,177,233,164,146,205, 36,144, 30,227,118,207, 11,238,182,
+ 54,238, 41,156,193,110,109,165,221,192, 88,162,219, 85, 40, 22,218,197, 20,149, 15,104, 53,214,127, 83,233, 88,253, 66,163, 85,
+240, 19,137,237,252, 65,226, 15,120, 90, 29, 47,170,228,116,235,133,212, 76,194, 99,152,252,  8,224, 71,113, 92,211,150,254, 87,
+246,199,231, 41,236, 51, 35,114, 52,  5, 18, 82,204,198, 18,250,146, 61,129,105, 91,127,164,107,202,115,126,141, 99, 78, 79, 77,
+242,128,236, 49, 18,251,222, 43,214,176,190,180,100,215, 22,186,136,204,246,137, 24,253,205, 36, 87,182,255,  0,150,206, 33,143,
+220, 90,184,230,247,  5,221,139, 74, 11, 12,113, 13, 50,162, 13,126, 36,  2, 73,250,  9,166,180,186, 55,210,108, 12, 73,137,221,
+ 35,113, 28,142,145,246,128,239,237, 44,178,250,215,213,204,252,184, 24, 83, 17, 72, 60,198,178,246, 18,205,236, 14,186, 74,193,
+143, 90,113,155, 99,118,139, 51, 41, 98, 11, 73,  8, 66, 16,  0, 20,  2,131, 97,175, 82,132,  4,  0,  0, 48, 11,202,231, 51, 50,
+ 73, 46, 74,155,169, 40,172,210, 73,102,146, 75, 52,146, 89,164,146,205, 36,149,  5,234,219,182,126,168,114,174,228, 98, 19,251,
+  9,144,202,182,118,254,236,164,227,189,193,101,153,166, 58,224, 91, 89,156,205,225, 55, 27,120,168, 41,148,227,113,223,183,169,
+ 72,170,169, 37, 43,232,213, 70,215, 77,201,198,174,185,249,177,  6, 67, 88,105,196,177, 12,123,181, 18,255,  0,194, 71, 53,133,
+213,113,114,172,182,191, 38,100, 64,233, 61, 89,131,137,110, 29,229,140,116,254,240, 60,151, 57, 79,236,247,230,163,117,186,230,
+ 76, 92,242, 91,251, 50,230, 92,225, 54,217,182, 76,182,198,129, 46,220,238,115,  2, 90,164, 90, 37,255,  0, 56, 83,209, 12, 91,
+ 27,111,182,182,204,  8,254, 96, 81, 73,243, 92,162,149,184, 51,122,108, 68, 26, 17,208, 30, 32,146, 15,151, 32,210, 27, 24,188,
+216,131,186, 77,220, 23, 62,112, 58,172,141,143, 57,107, 33,192,128,  8,243, 34, 94, 39,123,134,131,130, 54, 69,251,207, 19,221,
+244,236,135,173, 43,158, 65,220,126,223,224, 76,228,215,190,218, 92,108, 48, 99,227, 55, 28,131, 34,134,150,218,159,  1,235, 99,
+173,199,132,133, 92,157, 83,233,119,200,125, 79, 59, 54, 51, 14,215,154, 75,175, 33,192, 18, 12, 44,236, 72,198,169,207,100,102,
+ 36,119,  1, 19,192,238,212,252, 58, 51,134, 17, 36,112,210, 36,106,124,254,159,155, 41, 93, 10,196,229,  3, 17,180,153, 14, 35,
+110,131,226, 46,236, 92,200, 68,241,214, 64,233,179,188, 24, 55,230, 75, 55, 54,207,215,219,169, 23,180,203,155, 11, 52, 77,150,
+226,213,238,214,205,141,232, 18,177,119, 99, 99, 48,109,112,213, 33, 15,197,185, 49,116, 44,184,236,135, 90,109, 63, 10,207,156,
+164,168, 37, 45,137,145,211,196, 43,222, 35,161,131,141,167,115,137, 13,230, 69,152,196,197,192,  0,158, 90, 41,102,227,117, 41,
+ 89,111,150,101,168,177,142,225,181,140,  8,128,136,119, 18, 18, 98, 73,  0,113,248,139,171, 95,211,213,183,213,119,102, 49, 78,
+232, 51,149,195,187,102,191, 34,236,123,159,109,237,247,187,196, 25, 19,174, 69,120,196, 39,101, 68,249,233, 47, 15, 41,  6,239,
+243,  8, 73,144,160, 16, 55, 77, 81,198,185,185,182, 99,100, 78,173,164, 65,193, 19, 32, 22, 31, 17, 98,192,107,240,183, 14, 62,
+ 43, 83,  2,188,172,104, 93,184, 74,108, 65,128, 50,  4,159,130, 46, 28,157, 62, 55, 26,240,229,163, 47,153,152,119,165,223,206,
+187,  9,245, 97,123,245,149, 47,181,144, 47,189,243,188,185, 41,213,203,200, 46,120,244,182, 33,153, 52, 65, 17, 91,110,234,216,
+ 64, 67, 32, 50,141,207, 22,254, 17,175, 68,200,234,189, 22,220, 88,226,249,198, 53,197,180,  2, 65,219,183,225,237,212,247,175,
+ 51,197,233, 29,122,156,201,101,249, 17,149,146,125,101, 40, 22,126,207,140, 54,154, 14,237, 23, 76,224, 93,250,255,  0,230, 20,
+190,229, 48,113,236,191,183, 88,197,143, 22,150,179, 22, 85,221,  6,208,231,200,161,196, 20,  9, 28, 25,187, 72, 90,131,106, 33,
+ 68, 37,165,147, 79,186,122,107,157,191, 27,160, 66,  4,194,217,200,142,  3,226,215,187,229, 31,136, 93, 54, 62, 95,169, 39, 49,
+ 25,213,  8,196,241, 47, 29, 59,254,115,195,192,167, 47,201,227,  6,252,207, 48,108,175, 58, 71,174,187,165,206,110, 41, 45,214,
+ 77,154, 62, 75,116,106,237, 36, 77, 75,139, 50, 29,136,227,110,189,229, 70, 40, 41,  1,  1, 65, 53,167, 20,141,235, 83,213,153,
+ 61, 54,209, 95,237,  0,  4,113, 96,193,185, 63,  7, 63, 98, 85,207, 70,226,245, 74, 77,191,189,145, 32,157, 28,238, 47,204,141,
+ 75, 14,239,112, 93,228,187,101,189,197, 21,184,202, 74,143, 82, 70,184,197,221, 46, 20,252,223, 61, 30,119,239,212, 79,125, 61,
+ 59,102,157,141,198,191,156, 98,248, 69,246,117,199, 43,146,220,203,116, 79,146,142,245,194,206,251,107, 40,154,251, 75,114,168,
+138,233,163, 73, 81, 28,122, 84,138,246, 94,151,234,216,248,152,249, 80,182, 76,108,136, 17,208,151, 45, 46,192, 91,136,226,184,
+111, 87,116,124,156,220,156, 73,211, 29,209,174,100,203, 80, 24, 60, 15, 50, 31,129,224,234,192,252,193, 99,126,100,184,204, 76,
+ 27, 58,252,191, 19,107,152,205,144,206, 57, 94, 47,116, 83,  9, 93,223,230, 18,210, 99,164,137,106,101,162,219, 97, 43, 39,139,
+237,185, 82, 40, 72,168,213, 14,128,122,113, 19,134,102,225,185,182,200,114,226,252, 28,235,224, 66,209,245, 24,234, 96,215, 60,
+ 29,167,107,238,137,111,137,217,184,176, 97,175, 48, 87, 34,247,251,  6,252,232,127, 52, 27,109,171,177, 29,238,195,172,253,173,
+236, 91,115, 88,157,123,145, 17,198,201,148,227,  6,169, 83,141,137,146,228, 59,229,130, 84,219,105,  8, 65, 93, 10,149, 80, 10,
+122,172, 44,190,143,209,137,182,153,202,219, 25,135,119,220,  0,239, 58,150,224, 23, 33,159,133,215, 58,224,141, 55, 66, 52,212,
+238, 75,241,251,201, 61,195, 64,252, 79,103,101,100,126,141,229,118,231,180, 61,145,237, 87,103, 45,134, 85,147,  1,202, 44, 51,
+110, 46,169,216,237, 60,221,174,221,110,154,195,178, 92, 46,169,  5,197, 23, 95, 10, 82, 81, 85, 21, 44,144,154, 87, 92,133, 93,
+ 83,205,179, 34,203, 78,182, 66, 77,226, 72,211,220, 62,229,218,221,210, 60,170,177,170,164, 60,106,156, 95,135,  0,  8,126,253,
+ 79,222,171,222,196,250, 88,245,  1,217,255,  0, 81,240,103,217,109,183,168, 45, 43, 49,203,178,204,207, 49,145,145, 34, 78, 61,
+144,216,111,139,159, 38, 20, 54,172,198,107,142, 34, 91,110,200,139,205, 74,136,218, 80,166,150,164,184,190,116, 55,243,186,157,
+ 23,227,144, 76, 79,244,225, 24,199,107, 74, 50,142,208, 78,230,225,161,254, 98,238, 52, 12,179,176, 58, 86, 70, 62, 72, 32, 72,
+127, 82,114,148,183, 60,101, 25,110, 32,109,221,243,  2, 99,252,161,152,234, 93,118,212,235, 53,170,240, 34,185,119,140,220,135,
+ 97,186,137,177, 75,200, 74,203, 50, 16,146,132,184,138,244, 80, 10, 34,163,192,157,114,145,153,139,177,226,187, 25, 64, 73,156,
+ 59,106,185,179, 58,237, 63,121, 59, 45,220,174,225,205,236,182, 25,112,191,118,251,184,118,123, 28, 59, 92,140, 30,233, 98,179,
+221, 49,187,149,138,  3,150,182,217, 41,189,201,134,215,201,169,160,202,208,182, 84,181,161, 69,193,229,144, 65,215, 67, 78, 85,
+ 57, 21,214, 45,152,140,171,148,159,112,145, 18, 18, 47,252,160,235,199,139,  3,166,171,153,191, 18,236,107,109, 53, 86,101, 27,
+ 35, 22,218, 99, 19, 19, 16,223,204, 64,218,205,193,200,215, 69, 80,200,244,183,235, 94,235,222,222,217,119,  7,184, 56,239,243,
+ 44,215, 18,145,219,137, 23, 92,190,196, 48,166,254,125,152, 86,136,240,114,117,220,174,115,148,221,249,217, 31, 52,185, 28, 25,
+ 99,132,101,199,220,243,117, 92, 53,172, 58,158, 28,105,182, 16,147, 70, 98,198,137,223,163,146, 96,192,124,  0, 51,106, 94, 66,
+ 93,131, 85,142,122, 86,116,175,166,115,139,202,  6,167,144,217,171,  0, 39,186, 71,227, 37,221,128,104,152,246,157, 22,190,213,
+126, 89, 14, 91,240, 28,  2,205,158,118,174,198,187,180, 30,205,228, 24,174, 80,137, 12, 88, 31, 81,205,223,122,215,252,188,186,
+180,173, 65,217,  9,109, 51,  2, 36,130,164,160, 21, 15, 49, 60,133, 86, 87,168,222,203, 12, 45,147, 27,227, 40,252,223, 39,196,
+254,  3,229,211,159,102,137,177, 61, 46,213,212, 39, 76, 92, 99,202, 50,249,127,204,248, 91,196,252,205, 46, 90,235,170,135,217,
+255,  0, 64,221,247,110,251,110,119,191,118, 60,134,225,220,214,101,218,114, 72,121,229,162,127,111,214,196,116, 65,177, 71,105,
+ 22,153,211,103, 52,230, 67,197, 14, 52,168, 78,181, 25,213, 48,235,106, 82,130,211,201, 90,158, 95, 92,163,105,242,101, 17,  6,
+ 35,105, 22,115,145,248,128, 31,  7,253,224, 72,112,116,109, 16,240,253, 63,145,184,121,209,153,155,137,111,  6,189, 26, 35,225,
+ 36,143, 51,150,210,  1,218, 70,175,170, 31,221,143,203,187,188, 42,244,157,219,110,205,118,227,182, 86,216,121,108,126,220, 57,
+106,200,110, 88,252, 44, 17, 87,168,217,226,173,112,155, 65,184, 92,239,229, 74, 68, 79,152,109,107, 92,139,106,151, 39,204, 66,
+ 74, 22,132,132,171, 68,197,235,245,126,234,219,103,105, 35,205,112,  9,155, 24, 57,224, 35,205,185, 73,162,199, 80, 84, 50,253,
+ 57,119,237, 42,170,186, 64,144,169,137,  2,189,194,198, 28,101, 46, 79,196,193,228,227, 66, 56,174,247,196, 48,219, 51,182,123,
+ 86, 69,145,217, 35,179,158,148, 68,185,206,126, 83, 17, 28,154,221,205, 54,209,111, 91,174, 62,201,112, 41,228,178, 84,193,113,
+ 43, 87,193, 84,133, 20,235,135,182,226,230, 49,145,219,168,230,204,239,195,177,245,110,213,223,211, 76, 90, 50,148, 70,237,  9,
+224,238,205,199,181,180,119,225,220,153, 53, 93, 89, 89,164,146,205, 36,150,105, 36,179, 73, 37,154, 73, 44,210, 73,102,146, 75,
+ 52,146, 89,164,146,205, 36,150,105, 36,179, 73, 37,154, 73, 37,158,233,246,127,183,221,232,179, 91,241,254,227,192, 23, 11, 69,
+178,231,110,200,226, 50,165, 45, 33, 51,173,114, 83, 42, 58,207,  2, 57, 36, 45, 52, 82, 78,202,  4,130, 40,116,124,124,153,208,
+ 73,129, 98, 65, 30,195,197, 70,112, 18,226,149,109,254,141,125, 58, 91,101,218,229,199,199,155, 81,179, 94,239,121,132,  6,157,
+113,215, 26, 69,203, 32,105,214, 39, 44,182,181, 20,169, 10, 67,196, 37,  4,113, 69, 19,196, 14, 35, 86,101,213, 47, 32,252, 92,
+ 98, 35,236,143,  5,  1, 76,123, 57,191,189, 68,111,208,223,166,134,241,171, 30, 39,254, 95,229,102,199,113,251,190, 11,107, 75,
+146, 36, 45,104,180, 95, 16,148, 77,109, 75, 82,138,148,181,132,236,181, 30, 73, 42, 85,  8,169,212,191,213,175,221, 41,110,214,
+ 82, 18, 62, 35,130,111, 34, 44,  3,112, 12,183, 95,189, 26,246, 98,251, 18,209, 13, 42,188, 91,145,143,174, 35,150, 21,217,175,
+183,107,123,150,211, 10,204,171,  3, 98, 34,226, 60,133, 52,147, 13,106, 66,194,  8, 11,169, 42,169, 39, 77, 14,167,108, 73,224,
+119, 59,184,  5,220,238,213,199,106, 70,136,159,103,253,136, 93,175,242,255,  0,244,205,142, 56,153,120, 93,182,225,143,222, 80,
+164,169,171,166, 61,124,188, 91,103,182,143,229,145,109, 14, 54, 37,196,144,135,138, 29, 98, 27, 37,192,165, 30,110, 36, 56,127,
+ 19,226,212,229,214,111,151,204, 68,135, 97,  0,142, 36,240, 35,145, 37,187,180,224,152, 99,196,112,209, 77,149,232,111,211,108,
+236, 38, 47,110,231, 89, 94,127, 17,135, 42,249,115,143, 25,235,132,247, 22,153, 57, 17,116,206,115,207, 91,165,226,162,167, 84,
+164, 40,175,146, 21, 66,146,  8,  7, 81, 29, 90,241, 51, 48,117, 32, 14,  3,249,120, 39,242, 34,205,246,213, 70,143,232, 63,176,
+208,238,114,114, 56, 78,228, 76,102,147, 93,122, 68,220,133,140,175, 35,106,239, 32, 73,135, 22, 11,237, 59, 57,185, 97,245, 54,
+182,225, 49,240, 21, 81, 37,  9, 41,226, 64,212,143, 87,184,128, 62, 22, 28,182,197,184,147,193,155,153,247,166,253,188,123,253,
+229, 79, 71,162,222,193, 35, 22,155,132,136, 51,191,202,211,156,153, 45,200,127,205,238,128, 55, 46,109,233, 57, 10,165,180,160,
+240, 90, 36, 55, 53, 33,198,221, 74,185,162,148,  6,149, 26,135,250,165,219,132,156, 56,110, 67,128, 27, 91,135,  6,226, 19,249,
+ 17,102,251,118,161,119, 47, 66,253,148,131,133,102, 22, 76, 58,220, 14, 79,152, 90,191,147, 93, 39,228, 83, 46,215, 49, 49,198,
+231,201,186,181, 34, 98,254,105,169, 75,116, 75,148,181,151, 16,242, 86, 62, 16,149,  0,148,128, 72,245,107, 76,224,100,116,137,
+112,192,  6,208,  6, 26, 55,  1,193,153, 49,162, 44, 91,154, 39,233, 75,211,125,223,211,221,171, 38,149,149,223,220,200,179,108,
+182,234,155,237,206,107,139,184, 56,134,203, 54,248,246,198, 90, 67,151, 89, 83, 37, 47,139, 81,210, 74,156,120,238,104,144,148,
+132,164, 15,168,231, 12,131, 29,177,219, 24,134, 28, 59, 73,228,  0,231,216,158,154,182, 59,151,117,104, 92,173,118,235,196, 69,
+ 64,186,176,137, 16,151,247,155,121, 33, 73, 62,250, 31, 29, 80,140,140, 75,132, 82, 29,115,111,125,189, 35,247,  5,236,176,223,
+ 59, 60, 89,145,141,201, 72,173,170, 87,  0, 96,173, 63,120, 50,183, 30,104,121, 74, 63, 16, 73,169,  4,154,109, 74,108, 98,117,
+  8,198, 45, 34,202,181,180,146,116, 66,123, 95,232,167,184,151,156,177,137,221,227,242,163,227, 17, 20, 31, 76, 88,165,170,184,
+161,208,126, 27,175, 30, 95,218, 42, 20, 29,  5,119,  4,191,169, 68, 71,225, 46, 84, 97, 65,125, 87, 85, 67,133, 14,223, 29, 17,
+ 32,182,150,163, 33, 41, 66, 16,128,  0,  9, 74, 66, 82, 62,160, 41,172, 34, 73,226,174, 50,219,166, 73,102,146, 75,231, 46, 63,
+249,187,122,158,185,249,159, 59, 96,198, 83,197, 37, 73,242,225,221,  5,104, 43,227, 60,235,197,170,250,143,155, 63,229,175,221,
+ 47,212,131, 57,144,180,221,127, 55,239, 84, 13,217,127,152, 90,241,252,100,201, 73,  1, 65,232, 87, 85, 39,236, 76,240,127, 78,
+166,126,162,230,  3,242,215,238,151,234, 79,188,173, 80, 63, 55,127, 87, 55,  8,168,125,172,119, 22,230,170,  2, 62, 70,239,250,
+ 63,248,142,133, 63,169, 89,145,254, 90,253,210,253, 73, 70, 68,162, 81,255,  0, 53,159, 87,101,250, 72,199, 49,159,151,240, 40,
+133,118,  7,167,190,224,117, 84,253, 82,204,254,229,126,233,126,164, 64,232,196, 79,205, 51,212,106,156,109,169,150, 60,121, 43,
+ 80,170,169, 14,230, 62,138, 86,105,208, 39,245, 83, 60,127, 37, 94,233,126,180,218,169,183, 95,205,  3,191,182,242, 11,118, 91,
+ 10,155, 62,216,183, 26,236,105,225, 51, 67,135,213,110,163, 47,228,171,221, 47,214,164, 10,214,159,205, 15,212,  2,225,153, 73,
+179, 88, 43, 83,196,124,165,203,244,255,  0, 27,162, 15,170,125, 69,219,101, 94,233,126,180,150,184,255,  0,154, 31,169,  7,149,
+229,155,  5,128,184,122,113,135,114,255,  0,251,221, 41,253, 85,207,143,242, 85,238,151,235, 73, 23,133,249,139,250,155,144,217,
+113,220,126,196, 18,  0, 87,195, 14,228, 63, 92,211,160, 31,171, 89,238,219, 41,247, 75,245,169, 70, 46, 20,156,107,243, 12,245,
+ 41,120, 83,142, 75,176,216,209, 21,181,240, 42, 68, 75,136, 52,229, 79,218,152,116,174,250,179,212, 34,205, 10,125,210,253,106,
+117,213,184,169,240,255,  0, 48, 46,253, 79,121, 41, 98,209,100, 13, 82,171, 81,141, 60,211,236,151,164, 62,171,245, 34, 88, 87,
+ 81, 63,240,203,245,171,  7, 20, 33, 23,207,204,127,212, 29,154,236,237,189,118,156,124,182,157,144, 76, 91,141,107, 90,111,252,
+102,141, 71,213, 62,163,103,242, 85,238,151,235, 66,149, 12,129,187,249,154,250,170, 68,192,215,242,108, 99,229,137, 52, 38, 21,
+215,149, 60, 63,246,253, 91, 31, 84, 51, 27, 88, 87,238,151,234, 66, 48, 71,237,127,152,111,168,169,240, 85, 57,251,126, 50,130,
+145,208, 66,185,117,167,254,253,172,252,159,171,121,213,159,134,186,253,210,253,105,196,  7, 52, 58, 71,230, 91,234, 29,190, 78,
+ 34,217,141, 20, 32,241, 36,195,185,125, 31,253,251, 76, 62,173,103,145,254, 93, 94,233,126,180,132, 66,158,159,204,111,191,207,
+ 33, 14,179,106,199,150,159,218,164, 75,143, 74, 87,111,227,117, 40,253, 88,234, 18,255,  0,167, 87,186, 95,173, 64,179,168, 25,
+ 15,230,133,222,187, 26, 18,143,229, 22, 19, 36,141,210, 98,220, 41,211,221, 48,104,227,234,135, 82, 63,201, 87,186, 95,173, 49,
+ 75,147,127, 55, 14,250,166, 90, 97,194,177, 99,190,122,129, 63,137, 18,226,124, 61,211, 70,141,254,229,245, 22,125,149,123,165,
+250,211,  2,165, 65,252,214,251,252,227, 11, 84,171,  6, 60, 31, 29, 56, 68,184,129,250,102,147,161,127,186, 29, 67,251,149,123,
+165,250,212,128, 90, 46,191,155, 31,168,168,173,  3,108,177, 99,102, 81, 52, 33,112,238,100, 83,253,153,195, 69,143,212,236,254,
+112,171,221, 47,214,162, 65, 81,162,126,107,126,174,222, 99,230, 28,199,113,143, 47,246,105,  6,237,191,219,112,212,101,245, 75,
+ 55,148, 42,247, 75,245, 41,109, 41,135, 31,252,208,253, 65, 92, 35,242,187,217,113,244,189,236,110, 29,200, 10,255,  0,181, 52,
+234,142, 71,213,142,165, 14, 21,213,238,151,235, 68,141, 96,135, 40,244, 31,204,159,187,146,225,115,114,217,100, 18,  9,160, 31,
+ 43, 63,143,217,243,122,174,126,174,245, 63,252,186,125,211,253,104,158, 92, 89, 25,123,243,  7,206,161, 65, 68,135, 96, 89,211,
+ 49, 95,120,  8,242,192,255,  0,245, 53,253, 58, 20,126,175,245, 82,127,203,167,252, 51,253,105,121,112,239, 81, 99,254, 98, 61,
+216,185,  7,  4,  8, 54, 62,104, 21, 72, 92,105,198,166,190,233, 99, 69,255,  0,119, 58,160,227, 85, 94,233,254,181, 63, 34, 39,
+130, 84,185,254,100,254,170, 34, 42, 66,162,216,177,183, 80,201, 88, 74,132, 11,169,217, 29, 73,164,239, 15, 29,108,226,125, 79,
+206,184, 57,174,191,116,191, 82,  9,164,190,156, 20,120,191,154, 31,169,119,203, 73, 85,151, 27,243, 86,160,149, 36, 67,185,248,
+164, 40,211,248,253, 18,223,169,153,177, 26, 66,191,116,191, 82,128,129, 76,150,207,204,135,189,171, 83,137,187, 91, 44, 77,169,
+  9, 10,  1,184,215,  1,191,251, 83, 14,179,109,250,171,212,128,210,186,189,210,253,105,128, 76,120,207,175, 30,237,100, 22,183,
+167,166, 13,148, 45,170,236,152,243,105,183,211, 43, 84, 44,250,193,212,225,198,186,127,195, 63,214,165,180, 47,199,253,122,119,
+102, 27,  2, 68,155,125,156,182,118,170, 99,205,254,153, 90,171, 47,173, 61, 76, 22,242,233,255,  0, 12,255,  0, 90, 32,174, 40,
+ 92,207,204, 55,188,173,188,132,197,183,216,212,202,235,186,163, 79, 39,165,124, 37,234,205,127, 88,250,148,134,181,213,238,159,
+235, 81,242,194, 29,145,254,100, 61,243,180, 50, 36, 69,182,216, 20,215,237,121,145,110,  7,245, 76, 26,181, 71,213,206,161, 51,
+173,117,123,165,250,211,121, 97, 13,183,126,105, 61,225,185,173,108,181,108,176,165,212,  3, 94, 81,167,210,191,254,115, 87,127,
+221, 46,161,253,202,189,210,253,105,140, 16,135,127, 53, 63, 81,233,184, 57, 25,187, 70, 52,166, 82,118,254, 18,231,202,149,255,
+  0,223,181, 33,245, 71, 63,251,149,123,165,250,211,  8, 58,144,159,205, 31,212,131,197,191, 42,207,141,132,168,144,162,168,151,
+ 63, 15,255,  0, 29,165,254,232,231,255,  0,114,175,116,191, 90, 91, 10,203,239,230,143,234, 62,214,105, 30,207,142, 56,125,241,
+ 46,103,195,221, 56,106, 31,238,143, 81,254,229, 94,233,126,180,230,  0, 47,199,255,  0, 52,159, 82, 95, 34,212,136,246, 76,119,
+205, 81,163,156,162, 92,200, 30, 59, 82,112,210,255,  0,116,122,139,235, 10,191,195, 47,214,163, 32,200,153,252,208, 59,208,213,
+184,202,126,217, 97, 75,225, 60,136,249,107,133, 43,255,  0,231, 52, 57,253, 85,234, 35,254,157, 94,233,126,180,128, 90,113,159,
+205, 51,188,183,103,146,212,251,101,129, 33, 70,137, 45, 70,184, 15,254,180,195,160,207,234,199, 82,229, 93, 95,225,159,235, 82,
+ 17,143, 52,114,251,249,144,119,122,210,210, 95,110,223, 99, 83, 52,  5, 85,141, 62,180, 39,221, 47, 64,255,  0,119, 58,167,254,
+ 85, 95,225,159,235, 77,240,160,115,255,  0, 53, 30,239, 70,105, 78, 51,109,176,146,  5, 82, 21, 26,224,127, 84,193,169, 15,171,
+ 93, 83,255,  0, 46,175,240,207,245,164, 54,161,209, 63, 53,254,250,186,190, 79,218,113,224,198,244,164, 91,136, 59,125, 51,117,
+108,125, 84,234, 95,249,117,123,165,250,212, 75, 34, 22,159,205,  7,191,183, 69,184,164, 89,108, 38, 58,126,234,147, 22,227,244,
+239,252,102,165, 47,170,153,241, 26,194,175,116,191, 90, 76, 74,253,147,249,152,250,153,104,169,230,172, 24,250,162, 36,138,159,
+148,185, 86,135,255,  0,198,234,  7,234,206,112,254, 90,189,210,253,106, 91, 10,241,  7,243, 65,245, 13, 48,184,  6, 63, 99,248,
+ 83,201, 39,229,110, 52, 39,255,  0,206,104,176,250,167,158,127,150,175,116,191, 90,139, 20, 45,191,205,103,212,171, 83,147, 18,
+125,131, 30, 64, 89,160,164, 75,152, 61,125,243,181, 41,125, 81,234,  0, 56,133, 94,233,126,181, 33,  2, 83, 53,163,243, 37,245,
+  5,113,228,181, 89,172, 33,164,210,188, 98,220,107,250,102,106,145,250,181,212, 71,253, 58,189,210,253,104,166,144,  2,252,202,
+ 63, 51,174,239, 99,176,154,116,218,236,134, 83,132, 14, 42,143, 62,155,154,120, 75,174,139, 31,170,125, 76,143,146,159,240,207,
+245,168,236,138,220,223,230,111,221, 71,162,165, 77, 90,236,198, 74,129, 81, 31, 47, 59,143,135,255,  0,213, 87, 72,125, 82,234,
+135,254,157, 63,225,159,235, 81, 34, 33,  3,185,126,107,125,228,183,220,211,  7,249, 77,132,182, 77,  9, 49,174, 21,255,  0,245,
+154, 48,250,161,212,191,242,234,255,  0, 12,191, 90,139,  4,102,229,249,150,119,181,171, 31,243, 91,117,170,196,183, 41, 80,149,
+198,184, 17,250, 38, 13, 71,253,209,234, 96,235, 93, 95,225,151,235, 73,180, 74, 71,243, 94,245, 48, 94, 33, 22, 60,111,200, 29,
+ 73,135,116,175, 74,255,  0,247,253, 16,253, 80,234,  3,249, 42,247, 75,245,168,162,182, 95,205, 27,212, 37,218, 56,150, 45, 24,
+239,146, 15, 21,113,137,114,168,251,102,234, 51,250,165,212, 34, 91,101, 94,233,126,181, 49, 20,106,245,249,143,247,250,  4, 38,
+167, 68,180,216, 84,210,233,203,156, 91,129,161, 35,194,147,  6,170, 67,234,231, 80, 50,219,178,175,116,191, 90, 39,148,162,255,
+  0,251,152,119,253, 54,181, 73, 54,107,  9,152, 55, 74, 68, 91,143, 19,245,124,229,127, 78,154,127, 87,115,227, 38,217, 87,186,
+ 95,173, 35, 80, 73,185, 95,230,245,234, 67, 24,113,128,230, 63,142,169, 14, 40, 37, 99,228,238,149,  0,251, 41, 59, 86,241,254,
+169,117, 27,120, 66,175,116,191, 90, 28,162,203,100, 31,206, 15,190,111,201, 74, 36, 88,172,  9, 96,245, 41,139,114,  7,244,204,
+212,238,250,153,213, 33,252,148,255,  0,134,127,173, 65,194,131,148,254,114,157,255,  0,179, 73,242, 45,246, 28,117,196,248, 23,
+ 34, 92,201,167,251, 51,134,137, 95,212,190,165, 32,251, 42,255,  0, 12,191, 90,144,  1,104,179,254,114,254,163,103,147,243, 88,
+254, 54,129, 66, 83,198, 37,208,116,250,103, 29, 47,247, 47,169,127,114,175,240,203,245,165, 32,  2,252, 31,157, 15,127,188,245,
+ 70, 85,139, 28, 14,164,248,195,186,110,  7,179,248,237, 56,250,149,212,155,228,171,221, 47,214,162,  8, 41,131, 26,252,222,251,
+205,120,152,220,105,150,107, 10, 18,189,137, 68, 91,136,222,149,241,152,116,227,234, 79, 82, 35,228,171,221, 47,214,152,150, 70,
+191,253,212,123,197,230,150,205,162,198,  7, 36, 37, 63,195, 79,220, 43,169,255,  0, 23,170,255,  0,238,127, 83,118,217, 87,248,
+101,250,211,130,137,159,204,215,187,194,114, 97,255,  0, 42,178,212,176,167,255,  0,195, 79,234, 20,  5, 63,197,123,244,191,221,
+ 14,165,253,202,191,195, 47,214,153,215, 20, 91,109,151, 43, 85,201, 81,156, 28,152,  8,226,165,120, 87, 92,  6, 14, 64,144,116,
+211,138,101,198, 44,182, 91,141,165,230,228, 41, 36,133, 21, 41, 39,195,195, 81,200,182, 70, 90, 41, 16, 20,137,183,140, 83, 31,
+138,208,143,199,152,167,214, 65,213, 57,215,108,148, 92,  5, 38,209,220, 59, 68,136,107,113, 33, 42, 82, 85,176,167,191, 85,191,
+101, 53, 35,102,138, 67,247,184,215, 71, 17, 33,134,192, 80,  1, 52,165, 60,117, 90,112,144,209,245, 67,223,216,138,218,152,143,
+ 62,224,219, 83,144, 60,170, 37, 70,190,250,232, 96,152,196,234,165, 25, 45,238,204,199,161, 60,155,122,144, 10,212,118, 31, 94,
+152, 89, 57, 35, 70, 65, 26,181, 94,113,171, 13,254, 43, 87, 22,211,229,186,  7,222,  3,199, 84,114,161,108,195,133, 47, 48, 50,
+122,159,220, 76, 65,151,126, 94, 43,104,242, 72, 27,237, 79,103,134,170, 87,137,113,213, 60, 44, 26,163, 61,164, 54,158,226, 38,
+ 86, 49, 96, 91, 45,221, 82,133,204,  5,243, 70,212, 26, 32,169, 37, 93,  5,107,246, 87,232,215, 73,208,253, 59,147,212,111, 16,
+143, 47,183,225,170,183,137, 89,178, 65,149, 93,234,167,213,206, 45,233,176,175, 18,237, 76, 86, 36,229,206, 71,109,187,210, 37,
+150,164,195,113,185, 76, 20, 56, 26, 80,  1, 73, 88, 77, 22,  8, 88,234,  5, 43, 93,125, 43,233, 79, 66, 99, 98,192, 78,216,188,
+199,107, 16,235,168,175,167,136,128,227, 95,237, 76, 61,192,192,238,189,224,244,225, 97,245, 65,139, 69,  9,186, 34, 11,  3, 32,
+142,194, 64, 15,178,218, 72, 23,  4,129,212,211,136,112, 15,239,120, 29,115, 30,181,244,157, 80, 31,184,198,139,  8,252,195,223,
+241,126, 71,196, 44,158,167,141,178, 78, 57,253,202,152, 98,244,233, 64,149, 41, 91, 10,129,246,107,202,231, 88,224, 22, 20,160,
+ 93, 65,133,153,202, 50, 95,183,182,237, 26,166,194,186,171,109,  1,144,229, 21, 51, 20, 50,175, 48,229, 33,213, 18, 27, 82,149,
+ 95,170,163, 64, 34, 32,104,134,  3, 47,198, 59,133,252,174, 90, 96,242,252, 46, 69, 53, 39,216, 53, 58,107,125, 83,136,173, 89,
+ 44,248,119, 75,170, 11,148,162,147,201, 62,255,  0,134,186, 59, 16,144, 65,166, 68,180, 25,232,144, 54,113, 59,125,186,177, 93,
+135,129, 83,109, 17,123, 50, 98,132,188, 37, 15,189,186, 15,213, 67,160,203, 66,136,  2, 45, 15, 23,183,189, 29,187,139,192,  6,
+235, 67, 94,155, 43, 89,249, 57, 36,  6,  9,135, 20,236,226, 49, 56, 54,120,237,168, 38,135,142,244, 30,202,107,155, 55, 91,188,
+162, 27,  2,211, 14,193,143, 59,117, 12,161, 73,242, 92, 78,223, 81,209,229,125,140,152,200, 40,247,155,125,138,202,235, 45,249,
+137,  9, 43, 74, 78,254,221, 79, 30,203, 36, 89,148,  4,130,135,151,219,140,251,131, 12, 91, 22, 86,149, 39,144, 74, 42,106,  2,
+106,122,123,134,180,105,  5,142,136,155, 31, 64,174, 43,119,110,123, 91,233,115,181,223,248,143,222,245,252,254,113,115,138, 29,
+182,227,201, 52, 83,  1,207,197,252, 93,246, 82,135, 20,146,126,232,168, 21, 58,245,239, 77,122, 24,221, 92,108,188, 49, 35,135,
+ 96, 61,189,235,107,167, 98, 57,220, 70,157,255,  0,151,217,146,151,110,125, 83,118,174,126, 97,112,118,108, 24,198,216,228, 70,
+163,183, 20,181,193,183,228,189, 47,138,252,180,168,124, 41,  8, 41, 59,248, 39,125,206,187,250,125, 27,141, 92, 12,  0,226,182,
+ 37,141,  2, 11, 15,179,161,126,162,241,220, 67,183,253,250,123, 25,192,210, 21,140,195,106, 42,252,212,171,146, 93, 91,241, 83,
+ 39,154, 77, 78,220, 86,145,244,131,175, 33,245, 87, 77,142, 54, 84,171,135,  0,184,235,254, 18,204,202,171,203,115,175, 42,231,
+ 51,202, 87, 14,  2,148, 39,216, 53,207, 67, 20,201, 81,156,216,168,253,180,239,195,136,133, 54, 27, 14,111,241, 38,149,241,212,
+165,209,247,113, 80,149,200,237,207,186,147, 30,177,169, 60,170,158, 36,142,190,205, 97,221,211,  4,108, 83,132,220, 37,188, 91,
+185, 87, 57, 13,134,223, 81, 43,  4,132,141,253,180,213,200,244,248,  4, 51,105,117,249,151,228,121,  4,251,122,162,199, 39,205,
+ 63,119,232, 26, 37, 56,240,137, 69,137, 41, 78,219, 43, 44,182, 77, 42,117, 10,  5, 70,167,175, 74,107, 65,171,102,  9,245, 71,
+108, 41,155,112,186,169,101, 68, 40, 37, 32,138,251, 58,234,181,145,  3,130,148,100, 66,100, 72,118, 60, 21, 58, 72, 43,108,215,
+237, 59,232, 76,197, 56, 46, 87,236, 25,145,239,113,144,241, 32,254,201,175,211, 77, 25,152, 58, 69, 78,186, 22, 97, 69,114, 32,
+ 86,244,168,251, 53, 92,201,202,138, 82,184, 42,115,241,220, 42,119,240, 73, 41,235,245,105, 70,200,187, 20,220, 87,171,102, 61,
+ 42, 12, 52,207,101,234,132, 16,179, 67,245,232,224,192, 38,213, 79,188,223, 38, 92,224, 47,201, 89, 45, 37, 31, 22,245,241,174,
+137,228,198, 90,166, 33,146, 80,118, 92,249,172,196, 14, 42,139, 52,219,217,169,154,162, 20,132, 83,115,184, 36,232,173,199,117,
+194,124,133,129,184,175,142,179, 47,204,132, 75,  5, 40,214, 85,149,128,167, 31,199,112,185, 50,238, 52, 50,147,202,149,251, 53,
+205,229,217,101,146,209, 91,129, 17, 10,118, 53,149, 88,167, 90,188,137, 41,  0,186,163,185,246, 87, 66,149, 22,146, 19,121,193,
+122,191,100,152,181,168,152,208,194,  3,188,104, 72,166,137, 69, 87, 13, 74, 97, 96, 85,238, 73,144,219, 38,177,243, 45,148,135,
+153, 53,228, 58,143, 29,106,209, 27, 18, 51, 12,191,112,142,227, 72, 98, 74,154, 82,194,162, 42,169, 59,214,154,182,104,112,132,
+108, 80,243,123,140,107,197,195,203,117,127,  0, 33,198,253,149, 78,231, 87,107,129, 80, 50, 66,109,249, 75,237,203, 84,100, 40,
+121,109,130,145,239,213,216, 64,  5, 23,117,162, 76, 87,110,215, 36,204, 89, 32, 87,169,212, 37, 32,250, 41,  4,126,126, 90,205,
+162,208,109,104, 88, 91,132, 83,111,126,161, 52,130, 25, 62,236,151,236,129,168,128,  9,142,212, 10,117,169, 30, 26,106,196, 73,
+213, 49,  8,135,110, 68,203,101,109, 19, 77, 86,170, 44,215,216, 69,117, 87, 49,134,161, 40,185, 41,205,121,  4,105,176, 19,108,
+ 82,147,197, 20,169,215, 59,107,196,184, 87, 97, 20,215,140, 99,182,137,150,161, 45,245, 36,212,128,  5, 71,211,172,108,187,236,
+228,136, 32, 29, 40,119,139,  6,177,193, 75,115,150,132,173,  4,  2,  7,215,174,135,211,134,118, 30,197, 27, 42,113,162,172,127,
+150, 91,101, 91,228, 78,109, 60, 93, 65, 41,108, 15,236,141,117,163, 82,197, 80, 60, 82,250,113,231,175,243,154, 97,164,149,202,
+ 52,219,245,232, 54,216, 32, 20,226, 93, 50, 89,187, 63,146, 77,112,161,136,202, 10,103,225,115,111,118,169, 30,161,  8,243, 83,
+242, 73, 69,222,244,237, 53,199,155,187, 45,146,150,197, 66,199,215,190,171,203,173,196,104, 20,191,110, 83,172, 95, 79, 78,193,
+177, 55, 54,219, 28,173,213,144,106,  7,141, 41,170, 51,245, 29,100,176, 44, 81,134, 25, 33,214,169,157,180,153, 30,224,204, 89,
+109, 20, 56,120,245, 26, 23,250,177,150,160,168, 74,150, 91, 14, 57, 39,252,224,155, 71, 31,136,199, 81,229,238,  4,104,191,191,
+150,221,200, 91,  2,173, 49,235,234,229,201,118, 60,197,126, 35,128,138,251, 53,208,199, 31,202,224,128,181,227,232, 69,189, 51,
+191, 28,252, 68,237, 95, 15,102,172, 11,192,228,145,173,208,249, 54,203,125,233,246,193,112,209, 53, 61,116,199, 33,249, 38, 53,
+133, 47, 16,183,192,131, 49,196, 56, 74,152, 74,186, 31,112,208,238,176,144,163, 48,  2, 45, 47, 43,143,108,154, 17, 25,  4,180,
+ 56,210,154,206,150, 33,145,213, 13,215,155,143,118, 36,219,228, 41,213, 54,161,176,  9, 20,246, 13, 74,190,156,  9, 81,220, 80,
+136,253,196,149,114,188,176,249,  4, 36, 29,201,246,146, 52,106, 48,  3,145,216,141, 41, 48, 69,115,220,178, 93,206,225, 21,248,
+196,213,180,131, 81,208,104,223,181,140, 67, 20,163, 23, 91,172,153,101,214,231,111, 49,  1, 82,165, 45, 65,  9,226,119, 36,154,
+  0, 62,179,167,174,136,141,  0,226, 81,163, 73, 60, 23,231,112, 61, 64,206,244,253,104,184,224, 48,102,214,226,225, 45, 92, 86,
+133, 17, 73,  1,176,149,160,116, 53,109, 69,104,247,235,232, 79, 76,122,112, 97,227, 68,144,211, 32, 19,226, 87,160,116,140,120,
+208, 35, 22,213,181,241, 92,147,158,247, 50,243,155,228,  9,185, 77, 89,112,173, 99, 99,224,146,173,133, 62,205,117,240,248, 70,
+139,166,141, 97,254,223,110,245,246,215,177,214, 91, 38, 13,232,127, 15,199,178,  8,192,219, 31,199,162,193,145, 24,214,170,110,
+ 92, 96,135,146, 64,161, 31,134,226,135,215,174,127,124,103,108,163, 45, 99, 45,  8, 92, 85,213,249,247,202, 35,128, 92, 61,158,
+118,198,255,  0, 96,201,238, 88,123,206, 85, 86,217, 50, 34,  7,147, 94, 46,134, 93, 40, 14, 38,190, 10,  0, 17,244,235,231,110,
+165, 87,236,178,167, 68,181, 48,145,137,246, 22, 92,229,173,  9, 17,222,201,103,255,  0, 11,239,204,129, 56, 56, 67,142, 18,145,
+244,248,106,149,217,176,  1,149,  9,151, 41,235, 30,193,238,216,253,151,205, 59,174, 66,104,173, 97,254,244, 58,130,171,243,139,
+ 29,210,198,167, 30, 88, 43,115,153, 80,167,211,173,124, 92,136,200, 39,  8,173,169,102,241, 13,137,136, 20,121,164,209, 64,245,
+233, 77, 89,180, 14, 73,192,117,230,237,105,146,203, 37,231, 15, 23,156, 39,128,253, 90,175, 18,164, 75, 39, 92, 50,194,205,234,
+ 36,117,205,162, 20,216, 60,253,251, 15,233,214, 94,126, 68,161,160, 77,189, 29,187,200,198,162,194, 77,153, 14, 14, 92,128,251,
+117,144, 77,135, 86, 75,112, 69,108,182,124, 99, 37,105,187, 19,235,  1,240,145,199,126,186,170,103, 96, 46,201,206,214, 82,178,
+ 44, 37,171, 85,153,225, 13,124,110, 44,212,182,175,235,120,131,246,107, 67, 10,215,151,197,193, 68,  7, 72,153,  6,  5,125,202,
+ 44,172,200,133, 32,252,210, 84, 15, 94,132,107, 71, 30,248, 70,210,227, 68, 79, 44,174,183,244,159,233,106,215,133,224, 49, 59,
+201,220, 23,  4,139,241,136,183,162, 71,119,100, 54, 93, 71,150, 43, 94,191,  9,167,215,175, 97,244,175,166,171,200,128,186,113,
+227,160, 11, 95, 18, 62, 84,163, 17,243, 30, 61,192,255,  0, 98,225, 47, 92, 30,166,111,157,199,238,220,235,116,119,202,172, 17,
+ 36, 62,142, 85,248, 85,229,184, 91,175, 74,  1, 65,244,211,111, 13,123, 52, 68, 97,240, 69,118, 17,163,225,126, 67,128, 84,254,
+ 17,159,121,174,190,251,235, 45, 58,213, 16,170, 42,189, 18,  9, 72,223,218,154,215, 70,226, 10,  1,142,210, 35,246,212,174,150,
+193, 51, 43,111,112,187, 62,197,245,136,143, 63,155,227,228, 34,124,180, 81, 72, 93,173,105,  8,109,111,120,242,109,194, 17, 90,
+253,210,159,102,222, 79,245, 11,165,  9,  8,100, 68,124, 92, 37,248,131,248,172, 78,185,129,177,167, 30, 10,172,207,225,220,175,
+183,  9, 15, 90,118, 91,156,137, 30,234,107,206,105,178, 49, 33,215, 47, 42, 73, 74,120, 54, 25,146,218,110,206,165,205,252,197,
+ 18,175,175,166,175, 89,155,  6,209, 87, 52, 50,126,130,242,213, 29,118,247,  1, 11,  2,128, 31,118,185,251,154,122,162, 68, 48,
+100, 61,153, 14, 89,238,201,109,198,200,100,147, 85, 83, 85,200, 50, 10, 39, 69,178, 78,109,230, 78, 83,188, 79,150,210,183,250,
+ 41,190,137, 86, 43,197,209,  1, 71,133,225,236,128,137,112, 88,168, 74, 40, 82,  7, 83, 65,161,154,152,241, 82, 18,101,  5, 83,
+151,107,150,135, 84,146,135,214, 77, 82, 71,191, 71, 96,201,  5, 38,217, 58,235,112,157, 33,133, 36,166, 47,137,223,233,208,167,
+ 16,144, 44, 84, 40,215, 85, 90,231, 11,115, 10, 37,178, 73, 63,175, 82, 46, 98,162,189,221,111, 50,238,114, 10, 99,172,151,  0,
+ 21, 27,244,166,131,160, 77,181,212,107,106, 46, 18,225, 62,203,202, 33,196,215,237,165,116,164, 34, 53, 78, 34, 66,217,108,255,
+  0, 52, 65, 74, 35, 73, 39,228,158, 28, 69,126,154,234,212, 77,102, 61,232,127, 19,169, 54, 72, 51,224, 74,126, 60,181,131, 13,
+100,238,125,135, 66,187, 36, 66, 58, 35,194, 47,197, 54, 96,216, 70, 53, 61,228,188,162,  8,110,148, 39,174,177, 50, 51,172, 33,
+149,145, 24,133, 97, 93, 21,139,124,131,118,212, 41, 37,198, 71, 47, 15, 13,181,129,253, 89, 73,203,162, 78,216, 50,253,126,201,
+141, 77,196, 92,101, 10,  1,215, 42,  7,188,245,211,215,101,155,147, 60, 87,235,184,166, 45,111,177, 69,106, 50,199,205,132,239,
+ 79,163, 90, 53,217, 55,225,162, 20,163, 21, 94, 93,113,149,200, 14, 74, 46, 16, 84,178,145, 83,224, 85,254,141,107, 70,224,220,
+ 16, 77,104, 77,199,183,239, 71,182,188,146,239,196,232, 36,126,173, 30, 25, 64,114, 72, 65,106,176,118,252, 89,224, 32, 56,225,
+ 46, 47,145,175,186,154,144,191,114,159,148, 23,185,120,108,187,140,158, 17, 84, 84,180,236, 62,202,106, 99, 41,147, 26,194,137,
+ 35,183,115,173,146, 67,174,238,175, 16, 61,221,116,195, 51,114, 66,176,141,228,150, 84, 64,181,199,113, 35,138,148, 42,162, 61,
+180,211,194, 74, 81,  1, 36,197,252, 71,223,113,127, 18,146,162, 19, 93,246, 26, 36,138,114,193, 18,182,182,185,210,155,105,161,
+248,136,248,142,171,206, 91, 80,230,  2, 56,204, 73,161, 78, 72, 77,126,100,164,164, 31,163, 76,100,  8,213, 15,130, 68,189,228,
+121, 45,166,115,209,209,200,171,145, 41,  3,223,162, 67, 18, 19,226,156, 88, 93, 88,221,173,205, 47,210, 88,141,111,156, 74, 82,
+163,241, 18,124, 56,234,134, 94,  4, 57, 39,223, 36,237,150, 24,179,173,165, 51,213,201,161, 78, 39, 84,168,145,171, 72,232,139,
+ 11,143,106, 93,180,227, 88,130,217,249,114,177,230, 45,102,181,246, 87,125, 28,100, 90,144,136, 42,124, 27, 38, 39,100,188, 42,
+229, 23,136,242,  5,118,166,231,254,131, 80,148,236,176, 50, 36, 76, 98,155,113,158,238,227,205, 45,242,219, 40,162,129,228, 64,
+ 21,165, 53,147,118,  5,132,241, 68, 57,128, 41,209,187,149,106,188,175,228,227, 37, 37,151,  5, 72,218,128,211, 76,122,108,130,
+ 29,153,125,138, 29,179,190,141,217, 94,118,202,178, 10, 26, 81, 72,  6,158, 27,141,  6,206,139,205, 22, 57,186, 45, 55, 62,236,
+217,242, 87, 28,117, 64, 38, 99, 35,146, 72,166,244,223, 71,171,167, 24,232,165,251,136,203,138, 70,255,  0,197,113,254, 98, 23,
+110, 31,143,187, 31, 87, 42,107, 95,246, 31, 11, 42,126,110,170,157,195, 45,183,251,197,245, 82, 56, 41,  9, 64, 37, 73, 80,167,
+ 94,154,236,137,139, 42,242,118, 94,231, 71,188,140,141,203,122, 42, 26, 83,156, 77, 43,208,237,170, 80, 96, 84,157, 30,110,205,
+ 18,208,223,146,242,255,  0, 16,128,165,123,129,220,234,173,132,182,136,102,197, 55, 26,183, 48,169,110,185,214, 42, 71, 51,250,
+244, 56,200,158, 41,188,192, 83, 54, 58,140, 78, 83, 42,144,250, 80,167, 57, 17,241,117,235, 77, 83,190,203,  4,152, 33, 27, 89,
+109,200,236,248,132,135,124,222,  8,242, 91, 20,247,109,171, 20,155, 25, 74, 54, 58,  7, 38,211,136,177,  5, 50, 26,  9, 74,143,
+136,167,142,173,195,120, 69,222, 17,139, 77,163, 24,147,  5, 75,124,167,131,137,  5,  4,253, 99, 84,238,149,142,152,204,  5, 94,
+101, 55, 72,152, 76, 89,247, 88,143,124, 17, 18, 86, 55, 27, 40,252, 40,235,253,181, 39, 94,137,232, 62,137, 44,219,133,147, 31,
+ 12,  8, 63,111,114,217,232,248,230,251,  1, 28,138,230, 46,238,103,215, 28,226,255,  0, 42,116,231, 73,184,203,117,201,139, 93,
+119, 43,113,126,105,175,188,147,175,161,108,  3,107, 14, 11,190,193,172,194, 78, 70,173,248,160,157,171,110,227,124,204,173,214,
+ 53,  0,228,233, 51,163,180,210, 23,176, 52,112, 26,106,145, 96,  8, 91,146,145,218, 36,  2,251,139,234, 75,184,145,108, 29,134,
+ 17,236, 77,169, 13,170, 15, 56,104, 52,252, 54,213, 24, 10, 26,108, 56,131, 79,167, 92,182, 49, 18,180,120,174,111, 19, 24,131,
+ 41,158, 39, 69,205,125,193,206,109,183,159,150,200,157,248,103, 77,139, 10, 82,171,247,137,122,  3, 78, 18,122, 86,164,235,199,
+ 62,160, 97, 24,245,139,219,153,  7,252, 81, 18,252, 74,224,122,188,133,119,200,119,254, 73, 70,103,114,237, 81, 97, 53, 10, 66,
+128,124,113, 88,233, 93,235,174, 42,204,  9, 72,184, 88,214,222,202, 96,239,  4, 73, 22,  6,216, 82,135, 47,186, 43,237,173,127,
+ 86,179,207, 79, 32,170,241,202, 33, 38,229,249, 18,100,203,109,199,192, 44, 57, 90, 86,157, 60, 53,115, 31, 28,196,171,181, 91,
+185, 66,125,153, 81,153, 76,168, 67,131, 70,133, 84,233,236, 58,215,  7, 77, 85,168, 69,121,201, 19,122,184,197,142,251, 10,168,
+107,138,182,247,111,161, 85,197, 41,  5,230, 63,113,174,150,166, 86,193,170, 29, 74,  8,219,232,209,127, 97, 27, 14,171, 54,217,
+145, 38, 85,163,253,208,203,110,249, 19,230, 48, 90,155,105,116, 36, 86,149, 26,189, 62,157, 92, 98,202, 95, 19, 43, 47,182,249,
+157,234, 77,238, 45,193,231, 20,217, 64, 21,174,221, 69, 70,177,115, 49, 33, 88, 68,140,137, 10,209,200,243,213, 75,142, 31,126,
+ 71,198,148,208,208,245, 61, 53,155,229,128,116, 10,221, 80, 40,143,100,161,220, 50,140,174,  5,145,165,149, 69,146,242, 75,131,
+216,223, 46, 74,251,  0,214,255,  0, 78,233,163, 34,248, 65,184,149,167,131, 71,153,100, 65,225,252, 23, 89,250,154,238, 28,206,
+223,246,112,197,178,130, 26,135,111,156, 83, 77,210,218,225, 65,118,107, 74, 52,241, 11,101, 39,234,215,209,254,159,162, 53,200,
+ 68, 15,146, 37,189,139,166,199,196,142,233, 72,142, 36,127,  5,241,235, 34,126, 67,151, 87, 36, 54, 60,218,211,204,113,123,239,
+ 78, 68,239,212,212,131,173,250,194,216,180,143,  4,173,106, 98,105, 67,241,218, 88, 68, 67, 90,240, 20, 87, 37,171,245,158,154,
+156,193,224, 57,168,  9, 65,220,190,139,168,125,  6,230, 86,235, 30, 70,254, 39,149, 57,195, 14,200, 98,200,199,111, 74,221, 69,
+ 16,230,163,202, 83,201,241,228,210,130, 93, 20,222,169,214, 87, 82,199,142, 68, 77,115, 31, 12,129,  7,193, 79, 35, 22, 57, 24,
+210,143, 19,196,119, 16,255,  0,199, 84, 99, 63,237,212,158,218,231,215, 60, 46,246,186, 76,129, 50, 77,184,186,118, 11, 68,103,
+ 75, 97,196,143, 20,184,126, 32,125,131,223,175,156,115,241,101,139,108,234,151, 24, 72,131,236, 44,188,234, 81,209, 70,106,200,
+212, 16,236,184,235,243, 61,159, 71, 77,103,249,133, 84,176, 50,  7, 50,230,218,238,173,166, 58,127, 18,160, 46,158,253,180, 45,
+165, 52, 98,141,101, 86,150,  3,108,150,219,171,188,  2,148, 41,253,154,233,156,197, 40,193,210,221,134, 20, 53, 23, 27,117,158,
+ 78, 45,100, 29,181, 45,242, 70, 21,133, 97, 99,139,181, 89,156,101,176,128,148,157,148,  8,246,234,189,162, 71,130, 20,244, 43,
+101,234,213,103,189,220,150,164,165, 35,129, 11, 73,  3,111,110,161,  8,205, 45,234, 93,158, 37,141,215,222,132,  2, 65, 82, 64,
+ 39,253,157, 33, 25,130,160, 75,160,242,112,123, 75, 51,229,202, 85, 57, 54,217, 82,  1, 63,217,213,208,100, 98,202, 60, 18, 75,
+ 23, 24, 54,247, 92,147, 78, 74,  4,133,125, 91,106, 21,214,100,164, 10,136,230, 73, 33, 82,139,176,209,248, 10, 34,167,233,235,
+169,203, 29,194,152,154, 34,214, 81, 42,107,205,169,224,  4,118,134,223,101, 53, 24,210,193, 62,224,129,231, 25, 53,214, 12,114,
+236,122,148, 57,208,167, 69,134, 48,151, 20, 57, 30,197,187,183,249,173,234,219,102,145, 50, 74,148,144, 71,194, 21,238, 21,241,
+209,165,211,226, 80,229, 34,203,123,157,192,187,186,215,206,135, 15,226,  2, 40, 61,231, 85,165,211,226, 16, 68,137, 41,146,203,
+159, 94,103,194,141, 31,145,  9, 70,228, 87,173, 53,156, 48,162, 29, 89, 94,243, 14,225,223, 96, 73,142,168,156,138, 18,  2, 72,
+250,181,163, 28, 72,237, 77,170,147, 55, 55,113,235, 83, 34,180,127,101, 47,234, 21,208,255,  0,104,200,132,150, 67, 14, 99, 62,
+230,201, 90, 87, 86,134,218, 25,160, 59, 38,114,182,222,114,185, 40,136,210, 34, 26,185, 74, 80,123,244, 74,232,  9,196,138,223,
+133,101,146,154,121, 78,201, 63,137, 95, 31,211,169, 75, 28, 20,198,101, 77,200,123,137,252, 71,150, 40, 64,  0,172,251,201,255,
+  0, 78,165, 86, 18,136,185, 67,189,102,205, 94,224, 55,111, 10,  1,225,177,220,123, 55,212,109,164,192,128,141,  9,115, 42, 21,
+154,200,155,156,159,144, 96,132,186,  5, 84,107,239,174,165,176,128,161, 57,186,214,167,133,130,239,242,140,175,148,147,240,154,
+125, 59,233,252,131, 48,134, 78,137,170, 45,213,149,216, 87, 32, 40,121,200,  4, 19,227, 83,182,129, 44,111,137, 73,244, 73,151,
+ 22,147, 49,105,144,229, 57,169, 69, 74, 62,192, 14,175, 66,161, 16,134,  9, 68,160,200,159, 14, 75, 75, 96,128,193, 20, 65, 30,
+ 53,213,107, 32, 25, 17, 16,200,175,151,  9, 44, 34,  2, 94,226,242,104, 85,191,187, 84,170,199, 27,156,164,200,  1, 69,237,137,
+237,252,163,138, 83, 91,114, 80, 39,233,213,227, 76, 64, 72, 22, 70,204,153,159, 46,180,114, 42, 36,124, 71,115,211, 77, 93, 81,
+ 72,201,208,  7, 47,146,236,105,125, 72, 10,242,192, 80,  7,127,  1, 77, 16, 85, 25, 21, 18, 29,109,192,243,233, 48,155, 84,169,
+ 42, 32, 87,138, 65,235,190,165, 44,112,160,120,173,121, 19,183,197, 73,114,247, 20, 40,178,231,197, 81, 93,246,208,182, 68,150,
+ 82,  5, 64,176,222, 46,239,203,242,220, 82,146,225,  6,160,251,245, 35, 76, 66,111, 49,145, 79, 53,  5,144,175,218,  4,212,255,
+  0,104,159,245,105,182, 39,222, 17,155,203,204,217,239, 63, 49,110,108, 33,135,  0,173,  7,184,234,196,  0, 33, 94, 41,110,248,
+228,212, 93, 90,184, 50,215,196,165,164,158,187,143, 29,  6,  1,  2,113, 67, 59,133,112,188, 37,223,152,101, 10,226,180,132,138,
+ 87,196, 29,104,215,  8, 51, 42,147,166, 74, 53,147, 36,188,196,182, 58,209, 74,131,139, 79,136,235,182,152,209,  4, 47, 42, 65,
+122,199,230,223, 27, 74, 82,178, 71, 35, 83,244,242, 39, 64,149, 80,  5,209,127,110,233,235, 29,176,221, 47, 88, 44,249, 79,147,
+243, 21,224,217, 61,122,127,175, 83,223,  0, 81, 99, 67,  4, 27, 36,193,242, 24, 24,163, 46,149, 31, 55,128, 63, 96,209,133,177,
+  7, 85, 41,210,202,  0,187,221,218,197, 88,  2,161,109, 10, 84,215,192,232,103,100,164, 20, 14, 57, 33, 80,157,227,238, 29,206,
+109,198,101,144,186, 83, 13,181,182,251,232,168, 63,140,134,248,211,219, 80, 14,250,250, 43,211, 61, 42, 24, 24,145,139,107, 45,
+ 79,228,189,  3,211,125, 56,213,  3, 46, 10,160,189, 94,138,100, 42, 83, 67,146,197,104, 43, 90, 87,111,232,214,185,158,238, 11,
+179,142, 56,129, 46,117, 94, 48, 92,190,117,143, 50,183, 95, 98, 43,141,194, 44,150,100,164,170,160, 14, 46, 36,128,117, 33, 94,
+224,167, 99, 70, 44,190,185,247,143,186,206,229, 94,155, 44,183,214,138, 83,115,186,196,142,148, 52, 56,148,149,186,218, 92,113,
+  2,164,  0,  2, 91, 36,109,225,239,215, 35,143, 29,183, 55, 97, 65, 21, 60, 10,230, 92,203,185,109,255,  0,151,177,103,203,160,
+169,251, 84, 96,105,237, 97,199, 34, 80,251,199,151,174, 71,215,152, 66,121,242,179,182, 48, 62,232, 68, 47, 35,245, 21, 77,147,
+ 63,103,224,171,110,225,247,  2,106,178,136,172, 68, 89, 41, 45,212,129, 95,  0,125,154,229, 40,193, 27, 87, 49,100, 10,141, 27,
+185, 23, 95,152, 17,199, 34,158, 72, 73, 27,239, 78,132,123,255,  0, 94,178,115, 48, 68, 71,138,141, 84,238, 41,203,187,185,162,
+160, 99, 22,153,172, 43,227, 90, 69, 74, 79, 90,157,103,226, 98,157,228, 17,193, 88,140, 76, 10,100,237,238,110, 50, 60,124,181,
+ 40,236, 17, 90,125, 84,213,203,113,196, 85,216, 88,232,157,166,226,152,240,158,125,213, 85,164,  3, 64,125,192,141, 81,149, 91,
+ 74, 46,231, 80, 33, 72,181,100,126,107,203,160,112,166,155,127,118,154,153, 50,137, 12,135,176,  2,160,227,118,187, 28, 37, 72,
+226,148,149,149,158,103,110,160,233, 89, 41, 73, 19, 68,196,136,182,248,237,173,200,128, 33,208,147, 74,109,176, 26,171,108, 76,
+131, 20, 35, 23, 42, 13,206,229, 42, 85,185, 65,165,124, 64,245,246,208,234,165, 20,185,215,146,211,172,  6,101,114,250, 81,189,
+ 46,215,148,166,123,231,247, 45,113, 66,186,209, 69, 99,250, 53,232, 62,148,197,123,141,135,249, 98, 87, 77,233,220, 93,215, 19,
+220, 85,171,235, 67, 63,254,103,130, 73,182, 64,124,121,191,202,111,142, 41,  9,241, 42,180, 62,209, 39,174,233, 74,149, 77,181,
+236, 93,  8, 29,230, 93,160,254, 11,160,186,177, 86,157,225,124,180,149,144, 60,103,161,  9, 81, 72, 82,131,123, 83,195,199,244,
+235,118, 33,138, 86,252,164,253,181, 88,212,135, 26,146,209,228, 67, 11,170,210, 19,215,144, 87, 83,183,133,125,186, 59, 42, 17,
+146,181,189, 63,220, 87,108,202, 25,146,  8, 87, 53,166,137,222,188,  8,223, 89, 57,238,  3,174,143,165, 84, 39,240,157,  2,232,
+223, 90,182,217,183, 56, 24, 71,114,237,200,226,253,206,220,229,182,230,162,162, 86,228,219, 83,137, 73,116,142,148, 83, 14,180,
+  1,246,131,175, 42,245,150,  0, 18,133,224,124,193,143,136,255,  0,176,175, 60,245, 22, 31,147,149, 38,249, 73,209, 87, 24, 53,
+194,229, 54, 50,219,144, 42,162, 10,105,245,107,207,109,172, 21,205,217, 18,234,127,109,240,245,220, 50, 73,111, 92,118,101,181,
+  2,154,143,234,171, 77,101, 96, 69, 68, 72,132,205,121, 84, 22, 38, 41,183, 72,170, 91,227, 83, 79,110,169,206,189,195, 68,226,
+214, 74,217,  5,194,219,141, 91, 17,113, 72, 21, 43, 53, 34,157, 73,213,184, 99,104,167,231, 45, 54,123,201,188, 66,118,226, 86,
+  2, 82,158, 73, 26, 70,157,168, 68,186,142,238,122,136,138,110, 34, 79,241, 78,109, 95,171,142,138,106,  0, 38, 95,152,166,118,
+182,179, 86,173,175, 16, 80,224,170,141, 70,192,104,102,141, 29, 70, 65,107,206, 51,215, 90,204, 36,178,211,156, 98, 20,112,  2,
+187, 29, 26,186,244, 67,212,132,187,139,190,139,156,137,173, 47,226, 69, 73, 31, 89,210, 20,178,125,204,181,179,123, 97, 19,151,
+109,216, 33, 34,181,250, 79,183, 78, 43,116,241,154, 59,108,136,213,210, 55,150,193, 27,147, 82, 15,179, 77,229, 34, 41,173, 88,
+161, 92, 27,110,215, 34,133,105, 93, 20, 79,176,106,141,207, 19,162, 98, 87,230, 79, 14,201,110,179, 61, 29,176,144,150,182, 52,
+167,179, 70,166, 82,109, 84, 76,144, 12,101, 16, 39, 64,109,102,133, 33, 92, 71,208, 14,136, 65,100,225,145,136, 50, 89,102,235,
+229,197,161,105,  4,  3, 79,167, 84,  4, 52,213, 54,229, 38,229, 33,137, 19,138,151,247, 19,185, 31,160,232,241,212,  5, 33, 45,
+ 16, 27,133,222, 50,239,255,  0, 38,133,254,  3,136,  0, 13,182, 53,161,213,232,129,197, 33, 45,193, 28,181, 99,238, 70,177,249,
+172, 85, 96,172,214,155,237,170,214,134, 46,159,114,243, 55,229,224, 75, 67,242,104, 16,148, 21, 16,122,117, 27,104, 85,  3, 36,
+238,134, 61,120, 66,101,186, 99,236,133, 18, 80, 71,187, 71,217,180, 40, 18,225, 70,122, 66, 17,107,149, 33,229,254, 49,220,114,
+ 62,193, 81,162, 70,212, 33,161, 64,236, 23, 85,191,122,  4,172,148,167,166,254,193,162, 24,  3,197, 20,148,241, 22, 99,150,185,
+107,149, 29,202, 60,226,  2, 82,  1,241,165,116, 57,199, 69, 21,183, 22,180, 61,119,187,162,100,195,248,203,169, 21,246,232, 50,
+188, 13, 20,181, 68,231,217, 36,216, 97,203, 68,245,209,181,154,182, 61,213,168,213,115, 45,210,112,156,165,166,211, 34, 76,  7,
+ 86, 15,195,209,179,171, 17,159, 34,148, 84,236,114, 75,175, 51,202, 90,168,152,192, 40, 19,227,161,204,  4,139,168, 15, 93,205,
+219, 40, 80,105, 85,105, 73,240, 62, 58, 97, 16,  2,112,152,172,210, 35,218,225,186, 38, 40, 21,171,238,  3,239,213, 91,164, 72,
+ 78, 23,229,178,251, 13,135,190, 85, 68, 41,215,148,  0, 30,202,157, 14,161, 41,  4,164,193, 72,201, 87,143,198, 81,130,104, 86,
+ 18, 10,171, 78,167,127,215,162, 87, 92,129,116,201, 50,227, 18, 53, 88, 49,200, 72, 82,194,232, 15,191, 68,243, 75,164,201,237,
+119,219, 75,118,  1, 14, 64, 72, 80, 64,  9, 38,157, 71, 77, 68,213, 46, 40, 36,234,133, 95,216,181,219,162, 51,119,102,129, 75,
+ 27,145,239,209,163, 92,164,161, 61, 23,145,  1,175,242,242,174,127,246, 53, 75,188,189,251,143,215,162,121, 69,217, 15,147,175,
+ 87,185,237, 77, 96,240, 87,227, 35,136,160,240,213, 56,146, 22,225,144,100, 71, 33,141, 21, 24,181,190,234,208, 27,  0,151, 15,
+190,135, 79,171, 40, 62,168,  5,220,137,246,163, 33,  0, 40, 50,119, 61,124,117, 33, 34,236,156, 72, 40,119,179,  6, 53,181, 15,
+ 54,  0, 42,167,196, 62,144, 52, 93, 89, 62,232,148, 45,219,211,113,135,146,159,223,109, 74,104,226,178, 98,131, 41,178,183, 48,
+  9,100,224, 77, 33,196,128,167,  8,113, 68,211,222,106,117,  1, 94,136, 18,183, 85, 43, 50,157, 30, 77,166,223, 28,210,142,252,
+ 31, 80,  6,154,115, 89, 10, 98,110, 93, 85,253,212,200,173,216, 63,108,110,185,139,173,243,131,108,121,134,222,105, 37, 33,107,
+ 75,206,165,181,112,175,136, 10, 42,250,181,214,122, 43,165,254,239,168, 86,  8,120,135, 39,192,  2, 71,222,193, 93,195,172,206,
+192, 59,215, 19, 74,203,100, 93,231, 63,115,152,170,200,148,227,146, 93,229,226,183, 22, 86,161,191,211,175,160,237,150,210,195,
+130,245, 92, 10,255,  0,167,160,102, 31,197,208,105,242,219, 50, 72,108,130, 20,106,147,236,222,186,141,112,218,116, 86, 39,118,
+248,187,241, 68, 59, 91,137,207,204,187,133, 26,201,109,108, 58,243,171,111,147, 70,181, 80, 42,162,130,105,236, 30,193,163, 89,
+ 49, 88, 37, 87,220,102, 25,125, 52,206,240,201, 56,127,165, 91, 29,189,228,184,227,214,118,203, 14,177, 33,101,  5,178, 91, 89,
+ 69, 84,  1, 73, 79, 32, 40,122, 82,131, 92, 97,183,118, 65, 35,154,208,199, 31,  1,  5,114,191,108,173, 87,174,228, 98,226, 12,
+149, 41, 74,199,164,170, 26, 84,176, 66,148, 36,214, 97, 77,127,178, 87,250,117,141,245, 22,193, 92,105,159, 51, 22,241,227,255,
+  0, 98,243, 46,191, 80,156,221, 52, 66,237, 60,111,243, 99, 15, 92,147,201, 37, 52,170,136,216, 16, 71,142,188,182, 57,211,102,
+  0,191,130,230,141,  8,236,254,210,217, 32,182,242,163,179,201,226,180, 22,200, 21,161,  7,151, 93, 44,140, 28,203, 64, 62, 92,
+136,240, 37, 76, 98,145,201,  5,238, 78, 61,141, 92,236,177,224,221,164,136,239,182,  2,138,125,148, 53,174,192,210,164, 83,233,
+250,245,208,116, 47, 74,231,102,105,229,152,247,144,195,239,251,143,228,156, 97,153,241,  8,  4,110,242,118,215,183, 22,183,109,
+143,190, 93,116,178,175, 45,224,146,  8, 90, 85,247, 86,  5, 72,168,251, 62,189,186,203,126,148,230,202, 64,198,200, 17,227,203,
+248,247, 38,158, 41,138,222,215,169, 46,208,221,176,194,166, 46,106,143,114, 40, 42, 91, 15, 52,224, 80, 59,147, 66,144, 66,128,
+241,166,177,242,254,153,245, 90, 38,194, 17,152,228, 65, 30,230, 40, 70,137,197,  6,196,251,147,108,139,113, 13, 49, 61,165,161,
+105, 82,209,197,193, 66,133, 30, 33, 94,224, 79, 74,235,159,201,244,214,102, 49,254,165, 50,143,179,236,232, 83, 18,  8,221,171,
+ 37,125,134,167,203,229, 95,197,230,154, 26,142, 42,232, 69, 53,155, 44, 93,120, 32,139,  8,  8,180, 14,224,187, 43, 39,102,222,
+237,124,183, 83, 66, 62,162,117,  8,226,130,234, 62,113, 82, 51, 28,177, 22, 40, 43, 76,115, 85,149,  5, 26,111,196, 42,157,124,
+ 62,173, 84,167,  9,230, 95,130,209,174,237, 21,129,233,207, 56,126,107, 46,203, 42,226,216, 82, 27, 10, 38,149, 41,221, 66,167,
+220,160,117,222,122, 90,141,176,182, 93,171,186,244,137, 54, 72,158,196,203,222,172,230, 69,226, 20,216, 41,124, 58, 63,149,221,
+ 89, 10,175, 94, 86,151,154,165, 71,133, 87,175, 78,232, 92,214,175, 84,248,108, 15,205,112,181,189,245,201,150,135, 92,235, 82,
+106,106, 55,234, 79,233,215, 64, 34, 10, 29,164,136,150,224,139, 64, 46, 75,  9,116,252, 45,  2, 27, 66,143, 80,147, 93,254,146,
+ 70,164, 98,234,157,101,164,202,210,236,176, 66,111, 16,162, 52, 79,158,217,111,205, 90,250,242, 94,224, 19,238, 26,200,234, 37,
+184, 46,159,164,142, 47,205,118, 95,117,109, 12,221,189, 49,133, 60,134,215, 46,215, 58, 20,182, 92, 45,149, 60,148, 72,105,200,
+174, 37, 42, 27, 37, 10, 81, 65, 85,122,144,157,121,231,170, 43, 54, 97,159,251,178,  7,241, 30,237, 87, 63,235, 26, 67, 70,206,
+223,204, 42,119,183,144,173,232, 97,201, 18, 77, 36,160,145,196,251, 43,175, 46,148, 93,112, 18,144, 83,109,183,200, 48,157,150,
+250, 22,  0,173, 54,250,105,160, 77,217, 85,153,  9, 63, 42,186, 95,103, 60,161,  8,242,113,210,174, 59,248, 40,106, 84,200, 13,
+ 10, 25,134,224,133,230,107,147, 39, 21, 76,  9, 70,146, 27, 36, 40, 30,181,173, 53,106, 86, 54,137,227, 20, 58,215,114,153, 14,
+206,171, 92, 90,249,203,216,125,  0, 83, 72, 37,181,215,171,141,154, 75,211,163,188,163, 69,148,210,163,218,116,206,157,145,171,
+110,  6,252, 75,227, 55, 82,162,165, 45, 39,226,246, 80, 83, 82, 36, 33,237, 41, 99, 63,179, 92,158,191, 25, 76, 87,203,169,  6,
+158,208, 52,160, 66, 91, 74,139,142,195,202,108, 16,158,148,251, 71,202,119,225,229, 67,236,212,173,156, 93, 68,196,160,175, 68,
+189, 54,137, 23, 67, 90, 80,145,237,  2,135, 79, 89,137, 81, 98, 17,238,208,102,139,122,210,242,159, 85, 95,111,150,223, 70,138,
+ 64,137, 76,  9, 40,149,183, 38,188, 63,112,115,201,  6,170, 89,223,127, 29, 81,148,225, 50,234,102, 37, 67,201, 45,217,125,232,
+188,148,114, 12, 56,118,235,236,  7, 77, 43,225, 29, 19, 10,202,204, 83, 24,200,173,145, 93,140,225, 37, 73,  4,167,175,142,250,
+107, 50, 34, 20,132, 17, 76, 73,153,113,238,174,196,184,168,135, 92,  5,202,159, 13,245, 31,134, 65, 75,104, 69,185,134,224,186,
+243,194,166,156, 74,190,131, 77,  3,107, 37,181, 44,197,129, 25, 55, 69, 92,121,115,  2,165, 59,253,122, 60,166,120, 34,  8, 58,
+109,178,229,207, 65,179,252,176, 77, 89, 89,160, 81,251,116, 43,102,  8,101, 17,  4,175,146, 79,155,114, 91,136, 46,113, 20,246,
+251,119,219, 82,140,246,104,201, 16,143, 98,216,252, 89,209,163,115, 80, 83,193, 36,171,244,104, 22,100, 18, 83, 16,  0, 81,243,
+ 44, 72,  8,138, 83,107,224,215,197, 93,253,130,186, 53,115, 96,233,182,165,251, 28,  8,118, 88, 10,152,241, 10,121,102,155,245,
+212,231, 97, 60, 20,163, 16, 19,222, 45,103,106,242,194,101,172,209,134,144,  9, 81, 62,234,234,173,150,201, 45, 22,203, 21,204,
+ 55,112,114, 99, 42, 30, 67, 42,242,219,  3,161, 61,  6,128,204, 18, 91,251,153,145, 41,232,105, 71, 46, 75,162,121,111,210,163,
+ 70,174,173, 18, 66,110, 50,154,131, 97,107,229,135,197,196, 21,159,125, 43,167,218, 93, 74, 43,198,  7, 14, 70, 73, 30, 91, 64,
+ 20,182, 18,119,222,155,244,210,156, 74,114,  2,  7,106,177, 94,224,101, 47,176, 62,234,106, 81, 83,225,255,  0,209,171, 85,152,
+144,161, 40,149, 38,228, 47, 14,172,173, 68,134,144,119, 30,250,211,245,106, 22,136,144,193, 49,  5,107,181,217,114, 23, 37, 51,
+118, 74, 73, 64, 81, 41, 30,255,  0, 13, 42,118, 71, 68,138, 89,206,238,153,164,108,171,131,168, 87,146,162, 43, 74,236, 58,106,
+236, 99,  2, 10, 28,201, 10, 67, 87, 27,220,165,130,148, 41, 69,  0,  0,  7,182,154,203, 17, 27,212,181,101,178, 76,156,174,230,
+ 91, 77, 20,150,154, 21, 95, 95,  1,173, 41,152,136,160,135,116, 82,229, 58,235,123,176, 53,  9,178,106,143,128,253, 91,106, 56,
+243,142,210,149,160,190,136,152,187,223, 63,240,241, 88,233, 73,249,222,105, 72, 59,215,143, 19, 95,211, 77, 19,204,135, 30,229,
+ 29,133,144,167, 50,198, 17,120, 44,169, 91, 26, 84,125, 85,214,116,104, 44, 10,186,108,209, 31,201,114,146,206,  0,166,210,170,
+167,144, 41,247,111,169,198,151, 81, 18,117,  3, 14,157, 42,243,219,219,156,180,110,227,102,164, 15,175, 66,157,109, 96, 72, 88,
+235,197,198, 29,198,243,133, 38, 84, 38,202,148,154,  3, 65, 93,193,247,106,208,136, 72, 73, 45, 51, 14,224,187,145, 92,160, 82,
+218, 91,216, 31,111,253,  6,172,  0, 25, 41, 18,172,251, 62, 76,229,175, 24, 68, 71, 21,199,205,103,240,190,193,183,233,209,170,
+168, 21, 74,195, 39, 67,174,249,179,211,110, 86,219, 58,  9, 46, 69,108,184,189,252, 77,122,233,237,172, 69, 26,178, 85, 43,234,
+243, 37,189, 35,180, 83, 35,182, 20, 45,174,206,142, 38, 81, 43,226, 83,200,148,213,105, 52,  7,144,241, 26,244,223,166,213,  1,
+ 57,200,142, 32,177,211,248,191,220,183,250, 59,139,  1,239, 92,163, 26,238,165,184,  2,213,183, 77,245,233,209,134,233, 47, 69,
+ 57, 27, 32,235,241,249,203, 83,192, 21, 80,131,176,220,245,209,101,  6, 40,117, 93,186, 62, 10,229,244,153,107,150,223,114,109,
+247,166, 88, 14,165,183, 26,121,206, 73, 37, 73,  8,115,226, 80, 41,  5, 67,168, 32,141, 83,206, 47,  2, 21,188, 82,250,242, 95,
+ 68,253, 89,101, 82,110,158,158,226,222,108,107, 66, 67,145, 20,196,148,238, 16,243, 43,110,138, 74,131,117, 41,226,174, 42, 73,
+ 29, 55,167, 74,107,146,194,164,249,172, 85,171,174, 16,129, 61,171,147,187,127,119,149,131,225,151,108,145,153,113,219, 19,223,
+101,192,216, 62,105, 65, 67,124, 10,148,164,108, 79, 26,  3, 67,225, 95,118,181,186,223, 68,163,169,249,112,180, 22,137,125, 52,
+126, 58,118,113, 61,133,113, 25, 85,139,184,242, 65,167,247,166,226,250,150,203,215, 86,214,166,213,243, 45,  7, 22,186,240, 73,
+169, 69, 82, 41,191,128, 35,221,173, 92, 62,155,141,141, 16, 42,172, 15,102,191,128, 89,147,  2, 37, 14,202,251,151, 62,122,129,
+129,121, 49,194,195,106, 75, 37, 42,117, 13,168,138, 40, 18, 14,219,244,223,221, 77,104,198,198,228,  2,137, 61,139,205,130,251,
+103, 93,201,219,117,214, 67, 82, 82,251,128,184,219,224, 20,115,227,200,148,  5,148,240,175,176, 16, 61,213,211, 74,201, 18,225,
+ 60,102,  6,133, 87,125,233,236,205,165,155,130,110, 56,180,163,242,139, 10, 90, 25, 66,214,226, 77,106, 83,192, 44,169, 65, 52,
+240, 81,168,213,170,178, 73, 12, 80,229,  0,171,100,203,187,226, 76, 61, 26,109, 23,  8, 20,165,198,214,223, 34, 90, 66,234,165,
+ 26, 42,155,110, 13,  5, 52, 97,105,228,134,204, 23,140,179, 44,183,220, 98,176,221,144,  5,176,210, 80,180, 58,129,202,187,  4,
+144, 69,107, 78,170,  3,195,245, 30,171,228, 56,148, 59,  0, 60, 23,172, 27,189, 89,142, 47, 36, 38, 12,133, 44,185,196, 45, 15,
+ 56,162,133, 83, 96, 22,149, 29,192,216, 10, 17, 77, 80,234,125, 23, 11, 62,  6, 54,214, 59,136,  0, 17,238, 84,229, 72,151, 37,
+209, 93,186,239, 13,155, 33,186,183,121,189,197, 48,156, 40, 75, 65,198,255,  0, 21, 32,154,  2,161, 68,208, 18,125,166,131,175,
+134,254, 79,213,190,157,221,140,101, 58, 37,230, 68,106,  1, 12,124, 57,187,123,202, 12,176,149,207,103,197,241, 78,225, 91,151,
+  6, 52,216,238, 44,  2,190, 13, 60,219,138,  6,191,181, 69, 19, 83,239,215,152,223, 70, 70, 57, 50,182, 18, 29,228, 17,238,112,
+134, 98,151,114,252,178, 39,105, 27,131,131,195,119,201,185, 75, 87,204,149,  2, 65,226, 84, 17,212,127,100,107,208,189, 43,142,
+101,131,230, 31,230,252,139, 47, 72,244,139, 87, 91,255,  0,121,108,177,102,174,220,190,114,109,229,  5, 54,248, 54,201, 41, 88,
+ 53, 87,154,226,218, 80, 27, 13,190, 53,171,166,189, 15,164, 87,161, 79,214, 44, 62,116, 66,161, 45,238, 56,243,171,120,245, 65,
+ 59, 18,  5, 55,165,  7, 79, 19, 77,106, 19,170, 52,100, 54,183,106, 47,107,100,178, 20,146,121, 60,181, 37,  3,217, 94, 32,114,
+175,210, 78,156, 29, 18,136, 14, 11,104, 53,251,202,182,123, 29,  0,156,149,190, 42, 10, 66,150,146, 87,202,187,141,171,183,217,
+172,140,229,189,211, 72,  1,118,245,246, 44,145,233,162,253,112, 67,126,115,205,252,132, 68, 37, 47,161,151,120,184, 92,113,197,
+ 36, 57, 94, 97, 33,  9,170, 18,  9, 32,248,107,132,245,  4,141,120, 22, 22,226, 64,239,237,127,187,177, 97,122,206,248,237,140,
+  7, 29, 79,185, 81, 16, 68,  8,209,151,113, 67,148, 82,211,247,125,228, 83, 94, 77, 25,149,230,178,213, 47, 76,242, 69,201, 49,
+ 24, 86,210, 13, 85,191,141,107,161,202,221, 89,  2, 81, 70,172, 22,184,235,185, 37,114,126,235, 73,167,184,211, 67,144,116,162,
+  8,  8, 14,125, 97, 84,151,144,243, 95,185,125,116, 32, 31,237, 31,244,104,149,105,197, 73,148, 41,177, 90,180,200, 41,109,170,
+136,205,142, 71,111, 16, 63,215,169,151,226,155,114, 21, 19, 36,249,251,162, 90, 90, 72,109, 59,133, 83,110,181,211,194, 36,148,
+210,179,181, 48, 92,115,230,236,147, 89,183,172,143, 55,134,213,250, 53, 96,208, 83,121,168, 12,172,162, 60,136, 34, 77, 65,116,
+185,191,215,215,245,104, 70,178, 20, 60,224, 74,107,129,148, 90,110, 61,185,146,185, 44,165, 75, 36,165,  4, 15, 18,105,253, 26,
+ 13,180, 18, 93,212,227, 32, 80,171,197,186,213, 19,  1,155, 53,196,143, 51,203, 33,  3,199,238,234, 24,178, 50, 46,165, 32,171,
+206,214, 64,110,  4,180,195,121,  6,143,146,181,127,180,107,171,153, 51,113,162,140, 67, 43,  2,211,109,139, 14,242,166, 56,241,
+ 73, 53, 79, 77,197, 14,177,235,119,101, 34,156,156, 77,170, 38, 55,230, 60,  0,113, 41,169, 86,221,104, 71,244,104,115,150,227,
+224,131, 41, 23, 80, 49,117,198,155, 96,145,118,112, 14,  9,168,173, 61,244,210,147,168,204,151, 64,173,205,162,239,127,126, 98,
+ 69, 25,101, 42, 82,136,219,225,165,117,111, 24,148,162, 75,173,136, 72,188,218,102, 51,111, 79, 37, 41, 42, 74,  0,246,131, 79,
+215,162, 89, 47,140,  4, 66,233,111,  9,192,242,123,179,142, 14, 10, 72, 99,225,114,181,241,248, 78,172,202,200, 69, 56, 37,214,
+236,138,201,144, 91,236, 95, 45, 24,126, 59, 46,209, 99,220, 70,133, 27, 32, 74,125, 80, 73,216,230, 71,113,118, 60,184,234, 33,
+162,  0, 88,220,245, 58, 54,248, 20,128, 36, 39, 44, 31, 29,190, 89,239,237,177,112, 37, 80, 84,  6,254,192,119,213,121,  8,238,
+ 67,178, 37, 66,239,246, 66,171, 12,  2,204, 58,144,165,124, 60,122,238,106,118,213,184,214, 36, 64, 80, 50, 32, 42, 90,127,114,
+174,134, 92, 91, 97, 73, 10, 42, 28,146,107,215,174,175, 28, 32,  2, 81,180,149,104, 61,221, 79,242,183,111, 22, 80, 72,158,226,
+119, 30, 61, 53, 67,246,160,201, 41, 72,146,134,246,215, 63,126, 77,141, 82,229,214,133, 69,195, 90,239,212,233, 89,136, 55,132,
+198,122,169, 55,220,186,109,198,202,212,213,215,148,137,  9, 72,175,130,121, 83,245,104,194,144, 17,119,232,157, 35, 64,145,125,
+199,219,105,148,254, 27,128,  2,175,102,213, 58,205,182,192,  9,100, 65,162,120,198,109,182,108, 79, 10, 89,104, 15,159, 85,121,
+145,214,180, 26,  0,153,146, 78,171,247, 47, 18, 95,202, 20,243, 91,175,113, 79,104,  3, 86, 54,104,166, 39,162,215,113,191, 37,
+ 73, 91,142,167,138, 66,136, 88,253,  7, 83,141, 74, 41,155,  8,200, 98, 77,142,136,160,  2,144,161,199,233,213, 91, 98,197,148,
+ 93,121,207, 97,219, 98, 78, 55, 89,  8, 74,163,146, 16,118, 27, 84,255,  0,175, 82,216, 83,186,137,134, 91,225,200,154,244, 38,
+ 80,146,226,135,152,131, 74,251,244,198,178, 20,244, 68,174,150,  6, 27,182,159, 33, 32, 60,237, 82,178,  7, 77, 51, 30,  9,152,
+ 37,113, 13,120,250,218,113, 96, 41,  5,101, 36, 30,149, 42,210,216,145,138, 36, 30,144,110,  5, 94, 80,160, 72,114,158,227, 95,
+244,104,111,162,139, 42,114,221, 37,203,238, 72,194, 83, 80, 22, 40, 72,254,238,186, 31, 36, 70, 58,170, 59,137,  1, 63, 42,195,
+ 54, 69,181,203, 60,138,169,130,161,199,232,214,101,151,  0, 88, 43,245, 82, 89, 59,118,123, 25, 98,215, 99,157,109,150,154, 33,
+ 96,138, 43,198,163, 84,109,183,113,112,167, 26,245, 79, 88, 38, 37,107,139,137, 46, 28,148, 10,149, 26, 84,120, 84,143,233,210,
+149,146, 68,140,  0, 74, 93,195,193,237,177,228,166, 84, 84,132,199,  9,240,218,189,116,133,242,100,251, 65, 40, 13,234,  0, 74,
+173,145, 15,221,165, 65,254,206,218,181, 86, 73,  3,193, 52,234, 14,183, 79,198,173,240,175,  2,232,208,252, 87, 82, 27, 26,108,
+156,195, 56,232,148,105,  0,164,191, 84, 61,188,178,228, 93,177,149,100,147, 33,200,197,198,148,235,110,199,228,178, 93, 79,198,
+  7,150,144,121, 84,128, 79, 78,149,174,187, 79, 64,117,139,113,179, 35,  0,  6,201, 22,147,191,  2, 27,139,176,237,252,149,186,
+108,242,164,  8, 92, 16,214, 61, 53,169,138,134,235,110,  9,  8, 87,  5,  0,154, 17, 77,183, 73,233,175,163,227,140, 14,160,174,
+146, 29, 72,202, 41,130,211,218,220,198,247, 33, 44, 91,224, 63, 33,178, 43,201, 13, 44,168, 14,189, 18, 43,183,186,186, 29,241,
+ 17, 10,214, 53,196,151, 11,161,253, 53,246,251, 35,199,153,114, 98,237,242,221,122, 58,144,239, 40,136, 90,164,182,148,237,205,
+  8, 69, 92,174,221, 66, 78,222, 26,192,202,176,153, 50,233,168, 48, 21,187,177, 86, 71,127,253, 64, 91,114, 75,  3, 56,  5,190,
+100,241,108,141, 73, 82,143,  4,177, 71,  0, 53, 71,  5,167,204, 74,201,221, 84, 66,106,116,248,248,123, 37,187,154,192,203,204,
+243,  6,213,206, 25, 62,107, 38,254,219,168,132, 30,136,132,133, 37,106,153, 32,185,205, 41,173, 62,  6,155,170, 65,254,246,181,
+106,165,203,149,129,118, 67,104, 18,101,218,101,253,229,162, 68,194,164, 67, 66,146,227, 74, 87, 53, 36,131,247,130,121, 29,171,
+212, 29, 93,133, 65,150,116,237, 46,152,237, 55, 81,114,181,162, 81,121, 46, 60,214,201, 91,206,135, 28, 27, 80,208,148,  3, 79,
+113, 58,  9,164, 58,113, 97, 80,231,223,203,137, 15, 49, 33, 65,228, 20,182,243,133, 11, 20,226, 62, 26, 18,  0,240,209, 99, 80,
+ 81, 54, 39,142,207, 95,162,221,231, 42,220,250,188,201,193,  1,182,212, 20, 57, 30, 68, 55, 68,146, 64,162, 71, 77,  6,200, 54,
+168,181, 77,210,215,122, 49,111,228,179,110,152,187,207, 45,198, 82,234, 20,177, 68,128,177, 66,180, 16,  8,235,241, 26,239,227,
+165, 76,212,172, 28,149, 64, 49, 11,245,154,228,171, 57, 74,215, 21, 91,149,  0,160, 74,200,169, 78,227,168,  4,138,106,208,177,
+  3,105, 26, 45,234,199, 28,110,226,155,106,199, 21,157,157, 60,146,158, 28,182,  9, 62,102,195,235,211,139, 10,111, 45, 88,118,
+216,119,235, 53,169,  6,204,182,150,194, 20, 86, 22,132,182,149,171,144,  0, 32,114, 82,185, 36, 83,197, 26, 25,176, 58, 52, 70,
+139, 94, 23,146,101, 81,114, 17, 63, 25, 97,216,153, 31, 18, 67,144, 29,109,161, 67,177, 42,105, 52,228,107,239,  3, 80,190,154,
+178, 33,182,216,137, 14,240,232,114,168, 30, 72,159,115, 59,177,146,223, 50,155, 92,188,201,106, 55,168,136, 68, 68, 62, 91, 82,
+  3,220, 87,205, 60,184,169, 98,190,  4,130, 53,146,122,  5, 56,216,230, 52,  6,139,146,218, 54,164,147,248,173,126,145,159,228,
+ 89, 24, 30, 31,197, 93, 88,124,213,220,241,139,147, 16,148,  0, 48, 66,222,124,144,132,178,148,138,169, 41, 53,253,162,106, 78,
+155,165, 85,240,151, 90, 93, 94,207,235,130, 15, 32,170, 75, 36,201, 13,  7,192,  9, 92,102,212, 28, 21,219,110,116,173,  9,241,
+165,  6,173, 69,209,  4,128, 26,113, 70, 45,178, 92,184,  5,203,113,207, 41,166,194, 82,223,130, 81,182,202, 53,241,161,160,212,
+228,  9, 14,137, 93,162,178, 34, 53,237, 87, 39,166,116, 71,159,126,110, 45,172, 46, 83,109, 58,134,252,228,  2, 66,156, 38,128,
+ 36,117, 38,167,111,209,172,108,154,223, 78, 43,160,199,188,199, 83,162,234,142,250,102,179,152,198, 96,246,162,198,243,114, 33,
+148,137, 55,165,178,220,103,129,184, 21, 87,224,125, 60,156, 79,  4, 81,178,  2,130, 77, 42, 69,117,228,126,179,234,162,100, 99,
+194, 64,198, 39, 86,110, 62, 60, 87,155,245,188,179,147,121, 35,130,166,228,219, 47, 44,199,114,156,144,210, 10, 80, 18,161, 78,
+158, 58,225,231,116, 34,177,132,  9, 11,202, 49,233,110, 95, 35, 44,172,143, 48,164,  2, 60, 14,170, 78,224, 82,140, 19, 85,226,
+204,237,161,196,192,117, 92, 36, 43,170,188,119, 26,  7,156, 81,  4,  2,135,124,118, 44,118,163,193,121, 92,159, 73,248,125,253,
+116,171,188,186,127, 40, 45, 22,232, 76, 75,146,252,121, 66,175, 61, 64, 71,187, 79, 60,130,116, 10, 63,183,209,101,203,182, 81,
+ 93,182, 25, 54,202,  7,218, 60,151, 78,180,241,209,106,200,218,135, 60,103, 72, 25, 86,  7,116,187, 94,219,187, 54,178, 89, 80,
+  8,167,179,254,149,214,135,250,136, 32,168,126,213,150,219,159,111,223,128,227,112,119,  8,224, 86,125,228,141, 12,228,104,232,
+ 39, 27, 84,110,211,139,200,180,217,216,128,106,168,178,  8, 82,135,178,134,186, 17,200,220, 17,124,157,165,126, 95,218,106,100,
+ 68,219, 93,170, 35, 41,105, 65, 73,232, 64,235,182,154,175,128,104,150,199, 58,161,115,227, 91,172, 87, 52,184,216,  9,  9, 72,
+ 32,255,  0,119, 82, 36,201, 70,205, 20, 43, 94, 81, 38,237,125,117,244,254,237,  2,136, 62, 26,140,233, 16, 14, 80, 98, 73, 42,
+ 79,115,178,249,240,177,120,241, 98,146, 93,124,248,117, 53,213,108, 10, 55,146, 74, 86, 22, 94, 49,172,233,246,123, 97, 58, 27,
+ 64,170, 67, 71,226,250,119, 63,211,171,211,198, 26,  4, 25, 79, 84,115,183,211, 31,147,133, 23, 18,209,249,217,202,242,138,252,
+104,118,210,156,  5, 72,245,141, 17, 44, 22, 36,156, 94,242,228,121, 20, 80, 79, 45,143, 77,197,107,170, 54,203, 87, 71, 21,167,
+204, 10,116, 88,208,101,121,233, 72,126, 66,213,184, 27,237,176,213, 57,185, 41,205,101, 47, 92, 96,139,237,213,216,204,167,225,
+ 82,137, 32,123,180,183, 24,135, 72, 86, 81,155,119,111, 91, 45, 71, 97,180, 15, 57, 91,145, 79,163, 74,171, 73,213, 48,129, 83,
+220,180,197,135,118,106, 11,212,249,128,133, 41, 64,251,180, 83, 39, 75,105, 85,254,121,143, 91,110, 51,147,252,197,  1,109,135,
+ 56,164, 30,149, 39,109, 88,141,178, 18,209, 71,106, 66,185,246,142,195, 31, 41, 55, 87, 18,146, 18, 63,  9, 30,253,107,126,240,
+178,136,136, 69, 91,237,125,166,231,106,114,229, 50,139,134, 15, 26, 30,128,245,166,170,207, 32,130,164, 34, 22,182, 48,251, 53,
+190,206,166,216,  1, 12, 10,128,  7,141,116,142, 73,220,155,203,  5,  7,185,198,132,184,241,173,204,236,134,213,205, 53,246,214,
+163, 79, 27,228,120,164, 43,213, 91,120, 43, 45,219,240,212, 46, 77, 42,173,211, 95,160, 29,101, 93, 18, 45,117, 46, 40, 60,236,
+173,147, 33,216,124,255,  0,  9, 64,212,123,250, 87, 87, 43,173,148,118,175, 61,191,194,164, 95, 39, 59,121,  7,240, 80, 84,164,
+251,197, 53,  9,204,196,164,129,101,205,197,110,236,182,212, 66, 91,113,101,  4,123,198,218, 52, 37, 34, 17, 97, 16, 87,238, 36,
+226,109,151, 37, 41,181,127, 10,149,  4,159, 96, 36, 17,168, 90, 29,138,129,142,169,159, 41,109,139,237,157,232,104, 80, 60,207,
+ 48,107,211,106,232,209,147,  4,194, 11,243,  6,110, 61,158,224,137,202, 85, 80,144, 26, 62, 58,148, 62, 32,156,  7, 68,111,207,
+205,182, 73,118, 42,197, 89, 90,188,214,143,182,187,106, 70, 17, 36, 40,149, 89,102,153, 44,200,239,182,218,  1, 40, 76,132,115,
+167,176,171,125, 18,117,197,146,  4,171, 45, 66, 55, 36,206,219,129,128,167, 72,254,208, 41,166,178, 20,119,104,171, 60, 39, 27,
+105,171,250,228, 74,103,203, 67, 42,224,216,161,233,211, 90,211,201,209, 76,212, 19,107,225, 49,178,102,227,160,255,  0, 15, 84,
+144,  7,176,235, 46,113, 36,186,176, 44, 96,201,138,225,124,102,219,118, 85,189,  0, 36,134,195,155,120,232,120,213,153,161,217,
+ 61, 81,198,115, 38, 23,101,141, 38, 50,197, 43,193, 64,120,158,159,209,163,206, 59,100,201,226, 73,  8, 93,218,246,139,162, 29,
+ 74,212, 20,134,234, 69, 60, 52, 19, 23, 68, 35, 68, 14,232,243,115,226,183, 57,161,180, 97,192, 29, 56,208, 50,158,140,165,187,
+ 33,183,152,101,199, 55,229, 64,157,189,189, 52, 21, 48, 66,211,147,121, 14, 56,150, 93,169, 82,  0, 74,210,  9, 27, 31,160,215,
+ 69,162,217, 87, 45,195,138,112,197, 80,157,251,244,150,235, 63, 51,220, 30,220, 72,144,171,217,252, 85, 68, 33,151, 80,186,212,
+148,165, 10, 77,106,126,147,175,110,244,143,212, 81,165, 25,  0, 55, 34, 63, 53, 98,191,135,130, 87,244,251,234,102,217,129,102,
+236, 98,189,194,199, 82,153,173,150,210,250, 94, 74,152,146, 84, 13,  1,  9, 65, 28,171,224, 55,215,168,100, 84, 50,161,186,185,
+184, 62, 11,160,193,207,140, 15,196, 23, 96,247,155,214, 94, 13,143,118,105,201,125,186,132,252, 91,252,150, 82,134,248, 63,229,
+ 42, 59,171, 65,163,128, 56,216, 93,  1, 21, 62,223,110,176,232,233,114, 19,121, 45,108,174,171, 25, 71,225, 95, 61,178,188,179,
+ 44,202, 47,207,190,212,246,213, 50, 81,114, 93,205,247, 75, 78,  5, 40,142,101, 68, 52, 84,175, 48,154,159,  3,174,134, 49,137,
+ 92,197,150, 21, 14,208,197,237,114, 87, 22,  4,180,195,183,121,137,229, 33,212,186,154,182,164,141,184,146, 16, 15, 65,190,143,
+ 29, 21, 41,241, 76,177, 49,108, 94, 57,117, 78, 60,143,230,139,226,176, 67,136, 14, 56,179,224,164,113, 85, 54,175,179,233,212,
+101, 97,  9,180, 40,109,217,219, 69,160,150,221,248, 94,111,241, 24, 44,180,177,211,115,205, 60, 73, 59,120,214,154,136,176,168,
+146, 16,116,183,252,246, 89,139,110, 82,158,101,105,171,143, 52,219,137, 72, 42,241,  9, 88, 10,229,169,249,189,168, 64, 57, 93,
+ 23,233,187,211,124,139,108, 35,151, 93, 88, 76, 88,204,121, 74, 75, 79,209,165,186,207, 34,165,175,115,200,141,136,175,178,190,
+202,235, 59, 39, 60, 56, 11, 75, 31, 20,170, 59,212,151,112,161,220,243,185,247, 27,120, 66, 22,243,252,208,145,247, 19,197, 97,
+ 41, 41,  6,187,  4,164,109,171,244, 65,160,171,219, 55,146, 19,113,202, 33, 93, 88,136,234, 79, 55, 35,165,182,155, 91,102,129,
+213,114, 43,243, 20, 18, 41,202,139,160,250, 43,227,169, 68, 40,202, 97, 17, 98, 38, 59,111,120, 73,152,133, 25, 73,162,252,197,
+172, 44,112, 29, 70,251,113,175,133, 55,212,228,234, 34, 65, 16,191,247, 34,222,109, 14, 88,237, 37,182,152,  5, 38, 68,132,169,
+199, 22,162,234,232,148,  2,176, 64, 28,169,176,160,210,174,135, 46,161,102, 78,212,177, 96,115,231,174,239, 79,121,231, 68,120,
+252,154, 83,229,104,142,210,202,  9, 85, 10,148, 66,149,211,194,160, 83, 70,149, 69,  2, 25, 40,141,231, 60,139,121,129, 38, 44,
+104,145,230, 70, 74,  1,  5,106, 83,156, 55,218,170,124,241, 81,  7,112, 64, 52,212,170,139,104,121,163,249,175,170, 98,237,223,
+113,209,255,  0,135, 55,196,161, 72, 85,217, 49,214,148, 64, 75,116, 82, 16,131,183, 22,197,106,107,226,118, 29, 72,211, 28, 47,
+ 41,246,240, 42,228, 51, 13,146,  4,242,209, 32,218,123,131, 42,115, 10,109,  6,143,127,237, 43,229, 82, 18,  9, 60, 42,126,195,
+191,134,171,138, 73, 28, 22,151,157, 16,123, 83, 85,146,237, 35, 49,151, 26,207,143, 52, 95,100, 16,216, 75, 97, 92, 66,137,216,
+154,237,183,215,168, 89,  0,  2, 61, 51,109, 79, 53,220,158,145,113, 88,189,148,198, 25,205,242, 48,129,127, 45,151, 45, 81, 84,
+194,220,242, 86,107,252, 75,161,189,194,252, 16, 15, 78,180,173, 41,200,117,254,187, 71, 78,131,203,231, 60,  3, 63,181,  7, 59,
+168,233,182, 39,218,153, 31,188,204,191, 78, 55, 41,191,141,113,125,222,106, 81,  9, 78,213,167, 68,132,254,173,124,233,155,153,
+ 44,139,140,201,117,129, 57, 58,211,157, 24,145,173,143,200,101, 28,120,129, 81,253,173,101,137, 25,204,170,243,147,  4,161,137,
+ 92, 92,185,228,176,154, 88, 37, 10,226,174,157, 40,117,110,117,  0, 21, 67, 50,153,251,174,235,238,100, 12, 73,108,252, 41, 77,
+ 22, 62,132,106, 94, 72, 33, 48,153,116,141,122, 85,210, 83,176,164,178,146,165,169,101, 59,125, 58,170,  3, 20,104,204,186, 58,
+226,151, 14, 84, 71, 80,  9,154,126, 23, 52,204,136, 36, 81, 11,102, 72, 90,185, 63,  9, 68,132,185, 81,238,209,197, 97,212,183,
+148, 55, 31,150,204,229,204,183, 42,138,122, 58,138,146,  7,211,254,173, 52,226,201,141,139,213,152,200,203,178, 33,106, 80,252,
+ 85, 37, 73, 36,143,186,  6,250, 41, 31, 10,136,154,201,207,139,100,150,236,203,251,236,146,  9, 62, 20, 86,245,208,246,169,198,
+ 97,104,187, 88, 29,145,112, 76,132, 30, 81, 80,144,225, 35,165,104, 52,109,237,162, 26, 81,201,226, 73,154,243,142,161,  4,176,
+154,163,149, 58,106, 66,196,  9,135, 43,222, 41,136,162, 51,106,156,107,193,193,196, 15,110,250,161,153,150, 72,100, 90,234,230,
+ 83,165,231,  3,182,171, 27,102,116,230,194,159, 41,226,192,235,198,191,234,209,177,175, 53,196, 40,249, 78, 84,107, 47,110,108,
+246, 14,223, 73, 15,128,185,210,221,169,  7,173,  9,233,171, 51,203, 50, 82, 24,224, 20, 86,207, 18,221,143, 90, 35,169,105,  8,
+132,200, 43, 53,233,207,168,208,103, 97,154, 32,128,  5, 40, 72,205,210,185,210, 93, 86,238,184,162, 16,125,131,167,234,211,138,
+157, 66,114, 79, 56, 67,223, 59, 21,183,214,104,211, 77, 23,151,244,145, 81,161,202,164,254,102,137,135, 19,179,197,110, 43,215,
+ 73, 20, 15,186,190, 45, 15,113, 35,125, 82,176,238,208, 40, 25,128,136,219,111,241,160,101, 18, 22,234,135,203, 69,104,108,125,
+180,174,136, 70,208,164, 10,175,242, 12,205, 79,100,143,222,249,124, 38,173,182,  7,191,109, 88,170, 26, 58,107, 11,  4, 26,244,
+185,119,102, 35,188,210,170,242, 94, 10, 80,246,167,115,171, 52,176, 37,208,200,126, 10, 30, 97,111,150,139,188, 55, 98,142, 97,
+227, 66,  7,133,116, 99, 56,149,  2, 25,120,152,205,206,211,132, 92, 44, 41, 36,207, 75,222, 98, 71,137,  7, 69,  6, 37,144,136,
+ 40, 19, 49,239, 47, 72,102, 52,160, 67, 42,220,143,175, 76, 98, 29, 16, 58,133,123,182, 76,183, 54,185, 37, 39,201,109, 99,130,
+135,141, 14,167,183, 68,238,156,163,101, 78,205,197, 24,136,215,194,176,154, 10,125, 20,208,103, 72, 37,211, 18,202,190,200,110,
+147,237,178,100, 56,242, 84, 10,135,193,244,147,171, 53, 86, 20, 12,203, 43,159,181, 87, 73, 16, 49,136,145,194, 74, 95,125,174,
+ 84, 62, 53,  3, 84,111,135,196,134,102, 89, 83,189,204,188, 92, 78,106,155,122, 82, 79,150,249, 82,168, 61,164,127,167, 87,233,
+175, 69, 40,204,162,214, 84, 75,101,215, 96,187, 95, 49,215, 80,226, 79,246, 70,231, 66,156, 67, 41,130, 93, 18,141,115,185, 57,
+243,  9, 96, 19, 20,114, 72, 95,190,157, 52,251,  3, 50,144, 37, 67,199,110,215,153,178,154,181, 50, 21,230,149,239, 95,236,157,
+ 40,196,  4,209, 37, 58, 93,242, 39, 47,183,104,118,226, 40,166, 27,  9, 81, 61, 74,147,170,147,150,210,164, 18,182, 89,102, 97,
+167, 20,183,199,192,181,164,215,251, 85,  3, 68,140,204,194,103, 77,  5,226,111, 98,197,189, 68, 18, 15,210, 80, 20, 63, 86,151,
+145,201, 13,123,188,219, 99,201, 92,151,160,163,136, 69, 20,  8, 26,204,172, 21,162, 67,132, 24, 68,184,185,152,161, 46,213, 72,
+ 44,130,159,164,127,244,235, 70, 36, 72, 50,166, 67, 45, 25,149,235,201,186,198,186,168, 41, 33,228, 42, 58,182,216, 45, 58,142,
+ 20, 90, 68, 21, 27, 11,128,161,196,201, 23,111,197,144,219,234,163,190, 97,216,251,207,191, 74,248,188,244, 68,140,246,169, 22,
+236,148, 35, 18,157, 49,197,126, 47,153,196, 26,244,  7, 82,242, 24,  4,241,155,175,113,223,148,213,134, 52,119,149, 79,153, 95,
+153, 90,254,205,107,161, 74,181, 35,102,136,188,107,135,157,193,212, 10,199,102,148,246, 84,109,170,222, 91,148,222, 98,139, 50,
+236,221,194,236,153,149,  4, 57, 68,172,120, 87,174,136,106,209, 78, 54,178, 49,  6,242,212,124,157, 22,201,  4,112, 80, 10, 74,
+ 79,141, 55,219, 80,148,  8, 70, 23,  5, 79,122,225,237, 54, 31, 53,230,123,149, 98,137, 37,155,234,214,212, 87,166, 48,220,132,
+ 86,134,156, 11,143,  4, 54,145, 77,128, 73, 39,216, 60, 71,178,125, 51,234,121,  6,195, 76,166,240,  1,192,248,127, 45,126,228,
+122,239,213,146, 38, 82,152,142, 96,172,219, 32,221,211, 33,128,  4,110, 11, 64, 74,249,113,  0,132,186,167, 28,113, 74,223,170,
+146, 40, 58, 84,235,215, 76,137,151,  5,171, 18, 54,165,188,115,183, 86,166, 33,190,212,177,231, 78, 82, 66, 20,219,165,107,220,
+124, 68,142, 42, 64,241, 59,145, 95, 96,246, 20,241, 85,228,154, 59, 79,217,233, 93,200,200,153,237,220,117, 46, 92,247, 22,137,
+ 83, 29,217, 44,197,101, 79,  2,149, 41, 69, 60,170,118,232,127, 78,129,145,144, 42,137,145,209, 14,186, 13,178, 97,197, 89,125,
+204,238,215,162,143, 79,247,129,219, 28, 58,201, 39,185, 29,233,140,133, 42, 77,171, 26, 64, 83, 17, 31,105, 94, 83,136,126, 65,
+ 95,148,223, 21,144, 23,196, 45,105, 38,138,  0,144, 15, 55, 60,219,110, 46, 52,143,105, 93, 93, 61, 51, 31, 28, 53,174,102,121,
+ 14, 41, 34,127,106, 61, 71,122,149,192,207,119, 59,109,217, 27, 85,207, 10, 89, 91, 11, 93,131, 54,132,187,131, 14, 52, 65, 91,
+ 46, 53, 58, 52,100, 37,196,215,116, 41, 96,253,186,140,122,196,106,150,217, 75, 94,240,179,172,197,133,129,196,  8, 31,241,  7,
+247, 16,168,188, 55,185,110,246,179,184,238, 97,121,118, 51, 42,195,147,197, 83,110,203,177,101,241, 12, 41,205,182,181,249,105,
+144,149, 18, 82,243,100,138,115,108,241,250,122,235, 90, 25, 49,186, 47, 18,168,156,113, 29, 98,253,224,232, 71,241, 93, 11,221,
+ 31, 84,152, 15,109,123,111, 50,238,250,208,237,230,228,202,237,232,102, 50,197, 82, 22,128,144,144, 28, 42, 52,  9,220,236,145,
+ 79,168,105,168,195,157,147,213, 18,204,152,194, 58, 46, 16,191,119, 50,110,109,148, 57,144, 60,178,166, 95,112,172, 54,221, 56,
+182,223, 34,174, 32, 36,  1,176,160,215, 72, 43,218, 25, 96, 27, 92,186,219,110,204, 46, 49, 50, 38, 33,201, 10,105,150,221,109,
+148,114,253,170, 30, 32,208,109, 64,145,166,218,145,155, 43, 35,186, 55,246,173,248,148,124,142,206,201, 44,173,142, 46,202,108,
+ 84,166,169,  4,  4,143,235, 10, 18, 73,233, 95,177, 66, 42, 54, 77,152,170, 94, 78,125, 54,252, 27, 93,180,169,199,144, 60,198,
+221,104, 26,252, 35,226, 88,165,122, 31, 17,163, 87,161, 85,231, 39, 71, 45,185,101,198, 53,193,153, 23, 40,200, 90, 16, 18,151,
+  8,117, 77,  6,214, 71, 21,  5, 22,182, 73,166,195,150,250, 58,174, 74,127,129,151,220,219,182,201,138,218, 27,101, 97, 42, 64,
+137, 40,169,228, 58,210,252, 67,139, 32,164,251, 15, 29, 12,192, 34, 70,194,132,225,147,215,111,186, 34, 67,124, 86,235, 74, 10,
+ 83, 65,124,131,136, 38,165,165, 43,159,  5, 37, 67,110, 38,186,177, 92,219, 66,137, 11, 72, 46,175,204, 15,183, 93,139,153,  5,
+171,244, 21, 58,228,185,132, 60,228, 55,144, 94, 91,110, 44,241, 41, 80, 77, 17, 65, 77,128, 20, 30,205, 81,183,120, 37,184, 45,
+ 72,229,196, 55,106,185,123, 91,140,227,118, 11,131, 87,152, 54,196,162,209, 12,164, 54, 22,195,117, 83,132,212,249,156,141,104,
+105,224,154,123,107,174, 35,212,158,164,175,166,192,185,121,145,160, 68,191, 60,136,171, 86,255,  0,220, 57,121, 89, 76,251,146,
+144,150, 99,169, 45, 52,219, 96, 32,  1, 90,211,225,160, 63,102,190,122,235, 93, 90,236,235, 65,176,147,247,170, 39, 36,148, 86,
+235,114, 78, 61,110,143, 62,180,145, 34,139,  4,248,  0,157, 99, 87,163,133,  8,218,232, 30, 73,148, 42,225,142,165,181,174,174,
+200, 95, 65,227,184, 26,175, 94,147, 42, 50,150,228,103,183, 86,184, 34,106, 28,113, 32, 45,182,146,162,175, 97,235,163, 74, 69,
+ 32, 66,153,220,233, 17,221,186, 48,211, 10, 28, 30, 79,196,175,102,135,143,113, 32,167,248, 89,  9,105,219,101,189, 49, 99, 26,
+121,168, 93, 83, 90, 86,149,211,234, 67,165,188,  5, 19, 34,151, 17, 16, 93,184,199, 88,230,194,185,245,247, 29, 24,  7,  9,163,
+ 32,135,192,158,137,141,155,130,  8,  4, 54,167, 73,250,191,213,162, 10,200, 42, 70,206, 74, 71,110,217,142,155,192,186, 83,147,
+111,165,194,175,126,158,196, 57,  7, 76, 24, 21,145,111, 94,100,100,241,126, 22, 24,119,227,227,236,161,  4,126,157, 79,112, 17,
+100, 55, 64,187,149, 45,135, 50,105, 51,161,236,133, 40,165, 63,237,117,208,145,107, 29,169,183, 18, 98, 36,140, 80,249,233,171,
+206,160, 54, 20,127,172,122,104, 18, 58,163,237,  5, 15,200,236,118,187, 68, 85, 88,222, 74, 76,151, 80, 20, 78,219, 26,106, 17,
+145, 67, 49, 65, 23, 29,136,150, 72,108,160,254, 58, 30,242,214,125,213,235,166,242,220,185, 86,  8,  0, 35, 63,205, 89,153,107,
+126,223, 94, 66, 58,128, 30,225, 65,163,  8, 32,146,  0, 64,231,220,230, 75,142,210, 91,168,101,167, 56,113,246,154,237,254,157,
+ 24, 86,193, 71,115,168,189,200,187, 45, 48, 90,180,180,170,  6, 80, 22,224, 29, 74,136,211,152,136,186, 24,147,149, 86, 64,188,
+201,185,228,191,202,227, 10,172, 16,143,168,157,245,126,184,124, 14,133, 62, 37, 95, 56,251,236,219, 49,  5,199, 64,163,239,173,
+ 12,  5,127,100,  1, 93, 84,200,210, 42, 60, 81, 43,214, 64,213,154, 48, 90,149,248, 77, 34,169,  3,250,196,106,181,116,104,253,
+168, 70,101,210, 83,185,111,159,  1,217, 74,112,252,219,202, 37, 64, 31,217,212,103, 91,201,149,136,203, 68,159, 43, 34, 84,251,
+203, 48,153, 63,135, 90,171,232, 27,235, 90, 20,180, 80,229, 55, 40,237,178,243,228,171,229,  1,  6, 82,149, 81,238, 77, 53, 94,
+234,152, 58, 85,216,153, 45,247,  8, 47, 92,225,  9, 52, 86,252, 77,124,  8,255,  0, 94,170,236, 36, 34,111, 82, 27, 68, 37,222,
+ 31,184, 62,223, 38,  2,168, 82, 71, 90, 10,141, 41, 56,100,196,232,162,101,130,214,202, 33, 94,225,129,197,229,148, 41, 61,  8,
+166,218, 35,151, 68,143,  4, 62,250,237,166,229, 21,171, 52,112, 15, 26,188,226,136,240, 34,191,175, 71, 23, 48, 81, 17, 66,177,
+132,195,114, 35,150,183,  8,  4, 57,248,106, 39,160,  6,186, 47,152,218,166,219,201, 19,202,108,150, 91,163,177, 24,117,170,200,
+ 31, 18,168, 54,162,124,127, 70,163, 43,187, 20,188,176,139,193,201, 45,140,203, 12,180, 66, 92,134,208, 75, 65, 62, 39,166,171,
+137,147, 36,165, 86,136,124,172, 82,207,119,156,230, 65, 53,  0, 60, 18, 72, 39,196,145, 93, 26, 89,  6, 37, 12,197,150,140,118,
+ 20, 43,189,194, 83,241,192, 63, 35, 29, 85,167,183,125, 57,158,137, 73,111, 77,157,136,214,  6, 99,162,137,113,247,133, 85,244,
+157, 11,204, 58,148,162, 59, 84,102,226,198,176,102, 77, 37, 27, 44, 40, 54,170, 83,170,182,212, 68,204,131,164,203, 47, 79, 71,
+182,103, 38, 58, 77,  3, 99,154,143,188,138,233,228,116, 72,112, 90,114,197,183,118,185,219,161,116,106, 67,168, 82,191,235,  3,
+162,213, 45,169,132, 29, 31, 75, 44,127,156, 87,119,175,240,254, 98, 45,181,219,254,237, 67, 68,243,121,168,237,228,137,219, 90,
+110, 69,178, 67,108,145,243,  8, 85, 40,105,189,124, 53,142, 74,210,218,188,217,225, 71, 50, 37, 93, 37, 80, 62,192, 13,239, 77,
+143,179, 82,140,200,213, 14,113,  5, 47,247,  2, 36,  7,173,255,  0, 39, 65, 84,185,231, 36,248,133, 31,102,167, 92,200,147,164,
+ 40,  4, 36, 44,174, 43,239, 33,168,145,119, 90,143, 58, 15,  0, 55,213,234, 38,250,149, 94,250,214,204, 86,203, 54,247,140,220,
+ 45,138, 37, 42, 43, 10, 73,247,167,255,  0,163, 86,229, 33, 19,170,140, 99,162,105, 77,177,249,137,139,104, 86,207,178,205, 83,
+244,210,154,  5,210,  3, 85, 22, 68, 49,187, 76,150,138,172,215,  4, 16, 93,170, 78,222,250,  3,160, 68,129,170,144,172,160,247,
+235, 36,252, 86,234,211, 18, 18,124,133,172,148,168,251, 58,141, 18, 50, 18, 42, 70, 12, 20, 94,229,100, 44, 98,119,219, 62, 95,
+ 45,208,205,171,128, 47, 56, 73,167, 20,129, 93,128, 36,154,120,  1, 93,104, 99, 96,203, 34, 66, 48,137,148,137, 96,  7, 51,249,
+ 32, 18,120,  5, 89,247, 55, 55,190,119,154,252,111,236,182,235, 56,108, 37, 31,229, 81, 29, 41, 65, 10, 90,  2, 84,243,129, 71,
+136, 91,148,160, 31,120, 13,190,245,117,239,190,152,244,212, 58, 69, 44,117,178, 95, 49,252,135,114,217,196,199,218, 28,241, 94,
+109,157,164,187,202,182, 68,137, 54, 48, 10,152,181, 41, 84,120,  7, 74,212, 41,201,192, 40, 18, 19, 80, 79, 77,181,210, 74,206,
+ 37,105, 70,  4,128, 22,235,247, 96,114,204,125,232,246,120,149, 92, 71, 72,113,167,219,114, 43,172,190,154,208, 26,161,103,127,
+167,125, 66, 25, 49,144,117, 41,227,144,152, 59,178,140,155,211, 55,164,140,165,252, 89, 50, 99,119,123, 45,121,139, 36, 41,212,
+113,135,227,198,  9, 66, 74,154,147,199,144, 41, 14, 45, 65,104, 63,  9,  0,138, 83, 88,153,247,249,146,  3,147,173,190,147,143,
+183,116,184, 24,135,252,191, 55, 92,249,150, 71,239,159,167,107,102, 43,219,127, 69,214,134,151,110,190, 64,110,118,103,220,137,
+ 81,226,202,254,105, 53,199,  7,155, 29,249, 82,249,183, 18, 43, 28, 18, 82,208, 41,216,215,226, 81, 82,149, 80,221, 89,  7,119,
+ 46, 74,190, 77,121, 53,204, 10, 70,135, 83, 46,247,231,220, 63, 53,246, 67,242,185,244,105,221,142,201,224,253,194,190,247,214,
+212,213,141,204,134, 92, 24,214,251, 19, 75, 97,214,193,182, 48,227,111,207, 73,142,183, 91,227, 33,199,104,130, 20, 73, 74,  1,
+232, 70,179, 51,250,124,252,157,243,208,131,162,161,155,213, 99,101,209, 21,123, 87, 37,126,118, 61,134,192,178,126,213,221, 47,
+ 41, 97,166,243, 44,105,185, 23,251, 28,244,128, 30,101,216,109, 42, 67,140,133, 36,138,182,243,105, 40, 82, 79,194, 73, 10, 34,
+169, 20, 93, 32,201,149,239, 48,110,  4,246,133,241,251,188,153,157,223,228, 27,179,  2,227,241, 89, 89, 83,143,168, 18,165, 84,
+ 81, 94,222, 59,147, 81,227,227,190,189, 27,167,135,139,174,111, 59,225, 36,  4,173,133,100, 81,146,164,176,232,  0,211,141,119,
+  7,226,216,244,246,141,104, 77,102, 87, 32,155,162,201,141,117, 71,206,202,119,132,160,164,148, 84,142, 66,130,131,199,250,163,
+199, 67,  8,178, 42,220,236,143,112,177,233,246, 59,158,  3,144, 15,155, 19,152,226,174, 72, 75,156, 18, 27,226,146,147,213, 37,
+ 33, 53,168,223,233,208,236,129,119, 10,  2, 79,162,161, 47,114,226,195,187,220,225,246,242,220,253,214,205, 13, 14, 57,231,199,
+109, 68, 68, 75,138, 28, 93, 83,159, 15, 20,149,158,  6,187, 84,145, 90,212,106,169,201,218, 81,191,100, 76, 93, 77,145,220, 89,
+ 88,223,149,117,189,219,164,193,109,198, 16, 46,141,206,105,213, 68,228,177,177, 83,169,  5,170, 42,129, 73, 80, 62, 62,221, 89,
+142,104,224, 85, 51,143, 33,201, 49, 90,187,181, 18,253, 38, 44, 91, 36,166,121, 44, 37, 15,180,226, 93, 42, 73, 41,173, 40,121,
+124, 42, 78,227, 98, 43,211,221,106,187, 68,248, 33,202,  6, 39, 84,235, 14,235, 98,182,135,  2,219,109,219,146, 82,159,154, 67,
+ 64, 22,195, 78, 14, 68,164, 41, 72, 38,158,193, 66, 61,157, 52, 70, 72, 73, 92, 62,142, 21,142,231,119, 71,240,155,123,143,177,
+ 42, 58,140,176,203,143, 41,178,164,172, 84,128,186,252, 67,106,143,175,174,178,189, 67,212, 63,101,133, 59,128,115, 22,238,226,
+ 81,234, 27,164,186,141,118,105,176,173,235,179,197, 28, 27, 72, 10,240,216, 15,120,215,202,125, 83,172, 89,159,116,173,176,243,
+ 86, 44,168,146,139,218,241,116,170,223,111,135,200,149, 62,239,152,178,124, 64,222,186,199,141,155,164,170,236, 42, 95,120,238,
+107, 69,170, 50,163,159,194,105, 62, 90,105,210,160,  1,167, 17,123, 60, 83,  1,162, 85,180,203,113,251,108, 89,207, 18, 90, 74,
+248,160,120,114, 29,117,  9, 86,214, 20,252,  0, 86, 94, 48,251,237, 88, 94,187,199, 77, 66,168,130,161,236,216, 29, 66,109,180,
+ 39,218, 74, 31,127,121, 55, 89, 72, 90, 85,240,183,239,247,106,172, 32, 64, 79, 48, 64, 65,111,145,110, 75,150,155,146,129,  1,
+180,130,144, 58, 83,254,135, 87,  4,128,  9,132,  9,  8,102, 64, 95, 85,129,198, 65, 33, 75, 73,113, 71,127,126,141, 89,  5, 72,
+ 67, 68, 19,  4,188,202,145,103,149, 13,245, 20,188,134,138, 91, 39,161,  7,111,233,213,241, 16,132, 83, 54, 47,116, 54,139, 50,
+121,170,146, 91,162, 18, 61,198,162,186,169,145, 80,100,206,159,240,187,162, 98,224, 51, 80,193,254, 53,199, 60,211,237, 32,141,
+ 86,152,112,  8, 74, 39, 84,142,202, 21,145,229, 95,201,222, 39,154,249, 45,  7,218, 70,250,148,131,106,172, 70, 65, 49, 51,147,
+185, 97,198,149, 15,144, 11,101,208,163,254,202,169,253, 26, 20, 43,220,167,230,104,129,230,249, 79,157,112, 85,211,204,168, 91,
+ 97, 98,167,221,162,202,157,186, 40,139, 28,173, 86, 75,219, 55,140,122, 65, 89,  0,130,149,165,126,197,  2, 52, 72,212,158, 86,
+ 21,150,107,151,151,121,118, 35,171,226,212,196, 36, 34,167,246,128,174,159,104, 37,  6, 82, 82, 38, 72, 97,139, 12,169,168, 63,
+ 20,117,130,176, 60,  8,241,253, 26,148, 99,171, 40,  9,178, 86,206,110, 15, 25,106,144,149,114, 14,182,151,  6,253, 69, 52, 50,
+ 52, 61,201, 70, 76,146,241,119,154,137,148,155,162, 72,243, 86, 66,  0,254,209, 59,106,237, 35,224,  1, 41, 23, 42,227,181, 94,
+ 31, 92,115, 20,255,  0,216, 36, 41, 34,191,182,105, 93, 85,202,142,224,  2,104,201,  9,206,242,151,228, 77, 24,237, 56,190,211,
+ 97,210,124, 85, 81, 81,162,157, 25, 54,213,  5,219, 67,145, 89,138, 18,  9, 15, 50,167, 28, 62,  3, 81,132,  6,231, 69,150,129,
+146,125,157,213, 53,117,114,232,248, 33,181,184, 89,110,189, 40,157,181,165, 25,196, 29,188,208,  8,208,173, 22,220,170,106,243,
+ 66, 29,248, 90,113, 74,160,246, 37, 35,109, 44,186,218, 40, 84,133, 97,227,243,153,135, 10, 29,254,112, 42, 74,159, 90, 83,244,
+212,234,140,106, 96,200,132,151, 77,248,250, 25,184,216, 36, 93,158, 32, 37, 79,154, 15,160,109,250,181, 90,216,106,166,250, 36,
+ 62,224, 94,158,128,250, 34,127,217, 36,169,196,143,101, 78,152, 71,146, 53,101, 10,177, 92,228, 75,151,205,106, 41,243,126,  4,
+143,104,166,139,100, 24, 38,  5,120,118,225,252,138, 91,172, 19, 71,  2,171, 66,119,223, 81,144, 44,164,116, 86, 47,146, 39, 49,
+ 10,236,206,233, 17,234,170,120,242, 21,208,226, 84,156,148,164,235, 75,254, 99,231,180,126, 53, 43,141, 62,179,167,140,117,117,
+ 39, 70,178,203,193,131, 10, 60, 52, 26, 56, 19,197, 64, 29,206,212,208,229,  2,232,114,208,161, 29,165,187,124,188,251,227,110,
+ 42,190, 96,  9,  0,159,117,124,117,114,218,254,  4, 18,117, 68,111,183,132,166, 59, 44,133,209,109,168, 57, 74,244, 32,234,179,
+ 16,139, 18,131, 92,111,235,115, 49,140,250,205, 66,214, 29,246,253,221,247,209,235,175, 69, 19,168, 67,110,247,247,174,185,  5,
+206,238, 87,251,181,132,253, 92,105,167,148, 62, 20,137, 12,180, 94,243, 49, 14, 69,169,197, 44,121,137, 88, 53,175,128, 58, 45,
+ 84,186, 99, 45, 22,244,247, 60,213,103,204, 20,249,228, 57, 90,254,215,  5,105,121, 90,168,186,123,182, 95, 23, 24, 71,136,149,
+126, 36,167,146, 79, 94,131, 89,178,165,145, 69,234, 52,252,164,199,155, 45,144,170, 23,100, 82,155,251, 70,139, 28,100,198,212,
+ 23, 53,191,169, 76,161,210,173,214,231, 17,185,240, 26,151,146,218, 41,249,186, 45,118,150,216,149,104,110,254,104, 84,128,177,
+241,116, 32,105, 74, 59,116,237, 77, 25,191, 20,127,182,238,219,222,177,205,154,132,128,219,166,180,246, 30,186, 21,242, 32,163,
+ 86,200,232,139, 16,221, 35,220,  2,128,100, 36, 36,251,232, 52, 35,105, 60, 83,136, 34,147,101, 68,249,230,221,104, 10,161, 53,
+ 73, 26,173, 43,153, 26, 92, 16,190,242, 42, 52,155, 69,190, 74, 85,252, 79,  2,227,148,218,159, 89,213,204, 82,100,116,231,246,
+225,196,161,104,203,154,111,157,216,151,223, 12,149,142,221,226, 37,165,227,246,135, 84,195,151, 37, 44, 41,151,159,175, 21,148,
+146,  1, 82, 27, 27,  0,145,185,222,180,166,190,138,244, 71,166, 70,  5, 63,184,184, 31, 50, 92,  1,226,  7,223,199,199,144, 75,
+ 22,145, 41, 58,185,216,197,240,190,217,216, 89,109, 18,151, 42,238,  9,125, 92, 99,169,227,178,104, 82,138,212,242,169,167,221,
+ 20,  6,128, 15, 30,166, 83, 50, 61,129,111,194,  2, 33, 46,185,220,185, 88,220,215,174,115, 17,230, 76, 89,243, 91, 98, 50, 74,
+248,165, 73,  4,115,175, 21, 36,238, 42,  1,  7,221,165, 32,  8,100,104,186,184,189, 61,119, 59,179,189,217,190,196,107,187, 63,
+ 20,198, 71,146,218, 28, 67,174,167,250,201,228,178,218,148, 10,105, 93,134,222,221,103,228,215, 42,135,194,174, 86, 68,147,255,
+  0,170, 44, 91,  5,203, 32,217, 94,237, 12,200, 87, 60,175, 28,157, 30,247,  6, 52,183, 66, 96, 41,112,223, 68,196, 50,226,190,
+ 33,193,197, 55,229,184, 66, 43,197, 71, 99, 74,107, 14,248, 78,112, 35, 94, 43, 95,  2, 85,194,194, 38, 90, 50,137,  7,187, 77,
+ 62,246,246, 39,239, 79, 16,125, 15,118,222, 74, 59,139,112,237, 53,170,211,157,151, 90,152, 94,121,113,229,179, 22, 94,206,114,
+140,203,175, 59, 29,149, 37, 95,180,202, 18, 43,189,116, 12,121,219, 81,121, 68, 72,142,208,177, 51,177,108,177,227, 27, 26, 42,
+229,238,111,174,204,125, 22, 71,147,101, 97,231,  7, 15, 50,177,155, 83,245, 65, 21,  4, 22,121,  2, 41,239,209,239,202,158, 71,
+249,133,135,135,217,213, 44,110,139, 40,200,109, 14,124, 71,230,190,103,126, 97,217,223,115, 59,210,196,220, 82,  4, 99,  2,211,
+115,109,216,178, 38,188,235, 75,112,199,116,  6,221, 67, 13, 50,165, 30,106,109, 69, 60,151,192, 38,188,135, 35,182,174,224,237,
+254, 87, 42,253,253, 58,116,151,180,129,220,  8, 39,238,112,184, 47,185,254,159, 35, 48,151,217,106,174, 58,194,200, 66,156, 33,
+ 45,172,114, 42, 81, 35, 97,254,191, 13,118,216,115,216, 25,115,183,213,184,191, 53,205,153,205,177, 56,238, 72,184, 80,137,228,
+104,182,208,129, 82,  1, 87, 16, 54,233, 77, 91,222,235, 50, 84,152,148, 74,207,113,117,212,161, 14,149, 39,238,132,144,146, 55,
+ 62,  4,248,244,212, 29, 41,  2,  2,126,198, 45, 47, 42,212,252,168, 75,  9, 50, 16, 80,225,  4,161, 64,165, 10,219, 96,125,181,
+168,209, 12, 30, 37,  6,  5,164, 22,175, 76,140,122,172, 99,  1,204, 36, 89, 35, 91,  7,167,187,  4,171, 93,199, 56,141,113,122,
+211, 30, 83,204,222, 86,228, 56,207, 48, 29, 90,103, 74, 75, 37,142,  4, 49,204, 51,200, 21,  4,243, 36,224,201,163,175,122,215,
+167, 34,221,251, 71,202,126,220, 87,208,207, 74, 30,137,111,119,255,  0, 68,246,156,251,187, 86,127,148,255,  0, 48,189, 58, 69,
+158, 60,214, 60,181,189,102, 82,248, 48,181,182,232,  4,161,197,  5,169, 21, 27,160,131,208,235, 38,252,194, 38,  0, 86,140, 65,
+118, 92, 81,235,107,210, 28, 63, 78,217, 52, 46,228,224, 10,249, 44, 49,217,204, 69,145, 21,  0,134, 45,114,228, 57,229, 50,251,
+124,105,198, 43,142, 16,219,173, 86,129, 74, 74,147,190,218,215,198,180,176,144, 84,100,211,248, 15,177,  8,118,220,172,102, 56,
+155,122, 63, 41,112,146,219,127,128,133,149,172,162,149,171,107, 59, 26,111,240,174,181, 27,  3, 93,111,215, 51, 48,178,109,134,
+210,159,125, 34,229,127,229,158,250, 66,157, 62, 42,156,130,195,209,140,181, 21,243, 83,  8,125, 85, 81, 41, 60, 79,194,144,162,
+120,147,160,117, 76, 67,149,133,117, 67,140,163,248,107,249, 41, 85, 54, 43,189,174,119,148,177, 34,115, 84, 28, 41,229,239,177,
+  2,167, 95, 26,228,213, 56, 19,  9,134,144, 37,244,213,193,247,171,210,177, 77,114,243, 21,152,176, 86,202,232,180, 52, 72, 35,
+223,182,171,194,  4, 20, 56,144, 74, 31,144, 92, 99, 94, 49, 70,150,250,170,166,221, 40, 62,250,157, 29,136,144, 61,138, 17,  8,
+ 43, 17,126, 79, 29, 67, 76,238,  4,128,164, 15,239, 43,125, 88,143,196, 93, 65,216, 43, 42,221, 61,184, 56, 84,200,  9, 60,121,
+ 80,166,189,106,  5, 78,169,202,174,  9, 70,105, 52, 95,221,106,216, 37,  0, 84,162,176,157,171,184, 38,154, 39,237,244, 79, 41,
+184, 77,178, 37,199,149,109, 98, 74,168, 90, 13,  4,172,123,233, 77, 82,144, 32,178,132,102,201,107, 52,133, 75,107,173,197, 35,
+226,108,175,233, 77, 55,166,172, 99,233, 34,136, 44,112,149,241,104,172, 42,195,193,103,139,171,229,193,126,211,214,154,210, 18,
+213, 13, 69,147,145,173, 72, 96,179,247,218, 95,146,242,125,180,218,186,105,143,132,160, 74, 93,137,206,  6, 88, 96, 65,139, 49,
+181,127, 15, 83,205, 35,161, 30,205, 83,119, 96,150,160,148,219, 22,221,102,135,145, 65,204, 24,160,132,235, 11,117, 64,120, 43,
+254,131, 70,148,  9, 12,151,152,171,188,166,248, 85,116,155,107, 89,161, 46,121,141,239,213, 42, 53,211,215, 78,210,154, 54, 57,
+100, 22,252,244,135,218,254, 94,209, 37,228, 36, 41, 53,241,  4,104,246, 67,154,144,119, 90,177,187,196,171,118, 53,115,138,160,
+ 75,201, 28,169,189, 71,191, 72,  0, 74, 36,138, 47, 10,106,110,201,182,201,136,175,199, 74,  3,202,247,142,132,104, 70, 35, 80,
+144,213, 16,185,174, 76,104,151, 27,106,137,242, 39,209, 77,171,174,231,253,122,156,  8,116, 41,196,186,129,150, 98,215,104,120,
+148, 75,146,129, 46, 54,124,146,124,120,158,154, 28,153,212,227, 20,153,145,227, 55, 11, 52, 91, 85,246, 56, 41, 76,135,130, 84,
+ 61,167,144, 35, 87, 41,218, 66,140,193, 77, 71, 36,187, 91,174,236,171,129,249, 87, 40, 85,214,181,  0, 84, 29, 67,104,146,136,
+ 12,136, 60,216,202,243,215, 46,172,143,133,  8, 66, 10,124, 54,213,108,147,180,  4,104,132,217, 34, 55,205,219,221,132,216,  6,
+105,163, 13, 36,120,114, 77, 54,213, 11,108, 98,145,119, 75,153, 31,111,223,129,136,  6,  2, 71,207,176,240, 10,160,241, 82,180,
+ 60,108,147, 44,159, 16,166, 71,194,145,101,226,147,155,203,222,148,132, 17, 21,148,161,176, 71,245,136,169,215, 69,109,187,224,
+  2,  8,139, 43, 18,234, 91,182, 98, 16, 25,124,  1, 29,149,121,138,254,241, 26,171, 41,114,  9,194, 99,237,178,227,206,178,195,
+128,243,149, 98,115,235,168, 21,168,223,109, 86,151, 21, 38,116,159,222,203, 41,182,202, 66,159,162,127, 17,113,171,239,240, 58,
+106,156,201, 56,146,  3,139,249, 33,108,202,112,138, 48, 74, 15,211, 93, 91,156, 95, 68,219,146,198,127,146, 39,252,206, 28,108,
+209,181,128, 13, 61,218,120,210,193, 52,166, 21,195,219,155,210, 46, 24, 51,100, 42,170, 69, 27,169, 62, 27, 15, 29, 86,133, 90,
+148,230, 73, 91, 53,185, 11,  6, 87, 21,142, 95,130,245, 22, 41,181, 77, 70,139,229,104, 82,140,212,200,168,115, 42,184, 34, 98,
+ 62, 38, 26, 95,150,126,146, 54,235,168, 93, 29,177, 83, 39,113, 73, 76, 95,164,227, 57,252,139, 81, 60, 67,170, 28,147,211, 86,
+225,241, 86,171, 76,177, 83,110,183,231,110, 51,101, 70,140,170,200, 66,194, 83,244, 87, 65,149, 73, 70,213,  3, 52,187, 63, 98,
+184,196,124,253,244,162,132,239,212,232,244, 86,233,231, 99, 45, 13, 92, 87, 27, 17,122,115,191,226, 38, 44,172, 31, 26, 13, 78,
+200,114, 81,141,138,186,200,114, 91,131,207,199,220,144,218,142,254,202,157, 89,199,172, 37, 57,169, 13,222,157, 54, 87,156,228,
+124,209, 53,148,211,122,238,203,138,254,141, 63,146, 55,123, 16,252,197,107, 90,179, 69,171, 56,131,107,113,127,187,228,119,240,
+ 35, 84, 37, 67,242, 66,243, 86, 74,200,145, 43, 46, 68,102,213,205, 43,146, 85, 81,253,145,190,172,254,216,162,  9,160, 93,206,
+204, 16,197,205,184, 77,171,225,111,154,143,211,211, 80,141,  4,169, 74,205, 20,139, 14, 88,231,254, 16, 59, 33, 10,229, 32, 41,
+ 69, 32,120,  2, 78,135,101, 63, 27, 34,194,127, 10, 57,218,107,188,209,143, 34, 83,171,252, 37, 21,  7, 17,236,166,168,229,213,
+170, 61, 51, 78,215, 11,139,240,236,232,123,149, 25, 90,121,160,239, 83, 67,191,234,214,116, 66,178,235,197,163, 32,114,228,180,
+173,179,248,133, 35,138, 79,141, 58,232, 54,199,107,168,239,220, 21, 77,249,144,122,137,141,218, 30,207,198,182,192,115,134, 87,
+144,159,144,138,161, 90,179, 29, 32,169,247, 69, 63,104,138, 37, 62,243, 95, 13,122, 71,211, 31, 79,142,161,157, 27,103,173,117,
+252, 94, 36,112, 30,246, 39,193,144, 55,149, 77,122, 17,187,200,191,135,174, 18,130,156,186, 60,166,209,109,182, 64, 72,162, 91,
+  4,133, 41, 84, 39,221,237, 63,105,215,209, 93, 70, 91, 64,  1,109,244,200,233,170,235, 12,249,251,126, 39,136,170,230,204,132,
+185,145,184,134,219,146,226,156, 73,116, 36,172,164, 54,146, 57, 44,168,124, 91, 84, 15,102,199, 92,253, 82,148,166,199,130,220,
+144, 17,142,138,162,185,187,112,185, 68,230,149,249, 77,186, 82, 18,130,242,150,225, 42,216, 41,102,129, 32,145,238,213,228, 39,
+ 44,138,226,119,203,222, 59, 14, 69,129,183,158,224, 40,217,107,204,116,138,208, 38,165, 32,211,106,127,171, 67,178,  2, 74, 80,
+155, 43,  3, 25,202,238,146,172, 74, 76,135,202, 80,  1,242,  5, 18, 21,197, 39,122,  5, 85,  3,115,237, 30,237, 87, 53,177,100,
+231, 80,163,220, 51,107,220,249,  2, 20,127, 55,229,121, 41,177,201, 74,115,226, 73,228,124,180,168,238, 64,216,145,250,116, 65,
+ 80, 10,188,164, 87,137, 93,217,206,241,203, 90,103,254, 58, 82,231,224,149, 16, 42, 27,248,147, 80,148, 16, 41,198,167,127,163,
+221,168, 28,120,205, 48,178, 81, 85,214,115,234,  4, 73,186,249,247,116,174, 74,  8,161, 46, 21,143,188,181, 86,167,160,232,  9,
+219, 86, 41,195,  0,104,135, 44,146,232, 44,238,212, 91, 59,151,107, 55, 23, 90, 82, 45,210, 26, 74,163,184,207,152, 27, 79, 45,
+146,106,107,202,160, 29,200, 27,251,246, 58,117, 93, 24,241, 65, 53, 25,234, 23, 39,119,239,210,110, 87, 96,190, 57,124,178, 50,
+244,203, 35,239, 17,230,113,252, 69, 45, 36,236,221,104,104,120,236,124, 53,100,218, 36,171,207, 28,141, 82,  5,179,182,185, 93,
+185,197, 71,186,194,121,164,172,121,169, 74,146, 56,144, 72,167,  2,  9,251,164,113,210,112,171, 89, 81,101,100, 88, 49, 41,120,
+206, 48, 92,185,178,182,227,189,184,243,  0, 11, 11, 34,128,128,163,210,159, 93, 53,110,160,235, 62,192,  2,181,125, 24,119,171,
+181, 62,159,179,148,231, 25,167,108, 49,108,241,228,201, 67,168,111, 43,182,137,171,101,198,135,239,163,242, 80, 74, 92,  4,  3,
+ 85,182,232,218,161, 32,212,235, 31, 63, 14,195, 45,213,173,156, 11,104,182,  2, 22, 19, 25,118,143,204, 46,209,238,135,230,203,
+110,245,  9,206,125,201, 38, 36,226,  3,127, 40,104,  3, 98,148,  9, 64, 79,128,233,184, 26,199, 29, 46,210, 94, 64,191,219,177,
+ 78,216, 70,176,213,202, 50,240,227,238, 43,144, 61,121,247, 42,201,155,246, 46,245,137,206, 41,254,109,123, 49,224,219,227, 59,
+251,197,188,101,180,232, 90, 83,214,141,  4,151,  9,232,  2,117,160, 42, 53,197,155,185, 84,197,132,167,104, 45,160,212,170,195,
+187,211, 49,187,189,147, 28,187, 72,142,133,150,109,205,196,150,202,144,242, 22,183,152, 71,148, 10,220,160, 77, 42, 73, 21,250,
+235,177,214,254, 53,100,  5,151,147, 32,100, 91,181, 42,118,179, 32, 98,199,122,145, 21,129,229,220,228,  2, 66,  9, 53,242,210,
+193, 79, 36, 56,149, 16, 21, 82,122,142,132,143,163, 67, 22, 77, 46, 10, 17, 93,191,218,174,226,207,238, 71,108,220,188, 73,228,
+111, 86,230,217,141,115,113,102,165,105, 41, 62, 83,196,138,253,240,157,207,183,233,215,128,253, 80,244,140,177,114,142,109,122,
+215,105,115,221, 46,  7,216, 78,190, 37, 76,157, 17,139, 78, 86,202,131, 42,125,207,195, 13,169, 41,223,221,175, 41, 20,235,193,
+ 68, 77, 69,103, 42,117,120,147,181, 63,134,100, 81,179,244, 29, 78, 84,178,113, 52,199,140,100,112,165,196,136, 31, 80,226, 93,
+  8, 30,245,248,106, 38,162,  6,137,247, 39, 92,134,224,136,211, 83, 98,220, 60,166,249,173, 35,173, 84, 53, 90,209,180, 39,139,
+ 32,247,216,209,236,248,131, 40, 90, 72,113,194, 84,146,122,208,234, 66,110,  2, 48,136, 69, 49,233,129, 88,195,118,215,  5, 67,
+139, 73, 66,235,184, 30, 58, 20,225,205, 14,202,220,168,247, 73, 63, 55, 14, 77,172, 14, 75, 66, 20,210, 28, 30,218, 29,  6,161,
+168, 42, 32,106,148,237, 54,245,219,236,242, 99, 75, 85, 36, 33,196,174, 56,247, 43,195, 90, 51,144,  3, 69, 58,226,229,104, 56,
+131,236,207,106,224, 43,242,210,106,181,131,224,160, 52,226, 96,132, 41,195,226,116,211,140, 90, 62,125, 45,227,178, 83, 71,146,
+181, 58,158,155,208,244,251, 53,159,115, 68,186,150,212,238,171,123, 16, 44, 44, 89,222, 33, 79,113, 90, 17, 95,217, 10, 31,233,
+209, 99,120,116, 51, 91,232,171, 44,146, 19, 98,233,  6, 83,201,252, 84,185,242,206,159,104, 10,160,209,167,112, 60, 20, 97,  4,
+106,235,133,178,238, 82,204,152,123,199, 62, 90, 22, 61,196, 13, 70, 55,184, 32,162,236, 68, 50,142,222, 69,137,113,114,109,189,
+  3,202, 45,252,180,132,143, 26,142, 85,253, 58,171, 27,136, 68,148, 18,237,134,207, 30, 19, 69,164, 30, 15, 70,251,190,244,158,
+163, 79, 59,  9, 41,227,  4,126,197,  1,121, 37,158, 82, 31, 64,243,173,197, 60,149,237, 21,174,154,118, 17,170,150,192,143,228,
+206, 70,157,106, 85,129,  9, 10,242,216, 67,181,247,129,160,  9,150, 78, 35,201, 47, 49,105,135,148,218,153,178,184,129,198, 58,
+131,173, 87,168, 82,119,209,171,180,136,161,200, 37,236,208,166, 60,164, 53,198,142,144, 64,254,240, 26, 62, 44,202,105,  0, 86,
+238,220, 92,154, 84,183,229, 44,129, 68,132, 43,233,211,228,130, 67, 41,104,157,112,247, 99, 74,191, 55, 37,197, 13,144,167,  5,
+ 79,237, 38,180,214,101,177, 46,152,234, 86,200, 87, 72,183,169, 47,197,124,142, 14, 72,173, 15,247,169,253, 26,157, 53,109,147,
+243, 80,153,209, 67,201,172,182,166, 62,126,  4,  2, 23, 55,205, 11,168,166,212,  4,235, 82, 18, 36,178,128, 41, 31,184,183,229,
+ 53,129, 45,182,126, 41, 33, 92, 20,  7,133, 13, 53, 26,139,204,164, 84, 28,  7, 63,118,215,126,178,193, 67,149,101,165, 85, 67,
+194,167, 70, 53,110, 41,110,100, 87,212,197,253,203,150, 28,197,238, 56,163,236,202, 10,118,158,202,245, 63, 81,212,177,169,105,
+145,218,170,249,175,193, 87, 29,190,201, 28,187,220,228, 65, 66,170,218,136, 80,223,196,141, 92,157, 91, 36, 19,139, 28, 36,172,
+250,246,251, 23,151, 18,239,239, 25, 90,144, 73,247, 29, 91, 20,252, 62, 42, 34,110,173,126,209,101,202, 61,189, 98, 75, 75,169,
+ 50, 18,147, 67,224,126,189, 80, 21, 49, 41,229, 50,142,247, 94,210,251,233,182,221,192,170,155,112,110, 63,169,215, 77,  1,241,
+ 49, 74, 18, 44,153,253, 60, 38, 53,239, 31,185,183, 34,133,228,203,252, 51,227,183,179, 67,207,171,108, 85,186, 75,133, 80,119,
+174,  4,203, 31,116,228, 95, 92,  4, 71, 47,165,134,192,241, 33, 34,186, 62, 32,  6, 13,220,133, 96,114,235, 87,110,228,201,151,
+150, 38, 68,228,145, 25,231, 20, 77,124, 64, 27,106, 54, 16,204,154, 48, 76, 93,194,182,179,113,101,135, 86, 42,143, 63,201,228,
+  7,129,219, 66,170, 70, 37, 18, 80,112,160,100,113, 91, 22,104,246,148,117,140, 10, 62,145, 74,233,229, 61, 84, 60,190,  9, 35,
+ 60,181, 71,182, 99,104,152,194,127, 21,199, 18,149,171,250,191, 21,  0,213,156, 57,252, 73,172,142,136,138,112,212, 39,  7, 93,
+208, 39,248,181, 20, 74, 35,251,173, 41, 35,244, 43, 82,253,199,199,247, 40,121, 92,211, 41,193, 46,182,236,214, 85,233,202,170,
+ 56,105,197, 70, 80,241, 38,181,251, 52,254,104, 33, 87,157, 36,  2,162,118,227, 24,187,204,205, 99, 71,151, 94,104,230,250,138,
+186,208,146, 43,171, 50,190, 32, 34, 70,162,202, 46,107,219,139,141,214,227, 62,252,215, 35, 17,151,126, 93,  9,  3,175, 46,167,
+ 64, 25, 49,138, 36,168,117, 39, 23,192,239, 22, 92, 25,248,234,  5, 72, 43, 40, 35,233, 58,173,102, 76, 76,157, 19,202, 33, 74,
+194,226, 93,109,215, 68,217, 92,170, 82,162, 10,134,244,220,106,173,196, 29, 81,225, 21,110,103, 22, 25,104,197, 97,219,216, 79,
+227, 54,128,181,175,125,146,175,110,177,137,248,207, 98,156, 73,  0,160, 22, 56,143,192,200, 35,199, 64, 62, 91, 40, 42, 89,246,
+212,106, 50, 59,156, 40,151,128,117,243,163,243, 89,239,148,158,229,250,143,107,  3,183,186,218,236,248,170,  4, 48,219, 41,227,
+ 73, 43,252, 71,188,199, 22,126, 37, 10,164, 26,  0, 19,210,149,169,215,211,127, 76,122, 40,196,233,240,181,142,251, 53,227,201,
+249,118, 13, 61,170,  3, 85,110,250, 21, 98,233,129,246,253,172,158, 79, 52,202,152,225, 83, 62, 96,161,109,180,  0,157,193,241,
+ 81, 37, 66,187,237,174,183,168,252,114,101,209,244,209,178, 46,121,171,247,182,119, 75,101,229, 79,228, 25, 26,137, 97,181, 58,
+219,105,112,212,149,132,249,105,219,125,192, 85, 77,126,141,181,153,105, 49, 96, 22,149, 68, 16,229, 22,177,223,240,185,119, 48,
+194, 82,223, 22, 86,227,238, 44,208,161,  5,175,188,176,145, 80, 40, 79,135,143,188,234,102, 18,110, 41,133,145,117, 31, 33,205,
+ 49,  5, 66,126, 93,173,175, 45, 11,  5,196,147, 64,226,138,213,197,  1, 69, 39,225,223,115, 78,191,167, 74, 21,201,217, 41, 92,
+ 20,121,153,125,174,  4,  4, 77, 46,172,151,154, 66, 27,229,196, 81,197, 81, 35,143, 47,132, 82,132, 19, 67,191,219,167, 21,151,
+224,135, 43, 64,  8,124, 12,182, 68,104,102,229,114,144, 18,218, 42,134, 20,190,161, 53, 38,161, 32,237,241, 10,239,214,154, 33,
+172, 20, 19, 97, 81,102,103,173, 93, 35,183, 13,158, 44, 69, 90, 83, 85,184,173,139,109, 18, 86,120,131,176,240, 20, 30,222,186,
+ 66,160, 19, 27,221, 86, 29,250,191,219, 31, 74,213,109,224,153, 64, 81,110, 40, 26,124, 61, 82, 56,251,  0, 59,248,157, 89,162,
+ 61,168, 19,147,149,105,254, 95,183,184, 14,227, 19, 25,185, 48,252,155,187,109,190,136,136,124,188, 26,105,  9,230,181, 15,196,
+ 37,  6,139, 36,  0,  0,161,165, 65,213, 14,164, 36, 14,139, 91,167,109, 63, 50,189, 44,246,190,198,103,237,189,139,100, 73, 85,
+142,246,197, 20,152,115,148, 18, 84,164,163,135,154,144,138,  5, 15,136,210,149, 34,187,208,235, 23,247,215,215, 45, 66,244,106,
+186, 39, 78,190,128, 97, 45,199,155,113, 10,165,239,143,167, 12, 11, 18,181,252,205,162,231, 29, 86,244,176,168,233,  8, 74, 28,
+ 41, 66,136, 82,137, 11,  5, 66,165, 53,250, 78,181,241,122,156,143,204, 22,  6, 79,165, 41,176,252, 19, 35, 69,197,253,252,207,
+254,110, 98,221, 82,210, 98, 68, 74,227,161,109, 41, 62, 75,174,182, 82,  1, 77, 58,146, 55, 39,173,126,189,117,184,214,131, 23,
+ 11,202, 51,168, 48,153,137, 46,197, 42,224, 88, 78,117,144,218, 25,158,235,170,140,201, 65, 90,124, 18,121,124, 65, 38,180,220,
+251, 61,218, 28,236,114,158,186, 73,139,160,153,109,151, 40,180,220,  2,228,186,165,202, 88, 81, 83,123,146, 41,241, 83,245,248,
+232,177, 67,176, 16,135,179,220,188,250,200,223,200, 33, 78, 75,182,  0, 79,146, 66,157, 77, 41,184, 41, 80, 35, 68,112,126, 96,
+233, 70,249, 71,129, 70,229,231,215,204,205,134,173,242, 80,134, 20, 82, 27,113, 46,161,109,130, 62,233,220, 16, 70,194,157, 40,
+125,154,181, 92, 34, 70,133, 14, 71,114,151,130, 90,219,199,175,204, 74,187,254, 27, 92,138,146,166, 18,209,  9,169, 59,  7, 16,
+ 19, 80, 69, 69,119,209,  5,100, 20,192, 46,228,244,245,141, 51,157,227, 74,187, 96, 87, 36,198,201,196,111,229,147,109,237,144,
+ 12,200,138,  3,146,120,213, 73, 87,196, 43,197, 94, 52, 59, 29, 87,234, 24,208,204,162,116,217,194, 65,190,222,  5, 88,133, 98,
+ 65,148, 92,223,  7,205,176, 41, 79, 91,175, 44,112, 40,  0, 52,234,  2,146,149,242,233,240,171,116,157,183, 30,222,154,249,147,
+212, 94,159,151, 75,200, 21, 72, 14,208, 71,  2,168,217, 89,140,144,236,177,249, 86, 75, 13,166,220,215,220, 85, 29,127,220, 73,
+241,214, 47,146,  9, 80, 14,152,176,187,124,166,173, 16,148,146, 84,249,185, 51,196,127, 96,170,186, 83,164,  8,148,163, 37,100,
+127, 25,121,239,208,138,149,127,  8,211,109,182,176,127,181,215, 88, 89, 81,104, 35,  9, 58,113,238, 86, 30,213,202,243, 46,201,
+  4, 19,  6,216,207,159,191,182,149,161,250,245, 70,169, 48, 70,140,146,139,127, 59, 11, 30,142,230,226, 65, 60,210, 63,179,162,
+206,108,139, 35,162,159, 98,108, 34, 18,231, 57,241, 56, 66,214,107,253,106,116,213, 83, 55, 80,100, 26,109,138,124,143, 38,123,
+167,240, 94,113, 59,  1, 77,130,180,111, 48, 50, 35, 50, 55,144, 54,164,227,162, 51, 32,  9,173,188,158, 32,117,  9, 59, 29, 66,
+ 51, 81,140, 73, 81,110,209,238,120,196,216,183, 86, 43,230,148,  7, 20,124, 57, 29, 52,134,229, 34, 22,203,174, 91, 46, 79,149,
+ 45,229,116,  4,168,123,  9, 53,208,219,146,113, 20, 26,239,112,106,124,184,104, 35,226, 92,134,220, 36,123,136, 58,156,  9,220,
+130,155,174, 23,102, 16,227, 15, 53, 64,227,138, 77, 64,247,  4,232,230, 28,209, 35,193, 54, 76,109, 46,192,113,110,117,146,223,
+154, 41,224, 80,154,127, 70,170,200,106,164,171,184,112, 85, 34,109,193,182,254,250, 91, 14,164,143,167, 79, 36,242, 44, 19,118,
+  3,  5, 17, 98, 93, 88, 41, 60,230, 52,135,  5,125,201,210,155, 18,147, 50,142,182, 28, 91, 46, 75, 31,121, 77,  4,147,227, 64,
+105,168, 72, 48, 81, 28, 86,118,254,218,212,135,209, 37, 35,116,249,202,161,241, 34,187,104,213, 51,234,148,254, 84,135,158,162,
+109,203,205,122, 42,106,243, 79,158,  0,123,  2,168,117,106,150,130,174,163,246,246,197,114, 84,123,138,212,130, 28, 82,124,196,
+143, 10,141, 90, 44, 66, 76, 84,252, 85,219,138,209, 34, 81, 81, 72,137,178,143,211,190,168,221,  0, 36, 20,235, 14,234, 53,158,
+241, 45,188,136,121, 38,172, 21,249,138, 39,192,233,  8,135,116,242,142,137,186, 11, 15,202,201,164,160, 29,157,101, 75, 73, 62,
+ 42,166,165, 85,154,166,242,138,135, 59,  4,131, 34,207, 29,153,130,137,121, 78,169,100,244, 37, 53, 58,169,184,198, 68,132, 95,
+ 44, 50, 67,127,183, 83,109,235,114,248,221, 82,204,121,  8, 91,100, 86,156,107,173, 26,114, 53,  5, 10,117, 58,179,243, 14,220,
+ 69,201,240, 23,210,  5, 91,122, 63, 52,251,214, 83,165, 28,159,136, 30,194,129, 26, 54,146,169, 46,220,118,198,237,103,184, 38,
+224,  1, 13,151, 67,106,175,181, 10,165, 62,205, 91,187, 48, 73, 12, 80,193, 37,119,191, 17,153, 15, 36,154,208, 77, 28, 90,148,
+242, 64,175,141, 14,181, 49,110, 18,130, 82,169,111,244,213,117,149, 35, 30,151,102,144,126, 24,206,151,  0, 63,217,211,229,192,
+ 13, 80,182, 50,183, 50,252,183,206,237,136,186,210,175,199,230,105,227, 74,144, 53, 74,202,218,200,132,213,240, 37, 28,244,223,
+115,143,109,178,187, 53,215,  2, 90,113, 10,152,226, 65,232,163, 82,  6,163,159, 29,218, 43, 84,150,  9, 79,188,114,224,229,147,
+225,249, 84, 41, 92,174, 70,158, 63, 17,223, 85, 42,145,137, 40,140,191,110,240, 34, 68,202,237, 22,235,114, 66, 99,165,149, 45,
+ 92,124, 72, 27,147,165, 23, 47,226,144, 41,138,195,142, 39, 33,182,189,107,146, 15, 38,200,125, 39,251,101, 91,126,189, 14,226,
+199, 68,224, 58, 88,207,163, 53,104,154, 82,165,124, 77,159, 45, 95,102,148,  1, 41, 20,  2,125,141,156,146,210,184, 41, 80, 82,
+ 22,227, 74, 66,122,239,200,106,113,153,174, 78,159,110,228,240,108,144,197,180, 89,120,143, 44,180, 69,126,132,129,215,235,208,
+ 60,195,199,189, 65,147,109,142, 45,170, 77,213,248,114, 72, 89,109,154, 55, 90, 80,168,130, 21,250,180,210,180,141, 85,141,129,
+150,220,107, 23,183,183,112,157,127,105, 33, 42, 66,145, 13,175,160,157,207,219,161,221,144, 89, 74,170,244, 83,178, 59, 21,190,
+200,204,139, 18, 16, 11,132,135,157, 86,213,169,  3, 85,236,182, 69, 78,184,106,180,163, 30,134,222, 44,185,203, 72,230, 18,227,
+137,111,192,211,161,211, 69,202,150,208,232,  4, 11,  4,105,140, 69,190,  2,  3,169, 87,152,233,241, 60, 78,195, 86,  1,125, 18,
+  0,  5,101, 73, 67, 23, 37,181, 17,208, 21,201,132,151, 41,189, 19, 74,211, 85,167, 91, 20, 50,201, 46, 20, 64, 23,115,187, 36,
+127,134,168, 77,106, 64, 72,218,167,136, 39, 79, 93,111, 33,226,154,208,241, 95, 27,187,211, 45,251,255,  0,169,140,167, 33,134,
+180,173,148, 92,222, 75, 47,169, 10, 74, 82, 67,198,170,  9, 59,142, 39, 97, 95,167,174,250,250,255,  0,211,180,121,125, 62,152,
+183,242, 15,193, 86,172, 49, 11,167,251, 55,153,255,  0,151,240, 24, 13,184,232,120,178,147,242,204,236, 19, 66,121, 56,226,234,
+107,236,255,  0,161,212,239,134,233, 46,139, 30,205,177, 70, 15,118,100, 41,137, 13, 52,178,134, 30,243, 93,109,  1, 84, 80, 73,
+ 71, 34, 71,179,199,221,166, 20,186, 94,105, 68, 45,153,124,215,144,211,112,  1, 72, 44,150,214, 82, 79,223, 36,148,167,109,213,
+184,229,185,210, 49, 77,184,175,217,125,201,135,102,113,134, 84, 20,124,162, 11,105, 81, 20, 90,248,113, 46,174,189, 72, 27, 15,
+163, 78, 41, 37, 49,181,138, 26,174,233,166,253,124,102, 85,201,197, 22, 34,175,204, 76,118,  1, 82,190,  2, 66, 84,178,162,132,
+129, 83, 94,163,217,182,167, 26,140, 66, 28,173,117,234,251,220,104,172, 72,109,164,165,247,165, 58, 73, 80,142,164,164,167,145,
+226,148, 10, 37,193, 82, 60,  6,250, 81,165, 52,172,101, 58,204,243,249, 92,245, 89,165,195,185, 67,157,229,143, 42, 58, 28,139,
+230,148, 36, 84, 16,137,102, 57, 52, 78,228,147, 79, 30,154, 28,154, 60,199,223,253,169,  2, 74, 27,158, 88,123, 85, 18, 63, 27,
+238,116,220, 23,194, 75, 72,128,152,223,204,228, 41,124,  2,120,133, 90,220,117,144,175,239, 56,157,252,116,245,219, 51,194, 46,
+ 61,195,239,215,238, 80,176,  1,198, 67,237,246,237, 87, 15,163,203,247,111,196,  6,113, 12, 55, 33,188, 92,103,150,203,234, 71,
+242,  4,182,136,237, 54,247,146,151, 20,148, 92, 28,  8, 73, 95,237, 43,175,137,213,108,136,216, 11,202, 35,223,253,138,254, 53,
+145,219,161,116,225,223, 88, 56, 12,232,225,135,165,155,149,185,130,159, 33,106, 73,143, 44, 33,179,201,106,109,232,206,147, 95,
+ 49, 95,126,187,248, 26,109,166,141, 70,200,180,226, 62,222,196,122,242,236,162,123,161, 34, 10, 78, 86, 33,140, 92,160, 38, 44,
+ 91,178,212,193, 72, 92,153,119,107,179, 97, 17,155, 82,210,130,162,103, 45,182,127,173, 67,200,154, 13,245, 60,108, 72,198, 78,
+223,218,167,159,215, 50, 44,134,217, 75, 79,114,161, 59,185,216, 62,214,220,242,251,109,130,235,158,183, 62,227, 25,215,190,102,
+ 14, 53,107,145,114,150,144,133,  9, 27,249,238,198, 97,127, 10,184,146,135,  8,168,214,209,178, 77,164, 91,196,174, 76,252, 69,
+201, 79, 88,170,253, 50, 71,181,181,  0,204,200,223,118, 50,214, 30, 90,227,219,162, 56,133,110,207,196,201, 91,224, 84,154, 83,
+204,241,213, 50, 44,126, 74,240,150,136, 14, 73,153,246, 94, 53,208,255,  0,148,236,104,118, 96, 43,142,185, 23,104, 14,189, 37,
+ 20, 36, 85,167, 19,113, 28,  9, 20,220, 14,186,177,  8,207,153,251,255,  0,177, 87,145,117, 75,101,136,135,116,187,159, 54, 39,
+152,226, 84, 90,120,187,243, 42,232,  2,146,161,230, 62,233,161, 73,246,234,208, 85,100,183, 68,198, 45, 65,176, 27,132,195, 78,
+113,170,219, 73,146, 10, 72,253,186,121,148, 33, 73, 62, 30, 58, 36,102, 66,138,247, 54, 19,137,113, 49, 88, 90, 80,144, 66, 31,
+ 66,138,156, 64, 81,  2,138, 73, 85,126, 21, 39,127,183, 87,171,185,248,164, 10,232, 63, 72,153, 77,211,  0,202,224,221,173, 92,
+ 25,184,132,161,185, 12,154, 56,218,130,200,242,156, 79, 32,  9,222,169, 53,175,215,163,109,  4, 35, 87, 38,213,118,237,213,184,
+157,230,129, 14, 29,234, 43, 79,200,121, 44, 74,136,254,193,228,164, 14, 78,165, 37, 32, 21, 36,114, 27, 43,122, 10,208,109,175,
+ 55,250,153,210,142, 70,  8,182, 48,221, 58,207, 30,108, 70,190, 58,142,  8,215,180,194,172,178, 30,202,180,111, 51,236,183, 52,
+254, 19,  1, 74,110,190, 28, 58,107,231,  8,230,179, 42,134, 44,191, 49,108, 35,229,242, 56, 81,153,255,  0,  4,148,  9, 73, 30,
+197,183,237,213,159,222,143, 44,191, 21,  3, 88,117,181, 18, 76, 94,238,155,164,132,249,111,173,214, 66,138, 77,  2,130, 77,  1,
+213, 27,166, 37, 22, 72, 65,149,133, 38,252, 73,201,110, 50, 69, 30,146,160,194,  9,234, 65, 78,218,171, 42,192, 98,154,  4,164,
+ 11,230, 89, 21,216,177, 99,161, 60, 75, 73,242, 56,123, 77,116,214, 86,225,209,183, 41,179,158, 22,236, 93, 18, 16, 77, 29,124,
+  1, 79,234,145,170,245, 69,194, 97, 36,218, 45,145,215,135, 67,117, 34,175, 33,196, 82,130,181, 36,238, 53, 86, 37,236,218,173,
+158,  8,  5,202, 83, 98,238,182,194,122, 58,  2,171,211,125, 90,219,162,104, 22, 82,187,159, 46, 27,118,215, 80,205, 60,197,121,
+ 72,110,190,  0, 13,255,  0, 78,144, 96,162,101,197, 37,184,135,215,108,105,213,130, 82,174, 65, 95, 81, 52,212, 52,116,209,146,
+133,102, 66,231, 74, 51,218, 37, 76, 51, 84,148,255,  0, 85, 67, 96,116, 82, 26, 73,160,204,183,220,242, 98,205,214, 12,126,123,
+115,109, 39,125,183,165,117,116, 65,194, 25,147, 21, 97, 68,204,162,184,187,160,113, 85, 49, 16,132,178,  9, 62,205,233,170,118,
+ 86,197, 20, 76, 50, 31,219,169,241,110, 18,230, 75, 89,170, 86,213, 72,246, 83, 64,176, 22, 81, 50,209, 62, 63, 29,187, 83,176,
+210,148,208, 57, 25,101, 84,241,218,163, 66,142,165, 18, 50, 12,150, 98, 92, 26, 45, 41,149,109,230, 36,166,158,193,207, 69,188,
+ 50,103, 96,183,225,179,153,129,116,114, 57,217,182, 92, 86,254, 31, 16,169,208,251, 10,140, 75,130,135, 89,173, 17,111, 57, 60,
+216,136,253,215, 53, 60, 43,208,111, 93, 78,115, 41,226,  3, 39, 27, 62, 49,106,176, 95,225,197,121, 35,229, 93, 87,150,245,  7,
+138,197, 71,233,209, 43,184,152,169,  0,225, 34,221, 97,179,143,100, 25, 62, 62,164,241, 60,202, 26,175,188,114, 31,163, 70, 58,
+136,148, 58,248,144,150,176,139,  4,235,155, 87, 80, 83,248,172, 54,151, 27, 39,233,175,244,106, 82, 97, 23,228,144,  5, 60,150,
+191,151,196,139, 61,123, 72, 45,164, 87,233, 20, 58,163, 68,183, 76,163, 29,  2,253,153, 52, 93, 44,209,173,204,167,248,198,214,
+183,  0,241, 41, 59, 29, 28, 65,204,148, 39, 50,202, 10,159,105,120,220,187, 34,155,170,202,170, 42, 63,101, 39, 81, 49,218,150,
+231,  1, 53,226,247, 72,146,109,177,172,206, 10, 52,147,229,168,127,179, 93, 68,196,135, 42, 22, 73,248, 33,240,113,  6,217,254,
+ 99, 25, 45,252, 81,143,204,176,145,214,149,169,211, 88,238, 59,208,183,104,202,146,239,181,136,191,220,152,138,242,207,202,186,
+208, 27,244, 53,  7, 91,152,179,219,  6, 76, 75,164, 14,208, 90,151,143,222,114,  8,171, 20, 74,124,199, 19,244, 19, 93,107, 76,
+137, 49, 85,200, 36,163,243, 46,190,126, 46, 44, 47, 43,224, 91, 74,113, 73,246,239, 93,  6, 48,221, 99,170,242, 59, 87,172, 99,
+ 55,115, 21,237,211,174, 45, 92, 95,152,191, 33,173,255,  0,103,113,165,100, 55, 76,162,137,176, 65, 33,101, 10, 93,202, 27, 15,
+170,170, 75,156,134,250,173, 26, 82,243,139, 43, 41,171, 53,226,101,198, 45,249,214,202, 33, 33,131, 69,171,165, 58,255,  0, 70,
+148,107,  1, 42,237,116,225,219,233,237,182,204,137,107, 31,  8, 79,154, 79,182,134,137,213, 57,212,232,145,177, 84,221,227,157,
+115,114,234,176, 16, 67,143, 60, 72, 20, 61, 41,162,209, 21,  9, 76,234,162,226, 98,224,195, 48, 86,186,249,109, 40, 62,253,124,
+  1, 86,218, 29,209,116,106,166, 74,182, 75,112,149,119,  3,255,  0,103, 76,114,162,105,253, 96, 20, 63,250,186,173,183,226,218,
+166,250, 32,223,207, 29,110,230,227,209,205, 86,147,197, 60,124,106,116, 59, 70,138,123,147,166, 37, 61, 50,146,108,207,213, 42,
+112,165,247, 20, 60, 56,158, 90,175, 92, 95,197, 28, 77, 66,201,243,  6,239,217, 28,215, 35,170,158,119,224,183,255,  0,171, 31,
+211,162,249,111,162,111, 53,148,236, 74,106,114,107,252,108, 69, 43,170, 85, 13,194,177, 95,218, 52,240,210,219,182, 42, 50,181,
+  1,141,117,105,187,219,184,195, 27,165,151, 60,144,  7,245,129,167,235,211,192,104,233,183,234,156, 46, 87,132,227,113,139, 46,
+ 56, 12,181, 32,165,197,215, 96, 72,233,168,100,190,129, 60, 78,133,112,103,174, 47,204, 14,251,141,181,117,236,111,104,166,170,
+ 28,151,148,166,175, 87,136,110, 36,187, 78,133,150,150,  1,227,239, 41, 85,124, 53,239, 30,134,244, 21, 80,136,201,201,  2, 69,
+190, 24,158,  3,188,191,240, 80,149,132,174,100,236,142, 30,246,107, 53, 62, 77, 20,181,172,124, 11,  5, 75, 89, 39,175, 31, 19,
+237, 58,245,203,164, 33, 30,192,137,143, 94,249, 43,190, 28,  3,143,220,156,105,198, 15,203,180,144,133,  7,  5, 19,181,118,  0,
+144, 60, 55,214, 93,146,220,181,192,100,157,127,202, 34, 91,239,119, 15,147,120,188,133,213, 33,100,242,169, 85, 83,197, 62,192,
+  1,254,141, 22, 32,178, 25,152,  5, 48,227,157,193,153, 28,121,150,167,121, 48, 92, 89,101, 78,113,168,110,137, 71, 21,  1, 95,
+136,154,215,221,246,105,252,176, 82,243, 59, 17, 40,208, 46,247,187,143,241,199,204,148,175,141,146, 55, 37,197, 40,130,120, 80,
+147, 68,212,  0,117, 45,194, 42,  1,228,181, 77,197, 94,180,180,155,147,114, 35,196,104,164,252,114,127, 17,250,162,170, 39,202,
+109, 46, 41, 39,217,204, 36, 29, 39, 37, 66, 81,100, 38,109,233,167, 96, 59, 25,165, 73,153, 85,164,  9, 19,158,118, 59,101, 52,
+ 28,136,143, 25,202,133, 87,196,186,164,211,110, 58,127, 44,248, 33, 25,251, 84,123,142, 75,153, 94,210,187, 29,185, 42, 92,153,
+  8, 66, 83, 14, 19, 73, 97,142, 35,238,169, 77,176,150,219, 38,130,165,100, 87,196,159, 29, 74, 85,198, 33,202,143,152, 74,109,
+197, 59, 65,143,199, 84,105, 25, 74, 69,254,254,143, 49, 78,194,140,242,147,110,105,194,132,  4,121,178, 26,162,222, 32,214,168,
+ 96,161, 36, 80,135, 79, 77,  2,118,158,  3, 69, 40, 71,181, 23,200,175,221,200,176, 45,153,152,163, 47,252,149,181,149,187,  2,
+209, 99,105, 45, 70, 62, 84,119, 56,  1, 25,158, 40, 91,170, 36, 81,106,  5,100,154,146,118,213,123,108,132,  3,159,127, 18,181,
+ 48,105,178,233,109,128,114,135, 99,221,247,184, 95,155, 91,239,220, 57,200, 87,148,102, 71,116,240,117,146,211,129, 38, 42,218,
+112, 85,178,  7, 34,160,104,121, 31,102,130, 50, 98,120, 43,  6,131, 18,210,112, 71,114, 27,153,250,142,197,239,247,223,228, 44,
+220, 82,140,189, 77,134,132, 37, 19,229,182,137, 41, 82, 93, 81,242,209, 74,213,  3,198,162,160,208,  2, 53,119, 15, 32, 18,203,
+ 63, 54,141, 28, 23, 75,183, 56,121,157,162,247,111,204,242,103,158,127,230, 19, 34,224, 91,112,135, 89,161, 43,  4, 20, 56,158,
+ 34,169,  9, 32, 83, 98, 61,167, 86,188,193, 45, 22,118,194,  3,166, 11,111,117,238,147,218, 93,151, 47,106, 37,205,165,184,181,
+ 50, 93, 79, 37,213,  9, 46, 37, 44, 72,110,142, 33, 59, 38,129, 36, 36,251, 60, 52,226,174,245, 19, 61, 20,107,153,199, 92,243,
+ 47, 86,133, 57, 18,115,203, 67,170,109,254, 78,178,150,254,237, 82,235, 73,220,212,116, 40, 20, 29, 78,136, 34, 80,204,144,140,
+138,209, 38, 35,174,173,208, 12,  3, 85,124,210,126, 38,206,192, 18,151, 16, 74,  8, 73, 32,236, 79,244,104,142,132,232, 93,203,
+ 34,183,139, 75, 78, 52,178,155,211,116,  1,230,143, 54,212,129, 74, 86,149,246,131,167, 73,  2,183,228,143,205, 72, 18,104,151,
+146, 20,145,196, 26,146,147,176, 62,207,134,159,103,191, 70,137,100,149,173,219,108,132,218,236, 17,110,109,173,104,226, 18,182,
+ 92, 81, 53, 40, 43, 34,160,143,101,  6,175, 86, 75, 39,117,217, 30,153,187,213, 37,219,133,165, 23,103, 74, 45, 50,155, 75, 75,
+ 43, 52,226,132,169, 96,169, 36,214,132,111,168,117, 44, 24,102, 99,217, 68,254, 89,134, 40,149,201,244, 87, 86,104,216,121,217,
+215, 93,139,234, 81, 98,187, 86,131, 99, 90,107,226, 30,163,143, 44, 91, 37, 89,227, 18, 71,187,181, 13,181,100,150,196,159,229,
+151,251, 99, 75, 20, 75,137, 88,229,237, 73,213, 80, 73,138,115,162, 95,207,194, 99,231,209,219, 99,103,129, 73,175,215, 93, 72,
+ 19,181, 74, 33, 53, 94,165,170,245,112,126,197,  0,132,190,162,203,155,120,154, 10,215, 80,149,191, 10,109,136, 54,109,219,191,
+254, 56,203,136, 60, 27, 80, 11, 52,240,113, 61, 70,161, 94, 75, 64,132,251, 29, 19,201, 45,254, 69,174, 11, 42,111,248,101,132,
+ 21, 87,193, 64,141,244,209,155, 40,195,138, 32, 50,133, 69,198,141,184,241,167,156, 10,106,119,  0,  1, 67,250, 52, 26,225,241,
+186, 52,229,162, 89, 92,137, 13,203,112, 46,138,117,110,  9, 13,215,196,120,234,228, 75, 22, 81, 18, 91,114,185,137,190, 88,207,
+148, 65,146,148, 45, 65, 62, 60,135, 81,161,109,208,120,162,187,132, 59,  4,147, 26,245,111, 98, 28,149,  0, 27,115,202,112, 43,
+192, 29, 70,208, 65,117, 16,206,163,227, 80, 17,109,191,221,237,174,142, 36, 41, 71,143,129, 65,220, 40,125, 35, 86,164,117,140,
+144, 99, 38,209, 37,184,153, 73,201,146,212,143,136,199,125, 42, 29,119, 70,244, 58,191, 13, 84, 38, 83, 52, 91,202, 92,159, 60,
+ 48,186,249,169, 33,193, 95, 16, 42, 52, 11,126, 19,170, 81,147,169, 61,150,188, 56,234,231,182,163,241,  6,143, 31,162,180,211,
+ 91, 72, 42, 30,103, 37,107,119, 82,249,252,162,101,172, 36,241, 73,132, 84,163,225, 82, 41,170,162,141, 84,163,102,170,173,198,
+242,215,174, 55, 25,237,242,171,113, 26, 82,235, 95, 10,215, 69,186,  3, 78,245, 41, 72,144,136,193,203,218,139, 45,114, 22,177,
+193, 73, 75,138,223,218, 41,161,249, 90, 38,223,162,100,236,211,138,187,228, 23, 21,180,126, 58,126, 25,254,205,107,166, 48, 96,
+161,231,104,139, 74,201,214,238, 86,195, 75, 53,108,186,144, 15,128,224, 64,208,233,135,194,141, 93,156, 86,159, 81,204,194,181,
+102,237, 93,173,228, 40,221, 89,109,106, 66,119,170,210,154,104,210,137,224,137, 68,184,173, 93,183,141, 25,200,115,103,182,143,
+142, 65,106, 45,  0,216, 15,218,211, 73,216,  5,103, 69,231,185,147, 35, 65, 75,109,182,186, 71, 72,242,154,  9,241, 41,208, 43,
+172,196,184, 77, 50,  2,141,132, 20, 75,200, 27,184,201, 63,194, 50,148,165, 93,105, 90, 84,234,112,113, 36,206, 19,  5,190,201,
+ 14,226,151,167,172,  4,183, 38, 74,144,159,247,116,169,219, 76, 11,201, 65,150, 98, 48, 25,114,238, 25,  4,  7,196,147,196, 31,
+ 96, 26, 45,131,114,128, 26,166,139,162,217,180,229,237, 60,186,121,114,227,173,133,163,192, 21, 10, 15,174,186, 16,131,233,204,
+ 33,152,185, 85,110,117,132,162,255,  0,156,198,183, 13,220,138,142, 33, 94,210, 42,105,171, 66,237,170, 49,139,170,158,225,137,
+ 73,131,145, 60, 88, 28, 27,146,167, 97,184,174,149, 60,182,253, 90,212, 22,238,128, 80, 43, 85,199, 29, 76,139,106,165,  4,240,
+125, 46,124,138, 79,129,218,186, 63,157,229,203,185, 71,202, 18, 14,128,228,184,132,233, 24,116, 71,208,133,121, 17,229, 41,  1,
+ 59,252, 84, 36, 29, 40,100, 13,202, 18,172,112, 90, 15,110,174,163, 52,138,226,  9,254, 88,176,208, 65, 31,247,135,239, 15,171,
+ 74, 23,  3, 22, 79,228,133,115,222,140,152, 88,195,214,148, 19,241, 22,153,108, 87,165, 15,196,126,205, 82, 22,124, 78,150,198,
+  9,163,183,214, 59,124,155,108,132,164,209, 12, 45,164, 62, 79, 66, 54, 52, 26,  5,150,180, 84,227, 88,  1,210,142, 69,138, 65,
+200,178,233,211,222,  0,196,142,178,150, 18, 63,172, 18, 55,253, 26,140, 45,104,167, 33,212,140, 59, 13,183, 57, 99,188,206,125,
+158, 49, 90,101,  9,100,245, 37,100,255,  0, 70,166,117,101, 24,150, 40,191,242,246,133,183,205,  8,252,115, 23,200, 35,246,168,
+  5,  1,250,104, 78,153,254, 55, 82,228,201, 58,199,108, 90, 20,229,229,223,240,229, 94, 90, 43,244,245,251,116, 57, 65,194,145,
+237, 77, 45, 93,224,227,246, 11,197,205, 95,226, 18,218, 89,109, 71,175, 35,215, 77, 85,108, 82,220,171,152,185, 23,159,145,197,
+ 17,149,248,104, 37,199, 20,125,157, 78,143, 93, 46, 80,141,154,166,255,  0, 79,119,227, 51,186,151, 44,157,127, 13,182, 20,103,
+212,154,157,190, 20,215,245,234, 82,164, 51, 40,206,106, 47,107,163, 61,120,187, 28,157,241,248,151, 91,130,153,140, 61,169, 14,
+ 18,163,191,187, 67,216, 61,200,206,144,189,126,247,230, 71,104,240,217,242,236, 13,149,221,156,121,113, 34,184,231, 20,180,133,
+  1,197, 74,248,143,196, 71, 94, 32, 19,238,215, 87,233,111, 77,142,167,153, 88, 37,163, 18,  9,239, 31,109, 31,146,104,201,194,
+249, 77,114,186,203,201,178, 39, 95,150, 84,236,151,157, 83,143, 62,225,161, 90,214,162,165, 40,129,225,236,  3, 95, 80, 68, 70,
+ 33,162, 52, 78,186, 71,209,254, 57,  5,203,147,114,219,125, 49,173,172,165, 38,108,165,166,135,143, 45,208,149, 43,161, 87, 67,
+ 78,131, 84, 51,102,118,178,212,193,135, 53,208, 57,  4, 59,  6, 85, 31,249,133,133,228, 27, 75,238,169,176, 29,  9,109,110,165,
+ 53, 66,120,214,138,  0,159, 15,139,109,102, 86,241,226, 53, 90, 83,105,112, 85,141,219,210,244,220,134,238,226,109,229, 75,101,
+ 78,126, 31,201,130,180,212,157,202,146,149,  2,  0, 52, 31,209,171, 95,187,136, 26,170,199, 24,201, 15, 95,105,239,125,189, 44,
+ 53,120,138,225, 66, 79, 52, 54, 17, 84,  4,244,  7,225,  0, 84,168, 84,147,189,  6,137, 27,227, 62,  9,188,131, 13, 10,155,  3,
+ 32,184, 59, 29,110,160, 41,  9, 75,161,214,151, 66, 43,193,202,129,176,222,181,210,112, 74,147,118, 40,162, 45,219, 45,146,139,
+124,  6,202, 91,  1, 74, 90,148, 43, 85, 36,114, 34,131,112, 18, 18, 52, 81, 96,142,168,  6,162, 84,137, 29,189,189, 76,101,181,
+ 58,215,150,149,172, 15,133, 60,148, 91, 69, 82, 13, 60, 54,212,127,113, 16,162,113,202,149,137, 96,215, 31,154, 84, 63, 44,114,
+ 42, 83,170,  6,159,136, 60,190, 92,150,161,186,184,210,160, 86,130,157, 55,211, 89,120, 67,242,153, 89, 56,  6, 60,234,165, 51,
+107,130,218,190,101,194, 67, 32,  2, 64, 37, 66,174, 29,170,122,236, 61,192,106,140,166,250,164, 32,228,  5,222, 62,153,127, 45,
+123,157,239,  5,133,124,117,170,221, 33, 72, 23, 55, 28, 88,175,157, 84, 81, 64,211,160,166,201, 10,165,  6,185, 62,165,212,140,
+165,182, 60, 23, 97,209,236,142, 28,132,228, 89,211, 95,168,159,202,195,208,215,122,109,105,188,119,119, 23,105,156,181, 60, 60,
+217,241,218,122, 28,197, 20, 14, 52, 84,168, 74, 67,133, 52,240, 42, 35, 85, 33,146, 64, 12, 72, 43,183,187, 43, 31, 40,255,  0,
+ 86,168, 74, 61,174,210,247,134, 63,122,226,159, 80,222,135,189, 47,246, 66,249,106,199, 59, 27,142, 49, 13,165,190,149, 73,152,
+231,157, 41,229,178,133,  5, 31, 49,233, 10, 91,138, 28,146, 58,171, 91,253, 54,102, 71,113,119, 11,151,245, 21,152,213,213,229,
+211, 24,197,251, 56,251,248,253,233,  7,188,157,178,145,114,176,166,222,252,118,209, 62,221,205, 13,183, 80, 20,228,117,149,121,
+106, 72, 32, 18, 66,118, 62,253,107, 71, 37,164,235,140,157, 78, 25,115,190,111, 98, 94, 61,123,122, 53,176,  4, 41,  0,150, 67,
+ 73,160, 80, 73,228, 80,164,138, 84,210,190,250, 82,154,216,166,123,128, 43, 46,234,246,173, 22,151,228, 48,133,189, 25,196,200,
+140, 88,243,156, 65,113, 65,104,228,119, 29,118, 32,166,135,109,252,122,234,194,172,130,187,220,  9,182,235, 89,143,107,150,181,
+ 91,138,130,100, 49,181, 23,205,  9,167,194,107, 90,  5, 83,137,168,253, 26,102,116,146,180,121,220,175,207, 52,195, 73, 49, 29,
+160, 79,151, 84,  5, 85, 69, 73, 60, 62,239, 79,  4,129,190,164,  2, 98, 81,123, 52, 64,227,222,100,149,121, 47, 46,165, 47, 20,
+172, 22,235, 80,174, 98,170, 27, 84,251, 58,104,160, 38, 37, 88, 56, 94, 83, 17,187, 57,176, 92, 30, 10, 82, 63, 21,135,145, 68,
+252, 41,226,162,129,239, 27,170,158,237, 91,174, 65,146, 26,171,155,178, 89,155,238,221,161, 69,134,164,252,160,243, 18, 16,190,
+ 74,223,239, 37, 41,167, 77,247,213,200, 23, 10, 97,118,109,166,246,153,214, 73,141,169,  1,  7,130, 21, 64,165, 16,162, 18, 62,
+ 33,200,158,181,250, 61,154,248,143,213,122,103,228,  0, 27,250,146,237,254,241, 72, 29, 84, 44,186, 60,119,114, 59, 84,  8,224,
+ 37,193, 24, 40,123,121, 84, 40,141, 99, 68, 52, 18,117,170,253,134, 27,213,202,101,194, 48,229, 57,  8, 14, 68,246,159, 41, 28,
+149, 77, 70, 51,224, 20,193, 98,160,216, 99, 93, 32,223,226, 95,148,138,161, 43, 66,164, 87,216, 60, 62,173, 86,175,230,144, 70,
+ 58,  4,195,155,228,208,100,221, 16, 24, 72, 74, 82,162,149,143, 97, 52, 35, 77, 85,127, 55, 98,128,146,215,145, 74, 77,194,199,
+252,169, 73,254, 37,149,133, 33, 94, 36, 40,109, 77, 16,  6,  1, 11,154, 64,186,189,114, 72,101,100,144,252,117, 40, 56, 61,161,
+ 39,253, 26,183, 16,  1,241, 77,169, 10, 68, 59,138, 29,129, 30,114,207,196,219,171, 64, 81,254,170,199, 77, 53,240, 32,104,161,
+ 92,220, 33, 50,175,111, 66,159,243,169,168,142,149, 41, 15, 39,217, 95, 29, 40,  2,116,237, 86,  1,209,120,183, 37,235, 13,217,
+ 78,199, 81, 85,158,119, 23, 25,115,122,  5, 19,186,126,157, 30, 85,  2, 21,121, 88, 68,147, 66,146,185,114,147,127, 64,254, 45,
+176, 35, 72, 72, 31,121, 42, 27, 29, 13,158, 32,118, 40, 74,205, 82,102, 81,  9,216,193, 87,150,198,236,184, 90, 89, 31,213,174,
+172, 85, 39,100, 87,112,132, 90, 25,186,177,150,188,134, 18, 87, 22, 83, 62, 98, 58,144, 84,  6,227, 71,201,  2,202,251,194, 29,
+113, 32,167,142,218, 89, 83,  8, 92,110, 73,217,159,149, 90,211,238, 88, 59,131,170,248,150,249,145, 99,196, 40,219, 86,169,187,
+188,247, 56,243,112, 88, 55,244, 26,173,112,208,211,103,222, 54,167,232,209,204,117, 85,193, 98,169, 12,110,245, 50,217, 34,232,
+130, 42,228,166,210,210,125,212, 21, 35, 70,182,160, 68, 74,181, 18, 74,223,112,153, 62, 28, 71, 31,126,160, 45,180,  4, 39,127,
+ 29, 52,107,213,  8, 59, 21,109,250,112,184,202, 51, 46, 75,105, 63, 28,120, 60,137, 61, 10,202,122,111,170,214, 86,132, 11, 13,
+ 80,139,230,102,109,205,176,227,191, 12,245, 56, 92, 80, 61,119, 61, 53,  8, 86,202,221, 71,159,106,131,147,101, 23, 12,134,249,
+  9, 79,184, 92,117,161,201, 38,181,162,148, 40,  0,211,144,218,162, 66, 65,149,161,136,121, 24,254, 32,220,101,124,119,  5, 15,
+ 49, 67,216,165,253,209,170,224,110, 82, 22, 42,239,184, 89, 35,106,184, 55, 25,213,243, 48,194,138,192,232, 92, 89,160, 31, 86,
+141, 40, 48, 79, 41,186, 98,195, 93, 74, 45,140, 14, 84,248,121, 60,125,171, 86,244,213, 81,  6,114,152,205, 24,183, 94,156,102,
+226,197,177,213, 81,182,185, 73,113, 62,196,251,254,173, 60, 32,159,204,209,106,192,110,174, 79,203,229, 95, 66,138,109,172,173,
+ 74,  4, 86,132,141,205, 52,113, 29, 19, 25, 50,147,118,202,156,151, 61,119,103, 84, 75, 65,192, 25, 29,119, 42,219, 65, 33,181,
+ 77, 25,144,131, 74,202,213, 23,185,101, 42, 53, 45,  4,184,225,247, 41, 52, 58, 30,215,131,246,167, 18,100,181,156,185, 25,118,
+247, 87, 25, 35,230,155,150,167, 57, 10,116, 59,235, 66,191,132,109, 42,  0,169, 42,183, 64,149,133,198,147,194,146, 22,175,155,
+ 89, 63,214, 73,212,140,247, 58, 78,179, 33,143,110,143,111,249,116,182, 63,151, 37,191, 60,  5,116,243, 28,219,245,232, 85, 59,
+ 38,148,156,186, 93,145,113,182, 34, 93,190, 35, 31,  2, 99,172,243, 39,127,138,149,174,137, 45,206,158, 51, 68,114, 76,190, 59,
+209,235, 21, 53, 17,192, 91,135,250,196,154,105,246,188, 89, 64,241, 91,187,119,220, 97,111,122,227, 26, 75,149,130,150,139,197,
+ 53,175,199,225,166,242, 92,  0, 82,148,217,121,181, 95,227,179,  1,153, 79, 40,243,125,215, 30,122,157,104,170,208,104, 83,210,
+ 64, 36,250, 38,158,218,220, 24,188, 89, 23,109, 70,200,124,184, 72, 63,217, 86,195, 78,100,210, 66,226,189, 38, 74, 63,205,203,
+177,126,207, 36, 48, 15,254,173, 71, 76,220,212,183, 37,107,220,208,139, 76, 75,109,176,127, 15, 82,250,192, 31, 17,  0,237, 95,
+175, 86, 99, 29, 64, 41,237,249, 82, 94,125,149, 62,206, 36,251,110, 57, 71, 29,123,226,247,211, 86,171,168, 25,170,190, 99,  4,
+191, 21, 19,109, 24,172,139,212,138,166,227, 36, 37,166, 18,175, 15, 51,253, 90,182, 34,  4, 73, 74, 32,232,172, 46,215,199,122,
+217,219,235,204,200,130,146,164,182,220, 52,171,253,231,222,233,172,201,216,192,149,118, 53,185, 76, 86,199,173,248,163, 22,169,
+ 16, 71,154,171, 52, 55, 36,169,132,169, 40, 30, 98,200,  5,199, 22,175,133,  8, 21,169, 42,235,224, 10,168, 11, 98, 86,103, 31,
+ 31,179, 14,243,253,188, 18, 60, 89,124,200,245,169,221,171,159,118,123,175, 41,232,211,156,184,219,161,169,200,209,156,230,175,
+ 32,173,106,228,234,163, 55, 64, 16,217, 86,194,191, 17,  2,170, 36,239,175,166,125, 25,210,191, 97,131, 16, 99,182, 82,212,246,
+235,219,223,248,112, 83, 17, 84,196, 43,104,136,191, 63,133, 79, 34,165,169, 98,133, 70,155,  0, 20,122,123,117,213, 41,  0,202,
+219,237, 85,202,245,100,100, 50,228,215, 17,  1,208,135,223,102, 58, 90,224,164,175,227, 74, 84, 86, 43,191,142,199, 64,178, 59,
+149,218,100, 98, 21,163,134,228,178, 27,187, 25, 43,117,  1,197, 35,139, 97,117, 79,146,  9,  7,224,107,116, 18, 61,201, 26,132,
+171, 12,143, 27, 53, 86,166, 37,147,223,236,252, 92,199,102,182,167,  1, 42, 17,229,151, 90, 73,216,  2, 84,  2,208,119, 59,252,
+ 58,163,117, 81, 35,130,187, 81,144, 58, 21,112,218,153,178,103,152,180,104, 23,171,120, 18,219, 72,105,197,249, 18, 62, 53, 41,
+ 74, 89, 82, 23, 32,  4,134,192, 36,130,  9,253, 52,214, 60,160,107,145, 33,106,129,188,106,128, 93,189, 30,216,165, 60,155,245,
+184, 44, 41, 65,208, 26, 37,196,114,105,142, 43, 42,230,177, 94,  5, 75,222,130,190, 26,156,122,140,248, 21, 31,217, 68,168, 86,
+ 14,217, 59, 97,101,139,109,150, 10,155,138,162, 27,146,235,104,252, 69, 85, 37,197,110,104, 82, 14,196, 10,116,235, 93, 79,207,
+221,169,213, 55,237,155,130, 62,239,111, 46, 46, 48,234,147,  1,100,176, 82,130,174, 32, 40, 14, 59,  2, 87,176,169, 30, 62,237,
+180, 49,102,161,210, 56,250, 45, 24, 87,167, 12,178,249,115,100,  8,197, 45,  5, 37,181, 56,174, 67,136,116,113, 21, 36, 86,128,
+ 87,113,215, 70,187, 32, 68,119,170,159,180, 37,116, 87, 98,189, 45, 90,241,251,165,189,119, 40,193,198,220,113,180,191, 41,124,
+ 67,110,169,106, 42,  9,230,106,105,238,  3,235,214, 94, 70,105, 49, 40,213, 97,128, 67,175,169,253,146,193, 96,226,120, 44, 43,
+124,101,  5, 35,202, 77, 82,132,241,108, 87,127,133, 52, 31,167,125,102,244,236, 49,105, 50, 37,100,117, 92,163, 43, 25,153,145,
+252,143,  4,197, 50, 88,229,139,244, 54,164,180,161,196,165,196,131,215, 90, 57, 61, 54,184,135,118, 42,149, 25,214,215,242,146,
+185,207,212,239,161,238,215,229, 54,177,125,129, 21, 13,200,140,146, 26,111,203, 11,160,161,216, 29,141, 42,117,154, 50,103,142,
+ 88, 29, 22,198, 53,255,  0,185, 45, 49,170,249,215,234,103,181, 12, 67,150,245,145,  8,228,244,116,121,141,167,129, 63,  3,103,
+226, 64, 81,232,164,157,233,253, 26,214,162,211, 48,234,221,149,237,209,112,231,126,177,169, 23,  7,216,122, 50, 82,214, 65, 21,
+ 40, 42, 72,  4, 23, 60,186,132,  2,158,160,144,120,253, 90,232,112,167,162,199,204,130,161,110,243, 46,240, 36, 42,225,108,105,
+ 73,101,214, 40,161,184,248, 84,157,234,  0, 29, 64,  4,123,245,172, 36,178,  8, 74,206,192,191,161,196,183, 41,165, 54,  1, 33,
+ 69, 35,239,  4,149,  2, 77, 61,226,157,124, 61,218,155,178,101,180, 79,144,133, 37,207,151, 81,125, 52, 11, 65, 80, 90, 73, 79,
+ 34, 20,149, 87,122, 80, 83,253, 58,115, 36,204,137, 76,204,195,173, 41,181, 32,137,192,113, 90,233,247,130,192,165,124, 42, 52,
+132,153, 38, 94,237, 25,140,132,203, 67,145,208,164, 71, 85, 91, 75, 78, 14, 73, 85, 73, 10,235,184,240,240,209, 33, 36,220, 23,
+ 71,122, 93, 98,101,211, 37,142, 84,219,172, 50,148,165,194, 22,127, 14,158, 36,151, 57,  2, 62,158,154,185, 11,153, 22,184,185,
+ 93,175,219,220,219,  4,189, 92,127,201, 22,219,155,107,184,186,148, 22, 25,248, 18, 73, 78,202,108, 20,147,189,122,  3,245,107,
+199,126,165,122, 50, 89,245,156,204,120,189,177,249,135,247,135,110,173,168,211,159,  7,231,162,183, 44,112, 70,137,177,203, 11,
+146,114, 21, 92,100, 33, 72,126,  8, 82,144, 22,146,154,130,142, 52,223, 95, 61,100, 66,116,141,147, 12,123, 15,219, 95, 98,168,
+ 33,170,101,197,226,197,110,237,104,142,247,239,  3, 15,200,116,255,  0,124,113,  0,215,221,170, 33,221, 40,234, 86,252,115, 22,
+133,112,147, 46,214, 64, 46,199,125, 69,105, 52,175,150,164,109,250,117,  2,  8, 36,171, 58, 29, 18, 39,112, 49,246,224,221,164,
+ 72,173, 97, 21,182,133,120,113, 87, 16, 52,106, 78,224,156, 65,151,139,130,139, 55,178,218,235,195,202, 96,130,122, 29,182, 58,
+ 53,177,254,158,138, 16,139,113, 81,238,214,139,114,217,118,104,  2,174, 35,204,167,191,238,157, 14,162, 75, 30,196, 72,192,  7,
+ 73, 56,172,113, 41,235,134, 45, 33, 84,113,165,135, 89,254,234,183, 78,180, 50, 65,218, 36, 22,125, 81,109, 20,252,179, 15, 84,
+ 75,117,221,247,  5, 60,150, 90, 90,193,246,147, 74,232, 48,147,144,138,205,162, 71,199,178, 87,134, 52, 45,242,149,201, 37,242,
+ 88, 39,246, 84,147,225,173, 51,  4,  2, 53, 86,148, 52, 41,200, 13, 93, 34,142, 81,213, 21, 46, 58,145,226, 65,166,179,165,240,
+132,246, 85,170, 29,116,179,252,230, 45, 47,229,192, 91,242, 30, 66, 66, 79,133,126,241,251, 53, 26,230,210, 69, 17,209, 52,118,
+151,182,145,231,150,229,200, 64, 72,108,173, 13, 41, 67,168,225,211,125, 74,203,  8,  8,176,136, 65, 92,142, 44, 54,251,182, 47,
+108,169,121,228,184, 82,179,185, 41, 39,115,244,106, 84, 71,226,222,163, 54, 91,111,214, 39,239, 56, 77,174,202,181,213, 48,163,
+161,199,149,239,229, 82, 62,205,104, 59, 49, 89,230,179,185, 33, 90,112, 71,175, 25, 19,240,162,182, 75,252, 86,224,227,224, 86,
+ 54,174,148,236,208,  5,106, 35, 69, 63,188,152,164,139, 30,101, 97,192,163,163,148,245,195,105,249,101, 63,247,170, 20,167,213,
+169, 87, 39,121, 33, 74, 46, 25, 53, 98, 18,162, 97, 57, 92,156,117,135,  7,203, 64,143,243, 23,103, 73,251,203, 82,107,195, 80,
+144, 40, 86, 69,180, 84,198, 67,150,221,115,188,197,217,177, 63, 10,220,227,202, 76,100,143,  6,208,170,109,245,232,230,161,  1,
+170, 36, 74,126,196,237,200,106,122, 29,144,121,169,134,170, 74,191,173, 81, 82,126,189,103,201,228,236,160,100, 93,147, 30,107,
+220, 88,216,141,136, 56,135, 57,220, 87, 80,132,141,201, 89,216, 83,232, 26, 37, 84,104,167, 25,106,202,160,187,230, 78,221, 46,
+205, 70,106,170,125,215,  2,151,190,229,100,236, 53,103,200,209, 74, 83,213,149,194, 38,167, 26,110,215, 99,121, 64,206, 74, 18,
+252,148,255,  0,109, 99,149, 15,208, 53, 82, 85, 62,138,123,144,215,242, 73,108, 99,247, 12,177,229, 86,229,117,145,242, 48,135,
+177, 35,225, 37, 62,237, 76, 82,193, 39, 77,246,230,145,141, 96,144,227,180,104,235,169, 83,146, 20, 77, 54, 61, 73,208, 46, 60,
+130,121,142, 73,110,195,144, 38,234,183,230,201, 87, 27, 92,110,110,138,244, 33,190,154, 22, 68, 26,  0, 14, 42, 32,185, 73, 22,
+188,213,251,142, 67,116,188,185, 85, 59, 32, 43,202, 79,246, 65,219, 70, 56,255,  0,  4, 66,145,150,171, 91,247,217,158, 76,166,
+ 36, 40,213, 92, 84,  9,175,245,117,110,202,120, 21, 88, 76,137, 38,203,198, 67,228, 98,173,179, 31,102,252,132, 33, 52,241, 36,
+212,232,112,135, 20,140,245, 43,199,118, 46,206,199,237,226,209, 27,105, 76,180,203,142, 17,215,143, 93, 18,170,190, 32, 59, 84,
+ 68,221, 84,191,231,  9, 15, 50,110,  9, 63, 14,203, 42,175, 66,  5, 14,143, 58, 94, 76,167, 25, 40, 47,119, 77,113,109, 83,210,
+242,183, 91, 39,141,125,160,234,197,120,206, 83, 78,107, 87,111, 50,217,247,152,111,249, 39,227,125, 21, 82,189,192,239,163,156,
+112, 16,201,220,142,227,185,211,215,102, 31, 96, 18, 81, 29,222,  3,251,164,208, 29,102,229, 99,237, 46,137, 25,185, 79,152,118,
+108,172, 99, 34, 22,228, 43,240,211,193, 66,167,193,205,143,235,213, 99, 83,234,155,118,169,201,182,100, 43, 59,118,127, 35,228,
+ 33,109, 72,229,239, 91, 14, 46,159, 98,116,182,124, 41,110,213, 14,237,195,104,184,150,221,157,187,239,180,178,132,157,194, 25,
+ 66,126,247,214,116, 27,102,197,213,194, 52,100,155,124,195,134, 71,155, 65,178,253,235, 92,112,227,239,167,192,210,170,  4,234,
+223, 78,191,115,146,170,217, 79,  5,187, 57,199,221,145, 34,223,106, 41,227,200,124,225,246, 83,142,212,253, 90, 44,239,248, 76,
+ 81, 68,  0, 78, 93,177,179,202,186,217,191,203,237,158, 17,213,206, 91,228, 16, 10, 80,216,226,  9, 59,208,106,149,146,  4, 34,
+192,234,169,175, 90,157,212,186,118,231,180, 18,236,248,161, 75,  2,226,240,183, 45,218,173, 46, 62,165, 87,154,170, 13, 74, 82,
+158,181,235, 79,234,212, 43,187,244,  7, 77,142, 94,116,119,235,182, 36,247, 14, 31,111,237,100,226, 58,174,  5,139,106,151,126,
+186,189, 49,180,131, 17,189,156,125,123, 37,  9, 42,227,201, 68,144,  1, 81, 27, 10,212,235,232,162, 91, 64,143, 16,234, 38, 85,
+108,142,137,129,166, 92,242,210,146, 79,156,177,247,129,223,109,171,211,175, 77, 60, 74,140,194, 35, 99,153, 54, 43,160, 66, 88,
+ 75,169, 33,106, 88, 60, 73, 59,159,216,232, 71,215,167,100,226, 69, 60,226, 25, 11,182,214, 75,183,143,198,158,170, 20,114, 10,
+168,166,252,184,  5, 38,170, 63, 70,162, 98,234,197, 82,237, 87,111, 99,174, 44,230, 23, 22,224,194, 92,175,230,  2,129,111,240,
+142,160,138,251, 75,138,175, 31,109, 21,211,192,235, 43, 44,109, 91, 24,165,202,250,149,232,187,211, 68, 70,112,200, 25, 62, 90,
+ 32,200,152,166,212,164,221,  2,213,231, 41,181,184, 20, 91, 12,134,  5, 42,221, 64,161,226, 79,183, 92,142,102, 80, 50, 96,235,
+ 98, 47, 17,222,173,165,118, 35,  9,184,201,254, 83,103,101,182,218,142,163, 20,147, 21, 62,106, 68,129,201,214,234,148,168,165,
+ 42, 41,168,174,255,  0, 71, 77, 87, 54,144, 53, 68, 19,101, 34,127,162,238,222,  8,110, 72,141,198, 58,231, 60,167, 84, 80,130,
+ 62, 42, 42,158, 41, 36, 80,210,148, 31, 70,130, 50,230, 19,139, 65, 44,200, 77,159,209,238, 43,100,140,252,119, 82,153, 41,146,
+165, 21,198, 64,122,142, 43,204,  9,231,178,193,228, 42,  0,169, 32,  3,211,218,231, 54, 74, 68,197, 74,199, 61, 48,192,178, 67,
+126,222,244, 46, 44, 54, 80,219, 41, 41, 33,106,109,  0, 41, 41,234, 77,118,161,216,116,208,236,203,151, 30,105,124, 37, 66,204,
+ 48, 73,150,194,133, 91,217, 91, 11,130, 27,119,229,208,148,249,137, 72,113, 36,185,182,201,173, 13, 43,184,247,233,161,107,241,
+213,211,109,236, 87, 87,106,125, 83, 99,239,217,226,217,175, 15,161,187,209, 75, 73, 17,247,228,149, 20, 37, 75, 36,253,221,138,
+169, 74,254,173, 74,187, 44,171, 64,178, 51, 58,100,109,150,225,196,241, 86, 60, 62,238, 99,151, 84,173,200,143,  5, 70, 66, 74,
+202,129,173, 18, 15, 30, 70,158,221, 18, 89,114,151,204,179,127,210,164, 18, 55,115,187,180,155,123, 82,146, 28, 66,225, 22,194,
+185,114,221,  5, 68,129, 90,234, 59, 68,202,210,199,198, 21,248,174,  8,245,105,150,219,111,153,100, 59,181,149,  1,114, 80, 86,
+ 36,160, 29,184, 41, 60, 87,204, 39,122, 19,202,149,214,214, 38, 62,133, 26,219, 25,115,231,125,123, 21,137,100,214,225,147, 33,
+174, 18, 36,  4,172,200,106,129, 74,109, 73, 36, 10,141,141, 20,106,118,235,171,248,119, 24,157,170,174, 85, 27,131,174,102,202,
+123, 49,136,218, 46,201, 74,137,110, 40,115,247, 15, 37, 77,144,150,213,205, 20, 36,116,232, 62,173,116, 21,146, 66,193,182, 12,
+ 82,106,251, 69,110,152, 60,169, 79, 52, 74, 18,165,208, 84,158, 94, 95, 50,  5, 71, 66,181, 42,187,215,122,232,193,208, 76, 66,
+136, 61, 62,170,241, 58, 52, 88,204,241,226, 67,203, 84,100, 14,102,131,192,109,189, 72,174,219,211,232,210, 54, 55, 20,133,  6,
+ 92, 23,236, 63, 73,119,151, 82,183,158,101,201, 72,113,192,162,181,182,148,166,133, 59, 80,159,103, 34, 58,105,188,225,218,138,
+ 49, 10,177, 59, 27,232,251, 16,141,116, 98,102, 65,107, 14, 73,109, 97,208, 29,146,149,164,211,127,221,165,178,  0, 32,120,154,
+234,189,247,202, 33,129, 86,104,196,143,243, 46,131,201, 59, 71,142,195,198,184, 89,236,101,166, 84,128,143, 62,205, 23, 96,144,
+118, 73,113,176,170,154,143,218, 26,169, 70, 77,128,235, 39,241, 43, 70,120,245,182,145,101, 78,222, 44, 89, 94, 27,116, 76,247,
+ 30,117, 49,138,184, 69,118, 74, 28, 82,146,160,106, 42,164,132,208,253, 71,232,214,237, 57, 59,130,207,148, 12, 75,174,157,244,
+251,222, 25,121,189,137,252,119, 39,144,217,200,221, 74, 20,212,151,129, 74, 36, 20, 39,143,150,104,148,241, 81, 78,193, 85, 31,
+ 78,188,163,215,190,135, 25, 82, 57, 52,  2,228,124, 81,  0, 16, 88,104, 72,112,207,193,198,186,113, 66,200,173,195,132,223,105,
+200, 34, 51,153,205,109,231, 22,204,168, 97, 16,148,195,136,170,144, 80, 62, 33, 94, 67,199,221,175,  6,191, 14, 48,147, 18, 65,
+ 28, 65,  3,248,172,232,150,116,115, 16,203, 32,198,238, 68,245, 37,194,166, 93,183,169,231, 10,146, 18,  2,208,120,142,138, 86,
+171, 79, 28,109, 36, 31,187,251, 84,140,217,138, 85,206, 36,139,165,182,105,111,103, 36,187,243, 42, 31,213,  9, 77,  6,171,225,
+ 86,196,130,172, 78,122, 58,  3,113,186, 46,241,133, 69,189,176,170, 92,216, 96,177, 41,  3,239, 81,181, 85, 11,250, 41,171, 77,
+240,144,161, 57,234,180, 93,239,234,107, 25,141,112,167, 36, 56,164,161, 95,250,193,254,157, 54, 13, 79, 19,226,152,218,150,108,
+138,110, 85,233,219,228,115,198, 64,109, 77, 45, 63,218,105, 85,213,198,113,180,170,228,182,170,208,203, 45, 76,221, 93,118, 18,
+ 71, 20,221, 45,109, 42,158,213,240,255,  0, 78,171, 70,189,179,  8,126,118,139,153,100,179, 38,209,141,159, 63,103, 88,150,232,
+ 62,208, 82,170, 87, 91,  7, 82, 20,201,209,213,139,219,220,237,228,227,174,195,144, 69, 88,  1,183,  1,241,109,225, 64,126,163,
+172,252,154, 81, 55,184, 78,178,100,197,139,142, 53, 63, 97, 21, 40, 14,169, 94,213, 26, 38,154,  0,165,202,104,201, 62, 98,153,
+ 52,107, 54, 40,242,211,254, 37, 12,  4,178,159, 16,167,198,234,251, 52,178, 96,208, 36, 34, 86, 92,178, 65,179,170, 21,199, 39,
+126, 99,139, 41,140,218, 62, 81, 69, 93,  8,221,100,234,116, 68,236,  3,185, 52,198,171,212,  9,235,147,104,147, 13,162, 74,164,
+185, 84,211,193,164,171,141, 52,113, 39, 74,113,  0, 38, 12, 34,221,  6,201,127,152,251,200,  9,113, 46, 48, 86,124, 74, 82,158,
+ 92,126,221, 85,184,157, 20, 15,  5, 19, 39,106, 37,223, 47,147,154,202, 64, 47, 71, 74,150,149,145, 90, 33,191,138,131,235,213,
+152, 89,182, 44,152,  5, 95, 99,152,245,234,255,  0,141,222,239, 50,171,252,202,241, 37,231, 10,252, 67, 41, 77, 71,213, 77, 75,
+ 39, 36, 68,196, 40,237,116, 15, 22,193, 99,218,238, 48,217, 79,196,211,108, 56,226,213,253,162,106,  6,139,101,226,101, 74, 53,
+178,118,129,142, 61, 34, 28,133,176, 13, 29, 91, 44,169,105,247,252,103,245,105,160,200, 70,191,137, 87, 22,203,117,195, 57,151,
+124,190,206, 10,249, 43, 59, 79, 56,132,170,180, 73, 74,138, 19,245,154,106,252,154, 44,  2, 85,214,202,119,100,187, 88,139,194,
+221,205, 46, 71,149,186,218,224,158,239, 33,212, 20,158, 35,237,212,204,128, 32, 40,206, 58,166, 73, 16,238, 87, 43,138,242,151,
+235,252, 91, 15, 62,200, 62,  5,103,130, 71,212, 53, 82,168,130, 83,148, 49, 49,229, 77,185,217,109,178,  7,255,  0, 13,130,201,
+121,  0,116, 83,165,116,174,158,233,129,162,156, 66,115,201,103, 63, 60,181,143,180,174, 44, 60,  2,  2,135,136,  9,255,  0, 78,
+179,156, 72,186, 39, 20, 30,101,177, 17,237,169,176, 67,248, 95,152,219,173,109,237, 66,107,250,117, 10,190, 50,231,146,114, 25,
+ 40, 97,216,231,201,223,214,220,189,144,148,241,226,124, 20, 78,250,186, 44, 28, 20, 64, 70,123,165,141, 69,136,184, 73,182,208,
+ 33,104,226,225, 31,182,177,169,202,231, 12,135, 58,223, 84,207,103,197,227, 93,112,203,127,205, 15,139,205,249,115,244,  1, 93,
+ 85,149,187, 53, 76, 43, 82, 51,252, 37, 87, 56,115,224,179, 95,150,117,182,218, 65, 63,212,109, 28,206,167, 12,151, 46,154, 53,
+106,170,187,111,103,165,201,130,227,105, 71, 27, 75, 40, 87, 37, 83,239,184,191, 15,171, 86, 70, 83, 57,230,159, 98, 11,147,118,
+ 13,215, 95,108, 13,163, 52,194, 82,177,189, 20,235,138,216,106,205, 25,193, 47, 40, 20,115,183,157,149, 86, 53,143, 75, 97,223,
+134, 73,254, 28, 43,217,207,115,170,121,125, 65,230, 25, 60,106, 70,251,119,233,253,171,108,167,163, 56,174,102, 65, 67,197, 35,
+246, 80,216, 36,143,183, 67,202,205,222,124,  2, 94, 91, 40, 89, 70, 29, 42, 22, 91, 26, 52, 74,151, 19,248,178, 92, 30,222, 95,
+ 10,126,161,161, 67, 32,  8, 38, 21,186,188,  6, 47, 27,228,213,103, 64, 63,206,127,151,166,115,138,253,175, 55,201, 41, 66,127,
+254, 95, 45, 80,253,225,103,228,155, 96,116,135, 96,121, 54, 86,174,  1,147, 67, 21,161, 21, 39,217, 84,238, 62,189, 60,200,153,
+101,116,214, 80,251, 36,182, 89,182,127,152,221, 80, 15,188,227,177,146, 63,105, 72,165, 13, 53,114,152,249,113,110,106, 22, 71,
+ 84, 42, 69,226, 77,238,107,210,102, 42,169,142, 26,140,221,127,101,180,158,159,102,167,102,131,189, 12,171, 75,177,236, 70, 24,
+156,171,228,128,159,152,156,181, 70,104,175,163,108, 55, 85, 45, 95, 70,218,167,100,182,104,165, 18,184, 39,214,239,118,109,185,
+207,112, 29,182, 70, 80,114,201,106, 91,200,105,178,104,133,184,163, 69, 41, 64, 31,  0, 41,246,253, 26,250, 55,233,231,166,207,
+ 79,198,243, 39,243,216,  3,142,193,197,191,  4,106,227,205, 85, 24,150, 31, 34,239, 29, 87,135,220,227, 25, 35,204,105, 41, 72,
+ 13,165, 36,208,  0, 18,  0, 21,175, 65,174,238,235,  0, 42,237, 85,184,116,  3, 34,198,210,226,214,134,202,148,134,198,206, 40,
+ 84,124, 70,160, 82,189,104, 70,139, 81,112,171,219, 21, 14,212, 80,218,203,107, 80,242,105,192, 45, 20,228,181,248, 20,138,211,
+167, 78,186, 40, 66,224, 20,103,174,159, 39, 32,165,189,170,162,128,133, 18,107,190,230,136,235,169,152,232,161, 25,106,186, 71,
+209,253,234,215,109,188,195,185, 93,  0, 48,138,208,162,243,172, 50,144, 56,147, 74, 41,224,164,141,246, 31,134, 78,179,178,232,
+ 50,142,156, 86,230, 45,192, 21,245, 47,179,158,167,145, 38,202, 45,136,156,164,196, 33,190, 41, 73,112,164,165,163,189, 20,191,
+105, 29,104, 62,141,114,215,224, 16, 93,150,213,119,137,112, 87,159,111,251,209, 98,113, 42,189, 72,105, 79,184,232, 42,230,211,
+142, 46, 64,112, 40, 13,254, 34, 13, 27, 42,233,239,250,179, 47,199, 60,145,120,171, 91, 24,191,218, 51,155, 90, 17, 99,112, 22,
+ 93, 75,111,182,183,169, 84,186,164,171,194,180, 32,142, 53,160,167,214, 53, 66, 64,196,178,129, 27, 75,168, 57, 23,243, 43, 14,
+ 67,  2, 51,  6,136, 75, 95, 50,182, 82, 42,158, 64,130,178, 15, 95,133, 94, 21,246,141, 76, 64, 72, 58,156, 38, 36, 10,117,130,
+242, 94,152,196,181,214, 75, 77,  5,186,181, 54, 72,169, 53, 66,185, 17,236,118,160,141,  0,197, 84,155,109, 32,105,246,254,  9,
+103, 55,198,173, 81,242, 54, 89,150,145, 42, 43,129,181,  4,186, 10,144,138,252, 65,183, 56, 40,114, 32,159, 29,137,211,  8,171,
+ 24,215,153,215,168,230,127,130, 11, 35,210,214, 37,125, 97,219,197,190, 47,203, 78,243, 60,213, 37,148,134,208,165,157,254,238,
+199,165,  5,  9, 61, 61,250,144,178, 65, 70,121,113,140,128,146, 89,201,187, 37,220,236, 66,222,244,108, 66,121, 31, 52,149,198,
+ 74, 92, 11,251,138,108, 21, 21, 80, 80, 10,131, 77,182, 58,113, 99,241,  8,144,178, 19,224, 82, 62, 77,216, 30,249,230, 81,159,
+102, 21,201,134, 99,178, 91, 76,170,121,161,245,150,218, 40, 71, 20,241, 80, 41,226,  2,190, 35, 82,117,102,172,170,226, 93,138,
+148,224, 56, 58, 90,198,253, 37,199,198,236,178, 50, 44,149,196,220,174,110, 21,170,174, 32,171,128, 63, 17,226,  9,  6,162,191,
+102,172,217,212, 37, 54, 17,209, 60, 49,163, 19,174,170,157,239,156,235, 54, 63, 21,219, 61, 16,134,144, 56,164,164, 33, 13,168,
+236, 65, 52,166,231, 96, 71,187,219,171,216, 85, 74,122,148, 28,137,136,133,198,253,227,189,166,229,118, 13, 71,101, 41,144,131,
+200,133,243, 35,219,183, 42,154,125, 52,215, 97,137, 81,136, 92,190,101,128,148,163,105,182,194,126,158,115, 64,172,168,114,227,
+ 95,133, 84, 30, 34,155,251, 14,174,237, 84,163, 48,156, 48,132, 67,133,120, 12,202,108,170, 47, 34, 80,130, 86, 40,144, 62, 32,
+ 40,124,107, 93,142,129,109,123,149,154,236,101,111, 97, 16,113,213,201,249,184, 42, 79,157,195,128, 15,242, 13,186, 20,154,148,
+ 41, 67,122,245,  0,235, 58,200, 16,175,  9,186,177,113,108, 46,199, 57,182,153,148,133,180,225, 42,242,212,144,151, 27, 82, 82,
+118,  4,157,197,  0,165, 82, 70,218,165,101,146,138, 52, 64, 71,174,248, 34,229,180,227, 50, 31, 44,195,251,222,122,  2,100, 37,
+105,  6,148, 80,120, 26, 80,232, 49,150,175,197, 24,203, 86,224,149, 59,165,233,214, 85,199, 15,114, 67, 95, 42,243,209,210, 93,
+109,214, 86,219,110,  4,141,247, 67,169,228, 62,165,  1,239,209,232,203, 17,152, 10, 19,134,232,170, 27, 19,181,163, 16,200,154,
+152,251,101, 60, 28,  1, 14, 54,175, 52,245,169, 33, 64, 19,255,  0,165,174,158,155,  4,130,167, 18,202,243,159,108,135, 33,136,
+153,181,186, 91,210, 17, 45,104, 76,181,190, 18,126, 93,196,164,  4,161,106, 70,252, 72,160, 73, 35,110,149,166,188, 83,234, 95,
+165,161,140, 70, 69,111,182, 68,191, 96,231,199,240,117,159,151, 64,131, 17,205, 47, 12,170, 84, 28,149,198,210,225, 75,238, 39,
+202, 89, 59, 30, 53,173, 53,227,176,173,156, 21, 82,193,193, 75,139,126,147, 44,220,223,121, 95,128,212,117, 43,174,223,116,129,
+160,211, 91, 74, 73,132,180, 74, 24, 62, 88,235, 51, 35, 67,144,121, 67,153, 25,113, 22,159,122,137,  3, 86, 12, 24, 21,  9, 79,
+177, 49,201,142,134,177,244, 88,221, 38,173,171,204,229,236, 13,170,187,253, 90, 22, 33, 12, 71,122,105,104,171,135, 50,101, 90,
+ 46,247,  8,205,168,249, 77,200, 87, 78,148, 88,  6,154,212,149, 95, 16,239, 67, 18,119, 10,245,190,228,169,114,215,137,100, 80,
+199,240,242, 34, 37,128, 71,181,  7,112,126,173,  2,202, 90, 74,177, 58, 21,206,185,237,208, 62, 47, 48,120,241, 82,102,172,132,
+251,150,170,234,212,107,105,  5,102, 50,248, 71,122, 31,136,222,231, 63,122, 92,116,147,242,206, 71, 90, 92, 30,246,141, 65,211,
+223, 88,218,234, 64, 18,173, 89,179,238, 47,246,166, 44, 26,147, 53,197, 37,197,164,245,242,146, 65, 21,213, 17, 16, 36,197, 79,
+ 80, 21,235,106,244,189,234,111,184, 22,168,151,172, 31, 13,186,200,181,201,130,193, 75,206, 70, 84,118,150,164,166,149, 74,228,
+240, 10,250,142,180, 15,167,179,178,107,122,233,145,  7,185,191, 22, 86, 33,161, 66,103,122, 65,245, 71,133, 50,234,242,204, 38,
+237, 22,222,176,183,228, 77,110, 42,164, 50,208,109, 28,135, 55, 35,115, 74,107,239, 35, 82,159,167,179,177,224,246, 83, 32, 27,
+139, 63,224,233, 18,229, 47,250,122,178,255,  0,155,178,198,173,203, 73, 83, 45, 44, 50,229,125,137, 62, 98,171,246,107, 31,229,
+  9, 89, 39,  8,235,240,100,204,202,238,240, 98,143,196, 19, 84,202, 71,246, 81, 82, 79,217,170, 89, 32,128, 16,193, 80,178,167,
+ 88, 89,184,121, 84, 68,  0,134,160,177, 79,218, 52,170,207,219,161,202, 70, 62,228,224,169, 54,232,214,251, 22,  5, 53,210,  2,
+ 94,110, 41, 40, 30, 53, 89,227,250,181, 74, 82, 54,106, 82,125, 85, 91,112,184,181, 17,210,227, 63,119,229,202,234, 61,251,106,
+205, 19, 59,145,137,209, 57,224, 87, 85,189,218,249,207, 55,188,240,224, 83, 96,141,232,164, 17, 95,171, 90, 82,150,210, 16, 74,
+203, 54, 31, 18, 47,105,114,119, 88, 64, 18,174, 70, 48,  0,108,106, 82,121,126,157,244,213,229,188,246,246, 36,189,118,110,216,
+199,249, 54,237,138, 16,  3, 69,134, 67,171, 63,217, 30,221, 44,188,205,182, 69, 68,135, 81,187,138,136,246, 41, 81,109,113,254,
+ 22, 35,183,229, 45, 35,216, 17, 81,250,244,104, 88, 68,138,104, 33, 12, 90, 98, 69,110,205, 52,185,248,105,142,243,203,223,169,
+230, 72, 26,141,182, 19, 36,137, 68, 93,182, 59, 42,209,106,190,196,170,149, 29, 74, 46,145,185,226,179,177,208, 12, 90, 41,110,
+209, 71,102,142,100,102, 99,195,225,134, 86,175,119,197,190,158,161,183, 69, 53,213, 93,135,238,222,107,218, 63, 73, 54, 92,147,
+181,114,218,182, 92,110,249,  5,245, 51,100,136,112,164, 56,235, 76,177, 21, 77,160,170, 83, 78,108,146,163,211, 94,183,233,108,
+137, 81,211,163, 40,104, 76,228,229,135, 96, 84, 51,175,149, 96,109, 44,235, 85,219,189,118,238,236,195,106, 55,127,113, 11, 30,
+ 99,  9,193,201,114, 92,132,213,178,230,129,226, 88,155,109, 13, 45,  7,233,  4,123,181,127, 34, 85,100,134,190,168,207,189,154,
+ 94,240,197, 82,135, 80,156, 78,186,170,235,212,175,107,112,158,202,247, 33,142,217,224,139,146,188,120,174, 13,213,132, 92, 86,
+135, 36, 50,139,132, 70,229,249, 74, 91,105, 72, 87, 15, 51,136, 52,173, 58,215,174,188,195,213, 93, 54,188, 12,163, 85,110, 98,
+192,235,199, 80,235, 92,205,192, 40,119,120, 27,131,138,218,225, 71, 77,  5,194,117, 82,148,142,161, 42, 32,126,173,115,244,135,
+ 83, 28, 18,198, 69, 99, 70, 45,138,188,169, 95,  2,150,158, 73, 73,219,117, 29, 16,234, 11, 37, 18,145,103, 93,218, 49, 35,186,
+237, 56,184,164,  1,239, 45,154,233,226,241, 10, 71,130, 46,244,180,162,203, 17,245, 80, 42,115,138,118,135,197, 64,209, 41,208,
+ 68, 53,116,194, 90, 35,118,199,191,148,135, 60,149,  3, 53,109,134, 83,238, 39,169,208,203,142, 41, 21,169,156, 78, 50,101, 42,
+229, 62,132, 37,105, 42, 81,241,161,228, 70,250,168, 38, 73, 33, 52,142,136,160,190, 56,139,153,191,212,124,203,142,  7,184,215,
+254,193,182,203, 28,126,197,234, 60,153, 50,141,155,118, 55, 42,197, 24,114,229, 30, 59,175,218,100, 60,228,201,110,210,170, 73,
+ 41, 60, 83, 64, 55, 72,246,235,175,204,232,226,169, 25,213,168,110, 31,195,181,118,249,253,  6,117,107,  0,225, 87,145,109,222,
+108,132,197, 97, 36,181, 13, 44,178,218, 60, 11,178, 20,  1,247,107, 46,118, 57, 11,157,158, 58, 30,237,173,113,141,198,222,159,
+138, 66,100, 20, 40,143,113, 52,253, 58,140,172,224,171,154,121,167,123,197,237, 88,  7,111,222,198,152,113, 49,229, 51, 13,201,
+ 18,102,184,126,  8,204,173,  3,146,206,196, 19,191,194,159,218, 86,221, 42,117, 44, 28,127,220,228,  7,  4,135, 12,  7, 51,249,
+120,161,  8,176, 95, 49,123,131, 49, 23,155,212,149,199,169,101,215, 22,176,227,212,228, 82, 85,178,143,212, 54, 31, 71,211,175,
+175,113, 43,242,235,140, 72,224,  7,224,142,  6,128, 43, 86,204,221,130,201,218,216,241,212,121, 73,100,  5, 56,225,216,184,  2,
+107,193,180,251,214,  8, 39, 84,229,172,214,156, 64, 16, 84,222, 93,146,137,146,159,124, 16,219, 15,168,169,  0, 84,  0, 84,147,
+ 80,144, 41,225,176,214,173,113, 96,179, 45,155,165,185, 89, 60, 24,235, 83, 76, 26, 57,200,161,  1,190,136, 20,175, 47, 10,157,
+ 16, 32, 74, 64,168,234,125,239,153, 67, 45, 10, 62,104, 18,144, 42, 41,215,236,174,231,219,162,136,186, 31,  5,208, 93,141,184,
+ 69,181, 51, 30,243,125,123,230, 46, 43, 37, 44, 52,234,199,  4,165, 35,175,197, 95, 15,  0, 62,221, 35, 82,177, 27,153,116, 70,
+  9,222,115,111, 44,190,191, 44, 62,165, 81,178,  1, 73, 74, 58, 18,  2,118,165, 14,213,213, 43,177,119, 43,212,229,178,186,112,
+ 79, 80,178, 36,165, 76,153, 42, 49,138,120,164,242,160, 53, 59,128, 41,184,166,219,253,154,199,200,192,  3,146,213,163, 45,215,
+ 97,122, 69,239, 37,149,251,139, 78,201,124, 60,211, 12,209,  9,111,145, 73,116,173, 75,224,144,104, 73, 34,181,219,160, 79,191,
+ 92,198,125,  6, 28,190,204,180, 28, 89, 22, 93, 35, 29, 76, 93,242,166, 23,112,101, 10,136, 45,111,173, 43, 82,170, 22,181,188,
+149, 22,250, 83,112,125,187,212,107, 55,132, 80,108,  6,  3, 78,213, 54, 22, 75, 30, 30,  4,196,155, 98,120, 37,123,151,200, 10,
+ 42,105, 44,151,149, 83,225, 71,104, 20, 79,191,174,165,181,203, 32, 26,183, 90, 79, 16, 63, 30, 31,130, 31,101,204,172,249, 84,
+ 52, 94, 28,101,196,197, 67,210, 62,103,205, 71,196,164,176,  3,105,113, 97, 93, 18, 22,160, 70,164,107, 49, 69,156, 12, 56,119,
+ 34,183, 28,138, 61,146,  0, 74,164,135, 26,142,162,195,133,191,139,116,169, 72, 81,160,167, 74, 82,158,221,142,135,229, 58,132,
+107,222, 93,184,169, 23,216,246,235,132, 38, 97,190,235,137,142,251,126, 99,124, 57,161, 84,160, 95, 20, 26,146,  9, 77, 71,143,
+ 67,165,179, 85, 26,137,  5,217, 87, 23,181,228,152,156,167, 77,164, 33,203,107,132, 74, 13, 41, 75, 39,143, 18,  9, 80, 36,158,
+131,109,188, 62,141, 76, 66, 51, 90,113, 47,197, 40,119, 70, 96,157,105,101,248,142, 41,  1,103,227,143, 90,210,162,161, 73, 35,
+101,  3,237,235,171, 88,240,213,146, 43,151,251,245,136, 34,244,211,229,144, 21, 44,167,101, 40,164,132,252, 53, 21,  7,221, 94,
+186,220,195,158,214, 84,242, 32,224,174, 63,238,  7,106, 38,196,186,  8, 74,170, 28, 21, 40, 94,225, 38,167,161, 62,239,104,166,
+186,204,123,196,131,142, 75,152,200,169,139, 37,137,120, 92,219,114,213,205,163,230, 55,247,128, 32,154,123,189,191,110,173,  9,
+134, 84, 72,101,186,208,204,240,251,114, 34, 40, 21,141,184,171,168,222,157, 53,  9, 50,148,100,201,243,  9,157, 58, 27,234,243,
+ 65,171,148, 46,183,251, 53,  7,114, 41,208,248,143,110,170,219, 29, 21,168, 88,172,187, 86, 87,116,177, 33,165,176,190, 80,137,
+ 14,132,171,112, 15,137,216,238, 41,236,214,100,232,220, 85,200,218,193, 93,253,178,204,236, 23,150,146,151,146,150,166, 45, 32,
+  6,215,186, 66,129,174,202, 80,232,126,205,100,228,211, 40, 43,117,216, 38,154,102, 73,198,175, 73,118, 27, 37, 77, 74,  1,105,
+242,218,162,146,160, 19,186, 77,122, 26,248, 26,214,180,211, 64, 72, 51,132,251,187, 23, 30,119,186,219,105,178,229, 83,237,236,
+ 71,  9,184,178,178, 67,109,149,165, 42, 61, 65,  9, 81,165, 15,187, 93, 71, 77,  4,197,213, 11,239, 17, 42, 47,104,187,157, 18,
+224, 46, 88,164,112, 85, 14,100,122,160, 18, 63, 13,214,126, 52,146,151,  1,219, 99, 90, 29, 47, 87,226, 11,250,101,145,211,128,
+ 58,240, 85,108,183,116, 72, 80,110,115, 93,135,152,249, 47, 86,137, 43, 61,127,100,108, 63,213,175,146, 68, 26, 37, 80, 33,207,
+177, 20,135, 62, 73,182, 73,183, 64, 30,108,233,192, 52,202, 71, 82,159, 29, 66,184,252, 74, 50,142,138,110, 23,131, 49, 14,242,
+235,210, 42,166, 97, 37,167, 16,147,253,115, 95,212,117, 71, 39, 36,142,  8,144,169,147, 55,201, 49,114,139,114, 90, 79,227,165,
+167,120,255,  0,120,167, 65,170,102, 37, 16,192, 20,153, 31,183,209, 46,182,167, 46,206,128, 37, 58,215,  7, 54,234,234, 42,  1,
+250,245,118,204,194,225, 15,201, 98, 83,162, 33,166,  6, 25, 96,198,164, 44,121,150,214, 83, 33, 68,157,234,170,212,105, 89,150,
+100, 73, 77,228,  4,177,233,103,211, 75, 30,173,123,213,148, 99,215, 59,226, 49,220, 90,207, 14,126, 73,112,184, 46, 43,147, 22,
+ 98,219,148,223,154,134, 88,109, 72,230,231, 23, 10,128, 42, 27,  3,227,182,186,158,137,210,206,117,130,189,219, 90, 38, 68,179,
+232, 27,128,237, 80, 44,  1, 39,128, 87,230, 57,216,175, 64,221,188,109, 77, 65,198, 50,108,193,214,219, 33,233,215,187,204,123,
+ 66, 87,203,117,121,108, 91, 88,112,165, 39,195,146,201,246,235,174,143, 68,233,240, 12, 68,231,226, 91,240, 10,140,186,136, 28,
+ 34,172,182,175,126,158,187,  5, 63,159,165,107,107,115,178, 11,141, 38, 28,159, 34, 97, 51, 36,218,144,226,249, 53,111,130,212,
+180,169,180, 22, 17, 68,173,210, 20,165, 26,239, 74,106,221, 56, 88,152,  4,154, 35,186, 71, 93,210,212,199,176,  7,224,221,188,
+ 74,134, 79, 80,229,  4, 26,233,221,142,229,101,115, 37, 43, 46,200, 46, 19,164,182,146, 71,204,203,121, 73, 30, 63, 10, 57,113,
+ 72,175,128,  3, 79,118, 93,179,212,200,251,214,116,237,148,184,146, 84, 14,216,247, 95,185,216,221,216, 76,199,242, 11,132, 69,
+ 54, 22, 84,219, 50,223, 13,170,162,163,146, 57,113, 80,175,129, 26,157, 89, 86,192,184,145,247,165, 27,101, 30,  4,133,100,118,
+187, 50,193, 59,227,123, 75, 29,201,133, 14,207,221,201, 14, 45,152, 57,157,181,134,162, 34, 99,234,248, 82,139,163, 12,  4,182,
+190,100,129,231, 36,  5, 39,106,237, 93, 83,234, 29, 47, 31,170,  6,152, 16,183,148,198,142,127,239, 14,111,219,196, 45, 12,124,
+253,223, 12,253,234,146,206, 49, 76,135,181, 93,208,191, 88,114,184,198, 46, 65, 29,217,107,121,133,110, 42, 83,240,173, 36,108,
+ 82,164,144,164,145,212, 26,235,203, 58,142, 21,152,215, 74,171,  3, 74, 39, 85,160, 92, 42,103, 43,204, 92,147,113,129, 99, 70,
+201,113, 94,105, 35,170,148,179, 77,245, 78,117,238,137, 81,148,152,128,152,114,107,193,151,110,185,217,152, 63,143,229,182,218,
+ 71,185, 13,212,254,157,  6,140,125, 28,165,189,206,138,157,189, 95,132, 72,178,213, 95,220,196, 74, 79,184,147,169, 87, 64, 50,
+ 30, 40,219,222, 37, 51,118,155, 59,109,203,112,142, 21,252, 57,108, 54,177,239, 59,106,206,109, 91, 65, 42, 17,151,  5,103,219,
+230, 54,140,110,100,122,255,  0, 14, 16,183,192,254,226, 13, 53,207,209, 97,253,203,119,127,  4,112, 52,116,183,136,222, 13,175,
+ 18,186, 78,109, 84, 92,148, 39,236, 78,137,212,220, 89, 95,121, 31,138,106,139,146,179,191,224, 51,  6,213,144,178,161, 73,144,
+ 91, 90,255,  0,188, 18,  5,117,183, 40,234,171,214,126, 20,176,237,221,169,184,133,166, 66, 21, 66, 10,163,172,131,225,185, 26,
+121, 69,202,144, 42,197,236, 10, 88,201,109,159,203,230,111, 29,244,190,206,251,253,221,129,250,142,161,100,  8,138, 91,131, 37,
+ 60,206,228,213,138, 77,234, 35,103,241, 80,202, 25,229,237, 85, 74, 73,253, 26,120,  7, 14,164, 36,234,242,237,  5,225, 50, 63,
+ 47,219, 20,194,106,227, 25, 85,242, 18, 73,246,185,  6, 19,159,211,175, 82,244,232,126,154, 59,172,151,224, 22,103, 84, 58,  5,
+  7, 28,184,  7,110,209,172,136,221,230,218,113, 74,167,183,168, 26,210, 17,209,214, 56,146, 57,235, 70, 50,165,250,249,149,142,
+ 43,226,136,196, 75,  5, 83,253, 84,162,205, 24,154,253,154,226, 61,107, 94,238,165, 62,225, 31,249, 66,232,172,147, 48, 85,119,
+116,175,207,230, 93,222,199,160, 51, 83, 11,231, 92,168,234, 60,166,104, 53,205, 26, 26, 39,189, 79,126,137,123,213, 47,114, 25,
+115, 39, 78, 49,  5, 64, 52,133,115, 80, 79,130, 64,162, 70,134, 42,104, 34,137, 42,190, 46, 82,139,173,254, 37,165, 31,185,142,
+104,119,216,158,167, 79, 58,200,139,118,166,156,217, 62,101,183,  6,142, 79,138,227, 45, 31,134, 51,107,153, 32, 15, 10,157,171,
+162,126,223,108,  2,104,203, 69, 63, 14,190,183,121,203,156,113,103,148,102,185,185, 74,237, 80,104,157, 84,190,166,138,121, 77,
+ 50,247,114,251, 26,208, 98, 90, 99, 14,  9, 82, 91,230, 69, 42, 84,231,196,163,172,186,234,121, 20,219,131,164,213,102, 13,127,
+ 56, 75,124,191,  0, 54,166,233,253,146,180,141, 16,212,120, 41,242, 95, 71, 59,113, 99,176, 93,237,173, 65,190,176,219,133, 67,
+130,219,116, 38,132, 17,225, 93,119, 19,158,171,219,115, 37, 40,130,202,180,239,159,161,188, 81, 19, 92,206,187, 83,193, 18,208,
+232,155, 46,208, 74, 66, 93, 83,105, 52,225,236, 59,253,122,163,147,136, 45,212,105, 46,222, 94,208,185,124,140, 15,220,  7,  3,
+108,190,227,252, 23,  6, 94,127,204, 56,182, 77,125,131,149, 68,118, 13,204, 41, 69,198,159,  4, 81, 69,205,136, 34,128,143,122,
+ 78,178,103, 65,135,194, 70,171,152,203,170, 85, 72,198, 65,138,  9,222, 92,145,233,221,186,200, 38,161, 65, 79,174, 55,146,  8,
+216, 36,113,162,138, 83,208, 26, 10,114, 53, 32,116,246,107,162,244,141, 95,252,228,  1,224,227,241,251,104,179, 76,151,206,252,
+131, 49, 14,100, 13, 91,246, 81, 11,228,170,120,113,251,160,253,157, 60, 53,245, 24, 12, 20,183,185, 77, 19,187,143, 52,219, 62,
+ 79,114,250, 82,150, 18, 71, 68,165, 36, 13,135, 77,186,157,  0, 83,171,171, 70,214,139, 42,222,225,112,122,224,120, 54, 72, 74,
+ 79, 20,170,187,210,170, 31,171, 86,149, 25, 21, 46,203,143, 71, 80,249,169, 41, 89,117,123,  0,  9,167,135,196,163,224,  6,255,
+  0, 80,212,196, 84, 56,169,174,182, 98,205,243,150,144, 31,170,146,128, 64,169, 74, 77, 42,117, 98,181,  2,143,216,115, 75,156,
+  7,252,213,164,249, 68,134, 27, 74,183, 27,209, 85, 62,239,118,136, 82,116,231,140,247, 82,109,190,113, 92,151,124,192,162, 42,
+154,144,154,141,184,245,161,167,179,244,106, 18,  9,  9, 43,111,  0,239,124, 65, 37,149, 58, 84,164,168,141,146, 74,121, 26,239,
+ 64,124,  0, 30,202, 13, 84,178,167, 87,168,185,151, 87,118, 31,190,171, 77,214,214,220,119, 84,197,181, 69,  9,121,182, 28,252,
+ 84,178, 86,  1,  9, 82,104,  2,143, 90,214,191, 70,185,236,236, 64, 65, 91,184,215,240, 11,184, 49, 30,247,205,154,  6, 73, 49,
+224,181,177,206,216,211, 10, 80, 45, 82, 91, 46, 72,109, 59,208, 16, 56,164, 10,145,225,237,215, 45, 44,102,209,106, 59,167,124,
+139,185, 10,189, 99, 54,139,117,145, 75, 50,209, 45,203,100,196,164,212, 37, 14,184,158, 42,113, 11, 59,165,101, 41,  4, 17, 81,
+ 95, 97,208,225, 94,217, 23,236, 81, 16,212,158,213,178,249,108,200, 24,187, 51,115,128,144,254, 38,243, 50, 31,125,180,236,228,
+135, 66, 11,172, 50, 77,106, 56,171,226,161, 27,145,190,165, 25,  2, 59,221, 73,  3,196, 59,137,152,162,209,106,159,127,140, 34,
+218,146, 83, 14, 67,201, 88,117, 94,114,154, 84,133,173,194, 77, 79,152,165,114,232,106, 41,227,169,206,161,171, 20,153, 31, 29,
+246,182,222,103,221, 44,247, 87, 22,136,176,252,137,177,212,202, 15, 36,  3, 69,144,221,  9, 10, 28, 19, 81, 81,237,246,211, 81,
+242,  8,  0,168, 70,160, 31,189, 25,187,231, 48,238, 23, 38, 33,202,108,  5, 33, 33, 49,110,105,  0,182,226, 92,227, 84, 37, 71,
+196,145,200,117,233, 79,118,129,229, 17,170,156, 98,  2, 94,238, 75, 22,211, 26, 60, 83, 29, 77, 37,106, 47,  7, 27,221, 41, 95,
+ 34, 28,  5, 35,238,143,186,170, 13,186,232,148,184,213, 59,170, 87, 59,195, 90,122,232,228, 57, 95,133, 61,104,  9,110, 64,167,
+  7, 43, 94, 36,145,246, 87, 90,180,216,193, 10,192,235,159,123,155,132,179,110,152,204,233, 40, 30,111, 37, 52,251,110, 14, 35,
+144,170, 72, 80, 21,  2,190,209,181, 40,117,177,141,113, 98,203, 38,250,195,234,171,124,167, 10, 97,199,252,230, 91, 74, 90,235,
+ 68, 15,  5,110, 58,107, 90,155,244,  0,172,139,234, 74,114,241, 54,226,191,230, 51,178, 84,106,170,138,143,245, 29, 90, 18,117,
+ 80,197,138, 35,  6, 33,109,134, 86,217,224,242, 79, 23, 42, 15,221, 63,116,253, 26, 25, 82, 69,237,247, 43,131,113,156,180,190,
+162,149,164,243, 96,157,194, 86, 55, 52, 61,104, 65,208, 76,117,117, 33, 34,204,139,192,206,239, 24,180, 51, 60,177,206, 58, 65,
+228, 80, 78,212, 59,148,169, 63,116,212,116, 58, 28,233, 18, 83,174,227, 20,173,105,245,133, 54,221,119,126, 42,223, 43,  0, 56,
+243, 75, 74,184,172, 80,138,130,157,193, 28,126, 33, 81, 74,106, 83,193, 12,158, 57, 68, 23, 73, 25,151,115,239, 29,200,205, 83,
+ 57,135,144,165, 37, 10,  5,214,208, 82, 84,146,158, 96, 40,110, 65,219,110,189, 60, 70,175,224,208, 33,162, 29,214,111, 41,131,
+  3,149,118,115, 38, 90, 99,136,235,228,195,178,  4,142, 13,180,165, 33, 77,154,133,145,240,215,168,175,180,251,245, 95,214, 25,
+ 34,158,155,105, 60,192, 31,103,211,237,218,133, 34,192,166,199,113,166,110, 22,152,153, 75,187, 58,235, 12,196,112,116, 33,106,
+ 36,131,191,191, 95, 34,217, 99,  6,236, 66,130,247,143, 71, 78, 63,156, 71,145, 51,255,  0,103, 37, 41, 77, 60, 84,144,116, 29,
+206, 29, 22, 45,205, 60,221, 88,141,107,191, 77, 68, 98, 10, 37,180,153, 44,129,226, 22, 43,250, 14,168, 93, 81,119, 76, 37,170,
+ 19, 46,107,118, 28,181,112, 10,169, 10, 75, 77,145,236,228,240,161, 31,110,155,102,232,247,165,185,181, 67,242,123,153,179, 89,
+ 26,131, 24, 81, 69,213, 45, 84,235, 64,170, 87, 84,163,102,203,128, 60, 17,221,226,131,119, 11, 42,144,211,241,230,199, 89,242,
+ 29,109, 45,212,120,120,142,159, 70,180,168,171, 67,226,129,185, 91,191,150,130, 99, 91,253, 77, 99,184,251, 68,  6,114,232,185,
+  5,166,105,175,132,187, 84,132,160, 31,253, 98, 81,174,219,210, 23,255,  0,249, 10,199, 34, 37, 31,124, 79,230,202, 22, 13,192,
+142,212,192,137,  9,117,187,139, 64, 80,180,149, 10, 30,180, 78,187, 53,203,175, 80,208,168,246,102,166, 36,127, 81,105,255,  0,
+105, 90, 25, 42, 37, 78,112,186,244,151,103, 39,247,114, 27,  9,  3,251, 71,175,234,212,100,116, 72, 40, 54, 25, 14, 64,147, 41,
+ 67, 98,166,156,250,188, 53, 40,157, 20,147, 23,110, 98,249, 50,216, 46, 31,133,164, 57, 33,127, 80,219,245,232, 98,122,168,166,
+238,240, 50,231,122,251,  9, 15,185,174,213,220,251, 12,125, 24,229,229,254,171,147,103,184,  5, 38,  3,206,168,238, 84,203,227,
+202,175,136, 80,169,214, 71,171,177, 63,115,139, 28,145,243,214, 68,101,223, 19,192,159,  3,167,181,109, 96,219,230, 69,143, 37,
+202,157,183,236,231,113,187,185,221,139,109,143,  7,178,205,187,205,136, 20,228,180, 64,142,227,193,164, 54,104, 20,226,144, 40,
+128, 85,176, 42, 32,107,135,193,193,187, 40, 24,213,  3, 35,220, 29, 88,144, 36,247,171,170, 95,160,143, 84,233, 90,231,170,195,
+ 25,171,212,183, 22,217,129, 38,247, 99,106, 64,109, 93, 63, 13,201, 64,242,247,117,215, 69, 95,163,122,135,150,198,182, 61,155,
+162,255,  0,138,132, 99,180,241, 11,149,189, 87,118, 59,189,158,157,173,183, 69,247,103, 25,184, 88,153,156,249,143, 10, 76,200,
+235, 17,158, 13,167,149, 26,144,138,178,191,246, 84,117, 72,244, 92,140, 67, 17,116, 12,124, 70,158,254,  8,128, 16, 11,164, 14,
+202,100,238, 57,102,144,250,201, 21, 88,227, 95,236,234,175, 84,172,  8,160,215, 45, 66,232,156,122,232, 39, 99, 79,190,181, 80,
+  8,202,229,191,181, 52,215, 31,139, 83,228, 18,174, 74, 77,  4,175,104,185, 45, 86, 57, 22,142, 91,240, 82, 70,254,227,166,234,
+207,230,214,123,  8, 79,137,168, 37,120,239,182, 74,243, 61,142,199, 36, 72, 87,241,141, 52, 99, 44,248,236, 43,174,170,186,183,
+151, 64,145,218, 17, 63, 77,158,153,187,229,234, 71,181,133,254,223, 91, 66, 45, 17, 37,165, 83,175,247,119,155,129,106,134,142,
+ 53, 81,118, 92,130, 17,176, 34,169, 71, 37,111,211, 90, 56, 29, 11, 39, 54,210, 43,143,194, 56,200,233, 17,237,252,134,169,162,
+126, 21,212, 29,142,244,141,218,142,219,185, 18,223,151,119,138,208,253,249,135, 92, 75,145,236, 54,187,149,202, 50,150,190,169,
+ 76,164,249,105, 59,248,241,215, 80,125, 21,  2, 26,121, 17,  7,186, 36,253,238, 21,115,149, 88,211,119,226,148,251,157,249,122,
+228,217,173,206,233,116,236, 86,103,100,205, 31,121,247, 28, 85,141,151,149,109,187,210,132,209,184,211,248,165,124,119,173, 23,
+ 95, 96, 58,163,145,232,171,162, 30,153,198,206,225,161,247, 31,226,143, 85,208,159,202, 65, 95,157,173,194,179, 46,221,122, 22,
+127,  7,238, 45,182, 77,171, 43,180,247, 26,231, 21,232, 87,  6, 92, 97,228, 37,120,244,  7,146, 74, 29,  0,208,131, 80,122, 30,
+163, 91,253, 22,137,211,128, 97, 56,152,145,105,208,232,126, 80,169,245, 17,240,143, 20, 59,182, 72, 68,174,231,  0, 15,192, 57,
+ 86,190,194,157, 95,144,248, 86, 34,105,245,177, 49, 22,159, 93, 93,199,200,151,255,  0,248,232,118, 86,154, 39,218,172,122, 26,
+255,  0,167, 92,167,170,171,126,163,111,254, 31,249, 98,186, 11,143,199,246,236, 84,196, 55,209,105, 97,172,234,225,247,153,109,
+210,202,143, 94, 78,124, 71,174,185,249, 84,225,144,196,151, 57,247, 23,184,105,202,123,131, 38,122, 28, 36,149,240, 21,254,200,
+212,109,165,130,179,  2,229,111,237,  3, 43,159,125, 76,201, 74,248, 25,113,210,234,137,240, 73,174,131,180, 25,129,224,167, 56,
+232,153,153,204,211,113,190, 94,179,103,143,240,241,155, 48,226,154,237,182,219,106,237,212, 59,  4, 17, 52, 99,179,151,210, 60,
+215,214,127, 21,213, 36,110,124, 43, 83,172,142,165, 13,177, 41,188,199, 43,103,116,115,117, 77,200,210,149, 57,200, 55, 83, 82,
+124, 18, 40, 53, 71, 11, 24,136, 57,226, 83, 89, 99,200,  4,155,254,101,123,151,243, 10,159, 36,175,128,223,246, 70,150,207,234,
+183,114,190,218, 47,161,152,127,168, 40,179,108,237,249,174,143, 49, 32, 41, 11,  6,138, 30, 61,117,218, 91,137, 32,116, 94,240,
+ 12,101,170, 90,238, 87,171,107,205,154, 89, 44, 62, 71,129,223,217,183,129,213,204,110,158, 39,197, 87,182,232,214, 21, 61,220,
+126,227,226, 93,229,140,184,249,100, 64,227,171, 20, 18,153, 60, 31, 65,173, 65, 74,254,159,  3,171,243,232,177,156, 24,253,188,
+ 59, 23, 63,157, 58,178,162, 99, 48,253,253,158, 11,154,189, 82, 99,217,  6, 25,218,235,204,139,  3,174, 92, 49,183, 17, 71,215,
+ 25, 10, 50, 27, 71, 46,142,160,110, 18,  7, 85,  1, 79,109,  6,218,185,233, 94,129, 26,115, 68,166, 67, 13, 71, 47,177, 92,102,
+ 95, 74,149, 82,221, 19,186, 63,122,249,245,143, 91, 21,125,187, 72,190, 58,160,136,161,197,121,117,246,114,216, 15,171, 94,225,
+ 32,203, 50,  1,245, 83,239, 23, 24,177,228,173,166, 20, 84,148,143, 45, 70,190, 34,164,159,172,254,173, 52, 66,156,164,165,226,
+248,146,111, 79, 39,146, 74,220,125,206, 72,225, 93,207, 42,127,167, 83, 67,  3,114,113,155,  6,219,219,235, 42, 36,222, 79,154,
+  8, 80, 13,161, 37, 37,105, 64,167, 83,176,169,160,250,244,194, 78,167,177,134,169, 18, 22, 79, 10,235, 57,114,164, 33, 41,243,
+  2,170,148,212, 37,  8, 73, 53,  2,187,248, 29,245,102,185,104,171,158, 43,107,247,187,114,227,161,165, 43,138, 10,139,131,143,
+222, 32, 10,255,  0, 72,209,137,  5, 66, 75,211, 18,145,113,150,151, 32,168,212, 38,141,183, 80,126, 45,183,253, 58,150,215, 80,
+224,136,219,178,139,206, 55,118,  9,223,138, 64,162,150, 84,160,125,158, 62, 58, 20,226,141, 25, 46,149,244,177,234,  1,184,247,
+104,144,178,119,208,227,174, 40,124, 42, 72,160,230,120, 39, 99, 82,126, 34,  0, 27,120,147,211, 89,121,148,110,142,139, 95, 18,
+246,103, 95, 67,187,  7, 53, 23,251, 12,171,180,135, 84,234,101,127, 19,228, 56,126, 10,184,215,150,  8, 73,165, 10, 81, 68,215,
+192,141,114, 89,101,139,  5,208,211,168,117,110,246,159, 36,153, 38,246,227,210, 28, 13,188,203,233, 41,243,133, 10,202,152, 68,
+ 98,  1, 59, 26,150,133, 61,251,117, 27,211,184,  6, 71, 87,197,171, 34,114,100, 31,151, 42, 66,200, 41,125,  0,138,  0,182,151,
+176, 32,215,175,196, 53,156, 99,183, 84,251, 80, 76,154,219, 42,210,227,113, 45,209,145, 43, 27, 33, 34, 69,180,  1,248,140,114,
+ 31,112, 42,137, 37,  1, 68,129,226,157,189,154, 61,115,  5, 50,131,111,197,173, 88,228, 23,230,198,105, 10, 83, 74, 13,201,226,
+ 63, 24,  6,194, 64, 53,241, 87, 17,201, 53,  7,167,191, 79,230, 18,146,  0, 38,220, 39, 93,164,219,225, 76, 15,218,201,243, 98,
+133,143,129, 52, 32,167,142,251,  5,  0,118,222,132, 15, 96,169,244,109, 82, 76,217, 68,137, 19,237, 73,112,  1,243,124, 57,241,
+235, 66, 90, 73, 59, 30,169, 10,228,  8,246,104, 48,  0, 20,146, 38, 77, 45,153,241,  3,202, 28,141,  2, 18, 79,222, 77,105, 64,
+ 65, 29, 66,169,245,106,212, 80,166, 85, 11,234, 18, 11,171,185, 49, 34, 25,226,149,254, 27,141, 40, 87,112, 64,  1, 84,240,223,
+ 91, 24, 39,181,101,228,151, 85,179,118,240,251,200,143,196, 37, 95, 19,117, 61, 66,121,168,128,105,236,233,173, 29,205,170,206,
+150,169, 99, 45,180,182,195,106,117,176, 10,  9, 63, 79,188,141, 91,166, 78,169,216, 25,  8,181,178,182,166, 37, 46,143,192, 41,
+ 91,106,175, 74,116,167,233,174,143, 34,130, 22,185,206,203,180,  6,203, 42,  5,198,143, 14,149,  0,  2, 83,227,236, 26,140, 53,
+ 76, 82,238, 81,159, 53,104,129, 41,199,148,182, 31, 44,151, 10, 82,161,197, 96, 10, 40,138,212, 40,110, 42,  8,173, 61,190, 19,
+216,160,185,126,237,155,174, 21,237, 87, 66,178,220,159, 48,150, 74,133, 19,197, 69, 73, 82, 84,127,170, 82,165, 15,175, 87, 76,
+ 62, 21, 16, 85,149,219,204,219, 25,254,105, 14,232,193,  8,243, 17,229,187,208,161, 36, 36,171,130,169,226, 55, 35, 74, 17, 32,
+186, 44, 72,230,174,126,212,228,248,110, 73,109,186,192, 66,146,222, 68,219, 78, 22,  2,126, 32,182,  0,248,209,246,142, 64,142,
+189, 53,205,125, 69,194,179, 43,165,203,103, 24,145, 47, 17,192,254, 42, 22,135,142,137,134, 77,237,155, 94, 28,171, 84,147, 84,
+189, 21,135, 26, 80,253,151, 91,115, 99, 79,160,235,229, 73,234, 75, 40, 67, 64, 23,235,242, 85,118,154,171,146, 55,144, 16,135,
+194, 71,137, 64,162,135,217,167,174, 44, 19,137, 38, 88,119,131,113,131,110,159,214, 68,117,152,206,147,226,217,221, 63,102,161,
+ 96,112,128,101,241, 32, 29,209,158,183, 84,155,188,113, 73, 13, 43,203, 52,246,162,139, 31,165, 58,133, 49,109, 17,206,161, 18,
+189,249, 55,232, 16,238, 76, 39,240, 93,139,230,167,222, 78,228,107, 35,168, 84,100,224,113,226, 17, 49,202,  1,125,199,196,204,
+ 94, 68, 52,144,101, 53, 64,213,122,133, 36,114, 31,160,234,246,  5,198, 85, 70, 71,143, 52,167, 22, 37, 59,122, 36,200, 23,140,
+122,156,237,125,237, 71,139,127,207,109,176, 95,169,251,159, 53, 49,184,203, 63,245, 86,117,208,250,110,253,153,180,159,253, 72,
+253,229,148, 85,205,150, 99,139,199,187,133,148, 89,220, 79, 20, 71,186, 78,129,199,216,150,230, 56,207,244,107,211,179, 14,203,
+  8,239, 43,150,156, 90, 68, 45, 70, 26, 30,181,196,128,157,151,204,176, 71,189, 42,219, 84, 37, 38, 76, 19,238, 33,217, 16,112,
+209,152,247, 66,253,111,195,112,231,220,243, 45,178,111, 42, 90,164,205, 75, 71,227, 92,104,140,130,234,208,158,133, 84,  3,125,
+171,163,200, 87, 85, 98,203,236,141,113, 60, 31,137,240, 28, 74,183, 78, 20,236,215,128, 94,147,233,234,197,152, 49,112,184,118,
+ 55, 48,182,102,207, 71, 66,213, 42,213,110, 15, 70,186, 54,223,222, 46, 34, 28,144, 22,226, 19,181, 74, 42,119,233,169,227,154,
+ 50, 65,253,181,177,176,142, 67, 73,123,142,170,118,224, 78,  1,198,169, 82,210,210,161,169,228, 16, 82,250, 89, 45, 16,122,131,
+226, 63, 70,170,  2,203, 60,132,239,216, 28,147, 14,198,174, 23, 59, 71,113,210,227,157,190,191,218, 38, 65,184,181, 31,247,165,
+ 77, 82, 75, 62, 95, 80, 28,243, 91, 72, 73, 59,  2,106,118,213,204, 99, 85,144,157,119,124,147,137,  5,189,225,187,223,130,183,
+139,112,170, 78,120, 50, 19,144,247,247, 36,186, 71, 94, 23,128, 70,107, 17,237, 99,104,121, 12, 88, 44, 85, 97,181, 44, 16, 60,
+201,111, 38,142, 72,117, 64, 14, 74,112,154,157,232, 52, 90,242,  4, 43,242,233,136,174,  3,128,142,158,243,196,158,242,163,126,
+ 84,236,238,  9, 26,103, 57, 16,161, 17,191,150,226,156, 63,211,161,137,104,171,144,167, 64,239, 22,103,139, 71,123, 17,185, 54,
+206, 73,218, 43,147, 75,102,241,135,100,  8, 19, 45, 51,152, 82,129, 40, 44,189,200, 54,189,170,149,162,138,  4,  3,238,213,234,
+178,204, 96, 35, 47,138, 39, 66, 15,  4,106, 47,149,103, 67,167, 98,167,251,195,249,122, 72,197,239,118,140,167,210,149,190,125,
+243,179,185,211,162, 70, 59,108,104, 46,100,251, 92,176,163,243,150,153,  5, 60,148,163, 29, 66,169,113, 95,121,189,201, 60, 84,
+163,197,250,155,162, 78, 54, 67,200,137,148, 44,224,  6,164, 30, 96,248,126, 30, 11,106,160, 38, 55, 69, 89,216,215,229,231,222,
+ 56, 24,195,246,204,191, 39,196, 49,204,153,230, 11, 74,178,222,242, 40,237,206,109,207,234, 45, 49,146,243, 96,251, 71, 61,181,
+159,133,232, 76,184,147, 41,202,184,203,176,203, 95,184, 17,247,166,178, 65,155,112, 30,213, 82,103, 30,148,253, 66,246, 42,240,
+155,175,114,236, 15, 53,134, 56,  0,143,127,183,173,185,246,153,  1, 71,138, 74, 38, 68, 43,104, 21, 30,137, 81, 10,247,107,155,
+245, 79, 64,202,195,  0,217,  2, 34, 72,248,134,177,227,218, 52, 70,193,137,136, 46,155,123, 69,233,131, 18,239,221,150,102, 97,
+222, 73, 47, 65,244,245,132,150,174, 55,195, 24,148, 72,186, 60,231,248,123, 84, 69,237,197,199,212, 40,165,  3, 84, 39,125,137,
+  4,117,190,148,233,  3, 46, 82,149,154, 87, 14, 61,253,193,  6,217,  0, 12,143,  4,245,220,222,237,100, 25,204, 56,152,227, 81,
+217,178,118,206,218, 26, 99, 31,197, 45, 41, 12,219,173,209,210,126, 20,161,180,  0, 22,189,234,167, 20, 57, 40,251,182,215,113,
+109,198, 76, 34, 26, 35,132, 71,  0,176,111,200,149,135, 94, 29,138, 22, 59, 43,249, 93,222, 51,205,116, 15,165, 75,  7,194,187,
+ 29,  2, 22, 60,152,246, 33, 24,232,167,153, 11,102,255,  0, 45,  0,209,213,200, 46, 54, 69, 65,  4, 16,161, 66, 52, 57, 30, 97,
+ 60,116, 70, 59,191,222,238,225,230, 88,245,171,181,217,116,211,113,198,224,202, 76,200,174,202,  5,114, 89, 80,101,108, 22,252,
+226,106,164, 16,190,138,169, 20, 20, 32,109,171,115,205,178,202,246, 72,187, 31,106, 60,174,148,162, 34, 75,164, 44, 53,135,172,
+185,212,169,  8, 53,226,221, 83,244, 87, 80,148,192,130,175,179,146,189,253, 94,122, 73,204, 59,141,234, 51, 60,207,178, 75,205,
+187, 14,237,125,203,249, 48,141,124,191, 60, 65,152, 99, 88,225,176,242, 97,198,103,147,175, 20, 41, 36, 29,128,173, 69,106, 14,
+170,117,126,129,118, 86,117,182, 18, 33, 15,133,137,231,240,142,  3,137, 93, 21,194, 32,188,139, 42,239,186,222,136,172, 89,183,
+110,145,137,246, 83,186, 22, 75,142, 94,138,185, 10,223,120, 98,101,145, 18,214, 81, 64,203, 82, 37,114,111,154,142,201, 10,160,
+ 39,196,117,213, 56,250, 83,251,151, 70, 71,176,130, 16, 55,215, 61, 35, 32,254,229,243,195, 44,236,191,115,251, 73,220, 55,177,
+ 14,235,217,165, 89, 51, 72,174,186,220,251,116,246,203,110,182,226, 79, 32, 65,221, 42, 66,210, 65, 74,146, 74, 84, 55,  4,141,
+115, 29, 70,169, 83, 41, 66, 97,136, 60, 10,179, 26,153, 73,193,111, 11,178, 34,239, 29, 38,171,113, 79,134,233,215,145,240,213,
+ 65, 91,204, 20, 78, 33,148, 91,189,233,235, 94, 25,109,177,180, 41, 34,124,132,135,189,191,122,166,191,102,181,205, 96,234,169,
+236, 46,155,176,108,137,171, 72, 89, 42,221,176,105, 67,227,172, 44,186,124,201, 42,228,144, 82,206, 73,149,189,115,189, 41, 12,
+158, 79, 56,175, 41, 35,233, 59,234,112,164, 66, 58,169, 87, 18,100,191, 21,123,134,111, 72,197,194,254, 20,197, 89, 81,175,253,
+162,156, 77, 15,232, 58,199, 21,151, 54,119,143,118,171, 99,185, 89, 24,215,118,178,172, 70,150,251,130,139,177,  5, 18,151, 21,
+253, 58,245,235, 48,227, 35,193,122,148, 51, 37,  1,218, 20,139,255,  0,113,191,204,109,146,165, 30,103,198,181,209, 40,197,216,
+133,126,102,224,135, 90,239, 82, 34, 57, 85, 42,173,214,160,141, 94,216,179, 76,209, 73, 23,113, 61, 41, 33, 68, 19,209, 64,154,
+131,244,141, 10, 81,229,201, 78, 18, 84,103,122,125, 34, 99,121, 91, 15,222,187,114,219, 54,108,165, 92,158, 45, 33, 28, 32,200,
+117, 71,149, 92, 67, 96,240, 81, 53, 60,144, 40, 78,228, 87,125,116, 29, 63,175, 78,179,182,207,138, 63,120, 89,217, 93, 58, 51,
+ 15, 13, 15,220,184,215, 40,192,179,188, 19, 36,115, 25,206,160, 59,  6,246,165,243,242,222,165, 29, 65, 81, 72, 90, 22,154,165,
+104,219,170, 77, 53,217,227,100, 66,248,110,129,112,185,187,105,149,101,165,162,191,187, 17,128,195, 54,232,243,214,159, 49, 79,
+ 26, 34,162,161,  1, 66,149, 36,251, 69, 42,125,250, 86,216,220, 21,154, 32,151, 61, 86, 35,228,110,194,218,133,114,141,197, 77,
+138,236,  2, 82, 66,136,  3,222, 72,212, 40, 46,155, 40, 48, 84,205,170,216, 95, 80, 13,142,  8, 74, 69, 91, 29,  2,104,105, 95,
+121,219, 87,224, 21,  5,147,224, 15, 39,231, 84, 74, 80, 85,196, 40, 31, 14, 33, 71, 71, 26, 40, 73, 15,199,242, 83,105,187,161,
+ 42, 87,  6,131,136, 74,146,158,164, 36,238, 43,246,234,  2,214, 42, 44,234,196, 68,203,125,249,105,150,150,255,  0,132, 32,249,
+ 73,  4,128, 77,  9, 42, 52,  4, 19,190,137, 57,129,197, 18, 49, 79,189,141,198,111,243, 50,118,158,182,195,118,111, 21,  9, 45,
+161,134,214,186,148, 81,196,146, 18, 58,  0, 58,251, 14,178,242, 46,136,125, 86,142, 45,  5,215,208,158,193,247, 66,231,134,185,
+ 18,211,147,195,118, 32,114, 59, 15,150,100, 36,182,182,155, 80,248,194,194,192, 41, 38,169, 94,254,  0,235,153,202,128,153,120,
+234,186, 60,114, 98, 24,171,251, 31,206, 91,148,137, 79,218,136,224,162,167,152, 93, 69, 84, 91, 63,136,  7,188, 20, 87,233, 58,
+205,148, 85,176, 85,139,143,247,117,216,178, 99, 92, 16,232, 44, 85,184,243, 16,122, 40,154,132,148,159, 14, 64,237,239, 58,171,
+ 58,157,209,  1, 78, 81,187,174,222, 64, 24,199, 16,138,202, 66, 66,153,125, 60, 40,180,175,238,145,196,248, 20,148,144, 55,  7,
+141, 42,  1,208,  5,109,170, 69,121,200,110,205,179, 10, 75,136, 15, 55,113,114, 59,140,186, 26, 40,115,206, 74,  0, 91, 68, 18,
+104,165,113,161, 65,241,216, 29, 18,185,106, 20, 21,125,103,205, 31,117,232,151,139, 82,216, 80,109, 78, 50,165,238,211,156, 18,
+160,135, 89,112, 82,135,138,146, 20,147, 74,129, 79, 96,173,221,160,232, 84,  9, 86, 20,124,190, 29,210,215, 13,183,214,  1, 40,
+117, 40, 32,128, 80,164,168,180,180,158, 61,  8,169,247,108,117, 91, 99, 36,100,148, 46,183, 52,198,155, 34,  4,132, 16, 20, 25,
+123,122, 10, 57, 66,146, 69, 63,180, 40,125,250, 56,  4,161, 74, 74,170,239,211,177, 87, 17,217,168, 33,104,101,106,113, 74, 62,
+198,188,198,205, 79,188,237,173, 44, 55,  5,150,117,228, 21, 74, 92,114, 64,204,178,210,151,193,247,156,228,189,254,234, 74,  2,
+149,185,233, 64,161,246,235, 94, 49,112,178,231, 38, 40, 13,235, 37,183,207,148,149,161, 99,228,212, 42,  0, 59,110,145, 80, 62,
+130,117, 98,160, 64, 85,236, 33, 65,185,191,242,168,243,219, 59, 21,243,253, 66,159, 93, 52,120,151, 65,144,100,153,148,230,172,
+176,219,206, 18,  2, 65, 87, 26,111,191, 64, 62,221, 26, 16,213, 12,151, 84, 71,118, 59,220,110,209,211,101,142,132,185, 13, 77,
+128,226,149,247,154, 80, 21,  9,  7,223, 66, 55,251,118,213,184, 86, 29, 64,149,207,249,159,112,140,166,219,133, 29,202,112, 36,
+ 41, 74,169, 80, 33,100, 80,251, 71, 77, 18,114,112,202, 41,187,  1,186,186,218,216,134,167,131,113,158,113, 10,122,149, 77, 20,
+ 41, 67, 93,198,253, 62,157, 78, 60, 83,130,175,158,204,199,118,201,153,217,238, 19, 30, 82,109,111, 75, 98, 42,221, 21, 77, 27,
+125,208,209, 42, 30,202, 19, 95,163, 86,178, 40, 23, 83, 56, 30,  6, 37, 77, 92,217,131,119, 27,123,237,218, 46, 41,227, 46, 49,
+118,  3,200,  4, 40,121,145,159, 45,154, 17,177,220,108,117,241,127, 82,199,242, 47,178, 31,220,145, 30,226, 84, 64,213,145, 12,
+ 74,226,226,239, 12,113,175,146,128,107,244, 19,190,179,140,246,197,212, 72,213, 57, 98, 86, 89, 95, 41,118, 91,127,185,101, 73,
+113,191, 97,252, 64,  8,255,  0,170, 70,162,255,  0, 10,134,199, 46,135,230, 86,135,238, 86,123,195,140, 38,166, 56,102, 90, 13,
+ 60, 43,197, 99,236,208,225, 45, 85,136,197,212,238,218, 71,110,231,141,197,183, 40,252, 77,165,196,167,220,149,  2, 83,160,219,
+172,146, 26, 20, 17,251,138,204,183,155, 87,221,228, 66,143,246,146,158, 42,253, 90, 85,215,182, 12, 59, 81, 36, 28, 58, 35,218,
+ 73, 40,179,119,  6,219,145, 32,241,131, 10,237,110,185, 71, 80,216, 32,183, 37, 14, 40, 87,220, 69,117,163,131, 63, 46,218,229,
+217, 33,248,161, 46,187,245, 39,  5,171,127,123,242,230,144,144, 57,221,167,188,191,114,157,125, 79,  3,245,215, 94,187,213, 67,
+100, 79,196,174,107, 39,252,201,120,148,155,140, 46, 45,207, 40,179, 69,144,174, 49, 36, 92, 34, 50,249,254,170, 93,121, 45,168,
+254,157, 86,170,177, 57,136,158,  4,133, 24,241, 81,253,103,220,239, 82,125, 83,229,169,191, 59,198,211, 29, 75,177,217, 35,116,
+106, 52, 24, 40,249,118,218,105, 29, 18,144, 19,202,131,197, 68,248,235,203,125, 79,149,102, 71, 83,188, 79,249,100, 99, 17,200,
+ 70, 58,  0, 63, 31, 18,186,146,  0,136,101, 92,246,155, 36,200,112,119,160,231,248,204,181,197,201,225, 73, 18, 98, 72,104,209,
+104,113,180, 26,125, 32,167, 98, 14,196,108,118,214, 70, 46, 77,152,246,137,214,118,202, 37,193, 76, 87, 73,250,145,102,220,207,
+114,221,202,173,140,166, 52, 60,134,223,109,200, 76,116, 10, 37,183,167,194,110, 75,192, 15,122,212, 79,215,175,108,207, 59,228,
+ 38,205,190, 49,147,119,144,  9,251,215, 61,153, 17, 27, 11, 36,165, 62,220,112,202,186, 70,113,183,120,253, 43, 71, 79,183, 84,
+ 97, 38, 85, 86,174,214,246,250,110,121,124,185, 72,149, 49,139, 62, 13,105,100, 92, 47,249,  5,192,148,197,183,198,175, 16,165,
+120,169,107, 63, 11,109,167,117,157,135,137, 23,177,234,  4, 25, 74, 66, 48,136,115, 35,192, 15,183,  1,205, 26,154, 13,164,  0,
+152,176,187,207,161,222,224, 93,151,219,204, 63, 45,191, 70,201,211,201,184,247,219,229,190, 43, 54,103, 92, 39,138,106,148, 43,
+230, 27, 65, 81, 31, 18,192,  9, 27,157, 84,167,174,116,203,103,229,198,115,  4,232, 36, 64,218,255,  0,136,246,133,164,122, 96,
+ 35, 67,170, 81,205,112, 59,230, 15,152,175,  9,202,152,242, 47,112, 22,227, 50,218, 38,160,112,169,228,146, 54, 41, 80,162,146,
+ 71, 80, 65,213,219,171,149, 71,108,184,133,151, 40,152,146, 15, 20,227,128,247, 35, 62,194,187, 61,115,195, 49, 43,147,176,172,
+247,103, 20,236,148, 71, 81, 75,129, 72, 73, 10,242,214, 55, 71,152,138,  5,241,221, 65, 32,116,168, 51,143, 80,182, 17, 48,137,
+ 96, 83,198,233, 68, 24,131,161, 85,155,142,169,166, 16,186,244, 95, 19, 95, 30, 70,167, 84,235, 31, 17,240, 66, 33, 49,224, 93,
+221,205,251, 89, 45,225,141, 74, 14,227,243, 85,229,220,108,147,210, 36,219,102,180,180,241, 91,114, 34,187, 86,214, 20,157,171,
+ 74,251,  8,213,138,242,167, 13,  6,177, 58, 16,117,  7,196,112, 83,162,233, 85,192,167, 14,229,101,221,173,201,187, 67,  3,  0,
+237,  5,160,227,248,130, 12,139,205,206,211,201,107, 74,111, 50,221, 33,192,149,168,158,109,182,211,105, 75, 71,193,  6,158, 26,
+183,100,233,170, 49,133, 17,219, 23, 50, 35,188,255,  0,  1,195,185, 19, 43, 43,205,  1,180,254, 42,168,149, 12, 73,180,177, 34,
+148, 45, 60,211, 68,255,  0,102,155,159,183, 64,140,149, 34, 29, 58, 64,236, 78, 98,245,185,172,227, 34,157,105,196,240,153,139,
+254,  2,231,152,221, 97,217,217,150, 83, 67, 86,  4,165,  5,172,111,177,  9,161,246,232,135, 24,196,  9,206, 81,132, 79,  3, 34,
+ 34,254, 14,175, 83,139, 57,135,  3, 68, 67, 52,236,254,101,131, 63,111,203,111, 13,199,153,137,205,117,147, 14,245,105,146,204,
+235,116,154,128, 20, 17, 34, 50,148,138,236, 77, 13,  9, 27,210,154,107,104, 49,136,144, 34, 81, 60,  8, 46, 61,225, 10,236,121,
+ 86, 62, 32,150, 51, 91, 50, 36,229,179, 99, 15,184,210, 90,125,  4,116,161, 58,173,189,152,160,132, 53,  9,140,197,254, 84,162,
+ 41,230, 54, 18, 63, 81,211,217, 39,139,  5, 50, 19, 15,116,179, 28,195, 54,188, 75,201, 51,105,238,220, 47, 82, 91, 74, 16,243,
+164, 81,  8,165, 82,134,208,154, 37,  9, 30,  1, 32, 13, 78, 89, 83,182,111, 34,238,165,100,204,203,158, 43, 89,131, 31, 38,196,
+ 82,149,167,224, 91,126, 82,146,127,101, 72, 27,157, 40,216,210, 67,  1,105,239, 78, 37, 35,212,135,166,123,149,151, 38,172,206,
+236,246,202, 34,114,140, 98,230,176, 12,153, 24,243, 15, 37,171,165,189,231, 79,196,180, 48,218,195,237, 86,164,113, 32, 16,154,
+234,175, 88,163,247,248, 82,145,255,  0, 50,160,224,243,218, 56,131,225,196, 45,140, 11,204,190, 19,203,130,226, 27, 47,111,220,
+151,154, 41,149, 35,202,111,231, 57, 60,129,253, 80, 57, 37, 67,233,232,117,231, 81,204, 96, 60, 22,142,221, 86,187,222, 10,110,
+ 25,140,118, 26,105, 75,134, 26,145, 46, 26,169,240,135, 80,162,217, 79,210, 42, 14,180, 50,243,182, 87,  6,230,163, 24,  2,150,
+111,140,220, 49, 75,131,144,165,  2, 42, 18,191,169, 64,255,  0,163, 83,174, 66, 97,213, 41, 85,241, 20,  2, 42,229, 90,166, 72,
+186, 73,221,  8,  7,201,175,138,149,208,254,157, 53,196, 78, 32,  4, 90,225,179, 84, 49, 17,175, 98,107,185, 41, 74,188,227, 41,
+166,  0,241,242,131, 75, 73, 63,245,200,208,182,195,110,213,107, 85,212,121, 94, 11, 22,187,164,115, 63,117, 73,235,175, 79, 18,
+ 94,130, 36,144,238,248, 99,214,199, 60,248,134,130,189,  6,194,191, 70,141, 11, 25, 52,163,185,121,139,115,106, 34,124,137,199,
+141,126, 26,145,162, 56,146,  1,172,133, 62, 26,152, 36, 42, 19,129, 77,245, 41,  4, 29, 68,133, 49, 30,196, 94, 51,209,222, 71,
+ 39, 64,229,227, 90, 13, 12,197, 56,116,177,220,190,215,225, 29,201,179,155, 70, 79,  9,185,112, 65, 42,104,168,113,117,135, 10,
+105,230, 50,177,241, 37, 67,218, 14,254, 32,141,180,124, 92,203, 49,229,186, 36,133, 11,105,141,161,164, 29, 86, 51,187,125,124,
+236,117,129,119,  8,  9, 85,207, 13,132,193,101,169, 45,167,241,217, 43,216,173,244, 32, 80, 19,176, 11, 27,125, 26,236, 49,122,
+172, 50,190, 19,164,187, 57, 31,  5,147, 60, 73, 81,222, 23, 56,119,183, 43,255,  0, 57,228, 46,220,150, 71,201, 50, 41,205, 32,
+211,151, 37, 18,  7, 90,245, 39,236, 26,218,198,131,  5,151,151, 99,164,  1,120,135,  6, 42,227,215,139,238,116, 52, 38,164,129,
+182,222,237, 92,  4,  5, 73,208,231, 81,113,154, 92,243, 29,226,  7, 21,249,116, 38,160, 36, 10,251,182, 30, 58, 40,135, 53,  2,
+ 84, 56, 88,172,139,236,241, 30, 18,194, 94, 59, 30,  7,153, 59,248, 15,110,218,143,149,185, 32, 85,247,216, 94,203, 66,189,221,
+ 80,220,183,188,215,194,195,105,136, 79,152,176,163,181, 21, 82, 16,157,235,177, 63, 73, 26,167,146,118,112, 90, 88,181,191, 21,
+245, 51,242,253,236,206, 11,219,120,102, 61,202, 67, 75,188,188, 60,213,165, 73,142,167,210,145,189,  2, 80,186,128, 43,182,196,
+ 87,122,141,113,189, 78,114,153,101,211, 98, 87,180, 46,237,198,125, 28,246,183,189,157,175,148,223,114,236,241,231,181,112,108,
+ 42, 60,213,199,104, 77,100,165, 33, 72,117,167,136, 14, 37, 84, 32,138,212, 26,110,  8, 38,185,209, 50,137,248, 79,  5, 91, 47,
+ 48, 87, 33, 21,203,254,160,125, 46,102,254,156,103, 63,121,197, 60,235,183,108,190,100,202,141, 37,107, 65,151, 17, 64,173, 42,
+109,228,142, 37, 72, 40,  9,248,146, 15,191,218, 79, 28,152, 88,123,214,165, 80,148,195,128,171, 43,119,118,162, 50,228,146,183,
+ 43,  6, 66,152, 99,133,105, 68, 58, 82, 91, 35,222,146, 79,217,162,154, 83,  3,170,108,194,187,187, 17,196, 33,217, 78,254,  8,
+154, 28,128,180, 30, 42,143, 33, 36, 10, 84,111, 66, 66,210,124, 40,125,218, 28,233, 41,221, 94,  7, 38,180,102,208,164, 34,208,
+190, 50, 91,100,201, 97,134, 86,144,234, 74, 85,247, 19, 93,137, 66,129,225, 93,142,192,236,117, 66,  0,197,157, 57, 84, 95,114,
+ 47,177,173,179, 26, 92, 71, 40,171,179, 50,156,137,112,100,169, 11, 50,227,178, 86, 26, 82,118,  1, 84,109, 73, 32,130, 71, 17,
+ 90,128,107,177, 68, 73,246,126, 10,165,211,  0,169, 61,155,238,156,140,170, 60, 91, 68,169, 73, 18, 90,142,210,208, 69,  7, 39,
+  7, 31, 53, 32, 13,184, 45, 10, 65, 72,246,125,154,158, 77, 27, 92,170,245,220, 74,177,175,151, 70, 27, 76,139,171,235, 10,227,
+197, 47, 19,253, 71, 17,243, 27,211,251, 72, 58,169, 30, 44,167, 46,107,155,123,173,220, 39,211,  5, 54, 73, 36,148,202, 18, 37,
+188, 65, 39,156,117,220,156, 72, 31, 95, 45,110,227, 86, 31,193,101, 93, 50, 64, 84, 86, 87,150, 79,145, 46, 75, 11, 81,242,252,
+233,  1, 42,175, 82, 86, 71,216, 91,223,234,214,188, 32,  4,125,139, 50,115, 46,130, 49,148, 43,231, 20, 92, 81,  8, 90,156, 75,
+117, 63,247,105,225,250,211,162,109,100, 35, 45, 81, 72,189,203,133, 56,187,109, 82,249, 47,159,195, 83,238,  4,143,171, 76, 43,
+ 98,164,233, 10,225, 96,238, 87,113,163,204,145,130, 91, 94,145,101,140,241,139, 50,114, 80,165, 52,218,150, 66, 19,184,218,164,
+157,170, 69,126,202,200,228,194,  5,137,213, 26,172, 41,204,110,109, 23, 60,119, 27,  5,238, 30, 31, 42, 99,121, 45,189, 97,165,
+168,199,243, 24,230,146,219,174,213,109, 18, 22,  7,194,105, 74, 26, 26,235, 78, 17, 19, 26, 21, 90,202,140, 75, 21, 92, 68,237,
+150,112,213,209,217,210,225, 56,235,  9, 82,159,  1,  3,115, 65,189, 82,189,254,192,122,105,126,214, 96,160,144,143,227,208,238,
+110,202, 67,112,137, 18,192, 79,225, 40,148,172, 20,171,116,241, 52, 87, 93, 72,195, 84,195, 85,216, 93,139,176, 74,200,109, 81,
+241,249,132, 42,228,128, 37, 50,211,180, 80, 10,  4,186, 40, 83,211,116,157,143,142,174, 13,  7,138, 34,180,123,179, 17,120,221,
+174,197,112,144,158, 15,220,100, 72, 81,108,242,248, 84,133,142,104,  5, 71,113,241,  2, 61,128,143, 29,124,131,234,156, 93,153,
+153, 29,130,115,252, 79,253,190, 10, 35, 73, 41,184,164,  2,208,113,242, 55, 75,100,129,254,240,211, 92, 93,147,254,154, 32, 26,
+171, 58,212,132, 88,123,125, 26,115,244,249,153,238, 45,165,159,111, 21, 33, 35,245,104,181,203,114,104,142, 40, 86, 55, 41,153,
+ 56,124,233,210,232,126, 97, 82, 98, 30, 94, 33,164,168,234,112,135,198,166, 36,200, 39,105, 46,105,136, 99, 71, 87,245, 84,202,
+189,202, 64, 38,191, 97,212,188,183,145, 67, 37, 39, 92,110,175,197, 85,237, 79,157,153,113,212,180, 79,137, 42,165,126,205, 88,
+ 48,102, 79, 25, 56, 68, 34,228, 45,217,177, 24,240,246,249,242,150,165, 45, 94,197,169, 93, 63,234,211, 76, 34,197, 50,237,223,
+ 88,147, 83,111,245, 23,148,161, 63,186,145, 37, 43, 85,125,139,140,211,168, 63, 97,215,179,117, 96,247,207,237,200, 46,119, 44,
+127, 80,248,170,187, 30,122, 68,137,170,105,165,148, 80, 23, 91, 88,234,149, 32,243,  4, 31,113,213,  8,157,186,160, 18,172, 79,
+ 86,221,152,205, 61, 76, 68,183,122,132,236, 68, 21,223, 50,119,154,108,101,184,229,184,133, 92, 33,203, 44,165,167, 93,110, 53,
+121,184,203,138, 72, 82, 75, 96,154,147, 80, 41,183, 51,234,127, 77,221,153,121,203,198,142,253,195,227,136,249,132,185,150,230,
+ 15, 29, 57,186,233, 49,114, 35,108,123,210,119,167,143, 72,125,229,190, 34,114,123,185,103,155,131,246,250,  4,152,206, 76,190,
+101, 17,157,183, 33, 49,184, 31, 56, 71,110, 90, 82,227,174, 17, 80,132,161, 38,170,166,177,176, 61, 29,151,145,108,101,100, 13,
+ 80,  4,110, 50, 12,195,184, 29, 73,236,239, 68,156,196, 65, 39,130,116,239,159,112, 45,189,205,205,239,153,  6, 56,130,214, 56,
+201,106, 13,165,162, 56,148,195,138,210, 98, 50, 56,239, 67,193,  9, 36,123,117,232,153,243,140,236,120,252,188,  7,128, 12, 23,
+ 55,125,190,100,201, 74, 44, 76,118,110, 56,150,191,237,227,146, 18,125,186,164, 96,199,197, 87,  7, 86, 78,183,108, 43,183, 25,
+143,166, 11, 38, 41,149,231,145,241, 43,100,171,244,140,131, 37,133, 14, 51,151, 11,181,193,168,172, 38, 44, 24,233, 97,133, 36,
+ 37,176,162,226,130,157, 80, 72, 85,  8,  4,141,173,100,244,216,230, 97,198,169, 90, 33, 29,196,203, 71, 37,180,  1,191,138,215,
+196,186, 21, 87,169,212,160,184,158, 63,232, 55,  4,200, 92,135,143,226, 89, 37,254, 67,173,173,183, 39,223,111, 77, 66, 43, 10,
+ 77, 85, 70,109,237,241,  0,211,109,235,170,149,250,119,165,194, 45,178,115,241,147,126, 10,103,169,  1,192, 47, 29,245,239,126,
+ 47,221, 46,225, 89,101,227, 86,135,172,241,173,246,168,246,  7,155,151, 47,231, 93,124, 70, 74,154,105,229,188,164,165, 74, 95,
+150, 82,146, 85,185,166,182,114,108,133,177,137,136, 32,  8,129,169,115,167,122,206,201,200, 22,201,217,150,188, 17, 51,111,127,
+ 39,141, 64, 28,231,202,117,184,236,183,253,103, 92, 88,109, 35,235,174,179,225, 81,148,192, 28,208, 56,232,165,247,159,191,190,
+156,189, 60,100, 83, 59, 91,108,237,251,121,155,182,  9,170,181,100, 87,203,197,210,108, 55, 37, 76, 97, 94, 92,161, 17,184,191,
+ 11, 40,109,208,164, 37, 70,164,211,112,122,156,174,161,234,156,124, 44,153, 81, 10,119,236,210, 82, 50, 33,200,208,128,  7, 13,
+121,173,216,225, 87, 17,168,114,160,230,150, 46,223,231, 56, 29,183,191,189,133,113,243,218,201,243, 21,104,184,218,238, 10, 74,
+230, 88,238,236,183,231, 42, 27,203, 78,203,109,109,144,182,151,226,157,149, 67,215,102,171, 41,201,160, 95, 75,237, 37,136, 60,
+ 98,123, 63,129, 89,185,216,222, 86,163,129, 67, 96, 60,136,206, 55, 25, 70,141,172, 23, 86, 62,144,116, 40,157, 85, 14, 73,163,
+211, 78, 43,142,247, 11,187,208,172, 57, 82, 11,184,172,  4, 74,188, 92, 34,160, 84,200, 98,223, 29,114,203, 84,218,188,212,128,
+147,238, 39, 87,240, 43,140,172,248,184,  0, 73,246,106,173, 98,212, 39, 48, 10,230, 63, 80, 29,195,202,251,241,220,137,253,204,
+206,101,169,219,149,201,101,166, 34,133, 31, 34, 12,118, 84, 67, 17, 99,167,162, 27, 66, 77,  0,  3,222,119, 36,235,202,122,183,
+ 83,179, 50,211,108,203,147,247, 14, 64,119,  5,209,194, 46, 85,241,216,110,245,218,251, 61, 62,221,138,231, 77,200,184,118,110,
+255,  0,102, 17,114,139, 84, 98,149,175,205,142,149, 22, 37,199, 67,138, 74, 82,251, 75,  9, 33, 85, 27,109,236,161, 61, 61,234,
+ 47,244,235, 12,109,115, 76,180,144, 31,113, 29,224,165,101, 66, 96,131,192,171,122,251, 19,211,246, 95,217,188,171, 60,237, 93,
+190,236,155,181,165, 86, 72,226,227,127,121,142,110, 34,224,242,210, 66, 89,134,124,177, 68,183,185, 53,235,182,189, 11,  3, 63,
+ 19, 62,139,101, 76,102, 54,109,214, 77,252,196,242, 26,114, 89, 89, 56,144,174, 14, 29, 80,179,101,  7,221,115,203,251,233, 88,
+169, 30,202,211, 72,  6, 11, 53, 91,125,234,207,187, 87,233,130, 60, 12, 29,236, 78, 62,103,220,159,149,139,112,188, 79,191, 59,
+ 33,152, 77, 51, 45,148, 72, 12, 68, 98, 43,137, 36,132, 56,144, 92, 89,168, 61,  5, 54, 21, 58,215, 94,171,165, 88, 41,141, 66,
+201,176, 50, 50,225,168,118,  0,119,115, 91,152,248, 16,216, 12,181, 37,126,229,150,236,  6,225,135, 90, 59,175,217,214,156,139,
+219,236,161,153, 11, 69,170, 83,133,231,109,179,224, 58, 24,155, 24, 56,170,169, 72, 28,146,164, 40,238, 65,213,225,109, 89, 53,
+195, 34,160, 68,102,250,118, 17,161, 31,193,103,230,227,138,165,167,  2,180,122,109,183, 38,239,223,187, 62, 53, 51,226,180,221,
+226,222, 44, 18,144,122, 45,169,246,185, 12,208,143, 17,201, 64,253, 90,179,210,198,235, 60,179,194, 96,143,120, 42, 24, 71,250,
+129,115, 11,248, 99,118,254,224,206, 79,151,196,159, 59,203,219,163, 81,210, 26, 10,250,212, 14,188, 10,252,131, 29,123, 23, 77,
+ 24,104,138,217,187, 81, 30,211,143, 88, 23, 53, 63,197,207,122, 76,182,185,117, 40, 85, 87, 79,160,128, 53, 44,174,160,108,136,
+101, 24,195, 86, 85,175,119,123,125,111,154,228,139,203, 45,114,121,109,242,140,138,126,211,138,226,  1,254,233,174,180, 41,234,
+ 59, 76, 98,152, 84,238,146,178, 78,206, 58,155,189,178,218,161, 70, 83,228, 45,253,190,242,156,112, 42,154,208,167, 59,112, 62,
+212, 51, 83,178,222, 59,112,143, 48,176, 16, 60,144,248, 73, 20,218,134,164,106,183,238,116,119, 68,217,170,185, 46,  6, 29,222,
+ 15, 36,211,207, 72,251, 70,189,164, 21,220, 58, 95,118,209, 30, 90, 75,106, 77,107,245,234,105,221,  9,185,246,229,155,130, 15,
+150,146,  2,182,168, 26,136,179,106, 36,117, 74, 55,124,  6,253,140,201,249,142, 10,242,  1,217, 64, 18,  8,250,181,106,187,196,
+184,168, 74,178,165, 91, 35, 42,117, 23, 29,194,220,161,213,165,110, 21,244, 19,166,144,230,144,151,106, 42,214, 61, 38,224,215,
+ 20,168,161,241,251, 39, 65, 42, 78,203,212, 75, 92,219,115,230, 52,214,234,218,197, 21,226,  8,233,184,241,211,143,135,130,129,
+ 59,149, 21,234, 63,208,180, 44,173,147,146,118,156,162, 12,178, 84,185, 22, 83,240,196,123,157, 74,212,209, 20,242,150,122,  1,
+247, 63,187, 90,235,167,233,125,124,193,161,102,163,183,159,183,181, 99,102,244,221,239, 40,104,123, 23, 14,101,248,214, 73,137,
+100, 50,173, 55,200,111, 68,157,  8,165,153, 13, 73, 73, 66,195,138, 10,226,170, 31,  3, 77,136,216,245,241,215,105, 77,145,178,
+ 59,162, 92, 21,206,217, 19,  2,196, 49, 95,150, 56,243,166, 66,243, 86,176,175, 49,124, 93,173,121, 10,109, 79,179, 86, 68,180,
+ 67, 26,167,140, 50,210,196, 69,  0,243,124,210, 54,218,160,241,173, 65,  0,236,105,239,  7, 80,220,166,174,254,209,100, 16,241,
+  7, 13,202,223, 25,  8,185, 10,  3, 33,180, 32, 40, 36,110, 10, 65,  4,  3, 94,180, 26,171,116,119, 43,248,243,101,214,126,154,
+ 59,223,  6,239,152,218, 96,220,167, 60,200,149, 41,152,142,185, 29,109, 33,213,121,138,224, 18,165, 55, 74, 39,125,245,207,117,
+ 42, 76, 32, 72, 11,160,233,214,  9,216,  1, 58, 47,173, 86, 14,254, 99,216,182, 46,204, 11,108,198,196,  8,108, 54,196, 84, 37,
+196,148,209, 45,241, 32, 20,166,135,114, 42,117,194, 79, 34, 92,215, 68,125, 59, 27,100, 11,113,251,118,165, 76,191,186,182,108,
+206,  2,162,185,228, 59, 29,242, 67,168,114,132, 40, 10,164,141,246,221, 36,142,154,165, 60,137, 30, 28, 87, 77,131,209,133, 61,
+189,139,230,247,174, 76, 46,233,216,220,185,140,174,206,226, 21,128,223,222, 66,161, 54,195, 33,148,196, 91, 85,113,108,172, 35,
+111,187,203,137,234, 71, 94,149,215, 95,209,114,198, 76, 54,159,152,113, 88, 62,160,233,135, 22,123,192,248, 15,220,126,223,139,
+ 42,223,181, 29,218,158, 83, 14,  4,213, 31,226, 38,121,234,169,173, 22,167, 80,234,142,254,192,154,125,122,218,182,142,107,148,
+243,151, 65,118,163,186,146,237,249, 60, 91,219,114,  9,101,198,158,143, 41,165, 29,212, 30,142, 92,  7,221, 78, 21,250,117,153,
+125,  0,197,187,255,  0, 52, 72, 95,171,170,135,186, 93,218,125,235,253,206,198,251,223,195,177,119,102, 83,107, 42, 53,109,197,
+165,229,184,164, 87,160, 82, 86, 80, 64,240,160,240,214,182, 37, 13, 16,123,149, 11,174,212,133,239,179,217,244,203, 52,235, 85,
+226, 10,248,182,133,173,185, 59,254,203, 47, 58,223, 33,254,192, 63,111,187, 70,190,177, 39,  5,  6, 19, 96,175,123, 15,120, 23,
+124,193, 89,122, 83,188,190, 98, 20,178,233, 87,253,227, 16,193,  7,233,  5,103, 89, 39, 31,108,253,191,154,179,230,184, 92,241,
+221,204,245, 45,222, 98, 54,240,248, 98,176,203, 85,222,171,109, 78,  7,192,167,247,137,214,214, 53, 47, 19,226,179,111,177,136,
+ 85, 46, 91,148, 63, 62, 65,184, 69,116,121,  1,231, 18,  7,180, 34,160,127, 72,214,148, 52, 12,168,207, 82,129,101,121, 19,144,
+113,200,119, 20, 44,135,131,166, 50,169,212,169,105, 38,191,104,175,215,166,  5,138,137,  9,123, 19,205,237, 48,175,197,171,227,
+139, 84, 93,199,  6,  9, 11, 83,202, 85, 82, 43, 77,146,161,212,143,187, 93, 14,251,  8,210, 60, 85,252, 44, 77,229,229,193,116,
+150, 51,222,172, 82,219,137,196,194, 49, 11, 67, 86,235,123, 42,112,186,220,100,130, 30, 90,220, 60, 20,235,148,243, 29, 80,  4,
+ 10,175,169, 72,218,189,105,195, 12,153, 25, 18,175, 91,113,136,218,  2, 86, 93,148,156,133,216,210,217, 74,172, 50,211,197, 49,
+228, 36,173, 36,  3, 93,130,106,160,  5, 73,175,244,215, 90,245, 75,104,112,177,173,153, 39, 84,187,220,236, 38,203,140, 74, 83,
+207, 50,201,181,188,180, 54, 27,108, 23,252,162,180,113, 80,109,101, 45,184,  0,167,237, 38,163,219, 93,106, 81,145,185, 87,153,
+101, 93,199,237,229,182, 69,248, 67,156,231,148, 21,196, 70,117,142, 43, 91,110, 18, 20,148, 87,110, 66,155, 26,244,247,234,193,
+105, 40,  5,125,122,121,194,110,243,167, 53,112,132,219,107,156, 36, 46, 19,133,191,133,178,150, 18, 27,228,146, 61,164, 80,143,
+125,117, 32,166, 29, 48,250,142,185,174,235,220, 28, 95, 19,165, 91,114, 49,146,163,200,138, 58,218,128, 74,183,235, 81, 84,154,
+251,107,225,175,150, 61,127, 95,149,159,151, 31,239, 72, 55,137, 17, 47,237, 67,118,159,130,147,140,223,218, 82, 37, 44, 80, 54,
+ 84,148,164,251,147, 83,182,188,226,218, 14,208, 18, 22,166,254,239,228,200,178, 98, 56,197,173,  6,143, 37,145, 49,225, 90, 16,
+ 93, 81,115,127,209,167,170,163,230,  1,220,164, 39,240,186,  0, 47,206, 69,237,213,174, 27, 74,163,242, 30,126, 82,141,105,179,
+170,220,159,171, 87,235,168, 57, 80, 54, 49,101,227,  8,112,219,224,221,174,107,216, 50, 92, 45,215,193, 42, 80, 21,250,244,140,
+ 62, 36,192,238,  9, 74,229, 53, 55,219,155,204, 55,251,128,162,252,138,123, 43, 90,125,122,156,131,106,137, 29,  2,247,104,103,
+249,222, 89, 10,221, 44,129,111,105,192,236,195,224, 27, 64,230, 71,216, 41,160,119,169, 14, 43,186,125,104,188,183,253, 67,223,
+228,126,194,154,179,184,145,237, 83,150, 72,174,126,181,107,217, 58,128,254,177,239,  3,240, 11,  3, 51,252,217,125,185, 37, 76,
+ 27, 13,189, 79, 67,217, 19, 12, 45,120,221,188,183, 26,108,180,138,161,167, 95, 74,150,132,174,157, 57,132, 40, 38,189,104,117,
+ 74, 80, 59, 12,155, 69, 85,139, 58,147,125,187, 77,182,184,155,157,177,247, 35, 56,210,168,211,172, 45, 77,173, 42, 72,169,162,
+144, 65, 27,106,  0,152,151, 26, 20,129,100, 45,156,223, 40,189, 72,126,227,124,185, 74,156,233, 96,180,223,206,200,117,254,  7,
+221,230, 40,211,234,213,137, 89, 41,233, 34, 74,121, 18,120,173,150,102, 46, 45, 99,162,239,229, 56,109, 92,252,151, 36,240, 87,
+148, 30,113, 37,105, 65, 95, 78, 68, 36,144, 43, 93,181, 94, 96,152,187,112, 44,152,  5,190,198,130, 29, 43,115,104,142, 40, 16,
+ 61,195,174,154, 96, 16,132, 35,241, 58, 51,115,141,217, 78,217,246,148,250,131,239, 95,243, 75,165,142, 69,221,252,106,217,142,
+ 99,233,101,130,252,150, 99, 38,103,241, 83, 31, 81,242,154, 40, 87,236, 32,171,217,169, 93,147, 78, 21, 34,235,132,165,186, 76,
+  0,237,103,212,242, 11, 79, 31, 22, 54, 71,113,224, 21,117,117,252,206,108,214, 27,188,104,253,174,236,230, 31,110,183,189, 68,
+135, 50,  6,102, 95,229,182,145,236,126, 67,140,138,211,199,134,177,163,235, 25, 23,242,232,132, 71,123,200,251,244, 90, 35, 30,
+184,240,136, 77, 93,142,245,121,223,206,255,  0,122,128,135,219, 91,109,143,  3,199,113, 70,173, 87, 12,150,249,127, 86, 25, 30,
+111,242,248, 22,216,198, 67,174,249, 65,212,169, 64,168,161,  0,114, 27,168,106,223,167,189, 67,151,212,136,131, 87, 29,  9, 39,
+102,128, 14,231, 80,156, 33, 25, 31,132, 48, 29,138,242,133,234,139,  4,181,199,118, 52,108,227, 32,117, 72,253,226,176,188, 99,
+ 22,199, 25, 88,175, 68,185, 33, 50,100,164,125,  6,186,233,103,108,153,141,243,255,  0,193, 24, 71,241,  4,170,135, 62,184,240,
+  7,216,  0, 85, 31,115,113, 79, 68, 89,163, 87, 89,249, 76, 12,217, 51,167, 62,171,140,235,132, 75,189,165,217, 46, 62,242,252,
+215, 29, 34, 76, 82,146, 84,163, 85, 87, 92,253,158,156,233,214,218,102,124,221,197,201, 59,135, 63, 98,111,245, 56,240, 98,188,
+224,119,207, 75,221,171,236, 78, 95,218,174,204, 77,201,231, 92, 50,105,214,171,154, 27,203,152,181,134,226,185,  1, 74, 74,203,
+110, 91,220,220,173,181,208,213, 30,  3, 90,152,216, 56,248, 52, 78,186,204,142,242, 14,173,163,120, 33,228,230,194,202,200, 14,
+151,228, 93, 25, 98,120,113, 71,224, 67,  4,111,238, 77,117, 82, 80, 89,145, 58, 47,206,203,247,122,239,218,142,227,218,251,147,
+104, 74, 93,147, 21,213,173,113,220, 52, 67,204, 44, 22,157,105, 93,118, 91,106, 41,173, 54,174,174,209, 97,166, 98, 67,146,177,
+ 77,134, 18,  4,114, 94, 59,137,232,169,158,231, 95, 30,205,125, 43,223,237, 83,240,139,140,165, 92,134, 49,123,184, 69,180,221,
+236,229,127, 26,162,169, 19,150,134,221,105,  4,241, 67,136, 89,168,235,210,167,148,234, 30,143,149,182, 25,226,152,152, 31,229,
+ 37,140,123,181,226,  7, 34,235,160,175, 42, 19, 14,234,207,193,187,127,219,175, 78,141, 68,203,251,173, 34,209,151,119,125, 48,
+159,137,105,197,227, 41,187,165,166, 17,120, 81,201, 55,  7,147,248, 78, 41, 40,170, 82,210,  9,220,214,189, 10, 99,210, 61, 53,
+ 14,159, 57, 93,147,178,201,240,140, 62,104,135,231, 46, 68,183, 47,176, 29,249,177,128,104,151, 40,142, 91,234, 19,183,247,142,
+203,221,240,251, 22, 31, 19, 27,190, 94,157,133, 37,249, 22, 21, 45, 16, 92,249,  7, 84,180,164,198,113, 68, 53, 64,181, 83,129,
+ 53,232, 70,186,154,206, 61,117, 78, 53,212, 32,102,207,183,129,110,238, 92, 79,  5,159,118, 97,178, 27, 72, 84, 93,150, 98, 20,
+234,156,116,213, 11,228,165,127, 70,129,104, 84, 66, 51,249,151,221,221,183,247,206, 68,164, 26, 33,203, 77,137, 41,250, 21,104,
+140,173,190,205,113,190,180,139,245, 25,127,195, 31,249, 66,233,227, 47,128,120, 38, 47, 79,247,135, 30,244, 51,100,184, 74, 36,
+249, 25,109,250, 18,  9,240, 14, 64,134,225, 27,255,  0,106,186,232,122,  4, 63,252,104, 29,150, 75,240, 11, 47,170, 73,196, 83,
+247,165,230,131,190,163, 48,247,218, 20, 73,152,167,200, 62,  8,242, 86,218,126,210,117,173,210,166,249,113,241, 85,113,116,156,
+124, 85, 63,150, 98,137, 70,117,124,156,249,  2,136, 22,230,  0, 27,  5, 58, 82,179, 79,180,235,231,188,191,148,142,101,116,224,
+162,253,205, 49, 19,145, 66,152,210,  2, 45, 22, 56, 72,106, 50, 70,220,156,224, 83,250,183,208,161, 91, 17,216,156, 21, 82, 32,
+ 70,187, 72,181,166, 74, 69, 29,144,183,  0, 62, 40, 10, 36,125, 85,211,204,203,121, 61,131,248, 34,196,124, 46, 84,  5, 69,110,
+243,147, 77,153,196, 24,208, 92, 15,171,109,130, 35,165, 71,127,175, 90,120, 78,  3,118,160,146,197,  6,249, 62, 56,159,243,178,
+159,226, 22,239,204,  1, 79,217, 64,223,244,168,105,183,107,237, 70,219,162,210,213,198, 76,111,133,192,125,202,  4,235,222,215,
+103, 40,130,189, 70,190,  8,242,131,206,138,182, 79,197, 77, 76, 20, 57,197, 60,225, 50, 45, 55,  7,146, 93,  0,182,122, 19,181,
+126,157,  6,209,162, 45, 51,218, 85,158,174,216, 98,153, 61,167,136,109, 10, 81, 79,179, 89,147,186,112, 43, 82,  2, 51, 10,157,
+207,251, 10,238, 51, 57, 83,108,131,148,112, 74,203, 43,220,127,178,122,141,104, 81,155,187,138,171,118, 59,112, 65,237,177, 26,
+  7,138,218, 33, 73,251,220,190,242,126,143,110,173, 25,186,169,181,184,169, 87, 27, 75, 18, 69, 20,  7,149, 79,190,158,163,236,
+211,137, 40,237,  8, 47,155, 50, 10,212,211,136, 46, 50, 13,  2,210, 55,167,188,105, 55, 52,198, 42,185,239,239,167,110,218,119,
+231, 29,118, 53,226, 58, 90,190,165, 11,242, 37, 52,  2, 30,108,169,  5, 53, 74,169,191, 90,208,212, 87,195, 90, 24, 29, 82,220,
+ 66,241, 58, 30, 71,129,254,213, 87, 35, 18, 23,134,144,246,243, 92, 37,221,223, 78, 25,167, 98,239, 74,118,238, 21, 38,202,242,
+138, 19, 45,180,168, 52,239, 30,133, 85, 39,138,233,185,  4,239,224, 72,  7, 94,133,129,212,171,202,143,194, 88,243, 31,110, 43,
+151,202,195,157,  7, 94, 29,168, 86, 61,149, 54,194,145, 22, 69, 20,132,154, 37, 96,169, 42,219,219,199,199,219,177,213,210, 85,
+ 80, 89, 89,248,205,225,248,240,147,113,134,148, 60,201,253,180, 16,161, 83,181, 10,122,  3,245,  3,168, 29, 17, 99, 37, 41,174,
+238, 93,241,124,142, 45,226,219,206, 37,205,165,130,135, 16,148,182,107, 95,105,241, 30,243,170, 89, 53,137, 68,133,167,133,121,
+132,193,236, 43,179, 59, 47,235, 90,118, 73,132,177, 29,233, 74, 91,170, 64,  9,117,213,158, 92,147,214,160,239,183, 77,113,121,
+ 61, 52,  9, 21,233,248,157, 68, 89, 16, 85,249,218, 30,246,183,123,136, 45,207,200, 31, 54,165,  4,148,  2,  9,228,122,116,219,
+166,176,242,240,246,133,208, 99,230,  3,170,129,221, 75,189,131,212,149,182,251,216,153, 74,109, 51,225, 71,114, 67,114, 85, 74,
+ 53, 37,176,162,205, 85,227,241,  1, 93, 71,  7,118, 53,177,179,147,162,231,152,229, 99, 74,  0, 57, 63,143, 34,184,187, 19,131,
+113,133,116, 97,137, 73, 45, 63,  1, 10,243, 80,126,242, 93, 46, 20,172, 26,120,133, 10,107,210,228,  1,136, 35,154,241, 91, 30,
+ 50, 32,232, 85,181,141,203,184, 65,156,196,182, 84,124,132, 37,194,231, 93,146,168,197,  0,253, 90,161, 42,193, 26,166,220, 80,
+ 28,187,181,119, 75,245,237,204,134, 85,105, 37, 97,231, 19, 79,219, 65,165,127, 70,174,213,112,132, 64, 64,157,102, 69,212,155,
+ 94, 57, 55, 29,183,185,  9,196,148,184, 10,232,105, 74, 23,208,231,255,  0,105, 90,132,236,220, 83,109, 32, 34,118, 76,142,243,
+ 27, 15,143, 96,109, 42, 75,173, 51, 45, 10, 82,171, 94, 50,184, 32,125, 96, 38,154,140,224, 55, 19,246,226,150,226,147,251,133,
+ 14,227,120,187, 57, 36, 54, 74, 24,226,128,104,119, 67,116, 41, 63,104,213,170,102, 34, 21, 75, 34, 74,172, 46,214,123,163, 81,
+ 67, 41, 73, 73, 87,152, 57, 17,176, 80,116,172,126,189, 92,222, 10, 15,150, 82,127,116,110,146, 98, 97,178,  3,202,225, 49,181,
+180,235, 35,218,243,106,224,138, 15, 29,149,184,212, 37, 38,213, 18,186, 12,228, 34,150,240, 12,102, 82, 75,119,155,138,150,252,
+233, 69, 43, 95, 37, 16,  7, 33,208, 83,192,109, 77, 84,149,142, 87, 83, 78, 56,128,101,117, 98,205,173,134,153, 72, 36,190, 40,
+180,121,135,126, 67,196,215,111,209,165,251,150, 66, 56,130, 68,186,182, 32,193,178,220,123, 93,123,184,222,164,134,154,180, 70,
+143, 46, 50,129, 13,148,121,151,  8,209, 28,162,148,170, 84,135,126,186,104,184,121, 15, 34, 22,103, 83,195,217,  7, 85, 53,237,
+200, 57, 23,150,235, 18, 80,107,178,148,219,203, 82,148,  0,168, 35,137,161, 27,248,141,134,182, 33, 32,185,151, 40,198, 15,219,
+216,183,251,204, 86, 60,146, 32, 50,124,197,238, 82,183,156, 82, 58, 14,148,160, 31,210,119,213,168, 88,200,128, 58,185,187,117,
+149,219,172, 86,168, 24,  6, 28,216, 69,214, 20,199,166,206,144,178, 74,156,121,213, 49,230, 33, 30,208,  2, 64,160,235, 74,141,
+ 91,  5, 25,212, 14,249, 89,203,119, 75,119,112,214,162, 84,212, 87,173,143,131,241,112,144,151, 60,218,130, 42, 40,176,121, 87,
+ 94,  1,245,115,165,145,124, 47,143,  9,176, 62, 35, 71,247,  0,161,111,106, 90,196,238, 14, 79,121,168,140,159,223, 40, 39,233,
+ 42, 35,145,251,117,229,102,151, 37,101,206,198, 83,251,243,152, 57,113,201, 28,136,209,248, 80, 89,183, 70, 64,240,109,150,194,
+ 84, 71,215,160,209, 91,205,251,149,160,126, 21, 51, 35,113,225,252,154,198,131,198, 59,104,105,201, 10,246,  0, 57,  4,253,103,
+ 86,170,172,110,240, 77, 45, 75,173,153,109,239,252,187,136,  4, 54,120,189, 61,110, 45,193,226, 25, 97, 60,135,218,173,  6,208,
+243, 86,171, 12, 16, 78,218, 68,121,220, 85,119,137, 67,248,185,239,161,  8,175, 94, 59,154,126,141, 15, 46, 76, 89, 78,  1,202,
+ 39,112,103,252,183,140,185, 41,161,255,  0,198,174, 69,107, 30,212,160,175,203, 79, 79,112,208, 35,241,104,148,151,114,122,194,
+  9,255,  0,199,187,142,219, 34, 21,141,106, 39,197, 70,195, 16,126,161,175,101,234, 31,230,251, 35,255,  0, 40, 88, 89,163,250,
+135,237,201, 57,250, 59,202,110, 88,182, 23,220, 86,237,176, 98,221,110, 14,217, 13,229, 54,139,154, 74,227,205, 77,169,207, 53,
+214, 10, 65,169, 82,153,113, 97, 52,232,119,161,166,155, 27, 38,116,213,118,192, 36, 68, 55, 49,224,118,241, 30,208,236,167,211,
+216,200,131,192,133, 95,100,185,255,  0,163, 44,254, 12, 59,175,249,170,119,110,101,207, 91,138, 69,154,247,108,151,120,136,151,
+ 74,190, 52,177, 50,217,205,206,  3,162, 75,173,131, 78,186,195,198,235,253, 59, 36,110, 50,149, 71,176,131, 33,236, 35,151,136,
+ 86, 44,233,129,254, 18,200, 51, 25, 47,162, 28, 22,227, 30, 53,235, 62,184,230, 83,214,225,109, 54,108, 82,203, 42,  8,113, 73,
+ 79, 42, 57, 54,241,229, 37, 40,254,183,  4, 40,211,166,250,177, 46,179,211,235,212, 88,108, 61,145,137, 31,124,153, 48,233,173,
+243, 20,253,219, 78,252,219,253, 88, 99,119,255,  0, 79,150,107, 28, 60, 98,200,212, 72,217, 95,111,172,112, 63, 17,106, 54,183,
+157, 76,228, 58,250,199,152,252,151,226,184, 87, 83, 79,185,211,169, 49,233, 62,162,255,  0, 84,157,148,109, 16, 12,240,  3,185,
+223, 94,100,131,247, 35,228,227, 15, 45,162, 56,106,171,169, 82, 85,252,192,195,134, 40,195, 53, 97, 20,240, 82,142,228,232,187,
+ 86, 26, 38,135,112, 46,231,118,250,255,  0,233,127,185, 87,  4,217,172, 55,195, 18,241,143,100, 79,161, 78, 71,180,223, 97,  5,
+182,211,143,165, 27,134, 95,105,106,105,197, 10,148,131, 95,105,  6,183, 18, 25,152,242,162,101,156,131, 19,217, 33,249, 17,161,
+ 87, 48,239, 16,120,158,  5, 83,243, 63, 43,143, 87,232, 66,127,150,216, 34, 92,173,128,186,227,121,  4, 27,205,161, 86,146,216,
+  9, 66, 93,249,149,200, 72,  8,161, 42,248,128, 85, 60, 43,182,185, 63,255,  0, 82,207,140,140, 68, 28,118,131, 22,247,186,214,
+172,141,174, 72, 87, 44,124, 27,  8,244,213,218,107,166,  9,134, 93, 35,228, 93,229,202, 24,137,109,203,242, 27, 81, 43,183,193,
+129, 17, 65,223,229,144, 31, 80, 10,119,205,120,  5, 60,224,162, 84, 18, 19, 67,225,209,244, 62,153, 14,149,142,107,220, 39,108,
+190, 98, 56,  0,252,  1,231,222, 86,126,126, 76,100,241,143, 62, 41, 71,  0,199, 37, 95, 93,110,205, 13, 77,183, 58,124,134,160,
+176,228,165,134,153, 74,222,113, 45,165, 78, 45, 91, 37, 32,157,201,233,173,  6, 51,144,  3,154,202,140, 31, 68,213,222, 30,234,
+122,111,244,179,145, 92,123, 91,117,196, 38,119, 39,186,214,254, 81,111, 50, 46,178,228, 89,108,209,228,160, 81, 77,197,105,148,
+ 25, 15, 36, 31,135,154,248,165, 95,121, 59, 17,172,222,163,234, 28,110,159,105,168, 86,108,156, 75, 18, 78,208, 15,112,226,126,
+204,181,171,233,208,128,248,131,159,185,104,186,100, 29,182,205, 61, 47,225,253,214, 95,109,162,246,243,187, 89,117,217,247,173,
+ 54,232, 55, 27,140,191, 59, 27,138,217, 96, 76,113,185,138,  1, 30,124,149, 81,186,163,226, 66,121, 37, 84, 58,222,174,248,228,
+ 99, 70,211,  1,  3, 35,166,167,135,106,169,159, 77,112,136, 17, 12, 79,224,154,125, 49,219,187,120,221,203, 59,205,251,189,  9,
+115,187,127,142,227,179,221,184, 69,142,148,169,229,124,195,205, 70, 30, 87, 50,  0, 88, 73, 81, 65,168,162,168,106, 52, 44,123,
+107,162, 22, 91,104,120, 66, 36,148, 62,157, 72,178,100, 30, 12,144,251,191,217,  9,221,184,180,195,203, 49, 25, 73,191,246,126,
+234,210, 95,199,242,168, 73, 38, 52,166, 92, 95, 32,135,124, 90,125, 35,101,182,186, 16, 65,208,140, 98, 98, 44,132,132,171,151,
+  9, 14,  7,248, 30,208,149,248,210,168,235,195,181, 65,177,216,159,110,201, 46, 98,232, 86,150,135,148,159,114,254, 18,127, 78,
+170,190,168, 44,133,247, 10,244,187, 61,238, 61,161,147, 69,176,203, 77,159,164,167,146,191, 94,154,138, 92, 19,222,152,201,147,
+ 19,248,142, 84,174,202,183,159,185,  9,212, 98,233,154,155,127,207,173, 60, 90, 91,174, 54,165,  4, 36,154,114, 32, 36,214,149,
+167,142,140, 41,147,110,111,135,243, 83,218, 89,219, 68,185,142, 33,155,133,196, 69,111,104,201,221,103,216,132, 10,157, 70,193,
+170, 28,120, 41, 95,154,  3,168,115, 56,196, 46,234, 59,222,241,204,118,229,203,218,132, 91, 67,106, 63,245,155,166,184,239, 86,
+197,250,128,151,247,171,135,240, 93, 28, 37,240, 71,192, 39,156, 54,212, 49,207,203,247, 23, 75,  0,164, 59,148, 92,230, 57, 94,
+165, 79, 66,142, 43,246,157,116, 93,  5,191, 96,223,250,146,255,  0,150, 43, 59,169,134,140,124, 85,145,233,117,  8,139,223, 44,
+ 77,247,118, 91,139,138,218, 62,176, 73,213,142,139,255,  0,186,135,138,  6, 57,254,164,124, 85,115,221, 67, 14,207,150,189,110,
+114,159,204, 66, 25,157, 32,127, 85,194,209,  0,125,130,186,241,  9,227,153, 88,123,  1, 43,163, 50, 96,171,206,230,230, 95, 63,
+ 13, 94, 73,163,101,177, 25, 38,187, 41,100,  4,147,245,104,118, 84, 31, 69, 16, 85,105, 47, 40,110, 62, 79,243, 44, 31,224,109,
+233, 75, 13,  1,208,168, 10,157, 63,149,161, 86,  4,159, 68,193,135, 52,204,126,216,101,217,116,165, 14,111, 71, 49,153,175, 64,
+165,186,  9,250,205,105,171, 20,196,196,132,172, 96, 16, 85,181, 39,249, 11, 86,224, 54, 22,247,102, 17, 77,128, 47,161, 32,254,
+189, 75,202,209,251,212,124,213,174, 92, 20, 54,233,216, 20,248, 15,118,189,219,106,237, 55,149,  5,235,104, 65, 42,111,167,176,
+233,153, 62,231, 94,109,119,217, 22,  7,  2,155, 36,178, 13, 72, 59,145,169,141, 83,152,171, 35,  7,239, 87,203,  0,219,142, 84,
+ 29,168, 78,129,118, 48,146, 37, 55,152,113, 76,247,140,246,223,122,136,124,202, 18,161,215,111,101, 53, 76, 99, 16, 85,207,220,
+  9,  5, 90,100,228, 49, 55,230,225, 40, 32,215,127, 16,126,157, 92,172, 16, 21,121,144, 86,168, 55, 20, 73,248,217,  1, 47,138,
+  5,180,118, 10,250, 43,162,  4, 50,188,207, 76,119, 17,243, 81,255,  0,122, 42, 20,133,117,247,234,109,205, 11, 84,181,115, 75,
+115,219, 81, 67, 69, 18,147,247, 74, 77, 14,147,178,148, 98, 66, 91,201,113, 27, 62,115,105,127, 27,203, 34, 55, 42, 11,232, 45,
+ 56,212,132,213, 43,  7,223,238,246,245, 26,177, 69,210,166, 66, 81, 58,133, 27, 33, 27,  1, 18,224,184, 99,213, 95,166, 92,131,
+211,229,193,204,158,200, 29,155,219, 87,148, 18,203,235, 73,113,112,157,240,106, 65,  3,238,158,137, 95, 67,208,239,215,186,233,
+157, 98, 57, 49,105, 48,144,251,215, 43,157,211,205, 37,199,202,170,236,111,189, 87,107,  1, 13, 64,243, 71,154,120, 56,208, 37,
+ 65, 73,167,184,252, 67,254,148,214,176,177,249, 44,240,153, 87,159, 92,174,110,152,238, 36, 52,253,  0, 83,114, 56,173, 59, 80,
+109,200, 87,169,167,133, 58,248,106, 38, 38, 72,245,219,181, 60,246,131, 34,153, 98,188, 70,141,113, 82,147, 10, 71,152,242, 66,
+ 20,126, 15, 45, 65, 38,128,157,133,117,153,155, 88,229,197,116,157, 47, 52,237, 33,248, 43, 55,  9,239,222, 99,100,238,218,172,
+214,183, 86,213,173, 70,140, 61,204,146,167,128, 11, 88, 34,187, 80, 45,  7,235,214, 46, 70, 56, 49,220,120, 46,175,  7, 59,121,
+ 49, 39,144, 86,  6,  9,221,252,195,182, 94,171, 19, 18,254,231, 59,110, 73, 13, 18,136,169, 82,185,181, 78, 73, 39,161,228, 20,
+  8,250, 14,178,175,197, 18, 27,187, 22,230, 31, 86,140,  9,131,242, 77,217, 43, 17, 46,185,197,202,247,111,108,181, 26,115,190,
+111,150,161, 66,159, 52, 37,222,158,245, 18,117,211,224,218,124,160,235,207,250,236,132,178, 12,135,243,107,248,171,  3,  0,179,
+181, 58, 19, 74,112,  5, 58,235, 97,  2,189,  1, 82,212, 55,250,180,214,217,180, 58,204,142,170,196,103, 28,129, 49,216,236,166,
+134, 51,213,160,247,151, 21, 95,233,213, 99,105,111,  4, 81, 16,163,100,120, 52,  5, 94,218,142,234, 64,106, 66, 34,241, 52,232,
+174,105,  0,159,169, 90,156, 44, 58,148,165,  0,134, 47,  2,130,148, 73,243,155,  9, 12,169,167,  0,166,252, 28, 79, 26, 87,233,
+ 26, 49,177,208,246, 58,146,215,102,163, 74, 91,241,214,143,137,105, 66,107, 79,  2,221, 18,126,209, 93,  4,228,178,148,105,114,
+171,236,167,177,117,177,186,225,111,248,182, 74,130,144,  5, 57, 56,194,202,105,244,150,247,250,117, 98,188,150, 60, 82,253,184,
+101, 75,230,189,142,114,239,109, 94, 93,119,143,207, 14,182,212,133,125,208,236,158, 28,119, 62, 33, 27,253,127, 70,161,118,120,
+223,177,215, 73,210,250, 25,149, 30,113,209,206,158,  1, 86,157,158,141, 27,184, 87,121,230, 35,129,184,118,194,227,104, 42, 20,
+ 74,139,100,138, 15,111, 74,106,  2,254,212,246,215,183,146,177,236,144, 30, 97, 94, 90, 10, 92,113, 39,204, 42, 38,164,  3, 65,
+211,174,138, 36, 25,213, 98, 20, 47, 83,217,212, 28, 35,182,246,252, 66, 69,192,195,185,223,165,178,169, 17,219,221, 78,219,226,
+165,110,184, 93, 10, 60,120,121,193,162, 57,109, 84,215,168,213,206,154, 53, 50,228,177,122,245,160, 64, 67,153, 46,171,188, 71,
+ 40,141,120,154,220, 12, 97,213, 45,132, 20,243, 75, 68, 18, 58,117, 52,  3, 97, 77,169,236, 30,221,109, 65,202,229,140, 29, 91,
+214,254,233,218,123, 95, 99, 13, 52, 10,178,185,161,216,240,  2,190, 63, 41, 33,178,183,164, 45,103,199,116,165, 63, 73, 35,166,
+174, 82, 20,192,100, 71, 11,184,187,107,191, 67,186, 91, 92,160, 42,101,228, 44,255,  0, 94,156,  8, 63, 78,227,235,213,244,234,
+219,238,211,141, 95,251, 80,251,232, 73, 15,185, 38, 56,113,  0,  1, 64,162,160, 77,  7, 77,233,245,235,204,254,166,211,187, 18,
+ 50,228,  8,252, 84,173, 15, 20,169,216,220, 62, 85,223, 35, 66, 82, 63,133,133, 29,201,143, 44,141,129, 74,171, 67,245,111,175,
+159,108,183, 66,178, 77, 14, 82, 61,250,224,188,139,190, 13,193, 93,126, 88, 56,183, 82,141,246,105, 39,149, 79,247,186,234, 88,
+245,109,175,113, 86,246,232,201,238,240,242,174,121,188, 59, 51, 91, 70,143, 24,220,165, 19,213, 74, 85, 66, 19,244, 36, 13, 66,
+169,128,242,237, 40,219, 24, 33, 57,103,157,145,205,169, 85, 33,169, 34, 44,111,103, 16, 65, 90,135,211,160,217, 38, 42, 99,130,
+105,195, 26,137, 38,208,169,108, 10, 89,173, 69,180, 51,227,205, 73,109,124,143,214,163,170,185, 58,158,242,201, 13, 20, 41, 50,
+ 25,189, 52,215,204,125,240,121,212,248, 32, 26, 39, 67, 14,  2, 32, 26,133,213,151,143,204,126,229,145,101,118, 24,242,187, 97,
+136, 92, 50,107,179, 81,211, 46,101,226, 44,249,142, 22, 99,182,136,172,169, 73,249,132, 38,190, 75, 99,195, 93,193,245,189,164,
+ 63,147, 89, 35, 71, 32,158,238,212,  9,227,194, 69,200,212,167, 76, 51,243, 13,202,109,113,175,119, 91, 38,  3,132, 91,174,150,
+216,174,144,236, 27, 52,150,  9, 14,159, 40,161, 69, 18,194,136, 80, 52, 32, 17, 93, 84,151,175,242,107,151,195, 77, 58,233,242,
+159,212,156, 81,  8,157,  0,117,200,221,202,138,236,171,133,158,219, 29, 52, 17,120, 21, 37, 53, 33, 30,107,157,  7, 34, 79, 74,
+ 13,206,184,218,101,197, 30, 92,150,155,182, 44,244, 11,235,210, 26, 20,122, 37,185,247, 80,186,127,237, 19, 93, 75, 40,250,194,
+ 57,104,194,225,  8, 30,210, 82,144,114,172, 14,217,103, 23, 94,211,247, 69, 25,102, 38,176,205,255,  0, 26,182,176,245,173,213,
+ 10,132, 73,170, 64,228, 58, 16,170, 16,161,226, 42, 52, 44, 12,171, 40,178, 54,192,177,140,156, 21, 61,174, 89,116,236,155, 30,
+ 57,234, 98, 58,251,135,217,166,153,143,220,247, 91, 76,252,183,  5,101,127,196, 51, 33,230,194,220,151,110, 74,183,121,133,169,
+ 85, 41, 77, 84,130,105, 74, 17,175, 89,233,221, 70,174,175, 31, 50,173, 44,254,104,115,241,143,104, 62,240,177,115,112, 76, 73,
+ 49,212, 42,138,245,142,173,155,200,143,112,109, 77, 73, 67,190, 75,205,188,146,133,165, 12,142, 42,  5, 42,161,  4,157,180, 98,
+ 72, 37,249, 44,195, 21,145,108, 75,187,178,136,233, 79,198,165,158, 13,141,201,252, 64,160,  0, 30,225,169,137,178,134,213,111,
+118,235,210,254, 87,120,199,227,187,156,200,141,137, 91,238, 82, 18,213,161,204,133, 95, 46,237,194, 75,160, 33,150, 99,176,170,
+ 56, 66,214, 82, 57, 16,  0,  6,187,244, 51, 24,123, 27,204,144,175,118,145,220, 88,146,120,  0, 21,218,240,231,102,188, 21,123,
+148, 97,119, 28, 70,249,113,196,174, 76, 42, 45,194, 51,203,101,198, 28, 20, 83,101,  3,146,171,170,211, 50,129,219, 45,  8,226,
+170, 24,237,112,156,174,125,209,194,115,  6,172,249,  7,121,112, 27, 62, 97,157,218, 81, 30, 20, 27,253,197,115, 25,125,212, 51,
+ 79, 40, 79,110, 51,137,110, 87,  0,  0,252, 80,106, 58,248,213,239,158, 61,228, 78,234, 99, 57,199,129, 46, 29,187, 91, 73,123,
+ 85,216,103, 74, 33,184,170,247, 44,190,101,253,216,238,196,236,227, 53,116, 59,112,243, 26,102, 35, 45, 32, 55, 30, 44, 72,167,
+203,101,134, 26, 79,194,134,210, 54,  0,123,201,169, 36,232,246,102,202,211,175,246,120,  5, 78,217, 27,  9, 37, 58,246,251, 37,
+137,219,107,141,233,188,146,218,155,190,  9,149, 91,213,106,191,218,212,226,216, 91,145,158,162,137,101,212, 84,161,196,168, 85,
+ 38,135,250, 64,225,124, 12,103,  9,141,208,144,218, 71,113,236,239, 82,197,176,211, 39,237, 76, 23, 75, 35, 30,148, 59,117,101,
+202,187, 11,113,184,221,109, 25,231,203,193,111,182,249,189,181,139,139, 51, 35, 25, 62, 90, 31,121,152,142,  0,162,162,160,134,
+202, 27, 74,150,157,235, 65, 77,115, 89, 66, 93,  2,202,206, 45,178,151,157,255,  0, 74, 81,  5,199,110,135,183, 64,192, 19,174,
+186, 46,138,178, 45,131,145,167,122,253,206,114,110,213, 97,150,245, 61,220,254,212, 95,241,150,158, 82, 24,243, 44,151,  1,242,
+ 47, 73, 74, 11,190, 83,127,204, 24, 95,150,173,191,118, 86, 72, 30,237,105,203,212, 17,174,189,249, 24,179,175, 94, 71, 71,246,
+141, 60, 21, 27,176,107,  7,159,177, 84,153,239,119,  6, 13,124,137,157,224,254,153,111,183,139, 92,134,163, 93, 63,206, 61,192,
+151, 62,117,158, 36,103,210,151, 16,251,208,109,145,153,101,109, 20,169, 52, 91,142,240,223,223,173,  9,117,131, 85,  6,202,241,
+164,204,239, 39, 33,143, 61,  7, 15,106, 81,193,132, 75,179,248,171,143,255,  0, 23,114,222,244,118,  1,120,215,168,124, 91, 45,
+147,  1,233,236, 94,172,143,118,246,195,  8,192,102, 28,104,174, 70, 12,176,137, 15, 50,128,216, 82,213,191,196,118,221, 90, 31,
+ 77,235, 55,228, 82,101,147, 93,146, 18,144, 49,217, 16,192, 51,104,228,126,126, 40,215,208, 44,142,222,  1, 87,152, 53,223,209,
+188, 78,218, 30,235, 70,129,220, 97,130, 77,121, 86,152,151, 73,214,203, 11, 77, 72,144, 13, 86,134, 92, 68,165,160,168,111, 93,
+235,238,212, 50,186,238, 20, 43, 22, 24, 93,180,150,  5,162,207,216,238,168,255,  0,167,192,115, 42,187,245,243,150, 98,189,213,
+238, 94,  5,130,225, 86,187,188,  8,214,156,122, 13,169,181,228,109,176,137, 15, 67,121,229,205,142,248, 17,137, 73, 74,153,127,
+ 99, 65, 81, 74,107,146,245, 63, 82,175, 34,117,217, 24,202, 34, 48,  3,226,103, 35, 82, 14,157,174,173,215, 16, 36, 34, 57, 43,
+147, 41,238, 71,103,123, 81,233,203,  0,237,151,123,241,252,149, 98,251,115,155, 46,196,230, 62,168, 49,155,148, 22, 90, 73, 87,
+ 57,200, 88, 82, 80,144,138,241, 21, 21,214,151, 67,235, 53,225,224, 68,100, 85, 99, 19, 41,  2, 24,  9, 63, 99,241,109, 20,178,
+ 40,141,164,  2,234,196,179,229,221,144,237, 87,119, 44, 97,252, 79, 51,141,150,197,106, 28,251, 60,105, 42,128,164,203, 66,214,
+ 91,103,131, 33,148,184,231, 53, 36,167,225, 59,208,211, 90, 24,189,123, 31, 30,216, 19,143,116,102,117,136, 44,228, 30,  4,  6,
+125, 80, 99,135,  8, 72, 23, 46,168, 94,233,225, 93,218,155,221,140,147, 38,187,227,247, 24, 86, 91,156,217,113,237,142,202, 97,
+ 97,181, 45, 64, 54,196,114,180,213,  1,195,203,238, 86,189,118,215, 15,212,122,101,212,188,205,114,136,145, 44,227,180,232, 60,
+123,149,169, 72,186,174, 61, 67, 88, 47, 88,110, 99,142,246,106,219, 17,233, 25,219,129,184,174,219,217,109,106,144,185,171,123,
+202,242, 82,218,106,162,178,231,194,  5, 42, 78,218,204,167,  6,195, 61,134, 39,123,179, 54,175,193,155,181,210,178, 92,149, 70,
+206, 33,221,139,149,206,  5,154, 38, 63,112,122,247,127,145, 46, 45,154, 35,113,157, 83,147,164, 69,144, 98,190,220,116,129, 85,
+169,183, 18, 80,160,154,208,138,106,216,233,118,153, 70, 34,  5,228, 88,105,197,142,173,224,141,  9,115, 87, 46,125,218, 62,233,
+246,187,176,120,237,131, 48,178, 76,182,202,190,206,252,101, 75, 97,198,146, 28,  8, 83,200,105, 69, 67,169,  9, 38,158,227,167,
+203,233,119, 99, 71,125,144, 49, 14,218,134, 81,222,101, 37, 17,181,219,134, 86,246, 44,120,124,170,153,103, 31, 74,168, 63,120,
+152, 14, 56, 77,127,222,145,245,234,183,144,118, 38,222, 29,144,119,237,194, 74,118, 81, 11,246,131,175,104, 93,184,154,242,171,
+  2,221, 70,219, 47,192,141, 50,150,228, 58,126, 46,234,106,162, 13, 79,136,223,244,105,  2,136, 36,151,101, 67,151,107,122,173,
+212, 34,187, 17,210,186,152, 46, 19,241, 83,162,229, 87,  8, 77,142,100,173,161,224,116,194, 46,162, 92, 41, 78,100, 40,156,223,
+ 42,213, 52,222,186, 99, 90, 91,202,215, 18,245,  5,151,210,220,147,197,179,183, 47,119,191, 76,202, 92, 81, 39, 67,139,111,153,
+ 79,152,201,217, 15,160,236, 71,176,234, 32,169,131,162,253,137, 97,149, 33, 37,200,166,160,117, 73, 21,167,209,169,104, 82, 50,
+101,189,140, 80,188,146,135,211,191,178,158, 61,116,152,133,  9, 73,  4,205, 59,107,104,200,237, 50,108, 23,200,232,147,106,150,
+218,227,200,142,250, 66,144,235,110, 14, 42, 73,  7, 98,  8,212,171,176,192,130, 11, 16,152,180,131, 16,238,190,123,122,164,244,
+ 65,145,118, 58,254,238,115,134, 54,236,238,215,135, 22,226,184,114, 91,214,182,202, 69, 18,239, 42,169, 73, 43, 39,138,254,128,
+173,247, 61,191, 74,234,241,191,225,158,146, 11,153,205,233,230,162,227, 80, 82, 44, 28,109,230,111,167,204, 30,100,197, 60,182,
+ 22,146,  1, 42,112,172,  2,  7,208, 63,167, 91, 52,220,241,220,121, 15,201,214, 90,182, 98,224, 69,171,172,  8, 60, 63, 22, 19,
+  2, 84,133,215,143, 34,180,170, 67,149, 35,160,226, 82,145,239,214, 84,111, 22,213, 57, 30,114, 97,238, 13,247,171,120,249, 50,
+168,146, 20,252, 43, 15,184, 74,238, 61,157,203,184,242,155,113, 18, 36,173,197,116,243, 29, 82, 22,163, 83,224,  0, 31,110,170,
+103, 78, 32,  8, 71,128,251,126, 43,123,165,229, 19,190, 82, 61,138,199,238,  5,162, 78, 65, 50, 46,123,143,149,201,114,197, 45,
+183,161, 45,177,187,204,150,190, 69,116,173, 62, 26, 41, 78,  1,253,145,170, 55,197,154,174,100, 63,231,248, 32,195,169,255,  0,
+243, 36,190,135, 69,105, 64,184, 42,254,219, 25,  5,  0, 83,134, 59, 93,  8,169,225,192, 84,125, 35,125, 89,193,183, 67, 30,196,
+186,165,131,205, 12, 92, 48,252,211,166,  5,122, 22,185,108,196,116,  1,229, 45, 14, 16,119,248, 81, 82,173, 15, 34,231,169,207,
+247,128,251,213, 26,239,  1, 59,224,217, 48,151, 53, 41,112,252, 49,202,223, 65,254,207, 58, 83,255,  0, 75, 64,141,158,100,200,
+ 31,109,  2, 61,119, 57, 82,163,100,205,222,239,  7,122,169,132,176,132,146,127,238,212,131,253, 26,208,136,208,248,149, 33,107,
+150,  9,174,229,109,102, 88,121,196, 36,114, 90,  2,200,  3,193, 14,164, 15,209, 93, 74, 58,125,187,145, 12,147,197,166,199, 22,
+ 67,209, 95,160,163,209, 90, 89,167,137, 28, 91,255,  0,237,211, 89,150,205,180, 86,171, 33,208,174,224,225,240, 98,218,231, 76,
+112, 37, 13,180,147, 33,107, 35,238,148,164, 45, 74, 35,232, 70,250, 97,113, 10,237, 53,111,148, 71,105,  3,193,215, 53,250,248,
+133, 11,183, 29,151,176,118,246,203, 41,  8,147,118,136, 39,201,101,154,126, 27,142,213,231, 20, 79,183,226,166,168,244,162,114,
+ 45, 50, 61,171,185,235, 25,112,198,197, 17, 26, 16, 24,123,191,138,231, 30,204,224,152,181,175,178, 17, 50,187,100,132, 12,134,
+228,183, 94,122, 19,124,191,  9, 74, 93, 71,188, 10,158,135, 90, 91,165, 43, 54,142, 14,178,165, 40, 66,141,117, 97,199,189,103,
+165,108,190, 46, 81,122,190,205,186,127, 29,  9, 19, 37, 67,130,107,208, 50,233, 96, 43,225,  0, 80,241, 36,123,181,122,234,200,
+248, 98,126,220, 15,222,176, 33, 51, 40,  9,157, 57,251, 56,254,  9, 39,212,173,178, 22,109,220, 55,166, 93, 10,157,140,182,211,
+ 14, 25, 85, 15,203,180,209, 82,104,138,  1, 74,174,171,250, 78,186,140,106,  5,113,140, 87, 17,153,144,109,153, 37, 11,236,156,
+104, 48,224,127, 40,183, 48,150,174, 12, 59,243, 28,105, 79,152,101,230,194, 92,105, 68,239, 81,186,146,117, 97,153, 85,220,156,
+111,184,211, 17,100,198,146,167, 75,237, 44, 61,228,135, 77, 74, 18,227,117,166,255,  0, 78,173,227, 20,225, 88,125,190,183, 76,
+133, 99,110,231, 36,121,140, 36, 54,226,144,107,186, 67,128,154,125,  0,242,213,192, 84,192, 87, 54, 78,239,200,225, 78,202,121,
+206, 80, 86,166,159,  1, 67,144, 82,147, 85,  0, 65,232, 78,250,243,239,169, 54,109,233,197,187, 71,135, 17,246,252, 20,207,  4,
+ 95,182, 78,197,197, 59, 85, 39, 40,113,138, 38,242,161,104,168, 53, 80, 74,221, 73, 90,171,239, 72, 35, 95, 56,216, 33, 41,  0,
+ 31,241,254, 31,154,175, 49,162,169, 33,226, 82,109,221,216,186,228,179,147,184, 76,146,148,143,217, 21,  9, 66, 71,251,  0,106,
+221,179, 30, 78,208,159,106,103, 84, 32,188,230, 74, 89,168,113,200,105, 97, 43,254,207,203,255,  0,166,186,160,126, 24,199,197,
+ 76,151, 40,125,230,220, 99,225,144,166, 69,175,157,111, 75,173, 60, 61,161,211, 84, 29,  8,106,117,237, 83,228, 17, 75, 52,145,
+100,236,131, 47, 40, 81,215, 88,230,239,189,110, 58,105,250, 52,214,197,236, 80, 26,165,155,141,217,214,166, 61, 17,173,156, 87,
+148,194, 66,125,165,  3,167,219,166,216,227,218,166, 14,169,195, 29,186, 11,119,121,255,  0,154,190, 57,199,178, 91,121,111,208,
+ 41, 17,194, 18, 55,250,244,171,131,192,248,168,147,162,116,180,180,252, 92, 74,232, 57,149, 61,120,149, 29, 32,251, 90, 43,230,
+126,173,255,  0, 70,170, 26,158,207,  4,224,234,191, 18,134, 46,153,105, 10, 28,163, 33,131, 57,110, 30,135,137, 75, 72, 31, 69,
+106,116, 48,  8,  4,247,169, 62,170, 86,101, 53,148,219,211, 53, 63,191,158,250,184, 83,254,238, 49,162, 64,250,193, 58,175, 50,
+ 76,219,177, 72, 29, 82,155,249,107,108,206,186, 74, 38,174, 63,229,181, 95,238, 80,  1,250,245,118,170,255,  0,166,202, 66, 77,
+ 34,172, 44, 62,255,  0,121,199, 96, 14,226, 88,229,187,  7, 36,109, 41, 69,182,108, 85,169,167,155,124,169, 12,165,109,173,  4,
+ 40, 30,187,131,225,170,149, 91, 58,109, 18,129, 32,141, 65, 26, 50, 14,231, 79,119,255,  0,204, 87,188, 81,157,143,108,238, 29,
+171, 29,206, 36,243, 76, 86, 31,202,172,237,187, 45, 13,133,113, 32, 72,130,184,206,255,  0,214, 39,223, 93,118,244,250,215, 50,
+ 49,254,160,133,140, 63,154, 58,251,195, 38, 52, 66,124, 66, 59, 99,245,245,220, 72, 25, 43,144,112, 92, 99, 22,197,229,197, 73,
+ 42,159,100,179,  3, 48, 45,105, 34,137,122,224,236,130,158,187,208, 13, 66, 94,184,204, 58, 66, 21,214,123, 99, 29,127,248,137,
+ 79, 28,106,227,168,  9, 62,235,220, 60,203, 48,238, 12, 59,167,112,110,178,110,217, 28,184,160,187, 42,115,203,113,202,165,238,
+105,167, 35,240,129, 93,128,160, 30, 26,228,250,150, 93,185,100,206,201, 25, 72,158, 36,235,197, 79,118,138,211, 71,171,220, 23,
+ 45,125,155, 63,169, 59, 19,183, 43,140,104,237,252,190, 91, 96,113,182, 47,  1,144,133, 33, 40,146,219,255,  0,129, 39, 97, 64,
+165, 20,170,158, 39,174,187, 44, 63, 88,143, 42, 49,204,129,155,  6,223, 29, 39,237,125, 37,227,162,167,126, 52, 45,212,232, 84,
+244,221,253, 29,205,197,154,186, 53,155,222, 19,108,101,228, 40,199, 93,128, 42, 77, 93,  7,138, 10,147, 39,203,174,253,107, 77,
+106,207,212, 61, 47,105, 38,201,248,108,215,241,101, 76,116,237,126,111,185,109,183,122,149,236,207,109,164,124,199,105, 48,133,
+ 94,109,178,147,242,151,107,190, 96,240,249,201, 49,100,  5, 52,236,120,204,195, 62, 84,110, 84,251,245, 90,168,119,214,108,189,
+119, 77, 82,  3, 26,157,195,153,153,212,142, 96,  1,164,124,117,240, 87, 41,194,132, 65,230,164,103,125,237,244,197,139,227,241,
+115,140,115, 16,187,223,238, 43,242, 93,106,213,118,184,199,110,218,202,151, 84,130,234,163, 53,231, 58,134,213,213, 36,142, 93,
+  9,223, 86, 71,172,112,132,119, 66,153,153,118, 72,141,160,251, 53, 40,112,192,172, 30,107,127,101,187,213,117,238,198, 93,147,
+101, 89,165,201,136,221,194,149,111,184,218,177,137,107, 82, 33,198,131, 54, 76, 16,196,102, 99,169,100, 37,129,192, 45,166,205,
+118, 82,134,245, 53, 56,125, 35,170, 89,151,159,101,214,200, 11,103, 92,163,  2,116,  2, 76,192, 14,205, 28, 14,243,218,180, 36,
+ 88, 48, 75, 29,186,198, 51, 94,223,219, 59,137,127,239,173,178, 85,151,  3,185,217,227, 91,161, 91,239, 76,185, 29,115,239, 73,
+158,202,225, 63, 25,167,130, 84,224,142, 16,226,148,226, 65, 72, 73, 34,191, 22,150, 62, 53,152, 24,185, 49,200,137,132,108,131,
+  1, 45, 12,166,227,105,  0,241,109, 73, 35, 64, 60, 80,184,151, 66,187,171,154,246,227,181,253,237,177,247, 54,211,106,159,112,
+238,123, 88, 61,154,200,202,221,159, 29,171, 59,113,238,152,131, 80, 28, 83,241,209, 29, 78,188, 18,210,193,242,203,169,  5, 96,
+ 26,237, 77,109, 89,213, 42,197,157,100,  2,108, 52, 64,113, 27,117,172, 13, 67, 57, 96,120, 63, 20,199, 64,129,247,163,183,247,
+142,227,225, 61,184,190, 89, 59, 91,126,205,146,172, 61,134,219,190, 88,101,202,110, 43, 47,174,231, 62,140, 45,182, 34, 62,146,
+180,115, 11, 53, 88, 52, 80,219,199, 86,243,177, 13,148, 82,212, 78,207,233,128,224,150, 26,157, 56, 20, 32, 78,133, 24,237,229,
+255,  0, 24,179,122, 97,237,167, 98,115,151,144,199,111,114,185, 57,  4, 57,146,151,210,217,114, 98,100,119,109,247,  3, 77,192,
+105,213, 20,185,237,105,107, 29,105,172,234,115, 33, 60, 74, 40,176,255,  0, 78,221,238,127,186, 65,142,217,123,  9, 99,255,  0,
+116,148,199,130,135,234, 63,  9,149,109,245, 31,  2,215,122,109, 31,230, 11, 94, 53,137,218,100, 33,181,165,196,180,244,123, 35,
+ 13,190,148,173,  4,164,209, 66,149, 26,161,234,140,105, 66,216,214,120,198,186,193,241, 17,  1, 63,203,170,106,238,215,112,251,
+ 77,147,119, 43,183, 29,190,239, 20,196,177,131, 89, 49,123, 30,111,143,184,134,220,121, 78,220,160, 94,174,144,166,219, 19,228,
+133,112,249,232,156, 71, 37, 10,  5,180,138,144, 43,173,204,139,177,252,138, 40,188,180, 69,113,144,239, 34, 82,120,247,110, 31,
+120, 10, 80, 44, 55, 20,237,146,119,121, 57, 15,123,112,120,247,105,173, 70,238,134, 89,219,187,163,214,153,139, 90, 90, 67, 55,
+ 73, 23,  9,197,180,165,197, 16, 26, 43,109,110,180,217, 36, 81, 74, 72,219, 87,229,105,182,218,236,145,  2,201,227,144, 15,  6,
+148,140,189,220,192,246, 32,111,118, 61,161, 38,250, 97,237,167,112,123, 87, 51,185, 57,  7,119,109,178,172, 88,214, 64,149, 71,
+183, 91,239, 44,185, 21, 83,166,199,156,211,241, 23, 25,151,194, 84,231,149,197,107,243, 18,  8, 74,107,190,251,225, 67, 14,204,
+106, 46, 23, 68,198, 18,131,  0, 67, 60,156, 24,176, 60, 91, 82,227,128,241, 77, 81, 32,234,150, 61, 71,223,237, 24,230, 71, 47,
+243, 23, 68,248,238, 74,176,217, 29,198,161, 91,252,212, 25,  8,238, 24,254,  2, 50,203, 36,215,136,138,240,184,212,126,211,100,
+107, 86,168,196,196,103,147,241,109,102,255,  0,213,249, 93,188, 62, 63, 20,243, 58,238,251, 58,175, 61, 35, 79,122,249,152,250,
+ 67,140,218,188,197,124,230, 90,244,175,139,226,  9, 69,245,229, 18,175,101,125,250, 47, 78,128,223,135,220,101,255,  0, 49, 68,
+140,180,  9,231,190,184, 60,155,126,109,104,157, 43,183,247,124, 99, 22,199,219, 17, 88,188, 93,158,144,184,111,184,227, 74, 88,
+142,218, 94,142,210,121,209, 21,168, 89,216, 29,181,205,117, 78,158, 97, 16,124,153, 86, 31,137, 36,131,221,192, 33,212, 91, 86,
+101, 71, 57,150,219,127,206, 77, 99, 73, 82,127,157,243,118,250,183,106, 43,231,252,203,106, 66,107,215,238,114, 26,169,229, 33,
+239,230,139, 66,152,138,242, 89,  0, 10, 84,248,107,212,200, 93,200, 42,114,  3,211,169,199,100, 13,209,198,190, 58,  4,149,218,
+117, 82, 95,132,251,209,  2, 82,215, 57, 93, 58,208, 19,160,155, 24,178,180, 41,112,233, 54,251,109,114, 60,149, 57, 48, 81, 71,
+ 98,144, 52,104,149,  2, 16,112,195, 75, 81,161,167,133, 14,136,162,202,124, 12,108,186,158,109,238,131,236,246,233,196,148, 10,
+139,123,199, 28, 75,100,245,  3,167,184,233, 50, 97, 37,231, 27,189,220, 44, 14,152,210, 83,231, 91, 87,247,210,170,236, 61,218,
+129, 10,103, 80,157, 45, 55,  8,164,165,232,138,229, 25, 91,208,210,169,211,119, 32,144, 81,246, 28,140,235, 99,153,161, 61,  8,
+241,211, 58, 66, 74, 53,194,214, 31, 77, 87,186, 15,143,244,141, 50,146, 76,201,237,172, 60,181, 71,154,216, 83, 42,170, 22, 20,
+ 42,149, 37, 66,132, 43,218,  8,212,132,136, 69, 17,112,185,235,186, 30,137, 45,232,203, 99,102,216, 57, 13,227,234, 90,140,235,
+109,127,115,231, 18, 92,117,165,117, 35,226, 36,164,238, 54,166,219, 13,177,215, 13,120,179,131, 19, 38, 13,236,102,247, 46,123,
+ 59,167,236,121,195,135, 48,134, 90,113, 52, 93,103,170, 83,232,226,245,245,229, 62,210,127,238,109,173, 44,148,147,253,244,167,
+144,247, 13, 23,247,194,144, 53,248,106,137, 39,190, 71,226,251,150, 67,128,166, 91, 48,232,247,153,230,229,229,  2,134, 18,234,
+ 88, 36,159,251, 82,  5, 41,208,208, 15,209,173, 76,  2,  4,  6,225,171, 63,187,248,171, 21, 25,  1,161,103,226,172,  8,248, 99,
+ 22, 46,213,186,133, 14, 50,215, 41, 17,154, 20,241, 45, 17, 65,244, 21,157,114, 55,117, 97, 62,160,102,120,  8,159,185,207,224,
+170,202, 95, 18, 51,108,198,100, 47,229,173, 41,218, 71,226, 44,159,  2,164,188,161, 95,253, 16,117,119, 15,168,136, 87,101,146,
+ 58,150,  8,177, 58, 41,214,203,123,211,110, 87,187,187,  9, 41,143, 21,135,139,105, 30,222,  9, 74,126,211,172, 44,174,173,182,
+160, 15, 29,192,251,245, 85,165, 97,  0, 35, 16, 30, 85,142, 59, 98,164,201, 12,128,247,188,169,126, 97, 31,250, 35, 86,125, 59,
+157,230,239,127,230,151,220,223,246,171, 20, 89,197, 75,192,146,251,243,228,186, 62,231, 47,189,239, 90,130,104, 62,218,107,107,
+  3,168,249,166, 93,196,253,229, 18,137,147, 39, 86,197,142, 75, 75,150, 10,205, 91, 84,114, 21,244,  7, 58,253,180,214,173,147,
+ 15, 17,218,181,  4,157, 31,194,239,203,185,101, 12,217,153, 63,135, 26, 34,156, 81,254,175,199,230, 15,210,128, 62,189,100,100,
+216,249, 17,135,115,159,122, 44, 39,171, 41,189,205,201, 33,162,223, 34, 52,162,  3, 82, 89, 92,111,136,  2, 57,165, 69, 73,168,
+ 52,235, 90, 29, 89, 52,238,211,187,242, 90, 20,228,249, 82,140,135, 34, 15,185,124,249,245, 67,117,201,179,158,224, 46, 21,221,
+255,  0,152,110, 50,209, 25,143, 43,102,188,148, 10,113, 72, 36,248,143,175, 93,  7, 72,233,145,199,175, 77, 95, 85, 14,181,214,
+236,205,155,144,192,112,  8, 31,109,109, 87,  8, 88,231,249,106, 68, 32,211,172,189,205, 50,  5, 40,228,114,225,113,160,  0, 63,
+212, 32, 31,126,158,140, 34, 46,220,120, 42,121, 93, 75,250, 27, 65,212,176, 41,179, 14,237,102, 29,219,167, 20,172,110, 48,138,
+221,201,110, 57, 42,138, 89,  1,111, 41,117, 82, 66,137,  9,169,222,131,109, 95, 24,240, 18, 37,181, 89, 54,103, 90, 99,177,244,
+101, 85,103,246,144,205,241, 50, 37, 10, 56,211,129,192,149, 10,133,182,208,162,135,212, 77,117,163, 21,154,120,161, 24,109,173,
+171, 85,230,109,185,128, 62, 97, 77,249,241, 92, 35,122, 52,162,217,  3,237, 65,250,180, 80, 82, 77,115,237,239, 62,195, 83, 25,
+221,180, 36, 18,131,247,144,165, 43,137,175,214, 72,209,170, 44, 84,199,  5, 98,226, 83, 18,188,124,218,155,160, 90, 19,228,  1,
+253,223,132,159,180,164,106,224, 68,138,181,115,209,110,129,219, 23,227,135,146,169,110,121, 73,224,175,235,133,  5,  5,167,233,
+223, 94,109,245, 19,168, 85,251, 59, 41, 60,116, 35,216, 71,240, 83,145,209, 74,178,220, 98, 92,240,124,127, 16, 97, 92,154, 97,
+212, 63, 41, 35,250,196,128, 63, 70,250,249,230, 33,135, 30,104, 27,117, 74, 87,171,236, 73, 89,195,246,242,105, 34,232,250,226,
+164,142,136,224,107,255,  0,217,166,136, 67,251,147,148, 93,108, 54,229,241,213, 32,113,146,211, 97,147, 94,164,150,233,170,246,
+ 23,144,  9,130,139, 30,  1,184, 98,242,216, 77, 21,248,204, 23,  1,240,105,182,247, 52,250,116,237,167,181, 78, 42, 37,228,  9,
+ 93,177,151,107,104, 85,184,171,101,164,211,192, 33, 64,254,163,166,254,103, 67,175,129, 65, 27,181,  9,121,172, 55, 80,159,225,
+106,183,214, 79, 79,133, 73, 74,  1,250,107,167, 18,104,165, 41, 50, 37, 25,224,229,147, 40,200, 73,254, 34, 91,141,219,219, 62,
+ 52, 83,129, 10,253,  3, 77, 19,183, 69, 18,116, 78, 39, 34,249, 92,  9,187,179,198,137, 74,208,195,  3,218, 91,  4, 40,254,157,
+  6,248, 17,170,157,106,124,123,138, 45, 56, 11, 87,103,  5, 37, 77,110, 52, 80,127,177,230,149,210,191, 86,130, 96,229,148,164,
+ 89, 12,187,228,173, 92, 31,135,109,108,242, 22,232,143,200, 80, 31,215,120,154, 87,237,208,124,159,136,158,213,  8, 77,210, 37,
+250,224,184,239, 71,180, 71,  5, 82,214,150,157,116,255,  0, 93,215,135, 36,164,123,128, 63,110,174,215, 95,195,237, 82,148,149,
+181,118,158,187, 42,108,216, 74, 13, 95,138,207,205, 72,166,244, 91, 77, 21,212,253, 10, 93,126,173,103,194,189,198, 94, 41,171,
+208, 58, 68,190,201,242,115,116,207,148, 43, 18,  3, 63, 54, 66,142,197,213,167,154,107,245,144,117,116, 67,225,251,148,129, 71,
+ 59,117,127, 14, 94,219,145, 48,254, 59,229, 78, 57, 83,189,120,147,168, 66, 12,233,229, 38,  9,141,236,149, 82, 59,132,101, 50,
+121, 34, 43, 65,148,251,191,103, 85,132, 30, 35,237,205, 14,103,225, 65,251,161,147,124,190, 83, 61,166,206,205, 49, 21, 27, 31,
+ 20,182, 65,253, 90,149,149,188, 83, 68,175,219, 22,102,127,200,  2, 50, 85, 95, 48,165,100,215,254,233, 98,159,163, 84,242,170,
+213,187, 83,199, 84,223,100,204,218,103,  5, 14,184,170,149,184,210,145,239, 90, 93,228,127, 64,212,171,161,167,236, 82,220,193,
+ 21,133,144, 68,145,142, 92,237,106, 93, 88, 20,126, 56, 62,  9,115,226,167,212,161,171,130,157,164,160, 11, 18,246, 47,157, 52,
+225,184,218, 95, 85, 25,144,242, 82, 69,118,175, 47, 15,183, 74, 52,252, 33, 72,216,160,156,133,236,117, 23,187, 11,198,143,173,
+176, 15,210,149,115,  7,235,  7, 80,157, 27,136, 61,137,161, 98, 25, 31, 39, 67,215,134,227,180,  0, 92,198,130,222,  3,197, 92,
+ 10, 15,234,174,141,  8,109,114,144,155,169, 24, 54, 55, 18,213,219, 58,206, 79, 59,164, 25,111, 58,223, 61,213,229,201, 87,196,
+  5,125,155, 29, 66,235,141,135,142,173,249, 35,237,100, 53,203,132,133,134,154, 88,229, 56,185, 68, 32,117, 42, 41, 52, 26,161,
+135, 47, 54,226,  7,  0, 20,140, 88, 38, 60, 58,244,214,  9,136,220, 47, 82,156,224,243, 44, 21, 45,207,234,184,180,147,246,131,
+174,174, 21,105,185, 85,180, 59,  5, 83,118,123, 34, 85,247,186, 43,186, 58,121, 71,141,230, 72,117,100,215,112,159,135, 79, 94,
+ 62,226,231,216,154,226,225,130,126,236,133,222, 70,117,222, 11,166, 95, 33, 85,136,218, 85,  9,133, 87,225,  8, 65, 53,  3,235,
+214,141,181,129, 31,  5, 86,216,237,128, 87, 71,110,111, 49,155,185, 93, 46,140,209, 48, 97, 33,108,182,125,171,112,213, 71,236,
+ 26,198,166, 62,100,143,138, 91,118,133,195,221,230,201, 81,149,247, 51, 42,204, 37, 30, 86, 91,123,142,147,253, 87, 29, 72,  8,
+ 66, 62,211,173, 12,129,182, 81,132,120,149, 98,170,159, 84,251,232,222,198,156, 66,207,115,238,253,249, 52,118, 59, 11, 44,115,
+240, 90,128, 32, 10,232,205,203,177, 14,228,235,137,228, 46,197,197, 39,101, 23, 21, 86,235,120,144, 86, 10,137,173, 20,162,175,
+111,213,160,249, 90,185, 80,169,202,169,219,203, 95, 61,203,123, 36,243, 63, 21, 50,217,100, 10,254,202,155,115,225,253, 26, 35,
+243,228,137,228,150,101,120, 70,253,194,186,244,253,175,167,199, 94,147,201,119, 60,211, 62, 43,247, 81,215,253,190,159, 94,171,
+216,175, 87,197, 54,197,234, 63,119,227,247, 58,244,214,124,214,165, 92, 18,119,113, 63,237, 63,117,227,244,253, 90, 45,  8, 54,
+241,228,171, 89,127,188,253,175,246, 58,234,236, 85,116,197,139,125,193,251,222,158, 63,211,169, 32,216,166, 93, 58, 31,233,254,
+157, 50,  9,226,128, 72,253,249,251,158, 29,122,105, 73, 88, 10,110, 59,254, 35,246,252, 62,231,221,208,212, 36,154, 89,255,  0,
+ 10, 62,255,  0, 95,233,240,211,132, 50,140,199,255,  0, 12,122,248,125,254,186,100,229, 46,228,255,  0,124,253,223,246,180,145,
+160,180, 91, 63,225,223,111,222,233,167, 40, 86,240, 42,139,200,191,243, 50,239,251,191,248,112,255,  0, 13,251,175,240,135,252,
+ 63,246,127,215,161,102,127,237,127,241,143, 14, 92,123,151, 27,145,243, 31, 30, 92, 22, 97, 63,225,218,251,189,126,175,221, 47,
+254,131, 93,108,248, 89,224,127, 17,195,185, 88,237, 79, 89,183,252,191, 96,233,255,  0, 20, 79,251,191, 15,191,239,246,107,204,
+ 97,254,124,188, 15,224, 85, 14,104,196, 79,248,243,125, 62,243,189, 58,253,213,244,254,157,106,127,244,231,143, 17,249,162,242,
+ 82,112, 47,248,117,247,238,254,237,191,189,254,240,127,208,235,  7,170,255,  0,150,127,255,  0, 65,248, 21, 78,238,  8,124,239,
+241,206,127,117, 95,127,167, 81,211,250, 53,169,233,127,150, 72,180,240, 70,176, 95,248,113,255,  0,120,143,185,215,247,254, 62,
+255,  0,245,107, 71,162,124,151,127,196, 63, 53,115, 31,243, 79,182,239,241, 67,239,127,133, 95,221,251,191,188, 58,235,191,234,
+215,224, 22,144,226,138,118,183,254,120,185,253,255,  0,240,200,251,159,123,239,163,166,178,191,250,249,248,126,124,146,167,231,
+ 42, 63,126,255,  0,225,223,183,254, 44,126,239,232, 71, 79,118,186, 44,110, 42,205,139,142,115,207,249,194, 23,238,255,  0,111,
+239,245,251,171,251,254,255,  0,245,235,165,198,249, 22,101,223, 50, 43,143,126,241,207,220,255,  0,135,107,175,247, 19,211,223,
+168,215,197, 14,212, 67, 38,255,  0,  3, 27,239,126,241, 31,119,233,209,163,197, 83, 85, 87,115,255,  0,196, 35,238,125,233, 63,
+127,239,116, 61,125,222,223,126,172,197, 13, 40, 99, 63,243, 20, 95,247,111,125,254,191,117, 29,125,222,221, 18, 41,147,107,253,
+ 36,253,239,221,253, 95,124,104,213,169,197, 58, 96,255,  0,191,253,158,175,253,255,  0,247,205,255,  0,208,106,224,224,137, 20,
+225,220,255,  0,248,122,191,123,209,158,191,119,199,166,190,114,245,215,254,250,127, 55,183,135, 20, 67,242,163,189,175,255,  0,
+139, 55,215,238, 39,239,244,251,154,243,168,254,106,  3,130, 66,127,255,  0, 52,227,253,255,  0,241,238,253,238,189, 23,247,125,
+254,221, 90, 28, 20, 39,193, 89, 10,255,  0,156, 93,233,213, 29, 63,221,248,234,164,190, 98,163,205, 66,237,247,248,107,167,254,
+232,191,191,247,122,126,189, 18,206, 72,144,224,160, 64,255,  0,147,111,255,  0,239, 83,247,186,125, 90,132,184,133, 24,240, 43,
+ 93,155,247, 35,238,254,241,158,159,188,253,218,122,127,103,219,239,212,121,168, 77, 71, 63,249,126,255,  0, 79,241,235,251,157,
+ 63,124,175,189,239,246,105,127,214, 30, 31,146,105,112, 68, 50, 79,249, 15, 31,251,255,  0,188,127,238,254,235,160,251,222,253,
+ 62,127,201, 47,103,228,137, 74, 97,238,  7,254, 90, 99,189,127,120,207,238,190,239,220,241,208, 97,196,166,179,229, 74,152,199,
+252,126,243,247,191,118,143,222,245,251,135,167,187,217,169, 79,128, 85,234,228,160,202,255,  0,205,187, 55,220,253,252, 31,222,
+126,239,247, 77,245,254,141, 22, 31, 34, 45,138,197,191,255,  0,230,237,235,175,248, 73, 31,189,250,254,231,187,219,238,213, 28,
+110, 30,210,159,249,125,137, 75, 63,255,  0,141, 93,255,  0,223,163,251,189, 19,215,251, 58,178, 56, 39,151, 37, 23,  6,255,  0,
+153,191,237, 63,107,175, 78,159,179,167, 60, 19, 91,193, 50,226,127,243, 60,207,189,213,191,222,117,251,250,174, 62, 80,163, 63,
+145,  4,238,159,252,199,119,251,221, 83,215,175,221, 58,126, 67,197, 60,120,251, 22,188,123,254, 84, 79,222,253,202,190,142,186,
+  6, 71,249,138,112, 76,145,127,228,139,111,239, 63,120,231,221,233,211,199,223,162,199,230, 81, 60,209,107,103,248,  4,126,243,
+247, 13,125,223,247,170,251,222,237, 89,146,170,149,109, 63,241, 89, 95,189,253,248,251,159,222, 29, 52,255,  0,202,151, 52,193,
+221,143,249,166, 71, 79,240,140,125,207,189,251,179,247,253,255,  0,234,208,199,202,158, 60, 82,238, 29,255,  0, 59, 90,186,253,
+199, 63,121,247,116,231,129, 78, 57, 39,145,210, 71,222,253,159,185,251,174,169,235,239,213,  8,113, 42,244,190, 80,150, 45,127,
+243,181,179,167,248,159,219,251,159,113,127,167, 85,186, 87,249,146, 72,242, 67,251,181,255,  0,147,215, 31,223,127,139, 63,185,
+235,225,247,255,  0,179,174,198,191,144,120, 32,219,199,218,144, 61, 63,127,130,190,125,239,184,191,187,251,207,187,171,180,124,
+195,130,  1,252,213,157,233,111,254, 85,153,244,189,251,159,222,253,243,215,223,237,213,110,167,254, 76,184,251, 20,167,243,127,
+ 21,103, 98, 31,249,125,115,251,255,  0,125,223,185,247,254,224,251,222,253,102,116,127,179,168,228,241, 92, 91,148,127,229,157,
+219,238,255,  0,198, 87,211,239,254,248,126,255,  0,221,171,215,127,239,191,240,243,241, 86,  7,200,174,187,127,255,  0,243,119,
+143,239, 19,254, 19,238,127,235, 61,218,179,143,198,106,174, 71,  0,188, 79,255,  0,148,237,223,188,251,136,253,223,221,251,222,
+ 30,255,  0,110,167,103,228,165,140,170,132,127,139,115,255,  0,122,111,251,223,113,127,167, 64, 63, 40,251,118, 43, 43,255,217,
 };
-

From 1cf33787932aabc9e2d812f4cf50655059dcbff2 Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Wed, 30 Apr 2008 15:41:54 +0000
Subject: [PATCH 002/252] Added Freestyle to extern/ directory

---
 extern/freestyle/AUTHORS.TXT                  |      6 +
 extern/freestyle/BUGS.TXT                     |     11 +
 extern/freestyle/COPYRIGHT.TXT                |      9 +
 extern/freestyle/INSTALL.TXT                  |     79 +
 extern/freestyle/LICENSE.TXT                  |    340 +
 extern/freestyle/README.TXT                   |     51 +
 extern/freestyle/THANKS.TXT                   |      6 +
 extern/freestyle/TODO.TXT                     |      9 +
 extern/freestyle/src/Config.pri               |    176 +
 extern/freestyle/src/Freestyle-vc7-debug.sln  |    113 +
 .../freestyle/src/Freestyle-vc7-release.sln   |    111 +
 extern/freestyle/src/Freestyle-vc8-debug.sln  |     87 +
 .../freestyle/src/Freestyle-vc8-release.sln   |     87 +
 extern/freestyle/src/Makefile.pro             |     18 +
 extern/freestyle/src/app/AppAboutWindow.cpp   |     36 +
 extern/freestyle/src/app/AppAboutWindow.h     |     40 +
 extern/freestyle/src/app/AppCanvas.cpp        |    404 +
 extern/freestyle/src/app/AppCanvas.h          |     84 +
 extern/freestyle/src/app/AppConfig.cpp        |    120 +
 extern/freestyle/src/app/AppConfig.h          |    125 +
 .../src/app/AppDensityCurvesWindow.cpp        |     65 +
 .../src/app/AppDensityCurvesWindow.h          |     85 +
 .../freestyle/src/app/AppGL2DCurvesViewer.cpp |    152 +
 .../freestyle/src/app/AppGL2DCurvesViewer.h   |     80 +
 extern/freestyle/src/app/AppGLWidget.cpp      |   1049 +
 extern/freestyle/src/app/AppGLWidget.h        |    526 +
 .../src/app/AppInteractiveShaderWindow.cpp    |    119 +
 .../src/app/AppInteractiveShaderWindow.h      |     73 +
 extern/freestyle/src/app/AppMainWindow.cpp    |    288 +
 extern/freestyle/src/app/AppMainWindow.h      |     83 +
 extern/freestyle/src/app/AppOptionsWindow.cpp |    410 +
 extern/freestyle/src/app/AppOptionsWindow.h   |     74 +
 extern/freestyle/src/app/AppProgressBar.cpp   |     78 +
 extern/freestyle/src/app/AppProgressBar.h     |     55 +
 extern/freestyle/src/app/AppStyleWindow.cpp   |    366 +
 extern/freestyle/src/app/AppStyleWindow.h     |     93 +
 extern/freestyle/src/app/ConfigIO.cpp         |    116 +
 extern/freestyle/src/app/ConfigIO.h           |    181 +
 extern/freestyle/src/app/Controller.cpp       |   1498 +
 extern/freestyle/src/app/Controller.h         |    232 +
 extern/freestyle/src/app/Main.cpp             |     57 +
 extern/freestyle/src/app/QGLBasicWidget.cpp   |    141 +
 extern/freestyle/src/app/QGLBasicWidget.h     |    102 +
 .../src/app/QStyleModuleSyntaxHighlighter.cpp |    155 +
 .../src/app/QStyleModuleSyntaxHighlighter.h   |     57 +
 extern/freestyle/src/app/app.pro              |    179 +
 .../freestyle/src/app/appmainwindowbase4.ui   |    237 +
 .../freestyle/src/app/densitycurveswindow4.ui |    442 +
 extern/freestyle/src/app/freestyle.qrc        |     23 +
 extern/freestyle/src/app/icons/add.png        |    Bin 0 -> 400 bytes
 extern/freestyle/src/app/icons/arrow_down.png |    Bin 0 -> 813 bytes
 extern/freestyle/src/app/icons/arrow_left.png |    Bin 0 -> 776 bytes
 .../freestyle/src/app/icons/arrow_right.png   |    Bin 0 -> 773 bytes
 extern/freestyle/src/app/icons/arrow_up.png   |    Bin 0 -> 782 bytes
 extern/freestyle/src/app/icons/clear.png      |    Bin 0 -> 1057 bytes
 extern/freestyle/src/app/icons/close.png      |    Bin 0 -> 1437 bytes
 extern/freestyle/src/app/icons/edit.png       |    Bin 0 -> 896 bytes
 extern/freestyle/src/app/icons/eye0.png       |    Bin 0 -> 406 bytes
 extern/freestyle/src/app/icons/eye1.png       |    Bin 0 -> 402 bytes
 extern/freestyle/src/app/icons/folder.png     |    Bin 0 -> 1015 bytes
 extern/freestyle/src/app/icons/home.png       |    Bin 0 -> 1050 bytes
 extern/freestyle/src/app/icons/mod0.png       |    Bin 0 -> 910 bytes
 extern/freestyle/src/app/icons/mod1.png       |    Bin 0 -> 1051 bytes
 extern/freestyle/src/app/icons/ok.png         |    Bin 0 -> 769 bytes
 extern/freestyle/src/app/icons/reload.png     |    Bin 0 -> 1113 bytes
 extern/freestyle/src/app/icons/remove.png     |    Bin 0 -> 375 bytes
 extern/freestyle/src/app/icons/save.png       |    Bin 0 -> 1329 bytes
 extern/freestyle/src/app/icons/save_as.png    |    Bin 0 -> 1024 bytes
 .../src/app/interactiveshaderwindow4.ui       |    103 +
 extern/freestyle/src/app/optionswindow4.ui    |    651 +
 extern/freestyle/src/app/progressdialog4.ui   |     26 +
 extern/freestyle/src/app/src.pri              |     50 +
 extern/freestyle/src/app/stylewindow4.ui      |    182 +
 extern/freestyle/src/build_bundle.macosx.py   |    183 +
 extern/freestyle/src/geometry/BBox.h          |    141 +
 extern/freestyle/src/geometry/Bezier.cpp      |    118 +
 extern/freestyle/src/geometry/Bezier.h        |     73 +
 extern/freestyle/src/geometry/FastGrid.cpp    |     62 +
 extern/freestyle/src/geometry/FastGrid.h      |     85 +
 extern/freestyle/src/geometry/FitCurve.cpp    |    602 +
 extern/freestyle/src/geometry/FitCurve.h      |    101 +
 extern/freestyle/src/geometry/Geom.h          |     78 +
 extern/freestyle/src/geometry/GeomCleaner.cpp |    240 +
 extern/freestyle/src/geometry/GeomCleaner.h   |    219 +
 extern/freestyle/src/geometry/GeomUtils.cpp   |    742 +
 extern/freestyle/src/geometry/GeomUtils.h     |    309 +
 extern/freestyle/src/geometry/Grid.cpp        |    388 +
 extern/freestyle/src/geometry/Grid.h          |    358 +
 extern/freestyle/src/geometry/HashGrid.cpp    |     41 +
 extern/freestyle/src/geometry/HashGrid.h      |    109 +
 extern/freestyle/src/geometry/Noise.cpp       |    264 +
 extern/freestyle/src/geometry/Noise.h         |     77 +
 extern/freestyle/src/geometry/Polygon.h       |    215 +
 extern/freestyle/src/geometry/SweepLine.h     |    334 +
 extern/freestyle/src/geometry/VecMat.h        |    899 +
 extern/freestyle/src/geometry/geometry.pro    |     64 +
 extern/freestyle/src/geometry/matrix_util.cpp |    265 +
 extern/freestyle/src/geometry/matrix_util.h   |     69 +
 .../freestyle/src/geometry/normal_cycle.cpp   |    103 +
 extern/freestyle/src/geometry/normal_cycle.h  |     97 +
 extern/freestyle/src/geometry/src.pri         |     33 +
 extern/freestyle/src/image/GaussianFilter.cpp |     96 +
 extern/freestyle/src/image/GaussianFilter.h   |    144 +
 extern/freestyle/src/image/Image.h            |    389 +
 extern/freestyle/src/image/ImagePyramid.cpp   |    166 +
 extern/freestyle/src/image/ImagePyramid.h     |     92 +
 extern/freestyle/src/image/image.pro          |     66 +
 extern/freestyle/src/image/src.pri            |     13 +
 extern/freestyle/src/libconfig.pri            |    110 +
 extern/freestyle/src/makedsp.vcnet.debug.bat  |     25 +
 .../freestyle/src/makedsp.vcnet.release.bat   |     25 +
 .../src/rendering/GLBBoxRenderer.cpp          |    108 +
 .../freestyle/src/rendering/GLBBoxRenderer.h  |     59 +
 .../src/rendering/GLDebugRenderer.cpp         |    197 +
 .../freestyle/src/rendering/GLDebugRenderer.h |    182 +
 .../src/rendering/GLFreeMemoryVisitor.cpp     |     27 +
 .../src/rendering/GLFreeMemoryVisitor.h       |     23 +
 .../src/rendering/GLMonoColorRenderer.cpp     |     43 +
 .../src/rendering/GLMonoColorRenderer.h       |     60 +
 extern/freestyle/src/rendering/GLRenderer.cpp |    467 +
 extern/freestyle/src/rendering/GLRenderer.h   |    204 +
 .../src/rendering/GLSelectRenderer.cpp        |    159 +
 .../src/rendering/GLSelectRenderer.h          |     85 +
 .../src/rendering/GLStrokeRenderer.cpp        |    495 +
 .../src/rendering/GLStrokeRenderer.h          |     98 +
 extern/freestyle/src/rendering/GLUtils.cpp    |     68 +
 extern/freestyle/src/rendering/GLUtils.h      |     29 +
 .../src/rendering/GLXOffscreenViewer.cpp      |     86 +
 .../src/rendering/GLXOffscreenViewer.h        |    545 +
 extern/freestyle/src/rendering/extgl.cpp      |   2249 +
 extern/freestyle/src/rendering/extgl.h        |   5106 +
 extern/freestyle/src/rendering/pbuffer.cpp    |    292 +
 extern/freestyle/src/rendering/pbuffer.h      |     77 +
 extern/freestyle/src/rendering/rendering.pro  |    102 +
 extern/freestyle/src/rendering/src.pri        |     33 +
 .../freestyle/src/scene_graph/DrawingStyle.h  |     82 +
 .../src/scene_graph/IndexedFaceSet.cpp        |    321 +
 .../src/scene_graph/IndexedFaceSet.h          |    222 +
 extern/freestyle/src/scene_graph/LineRep.cpp  |     58 +
 extern/freestyle/src/scene_graph/LineRep.h    |    130 +
 extern/freestyle/src/scene_graph/Material.h   |    304 +
 .../src/scene_graph/MaxFileLoader.cpp         |    388 +
 .../freestyle/src/scene_graph/MaxFileLoader.h |     94 +
 extern/freestyle/src/scene_graph/Node.h       |     97 +
 .../freestyle/src/scene_graph/NodeCamera.cpp  |    119 +
 extern/freestyle/src/scene_graph/NodeCamera.h |    192 +
 .../src/scene_graph/NodeDrawingStyle.cpp      |     34 +
 .../src/scene_graph/NodeDrawingStyle.h        |     70 +
 .../freestyle/src/scene_graph/NodeGroup.cpp   |    122 +
 extern/freestyle/src/scene_graph/NodeGroup.h  |     84 +
 .../freestyle/src/scene_graph/NodeLight.cpp   |     80 +
 extern/freestyle/src/scene_graph/NodeLight.h  |     86 +
 .../freestyle/src/scene_graph/NodeShape.cpp   |     51 +
 extern/freestyle/src/scene_graph/NodeShape.h  |     89 +
 .../src/scene_graph/NodeTransform.cpp         |    166 +
 .../freestyle/src/scene_graph/NodeTransform.h |    107 +
 .../src/scene_graph/OrientedLineRep.cpp       |     31 +
 .../src/scene_graph/OrientedLineRep.h         |     67 +
 extern/freestyle/src/scene_graph/Rep.cpp      |      1 +
 extern/freestyle/src/scene_graph/Rep.h        |    127 +
 .../src/scene_graph/ScenePrettyPrinter.cpp    |     86 +
 .../src/scene_graph/ScenePrettyPrinter.h      |    105 +
 .../src/scene_graph/SceneVisitor.cpp          |      1 +
 .../freestyle/src/scene_graph/SceneVisitor.h  |     98 +
 .../freestyle/src/scene_graph/TriangleRep.cpp |     59 +
 .../freestyle/src/scene_graph/TriangleRep.h   |    106 +
 .../freestyle/src/scene_graph/VertexRep.cpp   |     29 +
 extern/freestyle/src/scene_graph/VertexRep.h  |     87 +
 .../freestyle/src/scene_graph/scene_graph.pro |     86 +
 extern/freestyle/src/scene_graph/src.pri      |     41 +
 .../src/stroke/AdvancedFunctions0D.cpp        |     85 +
 .../src/stroke/AdvancedFunctions0D.h          |    209 +
 .../src/stroke/AdvancedFunctions1D.cpp        |    108 +
 .../src/stroke/AdvancedFunctions1D.h          |    286 +
 .../src/stroke/AdvancedPredicates1D.h         |     81 +
 .../src/stroke/AdvancedStrokeShaders.cpp      |    423 +
 .../src/stroke/AdvancedStrokeShaders.h        |    222 +
 .../src/stroke/BasicStrokeShaders.cpp         |   1100 +
 .../freestyle/src/stroke/BasicStrokeShaders.h |    791 +
 extern/freestyle/src/stroke/Canvas.cpp        |    427 +
 extern/freestyle/src/stroke/Canvas.h          |    198 +
 extern/freestyle/src/stroke/Chain.cpp         |    126 +
 extern/freestyle/src/stroke/Chain.h           |     82 +
 .../src/stroke/ChainingIterators.cpp          |    147 +
 .../freestyle/src/stroke/ChainingIterators.h  |    364 +
 .../freestyle/src/stroke/ContextFunctions.cpp |     60 +
 .../freestyle/src/stroke/ContextFunctions.h   |    124 +
 extern/freestyle/src/stroke/Curve.cpp         |    818 +
 extern/freestyle/src/stroke/Curve.h           |    463 +
 .../src/stroke/CurveAdvancedIterators.h       |    378 +
 extern/freestyle/src/stroke/CurveIterators.h  |    295 +
 extern/freestyle/src/stroke/Modifiers.h       |     71 +
 extern/freestyle/src/stroke/Module.h          |     72 +
 extern/freestyle/src/stroke/Operators.cpp     |    862 +
 extern/freestyle/src/stroke/Operators.h       |    311 +
 .../freestyle/src/stroke/PSStrokeRenderer.cpp |     89 +
 .../freestyle/src/stroke/PSStrokeRenderer.h   |     63 +
 extern/freestyle/src/stroke/Predicates0D.h    |    160 +
 extern/freestyle/src/stroke/Predicates1D.h    |    438 +
 extern/freestyle/src/stroke/QInformationMap.h |     58 +
 extern/freestyle/src/stroke/Stroke.cpp        |    949 +
 extern/freestyle/src/stroke/Stroke.h          |    584 +
 .../src/stroke/StrokeAdvancedIterators.h      |    142 +
 extern/freestyle/src/stroke/StrokeIO.cpp      |     55 +
 extern/freestyle/src/stroke/StrokeIO.h        |     47 +
 extern/freestyle/src/stroke/StrokeIterators.h |    227 +
 extern/freestyle/src/stroke/StrokeLayer.cpp   |     55 +
 extern/freestyle/src/stroke/StrokeLayer.h     |     75 +
 .../freestyle/src/stroke/StrokeRenderer.cpp   |    146 +
 extern/freestyle/src/stroke/StrokeRenderer.h  |    140 +
 extern/freestyle/src/stroke/StrokeRep.cpp     |    820 +
 extern/freestyle/src/stroke/StrokeRep.h       |    138 +
 extern/freestyle/src/stroke/StrokeShader.h    |    119 +
 .../freestyle/src/stroke/StrokeTesselator.cpp |     88 +
 .../freestyle/src/stroke/StrokeTesselator.h   |     67 +
 extern/freestyle/src/stroke/StyleModule.h     |    144 +
 .../src/stroke/TextStrokeRenderer.cpp         |     73 +
 .../freestyle/src/stroke/TextStrokeRenderer.h |     68 +
 extern/freestyle/src/stroke/src.pri           |     54 +
 extern/freestyle/src/stroke/stroke.pro        |     89 +
 extern/freestyle/src/swig/Freestyle.i         |    283 +
 .../src/swig/FreestyleWrapper.vc7.vcproj      |    217 +
 .../src/swig/FreestyleWrapper.vc8.vcproj      |    283 +
 extern/freestyle/src/swig/Makefile            |     90 +
 extern/freestyle/src/swig/Makefile.cygwin     |     92 +
 extern/freestyle/src/swig/Makefile.linux      |     91 +
 extern/freestyle/src/swig/Makefile.mac        |     91 +
 extern/freestyle/src/swig/Makefile.noswig     |     64 +
 extern/freestyle/src/swig/ModuleWrapper.cpp   | 111845 +++++++++++++++
 extern/freestyle/src/swig/ModuleWrapper.h     |   1045 +
 extern/freestyle/src/system/BaseIterator.h    |     90 +
 extern/freestyle/src/system/BaseObject.cpp    |      1 +
 extern/freestyle/src/system/BaseObject.h      |     73 +
 extern/freestyle/src/system/Cast.h            |     44 +
 extern/freestyle/src/system/Exception.cpp     |     24 +
 extern/freestyle/src/system/Exception.h       |     64 +
 extern/freestyle/src/system/FreestyleConfig.h |    152 +
 extern/freestyle/src/system/Id.h              |    126 +
 extern/freestyle/src/system/Interpreter.h     |     56 +
 extern/freestyle/src/system/Precision.h       |     39 +
 extern/freestyle/src/system/ProgressBar.h     |     85 +
 extern/freestyle/src/system/PseudoNoise.cpp   |    108 +
 extern/freestyle/src/system/PseudoNoise.h     |     58 +
 .../src/system/PythonInterpreter.cpp          |     25 +
 .../freestyle/src/system/PythonInterpreter.h  |    111 +
 extern/freestyle/src/system/RandGen.cpp       |     86 +
 extern/freestyle/src/system/RandGen.h         |     48 +
 extern/freestyle/src/system/StringUtils.cpp   |     46 +
 extern/freestyle/src/system/StringUtils.h     |     51 +
 extern/freestyle/src/system/TimeStamp.cpp     |     25 +
 extern/freestyle/src/system/TimeStamp.h       |     71 +
 extern/freestyle/src/system/TimeUtils.h       |     58 +
 extern/freestyle/src/system/src.pri           |     30 +
 extern/freestyle/src/system/system.pro        |     73 +
 .../freestyle/src/view_map/FEdgeXDetector.cpp |    677 +
 .../freestyle/src/view_map/FEdgeXDetector.h   |    150 +
 extern/freestyle/src/view_map/Functions0D.cpp |    356 +
 extern/freestyle/src/view_map/Functions0D.h   |    487 +
 extern/freestyle/src/view_map/Functions1D.cpp |    209 +
 extern/freestyle/src/view_map/Functions1D.h   |    537 +
 extern/freestyle/src/view_map/Interface0D.h   |    351 +
 extern/freestyle/src/view_map/Interface1D.h   |    202 +
 extern/freestyle/src/view_map/Silhouette.cpp  |    370 +
 extern/freestyle/src/view_map/Silhouette.h    |   1417 +
 .../src/view_map/SilhouetteGeomEngine.cpp     |    185 +
 .../src/view_map/SilhouetteGeomEngine.h       |    122 +
 .../src/view_map/SteerableViewMap.cpp         |    243 +
 .../freestyle/src/view_map/SteerableViewMap.h |    153 +
 .../src/view_map/ViewEdgeXBuilder.cpp         |    666 +
 .../freestyle/src/view_map/ViewEdgeXBuilder.h |    214 +
 extern/freestyle/src/view_map/ViewMap.cpp     |    703 +
 extern/freestyle/src/view_map/ViewMap.h       |   1487 +
 .../src/view_map/ViewMapAdvancedIterators.h   |    691 +
 .../freestyle/src/view_map/ViewMapBuilder.cpp |   1027 +
 .../freestyle/src/view_map/ViewMapBuilder.h   |    224 +
 extern/freestyle/src/view_map/ViewMapIO.cpp   |   1245 +
 extern/freestyle/src/view_map/ViewMapIO.h     |    116 +
 .../freestyle/src/view_map/ViewMapIterators.h |    542 +
 .../src/view_map/ViewMapTesselator.cpp        |     36 +
 .../src/view_map/ViewMapTesselator.h          |    196 +
 extern/freestyle/src/view_map/src.pri         |     34 +
 extern/freestyle/src/view_map/view_map.pro    |     89 +
 .../freestyle/src/winged_edge/Curvature.cpp   |    647 +
 extern/freestyle/src/winged_edge/Curvature.h  |    156 +
 extern/freestyle/src/winged_edge/Nature.h     |     75 +
 extern/freestyle/src/winged_edge/WEdge.cpp    |    732 +
 extern/freestyle/src/winged_edge/WEdge.h      |    952 +
 .../freestyle/src/winged_edge/WFillGrid.cpp   |     60 +
 extern/freestyle/src/winged_edge/WFillGrid.h  |     80 +
 .../freestyle/src/winged_edge/WSFillGrid.cpp  |     60 +
 extern/freestyle/src/winged_edge/WSFillGrid.h |     79 +
 extern/freestyle/src/winged_edge/WXEdge.cpp   |    296 +
 extern/freestyle/src/winged_edge/WXEdge.h     |    582 +
 .../src/winged_edge/WXEdgeBuilder.cpp         |     43 +
 .../freestyle/src/winged_edge/WXEdgeBuilder.h |     51 +
 .../src/winged_edge/WingedEdgeBuilder.cpp     |    362 +
 .../src/winged_edge/WingedEdgeBuilder.h       |    160 +
 extern/freestyle/src/winged_edge/src.pri      |     21 +
 .../freestyle/src/winged_edge/winged_edge.pro |     84 +
 .../style_modules/ChainingIterators.py        |    731 +
 extern/freestyle/style_modules/Functions0D.py |     81 +
 extern/freestyle/style_modules/Functions1D.py |     45 +
 .../freestyle/style_modules/PredicatesB1D.py  |     70 +
 .../freestyle/style_modules/PredicatesU0D.py  |    103 +
 .../freestyle/style_modules/PredicatesU1D.py  |    381 +
 .../style_modules/anisotropic_diffusion.py    |     75 +
 .../apriori_and_causal_density.py             |     45 +
 .../style_modules/apriori_density.py          |     43 +
 .../style_modules/backbone_stretcher.py       |     36 +
 .../style_modules/blueprint_circles.py        |     46 +
 .../style_modules/blueprint_ellipses.py       |     46 +
 .../style_modules/blueprint_squares.py        |     45 +
 extern/freestyle/style_modules/cartoon.py     |     42 +
 extern/freestyle/style_modules/contour.py     |     42 +
 extern/freestyle/style_modules/curvature2d.py |     60 +
 .../style_modules/external_contour.py         |     43 +
 .../style_modules/external_contour_sketchy.py |     48 +
 .../style_modules/external_contour_smooth.py  |     44 +
 .../freestyle/style_modules/extra-lines.sml   |      3 +
 extern/freestyle/style_modules/haloing.py     |     50 +
 .../style_modules/ignore_small_occlusions.py  |     41 +
 .../style_modules/invisible_lines.py          |     42 +
 .../style_modules/japanese_bigbrush.py        |     59 +
 .../style_modules/logical_operators.py        |     36 +
 .../long_anisotropically_dense.py             |     81 +
 .../multiple_parameterization.py              |     51 +
 extern/freestyle/style_modules/nature.py      |     43 +
 extern/freestyle/style_modules/near_lines.py  |     44 +
 .../occluded_by_specific_object.py            |     45 +
 .../freestyle/style_modules/polygonalize.py   |     40 +
 extern/freestyle/style_modules/qi0.py         |     41 +
 .../style_modules/qi0_not_external_contour.py |     43 +
 extern/freestyle/style_modules/qi1.py         |     42 +
 extern/freestyle/style_modules/qi2.py         |     42 +
 .../style_modules/sequentialsplit_sketchy.py  |     68 +
 extern/freestyle/style_modules/shaders.py     |   1288 +
 .../sketchy_multiple_parameterization.py      |     48 +
 .../style_modules/sketchy_topology_broken.py  |     89 +
 .../sketchy_topology_preserved.py             |     49 +
 .../split_at_highest_2d_curvatures.py         |     40 +
 .../style_modules/split_at_tvertices.py       |     42 +
 .../freestyle/style_modules/stroke_texture.py |     43 +
 extern/freestyle/style_modules/suggestive.py  |     43 +
 .../thickness_fof_depth_discontinuity.py      |     62 +
 extern/freestyle/style_modules/tipremover.py  |     42 +
 .../style_modules/tvertex_remover.py          |     42 +
 .../style_modules/uniformpruning_zsort.py     |     40 +
 extern/freestyle/style_modules/vector.py      |    241 +
 348 files changed, 182620 insertions(+)
 create mode 100755 extern/freestyle/AUTHORS.TXT
 create mode 100755 extern/freestyle/BUGS.TXT
 create mode 100755 extern/freestyle/COPYRIGHT.TXT
 create mode 100755 extern/freestyle/INSTALL.TXT
 create mode 100755 extern/freestyle/LICENSE.TXT
 create mode 100755 extern/freestyle/README.TXT
 create mode 100755 extern/freestyle/THANKS.TXT
 create mode 100755 extern/freestyle/TODO.TXT
 create mode 100755 extern/freestyle/src/Config.pri
 create mode 100755 extern/freestyle/src/Freestyle-vc7-debug.sln
 create mode 100755 extern/freestyle/src/Freestyle-vc7-release.sln
 create mode 100755 extern/freestyle/src/Freestyle-vc8-debug.sln
 create mode 100755 extern/freestyle/src/Freestyle-vc8-release.sln
 create mode 100755 extern/freestyle/src/Makefile.pro
 create mode 100755 extern/freestyle/src/app/AppAboutWindow.cpp
 create mode 100755 extern/freestyle/src/app/AppAboutWindow.h
 create mode 100755 extern/freestyle/src/app/AppCanvas.cpp
 create mode 100755 extern/freestyle/src/app/AppCanvas.h
 create mode 100755 extern/freestyle/src/app/AppConfig.cpp
 create mode 100755 extern/freestyle/src/app/AppConfig.h
 create mode 100755 extern/freestyle/src/app/AppDensityCurvesWindow.cpp
 create mode 100755 extern/freestyle/src/app/AppDensityCurvesWindow.h
 create mode 100755 extern/freestyle/src/app/AppGL2DCurvesViewer.cpp
 create mode 100755 extern/freestyle/src/app/AppGL2DCurvesViewer.h
 create mode 100755 extern/freestyle/src/app/AppGLWidget.cpp
 create mode 100755 extern/freestyle/src/app/AppGLWidget.h
 create mode 100755 extern/freestyle/src/app/AppInteractiveShaderWindow.cpp
 create mode 100755 extern/freestyle/src/app/AppInteractiveShaderWindow.h
 create mode 100755 extern/freestyle/src/app/AppMainWindow.cpp
 create mode 100755 extern/freestyle/src/app/AppMainWindow.h
 create mode 100755 extern/freestyle/src/app/AppOptionsWindow.cpp
 create mode 100755 extern/freestyle/src/app/AppOptionsWindow.h
 create mode 100755 extern/freestyle/src/app/AppProgressBar.cpp
 create mode 100755 extern/freestyle/src/app/AppProgressBar.h
 create mode 100755 extern/freestyle/src/app/AppStyleWindow.cpp
 create mode 100755 extern/freestyle/src/app/AppStyleWindow.h
 create mode 100755 extern/freestyle/src/app/ConfigIO.cpp
 create mode 100755 extern/freestyle/src/app/ConfigIO.h
 create mode 100755 extern/freestyle/src/app/Controller.cpp
 create mode 100755 extern/freestyle/src/app/Controller.h
 create mode 100755 extern/freestyle/src/app/Main.cpp
 create mode 100755 extern/freestyle/src/app/QGLBasicWidget.cpp
 create mode 100755 extern/freestyle/src/app/QGLBasicWidget.h
 create mode 100755 extern/freestyle/src/app/QStyleModuleSyntaxHighlighter.cpp
 create mode 100755 extern/freestyle/src/app/QStyleModuleSyntaxHighlighter.h
 create mode 100755 extern/freestyle/src/app/app.pro
 create mode 100755 extern/freestyle/src/app/appmainwindowbase4.ui
 create mode 100755 extern/freestyle/src/app/densitycurveswindow4.ui
 create mode 100755 extern/freestyle/src/app/freestyle.qrc
 create mode 100755 extern/freestyle/src/app/icons/add.png
 create mode 100755 extern/freestyle/src/app/icons/arrow_down.png
 create mode 100755 extern/freestyle/src/app/icons/arrow_left.png
 create mode 100755 extern/freestyle/src/app/icons/arrow_right.png
 create mode 100755 extern/freestyle/src/app/icons/arrow_up.png
 create mode 100755 extern/freestyle/src/app/icons/clear.png
 create mode 100755 extern/freestyle/src/app/icons/close.png
 create mode 100755 extern/freestyle/src/app/icons/edit.png
 create mode 100755 extern/freestyle/src/app/icons/eye0.png
 create mode 100755 extern/freestyle/src/app/icons/eye1.png
 create mode 100755 extern/freestyle/src/app/icons/folder.png
 create mode 100755 extern/freestyle/src/app/icons/home.png
 create mode 100755 extern/freestyle/src/app/icons/mod0.png
 create mode 100755 extern/freestyle/src/app/icons/mod1.png
 create mode 100755 extern/freestyle/src/app/icons/ok.png
 create mode 100755 extern/freestyle/src/app/icons/reload.png
 create mode 100755 extern/freestyle/src/app/icons/remove.png
 create mode 100755 extern/freestyle/src/app/icons/save.png
 create mode 100755 extern/freestyle/src/app/icons/save_as.png
 create mode 100755 extern/freestyle/src/app/interactiveshaderwindow4.ui
 create mode 100755 extern/freestyle/src/app/optionswindow4.ui
 create mode 100755 extern/freestyle/src/app/progressdialog4.ui
 create mode 100755 extern/freestyle/src/app/src.pri
 create mode 100755 extern/freestyle/src/app/stylewindow4.ui
 create mode 100755 extern/freestyle/src/build_bundle.macosx.py
 create mode 100755 extern/freestyle/src/geometry/BBox.h
 create mode 100755 extern/freestyle/src/geometry/Bezier.cpp
 create mode 100755 extern/freestyle/src/geometry/Bezier.h
 create mode 100755 extern/freestyle/src/geometry/FastGrid.cpp
 create mode 100755 extern/freestyle/src/geometry/FastGrid.h
 create mode 100755 extern/freestyle/src/geometry/FitCurve.cpp
 create mode 100755 extern/freestyle/src/geometry/FitCurve.h
 create mode 100755 extern/freestyle/src/geometry/Geom.h
 create mode 100755 extern/freestyle/src/geometry/GeomCleaner.cpp
 create mode 100755 extern/freestyle/src/geometry/GeomCleaner.h
 create mode 100755 extern/freestyle/src/geometry/GeomUtils.cpp
 create mode 100755 extern/freestyle/src/geometry/GeomUtils.h
 create mode 100755 extern/freestyle/src/geometry/Grid.cpp
 create mode 100755 extern/freestyle/src/geometry/Grid.h
 create mode 100755 extern/freestyle/src/geometry/HashGrid.cpp
 create mode 100755 extern/freestyle/src/geometry/HashGrid.h
 create mode 100755 extern/freestyle/src/geometry/Noise.cpp
 create mode 100755 extern/freestyle/src/geometry/Noise.h
 create mode 100755 extern/freestyle/src/geometry/Polygon.h
 create mode 100755 extern/freestyle/src/geometry/SweepLine.h
 create mode 100755 extern/freestyle/src/geometry/VecMat.h
 create mode 100755 extern/freestyle/src/geometry/geometry.pro
 create mode 100755 extern/freestyle/src/geometry/matrix_util.cpp
 create mode 100755 extern/freestyle/src/geometry/matrix_util.h
 create mode 100755 extern/freestyle/src/geometry/normal_cycle.cpp
 create mode 100755 extern/freestyle/src/geometry/normal_cycle.h
 create mode 100755 extern/freestyle/src/geometry/src.pri
 create mode 100755 extern/freestyle/src/image/GaussianFilter.cpp
 create mode 100755 extern/freestyle/src/image/GaussianFilter.h
 create mode 100755 extern/freestyle/src/image/Image.h
 create mode 100755 extern/freestyle/src/image/ImagePyramid.cpp
 create mode 100755 extern/freestyle/src/image/ImagePyramid.h
 create mode 100755 extern/freestyle/src/image/image.pro
 create mode 100755 extern/freestyle/src/image/src.pri
 create mode 100755 extern/freestyle/src/libconfig.pri
 create mode 100755 extern/freestyle/src/makedsp.vcnet.debug.bat
 create mode 100755 extern/freestyle/src/makedsp.vcnet.release.bat
 create mode 100755 extern/freestyle/src/rendering/GLBBoxRenderer.cpp
 create mode 100755 extern/freestyle/src/rendering/GLBBoxRenderer.h
 create mode 100755 extern/freestyle/src/rendering/GLDebugRenderer.cpp
 create mode 100755 extern/freestyle/src/rendering/GLDebugRenderer.h
 create mode 100644 extern/freestyle/src/rendering/GLFreeMemoryVisitor.cpp
 create mode 100644 extern/freestyle/src/rendering/GLFreeMemoryVisitor.h
 create mode 100755 extern/freestyle/src/rendering/GLMonoColorRenderer.cpp
 create mode 100755 extern/freestyle/src/rendering/GLMonoColorRenderer.h
 create mode 100755 extern/freestyle/src/rendering/GLRenderer.cpp
 create mode 100755 extern/freestyle/src/rendering/GLRenderer.h
 create mode 100755 extern/freestyle/src/rendering/GLSelectRenderer.cpp
 create mode 100755 extern/freestyle/src/rendering/GLSelectRenderer.h
 create mode 100755 extern/freestyle/src/rendering/GLStrokeRenderer.cpp
 create mode 100755 extern/freestyle/src/rendering/GLStrokeRenderer.h
 create mode 100755 extern/freestyle/src/rendering/GLUtils.cpp
 create mode 100755 extern/freestyle/src/rendering/GLUtils.h
 create mode 100755 extern/freestyle/src/rendering/GLXOffscreenViewer.cpp
 create mode 100755 extern/freestyle/src/rendering/GLXOffscreenViewer.h
 create mode 100755 extern/freestyle/src/rendering/extgl.cpp
 create mode 100755 extern/freestyle/src/rendering/extgl.h
 create mode 100755 extern/freestyle/src/rendering/pbuffer.cpp
 create mode 100755 extern/freestyle/src/rendering/pbuffer.h
 create mode 100755 extern/freestyle/src/rendering/rendering.pro
 create mode 100755 extern/freestyle/src/rendering/src.pri
 create mode 100755 extern/freestyle/src/scene_graph/DrawingStyle.h
 create mode 100755 extern/freestyle/src/scene_graph/IndexedFaceSet.cpp
 create mode 100755 extern/freestyle/src/scene_graph/IndexedFaceSet.h
 create mode 100755 extern/freestyle/src/scene_graph/LineRep.cpp
 create mode 100755 extern/freestyle/src/scene_graph/LineRep.h
 create mode 100755 extern/freestyle/src/scene_graph/Material.h
 create mode 100755 extern/freestyle/src/scene_graph/MaxFileLoader.cpp
 create mode 100755 extern/freestyle/src/scene_graph/MaxFileLoader.h
 create mode 100755 extern/freestyle/src/scene_graph/Node.h
 create mode 100644 extern/freestyle/src/scene_graph/NodeCamera.cpp
 create mode 100644 extern/freestyle/src/scene_graph/NodeCamera.h
 create mode 100755 extern/freestyle/src/scene_graph/NodeDrawingStyle.cpp
 create mode 100755 extern/freestyle/src/scene_graph/NodeDrawingStyle.h
 create mode 100755 extern/freestyle/src/scene_graph/NodeGroup.cpp
 create mode 100755 extern/freestyle/src/scene_graph/NodeGroup.h
 create mode 100755 extern/freestyle/src/scene_graph/NodeLight.cpp
 create mode 100755 extern/freestyle/src/scene_graph/NodeLight.h
 create mode 100755 extern/freestyle/src/scene_graph/NodeShape.cpp
 create mode 100755 extern/freestyle/src/scene_graph/NodeShape.h
 create mode 100755 extern/freestyle/src/scene_graph/NodeTransform.cpp
 create mode 100755 extern/freestyle/src/scene_graph/NodeTransform.h
 create mode 100755 extern/freestyle/src/scene_graph/OrientedLineRep.cpp
 create mode 100755 extern/freestyle/src/scene_graph/OrientedLineRep.h
 create mode 100755 extern/freestyle/src/scene_graph/Rep.cpp
 create mode 100755 extern/freestyle/src/scene_graph/Rep.h
 create mode 100755 extern/freestyle/src/scene_graph/ScenePrettyPrinter.cpp
 create mode 100755 extern/freestyle/src/scene_graph/ScenePrettyPrinter.h
 create mode 100755 extern/freestyle/src/scene_graph/SceneVisitor.cpp
 create mode 100755 extern/freestyle/src/scene_graph/SceneVisitor.h
 create mode 100755 extern/freestyle/src/scene_graph/TriangleRep.cpp
 create mode 100755 extern/freestyle/src/scene_graph/TriangleRep.h
 create mode 100755 extern/freestyle/src/scene_graph/VertexRep.cpp
 create mode 100755 extern/freestyle/src/scene_graph/VertexRep.h
 create mode 100755 extern/freestyle/src/scene_graph/scene_graph.pro
 create mode 100755 extern/freestyle/src/scene_graph/src.pri
 create mode 100755 extern/freestyle/src/stroke/AdvancedFunctions0D.cpp
 create mode 100755 extern/freestyle/src/stroke/AdvancedFunctions0D.h
 create mode 100755 extern/freestyle/src/stroke/AdvancedFunctions1D.cpp
 create mode 100755 extern/freestyle/src/stroke/AdvancedFunctions1D.h
 create mode 100755 extern/freestyle/src/stroke/AdvancedPredicates1D.h
 create mode 100755 extern/freestyle/src/stroke/AdvancedStrokeShaders.cpp
 create mode 100755 extern/freestyle/src/stroke/AdvancedStrokeShaders.h
 create mode 100755 extern/freestyle/src/stroke/BasicStrokeShaders.cpp
 create mode 100755 extern/freestyle/src/stroke/BasicStrokeShaders.h
 create mode 100755 extern/freestyle/src/stroke/Canvas.cpp
 create mode 100755 extern/freestyle/src/stroke/Canvas.h
 create mode 100755 extern/freestyle/src/stroke/Chain.cpp
 create mode 100755 extern/freestyle/src/stroke/Chain.h
 create mode 100755 extern/freestyle/src/stroke/ChainingIterators.cpp
 create mode 100755 extern/freestyle/src/stroke/ChainingIterators.h
 create mode 100755 extern/freestyle/src/stroke/ContextFunctions.cpp
 create mode 100755 extern/freestyle/src/stroke/ContextFunctions.h
 create mode 100755 extern/freestyle/src/stroke/Curve.cpp
 create mode 100755 extern/freestyle/src/stroke/Curve.h
 create mode 100755 extern/freestyle/src/stroke/CurveAdvancedIterators.h
 create mode 100755 extern/freestyle/src/stroke/CurveIterators.h
 create mode 100755 extern/freestyle/src/stroke/Modifiers.h
 create mode 100755 extern/freestyle/src/stroke/Module.h
 create mode 100755 extern/freestyle/src/stroke/Operators.cpp
 create mode 100755 extern/freestyle/src/stroke/Operators.h
 create mode 100755 extern/freestyle/src/stroke/PSStrokeRenderer.cpp
 create mode 100755 extern/freestyle/src/stroke/PSStrokeRenderer.h
 create mode 100755 extern/freestyle/src/stroke/Predicates0D.h
 create mode 100755 extern/freestyle/src/stroke/Predicates1D.h
 create mode 100755 extern/freestyle/src/stroke/QInformationMap.h
 create mode 100755 extern/freestyle/src/stroke/Stroke.cpp
 create mode 100755 extern/freestyle/src/stroke/Stroke.h
 create mode 100755 extern/freestyle/src/stroke/StrokeAdvancedIterators.h
 create mode 100755 extern/freestyle/src/stroke/StrokeIO.cpp
 create mode 100755 extern/freestyle/src/stroke/StrokeIO.h
 create mode 100755 extern/freestyle/src/stroke/StrokeIterators.h
 create mode 100755 extern/freestyle/src/stroke/StrokeLayer.cpp
 create mode 100755 extern/freestyle/src/stroke/StrokeLayer.h
 create mode 100755 extern/freestyle/src/stroke/StrokeRenderer.cpp
 create mode 100755 extern/freestyle/src/stroke/StrokeRenderer.h
 create mode 100755 extern/freestyle/src/stroke/StrokeRep.cpp
 create mode 100755 extern/freestyle/src/stroke/StrokeRep.h
 create mode 100755 extern/freestyle/src/stroke/StrokeShader.h
 create mode 100755 extern/freestyle/src/stroke/StrokeTesselator.cpp
 create mode 100755 extern/freestyle/src/stroke/StrokeTesselator.h
 create mode 100755 extern/freestyle/src/stroke/StyleModule.h
 create mode 100755 extern/freestyle/src/stroke/TextStrokeRenderer.cpp
 create mode 100755 extern/freestyle/src/stroke/TextStrokeRenderer.h
 create mode 100755 extern/freestyle/src/stroke/src.pri
 create mode 100755 extern/freestyle/src/stroke/stroke.pro
 create mode 100755 extern/freestyle/src/swig/Freestyle.i
 create mode 100755 extern/freestyle/src/swig/FreestyleWrapper.vc7.vcproj
 create mode 100755 extern/freestyle/src/swig/FreestyleWrapper.vc8.vcproj
 create mode 100755 extern/freestyle/src/swig/Makefile
 create mode 100755 extern/freestyle/src/swig/Makefile.cygwin
 create mode 100755 extern/freestyle/src/swig/Makefile.linux
 create mode 100644 extern/freestyle/src/swig/Makefile.mac
 create mode 100755 extern/freestyle/src/swig/Makefile.noswig
 create mode 100755 extern/freestyle/src/swig/ModuleWrapper.cpp
 create mode 100755 extern/freestyle/src/swig/ModuleWrapper.h
 create mode 100755 extern/freestyle/src/system/BaseIterator.h
 create mode 100755 extern/freestyle/src/system/BaseObject.cpp
 create mode 100755 extern/freestyle/src/system/BaseObject.h
 create mode 100755 extern/freestyle/src/system/Cast.h
 create mode 100755 extern/freestyle/src/system/Exception.cpp
 create mode 100755 extern/freestyle/src/system/Exception.h
 create mode 100755 extern/freestyle/src/system/FreestyleConfig.h
 create mode 100755 extern/freestyle/src/system/Id.h
 create mode 100755 extern/freestyle/src/system/Interpreter.h
 create mode 100755 extern/freestyle/src/system/Precision.h
 create mode 100755 extern/freestyle/src/system/ProgressBar.h
 create mode 100755 extern/freestyle/src/system/PseudoNoise.cpp
 create mode 100755 extern/freestyle/src/system/PseudoNoise.h
 create mode 100755 extern/freestyle/src/system/PythonInterpreter.cpp
 create mode 100755 extern/freestyle/src/system/PythonInterpreter.h
 create mode 100755 extern/freestyle/src/system/RandGen.cpp
 create mode 100755 extern/freestyle/src/system/RandGen.h
 create mode 100755 extern/freestyle/src/system/StringUtils.cpp
 create mode 100755 extern/freestyle/src/system/StringUtils.h
 create mode 100755 extern/freestyle/src/system/TimeStamp.cpp
 create mode 100755 extern/freestyle/src/system/TimeStamp.h
 create mode 100755 extern/freestyle/src/system/TimeUtils.h
 create mode 100755 extern/freestyle/src/system/src.pri
 create mode 100755 extern/freestyle/src/system/system.pro
 create mode 100755 extern/freestyle/src/view_map/FEdgeXDetector.cpp
 create mode 100755 extern/freestyle/src/view_map/FEdgeXDetector.h
 create mode 100755 extern/freestyle/src/view_map/Functions0D.cpp
 create mode 100755 extern/freestyle/src/view_map/Functions0D.h
 create mode 100755 extern/freestyle/src/view_map/Functions1D.cpp
 create mode 100755 extern/freestyle/src/view_map/Functions1D.h
 create mode 100755 extern/freestyle/src/view_map/Interface0D.h
 create mode 100755 extern/freestyle/src/view_map/Interface1D.h
 create mode 100755 extern/freestyle/src/view_map/Silhouette.cpp
 create mode 100755 extern/freestyle/src/view_map/Silhouette.h
 create mode 100755 extern/freestyle/src/view_map/SilhouetteGeomEngine.cpp
 create mode 100755 extern/freestyle/src/view_map/SilhouetteGeomEngine.h
 create mode 100755 extern/freestyle/src/view_map/SteerableViewMap.cpp
 create mode 100755 extern/freestyle/src/view_map/SteerableViewMap.h
 create mode 100755 extern/freestyle/src/view_map/ViewEdgeXBuilder.cpp
 create mode 100755 extern/freestyle/src/view_map/ViewEdgeXBuilder.h
 create mode 100755 extern/freestyle/src/view_map/ViewMap.cpp
 create mode 100755 extern/freestyle/src/view_map/ViewMap.h
 create mode 100755 extern/freestyle/src/view_map/ViewMapAdvancedIterators.h
 create mode 100755 extern/freestyle/src/view_map/ViewMapBuilder.cpp
 create mode 100755 extern/freestyle/src/view_map/ViewMapBuilder.h
 create mode 100755 extern/freestyle/src/view_map/ViewMapIO.cpp
 create mode 100755 extern/freestyle/src/view_map/ViewMapIO.h
 create mode 100755 extern/freestyle/src/view_map/ViewMapIterators.h
 create mode 100755 extern/freestyle/src/view_map/ViewMapTesselator.cpp
 create mode 100755 extern/freestyle/src/view_map/ViewMapTesselator.h
 create mode 100755 extern/freestyle/src/view_map/src.pri
 create mode 100755 extern/freestyle/src/view_map/view_map.pro
 create mode 100755 extern/freestyle/src/winged_edge/Curvature.cpp
 create mode 100755 extern/freestyle/src/winged_edge/Curvature.h
 create mode 100755 extern/freestyle/src/winged_edge/Nature.h
 create mode 100755 extern/freestyle/src/winged_edge/WEdge.cpp
 create mode 100755 extern/freestyle/src/winged_edge/WEdge.h
 create mode 100755 extern/freestyle/src/winged_edge/WFillGrid.cpp
 create mode 100755 extern/freestyle/src/winged_edge/WFillGrid.h
 create mode 100755 extern/freestyle/src/winged_edge/WSFillGrid.cpp
 create mode 100755 extern/freestyle/src/winged_edge/WSFillGrid.h
 create mode 100755 extern/freestyle/src/winged_edge/WXEdge.cpp
 create mode 100755 extern/freestyle/src/winged_edge/WXEdge.h
 create mode 100755 extern/freestyle/src/winged_edge/WXEdgeBuilder.cpp
 create mode 100755 extern/freestyle/src/winged_edge/WXEdgeBuilder.h
 create mode 100755 extern/freestyle/src/winged_edge/WingedEdgeBuilder.cpp
 create mode 100755 extern/freestyle/src/winged_edge/WingedEdgeBuilder.h
 create mode 100755 extern/freestyle/src/winged_edge/src.pri
 create mode 100755 extern/freestyle/src/winged_edge/winged_edge.pro
 create mode 100755 extern/freestyle/style_modules/ChainingIterators.py
 create mode 100755 extern/freestyle/style_modules/Functions0D.py
 create mode 100755 extern/freestyle/style_modules/Functions1D.py
 create mode 100755 extern/freestyle/style_modules/PredicatesB1D.py
 create mode 100755 extern/freestyle/style_modules/PredicatesU0D.py
 create mode 100755 extern/freestyle/style_modules/PredicatesU1D.py
 create mode 100755 extern/freestyle/style_modules/anisotropic_diffusion.py
 create mode 100755 extern/freestyle/style_modules/apriori_and_causal_density.py
 create mode 100755 extern/freestyle/style_modules/apriori_density.py
 create mode 100755 extern/freestyle/style_modules/backbone_stretcher.py
 create mode 100755 extern/freestyle/style_modules/blueprint_circles.py
 create mode 100755 extern/freestyle/style_modules/blueprint_ellipses.py
 create mode 100755 extern/freestyle/style_modules/blueprint_squares.py
 create mode 100755 extern/freestyle/style_modules/cartoon.py
 create mode 100755 extern/freestyle/style_modules/contour.py
 create mode 100755 extern/freestyle/style_modules/curvature2d.py
 create mode 100755 extern/freestyle/style_modules/external_contour.py
 create mode 100755 extern/freestyle/style_modules/external_contour_sketchy.py
 create mode 100755 extern/freestyle/style_modules/external_contour_smooth.py
 create mode 100755 extern/freestyle/style_modules/extra-lines.sml
 create mode 100755 extern/freestyle/style_modules/haloing.py
 create mode 100755 extern/freestyle/style_modules/ignore_small_occlusions.py
 create mode 100755 extern/freestyle/style_modules/invisible_lines.py
 create mode 100755 extern/freestyle/style_modules/japanese_bigbrush.py
 create mode 100755 extern/freestyle/style_modules/logical_operators.py
 create mode 100755 extern/freestyle/style_modules/long_anisotropically_dense.py
 create mode 100755 extern/freestyle/style_modules/multiple_parameterization.py
 create mode 100755 extern/freestyle/style_modules/nature.py
 create mode 100755 extern/freestyle/style_modules/near_lines.py
 create mode 100755 extern/freestyle/style_modules/occluded_by_specific_object.py
 create mode 100755 extern/freestyle/style_modules/polygonalize.py
 create mode 100755 extern/freestyle/style_modules/qi0.py
 create mode 100755 extern/freestyle/style_modules/qi0_not_external_contour.py
 create mode 100755 extern/freestyle/style_modules/qi1.py
 create mode 100755 extern/freestyle/style_modules/qi2.py
 create mode 100755 extern/freestyle/style_modules/sequentialsplit_sketchy.py
 create mode 100755 extern/freestyle/style_modules/shaders.py
 create mode 100755 extern/freestyle/style_modules/sketchy_multiple_parameterization.py
 create mode 100755 extern/freestyle/style_modules/sketchy_topology_broken.py
 create mode 100755 extern/freestyle/style_modules/sketchy_topology_preserved.py
 create mode 100755 extern/freestyle/style_modules/split_at_highest_2d_curvatures.py
 create mode 100755 extern/freestyle/style_modules/split_at_tvertices.py
 create mode 100755 extern/freestyle/style_modules/stroke_texture.py
 create mode 100755 extern/freestyle/style_modules/suggestive.py
 create mode 100755 extern/freestyle/style_modules/thickness_fof_depth_discontinuity.py
 create mode 100755 extern/freestyle/style_modules/tipremover.py
 create mode 100755 extern/freestyle/style_modules/tvertex_remover.py
 create mode 100755 extern/freestyle/style_modules/uniformpruning_zsort.py
 create mode 100755 extern/freestyle/style_modules/vector.py

diff --git a/extern/freestyle/AUTHORS.TXT b/extern/freestyle/AUTHORS.TXT
new file mode 100755
index 00000000000..27cdb70d5ec
--- /dev/null
+++ b/extern/freestyle/AUTHORS.TXT
@@ -0,0 +1,6 @@
+Authors
+-------
+Frédo Durand		<fredo@mit.edu>
+Stéphane Grabli		<stephane.grabli@imag.fr>
+François Sillion	<francois.sillion@imag.fr>
+Emmanuel Turquin	<emmanuel.turquin@imag.fr>
diff --git a/extern/freestyle/BUGS.TXT b/extern/freestyle/BUGS.TXT
new file mode 100755
index 00000000000..c5bad029a47
--- /dev/null
+++ b/extern/freestyle/BUGS.TXT
@@ -0,0 +1,11 @@
+* Application doesn't exit properly (eg style window still hangs out)
+* macosx: Window bar is unaccessible.
+* macosx: Build leds to an application that is half-bundle (for the executable) half UNIX-style (for libraries).
+* Strokes Strips are sometimes incorrect
+* TVertex sometimes points towards NULL ViewEdges
+* Some points are found to be outside of the grid. (for big models and mostly in release mode). Probably due to precision problems.
+* Operators::recursiveChains() and ViewEdgeIterator change ViewEdgeIterator so that it supports the copy of specialized types in a transparent way. It works here only because we're never copying it and because it is passed as a reference.
+* Functions0D takes a Interface0DIterator& insted of a const Interface0DIterator& as argument. dangerous.
+* crashes on big models
+
+ 
diff --git a/extern/freestyle/COPYRIGHT.TXT b/extern/freestyle/COPYRIGHT.TXT
new file mode 100755
index 00000000000..cd37bd16786
--- /dev/null
+++ b/extern/freestyle/COPYRIGHT.TXT
@@ -0,0 +1,9 @@
+Freestyle
+
+Copyright (c) 2001-2007 by the following:
+
+
+Frédo Durand		<fredo@mit.edu>
+Stéphane Grabli		<stephane.grabli@gmail.com>
+François Sillion	<francois.sillion@imag.fr>
+Emmanuel Turquin	<emmanuel.turquin@imag.fr>
diff --git a/extern/freestyle/INSTALL.TXT b/extern/freestyle/INSTALL.TXT
new file mode 100755
index 00000000000..4fab1275116
--- /dev/null
+++ b/extern/freestyle/INSTALL.TXT
@@ -0,0 +1,79 @@
+Install
+-------
+
+* UNIX/LINUX
+
+(for a more detailed description, see doc/linuxinstall.html)
+
+  This is quite straightforward, provided that you have all the
+needed libraries properly installed (see Requirements section in
+the README.TXT file). 
+First, set the FREESTYLE-DIR environment variable to your 
+freestyle directory and then, simply type:
+
+$> cd "$FREESTYLE_DIR"/src
+$> qmake
+$> make
+
+Note: The SWIG wrapper hasn't been included in the qmake build
+cycle yet and thus has to be compiled separately, by hand:
+
+$> cd "$FREESTYLE_DIR"/src/swig
+$> make
+
+And to run the app:
+
+$> export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:./lib"
+$> cd "$FREESTYLE_DIR"/build/linux-g++/release/
+$> ./Freestyle
+
+
+* WINDOWS
+
+ - If you downloaded the binary version:
+
+1) unzip the package
+2) run vcredist_x86.exe
+3) run Freestyle.exe
+
+- Compilation Instructions:
+
+(for a more detailed description, including the cygwin
+compilation instructions, see doc/wininstall.html)
+
+1) launch 'makedsp.vcnet.debug.bat' in the 'src' subdir of your FREESTYLE_DIR to generate
+  a .vcproj file for each sub-project
+2) open 'src/Freestyle-vc8-debug.sln' with Visual Studio (tested with VC++ 8 express edition)
+3) compile the whole project using 'build solution' in the 'build' menu 
+4) run the app and enjoy ;)
+
+* MAC OS X
+
+(for a more detailed description, see doc/macosxinstall.html)
+
+  This is quite straightforward, provided that you have all the
+needed libraries properly installed (see Requirements section in
+the README.TXT file). 
+First, set the FREESTYLE-DIR environment variable to your 
+freestyle directory and then, simply type:
+
+$> cd "$FREESTYLE_DIR"/src
+$> qmake
+$> make
+
+Note: The SWIG wrapper hasn't been included in the qmake build
+cycle yet and thus has to be compiled separately, by hand:
+
+$> cd "$FREESTYLE_DIR"/src/swig
+$> make
+
+And to run the app:
+
+$> build_bundle.macosx.py
+$> cd "$FREESTYLE_DIR"/
+$> open Freestyle.App
+
+
+* IRIX
+
+Not tested yet...
diff --git a/extern/freestyle/LICENSE.TXT b/extern/freestyle/LICENSE.TXT
new file mode 100755
index 00000000000..5b6e7c66c27
--- /dev/null
+++ b/extern/freestyle/LICENSE.TXT
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                       59 Temple Place, Suite 330, Boston, MA  02111-1307  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) <year>  <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) year 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/freestyle/README.TXT b/extern/freestyle/README.TXT
new file mode 100755
index 00000000000..b0d026c8b9b
--- /dev/null
+++ b/extern/freestyle/README.TXT
@@ -0,0 +1,51 @@
+Freestyle, a procedural line drawing system
+http://freestyle.sourceforge.net
+
+INTRODUCTION
+------------
+Freestyle is a software for Non-Photorealistic Line Drawing rendering
+from 3D scenes. It is designed as a programmable interface to allow
+maximum control over the style of the final drawing: the user
+"programs" how the silhouettes and other feature lines from the 3D
+model should be turned into stylized strokes using a set of
+programmable operators dedicated to style description. This
+programmable approach, inspired by the shading languages available in
+photorealistic renderers such as Pixar's RenderMan, overcomes the
+limitations of integrated software with access to a limited number of
+parameters and permits the design of an infinite variety of rich and
+complex styles. The system currently focuses on pure line drawing as a
+first step. The style description language is Python augmented with
+our set of operators.  Freestyle was developed in the framework of a
+research project dedicated to the study of stylized line drawing
+rendering from 3D scenes. Details about this research can be found at:
+
+http://artis.imag.fr/Projects/Style
+
+This software is distributed under
+the terms of the GPL License.
+
+INSTALL
+-------
+Please see the file INSTALL.TXT for instructions on installation.
+
+REQUIREMENTS
+------------
+- OpenGL        >= 1.2
+- libQGLViewer  = 2.2.5-1
+- lib3ds        = 1.2
+- Qt            = 4.2.3
+- SWIG          = 1.3.31
+- Python        = 2.5
+
+For Linux and MacOSX:
+- g++           = 4.0 or 4.1
+
+For Windows:
+- Visual Studio = 2003 or 2005
+
+CONTACTING THE AUTHORS
+----------------------
+See the AUTHORS.TXT file for contact information.
+
+Thank you for your interest in this project, we hope you enjoy using it.
+---
diff --git a/extern/freestyle/THANKS.TXT b/extern/freestyle/THANKS.TXT
new file mode 100755
index 00000000000..3147715a63f
--- /dev/null
+++ b/extern/freestyle/THANKS.TXT
@@ -0,0 +1,6 @@
+The following is an incomplete list of people that have contributed to this 
+project in some way or another, in no particular order...
+
+* Thomas Netter (lib3ds fix)
+* Gilles Debunne, creator and maintainer of the great libQGLViewer.
+* Mark Rose, for his work on the SWIG director feature, and his help.
diff --git a/extern/freestyle/TODO.TXT b/extern/freestyle/TODO.TXT
new file mode 100755
index 00000000000..2e24752e026
--- /dev/null
+++ b/extern/freestyle/TODO.TXT
@@ -0,0 +1,9 @@
+sgrabli:
+--------
+
+* Update help and make it display correctly
+* Recode the ViewMap building - the Y junctions are not detected for smooth objects right now.
+* Check the strokes strippification code. It seems some parts are inverted.
+* Fix the pbuffer so that ATI cards are supported
+
+* Merge Chain and Stroke classes (to Stroke) and improve the base of operators (select, chain, split, shade) consquently (also think about a way to easily specify the pipeline synchronization mode).
diff --git a/extern/freestyle/src/Config.pri b/extern/freestyle/src/Config.pri
new file mode 100755
index 00000000000..68763dba502
--- /dev/null
+++ b/extern/freestyle/src/Config.pri
@@ -0,0 +1,176 @@
+# This file should be viewed as a -*- mode: Makefile -*-
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#                 A p p l i c a t i o n   &   L i b r a r i e s               #
+#                    b u i l d    c o n f i g u r a t i o n                   #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+
+#
+# APPLICATION
+#
+#######################################
+
+APPNAME         = Freestyle
+APPVERSION_MAJ  = 2
+APPVERSION_MID  = 2
+APPVERSION_MIN  = 0
+APPVERSION      = $${APPVERSION_MAJ}.$${APPVERSION_MID}.$${APPVERSION_MIN}
+
+PYTHON_VERSION_MAJ = 2
+PYTHON_VERSION_MIN = 5
+
+LIB3DS_VERSION_MAJ = 1
+LIB3DS_VERSION_MIN = 30
+
+#
+# CONFIG
+#
+#######################################
+
+CONFIG		-= debug release ReleaseBuild Release build_pass precompile_header debug_and_release debug_and_release_target
+CONFIG            *= qt shared stl exceptions rtti thread
+CONFIG                  *= release # debug or release
+CONFIG                  *= warn_off # warn_off or warn_on
+mac:CONFIG 		+= x86
+#mac:CONFIG		+= ppc
+#mac:CONFIG		*= lib_bundle
+
+#mac:QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.4u.sdk
+#message($$CONFIG)
+#CONFIG                  *= static
+#CONFIG                  *= profiling
+
+
+
+QT += opengl
+
+#
+# LIBRARIES
+#
+#######################################
+
+debug{
+	LIB_GEOMETRY     = $${APPNAME}Geometry_d
+	LIB_IMAGE        = $${APPNAME}Image_d
+	LIB_RENDERING    = $${APPNAME}Rendering_d
+	LIB_SCENE_GRAPH  = $${APPNAME}SceneGraph_d
+	LIB_SYSTEM       = $${APPNAME}System_d
+	LIB_VIEW_MAP     = $${APPNAME}ViewMap_d
+	LIB_STROKE       = $${APPNAME}Stroke_d
+	LIB_WINGED_EDGE  = $${APPNAME}WingedEdge_d
+}else{
+	LIB_GEOMETRY     = $${APPNAME}Geometry
+	LIB_IMAGE        = $${APPNAME}Image
+	LIB_RENDERING    = $${APPNAME}Rendering
+	LIB_SCENE_GRAPH  = $${APPNAME}SceneGraph
+	LIB_SYSTEM       = $${APPNAME}System
+	LIB_VIEW_MAP     = $${APPNAME}ViewMap
+	LIB_STROKE       = $${APPNAME}Stroke
+	LIB_WINGED_EDGE  = $${APPNAME}WingedEdge
+}
+
+LIBVERSION	= $${APPVERSION_MAJ}.$${APPVERSION_MID}
+
+
+#
+# FLAGS
+#
+#######################################
+
+win32:QMAKE_CXXFLAGS     *= /GR /GX
+win32:QMAKE_CFLAGS       *= /GR /GX
+irix-n32:QMAKE_CFLAGS    *= -LANG:std
+irix-n32:QMAKE_CXXFLAGS  *= -LANG:std
+linux-g++:QMAKE_CFLAGS   *= -Wno-deprecated
+linux-g++:QMAKE_CXXFLAGS *= -Wno-deprecated
+cygwin-g++:QMAKE_CFLAGS   *= -Wno-deprecated
+cygwin-g++:QMAKE_CXXFLAGS *= -Wno-deprecated -mno-win32
+mac:QMAKE_CFLAGS         *= -Wno-deprecated
+mac:QMAKE_CXXFLAGS       *= -Wno-deprecated
+
+linux-g++:QMAKE_CFLAGS_RELEASE   = -O3 -funroll-loops -fomit-frame-pointer -ffast-math -march=i686
+linux-g++:QMAKE_CXXFLAGS_RELEASE = -O3 -funroll-loops -fomit-frame-pointer -ffast-math -march=i686
+cygwin-g++:QMAKE_CFLAGS_RELEASE   = -O3 -funroll-loops -fomit-frame-pointer -ffast-math -march=i686
+cygwin-g++:QMAKE_CXXFLAGS_RELEASE = -O3 -funroll-loops -fomit-frame-pointer -ffast-math -march=i686
+mac:QMAKE_CFLAGS_RELEASE         = -O3 -funroll-loops -fomit-frame-pointer -ffast-math -march=i686
+mac:QMAKE_CXXFLAGS_RELEASE       = -O3 -funroll-loops -fomit-frame-pointer -ffast-math -march=i686
+
+profiling {
+  linux-g++:QMAKE_CFLAGS_DEBUG   = -pg
+  linux-g++:QMAKE_CXXFLAGS_DEBUG = -pg
+  linux-g++:QMAKE_LFLAGS_DEBUG   = -pg
+  cygwin-g++:QMAKE_CFLAGS_DEBUG   = -pg
+  cygwin-g++:QMAKE_CXXFLAGS_DEBUG = -pg
+  cygwin-g++:QMAKE_LFLAGS_DEBUG   = -pg
+  mac:QMAKE_CFLAGS_DEBUG         = -pg
+  mac:QMAKE_CXXFLAGS_DEBUG       = -pg
+  mac:QMAKE_LFLAGS_DEBUG         = -pg
+}
+
+#
+# DEFINES
+#
+#######################################
+
+win32:DEFINES           *= WIN32 QT_DLL QT_THREAD_SUPPORT
+linux-g++:DEFINES       *= LINUX
+cygwin-g++:DEFINES      *= CYGWIN
+irix-n32:DEFINES        *= IRIX
+mac:DEFINES             *= MACOSX
+
+#
+# BUILD DIRECTORIES (RELATIVE)
+#
+#######################################
+
+release {
+  win32 {
+    REL_OBJECTS_DIR   = \\win32\\release\\obj
+    REL_DESTDIR       = \\win32\\release
+  }
+  linux-g++ {
+    REL_OBJECTS_DIR   = linux-g++/release/obj
+    REL_DESTDIR       = linux-g++/release
+  }
+  cygwin-g++ {
+    REL_OBJECTS_DIR   = cygwin-g++/release/obj
+    REL_DESTDIR       = cygwin-g++/release
+  }
+  irix-n32 {
+    REL_OBJECTS_DIR   = irix-n32/release/obj
+    REL_DESTDIR       = irix-n32/release
+  }
+  mac {
+    REL_OBJECTS_DIR   = macosx/release/obj
+    REL_DESTDIR       = macosx/release
+  }
+}
+debug {
+  win32 {
+    REL_OBJECTS_DIR   = \\win32\\debug\\obj
+    REL_DESTDIR       = \\win32\\debug
+  }
+  linux-g++ {
+    REL_OBJECTS_DIR   = linux-g++/debug/obj
+    REL_DESTDIR       = linux-g++/debug
+  }
+  cygwin-g++ {
+    REL_OBJECTS_DIR   = cygwin-g++/debug/obj
+    REL_DESTDIR       = cygwin-g++/debug
+  }
+  irix-n32 {
+    REL_OBJECTS_DIR   = irix-n32/debug/obj
+    REL_DESTDIR       = irix-n32/debug
+  }
+  mac {
+    REL_OBJECTS_DIR   = macosx/debug/obj
+    REL_DESTDIR       = macosx/debug
+  }
+}
+
+#
+# INSTALL
+#
+#######################################
+
+#QMAKE_COPY_FILE       = $${QMAKE_COPY} -P
diff --git a/extern/freestyle/src/Freestyle-vc7-debug.sln b/extern/freestyle/src/Freestyle-vc7-debug.sln
new file mode 100755
index 00000000000..937f3f9faf9
--- /dev/null
+++ b/extern/freestyle/src/Freestyle-vc7-debug.sln
@@ -0,0 +1,113 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Freestyle_d", "app\app_d.vcproj", "{0BC94A80-9E3E-40D8-B2CF-6594F96361C5}"
+	ProjectSection(ProjectDependencies) = postProject
+		{DFCED64E-AEFA-4D06-8609-DE23A69D0361} = {DFCED64E-AEFA-4D06-8609-DE23A69D0361}
+		{AF37DD50-8CD3-4339-AB32-C6F8F770CB30} = {AF37DD50-8CD3-4339-AB32-C6F8F770CB30}
+		{FA76B552-8A89-4A50-92F7-A77935515005} = {FA76B552-8A89-4A50-92F7-A77935515005}
+		{3E1C0A57-8206-402F-A12E-3B100F121DDE} = {3E1C0A57-8206-402F-A12E-3B100F121DDE}
+		{9F2B9C57-F57F-4A8A-9590-6DDD1E51433C} = {9F2B9C57-F57F-4A8A-9590-6DDD1E51433C}
+		{4C44396A-8016-4360-8F5C-35CA6CC282BD} = {4C44396A-8016-4360-8F5C-35CA6CC282BD}
+		{AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A} = {AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A}
+		{858093EF-6B95-4D0F-AA0A-CF187C6F369F} = {858093EF-6B95-4D0F-AA0A-CF187C6F369F}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleGeometry_d", "geometry\geometry_d.vcproj", "{3E1C0A57-8206-402F-A12E-3B100F121DDE}"
+	ProjectSection(ProjectDependencies) = postProject
+		{AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A} = {AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleImage_d", "image\image_d.vcproj", "{4C44396A-8016-4360-8F5C-35CA6CC282BD}"
+	ProjectSection(ProjectDependencies) = postProject
+		{AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A} = {AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleRendering_d", "rendering\rendering_d.vcproj", "{9F2B9C57-F57F-4A8A-9590-6DDD1E51433C}"
+	ProjectSection(ProjectDependencies) = postProject
+		{DFCED64E-AEFA-4D06-8609-DE23A69D0361} = {DFCED64E-AEFA-4D06-8609-DE23A69D0361}
+		{3E1C0A57-8206-402F-A12E-3B100F121DDE} = {3E1C0A57-8206-402F-A12E-3B100F121DDE}
+		{AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A} = {AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A}
+		{858093EF-6B95-4D0F-AA0A-CF187C6F369F} = {858093EF-6B95-4D0F-AA0A-CF187C6F369F}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleSceneGraph_d", "scene_graph\scene_graph_d.vcproj", "{858093EF-6B95-4D0F-AA0A-CF187C6F369F}"
+	ProjectSection(ProjectDependencies) = postProject
+		{3E1C0A57-8206-402F-A12E-3B100F121DDE} = {3E1C0A57-8206-402F-A12E-3B100F121DDE}
+		{AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A} = {AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleStroke_d", "stroke\stroke_d.vcproj", "{DFCED64E-AEFA-4D06-8609-DE23A69D0361}"
+	ProjectSection(ProjectDependencies) = postProject
+		{FA76B552-8A89-4A50-92F7-A77935515005} = {FA76B552-8A89-4A50-92F7-A77935515005}
+		{3E1C0A57-8206-402F-A12E-3B100F121DDE} = {3E1C0A57-8206-402F-A12E-3B100F121DDE}
+		{AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A} = {AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleSystem_d", "system\system_d.vcproj", "{AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleViewMap_d", "view_map\view_map_d.vcproj", "{FA76B552-8A89-4A50-92F7-A77935515005}"
+	ProjectSection(ProjectDependencies) = postProject
+		{AF37DD50-8CD3-4339-AB32-C6F8F770CB30} = {AF37DD50-8CD3-4339-AB32-C6F8F770CB30}
+		{3E1C0A57-8206-402F-A12E-3B100F121DDE} = {3E1C0A57-8206-402F-A12E-3B100F121DDE}
+		{4C44396A-8016-4360-8F5C-35CA6CC282BD} = {4C44396A-8016-4360-8F5C-35CA6CC282BD}
+		{AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A} = {AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleWingedEdge_d", "winged_edge\winged_edge_d.vcproj", "{AF37DD50-8CD3-4339-AB32-C6F8F770CB30}"
+	ProjectSection(ProjectDependencies) = postProject
+		{3E1C0A57-8206-402F-A12E-3B100F121DDE} = {3E1C0A57-8206-402F-A12E-3B100F121DDE}
+		{AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A} = {AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A}
+		{858093EF-6B95-4D0F-AA0A-CF187C6F369F} = {858093EF-6B95-4D0F-AA0A-CF187C6F369F}
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		Release = Release
+	EndGlobalSection
+	GlobalSection(ProjectDependencies) = postSolution
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{0BC94A80-9E3E-40D8-B2CF-6594F96361C5}.Debug.ActiveCfg = Debug|Win32
+		{0BC94A80-9E3E-40D8-B2CF-6594F96361C5}.Debug.Build.0 = Debug|Win32
+		{0BC94A80-9E3E-40D8-B2CF-6594F96361C5}.Release.ActiveCfg = Debug|Win32
+		{0BC94A80-9E3E-40D8-B2CF-6594F96361C5}.Release.Build.0 = Debug|Win32
+		{3E1C0A57-8206-402F-A12E-3B100F121DDE}.Debug.ActiveCfg = Debug|Win32
+		{3E1C0A57-8206-402F-A12E-3B100F121DDE}.Debug.Build.0 = Debug|Win32
+		{3E1C0A57-8206-402F-A12E-3B100F121DDE}.Release.ActiveCfg = Debug|Win32
+		{3E1C0A57-8206-402F-A12E-3B100F121DDE}.Release.Build.0 = Debug|Win32
+		{4C44396A-8016-4360-8F5C-35CA6CC282BD}.Debug.ActiveCfg = Debug|Win32
+		{4C44396A-8016-4360-8F5C-35CA6CC282BD}.Debug.Build.0 = Debug|Win32
+		{4C44396A-8016-4360-8F5C-35CA6CC282BD}.Release.ActiveCfg = Debug|Win32
+		{4C44396A-8016-4360-8F5C-35CA6CC282BD}.Release.Build.0 = Debug|Win32
+		{9F2B9C57-F57F-4A8A-9590-6DDD1E51433C}.Debug.ActiveCfg = Debug|Win32
+		{9F2B9C57-F57F-4A8A-9590-6DDD1E51433C}.Debug.Build.0 = Debug|Win32
+		{9F2B9C57-F57F-4A8A-9590-6DDD1E51433C}.Release.ActiveCfg = Debug|Win32
+		{9F2B9C57-F57F-4A8A-9590-6DDD1E51433C}.Release.Build.0 = Debug|Win32
+		{858093EF-6B95-4D0F-AA0A-CF187C6F369F}.Debug.ActiveCfg = Debug|Win32
+		{858093EF-6B95-4D0F-AA0A-CF187C6F369F}.Debug.Build.0 = Debug|Win32
+		{858093EF-6B95-4D0F-AA0A-CF187C6F369F}.Release.ActiveCfg = Debug|Win32
+		{858093EF-6B95-4D0F-AA0A-CF187C6F369F}.Release.Build.0 = Debug|Win32
+		{DFCED64E-AEFA-4D06-8609-DE23A69D0361}.Debug.ActiveCfg = Debug|Win32
+		{DFCED64E-AEFA-4D06-8609-DE23A69D0361}.Debug.Build.0 = Debug|Win32
+		{DFCED64E-AEFA-4D06-8609-DE23A69D0361}.Release.ActiveCfg = Debug|Win32
+		{DFCED64E-AEFA-4D06-8609-DE23A69D0361}.Release.Build.0 = Debug|Win32
+		{AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A}.Debug.ActiveCfg = Debug|Win32
+		{AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A}.Debug.Build.0 = Debug|Win32
+		{AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A}.Release.ActiveCfg = Debug|Win32
+		{AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A}.Release.Build.0 = Debug|Win32
+		{FA76B552-8A89-4A50-92F7-A77935515005}.Debug.ActiveCfg = Debug|Win32
+		{FA76B552-8A89-4A50-92F7-A77935515005}.Debug.Build.0 = Debug|Win32
+		{FA76B552-8A89-4A50-92F7-A77935515005}.Release.ActiveCfg = Release|Win32
+		{FA76B552-8A89-4A50-92F7-A77935515005}.Release.Build.0 = Release|Win32
+		{AF37DD50-8CD3-4339-AB32-C6F8F770CB30}.Debug.ActiveCfg = Debug|Win32
+		{AF37DD50-8CD3-4339-AB32-C6F8F770CB30}.Debug.Build.0 = Debug|Win32
+		{AF37DD50-8CD3-4339-AB32-C6F8F770CB30}.Release.ActiveCfg = Debug|Win32
+		{AF37DD50-8CD3-4339-AB32-C6F8F770CB30}.Release.Build.0 = Debug|Win32
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal
diff --git a/extern/freestyle/src/Freestyle-vc7-release.sln b/extern/freestyle/src/Freestyle-vc7-release.sln
new file mode 100755
index 00000000000..74d5dc77f86
--- /dev/null
+++ b/extern/freestyle/src/Freestyle-vc7-release.sln
@@ -0,0 +1,111 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Freestyle", "app\app.vcproj", "{0BC94A80-9E3E-40D8-B2CF-6594F96361C5}"
+	ProjectSection(ProjectDependencies) = postProject
+		{DFCED64E-AEFA-4D06-8609-DE23A69D0361} = {DFCED64E-AEFA-4D06-8609-DE23A69D0361}
+		{AF37DD50-8CD3-4339-AB32-C6F8F770CB30} = {AF37DD50-8CD3-4339-AB32-C6F8F770CB30}
+		{FA76B552-8A89-4A50-92F7-A77935515005} = {FA76B552-8A89-4A50-92F7-A77935515005}
+		{3E1C0A57-8206-402F-A12E-3B100F121DDE} = {3E1C0A57-8206-402F-A12E-3B100F121DDE}
+		{9F2B9C57-F57F-4A8A-9590-6DDD1E51433C} = {9F2B9C57-F57F-4A8A-9590-6DDD1E51433C}
+		{4C44396A-8016-4360-8F5C-35CA6CC282BD} = {4C44396A-8016-4360-8F5C-35CA6CC282BD}
+		{AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A} = {AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A}
+		{858093EF-6B95-4D0F-AA0A-CF187C6F369F} = {858093EF-6B95-4D0F-AA0A-CF187C6F369F}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleGeometry", "geometry\geometry.vcproj", "{3E1C0A57-8206-402F-A12E-3B100F121DDE}"
+	ProjectSection(ProjectDependencies) = postProject
+		{AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A} = {AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleImage", "image\image.vcproj", "{4C44396A-8016-4360-8F5C-35CA6CC282BD}"
+	ProjectSection(ProjectDependencies) = postProject
+		{AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A} = {AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleRendering", "rendering\rendering.vcproj", "{9F2B9C57-F57F-4A8A-9590-6DDD1E51433C}"
+	ProjectSection(ProjectDependencies) = postProject
+		{DFCED64E-AEFA-4D06-8609-DE23A69D0361} = {DFCED64E-AEFA-4D06-8609-DE23A69D0361}
+		{3E1C0A57-8206-402F-A12E-3B100F121DDE} = {3E1C0A57-8206-402F-A12E-3B100F121DDE}
+		{AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A} = {AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A}
+		{858093EF-6B95-4D0F-AA0A-CF187C6F369F} = {858093EF-6B95-4D0F-AA0A-CF187C6F369F}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleSceneGraph", "scene_graph\scene_graph.vcproj", "{858093EF-6B95-4D0F-AA0A-CF187C6F369F}"
+	ProjectSection(ProjectDependencies) = postProject
+		{3E1C0A57-8206-402F-A12E-3B100F121DDE} = {3E1C0A57-8206-402F-A12E-3B100F121DDE}
+		{AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A} = {AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleStroke", "stroke\stroke.vcproj", "{DFCED64E-AEFA-4D06-8609-DE23A69D0361}"
+	ProjectSection(ProjectDependencies) = postProject
+		{FA76B552-8A89-4A50-92F7-A77935515005} = {FA76B552-8A89-4A50-92F7-A77935515005}
+		{3E1C0A57-8206-402F-A12E-3B100F121DDE} = {3E1C0A57-8206-402F-A12E-3B100F121DDE}
+		{AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A} = {AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleSystem", "system\system.vcproj", "{AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleViewMap", "view_map\view_map.vcproj", "{FA76B552-8A89-4A50-92F7-A77935515005}"
+	ProjectSection(ProjectDependencies) = postProject
+		{AF37DD50-8CD3-4339-AB32-C6F8F770CB30} = {AF37DD50-8CD3-4339-AB32-C6F8F770CB30}
+		{3E1C0A57-8206-402F-A12E-3B100F121DDE} = {3E1C0A57-8206-402F-A12E-3B100F121DDE}
+		{4C44396A-8016-4360-8F5C-35CA6CC282BD} = {4C44396A-8016-4360-8F5C-35CA6CC282BD}
+		{AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A} = {AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleWingedEdge", "winged_edge\winged_edge.vcproj", "{AF37DD50-8CD3-4339-AB32-C6F8F770CB30}"
+	ProjectSection(ProjectDependencies) = postProject
+		{3E1C0A57-8206-402F-A12E-3B100F121DDE} = {3E1C0A57-8206-402F-A12E-3B100F121DDE}
+		{AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A} = {AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A}
+		{858093EF-6B95-4D0F-AA0A-CF187C6F369F} = {858093EF-6B95-4D0F-AA0A-CF187C6F369F}
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		Release = Release
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{0BC94A80-9E3E-40D8-B2CF-6594F96361C5}.Debug.ActiveCfg = Debug|Win32
+		{0BC94A80-9E3E-40D8-B2CF-6594F96361C5}.Debug.Build.0 = Debug|Win32
+		{0BC94A80-9E3E-40D8-B2CF-6594F96361C5}.Release.ActiveCfg = Release|Win32
+		{0BC94A80-9E3E-40D8-B2CF-6594F96361C5}.Release.Build.0 = Release|Win32
+		{3E1C0A57-8206-402F-A12E-3B100F121DDE}.Debug.ActiveCfg = Debug|Win32
+		{3E1C0A57-8206-402F-A12E-3B100F121DDE}.Debug.Build.0 = Debug|Win32
+		{3E1C0A57-8206-402F-A12E-3B100F121DDE}.Release.ActiveCfg = Release|Win32
+		{3E1C0A57-8206-402F-A12E-3B100F121DDE}.Release.Build.0 = Release|Win32
+		{4C44396A-8016-4360-8F5C-35CA6CC282BD}.Debug.ActiveCfg = Debug|Win32
+		{4C44396A-8016-4360-8F5C-35CA6CC282BD}.Debug.Build.0 = Debug|Win32
+		{4C44396A-8016-4360-8F5C-35CA6CC282BD}.Release.ActiveCfg = Release|Win32
+		{4C44396A-8016-4360-8F5C-35CA6CC282BD}.Release.Build.0 = Release|Win32
+		{9F2B9C57-F57F-4A8A-9590-6DDD1E51433C}.Debug.ActiveCfg = Debug|Win32
+		{9F2B9C57-F57F-4A8A-9590-6DDD1E51433C}.Debug.Build.0 = Debug|Win32
+		{9F2B9C57-F57F-4A8A-9590-6DDD1E51433C}.Release.ActiveCfg = Release|Win32
+		{9F2B9C57-F57F-4A8A-9590-6DDD1E51433C}.Release.Build.0 = Release|Win32
+		{858093EF-6B95-4D0F-AA0A-CF187C6F369F}.Debug.ActiveCfg = Debug|Win32
+		{858093EF-6B95-4D0F-AA0A-CF187C6F369F}.Debug.Build.0 = Debug|Win32
+		{858093EF-6B95-4D0F-AA0A-CF187C6F369F}.Release.ActiveCfg = Release|Win32
+		{858093EF-6B95-4D0F-AA0A-CF187C6F369F}.Release.Build.0 = Release|Win32
+		{DFCED64E-AEFA-4D06-8609-DE23A69D0361}.Debug.ActiveCfg = Debug|Win32
+		{DFCED64E-AEFA-4D06-8609-DE23A69D0361}.Debug.Build.0 = Debug|Win32
+		{DFCED64E-AEFA-4D06-8609-DE23A69D0361}.Release.ActiveCfg = Release|Win32
+		{DFCED64E-AEFA-4D06-8609-DE23A69D0361}.Release.Build.0 = Release|Win32
+		{AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A}.Debug.ActiveCfg = Debug|Win32
+		{AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A}.Debug.Build.0 = Debug|Win32
+		{AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A}.Release.ActiveCfg = Release|Win32
+		{AE79BAD6-6F46-4AA1-BBEA-28CC209FC28A}.Release.Build.0 = Release|Win32
+		{FA76B552-8A89-4A50-92F7-A77935515005}.Debug.ActiveCfg = Debug|Win32
+		{FA76B552-8A89-4A50-92F7-A77935515005}.Debug.Build.0 = Debug|Win32
+		{FA76B552-8A89-4A50-92F7-A77935515005}.Release.ActiveCfg = Release|Win32
+		{FA76B552-8A89-4A50-92F7-A77935515005}.Release.Build.0 = Release|Win32
+		{AF37DD50-8CD3-4339-AB32-C6F8F770CB30}.Debug.ActiveCfg = Debug|Win32
+		{AF37DD50-8CD3-4339-AB32-C6F8F770CB30}.Debug.Build.0 = Debug|Win32
+		{AF37DD50-8CD3-4339-AB32-C6F8F770CB30}.Release.ActiveCfg = Release|Win32
+		{AF37DD50-8CD3-4339-AB32-C6F8F770CB30}.Release.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal
diff --git a/extern/freestyle/src/Freestyle-vc8-debug.sln b/extern/freestyle/src/Freestyle-vc8-debug.sln
new file mode 100755
index 00000000000..097ca30a174
--- /dev/null
+++ b/extern/freestyle/src/Freestyle-vc8-debug.sln
@@ -0,0 +1,87 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual C++ Express 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleSystem_d", "system\system_d.vcproj", "{AAAAA9BB-8C01-3BC3-9808-AB6717F08393}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleGeometry_d", "geometry\geometry_d.vcproj", "{5F60164C-8544-3259-A8CB-24636A092489}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleImage_d", "image\image_d.vcproj", "{28F6AC11-2A9B-3886-97DD-82FB353409CB}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleSceneGraph_d", "scene_graph\scene_graph_d.vcproj", "{C98C60D8-9836-30A5-BEA9-0D320E5AF308}"
+	ProjectSection(ProjectDependencies) = postProject
+		{AAAAA9BB-8C01-3BC3-9808-AB6717F08393} = {AAAAA9BB-8C01-3BC3-9808-AB6717F08393}
+		{5F60164C-8544-3259-A8CB-24636A092489} = {5F60164C-8544-3259-A8CB-24636A092489}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleWingedEdge_d", "winged_edge\winged_edge_d.vcproj", "{E46825D6-9581-3D8A-96FE-7C90BC188602}"
+	ProjectSection(ProjectDependencies) = postProject
+		{5F60164C-8544-3259-A8CB-24636A092489} = {5F60164C-8544-3259-A8CB-24636A092489}
+		{AAAAA9BB-8C01-3BC3-9808-AB6717F08393} = {AAAAA9BB-8C01-3BC3-9808-AB6717F08393}
+		{C98C60D8-9836-30A5-BEA9-0D320E5AF308} = {C98C60D8-9836-30A5-BEA9-0D320E5AF308}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleViewMap_d", "view_map\view_map_d.vcproj", "{6769BAB7-2894-3453-B07A-58C32D6646E3}"
+	ProjectSection(ProjectDependencies) = postProject
+		{C98C60D8-9836-30A5-BEA9-0D320E5AF308} = {C98C60D8-9836-30A5-BEA9-0D320E5AF308}
+		{E46825D6-9581-3D8A-96FE-7C90BC188602} = {E46825D6-9581-3D8A-96FE-7C90BC188602}
+		{AAAAA9BB-8C01-3BC3-9808-AB6717F08393} = {AAAAA9BB-8C01-3BC3-9808-AB6717F08393}
+		{5F60164C-8544-3259-A8CB-24636A092489} = {5F60164C-8544-3259-A8CB-24636A092489}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleStroke_d", "stroke\stroke_d.vcproj", "{EDA5F096-B8D0-336F-82DB-501B2F00C1CD}"
+	ProjectSection(ProjectDependencies) = postProject
+		{5F60164C-8544-3259-A8CB-24636A092489} = {5F60164C-8544-3259-A8CB-24636A092489}
+		{6769BAB7-2894-3453-B07A-58C32D6646E3} = {6769BAB7-2894-3453-B07A-58C32D6646E3}
+		{AAAAA9BB-8C01-3BC3-9808-AB6717F08393} = {AAAAA9BB-8C01-3BC3-9808-AB6717F08393}
+		{E46825D6-9581-3D8A-96FE-7C90BC188602} = {E46825D6-9581-3D8A-96FE-7C90BC188602}
+		{C98C60D8-9836-30A5-BEA9-0D320E5AF308} = {C98C60D8-9836-30A5-BEA9-0D320E5AF308}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleRendering_d", "rendering\rendering_d.vcproj", "{D5EA771F-A1FF-3F68-A391-98EEEB407E78}"
+	ProjectSection(ProjectDependencies) = postProject
+		{5F60164C-8544-3259-A8CB-24636A092489} = {5F60164C-8544-3259-A8CB-24636A092489}
+		{EDA5F096-B8D0-336F-82DB-501B2F00C1CD} = {EDA5F096-B8D0-336F-82DB-501B2F00C1CD}
+		{AAAAA9BB-8C01-3BC3-9808-AB6717F08393} = {AAAAA9BB-8C01-3BC3-9808-AB6717F08393}
+		{C98C60D8-9836-30A5-BEA9-0D320E5AF308} = {C98C60D8-9836-30A5-BEA9-0D320E5AF308}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Freestyle_d", "app\app_d.vcproj", "{606D6459-D5F6-3A09-8962-50E8551545AB}"
+	ProjectSection(ProjectDependencies) = postProject
+		{C98C60D8-9836-30A5-BEA9-0D320E5AF308} = {C98C60D8-9836-30A5-BEA9-0D320E5AF308}
+		{E46825D6-9581-3D8A-96FE-7C90BC188602} = {E46825D6-9581-3D8A-96FE-7C90BC188602}
+		{AAAAA9BB-8C01-3BC3-9808-AB6717F08393} = {AAAAA9BB-8C01-3BC3-9808-AB6717F08393}
+		{6769BAB7-2894-3453-B07A-58C32D6646E3} = {6769BAB7-2894-3453-B07A-58C32D6646E3}
+		{EDA5F096-B8D0-336F-82DB-501B2F00C1CD} = {EDA5F096-B8D0-336F-82DB-501B2F00C1CD}
+		{5F60164C-8544-3259-A8CB-24636A092489} = {5F60164C-8544-3259-A8CB-24636A092489}
+		{D5EA771F-A1FF-3F68-A391-98EEEB407E78} = {D5EA771F-A1FF-3F68-A391-98EEEB407E78}
+		{28F6AC11-2A9B-3886-97DD-82FB353409CB} = {28F6AC11-2A9B-3886-97DD-82FB353409CB}
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{AAAAA9BB-8C01-3BC3-9808-AB6717F08393}.Debug|Win32.ActiveCfg = Debug|Win32
+		{AAAAA9BB-8C01-3BC3-9808-AB6717F08393}.Debug|Win32.Build.0 = Debug|Win32
+		{5F60164C-8544-3259-A8CB-24636A092489}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5F60164C-8544-3259-A8CB-24636A092489}.Debug|Win32.Build.0 = Debug|Win32
+		{28F6AC11-2A9B-3886-97DD-82FB353409CB}.Debug|Win32.ActiveCfg = Debug|Win32
+		{28F6AC11-2A9B-3886-97DD-82FB353409CB}.Debug|Win32.Build.0 = Debug|Win32
+		{C98C60D8-9836-30A5-BEA9-0D320E5AF308}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C98C60D8-9836-30A5-BEA9-0D320E5AF308}.Debug|Win32.Build.0 = Debug|Win32
+		{E46825D6-9581-3D8A-96FE-7C90BC188602}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E46825D6-9581-3D8A-96FE-7C90BC188602}.Debug|Win32.Build.0 = Debug|Win32
+		{6769BAB7-2894-3453-B07A-58C32D6646E3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6769BAB7-2894-3453-B07A-58C32D6646E3}.Debug|Win32.Build.0 = Debug|Win32
+		{EDA5F096-B8D0-336F-82DB-501B2F00C1CD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EDA5F096-B8D0-336F-82DB-501B2F00C1CD}.Debug|Win32.Build.0 = Debug|Win32
+		{D5EA771F-A1FF-3F68-A391-98EEEB407E78}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D5EA771F-A1FF-3F68-A391-98EEEB407E78}.Debug|Win32.Build.0 = Debug|Win32
+		{606D6459-D5F6-3A09-8962-50E8551545AB}.Debug|Win32.ActiveCfg = Debug|Win32
+		{606D6459-D5F6-3A09-8962-50E8551545AB}.Debug|Win32.Build.0 = Debug|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/extern/freestyle/src/Freestyle-vc8-release.sln b/extern/freestyle/src/Freestyle-vc8-release.sln
new file mode 100755
index 00000000000..82b22ff0c3e
--- /dev/null
+++ b/extern/freestyle/src/Freestyle-vc8-release.sln
@@ -0,0 +1,87 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual C++ Express 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Freestyle", "app\app.vcproj", "{B56F2464-158F-32C1-A9F7-EE85397706EC}"
+	ProjectSection(ProjectDependencies) = postProject
+		{555B73B2-B07B-3865-9D41-0FB69091E0C9} = {555B73B2-B07B-3865-9D41-0FB69091E0C9}
+		{F6589FA0-9FA2-31F9-BD0F-FFE303DE8759} = {F6589FA0-9FA2-31F9-BD0F-FFE303DE8759}
+		{9A93A87D-09E4-3492-A68C-A7B1A38DE002} = {9A93A87D-09E4-3492-A68C-A7B1A38DE002}
+		{3804962B-1D5B-382E-B69E-96FFB2372A46} = {3804962B-1D5B-382E-B69E-96FFB2372A46}
+		{A494B81F-F5EC-35DE-8DDC-4F6FD6B536D5} = {A494B81F-F5EC-35DE-8DDC-4F6FD6B536D5}
+		{35891119-E049-35BB-AB8E-8536817F5CEE} = {35891119-E049-35BB-AB8E-8536817F5CEE}
+		{0FDD8610-0785-3089-900D-53F786E9AC9B} = {0FDD8610-0785-3089-900D-53F786E9AC9B}
+		{1D57A40D-AE4B-3E40-A023-4F37C9D7446C} = {1D57A40D-AE4B-3E40-A023-4F37C9D7446C}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleGeometry", "geometry\geometry.vcproj", "{1D57A40D-AE4B-3E40-A023-4F37C9D7446C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleImage", "image\image.vcproj", "{A494B81F-F5EC-35DE-8DDC-4F6FD6B536D5}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleRendering", "rendering\rendering.vcproj", "{0FDD8610-0785-3089-900D-53F786E9AC9B}"
+	ProjectSection(ProjectDependencies) = postProject
+		{1D57A40D-AE4B-3E40-A023-4F37C9D7446C} = {1D57A40D-AE4B-3E40-A023-4F37C9D7446C}
+		{35891119-E049-35BB-AB8E-8536817F5CEE} = {35891119-E049-35BB-AB8E-8536817F5CEE}
+		{3804962B-1D5B-382E-B69E-96FFB2372A46} = {3804962B-1D5B-382E-B69E-96FFB2372A46}
+		{9A93A87D-09E4-3492-A68C-A7B1A38DE002} = {9A93A87D-09E4-3492-A68C-A7B1A38DE002}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleSceneGraph", "scene_graph\scene_graph.vcproj", "{35891119-E049-35BB-AB8E-8536817F5CEE}"
+	ProjectSection(ProjectDependencies) = postProject
+		{3804962B-1D5B-382E-B69E-96FFB2372A46} = {3804962B-1D5B-382E-B69E-96FFB2372A46}
+		{1D57A40D-AE4B-3E40-A023-4F37C9D7446C} = {1D57A40D-AE4B-3E40-A023-4F37C9D7446C}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleStroke", "stroke\stroke.vcproj", "{9A93A87D-09E4-3492-A68C-A7B1A38DE002}"
+	ProjectSection(ProjectDependencies) = postProject
+		{1D57A40D-AE4B-3E40-A023-4F37C9D7446C} = {1D57A40D-AE4B-3E40-A023-4F37C9D7446C}
+		{35891119-E049-35BB-AB8E-8536817F5CEE} = {35891119-E049-35BB-AB8E-8536817F5CEE}
+		{3804962B-1D5B-382E-B69E-96FFB2372A46} = {3804962B-1D5B-382E-B69E-96FFB2372A46}
+		{F6589FA0-9FA2-31F9-BD0F-FFE303DE8759} = {F6589FA0-9FA2-31F9-BD0F-FFE303DE8759}
+		{555B73B2-B07B-3865-9D41-0FB69091E0C9} = {555B73B2-B07B-3865-9D41-0FB69091E0C9}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleSystem", "system\system.vcproj", "{3804962B-1D5B-382E-B69E-96FFB2372A46}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleViewMap", "view_map\view_map.vcproj", "{F6589FA0-9FA2-31F9-BD0F-FFE303DE8759}"
+	ProjectSection(ProjectDependencies) = postProject
+		{555B73B2-B07B-3865-9D41-0FB69091E0C9} = {555B73B2-B07B-3865-9D41-0FB69091E0C9}
+		{3804962B-1D5B-382E-B69E-96FFB2372A46} = {3804962B-1D5B-382E-B69E-96FFB2372A46}
+		{35891119-E049-35BB-AB8E-8536817F5CEE} = {35891119-E049-35BB-AB8E-8536817F5CEE}
+		{1D57A40D-AE4B-3E40-A023-4F37C9D7446C} = {1D57A40D-AE4B-3E40-A023-4F37C9D7446C}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreestyleWingedEdge", "winged_edge\winged_edge.vcproj", "{555B73B2-B07B-3865-9D41-0FB69091E0C9}"
+	ProjectSection(ProjectDependencies) = postProject
+		{1D57A40D-AE4B-3E40-A023-4F37C9D7446C} = {1D57A40D-AE4B-3E40-A023-4F37C9D7446C}
+		{35891119-E049-35BB-AB8E-8536817F5CEE} = {35891119-E049-35BB-AB8E-8536817F5CEE}
+		{3804962B-1D5B-382E-B69E-96FFB2372A46} = {3804962B-1D5B-382E-B69E-96FFB2372A46}
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{B56F2464-158F-32C1-A9F7-EE85397706EC}.Release|Win32.ActiveCfg = Release|Win32
+		{B56F2464-158F-32C1-A9F7-EE85397706EC}.Release|Win32.Build.0 = Release|Win32
+		{1D57A40D-AE4B-3E40-A023-4F37C9D7446C}.Release|Win32.ActiveCfg = Release|Win32
+		{1D57A40D-AE4B-3E40-A023-4F37C9D7446C}.Release|Win32.Build.0 = Release|Win32
+		{A494B81F-F5EC-35DE-8DDC-4F6FD6B536D5}.Release|Win32.ActiveCfg = Release|Win32
+		{A494B81F-F5EC-35DE-8DDC-4F6FD6B536D5}.Release|Win32.Build.0 = Release|Win32
+		{0FDD8610-0785-3089-900D-53F786E9AC9B}.Release|Win32.ActiveCfg = Release|Win32
+		{0FDD8610-0785-3089-900D-53F786E9AC9B}.Release|Win32.Build.0 = Release|Win32
+		{35891119-E049-35BB-AB8E-8536817F5CEE}.Release|Win32.ActiveCfg = Release|Win32
+		{35891119-E049-35BB-AB8E-8536817F5CEE}.Release|Win32.Build.0 = Release|Win32
+		{9A93A87D-09E4-3492-A68C-A7B1A38DE002}.Release|Win32.ActiveCfg = Release|Win32
+		{9A93A87D-09E4-3492-A68C-A7B1A38DE002}.Release|Win32.Build.0 = Release|Win32
+		{3804962B-1D5B-382E-B69E-96FFB2372A46}.Release|Win32.ActiveCfg = Release|Win32
+		{3804962B-1D5B-382E-B69E-96FFB2372A46}.Release|Win32.Build.0 = Release|Win32
+		{F6589FA0-9FA2-31F9-BD0F-FFE303DE8759}.Release|Win32.ActiveCfg = Release|Win32
+		{F6589FA0-9FA2-31F9-BD0F-FFE303DE8759}.Release|Win32.Build.0 = Release|Win32
+		{555B73B2-B07B-3865-9D41-0FB69091E0C9}.Release|Win32.ActiveCfg = Release|Win32
+		{555B73B2-B07B-3865-9D41-0FB69091E0C9}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/extern/freestyle/src/Makefile.pro b/extern/freestyle/src/Makefile.pro
new file mode 100755
index 00000000000..0e64bb342c3
--- /dev/null
+++ b/extern/freestyle/src/Makefile.pro
@@ -0,0 +1,18 @@
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#			      W A R N I N G ! ! !                             #
+#             a u t h o r i z e d    p e r s o n a l    o n l y               #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+
+TEMPLATE = subdirs
+SUBDIRS  = system \
+           image \
+           geometry \
+           scene_graph \
+           winged_edge \
+           view_map \
+           stroke \
+           rendering \
+#          swig \
+           app
+
+
diff --git a/extern/freestyle/src/app/AppAboutWindow.cpp b/extern/freestyle/src/app/AppAboutWindow.cpp
new file mode 100755
index 00000000000..d20e3f4e1ac
--- /dev/null
+++ b/extern/freestyle/src/app/AppAboutWindow.cpp
@@ -0,0 +1,36 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include <qmessagebox.h>
+#include "AppConfig.h"
+#include "AppAboutWindow.h"
+
+void AppAboutWindow::display() {
+  QMessageBox* mb;
+  
+  mb = new QMessageBox("About " + Config::APPLICATION_NAME,
+						Config::ABOUT_STRING,
+						QMessageBox::NoIcon,
+                        QMessageBox::Ok | QMessageBox::Default, QMessageBox::NoButton, QMessageBox::NoButton,
+						NULL,
+						(Qt::WFlags)(Qt::Dialog | Qt::MSWindowsFixedSizeDialogHint | Qt::WA_DeleteOnClose));
+  mb->show();
+}
diff --git a/extern/freestyle/src/app/AppAboutWindow.h b/extern/freestyle/src/app/AppAboutWindow.h
new file mode 100755
index 00000000000..ee04d27ae71
--- /dev/null
+++ b/extern/freestyle/src/app/AppAboutWindow.h
@@ -0,0 +1,40 @@
+//
+//  Filename         : AppAboutWindow.h
+//  Author           : Emmanuel Turquin
+//  Purpose          : Class to display a "About" window
+//  Date of creation : 13/06/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  APPABOUTWINDOWS_H
+# define APPABOUTWINDOWS_H
+
+class AppAboutWindow
+{
+ public:
+
+  static void display();
+};
+
+#endif // APPABOUTWINDOWS_H
diff --git a/extern/freestyle/src/app/AppCanvas.cpp b/extern/freestyle/src/app/AppCanvas.cpp
new file mode 100755
index 00000000000..60d36880c12
--- /dev/null
+++ b/extern/freestyle/src/app/AppCanvas.cpp
@@ -0,0 +1,404 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "AppGLWidget.h"
+#include "../image/Image.h"
+#include "../system/TimeStamp.h"
+#include "Controller.h"
+#include "../stroke/StrokeRenderer.h"
+#include "AppCanvas.h"
+#include "../rendering/GLRenderer.h"
+#include "../rendering/GLStrokeRenderer.h"
+#include "../rendering/GLUtils.h"
+#include "AppConfig.h"
+#include <QImage>
+
+#ifdef WIN32
+# include <windows.h>
+# include "../rendering/extgl.h"
+#endif
+#ifdef __MACH__
+# include <OpenGL/gl.h>
+#else
+# include <GL/gl.h>
+#endif
+
+AppCanvas::AppCanvas()
+:Canvas()
+{
+  _pViewer = 0;
+  _blendEquation = true;
+  _MapsPath = (const char*)(Config::Path::getInstance()->getMapsDir().toAscii().data());
+}
+
+AppCanvas::AppCanvas(AppGLWidget* iViewer)
+:Canvas()
+{
+  _pViewer = iViewer;
+  _blendEquation = true;
+}
+
+AppCanvas::AppCanvas(const AppCanvas& iBrother)
+:Canvas(iBrother)
+{
+  _pViewer = iBrother._pViewer;
+  _blendEquation = iBrother._blendEquation;
+}
+
+AppCanvas::~AppCanvas()
+{
+  _pViewer = 0;
+}
+
+void AppCanvas::SetViewer(AppGLWidget *iViewer)
+{
+  _pViewer = iViewer;
+}  
+
+int AppCanvas::width() const 
+{
+  return _pViewer->width();
+}
+
+int AppCanvas::height() const
+{
+  return _pViewer->height();
+}
+
+BBox<Vec3r> AppCanvas::scene3DBBox() const 
+{
+  return _pViewer->scene3DBBox();
+}
+
+void AppCanvas::preDraw()
+{
+  Canvas::preDraw();
+
+  _pViewer->prepareCanvas();
+  glClearColor(0,0,0,0);
+	glClear(GL_COLOR_BUFFER_BIT);
+	glDisable(GL_LIGHTING);
+	glPolygonMode(GL_FRONT, GL_FILL);
+	glShadeModel(GL_SMOOTH);
+	glDisable(GL_DEPTH_TEST);
+	glEnable(GL_TEXTURE_2D);
+  glEnable(GL_BLEND);
+}
+
+void AppCanvas::init() 
+{
+#ifdef WIN32
+  static bool firsttime = true;
+  if (firsttime)
+    {
+      if (extgl_Initialize() != 0)
+	      cerr << "Error: problem occurred while initializing GL extensions" << endl;			
+      else
+	      cout << "GL extensions initialized" << endl;
+
+      if(!glutils_extgl_GetProcAddress("glBlendEquation")){
+        _blendEquation = false;
+        cout << "glBlendEquation unavailable on this hardware -> switching to strokes basic rendering mode" << endl;
+      }
+      firsttime=false;
+    }
+#endif
+
+  _Renderer = new GLStrokeRenderer;
+  if(!StrokeRenderer::loadTextures())
+    {
+      cerr << "unable to load stroke textures" << endl;
+      return;
+    }
+}
+
+void AppCanvas::postDraw()
+{
+  //inverse frame buffer
+  glDisable(GL_TEXTURE_2D);
+  glDisable(GL_BLEND);
+  _pViewer->releaseCanvas();
+
+  Canvas::postDraw();
+}
+
+void AppCanvas::Erase()
+{
+  Canvas::Erase();
+  //_pViewer->clear();
+}
+
+#include "../image/GaussianFilter.h"
+void AppCanvas::readColorPixels(int x,int y,int w, int h, RGBImage& oImage) const
+{
+  //static unsigned number = 0;
+  float *rgb = new float[3*w*h];
+  _pViewer->readPixels(x,y,w,h,AppGLWidget::RGB,rgb);
+  oImage.setArray(rgb, width(), height(), w,h, x, y, false);
+  // FIXME
+  //  QImage qtmp(w, h, 32);
+  //  for(unsigned py=0;py<h;++py){
+  //    for(unsigned px=0;px<w;++px){
+  //      int r = (int)255*(oImage.getR(x+px,y+py));
+  //      int g = (int)255*(oImage.getG(x+px,y+py));
+  //      int b = (int)255*(oImage.getB(x+px,y+py));
+  //      qtmp.setPixel(px,py,qRgb(r,g,b));
+  //    }
+  //  }
+  //  qtmp.save("densityQuery"+QString::number(number)+".png", "PNG");
+  //  if(number == 1090){
+  //    RGBImage img;
+  //    float *rgbtmp = new float[3*width()*height()];
+  //    _pViewer->readPixels(0,0,width(),height(),AppGLWidget::RGB,rgbtmp);
+  //    img.setArray(rgbtmp, width(), height(), width(), height(), 0, 0, false);
+  //    QImage qtmp(width(), height(), 32);
+  //    for(unsigned py=0;py<height();++py){
+  //      for(unsigned px=0;px<width();++px){
+  //        int r = (int)255*(img.getR(px,py));
+  //        int g = (int)255*(img.getG(px,py));
+  //        int b = (int)255*(img.getB(px,py));
+  //        qtmp.setPixel(px,height()-1-py,qRgb(r,g,b));
+  //      }
+  //    }
+  //    qtmp.save("densityQuery"+QString::number(number)+".png", "PNG");
+  //    
+  //    GaussianFilter filter;
+  //    filter.SetSigma(4.0);
+  //    int bound = filter.getBound();
+  //    QImage qtmp2(width(), height(), 32);
+  //    for(int py2=0;py2<height();++py2){
+  //      for(int px2=0;px2<width();++px2){  
+  //        if( (px2-bound < 0) || (px2+bound>width())
+  //	      || (py2-bound < 0) || (py2+bound>height()))
+  //          continue;
+  //        int g = 255*filter.getSmoothedPixel<RGBImage>(&img, px2,py2);
+  //        qtmp2.setPixel(px2,height()-1-py2,qRgb(g,g,g));
+  //      }
+  //    }
+  //    qtmp2.save("blurredCausalDensity"+QString::number(number)+".png", "PNG");
+  //  }
+  //  cout << number << endl;
+  //  ++number;
+}
+
+void AppCanvas::readDepthPixels(int x,int y,int w, int h, GrayImage& oImage) const
+{
+  float *rgb = new float[w*h];
+  _pViewer->readPixels(x,y,w,h,AppGLWidget::DEPTH,rgb);
+  oImage.setArray(rgb, width(), height(), w,h, x, y, false);
+}
+
+void AppCanvas::update()
+{
+//  static int counter = 0;
+//  char fileName[100] = "framebuffer";
+//  char number[10];
+//
+  _pViewer->updateGL();
+  _pViewer->swapBuffers();
+  //QImage fb = _pViewer->grabFrameBuffer();
+  //  sprintf(number, "%3d", counter);
+  //  strcat(fileName, number);
+  //  strcat(fileName, ".bmp");
+  //  fb.save(fileName, "BMP");
+  //counter++;
+}
+
+void AppCanvas::Render(const StrokeRenderer *iRenderer)
+{
+  if(!_blendEquation){
+    RenderBasic(iRenderer);
+    return;
+  }
+
+  glClearColor(1,1,1,1);
+  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+  glDisable(GL_LIGHTING);
+  glPolygonMode(GL_FRONT, GL_FILL);
+  glShadeModel(GL_SMOOTH);
+  
+  if(_pViewer->draw3DsceneEnabled())
+  {
+    glClearColor(1,1,1,0);
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+    glMatrixMode(GL_PROJECTION);
+    glPushMatrix();
+    glMatrixMode(GL_MODELVIEW);
+    glPushMatrix();
+    
+    glEnable(GL_LIGHTING);
+    glEnable(GL_DEPTH_TEST);
+    _pViewer->Set3DContext();
+    _pViewer->DrawScene(_pViewer->glRenderer());
+    glDisable(GL_DEPTH_TEST);
+    glDisable(GL_LIGHTING);
+    glMatrixMode(GL_PROJECTION);
+    glPopMatrix();
+    glMatrixMode(GL_MODELVIEW);
+    glPopMatrix();
+  }
+  
+  
+  glDisable(GL_DEPTH_TEST);
+  glBlendEquation(GL_ADD);
+  
+  glBlendFunc(GL_DST_COLOR, GL_ZERO);
+  
+  if(_drawPaper)
+  {
+    glEnable(GL_BLEND);
+    glEnable(GL_TEXTURE_2D);
+    float zfar = _pViewer->zfar();
+    zfar = zfar+0.1*zfar;
+    //draw background paper // FIXME
+    //glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+    glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+    glBindTexture(GL_TEXTURE_2D, StrokeRenderer::_textureManager->getPaperTextureIndex(_paperTextureIndex)); 
+    glColor4f(1,1,1,0.0);
+    glBegin(GL_TRIANGLE_STRIP);
+    { 
+      glTexCoord2f(0,0); glVertex3f(0, 0, -1);
+      glTexCoord2f(4,0); glVertex3f(2048, 0, -1);
+      glTexCoord2f(0,4); glVertex3f(0, 2048, -1);
+      glTexCoord2f(4,4); glVertex3f(2048, 2048, -1);
+    } 
+    glEnd();
+  }
+  
+  glPushAttrib(GL_COLOR_BUFFER_BIT);
+  glBlendEquation(GL_FUNC_SUBTRACT);
+  glBlendFunc(GL_ONE, GL_ONE);
+  
+  glDisable(GL_TEXTURE_2D);
+  glEnable(GL_BLEND);
+  glColor4f(1,1,1,1);
+  glBegin(GL_TRIANGLE_STRIP);
+  {  
+    glVertex2f(0, 0);
+    glVertex2f(2048, 0);
+    glVertex2f(0, 2048);
+    glVertex2f(2048, 2048);
+  }  
+  glEnd();
+  glPopAttrib();
+  
+  glDisable(GL_DEPTH_TEST);
+  glBlendEquation(GL_ADD);
+  glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+  
+  glEnable(GL_TEXTURE_2D);
+  Canvas::Render(iRenderer);
+  //  
+  glPushAttrib(GL_COLOR_BUFFER_BIT);
+  glBlendEquation(GL_FUNC_SUBTRACT);
+  glBlendFunc(GL_ONE, GL_ONE);
+  
+  glDisable(GL_TEXTURE_2D);
+  glEnable(GL_BLEND);
+  glColor3f(1,1,1);
+  glBegin(GL_TRIANGLE_STRIP);
+  { 
+    glVertex2f(0, 0);
+    glVertex2f(2048, 0);
+    glVertex2f(0, 2048);
+    glVertex2f(2048, 2048);
+  } 
+  glEnd();
+  glPopAttrib();
+  
+  glDisable(GL_TEXTURE_2D);
+  glDisable(GL_BLEND);
+}
+
+void AppCanvas::RenderBasic(const StrokeRenderer *iRenderer)
+{
+  glClearColor(1,1,1,1);
+  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+  glDisable(GL_LIGHTING);
+  glPolygonMode(GL_FRONT, GL_FILL);
+  glShadeModel(GL_SMOOTH);
+  
+  if(_pViewer->draw3DsceneEnabled())
+  {
+    glClearColor(1,1,1,0);
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+    glMatrixMode(GL_PROJECTION);
+    glPushMatrix();
+    glMatrixMode(GL_MODELVIEW);
+    glPushMatrix();
+    
+    glEnable(GL_LIGHTING);
+    glEnable(GL_DEPTH_TEST);
+    _pViewer->Set3DContext();
+    _pViewer->DrawScene(_pViewer->glRenderer());
+    glDisable(GL_DEPTH_TEST);
+    glDisable(GL_LIGHTING);
+    glMatrixMode(GL_PROJECTION);
+    glPopMatrix();
+    glMatrixMode(GL_MODELVIEW);
+    glPopMatrix();
+  }
+
+  glBlendFunc(GL_DST_COLOR, GL_ZERO);
+  if(_drawPaper)
+  {
+    glEnable(GL_BLEND);
+    glEnable(GL_TEXTURE_2D);
+    float zfar = _pViewer->zfar();
+    zfar = zfar+0.1*zfar;
+    //draw background paper // FIXME
+    //glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+    glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+    glBindTexture(GL_TEXTURE_2D, StrokeRenderer::_textureManager->getPaperTextureIndex(_paperTextureIndex)); 
+    glColor4f(1,1,1,0.0);
+    glBegin(GL_TRIANGLE_STRIP);
+    { 
+      glTexCoord2f(0,0); glVertex3f(0, 0, -1);
+      glTexCoord2f(4,0); glVertex3f(2048, 0, -1);
+      glTexCoord2f(0,4); glVertex3f(0, 2048, -1);
+      glTexCoord2f(4,4); glVertex3f(2048, 2048, -1);
+    } 
+    glEnd();
+  }
+
+  glDisable(GL_DEPTH_TEST);
+  glPushAttrib(GL_COLOR_BUFFER_BIT);
+  glEnable(GL_BLEND);
+  glPopAttrib();
+
+  glDisable(GL_DEPTH_TEST);
+  glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+  
+  glEnable(GL_TEXTURE_2D);
+  Canvas::RenderBasic(iRenderer);
+
+  glDisable(GL_TEXTURE_2D);
+  glDisable(GL_BLEND);
+}
+
+
+void AppCanvas::RenderStroke(Stroke *iStroke) {
+  iStroke->Render(_Renderer);
+  if(_pViewer->getRecordFlag()){
+    //Sleep(1000);
+     _pViewer->saveSnapshot(true);
+  }
+}
diff --git a/extern/freestyle/src/app/AppCanvas.h b/extern/freestyle/src/app/AppCanvas.h
new file mode 100755
index 00000000000..703970c0fb1
--- /dev/null
+++ b/extern/freestyle/src/app/AppCanvas.h
@@ -0,0 +1,84 @@
+#ifndef ARTCANVAS_H
+#define ARTCANVAS_H
+
+//------------------------------------------------------------------------------------------//
+//
+//                        FileName          : AppCanvas.h
+//                        Author            : Stephane Grabli
+//                        Purpose           : Class to define the App Canvas.
+//                        Date Of Creation  : 05/01/2003
+//
+//------------------------------------------------------------------------------------------//
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "../stroke/Canvas.h"
+
+class AppGLWidget;
+class AppCanvas : public Canvas
+{
+private:
+  mutable AppGLWidget *_pViewer;
+  bool _blendEquation;
+public:
+  AppCanvas();
+  AppCanvas(AppGLWidget *iViewer);
+  AppCanvas(const AppCanvas& iBrother);
+  virtual ~AppCanvas();
+
+  /*! operations that need to be done before a draw */
+  virtual void preDraw();
+  
+  /*! operations that need to be done after a draw */
+  virtual void postDraw();
+  
+  /*! Erases the layers and clears the canvas */
+  virtual void Erase(); 
+  
+  /* init the canvas */
+  virtual void init();
+  
+  /*! Reads a pixel area from the canvas */
+  virtual void readColorPixels(int x,int y,int w, int h, RGBImage& oImage) const;
+  /*! Reads a depth pixel area from the canvas */
+  virtual void readDepthPixels(int x,int y,int w, int h, GrayImage& oImage) const;
+
+  virtual BBox<Vec3r> scene3DBBox() const ;
+
+  /*! update the canvas (display) */
+  virtual void update() ;
+
+  /*! Renders the created strokes */
+  virtual void Render(const StrokeRenderer *iRenderer);
+  virtual void RenderBasic(const StrokeRenderer *iRenderer);
+  virtual void RenderStroke(Stroke *iStroke) ;
+
+  /*! accessors */
+  virtual int width() const ;
+  virtual int height() const ;
+  inline const AppGLWidget * viewer() const {return _pViewer;}
+
+  /*! modifiers */
+  void SetViewer(AppGLWidget *iViewer) ;
+};
+
+
+#endif
diff --git a/extern/freestyle/src/app/AppConfig.cpp b/extern/freestyle/src/app/AppConfig.cpp
new file mode 100755
index 00000000000..217f58ee806
--- /dev/null
+++ b/extern/freestyle/src/app/AppConfig.cpp
@@ -0,0 +1,120 @@
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "AppConfig.h"
+#include <iostream>
+using namespace std;
+namespace Config{
+  Path* Path::_pInstance = 0;
+  Path::Path(){
+    // get the home directory
+    _HomeDir = getEnvVar("HOME");
+    // get the root directory
+    setRootDir(getEnvVar("FREESTYLE_DIR"));
+    //setRootDir(QString("."));
+    _pInstance = this;
+  }
+  void Path::setRootDir(const QString& iRootDir){
+    _ProjectDir = iRootDir;
+    _ModelsPath = "";
+    _PatternsPath = _ProjectDir +
+					     QString(DIR_SEP.c_str()) +
+					     "data" +
+					     QString(DIR_SEP.c_str()) +
+					     "textures" +
+					     QString(DIR_SEP.c_str()) +
+					     "variation_patterns" +
+					     QString(DIR_SEP.c_str());
+    _BrushesPath = _ProjectDir +
+					     QString(DIR_SEP.c_str()) +
+					     "data" +
+					     QString(DIR_SEP.c_str()) +
+					     "textures" +
+					     QString(DIR_SEP.c_str()) +
+					     "brushes" +
+					     QString(DIR_SEP.c_str());
+    _PythonPath = _ProjectDir + 
+              QString(DIR_SEP.c_str()) + 
+              "python" + 
+              QString(PATH_SEP.c_str()) +
+              _ProjectDir +
+					    QString(DIR_SEP.c_str()) +
+              "style_modules" +
+              QString(DIR_SEP.c_str()) ;
+    if (getenv("PYTHONPATH")) {
+      _PythonPath += QString(PATH_SEP.c_str()) + QString(getenv("PYTHONPATH"));
+    }
+#ifdef WIN32
+    _BrowserCmd = "C:\\Program Files\\Internet Explorer\\iexplore.exe %s";
+#else
+    _BrowserCmd = "mozilla %s";
+#endif
+    _HelpIndexPath = _ProjectDir +
+					  QString(DIR_SEP.c_str()) +
+					  "doc" +
+					  QString(DIR_SEP.c_str()) +
+					  "html" +
+					  QString(DIR_SEP.c_str()) +
+					  "index.html";
+    _PapersDir = _ProjectDir +
+					  QString(DIR_SEP.c_str()) +
+					  "data" +
+					  QString(DIR_SEP.c_str()) +
+					  "textures" +
+					  QString(DIR_SEP.c_str()) +
+					  "papers" +
+					  QString(DIR_SEP.c_str());
+    _EnvMapDir = _ProjectDir +
+				   QString(DIR_SEP.c_str()) +
+				   "data" +
+				   QString(DIR_SEP.c_str()) +
+				   "env_map" +
+				   QString(DIR_SEP.c_str());
+    _MapsDir = _ProjectDir +
+				   QString(DIR_SEP.c_str()) +
+				   "data" +
+           QString(DIR_SEP.c_str()) +
+				   "maps" +
+				   QString(DIR_SEP.c_str());
+  }
+  void Path::setHomeDir(const QString& iHomeDir){
+    _HomeDir = iHomeDir;
+  }
+  Path::~Path(){
+    _pInstance = 0;
+  }
+  Path* Path::getInstance() {
+    return _pInstance;
+  }
+  QString Path::getEnvVar(const QString& iEnvVarName){
+    QString value;
+    if (!getenv(iEnvVarName.toAscii().data())) {
+      cerr << "Warning: You may want to set the $"<< iEnvVarName.toAscii().data()
+		  << " environment variable to use " << QString(Config::APPLICATION_NAME).toAscii().data() << "." << endl
+	    << "         Otherwise, the current directory will be used instead." << endl;
+      value = ".";
+    }else{
+      value = getenv(iEnvVarName.toAscii().data());
+    } 
+    return value;
+  }
+
+} // End of namepace Config
+
diff --git a/extern/freestyle/src/app/AppConfig.h b/extern/freestyle/src/app/AppConfig.h
new file mode 100755
index 00000000000..54e00571275
--- /dev/null
+++ b/extern/freestyle/src/app/AppConfig.h
@@ -0,0 +1,125 @@
+//
+//  Filename         : AppConfig.h
+//  Author           : Emmanuel Turquin
+//  Purpose          : Configuration file
+//  Date of creation : 26/02/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  APP_CONFIG_H
+# define APP_CONFIG_H
+
+# include <qstring.h>
+# include "../system/FreestyleConfig.h"
+# include "../system/Precision.h"
+
+using namespace std;
+
+namespace Config {
+
+  class Path{
+  protected:
+    static Path * _pInstance;
+    QString _ProjectDir;
+    QString _ModelsPath;
+    QString _PatternsPath;
+    QString _BrushesPath;
+    QString _PythonPath;
+    QString _BrowserCmd;
+    QString _HelpIndexPath;
+    QString _PapersDir;
+    QString _EnvMapDir;
+    QString _MapsDir;
+    QString _HomeDir;
+  public:
+    Path();
+    virtual ~Path();
+    static Path* getInstance();
+
+    void setRootDir(const QString& iRootDir) ;
+    void setHomeDir(const QString& iHomeDir) ;
+
+    const QString& getProjectDir() const {return _ProjectDir;}
+    const QString& getModelsPath() const {return _ModelsPath;}
+    const QString& getPatternsPath() const {return _PatternsPath;}
+    const QString& getBrushesPath() const {return _BrushesPath;}
+    const QString& getPythonPath() const {return _PythonPath;}
+    const QString& getBrowserCmd() const {return _BrowserCmd;}
+    const QString& getHelpIndexpath() const {return _HelpIndexPath;}
+    const QString& getPapersDir() const {return _PapersDir;}
+    const QString& getEnvMapDir() const {return _EnvMapDir;}
+    const QString& getMapsDir() const {return _MapsDir;}
+    const QString& getHomeDir() const {return _HomeDir;}
+
+    static QString getEnvVar(const QString& iEnvVarName);
+    
+  };
+
+  //
+  // Configuration, default values
+  //
+  //////////////////////////////////////////////////////////////
+
+  // Application
+  static const QString APPLICATION_NAME(APPNAME);
+  static const QString APPLICATION_VERSION(APPVERSION);
+
+  // ViewMap
+  static const QString VIEWMAP_EXTENSION("vm");
+  static const QString VIEWMAP_MAGIC("ViewMap File");
+  static const QString VIEWMAP_VERSION("1.9");
+
+  // Style modules
+  static const QString STYLE_MODULE_EXTENSION("py");
+  static const QString STYLE_MODULES_LIST_EXTENSION("sml");
+
+  // Options
+  static const QString OPTIONS_DIR("." + APPLICATION_NAME);
+  static const QString OPTIONS_FILE("options.xml");
+  static const QString OPTIONS_CURRENT_DIRS_FILE("current_dirs.xml");
+  static const QString OPTIONS_QGLVIEWER_FILE("qglviewer.xml");
+
+  // Default options
+  static const real DEFAULT_SPHERE_RADIUS = 1.0;
+  static const real DEFAULT_DKR_EPSILON = 0.0;
+
+  // Papers
+  static const QString DEFAULT_PAPER_TEXTURE("whitepaper.jpg");
+
+  // Help & About texts
+  static const QString HELP_FILE("help.html");
+  static const QString ABOUT_STRING
+    (
+     "<CENTER><H2>" + APPLICATION_NAME + " " + APPLICATION_VERSION + "</H2>"
+     "<P>A programmable line drawing system</P></CENTER>"
+     "<UL>"
+     "<LI>Frédo Durand"
+     "<LI>Stéphane Grabli"
+     "<LI>François Sillion"
+     "<LI>Emmanuel Turquin"
+     "</UL>"
+     "<CENTER><B>(C) Artis 2003</B></CENTER>"
+     );
+
+} // End of namepace Config
+
+#endif // APP_CONFIG_H
diff --git a/extern/freestyle/src/app/AppDensityCurvesWindow.cpp b/extern/freestyle/src/app/AppDensityCurvesWindow.cpp
new file mode 100755
index 00000000000..fe2ae994f77
--- /dev/null
+++ b/extern/freestyle/src/app/AppDensityCurvesWindow.cpp
@@ -0,0 +1,65 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+#include "AppDensityCurvesWindow.h"
+#include "../scene_graph/NodeGroup.h"
+#include "AppGL2DCurvesViewer.h"
+#include <vector>
+using namespace std;
+
+
+AppDensityCurvesWindow::AppDensityCurvesWindow(QWidget *parent, const char *name, bool modal, Qt::WFlags fl)
+ : QDialog(parent, fl)
+{
+	setupUi(this);
+}
+AppDensityCurvesWindow::~AppDensityCurvesWindow(){ 
+}
+
+void AppDensityCurvesWindow::SetOrientationCurve(int i, const Vec2d& vmin, const Vec2d& vmax, const vector<Vec3r>& iCurve, const char *xlabel, const char *ylabel){
+  AppGL2DCurvesViewer * viewer = 0;
+  switch(i){
+  case 0:viewer = CurvesViewer0; break;
+  case 1:viewer = CurvesViewer1; break;
+  case 2:viewer = CurvesViewer2; break;
+  case 3:viewer = CurvesViewer3; break;
+  case 4:viewer = CurvesViewer4; break;
+  default:return;
+  }
+  
+  viewer->SetCurve(vmin, vmax, iCurve, xlabel, ylabel);
+}
+
+void AppDensityCurvesWindow::SetLevelCurve(int i, const Vec2d& vmin, const Vec2d& vmax, const vector<Vec3r>& iCurve, const char *xlabel, const char *ylabel){
+  AppGL2DCurvesViewer * viewer = 0;
+  switch(i){
+  case 1:viewer = LevelCurveViewer1; break;
+  case 2:viewer = LevelCurveViewer2; break;
+  case 3:viewer = LevelCurveViewer3; break;
+  case 4:viewer = LevelCurveViewer4; break;
+  case 5:viewer = LevelCurveViewer5; break;
+  case 6:viewer = LevelCurveViewer6; break;
+  case 7:viewer = LevelCurveViewer7; break;
+  case 8:viewer = LevelCurveViewer8; break;
+  default:return;
+  }
+  
+  viewer->SetCurve(vmin, vmax, iCurve, xlabel, ylabel);
+}
diff --git a/extern/freestyle/src/app/AppDensityCurvesWindow.h b/extern/freestyle/src/app/AppDensityCurvesWindow.h
new file mode 100755
index 00000000000..d7091440e06
--- /dev/null
+++ b/extern/freestyle/src/app/AppDensityCurvesWindow.h
@@ -0,0 +1,85 @@
+//
+//  Filename         : AppDensityCurvesWindow.h
+//  Author           : Stephane Grabli
+//  Purpose          : Class to define the density curves display window
+//  Date of creation : 14/03/04
+//
+///////////////////////////////////////////////////////////////////////////////
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  APPDENSITYCURVESWINDOW_H
+# define APPDENSITYCURVESWINDOW_H
+
+#include "ui_dir/ui_densitycurveswindow4.h"
+#include <vector>
+#include "../geometry/Geom.h"
+using namespace std;
+using namespace Geometry;
+using namespace Ui;
+
+class NodeGroup;
+
+class AppDensityCurvesWindow : public QDialog, public DensityCurvesWindow
+{
+Q_OBJECT
+public:
+	AppDensityCurvesWindow(QWidget *parent = 0, const char *name = 0, bool modal = FALSE, Qt::WFlags fl = 0);
+  virtual ~AppDensityCurvesWindow();
+
+  /*! Sets the node that contains the orientation curve i in 
+   *  viewer i (among 5).
+   *  \param i
+   *    The number of the viewer where the curve must be displayed.(0<=i<5).
+   *  \param vmin
+   *    The x,y min of the curve
+   *  \param vmax
+   *    The x,y max of the curve
+   *  \param iCurve
+   *    The array of XYZ coordinates of the points.
+   *  \param xlabel
+   *    The label of the x-axis
+   *  \param ylabel
+   *    The label of the y-axis
+   */
+  void SetOrientationCurve(int i, const Vec2d& vmin, const Vec2d& vmax, const vector<Vec3r>& iCurve, const char *xlabel, const char *ylabel);
+
+  /*! Sets the node that contains the level curve i in 
+   *  viewer i (i in [1,8]).
+   *  \param i
+   *    The number of the viewer where the curve must be displayed.(0<=i<5).
+   *  \param vmin
+   *    The x,y min of the curve
+   *  \param vmax
+   *    The x,y max of the curve
+   *  \param iCurve
+   *    The array of XYZ coordinates of the points.
+   *  \param xlabel
+   *    The label of the x-axis
+   *  \param ylabel
+   *    The label of the y-axis
+   */
+  void SetLevelCurve(int i, const Vec2d& vmin, const Vec2d& vmax, const vector<Vec3r>& iCurve, const char *xlabel, const char *ylabel);
+};
+
+#endif // APPDENSITYCURVESWINDOW_H
+
+
diff --git a/extern/freestyle/src/app/AppGL2DCurvesViewer.cpp b/extern/freestyle/src/app/AppGL2DCurvesViewer.cpp
new file mode 100755
index 00000000000..0915a4c3cbd
--- /dev/null
+++ b/extern/freestyle/src/app/AppGL2DCurvesViewer.cpp
@@ -0,0 +1,152 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "AppGL2DCurvesViewer.h"
+#include "../rendering/GLRenderer.h"
+#include "../scene_graph/NodeShape.h"
+#include "../scene_graph/LineRep.h"
+#include "../scene_graph/VertexRep.h"
+
+AppGL2DCurvesViewer::AppGL2DCurvesViewer(QWidget *iParent, const char *iName)
+: QGLViewer(iParent)
+{
+  _RootNode.SetLightingEnabled(false);
+  _RootNode.SetLineWidth(1.0);
+  _pGLRenderer = new GLRenderer;
+}
+AppGL2DCurvesViewer::~AppGL2DCurvesViewer(){
+  makeCurrent();
+  _RootNode.destroy();
+  if(_pGLRenderer)
+    delete _pGLRenderer;
+}
+  
+void AppGL2DCurvesViewer::SetRange(const Vec2d& vmin, const Vec2d& vmax, const char * xlabel, const char *ylabel){
+  _vmin = vmin;
+  _vmax = vmax;
+  _xmargin = (vmax.x()-vmin.x())/20.0;
+  _ymargin = (vmax.y()-vmin.y())/20.0;
+  _left = vmin.x()-_xmargin;
+  _right = vmax.x()+_xmargin;
+  _bottom = vmin.y()- _ymargin;
+  _top = vmax.y()+_ymargin;
+  if(xlabel)
+    _xlabel = xlabel;
+  if(ylabel)
+    _ylabel = ylabel;
+}
+void AppGL2DCurvesViewer::SetCurve(const Vec2d& vmin, const Vec2d& vmax, const vector<Vec3r>& iPoints, const char *xlabel, const char *ylabel){
+  SetRange(vmin, vmax, xlabel, ylabel);
+  vector<Node*> nodes;
+  _RootNode.RetrieveChildren(nodes);
+  _RootNode.DetachChildren();
+  for(vector<Node*>::iterator n=nodes.begin(), nend=nodes.end();
+  n!=nend;
+  ++n){
+    delete (*n);
+  }
+  _curve.clear();
+  _curve = iPoints;
+  NodeGroup * curveNode = new NodeGroup;
+  NodeShape * shape = new NodeShape;
+  shape->material().SetDiffuse(0,0,0,1);
+  curveNode->AddChild(shape);
+  shape->AddRep(new LineRep(iPoints));
+  for(vector<Vec3r>::const_iterator v=iPoints.begin(), vend=iPoints.end();
+  v!=vend;
+  ++v){
+    shape->AddRep(new VertexRep(v->x(), v->y(), v->z()));
+  }
+  _RootNode.AddChild(curveNode);
+  updateGL();
+}
+
+void AppGL2DCurvesViewer::AddNode(Node* iNode){
+  _RootNode.AddChild(iNode);
+}
+
+void AppGL2DCurvesViewer::DetachNode(Node* iNode){
+  _RootNode.DetachChild(iNode);
+}
+
+void AppGL2DCurvesViewer::RetrieveNodes(vector<Node*>& oNodes){
+  _RootNode.RetrieveChildren(oNodes);
+}
+
+void AppGL2DCurvesViewer::init(){
+  glClearColor(1,1,1,1);
+  _left = 0;
+  _right = width();
+  _bottom = 0; 
+  _top = height();
+}
+void AppGL2DCurvesViewer::draw(){
+  glPushAttrib(GL_ALL_ATTRIB_BITS);
+
+//    // Projection Matrix
+//    //==================
+  glMatrixMode(GL_PROJECTION);
+  glLoadIdentity();
+  glOrtho(_left,_right, _bottom, _top, -1.0, 1.0);
+
+  //Modelview Matrix
+  //================
+  glMatrixMode(GL_MODELVIEW);
+  glLoadIdentity();
+  glDisable(GL_DEPTH_TEST);
+  // draw axis
+  glColor3f(0.5, 0.5, 0.5);
+  // x axis
+  glBegin(GL_LINES);
+  glVertex2f(_left, _vmin.y());
+  glVertex2f(_vmax.x(), _vmin.y());
+  glEnd();
+  QFont serifFont( "Times", 8);
+  if(!_xlabel.isEmpty()){
+    renderText(width()-30, height()-1, _xlabel, serifFont);
+    //renderText(_vmax.x()-_xmargin, _vmin.y(), 0, _xlabel, serifFont);
+  }
+
+  // y axis
+  glBegin(GL_LINES);
+  glVertex2f(_vmin.x(), _bottom);
+  glVertex2f(_vmin.x(), _vmax.y());
+  glEnd();
+  if(!_ylabel.isEmpty()){
+    //renderText(_vmin.x(), _vmax.y()-3*_ymargin, _ylabel, serifFont);
+    renderText(12, 10, _ylabel, serifFont);
+  }
+  _RootNode.accept(*_pGLRenderer);
+  serifFont.setPointSize(7);
+  for(vector<Vec3r>::iterator v=_curve.begin(), vend=_curve.end();
+  v!=vend;
+  ++v){
+    if(v->y() == 0)
+      continue;
+    QString label = QString( "(%1, %2)" )
+                    .arg( (int)v->x())
+                    .arg( v->y(), 0, 'E', 1 );
+
+    renderText(v->x(), v->y(), 0, label, serifFont);
+  }
+  glPopAttrib();
+
+}
\ No newline at end of file
diff --git a/extern/freestyle/src/app/AppGL2DCurvesViewer.h b/extern/freestyle/src/app/AppGL2DCurvesViewer.h
new file mode 100755
index 00000000000..c0bb8b4109c
--- /dev/null
+++ b/extern/freestyle/src/app/AppGL2DCurvesViewer.h
@@ -0,0 +1,80 @@
+//
+//  Filename         : AppGL2DCurvesViewer.h
+//  Author           : Stephane Grabli
+//  Purpose          : 2D GL Curves viewer
+//  Date of creation : 14/03/2004
+//
+///////////////////////////////////////////////////////////////////////////////
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  APPGL2DCURVESVIEWER_H
+# define APPGL2DCURVESVIEWER_H
+
+# include <QGLViewer/qglviewer.h>
+# include "../scene_graph/NodeDrawingStyle.h"
+# include <qstring.h>
+
+class GLRenderer;
+
+class AppGL2DCurvesViewer : public QGLViewer
+{
+  Q_OBJECT
+    
+public:
+
+  AppGL2DCurvesViewer(QWidget *iParent, const char *iName = 0);
+  virtual ~AppGL2DCurvesViewer();
+  
+  /*! Sets the ranges.
+   */
+  void SetRange(const Vec2d& vmin, const Vec2d& vmax, const char * xlabel, const char *ylabel);
+  void SetCurve(const Vec2d& vmin, const Vec2d& vmax, const vector<Vec3r>& iPoints, const char *xlabel, const char *ylabel);
+  void AddNode(Node* iNode);
+  void DetachNode(Node* iNode);
+  void RetrieveNodes(vector<Node*>& oNodes);
+  
+  virtual QSize sizeHint() const {return QSize(200,200);}
+  virtual QSizePolicy sizePolicy() const {return QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);}
+protected:
+    virtual void init();
+    virtual void draw();
+
+private:
+  NodeDrawingStyle _RootNode;
+  GLRenderer     *_pGLRenderer;
+  vector<Vec3r> _curve;
+  Vec2d _vmin; // curve bbox min
+  Vec2d _vmax; // curve bbox max
+  double _left; // frustum clipping planes (slightly differemt from the bbox for a clear view)
+  double _right;
+  double _bottom;
+  float _xmargin; // margin around plot in x direction
+  float _ymargin; // margin around plot in y direction
+  double _top;
+  QString _xlabel;
+  QString _ylabel;
+  
+};
+
+
+#endif // APPGL2DCURVESVIEWER_H
+
diff --git a/extern/freestyle/src/app/AppGLWidget.cpp b/extern/freestyle/src/app/AppGLWidget.cpp
new file mode 100755
index 00000000000..d59ad716c18
--- /dev/null
+++ b/extern/freestyle/src/app/AppGLWidget.cpp
@@ -0,0 +1,1049 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include <iostream>
+#include <qtextstream.h>
+#include <qimage.h>
+#include <qtabwidget.h>
+#include <qtextedit.h>
+#include <QMouseEvent>
+#include "../stroke/Canvas.h"
+#include "AppGLWidget.h"
+#include "../scene_graph/NodeLight.h"
+#include "../rendering/GLRenderer.h"
+#include "../rendering/GLSelectRenderer.h"
+#include "../rendering/GLBBoxRenderer.h"
+#include "../rendering/GLMonoColorRenderer.h"
+#include "Controller.h"
+#include "../view_map/Silhouette.h"
+#include "../view_map/ViewMap.h"
+#include "../scene_graph/LineRep.h"
+#include "../scene_graph/NodeShape.h"
+#include "../scene_graph/VertexRep.h"
+#include "AppConfig.h"
+
+// glut.h must be included last to avoid a conflict with stdlib.h on vc .net 2003 and 2005
+#ifdef __MACH__
+# include <GLUT/glut.h>
+#else
+# include <GL/glut.h>
+#endif
+
+GLuint texture = 0;
+
+bool AppGLWidget::_frontBufferFlag = false;
+bool AppGLWidget::_backBufferFlag = true;
+
+AppGLWidget::AppGLWidget(QWidget *iParent, const char *iName)
+  : QGLViewer(iParent)
+{
+  _Fovy        = 30.f;
+  //_SceneDepth = 2.f;
+  _RenderStyle = LINE;
+  //_ModelRootNode->SetBBox(BBox<Vec3f>(Vec3f(-10.f, -10.f, -10.f), Vec3f(10.f, 10.f, 10.f)));
+  _ModelRootNode = new NodeDrawingStyle;
+  _SilhouetteRootNode = new NodeDrawingStyle;
+  _DebugRootNode = new NodeDrawingStyle;
+  
+  _RootNode.AddChild(_ModelRootNode);
+  _SilhouetteRootNode->SetStyle(DrawingStyle::LINES);
+  _SilhouetteRootNode->SetLightingEnabled(false);
+  _SilhouetteRootNode->SetLineWidth(2.f);
+  _SilhouetteRootNode->SetPointSize(3.f);
+
+  _RootNode.AddChild(_SilhouetteRootNode);
+
+  _DebugRootNode->SetStyle(DrawingStyle::LINES);
+  _DebugRootNode->SetLightingEnabled(false);
+  _DebugRootNode->SetLineWidth(1.f);
+  
+  _RootNode.AddChild(_DebugRootNode);
+
+  _minBBox = __min(__min(_ModelRootNode->bbox().getMin()[0], 
+                            _ModelRootNode->bbox().getMin()[1]),
+                      _ModelRootNode->bbox().getMin()[2]);
+  _maxBBox = __max(__max(_ModelRootNode->bbox().getMax()[0], 
+                            _ModelRootNode->bbox().getMax()[1]),
+                      _ModelRootNode->bbox().getMax()[2]);
+
+  _maxAbs = __max(rabs(_minBBox), rabs(_maxBBox));
+  _minAbs = __min(rabs(_minBBox), rabs(_maxBBox));
+
+  camera()->setZNearCoefficient(0.1);
+
+  // 2D Scene
+  //  _pFENode = new NodeDrawingStyle;
+  //  _pFENode->SetStyle(DrawingStyle::LINES);
+  //  _pFENode->SetLightingEnabled(false);
+  //  _pFENode->SetLineWidth(1.f);
+  //
+  //  _p2DNode.AddChild(_pFENode);
+  //  
+  //  _pVisibleSilhouetteNode = new NodeDrawingStyle;
+  //  _pVisibleSilhouetteNode->SetStyle(DrawingStyle::LINES);
+  //  _pVisibleSilhouetteNode->SetLightingEnabled(false);
+  //  _pVisibleSilhouetteNode->SetLineWidth(3.f);
+  //
+  //  _p2DNode.AddChild(_pVisibleSilhouetteNode);
+  //  
+  _p2DSelectionNode = new NodeDrawingStyle;
+  _p2DSelectionNode->SetLightingEnabled(false);
+  _p2DSelectionNode->SetStyle(DrawingStyle::LINES);
+  _p2DSelectionNode->SetLineWidth(5.f);
+  
+  _p2DNode.AddChild(_p2DSelectionNode);
+
+  _pGLRenderer = new GLRenderer;
+  _pSelectRenderer = new GLSelectRenderer;
+  _pBBoxRenderer = new GLBBoxRenderer;
+  _pMonoColorRenderer = new GLMonoColorRenderer;
+  _pDebugRenderer = new GLDebugRenderer;
+
+  _pMainWindow = NULL;
+  _cameraStateSaved = false;
+  _drawBBox = false;
+  _silhouette = false;
+  _fedges = false;
+  _debug = false;
+  _selection_mode = false;
+  _Draw2DScene = true;
+  _Draw3DScene = true;
+  _drawEnvMap = false;
+  _currentEnvMap = 1;
+  _maxId = 0;
+  _blendFunc = 0;
+
+  const QString sep(Config::DIR_SEP.c_str());
+  const QString filename = Config::Path::getInstance()->getHomeDir() + sep +
+    Config::OPTIONS_DIR + sep + Config::OPTIONS_QGLVIEWER_FILE;
+  setStateFileName(filename);  
+
+  //get camera frame:
+  qglviewer::Camera * cam = camera();
+  qglviewer::ManipulatedFrame *  fr = cam->frame() ;
+  _enableUpdateSilhouettes = false;
+  connect(fr, SIGNAL(modified()), this, SLOT(updateSilhouettes()));
+  _captureMovie = false;
+  //  _frontBufferFlag = false;
+  //  _backBufferFlag = true;
+  _record = false;
+}
+
+AppGLWidget::~AppGLWidget()
+{
+  int ref = _RootNode.destroy();
+  
+  _Light.destroy();
+  ref = _p2DNode.destroy();
+  
+  if(NULL != _pGLRenderer)
+    {
+      delete _pGLRenderer;
+      _pGLRenderer = NULL;
+    }
+
+  if(NULL != _pSelectRenderer)
+    {
+      delete _pSelectRenderer;
+      _pSelectRenderer = NULL;
+    }
+
+  if(NULL != _pBBoxRenderer)
+    {
+      delete _pBBoxRenderer;
+      _pBBoxRenderer = NULL;
+    }
+
+  if(NULL != _pMonoColorRenderer)
+    {
+      delete _pMonoColorRenderer;
+      _pMonoColorRenderer = NULL;
+    }
+
+  if(NULL != _pDebugRenderer)
+    {
+      delete _pDebugRenderer;
+      _pDebugRenderer = NULL;
+    }
+
+  makeCurrent();
+  //saveToFile(filename);
+}
+
+void AppGLWidget::SetMainWindow(QMainWindow *iMainWindow) {
+	_pMainWindow = iMainWindow;
+}
+void AppGLWidget::captureMovie()
+{
+  _captureMovie = true;
+  setSnapshotFormat("BMP");
+  setSnapshotFileName("anim");
+  camera()->playPath(0);
+  //_captureMovie = false;
+}
+
+void
+AppGLWidget::updateSilhouettes()
+{
+  if(!_enableUpdateSilhouettes || !g_pController)
+    return;
+  g_pController->ComputeViewMap();
+  g_pController->DrawStrokes();
+  if(_captureMovie)
+  {
+    if(!camera()->keyFrameInterpolator(0)->interpolationIsStarted())
+    {
+      _captureMovie = false;
+      return;
+    }
+    saveSnapshot(true);
+  }
+}
+
+void
+AppGLWidget::select(const QMouseEvent *e) {
+
+  // 3D Shape selection
+
+  if (_selection_mode) {
+
+    // Make openGL context current
+    makeCurrent();
+  
+    const unsigned SENSITIVITY = 4;
+    const unsigned NB_HITS_MAX = 64;
+  
+    // Prepare the selection mode
+    static GLuint hits[NB_HITS_MAX];
+  
+    glSelectBuffer(NB_HITS_MAX, hits);
+    glRenderMode(GL_SELECT);
+    glInitNames();
+
+    // Loads the matrices
+    glMatrixMode(GL_PROJECTION);
+    glLoadIdentity();
+    GLint viewport[4];
+    camera()->getViewport(viewport);
+    gluPickMatrix(static_cast<GLdouble>(e->x()), static_cast<GLdouble>(e->y()), SENSITIVITY, SENSITIVITY, viewport);
+
+    // loadProjectionMatrix() first resets the GL_PROJECTION matrix with a glLoadIdentity.
+    // Give false as a parameter in order to prevent this and to combine the matrices.
+    camera()->loadProjectionMatrix(false);
+
+    camera()->loadModelViewMatrix();
+  
+    // Render scene with objects ids
+    _pSelectRenderer->setSelectRendering(true);
+    DrawScene(_pSelectRenderer);
+    glFlush();
+
+    // Get the results
+    GLint nb_hits = glRenderMode(GL_RENDER);
+
+    if (nb_hits <= 0) {
+      _pSelectRenderer->setSelectedId(-1);
+      return;
+    }
+  
+    // Interpret results
+    unsigned int zMin = hits[1];
+    unsigned int selected = hits[3];
+    for (int i=1; i<nb_hits; ++i)
+      if (hits[i*4+1] < zMin)
+	{
+	  zMin = hits[i*4+1];
+	  selected = hits[i*4+3];
+	}
+    _pSelectRenderer->setSelectedId(selected);
+
+    cout << "SHAPE" << endl;
+    cout << "-----" << endl;
+    cout << "Id: " << _pSelectRenderer->getSelectedId() << endl;
+    cout << endl;
+
+    return;
+  }
+
+  // ViewMap selection
+
+  FEdge *fe = g_pController->SelectFEdge(e->x(), height()-e->y());
+  if (!fe)
+    return;
+  ViewEdge * ve = fe->viewedge();
+
+  if (ve) {
+    cout << "VIEWEDGE" << endl;
+    cout << "--------" << endl;
+    cout << "ViewEdge Id: " << ve->getId().getFirst() << ", " << ve->getId().getSecond() << endl;
+    cout << "Shape Id: " << ve->shape_id() << endl;
+    cout << "Nature: " << ve->getNature() << endl;
+    cout << "QI: " << ve->qi() << endl;
+    if(ve->aShape())
+      cout << "Occludee: " << ve->aShape()->getId() << endl;
+    else
+      cout << "Occludee: NULL" << endl ;
+    cout << endl;
+    
+    cout << "FEDGE" << endl;
+    cout << "-----" << endl;
+    cout << "FEdge Id: " << fe->getId().getFirst() << ", " << fe->getId().getSecond() << endl;
+    cout << "Vertex A Id: " << fe->vertexA()->getId() << endl;
+    cout << "Vertex B Id: " << fe->vertexB()->getId() << endl;
+    cout << endl;
+    
+    vector<ViewEdge*> vedges;
+    vedges.push_back(ve);
+    _p2DSelectionNode->AddChild(g_pController->BuildRep(vedges.begin(), vedges.end()));
+    // FEdge
+    LineRep * fedgeRep = new LineRep(fe->vertexA()->point2d(), fe->vertexB()->point2d());
+    fedgeRep->SetWidth(3.f);
+    NodeShape * fedgeNode = new NodeShape;
+    fedgeNode->AddRep(fedgeRep);
+    fedgeNode->material().SetDiffuse(0.2, 1, 0.2, 1.0);
+    _p2DSelectionNode->AddChild(fedgeNode);
+    //SVertex A
+    Vec3r A(fe->vertexA()->point2d());
+    VertexRep * aVertexRep = new VertexRep(A.x(), A.y(), A.z());
+    aVertexRep->SetPointSize(3.f);
+    NodeShape * aVertexNode = new NodeShape;
+    aVertexNode->AddRep(aVertexRep);
+    aVertexNode->material().SetDiffuse(1, 0, 0, 1.0);
+    _p2DSelectionNode->AddChild(aVertexNode);
+    // and its fedges
+    const vector<FEdge*>& afedges = fe->vertexA()->fedges();
+    vector<FEdge*>::const_iterator f=afedges.begin(), fend=afedges.end();
+    for(;
+    f!=fend;
+    ++f)
+    {
+      LineRep * lrep = new LineRep((*f)->vertexA()->point2d(), (*f)->vertexB()->point2d());
+      lrep->SetWidth(1.f);
+      aVertexNode->AddRep(lrep);
+    }
+    //SVertex B
+    Vec3r B(fe->vertexB()->point2d());
+    VertexRep * bVertexRep = new VertexRep(B.x(), B.y(), B.z());
+    bVertexRep->SetPointSize(3.f);
+    NodeShape * bVertexNode = new NodeShape;
+    bVertexNode->AddRep(bVertexRep);
+    bVertexNode->material().SetDiffuse(0, 0, 1, 1.0);
+    _p2DSelectionNode->AddChild(bVertexNode);
+    // and its fedges
+    const vector<FEdge*>& bfedges = fe->vertexB()->fedges();
+    f=bfedges.begin();
+    fend=bfedges.end();
+    for(;
+    f!=fend;
+    ++f)
+    {
+      LineRep * lrep = new LineRep((*f)->vertexA()->point2d(), (*f)->vertexB()->point2d());
+      lrep->SetWidth(1.f);
+      bVertexNode->AddRep(lrep);
+    }
+
+  }
+}
+
+
+void
+AppGLWidget::mousePressEvent(QMouseEvent *e)
+{
+  _p2DSelectionNode->destroy();
+  if (e->button() == Qt::LeftButton)
+  {
+	  if(e->modifiers() == Qt::ShiftModifier)
+	  {
+	      select(e);
+      }
+	  else if(e->modifiers() == Qt::ControlModifier)
+	  {
+      // Density Observation
+      g_pController->displayDensityCurves(e->x(), height()-1-e->y());
+	    }else{
+      QGLViewer::mousePressEvent(e);
+    }
+    updateGL();
+  }
+  else
+    QGLViewer::mousePressEvent(e);
+}
+
+void
+AppGLWidget::mouseReleaseEvent  (  QMouseEvent *    e  ) 
+{
+  //  if(g_pController)
+  //    g_pController->ComputeViewMap();
+  //  g_pController->DrawStrokes();
+  QGLViewer::mouseReleaseEvent(e);
+}
+
+void
+AppGLWidget::keyPressEvent(QKeyEvent* e)
+{
+  switch (e->key()) {
+
+  case Qt::Key_U:
+    _enableUpdateSilhouettes = !_enableUpdateSilhouettes;
+    break;
+  case Qt::Key_Escape:
+    break;
+  case Qt::Key_V:
+    g_pController->toggleVisibilityAlgo();
+    break;
+  case Qt::Key_R:
+	  if(e->modifiers() == Qt::ShiftModifier){
+      _record = !_record;
+      if(_record){
+        setSnapshotFormat("JPEG");
+        setSnapshotFileName("anim");
+        g_pController->displayMessage("record", true);
+      }else{
+        g_pController->displayMessage("");
+      }
+      
+    }
+    else if(_cameraStateSaved) {
+      setCameraState(_cameraPosition, _cameraOrientation);
+      updateGL();
+    }
+    break;
+  case Qt::Key_M: 
+    _drawEnvMap = !_drawEnvMap ; 
+    updateGL(); break;
+  case Qt::Key_Plus:
+    Canvas::getInstance()->changePaperTexture(true);updateGL();
+    break;
+  case Qt::Key_Minus:
+    Canvas::getInstance()->changePaperTexture(false);updateGL();
+    break;
+  case Qt::Key_P:
+    Canvas::getInstance()->togglePaperTexture();updateGL();
+    break;
+  case Qt::Key_PageUp:
+	  if(e->modifiers() == Qt::ControlModifier)
+      _blendFunc = (_blendFunc + 1) % 2;
+    else {
+      _currentEnvMap++;
+      if(_currentEnvMap > _maxId)
+	_currentEnvMap = 1;
+    }
+    updateGL();
+    break;
+  case Qt::Key_PageDown:
+	  if(e->modifiers() == Qt::ControlModifier)
+      _blendFunc = (_blendFunc + 1) % 2;
+    else {
+      _currentEnvMap--;
+      if(_currentEnvMap < 1)
+	_currentEnvMap = _maxId;
+    }
+    updateGL();
+    break;
+  case Qt::Key_1: _ModelRootNode->SetStyle(DrawingStyle::FILLED); updateGL(); break;
+  case Qt::Key_2: _ModelRootNode->SetStyle(DrawingStyle::LINES); _ModelRootNode->SetLineWidth(1.0); updateGL(); break;
+  case Qt::Key_3: _ModelRootNode->SetStyle(DrawingStyle::INVISIBLE); updateGL(); break;
+  case Qt::Key_B:
+    {
+//       if(e->state() == ShiftButton)
+//         {
+//           g_pController->toggleEdgeTesselationNature(Nature::BORDER); updateGL(); break;
+//         }
+//       else
+        {
+          _drawBBox == true ? _drawBBox = false : _drawBBox = true; updateGL(); break;
+        }
+    }
+//   case Key_C:
+//     if(e->state() == ShiftButton)
+//       {
+// 	g_pController->toggleEdgeTesselationNature(Nature::CREASE); updateGL(); break;
+//       }
+//     break;
+  case Qt::Key_S:
+    {
+//       if(e->state() == ShiftButton)
+//         {
+//           g_pController->toggleEdgeTesselationNature(Nature::SILHOUETTE); updateGL(); break;
+//         }
+//       else
+        {
+          _silhouette == true ? _silhouette = false : _silhouette = true; updateGL(); break;
+        }
+    }
+  case Qt::Key_L: 
+    {
+        _selection_mode = !_selection_mode; updateGL(); break;
+    }
+    break;
+  case Qt::Key_E: 
+    {
+        _fedges == true ? _fedges = false : _fedges = true; updateGL(); break;
+    }
+    break;
+  case Qt::Key_D: 
+    {
+      _debug == true ? _debug = false : _debug = true; updateGL();
+    }
+    break;
+  case Qt::Key_F2: _Draw2DScene == true ? _Draw2DScene = false : _Draw2DScene = true; updateGL(); break; 
+  case Qt::Key_F3: _Draw3DScene == true ? _Draw3DScene = false : _Draw3DScene = true; updateGL(); break; 
+  default:
+    QGLViewer::keyPressEvent(e);
+  }
+}
+
+void AppGLWidget::LoadEnvMap(const char *filename)
+{
+  GLuint textureId;
+  GLubyte *data;
+  //sgiImage img;
+  //cout << filename << endl;
+  QImage img(filename, "PNG");
+  QImage glImage = QGLWidget::convertToGLFormat(img);
+  int d = glImage.depth();
+  //data = img.read(filename); // tres beau bleu gris mauve!!
+  // allocate a texture name
+  glGenTextures( 1, &textureId );
+  if(textureId > _maxId)
+    _maxId = textureId;
+
+  // select our current texture
+  glBindTexture( GL_TEXTURE_2D, textureId );
+  
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, 
+                   GL_NEAREST);
+
+  glTexImage2D(GL_TEXTURE_2D, 0,GL_RGBA, glImage.width(), glImage.height(), 0,
+    GL_RGBA, GL_UNSIGNED_BYTE, glImage.bits() );
+}
+
+void AppGLWidget::help(){
+  emit helpRequired();
+
+  bool resize = false;
+  int width=600;
+  int height=400;
+
+  static QString label[] = {" &Keyboard ", " &Mouse "};
+
+  QTabWidget * hWidget = helpWidget();
+  if (!hWidget){
+    hWidget = new QTabWidget(NULL);
+    hWidget->setWindowTitle("Control Bindings");
+    resize = true;
+    for (int i=0; i<2; ++i){
+	    QTextEdit* tab = new QTextEdit(hWidget);
+	    //tab->setAcceptRichText(true); // FIXME: commented because qt 4.0 is incomplete
+#if QT_VERSION >= 300
+	    tab->setReadOnly(true);
+#endif
+	    hWidget->insertTab(i, tab, label[i]);
+    }
+  }
+
+#if QT_VERSION < 300
+  const int currentPageIndex = hWidget->currentPageIndex();
+#endif
+
+  for (int i=0; i<2; ++i)
+    {
+      QString text;
+      switch (i)
+	{
+	case 0 : text = keyboardString(); break;
+	case 1 : text = mouseString();	  break;
+	default : break;
+	}
+
+#if QT_VERSION < 300
+    hWidget->setCurrentPage(i);
+    QTextEdit* textEdit = (QTextEdit*)(hWidget->currentPage());
+#else
+    hWidget->setCurrentIndex(i);
+    QTextEdit* textEdit = (QTextEdit*)(hWidget->currentWidget());
+#endif
+    textEdit->setHtml(text);
+
+    if (resize && (textEdit->heightForWidth(width) > height))
+	height = textEdit->heightForWidth(width);
+    }
+  
+#if QT_VERSION < 300
+  hWidget->setCurrentPage(currentPageIndex);
+#endif
+
+  if (resize)
+    hWidget->resize(width, height+40); // 40 is tabs' height
+  hWidget->show();
+  hWidget->raise();  
+}
+  
+QString AppGLWidget::helpString() const{
+  QString pdir(Config::Path::getInstance()->getProjectDir());
+  QString text = "<a href=\"" + pdir + "/doc/html/index.html\">help content</a>";
+  return text;
+}
+
+QString AppGLWidget::mouseString() const{
+  QString text("<table border=\"1\" cellspacing=\"0\">\n");
+  text += "<tr bgcolor=\"#eebf00\"><th align=\"center\">Button</th><th align=\"center\">Description</th></tr>\n";
+  text += "<tr><td><b>Shift+Left</b></td><td>If view map exists, selects a view edge.<br> If in selection mode, selects a shape</td></tr>";
+	text += "</table>";
+  text += QGLViewer::mouseString();
+  return text;
+}
+
+QString AppGLWidget::keyboardString() const {
+
+  QString text("<table border=\"1\" cellspacing=\"0\">\n");
+  text += "<tr bgcolor=\"#eebf00\"><th align=\"center\">Key</th><th align=\"center\">Description</th></tr>\n";
+  text += "<tr><td><b>F2</b></td><td>Toggles 2D Scene display</td></tr>";
+  text += "<tr><td><b>F3</b></td><td>Toggles 3D Scene display</td></tr>";
+
+  text += "<tr><td><b>1</b></td><td>Filled display mode</td></tr>";
+  text += "<tr><td><b>2</b></td><td>Lines display mode</td></tr>";
+  text += "<tr><td><b>3</b></td><td>Invisible display mode</td></tr>";
+
+  text += "<tr><td><b>E</b></td><td>Toggles ViewMap display</td></tr>";
+  text += "<tr><td><b>B</b></td><td>Toggles bounding boxes display</td></tr>";
+  text += "<tr><td><b>S</b></td><td>Toggles GL silhouettes display</td></tr>";
+  text += "<tr><td><b>D</b></td><td>Toggles debug information display</td></tr>";
+  text += "<tr><td><b>L</b></td><td>Toggles shape selection mode</td></tr>";
+  text += "<tr><td><b>P</b></td><td>Toggles paper texture display</td></tr>";
+  text += "<tr><td><b>M</b></td><td>Toggles toon shading</td></tr>";
+  text += "<tr><td><b>V</b></td><td>Toggles visibility algorithm</td></tr>";
+
+  text += "<tr><td><b>R</b></td><td>Reset camera to the latest ViewMap computation settings</td></tr>";
+  text += "<tr><td><b>Shift+R</b></td><td>Toggles snapshots mode</td></tr>";
+
+  text += "<tr><td><b>U</b></td><td>Recomputes the ViewMap when the view changes</td></tr>";
+
+  text += "<tr><td><b>+/-</b></td><td>Change paper texture</td></tr>";
+  text += "<tr><td><b>PgUp/PgDn</b></td><td>Changes EnvMap</td></tr>";
+  text += "<tr><td><b>Ctrl+PgUp/PgDn</b></td><td>Changes blending function</td></tr>";
+  text += "</table>";
+  text += QGLViewer::keyboardString();
+  return text;
+}
+
+void AppGLWidget::init()
+{
+  setShortcut(QGLViewer::EXIT_VIEWER, 0);
+//  setShortcut(QGLViewer::DISPLAY_Z_BUFFER, 0);
+  setShortcut(QGLViewer::STEREO, 0);
+  setShortcut(QGLViewer::ANIMATION, 0);
+  setShortcut(QGLViewer::EDIT_CAMERA, 0);
+
+  restoreStateFromFile();
+
+  //trackball().fitBBox(_ModelRootNode->bbox().getMin(), _ModelRootNode->bbox().getMax(), _Fovy);
+
+   glClearColor(1,1,1,0);
+   glShadeModel(GL_SMOOTH);
+  
+   glCullFace(GL_BACK);
+   glEnable(GL_CULL_FACE);
+   glEnable(GL_DEPTH_TEST);
+
+   // open and read texture data
+   Config::Path * cpath = Config::Path::getInstance();
+   QString envmapDir = cpath->getEnvMapDir();
+   LoadEnvMap((envmapDir + QString("gray00.png")).toAscii().data());
+   //LoadEnvMap(Config::ENV_MAP_DIR + "gray01.bmp");
+   LoadEnvMap((envmapDir + QString("gray02.png")).toAscii().data());
+   LoadEnvMap((envmapDir + QString("gray03.png")).toAscii().data());
+   LoadEnvMap((envmapDir + QString("brown00.png")).toAscii().data());
+   glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP) ;
+   glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP) ;
+
+   // gl settings for Environmental Texturing:
+   glColor3f(1, 1, 1);
+
+   // Use GL auto-computed enviroment texture coordinates
+   //glEnable(GL_TEXTURE_GEN_S);
+   //glEnable(GL_TEXTURE_GEN_T);
+
+   // Bind the texture to use
+   //glBindTexture(GL_TEXTURE_2D,texture);
+   glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+   //glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+   
+   // parametres de melange
+   //glBlendFunc(GL_ONE, GL_ONE);
+   glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 
+   //glBlendEquatio(GL_FUNC_ADD);
+     
+   //glEnable(GL_BLEND);
+   NodeLight *light = new NodeLight;
+   _Light.AddChild(light);
+
+   // Change QGLViewer's default shortcut for snapshots
+   setShortcut(QGLViewer::SAVE_SCREENSHOT, Qt::CTRL + Qt::Key_W);
+   //   setShortcutKey (QGLViewer::SAVE_SCREENSHOT, Key_W);
+   //   setShortcutStateKey(QGLViewer::SAVE_SCREENSHOT, ControlButton);
+  
+   cout << "Renderer (GL)    : " << glGetString(GL_RENDERER) << endl
+	<< "Vendor (GL)      : " << glGetString(GL_VENDOR) << endl << endl;
+}
+
+void AppGLWidget::draw()
+{
+  if (true == _Draw3DScene)
+    {
+      if (true == _selection_mode) {
+	_pSelectRenderer->setSelectRendering(false);
+	_pSelectRenderer->resetColor();
+	DrawScene(_pSelectRenderer);
+      } else
+ 	DrawScene(_pGLRenderer);
+  
+      if (true == _silhouette)
+	DrawSilhouette();
+  
+      if (true == _drawBBox) {
+	glPushAttrib(GL_ALL_ATTRIB_BITS);
+	_ModelRootNode->accept(*_pBBoxRenderer);
+	glPopAttrib();
+      }
+
+      if (true == _debug) {
+	glPushAttrib(GL_ALL_ATTRIB_BITS);
+	_DebugRootNode->accept(*_pDebugRenderer);
+	glPopAttrib();
+      }
+    }
+
+  if (true == _Draw2DScene) {
+    Draw2DScene(_pGLRenderer);
+    Set3DContext();
+  }
+  if(_record){
+    saveSnapshot(true);
+  }
+   if(_captureMovie)
+  {
+    if(!camera()->keyFrameInterpolator(0)->interpolationIsStarted())
+    {
+      _captureMovie = false;
+      return;
+    }
+    saveSnapshot(true);
+  }
+}
+
+void AppGLWidget::DrawScene(SceneVisitor *iRenderer)
+{
+  glPushAttrib(GL_ALL_ATTRIB_BITS);
+
+  if(_drawEnvMap)
+  {
+    _ModelRootNode->SetLightingEnabled(false);
+    glEnable(GL_COLOR_MATERIAL);
+
+    glEnable(GL_TEXTURE_2D);
+    // Bind the texture to use
+    glBindTexture(GL_TEXTURE_2D,_currentEnvMap); 
+    switch(_blendFunc)
+    {
+    case 0:
+      glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE) ;
+      glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 
+      glEnable(GL_BLEND);
+      break;
+    case 1:
+      glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE) ;
+      glDisable(GL_BLEND);
+      break;
+      //    case 2:
+      //      glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE) ;
+      //      glBlendFunc(GL_ONE_MINUS_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 
+      //      glEnable(GL_BLEND);
+      //      break;
+      //    case 3:
+      //      glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE) ;
+      //      glBlendFunc(GL_ONE_MINUS_DST_COLOR, GL_ONE_MINUS_SRC_COLOR); 
+      //      glEnable(GL_BLEND);
+      //      break;
+      //    case 4:
+      //      glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE) ;
+      //      glBlendFunc(GL_DST_ALPHA, GL_ONE_MINUS_DST_ALPHA); 
+      //      glEnable(GL_BLEND);
+      //      break;
+    default:
+      break;
+    }
+
+    glEnable(GL_TEXTURE_GEN_S);
+    glEnable(GL_TEXTURE_GEN_T);
+  }
+
+  // FIXME
+  //  //_ModelRootNode->SetLightingEnabled(true);
+  //  if(_ModelRootNode->style() == DrawingStyle::LINES){
+  //    glPushAttrib(GL_ALL_ATTRIB_BITS);
+  //    //glDisable(GL_COLOR_MATERIAL);
+  //    _ModelRootNode->SetStyle(DrawingStyle::FILLED);
+  //    _ModelRootNode->SetLightingEnabled(true);
+  //    _ModelRootNode->accept(*iRenderer);  
+  //    _ModelRootNode->SetStyle(DrawingStyle::LINES);
+  //    _ModelRootNode->SetLightingEnabled(false);
+  //    _ModelRootNode->accept(*iRenderer);  
+  //    glPopAttrib();
+  //  }
+  //  else
+  _ModelRootNode->accept(*iRenderer);
+
+  glDisable(GL_TEXTURE_GEN_S);
+  glDisable(GL_TEXTURE_GEN_T);
+  glDisable(GL_TEXTURE_2D);
+  glDisable(GL_COLOR_MATERIAL);
+  _ModelRootNode->SetLightingEnabled(true);
+
+  if(_fedges == true)
+    _SilhouetteRootNode->accept(*iRenderer);
+
+  // FIXME: deprecated
+//   if(_debug == true)
+//     _DebugRootNode->accept(*iRenderer);
+  
+  glPopAttrib();
+}
+
+void AppGLWidget::prepareCanvas()
+{
+  makeCurrent();
+  glPushAttrib(GL_ALL_ATTRIB_BITS);
+
+  if(_frontBufferFlag){
+    if(_backBufferFlag)
+      glDrawBuffer(GL_FRONT_AND_BACK);
+    else
+      glDrawBuffer(GL_FRONT);
+  }
+  else if(_backBufferFlag)
+    glDrawBuffer(GL_BACK);
+  
+  // Projection Matrix
+  //==================
+  glMatrixMode(GL_PROJECTION);
+  glLoadIdentity();
+  
+  glOrtho(0,width(), 0, height(), -1.0, 1.0);
+  
+  //Modelview Matrix
+  //================
+  glMatrixMode(GL_MODELVIEW);
+  glLoadIdentity();
+}
+
+void AppGLWidget::releaseCanvas()
+{
+  makeCurrent();
+  glDrawBuffer(GL_BACK);
+  glPopAttrib();
+}
+
+void AppGLWidget::Draw2DScene(SceneVisitor *iRenderer)
+{
+  static bool first = 1;
+  glPushAttrib(GL_ALL_ATTRIB_BITS);
+
+//    // Projection Matrix
+//    //==================
+  glMatrixMode(GL_PROJECTION);
+  glLoadIdentity();
+  glOrtho(0,width(), 0, height(), -1.0, 1.0);
+
+//    //Modelview Matrix
+//    //================
+  glMatrixMode(GL_MODELVIEW);
+  glLoadIdentity();
+
+  //  glBegin(GL_LINE_LOOP);
+  //  glVertex2f(0,0);
+  //  glVertex2f(100,0);
+  //  glVertex2f(100,100);
+  //  glVertex2f(0,100);
+  //  glEnd();
+
+  //glDrawBuffer(GL_FRONT_AND_BACK);
+  // Draw visible silhouette
+  //_pVisibleSilhouetteNode->Render(iRenderer);
+  Canvas * canvas = Canvas::getInstance();
+  if((canvas) && (!canvas->isEmpty()))
+  {
+    if (first)
+    {
+      canvas->init();
+      first = false;
+    }
+    canvas->Render(canvas->renderer());
+  }
+  
+  glLoadIdentity();
+  //  glColor3f(0.f,1.f,0.f);
+  //  glLineWidth(5.f);
+  //glPolygonOffset(0.5f, 0.5f);
+  glPushAttrib(GL_DEPTH_BUFFER_BIT);
+  glDisable(GL_DEPTH_TEST);
+  _p2DSelectionNode->accept(*iRenderer);
+  glPopAttrib();
+  // Draw Feature edges
+  //  if(_fedges == true)
+  //  {
+  //    _pFENode->Render(iRenderer);
+  //  }
+ 
+  glPopAttrib();
+}
+
+void AppGLWidget::DrawSilhouette()
+{
+  glPushAttrib(GL_ALL_ATTRIB_BITS);
+  
+  glDepthFunc(GL_LESS);
+  glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
+  DrawScene(_pMonoColorRenderer);
+
+  glCullFace(GL_FRONT);
+  glDepthFunc(GL_LEQUAL);
+  glEnable(GL_POLYGON_OFFSET_FILL);
+  glLineWidth(3.0);
+  //glPolygonOffset(10.f, 10.f);
+  glPolygonOffset(0.5f, 0.5f);
+ 
+  glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+  _pMonoColorRenderer->setColor(0.f, 0.f, 0.f);
+  DrawScene(_pMonoColorRenderer);
+
+  //Restore old context
+  glPopAttrib();
+
+}
+
+void AppGLWidget::ReInitRenderers()
+{
+  // Debug Renderer
+  if(NULL != _pDebugRenderer)
+    _pDebugRenderer->ReInit(rabs(_ModelRootNode->bbox().getMax()[1] -
+				 _ModelRootNode->bbox().getMin()[1]));
+}
+
+void AppGLWidget::setFrontBufferFlag(bool iBool){
+  _frontBufferFlag = iBool;
+}
+bool AppGLWidget::getFrontBufferFlag() {
+  return _frontBufferFlag;
+}
+void AppGLWidget::setBackBufferFlag(bool iBool){
+  _backBufferFlag = iBool;
+}
+bool AppGLWidget::getBackBufferFlag() {
+  return _backBufferFlag;
+}
+
+//void AppGLWidget::DrawLines()
+//{
+//  //Antialiasing:
+//  glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+//  glEnable(GL_BLEND);
+//  glEnable(GL_LINE_SMOOTH);
+//  glPolygonMode(GL_FRONT, GL_LINE);
+//
+//  glColor3f(0.f, 0.f, 0.f);
+//  glLineWidth(2.f);
+//
+//  DrawScene();
+//}
+//
+//void AppGLWidget::DrawSurfacic()
+//{
+//  glPolygonMode(GL_FRONT, GL_FILL);
+//  glShadeModel(GL_SMOOTH);
+//  
+//  glEnable(GL_LIGHTING);
+//  glEnable(GL_LIGHT0);
+//
+//  
+//  GLreal diffuseV[] = {0.5, 0.7, 0.5, 1.0};
+//  glMaterialfv(GL_FRONT, GL_DIFFUSE, diffuseV);
+//
+//  //glColor3f(0.f, 0.f, 0.f);
+//
+//  DrawScene();
+//
+//  glDisable(GL_LIGHTING);
+//}
+//
+//void AppGLWidget::DrawDepthBuffer()
+//{
+//  GLint w = width();
+//  GLint h = height();
+//
+//  glPolygonMode(GL_FRONT, GL_FILL);
+//  
+//  //Disable the writing in the frame buffer
+//  glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
+//
+//  //This rendering will only fills the depth buffer
+//  DrawScene();
+//
+//  //Re-enable the frame buffer writing
+//  glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+//
+//
+//  GLreal *zPixels = new real[w*h];
+//  GLreal *colorPixels = new real[4*w*h];
+//
+// // glReadBuffer(GL_FRONT); //in reality: glReadBuffer and glDrawBuffer are both set to GL_BACK
+//  glReadPixels(0,0,w, h, GL_DEPTH_COMPONENT, GL_real, (GLreal*)zPixels);
+//
+//  real *tmpZ = zPixels;
+//  real *tmpColor = colorPixels;
+//
+//  for(int i=0; i<h; i++)
+//  {
+//    for(int j=0; j<w; j++)
+//    {
+//      //fprintf(test, " %.5f ", pixels[i*w+j]);
+//      tmpColor[0] = *tmpZ;
+//      tmpColor[1] = *tmpZ;
+//      tmpColor[2] = *tmpZ;
+//      tmpColor[3] = 1.f;
+//
+//      tmpColor += 4;
+//      tmpZ++;
+//    }
+//  }
+//  glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
+// // glDrawBuffer(GL_FRONT_AND_BACK);
+//  //glRasterPos2i(0, 0);
+//  //glLoadIdentity();
+//  glDrawPixels(w, h, GL_RGBA, GL_real, (GLreal *)colorPixels);
+//    
+//  delete [] zPixels;
+//  delete [] colorPixels;  
+//}
+
diff --git a/extern/freestyle/src/app/AppGLWidget.h b/extern/freestyle/src/app/AppGLWidget.h
new file mode 100755
index 00000000000..24bb2c7229b
--- /dev/null
+++ b/extern/freestyle/src/app/AppGLWidget.h
@@ -0,0 +1,526 @@
+//
+//  Filename         : AppConfig.h
+//  Author           : Stephane Grabli
+//  Purpose          : Configuration file
+//  Date of creation : 26/02/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  ARTGLWIDGET_H
+# define ARTGLWIDGET_H
+
+# ifndef WIN32
+#  include <algorithm>
+using namespace std;
+#  define __min(x,y) (min(x,y))
+#  define __max(x,y) (max(x,y))
+# endif // WIN32
+
+
+# include <qstringlist.h>
+# include "../geometry/Geom.h"
+# include "../geometry/BBox.h"
+# include "../scene_graph/NodeDrawingStyle.h"
+# include "../system/TimeUtils.h"
+# include "../system/Precision.h"
+# include "AppConfig.h"
+# include "../rendering/GLDebugRenderer.h"
+# include <QGLViewer/qglviewer.h>
+
+using namespace Geometry;
+
+typedef enum {SURFACIC, LINE, DEPTHBUFFER} RenderStyle;
+
+class FEdge;
+class QMainWindow;
+class GLRenderer;
+class GLSelectRenderer;
+class GLBBoxRenderer;
+class GLMonoColorRenderer;
+class GLDebugRenderer;
+
+class AppGLWidget : public QGLViewer
+{
+  Q_OBJECT
+    
+public:
+
+  AppGLWidget(QWidget *iParent, const char *iName = 0);
+  ~AppGLWidget();
+
+public slots:
+  virtual void updateSilhouettes();
+  
+public:
+  virtual void help();
+  
+  // captures a frame animation that was previously registered
+  void captureMovie();
+
+  /*! Sets the rendering style.
+        iStyle
+          The style used to render. Can be:
+          SURFACIC    : usual rendering
+          LINES       : line rendering
+          DEPTHBUFFER : grey-levels rendering of the depth buffer
+          */
+  inline void SetRenderStyle(RenderStyle iStyle)
+  {
+    _RenderStyle = iStyle;
+  }
+
+  /*! Sets the model to draw in the viewer 
+   *  iModel
+   *    The Root Node of the model 
+   */
+  inline void SetModel(NodeGroup *iModel)
+  {
+    if(0 != _ModelRootNode->numberOfChildren())
+    {
+      _ModelRootNode->DetachChildren();
+      _ModelRootNode->clearBBox();
+    }
+      
+    AddModel(iModel);
+  }
+
+  /*! Adds a model for displaying in the viewer */
+  inline void AddModel(NodeGroup *iModel) 
+  {
+    _ModelRootNode->AddChild(iModel);
+    
+    _ModelRootNode->UpdateBBox();
+
+    _minBBox = __min(__min(_ModelRootNode->bbox().getMin()[0], 
+                            _ModelRootNode->bbox().getMin()[1]),
+                      _ModelRootNode->bbox().getMin()[2]);
+    _maxBBox = __max(__max(_ModelRootNode->bbox().getMax()[0], 
+                            _ModelRootNode->bbox().getMax()[1]),
+                      _ModelRootNode->bbox().getMax()[2]);
+    
+     _maxAbs = __max(rabs(_minBBox), rabs(_maxBBox));
+
+     _minAbs = __min(rabs(_minBBox), rabs(_maxBBox));
+
+     // DEBUG:
+    ReInitRenderers();
+ 
+  }
+
+  inline void AddSilhouette(NodeGroup* iSilhouette)
+  {
+    _SilhouetteRootNode->AddChild(iSilhouette);
+    //ToggleSilhouette(true);
+    updateGL();
+  }
+
+  inline void Add2DSilhouette(NodeGroup *iSilhouette)
+  {
+    //_pFENode->AddChild(iSilhouette);
+    //ToggleSilhouette(true);
+    updateGL();
+  }
+
+  inline void Add2DVisibleSilhouette(NodeGroup *iVSilhouette)
+  {
+    //_pVisibleSilhouetteNode->AddChild(iVSilhouette);
+    updateGL();
+  }
+
+  inline void SetDebug(NodeGroup* iDebug)
+  {
+    if(0 != _DebugRootNode->numberOfChildren())
+    {
+      _DebugRootNode->DetachChildren();
+      _DebugRootNode->clearBBox();
+    }
+      
+    AddDebug(iDebug);
+  }
+
+  inline void AddDebug(NodeGroup* iDebug)
+  {
+    _DebugRootNode->AddChild(iDebug);
+    updateGL();
+  }
+
+  inline void DetachModel(Node *iModel)
+  {
+    _ModelRootNode->DetachChild(iModel);
+    _ModelRootNode->UpdateBBox();
+    
+    _minBBox = __min(__min(_ModelRootNode->bbox().getMin()[0], 
+                            _ModelRootNode->bbox().getMin()[1]),
+                      _ModelRootNode->bbox().getMin()[2]);
+    _maxBBox = __max(__max(_ModelRootNode->bbox().getMax()[0], 
+                            _ModelRootNode->bbox().getMax()[1]),
+                      _ModelRootNode->bbox().getMax()[2]);
+    
+     _maxAbs = __max(rabs(_minBBox), rabs(_maxBBox));
+     _minAbs = __min(rabs(_minBBox), rabs(_maxBBox));
+  } 
+
+  inline void DetachModel() 
+  {
+    _ModelRootNode->DetachChildren();
+    _ModelRootNode->clearBBox();
+    
+    // 2D Scene
+    //_p2DNode.DetachChildren();
+    //_pFENode->DetachChildren();
+    //_pVisibleSilhouetteNode->DetachChildren();
+    updateGL();
+  }
+
+  inline void DetachSilhouette()
+  {
+    _SilhouetteRootNode->DetachChildren();
+    //_pFENode->DetachChildren();
+    //_pVisibleSilhouetteNode->DetachChildren();
+    _p2DSelectionNode->destroy();
+    //updateGL(); //FIXME
+  }
+
+  inline void DetachVisibleSilhouette()
+  {
+    //_pVisibleSilhouetteNode->DetachChildren();
+    _p2DSelectionNode->destroy();
+    updateGL();
+  }
+
+  inline void DetachDebug()
+  {
+    _DebugRootNode->DetachChildren();
+    updateGL();
+  }
+
+  void SetMainWindow(QMainWindow *iMainWindow) ;
+
+  inline void Set3DContext()
+  {
+    // GL_PROJECTION matrix
+    camera()->loadProjectionMatrix();
+    // GL_MODELVIEW matrix
+    camera()->loadModelViewMatrix();
+  }
+  
+  inline void RetriveModelViewMatrix(float *p)
+  {
+    makeCurrent();
+    glGetFloatv(GL_MODELVIEW_MATRIX, p);
+  }
+  inline void RetriveModelViewMatrix(real *p)
+  {
+    makeCurrent();
+    glGetDoublev(GL_MODELVIEW_MATRIX, p);
+  }
+
+  inline void RetrieveProjectionMatrix(float *p)
+  {
+    makeCurrent();
+    glGetFloatv(GL_PROJECTION_MATRIX, p);
+
+  }
+  inline void RetrieveProjectionMatrix(real *p)
+  {
+    makeCurrent();
+    glGetDoublev(GL_PROJECTION_MATRIX, p);
+
+  }
+
+  inline void RetrieveViewport(int *p)
+  {
+    makeCurrent();
+    glGetIntegerv(GL_VIEWPORT,(GLint *)p);
+  }
+  
+  inline real GetFocalLength() const
+  {
+    real Near =  __max(0.1,(real)(-2.f*_maxAbs+camera()->distanceToSceneCenter()));
+    return Near;
+  }
+
+  inline real GetAspect() const
+  {
+    return ((real) width()/(real) height());
+  }
+
+  inline real GetFovyRadian() const
+  {
+    return _Fovy/180.0 * M_PI;
+  }
+
+  inline real GetFovyDegrees() const
+  {
+    return _Fovy;
+  }
+
+  inline void FitBBox()
+  {
+    qglviewer::Vec min_(_ModelRootNode->bbox().getMin()[0],
+			_ModelRootNode->bbox().getMin()[1],
+			_ModelRootNode->bbox().getMin()[2]);
+    qglviewer::Vec max_(_ModelRootNode->bbox().getMax()[0],
+			_ModelRootNode->bbox().getMax()[1],
+			_ModelRootNode->bbox().getMax()[2]);
+    setSceneBoundingBox(min_, max_);
+    camera()->showEntireScene();
+  }
+  
+  inline void ToggleSilhouette(bool enabled) 
+  {
+    _fedges = enabled;
+    updateGL();
+  }
+  
+  // Reinit the renderers which need to be informed
+  // when a model is added to the scene.
+  void ReInitRenderers();
+
+  inline void SetSelectedFEdge(FEdge* iFEdge) { _pDebugRenderer->SetSelectedFEdge(iFEdge); }
+
+  inline GLDebugRenderer* debugRenderer() { return _pDebugRenderer; }
+  inline void toggle3D() { _Draw3DScene == true ? _Draw3DScene = false : _Draw3DScene = true; updateGL();}
+
+  /*! glReadPixels */
+  typedef enum{
+    RGB,
+    DEPTH
+  } PixelFormat;
+  void readPixels(int x,
+                  int y,
+                  int width,
+                  int height,
+                  PixelFormat format,
+                  float *pixels) 
+  {
+    makeCurrent();
+    //glReadBuffer(GL_FRONT); //in reality: glReadBuffer and glDrawBuffer are both set to GL_BACK
+    glReadBuffer(GL_BACK);
+    GLenum glformat;
+    switch(format)
+    {
+    case RGB:
+      glformat = GL_RGB;
+      break;
+    case DEPTH:
+      glformat = GL_DEPTH_COMPONENT;
+      break;
+    default:
+      break;
+    }
+    glReadPixels(x,y,width, height, glformat, GL_FLOAT, (GLfloat*)pixels);
+  }
+
+  void clear() { makeCurrent(); glClear(GL_COLOR_BUFFER_BIT ); }
+
+  void prepareCanvas();
+  void releaseCanvas();
+
+  typedef enum {
+    FRONT,
+    BACK
+  } GLBuffer;
+
+  void setReadPixelsBuffer(int iBuffer) 
+  {
+    makeCurrent();
+    switch(iBuffer)
+    {
+    case FRONT:
+      glReadBuffer(GL_FRONT);
+      break;
+    case BACK:
+      glReadBuffer(GL_BACK);
+      break;
+    default:
+      break;
+    }
+  }
+
+  BBox<Vec3r> scene3DBBox() const { return _ModelRootNode->bbox(); }
+
+  inline real znear() const {
+    //    return __max((float)_maxAbs/5,(float)(-_maxAbs+camera()->distanceToSceneCenter()));
+    return camera()->zNear();
+  }
+  
+  inline real zfar() const {
+    //    return _maxAbs+camera()->distanceToSceneCenter();
+    return camera()->zFar();
+  }
+
+  inline bool draw3DsceneEnabled() const { return _Draw3DScene; }
+
+  inline bool getRecordFlag() const {return _record;}
+
+  void setCameraState(const float* position, const float* orientation) {
+    camera()->setPosition(qglviewer::Vec(position[0], position[1], position[2]));
+    camera()->setOrientation(qglviewer::Quaternion(orientation[0], orientation[1], orientation[2], orientation[3]));
+  }
+
+  void getCameraState(float* position, float* orientation) const {
+    qglviewer::Vec pos = camera()->position();
+    qglviewer::Quaternion orient = camera()->orientation();
+    int i;
+    for(i=0;i<3;++i){
+      position[i] = pos[i];
+    }
+    for(i=0;i<4;++i){
+      orientation[i] = orient[i];
+    }
+  }
+
+  void saveCameraState() {
+    getCameraState(_cameraPosition, _cameraOrientation);
+    _cameraStateSaved = true;
+  }
+
+  void setUpdateMode(bool b) {
+    _enableUpdateSilhouettes = b;
+  }
+
+  bool getUpdateMode() const {
+    return _enableUpdateSilhouettes;
+  }
+  static void setFrontBufferFlag(bool iBool);
+  static bool getFrontBufferFlag();
+  static void setBackBufferFlag(bool iBool);
+  static bool getBackBufferFlag();
+
+  // help
+  virtual QString helpString() const ;
+
+  virtual QString mouseString() const;
+  virtual QString keyboardString() const;
+
+protected:
+  virtual void    mousePressEvent(QMouseEvent *);
+  virtual void    mouseReleaseEvent  (  QMouseEvent *    e  ) ;
+  virtual void    select(const QMouseEvent *);
+  virtual void    keyPressEvent(QKeyEvent* e);
+  virtual void	  init();
+  virtual void    draw();
+
+  /*! Loads an envmap */
+  void LoadEnvMap(const char *filename);
+
+public:
+  /*! Core scene drawing */
+  void            DrawScene(SceneVisitor *iRenderer);
+
+  /*! 2D Scene Drawing */
+  void            Draw2DScene(SceneVisitor *iRenderer);
+
+  /*! Draws scene silhouettes in real time */
+  void            DrawSilhouette();
+  
+  /*! Draws the Scene in lines style */
+  //  void            DrawLines();
+  //  /*! Draws the scene in surfacic style */
+  //  void            DrawSurfacic();
+  //  /*! Draws the scene as a depth buffer image */
+  //  void            DrawDepthBuffer();
+
+  GLRenderer* glRenderer() {return _pGLRenderer;}
+
+protected:
+
+
+  //QString shortcutBindingsString() const;
+
+  /*! fabs or abs */
+  inline int rabs(int x) {return abs(x);}
+  inline real rabs(real x) {return fabs(x);}
+
+  
+protected:
+  float _Fovy;
+  //float _SceneDepth;
+  //BBox<Vec3f> _BBox;
+  
+  RenderStyle _RenderStyle;
+
+  //The root node container
+  NodeGroup        _RootNode;
+  NodeDrawingStyle *_ModelRootNode;
+  NodeDrawingStyle *_SilhouetteRootNode;
+  NodeDrawingStyle *_DebugRootNode;
+  
+  bool _silhouette;
+  bool _fedges;
+  bool _debug;
+  bool _selection_mode;
+
+  //a Universal light:
+  NodeGroup _Light;
+
+  real _minBBox;
+  real _maxBBox;
+  real _maxAbs;
+
+  real _minAbs;
+  bool _drawBBox;
+
+  // OpenGL Renderer
+  GLRenderer *_pGLRenderer;
+  GLSelectRenderer *_pSelectRenderer;
+  GLBBoxRenderer *_pBBoxRenderer;
+  GLMonoColorRenderer *_pMonoColorRenderer;
+  GLDebugRenderer *_pDebugRenderer;
+  
+  QMainWindow *_pMainWindow;
+
+  Chronometer _Chrono;
+
+  // 2D Scene
+  bool _Draw2DScene;
+  bool _Draw3DScene;  NodeGroup _p2DNode;
+  //NodeDrawingStyle *_pFENode; // Feature edges node
+  //NodeDrawingStyle *_pVisibleSilhouetteNode;
+  NodeDrawingStyle *_p2DSelectionNode;
+
+  // EnvMap
+  bool _drawEnvMap;
+  int _currentEnvMap;
+  int _maxId;
+  int _blendFunc;
+
+  // Each time we compute the view map, the camera state is 
+  // saved in order to be able to restore it later
+  bool  _cameraStateSaved;
+  float _cameraPosition[3];
+  float _cameraOrientation[4];
+
+  // interactive silhouette update
+  bool _enableUpdateSilhouettes;
+  //capture movie
+  bool _captureMovie;
+  // 2D drawing buffers
+  static bool _frontBufferFlag;
+  static bool _backBufferFlag;
+
+  bool _record;
+};
+
+#endif // ARTGLWIDGET_H
diff --git a/extern/freestyle/src/app/AppInteractiveShaderWindow.cpp b/extern/freestyle/src/app/AppInteractiveShaderWindow.cpp
new file mode 100755
index 00000000000..b074c85f9f9
--- /dev/null
+++ b/extern/freestyle/src/app/AppInteractiveShaderWindow.cpp
@@ -0,0 +1,119 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+#include <QTextEdit>
+#include <QFileDialog>
+#include "AppConfig.h"
+#include "Controller.h"
+#include "AppInteractiveShaderWindow.h"
+#include "QStyleModuleSyntaxHighlighter.h"
+
+AppInteractiveShaderWindow::AppInteractiveShaderWindow(QWidget* parent /* = 0 */, const char* name /* = 0 */, bool modal /* = FALSE */, Qt::WFlags fl /* = 0  */)
+: InteractiveShaderWindow() // parent, name, modal, fl)
+{
+	setupUi(this);
+  _CurrentShaderRow = -1;
+  _syntaxHighlighter = new QStyleModuleSyntaxHighlighter(TextArea);
+	// signals and slots connections
+    connect( CancelButton, SIGNAL( clicked() ), this, SLOT( fileClose() ) );
+    connect( SaveButton, SIGNAL( clicked() ), this, SLOT( fileSave() ) );
+    connect( SaveAsButton, SIGNAL( clicked() ), this, SLOT( fileSaveAs() ) );
+    connect( OkButton, SIGNAL( clicked() ), this, SLOT( fileOk() ) );
+}
+
+AppInteractiveShaderWindow::~AppInteractiveShaderWindow()
+{
+  if(_syntaxHighlighter){
+    delete _syntaxHighlighter;
+  }
+}
+
+void AppInteractiveShaderWindow::fileOk()
+{
+  fileSave();
+  fileClose();
+}
+
+void AppInteractiveShaderWindow::fileClose()
+{
+  TextArea->clear();
+  close();
+}
+
+void AppInteractiveShaderWindow::fileSave()
+{
+  QFile file(_CurrentShader);
+  if ( !file.open( QIODevice::WriteOnly ) )
+    return;
+  QTextStream ts( &file );
+  ts << TextArea->toPlainText();
+
+  file.close();
+  emit save();
+  g_pController->setModified(_CurrentShaderRow, true);
+}
+
+void AppInteractiveShaderWindow::fileSaveAs()
+{
+  QFileInfo fi1(_CurrentShader);
+  QString ext1 = fi1.suffix();
+  QString fn;
+
+  if (ext1 == Config::STYLE_MODULE_EXTENSION)
+    fn = QFileDialog::getSaveFileName(this,
+						"save file dialog"
+				      "Choose a file",
+						g_pController->getModulesDir(),
+				      "Style modules (*." + Config::STYLE_MODULE_EXTENSION + ")");
+  if (!fn.isEmpty() && (_CurrentShader == fn))
+    fileSave();
+  else if (!fn.isEmpty())
+    {
+      QFileInfo fi2(fn);
+      QString ext2 = fi2.suffix();
+      if (ext1 != ext2)
+	fn += "." + ext1;
+      QFile file(fn);
+	  if ( !file.open( QIODevice::WriteOnly ) )
+	return;
+      QTextStream ts( &file );
+      ts << TextArea->toPlainText();
+      file.close();
+      g_pController->AddStyleModule(fn.toAscii().data());
+      g_pController->setModulesDir(fi2.dir().path());
+    }
+}
+
+void AppInteractiveShaderWindow::DisplayShader(QString& iName)
+{
+  _CurrentShader = iName;
+  QFile file( iName);
+  if ( !file.open( QIODevice::ReadOnly ) )
+	  return;
+  
+  QTextStream ts( &file );
+  TextArea->setText( ts.readAll() );
+  TextArea->viewport()->setFocus();
+
+  // Set window title:
+  QFileInfo fi(iName);
+  setWindowTitle(fi.fileName());
+  g_pController->setModulesDir(fi.dir().path());
+}
diff --git a/extern/freestyle/src/app/AppInteractiveShaderWindow.h b/extern/freestyle/src/app/AppInteractiveShaderWindow.h
new file mode 100755
index 00000000000..58f2aa1f01a
--- /dev/null
+++ b/extern/freestyle/src/app/AppInteractiveShaderWindow.h
@@ -0,0 +1,73 @@
+#ifndef ARTINTERACTIVESHADERWINDOW_H
+#define ARTINTERACTIVESHADERWINDOW_H
+
+//------------------------------------------------------------------------------------------//
+//
+//                        FileName          : AppInteractiveShaderWindow.h
+//                        Author            : Stephane Grabli
+//                        Purpose           : Class to define the graphic window displaying the interactive shader
+//                        Date Of Creation  : 21/10/2002
+//
+//------------------------------------------------------------------------------------------//
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+#include "ui_dir/ui_interactiveshaderwindow4.h"
+#include <QKeyEvent>
+
+using namespace Ui;
+
+class QStyleModuleSyntaxHighlighter;
+class AppInteractiveShaderWindow : public QDialog, public InteractiveShaderWindow
+{
+  Q_OBJECT
+    public:
+		AppInteractiveShaderWindow(QWidget *parent = 0, const char *name = 0, bool modal = FALSE, Qt::WFlags fl = 0);
+  virtual ~AppInteractiveShaderWindow();
+
+public slots:
+  virtual void fileOk();
+  virtual void fileClose();
+  virtual void fileSave();
+  virtual void fileSaveAs();
+  
+  void DisplayShader(QString& iName);
+  void setCurrentShaderRow(int current) { _CurrentShaderRow = current; }
+  int getCurrentShaderRow() const { return _CurrentShaderRow; }
+
+ signals:
+  void save(  );
+
+ protected:
+
+	 void keyPressEvent(QKeyEvent *e) {
+		 if (e->key() == Qt::Key_Escape)
+	return;
+      QDialog::keyPressEvent(e);
+  }
+
+ private:
+  int _CurrentShaderRow;
+  QString _CurrentShader;
+  QStyleModuleSyntaxHighlighter *_syntaxHighlighter;
+};
+
+#endif
+
diff --git a/extern/freestyle/src/app/AppMainWindow.cpp b/extern/freestyle/src/app/AppMainWindow.cpp
new file mode 100755
index 00000000000..03b4f3a28ea
--- /dev/null
+++ b/extern/freestyle/src/app/AppMainWindow.cpp
@@ -0,0 +1,288 @@
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+#include <QApplication>
+#include <QCursor>
+#include <QProgressDialog>
+#include <QFileDialog>
+#include <QFile>
+#include <QStatusBar>
+#include <QToolBar>
+#include <QToolButton>
+#include <QLayout>
+#include "AppMainWindow.h"
+#include "AppGLWidget.h"
+#include "Controller.h"
+#include "AppConfig.h"
+
+AppMainWindow::AppMainWindow(QWidget *parent, const char *name, Qt::WindowFlags f)
+	: QMainWindow(parent, f)  // parent, name, f)
+{
+	setupUi(this); 
+	pQGLWidget = new AppGLWidget(this);
+	gridLayout->addWidget(pQGLWidget);
+
+  // setCaption(Config::APPLICATION_NAME + " " + Config::APPLICATION_VERSION);
+  setGeometry(20,20,700,700);
+  pQGLWidget->SetMainWindow(this);
+
+  _ProgressBar = new QProgressDialog(Config::APPLICATION_NAME + " Progress Dialog", "Cancel", 
+				     0, 100, this);
+	// signals and slots connections
+    connect( actionOpen, SIGNAL( triggered() ), this, SLOT( fileOpen() ) );
+    connect( actionQuit, SIGNAL( triggered() ), this, SLOT( close() ) );
+    connect( actionClose, SIGNAL( triggered() ), this, SLOT( fileClose() ) );
+    connect( actionComputeViewMap, SIGNAL( triggered() ), this, SLOT( ComputeViewMap() ) );
+    connect( actionSave, SIGNAL( triggered() ), this, SLOT( ViewMapFileSave() ) );
+    connect( actionStyleModelerWindow, SIGNAL( triggered() ), this, SLOT( DisplayStylesWindow() ) );
+    connect( actionOptionsWindow, SIGNAL( triggered() ), this, SLOT( DisplayOptionsWindow() ) );
+    connect( actionComputeStrokes, SIGNAL( triggered() ), this, SLOT( ComputeStrokes() ) );
+    connect( actionHelp, SIGNAL( triggered() ), this, SLOT( DisplayHelp() ) );
+    connect( actionSaveSnapshot, SIGNAL( triggered() ), this, SLOT( Snapshot() ) );
+    connect( actionCaptureMovie, SIGNAL( triggered() ), this, SLOT( captureMovie() ) );
+    connect( actionResetInterpreter, SIGNAL( triggered() ), this, SLOT( ResetInterpreter() ) );
+    connect( actionSaveDirectionalViewMapImages, SIGNAL( triggered() ), this, SLOT( SaveDirectionalViewMapImages() ) );
+    connect( actionAbout, SIGNAL( triggered() ), this, SLOT( About() ) );
+    connect( actionLoadCamera, SIGNAL( triggered() ), this, SLOT( loadCamera() ) );
+    connect( actionSavePSSnapshot, SIGNAL( triggered() ), this, SLOT( PSSnapshot() ) );
+    connect( actionSaveTextSnapshot, SIGNAL( triggered() ), this, SLOT( TextSnapshot() ) );
+    connect( actionControlBindings, SIGNAL( triggered() ), pQGLWidget, SLOT( help() ) );
+}
+
+AppMainWindow::~AppMainWindow() {}
+
+void AppMainWindow::fileOpen()
+{
+  QString s = QFileDialog::getOpenFileName(this,
+	  "open file dialog"
+	  "Choose a file",
+	  g_pController->getModelsDir(),
+					   "Scenes (*.3ds *.3DS);;ViewMaps (*." + Config::VIEWMAP_EXTENSION + ")");
+  if ( s.isEmpty() ) {
+    statusBar()->showMessage( "Loading aborted", 2000 );
+    return;
+  }
+
+  QFileInfo fi(s);
+  QString ext = fi.suffix();
+  if ((ext == "3ds") || (ext == "3DS"))
+    {
+      QApplication::setOverrideCursor( Qt::WaitCursor );
+      g_pController->Load3DSFile(s.toAscii().data()); // lunch time...
+      g_pController->setModelsDir(fi.dir().path());
+      QApplication::restoreOverrideCursor();
+    }
+  else if (ext == Config::VIEWMAP_EXTENSION)
+    {
+      QApplication::setOverrideCursor( Qt::WaitCursor );
+      g_pController->LoadViewMapFile(s.toAscii().data()); // ...and now tea time...
+      g_pController->setModelsDir(fi.dir().path());
+      QApplication::restoreOverrideCursor();
+    }
+}
+
+void AppMainWindow::loadCamera()
+{
+  QString s = QFileDialog::getOpenFileName(this,
+						"open file dialog"
+					   "Choose a file",
+						g_pController->getModelsDir(),
+					   "ViewMaps (*." + Config::VIEWMAP_EXTENSION + ")");
+  if ( s.isEmpty() ) {
+    statusBar()->showMessage( "Loading aborted", 2000 );
+    return;
+  }
+
+  QFileInfo fi(s);
+  QString ext = fi.suffix();
+  if (ext == Config::VIEWMAP_EXTENSION)
+    {
+      QApplication::setOverrideCursor( Qt::WaitCursor );
+      g_pController->LoadViewMapFile(s.toAscii().data(), true);
+      QApplication::restoreOverrideCursor();
+    }
+}
+
+void AppMainWindow::ViewMapFileSave() {
+  QString s = QFileDialog::getSaveFileName(this,
+					   "save file dialog"
+					   "Choose a file",
+		g_pController->getModelsDir(),
+					   "ViewMaps (*." + Config::VIEWMAP_EXTENSION + ")");
+  if (s.isEmpty()) {
+    statusBar()->showMessage( "Saving aborted", 2000 );
+    return;
+  }
+
+  QFileInfo fi(s);
+  QString ext = fi.suffix();
+  if(ext != Config::VIEWMAP_EXTENSION)
+    s += "." + Config::VIEWMAP_EXTENSION;
+
+  QApplication::setOverrideCursor( Qt::WaitCursor );
+  g_pController->setModelsDir(fi.dir().path());
+  g_pController->SaveViewMapFile(s.toAscii().data());
+  QApplication::restoreOverrideCursor();
+}
+
+void AppMainWindow::fileClose()
+{
+  g_pController->CloseFile();
+}
+
+void AppMainWindow::DisplayStylesWindow() {
+  g_pController->ExposeStyleWindow();
+}
+
+void AppMainWindow::DisplayOptionsWindow() {
+  g_pController->ExposeOptionsWindow();
+}
+
+void AppMainWindow::DisplayHelp() {
+  g_pController->ExposeHelpWindow();
+}
+
+void AppMainWindow::About() {
+  g_pController->ExposeAboutWindow();
+}
+
+void AppMainWindow::Snapshot() {
+  g_pController->saveSnapshot();
+}
+
+void AppMainWindow::captureMovie() {
+  g_pController->captureMovie();
+}
+
+void AppMainWindow::ResetInterpreter() {
+  g_pController->resetInterpreter();
+}
+
+//void AppMainWindow::BrutForceSilhouette()
+//{
+//  QApplication::setOverrideCursor( Qt::WaitCursor );
+//  g_pController->ComputeSilhouette(Controller::BRUT_FORCE);
+//  QApplication::restoreOverrideCursor();
+//}
+//
+//void AppMainWindow::AppelSilhouette()
+//{
+//  QApplication::setOverrideCursor( Qt::WaitCursor );
+//  g_pController->ComputeSilhouette();
+//  QApplication::restoreOverrideCursor();
+//}
+
+void AppMainWindow::ComputeViewMap()
+{
+  QApplication::setOverrideCursor(Qt::WaitCursor);
+  g_pController->ComputeViewMap();
+  QApplication::restoreOverrideCursor();
+}
+
+void AppMainWindow::SaveDirectionalViewMapImages(){
+  QApplication::setOverrideCursor(Qt::WaitCursor);
+  g_pController->saveSteerableViewMapImages();
+  QApplication::restoreOverrideCursor();
+}
+
+void AppMainWindow::ComputeStrokes()
+{
+  g_pController->DrawStrokes();
+}
+
+//void AppMainWindow::InitProgressBar(const char *title, int numSteps)
+//{
+//  _ProgressBar = new QProgressDialog(title, 0, numSteps, this, "progress", TRUE);
+//  _ProgressBar->show();
+//  _ProgressBar->setProgress(0);
+//}
+//
+//void AppMainWindow::SetProgressLabel(const char *label)
+//{
+//  if(NULL == _ProgressBar)
+//    return;
+//  _ProgressBar->setLabelText(label);
+//}
+//
+//void AppMainWindow::SetProgress(int i)
+//{
+//  _ProgressBar->setProgress(i);
+//  qApp->processEvents();
+//
+//  if(i == _ProgressBar->totalSteps())
+//  {
+//    _ProgressBar->setProgress(_ProgressBar->totalSteps());
+//    delete _ProgressBar;
+//    _ProgressBar = NULL;
+//  }
+//}
+
+void AppMainWindow::DisplayMessage(const char* msg, bool persistent)
+{
+  if(persistent)
+    statusBar()->showMessage( msg);
+  else
+    statusBar()->showMessage( msg, 2000 );
+}
+//void AppMainWindow::toggleSilhouette(bool enabled)
+//{
+//  pQGLWidget->ToggleSilhouette(enabled);
+//}
+
+void AppMainWindow::PSSnapshot() {
+  QString s = QFileDialog::getSaveFileName(this,
+					   "save file dialog"
+					   "Choose a file",
+						g_pController->view()->snapshotFileName(),
+					   "Encapsulated Postscript (*.eps)");
+  if (s.isEmpty()) {
+    statusBar()->showMessage( "Saving aborted", 2000 );
+    return;
+  }
+
+  QFileInfo fi(s);
+  QString ext = fi.suffix();
+  if(ext != "eps")
+    s += ".eps" ;
+
+  QApplication::setOverrideCursor( Qt::WaitCursor );
+  g_pController->savePSSnapshot(s);
+  QApplication::restoreOverrideCursor();
+}
+
+void AppMainWindow::TextSnapshot() {
+  QString s = QFileDialog::getSaveFileName(this,
+						"save file dialog"
+					   "Choose a file",
+						g_pController->getModelsDir(),
+					   "Text File (*.txt)");
+  if (s.isEmpty()) {
+    statusBar()->showMessage( "Saving aborted", 2000 );
+    return;
+  }
+
+  QFileInfo fi(s);
+  QString ext = fi.suffix();
+  if(ext != "txt")
+    s += ".txt" ;
+
+  QApplication::setOverrideCursor( Qt::WaitCursor );
+  g_pController->saveTextSnapshot(s);
+  QApplication::restoreOverrideCursor();
+}
diff --git a/extern/freestyle/src/app/AppMainWindow.h b/extern/freestyle/src/app/AppMainWindow.h
new file mode 100755
index 00000000000..750283f85ba
--- /dev/null
+++ b/extern/freestyle/src/app/AppMainWindow.h
@@ -0,0 +1,83 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+#ifndef ARTMAINWINDOW_H
+#define ARTMAINWINDOW_H
+
+#include <QKeyEvent>
+#include <QWidget>
+#include <QPainter>
+#include <QColorGroup>
+#include <QToolBar>
+#include <QMainWindow>
+#include "ui_dir/ui_appmainwindowbase4.h"
+
+using namespace Ui;
+
+class QProgressDialog;
+class AppGLWidget;
+class AppMainWindow : public QMainWindow, public AppMainWindowBase
+{
+  Q_OBJECT
+
+public:
+
+	AppMainWindow(QWidget *parent = 0, const char *name = 0, Qt::WindowFlags f = Qt::Window);
+  ~AppMainWindow();
+
+  QToolBar *pTools;
+
+public slots:
+  virtual void fileOpen();
+  virtual void fileClose();
+  virtual void loadCamera();
+  virtual void DisplayStylesWindow();
+  virtual void DisplayOptionsWindow();
+  virtual void DisplayHelp();
+  virtual void About();
+  virtual void ViewMapFileSave();
+  //  virtual void AppelSilhouette();
+  //  virtual void BrutForceSilhouette();
+  virtual void ComputeViewMap();
+  virtual void SaveDirectionalViewMapImages();
+  virtual void ComputeStrokes();
+  virtual void Snapshot();
+  virtual void captureMovie();
+  virtual void ResetInterpreter();
+  virtual void PSSnapshot();
+  virtual void TextSnapshot();
+
+public:
+  //  void InitProgressBar(const char *title, int numSteps)
+  ;
+  //  void SetProgressLabel(const char *label);
+  //  void SetProgress(int i);
+  //  
+  void DisplayMessage(const char* msg, bool persistent = false);
+
+  QProgressDialog * qtProgressDialog() {return _ProgressBar;}
+  AppGLWidget * pQGLWidget;
+
+private:
+  QProgressDialog* _ProgressBar;
+};
+
+
+#endif
diff --git a/extern/freestyle/src/app/AppOptionsWindow.cpp b/extern/freestyle/src/app/AppOptionsWindow.cpp
new file mode 100755
index 00000000000..6c3dc9a83aa
--- /dev/null
+++ b/extern/freestyle/src/app/AppOptionsWindow.cpp
@@ -0,0 +1,410 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+// Must be included before any QT header, because of moc
+#include "../system/PythonInterpreter.h"
+
+#include <QCheckBox>
+#include <QLineEdit>
+#include <QFileDialog>
+#include <QString>
+#include <QStringList>
+#include <QListWidgetItem>
+#include "../stroke/StrokeRenderer.h"
+#include "AppConfig.h"
+#include "Controller.h"
+#include "../view_map/ViewMapIO.h"
+#include "AppOptionsWindow.h"
+
+AppOptionsWindow::AppOptionsWindow(QWidget *parent, const char *name, bool modal, Qt::WFlags fl)
+: QDialog(parent, fl) { // parent, name, modal, fl) {
+
+	setupUi(this);
+  const QString sep(Config::DIR_SEP.c_str());
+  QString filename;
+
+  // Create a ConfigIO object
+  filename = Config::Path::getInstance()->getHomeDir() + sep + Config::OPTIONS_DIR + sep + Config::OPTIONS_FILE;
+  _options = new ConfigIO(filename, Config::APPLICATION_NAME + "Options");
+  _options->loadFile();
+
+  // Set the widgets to correct values
+
+  // -> Directories tab
+  QString str;
+  Config::Path * cpath = Config::Path::getInstance();
+  if (_options->getValue("default_path/models/path", str))
+    str = cpath->getModelsPath();
+  modelsPathLineEdit->setText(str);
+  if (_options->getValue("default_path/patterns/path", str))
+    str = cpath->getPatternsPath();
+  patternsPathLineEdit->setText(str);
+  if (_options->getValue("default_path/brushes/path", str))
+    str = cpath->getBrushesPath();
+  brushesPathLineEdit->setText(str);
+  if (_options->getValue("default_path/python/path", str))
+    str = cpath->getPythonPath();
+  pythonPathLineEdit->setText(str);
+
+  // -> Papers Textures tab
+  unsigned papers_nb;
+  QStringList sl;
+  if (_options->getValue("papers/nb", papers_nb)) {
+    sl.push_back(cpath->getPapersDir() + Config::DEFAULT_PAPER_TEXTURE);
+  } else {
+    for (unsigned i = 0; i < papers_nb; i++) {
+      QString path;
+      QTextStream(&path) << "papers/texture" << i << "/filename";
+      _options->getValue(path, str);
+	  paperTexturesList->insertItem(paperTexturesList->count(), str);
+    }
+  }
+  
+
+  // -> Help tab
+  if (_options->getValue("default_browser/cmd", str))
+    str = cpath->getBrowserCmd();
+  browserCmdLineEdit->setText(str);
+  if (_options->getValue("default_path/help/index", str))
+    str = cpath->getHelpIndexpath();
+  helpIndexPathLineEdit->setText(str);
+
+  // -> Misc tab
+  bool b;
+  if (_options->getValue("default_viewmap_format/float_vectors", b))
+    b = false;
+  asFloatCheckBox->setChecked(b);
+  if (_options->getValue("default_viewmap_format/no_occluders", b))
+    b = false;
+  noOccluderListCheckBox->setChecked(b);
+  if (_options->getValue("default_viewmap_format/compute_steerable", b))
+    b = false;
+  steerableViewMapCheckBox->setChecked(b);
+  if (_options->getValue("default_visibility/exhaustive_computation", b))
+    b = true;
+  qiCheckBox->setChecked(b);
+  if (_options->getValue("default_drawing_buffers/back_buffer", b))
+    b = true;
+  backBufferCheckBox->setChecked(b);
+  if (_options->getValue("default_drawing_buffers/front_buffer", b))
+    b = false;
+  frontBufferCheckBox->setChecked(b);
+  real r;
+  if (_options->getValue("default_ridges/sphere_radius", r))
+    r = Config::DEFAULT_SPHERE_RADIUS;
+  sphereRadiusLineEdit->setText(QString(QString::number(r)));
+  if (_options->getValue("default_ridges/enable", b))
+    b = false;
+  ridgeValleyCheckBox->setChecked(b);
+  if (_options->getValue("default_suggestive_contours/enable", b))
+    b = false;
+  suggestiveContoursCheckBox->setChecked(b);
+  if (_options->getValue("default_suggestive_contours/dkr_epsilon", r))
+    r = Config::DEFAULT_DKR_EPSILON;
+  krEpsilonLineEdit->setText(QString(QString::number(r)));
+
+  // Propagate changes
+  Propagate();
+
+	// signals and slots connections
+    connect( okButton, SIGNAL( clicked() ), this, SLOT( Ok() ) );
+    connect( applyButton, SIGNAL( clicked() ), this, SLOT( Apply() ) );
+    connect( closeButton, SIGNAL( clicked() ), this, SLOT( Cancel() ) );
+    connect( patternsPathAddButton, SIGNAL( clicked() ), this, SLOT( PatternsAdd() ) );
+    connect( modelPathAddButton, SIGNAL( clicked() ), this, SLOT( ModelsAdd() ) );
+    connect( addPaperTextureButton, SIGNAL( clicked() ), this, SLOT( PaperAdd() ) );
+    connect( removePaperTextureButton, SIGNAL( clicked() ), this, SLOT( PaperRemove() ) );
+    connect( moveUpPaperTextureButton, SIGNAL( clicked() ), this, SLOT( PaperUp() ) );
+    connect( moveDownPaperTextureButton, SIGNAL( clicked() ), this, SLOT( PaperDown() ) );
+    connect( clearPaperTextureButton, SIGNAL( clicked() ), this, SLOT( PaperClear() ) );
+    connect( pythonPathAddButton, SIGNAL( clicked() ), this, SLOT( PythonAdd() ) );
+    connect( helpIndexPathButton, SIGNAL( clicked() ), this, SLOT( HelpAdd() ) );
+    connect( brushesPathAddButton, SIGNAL( clicked() ), this, SLOT( BrushesAdd() ) );
+}
+
+AppOptionsWindow::~AppOptionsWindow() {
+  delete _options;
+}
+
+void AppOptionsWindow::Propagate() {
+
+  // Directories
+  ViewMapIO::Options::setModelsPath((const char*)modelsPathLineEdit->text().toAscii().data());
+  PythonInterpreter::Options::setPythonPath((const char*)pythonPathLineEdit->text().toAscii().data());
+  TextureManager::Options::setPatternsPath((const char*)patternsPathLineEdit->text().toAscii().data());
+  TextureManager::Options::setBrushesPath((const char*)brushesPathLineEdit->text().toAscii().data());
+  g_pController->setBrowserCmd(browserCmdLineEdit->text());
+  g_pController->setHelpIndex(helpIndexPathLineEdit->text());
+
+  // ViewMap Format
+  if (asFloatCheckBox->isChecked())
+    ViewMapIO::Options::addFlags(ViewMapIO::Options::FLOAT_VECTORS);
+  else
+    ViewMapIO::Options::rmFlags(ViewMapIO::Options::FLOAT_VECTORS);
+  if (noOccluderListCheckBox->isChecked())
+    ViewMapIO::Options::addFlags(ViewMapIO::Options::NO_OCCLUDERS);
+  else
+    ViewMapIO::Options::rmFlags(ViewMapIO::Options::NO_OCCLUDERS);
+  g_pController->setComputeSteerableViewMapFlag(steerableViewMapCheckBox->isChecked());
+
+  // Visibility
+  if (qiCheckBox->isChecked())
+    g_pController->setQuantitativeInvisibility(true);
+  else
+    g_pController->setQuantitativeInvisibility(false);
+
+  // Papers Textures
+  vector<string> sl;
+  for (unsigned i = 0; i < paperTexturesList->count(); i++) {
+    sl.push_back(paperTexturesList->item(i)->text().toAscii().constData());
+  }
+  TextureManager::Options::setPaperTextures(sl);
+
+   // Drawing Buffers
+  if (frontBufferCheckBox->isChecked())
+    g_pController->setFrontBufferFlag(true);
+  else
+    g_pController->setFrontBufferFlag(false);
+  if (backBufferCheckBox->isChecked())
+    g_pController->setBackBufferFlag(true);
+  else
+    g_pController->setBackBufferFlag(false);
+
+  // Ridges and Valleys
+  g_pController->setComputeRidgesAndValleysFlag(ridgeValleyCheckBox->isChecked());
+  // Suggestive Contours
+  g_pController->setComputeSuggestiveContoursFlag(suggestiveContoursCheckBox->isChecked());
+  bool ok;
+  real r = sphereRadiusLineEdit->text().toFloat(&ok);
+  if(ok)
+    g_pController->setSphereRadius(r);
+  else
+    sphereRadiusLineEdit->setText(QString(QString::number(g_pController->getSphereRadius())));
+  r = krEpsilonLineEdit->text().toFloat(&ok);
+  if(ok)
+    g_pController->setSuggestiveContourKrDerivativeEpsilon(r);
+  else
+    krEpsilonLineEdit->setText(QString(QString::number(g_pController->getSuggestiveContourKrDerivativeEpsilon())));
+}
+
+void AppOptionsWindow::Ok() {
+  Apply();
+  close();
+}
+
+void AppOptionsWindow::Apply() {
+
+  // Propagate changes
+  Propagate();
+
+  // Update values of the Options DOM Tree accordingly
+  _options->setValue("default_path/models/path", modelsPathLineEdit->text());
+  _options->setValue("default_path/patterns/path", patternsPathLineEdit->text());
+  _options->setValue("default_path/brushes/path", brushesPathLineEdit->text());
+  _options->setValue("default_path/python/path", pythonPathLineEdit->text());
+  _options->setValue("default_browser/cmd", browserCmdLineEdit->text());
+  _options->setValue("default_path/help/index", helpIndexPathLineEdit->text());
+  _options->setValue("default_viewmap_format/float_vectors", asFloatCheckBox->isChecked());
+  _options->setValue("default_viewmap_format/no_occluders", noOccluderListCheckBox->isChecked());
+  _options->setValue("default_visibility/exhaustive_computation", qiCheckBox->isChecked());
+  _options->setValue("default_drawing_buffers/front_buffer", frontBufferCheckBox->isChecked());
+  _options->setValue("default_drawing_buffers/back_buffer", backBufferCheckBox->isChecked());
+
+  // -> Papers Textures tab
+  unsigned papers_nb = paperTexturesList->count();
+  _options->setValue("papers/nb", papers_nb);
+  for (unsigned i = 0; i < papers_nb; i++) {
+    QString path;
+    QTextStream(&path) << "papers/texture" << i << "/filename";
+    _options->setValue(path, paperTexturesList->item(i)->text());
+  }
+
+  // -> Help tab
+  _options->setValue("default_browser/cmd", browserCmdLineEdit->text());
+  _options->setValue("default_path/help/index", helpIndexPathLineEdit->text());
+   
+  // -> Misc tab
+  _options->setValue("default_viewmap_format/float_vectors", asFloatCheckBox->isChecked());
+  _options->setValue("default_viewmap_format/no_occluders", noOccluderListCheckBox->isChecked());
+  _options->setValue("default_viewmap_format/compute_steerable", steerableViewMapCheckBox->isChecked());
+  _options->setValue("default_visibility/exhaustive_computation", qiCheckBox->isChecked());
+  _options->setValue("default_drawing_buffers/back_buffer", backBufferCheckBox->isChecked());
+  _options->setValue("default_drawing_buffers/front_buffer", frontBufferCheckBox->isChecked());
+  _options->setValue("default_ridges/enable", ridgeValleyCheckBox->isChecked());
+  _options->setValue("default_suggestive_contours/enable", suggestiveContoursCheckBox->isChecked());
+  bool ok;
+  real r = sphereRadiusLineEdit->text().toFloat(&ok);
+  if(!ok)
+    r = Config::DEFAULT_SPHERE_RADIUS;
+  _options->setValue("default_ridges/sphere_radius", r);
+  r = krEpsilonLineEdit->text().toFloat(&ok);
+  if(!ok)
+    r = Config::DEFAULT_DKR_EPSILON;
+  _options->setValue("default_suggestive_contours/dkr_epsilon", r);
+
+  // Save options to disk
+  _options->saveFile();
+}
+
+void AppOptionsWindow::Cancel() {
+
+  // Directories
+  QString qstr;
+  qstr = ViewMapIO::Options::getModelsPath().c_str();
+  modelsPathLineEdit->setText(qstr);
+  qstr = PythonInterpreter::Options::getPythonPath().c_str();
+  pythonPathLineEdit->setText(qstr);
+  qstr = TextureManager::Options::getPatternsPath().c_str();
+  patternsPathLineEdit->setText(qstr);
+  qstr = TextureManager::Options::getBrushesPath().c_str();
+  brushesPathLineEdit->setText(qstr);
+  qstr = g_pController->getBrowserCmd();
+  browserCmdLineEdit->setText(qstr);
+  qstr = g_pController->getHelpIndex();
+  helpIndexPathLineEdit->setText(qstr);
+
+  // ViewMap Format
+  updateViewMapFormat();
+  steerableViewMapCheckBox->setChecked(g_pController->getComputeSteerableViewMapFlag());
+
+  // Visibility
+  qiCheckBox->setChecked(g_pController->getQuantitativeInvisibility());
+
+  // Drawing buffers
+  frontBufferCheckBox->setChecked(g_pController->getFrontBufferFlag());
+  backBufferCheckBox->setChecked(g_pController->getBackBufferFlag());
+
+  // Ridges and Valleys
+  ridgeValleyCheckBox->setChecked(g_pController->getComputeRidgesAndValleysFlag());
+  // suggestive contours
+  suggestiveContoursCheckBox->setChecked(g_pController->getComputeSuggestiveContoursFlag());
+  sphereRadiusLineEdit->setText(QString::number(g_pController->getSphereRadius()));
+  krEpsilonLineEdit->setText(QString(QString::number(g_pController->getSuggestiveContourKrDerivativeEpsilon())));
+
+  close();
+}
+
+void AppOptionsWindow::updateViewMapFormat() {
+  asFloatCheckBox->setChecked(ViewMapIO::Options::getFlags() & ViewMapIO::Options::FLOAT_VECTORS);
+  noOccluderListCheckBox->setChecked(ViewMapIO::Options::getFlags() & ViewMapIO::Options::NO_OCCLUDERS);
+}
+
+void AppOptionsWindow::ModelsAdd() {
+  QString s = modelsPathLineEdit->text();
+  QString new_s = DirDialog();
+  if (new_s.isEmpty())
+    return;
+  if (!s.isEmpty())
+    s += Config::PATH_SEP.c_str();
+  s += new_s;
+  modelsPathLineEdit->setText(s);
+}
+
+void AppOptionsWindow::PatternsAdd() {
+  QString s = patternsPathLineEdit->text();
+  QString new_s = DirDialog();
+  if (new_s.isEmpty())
+    return;
+  if (!s.isEmpty())
+    s += Config::PATH_SEP.c_str();
+  s += new_s;
+  patternsPathLineEdit->setText(s);
+}
+
+void AppOptionsWindow::BrushesAdd() {
+  QString s = brushesPathLineEdit->text();
+  QString new_s = DirDialog();
+  if (new_s.isEmpty())
+    return;
+  if (!s.isEmpty())
+    s += Config::PATH_SEP.c_str();
+  s += new_s;
+  brushesPathLineEdit->setText(s);
+}
+
+void AppOptionsWindow::PythonAdd() {
+  QString s = pythonPathLineEdit->text();
+  QString new_s = DirDialog();
+  if (new_s.isEmpty())
+    return;
+  if (!s.isEmpty())
+    s += Config::PATH_SEP.c_str();
+  s += new_s;
+  pythonPathLineEdit->setText(s);
+}
+
+void AppOptionsWindow::HelpAdd() {
+  QString s = QFileDialog::getOpenFileName((QWidget *)this,
+	  "Open file dialog"
+					   "Choose a file",
+	  g_pController->getHelpIndex(),
+					   "HTML files (*.html *.htm)");
+  if (s.isEmpty())
+    return;
+  helpIndexPathLineEdit->setText(s);
+}
+
+QString AppOptionsWindow::DirDialog() {
+  QString s = QFileDialog::getExistingDirectory((QWidget *)this,
+						"get existing directory"
+						"Choose a directory",
+						".",
+						QFileDialog::ShowDirsOnly| QFileDialog::DontResolveSymlinks);
+  return s;
+}
+
+void AppOptionsWindow::PaperAdd() {
+  QStringList sl = QFileDialog::getOpenFileNames((QWidget *)this,
+	  "open files dialog"
+						 "Choose a file",
+						 g_pController->getPapersDir(),
+	  "Images (*.bmp *.png *.jpg *.xpm)");
+  paperTexturesList->insertItems(paperTexturesList->count(), sl);
+}
+
+void AppOptionsWindow::PaperRemove() {
+	paperTexturesList->takeItem(paperTexturesList->currentRow());
+}
+
+void AppOptionsWindow::PaperUp() {
+  int current = paperTexturesList->currentRow();
+  if (current < 1)
+    return;
+  QString s = paperTexturesList->currentItem()->text();
+  paperTexturesList->item(current)->setText(paperTexturesList->item(current - 1)->text());
+  paperTexturesList->item(current - 1)->setText(s);
+  paperTexturesList->setCurrentRow(current - 1);
+}
+
+void AppOptionsWindow::PaperDown() {
+	int current = paperTexturesList->currentRow();
+  if (current > paperTexturesList->count() - 2)
+    return;
+  QString s = paperTexturesList->currentItem()->text();
+  paperTexturesList->item(current)->setText(paperTexturesList->item(current + 1)->text());
+  paperTexturesList->item(current + 1)->setText(s);
+  paperTexturesList->setCurrentRow(current + 1);
+}
+
+void AppOptionsWindow::PaperClear() {
+  paperTexturesList->clear();
+}
+
diff --git a/extern/freestyle/src/app/AppOptionsWindow.h b/extern/freestyle/src/app/AppOptionsWindow.h
new file mode 100755
index 00000000000..aaa964739a6
--- /dev/null
+++ b/extern/freestyle/src/app/AppOptionsWindow.h
@@ -0,0 +1,74 @@
+//
+//  Filename         : AppOptionsWindow.h
+//  Author           : Emmanuel Turquin, Stephane Grabli
+//  Purpose          : Class to define the options window
+//  Date of creation : 27/01/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef ARTOPTIONSWINDOW_H
+#define ARTOPTIONSWINDOW_H
+
+#include "ConfigIO.h"
+#include "ui_dir/ui_optionswindow4.h"
+
+using namespace Ui;
+
+class AppOptionsWindow : public QDialog, public OptionsWindow
+{ 
+    Q_OBJECT
+
+public:
+
+	AppOptionsWindow(QWidget *parent = 0, const char *name = 0, bool modal = FALSE, Qt::WFlags fl = 0);
+    ~AppOptionsWindow();
+
+    virtual void updateViewMapFormat();
+
+public slots:
+
+    virtual void Ok();
+    virtual void Apply();
+    virtual void Cancel();
+
+    virtual void ModelsAdd();
+    virtual void PatternsAdd();
+    virtual void BrushesAdd();
+    virtual void PythonAdd();
+    virtual void HelpAdd();
+
+    virtual void PaperAdd();
+    virtual void PaperRemove();
+    virtual void PaperUp();
+    virtual void PaperDown();
+    virtual void PaperClear();
+
+ private:
+
+    virtual QString DirDialog();
+    virtual void Propagate();
+    
+    ConfigIO* _options;
+};
+
+#endif // ARTOPTIONSWINDOW_H
diff --git a/extern/freestyle/src/app/AppProgressBar.cpp b/extern/freestyle/src/app/AppProgressBar.cpp
new file mode 100755
index 00000000000..a4d18d07dd3
--- /dev/null
+++ b/extern/freestyle/src/app/AppProgressBar.cpp
@@ -0,0 +1,78 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+#include <qprogressdialog.h>
+#include <qapplication.h>
+#include "AppProgressBar.h"
+
+AppProgressBar::AppProgressBar()
+	: ProgressBar()
+{
+	_qtProgressBar = 0;
+}
+
+void AppProgressBar::reset()
+{
+  ProgressBar::reset();
+  if(NULL == _qtProgressBar)
+    return;
+
+  _qtProgressBar->reset();
+  _qtProgressBar->show();
+}
+
+void AppProgressBar::setTotalSteps(unsigned n)
+{
+  ProgressBar::setTotalSteps(n);
+  if(NULL == _qtProgressBar)
+    return;
+  
+   _qtProgressBar->setRange(0,_numtotalsteps);
+}
+
+void AppProgressBar::setProgress(unsigned i)
+{
+  if(i > _numtotalsteps)
+    return;
+
+  ProgressBar::setProgress(i);
+  if(NULL == _qtProgressBar)
+    return;
+
+  _qtProgressBar->setValue(_progress);
+  qApp->processEvents();
+
+  if(i == _numtotalsteps)
+  {
+    _qtProgressBar->setValue(_numtotalsteps);
+    
+    _qtProgressBar->reset();
+    ProgressBar::reset();
+    _qtProgressBar->hide();
+  }
+}
+
+void AppProgressBar::setLabelText(const string& label)
+{
+  ProgressBar::setLabelText(label);
+  if (NULL == _qtProgressBar)
+    return;
+  _qtProgressBar->setLabelText(_label.c_str());
+}
diff --git a/extern/freestyle/src/app/AppProgressBar.h b/extern/freestyle/src/app/AppProgressBar.h
new file mode 100755
index 00000000000..09cc500a981
--- /dev/null
+++ b/extern/freestyle/src/app/AppProgressBar.h
@@ -0,0 +1,55 @@
+#ifndef ARTPROGRESSBAR_H
+#define ARTPROGRESSBAR_H
+
+//
+//
+//                        FileName          : AppProgressBar.h
+//                        Author            : Stephane Grabli
+//                        Purpose           : Class to define the App progress bar
+//                        Date Of Creation  : 27/08/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+#include "../system/ProgressBar.h"
+
+class QProgressDialog;
+class AppProgressBar : public ProgressBar
+{
+public:
+  AppProgressBar();
+
+  virtual ~AppProgressBar() {}
+
+  virtual void reset();
+  virtual void setTotalSteps(unsigned n);
+  virtual void setProgress(unsigned i);
+  virtual void setLabelText(const string& text) ;
+
+  void setQTProgressBar(QProgressDialog* qtBar) {_qtProgressBar = qtBar;}
+
+  QProgressDialog * getQTProgressBar() {return _qtProgressBar;}
+
+private:
+  QProgressDialog *_qtProgressBar;
+};
+
+#endif
diff --git a/extern/freestyle/src/app/AppStyleWindow.cpp b/extern/freestyle/src/app/AppStyleWindow.cpp
new file mode 100755
index 00000000000..d8be753b498
--- /dev/null
+++ b/extern/freestyle/src/app/AppStyleWindow.cpp
@@ -0,0 +1,366 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include <fstream>
+#include <QCursor>
+#include <QApplication>
+#include <QFileDialog>
+#include <QHeaderView>
+#include <QString>
+#include "AppStyleWindow.h"
+#include "../stroke/Canvas.h"
+#include "../stroke/StyleModule.h"
+#include "Controller.h"
+#include "AppInteractiveShaderWindow.h"
+#include "AppConfig.h"
+
+AppStyleWindow::AppStyleWindow(QWidget* parent /* = 0 */, const char* name /* = 0 */, Qt::WFlags fl /* = 0 */)
+  : QDialog(parent, fl)
+{
+  // QDialog *widget = new QDialog(parent);
+  setupUi(this);
+	PlayList->setShowGrid(false);
+	PlayList->verticalHeader()->setVisible(false);
+	PlayList->horizontalHeader()->setClickable(false);
+	PlayList->setSelectionBehavior(QAbstractItemView::SelectRows);
+	PlayList->setSelectionMode(QAbstractItemView::SingleSelection);
+	PlayList->setColumnCount(5);
+  PlayList->setColumnWidth(0, 37);
+  PlayList->setColumnWidth(1, width() - 98);
+  PlayList->setColumnWidth(2, 37);
+  PlayList->hideColumn(3);
+  PlayList->hideColumn(4);
+  PlayList->setRowCount(0);
+  //PlayList->setsetLeftMargin(0);
+	PlayList->setHorizontalHeaderLabels((QStringList() << "Disp." << "Style Modules" << "Mod."));
+  _pInteractiveShaderWindow = new AppInteractiveShaderWindow(this);
+  _pInteractiveShaderWindow->hide();
+  QString projectDir(Config::Path::getInstance()->getProjectDir());
+  _mod0_image = new QPixmap(QString::fromUtf8(":/icons/icons/mod0.png"));
+  _mod1_image = new QPixmap(QString::fromUtf8(":/icons/icons/mod1.png"));
+  _disp0_image = new QPixmap(QString::fromUtf8(":/icons/icons/eye0.png"));
+  _disp1_image = new QPixmap(QString::fromUtf8(":/icons/icons/eye1.png"));
+
+  connect(_pInteractiveShaderWindow, SIGNAL(save()), SLOT(fileSave()));
+	// signals and slots connections
+    connect( addButton, SIGNAL( clicked() ), this, SLOT( Add() ) );
+    connect( removeButton, SIGNAL( clicked() ), this, SLOT( Remove() ) );
+    connect( PlayList, SIGNAL( cellDoubleClicked(int,int) ), this, SLOT( Display(int,int) ) );
+    connect( PlayList, SIGNAL( cellClicked(int,int) ), this, SLOT( ToggleLayer(int,int) ) );
+    connect( clearButton, SIGNAL( clicked() ), this, SLOT( Clear() ) );
+    connect( saveButton, SIGNAL( clicked() ), this, SLOT( SaveList() ) );
+    connect( moveUpButton, SIGNAL( clicked() ), this, SLOT( Up() ) );
+    connect( moveDownButton, SIGNAL( clicked() ), this, SLOT( Down() ) );
+    connect( editButton, SIGNAL( clicked() ), this, SLOT( Edit() ) );
+    connect( closeButton, SIGNAL( clicked() ), this, SLOT( Close() ) );
+}
+
+AppStyleWindow::~AppStyleWindow()
+{
+  delete _mod0_image;
+  delete _mod1_image;
+  delete _disp0_image;
+  delete _disp1_image;
+}
+
+void AppStyleWindow::Add(const char* iFileName, bool iDisp) {
+  //Add the item in the view box
+  //PlayList->insertItem(fi.fileName());  
+  // PlayList->insertItem(s);
+  int currentRow;
+  QFileInfo fi(iFileName);
+  if(0 == PlayList->rowCount())
+    {
+      currentRow = -1;
+    }
+  else
+    {
+      currentRow = PlayList->currentRow();
+    }
+  PlayList->insertRow(currentRow+1);
+	for(int i=0; i< PlayList->rowCount(); ++i){
+		PlayList->setRowHeight(i, 20);
+	}
+  //PlayList->setRowHeight(currentRow + 1, 20);
+
+	// eye item
+	QTableWidgetItem * eye_item = new QTableWidgetItem;
+	eye_item->setFlags(Qt::ItemIsEnabled);
+	PlayList->setItem(currentRow + 1, 0, eye_item);
+	// style module name item
+	QTableWidgetItem * style_module_name_item = new QTableWidgetItem(fi.fileName());
+	style_module_name_item->setFlags(Qt::ItemIsEnabled|Qt::ItemIsSelectable);
+  PlayList->setItem(currentRow + 1, 1, style_module_name_item);
+  PlayList->setItem(currentRow + 1, 3, new QTableWidgetItem(iFileName));
+	// refresh item
+	QTableWidgetItem * refresh_item = new QTableWidgetItem;
+	refresh_item->setFlags(Qt::ItemIsEnabled);
+	PlayList->setItem(currentRow + 1, 2, refresh_item);
+	
+	setModified(currentRow + 1, true);
+	QTableWidgetItem *checkItem = new QTableWidgetItem;
+  checkItem->setFlags(Qt::ItemIsUserCheckable);
+  if(iDisp)
+	  checkItem->setCheckState(Qt::Checked);
+  else
+		checkItem->setCheckState(Qt::Unchecked);
+  PlayList->setItem(currentRow + 1, 4, checkItem);
+  setChecked(currentRow + 1, iDisp);
+	PlayList->setCurrentCell(currentRow + 1, 1);
+	//PlayList->setRangeSelected(QTableWidgetSelectionRange( currentRow+1, 0, currentRow+1, 4), true);
+	QString text = (PlayList->item(currentRow + 1, 3))->text();
+	PlayList->takeVerticalHeaderItem(currentRow + 1);
+  _pInteractiveShaderWindow->setCurrentShaderRow(currentRow + 1);
+  _pInteractiveShaderWindow->DisplayShader(text);
+
+  // Load the shader in memory and add it to the 
+  // canvas list
+  g_pController->InsertStyleModule(currentRow + 1, iFileName);
+  g_pController->toggleLayer(currentRow + 1, iDisp);
+}
+
+void AppStyleWindow::AddList(const char* iFileName) {
+  ifstream ifs(iFileName);
+  if (!ifs.is_open()) {
+    cerr << "Error: Cannot load this file" << endl;
+    return;
+  }
+  QFileInfo fi(iFileName);
+  char tmp_buffer[256];
+  string s;
+  bool disp = true;
+  while (!ifs.eof()) {
+    ifs.getline(tmp_buffer, 255);
+    if (!tmp_buffer[0] || tmp_buffer[0] == '#')
+      continue;
+    if (tmp_buffer[0] == '0')
+      disp = false;
+    else
+      disp = true;
+    s = (const char*)fi.dir().path().toAscii().data();
+    s += Config::DIR_SEP;
+    s += tmp_buffer + 1;
+    ifstream test(s.c_str(), ios::binary);
+    if (!test.is_open()) {
+      cerr << "Error: Cannot load \"" << tmp_buffer + 1 << "\"" << endl;
+      continue;
+    }
+    Add(s.c_str(), disp);
+  }
+}
+
+void AppStyleWindow::SaveList() {
+  QString s = QFileDialog::getSaveFileName(
+						this,
+	  				   "Save file dialog"
+					   "Choose a file",
+						g_pController->getModulesDir(),
+					   "Style modules lists (*." + Config::STYLE_MODULES_LIST_EXTENSION + ")");
+
+  if (s.isEmpty())
+    return;
+  QFileInfo fi( s );
+  QString ext = fi.suffix();
+  if (ext != Config::STYLE_MODULES_LIST_EXTENSION)
+    s += "." + Config::STYLE_MODULES_LIST_EXTENSION;
+  ofstream ofs(s.toAscii().data(), ios::binary);
+  if (!ofs.is_open()) {
+    cerr << "Error: Cannot save this file" << endl;
+    return;
+  }
+  
+  QTableWidgetItem *checkItem;
+	for (unsigned i = 0 ; i < PlayList->rowCount(); i++) {
+    checkItem = PlayList->item(i, 4);
+		ofs << ((checkItem->checkState() ==  Qt::Checked) ? '1' : '0');
+    ofs << PlayList->item(i, 1)->text().toAscii().data() << endl;
+  }
+  g_pController->setModulesDir(fi.dir().path());
+  cout << "Style modules list saved" << endl;
+}
+
+void AppStyleWindow::Add()
+{
+  // Load Module
+  QString s = QFileDialog::getOpenFileName(this,
+						"Open file dialog"
+					   "Choose a file",
+						g_pController->getModulesDir(),
+					   "Style modules (*." + Config::STYLE_MODULE_EXTENSION + ")"
+					   ";;"
+					   "Style modules lists (*." + Config::STYLE_MODULES_LIST_EXTENSION + ")");
+
+  QFileInfo fi( s );
+  QString ext = fi.suffix();   // ext is taken after the last dot.
+
+  if (ext == Config::STYLE_MODULE_EXTENSION) {
+    g_pController->setModulesDir(fi.dir().path());
+    Add(s.toAscii().data());
+  }
+  else if (ext == Config::STYLE_MODULES_LIST_EXTENSION) {
+    g_pController->setModulesDir(fi.dir().path());
+    AddList(s.toAscii().data());
+  }
+}
+
+void AppStyleWindow::Remove()
+{
+  // Remove the selected item
+  g_pController->RemoveStyleModule(PlayList->currentRow());
+  PlayList->removeRow(PlayList->currentRow());
+  _pInteractiveShaderWindow->fileClose();
+}
+
+void AppStyleWindow::Clear()
+{
+  g_pController->Clear();
+	for (int i = PlayList->rowCount() - 1; i >= 0; i--)
+    PlayList->removeRow(i);
+  _pInteractiveShaderWindow->fileClose();
+}
+
+void AppStyleWindow::ExposeInteractiveShader()
+{
+  _pInteractiveShaderWindow->show();
+  //_pInteractiveShaderWindow->Load();
+}
+
+void AppStyleWindow::setModified(unsigned row, bool mod) {
+  if (mod) {
+		PlayList->item(row, 2)->setIcon(QIcon(*_mod1_image));
+    return;
+  }
+  Canvas* canvas = Canvas::getInstance();
+  StyleModule* sm = canvas->getCurrentStyleModule();
+  if (sm && sm->getAlwaysRefresh())
+    return;
+  PlayList->item(row, 2)->setIcon(QIcon(*_mod0_image));
+}
+
+void AppStyleWindow::setChecked(unsigned row, bool check) {
+  if (check)
+		PlayList->item(row, 0)->setIcon(QIcon(*_disp1_image));
+  else
+		PlayList->item(row, 0)->setIcon(QIcon(*_disp0_image));
+}
+
+void AppStyleWindow::Edit() {
+	if(PlayList->rowCount() == 0)
+    return;
+
+  int currentRow = PlayList->currentRow();
+
+  ExposeInteractiveShader();
+	QString text = (PlayList->item(currentRow, 3)->text());
+  _pInteractiveShaderWindow->setCurrentShaderRow(currentRow);
+  _pInteractiveShaderWindow->DisplayShader(text);
+}
+
+void AppStyleWindow::Display( int row, int col ) {
+  if(col != 1)
+    return;
+
+  Edit();
+}
+
+void AppStyleWindow::ToggleLayer(int row, int col)
+{
+  if(0 == PlayList->rowCount())
+    return;
+  
+  if(col != 0)
+    return;
+
+	QTableWidgetItem *checkItem = PlayList->item(row, 4);
+	if(checkItem->flags() != Qt::ItemIsUserCheckable)
+    return;
+
+	bool isChecked;
+	if(checkItem->checkState() == Qt::Checked){
+		checkItem->setCheckState(Qt::Unchecked);
+		isChecked = false;
+	}else{
+		checkItem->setCheckState(Qt::Checked);
+		isChecked = true;
+	}
+  g_pController->toggleLayer(row, isChecked);
+  setChecked(row, isChecked);
+}
+
+void AppStyleWindow::Up() {
+  int current = PlayList->currentRow();
+  if (current > 0) {
+    SwapShaders(current, current - 1);
+    PlayList->clearSelection();
+
+		PlayList->setRangeSelected(QTableWidgetSelectionRange( current-1, 0, current-1, 4), true);
+		PlayList->setCurrentCell(current-1, 1);
+    g_pController->updateCausalStyleModules(current - 1);
+		current = current-1;
+  }
+}
+
+void AppStyleWindow::Down() {
+  int current = PlayList->currentRow();
+  if (current < PlayList->rowCount() - 1) {
+    SwapShaders(current, current + 1);
+    PlayList->clearSelection();
+
+    PlayList->setRangeSelected(QTableWidgetSelectionRange( current+1, 0, current+1, 4), true);
+		PlayList->setCurrentCell(current+1, 1);
+
+    g_pController->updateCausalStyleModules(current);
+		current = current +1;
+  }
+}
+
+void AppStyleWindow::fileSave() {
+  int current = _pInteractiveShaderWindow->getCurrentShaderRow();
+	QString text = (PlayList->item(current, 3)->text());
+  g_pController->ReloadStyleModule(current, text.toAscii().data());
+	QTableWidgetItem *checkItem = PlayList->item(current, 4);
+	bool isChecked = (checkItem->checkState() == Qt::Checked) ? true : false;
+  g_pController->toggleLayer(current, isChecked);
+}
+
+void AppStyleWindow::resetModified(bool iMod)
+{
+  for(int i=0; i < PlayList->rowCount(); i++)
+  {
+    setModified(i,iMod);
+  }
+}
+
+void AppStyleWindow::SwapShaders(int i1, int i2) {
+  g_pController->SwapStyleModules(i1, i2);
+  //PlayList->swapRows(i1, i2);
+	QTableWidgetItem *first_row_items[5];
+	QTableWidgetItem *second_row_items[5];
+	int i;
+	for(i=0;i<5;++i){
+		first_row_items[i] = PlayList->takeItem(i1, i);
+		second_row_items[i] = PlayList->takeItem(i2, i);
+	}
+	for(i=0;i<5;++i){
+		PlayList->setItem(i1, i, second_row_items[i]);
+		PlayList->setItem(i2, i, first_row_items[i]);
+	}
+}
diff --git a/extern/freestyle/src/app/AppStyleWindow.h b/extern/freestyle/src/app/AppStyleWindow.h
new file mode 100755
index 00000000000..a9339abf9c8
--- /dev/null
+++ b/extern/freestyle/src/app/AppStyleWindow.h
@@ -0,0 +1,93 @@
+//
+//  Filename         : AppStyleWindow.h
+//  Author           : Stephane Grabli
+//  Purpose          : Class to define the style window
+//  Date of creation : 18/12/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  ARTSTYLEWINDOW_H
+#define  ARTSTYLEWINDOW_H
+
+#include <QKeyEvent>
+#include <QWidget>
+#include <QPainter>
+#include <QColorGroup>
+#include "ui_dir/ui_stylewindow4.h"
+
+using namespace Ui;
+
+class AppInteractiveShaderWindow;
+class AppStyleWindow : public QDialog, public StyleWindow
+{
+  Q_OBJECT
+public:
+	AppStyleWindow(QWidget* parent = 0, const char* name = 0, Qt::WFlags fl = 0);
+  virtual ~AppStyleWindow();
+
+  void ExposeInteractiveShader();
+  /*! sets all layers to visible */
+  //void resetLayers();
+  
+  virtual int  currentRow() const { return PlayList->currentRow(); }
+  virtual void setModified(unsigned row, bool mod);
+  virtual void resetModified(bool iMod = false);
+  virtual void setChecked(unsigned row, bool check);
+
+public slots:
+    virtual void Add();
+    virtual void Add(const char* iFileName, bool iDisp = true);
+    virtual void SaveList();
+    virtual void Remove();
+    virtual void Clear();
+    virtual void Up();
+    virtual void Down();
+    virtual void Edit();
+    virtual void Close() { close(); }
+    virtual void Display( int row, int col);
+    virtual void ToggleLayer(int row, int col);
+    virtual void SwapShaders(int i1, int i2);
+    void fileSave();
+
+ protected:
+    
+    void keyPressEvent(QKeyEvent *e) {
+		if (e->key() == Qt::Key_Escape)
+	return;
+		QDialog::keyPressEvent(e);
+    }
+
+private:
+
+    void AddList(const char* iFileName);
+
+    AppInteractiveShaderWindow* _pInteractiveShaderWindow;
+
+    QPixmap* _mod0_image;
+    QPixmap* _mod1_image;
+    QPixmap* _disp0_image;
+    QPixmap* _disp1_image;
+};
+
+#endif // ARTSTYLEWINDOW_H
diff --git a/extern/freestyle/src/app/ConfigIO.cpp b/extern/freestyle/src/app/ConfigIO.cpp
new file mode 100755
index 00000000000..8165deb07fd
--- /dev/null
+++ b/extern/freestyle/src/app/ConfigIO.cpp
@@ -0,0 +1,116 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include <iostream>
+#include <qfileinfo.h>
+#include <qdir.h>
+#include "ConfigIO.h"
+
+ConfigIO::ConfigIO(QString filename, const QString& doc_type, bool automatic, const QString& sep)
+  : _default_file(filename), _automatic(automatic) {
+  _doc_type = doc_type;
+  _path_sep = sep;
+  if (_automatic)
+    loadFile();
+}
+
+ConfigIO::~ConfigIO() {
+  if (_automatic)
+    saveFile();
+}
+
+QString	ConfigIO::getDefaultFile() const {
+  return _default_file;
+}
+
+void	ConfigIO::setDefaultFile(const QString& filename) {
+  _default_file = filename;
+}
+
+bool	ConfigIO::getAuto() const {
+  return _automatic;
+}
+
+void	ConfigIO::setAuto(bool automatic) {
+  _automatic = automatic;
+}
+
+QString	ConfigIO::getPathSep() const {
+  return _path_sep;
+}
+
+void	ConfigIO::setPathSep(const QString& sep) {
+  _path_sep = sep;
+}
+
+int	ConfigIO::loadFile(const QString& _filename) {
+
+  const QString filename = _filename.isEmpty() ? _default_file : _filename;
+
+  // check wether filename is a valid file and is readable
+  QFileInfo fileinfo(filename);
+  if (!fileinfo.isFile() || !fileinfo.isReadable()) {
+    std::cerr << "Warning: unable to load configuration file \""
+	 << fileinfo.fileName().toAscii().data() << "\"" << std::endl;
+    return 1;
+  }
+
+  // read the DOM tree from file
+  QFile file(filename);
+  file.open(QIODevice::ReadOnly);
+  _tree.setContent(&file);
+  file.close();
+
+  return 0;
+}
+
+int	ConfigIO::saveFile(const QString& _filename) const {
+
+  QString str_tree = _tree.toString();
+  if (str_tree.isEmpty())
+    return 1;
+
+  const QString filename = _filename.isEmpty() ? _default_file : _filename;
+
+  // if the directory in which we want to generate a file
+  // does not exist yet, try to create it
+  QFileInfo fileinfo(filename);
+  if (!fileinfo.exists()) {
+    QDir dir;
+    dir.mkdir(fileinfo.dir().path());
+  }
+
+  // check wether filename is a valid file and is writable
+  QFile file(filename);
+  file.open(QIODevice::WriteOnly);
+  if (!file.isOpen()) {
+    std::cerr << "Warning: unable to save configuration file \""
+	 << fileinfo.fileName().toAscii().data() << "\"" << std::endl;
+    return 1;
+  }
+
+  // write the DOM tree to file
+  QTextStream out(&file);
+  out << str_tree;
+  file.close();
+
+  return 0;
+}
diff --git a/extern/freestyle/src/app/ConfigIO.h b/extern/freestyle/src/app/ConfigIO.h
new file mode 100755
index 00000000000..15f3cd07575
--- /dev/null
+++ b/extern/freestyle/src/app/ConfigIO.h
@@ -0,0 +1,181 @@
+//
+//  Filename         : ConfigIO.h
+//  Author(s)        : Emmanuel Turquin
+//  Purpose          : Configuration management
+//  Date of creation : 26/02/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  CONFIGIO_H
+# define CONFIGIO_H
+
+# include <qstring.h>
+# include <qstringlist.h>
+# include <qtextstream.h>
+# include <qdom.h>
+# include "../system/FreestyleConfig.h"
+
+class ConfigIO
+{
+ public:
+
+  ConfigIO(QString filename = "",
+	   const QString& doc_type = "config_file",
+	   bool automatic = false,
+	   const QString& sep = "/");
+  ~ConfigIO();
+
+  QString	getDefaultFile() const;
+  void		setDefaultFile(const QString& filename);
+
+  bool		getAuto() const;
+  void		setAuto(bool automatic);
+
+  QString	getPathSep() const;
+  void		setPathSep(const QString& sep);
+
+  int		loadFile(const QString& filename = "");
+  int		saveFile(const QString& filename = "") const;
+
+  template <class T> int	getValue(const QString& path, T& res) const;
+  template <class T> int	setValue(const QString& path, const T& src);
+
+ private:
+
+  QString		_path_sep;
+  QString		_default_file;
+  bool			_automatic;
+
+  QDomDocument		_tree;
+  QString		_doc_type;
+};
+
+
+//
+// Implementation of templated methods
+//
+///////////////////////////////////////////////////
+
+namespace Internal {
+
+  template <class T>
+  struct	readValue {
+    void operator()(const QString &value, T &res) {
+        QTextStream((QString *)&value, QIODevice::ReadOnly)>> res;
+    }
+  };
+
+  template <>
+  struct	readValue<QString> {
+    void operator()(const QString& value, QString& res) {
+      res = value;
+    }
+  };
+
+  template <>
+  struct	readValue<bool> {
+    void operator()(const QString& value, bool& res) {
+      short res_tmp;
+      QTextStream((QString *)&value, QIODevice::ReadOnly) >> res_tmp;
+      res = res_tmp;
+    }
+  };
+
+} // end of namespace Internal
+
+
+template <class T>
+int	ConfigIO::getValue(const QString& path, T& res) const {
+
+  // Split path
+  QStringList strlist;
+  strlist = path.split(_path_sep);
+
+  unsigned size = strlist.size();
+  if (size-- < 2)
+    return 1;
+
+  // try to find the right element
+  QDomElement right_node;
+  QDomElement node = _tree.documentElement().firstChild().toElement();
+  for (unsigned i = 0;
+       !node.isNull() && i < size;
+       node = node.firstChild().toElement(), i++) {
+    while (!node.isNull() && node.tagName() != strlist[i])
+      node = node.nextSibling().toElement();
+    right_node = node;
+  }
+
+  // and the right attribute
+  if (right_node.hasAttribute(strlist[size])) {
+    QString value = right_node.attribute(strlist[size]);
+    Internal::readValue<T> rv;
+    rv(value, res);
+    return 0;
+  }
+
+  return 1;
+}
+
+
+template <class T>
+int	ConfigIO::setValue(const QString& path, const T& src) {
+
+  // Split path
+  QStringList strlist = path.split(_path_sep);
+
+  unsigned size = strlist.size();
+  if (size-- < 2)
+    return 1;
+
+  // verify that the tree isn't empty
+  // if so, create a root
+  QDomElement node = _tree.documentElement();
+  if (node.isNull()) {
+      node = _tree.createElement(_doc_type);
+      _tree.appendChild(node);
+  }
+  
+  // find the right element
+  QDomElement child = node.firstChild().toElement();
+  for (unsigned i = 0;
+       i < size;
+       node = child, child = child.firstChild().toElement(), i++) {
+    while (!child.isNull() && child.tagName() != strlist[i])
+      child = child.nextSibling().toElement();
+    if (child.isNull()) {
+      child = _tree.createElement(strlist[i]);
+      node.appendChild(child);
+    }
+  }
+
+  // and set the attribute
+  QString value;
+  QTextStream(&value, QIODevice::WriteOnly) << src;
+  node.setAttribute(strlist[size], value);
+
+  return 0;
+}
+
+#endif // CONFIGIO_H
diff --git a/extern/freestyle/src/app/Controller.cpp b/extern/freestyle/src/app/Controller.cpp
new file mode 100755
index 00000000000..ac41b31ac78
--- /dev/null
+++ b/extern/freestyle/src/app/Controller.cpp
@@ -0,0 +1,1498 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+// Must be included before any QT header, because of moc
+#include "../system/PythonInterpreter.h"
+
+#include <fstream>
+#include <float.h>
+#include <qfileinfo.h>
+#include <qprocess.h>
+#include <qstring.h>
+
+#include "AppGLWidget.h"
+#include "AppMainWindow.h"
+#include "AppProgressBar.h"
+#include "AppStyleWindow.h"
+#include "AppOptionsWindow.h"
+#include "AppAboutWindow.h"
+#include "AppCanvas.h"
+#include "AppConfig.h"
+#include "AppDensityCurvesWindow.h"
+
+#include "../system/StringUtils.h"
+#include "../scene_graph/MaxFileLoader.h"
+#include "../scene_graph/NodeShape.h"
+#include "../scene_graph/NodeTransform.h"
+#include "../scene_graph/NodeDrawingStyle.h"
+#include "../winged_edge/WingedEdgeBuilder.h"
+#include "../winged_edge/WEdge.h"
+#include "../scene_graph/VertexRep.h"
+#include "../winged_edge/WXEdgeBuilder.h"
+#include "../scene_graph/ScenePrettyPrinter.h"
+#include "../winged_edge/WFillGrid.h"
+
+#include "../view_map/ViewMapTesselator.h"
+#include "../stroke/StrokeTesselator.h"
+#include "../view_map/ViewMapIO.h"
+#include "Controller.h"
+#include "../view_map/ViewMap.h"
+#include "../winged_edge/Curvature.h"
+#include "QGLBasicWidget.h"
+#include <qimage.h>
+#include "../image/Image.h"
+#include "../view_map/SteerableViewMap.h"
+#include "../stroke/PSStrokeRenderer.h"
+#include "../stroke/TextStrokeRenderer.h"
+#include "../stroke/StyleModule.h"
+
+#ifndef WIN32
+//# include "GLXOffscreenBuffer.h"
+//# include "GLXOffscreenBuffer.h"
+#endif
+
+Controller::Controller()
+{
+  const QString sep(Config::DIR_SEP.c_str());
+  const QString filename = Config::Path::getInstance()->getHomeDir() + sep +
+    Config::OPTIONS_DIR + sep + Config::OPTIONS_CURRENT_DIRS_FILE;
+  _current_dirs = new ConfigIO(filename, Config::APPLICATION_NAME + "CurrentDirs", true);
+
+  _RootNode = new NodeGroup;
+  _RootNode->addRef();
+  
+  _SilhouetteNode = NULL;
+  //_ProjectedSilhouette = NULL;
+  //_VisibleProjectedSilhouette = NULL;
+  
+  _DebugNode = new NodeGroup;
+  _DebugNode->addRef();
+
+  _winged_edge = NULL;
+  
+  _pMainWindow = NULL;
+  _pView = NULL;
+
+  _edgeTesselationNature = (Nature::SILHOUETTE | Nature::BORDER | Nature::CREASE);
+
+  _ProgressBar = new AppProgressBar;
+  _SceneNumFaces = 0;
+  _minEdgeSize = DBL_MAX;
+  _bboxDiag = 0;
+  
+  _ViewMap = 0;
+
+  _Canvas = 0;
+
+  _VisibilityAlgo = ViewMapBuilder::ray_casting;
+  //_VisibilityAlgo = ViewMapBuilder::ray_casting_fast;
+
+  _Canvas = new AppCanvas;
+
+  _inter = new PythonInterpreter;
+  _EnableQI = true;
+  _ComputeRidges = true;
+  _ComputeSteerableViewMap = false;
+  _ComputeSuggestive = true;
+  _sphereRadius = 1.0;
+}
+
+Controller::~Controller()
+{
+  if(NULL != _RootNode)
+    {
+      int ref = _RootNode->destroy();
+      if(0 == ref)
+	delete _RootNode;
+    }
+  
+  if(NULL != _SilhouetteNode)
+    {
+      int ref = _SilhouetteNode->destroy();
+      if(0 == ref)
+	delete _SilhouetteNode;
+    }
+  
+  if(NULL != _DebugNode)
+    {
+      int ref = _DebugNode->destroy();
+      if(0 == ref)
+	delete _DebugNode;
+    }
+
+  //  if(NULL != _VisibleProjectedSilhouette)
+  //    {
+  //      int ref = _VisibleProjectedSilhouette->destroy();
+  //      if(0 == ref)
+  //	delete _VisibleProjectedSilhouette;
+  //    }
+  
+  //  if(NULL != _ProjectedSilhouette)
+  //    {
+  //      int ref = _ProjectedSilhouette->destroy();
+  //      if(0 == ref)
+  //	delete _ProjectedSilhouette;
+  //    }
+
+  if(NULL != _ProgressBar)
+    {
+      delete _ProgressBar;
+      _ProgressBar = NULL;
+    }
+
+  if(_winged_edge) {
+    delete _winged_edge;
+    _winged_edge = NULL;
+  }
+
+  if(0 != _ViewMap)
+    {
+      delete _ViewMap;
+      _ViewMap = 0;
+    }
+
+  if(0 != _Canvas)
+    {
+      delete _Canvas;
+      _Canvas = 0;
+    }
+
+  if (_inter) {
+    delete _inter;
+    _inter = NULL;
+  }
+
+  //  if(_pDensityCurvesWindow){
+  //    delete _pDensityCurvesWindow;
+  //    _pDensityCurvesWindow = 0;
+  //  }
+  delete _current_dirs;
+}
+
+void Controller::SetView(AppGLWidget *iView)
+{
+  if(NULL == iView)
+    return;
+  
+  _pView = iView;
+  //_pView2D->setGeometry(_pView->rect());
+  _Canvas->SetViewer(_pView);
+}
+
+void Controller::SetMainWindow(AppMainWindow *iMainWindow)
+{
+  _pMainWindow = iMainWindow;
+  _ProgressBar->setQTProgressBar(_pMainWindow->qtProgressDialog());
+	_pStyleWindow = new AppStyleWindow(_pMainWindow, "StyleWindow");
+  _pOptionsWindow = new AppOptionsWindow(_pMainWindow, "MainWindow");
+  _pDensityCurvesWindow = new AppDensityCurvesWindow(_pMainWindow, "MainWindow");
+}
+
+int Controller::Load3DSFile(const char *iFileName)
+{
+  if (_pView)
+    _pView->setUpdateMode(false);
+
+  //_pMainWindow->InitProgressBar("Loading 3DS Model", 4);
+  _ProgressBar->reset();
+  _ProgressBar->setLabelText("Loading 3DS Model");
+  _ProgressBar->setTotalSteps(3);
+  _ProgressBar->setProgress(0);
+
+  //_pMainWindow->setProgressLabel("Reading File");
+  //_pMainWindow->setProgressLabel("Cleaning mesh");
+  
+  _pMainWindow->DisplayMessage("Reading File");
+  _pMainWindow->DisplayMessage("Cleaning Mesh");
+  
+  MaxFileLoader loader3DS(iFileName);
+  //_RootNode->AddChild(BuildSceneTest());
+  
+  _Chrono.start();
+  
+  NodeGroup *maxScene = loader3DS.Load();
+
+  if (maxScene == NULL) {
+    _ProgressBar->setProgress(3);
+    return 1;
+  }
+
+  printf("Mesh cleaning    : %lf\n", _Chrono.stop());
+  _SceneNumFaces += loader3DS.numFacesRead();
+
+  if(loader3DS.minEdgeSize() < _minEdgeSize)
+    {
+      _minEdgeSize = loader3DS.minEdgeSize();
+      _EPSILON = _minEdgeSize*1e-6;
+      if(_EPSILON < DBL_MIN)
+	_EPSILON = 0.0;
+    }
+
+  cout << "Epsilon computed : " << _EPSILON << endl;
+
+  _ProgressBar->setProgress(1);
+
+  // DEBUG
+//   ScenePrettyPrinter spp;
+//   maxScene->accept(spp);
+
+  _RootNode->AddChild(maxScene);
+  _RootNode->UpdateBBox(); // FIXME: Correct that by making a Renderer to compute the bbox
+
+  _pView->SetModel(_RootNode);
+  _pView->FitBBox();
+  
+  _pMainWindow->DisplayMessage("Building Winged Edge structure");
+  _Chrono.start();
+
+  
+  WXEdgeBuilder wx_builder;
+  maxScene->accept(wx_builder);
+  _winged_edge = wx_builder.getWingedEdge();
+
+  printf("WEdge building   : %lf\n", _Chrono.stop());
+
+  _ProgressBar->setProgress(2);
+
+  _pMainWindow->DisplayMessage("Building Grid");
+ _Chrono.start();
+
+  _Grid.clear();
+  Vec3r size;
+  for(unsigned int i=0; i<3; i++)
+    {
+      size[i] = fabs(_RootNode->bbox().getMax()[i] - _RootNode->bbox().getMin()[i]);
+      size[i] += size[i]/10.0; // let make the grid 1/10 bigger to avoid numerical errors while computing triangles/cells intersections
+      if(size[i]==0){
+          cout << "Warning: the bbox size is 0 in dimension "<<i<<endl;
+      }
+    }
+  _Grid.configure(Vec3r(_RootNode->bbox().getMin() - size / 20.0), size,
+		  _SceneNumFaces);
+
+  // Fill in the grid:
+  WFillGrid fillGridRenderer(&_Grid, _winged_edge);
+  fillGridRenderer.fillGrid();
+
+  printf("Grid building    : %lf\n", _Chrono.stop());
+  
+  // DEBUG
+//   _Grid.displayDebug();
+
+  _ProgressBar->setProgress(3);
+   
+  _pView->SetDebug(_DebugNode);
+
+  //delete stuff
+  //  if(0 != ws_builder)
+  //    {
+  //      delete ws_builder;
+  //      ws_builder = 0;
+  //    }
+  _pView->updateGL();
+  QFileInfo qfi(iFileName);
+  string basename((const char*)qfi.fileName().toAscii().data());
+  _ListOfModels.push_back(basename);
+
+  cout << "Triangles nb     : " << _SceneNumFaces << endl;
+  _bboxDiag = (_RootNode->bbox().getMax()-_RootNode->bbox().getMin()).norm();
+  cout << "Bounding Box     : " << _bboxDiag << endl;
+  return 0;
+}
+
+void Controller::CloseFile()
+{
+  WShape::SetCurrentId(0);
+  _pView->DetachModel();
+  _ListOfModels.clear();
+  if(NULL != _RootNode)
+    {
+      int ref = _RootNode->destroy();
+      if(0 == ref)
+	_RootNode->addRef();
+    
+      _RootNode->clearBBox();
+    }
+  
+  _pView->DetachSilhouette();
+  if (NULL != _SilhouetteNode)
+    {
+      int ref = _SilhouetteNode->destroy();
+      if(0 == ref)
+	{
+	  delete _SilhouetteNode;
+	  _SilhouetteNode = NULL;
+	}
+    }
+  //  if(NULL != _ProjectedSilhouette)
+  //    {
+  //      int ref = _ProjectedSilhouette->destroy();
+  //      if(0 == ref)
+  //	{
+  //	  delete _ProjectedSilhouette;
+  //	  _ProjectedSilhouette = NULL;
+  //	}
+  //    }
+  //  if(NULL != _VisibleProjectedSilhouette)
+  //    {
+  //      int ref = _VisibleProjectedSilhouette->destroy();
+  //      if(0 == ref)
+  //	{
+  //	  delete _VisibleProjectedSilhouette;
+  //	  _VisibleProjectedSilhouette = NULL;
+  //	}
+  //  }
+  
+  _pView->DetachDebug();
+  if(NULL != _DebugNode)
+    {
+      int ref = _DebugNode->destroy();
+      if(0 == ref)
+	_DebugNode->addRef();
+    }
+  
+  if(_winged_edge) {
+    delete _winged_edge;
+    _winged_edge = NULL;
+  }
+
+  // We deallocate the memory:
+  if(NULL != _ViewMap)
+    {
+      delete _ViewMap;
+      _ViewMap = 0;
+    }
+
+  // clears the canvas
+  _Canvas->Erase();
+
+  // clears the grid
+  _Grid.clear();
+  _SceneNumFaces = 0;
+  _minEdgeSize = DBL_MAX;
+  //  _pView2D->DetachScene();
+  //  if(NULL != _SRoot)
+  //  {
+  //    int ref = _SRoot->destroy();
+  //    if(0 == ref)
+  //    {
+  //      //_SRoot->addRef();
+  //      delete _SRoot;
+  //      _SRoot = NULL;
+  //    }
+  //  }
+}
+
+//  static const streamsize buffer_size = 512 * 1024;
+
+void Controller::SaveViewMapFile(const char *oFileName)
+{
+  if (!_ViewMap)
+    return;
+
+  ofstream ofs(oFileName, ios::binary);
+  if (!ofs.is_open()) {
+    _pMainWindow->DisplayMessage("Error: Cannot save this file");
+    cerr << "Error: Cannot save this file" << endl;
+    return;
+  }
+//    char buffer[buffer_size];
+//  #if defined(__GNUC__) && (__GNUC__ < 3)
+//    ofs.rdbuf()->setbuf(buffer, buffer_size);
+//  # else
+//    ofs.rdbuf()->pubsetbuf(buffer, buffer_size);
+//  #endif
+  _Chrono.start();
+
+  ofs << Config::VIEWMAP_MAGIC.toAscii().data() << endl << Config::VIEWMAP_VERSION.toAscii().data() << endl;
+
+  // Write the models filenames
+  ofs << _ListOfModels.size() << endl;
+  for (vector<string>::const_iterator i = _ListOfModels.begin(); i != _ListOfModels.end(); i++)
+    ofs << *i << "\n";
+
+  // Save the camera position
+  float position[3];
+  float orientation[4];
+  _pView->getCameraState(position, orientation);
+  ofs.write((char*)position, 3 * sizeof(*position));
+  ofs.write((char*)orientation, 4 * sizeof(*orientation));
+
+  // Write ViewMap
+  if (ViewMapIO::save(ofs, _ViewMap, _ProgressBar)) {
+    _Chrono.stop();
+    cerr << "Error: Cannot save this file" << endl;
+    return;
+  }
+
+  real d = _Chrono.stop();
+  cout << "ViewMap saving   : " << d << endl;
+}
+
+void Controller::LoadViewMapFile(const char *iFileName, bool only_camera)
+{
+  ifstream ifs(iFileName, ios::binary);
+  if (!ifs.is_open()) {
+    _pMainWindow->DisplayMessage("Error: Cannot load this file");
+    cerr << "Error: Cannot load this file" << endl;
+    return;
+  }
+//    char buffer[buffer_size];
+//  #if defined(__GNUC__) && (__GNUC__ < 3)
+//    ifs.rdbuf()->setbuf(buffer, buffer_size);
+//  # else
+//    ifs.rdbuf()->pubsetbuf(buffer, buffer_size);
+//  #endif
+
+  // Test File Magic and version
+  char tmp_buffer[256];
+  QString test;
+  
+  ifs.getline(tmp_buffer, 255);
+  test = tmp_buffer;
+  if (test != Config::VIEWMAP_MAGIC) {
+    _pMainWindow->DisplayMessage(
+		(QString("Error: This is not a valid .") + Config::VIEWMAP_EXTENSION + QString(" file")).toAscii().data());
+    cerr << "Error: This is not a valid ." << Config::VIEWMAP_EXTENSION.toAscii().data() << " file" << endl;
+    return;
+  }
+  ifs.getline(tmp_buffer, 255);
+  test = tmp_buffer;
+  if (test != Config::VIEWMAP_VERSION && !only_camera) {
+    _pMainWindow->DisplayMessage(
+		(QString("Error: This version of the .") + Config::VIEWMAP_EXTENSION + QString(" file format is no longer supported")).toAscii().data());
+    cerr << "Error: This version of the ." << Config::VIEWMAP_EXTENSION.toAscii().data() << " file format is no longer supported" << endl;
+    return;
+  }
+
+  // Read the models filenames and open them (if not already done)
+  string tmp;
+  vector<string> tmp_vec;
+  unsigned models_nb, i;
+
+  ifs.getline(tmp_buffer, 255);
+  models_nb = atoi(tmp_buffer);
+  for (i = 0; i < models_nb; i++) {
+    ifs.getline(tmp_buffer, 255);
+    tmp = tmp_buffer;
+    tmp_vec.push_back(tmp);
+  }
+  if (_ListOfModels != tmp_vec && !only_camera) {
+    CloseFile();
+    vector<string> pathnames;
+    int err = 0;
+    for (vector<string>::const_iterator i = tmp_vec.begin(); i != tmp_vec.end(); i++)
+      {
+	pathnames.clear();
+	StringUtils::getPathName(ViewMapIO::Options::getModelsPath(), *i, pathnames);
+	for (vector<string>::const_iterator j = pathnames.begin(); j != pathnames.end(); j++)
+	  if (!(err = Load3DSFile(j->c_str())))
+	    break;
+	if (err) {
+	  _pMainWindow->DisplayMessage("Error: cannot find the right model(s)");
+	  cerr << "Error: cannot find model \"" << *i << "\" - check the path in the Options" << endl;
+	  return;
+	}
+      }
+  }
+
+  // Set the camera position
+  float position[3];
+  float orientation[4];
+  ifs.read((char*)position, 3 * sizeof(*position));
+  ifs.read((char*)orientation, 4 * sizeof(*orientation));
+  _pView->setCameraState(position, orientation);
+  _pView->saveCameraState();
+
+  if (only_camera) {
+    _pMainWindow->DisplayMessage("Camera parameters loaded");
+    return;
+  }
+
+  // Reset ViewMap
+  if(NULL != _ViewMap)
+    {
+      delete _ViewMap;
+      _ViewMap = 0;
+    }
+  _pView->DetachSilhouette();
+  if (NULL != _SilhouetteNode)
+    {
+      int ref = _SilhouetteNode->destroy();
+      if(0 == ref)
+	delete _SilhouetteNode;
+    }
+  //  if(NULL != _ProjectedSilhouette)
+  //    {
+  //      int ref = _ProjectedSilhouette->destroy();
+  //      if(0 == ref)
+  //	delete _ProjectedSilhouette;
+  //    }
+  //  if(NULL != _VisibleProjectedSilhouette)
+  //    {
+  //      int ref = _VisibleProjectedSilhouette->destroy();
+  //      if(0 == ref)
+  //	{
+  //	  delete _VisibleProjectedSilhouette;
+  //	  _VisibleProjectedSilhouette = 0;
+  //	}
+   // }
+  _ViewMap = new ViewMap();
+
+  // Read ViewMap
+  _Chrono.start();
+  if (ViewMapIO::load(ifs, _ViewMap, _ProgressBar)) {
+    _Chrono.stop();
+    _pMainWindow->DisplayMessage(
+		(QString("Error: This is not a valid .") + Config::VIEWMAP_EXTENSION + QString(" file")).toAscii().data());
+    cerr << "Error: This is not a valid ." << Config::VIEWMAP_EXTENSION.toAscii().data() << " file" << endl;
+    return;
+  }
+
+  // Update display
+  _pMainWindow->DisplayMessage("Updating display");
+  ViewMapTesselator3D sTesselator3d;
+  //ViewMapTesselator2D sTesselator2d;
+  //sTesselator2d.SetNature(_edgeTesselationNature);
+  sTesselator3d.SetNature(_edgeTesselationNature);
+  
+  // Tesselate the 3D edges:
+  _SilhouetteNode = sTesselator3d.Tesselate(_ViewMap);
+  _SilhouetteNode->addRef();
+  
+  // Tesselate 2D edges
+  //  _ProjectedSilhouette = sTesselator2d.Tesselate(_ViewMap);
+  //  _ProjectedSilhouette->addRef();
+  //  
+  _pView->AddSilhouette(_SilhouetteNode);
+  //_pView->Add2DSilhouette(_ProjectedSilhouette);
+
+  // Update options window
+  _pOptionsWindow->updateViewMapFormat();
+
+  real d = _Chrono.stop();
+  cout << "ViewMap loading  : " << d << endl;
+
+  // Compute the Directional ViewMap:
+  if(_ComputeSteerableViewMap){
+    ComputeSteerableViewMap();
+  }
+
+  // Reset Style modules modification flags
+  resetModified(true);
+}
+
+void Controller::ComputeViewMap()
+{
+
+  if (!_ListOfModels.size())
+    return;
+  
+  if(NULL != _ViewMap)
+    {
+      delete _ViewMap;
+      _ViewMap = 0;
+    }
+
+  _pView->DetachDebug();
+  if(NULL != _DebugNode)
+    {
+      int ref = _DebugNode->destroy();
+      if(0 == ref)
+	_DebugNode->addRef();
+    }
+  
+
+  _pView->DetachSilhouette();
+  if (NULL != _SilhouetteNode)
+    {
+      int ref = _SilhouetteNode->destroy();
+      if(0 == ref)
+	delete _SilhouetteNode;
+    }
+  //  if(NULL != _ProjectedSilhouette)
+  //    {
+  //      int ref = _ProjectedSilhouette->destroy();
+  //      if(0 == ref)
+  //	delete _ProjectedSilhouette;
+  //    }
+  //  if(NULL != _VisibleProjectedSilhouette)
+  //    {
+  //      int ref = _VisibleProjectedSilhouette->destroy();
+  //      if(0 == ref)
+  //	{
+  //	  delete _VisibleProjectedSilhouette;
+  //	  _VisibleProjectedSilhouette = 0;
+  //	}
+  //  }
+  
+  // retrieve the 3D viewpoint and transformations information
+  //----------------------------------------------------------
+  // Save the viewpoint context at the view level in order 
+  // to be able to restore it later:
+  _pView->saveCameraState();
+
+  // Restore the context of view:
+  // we need to perform all these operations while the 
+  // 3D context is on.
+  _pView->Set3DContext();
+  float src[3] = { 0, 0, 0 };
+  float vp_tmp[3];
+  _pView->camera()->getWorldCoordinatesOf(src, vp_tmp);
+  Vec3r vp(vp_tmp[0], vp_tmp[1], vp_tmp[2]);
+
+  real mv[4][4];
+  _pView->RetriveModelViewMatrix((real *)mv);
+  // retrieve the projection matrix:
+  real proj[4][4];
+  _pView->RetrieveProjectionMatrix((real *)proj);
+  int viewport[4];
+  _pView->RetrieveViewport(viewport);  
+  real focalLength = _pView->GetFocalLength();
+
+  // Flag the WXEdge structure for silhouette edge detection:
+  //----------------------------------------------------------
+
+  _Chrono.start();
+  if (_SceneNumFaces > 2000)
+    edgeDetector.SetProgressBar(_ProgressBar);
+ 
+  edgeDetector.SetViewpoint(Vec3r(vp));
+  edgeDetector.enableRidgesAndValleysFlag(_ComputeRidges);
+  edgeDetector.enableSuggestiveContours(_ComputeSuggestive);
+  edgeDetector.setSphereRadius(_sphereRadius);
+  edgeDetector.setSuggestiveContourKrDerivativeEpsilon(_suggestiveContourKrDerivativeEpsilon);
+  edgeDetector.processShapes(*_winged_edge);
+
+  real duration = _Chrono.stop();
+  printf("Feature lines    : %lf\n", duration);
+
+  // FIXME GLDEBUG
+  //====================================================================
+  //  NodeShape * silhouetteDebugShape = new NodeShape;
+  //  _DebugNode->AddChild(silhouetteDebugShape);
+  //  vector<WShape*>& wshapes = _winged_edge->getWShapes();
+  //  vector<WShape*>::iterator ws, wsend;
+  //  for(ws=wshapes.begin(), wsend=wshapes.end();
+  //  ws!=wsend;
+  //  ++ws){
+    // smooth
+//        vector<WVertex*>& wvertices = (*ws)->GetVertexList();
+//        unsigned modulo(1), currentIndex(0);
+//        for(vector<WVertex*>::iterator wv=wvertices.begin(), wvend=wvertices.end();
+//        wv!=wvend;
+//        ++wv){
+//          if(currentIndex%modulo != 0){
+//            ++currentIndex;
+//            continue;
+//          }else
+//            ++currentIndex;
+         
+//          WVertex::face_iterator fit=(*wv)->faces_begin();
+//          WVertex::face_iterator fitend=(*wv)->faces_end();
+//          for(; fit!=fitend; ++fit){
+//            WXFace *wxf = dynamic_cast<WXFace*>(*fit);
+//            unsigned vindex = wxf->GetIndex((*wv));
+//            vector<WXFaceLayer*> flayers;
+//            wxf->retrieveSmoothLayers(Nature::RIDGE, flayers);
+//            for(vector<WXFaceLayer*>::iterator fl=flayers.begin(), flend=flayers.end();
+//            fl!=flend;
+//            ++fl){
+//              Vec3r c[3];
+//              unsigned index = 0;
+//              for(unsigned i=0; i<3; ++i){
+// 	       //               real d = (*fl)->dotP(i);
+//                real d  = ((WXVertex*)(wxf->GetVertex(i)))->curvatures()->Kr;
+//                if(d < 0){
+//                  index = 1;
+//                  d = -d;
+//                }
+//                else
+//                  index = 0;
+//                c[i][index] = d;
+//              }  
+//            TriangleRep * frep = new TriangleRep( wxf->GetVertex(0)->GetVertex(),
+//              c[0],
+//              wxf->GetVertex(1)->GetVertex(),
+//              c[1],
+//              wxf->GetVertex(2)->GetVertex(),
+//              c[2]);
+//            silhouetteDebugShape->AddRep(frep);
+    //
+    //        //
+    //        Vec3r e2 = ((Face_Curvature_Info*)(*fl)->userdata)->vec_curvature_info[vindex]->e2;
+    //        Vec3r e1 = ((Face_Curvature_Info*)(*fl)->userdata)->vec_curvature_info[vindex]->e1;
+    //        OrientedLineRep * olrep1 = new OrientedLineRep((*wv)->GetVertex(), (*wv)->GetVertex()+e1);
+    //        OrientedLineRep * olrep2 = new OrientedLineRep((*wv)->GetVertex(), (*wv)->GetVertex()+e2);
+    //        silhouetteDebugShape->AddRep(olrep1);
+    //        silhouetteDebugShape->AddRep(olrep2);
+    //        WOEdge * oppositeEdge;
+    //        if(!(wxf->getOppositeEdge(*wv, oppositeEdge)))
+    //          continue;
+    //        Vec3r v1v2 = oppositeEdge->GetbVertex()->GetVertex() - oppositeEdge->GetaVertex()->GetVertex();
+    //        OrientedLineRep * opplrep = new OrientedLineRep(oppositeEdge->GetaVertex()->GetVertex(), oppositeEdge->GetaVertex()->GetVertex()+v1v2);
+    //        silhouetteDebugShape->AddRep(opplrep);
+    //        GeomUtils::intersection_test res;
+    //        real t;
+    //        res = GeomUtils::intersectRayPlane(oppositeEdge->GetaVertex()->GetVertex(), v1v2,
+    //          e2, -((*wv)->GetVertex()*e2),
+    //          t,1.e-06);
+    //        if((res == GeomUtils::DO_INTERSECT) && (t>=0.0) && (t<=1.0)){
+    //          Vec3r inter(oppositeEdge->GetaVertex()->GetVertex() + t*v1v2);
+    //          VertexRep * irep = new VertexRep(inter.x(), inter.y(), inter.z());
+    //          irep->SetPointSize(5.0);
+    //          silhouetteDebugShape->AddRep(irep);
+    //        }     
+// 	 }  
+//        }
+//        //break;
+//   }
+
+  //  vector<WFace*>& wfaces = (*ws)->GetFaceList();
+  //    for(vector<WFace*>::iterator wf=wfaces.begin(), wfend=wfaces.end();
+  //    wf!=wfend;
+  //    ++wf){
+  //      WXFace *wxf = dynamic_cast<WXFace*>(*wf);
+  //      vector<WXSmoothEdge*> smoothEdges;
+  //      wxf->retrieveSmoothEdges(Nature::RIDGE, smoothEdges);
+  //      for(vector<WXSmoothEdge*>::iterator se=smoothEdges.begin(), send=smoothEdges.end();
+  //      se!=send;
+  //      ++se){
+  //        real ta = (*se)->ta();
+  //        Vec3r A1((*se)->woea()->GetaVertex()->GetVertex());
+  //        Vec3r A2((*se)->woea()->GetbVertex()->GetVertex());
+  //        Vec3r A(A1+ta*(A2-A1));
+  //        
+  //        real tb = (*se)->tb();
+  //        Vec3r B1((*se)->woeb()->GetaVertex()->GetVertex());
+  //        Vec3r B2((*se)->woeb()->GetbVertex()->GetVertex());
+//        Vec3r B(B1+tb*(B2-B1));
+//        OrientedLineRep * line = new OrientedLineRep(A,B);
+//        silhouetteDebugShape->AddRep(line);
+//      }
+//      Material redmat;
+//      redmat.SetDiffuse(1,0,0,1);
+//      Material greenmat;
+//      greenmat.SetDiffuse(0,1,0,1);
+//      real vecSize = _bboxDiag/70.0;
+//      vector<WXFaceLayer*> flayers;
+//      wxf->retrieveSmoothLayers(Nature::RIDGE, flayers);
+//      for(vector<WXFaceLayer*>::iterator fl=flayers.begin(), flend=flayers.end();
+//      fl!=flend;
+//      ++fl){
+        //        Vec3r c[3];
+        //        unsigned nNegative = 0;
+        //        unsigned index = 0;
+        //        for(unsigned i=0; i<3; ++i){
+        //          //real d = (*fl)->dotP(i);
+        //          real d  = ((Face_Curvature_Info*)(*fl)->userdata)->vec_curvature_info[i]->K1/50.0;
+        //          //cout << d << endl;
+        //          if(d < 0){
+        //            nNegative++;
+        //            index = 1;
+        //            d = -d;
+        //          }
+        //          else
+        //            index = 0;
+        //          c[i][index] = d;
+        //        }
+        //        TriangleRep * frep = new TriangleRep( wxf->GetVertex(0)->GetVertex(),
+        //          c[0],
+        //          wxf->GetVertex(1)->GetVertex(),
+        //          c[1],
+        //          wxf->GetVertex(2)->GetVertex(),
+        //          c[2]);
+        //        //if((nNegative != 0) && (nNegative != 3))
+        //          silhouetteDebugShape->AddRep(frep);
+
+        // 3D CURVATURES
+        //==============
+        //        Face_Curvature_Info * fci = (Face_Curvature_Info*)(*fl)->userdata;
+        //        unsigned nvertices = wxf->numberOfVertices();
+        //        for(i=0; i<nvertices; ++i){
+        //          Curvature_info * ci = fci->vec_curvature_info[i];
+        //          Vec3r v(wxf->GetVertex(i)->GetVertex());
+        //          //          VertexRep *vrep = new VertexRep(v[0], v[1], v[2]);
+        //          //          vrep->SetMaterial(redmat);
+        //          //          vrep->SetPointSize(5.0);
+        //          //          silhouetteDebugShape->AddRep(vrep);
+        //          //          LineRep * maxc = new LineRep(v-vecSize*ci->e1/2.0, v+vecSize*ci->e1/2.0);
+        //          //          LineRep * maxc = new LineRep(v, v+vecSize*ci->e1);
+        //          //          maxc->SetMaterial(redmat);
+        //          //          maxc->SetWidth(2.0);
+        //          //          silhouetteDebugShape->AddRep(maxc);
+        //          LineRep * minc = new LineRep(v, v+vecSize*ci->e2);
+        //          minc->SetMaterial(greenmat);
+        //          minc->SetWidth(2.0);
+        //          silhouetteDebugShape->AddRep(minc);
+        //        }
+//      }
+//    }
+//  }
+ 
+  //  
+  //    // Sharp
+  //    vector<WEdge*>& wedges = (*ws)->GetEdgeList();
+  //    for(vector<WEdge*>::iterator we=wedges.begin(), weend=wedges.end();
+  //    we!=weend;
+  //    ++we){
+  //      WXEdge * wxe = dynamic_cast<WXEdge*>(*we);
+  //      if((wxe)->nature() != Nature::NO_FEATURE){
+  //        OrientedLineRep * line = new OrientedLineRep( wxe->GetaVertex()->GetVertex(),
+  //                                                      wxe->GetbVertex()->GetVertex());
+  //        silhouetteDebugShape->AddRep(line);
+  //      }
+  //    }
+  //  }
+  //  WVertex *wvertex = _winged_edge->getWShapes()[0]->GetVertexList()[0];
+  //  Vec3r v(wvertex->GetVertex());
+  //  VertexRep * vrep = new VertexRep(v[0],v[1], v[2]);
+  //  silhouetteDebugShape->AddRep(vrep );
+  //  WVertex::face_iterator fit = wvertex->faces_begin();
+  //  WVertex::face_iterator fitend = wvertex->faces_end();
+  //  while(fit!=fitend){
+  //    vector<WVertex*> fvertices;
+  //    (*fit)->RetrieveVertexList(fvertices);
+  //    Vec3r v[3];
+  //    unsigned i=0;
+  //    for(vector<WVertex*>::iterator fv=fvertices.begin(), fvend=fvertices.end();
+  //    fv!=fvend;
+  //    ++fv, ++i){
+  //      v[i] = (*fv)->GetVertex();
+  //    }
+  //    TriangleRep * triangle = new TriangleRep(v[0], v[1], v[2]);
+  //    silhouetteDebugShape->AddRep(triangle);
+  //    ++fit;
+  //  }
+  //====================================================================
+  // END GLDEBUG
+
+  // Builds the view map structure from the flagged WSEdge structure:
+  //----------------------------------------------------------
+  ViewMapBuilder vmBuilder;
+  vmBuilder.SetProgressBar(_ProgressBar);
+  vmBuilder.SetEnableQI(_EnableQI);
+  vmBuilder.SetViewpoint(Vec3r(vp));
+  
+  vmBuilder.SetTransform(mv, proj, viewport, focalLength, _pView->GetAspect(), _pView->GetFovyRadian());
+  vmBuilder.SetFrustum(_pView->znear(), _pView->zfar());
+  
+  vmBuilder.SetGrid(&_Grid);
+  
+  // Builds a tesselated form of the silhouette for display purpose:
+  //---------------------------------------------------------------
+  ViewMapTesselator3D sTesselator3d;
+  //ViewMapTesselator2D sTesselator2d;
+  //sTesselator2d.SetNature(_edgeTesselationNature);
+  sTesselator3d.SetNature(_edgeTesselationNature);
+    
+  _Chrono.start();
+  // Build View Map
+  _ViewMap = vmBuilder.BuildViewMap(*_winged_edge, _VisibilityAlgo, _EPSILON);
+  _ViewMap->setScene3dBBox(_RootNode->bbox());
+  
+  //Tesselate the 3D edges:
+  _SilhouetteNode = sTesselator3d.Tesselate(_ViewMap);
+  _SilhouetteNode->addRef();
+  
+  // Tesselate 2D edges
+  //  _ProjectedSilhouette = sTesselator2d.Tesselate(_ViewMap);
+  //  _ProjectedSilhouette->addRef();
+  
+  duration = _Chrono.stop();
+  printf("ViewMap building : %lf\n", duration);
+
+  // FIXME DEBUG
+  //    vector<ViewVertex*>& vvertices = _ViewMap->ViewVertices();
+  //    for(vector<ViewVertex*>::iterator vv=vvertices.begin(), vvend=vvertices.end();
+  //    vv!=vvend;
+  //    ++vv){
+  //      TVertex * tvertex = (*vv)->castToTVertex();
+  //      if(!tvertex)
+  //        continue;
+  //      cout << "TVertex : " << tvertex->getId() << endl;
+  //      if (!(tvertex->frontEdgeA().first))
+  //        cout << "null FrontEdgeA" << endl;
+  //      if (!(tvertex->frontEdgeB().first))
+  //        cout << "null FrontEdgeB" << endl;
+  //      if (!(tvertex->backEdgeA().first))
+  //        cout << "null BackEdgeA" << endl;
+  //      if (!(tvertex->backEdgeB().first))
+  //        cout << "null backEdgeB" << endl;
+  //    }
+  //    cout << "-----------" << endl;
+  //    vector<SVertex*>& svertices = _ViewMap->SVertices();
+  //    unsigned i = 0;
+  //    for(vector<SVertex*>::iterator sv = svertices.begin(), svend = svertices.end();
+  //        sv != svend && i < 10;
+  //        ++sv, ++i) {
+  //      cout << "SVertex - Id : " << (*sv)->getId() << endl;
+  //      cout << "SVertex - P3D : " << (*sv)->point3D() << endl;
+  //      cout << "SVertex - P2D : " << (*sv)->point2D() << endl;
+  //      set<Vec3r>::const_iterator i;
+  //      unsigned tmp;
+  //      for (i = (*sv)->normals().begin(), tmp = 0;
+  // 	  i != (*sv)->normals().end();
+  // 	  i++, tmp++);
+  //      cout << "SVertex - Normals : " << tmp << endl;
+  //      cout << "SVertex - FEdges : " << (*sv)->fedges().size() << endl;
+  //    }
+  //    cout << "-----------" << endl;
+  //    vector<FEdge*>& fedges = _ViewMap->FEdges();
+  //    for(vector<FEdge*>::iterator fe = fedges.begin(), feend = fedges.end();
+  //        fe != feend && i < 10;
+  //        ++fe, ++i) {
+  //      cout << "FEdge - Id: " << (*fe)->getId() << endl;
+  //      cout << "FEdge - Occl: " << (*fe)->getOccludeeIntersection() << endl;
+  //    }
+  //    cout << "-----------" << endl;
+  // END DEBUG
+
+  // FIXME GLDEBUG
+  //====================================================================
+  // CUSPS
+  //=======
+  //  vector<ViewEdge*>& vedges = _ViewMap->ViewEdges();
+  //  //typedef ViewEdgeInternal::fedge_iterator_base<Nonconst_traits<FEdge*> > fedge_iterator;
+  //  //fedge_iterator fit = vedges[0]->fedge_iterator_begin();
+  //  for(vector<ViewEdge*>::iterator ve=vedges.begin(), veend=vedges.end();
+  //  ve!=veend;
+  //  ++ve){
+  //    if((!((*ve)->getNature() & Nature::SILHOUETTE)) || (!((*ve)->fedgeA()->isSmooth())))
+  //      continue;
+  //    FEdge *fe = (*ve)->fedgeA();
+  //    FEdge * fefirst = fe;
+  //    //ViewEdge::fedge_iterator fit = (*ve)->fedge_iterator_begin();
+  //    //ViewEdge::vertex_iterator vit = (*ve)->vertices_begin();
+  //    
+  //    Material mat;
+  //    //    for(; !(fe.end()); ++fe){
+  //    bool first = true;
+  //    bool front = true;
+  //    bool positive = true;
+  //    do{
+  //      FEdgeSmooth * fes = dynamic_cast<FEdgeSmooth*>(fe);
+  //      Vec3r A((fes)->vertexA()->point3d());
+  //      Vec3r B((fes)->vertexB()->point3d());
+  //      Vec3r AB(B-A);
+  //      AB.normalize();
+  //      LineRep * lrep = new LineRep(A,B);
+  //      silhouetteDebugShape->AddRep(lrep);
+  //      Vec3r m((A+B)/2.0);
+  //      Vec3r crossP(AB^(fes)->normal()); 
+  //      crossP.normalize();
+  //      Vec3r viewvector(m-vp);
+  //      viewvector.normalize();
+  //      if(first){
+  //        if(((crossP)*(viewvector)) > 0)
+  //          positive = true;
+  //        else
+  //          positive = false;
+  //        first = false;
+  //      }
+  //      if(positive){
+  //        if(((crossP)*(viewvector)) < -0.2)
+  //          positive = false;
+  //      }else{
+  //        if(((crossP)*(viewvector)) > 0.2)
+  //          positive = true;
+  //      }
+  //      if(positive)
+  //        mat.SetDiffuse(1,1,0,1);
+  //      else
+  //        mat.SetDiffuse(1,0,0,1);
+  //      lrep->SetMaterial(mat);
+  //      fe = fe->nextEdge();
+  //    }while((fe!=0) && (fe!=fefirst));
+  //  }
+  //====================================================================
+  // END FIXME GLDEBUG
+  
+  _pView->AddSilhouette(_SilhouetteNode);
+  //_pView->AddSilhouette(_WRoot);
+  //_pView->Add2DSilhouette(_ProjectedSilhouette);
+  //_pView->Add2DVisibleSilhouette(_VisibleProjectedSilhouette);  
+  _pView->AddDebug(_DebugNode);
+
+  // Draw the steerable density map:
+  //--------------------------------
+  if(_ComputeSteerableViewMap){
+    ComputeSteerableViewMap();
+  }
+  // Reset Style modules modification flags
+  resetModified(true);
+}
+
+void Controller::ComputeSteerableViewMap(){
+  if((!_Canvas) || (!_ViewMap))
+    return;
+
+  if(_ProgressBar){
+    _ProgressBar->reset();
+    _ProgressBar->setLabelText("Computing Steerable ViewMap");
+    _ProgressBar->setTotalSteps(3);
+    _ProgressBar->setProgress(0);
+  }
+    
+  // Build 4 nodes containing the edges in the 4 directions
+  NodeGroup *ng[Canvas::NB_STEERABLE_VIEWMAP];
+  unsigned i;
+  real c = 32.f/255.f; // see SteerableViewMap::readSteerableViewMapPixel() for information about this 32.
+  for(i=0; i<Canvas::NB_STEERABLE_VIEWMAP; ++i){
+    ng[i] = new NodeGroup;
+  }
+  NodeShape *completeNS = new NodeShape;
+  completeNS->material().SetDiffuse(c,c,c,1);
+  ng[Canvas::NB_STEERABLE_VIEWMAP-1]->AddChild(completeNS);
+  SteerableViewMap * svm = _Canvas->getSteerableViewMap();
+  svm->Reset();
+
+  _pMainWindow->DisplayMessage("Dividing up edges");
+  ViewMap::fedges_container& fedges = _ViewMap->FEdges();
+  LineRep * fRep;
+  NodeShape *ns;
+  for(ViewMap::fedges_container::iterator f=fedges.begin(), fend=fedges.end();
+  f!=fend;
+  ++f){
+    if((*f)->viewedge()->qi() != 0)
+      continue;
+    fRep = new LineRep((*f)->vertexA()->point2d(),(*f)->vertexB()->point2d()) ;
+    completeNS->AddRep(fRep); // add to the complete map anyway
+    double *oweights = svm->AddFEdge(*f);
+    for(i=0; i<Canvas::NB_STEERABLE_VIEWMAP-1; ++i){
+      ns = new NodeShape;
+      double wc = oweights[i]*c;
+      if(oweights[i] == 0)
+        continue;
+      ns->material().SetDiffuse(wc, wc, wc, 1);
+      ns->AddRep(fRep);
+      ng[i]->AddChild(ns);
+    }
+  }
+  if(_ProgressBar)
+    _ProgressBar->setProgress(1);
+  _pMainWindow->DisplayMessage("Rendering Steerable ViewMap");
+  GrayImage *img[Canvas::NB_STEERABLE_VIEWMAP];
+  //#ifdef WIN32
+  QGLBasicWidget offscreenBuffer(_pView, "SteerableViewMap", _pView->width(), _pView->height()); 
+  QPixmap pm;
+  QImage qimg;
+  for(i=0; i<Canvas::NB_STEERABLE_VIEWMAP; ++i){
+    offscreenBuffer.AddNode(ng[i]);
+    //img[i] = new GrayImage(_pView->width(), _pView->height());
+    //offscreenBuffer.readPixels(0,0,_pView->width(), _pView->height(), img[i]->getArray());
+    pm = offscreenBuffer.renderPixmap(_pView->width(), _pView->height());
+
+    if(pm.isNull())
+      cout << "BuildViewMap Warning: couldn't render the steerable ViewMap" << endl;
+    //pm.save(QString("steerable")+QString::number(i)+QString(".bmp"), "BMP");
+    // FIXME!! Lost of time !
+    qimg = pm.toImage();
+    // FIXME !! again!
+    img[i] = new GrayImage(_pView->width(), _pView->height());
+    for(unsigned y=0;y<img[i]->height();++y){
+      for(unsigned x=0;x<img[i]->width();++x){
+        //img[i]->setPixel(x,y,(float)qGray(qimg.pixel(x,y))/255.f);
+        img[i]->setPixel(x,y,(float)qGray(qimg.pixel(x,y)));
+        //        float c = qGray(qimg.pixel(x,y));
+        //        img[i]->setPixel(x,y,qGray(qimg.pixel(x,y)));
+      }
+    }
+    offscreenBuffer.DetachNode(ng[i]);
+    ng[i]->destroy();
+    delete ng[i];
+    // check
+    //    qimg = QImage(_pView->width(), _pView->height(), 32);
+    //    for(y=0;y<img[i]->height();++y){
+    //      for(unsigned x=0;x<img[i]->width();++x){
+    //        float v = img[i]->pixel(x,y);
+    //        qimg.setPixel(x,y,qRgb(v,v,v));
+    //      }
+    //    }
+    //    qimg.save(QString("newsteerable")+QString::number(i)+QString(".bmp"), "BMP");
+  }
+  //#else
+// 	// LINUX
+//   QGLBasicWidget offscreenBuffer(_pView, "SteerableViewMap", _pView->width(), _pView->height()); 
+
+//   float * buffer = 0;
+//   for(i=0; i<Canvas::NB_STEERABLE_VIEWMAP; ++i){
+//     offscreenBuffer.AddNode(ng[i]);
+// 	offscreenBuffer.draw();
+//     img[i] = new GrayImage(_pView->width(), _pView->height());
+//     buffer = img[i]->getArray();
+//     offscreenBuffer.readPixels(0,0,_pView->width(), _pView->height(), buffer);
+//     for(unsigned y=0;y<img[i]->height();++y){
+//       for(unsigned x=0;x<img[i]->width();++x){
+//         img[i]->setPixel(x,y,255.f *img[i]->pixel(x,y));
+//       }
+//     }
+
+//     offscreenBuffer.DetachNode(ng[i]);
+//     ng[i]->destroy();
+//     delete ng[i];
+//   }
+// #endif
+  if(_ProgressBar)
+    _ProgressBar->setProgress(2);
+  _pMainWindow->DisplayMessage("Building Gaussian Pyramids");
+  svm->buildImagesPyramids(img,false,0,1.f);
+  if(_ProgressBar)
+    _ProgressBar->setProgress(3);
+}
+
+void Controller::saveSteerableViewMapImages(){
+  SteerableViewMap * svm = _Canvas->getSteerableViewMap();
+  if(!svm){
+    cerr << "the Steerable ViewMap has not been computed yet" << endl;
+    return;
+  }
+  svm->saveSteerableViewMap();
+}
+
+void Controller::toggleVisibilityAlgo() 
+{
+  if(_VisibilityAlgo == ViewMapBuilder::ray_casting) {
+    _VisibilityAlgo = ViewMapBuilder::ray_casting_fast;
+    _pMainWindow->DisplayMessage("Visibility algorithm switched to \"fast ray casting\"");
+  }
+  else if (_VisibilityAlgo == ViewMapBuilder::ray_casting_fast) {
+    _VisibilityAlgo = ViewMapBuilder::ray_casting_very_fast;
+    _pMainWindow->DisplayMessage("Visibility algorithm switched to \"very fast ray casting\"");
+  }
+  else {
+    _VisibilityAlgo = ViewMapBuilder::ray_casting;
+    _pMainWindow->DisplayMessage("Visibility algorithm switched to \"ray casting\"");
+  }
+}
+
+void Controller::setQuantitativeInvisibility(bool iBool)
+{
+  _EnableQI = iBool;
+}
+
+bool Controller::getQuantitativeInvisibility() const
+{
+  return _EnableQI;
+}
+
+void Controller::setComputeRidgesAndValleysFlag(bool iBool){
+  _ComputeRidges = iBool;
+}
+
+bool Controller::getComputeRidgesAndValleysFlag() const {
+  return _ComputeRidges;
+}
+void Controller::setComputeSuggestiveContoursFlag(bool b){
+  _ComputeSuggestive = b;
+}
+  
+bool Controller::getComputeSuggestiveContoursFlag() const {
+  return _ComputeSuggestive;
+}
+void Controller::setComputeSteerableViewMapFlag(bool iBool){
+  _ComputeSteerableViewMap = iBool;
+}
+
+bool Controller::getComputeSteerableViewMapFlag() const {
+  return _ComputeSteerableViewMap;
+}
+void Controller::setFrontBufferFlag(bool iBool)
+{
+  AppGLWidget::setFrontBufferFlag(iBool);
+}
+
+bool Controller::getFrontBufferFlag() const
+{
+  return AppGLWidget::getFrontBufferFlag();
+}
+
+void Controller::setBackBufferFlag(bool iBool)
+{
+  AppGLWidget::setBackBufferFlag(iBool);
+}
+
+bool Controller::getBackBufferFlag() const
+{
+  return AppGLWidget::getBackBufferFlag();
+}
+
+void Controller::DrawStrokes()
+{
+  if(_ViewMap == 0)
+    return;
+
+  _Chrono.start();
+  _Canvas->Draw();
+  real d = _Chrono.stop();
+  cout << "Strokes drawing  : " << d << endl;
+  resetModified();
+}
+
+void Controller::InsertStyleModule(unsigned index, const char *iFileName)
+{
+  QFileInfo fi(iFileName);
+  QString ext = fi.suffix();
+  if (ext != "py") {
+    cerr << "Error: Cannot load \"" << fi.fileName().toAscii().data()
+	 << "\", unknown extension" << endl;
+    return;
+  }
+  StyleModule* sm = new StyleModule(iFileName, _inter);
+  _Canvas->InsertStyleModule(index, sm);
+  
+}
+
+void Controller::AddStyleModule(const char *iFileName)
+{
+  _pStyleWindow->Add(iFileName);
+}
+
+void Controller::RemoveStyleModule(unsigned index)
+{
+  _Canvas->RemoveStyleModule(index);
+}
+
+void Controller::Clear()
+{
+  _Canvas->Clear();
+}
+
+void Controller::ReloadStyleModule(unsigned index, const char * iFileName)
+{
+  StyleModule* sm = new StyleModule(iFileName, _inter);
+  _Canvas->ReplaceStyleModule(index, sm);
+}
+
+void Controller::ExposeStyleWindow()
+{
+  _pStyleWindow->show();  
+}
+
+void Controller::ExposeOptionsWindow()
+{
+  _pOptionsWindow->show();
+}
+
+void Controller::ExposeHelpWindow()
+{
+	QStringList cmd_list = _browser_cmd.split(" ");
+  for (QStringList::iterator it = cmd_list.begin();
+       it != cmd_list.end();
+       ++it)
+    (*it).replace("%s", _help_index);
+  QProcess browser(0);
+  QString exe = cmd_list.first();
+  cmd_list.removeFirst();
+  browser.start(exe, cmd_list);
+}
+
+void Controller::ExposeAboutWindow()
+{
+  AppAboutWindow::display();
+}
+
+void Controller::SwapStyleModules(unsigned i1, unsigned i2)
+{
+  _Canvas->SwapStyleModules(i1, i2);
+}
+
+
+void Controller::toggleLayer(unsigned index, bool iDisplay)
+{
+  _Canvas->SetVisible(index, iDisplay);
+  _pView->updateGL();
+}
+
+void Controller::setModified(unsigned index, bool iMod)
+{
+  _pStyleWindow->setModified(index, iMod);
+  _Canvas->setModified(index, iMod);
+  updateCausalStyleModules(index + 1);
+}
+
+void Controller::updateCausalStyleModules(unsigned index) {
+  vector<unsigned> vec;
+  _Canvas->causalStyleModules(vec, index);
+  for (vector<unsigned>::const_iterator it = vec.begin(); it != vec.end(); it++) {
+    _pStyleWindow->setModified(*it, true);
+    _Canvas->setModified(*it, true);
+  }
+}
+
+void Controller::saveSnapshot(bool b) {
+ _pView->saveSnapshot(b);
+}
+
+void Controller::savePSSnapshot(const QString& iFileName){
+  PSStrokeRenderer psRenderer((const char*)iFileName.toAscii().data());
+  _Canvas->Render(&psRenderer);
+  psRenderer.Close();
+}
+
+void Controller::saveTextSnapshot(const QString& iFileName){
+  TextStrokeRenderer textRenderer((const char*)iFileName.toAscii().data());
+  _Canvas->Render(&textRenderer);
+  textRenderer.Close();
+}
+
+void Controller::captureMovie() {
+ _pView->captureMovie();
+}
+
+void Controller::resetModified(bool iMod)
+{
+  _pStyleWindow->resetModified(iMod);
+  _Canvas->resetModified(iMod);
+}
+
+FEdge* Controller::SelectFEdge(real x, real y)
+{
+  if (!_ViewMap)
+    return NULL;
+
+  FEdge *fedge = (FEdge*)_ViewMap->GetClosestFEdge(x,y);
+  ViewEdge *selection = fedge->viewedge();
+  _pView->SetSelectedFEdge(fedge);
+  _Canvas->SetSelectedFEdge(fedge);
+  return fedge;
+}
+
+ViewEdge* Controller::SelectViewEdge(real x, real y)
+{
+  if (!_ViewMap)
+    return NULL;
+
+  FEdge *fedge = (FEdge*)_ViewMap->GetClosestFEdge(x,y);
+  ViewEdge *selection = fedge->viewedge();
+  _pView->SetSelectedFEdge(fedge);
+  _Canvas->SetSelectedFEdge(fedge);
+  return selection;
+}
+
+NodeGroup * Controller::BuildRep(vector<ViewEdge*>::iterator vedges_begin, 
+                                       vector<ViewEdge*>::iterator vedges_end)
+{
+  ViewMapTesselator2D tesselator2D;
+  Material mat;
+  mat.SetDiffuse(1,1,0.3,1);
+  tesselator2D.SetMaterial(mat);
+
+  return (tesselator2D.Tesselate(vedges_begin, vedges_end));
+}
+
+void Controller::toggleEdgeTesselationNature(Nature::EdgeNature iNature)
+{
+  _edgeTesselationNature ^= (iNature);
+  ComputeViewMap();
+}
+
+void		Controller::setModelsDir(const QString& dir) {
+  _current_dirs->setValue("models/dir", dir);
+}
+
+QString		Controller::getModelsDir() const {
+  QString dir = ".";
+  _current_dirs->getValue("models/dir", dir);
+  return dir;
+}
+
+void		Controller::setModulesDir(const QString& dir) {
+  _current_dirs->setValue("modules/dir", dir);
+}
+
+QString		Controller::getModulesDir() const {
+  QString dir = ".";
+  _current_dirs->getValue("modules/dir", dir);
+  return dir;
+}
+
+void		Controller::setPapersDir(const QString& dir) {
+  _current_dirs->setValue("papers/dir", dir);
+}
+
+QString		Controller::getPapersDir() const {
+  QString dir = Config::Path::getInstance()->getPapersDir();
+  _current_dirs->getValue("papers/dir", dir);
+  return dir;
+}
+
+void		Controller::setHelpIndex(const QString& index) {
+  _help_index = index;
+}
+
+QString		Controller::getHelpIndex() const {
+  return _help_index;
+}
+
+void		Controller::setBrowserCmd(const QString& cmd) {
+  _browser_cmd = cmd;
+}
+
+QString		Controller::getBrowserCmd() const {
+  return _browser_cmd;
+}
+
+void		Controller::resetInterpreter() {
+  if (_inter)
+    _inter->reset();
+}
+
+void Controller::displayMessage(const char * msg, bool persistent){
+  _pMainWindow->DisplayMessage(msg, persistent);
+}
+
+void Controller::displayDensityCurves(int x, int y){
+  SteerableViewMap * svm = _Canvas->getSteerableViewMap();
+  if(!svm)
+    return;
+
+  unsigned i,j;
+  typedef vector<Vec3r> densityCurve;
+  vector<densityCurve> curves(svm->getNumberOfOrientations()+1);
+  vector<densityCurve> curvesDirection(svm->getNumberOfPyramidLevels());
+
+  // collect the curves values
+  unsigned nbCurves = svm->getNumberOfOrientations()+1;
+  unsigned nbPoints = svm->getNumberOfPyramidLevels();
+  if(!nbPoints)
+    return;
+
+  // build the density/nbLevels curves for each orientation
+  for(i=0;i<nbCurves; ++i){
+    for(j=0; j<nbPoints; ++j){
+      curves[i].push_back(Vec3r(j, svm->readSteerableViewMapPixel(i, j, x, y), 0));
+    }
+  }
+  // build the density/nbOrientations curves for each level
+  for(i=0;i<nbPoints; ++i){
+    for(j=0; j<nbCurves; ++j){
+      curvesDirection[i].push_back(Vec3r(j, svm->readSteerableViewMapPixel(j, i, x, y), 0));
+    }
+  }
+
+  // display the curves
+  for(i=0; i<nbCurves; ++i)
+    _pDensityCurvesWindow->SetOrientationCurve(i, Vec2d(0,0), Vec2d(nbPoints, 1), curves[i], "scale", "density");
+  for(i=1; i<=8; ++i)
+    _pDensityCurvesWindow->SetLevelCurve(i, Vec2d(0,0), Vec2d(nbCurves, 1), curvesDirection[i], "orientation", "density");
+  _pDensityCurvesWindow->show();
+}
diff --git a/extern/freestyle/src/app/Controller.h b/extern/freestyle/src/app/Controller.h
new file mode 100755
index 00000000000..95b97ebcda3
--- /dev/null
+++ b/extern/freestyle/src/app/Controller.h
@@ -0,0 +1,232 @@
+//
+//  Filename         : Controller.h
+//  Author           : Stephane Grabli
+//  Purpose          : The spinal tap of the system
+//  Date of creation : 01/07/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  CONTROLLER_H
+# define CONTROLLER_H
+
+# include <string>
+# include "ConfigIO.h"
+# include "../geometry/FastGrid.h"
+# include "../geometry/HashGrid.h"
+# include "../view_map/ViewMapBuilder.h"
+# include "../system/TimeUtils.h"
+# include "../system/Precision.h"
+# include "../system/Interpreter.h"
+# include "../view_map/FEdgeXDetector.h"
+
+class AppProgressBar;
+class AppGLWidget;
+class AppMainWindow;
+class NodeGroup;
+class WShape;
+class SShape;
+class ViewMap;
+class ViewEdge;
+class AppCanvas;
+class InteractiveShader;
+class Shader;
+class AppInteractiveShaderWindow;
+class AppStyleWindow;
+class AppOptionsWindow;
+class AppDensityCurvesWindow;
+
+class Controller
+{
+public:
+  Controller() ;
+  ~Controller() ;
+  
+  void SetView(AppGLWidget *iView);
+  void SetMainWindow(AppMainWindow *iMainWindow); 
+  int  Load3DSFile(const char *iFileName);
+  void CloseFile();
+  void LoadViewMapFile(const char *iFileName, bool only_camera = false);
+  void SaveViewMapFile(const char *iFileName);
+  void ComputeViewMap();
+  void ComputeSteerableViewMap();
+  void saveSteerableViewMapImages();
+  void toggleEdgeTesselationNature(Nature::EdgeNature iNature);
+  void DrawStrokes();
+  void ExposeStyleWindow();
+  void ExposeOptionsWindow();
+  void ExposeHelpWindow();
+  void ExposeAboutWindow();
+  void SwapStyleModules(unsigned i1, unsigned i2);
+  void InsertStyleModule(unsigned index, const char *iFileName);
+  void AddStyleModule(const char *iFileName);
+  void RemoveStyleModule(unsigned index);
+  void ReloadStyleModule(unsigned index, const char * iFileName);
+  void Clear();
+  void toggleLayer(unsigned index, bool iDisplay);
+  void setModified(unsigned index, bool iMod);
+  void resetModified(bool iMod=false);
+  void updateCausalStyleModules(unsigned index);
+  void saveSnapshot(bool b = false);
+  void savePSSnapshot(const QString& iFileName);
+  void saveTextSnapshot(const QString& iFileName);
+  void captureMovie();
+  void displayMessage(const char *msg, bool persistent = false);
+  void displayDensityCurves(int x, int y);
+ 
+  
+  ViewEdge * SelectViewEdge(real x, real y);
+  FEdge * SelectFEdge(real x, real y);
+  NodeGroup* BuildRep(vector<ViewEdge*>::iterator vedges_begin, 
+		      vector<ViewEdge*>::iterator vedges_end) ;
+  
+  NodeGroup* debugNode() {return _DebugNode;}
+  AppGLWidget * view() {return _pView;}
+  NodeGroup* debugScene() {return _DebugNode;}
+  Grid& grid() {return _Grid;}
+  
+  void toggleVisibilityAlgo();
+
+  void setQuantitativeInvisibility(bool iBool); // if true, we compute quantitativeInvisibility
+  bool getQuantitativeInvisibility() const;
+
+  void setFrontBufferFlag(bool b);
+  bool getFrontBufferFlag() const;
+  void setBackBufferFlag(bool b);
+  bool getBackBufferFlag() const;
+
+  void setComputeRidgesAndValleysFlag(bool b);
+  bool getComputeRidgesAndValleysFlag() const ;
+  void setComputeSuggestiveContoursFlag(bool b);
+  bool getComputeSuggestiveContoursFlag() const ;
+
+  void setComputeSteerableViewMapFlag(bool iBool);
+  bool getComputeSteerableViewMapFlag() const;
+  void setSphereRadius(real s){_sphereRadius=s;}
+  real getSphereRadius() const {return _sphereRadius;}
+  void setSuggestiveContourKrDerivativeEpsilon(real dkr){_suggestiveContourKrDerivativeEpsilon=dkr;}
+  real getSuggestiveContourKrDerivativeEpsilon() const {return _suggestiveContourKrDerivativeEpsilon;}
+
+  AppProgressBar* getProgressBar(void) { return _ProgressBar; }
+
+  void		setModelsDir(const QString& dir);
+  QString	getModelsDir() const;
+  void		setModulesDir(const QString& dir);
+  QString	getModulesDir() const;
+  void		setPapersDir(const QString& dir);
+  QString	getPapersDir() const;
+  void		setHelpIndex(const QString& dir);
+  QString	getHelpIndex() const;
+  void		setBrowserCmd(const QString& cmd);
+  QString	getBrowserCmd() const;
+
+  void resetInterpreter();
+
+private:
+
+  // Main Window:
+  AppMainWindow *_pMainWindow;
+
+  // List of models currently loaded
+  vector<string> _ListOfModels;
+
+  // Current directories
+  ConfigIO* _current_dirs;
+
+  //View
+  // 3D
+  AppGLWidget *_pView;
+  
+  // 2D
+  //Viewer2DWindow *_pView2DWindow;
+  //Viewer2D *_pView2D;
+  
+  //Model
+  // Drawing Structure
+  NodeGroup *_RootNode;
+
+  // Winged-Edge structure
+  WingedEdge* _winged_edge;
+  
+  ViewMap * _ViewMap;
+
+  // Silhouette structure:
+  //std::vector<SShape*> _SShapes;
+  //NodeGroup *_SRoot;
+  
+  // Silhouette
+  NodeGroup *_SilhouetteNode;
+  NodeGroup *_ProjectedSilhouette;
+  NodeGroup *_VisibleProjectedSilhouette;
+  
+  // more Debug info
+  NodeGroup *_DebugNode;
+
+  // debug
+  //  NodeUser<ViewMap> *_ViewMapNode; // FIXME
+
+  // Chronometer:
+  Chronometer _Chrono;
+
+  // Progress Bar
+  AppProgressBar *_ProgressBar;
+
+  // edges tesselation nature
+  int _edgeTesselationNature;
+
+  FastGrid _Grid;
+  //HashGrid _Grid;
+  
+  unsigned int _SceneNumFaces;
+  real _minEdgeSize;
+  real _EPSILON;
+  real _bboxDiag;
+
+  AppCanvas *_Canvas;
+
+  AppStyleWindow *_pStyleWindow;
+  AppOptionsWindow *_pOptionsWindow;
+  AppDensityCurvesWindow *_pDensityCurvesWindow;
+
+  ViewMapBuilder::visibility_algo	_VisibilityAlgo;
+  
+  // Script Interpreter
+  Interpreter* _inter;
+
+  QString	_help_index;
+  QString	_browser_cmd;
+
+  bool _EnableQI;
+  bool _ComputeRidges;
+  bool _ComputeSuggestive;
+  real _sphereRadius;
+  real _suggestiveContourKrDerivativeEpsilon;
+
+  bool _ComputeSteerableViewMap;
+
+  FEdgeXDetector edgeDetector;
+};
+
+extern Controller	*g_pController;
+
+#endif // CONTROLLER_H
diff --git a/extern/freestyle/src/app/Main.cpp b/extern/freestyle/src/app/Main.cpp
new file mode 100755
index 00000000000..ae4d28017c5
--- /dev/null
+++ b/extern/freestyle/src/app/Main.cpp
@@ -0,0 +1,57 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+#include <QApplication>
+#include <qgl.h>
+#include "Controller.h"
+#include "AppMainWindow.h"
+#include "AppConfig.h"
+
+// Global
+Controller	*g_pController;
+
+int main(int argc, char** argv)
+{
+  // sets the paths
+	QApplication::setColorSpec(QApplication::ManyColor);
+  QApplication *app = new QApplication(argc, argv);
+  Q_INIT_RESOURCE(freestyle);
+
+  Config::Path pathconfig;
+  
+  QGLFormat myformat;
+  myformat.setAlpha(true);
+  QGLFormat::setDefaultFormat( myformat );
+  
+  AppMainWindow mainWindow(NULL, "Freestyle");
+  //app->setMainWidget(mainWindow); // QT3
+
+  g_pController = new Controller;
+  g_pController->SetMainWindow(&mainWindow);
+  g_pController->SetView(mainWindow.pQGLWidget);
+  
+  mainWindow.show();
+
+  int res = app->exec();
+
+  delete g_pController;
+  
+  return res;
+}
diff --git a/extern/freestyle/src/app/QGLBasicWidget.cpp b/extern/freestyle/src/app/QGLBasicWidget.cpp
new file mode 100755
index 00000000000..44b5e0de224
--- /dev/null
+++ b/extern/freestyle/src/app/QGLBasicWidget.cpp
@@ -0,0 +1,141 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+#include "QGLBasicWidget.h"
+#include "../rendering/GLRenderer.h"
+// #ifndef WIN32
+// #include "../rendering/pbuffer.h"
+// #endif 
+
+QGLBasicWidget::QGLBasicWidget( QWidget* parent, const char* name, int w, int h, const QGLWidget* shareWidget )
+    : QGLWidget( parent, shareWidget )
+{
+  _pGLRenderer = new GLRenderer;
+// #ifndef WIN32
+//   _Pbuffer = new PBuffer(w,h,
+//               PBuffer::SingleBuffer 
+// 			  | PBuffer::DepthBuffer 
+// 			  | PBuffer::StencilBuffer);
+
+//   _Pbuffer->create(false);
+// #endif 
+  resizeGL(w,h);
+  _RootNode.SetLightingEnabled(false);
+  _RootNode.SetLineWidth(1.0);
+}
+
+QGLBasicWidget::QGLBasicWidget( const QGLFormat& format, QWidget* parent, const char* name, 
+	      int w, int h, const QGLWidget* shareWidget )
+    : QGLWidget( format, parent, shareWidget )
+{
+  _pGLRenderer = new GLRenderer;
+// #ifndef WIN32
+//   _Pbuffer = new PBuffer(w,h,
+//               PBuffer::SingleBuffer 
+// 			  | PBuffer::DepthBuffer 
+// 			  | PBuffer::StencilBuffer);
+//   _Pbuffer->create(false);
+// #endif 
+  resizeGL(w,h);
+  _RootNode.SetLightingEnabled(false);
+  _RootNode.SetLineWidth(1.0);
+}
+
+QGLBasicWidget::~QGLBasicWidget()
+{
+  _RootNode.destroy();
+  if(_pGLRenderer)
+    delete _pGLRenderer;
+// #ifndef WIN32
+//   if(_Pbuffer)
+//     delete _Pbuffer;
+// #endif 
+}
+
+void QGLBasicWidget::AddNode(Node* iNode){
+  _RootNode.AddChild(iNode);
+}
+
+void QGLBasicWidget::DetachNode(Node* iNode){
+  _RootNode.DetachChild(iNode);
+}
+
+void QGLBasicWidget::readPixels(int x,
+                                int y,
+                                int width,
+                                int height,
+                                float *pixels){
+// #ifndef WIN32
+// _Pbuffer->makeCurrent();
+
+//    glReadBuffer(GL_FRONT);
+//    GLenum e = glGetError();
+//    GLenum glformat = GL_RED;
+//    glReadPixels(x,y,width, height, glformat, GL_FLOAT, (GLfloat*)pixels);
+//    e = glGetError();
+// #endif 
+} 
+
+void QGLBasicWidget::initializeGL()
+{
+   glClearColor(_clearColor[0],_clearColor[1],_clearColor[2],1);
+}
+
+void QGLBasicWidget::resizeGL( int w, int h )
+{
+// #ifndef WIN32
+// 	_Pbuffer->makeCurrent();
+// #endif 
+
+    glViewport( 0, 0, (GLint)w, (GLint)h );
+    // Projection Matrix
+    //==================
+    glMatrixMode(GL_PROJECTION);
+    glLoadIdentity();
+// #ifndef WIN32
+// 	// FXS- changed order of y bounds for glRead
+//     glOrtho(0,w, h, 0, -1.0, 1.0);
+// #else
+    glOrtho(0,w, 0, h, -1.0, 1.0);
+    //#endif 
+}
+
+void QGLBasicWidget::paintGL()
+{
+// #ifndef WIN32
+// 	_Pbuffer->makeCurrent();
+//    glClearColor(_clearColor[0],_clearColor[1],_clearColor[2],1);
+// #endif 
+
+  glDrawBuffer( GL_FRONT);
+  glPushAttrib(GL_ALL_ATTRIB_BITS);
+  glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
+  //Modelview Matrix
+  //================
+  glMatrixMode(GL_MODELVIEW);
+  glLoadIdentity();
+    
+  glEnable(GL_BLEND);
+  glBlendFunc(GL_ONE, GL_ONE);
+  glDisable(GL_DEPTH_TEST);
+  _RootNode.accept(*_pGLRenderer);
+  glPopAttrib();
+}
+
diff --git a/extern/freestyle/src/app/QGLBasicWidget.h b/extern/freestyle/src/app/QGLBasicWidget.h
new file mode 100755
index 00000000000..9b29a641f28
--- /dev/null
+++ b/extern/freestyle/src/app/QGLBasicWidget.h
@@ -0,0 +1,102 @@
+//
+//  Filename         : QGLBasicWidget.h
+//  Author           : Stephane Grabli
+//  Purpose          : A basic qgl widget designed to be used as 
+//                     a 2D offscreen buffer. (no interactive function)
+//  Date of creation : 26/12/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef QGLBASICWIDGET_H
+#define QGLBASICWIDGET_H
+
+#include <qgl.h>
+#include "../geometry/Geom.h"
+//#include "../rendering/pbuffer.h"
+#include "../scene_graph/NodeDrawingStyle.h"
+using namespace Geometry;
+
+class GLRenderer;
+class ViewMap;
+// #ifndef WIN32
+// class PBuffer;
+// #endif
+class QGLBasicWidget : public QGLWidget
+{
+    Q_OBJECT
+
+public:
+
+    QGLBasicWidget( QWidget* parent, const char* name, int w, int h, const QGLWidget* shareWidget=0 );
+    QGLBasicWidget( const QGLFormat& format, QWidget* parent, const char* name, 
+	  int w, int h, const QGLWidget* shareWidget=0 );
+    ~QGLBasicWidget();
+
+    /*! Adds a node directly under the root node */
+    void AddNode(Node* iNode);
+    /*! Detach the node iNode which must 
+     *  be directly under the root node.
+     */
+    void DetachNode(Node *iNode);
+
+    /*! reads the frame buffer pixels as luminance .
+     *  \param x 
+     *    The lower-left corner x-coordinate of the 
+     *    rectangle we want to grab.
+     *  \param y
+     *    The lower-left corner y-coordinate of the 
+     *    rectangle we want to grab.
+     *  \param width
+     *    The width of the rectangle we want to grab.
+     *  \param height
+     *    The height of the rectangle we want to grab.
+     *  \params pixels
+     *    The array of float (of size width*height) in which 
+     *    the read values are stored.
+     */
+    void readPixels(int x,int y,int width,int height,float *pixels) ;
+// #ifndef WIN32
+// 	void draw() { paintGL(); }
+// #endif 
+
+    inline void SetClearColor(const Vec3f& c) {_clearColor = c;}
+    inline Vec3f getClearColor() const {return _clearColor;}
+
+protected:
+
+    virtual void		initializeGL();
+    virtual void		paintGL();
+    virtual void		resizeGL(int w, int h);
+
+private:
+// #ifndef WIN32
+//   PBuffer	*_Pbuffer;
+// #endif 
+  NodeDrawingStyle       _RootNode;
+  Vec3f           _clearColor;
+  GLRenderer     *_pGLRenderer;
+};
+
+
+#endif // QGLBASICWIDGET_H
diff --git a/extern/freestyle/src/app/QStyleModuleSyntaxHighlighter.cpp b/extern/freestyle/src/app/QStyleModuleSyntaxHighlighter.cpp
new file mode 100755
index 00000000000..16ea53f157c
--- /dev/null
+++ b/extern/freestyle/src/app/QStyleModuleSyntaxHighlighter.cpp
@@ -0,0 +1,155 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+#include "QStyleModuleSyntaxHighlighter.h"
+#include <QTextEdit>
+#include <QRegExp> 
+#include <iostream>
+using namespace std;
+
+QStyleModuleSyntaxHighlighter::QStyleModuleSyntaxHighlighter(QTextEdit *iTextEdit) 
+    : QSyntaxHighlighter(iTextEdit){
+  _operators.push_back("Operators");
+  _operators.push_back("select");
+  _operators.push_back("chain");
+  _operators.push_back("bidirectionalChain");
+  _operators.push_back("sequentialSplit");
+  _operators.push_back("recursiveSplit");
+  _operators.push_back("sort");
+  _operators.push_back("create");
+
+  _functors.push_back("StrokeShader");
+  _functors.push_back("UnaryPredicate1D");
+  _functors.push_back("UnaryPredicate0D");
+  _functors.push_back("BinaryPredicate1D");
+  _functors.push_back("ChainingIterator");
+  //  _functors.push_back("getName");
+  //  _functors.push_back("shade");
+  //  _functors.push_back("getObject");
+
+  _python.push_back("class ");
+  _python.push_back("from ");
+  _python.push_back("import ");
+  _python.push_back("__init__");
+  _python.push_back("__call__");
+  _python.push_back("def ");
+  _python.push_back("self");
+  _python.push_back("return");
+  //_python.push_back("print");
+  //  _python.push_back("for");
+  //  _python.push_back("if");
+  //  _python.push_back("while");
+  //  _python.push_back("range");
+  //  _python.push_back("in");
+
+	_defaultColor = iTextEdit->textColor();
+} 
+
+QStyleModuleSyntaxHighlighter::~QStyleModuleSyntaxHighlighter(){
+  _operators.clear();
+  _functors.clear();
+  _python.clear();
+}
+
+void QStyleModuleSyntaxHighlighter::highlightKeywords(const QString& text, vector<QString>& iKeywords, const QColor& iColor){
+  int pos = 0;
+  int pos1 = 0;
+  int pos2 = 0;
+  bool found = false;
+  for(vector<QString>::iterator o=iKeywords.begin(), oend=iKeywords.end();
+  o!=oend;
+  ++o){
+    pos =0;
+    QString word = *o;
+    while ( ( pos = text.indexOf(word,pos) ) != -1 ){
+      setFormat( pos , word.length() , iColor);
+      pos += text.length()+1;
+    }
+
+    //    while ( ( pos = text.find(QRegExp("(^|\\W)"+word+"\\W"),pos) ) != -1 ){
+    //      setFormat( pos , word.length()+1 , iColor);
+    //      pos += text.length()+1;
+    //    }
+  }
+}
+
+void QStyleModuleSyntaxHighlighter::dynamicHighlight(const QString& text){
+  int pos = 0;
+  int pos1 = 0;
+  int pos2 = 0;
+  while((pos1 = text.indexOf("class", pos, Qt::CaseSensitive) ) != -1 ){
+    int tmpPos = pos1+6;
+	if( ( pos2 = text.indexOf('(',tmpPos, Qt::CaseSensitive) ) != -1 ){
+      setFormat( tmpPos , pos2-tmpPos , QColor(0,0,255));
+      pos += pos2 - pos1+1;
+    } else{
+      setFormat( tmpPos, text.length()-tmpPos, QColor(0,0,255));
+      pos += text.length()+1;
+    }
+  }
+
+  while((pos1 = text.indexOf("def",pos, Qt::CaseSensitive) ) != -1 ){
+    int tmpPos = pos1+4;
+    if( ( pos2 = text.indexOf('(',tmpPos, Qt::CaseSensitive) ) != -1 ){
+      setFormat( tmpPos , pos2-tmpPos , QColor(136,0,0));
+      pos += pos2 - pos1+1;
+    } else{
+      setFormat( tmpPos, text.length()-tmpPos, QColor(136,0,0));
+      pos += text.length()+1;
+    }
+  }
+
+  pos = 0;
+  while((pos1 = text.indexOf("UnaryFunction", pos) ) != -1 ){
+    if( ( pos2 = text.indexOf(QRegExp("\\W"), pos1) ) != -1 ){
+      setFormat( pos1 , pos2-pos1 , QColor(0,0,255));
+      pos += pos2 - pos1+1;
+    } else{
+      setFormat( pos1, text.length()-pos1, QColor(0,0,255));
+      pos += text.length()+1;
+    }
+  }
+}
+
+void QStyleModuleSyntaxHighlighter::highlightComment(const QString& text){
+  int pos = 0;
+  int pos1 = 0;
+  int pos2 = 0;
+  while((pos1 = text.indexOf('#',pos, Qt::CaseSensitive) ) != -1 ){
+    if( ( pos2 = text.indexOf('\n',pos1, Qt::CaseSensitive) ) != -1 ){
+      setFormat( pos1 , pos2 , QColor(0,128,0));
+      pos += pos2 - pos1;
+      //setFormat( pos , text.length()-pos , _defaultColor );
+    } else{
+      setFormat( pos1 , text.length()-pos1, QColor(0,128,0));
+      pos += text.length()+1;
+    }
+  }
+}
+
+void QStyleModuleSyntaxHighlighter::highlightBlock ( const QString & text) {
+  setFormat( 0 , text.length() , _defaultColor );
+
+  highlightKeywords(text, _python, QColor(128,128,128));
+  highlightKeywords(text, _functors, QColor(136,0,0));
+  dynamicHighlight(text);
+  highlightKeywords(text, _operators, QColor(0,0,255));
+  highlightComment(text);
+}
\ No newline at end of file
diff --git a/extern/freestyle/src/app/QStyleModuleSyntaxHighlighter.h b/extern/freestyle/src/app/QStyleModuleSyntaxHighlighter.h
new file mode 100755
index 00000000000..ff3591ac45d
--- /dev/null
+++ b/extern/freestyle/src/app/QStyleModuleSyntaxHighlighter.h
@@ -0,0 +1,57 @@
+//
+//  Filename         : QStyleModuleSyntaxHighlighter.h
+//  Author           : Stephane Grabli
+//  Purpose          : Class to define the syntax highlighting
+//                     of the style module
+//  Date of creation : 07/01/2004
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef QSTYLEMODULESYNTAXHIGHLIGHTER_H
+#define QSTYLEMODULESYNTAXHIGHLIGHTER_H
+
+#include <QSyntaxHighlighter>
+#include <vector>
+
+class QStyleModuleSyntaxHighlighter : public QSyntaxHighlighter
+{
+public:
+  QStyleModuleSyntaxHighlighter(QTextEdit *iTextEdit);
+  virtual ~QStyleModuleSyntaxHighlighter();
+  
+  virtual void highlightBlock ( const QString & text) ;
+  
+protected:
+  void highlightKeywords(const QString& text, std::vector<QString>& iKeywords, const QColor& iColor);
+  void dynamicHighlight(const QString& text);
+  void highlightComment(const QString& text);
+
+private:
+  std::vector<QString> _operators; 
+  std::vector<QString> _functors;
+  std::vector<QString> _python;
+  QColor _defaultColor; 
+};
+
+#endif
diff --git a/extern/freestyle/src/app/app.pro b/extern/freestyle/src/app/app.pro
new file mode 100755
index 00000000000..e2ba9aec6f7
--- /dev/null
+++ b/extern/freestyle/src/app/app.pro
@@ -0,0 +1,179 @@
+# This file should be viewed as a -*- mode: Makefile -*-
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#			      W A R N I N G ! ! !                             #
+#             a u t h o r i z e d    p e r s o n a l    o n l y               #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+
+include(../Config.pri)
+
+TEMPLATE        = app
+TARGET          = $${APPNAME}
+debug: TARGET   = $${TARGET}_d
+VERSION         = $${APPVERSION}
+TARGET_VERSION_EXT = $${APPVERSION_MAJ}.$${APPVERSION_MID}
+
+
+
+#
+# CONFIG
+#
+#######################################
+
+CONFIG          *= console qglviewer2 3ds$${LIB3DS_VERSION_MAJ}.$${LIB3DS_VERSION_MIN} python$${PYTHON_VERSION_MAJ}.$${PYTHON_VERSION_MIN} glut
+win32: CONFIG	+= embed_manifest_exe 
+QT += xml
+
+exists (../libconfig.pri) {
+  include (../libconfig.pri)
+}
+
+#
+# BUILD DIRECTORIES
+#
+#######################################
+
+BUILD_DIR       = ../../build
+
+OBJECTS_DIR     = $${BUILD_DIR}/$${REL_OBJECTS_DIR}
+DESTDIR         = $${BUILD_DIR}/$${REL_DESTDIR}
+UI_DIR          = ui_dir
+
+#!win32:PYTHON_DIR_REL        = build/$${REL_DESTDIR}/lib/python
+#win32:PYTHON_DIR_REL        = build\\$${REL_DESTDIR}\\python
+  
+#
+# LIBS
+#
+#######################################
+
+!static {
+  !win32 {
+    lib_bundle {
+      LIBS += -F$${BUILD_DIR}/$${REL_DESTDIR}/lib -framework $${LIB_GEOMETRY} -framework $${LIB_IMAGE} \
+		-framework $${LIB_SCENE_GRAPH} -framework $${LIB_SYSTEM} \
+		-framework $${LIB_WINGED_EDGE} -framework $${LIB_VIEW_MAP} \
+		-framework $${LIB_RENDERING} -framework $${LIB_STROKE}
+    } else {
+      LIBS *= -L$${BUILD_DIR}/$${REL_DESTDIR}/lib \
+                     -l$${LIB_SYSTEM} -l$${LIB_IMAGE} -l$${LIB_GEOMETRY} \
+                     -l$${LIB_SCENE_GRAPH} -l$${LIB_WINGED_EDGE} -l$${LIB_VIEW_MAP} \
+                     -l$${LIB_RENDERING} -l$${LIB_STROKE}
+    }
+  }
+
+  win32:LIBS      *= $${DESTDIR}/$${LIB_SCENE_GRAPH}$${LIBVERSION}.lib \
+                     $${DESTDIR}/$${LIB_SYSTEM}$${LIBVERSION}.lib \
+                     $${DESTDIR}/$${LIB_WINGED_EDGE}$${LIBVERSION}.lib \
+                     $${DESTDIR}/$${LIB_VIEW_MAP}$${LIBVERSION}.lib \
+                     $${DESTDIR}/$${LIB_STROKE}$${LIBVERSION}.lib \
+                     $${DESTDIR}/$${LIB_RENDERING}$${LIBVERSION}.lib \
+                     $${DESTDIR}/$${LIB_GEOMETRY}$${LIBVERSION}.lib \
+                     $${DESTDIR}/$${LIB_IMAGE}$${LIBVERSION}.lib
+}
+
+# irix-n32:LIBS           *= -l3ds -lglut -lQGLViewer -lpython$${PYTHON_VERSION_MAJ}.$${PYTHON_VERSION_MIN}
+# mac:LIBS                *= -framework GLUT -lobjc -l3ds -lm -lQGLViewer -lpython$${PYTHON_VERSION_MAJ}.$${PYTHON_VERSION_MIN}
+
+#
+# INCLUDE PATH
+#
+#######################################
+
+#INCLUDEPATH             *= ../geometry ../image ../scene_graph ../stroke ../system \
+#                           ../view_map ../winged_edge ../rendering
+
+#
+# DEFINES
+#
+#######################################
+
+DEFINES                 *= APPNAME=\\\"$${APPNAME}\\\" \
+                           APPVERSION=\\\"$${APPVERSION}\\\" \
+                           #ROOT_DIR=\\"$(FREESTYLE_DIR)\\" \
+                           PYTHON_DIR_REL=\\\"$${PYTHON_DIR_REL}\\\"
+                                  
+#
+# MOC DIRECTORY
+#
+#######################################
+
+win32:MOCEXT            = win32
+linux-g++:MOCEXT        = linux
+cygwin-g++:MOCEXT       = cygwin
+irix-n32:MOCEXT         = irix
+mac:MOCEXT              = mac
+MOC_DIR                 = moc_$$MOCEXT
+
+#
+# INSTALL
+#
+#######################################
+
+EXE_DIR       = ../../
+# install library
+target.path   = $$EXE_DIR
+# "make install" configuration options
+INSTALLS     += target
+
+#
+# SOURCES, HEADERS & FORMS
+#
+#######################################
+
+
+static {
+  include(../system/src.pri)
+  include(../image/src.pri)
+  include(../geometry/src.pri)
+  include(../scene_graph/src.pri)
+  include(../winged_edge/src.pri)
+  include(../view_map/src.pri)
+  include(../stroke/src.pri)
+  include(../rendering/src.pri)
+}
+#include(src.pri)
+APP_DIR = ../app
+DEPENDPATH += .
+INCLUDEPATH += .
+
+FORMS += appmainwindowbase4.ui \
+         interactiveshaderwindow4.ui \
+         optionswindow4.ui \
+         progressdialog4.ui \
+         stylewindow4.ui \
+         densitycurveswindow4.ui
+RESOURCES += $${APP_DIR}/freestyle.qrc
+SOURCES *= $${APP_DIR}/AppAboutWindow.cpp \
+           $${APP_DIR}/AppCanvas.cpp \
+           $${APP_DIR}/AppConfig.cpp \
+           $${APP_DIR}/AppGLWidget.cpp \
+           $${APP_DIR}/AppInteractiveShaderWindow.cpp \
+           $${APP_DIR}/AppMainWindow.cpp \
+           $${APP_DIR}/AppOptionsWindow.cpp \
+           $${APP_DIR}/AppProgressBar.cpp \
+           $${APP_DIR}/AppStyleWindow.cpp \
+           $${APP_DIR}/Controller.cpp \
+           $${APP_DIR}/QGLBasicWidget.cpp \
+           $${APP_DIR}/QStyleModuleSyntaxHighlighter.cpp \
+           $${APP_DIR}/AppGL2DCurvesViewer.cpp \
+           $${APP_DIR}/AppDensityCurvesWindow.cpp \
+           $${APP_DIR}/ConfigIO.cpp \
+           $${APP_DIR}/Main.cpp
+
+HEADERS *= $${APP_DIR}/AppAboutWindow.h \
+           $${APP_DIR}/AppCanvas.h \
+           $${APP_DIR}/AppConfig.h \
+           $${APP_DIR}/AppGLWidget.h \
+           $${APP_DIR}/AppInteractiveShaderWindow.h \
+           $${APP_DIR}/AppMainWindow.h \
+           $${APP_DIR}/AppOptionsWindow.h \
+           $${APP_DIR}/AppProgressBar.h \
+           $${APP_DIR}/AppStyleWindow.h \
+           $${APP_DIR}/QGLBasicWidget.h \
+           $${APP_DIR}/QStyleModuleSyntaxHighlighter.h \
+           $${APP_DIR}/AppGL2DCurvesViewer.h \
+           $${APP_DIR}/AppDensityCurvesWindow.h \
+	   $${APP_DIR}/ConfigIO.h \
+           $${APP_DIR}/Controller.h
+
diff --git a/extern/freestyle/src/app/appmainwindowbase4.ui b/extern/freestyle/src/app/appmainwindowbase4.ui
new file mode 100755
index 00000000000..13e758d49dd
--- /dev/null
+++ b/extern/freestyle/src/app/appmainwindowbase4.ui
@@ -0,0 +1,237 @@
+<ui version="4.0" >
+ <class>AppMainWindowBase</class>
+ <widget class="QMainWindow" name="AppMainWindowBase" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>510</width>
+    <height>523</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Freestyle</string>
+  </property>
+  <widget class="QWidget" name="centralwidget" >
+   <layout class="QGridLayout" >
+    <property name="margin" >
+     <number>9</number>
+    </property>
+    <property name="spacing" >
+     <number>6</number>
+    </property>
+    <item row="0" column="0" >
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>0</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+     </layout>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QMenuBar" name="menubar" >
+   <property name="geometry" >
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>510</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <widget class="QMenu" name="menuHelp" >
+    <property name="title" >
+     <string>&amp;Help</string>
+    </property>
+    <addaction name="actionHelp" />
+    <addaction name="actionControlBindings" />
+    <addaction name="separator" />
+    <addaction name="actionAbout" />
+   </widget>
+   <widget class="QMenu" name="menuFile" >
+    <property name="title" >
+     <string>&amp;File</string>
+    </property>
+    <addaction name="actionOpen" />
+    <addaction name="actionSave" />
+    <addaction name="actionClose" />
+    <addaction name="separator" />
+    <addaction name="actionLoadCamera" />
+    <addaction name="separator" />
+    <addaction name="actionSaveSnapshot" />
+    <addaction name="actionSavePSSnapshot" />
+    <addaction name="actionSaveTextSnapshot" />
+    <addaction name="actionCaptureMovie" />
+    <addaction name="separator" />
+    <addaction name="actionQuit" />
+   </widget>
+   <widget class="QMenu" name="menuWindows" >
+    <property name="title" >
+     <string>&amp;Windows</string>
+    </property>
+    <addaction name="actionStyleModelerWindow" />
+    <addaction name="actionOptionsWindow" />
+   </widget>
+   <widget class="QMenu" name="menuTools" >
+    <property name="title" >
+     <string>&amp;Tools</string>
+    </property>
+    <addaction name="actionComputeViewMap" />
+    <addaction name="actionSaveDirectionalViewMapImages" />
+    <addaction name="actionComputeStrokes" />
+    <addaction name="separator" />
+    <addaction name="actionResetInterpreter" />
+   </widget>
+   <addaction name="menuFile" />
+   <addaction name="menuTools" />
+   <addaction name="menuWindows" />
+   <addaction name="menuHelp" />
+  </widget>
+  <widget class="QStatusBar" name="statusbar" />
+  <action name="actionOpen" >
+   <property name="text" >
+    <string>&amp;Open</string>
+   </property>
+   <property name="shortcut" >
+    <string>Ctrl+O</string>
+   </property>
+  </action>
+  <action name="actionSave" >
+   <property name="text" >
+    <string>&amp;Save</string>
+   </property>
+   <property name="shortcut" >
+    <string>Ctrl+S</string>
+   </property>
+  </action>
+  <action name="actionClose" >
+   <property name="text" >
+    <string>&amp;Close</string>
+   </property>
+   <property name="shortcut" >
+    <string>Ctrl+C</string>
+   </property>
+  </action>
+  <action name="actionLoadCamera" >
+   <property name="text" >
+    <string>Load Camera</string>
+   </property>
+   <property name="shortcut" >
+    <string>Ctrl+L</string>
+   </property>
+  </action>
+  <action name="actionSavePSSnapshot" >
+   <property name="text" >
+    <string>Save PS Snapshot...</string>
+   </property>
+   <property name="shortcut" >
+    <string>Ctrl+P</string>
+   </property>
+  </action>
+  <action name="actionSaveSnapshot" >
+   <property name="text" >
+    <string>Save Snapshot</string>
+   </property>
+   <property name="shortcut" >
+    <string>Ctrl+W</string>
+   </property>
+  </action>
+  <action name="actionSaveTextSnapshot" >
+   <property name="text" >
+    <string>Save Text Snapshot</string>
+   </property>
+   <property name="shortcut" >
+    <string>Ctrl+T</string>
+   </property>
+  </action>
+  <action name="actionCaptureMovie" >
+   <property name="text" >
+    <string>Capture Movie</string>
+   </property>
+   <property name="shortcut" >
+    <string>Ctrl+M</string>
+   </property>
+  </action>
+  <action name="actionQuit" >
+   <property name="text" >
+    <string>&amp;Quit</string>
+   </property>
+   <property name="shortcut" >
+    <string>Ctrl+Q</string>
+   </property>
+  </action>
+  <action name="actionComputeViewMap" >
+   <property name="text" >
+    <string>Compute View Map</string>
+   </property>
+   <property name="shortcut" >
+    <string>Ctrl+B</string>
+   </property>
+  </action>
+  <action name="actionSaveDirectionalViewMapImages" >
+   <property name="text" >
+    <string>Save Directional ViewMap Images</string>
+   </property>
+   <property name="shortcut" >
+    <string>Ctrl+Shift+B</string>
+   </property>
+  </action>
+  <action name="actionComputeStrokes" >
+   <property name="text" >
+    <string>Compute Strokes</string>
+   </property>
+   <property name="shortcut" >
+    <string>Ctrl+D</string>
+   </property>
+  </action>
+  <action name="actionResetInterpreter" >
+   <property name="text" >
+    <string>Reset Interpreter</string>
+   </property>
+   <property name="shortcut" >
+    <string>Ctrl+R</string>
+   </property>
+  </action>
+  <action name="actionStyleModelerWindow" >
+   <property name="text" >
+    <string>Style Modeler Window</string>
+   </property>
+   <property name="shortcut" >
+    <string>Ctrl+I</string>
+   </property>
+  </action>
+  <action name="actionOptionsWindow" >
+   <property name="text" >
+    <string>Options Window</string>
+   </property>
+   <property name="shortcut" >
+    <string>Alt+O</string>
+   </property>
+  </action>
+  <action name="actionHelp" >
+   <property name="text" >
+    <string>&amp;Help</string>
+   </property>
+   <property name="shortcut" >
+    <string>Ctrl+H</string>
+   </property>
+  </action>
+  <action name="actionControlBindings" >
+   <property name="text" >
+    <string>Control Bindings</string>
+   </property>
+   <property name="shortcut" >
+    <string>H</string>
+   </property>
+  </action>
+  <action name="actionAbout" >
+   <property name="text" >
+    <string>About</string>
+   </property>
+  </action>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/extern/freestyle/src/app/densitycurveswindow4.ui b/extern/freestyle/src/app/densitycurveswindow4.ui
new file mode 100755
index 00000000000..1a35e3247d1
--- /dev/null
+++ b/extern/freestyle/src/app/densitycurveswindow4.ui
@@ -0,0 +1,442 @@
+<ui version="4.0" >
+ <class>DensityCurvesWindow</class>
+ <widget class="QDialog" name="DensityCurvesWindow" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>838</width>
+    <height>272</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Density Curves</string>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QTabWidget" name="tabWidget2" >
+     <property name="currentIndex" >
+      <number>1</number>
+     </property>
+     <widget class="QWidget" name="tab" >
+      <attribute name="title" >
+       <string>[ density / pyramid level ]  for each Orientation</string>
+      </attribute>
+      <layout class="QHBoxLayout" >
+       <property name="margin" >
+        <number>9</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item>
+        <layout class="QVBoxLayout" >
+         <property name="margin" >
+          <number>0</number>
+         </property>
+         <property name="spacing" >
+          <number>6</number>
+         </property>
+         <item>
+          <widget class="AppGL2DCurvesViewer" native="1" name="CurvesViewer0" />
+         </item>
+         <item>
+          <widget class="QLabel" name="label0" >
+           <property name="text" >
+            <string>0 degree</string>
+           </property>
+           <property name="alignment" >
+            <set>Qt::AlignCenter</set>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QVBoxLayout" >
+         <property name="margin" >
+          <number>0</number>
+         </property>
+         <property name="spacing" >
+          <number>6</number>
+         </property>
+         <item>
+          <widget class="AppGL2DCurvesViewer" native="1" name="CurvesViewer1" />
+         </item>
+         <item>
+          <widget class="QLabel" name="label_45" >
+           <property name="text" >
+            <string>45 degrees</string>
+           </property>
+           <property name="alignment" >
+            <set>Qt::AlignCenter</set>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QVBoxLayout" >
+         <property name="margin" >
+          <number>0</number>
+         </property>
+         <property name="spacing" >
+          <number>6</number>
+         </property>
+         <item>
+          <widget class="AppGL2DCurvesViewer" native="1" name="CurvesViewer2" />
+         </item>
+         <item>
+          <widget class="QLabel" name="label90" >
+           <property name="text" >
+            <string>90 degrees</string>
+           </property>
+           <property name="alignment" >
+            <set>Qt::AlignCenter</set>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QVBoxLayout" >
+         <property name="margin" >
+          <number>0</number>
+         </property>
+         <property name="spacing" >
+          <number>6</number>
+         </property>
+         <item>
+          <widget class="AppGL2DCurvesViewer" native="1" name="CurvesViewer3" />
+         </item>
+         <item>
+          <widget class="QLabel" name="label135" >
+           <property name="text" >
+            <string>135 degrees</string>
+           </property>
+           <property name="alignment" >
+            <set>Qt::AlignCenter</set>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QVBoxLayout" >
+         <property name="margin" >
+          <number>0</number>
+         </property>
+         <property name="spacing" >
+          <number>6</number>
+         </property>
+         <item>
+          <widget class="AppGL2DCurvesViewer" native="1" name="CurvesViewer4" />
+         </item>
+         <item>
+          <widget class="QLabel" name="labelAll" >
+           <property name="text" >
+            <string>all directions</string>
+           </property>
+           <property name="alignment" >
+            <set>Qt::AlignCenter</set>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="tab" >
+      <attribute name="title" >
+       <string>[ density / orientation ]  for each Level</string>
+      </attribute>
+      <layout class="QVBoxLayout" >
+       <property name="margin" >
+        <number>9</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item>
+        <layout class="QHBoxLayout" >
+         <property name="margin" >
+          <number>0</number>
+         </property>
+         <property name="spacing" >
+          <number>6</number>
+         </property>
+         <item>
+          <layout class="QVBoxLayout" >
+           <property name="margin" >
+            <number>0</number>
+           </property>
+           <property name="spacing" >
+            <number>6</number>
+           </property>
+           <item>
+            <widget class="AppGL2DCurvesViewer" native="1" name="LevelCurveViewer1" >
+             <property name="minimumSize" >
+              <size>
+               <width>50</width>
+               <height>50</height>
+              </size>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="label0_2" >
+             <property name="text" >
+              <string>level 1</string>
+             </property>
+             <property name="alignment" >
+              <set>Qt::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QVBoxLayout" >
+           <property name="margin" >
+            <number>0</number>
+           </property>
+           <property name="spacing" >
+            <number>6</number>
+           </property>
+           <item>
+            <widget class="AppGL2DCurvesViewer" native="1" name="LevelCurveViewer2" >
+             <property name="minimumSize" >
+              <size>
+               <width>50</width>
+               <height>50</height>
+              </size>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="label0_2_2" >
+             <property name="text" >
+              <string>level 2</string>
+             </property>
+             <property name="alignment" >
+              <set>Qt::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QVBoxLayout" >
+           <property name="margin" >
+            <number>0</number>
+           </property>
+           <property name="spacing" >
+            <number>6</number>
+           </property>
+           <item>
+            <widget class="AppGL2DCurvesViewer" native="1" name="LevelCurveViewer3" >
+             <property name="minimumSize" >
+              <size>
+               <width>50</width>
+               <height>50</height>
+              </size>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="label0_2_2_2" >
+             <property name="text" >
+              <string>level 3</string>
+             </property>
+             <property name="alignment" >
+              <set>Qt::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QVBoxLayout" >
+           <property name="margin" >
+            <number>0</number>
+           </property>
+           <property name="spacing" >
+            <number>6</number>
+           </property>
+           <item>
+            <widget class="AppGL2DCurvesViewer" native="1" name="LevelCurveViewer4" >
+             <property name="minimumSize" >
+              <size>
+               <width>50</width>
+               <height>50</height>
+              </size>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="label0_2_2_3" >
+             <property name="text" >
+              <string>level 4</string>
+             </property>
+             <property name="alignment" >
+              <set>Qt::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" >
+         <property name="margin" >
+          <number>0</number>
+         </property>
+         <property name="spacing" >
+          <number>6</number>
+         </property>
+         <item>
+          <layout class="QVBoxLayout" >
+           <property name="margin" >
+            <number>0</number>
+           </property>
+           <property name="spacing" >
+            <number>6</number>
+           </property>
+           <item>
+            <widget class="AppGL2DCurvesViewer" native="1" name="LevelCurveViewer5" >
+             <property name="minimumSize" >
+              <size>
+               <width>50</width>
+               <height>50</height>
+              </size>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="label0_2_2_4" >
+             <property name="text" >
+              <string>level 5</string>
+             </property>
+             <property name="alignment" >
+              <set>Qt::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QVBoxLayout" >
+           <property name="margin" >
+            <number>0</number>
+           </property>
+           <property name="spacing" >
+            <number>6</number>
+           </property>
+           <item>
+            <widget class="AppGL2DCurvesViewer" native="1" name="LevelCurveViewer6" >
+             <property name="minimumSize" >
+              <size>
+               <width>50</width>
+               <height>50</height>
+              </size>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="label0_2_2_5" >
+             <property name="text" >
+              <string>level 6</string>
+             </property>
+             <property name="alignment" >
+              <set>Qt::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QVBoxLayout" >
+           <property name="margin" >
+            <number>0</number>
+           </property>
+           <property name="spacing" >
+            <number>6</number>
+           </property>
+           <item>
+            <widget class="AppGL2DCurvesViewer" native="1" name="LevelCurveViewer7" >
+             <property name="minimumSize" >
+              <size>
+               <width>50</width>
+               <height>50</height>
+              </size>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="label0_2_2_6" >
+             <property name="text" >
+              <string>level 7</string>
+             </property>
+             <property name="alignment" >
+              <set>Qt::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QVBoxLayout" >
+           <property name="margin" >
+            <number>0</number>
+           </property>
+           <property name="spacing" >
+            <number>6</number>
+           </property>
+           <item>
+            <widget class="AppGL2DCurvesViewer" native="1" name="LevelCurveViewer8" >
+             <property name="minimumSize" >
+              <size>
+               <width>50</width>
+               <height>50</height>
+              </size>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="label0_2_2_7" >
+             <property name="text" >
+              <string>level 8</string>
+             </property>
+             <property name="alignment" >
+              <set>Qt::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <customwidgets>
+  <customwidget>
+   <class>AppGL2DCurvesViewer</class>
+   <extends>QWidget</extends>
+   <header>AppGL2DCurvesViewer.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/extern/freestyle/src/app/freestyle.qrc b/extern/freestyle/src/app/freestyle.qrc
new file mode 100755
index 00000000000..b37a6702af6
--- /dev/null
+++ b/extern/freestyle/src/app/freestyle.qrc
@@ -0,0 +1,23 @@
+<!DOCTYPE RCC><RCC version="1.0">
+    <qresource prefix="/icons" >
+        <file>icons/add.png</file>
+        <file>icons/arrow_down.png</file>
+        <file>icons/arrow_left.png</file>
+        <file>icons/arrow_right.png</file>
+        <file>icons/arrow_up.png</file>
+        <file>icons/clear.png</file>
+        <file>icons/close.png</file>
+        <file>icons/edit.png</file>
+        <file>icons/eye0.png</file>
+        <file>icons/eye1.png</file>
+        <file>icons/folder.png</file>
+        <file>icons/home.png</file>
+        <file>icons/mod0.png</file>
+        <file>icons/mod1.png</file>
+        <file>icons/ok.png</file>
+        <file>icons/reload.png</file>
+        <file>icons/remove.png</file>
+        <file>icons/save.png</file>
+        <file>icons/save_as.png</file>
+    </qresource>
+</RCC>
diff --git a/extern/freestyle/src/app/icons/add.png b/extern/freestyle/src/app/icons/add.png
new file mode 100755
index 0000000000000000000000000000000000000000..d3388dcb3a977562e4ce812ddd429faf7bd671bf
GIT binary patch
literal 400
zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fY)RhkE)4%caKYZ?lYt_f1s;*b
z3=G_YAk0{w5<d|r$X?><>&kwaNsLF!x?!7h76SvLtfz}(NX4A1Q}+5DHV|>^S5Eup
zSIel<*41kMLVBT2$5QR2m)-}$Rwm0c9GS2*Dan;br-SkKl~fMDKf>1o1w4K(@%Xu0
z-F@G=){U-TD$?zjn6cl>zbAI~=q4@32|{6?4}W!+EMQ?V(2BpzEyJ|*+;x$a?E3FT
z8Lod<b-Nm{@^x}Y;pG)4KV~Lp^6D0-KmJ~?v`DzgEi(A}1*WU&8mw;3VF@ZWYY*CN
zIg`;lJ+yO5MSwVm;gx&klVcv=KW6NAbJsF~+jXUHCjB=Au^*W0O#Lvu=h>k*$Jm{C
z@5aeKYxP!SD6Fj3i?f$&-Fju!))HU+cgqf4YngOYv1HSV#0zF0D<8kVxh^HWb+`ZS
qUGu%J?Xd8!F-ZQC-dtDnlg-F)=gnE2J2ik|$KdJe=d#Wzp$PyaBBbpA

literal 0
HcmV?d00001

diff --git a/extern/freestyle/src/app/icons/arrow_down.png b/extern/freestyle/src/app/icons/arrow_down.png
new file mode 100755
index 0000000000000000000000000000000000000000..6cf2e9bba266cbc7e7d654477d85ba8deb923495
GIT binary patch
literal 813
zcmV+|1JeA7P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3labT3lag+-G2N4000McNliru(*hO^2_AIWihBS60=h{=
zK~#90wbfrpQ&AiT@bBH9tE(+o{wti3pb|Zp8X*K0MD%1v586w;%%HLtK?qh_WV(v1
z1W`g!h@{AeLNOsEf?f(0M<g?yt3V`cu4TI2-Fxmir-!<8b5mE~4}Ng({oV7qKkm8b
z9)WX?%?RD5sH@@rkN<~A1n3@L10MF`mR<+mIil7Hf{--&ejYWwAHYpU@P=Xes5UkN
zhX^VU<^Z|rhL-x5Qdcs#$B!#hezceE0t(Uqg{Y_FI@SpgIA=Jro1w^-a`w{Ta`$?;
z$B#z04^8`ba^!DkAe1Axv}Dri2JL__fHDrsIF1(pgqrNN1IrKup?dX~Gqr%mNgo>a
z?V!lEa8L%QOb00(7USTs3Pvb{O8+1g1q_6l>=&NJ;*&mHcl*##n580X3xi7kHbw!3
zt~@*fFUw#uVIT$;DOTiBC~B(R-nWcEAW-d<tPYPKSBo+gWTsLObp=vX0dgYvhXg4^
z7`BN~RRAaQCCD_ze*2xyoRfyCGFuoKCKV+1HUt$NBt@0A^T^~;pr>zA#7~KVs5B-|
z=7q2)OJ7x-8A3*?99N(A1J9>L%)EZ|MDv8`i8=LDai(w8J8Fu5!E8)!sefKHpxtG`
zm(ii-v6k|B0N|X*uDnY9z-6ybzIlJtf`G*1I$NDnejV<NSm1d(=!{0=ItBni5OAn7
z=(JfyM{P*}W+OwQ__S!m{c$V4x`vwFt+8lASi?&@g3fHK=%_1MfJKbOy^A95ji+JW
zHPq~Bi$|edNR$9j)E0D>_bU92dycziX1Qx-miLW)=cQeY=UyCaTF+P$*6_WpLFciD
z3V$^*#~+V=<0TIm&pFrMxM5@K!5W@_H+bW458;I!jAx&Jacv_sDOkg8jtQ6#oZ0Xd
rYMF5I5=Hc%E}1b&!~Ytaw&(o@&9xsD0e7hn00000NkvXXu0mjf%@k}o

literal 0
HcmV?d00001

diff --git a/extern/freestyle/src/app/icons/arrow_left.png b/extern/freestyle/src/app/icons/arrow_left.png
new file mode 100755
index 0000000000000000000000000000000000000000..72a5c462af6624985fb90335fe17b8c26bafba64
GIT binary patch
literal 776
zcmV+j1NZ!iP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3labT3lag+-G2N4000McNliru(*he69sp|!8JhqA0+mTb
zK~#90wUkRpRACgy|HpZV=#<lJ1S=P14_ASq36->J69}y%!stO^LFHnEAX-c%SY!_<
zUtkYv6Im&=F?u4(j1bL?iZaotb2W9w$LQ7X-g{b@;`QDc$At&Z;``3|e&7E)eCH4|
zV<RkWL#P0(sV0V^K;Jl8<`ksOD-f~*F*Of4CPN1B`g$qaSLRbHrSJ^{(hNA?wYU}<
zAXGrn7T3Q<fxw>$sxEV3iMOWW?g%hC3oh9PI5SKxjQ|5tpzcDkZa*p57g<zVoXgmp
z4rrP_?u`I%f`snYrxYFP*9V!|)Vqcl?|Yd?rd3`LiorX=DqsD`eE4jQDa#bv5oWv%
zG7nD*o||7V__yB*Uut7Mbnbpafre6a3<5*b;G!G>hfRZ`u717+uL2hQd{;|9>Mk!s
zSDOy}DFlqf!9_VTvTPc}DyUDg;)UM||A$)YtWONpfg>|O&lvNO?J^uT)u>dm;<?|B
zp0<bNZAcE)fxW}PtYFwkKv9hcddBVe8}4iIHdL$$1y;25v0cF66z)CpWg;pwgsSQM
zczztE`|`?;)=xGiCH^;E=Sh-;6Rn#(xz2R=mBL9l?3&@gvp^QUgw)3NGg+sTsW!AU
z5#ivIxF^?XcV8=vnZla`4tx%2jo;5FhMUd`B0|yQxM!==?ylTFZVGSmXX9%~YwWye
z4mWLSW(E;ei3f4q?%d+8EHuJT?ukOE+2x{k21I0lC!EL3jP8oes(~?a%hTmTOa@d<
z)A^~r6DY|;dBGj2f{4~Gg)V^zyYI$5c`lo~ykG(r6DiF>Cj$Lp8o04@`5UG*kBJC7
zs$(FF&Bv@}K-1Dz1bIOUz6{qKxViMwl)+2zRBYYg_1ZrSSHTG<CVpA~0000<MNUMn
GLSTaO*;^(6

literal 0
HcmV?d00001

diff --git a/extern/freestyle/src/app/icons/arrow_right.png b/extern/freestyle/src/app/icons/arrow_right.png
new file mode 100755
index 0000000000000000000000000000000000000000..f7e5c3b37e3435028dafa145f63064d91129ca17
GIT binary patch
literal 773
zcmV+g1N!`lP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3labT3lag+-G2N4000McNliru(*he693Wy+ThRaj0+LBY
zK~#90wbe~X6k!+#@c%pRjO%WLs}f>GT_Qp=i6uJJ7M(J>1%(GeutRpJLxi^|uqd&Q
zQxaA})Ic8!MR<w~J$Pu{-O63rmJpXHf=E|qX4jpsr-QicIJ@IQ_`q|Rd3b-k^PhJZ
zMnu?*;x<JE;3>YC`hiOeIkXdjbPGn_fRWRo$r>`td0e=9ta6yGMKP8Fcn-9?0bl@3
z0t{=lvpO(72PoMUcH@M%GMR`#L{K!sV3;WNmr7PTL)14x)H|jW*0^;cV?Pi0n8rpD
zz?a_y%d+<lk<i&n5WIf6{7&6)!?u^#6%??rtgvTa8N$B^re)cByJ(@S&4N(lr;Bgh
z@j}MMb$(Qa*C*21W)s0C%P~(cF+7TTpr|T)c-mh%3;^A)WK{b^>S#6)Y%(45`6UiR
zQ68$QvL|Ppcv%<#x?aersu8JkpN0dChGRaL;V=~QLRD4vyu*&WejrafL>%6hXCKl6
z5`Q=tre*7$qJi%HIq+T|9l7$lau@*49jr#{R_kLX&%rQFM+d5P)OZNQ`@tA1tn;{-
z0Dw11Ox6l|sHHv&eO=Uw#&Can3zCV?!&A3U*=DX8kIrIJz)Gm4PI1g+jl;c2Es`@4
z>C^Q?oon~kyt44i1SSRKLd~^uN%T%6fYeM>iuE~BpiC6f3?_KWh4ut8FxDMoS>rG;
z9Y87`mEt!`qb1?TQH*<$J-W9p19M%bvc_Q`Qjc%(sFb`_9(BME!nkYc>hWOXBFqvy
z?T<7d6^}{Z``uBXDC6Guz*1JDle-ojk8fJQ@N7L&@t8C}urX?b0ibPA@5$=uAyeaF
znN=WStAJ_b)8UbygYDNUK^<`M0e7oP{*$if_<!mj3FWFjnhf_P00000NkvXXu0mjf
DwGLWN

literal 0
HcmV?d00001

diff --git a/extern/freestyle/src/app/icons/arrow_up.png b/extern/freestyle/src/app/icons/arrow_up.png
new file mode 100755
index 0000000000000000000000000000000000000000..993a574b15a4a64718f1047b4274c6de9915a7d8
GIT binary patch
literal 782
zcmV+p1M&QcP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3labT3lag+-G2N4000McNliru(*hO^1vCTK450u30-H%h
zK~#90wUysXlTjSTpKZ<N=CTzeB?ZxCr9?s`*p)ZJx(*5iz39p)>LLj$L;r&!O-tL2
z&_(oPW&_KuHkV~!ZO$~)sT)~Ql)T%!*Y}+Be!CdcUN^T2ec*wYbI$YO%Q@e3UIP(f
zBV^nV>c4=8<3QxwI)lAY^nQ^*-dWH!uQ>HrWFpGz;5<EkK0_okqSzu)+Y6%R{zQGD
zT;9o{d2;)rM6xP~i?pYI2)Z&zbitiy_%E=3j@*MY8c7PHC8qb(cTUX%L`@IZhUeVl
zmveBZ7&#A>F&LqN3%z%h2-H_Fm@T&M)Ay4Nxfq7kee9iuTVa~Bs!T<ZDSwa8E*jA}
zx*3T?ve9+I*0UyfU>a_PYtF+vQU#$aa1%O4Eszp&<GqtB@a3)WM$s-U31`Lj1PsK%
zxX`&bQiS2SF>AcsrlRp+5@w6FyY6P}Ko&Uq3$^>UBms>><w9rIm<12~6P`OED}r%T
z)_l25MeUvxgvoZ+U@+*x3WsTRHH-_~9kaqcH0kkOtgKs@d~>`jRDwX<oVAWfKu*by
ztcs;2XbK}Rp)I>7Qi8tVM^ErlWgP&#ZaLDINJuqZAv^r>BHdb*6BL!3GQ3ThkDm&J
z!UVWk003O$Tk&jU%JaS@4F%FY4<Jx=L#pWvm-?B|aCB!10Mc-6<xrO^{+a}rRe}&2
zZih?pbof&)C;;GXlRc1>q?(S91HM=>gwVhRK@~Z`^NV0iBXmX_@Qlno8E?%E%_wxv
z9*~n#^{uc2zPJ^P0G<oHAmO^}g9H8kv8x|j_dD}JGnzPWf0dG@>h|z941F$!9DDZ&
ze+Dz&+qR$!7J9)lE<JVzyDv}aa=M$B>A^yk=F;kH)?2Y&+OU7#Z{OE^pRYwDPyhe`
M07*qoM6N<$f}Dk7W&i*H

literal 0
HcmV?d00001

diff --git a/extern/freestyle/src/app/icons/clear.png b/extern/freestyle/src/app/icons/clear.png
new file mode 100755
index 0000000000000000000000000000000000000000..1e3b2e37bd92039170e0c8c4b6800cbb304b2acb
GIT binary patch
literal 1057
zcmV++1m63JP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3lRVS3lRZ-WM7d0000McNliru(*p(yI|}PXV%-1$1FlI#
zK~#90m6dI4990y@fA`MAW@jI}Np{oPXl$zlMXd3GDy5`C$&2diT8a+^L40SwfN%T&
zEq;L(1QA7SDJZQ<18M~!(AK7rRPsP$6S~<ZnPjuGyEFIrV!LH0TcaMhGu+F$zxkhY
z&z+-0gicdR0gyWO%X^5tD<Y#}1S5h(1`z=x<HpDZ;0z)}-yH#<lclzTGsmxvitvqg
z6RGsh!TbF?cliA!C(I=w=Rrczv$5=Z3o}cF>(`g6t82kY;JjQO`)BY2=#|n_`~GqV
zioOvT$l>;9@LUVaQMi`EBwfPN4g$|Kl3#p&qkrP}%3)w!ejIzq(w%BWIJ@VWeaqgi
zq7N{TBD*U?Z;wOLR=5CS(Dg>>`hGK87j2z<>)ExwymPiM@5CaHfuA2r54}BBYycFJ
zWb!?v1VEr2mvlUhh&Hw@*|hUSHXR4sos*nrvpd&PmQUcd*9~CtXe*{|%ZLuQuE)UT
z^+x6RFxk}_(YI6aXaGb&b<7Vw?j(M_S=*Sq8+3g)2Cg+tV*xIH_yVuJv!Cquw`ojO
z2+INH-UenMg)XJh2X;G7$%9YMuarOg*<VK_wJlg8VHGO#4K9wj969<l-cjfY!PyL9
zd7Wrtt{Hs%<!bq->CGTC9ieOs?r>;AP=lb{gvk}SIU6xKTV--CVD@ehrx>~{21dF)
zq`gsELmuJt?}|;ggS3Z8Yk#}`{twv19UO_sNE1&rBFhdpNth~0sgl&uW{9&2R`b6p
z7O=oAx{O*d)Gkhipb;!(u$3X90?)F7z5r{}C%r(_4UW~St8w%2rVB#~P#TPYh(ali
z)()0sqgAVH9Tj<5+usXDZ#}`7;@-5=>j3Kw2sG525QQM3QOZJV3&&32B{hy6Q4MN@
zCbArRqw9jiZ&w)72W<GwR$6pRwblxy6k2JtrLZiG?Kt#ilN=kIqLdO!sdzeKimTN+
zOG|5v4CD~Nk3dIlcnhkOW=}yF&ilMvSmMwtuXFA8WLJ)3;E6wcZq2MvuQ$o()8ukJ
z<UDxNgM-Bc{&0eRt4b|!NF)m6vd^)2U-<3n;`WC}B<DW(^iOWg`1pR6#l<x$l`7#{
zKq_i7m=ZFX6vh5ta@h>G<^vABe;MH1R&ZBqQU@-aM&zT>mkPY`YLUYuee8WKjq6(2
zw#}V;0aqr<eD%W}E?t@jI0Kww`o#7<uiZ>}@$1t>GK!e}4{DBwZ;@*l#(`4+OrHSa
b|C+x6EX1(}8FF_Z00000NkvXXu0mjfK}zX*

literal 0
HcmV?d00001

diff --git a/extern/freestyle/src/app/icons/close.png b/extern/freestyle/src/app/icons/close.png
new file mode 100755
index 0000000000000000000000000000000000000000..2042ec3d1bab5ad174c0f0976fa11a8330668416
GIT binary patch
literal 1437
zcmV;O1!DS%P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3xxmx3xxsfzC_vp000McNliru(*p(yI{*uii^Bi_1u98I
zK~#90eU)8kWmgr)e{1i3&bjA)<laoK=`_h?noOEZI}_9a3tB6MzErfe(4sz+3ZYPt
zKKNt>A7)A&6kmlx!GT(^ilT_3D0Q$>hhn9}SfrDFOf$)R<R+6$GB>#&=bm%+^5NdO
z3_f@s_StOMKi2-Q|5{4`1X!wt4<3r#b6PIX7-LdZ1eD>YddF6WJMT4c-DG7g$zD0L
z(>>>ae8A+p2cnZ-JvMu)`tU;<kB#8dM7&qPBPbv!9@L|Gj(U%(2NYG+c4Ldq`DOX@
zrN*frZ+BiqL7uIJUwmfq$Xmsy9`{M(vUb+5qbTAm#yNbR;?oR7F+qTfi`XDU1;iM{
z7=n>9-MvKo8}FFcKVE<6r@P&M*vG5UOP_i2u}^oJ8-Dk~c`Je-7)=wC?(LXjt!~C<
z?=!V~=1p9wnY`UJNpr_I7a9>UsESW|CaRXaIA^w2*4<oSe&@7Yo{q;xxN+eku3T0V
z7sRIt<%3hqJ+VY(;j_f!hfoplIqk+Od&~b~<*&ac&wAJ}5=1mlQsR1rEDENl0B4L*
zpC<k1hk^LC%h>!P$DjWpQGEik9($|Hw6@l%Ow3T4n58r^OXcY2Sbps^$^I>jiv(+7
zknt=EaH@#+eNBCmQ9U%rv2ULys!y=@;dw6q@iq3ZeS(ck;4`XoiyVGziPFR@3s1km
z#aDkot{!m)%{?e00tOVpW2{B<l-Vbrr7%84^Zj>t@8$2a@$Yj?J^Ta@yz~poGsn30
z&o@~9*=c&WHYiWcGx>!t<Fg)O-Owp0nA_gW(;lNUM;V<z0Y2yB-=86A?-PyIDUOW;
z5Fe;h7#nAQ<0@DG@^b*HM;{=n)cW359avunU;&?{lqP3zwK_L1zDsjunXozv>hazW
z>Y-mKHZIe=`VqaI4N9Myq*R|6LUkCiDyoWzB5`>bz4s}`S`dTC;9=H)F_^&NeNLA4
z!1Vnt)<IumbQrOEBnTku_U}g#u2AeltsM#`V)_7Ma8Zm4Bk&%v4r2q<|BuG%b8HyV
z+u6i-njBa-LG{RSvTh4oC}3>R2V0AcLh>}BJb8q$Hcoqcon&tpSBU%I+ZwAXn&-G;
znccMy*}e2W7|W5bJVR6&A#LxICM^K6q(iUOq;mIRrXKkw0NutVvR)SxM5xzc#BR`|
z5F?nd!0Mk~rFwXQ^1Uax|LN~>`Rp&b^41^NeD54-yUF<R&vW?EZxL3<>1?dhc=vAv
z#Sy$$H20{2h~kFn6v0L@`x|Rq`pr+6`}%jN%%9-?=>=Nrmr2@9ilgI{?wST0knC)5
z<?QR^d5$d<kUSr>R#jEOd9R|Xh%unKx?)*wd~lxbnUhR?>1$MG78#j2HgFE~cDHD)
z{)fhezmxS6Ojy9UKz*)ct<IqE6z96hTD!4DFkL6z-4jIA6-v_DZt%fxU#5K5Axd}O
zgSY^L(%Ej%-M@v4E7+)nae>;nES(#l(7L`!h^+Mhdv9R2?&~E>`Q$;OYRRit#acCC
zsHPBWuhY`j<~40^uWS3}mU>ieR8$ZJQJ;J5Zm#R~H{X=t+P1vi>^?tg?V13*P>)YO
zI&<(;xHzkEy#lJzPlO*<8(#a9!{=zOgNCDIt&X;?Z(?q?<m^`a)Fbuci@(~~?~f)C
zSgI8soQ~XcSrp6&q}-l)ca$l2{QF~1RgoY>R<0!3E8jR+K6iGj&5wrQ!Ln2<FdaFv
rDCnQv0sB926d^>ol4P9OZUgXNPi&?HohzRx00000NkvXXu0mjfZSKb>

literal 0
HcmV?d00001

diff --git a/extern/freestyle/src/app/icons/edit.png b/extern/freestyle/src/app/icons/edit.png
new file mode 100755
index 0000000000000000000000000000000000000000..244751b1933fcc0554fcdae42a52b80747601215
GIT binary patch
literal 896
zcmV-`1AqL9P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3labT3lag+-G2N4000McNliru(*hO^85>S<Y^4AI0}V+;
zK~#90os~^!TvZguf9KwL@699=J2OU2)s%uQ7NI2|exL;r1Q)vSV-<wjg$rqmyDqvB
zq|ik{im40Th>9qJRK$%%FmA+%AJtAtOG?v8iA^cfBr}=G%)F0#TuhmEI&qTpz=gx*
zoge4^|L49dfBtg`V+7|^jS<$0Fp7!7h$L}Ts&#gs9f#a=%>RC_bm7N8-g~R0pY{};
zDbAv*oGH%gT9G)X^+u?bm8RZUTGjL49M|wK)J?ytZs9k*{=*0Q<sR>Zs&e~Et=Zxo
zVU6I7V2vSfPLUb{e*G5oG{fbc<cDnT&YE?>Mg(gOs^BjFOm1Wf=7AWv9&z>T4D<8N
z&wA=M(lLMt=<G@St-v({2$VA{-un~}d^9zA*I-?qBc1ym$`-It4X9NelZ-JlbCLHa
zzR*pBjS-@$qxjo>SV%+4gXJNL<zb%Qe}KKuKFPI(D_u1kGEbY!c>dS0k^vQ{r3gch
z==lQ#*5FioYBmIp{+=KhE5Jn{<)D`3e5t{GZ;qo5^lrdT6_!4M`v;+wKxBYHs*k<G
zh_zrLac=YA_}u6CyYp}ZNJUW3GJCnk=-US|fsd+^ByF%r0RYv-{^qs2{TT5Iu$l(4
zz!nz#$4TFlM?^5j+??}Ua)=aqJHFkBX7Lp1(JWL_?X#^6P%4&qX#4~sLdsgAIHFdo
z(O7Ntm!cKMo!o}MAo)?avINEha@2;mvGw8Yw8D^TrAn(A-aLM{fjwa1)*mj>5m@oT
zHi3Yv({n^S-=SPC6URwgTLHI*d3`mGTON3?!O+WuZWq(jO6JiqR6#^K%Sbn7UGplH
z2!OD@g`YnBj*){C|NE_opt^|aBCyW5O-{{WE}Ujt{a+q=_bULBq+3gCE$P8DnSo5#
zeqXRQn)vlgJb36R&UFJl&m)@+2!a6T6p`-Nr|-BuvG+v^&%Drqs#C%!VPGJGv4$je
zs47l3aPxf6cJduBy$-amtSUICIH#RlNKh1sd*8~GwT8n-j<Ijw8yr4zte-NQivIxT
WzI|!R<t8Hl0000<MNUMnLSTY(jjP)L

literal 0
HcmV?d00001

diff --git a/extern/freestyle/src/app/icons/eye0.png b/extern/freestyle/src/app/icons/eye0.png
new file mode 100755
index 0000000000000000000000000000000000000000..5f6d873cb0cf54212d1fb2fcb74038cad350f665
GIT binary patch
literal 406
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VTavfC3&Vd9T(EcfWS|IVfk$L9
z0|U1Z2s2)~TlWVj$X?><>&kwaNmN+OP%M6i1_J}5vZsq<NX4AD{rkO{5@p)w@7}S{
z;Kc1aS^J`wOlu3%eNj-*(bl5;huv$5wv=*nmW9DBsVUO4M4DbKklM7=-u20n?r@Wj
z_m(vs*z&CA*!%wW^XzIqKa7JHPjlkvQ04e_`9&vd(N5iWd0A7umde*(Np!wmD(F;D
z6u7kP|Dm*Nk7^mNm(G9u*(gzBl8@T)<5x>%&wu7PJi%}I;Y(F=&%bnqXt5r+<u<Rf
zcxKvW&)s+BwEj*r;9xSE$-@xj#r9Y3>uvU$`^O7qo~0#wNGdK>=~9yFJ(iKUFyMfR
zuZgd7XlPit*vroFO}BUNaW%HFvn?(w@vxC|4;0}!ED?WuTP}mvRIa;u;@fLZ`W4Q9
ybdT}sD)-e_f33=jyjJm0{bk9o@5hDzNy=~2&(wL<)#(fjK?YA(KbLh*2~7Y!q^2SO

literal 0
HcmV?d00001

diff --git a/extern/freestyle/src/app/icons/eye1.png b/extern/freestyle/src/app/icons/eye1.png
new file mode 100755
index 0000000000000000000000000000000000000000..f762b66b482a898e848f8a1f91812d4c116ecb17
GIT binary patch
literal 402
zcmV;D0d4+?P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00006VoOIv0RI60
z0RN!9r;`8x0Y^zhK~#9!?UTPt0&y6|9}irjAdRM$nu6{YsldP*3cQp=s-dYtLYgZP
z&*%qHF4fRQP?LjlLt9f|P=nW>&_8jAau;7wqI+5@8dPl754^+63m<rR-xui9+pGd$
zn;QAAi~uNvxX<RUDKD&XG8pAf_Jp==KYh>Du4THen?eX4p5Jk5X_Kc{c}~nmIVOjg
zIm*#-90mdb0tj_9`Tc$xhG995!+O2WnUy59i#)^OFaa>Kk>t2CN6WHUtJPXcrN2$J
zT17k_9|ZuC`21+%;qe)zQVE)-VR&c|qzjU8T^FWl0zesn+)|iIrH&Ovf!FJWBuQAF
zpGH&ISl`;iyE}lF@+&US4&d|o;PH4M%fFttwy_h5#5MpH3I#SA4eB?y+)Zbh&g`>T
wG+3!rexfoKi!FA&W>r-q9nL1$|EgZ*3q^XL$P=a5X#fBK07*qoM6N<$f}1z2d;kCd

literal 0
HcmV?d00001

diff --git a/extern/freestyle/src/app/icons/folder.png b/extern/freestyle/src/app/icons/folder.png
new file mode 100755
index 0000000000000000000000000000000000000000..3a99ad5ee9264bc91614c6549f1ea091f5bdd9ef
GIT binary patch
literal 1015
zcmV<T0|@+yP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3labT3lag+-G2N4000McNliru(*pwxD;M$7kktSH1B6LL
zK~#90wUys%990y@KXYfY8<RBI#1z_Mr5d%gR5V4bKZ*zy(V~!u58{&|($^pgtsq4d
zwH6`u#fLojC$w1bB}gBN<e{Lo7D}Qv($Lf-yPMhF?99%bx%c=mNxC5o+J_!E3^UyG
zxnI8L&bgkdaxcQ%6Dr`{&En6#p2Ru@I9n+ABOiZoWK;c`1Hu1=e*VoQ#X<+b@@p?2
zC=K*?v0VG{*VCUK9lq20{{){p^V6Ej3;Q42@!|{54<V_;7>`$u?0Ztu^JC**zCOMQ
ztg1YB;x~XzU3_ELvImTn20Bk3ed$1HaG)Cz3qYD$h9BR>#i{EjflXlV+2fZ1^rN@;
zk~$Czi9o$tXYtw$uRiktho0Jl2Ux3QnI+5IdPa$G>db|66XT<!(B^TeGk4>WM>`Rh
zLvQ?kll!6t-hJ<BN__=XK_pjl{QEz+a=nhViaI3-JZAp%M>zb0A}$2_0Rq=%K(w4O
z{qt3Z_ipFl;e(s}KKAWZR&2mmA0DC+LoCn|@I3fsYM#^IO_kQI*!j*BfDY~MrCzDg
zRSf9cRzw}Bb6BUSRjQ4Ip$AJGdutyT|AMdywFsImsQg`K=HfKB%D2!fZ+Za16A$+S
zaQ>712vDvjY#%5R0nH4WNnYG+K^VcMxm;zELA@r-UA{qOc9G7azoGqsu6iLr6R22^
zayg~DufS3r{;9(J5`+z<Qp>2+EVV|){A@^Nb`h22HqANSA3Jw;VtiyYQ0G`XYc0U<
zFED*=g^pT*g=MIQN+lG^)r_U8uv8HmVN4P>LGxOhDV0VHs!WWJi~<-{MO8_G*unfV
zL_rU;Hxp6;$rO=|nTf+W2dXq9VX@XCD|SQMKnrZXDKRh?=3ZJ4TFxM~lvE5!mV25A
zq@q}>SP?4a2F@?w_w?pW+XnVl9nVr2EWkE}0T1rq(Lq>_aVUen5C%e66zbh6QN6`V
zC5D}yI0b7HoO4Vrv^CGH%HLhclb-cHknZUqNiswrNkGISO$|xXg-8cUBBZI1rWqm`
zlb3D}yTENR=#2s2_Xz@rbA})=IA<^>|7NXE5Lm4B@qLH22HO5MgK~%QlZWqn_`bmy
zgYWwolW&l}d#lge*$!Sm$6Kj3#-M6RrA6Fo5k)a^D<+N-qBy1%Cy2FVl5GHcJoE)y
lYrgx?>nA(_?_OP|{{lw42X^C7OA`P9002ovPDHLkV1k6-(M13N

literal 0
HcmV?d00001

diff --git a/extern/freestyle/src/app/icons/home.png b/extern/freestyle/src/app/icons/home.png
new file mode 100755
index 0000000000000000000000000000000000000000..ec4b22098b270daffdb13bc14d4982d3b5bee257
GIT binary patch
literal 1050
zcmV+#1m*jQP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#tVu*cRCwBA
z{Qv(y11$hR0I?9GD5n3&e??_^hWmFPGAt>yVI)QmKmakKyO^tv0W9#XiGh(ZV4i>w
z5Bri&-+z0&To}u&l)mgc<Ntr}K79L||9?Z$T6_ir1P}wrU}Vf$`~Sb$6d=Pe(Va11
z?*F2Br~Z8W`uG3a&wu{E{P5@ht_!dJ+gEM-ED*VHH-rCNUUdC13=lvVE;gSEaq;tW
zE5Gb%@!=8V=3w~q??1zzzyBG2|7BqK{Rc$<XXsvk?$7#Tw_kn!_}1Y6_QKcb4h9Gy
zCTzZVd;1{6o)%voZgzHtuRs4WeE9*z-~Tau2GXB_bdrlci?6wwBqxv1O-A=#A#^hU
z0tm&$z%Ui#U}JuCqAQr4my;drGB5_Z@)ww9VE6@R{|B=d?z{AN|M}auzr46@^#4%n
zcbHiK0mOo2C<{Lq+wleYF6^u<tYDY@Ml%E(_B7UJ{_y3O(wV;udl(rRZT>@D3J^eW
zgQM-$egj?iLrzS9;S<oSAea97!+_J!pGa&AO>MR_w?r(W`wssDxe;U@KmdV*0+deA
z-hK07POiHE%$2|JxboL;h`~RB^!a;#7>?XzVEFWtnSp_cg(2GX8aS;31Q0xo<0hW`
zA8Dt9Vkj3oBg5mDpBcV>{RTATAH#>Q{}?{~;$RTu=VK7&V`b>v@*8L%(9_HyLzy7-
z9Cjs;c>n<f4+@a&AHV%Y@#3*--x%CNq#2k%`j{c=ICvNsWPr3;$~%V7OuP(C+>8v&
zOpHKtnSg2-89=cIbnJbA0D>F*18DGvZ~wps-g@z$Vci)<hUf3u7{XH+7^HxX;eo2-
z1Y$NI1{uo5#R|5N8R}RTAciFifB-@@`0HPWBX^k@cHH1%_{Ruz0ncv+KA<LXP*#Vk
zV}@mYprO1x5W`@GG6PL}36%#3AQXcS-(zLibB~9Cl@sbcU?v2)lmp2?7yub6zy~pq
zg#}6@DFO%}xWVs#@-SR}&db2V!wB~pNF6^Avtr4eAVY=tA%?Lc84d#g0R%VrBbzb<
z4=W?8*MQ=DI0`S2p~C#Ah9Vmb5I}H)c?5Xik}&Uav9U3*<1iRxs0cr*dSrtE0tjxf
z5YTC?EU1c{75*{2`_IIHtz-uoD#XWt>KG)00Rjka@b{1R_Wk(##~zl>fk~3#^z&ED
z8~3n-(>^2AbVeW)<M;t)zra(@0|XFi>Bh(?0ZjxbYDlf`Kp6xefEa02nF0hD06)Rp
U$7SziSpWb407*qoM6N<$f>S-^3jhEB

literal 0
HcmV?d00001

diff --git a/extern/freestyle/src/app/icons/mod0.png b/extern/freestyle/src/app/icons/mod0.png
new file mode 100755
index 0000000000000000000000000000000000000000..816d814528aab101dfbe3de1ef011f6a2c477bf7
GIT binary patch
literal 910
zcmV;919AL`P)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3labT3lag+-G2N4000McNliru(*hL~EjqYxxE%lh0~<+1
zK~#90t&>Y=TvZsyf9KwrOeQm(2<?<4YP(1u5<zUWVnAWAr3+i3J0YOZt+=t<Qf9Ie
zUAYix5TP3h6p1y9P$A$0oY<x+jcpz+(>jgQ*Tl?Zl6l;F?m3@}+nFJ{ap51n#rY2W
zzCYhX<#IW)*(_}>uR*B>8y;-=;02&9Xal~1#_Tx%R5qJMiAX0gUxK=Z-3i#$2mQT(
zK)C^TD^H44Jf5#iv$(jp4HRiV@~e=F!AKesJ=-fjlM3U|AY6YKW4?Hj5!eQE+D?)^
z!oi)EcvLXfVyvYZgkh}3il9Y!`Dx+x;a;xy9VM5`b*n9vh1olnYBRtO0$RS$>}tS~
zDGL(<6T*=x%S_QQdPyj3SX$ch`8CVf`OuMw;QU#Gblehm1sxcsi;812E_JOqcUU-g
zNZ8VfcfNC&djyLWh`MlKr$8*#F%(&=!@j2sejsdm0q^A#9Nq;#z9qz6&{kNg!ctWM
zuvk^RxkngG8f-M#1yx&+h#0gH@@1E`7My=gh(|)pjX-!~2#yZH(uQJBLO@_g)L`61
z7qsbvHWmk{cwusHQm|GqR_Jwv)BC}79UK+9+G_c<bU@R%-KqH&9@oQN+MlujOcy~1
z_DS<Keqb=hVyv)HZ?V~IQCPRsYt=5uSXfziP)ae<Z#gz(_-MglVp-t@7C*3jam!_5
z*}+=D)0(EIS$OPHE3bAz{V}*wigLeZa2<!wUiBGGTRylFAwAj0z{MnIu12|3bZ7)%
z1@6@x<{$L1zWh@Mq(p>MUwXVWXn6O9fc|(C*HK(9MYvjaPzpwO!^ypZuMK~!)wpmY
z&NtuYx&6uU&K@Zdp-?FB_T>Ri98jD(sM(i};V1{!QDK9XLI;MGM@^<yqFns`CbvI)
zrQ=3K!dn|29_E+#6^)O}-1sZS=%B}o1BPdJghN=}RQ&ePC0~m3>)a3A`}BAR(moSc
zDMcoeK`F&oXHU?2Zj5X9VWtpc@>Y_`n>|eb-r(njyWE-kng<ug{sqZoGNGgK@$t?_
kE;qt|(YAwaH~at4-=mhA*!fo}hyVZp07*qoM6N<$f{vu3_y7O^

literal 0
HcmV?d00001

diff --git a/extern/freestyle/src/app/icons/mod1.png b/extern/freestyle/src/app/icons/mod1.png
new file mode 100755
index 0000000000000000000000000000000000000000..c7c6618380099101319c7aebb508ee24ec5f94f5
GIT binary patch
literal 1051
zcmV+$1mydPP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3labT3lag+-G2N4000McNliru(*hO^12k2Qt0w>e1E@(v
zK~#90U6fsjlw}mhf6x2Q>^SbYo7$Kw;(F0m?56lp>4Juo8I(mrH$??OAb3&eMG;~%
z+f^Z1M221@-B?gUX(4VHN#)kAC29HYSexsn<JV5>?7Q>zKJW89r;BkT`@{d@95{at
z=i{&P`8>H?j%gH1Pz+%*f{KR7K<ps4pe@vn_VIt@aygWUOvgze3*1>Kv8)(!-(*Bj
zMbjA>Bz6>H%Q0>FZ1JT}2ZJEENht9jk%hq06Gfh^#yrz83zpml?K1#@@fxc}ud}L9
z;*~SAAK%u~&AUMm*lDq8p)9a$-~yZ5Qas$9h1Qmv+h5q$<nj(UbtSdy#Ms83ZrBn8
zfd*iBTo92BLl@<vQ&*g5W5qfr##%AfN-b{E*k*pB;iO@l{8V(Z{mZ|10G^28T@0a6
z;+{~;Q=RP&5MpCEc1h?xsF=CWW9B}O-h+z%3&NvE6vZmsJr5SopZ)sNdxAAeDdm-_
za53cGY}%3bh1ggQjVab2_Nm5-9V>(#%Y{m;c=j8QAFe`h9g;rWF;^hfwh2fk$_)VS
zy8RZ5Ho{b7*fP+{id*5^$Aq*Gu@i>NFkDsu1ZBk|i-eAh#U(RqftJKnb5sjk6PDNt
z1LHoW2JBfQq!S<_)Qs@J0(fu%3{NT+wF(H#N?NSn+6A;Ew1X*)#Ma>f*Q4f^Ix~WE
zf_1_SPk6oyeBZ-U&8{j9O(Qnct*?NDXB}wAxog$tVRp4S01k~oY#iDc8ahTBi?t5x
zgvn}ysd|GyCmhwVJPP2or@%UXJUii`l%l)cv3`N&&C?!x3yR1%v~hg!yU*T&hjT&{
z$JC>k)7N~$@e3yb<Gr*R+EW}JEGD@WT71vr{neV@tYhn7g6zjLng2<KZ9_>uAM>ag
zZ~}jY9w#ohFi|*u6wuSZHus7B(F-d(>>JN5HMFOb_@3fOF~QKdhf>fx4>ooRI<}lI
zg?#v1nuGlVyZ?A+!%pBbB7%sdM@B|cE8nZU{n}SmIXPCAuvV8!J(7B)CDO4(v5`tW
zlAq6)WqW^Bx?UYR0Q3N}0Oc#CShsGS%$YOCZC;h?zqVv+bvVpCbT!l%s}ZXy*EGLg
z(R^{%vH#2r`oI2e_vo(scLGJAA|jFi=<DmVxm-@=^Lfd?oPDdYJsA9Dq-~Rz%B)qX
zOcx@`*2|-2;@rvl=<%cD2VVRhm;kEzeBJ>!`O&{nN~s&x(sF~-E@1$DgR%Ul_#ab>
V6P!|1z)=7I002ovPDHLkV1nTL^q2qu

literal 0
HcmV?d00001

diff --git a/extern/freestyle/src/app/icons/ok.png b/extern/freestyle/src/app/icons/ok.png
new file mode 100755
index 0000000000000000000000000000000000000000..31c064ba9221ee125c0e45fd78c5c5aee61df26e
GIT binary patch
literal 769
zcmV+c1OEJpP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!lSxEDRCwBA
z{Qv(y11$hR05LJp2mk~S%?t(zAQnbOMyeUcw~9f5m5HIAm6;&`Ab=Pd7c%Sz26G`p
z0>cHeO`Ol5zyLImnGt9T1H%VqW(G%q0AggA&F~&9`H#VoA)Q3SX95jmWT@xj;7a)R
z^BV(@{Q!sq8Il<;00a;d!!L#n;(X!)41XB*GfZYMAj-f=Km(^R%;#X{xbI--kf0)>
z!T>bq0>f_xLy(~$B>({gGI%4<76vm1GXbE)euf@AhW7vs>}8nG%FKFS(^xaXBh-W8
z%8e@wmu_A<0CbomLngxqm{NcMVqoZE5MbzF_^<t4`@h6xiT^<MdxkbN!&`v{wlmCU
z>Sy{dctr5O#t#j!dhU7L{~0=gA&dn81P~-iG%@UF4rO*=QfFfLbMX(u|4sitF#HF)
z;6Km>z%XRs1V)NE0|Sd03j-quP|FJjhChpe>VE!Tz);7Kh|OSt0Ac}?KN&Xuz4X`N
zul!#I26Z6c4d{z4z+hnq(q=$D2y*}p144#}K=u-_o<xQgh6T7n4IqFZE-nLlm5t#(
zLjjV^D<I|vVs<34D?q%50TfY*z#v?JFMa_62$4JTfCk3{EfB+@@+uH-0|pHfFo-4)
zPL==x#0+N{0u5znuwam20QngegIu{EXecPHPa!U?0|XGFtoX%n5bUb&Xm}$Kp8y*6
zhe45HI`J6@Ab?N{iWp#0iw8y+FF0~QUT0u<3N(xn=+ec=X_PPk2q4tb?LWf-U`R7C
zd<5dPK>P$4LH|iN6a)YQh#7^a2TZY_83Gt?0om_>hAsuh{$++A<djPQ0fdU8fx!?B
zbYnD1!Xpa+1P~*wswRK{qFD_B5I{6D7$Cp^0_3fms&Ml~00000NkvXXu0mjf;aVXl

literal 0
HcmV?d00001

diff --git a/extern/freestyle/src/app/icons/reload.png b/extern/freestyle/src/app/icons/reload.png
new file mode 100755
index 0000000000000000000000000000000000000000..d26c280f1ac88c4e78a3a91790eff5ebc9e44908
GIT binary patch
literal 1113
zcmV-f1g86mP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#>q$gGRCwBA
z{Qv(y11$hR0I`4wMn*>LvdIhq4F4GX8U8XT0BHvXh#L+7@dF^<$gq@Q12%0S#{vWp
zBbY!pI2CMQKLaz+Kp7xkoPoh!#vUwn@%crD4^KWYFgyfuet|70M7IEBCO`l&U<5@9
z(7+_1+xi*)N1TiJf9S)Z{~!K*K*1NkT>M{lt?WPl1pfaF(F`Emk8UtP0HL}#8SKge
z4KEFb4x0`JEp9Em;rQv#Cx)`aWeodP?*qAh0?_4!FoOXC2w`vn(EI-x)++}nGfcLh
z%)rac3)Xz~{#6DZMji$QVFiW<Zyqp6NJ=oUbFiaW&~m(mVdvtVAZ8#aSU_e11Q5dD
zScdytMqCPA;av>kY~l<LpFd<!Wm0AE)AB<x<oEyI40}HAVfgy@D_rc$-!BYhE6W&O
zpM3oQXs{y4On?Al0?R}LUCY9tU~6LwOaOlw?tQw)V9RHVVJHZ&GO{v!|NEWc*{^4C
z{ORu}20urjS~g&0gUkW~fB<5Fs`qD*XJAkePyj0wdnd+VW^4vG?BJ(^4EKNBXOLu*
zWcdE?JHx3jr{HqezFcFt{q;7(gKxkD0yKl+Hqa~vh7AA#1T$DcP)?BH>;JC|Uw?gN
zh?j|nYixbe%5dZR4HQ>@`|yo{{|`TdsDLQL=g*%RZhV8vOMnel05Jgq2xhRuf1dvg
zPk%iHb2P;@!StOUcNq45+zSbUFRTo%oUROdTzU*<+GY#_Tmo>5823R_6(qhLKm<Sl
z!3<{j`Tr-wlV49zT=wqIJGfXnXF5Z%UNO;G8X$m}p!9*CpMNqu{rMD(AO3s@7Bu5A
zV-R5xVR-c85yMlqr?^dFh2n4UEYAQCKrn+J{Cn|_;X4#Ac)b9wXPfdihDgRphVzfl
zGd%e80K?1!pALXh0|dW>m<1vL0tk|&K}iIdjhT-z|7SkS{9pK@@c#?nF8n739Qb?y
ztOukQToeG!0+|UAKoA#$3Xz`-57;iSF$l0gA|>cv5W}&r$FTbR>W`~%_Q|g&!FoV?
zL1w@TB!B>7K~i7%{pk1gf(n8RTyk7sf%pgU3|bso3~qdGkg@@o5q5pv1&+`Vfe;26
zHW`MM?^iOgKV@fld-N^X447d60fbrz0ZS=n4(0-tP!$F~1wNu;|I>p{40l%FVfg#w
zFG?W<5I~saF{B7AP;^jaP_$5FVC7)NYT)l5zZveIxX*C^z<m%GZYa!PfB?c?&_nWj
zKhRJGDNQK`F-0*3ZUJtv)YlJR8D8Cg#qjL<Gmzmp3wnS6!fr6C1)#jI0LxLtR!sl_
f#7L{k6d=F=fzZql1@d*-00000NkvXXu0mjfkGa{8

literal 0
HcmV?d00001

diff --git a/extern/freestyle/src/app/icons/remove.png b/extern/freestyle/src/app/icons/remove.png
new file mode 100755
index 0000000000000000000000000000000000000000..86d8c38a7f859ec8d8046f84719e259f5ff24615
GIT binary patch
literal 375
zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fY)RhkE)4%caKYZ?lYt_f1s;*b
z3=G@?Ak4T{d2cCDkiEpy*OmP;lNgV-dhZ&&6b1%H7Ec$)kcv5PCmH%5a*$|~-=HGv
z@yApzr|-;~KkVW{?CfUjhZi-k-m$6iBCD{kL{H(Xgk2tol45!?TfF<jY}>`Qvc6f)
z=~KH+zjFWcdv|1?teMrMQu65v(}Nqi0zL;<ro9(g%A0mcVZzhtUGL*#*13nrfA-08
znrTrh>b7m#+uxdI=PIl9B<INn1!!?)uvRf0Xp?)qzfNV-)Z6*Xr;7FF?}|8e_|smG
z6{63?ZyFux{~j*X`}cJ4n;k1VXM08S$xZrPB{hAX{88V_yqDL!*{!>zEadoCnO}$H
z7-s(t$ZOimo#Q%l?>WA!&2Q`H2?XaIn%(wY;1FZM^u5O4`^61+PFPZO?X0?tMPb!q
TU50bOAY$-z^>bP0l+XkKp@En?

literal 0
HcmV?d00001

diff --git a/extern/freestyle/src/app/icons/save.png b/extern/freestyle/src/app/icons/save.png
new file mode 100755
index 0000000000000000000000000000000000000000..932100d98e9a5cc13465268cc51c83afb3659b05
GIT binary patch
literal 1329
zcmV-11<v}3P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3labT3lag+-G2N4000McNliru(*hO^0ysq=)=dBa1inc`
zK~#90m6Tg(R96&+zkOyhnHkL_am-ATMhWp!u*O^PMxuuJU<I)#S}%xNshHSUOG}D<
zuwb<yjo8u>RFGON5~78IN^A?-7^<Kp1iUn@M%$Q7Gc%b<oJ-D}oO9;vKBTQiQ;YxG
z-t6`5wf0*77L1}(r>@FCAjIX%M}*yOCmaq_Qc}X%vu8&;KC0|bZ&X%R(%l_o)v5|~
z-H>*>gZ%vQ96$cPC@(KZ(=^)J+Fl&IdGmhh^=2cbBs)6?n@wS0AVGQg4(W2a@%zW4
zs&5HJQE)n)|9Qy>@Y=O&>FWBEdGn?qB@7Me)YYvZ6iRa9#E-b$P9l*<R8;JeiejUv
zsE}xMmq?{jghHVaVDaRltgMV>%ifh6HdJx`{0+8ktHS3SJ0hUBH$g+g_Xr`-G@U@8
zm+b5u3JddSXn0cyAqa&+BQxH*^%FU1Qa+X?>Fevq=Nt1(i3J5&95}EBfIuL|p+gst
zQX+(4;llT1Ufy^b8{ZbnlR<$%h{D2Lq?BZ3Wj$TcGb$|fQ2W7aq*5A|CE2rQ9lgCF
zEX#VFaamaziNqj@gvP~-KT}(~{JBs7Aq4dwHc?#s5}Kx?syYsbgRHCtkHKr!d?dYI
z50+&S4o4X?HuHbMhG7y4^-)yhr?PSyhYx>4OUuV1olc_w96fr4?(QJj*>1w&IJ$1|
z#pgd@S=MvG!C(@vcO0f^k(1*_*L8}EU&penVQ_Wz5)z3)G|fQM43;ikfZOe4_wKLR
zxbaht9cvvGyl>wbCQdBCG}8<WsJL9NL@;;{MNx*kvv=>e(&@~^>&?P$R}eywPFqMR
z$;hzN(-Yz0!ywUUKTDU+XXnl(bay|Zrlx_}vtOaAYC84xO|-Ne5CEE{4Zm?m$9*a)
zW}|63*RS6~RaNry{mh&>8C}=#c-)khPQo;c>F(}h`}X4mgJI^(nGS%*<0Kl5V6&BA
z7@ff1&P%5)R8=RLRGBtyGS$_UT)1$X=H_c;WMq(=>%s3Ihtui6?RHXB<j3##qU#2_
zZjww6F=4_4dU__(+xyG##MIR_Nh!hQa`50mfMv_(v1!v>5{V%!OA-ntId`s|t5@3r
zL22m}48tUymKcV~iWOzl*Po%KWxud23)3_KP_A6LiVzTwr%=@tt5?q?5*Z{MPBJ*C
zlb1J!b?fFbfBp<yE+^NnwR7v%J)+SVrkN%u$BmQ{pKm#e^4M=mY3U5^-08$L)Bids
z8dWh(i@v@jckhO|e?Q9Y+xM9@>t(8{7NDvsilU%tL&Rb!{Qf*5k>AjD{V}+y=^Zh3
zY6)Fk0YI>E<7eEw8KA#^kp6y^L_(vz{SRWX1gX>zZg(a=pO1Jv$@=w+Ie4&<#>QG<
znw=v?(Vk2uIePRB0U)KMy847Xb?Q4z)5K=8v1QAvT)K3FMT_QOx7%oL{t2&l98yX=
zo=oELI2jpJ(6nDig8!L20GG?fkt17$q9{ly*|FnG`PEm$m$bIFv2x{NR8=K6HwP&t
zu~-VPcRcBI`Wf>)_xo}<99Y({QEF;V%FfO%48z23w_zB=-EVC@DNOVC7Xyzbo6Sab
n^-0;$(MdsppVOynMrHg3XD>JFd(#Jg00000NkvXXu0mjfC*pp_

literal 0
HcmV?d00001

diff --git a/extern/freestyle/src/app/icons/save_as.png b/extern/freestyle/src/app/icons/save_as.png
new file mode 100755
index 0000000000000000000000000000000000000000..2c8b3f3e7b4ffc635b4a333d5e0ad5eb2d0301b7
GIT binary patch
literal 1024
zcmV+b1poVqP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3labT3lag+-G2N4000McNliru(*hO^11Hfl>iGZw1C2>U
zK~#90wUkL{T~!#zfA_xo(!^NWBu&X8R)fU}U8tdzXboxAjiN{w3JQw2aA5`M;8GDq
z7p>hiMXf@ewbf0bsHIX$BZ^gOC}=T4%uw5AFyqV1d*>Tm-20wQT8D-G!-0G6Irn$|
z=NnGs?rhq&$DLH}o{j7oa0fHX<^j@q%hrMO?(SzIfazOrae!pgwmts9gX=MO?z-)2
z#wJSSauG=`VrhMzf74654`b%6S--`fT=o6L<@KYKEFy8hEOiO+?2G%WKfSl}(Tl>|
z9no}DbZ191SFL-Yp?mLhJl#4+f`h2yf34xMhwea3E($ewLNLnWm^mUw-%sE2*3PZW
zN)4ZW*3R?C50W_P&VC-*QQ|1N02;(72Sd~eqLj)?d;BV$_pIWRFOO0?KgpTV5ymIv
zzQi3wQpY0B-tCVNMG!^Nf>Q)Bf*8f(9O`*WW#M$sW;*U}WZ750u<O7MK8lx6oSod-
z^W)IL#N8<e1z_J7y{M*+)Qlj4sUxBUF;tD^%jy^%o8g-1L)NbwXZgt-$<Nb7r9n;&
z)xR^`-?tqgcEHq7F+|g0i=ZNgs-k9$j83yU+DGTwGc*m>k{mw8p+ewj-SrIj_dQ-Y
zVT?l%C8%a#B?Ljm(27$t)EpJ%%J_3SZ~m2)Q%&R!oaC4|9~5t3pm5WIe8divMKSZN
z?6UHMMNQ(gB)xQ9_YEz%HsX(epf`$md%BhRhWjr_bON5nRg5P#wr6#kmX)ewRzfX@
zs8i_KOl#8`=sreYl4F0;#$3}zB$Sa*T;$jx1g%!a`A{_@W-5iw&eC@Ky=Zq2r)v^k
zn^?-VU0WF+>1T3$kaB5yv13rJ+yl<g*-_LygJ%_@BMhE6#EOn)&c(*d1IDVZrx+Ue
zjpEz{5Mx?i1a_*e=|F2sGpde+In-+iS(qMv<$X@vm?swvv3kSnL~%lGZ5_3jHImEa
znHrzD&~Xr{#&+QMbJZ}28X*|w#;!Nsq)?P>BS%$P(b&YY<6{6Usr%z1$&)k`X3iBY
zD^sW#L5-P0nKNSr@-<3*WR!y<>X@e+|D6&@lU0fFz}ZnkQ0C@^Qb{QVC5TfBLI{>M
zi(%$8H8lJ)SS4-gBVP|^&QmuP=c=iD70(h2ZZJ4Kj%E4D=W`3dk-M{Y!xmrgb>Z88
u(sxI8RIkJHZ_58w?oNDZ&{-%hh5iH)WvQo_3>g{#0000<MNUMnLSTZ%zUcq}

literal 0
HcmV?d00001

diff --git a/extern/freestyle/src/app/interactiveshaderwindow4.ui b/extern/freestyle/src/app/interactiveshaderwindow4.ui
new file mode 100755
index 00000000000..e17442ad43e
--- /dev/null
+++ b/extern/freestyle/src/app/interactiveshaderwindow4.ui
@@ -0,0 +1,103 @@
+<ui version="4.0" >
+ <class>InteractiveShaderWindow</class>
+ <widget class="QDialog" name="InteractiveShaderWindow" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>368</width>
+    <height>482</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>InteractiveShader</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <widget class="QTextEdit" name="TextArea" />
+   </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <widget class="QPushButton" name="OkButton" >
+       <property name="toolTip" >
+        <string>Save and close window</string>
+       </property>
+       <property name="text" >
+        <string/>
+       </property>
+       <property name="icon" >
+        <iconset resource="freestyle.qrc" >:/icons/icons/ok.png</iconset>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="SaveButton" >
+       <property name="toolTip" >
+        <string>Save module</string>
+       </property>
+       <property name="text" >
+        <string/>
+       </property>
+       <property name="icon" >
+        <iconset resource="freestyle.qrc" >:/icons/icons/save.png</iconset>
+       </property>
+       <property name="shortcut" >
+        <string>Ctrl+S</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="SaveAsButton" >
+       <property name="toolTip" >
+        <string>Save module as</string>
+       </property>
+       <property name="text" >
+        <string/>
+       </property>
+       <property name="icon" >
+        <iconset resource="freestyle.qrc" >:/icons/icons/save_as.png</iconset>
+       </property>
+       <property name="shortcut" >
+        <string>Ctrl+W</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="CancelButton" >
+       <property name="toolTip" >
+        <string>Close window</string>
+       </property>
+       <property name="text" >
+        <string/>
+       </property>
+       <property name="icon" >
+        <iconset resource="freestyle.qrc" >:/icons/icons/close.png</iconset>
+       </property>
+       <property name="shortcut" >
+        <string>Ctrl+C</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <resources>
+  <include location="freestyle.qrc" />
+ </resources>
+ <connections/>
+</ui>
diff --git a/extern/freestyle/src/app/optionswindow4.ui b/extern/freestyle/src/app/optionswindow4.ui
new file mode 100755
index 00000000000..48c322c6d84
--- /dev/null
+++ b/extern/freestyle/src/app/optionswindow4.ui
@@ -0,0 +1,651 @@
+<ui version="4.0" >
+ <class>OptionsWindow</class>
+ <widget class="QDialog" name="OptionsWindow" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>414</width>
+    <height>443</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Options</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <widget class="QTabWidget" name="tabWidget" >
+     <property name="currentIndex" >
+      <number>4</number>
+     </property>
+     <widget class="QWidget" name="directoriesTab" >
+      <attribute name="title" >
+       <string>Directories</string>
+      </attribute>
+      <layout class="QVBoxLayout" >
+       <property name="margin" >
+        <number>9</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item>
+        <widget class="QGroupBox" name="modelsPathBox" >
+         <property name="title" >
+          <string>Models Path:</string>
+         </property>
+         <layout class="QGridLayout" >
+          <property name="margin" >
+           <number>9</number>
+          </property>
+          <property name="spacing" >
+           <number>6</number>
+          </property>
+          <item row="0" column="0" >
+           <layout class="QHBoxLayout" >
+            <property name="margin" >
+             <number>0</number>
+            </property>
+            <property name="spacing" >
+             <number>6</number>
+            </property>
+            <item>
+             <widget class="QLineEdit" name="modelsPathLineEdit" />
+            </item>
+            <item>
+             <widget class="QPushButton" name="modelPathAddButton" >
+              <property name="toolTip" >
+               <string>Add a folder to the path...</string>
+              </property>
+              <property name="text" >
+               <string/>
+              </property>
+              <property name="icon" >
+               <iconset resource="freestyle.qrc" >:/icons/icons/folder.png</iconset>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="patternsPathBox" >
+         <property name="title" >
+          <string>Patterns Path:</string>
+         </property>
+         <layout class="QGridLayout" >
+          <property name="margin" >
+           <number>9</number>
+          </property>
+          <property name="spacing" >
+           <number>6</number>
+          </property>
+          <item row="0" column="0" >
+           <layout class="QHBoxLayout" >
+            <property name="margin" >
+             <number>0</number>
+            </property>
+            <property name="spacing" >
+             <number>6</number>
+            </property>
+            <item>
+             <widget class="QLineEdit" name="patternsPathLineEdit" />
+            </item>
+            <item>
+             <widget class="QPushButton" name="patternsPathAddButton" >
+              <property name="toolTip" >
+               <string>Add a folder to the path...</string>
+              </property>
+              <property name="text" >
+               <string/>
+              </property>
+              <property name="icon" >
+               <iconset resource="freestyle.qrc" >:/icons/icons/folder.png</iconset>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="brushesPathBox" >
+         <property name="title" >
+          <string>Brushes Path:</string>
+         </property>
+         <layout class="QGridLayout" >
+          <property name="margin" >
+           <number>9</number>
+          </property>
+          <property name="spacing" >
+           <number>6</number>
+          </property>
+          <item row="0" column="0" >
+           <layout class="QHBoxLayout" >
+            <property name="margin" >
+             <number>0</number>
+            </property>
+            <property name="spacing" >
+             <number>6</number>
+            </property>
+            <item>
+             <widget class="QLineEdit" name="brushesPathLineEdit" />
+            </item>
+            <item>
+             <widget class="QPushButton" name="brushesPathAddButton" >
+              <property name="toolTip" >
+               <string>Add a folder to the path...</string>
+              </property>
+              <property name="text" >
+               <string/>
+              </property>
+              <property name="icon" >
+               <iconset resource="freestyle.qrc" >:/icons/icons/folder.png</iconset>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="pythonPathBox" >
+         <property name="title" >
+          <string>Python Path:</string>
+         </property>
+         <layout class="QGridLayout" >
+          <property name="margin" >
+           <number>9</number>
+          </property>
+          <property name="spacing" >
+           <number>6</number>
+          </property>
+          <item row="0" column="0" >
+           <layout class="QHBoxLayout" >
+            <property name="margin" >
+             <number>0</number>
+            </property>
+            <property name="spacing" >
+             <number>6</number>
+            </property>
+            <item>
+             <widget class="QLineEdit" name="pythonPathLineEdit" />
+            </item>
+            <item>
+             <widget class="QPushButton" name="pythonPathAddButton" >
+              <property name="toolTip" >
+               <string>Add a folder to the path...</string>
+              </property>
+              <property name="text" >
+               <string/>
+              </property>
+              <property name="icon" >
+               <iconset resource="freestyle.qrc" >:/icons/icons/folder.png</iconset>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="PaperTab" >
+      <attribute name="title" >
+       <string>Paper textures</string>
+      </attribute>
+      <layout class="QVBoxLayout" >
+       <property name="margin" >
+        <number>9</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item>
+        <widget class="QListWidget" name="paperTexturesList" />
+       </item>
+       <item>
+        <layout class="QHBoxLayout" >
+         <property name="margin" >
+          <number>0</number>
+         </property>
+         <property name="spacing" >
+          <number>6</number>
+         </property>
+         <item>
+          <widget class="QPushButton" name="addPaperTextureButton" >
+           <property name="toolTip" >
+            <string>Add Texture(s)</string>
+           </property>
+           <property name="text" >
+            <string/>
+           </property>
+           <property name="icon" >
+            <iconset resource="freestyle.qrc" >:/icons/icons/add.png</iconset>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="removePaperTextureButton" >
+           <property name="toolTip" >
+            <string>Remove Texture</string>
+           </property>
+           <property name="text" >
+            <string/>
+           </property>
+           <property name="icon" >
+            <iconset resource="freestyle.qrc" >:/icons/icons/remove.png</iconset>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="moveUpPaperTextureButton" >
+           <property name="toolTip" >
+            <string>Move up</string>
+           </property>
+           <property name="text" >
+            <string/>
+           </property>
+           <property name="icon" >
+            <iconset resource="freestyle.qrc" >:/icons/icons/arrow_up.png</iconset>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="moveDownPaperTextureButton" >
+           <property name="toolTip" >
+            <string>Move down</string>
+           </property>
+           <property name="text" >
+            <string/>
+           </property>
+           <property name="icon" >
+            <iconset resource="freestyle.qrc" >:/icons/icons/arrow_down.png</iconset>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="clearPaperTextureButton" >
+           <property name="toolTip" >
+            <string>Clear list</string>
+           </property>
+           <property name="text" >
+            <string/>
+           </property>
+           <property name="icon" >
+            <iconset resource="freestyle.qrc" >:/icons/icons/clear.png</iconset>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="featureLineTab" >
+      <attribute name="title" >
+       <string>Feature Lines</string>
+      </attribute>
+      <layout class="QVBoxLayout" >
+       <property name="margin" >
+        <number>9</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item>
+        <widget class="QGroupBox" name="curvaturesBox" >
+         <property name="title" >
+          <string>Curvatures</string>
+         </property>
+         <layout class="QGridLayout" >
+          <property name="margin" >
+           <number>9</number>
+          </property>
+          <property name="spacing" >
+           <number>6</number>
+          </property>
+          <item row="0" column="0" >
+           <layout class="QHBoxLayout" >
+            <property name="margin" >
+             <number>0</number>
+            </property>
+            <property name="spacing" >
+             <number>6</number>
+            </property>
+            <item>
+             <widget class="QLabel" name="sphereRadiusLabel" >
+              <property name="text" >
+               <string>Sphere Radius (x mean edge size)</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLineEdit" name="sphereRadiusLineEdit" />
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="ridgesAndValleysBox" >
+         <property name="title" >
+          <string>Ridges and Valleys</string>
+         </property>
+         <layout class="QGridLayout" >
+          <property name="margin" >
+           <number>9</number>
+          </property>
+          <property name="spacing" >
+           <number>6</number>
+          </property>
+          <item row="0" column="0" >
+           <widget class="QCheckBox" name="ridgeValleyCheckBox" >
+            <property name="text" >
+             <string>Compute Ridges and Valleys</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="suggestiveContoursBox" >
+         <property name="title" >
+          <string>Suggestive Contours</string>
+         </property>
+         <layout class="QVBoxLayout" >
+          <property name="margin" >
+           <number>9</number>
+          </property>
+          <property name="spacing" >
+           <number>6</number>
+          </property>
+          <item>
+           <widget class="QCheckBox" name="suggestiveContoursCheckBox" >
+            <property name="text" >
+             <string>Compute Suggestive Contours</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <layout class="QHBoxLayout" >
+            <property name="margin" >
+             <number>0</number>
+            </property>
+            <property name="spacing" >
+             <number>6</number>
+            </property>
+            <item>
+             <widget class="QLabel" name="krEpsilonLabel" >
+              <property name="text" >
+               <string>kr Derivative Epsilon</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLineEdit" name="krEpsilonLineEdit" />
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="miscelleanousTab" >
+      <attribute name="title" >
+       <string>Miscelleanous</string>
+      </attribute>
+      <layout class="QVBoxLayout" >
+       <property name="margin" >
+        <number>9</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item>
+        <widget class="QGroupBox" name="viewMapBox" >
+         <property name="title" >
+          <string>View Map</string>
+         </property>
+         <layout class="QVBoxLayout" >
+          <property name="margin" >
+           <number>9</number>
+          </property>
+          <property name="spacing" >
+           <number>6</number>
+          </property>
+          <item>
+           <widget class="QCheckBox" name="asFloatCheckBox" >
+            <property name="text" >
+             <string>Save vector coordinates as floats</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="noOccluderListCheckBox" >
+            <property name="text" >
+             <string>Do not save occluders lists</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="steerableViewMapCheckBox" >
+            <property name="text" >
+             <string>Compute Steerable ViewMap</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="visibilityBox" >
+         <property name="title" >
+          <string>Visibility</string>
+         </property>
+         <layout class="QVBoxLayout" >
+          <property name="margin" >
+           <number>9</number>
+          </property>
+          <property name="spacing" >
+           <number>6</number>
+          </property>
+          <item>
+           <widget class="QCheckBox" name="qiCheckBox" >
+            <property name="text" >
+             <string>Enable Quantitative Invisibility</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="drawingBox" >
+         <property name="title" >
+          <string>Drawing</string>
+         </property>
+         <layout class="QVBoxLayout" >
+          <property name="margin" >
+           <number>9</number>
+          </property>
+          <property name="spacing" >
+           <number>6</number>
+          </property>
+          <item>
+           <widget class="QCheckBox" name="backBufferCheckBox" >
+            <property name="text" >
+             <string>Back Buffer</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="frontBufferCheckBox" >
+            <property name="text" >
+             <string>Front Buffer</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="helpTab" >
+      <attribute name="title" >
+       <string>Help</string>
+      </attribute>
+      <layout class="QVBoxLayout" >
+       <property name="margin" >
+        <number>9</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item>
+        <layout class="QHBoxLayout" >
+         <property name="margin" >
+          <number>0</number>
+         </property>
+         <property name="spacing" >
+          <number>6</number>
+         </property>
+         <item>
+          <widget class="QLabel" name="browserCmdLabel" >
+           <property name="text" >
+            <string>Browser Command</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLineEdit" name="browserCmdLineEdit" />
+         </item>
+        </layout>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="helpBox" >
+         <property name="title" >
+          <string>Help index file:</string>
+         </property>
+         <layout class="QGridLayout" >
+          <property name="margin" >
+           <number>9</number>
+          </property>
+          <property name="spacing" >
+           <number>6</number>
+          </property>
+          <item row="0" column="0" >
+           <layout class="QHBoxLayout" >
+            <property name="margin" >
+             <number>0</number>
+            </property>
+            <property name="spacing" >
+             <number>6</number>
+            </property>
+            <item>
+             <widget class="QLineEdit" name="helpIndexPathLineEdit" />
+            </item>
+            <item>
+             <widget class="QPushButton" name="helpIndexPathButton" >
+              <property name="toolTip" >
+               <string>Browse</string>
+              </property>
+              <property name="text" >
+               <string/>
+              </property>
+              <property name="icon" >
+               <iconset resource="freestyle.qrc" >:/icons/icons/folder.png</iconset>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <spacer>
+         <property name="orientation" >
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" >
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <widget class="QPushButton" name="okButton" >
+       <property name="toolTip" >
+        <string>Save and close window</string>
+       </property>
+       <property name="text" >
+        <string/>
+       </property>
+       <property name="icon" >
+        <iconset resource="freestyle.qrc" >:/icons/icons/ok.png</iconset>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="applyButton" >
+       <property name="toolTip" >
+        <string>Save Options</string>
+       </property>
+       <property name="text" >
+        <string/>
+       </property>
+       <property name="icon" >
+        <iconset resource="freestyle.qrc" >:/icons/icons/save.png</iconset>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="closeButton" >
+       <property name="toolTip" >
+        <string>Close window</string>
+       </property>
+       <property name="text" >
+        <string/>
+       </property>
+       <property name="icon" >
+        <iconset resource="freestyle.qrc" >:/icons/icons/close.png</iconset>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="freestyle.qrc" />
+ </resources>
+ <connections/>
+</ui>
diff --git a/extern/freestyle/src/app/progressdialog4.ui b/extern/freestyle/src/app/progressdialog4.ui
new file mode 100755
index 00000000000..78cc67ed440
--- /dev/null
+++ b/extern/freestyle/src/app/progressdialog4.ui
@@ -0,0 +1,26 @@
+<ui version="4.0" stdsetdef="1" >
+  <author></author>
+  <comment></comment>
+  <exportmacro></exportmacro>
+  <class>ProgressDialog</class>
+  <widget class="QDialog" name="ProgressDialog" >
+    <property name="geometry" >
+      <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>350</width>
+        <height>64</height>
+      </rect>
+    </property>
+    <property name="windowTitle" >
+      <string>Progress Dialog</string>
+    </property>
+    <layout class="QGridLayout" >
+      <item row="0" column="0" >
+        <widget class="Q3ProgressBar" name="ProgressBar2" />
+      </item>
+    </layout>
+  </widget>
+  <layoutdefault spacing="6" margin="11" />
+  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+</ui>
diff --git a/extern/freestyle/src/app/src.pri b/extern/freestyle/src/app/src.pri
new file mode 100755
index 00000000000..2fcc9146216
--- /dev/null
+++ b/extern/freestyle/src/app/src.pri
@@ -0,0 +1,50 @@
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#			      W A R N I N G ! ! !                             #
+#             a u t h o r i z e d    p e r s o n a l    o n l y               #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+
+APP_DIR = ../app
+
+SOURCES *= $${APP_DIR}/AppAboutWindow.cpp \
+           $${APP_DIR}/AppCanvas.cpp \
+           $${APP_DIR}/AppConfig.cpp \
+           $${APP_DIR}/AppGLWidget.cpp \
+           $${APP_DIR}/AppInteractiveShaderWindow.cpp \
+           $${APP_DIR}/AppMainWindow.cpp \
+           $${APP_DIR}/AppOptionsWindow.cpp \
+           $${APP_DIR}/AppProgressBar.cpp \
+           $${APP_DIR}/AppStyleWindow.cpp \
+           $${APP_DIR}/Controller.cpp \
+           $${APP_DIR}/QGLBasicWidget.cpp \
+           $${APP_DIR}/QStyleModuleSyntaxHighlighter.cpp \
+           $${APP_DIR}/AppGL2DCurvesViewer.cpp \
+           $${APP_DIR}/AppDensityCurvesWindow.cpp \
+           $${APP_DIR}/ConfigIO.cpp \
+           $${APP_DIR}/Main.cpp
+
+HEADERS *= $${APP_DIR}/AppAboutWindow.h \
+           $${APP_DIR}/AppCanvas.h \
+           $${APP_DIR}/AppConfig.h \
+           $${APP_DIR}/AppGLWidget.h \
+           $${APP_DIR}/AppInteractiveShaderWindow.h \
+           $${APP_DIR}/AppMainWindow.h \
+           $${APP_DIR}/AppOptionsWindow.h \
+           $${APP_DIR}/AppProgressBar.h \
+           $${APP_DIR}/AppStyleWindow.h \
+           $${APP_DIR}/QGLBasicWidget.h \
+           $${APP_DIR}/QStyleModuleSyntaxHighlighter.h \
+           $${APP_DIR}/AppGL2DCurvesViewer.h \
+           $${APP_DIR}/AppDensityCurvesWindow.h \
+	   $${APP_DIR}/ConfigIO.h \
+           $${APP_DIR}/Controller.h
+
+FORMS *= $${APP_DIR}/appmainwindowbase4.ui \
+         $${APP_DIR}/interactiveshaderwindow4.ui \
+         $${APP_DIR}/optionswindow4.ui \
+         $${APP_DIR}/progressdialog4.ui \
+         $${APP_DIR}/stylewindow4.ui \
+         $${APP_DIR}/densitycurveswindow4.ui
+
+RESOURCES = $${APP_DIR}/freestyle.qrc
+
+
diff --git a/extern/freestyle/src/app/stylewindow4.ui b/extern/freestyle/src/app/stylewindow4.ui
new file mode 100755
index 00000000000..c4ff5f656ae
--- /dev/null
+++ b/extern/freestyle/src/app/stylewindow4.ui
@@ -0,0 +1,182 @@
+<ui version="4.0" >
+ <class>StyleWindow</class>
+ <widget class="QDialog" name="StyleWindow" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>571</width>
+    <height>421</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Style Modules</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <widget class="QTableWidget" name="PlayList" >
+     <property name="dragEnabled" >
+      <bool>false</bool>
+     </property>
+     <property name="rowCount" >
+      <number>0</number>
+     </property>
+     <property name="columnCount" >
+      <number>3</number>
+     </property>
+     <column/>
+     <column/>
+     <column/>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <widget class="QPushButton" name="addButton" >
+       <property name="toolTip" >
+        <string>Add a Style Module</string>
+       </property>
+       <property name="text" >
+        <string/>
+       </property>
+       <property name="icon" >
+        <iconset resource="freestyle.qrc" >:/icons/icons/add.png</iconset>
+       </property>
+       <property name="shortcut" >
+        <string>Ctrl+A</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="removeButton" >
+       <property name="toolTip" >
+        <string>Remove a Style Module</string>
+       </property>
+       <property name="text" >
+        <string/>
+       </property>
+       <property name="icon" >
+        <iconset resource="freestyle.qrc" >:/icons/icons/remove.png</iconset>
+       </property>
+       <property name="shortcut" >
+        <string>Ctrl+R</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="moveUpButton" >
+       <property name="toolTip" >
+        <string>Move up</string>
+       </property>
+       <property name="text" >
+        <string/>
+       </property>
+       <property name="icon" >
+        <iconset resource="freestyle.qrc" >:/icons/icons/arrow_up.png</iconset>
+       </property>
+       <property name="shortcut" >
+        <string>Ctrl+U</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="moveDownButton" >
+       <property name="toolTip" >
+        <string>Move down</string>
+       </property>
+       <property name="text" >
+        <string/>
+       </property>
+       <property name="icon" >
+        <iconset resource="freestyle.qrc" >:/icons/icons/arrow_down.png</iconset>
+       </property>
+       <property name="shortcut" >
+        <string>Ctrl+D</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="editButton" >
+       <property name="toolTip" >
+        <string>Edit Style Module</string>
+       </property>
+       <property name="text" >
+        <string/>
+       </property>
+       <property name="icon" >
+        <iconset resource="freestyle.qrc" >:/icons/icons/edit.png</iconset>
+       </property>
+       <property name="shortcut" >
+        <string>Ctrl+E</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="saveButton" >
+       <property name="toolTip" >
+        <string>Save Modules list</string>
+       </property>
+       <property name="text" >
+        <string/>
+       </property>
+       <property name="icon" >
+        <iconset resource="freestyle.qrc" >:/icons/icons/save.png</iconset>
+       </property>
+       <property name="shortcut" >
+        <string>Ctrl+S</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="clearButton" >
+       <property name="toolTip" >
+        <string>Clear Modules list</string>
+       </property>
+       <property name="text" >
+        <string/>
+       </property>
+       <property name="icon" >
+        <iconset resource="freestyle.qrc" >:/icons/icons/clear.png</iconset>
+       </property>
+       <property name="shortcut" >
+        <string>Ctrl+X</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="closeButton" >
+       <property name="toolTip" >
+        <string>Close window</string>
+       </property>
+       <property name="text" >
+        <string/>
+       </property>
+       <property name="icon" >
+        <iconset resource="freestyle.qrc" >:/icons/icons/close.png</iconset>
+       </property>
+       <property name="shortcut" >
+        <string>Ctrl+C</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="freestyle.qrc" />
+ </resources>
+ <connections/>
+</ui>
diff --git a/extern/freestyle/src/build_bundle.macosx.py b/extern/freestyle/src/build_bundle.macosx.py
new file mode 100755
index 00000000000..e97153f269c
--- /dev/null
+++ b/extern/freestyle/src/build_bundle.macosx.py
@@ -0,0 +1,183 @@
+#!/usr/bin/python
+
+import os,sys,string
+
+install_dependencies=["GLUT",\
+                          "QtCore", "QtGui", "QtXml", \
+                          "libQGLViewer", "FreestyleSystem", "FreestyleRendering",\
+                        "FreestyleImage","FreestyleGeometry", "FreestyleSceneGraph", "FreestyleWingedEdge",\
+                        "FreestyleViewMap", "FreestyleStroke"]
+
+if not("FREESTYLE_DIR" in os.environ):
+    print "FREESTYLE_DIR must be set to your Freestyle directory"
+    sys.exit()
+    
+src_dir_path=os.environ['FREESTYLE_DIR']
+dest_dir_path=os.path.join(os.environ['FREESTYLE_DIR'], "freestyle.2.0.0-macosx-x86")
+bundle_name="Freestyle.app"
+bundle_path=os.path.join(dest_dir_path,bundle_name)
+frameworks_path=os.path.join(bundle_path,"Contents/Frameworks")
+exe_path=os.path.join(bundle_path, "Contents/MacOS")
+original_lib_path=os.path.join(src_dir_path,"build/macosx/release/lib")
+original_exe_path=os.path.join(src_dir_path,"build/macosx/release",bundle_name,"Contents/MacOS")
+                               
+
+
+# Builds a dictionary of dependencies for
+# a given binary
+# The table format is:
+# "dependency name" "dependency path"
+def buildDependenciesTable(binary_file, dep_table):
+    cmd="otool -L %s" % binary_file
+    #print cmd
+    #otool_output = os.system(cmd)
+    otool_output = os.popen(cmd).read().split('\n')
+    for dep_text in otool_output:
+        if (dep_text.count(":") == 0):
+            dep = dep_text.split(' ')[0].lstrip()
+            dep_base_name=os.path.basename(dep)
+            dep_table[dep_base_name] = dep
+    
+
+def fixPaths(dep_table):
+    for k,v in dep_table.items():
+        if(k.count("Freestyle")):
+            dep_table[k] = os.path.join(src_dir_path, "build/macosx/release/lib",v)
+        if(k.count("QGLViewer")):
+            dep_table[k] = os.path.join("/usr/lib", v)
+
+def extractFrameworkBaseDir(framework_lib):
+    parts=framework_lib.split("/")
+    head="/"
+    tail=""
+    in_head=True
+    for p in parts:
+        if(in_head == True):
+            head=os.path.join(head,p)
+        else:
+            tail=os.path.join(tail,p)
+        if(p.count(".framework") != 0):
+            in_head=False
+    return (head,tail)    
+    
+def installDependencies(dep_table, install_dependencies, new_dep_table):
+    for k,v in dep_table.items():
+        for d in install_dependencies:
+            if(k.count(d)!=0):
+                framework_dir_path=v
+                cp_option=""
+                head=""
+                tail=""
+                if(v.count("framework")):
+                    (head,tail) = extractFrameworkBaseDir(v)
+                    framework_dir_path=head
+                    cp_option="-R"
+                lib_name=os.path.split(framework_dir_path)[1]
+                target=os.path.join(frameworks_path,lib_name)
+                # update new table
+                if(tail != ""):
+                    new_dep_table[k] = os.path.join("@executable_path/../Frameworks",lib_name,tail)
+                else:
+                    new_dep_table[k] = os.path.join("@executable_path/../Frameworks",lib_name)
+                if(os.path.exists(target) != True):    
+                    cmd = "cp %s %s %s" % (cp_option, framework_dir_path,frameworks_path)
+                    print "Installing dependency:",lib_name
+                    os.system(cmd)
+
+def updatePathsToDependencies(binary_file, install_dependencies, dep_table, new_dep_table):
+    # executable:
+    f_dep_table={}
+    buildDependenciesTable(binary_file,f_dep_table)
+    for k,v in f_dep_table.items():
+        # is k in install_dependencies?
+        for ld in install_dependencies:
+            if(k.count(ld) != 0):
+                #print new_dep_table
+                cmd="install_name_tool -change %s %s %s" % (v,new_dep_table[k], binary_file)
+                os.system(cmd)
+    # check
+    cmd="otool -L %s" % binary_file
+    os.system(cmd)
+
+def cleanDir(dir, to_delete):
+    os.chdir(dir)
+    #print os.getcwd()
+    for d in os.listdir("."):
+        #print d
+        if(d == "Headers"):
+            cmd="rm -rf Headers"
+            to_delete.append(os.path.join(dir,d))
+            #os.system(cmd)
+        elif(d.count("debug") != 0):
+            cmd="rm -rf %s"%(d)
+            #print cmd
+            to_delete.append(os.path.join(dir,d))
+            #os.system(cmd)
+        elif(os.path.isdir(d) == True):
+            #print d
+            cleanDir(os.path.join(dir,d), to_delete)
+        #else:
+        #    print d
+    os.chdir(os.path.join(dir,".."))
+    #print os.getcwd()
+
+    
+# build bundle structure
+if( os.path.exists(dest_dir_path) != True):
+    print "Creating directory",dest_dir_path
+    os.mkdir(dest_dir_path)
+
+if(os.path.exists(bundle_path) != True):
+    print "Creating the bundle structure", bundle_path
+    cmd = "cp -R %s %s" % (os.path.join(src_dir_path, "build/macosx/release/",bundle_name), bundle_path)
+    os.system(cmd)
+    os.mkdir(os.path.join(bundle_path,"Contents/Frameworks"))
+  
+                
+dep_table = {}
+new_dep_table = {}
+# Executable
+for f in os.listdir(original_exe_path):
+    if(f[0] == '.'):
+        continue
+    exe_file_path=os.path.join(original_exe_path, f)
+    buildDependenciesTable(exe_file_path, dep_table)
+    
+# Frameworks    
+for f in os.listdir(original_lib_path):
+    if (f.count("framework") == 0):
+        continue
+    f_name=f.split('.')[0]
+    fwk_path=os.path.join(original_lib_path, "%s.framework" % f_name,f_name)
+    buildDependenciesTable(fwk_path, dep_table)
+                               
+# Fix ad-hoc paths
+fixPaths(dep_table)
+    
+# install dependent libs
+installDependencies(dep_table, install_dependencies, new_dep_table)
+
+# update paths to installed dependencies
+for f in os.listdir(exe_path):
+    if(f[0] == '.'):
+        continue
+    updatePathsToDependencies(os.path.join(exe_path,f), install_dependencies, dep_table, new_dep_table)
+    
+# Frameworks    
+for f in os.listdir(frameworks_path):
+    if (f.count("framework") == 0):
+        continue
+    f_name=f.split('.')[0]
+    fwk_path=os.path.join(frameworks_path, "%s.framework" % f_name,f_name)
+    updatePathsToDependencies(fwk_path, install_dependencies, dep_table, new_dep_table)
+    
+
+# Clean-up
+# Remove debug libs
+print "Cleaning..."
+to_delete=[]
+cleanDir(bundle_path, to_delete)
+for f in to_delete:
+    cmd = "rm -rf %s"%f
+    print cmd
+    os.system(cmd)
diff --git a/extern/freestyle/src/geometry/BBox.h b/extern/freestyle/src/geometry/BBox.h
new file mode 100755
index 00000000000..9c46d7918e2
--- /dev/null
+++ b/extern/freestyle/src/geometry/BBox.h
@@ -0,0 +1,141 @@
+//
+//  Filename         : BBox.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : A class to hold a bounding box
+//  Date of creation : 22/05/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  BBOX_H
+# define BBOX_H
+
+template <class Point>
+class BBox
+{
+ public:
+
+  inline BBox() {
+    _empty = true;
+  }
+
+  template <class T>
+  inline BBox(const T& min_in, const T& max_in) : _min(min_in), _max(max_in) {
+    _empty = false;
+  }
+
+  template <class T>
+  inline BBox(const BBox<T>& b) : _min(b.getMin()), _max(b.getMax()) {
+    _empty = false;
+  }
+
+  template <class T>
+  inline void extendToContain(const T& p) {
+    if (_empty) {
+      _min = p;
+      _max = p;
+      _empty = false;
+      return;
+    }
+    for (unsigned i = 0; i < Point::dim(); i++) {
+      if (p[i] < _min[i])
+	_min[i] = p[i];
+      else if (p[i] > _max[i])
+	_max[i] = p[i];
+    }
+    _empty = false;
+  }
+
+  inline void clear() {
+    _empty = true;
+  }
+
+  inline bool empty() const {
+    return _empty;
+  }
+
+  inline const Point& getMin() const {
+    return _min;
+  }
+
+  inline const Point& getMax() const {
+    return _max;
+  }
+
+  inline BBox<Point>& operator=(const BBox<Point>& b) {
+    _min = b.getMin();
+    _max = b.getMax();
+    _empty = false;
+    return *this;
+  }
+
+  inline BBox<Point>& operator+=(const BBox<Point>& b) {
+    if (_empty) {
+      _min = b.getMin();
+      _max = b.getMax();
+      _empty = false;
+    }
+    else {
+      for (unsigned i = 0; i < Point::dim(); i++) {
+	if (b.getMin()[i] < _min[i])
+	  _min[i] = b.getMin()[i];
+	if (b.getMax()[i] > _max[i])
+	  _max[i] = b.getMax()[i];
+      }
+    }
+    return *this;
+  }
+
+  inline bool inside(const Point& p){
+    if(empty())
+        return false;
+    for (unsigned i = 0; i < Point::dim(); i++) {
+        if((_min[i]>p[i]) || (_max[i]<p[i]))
+            return false;
+    }
+    return true;
+
+  }
+
+private:
+
+  Point	_min;
+  Point	_max;
+  bool	_empty;
+};
+
+template <class Point>
+BBox<Point>& operator+(const BBox<Point> &b1, const BBox<Point> &b2)
+{
+  Point new_min;
+  Point new_max;
+
+  for (unsigned i = 0; i < Point::dim(); i++) {
+    new_min[i] = b1.getMin()[i] < b2.getMin()[i] ? b1.getMin()[i] : b2.getMin()[i];
+    new_max[i] = b1.getMax()[i] > b2.getMax()[i] ? b1.getMax()[i] : b2.getMax()[i];
+  }
+
+  return BBox<Point>(new_min, new_max);
+}
+
+#endif // BBOX_H
diff --git a/extern/freestyle/src/geometry/Bezier.cpp b/extern/freestyle/src/geometry/Bezier.cpp
new file mode 100755
index 00000000000..8f9771f29d3
--- /dev/null
+++ b/extern/freestyle/src/geometry/Bezier.cpp
@@ -0,0 +1,118 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "Bezier.h"
+#include "FitCurve.h"
+
+using namespace std;
+
+BezierCurveSegment::BezierCurveSegment()
+{
+}
+
+BezierCurveSegment::~BezierCurveSegment()
+{
+}
+
+void BezierCurveSegment::AddControlPoint(const Vec2d& iPoint)
+{
+  _ControlPolygon.push_back(iPoint);
+  if(_ControlPolygon.size() == 4)
+    Build();
+}
+
+void BezierCurveSegment::Build()
+{
+  if(_ControlPolygon.size() != 4)
+    return;
+
+  // Compute the rightmost part of the matrix:
+  vector<Vec2d>::const_iterator p0,p1,p2,p3;
+  p0 = _ControlPolygon.begin();
+  p1 = p0;++p1;
+  p2 = p1;++p2;
+  p3 = p2;++p3;
+  float x[4], y[4];
+  
+  x[0] = -p0->x()+3*p1->x()-3*p2->x()+p3->x();
+  x[1] = 3*p0->x()-6*p1->x()+3*p2->x();
+  x[2] = -3*p0->x()+3*p1->x();
+  x[3] = p0->x();
+
+  y[0] = -p0->y()+3*p1->y()-3*p2->y()+p3->y();
+  y[1] = 3*p0->y()-6*p1->y()+3*p2->y();
+  y[2] = -3*p0->y()+3*p1->y();
+  y[3] = p0->y();
+
+  int nvertices = 12;
+  float increment = 1.0/(float)nvertices;
+  float t = 0.f;
+  for(int i=0; i<=nvertices; ++i)
+  {
+    _Vertices.push_back(Vec2d((x[3] + t*(x[2] + t*(x[1] + t*x[0]))), 
+                              (y[3] + t*(y[2] + t*(y[1] + t*y[0])))));
+    t+=increment;
+  }
+}
+
+BezierCurve::BezierCurve()
+{
+  _currentSegment = new BezierCurveSegment;
+}
+
+BezierCurve::BezierCurve(vector<Vec2d>& iPoints, double error)
+{
+  FitCurveWrapper fitcurve;
+  _currentSegment = new BezierCurveSegment;
+  vector<Vec2d> curve;
+
+  fitcurve.FitCurve(iPoints, curve, error);
+  int i=0;
+  vector<Vec2d>::iterator v,vend;
+  for(v=curve.begin(),vend=curve.end();
+  v!=vend;
+  ++v)
+  {
+    if((i == 0) || (i%4 != 0))
+      AddControlPoint(*v);
+    ++i;
+  }
+}
+
+BezierCurve::~BezierCurve()
+{
+  if(_currentSegment)
+    delete _currentSegment;
+}
+
+void BezierCurve::AddControlPoint(const Vec2d& iPoint)
+{
+  _ControlPolygon.push_back(iPoint);
+  _currentSegment->AddControlPoint(iPoint);
+  if(_currentSegment->size() == 4)
+  {
+    _Segments.push_back(_currentSegment);
+    _currentSegment = new BezierCurveSegment;
+    _currentSegment->AddControlPoint(iPoint);
+  }
+}
+
+
diff --git a/extern/freestyle/src/geometry/Bezier.h b/extern/freestyle/src/geometry/Bezier.h
new file mode 100755
index 00000000000..acae71bbb2c
--- /dev/null
+++ b/extern/freestyle/src/geometry/Bezier.h
@@ -0,0 +1,73 @@
+//
+//  Filename         : Bezier.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Class to define a Bezier curve of order 4.
+//  Date of creation : 04/06/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  BEZIER_H
+# define BEZIER_H
+
+#include <vector>
+#include "../system/FreestyleConfig.h"
+#include "Geom.h"
+
+using namespace Geometry;
+
+class LIB_GEOMETRY_EXPORT BezierCurveSegment 
+{
+private:
+  std::vector<Vec2d> _ControlPolygon;
+  std::vector<Vec2d> _Vertices;
+
+public:
+  BezierCurveSegment();
+  virtual ~BezierCurveSegment();
+
+  void AddControlPoint(const Vec2d& iPoint);
+  void Build();
+  inline int size() const {return _ControlPolygon.size();}
+  inline std::vector<Vec2d>& vertices() {return _Vertices;}
+};
+
+
+class LIB_GEOMETRY_EXPORT BezierCurve 
+{
+private:
+  std::vector<Vec2d> _ControlPolygon;
+  std::vector<BezierCurveSegment*> _Segments;
+  BezierCurveSegment *_currentSegment;
+
+public:
+  BezierCurve();
+  BezierCurve(std::vector<Vec2d>& iPoints, double error=4.0);
+  virtual ~BezierCurve();
+
+  void AddControlPoint(const Vec2d& iPoint);
+  std::vector<Vec2d>& controlPolygon() {return _ControlPolygon;}
+  std::vector<BezierCurveSegment*>& segments() {return _Segments;}
+};
+
+#endif // BEZIER_H
diff --git a/extern/freestyle/src/geometry/FastGrid.cpp b/extern/freestyle/src/geometry/FastGrid.cpp
new file mode 100755
index 00000000000..b090a3df67f
--- /dev/null
+++ b/extern/freestyle/src/geometry/FastGrid.cpp
@@ -0,0 +1,62 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "FastGrid.h"
+
+void FastGrid::clear() {
+  if(!_cells)
+    return;
+
+  for(unsigned i = 0; i < _cells_size; i++)
+    if (_cells[i])
+      delete _cells[i];
+  delete[] _cells;
+  _cells = NULL;
+  _cells_size = 0;
+
+  Grid::clear();
+}
+
+void FastGrid::configure(const Vec3r& orig, const Vec3r& size, unsigned nb) {
+  Grid::configure(orig, size, nb);
+  _cells_size = _cells_nb[0] * _cells_nb[1] * _cells_nb[2];
+  _cells = new Cell*[_cells_size];
+  memset(_cells, 0, _cells_size * sizeof(*_cells));
+}
+
+Cell* FastGrid::getCell(const Vec3u& p) {
+    //cout << _cells<< " "<< p << " " <<_cells_nb[0]<<"-"<< _cells_nb[1]<<"-"<< _cells_nb[2]<< " "<<_cells_size<< endl;
+    assert(_cells||("_cells is a null pointer"));
+    assert((_cells_nb[0] * (p[2] * _cells_nb[1] + p[1]) + p[0])<_cells_size);
+    assert(p[0]<_cells_nb[0]);
+    assert(p[1]<_cells_nb[1]);
+    assert(p[2]<_cells_nb[2]);
+    return _cells[_cells_nb[0] * (p[2] * _cells_nb[1] + p[1]) + p[0]];
+}
+
+void FastGrid::fillCell(const Vec3u& p, Cell& cell) {
+    assert(_cells||("_cells is a null pointer"));
+    assert((_cells_nb[0] * (p[2] * _cells_nb[1] + p[1]) + p[0])<_cells_size);
+    assert(p[0]<_cells_nb[0]);
+    assert(p[1]<_cells_nb[1]);
+    assert(p[2]<_cells_nb[2]);
+    _cells[_cells_nb[0] * (p[2] * _cells_nb[1] + p[1]) + p[0]] = &cell;
+}
\ No newline at end of file
diff --git a/extern/freestyle/src/geometry/FastGrid.h b/extern/freestyle/src/geometry/FastGrid.h
new file mode 100755
index 00000000000..e620ff24385
--- /dev/null
+++ b/extern/freestyle/src/geometry/FastGrid.h
@@ -0,0 +1,85 @@
+//
+//  Filename         : FastGrid.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Class to define a cell grid surrounding the
+//                     bounding box of the scene
+//  Date of creation : 30/07/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  FASTGRID_H
+# define FASTGRID_H
+
+# include "Grid.h"
+# include <cassert>
+/*! Class to define a regular grid used for ray
+ *  casting computations 
+ *  We don't use a hashtable here. The grid is 
+ *  explicitly stored for faster computations.
+ *  However, this might result in significant
+ *  increase in memory usage (compared to the regular grid)
+ */
+
+class LIB_GEOMETRY_EXPORT FastGrid : public Grid
+{
+ public:
+
+  FastGrid() : Grid() {
+    _cells = NULL;
+    _cells_size = 0;
+  }
+  
+  virtual ~FastGrid() {
+    clear();
+  }
+
+  /*! clears the grid
+   *  Deletes all the cells, clears the hashtable,
+   *  resets size, size of cell, number of cells.
+   */
+  virtual void clear();
+  
+  /*! Sets the different parameters of the grid
+   *    orig
+   *      The grid origin
+   *    size
+   *      The grid's dimensions
+   *    nb
+   *      The number of cells of the grid
+   */
+  virtual void configure(const Vec3r& orig, const Vec3r& size, unsigned nb);
+  
+  /*! returns the cell whose coordinates are pased as argument */
+  Cell* getCell(const Vec3u& p) ;
+ 
+  /*! Fills the case p with the cell iCell */
+  virtual void fillCell(const Vec3u& p, Cell& cell);
+
+protected:
+
+  Cell**	_cells;
+  unsigned	_cells_size;
+};
+
+#endif // FASTGRID_H
diff --git a/extern/freestyle/src/geometry/FitCurve.cpp b/extern/freestyle/src/geometry/FitCurve.cpp
new file mode 100755
index 00000000000..ade40b050ca
--- /dev/null
+++ b/extern/freestyle/src/geometry/FitCurve.cpp
@@ -0,0 +1,602 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include <stdio.h>
+#include <math.h>
+#include "FitCurve.h"
+
+using namespace std;
+
+typedef Vector2 *BezierCurve;
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/* Forward declarations */
+static double *Reparameterize(Vector2 *d, int first, int last, double *u, BezierCurve bezCurve);
+static double NewtonRaphsonRootFind(BezierCurve Q, Vector2 P, double u);
+static Vector2 BezierII(int degree, Vector2 *V, double t);
+static double B0(double u);
+static double B1(double u);
+static double B2(double u);
+static double B3(double u);
+static Vector2 ComputeLeftTangent(Vector2 *d, int end);
+static Vector2 ComputeLeftTangent(Vector2 *d, int end);
+static Vector2 ComputeLeftTangent(Vector2 *d, int end);
+static double ComputeMaxError(Vector2 *d, int first, int last, BezierCurve bezCurve, double *u, int *splitPoint);
+static double *ChordLengthParameterize(Vector2 *d, int first, int last);
+static BezierCurve  GenerateBezier(Vector2 *d, int first, int last, double *uPrime, Vector2 tHat1, Vector2 tHat2);
+static Vector2 V2AddII(Vector2 a, Vector2 b);
+static Vector2 V2ScaleIII(Vector2 v, double s);
+static Vector2 V2SubII(Vector2 a, Vector2 b);
+
+
+#define MAXPOINTS	1000		/* The most points you can have */
+
+/* returns squared length of input vector */	
+double V2SquaredLength(Vector2 *a) 
+{	return(((*a)[0] * (*a)[0])+((*a)[1] * (*a)[1]));
+}
+	
+/* returns length of input vector */
+double V2Length(Vector2 *a) 
+{
+	return(sqrt(V2SquaredLength(a)));
+}
+
+Vector2 *V2Scale(Vector2 *v, double newlen) 
+{
+  double len = V2Length(v);
+	if (len != 0.0) { (*v)[0] *= newlen/len;   (*v)[1] *= newlen/len; }
+	return(v);
+}
+
+/* return the dot product of vectors a and b */
+double V2Dot(Vector2 *a, Vector2 *b) 
+{
+	return(((*a)[0]*(*b)[0])+((*a)[1]*(*b)[1]));
+}
+
+/* return the distance between two points */
+double V2DistanceBetween2Points(Vector2 *a, Vector2 *b)
+{
+double dx = (*a)[0] - (*b)[0];
+double dy = (*a)[1] - (*b)[1];
+	return(sqrt((dx*dx)+(dy*dy)));
+}
+
+/* return vector sum c = a+b */
+Vector2 *V2Add(Vector2 *a, Vector2 *b, Vector2 *c)
+{
+	(*c)[0] = (*a)[0]+(*b)[0];  (*c)[1] = (*a)[1]+(*b)[1];
+	return(c);
+} 
+
+/* normalizes the input vector and returns it */
+Vector2 *V2Normalize(Vector2 *v) 
+{
+double len = V2Length(v);
+	if (len != 0.0) { (*v)[0] /= len;  (*v)[1] /= len; }
+	return(v);
+}
+
+/* negates the input vector and returns it */
+Vector2 *V2Negate(Vector2 *v) 
+{
+	(*v)[0] = -(*v)[0];  (*v)[1] = -(*v)[1];
+	return(v);
+}
+
+ 
+/*
+ *  GenerateBezier :
+ *  Use least-squares method to find Bezier control points for region.
+ *
+ */
+static BezierCurve  GenerateBezier(Vector2 *d, int first, int last, double *uPrime, Vector2 tHat1, Vector2 tHat2)
+//    Vector2	*d;			/*  Array of digitized points	*/
+//    int		first, last;		/*  Indices defining region	*/
+//    double	*uPrime;		/*  Parameter values for region */
+//    Vector2	tHat1, tHat2;	/*  Unit tangents at endpoints	*/
+{
+    int 	i;
+    Vector2 	A[MAXPOINTS][2];	/* Precomputed rhs for eqn	*/
+    int 	nPts;			/* Number of pts in sub-curve */
+    double 	C[2][2];			/* Matrix C		*/
+    double 	X[2];			/* Matrix X			*/
+    double 	det_C0_C1,		/* Determinants of matrices	*/
+    	   	det_C0_X,
+	   		det_X_C1;
+    double 	alpha_l,		/* Alpha values, left and right	*/
+    	   	alpha_r;
+    Vector2 	tmp;			/* Utility variable		*/
+    BezierCurve	bezCurve;	/* RETURN bezier curve ctl pts	*/
+
+    bezCurve = (Vector2 *)malloc(4 * sizeof(Vector2));
+    nPts = last - first + 1;
+
+ 
+    /* Compute the A's	*/
+    for (i = 0; i < nPts; i++) {
+		Vector2		v1, v2;
+		v1 = tHat1;
+		v2 = tHat2;
+		V2Scale(&v1, B1(uPrime[i]));
+		V2Scale(&v2, B2(uPrime[i]));
+		A[i][0] = v1;
+		A[i][1] = v2;
+    }
+
+    /* Create the C and X matrices	*/
+    C[0][0] = 0.0;
+    C[0][1] = 0.0;
+    C[1][0] = 0.0;
+    C[1][1] = 0.0;
+    X[0]    = 0.0;
+    X[1]    = 0.0;
+
+    for (i = 0; i < nPts; i++) {
+        C[0][0] += V2Dot(&A[i][0], &A[i][0]);
+		C[0][1] += V2Dot(&A[i][0], &A[i][1]);
+/*					C[1][0] += V2Dot(&A[i][0], &A[i][1]);*/	
+		C[1][0] = C[0][1];
+		C[1][1] += V2Dot(&A[i][1], &A[i][1]);
+
+		tmp = V2SubII(d[first + i],
+	        V2AddII(
+	          V2ScaleIII(d[first], B0(uPrime[i])),
+		    	V2AddII(
+		      		V2ScaleIII(d[first], B1(uPrime[i])),
+		        			V2AddII(
+	                  		V2ScaleIII(d[last], B2(uPrime[i])),
+	                    		V2ScaleIII(d[last], B3(uPrime[i]))))));
+	
+
+	X[0] += V2Dot(&((A[i])[0]), &tmp);
+	X[1] += V2Dot(&((A[i])[1]), &tmp);
+    }
+
+    /* Compute the determinants of C and X	*/
+    det_C0_C1 = C[0][0] * C[1][1] - C[1][0] * C[0][1];
+    det_C0_X  = C[0][0] * X[1]    - C[0][1] * X[0];
+    det_X_C1  = X[0]    * C[1][1] - X[1]    * C[0][1];
+
+    /* Finally, derive alpha values	*/
+    if (det_C0_C1 == 0.0) {
+		det_C0_C1 = (C[0][0] * C[1][1]) * 10e-12;
+    }
+    alpha_l = det_X_C1 / det_C0_C1;
+    alpha_r = det_C0_X / det_C0_C1;
+
+
+    /*  If alpha negative, use the Wu/Barsky heuristic (see text) */
+	/* (if alpha is 0, you get coincident control points that lead to
+	 * divide by zero in any subsequent NewtonRaphsonRootFind() call. */
+    if (alpha_l < 1.0e-6 || alpha_r < 1.0e-6) {
+		double	dist = V2DistanceBetween2Points(&d[last], &d[first]) /
+					3.0;
+
+		bezCurve[0] = d[first];
+		bezCurve[3] = d[last];
+		V2Add(&(bezCurve[0]), V2Scale(&(tHat1), dist), &(bezCurve[1]));
+		V2Add(&(bezCurve[3]), V2Scale(&(tHat2), dist), &(bezCurve[2]));
+		return (bezCurve);
+    }
+
+    /*  First and last control points of the Bezier curve are */
+    /*  positioned exactly at the first and last data points */
+    /*  Control points 1 and 2 are positioned an alpha distance out */
+    /*  on the tangent vectors, left and right, respectively */
+    bezCurve[0] = d[first];
+    bezCurve[3] = d[last];
+    V2Add(&bezCurve[0], V2Scale(&tHat1, alpha_l), &bezCurve[1]);
+    V2Add(&bezCurve[3], V2Scale(&tHat2, alpha_r), &bezCurve[2]);
+    return (bezCurve);
+}
+
+
+/*
+ *  Reparameterize:
+ *	Given set of points and their parameterization, try to find
+ *   a better parameterization.
+ *
+ */
+static double *Reparameterize(Vector2 *d, int first, int last, double *u, BezierCurve bezCurve)
+//    Vector2	*d;			/*  Array of digitized points	*/
+//    int		first, last;		/*  Indices defining region	*/
+//    double	*u;			/*  Current parameter values	*/
+//    BezierCurve	bezCurve;	/*  Current fitted curve	*/
+{
+    int 	nPts = last-first+1;	
+    int 	i;
+    double	*uPrime;		/*  New parameter values	*/
+
+    uPrime = (double *)malloc(nPts * sizeof(double));
+    for (i = first; i <= last; i++) {
+		uPrime[i-first] = NewtonRaphsonRootFind(bezCurve, d[i], u[i-
+					first]);
+    }
+    return (uPrime);
+}
+
+
+
+/*
+ *  NewtonRaphsonRootFind :
+ *	Use Newton-Raphson iteration to find better root.
+ */
+static double NewtonRaphsonRootFind(BezierCurve Q, Vector2 P, double u)
+//    BezierCurve	Q;			/*  Current fitted curve	*/
+//    Vector2 		P;		/*  Digitized point		*/
+//    double 		u;		/*  Parameter value for "P"	*/
+{
+    double 		numerator, denominator;
+    Vector2 		Q1[3], Q2[2];	/*  Q' and Q''			*/
+    Vector2		Q_u, Q1_u, Q2_u; /*u evaluated at Q, Q', & Q''	*/
+    double 		uPrime;		/*  Improved u			*/
+    int 		i;
+    
+    /* Compute Q(u)	*/
+    Q_u = BezierII(3, Q, u);
+    
+    /* Generate control vertices for Q'	*/
+    for (i = 0; i <= 2; i++) {
+		Q1[i][0] = (Q[i+1][0] - Q[i][0]) * 3.0;
+		Q1[i][1] = (Q[i+1][1] - Q[i][1]) * 3.0;
+    }
+    
+    /* Generate control vertices for Q'' */
+    for (i = 0; i <= 1; i++) {
+		Q2[i][0] = (Q1[i+1][0] - Q1[i][0]) * 2.0;
+		Q2[i][1] = (Q1[i+1][1] - Q1[i][1]) * 2.0;
+    }
+    
+    /* Compute Q'(u) and Q''(u)	*/
+    Q1_u = BezierII(2, Q1, u);
+    Q2_u = BezierII(1, Q2, u);
+    
+    /* Compute f(u)/f'(u) */
+    numerator = (Q_u[0] - P[0]) * (Q1_u[0]) + (Q_u[1] - P[1]) * (Q1_u[1]);
+    denominator = (Q1_u[0]) * (Q1_u[0]) + (Q1_u[1]) * (Q1_u[1]) +
+		      	  (Q_u[0] - P[0]) * (Q2_u[0]) + (Q_u[1] - P[1]) * (Q2_u[1]);
+    
+    /* u = u - f(u)/f'(u) */
+    if(denominator == 0) // FIXME
+      return u;
+    uPrime = u - (numerator/denominator);
+    return (uPrime);
+}
+
+	
+		       
+/*
+ *  Bezier :
+ *  	Evaluate a Bezier curve at a particular parameter value
+ * 
+ */
+static Vector2 BezierII(int degree, Vector2 *V, double t)
+//    int		degree;		/* The degree of the bezier curve	*/
+//    Vector2 	*V;		/* Array of control points		*/
+//    double 	t;		/* Parametric value to find point for	*/
+{
+    int 	i, j;		
+    Vector2 	Q;	        /* Point on curve at parameter t	*/
+    Vector2 	*Vtemp;		/* Local copy of control points		*/
+
+    /* Copy array	*/
+    Vtemp = (Vector2 *)malloc((unsigned)((degree+1) 
+				* sizeof (Vector2)));
+    for (i = 0; i <= degree; i++) {
+		Vtemp[i] = V[i];
+    }
+
+    /* Triangle computation	*/
+    for (i = 1; i <= degree; i++) {	
+		for (j = 0; j <= degree-i; j++) {
+	    	Vtemp[j][0] = (1.0 - t) * Vtemp[j][0] + t * Vtemp[j+1][0];
+	    	Vtemp[j][1] = (1.0 - t) * Vtemp[j][1] + t * Vtemp[j+1][1];
+		}
+    }
+
+    Q = Vtemp[0];
+    free((void *)Vtemp);
+    return Q;
+}
+
+
+/*
+ *  B0, B1, B2, B3 :
+ *	Bezier multipliers
+ */
+static double B0(double u)
+{
+    double tmp = 1.0 - u;
+    return (tmp * tmp * tmp);
+}
+
+
+static double B1(double u)
+{
+    double tmp = 1.0 - u;
+    return (3 * u * (tmp * tmp));
+}
+
+static double B2(double u)
+{
+    double tmp = 1.0 - u;
+    return (3 * u * u * tmp);
+}
+
+static double B3(double u)
+{
+    return (u * u * u);
+}
+
+
+
+/*
+ * ComputeLeftTangent, ComputeRightTangent, ComputeCenterTangent :
+ *Approximate unit tangents at endpoints and "center" of digitized curve
+ */
+static Vector2 ComputeLeftTangent(Vector2 *d, int end)
+//    Vector2	*d;			/*  Digitized points*/
+//    int		end;		/*  Index to "left" end of region */
+{
+    Vector2	tHat1;
+    tHat1 = V2SubII(d[end+1], d[end]);
+    tHat1 = *V2Normalize(&tHat1);
+    return tHat1;
+}
+
+static Vector2 ComputeRightTangent(Vector2 *d, int end)
+//    Vector2	*d;			/*  Digitized points		*/
+//    int		end;		/*  Index to "right" end of region */
+{
+    Vector2	tHat2;
+    tHat2 = V2SubII(d[end-1], d[end]);
+    tHat2 = *V2Normalize(&tHat2);
+    return tHat2;
+}
+
+static Vector2 ComputeCenterTangent(Vector2 *d, int center)
+//    Vector2	*d;			/*  Digitized points			*/
+//    int		center;		/*  Index to point inside region	*/
+{
+    Vector2	V1, V2, tHatCenter;
+
+    V1 = V2SubII(d[center-1], d[center]);
+    V2 = V2SubII(d[center], d[center+1]);
+    tHatCenter[0] = (V1[0] + V2[0])/2.0;
+    tHatCenter[1] = (V1[1] + V2[1])/2.0;
+    tHatCenter = *V2Normalize(&tHatCenter);
+    return tHatCenter;
+}
+
+
+/*
+ *  ChordLengthParameterize :
+ *	Assign parameter values to digitized points 
+ *	using relative distances between points.
+ */
+static double *ChordLengthParameterize(Vector2 *d, int first, int last)
+//    Vector2	*d;			/* Array of digitized points */
+//    int		first, last;		/*  Indices defining region	*/
+{
+    int		i;	
+    double	*u;			/*  Parameterization		*/
+
+    u = (double *)malloc((unsigned)(last-first+1) * sizeof(double));
+
+    u[0] = 0.0;
+    for (i = first+1; i <= last; i++) {
+		u[i-first] = u[i-first-1] +
+	  			V2DistanceBetween2Points(&d[i], &d[i-1]);
+    }
+
+    for (i = first + 1; i <= last; i++) {
+		u[i-first] = u[i-first] / u[last-first];
+    }
+
+    return(u);
+}
+
+
+
+
+/*
+ *  ComputeMaxError :
+ *	Find the maximum squared distance of digitized points
+ *	to fitted curve.
+*/
+static double ComputeMaxError(Vector2 *d, int first, int last, BezierCurve bezCurve, double *u, int *splitPoint)
+//    Vector2	*d;			/*  Array of digitized points	*/
+//    int		first, last;		/*  Indices defining region	*/
+//    BezierCurve	bezCurve;		/*  Fitted Bezier curve		*/
+//    double	*u;			/*  Parameterization of points	*/
+//    int		*splitPoint;		/*  Point of maximum error	*/
+{
+    int		i;
+    double	maxDist;		/*  Maximum error		*/
+    double	dist;		/*  Current error		*/
+    Vector2	P;			/*  Point on curve		*/
+    Vector2	v;			/*  Vector from point to curve	*/
+
+    *splitPoint = (last - first + 1)/2;
+    maxDist = 0.0;
+    for (i = first + 1; i < last; i++) {
+		P = BezierII(3, bezCurve, u[i-first]);
+		v = V2SubII(P, d[i]);
+		dist = V2SquaredLength(&v);
+		if (dist >= maxDist) {
+	    	maxDist = dist;
+	    	*splitPoint = i;
+		}
+    }
+    return (maxDist);
+}
+static Vector2 V2AddII(Vector2 a, Vector2 b)
+{
+    Vector2	c;
+    c[0] = a[0] + b[0];  c[1] = a[1] + b[1];
+    return (c);
+}
+static Vector2 V2ScaleIII(Vector2 v, double s)
+{
+    Vector2 result;
+    result[0] = v[0] * s; result[1] = v[1] * s;
+    return (result);
+}
+
+static Vector2 V2SubII(Vector2 a, Vector2 b)
+{
+    Vector2	c;
+    c[0] = a[0] - b[0]; c[1] = a[1] - b[1];
+    return (c);
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+
+//------------------------- WRAPPER -----------------------------//
+
+FitCurveWrapper::FitCurveWrapper()
+{
+}
+
+FitCurveWrapper::~FitCurveWrapper()
+{
+  _vertices.clear();
+}
+
+void FitCurveWrapper::DrawBezierCurve(int n, Vector2 *curve )
+{
+	for(int i=0; i<n+1; ++i)
+    _vertices.push_back(curve[i]);
+}
+
+void FitCurveWrapper::FitCurve(vector<Vec2d>& data, vector<Vec2d>& oCurve, double error)
+{
+  int size = data.size();
+  Vector2 *d = new Vector2[size];
+  for(int i=0; i<size; ++i)
+  {
+    d[i][0] = data[i][0];
+    d[i][1] = data[i][1];
+  }
+
+  FitCurve(d,size,error);
+
+  // copy results
+  for(vector<Vector2>::iterator v=_vertices.begin(), vend=_vertices.end();
+  v!=vend;
+  ++v)
+  {
+    oCurve.push_back(Vec2d(v->x(), v->y())) ;
+  }
+  
+}
+
+void FitCurveWrapper::FitCurve(Vector2 *d, int nPts, double error)
+{
+    Vector2 tHat1, tHat2;	/*  Unit tangent vectors at endpoints */
+
+    tHat1 = ComputeLeftTangent(d, 0);
+    tHat2 = ComputeRightTangent(d, nPts - 1);
+    FitCubic(d, 0, nPts - 1, tHat1, tHat2, error);
+}
+
+void FitCurveWrapper::FitCubic(Vector2 *d, int first, int last, Vector2 tHat1, Vector2 tHat2, double error)
+{
+    BezierCurve	bezCurve; /*Control points of fitted Bezier curve*/
+    double	*u;		/*  Parameter values for point  */
+    double	*uPrime;	/*  Improved parameter values */
+    double	maxError;	/*  Maximum fitting error	 */
+    int		splitPoint;	/*  Point to split point set at	 */
+    int		nPts;		/*  Number of points in subset  */
+    double	iterationError; /*Error below which you try iterating  */
+    int		maxIterations = 4; /*  Max times to try iterating  */
+    Vector2	tHatCenter;   	/* Unit tangent vector at splitPoint */
+    int		i;		
+
+    iterationError = error * error;
+    nPts = last - first + 1;
+
+    /*  Use heuristic if region only has two points in it */
+    if (nPts == 2) {
+	    double dist = V2DistanceBetween2Points(&d[last], &d[first]) / 3.0;
+
+		bezCurve = (Vector2 *)malloc(4 * sizeof(Vector2));
+		bezCurve[0] = d[first];
+		bezCurve[3] = d[last];
+		V2Add(&bezCurve[0], V2Scale(&tHat1, dist), &bezCurve[1]);
+		V2Add(&bezCurve[3], V2Scale(&tHat2, dist), &bezCurve[2]);
+		DrawBezierCurve(3, bezCurve);
+		free((void *)bezCurve);
+		return;
+    }
+
+    /*  Parameterize points, and attempt to fit curve */
+    u = ChordLengthParameterize(d, first, last);
+    bezCurve = GenerateBezier(d, first, last, u, tHat1, tHat2);
+
+    /*  Find max deviation of points to fitted curve */
+    maxError = ComputeMaxError(d, first, last, bezCurve, u, &splitPoint);
+    if (maxError < error) {
+		DrawBezierCurve(3, bezCurve);
+		free((void *)u);
+		free((void *)bezCurve);
+		return;
+    }
+
+
+    /*  If error not too large, try some reparameterization  */
+    /*  and iteration */
+    if (maxError < iterationError) {
+		for (i = 0; i < maxIterations; i++) {
+	    	uPrime = Reparameterize(d, first, last, u, bezCurve);
+	    	bezCurve = GenerateBezier(d, first, last, uPrime, tHat1, tHat2);
+	    	maxError = ComputeMaxError(d, first, last,
+				       bezCurve, uPrime, &splitPoint);
+	    	if (maxError < error) {
+			DrawBezierCurve(3, bezCurve);
+			free((void *)u);
+			free((void *)bezCurve);
+			return;
+	    }
+	    free((void *)u);
+	    u = uPrime;
+	}
+    }
+
+    /* Fitting failed -- split at max error point and fit recursively */
+    free((void *)u);
+    free((void *)bezCurve);
+    tHatCenter = ComputeCenterTangent(d, splitPoint);
+    FitCubic(d, first, splitPoint, tHat1, tHatCenter, error);
+    V2Negate(&tHatCenter);
+    FitCubic(d, splitPoint, last, tHatCenter, tHat2, error);
+
+}
+
diff --git a/extern/freestyle/src/geometry/FitCurve.h b/extern/freestyle/src/geometry/FitCurve.h
new file mode 100755
index 00000000000..ed7cbe34780
--- /dev/null
+++ b/extern/freestyle/src/geometry/FitCurve.h
@@ -0,0 +1,101 @@
+//
+//  Filename         : FitCurve.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : An Algorithm for Automatically Fitting Digitized Curves
+//                       by Philip J. Schneider
+//                       from "Graphics Gems", Academic Press, 1990
+//  Date of creation : 06/06/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  FITCURVE_H
+# define FITCURVE_H
+
+#include <vector>
+#include "../system/FreestyleConfig.h"
+#include "Geom.h"
+
+using namespace Geometry;
+
+typedef struct Point2Struct {	/* 2d point */
+	double coordinates[2];
+  Point2Struct() {coordinates[0]=0;coordinates[1]=0;}
+  inline double operator[](const int i) const 
+  {
+    return coordinates[i];
+  }
+  inline double& operator[](const int i)
+  {
+    return coordinates[i];
+  }
+  inline double x() const {return coordinates[0];}
+  inline double y() const {return coordinates[1];}
+	} Point2;
+
+typedef Point2 Vector2;
+
+
+
+class LIB_GEOMETRY_EXPORT FitCurveWrapper
+{
+private:
+  std::vector<Vector2> _vertices;
+
+public:
+  FitCurveWrapper();
+  ~FitCurveWrapper();
+
+  /*! Fits a set of 2D data points to a set of Bezier Curve segments
+   *    data
+   *      Input data points
+   *    oCurve
+   *      Control points of the sets of bezier curve segments.
+   *      Each segment is made of 4 points (polynomial degree of curve = 3)
+   *    error
+   *      max error tolerance between resulting curve and input data 
+   */
+  void FitCurve(std::vector<Vec2d>& data, std::vector<Vec2d>& oCurve, double error);
+protected:
+    /* Vec2d	*d;			  Array of digitized points	  */
+    /* int		nPts;		  Number of digitized points	*/
+    /* double	error;		User-defined error squared	*/
+  void FitCurve(Vector2 *d, int nPts, double error);
+    
+  /*! Draws a Bezier curve segment
+   *  n
+   *    degree of curve (=3)
+   *  curve
+   *    bezier segments control points
+   */
+  void DrawBezierCurve(int n, Vector2 *curve);
+  
+  /* Vec2d	*d;			  Array of digitized points */
+  /* int		first, last;	 Indices of first and last pts in region */
+  /* Vec2d tHat1, tHat2;	 Unit tangent vectors at endpoints */
+  /* double	error;		  User-defined error squared	   */
+  void FitCubic(Vector2 *d, int first, int last, Vector2 tHat1, Vector2 tHat2, double error);
+    
+};
+
+#endif // FITCURVE_H
diff --git a/extern/freestyle/src/geometry/Geom.h b/extern/freestyle/src/geometry/Geom.h
new file mode 100755
index 00000000000..ac94213fe98
--- /dev/null
+++ b/extern/freestyle/src/geometry/Geom.h
@@ -0,0 +1,78 @@
+//
+//  Filename         : Geom.h
+//  Author(s)        : Sylvain Paris
+//                     Emmanuel Turquin
+//                     Stephane Grabli 
+//  Purpose          : Vectors and Matrices (useful type definitions)
+//  Date of creation : 20/05/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  GEOM_H
+# define GEOM_H
+
+# include "VecMat.h"
+# include "../system/Precision.h"
+
+namespace Geometry {
+
+  typedef VecMat::Vec2<unsigned>	Vec2u;
+  typedef VecMat::Vec2<int>		Vec2i;
+  typedef VecMat::Vec2<float>		Vec2f;
+  typedef VecMat::Vec2<double>		Vec2d;
+  typedef VecMat::Vec2<real>		Vec2r;
+
+  typedef VecMat::Vec3<unsigned>	Vec3u;
+  typedef VecMat::Vec3<int>		Vec3i;
+  typedef VecMat::Vec3<float>		Vec3f;
+  typedef VecMat::Vec3<double>		Vec3d;
+  typedef VecMat::Vec3<real>		Vec3r;
+
+  typedef VecMat::HVec3<unsigned>	HVec3u;
+  typedef VecMat::HVec3<int>		HVec3i;
+  typedef VecMat::HVec3<float>		HVec3f;
+  typedef VecMat::HVec3<double>		HVec3d;
+  typedef VecMat::HVec3<real>		HVec3r;
+
+  typedef VecMat::SquareMatrix<unsigned, 2>	Matrix22u;
+  typedef VecMat::SquareMatrix<int, 2>		Matrix22i;
+  typedef VecMat::SquareMatrix<float, 2>	Matrix22f;
+  typedef VecMat::SquareMatrix<double, 2>	Matrix22d;
+  typedef VecMat::SquareMatrix<real, 2>		Matrix22r;
+
+  typedef VecMat::SquareMatrix<unsigned, 3>	Matrix33u;
+  typedef VecMat::SquareMatrix<int, 3>		Matrix33i;
+  typedef VecMat::SquareMatrix<float, 3>	Matrix33f;
+  typedef VecMat::SquareMatrix<double, 3>	Matrix33d;
+  typedef VecMat::SquareMatrix<real, 3>		Matrix33r;
+
+  typedef VecMat::SquareMatrix<unsigned, 4>	Matrix44u;
+  typedef VecMat::SquareMatrix<int, 4>		Matrix44i;
+  typedef VecMat::SquareMatrix<float, 4>	Matrix44f;
+  typedef VecMat::SquareMatrix<double, 4>	Matrix44d;
+  typedef VecMat::SquareMatrix<real, 4>		Matrix44r;
+
+} // end of namespace Geometry
+
+#endif // GEOM_H
diff --git a/extern/freestyle/src/geometry/GeomCleaner.cpp b/extern/freestyle/src/geometry/GeomCleaner.cpp
new file mode 100755
index 00000000000..c148c521a46
--- /dev/null
+++ b/extern/freestyle/src/geometry/GeomCleaner.cpp
@@ -0,0 +1,240 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+//#if defined(__GNUC__) && (__GNUC__ >= 3)
+//// hash_map is not part of the C++ standard anymore;
+//// hash_map.h has been kept though for backward compatibility
+//# include <hash_map.h>
+//#else
+//# include <hash_map>
+//#endif
+
+#include <stdio.h>
+#include <list>
+#include <map>
+#include "../system/TimeUtils.h"
+#include "GeomCleaner.h"
+
+using namespace std;
+
+
+void GeomCleaner::SortIndexedVertexArray( const float *iVertices, unsigned iVSize, 
+                                          const unsigned *iIndices, unsigned iISize, 
+                                          real **oVertices, 
+                                          unsigned **oIndices)
+{
+  // First, we build a list of IndexVertex:
+  list<IndexedVertex> indexedVertices;
+  unsigned i;
+  for(i=0; i<iVSize; i+= 3)
+  {
+    indexedVertices.push_back(IndexedVertex(Vec3r(iVertices[i], iVertices[i+1], iVertices[i+2]), i/3));
+  }
+
+  // q-sort
+  indexedVertices.sort();
+
+  // build the indices mapping array:
+  unsigned *mapIndices = new unsigned[iVSize/3];
+  *oVertices = new real[iVSize];
+  list<IndexedVertex>::iterator iv;
+  unsigned newIndex = 0;
+  unsigned vIndex = 0;
+  for(iv=indexedVertices.begin(); iv!=indexedVertices.end(); iv++)
+  {
+    // Build the final results:
+    (*oVertices)[vIndex] = iv->x();
+    (*oVertices)[vIndex+1] = iv->y();
+    (*oVertices)[vIndex+2] = iv->z();
+
+    mapIndices[iv->index()] = newIndex;
+    newIndex++;
+    vIndex+=3;
+  }
+
+  
+  // Build the final index array:
+  *oIndices  = new unsigned[iISize];
+  for(i=0; i<iISize; i++)
+  {
+    (*oIndices)[i] = 3*mapIndices[iIndices[i]/3];
+  }
+
+  delete [] mapIndices;
+}
+
+void GeomCleaner::CompressIndexedVertexArray(const real *iVertices, unsigned iVSize, 
+                                             const unsigned *iIndices, unsigned iISize, 
+                                             real **oVertices, unsigned *oVSize, 
+                                             unsigned **oIndices)
+{
+  // First, we build a list of IndexVertex:
+  vector<Vec3r> vertices;
+  unsigned i;
+  for(i=0; i<iVSize; i+= 3)
+  {
+    vertices.push_back(Vec3r(iVertices[i], iVertices[i+1], iVertices[i+2]));
+  }
+
+  unsigned *mapVertex = new unsigned[iVSize];
+  vector<Vec3r>::iterator v = vertices.begin();
+  
+  vector<Vec3r> compressedVertices;
+  Vec3r previous = *v;
+  mapVertex[0] = 0;
+  compressedVertices.push_back(vertices.front());
+
+  v++;
+  Vec3r current;
+  i=1;
+  for(; v!=vertices.end(); v++)
+  {
+    current = *v;
+    if(current == previous)
+      mapVertex[i] = compressedVertices.size()-1;
+    else
+    {
+      compressedVertices.push_back(current);
+      mapVertex[i] = compressedVertices.size()-1;
+    }  
+    previous = current;
+    i++;
+  }
+
+  // Builds the resulting vertex array:
+  *oVSize = 3*compressedVertices.size();
+  *oVertices = new real [*oVSize];
+  i=0;
+  for(v=compressedVertices.begin(); v!=compressedVertices.end(); v++)
+  {
+    (*oVertices)[i] = (*v)[0];
+    (*oVertices)[i+1] = (*v)[1];
+    (*oVertices)[i+2] = (*v)[2];
+    i += 3;
+  }
+
+  // Map the index array:
+  *oIndices = new unsigned[iISize];
+  for(i=0; i<iISize; i++)
+  {
+    (*oIndices)[i] = 3*mapVertex[iIndices[i]/3];
+  }
+
+  delete [] mapVertex;
+}
+
+void GeomCleaner::SortAndCompressIndexedVertexArray(const float *iVertices, unsigned iVSize, 
+                                                    const unsigned *iIndices, unsigned iISize, 
+                                                    real **oVertices, unsigned *oVSize, 
+                                                    unsigned **oIndices)
+{
+
+  // tmp arrays used to store the sorted data:
+  real *tmpVertices;
+  unsigned   *tmpIndices;
+
+  Chronometer chrono;
+  // Sort data
+  chrono.start();
+  GeomCleaner::SortIndexedVertexArray(iVertices, iVSize, 
+                                      iIndices, iISize, 
+                                      &tmpVertices, &tmpIndices
+                                      );
+  printf("Sorting: %lf\n", chrono.stop());
+
+  // compress data
+  chrono.start();
+  GeomCleaner::CompressIndexedVertexArray(tmpVertices, iVSize, 
+                                          tmpIndices, iISize, 
+                                          oVertices, oVSize,
+                                          oIndices);
+  printf("Merging: %lf\n", chrono.stop());
+
+  // deallocates memory:
+  delete [] tmpVertices;
+  delete [] tmpIndices;
+}
+
+/*! Defines a hash table used for searching the Cells */
+struct GeomCleanerHasher{
+#define _MUL 950706376UL
+#define _MOD 2147483647UL
+  inline size_t operator() (const Vec3r& p) const {
+    size_t res = ((unsigned long) (p[0] * _MUL)) % _MOD;
+    res = ((res + (unsigned long) (p[1]) * _MUL)) % _MOD;
+    return ((res +(unsigned long) (p[2]) * _MUL)) % _MOD;
+  }
+};
+
+void GeomCleaner::CleanIndexedVertexArray(const float *iVertices, unsigned iVSize, 
+					  const unsigned *iIndices, unsigned iISize, 
+					  real **oVertices, unsigned *oVSize, 
+					  unsigned **oIndices)
+{
+  typedef map<Vec3r, unsigned> cleanHashTable;
+  vector<Vec3r> vertices;
+  unsigned i;
+  for(i=0; i<iVSize; i+= 3)
+    vertices.push_back(Vec3r(iVertices[i], iVertices[i+1], iVertices[i+2]));
+  
+  cleanHashTable ht;
+  vector<unsigned> newIndices;
+  vector<Vec3r> newVertices;
+  
+  // elimination of needless points
+  unsigned currentIndex = 0;
+  vector<Vec3r>::const_iterator v = vertices.begin();
+  vector<Vec3r>::const_iterator end = vertices.end();
+  cleanHashTable::const_iterator found;
+  for(; v!=end; v++)
+  {
+    found = ht.find(*v);
+    if(found != ht.end())
+    {
+      // The vertex is already in the new array.
+      newIndices.push_back((*found).second);
+    }
+    else
+    {
+      newVertices.push_back(*v);
+      newIndices.push_back(currentIndex);
+      ht[*v] = currentIndex;
+      currentIndex++;
+    }
+  }
+
+  // creation of oVertices array:
+  *oVSize = 3*newVertices.size();
+  *oVertices = new real[*oVSize];
+  currentIndex = 0;
+  end = newVertices.end();
+  for(v=newVertices.begin(); v!=end ; v++)
+  {
+    (*oVertices)[currentIndex++] = (*v)[0];
+    (*oVertices)[currentIndex++] = (*v)[1];
+    (*oVertices)[currentIndex++] = (*v)[2];
+  }
+
+  // map new indices:
+  *oIndices = new unsigned[iISize];
+  for(i=0; i<iISize; i++)
+    (*oIndices)[i] = 3*newIndices[iIndices[i]/3];
+}
diff --git a/extern/freestyle/src/geometry/GeomCleaner.h b/extern/freestyle/src/geometry/GeomCleaner.h
new file mode 100755
index 00000000000..d78d90ccb4a
--- /dev/null
+++ b/extern/freestyle/src/geometry/GeomCleaner.h
@@ -0,0 +1,219 @@
+//
+//  Filename         : GeomCleaner.h
+//  Author           : Stephane Grabli
+//  Purpose          : Class to define a cleaner of geometry providing 
+//                     a set of useful tools
+//  Date of creation : 04/03/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  GEOMCLEANER_H
+# define GEOMCLEANER_H
+
+# include "../system/FreestyleConfig.h"
+# include "Geom.h"
+
+using namespace Geometry;
+
+class LIB_GEOMETRY_EXPORT GeomCleaner
+{
+public:
+
+  inline GeomCleaner() {}
+  inline ~GeomCleaner() {}
+
+  /*! Sorts an array of Indexed vertices 
+   *    iVertices
+   *      Array of vertices to sort. It is organized as a
+   *      float series of vertex coordinates: XYZXYZXYZ...
+   *    iVSize
+   *      The size of iVertices array.
+   *    iIndices
+   *      The array containing the vertex indices (used to refer
+   *      to the vertex coordinates in an indexed face). Each 
+   *      element is an unsignedeger multiple of 3.
+   *    iISize
+   *      The size of iIndices array
+   *    oVertices
+   *      Output of sorted vertices. A vertex v1 precedes another one 
+   *      v2 in this array if v1.x<v2.x, or v1.x=v2.x && v1.y < v2.y 
+   *      or v1.x=v2.y && v1.y=v2.y && v1.z < v2.z.
+   *      The array is organized as a 3-float serie giving 
+   *      the vertices coordinates: XYZXYZXYZ...
+   *    oIndices
+   *      Output corresponding to the iIndices array but 
+   *      reorganized in order to match the sorted vertex array.
+   */    
+
+  static void SortIndexedVertexArray(const float *iVertices, unsigned iVSize, 
+                                     const unsigned *iIndices, unsigned iISize, 
+                                     real **oVertices, 
+                                     unsigned **oIndices);
+
+  /*! Compress a SORTED indexed vertex array by eliminating 
+   *  multiple appearing occurences of a single vertex.
+   *    iVertices
+   *      The SORTED vertex array to compress. It is organized as a
+   *      float series of vertex coordinates: XYZXYZXYZ...
+   *    iVSize
+   *      The size of iVertices array.
+   *    iIndices
+   *      The array containing the vertex indices (used to refer
+   *      to the vertex coordinates in an indexed face). Each 
+   *      element is an unsignedeger multiple of 3.
+   *    iISize
+   *      The size of iIndices array
+   *    oVertices
+   *      The vertex array, result of the compression.
+   *      The array is organized as a 3-float serie giving 
+   *      the vertices coordinates: XYZXYZXYZ...
+   *    oVSize
+   *      The size of oVertices.
+   *    oIndices
+   *      The indices array, reorganized to match the compressed 
+   *      oVertices array.
+   */
+
+  static void CompressIndexedVertexArray(const real *iVertices, unsigned iVSize, 
+                                         const unsigned *iIndices, unsigned iISize, 
+                                         real **oVertices, unsigned *oVSize, 
+                                         unsigned **oIndices);
+
+  /*! Sorts and compress an array of indexed vertices.
+   *    iVertices
+   *      The vertex array to sort then compress. It is organized as a
+   *      float series of vertex coordinates: XYZXYZXYZ...
+   *    iVSize
+   *      The size of iVertices array.
+   *    iIndices
+   *      The array containing the vertex indices (used to refer
+   *      to the vertex coordinates in an indexed face). Each 
+   *      element is an unsignedeger multiple of 3.
+   *    iISize
+   *      The size of iIndices array
+   *    oVertices
+   *      The vertex array, result of the sorting-compression.
+   *      The array is organized as a 3-float serie giving 
+   *      the vertices coordinates: XYZXYZXYZ...
+   *    oVSize
+   *      The size of oVertices.
+   *    oIndices
+   *      The indices array, reorganized to match the sorted and compressed 
+   *      oVertices array.
+   */
+
+  static void SortAndCompressIndexedVertexArray(const float *iVertices, unsigned iVSize, 
+                                                const unsigned *iIndices, unsigned iISize, 
+                                                real **oVertices, unsigned *oVSize, 
+                                                unsigned **oIndices);
+
+  /*! Cleans an indexed vertex array. (Identical to 
+   *  SortAndCompress except that we use here a hash
+   *  table to create the new array.)
+   *    iVertices
+   *      The vertex array to sort then compress. It is organized as a
+   *      float series of vertex coordinates: XYZXYZXYZ...
+   *    iVSize
+   *      The size of iVertices array.
+   *    iIndices
+   *      The array containing the vertex indices (used to refer
+   *      to the vertex coordinates in an indexed face). Each 
+   *      element is an unsignedeger multiple of 3.
+   *    iISize
+   *      The size of iIndices array
+   *    oVertices
+   *      The vertex array, result of the sorting-compression.
+   *      The array is organized as a 3-float serie giving 
+   *      the vertices coordinates: XYZXYZXYZ...
+   *    oVSize
+   *      The size of oVertices.
+   *    oIndices
+   *      The indices array, reorganized to match the sorted and compressed 
+   *      oVertices array.
+   */
+
+  static void CleanIndexedVertexArray(const float *iVertices, unsigned iVSize, 
+                                      const unsigned *iIndices, unsigned iISize, 
+                                      real **oVertices, unsigned *oVSize, 
+                                      unsigned **oIndices);
+};
+
+
+/*! Binary operators */
+//inline bool operator<(const IndexedVertex& iv1, const IndexedVertex& iv2);
+
+/*! Class Indexed Vertex. Used to represent 
+ *  an indexed vertex by storing the vertex 
+ *  coordinates as well as its index
+ */
+class IndexedVertex
+{
+public:
+
+private:
+  Vec3r      _Vector;
+  unsigned        _index;
+public:
+  inline IndexedVertex() {}
+  inline IndexedVertex(Vec3r iVector, unsigned iIndex)
+  {
+    _Vector = iVector;
+    _index = iIndex;
+  }
+  /*! accessors */
+  inline const Vec3r& vector() const {return _Vector;}
+  inline unsigned index() {return _index;}
+  inline real x() {return _Vector[0];}
+  inline real y() {return _Vector[1];}
+  inline real z() {return _Vector[2];}
+  
+  /*! modifiers */
+  inline void SetVector(const Vec3r& iVector) {_Vector = iVector;}
+  inline void SetIndex(unsigned iIndex) {_index = iIndex;}
+
+  /*! operators */
+  IndexedVertex& operator=(const IndexedVertex& iv)
+  {
+    _Vector = iv._Vector;
+    _index  = iv._index;
+    return *this;
+  }
+  inline real operator[](const unsigned i) {return _Vector[i];}
+  //friend inline bool operator<(const IndexedVertex& iv1, const IndexedVertex& iv2);
+  inline bool operator<(const IndexedVertex& v) const
+  {
+    return (_Vector < v._Vector);
+  }
+  inline bool operator==(const IndexedVertex& v)
+  {
+    return (_Vector == v._Vector);
+  }
+};
+
+//bool operator<(const IndexedVertex& iv1, const IndexedVertex& iv2)
+//{
+//  return iv1.operator<(iv2);
+//}
+
+#endif // GEOMCLEANER_H
diff --git a/extern/freestyle/src/geometry/GeomUtils.cpp b/extern/freestyle/src/geometry/GeomUtils.cpp
new file mode 100755
index 00000000000..fd36e81ca77
--- /dev/null
+++ b/extern/freestyle/src/geometry/GeomUtils.cpp
@@ -0,0 +1,742 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "GeomUtils.h"
+
+namespace GeomUtils {
+
+  // This internal procedure is defined below.
+  bool intersect2dSegPoly(Vec2r* seg,
+			  Vec2r* poly,
+			  unsigned n);
+
+  bool intersect2dSeg2dArea(const Vec2r& min,
+			    const Vec2r& max,
+			    const Vec2r& A,
+			    const Vec2r& B) {
+    Vec2r seg[2];
+    seg[0] = A;
+    seg[1] = B;
+
+    Vec2r poly[5];
+    poly[0][0] = min[0];
+    poly[0][1] = min[1];
+    poly[1][0] = max[0];
+    poly[1][1] = min[1];
+    poly[2][0] = max[0];
+    poly[2][1] = max[1];
+    poly[3][0] = min[0];
+    poly[3][1] = max[1];
+    poly[4][0] = min[0];
+    poly[4][1] = min[1];
+
+    return intersect2dSegPoly(seg, poly, 4);
+  }
+
+  bool include2dSeg2dArea(const Vec2r& min,
+			  const Vec2r& max,
+			  const Vec2r& A,
+			  const Vec2r& B) {
+    if((((max[0] > A[0])&&(A[0] > min[0]))&&((max[0] > B[0])&&(B[0] > min[0])))
+       && (((max[1] > A[1])&&(A[1] > min[1]))&&((max[1] > B[1])&&(B[1] > min[1]))))
+      return true;
+    return false;
+  }
+
+  intersection_test intersect2dSeg2dSeg(const Vec2r& p1,
+					const Vec2r& p2,
+					const Vec2r& p3,
+					const Vec2r& p4,
+					Vec2r& res) {
+    real a1, a2, b1, b2, c1, c2; // Coefficients of line eqns
+    real r1, r2, r3, r4;         // 'Sign' values
+    real denom, num;             // Intermediate values
+
+    // Compute a1, b1, c1, where line joining points p1 and p2
+    // is "a1 x  +  b1 y  +  c1  =  0".
+    a1 = p2[1] - p1[1];
+    b1 = p1[0] - p2[0];
+    c1 = p2[0] * p1[1] - p1[0] * p2[1];
+
+    // Compute r3 and r4.
+    r3 = a1 * p3[0] + b1 * p3[1] + c1;
+    r4 = a1 * p4[0] + b1 * p4[1] + c1;
+
+    // Check signs of r3 and r4.  If both point 3 and point 4 lie on
+    // same side of line 1, the line segments do not intersect.
+    if ( r3 != 0 && r4 != 0 && r3 * r4 > 0.0)
+      return (DONT_INTERSECT);
+
+    // Compute a2, b2, c2
+    a2 = p4[1] - p3[1];
+    b2 = p3[0] - p4[0];
+    c2 = p4[0] * p3[1] - p3[0] * p4[1];
+
+    // Compute r1 and r2
+    r1 = a2 * p1[0] + b2 * p1[1] + c2;
+    r2 = a2 * p2[0] + b2 * p2[1] + c2;
+
+    // Check signs of r1 and r2.  If both point 1 and point 2 lie
+    // on same side of second line segment, the line segments do
+    // not intersect.
+    if ( r1 != 0 && r2 != 0 && r1 * r2 > 0.0)
+      return (DONT_INTERSECT);
+
+    // Line segments intersect: compute intersection point.
+    denom = a1 * b2 - a2 * b1;
+    if (fabs(denom) < M_EPSILON)
+      return (COLINEAR);
+    
+    num = b1 * c2 - b2 * c1;
+    res[0] = num / denom;
+
+    num = a2 * c1 - a1 * c2;
+    res[1] = num / denom;
+
+    return (DO_INTERSECT);
+  }
+
+  intersection_test intersect2dLine2dLine(const Vec2r& p1,
+					  const Vec2r& p2,
+					  const Vec2r& p3,
+					  const Vec2r& p4,
+					  Vec2r& res) {
+    real a1, a2, b1, b2, c1, c2; // Coefficients of line eqns
+    real denom, num;             // Intermediate values
+
+    // Compute a1, b1, c1, where line joining points p1 and p2
+    // is "a1 x  +  b1 y  +  c1  =  0".
+    a1 = p2[1] - p1[1];
+    b1 = p1[0] - p2[0];
+    c1 = p2[0] * p1[1] - p1[0] * p2[1];
+
+    // Compute a2, b2, c2
+    a2 = p4[1] - p3[1];
+    b2 = p3[0] - p4[0];
+    c2 = p4[0] * p3[1] - p3[0] * p4[1];
+
+    // Line segments intersect: compute intersection point.
+    denom = a1 * b2 - a2 * b1;
+    if (fabs(denom) < M_EPSILON)
+      return (COLINEAR);
+
+    num = b1 * c2 - b2 * c1;
+    res[0] = num / denom;
+
+    num = a2 * c1 - a1 * c2;
+    res[1] = num / denom;
+
+    return (DO_INTERSECT);
+  }
+
+  intersection_test intersect2dSeg2dSegParametric(const Vec2r& p1,
+						  const Vec2r& p2,
+						  const Vec2r& p3,
+						  const Vec2r& p4,
+						  real& t,
+						  real& u) {
+    real a1, a2, b1, b2, c1, c2; // Coefficients of line eqns
+    real r1, r2, r3, r4;         // 'Sign' values
+    real denom, num;             // Intermediate values
+
+    // Compute a1, b1, c1, where line joining points p1 and p2
+    // is "a1 x  +  b1 y  +  c1  =  0".
+    a1 = p2[1] - p1[1];
+    b1 = p1[0] - p2[0];
+    c1 = p2[0] * p1[1] - p1[0] * p2[1];
+
+    // Compute r3 and r4.
+    r3 = a1 * p3[0] + b1 * p3[1] + c1;
+    r4 = a1 * p4[0] + b1 * p4[1] + c1;
+
+    // Check signs of r3 and r4.  If both point 3 and point 4 lie on
+    // same side of line 1, the line segments do not intersect.
+    if ( r3 != 0 && r4 != 0 && r3 * r4 > 0.0)
+      return (DONT_INTERSECT);
+
+    // Compute a2, b2, c2
+    a2 = p4[1] - p3[1];
+    b2 = p3[0] - p4[0];
+    c2 = p4[0] * p3[1] - p3[0] * p4[1];
+
+    // Compute r1 and r2
+    r1 = a2 * p1[0] + b2 * p1[1] + c2;
+    r2 = a2 * p2[0] + b2 * p2[1] + c2;
+
+    // Check signs of r1 and r2.  If both point 1 and point 2 lie
+    // on same side of second line segment, the line segments do
+    // not intersect.
+    if ( r1 != 0 && r2 != 0 && r1 * r2 > 0.0)
+      return (DONT_INTERSECT);
+
+    // Line segments intersect: compute intersection point.
+    denom = a1 * b2 - a2 * b1;
+    if (fabs(denom) < M_EPSILON)
+      return (COLINEAR);
+    
+    real d1, d2, e1;
+
+    d1 = p1[1] - p3[1];
+    d2 = p2[1] - p1[1];
+    e1 = p1[0] - p3[0];
+
+    num = -b2 * d1 - a2 * e1;
+    t = num / denom;
+
+    num = -b1 * d1 - a1 * e1;
+    u = num / denom;
+
+    return (DO_INTERSECT);
+  }
+
+  // AABB-triangle overlap test code
+  // by Tomas Akenine-Möller
+  // Function: int triBoxOverlap(real boxcenter[3],
+  //          real boxhalfsize[3],real triverts[3][3]);
+  // History:
+  //   2001-03-05: released the code in its first version
+  //   2001-06-18: changed the order of the tests, faster
+  //
+  // Acknowledgement: Many thanks to Pierre Terdiman for
+  // suggestions and discussions on how to optimize code.
+  // Thanks to David Hunt for finding a ">="-bug!
+
+#define X 0
+#define Y 1
+#define Z 2
+
+#define FINDMINMAX(x0, x1, x2, min, max) \
+  min = max = x0;    \
+  if(x1<min) min=x1; \
+  if(x1>max) max=x1; \
+  if(x2<min) min=x2; \
+  if(x2>max) max=x2;
+
+  //======================== X-tests ========================//
+#define AXISTEST_X01(a, b, fa, fb)                         \
+        p0 = a*v0[Y] - b*v0[Z];                            \
+        p2 = a*v2[Y] - b*v2[Z];                            \
+        if(p0<p2) {min=p0; max=p2;} else {min=p2; max=p0;} \
+        rad = fa * boxhalfsize[Y] + fb * boxhalfsize[Z];   \
+        if(min>rad || max<-rad) return 0;
+
+#define AXISTEST_X2(a, b, fa, fb)                          \
+        p0 = a*v0[Y] - b*v0[Z];                            \
+        p1 = a*v1[Y] - b*v1[Z];                            \
+        if(p0<p1) {min=p0; max=p1;} else {min=p1; max=p0;} \
+        rad = fa * boxhalfsize[Y] + fb * boxhalfsize[Z];   \
+        if(min>rad || max<-rad) return 0;
+
+  //======================== Y-tests ========================//
+#define AXISTEST_Y02(a, b, fa, fb)                         \
+        p0 = -a*v0[X] + b*v0[Z];                           \
+        p2 = -a*v2[X] + b*v2[Z];                           \
+        if(p0<p2) {min=p0; max=p2;} else {min=p2; max=p0;} \
+        rad = fa * boxhalfsize[X] + fb * boxhalfsize[Z];   \
+        if(min>rad || max<-rad) return 0;
+
+#define AXISTEST_Y1(a, b, fa, fb)                          \
+        p0 = -a*v0[X] + b*v0[Z];                           \
+        p1 = -a*v1[X] + b*v1[Z];                           \
+        if(p0<p1) {min=p0; max=p1;} else {min=p1; max=p0;} \
+        rad = fa * boxhalfsize[X] + fb * boxhalfsize[Z];   \
+        if(min>rad || max<-rad) return 0;
+
+  //======================== Z-tests ========================//
+#define AXISTEST_Z12(a, b, fa, fb)                         \
+        p1 = a*v1[X] - b*v1[Y];                            \
+        p2 = a*v2[X] - b*v2[Y];                            \
+        if(p2<p1) {min=p2; max=p1;} else {min=p1; max=p2;} \
+        rad = fa * boxhalfsize[X] + fb * boxhalfsize[Y];   \
+        if(min>rad || max<-rad) return 0;
+
+#define AXISTEST_Z0(a, b, fa, fb)                          \
+        p0 = a*v0[X] - b*v0[Y];                            \
+        p1 = a*v1[X] - b*v1[Y];                            \
+        if(p0<p1) {min=p0; max=p1;} else {min=p1; max=p0;} \
+        rad = fa * boxhalfsize[X] + fb * boxhalfsize[Y];   \
+        if(min>rad || max<-rad) return 0;
+ 
+  // This internal procedure is defined below.
+  bool overlapPlaneBox(Vec3r& normal, real d, Vec3r& maxbox);
+
+  // Use separating axis theorem to test overlap between triangle and box
+  // need to test for overlap in these directions:
+  // 1) the {x,y,z}-directions (actually, since we use the AABB of the triangle
+  //    we do not even need to test these)
+  // 2) normal of the triangle
+  // 3) crossproduct(edge from tri, {x,y,z}-directin)
+  //    this gives 3x3=9 more tests
+  bool overlapTriangleBox(Vec3r& boxcenter,
+			  Vec3r& boxhalfsize,
+			  Vec3r triverts[3]) {
+    Vec3r v0, v1, v2, normal, e0, e1, e2;
+    real min, max, d, p0, p1, p2, rad, fex, fey, fez;  
+
+    // This is the fastest branch on Sun
+    // move everything so that the boxcenter is in (0, 0, 0)
+    v0 = triverts[0] - boxcenter;
+    v1 = triverts[1] - boxcenter;
+    v2 = triverts[2] - boxcenter;
+
+    // compute triangle edges
+    e0 = v1 - v0;
+    e1 = v2 - v1;
+    e2 = v0 - v2;
+
+    // Bullet 3:
+    // Do the 9 tests first (this was faster)
+    fex = fabs(e0[X]);
+    fey = fabs(e0[Y]);
+    fez = fabs(e0[Z]);
+    AXISTEST_X01(e0[Z], e0[Y], fez, fey);
+    AXISTEST_Y02(e0[Z], e0[X], fez, fex);
+    AXISTEST_Z12(e0[Y], e0[X], fey, fex);
+
+    fex = fabs(e1[X]);
+    fey = fabs(e1[Y]);
+    fez = fabs(e1[Z]);
+    AXISTEST_X01(e1[Z], e1[Y], fez, fey);
+    AXISTEST_Y02(e1[Z], e1[X], fez, fex);
+    AXISTEST_Z0(e1[Y], e1[X], fey, fex);
+  
+    fex = fabs(e2[X]);
+    fey = fabs(e2[Y]);
+    fez = fabs(e2[Z]);
+    AXISTEST_X2(e2[Z], e2[Y], fez, fey);
+    AXISTEST_Y1(e2[Z], e2[X], fez, fex);
+    AXISTEST_Z12(e2[Y], e2[X], fey, fex);
+
+    // Bullet 1:
+    // first test overlap in the {x,y,z}-directions
+    // find min, max of the triangle each direction, and test for overlap in
+    // that direction -- this is equivalent to testing a minimal AABB around
+    // the triangle against the AABB
+
+    // test in X-direction
+    FINDMINMAX(v0[X], v1[X], v2[X], min, max);
+    if (min > boxhalfsize[X] || max < -boxhalfsize[X])
+      return false;
+
+    // test in Y-direction
+    FINDMINMAX(v0[Y], v1[Y], v2[Y], min, max);
+    if (min > boxhalfsize[Y] || max < -boxhalfsize[Y])
+      return false;
+
+    // test in Z-direction
+    FINDMINMAX(v0[Z], v1[Z], v2[Z], min, max);
+    if(min > boxhalfsize[Z] || max < -boxhalfsize[Z])
+      return false;
+
+    // Bullet 2:
+    // test if the box intersects the plane of the triangle
+    // compute plane equation of triangle: normal * x + d = 0
+    normal = e0 ^ e1;
+    d = -(normal * v0); // plane eq: normal.x + d = 0
+    if (!overlapPlaneBox(normal, d, boxhalfsize))
+      return false;
+  
+    return true; // box and triangle overlaps
+  }
+
+  // Fast, Minimum Storage Ray-Triangle Intersection
+  //
+  // Tomas Möller
+  // Prosolvia Clarus AB
+  // Sweden
+  // tompa@clarus.se
+  //
+  // Ben Trumbore
+  // Cornell University
+  // Ithaca, New York
+  // wbt@graphics.cornell.edu
+
+  bool intersectRayTriangle(Vec3r& orig, Vec3r& dir,
+			    Vec3r& v0, Vec3r& v1, Vec3r& v2,
+			    real& t, real& u, real& v, real epsilon) {
+    Vec3r edge1, edge2, tvec, pvec, qvec;
+    real det, inv_det;
+
+    // find vectors for two edges sharing v0
+    edge1 = v1 - v0;
+    edge2 = v2 - v0;
+
+    // begin calculating determinant - also used to calculate U parameter
+    pvec = dir ^ edge2;
+
+    // if determinant is near zero, ray lies in plane of triangle
+    det = edge1 * pvec;
+
+    // calculate distance from v0 to ray origin
+    tvec = orig - v0;
+    inv_det = 1.0 / det;
+   
+    qvec = tvec ^ edge1;
+      
+    if (det > epsilon) {
+      u = tvec * pvec;
+      if (u < 0.0 || u > det)
+	return false;
+            
+      // calculate V parameter and test bounds
+      v = dir * qvec;
+      if (v < 0.0 || u + v > det)
+	return false;
+    }
+    else if(det < -epsilon) {
+      // calculate U parameter and test bounds
+      u = tvec * pvec;
+      if (u > 0.0 || u < det)
+	return false;
+      
+      // calculate V parameter and test bounds
+      v = dir * qvec;
+      if (v > 0.0 || u + v < det)
+	return false;
+    }
+    else
+      return false;  // ray is parallell to the plane of the triangle
+
+    u *= inv_det;
+    v *= inv_det;
+    t = (edge2 * qvec) * inv_det;
+
+    return true;
+  }
+
+  // Intersection between plane and ray, adapted from Graphics Gems, Didier Badouel
+  intersection_test intersectRayPlane(Vec3r& orig, Vec3r& dir,
+				      Vec3r& norm, real d,
+				      real& t,
+				      real epsilon) { 
+    real denom = norm * dir;
+
+    if(fabs(denom) <= epsilon) { // plane and ray are parallel
+      if(fabs((norm * orig) + d) <= epsilon)
+        return COINCIDENT; // plane and ray are coincident
+      else
+        return COLINEAR;
+    }
+
+    t = -(d + (norm * orig)) / denom;
+
+    if (t < 0.0f)
+      return DONT_INTERSECT;
+
+    return DO_INTERSECT;
+  }
+
+    bool intersectRayBBox(const Vec3r& orig, const Vec3r& dir,   // ray origin and direction
+        const Vec3r& boxMin, const Vec3r& boxMax, // the bbox
+        real t0, real t1,
+        real& tmin, real& tmax,                  // I0=orig+tmin*dir is the first intersection, I1=orig+tmax*dir is the second intersection
+        real epsilon){
+
+            float tymin, tymax, tzmin, tzmax;
+            Vec3r inv_direction(1.0/dir[0], 1.0/dir[1], 1.0/dir[2]);
+            int sign[3];
+            sign[0] = (inv_direction.x() < 0);
+            sign[1] = (inv_direction.y() < 0);
+            sign[2] = (inv_direction.z() < 0);
+
+            Vec3r bounds[2];
+            bounds[0] = boxMin;
+            bounds[1] = boxMax;
+
+            tmin = (bounds[sign[0]].x() - orig.x()) * inv_direction.x();
+            tmax = (bounds[1-sign[0]].x() - orig.x()) * inv_direction.x();
+            tymin = (bounds[sign[1]].y() - orig.y()) * inv_direction.y();
+            tymax = (bounds[1-sign[1]].y() - orig.y()) * inv_direction.y();
+            if ( (tmin > tymax) || (tymin > tmax) )
+                return false;
+            if (tymin > tmin)
+                tmin = tymin;
+            if (tymax < tmax)
+                tmax = tymax;
+            tzmin = (bounds[sign[2]].z() - orig.z()) * inv_direction.z();
+            tzmax = (bounds[1-sign[2]].z() - orig.z()) * inv_direction.z();
+            if ( (tmin > tzmax) || (tzmin > tmax) )
+                return false;
+            if (tzmin > tmin)
+                tmin = tzmin;
+            if (tzmax < tmax)
+                tmax = tzmax;
+            return ( (tmin < t1) && (tmax > t0) );
+        }
+
+  // Checks whether 3D points p lies inside or outside of the triangle ABC
+  bool includePointTriangle(Vec3r& P,
+			    Vec3r& A,
+			    Vec3r& B,
+			    Vec3r& C) {
+    Vec3r AB(B - A);
+    Vec3r BC(C - B);
+    Vec3r CA(A - C);
+    Vec3r AP(P - A);
+    Vec3r BP(P - B);
+    Vec3r CP(P - C);
+
+    Vec3r N(AB ^ BC); // triangle's normal
+
+    N.normalize();
+
+    Vec3r J(AB ^ AP), K(BC ^ BP), L(CA ^ CP);
+    J.normalize();
+    K.normalize();
+    L.normalize();
+
+    if(J * N < 0)
+      return false; // on the right of AB
+
+    if(K * N < 0)
+      return false; // on the right of BC
+
+    if(L * N < 0)
+      return false; // on the right of CA
+
+    return true;
+  }
+
+  void transformVertex(const Vec3r& vert,
+		       const Matrix44r& matrix,
+		       Vec3r& res) {
+    HVec3r hvert(vert), res_tmp;    
+    real scale;
+    for (unsigned j = 0; j < 4; j++) {
+      scale = hvert[j];
+      for (unsigned i = 0; i < 4; i++)
+        res_tmp[i] += matrix(i, j) * scale;
+    }
+    
+    res[0] = res_tmp.x();
+    res[1] = res_tmp.y();
+    res[2] = res_tmp.z();
+  }
+  
+  void transformVertices(const vector<Vec3r>& vertices,
+			 const Matrix44r& trans,
+			 vector<Vec3r>& res) {
+    for (vector<Vec3r>::const_iterator v = vertices.begin();
+	 v != vertices.end();
+	 v++) {
+      Vec3r *res_tmp = new Vec3r;
+      transformVertex(*v, trans, *res_tmp);
+      res.push_back(*res_tmp);
+    }
+  }
+
+  Vec3r rotateVector(const Matrix44r& mat, const Vec3r& v) {
+    Vec3r res;
+    for (unsigned i = 0; i < 3; i++) {
+      res[i] = 0;
+      for (unsigned j = 0; j < 3; j++)
+	res[i] += mat(i, j) * v[j];
+    }
+    res.normalize();
+    return res;
+  }
+
+  // This internal procedure is defined below.
+  void fromCoordAToCoordB(const Vec3r& p,
+			  Vec3r& q,
+			  const real transform[4][4]);
+
+  void fromWorldToCamera(const Vec3r& p,
+			 Vec3r& q,
+			 const real model_view_matrix[4][4]) {
+    fromCoordAToCoordB(p, q, model_view_matrix);
+  }
+
+  void fromCameraToRetina(const Vec3r& p,
+			  Vec3r& q,
+			  const real projection_matrix[4][4]) {
+    fromCoordAToCoordB(p, q, projection_matrix);
+  }
+
+  void fromRetinaToImage(const Vec3r& p,
+			 Vec3r& q,
+			 const int viewport[4]) {
+    // winX:
+    q[0] = viewport[0] + viewport[2] * (p[0] + 1.0) / 2.0;
+
+    // winY:
+    q[1] = viewport[1] + viewport[3] * (p[1] + 1.0) / 2.0;
+
+    // winZ:
+    q[2] = (p[2] + 1.0) / 2.0;
+  }
+
+  void fromWorldToImage(const Vec3r& p,
+			Vec3r& q,
+			const real model_view_matrix[4][4],
+			const real projection_matrix[4][4],
+			const int viewport[4]) {
+    Vec3r p1, p2;
+    fromWorldToCamera(p, p1, model_view_matrix);
+    fromCameraToRetina(p1, p2, projection_matrix);
+    fromRetinaToImage(p2, q, viewport);
+    q[2] = p1[2];
+  }
+
+  void fromWorldToImage(const Vec3r& p,
+			Vec3r& q,
+			const real transform[4][4],
+			const int viewport[4]) {
+    fromCoordAToCoordB(p, q, transform);
+
+    // winX:
+    q[0] = viewport[0] + viewport[2] * (q[0] + 1.0) / 2.0;
+
+    //winY:
+    q[1] = viewport[1] + viewport[3] * (q[1] + 1.0) / 2.0;
+  }
+
+  void fromImageToRetina(const Vec3r& p,
+			 Vec3r& q,
+			 const int viewport[4]) {
+    q = p;
+    q[0] = 2.0 * (q[0] - viewport[0]) / viewport[2] - 1;
+    q[1] = 2.0 * (q[1] - viewport[1]) / viewport[3] - 1;
+  }
+
+  void fromRetinaToCamera(const Vec3r& p,
+			  Vec3r& q,
+			  real z,
+			  const real projection_matrix[4][4]) {
+    q[0] = (-p[0] * z) / projection_matrix[0][0];
+    q[1] = (-p[1] * z) / projection_matrix[1][1];
+    q[2] = z;
+  }
+
+  void fromCameraToWorld(const Vec3r& p,
+			 Vec3r& q,
+			 const real model_view_matrix[4][4]) {
+
+    real translation[3] = { model_view_matrix[0][3],
+			      model_view_matrix[1][3],
+			      model_view_matrix[2][3] };
+    for (unsigned i = 0; i < 3; i++) {
+      q[i] = 0.0;
+      for (unsigned short j = 0; j < 3; j++)
+	q[i] += model_view_matrix[j][i] * (p[j] - translation[j]);
+    }
+  }
+
+
+  //
+  // Internal code
+  //
+  /////////////////////////////////////////////////////////////////////////////
+
+  // Copyright 2001, softSurfer (www.softsurfer.com)
+  // This code may be freely used and modified for any purpose
+  // providing that this copyright notice is included with it.
+  // SoftSurfer makes no warranty for this code, and cannot be held
+  // liable for any real or imagined damage resulting from its use.
+  // Users of this code must verify correctness for their application.
+
+#define perp(u,v)  ((u)[0] * (v)[1] - (u)[1] * (v)[0])   // 2D perp product
+
+  inline bool intersect2dSegPoly(Vec2r* seg,
+				 Vec2r* poly,
+				 unsigned n) {
+    if (seg[0] == seg[1])
+      return false;
+
+    real  tE = 0;             // the maximum entering segment parameter
+    real  tL = 1;             // the minimum leaving segment parameter
+    real  t, N, D;            // intersect parameter t = N / D
+    Vec2r dseg;                // the segment direction vector
+    dseg = seg[1] - seg[0];
+    Vec2r e;                   // edge vector
+
+    for (unsigned i = 0; i < n; i++) { // process polygon edge poly[i]poly[i+1]
+      e = poly[i+1] - poly[i];
+      N = perp(e, seg[0] - poly[i]);
+      D = -perp(e, dseg);
+      if (fabs(D) < M_EPSILON) {
+	if (N < 0)
+	  return false;
+	else
+	  continue;
+      }
+
+      t = N / D;
+      if (D < 0) {       // segment seg is entering across this edge
+	if (t > tE) {    // new max tE
+	  tE = t;
+	  if (tE > tL)   // seg enters after leaving polygon
+	    return false;
+	}
+      }
+      else {             // segment seg is leaving across this edge
+	if (t < tL) {    // new min tL
+	  tL = t;
+	  if (tL < tE)   // seg leaves before entering polygon
+	    return false;
+	}
+      }
+    }
+
+    // tE <= tL implies that there is a valid intersection subsegment
+    return true;
+  }
+
+  inline bool overlapPlaneBox(Vec3r& normal, real d, Vec3r& maxbox) {
+    Vec3r vmin, vmax;
+
+    for(unsigned q = X; q <= Z; q++) {
+	if(normal[q] > 0.0f) {
+	  vmin[q] = -maxbox[q];
+	  vmax[q] = maxbox[q];
+	}
+	else {
+	  vmin[q] = maxbox[q];
+	  vmax[q] = -maxbox[q];
+	}
+    }
+    if((normal * vmin) + d > 0.0f)
+      return false;
+    if((normal * vmax) + d >= 0.0f)
+      return true;
+    return false;
+  }
+
+  inline void fromCoordAToCoordB(const Vec3r&p,
+				 Vec3r& q,
+				 const real transform[4][4]) {
+    HVec3r hp(p);
+    HVec3r hq(0, 0, 0, 0);
+
+    for (unsigned i = 0; i < 4; i++)
+      for (unsigned j = 0; j < 4; j++)
+	hq[i] += transform[i][j] * hp[j];
+
+    if(hq[3] == 0) {
+      q = p;
+      return;
+    }
+
+    for (unsigned k = 0; k < 3; k++)
+      q[k] = hq[k] / hq[3];
+  }
+
+} // end of namespace GeomUtils
diff --git a/extern/freestyle/src/geometry/GeomUtils.h b/extern/freestyle/src/geometry/GeomUtils.h
new file mode 100755
index 00000000000..53c94c22f8b
--- /dev/null
+++ b/extern/freestyle/src/geometry/GeomUtils.h
@@ -0,0 +1,309 @@
+//
+//  Filename         : GeomUtils.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Various tools for geometry
+//  Date of creation : 12/04/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  GEOMUTILS_H
+# define GEOMUTILS_H
+
+# include <vector>
+# include "../system/FreestyleConfig.h"
+# include "Geom.h"
+
+using namespace std;
+using namespace Geometry;
+
+namespace GeomUtils {
+
+  //
+  // Templated procedures
+  //
+  /////////////////////////////////////////////////////////////////////////////
+
+  /*! Computes the distance from a point P to a segment AB */
+  template<class T>
+  real distPointSegment( const T& P, const T& A , const T& B) { 
+    T AB, AP, BP;
+    AB = B - A;
+    AP = P - A;
+    BP = P - B;
+
+    real c1(AB * AP);
+    if (c1 <= 0)
+      return AP.norm();
+
+    real c2(AB * AB);
+    if (c2 <= c1)
+      return BP.norm();
+
+    real b = c1 / c2;
+    T Pb, PPb;
+    Pb = A + b * AB;
+    PPb = P - Pb;
+
+    return PPb.norm();
+  } 
+
+  //
+  // Non-templated procedures
+  //
+  /////////////////////////////////////////////////////////////////////////////
+
+  typedef enum {
+    DONT_INTERSECT,
+    DO_INTERSECT,
+    COLINEAR,
+    COINCIDENT
+  } intersection_test;
+
+  LIB_GEOMETRY_EXPORT
+  intersection_test intersect2dSeg2dSeg(const Vec2r& p1, const Vec2r& p2, // first segment
+					const Vec2r& p3, const Vec2r& p4, // second segment
+					Vec2r& res);                      // found intersection point
+
+  LIB_GEOMETRY_EXPORT
+  intersection_test intersect2dLine2dLine(const Vec2r& p1, const Vec2r& p2, // first segment
+					  const Vec2r& p3, const Vec2r& p4, // second segment
+					  Vec2r& res);                      // found intersection point
+
+  LIB_GEOMETRY_EXPORT
+  intersection_test intersect2dSeg2dSegParametric(const Vec2r& p1, const Vec2r& p2, // first segment
+						  const Vec2r& p3, const Vec2r& p4, // second segment
+						  real& t,                          // I = P1 + t * P1P2)
+						  real& u);                         // I = P3 + u * P3P4
+
+  /*! check whether a 2D segment intersect a 2D region or not */
+  LIB_GEOMETRY_EXPORT
+  bool intersect2dSeg2dArea(const Vec2r& min,
+			    const Vec2r& max,
+			    const Vec2r& A,
+			    const Vec2r& B);
+  
+  /*! check whether a 2D segment is included in a 2D region or not */
+  LIB_GEOMETRY_EXPORT
+  bool include2dSeg2dArea(const Vec2r& min,
+			  const Vec2r& max,
+			  const Vec2r& A,
+			  const Vec2r& B);
+
+  /*! Box-triangle overlap test, adapted from Tomas Akenine-Möller code */
+  LIB_GEOMETRY_EXPORT
+  bool overlapTriangleBox(Vec3r& boxcenter,
+			  Vec3r& boxhalfsize,
+			  Vec3r triverts[3]);
+
+  /*! Fast, Minimum Storage Ray-Triangle Intersection,
+   * adapted from Tomas Möller and Ben Trumbore code.
+   */
+  LIB_GEOMETRY_EXPORT
+  bool intersectRayTriangle(Vec3r& orig, Vec3r& dir,
+			    Vec3r& v0, Vec3r& v1, Vec3r& v2,
+			    real& t,                   // I = orig + t * dir
+                real& u, real& v,          // I = (1-u-v)*v0+u*v1+v*v2
+			    real epsilon = M_EPSILON); // the epsilon to use
+
+  /*! Intersection between plane and ray
+   * adapted from Graphics Gems, Didier Badouel 
+   */
+  LIB_GEOMETRY_EXPORT
+  intersection_test intersectRayPlane(Vec3r& orig, Vec3r& dir,   // ray origin and direction
+				      Vec3r& norm, real d,       // plane's normal and offset (plane = { P / P.N + d = 0 })
+				      real& t,                   // I = orig + t * dir
+				      real epsilon = M_EPSILON); // the epsilon to use
+
+ /*! Intersection Ray-Bounding box (axis aligned).
+  *  Adapted from Williams et al, "An Efficient Robust Ray-Box Intersection Algorithm", 
+  *  JGT 10:1 (2005), pp. 49-54.
+  *  Returns
+  */
+  LIB_GEOMETRY_EXPORT
+      bool intersectRayBBox(const Vec3r& orig, const Vec3r& dir,   // ray origin and direction
+      const Vec3r& boxMin, const Vec3r& boxMax, // the bbox
+      real t0, real t1,     // the interval in which at least on of the intersections must happen
+      real& tmin, real& tmax,                  // Imin=orig+tmin*dir is the first intersection, Imax=orig+tmax*dir is the second intersection
+      real epsilon = M_EPSILON); // the epsilon to use
+
+
+  /*! Checks whether 3D point P lies inside or outside of the triangle ABC */
+  LIB_GEOMETRY_EXPORT
+  bool includePointTriangle(Vec3r& P,
+			    Vec3r& A,
+			    Vec3r& B,
+			    Vec3r& C);
+
+  LIB_GEOMETRY_EXPORT
+  void transformVertex(const Vec3r& vert,
+		       const Matrix44r& matrix,
+		       Vec3r& res);
+  
+  LIB_GEOMETRY_EXPORT
+  void transformVertices(const vector<Vec3r>& vertices,
+			 const Matrix44r& trans,
+			 vector<Vec3r>& res);
+
+  LIB_GEOMETRY_EXPORT
+  Vec3r rotateVector(const Matrix44r& mat, const Vec3r& v);
+
+  //
+  // Coordinates systems changing procedures
+  //
+  /////////////////////////////////////////////////////////////////////////////
+
+  /*! From world to image
+   *  p
+   *    point's coordinates expressed in world coordinates system
+   *  q
+   *    vector in which the result will be stored
+   *  model_view_matrix
+   *    The model view matrix expressed in line major order (OpenGL
+   *    matrices are column major ordered)
+   *  projection_matrix
+   *    The projection matrix expressed in line major order (OpenGL
+   *    matrices are column major ordered)
+   *  viewport
+   *    The viewport: x,y coordinates followed by width and height (OpenGL like viewport)
+   */
+  LIB_GEOMETRY_EXPORT
+  void fromWorldToImage(const Vec3r& p,
+			Vec3r& q,
+			const real model_view_matrix[4][4],
+			const real projection_matrix[4][4],
+			const int viewport[4]);
+
+  /*! From world to image
+   *  p
+   *    point's coordinates expressed in world coordinates system
+   *  q
+   *    vector in which the result will be stored
+   *  transform
+   *    The transformation matrix (gathering model view and projection), 
+   *    expressed in line major order (OpenGL matrices are column major ordered)
+   *  viewport
+   *    The viewport: x,y coordinates followed by width and height (OpenGL like viewport)
+   */
+  LIB_GEOMETRY_EXPORT
+  void fromWorldToImage(const Vec3r& p,
+			Vec3r& q,
+			const real transform[4][4],
+			const int viewport[4]);
+
+  /*! Projects from world coordinates to camera coordinates 
+   *  Returns the point's coordinates expressed in the camera's 
+   *  coordinates system.
+   *  p
+   *    point's coordinates expressed in world coordinates system
+   *  q
+   *    vector in which the result will be stored
+   *  model_view_matrix
+   *    The model view matrix expressed in line major order (OpenGL
+   *    matrices are column major ordered)
+   */
+  LIB_GEOMETRY_EXPORT
+  void fromWorldToCamera(const Vec3r& p,
+			 Vec3r& q,
+			 const real model_view_matrix[4][4]);
+  
+  /*! Projects from World Coordinates to retina coordinates
+   *  Returns the point's coordinates expressed in Retina system.
+   *  p
+   *    point's coordinates expressed in camera system
+   *  q
+   *    vector in which the result will be stored
+   *  projection_matrix
+   *    The projection matrix expressed in line major order (OpenGL
+   *    matrices are column major ordered)
+   */
+  LIB_GEOMETRY_EXPORT
+  void fromCameraToRetina(const Vec3r& p,
+			  Vec3r& q,
+			  const real projection_matrix[4][4]);
+  
+  /*! From retina to image.
+   *  Returns the coordinates expressed in Image coorinates system.
+   *  p
+   *    point's coordinates expressed in retina system
+   *  q
+   *    vector in which the result will be stored
+   *  viewport
+   *    The viewport: x,y coordinates followed by width and height (OpenGL like viewport).
+   */
+  LIB_GEOMETRY_EXPORT
+  void fromRetinaToImage(const Vec3r& p,
+			 Vec3r& q,
+			 const int viewport[4]);
+  
+  /*! From image to retina
+   *  p
+   *    point's coordinates expressed in image system
+   *  q
+   *    vector in which the result will be stored
+   *  viewport
+   *    The viewport: x,y coordinates followed by width and height (OpenGL like viewport).
+   */
+  LIB_GEOMETRY_EXPORT
+  void fromImageToRetina(const Vec3r& p,
+			 Vec3r& q,
+			 const int viewport[4]);
+ 
+  /*! computes the coordinates of q in the camera coordinates system, 
+   *  using the known z coordinates of the 3D point. 
+   *  That means that this method does not inverse any matrices, 
+   *  it only computes X and Y from x,y and Z)
+   *  p
+   *    point's coordinates expressed in retina system
+   *  q
+   *    vector in which the result will be stored
+   *  projection_matrix
+   *    The projection matrix expressed in line major order (OpenGL
+   *    matrices are column major ordered)
+   
+   */
+  LIB_GEOMETRY_EXPORT
+  void fromRetinaToCamera(const Vec3r& p,
+			  Vec3r& q,
+			  real z,
+			  const real projection_matrix[4][4]);
+
+  /*! Projects from camera coordinates to world coordinates
+   *  Returns the point's coordinates expressed in the world's 
+   *  coordinates system.
+   *  p
+   *    point's coordinates expressed in the camera coordinates system
+   *  q
+   *    vector in which the result will be stored
+   *  model_view_matrix
+   *    The model view matrix expressed in line major order (OpenGL
+   *    matrices are column major ordered)
+   */
+  LIB_GEOMETRY_EXPORT
+  void fromCameraToWorld(const Vec3r& p,
+			 Vec3r& q,
+			 const real model_view_matrix[4][4]);
+
+} // end of namespace GeomUtils
+
+#endif // GEOMUTILS_H
diff --git a/extern/freestyle/src/geometry/Grid.cpp b/extern/freestyle/src/geometry/Grid.cpp
new file mode 100755
index 00000000000..59b730358bc
--- /dev/null
+++ b/extern/freestyle/src/geometry/Grid.cpp
@@ -0,0 +1,388 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "Grid.h"
+#include "BBox.h"
+#include <cassert>
+#include <stdexcept>
+
+// Grid Visitors
+/////////////////
+void allOccludersGridVisitor::examineOccluder(Polygon3r *occ){
+    occluders_.push_back(occ);
+}
+
+bool inBox(const Vec3r& inter, const Vec3r& box_min, const Vec3r& box_max){
+    if(((inter.x()>=box_min.x()) && (inter.x() <box_max.x()))
+        && ((inter.y()>=box_min.y()) && (inter.y() <box_max.y()))
+        && ((inter.z()>=box_min.z()) && (inter.z() <box_max.z()))
+        ){
+            return true;
+        }
+        return false;
+}
+void firstIntersectionGridVisitor::examineOccluder(Polygon3r *occ){
+
+    // check whether the edge and the polygon plane are coincident:
+    //-------------------------------------------------------------
+    //first let us compute the plane equation.
+    Vec3r v1(((occ)->getVertices())[0]);           
+    Vec3d normal((occ)->getNormal());
+    double d = -(v1 * normal);
+
+    double tmp_u, tmp_v, tmp_t;
+    if((occ)->rayIntersect(ray_org_, ray_dir_, tmp_t, tmp_u, tmp_v)){
+        if (fabs(ray_dir_ * normal) > 0.0001){
+            // Check whether the intersection is in the cell:
+            if(inBox(ray_org_+tmp_t*ray_dir_/ray_dir_.norm(), current_cell_->getOrigin(), current_cell_->getOrigin()+cell_size_)){
+
+                //Vec3d bboxdiag(_scene3d->bbox().getMax()-_scene3d->bbox().getMin());
+                //if ((t>1.0E-06*(min(min(bboxdiag.x(),bboxdiag.y()),bboxdiag.z()))) && (t<raylength)){
+                if(tmp_t < t_){
+                    occluder_ = occ;
+                    u_ = tmp_u;
+                    v_ = tmp_v;
+                    t_ = tmp_t;
+                }
+            }else{
+                occ->userdata2 = 0;
+            }
+        }
+    }
+}
+
+bool firstIntersectionGridVisitor::stop(){
+    if(occluder_)
+        return true;
+    return false;
+}
+
+// Grid
+/////////////////
+
+void Grid::clear() {
+  if (_occluders.size() != 0) {
+    for(OccludersSet::iterator it = _occluders.begin();
+	it != _occluders.end();
+	it++) {
+      delete (*it);
+    }
+    _occluders.clear();
+  }
+
+  _size = Vec3r(0, 0, 0);
+  _cell_size = Vec3r(0, 0, 0);
+  _orig = Vec3r(0, 0, 0);
+  _cells_nb = Vec3u(0, 0, 0);
+  //_ray_occluders.clear();
+}       
+
+void Grid::configure(const Vec3r& orig,
+		     const Vec3r& size,
+		     unsigned nb) {
+                 
+  _orig = orig;
+ Vec3r tmpSize=size;
+  // Compute the volume of the desired grid
+  real grid_vol = size[0] * size[1] * size[2];
+
+  if(grid_vol == 0){
+    double min=DBL_MAX;
+    int index;
+    int nzeros=0;
+    for(int i=0;i<3;++i){
+        if(size[i] == 0){
+            ++nzeros;
+            index=i;
+        }
+        if((size[i]!=0) && (min>size[i])){
+            min=size[i];
+        }
+    }
+    if(nzeros>1){
+        throw std::runtime_error("Warning: the 3D grid has more than one null dimension");
+    }
+    tmpSize[index]=min;
+    _orig[index] = _orig[index]-min/2;
+  }
+  // Compute the desired volume of a single cell
+  real cell_vol = grid_vol / nb;
+  // The edge of such a cubic cell is cubic root of cellVolume
+  real edge = pow(cell_vol, 1.0 / 3.0);
+
+  // We compute the number of cells par edge
+  // such as we cover at least the whole box.
+  unsigned i;
+  for (i = 0; i < 3; i++)
+    _cells_nb[i] = (unsigned)floor(tmpSize[i] / edge) + 1;
+
+  _size = tmpSize;
+
+  for(i = 0; i < 3; i++)
+    _cell_size[i] = _size[i] / _cells_nb[i];
+}
+
+void Grid::insertOccluder(Polygon3r* occluder) {
+  const vector<Vec3r> vertices = occluder->getVertices();
+  if (vertices.size() == 0)
+    return;
+
+  // add this occluder to the grid's occluders list
+  addOccluder(occluder);
+
+  // find the bbox associated to this polygon
+  Vec3r min, max;
+  occluder->getBBox(min, max);
+
+  // Retrieve the cell x, y, z cordinates associated with these min and max
+  Vec3u imax, imin;
+  getCellCoordinates(max, imax);
+  getCellCoordinates(min, imin);
+  
+  // We are now going to fill in the cells overlapping with the
+  // polygon bbox.
+  // If the polygon is a triangle (most of cases), we also
+  // check for each of these cells if it is overlapping with
+  // the triangle in order to only fill in the ones really overlapping
+  // the triangle.
+
+  unsigned i, x, y, z;
+  vector<Vec3r>::const_iterator it;
+  Vec3u coord;
+
+  if (vertices.size() == 3) { // Triangle case
+    Vec3r triverts[3];
+    i = 0;
+    for(it = vertices.begin();
+	it != vertices.end();
+	it++) {
+      triverts[i] = Vec3r(*it);
+      i++;
+    }
+
+    Vec3r boxmin, boxmax;
+
+    for (z = imin[2]; z <= imax[2]; z++)
+      for (y = imin[1]; y <= imax[1]; y++)
+	for (x = imin[0]; x <= imax[0]; x++) {
+	  coord[0] = x;
+	  coord[1] = y;
+	  coord[2] = z;
+	  // We retrieve the box coordinates of the current cell
+	  getCellBox(coord, boxmin, boxmax);
+	  // We check whether the triangle and the box ovewrlap:
+	  Vec3r boxcenter((boxmin + boxmax) / 2.0);
+	  Vec3r boxhalfsize(_cell_size / 2.0);
+	  if (GeomUtils::overlapTriangleBox(boxcenter, boxhalfsize, triverts)) {
+	    // We must then create the Cell and add it to the cells list
+	    // if it does not exist yet.
+	    // We must then add the occluder to the occluders list of this cell.
+	    Cell* cell = getCell(coord);
+	    if (!cell) {
+	      cell = new Cell(boxmin);
+	      fillCell(coord, *cell);
+	    }
+	    cell->addOccluder(occluder);
+	  }
+	}
+  }
+  else { // The polygon is not a triangle, we add all the cells overlapping the polygon bbox.
+    for (z = imin[2]; z <= imax[2]; z++)
+      for (y = imin[1]; y <= imax[1]; y++)
+	for (x = imin[0]; x <= imax[0]; x++) {
+	  coord[0] = x;
+	  coord[1] = y;
+	  coord[2] = z;
+	  Cell* cell = getCell(coord);
+	  if (!cell) {
+	    Vec3r orig;
+	    getCellOrigin(coord, orig);
+	    cell = new Cell(orig);
+	    fillCell(coord, *cell);
+	  }
+	  cell->addOccluder(occluder);
+	}
+  }
+}
+
+bool Grid::nextRayCell(Vec3u& current_cell, Vec3u& next_cell) {
+  next_cell = current_cell;
+  real t_min, t;
+  unsigned i;
+ 
+  t_min = FLT_MAX;    // init tmin with handle of the case where one or 2 _u[i] = 0. 
+  unsigned coord = 0; // predominant coord(0=x, 1=y, 2=z)
+
+
+  // using a parametric equation of
+  // a line : B = A + t u, we find
+  // the tx, ty and tz respectively coresponding
+  // to the intersections with the plans:
+  // x = _cell_size[0], y = _cell_size[1], z = _cell_size[2]
+  for (i = 0; i < 3; i++) {
+    if (_ray_dir[i] == 0)
+      continue;
+    if (_ray_dir[i] > 0)
+      t = (_cell_size[i] - _pt[i]) / _ray_dir[i];
+    else
+      t = -_pt[i] / _ray_dir[i];
+    if (t < t_min) {
+      t_min = t;
+      coord = i;
+    }
+  }
+
+  // We use the parametric line equation and
+  // the found t (tamx) to compute the
+  // B coordinates:
+  Vec3r pt_tmp(_pt);
+  _pt = pt_tmp + t_min * _ray_dir;
+    
+  // We express B coordinates in the next cell
+  // coordinates system. We just have to
+  // set the coordinate coord of B to 0
+  // of _CellSize[coord] depending on the sign
+  // of _u[coord]
+  if (_ray_dir[coord] > 0) {
+    next_cell[coord]++;
+    _pt[coord] -= _cell_size[coord];
+    // if we are out of the grid, we must stop
+    if (next_cell[coord] >= _cells_nb[coord])
+      return false;
+  }
+  else {
+    int tmp = next_cell[coord] - 1;
+    _pt[coord] = _cell_size[coord];
+    if (tmp < 0)
+      return false;
+    next_cell[coord]--;
+  }
+
+  _t += t_min;
+  if (_t >= _t_end)
+    return false;
+
+  return true;
+}
+
+void Grid::castRay(const Vec3r& orig,
+		   const Vec3r& end,
+		   OccludersSet& occluders,
+		   unsigned timestamp) {
+  initRay(orig, end, timestamp);
+  allOccludersGridVisitor visitor(occluders);
+  castRayInternal(visitor);
+}
+
+void Grid::castInfiniteRay(const Vec3r& orig,
+			   const Vec3r& dir,
+			   OccludersSet& occluders,
+			   unsigned timestamp) {
+  Vec3r end = Vec3r(orig + FLT_MAX * dir / dir.norm());
+  bool inter = initInfiniteRay(orig, dir, timestamp);
+  if(!inter)
+      return;
+  allOccludersGridVisitor visitor(occluders);
+  castRayInternal(visitor);
+}
+  
+Polygon3r* Grid::castRayToFindFirstIntersection(const Vec3r& orig,
+                   const Vec3r& dir,
+                   double& t,
+                   double& u,
+                   double& v,
+                   unsigned timestamp){
+    Polygon3r *occluder = 0;
+    Vec3r end = Vec3r(orig + FLT_MAX * dir / dir.norm());
+    bool inter = initInfiniteRay(orig, dir, timestamp);
+    if(!inter){
+        return 0;
+    }
+    firstIntersectionGridVisitor visitor(orig,dir,_cell_size);
+    castRayInternal(visitor);
+    occluder = visitor.occluder();
+    t = visitor.t_;
+    u = visitor.u_;
+    v = visitor.v_;
+    return occluder;
+}
+
+void Grid::initRay (const Vec3r &orig,
+		    const Vec3r& end,
+		    unsigned timestamp) {
+  _ray_dir = end - orig;
+  _t_end = _ray_dir.norm();
+  _t = 0;
+  _ray_dir.normalize();
+  _timestamp = timestamp;
+
+  for(unsigned i = 0; i < 3; i++) {
+    _current_cell[i] = (unsigned)floor((orig[i] - _orig[i]) / _cell_size[i]);
+    unsigned u = _current_cell[i];
+    _pt[i] = orig[i] - _orig[i] - _current_cell[i] * _cell_size[i];
+  }
+  //_ray_occluders.clear();
+
+}
+
+bool Grid::initInfiniteRay (const Vec3r &orig,
+		    const Vec3r& dir,
+		    unsigned timestamp) {
+  _ray_dir = dir;
+  _t_end = FLT_MAX;
+  _t = 0;
+  _ray_dir.normalize();
+  _timestamp = timestamp;
+
+  // check whether the origin is in or out the box:
+  Vec3r boxMin(_orig);
+  Vec3r boxMax(_orig+_size);
+  BBox<Vec3r> box(boxMin, boxMax);
+  if(box.inside(orig)){
+      for(unsigned i = 0; i < 3; i++) {
+          _current_cell[i] = (unsigned)floor((orig[i] - _orig[i]) / _cell_size[i]);
+          unsigned u = _current_cell[i];
+          _pt[i] = orig[i] - _orig[i] - _current_cell[i] * _cell_size[i];
+      }
+  }else{
+      // is the ray intersecting the box?
+      real tmin(-1.0), tmax(-1.0);
+      if(GeomUtils::intersectRayBBox(orig, _ray_dir, boxMin, boxMax, 0, _t_end, tmin, tmax)){
+        assert(tmin != -1.0);
+        Vec3r newOrig = orig + tmin*_ray_dir;
+        for(unsigned i = 0; i < 3; i++) {
+            _current_cell[i] = (unsigned)floor((newOrig[i] - _orig[i]) / _cell_size[i]);
+            if(_current_cell[i] == _cells_nb[i])
+                _current_cell[i] = _cells_nb[i] - 1;
+            unsigned u = _current_cell[i];
+            _pt[i] = newOrig[i] - _orig[i] - _current_cell[i] * _cell_size[i];
+        }
+
+      }else{
+          return false;
+      }
+  }
+  //_ray_occluders.clear();
+
+  return true;
+
+}
+
diff --git a/extern/freestyle/src/geometry/Grid.h b/extern/freestyle/src/geometry/Grid.h
new file mode 100755
index 00000000000..6197721bb45
--- /dev/null
+++ b/extern/freestyle/src/geometry/Grid.h
@@ -0,0 +1,358 @@
+//
+//  Filename         : Grid.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Base class to define a cell grid surrounding
+//                     the bounding box of the scene
+//  Date of creation : 30/07/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  GRID_H
+# define GRID_H
+
+# include <float.h>
+# include <vector>
+# include "../system/FreestyleConfig.h"
+# include "GeomUtils.h"
+# include "Geom.h"
+# include "Polygon.h"
+
+using namespace std;
+using namespace Geometry;
+
+typedef vector<Polygon3r*>	OccludersSet;
+
+
+//
+// Class to define cells used by the regular grid
+//
+///////////////////////////////////////////////////////////////////////////////
+
+class LIB_GEOMETRY_EXPORT Cell
+{
+ public:
+  
+  Cell(Vec3r& orig) {
+    _orig = orig;
+  }
+
+  virtual ~Cell() {}
+
+  inline void addOccluder(Polygon3r* o) {
+    if (o)
+      _occluders.push_back(o);
+  }
+
+  inline const Vec3r& getOrigin() {
+    return _orig;
+  }
+
+  inline OccludersSet& getOccluders() {
+    return _occluders;
+  }
+  
+ private:
+
+  Vec3r		_orig;
+  OccludersSet	_occluders;
+};
+
+
+class GridVisitor{
+public:
+    virtual void discoverCell(Cell *cell) {}
+    virtual void examineOccluder(Polygon3r *occ) {}
+    virtual void finishCell(Cell *cell) {}
+    virtual bool stop() {return false;}
+};
+
+/*! Gathers all the occluders belonging to the cells
+ * traversed by the ray */
+class allOccludersGridVisitor : public GridVisitor{
+public:
+    allOccludersGridVisitor(OccludersSet& occluders)
+        :GridVisitor(), occluders_(occluders){}
+    virtual void examineOccluder(Polygon3r *occ);
+
+    OccludersSet& occluders() {return occluders_;}
+    void clear() {occluders_.clear();}
+
+private:
+    OccludersSet& occluders_;
+};
+
+/*! Finds the first intersection and breaks. The occluder and 
+ * the intersection information are stored and accessible.
+ */
+class firstIntersectionGridVisitor : public GridVisitor {
+public:
+      firstIntersectionGridVisitor(const Vec3r& ray_org, const Vec3r& ray_dir, const Vec3r& cell_size) : 
+      GridVisitor(), ray_org_(ray_org), cell_size_(cell_size),ray_dir_(ray_dir),occluder_(0),
+            u_(0),v_(0),t_(DBL_MAX),current_cell_(0){}
+      virtual ~firstIntersectionGridVisitor() {}
+
+    virtual void discoverCell(Cell *cell) {current_cell_=cell;}
+    virtual void examineOccluder(Polygon3r *occ);
+    virtual bool stop();
+
+    Polygon3r * occluder() {return occluder_;}
+    
+public:
+    double u_, v_, t_;
+private:
+    Polygon3r *occluder_;
+    Vec3r ray_org_, ray_dir_;
+    Vec3r cell_size_;
+    Cell * current_cell_;
+};
+
+//
+// Class to define a regular grid used for ray casting computations
+//
+///////////////////////////////////////////////////////////////////////////////
+
+class LIB_GEOMETRY_EXPORT Grid
+{
+public:
+
+  /*! Builds a Grid 
+   *  Must be followed by a call to configure()
+   */
+  Grid() {}
+
+  virtual ~Grid() {
+    clear();
+  }
+
+  /*! clears the grid
+   *  Deletes all the cells, clears the hashtable,
+   *  resets size, size of cell, number of cells.
+   */
+  virtual void clear();
+
+  /*! Sets the different parameters of the grid
+   *    orig
+   *      The grid origin
+   *    size
+   *      The grid's dimensions
+   *    nb
+   *      The number of cells of the grid
+   */
+  virtual void configure(const Vec3r& orig, const Vec3r& size, unsigned nb);
+  
+  /*! returns a vector of integer containing the
+   *  coordinates of the cell containing the point
+   *  passed as argument
+   *    p
+   *      The point for which we're looking the cell
+   */
+  inline void getCellCoordinates(const Vec3r& p, Vec3u& res) {
+    int tmp;
+    for (int i = 0; i < 3; i++) {
+      tmp = (int)((p[i] - _orig[i]) / _cell_size[i]);
+      if (tmp < 0)
+	res[i] = 0;
+      else if ((unsigned)tmp >= _cells_nb[i])
+	res[i] = _cells_nb[i] - 1;
+      else
+	res[i] = tmp;
+    }
+  }
+
+  /*! Fills the case corresponding to coord with the cell */
+  virtual void fillCell(const Vec3u& coord, Cell& cell) = 0;
+
+  /*! returns the cell whose coordinates
+   *  are pased as argument
+   */
+  virtual Cell* getCell(const Vec3u& coord) = 0;
+
+  /*! returns the cell containing the point
+   *  passed as argument. If the cell is empty
+   *  (contains no occluder), NULL is returned
+   *    p
+   *      The point for which we're looking the cell
+   */
+  inline Cell* getCell(const Vec3r& p) {    
+    Vec3u coord;
+    getCellCoordinates(p, coord);
+    return getCell(coord);
+  }
+
+  /*! Retrieves the x,y,z coordinates of the origin of the cell whose coordinates (i,j,k)
+   *  is passed as argument
+   *    cell_coord
+   *      i,j,k integer coordinates for the cell
+   *    orig
+   *      x,y,x vector to be filled in with the cell origin's coordinates
+   */
+  inline void getCellOrigin(const Vec3u& cell_coord, Vec3r& orig) {
+    for (unsigned i = 0; i < 3; i++)
+      orig[i] = _orig[i] + cell_coord[i] * _cell_size[i];
+  }
+
+  /*! Retrieves the box corresponding to the cell whose coordinates
+   *  are passed as argument.
+   *    cell_coord
+   *      i,j,k integer coordinates for the cell
+   *    min_out
+   *      The min x,y,x vector of the box. Filled in by the method.
+   *    max_out
+   *      The max x,y,z coordinates of the box. Filled in by the method.
+   */
+  inline void getCellBox(const Vec3u& cell_coord, Vec3r& min_out, Vec3r& max_out) {
+    getCellOrigin(cell_coord, min_out);
+    max_out = min_out + _cell_size;
+  }
+
+  /*! inserts a convex polygon occluder
+   *  This method is quite coarse insofar as it
+   *  adds all cells intersecting the polygon bounding box
+   *    convex_poly
+   *      The list of 3D points constituing a convex polygon
+   */
+  void insertOccluder(Polygon3r * convex_poly);
+
+  /*! Adds an occluder to the list of occluders */
+  void addOccluder(Polygon3r* occluder) {
+    _occluders.push_back(occluder);
+  }
+
+  /*! Casts a ray between a starting point and an ending point
+   *  Returns the list of occluders contained
+   *  in the cells intersected by this ray
+   *  Starts with a call to InitRay.
+   */
+  void castRay(const Vec3r& orig,
+	       const Vec3r& end,
+	       OccludersSet& occluders,
+	       unsigned timestamp);
+
+  /*! Casts an infinite ray (still finishing at the end of the grid) from a starting point and in a given direction.
+   *  Returns the list of occluders contained
+   *  in the cells intersected by this ray
+   *  Starts with a call to InitRay.
+   */
+  void castInfiniteRay(const Vec3r& orig,
+		       const Vec3r& dir,
+		       OccludersSet& occluders,
+		       unsigned timestamp);
+
+  /*! Casts an infinite ray (still finishing at the end of the grid) from a starting point and in a given direction.
+  *  Returns the first intersection (occluder,t,u,v) or null.
+  *  Starts with a call to InitRay.
+  */
+  Polygon3r * castRayToFindFirstIntersection(const Vec3r& orig,
+      const Vec3r& dir,
+      double& t,
+      double& u,
+      double& v,
+      unsigned timestamp);
+
+
+  /*! Init all structures and values for computing
+   *  the cells intersected by this new ray
+   */
+  void initRay (const Vec3r &orig,
+		const Vec3r& end,
+		unsigned timestamp);
+
+  /*! Init all structures and values for computing
+   *  the cells intersected by this infinite ray.
+   * Returns false if the ray doesn't intersect the 
+   * grid.
+   */
+  bool initInfiniteRay (const Vec3r &orig,
+		const Vec3r& dir,
+		unsigned timestamp);
+
+ 
+  /*! Accessors */
+  inline const Vec3r& getOrigin() const {
+    return _orig;
+  }
+  inline Vec3r gridSize() const {
+    return _size;
+  }
+  inline Vec3r getCellSize() const {
+    return _cell_size;
+  }
+
+  void displayDebug() {
+    cerr << "Cells nb     : " << _cells_nb << endl;
+    cerr << "Cell size    : " << _cell_size << endl;
+    cerr << "Origin       : " << _orig << endl;
+    cerr << "Occluders nb : " << _occluders.size() << endl;
+  }
+
+ protected:
+
+  /*! Core of castRay and castInfiniteRay, find occluders
+   *  along the given ray
+   */
+  inline void castRayInternal(GridVisitor& visitor) {
+    Cell* current_cell = NULL;
+    do {
+      current_cell = getCell(_current_cell);
+      if (current_cell){
+          visitor.discoverCell(current_cell);
+          OccludersSet& occluders = current_cell->getOccluders(); // FIXME: I had forgotten the ref &
+          for (OccludersSet::iterator it = occluders.begin();
+              it != occluders.end();
+              it++) {
+                  if ((unsigned)(*it)->userdata2 != _timestamp) {
+                      (*it)->userdata2 = (void*)_timestamp;
+                      visitor.examineOccluder(*it);
+                  }
+              }
+          visitor.finishCell(current_cell);
+      }
+    } while ((!visitor.stop()) && (nextRayCell(_current_cell, _current_cell)));
+  }
+
+ 
+  /*! returns the  cell next to the cell
+   *  passed as argument.
+   */
+  bool nextRayCell(Vec3u& current_cell, Vec3u& next_cell);
+
+  unsigned	_timestamp;
+
+  Vec3u		_cells_nb;  // number of cells for x,y,z axis
+  Vec3r		_cell_size; // cell x,y,z dimensions
+  Vec3r		_size;      // grid x,y,x dimensions
+  Vec3r		_orig;      // grid origin
+
+  Vec3r		_ray_dir;      // direction vector for the ray
+  Vec3u		_current_cell; // The current cell being processed (designated by its 3 coordinates)
+  Vec3r		_pt;           // Points corresponding to the incoming and outgoing intersections
+                               // of one cell with the ray
+  real		_t_end;        // To know when we are at the end of the ray
+  real		_t;
+
+  //OccludersSet _ray_occluders; // Set storing the occluders contained in the cells traversed by a ray
+  OccludersSet _occluders;     // List of all occluders inserted in the grid
+};
+
+#endif // GRID_H
diff --git a/extern/freestyle/src/geometry/HashGrid.cpp b/extern/freestyle/src/geometry/HashGrid.cpp
new file mode 100755
index 00000000000..3cf845d57ef
--- /dev/null
+++ b/extern/freestyle/src/geometry/HashGrid.cpp
@@ -0,0 +1,41 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "HashGrid.h"
+
+void HashGrid::clear()
+{
+  if(!_cells.empty()) {
+    for(GridHashTable::iterator it = _cells.begin();
+	it !=_cells.end();
+	it++) {
+      Cell* cell = (*it).second;
+      delete cell;
+    }
+    _cells.clear();
+  }
+
+  Grid::clear();
+}
+
+void HashGrid::configure(const Vec3r& orig, const Vec3r& size, unsigned nb) {
+  Grid::configure(orig, size, nb);
+}
diff --git a/extern/freestyle/src/geometry/HashGrid.h b/extern/freestyle/src/geometry/HashGrid.h
new file mode 100755
index 00000000000..f6605957676
--- /dev/null
+++ b/extern/freestyle/src/geometry/HashGrid.h
@@ -0,0 +1,109 @@
+//
+//  Filename         : HashGrid.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Class to define a cell grid surrounding the
+//                     bounding box of the scene
+//  Date of creation : 30/07/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  HASHGRID_H
+# define HASHGRID_H
+
+//# if defined(__GNUC__) && (__GNUC__ >= 3)
+// hash_map is not part of the C++ standard anymore;
+// hash_map.h has been kept though for backward compatibility
+//#  include <hash_map.h>
+//# else
+//#  include <hash_map>
+//# endif
+
+# include "Grid.h"
+# include <map>
+/*! Defines a hash table used for searching the Cells */
+struct GridHasher{
+#define _MUL 950706376UL
+#define _MOD 2147483647UL
+  inline size_t operator() (const Vec3u& p) const 
+  {
+    size_t res = ((unsigned long) (p[0] * _MUL)) % _MOD;
+    res = ((res + (unsigned long) (p[1]) * _MUL)) % _MOD;
+    return ((res +(unsigned long) (p[2]) * _MUL)) % _MOD;
+  }
+};
+
+/*! Class to define a regular grid used for ray
+  casting computations */
+
+class LIB_GEOMETRY_EXPORT HashGrid : public Grid
+{
+ public:
+
+  typedef map<Vec3u, Cell*> GridHashTable;
+  
+  HashGrid() : Grid() {}
+
+  virtual ~HashGrid() {
+    clear();
+  }
+
+  /*! clears the grid
+   *  Deletes all the cells, clears the hashtable,
+   *  resets size, size of cell, number of cells.
+   */
+  virtual void clear();
+
+  /*! Sets the different parameters of the grid
+   *    orig
+   *      The grid origin
+   *    size
+   *      The grid's dimensions
+   *    nb
+   *      The number of cells of the grid
+   */
+  virtual void configure(const Vec3r& orig, const Vec3r& size, unsigned nb);
+  
+  /*! returns the cell whose coordinates
+   *  are pased as argument
+   */
+  virtual Cell* getCell(const Vec3u& p) {
+    Cell* found_cell = NULL;
+    
+    GridHashTable::const_iterator found = _cells.find(p);
+    if (found != _cells.end())
+      found_cell = (*found).second;
+    return found_cell;
+  }
+  
+  /*! Fills the case p with the cell iCell */
+  virtual void fillCell(const Vec3u& p, Cell& cell) {
+    _cells[p] = &cell;
+  }
+
+protected:
+
+  GridHashTable _cells;
+};
+
+#endif // HASHGRID_H
diff --git a/extern/freestyle/src/geometry/Noise.cpp b/extern/freestyle/src/geometry/Noise.cpp
new file mode 100755
index 00000000000..396fc3bbb47
--- /dev/null
+++ b/extern/freestyle/src/geometry/Noise.cpp
@@ -0,0 +1,264 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "Noise.h"
+# include <stdlib.h>
+# include <stdio.h>
+# include <math.h>
+#include <time.h>
+
+#define MINX		-1000000
+#define MINY		MINX
+#define MINZ		MINX
+#define SCURVE(a) ((a)*(a)*(3.0-2.0*(a)))
+#define REALSCALE ( 2.0 / 65536.0 )
+#define NREALSCALE ( 2.0 / 4096.0 )
+#define HASH3D(a,b,c) hashTable[hashTable[hashTable[(a) & 0xfff] ^ ((b) & 0xfff)] ^ ((c) & 0xfff)]
+#define HASH(a,b,c) (xtab[(xtab[(xtab[(a) & 0xff] ^ (b)) & 0xff] ^ (c)) & 0xff] & 0xff)
+#define INCRSUM(m,s,x,y,z)	((s)*(RTable[m]*0.5		\
+					+ RTable[m+1]*(x)	\
+					+ RTable[m+2]*(y)	\
+					+ RTable[m+3]*(z)))
+#define MAXSIZE		500
+#define nrand()		((float)rand()/(float)RAND_MAX)
+#define seednrand(x)	srand(x*RAND_MAX)
+
+#define BM 0xff
+
+#define N 0x1000
+#define NP 12   /* 2^N */
+#define NM 0xfff
+
+#define s_curve(t) ( t * t * (3. - 2. * t) )
+
+#define lerp(t, a, b) ( a + t * (b - a) )
+
+#define setup(i,b0,b1,r0,r1)\
+	t = i + N;\
+	b0 = ((int)t) & BM;\
+	b1 = (b0+1) & BM;\
+	r0 = t - (int)t;\
+	r1 = r0 - 1.;
+
+void normalize2(float v[2])
+{
+  float s;
+
+  s = sqrt(v[0] * v[0] + v[1] * v[1]);
+  v[0] = v[0] / s;
+  v[1] = v[1] / s;
+}
+
+void normalize3(float v[3])
+{
+  float s;
+
+  s = sqrt(v[0] * v[0] + v[1] * v[1] + v[2] * v[2]);
+  v[0] = v[0] / s;
+  v[1] = v[1] / s;
+  v[2] = v[2] / s;
+}
+
+float Noise::turbulence1(float arg, float freq, float amp, unsigned oct)
+{
+  float t;
+  float vec;
+  
+  for (t = 0; oct > 0 && freq > 0; freq *= 2, amp /= 2, --oct) 
+    {
+      vec = freq * arg;
+      t += smoothNoise1(vec) * amp;
+    }
+  return t;
+}
+
+float Noise::turbulence2(Vec2f& v, float freq, float amp, unsigned oct)
+{
+  float t;
+  Vec2f vec;
+  
+  for (t = 0; oct > 0 && freq > 0; freq *= 2, amp /= 2, --oct) 
+    {
+      vec.x() = freq * v.x();
+      vec.y() = freq * v.y();
+      t += smoothNoise2(vec) * amp;
+    }
+  return t;
+}
+
+float Noise::turbulence3(Vec3f& v, float freq, float amp, unsigned oct)
+{
+  float t;
+  Vec3f vec;
+  
+  for (t = 0; oct > 0 && freq > 0; freq *= 2, amp /= 2, --oct) 
+    {
+      vec.x() = freq * v.x();
+      vec.y() = freq * v.y();
+      vec.z() = freq * v.z();
+      t += smoothNoise3(vec) * amp;
+    }
+  return t;
+}
+
+// Noise functions over 1, 2, and 3 dimensions
+
+float Noise::smoothNoise1(float arg)
+{
+  int bx0, bx1;
+  float rx0, rx1, sx, t, u, v, vec;
+
+  vec = arg;
+  setup(vec, bx0,bx1, rx0,rx1);
+
+  sx = s_curve(rx0);
+
+  u = rx0 * g1[ p[ bx0 ] ];
+  v = rx1 * g1[ p[ bx1 ] ];
+
+  return lerp(sx, u, v);
+}
+
+float Noise::smoothNoise2(Vec2f& vec)
+{
+  int bx0, bx1, by0, by1, b00, b10, b01, b11;
+  float rx0, rx1, ry0, ry1, *q, sx, sy, a, b, t, u, v;
+  register int i, j;
+
+  setup(vec.x(), bx0,bx1, rx0,rx1);
+  setup(vec.y(), by0,by1, ry0,ry1);
+
+  i = p[ bx0 ];
+  j = p[ bx1 ];
+
+  b00 = p[ i + by0 ];
+  b10 = p[ j + by0 ];
+  b01 = p[ i + by1 ];
+  b11 = p[ j + by1 ];
+
+  sx = s_curve(rx0);
+  sy = s_curve(ry0);
+
+#define at2(rx,ry) ( rx * q[0] + ry * q[1] )
+
+  q = g2[ b00 ] ; u = at2(rx0,ry0);
+  q = g2[ b10 ] ; v = at2(rx1,ry0);
+  a = lerp(sx, u, v);
+
+  q = g2[ b01 ] ; u = at2(rx0,ry1);
+  q = g2[ b11 ] ; v = at2(rx1,ry1);
+  b = lerp(sx, u, v);
+
+  return lerp(sy, a, b);
+}
+
+float Noise::smoothNoise3(Vec3f& vec)
+{
+  int bx0, bx1, by0, by1, bz0, bz1, b00, b10, b01, b11;
+  float rx0, rx1, ry0, ry1, rz0, rz1, *q, sy, sz, a, b, c, d, t, u, v;
+  register int i, j;
+
+  setup(vec.x(), bx0,bx1, rx0,rx1);
+  setup(vec.y(), by0,by1, ry0,ry1);
+  setup(vec.z(), bz0,bz1, rz0,rz1);
+
+  i = p[ bx0 ];
+  j = p[ bx1 ];
+
+  b00 = p[ i + by0 ];
+  b10 = p[ j + by0 ];
+  b01 = p[ i + by1 ];
+  b11 = p[ j + by1 ];
+
+  t  = s_curve(rx0);
+  sy = s_curve(ry0);
+  sz = s_curve(rz0);
+
+#define at3(rx,ry,rz) ( rx * q[0] + ry * q[1] + rz * q[2] )
+
+  q = g3[ b00 + bz0 ] ;
+  u = at3(rx0,ry0,rz0);
+  q = g3[ b10 + bz0 ] ;
+  v = at3(rx1,ry0,rz0);
+  a = lerp(t, u, v);
+
+  q = g3[ b01 + bz0 ] ;
+  u = at3(rx0,ry1,rz0);
+  q = g3[ b11 + bz0 ] ;
+  v = at3(rx1,ry1,rz0);
+  b = lerp(t, u, v);
+
+  c = lerp(sy, a, b);
+
+  q = g3[ b00 + bz1 ] ;
+  u = at3(rx0,ry0,rz1);
+  q = g3[ b10 + bz1 ] ;
+  v = at3(rx1,ry0,rz1);
+  a = lerp(t, u, v);
+
+  q = g3[ b01 + bz1 ] ;
+  u = at3(rx0,ry1,rz1);
+  q = g3[ b11 + bz1 ] ;
+  v = at3(rx1,ry1,rz1);
+  b = lerp(t, u, v);
+
+  d = lerp(sy, a, b);
+
+  return lerp(sz, c, d);
+}
+
+Noise::Noise()
+{
+  int i, j, k;
+  
+  seednrand(time(NULL));
+  for (i = 0 ; i < _Noise_B_ ; i++) 
+    {
+      p[i] = i;
+
+      g1[i] = (float)((rand() % (_Noise_B_ + _Noise_B_)) - _Noise_B_) / _Noise_B_;
+
+      for (j = 0 ; j < 2 ; j++)
+	g2[i][j] = (float)((rand() % (_Noise_B_ + _Noise_B_)) - _Noise_B_) / _Noise_B_;
+      normalize2(g2[i]);
+
+      for (j = 0 ; j < 3 ; j++)
+	g3[i][j] = (float)((rand() % (_Noise_B_ + _Noise_B_)) - _Noise_B_) / _Noise_B_;
+      normalize3(g3[i]);
+    }
+
+  while (--i) 
+    {
+      k = p[i];
+      p[i] = p[j = rand() % _Noise_B_];
+      p[j] = k;
+    }
+
+  for (i = 0 ; i < _Noise_B_ + 2 ; i++) 
+    {
+      p[_Noise_B_ + i] = p[i];
+      g1[_Noise_B_ + i] = g1[i];
+      for (j = 0 ; j < 2 ; j++)
+	g2[_Noise_B_ + i][j] = g2[i][j];
+      for (j = 0 ; j < 3 ; j++)
+	g3[_Noise_B_ + i][j] = g3[i][j];
+    }
+}
diff --git a/extern/freestyle/src/geometry/Noise.h b/extern/freestyle/src/geometry/Noise.h
new file mode 100755
index 00000000000..00cebbb451e
--- /dev/null
+++ b/extern/freestyle/src/geometry/Noise.h
@@ -0,0 +1,77 @@
+//
+//  Filename         : Noise.h
+//  Author(s)        : Emmanuel Turquin
+//  Purpose          : Class to define Perlin noise
+//  Date of creation : 12/01/2004
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef NOISE_H
+# define NOISE_H
+
+
+# include "../system/FreestyleConfig.h"
+# include "Geom.h"
+
+#define _Noise_B_ 0x100
+
+using namespace Geometry;
+using namespace std;
+
+/*! Class to provide Perlin Noise functionalities */
+class LIB_GEOMETRY_EXPORT Noise
+{
+ public:
+
+  /*! Builds a Noise object */
+  Noise();
+  /*! Destructor */
+  ~Noise() {}
+
+  /*! Returns a noise value for a 1D element */
+  float turbulence1(float arg, float freq, float amp, unsigned oct = 4);
+
+  /*! Returns a noise value for a 2D element */
+  float turbulence2(Vec2f& v, float freq, float amp, unsigned oct = 4);
+
+  /*! Returns a noise value for a 3D element */
+  float turbulence3(Vec3f& v, float freq, float amp, unsigned oct = 4);
+
+  /*! Returns a smooth noise value for a 1D element */
+  float smoothNoise1(float arg);
+  /*! Returns a smooth noise value for a 2D element */
+  float smoothNoise2(Vec2f& vec);
+  /*! Returns a smooth noise value for a 3D element */
+  float smoothNoise3(Vec3f& vec);
+
+ private:
+
+  int p[ _Noise_B_ + _Noise_B_ + 2];
+  float g3[ _Noise_B_ + _Noise_B_ + 2][3];
+  float g2[ _Noise_B_ + _Noise_B_ + 2][2];
+  float g1[ _Noise_B_ + _Noise_B_ + 2];
+  int start;
+};
+
+#endif // NOISE_H
diff --git a/extern/freestyle/src/geometry/Polygon.h b/extern/freestyle/src/geometry/Polygon.h
new file mode 100755
index 00000000000..f9c4c78d424
--- /dev/null
+++ b/extern/freestyle/src/geometry/Polygon.h
@@ -0,0 +1,215 @@
+//
+//  Filename         : Polygon.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Class to define a polygon
+//  Date of creation : 30/07/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  POLYGON_H
+# define POLYGON_H
+
+# include <vector>
+# include "Geom.h"
+# include "GeomUtils.h"
+
+using namespace std;
+
+namespace Geometry {
+
+template <class Point>
+class Polygon
+{
+ public:
+
+  inline Polygon() {
+    _id = 0;
+    userdata = 0;
+    userdata2 = 0;
+  }
+
+  inline Polygon(const vector<Point>& vertices) {
+    _vertices = vertices;
+    computeBBox();
+    _id = 0;
+    userdata = 0;
+    userdata2 = 0;
+  }
+
+  inline Polygon(const Polygon<Point>& poly) {
+    Point p;
+    for(typename vector<Point>::const_iterator it = poly.getVertices().begin();
+	it != poly.getVertices().end();
+	it++) {
+      p = *it;
+      _vertices.push_back(p);
+    }
+
+    _id = poly.getId();
+    poly.getBBox(_min, _max);
+    userdata = 0;
+    userdata2 = 0;
+  }
+  
+  virtual ~Polygon() {}
+
+  //
+  // Accessors
+  //
+  /////////////////////////////////////////////////////////////////////////////
+
+  inline const vector<Point>& getVertices() const {
+    return _vertices;
+  }
+
+  inline void getBBox(Point& min, Point& max) const {
+    min = _min;
+    max = _max;
+  }
+
+  inline Point& getBBoxCenter()
+  {
+    Point result;
+    result = (_min + _max) / 2;
+    return result;
+  }
+
+  inline Point& getCenter() {
+    Point result;
+    for (typename vector<Point>::iterator it = _vertices.begin();
+	 it != _vertices.end();
+	 it++)
+      result += *it;
+    result /= _vertices.size();
+    return result;
+  }
+
+  inline unsigned getId() const {
+    return _id;
+  }
+
+  //
+  // Modifiers
+  //
+  /////////////////////////////////////////////////////////////////////////////
+
+  inline void setVertices(const vector<Point>& vertices) {
+    _vertices.clear();
+    Point p;
+    for (typename vector<Point>::const_iterator it = vertices.begin();
+	 it != vertices.end();
+	 it++) {
+      p = *it;
+      _vertices.push_back(p);
+    }
+    computeBBox();
+  }
+
+  inline void setId(unsigned id) {
+    _id = id;
+  }
+
+  //
+  // Other methods
+  //
+  /////////////////////////////////////////////////////////////////////////////
+
+  inline void computeBBox() {
+    if(_vertices.empty())
+      return;
+    
+    _max = _vertices[0];
+    _min = _vertices[0];
+
+    for(typename vector<Point>::iterator it = _vertices.begin();
+	it != _vertices.end();
+        it++) {
+      for(unsigned i = 0; i < Point::dim(); i++) {
+	if((*it)[i] > _max[i])
+	  _max[i] = (*it)[i];
+	if((*it)[i] < _min[i])
+	  _min[i] = (*it)[i];
+      }
+    }
+  }
+  
+  // FIXME Is it possible to get rid of userdatas ?
+  void* userdata;
+  void* userdata2; // Used during ray casting
+  
+ protected:
+  
+  vector<Point>	_vertices;
+  Point		_min;
+  Point		_max;
+  unsigned	_id;
+};
+
+
+//
+// Polygon3r class
+//
+///////////////////////////////////////////////////////////////////////////////
+
+class Polygon3r : public Polygon<Vec3r>
+{
+ public:
+
+  inline Polygon3r() : Polygon<Vec3r>() {}
+
+  inline Polygon3r(const vector<Vec3r>& vertices,
+		   const Vec3r& normal) : Polygon<Vec3r>(vertices) {
+    setNormal(normal);
+  }
+
+  inline Polygon3r(const Polygon3r& poly) : Polygon<Vec3r>(poly) {}
+  
+  virtual ~Polygon3r() {}
+
+  void setNormal(const Vec3r& normal) {
+    _normal = normal;
+  }
+
+  Vec3r getNormal() const {
+    return _normal;
+  }
+
+  /*! Check whether the Polygon intersects with the ray or not */
+  inline bool rayIntersect(Vec3r& orig, Vec3r& dir,
+			   real& t, real& u, real& v, real epsilon = M_EPSILON) {
+    //    if (_vertices.size() < 3)
+    //      return false;
+    return GeomUtils::intersectRayTriangle(orig, dir,
+					   _vertices[0], _vertices[1], _vertices[2],
+					   t, u, v, epsilon);
+  }
+
+ private:
+
+  Vec3r	_normal;
+};
+
+} // end of namespace Geometry
+
+#endif // POLYGON_H
diff --git a/extern/freestyle/src/geometry/SweepLine.h b/extern/freestyle/src/geometry/SweepLine.h
new file mode 100755
index 00000000000..e3fb4ad8c0c
--- /dev/null
+++ b/extern/freestyle/src/geometry/SweepLine.h
@@ -0,0 +1,334 @@
+//
+//  Filename         : SweepLine.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Class to define a Sweep Line
+//  Date of creation : 29/08/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  SWEEPLINE_H
+# define SWEEPLINE_H
+
+# include <list>
+# include <vector>
+
+/*! Class to define the intersection berween two segments*/
+template<class Edge>
+class Intersection
+{
+public:
+
+  template<class EdgeClass>
+  Intersection(EdgeClass* eA, real ta, EdgeClass* eB, real tb)
+  {
+    EdgeA = eA;
+    EdgeB = eB;
+    tA = ta;
+    tB = tb;
+    userdata = 0;
+  }
+
+  Intersection(const Intersection& iBrother)
+  {
+    EdgeA = iBrother.EdgeA;
+    EdgeB = iBrother.EdgeB;
+    tA = iBrother.tA;
+    tB = iBrother.tB;
+    userdata = 0;
+  }
+
+  /*! returns the parameter giving the 
+   *  intersection, for the edge iEdge 
+   */
+  real getParameter(Edge *iEdge) 
+  {
+    if(iEdge == EdgeA)
+      return tA;
+    if(iEdge == EdgeB)
+      return tB;
+    return 0;
+  }
+
+public:
+  void * userdata; // FIXME
+
+  Edge *EdgeA; // first segment
+  Edge *EdgeB; // second segment
+  real tA; // parameter defining the intersection point with respect to the segment EdgeA.
+  real tB; // parameter defining the intersection point with respect to the segment EdgeB.
+};
+
+
+
+
+
+
+
+
+template<class T, class Point>
+class Segment
+{
+  public:
+    Segment()
+    {
+    }
+    Segment(T& s, const Point& iA, const Point& iB) 
+    {
+      _edge = s;
+      if(iA < iB)
+      {
+        A = iA;
+        B = iB;
+        _order = true;
+      }
+      else
+      {
+        A = iB;
+        B = iA;
+        _order = false;
+      }
+    }
+
+    Segment(Segment<T,Point>& iBrother)
+    {
+      _edge = iBrother.edge();
+      A = iBrother.A;
+      B = iBrother.B;
+      _Intersections = iBrother._Intersections;
+      _order = iBrother._order;
+    }
+
+    Segment(const Segment<T,Point>& iBrother)
+    {
+      _edge = iBrother._edge;
+      A = iBrother.A;
+      B = iBrother.B;
+      _Intersections = iBrother._Intersections;
+      _order = iBrother._order;
+    }
+
+    ~Segment() {
+      _Intersections.clear();
+    }
+
+    inline Point operator[](const unsigned short int& i) const
+    {
+      return i%2==0 ? A : B;
+    }
+
+    inline bool operator==(const Segment<T,Point>& iBrother)
+    {
+      if(_edge == iBrother._edge)
+        return true;
+
+      return false;
+    }
+  
+    /* Adds an intersection for this segment */
+    inline void AddIntersection(Intersection<Segment<T,Point> > *i) {_Intersections.push_back(i);}
+
+    /*! Checks for a common vertex with another edge */
+    inline bool CommonVertex(const Segment<T,Point>& S, Point& CP)
+    {
+      if((A == S[0]) || (A == S[1]))
+      {
+        CP = A;
+        return true;
+      }
+      if((B == S[0]) || (B == S[1]))
+      {
+        CP = B;
+        return true;
+      }
+
+      return false;
+    }
+
+    inline vector<Intersection<Segment<T,Point> >*>& intersections() {return _Intersections;}
+    inline bool order() {return _order;}
+    inline T& edge() {return _edge;}
+
+  private:
+    T _edge;
+    Point A;
+    Point B;
+    std::vector<Intersection<Segment<T,Point> >*> _Intersections; // list of intersections parameters
+    bool _order; // true if A and B are in the same order than _edge.A and _edge.B. false otherwise.
+};
+
+/*! defines a binary function that can be overload 
+ *  by the user to specify at each condition 
+ *  the intersection between 2 edges must be computed
+ */
+template<class T1, class T2>
+struct binary_rule 
+{
+  binary_rule() {}
+  template<class T3,class T4>
+  binary_rule(const binary_rule<T3,T4>& brother) {}
+  virtual ~binary_rule() {}
+
+  virtual bool operator()(T1&, T2&)
+  {
+    return true;
+  }
+};
+
+
+template<class T,class Point>
+class SweepLine 
+{
+public:
+
+  SweepLine() {}
+  ~SweepLine() 
+  {
+    for(typename vector<Intersection<Segment<T,Point> >*>::iterator i=_Intersections.begin(),iend=_Intersections.end();
+    i!=iend;
+    i++)
+    {
+      delete (*i);
+    }
+    _Intersections.clear();
+
+    for(typename vector<Segment<T,Point>* >::iterator ie=_IntersectedEdges.begin(),ieend=_IntersectedEdges.end();
+    ie!=ieend;
+    ie++)
+    {
+      delete (*ie);
+    }
+    _IntersectedEdges.clear();
+
+    _set.clear();
+  }
+
+  
+  inline void process(Point& p, 
+                      vector<Segment<T,Point>*>& segments, 
+                      binary_rule<Segment<T,Point>,Segment<T,Point> >& binrule
+                      //binary_rule<Segment<T,Point>,Segment<T,Point> >& binrule = binary_rule<Segment<T,Point>,Segment<T,Point> >()
+                      ) 
+  {
+    // first we remove the segments that need to be removed and then 
+    // we add the segments to add
+    vector<Segment<T,Point>*> toadd;
+    typename vector<Segment<T,Point>*>::iterator s, send;
+    for(s=segments.begin(), send=segments.end();
+    s!=send;
+    s++)
+    {
+       if(p == (*(*s))[0])
+        toadd.push_back((*s));
+      else
+        remove((*s));
+    }
+    for(s=toadd.begin(), send=toadd.end();
+    s!=send;
+    s++)
+    {
+      add((*s), binrule);
+    }
+  }
+  
+  inline void add(Segment<T,Point>* S,
+                  binary_rule<Segment<T,Point>,Segment<T,Point> >& binrule
+                  //binary_rule<Segment<T,Point>,Segment<T,Point> >& binrule = binary_rule<Segment<T,Point>, Segment<T,Point> >()
+                  )
+  {
+    real t,u;
+    Point CP;
+    Vec2r v0, v1, v2, v3;
+    if(true == S->order())
+    {
+      v0[0] = ((*S)[0])[0];
+      v0[1] = ((*S)[0])[1];
+      v1[0] = ((*S)[1])[0];
+      v1[1] = ((*S)[1])[1];
+    }
+    else
+    {
+      v1[0] = ((*S)[0])[0];
+      v1[1] = ((*S)[0])[1];
+      v0[0] = ((*S)[1])[0];
+      v0[1] = ((*S)[1])[1];
+    }
+    for(typename std::list<Segment<T,Point>* >::iterator s=_set.begin(), send=_set.end();
+    s!=send;
+    s++)
+    {
+      Segment<T,Point>* currentS = (*s);
+      if(true != binrule(*S, *currentS))
+        continue;
+
+      if(true == currentS->order())
+      {
+        v2[0] = ((*currentS)[0])[0];
+	v2[1] = ((*currentS)[0])[1];
+        v3[0] = ((*currentS)[1])[0];
+	v3[1] = ((*currentS)[1])[1];
+      }
+      else
+      {
+        v3[0] = ((*currentS)[0])[0];
+	v3[1] = ((*currentS)[0])[1];
+        v2[0] = ((*currentS)[1])[0];
+	v2[1] = ((*currentS)[1])[1];
+      }
+      if(S->CommonVertex(*currentS, CP))
+        continue; // the two edges have a common vertex->no need to check
+      
+      if(GeomUtils::intersect2dSeg2dSegParametric(v0, v1, v2, v3, t, u))
+      {
+        // create the intersection
+        Intersection<Segment<T,Point> > * inter = new Intersection<Segment<T,Point> >(S,t,currentS,u);
+        // add it to the intersections list
+        _Intersections.push_back(inter);
+        // add this intersection to the first edge intersections list
+        S->AddIntersection(inter);
+        // add this intersection to the second edge intersections list
+        currentS->AddIntersection(inter);        
+      }
+    }
+    // add the added segment to the list of active segments
+    _set.push_back(S);
+  }
+  
+  inline void remove(Segment<T,Point>* s) 
+  {
+    if(s->intersections().size() > 0)
+      _IntersectedEdges.push_back(s);
+    _set.remove(s);
+  }
+
+  vector<Segment<T,Point>* >& intersectedEdges() {return _IntersectedEdges;}
+  vector<Intersection<Segment<T,Point> >*>& intersections() {return _Intersections;}
+  
+
+private:
+  std::list<Segment<T,Point>* > _set; // set of active edges for a given position of the sweep line
+  std::vector<Segment<T,Point>* > _IntersectedEdges; // the list of intersected edges
+  std::vector<Intersection<Segment<T,Point> >*> _Intersections; // the list of all intersections.
+};
+
+#endif // SWEEPLINE_H
diff --git a/extern/freestyle/src/geometry/VecMat.h b/extern/freestyle/src/geometry/VecMat.h
new file mode 100755
index 00000000000..9bbec3b1349
--- /dev/null
+++ b/extern/freestyle/src/geometry/VecMat.h
@@ -0,0 +1,899 @@
+//
+//  Filename         : VecMat.h
+//  Author(s)        : Sylvain Paris
+//                     Emmanuel Turquin
+//                     Stephane Grabli 
+//  Purpose          : Vectors and Matrices definition and manipulation
+//  Date of creation : 12/06/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  VECMAT_H
+# define VECMAT_H
+
+# include <math.h>
+# include <vector>
+# include <iostream>
+
+namespace VecMat {
+
+  namespace Internal {
+
+    template <bool B>
+    struct is_false {};
+
+    template <>
+    struct is_false<false> {
+      static inline void ensure() {}
+    };
+
+  } // end of namespace Internal
+
+  //
+  //  Vector class
+  //    - T: value type
+  //    - N: dimension
+  //
+  /////////////////////////////////////////////////////////////////////////////
+
+  template <class T, unsigned N>
+  class Vec
+  {
+  public:
+
+    typedef T value_type;
+    
+    // constructors
+
+    inline Vec() {
+      for (unsigned i = 0; i < N; i++)
+	this->_coord[i] = 0;
+    }
+
+    ~Vec() {
+      Internal::is_false<(N == 0)>::ensure();
+    }
+
+    template <class U>
+    explicit inline Vec(const U tab[N]) {
+      for (unsigned i = 0; i < N; i++)
+	this->_coord[i] = (T)tab[i];
+    }
+
+    template <class U>
+    explicit inline Vec(const std::vector<U>& tab) {
+      for (unsigned i = 0; i < N; i++)
+	this->_coord[i] = (T)tab[i];
+    }
+
+    template <class U>
+    explicit inline Vec(const Vec<U, N>& v) {
+      for (unsigned i = 0; i < N; i++)
+        this->_coord[i] = (T)v[i];
+    }
+
+    // accessors
+
+    inline value_type  operator[](const unsigned i) const {
+      return this->_coord[i];
+    }
+
+    inline value_type& operator[](const unsigned i) {
+      return this->_coord[i];
+    }
+
+    static inline unsigned dim() {
+      return N;
+    }
+    
+    // various useful methods
+
+    inline value_type norm() const {
+      return (T)sqrt((float)squareNorm());
+    }
+
+    inline value_type squareNorm() const {
+      return (*this) * (*this);
+    }
+
+    inline Vec<T, N>& normalize() {
+      value_type n = norm();
+      for (unsigned i = 0; i < N; i++)
+	this->_coord[i] /= n;
+      return *this;
+    }
+
+    inline Vec<T, N>& normalizeSafe() {
+      value_type n = norm();
+      if (n)
+	for (unsigned i=0; i < N; i++)
+	  this->_coord[i] /= n;
+      return *this;
+    }
+
+    // classical operators
+    inline Vec<T, N> operator+(const Vec<T, N>& v) const{
+    Vec<T, N> res(v);
+    res += *this;
+    return res;
+    } 
+
+    inline Vec<T, N> operator-(const Vec<T,N>& v) const{
+    Vec<T, N> res(*this);
+    res -= v;
+    return res;
+    } 
+
+    inline Vec<T, N> operator*(const typename Vec<T,N>::value_type r) const{
+    Vec<T, N> res(*this);
+    res *= r;
+    return res;
+    } 
+
+    inline Vec<T, N> operator/(const typename Vec<T,N>::value_type r) const{
+    Vec<T, N> res(*this);
+    if (r)
+      res /= r;
+    return res;
+    } 
+
+    // dot product
+    inline value_type operator*(const Vec<T, N>& v) const{
+    value_type sum = 0;
+    for (unsigned i = 0; i < N; i++)
+      sum += (*this)[i] * v[i];
+    return sum;
+    } 
+    
+    template <class U>
+    inline Vec<T, N>& operator=(const Vec<U, N>& v) {
+      if (this != &v)
+	for (unsigned i = 0; i < N; i++)
+	  this->_coord[i] = (T)v[i];
+      return *this;
+    }
+
+    template <class U>
+    inline Vec<T, N>& operator+=(const Vec<U, N>& v) {
+      for (unsigned i = 0 ; i < N; i++)
+	this->_coord[i] += (T)v[i];
+      return *this;
+    }
+
+    template <class U>
+    inline Vec<T, N>& operator-=(const Vec<U, N>& v) {
+      for (unsigned i = 0 ; i < N; i++)
+	this->_coord[i] -= (T)v[i];
+      return *this;
+    }
+
+    template <class U>
+    inline Vec<T, N>& operator*=(const U r) {
+      for (unsigned i = 0 ; i < N; i++)
+	this->_coord[i] *= r;
+      return *this;
+    }
+
+    template <class U>
+    inline Vec<T, N>& operator/=(const U r) {
+      if (r)
+	for (unsigned i = 0 ; i < N; i++)
+	  this->_coord[i] /= r;
+      return *this;
+    }
+
+
+    inline bool operator==(const Vec<T, N>& v) const {
+      for(unsigned i = 0; i < N; i++)
+	if (this->_coord[i] != v[i])
+	  return false;
+      return true;
+    }
+
+    inline bool operator!=(const Vec<T, N>& v) const {
+      for(unsigned i = 0; i < N; i++)
+	if (this->_coord[i] != v[i])
+	  return true;
+      return false;
+    }
+
+    inline bool operator<(const Vec<T, N>& v) const {
+      for (unsigned i = 0; i<N; i++) {
+	if (this->_coord[i] < v[i])
+	  return true;
+	if (this->_coord[i] > v[i])
+	  return false;
+	if (this->_coord[i] == v[i])
+	  continue;
+      }
+      return false;  
+    }
+
+    inline bool operator>(const Vec<T, N>& v) const {
+      for (unsigned i=0; i<N; i++) {
+	if(this->_coord[i] > v[i])
+	  return true;
+	if(this->_coord[i] < v[i])
+	  return false;
+	if(this->_coord[i] == v[i])
+	  continue;
+      }
+      return false;  
+    }
+
+  protected:
+
+    value_type _coord[N];
+    enum {
+      _dim = N,
+    };
+  };
+
+
+  //
+  //  Vec2 class (2D Vector)
+  //    - T: value type
+  //
+  /////////////////////////////////////////////////////////////////////////////
+
+  template <class T>
+  class Vec2 : public Vec<T, 2>
+  {
+  public:
+
+    typedef typename Vec<T, 2>::value_type value_type;
+
+    inline Vec2() : Vec<T, 2>() {}
+
+    template <class U>
+    explicit inline Vec2(const U tab[2]) : Vec<T, 2>(tab) {}
+
+    template <class U>
+    explicit inline Vec2(const std::vector<U>& tab) : Vec<T, 2>(tab) {}
+
+    template <class U>
+    inline Vec2(const Vec<U, 2>& v) : Vec<T, 2>(v) {}
+
+    inline Vec2(const value_type x,
+		const value_type y = 0) : Vec<T, 2>() {
+      this->_coord[0] = (T)x;
+      this->_coord[1] = (T)y;
+    }
+    
+    inline value_type x() const {
+      return this->_coord[0];
+    }
+
+    inline value_type& x() {
+      return this->_coord[0];
+    }
+
+    inline value_type y() const {
+      return this->_coord[1];
+    }
+
+    inline value_type& y() {
+      return this->_coord[1];
+    }
+
+    inline void setX(const value_type v) {
+      this->_coord[0] = v;
+    }
+
+    inline void setY(const value_type v) {
+      this->_coord[1] = v;
+    }
+
+    // FIXME: hack swig -- no choice
+    inline Vec2<T> operator+(const Vec2<T>& v) const{
+    Vec2<T> res(v);
+    res += *this;
+    return res;
+    } 
+
+    inline Vec2<T> operator-(const Vec2<T>& v) const{
+    Vec2<T> res(*this);
+    res -= v;
+    return res;
+    } 
+
+    inline Vec2<T> operator*(const value_type r) const{
+    Vec2<T> res(*this);
+    res *= r;
+    return res;
+    } 
+
+    inline Vec2<T> operator/(const value_type r) const{
+    Vec2<T> res(*this);
+    if (r)
+      res /= r;
+    return res;
+    } 
+
+    // dot product
+    inline value_type operator*(const Vec2<T>& v) const{
+    value_type sum = 0;
+    for (unsigned i = 0; i < 2; i++)
+      sum += (*this)[i] * v[i];
+    return sum;
+    } 
+  };
+
+
+  //
+  //  HVec3 class (3D Vector in homogeneous coordinates)
+  //    - T: value type
+  //
+  /////////////////////////////////////////////////////////////////////////////
+
+  template <class T>
+  class HVec3 : public Vec<T, 4>
+  {
+  public:
+
+    typedef typename Vec<T, 4>::value_type value_type;
+
+    inline HVec3() : Vec<T, 4>() {}
+
+    template <class U>
+    explicit inline HVec3(const U tab[4]) : Vec<T, 4>(tab) {}
+
+    template <class U>
+    explicit inline HVec3(const std::vector<U>& tab) : Vec<T, 4>(tab) {}
+
+    template<class U>
+    inline HVec3(const Vec<U, 4>& v) : Vec<T, 4>(v) {}
+  
+    inline HVec3(const value_type sx,
+		 const value_type sy = 0,
+		 const value_type sz = 0,
+		 const value_type s = 1) {
+      this->_coord[0] = sx;
+      this->_coord[1] = sy;
+      this->_coord[2] = sz;
+      this->_coord[3] = s;
+    }
+    
+    template <class U>
+    inline HVec3(const Vec<U, 3>& sv,
+		 const U s = 1) {
+      this->_coord[0] = (T)sv[0];
+      this->_coord[1] = (T)sv[1];
+      this->_coord[2] = (T)sv[2];
+      this->_coord[3] = (T)s;
+    }
+    
+    inline value_type sx() const {
+      return this->_coord[0];
+    }
+
+    inline value_type& sx() {
+      return this->_coord[0];
+    }
+
+    inline value_type sy() const {
+      return this->_coord[1];
+    }
+
+    inline value_type& sy() {
+      return this->_coord[1];
+    }
+
+    inline value_type sz() const {
+      return this->_coord[2];
+    }
+
+    inline value_type& sz() {
+      return this->_coord[2];
+    }
+
+    inline value_type s() const {
+      return this->_coord[3];
+    }
+
+    inline value_type& s() {
+      return this->_coord[3];
+    }
+
+    // Acces to non-homogeneous coordinates in 3D
+
+    inline value_type x() const {
+      return this->_coord[0] / this->_coord[3];
+    }
+
+    inline value_type y() const {
+      return this->_coord[1] / this->_coord[3];
+    }
+
+    inline value_type z() const {
+      return this->_coord[2] / this->_coord[3];
+    }
+  };
+
+
+  //
+  //  Vec3 class (3D Vec)
+  //    - T: value type
+  //
+  /////////////////////////////////////////////////////////////////////////////
+
+  template <class T>
+  class Vec3 : public Vec<T, 3>
+  {
+  public:
+    
+    typedef typename Vec<T, 3>::value_type value_type;
+
+    inline Vec3() : Vec<T, 3>() {}
+
+    template <class U>
+    explicit inline Vec3(const U tab[3]) : Vec<T, 3>(tab) {}
+
+    template <class U>
+    explicit inline Vec3(const std::vector<U>& tab) : Vec<T, 3>(tab) {}
+
+    template<class U>
+    inline Vec3(const Vec<U, 3>& v) : Vec<T, 3>(v) {}
+  
+    template<class U>
+      inline Vec3(const HVec3<U>& v) {
+      this->_coord[0] = (T)v.x();
+      this->_coord[1] = (T)v.y();
+      this->_coord[2] = (T)v.z();
+    }
+
+    inline Vec3(const value_type x,
+		const value_type y = 0,
+		const value_type z = 0) : Vec<T, 3>() {
+      this->_coord[0] = x;
+      this->_coord[1] = y;
+      this->_coord[2] = z;
+    }
+    
+    inline value_type x() const {
+      return this->_coord[0];
+    }
+
+    inline value_type& x() {
+      return this->_coord[0];
+    }
+
+    inline value_type y() const {
+      return this->_coord[1];
+    }
+
+    inline value_type& y() {
+      return this->_coord[1];
+    }
+
+    inline value_type z() const {
+      return this->_coord[2];
+    }
+
+    inline value_type& z() {
+      return this->_coord[2];
+    }
+
+    inline void setX(const value_type v) {
+      this->_coord[0] = v;
+    }
+
+    inline void setY(const value_type v) {
+      this->_coord[1] = v;
+    }
+
+    inline void setZ(const value_type v) {
+      this->_coord[2] = v;
+    }
+
+    // classical operators
+    // FIXME: hack swig -- no choice
+    inline Vec3<T> operator+(const Vec3<T>& v) const{
+    Vec3<T> res(v);
+    res += *this;
+    return res;
+    } 
+
+    inline Vec3<T> operator-(const Vec3<T>& v) const{
+    Vec3<T> res(*this);
+    res -= v;
+    return res;
+    } 
+
+    inline Vec3<T> operator*(const value_type r) const{
+    Vec3<T> res(*this);
+    res *= r;
+    return res;
+    } 
+
+    inline Vec3<T> operator/(const value_type r) const{
+    Vec3<T> res(*this);
+    if (r)
+      res /= r;
+    return res;
+    } 
+
+    // dot product
+    inline value_type operator*(const Vec3<T>& v) const{
+    value_type sum = 0;
+    for (unsigned i = 0; i < 3; i++)
+      sum += (*this)[i] * v[i];
+    return sum;
+    } 
+
+    // cross product for 3D Vectors
+    // FIXME: hack swig -- no choice
+    inline Vec3<T> operator^(const Vec3<T>& v) const{
+    Vec3<T> res((*this)[1] * v[2] - (*this)[2] * v[1],
+		(*this)[2] * v[0] - (*this)[0] * v[2],
+		(*this)[0] * v[1] - (*this)[1] * v[0]);
+    return res;
+    } 
+
+    // cross product for 3D Vectors
+    template <typename U>
+    inline Vec3<T> operator^(const Vec<U, 3>& v) const{
+    Vec3<T> res((*this)[1] * v[2] - (*this)[2] * v[1],
+		(*this)[2] * v[0] - (*this)[0] * v[2],
+		(*this)[0] * v[1] - (*this)[1] * v[0]);
+    return res;
+    } 
+  };
+
+
+  //
+  //  Matrix class
+  //    - T: value type
+  //    - M: rows
+  //    - N: cols
+  //
+  /////////////////////////////////////////////////////////////////////////////
+  
+  // Dirty, but icc under Windows needs this
+# define _SIZE (M * N)
+
+  template <class T, unsigned M, unsigned N>
+  class Matrix
+  {
+  public:
+
+    typedef T value_type;
+    
+    inline Matrix() {
+      for (unsigned i = 0; i < _SIZE; i++)
+	this->_coord[i] = 0;
+    }
+
+    ~Matrix() {
+      Internal::is_false<(M == 0)>::ensure();
+      Internal::is_false<(N == 0)>::ensure();
+    }
+
+    template <class U>
+    explicit inline Matrix(const U tab[_SIZE]) {
+      for (unsigned i = 0; i < _SIZE; i++)
+	this->_coord[i] = tab[i];
+    }
+
+    template <class U>
+    explicit inline Matrix(const std::vector<U>& tab) {
+      for (unsigned i = 0; i < _SIZE; i++)
+	this->_coord[i] = tab[i];
+    }
+
+    template <class U>
+    inline Matrix(const Matrix<U, M, N>& m) {
+      for (unsigned i = 0; i < M; i++)
+	for (unsigned j = 0; j < N; j++)
+	  this->_coord[i * N + j] = (T)m(i, j);
+    }
+
+    inline value_type operator()(const unsigned i, const unsigned j) const {
+      return this->_coord[i * N + j];
+    }
+
+    inline value_type& operator()(const unsigned i, const unsigned j) {
+      return this->_coord[i * N + j];
+    }
+
+    static inline unsigned rows() {
+      return M;
+    }
+
+    static inline unsigned cols() {
+      return N;
+    }
+
+    inline Matrix<T, M, N>& transpose() const {
+      Matrix<T, N, M> res;
+      for (unsigned i = 0; i < M; i++)
+	for (unsigned j = 0; j < N; j++)
+	  res(j,i) = this->_coord[i * N + j];
+      return res;
+    }
+
+    template <class U>
+    inline Matrix<T, M, N>& operator=(const Matrix<U, M, N>& m) {
+      if (this != &m)
+	for (unsigned i = 0; i < M; i++)
+	  for (unsigned j = 0; j < N; j++)
+	    this->_coord[i * N + j] = (T)m(i, j);
+      return *this;
+    }
+
+    template <class U>
+    inline Matrix<T, M, N>& operator+=(const Matrix<U, M, N>& m) {
+      for (unsigned i = 0; i < M; i++)
+	for (unsigned j = 0; j < N; j++)
+	  this->_coord[i * N + j] += (T)m(i, j);
+      return *this;
+    }
+
+    template <class U>
+    inline Matrix<T, M, N>& operator-=(const Matrix<U, M, N>& m) {
+      for (unsigned i = 0; i < M; i++)
+	for (unsigned j = 0; j < N; j++)
+	  this->_coord[i * N + j] -= (T)m(i, j);
+      return *this;
+    }
+
+    template <class U>
+    inline Matrix<T, M, N>& operator*=(const U lambda) {
+      for (unsigned i = 0; i < M; i++)
+	for (unsigned j = 0; j < N; j++)
+	  this->_coord[i * N + j] *= lambda;
+      return *this;
+    }
+
+    template <class U>
+    inline Matrix<T, M, N>& operator/=(const U lambda) {
+      if (lambda)
+	for (unsigned i = 0; i < M; i++)
+	  for (unsigned j = 0; j < N; j++)
+	    this->_coord[i * N + j] /= lambda;
+      return *this;
+    }
+
+  protected:
+
+    value_type _coord[_SIZE];
+  };
+
+
+  //
+  //  SquareMatrix class
+  //    - T: value type
+  //    - N: rows & cols
+  //
+  /////////////////////////////////////////////////////////////////////////////
+
+  // Dirty, but icc under Windows needs this
+# define __SIZE (N * N)
+
+  template <class T, unsigned N>
+  class SquareMatrix : public Matrix<T, N, N>
+  {
+  public:
+
+    typedef T value_type;
+  
+    inline SquareMatrix() : Matrix<T, N, N>() {}
+
+    template <class U>
+    explicit inline SquareMatrix(const U tab[__SIZE]) : Matrix<T, N, N>(tab) {}
+
+    template <class U>
+    explicit inline SquareMatrix(const std::vector<U>& tab) : Matrix<T, N, N>(tab) {}
+
+    template <class U>
+    inline SquareMatrix(const Matrix<U, N, N>& m) : Matrix<T, N, N>(m) {}
+
+    static inline SquareMatrix<T, N> identity() {
+      SquareMatrix<T, N> res;
+      for (unsigned i = 0; i < N; i++)
+	res(i, i) = 1;
+      return res;
+    }
+  };
+
+
+  //
+  // Vector external functions
+  //
+  /////////////////////////////////////////////////////////////////////////////
+
+  //  template <class T, unsigned N>
+  //  inline Vec<T, N> operator+(const Vec<T, N>& v1,
+  //				const Vec<T, N>& v2) {
+  //    Vec<T, N> res(v1);
+  //    res += v2;
+  //    return res;
+  //  }
+  //
+  //  template <class T, unsigned N>
+  //  inline Vec<T, N> operator-(const Vec<T, N>& v1,
+  //				const Vec<T, N>& v2) {
+  //    Vec<T, N> res(v1);
+  //    res -= v2;
+  //    return res;
+  //  }
+  //  template <class T, unsigned N>
+  //    inline Vec<T, N> operator*(const Vec<T, N>& v,
+  //				const typename Vec<T, N>::value_type r) {
+  //    Vec<T, N> res(v);
+  //    res *= r;
+  //    return res;
+  //  }
+  
+  template <class T, unsigned N>
+    inline Vec<T, N> operator*(const typename Vec<T, N>::value_type r,
+				const Vec<T, N>& v) {
+    Vec<T, N> res(v);
+    res *= r;
+    return res;
+  }
+  //
+  //  template <class T, unsigned N>
+  //  inline Vec<T, N> operator/(const Vec<T, N>& v,
+  //				const typename Vec<T, N>::value_type r) {
+  //    Vec<T, N> res(v);
+  //    if (r)
+  //      res /= r;
+  //    return res;
+  //  }
+  //
+  // dot product
+  //  template <class T, unsigned N>
+  //    inline typename Vec<T, N>::value_type operator*(const Vec<T, N>& v1,
+  //    const Vec<T, N>& v2) {
+  //    typename Vec<T, N>::value_type sum = 0;
+  //    for (unsigned i = 0; i < N; i++)
+  //      sum += v1[i] * v2[i];
+  //    return sum;
+  //  }
+  //
+  //  // cross product for 3D Vectors
+  //  template <typename T>
+  //  inline Vec3<T> operator^(const Vec<T, 3>& v1,
+  //			   const Vec<T, 3>& v2) {
+  //    Vec3<T> res(v1[1] * v2[2] - v1[2] * v2[1],
+  //		v1[2] * v2[0] - v1[0] * v2[2],
+  //		v1[0] * v2[1] - v1[1] * v2[0]);
+  //    return res;
+  //  }
+
+  // stream operator
+  template <class T, unsigned N>
+  inline std::ostream& operator<<(std::ostream& s,
+				  const Vec<T, N>& v) {
+    unsigned i;
+    s << "[";
+    for (i = 0; i < N - 1; i++)
+      s << v[i] << ", ";
+    s << v[i] << "]";
+    return s;
+  }
+
+
+  //
+  // Matrix external functions
+  //
+  /////////////////////////////////////////////////////////////////////////////
+
+  template <class T, unsigned M, unsigned N>
+  inline Matrix<T, M, N>
+  operator+(const Matrix<T, M, N>& m1,
+	    const Matrix<T, M, N>& m2) {
+    Matrix<T, M, N> res(m1);
+    res += m2;
+    return res;
+  }
+
+  template <class T, unsigned M, unsigned N>
+  inline Matrix<T, M, N>
+  operator-(const Matrix<T, M, N>& m1,
+	    const Matrix<T, M, N>& m2) {
+    Matrix<T, M, N> res(m1);
+    res -= m2;
+    return res;
+  }
+
+  template <class T, unsigned M, unsigned N>
+  inline Matrix<T, M, N>
+  operator*(const Matrix<T, M, N>& m1,
+	    const typename Matrix<T, M, N>::value_type lambda) {
+    Matrix<T, M, N> res(m1);
+    res *= lambda;
+    return res;
+  }
+
+  template <class T, unsigned M, unsigned N>
+  inline Matrix<T, M, N>
+  operator*(const typename Matrix<T, M, N>::value_type lambda,
+	    const Matrix<T, M, N>& m1) {
+    Matrix<T, M, N> res(m1);
+    res *= lambda;
+    return res;
+  }
+
+  template <class T, unsigned M, unsigned N>
+  inline Matrix<T, M, N>
+  operator/(const Matrix<T, M, N>& m1,
+	    const typename Matrix<T, M, N>::value_type lambda) {
+    Matrix<T, M, N> res(m1);
+    res /= lambda;
+    return res;
+  }
+
+  template <class T, unsigned M, unsigned N, unsigned P>
+  inline Matrix<T, M, P>
+  operator*(const Matrix<T, M, N>& m1,
+	    const Matrix<T, N, P>& m2) {
+    unsigned i, j, k;
+    Matrix<T, M, P> res;
+    typename  Matrix<T, N, P>::value_type scale;
+  
+    for (j = 0; j < P; j++) {
+      for (k = 0; k < N; k++) {
+	scale = m2(k, j);
+	for (i = 0; i < N; i++)
+	  res(i, j) += m1(i, k) * scale;
+      }
+    }
+    return res;
+  }
+
+  template <class T, unsigned M, unsigned N>
+  inline Vec<T, M>
+  operator*(const Matrix<T, M, N>& m,
+	    const Vec<T, N>& v) {
+  
+    Vec<T, M> res;
+    typename Matrix<T, M, N>::value_type scale;
+  
+    for (unsigned j = 0; j < M; j++) {
+      scale = v[j];
+      for (unsigned i = 0; i < N; i++)
+	res[i] += m(i, j) * scale;
+    }
+    return res;
+  }
+
+  // stream operator
+  template <class T, unsigned M, unsigned N>
+  inline std::ostream& operator<<(std::ostream& s,
+				  const Matrix<T, M, N>& m) {
+    unsigned i, j;
+    for (i = 0; i < M; i++) {
+      s << "[";
+      for (j = 0; j < N - 1; j++)
+	s << m(i, j) << ", ";
+      s << m(i, j) << "]" << std::endl;
+    }
+    return s;
+  }
+
+} // end of namespace VecMat
+
+#endif // VECMAT_H
diff --git a/extern/freestyle/src/geometry/geometry.pro b/extern/freestyle/src/geometry/geometry.pro
new file mode 100755
index 00000000000..a63aa6483b4
--- /dev/null
+++ b/extern/freestyle/src/geometry/geometry.pro
@@ -0,0 +1,64 @@
+# This file should be viewed as a -*- mode: Makefile -*-
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#			      W A R N I N G ! ! !                             #
+#             a u t h o r i z e d    p e r s o n a l    o n l y               #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+
+include(../Config.pri)
+
+TEMPLATE        = lib
+TARGET          = $${LIB_GEOMETRY}
+VERSION         = $${APPVERSION}
+TARGET_VERSION_EXT = $${APPVERSION_MAJ}.$${APPVERSION_MID}
+
+#
+# CONFIG
+#
+#######################################
+
+CONFIG          *= dll
+#
+# DEFINES
+#
+#######################################
+
+win32:DEFINES   *= MAKE_LIB_GEOMETRY_DLL
+
+#
+# INCLUDE PATH
+#
+#######################################
+
+#INCLUDEPATH     *= ../system
+
+#
+# BUILD DIRECTORIES
+#
+#######################################
+
+BUILD_DIR       = ../../build
+
+OBJECTS_DIR     = $${BUILD_DIR}/$${REL_OBJECTS_DIR}
+!win32:DESTDIR  = $${BUILD_DIR}/$${REL_DESTDIR}/lib
+win32:DESTDIR   = $${BUILD_DIR}/$${REL_DESTDIR}
+
+#
+# INSTALL
+#
+#######################################
+
+LIB_DIR       = ../../lib
+# install library
+target.path   = $$LIB_DIR
+# "make install" configuration options
+INSTALLS     += target
+
+#
+# SOURCES & HEADERS
+#
+#######################################
+
+!static {
+  include(src.pri)
+}
diff --git a/extern/freestyle/src/geometry/matrix_util.cpp b/extern/freestyle/src/geometry/matrix_util.cpp
new file mode 100755
index 00000000000..2117b06e62f
--- /dev/null
+++ b/extern/freestyle/src/geometry/matrix_util.cpp
@@ -0,0 +1,265 @@
+/*
+ *  GXML/Graphite: Geometry and Graphics Programming Library + Utilities
+ *  Copyright (C) 2000 Bruno Levy
+ *
+ *  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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *  If you modify this software, you should include a notice giving the
+ *  name of the person performing the modification, the date of modification,
+ *  and the reason for such modification.
+ *
+ *  Contact: Bruno Levy
+ *
+ *     levy@loria.fr
+ *
+ *     ISA Project
+ *     LORIA, INRIA Lorraine, 
+ *     Campus Scientifique, BP 239
+ *     54506 VANDOEUVRE LES NANCY CEDEX 
+ *     FRANCE
+ *
+ *  Note that the GNU General Public License does not permit incorporating
+ *  the Software into proprietary programs. 
+ */
+
+
+#include "matrix_util.h"
+#include <math.h>
+
+
+
+namespace OGF {
+    
+    namespace MatrixUtil {
+
+        static const double EPS = 0.00001 ;
+        static int MAX_ITER = 100 ;
+        
+        void semi_definite_symmetric_eigen(
+            const double *mat, int n, double *eigen_vec, double *eigen_val
+        ) {
+            double *a,*v;
+            double a_norm,a_normEPS,thr,thr_nn;
+            int nb_iter = 0;
+            int jj;
+            int i,j,k,ij,ik,l,m,lm,mq,lq,ll,mm,imv,im,iq,ilv,il,nn;
+            int *index;
+            double a_ij,a_lm,a_ll,a_mm,a_im,a_il;
+            double a_lm_2;
+            double v_ilv,v_imv;
+            double x;
+            double sinx,sinx_2,cosx,cosx_2,sincos;
+            double delta;
+        
+            // Number of entries in mat
+        
+            nn = (n*(n+1))/2;
+        
+            // Step 1: Copy mat to a
+        
+            a = new double[nn];
+        
+            for( ij=0; ij<nn; ij++ ) {
+                a[ij] = mat[ij];
+            }
+        
+            // Ugly Fortran-porting trick: indices for a are between 1 and n
+            a--;
+        
+            // Step 2 : Init diagonalization matrix as the unit matrix
+            v = new double[n*n];
+        
+            ij = 0;
+            for( i=0; i<n; i++ ) {
+                for( j=0; j<n; j++ ) {
+                    if( i==j ) {
+                        v[ij++] = 1.0;
+                    } else {
+                        v[ij++] = 0.0;
+                    }
+                }
+            }
+        
+            // Ugly Fortran-porting trick: indices for v are between 1 and n
+            v--;
+        
+            // Step 3 : compute the weight of the non diagonal terms 
+            ij     = 1  ;
+            a_norm = 0.0;
+            for( i=1; i<=n; i++ ) {
+                for( j=1; j<=i; j++ ) {
+                    if( i!=j ) {
+                        a_ij    = a[ij];
+                        a_norm += a_ij*a_ij;
+                    }
+                    ij++;
+                }
+            }
+        
+            if( a_norm != 0.0 ) {
+        
+                a_normEPS = a_norm*EPS;
+                thr       = a_norm    ;
+    
+                // Step 4 : rotations
+                while( thr > a_normEPS   &&   nb_iter < MAX_ITER ) {
+        
+                    nb_iter++;
+                    thr_nn = thr / nn;
+            
+                    for( l=1  ; l< n; l++ ) {
+                        for( m=l+1; m<=n; m++ ) {
+                    
+                            // compute sinx and cosx 
+                    
+                            lq   = (l*l-l)/2;
+                            mq   = (m*m-m)/2;
+                    
+                            lm     = l+mq;
+                            a_lm   = a[lm];
+                            a_lm_2 = a_lm*a_lm;
+                    
+                            if( a_lm_2 < thr_nn ) {
+                                continue ;
+                            }
+                    
+                            ll   = l+lq;
+                            mm   = m+mq;
+                            a_ll = a[ll];
+                            a_mm = a[mm];
+                    
+                            delta = a_ll - a_mm;
+                    
+                            if( delta == 0.0 ) {
+                                x = - M_PI/4 ; 
+                            } else {
+                                x = - atan( (a_lm+a_lm) / delta ) / 2.0 ;
+                            }
+
+                            sinx    = sin(x)   ;
+                            cosx    = cos(x)   ;
+                            sinx_2  = sinx*sinx;
+                            cosx_2  = cosx*cosx;
+                            sincos  = sinx*cosx;
+                    
+                            // rotate L and M columns 
+       
+                            ilv = n*(l-1);
+                            imv = n*(m-1);
+                    
+                            for( i=1; i<=n;i++ ) {
+                                if( (i!=l) && (i!=m) ) {
+                                    iq = (i*i-i)/2;
+                            
+                                    if( i<m )  { 
+                                        im = i + mq; 
+                                    } else {
+                                        im = m + iq;
+                                    }
+                                    a_im = a[im];
+                            
+                                    if( i<l ) {
+                                        il = i + lq; 
+                                    } else {
+                                        il = l + iq;
+                                    }
+                                    a_il = a[il];
+                            
+                                    a[il] =  a_il*cosx - a_im*sinx;
+                                    a[im] =  a_il*sinx + a_im*cosx;
+                                }
+                        
+                                ilv++;
+                                imv++;
+                        
+                                v_ilv = v[ilv];
+                                v_imv = v[imv];
+                        
+                                v[ilv] = cosx*v_ilv - sinx*v_imv;
+                                v[imv] = sinx*v_ilv + cosx*v_imv;
+                            } 
+                    
+                            x = a_lm*sincos; x+=x;
+                    
+                            a[ll] =  a_ll*cosx_2 + a_mm*sinx_2 - x;
+                            a[mm] =  a_ll*sinx_2 + a_mm*cosx_2 + x;
+                            a[lm] =  0.0;
+                    
+                            thr = fabs( thr - a_lm_2 );
+                        }
+                    }
+                }         
+            }
+        
+            // Step 5: index conversion and copy eigen values 
+        
+            // back from Fortran to C++
+            a++;
+        
+            for( i=0; i<n; i++ ) {
+                k = i + (i*(i+1))/2;
+                eigen_val[i] = a[k];
+            }
+     
+            delete[] a;
+        
+            // Step 6: sort the eigen values and eigen vectors 
+        
+            index = new int[n];
+            for( i=0; i<n; i++ ) {
+                index[i] = i;
+            }
+        
+            for( i=0; i<(n-1); i++ ) {
+                x = eigen_val[i];
+                k = i;
+            
+                for( j=i+1; j<n; j++ ) {
+                    if( x < eigen_val[j] ) {
+                        k = j;
+                        x = eigen_val[j];
+                    }
+                }
+            
+                eigen_val[k] = eigen_val[i];
+                eigen_val[i] = x;
+          
+                jj       = index[k];
+                index[k] = index[i];
+                index[i] = jj;
+            }
+
+
+            // Step 7: save the eigen vectors 
+    
+            v++; // back from Fortran to to C++
+        
+            ij = 0;
+            for( k=0; k<n; k++ ) {
+                ik = index[k]*n;
+                for( i=0; i<n; i++ ) {
+                    eigen_vec[ij++] = v[ik++];
+                }
+            }
+    
+            delete[] v    ;
+            delete[] index;
+            return;
+        }
+    
+//_________________________________________________________
+
+    }
+}
diff --git a/extern/freestyle/src/geometry/matrix_util.h b/extern/freestyle/src/geometry/matrix_util.h
new file mode 100755
index 00000000000..a990413c403
--- /dev/null
+++ b/extern/freestyle/src/geometry/matrix_util.h
@@ -0,0 +1,69 @@
+/*
+ *  GXML/Graphite: Geometry and Graphics Programming Library + Utilities
+ *  Copyright (C) 2000 Bruno Levy
+ *
+ *  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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *  If you modify this software, you should include a notice giving the
+ *  name of the person performing the modification, the date of modification,
+ *  and the reason for such modification.
+ *
+ *  Contact: Bruno Levy
+ *
+ *     levy@loria.fr
+ *
+ *     ISA Project
+ *     LORIA, INRIA Lorraine, 
+ *     Campus Scientifique, BP 239
+ *     54506 VANDOEUVRE LES NANCY CEDEX 
+ *     FRANCE
+ *
+ *  Note that the GNU General Public License does not permit incorporating
+ *  the Software into proprietary programs. 
+ */
+
+#ifndef __MATRIX_UTIL__
+#define __MATRIX_UTIL__
+
+# include "../system/FreestyleConfig.h"
+
+namespace OGF {
+
+    namespace MatrixUtil {
+
+        /**
+         * computes the eigen values and eigen vectors   
+         * of a semi definite symmetric matrix
+         *
+         * @param  matrix is stored in column symmetric storage, i.e.
+         *     matrix = { m11, m12, m22, m13, m23, m33, m14, m24, m34, m44 ... }
+         *     size = n(n+1)/2
+         *
+         * @param eigen_vectors (return) = { v1, v2, v3, ..., vn } 
+         *   where vk = vk0, vk1, ..., vkn
+         *     size = n^2, must be allocated by caller
+         *
+         * @param eigen_values  (return) are in decreasing order
+         *     size = n,   must be allocated by caller
+         */
+        LIB_GEOMETRY_EXPORT 
+        void semi_definite_symmetric_eigen(
+            const double *mat, int n, double *eigen_vec, double *eigen_val
+        ) ;
+    
+    }
+}
+
+#endif
diff --git a/extern/freestyle/src/geometry/normal_cycle.cpp b/extern/freestyle/src/geometry/normal_cycle.cpp
new file mode 100755
index 00000000000..b456ced8331
--- /dev/null
+++ b/extern/freestyle/src/geometry/normal_cycle.cpp
@@ -0,0 +1,103 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+#include "normal_cycle.h"
+#include "matrix_util.h"
+
+
+namespace OGF {
+
+//_________________________________________________________
+    
+
+    NormalCycle::NormalCycle() {
+    }
+
+    void NormalCycle::begin() {
+        M_[0] = M_[1] = M_[2] = M_[3] = M_[4] = M_[5] = 0 ;
+    }
+    
+    void NormalCycle::end() {
+        
+        double eigen_vectors[9] ;
+        MatrixUtil::semi_definite_symmetric_eigen(M_, 3, eigen_vectors, eigen_value_) ;
+            
+        axis_[0] = Vec3r(
+            eigen_vectors[0], eigen_vectors[1], eigen_vectors[2]
+        ) ;
+            
+        axis_[1] = Vec3r(
+            eigen_vectors[3], eigen_vectors[4], eigen_vectors[5]
+        ) ;
+        
+        axis_[2] = Vec3r(
+            eigen_vectors[6], eigen_vectors[7], eigen_vectors[8]
+        ) ;
+        
+        // Normalize the eigen vectors
+        
+        for(int i=0; i<3; i++) {
+            axis_[i].normalize() ;
+        }
+
+        // Sort the eigen vectors
+
+        i_[0] = 0 ;
+        i_[1] = 1 ;
+        i_[2] = 2 ;
+
+        double l0 = ::fabs(eigen_value_[0]) ;
+        double l1 = ::fabs(eigen_value_[1]) ;
+        double l2 = ::fabs(eigen_value_[2]) ;
+        
+        if(l1 > l0) {
+            ogf_swap(l0   , l1   ) ;
+            ogf_swap(i_[0], i_[1]) ;
+        }
+        if(l2 > l1) {
+            ogf_swap(l1   , l2   ) ;
+            ogf_swap(i_[1], i_[2]) ;
+        }
+        if(l1 > l0) {
+            ogf_swap(l0   , l1  ) ;
+            ogf_swap(i_[0],i_[1]) ;
+        }
+
+    }
+
+    void NormalCycle::accumulate_dihedral_angle(
+        const Vec3r& edge, double beta, double neigh_area
+    ) {
+        Vec3r e = edge ;
+        e.normalize() ;
+
+        double s = edge.norm() * beta * neigh_area ;
+
+        M_[0] += s * e.x() * e.x() ;
+        M_[1] += s * e.x() * e.y() ;
+        M_[2] += s * e.y() * e.y() ;
+        M_[3] += s * e.x() * e.z() ;
+        M_[4] += s * e.y() * e.z() ;
+        M_[5] += s * e.z() * e.z() ;        
+    }
+    
+//_________________________________________________________
+
+}
diff --git a/extern/freestyle/src/geometry/normal_cycle.h b/extern/freestyle/src/geometry/normal_cycle.h
new file mode 100755
index 00000000000..41fbf7b3fab
--- /dev/null
+++ b/extern/freestyle/src/geometry/normal_cycle.h
@@ -0,0 +1,97 @@
+/*
+ *  OGF/Graphite: Geometry and Graphics Programming Library + Utilities
+ *  Copyright (C) 2000 Bruno Levy
+ *
+ *  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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *  If you modify this software, you should include a notice giving the
+ *  name of the person performing the modification, the date of modification,
+ *  and the reason for such modification.
+ *
+ *  Contact: Bruno Levy
+ *
+ *     levy@loria.fr
+ *
+ *     ISA Project
+ *     LORIA, INRIA Lorraine, 
+ *     Campus Scientifique, BP 239
+ *     54506 VANDOEUVRE LES NANCY CEDEX 
+ *     FRANCE
+ *
+ *  Note that the GNU General Public License does not permit incorporating
+ *  the Software into proprietary programs. 
+ */
+
+#ifndef __MESH_TOOLS_MATH_NORMAL_CYCLE__
+#define __MESH_TOOLS_MATH_NORMAL_CYCLE__
+
+# include "../system/FreestyleConfig.h"
+# include "Geom.h"
+using namespace Geometry;
+ 
+namespace OGF {
+
+template <class T> inline void ogf_swap(T& x, T& y) {
+        T z = x ;
+        x = y ;
+        y = z ;
+    }
+
+//_________________________________________________________
+
+    /**
+     * NormalCycle evaluates the curvature tensor in function
+     * of a set of dihedral angles and associated vectors.
+     * Reference:
+     *    Restricted Delaunay Triangulation and Normal Cycle,
+     *    D. Cohen-Steiner and J.M. Morvan,
+     *    SOCG 2003
+     */
+    class LIB_GEOMETRY_EXPORT NormalCycle {
+    public:
+        NormalCycle() ;
+        void begin() ;
+        void end() ;
+        /**
+         * Note: the specified edge vector needs to be pre-clipped
+         * by the neighborhood.
+         */
+        void accumulate_dihedral_angle(
+            const Vec3r& edge, real angle, real neigh_area = 1.0
+        ) ;
+        const Vec3r& eigen_vector(int i) const { return axis_[i_[i]] ; }
+        real eigen_value(int i) const   { return eigen_value_[i_[i]] ;  } 
+
+        const Vec3r& N() const    { return eigen_vector(2) ; }
+        const Vec3r& Kmax() const { return eigen_vector(1) ; }
+        const Vec3r& Kmin() const { return eigen_vector(0) ; }
+
+        real n() const    { return eigen_value(2) ; }
+        real kmax() const { return eigen_value(1) ; }
+        real kmin() const { return eigen_value(0) ; }
+
+    private:
+        real center_[3] ;
+        Vec3r axis_[3] ;
+        real eigen_value_[3] ;
+        real M_[6] ;
+        int i_[3] ;
+    } ;
+    
+//_________________________________________________________
+
+}
+
+#endif
diff --git a/extern/freestyle/src/geometry/src.pri b/extern/freestyle/src/geometry/src.pri
new file mode 100755
index 00000000000..a35760fe892
--- /dev/null
+++ b/extern/freestyle/src/geometry/src.pri
@@ -0,0 +1,33 @@
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#			      W A R N I N G ! ! !                             #
+#             a u t h o r i z e d    p e r s o n a l    o n l y               #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+
+GEOMETRY_DIR = ../geometry
+
+SOURCES *= $${GEOMETRY_DIR}/GeomCleaner.cpp \
+           $${GEOMETRY_DIR}/GeomUtils.cpp \
+           $${GEOMETRY_DIR}/Grid.cpp \
+           $${GEOMETRY_DIR}/FastGrid.cpp \
+           $${GEOMETRY_DIR}/HashGrid.cpp \
+           $${GEOMETRY_DIR}/FitCurve.cpp \
+           $${GEOMETRY_DIR}/Bezier.cpp \
+           $${GEOMETRY_DIR}/Noise.cpp \
+           $${GEOMETRY_DIR}/matrix_util.cpp \
+           $${GEOMETRY_DIR}/normal_cycle.cpp
+
+HEADERS *= $${GEOMETRY_DIR}/BBox.h \
+           $${GEOMETRY_DIR}/FastGrid.h \
+           $${GEOMETRY_DIR}/Geom.h \
+           $${GEOMETRY_DIR}/GeomCleaner.h \
+           $${GEOMETRY_DIR}/GeomUtils.h \
+           $${GEOMETRY_DIR}/Grid.h \
+           $${GEOMETRY_DIR}/HashGrid.h \
+           $${GEOMETRY_DIR}/Polygon.h \
+           $${GEOMETRY_DIR}/SweepLine.h \
+           $${GEOMETRY_DIR}/FitCurve.h \
+           $${GEOMETRY_DIR}/Bezier.h \
+           $${GEOMETRY_DIR}/Noise.h \
+           $${GEOMETRY_DIR}/VecMat.h \
+           $${GEOMETRY_DIR}/matrix_util.h \
+           $${GEOMETRY_DIR}/normal_cycle.h
diff --git a/extern/freestyle/src/image/GaussianFilter.cpp b/extern/freestyle/src/image/GaussianFilter.cpp
new file mode 100755
index 00000000000..97c2aedc62e
--- /dev/null
+++ b/extern/freestyle/src/image/GaussianFilter.cpp
@@ -0,0 +1,96 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "GaussianFilter.h"
+#include <stdlib.h>
+
+GaussianFilter::GaussianFilter(float iSigma )
+{
+  _sigma = iSigma;
+  _mask = 0;
+  computeMask();
+}
+
+GaussianFilter::GaussianFilter(const GaussianFilter& iBrother) 
+{
+  _sigma = iBrother._sigma;
+  _maskSize = iBrother._maskSize;
+  _bound = iBrother._bound;
+  _storedMaskSize = iBrother._storedMaskSize;
+  _mask = new float[_maskSize*_maskSize];
+  memcpy(_mask, iBrother._mask, _maskSize*_maskSize*sizeof(float));
+}
+
+
+GaussianFilter& GaussianFilter::operator= (const GaussianFilter& iBrother) 
+{
+  _sigma = iBrother._sigma;
+  _maskSize = iBrother._maskSize;
+  _bound = iBrother._bound;
+  _storedMaskSize = iBrother._storedMaskSize;
+  _mask = new float[_storedMaskSize*_storedMaskSize];
+  memcpy(_mask, iBrother._mask, _storedMaskSize*_storedMaskSize*sizeof(float));
+  return *this;
+}
+
+
+GaussianFilter::~GaussianFilter()
+{
+  if(0!=_mask)
+  {
+    delete [] _mask;
+  }
+}
+
+int GaussianFilter::computeMaskSize(float sigma)
+{
+  int maskSize = (int)floor(4*sigma)+1;
+  if(0 == maskSize%2)
+    ++maskSize;
+
+  return maskSize;
+}
+
+void GaussianFilter::SetSigma(float sigma)
+{
+  _sigma = sigma;
+  computeMask();
+}
+
+void GaussianFilter::computeMask()
+{
+  if(0 != _mask){
+    delete [] _mask;
+  }
+
+  _maskSize = computeMaskSize(_sigma);
+  _storedMaskSize = (_maskSize+1)>>1;
+  _bound = _storedMaskSize-1;
+
+  float norm = _sigma*_sigma*2.f*M_PI; 
+  float invNorm = 1.0/norm;
+  _mask = new float[_storedMaskSize*_storedMaskSize*sizeof(float)];
+  for(int i=0; i<_storedMaskSize; ++i)
+    for(int j=0; j<_storedMaskSize; ++j)
+      _mask[i*_storedMaskSize+j] = invNorm*exp(-(i*i + j*j)/(2.0*_sigma*_sigma));
+      //_mask[i*_storedMaskSize+j] = exp(-(i*i + j*j)/(2.0*_sigma*_sigma));
+}
+
diff --git a/extern/freestyle/src/image/GaussianFilter.h b/extern/freestyle/src/image/GaussianFilter.h
new file mode 100755
index 00000000000..c75177541d3
--- /dev/null
+++ b/extern/freestyle/src/image/GaussianFilter.h
@@ -0,0 +1,144 @@
+//
+//  Filename         : Image.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Class to perform gaussian filtering operations on an image
+//  Date of creation : 20/05/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  GAUSSIANFILTER_H
+# define GAUSSIANFILTER_H
+
+#include "../system/FreestyleConfig.h"
+
+class LIB_IMAGE_EXPORT GaussianFilter{
+protected:
+  /* the mask is a symetrical 2d array (with respect 
+  to the middle point). 
+  Thus, M(i,j) = M(-i,j) = M(i,-j) = M(-i,-j).
+  For this reason, to represent a NxN array (N odd), we only store
+  a ((N+1)/2)x((N+1)/2) array.
+  */
+  float _sigma;
+  float *_mask;
+  int _bound;
+  int _maskSize; // the real mask size (must be odd)(the size of the mask we store is ((_maskSize+1)/2)*((_maskSize+1)/2))
+  int _storedMaskSize; //(_maskSize+1)/2)
+ 
+public:
+  GaussianFilter(float iSigma = 1.f) ;
+  GaussianFilter(const GaussianFilter&) ;
+  GaussianFilter& operator= (const GaussianFilter&) ;
+  virtual ~GaussianFilter() ;
+
+  /*! Returns the value for pixel x,y of image "map" after a gaussian blur, 
+   *  made using the sigma value.
+   *  The sigma value determines the mask size (~ 2 x sigma).
+   *  \param map
+   *    The image we wish to work on. The Map template must implement the 
+   *    foloowing methods: 
+   *    - float pixel(unsigned int x,unsigned int y) const;
+   *    - unsigned width() const;
+   *    - unsigned height() const;
+   *  \param x
+   *    The abscissa of the pixel where we want to evaluate the gaussian blur.
+   *  \param y
+   *    The ordinate of the pixel where we want to evaluate the gaussian blur.
+   *  \param sigma
+   *    The sigma value of the gaussian function.
+   */
+  template<class Map>
+  float getSmoothedPixel(Map * map, int x, int y) ;
+  
+  /*! Compute the mask size and returns the REAL mask size ((2*_maskSize)-1)
+   *  This method is provided for convenience.
+   */
+  static int computeMaskSize(float sigma) ;
+
+  /*! accessors */
+  inline float sigma() const {return _sigma;}
+  inline int maskSize() const {return _maskSize;}
+  inline int getBound() {return _bound;}
+
+  /*! modifiers */
+  void SetSigma(float sigma) ;
+  // void SetMaskSize(int size) {_maskSize = size;_storedMaskSize=(_maskSize+1)>>1;}
+  
+    
+protected:
+  void computeMask();
+};
+
+/*
+  
+  #############################################
+  #############################################
+  #############################################
+  ######                                 ######
+  ######   I M P L E M E N T A T I O N   ######
+  ######                                 ######
+  #############################################
+  #############################################
+  #############################################
+  
+*/
+
+
+#include <math.h>
+
+#ifdef __MACH__
+#define sqrtf(x) (sqrt(x))
+#endif
+
+template<class Map>
+float GaussianFilter::getSmoothedPixel(Map * map, int x, int y)
+{
+  float sum = 0.f;  
+  float L=0.f;
+  unsigned w=map->width();
+  unsigned h=map->height();
+
+  // Current pixel is x,y
+  // Sum surrounding pixels L value:
+  for(int i=-_bound; i<=_bound; ++i)
+  {
+    if((y+i < 0) || (y+i >= h))
+      continue;
+    for(int j=-_bound; j<=_bound; ++j)
+    {
+      if((x+j < 0) || (x+j >= w))
+        continue;
+      
+      float tmpL = map->pixel(x+j,y+i);
+      float m = _mask[abs(i)*_storedMaskSize+abs(j)];
+      L += m*tmpL;
+      sum += m;
+    }
+  }
+  //L /= sum;
+  return L;
+}
+
+
+#endif // GAUSSIANFILTER
diff --git a/extern/freestyle/src/image/Image.h b/extern/freestyle/src/image/Image.h
new file mode 100755
index 00000000000..83d6785e32f
--- /dev/null
+++ b/extern/freestyle/src/image/Image.h
@@ -0,0 +1,389 @@
+//
+//  Filename         : Image.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Class to encapsulate an array of RGB or Gray level values
+//  Date of creation : 20/05/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  IMAGE_H
+# define IMAGE_H
+
+# include <string> // for memcpy
+
+//
+// Image base class, for all types of images
+//
+///////////////////////////////////////////////////////////////////////////////
+
+/*! This class allows the storing of part of an image, 
+ *  while allowing a normal access to its pixel values.
+ *  You can for example only a rectangle of sw*sh, whose 
+ *  lower-left corner is at (ox, oy), of an image of 
+ *  size w*h, and access these pixels using x,y coordinates 
+ *  specified in the whole image coordinate system.
+ */
+class Image
+{
+ public:
+
+   /*! Default constructor */
+  Image() {
+    _storedWidth = 0;
+    _storedHeight = 0;
+    _width = 0;
+    _height = 0;
+    _Ox = 0;
+    _Oy = 0;
+  }
+
+  /*! Copy constructor */
+  Image(const Image& brother) {
+    _storedWidth = brother._storedWidth;
+    _storedHeight = brother._storedHeight;
+    _width = brother._width;
+    _height = brother._height;
+    _Ox = brother._Ox;
+    _Oy = brother._Oy;
+  }
+
+  /*! Builds an image from its width and height.
+   *  The memory is allocated consequently.
+   */
+  Image(unsigned w, unsigned h) {
+    _width = w;
+    _height = h;
+    _storedWidth = w;
+    _storedHeight = h;
+    _Ox = 0;
+    _Oy = 0;
+  }
+
+  /*! Builds a partial-storing image. 
+   *  \param w
+   *    The width of the complete image
+   *  \param h
+   *    The height of the complete image
+   *  \param sw
+   *    The width of the rectangle that will actually 
+   *    be stored.
+   *  \param sh
+   *    The height of the rectangle that will actually 
+   *    be stored.
+   *  \param ox
+   *    The x-abscissa of the origin of the rectangle that will actually 
+   *    be stored.
+   *  \param oy
+   *    The x-abscissa of the origin of the rectangle that will actually 
+   *    be stored.
+   */
+  Image(unsigned w, unsigned h, unsigned sw, unsigned sh, unsigned ox, unsigned oy) {
+    _width = w;
+    _height = h;
+    _storedWidth = sw;
+    _storedHeight = sh;
+    _Ox = ox;
+    _Oy = oy;
+  }
+
+  /*! Operator= */
+  Image& operator=(const Image& brother) {
+    _width = brother._width;
+    _height = brother._height;
+    _storedWidth = brother._storedWidth;
+    _storedHeight = brother._storedHeight;
+    _Ox = brother._Ox;
+    _Oy = brother._Oy;
+    return* this;
+  }
+
+  /*! Destructor */
+  virtual ~Image() {}
+
+  /*! Returns the width of the complete image */
+  inline unsigned width() const {
+    return _width;
+  }
+  /*! Returns the height of the complete image */
+  inline unsigned height() const {
+    return _height;
+  }
+  
+  /*! Returns the grey value for pixel x,y */
+  virtual float pixel(unsigned x, unsigned y) const = 0;
+
+  /*! Sets the array.
+   *  \param array
+   *    The array containing the values we wish to store.
+   *    Its size is sw*sh.
+   *  \param width
+   *    The width of the complete image
+   *  \param height
+   *    The height of the complete image
+   *  \param sw
+   *    The width of the rectangle that will actually 
+   *    be stored.
+   *  \param sh
+   *    The height of the rectangle that will actually 
+   *    be stored.
+   *  \param ox
+   *    The x-abscissa of the origin of the rectangle that will actually 
+   *    be stored.
+   *  \param oy
+   *    The x-abscissa of the origin of the rectangle that will actually 
+   *    be stored.
+   *  \param copy
+   *    If true, the array is copied, otherwise the pointer is 
+   *    copied
+   */
+  virtual void setArray(float* array, unsigned width, unsigned height, unsigned sw, unsigned sh, unsigned x, unsigned y, bool copy = true) = 0;
+  
+  /*! Returns the array containing the pixels values.
+   *  Its size is sw*sh, i.e. potentially a smaller 
+   *  rectangular part of the complete image.
+   */
+  virtual float * getArray() = 0;
+
+ protected:
+
+  unsigned	_width;
+  unsigned	_height;
+  unsigned _storedWidth;
+  unsigned _storedHeight;
+  unsigned _Ox; // origin of the stored part
+  unsigned _Oy; // origin of the stored part
+};
+
+
+//
+// RGBImage
+//
+///////////////////////////////////////////////////////////////////////////////
+
+class RGBImage : public Image
+{
+ public:
+
+  RGBImage() : Image() {
+    _rgb = 0;
+  }
+
+  RGBImage(const RGBImage& brother) : Image(brother) {
+    _rgb = new float[3 * _storedWidth * _storedHeight];
+    memcpy(_rgb, brother._rgb, 3 * _storedWidth * _storedHeight * sizeof(float));
+  }
+
+  RGBImage(unsigned w, unsigned h) : Image(w, h) {
+    _rgb = new float[3 * _width * _height];
+  }
+
+  RGBImage(float* rgb, unsigned w, unsigned h) : Image(w, h) {
+    _rgb = new float[3 * _width * _height];
+    memcpy(_rgb, rgb, 3 * _width * _height * sizeof(float));
+  }
+  
+  /*! Builds an RGB partial image from the useful part buffer.
+   *  \param rgb
+   *    The array of size 3*sw*sh containing the RGB values 
+   *    of the sw*sh pixels we need to stored.
+   *    These sw*sh pixels constitute a rectangular part of 
+   *    a bigger RGB image containing w*h pixels.
+   *  \param w
+   *    The width of the complete image
+   *  \param h
+   *    The height of the complete image
+   *  \param sw
+   *    The width of the part of the image we want to store and work on
+   *  \param sh
+   *    The height of the part of the image we want to store and work on
+   */
+  RGBImage(float* rgb, unsigned w, unsigned h, unsigned sw, unsigned sh, unsigned ox, unsigned oy) : Image(w, h, sw, sh, ox, oy) {
+    _rgb = new float[3 * _storedWidth * _storedHeight];
+    memcpy(_rgb, rgb, 3 * _storedWidth * _storedHeight * sizeof(float));
+  }
+
+  RGBImage& operator=(const RGBImage& brother) {
+    dynamic_cast<Image&>(*this) = brother;
+    _rgb = new float[3 * _storedWidth * _storedHeight];
+    memcpy(_rgb, brother._rgb, 3 * _storedWidth * _storedHeight * sizeof(float));
+    return* this;
+  }
+
+  virtual ~RGBImage() {
+    if(_rgb)
+      delete[] _rgb;
+  }
+
+  inline float getR(unsigned x, unsigned y) const {
+    return _rgb[3 * (y-_Oy) * _storedWidth + (x-_Ox) * 3];
+  }
+
+  inline float getG(unsigned x, unsigned y) const {
+    return _rgb[3 * (y-_Oy) * _storedWidth + (x-_Ox) * 3 + 1];
+  }
+
+  inline float getB(unsigned x, unsigned y) const {
+    return _rgb[3 * (y-_Oy) * _storedWidth + (x-_Ox) * 3 + 2];
+  }
+
+  virtual void setPixel(unsigned x, unsigned y, float r, float g, float b){
+    float * tmp = &(_rgb[3 * (y-_Oy) * _storedWidth + (x-_Ox) * 3]);
+    *tmp = r;++tmp;
+    *tmp = g;++tmp;
+    *tmp = b;
+  }
+
+  virtual float pixel(unsigned x, unsigned y) const  {
+    float res = 0;
+    float* tmp = &(_rgb[3 * (y-_Oy) * _storedWidth + (x-_Ox) * 3]);
+    res += 11 * (*tmp++);
+    res += 16 * (*tmp++);
+    res += 5 * (*tmp);
+    return res / 32;
+  }
+
+  /*! Sets the RGB array.
+   *    copy
+   *      If true, the array is copied, otherwise the pointer is 
+   *      copied
+   */
+  virtual void setArray(float* rgb, unsigned width, unsigned height, unsigned sw, unsigned sh, unsigned x, unsigned y, bool copy = true) {
+    _width = width;
+    _height = height;
+    _storedWidth = sw;
+    _storedHeight = sh;
+    _Ox = x;
+    _Oy = y;
+    if(!copy) {
+      _rgb = rgb;
+      return;
+    }
+  
+    memcpy(_rgb, rgb, 3 * _storedWidth * _storedHeight* sizeof(float));
+  }
+
+  virtual float * getArray() {return _rgb;}
+
+ protected:
+
+  float*	_rgb;
+};
+
+
+//
+// GrayImage
+//
+///////////////////////////////////////////////////////////////////////////////
+
+class GrayImage : public Image
+{
+ public:
+
+  GrayImage() : Image() {
+    _lvl = 0;
+  }
+
+  GrayImage(const GrayImage& brother) : Image(brother) {
+    _lvl = new float[_storedWidth*_storedHeight];
+    memcpy(_lvl, brother._lvl, _storedWidth*_storedHeight*sizeof(*_lvl));
+  }
+
+  /*! Builds an empty gray image */
+  GrayImage(unsigned w, unsigned h) : Image(w, h) {
+    _lvl = new float[_width*_height];
+  }
+
+  GrayImage(float* lvl, unsigned w, unsigned h) : Image(w, h) {
+    _lvl = new float[_width*_height];
+    memcpy(_lvl, lvl, _width*_height*sizeof(*_lvl));
+  }
+  
+  /*! Builds a partial image from the useful part buffer.
+   *  \param lvl
+   *    The array of size sw*sh containing the gray values 
+   *    of the sw*sh pixels we need to stored.
+   *    These sw*sh pixels constitute a rectangular part of 
+   *    a bigger gray image containing w*h pixels.
+   *  \param w
+   *    The width of the complete image
+   *  \param h
+   *    The height of the complete image
+   *  \param sw
+   *    The width of the part of the image we want to store and work on
+   *  \param sh
+   *    The height of the part of the image we want to store and work on
+   */
+  GrayImage(float* lvl, unsigned w, unsigned h, unsigned sw, unsigned sh, unsigned ox, unsigned oy) : Image(w, h, sw, sh, ox, oy) {
+    _lvl = new float[_storedWidth*_storedHeight];
+    memcpy(_lvl, lvl, _storedWidth*_storedHeight*sizeof(float));
+  }
+
+  GrayImage& operator=(const GrayImage& brother) {
+    dynamic_cast<Image&>(*this) = brother;
+    _lvl = new float[_storedWidth * _storedHeight];
+    memcpy(_lvl, brother._lvl, _storedWidth * _storedHeight * sizeof(float));
+  return *this;
+  }
+
+  virtual ~GrayImage() {
+    if(_lvl)
+      delete[] _lvl;
+  }
+
+  inline void setPixel(unsigned x, unsigned y, float v){
+    _lvl[(y-_Oy) * _storedWidth+ (x-_Ox)] = v;
+  } 
+
+  inline float pixel(unsigned x, unsigned y) const {
+    return _lvl[(y-_Oy) * _storedWidth+ (x-_Ox)];
+  }
+
+  /*! Sets the array.
+   *    copy
+   *      If true, the array is copie, otherwise the pounsigneder is 
+   *      copied
+   */
+  void setArray(float *lvl, unsigned width, unsigned height, unsigned sw, unsigned sh, unsigned x, unsigned y, bool copy = true) {
+    _width = width;
+    _height = height;
+    _storedWidth = sw;
+    _storedHeight = sh;
+    _Ox = x;
+    _Oy = y;
+    if(!copy) {  
+      _lvl = lvl;
+      return;
+    }
+  
+    memcpy(_lvl, lvl, _storedWidth * _storedHeight * sizeof(float));
+  }
+  /*! Returns the array containing the gray values. */
+  virtual float * getArray() {return _lvl;}
+
+ protected:
+
+  float *_lvl;
+};
+
+#endif // IMAGE_H
diff --git a/extern/freestyle/src/image/ImagePyramid.cpp b/extern/freestyle/src/image/ImagePyramid.cpp
new file mode 100755
index 00000000000..45c02004d1c
--- /dev/null
+++ b/extern/freestyle/src/image/ImagePyramid.cpp
@@ -0,0 +1,166 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+#include "ImagePyramid.h"
+#include "Image.h"
+#include "GaussianFilter.h"
+#include <iostream>
+
+using namespace std;
+
+//ImagePyramid::ImagePyramid(const GrayImage& level0, unsigned nbLevels){
+//  //BuildPyramid(level0,nbLevels);
+//}
+
+ImagePyramid::ImagePyramid(const ImagePyramid& iBrother){
+  if(!_levels.empty()){
+    for(vector<GrayImage*>::iterator im=_levels.begin(), imend=_levels.end();
+    im!=imend;
+    ++im){
+      _levels.push_back(new GrayImage(**im)); 
+    }
+  }
+}
+ImagePyramid::~ImagePyramid(){
+  if(!_levels.empty()){
+    for(vector<GrayImage*>::iterator im=_levels.begin(), imend=_levels.end();
+    im!=imend;
+    ++im){
+      delete (*im);
+    }
+    _levels.clear();
+  }
+}
+
+GrayImage * ImagePyramid::getLevel(int l){
+  return _levels[l];
+}
+
+float ImagePyramid::pixel(int x, int y, int level){
+  GrayImage *img = _levels[level];
+  if(0 == level){
+    return img->pixel(x,y);
+  }
+  int i  = 1<<level;
+  int sx = x>>level;
+  int sy = y>>level;
+  if(sx >= img->width())
+    sx = img->width()-1;
+  if(sy >= img->height())
+    sy = img->height()-1;
+  
+  // bilinear interpolation
+  float A = i*(sx+1)-x;
+  float B = x-i*sx;
+  float C = i*(sy+1)-y;
+  float D = y-i*sy;
+
+  float P1(0), P2(0);
+  P1 = A*img->pixel(sx,sy);
+  if(sx < img->width()-1){
+    if(x%i != 0)
+      P1 +=  B*img->pixel(sx+1,sy);
+  }else{
+    P1 +=  B*img->pixel(sx,sy);
+  }
+  if(sy<img->height()-1){
+    if(y%i != 0){
+      P2 = A*img->pixel(sx,sy+1);
+      if(sx < img->width()-1){
+        if(x%i != 0)
+          P2 += B*img->pixel(sx+1,sy+1);
+      }else{
+        P2 += B*img->pixel(sx,sy+1);
+      }
+    }
+  }else{
+    P2 = P1;
+  }
+  return (1.f/(float)(1<<2*level))*(C*P1 + D*P2);
+}
+
+int ImagePyramid::width(int level){
+  return _levels[level]->width();
+}
+
+int ImagePyramid::height(int level){
+  return _levels[level]->height();
+}
+
+GaussianPyramid::GaussianPyramid(const GrayImage& level0, unsigned nbLevels, float iSigma)
+    : ImagePyramid()
+{
+  _sigma = iSigma;
+  BuildPyramid(level0,nbLevels);
+} 
+GaussianPyramid::GaussianPyramid(GrayImage* level0, unsigned nbLevels, float iSigma)
+    : ImagePyramid()
+{
+  _sigma = iSigma;
+  BuildPyramid(level0,nbLevels);
+}
+
+GaussianPyramid::GaussianPyramid(const GaussianPyramid& iBrother)
+: ImagePyramid(iBrother){
+  _sigma = iBrother._sigma;
+}
+void GaussianPyramid::BuildPyramid(const GrayImage& level0, unsigned nbLevels){
+  GrayImage *pLevel = new GrayImage(level0);
+  BuildPyramid(pLevel, nbLevels);
+}
+
+void GaussianPyramid::BuildPyramid(GrayImage* level0, unsigned nbLevels){
+  GrayImage *pLevel = level0;
+  _levels.push_back(pLevel);
+  GaussianFilter gf(_sigma);
+  // build the nbLevels:
+  unsigned w = pLevel->width();
+  unsigned h = pLevel->height();
+  if(nbLevels!=0)
+  {
+    for(unsigned i=0; i<nbLevels; ++i){
+      w = pLevel->width()>>1;
+      h = pLevel->height()>>1;
+      GrayImage *img = new GrayImage(w,h);
+      for(unsigned y=0; y<h; ++y){
+        for(unsigned x=0; x<w; ++x){
+          float v = gf.getSmoothedPixel<GrayImage>(pLevel, 2*x,2*y);
+          img->setPixel(x,y,v);
+        } 
+      } 
+      _levels.push_back(img);
+      pLevel = img;
+    }
+  }else{
+    while((w>1) && (h>1)){
+      w = pLevel->width()>>1;
+      h = pLevel->height()>>1;
+      GrayImage *img = new GrayImage(w,h);
+      for(unsigned y=0; y<h; ++y){
+        for(unsigned x=0; x<w; ++x){
+          float v = gf.getSmoothedPixel<GrayImage>(pLevel, 2*x,2*y);
+          img->setPixel(x,y,v);
+        } 
+      } 
+      _levels.push_back(img);
+      pLevel = img;
+    } 
+  }
+}
diff --git a/extern/freestyle/src/image/ImagePyramid.h b/extern/freestyle/src/image/ImagePyramid.h
new file mode 100755
index 00000000000..9e326757f02
--- /dev/null
+++ b/extern/freestyle/src/image/ImagePyramid.h
@@ -0,0 +1,92 @@
+//
+//  Filename         : ImagePyramid.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Class to represent a pyramid of images
+//  Date of creation : 25/12/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  IMAGEPYRAMID_H
+# define IMAGEPYRAMID_H
+
+#include "../system/FreestyleConfig.h"
+#include <vector>
+
+class GrayImage;
+class LIB_IMAGE_EXPORT ImagePyramid{
+protected:
+  std::vector<GrayImage*> _levels;
+  
+public:
+  ImagePyramid(){}
+  ImagePyramid(const ImagePyramid& iBrother);
+  //ImagePyramid(const GrayImage& level0, unsigned nbLevels);
+  virtual ~ImagePyramid();
+
+  /*! Builds the pyramid.
+   * must be overloaded by inherited classes.
+   * if nbLevels==0, the complete pyramid is built
+   */
+  virtual void BuildPyramid(const GrayImage& level0, unsigned nbLevels) = 0;
+  
+  /*! Builds a pyramid without copying the base level */
+  virtual void BuildPyramid(GrayImage* level0, unsigned nbLevels) = 0;
+  
+  virtual GrayImage * getLevel(int l);
+  /*! Returns the pixel x,y using bilinear interpolation.
+   *  \param x
+   *    the abscissa specified in the finest level coordinate system
+   *  \param y
+   *    the ordinate specified in the finest level coordinate system
+   *  \param level
+   *    the level from which we want the pixel to be evaluated
+   */
+  virtual float pixel(int x, int y, int level=0);
+  /*! Returns the width of the level-th level image */
+  virtual int width(int level=0);
+  /*! Returns the height of the level-th level image */
+  virtual int height(int level=0);
+  /*! Returns the number of levels in the pyramid */
+  inline int getNumberOfLevels() const { return _levels.size();}
+}; 
+
+class LIB_IMAGE_EXPORT GaussianPyramid : public ImagePyramid
+{
+protected:
+  float _sigma;
+public:
+  GaussianPyramid(float iSigma=1.f) : ImagePyramid() {_sigma=iSigma;}
+  GaussianPyramid(const GrayImage& level0, unsigned nbLevels, float iSigma=1.f);
+  GaussianPyramid(GrayImage* level0, unsigned nbLevels, float iSigma=1.f);
+  GaussianPyramid(const GaussianPyramid& iBrother);
+  virtual ~GaussianPyramid(){}
+
+  virtual void BuildPyramid(const GrayImage& level0, unsigned nbLevels);
+  virtual void BuildPyramid(GrayImage* level0, unsigned nbLevels);
+  /* accessors */
+  inline float getSigma() const {return _sigma;}
+  /* modifiers */
+
+};
+#endif // IMAGEPYRAMID_H
diff --git a/extern/freestyle/src/image/image.pro b/extern/freestyle/src/image/image.pro
new file mode 100755
index 00000000000..133b6cf4f35
--- /dev/null
+++ b/extern/freestyle/src/image/image.pro
@@ -0,0 +1,66 @@
+# This file should be viewed as a -*- mode: Makefile -*-
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#			      W A R N I N G ! ! !                             #
+#             a u t h o r i z e d    p e r s o n a l    o n l y               #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+
+include(../Config.pri)
+
+TEMPLATE        = lib
+
+TARGET          = $${LIB_IMAGE}
+VERSION         = $${APPVERSION}
+TARGET_VERSION_EXT = $${APPVERSION_MAJ}.$${APPVERSION_MID}
+
+#
+# CONFIG
+#
+#######################################
+
+CONFIG          *= dll
+
+#
+# DEFINES
+#
+#######################################
+
+win32:DEFINES   *= MAKE_LIB_IMAGE_DLL
+
+#
+# INCLUDE PATH
+#
+#######################################
+
+#INCLUDEPATH     *= ../system
+
+#
+# BUILD DIRECTORIES
+#
+#######################################
+
+BUILD_DIR       = ../../build
+
+OBJECTS_DIR     = $${BUILD_DIR}/$${REL_OBJECTS_DIR}
+!win32:DESTDIR  = $${BUILD_DIR}/$${REL_DESTDIR}/lib
+win32:DESTDIR   = $${BUILD_DIR}/$${REL_DESTDIR}
+
+#
+# INSTALL
+#
+#######################################
+
+LIB_DIR       = ../../lib
+# install library
+target.path   = $$LIB_DIR
+# "make install" configuration options
+INSTALLS     += target
+
+#
+# SOURCES & HEADERS
+#
+#######################################
+
+!static {
+  include(src.pri)
+}
diff --git a/extern/freestyle/src/image/src.pri b/extern/freestyle/src/image/src.pri
new file mode 100755
index 00000000000..c047929b49f
--- /dev/null
+++ b/extern/freestyle/src/image/src.pri
@@ -0,0 +1,13 @@
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#			      W A R N I N G ! ! !                             #
+#             a u t h o r i z e d    p e r s o n a l    o n l y               #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+
+IMAGE_DIR = ../image
+
+SOURCES *= $${IMAGE_DIR}/GaussianFilter.cpp \
+           $${IMAGE_DIR}/ImagePyramid.cpp
+
+HEADERS *= $${IMAGE_DIR}/Image.h \
+           $${IMAGE_DIR}/GaussianFilter.h \
+           $${IMAGE_DIR}/ImagePyramid.h
diff --git a/extern/freestyle/src/libconfig.pri b/extern/freestyle/src/libconfig.pri
new file mode 100755
index 00000000000..6fec8878694
--- /dev/null
+++ b/extern/freestyle/src/libconfig.pri
@@ -0,0 +1,110 @@
+# This file should be viewed as a -*- mode: Makefile -*-
+
+contains( CONFIG, 3ds1.20 ) {
+  message ("Using 3ds 1.2.0 module")
+  linux-g++:INCLUDEPATH  *= $(HOME)/INCLUDE/LINUX
+  linux-g++:LIBS         *= -L$(HOME)/LIB/LINUX -l3ds
+  cygwin-g++:INCLUDEPATH  *= /usr/lib/lib3ds-1.2.0
+  cygwin-g++:LIBS         *= -L/usr/lib/lib3ds-1.2.0/lib3ds -l3ds
+  mac:INCLUDEPATH *= /usr/local/include
+  mac:LIBS         *= -l3ds
+  mac:QMAKE_LIBDIR *= /usr/local/lib
+  win32:    INCLUDEPATH  *= C:\include\lib3ds\1.2.0
+  win32:    QMAKE_LIBDIR *= C:\lib\lib3ds\1.2.0
+  win32:debug:    LIBS         *= lib3ds-120sd.lib
+  win32:release:    LIBS         *= lib3ds-120s.lib
+}
+
+contains( CONFIG, 3ds1.30 ) {
+  message ("Using 3ds 1.3.0 module")
+  linux-g++:INCLUDEPATH  *= $(HOME)/INCLUDE/LINUX
+  linux-g++:LIBS         *= -L$(HOME)/LIB/LINUX -l3ds
+  cygwin-g++:INCLUDEPATH  *= /usr/lib/lib3ds-1.3.0
+  cygwin-g++:LIBS         *= -L/usr/lib/lib3ds-1.3.0/lib3ds -l3ds
+  mac:INCLUDEPATH *= /usr/local/include
+  mac:LIBS         *= -l3ds
+  mac:QMAKE_LIBDIR *= /usr/local/lib
+  win32:    INCLUDEPATH  *= C:\include\lib3ds\1.3.0
+  win32:    QMAKE_LIBDIR *= C:\lib\lib3ds\1.3.0
+  win32:debug:    LIBS         *= lib3ds-1_3d.lib
+  win32:release:    LIBS         *= lib3ds-1_3.lib
+}
+
+contains( CONFIG, qglviewer ) {
+  message ("Using QGLViewer module")
+  CONFIG *= qt thread opengl glut
+  linux-g++:INCLUDEPATH *= $(HOME)/INCLUDE
+  linux-g++:LIBS        *= -L$(HOME)/LIB/LINUX -lQGLViewer
+  cygwin-g++:LIBS        *= -lQGLViewer
+  win32:    INCLUDEPATH  *= $(HOME)\INCLUDE
+  win32:    QMAKE_LIBDIR *= $(HOME)\LIB
+  win32:    LIBS        *= QGLViewer.lib
+}
+
+contains( CONFIG, python2.3) {
+  message ("Using python 2.3 module")
+  linux-g++:INCLUDEPATH *= /usr/include/python2.3
+  linux-g++:LIBS	*= -lpthread -lm -lutil	
+  linux-g++:LIBS        *= -L/usr/local/lib/ -lpython2.3 -L$(HOME)/LIB/LINUX 
+  win32:    INCLUDEPATH *= C:\python23\include
+  win32:    QMAKE_LIBDIR *= C:\python23\libs
+  win32:    LIBS        *= python23.lib
+}
+
+contains( CONFIG, python2.4) {
+  message ("Using python 2.4 module")
+  linux-g++:INCLUDEPATH *= /usr/include/python2.4
+  linux-g++:LIBS	*= -lpthread -lm -lutil	
+  linux-g++:LIBS        *= -L/usr/local/lib/ -lpython2.4 -L$(HOME)/LIB/LINUX
+  cygwin-g++:INCLUDEPATH *= /usr/include/python2.4
+  cygwin-g++:LIBS	*= -lpthread -lm -lutil	
+  cygwin-g++:LIBS        *= -L/usr/lib/python2.4/config -lpython2.4 
+  win32:    INCLUDEPATH *= C:\python24\include
+  win32:    QMAKE_LIBDIR *= C:\python24\libs
+  win32:    LIBS        *= python24.lib
+}
+
+contains( CONFIG, python2.5) {
+  message ("Using python 2.5 module")
+  linux-g++:INCLUDEPATH *= /usr/include/python2.5
+  linux-g++:LIBS	*= -lpthread -lm -lutil	
+  linux-g++:LIBS        *= -L/usr/local/lib/ -lpython2.5 -L$(HOME)/LIB/LINUX
+  mac:	    INCLUDEPATH *= /usr/include/python2.5
+  mac:      LIBS        *= -L/usr/lib/python2.5/config -lpython2.5
+  cygwin-g++:INCLUDEPATH *= /usr/include/python2.5
+  cygwin-g++:LIBS	*= -lpthread -lm -lutil	
+  cygwin-g++:LIBS        *= -L/usr/lib/python2.5/config -lpython2.5 
+  win32:    INCLUDEPATH *= C:\python25\include
+  win32:    QMAKE_LIBDIR *= C:\python25\libs
+  win32:    LIBS        *= python25.lib
+}
+
+
+contains( CONFIG, glut) {
+  message ("Using glut module")
+  linux-g++:LIBS *= -lglut -lXi
+  cygwin-g++:LIBS *= -lglut -lXi
+  mac: LIBS *= -framework Glut
+  win32:INCLUDEPATH *= C:\include
+  win32: QMAKE_LIBDIR *= C:\lib\glut
+  win32: LIBS *= glut32.lib
+}
+
+contains( CONFIG, qglviewer2 ) {
+  message ("Using QGLViewer module")
+  CONFIG *= qt thread opengl glut
+  linux-g++:INCLUDEPATH *= $(HOME)/INCLUDE
+  linux-g++:LIBS        *= -L$(HOME)/LIB/LINUX -lQGLViewer
+  mac: LIBS *= -lQGLViewer
+  cygwin-g++:LIBS        *= -lQGLViewer2
+  win32:    INCLUDEPATH  *= C:\include\QGLViewer\2.2.5
+  win32{
+    release{
+      QMAKE_LIBDIR *= C:\lib\QGLViewer\release
+    }
+    debug{
+      QMAKE_LIBDIR *= C:\lib\QGLViewer\debug
+    }
+  }
+  win32:    LIBS        *= QGLViewer2.lib
+}
diff --git a/extern/freestyle/src/makedsp.vcnet.debug.bat b/extern/freestyle/src/makedsp.vcnet.debug.bat
new file mode 100755
index 00000000000..e19ca52b4f7
--- /dev/null
+++ b/extern/freestyle/src/makedsp.vcnet.debug.bat
@@ -0,0 +1,25 @@
+@echo off
+for /D %%d in (*) do call :FOR2 %%d
+rem cd ..
+goto :EOF
+
+:FOR2
+set componentpath=%1
+set dirname=%~n1
+for %%p in (%componentpath%\*.pro) do if exist %%p call :DSP %%p
+
+goto :EOF
+
+:DSP
+set drive=%~d1
+set filepath=%~p1
+cd %drive%%filepath%
+rem echo %drive%%filepath%
+set filename=%~n1
+echo creating %filename%_d.vcproj from %filename%.pro ...
+if %filename% == app (
+  qmake -t vcapp -win32 -o %filename%_d %filename%.pro 
+) else (
+  qmake -t vclib -win32 -o %filename%_d %filename%.pro
+)
+cd..
diff --git a/extern/freestyle/src/makedsp.vcnet.release.bat b/extern/freestyle/src/makedsp.vcnet.release.bat
new file mode 100755
index 00000000000..3050a2fe4ea
--- /dev/null
+++ b/extern/freestyle/src/makedsp.vcnet.release.bat
@@ -0,0 +1,25 @@
+@echo off
+for /D %%d in (*) do call :FOR2 %%d
+rem cd ..
+goto :EOF
+
+:FOR2
+set componentpath=%1
+set dirname=%~n1
+for %%p in (%componentpath%\*.pro) do if exist %%p call :DSP %%p
+
+goto :EOF
+
+:DSP
+set drive=%~d1
+set filepath=%~p1
+cd %drive%%filepath%
+rem echo %drive%%filepath%
+set filename=%~n1
+echo creating %filename%.vcproj from %filename%.pro ...
+if %filename% == app (
+  qmake -t vcapp -win32 -o %filename% %filename%.pro 
+) else (
+  qmake -t vclib -win32 -o %filename% %filename%.pro
+)
+cd..
diff --git a/extern/freestyle/src/rendering/GLBBoxRenderer.cpp b/extern/freestyle/src/rendering/GLBBoxRenderer.cpp
new file mode 100755
index 00000000000..464779d6a43
--- /dev/null
+++ b/extern/freestyle/src/rendering/GLBBoxRenderer.cpp
@@ -0,0 +1,108 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "GLBBoxRenderer.h"
+#include "../scene_graph/IndexedFaceSet.h"
+#include "../scene_graph/NodeDrawingStyle.h"
+#include "../scene_graph/NodeShape.h"
+#include "../scene_graph/NodeLight.h"
+#include "../scene_graph/NodeTransform.h"
+
+#include "../scene_graph/Rep.h"
+#include "../scene_graph/Node.h"
+
+void GLBBoxRenderer::visitIndexedFaceSet(IndexedFaceSet& iFaceSet)  
+{
+  RenderRep(iFaceSet);
+}
+
+void GLBBoxRenderer::visitNodeGroup(NodeGroup& iGroupNode)  
+{
+  RenderNode(iGroupNode);
+}
+
+void GLBBoxRenderer::visitNodeTransform(NodeTransform& iTransformNode)
+{
+  RenderNode(iTransformNode);
+}
+
+void GLBBoxRenderer::visitDrawingStyle(DrawingStyle& iDrawingStyle) 
+{
+  if(DrawingStyle::INVISIBLE == iDrawingStyle.style())
+    return ;
+
+  glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+  glEnable(GL_BLEND);
+  glEnable(GL_LINE_SMOOTH);
+  glPolygonMode(GL_FRONT, GL_LINE);
+  glLineWidth(1.f);
+
+  glDisable(GL_LIGHTING);
+}
+
+void GLBBoxRenderer::RenderRep(const Rep& iRep) const 
+{
+  RenderBBox(iRep.bbox());
+}
+
+void GLBBoxRenderer::RenderNode(const Node& iNode) const 
+{
+  RenderBBox(iNode.bbox());
+}
+
+void GLBBoxRenderer::RenderBBox(const BBox<Vec3r>& iBox) const 
+{
+  if(iBox.empty())
+    return;
+
+  Vec3r m = iBox.getMin();
+  Vec3r M = iBox.getMax();
+
+  glColor3f(0.f, 0.f, 0.f);
+  glBegin(GL_LINE_LOOP);
+  ((GLBBoxRenderer*)(this))->glVertex3r(m[0], m[1], m[2]);
+  ((GLBBoxRenderer*)(this))->glVertex3r(M[0], m[1], m[2]);
+  ((GLBBoxRenderer*)(this))->glVertex3r(M[0], M[1], m[2]);
+  ((GLBBoxRenderer*)(this))->glVertex3r(m[0], M[1], m[2]);
+  glEnd();
+  
+  glBegin(GL_LINE_LOOP);
+  ((GLBBoxRenderer*)(this))->glVertex3r(m[0], m[1], M[2]);
+  ((GLBBoxRenderer*)(this))->glVertex3r(M[0], m[1], M[2]);
+  ((GLBBoxRenderer*)(this))->glVertex3r(M[0], M[1], M[2]);
+  ((GLBBoxRenderer*)(this))->glVertex3r(m[0], M[1], M[2]);
+  glEnd();
+  
+  glBegin(GL_LINE_LOOP);
+  ((GLBBoxRenderer*)(this))->glVertex3r(m[0], m[1], m[2]);
+  ((GLBBoxRenderer*)(this))->glVertex3r(m[0], m[1], M[2]);
+  ((GLBBoxRenderer*)(this))->glVertex3r(m[0], M[1], M[2]);
+  ((GLBBoxRenderer*)(this))->glVertex3r(m[0], M[1], m[2]);
+  glEnd();
+  
+  glBegin(GL_LINE_LOOP);
+  ((GLBBoxRenderer*)(this))->glVertex3r(M[0], m[1], m[2]);
+  ((GLBBoxRenderer*)(this))->glVertex3r(M[0], m[1], M[2]);
+  ((GLBBoxRenderer*)(this))->glVertex3r(M[0], M[1], M[2]);
+  ((GLBBoxRenderer*)(this))->glVertex3r(M[0], M[1], m[2]);
+  glEnd();
+
+}
diff --git a/extern/freestyle/src/rendering/GLBBoxRenderer.h b/extern/freestyle/src/rendering/GLBBoxRenderer.h
new file mode 100755
index 00000000000..4bb72ba80b0
--- /dev/null
+++ b/extern/freestyle/src/rendering/GLBBoxRenderer.h
@@ -0,0 +1,59 @@
+//
+//  Filename         : GLBBoxRenderer.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Class to render BBoxes of a 3D scene thanks to OpenGL
+//  Date of creation : 07/02/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  GLBBOXRENDERER_H
+# define GLBBOXRENDERER_H
+
+# include "../system/FreestyleConfig.h"
+# include "GLRenderer.h"
+# include "../geometry/BBox.h"
+
+class Rep;
+class Node;
+
+class LIB_RENDERING_EXPORT GLBBoxRenderer : public GLRenderer
+{
+public:
+
+  inline GLBBoxRenderer() : GLRenderer() {}
+  virtual ~GLBBoxRenderer() {}
+
+  VISIT_DECL(NodeGroup)
+  VISIT_DECL(NodeTransform)
+  VISIT_DECL(IndexedFaceSet)
+  VISIT_DECL(DrawingStyle)
+
+ protected:
+
+  void RenderRep(const Rep& iRep) const ;
+  void RenderNode(const Node& iNode) const ;
+  void RenderBBox(const BBox<Vec3r>& iBox) const ;
+};
+
+#endif // GLBBOXRENDERER_H
diff --git a/extern/freestyle/src/rendering/GLDebugRenderer.cpp b/extern/freestyle/src/rendering/GLDebugRenderer.cpp
new file mode 100755
index 00000000000..b396a0ce6d3
--- /dev/null
+++ b/extern/freestyle/src/rendering/GLDebugRenderer.cpp
@@ -0,0 +1,197 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include <stdio.h>
+#include "../scene_graph/VertexRep.h"
+#include "../scene_graph/NodeShape.h"
+#include "../scene_graph/IndexedFaceSet.h"
+#include "../scene_graph/LineRep.h"
+#include "../geometry/Grid.h"
+
+#include "GLDebugRenderer.h"
+
+#ifdef __MACH__
+#include <GLUT/glut.h>
+#else
+#include <GL/glut.h>
+#endif
+
+void GLDebugRenderer::visitIndexedFaceSet(IndexedFaceSet& iFaceSet)  
+{
+  unsigned int fIndex = 0;
+  
+  const real * vertices = iFaceSet.vertices();
+  const real * normals = iFaceSet.normals();
+  const Material *const* materials = (const Material**)iFaceSet.materials();
+  const unsigned *vindices = iFaceSet.vindices();
+  const unsigned *nindices = iFaceSet.nindices();
+  const unsigned *mindices = iFaceSet.mindices();
+  const unsigned numfaces = iFaceSet.numFaces();
+  const unsigned *numVertexPerFace = iFaceSet.numVertexPerFaces();
+  const IndexedFaceSet::TRIANGLES_STYLE * faceStyle = iFaceSet.trianglesStyle();  
+
+  const unsigned *pvi = vindices;
+  const unsigned *pni = nindices;
+  const unsigned* pmi = mindices;
+
+  for(fIndex=0; fIndex<numfaces; fIndex++)
+  {
+    switch(faceStyle[fIndex])
+    {
+    case IndexedFaceSet::TRIANGLE_STRIP:
+      RenderTriangleStrip(vertices, normals, materials, pvi, pni, pmi, numVertexPerFace[fIndex]);
+      break;
+    case IndexedFaceSet::TRIANGLE_FAN:
+      RenderTriangleFan(vertices, normals, materials, pvi, pni, pmi, numVertexPerFace[fIndex]);
+      break;
+    case IndexedFaceSet::TRIANGLES:
+      RenderTriangles(vertices, normals, materials, pvi, pni, pmi, numVertexPerFace[fIndex]);
+      break;
+    }
+    pvi += numVertexPerFace[fIndex];
+    pni += numVertexPerFace[fIndex];
+    pmi += numVertexPerFace[fIndex];
+  }
+}
+
+void GLDebugRenderer::visitNodeShape(NodeShape& iShapeNode) 
+{
+  // Gets the bbox size:
+  real minY = iShapeNode.bbox().getMin()[1];
+  real maxY = iShapeNode.bbox().getMax()[1];
+  
+  // sets the text size:
+  _bboxSize = fabs((maxY-minY)); ///1000.f;
+}
+
+void GLDebugRenderer::visitLineRep(LineRep& iLine) 
+{ 
+
+  glColor3f(0,0,0);
+
+  GLRenderer::visitLineRep(iLine);
+}
+
+void GLDebugRenderer::visitOrientedLineRep(OrientedLineRep& iLine) 
+{
+  GLRenderer::visitOrientedLineRep(iLine);
+}
+
+void GLDebugRenderer::visitVertexRep(VertexRep& iVertex) 
+{
+  glPointSize(3.0);
+
+  GLRenderer::visitVertexRep(iVertex);
+}
+
+
+void GLDebugRenderer::renderBitmapString(real x, 
+					 real y, 
+					 real z, 
+					 void *font, 
+					 char *string,
+					 float size) 
+{  
+  char *c;
+  
+  glPushMatrix();
+  glTranslater(x, y,z);
+  real textSize = min(_bboxSize/10.0, _minEdgeSize/2.0);
+  // adjust the text size so as it 
+  // is acceptable giving the bbox size:
+  while(_bboxSize/textSize>1000)
+    textSize *= 10.0;
+
+  glScalef(size, size, size);
+  glScalef(textSize/200.0, textSize/200.0, textSize/200.0);
+  for (c=string; *c != '\0'; c++) 
+  {
+    glutStrokeCharacter(font, *c);
+  }
+  glPopMatrix();
+}
+
+void GLDebugRenderer::RenderTriangleStrip(const real *iVertices, 
+                                          const real *iNormals,
+                                          const Material *const* iMaterials, 
+                                          const unsigned* iVIndices, 
+                                          const unsigned* iNIndices,
+                                          const unsigned* iMIndices,
+                                          const unsigned iNVertices) 
+{
+  //  glBegin(GL_TRIANGLE_STRIP);
+  //  for(unsigned int i=0; i<iNVertices; i++)
+  //  {
+  //    glNormal3r(iNormals[iNIndices[i]], 
+  //               iNormals[iNIndices[i]+1],
+  //               iNormals[iNIndices[i]+2]);
+  //
+  //    glVertex3r( iVertices[iVIndices[i]], 
+  //                iVertices[iVIndices[i]+1],
+  //                iVertices[iVIndices[i]+2]);
+  //  }
+  //  glEnd();
+}
+
+void GLDebugRenderer::RenderTriangleFan(const real *iVertices, 
+                                        const real *iNormals,
+                                        const Material *const* iMaterials, 
+                                        const unsigned* iVIndices, 
+                                        const unsigned* iNIndices,
+                                        const unsigned* iMIndices,
+                                        const unsigned iNVertices)  
+{
+  //  glBegin(GL_TRIANGLE_FAN);
+  //  for(unsigned int i=0; i<iNVertices; i++)
+  //  {
+  //    glNormal3r(iNormals[iNIndices[i]], 
+  //               iNormals[iNIndices[i]+1],
+  //               iNormals[iNIndices[i]+2]);
+  //
+  //    glVertex3r( iVertices[iVIndices[i]], 
+  //                iVertices[iVIndices[i]+1],
+  //                iVertices[iVIndices[i]+2]);
+  //  }
+  //  glEnd();
+}
+
+void GLDebugRenderer::RenderTriangles(const real *iVertices, 
+                                      const real *iNormals,
+                                      const Material *const* iMaterials, 
+                                      const unsigned* iVIndices, 
+                                      const unsigned* iNIndices,
+                                      const unsigned* iMIndices,
+                                      const unsigned iNVertices)  
+{
+  //  // Renders the normals:
+  //  glBegin(GL_LINES);
+  //  for(unsigned int i=0; i<iNVertices; i++)
+  //  { 
+  //    glVertex3r( iVertices[iVIndices[i]], 
+  //      iVertices[iVIndices[i]+1],
+  //      iVertices[iVIndices[i]+2]);
+  //    
+  //    glVertex3r(iVertices[iVIndices[i]] + iNormals[iNIndices[i]]/10.f, 
+  //      iVertices[iVIndices[i]+1] + iNormals[iNIndices[i]+1]/10.f,
+  //      iVertices[iVIndices[i]+2] + iNormals[iNIndices[i]+2]/10.f);
+  //  }
+  //  glEnd();
+}
diff --git a/extern/freestyle/src/rendering/GLDebugRenderer.h b/extern/freestyle/src/rendering/GLDebugRenderer.h
new file mode 100755
index 00000000000..abf76d079da
--- /dev/null
+++ b/extern/freestyle/src/rendering/GLDebugRenderer.h
@@ -0,0 +1,182 @@
+//
+//  Filename         : GLDebugRenderer.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Class to render the debug informations related to
+//                     a scene
+//  Date of creation : 03/04/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  GLDEBUGRENDERER_H
+# define GLDEBUGRENDERER_H
+
+# include <float.h>
+# include "../system/FreestyleConfig.h"
+# include "GLRenderer.h"
+# include "../view_map/Silhouette.h"
+# include "../winged_edge/Curvature.h"
+
+class WSMeshShape;
+class WSExactShape;
+
+class LIB_RENDERING_EXPORT GLDebugRenderer : public GLRenderer
+{
+public:
+
+  inline GLDebugRenderer() : GLRenderer() {
+    _bboxSize = 2.0;
+    SetMaxValue(&_minEdgeSize);
+    _SelectedFEdge = 0;
+  }
+
+  inline ~GLDebugRenderer() {}
+
+  VISIT_DECL(NodeShape)
+
+  VISIT_DECL(IndexedFaceSet)
+  VISIT_DECL(LineRep)
+  VISIT_DECL(OrientedLineRep)
+  VISIT_DECL(VertexRep)
+
+  /*! Renders a bitmap string in world coordinates 
+   *  x, y, z
+   *    The world coordinates of the sentence's starting point
+   *  font
+   *    The font used to display the text. 
+   *    Must be one of :
+   *    - GLUT_STROKE_ROMAN 
+   *    - GLUT_STROKE_MONO_ROMAN 
+   *  string
+   *    The text to display
+   *  size
+   *    The relative size of the text to display
+   */
+  void renderBitmapString(real x, 
+			  real y, 
+			  real z, 
+			  void *font, 
+			  char *string,
+			  float size = 1.f)  ; 
+
+  /*! Reinitialize the Renderer so as the previous 
+   *  text size does not affect the current one.
+   *  iBBoxSize
+   *    The size of the scene bounding box.
+   */
+  inline void ReInit(real iBBoxSize) {_bboxSize = iBBoxSize; SetMaxValue(&_minEdgeSize);}
+
+  inline void SetSelectedFEdge(FEdge *iFEdge) {_SelectedFEdge = iFEdge;}
+  inline FEdge * selectedFEdge() {return _SelectedFEdge;}
+
+protected:
+
+  /*! Renders a face made of a triangles strip
+   *    iVertices
+   *      Array of float containing the face vertices. 3 floats per 
+   *      x, y, z vertex coordinates
+   *    iNormals 
+   *      Array of float containing the face normals. 3 floats per 
+   *      x, y, z vertex normal coordinates
+   *    iVIndices
+   *      Array of the indices (to use with the iVertices array) 
+   *      describing the vertices parsing order
+   *    iNIndices
+   *      Array of normals indices (to use with iNormals array)
+   *      describing the normals parsing order
+   *    iNVertices
+   *      The number of vertices in the face
+   */
+  virtual void RenderTriangleStrip(const real *iVertices, 
+                                   const real *iNormals,
+                                   const Material *const* iMaterials, 
+                                   const unsigned* iVIndices, 
+                                   const unsigned* iNIndices,
+                                   const unsigned* iMIndices,
+                                   const unsigned iNVertices);
+
+  /*! Renders a face made of a triangles fan
+   *    iVertices
+   *      Array of float containing the face vertices. 3 floats per 
+   *      x, y, z vertex coordinates
+   *    iNormals 
+   *      Array of float containing the face normals. 3 floats per 
+   *      x, y, z vertex normal coordinates
+   *    iVIndices
+   *      Array of the indices (to use with the iVertices array) 
+   *      describing the vertices parsing order
+   *    iNIndices
+   *      Array of normals indices (to use with iNormals array)
+   *      describing the normals parsing order
+   *    iNVertices
+   *      The number of vertices in the face
+   */
+  virtual void RenderTriangleFan(const real *iVertices, 
+                                   const real *iNormals,
+                                   const Material *const*iMaterials, 
+                                   const unsigned* iVIndices, 
+                                   const unsigned* iNIndices,
+                                   const unsigned* iMIndices,
+                                   const unsigned iNVertices);
+
+  /*! Renders a face made of single triangles
+   *    iVertices
+   *      Array of float containing the face vertices. 3 floats per 
+   *      x, y, z vertex coordinates
+   *    iNormals 
+   *      Array of float containing the face normals. 3 floats per 
+   *      x, y, z vertex normal coordinates
+   *    iVIndices
+   *      Array of the indices (to use with the iVertices array) 
+   *      describing the vertices parsing order
+   *    iNIndices
+   *      Array of normals indices (to use with iNormals array)
+   *      describing the normals parsing order
+   *    iNVertices
+   *      The number of vertices in the face
+   */
+  virtual void RenderTriangles(const real *iVertices, 
+                                   const real *iNormals,
+                                   const Material *const* iMaterials, 
+                                   const unsigned* iVIndices, 
+                                   const unsigned* iNIndices,
+                                   const unsigned* iMIndices,
+                                   const unsigned iNVertices);
+
+  /*! glTranslatef or glTranslated */
+  inline void glTranslater(float x, float y, float z) {glTranslatef(x,y,z);}
+  inline void glTranslater(real x, real y, real z) {glTranslated(x,y,z);}
+
+
+private:
+
+  inline void SetMaxValue(float *oValue) {*oValue = FLT_MAX;}
+  inline void SetMaxValue(real *oValue) {*oValue = DBL_MAX;}
+
+  mutable real _bboxSize; 
+  mutable real _minEdgeSize;
+
+  FEdge *_SelectedFEdge;
+};
+
+#endif // GLDEBUGRENDERER_H
diff --git a/extern/freestyle/src/rendering/GLFreeMemoryVisitor.cpp b/extern/freestyle/src/rendering/GLFreeMemoryVisitor.cpp
new file mode 100644
index 00000000000..b5a835f5104
--- /dev/null
+++ b/extern/freestyle/src/rendering/GLFreeMemoryVisitor.cpp
@@ -0,0 +1,27 @@
+#include "GLFreeMemoryVisitor.h"
+#include "../scene_graph/IndexedFaceSet.h"
+
+# ifdef WIN32
+#  include <windows.h>
+# endif
+# ifdef __MACH__
+#  include <OpenGL/gl.h>
+# else
+#  include <GL/gl.h>
+# endif
+
+GLFreeMemoryVisitor::GLFreeMemoryVisitor()
+:SceneVisitor(){
+}
+
+GLFreeMemoryVisitor::~GLFreeMemoryVisitor(){
+}
+
+void GLFreeMemoryVisitor::visitIndexedFaceSet(IndexedFaceSet& ifs){
+    GLuint dl = ifs.displayList();
+    if(dl != 0){
+        if(glIsList(dl)){
+            glDeleteLists(dl, 1);
+        }
+    }
+}
diff --git a/extern/freestyle/src/rendering/GLFreeMemoryVisitor.h b/extern/freestyle/src/rendering/GLFreeMemoryVisitor.h
new file mode 100644
index 00000000000..dd6412b1bb7
--- /dev/null
+++ b/extern/freestyle/src/rendering/GLFreeMemoryVisitor.h
@@ -0,0 +1,23 @@
+#ifndef GL_FREE_MEMORY_VISITOR_H_
+#define GL_FREE_MEMORY_VISITOR_H_
+
+# include "../system/FreestyleConfig.h"
+# include "../scene_graph/SceneVisitor.h"
+
+/*! Mainly used to delete display lists */
+class LIB_RENDERING_EXPORT GLFreeMemoryVisitor : public SceneVisitor
+{
+public:
+
+    GLFreeMemoryVisitor() ;
+    virtual ~GLFreeMemoryVisitor() ;
+
+    //
+    // visitClass methods
+    //
+    //////////////////////////////////////////////
+
+        VISIT_DECL(IndexedFaceSet)
+};
+
+#endif // GL_FREE_MEMORY_H_
\ No newline at end of file
diff --git a/extern/freestyle/src/rendering/GLMonoColorRenderer.cpp b/extern/freestyle/src/rendering/GLMonoColorRenderer.cpp
new file mode 100755
index 00000000000..792846fa020
--- /dev/null
+++ b/extern/freestyle/src/rendering/GLMonoColorRenderer.cpp
@@ -0,0 +1,43 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "GLMonoColorRenderer.h"
+
+void GLMonoColorRenderer::visitMaterial(Material&) {
+  glColor3f(_r, _g, _b);
+}
+
+void GLMonoColorRenderer::visitDrawingStyle(DrawingStyle&) {
+  glDisable(GL_LIGHTING);
+  glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+  glEnable(GL_BLEND);
+  glEnable(GL_LINE_SMOOTH);
+  glLineWidth(3.0);
+  glPolygonMode(GL_BACK, GL_LINE);
+  //glPolygonMode(GL_BACK, GL_FILL);
+}
+
+void GLMonoColorRenderer::setColor(float r, float g, float b, float alpha) {
+  _r = r;
+  _g = g;
+  _b = b;
+  _alpha = alpha;
+}
diff --git a/extern/freestyle/src/rendering/GLMonoColorRenderer.h b/extern/freestyle/src/rendering/GLMonoColorRenderer.h
new file mode 100755
index 00000000000..d8e3cf536ec
--- /dev/null
+++ b/extern/freestyle/src/rendering/GLMonoColorRenderer.h
@@ -0,0 +1,60 @@
+//
+//  Filename         : GLMonoColorRenderer.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Class to render 3D scene in 2 colors thanks to OpenGL
+//  Date of creation : 07/02/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  GLMONOCOLORRENDERER_H
+# define GLMONOCOLORRENDERER_H
+
+# include "../system/FreestyleConfig.h"
+# include "GLRenderer.h"
+
+class LIB_RENDERING_EXPORT GLMonoColorRenderer : public GLRenderer
+{
+ public:
+
+  GLMonoColorRenderer() : GLRenderer() {
+    _r = _g = _b = 0.f;
+    _alpha = 1.f;
+  }
+
+  virtual ~GLMonoColorRenderer() {}
+
+  VISIT_DECL(DrawingStyle)
+  VISIT_DECL(Material)
+
+  void setColor(float r, float g, float b, float alpha = 1.f);
+
+private:
+
+  float _r;
+  float _g;
+  float _b;
+  float _alpha;
+};
+
+#endif // GLMONOCOLORRENDERER_H
diff --git a/extern/freestyle/src/rendering/GLRenderer.cpp b/extern/freestyle/src/rendering/GLRenderer.cpp
new file mode 100755
index 00000000000..d566060dfc7
--- /dev/null
+++ b/extern/freestyle/src/rendering/GLRenderer.cpp
@@ -0,0 +1,467 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "../scene_graph/IndexedFaceSet.h"
+#include "../scene_graph/NodeDrawingStyle.h"
+#include "../scene_graph/NodeLight.h"
+#include "../scene_graph/NodeCamera.h"
+#include "../scene_graph/NodeTransform.h"
+#include "../scene_graph/NodeShape.h"
+#include "../scene_graph/OrientedLineRep.h"
+#include "../scene_graph/VertexRep.h"
+#include "../stroke/Stroke.h"
+
+#include "../scene_graph/TriangleRep.h"
+
+#include "GLRenderer.h"
+
+static GLenum lights[8] = {GL_LIGHT0, 
+                    GL_LIGHT1, 
+                    GL_LIGHT2, 
+                    GL_LIGHT3, 
+                    GL_LIGHT4,
+                    GL_LIGHT5,
+                    GL_LIGHT6,
+                    GL_LIGHT7};
+
+void GLRenderer::visitIndexedFaceSet(IndexedFaceSet& ifs)
+{
+  /*GLuint dl = ifs.displayList();
+  if(dl != 0){
+    glCallList(dl);
+    return;
+  }*/
+  unsigned int fIndex = 0;
+  
+  const real * vertices = ifs.vertices();
+  const real * normals = ifs.normals();
+  const real * texCoords = ifs.texCoords();
+  const Material *const* materials = ifs.materials();
+  const unsigned *vindices = ifs.vindices();
+  const unsigned *nindices = ifs.nindices();
+  const unsigned *mindices = ifs.mindices();
+  const unsigned *tindices = ifs.tindices();
+  const unsigned numfaces = ifs.numFaces();
+  const IndexedFaceSet::TRIANGLES_STYLE * faceStyle = ifs.trianglesStyle();
+  const unsigned *numVertexPerFace = ifs.numVertexPerFaces();
+  
+
+  const unsigned* pvi = vindices;
+  const unsigned* pni = nindices;
+  const unsigned* pmi = mindices;
+  const unsigned* pti = tindices;
+
+  //dl = glGenLists(1);
+  //glNewList(dl, GL_COMPILE_AND_EXECUTE);
+  for(fIndex=0; fIndex<numfaces; fIndex++)
+  {
+    switch(faceStyle[fIndex])
+    {
+    case IndexedFaceSet::TRIANGLE_STRIP:
+      RenderTriangleStrip(vertices, normals, materials, texCoords, pvi, pni, pmi, pti, numVertexPerFace[fIndex]);
+      break;
+    case IndexedFaceSet::TRIANGLE_FAN:
+      RenderTriangleFan(vertices, normals, materials, texCoords, pvi, pni, pmi, pti, numVertexPerFace[fIndex]);
+      break;
+    case IndexedFaceSet::TRIANGLES:
+      RenderTriangles(vertices, normals, materials, texCoords, pvi, pni, pmi, pti, numVertexPerFace[fIndex]);
+      break;
+    }
+    pvi += numVertexPerFace[fIndex];
+    pni += numVertexPerFace[fIndex];
+		if(pmi)
+			pmi += numVertexPerFace[fIndex];
+    if(pti)
+        pti += numVertexPerFace[fIndex];
+  }
+  //glEndList();
+  //ifs.SetDisplayList(dl);
+}
+
+void GLRenderer::visitNodeTransform(NodeTransform& tn) {
+  if(tn.scaled())
+    glEnable(GL_NORMALIZE);
+}
+
+void GLRenderer::visitNodeTransformBefore(NodeTransform& tn) {
+  glPushMatrix();
+
+  // Now apply transform
+  applyTransform(tn.matrix());
+}
+
+void GLRenderer::visitNodeTransformAfter(NodeTransform& tn) {
+  glPopMatrix();
+}
+
+void GLRenderer::visitNodeLight(NodeLight& ln)  
+{
+  if(true != ln.isOn())
+    return;
+
+  int number = ln.number();
+  
+  glLightfv(lights[number], GL_AMBIENT, ln.ambient());
+  glLightfv(lights[number], GL_DIFFUSE, ln.diffuse());
+  glLightfv(lights[number], GL_SPECULAR, ln.specular());
+  glLightfv(lights[number], GL_POSITION, ln.position());
+
+  glEnable(lights[number]);
+}
+
+void GLRenderer::visitNodeCamera(NodeCamera& cn)  
+{
+    const double * mvm = cn.modelViewMatrix();
+    const double * pm = cn.projectionMatrix();
+
+    glMatrixMode(GL_PROJECTION);
+    glLoadIdentity();
+    glMultMatrixd(pm);
+
+    glMatrixMode(GL_MODELVIEW);
+    glLoadIdentity();
+    glMultMatrixd(mvm);
+
+
+}
+
+void GLRenderer::visitNodeDrawingStyleBefore(NodeDrawingStyle& ds) {
+  glPushAttrib(GL_ALL_ATTRIB_BITS);
+}
+
+void GLRenderer::visitNodeDrawingStyleAfter(NodeDrawingStyle&) {
+  glPopAttrib();
+}
+
+void GLRenderer::RenderTriangleStrip( const real *iVertices, 
+                                     const real *iNormals,
+                                     const Material *const* iMaterials,
+                                     const real *iTexCoords,
+                                     const unsigned* iVIndices, 
+                                     const unsigned* iNIndices,
+                                     const unsigned* iMIndices,
+                                     const unsigned* iTIndices,
+                                     const unsigned iNVertices) 
+{
+  unsigned index = -1;
+  glBegin(GL_TRIANGLE_STRIP);
+  for(unsigned int i=0; i<iNVertices; i++)
+  {
+		if(iMIndices){
+			if(iMIndices[i] != index){
+				visitMaterial(*(iMaterials[iMIndices[i]]));
+				index = iMIndices[i];
+			}
+		}
+
+        if(iTIndices){
+            glTexCoord2f(   iTexCoords[iTIndices[i]],
+                            iTexCoords[iTIndices[i]+1]);
+		}
+    
+    glNormal3r(iNormals[iNIndices[i]], 
+               iNormals[iNIndices[i]+1],
+               iNormals[iNIndices[i]+2]);
+
+    glVertex3r( iVertices[iVIndices[i]], 
+                iVertices[iVIndices[i]+1],
+                iVertices[iVIndices[i]+2]);
+  }
+  glEnd();
+}
+
+void GLRenderer::RenderTriangleFan( const real *iVertices, 
+                                    const real *iNormals,
+                                    const Material *const* iMaterials,
+                                    const real *iTexCoords,
+                                    const unsigned* iVIndices, 
+                                    const unsigned* iNIndices,
+                                    const unsigned* iMIndices,
+                                    const unsigned* iTIndices,
+                                    const unsigned iNVertices)  
+{
+  unsigned index = -1;
+  glBegin(GL_TRIANGLE_FAN);
+  for(unsigned int i=0; i<iNVertices; i++)
+  {
+		if(iMIndices){
+			if(iMIndices[i] != index){
+				visitMaterial(*(iMaterials[iMIndices[i]]));
+				index = iMIndices[i];
+			}
+		}
+        if(iTIndices){
+            glTexCoord2f(   iTexCoords[iTIndices[i]],
+                            iTexCoords[iTIndices[i]+1]);
+		}
+
+    glNormal3r(iNormals[iNIndices[i]], 
+               iNormals[iNIndices[i]+1],
+               iNormals[iNIndices[i]+2]);
+
+    glVertex3r( iVertices[iVIndices[i]], 
+                iVertices[iVIndices[i]+1],
+                iVertices[iVIndices[i]+2]);
+  }
+  glEnd();
+}
+
+void GLRenderer::RenderTriangles( const real *iVertices, 
+                                 const real *iNormals,
+                                 const Material *const* iMaterials,
+                                 const real *iTexCoords,
+                                 const unsigned* iVIndices, 
+                                 const unsigned* iNIndices,
+                                 const unsigned* iMIndices,
+                                 const unsigned* iTIndices,
+                                 const unsigned iNVertices)  
+{
+  unsigned index = -1;
+  glBegin(GL_TRIANGLES);
+  for(unsigned int i=0; i<iNVertices; i++)
+  {
+		if(iMIndices){
+			if(iMIndices[i] != index){
+				visitMaterial(*(iMaterials[iMIndices[i]]));
+				index = iMIndices[i];
+			}
+		}
+        if(iTIndices){
+            glTexCoord2f(   iTexCoords[iTIndices[i]],
+                            iTexCoords[iTIndices[i]+1]);
+		}
+
+    glNormal3r(iNormals[iNIndices[i]], 
+               iNormals[iNIndices[i]+1],
+               iNormals[iNIndices[i]+2]);
+
+    glVertex3r( iVertices[iVIndices[i]], 
+                iVertices[iVIndices[i]+1],
+                iVertices[iVIndices[i]+2]);
+  }
+  glEnd();
+}
+
+void GLRenderer::visitLineRep( LineRep& iLine) 
+{
+  if(iLine.width() != 0)
+    glLineWidth(iLine.width());
+
+  switch(iLine.style())
+  {
+  case LineRep::LINES:
+    glBegin(GL_LINES);
+    break;
+  case LineRep::LINE_STRIP:
+    glBegin(GL_LINE_STRIP);
+    break;
+  case LineRep::LINE_LOOP:
+    glBegin(GL_LINE_LOOP);
+    break;
+  default:
+    return;
+  }
+
+ const vector<Vec3r>& vertices = iLine.vertices();
+  float step=1.f/vertices.size();
+  vector<Vec3r>::const_iterator v;
+
+  for(v=vertices.begin(); v!=vertices.end(); v++)
+    glVertex3r((*v)[0], (*v)[1], (*v)[2]);
+
+  glEnd();
+}
+
+
+void GLRenderer::visitTriangleRep( TriangleRep& iTriangle) 
+{
+  glPushAttrib(GL_ALL_ATTRIB_BITS);
+  switch(iTriangle.style())
+  {
+  case TriangleRep::FILL:
+    glPolygonMode(GL_FRONT, GL_FILL);
+    break;
+  case TriangleRep::LINES:
+    glPolygonMode(GL_FRONT, GL_LINES);
+    break;
+  default:
+    return;
+  }
+
+  glBegin(GL_TRIANGLES);
+  for(int i=0; i<3; ++i)
+  {
+    glColor3f(iTriangle.color(i)[0], iTriangle.color(i)[1], iTriangle.color(i)[2]);
+    glVertex3r(iTriangle.vertex(i)[0], iTriangle.vertex(i)[1], iTriangle.vertex(i)[2]);
+  }
+
+  glEnd();
+
+
+
+  glPopAttrib();
+
+}
+
+void GLRenderer::visitOrientedLineRep(OrientedLineRep& iLine) 
+{
+  switch(iLine.style())
+  {
+  case LineRep::LINES:
+    glBegin(GL_LINES);
+    break;
+  case LineRep::LINE_STRIP:
+    glBegin(GL_LINE_STRIP);
+    break;
+  case LineRep::LINE_LOOP:
+    glBegin(GL_LINE_LOOP);
+    break;
+  default:
+    return;
+  }
+
+  int i=0;
+  int ncolor = iLine.getId().getFirst()%3;
+  
+  const vector<Vec3r>& vertices = iLine.vertices();
+  float step=1.f/vertices.size();
+  vector<Vec3r>::const_iterator v;
+  for(v=vertices.begin(); v!=vertices.end(); v++)
+  {
+    switch(ncolor)
+    {
+    case 0:
+      glColor3f(i*step,0.f,0.f);
+      break;
+    case 1:
+      glColor3f(0.f, i*step, 0.f);
+      break;
+    case 2:
+      glColor3f(0.f, 0.f, i*step);
+      break;
+    default:
+      glColor3f(i*step, i*step,i*step);
+      break;
+    }
+    i++;
+    glVertex3r((*v)[0], (*v)[1], (*v)[2]);
+  }
+
+  glEnd();
+}
+
+void GLRenderer::visitVertexRep( VertexRep& iVertex) 
+{
+  if(iVertex.pointSize() != 0.f)
+    glPointSize(iVertex.pointSize());
+  
+  glBegin(GL_POINTS);
+  glVertex3r(iVertex.x(), iVertex.y(), iVertex.z());
+  glEnd();
+}
+
+void GLRenderer::visitDrawingStyle(DrawingStyle& iDrawingStyle) 
+{
+  
+  // Drawing Style management
+  switch(iDrawingStyle.style())
+  {
+  case DrawingStyle::FILLED:
+    glPolygonMode(GL_FRONT, GL_FILL);
+    glShadeModel(GL_SMOOTH);
+    break;
+
+  case DrawingStyle::LINES:
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+    glEnable(GL_BLEND);
+    glEnable(GL_LINE_SMOOTH);
+    glPolygonMode(GL_FRONT, GL_LINE);
+    glLineWidth(iDrawingStyle.lineWidth());
+    break;
+
+  case DrawingStyle::POINTS:
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+    glEnable(GL_BLEND);
+    glEnable(GL_POINT_SMOOTH);
+    glPolygonMode(GL_FRONT, GL_POINT);
+    glPointSize(iDrawingStyle.pointSize());
+    break;
+
+  case DrawingStyle::INVISIBLE:
+    glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
+    glDepthMask(0);
+    break;
+
+  default:
+    break;
+  }
+
+  glLineWidth(iDrawingStyle.lineWidth());
+  glPointSize(iDrawingStyle.pointSize());
+
+  // FIXME
+  if(true == iDrawingStyle.lightingEnabled())
+    glEnable(GL_LIGHTING);
+  else
+    glDisable(GL_LIGHTING);
+}
+
+void GLRenderer::visitMaterial(Material& m) {
+  const float* diff = m.diffuse();
+  const float* amb = m.ambient();
+  const float* spec = m.specular();
+  const float* em = m.emission();
+
+  RenderColor(diff);
+  glMaterialfv(GL_FRONT, GL_AMBIENT, amb);
+  glMaterialfv(GL_FRONT, GL_DIFFUSE, diff);
+  glMaterialfv(GL_FRONT, GL_SPECULAR, spec);
+  glMaterialfv(GL_FRONT, GL_EMISSION, em);
+  glMaterialf(GL_FRONT, GL_SHININESS, m.shininess());
+}
+
+void GLRenderer::visitMaterial(const Material& m) {
+  const float* diff = m.diffuse();
+  const float* amb = m.ambient();
+  const float* spec = m.specular();
+  const float* em = m.emission();
+
+  RenderColor(diff);
+  glMaterialfv(GL_FRONT, GL_AMBIENT, amb);
+  glMaterialfv(GL_FRONT, GL_DIFFUSE, diff);
+  glMaterialfv(GL_FRONT, GL_SPECULAR, spec);
+  glMaterialfv(GL_FRONT, GL_EMISSION, em);
+  glMaterialf(GL_FRONT, GL_SHININESS, m.shininess());
+}
+void GLRenderer::applyTransform( const Matrix44r &iMatrix)  
+{
+  real m[16];
+  for(int lign=0; lign<4; lign++)
+    for(int column=0; column<4; column++)
+      m[column*4+lign] = iMatrix(lign, column);
+
+  glMultMatrixr(m);
+}
+
+void GLRenderer::RenderColor( const float *rgba)  
+{
+  glColor4fv(rgba);
+} 
diff --git a/extern/freestyle/src/rendering/GLRenderer.h b/extern/freestyle/src/rendering/GLRenderer.h
new file mode 100755
index 00000000000..ddbf082038b
--- /dev/null
+++ b/extern/freestyle/src/rendering/GLRenderer.h
@@ -0,0 +1,204 @@
+//
+//  Filename         : GLRenderer.h
+//  Author(s)        : Stephane Grabli, Emmanuel Turquin
+//  Purpose          : Class to render a 3D scene thanks to OpenGL
+//  Date of creation : 07/02/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  GLRENDERER_H
+# define GLRENDERER_H
+
+# ifdef WIN32
+#  include <windows.h>
+# endif
+# ifdef __MACH__
+#  include <OpenGL/gl.h>
+# else
+#  include <GL/gl.h>
+# endif
+
+# include "../system/FreestyleConfig.h"
+# include "../system/Precision.h"
+# include "../scene_graph/SceneVisitor.h"
+# include "../geometry/Geom.h"
+using namespace Geometry; 
+
+class LIB_RENDERING_EXPORT GLRenderer : public SceneVisitor
+{
+ public:
+
+  inline GLRenderer() : SceneVisitor() {}
+  virtual ~GLRenderer() {}
+
+  //
+  // visitClass methods
+  //
+  //////////////////////////////////////////////
+
+  VISIT_DECL(NodeLight)
+  VISIT_DECL(NodeCamera)
+  VISIT_DECL(NodeTransform)
+
+  VISIT_DECL(LineRep)
+  VISIT_DECL(OrientedLineRep)
+  VISIT_DECL(TriangleRep)
+  VISIT_DECL(VertexRep)
+  VISIT_DECL(IndexedFaceSet)
+  VISIT_DECL(DrawingStyle)
+  VISIT_DECL(Material)
+
+  virtual void visitMaterial(const Material&);
+  virtual void visitNodeTransformBefore(NodeTransform&);
+  virtual void visitNodeTransformAfter(NodeTransform&);
+  virtual void visitNodeDrawingStyleBefore(NodeDrawingStyle&);
+  virtual void visitNodeDrawingStyleAfter(NodeDrawingStyle&);
+
+ protected:
+
+  /*! Renders a face made of a triangles strip
+   *    iVertices
+   *      Array of float containing the face vertices. 3 floats per 
+   *      x, y, z vertex coordinates
+   *    iNormals 
+   *      Array of float containing the face normals. 3 floats per 
+   *      x, y, z vertex normal coordinates
+   *    iTexCoords
+   *      Array of float containing the face uv coords. 2 floats per 
+   *      u,v vertex texture coordinates
+   *    iVIndices
+   *      Array of the indices (to use with the iVertices array) 
+   *      describing the vertices parsing order
+   *    iNIndices
+   *      Array of normals indices (to use with iNormals array)
+   *      describing the normals parsing order
+   *    iTIndices
+   *      Array of texture coordinates indices (to use with iTexCoords array)
+   *      describing the texture coordinates parsing order
+   *    iNVertices
+   *      The number of vertices in the face
+   */
+  virtual void RenderTriangleStrip(const real *iVertices, 
+                                   const real *iNormals,
+                                   const Material *const*iMaterials, 
+                                   const real *iTexCoords,
+                                   const unsigned* iVIndices, 
+                                   const unsigned* iNIndices,
+                                   const unsigned* iMIndices,
+                                   const unsigned* iTIndices,
+                                   const unsigned iNVertices) ;
+
+  /*! Renders a face made of a triangles fan
+   *    iVertices
+   *      Array of float containing the face vertices. 3 floats per 
+   *      x, y, z vertex coordinates
+   *    iNormals 
+   *      Array of float containing the face normals. 3 floats per 
+   *      x, y, z vertex normal coordinates
+   *    iTexCoords
+   *      Array of float containing the face uv coords. 2 floats per 
+   *      u,v vertex texture coordinates
+   *    iVIndices
+   *      Array of the indices (to use with the iVertices array) 
+   *      describing the vertices parsing order
+   *    iNIndices
+   *      Array of normals indices (to use with iNormals array)
+   *      describing the normals parsing order
+   *    iTIndices
+   *      Array of texture coordinates indices (to use with iTexCoords array)
+   *      describing the texture coordinates parsing order
+   *    iNVertices
+   *      The number of vertices in the face
+   */
+  virtual void RenderTriangleFan(const real *iVertices, 
+                                 const real *iNormals,
+                                 const Material *const* iMaterials,
+                                 const real *iTexCoords,
+                                 const unsigned* iVIndices, 
+                                 const unsigned* iNIndices,
+                                 const unsigned* iMIndices,
+                                 const unsigned* iTIndices,
+                                 const unsigned iNVertices) ;
+
+  /*! Renders a face made of single triangles
+   *    iVertices
+   *      Array of float containing the face vertices. 3 floats per 
+   *      x, y, z vertex coordinates
+   *    iNormals 
+   *      Array of float containing the face normals. 3 floats per 
+   *      x, y, z vertex normal coordinates
+   *    iTexCoords
+   *      Array of float containing the face uv coords. 2 floats per 
+   *      u,v vertex texture coordinates
+   *    iVIndices
+   *      Array of the indices (to use with the iVertices array) 
+   *      describing the vertices parsing order
+   *    iNIndices
+   *      Array of normals indices (to use with iNormals array)
+   *      describing the normals parsing order
+   *    iTIndices
+   *      Array of texture coordinates indices (to use with iTexCoords array)
+   *      describing the texture coordinates parsing order
+   *    iNVertices
+   *      The number of vertices in the face
+   */
+  virtual void RenderTriangles(const real *iVertices, 
+                               const real *iNormals,
+                               const Material *const* iMaterials, 
+                               const real *iTexCoords,
+                               const unsigned* iVIndices, 
+                               const unsigned* iNIndices,
+                               const unsigned* iMIndices,
+                               const unsigned* iTIndices,
+                               const unsigned iNVertices)  ;
+
+  /*! Apply a transform matrix by multiplying 
+   *  the current OpenGL ModelView Matrix by 
+   *  iMatrix
+   */
+  virtual void applyTransform( const Matrix44r &iMatrix)  ;
+
+  /*! Sets the current drawing color.
+   *  Active only when light is disabled
+   *  (simple call to glColor4fv)
+   *    rgba
+   *      array of 4 floats (r, g, b and alpha)
+   */
+  virtual void RenderColor( const float *rgba);
+
+  /*! glVertex3f or glVertex3d */
+  inline void glVertex3r(float x, float y, float z) {glVertex3f(x,y,z);}
+  inline void glVertex3r(real x, real y, real z) {glVertex3d(x,y,z);}
+
+  /*! glVertex3f or glNormal3d */
+  inline void glNormal3r(float x, float y, float z) {glNormal3f(x,y,z);}
+  inline void glNormal3r(real x, real y, real z) {glNormal3d(x,y,z);}
+
+  /*! glMultMatrixf or glMultMatrixd */
+  inline void glMultMatrixr(float *m) {glMultMatrixf(m);}
+  inline void glMultMatrixr(real *m) {glMultMatrixd(m);}
+
+};
+
+#endif // GLRENDERER_H
diff --git a/extern/freestyle/src/rendering/GLSelectRenderer.cpp b/extern/freestyle/src/rendering/GLSelectRenderer.cpp
new file mode 100755
index 00000000000..b4a2406c644
--- /dev/null
+++ b/extern/freestyle/src/rendering/GLSelectRenderer.cpp
@@ -0,0 +1,159 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "../scene_graph/IndexedFaceSet.h"
+#include "../scene_graph/NodeShape.h"
+#include "GLSelectRenderer.h"
+
+static const float	INACTIVE_COLOR_MIN = 0.2;
+static const float	INACTIVE_COLOR_MAX = 0.8;
+static const float	INACTIVE_COLOR_OFFSET = 0.2;
+
+static const float	ACTIVE_COLOR[4] = {0.8,
+					   0.2,
+					   0.2,
+					   1};
+
+static float		selection_color[4] = {INACTIVE_COLOR_MIN,
+					      INACTIVE_COLOR_MIN,
+					      INACTIVE_COLOR_MIN,
+					      1};
+
+
+void GLSelectRenderer::resetColor() {
+  for (unsigned i = 0; i < 3; ++i)
+    selection_color[i] = INACTIVE_COLOR_MIN;
+}
+
+void GLSelectRenderer::visitNodeShape(NodeShape& sn) {
+  if (_gl_select_rendering)
+    return;
+  for (unsigned i = 0; i < 3; ++i) {
+    selection_color[i] += INACTIVE_COLOR_OFFSET;
+    if (selection_color[i] > INACTIVE_COLOR_MAX)
+      selection_color[i] = INACTIVE_COLOR_MIN;
+  }
+  if (sn.shapes()[0]->getId() == _selected_shape) {
+    _current_shape_active = true;
+    return;
+  }
+  _current_shape_active = false;
+}
+
+void GLSelectRenderer::visitMaterial(Material& m) {
+  if (_gl_select_rendering)
+    return;
+
+  const float* amb = m.ambient();
+  const float* spec = m.specular();
+  const float* em = m.emission();
+
+  if (_current_shape_active) {
+    RenderColor(ACTIVE_COLOR);
+    glMaterialfv(GL_FRONT, GL_DIFFUSE, ACTIVE_COLOR);
+  } else {
+    RenderColor(selection_color);
+    glMaterialfv(GL_FRONT, GL_DIFFUSE, selection_color);
+  }
+  glMaterialfv(GL_FRONT, GL_AMBIENT, amb);
+  glMaterialfv(GL_FRONT, GL_SPECULAR, spec);
+  glMaterialfv(GL_FRONT, GL_EMISSION, em);
+  glMaterialf(GL_FRONT, GL_SHININESS, m.shininess());
+}
+
+void GLSelectRenderer::visitMaterial(const Material& m) {
+  if (_gl_select_rendering)
+    return;
+
+  const float* amb = m.ambient();
+  const float* spec = m.specular();
+  const float* em = m.emission();
+
+  if (_current_shape_active) {
+    RenderColor(ACTIVE_COLOR);
+    glMaterialfv(GL_FRONT, GL_DIFFUSE, ACTIVE_COLOR);
+  } else {
+    RenderColor(selection_color);
+    glMaterialfv(GL_FRONT, GL_DIFFUSE, selection_color);
+  }
+  glMaterialfv(GL_FRONT, GL_AMBIENT, amb);
+  glMaterialfv(GL_FRONT, GL_SPECULAR, spec);
+  glMaterialfv(GL_FRONT, GL_EMISSION, em);
+  glMaterialf(GL_FRONT, GL_SHININESS, m.shininess());
+}
+
+void GLSelectRenderer::visitIndexedFaceSet(IndexedFaceSet& ifs)
+{
+  unsigned int fIndex = 0;
+  
+  const real * vertices = ifs.vertices();
+  const real * normals = ifs.normals();
+  const Material *const* materials = ifs.materials();
+  const real * texCoords= ifs.texCoords();
+  const unsigned *vindices = ifs.vindices();
+  const unsigned *nindices = ifs.nindices();
+  const unsigned *mindices = ifs.mindices();
+  const unsigned *tindices = ifs.tindices();
+  const unsigned numfaces = ifs.numFaces();
+  const IndexedFaceSet::TRIANGLES_STYLE * faceStyle = ifs.trianglesStyle();
+  const unsigned *numVertexPerFace = ifs.numVertexPerFaces();
+  
+
+  const unsigned* pvi = vindices;
+  const unsigned* pni = nindices;
+  const unsigned* pmi = mindices;
+  const unsigned* pti = tindices;
+
+  for(fIndex=0; fIndex<numfaces; fIndex++)
+  {
+    switch(faceStyle[fIndex])
+    {
+    case IndexedFaceSet::TRIANGLE_STRIP:
+      RenderTriangleStrip(vertices, normals, materials, texCoords, pvi, pni, pmi, pti, numVertexPerFace[fIndex]);
+      break;
+    case IndexedFaceSet::TRIANGLE_FAN:
+      RenderTriangleFan(vertices, normals, materials, texCoords, pvi, pni, pmi, pti, numVertexPerFace[fIndex]);
+      break;
+    case IndexedFaceSet::TRIANGLES:
+      RenderTriangles(vertices, normals, materials, texCoords, pvi, pni, pmi, pti, numVertexPerFace[fIndex]);
+      break;
+    }
+    pvi += numVertexPerFace[fIndex];
+    pni += numVertexPerFace[fIndex];
+    pmi += numVertexPerFace[fIndex];
+    if(pti)
+        pti += numVertexPerFace[fIndex];
+  }
+}
+
+void GLSelectRenderer::visitNodeShapeBefore(NodeShape& sn) {
+  if (!_gl_select_rendering)
+    return;
+  
+  glPushName(sn.shapes()[0]->getId().getFirst());
+}
+
+void GLSelectRenderer::visitNodeShapeAfter(NodeShape& sn) {
+  if (!_gl_select_rendering)
+    return;
+
+  glPopName();
+}
diff --git a/extern/freestyle/src/rendering/GLSelectRenderer.h b/extern/freestyle/src/rendering/GLSelectRenderer.h
new file mode 100755
index 00000000000..bf8a334aebb
--- /dev/null
+++ b/extern/freestyle/src/rendering/GLSelectRenderer.h
@@ -0,0 +1,85 @@
+//
+//  Filename         : GLSelectRenderer.h
+//  Author(s)        : Emmanuel Turquin
+//  Purpose          : Class to highlight selected shapes
+//  Date of creation : 09/01/2004
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  GL_SELECT_RENDERER_H
+# define GL_SELECT_RENDERER_H
+
+# include "GLRenderer.h"
+
+class LIB_RENDERING_EXPORT GLSelectRenderer : public GLRenderer
+{
+ public:
+
+  inline GLSelectRenderer() : GLRenderer() {
+    _selected_shape = -1; // -1 means no selection
+    _current_shape_active = false;
+    _gl_select_rendering = false;
+  }
+  virtual ~GLSelectRenderer() {}
+
+  //
+  // visitClass methods
+  //
+  //////////////////////////////////////////////
+
+  VISIT_DECL(NodeShape)
+
+  VISIT_DECL(IndexedFaceSet)
+  VISIT_DECL(Material)
+
+  virtual void visitMaterial(const Material&);
+  virtual void visitNodeShapeBefore(NodeShape&);
+  virtual void visitNodeShapeAfter(NodeShape&);
+
+  void resetColor();
+
+  void setSelectedId(const int id) {
+    _selected_shape = id;
+  }
+
+  void setSelectRendering(bool b) {
+    _gl_select_rendering = b;
+  }
+
+  int getSelectedId() const {
+    return _selected_shape;
+  }
+
+  bool getSelectRendering() const {
+    return _gl_select_rendering;
+  }
+
+ private:
+
+  int		_selected_shape;
+  bool		_current_shape_active;
+  bool		_gl_select_rendering;
+};
+
+#endif // GL_SELECT_RENDERER_H
diff --git a/extern/freestyle/src/rendering/GLStrokeRenderer.cpp b/extern/freestyle/src/rendering/GLStrokeRenderer.cpp
new file mode 100755
index 00000000000..7525807da47
--- /dev/null
+++ b/extern/freestyle/src/rendering/GLStrokeRenderer.cpp
@@ -0,0 +1,495 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include <qimage.h>
+#include <qfileinfo.h>
+#include <qgl.h>
+#include <qfile.h>
+#include "GLStrokeRenderer.h"
+
+#ifdef WIN32
+# include "extgl.h"
+#endif // WIN32
+
+//#define glBlendEquation(x)
+
+GLStrokeRenderer::GLStrokeRenderer()
+:StrokeRenderer()
+{
+  _textureManager = new GLTextureManager;
+}
+
+GLStrokeRenderer::~GLStrokeRenderer()
+{
+  if(0 != _textureManager)
+  {
+    delete _textureManager;
+    _textureManager = 0;
+  }
+}
+
+float initialColor(float x, float avTex=0.5)
+{
+  float y=(1-x)/avTex;
+  return (y>1 ? 1 : y);
+}
+//float complementColor(float x, float avTex=0.5)
+//{
+//  float y=(1-x)/avTex-1;
+//  return (y<0 ? 0 : y);
+//}
+
+float complementColor(float x, float avTex=0.5)
+{
+  float y=(1-x);///avTex-1;
+  return (y<0 ? 0 : y);
+}
+
+void GLStrokeRenderer::RenderStrokeRep(StrokeRep *iStrokeRep) const
+{
+  glPushAttrib(GL_COLOR_BUFFER_BIT);
+  Stroke::MediumType strokeType = iStrokeRep->getMediumType();
+  // int averageTextureAlpha=0.5; //default value
+  // if (strokeType==OIL_STROKE)
+    // averageTextureAlpha=0.75; 
+  // if (strokeType>=NO_BLEND_STROKE)
+    // averageTextureAlpha=1.0; 
+  // if (strokeType<0)
+    // {
+      // renderNoTexture(iStrokeRep);
+      // return;
+    // }
+  int i;
+  glDisable(GL_CULL_FACE);
+  glDisable(GL_LIGHTING);
+  glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
+  glShadeModel(GL_SMOOTH);
+  glDisable(GL_DEPTH_TEST);
+    
+  glEnable(GL_BLEND);
+
+  if(strokeType==Stroke::DRY_MEDIUM)
+    {
+      glBlendEquation(GL_MAX);
+    }
+  else if(strokeType==Stroke::OPAQUE_MEDIUM)
+    {
+      glBlendEquation(GL_ADD);
+      glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+    }
+  else
+    {
+      glBlendEquation(GL_ADD);
+      glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+    }
+  glEnable(GL_TEXTURE_2D);
+  glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+  //glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+
+  //first texture, basically the only one for lighter strokes
+  glBindTexture(GL_TEXTURE_2D, iStrokeRep->getTextureId()); 
+  //glBindTexture(GL_TEXTURE_2D, _textureManager.getPaperTextureIndex()); 
+  
+  vector<Strip*>& strips = iStrokeRep->getStrips();
+  for(vector<Strip*>::iterator s=strips.begin(), send=strips.end();
+  s!=send;
+  ++s){
+    Strip::vertex_container& vertices = (*s)->vertices();
+    glBegin(GL_TRIANGLE_STRIP);
+    for(Strip::vertex_container::iterator v=vertices.begin(), vend=vertices.end();
+    v!=vend;
+    ++v){
+      StrokeVertexRep * svRep = (*v);
+      Vec3r color = svRep->color();
+      real alpha = svRep->alpha();
+      glColor4f(complementColor(color[0]), 
+      complementColor(color[1]), 
+      complementColor(color[2]), alpha);
+      glTexCoord2f(svRep->texCoord()[0],svRep->texCoord()[1] );
+      glVertex2f(svRep->point2d()[0], svRep->point2d()[1]);
+    }  
+    glEnd();
+  }
+//  if (strokeType>=NO_BLEND_STROKE) return;
+  //  //return;
+  //
+  //  //second texture, the complement, for stronger strokes
+  //  glBindTexture(GL_TEXTURE_2D, _textureManager.getTextureIndex(2*strokeType+1)); 
+  //  glBegin(GL_TRIANGLE_STRIP);
+  //  for(i=0; i<_sizeStrip; i++)
+  //  {
+  //    glColor4f(complementColor(_color[i][0]), 
+  //      complementColor(_color[i][1]), 
+  //      complementColor(_color[i][2]), _alpha[i]);
+  //    glTexCoord2f(_texCoord[i][0],_texCoord[i][1] );
+  //    glVertex2f(_vertex[i][0], _vertex[i][1]);
+  //  }
+  //  glEnd();
+
+  glPopAttrib();
+}
+
+void GLStrokeRenderer::RenderStrokeRepBasic(StrokeRep *iStrokeRep) const
+{
+  glPushAttrib(GL_COLOR_BUFFER_BIT);
+  Stroke::MediumType strokeType = iStrokeRep->getMediumType();
+  int i;
+  glDisable(GL_CULL_FACE);
+  glDisable(GL_LIGHTING);
+  glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
+  glShadeModel(GL_SMOOTH);
+  glDisable(GL_DEPTH_TEST);
+    
+  glEnable(GL_BLEND);
+
+  glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+  glEnable(GL_TEXTURE_2D);
+  glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+  //glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+
+  //first texture, basically the only one for lighter strokes
+  glBindTexture(GL_TEXTURE_2D, iStrokeRep->getTextureId()); 
+  //glBindTexture(GL_TEXTURE_2D, _textureManager.getPaperTextureIndex()); 
+  
+  vector<Strip*>& strips = iStrokeRep->getStrips();
+  for(vector<Strip*>::iterator s=strips.begin(), send=strips.end();
+  s!=send;
+  ++s){
+    Strip::vertex_container& vertices = (*s)->vertices();
+    glBegin(GL_TRIANGLE_STRIP);
+    for(Strip::vertex_container::iterator v=vertices.begin(), vend=vertices.end();
+    v!=vend;
+    ++v){
+      StrokeVertexRep * svRep = (*v);
+      Vec3r color = svRep->color();
+      real alpha = svRep->alpha();
+      glColor4f(color[0], 
+              color[1], 
+              color[2], alpha);
+      glTexCoord2f(svRep->texCoord()[0],svRep->texCoord()[1] );
+      glVertex2f(svRep->point2d()[0], svRep->point2d()[1]);
+    }  
+    glEnd();
+  }
+  glPopAttrib();
+}
+
+//No Texture
+//void GLStrokeRenderer::renderNoTexture(StrokeRep *iStrokeRep) const
+//{
+//  Stroke::MediumType strokeType = iStrokeRep->getMediumType();
+//  int sizeStrip = iStrokeRep->sizeStrip();
+//  const Vec3r *color = iStrokeRep->colors();
+//  const Vec2r *vertex = iStrokeRep->vertices();
+//  const float *alpha = iStrokeRep->alpha();
+//  
+//  glDisable(GL_LIGHTING);
+//  glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
+//  glShadeModel(GL_SMOOTH);
+//  glDisable(GL_DEPTH_TEST);
+//
+//  //if (strokeType==NO_TEXTURE_STROKE)
+//  if(strokeType < 0)
+//    {
+//      glDisable(GL_BLEND);
+//      glDisable(GL_TEXTURE_2D);
+//      glBegin(GL_TRIANGLE_STRIP);
+//      for(int i=0; i<sizeStrip; i++)
+//	{ 
+//	  glColor4f(complementColor(color[i][0]), 
+//		    complementColor(color[i][1]), 
+//		    complementColor(color[i][2]), alpha[i]);
+//	  glVertex2f(vertex[i][0], vertex[i][1]);
+//	} 
+//      glEnd();
+//    } 
+//  else
+//    {
+//      //#ifdef WIN32
+//      //glBlendEquation(GL_FUNC_REVERSE_SUBTRACT);
+//      glBlendEquation(GL_ADD);
+//      //#endif
+//      glEnable(GL_BLEND);
+//      glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+//      glDisable(GL_TEXTURE_2D);
+//      glBegin(GL_TRIANGLE_STRIP);
+//      for(int i=0; i<sizeStrip; i++)
+//	{ 
+//	  glColor4f(complementColor(color[i][0]), 
+//		    complementColor(color[i][1]), 
+//		    complementColor(color[i][2]), alpha[i]);
+//	  glVertex2f(vertex[i][0], vertex[i][1]);
+//	} 
+//      glEnd();
+//    }
+//  //	cerr<<"color="<<_color[1][0]<<", "<<_color[1][1]<<", "<<_color[1][2]<<") "<<endl;
+//	
+//	
+//}
+
+
+/**********************************/
+/*                                */
+/*                                */
+/*         GLTextureManager         */
+/*                                */
+/*                                */
+/**********************************/
+
+//#define TEXTURES_DIR ROOT_DIR "/data/textures"
+
+GLTextureManager::GLTextureManager ()
+: TextureManager()
+{
+  //_brushes_path = Config::getInstance()...
+}
+
+GLTextureManager::~GLTextureManager ()
+{
+}
+
+void
+GLTextureManager::loadPapers ()
+{
+  unsigned size = _papertextures.size();
+  _papertexname = new unsigned[size];
+  GLuint *tmp = new GLuint[size];
+  glGenTextures(size, tmp);
+  for(int i=0;i<size;++i){
+    _papertexname[i] = tmp[i];
+  }
+  delete [] tmp;
+
+  // Papers textures
+  cout << "Loading papers textures..." << endl;
+
+  for (unsigned i = 0; i < size; i++)
+    preparePaper(_papertextures[i].c_str(), _papertexname[i]);
+
+  cout << "Done." << endl << endl;
+}
+
+void GLTextureManager::loadStandardBrushes()
+{
+  //  getBrushTextureIndex(TEXTURES_DIR "/brushes/charcoalAlpha.bmp", Stroke::HUMID_MEDIUM);
+  //  getBrushTextureIndex(TEXTURES_DIR "/brushes/washbrushAlpha.bmp", Stroke::HUMID_MEDIUM);
+  //  getBrushTextureIndex(TEXTURES_DIR "/brushes/oil.bmp", Stroke::HUMID_MEDIUM);
+  //  getBrushTextureIndex(TEXTURES_DIR "/brushes/oilnoblend.bmp", Stroke::HUMID_MEDIUM);
+  //  getBrushTextureIndex(TEXTURES_DIR "/brushes/charcoalAlpha.bmp", Stroke::DRY_MEDIUM);
+  //  getBrushTextureIndex(TEXTURES_DIR "/brushes/washbrushAlpha.bmp", Stroke::DRY_MEDIUM);
+  //  getBrushTextureIndex(TEXTURES_DIR "/brushes/opaqueDryBrushAlpha.bmp", Stroke::OPAQUE_MEDIUM);
+  //  getBrushTextureIndex(TEXTURES_DIR "/brushes/opaqueBrushAlpha.bmp", Stroke::OPAQUE_MEDIUM);
+  _defaultTextureId = getBrushTextureIndex("smoothAlpha.bmp", Stroke::OPAQUE_MEDIUM);
+}
+
+
+unsigned
+GLTextureManager::loadBrush(string sname, Stroke::MediumType mediumType)
+{
+  GLuint texId;
+  glGenTextures(1, &texId);
+  bool found = false;
+  vector<string> pathnames;
+  QString path;
+  StringUtils::getPathName(TextureManager::Options::getBrushesPath(),
+  sname,
+  pathnames);
+  for (vector<string>::const_iterator j = pathnames.begin(); j != pathnames.end(); j++) {
+    path = j->c_str();
+    if(QFile::exists(path)){
+      found = true;
+      break;
+    }
+  }
+  if(!found)
+    return 0;
+  // Brush texture
+  cout << "Loading brush texture..." << endl;
+  switch(mediumType){
+  case Stroke::DRY_MEDIUM:
+    prepareTextureLuminance((const char*)path.toAscii(), texId);
+    break;
+  case Stroke::HUMID_MEDIUM:
+  case Stroke::OPAQUE_MEDIUM:
+  default:
+    prepareTextureAlpha((const char*)path.toAscii(), texId);
+    break;
+  }
+  cout << "Done." << endl << endl;
+
+  return texId;
+}
+
+bool 
+GLTextureManager::prepareTextureAlpha (string sname, GLuint itexname)
+{
+  const char * name = sname.c_str();
+  QImage qim(name);
+  QFileInfo fi(name);
+  QString filename = fi.fileName();
+  if (qim.isNull()) 
+    {
+      cerr << "  Error: unable to read \"" << name << "\"" << endl;
+      return false;
+    }
+  if (qim.depth()>8)
+    {
+      cerr<<"  Error: \""<< name <<"\" has "<<qim.depth()<<" bits/pixel"<<endl;
+      return false;
+    }
+  //		qim=QGLWidget::convertToGLFormat( qimOri );
+
+  glBindTexture(GL_TEXTURE_2D, itexname);
+  //glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+	
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
+		  GL_LINEAR);
+  //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
+  //	      GL_NEAREST);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
+		  GL_LINEAR);     
+
+  glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, qim.width(), qim.height(), 0, 
+	       GL_ALPHA, GL_UNSIGNED_BYTE, qim.bits());	
+
+  cout << "  \"" << filename.toAscii().data() << "\" loaded with "<< qim.depth() << " bits per pixel" << endl;
+
+  return true;
+
+}
+
+bool 
+GLTextureManager::prepareTextureLuminance (string sname, GLuint itexname)
+{
+  const char * name = sname.c_str();
+  QImage qim(name);
+  QFileInfo fi(name);
+  QString filename = fi.fileName();
+  if (qim.isNull()) 
+    {
+      cerr << "  Error: unable to read \"" << name << "\"" << endl;
+      return false;
+    }
+  if (qim.depth() > 8)
+    {
+      cerr<<"  Error: \""<<name<<"\" has "<<qim.depth()<<" bits/pixel"<<endl;
+      return false;
+    }
+
+  glBindTexture(GL_TEXTURE_2D, itexname);
+  //glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+	
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
+		  GL_LINEAR);
+  //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
+  //	      GL_NEAREST);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
+		  GL_LINEAR);     
+
+  glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE, qim.width(), qim.height(), 0, 
+	       GL_LUMINANCE, GL_UNSIGNED_BYTE, qim.bits());	
+
+  cout << "  \"" << filename.toAscii().data() << "\" loaded with "<< qim.depth() << " bits per pixel" << endl;
+
+  return true;
+
+}
+
+bool 
+GLTextureManager::prepareTextureLuminanceAndAlpha (string sname, GLuint itexname)
+{
+  const char * name = sname.c_str();
+  QImage qim(name);
+  QFileInfo fi(name);
+  QString filename = fi.fileName();
+  if (qim.isNull()) 
+    {
+      cerr << "  Error: unable to read \"" << name << "\"" << endl;
+      return false;
+    }
+  if (qim.depth() > 8)
+    {
+      cerr<<"  Error: \""<<name<<"\" has "<<qim.depth()<<" bits/pixel"<<endl;
+      return false;
+    }
+					   
+  glBindTexture(GL_TEXTURE_2D, itexname);
+  //glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+					     
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
+		  GL_LINEAR);
+  //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
+  //	      GL_NEAREST);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
+		  GL_LINEAR);     
+						     
+  glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE, qim.width(), qim.height(), 0, 
+	       GL_LUMINANCE, GL_UNSIGNED_BYTE, qim.bits());	
+  glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, qim.width(), qim.height(), 0, 
+	       GL_ALPHA, GL_UNSIGNED_BYTE, qim.bits());	
+							 
+  cout << "  \"" << filename.toAscii().data() << "\" loaded with "<< qim.depth() << " bits per pixel" << endl;						   
+
+  return true;
+							     
+}
+
+bool 
+GLTextureManager::preparePaper (const char *name, GLuint itexname)
+{
+  QImage qim(name);
+  QFileInfo fi(name);
+  QString filename = fi.fileName();
+  if (qim.isNull()) 
+    {
+      cerr << "  Error: unable to read \"" << name << "\"" << endl;
+      return false;
+    }
+  if (qim.depth()!=32)
+    {
+      cerr<<"  Error: \""<<name<<"\" has "<<qim.depth()<<" bits/pixel"<<endl;
+      return false;
+    }
+  QImage qim2=QGLWidget::convertToGLFormat( qim );
+
+  glBindTexture(GL_TEXTURE_2D, itexname);
+	
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
+		  GL_LINEAR);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
+		  GL_LINEAR);     
+
+  glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, qim.width(), qim.height(), 0, 
+	       GL_RGBA, GL_UNSIGNED_BYTE, qim2.bits());	
+
+  cout << "  \"" << filename.toAscii().data() << "\" loaded with "<< qim.depth() << " bits per pixel" << endl;
+
+  return true;
+}
+
diff --git a/extern/freestyle/src/rendering/GLStrokeRenderer.h b/extern/freestyle/src/rendering/GLStrokeRenderer.h
new file mode 100755
index 00000000000..bef95996444
--- /dev/null
+++ b/extern/freestyle/src/rendering/GLStrokeRenderer.h
@@ -0,0 +1,98 @@
+//
+//  Filename         : GLStrokeRenderer.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Class to define the GL stroke renderer.
+//  Date of creation : 05/03/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  GLSTROKERENDERER_H
+# define GLSTROKERENDERER_H
+
+# include "../system/FreestyleConfig.h"
+# include "../stroke/StrokeRenderer.h"
+# include "../stroke/StrokeRep.h"
+
+
+# ifdef WIN32
+#  include <windows.h>
+# endif
+# ifdef __MACH__
+#  include <OpenGL/gl.h>
+# else
+#  include <GL/gl.h>
+# endif
+
+/**********************************/
+/*                                */
+/*                                */
+/*         GLTextureManager       */
+/*                                */
+/*                                */
+/**********************************/
+
+/*! Class to load textures
+ */
+class LIB_RENDERING_EXPORT GLTextureManager : public TextureManager
+{
+ public:
+  GLTextureManager ();
+  virtual ~GLTextureManager ();
+protected:
+  virtual unsigned loadBrush(string fileName, Stroke::MediumType = Stroke::OPAQUE_MEDIUM);
+  
+ protected:
+  virtual void loadPapers();
+  virtual void loadStandardBrushes();
+  bool prepareTextureAlpha (string name, GLuint itexname);
+  bool prepareTextureLuminance (string name, GLuint itexname);
+  bool prepareTextureLuminanceAndAlpha (string name, GLuint itexname);
+  bool preparePaper (const char *name, GLuint itexname);
+};
+
+
+
+/**********************************/
+/*                                */
+/*                                */
+/*         GLStrokeRenderer       */
+/*                                */
+/*                                */
+/**********************************/
+
+class LIB_RENDERING_EXPORT GLStrokeRenderer : public StrokeRenderer
+{
+public:
+  GLStrokeRenderer();
+  virtual ~GLStrokeRenderer();
+
+  /*! Renders a stroke rep */
+  virtual void RenderStrokeRep(StrokeRep *iStrokeRep) const;
+  virtual void RenderStrokeRepBasic(StrokeRep *iStrokeRep) const;
+
+protected:
+  //void renderNoTexture(StrokeRep *iStrokeRep) const;
+};
+
+#endif // GLSTROKERENDERER_H
diff --git a/extern/freestyle/src/rendering/GLUtils.cpp b/extern/freestyle/src/rendering/GLUtils.cpp
new file mode 100755
index 00000000000..5e9ba2a5bf4
--- /dev/null
+++ b/extern/freestyle/src/rendering/GLUtils.cpp
@@ -0,0 +1,68 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+#include "GLUtils.h"
+
+# ifdef WIN32
+#  include <windows.h>
+# endif
+# ifdef __MACH__
+#  include <OpenGL/gl.h>
+# else
+#  include <GL/gl.h>
+# endif
+#include <string.h>
+
+int isExtensionSupported(const char *extension)
+{
+  const GLubyte *extensions = NULL;
+  const GLubyte *start;
+  GLubyte *where, *terminator;
+
+  /* Extension names should not have spaces. */
+  where = (GLubyte *) strchr(extension, ' ');
+  if (where || *extension == '\0')
+    return 0;
+  extensions = glGetString(GL_EXTENSIONS);
+  /* It takes a bit of care to be fool-proof about parsing the
+     OpenGL extensions string. Don't be fooled by sub-strings,
+     etc. */
+  start = extensions;
+  for (;;) {
+    where = (GLubyte *) strstr((const char *) start, extension);
+    if (!where)
+      break;
+    terminator = where + strlen(extension);
+    if (where == start || *(where - 1) == ' ')
+      if (*terminator == ' ' || *terminator == '\0')
+        return 1;
+    start = terminator;
+  }
+  return 0;
+}
+
+void *glutils_extgl_GetProcAddress(const char *name)
+{
+#ifdef _WIN32
+    void *t = wglGetProcAddress(name);
+    return t;
+#endif
+}
+
diff --git a/extern/freestyle/src/rendering/GLUtils.h b/extern/freestyle/src/rendering/GLUtils.h
new file mode 100755
index 00000000000..453b3f31259
--- /dev/null
+++ b/extern/freestyle/src/rendering/GLUtils.h
@@ -0,0 +1,29 @@
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef GLUTILS_H
+#define GLUTILS_H
+
+#include "../system/FreestyleConfig.h"
+
+int LIB_RENDERING_EXPORT isExtensionSupported(const char *extension);
+void LIB_RENDERING_EXPORT *glutils_extgl_GetProcAddress(const char *name);
+
+#endif
diff --git a/extern/freestyle/src/rendering/GLXOffscreenViewer.cpp b/extern/freestyle/src/rendering/GLXOffscreenViewer.cpp
new file mode 100755
index 00000000000..7135cedd7ad
--- /dev/null
+++ b/extern/freestyle/src/rendering/GLXOffscreenViewer.cpp
@@ -0,0 +1,86 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef WIN32
+# include "GLRenderer.h"
+# include "GLXOffscreenViewer.h"
+
+
+GLXOffscreenViewer::GLXOffscreenViewer(int w, int h){
+    _offscreenArea = new OffScreenArea(OffScreenArea::PIXMAP_OFFSCREEN_TYPE);
+    _offscreenArea->AllocateOffScreenArea(w,h);
+    _RootNode.SetLightingEnabled(false);
+    _RootNode.SetLineWidth(1.0);
+    _pGLRenderer = new GLRenderer;
+} 
+
+GLXOffscreenViewer::~GLXOffscreenViewer(){
+    if(_offscreenArea)
+      delete _offscreenArea;
+    if(_pGLRenderer)
+      delete _pGLRenderer;
+    _RootNode.destroy();  
+}
+
+void GLXOffscreenViewer::AddNode(Node* iNode){
+  _RootNode.AddChild(iNode);
+}
+
+void GLXOffscreenViewer::DetachNode(Node* iNode){
+  _RootNode.DetachChild(iNode);
+}
+
+void GLXOffscreenViewer::init(){
+  glClearColor(_clearColor[0],_clearColor[1],_clearColor[2],1);
+}
+
+void GLXOffscreenViewer::readPixels(int x,
+                                int y,
+                                int width,
+                                int height,
+                                float *pixels){
+  _offscreenArea->MakeCurrent();
+  glReadBuffer(GL_FRONT);
+  GLenum glformat = GL_RED;
+  glReadPixels(x,y,width, height, glformat, GL_FLOAT, (GLfloat*)pixels);
+} 
+
+
+
+void GLXOffscreenViewer::draw()
+{
+  _offscreenArea->MakeCurrent();
+  glPushAttrib(GL_ALL_ATTRIB_BITS);
+  glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
+  //Modelview Matrix
+  //================
+  glMatrixMode(GL_MODELVIEW);
+  glLoadIdentity();
+    
+  glEnable(GL_BLEND);
+  glBlendFunc(GL_ONE, GL_ONE);
+  glDisable(GL_DEPTH_TEST);
+  _RootNode.accept(*_pGLRenderer);
+  glFlush();
+  glPopAttrib();
+}
+
+#endif
diff --git a/extern/freestyle/src/rendering/GLXOffscreenViewer.h b/extern/freestyle/src/rendering/GLXOffscreenViewer.h
new file mode 100755
index 00000000000..c09a23f500b
--- /dev/null
+++ b/extern/freestyle/src/rendering/GLXOffscreenViewer.h
@@ -0,0 +1,545 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+#ifndef GLXOFFSCREENVIEWER_H
+# define GLXOFFSCREENVIEWER_H
+
+# ifdef 0
+//#ifndef WIN32
+//
+// @(#)OffScreen.h	1.4 10/11/00
+//
+
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <iostream>
+#include <malloc.h>
+#include <math.h>
+#include <limits.h>
+#include <sys/types.h>
+#include <sys/times.h>
+
+#include <X11/Xlib.h>
+#include <GL/gl.h>
+#include <GL/glx.h>
+#include <GL/glu.h>
+
+namespace OFFSCREEN {	// I put this here to avoid conflicts between Qt and
+								// X11 in the definition of INT32
+
+	/*! \namespace OFFSCREEN
+	 *  \bugs attention a la restauration de context quand il n'avait rien avant l'OffScreenArea !!
+	 */
+
+static bool OutOfMemory = false ;
+static XErrorHandler oldHandler = NULL ;
+
+static int myXErrorHandler (Display *_d, XErrorEvent *_xee)
+{
+	OutOfMemory = True;
+	if(oldHandler)
+	{
+		return (*oldHandler)(_d,_xee);
+	}
+	else
+	{
+		return false;
+	}
+
+	return 0;
+}
+
+class OffScreenArea 
+{
+	public:
+		static const int UNKNOWN_OFFSCREEN_TYPE = 0 ;
+		static const int PIXMAP_OFFSCREEN_TYPE = 1 ;
+		static const int PBUFFER_OFFSCREEN_TYPE = 2 ;
+		static const int KEEP_PIXMAP = 1 ;
+
+		OffScreenArea  (int type = UNKNOWN_OFFSCREEN_TYPE,GLXContext shareCtx = NULL)
+		{
+			DefaultType = type ;
+			i_Screen = -1;
+			i_Height = 0;
+			i_Width  = 0;
+			
+			i_OffScreenAreaType = UNKNOWN_OFFSCREEN_TYPE ;
+			i_GLContext = NULL;
+			i_Drawable  = GLXDrawable(0);
+			i_XPix      = Pixmap(0);
+			i_pXVisual  = NULL;
+			i_pDisplay  = NULL;
+
+			SetDisplayAndScreen((Display *)NULL,(int)-1) ;
+		}
+
+		GLXContext GetGLXContext() { return i_GLContext ; }
+		~OffScreenArea ()
+		{
+			DestroyOffScreenArea();
+		}
+	
+		/*
+		 * 0 : cannot allocate
+		 * 1 : allocation done
+		 * FIRST : try to allocate PixelBuffer (Single, double buffer)
+		 * SECOND : try to allocate GLXPixmap if PixelBuffer is not available
+		 */
+		/*
+		 * Here, we try to allocate an OffScreen Area
+		 * first, with PBuffer (if this GLX_ext. is
+		 * available and we can create one)
+		 * second, with a pixmap 
+		 */
+		int AllocateOffScreenArea(int width,int height)
+		{
+			save_GLContext = glXGetCurrentContext();
+			save_pDisplay  = glXGetCurrentDisplay();
+			save_Drawable  = glXGetCurrentDrawable();
+
+			int AlreadyThere = 0;
+#ifdef A_VIRER
+			static int AlreadyThere = 0;
+
+			if ( ( width != i_Width ) || ( height != i_Height ) )
+			{
+				AlreadyThere = 0;
+				DestroyOffScreenArea();
+			}
+#endif
+			if(!AlreadyThere)
+			{
+				AlreadyThere = 1;
+
+				/** Before to use a Pixmap, we try with pbuffer **/	
+				if(TryPBuffer(false,width,height))
+				{
+#ifdef DEBUG
+					fprintf(stderr, "Using single-buffer PBuffer for off-screen rendering.\n") ;
+#endif
+					return true ;
+				}
+
+				fprintf(stderr, "Cannot use a single-buffer PBuffer, trying double buffer.\n") ;
+
+				if(TryPBuffer(true,width,height))
+				{
+#ifdef DEBUG
+					fprintf(stderr, "Using double-buffer PBuffer for off-screen rendering.\n") ;
+#endif
+					return true ;
+				}
+#ifdef DEBUG
+				fprintf(stderr, "Warning : cannot create a PBuffer, trying Pixmap\n");
+#endif
+				if(TryPixmap(width,height))
+				{
+#ifdef DEBUG
+					fprintf(stderr, "Notice  : using Pixmap for offScreen rendering\n");
+#endif
+					return true ;
+				}
+#ifdef DEBUG
+				fprintf (stderr, "Warning : cannot create a Pixmap\n");
+#endif
+
+				return false;
+			}
+			return true ;
+		}
+
+		void MakeCurrent() 
+		{
+			glXMakeCurrent(i_pDisplay,i_Drawable,i_GLContext);
+		}
+	
+	protected:
+		inline  Display     * XServer         ( void ) { return i_pDisplay; }
+		inline  GLXContext    GraphicContext  ( void ) { return i_GLContext; }
+		inline  GLXDrawable   Drawable        ( void ) { return i_Drawable; }
+		inline  XVisualInfo * XVisual         ( void ) { return i_pXVisual; }
+
+		int DefaultType ;
+		int i_OffScreenAreaType;
+		int i_Height;
+		int i_Width;
+	
+		GLXContext    save_GLContext;
+		Display     * save_pDisplay;
+		GLXDrawable   save_Drawable;
+
+		Display     * i_pDisplay;
+		int           i_Screen;
+		GLXContext    i_GLContext;
+		GLXContext    i_shareContext;
+		GLXDrawable   i_Drawable;
+		Pixmap        i_XPix;
+		XVisualInfo * i_pXVisual;
+	
+		/* 
+		 * Define Display and screen
+		 * IF display == NULL THEN try to open default Display
+		 * IF screenNumber is < 0 THEN take default Screen
+		 */
+		void SetDisplayAndScreen ( Display *pDisplay , int Screen )
+		{
+			if ( pDisplay == NULL )
+			    i_pDisplay = XOpenDisplay ( NULL );
+			else
+			    i_pDisplay = pDisplay;
+			
+			if ( Screen < 0 )
+			    i_Screen = DefaultScreen ( i_pDisplay );
+			else
+			    i_Screen = Screen;
+		}
+		
+		// 
+		// Creates a PBuffer
+		// 
+		// <Return Values>
+		// 0 : failure
+		// 1 : succeed
+		//  
+
+		bool CreatePBuffer (unsigned int width, unsigned int height , int * pAttribList)
+		{
+#ifdef DEBUG	
+			int error = 0 ;
+			while((error = glGetError()) > 0)
+				std::cerr << "GLError " << (void *)error << " encountered." << std::endl ;
+#endif
+			GLXFBConfig *pfbConfigs;
+			int nbConfigs;
+			static int pbAttribs[] = { GLX_LARGEST_PBUFFER, true,
+												GLX_PRESERVED_CONTENTS, true,
+												GLX_PBUFFER_WIDTH,0,
+												GLX_PBUFFER_HEIGHT,0,
+			  									None };
+			
+			pbAttribs[5] = width ;
+			pbAttribs[7] = height ;
+
+			// Looks for a config that matches pAttribList
+			pfbConfigs = glXChooseFBConfig(i_pDisplay,i_Screen,pAttribList,&nbConfigs) ;
+#ifdef DEBUG
+			std::cout << nbConfigs << " found for pbuffer." << std::endl ;
+#endif
+
+			if(pfbConfigs == NULL)
+				return false ;
+
+			i_pXVisual = glXGetVisualFromFBConfig(i_pDisplay,pfbConfigs[0]);
+			i_OffScreenAreaType = PBUFFER_OFFSCREEN_TYPE;
+
+			// Sets current error handler
+			OutOfMemory = False;
+			oldHandler = XSetErrorHandler( myXErrorHandler );
+
+			i_Drawable = glXCreatePbuffer(i_pDisplay,pfbConfigs[0],pbAttribs);
+					
+			if(i_Drawable == 0)
+			{
+				i_pXVisual = NULL;
+				return false ;
+			}
+			unsigned int w=0,h=0;
+			glXQueryDrawable(i_pDisplay,i_Drawable,GLX_WIDTH,&w) ;
+			glXQueryDrawable(i_pDisplay,i_Drawable,GLX_HEIGHT,&h) ;
+
+			if((w != width)||(h != height))
+			{
+#ifdef DEBUG
+				std::cerr << "Could not allocate Pbuffer. Only size " << w << "x" << h << " found." << std::endl ;
+#endif
+				return false ;
+			}
+#ifdef DEBUG
+			else
+				std::cerr << "Could allocate Pbuffer. Size " << w << "x" << h << " found." << std::endl ;
+#endif
+#ifdef DEBUG	
+			while((error = glGetError()) > 0)
+				std::cerr << "GLError " << (void *)error << " encountered." << std::endl ;
+#endif
+			// now create GLXContext
+
+			if((i_GLContext = glXCreateContext(i_pDisplay,i_pXVisual,NULL,true)) == NULL) 
+			{
+				DestroyOffScreenArea() ;
+				return false ;
+			}
+
+			/* Restore original X error handler */
+			(void) XSetErrorHandler( oldHandler );
+		
+			if(!OutOfMemory)
+			{	
+				i_Height = height;
+				i_Width  = width;
+			
+				return true ;
+			}
+			else
+				return false ;
+		}
+
+		// 
+		// Creates a Pixmap
+		// 
+		// <Return Values>
+		// false : failure
+		// true  : succeed
+		// 
+
+		bool CreatePixmap (int width, int height , int * pAttribList)
+		{
+			int depth;
+			int totdepth=0;
+			XErrorHandler oldHandler;
+			XVisualInfo * pvisP;
+			
+			pvisP = glXChooseVisual ( i_pDisplay, i_Screen , pAttribList);
+
+			if ( pvisP == NULL)
+			{
+				fprintf( stderr , "Warning : no 24-bit true color visual available\n" );
+				return false ;
+			}
+			
+			OutOfMemory = False;
+			oldHandler = XSetErrorHandler(myXErrorHandler);
+			if(i_XPix == Pixmap(NULL))
+			{
+				depth = 0;
+				for (unsigned int i=0,j=0; (pAttribList[i] != None) && (j<3) ; i++ )
+				{
+					switch ( pAttribList[i] )
+					{
+						case GLX_RED_SIZE: 	glXGetConfig(i_pDisplay,pvisP,GLX_RED_SIZE,&depth) ;
+													totdepth += depth ;
+													i++ ;
+													j++ ;
+					    							break;
+		
+						case GLX_GREEN_SIZE: glXGetConfig(i_pDisplay,pvisP,GLX_GREEN_SIZE,&depth) ;
+													totdepth += depth ;
+													i++ ;
+													j++ ;
+													break;
+		
+						case GLX_BLUE_SIZE: 	glXGetConfig(i_pDisplay,pvisP,GLX_BLUE_SIZE,&depth) ;
+													totdepth += depth ;
+													i++ ;
+													j++ ;
+													break;
+						default:
+													break;
+					}
+				}
+			    
+				fprintf(stderr,"%d bits color buffer found\n",depth) ;
+				i_XPix = XCreatePixmap(i_pDisplay,RootWindow (i_pDisplay,0),width,height,totdepth);
+				XSync(i_pDisplay,False);
+				if(OutOfMemory)
+				{
+					i_XPix = Pixmap(0);
+					XSetErrorHandler(oldHandler);
+					oldHandler = NULL ;
+					fprintf(stderr,"Warning : could not allocate Pixmap\n");
+					return false ;
+				}
+			}
+		
+			// Perhaps should we verify th type of Area (Pixmap) ?
+			if ( i_Drawable == GLXDrawable(NULL) )
+			{
+				// i_Drawable = i_XPix;
+				i_Drawable = glXCreateGLXPixmap ( i_pDisplay , pvisP , i_XPix );
+				XSync ( i_pDisplay , False );
+				if(OutOfMemory)
+			 	{ 
+					i_Drawable = GLXDrawable(0); 
+					DestroyOffScreenArea();
+					fprintf ( stderr , "Warning : could not allocate GLX Pixmap\n"); 
+					return false ;
+				} 
+				else
+				{
+					if(i_GLContext != NULL) 
+					{
+						glXDestroyContext ( i_pDisplay , i_GLContext );
+						i_GLContext = NULL;
+					}
+					if((i_GLContext = glXCreateContext(i_pDisplay,pvisP,NULL,GL_FALSE)) == NULL)
+					{
+						DestroyOffScreenArea();
+						fprintf(stderr, "Warning : could not create rendering context");
+					}
+				}
+			}
+			XSetErrorHandler(oldHandler);
+			
+			i_pXVisual = (i_Drawable != GLXDrawable(NULL) ? pvisP : NULL);
+			
+			i_Height = height;
+			i_Width  = width;
+			
+			if(i_Drawable != GLXDrawable(NULL))
+			{
+				i_OffScreenAreaType = PIXMAP_OFFSCREEN_TYPE;
+				return true ;
+			}
+			
+			return false ;
+		}
+
+		bool TryPixmap(int width,int height)
+		{
+			int attrList[30];
+			int n = 0;
+		
+			attrList[n++] = GLX_RED_SIZE;
+			attrList[n++] = 8;
+			attrList[n++] = GLX_GREEN_SIZE;
+			attrList[n++] = 8;
+			attrList[n++] = GLX_BLUE_SIZE;
+			attrList[n++] = 8;
+			attrList[n++] = GLX_RGBA;
+			attrList[n++] = GLX_DEPTH_SIZE;
+			attrList[n++] = 16;
+			attrList[n++] = GLX_STENCIL_SIZE;
+			attrList[n++] = 1;
+			attrList[n++] = None;
+		
+			return CreatePixmap(width,height,attrList) ;
+		}
+
+		bool TryPBuffer(bool double_buffer,int width,int height)
+		{
+			int attrList[30];
+			int n = 0;
+		
+			attrList[n++] = GLX_RENDER_TYPE;
+			attrList[n++] = GLX_RGBA_BIT;
+			attrList[n++] = GLX_DRAWABLE_TYPE;
+			attrList[n++] = GLX_PBUFFER_BIT;
+			attrList[n++] = GLX_RED_SIZE;
+			attrList[n++] = 8;
+			attrList[n++] = GLX_GREEN_SIZE;
+			attrList[n++] = 8;
+			attrList[n++] = GLX_BLUE_SIZE;
+			attrList[n++] = 8;
+			attrList[n++] = GLX_DEPTH_SIZE;
+			attrList[n++] = 8;
+			attrList[n++] = GLX_DOUBLEBUFFER;
+			attrList[n++] = double_buffer;
+			attrList[n++] = None;
+		
+			return CreatePBuffer(width,height,attrList) ;
+		}
+
+		void DestroyOffScreenArea()
+		{
+			glXMakeCurrent(save_pDisplay,save_Drawable,save_GLContext);
+
+			switch ( i_OffScreenAreaType )
+			{
+				case PIXMAP_OFFSCREEN_TYPE : 	if(i_Drawable != 0)
+					  										glXDestroyGLXPixmap(i_pDisplay,i_Drawable);
+					
+														if (i_XPix != 0)
+														{
+															XFreePixmap (i_pDisplay,i_XPix);
+															i_XPix = 0;
+														}
+														break;
+			   case PBUFFER_OFFSCREEN_TYPE :	if(i_Drawable != 0)
+															glXDestroyPbuffer(i_pDisplay,i_Drawable);
+		      										break;
+				default: break;
+			}
+		
+			if (i_GLContext != NULL)
+			{
+				glXDestroyContext(i_pDisplay,i_GLContext);
+				i_GLContext = NULL;
+			}
+		  
+			i_Drawable = 0;
+			i_OffScreenAreaType = UNKNOWN_OFFSCREEN_TYPE;
+		}
+} ;
+
+}
+
+
+#include "Geom.h"
+#include "NodeDrawingStyle.h"
+using namespace Geometry;
+//using namespace OFFSCREEN;
+class GLXOffscreenViewer{
+public:
+  GLXOffscreenViewer(int w, int h);
+  virtual ~GLXOffscreenViewer();
+
+  /*! Adds a node directly under the root node */
+    void AddNode(Node* iNode);
+    /*! Detach the node iNode which must 
+     *  be directly under the root node.
+     */
+    void DetachNode(Node *iNode);
+
+    /*! reads the frame buffer pixels as luminance .
+     *  \param x 
+     *    The lower-left corner x-coordinate of the 
+     *    rectangle we want to grab.
+     *  \param y
+     *    The lower-left corner y-coordinate of the 
+     *    rectangle we want to grab.
+     *  \param width
+     *    The width of the rectangle we want to grab.
+     *  \param height
+     *    The height of the rectangle we want to grab.
+     *  \params pixels
+     *    The array of float (of size width*height) in which 
+     *    the read values are stored.
+     */
+    void readPixels(int x,int y,int width,int height,float *pixels) ;
+
+    inline void SetClearColor(const Vec3f& c) {_clearColor = c;}
+    inline Vec3f getClearColor() const {return _clearColor;}
+
+  void init();
+  void draw();
+
+protected:
+  OffScreenArea *_offscreenArea;
+  NodeDrawingStyle       _RootNode;
+  Vec3f           _clearColor;
+  GLRenderer     *_pGLRenderer;
+  
+};
+
+#endif // WIN32
+
+#endif
diff --git a/extern/freestyle/src/rendering/extgl.cpp b/extern/freestyle/src/rendering/extgl.cpp
new file mode 100755
index 00000000000..d7207f21299
--- /dev/null
+++ b/extern/freestyle/src/rendering/extgl.cpp
@@ -0,0 +1,2249 @@
+/* ----------------------------------------------------------------------------
+Copyright (c) 2001-2002, Lev Povalahev
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice, 
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice, 
+      this list of conditions and the following disclaimer in the documentation 
+      and/or other materials provided with the distribution.
+    * The name of the author may be used to endorse or promote products 
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, 
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
+THE POSSIBILITY OF SUCH DAMAGE.
+------------------------------------------------------------------------------*/
+/* 
+    Lev Povalahev
+
+    levp@gmx.net
+
+    http://www.uni-karlsruhe.de/~uli2/
+
+*/                         
+      
+#include "extgl.h"
+#include <stdio.h>
+#include <string.h>
+
+#ifndef _WIN32
+#include <GL/glx.h>
+#endif /* _WIN32 */
+
+/* turn off the warning for the borland compiler*/
+#ifdef __BORLANDC__
+#pragma warn -8064
+#pragma warn -8065
+#endif /* __BORLANDC__	*/
+
+/* function variables */
+
+/*-------------------------------------*/
+/* WGL stuff */
+/*-------------------------------------*/
+
+#ifdef _WIN32
+
+/* WGL_EXT_etxension_string */
+
+#ifdef WGL_EXT_extensions_string
+wglGetExtensionsStringEXTPROC wglGetExtensionsStringEXT = NULL;
+#endif /* WGL_EXT_extension_string */
+
+/* WGL_ARB_buffer_region */
+
+#ifdef WGL_ARB_buffer_region
+wglCreateBufferRegionARBPROC wglCreateBufferRegionARB = NULL;
+wglDeleteBufferRegionARBPROC wglDeleteBufferRegionARB = NULL;
+wglSaveBufferRegionARBPROC wglSaveBufferRegionARB = NULL;
+wglRestoreBufferRegionARBPROC wglRestoreBufferRegionARB = NULL;
+#endif /* WGL_ARB_buffer_region */
+
+/* WGL_ARB_extension_string */
+
+
+#ifdef WGL_ARB_extensions_string
+wglGetExtensionsStringARBPROC wglGetExtensionsStringARB = NULL;
+#endif /* WGL_ARB_extension_string */
+
+/* WGL_ARB_pbuffer */
+
+#ifdef WGL_ARB_pbuffer
+wglCreatePbufferARBPROC wglCreatePbufferARB = NULL;
+wglGetPbufferDCARBPROC wglGetPbufferDCARB = NULL;
+wglReleasePbufferDCARBPROC wglReleasePbufferDCARB = NULL;
+wglDestroyPbufferARBPROC wglDestroyPbufferARB = NULL;
+wglQueryPbufferARBPROC wglQueryPbufferARB = NULL;
+#endif /* WGL_ARB_pbuffer */
+
+/* WGL_ARB_pixel_format */
+
+#ifdef WGL_ARB_pixel_format
+wglGetPixelFormatAttribivARBPROC wglGetPixelFormatAttribivARB = NULL;
+wglGetPixelFormatAttribfvARBPROC wglGetPixelFormatAttribfvARB = NULL;
+wglChoosePixelFormatARBPROC wglChoosePixelFormatARB = NULL;
+#endif /* WGL_ARB_pixel_format */
+
+/* WGL_ARB_render_texture */
+
+#ifdef WGL_ARB_render_texture
+wglBindTexImageARBPROC wglBindTexImageARB = NULL;
+wglReleaseTexImageARBPROC wglReleaseTexImageARB = NULL;
+wglSetPbufferAttribARBPROC wglSetPbufferAttribARB = NULL;
+#endif /* WGL_ARB_render_texture */
+
+/* WGL_EXT_swap_control */
+
+#ifdef WGL_EXT_swap_control
+wglSwapIntervalEXTPROC wglSwapIntervalEXT = NULL;
+wglGetSwapIntervalEXTPROC wglGetSwapIntervalEXT = NULL;
+#endif /* WGL_EXT_swap_control */
+
+/* WGL_ARB_make_current_read */
+
+#ifdef WGL_ARB_make_current_read
+wglMakeContextCurrentARBPROC wglMakeContextCurrentARB = NULL;
+wglGetCurrentReadDCARBPROC wglGetCurrentReadDCARB = NULL;
+#endif /* WGL_ARB_make_current_read*/ 
+
+/* VAR */
+
+#endif /* WIN32 */
+
+/*-------------------------------------*/
+/*---WGL STUFF END---------------------*/
+/*-------------------------------------*/
+
+#ifdef _WIN32
+
+#ifdef GL_VERSION_1_2
+glDrawRangeElementsPROC glDrawRangeElements = NULL;
+glTexImage3DPROC glTexImage3D = NULL;
+glTexSubImage3DPROC glTexSubImage3D = NULL;
+glCopyTexSubImage3DPROC glCopyTexSubImage3D = NULL;
+#endif /* GL_VERSION_1_2 */
+
+#ifdef GL_ARB_imaging
+glBlendColorPROC glBlendColor = NULL;
+LIB_RENDERING_EXPORT
+glBlendEquationPROC glBlendEquation = NULL;
+glColorTablePROC glColorTable = NULL;
+glColorTableParameterfvPROC glColorTableParameterfv = NULL;
+glColorTableParameterivPROC glColorTableParameteriv = NULL;
+glCopyColorTablePROC glCopyColorTable = NULL;
+glGetColorTablePROC glGetColorTable = NULL;
+glGetColorTableParameterfvPROC glGetColorTableParameterfv = NULL;
+glGetColorTableParameterivPROC glGetColorTableParameteriv = NULL;
+glColorSubTablePROC glColorSubTable = NULL;
+glCopyColorSubTablePROC glCopyColorSubTable = NULL;
+glConvolutionFilter1DPROC glConvolutionFilter1D = NULL;
+glConvolutionFilter2DPROC glConvolutionFilter2D = NULL;
+glConvolutionParameterfPROC glConvolutionParameterf = NULL;
+glConvolutionParameterfvPROC glConvolutionParameterfv = NULL;
+glConvolutionParameteriPROC glConvolutionParameteri = NULL;
+glConvolutionParameterivPROC glConvolutionParameteriv = NULL;
+glCopyConvolutionFilter1DPROC glCopyConvolutionFilter1D = NULL;
+glCopyConvolutionFilter2DPROC glCopyConvolutionFilter2D = NULL;
+glGetConvolutionFilterPROC glGetConvolutionFilter = NULL;
+glGetConvolutionParameterfvPROC glGetConvolutionParameterfv = NULL;
+glGetConvolutionParameterivPROC glGetConvolutionParameteriv = NULL;
+glGetSeparableFilterPROC glGetSeparableFilter = NULL;
+glSeparableFilter2DPROC glSeparableFilter2D = NULL;
+glGetHistogramPROC glGetHistogram = NULL;
+glGetHistogramParameterfvPROC glGetHistogramParameterfv = NULL;
+glGetHistogramParameterivPROC glGetHistogramParameteriv = NULL;
+glGetMinmaxPROC glGetMinmax = NULL;
+glGetMinmaxParameterfvPROC glGetMinmaxParameterfv = NULL;
+glGetMinmaxParameterivPROC glGetMinmaxParameteriv = NULL;
+glHistogramPROC glHistogram = NULL;
+glMinmaxPROC glMinmax = NULL;
+glResetHistogramPROC glResetHistogram = NULL;
+glResetMinmaxPROC glResetMinmax = NULL;
+#endif /* GL_ARB_imaging */
+
+/* 1.3 */
+
+#ifdef GL_VERSION_1_3
+glActiveTexturePROC glActiveTexture = NULL;
+glClientActiveTexturePROC glClientActiveTexture = NULL;
+glMultiTexCoord1dPROC glMultiTexCoord1d = NULL;
+glMultiTexCoord1dvPROC glMultiTexCoord1dv = NULL;
+glMultiTexCoord1fPROC glMultiTexCoord1f = NULL;
+glMultiTexCoord1fvPROC glMultiTexCoord1fv = NULL;
+glMultiTexCoord1iPROC glMultiTexCoord1i = NULL;
+glMultiTexCoord1ivPROC glMultiTexCoord1iv = NULL;
+glMultiTexCoord1sPROC glMultiTexCoord1s = NULL;
+glMultiTexCoord1svPROC glMultiTexCoord1sv = NULL;
+glMultiTexCoord2dPROC glMultiTexCoord2d = NULL;
+glMultiTexCoord2dvPROC glMultiTexCoord2dv = NULL;
+glMultiTexCoord2fPROC glMultiTexCoord2f = NULL;
+glMultiTexCoord2fvPROC glMultiTexCoord2fv = NULL;
+glMultiTexCoord2iPROC glMultiTexCoord2i = NULL;
+glMultiTexCoord2ivPROC glMultiTexCoord2iv = NULL;
+glMultiTexCoord2sPROC glMultiTexCoord2s = NULL;
+glMultiTexCoord2svPROC glMultiTexCoord2sv = NULL;
+glMultiTexCoord3dPROC glMultiTexCoord3d = NULL;
+glMultiTexCoord3dvPROC glMultiTexCoord3dv = NULL;
+glMultiTexCoord3fPROC glMultiTexCoord3f = NULL;
+glMultiTexCoord3fvPROC glMultiTexCoord3fv = NULL;
+glMultiTexCoord3iPROC glMultiTexCoord3i = NULL;
+glMultiTexCoord3ivPROC glMultiTexCoord3iv = NULL;
+glMultiTexCoord3sPROC glMultiTexCoord3s = NULL;
+glMultiTexCoord3svPROC glMultiTexCoord3sv = NULL;
+glMultiTexCoord4dPROC glMultiTexCoord4d = NULL;
+glMultiTexCoord4dvPROC glMultiTexCoord4dv = NULL;
+glMultiTexCoord4fPROC glMultiTexCoord4f = NULL;
+glMultiTexCoord4fvPROC glMultiTexCoord4fv = NULL;
+glMultiTexCoord4iPROC glMultiTexCoord4i = NULL;
+glMultiTexCoord4ivPROC glMultiTexCoord4iv = NULL;
+glMultiTexCoord4sPROC glMultiTexCoord4s = NULL;
+glMultiTexCoord4svPROC glMultiTexCoord4sv = NULL;
+glLoadTransposeMatrixfPROC glLoadTransposeMatrixf = NULL;
+glLoadTransposeMatrixdPROC glLoadTransposeMatrixd = NULL;
+glMultTransposeMatrixfPROC glMultTransposeMatrixf = NULL;
+glMultTransposeMatrixdPROC glMultTransposeMatrixd = NULL;
+glCompressedTexImage3DPROC glCompressedTexImage3D = NULL;
+glCompressedTexImage2DPROC glCompressedTexImage2D = NULL;
+glCompressedTexImage1DPROC glCompressedTexImage1D = NULL;
+glCompressedTexSubImage3DPROC glCompressedTexSubImage3D = NULL;
+glCompressedTexSubImage2DPROC glCompressedTexSubImage2D = NULL;
+glCompressedTexSubImage1DPROC glCompressedTexSubImage1D = NULL;
+glGetCompressedTexImagePROC glGetCompressedTexImage = NULL;
+glSampleCoveragePROC glSampleCoverage = NULL;
+#endif /* GL_VERSION_1_3 */
+
+/* ARB_multitexture */
+
+#ifdef GL_ARB_multitexture
+glActiveTextureARBPROC glActiveTextureARB = NULL;
+glClientActiveTextureARBPROC glClientActiveTextureARB = NULL;
+glMultiTexCoord1dARBPROC glMultiTexCoord1dARB = NULL;
+glMultiTexCoord1dvARBPROC glMultiTexCoord1dvARB = NULL;
+glMultiTexCoord1fARBPROC glMultiTexCoord1fARB = NULL;
+glMultiTexCoord1fvARBPROC glMultiTexCoord1fvARB = NULL;
+glMultiTexCoord1iARBPROC glMultiTexCoord1iARB = NULL;
+glMultiTexCoord1ivARBPROC glMultiTexCoord1ivARB = NULL;
+glMultiTexCoord1sARBPROC glMultiTexCoord1sARB = NULL;
+glMultiTexCoord1svARBPROC glMultiTexCoord1svARB = NULL;
+glMultiTexCoord2dARBPROC glMultiTexCoord2dARB = NULL;
+glMultiTexCoord2dvARBPROC glMultiTexCoord2dvARB = NULL;
+glMultiTexCoord2fARBPROC glMultiTexCoord2fARB = NULL;
+glMultiTexCoord2fvARBPROC glMultiTexCoord2fvARB = NULL;
+glMultiTexCoord2iARBPROC glMultiTexCoord2iARB = NULL;
+glMultiTexCoord2ivARBPROC glMultiTexCoord2ivARB = NULL;
+glMultiTexCoord2sARBPROC glMultiTexCoord2sARB = NULL;
+glMultiTexCoord2svARBPROC glMultiTexCoord2svARB = NULL;
+glMultiTexCoord3dARBPROC glMultiTexCoord3dARB = NULL;
+glMultiTexCoord3dvARBPROC glMultiTexCoord3dvARB = NULL;
+glMultiTexCoord3fARBPROC glMultiTexCoord3fARB = NULL;
+glMultiTexCoord3fvARBPROC glMultiTexCoord3fvARB = NULL;
+glMultiTexCoord3iARBPROC glMultiTexCoord3iARB = NULL;
+glMultiTexCoord3ivARBPROC glMultiTexCoord3ivARB = NULL;
+glMultiTexCoord3sARBPROC glMultiTexCoord3sARB = NULL;
+glMultiTexCoord3svARBPROC glMultiTexCoord3svARB = NULL;
+glMultiTexCoord4dARBPROC glMultiTexCoord4dARB = NULL;
+glMultiTexCoord4dvARBPROC glMultiTexCoord4dvARB = NULL;
+glMultiTexCoord4fARBPROC glMultiTexCoord4fARB = NULL;
+glMultiTexCoord4fvARBPROC glMultiTexCoord4fvARB = NULL;
+glMultiTexCoord4iARBPROC glMultiTexCoord4iARB = NULL;
+glMultiTexCoord4ivARBPROC glMultiTexCoord4ivARB = NULL;
+glMultiTexCoord4sARBPROC glMultiTexCoord4sARB = NULL;
+glMultiTexCoord4svARBPROC glMultiTexCoord4svARB = NULL;
+#endif /* GL_ARB_multitexture */
+
+#endif /* WIN32 */
+
+/* ARB_transpose_matrix */
+
+#ifdef GL_ARB_transpose_matrix
+glLoadTransposeMatrixfARBPROC glLoadTransposeMatrixfARB = NULL;
+glLoadTransposeMatrixdARBPROC glLoadTransposeMatrixdARB = NULL;
+glMultTransposeMatrixfARBPROC glMultTransposeMatrixfARB = NULL;
+glMultTransposeMatrixdARBPROC glMultTransposeMatrixdARB = NULL;
+#endif /* GL_ARB_transpose_matrix */
+
+/* ARB_texture_compression */
+
+#ifdef GL_ARB_texture_compression 
+glCompressedTexImage3DARBPROC glCompressedTexImage3DARB = NULL;
+glCompressedTexImage2DARBPROC glCompressedTexImage2DARB = NULL;
+glCompressedTexImage1DARBPROC glCompressedTexImage1DARB = NULL; 
+glCompressedTexSubImage3DARBPROC glCompressedTexSubImage3DARB = NULL;
+glCompressedTexSubImage2DARBPROC glCompressedTexSubImage2DARB = NULL;
+glCompressedTexSubImage1DARBPROC glCompressedTexSubImage1DARB = NULL;
+glGetCompressedTexImageARBPROC glGetCompressedTexImageARB = NULL;
+#endif /* GL_ARB_texture_compression */
+
+/* EXT_secondary_color */
+
+#ifdef GL_EXT_secondary_color
+glSecondaryColor3bEXTPROC glSecondaryColor3bEXT = NULL;
+glSecondaryColor3bvEXTPROC glSecondaryColor3bvEXT = NULL;
+glSecondaryColor3dEXTPROC glSecondaryColor3dEXT = NULL;
+glSecondaryColor3dvEXTPROC glSecondaryColor3dvEXT = NULL;
+glSecondaryColor3fEXTPROC glSecondaryColor3fEXT = NULL;
+glSecondaryColor3fvEXTPROC glSecondaryColor3fvEXT = NULL;
+glSecondaryColor3iEXTPROC glSecondaryColor3iEXT = NULL;
+glSecondaryColor3ivEXTPROC glSecondaryColor3ivEXT = NULL;
+glSecondaryColor3sEXTPROC glSecondaryColor3sEXT = NULL;
+glSecondaryColor3svEXTPROC glSecondaryColor3svEXT = NULL;
+glSecondaryColor3ubEXTPROC glSecondaryColor3ubEXT = NULL;
+glSecondaryColor3ubvEXTPROC glSecondaryColor3ubvEXT = NULL;
+glSecondaryColor3uiEXTPROC glSecondaryColor3uiEXT = NULL;
+glSecondaryColor3uivEXTPROC glSecondaryColor3uivEXT = NULL;
+glSecondaryColor3usEXTPROC glSecondaryColor3usEXT = NULL;
+glSecondaryColor3usvEXTPROC glSecondaryColor3usvEXT = NULL;
+glSecondaryColorPointerEXTPROC glSecondaryColorPointerEXT = NULL;
+#endif /* GL_EXT_secondary_color */
+
+/* EXT_compiled_vertex_array */
+
+#ifdef GL_EXT_compiled_vertex_array 
+glLockArraysEXTPROC glLockArraysEXT = NULL;
+glUnlockArraysEXTPROC glUnlockArraysEXT = NULL;
+#endif /* GL_EXT_compiled_vertex_array */
+
+/* EXT_fog_coord */
+
+#ifdef GL_EXT_fog_coord
+glFogCoordfEXTPROC glFogCoordfEXT = NULL;
+glFogCoordfvEXTPROC glFogCoordfvEXT = NULL;
+glFogCoorddEXTPROC glFogCoorddEXT = NULL;
+glFogCoorddvEXTPROC glFogCoorddvEXT = NULL;
+glFogCoordPointerEXTPROC glFogCoordPointerEXT = NULL;
+#endif /* GL_EXT_for_color */
+
+/* NV_vertex_array_range */
+
+#ifdef GL_NV_vertex_array_range
+glFlushVertexArrayRangeNVPROC glFlushVertexArrayRangeNV = NULL;
+glVertexArrayRangeNVPROC glVertexArrayRangeNV = NULL;
+
+#ifdef _WIN32
+wglAllocateMemoryNVPROC wglAllocateMemoryNV = NULL;
+wglFreeMemoryNVPROC wglFreeMemoryNV = NULL;
+#else
+glXAllocateMemoryNVPROC glXAllocateMemoryNV = NULL;
+glXFreeMemoryNVPROC glXFreeMemoryNV = NULL;
+#endif /* WIN32 */
+
+#endif /* GL_NV_vertex_array_range */
+
+/* EXT_point_parameters */
+
+#ifdef GL_EXT_point_parameters
+glPointParameterfEXTPROC glPointParameterfEXT = NULL;
+glPointParameterfvEXTPROC glPointParameterfvEXT = NULL;
+#endif /* GL_EXT_point_parameters */
+
+/* NV_register_combiners */
+
+#ifdef GL_NV_register_combiners
+glCombinerParameterfvNVPROC glCombinerParameterfvNV = NULL;
+glCombinerParameterfNVPROC  glCombinerParameterfNV = NULL;
+glCombinerParameterivNVPROC glCombinerParameterivNV = NULL;
+glCombinerParameteriNVPROC glCombinerParameteriNV = NULL;
+glCombinerInputNVPROC glCombinerInputNV = NULL;
+glCombinerOutputNVPROC glCombinerOutputNV = NULL;
+glFinalCombinerInputNVPROC glFinalCombinerInputNV = NULL;
+glGetCombinerInputParameterfvNVPROC glGetCombinerInputParameterfvNV = NULL;
+glGetCombinerInputParameterivNVPROC glGetCombinerInputParameterivNV = NULL;
+glGetCombinerOutputParameterfvNVPROC glGetCombinerOutputParameterfvNV = NULL;
+glGetCombinerOutputParameterivNVPROC glGetCombinerOutputParameterivNV = NULL;
+glGetFinalCombinerInputParameterfvNVPROC glGetFinalCombinerInputParameterfvNV = NULL;
+glGetFinalCombinerInputParameterivNVPROC glGetFinalCombinerInputParameterivNV = NULL;
+#endif /* GL_NV_register_combiners */
+
+/* ARB_multisample */
+
+#ifdef GL_ARB_multisample
+glSampleCoverageARBPROC glSampleCoverageARB = NULL;
+#endif /* GL_ARB_multisample */
+
+/* EXT_vertex_weighting */
+
+#ifdef GL_EXT_vertex_weighting
+glVertexWeightfEXTPROC glVertexWeightfEXT = NULL;
+glVertexWeightfvEXTPROC glVertexWeightfvEXT = NULL;
+glVertexWeightPointerEXTPROC glVertexWeightPointerEXT = NULL;
+#endif /* GL_EXT_vertex_weighting */
+
+/* NV_vertex_program */
+
+#ifdef GL_NV_vertex_program
+glBindProgramNVPROC glBindProgramNV = NULL;
+glDeleteProgramsNVPROC glDeleteProgramsNV = NULL;
+glExecuteProgramNVPROC glExecuteProgramNV = NULL;
+glGenProgramsNVPROC glGenProgramsNV = NULL;
+glAreProgramsResidentNVPROC glAreProgramsResidentNV = NULL;
+glRequestResidentProgramsNVPROC glRequestResidentProgramsNV = NULL;
+glGetProgramParameterfvNVPROC glGetProgramParameterfvNV = NULL;
+glGetProgramParameterdvNVPROC glGetProgramParameterdvNV = NULL;
+glGetProgramivNVPROC glGetProgramivNV = NULL;
+glGetProgramStringNVPROC glGetProgramStringNV = NULL;
+glGetTrackMatrixivNVPROC glGetTrackMatrixivNV = NULL;
+glGetVertexAttribdvNVPROC glGetVertexAttribdvNV = NULL;
+glGetVertexAttribfvNVPROC glGetVertexAttribfvNV = NULL;
+glGetVertexAttribivNVPROC glGetVertexAttribivNV = NULL;
+glGetVertexAttribPointervNVPROC glGetVertexAttribPointervNV = NULL;
+glIsProgramNVPROC glIsProgramNV = NULL;
+glLoadProgramNVPROC glLoadProgramNV = NULL;
+glProgramParameter4fNVPROC glProgramParameter4fNV = NULL;
+glProgramParameter4dNVPROC glProgramParameter4dNV = NULL;
+glProgramParameter4dvNVPROC glProgramParameter4dvNV = NULL;
+glProgramParameter4fvNVPROC glProgramParameter4fvNV = NULL;
+glProgramParameters4dvNVPROC glProgramParameters4dvNV = NULL;
+glProgramParameters4fvNVPROC glProgramParameters4fvNV = NULL;
+glTrackMatrixNVPROC glTrackMatrixNV = NULL;
+glVertexAttribPointerNVPROC glVertexAttribPointerNV = NULL;
+glVertexAttrib1sNVPROC glVertexAttrib1sNV = NULL;
+glVertexAttrib1fNVPROC glVertexAttrib1fNV = NULL;
+glVertexAttrib1dNVPROC glVertexAttrib1dNV = NULL;
+glVertexAttrib2sNVPROC glVertexAttrib2sNV = NULL;
+glVertexAttrib2fNVPROC glVertexAttrib2fNV = NULL;
+glVertexAttrib2dNVPROC glVertexAttrib2dNV = NULL;
+glVertexAttrib3sNVPROC glVertexAttrib3sNV = NULL;
+glVertexAttrib3fNVPROC glVertexAttrib3fNV = NULL;
+glVertexAttrib3dNVPROC glVertexAttrib3dNV = NULL;
+glVertexAttrib4sNVPROC glVertexAttrib4sNV = NULL;
+glVertexAttrib4fNVPROC glVertexAttrib4fNV = NULL;
+glVertexAttrib4dNVPROC glVertexAttrib4dNV = NULL;
+glVertexAttrib4ubNVPROC glVertexAttrib4ubNV = NULL;
+glVertexAttrib1svNVPROC glVertexAttrib1svNV = NULL;
+glVertexAttrib1fvNVPROC glVertexAttrib1fvNV = NULL;
+glVertexAttrib1dvNVPROC glVertexAttrib1dvNV = NULL;
+glVertexAttrib2svNVPROC glVertexAttrib2svNV = NULL;
+glVertexAttrib2fvNVPROC glVertexAttrib2fvNV = NULL;
+glVertexAttrib2dvNVPROC glVertexAttrib2dvNV = NULL;
+glVertexAttrib3svNVPROC glVertexAttrib3svNV = NULL;
+glVertexAttrib3fvNVPROC glVertexAttrib3fvNV = NULL;
+glVertexAttrib3dvNVPROC glVertexAttrib3dvNV = NULL;
+glVertexAttrib4svNVPROC glVertexAttrib4svNV = NULL;
+glVertexAttrib4fvNVPROC glVertexAttrib4fvNV = NULL;
+glVertexAttrib4dvNVPROC glVertexAttrib4dvNV = NULL;
+glVertexAttrib4ubvNVPROC glVertexAttrib4ubvNV = NULL;
+glVertexAttribs1svNVPROC glVertexAttribs1svNV = NULL;
+glVertexAttribs1fvNVPROC glVertexAttribs1fvNV = NULL;
+glVertexAttribs1dvNVPROC glVertexAttribs1dvNV = NULL;
+glVertexAttribs2svNVPROC glVertexAttribs2svNV = NULL;
+glVertexAttribs2fvNVPROC glVertexAttribs2fvNV = NULL;
+glVertexAttribs2dvNVPROC glVertexAttribs2dvNV = NULL;
+glVertexAttribs3svNVPROC glVertexAttribs3svNV = NULL;
+glVertexAttribs3fvNVPROC glVertexAttribs3fvNV = NULL;
+glVertexAttribs3dvNVPROC glVertexAttribs3dvNV = NULL;
+glVertexAttribs4svNVPROC glVertexAttribs4svNV = NULL;
+glVertexAttribs4fvNVPROC glVertexAttribs4fvNV = NULL;
+glVertexAttribs4dvNVPROC glVertexAttribs4dvNV = NULL;
+glVertexAttribs4ubvNVPROC glVertexAttribs4ubvNV = NULL;
+#endif /* GL_NV_vertex_program */
+
+/* NV_fence */
+
+#ifdef GL_NV_fence
+glGenFencesNVPROC glGenFencesNV = NULL;
+glDeleteFencesNVPROC glDeleteFencesNV = NULL;
+glSetFenceNVPROC glSetFenceNV = NULL;
+glTestFenceNVPROC glTestFenceNV = NULL;
+glFinishFenceNVPROC glFinishFenceNV = NULL;
+glIsFenceNVPROC glIsFenceNV = NULL;
+glGetFenceivNVPROC glGetFenceivNV = NULL;
+#endif /* GL_NV_fence */
+
+/* NV_register_combiners2 */
+
+#ifdef GL_NV_register_combiners2
+glCombinerStageParameterfvNVPROC glCombinerStageParameterfvNV = NULL;
+glGetCombinerStageParameterfvNVPROC glGetCombinerStageParameterfvNV = NULL;
+#endif /* GL_NV_register_combiners2 */
+
+/* NV_evaluators */
+
+#ifdef GL_NV_evaluators
+glMapControlPointsNVPROC glMapControlPointsNV = NULL;
+glMapParameterivNVPROC glMapParameterivNV = NULL;
+glMapParameterfvNVPROC glMapParameterfvNV = NULL;
+glGetMapControlPointsNVPROC glGetMapControlPointsNV = NULL;
+glGetMapParameterivNVPROC glGetMapParameterivNV = NULL;
+glGetMapParameterfvNVPROC glGetMapParameterfvNV = NULL;
+glGetMapAttribParameterivNVPROC glGetMapAttribParameterivNV = NULL;
+glGetMapAttribParameterfvNVPROC glGetMapAttribParameterfvNV = NULL;
+glEvalMapsNVPROC glEvalMapsNV = NULL;
+#endif /* GL_NV_evaluators */
+
+/* ATI_pn_triangles */
+
+#ifdef GL_ATI_pn_triangles 
+glPNTrianglesiATIPROC glPNTrianglesiATI = NULL;
+glPNTrianglesfATIPROC glPNTrianglesfATI = NULL;
+#endif /* GL_ATI_pn_triangles */
+
+/* ARB_point_parameters */
+
+#ifdef GL_ARB_point_parameters
+glPointParameterfARBPROC glPointParameterfARB = NULL;
+glPointParameterfvARBPROC glPointParameterfvARB = NULL;
+#endif /* GL_ABR_point_parameters */
+
+/* ARB_vertex_blend */
+
+#ifdef GL_ARB_vertex_blend
+glWeightbvARBPROC glWeightbvARB = NULL;
+glWeightsvARBPROC glWeightsvARB = NULL;
+glWeightivARBPROC glWeightivARB = NULL;
+glWeightfvARBPROC glWeightfvARB = NULL;
+glWeightdvARBPROC glWeightdvARB = NULL;
+glWeightubvARBPROC glWeightubvARB = NULL;
+glWeightusvARBPROC glWeightusvARB = NULL;
+glWeightuivARBPROC glWeightuivARB = NULL;
+glWeightPointerARBPROC glWeightPointerARB = NULL;
+glVertexBlendARBPROC glVertexBlendARB = NULL;
+#endif /* GL_ARB_vertex_blend */
+
+/* EXT_multi_draw_arrays */
+
+#ifdef GL_EXT_multi_draw_arrays
+glMultiDrawArraysEXTPROC glMultiDrawArraysEXT = NULL;
+glMultiDrawElementsEXTPROC glMultiDrawElementsEXT = NULL;
+#endif /* GL_EXT_multi_draw_arrays */
+
+/* ARB_matrix_palette */
+
+#ifdef GL_ARB_matrix_palette
+glCurrentPaletteMatrixARBPROC glCurrentPaletteMatrixARB = NULL;
+glMatrixIndexubvARBPROC glMatrixIndexubvARB = NULL;
+glMatrixIndexusvARBPROC glMatrixIndexusvARB = NULL;
+glMatrixIndexuivARBPROC glMatrixIndexuivARB = NULL;
+glMatrixIndexPointerARBPROC glMatrixIndexPointerARB = NULL;
+#endif /* GL_ARB_matrix_palette */
+
+/* EXT_vertex_shader */
+
+#ifdef GL_EXT_vertex_shader
+glBeginVertexShaderEXTPROC glBeginVertexShaderEXT = NULL;
+glEndVertexShaderEXTPROC glEndVertexShaderEXT = NULL;
+glBindVertexShaderEXTPROC glBindVertexShaderEXT = NULL;
+glGenVertexShadersEXTPROC glGenVertexShadersEXT = NULL;
+glDeleteVertexShaderEXTPROC glDeleteVertexShaderEXT = NULL;
+glShaderOp1EXTPROC glShaderOp1EXT = NULL;
+glShaderOp2EXTPROC glShaderOp2EXT = NULL;
+glShaderOp3EXTPROC glShaderOp3EXT = NULL;
+glSwizzleEXTPROC glSwizzleEXT = NULL;
+glWriteMaskEXTPROC glWriteMaskEXT = NULL;
+glInsertComponentEXTPROC glInsertComponentEXT = NULL;
+glExtractComponentEXTPROC glExtractComponentEXT = NULL;
+glGenSymbolsEXTPROC glGenSymbolsEXT = NULL;
+glSetInvariantEXTPROC glSetInvariantEXT = NULL;
+glSetLocalConstantEXTPROC glSetLocalConstantEXT = NULL;
+glVariantbvEXTPROC glVariantbvEXT = NULL;
+glVariantsvEXTPROC glVariantsvEXT = NULL;
+glVariantivEXTPROC glVariantivEXT = NULL;
+glVariantfvEXTPROC glVariantfvEXT = NULL;
+glVariantdvEXTPROC glVariantdvEXT = NULL;
+glVariantubvEXTPROC glVariantubvEXT = NULL;
+glVariantusvEXTPROC glVariantusvEXT = NULL;
+glVariantuivEXTPROC glVariantuivEXT = NULL;
+glVariantPointerEXTPROC glVariantPointerEXT = NULL;
+glEnableVariantClientStateEXTPROC glEnableVariantClientStateEXT = NULL;
+glDisableVariantClientStateEXTPROC glDisableVariantClientStateEXT = NULL;
+glBindLightParameterEXTPROC glBindLightParameterEXT = NULL;
+glBindMaterialParameterEXTPROC glBindMaterialParameterEXT = NULL;
+glBindTexGenParameterEXTPROC glBindTexGenParameterEXT = NULL;
+glBindTextureUnitParameterEXTPROC glBindTextureUnitParameterEXT = NULL;
+glBindParameterEXTPROC glBindParameterEXT = NULL;
+glIsVariantEnabledEXTPROC glIsVariantEnabledEXT = NULL;
+glGetVariantBooleanvEXTPROC glGetVariantBooleanvEXT = NULL;
+glGetVariantIntegervEXTPROC glGetVariantIntegervEXT = NULL;
+glGetVariantFloatvEXTPROC glGetVariantFloatvEXT = NULL;
+glGetVariantPointervEXTPROC glGetVariantPointervEXT = NULL;
+glGetInvariantBooleanvEXTPROC glGetInvariantBooleanvEXT = NULL;
+glGetInvariantIntegervEXTPROC glGetInvariantIntegervEXT = NULL;
+glGetInvariantFloatvEXTPROC glGetInvariantFloatvEXT = NULL;
+glGetLocalConstantBooleanvEXTPROC glGetLocalConstantBooleanvEXT = NULL;
+glGetLocalConstantIntegervEXTPROC glGetLocalConstantIntegervEXT = NULL;
+glGetLocalConstantFloatvEXTPROC glGetLocalConstantFloatvEXT = NULL;
+#endif /* GL_EXT_vertex_shader */
+
+/* ATI_envmap_bumpmap */
+
+#ifdef GL_ATI_envmap_bumpmap
+glTexBumpParameterivATIPROC glTexBumpParameterivATI = NULL;
+glTexBumpParameterfvATIPROC glTexBumpParameterfvATI = NULL;
+glGetTexBumpParameterivATIPROC glGetTexBumpParameterivATI = NULL;
+glGetTexBumpParameterfvATIPROC glGetTexBumpParameterfvATI = NULL;
+#endif /* GL_ATI_envmap_bumpmap */
+
+/* ATI_fragment_shader */
+
+#ifdef GL_ATI_fragment_shader
+glGenFragmentShadersATIPROC glGenFragmentShadersATI = NULL;
+glBindFragmentShaderATIPROC glBindFragmentShaderATI = NULL;
+glDeleteFragmentShaderATIPROC glDeleteFragmentShaderATI = NULL;
+glBeginFragmentShaderATIPROC glBeginFragmentShaderATI = NULL;
+glEndFragmentShaderATIPROC glEndFragmentShaderATI = NULL;
+glPassTexCoordATIPROC glPassTexCoordATI = NULL;
+glSampleMapATIPROC glSampleMapATI = NULL;
+glColorFragmentOp1ATIPROC glColorFragmentOp1ATI = NULL;
+glColorFragmentOp2ATIPROC glColorFragmentOp2ATI = NULL;
+glColorFragmentOp3ATIPROC glColorFragmentOp3ATI = NULL;
+glAlphaFragmentOp1ATIPROC glAlphaFragmentOp1ATI = NULL;
+glAlphaFragmentOp2ATIPROC glAlphaFragmentOp2ATI = NULL;
+glAlphaFragmentOp3ATIPROC glAlphaFragmentOp3ATI = NULL;
+glSetFragmentShaderConstantATIPROC glSetFragmentShaderConstantATI = NULL;
+#endif /* GL_ATI_fragment_shader */
+
+/* ATI_element_array */
+
+#ifdef GL_ATI_element_array 
+glElementPointerATIPROC glElementPointerATI = NULL;
+glDrawElementArrayATIPROC glDrawElementArrayATI = NULL;
+glDrawRangeElementArrayATIPROC glDrawRangeElementArrayATI = NULL;
+#endif /* GL_ATI_element_array */
+
+/* ATI_vertex_streams */
+
+#ifdef GL_ATI_vertex_streams
+glClientActiveVertexStreamATIPROC glClientActiveVertexStreamATI = NULL;
+glVertexBlendEnviATIPROC glVertexBlendEnviATI = NULL;
+glVertexBlendEnvfATIPROC glVertexBlendEnvfATI = NULL;
+glVertexStream2sATIPROC glVertexStream2sATI = NULL;
+glVertexStream2svATIPROC glVertexStream2svATI = NULL;
+glVertexStream2iATIPROC glVertexStream2iATI = NULL;
+glVertexStream2ivATIPROC glVertexStream2ivATI = NULL;
+glVertexStream2fATIPROC glVertexStream2fATI = NULL;
+glVertexStream2fvATIPROC glVertexStream2fvATI = NULL;
+glVertexStream2dATIPROC glVertexStream2dATI = NULL;
+glVertexStream2dvATIPROC glVertexStream2dvATI = NULL;
+glVertexStream3sATIPROC glVertexStream3sATI = NULL;
+glVertexStream3svATIPROC glVertexStream3svATI = NULL;
+glVertexStream3iATIPROC glVertexStream3iATI = NULL;
+glVertexStream3ivATIPROC glVertexStream3ivATI = NULL;
+glVertexStream3fATIPROC glVertexStream3fATI = NULL;
+glVertexStream3fvATIPROC glVertexStream3fvATI = NULL;
+glVertexStream3dATIPROC glVertexStream3dATI = NULL;
+glVertexStream3dvATIPROC glVertexStream3dvATI = NULL;
+glVertexStream4sATIPROC glVertexStream4sATI = NULL;
+glVertexStream4svATIPROC glVertexStream4svATI = NULL;
+glVertexStream4iATIPROC glVertexStream4iATI = NULL;
+glVertexStream4ivATIPROC glVertexStream4ivATI = NULL;
+glVertexStream4fATIPROC glVertexStream4fATI = NULL;
+glVertexStream4fvATIPROC glVertexStream4fvATI = NULL;
+glVertexStream4dATIPROC glVertexStream4dATI = NULL;
+glVertexStream4dvATIPROC glVertexStream4dvATI = NULL;
+glNormalStream3bATIPROC glNormalStream3bATI = NULL;
+glNormalStream3bvATIPROC glNormalStream3bvATI = NULL;
+glNormalStream3sATIPROC glNormalStream3sATI = NULL;
+glNormalStream3svATIPROC glNormalStream3svATI = NULL;
+glNormalStream3iATIPROC glNormalStream3iATI = NULL;
+glNormalStream3ivATIPROC glNormalStream3ivATI = NULL;
+glNormalStream3fATIPROC glNormalStream3fATI = NULL;
+glNormalStream3fvATIPROC glNormalStream3fvATI = NULL;
+glNormalStream3dATIPROC glNormalStream3dATI = NULL;
+glNormalStream3dvATIPROC glNormalStream3dvATI = NULL;
+#endif /* GL_ATI_vertex_streams */
+
+/* ATI_vertex_array_object */
+
+#ifdef GL_ATI_vertex_array_object
+glNewObjectBufferATIPROC glNewObjectBufferATI = NULL;
+glIsObjectBufferATIPROC glIsObjectBufferATI = NULL;
+glUpdateObjectBufferATIPROC glUpdateObjectBufferATI = NULL;
+glGetObjectBufferfvATIPROC glGetObjectBufferfvATI = NULL;
+glGetObjectBufferivATIPROC glGetObjectBufferivATI = NULL;
+glFreeObjectBufferATIPROC glFreeObjectBufferATI = NULL;
+glArrayObjectATIPROC glArrayObjectATI = NULL;
+glGetArrayObjectfvATIPROC glGetArrayObjectfvATI = NULL;
+glGetArrayObjectivATIPROC glGetArrayObjectivATI = NULL;
+glVariantArrayObjectATIPROC glVariantArrayObjectATI = NULL;
+glGetVariantArrayObjectfvATIPROC glGetVariantArrayObjectfvATI = NULL;
+glGetVariantArrayObjectivATIPROC glGetVariantArrayObjectivATI = NULL;
+#endif /* GL_ATI_vertex_array_object */
+
+/* NV_occlusion_query */
+
+#ifdef GL_NV_occlusion_query
+glGenOcclusionQueriesNVPROC glGenOcclusionQueriesNV = NULL;
+glDeleteOcclusionQueriesNVPROC glDeleteOcclusionQueriesNV = NULL;
+glIsOcclusionQueryNVPROC glIsOcclusionQueryNV = NULL;
+glBeginOcclusionQueryNVPROC glBeginOcclusionQueryNV = NULL;
+glEndOcclusionQueryNVPROC glEndOcclusionQueryNV = NULL;
+glGetOcclusionQueryivNVPROC glGetOcclusionQueryivNV = NULL;
+glGetOcclusionQueryuivNVPROC glGetOcclusionQueryuivNV = NULL;
+#endif /* GL_NV_occlusion_query */
+
+/* NV_point_sprite */
+
+#ifdef GL_NV_point_sprite
+glPointParameteriNVPROC glPointParameteriNV = NULL;
+glPointParameterivNVPROC glPointParameterivNV = NULL;
+#endif /* GL_NV_point_sprite */
+
+/* ARB_window_pos */
+
+#ifdef GL_ARB_window_pos
+glWindowPos2dARBPROC glWindowPos2dARB = NULL;
+glWindowPos2fARBPROC glWindowPos2fARB = NULL;
+glWindowPos2iARBPROC glWindowPos2iARB = NULL;
+glWindowPos2sARBPROC glWindowPos2sARB = NULL;
+glWindowPos2dvARBPROC glWindowPos2dvARB = NULL;
+glWindowPos2fvARBPROC glWindowPos2fvARB = NULL;
+glWindowPos2ivARBPROC glWindowPos2ivARB = NULL;
+glWindowPos2svARBPROC glWindowPos2svARB = NULL;
+glWindowPos3dARBPROC glWindowPos3dARB = NULL;
+glWindowPos3fARBPROC glWindowPos3fARB = NULL;
+glWindowPos3iARBPROC glWindowPos3iARB = NULL;
+glWindowPos3sARBPROC glWindowPos3sARB = NULL;
+glWindowPos3dvARBPROC glWindowPos3dvARB = NULL;
+glWindowPos3fvARBPROC glWindowPos3fvARB = NULL;
+glWindowPos3ivARBPROC glWindowPos3ivARB = NULL;
+glWindowPos3svARBPROC glWindowPos3svARB = NULL;
+#endif /* GL_ARB_window_pos */
+
+/* EXT_draw_range_elements */
+
+#ifdef GL_EXT_draw_range_elements
+glDrawRangeElementsEXTPROC glDrawRangeElementsEXT = NULL;
+#endif /* GL_EXT_draw_range_elements  */
+
+/* EXT_stencil_two_side */
+
+#ifdef GL_EXT_stencil_two_side
+glActiveStencilFaceEXTPROC glActiveStencilFaceEXT = NULL;
+#endif /* GL_EXT_stencil_two_side */
+
+/* ARB_vertex_program */
+
+#ifdef GL_ARB_vertex_program
+glVertexAttrib1sARBPROC glVertexAttrib1sARB = NULL;
+glVertexAttrib1fARBPROC glVertexAttrib1fARB = NULL;
+glVertexAttrib1dARBPROC glVertexAttrib1dARB = NULL;
+glVertexAttrib2sARBPROC glVertexAttrib2sARB = NULL;
+glVertexAttrib2fARBPROC glVertexAttrib2fARB = NULL;
+glVertexAttrib2dARBPROC glVertexAttrib2dARB = NULL;
+glVertexAttrib3sARBPROC glVertexAttrib3sARB = NULL;
+glVertexAttrib3fARBPROC glVertexAttrib3fARB = NULL;
+glVertexAttrib3dARBPROC glVertexAttrib3dARB = NULL;
+glVertexAttrib4sARBPROC glVertexAttrib4sARB = NULL;
+glVertexAttrib4fARBPROC glVertexAttrib4fARB = NULL;
+glVertexAttrib4dARBPROC glVertexAttrib4dARB = NULL;
+glVertexAttrib4NubARBPROC glVertexAttrib4NubARB = NULL;
+glVertexAttrib1svARBPROC glVertexAttrib1svARB = NULL;
+glVertexAttrib1fvARBPROC glVertexAttrib1fvARB = NULL;
+glVertexAttrib1dvARBPROC glVertexAttrib1dvARB = NULL;
+glVertexAttrib2svARBPROC glVertexAttrib2svARB = NULL;
+glVertexAttrib2fvARBPROC glVertexAttrib2fvARB = NULL;
+glVertexAttrib2dvARBPROC glVertexAttrib2dvARB = NULL;
+glVertexAttrib3svARBPROC glVertexAttrib3svARB = NULL;
+glVertexAttrib3fvARBPROC glVertexAttrib3fvARB = NULL;
+glVertexAttrib3dvARBPROC glVertexAttrib3dvARB = NULL;
+glVertexAttrib4bvARBPROC glVertexAttrib4bvARB = NULL;
+glVertexAttrib4svARBPROC glVertexAttrib4svARB = NULL;
+glVertexAttrib4ivARBPROC glVertexAttrib4ivARB = NULL;
+glVertexAttrib4ubvARBPROC glVertexAttrib4ubvARB = NULL;
+glVertexAttrib4usvARBPROC glVertexAttrib4usvARB = NULL;
+glVertexAttrib4uivARBPROC glVertexAttrib4uivARB = NULL;
+glVertexAttrib4fvARBPROC glVertexAttrib4fvARB = NULL;
+glVertexAttrib4dvARBPROC glVertexAttrib4dvARB = NULL;
+glVertexAttrib4NbvARBPROC glVertexAttrib4NbvARB = NULL;
+glVertexAttrib4NsvARBPROC glVertexAttrib4NsvARB = NULL;
+glVertexAttrib4NivARBPROC glVertexAttrib4NivARB = NULL;
+glVertexAttrib4NubvARBPROC glVertexAttrib4NubvARB = NULL;
+glVertexAttrib4NusvARBPROC glVertexAttrib4NusvARB = NULL;
+glVertexAttrib4NuivARBPROC glVertexAttrib4NuivARB = NULL;
+glVertexAttribPointerARBPROC glVertexAttribPointerARB = NULL;
+glEnableVertexAttribArrayARBPROC glEnableVertexAttribArrayARB = NULL;
+glDisableVertexAttribArrayARBPROC glDisableVertexAttribArrayARB = NULL;
+glProgramStringARBPROC glProgramStringARB = NULL;
+glBindProgramARBPROC glBindProgramARB = NULL;
+glDeleteProgramsARBPROC glDeleteProgramsARB = NULL;
+glGenProgramsARBPROC glGenProgramsARB = NULL;
+glProgramEnvParameter4dARBPROC glProgramEnvParameter4dARB = NULL;
+glProgramEnvParameter4dvARBPROC glProgramEnvParameter4dvARB = NULL;
+glProgramEnvParameter4fARBPROC glProgramEnvParameter4fARB = NULL;
+glProgramEnvParameter4fvARBPROC glProgramEnvParameter4fvARB = NULL;
+glProgramLocalParameter4dARBPROC glProgramLocalParameter4dARB = NULL;
+glProgramLocalParameter4dvARBPROC glProgramLocalParameter4dvARB = NULL;
+glProgramLocalParameter4fARBPROC glProgramLocalParameter4fARB = NULL;
+glProgramLocalParameter4fvARBPROC glProgramLocalParameter4fvARB = NULL;
+glGetProgramEnvParameterdvARBPROC glGetProgramEnvParameterdvARB = NULL;
+glGetProgramEnvParameterfvARBPROC glGetProgramEnvParameterfvARB = NULL;
+glGetProgramLocalParameterdvARBPROC glGetProgramLocalParameterdvARB = NULL;
+glGetProgramLocalParameterfvARBPROC glGetProgramLocalParameterfvARB = NULL;
+glGetProgramivARBPROC glGetProgramivARB = NULL;
+glGetProgramStringARBPROC glGetProgramStringARB = NULL;
+glGetVertexAttribdvARBPROC glGetVertexAttribdvARB = NULL;
+glGetVertexAttribfvARBPROC glGetVertexAttribfvARB = NULL;
+glGetVertexAttribivARBPROC glGetVertexAttribivARB = NULL;
+glGetVertexAttribPointervARBPROC glGetVertexAttribPointervARB = NULL;
+glIsProgramARBPROC glIsProgramARB = NULL;
+#endif /* GL_ARB_vertex_program */
+
+/* EXT_cull_vertex */
+
+#ifdef GL_EXT_cull_vertex
+glCullParameterfvEXTPROC glCullParameterfvEXT = NULL;
+glCullParameterdvEXTPROC glCullParameterdvEXT = NULL;
+#endif /* GL_EXT_cull_vertex */
+
+#ifdef GL_EXT_blend_function_sepatate
+glBlendFuncSeparateEXTPROC glBlendFuncSeparateEXT = NULL;
+glBlendFuncSeparateINGRPROC glBlendFuncSeparateINGR = NULL;
+#endif /* GL_EXT_blend_func_separate */
+
+#ifdef _WIN32
+#ifdef GL_VERSION_1_4
+/*#ifndef GL_VERSION_1_2
+glBlendColorPROC glBlendColor = NULL;
+glBlendEquationPROC glBlendEquation = NULL;
+#endif *//* GL_VERSION_1_2 */
+glFogCoordfPROC glFogCoordf = NULL;
+glFogCoordfvPROC glFogCoordfv = NULL;
+glFogCoorddPROC glFogCoordd = NULL;
+glFogCoorddvPROC glFogCoorddv = NULL;
+glFogCoordPointerPROC glFogCoordPointer = NULL;
+glMultiDrawArraysPROC glMultiDrawArrays = NULL;
+glMultiDrawElementsPROC glMultiDrawElements = NULL;
+glPointParameterfPROC glPointParameterf = NULL;
+glPointParameterfvPROC glPointParameterfv = NULL;
+glSecondaryColor3bPROC glSecondaryColor3b = NULL;
+glSecondaryColor3bvPROC glSecondaryColor3bv = NULL;
+glSecondaryColor3dPROC glSecondaryColor3d = NULL;
+glSecondaryColor3dvPROC glSecondaryColor3dv = NULL;
+glSecondaryColor3fPROC glSecondaryColor3f = NULL;
+glSecondaryColor3fvPROC glSecondaryColor3fv = NULL;
+glSecondaryColor3iPROC glSecondaryColor3i = NULL;
+glSecondaryColor3ivPROC glSecondaryColor3iv = NULL;
+glSecondaryColor3sPROC glSecondaryColor3s = NULL;
+glSecondaryColor3svPROC glSecondaryColor3sv = NULL;
+glSecondaryColor3ubPROC glSecondaryColor3ub = NULL;
+glSecondaryColor3ubvPROC glSecondaryColor3ubv = NULL;
+glSecondaryColor3uiPROC glSecondaryColor3ui = NULL;
+glSecondaryColor3uivPROC glSecondaryColor3uiv = NULL;
+glSecondaryColor3usPROC glSecondaryColor3us = NULL;
+glSecondaryColor3usvPROC glSecondaryColor3usv = NULL;
+glSecondaryColorPointerPROC glSecondaryColorPointer = NULL;
+glBlendFuncSeparatePROC glBlendFuncSeparate = NULL;
+glWindowPos2dPROC glWindowPos2d = NULL;
+glWindowPos2fPROC glWindowPos2f = NULL;
+glWindowPos2iPROC glWindowPos2i = NULL;
+glWindowPos2sPROC glWindowPos2s = NULL;
+glWindowPos2dvPROC glWindowPos2dv = NULL;
+glWindowPos2fvPROC glWindowPos2fv = NULL;
+glWindowPos2ivPROC glWindowPos2iv = NULL;
+glWindowPos2svPROC glWindowPos2sv = NULL;
+glWindowPos3dPROC glWindowPos3d = NULL;
+glWindowPos3fPROC glWindowPos3f = NULL;
+glWindowPos3iPROC glWindowPos3i = NULL;
+glWindowPos3sPROC glWindowPos3s = NULL;
+glWindowPos3dvPROC glWindowPos3dv = NULL;
+glWindowPos3fvPROC glWindowPos3fv = NULL;
+glWindowPos3ivPROC glWindowPos3iv = NULL;
+glWindowPos3svPROC glWindowPos3sv = NULL;
+#endif /* GL_VERSION_1_4 */
+#endif /* WIN32 */
+
+#ifdef GL_EXT_blend_func_separate
+glBlendFuncSeparateEXTPROC glBlendFuncSeparateEXT = NULL;
+#endif /* GL_EXT_blend_func_separate */
+
+
+#ifdef GL_NV_element_array
+glElementPointerNVPROC glElementPointerNV = NULL;
+glDrawElementArrayNVPROC glDrawElementArrayNV = NULL;
+glDrawRangeElementArrayNVPROC glDrawRangeElementArrayNV = NULL;
+glMultiDrawElementArrayNVPROC glMultiDrawElementArrayNV = NULL;
+glMultiDrawRangeElementArrayNVPROC glMultiDrawRangeElementArrayNV = NULL;
+#endif /* GL_NV_element_array */
+
+#ifdef GL_NV_fragment_program
+glProgramNamedParameter4fNVPROC glProgramNamedParameter4fNV = NULL;
+glProgramNamedParameter4dNVPROC glProgramNamedParameter4dNV = NULL;
+glProgramNamedParameter4fvNVPROC glProgramNamedParameter4fvNV = NULL;
+glProgramNamedParameter4dvNVPROC glProgramNamedParameter4dvNV = NULL;
+glGetProgramNamedParameterfvNVPROC glGetProgramNamedParameterfvNV = NULL;
+glGetProgramNamedParameterdvNVPROC glGetProgramNamedParameterdvNV = NULL;
+#ifndef GL_ARB_vertex_program
+glProgramLocalParameter4dARBPROC glProgramLocalParameter4dARB = NULL;
+glProgramLocalParameter4dvARBPROC glProgramLocalParameter4dvARB = NULL;
+glProgramLocalParameter4fARBPROC glProgramLocalParameter4fARB = NULL;
+glProgramLocalParameter4fvARBPROC glProgramLocalParameter4fvARB = NULL;
+glGetProgramLocalParameterdvARBPROC glGetProgramLocalParameterdvARB = NULL;
+glGetProgramLocalParameterfvARBPROC glGetProgramLocalParameterfvARB = NULL;
+#endif /* GL_ARB_vertex_program */
+#endif /* GL_NV_fragment_program */
+
+
+#ifdef GL_NV_primitive_restart
+glPrimitiveRestartNVPROC glPrimitiveRestartNV = NULL;
+glPrimitiveRestartIndexNVPROC glPrimitiveRestartIndexNV = NULL;
+#endif /* GL_NV_primitive_restart */
+
+// added -ec
+#ifdef GL_ATI_draw_buffers
+PFNGLDRAWBUFFERS glDrawBuffersATI;
+#endif
+
+static int extgl_error = 0;
+
+struct ExtensionTypes extgl_Extensions;
+
+struct ExtensionTypes SupportedExtensions; /* deprecated, please do not use */
+
+
+/* getProcAddress */
+
+void *extgl_GetProcAddress(const char *name)
+{
+#ifdef _WIN32
+    void *t = wglGetProcAddress(name);
+    if (t == NULL)
+    {
+        extgl_error = 1;  
+    }
+    return t;
+#else
+    void *t = (void*)glXGetProcAddressARB((GLubyte *)name);
+    if (t == NULL)
+    {
+        extgl_error = 1;
+    }
+    return t;
+#endif
+}
+
+/*-----------------------------------------------------*/
+/* WGL stuff */
+/*-----------------------------------------------------*/
+
+#ifdef _WIN32
+
+/** returns true if the extention is available */
+int QueryWGLExtension(const char *name)
+{
+    const GLubyte *extensions;
+    const GLubyte *start;
+    GLubyte *where, *terminator;
+
+    /* Extension names should not have spaces. */
+    where = (GLubyte *) strchr(name, ' ');
+    if (where || *name == '\0')
+        return 0;
+    if (wglGetExtensionsStringARB == NULL)
+        if (wglGetExtensionsStringEXT == NULL)
+            return 0;
+        else
+            extensions = (GLubyte*)wglGetExtensionsStringEXT();
+    else
+        extensions = (GLubyte*)wglGetExtensionsStringARB(wglGetCurrentDC());
+    /* It takes a bit of care to be fool-proof about parsing the
+         OpenGL extensions string. Don't be fooled by sub-strings,
+        etc. */
+    start = extensions;
+    for (;;) 
+    {
+        where = (GLubyte *) strstr((const char *) start, name);
+        if (!where)
+            break;
+        terminator = where + strlen(name);
+        if (where == start || *(where - 1) == ' ')
+            if (*terminator == ' ' || *terminator == '\0')
+                return 1;
+        start = terminator;
+    }
+    return 0;
+}
+
+void extgl_InitWGLARBBufferRegion()
+{
+#ifdef WGL_ARB_buffer_region    
+    if (!extgl_Extensions.wgl.ARB_buffer_region)
+        return;
+    wglCreateBufferRegionARB = (wglCreateBufferRegionARBPROC) extgl_GetProcAddress("wglCreateBufferRegionARB");
+    wglDeleteBufferRegionARB = (wglDeleteBufferRegionARBPROC) extgl_GetProcAddress("wglDeleteBufferRegionARB");
+    wglSaveBufferRegionARB = (wglSaveBufferRegionARBPROC) extgl_GetProcAddress("wglSaveBufferRegionARB");
+    wglRestoreBufferRegionARB = (wglRestoreBufferRegionARBPROC) extgl_GetProcAddress("wglRestoreBufferRegionARB");
+#endif
+}
+
+void extgl_InitWGLARBPbuffer()
+{
+#ifdef WGL_ARB_pbuffer
+    if (!extgl_Extensions.wgl.ARB_pbuffer)
+        return;
+    wglCreatePbufferARB = (wglCreatePbufferARBPROC) extgl_GetProcAddress("wglCreatePbufferARB");
+    wglGetPbufferDCARB = (wglGetPbufferDCARBPROC) extgl_GetProcAddress("wglGetPbufferDCARB");
+    wglReleasePbufferDCARB = (wglReleasePbufferDCARBPROC) extgl_GetProcAddress("wglReleasePbufferDCARB");
+    wglDestroyPbufferARB = (wglDestroyPbufferARBPROC) extgl_GetProcAddress("wglDestroyPbufferARB");
+    wglQueryPbufferARB = (wglQueryPbufferARBPROC) extgl_GetProcAddress("wglQueryPbufferARB");
+#endif
+}
+
+void extgl_InitWGLARBPixelFormat()
+{
+#ifdef WGL_ARB_pixel_format
+    if (!extgl_Extensions.wgl.ARB_pixel_format)
+        return;
+    wglGetPixelFormatAttribivARB = (wglGetPixelFormatAttribivARBPROC) extgl_GetProcAddress("wglGetPixelFormatAttribivARB");
+    wglGetPixelFormatAttribfvARB = (wglGetPixelFormatAttribfvARBPROC) extgl_GetProcAddress("wglGetPixelFormatAttribfvARB");
+    wglChoosePixelFormatARB = (wglChoosePixelFormatARBPROC) extgl_GetProcAddress("wglChoosePixelFormatARB");
+#endif
+}
+
+void extgl_InitWGLARBRenderTexture()
+{
+#ifdef WGL_ARB_render_texture
+    if (!extgl_Extensions.wgl.ARB_render_texture)
+        return;
+    wglBindTexImageARB = (wglBindTexImageARBPROC) extgl_GetProcAddress("wglBindTexImageARB");
+    wglReleaseTexImageARB = (wglReleaseTexImageARBPROC) extgl_GetProcAddress("wglReleaseTexImageARB");
+    wglSetPbufferAttribARB = (wglSetPbufferAttribARBPROC) extgl_GetProcAddress("wglSetPbufferAttribARB");
+#endif
+}
+
+void extgl_InitWGLEXTSwapControl()
+{
+#ifdef WGL_EXT_swap_control
+    if (!extgl_Extensions.wgl.EXT_swap_control)
+        return;
+    wglSwapIntervalEXT = (wglSwapIntervalEXTPROC) extgl_GetProcAddress("wglSwapIntervalEXT");
+    wglGetSwapIntervalEXT = (wglGetSwapIntervalEXTPROC) extgl_GetProcAddress("wglGetSwapIntervalEXT");
+#endif
+}
+
+void extgl_InitWGLARBMakeCurrentRead()
+{
+#ifdef WGL_ARB_make_current_read
+    if (!extgl_Extensions.wgl.ARB_make_current_read)
+        return;
+    wglMakeContextCurrentARB = (wglMakeContextCurrentARBPROC) extgl_GetProcAddress("wglMakeContextCurrentARB");
+    wglGetCurrentReadDCARB = (wglGetCurrentReadDCARBPROC) extgl_GetProcAddress("wglGetCurrentReadDCARB");
+#endif
+}
+
+void extgl_InitSupportedWGLExtensions()
+{
+    extgl_Extensions.wgl.ARB_buffer_region = QueryWGLExtension("WGL_ARB_buffer_region");
+    extgl_Extensions.wgl.ARB_make_current_read = QueryWGLExtension("WGL_ARB_make_current_read");
+    extgl_Extensions.wgl.ARB_multisample = QueryWGLExtension("WGL_ARB_multisample");
+    extgl_Extensions.wgl.ARB_pbuffer = QueryWGLExtension("WGL_ARB_pbuffer");
+    extgl_Extensions.wgl.ARB_pixel_format = QueryWGLExtension("WGL_ARB_pixel_format");
+    extgl_Extensions.wgl.ARB_render_texture = QueryWGLExtension("WGL_ARB_render_texture");
+    extgl_Extensions.wgl.EXT_swap_control = QueryWGLExtension("WGL_EXT_swap_control");
+    extgl_Extensions.wgl.NV_render_depth_texture = QueryWGLExtension("WGL_NV_render_depth_texture");
+    extgl_Extensions.wgl.NV_render_texture_rectangle = QueryWGLExtension("WGL_NV_render_texture_rectangle");
+    extgl_Extensions.wgl.ATI_pixel_format_float = QueryWGLExtension("WGL_ATI_pixel_format_float"); // added -ec
+}
+
+int extgl_InitializeWGL()
+{
+    extgl_error = 0;
+    wglGetExtensionsStringARB = (wglGetExtensionsStringARBPROC) extgl_GetProcAddress("wglGetExtensionsStringARB");
+    wglGetExtensionsStringEXT = (wglGetExtensionsStringEXTPROC) extgl_GetProcAddress("wglGetExtensionsStringEXT");
+    extgl_Extensions.wgl.ARB_extensions_string = wglGetExtensionsStringARB != NULL;
+    extgl_Extensions.wgl.EXT_extensions_string = wglGetExtensionsStringEXT != NULL;
+    extgl_error = 0;
+
+    extgl_InitSupportedWGLExtensions();
+   
+
+    extgl_InitWGLARBMakeCurrentRead();
+    extgl_InitWGLEXTSwapControl();
+    extgl_InitWGLARBRenderTexture();
+    extgl_InitWGLARBPixelFormat();
+    extgl_InitWGLARBPbuffer();
+    extgl_InitWGLARBBufferRegion();
+    
+    return extgl_error;
+}
+
+#endif /* WIN32 */
+
+/*-----------------------------------------------------*/
+/* WGL stuff END*/
+/*-----------------------------------------------------*/
+
+/** returns true if the extention is available */
+int QueryExtension(const char *name)
+{
+    const GLubyte *extensions;
+    const GLubyte *start;
+    GLubyte *where, *terminator;
+
+    /* Extension names should not have spaces. */
+    where = (GLubyte *) strchr(name, ' ');
+    if (where || *name == '\0')
+        return 0;
+    extensions = glGetString(GL_EXTENSIONS);
+    /* It takes a bit of care to be fool-proof about parsing the
+         OpenGL extensions string. Don't be fooled by sub-strings,
+        etc. */
+    start = extensions;
+    for (;;) 
+    {
+        where = (GLubyte *) strstr((const char *) start, name);
+        if (!where)
+            break;
+        terminator = where + strlen(name);
+        if (where == start || *(where - 1) == ' ')
+            if (*terminator == ' ' || *terminator == '\0')
+                return 1;
+        start = terminator;
+    }
+    return 0;
+}
+
+// added -ec
+/* ATI_draw_buffers */
+void extgl_InitATIDrawBuffers()
+{
+#ifdef GL_ATI_draw_buffers
+    if (!extgl_Extensions.ATI_draw_buffers)
+        return;
+    glDrawBuffersATI = (PFNGLDRAWBUFFERS) extgl_GetProcAddress("glDrawBuffersATI");
+#endif
+}
+
+void extgl_InitARBFragmentProgram()
+{
+#ifdef GL_ARB_fragment_program
+    if (!extgl_Extensions.ARB_fragment_program)
+        return;
+    glProgramStringARB = (glProgramStringARBPROC) extgl_GetProcAddress("glProgramStringARB");
+    glBindProgramARB = (glBindProgramARBPROC) extgl_GetProcAddress("glBindProgramARB");
+    glDeleteProgramsARB = (glDeleteProgramsARBPROC) extgl_GetProcAddress("glDeleteProgramsARB");
+    glGenProgramsARB = (glGenProgramsARBPROC) extgl_GetProcAddress("glGenProgramsARB");
+    glProgramEnvParameter4dARB = (glProgramEnvParameter4dARBPROC) extgl_GetProcAddress("glProgramEnvParameter4dARB");
+    glProgramEnvParameter4dvARB = (glProgramEnvParameter4dvARBPROC) extgl_GetProcAddress("glProgramEnvParameter4dvARB");
+    glProgramEnvParameter4fARB = (glProgramEnvParameter4fARBPROC) extgl_GetProcAddress("glProgramEnvParameter4fARB");
+    glProgramEnvParameter4fvARB = (glProgramEnvParameter4fvARBPROC) extgl_GetProcAddress("glProgramEnvParameter4fvARB");
+    glProgramLocalParameter4dARB = (glProgramLocalParameter4dARBPROC) extgl_GetProcAddress("glProgramLocalParameter4dARB");
+    glProgramLocalParameter4dvARB = (glProgramLocalParameter4dvARBPROC) extgl_GetProcAddress("glProgramLocalParameter4dvARB");
+    glProgramLocalParameter4fARB = (glProgramLocalParameter4fARBPROC) extgl_GetProcAddress("glProgramLocalParameter4fARB");
+    glProgramLocalParameter4fvARB = (glProgramLocalParameter4fvARBPROC) extgl_GetProcAddress("glProgramLocalParameter4fvARB");
+    glGetProgramEnvParameterdvARB = (glGetProgramEnvParameterdvARBPROC) extgl_GetProcAddress("glGetProgramEnvParameterdvARB");
+    glGetProgramEnvParameterfvARB = (glGetProgramEnvParameterfvARBPROC) extgl_GetProcAddress("glGetProgramEnvParameterfvARB");
+    glGetProgramLocalParameterdvARB = (glGetProgramLocalParameterdvARBPROC) extgl_GetProcAddress("glGetProgramLocalParameterdvARB");
+    glGetProgramLocalParameterfvARB = (glGetProgramLocalParameterfvARBPROC) extgl_GetProcAddress("glGetProgramLocalParameterfvARB");
+    glGetProgramivARB = (glGetProgramivARBPROC) extgl_GetProcAddress("glGetProgramivARB");
+    glGetProgramStringARB = (glGetProgramStringARBPROC) extgl_GetProcAddress("glGetProgramStringARB");
+    glIsProgramARB = (glIsProgramARBPROC) extgl_GetProcAddress("glIsProgramARB");
+#endif
+}
+
+void extgl_InitNVPrimitiveRestart()
+{
+#ifdef GL_NV_primitive_restart
+    if (!extgl_Extensions.NV_primitive_restart)
+        return;
+    glPrimitiveRestartNV = (glPrimitiveRestartNVPROC) extgl_GetProcAddress("glPrimitiveRestartNV");
+    glPrimitiveRestartIndexNV = (glPrimitiveRestartIndexNVPROC) extgl_GetProcAddress("glPrimitiveRestartIndexNV");
+#endif /* GL_NV_primitive_restart */
+}
+
+void extgl_InitNVFragmentProgram()
+{
+#ifdef GL_NV_fragment_program
+    if (!extgl_Extensions.NV_fragment_program)
+        return;
+    glProgramNamedParameter4fNV = (glProgramNamedParameter4fNVPROC) extgl_GetProcAddress("glProgramNamedParameter4fNV");
+    glProgramNamedParameter4dNV = (glProgramNamedParameter4dNVPROC) extgl_GetProcAddress("glProgramNamedParameter4dNV");
+    glProgramNamedParameter4fvNV = (glProgramNamedParameter4fvNVPROC) extgl_GetProcAddress("glProgramNamedParameter4fvNV");
+    glProgramNamedParameter4dvNV = (glProgramNamedParameter4dvNVPROC) extgl_GetProcAddress("glProgramNamedParameter4dvNV");
+    glGetProgramNamedParameterfvNV = (glGetProgramNamedParameterfvNVPROC) extgl_GetProcAddress("glGetProgramNamedParameterfvNV");
+    glGetProgramNamedParameterdvNV = (glGetProgramNamedParameterdvNVPROC) extgl_GetProcAddress("glGetProgramNamedParameterdvNV");
+#ifndef GL_ARB_vertex_program
+    glProgramLocalParameter4dARB = (glProgramLocalParameter4dARBPROC) extgl_GetProcAddress("glProgramLocalParameter4dARB");
+    glProgramLocalParameter4dvARB = (glProgramLocalParameter4dvARBPROC) extgl_GetProcAddress("glProgramLocalParameter4dvARB");
+    glProgramLocalParameter4fARB = (glProgramLocalParameter4fARBPROC) extgl_GetProcAddress("glProgramLocalParameter4fARB");
+    glProgramLocalParameter4fvARB = (glProgramLocalParameter4fvARBPROC) extgl_GetProcAddress("glProgramLocalParameter4fvARB");
+    glGetProgramLocalParameterdvARB = (glGetProgramLocalParameterdvARBPROC) extgl_GetProcAddress("glGetProgramLocalParameterdvARB");
+    glGetProgramLocalParameterfvARB = (glGetProgramLocalParameterfvARBPROC) extgl_GetProcAddress("glGetProgramLocalParameterfvARB");
+#endif /* GL_ARB_vertex_program */
+#endif /* GL_NV_fragment_program */
+}
+
+void extgl_InitNVElementArray()
+{
+#ifdef GL_NV_element_array
+    if (!extgl_Extensions.NV_element_array)
+        return;
+    glElementPointerNV = (glElementPointerNVPROC) extgl_GetProcAddress("glElementPointerNV");
+    glDrawElementArrayNV = (glDrawElementArrayNVPROC) extgl_GetProcAddress("glDrawElementArrayNV");
+    glDrawRangeElementArrayNV = (glDrawRangeElementArrayNVPROC) extgl_GetProcAddress("glDrawRangeElementArrayNV");
+    glMultiDrawElementArrayNV = (glMultiDrawElementArrayNVPROC) extgl_GetProcAddress("glMultiDrawElementArrayNV");
+    glMultiDrawRangeElementArrayNV = (glMultiDrawRangeElementArrayNVPROC) extgl_GetProcAddress("glMultiDrawRangeElementArrayNV");
+#endif
+}
+
+
+void extgl_InitEXTBlendFuncSeparate()
+{
+#ifdef GL_EXT_blend_func_separate
+    if (!extgl_Extensions.EXT_blend_func_separate)
+        return;
+    glBlendFuncSeparateEXT = (glBlendFuncSeparateEXTPROC) extgl_GetProcAddress("glBlendFuncSeparateEXT");
+#endif
+}
+
+void extgl_InitEXTCullVertex()
+{
+#ifdef GL_EXT_cull_vertex
+    if (!extgl_Extensions.EXT_cull_vertex)
+        return;
+    glCullParameterfvEXT = (glCullParameterfvEXTPROC) extgl_GetProcAddress("glCullParameterfvEXT");
+    glCullParameterdvEXT = (glCullParameterdvEXTPROC) extgl_GetProcAddress("glCullParameterdvEXT");
+#endif
+}
+
+void extgl_InitARBVertexProgram()
+{
+#ifdef GL_ARB_vertex_program
+    if (!extgl_Extensions.ARB_vertex_program)
+        return;
+    glVertexAttrib1sARB = (glVertexAttrib1sARBPROC) extgl_GetProcAddress("glVertexAttrib1sARB");
+    glVertexAttrib1fARB = (glVertexAttrib1fARBPROC) extgl_GetProcAddress("glVertexAttrib1fARB");
+    glVertexAttrib1dARB = (glVertexAttrib1dARBPROC) extgl_GetProcAddress("glVertexAttrib1dARB");
+    glVertexAttrib2sARB = (glVertexAttrib2sARBPROC) extgl_GetProcAddress("glVertexAttrib2sARB");
+    glVertexAttrib2fARB = (glVertexAttrib2fARBPROC) extgl_GetProcAddress("glVertexAttrib2fARB");
+    glVertexAttrib2dARB = (glVertexAttrib2dARBPROC) extgl_GetProcAddress("glVertexAttrib2dARB");
+    glVertexAttrib3sARB = (glVertexAttrib3sARBPROC) extgl_GetProcAddress("glVertexAttrib3sARB");
+    glVertexAttrib3fARB = (glVertexAttrib3fARBPROC) extgl_GetProcAddress("glVertexAttrib3fARB");
+    glVertexAttrib3dARB = (glVertexAttrib3dARBPROC) extgl_GetProcAddress("glVertexAttrib3dARB");
+    glVertexAttrib4sARB = (glVertexAttrib4sARBPROC) extgl_GetProcAddress("glVertexAttrib4sARB");
+    glVertexAttrib4fARB = (glVertexAttrib4fARBPROC) extgl_GetProcAddress("glVertexAttrib4fARB");
+    glVertexAttrib4dARB = (glVertexAttrib4dARBPROC) extgl_GetProcAddress("glVertexAttrib4dARB");
+    glVertexAttrib4NubARB = (glVertexAttrib4NubARBPROC) extgl_GetProcAddress("glVertexAttrib4NubARB");
+    glVertexAttrib1svARB = (glVertexAttrib1svARBPROC) extgl_GetProcAddress("glVertexAttrib1svARB");
+    glVertexAttrib1fvARB = (glVertexAttrib1fvARBPROC) extgl_GetProcAddress("glVertexAttrib1fvARB");
+    glVertexAttrib1dvARB = (glVertexAttrib1dvARBPROC) extgl_GetProcAddress("glVertexAttrib1dvARB");
+    glVertexAttrib2svARB = (glVertexAttrib2svARBPROC) extgl_GetProcAddress("glVertexAttrib2svARB");
+    glVertexAttrib2fvARB = (glVertexAttrib2fvARBPROC) extgl_GetProcAddress("glVertexAttrib2fvARB");
+    glVertexAttrib2dvARB = (glVertexAttrib2dvARBPROC) extgl_GetProcAddress("glVertexAttrib2dvARB");
+    glVertexAttrib3svARB = (glVertexAttrib3svARBPROC) extgl_GetProcAddress("glVertexAttrib3svARB");
+    glVertexAttrib3fvARB = (glVertexAttrib3fvARBPROC) extgl_GetProcAddress("glVertexAttrib3fvARB");
+    glVertexAttrib3dvARB = (glVertexAttrib3dvARBPROC) extgl_GetProcAddress("glVertexAttrib3dvARB");
+    glVertexAttrib4bvARB = (glVertexAttrib4bvARBPROC) extgl_GetProcAddress("glVertexAttrib4bvARB");
+    glVertexAttrib4svARB = (glVertexAttrib4svARBPROC) extgl_GetProcAddress("glVertexAttrib4svARB");
+    glVertexAttrib4ivARB = (glVertexAttrib4ivARBPROC) extgl_GetProcAddress("glVertexAttrib4ivARB");
+    glVertexAttrib4ubvARB = (glVertexAttrib4ubvARBPROC) extgl_GetProcAddress("glVertexAttrib4ubvARB");
+    glVertexAttrib4usvARB = (glVertexAttrib4usvARBPROC) extgl_GetProcAddress("glVertexAttrib4usvARB");
+    glVertexAttrib4uivARB = (glVertexAttrib4uivARBPROC) extgl_GetProcAddress("glVertexAttrib4uivARB");
+    glVertexAttrib4fvARB = (glVertexAttrib4fvARBPROC) extgl_GetProcAddress("glVertexAttrib4fvARB");
+    glVertexAttrib4dvARB = (glVertexAttrib4dvARBPROC) extgl_GetProcAddress("glVertexAttrib4dvARB");
+    glVertexAttrib4NbvARB = (glVertexAttrib4NbvARBPROC) extgl_GetProcAddress("glVertexAttrib4NbvARB");
+    glVertexAttrib4NsvARB = (glVertexAttrib4NsvARBPROC) extgl_GetProcAddress("glVertexAttrib4NsvARB");
+    glVertexAttrib4NivARB = (glVertexAttrib4NivARBPROC) extgl_GetProcAddress("glVertexAttrib4NivARB");
+    glVertexAttrib4NubvARB = (glVertexAttrib4NubvARBPROC) extgl_GetProcAddress("glVertexAttrib4NubvARB");
+    glVertexAttrib4NusvARB = (glVertexAttrib4NusvARBPROC) extgl_GetProcAddress("glVertexAttrib4NusvARB");
+    glVertexAttrib4NuivARB = (glVertexAttrib4NuivARBPROC) extgl_GetProcAddress("glVertexAttrib4NuivARB");
+    glVertexAttribPointerARB = (glVertexAttribPointerARBPROC) extgl_GetProcAddress("glVertexAttribPointerARB");
+    glEnableVertexAttribArrayARB = (glEnableVertexAttribArrayARBPROC) extgl_GetProcAddress("glEnableVertexAttribArrayARB");
+    glDisableVertexAttribArrayARB = (glDisableVertexAttribArrayARBPROC) extgl_GetProcAddress("glDisableVertexAttribArrayARB");
+    glProgramStringARB = (glProgramStringARBPROC) extgl_GetProcAddress("glProgramStringARB");
+    glBindProgramARB = (glBindProgramARBPROC) extgl_GetProcAddress("glBindProgramARB");
+    glDeleteProgramsARB = (glDeleteProgramsARBPROC) extgl_GetProcAddress("glDeleteProgramsARB");
+    glGenProgramsARB = (glGenProgramsARBPROC) extgl_GetProcAddress("glGenProgramsARB");
+    glProgramEnvParameter4dARB = (glProgramEnvParameter4dARBPROC) extgl_GetProcAddress("glProgramEnvParameter4dARB");
+    glProgramEnvParameter4dvARB = (glProgramEnvParameter4dvARBPROC) extgl_GetProcAddress("glProgramEnvParameter4dvARB");
+    glProgramEnvParameter4fARB = (glProgramEnvParameter4fARBPROC) extgl_GetProcAddress("glProgramEnvParameter4fARB");
+    glProgramEnvParameter4fvARB = (glProgramEnvParameter4fvARBPROC) extgl_GetProcAddress("glProgramEnvParameter4fvARB");
+    glProgramLocalParameter4dARB = (glProgramLocalParameter4dARBPROC) extgl_GetProcAddress("glProgramLocalParameter4dARB");
+    glProgramLocalParameter4dvARB = (glProgramLocalParameter4dvARBPROC) extgl_GetProcAddress("glProgramLocalParameter4dvARB");
+    glProgramLocalParameter4fARB = (glProgramLocalParameter4fARBPROC) extgl_GetProcAddress("glProgramLocalParameter4fARB");
+    glProgramLocalParameter4fvARB = (glProgramLocalParameter4fvARBPROC) extgl_GetProcAddress("glProgramLocalParameter4fvARB");
+    glGetProgramEnvParameterdvARB = (glGetProgramEnvParameterdvARBPROC) extgl_GetProcAddress("glGetProgramEnvParameterdvARB");
+    glGetProgramEnvParameterfvARB = (glGetProgramEnvParameterfvARBPROC) extgl_GetProcAddress("glGetProgramEnvParameterfvARB");
+    glGetProgramLocalParameterdvARB = (glGetProgramLocalParameterdvARBPROC) extgl_GetProcAddress("glGetProgramLocalParameterdvARB");
+    glGetProgramLocalParameterfvARB = (glGetProgramLocalParameterfvARBPROC) extgl_GetProcAddress("glGetProgramLocalParameterfvARB");
+    glGetProgramivARB = (glGetProgramivARBPROC) extgl_GetProcAddress("glGetProgramivARB");
+    glGetProgramStringARB = (glGetProgramStringARBPROC) extgl_GetProcAddress("glGetProgramStringARB");
+    glGetVertexAttribdvARB = (glGetVertexAttribdvARBPROC) extgl_GetProcAddress("glGetVertexAttribdvARB");
+    glGetVertexAttribfvARB = (glGetVertexAttribfvARBPROC) extgl_GetProcAddress("glGetVertexAttribfvARB");
+    glGetVertexAttribivARB = (glGetVertexAttribivARBPROC) extgl_GetProcAddress("glGetVertexAttribivARB");
+    glGetVertexAttribPointervARB = (glGetVertexAttribPointervARBPROC) extgl_GetProcAddress("glGetVertexAttribPointervARB");
+    glIsProgramARB = (glIsProgramARBPROC) extgl_GetProcAddress("glIsProgramARB");
+#endif
+}
+
+void extgl_InitEXTStencilTwoSide()
+{
+#ifdef GL_EXT_stencil_two_side
+    if (!extgl_Extensions.EXT_stencil_two_side)
+        return;
+    glActiveStencilFaceEXT = (glActiveStencilFaceEXTPROC) extgl_GetProcAddress("glActiveStencilFaceEXT");
+#endif
+}
+
+void extgl_InitARBWindowPos()
+{
+#ifdef GL_ARB_window_pos
+    if (!extgl_Extensions.ARB_window_pos)
+        return;
+    glWindowPos2dARB = (glWindowPos2dARBPROC) extgl_GetProcAddress("glWindowPos2dARB");
+    glWindowPos2fARB = (glWindowPos2fARBPROC) extgl_GetProcAddress("glWindowPos2fARB");
+    glWindowPos2iARB = (glWindowPos2iARBPROC) extgl_GetProcAddress("glWindowPos2iARB");
+    glWindowPos2sARB = (glWindowPos2sARBPROC) extgl_GetProcAddress("glWindowPos2sARB");
+    glWindowPos2dvARB = (glWindowPos2dvARBPROC) extgl_GetProcAddress("glWindowPos2dvARB");
+    glWindowPos2fvARB = (glWindowPos2fvARBPROC) extgl_GetProcAddress("glWindowPos2fvARB");
+    glWindowPos2ivARB = (glWindowPos2ivARBPROC) extgl_GetProcAddress("glWindowPos2ivARB");
+    glWindowPos2svARB = (glWindowPos2svARBPROC) extgl_GetProcAddress("glWindowPos2svARB");
+    glWindowPos3dARB = (glWindowPos3dARBPROC) extgl_GetProcAddress("glWindowPos3dARB");
+    glWindowPos3fARB = (glWindowPos3fARBPROC) extgl_GetProcAddress("glWindowPos3fARB");
+    glWindowPos3iARB = (glWindowPos3iARBPROC) extgl_GetProcAddress("glWindowPos3iARB");
+    glWindowPos3sARB = (glWindowPos3sARBPROC) extgl_GetProcAddress("glWindowPos3sARB");
+    glWindowPos3dvARB = (glWindowPos3dvARBPROC) extgl_GetProcAddress("glWindowPos3dvARB");
+    glWindowPos3fvARB = (glWindowPos3fvARBPROC) extgl_GetProcAddress("glWindowPos3fvARB");
+    glWindowPos3ivARB = (glWindowPos3ivARBPROC) extgl_GetProcAddress("glWindowPos3ivARB");
+    glWindowPos3svARB = (glWindowPos3svARBPROC) extgl_GetProcAddress("glWindowPos3svARB");
+#endif 
+}
+
+void extgl_InitARBTextureCompression()
+{
+#ifdef GL_ARB_texture_compression
+    if (!extgl_Extensions.ARB_texture_compression)
+        return;
+    glCompressedTexImage3DARB = (glCompressedTexImage3DARBPROC) extgl_GetProcAddress("glCompressedTexImage3DARB");
+    glCompressedTexImage2DARB = (glCompressedTexImage2DARBPROC) extgl_GetProcAddress("glCompressedTexImage2DARB");
+    glCompressedTexImage1DARB = (glCompressedTexImage1DARBPROC) extgl_GetProcAddress("glCompressedTexImage1DARB");
+    glCompressedTexSubImage3DARB = (glCompressedTexSubImage3DARBPROC) extgl_GetProcAddress("glCompressedTexSubImage3DARB");
+    glCompressedTexSubImage2DARB = (glCompressedTexSubImage2DARBPROC) extgl_GetProcAddress("glCompressedTexSubImage2DARB");
+    glCompressedTexSubImage1DARB = (glCompressedTexSubImage1DARBPROC) extgl_GetProcAddress("glCompressedTexSubImage1DARB");
+    glGetCompressedTexImageARB = (glGetCompressedTexImageARBPROC) extgl_GetProcAddress("glGetCompressedTexImageARB");
+#endif
+}
+
+void extgl_InitNVPointSprite()
+{
+#ifdef GL_NV_point_sprite
+    if (!extgl_Extensions.NV_point_sprite)
+        return;
+    glPointParameteriNV = (glPointParameteriNVPROC) extgl_GetProcAddress("glPointParameteriNV");
+    glPointParameterivNV = (glPointParameterivNVPROC) extgl_GetProcAddress("glPointParameterivNV");
+#endif
+}
+
+void extgl_InitNVOcclusionQuery()
+{
+#ifdef GL_NV_occlusion_query
+    if (!extgl_Extensions.NV_occlusion_query)
+        return;
+    glGenOcclusionQueriesNV = (glGenOcclusionQueriesNVPROC) extgl_GetProcAddress("glGenOcclusionQueriesNV");
+    glDeleteOcclusionQueriesNV = (glDeleteOcclusionQueriesNVPROC) extgl_GetProcAddress("glDeleteOcclusionQueriesNV");
+    glIsOcclusionQueryNV = (glIsOcclusionQueryNVPROC) extgl_GetProcAddress("glIsOcclusionQueryNV");
+    glBeginOcclusionQueryNV = (glBeginOcclusionQueryNVPROC) extgl_GetProcAddress("glBeginOcclusionQueryNV");
+    glEndOcclusionQueryNV = (glEndOcclusionQueryNVPROC) extgl_GetProcAddress("glEndOcclusionQueryNV");
+    glGetOcclusionQueryivNV = (glGetOcclusionQueryivNVPROC) extgl_GetProcAddress("glGetOcclusionQueryivNV");
+    glGetOcclusionQueryuivNV = (glGetOcclusionQueryuivNVPROC) extgl_GetProcAddress("glGetOcclusionQueryuivNV");
+#endif
+}
+
+void extgl_InitATIVertexArrayObject()
+{
+#ifdef GL_ATI_vertex_array_object
+    if (!extgl_Extensions.ATI_vertex_array_object)
+        return;
+    glNewObjectBufferATI = (glNewObjectBufferATIPROC) extgl_GetProcAddress("glNewObjectBufferATI");
+    glIsObjectBufferATI = (glIsObjectBufferATIPROC) extgl_GetProcAddress("glIsObjectBufferATI");
+    glUpdateObjectBufferATI = (glUpdateObjectBufferATIPROC) extgl_GetProcAddress("glUpdateObjectBufferATI");
+    glGetObjectBufferfvATI = (glGetObjectBufferfvATIPROC) extgl_GetProcAddress("glGetObjectBufferfvATI");
+    glGetObjectBufferivATI = (glGetObjectBufferivATIPROC) extgl_GetProcAddress("glGetObjectBufferivATI");
+    glFreeObjectBufferATI = (glFreeObjectBufferATIPROC) extgl_GetProcAddress("glFreeObjectBufferATI");
+    glArrayObjectATI = (glArrayObjectATIPROC) extgl_GetProcAddress("glArrayObjectATI");
+    glGetArrayObjectfvATI = (glGetArrayObjectfvATIPROC) extgl_GetProcAddress("glGetArrayObjectfvATI");
+    glGetArrayObjectivATI = (glGetArrayObjectivATIPROC) extgl_GetProcAddress("glGetArrayObjectivATI");
+    glVariantArrayObjectATI = (glVariantArrayObjectATIPROC) extgl_GetProcAddress("glVariantArrayObjectATI");
+    glGetVariantArrayObjectfvATI = (glGetVariantArrayObjectfvATIPROC) extgl_GetProcAddress("glGetVariantArrayObjectfvATI");
+    glGetVariantArrayObjectivATI = (glGetVariantArrayObjectivATIPROC) extgl_GetProcAddress("glGetVariantArrayObjectivATI");
+#endif
+}
+
+void extgl_InitATIVertexStreams()
+{
+#ifdef GL_ATI_vertex_streams
+    if (!extgl_Extensions.ATI_vertex_streams)
+        return;
+    glClientActiveVertexStreamATI = (glClientActiveVertexStreamATIPROC) extgl_GetProcAddress("glClientActiveVertexStreamATI");
+    glVertexBlendEnviATI = (glVertexBlendEnviATIPROC) extgl_GetProcAddress("glVertexBlendEnviATI");
+    glVertexBlendEnvfATI = (glVertexBlendEnvfATIPROC) extgl_GetProcAddress("glVertexBlendEnvfATI");
+    glVertexStream2sATI = (glVertexStream2sATIPROC) extgl_GetProcAddress("glVertexStream2sATI");
+    glVertexStream2svATI = (glVertexStream2svATIPROC) extgl_GetProcAddress("glVertexStream2svATI");
+    glVertexStream2iATI = (glVertexStream2iATIPROC) extgl_GetProcAddress("glVertexStream2iATI");
+    glVertexStream2ivATI = (glVertexStream2ivATIPROC) extgl_GetProcAddress("glVertexStream2ivATI");
+    glVertexStream2fATI = (glVertexStream2fATIPROC) extgl_GetProcAddress("glVertexStream2fATI");
+    glVertexStream2fvATI = (glVertexStream2fvATIPROC) extgl_GetProcAddress("glVertexStream2fvATI");
+    glVertexStream2dATI = (glVertexStream2dATIPROC) extgl_GetProcAddress("glVertexStream2dATI");
+    glVertexStream2dvATI = (glVertexStream2dvATIPROC) extgl_GetProcAddress("glVertexStream2dvATI");
+    glVertexStream3sATI = (glVertexStream3sATIPROC) extgl_GetProcAddress("glVertexStream3sATI");
+    glVertexStream3svATI = (glVertexStream3svATIPROC) extgl_GetProcAddress("glVertexStream3svATI");
+    glVertexStream3iATI = (glVertexStream3iATIPROC) extgl_GetProcAddress("glVertexStream3iATI");
+    glVertexStream3ivATI = (glVertexStream3ivATIPROC) extgl_GetProcAddress("glVertexStream3ivATI");
+    glVertexStream3fATI = (glVertexStream3fATIPROC) extgl_GetProcAddress("glVertexStream3fATI");
+    glVertexStream3fvATI = (glVertexStream3fvATIPROC) extgl_GetProcAddress("glVertexStream3fvATI");
+    glVertexStream3dATI = (glVertexStream3dATIPROC) extgl_GetProcAddress("glVertexStream3dATI");
+    glVertexStream3dvATI = (glVertexStream3dvATIPROC) extgl_GetProcAddress("glVertexStream3dvATI");
+    glVertexStream4sATI = (glVertexStream4sATIPROC) extgl_GetProcAddress("glVertexStream4sATI");
+    glVertexStream4svATI = (glVertexStream4svATIPROC) extgl_GetProcAddress("glVertexStream4svATI");
+    glVertexStream4iATI = (glVertexStream4iATIPROC) extgl_GetProcAddress("glVertexStream4iATI");
+    glVertexStream4ivATI = (glVertexStream4ivATIPROC) extgl_GetProcAddress("glVertexStream4ivATI");
+    glVertexStream4fATI = (glVertexStream4fATIPROC) extgl_GetProcAddress("glVertexStream4fATI");
+    glVertexStream4fvATI = (glVertexStream4fvATIPROC) extgl_GetProcAddress("glVertexStream4fvATI");
+    glVertexStream4dATI = (glVertexStream4dATIPROC) extgl_GetProcAddress("glVertexStream4dATI");
+    glVertexStream4dvATI = (glVertexStream4dvATIPROC) extgl_GetProcAddress("glVertexStream4dvATI");
+    glNormalStream3bATI = (glNormalStream3bATIPROC) extgl_GetProcAddress("glNormalStream3bATI");
+    glNormalStream3bvATI = (glNormalStream3bvATIPROC) extgl_GetProcAddress("glNormalStream3bvATI");
+    glNormalStream3sATI = (glNormalStream3sATIPROC) extgl_GetProcAddress("glNormalStream3sATI");
+    glNormalStream3svATI = (glNormalStream3svATIPROC) extgl_GetProcAddress("glNormalStream3svATI");
+    glNormalStream3iATI = (glNormalStream3iATIPROC) extgl_GetProcAddress("glNormalStream3iATI");
+    glNormalStream3ivATI = (glNormalStream3ivATIPROC) extgl_GetProcAddress("glNormalStream3ivATI");
+    glNormalStream3fATI = (glNormalStream3fATIPROC) extgl_GetProcAddress("glNormalStream3fATI");
+    glNormalStream3fvATI = (glNormalStream3fvATIPROC) extgl_GetProcAddress("glNormalStream3fvATI");
+    glNormalStream3dATI = (glNormalStream3dATIPROC) extgl_GetProcAddress("glNormalStream3dATI");
+    glNormalStream3dvATI = (glNormalStream3dvATIPROC) extgl_GetProcAddress("glNormalStream3dvATI");
+#endif
+}
+
+void extgl_InitATIElementArray()
+{
+#ifdef GL_ATI_element_array
+    if (!extgl_Extensions.ATI_element_array)
+        return;
+    glElementPointerATI = (glElementPointerATIPROC) extgl_GetProcAddress("glElementPointerATI");
+    glDrawElementArrayATI = (glDrawElementArrayATIPROC) extgl_GetProcAddress("glDrawElementArrayATI");
+    glDrawRangeElementArrayATI = (glDrawRangeElementArrayATIPROC) extgl_GetProcAddress("glDrawRangeElementArrayATI");
+#endif
+}
+
+void extgl_InitATIFragmentShader()
+{
+#ifdef GL_ATI_fragment_shader
+    if (!extgl_Extensions.ATI_fragment_shader)
+        return;
+    glGenFragmentShadersATI = (glGenFragmentShadersATIPROC) extgl_GetProcAddress("glGenFragmentShadersATI");
+    glBindFragmentShaderATI = (glBindFragmentShaderATIPROC) extgl_GetProcAddress("glBindFragmentShaderATI");
+    glDeleteFragmentShaderATI = (glDeleteFragmentShaderATIPROC) extgl_GetProcAddress("glDeleteFragmentShaderATI");
+    glBeginFragmentShaderATI = (glBeginFragmentShaderATIPROC) extgl_GetProcAddress("glBeginFragmentShaderATI");
+    glEndFragmentShaderATI = (glEndFragmentShaderATIPROC) extgl_GetProcAddress("glEndFragmentShaderATI");
+    glPassTexCoordATI = (glPassTexCoordATIPROC) extgl_GetProcAddress("glPassTexCoordATI");
+    glSampleMapATI = (glSampleMapATIPROC) extgl_GetProcAddress("glSampleMapATI");
+    glColorFragmentOp1ATI = (glColorFragmentOp1ATIPROC) extgl_GetProcAddress("glColorFragmentOp1ATI");
+    glColorFragmentOp2ATI = (glColorFragmentOp2ATIPROC) extgl_GetProcAddress("glColorFragmentOp2ATI");
+    glColorFragmentOp3ATI = (glColorFragmentOp3ATIPROC) extgl_GetProcAddress("glColorFragmentOp3ATI");
+    glAlphaFragmentOp1ATI = (glAlphaFragmentOp1ATIPROC) extgl_GetProcAddress("glAlphaFragmentOp1ATI");
+    glAlphaFragmentOp2ATI = (glAlphaFragmentOp2ATIPROC) extgl_GetProcAddress("glAlphaFragmentOp2ATI");
+    glAlphaFragmentOp3ATI = (glAlphaFragmentOp3ATIPROC) extgl_GetProcAddress("glAlphaFragmentOp3ATI");
+    glSetFragmentShaderConstantATI = (glSetFragmentShaderConstantATIPROC) extgl_GetProcAddress("glSetFragmentShaderConstantATI");
+#endif
+}
+
+
+void extgl_InitATIEnvmapBumpmap()
+{
+#ifdef GL_ATI_envmap_bumpmap
+    if (!extgl_Extensions.ATI_envmap_bumpmap)
+        return;
+    glTexBumpParameterivATI = (glTexBumpParameterivATIPROC) extgl_GetProcAddress("glTexBumpParameterivATI");
+    glTexBumpParameterfvATI = (glTexBumpParameterfvATIPROC) extgl_GetProcAddress("glTexBumpParameterfvATI");
+    glGetTexBumpParameterivATI = (glGetTexBumpParameterivATIPROC) extgl_GetProcAddress("glGetTexBumpParameterivATI");
+    glGetTexBumpParameterfvATI = (glGetTexBumpParameterfvATIPROC) extgl_GetProcAddress("glGetTexBumpParameterfvATI");
+#endif
+}
+
+void extgl_InitEXTVertexShader()
+{
+#ifdef GL_EXT_vertex_shader
+    if (!extgl_Extensions.EXT_vertex_shader)
+        return;
+    glBeginVertexShaderEXT = (glBeginVertexShaderEXTPROC) extgl_GetProcAddress("glBeginVertexShaderEXT");
+    glEndVertexShaderEXT = (glEndVertexShaderEXTPROC) extgl_GetProcAddress("glEndVertexShaderEXT");
+    glBindVertexShaderEXT = (glBindVertexShaderEXTPROC) extgl_GetProcAddress("glBindVertexShaderEXT");
+    glGenVertexShadersEXT = (glGenVertexShadersEXTPROC) extgl_GetProcAddress("glGenVertexShadersEXT");
+    glDeleteVertexShaderEXT = (glDeleteVertexShaderEXTPROC) extgl_GetProcAddress("glDeleteVertexShaderEXT");
+    glShaderOp1EXT = (glShaderOp1EXTPROC) extgl_GetProcAddress("glShaderOp1EXT");
+    glShaderOp2EXT = (glShaderOp2EXTPROC) extgl_GetProcAddress("glShaderOp2EXT");
+    glShaderOp3EXT = (glShaderOp3EXTPROC) extgl_GetProcAddress("glShaderOp3EXT");
+    glSwizzleEXT = (glSwizzleEXTPROC) extgl_GetProcAddress("glSwizzleEXT");
+    glWriteMaskEXT = (glWriteMaskEXTPROC) extgl_GetProcAddress("glWriteMaskEXT");
+    glInsertComponentEXT = (glInsertComponentEXTPROC) extgl_GetProcAddress("glInsertComponentEXT");
+    glExtractComponentEXT = (glExtractComponentEXTPROC) extgl_GetProcAddress("glExtractComponentEXT");
+    glGenSymbolsEXT = (glGenSymbolsEXTPROC) extgl_GetProcAddress("glGenSymbolsEXT");
+    glSetInvariantEXT = (glSetInvariantEXTPROC) extgl_GetProcAddress("glSetInvarianceEXT");
+    glSetLocalConstantEXT = (glSetLocalConstantEXTPROC) extgl_GetProcAddress("glSetLocalConstantEXT");
+    glVariantbvEXT = (glVariantbvEXTPROC) extgl_GetProcAddress("glVariantbvEXT");
+    glVariantsvEXT = (glVariantsvEXTPROC) extgl_GetProcAddress("glVariantsvEXT");
+    glVariantivEXT = (glVariantivEXTPROC) extgl_GetProcAddress("glVariantivEXT");
+    glVariantfvEXT = (glVariantfvEXTPROC) extgl_GetProcAddress("glVariantfvEXT");
+    glVariantdvEXT = (glVariantdvEXTPROC) extgl_GetProcAddress("glVariantdvEXT");
+    glVariantubvEXT = (glVariantubvEXTPROC) extgl_GetProcAddress("glVariantubvEXT");
+    glVariantusvEXT = (glVariantusvEXTPROC) extgl_GetProcAddress("glVariantusvEXT");
+    glVariantuivEXT = (glVariantuivEXTPROC) extgl_GetProcAddress("glVariantuivEXT");
+    glVariantPointerEXT = (glVariantPointerEXTPROC) extgl_GetProcAddress("glVariantPointerEXT");
+    glEnableVariantClientStateEXT = (glEnableVariantClientStateEXTPROC) extgl_GetProcAddress("glEnableVariantClientStateEXT");
+    glDisableVariantClientStateEXT = (glDisableVariantClientStateEXTPROC) extgl_GetProcAddress("glDisableVariantClientStateEXT");
+    glBindLightParameterEXT = (glBindLightParameterEXTPROC) extgl_GetProcAddress("glBindLightParameterEXT");
+    glBindMaterialParameterEXT = (glBindMaterialParameterEXTPROC) extgl_GetProcAddress("glBindMaterialParameterEXT");
+    glBindTexGenParameterEXT = (glBindTexGenParameterEXTPROC) extgl_GetProcAddress("glBindTexGenParameterEXT");
+    glBindTextureUnitParameterEXT = (glBindTextureUnitParameterEXTPROC) extgl_GetProcAddress("glBindTextureUnitParameterEXT");
+    glBindParameterEXT = (glBindParameterEXTPROC) extgl_GetProcAddress("glBindParameterEXT");
+    glIsVariantEnabledEXT = (glIsVariantEnabledEXTPROC) extgl_GetProcAddress("glIsVariantEnabledEXT");
+    glGetVariantBooleanvEXT = (glGetVariantBooleanvEXTPROC) extgl_GetProcAddress("glGetVariantBooleanvEXT");
+    glGetVariantIntegervEXT = (glGetVariantIntegervEXTPROC) extgl_GetProcAddress("glGetVariantIntegervEXT");
+    glGetVariantFloatvEXT = (glGetVariantFloatvEXTPROC) extgl_GetProcAddress("glGetVariantFloatvEXT");
+    glGetVariantPointervEXT = (glGetVariantPointervEXTPROC) extgl_GetProcAddress("glGetVariantPointervEXT");
+    glGetInvariantBooleanvEXT = (glGetInvariantBooleanvEXTPROC) extgl_GetProcAddress("glGetInvariantBooleanvEXT");
+    glGetInvariantIntegervEXT = (glGetInvariantIntegervEXTPROC) extgl_GetProcAddress("glGetInvariantIntegervEXT");
+    glGetInvariantFloatvEXT = (glGetInvariantFloatvEXTPROC) extgl_GetProcAddress("glGetInvariantFloatvEXT");
+    glGetLocalConstantBooleanvEXT = (glGetLocalConstantBooleanvEXTPROC) extgl_GetProcAddress("glGetLocalConstantBooleanvEXT");
+    glGetLocalConstantIntegervEXT = (glGetLocalConstantIntegervEXTPROC) extgl_GetProcAddress("glGetLocalConstantIntegervEXT");
+    glGetLocalConstantFloatvEXT = (glGetLocalConstantFloatvEXTPROC) extgl_GetProcAddress("glGetLocalConstantFloatvEXT");
+#endif
+}
+
+void extgl_InitARBMatrixPalette()
+{
+#ifdef GL_ARB_matrix_palette
+    if (!extgl_Extensions.ARB_matrix_palette)
+        return;
+    glCurrentPaletteMatrixARB = (glCurrentPaletteMatrixARBPROC) extgl_GetProcAddress("glCurrentPaletteMatrixARB");
+    glMatrixIndexubvARB = (glMatrixIndexubvARBPROC) extgl_GetProcAddress("glMatrixIndexubvARB");
+    glMatrixIndexusvARB = (glMatrixIndexusvARBPROC) extgl_GetProcAddress("glMatrixIndexusvARB");
+    glMatrixIndexuivARB = (glMatrixIndexuivARBPROC) extgl_GetProcAddress("glMatrixIndexuivARB");
+    glMatrixIndexPointerARB = (glMatrixIndexPointerARBPROC) extgl_GetProcAddress("glMatrixIndexPointerARB");
+#endif
+}
+
+void extgl_InitEXTMultiDrawArrays()
+{
+#ifdef GL_EXT_multi_draw_arrays
+    if (!extgl_Extensions.EXT_multi_draw_arrays)
+        return;
+    glMultiDrawArraysEXT = (glMultiDrawArraysEXTPROC) extgl_GetProcAddress("glMultiDrawArraysEXT");
+    glMultiDrawElementsEXT = (glMultiDrawElementsEXTPROC) extgl_GetProcAddress("glMultiDrawElementsEXT");
+#endif
+}
+
+void extgl_InitARBVertexBlend()
+{
+#ifdef GL_ARB_vertex_blend
+    if (!extgl_Extensions.ARB_vertex_blend)
+        return;
+    glWeightbvARB = (glWeightbvARBPROC) extgl_GetProcAddress("glWeightbvARB");
+    glWeightsvARB = (glWeightsvARBPROC) extgl_GetProcAddress("glWeightsvARB");
+    glWeightivARB = (glWeightivARBPROC) extgl_GetProcAddress("glWeightivARB");
+    glWeightfvARB = (glWeightfvARBPROC) extgl_GetProcAddress("glWeightfvARB");
+    glWeightdvARB = (glWeightdvARBPROC) extgl_GetProcAddress("glWeightdvARB");
+    glWeightubvARB = (glWeightubvARBPROC) extgl_GetProcAddress("glWeightubvARB");
+    glWeightusvARB = (glWeightusvARBPROC) extgl_GetProcAddress("glWeightusvARB");
+    glWeightuivARB = (glWeightuivARBPROC) extgl_GetProcAddress("glWeightuivARB");
+    glWeightPointerARB = (glWeightPointerARBPROC) extgl_GetProcAddress("glWeightPointerARB");
+    glVertexBlendARB = (glVertexBlendARBPROC) extgl_GetProcAddress("glVertexBlendARB");
+#endif
+}
+
+void extgl_InitARBPointParameters()
+{
+#ifdef GL_ARB_point_parameters
+    if (!extgl_Extensions.ARB_point_parameters)
+        return;
+    glPointParameterfARB = (glPointParameterfARBPROC) extgl_GetProcAddress("glPointParameterfARB");
+    glPointParameterfvARB = (glPointParameterfvARBPROC) extgl_GetProcAddress("glPointParameterfvARB");
+#endif
+}
+
+void extgl_InitATIPNTriangles()
+{
+#ifdef GL_ATI_pn_triangles
+    if (!extgl_Extensions.ATI_pn_triangles)
+        return;
+    glPNTrianglesiATI = (glPNTrianglesiATIPROC) extgl_GetProcAddress("glPNTrianglesiATI");
+    glPNTrianglesfATI = (glPNTrianglesfATIPROC) extgl_GetProcAddress("glPNTrianglesfATI");
+#endif
+}
+
+void extgl_InitNVEvaluators()
+{
+#ifdef GL_NV_evaluators
+    if (!extgl_Extensions.NV_evaluators)
+        return;
+    glMapControlPointsNV = (glMapControlPointsNVPROC) extgl_GetProcAddress("glMapControlPointsNV");
+    glMapParameterivNV = (glMapParameterivNVPROC) extgl_GetProcAddress("glMapParameterivNV");
+    glMapParameterfvNV = (glMapParameterfvNVPROC) extgl_GetProcAddress("glMapParameterfvNV");
+    glGetMapControlPointsNV = (glGetMapControlPointsNVPROC) extgl_GetProcAddress("glGetMapControlPointsNV");
+    glGetMapParameterivNV = (glGetMapParameterivNVPROC) extgl_GetProcAddress("glGetMapParameterivNV");
+    glGetMapParameterfvNV = (glGetMapParameterfvNVPROC) extgl_GetProcAddress("glGetMapParameterfvNV");
+    glGetMapAttribParameterivNV = (glGetMapAttribParameterivNVPROC) extgl_GetProcAddress("glGetMapAttribParameterivNV");
+    glGetMapAttribParameterfvNV = (glGetMapAttribParameterfvNVPROC) extgl_GetProcAddress("glGetMapAttribParameterfvNV");
+    glEvalMapsNV = (glEvalMapsNVPROC) extgl_GetProcAddress("glEvalMapsNV");
+#endif
+}
+
+void extgl_InitNVRegisterCombiners2()
+{
+#ifdef GL_NV_register_combiners
+    if (!extgl_Extensions.NV_register_combiners2)
+        return;
+    glCombinerStageParameterfvNV = (glCombinerStageParameterfvNVPROC) extgl_GetProcAddress("glCombinerStageParameterfvNV");
+    glGetCombinerStageParameterfvNV = (glGetCombinerStageParameterfvNVPROC) extgl_GetProcAddress("glGetCombinerStageParameterfvNV");
+#endif
+}
+
+void extgl_InitNVFence()
+{
+#ifdef GL_NV_fence
+    if (!extgl_Extensions.NV_fence)
+        return;
+    glGenFencesNV = (glGenFencesNVPROC) extgl_GetProcAddress("glGenFencesNV");
+    glDeleteFencesNV = (glDeleteFencesNVPROC) extgl_GetProcAddress("glDeleteFencesNV");
+    glSetFenceNV = (glSetFenceNVPROC) extgl_GetProcAddress("glSetFenceNV");
+    glTestFenceNV = (glTestFenceNVPROC) extgl_GetProcAddress("glTestFenceNV");
+    glFinishFenceNV = (glFinishFenceNVPROC) extgl_GetProcAddress("glFinishFenceNV");
+    glIsFenceNV = (glIsFenceNVPROC) extgl_GetProcAddress("glIsFenceNV");
+    glGetFenceivNV = (glGetFenceivNVPROC) extgl_GetProcAddress("glGetFenceivNV");
+#endif
+}
+
+void extgl_InitNVVertexProgram()
+{
+#ifdef GL_NV_vertex_program
+    if (!extgl_Extensions.NV_vertex_program)
+        return;
+    glBindProgramNV = (glBindProgramNVPROC) extgl_GetProcAddress("glBindProgramNV");
+    glDeleteProgramsNV = (glDeleteProgramsNVPROC) extgl_GetProcAddress("glDeleteProgramsNV");
+    glExecuteProgramNV = (glExecuteProgramNVPROC) extgl_GetProcAddress("glExecuteProgramNV");
+    glGenProgramsNV = (glGenProgramsNVPROC) extgl_GetProcAddress("glGenProgramsNV");
+    glAreProgramsResidentNV = (glAreProgramsResidentNVPROC) extgl_GetProcAddress("glAreProgramsResidentNV");
+    glRequestResidentProgramsNV = (glRequestResidentProgramsNVPROC) extgl_GetProcAddress("glRequestResidentProgramsNV");
+    glGetProgramParameterfvNV = (glGetProgramParameterfvNVPROC) extgl_GetProcAddress("glGetProgramParameterfvNV");
+    glGetProgramParameterdvNV = (glGetProgramParameterdvNVPROC) extgl_GetProcAddress("glGetProgramParameterdvNV");
+    glGetProgramivNV = (glGetProgramivNVPROC) extgl_GetProcAddress("glGetProgramivNV");
+    glGetProgramStringNV = (glGetProgramStringNVPROC) extgl_GetProcAddress("glGetProgramStringNV");
+    glGetTrackMatrixivNV = (glGetTrackMatrixivNVPROC) extgl_GetProcAddress("glGetTrackMatrixivNV");
+    glGetVertexAttribdvNV = (glGetVertexAttribdvNVPROC) extgl_GetProcAddress("glGetVertexAttribdvNV");
+    glGetVertexAttribfvNV = (glGetVertexAttribfvNVPROC) extgl_GetProcAddress("glGetVertexAttribfvNV");
+    glGetVertexAttribivNV = (glGetVertexAttribivNVPROC) extgl_GetProcAddress("glGetVertexAttribivNV");
+    glGetVertexAttribPointervNV = (glGetVertexAttribPointervNVPROC) extgl_GetProcAddress("glGetVertexAttribPointervNV");
+    glIsProgramNV = (glIsProgramNVPROC) extgl_GetProcAddress("glIsProgramNV");
+    glLoadProgramNV = (glLoadProgramNVPROC) extgl_GetProcAddress("glLoadProgramNV");
+    glProgramParameter4fNV = (glProgramParameter4fNVPROC) extgl_GetProcAddress("glProgramParameter4fNV");
+    glProgramParameter4dNV = (glProgramParameter4dNVPROC) extgl_GetProcAddress("glProgramParameter4dNV");
+    glProgramParameter4dvNV = (glProgramParameter4dvNVPROC) extgl_GetProcAddress("glProgramParameter4dvNV");
+    glProgramParameter4fvNV = (glProgramParameter4fvNVPROC) extgl_GetProcAddress("glProgramParameter4fvNV");
+    glProgramParameters4dvNV = (glProgramParameters4dvNVPROC) extgl_GetProcAddress("glProgramParameters4dvNV");
+    glProgramParameters4fvNV = (glProgramParameters4fvNVPROC) extgl_GetProcAddress("glProgramParameters4fvNV");
+    glTrackMatrixNV = (glTrackMatrixNVPROC) extgl_GetProcAddress("glTrackMatrixNV");
+    glVertexAttribPointerNV = (glVertexAttribPointerNVPROC) extgl_GetProcAddress("glVertexAttribPointerNV");
+    glVertexAttrib1sNV = (glVertexAttrib1sNVPROC) extgl_GetProcAddress("glVertexAttrib1sNV");
+    glVertexAttrib1fNV = (glVertexAttrib1fNVPROC) extgl_GetProcAddress("glVertexAttrib1fNV");
+    glVertexAttrib1dNV = (glVertexAttrib1dNVPROC) extgl_GetProcAddress("glVertexAttrib1dNV");
+    glVertexAttrib2sNV = (glVertexAttrib2sNVPROC) extgl_GetProcAddress("glVertexAttrib2sNV");
+    glVertexAttrib2fNV = (glVertexAttrib2fNVPROC) extgl_GetProcAddress("glVertexAttrib2fNV");
+    glVertexAttrib2dNV = (glVertexAttrib2dNVPROC) extgl_GetProcAddress("glVertexAttrib2dNV");
+    glVertexAttrib3sNV = (glVertexAttrib3sNVPROC) extgl_GetProcAddress("glVertexAttrib3sNV");
+    glVertexAttrib3fNV = (glVertexAttrib3fNVPROC) extgl_GetProcAddress("glVertexAttrib3fNV");
+    glVertexAttrib3dNV = (glVertexAttrib3dNVPROC) extgl_GetProcAddress("glVertexAttrib3dNV");
+    glVertexAttrib4sNV = (glVertexAttrib4sNVPROC) extgl_GetProcAddress("glVertexAttrib4sNV");
+    glVertexAttrib4fNV = (glVertexAttrib4fNVPROC) extgl_GetProcAddress("glVertexAttrib4fNV");
+    glVertexAttrib4dNV = (glVertexAttrib4dNVPROC) extgl_GetProcAddress("glVertexAttrib4dNV");
+    glVertexAttrib4ubNV = (glVertexAttrib4ubNVPROC) extgl_GetProcAddress("glVertexAttrib4ubNV");
+    glVertexAttrib1svNV = (glVertexAttrib1svNVPROC) extgl_GetProcAddress("glVertexAttrib1svNV");
+    glVertexAttrib1fvNV = (glVertexAttrib1fvNVPROC) extgl_GetProcAddress("glVertexAttrib1fvNV");
+    glVertexAttrib1dvNV = (glVertexAttrib1dvNVPROC) extgl_GetProcAddress("glVertexAttrib1dvNV");
+    glVertexAttrib2svNV = (glVertexAttrib2svNVPROC) extgl_GetProcAddress("glVertexAttrib2svNV");
+    glVertexAttrib2fvNV = (glVertexAttrib2fvNVPROC) extgl_GetProcAddress("glVertexAttrib2fvNV");
+    glVertexAttrib2dvNV = (glVertexAttrib2dvNVPROC) extgl_GetProcAddress("glVertexAttrib2dvNV");
+    glVertexAttrib3svNV = (glVertexAttrib3svNVPROC) extgl_GetProcAddress("glVertexAttrib3svNV");
+    glVertexAttrib3fvNV = (glVertexAttrib3fvNVPROC) extgl_GetProcAddress("glVertexAttrib3fvNV");
+    glVertexAttrib3dvNV = (glVertexAttrib3dvNVPROC) extgl_GetProcAddress("glVertexAttrib3dvNV");
+    glVertexAttrib4svNV = (glVertexAttrib4svNVPROC) extgl_GetProcAddress("glVertexAttrib4svNV");
+    glVertexAttrib4fvNV = (glVertexAttrib4fvNVPROC) extgl_GetProcAddress("glVertexAttrib4fvNV");
+    glVertexAttrib4dvNV = (glVertexAttrib4dvNVPROC) extgl_GetProcAddress("glVertexAttrib4dvNV");
+    glVertexAttrib4ubvNV = (glVertexAttrib4ubvNVPROC) extgl_GetProcAddress("glVertexAttrib4ubvNV");
+    glVertexAttribs1svNV = (glVertexAttribs1svNVPROC) extgl_GetProcAddress("glVertexAttribs1svNV");
+    glVertexAttribs1fvNV = (glVertexAttribs1fvNVPROC) extgl_GetProcAddress("glVertexAttribs1fvNV");
+    glVertexAttribs1dvNV = (glVertexAttribs1dvNVPROC) extgl_GetProcAddress("glVertexAttribs1dvNV");
+    glVertexAttribs2svNV = (glVertexAttribs2svNVPROC) extgl_GetProcAddress("glVertexAttribs2svNV");
+    glVertexAttribs2fvNV = (glVertexAttribs2fvNVPROC) extgl_GetProcAddress("glVertexAttribs2fvNV");
+    glVertexAttribs2dvNV = (glVertexAttribs2dvNVPROC) extgl_GetProcAddress("glVertexAttribs2dvNV");
+    glVertexAttribs3svNV = (glVertexAttribs3svNVPROC) extgl_GetProcAddress("glVertexAttribs3svNV");
+    glVertexAttribs3fvNV = (glVertexAttribs3fvNVPROC) extgl_GetProcAddress("glVertexAttribs3fvNV");
+    glVertexAttribs3dvNV = (glVertexAttribs3dvNVPROC) extgl_GetProcAddress("glVertexAttribs3dvNV");
+    glVertexAttribs4svNV = (glVertexAttribs4svNVPROC) extgl_GetProcAddress("glVertexAttribs4svNV");
+    glVertexAttribs4fvNV = (glVertexAttribs4fvNVPROC) extgl_GetProcAddress("glVertexAttribs4fvNV");
+    glVertexAttribs4dvNV = (glVertexAttribs4dvNVPROC) extgl_GetProcAddress("glVertexAttribs4dvNV");
+    glVertexAttribs4ubvNV = (glVertexAttribs4ubvNVPROC) extgl_GetProcAddress("glVertexAttribs4ubvNV");
+#endif
+}
+
+void extgl_InitEXTVertexWeighting()
+{
+#ifdef GL_EXT_vertex_weighting
+    if (!extgl_Extensions.EXT_vertex_weighting)
+        return;
+    glVertexWeightfEXT = (glVertexWeightfEXTPROC) extgl_GetProcAddress("glVertexWeightfEXT");
+    glVertexWeightfvEXT = (glVertexWeightfvEXTPROC) extgl_GetProcAddress("glVertexWeightfvEXT");
+    glVertexWeightPointerEXT = (glVertexWeightPointerEXTPROC) extgl_GetProcAddress("glVertexWeightPointerEXT");
+#endif
+}
+
+void extgl_InitARBMultisample()
+{
+#ifdef GL_ARB_multisample
+    if (!extgl_Extensions.ARB_multisample)
+        return;
+    glSampleCoverageARB = (glSampleCoverageARBPROC) extgl_GetProcAddress("glSampleCoverageARB");
+#endif
+}
+
+void extgl_InitNVRegisterCombiners()
+{
+#ifdef GL_NV_register_combiners
+    if (!extgl_Extensions.NV_register_combiners)
+        return;
+    glCombinerParameterfvNV = (glCombinerParameterfvNVPROC) extgl_GetProcAddress("glCombinerParameterfvNV");
+    glCombinerParameterfNV = (glCombinerParameterfNVPROC) extgl_GetProcAddress("glCombinerParameterfNV");
+    glCombinerParameterivNV = (glCombinerParameterivNVPROC) extgl_GetProcAddress("glCombinerParameterivNV");
+    glCombinerParameteriNV = (glCombinerParameteriNVPROC) extgl_GetProcAddress("glCombinerParameteriNV");
+    glCombinerInputNV = (glCombinerInputNVPROC) extgl_GetProcAddress("glCombinerInputNV");
+    glCombinerOutputNV = (glCombinerOutputNVPROC) extgl_GetProcAddress("glCombinerOutputNV");
+    glFinalCombinerInputNV = (glFinalCombinerInputNVPROC) extgl_GetProcAddress("glFinalCombinerInputNV");
+    glGetCombinerInputParameterfvNV = (glGetCombinerInputParameterfvNVPROC) extgl_GetProcAddress("glGetCombinerInputParameterfvNV");
+    glGetCombinerInputParameterivNV = (glGetCombinerInputParameterivNVPROC) extgl_GetProcAddress("glGetCombinerInputParameterivNV");
+    glGetCombinerOutputParameterfvNV = (glGetCombinerOutputParameterfvNVPROC) extgl_GetProcAddress("glGetCombinerOutputParameterfvNV");
+    glGetCombinerOutputParameterivNV = (glGetCombinerOutputParameterivNVPROC) extgl_GetProcAddress("glGetCombinerOutputParameterivNV");
+    glGetFinalCombinerInputParameterfvNV = (glGetFinalCombinerInputParameterfvNVPROC) extgl_GetProcAddress("glGetFinalCombinerInputParameterfvNV");
+    glGetFinalCombinerInputParameterivNV = (glGetFinalCombinerInputParameterivNVPROC) extgl_GetProcAddress("glGetFinalCombinerInputParameterivNV");
+#endif
+}
+
+void extgl_InitEXTPointParameters()
+{
+#ifdef GL_EXT_point_parameters
+    if (!extgl_Extensions.EXT_point_parameters)
+        return;
+    glPointParameterfEXT = (glPointParameterfEXTPROC) extgl_GetProcAddress("glPointParameterfEXT");
+    glPointParameterfvEXT = (glPointParameterfvEXTPROC) extgl_GetProcAddress("glPointParameterfvEXT");
+#endif
+}
+
+void extgl_InitNVVertexArrayRange()
+{
+#ifdef GL_NV_vertex_array_range
+    if (!extgl_Extensions.NV_vertex_array_range)
+        return;
+    glFlushVertexArrayRangeNV = (glFlushVertexArrayRangeNVPROC) extgl_GetProcAddress("glFlushVertexArrayRangeNV");
+    glVertexArrayRangeNV = (glVertexArrayRangeNVPROC) extgl_GetProcAddress("glVertexArrayRangeNV");
+#ifdef _WIN32
+    wglAllocateMemoryNV = (wglAllocateMemoryNVPROC) extgl_GetProcAddress("wglAllocateMemoryNV");
+    wglFreeMemoryNV = (wglFreeMemoryNVPROC) extgl_GetProcAddress("wglFreeMemoryNV");
+#else
+    glXAllocateMemoryNV = (glXAllocateMemoryNVPROC) extgl_GetProcAddress("glXAllocateMemoryNV");
+    glXFreeMemoryNV = (glXFreeMemoryNVPROC) extgl_GetProcAddress("glXFreeMemoryNV");
+#endif /* WIN32 */
+#endif
+}
+ 
+void extgl_InitEXTFogCoord()
+{
+#ifdef GL_EXT_fog_coord
+    if (!extgl_Extensions.EXT_fog_coord)
+        return;
+    glFogCoordfEXT = (glFogCoordfEXTPROC) extgl_GetProcAddress("glFogCoordfEXT");
+    glFogCoordfvEXT = (glFogCoordfvEXTPROC) extgl_GetProcAddress("glFogCoordfvEXT");
+    glFogCoorddEXT = (glFogCoorddEXTPROC) extgl_GetProcAddress("glFogCoorddEXT");
+    glFogCoorddvEXT = (glFogCoorddvEXTPROC) extgl_GetProcAddress("glFogCoorddvEXT");
+    glFogCoordPointerEXT = (glFogCoordPointerEXTPROC) extgl_GetProcAddress("glFogCoordPointerEXT");
+#endif
+}
+
+void extgl_InitEXTSecondaryColor()
+{
+#ifdef GL_EXT_secondary_color
+    if (!extgl_Extensions.EXT_secondary_color)
+        return;
+    glSecondaryColor3bEXT = (glSecondaryColor3bEXTPROC) extgl_GetProcAddress("glSecondaryColor3bEXT");
+    glSecondaryColor3bvEXT = (glSecondaryColor3bvEXTPROC) extgl_GetProcAddress("glSecondaryColor3bvEXT");
+    glSecondaryColor3dEXT = (glSecondaryColor3dEXTPROC) extgl_GetProcAddress("glSecondaryColor3dEXT");
+    glSecondaryColor3dvEXT = (glSecondaryColor3dvEXTPROC) extgl_GetProcAddress("glSecondaryColor3dvEXT");
+    glSecondaryColor3fEXT = (glSecondaryColor3fEXTPROC) extgl_GetProcAddress("glSecondaryColor3fEXT");
+    glSecondaryColor3fvEXT = (glSecondaryColor3fvEXTPROC) extgl_GetProcAddress("glSecondaryColor3fvEXT");
+    glSecondaryColor3iEXT = (glSecondaryColor3iEXTPROC) extgl_GetProcAddress("glSecondaryColor3iEXT");
+    glSecondaryColor3ivEXT = (glSecondaryColor3ivEXTPROC) extgl_GetProcAddress("glSecondaryColor3ivEXT");
+    glSecondaryColor3sEXT = (glSecondaryColor3sEXTPROC) extgl_GetProcAddress("glSecondaryColor3sEXT");
+    glSecondaryColor3svEXT = (glSecondaryColor3svEXTPROC) extgl_GetProcAddress("glSecondaryColor3svEXT");
+    glSecondaryColor3ubEXT = (glSecondaryColor3ubEXTPROC) extgl_GetProcAddress("glSecondaryColor3ubEXT");
+    glSecondaryColor3ubvEXT = (glSecondaryColor3ubvEXTPROC) extgl_GetProcAddress("glSecondaryColor3ubvEXT");
+    glSecondaryColor3uiEXT = (glSecondaryColor3uiEXTPROC) extgl_GetProcAddress("glSecondaryColor3uiEXT");
+    glSecondaryColor3uivEXT = (glSecondaryColor3uivEXTPROC) extgl_GetProcAddress("glSecondaryColor3uivEXT");
+    glSecondaryColor3usEXT = (glSecondaryColor3usEXTPROC) extgl_GetProcAddress("glSecondaryColor3usEXT");
+    glSecondaryColor3usvEXT = (glSecondaryColor3usvEXTPROC) extgl_GetProcAddress("glSecondaryColor3usvEXT");
+    glSecondaryColorPointerEXT = (glSecondaryColorPointerEXTPROC) extgl_GetProcAddress("glSecondaryColorPointerEXT");
+#endif
+}
+
+void extgl_InitEXTCompiledVertexArray()
+{
+#ifdef GL_EXT_compiled_vertex_array
+    if (!extgl_Extensions.EXT_compiled_vertex_array)
+        return;
+    glLockArraysEXT = (glLockArraysEXTPROC) extgl_GetProcAddress("glLockArraysEXT");
+    glUnlockArraysEXT = (glUnlockArraysEXTPROC) extgl_GetProcAddress("glUnlockArraysEXT");
+#endif
+}
+
+void extgl_InitARBTransposeMatrix()
+{
+#ifdef GL_ARB_transpose_matrix
+    if (!extgl_Extensions.ARB_transpose_matrix)
+        return;
+    glLoadTransposeMatrixfARB = (glLoadTransposeMatrixfARBPROC) extgl_GetProcAddress("glLoadTransposeMatrixfARB");
+    glLoadTransposeMatrixdARB = (glLoadTransposeMatrixdARBPROC) extgl_GetProcAddress("glLoadTransposeMatrixdARB");
+    glMultTransposeMatrixfARB = (glMultTransposeMatrixfARBPROC) extgl_GetProcAddress("glMultTransposeMatrixfARB");
+    glMultTransposeMatrixdARB = (glMultTransposeMatrixdARBPROC) extgl_GetProcAddress("glMultTransposeMatrixdARB");
+#endif
+}
+
+void extgl_InitEXTDrawRangeElements()
+{
+#ifdef GL_EXT_draw_range_elements
+    if (!extgl_Extensions.EXT_draw_range_elements)
+        return;
+    glDrawRangeElementsEXT = (glDrawRangeElementsEXTPROC) extgl_GetProcAddress("glDrawRangeElementsEXT");
+#endif
+}
+
+void extgl_InitARBMultitexture()
+{
+#ifdef _WIN32
+#ifdef GL_ARB_multitexture
+    if (!extgl_Extensions.ARB_multitexture)
+        return;
+    glActiveTextureARB = (glActiveTextureARBPROC) extgl_GetProcAddress("glActiveTextureARB");
+    glClientActiveTextureARB = (glClientActiveTextureARBPROC) extgl_GetProcAddress("glClientActiveTextureARB");
+
+    glMultiTexCoord1dARB = (glMultiTexCoord1dARBPROC) extgl_GetProcAddress("glMultiTexCoord1dARB");
+    glMultiTexCoord1dvARB = (glMultiTexCoord1dvARBPROC) extgl_GetProcAddress("glMultiTexCoord1dvARB");
+    glMultiTexCoord1fARB = (glMultiTexCoord1fARBPROC) extgl_GetProcAddress("glMultiTexCoord1fARB");
+    glMultiTexCoord1fvARB = (glMultiTexCoord1fvARBPROC) extgl_GetProcAddress("glMultiTexCoord1fvARB");
+    glMultiTexCoord1iARB = (glMultiTexCoord1iARBPROC) extgl_GetProcAddress("glMultiTexCoord1iARB");
+    glMultiTexCoord1ivARB = (glMultiTexCoord1ivARBPROC) extgl_GetProcAddress("glMultiTexCoord1ivARB");
+    glMultiTexCoord1sARB = (glMultiTexCoord1sARBPROC) extgl_GetProcAddress("glMultiTexCoord1sARB");
+    glMultiTexCoord1svARB = (glMultiTexCoord1svARBPROC) extgl_GetProcAddress("glMultiTexCoord1svARB");
+
+    glMultiTexCoord2dARB = (glMultiTexCoord2dARBPROC) extgl_GetProcAddress("glMultiTexCoord2dARB");
+    glMultiTexCoord2dvARB = (glMultiTexCoord2dvARBPROC) extgl_GetProcAddress("glMultiTexCoord2dvARB");
+    glMultiTexCoord2fARB = (glMultiTexCoord2fARBPROC) extgl_GetProcAddress("glMultiTexCoord2fARB");
+    glMultiTexCoord2fvARB = (glMultiTexCoord2fvARBPROC) extgl_GetProcAddress("glMultiTexCoord2fvARB");
+    glMultiTexCoord2iARB = (glMultiTexCoord2iARBPROC) extgl_GetProcAddress("glMultiTexCoord2iARB");
+    glMultiTexCoord2ivARB = (glMultiTexCoord2ivARBPROC) extgl_GetProcAddress("glMultiTexCoord2ivARB");
+    glMultiTexCoord2sARB = (glMultiTexCoord2sARBPROC) extgl_GetProcAddress("glMultiTexCoord2sARB");
+    glMultiTexCoord2svARB = (glMultiTexCoord2svARBPROC) extgl_GetProcAddress("glMultiTexCoord2svARB");
+
+    glMultiTexCoord3dARB = (glMultiTexCoord3dARBPROC) extgl_GetProcAddress("glMultiTexCoord3dARB");
+    glMultiTexCoord3dvARB = (glMultiTexCoord3dvARBPROC) extgl_GetProcAddress("glMultiTexCoord3dvARB");
+    glMultiTexCoord3fARB = (glMultiTexCoord3fARBPROC) extgl_GetProcAddress("glMultiTexCoord3fARB");
+    glMultiTexCoord3fvARB = (glMultiTexCoord3fvARBPROC) extgl_GetProcAddress("glMultiTexCoord3fvARB");
+    glMultiTexCoord3iARB = (glMultiTexCoord3iARBPROC) extgl_GetProcAddress("glMultiTexCoord3iARB");
+    glMultiTexCoord3ivARB = (glMultiTexCoord3ivARBPROC) extgl_GetProcAddress("glMultiTexCoord3ivARB");
+    glMultiTexCoord3sARB = (glMultiTexCoord3sARBPROC) extgl_GetProcAddress("glMultiTexCoord3sARB");
+    glMultiTexCoord3svARB = (glMultiTexCoord3svARBPROC) extgl_GetProcAddress("glMultiTexCoord3svARB");
+
+    glMultiTexCoord4dARB = (glMultiTexCoord4dARBPROC) extgl_GetProcAddress("glMultiTexCoord4dARB");
+    glMultiTexCoord4dvARB = (glMultiTexCoord4dvARBPROC) extgl_GetProcAddress("glMultiTexCoord4dvARB");
+    glMultiTexCoord4fARB = (glMultiTexCoord4fARBPROC) extgl_GetProcAddress("glMultiTexCoord4fARB");
+    glMultiTexCoord4fvARB = (glMultiTexCoord4fvARBPROC) extgl_GetProcAddress("glMultiTexCoord4fvARB");
+    glMultiTexCoord4iARB = (glMultiTexCoord4iARBPROC) extgl_GetProcAddress("glMultiTexCoord4iARB");
+    glMultiTexCoord4ivARB = (glMultiTexCoord4ivARBPROC) extgl_GetProcAddress("glMultiTexCoord4ivARB");
+    glMultiTexCoord4sARB = (glMultiTexCoord4sARBPROC) extgl_GetProcAddress("glMultiTexCoord4sARB");
+    glMultiTexCoord4svARB = (glMultiTexCoord4svARBPROC) extgl_GetProcAddress("glMultiTexCoord4svARB");
+#endif /* GL_ARB_multitexture */
+#endif /* WIN32 */
+}
+
+void extgl_InitOpenGL1_2()
+{
+#ifdef _WIN32
+#ifdef GL_VERSION_1_2
+    if (!extgl_Extensions.OpenGL12)
+        return;
+    glTexImage3D = (glTexImage3DPROC) extgl_GetProcAddress("glTexImage3D");
+    glTexSubImage3D = (glTexSubImage3DPROC) extgl_GetProcAddress("glTexSubImage3D");
+    glCopyTexSubImage3D = (glCopyTexSubImage3DPROC) extgl_GetProcAddress("glCopyTexSubImage3D");
+    glDrawRangeElements = (glDrawRangeElementsPROC) extgl_GetProcAddress("glDrawRangeElements");
+#endif /* GL_VERSION_1_2 */
+#endif /* WIN32 */
+}
+
+void extgl_InitARBImaging()
+{
+#ifdef _WIN32
+#ifdef GL_ARB_imaging
+    if (!extgl_Extensions.ARB_imaging)
+        return;
+    glBlendColor = (glBlendColorPROC) extgl_GetProcAddress("glBlendColor");
+    glBlendEquation = (glBlendEquationPROC) extgl_GetProcAddress("glBlendEquation");
+    glColorTable = (glColorTablePROC) extgl_GetProcAddress("glColorTable");
+    glColorTableParameterfv = (glColorTableParameterfvPROC) extgl_GetProcAddress("glColorTableParameterfv");
+    glColorTableParameteriv = (glColorTableParameterivPROC) extgl_GetProcAddress("glColorTableParameteriv");
+    glCopyColorTable = (glCopyColorTablePROC) extgl_GetProcAddress("glCopyColorTable");
+    glGetColorTable = (glGetColorTablePROC) extgl_GetProcAddress("glGetColorTable");
+    glGetColorTableParameterfv = (glGetColorTableParameterfvPROC) extgl_GetProcAddress("glGetColorTableParameterfv");
+    glGetColorTableParameteriv = (glGetColorTableParameterivPROC) extgl_GetProcAddress("glGetColorTableParameteriv");
+    glColorSubTable = (glColorSubTablePROC) extgl_GetProcAddress("glColorSubTable");
+    glCopyColorSubTable = (glCopyColorSubTablePROC) extgl_GetProcAddress("glCopyColorSubTable");
+    glConvolutionFilter1D = (glConvolutionFilter1DPROC) extgl_GetProcAddress("glConvolutionFilter1D");
+    glConvolutionFilter2D = (glConvolutionFilter2DPROC) extgl_GetProcAddress("glConvolutionFilter2D");
+    glConvolutionParameterf = (glConvolutionParameterfPROC) extgl_GetProcAddress("glConvolutionParameterf");
+    glConvolutionParameterfv = (glConvolutionParameterfvPROC) extgl_GetProcAddress("glConvolutionParameterfv");
+    glConvolutionParameteri = (glConvolutionParameteriPROC) extgl_GetProcAddress("glConvolutionParameteri");
+    glConvolutionParameteriv = (glConvolutionParameterivPROC) extgl_GetProcAddress("glConvolutionParameteriv");
+    glCopyConvolutionFilter1D = (glCopyConvolutionFilter1DPROC) extgl_GetProcAddress("glCopyConvolutionFilter1D");
+    glCopyConvolutionFilter2D = (glCopyConvolutionFilter2DPROC) extgl_GetProcAddress("glCopyConvolutionFilter2D");
+    glGetConvolutionFilter = (glGetConvolutionFilterPROC) extgl_GetProcAddress("glGetConvolutionFilter");
+    glGetConvolutionParameterfv = (glGetConvolutionParameterfvPROC) extgl_GetProcAddress("glGetConvolutionParameterfv");
+    glGetConvolutionParameteriv = (glGetConvolutionParameterivPROC) extgl_GetProcAddress("glGetConvolutionParameteriv");
+    glGetSeparableFilter = (glGetSeparableFilterPROC) extgl_GetProcAddress("glGetSeparableFilter");
+    glSeparableFilter2D = (glSeparableFilter2DPROC) extgl_GetProcAddress("glSeparableFilter2D");
+    glGetHistogram = (glGetHistogramPROC) extgl_GetProcAddress("glGetHistogram");
+    glGetHistogramParameterfv = (glGetHistogramParameterfvPROC) extgl_GetProcAddress("glGetHistogramParameterfv");
+    glGetHistogramParameteriv = (glGetHistogramParameterivPROC) extgl_GetProcAddress("glGetHistogramParameteriv");
+    glGetMinmax = (glGetMinmaxPROC) extgl_GetProcAddress("glGetMinmax");
+    glGetMinmaxParameterfv = (glGetMinmaxParameterfvPROC) extgl_GetProcAddress("glGetMinmaxParameterfv");
+    glGetMinmaxParameteriv = (glGetMinmaxParameterivPROC) extgl_GetProcAddress("glGetMinmaxParameteriv");
+    glHistogram = (glHistogramPROC) extgl_GetProcAddress("glHistogram");
+    glMinmax = (glMinmaxPROC) extgl_GetProcAddress("glMinmax");
+    glResetHistogram = (glResetHistogramPROC) extgl_GetProcAddress("glResetHistogram");
+    glResetMinmax = (glResetMinmaxPROC) extgl_GetProcAddress("glResetMinmax");
+#endif /* GL_ARB_imaging */
+#endif /* WIN32 */
+}
+
+void extgl_InitOpenGL1_3()
+{
+#ifdef _WIN32
+#ifdef GL_VERSION_1_3
+    if (!extgl_Extensions.OpenGL13)
+        return;
+    glActiveTexture = (glActiveTexturePROC) extgl_GetProcAddress("glActiveTexture");
+    glClientActiveTexture = (glClientActiveTexturePROC) extgl_GetProcAddress("glClientActiveTexture");
+
+    glMultiTexCoord1d = (glMultiTexCoord1dPROC) extgl_GetProcAddress("glMultiTexCoord1d");
+    glMultiTexCoord1dv = (glMultiTexCoord1dvPROC) extgl_GetProcAddress("glMultiTexCoord1dv");
+    glMultiTexCoord1f = (glMultiTexCoord1fPROC) extgl_GetProcAddress("glMultiTexCoord1f");
+    glMultiTexCoord1fv = (glMultiTexCoord1fvPROC) extgl_GetProcAddress("glMultiTexCoord1fv");
+    glMultiTexCoord1i = (glMultiTexCoord1iPROC) extgl_GetProcAddress("glMultiTexCoord1i");
+    glMultiTexCoord1iv = (glMultiTexCoord1ivPROC) extgl_GetProcAddress("glMultiTexCoord1iv");
+    glMultiTexCoord1s = (glMultiTexCoord1sPROC) extgl_GetProcAddress("glMultiTexCoord1s");
+    glMultiTexCoord1sv = (glMultiTexCoord1svPROC) extgl_GetProcAddress("glMultiTexCoord1sv");
+
+    glMultiTexCoord2d = (glMultiTexCoord2dPROC) extgl_GetProcAddress("glMultiTexCoord2d");
+    glMultiTexCoord2dv = (glMultiTexCoord2dvPROC) extgl_GetProcAddress("glMultiTexCoord2dv");
+    glMultiTexCoord2f = (glMultiTexCoord2fPROC) extgl_GetProcAddress("glMultiTexCoord2f");
+    glMultiTexCoord2fv = (glMultiTexCoord2fvPROC) extgl_GetProcAddress("glMultiTexCoord2fv");
+    glMultiTexCoord2i = (glMultiTexCoord2iPROC) extgl_GetProcAddress("glMultiTexCoord2i");
+    glMultiTexCoord2iv = (glMultiTexCoord2ivPROC) extgl_GetProcAddress("glMultiTexCoord2iv");
+    glMultiTexCoord2s = (glMultiTexCoord2sPROC) extgl_GetProcAddress("glMultiTexCoord2s");
+    glMultiTexCoord2sv = (glMultiTexCoord2svPROC) extgl_GetProcAddress("glMultiTexCoord2sv");
+
+    glMultiTexCoord3d = (glMultiTexCoord3dPROC) extgl_GetProcAddress("glMultiTexCoord3d");
+    glMultiTexCoord3dv = (glMultiTexCoord3dvPROC) extgl_GetProcAddress("glMultiTexCoord3dv");
+    glMultiTexCoord3f = (glMultiTexCoord3fPROC) extgl_GetProcAddress("glMultiTexCoord3f");
+    glMultiTexCoord3fv = (glMultiTexCoord3fvPROC) extgl_GetProcAddress("glMultiTexCoord3fv");
+    glMultiTexCoord3i = (glMultiTexCoord3iPROC) extgl_GetProcAddress("glMultiTexCoord3i");
+    glMultiTexCoord3iv = (glMultiTexCoord3ivPROC) extgl_GetProcAddress("glMultiTexCoord3iv");
+    glMultiTexCoord3s = (glMultiTexCoord3sPROC) extgl_GetProcAddress("glMultiTexCoord3s");
+    glMultiTexCoord3sv = (glMultiTexCoord3svPROC) extgl_GetProcAddress("glMultiTexCoord3sv");
+
+    glMultiTexCoord4d = (glMultiTexCoord4dPROC) extgl_GetProcAddress("glMultiTexCoord4d");
+    glMultiTexCoord4dv = (glMultiTexCoord4dvPROC) extgl_GetProcAddress("glMultiTexCoord4dv");
+    glMultiTexCoord4f = (glMultiTexCoord4fPROC) extgl_GetProcAddress("glMultiTexCoord4f");
+    glMultiTexCoord4fv = (glMultiTexCoord4fvPROC) extgl_GetProcAddress("glMultiTexCoord4fv");
+    glMultiTexCoord4i = (glMultiTexCoord4iPROC) extgl_GetProcAddress("glMultiTexCoord4i");
+    glMultiTexCoord4iv = (glMultiTexCoord4ivPROC) extgl_GetProcAddress("glMultiTexCoord4iv");
+    glMultiTexCoord4s = (glMultiTexCoord4sPROC) extgl_GetProcAddress("glMultiTexCoord4s");
+    glMultiTexCoord4sv = (glMultiTexCoord4svPROC) extgl_GetProcAddress("glMultiTexCoord4sv");
+
+    glLoadTransposeMatrixf = (glLoadTransposeMatrixfPROC) extgl_GetProcAddress("glLoadTransposeMatrixf");
+    glLoadTransposeMatrixd = (glLoadTransposeMatrixdPROC) extgl_GetProcAddress("glLoadTransposeMatrixd");
+    glMultTransposeMatrixf = (glMultTransposeMatrixfPROC) extgl_GetProcAddress("glMultTransposeMatrixf");
+    glMultTransposeMatrixd = (glMultTransposeMatrixdPROC) extgl_GetProcAddress("glMultTransposeMatrixd");
+    glCompressedTexImage3D = (glCompressedTexImage3DPROC) extgl_GetProcAddress("glCompressedTexImage3D");
+    glCompressedTexImage2D = (glCompressedTexImage2DPROC) extgl_GetProcAddress("glCompressedTexImage2D");
+    glCompressedTexImage1D = (glCompressedTexImage1DPROC) extgl_GetProcAddress("glCompressedTexImage1D");
+    glCompressedTexSubImage3D = (glCompressedTexSubImage3DPROC) extgl_GetProcAddress("glCompressedTexSubImage3D");
+    glCompressedTexSubImage2D = (glCompressedTexSubImage2DPROC) extgl_GetProcAddress("glCompressedTexSubImage2D");
+    glCompressedTexSubImage1D = (glCompressedTexSubImage1DPROC) extgl_GetProcAddress("glCompressedTexSubImage1D");
+    glGetCompressedTexImage = (glGetCompressedTexImagePROC) extgl_GetProcAddress("glGetCompressedTexImage");
+
+    glSampleCoverage = (glSampleCoveragePROC) extgl_GetProcAddress("glSampleCoverage");
+#endif /* GL_VERSION_1_3 */
+#endif /* WIN32 */
+}
+
+void extgl_InitOpenGL1_4()
+{
+#ifdef _WIN32
+#ifdef GL_VERSION_1_4
+    if (!extgl_Extensions.OpenGL14)
+        return;
+    glBlendColor = (glBlendColorPROC) extgl_GetProcAddress("glBlendColor");
+    glBlendEquation = (glBlendEquationPROC) extgl_GetProcAddress("glBlendEquation");
+    glFogCoordf = (glFogCoordfPROC) extgl_GetProcAddress("glFogCoordf");
+    glFogCoordfv = (glFogCoordfvPROC) extgl_GetProcAddress("glFogCoordfv");
+    glFogCoordd = (glFogCoorddPROC) extgl_GetProcAddress("glFogCoordd");
+    glFogCoorddv = (glFogCoorddvPROC) extgl_GetProcAddress("glFogCoorddv");
+    glFogCoordPointer = (glFogCoordPointerPROC) extgl_GetProcAddress("glFogCoordPointer");
+    glMultiDrawArrays = (glMultiDrawArraysPROC) extgl_GetProcAddress("glMultiDrawArrays");
+    glMultiDrawElements = (glMultiDrawElementsPROC) extgl_GetProcAddress("glMultiDrawElements");
+    glPointParameterf = (glPointParameterfPROC) extgl_GetProcAddress("glPointParameterf");
+    glPointParameterfv = (glPointParameterfvPROC) extgl_GetProcAddress("glPointParameterfv");
+    glSecondaryColor3b = (glSecondaryColor3bPROC) extgl_GetProcAddress("glSecondaryColor3b");
+    glSecondaryColor3bv = (glSecondaryColor3bvPROC) extgl_GetProcAddress("glSecondaryColor3bv");
+    glSecondaryColor3d = (glSecondaryColor3dPROC) extgl_GetProcAddress("glSecondaryColor3d");
+    glSecondaryColor3dv = (glSecondaryColor3dvPROC) extgl_GetProcAddress("glSecondaryColor3dv");
+    glSecondaryColor3f = (glSecondaryColor3fPROC) extgl_GetProcAddress("glSecondaryColor3f");
+    glSecondaryColor3fv = (glSecondaryColor3fvPROC) extgl_GetProcAddress("glSecondaryColor3fv");
+    glSecondaryColor3i = (glSecondaryColor3iPROC) extgl_GetProcAddress("glSecondaryColor3i");
+    glSecondaryColor3iv = (glSecondaryColor3ivPROC) extgl_GetProcAddress("glSecondaryColor3iv");
+    glSecondaryColor3s = (glSecondaryColor3sPROC) extgl_GetProcAddress("glSecondaryColor3s");
+    glSecondaryColor3sv = (glSecondaryColor3svPROC) extgl_GetProcAddress("glSecondaryColor3sv");
+    glSecondaryColor3ub = (glSecondaryColor3ubPROC) extgl_GetProcAddress("glSecondaryColor3ub");
+    glSecondaryColor3ubv = (glSecondaryColor3ubvPROC) extgl_GetProcAddress("glSecondaryColor3ubv");
+    glSecondaryColor3ui = (glSecondaryColor3uiPROC) extgl_GetProcAddress("glSecondaryColor3ui");
+    glSecondaryColor3uiv = (glSecondaryColor3uivPROC) extgl_GetProcAddress("glSecondaryColor3uiv");
+    glSecondaryColor3us = (glSecondaryColor3usPROC) extgl_GetProcAddress("glSecondaryColor3us");
+    glSecondaryColor3usv = (glSecondaryColor3usvPROC) extgl_GetProcAddress("glSecondaryColor3usv");
+    glSecondaryColorPointer = (glSecondaryColorPointerPROC) extgl_GetProcAddress("glSecondaryColorPointer");
+    glBlendFuncSeparate = (glBlendFuncSeparatePROC) extgl_GetProcAddress("glBlendFuncSeparate");
+    glWindowPos2d = (glWindowPos2dPROC) extgl_GetProcAddress("glWindowPos2d");
+    glWindowPos2f = (glWindowPos2fPROC) extgl_GetProcAddress("glWindowPos2f");
+    glWindowPos2i = (glWindowPos2iPROC) extgl_GetProcAddress("glWindowPos2i");
+    glWindowPos2s = (glWindowPos2sPROC) extgl_GetProcAddress("glWindowPos2s");
+    glWindowPos2dv = (glWindowPos2dvPROC) extgl_GetProcAddress("glWindowPos2dv");
+    glWindowPos2fv = (glWindowPos2fvPROC) extgl_GetProcAddress("glWindowPos2fv");
+    glWindowPos2iv = (glWindowPos2ivPROC) extgl_GetProcAddress("glWindowPos2iv");
+    glWindowPos2sv = (glWindowPos2svPROC) extgl_GetProcAddress("glWindowPos2sv");
+    glWindowPos3d = (glWindowPos3dPROC) extgl_GetProcAddress("glWindowPos3d");
+    glWindowPos3f = (glWindowPos3fPROC) extgl_GetProcAddress("glWindowPos3f");
+    glWindowPos3i = (glWindowPos3iPROC) extgl_GetProcAddress("glWindowPos3i");
+    glWindowPos3s = (glWindowPos3sPROC) extgl_GetProcAddress("glWindowPos3s");
+    glWindowPos3dv = (glWindowPos3dvPROC) extgl_GetProcAddress("glWindowPos3dv");
+    glWindowPos3fv = (glWindowPos3fvPROC) extgl_GetProcAddress("glWindowPos3fv");
+    glWindowPos3iv = (glWindowPos3ivPROC) extgl_GetProcAddress("glWindowPos3iv");
+    glWindowPos3sv = (glWindowPos3svPROC) extgl_GetProcAddress("glWindowPos3sv");
+#endif /* GL_VERSION_1_4 */
+#endif /* WIN32 */
+}
+
+void extgl_InitSupportedExtensions()
+{
+    char *s = (char*) glGetString(GL_VERSION);
+    if (!s)
+        return;
+    const char v[2]={s[0],'\0'};
+    int major = atoi(v);
+    if(atoi(v) >= 2){
+      extgl_Extensions.OpenGL12 = 1;
+      extgl_Extensions.OpenGL13 = 1;
+      extgl_Extensions.OpenGL14 = 1;
+    }else{
+    s = strstr(s, "1.");
+    }
+    if (s == NULL)
+    {
+        extgl_Extensions.OpenGL12 = 0;    
+        extgl_Extensions.OpenGL13 = 0;    
+        extgl_Extensions.OpenGL14 = 0;
+    }
+    else
+    {
+        extgl_Extensions.OpenGL12 = 0;
+        extgl_Extensions.OpenGL13 = 0;
+        extgl_Extensions.OpenGL14 = 0;
+
+        if( s[2] >= '4' )
+        {
+            extgl_Extensions.OpenGL12 = 1;
+            extgl_Extensions.OpenGL13 = 1;
+            extgl_Extensions.OpenGL14 = 1;
+        }
+        if( s[2] == '3' )
+        {
+            extgl_Extensions.OpenGL12 = 1;
+            extgl_Extensions.OpenGL13 = 1;
+        }
+        if( s[2] == '2' )
+        {
+            extgl_Extensions.OpenGL12 = 1;
+        }
+    }
+    extgl_Extensions.ARB_depth_texture = QueryExtension("GL_ARB_depth_texture");
+    extgl_Extensions.ARB_fragment_program = QueryExtension("GL_ARB_fragment_program");
+    extgl_Extensions.ARB_imaging = QueryExtension("GL_ARB_imaging");
+    extgl_Extensions.ARB_matrix_palette = QueryExtension("GL_ARB_matrix_palette");
+    extgl_Extensions.ARB_multisample = QueryExtension("GL_ARB_multisample");
+    extgl_Extensions.ARB_multitexture = QueryExtension("GL_ARB_multitexture");
+    extgl_Extensions.ARB_point_parameters = QueryExtension("GL_ARB_point_parameters");
+    extgl_Extensions.ARB_shadow = QueryExtension("GL_ARB_shadow");
+    extgl_Extensions.ARB_shadow_ambient = QueryExtension("GL_ARB_shadow_ambient");
+    extgl_Extensions.ARB_texture_border_clamp = QueryExtension("GL_ARB_texture_border_clamp");
+    extgl_Extensions.ARB_texture_compression = QueryExtension("GL_ARB_texture_compression");
+    extgl_Extensions.ARB_texture_cube_map = QueryExtension("GL_ARB_texture_cube_map");
+    extgl_Extensions.ARB_texture_env_add = QueryExtension("GL_ARB_texture_env_add");
+    extgl_Extensions.ARB_texture_env_combine = QueryExtension("GL_ARB_texture_env_combine");
+    extgl_Extensions.ARB_texture_env_crossbar = QueryExtension("GL_ARB_texture_env_crossbar");
+    extgl_Extensions.ARB_texture_env_dot3 = QueryExtension("GL_ARB_texture_env_dot3");
+    extgl_Extensions.ARB_texture_mirrored_repeat = QueryExtension("GL_ARB_texture_mirrored_repeat");
+    extgl_Extensions.ARB_transpose_matrix = QueryExtension("GL_ARB_transpose_matrix");
+    extgl_Extensions.ARB_vertex_blend = QueryExtension("GL_ARB_vertex_blend");
+    extgl_Extensions.ARB_vertex_program = QueryExtension("GL_ARB_vertex_program");
+    extgl_Extensions.ARB_window_pos = QueryExtension("GL_ARB_window_pos");
+    extgl_Extensions.EXT_abgr = QueryExtension("GL_EXT_abgr");
+    extgl_Extensions.EXT_bgra = QueryExtension("GL_EXT_bgra");
+    extgl_Extensions.EXT_blend_func_separate = QueryExtension("GL_EXT_blend_function_separate");
+    extgl_Extensions.EXT_compiled_vertex_array = QueryExtension("GL_EXT_compiled_vertex_array");
+    extgl_Extensions.EXT_cull_vertex = QueryExtension("GL_EXT_cull_vertex");
+    extgl_Extensions.EXT_draw_range_elements = QueryExtension("GL_EXT_draw_range_elements");
+    extgl_Extensions.EXT_fog_coord = QueryExtension("GL_EXT_fog_coord");
+    extgl_Extensions.EXT_multi_draw_arrays = QueryExtension("GL_EXT_multi_draw_arrays");
+    extgl_Extensions.EXT_point_parameters = QueryExtension("GL_EXT_point_parameters");
+    extgl_Extensions.EXT_secondary_color = QueryExtension("GL_EXT_secondary_color");
+    extgl_Extensions.EXT_separate_specular_color = QueryExtension("GL_EXT_separate_specular_color");
+    extgl_Extensions.EXT_shadow_funcs = QueryExtension("GL_EXT_shadow_funcs");
+    extgl_Extensions.EXT_stencil_two_side = QueryExtension("GL_EXT_stencil_two_side");
+    extgl_Extensions.EXT_stencil_wrap = QueryExtension("GL_EXT_stencil_wrap");
+    extgl_Extensions.EXT_texture_compression_s3tc = QueryExtension("GL_EXT_texture_compression_s3tc");
+    extgl_Extensions.EXT_texture_env_combine = QueryExtension("GL_EXT_texture_env_combine");
+    extgl_Extensions.EXT_texture_filter_anisotropic = QueryExtension("GL_EXT_texture_filter_anisotropic");
+    extgl_Extensions.EXT_texture_lod_bias = QueryExtension("GL_EXT_texture_lod_bias");
+    extgl_Extensions.EXT_texture_rectangle = QueryExtension("GL_EXT_texture_rectangle"); // added -ec
+    extgl_Extensions.EXT_vertex_shader = QueryExtension("GL_EXT_vertex_shader");
+    extgl_Extensions.EXT_vertex_weighting = QueryExtension("GL_EXT_vertex_weighting");
+    extgl_Extensions.ATI_draw_buffers = QueryExtension("GL_ATI_draw_buffers"); // added -ec    
+    extgl_Extensions.ATI_element_array = QueryExtension("GL_ATI_element_array");
+    extgl_Extensions.ATI_envmap_bumpmap = QueryExtension("GL_ATI_envmap_bumpmap");
+    extgl_Extensions.ATI_fragment_shader = QueryExtension("GL_ATI_fragment_shader");
+    extgl_Extensions.ATI_pn_triangles = QueryExtension("GL_ATI_pn_triangles");
+    extgl_Extensions.ATI_point_cull_mode = QueryExtension("GL_ATI_point_cull_mode");
+    extgl_Extensions.ATI_text_fragment_shader = QueryExtension("GL_ATI_text_fragment_shader");
+    extgl_Extensions.ATI_texture_float = QueryExtension("GL_ATI_texture_float"); // added -ec
+    extgl_Extensions.ATI_texture_mirror_once = QueryExtension("GL_ATI_texture_mirror_once");
+    extgl_Extensions.ATI_vertex_array_object = QueryExtension("GL_ATI_vertex_array_object");
+    extgl_Extensions.ATI_vertex_streams = QueryExtension("GL_ATI_vertex_streams");
+    extgl_Extensions.ATIX_point_sprites = QueryExtension("GL_ATIX_point_sprites");
+    extgl_Extensions.ATIX_texture_env_route = QueryExtension("GL_ATIX_texture_env_route");
+    extgl_Extensions.HP_occlusion_test = QueryExtension("GL_HP_occlusion_test");
+    extgl_Extensions.NV_blend_square = QueryExtension("GL_NV_blend_square");
+    extgl_Extensions.NV_copy_depth_to_color = QueryExtension("GL_NV_copy_depth_to_color");
+    extgl_Extensions.NV_depth_clamp = QueryExtension("GL_NV_depth_clamp");
+    extgl_Extensions.NV_element_array = QueryExtension("GL_NV_element_array");
+    extgl_Extensions.NV_evaluators = QueryExtension("GL_NV_evaluators");
+    extgl_Extensions.NV_fence = QueryExtension("GL_NV_fence");
+    extgl_Extensions.NV_float_buffer = QueryExtension("GL_NV_float_buffer");
+    extgl_Extensions.NV_fog_distance = QueryExtension("GL_NV_fog_distance");
+    extgl_Extensions.NV_fragment_program = QueryExtension("GL_NV_fragment_program");
+    extgl_Extensions.NV_light_max_exponent = QueryExtension("GL_NV_light_max_exponent");
+    extgl_Extensions.NV_occlusion_query = QueryExtension("GL_NV_occlusion_query");
+    extgl_Extensions.NV_packed_depth_stencil = QueryExtension("GL_NV_packed_depth_stencil");
+    extgl_Extensions.NV_point_sprite = QueryExtension("GL_NV_point_sprite");
+    extgl_Extensions.NV_primitive_restart = QueryExtension("GL_NV_primitive_restart");
+    extgl_Extensions.NV_register_combiners = QueryExtension("GL_NV_register_combiners");
+    extgl_Extensions.NV_register_combiners2 = QueryExtension("GL_NV_register_combiners2");
+    extgl_Extensions.NV_texgen_reflection = QueryExtension("GL_NV_texgen_reflection");
+    extgl_Extensions.NV_texture_env_combine4 = QueryExtension("GL_NV_texture_env_combine4");
+    extgl_Extensions.NV_texture_rectangle = QueryExtension("GL_NV_texture_rectangle");
+    extgl_Extensions.NV_texture_shader = QueryExtension("GL_NV_texture_shader");
+    extgl_Extensions.NV_texture_shader2 = QueryExtension("GL_NV_texture_shader2");
+    extgl_Extensions.NV_texture_shader3 = QueryExtension("GL_NV_texture_shader3");
+    extgl_Extensions.NV_vertex_array_range = QueryExtension("GL_NV_vertex_array_range");
+    extgl_Extensions.NV_vertex_array_range2 = QueryExtension("GL_NV_vertex_array_range2");
+    extgl_Extensions.NV_vertex_program = QueryExtension("GL_NV_vertex_program");
+    extgl_Extensions.NV_vertex_program1_1 = QueryExtension("GL_NV_vertex_program1_1");
+    extgl_Extensions.NV_vertex_program2 = QueryExtension("GL_NV_vertex_program2");
+    extgl_Extensions.SGIS_generate_mipmap = QueryExtension("GL_SGIS_generate_mipmap");
+    extgl_Extensions.SGIX_depth_texture = QueryExtension("GL_SGIX_depth_texture");
+    extgl_Extensions.SGIX_shadow = QueryExtension("GL_SGIX_shadow");
+}
+
+
+/* extgl_Init the extensions and load all the functions */
+int extgl_Initialize()
+{
+    extgl_error = 0;
+    extgl_InitSupportedExtensions();
+    
+    /* first load the etensions */
+    extgl_InitARBTransposeMatrix();
+    extgl_InitARBMultisample();
+    extgl_InitEXTCompiledVertexArray();
+    extgl_InitEXTSecondaryColor();
+    extgl_InitEXTFogCoord();
+    extgl_InitNVVertexArrayRange();
+    extgl_InitEXTPointParameters();
+    extgl_InitNVRegisterCombiners();
+    extgl_InitEXTVertexWeighting();
+    extgl_InitNVVertexProgram();
+    extgl_InitNVFence();
+    extgl_InitNVRegisterCombiners2();
+    extgl_InitATIPNTriangles();
+    extgl_InitARBPointParameters();
+    extgl_InitARBVertexBlend();
+    extgl_InitEXTMultiDrawArrays();
+    extgl_InitARBMatrixPalette();
+    extgl_InitEXTVertexShader();
+    extgl_InitATIEnvmapBumpmap();
+    extgl_InitATIFragmentShader();
+    extgl_InitATIElementArray();
+    extgl_InitATIVertexStreams();
+    extgl_InitATIVertexArrayObject();
+    extgl_InitNVOcclusionQuery();
+    extgl_InitNVPointSprite();
+    extgl_InitARBWindowPos();
+    extgl_InitARBTextureCompression();
+    extgl_InitEXTDrawRangeElements();
+    extgl_InitEXTStencilTwoSide();
+    extgl_InitARBVertexProgram();
+    extgl_InitEXTCullVertex();
+    extgl_InitEXTBlendFuncSeparate();
+    extgl_InitARBImaging();
+    extgl_InitARBMultitexture();
+    extgl_InitNVElementArray();
+    extgl_InitNVFragmentProgram();
+    extgl_InitNVPrimitiveRestart();
+    extgl_InitARBFragmentProgram();
+    extgl_InitATIDrawBuffers();
+    
+   /* now load core opengl */
+    extgl_InitOpenGL1_2();
+    extgl_InitOpenGL1_3();
+    extgl_InitOpenGL1_4();
+
+    /* load WGL extensions */
+#ifdef _WIN32
+    extgl_InitializeWGL();
+#endif
+
+    SupportedExtensions = extgl_Extensions;
+    return extgl_error;
+}
+
+/* deprecated function please do not use it, use extgl_Initialize() instead */
+int glInitialize()
+{
+    return extgl_Initialize();
+}
+
+/* turn on the warning for the borland compiler*/
+#ifdef __BORLANDC__
+#pragma warn .8064
+#pragma warn .8065
+#endif /* __BORLANDC__	*/
diff --git a/extern/freestyle/src/rendering/extgl.h b/extern/freestyle/src/rendering/extgl.h
new file mode 100755
index 00000000000..68c13dea3d2
--- /dev/null
+++ b/extern/freestyle/src/rendering/extgl.h
@@ -0,0 +1,5106 @@
+/* Small parts were taken from glext.h, here's the lisence: */
+
+/*
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: This software was created using the
+** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has
+** not been independently verified as being compliant with the OpenGL(R)
+** version 1.2.1 Specification.
+*/
+
+/*  Most parts copyright (c) 2001-2002 Lev Povalahev under this lisence: */
+
+/* ----------------------------------------------------------------------------
+Copyright (c) 2002, Lev Povalahev
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice, 
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice, 
+      this list of conditions and the following disclaimer in the documentation 
+      and/or other materials provided with the distribution.
+    * The name of the author may be used to endorse or promote products 
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, 
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
+THE POSSIBILITY OF SUCH DAMAGE.
+------------------------------------------------------------------------------*/
+/*
+    GL_draw_range_elements support added by Benjamin Karaban
+  
+    Lev Povalahev contact information:
+    
+    levp@gmx.net
+
+    http://www.uni-karlsruhe.de/~uli2/
+*/
+/* These extensions are supported:                
+GL_ARB_depth_texture
+GL_ARB_fragment_program
+GL_ARB_imaging
+GL_ARB_matrix_palette
+GL_ARB_multisample
+GL_ARB_multitexture
+GL_ARB_point_parameters
+GL_ARB_shadow
+GL_ARB_shadow_ambient
+GL_ARB_texture_compression
+GL_ARB_texture_env_add
+GL_ARB_texture_env_dot3
+GL_ARB_texture_env_combine
+GL_ARB_texture_env_crossbar
+GL_ARB_texture_border_clamp
+GL_ARB_texture_cube_map
+GL_ARB_texture_mirrored_repeat
+GL_ARB_transpose_matrix
+GL_ARB_vertex_blend
+GL_ARB_vertex_program
+GL_ARB_window_pos
+GL_EXT_abgr
+GL_EXT_bgra
+GL_EXT_blend_function_separate
+GL_EXT_compiled_vertex_array
+GL_EXT_cull_vertex
+GL_EXT_draw_range_elements
+GL_EXT_fog_coord
+GL_EXT_multi_draw_arrays
+GL_EXT_point_parameters
+GL_EXT_secondary_color  
+GL_EXT_separate_specular_color
+GL_EXT_shadow_funcs
+GL_EXT_stencil_two_side
+GL_EXT_stencil_wrap
+GL_EXT_texture_compression_s3tc
+GL_EXT_texture_filter_anisotropic
+GL_EXT_texture_lod_bias
+GL_EXT_vertex_shader
+GL_EXT_vertex_weighting
+GL_ATI_element_array
+GL_ATI_envmap_bumpmap
+GL_ATI_fragment_shader
+GL_ATI_pn_triangles
+GL_ATI_text_fragment_shader
+GL_ATI_texture_mirror_once
+GL_ATI_vertex_array_object;
+GL_ATI_vertex_streams
+GL_ATIX_point_sprites
+GL_ATIX_texture_env_route
+GL_HP_occlusion_test
+GL_NV_blend_square
+GL_NV_copy_depth_to_color
+GL_NV_depth_clamp
+GL_NV_element_array
+GL_NV_evaluators
+GL_NV_fence
+GL_NV_float_buffer
+GL_NV_fog_distance
+GL_NV_fragment_program
+GL_NV_light_max_exponent
+GL_NV_occlusion_query
+GL_NV_packed_depth_stencil
+GL_NV_point_sprite
+GL_NV_primitive_restart
+GL_NV_register_combiners
+GL_NV_register_combiners2
+GL_NV_texgen_reflection
+GL_NV_texture_env_combine4
+GL_NV_texture_rectangle
+GL_NV_texture_shader
+GL_NV_texture_shader2
+GL_NV_texture_shader3
+GL_NV_vertex_array_range
+GL_NV_vertex_array_range2
+GL_NV_vertex_program
+GL_NV_vertex_program1_1
+GL_NV_vertex_program2
+GL_SGIS_generate_mipmap
+GL_SGIX_shadow
+GL_SGIX_depth_texture
+WGL_ARB_buffer_region
+WGL_ARB_extensions_string
+WGL_ARB_make_current_read;
+WGL_ARB_multisample
+WGL_ARB_pbuffer
+WGL_ARB_pixel_format
+WGL_ARB_render_texture 
+WGL_EXT_extensions_string
+WGL_EXT_swap_control
+WGL_NV_render_depth_texture
+WGL_NV_render_texture_rectangle
+
+// Added -ec.  Some of these are still proprietary, so do not
+// distribute.
+
+EXT_texture_rectangle
+ATI_draw_buffers
+ATI_pixel_format_float
+ATI_texture_float
+*/
+#ifndef __EXTGL_H__
+#define __EXTGL_H__
+
+#include "../system/FreestyleConfig.h"
+
+#if defined(_WIN32) && !defined(APIENTRY)
+#define WIN32_LEAN_AND_MEAN 1
+#include <windows.h>
+#endif
+
+#define __glext_h_
+#define __GLEXT_H_
+#define __gl_h_
+#define __GL_H__
+
+#include <string.h>
+
+#ifndef APIENTRY
+#define APIENTRY
+#endif
+
+#ifndef _WIN32
+#define GLAPI extern
+#define GLAPIENTRY
+#endif
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef __MACH__
+/* OpenGL 1.1 definition */
+
+typedef unsigned int GLenum;
+typedef unsigned char GLboolean;
+typedef unsigned int GLbitfield;
+typedef signed char GLbyte;
+typedef short GLshort;
+typedef int GLint;
+typedef int GLsizei;
+typedef unsigned char GLubyte;
+typedef unsigned short GLushort;
+typedef unsigned int GLuint;
+typedef float GLfloat;
+typedef float GLclampf;
+typedef double GLdouble;
+typedef double GLclampd;
+typedef void GLvoid;
+
+#endif
+
+#ifndef _WIN32
+#ifndef __MACH__
+#include <GL/glx.h>
+#endif
+#endif /* _WIN32 */
+
+/* for mingw compatibility */
+typedef void (*_GLfuncptr)();
+
+#define GL_VERSION_1_1                                          1
+#define GL_ACCUM                                                0x0100
+#define GL_LOAD                                                 0x0101
+#define GL_RETURN                                               0x0102
+#define GL_MULT                                                 0x0103
+#define GL_ADD                                                  0x0104
+#define GL_NEVER                                                0x0200
+#define GL_LESS                                                 0x0201
+#define GL_EQUAL                                                0x0202
+#define GL_LEQUAL                                               0x0203
+#define GL_GREATER                                              0x0204
+#define GL_NOTEQUAL                                             0x0205
+#define GL_GEQUAL                                               0x0206
+#define GL_ALWAYS                                               0x0207
+#define GL_CURRENT_BIT                                          0x00000001
+#define GL_POINT_BIT                                            0x00000002
+#define GL_LINE_BIT                                             0x00000004
+#define GL_POLYGON_BIT                                          0x00000008
+#define GL_POLYGON_STIPPLE_BIT                                  0x00000010
+#define GL_PIXEL_MODE_BIT                                       0x00000020
+#define GL_LIGHTING_BIT                                         0x00000040
+#define GL_FOG_BIT                                              0x00000080
+#define GL_DEPTH_BUFFER_BIT                                     0x00000100
+#define GL_ACCUM_BUFFER_BIT                                     0x00000200
+#define GL_STENCIL_BUFFER_BIT                                   0x00000400
+#define GL_VIEWPORT_BIT                                         0x00000800
+#define GL_TRANSFORM_BIT                                        0x00001000
+#define GL_ENABLE_BIT                                           0x00002000
+#define GL_COLOR_BUFFER_BIT                                     0x00004000
+#define GL_HINT_BIT                                             0x00008000
+#define GL_EVAL_BIT                                             0x00010000
+#define GL_LIST_BIT                                             0x00020000
+#define GL_TEXTURE_BIT                                          0x00040000
+#define GL_SCISSOR_BIT                                          0x00080000
+#define GL_ALL_ATTRIB_BITS                                      0x000fffff
+#define GL_POINTS                                               0x0000
+#define GL_LINES                                                0x0001
+#define GL_LINE_LOOP                                            0x0002
+#define GL_LINE_STRIP                                           0x0003
+#define GL_TRIANGLES                                            0x0004
+#define GL_TRIANGLE_STRIP                                       0x0005
+#define GL_TRIANGLE_FAN                                         0x0006
+#define GL_QUADS                                                0x0007
+#define GL_QUAD_STRIP                                           0x0008
+#define GL_POLYGON                                              0x0009
+#define GL_ZERO                                                 0
+#define GL_ONE                                                  1
+#define GL_SRC_COLOR                                            0x0300
+#define GL_ONE_MINUS_SRC_COLOR                                  0x0301
+#define GL_SRC_ALPHA                                            0x0302
+#define GL_ONE_MINUS_SRC_ALPHA                                  0x0303
+#define GL_DST_ALPHA                                            0x0304
+#define GL_ONE_MINUS_DST_ALPHA                                  0x0305
+#define GL_DST_COLOR                                            0x0306
+#define GL_ONE_MINUS_DST_COLOR                                  0x0307
+#define GL_SRC_ALPHA_SATURATE                                   0x0308
+#define GL_TRUE                                                 1
+#define GL_FALSE                                                0
+#define GL_CLIP_PLANE0                                          0x3000
+#define GL_CLIP_PLANE1                                          0x3001
+#define GL_CLIP_PLANE2                                          0x3002
+#define GL_CLIP_PLANE3                                          0x3003
+#define GL_CLIP_PLANE4                                          0x3004
+#define GL_CLIP_PLANE5                                          0x3005
+#define GL_BYTE                                                 0x1400
+#define GL_UNSIGNED_BYTE                                        0x1401
+#define GL_SHORT                                                0x1402
+#define GL_UNSIGNED_SHORT                                       0x1403
+#define GL_INT                                                  0x1404
+#define GL_UNSIGNED_INT                                         0x1405
+#define GL_FLOAT                                                0x1406
+#define GL_2_BYTES                                              0x1407
+#define GL_3_BYTES                                              0x1408
+#define GL_4_BYTES                                              0x1409
+#define GL_DOUBLE                                               0x140A
+#define GL_NONE                           0
+#define GL_FRONT_LEFT                                           0x0400
+#define GL_FRONT_RIGHT                                          0x0401
+#define GL_BACK_LEFT                                            0x0402
+#define GL_BACK_RIGHT                                           0x0403
+#define GL_FRONT                                                0x0404
+#define GL_BACK                                                 0x0405
+#define GL_LEFT                                                 0x0406
+#define GL_RIGHT                                                0x0407
+#define GL_FRONT_AND_BACK                                       0x0408
+#define GL_AUX0                                                 0x0409
+#define GL_AUX1                                                 0x040A
+#define GL_AUX2                                                 0x040B
+#define GL_AUX3                                                 0x040C
+#define GL_NO_ERROR                       0
+#define GL_INVALID_ENUM                                         0x0500
+#define GL_INVALID_VALUE                                        0x0501
+#define GL_INVALID_OPERATION                                    0x0502
+#define GL_STACK_OVERFLOW                                       0x0503
+#define GL_STACK_UNDERFLOW                                      0x0504
+#define GL_OUT_OF_MEMORY                                        0x0505
+#define GL_2D                                                   0x0600
+#define GL_3D                                                   0x0601
+#define GL_3D_COLOR                                             0x0602
+#define GL_3D_COLOR_TEXTURE                                     0x0603
+#define GL_4D_COLOR_TEXTURE                                     0x0604
+#define GL_PASS_THROUGH_TOKEN                                   0x0700
+#define GL_POINT_TOKEN                                          0x0701
+#define GL_LINE_TOKEN                                           0x0702
+#define GL_POLYGON_TOKEN                                        0x0703
+#define GL_BITMAP_TOKEN                                         0x0704
+#define GL_DRAW_PIXEL_TOKEN                                     0x0705
+#define GL_COPY_PIXEL_TOKEN                                     0x0706
+#define GL_LINE_RESET_TOKEN                                     0x0707
+#define GL_EXP                                                  0x0800
+#define GL_EXP2                                                 0x0801
+#define GL_CW                                                   0x0900
+#define GL_CCW                                                  0x0901
+#define GL_COEFF                                                0x0A00
+#define GL_ORDER                                                0x0A01
+#define GL_DOMAIN                                               0x0A02
+#define GL_CURRENT_COLOR                                        0x0B00
+#define GL_CURRENT_INDEX                                        0x0B01
+#define GL_CURRENT_NORMAL                                       0x0B02
+#define GL_CURRENT_TEXTURE_COORDS                               0x0B03
+#define GL_CURRENT_RASTER_COLOR                                 0x0B04
+#define GL_CURRENT_RASTER_INDEX                                 0x0B05
+#define GL_CURRENT_RASTER_TEXTURE_COORDS                        0x0B06
+#define GL_CURRENT_RASTER_POSITION                              0x0B07
+#define GL_CURRENT_RASTER_POSITION_VALID                        0x0B08
+#define GL_CURRENT_RASTER_DISTANCE                              0x0B09
+#define GL_POINT_SMOOTH                                         0x0B10
+#define GL_POINT_SIZE                                           0x0B11
+#define GL_POINT_SIZE_RANGE                                     0x0B12
+#define GL_POINT_SIZE_GRANULARITY                               0x0B13
+#define GL_LINE_SMOOTH                                          0x0B20
+#define GL_LINE_WIDTH                                           0x0B21
+#define GL_LINE_WIDTH_RANGE                                     0x0B22
+#define GL_LINE_WIDTH_GRANULARITY                               0x0B23
+#define GL_LINE_STIPPLE                                         0x0B24
+#define GL_LINE_STIPPLE_PATTERN                                 0x0B25
+#define GL_LINE_STIPPLE_REPEAT                                  0x0B26
+#define GL_LIST_MODE                                            0x0B30
+#define GL_MAX_LIST_NESTING                                     0x0B31
+#define GL_LIST_BASE                                            0x0B32
+#define GL_LIST_INDEX                                           0x0B33
+#define GL_POLYGON_MODE                                         0x0B40
+#define GL_POLYGON_SMOOTH                                       0x0B41
+#define GL_POLYGON_STIPPLE                                      0x0B42
+#define GL_EDGE_FLAG                                            0x0B43
+#define GL_CULL_FACE                                            0x0B44
+#define GL_CULL_FACE_MODE                                       0x0B45
+#define GL_FRONT_FACE                                           0x0B46
+#define GL_LIGHTING                                             0x0B50
+#define GL_LIGHT_MODEL_LOCAL_VIEWER                             0x0B51
+#define GL_LIGHT_MODEL_TWO_SIDE                                 0x0B52
+#define GL_LIGHT_MODEL_AMBIENT                                  0x0B53
+#define GL_SHADE_MODEL                                          0x0B54
+#define GL_COLOR_MATERIAL_FACE                                  0x0B55
+#define GL_COLOR_MATERIAL_PARAMETER                             0x0B56
+#define GL_COLOR_MATERIAL                                       0x0B57
+#define GL_FOG                                                  0x0B60
+#define GL_FOG_INDEX                                            0x0B61
+#define GL_FOG_DENSITY                                          0x0B62
+#define GL_FOG_START                                            0x0B63
+#define GL_FOG_END                                              0x0B64
+#define GL_FOG_MODE                                             0x0B65
+#define GL_FOG_COLOR                                            0x0B66
+#define GL_DEPTH_RANGE                                          0x0B70
+#define GL_DEPTH_TEST                                           0x0B71
+#define GL_DEPTH_WRITEMASK                                      0x0B72
+#define GL_DEPTH_CLEAR_VALUE                                    0x0B73
+#define GL_DEPTH_FUNC                                           0x0B74
+#define GL_ACCUM_CLEAR_VALUE                                    0x0B80
+#define GL_STENCIL_TEST                                         0x0B90
+#define GL_STENCIL_CLEAR_VALUE                                  0x0B91
+#define GL_STENCIL_FUNC                                         0x0B92
+#define GL_STENCIL_VALUE_MASK                                   0x0B93
+#define GL_STENCIL_FAIL                                         0x0B94
+#define GL_STENCIL_PASS_DEPTH_FAIL                              0x0B95
+#define GL_STENCIL_PASS_DEPTH_PASS                              0x0B96
+#define GL_STENCIL_REF                                          0x0B97
+#define GL_STENCIL_WRITEMASK                                    0x0B98
+#define GL_MATRIX_MODE                                          0x0BA0
+#define GL_NORMALIZE                                            0x0BA1
+#define GL_VIEWPORT                                             0x0BA2
+#define GL_MODELVIEW_STACK_DEPTH                                0x0BA3
+#define GL_PROJECTION_STACK_DEPTH                               0x0BA4
+#define GL_TEXTURE_STACK_DEPTH                                  0x0BA5
+#define GL_MODELVIEW_MATRIX                                     0x0BA6
+#define GL_PROJECTION_MATRIX                                    0x0BA7
+#define GL_TEXTURE_MATRIX                                       0x0BA8
+#define GL_ATTRIB_STACK_DEPTH                                   0x0BB0
+#define GL_CLIENT_ATTRIB_STACK_DEPTH                            0x0BB1
+#define GL_ALPHA_TEST                                           0x0BC0
+#define GL_ALPHA_TEST_FUNC                                      0x0BC1
+#define GL_ALPHA_TEST_REF                                       0x0BC2
+#define GL_DITHER                                               0x0BD0
+#define GL_BLEND_DST                                            0x0BE0
+#define GL_BLEND_SRC                                            0x0BE1
+#define GL_BLEND                                                0x0BE2
+#define GL_LOGIC_OP_MODE                                        0x0BF0
+#define GL_INDEX_LOGIC_OP                                       0x0BF1
+#define GL_COLOR_LOGIC_OP                                       0x0BF2
+#define GL_AUX_BUFFERS                                          0x0C00
+#define GL_DRAW_BUFFER                                          0x0C01
+#define GL_READ_BUFFER                                          0x0C02
+#define GL_SCISSOR_BOX                                          0x0C10
+#define GL_SCISSOR_TEST                                         0x0C11
+#define GL_INDEX_CLEAR_VALUE                                    0x0C20
+#define GL_INDEX_WRITEMASK                                      0x0C21
+#define GL_COLOR_CLEAR_VALUE                                    0x0C22
+#define GL_COLOR_WRITEMASK                                      0x0C23
+#define GL_INDEX_MODE                                           0x0C30
+#define GL_RGBA_MODE                                            0x0C31
+#define GL_DOUBLEBUFFER                                         0x0C32
+#define GL_STEREO                                               0x0C33
+#define GL_RENDER_MODE                                          0x0C40
+#define GL_PERSPECTIVE_CORRECTION_HINT                          0x0C50
+#define GL_POINT_SMOOTH_HINT                                    0x0C51
+#define GL_LINE_SMOOTH_HINT                                     0x0C52
+#define GL_POLYGON_SMOOTH_HINT                                  0x0C53
+#define GL_FOG_HINT                                             0x0C54
+#define GL_TEXTURE_GEN_S                                        0x0C60
+#define GL_TEXTURE_GEN_T                                        0x0C61
+#define GL_TEXTURE_GEN_R                                        0x0C62
+#define GL_TEXTURE_GEN_Q                                        0x0C63
+#define GL_PIXEL_MAP_I_TO_I                                     0x0C70
+#define GL_PIXEL_MAP_S_TO_S                                     0x0C71
+#define GL_PIXEL_MAP_I_TO_R                                     0x0C72
+#define GL_PIXEL_MAP_I_TO_G                                     0x0C73
+#define GL_PIXEL_MAP_I_TO_B                                     0x0C74
+#define GL_PIXEL_MAP_I_TO_A                                     0x0C75
+#define GL_PIXEL_MAP_R_TO_R                                     0x0C76
+#define GL_PIXEL_MAP_G_TO_G                                     0x0C77
+#define GL_PIXEL_MAP_B_TO_B                                     0x0C78
+#define GL_PIXEL_MAP_A_TO_A                                     0x0C79
+#define GL_PIXEL_MAP_I_TO_I_SIZE                                0x0CB0
+#define GL_PIXEL_MAP_S_TO_S_SIZE                                0x0CB1
+#define GL_PIXEL_MAP_I_TO_R_SIZE                                0x0CB2
+#define GL_PIXEL_MAP_I_TO_G_SIZE                                0x0CB3
+#define GL_PIXEL_MAP_I_TO_B_SIZE                                0x0CB4
+#define GL_PIXEL_MAP_I_TO_A_SIZE                                0x0CB5
+#define GL_PIXEL_MAP_R_TO_R_SIZE                                0x0CB6
+#define GL_PIXEL_MAP_G_TO_G_SIZE                                0x0CB7
+#define GL_PIXEL_MAP_B_TO_B_SIZE                                0x0CB8
+#define GL_PIXEL_MAP_A_TO_A_SIZE                                0x0CB9
+#define GL_UNPACK_SWAP_BYTES                                    0x0CF0
+#define GL_UNPACK_LSB_FIRST                                     0x0CF1
+#define GL_UNPACK_ROW_LENGTH                                    0x0CF2
+#define GL_UNPACK_SKIP_ROWS                                     0x0CF3
+#define GL_UNPACK_SKIP_PIXELS                                   0x0CF4
+#define GL_UNPACK_ALIGNMENT                                     0x0CF5
+#define GL_PACK_SWAP_BYTES                                      0x0D00
+#define GL_PACK_LSB_FIRST                                       0x0D01
+#define GL_PACK_ROW_LENGTH                                      0x0D02
+#define GL_PACK_SKIP_ROWS                                       0x0D03
+#define GL_PACK_SKIP_PIXELS                                     0x0D04
+#define GL_PACK_ALIGNMENT                                       0x0D05
+#define GL_MAP_COLOR                                            0x0D10
+#define GL_MAP_STENCIL                                          0x0D11
+#define GL_INDEX_SHIFT                                          0x0D12
+#define GL_INDEX_OFFSET                                         0x0D13
+#define GL_RED_SCALE                                            0x0D14
+#define GL_RED_BIAS                                             0x0D15
+#define GL_ZOOM_X                                               0x0D16
+#define GL_ZOOM_Y                                               0x0D17
+#define GL_GREEN_SCALE                                          0x0D18
+#define GL_GREEN_BIAS                                           0x0D19
+#define GL_BLUE_SCALE                                           0x0D1A
+#define GL_BLUE_BIAS                                            0x0D1B
+#define GL_ALPHA_SCALE                                          0x0D1C
+#define GL_ALPHA_BIAS                                           0x0D1D
+#define GL_DEPTH_SCALE                                          0x0D1E
+#define GL_DEPTH_BIAS                                           0x0D1F
+#define GL_MAX_EVAL_ORDER                                       0x0D30
+#define GL_MAX_LIGHTS                                           0x0D31
+#define GL_MAX_CLIP_PLANES                                      0x0D32
+#define GL_MAX_TEXTURE_SIZE                                     0x0D33
+#define GL_MAX_PIXEL_MAP_TABLE                                  0x0D34
+#define GL_MAX_ATTRIB_STACK_DEPTH                               0x0D35
+#define GL_MAX_MODELVIEW_STACK_DEPTH                            0x0D36
+#define GL_MAX_NAME_STACK_DEPTH                                 0x0D37
+#define GL_MAX_PROJECTION_STACK_DEPTH                           0x0D38
+#define GL_MAX_TEXTURE_STACK_DEPTH                              0x0D39
+#define GL_MAX_VIEWPORT_DIMS                                    0x0D3A
+#define GL_MAX_CLIENT_ATTRIB_STACK_DEPTH                        0x0D3B
+#define GL_SUBPIXEL_BITS                                        0x0D50
+#define GL_INDEX_BITS                                           0x0D51
+#define GL_RED_BITS                                             0x0D52
+#define GL_GREEN_BITS                                           0x0D53
+#define GL_BLUE_BITS                                            0x0D54
+#define GL_ALPHA_BITS                                           0x0D55
+#define GL_DEPTH_BITS                                           0x0D56
+#define GL_STENCIL_BITS                                         0x0D57
+#define GL_ACCUM_RED_BITS                                       0x0D58
+#define GL_ACCUM_GREEN_BITS                                     0x0D59
+#define GL_ACCUM_BLUE_BITS                                      0x0D5A
+#define GL_ACCUM_ALPHA_BITS                                     0x0D5B
+#define GL_NAME_STACK_DEPTH                                     0x0D70
+#define GL_AUTO_NORMAL                                          0x0D80
+#define GL_MAP1_COLOR_4                                         0x0D90
+#define GL_MAP1_INDEX                                           0x0D91
+#define GL_MAP1_NORMAL                                          0x0D92
+#define GL_MAP1_TEXTURE_COORD_1                                 0x0D93
+#define GL_MAP1_TEXTURE_COORD_2                                 0x0D94
+#define GL_MAP1_TEXTURE_COORD_3                                 0x0D95
+#define GL_MAP1_TEXTURE_COORD_4                                 0x0D96
+#define GL_MAP1_VERTEX_3                                        0x0D97
+#define GL_MAP1_VERTEX_4                                        0x0D98
+#define GL_MAP2_COLOR_4                                         0x0DB0
+#define GL_MAP2_INDEX                                           0x0DB1
+#define GL_MAP2_NORMAL                                          0x0DB2
+#define GL_MAP2_TEXTURE_COORD_1                                 0x0DB3
+#define GL_MAP2_TEXTURE_COORD_2                                 0x0DB4
+#define GL_MAP2_TEXTURE_COORD_3                                 0x0DB5
+#define GL_MAP2_TEXTURE_COORD_4                                 0x0DB6
+#define GL_MAP2_VERTEX_3                                        0x0DB7
+#define GL_MAP2_VERTEX_4                                        0x0DB8
+#define GL_MAP1_GRID_DOMAIN                                     0x0DD0
+#define GL_MAP1_GRID_SEGMENTS                                   0x0DD1
+#define GL_MAP2_GRID_DOMAIN                                     0x0DD2
+#define GL_MAP2_GRID_SEGMENTS                                   0x0DD3
+#define GL_TEXTURE_1D                                           0x0DE0
+#define GL_TEXTURE_2D                                           0x0DE1
+#define GL_FEEDBACK_BUFFER_POINTER                              0x0DF0
+#define GL_FEEDBACK_BUFFER_SIZE                                 0x0DF1
+#define GL_FEEDBACK_BUFFER_TYPE                                 0x0DF2
+#define GL_SELECTION_BUFFER_POINTER                             0x0DF3
+#define GL_SELECTION_BUFFER_SIZE                                0x0DF4
+#define GL_TEXTURE_WIDTH                                        0x1000
+#define GL_TEXTURE_HEIGHT                                       0x1001
+#define GL_TEXTURE_INTERNAL_FORMAT                              0x1003
+#define GL_TEXTURE_BORDER_COLOR                                 0x1004
+#define GL_TEXTURE_BORDER                                       0x1005
+#define GL_DONT_CARE                                            0x1100
+#define GL_FASTEST                                              0x1101
+#define GL_NICEST                                               0x1102
+#define GL_LIGHT0                                               0x4000
+#define GL_LIGHT1                                               0x4001
+#define GL_LIGHT2                                               0x4002
+#define GL_LIGHT3                                               0x4003
+#define GL_LIGHT4                                               0x4004
+#define GL_LIGHT5                                               0x4005
+#define GL_LIGHT6                                               0x4006
+#define GL_LIGHT7                                               0x4007
+#define GL_AMBIENT                                              0x1200
+#define GL_DIFFUSE                                              0x1201
+#define GL_SPECULAR                                             0x1202
+#define GL_POSITION                                             0x1203
+#define GL_SPOT_DIRECTION                                       0x1204
+#define GL_SPOT_EXPONENT                                        0x1205
+#define GL_SPOT_CUTOFF                                          0x1206
+#define GL_CONSTANT_ATTENUATION                                 0x1207
+#define GL_LINEAR_ATTENUATION                                   0x1208
+#define GL_QUADRATIC_ATTENUATION                                0x1209
+#define GL_COMPILE                                              0x1300
+#define GL_COMPILE_AND_EXECUTE                                  0x1301
+#define GL_CLEAR                                                0x1500
+#define GL_AND                                                  0x1501
+#define GL_AND_REVERSE                                          0x1502
+#define GL_COPY                                                 0x1503
+#define GL_AND_INVERTED                                         0x1504
+#define GL_NOOP                                                 0x1505
+#define GL_XOR                                                  0x1506
+#define GL_OR                                                   0x1507
+#define GL_NOR                                                  0x1508
+#define GL_EQUIV                                                0x1509
+#define GL_INVERT                                               0x150A
+#define GL_OR_REVERSE                                           0x150B
+#define GL_COPY_INVERTED                                        0x150C
+#define GL_OR_INVERTED                                          0x150D
+#define GL_NAND                                                 0x150E
+#define GL_SET                                                  0x150F
+#define GL_EMISSION                                             0x1600
+#define GL_SHININESS                                            0x1601
+#define GL_AMBIENT_AND_DIFFUSE                                  0x1602
+#define GL_COLOR_INDEXES                                        0x1603
+#define GL_MODELVIEW                                            0x1700
+#define GL_PROJECTION                                           0x1701
+#define GL_TEXTURE                                              0x1702
+#define GL_COLOR                                                0x1800
+#define GL_DEPTH                                                0x1801
+#define GL_STENCIL                                              0x1802
+#define GL_COLOR_INDEX                                          0x1900
+#define GL_STENCIL_INDEX                                        0x1901
+#define GL_DEPTH_COMPONENT                                      0x1902
+#define GL_RED                                                  0x1903
+#define GL_GREEN                                                0x1904
+#define GL_BLUE                                                 0x1905
+#define GL_ALPHA                                                0x1906
+#define GL_RGB                                                  0x1907
+#define GL_RGBA                                                 0x1908
+#define GL_LUMINANCE                                            0x1909
+#define GL_LUMINANCE_ALPHA                                      0x190A
+#define GL_BITMAP                                               0x1A00
+#define GL_POINT                                                0x1B00
+#define GL_LINE                                                 0x1B01
+#define GL_FILL                                                 0x1B02
+#define GL_RENDER                                               0x1C00
+#define GL_FEEDBACK                                             0x1C01
+#define GL_SELECT                                               0x1C02
+#define GL_FLAT                                                 0x1D00
+#define GL_SMOOTH                                               0x1D01
+#define GL_KEEP                                                 0x1E00
+#define GL_REPLACE                                              0x1E01
+#define GL_INCR                                                 0x1E02
+#define GL_DECR                                                 0x1E03
+#define GL_VENDOR                                               0x1F00
+#define GL_RENDERER                                             0x1F01
+#define GL_VERSION                                              0x1F02
+#define GL_EXTENSIONS                                           0x1F03
+#define GL_S                                                    0x2000
+#define GL_T                                                    0x2001
+#define GL_R                                                    0x2002
+#define GL_Q                                                    0x2003
+#define GL_MODULATE                                             0x2100
+#define GL_DECAL                                                0x2101
+#define GL_TEXTURE_ENV_MODE                                     0x2200
+#define GL_TEXTURE_ENV_COLOR                                    0x2201
+#define GL_TEXTURE_ENV                                          0x2300
+#define GL_EYE_LINEAR                                           0x2400
+#define GL_OBJECT_LINEAR                                        0x2401
+#define GL_SPHERE_MAP                                           0x2402
+#define GL_TEXTURE_GEN_MODE                                     0x2500
+#define GL_OBJECT_PLANE                                         0x2501
+#define GL_EYE_PLANE                                            0x2502
+#define GL_NEAREST                                              0x2600
+#define GL_LINEAR                                               0x2601
+#define GL_NEAREST_MIPMAP_NEAREST                               0x2700
+#define GL_LINEAR_MIPMAP_NEAREST                                0x2701
+#define GL_NEAREST_MIPMAP_LINEAR                                0x2702
+#define GL_LINEAR_MIPMAP_LINEAR                                 0x2703
+#define GL_TEXTURE_MAG_FILTER                                   0x2800
+#define GL_TEXTURE_MIN_FILTER                                   0x2801
+#define GL_TEXTURE_WRAP_S                                       0x2802
+#define GL_TEXTURE_WRAP_T                                       0x2803
+#define GL_CLAMP                                                0x2900
+#define GL_REPEAT                                               0x2901
+#define GL_CLIENT_PIXEL_STORE_BIT                               0x00000001
+#define GL_CLIENT_VERTEX_ARRAY_BIT                              0x00000002
+#define GL_CLIENT_ALL_ATTRIB_BITS                               0xffffffff
+#define GL_POLYGON_OFFSET_FACTOR                                0x8038
+#define GL_POLYGON_OFFSET_UNITS                                 0x2A00
+#define GL_POLYGON_OFFSET_POINT                                 0x2A01
+#define GL_POLYGON_OFFSET_LINE                                  0x2A02
+#define GL_POLYGON_OFFSET_FILL                                  0x8037
+#define GL_ALPHA4                                               0x803B
+#define GL_ALPHA8                                               0x803C
+#define GL_ALPHA12                                              0x803D
+#define GL_ALPHA16                                              0x803E
+#define GL_LUMINANCE4                                           0x803F
+#define GL_LUMINANCE8                                           0x8040
+#define GL_LUMINANCE12                                          0x8041
+#define GL_LUMINANCE16                                          0x8042
+#define GL_LUMINANCE4_ALPHA4                                    0x8043
+#define GL_LUMINANCE6_ALPHA2                                    0x8044
+#define GL_LUMINANCE8_ALPHA8                                    0x8045
+#define GL_LUMINANCE12_ALPHA4                                   0x8046
+#define GL_LUMINANCE12_ALPHA12                                  0x8047
+#define GL_LUMINANCE16_ALPHA16                                  0x8048
+#define GL_INTENSITY                                            0x8049
+#define GL_INTENSITY4                                           0x804A
+#define GL_INTENSITY8                                           0x804B
+#define GL_INTENSITY12                                          0x804C
+#define GL_INTENSITY16                                          0x804D
+#define GL_R3_G3_B2                                             0x2A10
+#define GL_RGB4                                                 0x804F
+#define GL_RGB5                                                 0x8050
+#define GL_RGB8                                                 0x8051
+#define GL_RGB10                                                0x8052
+#define GL_RGB12                                                0x8053
+#define GL_RGB16                                                0x8054
+#define GL_RGBA2                                                0x8055
+#define GL_RGBA4                                                0x8056
+#define GL_RGB5_A1                                              0x8057
+#define GL_RGBA8                                                0x8058
+#define GL_RGB10_A2                                             0x8059
+#define GL_RGBA12                                               0x805A
+#define GL_RGBA16                                               0x805B
+#define GL_TEXTURE_RED_SIZE                                     0x805C
+#define GL_TEXTURE_GREEN_SIZE                                   0x805D
+#define GL_TEXTURE_BLUE_SIZE                                    0x805E
+#define GL_TEXTURE_ALPHA_SIZE                                   0x805F
+#define GL_TEXTURE_LUMINANCE_SIZE                               0x8060
+#define GL_TEXTURE_INTENSITY_SIZE                               0x8061
+#define GL_PROXY_TEXTURE_1D                                     0x8063
+#define GL_PROXY_TEXTURE_2D                                     0x8064
+#define GL_TEXTURE_PRIORITY                                     0x8066
+#define GL_TEXTURE_RESIDENT                                     0x8067
+#define GL_TEXTURE_BINDING_1D                                   0x8068
+#define GL_TEXTURE_BINDING_2D                                   0x8069
+#define GL_VERTEX_ARRAY                                         0x8074
+#define GL_NORMAL_ARRAY                                         0x8075
+#define GL_COLOR_ARRAY                                          0x8076
+#define GL_INDEX_ARRAY                                          0x8077
+#define GL_TEXTURE_COORD_ARRAY                                  0x8078
+#define GL_EDGE_FLAG_ARRAY                                      0x8079
+#define GL_VERTEX_ARRAY_SIZE                                    0x807A
+#define GL_VERTEX_ARRAY_TYPE                                    0x807B
+#define GL_VERTEX_ARRAY_STRIDE                                  0x807C
+#define GL_NORMAL_ARRAY_TYPE                                    0x807E
+#define GL_NORMAL_ARRAY_STRIDE                                  0x807F
+#define GL_COLOR_ARRAY_SIZE                                     0x8081
+#define GL_COLOR_ARRAY_TYPE                                     0x8082
+#define GL_COLOR_ARRAY_STRIDE                                   0x8083
+#define GL_INDEX_ARRAY_TYPE                                     0x8085
+#define GL_INDEX_ARRAY_STRIDE                                   0x8086
+#define GL_TEXTURE_COORD_ARRAY_SIZE                             0x8088
+#define GL_TEXTURE_COORD_ARRAY_TYPE                             0x8089
+#define GL_TEXTURE_COORD_ARRAY_STRIDE                           0x808A
+#define GL_EDGE_FLAG_ARRAY_STRIDE                               0x808C
+#define GL_VERTEX_ARRAY_POINTER                                 0x808E
+#define GL_NORMAL_ARRAY_POINTER                                 0x808F
+#define GL_COLOR_ARRAY_POINTER                                  0x8090
+#define GL_INDEX_ARRAY_POINTER                                  0x8091
+#define GL_TEXTURE_COORD_ARRAY_POINTER                          0x8092
+#define GL_EDGE_FLAG_ARRAY_POINTER                              0x8093
+#define GL_V2F                                                  0x2A20
+#define GL_V3F                                                  0x2A21
+#define GL_C4UB_V2F                                             0x2A22
+#define GL_C4UB_V3F                                             0x2A23
+#define GL_C3F_V3F                                              0x2A24
+#define GL_N3F_V3F                                              0x2A25
+#define GL_C4F_N3F_V3F                                          0x2A26
+#define GL_T2F_V3F                                              0x2A27
+#define GL_T4F_V4F                                              0x2A28
+#define GL_T2F_C4UB_V3F                                         0x2A29
+#define GL_T2F_C3F_V3F                                          0x2A2A
+#define GL_T2F_N3F_V3F                                          0x2A2B
+#define GL_T2F_C4F_N3F_V3F                                      0x2A2C
+#define GL_T4F_C4F_N3F_V4F                                      0x2A2D
+#define GL_LOGIC_OP GL_INDEX_LOGIC_OP
+#define GL_TEXTURE_COMPONENTS GL_TEXTURE_INTERNAL_FORMAT
+
+/* functions */
+
+extern void APIENTRY glAccum (GLenum op, GLfloat value);
+extern void APIENTRY glAlphaFunc (GLenum func, GLclampf ref);
+extern GLboolean APIENTRY glAreTexturesResident (GLsizei n, const GLuint *textures, GLboolean *residences);
+extern void APIENTRY glArrayElement (GLint i);
+extern void APIENTRY glBegin (GLenum mode);
+extern void APIENTRY glBindTexture (GLenum target, GLuint texture);
+extern void APIENTRY glBitmap (GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap);
+extern void APIENTRY glBlendFunc (GLenum sfactor, GLenum dfactor);
+extern void APIENTRY glCallList (GLuint list);
+extern void APIENTRY glCallLists (GLsizei n, GLenum type, const GLvoid *lists);
+extern void APIENTRY glClear (GLbitfield mask);
+extern void APIENTRY glClearAccum (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
+extern void APIENTRY glClearColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+extern void APIENTRY glClearDepth (GLclampd depth);
+extern void APIENTRY glClearIndex (GLfloat c);
+extern void APIENTRY glClearStencil (GLint s);
+extern void APIENTRY glClipPlane (GLenum plane, const GLdouble *equation);
+extern void APIENTRY glColor3b (GLbyte red, GLbyte green, GLbyte blue);
+extern void APIENTRY glColor3bv (const GLbyte *v);
+extern void APIENTRY glColor3d (GLdouble red, GLdouble green, GLdouble blue);
+extern void APIENTRY glColor3dv (const GLdouble *v);
+extern void APIENTRY glColor3f (GLfloat red, GLfloat green, GLfloat blue);
+extern void APIENTRY glColor3fv (const GLfloat *v);
+extern void APIENTRY glColor3i (GLint red, GLint green, GLint blue);
+extern void APIENTRY glColor3iv (const GLint *v);
+extern void APIENTRY glColor3s (GLshort red, GLshort green, GLshort blue);
+extern void APIENTRY glColor3sv (const GLshort *v);
+extern void APIENTRY glColor3ub (GLubyte red, GLubyte green, GLubyte blue);
+extern void APIENTRY glColor3ubv (const GLubyte *v);
+extern void APIENTRY glColor3ui (GLuint red, GLuint green, GLuint blue);
+extern void APIENTRY glColor3uiv (const GLuint *v);
+extern void APIENTRY glColor3us (GLushort red, GLushort green, GLushort blue);
+extern void APIENTRY glColor3usv (const GLushort *v);
+extern void APIENTRY glColor4b (GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha);
+extern void APIENTRY glColor4bv (const GLbyte *v);
+extern void APIENTRY glColor4d (GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha);
+extern void APIENTRY glColor4dv (const GLdouble *v);
+extern void APIENTRY glColor4f (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
+extern void APIENTRY glColor4fv (const GLfloat *v);
+extern void APIENTRY glColor4i (GLint red, GLint green, GLint blue, GLint alpha);
+extern void APIENTRY glColor4iv (const GLint *v);
+extern void APIENTRY glColor4s (GLshort red, GLshort green, GLshort blue, GLshort alpha);
+extern void APIENTRY glColor4sv (const GLshort *v);
+extern void APIENTRY glColor4ub (GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha);
+extern void APIENTRY glColor4ubv (const GLubyte *v);
+extern void APIENTRY glColor4ui (GLuint red, GLuint green, GLuint blue, GLuint alpha);
+extern void APIENTRY glColor4uiv (const GLuint *v);
+extern void APIENTRY glColor4us (GLushort red, GLushort green, GLushort blue, GLushort alpha);
+extern void APIENTRY glColor4usv (const GLushort *v);
+extern void APIENTRY glColorMask (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
+extern void APIENTRY glColorMaterial (GLenum face, GLenum mode);
+extern void APIENTRY glColorPointer (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+extern void APIENTRY glCopyPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum type);
+extern void APIENTRY glCopyTexImage1D (GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLint border);
+extern void APIENTRY glCopyTexImage2D (GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+extern void APIENTRY glCopyTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+extern void APIENTRY glCopyTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+extern void APIENTRY glCullFace (GLenum mode);
+extern void APIENTRY glDeleteLists (GLuint list, GLsizei range);
+extern void APIENTRY glDeleteTextures (GLsizei n, const GLuint *textures);
+extern void APIENTRY glDepthFunc (GLenum func);
+extern void APIENTRY glDepthMask (GLboolean flag);
+extern void APIENTRY glDepthRange (GLclampd zNear, GLclampd zFar);
+extern void APIENTRY glDisable (GLenum cap);
+extern void APIENTRY glDisableClientState (GLenum array);
+extern void APIENTRY glDrawArrays (GLenum mode, GLint first, GLsizei count);
+extern void APIENTRY glDrawBuffer (GLenum mode);
+extern void APIENTRY glDrawElements (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices);
+extern void APIENTRY glDrawPixels (GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
+extern void APIENTRY glEdgeFlag (GLboolean flag);
+#ifndef __MACH__
+extern void APIENTRY glEdgeFlagPointer (GLsizei stride, const GLvoid *pointer);
+#endif
+extern void APIENTRY glEdgeFlagv (const GLboolean *flag);
+extern void APIENTRY glEnable (GLenum cap);
+extern void APIENTRY glEnableClientState (GLenum array);
+extern void APIENTRY glEnd (void);
+extern void APIENTRY glEndList (void);
+extern void APIENTRY glEvalCoord1d (GLdouble u);
+extern void APIENTRY glEvalCoord1dv (const GLdouble *u);
+extern void APIENTRY glEvalCoord1f (GLfloat u);
+extern void APIENTRY glEvalCoord1fv (const GLfloat *u);
+extern void APIENTRY glEvalCoord2d (GLdouble u, GLdouble v);
+extern void APIENTRY glEvalCoord2dv (const GLdouble *u);
+extern void APIENTRY glEvalCoord2f (GLfloat u, GLfloat v);
+extern void APIENTRY glEvalCoord2fv (const GLfloat *u);
+extern void APIENTRY glEvalMesh1 (GLenum mode, GLint i1, GLint i2);
+extern void APIENTRY glEvalMesh2 (GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2);
+extern void APIENTRY glEvalPoint1 (GLint i);
+extern void APIENTRY glEvalPoint2 (GLint i, GLint j);
+extern void APIENTRY glFeedbackBuffer (GLsizei size, GLenum type, GLfloat *buffer);
+extern void APIENTRY glFinish (void);
+extern void APIENTRY glFlush (void);
+extern void APIENTRY glFogf (GLenum pname, GLfloat param);
+extern void APIENTRY glFogfv (GLenum pname, const GLfloat *params);
+extern void APIENTRY glFogi (GLenum pname, GLint param);
+extern void APIENTRY glFogiv (GLenum pname, const GLint *params);
+extern void APIENTRY glFrontFace (GLenum mode);
+extern void APIENTRY glFrustum (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
+extern GLuint APIENTRY glGenLists (GLsizei range);
+extern void APIENTRY glGenTextures (GLsizei n, GLuint *textures);
+extern void APIENTRY glGetBooleanv (GLenum pname, GLboolean *params);
+extern void APIENTRY glGetClipPlane (GLenum plane, GLdouble *equation);
+extern void APIENTRY glGetDoublev (GLenum pname, GLdouble *params);
+extern GLenum APIENTRY glGetError (void);
+extern void APIENTRY glGetFloatv (GLenum pname, GLfloat *params);
+extern void APIENTRY glGetIntegerv (GLenum pname, GLint *params);
+extern void APIENTRY glGetLightfv (GLenum light, GLenum pname, GLfloat *params);
+extern void APIENTRY glGetLightiv (GLenum light, GLenum pname, GLint *params);
+extern void APIENTRY glGetMapdv (GLenum target, GLenum query, GLdouble *v);
+extern void APIENTRY glGetMapfv (GLenum target, GLenum query, GLfloat *v);
+extern void APIENTRY glGetMapiv (GLenum target, GLenum query, GLint *v);
+extern void APIENTRY glGetMaterialfv (GLenum face, GLenum pname, GLfloat *params);
+extern void APIENTRY glGetMaterialiv (GLenum face, GLenum pname, GLint *params);
+extern void APIENTRY glGetPixelMapfv (GLenum map, GLfloat *values);
+extern void APIENTRY glGetPixelMapuiv (GLenum map, GLuint *values);
+extern void APIENTRY glGetPixelMapusv (GLenum map, GLushort *values);
+extern void APIENTRY glGetPointerv (GLenum pname, GLvoid* *params);
+extern void APIENTRY glGetPolygonStipple (GLubyte *mask);
+extern const GLubyte * APIENTRY glGetString (GLenum name);
+extern void APIENTRY glGetTexEnvfv (GLenum target, GLenum pname, GLfloat *params);
+extern void APIENTRY glGetTexEnviv (GLenum target, GLenum pname, GLint *params);
+extern void APIENTRY glGetTexGendv (GLenum coord, GLenum pname, GLdouble *params);
+extern void APIENTRY glGetTexGenfv (GLenum coord, GLenum pname, GLfloat *params);
+extern void APIENTRY glGetTexGeniv (GLenum coord, GLenum pname, GLint *params);
+extern void APIENTRY glGetTexImage (GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels);
+extern void APIENTRY glGetTexLevelParameterfv (GLenum target, GLint level, GLenum pname, GLfloat *params);
+extern void APIENTRY glGetTexLevelParameteriv (GLenum target, GLint level, GLenum pname, GLint *params);
+extern void APIENTRY glGetTexParameterfv (GLenum target, GLenum pname, GLfloat *params);
+extern void APIENTRY glGetTexParameteriv (GLenum target, GLenum pname, GLint *params);
+extern void APIENTRY glHint (GLenum target, GLenum mode);
+extern void APIENTRY glIndexMask (GLuint mask);
+extern void APIENTRY glIndexPointer (GLenum type, GLsizei stride, const GLvoid *pointer);
+extern void APIENTRY glIndexd (GLdouble c);
+extern void APIENTRY glIndexdv (const GLdouble *c);
+extern void APIENTRY glIndexf (GLfloat c);
+extern void APIENTRY glIndexfv (const GLfloat *c);
+extern void APIENTRY glIndexi (GLint c);
+extern void APIENTRY glIndexiv (const GLint *c);
+extern void APIENTRY glIndexs (GLshort c);
+extern void APIENTRY glIndexsv (const GLshort *c);
+extern void APIENTRY glIndexub (GLubyte c);
+extern void APIENTRY glIndexubv (const GLubyte *c);
+extern void APIENTRY glInitNames (void);
+extern void APIENTRY glInterleavedArrays (GLenum format, GLsizei stride, const GLvoid *pointer);
+extern GLboolean APIENTRY glIsEnabled (GLenum cap);
+extern GLboolean APIENTRY glIsList (GLuint list);
+extern GLboolean APIENTRY glIsTexture (GLuint texture);
+extern void APIENTRY glLightModelf (GLenum pname, GLfloat param);
+extern void APIENTRY glLightModelfv (GLenum pname, const GLfloat *params);
+extern void APIENTRY glLightModeli (GLenum pname, GLint param);
+extern void APIENTRY glLightModeliv (GLenum pname, const GLint *params);
+extern void APIENTRY glLightf (GLenum light, GLenum pname, GLfloat param);
+extern void APIENTRY glLightfv (GLenum light, GLenum pname, const GLfloat *params);
+extern void APIENTRY glLighti (GLenum light, GLenum pname, GLint param);
+extern void APIENTRY glLightiv (GLenum light, GLenum pname, const GLint *params);
+extern void APIENTRY glLineStipple (GLint factor, GLushort pattern);
+extern void APIENTRY glLineWidth (GLfloat width);
+extern void APIENTRY glListBase (GLuint base);
+extern void APIENTRY glLoadIdentity (void);
+extern void APIENTRY glLoadMatrixd (const GLdouble *m);
+extern void APIENTRY glLoadMatrixf (const GLfloat *m);
+extern void APIENTRY glLoadName (GLuint name);
+extern void APIENTRY glLogicOp (GLenum opcode);
+extern void APIENTRY glMap1d (GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points);
+extern void APIENTRY glMap1f (GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points);
+extern void APIENTRY glMap2d (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points);
+extern void APIENTRY glMap2f (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points);
+extern void APIENTRY glMapGrid1d (GLint un, GLdouble u1, GLdouble u2);
+extern void APIENTRY glMapGrid1f (GLint un, GLfloat u1, GLfloat u2);
+extern void APIENTRY glMapGrid2d (GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2);
+extern void APIENTRY glMapGrid2f (GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2);
+extern void APIENTRY glMaterialf (GLenum face, GLenum pname, GLfloat param);
+extern void APIENTRY glMaterialfv (GLenum face, GLenum pname, const GLfloat *params);
+extern void APIENTRY glMateriali (GLenum face, GLenum pname, GLint param);
+extern void APIENTRY glMaterialiv (GLenum face, GLenum pname, const GLint *params);
+extern void APIENTRY glMatrixMode (GLenum mode);
+extern void APIENTRY glMultMatrixd (const GLdouble *m);
+extern void APIENTRY glMultMatrixf (const GLfloat *m);
+extern void APIENTRY glNewList (GLuint list, GLenum mode);
+extern void APIENTRY glNormal3b (GLbyte nx, GLbyte ny, GLbyte nz);
+extern void APIENTRY glNormal3bv (const GLbyte *v);
+extern void APIENTRY glNormal3d (GLdouble nx, GLdouble ny, GLdouble nz);
+extern void APIENTRY glNormal3dv (const GLdouble *v);
+extern void APIENTRY glNormal3f (GLfloat nx, GLfloat ny, GLfloat nz);
+extern void APIENTRY glNormal3fv (const GLfloat *v);
+extern void APIENTRY glNormal3i (GLint nx, GLint ny, GLint nz);
+extern void APIENTRY glNormal3iv (const GLint *v);
+extern void APIENTRY glNormal3s (GLshort nx, GLshort ny, GLshort nz);
+extern void APIENTRY glNormal3sv (const GLshort *v);
+extern void APIENTRY glNormalPointer (GLenum type, GLsizei stride, const GLvoid *pointer);
+extern void APIENTRY glOrtho (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
+extern void APIENTRY glPassThrough (GLfloat token);
+extern void APIENTRY glPixelMapfv (GLenum map, GLsizei mapsize, const GLfloat *values);
+extern void APIENTRY glPixelMapuiv (GLenum map, GLsizei mapsize, const GLuint *values);
+extern void APIENTRY glPixelMapusv (GLenum map, GLsizei mapsize, const GLushort *values);
+extern void APIENTRY glPixelStoref (GLenum pname, GLfloat param);
+extern void APIENTRY glPixelStorei (GLenum pname, GLint param);
+extern void APIENTRY glPixelTransferf (GLenum pname, GLfloat param);
+extern void APIENTRY glPixelTransferi (GLenum pname, GLint param);
+extern void APIENTRY glPixelZoom (GLfloat xfactor, GLfloat yfactor);
+extern void APIENTRY glPointSize (GLfloat size);
+extern void APIENTRY glPolygonMode (GLenum face, GLenum mode);
+extern void APIENTRY glPolygonOffset (GLfloat factor, GLfloat units);
+extern void APIENTRY glPolygonStipple (const GLubyte *mask);
+extern void APIENTRY glPopAttrib (void);
+extern void APIENTRY glPopClientAttrib (void);
+extern void APIENTRY glPopMatrix (void);
+extern void APIENTRY glPopName (void);
+extern void APIENTRY glPrioritizeTextures (GLsizei n, const GLuint *textures, const GLclampf *priorities);
+extern void APIENTRY glPushAttrib (GLbitfield mask);
+extern void APIENTRY glPushClientAttrib (GLbitfield mask);
+extern void APIENTRY glPushMatrix (void);
+extern void APIENTRY glPushName (GLuint name);
+extern void APIENTRY glRasterPos2d (GLdouble x, GLdouble y);
+extern void APIENTRY glRasterPos2dv (const GLdouble *v);
+extern void APIENTRY glRasterPos2f (GLfloat x, GLfloat y);
+extern void APIENTRY glRasterPos2fv (const GLfloat *v);
+extern void APIENTRY glRasterPos2i (GLint x, GLint y);
+extern void APIENTRY glRasterPos2iv (const GLint *v);
+extern void APIENTRY glRasterPos2s (GLshort x, GLshort y);
+extern void APIENTRY glRasterPos2sv (const GLshort *v);
+extern void APIENTRY glRasterPos3d (GLdouble x, GLdouble y, GLdouble z);
+extern void APIENTRY glRasterPos3dv (const GLdouble *v);
+extern void APIENTRY glRasterPos3f (GLfloat x, GLfloat y, GLfloat z);
+extern void APIENTRY glRasterPos3fv (const GLfloat *v);
+extern void APIENTRY glRasterPos3i (GLint x, GLint y, GLint z);
+
+extern void APIENTRY glRasterPos3iv (const GLint *v);
+extern void APIENTRY glRasterPos3s (GLshort x, GLshort y, GLshort z);
+extern void APIENTRY glRasterPos3sv (const GLshort *v);
+extern void APIENTRY glRasterPos4d (GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+extern void APIENTRY glRasterPos4dv (const GLdouble *v);
+extern void APIENTRY glRasterPos4f (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+extern void APIENTRY glRasterPos4fv (const GLfloat *v);
+extern void APIENTRY glRasterPos4i (GLint x, GLint y, GLint z, GLint w);
+extern void APIENTRY glRasterPos4iv (const GLint *v);
+extern void APIENTRY glRasterPos4s (GLshort x, GLshort y, GLshort z, GLshort w);
+extern void APIENTRY glRasterPos4sv (const GLshort *v);
+extern void APIENTRY glReadBuffer (GLenum mode);
+extern void APIENTRY glReadPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels);
+extern void APIENTRY glRectd (GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2);
+extern void APIENTRY glRectdv (const GLdouble *v1, const GLdouble *v2);
+extern void APIENTRY glRectf (GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2);
+extern void APIENTRY glRectfv (const GLfloat *v1, const GLfloat *v2);
+extern void APIENTRY glRecti (GLint x1, GLint y1, GLint x2, GLint y2);
+extern void APIENTRY glRectiv (const GLint *v1, const GLint *v2);
+extern void APIENTRY glRects (GLshort x1, GLshort y1, GLshort x2, GLshort y2);
+extern void APIENTRY glRectsv (const GLshort *v1, const GLshort *v2);
+extern GLint APIENTRY glRenderMode (GLenum mode);
+extern void APIENTRY glRotated (GLdouble angle, GLdouble x, GLdouble y, GLdouble z);
+extern void APIENTRY glRotatef (GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
+extern void APIENTRY glScaled (GLdouble x, GLdouble y, GLdouble z);
+extern void APIENTRY glScalef (GLfloat x, GLfloat y, GLfloat z);
+extern void APIENTRY glScissor (GLint x, GLint y, GLsizei width, GLsizei height);
+extern void APIENTRY glSelectBuffer (GLsizei size, GLuint *buffer);
+extern void APIENTRY glShadeModel (GLenum mode);
+extern void APIENTRY glStencilFunc (GLenum func, GLint ref, GLuint mask);
+extern void APIENTRY glStencilMask (GLuint mask);
+extern void APIENTRY glStencilOp (GLenum fail, GLenum zfail, GLenum zpass);
+extern void APIENTRY glTexCoord1d (GLdouble s);
+extern void APIENTRY glTexCoord1dv (const GLdouble *v);
+extern void APIENTRY glTexCoord1f (GLfloat s);
+extern void APIENTRY glTexCoord1fv (const GLfloat *v);
+extern void APIENTRY glTexCoord1i (GLint s);
+extern void APIENTRY glTexCoord1iv (const GLint *v);
+extern void APIENTRY glTexCoord1s (GLshort s);
+extern void APIENTRY glTexCoord1sv (const GLshort *v);
+extern void APIENTRY glTexCoord2d (GLdouble s, GLdouble t);
+extern void APIENTRY glTexCoord2dv (const GLdouble *v);
+extern void APIENTRY glTexCoord2f (GLfloat s, GLfloat t);
+extern void APIENTRY glTexCoord2fv (const GLfloat *v);
+extern void APIENTRY glTexCoord2i (GLint s, GLint t);
+extern void APIENTRY glTexCoord2iv (const GLint *v);
+extern void APIENTRY glTexCoord2s (GLshort s, GLshort t);
+extern void APIENTRY glTexCoord2sv (const GLshort *v);
+extern void APIENTRY glTexCoord3d (GLdouble s, GLdouble t, GLdouble r);
+extern void APIENTRY glTexCoord3dv (const GLdouble *v);
+extern void APIENTRY glTexCoord3f (GLfloat s, GLfloat t, GLfloat r);
+extern void APIENTRY glTexCoord3fv (const GLfloat *v);
+extern void APIENTRY glTexCoord3i (GLint s, GLint t, GLint r);
+extern void APIENTRY glTexCoord3iv (const GLint *v);
+extern void APIENTRY glTexCoord3s (GLshort s, GLshort t, GLshort r);
+extern void APIENTRY glTexCoord3sv (const GLshort *v);
+extern void APIENTRY glTexCoord4d (GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+extern void APIENTRY glTexCoord4dv (const GLdouble *v);
+extern void APIENTRY glTexCoord4f (GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+extern void APIENTRY glTexCoord4fv (const GLfloat *v);
+extern void APIENTRY glTexCoord4i (GLint s, GLint t, GLint r, GLint q);
+extern void APIENTRY glTexCoord4iv (const GLint *v);
+extern void APIENTRY glTexCoord4s (GLshort s, GLshort t, GLshort r, GLshort q);
+extern void APIENTRY glTexCoord4sv (const GLshort *v);
+extern void APIENTRY glTexCoordPointer (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+extern void APIENTRY glTexEnvf (GLenum target, GLenum pname, GLfloat param);
+extern void APIENTRY glTexEnvfv (GLenum target, GLenum pname, const GLfloat *params);
+extern void APIENTRY glTexEnvi (GLenum target, GLenum pname, GLint param);
+extern void APIENTRY glTexEnviv (GLenum target, GLenum pname, const GLint *params);
+extern void APIENTRY glTexGend (GLenum coord, GLenum pname, GLdouble param);
+extern void APIENTRY glTexGendv (GLenum coord, GLenum pname, const GLdouble *params);
+extern void APIENTRY glTexGenf (GLenum coord, GLenum pname, GLfloat param);
+extern void APIENTRY glTexGenfv (GLenum coord, GLenum pname, const GLfloat *params);
+extern void APIENTRY glTexGeni (GLenum coord, GLenum pname, GLint param);
+extern void APIENTRY glTexGeniv (GLenum coord, GLenum pname, const GLint *params);
+#ifndef __MACH__
+extern void APIENTRY glTexImage1D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+extern void APIENTRY glTexImage2D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+#endif
+extern void APIENTRY glTexParameterf (GLenum target, GLenum pname, GLfloat param);
+extern void APIENTRY glTexParameterfv (GLenum target, GLenum pname, const GLfloat *params);
+extern void APIENTRY glTexParameteri (GLenum target, GLenum pname, GLint param);
+extern void APIENTRY glTexParameteriv (GLenum target, GLenum pname, const GLint *params);
+extern void APIENTRY glTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
+extern void APIENTRY glTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
+extern void APIENTRY glTranslated (GLdouble x, GLdouble y, GLdouble z);
+extern void APIENTRY glTranslatef (GLfloat x, GLfloat y, GLfloat z);
+extern void APIENTRY glVertex2d (GLdouble x, GLdouble y);
+extern void APIENTRY glVertex2dv (const GLdouble *v);
+extern void APIENTRY glVertex2f (GLfloat x, GLfloat y);
+extern void APIENTRY glVertex2fv (const GLfloat *v);
+extern void APIENTRY glVertex2i (GLint x, GLint y);
+extern void APIENTRY glVertex2iv (const GLint *v);
+extern void APIENTRY glVertex2s (GLshort x, GLshort y);
+extern void APIENTRY glVertex2sv (const GLshort *v);
+extern void APIENTRY glVertex3d (GLdouble x, GLdouble y, GLdouble z);
+extern void APIENTRY glVertex3dv (const GLdouble *v);
+extern void APIENTRY glVertex3f (GLfloat x, GLfloat y, GLfloat z);
+extern void APIENTRY glVertex3fv (const GLfloat *v);
+extern void APIENTRY glVertex3i (GLint x, GLint y, GLint z);
+extern void APIENTRY glVertex3iv (const GLint *v);
+extern void APIENTRY glVertex3s (GLshort x, GLshort y, GLshort z);
+extern void APIENTRY glVertex3sv (const GLshort *v);
+extern void APIENTRY glVertex4d (GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+extern void APIENTRY glVertex4dv (const GLdouble *v);
+extern void APIENTRY glVertex4f (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+extern void APIENTRY glVertex4fv (const GLfloat *v);
+extern void APIENTRY glVertex4i (GLint x, GLint y, GLint z, GLint w);
+extern void APIENTRY glVertex4iv (const GLint *v);
+extern void APIENTRY glVertex4s (GLshort x, GLshort y, GLshort z, GLshort w);
+extern void APIENTRY glVertex4sv (const GLshort *v);
+extern void APIENTRY glVertexPointer (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+extern void APIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei height);
+
+/* OpenGL 1.2 */
+
+#ifndef GL_VERSION_1_2
+#define GL_ARB_imaging 1
+#define GL_VERSION_1_2 1
+#define GL_RESCALE_NORMAL                                       0x803A
+#define GL_CLAMP_TO_EDGE                                        0x812F
+#define GL_MAX_ELEMENTS_VERTICES                                0x80E8
+#define GL_MAX_ELEMENTS_INDICES                                 0x80E9
+#define GL_BGR                                                  0x80E0
+#define GL_BGRA                                                 0x80E1
+#define GL_UNSIGNED_BYTE_3_3_2                                  0x8032
+#define GL_UNSIGNED_BYTE_2_3_3_REV                              0x8362
+#define GL_UNSIGNED_SHORT_5_6_5                                 0x8363
+#define GL_UNSIGNED_SHORT_5_6_5_REV                             0x8364
+#define GL_UNSIGNED_SHORT_4_4_4_4                               0x8033
+#define GL_UNSIGNED_SHORT_4_4_4_4_REV                           0x8365
+#define GL_UNSIGNED_SHORT_5_5_5_1                               0x8034
+#define GL_UNSIGNED_SHORT_1_5_5_5_REV                           0x8366
+#define GL_UNSIGNED_INT_8_8_8_8                                 0x8035
+#define GL_UNSIGNED_INT_8_8_8_8_REV                             0x8367
+#define GL_UNSIGNED_INT_10_10_10_2                              0x8036
+#define GL_UNSIGNED_INT_2_10_10_10_REV                          0x8368
+#define GL_LIGHT_MODEL_COLOR_CONTROL                            0x81F8
+#define GL_SINGLE_COLOR                                         0x81F9
+#define GL_SEPARATE_SPECULAR_COLOR                              0x81FA
+#define GL_TEXTURE_MIN_LOD                                      0x813A
+#define GL_TEXTURE_MAX_LOD                                      0x813B
+#define GL_TEXTURE_BASE_LEVEL                                   0x813C
+#define GL_TEXTURE_MAX_LEVEL                                    0x813D
+#define GL_SMOOTH_POINT_SIZE_RANGE                              0x0B12
+#define GL_SMOOTH_POINT_SIZE_GRANULARITY                        0x0B13
+#define GL_SMOOTH_LINE_WIDTH_RANGE                              0x0B22
+#define GL_SMOOTH_LINE_WIDTH_GRANULARITY                        0x0B23
+#define GL_ALIASED_POINT_SIZE_RANGE                             0x846D
+#define GL_ALIASED_LINE_WIDTH_RANGE                             0x846E
+#define GL_PACK_SKIP_IMAGES                                     0x806B
+#define GL_PACK_IMAGE_HEIGHT                                    0x806C
+#define GL_UNPACK_SKIP_IMAGES                                   0x806D
+#define GL_UNPACK_IMAGE_HEIGHT                                  0x806E
+#define GL_TEXTURE_3D                                           0x806F
+#define GL_PROXY_TEXTURE_3D                                     0x8070
+#define GL_TEXTURE_DEPTH                                        0x8071
+#define GL_TEXTURE_WRAP_R                                       0x8072
+#define GL_MAX_3D_TEXTURE_SIZE                                  0x8073
+#define GL_TEXTURE_BINDING_3D                                   0x806A
+#define GL_COLOR_TABLE                                          0x80D0
+#define GL_POST_CONVOLUTION_COLOR_TABLE                         0x80D1
+#define GL_POST_COLOR_MATRIX_COLOR_TABLE                        0x80D2
+#define GL_PROXY_COLOR_TABLE                                    0x80D3
+#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE                   0x80D4
+#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE                  0x80D5
+#define GL_COLOR_TABLE_SCALE                                    0x80D6
+#define GL_COLOR_TABLE_BIAS                                     0x80D7
+#define GL_COLOR_TABLE_FORMAT                                   0x80D8
+#define GL_COLOR_TABLE_WIDTH                                    0x80D9
+#define GL_COLOR_TABLE_RED_SIZE                                 0x80DA
+#define GL_COLOR_TABLE_GREEN_SIZE                               0x80DB
+#define GL_COLOR_TABLE_BLUE_SIZE                                0x80DC
+#define GL_COLOR_TABLE_ALPHA_SIZE                               0x80DD
+#define GL_COLOR_TABLE_LUMINANCE_SIZE                           0x80DE
+#define GL_COLOR_TABLE_INTENSITY_SIZE                           0x80DF
+#define GL_CONVOLUTION_1D                                       0x8010
+#define GL_CONVOLUTION_2D                                       0x8011
+#define GL_SEPARABLE_2D                                         0x8012
+#define GL_CONVOLUTION_BORDER_MODE                              0x8013
+#define GL_CONVOLUTION_FILTER_SCALE                             0x8014
+#define GL_CONVOLUTION_FILTER_BIAS                              0x8015
+#define GL_REDUCE                                               0x8016
+#define GL_CONVOLUTION_FORMAT                                   0x8017
+#define GL_CONVOLUTION_WIDTH                                    0x8018
+#define GL_CONVOLUTION_HEIGHT                                   0x8019
+#define GL_MAX_CONVOLUTION_WIDTH                                0x801A
+#define GL_MAX_CONVOLUTION_HEIGHT                               0x801B
+#define GL_POST_CONVOLUTION_RED_SCALE                           0x801C
+#define GL_POST_CONVOLUTION_GREEN_SCALE                         0x801D
+#define GL_POST_CONVOLUTION_BLUE_SCALE                          0x801E
+#define GL_POST_CONVOLUTION_ALPHA_SCALE                         0x801F
+#define GL_POST_CONVOLUTION_RED_BIAS                            0x8020
+#define GL_POST_CONVOLUTION_GREEN_BIAS                          0x8021
+#define GL_POST_CONVOLUTION_BLUE_BIAS                           0x8022
+#define GL_POST_CONVOLUTION_ALPHA_BIAS                          0x8023
+#define GL_CONSTANT_BORDER                                      0x8151
+#define GL_REPLICATE_BORDER                                     0x8153
+#define GL_CONVOLUTION_BORDER_COLOR                             0x8154
+#define GL_COLOR_MATRIX                                         0x80B1
+#define GL_COLOR_MATRIX_STACK_DEPTH                             0x80B2
+#define GL_MAX_COLOR_MATRIX_STACK_DEPTH                         0x80B3
+#define GL_POST_COLOR_MATRIX_RED_SCALE                          0x80B4
+#define GL_POST_COLOR_MATRIX_GREEN_SCALE                        0x80B5
+#define GL_POST_COLOR_MATRIX_BLUE_SCALE                         0x80B6
+#define GL_POST_COLOR_MATRIX_ALPHA_SCALE                        0x80B7
+#define GL_POST_COLOR_MATRIX_RED_BIAS                           0x80B8
+#define GL_POST_COLOR_MATRIX_GREEN_BIAS                         0x80B9
+#define GL_POST_COLOR_MATRIX_BLUE_BIAS                          0x80BA
+#define GL_POST_COLOR_MATRIX_ALPHA_BIAS                         0x80BB
+#define GL_HISTOGRAM                                            0x8024
+#define GL_PROXY_HISTOGRAM                                      0x8025
+#define GL_HISTOGRAM_WIDTH                                      0x8026
+#define GL_HISTOGRAM_FORMAT                                     0x8027
+#define GL_HISTOGRAM_RED_SIZE                                   0x8028
+#define GL_HISTOGRAM_GREEN_SIZE                                 0x8029
+#define GL_HISTOGRAM_BLUE_SIZE                                  0x802A
+#define GL_HISTOGRAM_ALPHA_SIZE                                 0x802B
+#define GL_HISTOGRAM_LUMINANCE_SIZE                             0x802C
+#define GL_HISTOGRAM_SINK                                       0x802D
+#define GL_MINMAX                                               0x802E
+#define GL_MINMAX_FORMAT                                        0x802F
+#define GL_MINMAX_SINK                                          0x8030
+#define GL_TABLE_TOO_LARGE                                      0x8031
+#define GL_BLEND_EQUATION                                       0x8009
+#define GL_MIN                                                  0x8007
+#define GL_MAX                                                  0x8008
+#define GL_FUNC_ADD                                             0x8006
+#define GL_FUNC_SUBTRACT                                        0x800A
+#define GL_FUNC_REVERSE_SUBTRACT                                0x800B
+#define GL_BLEND_COLOR                                          0x8005
+#define GL_CONSTANT_COLOR                                       0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR                             0x8002
+#define GL_CONSTANT_ALPHA                                       0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA                             0x8004
+
+typedef void (APIENTRY * glColorTablePROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table );
+typedef void (APIENTRY * glColorSubTablePROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data );
+typedef void (APIENTRY * glColorTableParameterivPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRY * glColorTableParameterfvPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRY * glCopyColorSubTablePROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width );
+typedef void (APIENTRY * glCopyColorTablePROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width );
+typedef void (APIENTRY * glGetColorTablePROC) (GLenum target, GLenum format, GLenum type, GLvoid *table );
+typedef void (APIENTRY * glGetColorTableParameterfvPROC) (GLenum target, GLenum pname, GLfloat *params );
+typedef void (APIENTRY * glGetColorTableParameterivPROC) (GLenum target, GLenum pname, GLint *params );
+typedef void (APIENTRY * glBlendEquationPROC) (GLenum mode );
+typedef void (APIENTRY * glBlendColorPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha );
+typedef void (APIENTRY * glHistogramPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink );
+typedef void (APIENTRY * glResetHistogramPROC) (GLenum target );
+typedef void (APIENTRY * glGetHistogramPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values );
+typedef void (APIENTRY * glGetHistogramParameterfvPROC) (GLenum target, GLenum pname, GLfloat *params );
+typedef void (APIENTRY * glGetHistogramParameterivPROC) (GLenum target, GLenum pname, GLint *params );
+typedef void (APIENTRY * glMinmaxPROC) (GLenum target, GLenum internalformat, GLboolean sink );
+typedef void (APIENTRY * glResetMinmaxPROC) (GLenum target );
+typedef void (APIENTRY * glGetMinmaxPROC) (GLenum target, GLboolean reset, GLenum format, GLenum types, GLvoid *values );
+typedef void (APIENTRY * glGetMinmaxParameterfvPROC) (GLenum target, GLenum pname, GLfloat *params );
+typedef void (APIENTRY * glGetMinmaxParameterivPROC) (GLenum target, GLenum pname, GLint *params );
+typedef void (APIENTRY * glConvolutionFilter1DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image );
+typedef void (APIENTRY * glConvolutionFilter2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image );
+typedef void (APIENTRY * glConvolutionParameterfPROC) (GLenum target, GLenum pname, GLfloat params );
+typedef void (APIENTRY * glConvolutionParameterfvPROC) (GLenum target, GLenum pname, const GLfloat *params );
+typedef void (APIENTRY * glConvolutionParameteriPROC) (GLenum target, GLenum pname, GLint params );
+typedef void (APIENTRY * glConvolutionParameterivPROC) (GLenum target, GLenum pname, const GLint *params );
+typedef void (APIENTRY * glCopyConvolutionFilter1DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width );
+typedef void (APIENTRY * glCopyConvolutionFilter2DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRY * glGetConvolutionFilterPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image );
+typedef void (APIENTRY * glGetConvolutionParameterfvPROC) (GLenum target, GLenum pname, GLfloat *params );
+typedef void (APIENTRY * glGetConvolutionParameterivPROC) (GLenum target, GLenum pname, GLint *params );
+typedef void (APIENTRY * glSeparableFilter2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column );
+typedef void (APIENTRY * glGetSeparableFilterPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span );
+typedef void (APIENTRY * glDrawRangeElementsPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices );
+typedef void (APIENTRY * glTexImage3DPROC) (GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels );
+typedef void (APIENTRY * glTexSubImage3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRY * glCopyTexSubImage3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height );
+
+#ifdef _WIN32
+
+extern glBlendColorPROC glBlendColor;
+LIB_RENDERING_EXPORT
+extern glBlendEquationPROC glBlendEquation;
+extern glColorTablePROC glColorTable;
+extern glColorTableParameterfvPROC glColorTableParameterfv;
+extern glColorTableParameterivPROC glColorTableParameteriv;
+extern glCopyColorTablePROC glCopyColorTable;
+extern glGetColorTablePROC glGetColorTable;
+extern glGetColorTableParameterfvPROC glGetColorTableParameterfv;
+extern glGetColorTableParameterivPROC glGetColorTableParameteriv;
+extern glColorSubTablePROC glColorSubTable;
+extern glCopyColorSubTablePROC glCopyColorSubTable;
+extern glConvolutionFilter1DPROC glConvolutionFilter1D;
+extern glConvolutionFilter2DPROC glConvolutionFilter2D;
+extern glConvolutionParameterfPROC glConvolutionParameterf;
+extern glConvolutionParameterfvPROC glConvolutionParameterfv;
+extern glConvolutionParameteriPROC glConvolutionParameteri;
+extern glConvolutionParameterivPROC glConvolutionParameteriv;
+extern glCopyConvolutionFilter1DPROC glCopyConvolutionFilter1D;
+extern glCopyConvolutionFilter2DPROC glCopyConvolutionFilter2D;
+extern glGetConvolutionFilterPROC glGetConvolutionFilter;
+extern glGetConvolutionParameterfvPROC glGetConvolutionParameterfv;
+extern glGetConvolutionParameterivPROC glGetConvolutionParameteriv;
+extern glGetSeparableFilterPROC glGetSeparableFilter;
+extern glSeparableFilter2DPROC glSeparableFilter2D;
+extern glGetHistogramPROC glGetHistogram;
+extern glGetHistogramParameterfvPROC glGetHistogramParameterfv;
+extern glGetHistogramParameterivPROC glGetHistogramParameteriv;
+extern glGetMinmaxPROC glGetMinmax;
+extern glGetMinmaxParameterfvPROC glGetMinmaxParameterfv;
+extern glGetMinmaxParameterivPROC glGetMinmaxParameteriv;
+extern glHistogramPROC glHistogram;
+extern glMinmaxPROC glMinmax;
+extern glResetHistogramPROC glResetHistogram;
+extern glResetMinmaxPROC glResetMinmax;
+extern glDrawRangeElementsPROC glDrawRangeElements;
+extern glTexImage3DPROC glTexImage3D;
+extern glTexSubImage3DPROC glTexSubImage3D;
+extern glCopyTexSubImage3DPROC glCopyTexSubImage3D;
+
+#else
+
+extern void APIENTRY glColorTable (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table );
+extern void APIENTRY glColorSubTable (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data );
+extern void APIENTRY glColorTableParameteriv (GLenum target, GLenum pname, const GLint *params);
+extern void APIENTRY glColorTableParameterfv (GLenum target, GLenum pname, const GLfloat *params);
+extern void APIENTRY glCopyColorSubTable (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width );
+extern void APIENTRY glCopyColorTable (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width );
+extern void APIENTRY glGetColorTable (GLenum target, GLenum format, GLenum type, GLvoid *table );
+extern void APIENTRY glGetColorTableParameterfv (GLenum target, GLenum pname, GLfloat *params );
+extern void APIENTRY glGetColorTableParameteriv (GLenum target, GLenum pname, GLint *params );
+extern void APIENTRY glBlendEquation (GLenum mode );
+extern void APIENTRY glBlendColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha );
+extern void APIENTRY glHistogram (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink );
+extern void APIENTRY glResetHistogram (GLenum target );
+extern void APIENTRY glGetHistogram (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values );
+extern void APIENTRY glGetHistogramParameterfv (GLenum target, GLenum pname, GLfloat *params );
+extern void APIENTRY glGetHistogramParameteriv (GLenum target, GLenum pname, GLint *params );
+extern void APIENTRY glMinmax (GLenum target, GLenum internalformat, GLboolean sink );
+extern void APIENTRY glResetMinmax (GLenum target );
+extern void APIENTRY glGetMinmax (GLenum target, GLboolean reset, GLenum format, GLenum types, GLvoid *values );
+extern void APIENTRY glGetMinmaxParameterfv (GLenum target, GLenum pname, GLfloat *params );
+extern void APIENTRY glGetMinmaxParameteriv (GLenum target, GLenum pname, GLint *params );
+extern void APIENTRY glConvolutionFilter1D (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image );
+extern void APIENTRY glConvolutionFilter2D (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image );
+extern void APIENTRY glConvolutionParameterf (GLenum target, GLenum pname, GLfloat params );
+extern void APIENTRY glConvolutionParameterfv (GLenum target, GLenum pname, const GLfloat *params );
+extern void APIENTRY glConvolutionParameteri (GLenum target, GLenum pname, GLint params );
+extern void APIENTRY glConvolutionParameteriv (GLenum target, GLenum pname, const GLint *params );
+extern void APIENTRY glCopyConvolutionFilter1D (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width );
+extern void APIENTRY glCopyConvolutionFilter2D (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
+extern void APIENTRY glGetConvolutionFilter (GLenum target, GLenum format, GLenum type, GLvoid *image );
+extern void APIENTRY glGetConvolutionParameterfv (GLenum target, GLenum pname, GLfloat *params );
+extern void APIENTRY glGetConvolutionParameteriv (GLenum target, GLenum pname, GLint *params );
+extern void APIENTRY glSeparableFilter2D (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column );
+extern void APIENTRY glGetSeparableFilter (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span );
+extern void APIENTRY glDrawRangeElements (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices );
+extern void APIENTRY glTexImage3D (GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels );
+extern void APIENTRY glTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+extern void APIENTRY glCopyTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height );
+
+#endif /* WIN32 */
+
+#endif /* GL_VERSION_1_2 */
+
+/* OpenGL 1.3 */
+
+#ifndef GL_VERSION_1_3
+#define GL_VERSION_1_3 1
+#define GL_TEXTURE0                                             0x84C0
+#define GL_TEXTURE1                                             0x84C1
+#define GL_TEXTURE2                                             0x84C2
+#define GL_TEXTURE3                                             0x84C3
+#define GL_TEXTURE4                                             0x84C4
+#define GL_TEXTURE5                                             0x84C5
+#define GL_TEXTURE6                                             0x84C6
+#define GL_TEXTURE7                                             0x84C7
+#define GL_TEXTURE8                                             0x84C8
+#define GL_TEXTURE9                                             0x84C9
+#define GL_TEXTURE10                                            0x84CA
+#define GL_TEXTURE11                                            0x84CB
+#define GL_TEXTURE12                                            0x84CC
+#define GL_TEXTURE13                                            0x84CD
+#define GL_TEXTURE14                                            0x84CE
+#define GL_TEXTURE15                                            0x84CF
+#define GL_TEXTURE16                                            0x84D0
+#define GL_TEXTURE17                                            0x84D1
+#define GL_TEXTURE18                                            0x84D2
+#define GL_TEXTURE19                                            0x84D3
+#define GL_TEXTURE20                                            0x84D4
+#define GL_TEXTURE21                                            0x84D5
+#define GL_TEXTURE22                                            0x84D6
+#define GL_TEXTURE23                                            0x84D7
+#define GL_TEXTURE24                                            0x84D8
+#define GL_TEXTURE25                                            0x84D9
+#define GL_TEXTURE26                                            0x84DA
+#define GL_TEXTURE27                                            0x84DB
+#define GL_TEXTURE28                                            0x84DC
+#define GL_TEXTURE29                                            0x84DD
+#define GL_TEXTURE30                                            0x84DE
+#define GL_TEXTURE31                                            0x84DF
+#define GL_ACTIVE_TEXTURE                                       0x84E0
+#define GL_CLIENT_ACTIVE_TEXTURE                                0x84E1
+#define GL_MAX_TEXTURE_UNITS                                    0x84E2
+
+#define GL_NORMAL_MAP                                           0x8511
+#define GL_REFLECTION_MAP                                       0x8512
+#define GL_TEXTURE_CUBE_MAP                                     0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP                             0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X                          0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X                          0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y                          0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y                          0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z                          0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z                          0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP                               0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE                            0x851C
+
+#define GL_COMPRESSED_ALPHA                                     0x84E9
+#define GL_COMPRESSED_LUMINANCE                                 0x84EA
+#define GL_COMPRESSED_LUMINANCE_ALPHA                           0x84EB
+#define GL_COMPRESSED_INTENSITY                                 0x84EC
+#define GL_COMPRESSED_RGB                                       0x84ED
+#define GL_COMPRESSED_RGBA                                      0x84EE
+#define GL_TEXTURE_COMPRESSION_HINT                             0x84EF
+#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE                        0x86A0
+#define GL_TEXTURE_COMPRESSED                                   0x86A1
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS                       0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS                           0x86A3
+
+#define GL_MULTISAMPLE                                          0x809D
+#define GL_SAMPLE_ALPHA_TO_COVERAGE                             0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE                                  0x809F
+#define GL_SAMPLE_COVERAGE                                      0x80A0
+#define GL_SAMPLE_BUFFERS                                       0x80A8
+#define GL_SAMPLES                                              0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE                                0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT                               0x80AB
+#define GL_MULTISAMPLE_BIT                                      0x20000000
+
+#define GL_TRANSPOSE_MODELVIEW_MATRIX                           0x84E3
+#define GL_TRANSPOSE_PROJECTION_MATRIX                          0x84E4
+#define GL_TRANSPOSE_TEXTURE_MATRIX                             0x84E5
+#define GL_TRANSPOSE_COLOR_MATRIX                               0x84E6
+
+#define GL_COMBINE                                              0x8570
+#define GL_COMBINE_RGB                                          0x8571
+#define GL_COMBINE_ALPHA                                        0x8572
+#define GL_SOURCE0_RGB                                          0x8580
+#define GL_SOURCE1_RGB                                          0x8581
+#define GL_SOURCE2_RGB                                          0x8582
+#define GL_SOURCE0_ALPHA                                        0x8588
+#define GL_SOURCE1_ALPHA                                        0x8589
+#define GL_SOURCE2_ALPHA                                        0x858A
+#define GL_OPERAND0_RGB                                         0x8590
+#define GL_OPERAND1_RGB                                         0x8591
+#define GL_OPERAND2_RGB                                         0x8592
+#define GL_OPERAND0_ALPHA                                       0x8598
+#define GL_OPERAND1_ALPHA                                       0x8599
+#define GL_OPERAND2_ALPHA                                       0x859A
+#define GL_RGB_SCALE                                            0x8573
+#define GL_ADD_SIGNED                                           0x8574
+#define GL_INTERPOLATE                                          0x8575
+#define GL_SUBTRACT                                             0x84E7
+#define GL_CONSTANT                                             0x8576
+#define GL_PRIMARY_COLOR                                        0x8577
+#define GL_PREVIOUS                                             0x8578
+#define GL_DOT3_RGB                                             0x86AE
+#define GL_DOT3_RGBA                                            0x86AF
+#define GL_CLAMP_TO_BORDER                                      0x812D
+
+typedef void (APIENTRY * glActiveTexturePROC) (GLenum texture );
+typedef void (APIENTRY * glClientActiveTexturePROC) (GLenum texture );
+typedef void (APIENTRY * glCompressedTexImage1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data );
+typedef void (APIENTRY * glCompressedTexImage2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data );
+typedef void (APIENTRY * glCompressedTexImage3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data );
+typedef void (APIENTRY * glCompressedTexSubImage1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data );
+typedef void (APIENTRY * glCompressedTexSubImage2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data );
+typedef void (APIENTRY * glCompressedTexSubImage3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data );
+typedef void (APIENTRY * glGetCompressedTexImagePROC) (GLenum target, GLint lod, GLvoid *img );
+typedef void (APIENTRY * glMultiTexCoord1dPROC) (GLenum target, GLdouble s );
+typedef void (APIENTRY * glMultiTexCoord1dvPROC) (GLenum target, const GLdouble *v );
+typedef void (APIENTRY * glMultiTexCoord1fPROC) (GLenum target, GLfloat s );
+typedef void (APIENTRY * glMultiTexCoord1fvPROC) (GLenum target, const GLfloat *v );
+typedef void (APIENTRY * glMultiTexCoord1iPROC) (GLenum target, GLint s );
+typedef void (APIENTRY * glMultiTexCoord1ivPROC) (GLenum target, const GLint *v );
+typedef void (APIENTRY * glMultiTexCoord1sPROC) (GLenum target, GLshort s );
+typedef void (APIENTRY * glMultiTexCoord1svPROC) (GLenum target, const GLshort *v );
+typedef void (APIENTRY * glMultiTexCoord2dPROC) (GLenum target, GLdouble s, GLdouble t );
+typedef void (APIENTRY * glMultiTexCoord2dvPROC) (GLenum target, const GLdouble *v );
+typedef void (APIENTRY * glMultiTexCoord2fPROC) (GLenum target, GLfloat s, GLfloat t );
+typedef void (APIENTRY * glMultiTexCoord2fvPROC) (GLenum target, const GLfloat *v );
+typedef void (APIENTRY * glMultiTexCoord2iPROC) (GLenum target, GLint s, GLint t );
+typedef void (APIENTRY * glMultiTexCoord2ivPROC) (GLenum target, const GLint *v );
+typedef void (APIENTRY * glMultiTexCoord2sPROC) (GLenum target, GLshort s, GLshort t );
+typedef void (APIENTRY * glMultiTexCoord2svPROC) (GLenum target, const GLshort *v );
+typedef void (APIENTRY * glMultiTexCoord3dPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r );
+typedef void (APIENTRY * glMultiTexCoord3dvPROC) (GLenum target, const GLdouble *v );
+typedef void (APIENTRY * glMultiTexCoord3fPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r );
+typedef void (APIENTRY * glMultiTexCoord3fvPROC) (GLenum target, const GLfloat *v );
+typedef void (APIENTRY * glMultiTexCoord3iPROC) (GLenum target, GLint s, GLint t, GLint r );
+typedef void (APIENTRY * glMultiTexCoord3ivPROC) (GLenum target, const GLint *v );
+typedef void (APIENTRY * glMultiTexCoord3sPROC) (GLenum target, GLshort s, GLshort t, GLshort r );
+typedef void (APIENTRY * glMultiTexCoord3svPROC) (GLenum target, const GLshort *v );
+typedef void (APIENTRY * glMultiTexCoord4dPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q );
+typedef void (APIENTRY * glMultiTexCoord4dvPROC) (GLenum target, const GLdouble *v );
+typedef void (APIENTRY * glMultiTexCoord4fPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q );
+typedef void (APIENTRY * glMultiTexCoord4fvPROC) (GLenum target, const GLfloat *v );
+typedef void (APIENTRY * glMultiTexCoord4iPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q );
+typedef void (APIENTRY * glMultiTexCoord4ivPROC) (GLenum target, const GLint *v );
+typedef void (APIENTRY * glMultiTexCoord4sPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q );
+typedef void (APIENTRY * glMultiTexCoord4svPROC) (GLenum target, const GLshort *v );
+typedef void (APIENTRY * glLoadTransposeMatrixdPROC) (const GLdouble m[16] );
+typedef void (APIENTRY * glLoadTransposeMatrixfPROC) (const GLfloat m[16] );
+typedef void (APIENTRY * glMultTransposeMatrixdPROC) (const GLdouble m[16] );
+typedef void (APIENTRY * glMultTransposeMatrixfPROC) (const GLfloat m[16] );
+typedef void (APIENTRY * glSampleCoveragePROC) (GLclampf value, GLboolean invert );
+
+#ifdef _WIN32
+
+extern glActiveTexturePROC glActiveTexture;
+extern glClientActiveTexturePROC glClientActiveTexture;
+extern glMultiTexCoord1dPROC glMultiTexCoord1d;
+extern glMultiTexCoord1dvPROC glMultiTexCoord1dv;
+extern glMultiTexCoord1fPROC glMultiTexCoord1f;
+extern glMultiTexCoord1fvPROC glMultiTexCoord1fv;
+extern glMultiTexCoord1iPROC glMultiTexCoord1i;
+extern glMultiTexCoord1ivPROC glMultiTexCoord1iv;
+extern glMultiTexCoord1sPROC glMultiTexCoord1s;
+extern glMultiTexCoord1svPROC glMultiTexCoord1sv;
+extern glMultiTexCoord2dPROC glMultiTexCoord2d;
+extern glMultiTexCoord2dvPROC glMultiTexCoord2dv;
+extern glMultiTexCoord2fPROC glMultiTexCoord2f;
+extern glMultiTexCoord2fvPROC glMultiTexCoord2fv;
+extern glMultiTexCoord2iPROC glMultiTexCoord2i;
+extern glMultiTexCoord2ivPROC glMultiTexCoord2iv;
+extern glMultiTexCoord2sPROC glMultiTexCoord2s;
+extern glMultiTexCoord2svPROC glMultiTexCoord2sv;
+extern glMultiTexCoord3dPROC glMultiTexCoord3d;
+extern glMultiTexCoord3dvPROC glMultiTexCoord3dv;
+extern glMultiTexCoord3fPROC glMultiTexCoord3f;
+extern glMultiTexCoord3fvPROC glMultiTexCoord3fv;
+extern glMultiTexCoord3iPROC glMultiTexCoord3i;
+extern glMultiTexCoord3ivPROC glMultiTexCoord3iv;
+extern glMultiTexCoord3sPROC glMultiTexCoord3s;
+extern glMultiTexCoord3svPROC glMultiTexCoord3sv;
+extern glMultiTexCoord4dPROC glMultiTexCoord4d;
+extern glMultiTexCoord4dvPROC glMultiTexCoord4dv;
+extern glMultiTexCoord4fPROC glMultiTexCoord4f;
+extern glMultiTexCoord4fvPROC glMultiTexCoord4fv;
+extern glMultiTexCoord4iPROC glMultiTexCoord4i;
+extern glMultiTexCoord4ivPROC glMultiTexCoord4iv;
+extern glMultiTexCoord4sPROC glMultiTexCoord4s;
+extern glMultiTexCoord4svPROC glMultiTexCoord4sv;
+extern glLoadTransposeMatrixfPROC glLoadTransposeMatrixf;
+extern glLoadTransposeMatrixdPROC glLoadTransposeMatrixd;
+extern glMultTransposeMatrixfPROC glMultTransposeMatrixf;
+extern glMultTransposeMatrixdPROC glMultTransposeMatrixd;
+extern glCompressedTexImage3DPROC glCompressedTexImage3D;
+extern glCompressedTexImage2DPROC glCompressedTexImage2D;
+extern glCompressedTexImage1DPROC glCompressedTexImage1D;
+extern glCompressedTexSubImage3DPROC glCompressedTexSubImage3D;
+extern glCompressedTexSubImage2DPROC glCompressedTexSubImage2D;
+extern glCompressedTexSubImage1DPROC glCompressedTexSubImage1D;
+extern glGetCompressedTexImagePROC glGetCompressedTexImage;
+extern glSampleCoveragePROC glSampleCoverage;
+
+#else
+
+extern void APIENTRY glActiveTexture (GLenum texture );
+extern void APIENTRY glClientActiveTexture (GLenum texture );
+extern void APIENTRY glCompressedTexImage1D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data );
+extern void APIENTRY glCompressedTexImage2D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data );
+extern void APIENTRY glCompressedTexImage3D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data );
+extern void APIENTRY glCompressedTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data );
+extern void APIENTRY glCompressedTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data );
+extern void APIENTRY glCompressedTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data );
+extern void APIENTRY glGetCompressedTexImage (GLenum target, GLint lod, GLvoid *img );
+extern void APIENTRY glMultiTexCoord1d (GLenum target, GLdouble s );
+extern void APIENTRY glMultiTexCoord1dv (GLenum target, const GLdouble *v );
+extern void APIENTRY glMultiTexCoord1f (GLenum target, GLfloat s );
+extern void APIENTRY glMultiTexCoord1fv (GLenum target, const GLfloat *v );
+extern void APIENTRY glMultiTexCoord1i (GLenum target, GLint s );
+extern void APIENTRY glMultiTexCoord1iv (GLenum target, const GLint *v );
+extern void APIENTRY glMultiTexCoord1s (GLenum target, GLshort s );
+extern void APIENTRY glMultiTexCoord1sv (GLenum target, const GLshort *v );
+extern void APIENTRY glMultiTexCoord2d (GLenum target, GLdouble s, GLdouble t );
+extern void APIENTRY glMultiTexCoord2dv (GLenum target, const GLdouble *v );
+extern void APIENTRY glMultiTexCoord2f (GLenum target, GLfloat s, GLfloat t );
+extern void APIENTRY glMultiTexCoord2fv (GLenum target, const GLfloat *v );
+extern void APIENTRY glMultiTexCoord2i (GLenum target, GLint s, GLint t );
+extern void APIENTRY glMultiTexCoord2iv (GLenum target, const GLint *v );
+extern void APIENTRY glMultiTexCoord2s (GLenum target, GLshort s, GLshort t );
+extern void APIENTRY glMultiTexCoord2sv (GLenum target, const GLshort *v );
+extern void APIENTRY glMultiTexCoord3d (GLenum target, GLdouble s, GLdouble t, GLdouble r );
+extern void APIENTRY glMultiTexCoord3dv (GLenum target, const GLdouble *v );
+extern void APIENTRY glMultiTexCoord3f (GLenum target, GLfloat s, GLfloat t, GLfloat r );
+extern void APIENTRY glMultiTexCoord3fv (GLenum target, const GLfloat *v );
+extern void APIENTRY glMultiTexCoord3i (GLenum target, GLint s, GLint t, GLint r );
+extern void APIENTRY glMultiTexCoord3iv (GLenum target, const GLint *v );
+extern void APIENTRY glMultiTexCoord3s (GLenum target, GLshort s, GLshort t, GLshort r );
+extern void APIENTRY glMultiTexCoord3sv (GLenum target, const GLshort *v );
+extern void APIENTRY glMultiTexCoord4d (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q );
+extern void APIENTRY glMultiTexCoord4dv (GLenum target, const GLdouble *v );
+extern void APIENTRY glMultiTexCoord4f (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q );
+extern void APIENTRY glMultiTexCoord4fv (GLenum target, const GLfloat *v );
+extern void APIENTRY glMultiTexCoord4i (GLenum target, GLint s, GLint t, GLint r, GLint q );
+extern void APIENTRY glMultiTexCoord4iv (GLenum target, const GLint *v );
+extern void APIENTRY glMultiTexCoord4s (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q );
+extern void APIENTRY glMultiTexCoord4sv (GLenum target, const GLshort *v );
+extern void APIENTRY glLoadTransposeMatrixd (const GLdouble m[16] );
+extern void APIENTRY glLoadTransposeMatrixf (const GLfloat m[16] );
+extern void APIENTRY glMultTransposeMatrixd (const GLdouble m[16] );
+extern void APIENTRY glMultTransposeMatrixf (const GLfloat m[16] );
+extern void APIENTRY glSampleCoverage (GLclampf value, GLboolean invert );
+
+#endif /* WIN32 */
+
+#endif /* GL_VERSION_1_3 */
+
+/* OpenGL 1.4 */
+
+#ifndef GL_VERSION_1_4
+#define GL_VERSION_1_4
+
+/*#ifndef GL_VERSION_1_2
+#define GL_BLEND_EQUATION                                       0x8009
+#define GL_MIN                                                  0x8007
+#define GL_MAX                                                  0x8008
+#define GL_FUNC_ADD                                             0x8006
+#define GL_FUNC_SUBTRACT                                        0x800A
+#define GL_FUNC_REVERSE_SUBTRACT                                0x800B
+#define GL_BLEND_COLOR                                          0x8005
+#define GL_CONSTANT_COLOR                                       0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR                             0x8002
+#define GL_CONSTANT_ALPHA                                       0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA                             0x8004
+#endif *//* GL_VERSION_1_2 */
+
+#define GL_GENERATE_MIPMAP                                      0x8191
+#define GL_GENERATE_MIPMAP_HINT                                 0x8192
+#define GL_DEPTH_COMPONENT16                                    0x81A5
+#define GL_DEPTH_COMPONENT24                                    0x81A6
+#define GL_DEPTH_COMPONENT32                                    0x81A7
+#define GL_TEXTURE_DEPTH_SIZE                                   0x884A
+#define GL_DEPTH_TEXTURE_MODE                                   0x884B
+#define GL_TEXTURE_COMPARE_MODE                                 0x884C
+#define GL_TEXTURE_COMPARE_FUNC                                 0x884D
+#define GL_COMPARE_R_TO_TEXTURE                                 0x884E
+#define GL_FOG_COORDINATE_SOURCE                                0x8450
+#define GL_FOG_COORDINATE                                       0x8451
+#define GL_FRAGMENT_DEPTH                                       0x8452
+#define GL_CURRENT_FOG_COORDINATE                               0x8453
+#define GL_FOG_COORDINATE_ARRAY_TYPE                            0x8454
+#define GL_FOG_COORDINATE_ARRAY_STRIDE                          0x8455
+#define GL_FOG_COORDINATE_ARRAY_POINTER                         0x8456
+#define GL_FOG_COORDINATE_ARRAY                                 0x8457
+#define GL_POINT_SIZE_MIN                                       0x8126
+#define GL_POINT_SIZE_MAX                                       0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE                            0x8128
+#define GL_POINT_DISTANCE_ATTENUATION                           0x8129
+#define GL_COLOR_SUM                                            0x8458
+#define GL_CURRENT_SECONDARY_COLOR                              0x8459
+#define GL_SECONDARY_COLOR_ARRAY_SIZE                           0x845A
+#define GL_SECONDARY_COLOR_ARRAY_TYPE                           0x845B
+#define GL_SECONDARY_COLOR_ARRAY_STRIDE                         0x845C
+#define GL_SECONDARY_COLOR_ARRAY_POINTER                        0x845D
+#define GL_SECONDARY_COLOR_ARRAY                                0x845E
+#define GL_BLEND_DST_RGB                                        0x80C8
+#define GL_BLEND_SRC_RGB                                        0x80C9
+#define GL_BLEND_DST_ALPHA                                      0x80CA
+#define GL_BLEND_SRC_ALPHA                                      0x80CB
+#define GL_INCR_WRAP                                            0x8507
+#define GL_DECR_WRAP                                            0x8508
+#define GL_TEXTURE_FILTER_CONTROL                               0x8500
+#define GL_TEXTURE_LOD_BIAS                                     0x8501
+#define GL_MAX_TEXTURE_LOD_BIAS                                 0x84FD
+#define GL_GL_MIRRORED_REPEAT                                   0x8370
+
+/*#ifndef GL_VERSION_1_2
+typedef void (APIENTRY * glBlendEquationPROC) (GLenum mode );
+typedef void (APIENTRY * glBlendColorPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha );
+#endif *//* GL_VERSION_1_2 */
+typedef void (APIENTRY * glFogCoordfPROC) (GLfloat coord);
+typedef void (APIENTRY * glFogCoordfvPROC) (const GLfloat *coord);
+typedef void (APIENTRY * glFogCoorddPROC) (GLdouble coord);
+typedef void (APIENTRY * glFogCoorddvPROC) (const GLdouble *coord);
+typedef void (APIENTRY * glFogCoordPointerPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRY * glMultiDrawArraysPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
+typedef void (APIENTRY * glMultiDrawElementsPROC) (GLenum mode, GLsizei *count, GLenum type, const GLvoid **indices, GLsizei primcount);
+typedef void (APIENTRY * glPointParameterfPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRY * glPointParameterfvPROC) (GLenum pname, GLfloat *params);
+typedef void (APIENTRY * glSecondaryColor3bPROC) (GLbyte red, GLbyte green, GLbyte blue);
+typedef void (APIENTRY * glSecondaryColor3bvPROC) (const GLbyte *v);
+typedef void (APIENTRY * glSecondaryColor3dPROC) (GLdouble red, GLdouble green, GLdouble blue);
+typedef void (APIENTRY * glSecondaryColor3dvPROC) (const GLdouble *v);
+typedef void (APIENTRY * glSecondaryColor3fPROC) (GLfloat red, GLfloat green, GLfloat blue);
+typedef void (APIENTRY * glSecondaryColor3fvPROC) (const GLfloat *v);
+typedef void (APIENTRY * glSecondaryColor3iPROC) (GLint red, GLint green, GLint blue);
+typedef void (APIENTRY * glSecondaryColor3ivPROC) (const GLint *v);
+typedef void (APIENTRY * glSecondaryColor3sPROC) (GLshort red, GLshort green, GLshort blue);
+typedef void (APIENTRY * glSecondaryColor3svPROC) (const GLshort *v);
+typedef void (APIENTRY * glSecondaryColor3ubPROC) (GLubyte red, GLubyte green, GLubyte blue);
+typedef void (APIENTRY * glSecondaryColor3ubvPROC) (const GLubyte *v);
+typedef void (APIENTRY * glSecondaryColor3uiPROC) (GLuint red, GLuint green, GLuint blue);
+typedef void (APIENTRY * glSecondaryColor3uivPROC) (const GLuint *v);
+typedef void (APIENTRY * glSecondaryColor3usPROC) (GLushort red, GLushort green, GLushort blue);
+typedef void (APIENTRY * glSecondaryColor3usvPROC) (const GLushort *v);
+typedef void (APIENTRY * glSecondaryColorPointerPROC) (GLint size, GLenum type, GLsizei stride, GLvoid *pointer);
+typedef void (APIENTRY * glBlendFuncSeparatePROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+typedef void (APIENTRY * glWindowPos2dPROC) (GLdouble x, GLdouble y);
+typedef void (APIENTRY * glWindowPos2fPROC) (GLfloat x, GLfloat y);
+typedef void (APIENTRY * glWindowPos2iPROC) (GLint x, GLint y);
+typedef void (APIENTRY * glWindowPos2sPROC) (GLshort x, GLshort y);
+typedef void (APIENTRY * glWindowPos2dvPROC) (const GLdouble *p);
+typedef void (APIENTRY * glWindowPos2fvPROC) (const GLfloat *p);
+typedef void (APIENTRY * glWindowPos2ivPROC) (const GLint *p);
+typedef void (APIENTRY * glWindowPos2svPROC) (const GLshort *p);
+typedef void (APIENTRY * glWindowPos3dPROC) (GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRY * glWindowPos3fPROC) (GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRY * glWindowPos3iPROC) (GLint x, GLint y, GLint z);
+typedef void (APIENTRY * glWindowPos3sPROC) (GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRY * glWindowPos3dvPROC) (const GLdouble *p);
+typedef void (APIENTRY * glWindowPos3fvPROC) (const GLfloat *p);
+typedef void (APIENTRY * glWindowPos3ivPROC) (const GLint *p);
+typedef void (APIENTRY * glWindowPos3svPROC) (const GLshort *p);
+
+/*#ifndef GL_VERSION_1_2
+extern glBlendColorPROC glBlendColor;
+extern glBlendEquationPROC glBlendEquation;
+#endif *//* GL_VERSION_1_2 */
+
+#ifdef _WIN32
+
+extern glFogCoordfPROC glFogCoordf;
+extern glFogCoordfvPROC glFogCoordfv;
+extern glFogCoorddPROC glFogCoordd;
+extern glFogCoorddvPROC glFogCoorddv;
+extern glFogCoordPointerPROC glFogCoordPointer;
+extern glMultiDrawArraysPROC glMultiDrawArrays;
+extern glMultiDrawElementsPROC glMultiDrawElements;
+extern glPointParameterfPROC glPointParameterf;
+extern glPointParameterfvPROC glPointParameterfv;
+extern glSecondaryColor3bPROC glSecondaryColor3b;
+extern glSecondaryColor3bvPROC glSecondaryColor3bv;
+extern glSecondaryColor3dPROC glSecondaryColor3d;
+extern glSecondaryColor3dvPROC glSecondaryColor3dv;
+extern glSecondaryColor3fPROC glSecondaryColor3f;
+extern glSecondaryColor3fvPROC glSecondaryColor3fv;
+extern glSecondaryColor3iPROC glSecondaryColor3i;
+extern glSecondaryColor3ivPROC glSecondaryColor3iv;
+extern glSecondaryColor3sPROC glSecondaryColor3s;
+extern glSecondaryColor3svPROC glSecondaryColor3sv;
+extern glSecondaryColor3ubPROC glSecondaryColor3ub;
+extern glSecondaryColor3ubvPROC glSecondaryColor3ubv;
+extern glSecondaryColor3uiPROC glSecondaryColor3ui;
+extern glSecondaryColor3uivPROC glSecondaryColor3uiv;
+extern glSecondaryColor3usPROC glSecondaryColor3us;
+extern glSecondaryColor3usvPROC glSecondaryColor3usv;
+extern glSecondaryColorPointerPROC glSecondaryColorPointer;
+extern glBlendFuncSeparatePROC glBlendFuncSeparate;
+extern glWindowPos2dPROC glWindowPos2d;
+extern glWindowPos2fPROC glWindowPos2f;
+extern glWindowPos2iPROC glWindowPos2i;
+extern glWindowPos2sPROC glWindowPos2s;
+extern glWindowPos2dvPROC glWindowPos2dv;
+extern glWindowPos2fvPROC glWindowPos2fv;
+extern glWindowPos2ivPROC glWindowPos2iv;
+extern glWindowPos2svPROC glWindowPos2sv;
+extern glWindowPos3dPROC glWindowPos3d;
+extern glWindowPos3fPROC glWindowPos3f;
+extern glWindowPos3iPROC glWindowPos3i;
+extern glWindowPos3sPROC glWindowPos3s;
+extern glWindowPos3dvPROC glWindowPos3dv;
+extern glWindowPos3fvPROC glWindowPos3fv;
+extern glWindowPos3ivPROC glWindowPos3iv;
+extern glWindowPos3svPROC glWindowPos3sv;
+
+#else
+
+extern void APIENTRY glFogCoordf (GLfloat coord);
+extern void APIENTRY glFogCoordfv (const GLfloat *coord);
+extern void APIENTRY glFogCoordd (GLdouble coord);
+extern void APIENTRY glFogCoorddv (const GLdouble *coord);
+extern void APIENTRY glFogCoordPointer (GLenum type, GLsizei stride, const GLvoid *pointer);
+extern void APIENTRY glMultiDrawArrays (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
+extern void APIENTRY glMultiDrawElements (GLenum mode, GLsizei *count, GLenum type, const GLvoid **indices, GLsizei primcount);
+extern void APIENTRY glPointParameterf (GLenum pname, GLfloat param);
+extern void APIENTRY glPointParameterfv (GLenum pname, GLfloat *params);
+extern void APIENTRY glSecondaryColor3b (GLbyte red, GLbyte green, GLbyte blue);
+extern void APIENTRY glSecondaryColor3bv (const GLbyte *v);
+extern void APIENTRY glSecondaryColor3d (GLdouble red, GLdouble green, GLdouble blue);
+extern void APIENTRY glSecondaryColor3dv (const GLdouble *v);
+extern void APIENTRY glSecondaryColor3f (GLfloat red, GLfloat green, GLfloat blue);
+extern void APIENTRY glSecondaryColor3fv (const GLfloat *v);
+extern void APIENTRY glSecondaryColor3i (GLint red, GLint green, GLint blue);
+extern void APIENTRY glSecondaryColor3iv (const GLint *v);
+extern void APIENTRY glSecondaryColor3s (GLshort red, GLshort green, GLshort blue);
+extern void APIENTRY glSecondaryColor3sv (const GLshort *v);
+extern void APIENTRY glSecondaryColor3ub (GLubyte red, GLubyte green, GLubyte blue);
+extern void APIENTRY glSecondaryColor3ubv (const GLubyte *v);
+extern void APIENTRY glSecondaryColor3ui (GLuint red, GLuint green, GLuint blue);
+extern void APIENTRY glSecondaryColor3uiv (const GLuint *v);
+extern void APIENTRY glSecondaryColor3us (GLushort red, GLushort green, GLushort blue);
+extern void APIENTRY glSecondaryColor3usv (const GLushort *v);
+extern void APIENTRY glSecondaryColorPointer (GLint size, GLenum type, GLsizei stride, GLvoid *pointer);
+extern void APIENTRY glBlendFuncSeparate (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+extern void APIENTRY glWindowPos2d (GLdouble x, GLdouble y);
+extern void APIENTRY glWindowPos2f (GLfloat x, GLfloat y);
+extern void APIENTRY glWindowPos2i (GLint x, GLint y);
+extern void APIENTRY glWindowPos2s (GLshort x, GLshort y);
+extern void APIENTRY glWindowPos2dv (const GLdouble *p);
+extern void APIENTRY glWindowPos2fv (const GLfloat *p);
+extern void APIENTRY glWindowPos2iv (const GLint *p);
+extern void APIENTRY glWindowPos2sv (const GLshort *p);
+extern void APIENTRY glWindowPos3d (GLdouble x, GLdouble y, GLdouble z);
+extern void APIENTRY glWindowPos3f (GLfloat x, GLfloat y, GLfloat z);
+extern void APIENTRY glWindowPos3i (GLint x, GLint y, GLint z);
+extern void APIENTRY glWindowPos3s (GLshort x, GLshort y, GLshort z);
+extern void APIENTRY glWindowPos3dv (const GLdouble *p);
+extern void APIENTRY glWindowPos3fv (const GLfloat *p);
+extern void APIENTRY glWindowPos3iv (const GLint *p);
+extern void APIENTRY glWindowPos3sv (const GLshort *p);
+
+#endif /* WIN32 */
+
+#endif /* GL_VERSION_1_4 */
+
+/*-------------------------------------------------------------------*/
+/*------------EXTENSIONS---------------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+/*-------------------------------------------------------------------*/
+/*------------ARB_MULTITEXTURE---------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_ARB_multitexture
+#define GL_ARB_multitexture 1
+#define GL_TEXTURE0_ARB                                         0x84C0
+#define GL_TEXTURE1_ARB                                         0x84C1
+#define GL_TEXTURE2_ARB                                         0x84C2
+#define GL_TEXTURE3_ARB                                         0x84C3
+#define GL_TEXTURE4_ARB                                         0x84C4
+#define GL_TEXTURE5_ARB                                         0x84C5
+#define GL_TEXTURE6_ARB                                         0x84C6
+#define GL_TEXTURE7_ARB                                         0x84C7
+#define GL_TEXTURE8_ARB                                         0x84C8
+#define GL_TEXTURE9_ARB                                         0x84C9
+#define GL_TEXTURE10_ARB                                        0x84CA
+#define GL_TEXTURE11_ARB                                        0x84CB
+#define GL_TEXTURE12_ARB                                        0x84CC
+#define GL_TEXTURE13_ARB                                        0x84CD
+#define GL_TEXTURE14_ARB                                        0x84CE
+#define GL_TEXTURE15_ARB                                        0x84CF
+#define GL_TEXTURE16_ARB                                        0x84D0
+#define GL_TEXTURE17_ARB                                        0x84D1
+#define GL_TEXTURE18_ARB                                        0x84D2
+#define GL_TEXTURE19_ARB                                        0x84D3
+#define GL_TEXTURE20_ARB                                        0x84D4
+#define GL_TEXTURE21_ARB                                        0x84D5
+#define GL_TEXTURE22_ARB                                        0x84D6
+#define GL_TEXTURE23_ARB                                        0x84D7
+#define GL_TEXTURE24_ARB                                        0x84D8
+#define GL_TEXTURE25_ARB                                        0x84D9
+#define GL_TEXTURE26_ARB                                        0x84DA
+#define GL_TEXTURE27_ARB                                        0x84DB
+#define GL_TEXTURE28_ARB                                        0x84DC
+#define GL_TEXTURE29_ARB                                        0x84DD
+#define GL_TEXTURE30_ARB                                        0x84DE
+#define GL_TEXTURE31_ARB                                        0x84DF
+#define GL_ACTIVE_TEXTURE_ARB                                   0x84E0
+#define GL_CLIENT_ACTIVE_TEXTURE_ARB                            0x84E1
+#define GL_MAX_TEXTURE_UNITS_ARB                                0x84E2
+
+typedef void (APIENTRY * glActiveTextureARBPROC) (GLenum texture );
+typedef void (APIENTRY * glClientActiveTextureARBPROC) (GLenum texture );
+typedef void (APIENTRY * glMultiTexCoord1dARBPROC) (GLenum target, GLdouble s );
+typedef void (APIENTRY * glMultiTexCoord1dvARBPROC) (GLenum target, const GLdouble *v );
+typedef void (APIENTRY * glMultiTexCoord1fARBPROC) (GLenum target, GLfloat s );
+typedef void (APIENTRY * glMultiTexCoord1fvARBPROC) (GLenum target, const GLfloat *v );
+typedef void (APIENTRY * glMultiTexCoord1iARBPROC) (GLenum target, GLint s );
+typedef void (APIENTRY * glMultiTexCoord1ivARBPROC) (GLenum target, const GLint *v );
+typedef void (APIENTRY * glMultiTexCoord1sARBPROC) (GLenum target, GLshort s );
+typedef void (APIENTRY * glMultiTexCoord1svARBPROC) (GLenum target, const GLshort *v );
+typedef void (APIENTRY * glMultiTexCoord2dARBPROC) (GLenum target, GLdouble s, GLdouble t );
+typedef void (APIENTRY * glMultiTexCoord2dvARBPROC) (GLenum target, const GLdouble *v );
+typedef void (APIENTRY * glMultiTexCoord2fARBPROC) (GLenum target, GLfloat s, GLfloat t );
+typedef void (APIENTRY * glMultiTexCoord2fvARBPROC) (GLenum target, const GLfloat *v );
+typedef void (APIENTRY * glMultiTexCoord2iARBPROC) (GLenum target, GLint s, GLint t );
+typedef void (APIENTRY * glMultiTexCoord2ivARBPROC) (GLenum target, const GLint *v );
+typedef void (APIENTRY * glMultiTexCoord2sARBPROC) (GLenum target, GLshort s, GLshort t );
+typedef void (APIENTRY * glMultiTexCoord2svARBPROC) (GLenum target, const GLshort *v );
+typedef void (APIENTRY * glMultiTexCoord3dARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r );
+typedef void (APIENTRY * glMultiTexCoord3dvARBPROC) (GLenum target, const GLdouble *v );
+typedef void (APIENTRY * glMultiTexCoord3fARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r );
+typedef void (APIENTRY * glMultiTexCoord3fvARBPROC) (GLenum target, const GLfloat *v );
+typedef void (APIENTRY * glMultiTexCoord3iARBPROC) (GLenum target, GLint s, GLint t, GLint r );
+typedef void (APIENTRY * glMultiTexCoord3ivARBPROC) (GLenum target, const GLint *v );
+typedef void (APIENTRY * glMultiTexCoord3sARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r );
+typedef void (APIENTRY * glMultiTexCoord3svARBPROC) (GLenum target, const GLshort *v );
+typedef void (APIENTRY * glMultiTexCoord4dARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q );
+typedef void (APIENTRY * glMultiTexCoord4dvARBPROC) (GLenum target, const GLdouble *v );
+typedef void (APIENTRY * glMultiTexCoord4fARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q );
+typedef void (APIENTRY * glMultiTexCoord4fvARBPROC) (GLenum target, const GLfloat *v );
+typedef void (APIENTRY * glMultiTexCoord4iARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q );
+typedef void (APIENTRY * glMultiTexCoord4ivARBPROC) (GLenum target, const GLint *v );
+typedef void (APIENTRY * glMultiTexCoord4sARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q );
+typedef void (APIENTRY * glMultiTexCoord4svARBPROC) (GLenum target, const GLshort *v );
+
+#ifdef _WIN32
+
+extern glActiveTextureARBPROC glActiveTextureARB;
+extern glClientActiveTextureARBPROC glClientActiveTextureARB;
+extern glMultiTexCoord1dARBPROC glMultiTexCoord1dARB;
+extern glMultiTexCoord1dvARBPROC glMultiTexCoord1dvARB;
+extern glMultiTexCoord1fARBPROC glMultiTexCoord1fARB;
+extern glMultiTexCoord1fvARBPROC glMultiTexCoord1fvARB;
+extern glMultiTexCoord1iARBPROC glMultiTexCoord1iARB;
+extern glMultiTexCoord1ivARBPROC glMultiTexCoord1ivARB;
+extern glMultiTexCoord1sARBPROC glMultiTexCoord1sARB;
+extern glMultiTexCoord1svARBPROC glMultiTexCoord1svARB;
+extern glMultiTexCoord2dARBPROC glMultiTexCoord2dARB;
+extern glMultiTexCoord2dvARBPROC glMultiTexCoord2dvARB;
+extern glMultiTexCoord2fARBPROC glMultiTexCoord2fARB;
+extern glMultiTexCoord2fvARBPROC glMultiTexCoord2fvARB;
+extern glMultiTexCoord2iARBPROC glMultiTexCoord2iARB;
+extern glMultiTexCoord2ivARBPROC glMultiTexCoord2ivARB;
+extern glMultiTexCoord2sARBPROC glMultiTexCoord2sARB;
+extern glMultiTexCoord2svARBPROC glMultiTexCoord2svARB;
+extern glMultiTexCoord3dARBPROC glMultiTexCoord3dARB;
+extern glMultiTexCoord3dvARBPROC glMultiTexCoord3dvARB;
+extern glMultiTexCoord3fARBPROC glMultiTexCoord3fARB;
+extern glMultiTexCoord3fvARBPROC glMultiTexCoord3fvARB;
+extern glMultiTexCoord3iARBPROC glMultiTexCoord3iARB;
+extern glMultiTexCoord3ivARBPROC glMultiTexCoord3ivARB;
+extern glMultiTexCoord3sARBPROC glMultiTexCoord3sARB;
+extern glMultiTexCoord3svARBPROC glMultiTexCoord3svARB;
+extern glMultiTexCoord4dARBPROC glMultiTexCoord4dARB;
+extern glMultiTexCoord4dvARBPROC glMultiTexCoord4dvARB;
+extern glMultiTexCoord4fARBPROC glMultiTexCoord4fARB;
+extern glMultiTexCoord4fvARBPROC glMultiTexCoord4fvARB;
+extern glMultiTexCoord4iARBPROC glMultiTexCoord4iARB;
+extern glMultiTexCoord4ivARBPROC glMultiTexCoord4ivARB;
+extern glMultiTexCoord4sARBPROC glMultiTexCoord4sARB;
+extern glMultiTexCoord4svARBPROC glMultiTexCoord4svARB;
+
+#else
+
+extern void APIENTRY glActiveTextureARB (GLenum texture );
+extern void APIENTRY glClientActiveTextureARB (GLenum texture );
+extern void APIENTRY glMultiTexCoord1dARB (GLenum target, GLdouble s );
+extern void APIENTRY glMultiTexCoord1dvARB (GLenum target, const GLdouble *v );
+extern void APIENTRY glMultiTexCoord1fARB (GLenum target, GLfloat s );
+extern void APIENTRY glMultiTexCoord1fvARB (GLenum target, const GLfloat *v );
+extern void APIENTRY glMultiTexCoord1iARB (GLenum target, GLint s );
+extern void APIENTRY glMultiTexCoord1ivARB (GLenum target, const GLint *v );
+extern void APIENTRY glMultiTexCoord1sARB (GLenum target, GLshort s );
+extern void APIENTRY glMultiTexCoord1svARB (GLenum target, const GLshort *v );
+extern void APIENTRY glMultiTexCoord2dARB (GLenum target, GLdouble s, GLdouble t );
+extern void APIENTRY glMultiTexCoord2dvARB (GLenum target, const GLdouble *v );
+extern void APIENTRY glMultiTexCoord2fARB (GLenum target, GLfloat s, GLfloat t );
+extern void APIENTRY glMultiTexCoord2fvARB (GLenum target, const GLfloat *v );
+extern void APIENTRY glMultiTexCoord2iARB (GLenum target, GLint s, GLint t );
+extern void APIENTRY glMultiTexCoord2ivARB (GLenum target, const GLint *v );
+extern void APIENTRY glMultiTexCoord2sARB (GLenum target, GLshort s, GLshort t );
+extern void APIENTRY glMultiTexCoord2svARB (GLenum target, const GLshort *v );
+extern void APIENTRY glMultiTexCoord3dARB (GLenum target, GLdouble s, GLdouble t, GLdouble r );
+extern void APIENTRY glMultiTexCoord3dvARB (GLenum target, const GLdouble *v );
+extern void APIENTRY glMultiTexCoord3fARB (GLenum target, GLfloat s, GLfloat t, GLfloat r );
+extern void APIENTRY glMultiTexCoord3fvARB (GLenum target, const GLfloat *v );
+extern void APIENTRY glMultiTexCoord3iARB (GLenum target, GLint s, GLint t, GLint r );
+extern void APIENTRY glMultiTexCoord3ivARB (GLenum target, const GLint *v );
+extern void APIENTRY glMultiTexCoord3sARB (GLenum target, GLshort s, GLshort t, GLshort r );
+extern void APIENTRY glMultiTexCoord3svARB (GLenum target, const GLshort *v );
+extern void APIENTRY glMultiTexCoord4dARB (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q );
+extern void APIENTRY glMultiTexCoord4dvARB (GLenum target, const GLdouble *v );
+extern void APIENTRY glMultiTexCoord4fARB (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q );
+extern void APIENTRY glMultiTexCoord4fvARB (GLenum target, const GLfloat *v );
+extern void APIENTRY glMultiTexCoord4iARB (GLenum target, GLint s, GLint t, GLint r, GLint q );
+extern void APIENTRY glMultiTexCoord4ivARB (GLenum target, const GLint *v );
+extern void APIENTRY glMultiTexCoord4sARB (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q );
+extern void APIENTRY glMultiTexCoord4svARB (GLenum target, const GLshort *v );
+
+#endif /* WIN32 */
+
+#endif /* GL_ARB_multitexture */
+
+/*-------------------------------------------------------------------*/
+/*------------ARB_TRANSPOSE_MATRIX-----------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_ARB_transpose_matrix
+#define GL_ARB_transpose_matrix 1
+
+#define GL_TRANSPOSE_MODELVIEW_MATRIX_ARB                       0x84E3
+#define GL_TRANSPOSE_PROJECTION_MATRIX_ARB                      0x84E4
+#define GL_TRANSPOSE_TEXTURE_MATRIX_ARB                         0x84E5
+#define GL_TRANSPOSE_COLOR_MATRIX_ARB                           0x84E6
+
+typedef void (APIENTRY * glLoadTransposeMatrixdARBPROC) (const GLdouble m[16] );
+typedef void (APIENTRY * glLoadTransposeMatrixfARBPROC) (const GLfloat m[16] );
+typedef void (APIENTRY * glMultTransposeMatrixdARBPROC) (const GLdouble m[16] );
+typedef void (APIENTRY * glMultTransposeMatrixfARBPROC) (const GLfloat m[16] );
+
+extern glLoadTransposeMatrixfARBPROC glLoadTransposeMatrixfARB;
+extern glLoadTransposeMatrixdARBPROC glLoadTransposeMatrixdARB;
+extern glMultTransposeMatrixfARBPROC glMultTransposeMatrixfARB;
+extern glMultTransposeMatrixdARBPROC glMultTransposeMatrixdARB;
+
+#endif /* GL_ARB_transpose_matrix */
+
+/*-------------------------------------------------------------------*/
+/*------------ARB_TEXTURE_COMPRESSION--------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_ARB_texture_compression
+#define GL_ARB_texture_compression 1
+
+#define GL_COMPRESSED_ALPHA_ARB                                 0x84E9
+#define GL_COMPRESSED_LUMINANCE_ARB                             0x84EA
+#define GL_COMPRESSED_LUMINANCE_ALPHA_ARB                       0x84EB
+#define GL_COMPRESSED_INTENSITY_ARB                             0x84EC
+#define GL_COMPRESSED_RGB_ARB                                   0x84ED
+#define GL_COMPRESSED_RGBA_ARB                                  0x84EE
+#define GL_TEXTURE_COMPRESSION_HINT_ARB                         0x84EF
+#define GL_TEXTURE_IMAGE_SIZE_ARB                               0x86A0
+#define GL_TEXTURE_COMPRESSED_ARB                               0x86A1
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB                   0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS_ARB                       0x86A3
+
+typedef void (APIENTRY * glCompressedTexImage1DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data );
+typedef void (APIENTRY * glCompressedTexImage2DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data );
+typedef void (APIENTRY * glCompressedTexImage3DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data );
+typedef void (APIENTRY * glCompressedTexSubImage1DARBPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data );
+typedef void (APIENTRY * glCompressedTexSubImage2DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data );
+typedef void (APIENTRY * glCompressedTexSubImage3DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data );
+typedef void (APIENTRY * glGetCompressedTexImageARBPROC) (GLenum target, GLint lod, GLvoid *img );
+
+extern glCompressedTexImage3DARBPROC glCompressedTexImage3DARB;
+extern glCompressedTexImage2DARBPROC glCompressedTexImage2DARB;
+extern glCompressedTexImage1DARBPROC glCompressedTexImage1DARB; 
+extern glCompressedTexSubImage3DARBPROC glCompressedTexSubImage3DARB;
+extern glCompressedTexSubImage2DARBPROC glCompressedTexSubImage2DARB;
+extern glCompressedTexSubImage1DARBPROC glCompressedTexSubImage1DARB;
+extern glGetCompressedTexImageARBPROC glGetCompressedTexImageARB;
+
+#endif /* GL_ARB_texture_compression */
+
+/*-------------------------------------------------------------------*/
+/*------------ARB_CUBE_MAP-------------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_ARB_texture_cube_map
+#define GL_ARB_texture_cube_map 1
+
+#define GL_NORMAL_MAP_ARB                                       0x8511
+#define GL_REFLECTION_MAP_ARB                                   0x8512
+#define GL_TEXTURE_CUBE_MAP_ARB                                 0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP_ARB                         0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB                      0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB                      0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB                      0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB                      0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB                      0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB                      0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP_ARB                           0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB                        0x851C
+
+#endif /* GL_ARB_texture_cube_map */
+
+/*-------------------------------------------------------------------*/
+/*------------SGIX_SHADOW--------------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_SGIX_shadow
+#define GL_SGIX_shadow 1
+
+#define GL_TEXTURE_COMPARE_SGIX                                  0x819A
+#define GL_TEXTURE_COMPARE_OPERATOR_SGIX                         0x819B
+#define GL_TEXTURE_LEQUAL_R_SGIX                                 0x819C
+#define GL_TEXTURE_GEQUAL_R_SGIX                                 0x819D
+
+#endif /* GL_SGIX_shadow */
+
+/*-------------------------------------------------------------------*/
+/*------------SGIX_DEPTH_TEXTURE-------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_SGIX_depth_texture
+#define GL_SGIX_depth_texture 1
+
+#define GL_DEPTH_COMPONENT16_SGIX                                0x81A5
+#define GL_DEPTH_COMPONENT24_SGIX                                0x81A6
+#define GL_DEPTH_COMPONENT32_SGIX                                0x81A7
+
+#endif /* GL_SGIX_depth_texture */
+
+/*-------------------------------------------------------------------*/
+/*------------EXT_COMPILED_VERTEX_ARRAY------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_EXT_compiled_vertex_array
+#define GL_EXT_compiled_vertex_array 1
+
+#define GL_ARRAY_ELEMENT_LOCK_FIRST_EXT                         0x81A8
+#define GL_ARRAY_ELEMENT_LOCK_COUNT_EXT                         0x81A9
+
+typedef void (APIENTRY * glLockArraysEXTPROC) (GLint first, GLsizei count);
+typedef void (APIENTRY * glUnlockArraysEXTPROC) ();
+
+extern glLockArraysEXTPROC glLockArraysEXT;
+extern glUnlockArraysEXTPROC glUnlockArraysEXT;
+
+#endif /* GL_EXT_compiled_vertex_array */
+
+/*-------------------------------------------------------------------*/
+/*------------ARB_TEXTURE_ENV_COMBINE--------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_ARB_texture_env_combine
+#define GL_ARB_texture_env_combine 1
+
+#define GL_COMBINE_ARB                                          0x8570
+#define GL_COMBINE_RGB_ARB                                      0x8571
+#define GL_COMBINE_ALPHA_ARB                                    0x8572
+#define GL_RGB_SCALE_ARB                                        0x8573
+#define GL_ADD_SIGNED_ARB                                       0x8574
+#define GL_INTERPOLATE_ARB                                      0x8575
+#define GL_CONSTANT_ARB                                         0x8576
+#define GL_PRIMARY_COLOR_ARB                                    0x8577
+#define GL_PREVIOUS_ARB                                         0x8578
+#define GL_SOURCE0_RGB_ARB                                      0x8580
+#define GL_SOURCE1_RGB_ARB                                      0x8581
+#define GL_SOURCE2_RGB_ARB                                      0x8582
+#define GL_SOURCE0_ALPHA_ARB                                    0x8588
+#define GL_SOURCE1_ALPHA_ARB                                    0x8589
+#define GL_SOURCE2_ALPHA_ARB                                    0x858A
+#define GL_OPERAND0_RGB_ARB                                     0x8590
+#define GL_OPERAND1_RGB_ARB                                     0x8591
+#define GL_OPERAND2_RGB_ARB                                     0x8592
+#define GL_OPERAND0_ALPHA_ARB                                   0x8598
+#define GL_OPERAND1_ALPHA_ARB                                   0x8599
+#define GL_OPERAND2_ALPHA_ARB                                   0x859A
+
+#endif /* GL_ARB_texture_env_combine */
+
+/*-------------------------------------------------------------------*/
+/*------------ARB_TEXTURE_ENV_DOT3-----------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_ARB_texture_env_dot3
+#define GL_ARB_texture_env_dot3 1
+
+#define GL_DOT3_RGB_ARB                                         0x86AE
+#define GL_DOT3_RGBA_ARB                                        0x86AF
+
+#endif /* GL_ARB_texture_env_dot3 */
+
+/*-------------------------------------------------------------------*/
+/*------------ARB_TEXTURE_BORDER_CLAMP-------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_ARB_texture_border_clamp
+#define GL_ARB_texture_border_clamp 1
+
+#define GL_CLAMP_TO_BORDER_ARB                                  0x812D
+
+#endif /* GL_ARB_texture_border_clamp */
+
+/*-------------------------------------------------------------------*/
+/*------------ARB_TEXTURE_ENV_ADD------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_ARB_texture_env_add
+#define GL_ARB_texture_env_add 1
+
+
+#endif /* GL_ARB_texture_env_add */
+
+/*-------------------------------------------------------------------*/
+/*------------EXT_SECONDARY_COLOR------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_EXT_secondary_color
+#define GL_EXT_secondary_color 1
+
+#define GL_COLOR_SUM_EXT                                        0x8458
+#define GL_CURRENT_SECONDARY_COLOR_EXT                          0x8459
+#define GL_SECONDARY_COLOR_ARRAY_SIZE_EXT                       0x845A
+#define GL_SECONDARY_COLOR_ARRAY_TYPE_EXT                       0x845B
+#define GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT                     0x845C
+#define GL_SECONDARY_COLOR_ARRAY_POINTER_EXT                    0x845D
+#define GL_SECONDARY_COLOR_ARRAY_EXT                            0x845E
+
+typedef void (APIENTRY * glSecondaryColor3bEXTPROC) (GLbyte red, GLbyte green, GLbyte blue);
+typedef void (APIENTRY * glSecondaryColor3bvEXTPROC) (const GLbyte *v);
+typedef void (APIENTRY * glSecondaryColor3dEXTPROC) (GLdouble red, GLdouble green, GLdouble blue);
+typedef void (APIENTRY * glSecondaryColor3dvEXTPROC) (const GLdouble *v);
+typedef void (APIENTRY * glSecondaryColor3fEXTPROC) (GLfloat red, GLfloat green, GLfloat blue);
+typedef void (APIENTRY * glSecondaryColor3fvEXTPROC) (const GLfloat *v);
+typedef void (APIENTRY * glSecondaryColor3iEXTPROC) (GLint red, GLint green, GLint blue);
+typedef void (APIENTRY * glSecondaryColor3ivEXTPROC) (const GLint *v);
+typedef void (APIENTRY * glSecondaryColor3sEXTPROC) (GLshort red, GLshort green, GLshort blue);
+typedef void (APIENTRY * glSecondaryColor3svEXTPROC) (const GLshort *v);
+typedef void (APIENTRY * glSecondaryColor3ubEXTPROC) (GLubyte red, GLubyte green, GLubyte blue);
+typedef void (APIENTRY * glSecondaryColor3ubvEXTPROC) (const GLubyte *v);
+typedef void (APIENTRY * glSecondaryColor3uiEXTPROC) (GLuint red, GLuint green, GLuint blue);
+typedef void (APIENTRY * glSecondaryColor3uivEXTPROC) (const GLuint *v);
+typedef void (APIENTRY * glSecondaryColor3usEXTPROC) (GLushort red, GLushort green, GLushort blue);
+typedef void (APIENTRY * glSecondaryColor3usvEXTPROC) (const GLushort *v);
+typedef void (APIENTRY * glSecondaryColorPointerEXTPROC) (GLint size, GLenum type, GLsizei stride, GLvoid *pointer);
+
+extern glSecondaryColor3bEXTPROC glSecondaryColor3bEXT;
+extern glSecondaryColor3bvEXTPROC glSecondaryColor3bvEXT;
+extern glSecondaryColor3dEXTPROC glSecondaryColor3dEXT;
+extern glSecondaryColor3dvEXTPROC glSecondaryColor3dvEXT;
+extern glSecondaryColor3fEXTPROC glSecondaryColor3fEXT;
+extern glSecondaryColor3fvEXTPROC glSecondaryColor3fvEXT;
+extern glSecondaryColor3iEXTPROC glSecondaryColor3iEXT;
+extern glSecondaryColor3ivEXTPROC glSecondaryColor3ivEXT;
+extern glSecondaryColor3sEXTPROC glSecondaryColor3sEXT;
+extern glSecondaryColor3svEXTPROC glSecondaryColor3svEXT;
+extern glSecondaryColor3ubEXTPROC glSecondaryColor3ubEXT;
+extern glSecondaryColor3ubvEXTPROC glSecondaryColor3ubvEXT;
+extern glSecondaryColor3uiEXTPROC glSecondaryColor3uiEXT;
+extern glSecondaryColor3uivEXTPROC glSecondaryColor3uivEXT;
+extern glSecondaryColor3usEXTPROC glSecondaryColor3usEXT;
+extern glSecondaryColor3usvEXTPROC glSecondaryColor3usvEXT;
+extern glSecondaryColorPointerEXTPROC glSecondaryColorPointerEXT;
+
+#endif /* GL_EXT_secondary_color */
+
+/*-------------------------------------------------------------------*/
+/*------------EXT_FOG_COORD------------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_EXT_fog_coord
+#define GL_EXT_fog_coord 1
+
+#define GL_FOG_COORDINATE_SOURCE_EXT                            0x8450
+#define GL_FOG_COORDINATE_EXT                                   0x8451
+#define GL_FRAGMENT_DEPTH_EXT                                   0x8452
+#define GL_CURRENT_FOG_COORDINATE_EXT                           0x8453
+#define GL_FOG_COORDINATE_ARRAY_TYPE_EXT                        0x8454
+#define GL_FOG_COORDINATE_ARRAY_STRIDE_EXT                      0x8455
+#define GL_FOG_COORDINATE_ARRAY_POINTER_EXT                     0x8456
+#define GL_FOG_COORDINATE_ARRAY_EXT                             0x8457
+
+typedef void (APIENTRY * glFogCoordfEXTPROC) (GLfloat coord);
+typedef void (APIENTRY * glFogCoordfvEXTPROC) (const GLfloat *coord);
+typedef void (APIENTRY * glFogCoorddEXTPROC) (GLdouble coord);
+typedef void (APIENTRY * glFogCoorddvEXTPROC) (const GLdouble *coord);
+typedef void (APIENTRY * glFogCoordPointerEXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
+
+extern glFogCoordfEXTPROC glFogCoordfEXT;
+extern glFogCoordfvEXTPROC glFogCoordfvEXT;
+extern glFogCoorddEXTPROC glFogCoorddEXT;
+extern glFogCoorddvEXTPROC glFogCoorddvEXT;
+extern glFogCoordPointerEXTPROC glFogCoordPointerEXT;
+
+#endif /* GL_EXT_fog_coord */
+
+/*-------------------------------------------------------------------*/
+/*------------NV_VERTEX_ARRAY_RANGE----------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_NV_vertex_array_range
+#define GL_NV_vertex_array_range 1
+
+#define GL_VERTEX_ARRAY_RANGE_NV                                0x851D
+#define GL_VERTEX_ARRAY_RANGE_LENGTH_NV                         0x851E
+#define GL_VERTEX_ARRAY_RANGE_VALID_NV                          0x851F
+#define GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV                    0x8520
+#define GL_VERTEX_ARRAY_RANGE_POINTER_NV                        0x8521
+
+typedef void (APIENTRY * glFlushVertexArrayRangeNVPROC) (void);
+typedef void (APIENTRY * glVertexArrayRangeNVPROC) (GLsizei size, const GLvoid *pointer);
+
+extern glFlushVertexArrayRangeNVPROC glFlushVertexArrayRangeNV;
+extern glVertexArrayRangeNVPROC glVertexArrayRangeNV;
+
+#ifdef _WIN32
+
+typedef void * (APIENTRY * wglAllocateMemoryNVPROC) (GLsizei size, GLfloat readFrequency, GLfloat writeFrequency, GLfloat priority);
+typedef void (APIENTRY * wglFreeMemoryNVPROC) (void *pointer);
+
+extern wglAllocateMemoryNVPROC wglAllocateMemoryNV;
+extern wglFreeMemoryNVPROC wglFreeMemoryNV;
+
+#else
+
+typedef void * (APIENTRY * glXAllocateMemoryNVPROC) (GLsizei size, GLfloat readFrequency, GLfloat writeFrequency, GLfloat priority);
+typedef void (APIENTRY * glXFreeMemoryNVPROC) (void *pointer);
+
+extern glXAllocateMemoryNVPROC glXAllocateMemoryNV;
+extern glXFreeMemoryNVPROC glXFreeMemoryNV;
+
+#endif /* WIN32 */
+
+#endif /* GL_NV_vertex_array_range */
+
+/*-------------------------------------------------------------------*/
+/*------------NV_VERTEX_ARRAY_RANGE2---------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_NV_vertex_array_range2
+#define GL_NV_vertex_array_range2 1
+
+#define GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV                  0x8533
+
+#endif /* GL_NV_vertex_array_range2 */
+
+/*-------------------------------------------------------------------*/
+/*------------EXT_POINT_PARAMETERS-----------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_EXT_point_parameters
+#define GL_EXT_point_parameters 1
+
+#define GL_POINT_SIZE_MIN_EXT                                   0x8126
+#define GL_POINT_SIZE_MAX_EXT                                   0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE_EXT                        0x8128
+#define GL_DISTANCE_ATTENUATION_EXT                             0x8129
+
+typedef void (APIENTRY * glPointParameterfEXTPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRY * glPointParameterfvEXTPROC) (GLenum pname, const GLfloat *params);
+
+extern glPointParameterfEXTPROC glPointParameterfEXT;
+extern glPointParameterfvEXTPROC glPointParameterfvEXT;
+
+#endif /* GL_EXT_point_parameters */
+
+/*-------------------------------------------------------------------*/
+/*------------NV_REGISTER_COMBINERS----------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_NV_register_combiners
+#define GL_NV_register_combiners 1
+
+#define GL_REGISTER_COMBINERS_NV                                0x8522
+#define GL_COMBINER0_NV                                         0x8550
+#define GL_COMBINER1_NV                                         0x8551
+#define GL_COMBINER2_NV                                         0x8552
+#define GL_COMBINER3_NV                                         0x8553
+#define GL_COMBINER4_NV                                         0x8554
+#define GL_COMBINER5_NV                                         0x8555
+#define GL_COMBINER6_NV                                         0x8556
+#define GL_COMBINER7_NV                                         0x8557
+#define GL_VARIABLE_A_NV                                        0x8523
+#define GL_VARIABLE_B_NV                                        0x8524
+#define GL_VARIABLE_C_NV                                        0x8525
+#define GL_VARIABLE_D_NV                                        0x8526
+#define GL_VARIABLE_E_NV                                        0x8527
+#define GL_VARIABLE_F_NV                                        0x8528
+#define GL_VARIABLE_G_NV                                        0x8529
+#define GL_CONSTANT_COLOR0_NV                                   0x852A
+#define GL_CONSTANT_COLOR1_NV                                   0x852B
+#define GL_PRIMARY_COLOR_NV                                     0x852C
+#define GL_SECONDARY_COLOR_NV                                   0x852D
+#define GL_SPARE0_NV                                            0x852E
+#define GL_SPARE1_NV                                            0x852F
+#define GL_UNSIGNED_IDENTITY_NV                                 0x8536
+#define GL_UNSIGNED_INVERT_NV                                   0x8537
+#define GL_EXPAND_NORMAL_NV                                     0x8538
+#define GL_EXPAND_NEGATE_NV                                     0x8539
+#define GL_HALF_BIAS_NORMAL_NV                                  0x853A
+#define GL_HALF_BIAS_NEGATE_NV                                  0x853B
+#define GL_SIGNED_IDENTITY_NV                                   0x853C
+#define GL_SIGNED_NEGATE_NV                                     0x853D
+#define GL_E_TIMES_F_NV                                         0x8531
+#define GL_SPARE0_PLUS_SECONDARY_COLOR_NV                       0x8532
+#define GL_SCALE_BY_TWO_NV                                      0x853E
+#define GL_SCALE_BY_FOUR_NV                                     0x853F
+#define GL_SCALE_BY_ONE_HALF_NV                                 0x8540
+#define GL_BIAS_BY_NEGATIVE_ONE_HALF_NV                         0x8541
+#define GL_DISCARD_NV                                           0x8530
+#define GL_COMBINER_INPUT_NV                                    0x8542
+#define GL_COMBINER_MAPPING_NV                                  0x8543
+#define GL_COMBINER_COMPONENT_USAGE_NV                          0x8544
+#define GL_COMBINER_AB_DOT_PRODUCT_NV                           0x8545
+#define GL_COMBINER_CD_DOT_PRODUCT_NV                           0x8546
+#define GL_COMBINER_MUX_SUM_NV                                  0x8547
+#define GL_COMBINER_SCALE_NV                                    0x8548
+#define GL_COMBINER_BIAS_NV                                     0x8549
+#define GL_COMBINER_AB_OUTPUT_NV                                0x854A
+#define GL_COMBINER_CD_OUTPUT_NV                                0x854B
+#define GL_COMBINER_SUM_OUTPUT_NV                               0x854C
+#define GL_NUM_GENERAL_COMBINERS_NV                             0x854E
+#define GL_COLOR_SUM_CLAMP_NV                                   0x854F
+#define GL_MAX_GENERAL_COMBINERS_NV                             0x854D
+
+typedef void (APIENTRY * glCombinerParameterfvNVPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRY * glCombinerParameterfNVPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRY * glCombinerParameterivNVPROC) (GLenum pname, const GLint *params);
+typedef void (APIENTRY * glCombinerParameteriNVPROC) (GLenum pname, GLint param);
+typedef void (APIENTRY * glCombinerInputNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
+typedef void (APIENTRY * glCombinerOutputNVPROC) (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum);
+typedef void (APIENTRY * glFinalCombinerInputNVPROC) (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
+typedef void (APIENTRY * glGetCombinerInputParameterfvNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params);
+typedef void (APIENTRY * glGetCombinerInputParameterivNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params);
+typedef void (APIENTRY * glGetCombinerOutputParameterfvNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLfloat *params);
+typedef void (APIENTRY * glGetCombinerOutputParameterivNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLint *params);
+typedef void (APIENTRY * glGetFinalCombinerInputParameterfvNVPROC) (GLenum variable, GLenum pname, GLfloat *params);
+typedef void (APIENTRY * glGetFinalCombinerInputParameterivNVPROC) (GLenum variable, GLenum pname, GLint *params);
+
+extern glCombinerParameterfvNVPROC glCombinerParameterfvNV;
+extern glCombinerParameterfNVPROC  glCombinerParameterfNV;
+extern glCombinerParameterivNVPROC glCombinerParameterivNV;
+extern glCombinerParameteriNVPROC glCombinerParameteriNV;
+extern glCombinerInputNVPROC glCombinerInputNV;
+extern glCombinerOutputNVPROC glCombinerOutputNV;
+extern glFinalCombinerInputNVPROC glFinalCombinerInputNV;
+extern glGetCombinerInputParameterfvNVPROC glGetCombinerInputParameterfvNV;
+extern glGetCombinerInputParameterivNVPROC glGetCombinerInputParameterivNV;
+extern glGetCombinerOutputParameterfvNVPROC glGetCombinerOutputParameterfvNV;
+extern glGetCombinerOutputParameterivNVPROC glGetCombinerOutputParameterivNV;
+extern glGetFinalCombinerInputParameterfvNVPROC glGetFinalCombinerInputParameterfvNV;
+extern glGetFinalCombinerInputParameterivNVPROC glGetFinalCombinerInputParameterivNV;
+
+#endif /* GL_NV_register_combiners */
+
+/*-------------------------------------------------------------------*/
+/*------------ARB_MULTISAMPLE----------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_ARB_multisample
+#define GL_ARB_multisample 1
+
+#define GL_MULTISAMPLE_ARB                                      0x809D
+#define GL_SAMPLE_ALPHA_TO_COVERAGE_ARB                         0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_ARB                              0x809F
+#define GL_SAMPLE_COVERAGE_ARB                                  0x80A0
+#define GL_SAMPLE_BUFFERS_ARB                                   0x80A8
+#define GL_SAMPLES_ARB                                          0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE_ARB                            0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT_ARB                           0x80AB
+#define GL_MULTISAMPLE_BIT_ARB                                  0x20000000
+
+typedef void (APIENTRY * glSampleCoverageARBPROC) (GLclampf value, GLboolean invert );
+
+extern glSampleCoverageARBPROC glSampleCoverageARB;
+
+#endif /* GL_ARB_multisample */
+
+/*-------------------------------------------------------------------*/
+/*------------NV_TEXTURE_SHADER--------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_NV_texture_shader
+#define GL_NV_texture_shader 1
+
+#define GL_TEXTURE_SHADER_NV                                    0x86DE
+#define GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV                 0x86D9
+#define GL_SHADER_OPERATION_NV                                  0x86DF
+#define GL_CULL_MODES_NV                                        0x86E0
+#define GL_OFFSET_TEXTURE_MATRIX_NV                             0x86E1
+#define GL_OFFSET_TEXTURE_SCALE_NV                              0x86E2
+#define GL_OFFSET_TEXTURE_BIAS_NV                               0x86E3
+#define GL_PREVIOUS_TEXTURE_INPUT_NV                            0x86E4
+#define GL_CONST_EYE_NV                                         0x86E5
+#define GL_SHADER_CONSISTENT_NV                                 0x86DD
+#define GL_PASS_THROUGH_NV                                      0x86E6
+#define GL_CULL_FRAGMENT_NV                                     0x86E7
+#define GL_OFFSET_TEXTURE_2D_NV                                 0x86E8
+#define GL_OFFSET_TEXTURE_RECTANGLE_NV                          0x864C
+#define GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV                    0x864D
+#define GL_DEPENDENT_AR_TEXTURE_2D_NV                           0x86E9
+#define GL_DEPENDENT_GB_TEXTURE_2D_NV                           0x86EA
+#define GL_DOT_PRODUCT_NV                                       0x86EC
+#define GL_DOT_PRODUCT_DEPTH_REPLACE_NV                         0x86ED
+#define GL_DOT_PRODUCT_TEXTURE_2D_NV                            0x86EE
+#define GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV                     0x864E
+#define GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV                      0x86F0
+#define GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV                      0x86F1
+#define GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV                      0x86F2
+#define GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV            0x86F3
+#define GL_HILO_NV                                              0x86F4
+#define GL_DSDT_NV                                              0x86F5
+#define GL_DSDT_MAG_NV                                          0x86F6
+#define GL_DSDT_MAG_VIB_NV                                      0x86F7
+#define GL_UNSIGNED_INT_S8_S8_8_8_NV                            0x86DA
+#define GL_UNSIGNED_INT_8_8_S8_S8_REV_NV                        0x86DB
+#define GL_SIGNED_RGBA_NV                                       0x86FB
+#define GL_SIGNED_RGBA8_NV                                      0x86FC
+#define GL_SIGNED_RGB_NV                                        0x86FE
+#define GL_SIGNED_RGB8_NV                                       0x86FF
+#define GL_SIGNED_LUMINANCE_NV                                  0x8701
+#define GL_SIGNED_LUMINANCE8_NV                                 0x8702
+#define GL_SIGNED_LUMINANCE_ALPHA_NV                            0x8703
+#define GL_SIGNED_LUMINANCE8_ALPHA8_NV                          0x8704
+#define GL_SIGNED_ALPHA_NV                                      0x8705
+#define GL_SIGNED_ALPHA8_NV                                     0x8706
+#define GL_SIGNED_INTENSITY_NV                                  0x8707
+#define GL_SIGNED_INTENSITY8_NV                                 0x8708
+#define GL_SIGNED_RGB_UNSIGNED_ALPHA_NV                         0x870C
+#define GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV                       0x870D
+#define GL_HILO16_NV                                            0x86F8
+#define GL_SIGNED_HILO_NV                                       0x86F9
+#define GL_SIGNED_HILO16_NV                                     0x86FA
+#define GL_DSDT8_NV                                             0x8709
+#define GL_DSDT8_MAG8_NV                                        0x870A
+#define GL_DSDT_MAG_INTENSITY_NV                                0x86DC
+#define GL_DSDT8_MAG8_INTENSITY8_NV                             0x870B
+#define GL_HI_SCALE_NV                                          0x870E
+#define GL_LO_SCALE_NV                                          0x870F
+#define GL_DS_SCALE_NV                                          0x8710
+#define GL_DT_SCALE_NV                                          0x8711
+#define GL_MAGNITUDE_SCALE_NV                                   0x8712
+#define GL_VIBRANCE_SCALE_NV                                    0x8713
+#define GL_HI_BIAS_NV                                           0x8714
+#define GL_LO_BIAS_NV                                           0x8715
+#define GL_DS_BIAS_NV                                           0x8716
+#define GL_DT_BIAS_NV                                           0x8717
+#define GL_MAGNITUDE_BIAS_NV                                    0x8718
+#define GL_VIBRANCE_BIAS_NV                                     0x8719
+#define GL_TEXTURE_BORDER_VALUES_NV                             0x871A
+#define GL_TEXTURE_HI_SIZE_NV                                   0x871B
+#define GL_TEXTURE_LO_SIZE_NV                                   0x871C
+#define GL_TEXTURE_DS_SIZE_NV                                   0x871D
+#define GL_TEXTURE_DT_SIZE_NV                                   0x871E
+#define GL_TEXTURE_MAG_SIZE_NV                                  0x871F
+
+#endif /* GL_NV_texture_shader */
+
+/*-------------------------------------------------------------------*/
+/*------------GL_NV_TEXTURE_RECTANGLE--------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_NV_texture_rectangle
+#define GL_NV_texture_rectangle 1
+
+#define GL_TEXTURE_RECTANGLE_NV                                 0x84F5
+#define GL_TEXTURE_BINDING_RECTANGLE_NV                         0x84F6
+#define GL_PROXY_TEXTURE_RECTANGLE_NV                           0x84F7
+#define GL_MAX_RECTANGLE_TEXTURE_SIZE_NV                        0x84F8
+
+#endif /* GL_NV_texture_recrangle */
+
+/*-------------------------------------------------------------------*/
+/*------------NV_TEXTURE_ENV_COMBINE4--------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_NV_texture_env_combine4
+#define GL_NV_texture_env_combine4 1
+
+#define GL_COMBINE4_NV                                          0x8503
+#define GL_SOURCE3_RGB_NV                                       0x8583
+#define GL_SOURCE3_ALPHA_NV                                     0x858B
+#define GL_OPERAND3_RGB_NV                                      0x8593
+#define GL_OPERAND3_ALPHA_NV                                    0x859B
+
+#endif /* GL_NV_texture_env_combine */
+
+/*-------------------------------------------------------------------*/
+/*------------NV_FOG_DISTANCE----------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_NV_fog_distance
+#define GL_NV_fog_distance 1
+
+#define GL_FOG_DISTANCE_MODE_NV                                 0x855A
+#define GL_EYE_RADIAL_NV                                        0x855B
+#define GL_EYE_PLANE_ABSOLUTE_NV                                0x855C
+
+#endif /* GL_NV_fog_distance */
+
+/*-------------------------------------------------------------------*/
+/*------------EXT_TEXTURE_FILTER_ANISOTROPIC-------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_EXT_texture_filter_anisotropic
+#define GL_EXT_texture_filter_anisotropic 1
+
+#define GL_TEXTURE_MAX_ANISOTROPY_EXT                           0x84FE
+#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT                       0x84FF
+
+#endif /* GL_EXT_texture_filter_anisotropic */
+
+/*-------------------------------------------------------------------*/
+/*------------SGIS_GENERATE_MIPMAP-----------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_SGIS_generate_mipmap
+#define GL_SGIS_generate_mipmap 1
+
+#define GL_GENERATE_MIPMAP_SGIS                                 0x8191
+#define GL_GENERATE_MIPMAP_HINT_SGIS                            0x8192
+
+#endif /* GL_SGIS_generate_mipmap */
+
+/*-------------------------------------------------------------------*/
+/*------------NV_TEXGEN_REFLECTION-----------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_NV_texgen_reflection
+#define GL_NV_texgen_reflection 1
+
+#define GL_NORMAL_MAP_NV                                        0x8511
+#define GL_REFLECTION_MAP_NV                                    0x8512
+
+#endif /* GL_NV_texgen_reflection */
+
+/*-------------------------------------------------------------------*/
+/*------------EXT_VERTEX_WEIGHTING-----------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_EXT_vertex_weighting
+#define GL_EXT_vertex_weighting 1
+
+#define GL_MODELVIEW0_STACK_DEPTH_EXT                           0x0BA3  /* alias to GL_MODELVIEW_STACK_DEPTH */
+#define GL_MODELVIEW1_STACK_DEPTH_EXT                           0x8502
+#define GL_MODELVIEW0_MATRIX_EXT                                0x0BA6  /* alias to GL_MODELVIEW_MATRIX */
+#define GL_MODELVIEW1_MATRIX_EXT                                0x8506
+#define GL_VERTEX_WEIGHTING_EXT                                 0x8509
+#define GL_MODELVIEW0_EXT                                       0x1700  /* alias to GL_MODELVIEW */
+#define GL_MODELVIEW1_EXT                                       0x850A
+#define GL_CURRENT_VERTEX_WEIGHT_EXT                            0x850B
+#define GL_VERTEX_WEIGHT_ARRAY_EXT                              0x850C
+#define GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT                         0x850D
+#define GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT                         0x850E
+#define GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT                       0x850F
+#define GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT                      0x8510
+
+typedef void (APIENTRY * glVertexWeightfEXTPROC) (GLfloat weight);
+typedef void (APIENTRY * glVertexWeightfvEXTPROC) (const GLfloat *weight);
+typedef void (APIENTRY * glVertexWeightPointerEXTPROC) (GLsizei size, GLenum type, GLsizei stride, const GLvoid *pointer);
+
+extern glVertexWeightfEXTPROC glVertexWeightfEXT;
+extern glVertexWeightfvEXTPROC glVertexWeightfvEXT;
+extern glVertexWeightPointerEXTPROC glVertexWeightPointerEXT;
+
+#endif /* GL_EXT_vertex_weighting */
+
+/*-------------------------------------------------------------------*/
+/*------------NV_VERTEX_PROGRAM--------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_NV_vertex_program
+#define GL_NV_vertex_program 1
+
+#define GL_VERTEX_PROGRAM_NV                                    0x8620
+#define GL_VERTEX_PROGRAM_POINT_SIZE_NV                         0x8642
+#define GL_VERTEX_PROGRAM_TWO_SIDE_NV                           0x8643
+#define GL_VERTEX_STATE_PROGRAM_NV                              0x8621
+#define GL_ATTRIB_ARRAY_SIZE_NV                                 0x8623
+#define GL_ATTRIB_ARRAY_STRIDE_NV                               0x8624
+#define GL_ATTRIB_ARRAY_TYPE_NV                                 0x8625
+#define GL_CURRENT_ATTRIB_NV                                    0x8626
+#define GL_PROGRAM_PARAMETER_NV                                 0x8644
+#define GL_ATTRIB_ARRAY_POINTER_NV                              0x8645
+#define GL_PROGRAM_TARGET_NV                                    0x8646
+#define GL_PROGRAM_LENGTH_NV                                    0x8627
+#define GL_PROGRAM_RESIDENT_NV                                  0x8647
+#define GL_PROGRAM_STRING_NV                                    0x8628
+#define GL_TRACK_MATRIX_NV                                      0x8648
+#define GL_TRACK_MATRIX_TRANSFORM_NV                            0x8649
+#define GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV                      0x862E
+#define GL_MAX_TRACK_MATRICES_NV                                0x862F
+#define GL_CURRENT_MATRIX_STACK_DEPTH_NV                        0x8640
+#define GL_CURRENT_MATRIX_NV                                    0x8641
+#define GL_VERTEX_PROGRAM_BINDING_NV                            0x864A
+#define GL_PROGRAM_ERROR_POSITION_NV                            0x864B
+#define GL_MODELVIEW_PROJECTION_NV                              0x8629
+#define GL_MATRIX0_NV                                           0x8630
+#define GL_MATRIX1_NV                                           0x8631
+#define GL_MATRIX2_NV                                           0x8632
+#define GL_MATRIX3_NV                                           0x8633
+#define GL_MATRIX4_NV                                           0x8634
+#define GL_MATRIX5_NV                                           0x8635
+#define GL_MATRIX6_NV                                           0x8636
+#define GL_MATRIX7_NV                                           0x8637
+#define GL_IDENTITY_NV                                          0x862A
+#define GL_INVERSE_NV                                           0x862B
+#define GL_TRANSPOSE_NV                                         0x862C
+#define GL_INVERSE_TRANSPOSE_NV                                 0x862D
+#define GL_VERTEX_ATTRIB_ARRAY0_NV                              0x8650
+#define GL_VERTEX_ATTRIB_ARRAY1_NV                              0x8651
+#define GL_VERTEX_ATTRIB_ARRAY2_NV                              0x8652
+#define GL_VERTEX_ATTRIB_ARRAY3_NV                              0x8653
+#define GL_VERTEX_ATTRIB_ARRAY4_NV                              0x8654
+#define GL_VERTEX_ATTRIB_ARRAY5_NV                              0x8655
+#define GL_VERTEX_ATTRIB_ARRAY6_NV                              0x8656
+#define GL_VERTEX_ATTRIB_ARRAY7_NV                              0x8657
+#define GL_VERTEX_ATTRIB_ARRAY8_NV                              0x8658
+#define GL_VERTEX_ATTRIB_ARRAY9_NV                              0x8659
+#define GL_VERTEX_ATTRIB_ARRAY10_NV                             0x865A
+#define GL_VERTEX_ATTRIB_ARRAY11_NV                             0x865B
+#define GL_VERTEX_ATTRIB_ARRAY12_NV                             0x865C
+#define GL_VERTEX_ATTRIB_ARRAY13_NV                             0x865D
+#define GL_VERTEX_ATTRIB_ARRAY14_NV                             0x865E
+#define GL_VERTEX_ATTRIB_ARRAY15_NV                             0x865F
+#define GL_MAP1_VERTEX_ATTRIB0_4_NV                             0x8660
+#define GL_MAP1_VERTEX_ATTRIB1_4_NV                             0x8661
+#define GL_MAP1_VERTEX_ATTRIB2_4_NV                             0x8662
+#define GL_MAP1_VERTEX_ATTRIB3_4_NV                             0x8663
+#define GL_MAP1_VERTEX_ATTRIB4_4_NV                             0x8664
+#define GL_MAP1_VERTEX_ATTRIB5_4_NV                             0x8665
+#define GL_MAP1_VERTEX_ATTRIB6_4_NV                             0x8666
+#define GL_MAP1_VERTEX_ATTRIB7_4_NV                             0x8667
+#define GL_MAP1_VERTEX_ATTRIB8_4_NV                             0x8668
+#define GL_MAP1_VERTEX_ATTRIB9_4_NV                             0x8669
+#define GL_MAP1_VERTEX_ATTRIB10_4_NV                            0x866A
+#define GL_MAP1_VERTEX_ATTRIB11_4_NV                            0x866B
+#define GL_MAP1_VERTEX_ATTRIB12_4_NV                            0x866C
+#define GL_MAP1_VERTEX_ATTRIB13_4_NV                            0x866D
+#define GL_MAP1_VERTEX_ATTRIB14_4_NV                            0x866E
+#define GL_MAP1_VERTEX_ATTRIB15_4_NV                            0x866F
+#define GL_MAP2_VERTEX_ATTRIB0_4_NV                             0x8670
+#define GL_MAP2_VERTEX_ATTRIB1_4_NV                             0x8671
+#define GL_MAP2_VERTEX_ATTRIB2_4_NV                             0x8672
+#define GL_MAP2_VERTEX_ATTRIB3_4_NV                             0x8673
+#define GL_MAP2_VERTEX_ATTRIB4_4_NV                             0x8674
+#define GL_MAP2_VERTEX_ATTRIB5_4_NV                             0x8675
+#define GL_MAP2_VERTEX_ATTRIB6_4_NV                             0x8676
+#define GL_MAP2_VERTEX_ATTRIB7_4_NV                             0x8677
+#define GL_MAP2_VERTEX_ATTRIB8_4_NV                             0x8678
+#define GL_MAP2_VERTEX_ATTRIB9_4_NV                             0x8679
+#define GL_MAP2_VERTEX_ATTRIB10_4_NV                            0x867A
+#define GL_MAP2_VERTEX_ATTRIB11_4_NV                            0x867B
+#define GL_MAP2_VERTEX_ATTRIB12_4_NV                            0x867C
+#define GL_MAP2_VERTEX_ATTRIB13_4_NV                            0x867D
+#define GL_MAP2_VERTEX_ATTRIB14_4_NV                            0x867E
+#define GL_MAP2_VERTEX_ATTRIB15_4_NV                            0x867F
+
+typedef void (APIENTRY * glBindProgramNVPROC) (GLenum target, GLuint id);
+typedef void (APIENTRY * glDeleteProgramsNVPROC) (GLsizei n, const GLuint *ids);
+typedef void (APIENTRY * glExecuteProgramNVPROC) (GLenum target, GLuint id, const GLfloat *params);
+typedef void (APIENTRY * glGenProgramsNVPROC) (GLsizei n, GLuint *ids);
+typedef GLboolean (APIENTRY * glAreProgramsResidentNVPROC) (GLsizei n, const GLuint *ids, GLboolean *residences);
+typedef void (APIENTRY * glRequestResidentProgramsNVPROC) (GLsizei n, GLuint *ids);
+typedef void (APIENTRY * glGetProgramParameterfvNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRY * glGetProgramParameterdvNVPROC) (GLenum target, GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRY * glGetProgramivNVPROC) (GLuint id, GLenum pname, GLint *params);
+typedef void (APIENTRY * glGetProgramStringNVPROC) (GLuint id, GLenum pname, GLubyte *program);
+typedef void (APIENTRY * glGetTrackMatrixivNVPROC) (GLenum target, GLuint address, GLenum pname, GLint *params);
+typedef void (APIENTRY * glGetVertexAttribdvNVPROC) (GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRY * glGetVertexAttribfvNVPROC) (GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRY * glGetVertexAttribivNVPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRY * glGetVertexAttribPointervNVPROC) (GLuint index, GLenum pname, GLvoid **pointer);
+typedef GLboolean (APIENTRY * glIsProgramNVPROC) (GLuint id);
+typedef void (APIENTRY * glLoadProgramNVPROC) (GLenum target, GLuint id, GLsizei len, const GLubyte *program);
+typedef void (APIENTRY * glProgramParameter4fNVPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRY * glProgramParameter4dNVPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRY * glProgramParameter4dvNVPROC) (GLenum target, GLuint index, const GLdouble *params);
+typedef void (APIENTRY * glProgramParameter4fvNVPROC) (GLenum target, GLuint index, const GLfloat *params);
+typedef void (APIENTRY * glProgramParameters4dvNVPROC) (GLenum target, GLuint index, GLuint num, const GLdouble *params);
+typedef void (APIENTRY * glProgramParameters4fvNVPROC) (GLenum target, GLuint index, GLuint num, const GLfloat *params);
+typedef void (APIENTRY * glTrackMatrixNVPROC) (GLenum target, GLuint address, GLenum matrix, GLenum transform);
+typedef void (APIENTRY * glVertexAttribPointerNVPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRY * glVertexAttrib1sNVPROC) (GLuint index, GLshort x);
+typedef void (APIENTRY * glVertexAttrib1fNVPROC) (GLuint index, GLfloat x);
+typedef void (APIENTRY * glVertexAttrib1dNVPROC) (GLuint index, GLdouble x);
+typedef void (APIENTRY * glVertexAttrib2sNVPROC) (GLuint index, GLshort x, GLshort y);
+typedef void (APIENTRY * glVertexAttrib2fNVPROC) (GLuint index, GLfloat x, GLfloat y);
+typedef void (APIENTRY * glVertexAttrib2dNVPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (APIENTRY * glVertexAttrib3sNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRY * glVertexAttrib3fNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRY * glVertexAttrib3dNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRY * glVertexAttrib4sNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRY * glVertexAttrib4fNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRY * glVertexAttrib4dNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRY * glVertexAttrib4ubNVPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+typedef void (APIENTRY * glVertexAttrib1svNVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRY * glVertexAttrib1fvNVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRY * glVertexAttrib1dvNVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRY * glVertexAttrib2svNVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRY * glVertexAttrib2fvNVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRY * glVertexAttrib2dvNVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRY * glVertexAttrib3svNVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRY * glVertexAttrib3fvNVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRY * glVertexAttrib3dvNVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRY * glVertexAttrib4svNVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRY * glVertexAttrib4fvNVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRY * glVertexAttrib4dvNVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRY * glVertexAttrib4ubvNVPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRY * glVertexAttribs1svNVPROC) (GLuint index, GLsizei n, const GLshort *v);
+typedef void (APIENTRY * glVertexAttribs1fvNVPROC) (GLuint index, GLsizei n, const GLfloat *v);
+typedef void (APIENTRY * glVertexAttribs1dvNVPROC) (GLuint index, GLsizei n, const GLdouble *v);
+typedef void (APIENTRY * glVertexAttribs2svNVPROC) (GLuint index, GLsizei n, const GLshort *v);
+typedef void (APIENTRY * glVertexAttribs2fvNVPROC) (GLuint index, GLsizei n, const GLfloat *v);
+typedef void (APIENTRY * glVertexAttribs2dvNVPROC) (GLuint index, GLsizei n, const GLdouble *v);
+typedef void (APIENTRY * glVertexAttribs3svNVPROC) (GLuint index, GLsizei n, const GLshort *v);
+typedef void (APIENTRY * glVertexAttribs3fvNVPROC) (GLuint index, GLsizei n, const GLfloat *v);
+typedef void (APIENTRY * glVertexAttribs3dvNVPROC) (GLuint index, GLsizei n, const GLdouble *v);
+typedef void (APIENTRY * glVertexAttribs4svNVPROC) (GLuint index, GLsizei n, const GLshort *v);
+typedef void (APIENTRY * glVertexAttribs4fvNVPROC) (GLuint index, GLsizei n, const GLfloat *v);
+typedef void (APIENTRY * glVertexAttribs4dvNVPROC) (GLuint index, GLsizei n, const GLdouble *v);
+typedef void (APIENTRY * glVertexAttribs4ubvNVPROC) (GLuint index, GLsizei n, const GLubyte *v);
+
+extern glBindProgramNVPROC glBindProgramNV;
+extern glDeleteProgramsNVPROC glDeleteProgramsNV;
+extern glExecuteProgramNVPROC glExecuteProgramNV;
+extern glGenProgramsNVPROC glGenProgramsNV;
+extern glAreProgramsResidentNVPROC glAreProgramsResidentNV;
+extern glRequestResidentProgramsNVPROC glRequestResidentProgramsNV;
+extern glGetProgramParameterfvNVPROC glGetProgramParameterfvNV;
+extern glGetProgramParameterdvNVPROC glGetProgramParameterdvNV;
+extern glGetProgramivNVPROC glGetProgramivNV;
+extern glGetProgramStringNVPROC glGetProgramStringNV;
+extern glGetTrackMatrixivNVPROC glGetTrackMatrixivNV;
+extern glGetVertexAttribdvNVPROC glGetVertexAttribdvNV;
+extern glGetVertexAttribfvNVPROC glGetVertexAttribfvNV;
+extern glGetVertexAttribivNVPROC glGetVertexAttribivNV;
+extern glGetVertexAttribPointervNVPROC glGetVertexAttribPointervNV;
+extern glIsProgramNVPROC glIsProgramNV;
+extern glLoadProgramNVPROC glLoadProgramNV;
+extern glProgramParameter4fNVPROC glProgramParameter4fNV;
+extern glProgramParameter4dNVPROC glProgramParameter4dNV;
+extern glProgramParameter4dvNVPROC glProgramParameter4dvNV;
+extern glProgramParameter4fvNVPROC glProgramParameter4fvNV;
+extern glProgramParameters4dvNVPROC glProgramParameters4dvNV;
+extern glProgramParameters4fvNVPROC glProgramParameters4fvNV;
+extern glTrackMatrixNVPROC glTrackMatrixNV;
+extern glVertexAttribPointerNVPROC glVertexAttribPointerNV;
+extern glVertexAttrib1sNVPROC glVertexAttrib1sNV;
+extern glVertexAttrib1fNVPROC glVertexAttrib1fNV;
+extern glVertexAttrib1dNVPROC glVertexAttrib1dNV;
+extern glVertexAttrib2sNVPROC glVertexAttrib2sNV;
+extern glVertexAttrib2fNVPROC glVertexAttrib2fNV;
+extern glVertexAttrib2dNVPROC glVertexAttrib2dNV;
+extern glVertexAttrib3sNVPROC glVertexAttrib3sNV;
+extern glVertexAttrib3fNVPROC glVertexAttrib3fNV;
+extern glVertexAttrib3dNVPROC glVertexAttrib3dNV;
+extern glVertexAttrib4sNVPROC glVertexAttrib4sNV;
+extern glVertexAttrib4fNVPROC glVertexAttrib4fNV;
+extern glVertexAttrib4dNVPROC glVertexAttrib4dNV;
+extern glVertexAttrib4ubNVPROC glVertexAttrib4ubNV;
+extern glVertexAttrib1svNVPROC glVertexAttrib1svNV;
+extern glVertexAttrib1fvNVPROC glVertexAttrib1fvNV;
+extern glVertexAttrib1dvNVPROC glVertexAttrib1dvNV;
+extern glVertexAttrib2svNVPROC glVertexAttrib2svNV;
+extern glVertexAttrib2fvNVPROC glVertexAttrib2fvNV;
+extern glVertexAttrib2dvNVPROC glVertexAttrib2dvNV;
+extern glVertexAttrib3svNVPROC glVertexAttrib3svNV;
+extern glVertexAttrib3fvNVPROC glVertexAttrib3fvNV;
+extern glVertexAttrib3dvNVPROC glVertexAttrib3dvNV;
+extern glVertexAttrib4svNVPROC glVertexAttrib4svNV;
+extern glVertexAttrib4fvNVPROC glVertexAttrib4fvNV;
+extern glVertexAttrib4dvNVPROC glVertexAttrib4dvNV;
+extern glVertexAttrib4ubvNVPROC glVertexAttrib4ubvNV;
+extern glVertexAttribs1svNVPROC glVertexAttribs1svNV;
+extern glVertexAttribs1fvNVPROC glVertexAttribs1fvNV;
+extern glVertexAttribs1dvNVPROC glVertexAttribs1dvNV;
+extern glVertexAttribs2svNVPROC glVertexAttribs2svNV;
+extern glVertexAttribs2fvNVPROC glVertexAttribs2fvNV;
+extern glVertexAttribs2dvNVPROC glVertexAttribs2dvNV;
+extern glVertexAttribs3svNVPROC glVertexAttribs3svNV;
+extern glVertexAttribs3fvNVPROC glVertexAttribs3fvNV;
+extern glVertexAttribs3dvNVPROC glVertexAttribs3dvNV;
+extern glVertexAttribs4svNVPROC glVertexAttribs4svNV;
+extern glVertexAttribs4fvNVPROC glVertexAttribs4fvNV;
+extern glVertexAttribs4dvNVPROC glVertexAttribs4dvNV;
+extern glVertexAttribs4ubvNVPROC glVertexAttribs4ubvNV;
+
+#endif /* GL_NV_vertex_program */
+
+/*-------------------------------------------------------------------*/
+/*------------NV_FENCE-----------------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_NV_fence
+#define GL_NV_fence 1
+
+#define GL_ALL_COMPLETED_NV                                     0x84F2
+#define GL_FENCE_STATUS_NV                                      0x84F3
+#define GL_FENCE_CONDITION_NV                                   0x84F4
+
+typedef void (APIENTRY * glGenFencesNVPROC) (GLsizei n, GLuint *fences);
+typedef void (APIENTRY * glDeleteFencesNVPROC) (GLsizei n, const GLuint *fences);
+typedef void (APIENTRY * glSetFenceNVPROC) (GLuint fence, GLenum condition);
+typedef GLboolean (APIENTRY * glTestFenceNVPROC) (GLuint fence);
+typedef void (APIENTRY * glFinishFenceNVPROC) (GLuint fence);
+typedef GLboolean (APIENTRY * glIsFenceNVPROC) (GLuint fence);
+typedef void (APIENTRY * glGetFenceivNVPROC) (GLuint fence, GLenum pname, GLint *params);
+
+extern glGenFencesNVPROC glGenFencesNV;
+extern glDeleteFencesNVPROC glDeleteFencesNV;
+extern glSetFenceNVPROC glSetFenceNV;
+extern glTestFenceNVPROC glTestFenceNV;
+extern glFinishFenceNVPROC glFinishFenceNV;
+extern glIsFenceNVPROC glIsFenceNV;
+extern glGetFenceivNVPROC glGetFenceivNV;
+
+#endif /* GL_NV_fence */
+
+/*-------------------------------------------------------------------*/
+/*------------NV_TEXTURE_SHADER2-------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_NV_texture_shader2
+#define GL_NV_texture_shader2
+
+#define GL_DOT_PRODUCT_TEXTURE_3D_NV                            0x86EF
+#define GL_HILO_NV                                              0x86F4
+#define GL_DSDT_NV                                              0x86F5
+#define GL_DSDT_MAG_NV                                          0x86F6
+#define GL_DSDT_MAG_VIB_NV                                      0x86F7
+#define GL_UNSIGNED_INT_S8_S8_8_8_NV                            0x86DA
+#define GL_UNSIGNED_INT_8_8_S8_S8_REV_NV                        0x86DB
+#define GL_SIGNED_RGBA_NV                                       0x86FB
+#define GL_SIGNED_RGBA8_NV                                      0x86FC
+#define GL_SIGNED_RGB_NV                                        0x86FE
+#define GL_SIGNED_RGB8_NV                                       0x86FF
+#define GL_SIGNED_LUMINANCE_NV                                  0x8701
+#define GL_SIGNED_LUMINANCE8_NV                                 0x8702
+#define GL_SIGNED_LUMINANCE_ALPHA_NV                            0x8703
+#define GL_SIGNED_LUMINANCE8_ALPHA8_NV                          0x8704
+#define GL_SIGNED_ALPHA_NV                                      0x8705
+#define GL_SIGNED_ALPHA8_NV                                     0x8706
+#define GL_SIGNED_INTENSITY_NV                                  0x8707
+#define GL_SIGNED_INTENSITY8_NV                                 0x8708
+#define GL_SIGNED_RGB_UNSIGNED_ALPHA_NV                         0x870C
+#define GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV                       0x870D
+#define GL_HILO16_NV                                            0x86F8
+#define GL_SIGNED_HILO_NV                                       0x86F9
+#define GL_SIGNED_HILO16_NV                                     0x86FA
+#define GL_DSDT8_NV                                             0x8709
+#define GL_DSDT8_MAG8_NV                                        0x870A
+#define GL_DSDT_MAG_INTENSITY_NV                                0x86DC
+#define GL_DSDT8_MAG8_INTENSITY8_NV                             0x870B 
+
+#endif /* GL_NV_texture_shader2 */
+
+/*-------------------------------------------------------------------*/
+/*------------NV_BLEND_SQUARE----------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_NV_blend_square
+#define GL_NV_blend_square 1
+
+#endif /* GL_NV_blend_square */
+
+/*-------------------------------------------------------------------*/
+/*------------NV_LIGHT_MAX_EXPONENT----------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_NV_light_max_exponent
+#define GL_NV_light_max_exponent 1
+
+#define GL_MAX_SHININESS_NV                                     0x8504
+#define GL_MAX_SPOT_EXPONENT_NV                                 0x8505
+
+#endif /* GL_NV_light_max_exponent */
+
+/*-------------------------------------------------------------------*/
+/*------------NV_PACKED_DEPTH_STENCIL--------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_NV_packed_depth_stencil
+#define GL_NV_packed_depth_stencil 1
+
+#define GL_DEPTH_STENCIL_NV                                     0x84F9
+#define GL_UNSIGNED_INT_24_8_NV                                 0x84FA
+
+#endif /* GL_NV_packed_depth_stencil */
+
+/*-------------------------------------------------------------------*/
+/*------------NV_REGISTER_COMBINERS2---------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_NV_register_combiners2
+#define GL_NV_register_combiners2
+
+#define GL_PER_STAGE_CONSTANTS_NV                               0x8535
+
+typedef void (APIENTRY * glCombinerStageParameterfvNVPROC) (GLenum stage, GLenum pname, const GLfloat *params);
+typedef void (APIENTRY * glGetCombinerStageParameterfvNVPROC) (GLenum stage, GLenum pname, GLfloat *params);
+
+extern glCombinerStageParameterfvNVPROC glCombinerStageParameterfvNV;
+extern glGetCombinerStageParameterfvNVPROC glGetCombinerStageParameterfvNV;
+
+#endif /* GL_NV_register_combiners2 */
+
+/*-------------------------------------------------------------------*/
+/*------------EXT_ABGR-----------------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_EXT_abgr
+#define GL_EXT_abgr 1
+
+#define GL_ABGR_EXT                                             0x8000
+
+#endif /* GL_EXT_abgr */
+
+/*-------------------------------------------------------------------*/
+/*------------EXT_STENCIL_WRAP---------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_EXT_stencil_wrap
+#define GL_EXT_stencil_wrap 1
+
+#define GL_INCR_WRAP_EXT                                        0x8507
+#define GL_DECR_WRAP_EXT                                        0x8508
+
+#endif /* GL_EXT_stencil_wrap */
+
+/*-------------------------------------------------------------------*/
+/*------------EXT_TEXTURE_LOD_BIAS-----------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_EXT_texture_lod_bias
+#define GL_EXT_texture_lod_bias 1
+
+#define GL_TEXTURE_FILTER_CONTROL_EXT                           0x8500
+#define GL_TEXTURE_LOD_BIAS_EXT                                 0x8501
+#define GL_MAX_TEXTURE_LOD_BIAS_EXT                             0x84FD
+
+#endif /* GL_EXT_texture_lod_bias */
+
+/*-------------------------------------------------------------------*/
+/*------------NV_EVALUATORS------------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_NV_evaluators
+#define GL_NV_evaluators 1
+
+#define GL_EVAL_2D_NV                                           0x86C0
+#define GL_EVAL_TRIANGULAR_2D_NV                                0x86C1
+#define GL_MAP_TESSELLATION_NV                                  0x86C2
+#define GL_MAP_ATTRIB_U_ORDER_NV                                0x86C3
+#define GL_MAP_ATTRIB_V_ORDER_NV                                0x86C4
+#define GL_EVAL_FRACTIONAL_TESSELLATION_NV                      0x86C5
+#define GL_EVAL_VERTEX_ATTRIB0_NV                               0x86C6
+#define GL_EVAL_VERTEX_ATTRIB1_NV                               0x86C7
+#define GL_EVAL_VERTEX_ATTRIB2_NV                               0x86C8
+#define GL_EVAL_VERTEX_ATTRIB3_NV                               0x86C9
+#define GL_EVAL_VERTEX_ATTRIB4_NV                               0x86CA
+#define GL_EVAL_VERTEX_ATTRIB5_NV                               0x86CB
+#define GL_EVAL_VERTEX_ATTRIB6_NV                               0x86CC
+#define GL_EVAL_VERTEX_ATTRIB7_NV                               0x86CD
+#define GL_EVAL_VERTEX_ATTRIB8_NV                               0x86CE
+#define GL_EVAL_VERTEX_ATTRIB9_NV                               0x86CF
+#define GL_EVAL_VERTEX_ATTRIB10_NV                              0x86D0
+#define GL_EVAL_VERTEX_ATTRIB11_NV                              0x86D1
+#define GL_EVAL_VERTEX_ATTRIB12_NV                              0x86D2
+#define GL_EVAL_VERTEX_ATTRIB13_NV                              0x86D3
+#define GL_EVAL_VERTEX_ATTRIB14_NV                              0x86D4
+#define GL_EVAL_VERTEX_ATTRIB15_NV                              0x86D5
+#define GL_MAX_MAP_TESSELLATION_NV                              0x86D6
+#define GL_MAX_RATIONAL_EVAL_ORDER_NV                           0x86D7
+
+typedef void (APIENTRY * glMapControlPointsNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const GLvoid *points);
+typedef void (APIENTRY * glMapParameterivNVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRY * glMapParameterfvNVPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRY * glGetMapControlPointsNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, GLvoid *points);
+typedef void (APIENTRY * glGetMapParameterivNVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRY * glGetMapParameterfvNVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRY * glGetMapAttribParameterivNVPROC) (GLenum target, GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRY * glGetMapAttribParameterfvNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRY * glEvalMapsNVPROC) (GLenum target, GLenum mode);
+
+extern glMapControlPointsNVPROC glMapControlPointsNV;
+extern glMapParameterivNVPROC glMapParameterivNV;
+extern glMapParameterfvNVPROC glMapParameterfvNV;
+extern glGetMapControlPointsNVPROC glGetMapControlPointsNV;
+extern glGetMapParameterivNVPROC glGetMapParameterivNV;
+extern glGetMapParameterfvNVPROC glGetMapParameterfvNV;
+extern glGetMapAttribParameterivNVPROC glGetMapAttribParameterivNV;
+extern glGetMapAttribParameterfvNVPROC glGetMapAttribParameterfvNV;
+extern glEvalMapsNVPROC glEvalMapsNV;
+
+#endif /* GL_NV_evaluators */
+
+/*-------------------------------------------------------------------*/
+/*------------NV_COPY_DEPTH_TO_COLOR---------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_NV_copy_depth_to_color
+#define GL_NV_copy_depth_to_color 1
+
+#define GL_DEPTH_STENCIL_TO_RGBA_NV                             0x886E
+#define GL_DEPTH_STENCIL_TO_BGRA_NV                             0x886F
+
+#endif /* GL_NV_copy_depth_to_color */
+
+/*-------------------------------------------------------------------*/
+/*------------ATI_PN_TRIANGLES---------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_ATI_pn_triangles
+#define GL_ATI_pn_triangles 1
+
+#define GL_PN_TRIANGLES_ATI                                     0x87F0
+#define GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI               0x87F1
+#define GL_PN_TRIANGLES_POINT_MODE_ATI                          0x87F2
+#define GL_PN_TRIANGLES_NORMAL_MODE_ATI                         0x87F3
+#define GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI                   0x87F4
+#define GL_PN_TRIANGLES_POINT_MODE_LINEAR_ATI                   0x87F5
+#define GL_PN_TRIANGLES_POINT_MODE_CUBIC_ATI                    0x87F6
+#define GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI                  0x87F7
+#define GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI               0x87F8
+
+typedef void (APIENTRY * glPNTrianglesiATIPROC) (GLenum pname, GLint param);
+typedef void (APIENTRY * glPNTrianglesfATIPROC) (GLenum pname, GLfloat param);
+
+extern glPNTrianglesiATIPROC glPNTrianglesiATI;
+extern glPNTrianglesfATIPROC glPNTrianglesfATI;
+
+#endif /* GL_ATI_pn_triangles */
+
+/*-------------------------------------------------------------------*/
+/*------------ARB_POINT_PARAMETERS-----------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_ARB_point_parameters
+#define GL_ARB_point_parameters 1
+
+#define GL_POINT_SIZE_MIN_ARB                                   0x8126
+#define GL_POINT_SIZE_MAX_ARB                                   0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE_ARB                        0x8128
+#define GL_POINT_DISTANCE_ATTENUATION_ARB                       0x8129
+
+typedef void (APIENTRY * glPointParameterfARBPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRY * glPointParameterfvARBPROC) (GLenum pname, GLfloat *params);
+
+extern glPointParameterfARBPROC glPointParameterfARB;
+extern glPointParameterfvARBPROC glPointParameterfvARB;
+
+#endif /* GL_ARB_point_parameters */
+
+/*-------------------------------------------------------------------*/
+/*------------ARB_TEXTURE_ENV_CROSSBAR-------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_ARB_texture_env_crossbar
+#define GL_ARB_texture_env_crossbar 1
+
+#endif
+
+/*-------------------------------------------------------------------*/
+/*------------ARB_VERTEX_BLEND---------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_ARB_vertex_blend
+#define GL_ARB_vertex_blend 1
+
+#define GL_MAX_VERTEX_UNITS_ARB                                 0x86A4
+#define GL_ACTIVE_VERTEX_UNITS_ARB                              0x86A5
+#define GL_WEIGHT_SUM_UNITY_ARB                                 0x86A6      
+#define GL_VERTEX_BLEND_ARB                                     0x86A7
+#define GL_CURRENT_WEIGHT_ARB                                   0x86A8
+#define GL_WEIGHT_ARRAY_TYPE_ARB                                0x86A9
+#define GL_WEIGHT_ARRAY_STRIDE_ARB                              0x86AA
+#define GL_WEIGHT_ARRAY_SIZE_ARB                                0x86AB
+#define GL_WEIGHT_ARRAY_POINTER_ARB                             0x86AC
+#define GL_WEIGHT_ARRAY_ARB                                     0x86AD
+#define GL_MODELVIEW0_ARB                                       0x1700
+#define GL_MODELVIEW1_ARB                                       0x850A
+#define GL_MODELVIEW2_ARB                                       0x8722
+#define GL_MODELVIEW3_ARB                                       0x8723
+#define GL_MODELVIEW4_ARB                                       0x8724
+#define GL_MODELVIEW5_ARB                                       0x8725
+#define GL_MODELVIEW6_ARB                                       0x8726
+#define GL_MODELVIEW7_ARB                                       0x8727
+#define GL_MODELVIEW8_ARB                                       0x8728
+#define GL_MODELVIEW9_ARB                                       0x8729
+#define GL_MODELVIEW10_ARB                                      0x872A
+#define GL_MODELVIEW11_ARB                                      0x872B
+#define GL_MODELVIEW12_ARB                                      0x872C
+#define GL_MODELVIEW13_ARB                                      0x872D
+#define GL_MODELVIEW14_ARB                                      0x872E
+#define GL_MODELVIEW15_ARB                                      0x872F
+#define GL_MODELVIEW16_ARB                                      0x8730
+#define GL_MODELVIEW17_ARB                                      0x8731
+#define GL_MODELVIEW18_ARB                                      0x8732
+#define GL_MODELVIEW19_ARB                                      0x8733
+#define GL_MODELVIEW20_ARB                                      0x8734
+#define GL_MODELVIEW21_ARB                                      0x8735
+#define GL_MODELVIEW22_ARB                                      0x8736
+#define GL_MODELVIEW23_ARB                                      0x8737
+#define GL_MODELVIEW24_ARB                                      0x8738
+#define GL_MODELVIEW25_ARB                                      0x8739
+#define GL_MODELVIEW26_ARB                                      0x873A
+#define GL_MODELVIEW27_ARB                                      0x873B
+#define GL_MODELVIEW28_ARB                                      0x873C
+#define GL_MODELVIEW29_ARB                                      0x873D
+#define GL_MODELVIEW30_ARB                                      0x873E
+#define GL_MODELVIEW31_ARB                                      0x873F
+
+typedef void (APIENTRY * glWeightbvARBPROC) (GLint size, GLbyte *weights);
+typedef void (APIENTRY * glWeightsvARBPROC) (GLint size, GLshort *weights);
+typedef void (APIENTRY * glWeightivARBPROC) (GLint size, GLint *weights);
+typedef void (APIENTRY * glWeightfvARBPROC) (GLint size, GLfloat *weights);
+typedef void (APIENTRY * glWeightdvARBPROC) (GLint size, GLdouble *weights);
+typedef void (APIENTRY * glWeightubvARBPROC) (GLint size, GLubyte *weights);
+typedef void (APIENTRY * glWeightusvARBPROC) (GLint size, GLushort *weights);
+typedef void (APIENTRY * glWeightuivARBPROC) (GLint size, GLuint *weights);
+typedef void (APIENTRY * glWeightPointerARBPROC) (GLint size, GLenum type, GLsizei stride, GLvoid *pointer);
+typedef void (APIENTRY * glVertexBlendARBPROC) (GLint count);
+
+extern glWeightbvARBPROC glWeightbvARB;
+extern glWeightsvARBPROC glWeightsvARB;
+extern glWeightivARBPROC glWeightivARB;
+extern glWeightfvARBPROC glWeightfvARB;
+extern glWeightdvARBPROC glWeightdvARB;
+extern glWeightubvARBPROC glWeightubvARB;
+extern glWeightusvARBPROC glWeightusvARB;
+extern glWeightuivARBPROC glWeightuivARB;
+extern glWeightPointerARBPROC glWeightPointerARB;
+extern glVertexBlendARBPROC glVertexBlendARB;
+
+#endif /* GL_ARB_vertex_blend */
+
+/*-------------------------------------------------------------------*/
+/*------------EXT_MULTI_DRAW_ARRAYS----------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_EXT_multi_draw_arrays
+#define GL_EXT_multi_draw_arrays 1
+
+typedef void (APIENTRY * glMultiDrawArraysEXTPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
+typedef void (APIENTRY * glMultiDrawElementsEXTPROC) (GLenum mode, GLsizei *count, GLenum type, const GLvoid **indices, GLsizei primcount);
+
+extern glMultiDrawArraysEXTPROC glMultiDrawArraysEXT;
+extern glMultiDrawElementsEXTPROC glMultiDrawElementsEXT;
+
+#endif /* GL_EXT_multi_draw_arrays */
+
+/*-------------------------------------------------------------------*/
+/*------------ARB_MATRIX_PALETTE-------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_ARB_matrix_palette
+#define GL_ARB_matrix_palette 1
+
+#define GL_MATRIX_PALETTE_ARB                                   0x8840
+#define GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB                   0x8841
+#define GL_MAX_PALETTE_MATRICES_ARB                             0x8842
+#define GL_CURRENT_PALETTE_MATRIX_ARB                           0x8843
+#define GL_MATRIX_INDEX_ARRAY_ARB                               0x8844
+#define GL_CURRENT_MATRIX_INDEX_ARB                             0x8845
+#define GL_MATRIX_INDEX_ARRAY_SIZE_ARB                          0x8846
+#define GL_MATRIX_INDEX_ARRAY_TYPE_ARB                          0x8847
+#define GL_MATRIX_INDEX_ARRAY_STRIDE_ARB                        0x8848
+#define GL_MATRIX_INDEX_ARRAY_POINTER_ARB                       0x8849
+
+typedef void (APIENTRY * glCurrentPaletteMatrixARBPROC) (GLint index);
+typedef void (APIENTRY * glMatrixIndexubvARBPROC) (GLint size, GLubyte *indices);
+typedef void (APIENTRY * glMatrixIndexusvARBPROC) (GLint size, GLushort *indices);
+typedef void (APIENTRY * glMatrixIndexuivARBPROC) (GLint size, GLuint *indices);
+typedef void (APIENTRY * glMatrixIndexPointerARBPROC) (GLint size, GLenum type, GLsizei stride, GLvoid *pointer);
+
+extern glCurrentPaletteMatrixARBPROC glCurrentPaletteMatrixARB;
+extern glMatrixIndexubvARBPROC glMatrixIndexubvARB;
+extern glMatrixIndexusvARBPROC glMatrixIndexusvARB;
+extern glMatrixIndexuivARBPROC glMatrixIndexuivARB;
+extern glMatrixIndexPointerARBPROC glMatrixIndexPointerARB;
+
+#endif /* GL_ARB_matrix_palette */
+
+/*-------------------------------------------------------------------*/
+/*------------EXT_VERTEX_SHADER--------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_EXT_vertex_shader
+#define GL_EXT_vertex_shader 1
+
+#define GL_VERTEX_SHADER_EXT                                    0x8780
+#define GL_VERTEX_SHADER_BINDING_EXT                            0x8781
+#define GL_OP_INDEX_EXT                                         0x8782
+#define GL_OP_NEGATE_EXT                                        0x8783
+#define GL_OP_DOT3_EXT                                          0x8784
+#define GL_OP_DOT4_EXT                                          0x8785
+#define GL_OP_MUL_EXT                                           0x8786
+#define GL_OP_ADD_EXT                                           0x8787
+#define GL_OP_MADD_EXT                                          0x8788
+#define GL_OP_FRAC_EXT                                          0x8789
+#define GL_OP_MAX_EXT                                           0x878A
+#define GL_OP_MIN_EXT                                           0x878B
+#define GL_OP_SET_GE_EXT                                        0x878C
+#define GL_OP_SET_LT_EXT                                        0x878D
+#define GL_OP_CLAMP_EXT                                         0x878E
+#define GL_OP_FLOOR_EXT                                         0x878F
+#define GL_OP_ROUND_EXT                                         0x8790
+#define GL_OP_EXP_BASE_2_EXT                                    0x8791
+#define GL_OP_LOG_BASE_2_EXT                                    0x8792
+#define GL_OP_POWER_EXT                                         0x8793
+#define GL_OP_RECIP_EXT                                         0x8794
+#define GL_OP_RECIP_SQRT_EXT                                    0x8795
+#define GL_OP_SUB_EXT                                           0x8796
+#define GL_OP_CROSS_PRODUCT_EXT                                 0x8797
+#define GL_OP_MULTIPLY_MATRIX_EXT                               0x8798
+#define GL_OP_MOV_EXT                                           0x8799
+#define GL_OUTPUT_VERTEX_EXT                                    0x879A
+#define GL_OUTPUT_COLOR0_EXT                                    0x879B
+#define GL_OUTPUT_COLOR1_EXT                                    0x879C
+#define GL_OUTPUT_TEXTURE_COORD0_EXT                            0x879D
+#define GL_OUTPUT_TEXTURE_COORD1_EXT                            0x879E
+#define GL_OUTPUT_TEXTURE_COORD2_EXT                            0x879F
+#define GL_OUTPUT_TEXTURE_COORD3_EXT                            0x87A0
+#define GL_OUTPUT_TEXTURE_COORD4_EXT                            0x87A1
+#define GL_OUTPUT_TEXTURE_COORD5_EXT                            0x87A2
+#define GL_OUTPUT_TEXTURE_COORD6_EXT                            0x87A3
+#define GL_OUTPUT_TEXTURE_COORD7_EXT                            0x87A4
+#define GL_OUTPUT_TEXTURE_COORD8_EXT                            0x87A5
+#define GL_OUTPUT_TEXTURE_COORD9_EXT                            0x87A6
+#define GL_OUTPUT_TEXTURE_COORD10_EXT                           0x87A7
+#define GL_OUTPUT_TEXTURE_COORD11_EXT                           0x87A8
+#define GL_OUTPUT_TEXTURE_COORD12_EXT                           0x87A9
+#define GL_OUTPUT_TEXTURE_COORD13_EXT                           0x87AA
+#define GL_OUTPUT_TEXTURE_COORD14_EXT                           0x87AB
+#define GL_OUTPUT_TEXTURE_COORD15_EXT                           0x87AC
+#define GL_OUTPUT_TEXTURE_COORD16_EXT                           0x87AD
+#define GL_OUTPUT_TEXTURE_COORD17_EXT                           0x87AE
+#define GL_OUTPUT_TEXTURE_COORD18_EXT                           0x87AF
+#define GL_OUTPUT_TEXTURE_COORD19_EXT                           0x87B0
+#define GL_OUTPUT_TEXTURE_COORD20_EXT                           0x87B1
+#define GL_OUTPUT_TEXTURE_COORD21_EXT                           0x87B2
+#define GL_OUTPUT_TEXTURE_COORD22_EXT                           0x87B3
+#define GL_OUTPUT_TEXTURE_COORD23_EXT                           0x87B4
+#define GL_OUTPUT_TEXTURE_COORD24_EXT                           0x87B5
+#define GL_OUTPUT_TEXTURE_COORD25_EXT                           0x87B6
+#define GL_OUTPUT_TEXTURE_COORD26_EXT                           0x87B7
+#define GL_OUTPUT_TEXTURE_COORD27_EXT                           0x87B8
+#define GL_OUTPUT_TEXTURE_COORD28_EXT                           0x87B9
+#define GL_OUTPUT_TEXTURE_COORD29_EXT                           0x87BA
+#define GL_OUTPUT_TEXTURE_COORD30_EXT                           0x87BB
+#define GL_OUTPUT_TEXTURE_COORD31_EXT                           0x87BC
+#define GL_OUTPUT_FOG_EXT                                       0x87BD
+#define GL_SCALAR_EXT                                           0x87BE
+#define GL_VECTOR_EXT                                           0x87BF
+#define GL_MATRIX_EXT                                           0x87C0
+#define GL_VARIANT_EXT                                          0x87C1
+#define GL_INVARIANT_EXT                                        0x87C2
+#define GL_LOCAL_CONSTANT_EXT                                   0x87C3
+#define GL_LOCAL_EXT                                            0x87C4
+#define GL_MAX_VERTEX_SHADER_INSTRUCTIONS_EXT                   0x87C5
+#define GL_MAX_VERTEX_SHADER_VARIANTS_EXT                       0x87C6
+#define GL_MAX_VERTEX_SHADER_INVARIANTS_EXT                     0x87C7
+#define GL_MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT                0x87C8
+#define GL_MAX_VERTEX_SHADER_LOCALS_EXT                         0x87C9
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT         0x87CA
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT             0x87CB
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INVARIANTS_EXT           0x87CC
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT      0x87CD
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT               0x87CE
+#define GL_VERTEX_SHADER_INSTRUCTIONS_EXT                       0x87CF
+#define GL_VERTEX_SHADER_VARIANTS_EXT                           0x87D0
+#define GL_VERTEX_SHADER_INVARIANTS_EXT                         0x87D1
+#define GL_VERTEX_SHADER_LOCAL_CONSTANTS_EXT                    0x87D2
+#define GL_VERTEX_SHADER_LOCALS_EXT                             0x87D3
+#define GL_VERTEX_SHADER_OPTIMIZED_EXT                          0x87D4
+#define GL_X_EXT                                                0x87D5
+#define GL_Y_EXT                                                0x87D6
+#define GL_Z_EXT                                                0x87D7
+#define GL_W_EXT                                                0x87D8
+#define GL_NEGATIVE_X_EXT                                       0x87D9
+#define GL_NEGATIVE_Y_EXT                                       0x87DA
+#define GL_NEGATIVE_Z_EXT                                       0x87DB
+#define GL_NEGATIVE_W_EXT                                       0x87DC
+#define GL_ZERO_EXT                                             0x87DD
+#define GL_ONE_EXT                                              0x87DE
+#define GL_NEGATIVE_ONE_EXT                                     0x87DF
+#define GL_NORMALIZED_RANGE_EXT                                 0x87E0
+#define GL_FULL_RANGE_EXT                                       0x87E1
+#define GL_CURRENT_VERTEX_EXT                                   0x87E2
+#define GL_MVP_MATRIX_EXT                                       0x87E3
+#define GL_VARIANT_VALUE_EXT                                    0x87E4
+#define GL_VARIANT_DATATYPE_EXT                                 0x87E5
+#define GL_VARIANT_ARRAY_STRIDE_EXT                             0x87E6
+#define GL_VARIANT_ARRAY_TYPE_EXT                               0x87E7
+#define GL_VARIANT_ARRAY_EXT                                    0x87E8
+#define GL_VARIANT_ARRAY_POINTER_EXT                            0x87E9
+#define GL_INVARIANT_VALUE_EXT                                  0x87EA
+#define GL_INVARIANT_DATATYPE_EXT                               0x87EB
+#define GL_LOCAL_CONSTANT_VALUE_EXT                             0x87EC
+#define GL_LOCAL_CONSTANT_DATATYPE_EXT                          0x87ED
+
+typedef void (APIENTRY * glBeginVertexShaderEXTPROC) ();
+typedef void (APIENTRY * glEndVertexShaderEXTPROC) ();
+typedef void (APIENTRY * glBindVertexShaderEXTPROC) (GLuint id);
+typedef GLuint (APIENTRY * glGenVertexShadersEXTPROC) (GLuint range);
+typedef void (APIENTRY * glDeleteVertexShaderEXTPROC) (GLuint id);
+typedef void (APIENTRY * glShaderOp1EXTPROC) (GLenum op, GLuint res, GLuint arg1);
+typedef void (APIENTRY * glShaderOp2EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2);
+typedef void (APIENTRY * glShaderOp3EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2, GLuint arg3);
+typedef void (APIENTRY * glSwizzleEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
+typedef void (APIENTRY * glWriteMaskEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
+typedef void (APIENTRY * glInsertComponentEXTPROC) (GLuint res, GLuint src, GLuint num);
+typedef void (APIENTRY * glExtractComponentEXTPROC) (GLuint res, GLuint src, GLuint num);
+typedef GLuint (APIENTRY * glGenSymbolsEXTPROC) (GLenum dataType, GLenum storageType, GLenum range, GLuint components);
+typedef void (APIENTRY * glSetInvariantEXTPROC) (GLuint id, GLenum type, GLvoid *addr);
+typedef void (APIENTRY * glSetLocalConstantEXTPROC) (GLuint id, GLenum type, GLvoid *addr);
+typedef void (APIENTRY * glVariantbvEXTPROC) (GLuint id, GLbyte *addr);
+typedef void (APIENTRY * glVariantsvEXTPROC) (GLuint id, GLshort *addr);
+typedef void (APIENTRY * glVariantivEXTPROC) (GLuint id, GLint *addr);
+typedef void (APIENTRY * glVariantfvEXTPROC) (GLuint id, GLfloat *addr);
+typedef void (APIENTRY * glVariantdvEXTPROC) (GLuint id, GLdouble *addr);
+typedef void (APIENTRY * glVariantubvEXTPROC) (GLuint id, GLubyte *addr);
+typedef void (APIENTRY * glVariantusvEXTPROC) (GLuint id, GLushort *addr);
+typedef void (APIENTRY * glVariantuivEXTPROC) (GLuint id, GLuint *addr);
+typedef void (APIENTRY * glVariantPointerEXTPROC) (GLuint id, GLenum type, GLuint stride, GLvoid *addr);
+typedef void (APIENTRY * glEnableVariantClientStateEXTPROC) (GLuint id);
+typedef void (APIENTRY * glDisableVariantClientStateEXTPROC) (GLuint id);
+typedef GLuint (APIENTRY * glBindLightParameterEXTPROC) (GLenum light, GLenum value);
+typedef GLuint (APIENTRY * glBindMaterialParameterEXTPROC) (GLenum face, GLenum value);
+typedef GLuint (APIENTRY * glBindTexGenParameterEXTPROC) (GLenum unit, GLenum coord, GLenum value);
+typedef GLuint (APIENTRY * glBindTextureUnitParameterEXTPROC) (GLenum unit, GLenum value);
+typedef GLuint (APIENTRY * glBindParameterEXTPROC) (GLenum value);
+typedef GLboolean (APIENTRY * glIsVariantEnabledEXTPROC) (GLuint id, GLenum cap);
+typedef void (APIENTRY * glGetVariantBooleanvEXTPROC) (GLuint id, GLenum value, GLboolean *data);
+typedef void (APIENTRY * glGetVariantIntegervEXTPROC) (GLuint id, GLenum value, GLint *data);
+typedef void (APIENTRY * glGetVariantFloatvEXTPROC) (GLuint id, GLenum value, GLfloat *data);
+typedef void (APIENTRY * glGetVariantPointervEXTPROC) (GLuint id, GLenum value, GLvoid **data);
+typedef void (APIENTRY * glGetInvariantBooleanvEXTPROC) (GLuint id, GLenum value, GLboolean *data);
+typedef void (APIENTRY * glGetInvariantIntegervEXTPROC) (GLuint id, GLenum value, GLint *data);
+typedef void (APIENTRY * glGetInvariantFloatvEXTPROC) (GLuint id, GLenum value, GLfloat *data);
+typedef void (APIENTRY * glGetLocalConstantBooleanvEXTPROC) (GLuint id, GLenum value, GLboolean *data);
+typedef void (APIENTRY * glGetLocalConstantIntegervEXTPROC) (GLuint id, GLenum value, GLint *data);
+typedef void (APIENTRY * glGetLocalConstantFloatvEXTPROC) (GLuint id, GLenum value, GLfloat *data);
+
+extern glBeginVertexShaderEXTPROC glBeginVertexShaderEXT;
+extern glEndVertexShaderEXTPROC glEndVertexShaderEXT;
+extern glBindVertexShaderEXTPROC glBindVertexShaderEXT;
+extern glGenVertexShadersEXTPROC glGenVertexShadersEXT;
+extern glDeleteVertexShaderEXTPROC glDeleteVertexShaderEXT;
+extern glShaderOp1EXTPROC glShaderOp1EXT;
+extern glShaderOp2EXTPROC glShaderOp2EXT;
+extern glShaderOp3EXTPROC glShaderOp3EXT;
+extern glSwizzleEXTPROC glSwizzleEXT;
+extern glWriteMaskEXTPROC glWriteMaskEXT;
+extern glInsertComponentEXTPROC glInsertComponentEXT;
+extern glExtractComponentEXTPROC glExtractComponentEXT;
+extern glGenSymbolsEXTPROC glGenSymbolsEXT;
+extern glSetInvariantEXTPROC glSetInvariantEXT;
+extern glSetLocalConstantEXTPROC glSetLocalConstantEXT;
+extern glVariantbvEXTPROC glVariantbvEXT;
+extern glVariantsvEXTPROC glVariantsvEXT;
+extern glVariantivEXTPROC glVariantivEXT;
+extern glVariantfvEXTPROC glVariantfvEXT;
+extern glVariantdvEXTPROC glVariantdvEXT;
+extern glVariantubvEXTPROC glVariantubvEXT;
+extern glVariantusvEXTPROC glVariantusvEXT;
+extern glVariantuivEXTPROC glVariantuivEXT;
+extern glVariantPointerEXTPROC glVariantPointerEXT;
+extern glEnableVariantClientStateEXTPROC glEnableVariantClientStateEXT;
+extern glDisableVariantClientStateEXTPROC glDisableVariantClientStateEXT;
+extern glBindLightParameterEXTPROC glBindLightParameterEXT;
+extern glBindMaterialParameterEXTPROC glBindMaterialParameterEXT;
+extern glBindTexGenParameterEXTPROC glBindTexGenParameterEXT;
+extern glBindTextureUnitParameterEXTPROC glBindTextureUnitParameterEXT;
+extern glBindParameterEXTPROC glBindParameterEXT;
+extern glIsVariantEnabledEXTPROC glIsVariantEnabledEXT;
+extern glGetVariantBooleanvEXTPROC glGetVariantBooleanvEXT;
+extern glGetVariantIntegervEXTPROC glGetVariantIntegervEXT;
+extern glGetVariantFloatvEXTPROC glGetVariantFloatvEXT;
+extern glGetVariantPointervEXTPROC glGetVariantPointervEXT;
+extern glGetInvariantBooleanvEXTPROC glGetInvariantBooleanvEXT;
+extern glGetInvariantIntegervEXTPROC glGetInvariantIntegervEXT;
+extern glGetInvariantFloatvEXTPROC glGetInvariantFloatvEXT;
+extern glGetLocalConstantBooleanvEXTPROC glGetLocalConstantBooleanvEXT;
+extern glGetLocalConstantIntegervEXTPROC glGetLocalConstantIntegervEXT;
+extern glGetLocalConstantFloatvEXTPROC glGetLocalConstantFloatvEXT;
+
+#endif /* GL_EXT_vertex_shader */
+
+/*-------------------------------------------------------------------*/
+/*------------ATI_ENVMAP_BUMPMAP-------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_ATI_envmap_bumpmap
+#define GL_ATI_envmap_bumpmap 1
+
+#define GL_BUMP_ROT_MATRIX_ATI                                  0x8775
+#define GL_BUMP_ROT_MATRIX_SIZE_ATI                             0x8776
+#define GL_BUMP_NUM_TEX_UNITS_ATI                               0x8777
+#define GL_BUMP_TEX_UNITS_ATI                                   0x8778
+#define GL_DUDV_ATI                                             0x8779
+#define GL_DU8DV8_ATI                                           0x877A
+#define GL_BUMP_ENVMAP_ATI                                      0x877B
+#define GL_BUMP_TARGET_ATI                                      0x877C
+
+typedef void (APIENTRY * glTexBumpParameterivATIPROC) (GLenum pname, GLint *param);
+typedef void (APIENTRY * glTexBumpParameterfvATIPROC) (GLenum pname, GLfloat *param);
+typedef void (APIENTRY * glGetTexBumpParameterivATIPROC) (GLenum pname, GLint *param);
+typedef void (APIENTRY * glGetTexBumpParameterfvATIPROC) (GLenum pname, GLfloat *param);
+
+extern glTexBumpParameterivATIPROC glTexBumpParameterivATI;
+extern glTexBumpParameterfvATIPROC glTexBumpParameterfvATI;
+extern glGetTexBumpParameterivATIPROC glGetTexBumpParameterivATI;
+extern glGetTexBumpParameterfvATIPROC glGetTexBumpParameterfvATI;
+
+#endif /* GL_ATI_envmap_bumpmap */
+
+/*-------------------------------------------------------------------*/
+/*------------ATI_FRAGMENT_SHADER------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_ATI_fragment_shader
+#define GL_ATI_fragment_shader 1
+
+#define GL_FRAGMENT_SHADER_ATI                                  0x8920
+#define GL_REG_0_ATI                                            0x8921
+#define GL_REG_1_ATI                                            0x8922
+#define GL_REG_2_ATI                                            0x8923
+#define GL_REG_3_ATI                                            0x8924
+#define GL_REG_4_ATI                                            0x8925
+#define GL_REG_5_ATI                                            0x8926
+#define GL_REG_6_ATI                                            0x8927
+#define GL_REG_7_ATI                                            0x8928
+#define GL_REG_8_ATI                                            0x8929
+#define GL_REG_9_ATI                                            0x892A
+#define GL_REG_10_ATI                                           0x892B
+#define GL_REG_11_ATI                                           0x892C
+#define GL_REG_12_ATI                                           0x892D
+#define GL_REG_13_ATI                                           0x892E
+#define GL_REG_14_ATI                                           0x892F
+#define GL_REG_15_ATI                                           0x8930
+#define GL_REG_16_ATI                                           0x8931
+#define GL_REG_17_ATI                                           0x8932
+#define GL_REG_18_ATI                                           0x8933
+#define GL_REG_19_ATI                                           0x8934
+#define GL_REG_20_ATI                                           0x8935
+#define GL_REG_21_ATI                                           0x8936
+#define GL_REG_22_ATI                                           0x8937
+#define GL_REG_23_ATI                                           0x8938
+#define GL_REG_24_ATI                                           0x8939
+#define GL_REG_25_ATI                                           0x893A
+#define GL_REG_26_ATI                                           0x893B
+#define GL_REG_27_ATI                                           0x893C
+#define GL_REG_28_ATI                                           0x893D
+#define GL_REG_29_ATI                                           0x893E
+#define GL_REG_30_ATI                                           0x893F
+#define GL_REG_31_ATI                                           0x8940
+#define GL_CON_0_ATI                                            0x8941
+#define GL_CON_1_ATI                                            0x8942
+#define GL_CON_2_ATI                                            0x8943
+#define GL_CON_3_ATI                                            0x8944
+#define GL_CON_4_ATI                                            0x8945
+#define GL_CON_5_ATI                                            0x8946
+#define GL_CON_6_ATI                                            0x8947
+#define GL_CON_7_ATI                                            0x8948
+#define GL_CON_8_ATI                                            0x8949
+#define GL_CON_9_ATI                                            0x894A
+#define GL_CON_10_ATI                                           0x894B
+#define GL_CON_11_ATI                                           0x894C
+#define GL_CON_12_ATI                                           0x894D
+#define GL_CON_13_ATI                                           0x894E
+#define GL_CON_14_ATI                                           0x894F
+#define GL_CON_15_ATI                                           0x8950
+#define GL_CON_16_ATI                                           0x8951
+#define GL_CON_17_ATI                                           0x8952
+#define GL_CON_18_ATI                                           0x8953
+#define GL_CON_19_ATI                                           0x8954
+#define GL_CON_20_ATI                                           0x8955
+#define GL_CON_21_ATI                                           0x8956
+#define GL_CON_22_ATI                                           0x8957
+#define GL_CON_23_ATI                                           0x8958
+#define GL_CON_24_ATI                                           0x8959
+#define GL_CON_25_ATI                                           0x895A
+#define GL_CON_26_ATI                                           0x895B
+#define GL_CON_27_ATI                                           0x895C
+#define GL_CON_28_ATI                                           0x895D
+#define GL_CON_29_ATI                                           0x895E
+#define GL_CON_30_ATI                                           0x895F
+#define GL_CON_31_ATI                                           0x8960
+#define GL_MOV_ATI                                              0x8961
+#define GL_ADD_ATI                                              0x8963
+#define GL_MUL_ATI                                              0x8964
+#define GL_SUB_ATI                                              0x8965
+#define GL_DOT3_ATI                                             0x8966
+#define GL_DOT4_ATI                                             0x8967
+#define GL_MAD_ATI                                              0x8968
+#define GL_LERP_ATI                                             0x8969
+#define GL_CND_ATI                                              0x896A
+#define GL_CND0_ATI                                             0x896B
+#define GL_DOT2_ADD_ATI                                         0x896C
+#define GL_SECONDARY_INTERPOLATOR_ATI                           0x896D
+#define GL_NUM_FRAGMENT_REGISTERS_ATI                           0x896E
+#define GL_NUM_FRAGMENT_CONSTANTS_ATI                           0x896F
+#define GL_NUM_PASSES_ATI                                       0x8970
+#define GL_NUM_INSTRUCTIONS_PER_PASS_ATI                        0x8971
+#define GL_NUM_INSTRUCTIONS_TOTAL_ATI                           0x8972
+#define GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI                0x8973
+#define GL_NUM_LOOPBACK_COMPONENTS_ATI                          0x8974
+#define GL_COLOR_ALPHA_PAIRING_ATI                              0x8975
+#define GL_SWIZZLE_STR_ATI                                      0x8976
+#define GL_SWIZZLE_STQ_ATI                                      0x8977
+#define GL_SWIZZLE_STR_DR_ATI                                   0x8978
+#define GL_SWIZZLE_STQ_DQ_ATI                                   0x8979
+#define GL_SWIZZLE_STRQ_ATI                                     0x897A
+#define GL_SWIZZLE_STRQ_DQ_ATI                                  0x897B
+#define GL_RED_BIT_ATI                                          0x00000001
+#define GL_GREEN_BIT_ATI                                        0x00000002
+#define GL_BLUE_BIT_ATI                                         0x00000004
+#define GL_2X_BIT_ATI                                           0x00000001
+#define GL_4X_BIT_ATI                                           0x00000002
+#define GL_8X_BIT_ATI                                           0x00000004
+#define GL_HALF_BIT_ATI                                         0x00000008
+#define GL_QUARTER_BIT_ATI                                      0x00000010
+#define GL_EIGHTH_BIT_ATI                                       0x00000020
+#define GL_SATURATE_BIT_ATI                                     0x00000040
+#define GL_COMP_BIT_ATI                                         0x00000002
+#define GL_NEGATE_BIT_ATI                                       0x00000004
+#define GL_BIAS_BIT_ATI                                         0x00000008
+
+typedef GLuint (APIENTRY * glGenFragmentShadersATIPROC) (GLuint range);
+typedef void (APIENTRY * glBindFragmentShaderATIPROC) (GLuint id);
+typedef void (APIENTRY * glDeleteFragmentShaderATIPROC) (GLuint id);
+typedef void (APIENTRY * glBeginFragmentShaderATIPROC) (GLvoid);
+typedef void (APIENTRY * glEndFragmentShaderATIPROC) (GLvoid);
+typedef void (APIENTRY * glPassTexCoordATIPROC) (GLuint dst, GLuint coord, GLenum swizzle);
+typedef void (APIENTRY * glSampleMapATIPROC) (GLuint dst, GLuint interp, GLenum swizzle);
+typedef void (APIENTRY * glColorFragmentOp1ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
+typedef void (APIENTRY * glColorFragmentOp2ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
+typedef void (APIENTRY * glColorFragmentOp3ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
+typedef void (APIENTRY * glAlphaFragmentOp1ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
+typedef void (APIENTRY * glAlphaFragmentOp2ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
+typedef void (APIENTRY * glAlphaFragmentOp3ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
+typedef void (APIENTRY * glSetFragmentShaderConstantATIPROC) (GLuint dst, const GLfloat *value);
+
+extern glGenFragmentShadersATIPROC glGenFragmentShadersATI;
+extern glBindFragmentShaderATIPROC glBindFragmentShaderATI;
+extern glDeleteFragmentShaderATIPROC glDeleteFragmentShaderATI;
+extern glBeginFragmentShaderATIPROC glBeginFragmentShaderATI;
+extern glEndFragmentShaderATIPROC glEndFragmentShaderATI;
+extern glPassTexCoordATIPROC glPassTexCoordATI;
+extern glSampleMapATIPROC glSampleMapATI;
+extern glColorFragmentOp1ATIPROC glColorFragmentOp1ATI;
+extern glColorFragmentOp2ATIPROC glColorFragmentOp2ATI;
+extern glColorFragmentOp3ATIPROC glColorFragmentOp3ATI;
+extern glAlphaFragmentOp1ATIPROC glAlphaFragmentOp1ATI;
+extern glAlphaFragmentOp2ATIPROC glAlphaFragmentOp2ATI;
+extern glAlphaFragmentOp3ATIPROC glAlphaFragmentOp3ATI;
+extern glSetFragmentShaderConstantATIPROC glSetFragmentShaderConstantATI;
+
+#endif /* GL_ATI_fragment_shader */
+
+/*-------------------------------------------------------------------*/
+/*------------ATI_TEXTURE_MIRROR_ONCE--------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_ATI_texture_mirror_once
+#define GL_ATI_texture_mirror_once 1
+
+#define GL_MIRROR_CLAMP_ATI                                     0x8742
+#define GL_MIRROR_CLAMP_TO_EDGE_ATI                             0x8743
+
+#endif
+
+/*-------------------------------------------------------------------*/
+/*------------ATI_ELEMENT_ARRAY--------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_ATI_element_array
+#define GL_ATI_element_array 1
+
+#define GL_ELEMENT_ARRAY_ATI                                    0x8768
+#define GL_ELEMENT_ARRAY_TYPE_ATI                               0x8769
+#define GL_ELEMENT_ARRAY_POINTER_ATI                            0x876A
+
+typedef void (APIENTRY * glElementPointerATIPROC) (GLenum type, const GLvoid *pointer);
+typedef void (APIENTRY * glDrawElementArrayATIPROC) (GLenum mode, GLsizei count);
+typedef void (APIENTRY * glDrawRangeElementArrayATIPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count);
+
+extern glElementPointerATIPROC glElementPointerATI;
+extern glDrawElementArrayATIPROC glDrawElementArrayATI;
+extern glDrawRangeElementArrayATIPROC glDrawRangeElementArrayATI;
+
+#endif /* GL_ATI_element_array */
+
+/*-------------------------------------------------------------------*/
+/*------------ATI_VERTEX_STREAMS-------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_ATI_vertex_streams 
+#define GL_ATI_vertex_streams 1
+
+#define GL_MAX_VERTEX_STREAMS_ATI                               0x876B  
+#define GL_VERTEX_SOURCE_ATI                                    0x876C
+#define GL_VERTEX_STREAM0_ATI                                   0x876D
+#define GL_VERTEX_STREAM1_ATI                                   0x876E
+#define GL_VERTEX_STREAM2_ATI                                   0x876F
+#define GL_VERTEX_STREAM3_ATI                                   0x8770
+#define GL_VERTEX_STREAM4_ATI                                   0x8771
+#define GL_VERTEX_STREAM5_ATI                                   0x8772
+#define GL_VERTEX_STREAM6_ATI                                   0x8773
+#define GL_VERTEX_STREAM7_ATI                                   0x8774
+
+typedef void (APIENTRY * glClientActiveVertexStreamATIPROC) (GLenum stream);
+typedef void (APIENTRY * glVertexBlendEnviATIPROC) (GLenum pname, GLint param);
+typedef void (APIENTRY * glVertexBlendEnvfATIPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRY * glVertexStream2sATIPROC) (GLenum stream, GLshort x, GLshort y);
+typedef void (APIENTRY * glVertexStream2svATIPROC) (GLenum stream, const GLshort *v);
+typedef void (APIENTRY * glVertexStream2iATIPROC) (GLenum stream, GLint x, GLint y);
+typedef void (APIENTRY * glVertexStream2ivATIPROC) (GLenum stream, const GLint *v);
+typedef void (APIENTRY * glVertexStream2fATIPROC) (GLenum stream, GLfloat x, GLfloat y);
+typedef void (APIENTRY * glVertexStream2fvATIPROC) (GLenum stream, const GLfloat *v);
+typedef void (APIENTRY * glVertexStream2dATIPROC) (GLenum stream, GLdouble x, GLdouble y);
+typedef void (APIENTRY * glVertexStream2dvATIPROC) (GLenum stream, const GLdouble *v);
+typedef void (APIENTRY * glVertexStream3sATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRY * glVertexStream3svATIPROC) (GLenum stream, const GLshort *v);
+typedef void (APIENTRY * glVertexStream3iATIPROC) (GLenum stream, GLint x, GLint y, GLint z);
+typedef void (APIENTRY * glVertexStream3ivATIPROC) (GLenum stream, const GLint *v);
+typedef void (APIENTRY * glVertexStream3fATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRY * glVertexStream3fvATIPROC) (GLenum stream, const GLfloat *v);
+typedef void (APIENTRY * glVertexStream3dATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRY * glVertexStream3dvATIPROC) (GLenum stream, const GLdouble *v);
+typedef void (APIENTRY * glVertexStream4sATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRY * glVertexStream4svATIPROC) (GLenum stream, const GLshort *v);
+typedef void (APIENTRY * glVertexStream4iATIPROC) (GLenum stream, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRY * glVertexStream4ivATIPROC) (GLenum stream, const GLint *v);
+typedef void (APIENTRY * glVertexStream4fATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRY * glVertexStream4fvATIPROC) (GLenum stream, const GLfloat *v);
+typedef void (APIENTRY * glVertexStream4dATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRY * glVertexStream4dvATIPROC) (GLenum stream, const GLdouble *v);
+typedef void (APIENTRY * glNormalStream3bATIPROC) (GLenum stream, GLbyte x, GLbyte y, GLbyte z);
+typedef void (APIENTRY * glNormalStream3bvATIPROC) (GLenum stream, const GLbyte *v);
+typedef void (APIENTRY * glNormalStream3sATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRY * glNormalStream3svATIPROC) (GLenum stream, const GLshort *v);
+typedef void (APIENTRY * glNormalStream3iATIPROC) (GLenum stream, GLint x, GLint y, GLint z);
+typedef void (APIENTRY * glNormalStream3ivATIPROC) (GLenum stream, const GLint *v);
+typedef void (APIENTRY * glNormalStream3fATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRY * glNormalStream3fvATIPROC) (GLenum stream, const GLfloat *v);
+typedef void (APIENTRY * glNormalStream3dATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRY * glNormalStream3dvATIPROC) (GLenum stream, const GLdouble *v);
+
+
+extern glClientActiveVertexStreamATIPROC glClientActiveVertexStreamATI;
+extern glVertexBlendEnviATIPROC glVertexBlendEnviATI;
+extern glVertexBlendEnvfATIPROC glVertexBlendEnvfATI;
+extern glVertexStream2sATIPROC glVertexStream2sATI;
+extern glVertexStream2svATIPROC glVertexStream2svATI;
+extern glVertexStream2iATIPROC glVertexStream2iATI;
+extern glVertexStream2ivATIPROC glVertexStream2ivATI;
+extern glVertexStream2fATIPROC glVertexStream2fATI;
+extern glVertexStream2fvATIPROC glVertexStream2fvATI;
+extern glVertexStream2dATIPROC glVertexStream2dATI;
+extern glVertexStream2dvATIPROC glVertexStream2dvATI;
+extern glVertexStream3sATIPROC glVertexStream3sATI;
+extern glVertexStream3svATIPROC glVertexStream3svATI;
+extern glVertexStream3iATIPROC glVertexStream3iATI;
+extern glVertexStream3ivATIPROC glVertexStream3ivATI;
+extern glVertexStream3fATIPROC glVertexStream3fATI;
+extern glVertexStream3fvATIPROC glVertexStream3fvATI;
+extern glVertexStream3dATIPROC glVertexStream3dATI;
+extern glVertexStream3dvATIPROC glVertexStream3dvATI;
+extern glVertexStream4sATIPROC glVertexStream4sATI;
+extern glVertexStream4svATIPROC glVertexStream4svATI;
+extern glVertexStream4iATIPROC glVertexStream4iATI;
+extern glVertexStream4ivATIPROC glVertexStream4ivATI;
+extern glVertexStream4fATIPROC glVertexStream4fATI;
+extern glVertexStream4fvATIPROC glVertexStream4fvATI;
+extern glVertexStream4dATIPROC glVertexStream4dATI;
+extern glVertexStream4dvATIPROC glVertexStream4dvATI;
+extern glNormalStream3bATIPROC glNormalStream3bATI;
+extern glNormalStream3bvATIPROC glNormalStream3bvATI;
+extern glNormalStream3sATIPROC glNormalStream3sATI;
+extern glNormalStream3svATIPROC glNormalStream3svATI;
+extern glNormalStream3iATIPROC glNormalStream3iATI;
+extern glNormalStream3ivATIPROC glNormalStream3ivATI;
+extern glNormalStream3fATIPROC glNormalStream3fATI;
+extern glNormalStream3fvATIPROC glNormalStream3fvATI;
+extern glNormalStream3dATIPROC glNormalStream3dATI;
+extern glNormalStream3dvATIPROC glNormalStream3dvATI;
+
+#endif /* GL_ATI_vertex_streams */
+
+/*-------------------------------------------------------------------*/
+/*------------ATI_VERTEX_ARRAY_OBJECT--------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_ATI_vertex_array_object
+#define GL_ATI_vertex_array_object 1
+
+#define GL_STATIC_ATI                                           0x8760
+#define GL_DYNAMIC_ATI                                          0x8761
+#define GL_PRESERVE_ATI                                         0x8762
+#define GL_DISCARD_ATI                                          0x8763
+#define GL_OBJECT_BUFFER_SIZE_ATI                               0x8764
+#define GL_OBJECT_BUFFER_USAGE_ATI                              0x8765
+#define GL_ARRAY_OBJECT_BUFFER_ATI                              0x8766
+#define GL_ARRAY_OBJECT_OFFSET_ATI                              0x8767
+
+typedef GLuint (APIENTRY * glNewObjectBufferATIPROC) (GLsizei size, const GLvoid *pointer, GLenum usage);
+typedef GLboolean (APIENTRY * glIsObjectBufferATIPROC) (GLuint buffer);
+typedef void (APIENTRY * glUpdateObjectBufferATIPROC) (GLuint buffer, GLuint offset, GLsizei size, const GLvoid *pointer, GLenum preserve);
+typedef void (APIENTRY * glGetObjectBufferfvATIPROC) (GLuint buffer, GLenum pname, GLfloat *params);
+typedef void (APIENTRY * glGetObjectBufferivATIPROC) (GLuint buffer, GLenum pname, GLint *params);
+typedef void (APIENTRY * glFreeObjectBufferATIPROC) (GLuint buffer);
+typedef void (APIENTRY * glArrayObjectATIPROC) (GLenum array, GLint size, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
+typedef void (APIENTRY * glGetArrayObjectfvATIPROC) (GLenum array, GLenum pname, GLfloat *params);
+typedef void (APIENTRY * glGetArrayObjectivATIPROC) (GLenum array, GLenum pname, GLint *params);
+typedef void (APIENTRY * glVariantArrayObjectATIPROC) (GLuint id, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
+typedef void (APIENTRY * glGetVariantArrayObjectfvATIPROC) (GLuint id, GLenum pname, GLfloat *params);
+typedef void (APIENTRY * glGetVariantArrayObjectivATIPROC) (GLuint id, GLenum pname, GLint *params);
+
+extern glNewObjectBufferATIPROC glNewObjectBufferATI;
+extern glIsObjectBufferATIPROC glIsObjectBufferATI;
+extern glUpdateObjectBufferATIPROC glUpdateObjectBufferATI;
+extern glGetObjectBufferfvATIPROC glGetObjectBufferfvATI;
+extern glGetObjectBufferivATIPROC glGetObjectBufferivATI;
+extern glFreeObjectBufferATIPROC glFreeObjectBufferATI;
+extern glArrayObjectATIPROC glArrayObjectATI;
+extern glGetArrayObjectfvATIPROC glGetArrayObjectfvATI;
+extern glGetArrayObjectivATIPROC glGetArrayObjectivATI;
+extern glVariantArrayObjectATIPROC glVariantArrayObjectATI;
+extern glGetVariantArrayObjectfvATIPROC glGetVariantArrayObjectfvATI;
+extern glGetVariantArrayObjectivATIPROC glGetVariantArrayObjectivATI;
+
+#endif /* GL_ATI_vertex_array_object */
+
+/*-------------------------------------------------------------------*/
+/*------------HP_OCCLUSION_TEST--------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_HP_occlusion_test
+#define GL_HP_occlusion_test 1
+
+#define GL_OCCLUSION_TEST_HP                                    0x8165;
+#define GL_OCCLUSION_TEST_RESULT_HP                             0x8166;
+
+#endif /* GL_HP_occlusion_test */
+
+/*-------------------------------------------------------------------*/
+/*------------ATIX_POINT_SPRITES-------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_ATIX_point_sprites
+#define GL_ATIX_point_sprites 1
+
+#define GL_TEXTURE_POINT_MODE_ATIX                               0x60b0
+#define	GL_TEXTURE_POINT_ONE_COORD_ATIX                          0x60b1
+#define	GL_TEXTURE_POINT_SPRITE_ATIX                             0x60b2
+#define GL_POINT_SPRITE_CULL_MODE_ATIX                           0x60b3
+#define GL_POINT_SPRITE_CULL_CENTER_ATIX                         0x60b4
+#define GL_POINT_SPRITE_CULL_CLIP_ATIX                           0x60b5
+
+#endif /* GL_ATIX_point_sprites */
+
+/*-------------------------------------------------------------------*/
+/*------------ATIX_TEXTURE_ENV_ROUTE---------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_ATIX_texture_env_route
+#define GL_ATIX_texture_env_route 1
+
+#define GL_SECONDARY_COLOR_ATIX                                  0x8747
+#define GL_TEXTURE_OUTPUT_RGB_ATIX                               0x8748
+#define GL_TEXTURE_OUTPUT_ALPHA_ATIX                             0x8749
+
+#endif /* GL_ATIX_texture_env_route */
+
+/*-------------------------------------------------------------------*/
+/*------------NV_DEPTH_CLAMP-----------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_NV_depth_clamp
+#define GL_NV_depth_clamp 1
+
+#define GL_DEPTH_CLAMP_NV                                       0x864F
+
+#endif /* GL_NV_depth_clamp */
+
+/*-------------------------------------------------------------------*/
+/*------------NV_OCCLUSION_QUERY-------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_NV_occlusion_query
+#define GL_NV_occlusion_query 1
+
+#ifndef GL_HP_occlusion_test
+#define GL_OCCLUSION_TEST_HP                                    0x8165
+#define GL_OCCLUSION_TEST_RESULT_HP                             0x8166
+#endif /* GL_HP_occlusion_test */
+#define GL_PIXEL_COUNTER_BITS_NV                                0x8864
+#define GL_CURRENT_OCCLUSION_QUERY_ID_NV                        0x8865
+#define GL_PIXEL_COUNT_NV                                       0x8866
+#define GL_PIXEL_COUNT_AVAILABLE_NV                             0x8867
+
+typedef void (APIENTRY * glGenOcclusionQueriesNVPROC) (GLsizei n, GLuint *ids);
+typedef void (APIENTRY * glDeleteOcclusionQueriesNVPROC) (GLsizei n, const GLuint *ids);
+typedef GLboolean (APIENTRY * glIsOcclusionQueryNVPROC) (GLuint id);
+typedef void (APIENTRY * glBeginOcclusionQueryNVPROC) (GLuint id);
+typedef void (APIENTRY * glEndOcclusionQueryNVPROC) (void);
+typedef void (APIENTRY * glGetOcclusionQueryivNVPROC) (GLuint id, GLenum pname, GLint *params);
+typedef void (APIENTRY * glGetOcclusionQueryuivNVPROC) (GLuint id, GLenum pname, GLuint *params);
+
+extern glGenOcclusionQueriesNVPROC glGenOcclusionQueriesNV;
+extern glDeleteOcclusionQueriesNVPROC glDeleteOcclusionQueriesNV;
+extern glIsOcclusionQueryNVPROC glIsOcclusionQueryNV;
+extern glBeginOcclusionQueryNVPROC glBeginOcclusionQueryNV;
+extern glEndOcclusionQueryNVPROC glEndOcclusionQueryNV;
+extern glGetOcclusionQueryivNVPROC glGetOcclusionQueryivNV;
+extern glGetOcclusionQueryuivNVPROC glGetOcclusionQueryuivNV;
+
+#endif /* GL_NV_occlusion_query */
+
+/*-------------------------------------------------------------------*/
+/*------------NV_POINT_SPRITE----------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_NV_point_sprite
+#define GL_NV_point_sprite 1
+
+#define GL_POINT_SPRITE_NV                                      0x8861
+#define GL_COORD_REPLACE_NV                                     0x8862
+#define GL_POINT_SPRITE_R_MODE_NV                               0x8863
+
+typedef void (APIENTRY * glPointParameteriNVPROC) (GLenum pname, GLint param);
+typedef void (APIENTRY * glPointParameterivNVPROC) (GLenum pname, const GLint *params);
+
+extern glPointParameteriNVPROC glPointParameteriNV;
+extern glPointParameterivNVPROC glPointParameterivNV;
+
+#endif /* GL_NV_point_sprite */
+
+/*-------------------------------------------------------------------*/
+/*------------NV_TEXTURE_SHADER3-------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_NV_texture_shader3
+#define GL_NV_texture_shader3 1
+
+#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_NV                      0x8850
+#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV                0x8851
+#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV               0x8852
+#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV         0x8853
+#define GL_OFFSET_HILO_TEXTURE_2D_NV                            0x8854
+#define GL_OFFSET_HILO_TEXTURE_RECTANGLE_NV                     0x8855
+#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV                 0x8856
+#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV          0x8857
+#define GL_DEPENDENT_HILO_TEXTURE_2D_NV                         0x8858
+#define GL_DEPENDENT_RGB_TEXTURE_3D_NV                          0x8859
+#define GL_DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV                    0x885A
+#define GL_DOT_PRODUCT_PASS_THROUGH_NV                          0x885B
+#define GL_DOT_PRODUCT_TEXTURE_1D_NV                            0x885C
+#define GL_DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV                  0x885D
+#define GL_HILO8_NV                                             0x885E
+#define GL_SIGNED_HILO8_NV                                      0x885F
+#define GL_FORCE_BLUE_TO_ONE_NV                                 0x8860
+
+#endif /* GL_NV_texture_shader3 */
+
+/*-------------------------------------------------------------------*/
+/*------------NV_VERTEX_PROGRAM1_1-----------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_NV_vertex_program1_1
+#define GL_NV_vertex_program1_1
+
+#endif /* GL_NV_vertex_program1_1 */
+
+/*-------------------------------------------------------------------*/
+/*------------ARB_TEXTURE_MIRRORED_REPEAT----------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_ARB_texture_mirrored_repeat
+#define GL_ARB_texture_mirrored_repeat 1
+
+#define GL_GL_MIRRORED_REPEAT_ARB                               0x8370
+
+#endif /* GL_ARB_texture_mirrored_repeat */
+
+/*-------------------------------------------------------------------*/
+/*------------ARB_SHADOW---------------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_ARB_shadow
+#define GL_ARB_shadow 1
+
+#define GL_TEXTURE_COMPARE_MODE_ARB                             0x884C
+#define GL_TEXTURE_COMPARE_FUNC_ARB                             0x884D
+#define GL_COMPARE_R_TO_TEXTURE_ARB                             0x884E
+
+#endif /* GL_ARB_shadow */
+
+/*-------------------------------------------------------------------*/
+/*------------ARB_SHADOW_AMBIENT-------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_ARB_shadow_ambient
+#define GL_ARB_shadow_ambient 1
+
+#define GL_TEXTURE_COMPARE_FAIL_VALUE_ARB                       0x80BF 
+
+#endif /* GL_ARB_shadow_ambient */
+
+/*-------------------------------------------------------------------*/
+/*------------ARB_DEPTH_TEXTURE--------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_ARB_depth_texture
+#define GL_ARB_depth_texture 1
+
+#define GL_DEPTH_COMPONENT16_ARB                                0x81A5
+#define GL_DEPTH_COMPONENT24_ARB                                0x81A6
+#define GL_DEPTH_COMPONENT32_ARB                                0x81A7
+#define GL_TEXTURE_DEPTH_SIZE_ARB                               0x884A
+#define GL_DEPTH_TEXTURE_MODE_ARB                               0x884B
+
+#endif /* GL_ARB_depth_texture */
+
+/*-------------------------------------------------------------------*/
+/*------------ARB_WINDOW_POS-----------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_ARB_window_pos
+#define GL_ARB_window_pos 1
+
+typedef void (APIENTRY * glWindowPos2dARBPROC) (GLdouble x, GLdouble y);
+typedef void (APIENTRY * glWindowPos2fARBPROC) (GLfloat x, GLfloat y);
+typedef void (APIENTRY * glWindowPos2iARBPROC) (GLint x, GLint y);
+typedef void (APIENTRY * glWindowPos2sARBPROC) (GLshort x, GLshort y);
+typedef void (APIENTRY * glWindowPos2dvARBPROC) (const GLdouble *p);
+typedef void (APIENTRY * glWindowPos2fvARBPROC) (const GLfloat *p);
+typedef void (APIENTRY * glWindowPos2ivARBPROC) (const GLint *p);
+typedef void (APIENTRY * glWindowPos2svARBPROC) (const GLshort *p);
+typedef void (APIENTRY * glWindowPos3dARBPROC) (GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRY * glWindowPos3fARBPROC) (GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRY * glWindowPos3iARBPROC) (GLint x, GLint y, GLint z);
+typedef void (APIENTRY * glWindowPos3sARBPROC) (GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRY * glWindowPos3dvARBPROC) (const GLdouble *p);
+typedef void (APIENTRY * glWindowPos3fvARBPROC) (const GLfloat *p);
+typedef void (APIENTRY * glWindowPos3ivARBPROC) (const GLint *p);
+typedef void (APIENTRY * glWindowPos3svARBPROC) (const GLshort *p);
+
+extern glWindowPos2dARBPROC glWindowPos2dARB;
+extern glWindowPos2fARBPROC glWindowPos2fARB;
+extern glWindowPos2iARBPROC glWindowPos2iARB;
+extern glWindowPos2sARBPROC glWindowPos2sARB;
+extern glWindowPos2dvARBPROC glWindowPos2dvARB;
+extern glWindowPos2fvARBPROC glWindowPos2fvARB;
+extern glWindowPos2ivARBPROC glWindowPos2ivARB;
+extern glWindowPos2svARBPROC glWindowPos2svARB;
+extern glWindowPos3dARBPROC glWindowPos3dARB;
+extern glWindowPos3fARBPROC glWindowPos3fARB;
+extern glWindowPos3iARBPROC glWindowPos3iARB;
+extern glWindowPos3sARBPROC glWindowPos3sARB;
+extern glWindowPos3dvARBPROC glWindowPos3dvARB;
+extern glWindowPos3fvARBPROC glWindowPos3fvARB;
+extern glWindowPos3ivARBPROC glWindowPos3ivARB;
+extern glWindowPos3svARBPROC glWindowPos3svARB;
+
+#endif /* GL_ARB_window_pos */
+
+/*-------------------------------------------------------------------*/
+/*------------EXT_SHADOW_FUNCS---------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_EXT_shadow_funcs
+#define GL_EXT_shadow_funcs 1
+
+#endif /* GL_EXT_shadow_funcs */
+
+
+/*-------------------------------------------------------------------*/
+/*------------EXT_draw_range_elements--------------------------------*/
+/*-------------------------------------------------------------------*/
+
+
+#ifndef GL_EXT_draw_range_elements
+#define GL_EXT_draw_range_elements 1
+
+typedef void (APIENTRY * glDrawRangeElementsEXTPROC) ( GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
+
+extern glDrawRangeElementsEXTPROC glDrawRangeElementsEXT;
+
+#define GL_MAX_ELEMENTS_VERTICES_EXT                            0x80E8
+#define GL_MAX_ELEMENTS_INDICES_EXT                             0x80E9
+
+#endif
+
+/*-------------------------------------------------------------------*/
+/*------------EXT_texture_compression_s3tc---------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_EXT_texture_compression_s3tc
+#define GL_EXT_texture_compression_s3tc 1
+
+#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT                         0x83F0
+#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT                        0x83F1
+#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT                        0x83F2
+#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT                        0x83F3
+
+#endif /* GL_EXT_texture_compression_s3tc */
+
+/*-------------------------------------------------------------------*/
+/*------------EXT_stencil_two_side-----------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_EXT_stencil_two_side
+#define GL_EXT_stencil_two_side 1
+
+typedef void (APIENTRY * glActiveStencilFaceEXTPROC) (GLenum face);
+
+extern glActiveStencilFaceEXTPROC glActiveStencilFaceEXT;
+
+#define GL_STENCIL_TEST_TWO_SIDE_EXT                            0x8910
+#define GL_ACTIVE_STENCIL_FACE_EXT                              0x8911
+
+#endif /* GL_EXT_stencil_two_side */
+
+/*-------------------------------------------------------------------*/
+/*------------ARB_vertex_program-------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_ARB_vertex_program
+#define GL_ARB_vertex_program 1
+
+typedef void (APIENTRY * glVertexAttrib1sARBPROC) (GLuint index, GLshort x);
+typedef void (APIENTRY * glVertexAttrib1fARBPROC) (GLuint index, GLfloat x);
+typedef void (APIENTRY * glVertexAttrib1dARBPROC) (GLuint index, GLdouble x);
+typedef void (APIENTRY * glVertexAttrib2sARBPROC) (GLuint index, GLshort x, GLshort y);
+typedef void (APIENTRY * glVertexAttrib2fARBPROC) (GLuint index, GLfloat x, GLfloat y);
+typedef void (APIENTRY * glVertexAttrib2dARBPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (APIENTRY * glVertexAttrib3sARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRY * glVertexAttrib3fARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRY * glVertexAttrib3dARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRY * glVertexAttrib4sARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRY * glVertexAttrib4fARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRY * glVertexAttrib4dARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRY * glVertexAttrib4NubARBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+typedef void (APIENTRY * glVertexAttrib1svARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRY * glVertexAttrib1fvARBPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRY * glVertexAttrib1dvARBPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRY * glVertexAttrib2svARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRY * glVertexAttrib2fvARBPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRY * glVertexAttrib2dvARBPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRY * glVertexAttrib3svARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRY * glVertexAttrib3fvARBPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRY * glVertexAttrib3dvARBPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRY * glVertexAttrib4bvARBPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRY * glVertexAttrib4svARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRY * glVertexAttrib4ivARBPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRY * glVertexAttrib4ubvARBPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRY * glVertexAttrib4usvARBPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRY * glVertexAttrib4uivARBPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRY * glVertexAttrib4fvARBPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRY * glVertexAttrib4dvARBPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRY * glVertexAttrib4NbvARBPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRY * glVertexAttrib4NsvARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRY * glVertexAttrib4NivARBPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRY * glVertexAttrib4NubvARBPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRY * glVertexAttrib4NusvARBPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRY * glVertexAttrib4NuivARBPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRY * glVertexAttribPointerARBPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
+typedef void (APIENTRY * glEnableVertexAttribArrayARBPROC) (GLuint index);
+typedef void (APIENTRY * glDisableVertexAttribArrayARBPROC) (GLuint index);
+typedef void (APIENTRY * glProgramStringARBPROC) (GLenum target, GLenum format, GLsizei len, const GLvoid *string); 
+typedef void (APIENTRY * glBindProgramARBPROC) (GLenum target, GLuint program);
+typedef void (APIENTRY * glDeleteProgramsARBPROC) (GLsizei n, const GLuint *programs);
+typedef void (APIENTRY * glGenProgramsARBPROC) (GLsizei n, GLuint *programs);
+typedef void (APIENTRY * glProgramEnvParameter4dARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRY * glProgramEnvParameter4dvARBPROC) (GLenum target, GLuint index, const GLdouble *params);
+typedef void (APIENTRY * glProgramEnvParameter4fARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRY * glProgramEnvParameter4fvARBPROC) (GLenum target, GLuint index, const GLfloat *params);
+typedef void (APIENTRY * glProgramLocalParameter4dARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRY * glProgramLocalParameter4dvARBPROC) (GLenum target, GLuint index, const GLdouble *params);
+typedef void (APIENTRY * glProgramLocalParameter4fARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRY * glProgramLocalParameter4fvARBPROC) (GLenum target, GLuint index, const GLfloat *params);
+typedef void (APIENTRY * glGetProgramEnvParameterdvARBPROC) (GLenum target, GLuint index, GLdouble *params);
+typedef void (APIENTRY * glGetProgramEnvParameterfvARBPROC) (GLenum target, GLuint index, GLfloat *params);
+typedef void (APIENTRY * glGetProgramLocalParameterdvARBPROC) (GLenum target, GLuint index, GLdouble *params);
+typedef void (APIENTRY * glGetProgramLocalParameterfvARBPROC) (GLenum target, GLuint index, GLfloat *params);
+typedef void (APIENTRY * glGetProgramivARBPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRY * glGetProgramStringARBPROC) (GLenum target, GLenum pname, GLvoid *string);
+typedef void (APIENTRY * glGetVertexAttribdvARBPROC) (GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRY * glGetVertexAttribfvARBPROC) (GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRY * glGetVertexAttribivARBPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRY * glGetVertexAttribPointervARBPROC) (GLuint index, GLenum pname, GLvoid **pointer);
+typedef GLboolean (APIENTRY * glIsProgramARBPROC) (GLuint program);
+
+extern glVertexAttrib1sARBPROC glVertexAttrib1sARB;
+extern glVertexAttrib1fARBPROC glVertexAttrib1fARB;
+extern glVertexAttrib1dARBPROC glVertexAttrib1dARB;
+extern glVertexAttrib2sARBPROC glVertexAttrib2sARB;
+extern glVertexAttrib2fARBPROC glVertexAttrib2fARB;
+extern glVertexAttrib2dARBPROC glVertexAttrib2dARB;
+extern glVertexAttrib3sARBPROC glVertexAttrib3sARB;
+extern glVertexAttrib3fARBPROC glVertexAttrib3fARB;
+extern glVertexAttrib3dARBPROC glVertexAttrib3dARB;
+extern glVertexAttrib4sARBPROC glVertexAttrib4sARB;
+extern glVertexAttrib4fARBPROC glVertexAttrib4fARB;
+extern glVertexAttrib4dARBPROC glVertexAttrib4dARB;
+extern glVertexAttrib4NubARBPROC glVertexAttrib4NubARB;
+extern glVertexAttrib1svARBPROC glVertexAttrib1svARB;
+extern glVertexAttrib1fvARBPROC glVertexAttrib1fvARB;
+extern glVertexAttrib1dvARBPROC glVertexAttrib1dvARB;
+extern glVertexAttrib2svARBPROC glVertexAttrib2svARB;
+extern glVertexAttrib2fvARBPROC glVertexAttrib2fvARB;
+extern glVertexAttrib2dvARBPROC glVertexAttrib2dvARB;
+extern glVertexAttrib3svARBPROC glVertexAttrib3svARB;
+extern glVertexAttrib3fvARBPROC glVertexAttrib3fvARB;
+extern glVertexAttrib3dvARBPROC glVertexAttrib3dvARB;
+extern glVertexAttrib4bvARBPROC glVertexAttrib4bvARB;
+extern glVertexAttrib4svARBPROC glVertexAttrib4svARB;
+extern glVertexAttrib4ivARBPROC glVertexAttrib4ivARB;
+extern glVertexAttrib4ubvARBPROC glVertexAttrib4ubvARB;
+extern glVertexAttrib4usvARBPROC glVertexAttrib4usvARB;
+extern glVertexAttrib4uivARBPROC glVertexAttrib4uivARB;
+extern glVertexAttrib4fvARBPROC glVertexAttrib4fvARB;
+extern glVertexAttrib4dvARBPROC glVertexAttrib4dvARB;
+extern glVertexAttrib4NbvARBPROC glVertexAttrib4NbvARB;
+extern glVertexAttrib4NsvARBPROC glVertexAttrib4NsvARB;
+extern glVertexAttrib4NivARBPROC glVertexAttrib4NivARB;
+extern glVertexAttrib4NubvARBPROC glVertexAttrib4NubvARB;
+extern glVertexAttrib4NusvARBPROC glVertexAttrib4NusvARB;
+extern glVertexAttrib4NuivARBPROC glVertexAttrib4NuivARB;
+extern glVertexAttribPointerARBPROC glVertexAttribPointerARB;
+extern glEnableVertexAttribArrayARBPROC glEnableVertexAttribArrayARB;
+extern glDisableVertexAttribArrayARBPROC glDisableVertexAttribArrayARB;
+extern glProgramStringARBPROC glProgramStringARB;
+extern glBindProgramARBPROC glBindProgramARB;
+extern glDeleteProgramsARBPROC glDeleteProgramsARB;
+extern glGenProgramsARBPROC glGenProgramsARB;
+extern glProgramEnvParameter4dARBPROC glProgramEnvParameter4dARB;
+extern glProgramEnvParameter4dvARBPROC glProgramEnvParameter4dvARB;
+extern glProgramEnvParameter4fARBPROC glProgramEnvParameter4fARB;
+extern glProgramEnvParameter4fvARBPROC glProgramEnvParameter4fvARB;
+extern glProgramLocalParameter4dARBPROC glProgramLocalParameter4dARB;
+extern glProgramLocalParameter4dvARBPROC glProgramLocalParameter4dvARB;
+extern glProgramLocalParameter4fARBPROC glProgramLocalParameter4fARB;
+extern glProgramLocalParameter4fvARBPROC glProgramLocalParameter4fvARB;
+extern glGetProgramEnvParameterdvARBPROC glGetProgramEnvParameterdvARB;
+extern glGetProgramEnvParameterfvARBPROC glGetProgramEnvParameterfvARB;
+extern glGetProgramLocalParameterdvARBPROC glGetProgramLocalParameterdvARB;
+extern glGetProgramLocalParameterfvARBPROC glGetProgramLocalParameterfvARB;
+extern glGetProgramivARBPROC glGetProgramivARB;
+extern glGetProgramStringARBPROC glGetProgramStringARB;
+extern glGetVertexAttribdvARBPROC glGetVertexAttribdvARB;
+extern glGetVertexAttribfvARBPROC glGetVertexAttribfvARB;
+extern glGetVertexAttribivARBPROC glGetVertexAttribivARB;
+extern glGetVertexAttribPointervARBPROC glGetVertexAttribPointervARB;
+extern glIsProgramARBPROC glIsProgramARB;
+
+#define GL_VERTEX_PROGRAM_ARB                                   0x8620
+#define GL_VERTEX_PROGRAM_POINT_SIZE_ARB                        0x8642
+#define GL_VERTEX_PROGRAM_TWO_SIDE_ARB                          0x8643
+#define GL_COLOR_SUM_ARB                                        0x8458
+#define GL_PROGRAM_FORMAT_ASCII_ARB                             0x8875
+#define GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB                      0x8622
+#define GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB                         0x8623
+#define GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB                       0x8624
+#define GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB                         0x8625
+#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB                   0x886A
+#define GL_CURRENT_VERTEX_ATTRIB_ARB                            0x8626
+#define GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB                      0x8645
+#define GL_PROGRAM_LENGTH_ARB                                   0x8627
+#define GL_PROGRAM_FORMAT_ARB                                   0x8876
+#define GL_PROGRAM_BINDING_ARB                                  0x8677
+#define GL_PROGRAM_INSTRUCTIONS_ARB                             0x88A0
+#define GL_MAX_PROGRAM_INSTRUCTIONS_ARB                         0x88A1
+#define GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB                      0x88A2
+#define GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB                  0x88A3
+#define GL_PROGRAM_TEMPORARIES_ARB                              0x88A4
+#define GL_MAX_PROGRAM_TEMPORARIES_ARB                          0x88A5
+#define GL_PROGRAM_NATIVE_TEMPORARIES_ARB                       0x88A6
+#define GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB                   0x88A7
+#define GL_PROGRAM_PARAMETERS_ARB                               0x88A8
+#define GL_MAX_PROGRAM_PARAMETERS_ARB                           0x88A9
+#define GL_PROGRAM_NATIVE_PARAMETERS_ARB                        0x88AA
+#define GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB                    0x88AB
+#define GL_PROGRAM_ATTRIBS_ARB                                  0x88AC
+#define GL_MAX_PROGRAM_ATTRIBS_ARB                              0x88AD
+#define GL_PROGRAM_NATIVE_ATTRIBS_ARB                           0x88AE
+#define GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB                       0x88AF
+#define GL_PROGRAM_ADDRESS_REGISTERS_ARB                        0x88B0
+#define GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB                    0x88B1
+#define GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB                 0x88B2
+#define GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB             0x88B3
+#define GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB                     0x88B4
+#define GL_MAX_PROGRAM_ENV_PARAMETERS_ARB                       0x88B5
+#define GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB                      0x88B6
+#define GL_PROGRAM_STRING_ARB                                   0x8628
+#define GL_PROGRAM_ERROR_POSITION_ARB                           0x864B
+#define GL_CURRENT_MATRIX_ARB                                   0x8641
+#define GL_TRANSPOSE_CURRENT_MATRIX_ARB                         0x88B7
+#define GL_CURRENT_MATRIX_STACK_DEPTH_ARB                       0x8640
+#define GL_MAX_VERTEX_ATTRIBS_ARB                               0x8869
+#define GL_MAX_PROGRAM_MATRICES_ARB                             0x862F
+#define GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB                   0x862E
+#define GL_PROGRAM_ERROR_STRING_ARB                             0x8874
+#define GL_MATRIX0_ARB                                          0x88C0
+#define GL_MATRIX1_ARB                                          0x88C1
+#define GL_MATRIX2_ARB                                          0x88C2
+#define GL_MATRIX3_ARB                                          0x88C3
+#define GL_MATRIX4_ARB                                          0x88C4
+#define GL_MATRIX5_ARB                                          0x88C5
+#define GL_MATRIX6_ARB                                          0x88C6
+#define GL_MATRIX7_ARB                                          0x88C7
+#define GL_MATRIX8_ARB                                          0x88C8
+#define GL_MATRIX9_ARB                                          0x88C9
+#define GL_MATRIX10_ARB                                         0x88CA
+#define GL_MATRIX11_ARB                                         0x88CB
+#define GL_MATRIX12_ARB                                         0x88CC
+#define GL_MATRIX13_ARB                                         0x88CD
+#define GL_MATRIX14_ARB                                         0x88CE
+#define GL_MATRIX15_ARB                                         0x88CF
+#define GL_MATRIX16_ARB                                         0x88D0
+#define GL_MATRIX17_ARB                                         0x88D1
+#define GL_MATRIX18_ARB                                         0x88D2
+#define GL_MATRIX19_ARB                                         0x88D3
+#define GL_MATRIX20_ARB                                         0x88D4
+#define GL_MATRIX21_ARB                                         0x88D5
+#define GL_MATRIX22_ARB                                         0x88D6
+#define GL_MATRIX23_ARB                                         0x88D7
+#define GL_MATRIX24_ARB                                         0x88D8
+#define GL_MATRIX25_ARB                                         0x88D9
+#define GL_MATRIX26_ARB                                         0x88DA
+#define GL_MATRIX27_ARB                                         0x88DB
+#define GL_MATRIX28_ARB                                         0x88DC
+#define GL_MATRIX29_ARB                                         0x88DD
+#define GL_MATRIX30_ARB                                         0x88DE
+#define GL_MATRIX31_ARB                                         0x88DF
+
+#endif /* GL_ARB_vertex_program */
+
+/*-------------------------------------------------------------------*/
+/*------------GL_EXT_BGRA--------------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_EXT_bgra
+#define GL_EXT_bgra 1
+
+#define GL_BGR_EXT                                              0x80E0
+#define GL_BGRA_EXT                                             0x80E1
+
+#endif /* GL_EXT_bgra */
+
+/*-------------------------------------------------------------------*/
+/*------------EXT_CULL_VERTEX----------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_EXT_cull_vertex
+#define GL_EXT_cull_vertex 1
+
+#define GL_CULL_VERTEX_EXT                                      0x81AA
+#define GL_CULL_VERTEX_EYE_POSITION_EXT                         0x81AB
+#define GL_CULL_VERTEX_OBJECT_POSITION_EXT                      0x81AC
+
+typedef void (APIENTRY * glCullParameterfvEXTPROC) (GLenum pname, GLfloat *params);
+typedef void (APIENTRY * glCullParameterdvEXTPROC) (GLenum pname, GLdouble *params);
+
+extern glCullParameterfvEXTPROC glCullParameterfvEXT;
+extern glCullParameterdvEXTPROC glCullParameterdvEXT;
+ 
+
+#endif /* GL_EXT_cull_vertex */
+
+/*-------------------------------------------------------------------*/
+/*------------GL_ATI_POINT_CULL_MODE---------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_ATI_point_cull_mode
+#define GL_ATI_point_cull_mode 1
+
+#define GL_POINT_CULL_MODE_ATI                                  0x60b3
+#define GL_POINT_CULL_CENTER_ATI                                0x60b4
+#define GL_POINT_CLIP_ATI                                       0x60b5
+
+#endif /* GL_ATI_point_cull_mode */
+
+/*-------------------------------------------------------------------*/
+/*------------GL_BLEND_FUNC_SEPARATE---------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_EXT_blend_func_separate
+#define GL_EXT_blend_func_separate 1
+
+#define GL_BLEND_DST_RGB_EXT                                    0x80C8
+#define GL_BLEND_SRC_RGB_EXT                                    0x80C9
+#define GL_BLEND_DST_ALPHA_EXT                                  0x80CA
+#define GL_BLEND_SRC_ALPHA_EXT                                  0x80CB
+
+typedef void (APIENTRY * glBlendFuncSeparateEXTPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+
+extern glBlendFuncSeparateEXTPROC glBlendFuncSeparateEXT;
+
+#endif /* GL_EXT_blend_func_separate */
+
+/*-------------------------------------------------------------------*/
+/*------------GL_EXT_SEPARATE_SPECULAR_COLOR-------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_EXT_separate_specular_color
+#define GL_EXT_separate_specular_color 1
+
+#define GL_LIGHT_MODEL_COLOR_CONTROL_EXT                        0x81F8
+#define GL_SINGLE_COLOR_EXT                                     0x81F9
+#define GL_SEPARATE_SPECULAR_COLOR_EXT                          0x81FA
+
+#endif /* GL_EXT_separate_specular_color */
+
+/*-------------------------------------------------------------------*/
+/*------------GL_NV_ELEMENT_ARRAY------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_NV_element_array
+#define GL_NV_element_array 1
+
+#define GL_ELEMENT_ARRAY_TYPE_NV                                0x8769
+#define GL_ELEMENT_ARRAY_POINTER_NV                             0x876A
+
+typedef void (APIENTRY * glElementPointerNVPROC) (GLenum type, const GLvoid *pointer);
+typedef void (APIENTRY * glDrawElementArrayNVPROC) (GLenum mode, GLint first, GLsizei count);
+typedef void (APIENTRY * glDrawRangeElementArrayNVPROC) (GLenum mode, GLuint start, GLuint end, GLint first, GLsizei count);
+typedef void (APIENTRY * glMultiDrawElementArrayNVPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
+typedef void (APIENTRY * glMultiDrawRangeElementArrayNVPROC) (GLenum mode, GLuint start, GLuint end, const GLint *first, const GLsizei *count, GLsizei primcount);
+
+extern glElementPointerNVPROC glElementPointerNV;
+extern glDrawElementArrayNVPROC glDrawElementArrayNV;
+extern glDrawRangeElementArrayNVPROC glDrawRangeElementArrayNV;
+extern glMultiDrawElementArrayNVPROC glMultiDrawElementArrayNV;
+extern glMultiDrawRangeElementArrayNVPROC glMultiDrawRangeElementArrayNV;
+
+#endif /* GL_NV_element_array */
+
+/*-------------------------------------------------------------------*/
+/*------------GL_NV_FLOAT_BUFFER-------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_NV_float_buffer
+#define GL_NV_float_buffer 1
+
+#define GL_FLOAT_R_NV                                           0x8880
+#define GL_FLOAT_RG_NV                                          0x8881
+#define GL_FLOAT_RGB_NV                                         0x8882
+#define GL_FLOAT_RGBA_NV                                        0x8883
+#define GL_FLOAT_R32_NV                                         0x8885
+#define GL_FLOAT_R16_NV                                         0x8884
+#define GL_FLOAT_R32_NV                                         0x8885
+#define GL_FLOAT_RG16_NV                                        0x8886
+#define GL_FLOAT_RG32_NV                                        0x8887
+#define GL_FLOAT_RGB16_NV                                       0x8888
+#define GL_FLOAT_RGB32_NV                                       0x8889
+#define GL_FLOAT_RGBA16_NV                                      0x888A
+#define GL_FLOAT_RGBA32_NV                                      0x888B
+#define GL_TEXTURE_FLOAT_COMPONENTS_NV                          0x888C
+#define GL_FLOAT_CLEAR_COLOR_VALUE_NV                           0x888D
+#define GL_FLOAT_RGBA_MODE_NV                                   0x888E
+
+#ifdef _WIN32
+#define WGL_FLOAT_COMPONENTS_NV                                 0x20B0
+#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_R_NV                0x20B1
+#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RG_NV               0x20B2
+#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGB_NV              0x20B3
+#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGBA_NV             0x20B4
+#define WGL_TEXTURE_FLOAT_R_NV                                  0x20B5
+#define WGL_TEXTURE_FLOAT_RG_NV                                 0x20B6
+#define WGL_TEXTURE_FLOAT_RGB_NV                                0x20B7
+#define WGL_TEXTURE_FLOAT_RGBA_NV                               0x20B8
+#endif /* _WIN32 */
+
+#endif /* GL_NV_float_buffer */
+
+/*-------------------------------------------------------------------*/
+/*------------GL_NV_FRAGMENT_PROGRAM---------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_NV_fragment_program
+#define GL_NV_fragment_program 1
+
+#define GL_FRAGMENT_PROGRAM_NV                                  0x8870
+#define GL_MAX_TEXTURE_COORDS_NV                                0x8871
+#define GL_MAX_TEXTURE_IMAGE_UNITS_NV                           0x8872
+#define GL_FRAGMENT_PROGRAM_BINDING_NV                          0x8873
+#define GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV             0x8868
+#define GL_PROGRAM_ERROR_STRING_NV                              0x8874
+
+typedef void (APIENTRY * glProgramNamedParameter4fNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRY * glProgramNamedParameter4dNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRY * glProgramNamedParameter4fvNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLfloat v[]);
+typedef void (APIENTRY * glProgramNamedParameter4dvNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLdouble v[]);
+typedef void (APIENTRY * glGetProgramNamedParameterfvNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat *params);
+typedef void (APIENTRY * glGetProgramNamedParameterdvNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble *params);
+
+#ifndef GL_ARB_vertex_program
+typedef void (APIENTRY * glProgramLocalParameter4dARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRY * glProgramLocalParameter4dvARBPROC) (GLenum target, GLuint index, const GLdouble *params);
+typedef void (APIENTRY * glProgramLocalParameter4fARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRY * glProgramLocalParameter4fvARBPROC) (GLenum target, GLuint index, const GLfloat *params);
+typedef void (APIENTRY * glGetProgramLocalParameterdvARBPROC) (GLenum target, GLuint index, GLdouble *params);
+typedef void (APIENTRY * glGetProgramLocalParameterfvARBPROC) (GLenum target, GLuint index, GLfloat *params);
+#endif /* GL_ARB_vertex_program */
+
+extern glProgramNamedParameter4fNVPROC glProgramNamedParameter4fNV;
+extern glProgramNamedParameter4dNVPROC glProgramNamedParameter4dNV;
+extern glProgramNamedParameter4fvNVPROC glProgramNamedParameter4fvNV;
+extern glProgramNamedParameter4dvNVPROC glProgramNamedParameter4dvNV;
+extern glGetProgramNamedParameterfvNVPROC glGetProgramNamedParameterfvNV;
+extern glGetProgramNamedParameterdvNVPROC glGetProgramNamedParameterdvNV;
+
+#ifndef GL_ARB_vertex_program
+extern glProgramLocalParameter4dARBPROC glProgramLocalParameter4dARB;
+extern glProgramLocalParameter4dvARBPROC glProgramLocalParameter4dvARB;
+extern glProgramLocalParameter4fARBPROC glProgramLocalParameter4fARB;
+extern glProgramLocalParameter4fvARBPROC glProgramLocalParameter4fvARB;
+extern glGetProgramLocalParameterdvARBPROC glGetProgramLocalParameterdvARB;
+extern glGetProgramLocalParameterfvARBPROC glGetProgramLocalParameterfvARB;
+#endif /* GL_ARB_vertex_program */
+
+#endif /* GL_NV_fragment_program */
+
+/*-------------------------------------------------------------------*/
+/*------------GL_NV_PRIMITIVE_RESTART--------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_NV_primitive_restart
+#define GL_NV_primitive_restart 1
+
+#define GL_PRIMITIVE_RESTART_NV                                 0x8558
+#define GL_PRIMITIVE_RESTART_INDEX_NV                           0x8559
+
+typedef void (APIENTRY * glPrimitiveRestartNVPROC) ();
+typedef void (APIENTRY * glPrimitiveRestartIndexNVPROC) (GLuint index);
+
+extern glPrimitiveRestartNVPROC glPrimitiveRestartNV;
+extern glPrimitiveRestartIndexNVPROC glPrimitiveRestartIndexNV;
+
+#endif /* GL_NV_primitive_restart */
+
+/*-------------------------------------------------------------------*/
+/*------------GL_NV_VERTEX_PROGRAM2----------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_NV_vertex_program2
+#define GL_NV_vertex_program2 1
+
+#endif /* GL_NV_vertex_program2 */
+
+/*-------------------------------------------------------------------*/
+/*------------GL_ARB_FRAGMENT_PROGRAM--------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_ARB_fragment_program
+#define GL_ARB_fragment_program
+
+#ifndef GL_ARB_vertex_program
+#error ARB_vertex_program not defined
+#endif
+
+/* no new entry points, all of ARB_vertex_program reused */
+
+#define GL_FRAGMENT_PROGRAM_ARB                                 0x8804
+#define GL_PROGRAM_ALU_INSTRUCTIONS_ARB                         0x8805
+#define GL_PROGRAM_TEX_INSTRUCTIONS_ARB                         0x8806
+#define GL_PROGRAM_TEX_INDIRECTIONS_ARB                         0x8807
+#define GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB                  0x8808
+#define GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB                  0x8809
+#define GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB                  0x880A
+#define GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB                     0x880B
+#define GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB                     0x880C
+#define GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB                     0x880D
+#define GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB              0x880E
+#define GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB              0x880F
+#define GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB              0x8810
+#define GL_MAX_TEXTURE_COORDS_ARB                               0x8871
+#define GL_MAX_TEXTURE_IMAGE_UNITS_ARB                          0x8872
+
+#endif /* GL_ARB_fragment_program */
+
+/*-------------------------------------------------------------------*/
+/*------------GL_ATI_TEXT_FRAGMENT_SHADER----------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_ATI_text_fragment_shader
+#define GL_ATI_text_fragment_shader 1
+
+#define GL_TEXT_FRAGMENT_SHADER_ATI                             0x8200
+
+#endif /* GL_ATI_text_fragment_shader */
+
+/*-------------------------------------------------------------------*/
+/*------------GL_EXT_textzre_env_combine-----------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_EXT_texture_env_combine
+#define GL_EXT_texture_env_combine 1
+
+#define GL_COMBINE_EXT                                          0x8570
+#define GL_COMBINE_RGB_EXT                                      0x8571
+#define GL_COMBINE_ALPHA_EXT                                    0x8572
+#define GL_RGB_SCALE_EXT                                        0x8573
+#define GL_ADD_SIGNED_EXT                                       0x8574
+#define GL_INTERPOLATE_EXT                                      0x8575
+#define GL_CONSTANT_EXT                                         0x8576
+#define GL_PRIMARY_COLOR_EXT                                    0x8577
+#define GL_PREVIOUS_EXT                                         0x8578
+#define GL_SOURCE0_RGB_EXT                                      0x8580
+#define GL_SOURCE1_RGB_EXT                                      0x8581
+#define GL_SOURCE2_RGB_EXT                                      0x8582
+#define GL_SOURCE0_ALPHA_EXT                                    0x8588
+#define GL_SOURCE1_ALPHA_EXT                                    0x8589
+#define GL_SOURCE2_ALPHA_EXT                                    0x858A
+#define GL_OPERAND0_RGB_EXT                                     0x8590
+#define GL_OPERAND1_RGB_EXT                                     0x8591
+#define GL_OPERAND2_RGB_EXT                                     0x8592
+#define GL_OPERAND0_ALPHA_EXT                                   0x8598
+#define GL_OPERAND1_ALPHA_EXT                                   0x8599
+#define GL_OPERAND2_ALPHA_EXT                                   0x859A
+
+#endif /* GL_EXT_texture_env_combine */
+
+// added -ec
+/*-------------------------------------------------------------------*/
+/*------------GL_EXT_TEXTURE_RECTANGLE-------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_EXT_texture_rectangle
+#define GL_EXT_texture_rectangle 1
+
+#define GL_TEXTURE_RECTANGLE_EXT                                 0x84F5
+#define GL_TEXTURE_BINDING_RECTANGLE_EXT                         0x84F6
+#define GL_PROXY_TEXTURE_RECTANGLE_EXT                           0x84F7
+#define GL_MAX_RECTANGLE_TEXTURE_SIZE_EXT                        0x84F8
+
+#endif /* GL_EXT_texture_rectangle */
+
+// added -ec
+/*-------------------------------------------------------------------*/
+/*------------GL_ATI_texture_float-----------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_ATI_texture_float
+#define GL_ATI_texture_float                1
+
+#define GL_RGBA_FLOAT32_ATI                 0x8814
+#define GL_RGB_FLOAT32_ATI                  0x8815
+#define GL_ALPHA_FLOAT32_ATI                0x8816
+#define GL_INTENSITY_FLOAT32_ATI            0x8817
+#define GL_LUMINANCE_FLOAT32_ATI            0x8818
+#define GL_LUMINANCE_ALPHA_FLOAT32_ATI      0x8819
+#define GL_RGBA_FLOAT16_ATI                 0x881A
+#define GL_RGB_FLOAT16_ATI                  0x881B
+#define GL_ALPHA_FLOAT16_ATI                0x881C
+#define GL_INTENSITY_FLOAT16_ATI            0x881D
+#define GL_LUMINANCE_FLOAT16_ATI            0x881E
+#define GL_LUMINANCE_ALPHA_FLOAT16_ATI      0x881F
+    
+#endif /* GL_ATI_texture_float */
+
+// added -ec
+/*-------------------------------------------------------------------*/
+/*------------GL_ATI_draw_buffers------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef GL_ATI_draw_buffers
+#define GL_ATI_draw_buffers     1
+//
+// requires GL_ARB_fragment_program
+//
+
+#define GL_MAX_DRAW_BUFFERS_ATI 0x8824
+#define GL_DRAW_BUFFER0_ATI     0x8825
+#define GL_DRAW_BUFFER1_ATI     0x8826
+#define GL_DRAW_BUFFER2_ATI     0x8827
+#define GL_DRAW_BUFFER3_ATI     0x8828
+#define GL_DRAW_BUFFER4_ATI     0x8829
+#define GL_DRAW_BUFFER5_ATI     0x882A
+#define GL_DRAW_BUFFER6_ATI     0x882B
+#define GL_DRAW_BUFFER7_ATI     0x882C
+#define GL_DRAW_BUFFER8_ATI     0x882D
+#define GL_DRAW_BUFFER9_ATI     0x882E
+#define GL_DRAW_BUFFER10_ATI    0x882F
+#define GL_DRAW_BUFFER11_ATI    0x8830
+#define GL_DRAW_BUFFER12_ATI    0x8831
+#define GL_DRAW_BUFFER13_ATI    0x8832
+#define GL_DRAW_BUFFER14_ATI    0x8833
+#define GL_DRAW_BUFFER15_ATI    0x8834
+
+typedef void (APIENTRY * PFNGLDRAWBUFFERS) (GLsizei n, const GLenum *bufs);
+
+extern PFNGLDRAWBUFFERS glDrawBuffersATI;
+
+#endif /* GL_ATI_draw_buffers */
+
+// added -ec
+/*-------------------------------------------------------------------*/
+/*------------GL_ATI_pixel_format_float------------------------------*/
+/*-------------------------------------------------------------------*/
+#ifndef WGL_ATI_pixel_format_float
+#define WGL_ATI_pixel_format_float
+
+#define WGL_RGBA_FLOAT_MODE_ATI                     0x8820
+#define WGL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI         0x8835
+#define WGL_TYPE_RGBA_FLOAT_ATI                     0x21A0
+    
+#endif /* WGL_ATI_pixel_format_float */
+
+/*-------------------------------------------------------------------*/
+/*------------END GL EXTENSIONS--------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+/*-------------------------------------------------------------------*/
+/*------------WGL EXTENSIONS HERE------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifdef _WIN32
+
+/*-------------------------------------------------------------------*/
+/*------------WGL_EXT_EXTENSION_STRING-------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef WGL_EXT_extensions_string
+#define WGL_EXT_extensions_string 1
+
+typedef const char* (APIENTRY * wglGetExtensionsStringEXTPROC) ();
+
+extern wglGetExtensionsStringEXTPROC wglGetExtensionsStringEXT;
+
+#endif /* WGL_EXT_extensions_string */
+
+/*-------------------------------------------------------------------*/
+/*------------WGL_ARB_BUFFER_REGION----------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef WGL_ARB_buffer_region
+#define WGL_ARB_buffer_region 1
+
+
+#define WGL_FRONT_COLOR_BUFFER_BIT_ARB                          0x00000001
+#define WGL_BACK_COLOR_BUFFER_BIT_ARB                           0x00000002
+#define WGL_DEPTH_BUFFER_BIT_ARB                                0x00000004
+#define WGL_STENCIL_BUFFER_BIT_ARB                              0x00000008
+
+typedef HANDLE (APIENTRY * wglCreateBufferRegionARBPROC) (HDC hDC, int iLayerPlane, UINT uType);
+typedef VOID (APIENTRY * wglDeleteBufferRegionARBPROC) (HANDLE hRegion);
+typedef BOOL (APIENTRY * wglSaveBufferRegionARBPROC) (HANDLE hRegion, int x, int y, int width, int height);
+typedef BOOL (APIENTRY * wglRestoreBufferRegionARBPROC) (HANDLE hRegion, int x, int y, int width, int height, int xSrc, int ySrc);
+
+extern wglCreateBufferRegionARBPROC wglCreateBufferRegionARB;
+extern wglDeleteBufferRegionARBPROC wglDeleteBufferRegionARB;
+extern wglSaveBufferRegionARBPROC wglSaveBufferRegionARB;
+extern wglRestoreBufferRegionARBPROC wglRestoreBufferRegionARB;
+
+#endif /* WGL_ARB_buffer_region */
+
+/*-------------------------------------------------------------------*/
+/*------------WGL_ARB_EXTENSION_STRING-------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef WGL_ARB_extensions_string
+#define WGL_ARB_extensions_string 1
+
+typedef const char* (APIENTRY * wglGetExtensionsStringARBPROC) (HDC hdc);
+
+extern wglGetExtensionsStringARBPROC wglGetExtensionsStringARB;
+
+#endif /* WGL_ARB_extensions_string */
+
+/*-------------------------------------------------------------------*/
+/*------------WGL_ARB_PBUFFER----------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef WGL_ARB_pbuffer
+#define WGL_ARB_pbuffer 1
+
+#define WGL_DRAW_TO_PBUFFER_ARB                                 0x202D
+#define WGL_DRAW_TO_PBUFFER_ARB                                 0x202D
+#define WGL_MAX_PBUFFER_PIXELS_ARB                              0x202E
+#define WGL_MAX_PBUFFER_WIDTH_ARB                               0x202F
+#define WGL_MAX_PBUFFER_HEIGHT_ARB                              0x2030
+#define WGL_PBUFFER_LARGEST_ARB                                 0x2033
+#define WGL_PBUFFER_WIDTH_ARB                                   0x2034
+#define WGL_PBUFFER_HEIGHT_ARB                                  0x2035
+#define WGL_PBUFFER_LOST_ARB                                    0x2036
+
+DECLARE_HANDLE(HPBUFFERARB);
+
+typedef HPBUFFERARB (APIENTRY * wglCreatePbufferARBPROC) (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList);
+typedef HDC (APIENTRY * wglGetPbufferDCARBPROC) (HPBUFFERARB hPbuffer);
+typedef int (APIENTRY * wglReleasePbufferDCARBPROC) (HPBUFFERARB hPbuffer, HDC hDC);
+typedef BOOL (APIENTRY * wglDestroyPbufferARBPROC) (HPBUFFERARB hPbuffer);
+typedef BOOL (APIENTRY * wglQueryPbufferARBPROC) (HPBUFFERARB hPbuffer, int iAttribute, int *piValue);
+
+extern wglCreatePbufferARBPROC wglCreatePbufferARB;
+extern wglGetPbufferDCARBPROC wglGetPbufferDCARB;
+extern wglReleasePbufferDCARBPROC wglReleasePbufferDCARB;
+extern wglDestroyPbufferARBPROC wglDestroyPbufferARB;
+extern wglQueryPbufferARBPROC wglQueryPbufferARB;
+
+#endif /* WGL_ARB_pbuffer */
+
+/*-------------------------------------------------------------------*/
+/*------------WGL_ARB_PIXEL_FORMAT-----------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef WGL_ARB_pixel_format
+#define WGL_ARB_pixel_format 1
+
+#define WGL_NUMBER_PIXEL_FORMATS_ARB                            0x2000
+#define WGL_DRAW_TO_WINDOW_ARB                                  0x2001
+#define WGL_DRAW_TO_BITMAP_ARB                                  0x2002
+#define WGL_ACCELERATION_ARB                                    0x2003
+#define WGL_NEED_PALETTE_ARB                                    0x2004
+#define WGL_NEED_SYSTEM_PALETTE_ARB                             0x2005
+#define WGL_SWAP_LAYER_BUFFERS_ARB                              0x2006
+#define WGL_SWAP_METHOD_ARB                                     0x2007
+#define WGL_NUMBER_OVERLAYS_ARB                                 0x2008
+#define WGL_NUMBER_UNDERLAYS_ARB                                0x2009
+#define WGL_TRANSPARENT_ARB                                     0x200A
+#define WGL_TRANSPARENT_RED_VALUE_ARB                           0x2037
+#define WGL_TRANSPARENT_GREEN_VALUE_ARB                         0x2038
+#define WGL_TRANSPARENT_BLUE_VALUE_ARB                          0x2039
+#define WGL_TRANSPARENT_ALPHA_VALUE_ARB                         0x203A
+#define WGL_TRANSPARENT_INDEX_VALUE_ARB                         0x203B
+#define WGL_SHARE_DEPTH_ARB                                     0x200C
+#define WGL_SHARE_STENCIL_ARB                                   0x200D
+#define WGL_SHARE_ACCUM_ARB                                     0x200E
+#define WGL_SUPPORT_GDI_ARB                                     0x200F
+#define WGL_SUPPORT_OPENGL_ARB                                  0x2010
+#define WGL_DOUBLE_BUFFER_ARB                                   0x2011
+#define WGL_STEREO_ARB                                          0x2012
+#define WGL_PIXEL_TYPE_ARB                                      0x2013
+#define WGL_COLOR_BITS_ARB                                      0x2014
+#define WGL_RED_BITS_ARB                                        0x2015
+#define WGL_RED_SHIFT_ARB                                       0x2016
+#define WGL_GREEN_BITS_ARB                                      0x2017
+#define WGL_GREEN_SHIFT_ARB                                     0x2018
+#define WGL_BLUE_BITS_ARB                                       0x2019
+#define WGL_BLUE_SHIFT_ARB                                      0x201A
+#define WGL_ALPHA_BITS_ARB                                      0x201B
+#define WGL_ALPHA_SHIFT_ARB                                     0x201C
+#define WGL_ACCUM_BITS_ARB                                      0x201D
+#define WGL_ACCUM_RED_BITS_ARB                                  0x201E
+#define WGL_ACCUM_GREEN_BITS_ARB                                0x201F
+#define WGL_ACCUM_BLUE_BITS_ARB                                 0x2020
+#define WGL_ACCUM_ALPHA_BITS_ARB                                0x2021
+#define WGL_DEPTH_BITS_ARB                                      0x2022
+#define WGL_STENCIL_BITS_ARB                                    0x2023
+#define WGL_AUX_BUFFERS_ARB                                     0x2024
+#define WGL_NO_ACCELERATION_ARB                                 0x2025
+#define WGL_GENERIC_ACCELERATION_ARB                            0x2026
+#define WGL_FULL_ACCELERATION_ARB                               0x2027
+#define WGL_SWAP_EXCHANGE_ARB                                   0x2028
+#define WGL_SWAP_COPY_ARB                                       0x2029
+#define WGL_SWAP_UNDEFINED_ARB                                  0x202A
+#define WGL_TYPE_RGBA_ARB                                       0x202B
+#define WGL_TYPE_COLORINDEX_ARB                                 0x202C
+
+typedef BOOL (APIENTRY * wglGetPixelFormatAttribivARBPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, int *piValues);
+typedef BOOL (APIENTRY * wglGetPixelFormatAttribfvARBPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, FLOAT *pfValues);
+typedef BOOL (APIENTRY * wglChoosePixelFormatARBPROC) (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats);
+
+extern wglGetPixelFormatAttribivARBPROC wglGetPixelFormatAttribivARB;
+extern wglGetPixelFormatAttribfvARBPROC wglGetPixelFormatAttribfvARB;
+extern wglChoosePixelFormatARBPROC wglChoosePixelFormatARB;
+
+#endif /* WGL_ARB_pixel_format */
+
+/*-------------------------------------------------------------------*/
+/*------------WGL_ARB_RENDER_TEXTURE---------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef WGL_ARB_render_texture
+#define WGL_ARB_render_texture 1
+
+#define WGL_BIND_TO_TEXTURE_RGB_ARB                             0x2070
+#define WGL_BIND_TO_TEXTURE_RGBA_ARB                            0x2071
+#define WGL_TEXTURE_FORMAT_ARB                                  0x2072
+#define WGL_TEXTURE_TARGET_ARB                                  0x2073
+#define WGL_MIPMAP_TEXTURE_ARB                                  0x2074
+#define WGL_TEXTURE_RGB_ARB                                     0x2075
+#define WGL_TEXTURE_RGBA_ARB                                    0x2076
+#define WGL_NO_TEXTURE_ARB                                      0x2077
+#define WGL_TEXTURE_CUBE_MAP_ARB                                0x2078
+#define WGL_TEXTURE_1D_ARB                                      0x2079
+#define WGL_TEXTURE_2D_ARB                                      0x207A
+#define WGL_NO_TEXTURE_ARB                                      0x2077
+#define WGL_MIPMAP_LEVEL_ARB                                    0x207B
+#define WGL_CUBE_MAP_FACE_ARB                                   0x207C
+#define WGL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB                     0x207D
+#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB                     0x207E
+#define WGL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB                     0x207F
+#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB                     0x2080
+#define WGL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB                     0x2081
+#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB                     0x2082
+#define WGL_FRONT_LEFT_ARB                                      0x2083
+#define WGL_FRONT_RIGHT_ARB                                     0x2084
+#define WGL_BACK_LEFT_ARB                                       0x2085
+#define WGL_BACK_RIGHT_ARB                                      0x2086
+#define WGL_AUX0_ARB                                            0x2087
+#define WGL_AUX1_ARB                                            0x2088
+#define WGL_AUX2_ARB                                            0x2089
+#define WGL_AUX3_ARB                                            0x208A
+#define WGL_AUX4_ARB                                            0x208B
+#define WGL_AUX5_ARB                                            0x208C
+#define WGL_AUX6_ARB                                            0x208D
+#define WGL_AUX7_ARB                                            0x208E
+#define WGL_AUX8_ARB                                            0x208F
+#define WGL_AUX9_ARB                                            0x2090
+
+typedef BOOL (APIENTRY * wglBindTexImageARBPROC) (HPBUFFERARB hPbuffer, int iBuffer);
+typedef BOOL (APIENTRY * wglReleaseTexImageARBPROC) (HPBUFFERARB hPbuffer, int iBuffer);
+typedef BOOL (APIENTRY * wglSetPbufferAttribARBPROC) (HPBUFFERARB hPbuffer, const int *piAttribList);
+
+extern wglBindTexImageARBPROC wglBindTexImageARB;
+extern wglReleaseTexImageARBPROC wglReleaseTexImageARB;
+extern wglSetPbufferAttribARBPROC wglSetPbufferAttribARB;
+
+#endif /*WGL_ARB_render_texture */
+
+/*-------------------------------------------------------------------*/
+/*------------WGL_EXT_SWAP_CONTROL-----------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef WGL_EXT_swap_control
+#define WGL_EXT_swap_control 1
+
+typedef BOOL (APIENTRY * wglSwapIntervalEXTPROC) (int interval);
+typedef int (APIENTRY * wglGetSwapIntervalEXTPROC) (void);
+
+extern wglSwapIntervalEXTPROC wglSwapIntervalEXT;
+extern wglGetSwapIntervalEXTPROC wglGetSwapIntervalEXT;
+
+#endif /* WGL_EXT_swap_control */
+
+/*-------------------------------------------------------------------*/
+/*------------WGL_ARB_MAKE_CURRENT_READ------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef WGL_ARB_make_current_read
+#define WGL_ARB_make_current_read 1
+
+#define ERROR_INVALID_PIXEL_TYPE_ARB                            0x2043
+#define ERROR_INCOMPATIBLE_DEVICE_CONTEXTS_ARB	                0x2054
+
+typedef BOOL (APIENTRY * wglMakeContextCurrentARBPROC) (HDC hDrawDC, HDC hReadDC, HGLRC hglrc);
+typedef HDC (APIENTRY * wglGetCurrentReadDCARBPROC) (void);
+
+extern wglMakeContextCurrentARBPROC wglMakeContextCurrentARB;
+extern wglGetCurrentReadDCARBPROC wglGetCurrentReadDCARB;
+
+#endif /* WGL_ARB_make_current_read */
+
+/*-------------------------------------------------------------------*/
+/*------------WGL_ARB_MULTISAMPLE------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef WGL_ARB_multisample
+#define WGL_ARB_multisample 1
+
+#define WGL_SAMPLE_BUFFERS_ARB                                  0x2041
+#define WGL_SAMPLES_ARB                                         0x2042
+
+#endif /* WGL_ARB_multisample */
+
+/*-------------------------------------------------------------------*/
+/*------------WGL_NV_RENDER_DEPTH_TEXTURE----------------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef WGL_NV_render_depth_texture
+#define WGL_NV_render_depth_texture 1
+
+#define WGL_BIND_TO_TEXTURE_DEPTH_NV                            0x20A3
+#define WGL_BIND_TO_TEXTURE_RECTANGLE_DEPTH_NV                  0x20A4
+#define WGL_DEPTH_TEXTURE_FORMAT_NV                             0x20A5
+#define WGL_TEXTURE_DEPTH_COMPONENT_NV                          0x20A6
+#define WGL_NO_TEXTURE_ARB                                      0x2077
+#define WGL_DEPTH_COMPONENT_NV                                  0x20A7
+
+#endif /* WGL_NV_render_depth_texture */
+
+/*-------------------------------------------------------------------*/
+/*------------WGL_NV_RENDER_TEXTURE_RECTANGLE-----------------------*/
+/*-------------------------------------------------------------------*/
+
+#ifndef WGL_NV_render_texture_rectangle 
+#define WGL_NV_render_texture_rectangle 1
+
+#define WGL_BIND_TO_TEXTURE_RECTANGLE_RGB_NV                    0x20A0
+#define WGL_BIND_TO_TEXTURE_RECTANGLE_RGBA_NV                   0x20A1
+#define WGL_TEXTURE_RECTANGLE_NV                                0x20A2
+
+#endif /* WGL_NV_render_texture_rectangle */
+
+/*-------------------------------------------------------------------*/
+/*------------END WGL EXTENSIONS-------------------------------------*/
+/*-------------------------------------------------------------------*/
+
+#endif /* WIN32 */
+
+/* helper stuff */
+
+/* I use int here because C does not know bool */
+
+#ifdef _WIN32
+
+struct WGLExtensionTypes
+{
+    int ARB_buffer_region;
+    int ARB_extensions_string;
+    int ARB_make_current_read;
+    int ARB_multisample;
+    int ARB_pbuffer;
+    int ARB_pixel_format;
+    int ARB_render_texture;
+    int EXT_extensions_string;
+    int EXT_swap_control;
+    int NV_render_depth_texture;
+    int NV_render_texture_rectangle;
+    int ATI_pixel_format_float;
+};
+
+#else /* No WIN32 */
+
+struct GLXExtensionTypes
+{
+
+};
+
+#endif /* WIN32 */
+
+struct ExtensionTypes
+{
+#ifdef _WIN32 /* WGL extensions */   
+    struct WGLExtensionTypes wgl;
+#else /* no WIN32 */
+    struct GLXExtensionTypes glx;
+#endif /* WIN32 */
+    int ARB_imaging;
+    int ARB_depth_texture;
+    int ARB_fragment_program;
+    int ARB_matrix_palette;
+    int ARB_multisample;
+    int ARB_multitexture;
+    int ARB_point_parameters;
+    int ARB_shadow;
+    int ARB_shadow_ambient;
+    int ARB_texture_border_clamp;
+    int ARB_texture_compression;
+    int ARB_texture_cube_map;
+    int ARB_texture_env_add;
+    int ARB_texture_env_dot3;
+    int ARB_texture_env_combine;
+    int ARB_texture_env_crossbar;
+    int ARB_texture_mirrored_repeat;
+    int ARB_transpose_matrix;
+    int ARB_vertex_blend;
+    int ARB_vertex_program;
+    int ARB_window_pos;
+    int EXT_abgr;
+    int EXT_bgra;
+    int EXT_blend_func_separate;
+    int EXT_compiled_vertex_array;
+    int EXT_cull_vertex;
+    int EXT_fog_coord;
+    int EXT_multi_draw_arrays;
+    int EXT_point_parameters;
+    int EXT_secondary_color;
+    int EXT_separate_specular_color;
+    int EXT_shadow_funcs;
+    int EXT_stencil_two_side;
+    int EXT_stencil_wrap;
+    int EXT_texture_compression_s3tc;
+    int EXT_texture_env_combine;
+    int EXT_texture_filter_anisotropic;
+    int EXT_texture_lod_bias;
+    int EXT_texture_rectangle; // added -ec
+    int EXT_vertex_shader;
+    int EXT_vertex_weighting;
+    int EXT_draw_range_elements;
+    int ATI_draw_buffers; // added -ec
+    int ATI_element_array;
+    int ATI_envmap_bumpmap;
+    int ATI_fragment_shader;
+    int ATI_pn_triangles;
+    int ATI_point_cull_mode;
+    int ATI_text_fragment_shader;
+    int ATI_texture_float; // added -ec
+    int ATI_texture_mirror_once;
+    int ATI_vertex_array_object;
+    int ATI_vertex_streams;
+    int ATIX_point_sprites;
+    int ATIX_texture_env_route;
+    int HP_occlusion_test;
+    int NV_blend_square;
+    int NV_copy_depth_to_color;
+    int NV_depth_clamp;
+    int NV_element_array;
+    int NV_evaluators;
+    int NV_fence;
+    int NV_float_buffer;
+    int NV_fog_distance;
+    int NV_fragment_program;
+    int NV_light_max_exponent;
+    int NV_occlusion_query;
+    int NV_packed_depth_stencil;
+    int NV_point_sprite;
+    int NV_primitive_restart;
+    int NV_register_combiners;
+    int NV_register_combiners2;
+    int NV_texgen_reflection;
+    int NV_texture_env_combine4;
+    int NV_texture_rectangle;
+    int NV_texture_shader;
+    int NV_texture_shader2;
+    int NV_texture_shader3;
+    int NV_vertex_array_range;
+    int NV_vertex_array_range2;
+    int NV_vertex_program;
+    int NV_vertex_program1_1;
+    int NV_vertex_program2;
+    int SGIS_generate_mipmap;
+    int SGIX_shadow;
+    int SGIX_depth_texture;
+    int OpenGL12;
+    int OpenGL13;
+    int OpenGL14;
+};
+
+extern struct ExtensionTypes extgl_Extensions;
+
+extern struct ExtensionTypes SupportedExtensions; /* deprecated, please do not use */
+
+/* initializes everything, call this right after the rc is created. the function returns 0 if successful */
+LIB_RENDERING_EXPORT
+int extgl_Initialize();
+
+LIB_RENDERING_EXPORT
+int glInitialize(); /* deprecated, please do not use */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __EXTGL_H__ */
diff --git a/extern/freestyle/src/rendering/pbuffer.cpp b/extern/freestyle/src/rendering/pbuffer.cpp
new file mode 100755
index 00000000000..ec73fc52ae4
--- /dev/null
+++ b/extern/freestyle/src/rendering/pbuffer.cpp
@@ -0,0 +1,292 @@
+#include <pbuffer.h>
+
+#include <memory.h>
+
+#define MAX_PFORMATS 256
+#define MAX_ATTRIBS  32
+#define PBUFFER_AS_TEXTURE 2048
+
+//************************************************************
+// Implementation of PBuffer
+//************************************************************
+/*!
+ * Creates a PBuffer of size \p w by \p h, eith mode \p mode.
+ */
+PBuffer::PBuffer(const unsigned int w,
+		 const unsigned int h,
+		 const int format) 
+  : format_(format),
+    sharedContext_(false),
+    sharedLists_(false),
+    display_(NULL),
+    glxPbuffer_(0),
+    glxContext_(0), 
+    width_(w),
+    height_(h)
+{
+}    
+/*!
+ * Initialize the pbuffer. If \p shareContext is true, then the currently
+ * active context with be shared by the pbuffer, meaning for example that
+ * textures objects or display lists of the currently active GL context will
+ * be available to the pbuffer.  If you want it to be the case just for
+ * display lists, set \p sharedContext to false and \p shareLists to true.
+ * 
+ * This function is outside of the constructor for several reasons. First it
+ * might raise exceptions so it cannot be done in the constructor. Secondly,
+ * it is using the current context for sharing so you might want to create
+ * the pbuffer at a moment where this context is not yet active, and then
+ * initialise it once the context has been created and activated.
+ *
+ * Return false if creation failed.
+ */
+bool
+PBuffer::create(const bool shareContext, const bool shareLists)
+{
+  // Set display and screen
+  Display *pDisplay     = glXGetCurrentDisplay();
+  if (pDisplay == NULL)
+  {
+    pDisplay = XOpenDisplay(NULL);
+  }
+  int iScreen           = DefaultScreen(pDisplay);
+  GLXContext glxContext = glXGetCurrentContext();
+  
+  GLXFBConfig *glxConfig;
+  int iConfigCount;   
+    
+  sharedContext_ = shareContext;
+  sharedLists_ = shareLists;
+
+  if (sharedContext_)
+  {
+    glxConfig = glXGetFBConfigs(pDisplay, iScreen, &iConfigCount);
+    if (!glxConfig)
+    {
+//       "pbuffer creation error:  glXGetFBConfigs() failed"
+      return false;
+    }
+  }  
+  else
+  {
+    int iAttributes[2*MAX_ATTRIBS];
+    int curAttrib = 0;
+        
+    memset(iAttributes, 0, 2*MAX_ATTRIBS*sizeof(int));        
+            
+    iAttributes[2*curAttrib  ] = GLX_DRAWABLE_TYPE;
+    iAttributes[2*curAttrib+1] = GLX_PBUFFER_BIT;
+    curAttrib++;
+        
+    if (format_ & ColorIndex)
+    {
+      iAttributes[2*curAttrib  ] = GLX_RENDER_TYPE;
+      iAttributes[2*curAttrib+1] = GLX_COLOR_INDEX_BIT;
+      curAttrib++;
+    }
+    else
+    {
+      iAttributes[2*curAttrib  ] = GLX_RENDER_TYPE;
+      iAttributes[2*curAttrib+1] = GLX_RGBA_BIT;
+      iAttributes[2*curAttrib  ] = GLX_ALPHA_SIZE;
+      iAttributes[2*curAttrib+1] = 8;
+      curAttrib++;
+    }
+        
+    if (format_ & DoubleBuffer)
+    {
+      iAttributes[2*curAttrib  ] = GLX_DOUBLEBUFFER;
+      iAttributes[2*curAttrib+1] = true;
+      curAttrib++;
+    }
+    else
+    {
+      iAttributes[2*curAttrib  ] = GLX_DOUBLEBUFFER;
+      iAttributes[2*curAttrib+1] = false;
+      curAttrib++;
+    }  
+    if (format_ & DepthBuffer)
+    {
+      iAttributes[2*curAttrib  ] = GLX_DEPTH_SIZE;
+      iAttributes[2*curAttrib+1] = 1;
+      curAttrib++;
+    }
+    else
+    {
+      iAttributes[2*curAttrib  ] = GLX_DEPTH_SIZE;
+      iAttributes[2*curAttrib+1] = 0;
+      curAttrib++;
+    }    
+        
+    if (format_ & StencilBuffer)
+    {
+      iAttributes[2*curAttrib  ] = GLX_STENCIL_SIZE;
+      iAttributes[2*curAttrib+1] = 1;
+      curAttrib++;
+    }
+    else
+    {
+      iAttributes[2*curAttrib  ] = GLX_STENCIL_SIZE;
+      iAttributes[2*curAttrib+1] = 0;
+      curAttrib++;
+    }
+
+    iAttributes[2*curAttrib  ] = None;
+    
+    glxConfig = glXChooseFBConfigSGIX(pDisplay, iScreen, iAttributes, &iConfigCount);
+    if (!glxConfig)
+    {
+      // "pbuffer creation error:  glXChooseFBConfig() failed"
+      return false;
+    }
+  }
+   
+  int attributes[5];
+  int iCurAttrib = 0;
+    
+  memset(attributes, 0, 5*sizeof(int));
+
+  attributes[2*iCurAttrib  ] = GLX_LARGEST_PBUFFER;
+  attributes[2*iCurAttrib+1] = true;
+  iCurAttrib++;
+
+  attributes[2*iCurAttrib  ] = GLX_PRESERVED_CONTENTS;
+  attributes[2*iCurAttrib+1] = true;
+  iCurAttrib++;
+    
+  attributes[2*iCurAttrib  ] = None;
+
+  glxPbuffer_ = glXCreateGLXPbufferSGIX(pDisplay, glxConfig[0],
+					width_, height_, attributes);
+    
+  if (!glxPbuffer_)
+  {
+    // "pbuffer creation error:  glXCreatePbuffer() failed"
+    return false;
+  }
+    
+  if (sharedContext_)
+  {
+    glxContext_ = glxContext;
+  }
+  else
+  {
+    if (format_ & ColorIndex)
+    {
+      if (sharedLists_)
+	glxContext_ = glXCreateContextWithConfigSGIX(pDisplay,
+						     glxConfig[0],
+						     GLX_COLOR_INDEX_TYPE,
+						     glxContext, true);
+      else
+	glxContext_ = glXCreateContextWithConfigSGIX(pDisplay,
+						     glxConfig[0],
+						     GLX_COLOR_INDEX_TYPE,
+						     NULL, true);
+    }
+    else
+    {
+      if (sharedLists_)
+	glxContext_ = glXCreateContextWithConfigSGIX(pDisplay,
+						     glxConfig[0],
+						     GLX_RGBA_TYPE,
+						     glxContext, true);
+      else
+	glxContext_ = glXCreateContextWithConfigSGIX(pDisplay,
+						     glxConfig[0],
+						     GLX_RGBA_TYPE,
+						     NULL, true);
+    }
+
+    if (!glxConfig)
+    {
+      // "pbuffer creation error:  glXCreateNewContext() failed"
+      return false;
+    }
+  }
+
+  display_ = pDisplay;
+
+  glXQueryGLXPbufferSGIX(display_, glxPbuffer_, GLX_WIDTH, &width_);
+  glXQueryGLXPbufferSGIX(display_, glxPbuffer_, GLX_HEIGHT, &height_);
+
+  return true;
+}
+/*!
+ * Destroy the pbuffer
+ */
+PBuffer::~PBuffer()
+{
+  if (glxPbuffer_)
+  {
+    glXDestroyGLXPbufferSGIX(display_, glxPbuffer_);        
+  }
+}
+/*!
+ * Activate the pbuffer as the current GL context. All subsequents GL
+ * commands will now affect the pbuffer. If you want to push/pop the current
+ * OpenGL context use subclass PBufferEx instead.
+ *
+ * Return false if it failed.
+ */
+bool
+PBuffer::makeCurrent()
+{
+  return glXMakeCurrent(display_, glxPbuffer_, glxContext_);
+}
+/*!
+ * Return the width of the pbuffer
+ */
+unsigned int
+PBuffer::width() const
+{
+  return width_;
+}
+/*!
+ * Return the height of the pbuffer
+ */
+unsigned int
+PBuffer::height() const
+{
+  return height_;
+}
+//************************************************************
+// Implementation of PBufferEx
+//************************************************************
+PBufferEx::PBufferEx(const unsigned int width,
+		     const unsigned int height,
+		     const int mode)
+  : PBuffer(width, height, mode),
+    oldDisplay_(NULL),
+    glxOldDrawable_(0),
+    glxOldContext_(0)
+{
+}
+/*!
+ * Activate the pbuffer as the current GL context. All subsequents GL
+ * commands will now affect the pbuffer. Once you are done with you GL
+ * commands, you can call endCurrent() to restore the context that was active
+ * when you call makeCurrent().
+ *
+ * Return false if it failed.
+ */
+bool
+PBufferEx::makeCurrent()
+{
+  oldDisplay_ = glXGetCurrentDisplay();
+  glxOldDrawable_ = glXGetCurrentDrawable();
+  glxOldContext_ = glXGetCurrentContext();
+  
+  return PBuffer::makeCurrent();
+}
+/*!
+ * Restore the GL context that was active when makeCurrent() was called.
+ *
+ * Return false if it failed.
+ */
+bool
+PBufferEx::endCurrent()
+{
+  return glXMakeCurrent(oldDisplay_, glxOldDrawable_, glxOldContext_);
+}
+
diff --git a/extern/freestyle/src/rendering/pbuffer.h b/extern/freestyle/src/rendering/pbuffer.h
new file mode 100755
index 00000000000..7f11f461b1c
--- /dev/null
+++ b/extern/freestyle/src/rendering/pbuffer.h
@@ -0,0 +1,77 @@
+#ifndef PBUFFERS_H
+#define PBUFFERS_H
+
+#ifndef WIN32
+#  ifdef __MACH__
+#    include <OpenGL/gl.h>
+#  else
+#    include <GL/gl.h>
+#    include <GL/glx.h>
+#  endif
+
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+// Interface of PBuffer
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+class PBuffer
+{
+public:
+  enum FormatOption
+  {
+    DoubleBuffer            = 0x0001,
+    DepthBuffer             = 0x0002,
+    Rgba                    = 0x0004,
+    StencilBuffer           = 0x0020,
+    SingleBuffer            = DoubleBuffer  << 16,
+    NoDepthBuffer           = DepthBuffer   << 16,
+    ColorIndex              = Rgba          << 16,
+    NoStencilBuffer         = StencilBuffer << 16,
+  };
+     
+  PBuffer(const unsigned int width,
+	  const unsigned int height,
+	  int format);
+  bool create(const bool shareContext = false,
+	      const bool shareLists = false);
+  virtual ~PBuffer();
+  
+  virtual bool makeCurrent();
+  unsigned int width() const;
+  unsigned int height() const;
+protected:
+  ///! Flags indicating the type of pbuffer.
+  int          format_;
+  ///! Flag indicating if the rendering context is shared with another context.
+  bool         sharedContext_;
+  //! Flag indicating if display lists should be shared between rendering
+  // contexts.(If the rendering context is shared (default), then display
+  // lists are automatically shared).
+  bool         sharedLists_; 
+  Display*     display_;
+  GLXPbuffer   glxPbuffer_;
+  GLXContext   glxContext_;    
+  unsigned int width_;
+  unsigned int height_;
+};
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+// Interface of PBufferEx
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+/*!
+ * pbuffer layer to keep previous pbuffer states.
+ */
+class PBufferEx : public PBuffer
+{
+public:
+  PBufferEx(const unsigned int width,
+	    const unsigned int height,
+	    const int mode );
+  virtual bool makeCurrent();
+  bool endCurrent();
+private:
+  Display*    oldDisplay_;
+  GLXDrawable glxOldDrawable_;
+  GLXContext  glxOldContext_;
+  int	      vp[4];
+};
+
+#endif //PBUFFERS_H
+#endif //WIN32
diff --git a/extern/freestyle/src/rendering/rendering.pro b/extern/freestyle/src/rendering/rendering.pro
new file mode 100755
index 00000000000..0bbca195b6b
--- /dev/null
+++ b/extern/freestyle/src/rendering/rendering.pro
@@ -0,0 +1,102 @@
+# This file should be viewed as a -*- mode: Makefile -*-
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#			      W A R N I N G ! ! !                             #
+#             a u t h o r i z e d    p e r s o n a l    o n l y               #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+
+include(../Config.pri)
+
+TEMPLATE        = lib
+
+TARGET          = $${LIB_RENDERING}
+VERSION         = $${APPVERSION}
+TARGET_VERSION_EXT = $${APPVERSION_MAJ}.$${APPVERSION_MID}
+
+#
+# CONFIG
+#
+#######################################
+
+CONFIG          *= opengl glut dll 
+
+exists (../libconfig.pri) {
+  include (../libconfig.pri)
+}
+
+#
+# DEFINES
+#
+#######################################
+
+#DEFINES         *= ROOT_DIR=\"$(FREESTYLE_DIR)\"
+win32:DEFINES   *= MAKE_LIB_RENDERING_DLL
+
+#
+# INCLUDE PATH
+#
+#######################################
+
+#INCLUDEPATH     *= ../scene_graph ../winged_edge ../view_map ../geometry \
+#                   ../stroke ../system ../image
+
+#
+# BUILD DIRECTORIES
+#
+#######################################
+
+BUILD_DIR       = ../../build
+
+OBJECTS_DIR     = $${BUILD_DIR}/$${REL_OBJECTS_DIR}
+!win32:DESTDIR  = $${BUILD_DIR}/$${REL_DESTDIR}/lib
+win32:DESTDIR   = $${BUILD_DIR}/$${REL_DESTDIR}
+
+#
+# LIBS
+#
+#######################################
+
+win32:LIBS      *= $${DESTDIR}/$${LIB_GEOMETRY}$${LIBVERSION}.lib \
+                   $${DESTDIR}/$${LIB_SCENE_GRAPH}$${LIBVERSION}.lib \
+                   $${DESTDIR}/$${LIB_SYSTEM}$${LIBVERSION}.lib \
+                   $${DESTDIR}/$${LIB_WINGED_EDGE}$${LIBVERSION}.lib \
+                   $${DESTDIR}/$${LIB_VIEW_MAP}$${LIBVERSION}.lib \
+                   $${DESTDIR}/$${LIB_STROKE}$${LIBVERSION}.lib
+
+!win32 {
+    lib_bundle {
+      LIBS += -F$${DESTDIR} -framework $${LIB_GEOMETRY} \
+		-framework $${LIB_IMAGE} -framework $${LIB_SCENE_GRAPH} \
+		-framework $${LIB_SYSTEM} -framework $${LIB_WINGED_EDGE} \
+		-framework $${LIB_VIEW_MAP} -framework $${LIB_STROKE}
+    } else {
+      LIBS *= -L$${DESTDIR} -l$${LIB_GEOMETRY} -l$${LIB_IMAGE} -l$${LIB_SCENE_GRAPH} \
+                   -l$${LIB_SYSTEM} -l$${LIB_WINGED_EDGE} -l$${LIB_VIEW_MAP} -l$${LIB_STROKE}
+    }
+  }
+#
+# INSTALL
+#
+#######################################
+
+LIB_DIR       = ../../lib
+# install library
+target.path   = $$LIB_DIR
+# "make install" configuration options
+INSTALLS     += target
+
+#
+# SOURCES & HEADERS
+#
+#######################################
+
+!static {
+  include(src.pri)
+}
+
+
+#
+# DEFINES
+# 
+#######################################
+!win32: DEFINES += GLX_GLXEXT_PROTOTYPES
diff --git a/extern/freestyle/src/rendering/src.pri b/extern/freestyle/src/rendering/src.pri
new file mode 100755
index 00000000000..aee4cdb2782
--- /dev/null
+++ b/extern/freestyle/src/rendering/src.pri
@@ -0,0 +1,33 @@
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#			      W A R N I N G ! ! !                             #
+#             a u t h o r i z e d    p e r s o n a l    o n l y               #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+
+RENDERING_DIR = ../rendering
+
+SOURCES *= $${RENDERING_DIR}/GLBBoxRenderer.cpp \
+           $${RENDERING_DIR}/GLDebugRenderer.cpp \
+           $${RENDERING_DIR}/GLFreeMemoryVisitor.cpp \
+           $${RENDERING_DIR}/GLMonoColorRenderer.cpp \
+           $${RENDERING_DIR}/GLRenderer.cpp \
+           $${RENDERING_DIR}/GLSelectRenderer.cpp \
+           $${RENDERING_DIR}/GLStrokeRenderer.cpp \
+           $${RENDERING_DIR}/GLUtils.cpp 
+				     
+win32:SOURCES *= $${RENDERING_DIR}/extgl.cpp
+
+#!win32:SOURCES *= $${RENDERING_DIR}/pbuffer.cpp 
+				     
+HEADERS *= $${RENDERING_DIR}/GLBBoxRenderer.h \
+           $${RENDERING_DIR}/GLDebugRenderer.h \
+           $${RENDERING_DIR}/GLFreeMemoryVisitor.h \
+           $${RENDERING_DIR}/GLMonoColorRenderer.h \
+           $${RENDERING_DIR}/GLRenderer.h \
+           $${RENDERING_DIR}/GLSelectRenderer.h \
+           $${RENDERING_DIR}/GLStrokeRenderer.h \
+           $${RENDERING_DIR}/GLUtils.h 
+				     
+win32:HEADERS *= $${RENDERING_DIR}/extgl.h
+
+#!win32:HEADERS *= $${RENDERING_DIR}/pbuffer.h
+
diff --git a/extern/freestyle/src/scene_graph/DrawingStyle.h b/extern/freestyle/src/scene_graph/DrawingStyle.h
new file mode 100755
index 00000000000..e2be6fa8264
--- /dev/null
+++ b/extern/freestyle/src/scene_graph/DrawingStyle.h
@@ -0,0 +1,82 @@
+//
+//  Filename         : DrawingStyle.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Class to define the drawing style of a node
+//  Date of creation : 10/10/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  DRAWINGSTYLE_H
+# define DRAWINGSTYLE_H
+
+class DrawingStyle
+{
+public:
+  enum STYLE
+  {FILLED, LINES, POINTS, INVISIBLE};
+  
+  inline DrawingStyle() {Style = FILLED; LineWidth = 2.f; PointSize = 2.f; LightingEnabled = true;}
+  inline explicit DrawingStyle(const DrawingStyle& iBrother);
+  
+  virtual ~DrawingStyle() {}
+
+  /*! operators */
+  inline DrawingStyle& operator=(const DrawingStyle& ds);
+  
+  inline void SetStyle(const STYLE iStyle) {Style = iStyle;}
+  inline void SetLineWidth(const float iLineWidth) {LineWidth = iLineWidth;}
+  inline void SetPointSize(const float iPointSize) {PointSize = iPointSize;}
+  inline void SetLightingEnabled(const bool on) {LightingEnabled = on;}
+
+  inline STYLE style() const {return Style;}
+  inline float lineWidth() const {return LineWidth;}
+  inline float pointSize() const {return PointSize;}
+  inline bool lightingEnabled() const {return LightingEnabled;}
+
+private:
+  STYLE Style;
+  float LineWidth;
+  float PointSize;
+  bool LightingEnabled;
+};
+
+DrawingStyle::DrawingStyle(const DrawingStyle& iBrother)
+{
+  Style           = iBrother.Style;
+  LineWidth       = iBrother.LineWidth;
+  PointSize       = iBrother.PointSize;
+  LightingEnabled = iBrother.LightingEnabled;
+}
+
+DrawingStyle& DrawingStyle::operator=(const DrawingStyle& ds)
+{
+  Style           = ds.Style;
+  LineWidth       = ds.LineWidth;
+  PointSize       = ds.PointSize;
+  LightingEnabled = ds.LightingEnabled;
+
+  return *this;
+}
+
+#endif // DRAWINGSTYLE_H
diff --git a/extern/freestyle/src/scene_graph/IndexedFaceSet.cpp b/extern/freestyle/src/scene_graph/IndexedFaceSet.cpp
new file mode 100755
index 00000000000..ec3d3ad748c
--- /dev/null
+++ b/extern/freestyle/src/scene_graph/IndexedFaceSet.cpp
@@ -0,0 +1,321 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "IndexedFaceSet.h"
+
+IndexedFaceSet::IndexedFaceSet()
+: Rep()
+{
+  _Vertices = NULL;
+  _Normals = NULL;
+  _Materials = 0;
+  _TexCoords = 0;
+  _VSize = 0;
+  _NSize = 0;
+  _MSize = 0;
+  _TSize = 0;
+  _NumFaces = 0;
+  _NumVertexPerFace = NULL;
+  _FaceStyle = NULL;
+  _VIndices = NULL;
+  _VISize = 0;
+  _NIndices = NULL;
+  _NISize = 0;
+  _MIndices = NULL;
+  _MISize = 0;
+  _TIndices = NULL;
+  _TISize = 0;
+  _displayList = 0;
+}
+
+IndexedFaceSet::IndexedFaceSet( real *iVertices, unsigned iVSize, 
+                                real *iNormals, unsigned iNSize,
+                                Material **iMaterials, unsigned iMSize,
+                                real *iTexCoords, unsigned iTSize,
+                                unsigned iNumFaces, unsigned *iNumVertexPerFace, TRIANGLES_STYLE *iFaceStyle,
+                                unsigned *iVIndices, unsigned iVISize,
+                                unsigned *iNIndices, unsigned iNISize,
+                                unsigned *iMIndices, unsigned iMISize,
+                                unsigned *iTIndices, unsigned iTISize,
+                                unsigned iCopy)
+                                : Rep()
+{
+  if(1 == iCopy)
+  {
+    _VSize = iVSize;
+    _Vertices = new real[_VSize];
+    memcpy(_Vertices, iVertices, iVSize*sizeof(real));
+
+    _NSize = iNSize;
+    _Normals = new real[_NSize];
+    memcpy(_Normals, iNormals, iNSize*sizeof(real));
+
+    _MSize = iMSize;
+    _Materials = 0;
+	if(iMaterials){
+		_Materials = new Material*[_MSize];
+		for(unsigned i=0; i<_MSize; ++i)
+			_Materials[i] = new Material(*(iMaterials[i]));
+	}
+    _TSize = iTSize;
+    _TexCoords = 0;
+    if(_TSize){
+        _TexCoords = new real[_TSize];
+        memcpy(_TexCoords, iTexCoords, iTSize*sizeof(real));
+    }
+
+    _NumFaces = iNumFaces;
+    _NumVertexPerFace = new unsigned[_NumFaces];
+    memcpy(_NumVertexPerFace, iNumVertexPerFace, _NumFaces*sizeof(unsigned));
+
+    _FaceStyle = new TRIANGLES_STYLE[_NumFaces];
+    memcpy(_FaceStyle, iFaceStyle, _NumFaces*sizeof(TRIANGLES_STYLE));
+
+    _VISize = iVISize;
+    _VIndices = new unsigned[_VISize];
+    memcpy(_VIndices, iVIndices, _VISize*sizeof(unsigned));
+  
+    _NISize = iNISize;
+    _NIndices = new unsigned[_NISize];
+    memcpy(_NIndices, iNIndices, _NISize*sizeof(unsigned));
+
+    _MISize = iMISize;
+		_MIndices = 0;
+		if(iMIndices){
+			_MIndices = new unsigned[_MISize];
+			memcpy(_MIndices, iMIndices, _MISize*sizeof(unsigned));
+		}
+    _TISize = iTISize;
+    _TIndices = 0;
+    if(_TISize){
+        _TIndices = new unsigned[_TISize];
+        memcpy(_TIndices, iTIndices, _TISize*sizeof(unsigned));
+    }
+  }
+  else
+  {
+    _VSize = iVSize;
+    _Vertices = iVertices;
+
+    _NSize = iNSize;
+    _Normals = iNormals;
+
+    _MSize = iMSize;
+		_Materials = 0;
+		if(iMaterials)
+			_Materials = iMaterials;
+    
+    _TSize = iTSize;
+    _TexCoords = iTexCoords;
+
+    _NumFaces = iNumFaces;
+    _NumVertexPerFace = iNumVertexPerFace;
+    _FaceStyle = iFaceStyle;
+
+    _VISize = iVISize;
+    _VIndices = iVIndices;
+  
+    _NISize = iNISize;
+    _NIndices = iNIndices;
+    
+    _MISize = iMISize;
+		_MIndices = 0;
+		if(iMISize)
+			_MIndices = iMIndices;
+
+    _TISize = iTISize;
+    _TIndices = iTIndices;
+    }
+
+  _displayList = 0;
+}
+
+IndexedFaceSet::IndexedFaceSet( const IndexedFaceSet& iBrother)
+:Rep(iBrother)
+{
+  _VSize = iBrother.vsize();
+  _Vertices = new real[_VSize];
+  memcpy(_Vertices, iBrother.vertices(), _VSize*sizeof(real));
+  
+  _NSize = iBrother.nsize();
+  _Normals = new real[_NSize];
+  memcpy(_Normals, iBrother.normals(), _NSize*sizeof(real));
+
+  _MSize = iBrother.msize();
+	if(_MSize){
+		_Materials = new Material*[_MSize];
+		for(unsigned i=0; i<_MSize; ++i){
+			_Materials[i] = new Material(*(iBrother._Materials[i]));
+		}
+	}else{
+		_Materials = 0;
+	}
+
+    _TSize = iBrother.tsize();
+    _TexCoords  = 0;
+    if(_TSize){
+        _TexCoords = new real[_TSize];
+        memcpy(_TexCoords, iBrother.texCoords(), _TSize*sizeof(real));
+    }
+  
+  _NumFaces = iBrother.numFaces();
+  _NumVertexPerFace = new unsigned[_NumFaces];
+  memcpy(_NumVertexPerFace, iBrother.numVertexPerFaces(), _NumFaces*sizeof(unsigned));
+  
+  _FaceStyle = new TRIANGLES_STYLE[_NumFaces];
+  memcpy(_FaceStyle, iBrother.trianglesStyle(), _NumFaces*sizeof(TRIANGLES_STYLE));
+  
+  _VISize = iBrother.visize();
+  _VIndices = new unsigned[_VISize];
+  memcpy(_VIndices, iBrother.vindices(), _VISize*sizeof(unsigned));
+  
+  _NISize = iBrother.nisize();
+  _NIndices = new unsigned[_NISize];
+  memcpy(_NIndices, iBrother.nindices(), _NISize*sizeof(unsigned));
+
+  _MISize = iBrother.misize();
+	if(_MISize){
+		_MIndices = new unsigned[_MISize];
+		memcpy(_MIndices, iBrother.mindices(), _MISize*sizeof(unsigned));
+	}else{
+		_MIndices=0;
+	}
+
+    _TISize = iBrother.tisize();
+    _TIndices = 0;
+    if(_TISize){
+        _TIndices = new unsigned[_TISize];
+        memcpy(_TIndices, iBrother.tindices(), _TISize*sizeof(unsigned));
+    }
+
+  _displayList = 0;
+}
+
+IndexedFaceSet::~IndexedFaceSet()
+{
+  if(NULL != _Vertices)
+  {
+    delete [] _Vertices;
+    _Vertices = NULL;
+  }
+
+  if(NULL != _Normals)
+  {
+    delete [] _Normals;
+    _Normals = NULL;
+  }
+
+  if(NULL != _Materials)
+  {
+    for(unsigned i=0; i<_MSize; ++i)
+      delete _Materials[i];
+    delete [] _Materials;
+    _Materials = NULL;
+  }
+
+  if(NULL != _TexCoords)
+  {
+      delete [] _TexCoords;
+      _TexCoords = NULL;
+  }
+
+  if(NULL != _NumVertexPerFace)
+  {
+    delete [] _NumVertexPerFace;
+    _NumVertexPerFace = NULL;
+  }
+
+  if(NULL != _FaceStyle)
+  {
+    delete [] _FaceStyle;
+    _FaceStyle = NULL;
+  }
+
+  if(NULL != _VIndices)
+  {
+    delete [] _VIndices;
+    _VIndices = NULL;
+  }
+
+  if(NULL != _NIndices)
+  {
+    delete [] _NIndices;
+    _NIndices = NULL;
+  }
+
+  if(NULL != _MIndices)
+  {
+    delete [] _MIndices;
+    _MIndices = NULL;
+  }
+  if(NULL != _TIndices)
+  {
+      delete [] _TIndices;
+      _TIndices = NULL;
+  }
+  // should find a way to deallocates the displayList
+  // glDeleteLists(GLuint list, GLSizei range)
+  _displayList = 0;
+}
+
+void IndexedFaceSet::accept(SceneVisitor& v) {
+    Rep::accept(v);
+    v.visitIndexedFaceSet(*this);
+}
+
+void IndexedFaceSet::ComputeBBox()
+{
+  real XMax = _Vertices[0];
+  real YMax = _Vertices[1];
+  real ZMax = _Vertices[2];
+
+  real XMin = _Vertices[0];
+  real YMin = _Vertices[1];
+  real ZMin = _Vertices[2];
+
+  // parse all the coordinates to find 
+  // the Xmax, YMax, ZMax
+  real *v = _Vertices;
+
+  for(unsigned i=0; i<_VSize/3; i++)
+  {
+    // X
+    if(*v > XMax)
+      XMax = *v;
+    if(*v < XMin)
+      XMin = *v;
+    v++;
+
+    if(*v > YMax)
+      YMax = *v;
+    if(*v < YMin)
+      YMin = *v;
+    v++;
+
+    if(*v > ZMax)
+      ZMax = *v;
+    if(*v < ZMin)
+      ZMin = *v;
+    v++;
+  }
+
+  SetBBox(BBox<Vec3r>(Vec3r(XMin, YMin, ZMin), Vec3r(XMax, YMax, ZMax)));
+}
diff --git a/extern/freestyle/src/scene_graph/IndexedFaceSet.h b/extern/freestyle/src/scene_graph/IndexedFaceSet.h
new file mode 100755
index 00000000000..c6951942dbb
--- /dev/null
+++ b/extern/freestyle/src/scene_graph/IndexedFaceSet.h
@@ -0,0 +1,222 @@
+//
+//  Filename         : IndexedFaceSet.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : A Set of indexed faces to represent a surfacic object
+//  Date of creation : 22/01/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  INDEXEDFACESET_H
+# define INDEXEDFACESET_H
+
+# include <stdio.h>
+# include <memory.h>
+
+//! inherits from class Rep 
+# include "Rep.h"
+
+# include "../system/FreestyleConfig.h"
+
+class LIB_SCENE_GRAPH_EXPORT IndexedFaceSet : public Rep
+	{
+public:
+
+  /*! Triangles description style:*/
+  enum TRIANGLES_STYLE{TRIANGLE_STRIP, TRIANGLE_FAN, TRIANGLES};
+
+  /*! Builds an empty indexed face set 
+  */
+  IndexedFaceSet();
+  /*! Builds an indexed face set 
+        iVertices
+          The array of object vertices 3D coordinates (for all faces).
+          If iCopy != 0, the array is copied; you must desallocate iVertices. Else you must not.
+        iVSize
+          The size of iVertices (must be a multiple of 3)
+        iNormals
+          The array of object normals 3D coordinates.
+          If iCopy != 0, the array is copied; you must desallocate iNormals. Else you must not.
+        iNSize
+          The size of iNormals
+        iMaterials
+          The array of materials
+        iMSize
+          The size of iMaterials
+        iTexCoords
+          The array of texture coordinates.
+        iTSize
+          The size of iTexCoords (must be multiple of 2)
+        iNumFaces
+          The number of faces
+        iNumVertexPerFace
+          Array containing the number of vertices per face.
+        iFaceStyle
+          Array containing the description style of each faces.
+          The style belongs to:
+          - TRIANGLE_STRIP: the face indices describe a triangle strip
+          - TRIANGLE_FAN  : the face indices describe a triangle fan
+          - TRIANGLES     : the face indices describe single triangles
+          If iCopy != 0, the array is copied; you must desallocate iFaceStyle. Else you must not.
+        iVIndices,
+          Array of vertices indices. 
+          The integers contained in this array must be multiple of 3.
+          If iCopy != 0, the array is copied; you must desallocate iVIndices. Else you must not.
+        iVISize
+          The size of iVIndices.
+        iNIndices
+          Array of normals indices. 
+          The integers contained in this array must be multiple of 3.
+          If iCopy != 0, the array is copied; you must desallocate iNIndices. Else you must not.
+        iNISize
+          The size of iNIndices
+        iMIndices
+          The Material indices (per vertex)
+        iMISize
+          The size of iMIndices
+        iTIndices
+          The Texture coordinates indices (per vertex). The integers contained in this array must be multiple of 2.
+        iTISize
+          The size of iMIndices
+        iCopy
+          0 : the arrays are not copied. The pointers passed as arguments are used. 
+              IndexedFaceSet takes these arrays desallocation in charge.
+          1 : the arrays are copied. The caller is in charge of the arrays, passed
+              as arguments desallocation.
+  */
+  IndexedFaceSet( real *iVertices, unsigned iVSize, 
+		  real *iNormals, unsigned iNSize,
+                  Material **iMaterials, unsigned iMSize,
+                  real *iTexCoords, unsigned iTSize,
+		  unsigned iNumFaces, unsigned *iNumVertexPerFace, TRIANGLES_STYLE *iFaceStyle,
+		  unsigned *iVIndices, unsigned iVISize,
+		  unsigned *iNIndices, unsigned iNISize,
+                  unsigned *iMIndices, unsigned iMISize,
+                  unsigned *iTIndices, unsigned iTISize,
+		  unsigned iCopy = 1
+		  );
+  
+  /*! Builds an indexed face set from an other indexed face set */
+  IndexedFaceSet(const IndexedFaceSet& iBrother);
+
+	void swap(IndexedFaceSet& ioOther){
+		std::swap(_Vertices, ioOther._Vertices);
+		std::swap(_Normals, ioOther._Normals);
+		std::swap(_Materials, ioOther._Materials);
+        std::swap(_TexCoords, ioOther._TexCoords);
+
+		std::swap(_VSize, ioOther._VSize);
+		std::swap(_NSize, ioOther._NSize);
+		std::swap(_MSize, ioOther._MSize);
+        std::swap(_TSize, ioOther._TSize);
+
+		std::swap(_NumFaces, ioOther._NumFaces);
+		std::swap(_NumVertexPerFace, ioOther._NumVertexPerFace);
+		std::swap(_FaceStyle, ioOther._FaceStyle);
+
+		std::swap(_VIndices, ioOther._VIndices);
+		std::swap(_NIndices, ioOther._NIndices);
+		std::swap(_MIndices, ioOther._MIndices); // Material Indices
+        std::swap(_TIndices, ioOther._TIndices);
+
+		std::swap(_VISize, ioOther._VISize);
+		std::swap(_NISize, ioOther._NISize);
+		std::swap(_MISize, ioOther._MISize);
+        std::swap(_TISize, ioOther._TISize);
+
+		std::swap(_displayList, ioOther._displayList);
+
+		Rep::swap(ioOther);
+	}
+
+	IndexedFaceSet& operator=(const IndexedFaceSet& iBrother){
+		IndexedFaceSet tmp(iBrother);
+		swap(tmp);
+		return *this;
+	}
+
+  /*! Desctructor 
+      desallocates all the ressources */
+  virtual ~IndexedFaceSet();
+
+  /*! Accept the corresponding visitor */
+  virtual void accept(SceneVisitor& v);
+
+  /*! Compute the Bounding Box */
+  virtual void ComputeBBox();
+
+  /*! modifiers */
+  inline void SetDisplayList(unsigned int index) {_displayList = index;}
+
+  /*! Accessors */
+  virtual const real * vertices() const {return _Vertices;}
+  virtual const real * normals() const {return _Normals;}
+  virtual const Material*const* materials() const {return _Materials;}
+  virtual const real* texCoords() const {return _TexCoords;}
+  virtual const unsigned vsize() const {return _VSize;}
+  virtual const unsigned nsize() const {return _NSize;}
+  virtual const unsigned msize() const {return _MSize;}
+  virtual const unsigned tsize() const {return _TSize;}
+  virtual const unsigned numFaces() const {return _NumFaces;}
+  virtual const unsigned * numVertexPerFaces() const {return _NumVertexPerFace;}
+  virtual const TRIANGLES_STYLE * trianglesStyle() const {return _FaceStyle;}
+  virtual const unsigned* vindices() const {return _VIndices;}
+  virtual const unsigned* nindices() const {return _NIndices;}
+  virtual const unsigned* mindices() const {return _MIndices;}
+  virtual const unsigned* tindices() const {return _TIndices;}
+  virtual const unsigned visize() const {return _VISize;}
+  virtual const unsigned nisize() const {return _NISize;}
+  virtual const unsigned misize() const {return _MISize;}
+  virtual const unsigned tisize() const {return _TISize;}
+  inline unsigned int displayList() const {return _displayList;}
+
+protected:
+  real *_Vertices;
+  real *_Normals;
+  Material** _Materials;
+  real *_TexCoords;
+  
+  unsigned _VSize;
+  unsigned _NSize;
+  unsigned _MSize;
+  unsigned _TSize;
+
+  unsigned _NumFaces;
+  unsigned *_NumVertexPerFace;
+  TRIANGLES_STYLE *_FaceStyle;
+
+  unsigned *_VIndices;
+  unsigned *_NIndices;
+  unsigned *_MIndices; // Material Indices
+  unsigned *_TIndices; // Texture coordinates Indices
+  
+  unsigned _VISize;
+  unsigned _NISize;
+  unsigned _MISize;
+  unsigned _TISize;
+
+  unsigned int _displayList;
+
+};
+
+#endif // INDEXEDFACESET_H
diff --git a/extern/freestyle/src/scene_graph/LineRep.cpp b/extern/freestyle/src/scene_graph/LineRep.cpp
new file mode 100755
index 00000000000..9dec2ec803f
--- /dev/null
+++ b/extern/freestyle/src/scene_graph/LineRep.cpp
@@ -0,0 +1,58 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "LineRep.h"
+
+void LineRep::ComputeBBox()
+{
+  real XMax = _vertices.front()[0];
+  real YMax = _vertices.front()[1];
+  real ZMax = _vertices.front()[2];
+
+  real XMin = _vertices.front()[0];
+  real YMin = _vertices.front()[1];
+  real ZMin = _vertices.front()[2];
+
+  // parse all the coordinates to find 
+  // the XMax, YMax, ZMax
+  vector<Vec3r>::iterator v;
+  for(v=_vertices.begin(); v!=_vertices.end(); v++) {
+    // X
+    if((*v)[0] > XMax)
+      XMax = (*v)[0];
+    if((*v)[0] < XMin)
+      XMin = (*v)[0];
+
+    // Y
+    if((*v)[1] > YMax)
+      YMax = (*v)[1];
+    if((*v)[1] < YMin)
+      YMin = (*v)[1];
+
+    // Z
+    if((*v)[2] > ZMax)
+      ZMax = (*v)[2];
+    if((*v)[2] < ZMin)
+      ZMin = (*v)[2];
+  }
+
+  SetBBox(BBox<Vec3r>(Vec3r(XMin, YMin, ZMin), Vec3r(XMax, YMax, ZMax)));
+}
diff --git a/extern/freestyle/src/scene_graph/LineRep.h b/extern/freestyle/src/scene_graph/LineRep.h
new file mode 100755
index 00000000000..1bbba130ba3
--- /dev/null
+++ b/extern/freestyle/src/scene_graph/LineRep.h
@@ -0,0 +1,130 @@
+//
+//  Filename         : LineRep.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Class to define the representation of 3D Line.
+//  Date of creation : 26/03/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  LINEREP_H
+# define LINEREP_H
+
+# include <vector>
+# include <list>
+# include "Rep.h"
+# include "../system/FreestyleConfig.h"
+
+using namespace std;
+
+/*! Base class for all lines objects */
+class LIB_SCENE_GRAPH_EXPORT LineRep : public Rep
+{
+public:
+  
+  /*! Line description style */
+  enum LINES_STYLE{LINES, LINE_STRIP, LINE_LOOP};
+  inline LineRep() : Rep() {_width = 0.f;}
+
+  /*! Builds a single line from 2 vertices
+   *  v1
+   *    first vertex
+   *  v2
+   *    second vertex
+   */
+  inline LineRep(const Vec3r& v1, const Vec3r& v2)
+    : Rep()
+  {
+    SetStyle(LINES);
+    AddVertex(v1);
+    AddVertex(v2);
+    _width = 0.f;
+  }
+
+  /*! Builds a line rep from a vertex chain */
+  inline LineRep(const vector<Vec3r>& vertices)
+    : Rep()
+  {
+    _vertices = vertices;
+    SetStyle(LINE_STRIP);
+    _width = 0.f;
+  }
+
+  /*! Builds a line rep from a vertex chain */
+  inline LineRep(const list<Vec3r>& vertices)
+    : Rep()
+  {
+    for(list<Vec3r>::const_iterator v=vertices.begin(), end=vertices.end();
+    v!=end;
+    v++)
+    {
+      _vertices.push_back(*v);
+    }
+    SetStyle(LINE_STRIP);
+    _width = 0.f;
+  }
+
+  virtual ~LineRep() 
+  {
+  _vertices.clear();
+  } 
+
+  /*! accessors */
+  inline const LINES_STYLE style() const {return _Style;}
+  inline const vector<Vec3r>& vertices() const {return _vertices;}
+  inline float width() const {return _width;}
+
+  /*! modifiers */
+  inline void SetStyle(const LINES_STYLE iStyle) {_Style = iStyle;}
+  inline void AddVertex(const Vec3r& iVertex) {_vertices.push_back(iVertex);}
+  inline void SetVertices(const vector<Vec3r>& iVertices)
+  {
+    if(0 != _vertices.size())
+    {
+      _vertices.clear();
+    }
+    for(vector<Vec3r>::const_iterator v=iVertices.begin(), end=iVertices.end();
+        v!=end;
+        v++)
+        {
+          _vertices.push_back(*v);
+        }
+  }
+  inline void SetWidth(float iWidth) {_width=iWidth;}
+
+  /*! Accept the corresponding visitor */
+  virtual void accept(SceneVisitor& v) {
+    Rep::accept(v);
+    v.visitLineRep(*this);
+  }
+
+  /*! Computes the line bounding box.*/
+  virtual void ComputeBBox();
+
+private:
+  LINES_STYLE _Style;
+  vector<Vec3r> _vertices;
+  float _width;
+};
+
+#endif // LINEREP_H
diff --git a/extern/freestyle/src/scene_graph/Material.h b/extern/freestyle/src/scene_graph/Material.h
new file mode 100755
index 00000000000..09557ad3473
--- /dev/null
+++ b/extern/freestyle/src/scene_graph/Material.h
@@ -0,0 +1,304 @@
+//
+//  Filename         : Material.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Class used to handle materials.
+//  Date of creation : 10/10/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  MATERIAL_H
+# define MATERIAL_H
+
+# include "../system/FreestyleConfig.h"
+
+/*! Class defining a material */
+class Material
+{
+public:
+  /*! Default constructor */
+  inline Material();
+  /*! Builds a Material from its diffuse, ambiant, specular, emissive
+   *  colors and a shininess coefficient.
+   *    \param iDiffuse
+   *      A 4 element float-array containing the diffuse color.
+   *    \param iAmbiant
+   *      A 4 element float-array containing the ambiant color.
+   *    \param iSpecular
+   *      A 4 element float-array containing the specular color.
+   *    \param iEmission
+   *      A 4 element float-array containing the emissive color.
+   *    \param iShininess
+   *      The shininess coefficient.
+   */
+  inline Material(const float *iDiffuse,
+                  const float *iAmbiant,
+                  const float *iSpecular, 
+                  const float *iEmission, 
+                  const float iShininess);
+
+  /*! Copy constructor */
+  inline Material(const Material& m);
+  /*! Destructor */
+  virtual ~Material() {}
+
+
+  /*! Returns the diffuse color as a 4 float array */
+  inline const float * diffuse() const { return Diffuse; }
+  /*! Returns the red component of the diffuse color */
+  inline const float   diffuseR() const { return Diffuse[0]; }
+  /*! Returns the green component of the diffuse color */
+  inline const float   diffuseG() const { return Diffuse[1]; }
+  /*! Returns the blue component of the diffuse color */
+  inline const float   diffuseB() const { return Diffuse[2]; }
+  /*! Returns the alpha component of the diffuse color */
+  inline const float   diffuseA() const { return Diffuse[3]; }
+
+  /*! Returns the specular color as a 4 float array */
+  inline const float * specular() const { return Specular; }
+  /*! Returns the red component of the specular color */
+  inline const float   specularR() const { return Specular[0]; }
+  /*! Returns the green component of the specular color */
+  inline const float   specularG() const { return Specular[1]; }
+  /*! Returns the blue component of the specular color */
+  inline const float   specularB() const { return Specular[2]; }
+  /*! Returns the alpha component of the specular color */
+  inline const float   specularA() const { return Specular[3]; }
+
+  /*! Returns the ambiant color as a 4 float array */
+  inline const float * ambient() const { return Ambient; }
+  /*! Returns the red component of the ambiant color */
+  inline const float   ambientR() const { return Ambient[0]; }
+  /*! Returns the green component of the ambiant color */
+  inline const float   ambientG() const { return Ambient[1]; }
+  /*! Returns the blue component of the ambiant color */
+  inline const float   ambientB() const { return Ambient[2]; }
+  /*! Returns the alpha component of the ambiant color */
+  inline const float   ambientA() const { return Ambient[3]; }
+
+  /*! Returns the emissive color as a 4 float array */
+  inline const float * emission() const { return Emission; }
+  /*! Returns the red component of the emissive color */
+  inline const float   emissionR() const { return Emission[0]; }
+  /*! Returns the green component of the emissive color */
+  inline const float   emissionG() const { return Emission[1]; }
+  /*! Returns the blue component of the emissive color */
+  inline const float   emissionB() const { return Emission[2]; }
+  /*! Returns the alpha component of the emissive color */
+  inline const float   emissionA() const { return Emission[3]; }
+
+  /*! Returns the shininess coefficient */
+  inline const float shininess() const { return Shininess; }
+
+  /*! Sets the diffuse color.
+   *    \param r
+   *      Red component
+   *    \param g
+   *      Green component
+   *    \param b
+   *     Blue component
+   *    \param a
+   *      Alpha component
+   */
+  inline void SetDiffuse(const float r, const float g, const float b, const float a);
+  /*! Sets the specular color.
+   *    \param r
+   *      Red component
+   *    \param g
+   *      Green component
+   *    \param b
+   *     Blue component
+   *    \param a
+   *      Alpha component
+   */
+  inline void SetSpecular(const float r, const float g, const float b, const float a);
+  /*! Sets the ambiant color.
+   *    \param r
+   *      Red component
+   *    \param g
+   *      Green component
+   *    \param b
+   *     Blue component
+   *    \param a
+   *      Alpha component
+   */
+  inline void SetAmbient(const float r, const float g, const float b, const float a);
+
+  /*! Sets the emissive color.
+   *    \param r
+   *      Red component
+   *    \param g
+   *      Green component
+   *    \param b
+   *     Blue component
+   *    \param a
+   *      Alpha component
+   */
+  inline void SetEmission(const float r, const float g, const float b, const float a);
+
+  /*! Sets the shininess.
+   *    \param s
+   *      Shininess
+   */
+  inline void SetShininess(const float s);
+
+  /* operators */
+  inline Material& operator=(const Material& m);
+  inline bool operator!=(const Material& m) const;
+  inline bool operator==(const Material& m) const;
+
+private:
+
+  /*! Material properties */
+  float Diffuse[4];
+  float Specular[4];
+  float Ambient[4];
+  float Emission[4];
+  float Shininess;
+
+};
+
+Material::Material()
+{
+  Ambient[0] = Ambient[1] = Ambient[2] = 0.2f;
+  Ambient[3] = 1.f;
+
+  Diffuse[0] = Diffuse[1] = Diffuse[2] = 0.8f;
+  Diffuse[3] = 1.f;
+
+  Emission[0] = Emission[1] = Emission[2] = 0.f;
+  Emission[3] = 1.f;
+
+  Specular[0] = Specular[1] = Specular[2] = 0.f;
+  Specular[3] = 1.f;
+
+  Shininess = 0.f;
+}
+
+Material::Material(const float *iDiffuse,
+                   const float *iAmbiant,
+                   const float *iSpecular, 
+                   const float *iEmission, 
+                   const float iShininess)
+{
+  for(int i=0; i<4; i++)
+  {
+    Diffuse[i]  = iDiffuse[i];
+    Specular[i] = iSpecular[i];
+    Ambient[i]  = iAmbiant[i];
+    Emission[i] = iEmission[i];
+  }
+
+  Shininess = iShininess;
+}
+
+Material::Material(const Material& m)
+{
+  for(int i=0; i<4; i++)
+  {
+    Diffuse[i]  = m.diffuse()[i];
+    Specular[i] = m.specular()[i];
+    Ambient[i]  = m.ambient()[i];
+    Emission[i] = m.emission()[i];
+  }
+
+  Shininess = m.shininess();
+}
+
+void Material::SetDiffuse(const float r, const float g, const float b, const float a)
+{
+  Diffuse[0] = r;
+  Diffuse[1] = g;
+  Diffuse[2] = b;
+  Diffuse[3] = a;
+}
+
+void Material::SetSpecular(const float r, const float g, const float b, const float a)
+{
+  Specular[0] = r;
+  Specular[1] = g;
+  Specular[2] = b;
+  Specular[3] = a;
+}
+  
+void Material::SetAmbient(const float r, const float g, const float b, const float a)
+{
+  Ambient[0] = r;
+  Ambient[1] = g;
+  Ambient[2] = b;
+  Ambient[3] = a;
+}
+
+void Material::SetEmission(const float r, const float g, const float b, const float a)
+{
+  Emission[0] = r;
+  Emission[1] = g;
+  Emission[2] = b;
+  Emission[3] = a;
+}
+
+void Material::SetShininess(const float s)
+{
+  Shininess = s;
+}
+
+Material& Material::operator=(const Material& m)
+{
+  for(int i=0; i<4; i++)
+  {
+    Diffuse[i]  = m.diffuse()[i];
+    Specular[i] = m.specular()[i];
+    Ambient[i]  = m.ambient()[i];
+    Emission[i] = m.emission()[i];
+  }
+
+  Shininess = m.shininess();
+
+  return *this;
+}
+
+bool Material::operator!=(const Material& m) const
+{
+  if(Shininess != m.shininess())
+    return true;
+  for(int i=0; i<4; i++)
+  {
+    if(Diffuse[i]  != m.diffuse()[i])
+      return true;
+    if(Specular[i] != m.specular()[i])
+      return true;
+    if(Ambient[i]  != m.ambient()[i])
+      return true;
+    if(Emission[i] != m.emission()[i])
+      return true;
+  }
+
+  return false;
+}
+
+bool Material::operator==(const Material& m) const
+{
+  return (!((*this)!=m));
+}
+
+#endif // MATERIAL_H
diff --git a/extern/freestyle/src/scene_graph/MaxFileLoader.cpp b/extern/freestyle/src/scene_graph/MaxFileLoader.cpp
new file mode 100755
index 00000000000..515874c4021
--- /dev/null
+++ b/extern/freestyle/src/scene_graph/MaxFileLoader.cpp
@@ -0,0 +1,388 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "MaxFileLoader.h"
+
+MaxFileLoader::MaxFileLoader()
+{
+  _FileName = NULL;
+  _3dsFile = NULL;
+  _Scene = NULL;
+  _numFacesRead = 0;
+  _minEdgeSize = DBL_MAX;
+}
+
+MaxFileLoader::MaxFileLoader(const char *iFileName)
+{
+  _FileName = new char[strlen(iFileName)+1];
+  strcpy(_FileName, iFileName);
+
+  _3dsFile = NULL;
+  _Scene = NULL;
+  _numFacesRead = 0;
+  _minEdgeSize = DBL_MAX;
+}
+
+MaxFileLoader::~MaxFileLoader()
+{
+  if(NULL != _FileName)
+  {
+    delete [] _FileName;
+    _FileName = NULL;
+  }
+
+  if(NULL != _3dsFile)
+  {
+    lib3ds_file_free(_3dsFile);
+    _3dsFile = NULL;
+  }
+
+  _Scene = NULL;
+}
+
+void MaxFileLoader::SetFileName(const char *iFileName)
+{
+  if(NULL != _FileName)
+    delete [] _FileName;
+
+  _FileName = new char[strlen(iFileName)+1];
+  strcpy(_FileName, iFileName);
+}
+
+NodeGroup* MaxFileLoader::Load()
+{
+  _3dsFile=lib3ds_file_load(_FileName);
+  if(NULL == _3dsFile)
+    return NULL;
+
+	/* No nodes?  Fabricate nodes to display all the meshes. */
+  if( !_3dsFile->nodes )
+  {
+    Lib3dsMesh *mesh;
+    Lib3dsNode *node;
+
+    for(mesh = _3dsFile->meshes; mesh != NULL; mesh = mesh->next)
+    {
+      node = lib3ds_node_new_object();
+      strcpy(node->name, mesh->name);
+      node->parent_id = LIB3DS_NO_PARENT;
+      node->data.object.scl_track.keyL = lib3ds_lin3_key_new();
+      node->data.object.scl_track.keyL->value[0] = 1.;
+      node->data.object.scl_track.keyL->value[1] = 1.;
+      node->data.object.scl_track.keyL->value[2] = 1.;
+      lib3ds_file_insert_node(_3dsFile, node);
+    }
+  }
+
+  lib3ds_file_eval(_3dsFile, 0);
+  
+  // creation of the scene root node
+  _Scene = new NodeGroup;
+
+  // converts the 3ds format to the scene format
+  // the RenderNode method modifies _Scene.
+  Lib3dsNode *p;
+  for (p=_3dsFile->nodes; p!=0; p=p->next) {
+    RenderNode(p);
+  }
+  //Returns the built scene.
+  return _Scene;
+}
+
+void lib3ds_normal_transform(Lib3dsVector c, Lib3dsMatrix m, Lib3dsVector a)
+{
+  c[0]= (m[0][0]*a[0] + m[1][0]*a[1] + m[2][0]*a[2]);
+  c[1]= (m[0][1]*a[0] + m[1][1]*a[1] + m[2][1]*a[2]);
+  c[2]= (m[0][2]*a[0] + m[1][2]*a[1] + m[2][2]*a[2]);
+
+  //  c[0]= (m[0][0]*a[0] + m[1][0]*a[1] + m[2][0]*a[2])/m[0][0];
+  //  c[1]= (m[0][1]*a[0] + m[1][1]*a[1] + m[2][1]*a[2])/m[1][1];
+  //  c[2]= (m[0][2]*a[0] + m[1][2]*a[1] + m[2][2]*a[2])/m[2][2];
+
+  //lib3ds_vector_normalize(c);
+
+  //  c[0] = c[0]*m[0][0];
+  //  c[1] = c[1]*m[1][1];
+  //  c[2] = c[2]*m[2][2];
+
+}
+
+
+
+void MaxFileLoader::RenderNode(Lib3dsNode *iNode)
+{
+  Lib3dsNode *p;
+  for (p=iNode->childs; p!=0; p=p->next) 
+    RenderNode(p);
+
+  float minBBox[3];
+  float maxBBox[3];
+  if (iNode->type==LIB3DS_OBJECT_NODE) 
+  {
+    if (strcmp(iNode->name,"$$$DUMMY")==0) 
+      return;
+
+    NodeTransform *currentMesh = new NodeTransform;
+    NodeShape * shape;
+    
+    if (!iNode->user.d) // If the shape is not built yet, just do it !
+    {
+      Lib3dsMesh *mesh=lib3ds_file_mesh_by_name(_3dsFile, iNode->name);
+      ASSERT(mesh);
+      if (!mesh) 
+        return;
+
+      // builds the shape:
+      shape = new NodeShape;
+      iNode->user.d=(unsigned long)shape; // We store as user data the NodeShape address
+
+      // We invert the matrix in order to 
+      // be able to retrieve the shape's coordinates 
+      // in its local coordinates system (origin is the iNode pivot)
+      Lib3dsMatrix M;
+      lib3ds_matrix_copy(M, mesh->matrix);
+      lib3ds_matrix_inv(M);
+      
+      // We compute a normal per vertex and manages the smoothing of the shape:
+      Lib3dsVector *normalL=(Lib3dsVector*)malloc(3*sizeof(Lib3dsVector)*mesh->faces);
+      lib3ds_mesh_calculate_normals(mesh, normalL);
+
+      // We build the rep:
+      IndexedFaceSet *rep;
+      unsigned numFaces = mesh->faces;
+      
+      unsigned vSize = 3*3*numFaces;
+      float *vertices = new float[vSize];
+      unsigned nSize = vSize;
+      float *normals = new float[nSize];
+      unsigned *numVertexPerFaces = new unsigned[numFaces];
+      vector<Material> meshMaterials;
+
+      IndexedFaceSet::TRIANGLES_STYLE *faceStyle = new IndexedFaceSet::TRIANGLES_STYLE[numFaces];
+      unsigned i;
+      for (i = 0; i <numFaces; i++) {
+        faceStyle[i] = IndexedFaceSet::TRIANGLES;
+        numVertexPerFaces[i] = 3;
+      }
+      
+      unsigned viSize = 3*numFaces;
+      unsigned *VIndices = new unsigned[viSize];
+      unsigned niSize = viSize;
+      unsigned *NIndices = new unsigned[niSize];
+      unsigned *MIndices = new unsigned[viSize]; // Material Indices
+     
+
+      float *pv = vertices;
+      float *pn = normals;
+      unsigned *pvi = VIndices;
+      unsigned *pni = NIndices;
+      unsigned *pmi = MIndices;
+      
+      unsigned currentIndex = 0;
+      unsigned currentMIndex = 0;
+
+      Material tmpMat;
+      
+      // we want to find the min and max coordinates as we build the rep. 
+      // We initialize the min and max values whith the first vertex.
+      float pvtmp[3];
+      lib3ds_vector_transform(pvtmp, M, mesh->pointL[mesh->faceL[0].points[0]].pos);
+      minBBox[0] = pvtmp[0];
+      maxBBox[0] = pvtmp[0];
+      minBBox[1] = pvtmp[1];
+      maxBBox[1] = pvtmp[1];
+      minBBox[2] = pvtmp[2];
+      maxBBox[2] = pvtmp[2];
+
+      unsigned p;
+      real vert[3][3];
+      real norm;
+      for(p=0; p<mesh->faces; ++p) // we parse the faces of the mesh
+      {
+        Lib3dsFace *f=&mesh->faceL[p];
+        Lib3dsMaterial *mat=0;
+        if (f->material[0]) 
+          mat=lib3ds_file_material_by_name(_3dsFile, f->material);
+
+        if (mat) 
+        {
+          tmpMat.SetDiffuse(mat->diffuse[0], mat->diffuse[1], mat->diffuse[2], mat->diffuse[3]);
+          tmpMat.SetSpecular(mat->specular[0], mat->specular[1], mat->specular[2], mat->specular[3]);
+          float s = (float)pow(2.0, 10.0*mat->shininess);
+          if(s > 128.f)
+            s = 128.f;
+          tmpMat.SetShininess(s);
+        }
+        
+        if(meshMaterials.empty()){
+          meshMaterials.push_back(tmpMat);
+          shape->SetMaterial(tmpMat);
+        }else{
+          // find if the material is aleady in the list
+          unsigned i=0;
+          bool found = false;
+          for(vector<Material>::iterator it=meshMaterials.begin(), itend=meshMaterials.end();
+          it!=itend;
+          ++it){
+            if(*it == tmpMat){
+              currentMIndex = i;
+              found = true;
+              break;
+            }
+            ++i;
+          }
+          if(!found){
+            meshMaterials.push_back(tmpMat);
+            currentMIndex = meshMaterials.size()-1;
+          }
+        }
+        
+
+        for(i=0; i<3; ++i) // we parse the vertices of the face f
+        {
+          unsigned j;
+          lib3ds_vector_transform(pv, M, mesh->pointL[f->points[i]].pos); //fills the cells of the pv array
+          for(j=0; j<3; j++) // we parse the xyz coordinates of the vertex i
+          {
+            if(minBBox[j] > pv[j])
+              minBBox[j] = pv[j];
+
+            if(maxBBox[j] < pv[j])
+              maxBBox[j] = pv[j];
+
+            vert[i][j] = pv[j];
+          }
+          
+          for(j=0; j<3; j++)
+            pn[j] = f->normal[j];
+
+          lib3ds_normal_transform(pn, M, normalL[3*p+i]); //fills the cells of the pv array
+          //lib3ds_vector_normalize(pn);
+
+          
+          *pvi = currentIndex;
+          *pni = currentIndex;
+          *pmi = currentMIndex;
+          
+
+          currentIndex +=3;
+          pv += 3;
+          pn += 3;
+          pvi++;
+          pni++;
+          pmi++;
+          
+        }
+
+        for(i=0; i<3; i++)
+        {
+          norm = 0.0;
+          for (unsigned j = 0; j < 3; j++)
+            norm += (vert[i][j] - vert[(i+1)%3][j])*(vert[i][j] - vert[(i+1)%3][j]);
+          norm = sqrt(norm);
+          if(_minEdgeSize > norm)
+            _minEdgeSize = norm;
+        }
+
+        _numFacesRead++;
+      }
+
+      free(normalL);
+
+      // We might have several times the same vertex. We want a clean 
+      // shape with no real-vertex. Here, we are making a cleaning 
+      // pass.
+      real *cleanVertices = NULL;
+      unsigned   cvSize;
+      unsigned   *cleanVIndices = NULL;
+      
+      GeomCleaner::CleanIndexedVertexArray(
+        vertices, vSize, 
+        VIndices, viSize,
+        &cleanVertices, &cvSize, 
+        &cleanVIndices);
+
+      real *cleanNormals = NULL;
+      unsigned   cnSize;
+      unsigned   *cleanNIndices = NULL;
+
+      GeomCleaner::CleanIndexedVertexArray(
+        normals, nSize, 
+        NIndices, niSize,
+        &cleanNormals, &cnSize, 
+        &cleanNIndices);
+
+      // format materials array
+      Material** marray = new Material*[meshMaterials.size()];
+      unsigned mindex=0;
+      for(vector<Material>::iterator m=meshMaterials.begin(), mend=meshMaterials.end();
+          m!=mend;
+          ++m){
+        marray[mindex] = new Material(*m);
+        ++mindex;
+      }
+      // deallocates memory:
+      delete [] vertices;
+      delete [] normals;
+      delete [] VIndices;
+      delete [] NIndices;
+      
+      // Create the IndexedFaceSet with the retrieved attributes
+      rep = new IndexedFaceSet(cleanVertices, cvSize, 
+                               cleanNormals, cnSize,
+                               marray, meshMaterials.size(),
+                               0, 0,
+                               numFaces, numVertexPerFaces, faceStyle,
+                               cleanVIndices, viSize,
+                               cleanNIndices, niSize,
+                               MIndices, viSize,
+                               0,0,
+                               0);
+	  // sets the id of the rep
+	  rep->SetId(Id(iNode->node_id, 0));
+
+
+      const BBox<Vec3r> bbox = BBox<Vec3r>(Vec3r(minBBox[0], minBBox[1], minBBox[2]), 
+                                           Vec3r(maxBBox[0], maxBBox[1], maxBBox[2]));
+      rep->SetBBox(bbox);
+      shape->AddRep(rep);
+    }
+
+    if (iNode->user.d) 
+    {
+      if(NULL != iNode->matrix)
+      {
+        Lib3dsObjectData *d = &iNode->data.object;
+        Matrix44r M44f;
+        for(unsigned i=0; i<4; i++)
+          for(unsigned j=0; j<4; j++)
+            M44f(i,j) = iNode->matrix[j][i];
+          
+          currentMesh->SetMatrix(Matrix44r(M44f));
+          currentMesh->Translate(-d->pivot[0], -d->pivot[1], -d->pivot[2]);
+      }
+      shape = (NodeShape*)iNode->user.d;
+      currentMesh->AddChild(shape);
+      _Scene->AddChild(currentMesh);
+    }
+  }
+
+}
diff --git a/extern/freestyle/src/scene_graph/MaxFileLoader.h b/extern/freestyle/src/scene_graph/MaxFileLoader.h
new file mode 100755
index 00000000000..ab31e656d46
--- /dev/null
+++ b/extern/freestyle/src/scene_graph/MaxFileLoader.h
@@ -0,0 +1,94 @@
+//
+//  Filename         : MaxFileLoader.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Class used to load 3ds models.
+//  Date of creation : 10/10/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  MAX_FILE_LOADER_H
+# define MAX_FILE_LOADER_H
+
+# include <string.h>              
+# include <float.h>
+# include <lib3ds/file.h>
+# include <lib3ds/node.h>
+# include <lib3ds/camera.h>
+# include <lib3ds/mesh.h>
+# include <lib3ds/material.h>
+# include <lib3ds/matrix.h>
+# include <lib3ds/vector.h>
+# include <lib3ds/file.h>
+# include "../system/FreestyleConfig.h"
+# include "NodeGroup.h"
+# include "NodeTransform.h"
+# include "NodeShape.h"
+# include "IndexedFaceSet.h"
+# include "../geometry/BBox.h"
+# include "../geometry/Geom.h"
+# include "../geometry/GeomCleaner.h"
+
+
+class NodeGroup;
+
+class LIB_SCENE_GRAPH_EXPORT MaxFileLoader
+{
+public:
+  /*! Builds a MaxFileLoader */
+  MaxFileLoader();
+  /*! Builds a MaxFileLoader to load the iFileName
+      file.
+        iFileName
+          The name of the 3dsMax file to load
+   */
+  explicit MaxFileLoader(const char *iFileName);
+  virtual ~MaxFileLoader();
+
+  /*! Sets the name of the 3dsMax file to load */
+  void SetFileName(const char *iFileName);
+
+  /*! Loads the 3D scene and returns 
+   *  a pointer to the scene root node
+   */
+  NodeGroup * Load();
+  //void Load(const char *iFileName);
+
+  /*! Gets the number of read faces */
+  inline unsigned int numFacesRead() {return _numFacesRead;}
+
+  /*! Gets the smallest edge size read */
+  inline real minEdgeSize() {return _minEdgeSize;}
+
+protected:
+  void RenderNode(Lib3dsNode *iNode);
+
+protected:
+  char *_FileName;
+  Lib3dsFile *_3dsFile;
+  NodeGroup* _Scene;
+  unsigned _numFacesRead;
+  real _minEdgeSize;
+};
+
+#endif // MAX_FILE_LOADER_H
diff --git a/extern/freestyle/src/scene_graph/Node.h b/extern/freestyle/src/scene_graph/Node.h
new file mode 100755
index 00000000000..1726dd3c853
--- /dev/null
+++ b/extern/freestyle/src/scene_graph/Node.h
@@ -0,0 +1,97 @@
+//
+//  Filename         : Node.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Abstract class for scene graph nodes. Inherits from 
+//                     BaseObject which defines the addRef release mechanism.
+//  Date of creation : 24/01/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  NODE_H
+# define NODE_H
+
+# include "../system/FreestyleConfig.h"
+# include "../system/BaseObject.h"
+# include "SceneVisitor.h"
+# include "../geometry/BBox.h"
+# include "../geometry/Geom.h"
+# include "../system/Precision.h"
+
+using namespace std;
+using namespace Geometry;
+
+class LIB_SCENE_GRAPH_EXPORT Node : public BaseObject
+{
+public:
+
+  inline Node() : BaseObject() {}
+  inline Node(const Node& iBrother) : BaseObject()
+  {
+    _BBox = iBrother.bbox();
+  }
+  virtual ~Node(){}
+
+  /*! Accept the corresponding visitor
+   * Each inherited node 
+   * must overload this method
+   */
+  virtual void accept(SceneVisitor& v) {
+    v.visitNode(*this);
+  }
+
+  /*! bounding box management */
+  /*! Returns the node bounding box 
+   *  If no bounding box exists, an empty bbox
+   *  is returned
+   */
+  virtual const BBox<Vec3r>& bbox() const {return _BBox;}
+
+  /*! Sets the Node bounding box */
+  virtual void SetBBox(const BBox<Vec3r>& iBox) {_BBox = iBox;}
+
+  /*! Makes the union of _BBox and iBox */
+  virtual void AddBBox(const BBox<Vec3r>& iBox) 
+  {
+    if(iBox.empty())
+      return;
+
+    if(_BBox.empty())
+      _BBox = iBox;
+    else
+      _BBox += iBox;
+  }
+
+  /*! Updates the BBox */
+  virtual const BBox<Vec3r>& UpdateBBox() {return _BBox;}
+
+  /*! Clears the bounding box */
+  virtual void clearBBox() { _BBox.clear(); }
+  
+protected:
+  
+private: 
+  BBox<Vec3r> _BBox;
+};
+
+#endif // NODE_H
diff --git a/extern/freestyle/src/scene_graph/NodeCamera.cpp b/extern/freestyle/src/scene_graph/NodeCamera.cpp
new file mode 100644
index 00000000000..2d850287ae5
--- /dev/null
+++ b/extern/freestyle/src/scene_graph/NodeCamera.cpp
@@ -0,0 +1,119 @@
+#include "NodeCamera.h"
+#include <math.h>
+
+void loadIdentity(double * matrix){
+    int i;
+
+    // Build Identity matrix
+    for(i=0;i<16;++i){
+        double value ;
+        if((i % 5) == 0)
+            value = 1.0;
+        else
+            value = 0;
+        matrix[i] = value;
+    }
+}
+
+NodeCamera::NodeCamera(CameraType camera_type)
+:camera_type_(camera_type){
+    loadIdentity(modelview_matrix_);
+    loadIdentity(projection_matrix_);
+}
+
+NodeCamera::NodeCamera(const NodeCamera& iBrother)
+:camera_type_(iBrother.camera_type_){
+    memcpy(modelview_matrix_, iBrother.modelview_matrix_, 16*sizeof(double));
+    memcpy(projection_matrix_, iBrother.projection_matrix_, 16*sizeof(double));
+}
+
+void NodeCamera::accept(SceneVisitor& v){
+    v.visitNodeCamera(*this)   ;
+}
+
+void NodeCamera::setModelViewMatrix(double modelview_matrix[16]){
+    memcpy(modelview_matrix_, modelview_matrix,16*sizeof(double));
+}
+
+void NodeCamera::setProjectionMatrix(double projection_matrix[16]){
+    memcpy(projection_matrix_, projection_matrix,16*sizeof(double));
+}
+
+NodeOrthographicCamera::NodeOrthographicCamera()
+:NodeCamera(NodeCamera::ORTHOGRAPHIC),
+left_(0),right_(0),bottom_(0),top_(0),zNear_(0),zFar_(0){
+    loadIdentity(projection_matrix_);
+    loadIdentity(modelview_matrix_);
+}
+
+NodeOrthographicCamera::NodeOrthographicCamera(double left
+                                                , double right
+                                                , double bottom
+                                                , double top
+                                                , double zNear
+                                                , double zFar
+                                                )
+:NodeCamera(NodeCamera::ORTHOGRAPHIC),
+left_(left),
+right_(right),
+bottom_(bottom),
+top_(top),
+zNear_(zNear),
+zFar_(zFar){
+
+    loadIdentity(projection_matrix_);
+
+    projection_matrix_[0] = 2.0/(right-left);
+    projection_matrix_[3] = -(right + left) / (right - left) ;
+    projection_matrix_[5] = 2.0/(top-bottom);
+    projection_matrix_[7] = -(top + bottom) / (top - bottom) ;
+    projection_matrix_[10] = -2.0/(zFar-zNear);
+    projection_matrix_[11] = -(zFar + zNear) / (zFar - zNear);
+
+}
+
+NodeOrthographicCamera::NodeOrthographicCamera(const NodeOrthographicCamera& iBrother)
+:NodeCamera(iBrother),left_(iBrother.left_),right_(iBrother.right_),bottom_(iBrother.bottom_),top_(iBrother.top_),zNear_(iBrother.zNear_),zFar_(iBrother.zFar_){
+}
+
+NodePerspectiveCamera::NodePerspectiveCamera()
+:NodeCamera(NodeCamera::PERSPECTIVE){
+}
+
+NodePerspectiveCamera::NodePerspectiveCamera(double fovy
+                                        , double aspect
+                                        , double zNear
+                                        , double zFar)
+:NodeCamera(NodeCamera::PERSPECTIVE){
+    loadIdentity(projection_matrix_);
+
+    double f = cos(fovy/2.0)/sin(fovy/2.0); // cotangent
+
+    projection_matrix_[0] = f/aspect;
+    projection_matrix_[5] = f;
+    projection_matrix_[10] = (zNear+zFar)/(zNear-zFar);
+    projection_matrix_[11] = (2.0*zNear*zFar)/(zNear-zFar);
+    projection_matrix_[14] = -1.0;
+    projection_matrix_[15] = 0;
+
+}
+
+NodePerspectiveCamera::NodePerspectiveCamera(double left,
+                                        double right,
+                                        double bottom,
+                                        double top,
+                                        double zNear,
+                                        double zFar)
+:NodeCamera(NodeCamera::PERSPECTIVE){
+    loadIdentity(projection_matrix_);
+
+    projection_matrix_[0] = (2.0*zNear)/(right-left);
+    projection_matrix_[2] = (right+left)/(right-left);
+    projection_matrix_[5] = (2.0*zNear)/(top-bottom);
+    projection_matrix_[6] = (top+bottom)/(top-bottom);
+    projection_matrix_[10] = - (zFar+zNear)/(zFar-zNear);
+    projection_matrix_[11] = - (2.0*zFar*zNear)/(zFar-zNear);
+    projection_matrix_[14] = -1.0;
+    projection_matrix_[15] = 0;
+}
+
diff --git a/extern/freestyle/src/scene_graph/NodeCamera.h b/extern/freestyle/src/scene_graph/NodeCamera.h
new file mode 100644
index 00000000000..76ccf465d38
--- /dev/null
+++ b/extern/freestyle/src/scene_graph/NodeCamera.h
@@ -0,0 +1,192 @@
+//
+//  Filename         : NodeCamera.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Class to represent a light node
+//  Date of creation : 25/01/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+#ifndef NODE_CAMERA_H_
+#define NODE_CAMERA_H_
+
+# include "../geometry/Geom.h"
+# include "../system/FreestyleConfig.h"
+# include "Node.h"
+
+using namespace Geometry;
+
+class NodeOrthographicCamera;
+class NodePerspectiveCamera;
+class LIB_SCENE_GRAPH_EXPORT NodeCamera : public Node
+{
+public:
+    typedef enum {PERSPECTIVE,ORTHOGRAPHIC,GENERIC} CameraType;
+
+    /*! Default matrices: Identity for both projection and modelview. */
+    NodeCamera(CameraType camera_type = GENERIC); 
+    NodeCamera(const NodeCamera& iBrother);
+
+    virtual ~NodeCamera() {}
+
+    /*! Accept the corresponding visitor */
+    virtual void accept(SceneVisitor& v);
+
+    /*! Matrix is copied */
+    void setModelViewMatrix(double modelview_matrix[16]);
+    /*! Matrix is copied */
+    void setProjectionMatrix(double projection_matrix[16]);
+
+    double * modelViewMatrix() {return modelview_matrix_;}
+    double * projectionMatrix() {return projection_matrix_;}
+
+protected:
+    // row major right handed matrix
+    double modelview_matrix_[16];
+    // row major right handed matrix
+    double projection_matrix_[16];
+
+    CameraType camera_type_;
+};
+
+class LIB_SCENE_GRAPH_EXPORT NodeOrthographicCamera : public NodeCamera{
+public:
+    NodeOrthographicCamera();
+    /*! Builds a parallel projection matrix a la glOrtho.
+    A  	0  	0  	tx
+    0 	B 	0 	ty
+    0 	0 	C 	tz
+    0 	0 	0 	1
+
+    where
+
+    A =
+    2 / (right - left) 
+    B =
+    2 / (top - bottom) 
+    C =
+    -2 / (far - near) 
+    tx =
+    -(right + left) / (right - left) 
+    ty =
+    -(top + bottom) / (top - bottom) 
+    tz =
+    -(zFar + zNear) / (zFar - zNear) 
+    */
+    NodeOrthographicCamera(double left
+        , double right
+        , double bottom
+        , double top
+        , double zNear
+        , double zFar
+        );
+
+    double left() const {return left_;}
+    double right() const {return right_;}
+    double bottom() const {return bottom_;}
+    double top() const {return top_;}
+    double zNear() const {return zNear_;}
+    double zFar() const {return zFar_;}
+
+    NodeOrthographicCamera(const NodeOrthographicCamera& iBrother);
+
+private:
+    double left_;
+    double right_;
+    double bottom_;
+    double top_;
+    double zNear_;
+    double zFar_;
+};
+
+class LIB_SCENE_GRAPH_EXPORT NodePerspectiveCamera : public NodeCamera {
+public:
+    NodePerspectiveCamera();
+    /*! Builds a perspective projection matrix a la gluPerspective. 
+    Given	f defined as follows:
+    fovy
+    f	= cotangent(____)
+    2
+    The generated	matrix is
+
+
+    (	 f       		                                            )
+    |  ______				                                        |
+    |  aspect           0	            0		        0	        |
+    |					                                            |
+    |	0               f	            0		        0	        |
+    |					                                            |
+    |					            zNear+zFar       2*zNear*zFar   |
+    |		                        __________      ____________    |
+    |	0               0	        zNear-zFar       zNear-zFar     |
+    |					                                            |
+    (   0               0	            -1		        0           )
+    \param fovy
+    Field of View specified in radians.
+    */
+    NodePerspectiveCamera(double fovy
+        , double aspect
+        , double zNear
+        , double zFar);
+
+    /*! Builds a perspective projection matrix a la glFrustum.
+    (	2*zNear                                                         )
+    |  __________			                                            |
+    |  right-left           0               A               0           |
+    |                                                                   |
+    |			         2*zNear		                                |
+    |	  0	            __________          B               0           |
+    |		            top-bottom		                                |
+    |                                                                   |
+    |	  0	                0               C               D           |
+    |					                                                |
+    |	  0	                0               -1              0           |
+    (					                                                )
+
+    right+left
+    A = __________
+    right-left
+
+    top+bottom
+    B = __________
+    top-bottom
+
+    zFar+zNear
+    C = - __________
+    zFar-zNear
+
+    2*zFar*zNear
+    D = -  ____________
+    zFar-zNear
+    */
+    NodePerspectiveCamera(double left,
+        double right,
+        double bottom,
+        double top,
+        double zNear,
+        double zFar);
+};
+
+
+#endif // NODE_CAMERA_H_
\ No newline at end of file
diff --git a/extern/freestyle/src/scene_graph/NodeDrawingStyle.cpp b/extern/freestyle/src/scene_graph/NodeDrawingStyle.cpp
new file mode 100755
index 00000000000..acd740ee055
--- /dev/null
+++ b/extern/freestyle/src/scene_graph/NodeDrawingStyle.cpp
@@ -0,0 +1,34 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "NodeDrawingStyle.h"
+
+void NodeDrawingStyle::accept(SceneVisitor& v) {
+  v.visitNodeDrawingStyle(*this);
+
+  v.visitNodeDrawingStyleBefore(*this);
+  v.visitDrawingStyle(_DrawingStyle);
+  for(vector<Node*>::iterator node=_Children.begin(), end=_Children.end(); 
+  node!=end; 
+  node++)
+    (*node)->accept(v);
+  v.visitNodeDrawingStyleAfter(*this);
+}
diff --git a/extern/freestyle/src/scene_graph/NodeDrawingStyle.h b/extern/freestyle/src/scene_graph/NodeDrawingStyle.h
new file mode 100755
index 00000000000..18442ae10f9
--- /dev/null
+++ b/extern/freestyle/src/scene_graph/NodeDrawingStyle.h
@@ -0,0 +1,70 @@
+//
+//  Filename         : NodeDrawingStyle.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Class to define a Drawing Style to be applied 
+//                     to the underlying children. Inherits from NodeGroup.
+//  Date of creation : 06/02/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  NODEDRAWINGSTYLE_H
+# define NODEDRAWINGSTYLE_H
+
+# include "../system/FreestyleConfig.h"
+# include "NodeGroup.h"
+# include "DrawingStyle.h"
+
+class LIB_SCENE_GRAPH_EXPORT NodeDrawingStyle : public NodeGroup
+{
+public:
+
+  inline NodeDrawingStyle() : NodeGroup() {}
+  virtual ~NodeDrawingStyle() {}
+
+  inline const DrawingStyle& drawingStyle() const { return _DrawingStyle; }
+  inline void SetDrawingStyle(const DrawingStyle& iDrawingStyle) { _DrawingStyle = iDrawingStyle; }
+
+  /*! Sets the style. Must be one of FILLED, LINES, POINTS, INVISIBLE. */
+  inline void SetStyle(const DrawingStyle::STYLE iStyle) { _DrawingStyle.SetStyle(iStyle); }
+  /*! Sets the line width in the LINES style case */
+  inline void SetLineWidth(const float iLineWidth) { _DrawingStyle.SetLineWidth(iLineWidth); }
+  /*! Sets the Point size in the POINTS style case */
+  inline void SetPointSize(const float iPointSize) { _DrawingStyle.SetPointSize(iPointSize); }
+  /*! Enables or disables the lighting. TRUE = enable */
+  inline void SetLightingEnabled(const bool iEnableLighting) { _DrawingStyle.SetLightingEnabled(iEnableLighting); }
+
+  /*! Accept the corresponding visitor */
+  virtual void accept(SceneVisitor& v);
+
+  /*! accessors */
+  inline DrawingStyle::STYLE style() const {return _DrawingStyle.style();}
+  inline float lineWidth() const {return _DrawingStyle.lineWidth();}
+  inline float pointSize() const {return _DrawingStyle.pointSize();}
+  inline bool lightingEnabled() const {return _DrawingStyle.lightingEnabled();}
+
+private:
+  DrawingStyle _DrawingStyle;
+};
+
+#endif // NODEDRAWINGSTYLE_H
diff --git a/extern/freestyle/src/scene_graph/NodeGroup.cpp b/extern/freestyle/src/scene_graph/NodeGroup.cpp
new file mode 100755
index 00000000000..3d2aa2c8694
--- /dev/null
+++ b/extern/freestyle/src/scene_graph/NodeGroup.cpp
@@ -0,0 +1,122 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "NodeGroup.h"
+
+void NodeGroup::AddChild(Node *iChild)
+{
+  if(NULL == iChild)
+    return;
+
+  _Children.push_back(iChild);
+  iChild->addRef();
+}
+
+int NodeGroup::destroy()
+{
+  /*! Node::destroy makes a release on the object 
+   *  and then returns the reference counter.
+   *  If the reference counter is equal to 0, 
+   *  that means that nobody else is linking 
+   *  this node group and that we can destroy the whole 
+   *  underlying tree.
+   *  Else, one or several Node link this node group, 
+   *  and we only returns the reference counter 
+   *  decremented by Node::destroy();
+   */
+  int refThis = Node::destroy();
+  
+  // if refThis != 0, we can't destroy the tree
+  if(0 != refThis) 
+    return refThis;
+
+  // If we are here, that means that nobody else
+  // needs our NodeGroup and we can destroy it.
+  int refCount = 0;
+  vector<Node *>::iterator node;
+  
+  for(node=_Children.begin(); node!=_Children.end(); node++)
+  {
+    refCount = (*node)->destroy();
+    if(0 == refCount)
+      delete (*node);
+  }
+
+  _Children.clear();
+  
+  return refThis;
+}
+
+void NodeGroup::accept(SceneVisitor& v) {
+  v.visitNodeGroup(*this);
+  
+  v.visitNodeGroupBefore(*this);
+  for(vector<Node *>::iterator node=_Children.begin(), end=_Children.end(); 
+  node!=end;
+  node++)
+    (*node)->accept(v);
+  v.visitNodeGroupAfter(*this);
+}
+
+void NodeGroup::DetachChildren()
+{
+  vector<Node *>::iterator node;
+  
+  for(node=_Children.begin(); node!=_Children.end(); node++)
+  {
+    (*node)->release();
+  }
+
+  _Children.clear();
+}
+
+void NodeGroup::DetachChild(Node *iChild)
+{
+  int found = 0;
+  vector<Node*>::iterator node;
+  
+  for(node=_Children.begin(); node!=_Children.end(); node++)
+  {
+    if((*node) == iChild)
+    {
+      (*node)->release();
+      _Children.erase(node);
+      found = 1;
+      break;
+    }
+  }
+}
+
+void NodeGroup::RetrieveChildren(vector<Node*>& oNodes){
+  oNodes = _Children;
+}
+
+const BBox<Vec3r>& NodeGroup::UpdateBBox()
+{
+  vector<Node *>::iterator node;
+  clearBBox();
+  for(node=_Children.begin(); node!=_Children.end(); node++)
+  {
+    AddBBox((*node)->UpdateBBox());
+  }
+
+  return Node::UpdateBBox();
+}
diff --git a/extern/freestyle/src/scene_graph/NodeGroup.h b/extern/freestyle/src/scene_graph/NodeGroup.h
new file mode 100755
index 00000000000..a1bd2b57e56
--- /dev/null
+++ b/extern/freestyle/src/scene_graph/NodeGroup.h
@@ -0,0 +1,84 @@
+//
+//  Filename         : NodeGroup.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Class to represent a group node. This node can contains
+//                     several children. It also contains a transform matrix
+//                     indicating the transform state of the underlying
+//                     children.
+//  Date of creation : 24/01/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  NODEGROUP_H
+# define NODEGROUP_H
+
+# include <vector>
+# include "../system/FreestyleConfig.h"
+# include "Node.h"
+
+using namespace std;
+
+class LIB_SCENE_GRAPH_EXPORT NodeGroup : public Node
+{
+public:
+
+  inline NodeGroup(): Node() {}
+  virtual ~NodeGroup(){}
+
+  /*! Adds a child. Makes a addRef on the
+   *  iChild reference counter */
+  virtual void AddChild(Node *iChild);
+
+  /*! destroys all the underlying nodes 
+   *  Returns the reference counter 
+   *  after having done a release() */
+  virtual int destroy();
+
+  /*! Detaches all the children */
+  virtual void DetachChildren();
+
+  /*! Detached the sepcified child */
+  virtual void DetachChild(Node *iChild);
+
+  /*! Retrieve children */
+  virtual void RetrieveChildren(vector<Node*>& oNodes);
+
+
+  /*! Renders every children */
+  //  virtual void Render(Renderer *iRenderer);
+
+  /*! Accept the corresponding visitor */
+  virtual void accept(SceneVisitor& v);
+
+  /*! Updates the BBox */
+  virtual const BBox<Vec3r>& UpdateBBox();
+
+  /*! Returns the number of children */
+  virtual int numberOfChildren() {return _Children.size();}
+
+protected:
+  vector<Node*> _Children;
+};
+
+#endif // NODEGROUP_H
diff --git a/extern/freestyle/src/scene_graph/NodeLight.cpp b/extern/freestyle/src/scene_graph/NodeLight.cpp
new file mode 100755
index 00000000000..61a46155cfa
--- /dev/null
+++ b/extern/freestyle/src/scene_graph/NodeLight.cpp
@@ -0,0 +1,80 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "NodeLight.h"
+
+int NodeLight::numberOfLights = 0;
+
+NodeLight::NodeLight()
+: Node() 
+{
+  if(numberOfLights > 7)
+  {
+    _number = 7;
+  }
+  else
+  {
+    _number = numberOfLights; 
+    numberOfLights++;
+  }
+  
+  Ambient[0] = Ambient[1] = Ambient[2] = 0.f;
+  Ambient[3] = 1.f;
+  
+  for(int i=0; i<4; i++)
+  {
+    Diffuse[i] = 1.f;
+    Specular[i] = 1.f;
+  }
+
+  Position[0] = Position[1] = Position[3] = 0.f;
+  Position[2] = 1.f;
+
+  on = true;
+}
+
+NodeLight::NodeLight(NodeLight& iBrother)
+: Node(iBrother)
+{
+    if(numberOfLights > 7)
+  {
+    _number = 7;
+  }
+  else
+  {
+    _number = numberOfLights; 
+    numberOfLights++;
+  }
+
+  for(int i=0; i<4; i++)
+  {
+    Ambient[i] = iBrother.ambient()[i];
+    Diffuse[i] = iBrother.diffuse()[i];
+    Specular[i] = iBrother.specular()[i];
+    Position[i] = iBrother.position()[i];
+  }
+
+  on = iBrother.isOn();
+}
+
+void NodeLight::accept(SceneVisitor& v) {
+  v.visitNodeLight(*this);
+}
diff --git a/extern/freestyle/src/scene_graph/NodeLight.h b/extern/freestyle/src/scene_graph/NodeLight.h
new file mode 100755
index 00000000000..0689505fb24
--- /dev/null
+++ b/extern/freestyle/src/scene_graph/NodeLight.h
@@ -0,0 +1,86 @@
+//
+//  Filename         : NodeLight.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Class to represent a light node
+//  Date of creation : 25/01/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  NODELIGHT_H
+# define NODELIGHT_H
+
+# include "../geometry/Geom.h"
+# include "../system/FreestyleConfig.h"
+# include "Node.h"
+
+using namespace Geometry;
+
+class LIB_SCENE_GRAPH_EXPORT NodeLight : public Node
+{
+public:
+
+  NodeLight(); 
+  NodeLight(NodeLight& iBrother);
+
+  virtual ~NodeLight() {}
+
+  /*! Accept the corresponding visitor */
+  virtual void accept(SceneVisitor& v);
+
+  /*! Accessors for the light properties */
+  inline const float * ambient() const {return Ambient;}
+  inline const float * diffuse() const {return Diffuse;}
+  inline const float * specular() const {return Specular;}
+  inline const float * position() const {return Position;}
+  inline bool isOn() const {return on;}
+  inline int number() const {return _number;}
+ 
+private:
+  // Data members
+  // ============
+
+  /*! on=true, the light is on */
+  bool on;
+
+  /*! The color definition */
+  float Ambient[4];
+  float Diffuse[4];
+  float Specular[4];
+
+  /*! Light position. if w = 0, the light is 
+   * placed at infinite.
+   */
+  float Position[4];
+
+  /*! used to manage the number of lights */
+  /*! numberOfLights
+   *    the number of lights in the scene. 
+   *    Initially, 0.
+   */
+  static int numberOfLights;
+  /*! The current lignt number */
+  int _number;
+};
+
+#endif // NODELIGHT_H
diff --git a/extern/freestyle/src/scene_graph/NodeShape.cpp b/extern/freestyle/src/scene_graph/NodeShape.cpp
new file mode 100755
index 00000000000..2012ef83b9f
--- /dev/null
+++ b/extern/freestyle/src/scene_graph/NodeShape.cpp
@@ -0,0 +1,51 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "NodeShape.h"
+
+NodeShape::~NodeShape()
+{
+  vector<Rep *>::iterator rep;
+ 
+  if(0 != _Shapes.size())
+  {
+    for(rep=_Shapes.begin(); rep!=_Shapes.end(); rep++)
+    {
+      int refCount = (*rep)->destroy();
+      if(0 == refCount)
+        delete (*rep);
+    }
+
+    _Shapes.clear();
+  }
+}
+
+void NodeShape::accept(SceneVisitor& v) {
+  v.visitNodeShape(*this);
+  
+  v.visitMaterial(_Material);
+ 
+  v.visitNodeShapeBefore(*this);
+  vector<Rep *>::iterator rep;
+  for(rep = _Shapes.begin(); rep != _Shapes.end(); rep++)
+    (*rep)->accept(v);
+  v.visitNodeShapeAfter(*this);
+}
diff --git a/extern/freestyle/src/scene_graph/NodeShape.h b/extern/freestyle/src/scene_graph/NodeShape.h
new file mode 100755
index 00000000000..3e963beec38
--- /dev/null
+++ b/extern/freestyle/src/scene_graph/NodeShape.h
@@ -0,0 +1,89 @@
+//
+//  Filename         : NodeShape.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Class to build a shape node. It contains a Rep, 
+//                     which is the shape geometry
+//  Date of creation : 25/01/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  NODESHAPE_H
+# define NODESHAPE_H
+
+# include <vector>
+# include "../system/FreestyleConfig.h"
+# include "Node.h"
+# include "Rep.h"
+# include "../geometry/BBox.h"
+# include "../geometry/Geom.h"
+# include "Material.h"
+
+using namespace std;
+using namespace Geometry;
+
+class LIB_SCENE_GRAPH_EXPORT NodeShape : public Node
+{
+public:
+  
+  inline NodeShape() : Node() {}
+  
+  virtual ~NodeShape();
+
+  /*! Adds a Rep to the _Shapes list
+   *  The delete of the rep is done 
+   *  when it is not used any more by 
+   *  the Scene Manager. So, it must not 
+   *  be deleted by the caller
+   */
+  virtual void AddRep(Rep *iRep)
+  {
+    if(NULL == iRep)
+      return;
+    _Shapes.push_back(iRep);
+    iRep->addRef();
+    
+    // updates bbox:
+    AddBBox(iRep->bbox());
+  }
+
+  /*! Accept the corresponding visitor */
+  virtual void accept(SceneVisitor& v);
+
+  /*! Sets the shape material */
+  inline void SetMaterial(const Material& iMaterial) { _Material = iMaterial; }
+
+  /*! accessors */
+  /*! returns the shape's material */
+  inline Material& material() { return _Material; }
+  inline const vector<Rep*>& shapes() {return _Shapes;}
+
+private:
+  /*! list of shapes */
+  vector<Rep*> _Shapes;
+
+  /*! Shape Material */
+  Material _Material;
+};
+
+#endif // NODESHAPE_H
diff --git a/extern/freestyle/src/scene_graph/NodeTransform.cpp b/extern/freestyle/src/scene_graph/NodeTransform.cpp
new file mode 100755
index 00000000000..64e9b7a4dd6
--- /dev/null
+++ b/extern/freestyle/src/scene_graph/NodeTransform.cpp
@@ -0,0 +1,166 @@
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+#include "../system/FreestyleConfig.h"
+#include "NodeTransform.h"
+
+void NodeTransform::Translate(real x, real y, real z)
+{
+  _Matrix(0, 3) += x;
+  _Matrix(1, 3) += y;
+  _Matrix(2, 3) += z;
+}
+
+void NodeTransform::Rotate(real iAngle, real x, real y, real z)
+{
+  //Normalize the x,y,z vector;
+  real norm = (real)sqrt(x*x+y*y+z*z);
+  if(0 == norm)
+    return;
+
+  x /= norm;
+  y /= norm;
+  z /= norm;
+
+  // find the corresponding matrix with the Rodrigues formula:
+  // R = I + sin(iAngle)*Ntilda + (1-cos(iAngle))*Ntilda*Ntilda
+  Matrix33r Ntilda;
+  Ntilda(0,0) = Ntilda(1,1) = Ntilda(2,2) = 0.f;
+  Ntilda(0,1) = -z;
+  Ntilda(0,2) = y;
+  Ntilda(1,0) = z;
+  Ntilda(1,2) = -x;
+  Ntilda(2,0) = -y;
+  Ntilda(2,1) = x;
+
+  const Matrix33r Ntilda2(Ntilda * Ntilda);
+  
+
+  const real sinAngle = (real)sin((iAngle/180.f)*M_PI);
+  const real cosAngle = (real)cos((iAngle/180.f)*M_PI);
+  
+  Matrix33r NS(Ntilda*sinAngle);
+  Matrix33r NC(Ntilda2*(1.f-cosAngle));
+  Matrix33r R;
+  R = Matrix33r::identity();
+  R += NS + NC;
+  
+  //R4 is the corresponding 4x4 matrix
+  Matrix44r R4;
+  R4 = Matrix44r::identity();
+
+  for(int i=0; i<3; i++)
+    for(int j=0; j<3; j++)
+      R4(i,j) = R(i,j);
+    
+  // Finally, we multiply our current matrix by R4:
+  Matrix44r mat_tmp(_Matrix);
+  _Matrix = mat_tmp * R4;
+}
+
+void NodeTransform::Scale(real x, real y, real z)
+{
+  _Matrix(0,0) *= x;
+  _Matrix(1,1) *= y;
+  _Matrix(2,2) *= z;
+
+  _Scaled = true;
+}
+
+void NodeTransform::MultiplyMatrix(const Matrix44r &iMatrix)
+{
+  Matrix44r mat_tmp(_Matrix);
+  _Matrix = mat_tmp * iMatrix;
+}
+
+void NodeTransform::SetMatrix(const Matrix44r &iMatrix)
+{
+  _Matrix = iMatrix;
+  if(isScaled(iMatrix))
+    _Scaled = true;
+}
+
+void NodeTransform::accept(SceneVisitor& v) {
+  v.visitNodeTransform(*this);
+
+  v.visitNodeTransformBefore(*this);
+  for(vector<Node *>::iterator node=_Children.begin(), end=_Children.end(); 
+  node!=end; 
+  node++)
+    (*node)->accept(v);
+  v.visitNodeTransformAfter(*this);
+}
+
+void NodeTransform::AddBBox(const BBox<Vec3r>& iBBox)
+{
+  Vec3r oldMin(iBBox.getMin());
+  Vec3r oldMax(iBBox.getMax());
+  
+  // compute the 8 corners of the bbox
+  HVec3r box[8];
+  box[0] = HVec3r(iBBox.getMin());
+  box[1] = HVec3r(oldMax[0], oldMin[1], oldMin[2]);
+  box[2] = HVec3r(oldMax[0], oldMax[1], oldMin[2]);
+  box[3] = HVec3r(oldMin[0], oldMax[1], oldMin[2]);
+  box[4] = HVec3r(oldMin[0], oldMin[1], oldMax[2]);
+  box[5] = HVec3r(oldMax[0], oldMin[1], oldMax[2]);
+  box[6] = HVec3r(oldMax[0], oldMax[1], oldMax[2]);
+  box[7] = HVec3r(oldMin[0], oldMax[1], oldMax[2]);
+
+  // Computes the transform iBBox
+  HVec3r tbox[8];
+  unsigned i;
+  for(i = 0; i < 8; i++)
+    tbox[i] = _Matrix * box[i];
+
+  Vec3r newMin(tbox[0]);
+  Vec3r newMax(tbox[0]);
+  for (i=0; i<8; i++)
+  {
+    for (unsigned int j=0; j<3; j++)
+    {
+      if (newMin[j] > tbox[i][j])
+        newMin[j] = tbox[i][j];
+      if (newMax[j] < tbox[i][j])
+        newMax[j] = tbox[i][j];
+    }
+  }
+  
+  BBox<Vec3r> transformBox(newMin, newMax);
+  
+  Node::AddBBox(transformBox);
+}
+
+bool NodeTransform::isScaled(const Matrix44r &M)
+{
+  for(unsigned int j=0; j<3; j++)
+  {
+    real norm = 0;
+    for(unsigned int i=0; i<3; i++)
+    {
+      norm += M(i,j)*M(i,j);
+    }
+    if((norm > 1.01) || (norm < 0.99))
+      return true;
+  }
+
+  return false;
+}
diff --git a/extern/freestyle/src/scene_graph/NodeTransform.h b/extern/freestyle/src/scene_graph/NodeTransform.h
new file mode 100755
index 00000000000..3929c60996b
--- /dev/null
+++ b/extern/freestyle/src/scene_graph/NodeTransform.h
@@ -0,0 +1,107 @@
+//
+//  Filename         : NodeTransform.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Class to represent a transform node. A Transform node 
+//                     contains one or several children, all affected by the 
+//                     transformation.
+//  Date of creation : 06/02/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  NODETRANSFORM_H
+# define NODETRANSFORM_H
+
+# include "../geometry/Geom.h"
+# include "../system/FreestyleConfig.h"
+# include "NodeGroup.h"
+
+using namespace Geometry;
+
+class LIB_SCENE_GRAPH_EXPORT NodeTransform : public NodeGroup
+{
+public:
+  
+  inline NodeTransform() : NodeGroup() {
+    _Matrix = Matrix44r::identity();
+    _Scaled=false;
+  }
+
+  virtual ~NodeTransform() {}
+
+  /*! multiplys the current matrix by the 
+   * x, y, z translation matrix.
+   */
+  void Translate(real x, real y, real z);
+
+  /*! multiplys the current matrix by a 
+   *  rotation matrix
+   *    iAngle
+   *      The rotation angle
+   *    x, y, z
+   *      The rotation axis
+   */
+  void Rotate(real iAngle, real x, real y, real z);
+
+  /*! multiplys the current matrix by a 
+   *  scaling matrix.
+   *    x, y, z
+   *      The scaling coefficients
+   *      with respect to the x,y,z axis
+   */
+  void Scale(real x, real y, real z);
+
+  /*! Multiplys the current matrix
+   *  by iMatrix
+   */
+  void MultiplyMatrix(const Matrix44r &iMatrix);
+
+  /*! Sets the current matrix to iMatrix */
+  void SetMatrix(const Matrix44r &iMatrix);
+
+  /*! Accept the corresponding visitor */
+  virtual void accept(SceneVisitor& v);
+
+  /*! Overloads the Node::AddBBox in order to take care 
+   *  about the transformation
+   */
+  virtual void AddBBox(const BBox<Vec3r>& iBBox);
+
+  /*! Checks whether a matrix contains a scale factor 
+   *  or not.
+   *  Returns true if yes.
+   *    iMatrix
+   *      The matrix to check
+   */
+  bool isScaled(const Matrix44r &M);
+
+  /*! accessors */
+  inline const Matrix44r& matrix() const { return _Matrix; }
+  inline bool scaled() const {return _Scaled;}
+
+private:
+  Matrix44r _Matrix;
+  bool _Scaled;
+};
+
+#endif // NODETRANSFORM_H
diff --git a/extern/freestyle/src/scene_graph/OrientedLineRep.cpp b/extern/freestyle/src/scene_graph/OrientedLineRep.cpp
new file mode 100755
index 00000000000..2d0205308b9
--- /dev/null
+++ b/extern/freestyle/src/scene_graph/OrientedLineRep.cpp
@@ -0,0 +1,31 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "OrientedLineRep.h"
+#include "../system/BaseObject.h"
+
+void OrientedLineRep::accept(SceneVisitor& v) {
+  Rep::accept(v);
+  if(!material())
+    v.visitOrientedLineRep(*this);
+  else
+    v.visitLineRep(*this);
+}
diff --git a/extern/freestyle/src/scene_graph/OrientedLineRep.h b/extern/freestyle/src/scene_graph/OrientedLineRep.h
new file mode 100755
index 00000000000..4274581e39a
--- /dev/null
+++ b/extern/freestyle/src/scene_graph/OrientedLineRep.h
@@ -0,0 +1,67 @@
+//
+//  Filename         : OrientedLineRep.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Class to display an oriented line representation.
+//  Date of creation : 24/10/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  VIEWEDGEREP_H
+# define VIEWEDGEREP_H
+
+# include "../system/FreestyleConfig.h"
+# include "LineRep.h"
+
+class LIB_SCENE_GRAPH_EXPORT OrientedLineRep : public LineRep
+{
+public:
+
+  OrientedLineRep() : LineRep() {}
+  /*! Builds a single line from 2 vertices
+   *  v1
+   *    first vertex
+   *  v2
+   *    second vertex
+   */
+  inline OrientedLineRep(const Vec3r& v1, const Vec3r& v2)
+    : LineRep(v1,v2)
+  {}
+
+  /*! Builds a line rep from a vertex chain */
+  inline OrientedLineRep(const vector<Vec3r>& vertices)
+    : LineRep(vertices)
+  {}
+
+  /*! Builds a line rep from a vertex chain */
+  inline OrientedLineRep(const list<Vec3r>& vertices)
+    : LineRep(vertices)
+  {}
+
+  virtual ~OrientedLineRep() {}
+
+  /*! Accept the corresponding visitor */
+  virtual void accept(SceneVisitor& v);
+};
+
+#endif // VIEWEDGEREP_H
diff --git a/extern/freestyle/src/scene_graph/Rep.cpp b/extern/freestyle/src/scene_graph/Rep.cpp
new file mode 100755
index 00000000000..520d3c41e2e
--- /dev/null
+++ b/extern/freestyle/src/scene_graph/Rep.cpp
@@ -0,0 +1 @@
+#include "Rep.h"
\ No newline at end of file
diff --git a/extern/freestyle/src/scene_graph/Rep.h b/extern/freestyle/src/scene_graph/Rep.h
new file mode 100755
index 00000000000..6ccc2152c48
--- /dev/null
+++ b/extern/freestyle/src/scene_graph/Rep.h
@@ -0,0 +1,127 @@
+//
+//  Filename         : Rep.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Base class for all shapes. Inherits from BasicObjects 
+//                     for references counter management (addRef, release).
+//  Date of creation : 25/01/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  REP_H
+# define REP_H
+
+# include "../system/BaseObject.h"
+# include "SceneVisitor.h"
+# include "../geometry/BBox.h"
+# include "../geometry/Geom.h"
+# include "../system/Precision.h"
+# include "Material.h"
+# include "../system/Id.h"
+
+using namespace Geometry;
+
+class LIB_SCENE_GRAPH_EXPORT Rep : public BaseObject
+{
+public:
+  
+  inline Rep() : BaseObject() {_Id = 0; _Material=0;}
+  inline Rep(const Rep& iBrother)
+    : BaseObject()
+  {
+    _Id = iBrother._Id;
+    if(0 == iBrother._Material)
+      _Material = 0;
+    else
+      _Material = new Material(*(iBrother._Material));
+
+    _BBox = iBrother.bbox();
+  }
+	inline void swap(Rep& ioOther){
+		std::swap(_BBox,ioOther._BBox);
+		std::swap(_Id, ioOther._Id);
+		std::swap(_Material,ioOther._Material);
+	}
+	Rep& operator=(const Rep& iBrother){
+		if(&iBrother != this){
+			_Id = iBrother._Id;
+			if(0 == iBrother._Material)
+				_Material = 0;
+			else{
+				if(_Material == 0){
+					_Material = new Material(*iBrother._Material);
+				}else{
+					(*_Material)=(*(iBrother._Material));
+				}
+				_BBox = iBrother.bbox();
+			}
+		}
+		return *this;
+	}
+  virtual ~Rep() 
+  {
+    if(0 != _Material)
+    {
+      delete _Material;
+      _Material = 0;
+    }
+  }
+
+  /*! Accept the corresponding visitor
+   *  Must be overload by 
+   *  inherited classes
+   */
+  virtual void accept(SceneVisitor& v) {
+    if(_Material)
+      v.visitMaterial(*_Material);
+    v.visitRep(*this);
+  }
+
+  /*! Computes the rep bounding box.
+   *  Each Inherited rep must compute 
+   *  its bbox depending on the way the data
+   *  are stored. So, each inherited class 
+   *  must overload this method
+   */
+  virtual void ComputeBBox() = 0;
+  
+  /*! Returns the rep bounding box */
+  virtual const BBox<Vec3r>& bbox() const {return _BBox;}
+  inline Id getId() const {return _Id;}
+  inline const Material * material() const {return _Material;}
+
+  /*! Sets the Rep bounding box */
+  virtual void SetBBox(const BBox<Vec3r>& iBox) {_BBox = iBox;}
+  inline void SetId(const Id& id) {_Id = id;}
+  inline void SetMaterial(const Material& iMaterial) 
+  {
+    _Material = new Material(iMaterial);
+  }
+
+private:
+  BBox<Vec3r> _BBox;
+  Id _Id;
+  Material *_Material;
+};
+
+#endif // REP_H
diff --git a/extern/freestyle/src/scene_graph/ScenePrettyPrinter.cpp b/extern/freestyle/src/scene_graph/ScenePrettyPrinter.cpp
new file mode 100755
index 00000000000..aeee87f8222
--- /dev/null
+++ b/extern/freestyle/src/scene_graph/ScenePrettyPrinter.cpp
@@ -0,0 +1,86 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include <iomanip>
+#include "ScenePrettyPrinter.h"
+#include "IndexedFaceSet.h"
+
+#define VISIT(CLASS) \
+  void ScenePrettyPrinter::visit##CLASS(CLASS&) { \
+    _ofs << _space << #CLASS << endl; \
+  }
+
+VISIT(Node)
+VISIT(NodeShape)
+VISIT(NodeGroup)
+VISIT(NodeLight)
+VISIT(NodeDrawingStyle)
+VISIT(NodeTransform)
+
+void ScenePrettyPrinter::visitNodeShapeBefore(NodeShape&) {
+  increaseSpace();
+}
+
+void ScenePrettyPrinter::visitNodeShapeAfter(NodeShape&) {
+  decreaseSpace();
+}
+
+void ScenePrettyPrinter::visitNodeGroupBefore(NodeGroup&) {
+  increaseSpace();
+}
+
+void ScenePrettyPrinter::visitNodeGroupAfter(NodeGroup&) {
+  decreaseSpace();
+}
+
+void ScenePrettyPrinter::visitNodeDrawingStyleBefore(NodeDrawingStyle&) {
+  increaseSpace();
+}
+
+void ScenePrettyPrinter::visitNodeDrawingStyleAfter(NodeDrawingStyle&) {
+  decreaseSpace();
+}
+
+void ScenePrettyPrinter::visitNodeTransformBefore(NodeTransform&) {
+  increaseSpace();
+}
+
+void ScenePrettyPrinter::visitNodeTransformAfter(NodeTransform&) {
+  decreaseSpace();
+}
+
+VISIT(LineRep)
+VISIT(OrientedLineRep)
+VISIT(TriangleRep)
+VISIT(VertexRep)
+
+void ScenePrettyPrinter::visitIndexedFaceSet(IndexedFaceSet& ifs) {
+  const real*	vertices = ifs.vertices();
+  unsigned	vsize = ifs.vsize();
+
+  _ofs << _space << "IndexedFaceSet" << endl;
+  const real *p = vertices;
+  for (unsigned i = 0; i < vsize / 3; i++) {
+    _ofs << _space << "  " << setw(3) << setfill('0') << i << ": "
+	 << p[0] << ", " << p[1] << ", " << p[2] << endl;
+    p += 3;
+  }
+}
diff --git a/extern/freestyle/src/scene_graph/ScenePrettyPrinter.h b/extern/freestyle/src/scene_graph/ScenePrettyPrinter.h
new file mode 100755
index 00000000000..4e83825ff55
--- /dev/null
+++ b/extern/freestyle/src/scene_graph/ScenePrettyPrinter.h
@@ -0,0 +1,105 @@
+//
+//  Filename         : ScenePrettyPrinter.h
+//  Author(s)        : Stephane Grabli, Emmanuel Turquin
+//  Purpose          : Class to display textual information
+//                     about a scene graph.
+//  Date of creation : 26/04/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  SCENE_PRETTY_PRINTER_H
+# define SCENE_PRETTY_PRINTER_H
+
+# include <iostream>
+# include <fstream>
+# include <string>
+# include "SceneVisitor.h"
+
+using namespace std;
+
+class ScenePrettyPrinter : public SceneVisitor
+{
+public:
+
+  ScenePrettyPrinter(const string filename = "SceneLog.txt")
+    : SceneVisitor() {
+    if (!filename.empty())
+      _ofs.open(filename.c_str());
+    if (!_ofs.is_open())
+      cerr << "Warning, unable to open file \"" << filename << "\"" << endl;
+    _space = "";
+  }
+
+  virtual ~ScenePrettyPrinter() {
+    if (_ofs.is_open())
+      _ofs.close();
+  }
+
+
+  //
+  // visitClass methods
+  //
+  //////////////////////////////////////////////
+
+  VISIT_DECL(Node)
+  VISIT_DECL(NodeShape)
+  VISIT_DECL(NodeGroup)
+  VISIT_DECL(NodeLight)
+  VISIT_DECL(NodeDrawingStyle)
+  VISIT_DECL(NodeTransform)
+
+  VISIT_DECL(LineRep)
+  VISIT_DECL(OrientedLineRep)
+  VISIT_DECL(TriangleRep)
+  VISIT_DECL(VertexRep)
+  VISIT_DECL(IndexedFaceSet)
+
+  virtual void visitNodeShapeBefore(NodeShape&);
+  virtual void visitNodeShapeAfter(NodeShape&);
+  virtual void visitNodeGroupBefore(NodeGroup&);
+  virtual void visitNodeGroupAfter(NodeGroup&);
+  virtual void visitNodeDrawingStyleBefore(NodeDrawingStyle&);
+  virtual void visitNodeDrawingStyleAfter(NodeDrawingStyle&);
+  virtual void visitNodeTransformBefore(NodeTransform&);
+  virtual void visitNodeTransformAfter(NodeTransform&);
+
+ protected:
+  
+  void increaseSpace()
+  {
+    _space += "  ";
+  }
+
+  void decreaseSpace()
+  {
+    _space.erase(0, 2);
+  }
+
+ private:
+
+  ofstream	_ofs;
+  string	_space;
+};
+
+#endif // SCENE_PRETTY_PRINTER_H
diff --git a/extern/freestyle/src/scene_graph/SceneVisitor.cpp b/extern/freestyle/src/scene_graph/SceneVisitor.cpp
new file mode 100755
index 00000000000..9cfb9d40d24
--- /dev/null
+++ b/extern/freestyle/src/scene_graph/SceneVisitor.cpp
@@ -0,0 +1 @@
+#include "SceneVisitor.h"
\ No newline at end of file
diff --git a/extern/freestyle/src/scene_graph/SceneVisitor.h b/extern/freestyle/src/scene_graph/SceneVisitor.h
new file mode 100755
index 00000000000..c57bd2e0f6e
--- /dev/null
+++ b/extern/freestyle/src/scene_graph/SceneVisitor.h
@@ -0,0 +1,98 @@
+//
+//  Filename         : SceneVisitor.h
+//  Author(s)        : Emmanuel Turquin
+//  Purpose          : Class to visit (without doing anything)
+//                     a scene graph structure
+//  Date of creation : 26/04/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  SCENE_VISITOR_H
+# define SCENE_VISITOR_H
+
+# define VISIT_COMPLETE_DEF(type)		\
+virtual void visit##type(type&) {}		\
+virtual void visit##type##Before(type&) {}	\
+virtual void visit##type##After(type&) {}
+
+# define VISIT_DECL(type) virtual void visit##type(type&);
+
+# define VISIT_COMPLETE_DECL(type) \
+    virtual void visit##type##Before(type&); \
+    virtual void visit##type(type&); \
+    virtual void visit##type##After(type&); 
+
+#include "../system/FreestyleConfig.h"
+
+class Node;
+class NodeShape;
+class NodeGroup;
+class NodeLight;
+class NodeCamera;
+class NodeDrawingStyle;
+class NodeTransform;
+
+class Rep;
+class LineRep;
+class OrientedLineRep;
+class TriangleRep;
+class VertexRep;
+class IndexedFaceSet;
+class DrawingStyle;
+class Material;
+
+class LIB_SCENE_GRAPH_EXPORT SceneVisitor
+{
+public:
+  
+  SceneVisitor() {}
+  virtual ~SceneVisitor() {}
+
+  virtual void beginScene() {}
+  virtual void endScene() {}
+
+  //
+  // visitClass methods
+  //
+  //////////////////////////////////////////////
+
+  VISIT_COMPLETE_DEF(Node)
+  VISIT_COMPLETE_DEF(NodeShape)
+  VISIT_COMPLETE_DEF(NodeGroup)
+  VISIT_COMPLETE_DEF(NodeLight)
+  VISIT_COMPLETE_DEF(NodeCamera)
+  VISIT_COMPLETE_DEF(NodeDrawingStyle)
+  VISIT_COMPLETE_DEF(NodeTransform)
+
+  VISIT_COMPLETE_DEF(Rep)
+  VISIT_COMPLETE_DEF(LineRep)
+  VISIT_COMPLETE_DEF(OrientedLineRep)
+  VISIT_COMPLETE_DEF(TriangleRep)
+  VISIT_COMPLETE_DEF(VertexRep)
+  VISIT_COMPLETE_DEF(IndexedFaceSet)
+  VISIT_COMPLETE_DEF(DrawingStyle)
+  VISIT_COMPLETE_DEF(Material)
+};
+
+#endif // SCENEVISITOR_H
diff --git a/extern/freestyle/src/scene_graph/TriangleRep.cpp b/extern/freestyle/src/scene_graph/TriangleRep.cpp
new file mode 100755
index 00000000000..215124b0676
--- /dev/null
+++ b/extern/freestyle/src/scene_graph/TriangleRep.cpp
@@ -0,0 +1,59 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "TriangleRep.h"
+
+void TriangleRep::ComputeBBox()
+{
+  real XMax = _vertices[0][0];
+  real YMax = _vertices[0][1];
+  real ZMax = _vertices[0][2];
+
+  real XMin = _vertices[0][0];
+  real YMin = _vertices[0][1];
+  real ZMin = _vertices[0][2];
+
+  // parse all the coordinates to find 
+  // the XMax, YMax, ZMax
+  for(int i=0; i<3; ++i)
+  {
+    // X
+    if(_vertices[i][0] > XMax)
+      XMax = _vertices[i][0];
+    if(_vertices[i][0] < XMin)
+      XMin = _vertices[i][0];
+
+    // Y
+    if(_vertices[i][1] > YMax)
+      YMax = _vertices[i][1];
+    if(_vertices[i][1] < YMin)
+      YMin = _vertices[i][1];
+
+    // Z
+    if(_vertices[i][2] > ZMax)
+      ZMax = _vertices[i][2];
+    if(_vertices[i][2] < ZMin)
+      ZMin = _vertices[i][2];
+
+  }
+
+  SetBBox(BBox<Vec3r>(Vec3r(XMin, YMin, ZMin), Vec3r(XMax, YMax, ZMax)));
+}
diff --git a/extern/freestyle/src/scene_graph/TriangleRep.h b/extern/freestyle/src/scene_graph/TriangleRep.h
new file mode 100755
index 00000000000..20df12cfd8f
--- /dev/null
+++ b/extern/freestyle/src/scene_graph/TriangleRep.h
@@ -0,0 +1,106 @@
+//
+//  Filename         : TriangleRep.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Class to define the represenation of a triangle
+//  Date of creation : 16/12/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  TRIANGLEREP_H
+# define TRIANGLEREP_H
+
+//! inherits from class Rep 
+#include "Rep.h"
+
+/*! Base class for all lines objects */
+class LIB_SCENE_GRAPH_EXPORT TriangleRep : public Rep
+{
+public:
+  
+  /*! Line description style */
+  enum TRIANGLE_STYLE{FILL, LINES};
+private:
+  TRIANGLE_STYLE _Style;
+  Vec3r _vertices[3];
+  Vec3r _colors[3];
+public:
+  inline TriangleRep() : Rep() {_Style = FILL;}
+
+  /*! Builds a triangle from 3 vertices
+   *  v0
+   *    first vertex
+   *  v1
+   *    second vertex
+   *  v2
+   *    third vertex
+   */
+  inline TriangleRep(const Vec3r& v0, const Vec3r& v1, const Vec3r& v2)
+    : Rep()
+  {
+    _vertices[0] = v0;
+    _vertices[1] = v1;
+    _vertices[2] = v2;
+    _Style = FILL;
+  }
+  inline TriangleRep( const Vec3r& v0, const Vec3r& c0,
+                      const Vec3r& v1, const Vec3r& c1,
+                      const Vec3r& v2, const Vec3r& c2)
+    : Rep()
+  {
+    _vertices[0] = v0;
+    _vertices[1] = v1;
+    _vertices[2] = v2;
+    _colors[0] = c0;
+    _colors[1] = c1;
+    _colors[2] = c2;
+    _Style = FILL;
+  }
+
+  virtual ~TriangleRep() 
+  {} 
+
+  /*! accessors */
+  inline const TRIANGLE_STYLE style() const {return _Style;}
+  inline const Vec3r& vertex(int index) const {return _vertices[index];}
+  inline const Vec3r& color(int index) const {return _colors[index];}
+  /*! modifiers */
+  inline void SetStyle(const TRIANGLE_STYLE iStyle) {_Style = iStyle;}
+  inline void SetVertex(int index, const Vec3r& iVertex) {_vertices[index] = iVertex;}
+  inline void SetColor(int index, const Vec3r& iColor) {_colors[index] = iColor;}
+  inline void SetVertices(const Vec3r& v0, const Vec3r& v1, const Vec3r& v2) {_vertices[0] = v0; _vertices[1] = v1; _vertices[2] = v2;}
+  inline void SetColors(const Vec3r& c0, const Vec3r& c1, const Vec3r& c2) {_colors[0] = c0; _colors[1] = c1; _colors[2] = c2;}
+
+  /*! Accept the corresponding visitor */
+  virtual void accept(SceneVisitor& v) {
+    Rep::accept(v);
+    v.visitTriangleRep(*this);
+  }
+
+  /*! Computes the triangle bounding box.*/
+  virtual void ComputeBBox();
+
+
+};
+
+#endif
diff --git a/extern/freestyle/src/scene_graph/VertexRep.cpp b/extern/freestyle/src/scene_graph/VertexRep.cpp
new file mode 100755
index 00000000000..1ecb5f141e1
--- /dev/null
+++ b/extern/freestyle/src/scene_graph/VertexRep.cpp
@@ -0,0 +1,29 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "VertexRep.h"
+
+void VertexRep::ComputeBBox()
+{
+
+  SetBBox(BBox<Vec3r>(Vec3r(_coordinates[0], _coordinates[1], _coordinates[2]), 
+                      Vec3r(_coordinates[0], _coordinates[1], _coordinates[2])));
+}
diff --git a/extern/freestyle/src/scene_graph/VertexRep.h b/extern/freestyle/src/scene_graph/VertexRep.h
new file mode 100755
index 00000000000..9dce7fbbe9c
--- /dev/null
+++ b/extern/freestyle/src/scene_graph/VertexRep.h
@@ -0,0 +1,87 @@
+//
+//  Filename         : VertexRep.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Class to define the representation of a vertex for
+//                     displaying purpose.
+//  Date of creation : 03/04/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  VERTEXREP_H
+# define VERTEXREP_H
+
+#include "Rep.h"
+
+class LIB_SCENE_GRAPH_EXPORT VertexRep : public Rep
+{
+public:
+  
+  inline VertexRep() : Rep() {_vid = 0;_PointSize = 0.f;}
+  inline VertexRep(real x, real y, real z, int id = 0) 
+    : Rep()
+  {
+    _coordinates[0] = x;
+    _coordinates[1] = y;
+    _coordinates[2] = z;
+
+    _vid = id;
+    _PointSize = 0.f;
+  }
+
+  inline ~VertexRep() {}
+
+  /*! Accept the corresponding visitor */
+
+  virtual void accept(SceneVisitor& v) {
+    Rep::accept(v);
+    v.visitVertexRep(*this);
+  }
+
+  /*! Computes the rep bounding box.
+   */
+  virtual void ComputeBBox();
+
+  /*! accessors */
+  inline const int vid() const {return _vid;}
+  inline const real * coordinates() const {return _coordinates;}
+  inline real x() const {return _coordinates[0];}
+  inline real y() const {return _coordinates[1];}
+  inline real z() const {return _coordinates[2];}
+  inline float pointSize() const {return _PointSize;}
+
+  /*! modifiers */
+  inline void SetVid(int id) {_vid = id;}
+  inline void setX(real x) {_coordinates[0] = x;}
+  inline void setY(real y) {_coordinates[1] = y;}
+  inline void setZ(real z) {_coordinates[2] = z;}
+  inline void SetCoordinates(real x, real y, real z) {_coordinates[0] = x;_coordinates[1] = y; _coordinates[2] = z;}
+  inline void SetPointSize(float iPointSize) {_PointSize = iPointSize;}
+
+private:
+  int _vid; // vertex id
+  real _coordinates[3];
+  float _PointSize;
+};
+
+#endif // VERTEXREP_H
diff --git a/extern/freestyle/src/scene_graph/scene_graph.pro b/extern/freestyle/src/scene_graph/scene_graph.pro
new file mode 100755
index 00000000000..5736104a597
--- /dev/null
+++ b/extern/freestyle/src/scene_graph/scene_graph.pro
@@ -0,0 +1,86 @@
+# This file should be viewed as a -*- mode: Makefile -*-
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#			      W A R N I N G ! ! !                             #
+#             a u t h o r i z e d    p e r s o n a l    o n l y               #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+
+include(../Config.pri)
+
+TEMPLATE        = lib
+
+TARGET          = $${LIB_SCENE_GRAPH}
+VERSION         = $${APPVERSION}
+TARGET_VERSION_EXT = $${APPVERSION_MAJ}.$${APPVERSION_MID}
+
+#
+# CONFIG
+#
+#######################################
+
+CONFIG          *= dll 3ds$${LIB3DS_VERSION_MAJ}.$${LIB3DS_VERSION_MIN}
+
+
+exists (../libconfig.pri) {
+  include (../libconfig.pri)
+}
+#
+# DEFINES
+#
+#######################################
+
+win32:DEFINES *= MAKE_LIB_SCENE_GRAPH_DLL
+
+#
+# INCLUDE PATH
+#
+#######################################
+
+#INCLUDEPATH     *= ../geometry ../system
+
+#
+# BUILD DIRECTORIES
+#
+#######################################
+
+BUILD_DIR       = ../../build
+
+OBJECTS_DIR     = $${BUILD_DIR}/$${REL_OBJECTS_DIR}
+!win32:DESTDIR  = $${BUILD_DIR}/$${REL_DESTDIR}/lib
+win32:DESTDIR   = $${BUILD_DIR}/$${REL_DESTDIR}
+
+#
+# LIBS
+#
+#######################################
+
+win32:LIBS      *= $${DESTDIR}/$${LIB_GEOMETRY}$${LIBVERSION}.lib \
+		   $${DESTDIR}/$${LIB_SYSTEM}$${LIBVERSION}.lib
+!win32 {
+  lib_bundle {
+    LIBS += -F$${DESTDIR} -framework $${LIB_GEOMETRY} \
+	    -framework $${LIB_SYSTEM}
+  } else {
+    LIBS *= -L$${DESTDIR}/ -l$${LIB_GEOMETRY} -l$${LIB_SYSTEM}
+  }
+}
+
+#
+# INSTALL
+#
+#######################################
+
+LIB_DIR       = ../../lib
+# install library
+target.path   = $$LIB_DIR
+# "make install" configuration options
+INSTALLS     += target
+
+#
+# SOURCES & HEADERS
+#
+#######################################
+
+!static {
+  include(src.pri)
+}
diff --git a/extern/freestyle/src/scene_graph/src.pri b/extern/freestyle/src/scene_graph/src.pri
new file mode 100755
index 00000000000..994db200812
--- /dev/null
+++ b/extern/freestyle/src/scene_graph/src.pri
@@ -0,0 +1,41 @@
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#			      W A R N I N G ! ! !                             #
+#             a u t h o r i z e d    p e r s o n a l    o n l y               #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+
+SCENE_GRAPH_DIR = ../scene_graph
+
+SOURCES *= $${SCENE_GRAPH_DIR}/IndexedFaceSet.cpp \
+           $${SCENE_GRAPH_DIR}/LineRep.cpp \
+           $${SCENE_GRAPH_DIR}/MaxFileLoader.cpp \
+           $${SCENE_GRAPH_DIR}/NodeCamera.cpp \
+           $${SCENE_GRAPH_DIR}/NodeDrawingStyle.cpp \
+           $${SCENE_GRAPH_DIR}/NodeGroup.cpp \
+           $${SCENE_GRAPH_DIR}/NodeLight.cpp \
+           $${SCENE_GRAPH_DIR}/NodeShape.cpp \
+           $${SCENE_GRAPH_DIR}/NodeTransform.cpp \
+           $${SCENE_GRAPH_DIR}/OrientedLineRep.cpp \
+           $${SCENE_GRAPH_DIR}/ScenePrettyPrinter.cpp \
+           $${SCENE_GRAPH_DIR}/TriangleRep.cpp \
+           $${SCENE_GRAPH_DIR}/VertexRep.cpp \
+           $${SCENE_GRAPH_DIR}/Rep.cpp \
+           $${SCENE_GRAPH_DIR}/SceneVisitor.cpp
+
+HEADERS *= $${SCENE_GRAPH_DIR}/DrawingStyle.h \
+           $${SCENE_GRAPH_DIR}/IndexedFaceSet.h \
+           $${SCENE_GRAPH_DIR}/LineRep.h \
+           $${SCENE_GRAPH_DIR}/Material.h \
+           $${SCENE_GRAPH_DIR}/MaxFileLoader.h \
+           $${SCENE_GRAPH_DIR}/Node.h \
+           $${SCENE_GRAPH_DIR}/NodeCamera.h \
+           $${SCENE_GRAPH_DIR}/NodeDrawingStyle.h \
+           $${SCENE_GRAPH_DIR}/NodeGroup.h \
+           $${SCENE_GRAPH_DIR}/NodeLight.h \
+           $${SCENE_GRAPH_DIR}/NodeShape.h \
+           $${SCENE_GRAPH_DIR}/NodeTransform.h \
+           $${SCENE_GRAPH_DIR}/OrientedLineRep.h \
+           $${SCENE_GRAPH_DIR}/Rep.h \
+           $${SCENE_GRAPH_DIR}/ScenePrettyPrinter.h \
+           $${SCENE_GRAPH_DIR}/SceneVisitor.h \
+           $${SCENE_GRAPH_DIR}/TriangleRep.h \
+           $${SCENE_GRAPH_DIR}/VertexRep.h
diff --git a/extern/freestyle/src/stroke/AdvancedFunctions0D.cpp b/extern/freestyle/src/stroke/AdvancedFunctions0D.cpp
new file mode 100755
index 00000000000..c22e183eccb
--- /dev/null
+++ b/extern/freestyle/src/stroke/AdvancedFunctions0D.cpp
@@ -0,0 +1,85 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+# include "../view_map/Functions0D.h"
+# include "AdvancedFunctions0D.h"
+# include "../view_map/SteerableViewMap.h"
+# include "Canvas.h"
+
+namespace Functions0D {
+
+  double DensityF0D::operator()(Interface0DIterator& iter) {
+    Canvas* canvas = Canvas::getInstance();
+    int bound = _filter.getBound();
+    if( (iter->getProjectedX()-bound < 0) || (iter->getProjectedX()+bound>canvas->width())
+	|| (iter->getProjectedY()-bound < 0) || (iter->getProjectedY()+bound>canvas->height()))
+      return 0.0;
+    RGBImage image;
+    canvas->readColorPixels((int)iter->getProjectedX() - bound,
+			    (int)iter->getProjectedY() - bound,
+			    _filter.maskSize(),
+			    _filter.maskSize(),
+			    image);
+    return _filter.getSmoothedPixel<RGBImage>(&image, (int)iter->getProjectedX(),
+					(int)iter->getProjectedY());
+  }
+
+
+  double LocalAverageDepthF0D::operator()(Interface0DIterator& iter) {
+    Canvas * iViewer = Canvas::getInstance();
+    int bound = _filter.getBound();
+    
+    if( (iter->getProjectedX()-bound < 0) || (iter->getProjectedX()+bound>iViewer->width())
+	|| (iter->getProjectedY()-bound < 0) || (iter->getProjectedY()+bound>iViewer->height()))
+      return 0.0;
+    GrayImage image ;
+    iViewer->readDepthPixels((int)iter->getProjectedX()-bound,(int)iter->getProjectedY()-bound,_filter.maskSize(),_filter.maskSize(),image);
+    return _filter.getSmoothedPixel(&image, (int)iter->getProjectedX(), (int)iter->getProjectedY());
+  }
+
+  float ReadMapPixelF0D::operator()(Interface0DIterator& iter) {
+    Canvas * canvas = Canvas::getInstance();
+    return canvas->readMapPixel(_mapName, _level, (int)iter->getProjectedX(), (int)iter->getProjectedY());
+  }
+
+  float ReadSteerableViewMapPixelF0D::operator()(Interface0DIterator& iter) {
+    SteerableViewMap *svm = Canvas::getInstance()->getSteerableViewMap();
+    float v = svm->readSteerableViewMapPixel(_orientation, _level,(int)iter->getProjectedX(), (int)iter->getProjectedY());
+    return v;
+  }
+
+  float ReadCompleteViewMapPixelF0D::operator()(Interface0DIterator& iter) {
+    SteerableViewMap *svm = Canvas::getInstance()->getSteerableViewMap();
+    float v = svm->readCompleteViewMapPixel(_level,(int)iter->getProjectedX(), (int)iter->getProjectedY());
+    return v;
+  }
+
+  float GetViewMapGradientNormF0D::operator()(Interface0DIterator& iter){
+    SteerableViewMap *svm = Canvas::getInstance()->getSteerableViewMap();
+    float pxy = svm->readCompleteViewMapPixel(_level,(int)iter->getProjectedX(), (int)iter->getProjectedY());
+    float gx = svm->readCompleteViewMapPixel(_level,(int)iter->getProjectedX()+_step, (int)iter->getProjectedY())
+      - pxy;
+    float gy = svm->readCompleteViewMapPixel(_level,(int)iter->getProjectedX(), (int)iter->getProjectedY()+_step)
+      - pxy;
+	float f = Vec2f(gx,gy).norm();
+    return f;
+  }
+} // end of namespace Functions0D
diff --git a/extern/freestyle/src/stroke/AdvancedFunctions0D.h b/extern/freestyle/src/stroke/AdvancedFunctions0D.h
new file mode 100755
index 00000000000..d92575cf110
--- /dev/null
+++ b/extern/freestyle/src/stroke/AdvancedFunctions0D.h
@@ -0,0 +1,209 @@
+//
+//  Filename         : AdvancedFunctions0D.h
+//  Author(s)        : Stephane Grabli
+//                     Emmanuel Turquin
+//  Purpose          : Functions taking 0D input
+//  Date of creation : 01/07/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  ADVANCED_FUNCTIONS0D_HPP
+# define ADVANCED_FUNCTIONS0D_HPP
+
+
+# include "../image/Image.h"
+# include "../image/GaussianFilter.h"
+# include "../view_map/Functions0D.h"
+
+//
+// Functions definitions
+//
+///////////////////////////////////////////////////////////
+
+namespace Functions0D {
+
+  // DensityF0D
+  /*! Returns the density of the (result) image evaluated at an Interface0D.
+   *  This density is evaluated using a pixels square window around the
+   *  evaluation point and integrating these values using
+   *  a gaussian.
+   */
+  class LIB_STROKE_EXPORT DensityF0D : public UnaryFunction0D<double>
+  {
+  public:
+    /*! Builds the functor from the gaussian sigma value.
+     *  \param sigma
+     *    sigma indicates the x value for which the gaussian
+     *    function is 0.5. It leads to the window size
+     *    value. (the larger, the smoother)
+     */
+    DensityF0D(double sigma = 2) : UnaryFunction0D<double>() {
+      _filter.SetSigma((float)sigma);
+    }
+    /*! Returns the string "DensityF0D"*/
+    string getName() const {
+      return "DensityF0D";
+    }
+    /*! The () operator. */
+    double operator()(Interface0DIterator& iter);
+
+  private:
+
+    GaussianFilter _filter;
+  };
+
+  // LocalAverageDepthF0D
+  /*! Returns the average depth around a point.
+   *  The result is obtained by querying the
+   *  depth buffer on a window around that point.
+   */
+  class LIB_STROKE_EXPORT LocalAverageDepthF0D : public UnaryFunction0D<double>
+  {
+  private:
+    GaussianFilter _filter;
+  public:
+    /*! Builds the functor from the size of the mask that
+     *   will be used.
+     */
+    LocalAverageDepthF0D(real maskSize=5.f) : UnaryFunction0D<double>() {
+      _filter.SetSigma((float)maskSize/2.f);
+    }
+    /*! Returns the string "LocalAverageDepthF0D"*/
+    string getName() const {
+      return "LocalAverageDepthF0D";
+    }
+    /*! the () operator.*/
+    double operator()(Interface0DIterator& iter);
+  };
+
+  // ReadMapPixel
+  /*! Reads a pixel in a map.
+   */
+  class LIB_STROKE_EXPORT ReadMapPixelF0D : public UnaryFunction0D<float>
+  {
+  private:
+    const char * _mapName;
+    int _level;
+  public:
+    /*! Builds the functor from name of the 
+     *  Map that must be read.
+     *  \param iMapName
+     *    The name of the map.
+     *  \param level
+     *    The level of the pyramid from which 
+     *    the pixel must be read.
+     */
+    ReadMapPixelF0D(const char *iMapName, int level) : UnaryFunction0D<float>() {
+      _mapName = iMapName;
+      _level = level;
+    }
+    /*! Returns the string "ReadMapPixelF0D"*/
+    string getName() const {
+      return "ReadMapPixelF0D";
+    }
+    /*! the () operator.*/
+    float operator()(Interface0DIterator& iter);
+  };
+  
+  // ReadSteerableViewMapPixel
+  /*! Reads a pixel in one of the level of one of the steerable viewmaps.
+   */
+  class LIB_STROKE_EXPORT ReadSteerableViewMapPixelF0D : public UnaryFunction0D<float>
+  {
+  private:
+    unsigned _orientation;
+    int _level;
+  public:
+    /*! Builds the functor
+     *  \param nOrientation
+     *    The integer belonging to [0,4] indicating the orientation (E,NE,N,NW)
+     *    we are interested in.
+     *  \param level
+     *    The level of the pyramid from which 
+     *    the pixel must be read.
+     */
+    ReadSteerableViewMapPixelF0D(unsigned nOrientation, int level) : UnaryFunction0D<float>() {
+      _orientation = nOrientation;
+      _level = level;
+    }
+    /*! Returns the string "ReadSteerableViewMapPixelF0D"*/
+    string getName() const {
+      return "ReadSteerableViewMapPixelF0D";
+    }
+    /*! the () operator.*/
+    float operator()(Interface0DIterator& iter);
+  };
+
+  // ReadCompleteViewMapPixel
+  /*! Reads a pixel in one of the level of the complete viewmap.
+   */
+  class LIB_STROKE_EXPORT ReadCompleteViewMapPixelF0D : public UnaryFunction0D<float>
+  {
+  private:
+    int _level;
+  public:
+    /*! Builds the functor 
+     *  \param level
+     *    The level of the pyramid from which 
+     *    the pixel must be read.
+     */
+    ReadCompleteViewMapPixelF0D(int level) : UnaryFunction0D<float>() {
+      _level = level;
+    }
+    /*! Returns the string "ReadCompleteViewMapPixelF0D"*/
+    string getName() const {
+      return "ReadCompleteViewMapPixelF0D";
+    }
+    /*! the () operator.*/
+    float operator()(Interface0DIterator& iter);
+  };
+  
+  // GetViewMapGradientNormF0D
+  /*! Returns the norm of the gradient of the global viewmap density image.
+   */
+  class LIB_STROKE_EXPORT GetViewMapGradientNormF0D: public UnaryFunction0D< float>
+  {
+    private:
+    int _level;
+    float _step;
+  public:
+    /*! Builds the functor 
+     *  \param level
+     *    The level of the pyramid from which 
+     *    the pixel must be read.
+     */
+    GetViewMapGradientNormF0D(int level) : UnaryFunction0D<float>() {
+      _level = level;
+      _step = (float)pow(2.0,_level);
+    }
+    /*! Returns the string "GetOccludeeF0D"*/
+    string getName() const {
+      return "GetViewMapGradientNormF0D";
+    }
+    /*! the () operator.*/
+    float operator()(Interface0DIterator& iter);
+  };
+} // end of namespace Functions0D
+
+#endif // ADVANCED_FUNCTIONS0D_HPP
diff --git a/extern/freestyle/src/stroke/AdvancedFunctions1D.cpp b/extern/freestyle/src/stroke/AdvancedFunctions1D.cpp
new file mode 100755
index 00000000000..cf2982606e0
--- /dev/null
+++ b/extern/freestyle/src/stroke/AdvancedFunctions1D.cpp
@@ -0,0 +1,108 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+# include "AdvancedFunctions1D.h"
+# include "../view_map/SteerableViewMap.h"
+# include "Canvas.h"
+
+// FIXME
+namespace Functions1D {
+
+  real GetSteerableViewMapDensityF1D::operator()(Interface1D& inter) {
+    SteerableViewMap * svm = Canvas::getInstance()->getSteerableViewMap();
+    Interface0DIterator it = inter.pointsBegin(_sampling);
+    Interface0DIterator itnext = it;++itnext;
+    FEdge *fe;
+    unsigned nSVM;
+    vector<float> values;
+    while(!itnext.isEnd()){
+      Interface0D& i0D = (*it);
+      Interface0D& i0Dnext = (*itnext);
+      fe = i0D.getFEdge(i0Dnext);
+      if(fe == 0){
+        cerr << "GetSteerableViewMapDensityF1D warning: no FEdge between " << i0D.getId() << " and " << i0Dnext.getId() << endl;
+        // compute the direction between these two ???
+        Vec2f dir = i0Dnext.getPoint2D()-i0D.getPoint2D();
+        nSVM = svm->getSVMNumber(dir);
+      }else{
+      nSVM = svm->getSVMNumber(fe->getId().getFirst());
+      }
+      Vec2r m((i0D.getProjectedX()+i0Dnext.getProjectedX())/2.0,
+              (i0D.getProjectedY()+i0Dnext.getProjectedY())/2.0);
+      values.push_back(svm->readSteerableViewMapPixel(nSVM,_level,(int)m[0],(int)m[1]));
+      ++it;++itnext;
+    }
+    float res, res_tmp;
+    vector<float>::iterator v = values.begin(), vend=values.end();
+    unsigned size = 1;
+    switch(_integration) {
+      case MIN:
+        res = *v;++v;
+        for (; v!=vend; ++v) {
+          res_tmp = *v;
+          if (res_tmp < res)
+	          res = res_tmp;
+        }
+        break;
+      case MAX:
+        res = *v;++v;
+        for (; v!=vend; ++v) {
+          res_tmp = *v;
+          if (res_tmp > res)
+	          res = res_tmp;
+        } 
+        break;
+      case FIRST:
+        res = *v;
+        break;
+      case LAST:
+        --vend;
+        res = *vend;
+        break;
+      case MEAN:
+      default:
+        res = *v;++v;
+        for (; v!=vend; ++v, ++size)
+          res += *v;
+        res /= (size ? size : 1);
+        break;
+    } 
+  return res;
+  }  
+
+  double GetDirectionalViewMapDensityF1D::operator()(Interface1D& inter) {
+    unsigned size;
+    double res =  integrate(_fun, inter.pointsBegin(_sampling), inter.pointsEnd(_sampling), _integration);
+    return res;
+  } 
+  
+  double GetCompleteViewMapDensityF1D::operator()(Interface1D& inter) {
+    unsigned size;
+    Id id = inter.getId();
+    double res =  integrate(_fun, inter.pointsBegin(_sampling), inter.pointsEnd(_sampling), _integration);
+    return res;
+  } 
+
+  real GetViewMapGradientNormF1D::operator()(Interface1D& inter){
+	return integrate(_func, inter.pointsBegin(_sampling), inter.pointsEnd(_sampling), _integration);
+  }
+}
+
diff --git a/extern/freestyle/src/stroke/AdvancedFunctions1D.h b/extern/freestyle/src/stroke/AdvancedFunctions1D.h
new file mode 100755
index 00000000000..65b0eec36fd
--- /dev/null
+++ b/extern/freestyle/src/stroke/AdvancedFunctions1D.h
@@ -0,0 +1,286 @@
+//
+//  Filename         : AdvancedFunctions1D.h
+//  Author(s)        : Stephane Grabli, Emmanuel Turquin
+//  Purpose          : Functions taking 1D input
+//  Date of creation : 01/07/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  ADVANCED_FUNCTIONS1D_HPP
+# define ADVANCED_FUNCTIONS1D_HPP
+
+
+# include "AdvancedFunctions0D.h"
+# include "../view_map/Functions1D.h"
+
+//
+// Functions definitions
+//
+///////////////////////////////////////////////////////////
+
+namespace Functions1D {
+
+  // DensityF1D
+  /*! Returns the density evaluated for an Interface1D.
+   *  The density is evaluated for a set of points along
+   *  the Interface1D (using the DensityF0D functor)
+   *  with a user-defined sampling and
+   *  then integrated into a single value using
+   *  a user-defined integration method.
+   */
+  class DensityF1D : public UnaryFunction1D<double>
+  {
+  private:
+    float _sampling;
+  public:
+    /*! Builds the functor.
+     *  \param sigma
+     *    Thesigma used in DensityF0D and determining
+     *    the window size used in each density query.
+     *  \param iType
+     *    The integration method used to compute
+     *    a single value from a set of values.
+     *  \param sampling
+     *    The resolution used to sample the chain: the corresponding 0D function
+     *    is evaluated at each sample point and the result is obtained by
+     *    combining the resulting values into a single one, following the
+     *    method specified by iType.
+     */
+    DensityF1D(double sigma = 2, IntegrationType iType = MEAN, float sampling=2.f) : UnaryFunction1D<double>(iType), _fun(sigma) {
+      _sampling = sampling;
+    }
+    /*! Destructor */
+    virtual ~DensityF1D(){}
+
+    /*! Returns the string "DensityF1D"*/
+    string getName() const {
+      return "DensityF1D";
+    }
+    /*! the () operator.*/
+    double operator()(Interface1D& inter) {
+      return integrate(_fun, inter.pointsBegin(_sampling), inter.pointsEnd(_sampling), _integration);
+    }
+  private:
+    Functions0D::DensityF0D	_fun;
+  };
+
+  // LocalAverageDepthF1D
+  /*! Returns the average depth evaluated for an Interface1D.
+   *  The average depth is evaluated for a set of points along
+   *  the Interface1D (using the LocalAverageDepthF0D functor)
+   *  with a user-defined sampling and
+   *  then integrated into a single value using
+   *  a user-defined integration method.
+   */
+  class LocalAverageDepthF1D : public UnaryFunction1D<double>
+  {
+    public:
+    /*! Builds the functor.
+     *  \param sigma
+     *    The sigma used in DensityF0D and determining
+     *    the window size used in each density query.
+     *  \param iType
+     *    The integration method used to compute
+     *    a single value from a set of values.
+     */
+    LocalAverageDepthF1D(real sigma, IntegrationType iType = MEAN) 
+      : UnaryFunction1D<double>(iType), _fun(sigma){
+    }
+    /*! Returns the string "LocalAverageDepthF1D"*/
+    string getName() const {
+      return "LocalAverageDepthF1D";
+    }
+    /*! the () operator.*/
+    double operator()(Interface1D& inter) {
+      return integrate(_fun, inter.verticesBegin(), inter.verticesEnd(), _integration);
+    }
+  private:
+    Functions0D::LocalAverageDepthF0D	_fun;
+  };
+
+  // GetCompleteViewMapDensity
+  /*! Returns the density evaluated for an Interface1D in the 
+   *  complete viewmap image.
+   *  The density is evaluated for a set of points along
+   *  the Interface1D (using the ReadCompleteViewMapPixelF0D functor)
+   *  and then integrated into a single value using
+   *  a user-defined integration method.
+   */
+  class LIB_STROKE_EXPORT GetCompleteViewMapDensityF1D : public UnaryFunction1D<double>
+  {
+  public:
+    /*! Builds the functor.
+     *  \param level
+     *    The level of the pyramid from which 
+     *    the pixel must be read.
+     *  \param iType
+     *    The integration method used to compute
+     *    a single value from a set of values.
+     *  \param sampling
+     *    The resolution used to sample the chain: the corresponding 0D function
+     *    is evaluated at each sample point and the result is obtained by
+     *    combining the resulting values into a single one, following the
+     *    method specified by iType.
+     */
+    GetCompleteViewMapDensityF1D(unsigned level, IntegrationType iType = MEAN, float sampling=2.f) 
+      : UnaryFunction1D<double>(iType), _fun(level){_sampling = sampling;}
+    /*! Returns the string "GetCompleteViewMapDensityF1D"*/
+    string getName() const {
+      return "GetCompleteViewMapDensityF1D";
+    }
+    /*! the () operator.*/
+    double operator()(Interface1D& inter);
+    
+  private:
+    Functions0D::ReadCompleteViewMapPixelF0D _fun;
+    float _sampling;
+  };
+
+  // GetDirectionalViewMapDensity
+  /*! Returns the density evaluated for an Interface1D in of the 
+   *  steerable viewmaps image.
+   *  The direction telling which Directional map to choose 
+   *  is explicitely specified by the user.
+   *  The density is evaluated for a set of points along
+   *  the Interface1D (using the ReadSteerableViewMapPixelF0D functor)
+   *  and then integrated into a single value using
+   *  a user-defined integration method.
+   */
+  class LIB_STROKE_EXPORT GetDirectionalViewMapDensityF1D : public UnaryFunction1D<double>
+  {
+  public:
+    /*! Builds the functor.
+     *  \param iOrientation
+     *    The number of the directional map 
+     *    we must work with.
+     *  \param level
+     *    The level of the pyramid from which 
+     *    the pixel must be read.
+     *  \param iType
+     *    The integration method used to compute
+     *    a single value from a set of values.
+     *  \param sampling
+     *    The resolution used to sample the chain: the corresponding 0D function
+     *    is evaluated at each sample point and the result is obtained by
+     *    combining the resulting values into a single one, following the
+     *    method specified by iType.
+     */
+    GetDirectionalViewMapDensityF1D(unsigned iOrientation, unsigned level, IntegrationType iType = MEAN, float sampling=2.f) 
+      : UnaryFunction1D<double>(iType), _fun(iOrientation,level){_sampling = sampling;}
+    /*! Returns the string "GetDirectionalViewMapDensityF1D"*/
+    string getName() const {
+      return "GetDirectionalViewMapDensityF1D";
+    }
+    /*! the () operator.*/
+    double operator()(Interface1D& inter);
+    
+  private:
+    Functions0D::ReadSteerableViewMapPixelF0D _fun;
+    float _sampling;
+  };
+
+  // GetSteerableViewMapDensityF1D
+  /*! Returns the density of the viewmap 
+   *  for a given Interface1D. The density of each 
+   *  FEdge is evaluated in the proper steerable 
+   *  ViewMap depending on its oorientation.
+   */
+  class LIB_STROKE_EXPORT GetSteerableViewMapDensityF1D : public UnaryFunction1D<real>
+  {
+  private:
+    int _level;
+    float _sampling;
+  public:
+    /*! Builds the functor from the level 
+     *  of the pyramid from which the pixel must be read.
+     *  \param level
+     *    The level of the pyramid from which 
+     *    the pixel must be read.
+     *  \param iType
+     *    The integration method used to compute
+     *    a single value from a set of values.
+     *  \param sampling
+     *    The resolution used to sample the chain: the corresponding 0D function
+     *    is evaluated at each sample point and the result is obtained by
+     *    combining the resulting values into a single one, following the
+     *    method specified by iType.
+     */
+    GetSteerableViewMapDensityF1D(int level,IntegrationType iType = MEAN, float sampling=2.f) : UnaryFunction1D<real>(iType) {
+      _level = level;
+      _sampling = sampling;
+    }
+    /*! Destructor */
+    virtual ~GetSteerableViewMapDensityF1D(){}
+
+    /*! Returns the string "GetSteerableViewMapDensityF1D"*/
+    string getName() const {
+      return "GetSteerableViewMapDensityF1D";
+    }
+    /*! the () operator.*/
+    real operator()(Interface1D& inter);
+  };
+
+  // GetViewMapGradientNormF1D
+  /*! Returns the density of the viewmap 
+   *  for a given Interface1D. The density of each 
+   *  FEdge is evaluated in the proper steerable 
+   *  ViewMap depending on its oorientation.
+   */
+  class LIB_STROKE_EXPORT GetViewMapGradientNormF1D : public UnaryFunction1D<real>
+  {
+  private:
+    int _level;
+    float _sampling;
+    Functions0D::GetViewMapGradientNormF0D _func;
+  public:
+    /*! Builds the functor from the level 
+     *  of the pyramid from which the pixel must be read.
+     *  \param level
+     *    The level of the pyramid from which 
+     *    the pixel must be read.
+     *  \param iType
+     *    The integration method used to compute
+     *    a single value from a set of values.
+     *  \param sampling
+     *    The resolution used to sample the chain: the corresponding 0D function
+     *    is evaluated at each sample point and the result is obtained by
+     *    combining the resulting values into a single one, following the
+     *    method specified by iType.
+     */
+    GetViewMapGradientNormF1D(int level,IntegrationType iType = MEAN, float sampling=2.f) 
+      : UnaryFunction1D<real>(iType), _func(level) {
+      _level = level;
+      _sampling = sampling;
+    }
+    
+    /*! Returns the string "GetSteerableViewMapDensityF1D"*/
+    string getName() const {
+      return "GetViewMapGradientNormF1D";
+    }
+    /*! the () operator.*/
+    real operator()(Interface1D& inter);
+  };
+} // end of namespace Functions1D
+
+#endif // ADVANCED_FUNCTIONS1D_HPP
diff --git a/extern/freestyle/src/stroke/AdvancedPredicates1D.h b/extern/freestyle/src/stroke/AdvancedPredicates1D.h
new file mode 100755
index 00000000000..f348f8593e5
--- /dev/null
+++ b/extern/freestyle/src/stroke/AdvancedPredicates1D.h
@@ -0,0 +1,81 @@
+//
+//  Filename         : AdvancedPredicates1D.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Class gathering stroke creation algorithms
+//  Date of creation : 01/07/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  ADVANCED_PREDICATES1D_H
+# define ADVANCED_PREDICATES1D_H
+
+# include <string>
+# include "../view_map/Interface1D.h"
+# include "AdvancedFunctions1D.h"
+# include "Predicates1D.h"
+
+//
+// Predicates definitions
+//
+///////////////////////////////////////////////////////////
+
+namespace Predicates1D {
+
+  // DensityLowerThanUP1D
+  /*! Returns true if the density evaluated for the
+   *  Interface1D is less than a user-defined density value.
+   */
+  class DensityLowerThanUP1D : public UnaryPredicate1D
+  {
+  public:
+    /*! Builds the functor.
+     *  \param threshold
+     *    The value of the threshold density.
+     *    Any Interface1D having a density lower than
+     *    this threshold will match.
+     *  \param sigma
+     *    The sigma value defining the density evaluation window size
+     *    used in the DensityF0D functor.
+     */
+    DensityLowerThanUP1D(double threshold, double sigma = 2) {
+      _threshold = threshold;
+      _sigma = sigma;
+    }
+    /*! Returns the string "DensityLowerThanUP1D"*/
+    string getName() const {
+      return "DensityLowerThanUP1D";
+    }
+    /*! The () operator. */
+    bool operator()(Interface1D& inter) {
+      Functions1D::DensityF1D fun(_sigma);
+      return (fun(inter) < _threshold);
+    }
+  private:
+    double _sigma;
+    double _threshold;
+  };
+
+} // end of namespace Predicates1D
+
+#endif // ADVANCED_PREDICATES1D_H
diff --git a/extern/freestyle/src/stroke/AdvancedStrokeShaders.cpp b/extern/freestyle/src/stroke/AdvancedStrokeShaders.cpp
new file mode 100755
index 00000000000..b1c5317c5f1
--- /dev/null
+++ b/extern/freestyle/src/stroke/AdvancedStrokeShaders.cpp
@@ -0,0 +1,423 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "../system/PseudoNoise.h"
+#include "../system/RandGen.h"
+#include "AdvancedStrokeShaders.h"
+#include "StrokeIterators.h"
+
+/////////////////////////////////////////
+//
+//  CALLIGRAPHICS SHADER
+//
+/////////////////////////////////////////
+
+
+CalligraphicShader::CalligraphicShader (real iMinThickness, real iMaxThickness,
+					const Vec2f &iOrientation, bool clamp)
+  : StrokeShader()
+{
+  _minThickness=iMinThickness;
+  _maxThickness=iMaxThickness;
+  _orientation = iOrientation;
+  _orientation.normalize();
+  _clamp = clamp;
+}
+
+float ksinToto=0;
+
+void 
+CalligraphicShader::shade(Stroke &ioStroke) const 
+{
+  Interface0DIterator v;
+  Functions0D::VertexOrientation2DF0D fun;
+  StrokeVertex* sv;
+  for(v=ioStroke.verticesBegin();
+      !v.isEnd();
+      ++v)
+    {
+      real thickness;
+      Vec2f vertexOri(fun(v));
+      Vec2r ori2d(-vertexOri[1], vertexOri[0]);
+      ori2d.normalizeSafe();
+      real scal = ori2d * _orientation;
+      sv = dynamic_cast<StrokeVertex*>(&(*v));
+      if (_clamp && (scal<0)) {
+	scal=0.0;
+	sv->attribute().setColor(1,1,1);
+      }
+      else {
+	scal=fabs(scal);
+	sv->attribute().setColor(0,0,0);
+      }
+      thickness=_minThickness+scal*(_maxThickness-_minThickness);
+      if (thickness<0.0)
+	thickness=0.0;
+      sv->attribute().setThickness(thickness/2.0,thickness/2.0);
+    }
+
+}
+
+//void 
+//TipRemoverShader::shade(Stroke &ioStroke) const 
+//{
+//  
+//  StrokeInternal::StrokeVertexIterator v, vend;
+//  for(v=ioStroke.strokeVerticesBegin(), vend=ioStroke.strokeVerticesEnd();
+//      v!=vend;
+//      ++v)
+//    {
+//      if (((*v)->curvilinearAbscissa()<_tipLength) ||
+//	  ((*v)->strokeLength()-(*v)->curvilinearAbscissa()<_tipLength))
+//      { 
+//	  (*v)->attribute().setThickness(0.0, 0.0);
+//	  (*v)->attribute().setColor(1,1,1);
+//      } 
+//    }
+//
+//}
+
+
+
+/////////////////////////////////////////
+//
+//  SPATIAL NOISE SHADER
+//
+/////////////////////////////////////////
+
+static const unsigned NB_VALUE_NOISE = 512;
+
+SpatialNoiseShader::SpatialNoiseShader (float ioamount, float ixScale, int nbOctave, 
+					bool smooth, bool pureRandom)
+  : StrokeShader()
+{
+  _amount = ioamount;
+  if (ixScale==0) _xScale=0;
+  else _xScale=1.0/ixScale/real(NB_VALUE_NOISE);
+  _nbOctave=nbOctave;
+  _smooth=smooth;
+  _pureRandom=pureRandom;
+}
+void
+SpatialNoiseShader::shade(Stroke &ioStroke) const 
+{
+  Interface0DIterator v, v2;
+  v=ioStroke.verticesBegin();
+  Vec2r p(v->getProjectedX(), v->getProjectedY());
+  v2=v; ++v2;
+  Vec2r p0(v2->getProjectedX(), v2->getProjectedY());
+  p0=p+2*(p-p0);
+  StrokeVertex* sv;
+  sv = dynamic_cast<StrokeVertex*>(&(*v));
+  real initU = sv->strokeLength()*real(NB_VALUE_NOISE);
+  if (_pureRandom) initU+=RandGen::drand48()*real(NB_VALUE_NOISE);
+
+  Functions0D::VertexOrientation2DF0D fun;
+  while (!v.isEnd())
+    {
+      sv = dynamic_cast<StrokeVertex*>(&(*v));
+      Vec2r p(sv->getPoint());
+      Vec2r vertexOri(fun(v));
+      Vec2r ori2d(vertexOri[0], vertexOri[1]);
+      ori2d = Vec2r(p-p0);
+      ori2d.normalizeSafe();
+
+      PseudoNoise mynoise;
+      real bruit;
+
+      if (_smooth)
+	bruit=mynoise.turbulenceSmooth(_xScale*sv->curvilinearAbscissa()+initU,
+				       _nbOctave);
+      else
+	bruit=mynoise.turbulenceLinear(_xScale*sv->curvilinearAbscissa()+initU,
+				       _nbOctave);
+      
+      Vec2r noise(-ori2d[1]*_amount*bruit,
+		  ori2d[0]*_amount*bruit);
+
+      sv->SetPoint(p[0]+noise[0], p[1]+noise[1]);
+      p0=p;
+
+      ++v;
+    }
+
+}
+
+
+ 
+/////////////////////////////////////////
+//
+//  SMOOTHING SHADER
+//
+/////////////////////////////////////////
+
+
+SmoothingShader::SmoothingShader (int ionbIteration, real iFactorPoint, real ifactorCurvature, real iFactorCurvatureDifference,
+				  real iAnisoPoint, real iAnisoNormal, real iAnisoCurvature, real iCarricatureFactor) 
+  : StrokeShader()
+{
+  _nbIterations=ionbIteration;
+  _factorCurvature=ifactorCurvature;
+  _factorCurvatureDifference=iFactorCurvatureDifference;
+  _anisoNormal=iAnisoNormal;
+  _anisoCurvature=iAnisoCurvature;
+  _carricatureFactor=iCarricatureFactor;
+  _factorPoint=iFactorPoint;
+  _anisoPoint=iAnisoPoint;
+}
+
+
+
+void
+SmoothingShader::shade(Stroke &ioStroke) const 
+{
+  //cerr<<" Smoothing a stroke  "<<endl;
+
+  Smoother smoother(ioStroke);
+  smoother.smooth(_nbIterations, _factorPoint, _factorCurvature, _factorCurvatureDifference, 
+		  _anisoPoint, _anisoNormal, _anisoCurvature, _carricatureFactor);
+}
+
+// SMOOTHER
+////////////////////////////
+
+Smoother::Smoother(Stroke &ioStroke)
+{
+  _stroke=&ioStroke;
+
+  _nbVertices=ioStroke.vertices_size();
+  _vertex=new Vec2r[_nbVertices];
+  _curvature=new real[_nbVertices];
+  _normal=new Vec2r[_nbVertices];
+  StrokeInternal::StrokeVertexIterator v, vend;
+  int i=0;
+  for(v = ioStroke.strokeVerticesBegin(), vend = ioStroke.strokeVerticesEnd();
+      v != vend;
+      ++v)
+    {
+      _vertex[i]=(v)->getPoint();	
+      i++;
+    }
+  Vec2r vec_tmp(_vertex[0]-_vertex[_nbVertices-1]);
+  _isClosedCurve = (vec_tmp.norm() < M_EPSILON);
+
+  _safeTest=(_nbVertices>4);
+}
+
+void Smoother::smooth(int nbIteration, real iFactorPoint, real ifactorCurvature, real iFactorCurvatureDifference,
+		      real iAnisoPoint, real iAnisoNormal, real iAnisoCurvature, real iCarricatureFactor)
+{
+  _factorCurvature=ifactorCurvature;
+  _factorCurvatureDifference=iFactorCurvatureDifference;
+  _anisoNormal=iAnisoNormal;
+  _anisoCurvature=iAnisoCurvature;
+  _carricatureFactor=iCarricatureFactor;
+  _factorPoint=iFactorPoint;
+  _anisoPoint=iAnisoPoint;
+
+  for (int i=0; i<nbIteration; i++)
+    iteration ();
+  copyVertices(); 
+}
+
+real edgeStopping (real x, real sigma)
+{
+  if (sigma==0.0) return 1.0;
+  return exp(-x*x/(sigma*sigma));
+}
+
+void 
+Smoother::iteration ()
+{
+  computeCurvature();
+  for (int i=1; i<_nbVertices-1; i++)
+    {
+      real motionNormal=_factorCurvature*_curvature[i]*
+	edgeStopping(_curvature[i], _anisoNormal);
+
+      real diffC1=_curvature[i]-_curvature[i-1];
+      real diffC2=_curvature[i]-_curvature[i+1];
+      real motionCurvature=edgeStopping(diffC1, _anisoCurvature)*diffC1 +
+	edgeStopping(diffC2, _anisoCurvature)*diffC2;//_factorCurvatureDifference;
+      motionCurvature*=_factorCurvatureDifference;
+      //motionCurvature=_factorCurvatureDifference*(diffC1+diffC2);
+      if (_safeTest)
+	_vertex[i]=Vec2r(_vertex[i]+(motionNormal+motionCurvature)*_normal[i]);
+      Vec2r v1(_vertex[i-1]-_vertex[i]);
+      Vec2r v2(_vertex[i+1]-_vertex[i]);
+      real d1 = v1.norm();
+      real d2 = v2.norm();
+      _vertex[i]=Vec2r(_vertex[i]+ 
+		       _factorPoint*edgeStopping(d2, _anisoPoint)*(_vertex[i-1]-_vertex[i]) +
+		       _factorPoint*edgeStopping(d1, _anisoPoint)*(_vertex[i+1]-_vertex[i]) );
+    }
+
+  if (_isClosedCurve)
+    {
+      real motionNormal=_factorCurvature*_curvature[0]*
+	edgeStopping(_curvature[0], _anisoNormal);
+
+      real diffC1=_curvature[0]-_curvature[_nbVertices-2];
+      real diffC2=_curvature[0]-_curvature[1];
+      real motionCurvature=edgeStopping(diffC1, _anisoCurvature)*diffC1 +
+	edgeStopping(diffC2, _anisoCurvature)*diffC2;//_factorCurvatureDifference;
+      motionCurvature*=_factorCurvatureDifference;
+      //motionCurvature=_factorCurvatureDifference*(diffC1+diffC2);
+      _vertex[0]=Vec2r(_vertex[0]+(motionNormal+motionCurvature)*_normal[0]);
+      _vertex[_nbVertices-1]=_vertex[0];
+    }
+}
+
+
+void 
+Smoother::computeCurvature ()
+{
+  int i;
+  Vec2r BA, BC, normalCurvature;
+  for (i = 1; i < _nbVertices - 1; i++)
+    {
+      BA=_vertex[i-1]-_vertex[i];
+      BC=_vertex[i+1]-_vertex[i];
+      real lba=BA.norm(), lbc=BC.norm();
+      BA.normalizeSafe();
+      BC.normalizeSafe();
+      normalCurvature = BA + BC;
+
+      _normal[i]=Vec2r(-(BC-BA)[1], (BC-BA)[0]);
+      _normal[i].normalizeSafe();
+
+      _curvature[i] = normalCurvature * _normal[i];
+      if (lba+lbc > M_EPSILON)
+	_curvature[i]/=(0.5*lba+lbc);
+    }
+  _curvature[0]=_curvature[1];
+  _curvature[_nbVertices-1]=_curvature[_nbVertices-2];
+  Vec2r di(_vertex[1]-_vertex[0]); 
+  _normal[0] = Vec2r(-di[1], di[0]);
+  _normal[0].normalizeSafe();
+  di=_vertex[_nbVertices-1]-_vertex[_nbVertices-2];
+  _normal[_nbVertices-1]=Vec2r(-di[1], di[0]);
+  _normal[_nbVertices-1].normalizeSafe();
+
+  if (_isClosedCurve)
+    {
+      BA=_vertex[_nbVertices-2]-_vertex[0];
+      BC=_vertex[1]-_vertex[0];
+      real lba=BA.norm(), lbc=BC.norm();
+      BA.normalizeSafe();
+      BC.normalizeSafe();
+      normalCurvature = BA + BC;
+
+      _normal[i]=Vec2r(-(BC-BA)[1], (BC-BA)[0]);
+      _normal[i].normalizeSafe();
+
+      _curvature[i] = normalCurvature * _normal[i];
+      if (lba+lbc > M_EPSILON)
+	_curvature[i]/=(0.5*lba+lbc);
+
+      _normal[_nbVertices-1]=_normal[0];
+      _curvature[_nbVertices-1]=_curvature[0];
+    }
+}
+
+void 
+Smoother::copyVertices ()
+{
+  int i=0;
+  StrokeInternal::StrokeVertexIterator v, vend;
+  for(v=_stroke->strokeVerticesBegin(), vend=_stroke->strokeVerticesEnd();
+      v!=vend;
+      ++v)
+    {
+      const Vec2r p0((v)->getPoint());
+      const Vec2r p1(_vertex[i]);
+      Vec2r p(p0 + _carricatureFactor * (p1 - p0));
+
+      (v)->SetPoint(p[0], p[1]);
+      i++;
+    }
+
+}
+
+ 
+/////////////////////////////////////////
+//
+//  OMISSION SHADER
+//
+/////////////////////////////////////////
+
+OmissionShader::OmissionShader (real sizeWindow, real thrVari, real thrFlat, real lFlat)
+{
+  _sizeWindow=sizeWindow;
+  _thresholdVariation=thrVari;
+  _thresholdFlat=thrFlat;
+  _lengthFlat=lFlat;
+}
+
+void
+OmissionShader::shade(Stroke &ioStroke) const 
+{
+  Omitter omi(ioStroke);
+  omi.omit(_sizeWindow, _thresholdVariation, _thresholdFlat, _lengthFlat);
+
+}
+
+
+// OMITTER
+///////////////////////////
+
+Omitter::Omitter (Stroke &ioStroke)
+  :Smoother (ioStroke)
+{
+  StrokeInternal::StrokeVertexIterator v, vend;
+  int i=0;
+  for(v=ioStroke.strokeVerticesBegin(), vend=ioStroke.strokeVerticesEnd();
+      v!=vend;
+      ++v)
+    {
+      _u[i]=(v)->curvilinearAbscissa();
+      i++;
+    }
+
+}
+
+void
+Omitter::omit (real sizeWindow, real thrVari, real thrFlat, real lFlat)
+{
+  _sizeWindow=sizeWindow;
+  _thresholdVariation=thrVari;
+  _thresholdFlat=thrFlat;
+  _lengthFlat=lFlat;
+
+  for (int i=1; i<_nbVertices-1; i++)
+    {
+      if (_u[i]<_lengthFlat) continue;
+      // is the previous segment flat?
+      int j=i-1; 
+      while ((j>=0) && (_u[i]-_u[j]<_lengthFlat))
+	{
+	  if ((_normal[j] * _normal[i]) < _thresholdFlat)
+	    ; // FIXME
+	  j--;
+	}
+
+    }
+}
diff --git a/extern/freestyle/src/stroke/AdvancedStrokeShaders.h b/extern/freestyle/src/stroke/AdvancedStrokeShaders.h
new file mode 100755
index 00000000000..b624ccd3e6b
--- /dev/null
+++ b/extern/freestyle/src/stroke/AdvancedStrokeShaders.h
@@ -0,0 +1,222 @@
+//
+//  Filename         : AdvancedStrokeShaders.h
+//  Author           : Fredo Durand
+//  Purpose          : Fredo's stroke shaders
+//  Date of creation : 17/12/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  ADVANCEDSTROKESHADERS_H
+# define ADVANCEDSTROKESHADERS_H
+
+# include "BasicStrokeShaders.h"
+
+/*! [ Thickness Shader ].
+ *  Assigns thicknesses to the stroke vertices
+ *  so that the stroke looks like made with a calligraphic tool.
+ *  i.e. The stroke will be the thickest in a main direction,
+ *  the thinest in the direction perpendicular to this one,
+ *  and an interpolation inbetween.
+ */
+class LIB_STROKE_EXPORT CalligraphicShader : public StrokeShader 
+{
+	
+public:
+  /*! Builds the shader.
+   *  \param iMinThickness
+   *    The minimum thickness in the direction perpandicular
+   *    to the main direction.
+   *  \param iMaxThickness
+   *    The maximum thickness in the main direction.
+   *  \param iOrientation
+   *    The 2D vector giving the main direction.
+   *  \param clamp
+   *    Tells ???
+   */
+  CalligraphicShader (real iMinThickness, real iMaxThickness,
+		      const Vec2f &iOrientation, bool clamp);
+  /*! Destructor. */
+  virtual ~CalligraphicShader () {}
+  /*! The shading method */
+  virtual void shade(Stroke &ioStroke) const;
+protected:
+  real _maxThickness;
+  real _minThickness;
+  Vec2f _orientation; 
+  bool _clamp;
+};
+
+/*! [ Geometry Shader ].
+ *  Spatial Noise stroke shader.
+ *  Moves the vertices to make the stroke more noisy.
+ *  @see \htmlonly <a href=noise/noise.html>noise/noise.html</a> \endhtmlonly
+ */
+class LIB_STROKE_EXPORT SpatialNoiseShader : public StrokeShader 
+{
+public:
+  /*! Builds the shader.
+   *  \param iAmount
+   *    The amplitude of the noise.
+   *  \param ixScale
+   *    The noise frequency
+   *  \param nbOctave
+   *    The number of octaves
+   *  \param smooth
+   *    If you want the noise to be smooth
+   *  \param pureRandom
+   *    If you don't want any coherence
+   */
+  SpatialNoiseShader (float iAmount, float ixScale, int nbOctave, bool smooth, bool pureRandom);
+  /*! Destructor. */
+  virtual ~SpatialNoiseShader () {}
+  /*! The shading method. */
+  virtual void shade(Stroke &ioStroke) const;
+
+protected:
+
+  float _amount;
+  float _xScale;
+  int _nbOctave;
+  bool _smooth;
+  bool _pureRandom;
+};
+
+/*! [ Geometry Shader ].
+ *  Smoothes the stroke.
+ *  (Moves the vertices to make the stroke smoother).
+ *  Uses curvature flow to converge towards a curve of constant
+ *  curvature. The diffusion method we use is anisotropic
+ *  to prevent the diffusion accross corners.
+ *  @see \htmlonly <a href=/smoothing/smoothing.html>smoothing/smoothing.html</a> endhtmlonly
+ */
+class LIB_STROKE_EXPORT SmoothingShader : public StrokeShader 
+{
+public:
+  /*! Builds the shader.
+   *  \param iNbIteration
+   *    The number of iterations. (400)
+   *  \param iFactorPoint
+   *    0
+   *  \param ifactorCurvature
+   *    0
+   *  \param iFactorCurvatureDifference
+   *    0.2
+   *  \param iAnisoPoint
+   *    0
+   *  \param iAnisNormal
+   *    0
+   *  \param iAnisoCurvature
+   *    0
+   *  \param icarricatureFactor
+   *    1
+   */
+  SmoothingShader (int iNbIteration, real iFactorPoint, real ifactorCurvature, real iFactorCurvatureDifference,
+		   real iAnisoPoint, real iAnisoNormal, real iAnisoCurvature, real icarricatureFactor);
+  /*! Destructor. */
+  virtual ~SmoothingShader () {}
+
+  /*! The shading method. */
+  virtual void shade(Stroke &ioStroke) const;
+
+protected:
+
+  int _nbIterations;
+  real _factorPoint;
+  real _factorCurvature;
+  real _factorCurvatureDifference;
+  real _anisoPoint;
+  real _anisoNormal;
+  real _anisoCurvature;
+  real _carricatureFactor;
+};
+
+class LIB_STROKE_EXPORT Smoother
+{
+public:
+  Smoother (Stroke &ioStroke);
+	
+  virtual ~Smoother () {}
+
+  void smooth (int nbIterations, real iFactorPoint, real ifactorCurvature, real iFactorCurvatureDifference,
+	       real iAnisoPoint, real iAnisoNormal, real iAnisoCurvature, real icarricatureFactor);
+  void computeCurvature ();
+
+protected:
+  real _factorPoint;
+  real _factorCurvature;
+  real _factorCurvatureDifference;
+  real _anisoPoint;
+  real _anisoNormal;
+  real _anisoCurvature;
+  real _carricatureFactor;
+
+  void iteration();
+  void copyVertices ();
+
+  Stroke *_stroke;
+  int _nbVertices;
+  Vec2r *_vertex;
+  Vec2r *_normal;
+  real *_curvature;
+  bool *_isFixedVertex;
+
+  bool _isClosedCurve;
+  bool _safeTest;
+};
+
+class LIB_STROKE_EXPORT Omitter : public Smoother 
+{
+public:
+  Omitter (Stroke &ioStroke);
+  virtual ~Omitter () {}
+
+  void omit (real sizeWindow, real thrVari, real thrFlat, real lFlat);
+protected:
+  real *_u;
+
+  real _sizeWindow;
+  real _thresholdVariation;
+  real _thresholdFlat;
+  real _lengthFlat;
+};
+
+/*! Omission shader 
+ */
+class LIB_STROKE_EXPORT OmissionShader : public StrokeShader 
+{
+public:
+  OmissionShader (real sizeWindow, real thrVari, real thrFlat, real lFlat);
+  virtual ~OmissionShader () {}
+
+  virtual void shade(Stroke &ioStroke) const;
+
+protected:
+
+  real _sizeWindow;
+  real _thresholdVariation;
+  real _thresholdFlat;
+  real _lengthFlat;
+};
+
+#endif // ADVANCEDSTROKESHADERS_H
diff --git a/extern/freestyle/src/stroke/BasicStrokeShaders.cpp b/extern/freestyle/src/stroke/BasicStrokeShaders.cpp
new file mode 100755
index 00000000000..c3827ae3e36
--- /dev/null
+++ b/extern/freestyle/src/stroke/BasicStrokeShaders.cpp
@@ -0,0 +1,1100 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include <fstream>
+#include <qimage.h>
+#include "BasicStrokeShaders.h"
+#include "../system/PseudoNoise.h"
+#include "../system/RandGen.h"
+#include "../view_map/Functions0D.h"
+#include "../view_map/Functions1D.h"
+#include "AdvancedFunctions0D.h"
+#include "AdvancedFunctions1D.h"
+#include "StrokeIterators.h"
+#include "../system/StringUtils.h"
+#include "StrokeRenderer.h"
+#include "StrokeIO.h"
+#include <QString>
+
+// Internal function
+void convert(const QImage& iImage, float **oArray, unsigned &oSize) {
+  oSize = iImage.width();
+  *oArray = new float[oSize];
+  for(unsigned i=0; i<oSize; ++i) {
+    QRgb rgb = iImage.pixel(i,0);
+    (*oArray)[i] = ((float)qBlue(rgb))/255.f;
+  }
+}
+
+namespace StrokeShaders {
+
+  //
+  //  Thickness modifiers
+  //
+  //////////////////////////////////////////////////////////
+
+  void ConstantThicknessShader::shade(Stroke& stroke) const
+  {
+    StrokeInternal::StrokeVertexIterator v, vend;
+    int i=0;
+    int size = stroke.strokeVerticesSize();
+    for(v=stroke.strokeVerticesBegin(), vend=stroke.strokeVerticesEnd();
+	v!=vend;
+	++v)
+      {
+	if((1 == i) || (size-2 == i))
+	  v->attribute().setThickness(_thickness/4.0,_thickness/4.0);
+	if((0 == i) || (size-1 == i))
+	  v->attribute().setThickness(0,0);
+      
+	v->attribute().setThickness(_thickness/2.0, _thickness/2.0);
+      }
+  } 
+
+  void ConstantExternThicknessShader::shade(Stroke& stroke) const
+  {
+    StrokeInternal::StrokeVertexIterator v, vend;
+    int i=0;
+    int size = stroke.strokeVerticesSize();
+    for(v=stroke.strokeVerticesBegin(), vend=stroke.strokeVerticesEnd();
+	v!=vend;
+	++v)
+      {
+	if((1 == i) || (size-2 == i))
+	  v->attribute().setThickness(_thickness/2.0,0);
+	if((0 == i) || (size-1 == i))
+	  v->attribute().setThickness(0,0);
+      
+	v->attribute().setThickness(_thickness, 0);
+      }
+  } 
+
+  void IncreasingThicknessShader::shade(Stroke& stroke) const
+  {
+
+    int n=stroke.strokeVerticesSize()-1;
+    StrokeInternal::StrokeVertexIterator v, vend;
+    int i=0;
+    for(v=stroke.strokeVerticesBegin(), vend=stroke.strokeVerticesEnd();
+	v!=vend;
+ 
+	++v)
+      {
+	float t;
+	if(i < (float)n/2.f)
+	  t = (1.0-(float)i/(float)n)*_ThicknessMin + (float)i/(float)n*_ThicknessMax;
+	else
+	  t = (1.0-(float)i/(float)n)*_ThicknessMax + (float)i/(float)n*_ThicknessMin;
+	v->attribute().setThickness(t/2.0, t/2.0);
+	++i;
+      }
+  } 
+
+  void ConstrainedIncreasingThicknessShader::shade(Stroke& stroke) const
+  {
+    float slength = stroke.getLength2D();
+    float maxT = min(_ratio*slength,_ThicknessMax);
+    int n=stroke.strokeVerticesSize()-1;
+    StrokeInternal::StrokeVertexIterator v, vend;
+    int i=0;
+    for(v=stroke.strokeVerticesBegin(), vend=stroke.strokeVerticesEnd();
+	v!=vend;
+ 
+	++v)
+      {
+	float t;
+	if(i < (float)n/2.f)
+	  t = (1.0-(float)i/(float)n)*_ThicknessMin + (float)i/(float)n*maxT;
+	else
+	  t = (1.0-(float)i/(float)n)*maxT + (float)i/(float)n*_ThicknessMin;
+	v->attribute().setThickness(t/2.0, t/2.0);
+	if(i == n-1)
+	  v->attribute().setThickness(_ThicknessMin/2.0, _ThicknessMin/2.0);
+	++i;
+      }
+  } 
+
+
+  void LengthDependingThicknessShader::shade(Stroke& stroke) const
+  {
+    float step = (_maxThickness-_minThickness)/3.f;
+    float l = stroke.getLength2D();
+    float thickness;
+    if(l>300.f)
+      thickness = _minThickness+3.f*step;
+    else if((l< 300.f) && (l>100.f))
+      thickness = _minThickness+2.f*step;
+    else if((l<100.f) && (l>50.f))
+      thickness = _minThickness+1.f*step;
+    else if(l< 50.f)
+      thickness = _minThickness;
+
+    StrokeInternal::StrokeVertexIterator v, vend;
+    int i=0;
+    int size = stroke.strokeVerticesSize();
+    for(v=stroke.strokeVerticesBegin(), vend=stroke.strokeVerticesEnd();
+	v!=vend;
+	++v)
+      {
+	if((1 == i) || (size-2 == i))
+	  v->attribute().setThickness(thickness/4.0,thickness/4.0);
+	if((0 == i) || (size-1 == i))
+	  v->attribute().setThickness(0,0);
+      
+	v->attribute().setThickness(thickness/2.0, thickness/2.0);
+      }
+  }
+
+
+  ThicknessVariationPatternShader::ThicknessVariationPatternShader(const string pattern_name,
+									float iMinThickness,
+									float iMaxThickness,
+									bool stretch)
+    : StrokeShader() {
+    _stretch = stretch;
+    _minThickness = iMinThickness;
+    _maxThickness = iMaxThickness;
+    QImage image;
+    vector<string> pathnames;
+    StringUtils::getPathName(TextureManager::Options::getPatternsPath(),
+			     pattern_name,
+			     pathnames);
+    for (vector<string>::const_iterator j = pathnames.begin(); j != pathnames.end(); j++) {
+      ifstream ifs(j->c_str());
+      if (ifs.is_open()) {
+	image.load(j->c_str());
+	break;
+      }
+    }
+    if (image.isNull())
+      cerr << "Error: cannot find pattern \"" << pattern_name
+	   << "\" - check the path in the Options" << endl;
+    else
+      convert(image, &_aThickness, _size);
+  }
+  
+  void ThicknessVariationPatternShader::shade(Stroke& stroke) const
+  { 
+    StrokeInternal::StrokeVertexIterator v, vend;
+    float *array = 0;
+    int size;
+    array = _aThickness;
+    size = _size;
+    // }
+    int vert_size = stroke.strokeVerticesSize();
+    int sig = 0;
+    unsigned index;
+    const float* originalThickness;
+    for(v=stroke.strokeVerticesBegin(), vend=stroke.strokeVerticesEnd();
+	v!=vend;
+	++v)
+      {
+	originalThickness = v->attribute().getThickness();
+	if (_stretch) {
+	float tmp = v->u()*(_size-1);
+	index = (unsigned)floor(tmp);
+	  if((tmp-index) > (index+1-tmp))
+	    ++index;
+	}
+	else
+	  index = (unsigned)floor(v->curvilinearAbscissa());
+	index %= _size;
+	float thicknessR = array[index]*originalThickness[0];
+	float thicknessL = array[index]*originalThickness[1];
+	if(thicknessR+thicknessL < _minThickness)
+	  {
+	    thicknessL = _minThickness/2.f;
+	    thicknessR = _minThickness/2.f;
+	  }
+	if(thicknessR+thicknessL > _maxThickness)
+	  {
+	    thicknessL = _maxThickness/2.f;
+	    thicknessR = _maxThickness/2.f;
+	  }
+	if((sig==0) || (sig==vert_size-1))
+	  v->attribute().setThickness(1, 1);
+	else
+	  v->attribute().setThickness(thicknessR, thicknessL);
+	++sig;
+      }
+  } 
+
+
+  static const unsigned NB_VALUE_NOISE = 512;
+  ThicknessNoiseShader::ThicknessNoiseShader()
+    :StrokeShader()
+  {_amplitude=1.f;_scale=1.f/2.f/(float)NB_VALUE_NOISE;}
+
+  ThicknessNoiseShader::ThicknessNoiseShader(float iAmplitude, float iPeriod)
+    :StrokeShader()
+  {_amplitude=iAmplitude;_scale=1.f/iPeriod/(float)NB_VALUE_NOISE;}
+
+
+  void ThicknessNoiseShader::shade(Stroke& stroke) const
+  {  
+    StrokeInternal::StrokeVertexIterator v=stroke.strokeVerticesBegin(), vend=stroke.strokeVerticesEnd();
+    real initU1=v->strokeLength()*real(NB_VALUE_NOISE)+RandGen::drand48()*real(NB_VALUE_NOISE);
+    real initU2=v->strokeLength()*real(NB_VALUE_NOISE)+RandGen::drand48()*real(NB_VALUE_NOISE);
+  
+    real bruit, bruit2;
+    PseudoNoise mynoise, mynoise2;
+    for(;
+	v!=vend;
+	++v)
+      {
+     
+	bruit=mynoise.turbulenceSmooth(_scale*v->curvilinearAbscissa()+initU1,
+				       2); //2 : nbOctaves
+	bruit2=mynoise2.turbulenceSmooth(_scale*v->curvilinearAbscissa()+initU2,
+					 2); //2 : nbOctaves
+	const float *originalThickness = v->attribute().getThickness();
+	float r = bruit*_amplitude+originalThickness[0];
+	float l = bruit2*_amplitude+originalThickness[1];
+	v->attribute().setThickness(r,l);
+      }
+  
+  }
+
+  //
+  //  Color shaders
+  //
+  ///////////////////////////////////////////////////////////////////////////////
+
+  void ConstantColorShader::shade(Stroke& stroke) const
+  {
+    StrokeInternal::StrokeVertexIterator v, vend;
+    for(v=stroke.strokeVerticesBegin(), vend=stroke.strokeVerticesEnd();
+	v!=vend;
+	++v)
+      {
+	v->attribute().setColor(_color[0], _color[1], _color[2]);
+	v->attribute().setAlpha(_color[3]);
+      }
+  }
+
+  void IncreasingColorShader::shade(Stroke& stroke) const
+  {
+    StrokeInternal::StrokeVertexIterator v, vend;
+    int n=stroke.strokeVerticesSize()-1;
+    int yo=0;
+    float newcolor[4];
+    for(v=stroke.strokeVerticesBegin(), vend=stroke.strokeVerticesEnd();
+	v!=vend;
+  
+	++v)
+      {
+	for(int i=0; i<4; ++i) 
+	  {
+	    newcolor[i] = (1.0-(float)yo/(float)n)*_colorMin[i] + (float)yo/(float)n*_colorMax[i];
+	  }
+	v->attribute().setColor(newcolor[0], newcolor[1], newcolor[2]);
+	v->attribute().setAlpha(newcolor[3]);
+	++yo;
+      }
+  }
+
+  ColorVariationPatternShader::ColorVariationPatternShader(const string pattern_name,
+							   bool stretch)
+    : StrokeShader() {
+    _stretch = stretch;
+    QImage image;
+    vector<string> pathnames;
+    StringUtils::getPathName(TextureManager::Options::getPatternsPath(),
+			     pattern_name,
+			     pathnames);
+    for (vector<string>::const_iterator j = pathnames.begin(); j != pathnames.end(); j++) {
+      ifstream ifs(j->c_str());
+      if (ifs.is_open()) {
+	image.load(j->c_str());
+	break;
+      }
+    }
+    if (image.isNull())
+      cerr << "Error: cannot find pattern \"" << pattern_name
+	   << "\" - check the path in the Options" << endl;
+    else
+      convert(image, &_aVariation, _size);
+  }
+  
+  void ColorVariationPatternShader::shade(Stroke& stroke) const
+  {
+    StrokeInternal::StrokeVertexIterator v, vend;
+    unsigned index;
+    for(v=stroke.strokeVerticesBegin(), vend=stroke.strokeVerticesEnd();
+	v!=vend;
+	++v)
+      {
+	const float *originalColor = v->attribute().getColor();
+	if (_stretch) {
+	  float tmp = v->u()*(_size-1);
+	  index = (unsigned)floor(tmp);
+	  if((tmp-index) > (index+1-tmp))
+	    ++index;
+	}
+	else
+	  index = (unsigned)floor(v->curvilinearAbscissa());
+	index %= _size;
+	float r = _aVariation[index]*originalColor[0];
+	float g = _aVariation[index]*originalColor[1];
+	float b = _aVariation[index]*originalColor[2];
+	v->attribute().setColor(r,g,b);
+      }
+  }
+
+  void MaterialColorShader::shade(Stroke& stroke) const
+  {
+    Interface0DIterator v, vend;
+    Functions0D::MaterialF0D fun;
+    StrokeVertex *sv;
+    for(v=stroke.verticesBegin(), vend=stroke.verticesEnd();
+	v!=vend;
+	++v)
+      {
+    const float *diffuse = fun(v).diffuse();
+    sv = dynamic_cast<StrokeVertex*>(&(*v));
+	  sv->attribute().setColor(diffuse[0]*_coefficient, diffuse[1]*_coefficient, diffuse[2]*_coefficient);
+	  sv->attribute().setAlpha(diffuse[3]);
+      }
+  }
+
+
+  void CalligraphicColorShader::shade(Stroke& stroke) const
+  {
+    Interface0DIterator v;
+    Functions0D::VertexOrientation2DF0D fun;
+    StrokeVertex* sv;
+    for(v=stroke.verticesBegin();
+	!v.isEnd();
+	++v)
+      {
+	Vec2f vertexOri(fun(v));
+	Vec2d ori2d(-vertexOri[1], vertexOri[0]);
+	ori2d.normalizeSafe();
+	real scal = ori2d * _orientation;
+	sv = dynamic_cast<StrokeVertex*>(&(*v));
+	if ((scal<0)) 
+	  sv->attribute().setColor(0,0,0);
+	else
+	  sv->attribute().setColor(1,1,1);
+      }
+  }
+
+
+  ColorNoiseShader::ColorNoiseShader()
+    :StrokeShader()
+  {_amplitude=1.f;_scale=1.f/2.f/(float)NB_VALUE_NOISE;}
+
+  ColorNoiseShader::ColorNoiseShader(float iAmplitude, float iPeriod)
+    :StrokeShader()
+  {_amplitude=iAmplitude;_scale=1.f/iPeriod/(float)NB_VALUE_NOISE;}
+
+
+  void ColorNoiseShader::shade(Stroke& stroke) const
+  {  
+    StrokeInternal::StrokeVertexIterator v=stroke.strokeVerticesBegin(), vend=stroke.strokeVerticesEnd();
+    real initU=v->strokeLength()*real(NB_VALUE_NOISE)+RandGen::drand48()*real(NB_VALUE_NOISE);
+  
+    real bruit;
+    PseudoNoise mynoise;
+    for(;
+	v!=vend;
+	++v)
+      {
+     
+	bruit=mynoise.turbulenceSmooth(_scale*v->curvilinearAbscissa()+initU,
+				       2); //2 : nbOctaves
+	const float *originalColor = v->attribute().getColor();
+	float r = bruit*_amplitude+originalColor[0];
+	float g = bruit*_amplitude+originalColor[1];
+	float b = bruit*_amplitude+originalColor[2];
+	v->attribute().setColor(r,g,b);
+      }
+  
+  }
+
+ 
+  //
+  //  Texture Shaders
+  //
+  ///////////////////////////////////////////////////////////////////////////////
+
+  void TextureAssignerShader::shade(Stroke& stroke) const
+  {
+  //  getBrushTextureIndex(TEXTURES_DIR "/brushes/charcoalAlpha.bmp", Stroke::HUMID_MEDIUM);
+  //  getBrushTextureIndex(TEXTURES_DIR "/brushes/washbrushAlpha.bmp", Stroke::HUMID_MEDIUM);
+  //  getBrushTextureIndex(TEXTURES_DIR "/brushes/oil.bmp", Stroke::HUMID_MEDIUM);
+  //  getBrushTextureIndex(TEXTURES_DIR "/brushes/oilnoblend.bmp", Stroke::HUMID_MEDIUM);
+  //  getBrushTextureIndex(TEXTURES_DIR "/brushes/charcoalAlpha.bmp", Stroke::DRY_MEDIUM);
+  //  getBrushTextureIndex(TEXTURES_DIR "/brushes/washbrushAlpha.bmp", Stroke::DRY_MEDIUM);
+  //  getBrushTextureIndex(TEXTURES_DIR "/brushes/opaqueDryBrushAlpha.bmp", Stroke::OPAQUE_MEDIUM);
+  //  getBrushTextureIndex(TEXTURES_DIR "/brushes/opaqueBrushAlpha.bmp", Stroke::OPAQUE_MEDIUM);
+
+    TextureManager * instance = TextureManager::getInstance();
+    if(!instance)
+      return;
+    string pathname;
+    Stroke::MediumType mediumType;
+    bool hasTips = false;
+    switch(_textureId)
+    {
+    case 0:
+      //pathname = TextureManager::Options::getBrushesPath() + "/charcoalAlpha.bmp";
+			pathname = "/charcoalAlpha.bmp";
+      mediumType = Stroke::HUMID_MEDIUM;
+      hasTips = false;
+      break;
+    case 1:
+      pathname = "/washbrushAlpha.bmp";
+      mediumType = Stroke::HUMID_MEDIUM;
+      hasTips = true;
+      break;
+    case 2:
+      pathname = "/oil.bmp";
+      mediumType = Stroke::HUMID_MEDIUM;
+      hasTips = true;
+      break;
+    case 3:
+      pathname = "/oilnoblend.bmp";
+      mediumType = Stroke::HUMID_MEDIUM;
+      hasTips = true;
+      break;
+    case 4:
+      pathname = "/charcoalAlpha.bmp";
+      mediumType = Stroke::DRY_MEDIUM;
+      hasTips = false;
+      break;
+    case 5:
+      mediumType = Stroke::DRY_MEDIUM;
+      hasTips = true;
+      break;
+    case 6:
+      pathname = "/opaqueDryBrushAlpha.bmp";
+      mediumType = Stroke::OPAQUE_MEDIUM;
+      hasTips = true;
+      break;
+    case 7:
+      pathname = "/opaqueBrushAlpha.bmp";
+      mediumType = Stroke::OPAQUE_MEDIUM;
+      hasTips = true;
+      break;
+    default:
+      pathname = "/smoothAlpha.bmp";
+      mediumType = Stroke::OPAQUE_MEDIUM;
+      hasTips = false;
+      break;
+    }
+    unsigned int texId = instance->getBrushTextureIndex(pathname, mediumType);
+    stroke.SetMediumType(mediumType);
+    stroke.SetTips(hasTips);
+    stroke.SetTextureId(texId);
+  }
+
+  // FIXME
+  void StrokeTextureShader::shade(Stroke& stroke) const
+  {
+    TextureManager * instance = TextureManager::getInstance();
+    if(!instance)
+      return;
+    string pathname = TextureManager::Options::getBrushesPath() + "/" + _texturePath;
+    unsigned int texId = instance->getBrushTextureIndex(pathname, _mediumType);
+    stroke.SetMediumType(_mediumType);
+    stroke.SetTips(_tips);
+    stroke.SetTextureId(texId);
+  }
+
+  //
+  //  Geometry Shaders
+  //
+  ///////////////////////////////////////////////////////////////////////////////
+
+  void BackboneStretcherShader::shade(Stroke& stroke) const
+  {
+    float l=stroke.getLength2D();
+    if(l <= 50)
+      return;
+
+    StrokeInternal::StrokeVertexIterator v0=stroke.strokeVerticesBegin();
+    StrokeInternal::StrokeVertexIterator v1=v0;++v1;
+    StrokeInternal::StrokeVertexIterator vn=stroke.strokeVerticesEnd();--vn;
+    StrokeInternal::StrokeVertexIterator vn_1=vn;--vn_1;
+    
+    
+    Vec2d first((v0)->x(), (v0)->y());
+    Vec2d last((vn)->x(), (vn)->y());
+
+    Vec2d d1(first-Vec2d((v1)->x(), (v1)->y())); 
+    d1.normalize();
+    Vec2d dn(last-Vec2d((vn_1)->x(), (vn_1)->y()));
+    dn.normalize();
+
+    Vec2d newFirst(first+_amount*d1);
+    (v0)->SetPoint(newFirst[0], newFirst[1]);
+    Vec2d newLast(last+_amount*dn);
+    (vn)->SetPoint(newLast[0], newLast[1]);
+  }
+
+  void SamplingShader::shade(Stroke& stroke) const
+  {
+    stroke.Resample(_sampling);
+  }
+
+  void ExternalContourStretcherShader::shade(Stroke& stroke) const
+  { 
+    float l=stroke.getLength2D();
+    Interface0DIterator it=stroke.verticesBegin();
+    Functions0D::Normal2DF0D fun;
+    StrokeVertex* sv;
+    while (!it.isEnd())
+      {
+	Vec2f n(fun(it));
+	sv = dynamic_cast<StrokeVertex*>(&(*it));
+	Vec2d newPoint(sv->x()+_amount*n.x(), sv->y()+_amount*n.y());
+	sv->SetPoint(newPoint[0], newPoint[1]);
+	++it;
+      }
+  }
+
+  void BSplineShader::shade(Stroke& stroke) const
+  {
+    if(stroke.strokeVerticesSize() < 4)
+      return;
+
+    // Find the new vertices
+    vector<Vec2d> newVertices;
+    double t=0.f;
+    float _sampling = 5.f;
+
+    StrokeInternal::StrokeVertexIterator p0,p1,p2,p3, end;
+    p0 = stroke.strokeVerticesBegin();
+    p1 = p0;
+    p2 = p1;
+    p3 = p2;
+    end = stroke.strokeVerticesEnd();
+    double a[4],b[4];
+    int n=0;
+    while(p1 != end)
+      {
+	//      if(p1 == end)
+	//        p1 = p0;
+	if(p2 == end)
+	  p2 = p1;
+	if(p3 == end)
+	  p3 = p2;
+	// compute new matrix
+	a[0] = (-(p0)->x()+3*(p1)->x()-3*(p2)->x()+(p3)->x())/6.0;
+	a[1] = (3*(p0)->x()-6*(p1)->x()+3*(p2)->x())/6.0;
+	a[2] = (-3*(p0)->x()+3*(p2)->x())/6.0;
+	a[3] = ((p0)->x()+4*(p1)->x()+(p2)->x())/6.0;
+
+	b[0] = (-(p0)->y()+3*(p1)->y()-3*(p2)->y()+(p3)->y())/6.0;
+	b[1] = (3*(p0)->y()-6*(p1)->y()+3*(p2)->y())/6.0;
+	b[2] = (-3*(p0)->y()+3*(p2)->y())/6.0;
+	b[3] = ((p0)->y()+4*(p1)->y()+(p2)->y())/6.0;
+
+
+	// draw the spline depending on resolution:
+	Vec2d p1p2((p2)->x()-(p1)->x(), (p2)->y()-(p1)->y());
+	double norm = p1p2.norm();
+	//t = _sampling/norm;
+	t=0;
+	while(t<1)
+	  { 
+	    newVertices.push_back(Vec2d((a[3] + t*(a[2] + t*(a[1] + t*a[0]))), 
+					(b[3] + t*(b[2] + t*(b[1] + t*b[0])))));
+	    t = t + _sampling/norm;
+	  } 
+	if(n > 2)
+	  {
+	    ++p0;
+	    ++p1;
+	    ++p2;
+	    ++p3;
+	  }
+	else
+	  {
+	    if(n==0)
+	      ++p3;
+	    if(n==1)
+	      {++p2;++p3;}
+	    if(n==2)
+	      {++p1;++p2;++p3;}
+	    ++n;
+	  }
+      }
+    //last point:
+    newVertices.push_back(Vec2d((p0)->x(), (p0)->y()));
+    
+    int originalSize = newVertices.size();
+    _sampling = stroke.ComputeSampling(originalSize);
+
+    // Resample and set x,y coordinates
+    stroke.Resample(_sampling);
+    int newsize = stroke.strokeVerticesSize();
+    
+    int nExtraVertex=0;
+    if(newsize < originalSize)
+      cerr << "Warning: unsufficient resampling" << endl;
+    else
+      {
+	nExtraVertex = newsize - originalSize;
+      }
+
+    // assigns the new coordinates:
+    vector<Vec2d>::iterator p,pend;
+    p=newVertices.begin();pend=newVertices.end();
+    vector<Vec2d>::iterator last = p;
+    n=0;
+    StrokeInternal::StrokeVertexIterator it=stroke.strokeVerticesBegin(), itend=stroke.strokeVerticesEnd();
+    it=stroke.strokeVerticesBegin();
+    for(;
+	((it!=itend) && (p!=pend));
+	++it)
+      {
+	it->SetX(p->x());
+	it->SetY(p->y());
+	last = p;
+	++p;
+	++n;
+      }
+    // nExtraVertex should stay unassigned
+    for(int i=0; i< nExtraVertex; ++i)
+      {
+	it->SetX(last->x());
+	it->SetY(last->y());
+	if(it.isEnd())
+	  cerr << "Warning: Problem encountered while creating B-spline" << endl;
+	++it;
+	++n;
+      }
+  }
+
+  //!! Bezier curve stroke shader
+  void BezierCurveShader::shade(Stroke& stroke) const
+  { 
+    if(stroke.strokeVerticesSize() < 4)
+      return;
+
+    // Build the Bezier curve from this set of data points:    
+    vector<Vec2d> data;
+    StrokeInternal::StrokeVertexIterator v=stroke.strokeVerticesBegin(), vend=stroke.strokeVerticesEnd();
+    data.push_back(Vec2d(v->x(), v->y()));//first one
+    StrokeInternal::StrokeVertexIterator previous = v;++v;
+    for(;
+	v!=vend;
+	++v)
+      {
+	if(!((fabs(v->x() -(previous)->x())<M_EPSILON) && ((fabs(v->y() - (previous)->y())<M_EPSILON))))
+	  data.push_back(Vec2d(v->x(), v->y()));
+	previous = v;
+      }
+    
+    //    Vec2d tmp;bool equal=false;
+    //    if(data.front() == data.back())
+    //    {
+    //      tmp = data.back();
+    //      data.pop_back();
+    //      equal=true;
+    //    }
+    // here we build the bezier curve
+    BezierCurve bcurve(data, _error);
+
+    // bad performances are here !!! // FIXME
+    vector<Vec2d> CurveVertices;
+    vector<BezierCurveSegment*>& bsegments = bcurve.segments();
+    vector<BezierCurveSegment*>::iterator s=bsegments.begin(),send=bsegments.end();
+    vector<Vec2d>& segmentsVertices = (*s)->vertices();
+    vector<Vec2d>::iterator p,pend;
+    // first point
+    CurveVertices.push_back(segmentsVertices[0]);
+    for(;
+	s!=send;
+	++s)
+      {
+	segmentsVertices = (*s)->vertices();
+	p=segmentsVertices.begin(); pend=segmentsVertices.end();
+	++p;
+	for(;
+	    p!=pend;
+	    ++p)
+	  {
+	    CurveVertices.push_back((*p));
+	  }
+      }
+
+    //if(equal)
+    //    if(data.back() == data.front())
+    //    {
+    //      vector<Vec2d>::iterator d=data.begin(), dend=data.end();
+    //      cout << "ending point = starting point" << endl;
+    //      cout << "---------------DATA----------" << endl;
+    //      for(;
+    //      d!=dend;
+    //      ++d)
+    //      {
+    //        cout << d->x() << "-" << d->y() << endl;
+    //      }
+    //      cout << "--------------BEZIER RESULT----------" << endl;
+    //      d=CurveVertices.begin(), dend=CurveVertices.end();
+    //      for(;d!=dend;++d)
+    //      {
+    //        cout << d->x() << "-" << d->y() << endl;
+    //      }
+    //    }
+
+    // Resample the Stroke depending on the number of 
+    // vertices of the bezier curve:
+    int originalSize = CurveVertices.size();
+    //float sampling = stroke.ComputeSampling(originalSize);
+    //stroke.Resample(sampling);
+    stroke.Resample(originalSize);
+    int newsize = stroke.strokeVerticesSize();
+    int nExtraVertex=0;
+    if(newsize < originalSize)
+      cerr << "Warning: unsufficient resampling" << endl;
+    else
+      {
+	//cout << "Oversampling" << endl;
+        nExtraVertex = newsize - originalSize;
+        if(nExtraVertex != 0)
+          cout << "Bezier Shader : Stroke " << stroke.getId() << " have not been resampled" << endl;
+      }
+
+    // assigns the new coordinates:
+    p=CurveVertices.begin();pend=CurveVertices.end();
+    vector<Vec2d>::iterator last = p;
+    int n=0;
+    StrokeInternal::StrokeVertexIterator it=stroke.strokeVerticesBegin(), itend=stroke.strokeVerticesEnd();
+    //    while(p!=pend)
+    //    { 
+    //      ++n;
+    //      ++p;
+    //    }
+    it=stroke.strokeVerticesBegin();
+    for(;
+	((it!=itend) && (p!=pend));
+	++it)
+      {
+	it->SetX(p->x());
+	it->SetY(p->y());
+	//      double x = p->x();
+	//      double y = p->y();
+	//      cout << "x = " << x << "-" << "y = " << y << endl;
+	last = p;
+	++p;
+	++n;
+      }
+
+    // Deal with extra vertices:
+    if(nExtraVertex == 0)
+      return;
+
+    // nExtraVertex should stay unassigned
+    vector<StrokeAttribute> attributes;
+    vector<StrokeVertex*> verticesToRemove;
+    for(int i=0; i< nExtraVertex; ++i)
+    {
+      verticesToRemove.push_back(&(*it));
+      if(it.isEnd())
+        cout << "fucked up" << endl;
+      ++it;
+      ++n;
+    }
+    it=stroke.strokeVerticesBegin();
+    for(;
+    it!=itend;
+    ++it)
+    {
+      attributes.push_back(it->attribute());
+    }
+
+    for(vector<StrokeVertex*>::iterator vr=verticesToRemove.begin(), vrend=verticesToRemove.end();
+    vr!=vrend;
+    ++vr)
+    {
+      stroke.RemoveVertex(*vr);
+    }
+    it=stroke.strokeVerticesBegin();
+    itend=stroke.strokeVerticesEnd();
+    vector<StrokeAttribute>::iterator a=attributes.begin(), aend=attributes.end();
+    int index = 0;
+    int index1 = (int)floor((float)originalSize/2.0);
+    int index2 = index1+nExtraVertex;
+    for(;
+    (it!=itend) && (a!=aend);
+    ++it)
+    {
+      (it)->SetAttribute(*a);
+      if((index <= index1)||(index>index2))
+        ++a;
+      ++index;
+    }
+  } 
+
+  void InflateShader::shade(Stroke& stroke) const
+  {
+    // we're computing the curvature variance of the stroke.(Combo 5)
+    // If it's too high, forget about it
+    Functions1D::Curvature2DAngleF1D fun;
+    if(fun(stroke) > _curvatureThreshold)
+      return;
+
+    Functions0D::VertexOrientation2DF0D ori_fun;
+    Functions0D::Curvature2DAngleF0D curv_fun;
+    Functions1D::Normal2DF1D norm_fun;
+    Interface0DIterator it=stroke.verticesBegin();
+    StrokeVertex* sv;
+    while (!it.isEnd())
+      {
+	Vec2f ntmp = ori_fun(it);
+	Vec2f n(ntmp.y(), -ntmp.x());
+	Vec2f strokeN(norm_fun(stroke));
+	if(n*strokeN < 0)
+	  { 
+	    n[0] = -n[0];
+	    n[1] = -n[1];
+	  }
+	sv = dynamic_cast<StrokeVertex*>(&(*it));
+	float u=sv->u();
+	float t = 4.f*(0.25f - (u-0.5)*(u-0.5));
+	float curvature_coeff = (M_PI-curv_fun(it))/M_PI;
+	Vec2d newPoint(sv->x()+curvature_coeff*t*_amount*n.x(), sv->y()+curvature_coeff*t*_amount*n.y());
+	sv->SetPoint(newPoint[0], newPoint[1]);
+	++it;
+      }
+  }
+
+  class CurvePiece
+  {
+  public:
+    StrokeInternal::StrokeVertexIterator _begin;
+    StrokeInternal::StrokeVertexIterator _last;
+    Vec2d                   A;
+    Vec2d                   B;
+    int size;
+    float _error;
+
+    CurvePiece(StrokeInternal::StrokeVertexIterator b, StrokeInternal::StrokeVertexIterator l, int iSize)
+    {
+      _begin = b;
+      _last = l;
+      A = Vec2d((_begin)->x(),(_begin)->y());
+      B = Vec2d((_last)->x(),(_last)->y());
+      size = iSize;
+    }
+
+    float error() 
+    {
+      float maxE = 0.f;
+      for(StrokeInternal::StrokeVertexIterator it=_begin;
+	  it!=_last;
+	  ++it)
+	{
+	  Vec2d P(it->x(), it->y());
+	  float d = GeomUtils::distPointSegment(P,A,B);
+	  if(d > maxE)
+	    maxE = d;
+	}
+      _error = maxE;
+      return maxE;
+    }
+    //! Subdivides the curve into two pieces.
+    //  The first piece is this same object (modified)
+    // the second piece is returned by the method
+    CurvePiece * subdivide()
+    {
+      StrokeInternal::StrokeVertexIterator it=_begin;
+      int actualSize = 1;
+      for(int i=0; i<size/2; ++i)
+	{
+	  ++it;
+	  ++actualSize;
+	}
+      CurvePiece * second = new CurvePiece(it, _last, size-actualSize+1);
+      size = actualSize;
+      _last = it;
+      B = Vec2d((_last)->x(), (_last)->y());
+      return second;
+    }
+  };
+
+  void PolygonalizationShader::shade(Stroke& stroke) const
+  {
+    vector<CurvePiece*> _pieces;
+    vector<CurvePiece*> _results;
+    vector<CurvePiece*>::iterator cp,cpend;
+
+    // Compute first approx:
+    StrokeInternal::StrokeVertexIterator a=stroke.strokeVerticesBegin();
+    StrokeInternal::StrokeVertexIterator b=stroke.strokeVerticesEnd();--b;
+    int size = stroke.strokeVerticesSize();
+
+    CurvePiece * piece = new CurvePiece(a,b,size);
+    _pieces.push_back(piece);
+  
+    while(!_pieces.empty())
+      {
+	piece = _pieces.back();_pieces.pop_back();
+	if(piece->error() > _error)
+	  {
+	    CurvePiece * second = piece->subdivide();
+	    _pieces.push_back(second);
+	    _pieces.push_back(piece);
+	  }
+	else
+	  {
+	    _results.push_back(piece);
+	  }
+      }
+
+    // actually modify the geometry for each piece:
+    for(cp=_results.begin(), cpend=_results.end();
+	cp!=cpend;
+	++cp)
+      {
+	a = (*cp)->_begin;
+	b = (*cp)->_last;
+	Vec2d u = (*cp)->B-(*cp)->A;
+	Vec2d n(u[1], -u[0]);n.normalize();
+	//Vec2d n(0,0);
+	float offset = ((*cp)->_error);
+	StrokeInternal::StrokeVertexIterator v,vlast;
+	for(v=a;
+	    v!=b;
+	    ++v)
+	  {
+	    v->SetPoint((*cp)->A.x()+v->u()*u.x()+n.x()*offset, (*cp)->A.y()+v->u()*u.y()+n.y()*offset);
+	  }
+	//    u.normalize();
+	//    (*a)->SetPoint((*a)->x()-u.x()*10, (*a)->y()-u.y()*10);
+      }
+
+    // delete stuff
+    for(cp=_results.begin(), cpend=_results.end();
+	cp!=cpend;
+	++cp)
+      {
+	delete (*cp);
+      }
+    _results.clear();
+  }
+
+  void GuidingLinesShader::shade(Stroke& stroke) const
+  {
+    Functions1D::Normal2DF1D norm_fun;
+    StrokeInternal::StrokeVertexIterator a=stroke.strokeVerticesBegin();
+    StrokeInternal::StrokeVertexIterator b=stroke.strokeVerticesEnd();--b;
+    int size = stroke.strokeVerticesSize();
+    CurvePiece piece(a,b,size);
+
+    Vec2d u = piece.B-piece.A;
+    Vec2f n(u[1], -u[0]);n.normalize();
+    Vec2f strokeN(norm_fun(stroke));
+    if(n*strokeN < 0)
+      {
+	n[0] = -n[0];
+	n[1] = -n[1];
+      }
+    float offset = (piece.error())/2.f*_offset;
+    StrokeInternal::StrokeVertexIterator v=a,vend=stroke.strokeVerticesEnd();
+    for(;
+	v!=vend;
+	++v)
+      {
+	v->SetPoint(piece.A.x()+v->u()*u.x()+n.x()*offset, piece.A.y()+v->u()*u.y()+n.y()*offset);
+      }
+  }
+
+  /////////////////////////////////////////
+  //
+  //  Tip Remover
+  //
+  /////////////////////////////////////////
+
+
+  TipRemoverShader::TipRemoverShader(real tipLength)
+    : StrokeShader()
+  {
+    _tipLength = tipLength;
+  }
+
+  void 
+  TipRemoverShader::shade(Stroke& stroke) const 
+  {
+    int originalSize = stroke.strokeVerticesSize();
+
+    if(originalSize<4)
+      return;
+
+    StrokeInternal::StrokeVertexIterator v, vend;
+    vector<StrokeVertex*> verticesToRemove;
+    vector<StrokeAttribute> oldAttributes;
+    v=stroke.strokeVerticesBegin(); vend=stroke.strokeVerticesEnd();
+    for(;
+	v!=vend;
+	++v)
+      { 
+	if ((v->curvilinearAbscissa()<_tipLength) ||
+	    (v->strokeLength()-v->curvilinearAbscissa()<_tipLength))
+	  { 
+	    verticesToRemove.push_back(&(*v));
+	  }
+	oldAttributes.push_back(v->attribute());
+      } 
+
+    if(originalSize-verticesToRemove.size() < 2)
+      return;
+
+    vector<StrokeVertex*>::iterator sv=verticesToRemove.begin(), svend=verticesToRemove.end();
+    for(;
+	sv!=svend;
+	++sv)
+      {
+	stroke.RemoveVertex((*sv));
+      }
+
+    // Resample so that our new stroke have the same 
+    // number of vertices than before
+    stroke.Resample(originalSize);
+  
+    if(stroke.strokeVerticesSize() != originalSize)
+      cerr << "Warning: resampling problem" << endl;
+
+    // assign old attributes to new stroke vertices:
+    v=stroke.strokeVerticesBegin(); vend=stroke.strokeVerticesEnd();
+    vector<StrokeAttribute>::iterator a=oldAttributes.begin(), aend=oldAttributes.end();
+    //cout << "-----------------------------------------------" << endl;
+    for(;(v!=vend)&&(a!=aend);++v,++a)
+      {
+	v->SetAttribute(*a);
+	//cout << "thickness = " << (*a).getThickness()[0] << "-" << (*a).getThickness()[1] << endl;
+      }
+    // we're done!
+  }
+
+  void streamShader::shade(Stroke& stroke) const{
+    cout << stroke << endl;
+  } 
+  void fstreamShader::shade(Stroke& stroke) const{
+    _stream << stroke << endl;
+  } 
+
+} // end of namespace StrokeShaders
+
diff --git a/extern/freestyle/src/stroke/BasicStrokeShaders.h b/extern/freestyle/src/stroke/BasicStrokeShaders.h
new file mode 100755
index 00000000000..f68971a3966
--- /dev/null
+++ b/extern/freestyle/src/stroke/BasicStrokeShaders.h
@@ -0,0 +1,791 @@
+//
+//  Filename         : BasicStrokeShaders.h
+//  Author           : Stephane Grabli
+//  Purpose          : Class gathering basic stroke shaders
+//  Date of creation : 17/12/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  BASIC_STROKE_SHADERS_H
+# define BASIC_STROKE_SHADERS_H
+
+# include "Stroke.h"
+# include "../geometry/Geom.h"
+# include "../geometry/Bezier.h"
+# include "StrokeShader.h"
+# include <fstream>
+
+using namespace std;
+using namespace Geometry;
+
+namespace StrokeShaders {
+
+  //
+  //  Thickness modifiers
+  //
+  //////////////////////////////////////////////////////
+  /*! [ Thickness Shader ].
+   *  Assigns an absolute constant thickness to every
+   *  vertices of the Stroke.
+   */
+  class LIB_STROKE_EXPORT ConstantThicknessShader : public StrokeShader
+  {
+  public:
+    /*! Builds the shader.
+     *  \param thickness
+     *    The thickness that must be assigned
+     *    to the stroke.
+     */
+    ConstantThicknessShader(float thickness) : StrokeShader() {
+      _thickness = thickness;
+    }
+    /*! Destructor. */
+    virtual ~ConstantThicknessShader() {}
+    /*! Returns the string "ConstantThicknessShader".*/
+    virtual string getName() const {
+      return "ConstantThicknessShader";
+    }
+    /*! The shading method. */
+    virtual void shade(Stroke& stroke) const;
+
+  private:
+    float _thickness;
+  };
+
+  /* [ Thickness Shader ].
+   *  Assigns an absolute constant external thickness to every
+   *  vertices of the Stroke. The external thickness of a point
+   *  is its thickness from the point to the strip border
+   *  in the direction pointing outside the object the
+   *  Stroke delimitates.
+   */
+  class LIB_STROKE_EXPORT ConstantExternThicknessShader : public StrokeShader
+  {
+  public:
+
+    ConstantExternThicknessShader(float thickness) : StrokeShader() {
+      _thickness = thickness;
+    }
+
+    virtual ~ConstantExternThicknessShader() {}
+
+    virtual string getName() const {
+      return "ConstantExternThicknessShader";
+    }
+
+    virtual void shade(Stroke& stroke) const;
+
+  private:
+
+    float _thickness;
+  };
+
+  /*! [ Thickness Shader ].
+   *  Assigns thicknesses values such as the thickness
+   *  increases from a thickness value A to a thickness value B
+   *  between the first vertex to the midpoint vertex and
+   *  then decreases from B to a A between this midpoint vertex
+   *  and the last vertex.
+   *  The thickness is linearly interpolated from A to B.
+   */
+  class LIB_STROKE_EXPORT IncreasingThicknessShader : public StrokeShader
+  {
+  public:
+    /*! Builds the shader.
+     *  \param iThicknessMin
+     *    The first thickness value.
+     *  \param iThicknessMax
+     *    The second thickness value.
+     */
+    IncreasingThicknessShader(float iThicknessMin, float iThicknessMax)
+      : StrokeShader()
+    {
+      _ThicknessMin = iThicknessMin;
+      _ThicknessMax = iThicknessMax;
+    }
+    /*! Destructor.*/
+    virtual ~IncreasingThicknessShader() {}
+    /*! The shading method. */
+    virtual void shade(Stroke& stroke) const;
+
+  private:
+
+    float _ThicknessMin;
+    float _ThicknessMax;
+  };
+
+  /*! [ Thickness shader ].
+   *  Same as previous but 
+   *  here we allow the user to control the ratio thickness/length so that 
+   *  we don't get fat short lines
+   */
+  class LIB_STROKE_EXPORT ConstrainedIncreasingThicknessShader : public StrokeShader
+  {
+  private:
+    float _ThicknessMin;
+    float _ThicknessMax;
+    float _ratio;
+  public:
+    /*! Builds the shader.
+     *  \param iThicknessMin
+     *    The first thickness value.
+     *  \param iThicknessMax
+     *    The second thickness value.
+     *  \param iRatio
+     *    The ration thickness/length we don't want to
+     *    exceed.
+     */ 
+    ConstrainedIncreasingThicknessShader(float iThicknessMin, float iThicknessMax, float iRatio)
+      : StrokeShader()
+    {
+      _ThicknessMin = iThicknessMin;
+      _ThicknessMax = iThicknessMax;
+      _ratio = iRatio;
+    }
+    /*! Destructor.*/
+    virtual ~ConstrainedIncreasingThicknessShader() {}
+    /*! The shading method. */
+    virtual void shade(Stroke& stroke) const;
+  };
+
+  /*  [ Thickness Shader ].
+   *  Modifys the thickness in a relative way
+   *  depending on its length.
+   */
+  class LIB_STROKE_EXPORT LengthDependingThicknessShader : public StrokeShader
+  {
+  private:
+    float _minThickness;
+    float _maxThickness;
+    // We divide the strokes in 4 categories:
+    // l > 300
+    // 100 < l < 300
+    // 50 < l < 100
+    // l < 50
+  public:
+    LengthDependingThicknessShader(float iMinThickness, float iMaxThickness)
+      : StrokeShader()
+    {
+      _minThickness = iMinThickness;
+      _maxThickness = iMaxThickness;
+    }
+    virtual ~LengthDependingThicknessShader() {}
+
+    virtual void shade(Stroke& stroke) const;
+  };
+
+  /*! [ Thickness Shader ].
+   *  Applys a pattern (texture) to vary thickness.
+   *  The new thicknesses are the result of the multiplication
+   *  of the pattern and the original thickness
+   */
+  class LIB_STROKE_EXPORT ThicknessVariationPatternShader : public StrokeShader
+  {
+  public:
+
+    /*! Builds the shader.
+     *  \param pattern_name
+     *    The texture file name.
+     *  \param iMinThickness
+     *    The minimum thickness we don't want to exceed.
+     *  \param iMaxThickness
+     *    The maximum thickness we don't want to exceed.
+     *  \param stretch
+     *    Tells whether the pattern texture must
+     *    be stretched or repeted to fit the stroke.
+     */
+    ThicknessVariationPatternShader(const string pattern_name,
+				    float iMinThickness = 1.f,
+				    float iMaxThickness = 5.f,
+				    bool stretch = true);
+    /*! Destructor.*/
+    virtual ~ThicknessVariationPatternShader()
+    {
+      if(0 != _aThickness)
+	{
+	  delete [] _aThickness;
+	  _aThickness = 0;
+	}
+    }
+    /*! The shading method. */
+    virtual void shade(Stroke& stroke) const;
+
+  private:
+
+    float*	_aThickness; // array of thickness values, in % of the max (i.e comprised between 0 and 1)
+    unsigned	_size;
+    float	_minThickness;
+    float	_maxThickness;
+    bool	_stretch;
+  };
+
+  /*!  [ Thickness Shader ].
+   *   Adds some noise to the stroke thickness.
+   *   \see \htmlonly <a href=noise/noise.html>noise/noise.html</a>\endhtmlonly
+   */
+  class LIB_STROKE_EXPORT ThicknessNoiseShader : public StrokeShader
+  {
+  private:
+    float _amplitude;
+    float _scale;
+  public:
+    ThicknessNoiseShader();
+    /*! Builds a Thickness Noise Shader
+     *    \param iAmplitude
+     *      The amplitude of the noise signal
+     *    \param iPeriod
+     *      The period of the noise signal
+     */
+    ThicknessNoiseShader(float iAmplitude, float iPeriod);
+    /*! The shading method. */
+    virtual void shade(Stroke& stroke) const;
+  };
+
+
+  //
+  //  Color shaders
+  //
+  /////////////////////////////////////////////////////////
+  /*!  [ Color Shader ].
+   *   Assigns a constant color to every vertices of the Stroke.
+   */
+  class LIB_STROKE_EXPORT ConstantColorShader : public StrokeShader
+  {
+  public:
+    /*! Builds the shader from a user-specified color.
+     *  \param iR
+     *    The red component
+     *  \param iG
+     *    The green component
+     *  \param iB
+     *    The blue component
+     *  \param iAlpha
+     *    The alpha value
+     */
+    ConstantColorShader(float iR, float iG, float iB, float iAlpha=1.f)
+      : StrokeShader()
+    {
+      _color[0] = iR;
+      _color[1] = iG;
+      _color[2] = iB;
+      _color[3] = iAlpha;
+    }
+
+    virtual string getName() const {
+      return "ConstantColorShader";
+    }
+    /*! The shading method. */
+    virtual void shade(Stroke& stroke) const;
+
+  private:
+
+    float _color[4];
+  };
+
+  /*!  [ Color Shader ].
+   *   Assigns a varying color to the stroke.
+   *   The user specifies 2 colors A and B. The stroke
+   *   color will change linearly from A to B between the
+   *   first and the last vertex.
+   */
+  class LIB_STROKE_EXPORT IncreasingColorShader : public StrokeShader
+  {
+  private:
+    float _colorMin[4];
+    float _colorMax[4];
+  public:
+    /*! Builds the shader from 2 user-specified colors.
+     *  \param iRm
+     *    The first color red component
+     *  \param iGm
+     *    The first color green component
+     *  \param iBm
+     *    The first color blue component
+     *  \param iAlpham
+     *    The first color alpha value
+     *  \param iRM
+     *    The second color red component
+     *  \param iGM
+     *    The second color green component
+     *  \param iBM
+     *    The second color blue component
+     *  \param iAlphaM
+     *    The second color alpha value
+     */
+    IncreasingColorShader(float iRm, float iGm, float iBm, float iAlpham, 
+				float iRM, float iGM, float iBM, float iAlphaM)
+      : StrokeShader() 
+    {
+      _colorMin[0] = iRm;
+      _colorMin[1] = iGm;
+      _colorMin[2] = iBm;
+      _colorMin[3] = iAlpham;
+
+      _colorMax[0] = iRM;
+      _colorMax[1] = iGM;
+      _colorMax[2] = iBM;
+      _colorMax[3] = iAlphaM;
+    }
+    /*! The shading method. */
+    virtual void shade(Stroke& stroke) const;
+  };
+
+  /*! [ Color Shader ].
+   *  Applys a pattern to vary original color.
+   *  The new color is the result of the multiplication
+   *  of the pattern and the original color
+   */
+  class LIB_STROKE_EXPORT ColorVariationPatternShader : public StrokeShader
+  {
+  public:
+    /*! Builds the shader from the pattern texture file name.
+     *  \param pattern_name
+     *    The file name of the texture file to use as pattern
+     *  \param stretch
+     *    Tells whether the texture must be strecthed or repeted
+     *    to fit the stroke.
+     */
+    ColorVariationPatternShader(const string pattern_name, bool stretch = true);
+    /*! Destructor */
+    virtual ~ColorVariationPatternShader()
+    {
+      if(0 != _aVariation)
+	{
+	  delete [] _aVariation;
+	  _aVariation = 0;
+	}
+    }
+    /*! The shading method. */
+    virtual void shade(Stroke& stroke) const;
+
+  private:
+
+    float*	_aVariation; // array of coef values, in % of the max (i.e comprised between 0 and 1)
+    unsigned	_size;
+    bool	_stretch;
+  };
+
+  /* [ Color Shader ].
+   *  Assigns a color to the stroke depending
+   *  on the material of the shape to which ot belongs
+   *  to. (Disney shader)
+   */
+  class LIB_STROKE_EXPORT MaterialColorShader : public StrokeShader
+  {
+  private:
+    float _coefficient;
+  public:
+    MaterialColorShader(float coeff=1.f)
+      : StrokeShader()
+    {_coefficient=coeff;}
+
+    virtual void shade(Stroke& stroke) const;
+  };
+
+  class LIB_STROKE_EXPORT CalligraphicColorShader : public StrokeShader
+  {
+  private:
+    int _textureId;
+    Vec2d _orientation;
+  public:
+    CalligraphicColorShader(
+			    const Vec2d &iOrientation)
+      : StrokeShader()
+    { 
+      _orientation=iOrientation;
+      _orientation.normalize();
+    } 
+    virtual void shade(Stroke& stroke) const;
+
+  };
+
+  /*! [ Color Shader ].
+   *  Shader to add noise to the stroke colors.
+   */ 
+  class LIB_STROKE_EXPORT ColorNoiseShader : public StrokeShader
+  {
+  private:
+    float _amplitude; 
+    float _scale;     
+
+  public:
+    ColorNoiseShader();
+    /*! Builds a Color Noise Shader
+     *    \param iAmplitude
+     *      The amplitude of the noise signal
+     *    \param iPeriod
+     *      The period of the noise signal
+     */
+    ColorNoiseShader(float iAmplitude, float iPeriod);
+    /*! The shading method. */
+    virtual void shade(Stroke& stroke) const;
+  };
+
+  //
+  //  Texture Shaders
+  //
+  ///////////////////////////////////////////////////////////////////////////////
+  /*! [ Texture Shader ].
+   *  Assigns a texture to the stroke in order to simulate
+   *  its marks system. This shader takes as input an integer value
+   *  telling which texture and blending mode to use among a set of
+   *  predefined textures.
+   *  Here are the different presets:
+   *  0) -> /brushes/charcoalAlpha.bmp, HUMID_MEDIUM
+   *  1) -> /brushes/washbrushAlpha.bmp, HUMID_MEDIUM
+   *  2) -> /brushes/oil.bmp, HUMID_MEDIUM
+   *  3) -> /brushes/oilnoblend.bmp, HUMID_MEDIUM
+   *  4) -> /brushes/charcoalAlpha.bmp, DRY_MEDIUM
+   *  5) -> /brushes/washbrushAlpha.bmp, DRY_MEDIUM
+   *  6) -> /brushes/opaqueDryBrushAlpha.bmp, OPAQUE_MEDIUM
+   *  7) -> /brushes/opaqueBrushAlpha.bmp, Stroke::OPAQUE_MEDIUM
+   *  Any other value will lead to the following preset:
+   *  default) -> /brushes/smoothAlpha.bmp, OPAQUE_MEDIUM.
+   */
+  class LIB_STROKE_EXPORT TextureAssignerShader : public StrokeShader // FIXME
+  {
+  private:
+    int _textureId;
+  public:
+    /*! Builds the shader.
+     *  \param id
+     *    The number of the preset to use.
+     */
+    TextureAssignerShader(int id)
+      : StrokeShader()
+    {
+      _textureId = id;
+    }
+    /*! The shading method */
+    virtual void shade(Stroke& stroke) const;
+  
+  };
+  /*! [ Texture Shader ].
+   *  Assigns a texture and a blending mode to the stroke
+   *  in order to simulate its marks system.
+   */
+  class LIB_STROKE_EXPORT StrokeTextureShader : public StrokeShader
+  {
+  private:
+    string _texturePath;
+    Stroke::MediumType _mediumType;
+    bool _tips; // 0 or 1
+    
+  public:
+    /*! Builds the shader from the texture file name and the blending mode to use.
+     *  \param textureFile
+     *    The the texture file name.
+     *    \attention The textures must be placed in the $FREESTYLE_DIR/data/textures/brushes
+     *    directory.
+     *  \param mediumType
+     *    The medium type and therefore, the blending mode that must
+     *    be used for the rendering of this stroke.
+     *  \param iTips
+     *    Tells whether the texture includes tips or not.
+     *    If it is the case, the texture image must respect the following
+     *    format:
+     *    \verbatim
+     *     __________
+     *    |          |
+     *    |    A     |
+     *    |__________|
+     *    |     |    |
+     *    |  B  | C  |
+     *    |_____|____|
+     * 
+     *    \endverbatim
+     *    - A : The stroke's corpus texture
+     *    - B : The stroke's left extremity texture
+     *    - C : The stroke's right extremity texture
+     */
+    StrokeTextureShader(const string textureFile, Stroke::MediumType mediumType = Stroke::OPAQUE_MEDIUM, bool iTips = false)
+      : StrokeShader()
+    {
+      _texturePath = textureFile;
+      _mediumType = mediumType;
+      _tips = iTips;
+    }
+    /*! The shading method */
+    virtual void shade(Stroke& stroke) const;
+  
+  };
+
+
+  //
+  //  Geometry Shaders
+  //
+  ///////////////////////////////////////////////////////////////////////////////
+  /*! [ Geometry Shader ].
+   *  Stretches the stroke at its two extremities and following the
+   *  respective directions: v(1)v(0) and v(n-1)v(n).
+   */
+  class LIB_STROKE_EXPORT BackboneStretcherShader : public StrokeShader
+  {
+  private:
+    float _amount; 
+  public:
+    /*! Builds the shader.
+     *  \param iAmount
+     *    The stretching amount value.
+     */
+    BackboneStretcherShader(float iAmount=2.f)
+      : StrokeShader()
+    {
+      _amount = iAmount;
+    }
+    /*! The shading method */
+    virtual void shade(Stroke& stroke) const;
+  };
+
+  /*! [ Geometry Shader. ]
+   *  Resamples the stroke.
+   *  @see Stroke::Resample(float).
+   */
+  class LIB_STROKE_EXPORT SamplingShader: public StrokeShader
+  {
+  private:
+    float _sampling;
+  public:
+    /*! Builds the shader.
+     *  \param sampling
+     *    The sampling to use for the
+     *    stroke resampling
+     */
+    SamplingShader(float  sampling)
+      : StrokeShader()
+    {
+      _sampling = sampling;
+    }
+    /*! The shading method */
+    virtual void shade(Stroke& stroke) const;
+  };
+
+
+  class LIB_STROKE_EXPORT ExternalContourStretcherShader : public StrokeShader
+  {
+  private:
+    float _amount; 
+  public:
+    ExternalContourStretcherShader(float iAmount=2.f)
+      : StrokeShader()
+    {
+      _amount = iAmount;
+    }
+
+    virtual void shade(Stroke& stroke) const;
+  };
+
+  // B-Spline stroke shader
+  class LIB_STROKE_EXPORT BSplineShader: public StrokeShader
+  { 
+  public:
+    BSplineShader()
+      : StrokeShader()
+    {}
+
+    virtual void shade(Stroke& stroke) const;
+  };
+
+
+  // Bezier curve stroke shader
+  /*! [ Geometry Shader ].
+   *  Transforms the stroke backbone geometry
+   *  so that it corresponds to a Bezier Curve
+   *  approximation of the original backbone geometry.
+   *  @see \htmlonly <a href=bezier/bezier.html>bezier/bezier.html</a> \endhtmlonly
+   */
+  class LIB_STROKE_EXPORT BezierCurveShader : public StrokeShader
+  { 
+  private:
+    float _error;
+  public:
+    /*! Builds the shader.
+     *  \param error
+     *    The error we're allowing for the approximation.
+     *    This error is the max distance allowed between
+     *    the new curve and the original geometry.
+     */
+    BezierCurveShader(float error = 4.0)
+      : StrokeShader()
+    {_error=error;}
+
+    /*! The shading method */
+    virtual void shade(Stroke& stroke) const;
+  };
+
+  /* Shader to inflate the curves. It keeps the extreme
+   *  points positions and moves the other ones along 
+   *  the 2D normal. The displacement value is proportional
+   *  to the 2d curvature at the considered point (the higher 
+   *  the curvature, the smaller the displacement) and to a value 
+   *  specified by the user.
+   */
+  class LIB_STROKE_EXPORT InflateShader : public StrokeShader
+  {
+  private:
+    float _amount; 
+    float _curvatureThreshold;
+  public:
+    /*! Builds an inflate shader
+     *    \param iAmount
+     *      A multiplicative coefficient that 
+     *      acts on the amount and direction of displacement
+     *    \param iThreshold
+     *      The curves having a 2d curvature > iThreshold
+     *      at one of their points is not inflated 
+     */
+    InflateShader(float iAmount,float iThreshold)
+      : StrokeShader()
+    {
+      _amount = iAmount;
+      _curvatureThreshold = iThreshold;
+    }
+    /*! The shading method */
+    virtual void shade(Stroke& stroke) const;
+  };
+
+  /*! [ Geometry Shader ].
+   *  Shader to modify the Stroke geometry so that 
+   *  it looks more "polygonal".
+   *  The basic idea is to start from the
+   *  minimal stroke approximation consisting in
+   *  a line joining the first vertex to the last one and
+   *  to subdivide using the original stroke vertices
+   *  until a certain error is reached.
+   */
+  class LIB_STROKE_EXPORT PolygonalizationShader : public StrokeShader
+  {
+  private:
+    float _error;
+  public:
+    /*! Builds the shader.
+     *  \param iError
+     *    The error we want our polygonal approximation
+     *    to have with respect to the original geometry.
+     *    The smaller, the closer the new stroke to
+     *    the orinal one.
+     *    This error corresponds to the maximum distance
+     *    between the new stroke and the old one.
+     */
+    PolygonalizationShader(float iError) : StrokeShader() 
+    {_error = iError;}
+    /*! The shading method */
+    virtual void shade(Stroke& stroke) const;
+  };
+
+
+  /*! [ Geometry Shader ].
+   *  Shader to modify the Stroke geometry so that 
+   *  it corresponds to its main direction line.
+   *  This shader must be used together with the 
+   *  splitting operator using the curvature criterion.
+   *  Indeed, the precision of the approximation
+   *  will depend on the size of the stroke's pieces.
+   *  The bigger the pieces, the rougher the approximation.
+   */
+  class LIB_STROKE_EXPORT GuidingLinesShader : public StrokeShader
+  {
+  private:
+    float _offset;
+  public:
+    /*! Builds a Guiding Lines shader
+     *    \param iOffset
+     *      The line that replaces the stroke
+     *      is initially in the middle 
+     *      of the initial stroke "bbox".
+     *      iOffset is the value of the displacement 
+     *      which is applied to this line along its 
+     *      normal.
+     */
+    GuidingLinesShader(float iOffset) : StrokeShader()
+    {_offset = iOffset;}
+    /*! The shading method */
+    virtual void shade(Stroke& stroke) const;
+  };
+
+  /*! [ Geometry Shader ].
+   *  Removes the stroke's extremities.
+   */
+  class LIB_STROKE_EXPORT TipRemoverShader : public StrokeShader 
+  {
+  public:
+    /*! Builds the shader.
+     *  \param tipLength
+     *    The length of the piece of stroke
+     *    we want to remove at each extremity.
+     */
+    TipRemoverShader (real tipLength);
+    /*! Destructor. */
+    virtual ~TipRemoverShader () {}
+    /*! The shading method */
+    virtual void shade(Stroke &stroke) const;
+
+  protected:
+
+    real _tipLength; 
+  };
+
+  /*! [ output Shader ].
+   *  streams the Stroke
+   */
+  class LIB_STROKE_EXPORT streamShader : public StrokeShader
+  {
+  public:
+    /*! Destructor. */
+    virtual ~streamShader() {}
+    /*! Returns the string "streamShader".*/
+    virtual string getName() const {
+      return "streamShader";
+    }
+    /*! The shading method. */
+    virtual void shade(Stroke& stroke) const;
+  };
+
+  /*! [ output Shader ].
+   *  streams the Stroke in a file
+   */
+  class LIB_STROKE_EXPORT fstreamShader : public StrokeShader
+  {
+  protected:
+    mutable ofstream _stream;
+  public:
+    /*! Builds the shader from the output file name */
+    fstreamShader(const char *iFileName) : StrokeShader(){
+      _stream .open(iFileName);
+      if(!_stream.is_open()){
+        cout << "couldn't open file " << iFileName << endl;
+      }
+    }
+    /*! Destructor. */
+    virtual ~fstreamShader() {_stream.close();}
+    /*! Returns the string "fstreamShader".*/
+    virtual string getName() const {
+      return "fstreamShader";
+    }
+    /*! The shading method. */
+    virtual void shade(Stroke& stroke) const;
+  };
+} // end of namespace StrokeShaders
+
+#endif // BASIC_STROKE_SHADERS_H
diff --git a/extern/freestyle/src/stroke/Canvas.cpp b/extern/freestyle/src/stroke/Canvas.cpp
new file mode 100755
index 00000000000..ecb76c4a015
--- /dev/null
+++ b/extern/freestyle/src/stroke/Canvas.cpp
@@ -0,0 +1,427 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include <vector>
+#include "../system/FreestyleConfig.h"
+#include "StrokeRenderer.h"
+#include "../system/TimeStamp.h"
+#include "../system/PseudoNoise.h"
+#include "Canvas.h"
+#include <qimage.h>
+#include <QString>
+#include "../image/Image.h"
+#include "../image/GaussianFilter.h"
+#include "../image/ImagePyramid.h"
+#include "../view_map/SteerableViewMap.h"
+#include "StyleModule.h"
+
+using namespace std;
+
+LIB_STROKE_EXPORT
+Canvas * Canvas::_pInstance = 0;
+
+LIB_STROKE_EXPORT
+const char * Canvas::_MapsPath = 0;
+
+using namespace std;
+
+Canvas::Canvas()
+{
+  _SelectedFEdge = 0;
+  _pInstance = this;
+  PseudoNoise::init(42);
+  _paperTextureIndex = 0;
+  _Renderer = 0;
+  _drawPaper = true;
+  _current_sm = NULL;
+  _steerableViewMap = new SteerableViewMap(NB_STEERABLE_VIEWMAP-1);
+}
+
+Canvas::Canvas(const Canvas& iBrother)
+{
+  _SelectedFEdge = iBrother._SelectedFEdge;
+  _pInstance = this;
+  PseudoNoise::init(42);
+  _paperTextureIndex = iBrother._paperTextureIndex;
+  _Renderer = iBrother._Renderer;
+  _drawPaper = iBrother._drawPaper;
+  _current_sm = iBrother._current_sm;
+  _steerableViewMap = new SteerableViewMap(*(iBrother._steerableViewMap));
+  
+}
+
+Canvas::~Canvas()
+{
+  _pInstance = 0;
+
+  Clear();
+  if(_Renderer)
+  {
+    delete _Renderer;
+    _Renderer = 0;
+  }
+  // FIXME: think about an easy control 
+  // for the maps memory management...
+  if(!_maps.empty()){
+    for(mapsMap::iterator m=_maps.begin(), mend=_maps.end();
+    m!=mend;
+    ++m){
+      delete ((*m).second);
+    }
+    _maps.clear();
+  }
+  if(_steerableViewMap)
+    delete _steerableViewMap;
+}
+
+void Canvas::preDraw() {}
+
+void Canvas::Draw()
+{
+  if(_StyleModules.empty())
+    return;
+  preDraw();
+  TimeStamp *timestamp = TimeStamp::instance();
+
+  for(unsigned i = 0; i < _StyleModules.size(); i++) {
+    _current_sm = _StyleModules[i];
+    if (!_StyleModules[i]->getModified())
+    {
+      if (_StyleModules[i]->getDrawable() && _Layers[i])
+	_Layers[i]->Render(_Renderer);
+      continue;
+    }
+    if (i < _Layers.size() && _Layers[i])
+      delete _Layers[i];
+
+    _Layers[i] = _StyleModules[i]->execute();
+
+    if (_StyleModules[i]->getDrawable() && _Layers[i])
+      _Layers[i]->Render(_Renderer);
+
+    timestamp->increment();
+  }
+  postDraw();
+}
+
+void Canvas::postDraw()
+{
+  update();
+}
+
+
+void Canvas::Clear()
+{
+  if(!_Layers.empty()) {
+    for (deque<StrokeLayer*>::iterator sl=_Layers.begin(), slend=_Layers.end();
+	 sl != slend;
+	 ++sl)
+      if (*sl)
+	delete (*sl);
+    _Layers.clear();  
+  }
+
+  if(!_StyleModules.empty()) {
+    for (deque<StyleModule*>::iterator s=_StyleModules.begin(), send=_StyleModules.end();
+	 s != send;
+	 ++s)
+      if (*s)
+	delete (*s);
+    _StyleModules.clear();
+  }
+  if(_steerableViewMap)
+    _steerableViewMap->Reset();
+}
+
+void Canvas::Erase()
+{
+  if(!_Layers.empty())
+  {
+    for (deque<StrokeLayer*>::iterator sl=_Layers.begin(), slend=_Layers.end();
+	 sl != slend;
+	 ++sl)
+      if (*sl)
+	(*sl)->clear();
+  }
+  if(_steerableViewMap)
+    _steerableViewMap->Reset();
+  update();
+}
+
+void Canvas::InsertStyleModule(unsigned index, StyleModule *iStyleModule) {
+  unsigned size = _StyleModules.size();
+  StrokeLayer* layer = new StrokeLayer();
+  if((_StyleModules.empty()) || (index == size)) {
+    _StyleModules.push_back(iStyleModule);
+    _Layers.push_back(layer);
+    return;
+  }
+	_StyleModules.insert(_StyleModules.begin() + index, iStyleModule);
+  _Layers.insert(_Layers.begin()+index, layer);
+}
+
+void Canvas::RemoveStyleModule(unsigned index)
+{
+  unsigned i=0;
+  if (!_StyleModules.empty())
+    {
+      for(deque<StyleModule*>::iterator s=_StyleModules.begin(), send=_StyleModules.end();
+	  s!=send;
+	  ++s)
+	{
+	  if(i == index)
+	    { 
+	      // remove shader
+	      if (*s)
+		delete *s;
+	      _StyleModules.erase(s);
+	      break;
+	    } 
+	  ++i;
+	}
+    }
+  i=0;
+  if(!_Layers.empty())
+  {
+    for(deque<StrokeLayer*>::iterator sl=_Layers.begin(), slend=_Layers.end();
+    sl!=slend;
+    ++sl)
+    {
+      if(i == index)
+      { 
+        // remove layer
+	if (*sl)
+	  delete *sl;
+        _Layers.erase(sl);
+        break;
+      } 
+      ++i;
+    }
+  }
+}
+
+
+void Canvas::SwapStyleModules(unsigned i1, unsigned i2)
+{
+  StyleModule* tmp;
+  tmp = _StyleModules[i1];
+  _StyleModules[i1] = _StyleModules[i2];
+  _StyleModules[i2] = tmp;
+
+  StrokeLayer* tmp2;
+  tmp2 = _Layers[i1];
+  _Layers[i1] = _Layers[i2];
+  _Layers[i2] = tmp2;
+}
+
+void Canvas::ReplaceStyleModule(unsigned index, StyleModule *iStyleModule)
+{
+  unsigned i=0;
+  for(deque<StyleModule*>::iterator s=_StyleModules.begin(), send=_StyleModules.end();
+      s != send;
+      ++s)
+    {
+      if(i == index)
+	{
+	  if (*s)
+	    delete *s;
+	  *s = iStyleModule;
+	  break;
+	}
+      ++i;
+    }
+}
+
+void Canvas::SetVisible(unsigned index, bool iVisible) {
+  _StyleModules[index]->setDisplayed(iVisible);
+}
+ 
+void Canvas::setModified(unsigned index, bool iMod)
+{
+  _StyleModules[index]->setModified(iMod);
+}
+
+void Canvas::resetModified(bool iMod/* =false */)
+{
+  unsigned size = _StyleModules.size();
+  for(unsigned i = 0; i < size; ++i)
+    setModified(i,iMod);
+}
+
+void Canvas::causalStyleModules(vector<unsigned>& vec, unsigned index) {
+  unsigned size = _StyleModules.size();
+
+  for(unsigned i = index; i < size; ++i)
+    if (_StyleModules[i]->getCausal())
+      vec.push_back(i);
+}
+
+void Canvas::changePaperTexture(bool increment)
+{
+  if(increment)
+    _paperTextureIndex = (_paperTextureIndex+1) % TextureManager::getPaperTexturesNumber();
+  else
+  {
+    _paperTextureIndex--;
+    if(_paperTextureIndex < 0)
+      _paperTextureIndex = TextureManager::getPaperTexturesNumber() - 1;
+  }
+}
+
+void Canvas::Render(const StrokeRenderer *iRenderer)
+{
+  for (unsigned i = 0; i < _StyleModules.size(); i++) {
+    if(!_StyleModules[i]->getDisplayed() || !_Layers[i])
+      continue;
+    _Layers[i]->Render(iRenderer);
+  }
+}
+
+void Canvas::RenderBasic(const StrokeRenderer *iRenderer)
+
+{
+  for (unsigned i = 0; i < _StyleModules.size(); i++) {
+    if(!_StyleModules[i]->getDisplayed() || !_Layers[i])
+      continue;
+    _Layers[i]->RenderBasic(iRenderer);
+  }
+}
+
+void Canvas::loadMap(const char *iFileName, const char *iMapName, unsigned int iNbLevels, float iSigma){
+  // check whether this map was already loaded:
+  if(!_maps.empty()){
+    mapsMap::iterator m = _maps.find(iMapName);
+    if(m!=_maps.end()){
+      // lazy check for size changes
+      ImagePyramid * pyramid = (*m).second;
+      if((pyramid->width() != width()) || (pyramid->height() != height())){
+        delete pyramid;
+      }else{
+        return;
+      }
+    }
+  }
+  string filePath;
+  if(_MapsPath){
+    filePath = _MapsPath;
+    filePath += iFileName;
+  }else{
+    filePath = iFileName;
+  }
+  QImage * qimg;
+  QImage newMap(filePath.c_str()); 
+  if(newMap.isNull()){
+    cout << "Could not load image file " << filePath << endl;
+    return;
+  }
+  qimg = &newMap;
+  
+  //resize
+  QImage scaledImg;
+  if((newMap.width()!=width()) || (newMap.height()!=height())){
+	  scaledImg = newMap.scaled(width(), height(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+    qimg = &scaledImg;
+  }
+
+  // deal with color image 
+  //  if(newMap->depth() != 8){
+  //    int w = newMap->width();
+  //    int h = newMap->height();
+  //    QImage *tmp = new QImage(w, h, 8);
+  //    for(unsigned y=0;y<h;++y){
+  //      for(unsigned x=0;x<w;++x){
+  //        int c = qGray(newMap->pixel(x,y));
+  //        tmp->setPixel(x,y,c);
+  //      }
+  //    }
+  //    delete newMap;
+  //    newMap = tmp;
+  //  }
+
+  unsigned x,y;
+  int w = qimg->width();
+  int h = qimg->height();
+  GrayImage tmp(w,h);
+  for(y=0; y<h;++y){
+    for(x=0;x<w;++x){
+      float c = qGray(qimg->pixel(x,y));// /255.f;
+      tmp.setPixel(x,y,c);
+    }
+  }
+
+  //  GrayImage blur(w,h);
+  //  GaussianFilter gf(4.f);
+  //  //int bound = gf.getBound();
+  //  for(y=0; y<h;++y){
+  //    for(x=0;x<w;++x){
+  //      int c = gf.getSmoothedPixel<GrayImage>(&tmp, x,y);
+  //      blur.setPixel(x,y,c);
+  //    }
+  //  }
+
+  GaussianPyramid *pyramid = new GaussianPyramid(tmp, iNbLevels, iSigma);
+  int ow = pyramid->width(0);
+  int oh = pyramid->height(0);
+  QString base(iMapName);
+  for(unsigned i=0; i<pyramid->getNumberOfLevels(); ++i){
+    // save each image:
+    //    w = pyramid.width(i);
+    //    h = pyramid.height(i);
+	  QImage qtmp(ow, oh, QImage::Format_RGB32);
+    //int k = (1<<i);
+    for(y=0;y<oh;++y){
+      for(x=0;x<ow;++x){
+        int c = pyramid->pixel(x,y,i);//255*pyramid->pixel(x,y,i);
+        qtmp.setPixel(x,y,qRgb(c,c,c));
+      }
+    }
+    qtmp.save(base+QString::number(i)+".bmp", "BMP");
+  }
+  //  QImage *qtmp = new QImage(w, h, 32);
+  //  for(y=0;y<h;++y){
+  //    for(x=0;x<w;++x){
+  //      int c = (int)blur.pixel(x,y);
+  //      qtmp->setPixel(x,y,qRgb(c,c,c));
+  //    }
+  //  }
+  //  delete newMap;
+  //  newMap = qtmp;
+  //
+  _maps[iMapName] = pyramid;
+  //  newMap->save("toto.bmp", "BMP");
+}
+
+float Canvas::readMapPixel(const char *iMapName, int level, int x, int y){
+  if(_maps.empty()){
+    cout << "readMapPixel warning: no map was loaded "<< endl;
+    return -1;
+  }
+  mapsMap::iterator m = _maps.find(iMapName);
+  if(m==_maps.end()){
+    cout << "readMapPixel warning: no map was loaded with the name " << iMapName << endl;
+    return -1;
+  }
+  ImagePyramid *pyramid = (*m).second;
+  if((x<0) || (x>=pyramid->width()) || (y<0) || (y>=pyramid->height()))
+    return 0;
+  
+  return pyramid->pixel(x,height()-1-y,level);
+}
diff --git a/extern/freestyle/src/stroke/Canvas.h b/extern/freestyle/src/stroke/Canvas.h
new file mode 100755
index 00000000000..cae50162933
--- /dev/null
+++ b/extern/freestyle/src/stroke/Canvas.h
@@ -0,0 +1,198 @@
+//
+//  Filename         : Canvas.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Class to define a canvas designed to draw style modules
+//  Date of creation : 20/10/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  CANVAS_H
+# define CANVAS_H
+
+# include <deque>
+# include <vector>
+# include <map>
+# include "../system/FreestyleConfig.h"
+# include "StrokeLayer.h"
+# include "../geometry/BBox.h"
+# include "../geometry/Geom.h"
+
+using namespace Geometry;
+
+struct ltstr
+{
+  bool operator()(const char* s1, const char* s2) const
+  {
+    return strcmp(s1, s2) < 0;
+  }
+};
+
+class InformationMap;
+class StrokeRenderer;
+class ViewMap;
+class ViewEdge;
+class FEdge;
+class RGBImage;
+class GrayImage;
+class QImage;
+class ImagePyramid;
+class SteerableViewMap;
+class StyleModule;
+
+/*! Class to define the canvas on which strokes are drawn.
+ *  It's used to store state information about the drawing.
+ */
+class LIB_STROKE_EXPORT Canvas 
+{
+public:
+  /*! Returns a pointer on the Canvas instance */
+  static Canvas * getInstance() {return _pInstance;}
+  typedef std::map<const char*, ImagePyramid*, ltstr> mapsMap ;
+  static const int NB_STEERABLE_VIEWMAP = 5;
+protected:
+  static Canvas *_pInstance;
+  std::deque<StrokeLayer*> _Layers;
+  std::deque<StyleModule*> _StyleModules;
+  FEdge *_SelectedFEdge;
+  int _paperTextureIndex;
+  bool _drawPaper;
+  StrokeRenderer *_Renderer;
+  StyleModule* _current_sm;
+  mapsMap _maps;
+  static const char * _MapsPath;
+  SteerableViewMap *_steerableViewMap;
+  
+public:
+  /* Builds the Canvas */
+  Canvas();
+  /* Copy constructor */
+  Canvas(const Canvas& iBrother);
+  /* Destructor */
+  virtual ~Canvas();
+
+  /* operations that need to be done before a draw */
+  virtual void preDraw();
+
+  /* Draw the canvas using the current shader */
+  virtual void Draw();
+
+  /* operations that need to be done after a draw */
+  virtual void postDraw();
+
+  /* Renders the created strokes */
+  virtual void Render(const StrokeRenderer *iRenderer);
+  /* Basic Renders the created strokes */
+  virtual void RenderBasic(const StrokeRenderer *iRenderer);
+  /* Renders a stroke */
+  virtual void RenderStroke(Stroke *iStroke) = 0;
+  
+  /* init the canvas */
+  virtual void init() = 0;
+  
+  /* Clears the Canvas (shaders stack, layers stack...)*/
+  void Clear();
+
+  /* Erases the layers */
+  virtual void Erase(); 
+
+  /* Reads a pixel area from the canvas */
+  virtual void readColorPixels(int x, int y,int w, int h, RGBImage& oImage) const = 0;
+  /* Reads a depth pixel area from the canvas */
+  virtual void readDepthPixels(int x, int y,int w, int h, GrayImage& oImage) const = 0;
+
+  /* update the canvas (display) */
+  virtual void update() = 0;
+
+  /* checks whether the canvas is empty or not */
+  bool isEmpty() const {return (_Layers.empty());}
+
+  /* Maps management */
+  /*! Loads an image map. The map will be scaled 
+   *  (without preserving the ratio in order 
+   *  to fit the actual canvas size.)
+   *  The image must be a gray values image...
+   *  \param iFileName
+   *    The name of the image file
+   *  \param iMapName
+   *    The name that will be used to access
+   *    this image
+   *  \param iNbLevels
+   *    The number of levels in the map pyramid. (default = 4).
+   *    If iNbLevels == 0, the complete pyramid is built.
+   */
+  void loadMap(const char *iFileName, const char *iMapName, unsigned iNbLevels=4, float iSigma = 1.f);
+
+  /*! Reads a pixel value in a map.
+   *  Returns a value between 0 and 1.
+   *  \param iMapName
+   *    The name of the map
+   *  \param level
+   *    The level of the pyramid from which the pixel must 
+   *    be read.
+   *  \param x
+   *    The abscissa of the desired pixel specified in level0 coordinate 
+   *    system. The origin is the lower left corner.
+   *  \param y
+   *    The ordinate of the desired pixel specified in level0 coordinate 
+   *    system. The origin is the lower left corner.
+   */
+  float readMapPixel(const char *iMapName, int level, int x, int y);
+
+  /*! Sets the steerable viewmap */
+  void loadSteerableViewMap(SteerableViewMap * iSVM) {_steerableViewMap = iSVM;}
+
+  /*! Returns the steerable VM */
+  SteerableViewMap * getSteerableViewMap() {return _steerableViewMap;}
+  
+  /*! accessors */
+  inline const FEdge * selectedFEdge() const {return _SelectedFEdge;}
+  inline FEdge * selectedFEdge() {return _SelectedFEdge;}
+  virtual int width() const = 0;
+  virtual int height() const = 0;
+  inline int currentPaperTextureIndex() const {return _paperTextureIndex;}
+  virtual BBox<Vec3r> scene3DBBox() const = 0;
+  inline const StrokeRenderer * renderer() const {return _Renderer;}
+  inline StyleModule* getCurrentStyleModule() { return _current_sm; }
+  virtual bool getRecordFlag() const {return false;}
+
+  /*! modifiers */
+  inline void SetSelectedFEdge(FEdge *iFEdge) {_SelectedFEdge = iFEdge;}
+  /*! inserts a shader at pos index+1 */
+  void InsertStyleModule(unsigned index, StyleModule *iStyleModule);
+  void RemoveStyleModule(unsigned index);
+  void SwapStyleModules(unsigned i1, unsigned i2);
+  void ReplaceStyleModule(unsigned index, StyleModule *iStyleModule);
+  void SetVisible(unsigned index, bool iVisible) ;
+  //inline void SetDensityMap(InformationMap<RGBImage>* iMap) {_DensityMap = iMap;}
+  inline void AddLayer(StrokeLayer *iLayer) {_Layers.push_back(iLayer);}
+  inline void SetCurrentPaperTextureIndex(int i) {_paperTextureIndex = i;}
+  void changePaperTexture(bool increment=true) ;
+  /*! enables/disables paper texture */
+  inline void togglePaperTexture() {_drawPaper = !_drawPaper;}
+  void resetModified(bool iMod=false);
+  void causalStyleModules(std::vector<unsigned>& vec, unsigned index = 0);
+  void setModified(unsigned index, bool b);
+};
+
+#endif // CANVAS_H
diff --git a/extern/freestyle/src/stroke/Chain.cpp b/extern/freestyle/src/stroke/Chain.cpp
new file mode 100755
index 00000000000..3776cd58a03
--- /dev/null
+++ b/extern/freestyle/src/stroke/Chain.cpp
@@ -0,0 +1,126 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "Chain.h"
+#include "../view_map/ViewMapIterators.h"
+#include "../view_map/ViewMapAdvancedIterators.h"
+
+void Chain::push_viewedge_back(ViewEdge *iViewEdge, bool orientation)
+{
+  ViewEdge::vertex_iterator v;
+  ViewEdge::vertex_iterator vend;
+  ViewEdge::vertex_iterator vfirst;
+  Vec3r previous, current;
+  if(true == orientation)
+  {
+    v=iViewEdge->vertices_begin();
+    vfirst = v;
+    vend=iViewEdge->vertices_end();
+  }
+  else
+  {
+    v=iViewEdge->vertices_last();
+    vfirst = v;
+    vend=iViewEdge->vertices_end();
+  }
+
+  if(!_Vertices.empty())
+  {
+    previous = _Vertices.back()->point2d();
+    if(orientation)
+      ++v;
+    else
+      --v;
+  }
+  else
+    previous = (*v)->point2d(); 
+  do{
+    current = (*v)->point2d();
+    Curve::push_vertex_back(*v);
+    //_Length += (current-previous).norm();
+    previous = current;
+    if(orientation)
+      ++v;
+    else
+      --v;
+  }while((v!=vend) && (v!=vfirst));
+
+  if(v==vfirst)
+  {
+    //Add last one:
+    current = (*v)->point2d();
+    Curve::push_vertex_back(*v);
+    //_Length += (current-previous).norm();
+  }
+} 
+
+void Chain::push_viewedge_front(ViewEdge *iViewEdge, bool orientation)
+{
+  orientation = !orientation;
+  ViewEdge::vertex_iterator v;
+  ViewEdge::vertex_iterator vend;
+  ViewEdge::vertex_iterator vfirst;
+  Vec3r previous, current;
+  if(true == orientation)
+  {
+    v=iViewEdge->vertices_begin();
+    vfirst = v;
+    vend=iViewEdge->vertices_end();
+  }
+  else
+  {
+    v=iViewEdge->vertices_last();
+    vfirst = v;
+    vend=iViewEdge->vertices_end();
+  }
+
+  if(!_Vertices.empty())
+  {
+    previous = _Vertices.front()->point2d();
+    if(orientation)
+      ++v;
+    else
+      --v;
+  }
+  else
+    previous = (*v)->point2d(); 
+  do{
+    current = (*v)->point2d();
+    Curve::push_vertex_front((*v));
+    //_Length += (current-previous).norm();
+    previous = current;
+    if(orientation)
+      ++v;
+    else
+      --v;
+  }while((v!=vend) && (v!=vfirst));
+  
+  if(v==vfirst)
+  {
+    //Add last one:
+    current = (*v)->point2d();
+    Curve::push_vertex_front(*v);
+    //_Length += (current-previous).norm();
+  }
+}
+
+
+
diff --git a/extern/freestyle/src/stroke/Chain.h b/extern/freestyle/src/stroke/Chain.h
new file mode 100755
index 00000000000..042437a4154
--- /dev/null
+++ b/extern/freestyle/src/stroke/Chain.h
@@ -0,0 +1,82 @@
+//
+//  Filename         : Chain.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Class to define a chain of viewedges.
+//  Date of creation : 09/01/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  CHAIN_H
+# define CHAIN_H
+
+# include "../view_map/ViewMap.h"
+# include "Curve.h"
+/*! Class to represent a 1D elements issued
+ *  from the chaining process.
+ *  A Chain is the last step before the Stroke and
+ *  is used in the Splitting and Creation processes.
+ */
+class Chain : public Curve
+{
+protected:
+  // tmp
+  Id * _splittingId;
+public:
+  /*! Defult constructor. */
+  Chain() : Curve() {_splittingId=0;}
+  /*! Builds a chain from its Id. */
+  Chain(const Id& id) : Curve(id) {_splittingId=0;}
+  /*! Copy Constructor */
+  Chain(const Chain& iBrother) : Curve(iBrother) {_splittingId=iBrother._splittingId;}
+  /*! Destructor. */
+  virtual ~Chain() {
+    // only the last splitted deletes this id
+    if(_splittingId){
+      if(*_splittingId == _Id)
+        delete _splittingId;
+    }
+  }
+
+  /*! Adds a ViewEdge at the end of the chain
+   *  \param iViewEdge
+   *    The ViewEdge that must be added.
+   *  \param orientation
+   *    The orientation with which this ViewEdge
+   *    must be processed.
+   */
+  void push_viewedge_back(ViewEdge *iViewEdge, bool orientation) ;
+  /*! Adds a ViewEdge at the beginning of the chain
+   *  \param iViewEdge
+   *    The ViewEdge that must be added.
+   *  \param orientation
+   *    The orientation with which this ViewEdge
+   *    must be processed.
+   */
+  void push_viewedge_front(ViewEdge *iViewEdge, bool orientation) ;
+
+  inline void setSplittingId(Id * sid){_splittingId = sid;}
+  inline Id* getSplittingId() {return _splittingId;}
+};
+
+#endif // CHAIN_H
diff --git a/extern/freestyle/src/stroke/ChainingIterators.cpp b/extern/freestyle/src/stroke/ChainingIterators.cpp
new file mode 100755
index 00000000000..206b6eb7364
--- /dev/null
+++ b/extern/freestyle/src/stroke/ChainingIterators.cpp
@@ -0,0 +1,147 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+#include "ChainingIterators.h"
+#include "../system/TimeStamp.h"
+
+ViewEdge* AdjacencyIterator::operator*() {
+  return (*_internalIterator).first;
+}
+bool AdjacencyIterator::isIncoming() const{
+  return (*_internalIterator).second;
+}
+
+void AdjacencyIterator::increment(){
+  ++_internalIterator;
+  while((!_internalIterator.isEnd()) && (!isValid((*_internalIterator).first)))
+    ++_internalIterator;
+}
+
+bool AdjacencyIterator::isValid(ViewEdge* edge){
+  if(_restrictToSelection)
+    if(edge->getTimeStamp() != TimeStamp::instance()->getTimeStamp())
+      return false;
+  if(_restrictToUnvisited)
+    if(edge->getChainingTimeStamp() > TimeStamp::instance()->getTimeStamp())
+      return false;
+    return true;
+}
+
+void ChainingIterator::increment() {
+  _increment = true;
+  ViewVertex * vertex = getVertex();
+  if(!vertex){
+    _edge = 0;
+    return;
+  }
+  AdjacencyIterator it = AdjacencyIterator(vertex, _restrictToSelection, _restrictToUnvisited);
+  if(it.isEnd())
+    _edge = 0;
+  else
+    _edge = traverse(it);
+  if(_edge == 0)
+    return;
+  if(_edge->A() == vertex)
+    _orientation = true;
+  else
+    _orientation = false;
+}
+
+void ChainingIterator::decrement() {
+  _increment = false;
+  ViewVertex * vertex = getVertex();
+  if(!vertex){
+    _edge = 0;
+    return;
+  }
+  AdjacencyIterator it = AdjacencyIterator(vertex, _restrictToSelection, _restrictToUnvisited);
+  if(it.isEnd())
+    _edge = 0;
+  else
+    _edge = traverse(it);
+  if(_edge == 0)
+    return;
+  if(_edge->B() == vertex)
+    _orientation = true;
+  else
+    _orientation = false;
+}
+
+//
+// ChainSilhouetteIterators
+//
+///////////////////////////////////////////////////////////
+
+ViewEdge * ChainSilhouetteIterator::traverse(const AdjacencyIterator& ait){
+  AdjacencyIterator it(ait);
+  ViewVertex* nextVertex = getVertex();
+  // we can't get a NULL nextVertex here, it was intercepted
+  // before
+  if(nextVertex->getNature() & Nature::T_VERTEX){
+    TVertex * tvertex = (TVertex*)nextVertex;
+    ViewEdge *mate = (tvertex)->mate(getCurrentEdge());
+    while(!it.isEnd()){
+      ViewEdge *ve = *it;
+      if(ve == mate)
+        return ve;
+      ++it;
+    }
+    return 0;
+  }
+  if(nextVertex->getNature() & Nature::NON_T_VERTEX){
+    NonTVertex * nontvertex = (NonTVertex*)nextVertex;
+    ViewEdge * newEdge(0);
+    // we'll try to chain the edges by keeping the same nature...
+    // the preseance order is : SILHOUETTE, BORDER, CREASE, SUGGESTIVE, VALLEY, RIDGE
+    Nature::EdgeNature natures[6] = {Nature::SILHOUETTE, Nature::BORDER, Nature::CREASE, Nature::SUGGESTIVE_CONTOUR, Nature::VALLEY, Nature::RIDGE};
+    for(unsigned i=0; i<6; ++i){
+      if(getCurrentEdge()->getNature() & natures[i]){
+        int n = 0;
+        while(!it.isEnd()){
+          ViewEdge *ve = *it;
+          if(ve->getNature() & natures[i]){
+            ++n;
+            newEdge = ve;
+          } 
+          ++it;
+        } 
+        if(n == 1){
+          return newEdge;
+        }else{
+          return 0;
+        }   
+      } 
+    }
+  }
+  return 0;
+}
+
+ViewEdge * ChainPredicateIterator::traverse(const AdjacencyIterator& ait){
+  AdjacencyIterator it(ait);
+  // Iterates over next edges to see if one of them 
+  // respects the predicate:
+  while(!it.isEnd()) {
+    ViewEdge *ve = *it;
+    if(((*_unary_predicate)(*ve)) && ((*_binary_predicate)(*(getCurrentEdge()),*(ve))))
+        return ve;
+    ++it;
+  }
+  return 0;
+} 
diff --git a/extern/freestyle/src/stroke/ChainingIterators.h b/extern/freestyle/src/stroke/ChainingIterators.h
new file mode 100755
index 00000000000..1e946855dce
--- /dev/null
+++ b/extern/freestyle/src/stroke/ChainingIterators.h
@@ -0,0 +1,364 @@
+//
+//  Filename         : ChainingIterators
+//  Author           : Stephane Grabli
+//  Purpose          : Chaining iterators
+//  Date of creation : 01/07/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+#ifndef  CHAININGITERATORS_H
+# define CHAININGITERATORS_H
+
+# include <iostream>
+# include "../view_map/ViewMap.h"
+# include "../view_map/ViewMapIterators.h"
+# include "../view_map/ViewMapAdvancedIterators.h"
+# include "Predicates1D.h"
+
+//using namespace ViewEdgeInternal;
+
+//
+// Adjacency iterator used in the chaining process
+//
+///////////////////////////////////////////////////////////
+class LIB_STROKE_EXPORT AdjacencyIterator{
+protected:
+  ViewVertexInternal::orientedViewEdgeIterator _internalIterator;
+  bool _restrictToSelection;
+  bool _restrictToUnvisited;
+public:
+  AdjacencyIterator(){
+    _restrictToSelection = true;
+    _restrictToUnvisited = true;
+  }
+  AdjacencyIterator(ViewVertex *iVertex, bool iRestrictToSelection = true, bool iRestrictToUnvisited = true){
+    _restrictToSelection = iRestrictToSelection;
+    _restrictToUnvisited = iRestrictToUnvisited;
+    _internalIterator = iVertex->edgesBegin();
+    while((!_internalIterator.isEnd()) && (!isValid((*_internalIterator).first)))
+      ++_internalIterator;
+  }
+  AdjacencyIterator(const AdjacencyIterator& iBrother){
+    _internalIterator = iBrother._internalIterator;
+    _restrictToSelection = iBrother._restrictToSelection;
+    _restrictToUnvisited = iBrother._restrictToUnvisited;
+  }
+  AdjacencyIterator& operator=(const AdjacencyIterator& iBrother) {  
+    _internalIterator = iBrother._internalIterator;
+    _restrictToSelection = iBrother._restrictToSelection;
+    _restrictToUnvisited = iBrother._restrictToUnvisited;  
+    return *this;
+  } 
+  virtual ~AdjacencyIterator(){
+  }
+  
+  inline bool isEnd(){
+    return _internalIterator.isEnd();
+  }
+  inline bool isBegin(){
+    return _internalIterator.isBegin();
+  }
+  /*! Returns true if the current ViewEdge is is coming
+   *  towards the iteration vertex. False otherwise.
+   */
+  bool isIncoming() const ;
+
+  /*! Returns a *pointer* to the pointed ViewEdge. */
+  virtual ViewEdge* operator*() ;
+  virtual ViewEdge* operator->() {return operator*();}
+  virtual AdjacencyIterator& operator++() {
+    increment();
+    return *this;
+  }
+  virtual AdjacencyIterator operator++(int) {
+    AdjacencyIterator tmp(*this);
+    increment();
+    return tmp;
+  }
+  void increment();
+  
+protected:
+  bool isValid(ViewEdge* edge);
+};
+
+//
+// Base class for Chaining Iterators
+//
+///////////////////////////////////////////////////////////
+
+/*! Base class for chaining iterators.
+ *  This class is designed to be overloaded
+ *  in order to describe chaining rules.
+ *  It makes the works of chaining rules description 
+ *  easier.
+ *  The two main methods that need to overloaded are 
+ *  traverse() and init(). 
+ *  traverse() tells which ViewEdge to follow, among the adjacent ones.
+ *  If you specify restriction rules (such as "Chain only 
+ *  ViewEdges of the selection"), they will be included 
+ *  in the adjacency iterator. (i.e, the adjacent iterator 
+ *  will only stop on "valid" edges).
+ */
+class LIB_STROKE_EXPORT ChainingIterator : public ViewEdgeInternal::ViewEdgeIterator{
+protected:
+  bool _restrictToSelection;
+  bool _restrictToUnvisited;
+  bool _increment; //true if we're currently incrementing, false when decrementing
+  
+public:
+  /*! Builds a Chaining Iterator from the first ViewEdge used for iteration
+   *  and its orientation.
+   *  \param iRestrictToSelection
+   *    Indicates whether to force the chaining to stay within
+   *    the set of selected ViewEdges or not.
+   *  \param iRestrictToUnvisited
+   *    Indicates whether a ViewEdge that has already been chained
+   *    must be ignored ot not.
+   *  \param begin
+   *    The ViewEdge from which to start the chain.
+   *  \param orientation
+   *    The direction to follow to explore the graph. If true,
+   *    the direction indicated by the first ViewEdge is used.
+   */
+  ChainingIterator(bool iRestrictToSelection = true, bool iRestrictToUnvisited = true, ViewEdge* begin = 0, bool orientation = true)
+    : ViewEdgeIterator(begin, orientation) {
+    _restrictToSelection = iRestrictToSelection;
+    _restrictToUnvisited = iRestrictToUnvisited;
+    _increment = true;
+  }
+
+  /*! Copy constructor */
+  ChainingIterator(const ChainingIterator& brother)
+    : ViewEdgeIterator(brother) {
+    _restrictToSelection = brother._restrictToSelection;
+    _restrictToUnvisited = brother._restrictToUnvisited;
+    _increment = brother._increment;
+  }
+
+  /*! Returns the string "ChainingIterator" */
+  virtual string getExactTypeName() const {
+    return "ChainingIterator";
+  }
+
+  /*! Inits the iterator context.
+   *  This method is called each time 
+   *  a new chain is started.
+   *  It can be used to reset some 
+   *  history information that you 
+   *  might want to keep.  
+   */
+  virtual void init(){}
+  
+  /*! This method iterates over the potential next 
+   *  ViewEdges and returns the one that will be 
+   *  followed next.
+   *  returns the next ViewEdge to follow or 
+   *  0 when the end of the chain is reached.
+   *  \param it
+   *    The iterator over the ViewEdges adjacent to 
+   *    the end vertex of the current ViewEdge.
+   *    The Adjacency iterator reflects the restriction 
+   *    rules by only iterating over the valid ViewEdges.
+   */
+  virtual ViewEdge * traverse(const AdjacencyIterator &it){
+    cerr << "Warning: the traverse method was not defined" << endl;
+    return 0;
+  }
+  
+  /* accessors */
+  /*! Returns true if the orientation of the current ViewEdge 
+   *  corresponds to its natural orientation
+   */
+  //inline bool getOrientation() const {}
+  /*! Returns the vertex which is the next crossing */
+  inline ViewVertex * getVertex() {
+    if(_increment){
+      if(_orientation){
+        return _edge->B();
+      }else{
+        return _edge->A();
+      }  
+    }else{
+      if(_orientation){
+        return _edge->A();
+      }else{
+        return _edge->B();
+      }
+    }
+  }
+
+  /*! Returns true if the current iteration is an incrementation */
+  inline bool isIncrementing() const{
+    return _increment;
+  }
+  
+  /* increments.*/
+  virtual void increment() ;
+  virtual void decrement() ;
+};
+
+//
+// Chaining iterators definitions
+//
+///////////////////////////////////////////////////////////
+
+/*! A ViewEdge Iterator used to follow ViewEdges the most naturally.
+ *  For example, it will follow visible ViewEdges of same nature.
+ *  As soon, as the nature or the visibility changes, the iteration
+ *  stops (by setting the pointed ViewEdge to 0).
+ *  In the case of an iteration over a set of ViewEdge that are both
+ *  Silhouette and Crease, there will be a precedence of the silhouette
+ *  over the crease criterion.
+ */
+class LIB_STROKE_EXPORT ChainSilhouetteIterator : public ChainingIterator
+{
+public:
+  /*! Builds a ChainSilhouetteIterator from the first ViewEdge used for iteration
+   *  and its orientation.
+   *  \param iRestrictToSelection
+   *    Indicates whether to force the chaining to stay within
+   *    the set of selected ViewEdges or not.
+   *  \param begin
+   *    The ViewEdge from where to start the iteration.
+   *  \param orientation
+   *    If true, we'll look for the next ViewEdge among the
+   *    ViewEdges that surround the ending ViewVertex of begin.
+   *    If false, we'll search over the ViewEdges surrounding
+   *    the ending ViewVertex of begin.
+   */
+  ChainSilhouetteIterator(bool iRestrictToSelection = true, ViewEdge* begin = NULL, bool orientation = true)
+    : ChainingIterator(iRestrictToSelection, true, begin, orientation) {}
+
+  /*! Copy constructor */
+  ChainSilhouetteIterator(const ChainSilhouetteIterator& brother)
+    : ChainingIterator(brother) {}
+
+  /*! Returns the string "ChainSilhouetteIterator" */
+  virtual string getExactTypeName() const {
+    return "ChainSilhouetteIterator";
+  }
+
+  /*! This method iterates over the potential next 
+   *  ViewEdges and returns the one that will be 
+   *  followed next.
+   *  When reaching the end of a chain, 0 is returned.
+   */
+  virtual ViewEdge * traverse(const AdjacencyIterator& it);
+
+};
+
+//
+// ChainPredicateIterator
+//
+///////////////////////////////////////////////////////////
+
+/*! A "generic" user-controlled ViewEdge iterator. This iterator
+ *  is in particular built from a unary predicate and a binary predicate.
+ *  First, the unary predicate is evaluated for all potential next ViewEdges
+ *  in order to only keep the ones respecting a certain constraint.
+ *  Then, the binary predicate is evaluated on the current ViewEdge
+ *  together with each ViewEdge of the previous selection. The first
+ *  ViewEdge respecting both the unary predicate and the binary predicate
+ *  is kept as the next one. If none of the potential next ViewEdge respects
+ *  these 2 predicates, 0 is returned.
+ */
+class LIB_STROKE_EXPORT ChainPredicateIterator : public ChainingIterator
+{
+protected:
+  BinaryPredicate1D *_binary_predicate; // the caller is responsible for the deletion of this object
+  UnaryPredicate1D  *_unary_predicate;  // the caller is responsible for the deletion of this object
+public:
+
+  /*! Builds a ChainPredicateIterator from a starting ViewEdge and its orientation.
+   *  \param iRestrictToSelection
+   *    Indicates whether to force the chaining to stay within
+   *    the set of selected ViewEdges or not.
+   *  \param iRestrictToUnvisited
+   *    Indicates whether a ViewEdge that has already been chained
+   *    must be ignored ot not.
+   *  \param begin
+   *    The ViewEdge from where to start the iteration.
+   *  \param orientation
+   *    If true, we'll look for the next ViewEdge among the
+   *    ViewEdges that surround the ending ViewVertex of begin.
+   *    If false, we'll search over the ViewEdges surrounding
+   *    the ending ViewVertex of begin.
+   */
+  ChainPredicateIterator(bool iRestrictToSelection = true, bool iRestrictToUnvisited = true, ViewEdge* begin = NULL, bool orientation = true)
+    : ChainingIterator(iRestrictToSelection, iRestrictToUnvisited, begin, orientation) {
+    _binary_predicate = 0;
+    _unary_predicate = 0;
+  }
+
+  /*! Builds a ChainPredicateIterator from a unary predicate, a binary predicate, a starting ViewEdge and its orientation.
+   *  \param iRestrictToSelection
+   *    Indicates whether to force the chaining to stay within
+   *    the set of selected ViewEdges or not.
+   *  \param iRestrictToUnvisited
+   *    Indicates whether a ViewEdge that has already been chained
+   *    must be ignored ot not.
+   *  \param upred
+   *    The unary predicate that the next ViewEdge must satisfy.
+   *  \param bpred
+   *    The binary predicate that the next ViewEdge must satisfy
+   *    together with the actual pointed ViewEdge. 
+   *  \param begin
+   *    The ViewEdge from where to start the iteration.
+   *  \param orientation
+   *    If true, we'll look for the next ViewEdge among the
+   *    ViewEdges that surround the ending ViewVertex of begin.
+   *    If false, we'll search over the ViewEdges surrounding
+   *    the ending ViewVertex of begin.
+   */
+  ChainPredicateIterator(UnaryPredicate1D& upred, BinaryPredicate1D& bpred, bool iRestrictToSelection = true, bool iRestrictToUnvisited = true, ViewEdge* begin = NULL, bool orientation = true)
+    : ChainingIterator(iRestrictToSelection, iRestrictToUnvisited, begin, orientation) {
+    _unary_predicate = &upred;
+    _binary_predicate = &bpred;
+  }
+
+  /*! Copy constructor */
+  ChainPredicateIterator(const ChainPredicateIterator& brother)
+    : ChainingIterator(brother){
+    _unary_predicate = brother._unary_predicate;
+    _binary_predicate = brother._binary_predicate;
+  }
+
+  /*! Destructor. */
+  virtual ~ChainPredicateIterator(){
+    _unary_predicate = 0;
+    _binary_predicate = 0;
+  }
+
+  /*! Returns the string "ChainPredicateIterator" */
+  virtual string getExactTypeName() const {
+    return "ChainPredicateIterator";
+  }
+
+  /*! This method iterates over the potential next 
+   *  ViewEdges and returns the one that will be 
+   *  followed next.
+   *  When reaching the end of a chain, 0 is returned.
+   */
+  virtual ViewEdge * traverse(const AdjacencyIterator &it); 
+};
+
+#endif // CHAININGITERATORS_H
diff --git a/extern/freestyle/src/stroke/ContextFunctions.cpp b/extern/freestyle/src/stroke/ContextFunctions.cpp
new file mode 100755
index 00000000000..b55da1fb0f8
--- /dev/null
+++ b/extern/freestyle/src/stroke/ContextFunctions.cpp
@@ -0,0 +1,60 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "ContextFunctions.h"
+#include "../view_map/SteerableViewMap.h"
+#include "../system/TimeStamp.h"
+namespace ContextFunctions {
+  
+  unsigned GetTimeStampCF(){
+    return TimeStamp::instance()->getTimeStamp();
+  }
+
+  unsigned GetCanvasWidthCF(){
+    return Canvas::getInstance()->width();
+  }
+
+  unsigned GetCanvasHeightCF(){
+    return Canvas::getInstance()->height();
+  }
+  void LoadMapCF(const char *iFileName, const char *iMapName, unsigned iNbLevels, float iSigma ){
+    return Canvas::getInstance()->loadMap(iFileName, iMapName, iNbLevels,iSigma);
+  }
+
+  float ReadMapPixelCF(const char *iMapName, int level, unsigned x, unsigned y){
+    Canvas * canvas = Canvas::getInstance();
+    return canvas->readMapPixel(iMapName, level, x,y);
+  }
+
+  float ReadCompleteViewMapPixelCF(int level, unsigned x, unsigned y){
+	  SteerableViewMap *svm = Canvas::getInstance()->getSteerableViewMap();
+    return svm->readCompleteViewMapPixel(level,x,y);
+  }
+
+  float ReadDirectionalViewMapPixelCF(int iOrientation, int level, unsigned x, unsigned y){
+    SteerableViewMap *svm = Canvas::getInstance()->getSteerableViewMap();
+    return svm->readSteerableViewMapPixel(iOrientation, level,x,y);
+  }
+
+  FEdge * GetSelectedFEdgeCF(){
+    return Canvas::getInstance()->selectedFEdge();
+  }
+}
diff --git a/extern/freestyle/src/stroke/ContextFunctions.h b/extern/freestyle/src/stroke/ContextFunctions.h
new file mode 100755
index 00000000000..37c98656fa7
--- /dev/null
+++ b/extern/freestyle/src/stroke/ContextFunctions.h
@@ -0,0 +1,124 @@
+//
+//  Filename         : AdvancedFunctions0D.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Functions related to context queries
+//  Date of creation : 20/12/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  CONTEXT_FUNCTIONS_HPP
+# define CONTEXT_FUNCTIONS_HPP
+
+# include "Canvas.h"
+# include "../image/Image.h"
+# include "../image/GaussianFilter.h"
+
+/*! \file ContextFunctions.h
+ *  Interface to access the context related
+ *  information.
+ */
+//
+// Context Functions definitions
+//
+///////////////////////////////////////////////////////////
+/*! namespace containing all the Context related functions */
+namespace ContextFunctions {
+
+  // GetTimeStamp
+  LIB_STROKE_EXPORT
+  /*! Returns the system time stamp */
+  unsigned GetTimeStampCF();
+
+  // GetCanvasWidth
+  /*! Returns the canvas width */
+  LIB_STROKE_EXPORT
+  unsigned GetCanvasWidthCF();
+ 
+  // GetCanvasHeight
+  /*! Returns the canvas width */
+  LIB_STROKE_EXPORT 
+  unsigned GetCanvasHeightCF();
+  
+  // Load map
+  /*! Loads an image map for further reading */
+  LIB_STROKE_EXPORT 
+  void LoadMapCF(const char *iFileName, const char *iMapName, unsigned iNbLevels=4, float iSigma=1.f);
+
+  // ReadMapPixel
+  /*! Reads a pixel in a user-defined map 
+   *  \return the floating value stored for that pixel
+   *  \param iMapName
+   *    The name of the map
+   *  \param level
+   *    The level of the pyramid in which we wish to read the pixel
+   *  \param x
+   *    The x-coordinate of the pixel we wish to read. The origin is
+   *    in the lower-left corner.
+   *  \param y
+   *    The y-coordinate of the pixel we wish to read. The origin is
+   *    in the lower-left corner.
+   */
+  LIB_STROKE_EXPORT 
+  float ReadMapPixelCF(const char *iMapName, int level, unsigned x, unsigned y);
+
+  // ReadCompleteViewMapPixel
+  /*! Reads a pixel in the complete view map
+   *  \return the floating value stored for that pixel
+   *  \param level
+   *    The level of the pyramid in which we wish to read the pixel
+   *  \param x
+   *    The x-coordinate of the pixel we wish to read. The origin is
+   *    in the lower-left corner.
+   *  \param y
+   *    The y-coordinate of the pixel we wish to read. The origin is
+   *    in the lower-left corner.
+   */
+  LIB_STROKE_EXPORT 
+  float ReadCompleteViewMapPixelCF(int level, unsigned x, unsigned y);
+
+  // ReadOrientedViewMapPixel
+  /*! Reads a pixel in one of the oriented view map images
+   *  \return the floating value stored for that pixel
+   *  \param iOrientation
+   *    The number telling which orientation we want to check
+   *  \param level
+   *    The level of the pyramid in which we wish to read the pixel
+   *  \param x
+   *    The x-coordinate of the pixel we wish to read. The origin is
+   *    in the lower-left corner.
+   *  \param y
+   *    The y-coordinate of the pixel we wish to read. The origin is
+   *    in the lower-left corner.
+   */
+  LIB_STROKE_EXPORT 
+  float ReadDirectionalViewMapPixelCF(int iOrientation, int level, unsigned x, unsigned y);
+
+  // DEBUG
+  LIB_STROKE_EXPORT 
+  FEdge * GetSelectedFEdgeCF();
+
+} // end of namespace ContextFunctions
+
+#endif // CONTEXT_FUNCTIONS_HPP
+
diff --git a/extern/freestyle/src/stroke/Curve.cpp b/extern/freestyle/src/stroke/Curve.cpp
new file mode 100755
index 00000000000..f7b255c3ef4
--- /dev/null
+++ b/extern/freestyle/src/stroke/Curve.cpp
@@ -0,0 +1,818 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "Curve.h"
+#include "CurveIterators.h"
+#include "CurveAdvancedIterators.h"
+
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             CurvePoint         */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+CurvePoint::CurvePoint()
+{
+  __A=0;
+  __B=0;
+  _t2d=0;
+}
+
+CurvePoint::CurvePoint(SVertex *iA, SVertex *iB, float t) 
+{
+  __A=iA;
+  __B=iB;
+  _t2d=t;
+  if((iA == 0) && (t == 1.f))
+  {
+    _Point2d=__B->point2d();
+    _Point3d=__B->point3d();
+  }
+  else if((iB == 0) && (t == 0.f))
+  {
+    _Point2d=__A->point2d();
+    _Point3d=__A->point3d();
+  }
+  else
+  {
+    _Point2d=__A->point2d()+_t2d*(__B->point2d()-__A->point2d());
+    _Point3d=__A->point3d()+_t2d*(__B->point3d()-__A->point3d());
+  }
+}
+
+CurvePoint::CurvePoint(CurvePoint *iA, CurvePoint *iB, float t3) 
+{
+  float t1=iA->t2d();
+  float t2=iB->t2d();
+  if((iA->A() == iB->A()) && (iA->B() == iB->B()) && (iA->A() != 0) && (iA->B() != 0) && (iB->A() != 0) && (iB->B() != 0))
+  {
+    __A=iA->A();
+    __B=iB->B();
+    _t2d=t1+t2*t3-t1*t3;
+  }
+  else if((iA->B() == 0) && (iB->B() == 0))
+  {
+    __A = iA->A();
+    __B = iB->A();
+    _t2d = t3;
+  }
+  else if((iA->t2d() == 0) && (iB->t2d() == 0))
+  {
+    __A = iA->A();
+    __B = iB->A();
+    _t2d = t3;
+  }
+  else if(iA->A() == iB->A()){
+    if(iA->t2d() == 0){
+      __A = iB->A();
+      __B = iB->B();
+      _t2d = t3;
+    }else if(iB->t2d() == 0){
+      __A = iA->A();
+      __B = iA->B();
+      _t2d = t3;
+    }
+  }else if(iA->B() == iB->B()){
+    if(iA->t2d() == 1){
+      __A = iB->A();
+      __B = iB->B();
+      _t2d = t3;
+    }else if(iB->t2d() == 1){
+      __A = iA->A();
+      __B = iA->B();
+      _t2d = t3;
+    }
+  }
+  else if(iA->B() == iB->A())
+  {
+    if((iA->t2d() != 1.f) && (iB->t2d() == 0.f))
+    {
+      __A = iA->A();
+      __B = iA->B();
+      _t2d=t1+t3-t1*t3;
+      //_t2d = t3;
+    }
+    else if((iA->t2d() == 1.f) && (iB->t2d() != 0.f))
+    {
+      __A = iB->A();
+      __B = iB->B();
+      //_t2d = t3;
+      _t2d=t2*t3;
+    }
+    
+  }
+  //_Point2d=__A->point2d()+_t2d*(__B->point2d()-__A->point2d());
+  //_Point3d=__A->point3d()+_t2d*(__B->point3d()-__A->point3d());
+
+  _Point2d= iA->point2d()+t3*(iB->point2d()-iA->point2d());
+  _Point3d=__A->point3d()+_t2d*(__B->point3d()-__A->point3d());
+}
+
+CurvePoint::CurvePoint(const CurvePoint& iBrother) 
+{
+  __A=iBrother.__A;
+  __B=iBrother.__B;
+  _t2d=iBrother._t2d;
+  _Point2d=iBrother._Point2d;
+  _Point3d=iBrother._Point3d;
+}
+
+CurvePoint& CurvePoint::operator=(const CurvePoint& iBrother)
+{
+  __A=iBrother.__A;
+  __B=iBrother.__B;
+  _t2d=iBrother._t2d;
+  _Point2d=iBrother._Point2d;
+  _Point3d=iBrother._Point3d;
+  return *this;
+}
+
+
+FEdge *CurvePoint::fedge() 
+{
+  if(getNature() & Nature::T_VERTEX)
+    return 0;
+  return __A->fedge();
+}
+
+
+FEdge* CurvePoint::getFEdge(Interface0D& inter)
+{
+  CurvePoint* iVertexB = dynamic_cast<CurvePoint*>(&inter);
+  if (!iVertexB)
+    return 0;
+  if(((__A == iVertexB->__A) && (__B == iVertexB->__B))
+    ||
+    ((__A == iVertexB->__B) && (__B == iVertexB->__A)))
+    return __A->getFEdge(*__B);
+  else if(__B == 0)
+  {
+    if(iVertexB->__B == 0)
+      return __A->getFEdge(*(iVertexB->__A));
+    else if(iVertexB->__A == __A)
+      return __A->getFEdge(*(iVertexB->__B));
+    else if(iVertexB->__B == __A)
+      return __A->getFEdge(*(iVertexB->__A));
+  }
+  else if(iVertexB->__B == 0)
+  {
+    if(iVertexB->__A == __A)
+      return __B->getFEdge(*(iVertexB->__A));
+    else if(iVertexB->__A == __B)
+      return __A->getFEdge(*(iVertexB->__A));
+  }
+  else if(__B == iVertexB->__A)
+  {
+    if((_t2d != 1) && (iVertexB->_t2d == 0))
+      return __A->getFEdge(*__B);
+    if((_t2d == 1) && (iVertexB->_t2d != 0))
+      return iVertexB->__A->getFEdge(*(iVertexB->__B));
+  }
+  else if(__B == iVertexB->__B)
+  {
+    if((_t2d != 1) && (iVertexB->_t2d == 1))
+      return __A->getFEdge(*__B);
+    if((_t2d == 1) && (iVertexB->_t2d != 1))
+      return iVertexB->__A->getFEdge(*(iVertexB->__B));
+  }
+  else if(__A == iVertexB->__A)
+  {
+    if((_t2d == 0) && (iVertexB->_t2d != 0))
+      return iVertexB->__A->getFEdge(*(iVertexB->__B));
+    if((_t2d != 0) && (iVertexB->_t2d == 0))
+      return __A->getFEdge(*__B);
+  }
+  else if(__A == iVertexB->__B)
+  {
+    if((_t2d == 0) && (iVertexB->_t2d != 1))
+      return iVertexB->__A->getFEdge(*(iVertexB->__B));
+    if((_t2d != 0) && (iVertexB->_t2d == 1))
+      return __A->getFEdge(*__B);
+  }
+  
+  cerr << "Warning: you should not be there..." << endl;
+
+  return 0;
+}
+
+
+ Vec3r CurvePoint::normal() const
+{
+  if(__B == 0)
+    return __A->normal();
+  if(__A == 0)
+    return __B->normal();
+  Vec3r Na = __A->normal();
+  if(Exception::getException())
+    Na = Vec3r(0,0,0);
+  Vec3r Nb = __B->normal();
+  if(Exception::getException())
+    Nb = Vec3r(0,0,0);
+  // compute t3d:
+  real t3d = SilhouetteGeomEngine::ImageToWorldParameter(__A->getFEdge(*__B),_t2d);
+  return ((1-t3d)*Na+t3d*Nb);
+}
+
+
+ // Material CurvePoint::material() const 
+ //{
+ //  if(__A == 0)
+ //    return __B->material();
+ //  return __A->material();
+ //}
+
+
+//  Id CurvePoint::shape_id() const 
+// {
+//   if(__A == 0)
+//     return __B->shape_id();
+//   return __A->shape_id();
+// }
+
+
+ const SShape * CurvePoint::shape() const 
+{
+  if(__A == 0)
+    return __B->shape();
+  return __A->shape();
+}
+
+
+ 
+//  float CurvePoint::shape_importance() const 
+// {
+
+//   if(__A == 0)
+
+//     return __B->shape_importance();
+//   return __A->shape_importance();
+// } 
+
+  
+ // const unsigned CurvePoint::qi() const 
+ //{
+ //  if(__A == 0)
+ //    return __B->qi();
+ //  if(__B == 0)
+ //    return __A->qi();
+ //  return __A->getFEdge(*__B)->qi();
+ //}
+
+  
+ occluder_container::const_iterator CurvePoint::occluders_begin() const 
+{
+  if(__A == 0)
+    return __B->occluders_begin();
+  if(__B == 0)
+    return __A->occluders_begin();
+  return __A->getFEdge(*__B)->occluders_begin();
+}
+  
+ occluder_container::const_iterator CurvePoint::occluders_end() const 
+{
+  if(__A == 0)
+    return __B->occluders_end();
+  if(__B == 0)
+    return __A->occluders_end();
+  return __A->getFEdge(*__B)->occluders_end();
+}
+  
+ bool CurvePoint::occluders_empty() const 
+{
+  if(__A == 0)
+    return __B->occluders_empty();
+  if(__B == 0)
+    return __A->occluders_empty();
+  return __A->getFEdge(*__B)->occluders_empty();
+}
+  
+ int CurvePoint::occluders_size() const 
+{
+  if(__A == 0)
+    return __B->occluders_size();
+  if(__B == 0)
+    return __A->occluders_size();
+  return __A->getFEdge(*__B)->occluders_size();
+}
+  
+ const SShape * CurvePoint::occluded_shape() const 
+{
+  if(__A == 0)
+    return __B->occluded_shape();
+  if(__B == 0)
+    return __A->occluded_shape();
+  return __A->getFEdge(*__B)->occluded_shape();
+}
+  
+ const Polygon3r& CurvePoint::occludee() const 
+{
+  if(__A == 0)
+    return __B->occludee();
+  if(__B == 0)
+    return __A->occludee();
+  return __A->getFEdge(*__B)->occludee();
+}
+  
+ const bool  CurvePoint::occludee_empty() const 
+{
+  if(__A == 0)
+    return __B->occludee_empty();
+  if(__B == 0)
+    return __A->occludee_empty();
+  return __A->getFEdge(*__B)->occludee_empty();
+}
+  
+ real CurvePoint::z_discontinuity() const 
+{
+  if(__A == 0)
+    return __B->z_discontinuity();
+  if(__B == 0)
+    return __A->z_discontinuity();
+  if(__A->getFEdge(*__B) == 0)
+    return 0.0;
+
+  return __A->getFEdge(*__B)->z_discontinuity();
+}
+//  
+// float CurvePoint::local_average_depth() const 
+//{
+//  return local_average_depth_function<CurvePoint >(this);
+//}
+//  
+// float CurvePoint::local_depth_variance() const 
+//{
+//  return local_depth_variance_function<CurvePoint >(this);
+//}
+//  
+// real CurvePoint::local_average_density(float sigma) const
+//{
+//  //return local_average_density<CurvePoint >(this);
+//
+//  return density_function<CurvePoint >(this);
+//}
+// Vec3r shaded_color() const ;
+//   
+//  Vec3r CurvePoint::orientation2d() const 
+// {
+//   if(__A == 0)
+//     return __B->orientation2d();
+//   if(__B == 0)
+//     return __A->orientation2d();
+//   return __B->point2d()-__A->point2d();
+// }
+//   
+//  Vec3r CurvePoint::orientation3d() const 
+// {
+//   if(__A == 0)
+//     return __B->orientation3d();
+//   if(__B == 0)
+//     return __A->orientation3d();
+//   return __B->point3d()-__A->point3d();
+// }
+
+// real curvature2d() const {return viewedge()->curvature2d((_VertexA->point2d()+_VertexB->point2d())/2.0);}
+//  
+// Vec3r CurvePoint::curvature2d_as_vector() const 
+//{
+//  //  Vec3r edgeA = (_FEdges[0])->orientation2d().normalize();
+//  //  Vec3r edgeB = (_FEdges[1])->orientation2d().normalize();
+//  //  return edgeA+edgeB;
+//  //  
+//  if(__A == 0)
+//    return __B->curvature2d_as_vector();
+//  if(__B == 0)
+//    return __A->curvature2d_as_vector();
+//  return ((1-_t2d)*__A->curvature2d_as_vector()+_t2d*__B->curvature2d_as_vector());
+//}
+//  
+// real CurvePoint::curvature2d_as_angle() const 
+//{
+//  //  Vec3r edgeA = (_FEdges[0])->orientation2d();
+//  //  Vec3r edgeB = (_FEdges[1])->orientation2d();
+//  //  Vec2d N1(-edgeA.y(), edgeA.x());N1.normalize();
+//  //  Vec2d N2(-edgeB.y(), edgeB.x());N2.normalize();
+//  //  return acos((N1*N2));
+//
+//  if(__A == 0)
+//    return __B->curvature2d_as_angle();
+//  if(__B == 0)
+//    return __A->curvature2d_as_angle();
+//  return ((1-_t2d)*__A->curvature2d_as_angle()+_t2d*__B->curvature2d_as_angle());
+//}
+
+  
+real CurvePoint::curvatureFredo() const 
+{
+  if(__A == 0)
+    return __B->curvatureFredo();
+  if(__B == 0)
+    return __A->curvatureFredo();
+  return ((1-_t2d)*__A->curvatureFredo()+_t2d*__B->curvatureFredo());
+}
+  
+Vec2d CurvePoint::directionFredo () const 
+{
+  if(__A == 0)
+    return __B->directionFredo();
+  if(__B == 0)
+    return __A->directionFredo();
+  return ((1-_t2d)*__A->directionFredo()+_t2d*__B->directionFredo());
+}
+
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             Curve              */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+/* for  functions */
+
+
+Curve::~Curve()
+{
+  if(!_Vertices.empty())
+  {
+    for(vertex_container::iterator it=_Vertices.begin(), itend =_Vertices.end();
+    it!=itend;
+    ++it)
+    {
+      delete (*it);
+    }
+    _Vertices.clear();
+  }
+}
+
+/*! iterators access */
+Curve::point_iterator Curve::points_begin(float step) 
+{
+  vertex_container::iterator second = _Vertices.begin();++second;
+  return point_iterator(_Vertices.begin(), second, _Vertices.begin(), _Vertices.end(), _nSegments, step, 0.f, 0.f);
+  //return point_iterator(_Vertices.begin(), second, _nSegments, step, 0.f, 0.f);
+}
+Curve::const_point_iterator Curve::points_begin(float step) const 
+{
+  vertex_container::const_iterator second = _Vertices.begin();++second;
+  return const_point_iterator(_Vertices.begin(), second, _Vertices.begin(), _Vertices.end(), _nSegments, step, 0.f, 0.f);
+  //return const_point_iterator(_Vertices.begin(), second, _nSegments, step, 0.f, 0.f);
+}
+Curve::point_iterator Curve::points_end(float step)  
+{
+  return point_iterator(_Vertices.end(), _Vertices.end(), _Vertices.begin(), _Vertices.end(), _nSegments, step, 1.f, _Length);
+  //return point_iterator(_Vertices.end(), _Vertices.end(), _nSegments, step, 1.f, _Length);
+}
+Curve::const_point_iterator Curve::points_end(float step) const   
+{
+  return const_point_iterator(_Vertices.end(), _Vertices.end(), _Vertices.begin(), _Vertices.end(), _nSegments, step, 1.f, _Length);
+  //return const_point_iterator(_Vertices.end(), _Vertices.end(), _nSegments, step, 1.f, _Length);
+}
+
+// Adavnced Iterators access
+Curve::point_iterator Curve::vertices_begin(){return points_begin(0);}
+Curve::const_point_iterator Curve::vertices_begin() const {return points_begin(0);}
+Curve::point_iterator Curve::vertices_end(){return points_end(0);}
+Curve::const_point_iterator Curve::vertices_end() const {return points_end(0);}
+
+// specialized iterators access
+CurveInternal::CurvePointIterator Curve::curvePointsBegin(float t){
+  vertex_container::iterator second = _Vertices.begin();++second;
+  return CurveInternal::CurvePointIterator(_Vertices.begin(), second, _Vertices.begin(), _Vertices.end(), 0, _nSegments, _Length, t, 0.f, 0.f);
+}
+
+CurveInternal::CurvePointIterator Curve::curvePointsEnd(float t){
+  vertex_container::iterator last = _Vertices.end();--last;
+  return CurveInternal::CurvePointIterator(last, _Vertices.end(), _Vertices.begin(), _Vertices.end(), _nSegments, _nSegments, _Length, t, 0.f, _Length);
+}
+
+CurveInternal::CurvePointIterator  Curve::curveVerticesBegin(){
+  return curvePointsBegin(0);
+}
+
+CurveInternal::CurvePointIterator Curve::curveVerticesEnd(){
+  return curvePointsEnd(0);
+}
+
+Interface0DIterator Curve::pointsBegin(float t){
+  vertex_container::iterator second = _Vertices.begin();++second;
+  Interface0DIterator ret(new CurveInternal::CurvePointIterator(_Vertices.begin(), second, _Vertices.begin(), _Vertices.end(), 0, _nSegments, _Length, t, 0.f, 0.f));
+  return ret;
+}
+
+Interface0DIterator Curve::pointsEnd(float t){
+  vertex_container::iterator last = _Vertices.end();--last;
+  Interface0DIterator ret(new CurveInternal::CurvePointIterator(last, _Vertices.end(), _Vertices.begin(), _Vertices.end(), _nSegments, _nSegments, _Length, t, 0.f, _Length));
+  return ret;
+}
+
+Interface0DIterator Curve::verticesBegin(){
+  return pointsBegin(0);
+}
+
+Interface0DIterator Curve::verticesEnd(){
+  return pointsEnd(0);
+}
+
+
+// Vec3r shaded_color(int iCombination = 0) const ;
+//
+// Vec3r  Curve::orientation2d(point_iterator it) const 
+//{
+//  return (*it)->orientation2d();
+//}
+/* template <class BaseVertex> */
+/*  Vec3r  Curve::orientation2d(int iCombination) const  */
+/* { */
+/*   return edge_orientation2d_function<Curve >(this, iCombination); */
+/* } */
+//
+// Vec3r  Curve::orientation3d(point_iterator it) const 
+//{
+//  return (*it)->orientation3d();
+//}
+/*  */
+/*  Vec3r  Curve::orientation3d(int iCombination) const  */
+/* { */
+/*   return edge_orientation3d_function<Curve >(this, iCombination); */
+/* } */
+// real curvature2d(point_iterator it) const {return (*it)->curvature2d();}
+// real curvature2d(int iCombination = 0) const ;
+
+// Material Curve::material() const 
+//{
+//  const_vertex_iterator v=vertices_begin(), vend=vertices_end();
+//  const Material& mat = (*v)->material();
+//  for(;v!=vend;++v)
+//  {
+//    if((*v)->material() != mat)
+//      Exception::raiseException();
+//  }
+//  return mat;
+//}
+
+// int Curve::qi() const 
+//{
+//  const_vertex_iterator v=vertices_begin(), vend=vertices_end();
+//  int qi_= (*v)->qi();
+//  for(;v!=vend;++v)
+//  {
+//    if((*v)->qi() != qi_)
+//      Exception::raiseException();
+//  }
+//  return qi_;
+//}
+// occluder_container::const_iterator occluders_begin() const {return _FEdgeA->occluders().begin();}
+// occluder_container::const_iterator occluders_end() const {return _FEdgeA->occluders().end();}
+
+//int Curve::occluders_size() const 
+//{
+//  return qi();
+//}
+
+// bool Curve::occluders_empty() const 
+//{
+//  const_vertex_iterator v=vertices_begin(), vend=vertices_end();
+//  bool empty = (*v)->occluders_empty();
+//  for(;v!=vend;++v)
+//  {
+//    if((*v)->occluders_empty() != empty)
+//      Exception::raiseException();
+//  }
+//  return empty;
+//}
+// const Polygon3r& occludee() const {return *(_FEdgeA->aFace());}
+
+// const SShape * Curve::occluded_shape() const 
+//{
+//  const_vertex_iterator v=vertices_begin(), vend=vertices_end();
+//  const SShape *sshape = (*v)->occluded_shape();
+//  for(;v!=vend;++v)
+//  {
+//    if((*v)->occluded_shape() != sshape)
+//      Exception::raiseException();
+//  }
+//  return sshape;
+//}
+
+
+// const bool Curve::occludee_empty() const 
+//{
+//  const_vertex_iterator v=vertices_begin(), vend=vertices_end();
+//  bool empty = (*v)->occludee_empty();
+//  for(;v!=vend;++v)
+//  {
+//    if((*v)->occludee_empty() != empty)
+//      Exception::raiseException();
+//  }
+//  return empty;
+//}
+/*  */
+/*  real Curve::z_discontinuity(int iCombination) const  */
+/* { */
+/*   return z_discontinuity_edge_function<Curve >(this, iCombination); */
+/* } */
+
+//  int Curve::shape_id() const 
+// {
+//   const_vertex_iterator v=vertices_begin(), vend=vertices_end();
+//   Id id = (*v)->shape_id();
+//   for(;v!=vend;++v)
+//   {
+//     if((*v)->shape_id() != id)
+//       Exception::raiseException();
+//   }
+//   return id.first;
+// }
+
+
+// const SShape * Curve::shape() const 
+//{
+//  const_vertex_iterator v=vertices_begin(), vend=vertices_end();
+//  const SShape *sshape = (*v)->shape();
+//  for(;v!=vend;++v)
+//  {
+//    if((*v)->shape() != sshape)
+//      Exception::raiseException();
+//  }
+//  return sshape;
+//}
+
+
+// occluder_container::const_iterator Curve::occluders_begin() const 
+//{
+//  const_vertex_iterator v=vertices_begin();
+//  return (*v)->occluders_begin();
+//}
+//
+//
+// occluder_container::const_iterator Curve::occluders_end() const 
+//{
+//  const_vertex_iterator v=vertices_end();
+//  return (*v)->occluders_end();
+//}
+
+/*  */
+/*  Vec3r Curve::curvature2d_as_vector(int iCombination) const  */
+/* { */
+/*   return curvature2d_as_vector_edge_function<Curve >(this, iCombination); */
+/* } */
+/*  */
+/*  real Curve::curvature2d_as_angle(int iCombination) const  */
+/* { */
+/*   return curvature2d_as_angle_edge_function<Curve >(this, iCombination); */
+/* } */
+
+/*  */
+/*  float Curve::shape_importance(int iCombination) const  */
+/* { */
+/*   return shape_importance_edge_function<Curve >(this, iCombination); */
+/* }  */
+
+/*  */
+/*  float Curve::local_average_depth(int iCombination) const */
+/* { */
+/*   return local_average_depth_edge_function<Curve >(this, iCombination); */
+/* } */
+/*  */
+/*  float Curve::local_depth_variance(int iCombination ) const  */
+/* { */
+/*   return local_depth_variance_edge_function<Curve >(this, iCombination); */
+/*   //  local_depth_variance_functor<Point> functor; */
+/*   //  float result; */
+/*   //  Evaluate<float, local_depth_variance_functor<Point> >(&functor, iCombination, result);  */
+/*   //  return result; */
+/* } */
+
+/*  */
+/*  real Curve::local_average_density(float sigma, int iCombination ) const */
+/* { */
+/*   return density_edge_function<Curve >(this, iCombination); */
+/*   //  density_functor<Point> functor; */
+/*   //  real result; */
+/*   //  Evaluate<real, density_functor<Point> >(&functor, iCombination, result);  */
+/*   //  return result; */
+/* } */
+
+#define EPS_CURVA_DIR 0.01
+
+
+void Curve::computeCurvatureAndOrientation ()
+{
+// 	const_vertex_iterator v=vertices_begin(), vend=vertices_end(), v2, prevV, v0;
+// 	Vec2d p0, p1, p2;
+// 	Vec3r p;
+
+// 	p=(*v)->point2d();
+// 	p0=Vec2d(p[0], p[1]);
+// 	prevV=v; ++v;
+// 	p=(*v)->point2d();
+// 	p1=Vec2d(p[0], p[1]);
+// 	Vec2d prevDir(p1-p0);
+
+// 	for(;v!=vend;++v)
+// 	{
+// 		v2=v; ++v2;
+// 		if (v2==vend) break;
+// 		Vec3r p2=(*v2)->point2d();
+		
+// 		Vec2d BA=p0-p1;
+// 		Vec2d BC=p2-p1;
+// 		real lba=BA.norm(), lbc=BC.norm();
+// 		BA.normalizeSafe();
+// 		BC.normalizeSafe();
+// 		Vec2d normalCurvature=BA+BC;
+// 		Vec2d dir=Vec2d(BC-BA);
+// 		Vec2d normal=Vec2d(-dir[1], dir[0]);
+
+// 		normal.normalizeSafe();
+// 		real curvature=normalCurvature*normal;
+// 		if (lba+lbc > MY_EPSILON)
+// 		  curvature/=(0.5*lba+lbc);
+// 		if (dir.norm() < MY_EPSILON)
+// 		  dir=0.1*prevDir;
+// 		(*v)->setCurvatureFredo(curvature);
+// 		(*v)->setDirectionFredo(dir);
+
+// 		prevV=v; p0=p1; p1=p2; prevDir=dir; prevDir.normalize();
+// 	}
+// 	(*v)->setCurvatureFredo((*prevV)->curvatureFredo());
+// 	(*v)->setDirectionFredo((*v)->point2d()-(*prevV)->point2d());
+// 	v0=vertices_begin(); v2=v0; ++v2;
+// 	(*v0)->setCurvatureFredo((*v2)->curvatureFredo());
+// 	(*v0)->setDirectionFredo((*v2)->point2d()-(*v0)->point2d());
+
+// 	//closed curve case one day...
+
+// 	//
+// 	return;
+
+// 	//numerical degeneracy verification.. we'll see later 
+// 	const_vertex_iterator vLastReliable=vertices_begin();
+
+// 	v=vertices_begin();
+// 	p=(*v)->point2d();
+// 	p0=Vec2d(p[0], p[1]);
+// 	prevV=v; ++v;
+// 	p=(*v)->point2d();
+// 	p1=Vec2d(p[0], p[1]);
+// 	bool isReliable=false;
+// 	if ((p1-p0).norm>EPS_CURVA) 
+// 	{
+// 		vLastReliable=v;
+// 		isReliable=true;
+// 	}
+
+// 	for(;v!=vend;++v)
+// 	{
+// 		v2=v; ++v2;
+// 		if (v2==vend) break;
+// 		Vec3r p2=(*v2)->point2d();
+		
+// 		Vec2d BA=p0-p1;
+// 		Vec2d BC=p2-p1;
+// 		real lba=BA.norm(), lbc=BC.norm();
+
+// 		if ((lba+lbc)<EPS_CURVA)
+// 		{
+// 			isReliable=false;
+// 			cerr<<"/";
+// 		}
+// 		else
+// 		{
+// 			if (!isReliable)//previous points were not reliable
+// 			{
+// 				const_vertex_iterator vfix=vLastReliable;
+// 				vfix++;
+// 				for (; vfix!=v; ++vfix)
+// 				{
+// 					(*vfix)->setCurvatureFredo((*v)->curvatureFredo());
+// 					(*vfix)->setDirectionFredo((*v)->directionFredo());
+// 				}
+// 			}
+// 			isReliable=true; 
+// 			vLastReliable=v;
+// 		}	
+// 		prevV=v; p0=p1; p1=p2;
+// 	}
+
+}
diff --git a/extern/freestyle/src/stroke/Curve.h b/extern/freestyle/src/stroke/Curve.h
new file mode 100755
index 00000000000..400f27e5d5a
--- /dev/null
+++ b/extern/freestyle/src/stroke/Curve.h
@@ -0,0 +1,463 @@
+//
+//  Filename         : Curve.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Class to define a container for curves
+//  Date of creation : 11/01/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  CURVE_H
+# define CURVE_H
+
+# include <deque>
+# include "../system/BaseIterator.h"
+# include "../geometry/Geom.h"
+//# include "../scene_graph/Material.h"
+# include "../view_map/Silhouette.h"
+# include "../view_map/SilhouetteGeomEngine.h"
+# include "../view_map/Interface0D.h"
+# include "../view_map/Interface1D.h"
+
+using namespace std;
+using namespace Geometry;
+
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             CurvePoint         */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+/*! Class to represent a point of a curve.
+ *  A CurvePoint can be any point of a 1D curve
+ *  (it doesn't have to be a vertex of the curve).
+ *  Any Interface1D is built upon ViewEdges, themselves
+ *  built upon FEdges. Therefore, a curve is basically
+ *  a polyline made of a list SVertex.
+ *  Thus, a CurvePoint is built by lineraly interpolating
+ *  two SVertex.
+ *  CurvePoint can be used as virtual points while 
+ *  querying 0D information along a curve at a given resolution.
+ */
+class LIB_STROKE_EXPORT CurvePoint : public Interface0D
+{
+public: // Implementation of Interface0D
+  /*! Returns the string "CurvePoint"*/
+  virtual string getExactTypeName() const {
+    return "CurvePoint";
+  }
+
+  // Data access methods
+  /*! Returns the 3D X coordinate of the point */
+  virtual real getX() const {
+    return _Point3d.x();
+  }
+  /*! Returns the 3D Y coordinate of the point */
+  virtual real getY() const {
+    return _Point3d.y();
+  }
+  /*! Returns the 3D Z coordinate of the point */
+  virtual real getZ() const {
+    return _Point3d.z();
+  }
+  /*!  Returns the 3D point. */ 
+  virtual Vec3f getPoint3D() const {
+    return _Point3d;
+  }
+  /*! Returns the projected 3D X coordinate of the point */
+  virtual real getProjectedX() const {
+    return _Point2d.x();
+  }
+  /*! Returns the projected 3D Y coordinate of the point */
+  virtual real getProjectedY() const {
+    return _Point2d.y();
+  }
+  /*! Returns the projected 3D Z coordinate of the point */
+  virtual real getProjectedZ() const {
+    return _Point2d.z();
+  }
+  /*!  Returns the 2D point. */ 
+  virtual Vec2f getPoint2D() const {
+    return Vec2f((float)_Point2d.x(),(float)_Point2d.y());
+  }
+
+  virtual FEdge* getFEdge(Interface0D& inter);
+  /*! Returns the CurvePoint's Id */
+  virtual Id getId() const {
+    Id id;
+    if(_t2d == 0)
+      return __A->getId();
+    else if(_t2d == 1)
+      return __B->getId();
+    return id;
+  }
+  /*! Returns the CurvePoint's Nature */
+  virtual Nature::VertexNature getNature() const {
+    Nature::VertexNature nature = Nature::POINT;
+    if(_t2d == 0)
+      nature |= __A->getNature();
+    else if(_t2d == 1)
+      nature |= __B->getNature();
+    return nature;
+  }
+
+  /*! Cast the Interface0D in SVertex if it can be. */ 
+  virtual SVertex * castToSVertex(){
+    if(_t2d == 0)
+      return __A;
+    else if(_t2d == 1)
+      return __B;
+    return Interface0D::castToSVertex();
+  }
+
+  /*! Cast the Interface0D in ViewVertex if it can be. */ 
+  virtual ViewVertex * castToViewVertex(){
+    if(_t2d == 0)
+      return __A->castToViewVertex();
+    else if(_t2d == 1)
+      return __B->castToViewVertex();
+    return Interface0D::castToViewVertex();
+  }
+
+  /*! Cast the Interface0D in NonTVertex if it can be. */ 
+  virtual NonTVertex * castToNonTVertex(){
+    if(_t2d == 0)
+      return __A->castToNonTVertex();
+    else if(_t2d == 1)
+      return __B->castToNonTVertex();
+    return Interface0D::castToNonTVertex();
+  }
+
+  /*! Cast the Interface0D in TVertex if it can be. */ 
+  virtual TVertex * castToTVertex(){
+    if(_t2d == 0)
+      return __A->castToTVertex();
+    else if(_t2d == 1)
+      return __B->castToTVertex();
+    return Interface0D::castToTVertex();
+  }
+public:
+  typedef SVertex vertex_type;
+protected:
+  SVertex *__A;
+  SVertex *__B;
+  float _t2d;
+  //float _t3d;
+  Vec3r _Point2d;
+  Vec3r _Point3d;
+public:
+  /*! Defult Constructor. */
+   CurvePoint();
+  /*! Builds a CurvePoint from two SVertex and an interpolation
+   *  parameter.
+   *  \param iA
+   *    The first SVertex
+   *  \param iB
+   *    The second SVertex
+   *  \param t2d
+   *    A 2D interpolation parameter
+   *    used to linearly interpolate \a iA and \a iB
+   */
+   CurvePoint(SVertex *iA, SVertex *iB, float t2d) ;
+  /*! Builds a CurvePoint from two CurvePoint and an interpolation parameter.
+   *  \param iA
+   *    The first CurvePoint
+   *  \param iB
+   *    The second CurvePoint
+   *  \param t2d
+   *    The 2D interpolation parameter used
+   *    to linearly interpolate \a iA and \a iB.
+   */
+   CurvePoint(CurvePoint *iA, CurvePoint *iB, float t2d) ;
+  // CurvePoint(SVertex *iA, SVertex *iB, float t2d, float t3d) ;
+  /*! Copy Constructor. */
+   CurvePoint(const CurvePoint& iBrother) ;
+  /*! Operator = */
+   CurvePoint& operator=(const CurvePoint& iBrother) ;
+  /*! Destructor */
+  virtual ~CurvePoint() {}
+  /*! Operator == */
+  bool operator==(const CurvePoint& b){
+    return ((__A==b.__A) && (__B==b.__B) && (_t2d==b._t2d));
+  }
+
+  /* accessors */
+  /*! Returns the first SVertex upon which
+   *  the CurvePoint is built. */
+  inline SVertex * A() {return __A;}
+  /*! Returns the second SVertex upon which
+   *  the CurvePoint is built. */
+  inline SVertex * B() {return __B;}
+  /*! Returns the interpolation parameter. */
+  inline float t2d() const {return _t2d;}
+  //inline const float t3d() const {return _t3d;}
+
+  /* modifiers */
+  /*! Sets the first SVertex upon which to build
+   *  the CurvePoint.
+   */
+  inline void SetA(SVertex *iA) {__A = iA;}
+  /*! Sets the second SVertex upon which to build
+   *  the CurvePoint.
+   */
+  inline void SetB(SVertex *iB) {__B = iB;}
+  /*! Sets the 2D interpolation parameter to use.
+   */
+  inline void SetT2d(float t) {_t2d = t;}
+  //inline void SetT3d(float t) {_t3d = t;}
+
+  /* Information access interface */
+
+  FEdge *fedge() ;
+  inline const Vec3r& point2d() const {return _Point2d;}
+  inline const Vec3r& point3d() const {return _Point3d;}
+   Vec3r normal() const ;
+   //Material material() const ;
+  // Id shape_id() const ;
+   const SShape * shape() const ;
+  // float shape_importance() const ;
+  
+   //const unsigned qi() const ;
+   occluder_container::const_iterator occluders_begin() const ;
+   occluder_container::const_iterator occluders_end() const ;
+   bool occluders_empty() const ;
+   int occluders_size() const ;
+   const Polygon3r& occludee() const ;
+   const SShape * occluded_shape() const ;
+   const bool  occludee_empty() const ;
+   real z_discontinuity() const ;
+  //   float local_average_depth() const ;
+  //   float local_depth_variance() const ;
+  //   real local_average_density(float sigma = 2.3f) const ;
+  // Vec3r shaded_color() const ;
+//    Vec3r orientation2d() const ; 
+//    Vec3r orientation3d() const ;
+  //  // real curvature2d() const {return viewedge()->curvature2d((_VertexA->point2d()+_VertexB->point2d())/2.0);}  
+  //   Vec3r curvature2d_as_vector() const ;
+  //  /*! angle in radians */
+  //   real curvature2d_as_angle() const ;
+
+  real curvatureFredo () const;
+  Vec2d directionFredo () const;
+};
+
+
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             Curve              */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+namespace CurveInternal {
+  class CurvePoint_const_traits;
+  class CurvePoint_nonconst_traits;
+  template<class Traits> class __point_iterator;
+  class CurvePointIterator;
+} // end of namespace CurveInternal
+
+/*! Base class for curves made of CurvePoints.
+ *  SVertex is the type of the initial curve vertices.
+ *  A Chain is a specialization of a Curve.
+ */
+class LIB_STROKE_EXPORT Curve : public Interface1D
+{
+public:
+  typedef CurvePoint Vertex;
+  typedef CurvePoint Point;
+  typedef Point point_type;
+  typedef Vertex vertex_type;
+  typedef deque<Vertex*> vertex_container;
+
+  /* Iterator to iterate over a vertex edges */
+  
+  typedef CurveInternal::__point_iterator<CurveInternal::CurvePoint_nonconst_traits > point_iterator;
+  typedef CurveInternal::__point_iterator<CurveInternal::CurvePoint_const_traits > const_point_iterator;
+  typedef point_iterator vertex_iterator ;
+  typedef const_point_iterator const_vertex_iterator ;
+  
+protected:
+  vertex_container _Vertices;
+  double _Length;
+  Id _Id;
+  unsigned _nSegments; // number of segments
+
+public:
+  /*! Default Constructor. */
+  Curve() {_Length = 0;_Id = 0;_nSegments=0;}
+  /*! Builds a Curve from its id */
+  Curve(const Id& id) {_Length = 0;_Id = id;_nSegments=0;}
+  /*! Copy Constructor. */
+  Curve(const Curve& iBrother) {_Length = iBrother._Length;_Vertices = iBrother._Vertices;_Id=iBrother._Id;_nSegments=0;}
+  /*! Destructor. */
+  virtual ~Curve() ;
+
+  /*
+	fredo's curvature storage
+  */
+  void computeCurvatureAndOrientation ();
+
+  /*! Adds a single vertex (CurvePoint) at the end of the Curve */
+  inline void push_vertex_back(Vertex *iVertex) 
+  {
+    if(!_Vertices.empty())
+    {
+      Vec3r vec_tmp(iVertex->point2d() - _Vertices.back()->point2d());
+      _Length += vec_tmp.norm();
+      ++_nSegments;
+    }
+    Vertex * new_vertex = new Vertex(*iVertex);
+    _Vertices.push_back(new_vertex);
+  }
+  /*! Adds a single vertex (SVertex) at the end of the Curve */
+  inline void push_vertex_back(SVertex *iVertex) 
+  {
+    if(!_Vertices.empty())
+    {
+      Vec3r vec_tmp(iVertex->point2d() - _Vertices.back()->point2d());
+      _Length += vec_tmp.norm();
+      ++_nSegments;
+    }
+    Vertex *new_vertex = new Vertex(iVertex, 0,0);
+    _Vertices.push_back(new_vertex);
+  }
+  /*! Adds a single vertex (CurvePoint) at the front of the Curve */
+  inline void push_vertex_front(Vertex *iVertex) 
+  {
+    if(!_Vertices.empty())
+    {
+      Vec3r vec_tmp(iVertex->point2d() - _Vertices.front()->point2d());
+      _Length += vec_tmp.norm();
+      ++_nSegments;
+    }
+    Vertex * new_vertex = new Vertex(*iVertex);
+    _Vertices.push_front(new_vertex);
+  }
+  /*! Adds a single vertex (SVertex) at the front of the Curve */
+  inline void push_vertex_front(SVertex *iVertex) 
+  {
+    if(!_Vertices.empty())
+    {
+      Vec3r vec_tmp(iVertex->point2d() - _Vertices.front()->point2d());
+      _Length += vec_tmp.norm();
+      ++_nSegments;
+    }
+    Vertex *new_vertex = new Vertex(iVertex, 0,0);
+    _Vertices.push_front(new_vertex);
+  }
+  /*! Returns true is the Curve doesn't have any Vertex yet. */
+  inline bool empty() const {return _Vertices.empty();}
+  /*! Returns the 2D length of the Curve.*/
+  inline real getLength2D() const {return _Length;}
+  /*! Returns the Id of the 1D element .*/
+  virtual Id getId() const {
+    return _Id;
+  }
+  /*! Returns the number of segments in the
+   *  oplyline constituing the Curve.
+   */
+  inline unsigned int nSegments() const {return _nSegments;}
+
+  inline void setId(const Id& id){_Id = id;}
+  /* Information access interface */
+  
+  
+  //inline Vec3r shaded_color(int iCombination = 0) const ;
+  //  inline Vec3r  orientation2d(point_iterator it) const ;
+   //Vec3r  orientation2d(int iCombination = 0) const ;
+  //   Vec3r  orientation3d(point_iterator it) const ;
+   //Vec3r  orientation3d(int iCombination = 0) const ;
+  // real curvature2d(point_iterator it) const {return (*it)->curvature2d();}
+  // real curvature2d(int iCombination = 0) const ;
+   //Material material() const ;
+   //int qi() const ;
+   //   occluder_container::const_iterator occluders_begin() const ;
+   //   occluder_container::const_iterator occluders_end() const ;
+   //int occluders_size() const;
+   //bool occluders_empty() const ;
+  // const Polygon3r& occludee() const {return *(_FEdgeA->aFace());}
+   //const SShape * occluded_shape() const;
+   //const bool occludee_empty() const ;
+   //real z_discontinuity(int iCombination = 0) const ;
+  // int shape_id() const ;
+   //const SShape * shape() const ;
+   //float shape_importance(int iCombination=0) const ;
+   //float local_average_depth(int iCombination = 0) const;
+   //float local_depth_variance(int iCombination = 0) const ;
+   //real local_average_density(float sigma = 2.3f, int iCombination = 0) const ;
+   //Vec3r curvature2d_as_vector(int iCombination=0) const ;
+  /*! angle in radians */
+   //real curvature2d_as_angle(int iCombination=0) const ;  
+  
+  /* advanced iterators access */
+  point_iterator points_begin(float step = 0);
+  const_point_iterator points_begin(float step = 0) const;
+  point_iterator points_end(float step = 0);
+  const_point_iterator points_end(float step = 0) const;
+
+  // methods given for convenience */
+  point_iterator vertices_begin();
+  const_point_iterator vertices_begin() const;
+  point_iterator vertices_end();
+  const_point_iterator vertices_end() const;
+
+  // specialized iterators access
+  CurveInternal::CurvePointIterator curvePointsBegin(float t=0.f);
+  CurveInternal::CurvePointIterator curvePointsEnd(float t=0.f);
+
+  CurveInternal::CurvePointIterator curveVerticesBegin();
+  CurveInternal::CurvePointIterator curveVerticesEnd();
+
+  // Iterators access
+  /*! Returns an Interface0DIterator pointing onto
+   *  the first vertex of the Curve and that can iterate
+   *  over the \a vertices of the Curve.
+   */
+  virtual Interface0DIterator verticesBegin();
+  /*! Returns an Interface0DIterator pointing after
+   *  the last vertex of the Curve and that can iterate
+   *  over the \a vertices of the Curve.
+   */
+  virtual Interface0DIterator verticesEnd();
+  /*! Returns an Interface0DIterator pointing onto
+   *  the first point of the Curve and that can iterate
+   *  over the \a points of the Curve at any resolution.
+   *  At each iteration a virtual temporary CurvePoint
+   *  is created.
+   */
+  virtual Interface0DIterator pointsBegin(float t=0.f);
+  /*! Returns an Interface0DIterator pointing after
+   *  the last point of the Curve and that can iterate
+   *  over the \a points of the Curve at any resolution.
+   *  At each iteration a virtual temporary CurvePoint
+   *  is created.
+   */
+  virtual Interface0DIterator pointsEnd(float t=0.f);
+};
+
+  
+
+#endif
diff --git a/extern/freestyle/src/stroke/CurveAdvancedIterators.h b/extern/freestyle/src/stroke/CurveAdvancedIterators.h
new file mode 100755
index 00000000000..dfc9f2719f8
--- /dev/null
+++ b/extern/freestyle/src/stroke/CurveAdvancedIterators.h
@@ -0,0 +1,378 @@
+//
+//  Filename         : CurveAdvancedIterators.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Iterators used to iterate over the elements of the Curve
+//                     Can't be used in python
+//  Date of creation : 01/08/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  ADVANCEDCURVEITERATORS_H
+# define ADVANCEDCURVEITERATORS_H
+
+# include "Stroke.h"
+
+namespace CurveInternal {
+
+  class CurvePoint_const_traits : public Const_traits<CurvePoint*> {
+  public:
+    typedef deque<CurvePoint*> vertex_container;
+    typedef vertex_container::const_iterator vertex_container_iterator;
+    typedef SVertex vertex_type; 
+  };
+  
+  class CurvePoint_nonconst_traits : public Nonconst_traits<CurvePoint*> {
+  public:
+    typedef deque<CurvePoint*> vertex_container;
+    typedef vertex_container::iterator vertex_container_iterator ;
+    typedef SVertex vertex_type; 
+  };
+
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*     CurvePoint Iterator        */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+
+  /*! iterator on a curve. Allows an iterating outside 
+   *  initial vertices. A CurvePoint is instanciated an returned 
+   *  when the iterator is dereferenced.
+   */
+
+  template<class Traits>
+    class __point_iterator : public IteratorBase<Traits, BidirectionalIteratorTag_Traits>
+  { 
+  public:
+    typedef __point_iterator <Traits>  Self;
+    typedef typename Traits::vertex_container_iterator  vertex_container_iterator;
+    typedef typename Traits::vertex_type vertex_type;
+    typedef CurvePoint Point;
+    typedef Point point_type;
+    
+    typedef __point_iterator<CurvePoint_nonconst_traits > iterator;
+    typedef __point_iterator<CurvePoint_const_traits > const_iterator;
+    
+    //  public:
+    //    typedef Vertex vertex_type ;
+    //    typedef vertex_container_iterator vertex_iterator_type;
+    //    typedef CurvePoint<Vertex> Point;
+    //    typedef Point point_type;
+    typedef IteratorBase<Traits,BidirectionalIteratorTag_Traits> parent_class;
+    //# if defined(__GNUC__) && (__GNUC__ < 3)
+    //    typedef bidirectional_iterator<CurvePoint<Vertex>,ptrdiff_t> bidirectional_point_iterator;
+    //# else
+    //    typedef iterator<bidirectional_iterator_tag, CurvePoint<Vertex>,ptrdiff_t> bidirectional_point_iterator;
+    //# endif
+    friend class Curve; 
+    //friend class Curve::vertex_iterator;
+    //friend class __point_iterator<CurvePoint_nonconst_traits >;
+    //friend class iterator;
+    //protected:
+  public:
+    float _CurvilinearLength;
+    float _step;
+    vertex_container_iterator __A;
+    vertex_container_iterator __B;
+    vertex_container_iterator _begin;
+    vertex_container_iterator _end;
+    int _n;
+    int _currentn;
+    float _t;
+    mutable Point *_Point;
+    
+  public:
+    
+  public:
+    inline __point_iterator(float step = 0.f)
+      : parent_class()
+    {
+      _step = step;
+      _CurvilinearLength = 0.f;
+      _t = 0.f;
+      _Point = 0;
+      _n = 0;
+      _currentn = 0;
+    }
+    
+    inline __point_iterator(const iterator& iBrother)
+      : parent_class()
+    {
+      __A = iBrother.__A;
+      __B = iBrother.__B;
+      _begin = iBrother._begin;
+      _end = iBrother._end;
+      _CurvilinearLength = iBrother._CurvilinearLength;
+      _step = iBrother._step;
+      _t = iBrother._t;
+      if(iBrother._Point == 0)
+        _Point = 0;
+      else
+        _Point = new Point(*(iBrother._Point));
+      _n = iBrother._n;
+      _currentn = iBrother._currentn;
+    }
+    inline __point_iterator(const const_iterator& iBrother)
+      : parent_class()
+    {
+      __A = iBrother.__A;
+      __B = iBrother.__B;
+      _begin = iBrother._begin;
+      _end = iBrother._end;
+      _CurvilinearLength = iBrother._CurvilinearLength;
+      _step = iBrother._step;
+      _t = iBrother._t;
+      if(iBrother._Point == 0)
+        _Point = 0;
+      else
+        _Point = new Point(*(iBrother._Point));
+      _n = iBrother._n;
+      _currentn = iBrother._currentn;
+    }
+    inline Self& operator=(const Self& iBrother)
+    {
+      //((bidirectional_point_iterator*)this)->operator=(iBrother);
+      __A = iBrother.__A;
+      __B = iBrother.__B;
+      _begin = iBrother._begin;
+      _end = iBrother._end;
+      _CurvilinearLength = iBrother._CurvilinearLength;
+      _step = iBrother._step;
+      _t = iBrother._t;
+      if(iBrother._Point == 0)
+        _Point = 0;
+      else
+        _Point = new Point(*(iBrother._Point));
+      _n = iBrother._n;
+      _currentn = iBrother._currentn;
+      return *this;
+    }
+    virtual ~__point_iterator()
+    {
+      if(_Point != 0)
+        delete _Point;
+    }
+  //protected://FIXME
+  public:
+    inline __point_iterator(vertex_container_iterator iA, 
+      vertex_container_iterator iB, 
+      vertex_container_iterator ibegin, 
+      vertex_container_iterator iend, 
+      int currentn,
+      int n,
+      float step, float t=0.f, float iCurvilinearLength = 0.f)
+      : parent_class()
+    {
+      __A = iA;
+      __B = iB;
+      _begin = ibegin;
+      _end = iend;
+      _CurvilinearLength = iCurvilinearLength;
+      _step = step;
+      _t = t;
+      _Point = 0;
+      _n = n;
+      _currentn = currentn;
+    }
+    
+  public:
+    
+    // operators
+    inline Self& operator++()  // operator corresponding to ++i
+    { 
+      increment();
+      return *this;
+    }
+    inline Self operator++(int)  // opérateur correspondant à i++ 
+    {                                  // c.a.d qui renvoie la valeur *puis* incrémente.
+      Self tmp = *this;        // C'est pour cela qu'on stocke la valeur
+      increment();                    // dans un temporaire. 
+      return tmp;
+    }
+    inline Self& operator--()  // operator corresponding to ++i
+    { 
+      decrement();
+      return *this;
+    }
+    inline Self operator--(int)  // opérateur correspondant à i++ 
+    {                                  // c.a.d qui renvoie la valeur *puis* incrémente.
+      Self tmp = *this;        // C'est pour cela qu'on stocke la valeur
+      decrement();                    // dans un temporaire. 
+      return tmp;
+    }
+    
+    // comparibility
+    virtual bool operator!=(const Self& b) const
+    {
+      return ((__A!=b.__A) || (__B!=b.__B) || (_t != b._t));
+    }
+    virtual bool operator==(const Self& b) const
+    {
+      return !(*this != b);
+    }
+    
+    // dereferencing
+    virtual typename Traits::reference operator*() const  
+    {
+      if(_Point != 0)
+      {
+        delete _Point;
+        _Point = 0;
+      }
+      if((_currentn < 0) || (_currentn >= _n))
+        return _Point; // 0 in this case
+      return (_Point = new Point(*__A,*__B,_t));
+    }
+    virtual typename Traits::pointer operator->() const { return &(operator*());}
+    
+  public:
+    virtual bool begin() const 
+    {
+      if((__A == _begin) && (_t < (float)M_EPSILON))
+        return true;
+      return false;
+    }
+    virtual bool end() const 
+    {
+      if((__B == _end))
+        return true;
+      return false;
+    }
+  protected:
+    virtual void increment() 
+    {
+      if(_Point != 0)
+      {
+        delete _Point;
+        _Point = 0;
+      }
+      if((_currentn == _n-1) && (_t == 1.f))
+      {
+        // we're setting the iterator to end
+        ++__A;
+        ++__B;
+        ++_currentn;
+        _t = 0.f;
+        return;
+      }
+      
+      if(0 == _step) // means we iterate over initial vertices
+      {
+	      Vec3r vec_tmp((*__B)->point2d() - (*__A)->point2d());
+        _CurvilinearLength += vec_tmp.norm();
+        if(_currentn == _n-1)
+        { 
+          _t = 1.f;   
+          return;
+        }
+        ++__B;
+        ++__A;
+        ++_currentn;
+        return;
+      }
+      
+      // compute the new position:
+      Vec3r vec_tmp2((*__A)->point2d() - (*__B)->point2d());
+      float normAB = vec_tmp2.norm();
+
+      if(normAB > M_EPSILON)
+      {
+        _CurvilinearLength += _step;
+        _t = _t + _step/normAB;
+      }
+      else
+        _t = 1.f; // AB is a null segment, we're directly at its end
+        //if normAB ~= 0, we don't change these values
+      if(_t >= 1)
+      { 
+        _CurvilinearLength -= normAB*(_t-1);
+        if(_currentn == _n-1)
+          _t=1.f;
+        else
+        {
+          _t = 0.f;
+          ++_currentn;
+          ++__A;++__B;
+        }
+      }
+    }
+    virtual void decrement() 
+    {
+      if(_Point != 0)
+      {
+        delete _Point;
+        _Point = 0;
+      }
+      
+      if(_t == 0.f) //we're at the beginning of the edge
+      {
+        _t = 1.f;
+        --_currentn;
+        --__A; --__B;
+        if(_currentn == _n-1)
+          return;
+      }
+
+      if(0 == _step) // means we iterate over initial vertices
+      {
+	      Vec3r vec_tmp((*__B)->point2d() - (*__A)->point2d());
+        _CurvilinearLength -= vec_tmp.norm();
+        _t = 0;
+        return;
+      }
+      
+      // compute the new position:
+      Vec3r vec_tmp2((*__A)->point2d() - (*__B)->point2d());
+      float normAB = vec_tmp2.norm();
+      
+      if(normAB >M_EPSILON)
+      {
+        _CurvilinearLength -= _step;
+        _t = _t - _step/normAB;
+      }
+      else
+        _t = -1.f; // We just need a negative value here
+
+      // round value
+      if(fabs(_t) < (float)M_EPSILON)
+        _t = 0.0;
+      if(_t < 0)
+      { 
+        if(_currentn == 0)
+          _CurvilinearLength = 0.f;
+        else
+        _CurvilinearLength += normAB*(-_t);
+        _t = 0.f;
+      } 
+    }
+  };
+
+
+
+} // end of namespace StrokeInternal
+
+
+#endif // ADVANCEDCURVEITERATORS_H
diff --git a/extern/freestyle/src/stroke/CurveIterators.h b/extern/freestyle/src/stroke/CurveIterators.h
new file mode 100755
index 00000000000..92f8bf065f4
--- /dev/null
+++ b/extern/freestyle/src/stroke/CurveIterators.h
@@ -0,0 +1,295 @@
+//
+//  Filename         : CurveIterators.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Iterators used to iterate over the elements of the Curve
+//  Date of creation : 01/08/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  CURVEITERATORS_H
+# define CURVEITERATORS_H
+
+#include "Stroke.h"
+#include "Curve.h"
+
+namespace CurveInternal {
+
+  /*! iterator on a curve. Allows an iterating outside 
+   *  initial vertices. A CurvePoint is instanciated an returned 
+   *  when the iterator is dereferenced.
+   */
+
+  class CurvePointIterator : public Interface0DIteratorNested
+  { 
+  public:
+    friend class ::Curve; 
+  public:
+    float _CurvilinearLength;
+    float _step;
+    ::Curve::vertex_container::iterator __A;
+    ::Curve::vertex_container::iterator __B;
+    ::Curve::vertex_container::iterator _begin;
+    ::Curve::vertex_container::iterator _end;
+    int _n;
+    int _currentn;
+    float _t;
+    mutable CurvePoint _Point;
+    float _CurveLength;
+
+  public:
+    
+  public:
+    inline CurvePointIterator(float step = 0.f)
+      : Interface0DIteratorNested()
+    {
+      _step = step;
+      _CurvilinearLength = 0.f;
+      _t = 0.f;
+      //_Point = 0;
+      _n = 0;
+      _currentn = 0;
+      _CurveLength=0;
+    }
+    
+    inline CurvePointIterator(const CurvePointIterator& iBrother)
+      : Interface0DIteratorNested()
+    {
+      __A = iBrother.__A;
+      __B = iBrother.__B;
+      _begin = iBrother._begin;
+      _end = iBrother._end;
+      _CurvilinearLength = iBrother._CurvilinearLength;
+      _step = iBrother._step;
+      _t = iBrother._t;
+      _Point = iBrother._Point;
+      _n = iBrother._n;
+      _currentn = iBrother._currentn;
+      _CurveLength = iBrother._CurveLength;
+    }
+    inline CurvePointIterator& operator=(const CurvePointIterator& iBrother)
+    {
+      __A = iBrother.__A;
+      __B = iBrother.__B;
+      _begin = iBrother._begin;
+      _end = iBrother._end;
+      _CurvilinearLength = iBrother._CurvilinearLength;
+      _step = iBrother._step;
+      _t = iBrother._t;
+      _Point = iBrother._Point;
+      _n = iBrother._n;
+      _currentn = iBrother._currentn;
+      _CurveLength = iBrother._CurveLength;
+      return *this;
+    }
+    virtual ~CurvePointIterator()
+    {
+    }
+  protected:
+    inline CurvePointIterator(::Curve::vertex_container::iterator iA, 
+                              ::Curve::vertex_container::iterator iB, 
+                              ::Curve::vertex_container::iterator ibegin, 
+                              ::Curve::vertex_container::iterator iend,
+                              int currentn,
+      int n,
+      float iCurveLength,
+      float step, float t=0.f, float iCurvilinearLength = 0.f)
+      : Interface0DIteratorNested()
+    {
+      __A = iA;
+      __B = iB;
+      _begin = ibegin;
+      _end = iend;
+      _CurvilinearLength = iCurvilinearLength;
+      _step = step;
+      _t = t;
+      _n = n;
+      _currentn = currentn;
+      _CurveLength = iCurveLength;
+    }
+ 
+  public:
+
+    virtual CurvePointIterator* copy() const {
+      return new CurvePointIterator(*this);
+    }
+
+    inline Interface0DIterator CastToInterface0DIterator() const{
+      Interface0DIterator ret(new CurveInternal::CurvePointIterator(*this));
+      return ret;
+    }
+    virtual string getExactTypeName() const {
+      return "CurvePointIterator";
+    }
+    
+    // operators
+    inline CurvePointIterator& operator++()  // operator corresponding to ++i
+    { 
+      increment();
+      return *this;
+    }
+   
+    inline CurvePointIterator& operator--()  // operator corresponding to ++i
+    { 
+      decrement();
+      return *this;
+    }
+    
+    // comparibility
+    virtual bool operator==(const Interface0DIteratorNested& b) const
+    {
+      const CurvePointIterator* it_exact = dynamic_cast<const CurvePointIterator*>(&b);
+      if (!it_exact)
+	  return false;
+      return ((__A==it_exact->__A) && (__B==it_exact->__B) && (_t == it_exact->_t));
+    }
+    
+    // dereferencing
+    virtual CurvePoint& operator*()  
+    {
+      return (_Point = CurvePoint(*__A,*__B,_t));
+    }
+    virtual CurvePoint* operator->() { return &(operator*());}
+  public:
+    virtual bool isBegin() const 
+    {
+      if((__A == _begin) && (_t < (float)M_EPSILON))
+        return true;
+      return false;
+    }
+    virtual bool isEnd() const 
+    {
+      if(__B == _end)
+        return true;
+      return false;
+    }
+  protected:
+    virtual void increment() 
+    {
+      if((_currentn == _n-1) && (_t == 1.f))
+      {
+        // we're setting the iterator to end
+        ++__A;
+        ++__B;
+        ++_currentn;
+        _t = 0.f;
+        return;
+      }
+      
+      if(0 == _step) // means we iterate over initial vertices
+      {
+	      Vec3r vec_tmp((*__B)->point2d() - (*__A)->point2d());
+        _CurvilinearLength += (float)vec_tmp.norm();
+        if(_currentn == _n-1)
+        { 
+          _t = 1.f;   
+          return;
+        }
+        ++__B;
+        ++__A;
+        ++_currentn;
+        return;
+      }
+      
+      // compute the new position:
+      Vec3r vec_tmp2((*__A)->point2d() - (*__B)->point2d());
+      float normAB = (float)vec_tmp2.norm();
+
+      if(normAB > M_EPSILON)
+      {
+        _CurvilinearLength += _step;
+        _t = _t + _step/normAB;
+      }
+      else
+        _t = 1.f; // AB is a null segment, we're directly at its end
+        //if normAB ~= 0, we don't change these values
+      if(_t >= 1)
+      { 
+        _CurvilinearLength -= normAB*(_t-1);
+        if(_currentn == _n-1)
+          _t=1.f;
+        else
+        {
+          _t = 0.f;
+          ++_currentn;
+          ++__A;++__B;
+        }
+      }
+    }
+    virtual void decrement() 
+    {
+      if(_t == 0.f) //we're at the beginning of the edge
+      {
+        _t = 1.f;
+        --_currentn;
+        --__A; --__B;
+        if(_currentn == _n-1)
+          return;
+      }
+
+      if(0 == _step) // means we iterate over initial vertices
+      {
+	      Vec3r vec_tmp((*__B)->point2d() - (*__A)->point2d());
+        _CurvilinearLength -= (float)vec_tmp.norm();
+        _t = 0;
+        return;
+      }
+      
+      // compute the new position:
+      Vec3r vec_tmp2((*__A)->point2d() - (*__B)->point2d());
+      float normAB = (float)vec_tmp2.norm();
+      
+      if(normAB >M_EPSILON)
+      {
+        _CurvilinearLength -= _step;
+        _t = _t - _step/normAB;
+      }
+      else
+        _t = -1.f; // We just need a negative value here
+
+      // round value
+      if(fabs(_t) < (float)M_EPSILON)
+        _t = 0.0;
+      if(_t < 0)
+      { 
+        if(_currentn == 0)
+          _CurvilinearLength = 0.f;
+        else
+        _CurvilinearLength += normAB*(-_t);
+        _t = 0.f;
+      } 
+    }
+
+    virtual float t() const{
+      return _CurvilinearLength;
+    } 
+    virtual float u() const{
+      return _CurvilinearLength/_CurveLength;
+    } 
+  };
+
+  
+
+} // end of namespace StrokeInternal
+
+#endif // CURVEITERATORS_H
diff --git a/extern/freestyle/src/stroke/Modifiers.h b/extern/freestyle/src/stroke/Modifiers.h
new file mode 100755
index 00000000000..c3be65ffc89
--- /dev/null
+++ b/extern/freestyle/src/stroke/Modifiers.h
@@ -0,0 +1,71 @@
+//
+//  Filename         : Modifiers.h
+//  Author           : Stephane Grabli
+//  Purpose          : modifiers...
+//  Date of creation : 05/01/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  MODIFIERS_H
+# define MODIFIERS_H
+
+# include "TimeStamp.h"
+
+/* ----------------------------------------- *
+ *                                           *
+ *              modifiers                 *
+ *                                           *
+ * ----------------------------------------- */
+/*! Base class for modifiers.
+ *  Modifiers are used in the
+ *  Operators in order to "mark"
+ *  the processed Interface1D.
+ */
+template<class Edge>
+struct EdgeModifier : public unary_function<Edge,void>
+{
+  /*! Default construction */
+  EdgeModifier() : unary_function<Edge,void>() {}
+  /*! the () operator */
+  virtual void operator()(Edge& iEdge) {}
+};
+
+/*! Modifier that sets the time stamp
+ *  of an Interface1D to the time stamp
+ *  of the system.
+ */
+template<class Edge>
+struct TimestampModifier : public EdgeModifier<Edge>
+{
+  /*! Default constructor */
+  TimestampModifier() : EdgeModifier<Edge>() {}
+  /*! The () operator. */
+  virtual void operator()(Edge& iEdge) 
+  {
+    TimeStamp *timestamp = TimeStamp::instance();
+    iEdge.SetTimeStamp(timestamp->getTimeStamp());
+  }
+};
+
+#endif // MODIFIERS_H
diff --git a/extern/freestyle/src/stroke/Module.h b/extern/freestyle/src/stroke/Module.h
new file mode 100755
index 00000000000..591bb157392
--- /dev/null
+++ b/extern/freestyle/src/stroke/Module.h
@@ -0,0 +1,72 @@
+//
+//  Filename         : Module.h
+//  Author(s)        : Emmanuel Turquin
+//  Purpose          : Set the type of the module
+//  Date of creation : 01/07/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  MODULE_H
+# define MODULE_H
+
+# include "Canvas.h"
+# include "StyleModule.h"
+
+class Module
+{
+public:
+
+  static void setAlwaysRefresh(bool b = true) {
+    getCurrentStyleModule()->setAlwaysRefresh(b);
+  }
+
+  static void setCausal(bool b = true) {
+    getCurrentStyleModule()->setCausal(b);
+  }
+
+  static void setDrawable(bool b = true) {
+    getCurrentStyleModule()->setDrawable(b);
+  }
+
+  static bool getAlwaysRefresh() {
+    return getCurrentStyleModule()->getAlwaysRefresh();
+  }
+
+  static bool getCausal() {
+    return getCurrentStyleModule()->getCausal();
+  }
+
+  static bool getDrawable() {
+    return getCurrentStyleModule()->getDrawable();
+  }
+
+private:
+
+  static StyleModule* getCurrentStyleModule() {
+    Canvas* canvas = Canvas::getInstance();
+    return canvas->getCurrentStyleModule();
+  }
+};
+
+#endif // MODULE_H
diff --git a/extern/freestyle/src/stroke/Operators.cpp b/extern/freestyle/src/stroke/Operators.cpp
new file mode 100755
index 00000000000..121dee3ba26
--- /dev/null
+++ b/extern/freestyle/src/stroke/Operators.cpp
@@ -0,0 +1,862 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include <algorithm>
+#include "Operators.h"
+#include "Canvas.h"
+#include "Stroke.h"
+
+LIB_STROKE_EXPORT Operators::I1DContainer	  Operators::_current_view_edges_set;
+LIB_STROKE_EXPORT Operators::I1DContainer		Operators::_current_chains_set;
+LIB_STROKE_EXPORT Operators::I1DContainer*	Operators::_current_set = NULL;
+LIB_STROKE_EXPORT Operators::StrokesContainer	Operators::_current_strokes_set;
+
+void Operators::select(UnaryPredicate1D& pred) {
+  if (!_current_set)
+    return;
+  if(_current_set->empty())
+    return;
+  I1DContainer new_set;
+  I1DContainer rejected;
+  Functions1D::ChainingTimeStampF1D cts;
+  Functions1D::TimeStampF1D ts;
+  I1DContainer::iterator it = _current_set->begin();
+  I1DContainer::iterator itbegin = it;
+  while (it != _current_set->end()) {
+    Interface1D * i1d = *it;
+    cts(*i1d); // mark everyone's chaining time stamp anyway
+    if (pred(*i1d)){
+      new_set.push_back(i1d);
+      ts(*i1d);
+    }else{
+      rejected.push_back(i1d);
+    }
+    ++it;
+  }
+  if((*itbegin)->getExactTypeName() != "ViewEdge"){
+    for (it = rejected.begin();
+       it != rejected.end();
+       ++it)
+    delete *it;
+  }
+  rejected.clear();
+  _current_set->clear();
+  *_current_set = new_set;
+}
+
+
+void Operators::chain(ViewEdgeInternal::ViewEdgeIterator& it,
+		      UnaryPredicate1D& pred,
+		      UnaryFunction1D<void>& modifier) {
+  if (_current_view_edges_set.empty())
+    return;
+
+  unsigned id = 0;
+  ViewEdge* edge;
+  Chain* new_chain;
+
+  for (I1DContainer::iterator it_edge = _current_view_edges_set.begin();
+       it_edge != _current_view_edges_set.end();
+       ++it_edge) {
+    if (pred(**it_edge))
+      continue;
+
+    edge = dynamic_cast<ViewEdge*>(*it_edge);
+    it.setBegin(edge);
+    it.setCurrentEdge(edge);
+
+    Chain* new_chain = new Chain(id);++id;
+    do {
+      new_chain->push_viewedge_back(*it, it.getOrientation());
+      modifier(**it);
+      ++it;
+    } while (!it.isEnd() && !pred(**it));
+
+    _current_chains_set.push_back(new_chain);
+  }
+
+  if (!_current_chains_set.empty())
+    _current_set = &_current_chains_set;
+}
+
+
+void Operators::chain(ViewEdgeInternal::ViewEdgeIterator& it,
+		      UnaryPredicate1D& pred) {
+  if (_current_view_edges_set.empty())
+    return;
+
+  unsigned id = 0;
+  Functions1D::IncrementChainingTimeStampF1D ts;
+  Predicates1D::EqualToChainingTimeStampUP1D pred_ts(TimeStamp::instance()->getTimeStamp()+1);
+
+  ViewEdge* edge;
+  Chain* new_chain;
+
+  for (I1DContainer::iterator it_edge = _current_view_edges_set.begin();
+       it_edge != _current_view_edges_set.end();
+       ++it_edge) {
+    if (pred(**it_edge) || pred_ts(**it_edge))
+      continue;
+
+    edge = dynamic_cast<ViewEdge*>(*it_edge);
+    it.setBegin(edge);
+    it.setCurrentEdge(edge);
+
+    Chain* new_chain = new Chain(id);++id;
+    do {
+      new_chain->push_viewedge_back(*it, it.getOrientation());
+      ts(**it);
+      ++it;
+    } while (!it.isEnd() && !pred(**it) && !pred_ts(**it));
+
+    _current_chains_set.push_back(new_chain);
+  }
+
+  if (!_current_chains_set.empty())
+    _current_set = &_current_chains_set;
+}
+
+
+//void Operators::bidirectionalChain(ViewEdgeIterator& it,
+//				   UnaryPredicate1D& pred,
+//				   UnaryFunction1D<void>& modifier) {
+//  if (_current_view_edges_set.empty())
+//    return;
+//
+//  unsigned id = 0;
+//  ViewEdge* edge;
+//  Chain* new_chain;
+//
+//  for (I1DContainer::iterator it_edge = _current_view_edges_set.begin();
+//       it_edge != _current_view_edges_set.end();
+//       ++it_edge) {
+//    if (pred(**it_edge))
+//      continue;
+//
+//    edge = dynamic_cast<ViewEdge*>(*it_edge);
+//    it.setBegin(edge);
+//    it.setCurrentEdge(edge);
+//
+//    Chain* new_chain = new Chain(id);++id;
+//    //ViewEdgeIterator it_back(it);--it_back; // FIXME
+//    do {
+//      new_chain->push_viewedge_back(*it, it.getOrientation());
+//      modifier(**it);
+//      ++it;
+//    } while (!it.isEnd() && !pred(**it));
+//    it.setBegin(edge);
+//    it.setCurrentEdge(edge);
+//    --it;
+//    while (!it.isEnd() && !pred(**it)) {
+//      new_chain->push_viewedge_front(*it, it.getOrientation());
+//      modifier(**it);
+//      --it;
+//    }
+//
+//    _current_chains_set.push_back(new_chain);
+//  }
+//
+//  if (!_current_chains_set.empty())
+//    _current_set = &_current_chains_set;
+//}
+//
+//void Operators::bidirectionalChain(ViewEdgeIterator& it,
+//				   UnaryPredicate1D& pred) {
+//  if (_current_view_edges_set.empty())
+//    return;
+//
+//  unsigned id = 0;
+//  Functions1D::IncrementChainingTimeStampF1D ts;
+//  Predicates1D::EqualToChainingTimeStampUP1D pred_ts(TimeStamp::instance()->getTimeStamp()+1);
+//
+//  ViewEdge* edge;
+//  Chain* new_chain;
+//
+//  for (I1DContainer::iterator it_edge = _current_view_edges_set.begin();
+//       it_edge != _current_view_edges_set.end();
+//       ++it_edge) {
+//    if (pred(**it_edge) || pred_ts(**it_edge))
+//      continue;
+//
+//    edge = dynamic_cast<ViewEdge*>(*it_edge);
+//    it.setBegin(edge);
+//    it.setCurrentEdge(edge);
+          //
+          //    Chain* new_chain = new Chain(id);++id;
+          //    //ViewEdgeIterator it_back(it);--it_back;//FIXME
+          //    do {
+          //      new_chain->push_viewedge_back(*it, it.getOrientation());
+          //      ts(**it);
+          //      ++it;
+          //    } while (!it.isEnd() && !pred(**it) && !pred_ts(**it));
+          //    it.setBegin(edge);
+          //    it.setCurrentEdge(edge);
+          //    --it;
+          //    while (!it.isEnd() && !pred(**it) && !pred_ts(**it)) {
+          //      new_chain->push_viewedge_front(*it, it.getOrientation());
+          //      ts(**it);
+          //      --it;
+          //    }
+          //
+          //    _current_chains_set.push_back(new_chain);
+          //  }
+          //
+          //  if (!_current_chains_set.empty())
+          //    _current_set = &_current_chains_set;
+          //}
+
+void Operators::bidirectionalChain(ChainingIterator& it, UnaryPredicate1D& pred) {
+  if (_current_view_edges_set.empty())
+    return;
+
+  unsigned id = 0;
+  Functions1D::IncrementChainingTimeStampF1D ts;
+  Predicates1D::EqualToChainingTimeStampUP1D pred_ts(TimeStamp::instance()->getTimeStamp()+1);
+  
+  ViewEdge* edge;
+  Chain* new_chain;
+  
+  for (I1DContainer::iterator it_edge = _current_view_edges_set.begin();
+  it_edge != _current_view_edges_set.end();
+  ++it_edge) {
+    if (pred(**it_edge) || pred_ts(**it_edge))
+      continue;
+    
+    edge = dynamic_cast<ViewEdge*>(*it_edge);
+    // re-init iterator
+    it.setBegin(edge);
+    it.setCurrentEdge(edge);
+    it.setOrientation(true);
+    it.init();
+    
+    Chain* new_chain = new Chain(id);++id;
+    //ViewEdgeIterator it_back(it);--it_back;//FIXME
+    do {
+      new_chain->push_viewedge_back(*it, it.getOrientation());
+      ts(**it);
+      it.increment(); // FIXME
+    } while (!it.isEnd() && !pred(**it));
+    it.setBegin(edge);
+    it.setCurrentEdge(edge);
+    it.setOrientation(true);
+    it.decrement(); // FIXME
+    while (!it.isEnd() && !pred(**it)) {
+      new_chain->push_viewedge_front(*it, it.getOrientation());
+      ts(**it);
+      it.decrement();// FIXME
+    }
+    _current_chains_set.push_back(new_chain);
+  }
+  
+  if (!_current_chains_set.empty())
+    _current_set = &_current_chains_set;
+}
+
+void Operators::bidirectionalChain(ChainingIterator& it) {
+  if (_current_view_edges_set.empty())
+    return;
+
+  unsigned id = 0;
+  Functions1D::IncrementChainingTimeStampF1D ts;
+  Predicates1D::EqualToChainingTimeStampUP1D pred_ts(TimeStamp::instance()->getTimeStamp()+1);
+  
+  ViewEdge* edge;
+  Chain* new_chain;
+  
+  for (I1DContainer::iterator it_edge = _current_view_edges_set.begin();
+  it_edge != _current_view_edges_set.end();
+  ++it_edge) {
+    if (pred_ts(**it_edge))
+      continue;
+    
+    edge = dynamic_cast<ViewEdge*>(*it_edge);
+    // re-init iterator
+    it.setBegin(edge);
+    it.setCurrentEdge(edge);
+    it.setOrientation(true);
+    it.init();
+    
+    Chain* new_chain = new Chain(id);++id;
+    //ViewEdgeIterator it_back(it);--it_back;//FIXME
+    do {
+      new_chain->push_viewedge_back(*it, it.getOrientation());
+      ts(**it);
+      it.increment(); // FIXME
+    } while (!it.isEnd());
+    it.setBegin(edge);
+    it.setCurrentEdge(edge);
+    it.setOrientation(true);
+    it.decrement(); // FIXME
+    while (!it.isEnd()) {
+      new_chain->push_viewedge_front(*it, it.getOrientation());
+      ts(**it);
+      it.decrement();// FIXME
+    }
+    _current_chains_set.push_back(new_chain);
+  }
+  
+  if (!_current_chains_set.empty())
+    _current_set = &_current_chains_set;
+}
+
+void Operators::sequentialSplit(UnaryPredicate0D& pred, 
+				float sampling)
+{
+  if (_current_chains_set.empty()) {
+    cerr << "Warning: current set empty" << endl;
+    return;
+  }
+  CurvePoint *point;
+  Chain * new_curve;
+  I1DContainer splitted_chains;
+  Interface0DIterator first;
+  Interface0DIterator end;
+  Interface0DIterator last;
+  Interface0DIterator it;
+  I1DContainer::iterator cit = _current_chains_set.begin(), citend = _current_chains_set.end();
+  for (;
+       cit != citend;
+       ++cit) {
+    
+    Id currentId = (*cit)->getId();
+    new_curve = new Chain(currentId);
+    first = (*cit)->pointsBegin(sampling);
+    end = (*cit)->pointsEnd(sampling);
+    last = end;--last;
+    it = first;
+
+    point = dynamic_cast<CurvePoint*>(&(*it));
+    new_curve->push_vertex_back(point);++it;
+    for(; it!= end; ++it)
+      {
+        point = dynamic_cast<CurvePoint*>(&(*it));
+        new_curve->push_vertex_back(point);
+        if((pred(it)) && (it!=last))
+          {
+            splitted_chains.push_back(new_curve);
+            currentId.setSecond(currentId.getSecond()+1);
+            new_curve = new Chain(currentId);
+            new_curve->push_vertex_back(point);
+          }
+      }
+    if(new_curve->nSegments() == 0){
+      delete new_curve;
+      return;
+    }
+
+    splitted_chains.push_back(new_curve);
+  }
+
+  // Update the current set of chains:
+  cit = _current_chains_set.begin();
+  for(;
+      cit != citend;
+      ++cit){
+    delete (*cit);
+  }
+  _current_chains_set.clear();
+  _current_chains_set = splitted_chains;
+  splitted_chains.clear();
+
+  if (!_current_chains_set.empty())
+    _current_set = &_current_chains_set;
+}
+
+void Operators::sequentialSplit(UnaryPredicate0D& startingPred, UnaryPredicate0D& stoppingPred, 
+				float sampling)
+{
+  if (_current_chains_set.empty()) {
+    cerr << "Warning: current set empty" << endl;
+    return;
+  }
+  CurvePoint *point;
+  Chain * new_curve;
+  I1DContainer splitted_chains;
+  Interface0DIterator first;
+  Interface0DIterator end;
+  Interface0DIterator last;
+  Interface0DIterator itStart;
+  Interface0DIterator itStop;
+  I1DContainer::iterator cit = _current_chains_set.begin(), citend = _current_chains_set.end();
+  for (;
+  cit != citend;
+  ++cit) {
+    Id currentId = (*cit)->getId();
+    first = (*cit)->pointsBegin(sampling);
+    end = (*cit)->pointsEnd(sampling);
+    last = end;--last;
+    itStart = first;
+    do{
+      itStop = itStart;++itStop;
+      
+      new_curve = new Chain(currentId);
+      currentId.setSecond(currentId.getSecond()+1);
+      
+      point = dynamic_cast<CurvePoint*>(&(*itStart));
+      new_curve->push_vertex_back(point);    
+      do{
+        point = dynamic_cast<CurvePoint*>(&(*itStop));
+        new_curve->push_vertex_back(point);    
+        ++itStop;
+      }while((itStop!=end) && (!stoppingPred(itStop)));
+      if(itStop!=end){
+        point = dynamic_cast<CurvePoint*>(&(*itStop));
+        new_curve->push_vertex_back(point);    
+      }
+      if(new_curve->nSegments() == 0){
+        delete new_curve;
+      }else{
+        splitted_chains.push_back(new_curve);
+      }
+      // find next start
+      do{
+        ++itStart;
+      }while((itStart!=end) && (!startingPred(itStart)));
+    }while((itStart!=end) && (itStart!=last));
+  }
+  
+  // Update the current set of chains:
+  cit = _current_chains_set.begin();
+  for(;
+  cit != citend;
+  ++cit){
+    delete (*cit);
+  }
+  _current_chains_set.clear();
+  _current_chains_set = splitted_chains;
+  splitted_chains.clear();
+  
+  if (!_current_chains_set.empty())
+    _current_set = &_current_chains_set;
+}
+
+#include "CurveIterators.h"
+
+// Internal function
+void __recursiveSplit(Chain *_curve, UnaryFunction0D<double>& func, UnaryPredicate1D& pred, float sampling,
+                      Operators::I1DContainer& newChains, Operators::I1DContainer& splitted_chains)
+{
+  if(((_curve->nSegments() == 1) && (sampling == 0)) || (_curve->getLength2D() <= sampling)){
+    newChains.push_back(_curve);
+    return;
+  }
+
+  CurveInternal::CurvePointIterator first             = _curve->curvePointsBegin(sampling);
+  CurveInternal::CurvePointIterator second            = first; ++second;
+  CurveInternal::CurvePointIterator end               = _curve->curvePointsEnd(sampling);
+  CurveInternal::CurvePointIterator it                = second;
+  CurveInternal::CurvePointIterator split             = second;
+  Interface0DIterator it0d                            = it.CastToInterface0DIterator();
+  real _min                                           = FLT_MAX;++it;//func(it0d);++it;
+  CurveInternal::CurvePointIterator next              = it;++next;
+  real tmp;
+  
+  bool bsplit = false;
+  for(; ((it != end) && (next != end)); ++it,++next){
+    it0d = it.CastToInterface0DIterator();
+    tmp = func(it0d);
+    if(tmp < _min){
+      _min = tmp;
+      split = it;
+      bsplit = true;
+    }
+  }
+  
+  if(!bsplit){ // we didn't find any minimum
+    newChains.push_back(_curve);
+    return;
+  }
+
+  // retrieves the current splitting id
+  Id * newId = _curve->getSplittingId();
+  if(newId == 0){
+    newId = new Id(_curve->getId());
+    _curve->setSplittingId(newId);
+  } 
+
+  Chain *new_curve_a = new Chain(*newId);
+  newId->setSecond(newId->getSecond()+1);
+  new_curve_a->setSplittingId(newId);
+  Chain *new_curve_b = new Chain(*newId);
+  newId->setSecond(newId->getSecond()+1);
+  new_curve_b->setSplittingId(newId);
+  
+  CurveInternal::CurvePointIterator vit = _curve->curveVerticesBegin(), vitend=_curve->curveVerticesEnd();
+  CurveInternal::CurvePointIterator vnext = vit; ++vnext;
+
+  
+  for(; (vit!=vitend)&&(vnext!=vitend)&&(split._CurvilinearLength-vit._CurvilinearLength> 0.001); ++vit,++vnext){
+    new_curve_a->push_vertex_back(&(*vit));
+  }
+  if((vit==vitend) || (vnext == vitend)){
+    cout << "The split takes place in bad location" << endl;
+    newChains.push_back(_curve);
+    delete new_curve_a;
+    delete new_curve_b;
+    return;
+  }
+
+  // build the two resulting chains
+  if(fabs(vit._CurvilinearLength-split._CurvilinearLength) > 0.001){
+    new_curve_a->push_vertex_back(&(*split));
+    new_curve_b->push_vertex_back(&(*split));
+  }
+  else{
+    new_curve_a->push_vertex_back(&(*vit));
+  }
+
+  for(;vit!=vitend;++vit)
+    new_curve_b->push_vertex_back(&(*vit));
+  
+  // let's check whether one or two of the two new curves 
+  // satisfy the stopping condition or not.
+  // (if one of them satisfies it, we don't split)
+  if((pred(*new_curve_a)) || (pred(*new_curve_b))){
+    // we don't actually create these two chains
+    newChains.push_back(_curve);
+    delete new_curve_a;
+    delete new_curve_b;
+    return;
+  }
+  // here we know we'll split _curve:
+  splitted_chains.push_back(_curve);
+
+  __recursiveSplit(new_curve_a, func, pred, sampling, newChains, splitted_chains);
+  __recursiveSplit(new_curve_b, func, pred, sampling, newChains, splitted_chains);
+}
+
+void Operators::recursiveSplit(UnaryFunction0D<double>& func, UnaryPredicate1D& pred, float sampling)
+{
+  if (_current_chains_set.empty()) {
+    cerr << "Warning: current set empty" << endl;
+    return;
+  }
+
+  Chain *currentChain = 0;
+  I1DContainer splitted_chains;
+  I1DContainer newChains;
+  I1DContainer::iterator cit = _current_chains_set.begin(), citend = _current_chains_set.end();
+  for (;
+       cit != citend;
+       ++cit) {
+    currentChain = dynamic_cast<Chain*>(*cit);
+    if(!currentChain)
+      continue;
+    // let's check the first one:
+    if(!pred(*currentChain)){
+      __recursiveSplit(currentChain, func, pred, sampling, newChains, splitted_chains);
+    }else{
+      newChains.push_back(currentChain);
+    }
+  }
+  // Update the current set of chains:
+  if(!splitted_chains.empty()){
+    for(cit = splitted_chains.begin(), citend = splitted_chains.end();
+        cit != citend;
+        ++cit){
+      delete (*cit);
+    } 
+  splitted_chains.clear();
+  } 
+  
+  _current_chains_set.clear();
+  _current_chains_set = newChains;
+  newChains.clear();
+
+  if (!_current_chains_set.empty())
+    _current_set = &_current_chains_set;
+}
+
+
+// recursive split with pred 0D
+void __recursiveSplit(Chain *_curve, UnaryFunction0D<double>& func, UnaryPredicate0D& pred0d, UnaryPredicate1D& pred, float sampling,
+                      Operators::I1DContainer& newChains, Operators::I1DContainer& splitted_chains)
+{
+  if(((_curve->nSegments() == 1) && (sampling == 0)) || (_curve->getLength2D() <= sampling)){
+    newChains.push_back(_curve);
+    return;
+  }
+
+  CurveInternal::CurvePointIterator first             = _curve->curvePointsBegin(sampling);
+  CurveInternal::CurvePointIterator second            = first; ++second;
+  CurveInternal::CurvePointIterator end               = _curve->curvePointsEnd(sampling);
+  CurveInternal::CurvePointIterator it                = second;
+  CurveInternal::CurvePointIterator split             = second;
+  Interface0DIterator it0d                            = it.CastToInterface0DIterator();
+  //real _min                                           = func(it0d);++it;
+  real _min                                           = FLT_MAX;++it;
+  real mean                                           = 0.f;
+  real variance                                       = 0.f;
+  unsigned count                                      = 0;
+  CurveInternal::CurvePointIterator next              = it;++next;
+  real tmp;
+  
+  bool bsplit = false;
+  for(; ((it != end) && (next != end)); ++it,++next){
+    ++count;
+    it0d = it.CastToInterface0DIterator();
+    if(!pred0d(it0d))
+      continue;
+    tmp = func(it0d);
+    mean += tmp;
+    if(tmp < _min){
+      _min = tmp;
+      split = it;
+      bsplit = true;
+    }
+  }
+  mean /= (float)count;
+
+  //if((!bsplit) || (mean-_min>mean)){ // we didn't find any minimum
+  if(!bsplit){ // we didn't find any minimum
+    newChains.push_back(_curve);
+    return;
+  }
+
+  // retrieves the current splitting id
+  Id * newId = _curve->getSplittingId();
+  if(newId == 0){
+    newId = new Id(_curve->getId());
+    _curve->setSplittingId(newId);
+  } 
+
+  Chain *new_curve_a = new Chain(*newId);
+  newId->setSecond(newId->getSecond()+1);
+  new_curve_a->setSplittingId(newId);
+  Chain *new_curve_b = new Chain(*newId);
+  newId->setSecond(newId->getSecond()+1);
+  new_curve_b->setSplittingId(newId);
+  
+  CurveInternal::CurvePointIterator vit = _curve->curveVerticesBegin(), vitend=_curve->curveVerticesEnd();
+  CurveInternal::CurvePointIterator vnext = vit; ++vnext;
+
+  
+  for(; (vit!=vitend)&&(vnext!=vitend)&&(split._CurvilinearLength-vit._CurvilinearLength> 0.001); ++vit,++vnext){
+    new_curve_a->push_vertex_back(&(*vit));
+  }
+  if((vit==vitend) || (vnext == vitend)){
+    cout << "The split takes place in bad location" << endl;
+    newChains.push_back(_curve);
+    delete new_curve_a;
+    delete new_curve_b;
+    return;
+  }
+
+  // build the two resulting chains
+  if(fabs(vit._CurvilinearLength-split._CurvilinearLength) > 0.001){
+    new_curve_a->push_vertex_back(&(*split));
+    new_curve_b->push_vertex_back(&(*split));
+  }
+  else{
+    new_curve_a->push_vertex_back(&(*vit));
+  }
+
+  for(;vit!=vitend;++vit)
+    new_curve_b->push_vertex_back(&(*vit));
+  
+  // let's check whether one or two of the two new curves 
+  // satisfy the stopping condition or not.
+  // (if one of them satisfies it, we don't split)
+  if((pred(*new_curve_a)) || (pred(*new_curve_b))){
+    // we don't actually create these two chains
+    newChains.push_back(_curve);
+    delete new_curve_a;
+    delete new_curve_b;
+    return;
+  }
+  // here we know we'll split _curve:
+  splitted_chains.push_back(_curve);
+
+  __recursiveSplit(new_curve_a, func, pred0d, pred, sampling, newChains, splitted_chains);
+  __recursiveSplit(new_curve_b, func, pred0d, pred, sampling, newChains, splitted_chains);
+}
+
+void Operators::recursiveSplit(UnaryFunction0D<double>& func, UnaryPredicate0D& pred0d,  UnaryPredicate1D& pred, float sampling)
+{
+  if (_current_chains_set.empty()) {
+    cerr << "Warning: current set empty" << endl;
+    return;
+  }
+
+  Chain *currentChain = 0;
+  I1DContainer splitted_chains;
+  I1DContainer newChains;
+  I1DContainer::iterator cit = _current_chains_set.begin(), citend = _current_chains_set.end();
+  for (;
+       cit != citend;
+       ++cit) {
+    currentChain = dynamic_cast<Chain*>(*cit);
+    if(!currentChain)
+      continue;
+    // let's check the first one:
+    if(!pred(*currentChain)){
+      __recursiveSplit(currentChain, func, pred0d, pred, sampling, newChains, splitted_chains);
+    }else{
+      newChains.push_back(currentChain);
+    }
+  }
+  // Update the current set of chains:
+  if(!splitted_chains.empty()){
+    for(cit = splitted_chains.begin(), citend = splitted_chains.end();
+        cit != citend;
+        ++cit){
+      delete (*cit);
+    } 
+  splitted_chains.clear();
+  } 
+  
+  _current_chains_set.clear();
+  _current_chains_set = newChains;
+  newChains.clear();
+
+  if (!_current_chains_set.empty())
+    _current_set = &_current_chains_set;
+}
+// Internal class
+class PredicateWrapper
+{
+public:
+
+  inline PredicateWrapper(BinaryPredicate1D& pred) {
+    _pred = &pred;
+  }
+
+  inline bool operator()(Interface1D* i1, Interface1D* i2) {
+    return (*_pred)(*i1, *i2);
+  }
+
+private:
+
+  BinaryPredicate1D* _pred;
+};
+
+void Operators::sort(BinaryPredicate1D& pred) {
+  if (!_current_set)
+    return;
+  std::sort(_current_set->begin(), _current_set->end(), PredicateWrapper(pred));
+}
+
+Stroke* createStroke(Interface1D& inter) {
+  Stroke* stroke = new Stroke;
+  stroke->SetId(inter.getId());
+
+  float currentCurvilignAbscissa = 0.f;
+
+  Interface0DIterator it = inter.verticesBegin(), itend = inter.verticesEnd();
+  Interface0DIterator itfirst = it;
+
+  Vec3r current(it->getProjectedX(), it->getProjectedY(), it->getProjectedZ());
+  Vec3r previous = current;
+  SVertex* sv;
+  CurvePoint* cp;
+  StrokeVertex* stroke_vertex;  
+
+  do {
+    cp = dynamic_cast<CurvePoint*>(&(*it));
+    if (!cp) {
+      sv = dynamic_cast<SVertex*>(&(*it));
+      if (!sv) {
+	cerr << "Warning: unexpected Vertex type" << endl;
+	continue;
+      }
+      stroke_vertex = new StrokeVertex(sv);
+    }
+    else
+      stroke_vertex = new StrokeVertex(cp);
+    current = stroke_vertex->point2d();
+    Vec3r vec_tmp(current - previous);
+    currentCurvilignAbscissa += vec_tmp.norm();
+    stroke_vertex->SetCurvilinearAbscissa(currentCurvilignAbscissa);
+    stroke->push_back(stroke_vertex);
+    previous = current;
+    ++it;
+  } while((it != itend) && (it != itfirst));
+
+  if (it == itfirst) {
+    // Add last vertex:
+    cp = dynamic_cast<CurvePoint*>(&(*it));
+    if (!cp) {
+      sv = dynamic_cast<SVertex*>(&(*it));
+      if (!sv)
+	cerr << "Warning: unexpected Vertex type" << endl;
+      else
+	stroke_vertex = new StrokeVertex(sv);
+    }
+    else
+      stroke_vertex = new StrokeVertex(cp);
+    current = stroke_vertex->point2d();
+    Vec3r vec_tmp(current - previous);
+    currentCurvilignAbscissa += vec_tmp.norm();
+    stroke_vertex->SetCurvilinearAbscissa(currentCurvilignAbscissa);
+    stroke->push_back(stroke_vertex);
+  }
+  stroke->SetLength(currentCurvilignAbscissa);
+  return stroke;
+}
+
+
+inline void applyShading(Stroke& stroke, vector<StrokeShader*>& shaders) {
+  for (vector<StrokeShader*>::iterator it = shaders.begin();
+       it != shaders.end();
+       ++it)
+    (*it)->shade(stroke);
+}
+
+
+void Operators::create(UnaryPredicate1D& pred, vector<StrokeShader*> shaders) {
+  Canvas* canvas = Canvas::getInstance();
+  if (!_current_set) {
+    cerr << "Warning: current set empty" << endl;
+    return;
+  }
+  for (Operators::I1DContainer::iterator it = _current_set->begin();
+       it != _current_set->end();
+       ++it) {
+    if (!pred(**it))
+      continue;
+    Stroke* stroke = createStroke(**it);
+    if (stroke) {
+      applyShading(*stroke, shaders);
+      canvas->RenderStroke(stroke);
+      _current_strokes_set.push_back(stroke);
+    }
+  }
+}
+
+
+void Operators::reset() {
+  ViewMap* vm = ViewMap::getInstance();
+  if (!vm) {
+    cerr << "Error: no ViewMap computed yet" << endl;
+    return;
+  }
+  _current_view_edges_set.clear();
+  for (I1DContainer::iterator it = _current_chains_set.begin();
+       it != _current_chains_set.end();
+       ++it)
+    delete *it;
+  _current_chains_set.clear();
+  _current_view_edges_set.insert(_current_view_edges_set.begin(),
+				 vm->ViewEdges().begin(),
+				 vm->ViewEdges().end());
+  _current_set = &_current_view_edges_set;
+  _current_strokes_set.clear();
+}
diff --git a/extern/freestyle/src/stroke/Operators.h b/extern/freestyle/src/stroke/Operators.h
new file mode 100755
index 00000000000..96ecd0aa75b
--- /dev/null
+++ b/extern/freestyle/src/stroke/Operators.h
@@ -0,0 +1,311 @@
+//
+//  Filename         : Operators.h
+//  Author(s)        : Stephane Grabli, Emmanuel Turquin
+//  Purpose          : Class gathering stroke creation algorithms
+//  Date of creation : 01/07/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  OPERATORS_H
+# define OPERATORS_H
+
+# include <vector>
+# include <iostream>
+# include "../view_map/Interface1D.h"
+# include "Predicates1D.h"
+# include "Predicates0D.h"
+# include "../view_map/ViewMap.h"
+# include "Chain.h"
+# include "ChainingIterators.h"
+# include "../system/TimeStamp.h"
+# include "StrokeShader.h"
+
+/*! Class defining the operators used in a style module.
+ *  There are 4 classes of operators: Selection, Chaining,
+ * Splitting and Creating. All these operators are user controlled
+ * in the scripting language through Functors, Predicates and Shaders
+ * that are taken as arguments.
+ */
+class LIB_STROKE_EXPORT Operators {
+
+public:
+
+  typedef vector<Interface1D*>	I1DContainer;
+  typedef vector<Stroke*>	StrokesContainer;
+
+
+  //
+  // Operators
+  //
+  ////////////////////////////////////////////////
+
+  /*! Selects the ViewEdges of the ViewMap verifying
+   *  a specified condition.
+   *  \param pred The predicate expressing this condition
+   */
+  static void select(UnaryPredicate1D& pred);
+
+  /*! Builds a set of chains from the current set of ViewEdges.
+   *  Each ViewEdge of the current list starts a new chain. The chaining
+   *  operator then iterates over the ViewEdges of the ViewMap using the
+   *  user specified iterator.
+   *  This operator only iterates using the increment operator and is
+   *  therefore unidirectional.
+   *  \param it
+   *           The iterator on the ViewEdges of the ViewMap. It contains
+   *           the chaining rule.
+   *  \param pred
+   *           The predicate on the ViewEdge that expresses the stopping
+   *           condition.
+   *  \param modifier
+   *           A function that takes a ViewEdge as argument and that
+   *           is used to modify the processed ViewEdge state (the timestamp
+   *           incrementation is a typical illustration of such a modifier)
+   */
+  static void chain(ViewEdgeInternal::ViewEdgeIterator& it,
+		    UnaryPredicate1D& pred,
+		    UnaryFunction1D<void>& modifier);
+
+  /*! Builds a set of chains from the current set of ViewEdges.
+   *  Each ViewEdge of the current list starts a new chain. The chaining
+   *  operator then iterates over the ViewEdges of the ViewMap using the
+   *  user specified iterator.
+   *  This operator only iterates using the increment operator and is
+   *  therefore unidirectional.
+   *  This chaining operator is different from the previous one because
+   *  it doesn't take any modifier as argument. Indeed, the time stamp (insuring
+   *  that a ViewEdge is processed one time) is automatically managed in this case.
+   *  \param it
+   *           The iterator on the ViewEdges of the ViewMap. It contains
+   *           the chaining rule.
+   *  \param pred
+   *           The predicate on the ViewEdge that expresses the stopping
+   *           condition.
+   */
+  static void chain(ViewEdgeInternal::ViewEdgeIterator& it,
+		    UnaryPredicate1D& pred);  
+
+  /*! Builds a set of chains from the current set of ViewEdges.
+   *  Each ViewEdge of the current list potentially starts a new chain. The chaining
+   *  operator then iterates over the ViewEdges of the ViewMap using the
+   *  user specified iterator.
+   *  This operator iterates both using the increment and decrement operators and is
+   *  therefore bidirectional.
+   *  This operator works with a ChainingIterator which contains the  
+   *  chaining rules. It is this last one which can be told 
+   *  to chain only edges that belong to the selection or not to 
+   *  process twice a ViewEdge during the chaining.
+   *  Each time a ViewEdge is added to a chain, its chaining time stamp
+   *  is incremented. This allows you to keep track of 
+   *  the number of chains to which a ViewEdge belongs to.
+   *  \param it
+   *           The ChainingIterator on the ViewEdges of the ViewMap. It contains
+   *           the chaining rule.
+   *  \param pred
+   *           The predicate on the ViewEdge that expresses the stopping
+   *           condition.
+   */
+  static void bidirectionalChain(ChainingIterator& it, UnaryPredicate1D& pred);
+
+  /*! The only difference with the above bidirectional chaining algorithm is 
+   *  that we don't need to pass a stopping criterion. This might be desirable 
+   *  when the stopping criterion is already contained in the iterator 
+   *  definition.
+   *  Builds a set of chains from the current set of ViewEdges.
+   *  Each ViewEdge of the current list potentially starts a new chain. The chaining
+   *  operator then iterates over the ViewEdges of the ViewMap using the
+   *  user specified iterator.
+   *  This operator iterates both using the increment and decrement operators and is
+   *  therefore bidirectional.
+   *  This operator works with a ChainingIterator which contains the  
+   *  chaining rules. It is this last one which can be told 
+   *  to chain only edges that belong to the selection or not to 
+   *  process twice a ViewEdge during the chaining.
+   *  Each time a ViewEdge is added to a chain, its chaining time stamp
+   *  is incremented. This allows you to keep track of 
+   *  the number of chains to which a ViewEdge belongs to.
+   *  \param it
+   *           The ChainingIterator on the ViewEdges of the ViewMap. It contains
+   *           the chaining rule.
+   */
+  static void bidirectionalChain(ChainingIterator& it);
+
+  /*! Splits each chain of the current set of chains in a sequential way.
+   *  The points of each chain are processed (with a specified sampling) sequentially.
+   *  Each time a user specified starting condition is verified, a new chain begins and 
+   *  ends as soon as a user-defined stopping predicate is verified.
+   *  This allows chains overlapping rather than chains partitioning.
+   *  The first point of the initial chain is the first point of one of the 
+   *  resulting chains.
+   *  The splitting ends when no more chain can start.
+   *  \param startingPred
+   *           The predicate on a point that expresses the starting
+   *           condition
+   *  \param stoppingPred
+   *           The predicate on a point that expresses the stopping
+   *           condition
+   *  \param sampling
+   *           The resolution used to sample the chain for the predicates
+   *           evaluation. (The chain is not actually resampled, a virtual point
+   *           only progresses along the curve using this resolution)
+   */
+  static void sequentialSplit(UnaryPredicate0D& startingPred, UnaryPredicate0D& stoppingPred, 
+                              float sampling = 0.f);
+
+  /*! Splits each chain of the current set of chains in a sequential way.
+   *  The points of each chain are processed (with a specified sampling) sequentially
+   *  and each time a user specified condition is verified, the chain is split into two chains.
+   *  The resulting set of chains is a partition of the initial chain
+   *  \param pred
+   *           The predicate on a point that expresses the splitting
+   *           condition
+   *  \param sampling
+   *           The resolution used to sample the chain for the predicate
+   *           evaluation. (The chain is not actually resampled, a virtual point
+   *           only progresses along the curve using this resolution)
+   */
+  static void sequentialSplit(UnaryPredicate0D& pred, 
+                              float sampling = 0.f);
+
+  /*! Splits the current set of chains in a recursive way.
+   *  We process the points of each chain (with a specified sampling) to find
+   *  the point minimizing a specified function. The chain is split in two at this
+   *  point and the two new chains are processed in the same way.
+   *  The recursivity level is controlled through a predicate 1D that expresses a stopping condition
+   *  on the chain that is about to be processed.
+   *  \param func
+   *           The Unary Function evaluated at each point of the chain.
+   *           The splitting point is the point minimizing this function
+   *  \param pred
+   *           The Unary Predicate ex pressing the recursivity stopping condition.
+   *           This predicate is evaluated for each curve before it actually gets
+   *           split. If pred(chain) is true, the curve won't be split anymore.
+   *  \param sampling
+   *           The resolution used to sample the chain for the predicates
+   *           evaluation. (The chain is not actually resampled, a virtual point
+   *           only progresses along the curve using this resolution)
+   */
+  static void recursiveSplit(UnaryFunction0D<double>& func, UnaryPredicate1D& pred, float sampling = 0);
+
+  /*! Splits the current set of chains in a recursive way.
+   *  We process the points of each chain (with a specified sampling) to find
+   *  the point minimizing a specified function. The chain is split in two at this
+   *  point and the two new chains are processed in the same way.
+   *  The user can specify a 0D predicate to make a first selection 
+   *  on the points that can potentially be split.
+   *  A point that doesn't verify the 0D predicate won't be candidate 
+   *  in realizing the min.
+   *  The recursivity level is controlled through a predicate 1D that expresses a stopping condition
+   *  on the chain that is about to be processed.
+   *  \param func
+   *           The Unary Function evaluated at each point of the chain.
+   *           The splitting point is the point minimizing this function
+   *  \param pred0d
+   *           The Unary Predicate 0D used to select the candidate points 
+   *           where the split can occur.
+   *           For example, it is very likely that would rather have  
+   *           your chain splitting around its middle point than around 
+   *           one of its extremities. A 0D predicate working on 
+   *           the curvilinear abscissa allows to add this kind of constraints.
+   *  \param pred
+   *           The Unary Predicate ex pressing the recursivity stopping condition.
+   *           This predicate is evaluated for each curve before it actually gets
+   *           split. If pred(chain) is true, the curve won't be split anymore.
+   *  \param sampling
+   *           The resolution used to sample the chain for the predicates
+   *           evaluation. (The chain is not actually resampled, a virtual point
+   *           only progresses along the curve using this resolution)
+   *           
+   */
+  static void recursiveSplit(UnaryFunction0D<double>& func, UnaryPredicate0D& pred0d, UnaryPredicate1D& pred, float sampling = 0);
+    
+  /*! Sorts the current set of chains (or viewedges) according to the
+   * comparison predicate given as argument.
+   *  \param pred
+   *           The binary predicate used for the comparison
+   */
+  static void sort(BinaryPredicate1D& pred);
+
+  /*! Creates and shades the strokes from the current set of chains.
+   *  A predicate can be specified to make a selection pass on the
+   *  chains.
+   *  \param pred
+   *           The predicate that a chain must verify in order to
+   *           be transform as a stroke
+   *  \param shaders
+   *           The list of shaders used to shade the strokes
+   */
+  static void create(UnaryPredicate1D& pred, vector<StrokeShader*> shaders);
+
+  //
+  // Data access
+  //
+  ////////////////////////////////////////////////
+
+  static ViewEdge* getViewEdgeFromIndex(unsigned i) {
+    return dynamic_cast<ViewEdge*>(_current_view_edges_set[i]);
+  }
+  
+  static Chain* getChainFromIndex(unsigned i) {
+    return dynamic_cast<Chain*>(_current_chains_set[i]);
+  }
+    
+  static Stroke* getStrokeFromIndex(unsigned i) {
+    return _current_strokes_set[i];
+  }
+  
+  static unsigned getViewEdgesSize() {
+    return _current_view_edges_set.size();
+  }
+  
+  static unsigned getChainsSize() {
+    return _current_chains_set.size();
+  }
+
+  static unsigned getStrokesSize() {
+    return _current_strokes_set.size();
+  }
+  
+  //
+  // Not exported in Python
+  //
+  //////////////////////////////////////////////////
+
+  static StrokesContainer* getStrokesSet() {
+    return &_current_strokes_set;
+  }
+
+  static void reset();
+
+private:
+
+  Operators() {}
+
+  static I1DContainer		_current_view_edges_set;
+  static I1DContainer		_current_chains_set;
+  static I1DContainer*		_current_set;
+  static StrokesContainer	_current_strokes_set;
+};
+
+#endif // OPERATORS_H
diff --git a/extern/freestyle/src/stroke/PSStrokeRenderer.cpp b/extern/freestyle/src/stroke/PSStrokeRenderer.cpp
new file mode 100755
index 00000000000..dc9c94e0e11
--- /dev/null
+++ b/extern/freestyle/src/stroke/PSStrokeRenderer.cpp
@@ -0,0 +1,89 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+# include "PSStrokeRenderer.h"
+# include "Canvas.h"
+
+PSStrokeRenderer::PSStrokeRenderer(const char* iFileName)
+:StrokeRenderer(){
+  if(!iFileName)
+    iFileName = "freestyle.ps";
+  // open the stream:
+  _ofstream.open(iFileName, ios::out);
+  if(!_ofstream.is_open()){
+    cerr << "couldn't open the output file " << iFileName << endl;
+  }
+  _ofstream << "%!PS-Adobe-2.0 EPSF-2.0" << endl;
+  _ofstream << "%%Creator: Freestyle (http://artis.imag.fr/Software/Freestyle)" << endl;
+  _ofstream << "%%BoundingBox: " << 0 << " "<< 0 << " " << Canvas::getInstance()->width() << " " << Canvas::getInstance()->height() << endl;
+  _ofstream << "%%EndComments" << endl;
+}
+
+PSStrokeRenderer::~PSStrokeRenderer(){
+  Close();
+}
+
+void PSStrokeRenderer::RenderStrokeRep(StrokeRep *iStrokeRep) const{
+  RenderStrokeRepBasic(iStrokeRep);
+}
+
+void PSStrokeRenderer::RenderStrokeRepBasic(StrokeRep *iStrokeRep) const{
+  vector<Strip*>& strips = iStrokeRep->getStrips();
+  Strip::vertex_container::iterator v[3];
+  StrokeVertexRep *svRep[3];
+  Vec3r color[3];
+  for(vector<Strip*>::iterator s=strips.begin(), send=strips.end();
+  s!=send;
+  ++s){
+    Strip::vertex_container& vertices = (*s)->vertices();
+    v[0] = vertices.begin();
+    v[1] = v[0];++(v[1]);
+    v[2] = v[1]; ++(v[2]);
+
+    while(v[2]!=vertices.end()){
+      svRep[0] = *(v[0]);
+      svRep[1] = *(v[1]);
+      svRep[2] = *(v[2]);
+      
+      color[0] = svRep[0]->color();
+      //color[1] = svRep[1]->color();
+      //color[2] = svRep[2]->color();
+      
+      _ofstream << "newpath" << endl;
+      _ofstream << (color[0])[0] << " " << (color[0])[1] << " " << (color[0])[2] << " setrgbcolor" <<endl;
+      _ofstream << svRep[0]->point2d()[0] << " " <<svRep[0]->point2d()[1] << " moveto" << endl;
+      _ofstream << svRep[1]->point2d()[0] << " " <<svRep[1]->point2d()[1] << " lineto" << endl;
+      _ofstream << svRep[2]->point2d()[0] << " " <<svRep[2]->point2d()[1] << " lineto" << endl;
+      _ofstream << "closepath" << endl;
+      _ofstream << "fill" << endl;
+
+      ++v[0];
+      ++v[1];
+      ++v[2];
+    }  
+  }
+}
+
+void PSStrokeRenderer::Close(){
+  if(_ofstream.is_open())
+    _ofstream.close();
+}
+
diff --git a/extern/freestyle/src/stroke/PSStrokeRenderer.h b/extern/freestyle/src/stroke/PSStrokeRenderer.h
new file mode 100755
index 00000000000..821c016ab91
--- /dev/null
+++ b/extern/freestyle/src/stroke/PSStrokeRenderer.h
@@ -0,0 +1,63 @@
+//
+//  Filename         : PSStrokeRenderer.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Class to define the Postscript rendering of a stroke
+//  Date of creation : 10/26/2004
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  PSSTROKERENDERER_H
+# define PSSTROKERENDERER_H
+
+# include "../system/FreestyleConfig.h"
+# include "StrokeRenderer.h"
+# include <fstream>
+
+/**********************************/
+/*                                */
+/*                                */
+/*         PSStrokeRenderer       */
+/*                                */
+/*                                */
+/**********************************/
+
+class LIB_STROKE_EXPORT PSStrokeRenderer : public StrokeRenderer
+{
+public:
+  PSStrokeRenderer(const char * iFileName = 0);
+  virtual ~PSStrokeRenderer();
+
+  /*! Renders a stroke rep */
+  virtual void RenderStrokeRep(StrokeRep *iStrokeRep) const;
+  virtual void RenderStrokeRepBasic(StrokeRep *iStrokeRep) const;
+
+  /*! Closes the output PS file */
+  void Close();
+
+protected:
+  mutable ofstream _ofstream;
+};
+
+#endif // PSSTROKERENDERER_H
+
diff --git a/extern/freestyle/src/stroke/Predicates0D.h b/extern/freestyle/src/stroke/Predicates0D.h
new file mode 100755
index 00000000000..4c2dfacdf98
--- /dev/null
+++ b/extern/freestyle/src/stroke/Predicates0D.h
@@ -0,0 +1,160 @@
+//
+//  Filename         : Predicates0D.h
+//  Author(s)        : Stephane Grabli, Emmanuel Turquin
+//  Purpose          : Class gathering stroke creation algorithms
+//  Date of creation : 01/07/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  PREDICATES0D_H
+# define PREDICATES0D_H
+
+# include "../view_map/Functions0D.h"
+
+//
+// UnaryPredicate0D (base class for predicates in 0D)
+//
+///////////////////////////////////////////////////////////
+/*! Base class for Unary Predicates that work
+ *  on Interface0DIterator.
+ *  A UnaryPredicate0D is a functor that evaluates
+ *  a condition on a Interface0DIterator and returns
+ *  true or false depending on whether this condition is
+ *  satisfied or not.
+ *  The UnaryPredicate0D is used by calling its () operator.
+ *  Any inherited class must overload the () operator.
+ */
+class UnaryPredicate0D
+{
+public:
+  /*! Default constructor. */
+  UnaryPredicate0D() {}
+  /*! Destructor. */
+  virtual ~UnaryPredicate0D() {}
+  /*! Returns the string of the name
+   *  of the UnaryPredicate0D.
+   */
+  virtual string getName() const {
+    return "UnaryPredicate0D";
+  }
+  /*! The () operator. Must be overload
+   *  by inherited classes.
+   *  \param it
+   *    The Interface0DIterator pointing onto the
+   *    Interface0D at which we wish to evaluate
+   *    the predicate.
+   *  \return true if the condition is satisfied,
+   *    false otherwise.
+   */
+  virtual bool operator()(Interface0DIterator& it) {
+    cerr << "Warning: operator() not implemented" << endl;
+    return false;
+  }
+};
+
+
+//
+// BinaryPredicate0D (base class for predicates in 0D)
+//
+///////////////////////////////////////////////////////////
+/*! Base class for Binary Predicates working on Interface0D.
+ *  A BinaryPredicate0D is typically an ordering relation
+ *  between two Interface0D.
+ *  It evaluates a relation between 2 Interface0D and
+ *  returns true or false.
+ *  It is used by calling the () operator.
+ */
+class BinaryPredicate0D
+{
+public:
+  /*! Default constructor. */
+  BinaryPredicate0D() {}
+  /*! Destructor. */
+  virtual ~BinaryPredicate0D() {}
+  /*! Returns the string of the name of the
+   * binary predicate.
+   */
+  virtual string getName() const {
+    return "BinaryPredicate0D";
+  }
+
+  /*! The () operator. Must be overload by inherited classes.
+   *  It evaluates a relation between 2 Interface0D.
+   *  \param inter1
+   *    The first Interface0D.
+   *  \param inter2
+   *    The second Interface0D.
+   *  \return true or false.
+   */
+  virtual bool operator()(Interface0D& inter1, Interface0D& inter2) {
+    cerr << "Warning: operator() not implemented" << endl;
+    return false;
+  }
+};
+
+
+//
+// Predicates definitions
+//
+///////////////////////////////////////////////////////////
+
+namespace Predicates0D {
+
+  // TrueUP0D
+  /*! Returns true any time */
+  class TrueUP0D : public UnaryPredicate0D
+  {
+  public:
+    /*! Default constructor. */
+    TrueUP0D() {}
+    /*! Returns the string "TrueUP0D"*/
+    string getName() const {
+      return "TrueUP0D";
+    }
+    /*! The () operator. */
+    bool operator()(Interface0DIterator&) {
+      return true;
+    }
+  };
+
+  // FalseUP0D
+  /*! Returns false any time */
+  class FalseUP0D : public UnaryPredicate0D
+  {
+  public:
+    /*! Default constructor. */
+    FalseUP0D() {}
+    /*! Returns the string "FalseUP0D"*/
+    string getName() const {
+      return "FalseUP0D";
+    }
+    /*! The () operator. */
+    bool operator()(Interface0DIterator&) {
+      return false;
+    }
+  };
+
+} // end of namespace Predicates0D
+
+#endif // PREDICATES0D_H
diff --git a/extern/freestyle/src/stroke/Predicates1D.h b/extern/freestyle/src/stroke/Predicates1D.h
new file mode 100755
index 00000000000..cf9a3283ae4
--- /dev/null
+++ b/extern/freestyle/src/stroke/Predicates1D.h
@@ -0,0 +1,438 @@
+//
+//  Filename         : Predicates1D.h
+//  Author(s)        : Stephane Grabli, Emmanuel Turquin
+//  Purpose          : Class gathering stroke creation algorithms
+//  Date of creation : 01/07/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  PREDICATES1D_H
+# define PREDICATES1D_H
+
+# include <string>
+# include "../system/TimeStamp.h"
+# include "../view_map/Interface1D.h"
+# include "../view_map/Functions1D.h"
+# include "AdvancedFunctions1D.h"
+
+//
+// UnaryPredicate1D (base class for predicates in 1D)
+//
+///////////////////////////////////////////////////////////
+/*! Base class for Unary Predicates that work
+ *  on Interface1D.
+ *  A UnaryPredicate1D is a functor that evaluates
+ *  a condition on a Interface1D and returns
+ *  true or false depending on whether this condition is
+ *  satisfied or not.
+ *  The UnaryPredicate1D is used by calling its () operator.
+ *  Any inherited class must overload the () operator.
+ */
+class UnaryPredicate1D
+{
+public:
+  /*! Default constructor. */
+  UnaryPredicate1D() {}
+  /*! Destructor. */
+  virtual ~UnaryPredicate1D() {}
+  /*! Returns the string of the name
+   *  of the UnaryPredicate1D.
+   */
+  virtual string getName() const {
+    return "UnaryPredicate1D";
+  }
+  /*! The () operator. Must be overload
+   *  by inherited classes.
+   *  \param inter
+   *    The Interface1D on  which we wish to evaluate
+   *    the predicate.
+   *  \return true if the condition is satisfied,
+   *    false otherwise.
+   */
+  virtual bool operator()(Interface1D& inter) {
+    cerr << "Warning: operator() not implemented" << endl;
+    return false;
+  }
+};
+
+
+//
+// BinaryPredicate1D (base class for predicates in 1D)
+//
+///////////////////////////////////////////////////////////
+/*! Base class for Binary Predicates working on Interface1D.
+ *  A BinaryPredicate1D is typically an ordering relation
+ *  between two Interface1D.
+ *  It evaluates a relation between 2 Interface1D and
+ *  returns true or false.
+ *  It is used by calling the () operator.
+ */
+class BinaryPredicate1D
+{
+public:
+  /*! Default constructor. */
+  BinaryPredicate1D() {}
+  /*! Destructor. */
+  virtual ~BinaryPredicate1D() {}
+  /*! Returns the string of the name of the
+   * binary predicate.
+   */
+  virtual string getName() const {
+    return "BinaryPredicate1D";
+  }
+  /*! The () operator. Must be overload by inherited classes.
+   *  It evaluates a relation between 2 Interface1D.
+   *  \param inter1
+   *    The first Interface1D.
+   *  \param inter2
+   *    The second Interface1D.
+   *  \return true or false.
+   */
+  virtual bool operator()(Interface1D& inter1, Interface1D& inter2) {
+    cerr << "Warning: operator() not implemented" << endl;
+    return false;
+  }
+};
+
+
+//
+// Predicates definitions
+//
+///////////////////////////////////////////////////////////
+
+namespace Predicates1D {
+
+  // TrueUP1D
+  /*! Returns true */
+  class TrueUP1D : public UnaryPredicate1D
+  {
+  public:
+    /*! Constructor */
+    TrueUP1D() {}
+    /*! Returns the string "TrueUP1D"*/
+    string getName() const {
+      return "TrueUP1D";
+    }
+    /*! the () operator */
+    bool operator()(Interface1D&) {
+      return true;
+    }
+  };
+
+  // FalseUP1D
+  /*! Returns false */
+  class FalseUP1D : public UnaryPredicate1D
+  {
+  public:
+    /*! Constructor */
+    FalseUP1D() {}
+    /*! Returns the string "FalseUP1D"*/
+    string getName() const {
+      return "FalseUP1D";
+    }
+    /*! the () operator */
+    bool operator()(Interface1D&) {
+      return false;
+    }
+  };
+
+  // QuantitativeInvisibilityUP1D
+  /*! Returns true if the Quantitative Invisibility evaluated
+   *  at an Interface1D, using the QuantitativeInvisibilityF1D
+   *  functor, equals a certain user-defined value.
+   */
+  class QuantitativeInvisibilityUP1D : public UnaryPredicate1D
+  {
+  public:
+    /*! Builds the Predicate.
+     *  \param qi
+     *    The Quantitative Invisibility you want
+     *    the Interface1D to have
+     */
+    QuantitativeInvisibilityUP1D(unsigned qi = 0) : _qi(qi) {}
+    /*! Returns the string "QuantitativeInvisibilityUP1D"*/
+    string getName() const {
+      return "QuantitativeInvisibilityUP1D";
+    }
+    /*! the () operator */
+    bool operator()(Interface1D& inter) {
+      Functions1D::QuantitativeInvisibilityF1D func;
+      return (func(inter) == _qi);
+    }
+  private:
+    unsigned _qi;
+  };
+
+  // ContourUP1D
+  /*! Returns true if the Interface1D is a contour.
+   *  An Interface1D is a contour if it is borded
+   *  by a different shape on each of its sides.
+   */
+  class ContourUP1D : public UnaryPredicate1D
+  {
+  private:
+    Functions1D::CurveNatureF1D _getNature;
+  public:
+    /*! Returns the string "ContourUP1D"*/
+    string getName() const {
+      return "ContourUP1D";
+    }
+    /*! The () operator. */
+    bool operator()(Interface1D& inter) {
+      if((_getNature(inter) & Nature::SILHOUETTE) || (_getNature(inter) & Nature::BORDER)){
+        Interface0DIterator it=inter.verticesBegin();
+        for(; !it.isEnd(); ++it){
+          if(Functions0D::getOccludeeF0D(it) != Functions0D::getShapeF0D(it))
+            return true;
+        }
+      }
+      return false;
+    }
+  };
+
+  // ExternalContourUP1D
+  /*! Returns true if the Interface1D is an external contour.
+   *  An Interface1D is an external contour if it is borded
+   *  by no shape on one of its sides.
+   */
+  class ExternalContourUP1D : public UnaryPredicate1D
+  {
+  private:
+    Functions1D::CurveNatureF1D _getNature;
+  public:
+    /*! Returns the string "ExternalContourUP1D"*/
+    string getName() const {
+      return "ExternalContourUP1D";
+    }
+    /*! The () operator. */
+    bool operator()(Interface1D& inter) {
+      if((_getNature(inter) & Nature::SILHOUETTE) || (_getNature(inter) & Nature::BORDER)){
+        set<ViewShape*> occluded;
+        Functions1D::getOccludeeF1D(inter, occluded);
+        for(set<ViewShape*>::iterator os=occluded.begin(), osend=occluded.end();
+            os!=osend;
+            ++os){
+          if((*os) == 0)
+            return true;
+        }
+      }
+      return false;
+    }
+  };
+
+  // EqualToTimeStampUP1D
+  /*! Returns true if the Interface1D's time stamp
+   *  is equal to a certain user-defined value.
+   */
+  class EqualToTimeStampUP1D : public UnaryPredicate1D
+  {
+  protected:
+    unsigned _timeStamp; 
+  public:
+    EqualToTimeStampUP1D(unsigned ts) : UnaryPredicate1D(){
+      _timeStamp = ts;
+    }
+    /*! Returns the string "EqualToTimeStampUP1D"*/
+    string getName() const {
+      return "EqualToTimeStampUP1D";
+    }
+    /*! The () operator. */
+    bool operator()(Interface1D& inter) {
+      return (inter.getTimeStamp() == _timeStamp);
+    }
+  };
+
+  // EqualToChainingTimeStampUP1D
+  /*! Returns true if the Interface1D's time stamp
+   *  is equal to a certain user-defined value.
+   */
+  class EqualToChainingTimeStampUP1D : public UnaryPredicate1D
+  {
+  protected:
+    unsigned _timeStamp; 
+  public:
+    EqualToChainingTimeStampUP1D(unsigned ts) : UnaryPredicate1D(){
+      _timeStamp = ts;
+    }
+    /*! Returns the string "EqualToChainingTimeStampUP1D"*/
+    string getName() const {
+      return "EqualToChainingTimeStampUP1D";
+    }
+    /*! The () operator. */
+    bool operator()(Interface1D& inter) {
+      ViewEdge* edge = dynamic_cast<ViewEdge*>(&inter);
+      if (!edge)
+	return false;
+      return (edge->getChainingTimeStamp() >= _timeStamp);
+    }
+  };
+
+  // ShapeUP1D
+  /*! Returns true if the shape to which the Interface1D
+   *  belongs to has the same Id as the one specified by the
+   *  user.
+   */
+  class ShapeUP1D: public UnaryPredicate1D
+  {
+  private:
+    Id _id;
+  public:
+    /*! Builds the Predicate.
+     *  \param idFirst
+     *    The first Id component.
+     *  \param idSecond
+     *    The second Id component.
+     */
+    ShapeUP1D(unsigned idFirst, unsigned idSecond=0) 
+      : UnaryPredicate1D(){
+      _id = Id(idFirst, idSecond);
+    }
+    /*! Returns the string "ShapeUP1D"*/
+    string getName() const {
+      return "ShapeUP1D";
+    }
+    /*! The () operator. */
+    bool operator()(Interface1D& inter) {
+      set<ViewShape*> shapes;
+      Functions1D::getShapeF1D(inter, shapes);
+      for(set<ViewShape*>::iterator s=shapes.begin(), send=shapes.end();
+      s!=send;
+      ++s){
+        if((*s)->getId() == _id)
+          return true;
+      }
+      return false;
+    }
+  };
+  
+  //
+  //   Binary Predicates definitions
+  //
+  ///////////////////////////////////////////////////////////
+
+  // TrueBP1D
+  /*! Returns true. */
+  class TrueBP1D : public BinaryPredicate1D
+  {
+  public:
+    /*! Returns the string "TrueBP1D"*/
+    string getName() const {
+      return "TrueBP1D";
+    }
+    /*! The () operator. */
+    bool operator()(Interface1D& i1, Interface1D& i2) {
+      return true;
+    }
+  };
+
+  // FalseBP1D
+    /*! Returns false. */
+  class FalseBP1D : public BinaryPredicate1D
+  {
+  public:
+    /*! Returns the string "FalseBP1D"*/
+    string getName() const {
+      return "FalseBP1D";
+    }
+    /*! The () operator. */
+    bool operator()(Interface1D& i1, Interface1D& i2) {
+      return false;
+    }
+  };
+  
+  // Length2DBP1D
+  /*! Returns true if the 2D length of the Interface1D i1
+   *  is less than the 2D length of the Interface1D i2.
+   */
+  class Length2DBP1D : public BinaryPredicate1D
+  {
+  public:
+    /*! Returns the string "Length2DBP1D"*/
+    string getName() const {
+      return "Length2DBP1D";
+    }
+    /*! The () operator. */
+    bool operator()(Interface1D& i1, Interface1D& i2) {
+      return (i1.getLength2D() > i2.getLength2D());
+    }
+  };
+
+  // SameShapeIdBP1D
+  /*! Returns true if the Interface1D i1 and i2 belong
+   *  to the same shape.
+   */
+  class SameShapeIdBP1D : public BinaryPredicate1D
+  {
+  public:
+    /*! Returns the string "SameShapeIdBP1D"*/
+    string getName() const {
+      return "SameShapeIdBP1D";
+    }
+    /*! The () operator. */
+    bool operator()(Interface1D& i1, Interface1D& i2) {
+      set<ViewShape*> shapes1;
+      Functions1D::getShapeF1D(i1, shapes1);
+      set<ViewShape*> shapes2;
+      Functions1D::getShapeF1D(i2, shapes2);
+      // FIXME:// n2 algo, can do better...
+      for(set<ViewShape*>::iterator s=shapes1.begin(), send=shapes1.end();
+          s!=send;
+          ++s){
+        Id current = (*s)->getId();
+        for(set<ViewShape*>::iterator s2=shapes2.begin(), s2end=shapes2.end();
+          s2!=s2end;
+          ++s2){
+          if((*s2)->getId() == current)
+            return true;
+        }
+      }
+      return false;
+    }
+  };
+
+  // ViewMapGradientNormBP1D
+  /*! Returns true if the evaluation of the 
+   *  Gradient norm Function is higher for Interface1D i1 
+   *  than for i2.
+   */
+  class ViewMapGradientNormBP1D : public BinaryPredicate1D
+  {
+  private:
+    Functions1D::GetViewMapGradientNormF1D _func;
+  public:
+    ViewMapGradientNormBP1D(int level, IntegrationType iType=MEAN, float sampling=2.0) 
+      : BinaryPredicate1D(), _func(level, iType, sampling) {
+    }
+    /*! Returns the string "ViewMapGradientNormBP1D"*/
+    string getName() const {
+      return "ViewMapGradientNormBP1D";
+    }
+    /*! The () operator. */
+    bool operator()(Interface1D& i1, Interface1D& i2) {
+      return (_func(i1) > _func(i2));
+    }
+  };
+} // end of namespace Predicates1D
+
+#endif // PREDICATES1D_H
diff --git a/extern/freestyle/src/stroke/QInformationMap.h b/extern/freestyle/src/stroke/QInformationMap.h
new file mode 100755
index 00000000000..2542bdba147
--- /dev/null
+++ b/extern/freestyle/src/stroke/QInformationMap.h
@@ -0,0 +1,58 @@
+//
+//  Filename         : QInformationMap.h
+//  Author           : Stephane Grabli
+//  Purpose          : Class defining an information map using a QImage
+//  Date of creation : 04/01/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  QINFORMATIONMAP_H
+# define QINFORMATIONMAP_H
+
+# include <qimage.h>
+# include "InformationMap.h"
+
+class QInformationMap : public InformationMap
+{
+private:
+  QImage _map; // the image or a piece of image
+
+public:
+  QInformationMap();
+  QInformationMap(const QImage&);
+  QInformationMap(const QInformationMap&);
+  QInformationMap& operator=(const QInformationMap&);
+
+  //float getSmoothedPixel(int x, int y, float sigma = 0.2f)
+  virtual float getMean(int x, int y) ;
+  virtual void retrieveMeanAndVariance(int x, int y, float &oMean, float &oVariance) ;
+
+  inline const QImage& map() const {return _map;}
+  inline void SetMap(const QImage& iMap, float iw, float ih) {_map = iMap.copy();_w=iw;_h=ih;}
+
+protected:
+  virtual float computeGaussian(int x, int y);
+};
+
+#endif // QINFORMATIONMAP_H
diff --git a/extern/freestyle/src/stroke/Stroke.cpp b/extern/freestyle/src/stroke/Stroke.cpp
new file mode 100755
index 00000000000..d6ff4d255c4
--- /dev/null
+++ b/extern/freestyle/src/stroke/Stroke.cpp
@@ -0,0 +1,949 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "Stroke.h"
+#include "StrokeRenderer.h"
+#include "StrokeIterators.h"
+#include "StrokeAdvancedIterators.h"
+
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*         StrokeAttribute        */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+StrokeAttribute::StrokeAttribute()
+{
+  int i;
+  _alpha = 1.f;
+  _thickness[0] = 1.f;
+  _thickness[1] = 1.f;
+  for(i=0; i<3; ++i)
+    _color[i] = 0.2f;
+  _color[0]=0.8;
+  _userAttributesReal = 0;
+  _userAttributesVec2f = 0;
+  _userAttributesVec3f = 0;
+  _visible = true;
+}
+StrokeAttribute::StrokeAttribute(const StrokeAttribute& iBrother)
+{
+  _alpha = iBrother._alpha;
+  _thickness[0] = iBrother._thickness[0];
+  _thickness[1] = iBrother._thickness[1];
+  for(int i=0; i<3; ++i)
+    _color[i] = iBrother._color[i];
+  _visible = iBrother._visible;
+  if(iBrother._userAttributesReal)
+    _userAttributesReal = new realMap(*iBrother._userAttributesReal);
+  else
+    _userAttributesReal = 0;
+  if(iBrother._userAttributesVec2f)
+    _userAttributesVec2f = new Vec2fMap(*iBrother._userAttributesVec2f);
+  else
+    _userAttributesVec2f = 0;
+  if(iBrother._userAttributesVec3f)
+    _userAttributesVec3f = new Vec3fMap(*iBrother._userAttributesVec3f);
+  else
+    _userAttributesVec3f = 0;
+}
+StrokeAttribute::StrokeAttribute( float iRColor, float iGColor, float iBColor,
+                                  float iAlpha,
+                                  float iRThickness, float iLThickness)
+{
+  _color[0] = iRColor;
+  _color[1] = iGColor;
+  _color[2] = iBColor;
+
+  _alpha = iAlpha;
+
+  _thickness[0] = iRThickness;
+  _thickness[1] = iLThickness;
+  
+  _visible = true;
+
+  _userAttributesReal = 0;
+  _userAttributesVec2f = 0;
+  _userAttributesVec3f = 0;
+}
+StrokeAttribute::StrokeAttribute(const StrokeAttribute& a1, const StrokeAttribute& a2, float t)
+
+{
+
+  _alpha = (1-t)*a1._alpha + t*a2._alpha;
+  _thickness[0] = (1-t)*a1._thickness[0] + t*a2._thickness[0];
+  _thickness[1] = (1-t)*a1._thickness[1] + t*a2._thickness[1];
+  for(int i=0; i<3; ++i)
+    _color[i] = (1-t)*a1._color[i] + t*a2._color[i];
+
+  _visible = true;
+  
+  // FIXME: a verifier (et a ameliorer)
+  if((a1._userAttributesReal) && (a2._userAttributesReal)){
+    if(a1._userAttributesReal->size() == a2._userAttributesReal->size()){
+      _userAttributesReal = new realMap;
+      realMap::iterator it1=a1._userAttributesReal->begin(), it1end=a1._userAttributesReal->end();
+      realMap::iterator it2=a2._userAttributesReal->begin(), it2end=a2._userAttributesReal->end();
+      for(; (it1!=it1end); ++it1){
+        (*_userAttributesReal)[(*it1).first] = ((1-t)*(*it1).second+t*(*it2).second);
+      }
+    }
+  }else{
+    _userAttributesReal = 0;
+  }
+  if((a1._userAttributesVec2f) && (a2._userAttributesVec2f)){
+    if(a1._userAttributesVec2f->size() == a2._userAttributesVec2f->size()){
+      _userAttributesVec2f = new Vec2fMap;
+      Vec2fMap::iterator it1=a1._userAttributesVec2f->begin(), it1end=a1._userAttributesVec2f->end();
+      Vec2fMap::iterator it2=a2._userAttributesVec2f->begin(), it2end=a2._userAttributesVec2f->end();
+      for(; (it1!=it1end); ++it1){
+        (*_userAttributesVec2f)[(*it1).first] = ((1-t)*(*it1).second+t*(*it2).second);
+      }
+    }
+  }else{
+    _userAttributesVec2f = 0;
+  }
+  if((a1._userAttributesVec3f) && (a2._userAttributesVec3f)){
+    if(a1._userAttributesVec3f->size() == a2._userAttributesVec3f->size()){
+      _userAttributesVec3f = new Vec3fMap;
+      Vec3fMap::iterator it1=a1._userAttributesVec3f->begin(), it1end=a1._userAttributesVec3f->end();
+      Vec3fMap::iterator it2=a2._userAttributesVec3f->begin(), it2end=a2._userAttributesVec3f->end();
+      for(; (it1!=it1end); ++it1){
+        (*_userAttributesVec3f)[(*it1).first] = ((1-t)*(*it1).second+t*(*it2).second);
+      }
+    }
+  }else{
+    _userAttributesVec3f = 0;
+  }
+
+}
+StrokeAttribute::~StrokeAttribute()
+{
+  if(_userAttributesReal){
+    _userAttributesReal->clear();
+    delete _userAttributesReal;
+  }
+  if(_userAttributesVec2f){
+    _userAttributesVec2f->clear();
+    delete _userAttributesVec2f;
+  }
+  if(_userAttributesVec3f){
+    _userAttributesVec3f->clear();
+    delete _userAttributesVec3f;
+  }
+}
+
+StrokeAttribute& StrokeAttribute::operator=(const StrokeAttribute& iBrother)
+{ 
+  int i;
+  _alpha = iBrother._alpha;
+  _thickness[0] = iBrother._thickness[0];
+  _thickness[1] = iBrother._thickness[1];
+  for(i=0; i<3; ++i)
+    _color[i] = iBrother._color[i];
+  _visible = iBrother._visible;
+  if(iBrother._userAttributesReal){
+    if(!_userAttributesReal)
+      _userAttributesReal = new realMap;
+    _userAttributesReal = new realMap(*(iBrother._userAttributesReal));
+  }else{
+    _userAttributesReal = 0;
+  }
+  if(iBrother._userAttributesVec2f){
+    if(!_userAttributesVec2f)
+      _userAttributesVec2f = new Vec2fMap;
+    _userAttributesVec2f = new Vec2fMap(*(iBrother._userAttributesVec2f));
+  }else{
+    _userAttributesVec2f = 0;
+  }
+  if(iBrother._userAttributesVec3f){
+    if(!_userAttributesVec3f)
+      _userAttributesVec3f = new Vec3fMap;
+    _userAttributesVec3f = new Vec3fMap(*(iBrother._userAttributesVec3f));
+  }else{
+    _userAttributesVec3f = 0;
+  } 
+  return *this;
+}
+
+float StrokeAttribute::getAttributeReal(const char *iName) const{
+  if(!_userAttributesReal){
+    cout << "StrokeAttribute warning: no real attribute was defined"<< endl;
+    return 0;
+  }
+  realMap::iterator a = _userAttributesReal->find(iName);
+  if(a ==_userAttributesReal->end()){
+    cout << "StrokeAttribute warning: no real attribute was added with the name " << iName << endl;
+    return 0;
+  }
+  return (*a).second;
+}
+Vec2f StrokeAttribute::getAttributeVec2f(const char *iName) const{
+  if(!_userAttributesVec2f){
+    cout << "StrokeAttribute warning: no Vec2f attribute was defined "<< endl;
+    return 0;
+  }
+  Vec2fMap::iterator a = _userAttributesVec2f->find(iName);
+  if(a ==_userAttributesVec2f->end()){
+    cout << "StrokeAttribute warning: no Vec2f attribute was added with the name " << iName << endl;
+    return 0;
+  }
+  return (*a).second;
+}
+Vec3f StrokeAttribute::getAttributeVec3f(const char *iName) const{
+  if(!_userAttributesVec3f){
+    cout << "StrokeAttribute warning: no Vec3f attribute was defined"<< endl;
+    return 0;
+  }
+  Vec3fMap::iterator a = _userAttributesVec3f->find(iName);
+  if(a ==_userAttributesVec3f->end()){
+    cout << "StrokeAttribute warning: no Vec3f attribute was added with the name " << iName << endl;
+    return 0;
+  }
+  return (*a).second;
+}
+bool StrokeAttribute::isAttributeAvailableReal(const char *iName) const{
+  if(!_userAttributesReal){
+    return false;
+  }
+  realMap::iterator a = _userAttributesReal->find(iName);
+  if(a ==_userAttributesReal->end()){
+    return false;
+  }
+  return true;
+}
+bool StrokeAttribute::isAttributeAvailableVec2f(const char *iName) const{
+  if(!_userAttributesVec2f){
+    return false;
+  }
+  Vec2fMap::iterator a = _userAttributesVec2f->find(iName);
+  if(a ==_userAttributesVec2f->end()){
+    return false;
+  }
+  return true;
+}
+bool StrokeAttribute::isAttributeAvailableVec3f(const char *iName) const{
+  if(!_userAttributesVec3f){
+    return false;
+  }
+  Vec3fMap::iterator a = _userAttributesVec3f->find(iName);
+  if(a ==_userAttributesVec3f->end()){
+    return false;
+  }
+  return true;
+}
+void StrokeAttribute::setAttributeReal(const char *iName, float att){
+  if(!_userAttributesReal)
+    _userAttributesReal = new realMap;
+  (*_userAttributesReal)[iName] = att;
+}
+void StrokeAttribute::setAttributeVec2f(const char *iName, const Vec2f& att){
+  if(!_userAttributesVec2f)
+    _userAttributesVec2f = new Vec2fMap;
+  (*_userAttributesVec2f)[iName] = att;
+}
+void StrokeAttribute::setAttributeVec3f(const char *iName, const Vec3f& att){
+  if(!_userAttributesVec3f)
+    _userAttributesVec3f = new Vec3fMap;
+  (*_userAttributesVec3f)[iName] = att;
+}
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*           StrokeVertex         */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+StrokeVertex::StrokeVertex()
+
+:CurvePoint()
+{
+
+  _CurvilignAbscissa = 0.f;
+
+  _StrokeLength = 0.f;
+}
+
+
+
+StrokeVertex::StrokeVertex(const StrokeVertex& iBrother)
+
+:CurvePoint(iBrother)
+{
+  _Attribute = iBrother._Attribute;
+
+  _CurvilignAbscissa = 0.f;
+
+  _StrokeLength = 0.f;
+}
+StrokeVertex::StrokeVertex(SVertex *iSVertex)
+
+:CurvePoint(iSVertex,0,0.f)
+
+{
+
+  _CurvilignAbscissa = 0.f;
+
+  _StrokeLength = 0.f;
+
+}
+
+
+
+StrokeVertex::StrokeVertex(CurvePoint *iPoint)
+
+:CurvePoint(*iPoint)
+
+{
+
+  _CurvilignAbscissa = 0.f;
+
+  _StrokeLength = 0.f;
+
+}
+
+
+
+StrokeVertex::StrokeVertex(StrokeVertex *iA, StrokeVertex *iB, float t3)
+
+:CurvePoint(iA,iB,t3)
+
+{
+
+  // interpolate attributes:
+
+  _Attribute = StrokeAttribute(iA->attribute(), iB->attribute(), t3);
+  _CurvilignAbscissa = (1-t3)*iA->curvilinearAbscissa()+t3*iB->curvilinearAbscissa();
+  _StrokeLength = iA->strokeLength();
+
+}
+
+  
+
+StrokeVertex::StrokeVertex(SVertex *iSVertex, const StrokeAttribute& iAttribute)
+
+:CurvePoint(iSVertex,0,0.f)
+
+{
+
+  _Attribute = iAttribute;
+
+  _CurvilignAbscissa = 0.f;
+
+  _StrokeLength = 0.f;
+
+}
+StrokeVertex::~StrokeVertex()
+{
+}
+
+StrokeVertex& StrokeVertex::operator=(const StrokeVertex& iBrother)
+{ 
+  ((CurvePoint*)this)->operator=(iBrother);
+  _Attribute = iBrother._Attribute;
+
+  _CurvilignAbscissa = 0.f;
+
+  _StrokeLength = 0.f;
+  return *this;
+}
+
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             Stroke             */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+Stroke::Stroke()
+{
+  _Length = 0;
+  _id = 0;
+  _sampling = FLT_MAX;
+  //_mediumType = DEFAULT_STROKE;
+  _mediumType = OPAQUE_MEDIUM;
+  _textureId = 0;
+  _tips = false;
+  _rep = 0;
+}
+
+Stroke::Stroke(const Stroke& iBrother)
+{
+  for(vertex_container::const_iterator v=iBrother._Vertices.begin(), vend=iBrother._Vertices.end();
+      v!=vend;
+      v++)
+    {
+      _Vertices.push_back(*v);  
+    }
+  _Length = 0;
+  _id = iBrother._id;
+  _ViewEdges = iBrother._ViewEdges;
+  _sampling = iBrother._sampling;
+  _mediumType = iBrother._mediumType;
+  _textureId = iBrother._textureId;
+  _tips = iBrother._tips;
+  _rep = new StrokeRep(*(iBrother._rep));
+}
+
+Stroke::~Stroke()
+{
+  if(!_Vertices.empty())
+  {
+    for(vertex_container::iterator v=_Vertices.begin(), vend=_Vertices.end();
+    v!=vend;
+    v++)
+    {
+      delete (*v);
+    }
+    _Vertices.clear();
+  }
+
+  _ViewEdges.clear();
+  if(_rep != 0)
+  {
+    delete _rep;
+    _rep = 0;
+  }
+}
+
+Stroke& Stroke::operator=(const Stroke& iBrother)
+{ 
+  if(!_Vertices.empty())
+    _Vertices.clear();
+
+  for(vertex_container::const_iterator v=iBrother._Vertices.begin(), vend=iBrother._Vertices.end();
+  v!=vend;
+  v++)
+  {
+    _Vertices.push_back(*v);  
+  }
+  _Length = iBrother._Length;
+  _id = iBrother._id;
+  _ViewEdges = iBrother._ViewEdges;
+  _sampling = iBrother._sampling;
+  if(_rep) delete _rep;
+  if(iBrother._rep)
+    _rep = new StrokeRep(*(iBrother._rep));
+  return *this;
+}
+
+
+void Stroke::SetLength(float iLength)
+{
+  _Length = iLength;
+  for(vertex_container::iterator v=_Vertices.begin(), vend=_Vertices.end();
+  v!=vend;
+  ++v)
+  {
+    (*v)->SetStrokeLength(iLength);
+  }
+}
+
+float Stroke::ComputeSampling(int iNVertices)
+{
+  if(iNVertices <= _Vertices.size())
+    return _sampling;
+
+  float sampling = _Length/(float)(iNVertices-_Vertices.size()+1);
+  return sampling;
+}
+
+class StrokeSegment
+{
+public:
+  StrokeInternal::StrokeVertexIterator _begin;
+  StrokeInternal::StrokeVertexIterator _end;
+  float _length;
+  int _n;
+  float _sampling;
+  bool _resampled;
+  
+  StrokeSegment(StrokeInternal::StrokeVertexIterator ibegin,
+                StrokeInternal::StrokeVertexIterator iend,
+                float ilength,
+                int in,
+                float isampling)
+                {
+                  _begin=ibegin;
+                  _end=iend;
+                  _length=ilength;
+                  _n=in;
+                  _sampling = isampling;
+                  _resampled = false;
+                }
+};
+
+void Stroke::Resample(int iNPoints)
+{
+  int vertsize = strokeVerticesSize();
+  if(iNPoints <= vertsize)
+    return;
+
+  StrokeInternal::StrokeVertexIterator it = strokeVerticesBegin();
+  StrokeInternal::StrokeVertexIterator next = it;++next;
+  StrokeInternal::StrokeVertexIterator itend = strokeVerticesEnd();
+
+  vertex_container newVertices;
+  real t=0.f;
+  StrokeVertex * newVertex = 0;
+  vector<StrokeSegment> strokeSegments;
+  int N=0;
+  float meanlength = 0;
+  int nsegments = 0;
+  while(((it!=itend)&&(next!=itend)))
+  { 
+    Vec3r a((it)->point2d());
+    Vec3r b((next)->point2d());
+    Vec3r vec_tmp(b - a);
+    real norm_var = vec_tmp.norm();
+    int numberOfPointsToAdd = (int)floor((iNPoints-strokeVerticesSize())*norm_var/_Length);
+    float csampling = norm_var/(float)(numberOfPointsToAdd+1);
+    strokeSegments.push_back(StrokeSegment(it,next,norm_var,numberOfPointsToAdd, csampling));
+    N+=numberOfPointsToAdd;
+    meanlength += norm_var;
+    ++nsegments;
+    ++it; ++next;
+  }
+  meanlength /= (float)nsegments;
+
+  // if we don't have enough points let's resample 
+  // finer some segments
+  int NPointsToAdd = iNPoints-vertsize;
+  bool checkEveryone = false;
+  while(N < NPointsToAdd)
+  {
+    for(vector<StrokeSegment>::iterator s=strokeSegments.begin(), send=strokeSegments.end();
+    s!=send;
+    ++s)
+    {
+      if(s->_sampling == 0.f)
+        continue;
+
+      if(s->_resampled == false)
+      {
+        if((!checkEveryone) && (s->_length < meanlength))
+          continue;
+        //resample
+        s->_n = s->_n+1;
+        s->_sampling = s->_length/(float)(s->_n+1);
+        s->_resampled = true;
+        N++;
+        if(N == NPointsToAdd)
+          break;
+      }
+    }
+    checkEveryone = true;
+  }
+  //actually resample:
+  for(vector<StrokeSegment>::iterator s=strokeSegments.begin(), send=strokeSegments.end();
+  s!=send;
+  ++s)
+  { 
+    newVertices.push_back(&(*(s->_begin)));
+    if(s->_sampling < _sampling)
+      _sampling = s->_sampling;
+    
+    t = s->_sampling/s->_length;
+    for(int i=0; i<s->_n; ++i)
+    {
+      newVertex = new StrokeVertex(&(*(s->_begin)),&(*(s->_end)),t);
+      newVertices.push_back(newVertex);
+      t += s->_sampling/s->_length;
+    }
+    it=s->_begin;
+    next=s->_end;
+  }
+
+  // add last:
+  ++it;++next;
+  if((it != itend) && (next == itend))// && (t == 0.f))
+    newVertices.push_back(&(*it));
+
+  int newsize = newVertices.size();
+  if(newsize != iNPoints)
+    cerr << "Warning: incorrect points number" << endl;
+
+  _Vertices.clear();
+  _Vertices = newVertices;
+  newVertices.clear();
+  
+  if(_rep)
+  {
+    delete _rep;
+    _rep = new StrokeRep(this);
+  }
+}
+
+
+void Stroke::Resample(float iSampling)
+{
+  //  cerr<<"old size :"<<strokeVerticesSize()<<endl;
+  if(iSampling == 0)
+
+    return;
+  if(iSampling >= _sampling)
+    return ;
+
+  _sampling = iSampling;   
+  // Resample...
+  //real curvilinearLength = 0.f;
+  vertex_container newVertices;
+  real t=0.f;
+  StrokeVertex * newVertex = 0;
+  StrokeInternal::StrokeVertexIterator it = strokeVerticesBegin();
+  StrokeInternal::StrokeVertexIterator next = it;++next;
+  StrokeInternal::StrokeVertexIterator itend = strokeVerticesEnd();
+  while(((it!=itend)&&(next!=itend)))
+  { 
+    newVertices.push_back(&(*it));
+    Vec3r a((it)->point2d());
+    Vec3r b((next)->point2d());
+    Vec3r vec_tmp(b - a);
+    real norm_var = vec_tmp.norm();
+    if(norm_var <= _sampling)
+    {
+      //curvilinearLength += norm_var;
+      ++it; ++next;
+      continue;
+    }
+
+  //curvilinearLength += _sampling;
+    t = _sampling/norm_var;
+    float limit = 0.99f;
+    while(t<limit)
+    {
+      newVertex = new StrokeVertex(&(*it),&(*next),t);
+      //newVertex->SetCurvilinearAbscissa(curvilinearLength);
+      newVertices.push_back(newVertex);
+      t = t + _sampling/norm_var;
+    }
+    ++it; ++next;
+  }
+  // add last:
+  if((it != itend) && (next == itend))// && (t == 0.f))
+    newVertices.push_back(&(*it));
+
+  _Vertices.clear();
+  _Vertices = newVertices;
+  newVertices.clear();
+  
+  if(_rep)
+  {
+    delete _rep;
+    _rep = new StrokeRep(this);
+  }
+}
+
+void Stroke::RemoveVertex(StrokeVertex *iVertex)
+{
+  vertex_container::iterator it=_Vertices.begin(), itend=_Vertices.end();
+  for(;
+  it!=itend;
+  ++it)
+  {
+    if((*it) == iVertex)
+    {
+      delete iVertex;
+      it = _Vertices.erase(it); // it is now the element just after the erased element
+      break;
+    }
+  }
+  // recompute various values (length, curvilign abscissa)
+  float curvabsc = 0.f;
+  it=_Vertices.begin();
+  itend=_Vertices.end();
+  vertex_container::iterator previous=it;
+  for(;
+  (it!=itend);
+  ++it)
+  {
+    if(it != previous)
+      curvabsc += ((*it)->point2d()-(*previous)->point2d()).norm();
+    (*it)->SetCurvilinearAbscissa(curvabsc);
+    previous = it;
+  }
+  _Length = curvabsc;
+  it=_Vertices.begin();
+  for(;
+  (it!=itend);
+  ++it)
+  {
+    (*it)->SetStrokeLength(_Length);
+  }
+}
+
+void Stroke::InsertVertex(StrokeVertex *iVertex, StrokeInternal::StrokeVertexIterator next)
+{
+  vertex_container::iterator it=_Vertices.begin(), itend=_Vertices.end();
+
+  vertex_container::iterator itnext = next.getIt();
+  _Vertices.insert(itnext, iVertex);
+  // recompute various values (length, curvilign abscissa)
+  float curvabsc = 0.f;
+  it=_Vertices.begin();
+  itend=_Vertices.end();
+  vertex_container::iterator previous=it;
+  for(;
+  (it!=itend);
+  ++it)
+  {
+    curvabsc += ((*it)->point2d()-(*previous)->point2d()).norm();
+    (*it)->SetCurvilinearAbscissa(curvabsc);
+    previous = it;
+  }
+  _Length = curvabsc;
+  for(;
+  (it!=itend);
+  ++it)
+  {
+    (*it)->SetStrokeLength(_Length);
+  }
+}
+
+//! embedding vertex iterator
+Stroke::const_vertex_iterator Stroke::vertices_begin() const { return const_vertex_iterator(_Vertices.begin(),_Vertices.begin(), _Vertices.end()); }
+Stroke::const_vertex_iterator Stroke::vertices_end() const { return const_vertex_iterator(_Vertices.end(),_Vertices.begin(), _Vertices.end()); }
+Stroke::vertex_iterator Stroke::vertices_end() { return vertex_iterator(_Vertices.end(),_Vertices.begin(), _Vertices.end()); }
+
+StrokeInternal::StrokeVertexIterator Stroke::strokeVerticesBegin(float t) {
+  if((t!=0) && (t < _sampling))
+    Resample(t);
+  return StrokeInternal::StrokeVertexIterator(this->_Vertices.begin(), this->_Vertices.begin(), this->_Vertices.end());
+}
+
+StrokeInternal::StrokeVertexIterator Stroke::strokeVerticesEnd() {
+  return StrokeInternal::StrokeVertexIterator(this->_Vertices.end(), this->_Vertices.begin(), this->_Vertices.end());
+}
+
+Interface0DIterator Stroke::verticesBegin() {
+  Interface0DIterator ret(new StrokeInternal::StrokeVertexIterator(this->_Vertices.begin(),
+								   this->_Vertices.begin(),
+								   this->_Vertices.end()));
+  return ret;
+}
+
+Interface0DIterator Stroke::verticesEnd() {
+  Interface0DIterator ret(new StrokeInternal::StrokeVertexIterator(this->_Vertices.end(),
+								   this->_Vertices.begin(),
+								   this->_Vertices.end()));
+  return ret;
+}
+
+Interface0DIterator Stroke::pointsBegin(float t) {
+  return verticesBegin(); // FIXME
+}
+
+Interface0DIterator Stroke::pointsEnd(float t) {
+  return verticesEnd();
+}
+
+void Stroke::Render(const StrokeRenderer *iRenderer)
+{
+  if(!_rep)
+    _rep = new StrokeRep(this);
+  iRenderer->RenderStrokeRep(_rep);
+}
+
+void Stroke::RenderBasic(const StrokeRenderer *iRenderer)
+{
+  if(!_rep)
+    _rep = new StrokeRep(this);
+  iRenderer->RenderStrokeRepBasic(_rep);
+}
+
+Stroke::vertex_iterator Stroke::vertices_begin(float sampling) 
+{
+  // Resample if necessary
+  if((sampling != 0) && (sampling < _sampling))
+    Resample(sampling);
+  return vertex_iterator(_Vertices.begin(),_Vertices.begin(),_Vertices.end());
+  //return _Vertices.begin(); 
+}
+//
+//Stroke::vertex_iterator Stroke::vertices_last() 
+//{
+//  vertex_iterator res = vertices_begin();
+//  vertex_iterator next = res;++next;
+//  while(!next.end())
+//  {
+//    ++next;
+//    ++res;
+//  }
+//  return res;
+//}
+//
+//Stroke::const_vertex_iterator Stroke::vertices_last() const
+//{
+//  const_vertex_iterator res = vertices_begin();
+//  const_vertex_iterator next = res;++next;
+//  while(!next.end())
+//  {
+//    ++next;
+//    ++res;
+//  }
+//  return res;
+//}
+
+//Stroke::vertex_container::reverse_iterator Stroke::vertices_last(float sampling) 
+//{
+//  // Resample if necessary
+//  if(sampling < _sampling)
+//    Resample(sampling);
+//  return _Vertices.rbegin();
+//}
+
+
+//inline Vec3r shaded_color(int iCombination = 0) const ;
+//inline Vec<3,real> Stroke::orientation2d(const_vertex_iterator it) const 
+//{
+//  return iterator_edge_orientation2d_function<Stroke, const_vertex_iterator>(this, it);
+//}
+// Vec3r  Stroke::orientation2d(int iCombination) const 
+// {
+//   return edge_orientation2d_function<Stroke>(*this, iCombination);
+// }
+//inline Vec3r Stroke::orientation3d(const_vertex_iterator it) const 
+//{
+//  return iterator_edge_orientation3d_function<Stroke, const_vertex_iterator>(*this, it);
+//}
+// Vec3r  Stroke::orientation3d(int iCombination) const 
+// {
+//   return edge_orientation3d_function<Stroke>(*this, iCombination);
+// }
+
+//Material Stroke::material() const 
+//{
+//  const_vertex_iterator v=vertices_begin(), vend=strokeVerticesEnd();
+//  Material mat = (*v)->material();
+//  for(;v!=vend;++v)
+//  {
+//    if(mat != (*v)->material())
+//      Exception::raiseException();
+//  }
+//  return mat;
+//}
+
+//int Stroke::qi() const 
+//{
+//  const_vertex_iterator v=vertices_begin(), vend=vertices_end();
+//  int qi_= (*v)->qi();
+//  for(;v!=vend;++v)
+//  {
+//    if((*v)->qi() != qi_)
+//      Exception::raiseException();
+//  }
+//  return qi_;
+//}
+//inline occluder_container::const_iterator occluders_begin() const {return _FEdgeA->occluders().begin();}
+//inline occluder_container::const_iterator occluders_end() const {return _FEdgeA->occluders().end();}
+
+//int Stroke::occluders_size() const 
+//{
+//  return qi();
+//}
+//
+//bool Stroke::occluders_empty() const 
+//{
+//  const_vertex_iterator v=vertices_begin(), vend=vertices_end();
+//  bool empty = (*v)->occluders_empty();
+//  for(;v!=vend;++v)
+//  {
+//    if((*v)->occluders_empty() != empty)
+//      Exception::raiseException();
+//  }
+//  return empty;
+//}
+////inline const polygon3d& occludee() const {return *(_FEdgeA->aFace());}
+//const SShape * Stroke::occluded_shape() const 
+//{
+//  const_vertex_iterator v=vertices_begin(), vend=vertices_end();
+//  const SShape *sshape = (*v)->occluded_shape();
+//  for(;v!=vend;++v)
+//  {
+//    if((*v)->occluded_shape() != sshape)
+//      Exception::raiseException();
+//  }
+//  return sshape;
+//}
+//
+//const bool Stroke::occludee_empty() const 
+//{
+//  const_vertex_iterator v=vertices_begin(), vend=vertices_end();
+//  bool empty = (*v)->occludee_empty();
+//  for(;v!=vend;++v)
+//  {
+//    if((*v)->occludee_empty() != empty)
+//      Exception::raiseException();
+//  }
+//  return empty;
+//}
+
+//const SShape * Stroke::shape() const 
+//{
+//  const_vertex_iterator v=vertices_begin(), vend=vertices_end();
+//  const SShape *sshape = (*v)->shape();
+//  for(;v!=vend;++v)
+//  {
+//    if((*v)->shape() != sshape)
+//      Exception::raiseException();
+//  }
+//  return sshape;
+//}
+
+// real Stroke::z_discontinuity(int iCombination) const 
+// {
+//   return z_discontinuity_edge_function<Stroke>(*this, iCombination);
+// }
+
+// Vec3r Stroke::curvature2d_as_vector(int iCombination) const 
+// {
+//   return curvature2d_as_vector_edge_function<Stroke>(*this, iCombination);
+// }
+
+// real Stroke::curvature2d_as_angle(int iCombination) const 
+// {
+//   return curvature2d_as_angle_edge_function<Stroke>(*this, iCombination);
+// }
+
+// float Stroke::shape_importance(int iCombination) const 
+// {
+//   return shape_importance_edge_function<Stroke>(*this, iCombination);
+// }
+
+
+// float Stroke::local_average_depth(int iCombination ) const
+// { 
+//   return local_average_depth_edge_function<Stroke >(*this, iCombination);
+// }
+
+// float Stroke::local_depth_variance(int iCombination) const
+// {
+//   return local_depth_variance_edge_function<Stroke>(*this, iCombination);
+// }
+
+// real Stroke::local_average_density(float sigma , int iCombination ) const 
+// {
+//   return density_edge_function<Stroke>(*this, iCombination);
+// }
diff --git a/extern/freestyle/src/stroke/Stroke.h b/extern/freestyle/src/stroke/Stroke.h
new file mode 100755
index 00000000000..a5cf51f8224
--- /dev/null
+++ b/extern/freestyle/src/stroke/Stroke.h
@@ -0,0 +1,584 @@
+//
+//  Filename         : Stroke.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Classes to define a stroke
+//  Date of creation : 09/09/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  STROKE_H
+# define STROKE_H
+
+# include <vector>
+# include <map>
+# include "../system/FreestyleConfig.h"
+# include "../view_map/Silhouette.h"
+# include "Curve.h"
+# include "../view_map/Interface1D.h"
+# include "../system/StringUtils.h"
+
+//
+//  StrokeAttribute
+//
+////////////////////////////////////////////////////////
+
+/*! Class to define an attribute associated to a Stroke Vertex.
+ *  This attribute stores the color, alpha and thickness values
+ *  for a Stroke Vertex.
+ */
+class LIB_STROKE_EXPORT StrokeAttribute
+{
+public:
+
+  /*! default constructor */
+  StrokeAttribute();
+  /*! Copy constructor */
+  StrokeAttribute(const StrokeAttribute& iBrother);
+  /*! Builds a stroke vertex attribute from 
+   *  a set of parameters.
+   *    \param iRColor
+   *      The Red Component value.
+   *    \param iGColor
+   *      The Green Component value.
+   *    \param iBColor
+   *      The Blue Component value.
+   *    \param iAlpha
+   *      The transparency value
+   *    \param iRThickness
+   *      The thickness of the stroke on the right
+   *    \param iLThickness
+   *      The Thickness of the stroke on the left
+   */
+  StrokeAttribute(float iRColor, float iGColor, float iBColor,
+                  float iAlpha,
+                  float iRThickness, float iLThickness);
+
+  /*! Interpolation constructor.
+   *  Builds a StrokeAttribute from two
+   *  StrokeAttributes and an interpolation parameter.
+   *  \param a1
+   *    The first Attribute.
+   *  \param a2
+   *    The second parameter.
+   *  \param t
+   *    The interpolation parameter.
+   */
+  StrokeAttribute(const StrokeAttribute& a1, const StrokeAttribute& a2, float t);
+
+  /*! destructor */
+  virtual ~StrokeAttribute();
+
+  /* operators */
+  /*! operator = */
+  StrokeAttribute& operator=(const StrokeAttribute& iBrother);
+  
+  /* accessors */
+  /*! Returns the attribute's color.
+   *  \return The array of 3 floats containing the R,G,B values
+   *  of the attribute's color.
+   */
+  inline const float* getColor()  const { return _color; }
+  /*! Returns the R color component. */
+  inline const float  getColorR() const { return _color[0]; }
+  /*! Returns the G color component. */
+  inline const float  getColorG() const { return _color[1]; }
+  /*! Returns the B color component. */
+  inline const float  getColorB() const { return _color[2]; }
+  /*! Returns the RGB color components. */
+  inline Vec3f  getColorRGB() const { return Vec3f(_color[0], _color[1], _color[2]); }
+  /*! Returns the alpha color component. */
+  inline float getAlpha() const { return _alpha; }
+  /*! Returns the attribute's thickness.
+   *  \return an array of 2 floats. the first value is
+   *  the thickness on the right of the vertex when following
+   *  the stroke, the second one is the thickness on the left.
+   */
+  inline const float* getThickness() const { return _thickness; }
+  /*! Returns the thickness on the right of the vertex when following the
+   *  stroke. */
+  inline const float  getThicknessR() const { return _thickness[0]; }
+  /*! Returns the thickness on the left of the vertex when following the
+   *  stroke. */
+  inline const float  getThicknessL() const { return _thickness[1]; }
+  /*! Returns the thickness on the right and on the left of the vertex when following the
+   *  stroke. */
+  inline Vec2f getThicknessRL() const { return Vec2f(_thickness[0], _thickness[1]); }
+
+  /*! Returns true if the strokevertex is visible, false otherwise */
+  inline bool isVisible() const {return _visible;}
+
+  /*! Returns an attribute of type real
+   *  \param iName
+   *    The name of the attribute
+   */
+  float getAttributeReal(const char *iName) const;
+  /*! Returns an attribute of type Vec2f
+   *  \param iName
+   *    The name of the attribute
+   */
+  Vec2f getAttributeVec2f(const char *iName) const;
+  /*! Returns an attribute of type Vec3f
+   *  \param iName
+   *    The name of the attribute
+   */
+  Vec3f getAttributeVec3f(const char *iName) const;
+
+  /*! Checks whether the attribute iName is availbale */
+  bool isAttributeAvailableReal(const char *iName) const ;
+  /*! Checks whether the attribute iName is availbale */
+  bool isAttributeAvailableVec2f(const char *iName) const ;
+  /*! Checks whether the attribute iName is availbale */
+  bool isAttributeAvailableVec3f(const char *iName) const ;
+  
+  /* modifiers */
+  /*! Sets the attribute's color.
+   *    \param r
+   *      The new R value.
+   *    \param g
+   *      The new G value.
+   *    \param b
+   *      The new B value.
+   */
+  inline void setColor(float r, float g, float b) { _color[0]=r; _color[1]=g; _color[2]=b; }
+  /*! Sets the attribute's color.
+   *    \param iRGB
+   *      The new RGB values.
+   */
+  inline void setColor(const Vec3f& iRGB) { _color[0]=iRGB[0]; _color[1]=iRGB[1]; _color[2]=iRGB[2]; }
+  /*! Sets the attribute's alpha value.
+   *  \param alpha
+   *    The new alpha value.
+   */
+  inline void setAlpha(float alpha) { _alpha = alpha; }
+  /*! Sets the attribute's thickness.
+   *  \param tr
+   *    The thickness on the right of the vertex when following the stroke.
+   *  \param tl
+   *    The thickness on the left of the vertex when following the stroke.
+   */
+  inline void setThickness(float tr, float tl) { _thickness[0]=tr; _thickness[1]=tl; }
+  /*! Sets the attribute's thickness.
+   *  \param tRL
+   *    The thickness on the right and on the left of the vertex when following the stroke.
+   */
+  inline void setThickness(const Vec2f& tRL) { _thickness[0]=tRL[0]; _thickness[1]=tRL[1]; }
+
+  /*! Sets the visible flag. True means visible. */
+  inline void SetVisible(bool iVisible){ _visible = iVisible; }
+
+  /*! Adds a user defined attribute of type real
+   *  If there is no attribute of name iName, it is added.
+   *  Otherwise, the new value replaces the old one.
+   *  \param iName
+   *    The name of the attribute
+   *  \param att
+   *    The attribute's value
+   */
+  void setAttributeReal(const char *iName, float att);
+  /*! Adds a user defined attribute of type Vec2f
+   *  If there is no attribute of name iName, it is added.
+   *  Otherwise, the new value replaces the old one.
+   *  \param iName
+   *    The name of the attribute
+   *  \param att
+   *    The attribute's value
+   */
+  void setAttributeVec2f(const char *iName, const Vec2f& att);
+  /*! Adds a user defined attribute of type Vec3f
+   *  If there is no attribute of name iName, it is added.
+   *  Otherwise, the new value replaces the old one.
+   *  \param iName
+   *    The name of the attribute
+   *  \param att
+   *    The attribute's value
+   */
+  void setAttributeVec3f(const char *iName, const Vec3f& att);
+
+private:
+
+  typedef std::map<const char*, float, StringUtils::ltstr> realMap ;
+  typedef std::map<const char*, Vec2f, StringUtils::ltstr> Vec2fMap ;
+  typedef std::map<const char*, Vec3f, StringUtils::ltstr> Vec3fMap ;
+
+  float _color[3];      //! the color 
+  float _alpha;         //! alpha 
+  float _thickness[2];  //! the thickness on the right and on the left of the backbone vertex (the stroke is oriented)
+  bool _visible;
+  realMap *_userAttributesReal;
+  Vec2fMap *_userAttributesVec2f;
+  Vec3fMap *_userAttributesVec3f;
+};
+
+
+//
+//  StrokeVertex
+//
+////////////////////////////////////////////////////////
+
+/*! Class to define a stroke vertex.
+ */
+class LIB_STROKE_EXPORT StrokeVertex : public CurvePoint
+{
+public: // Implementation of Interface0D
+
+  /*! Returns the string "StrokeVertex"*/
+  virtual string getExactTypeName() const {
+    return "StrokeVertex";
+  }
+
+private:
+
+  StrokeAttribute _Attribute; //! The attribute associated to the vertex
+  float _CurvilignAbscissa; //! the curvilign abscissa
+  float _StrokeLength; // stroke length
+  
+public:
+
+  /*! default constructor */
+  StrokeVertex();
+  /*! Copy constructor */
+  StrokeVertex(const StrokeVertex& iBrother);
+  /*! Builds a stroke vertex from a SVertex */
+  StrokeVertex(SVertex *iSVertex);
+  /*! Builds a stroke vertex from a CurvePoint */
+  StrokeVertex(CurvePoint *iPoint);
+  /*! Builds Stroke Vertex from 2 stroke vertices and an interpolation parameter*/
+  StrokeVertex(StrokeVertex *iA, StrokeVertex *iB, float t3);
+  /*! Builds a stroke from a view vertex and an attribute */
+  StrokeVertex(SVertex *iSVertex, const StrokeAttribute& iAttribute);
+  /*! destructor */
+  virtual ~StrokeVertex();
+  
+  /* operators */
+  /*! operator = */
+  StrokeVertex& operator=(const StrokeVertex& iBrother);
+  
+  /* accessors */
+  /*! Returns the 2D point x coordinate */
+  inline real x() const { return _Point2d[0]; }
+  /*! Returns the 2D point y coordinate */
+  inline real y() const { return _Point2d[1]; }
+  /*! Returns the 2D point coordinates as a Vec2d */
+  Vec2f getPoint () {return Vec2f((float)point2d()[0], (float)point2d()[1]);}
+  /*! Returns the ith 2D point coordinate (i=0 or 1)*/
+  inline real  operator[](const int i) const { return _Point2d[i]; }
+  /*! Returns the StrokeAttribute for this StrokeVertex */
+  inline const StrokeAttribute& attribute() const { return _Attribute; }
+  /*! Returns a non-const reference to the StrokeAttribute of this StrokeVertex */
+  inline StrokeAttribute& attribute() {return _Attribute;}
+  /*! Returns the curvilinear abscissa */
+  inline float curvilinearAbscissa() const {return _CurvilignAbscissa;}
+  /*! Returns the length of the Stroke to which this StrokeVertex belongs */
+  inline float strokeLength() const {return _StrokeLength;}
+  /*! Returns the curvilinear abscissa of this StrokeVertex in the Stroke */
+  inline float u() const {return _CurvilignAbscissa/_StrokeLength;}
+
+  /* modifiers */
+  /*! Sets the 2D x value */
+  inline void SetX(real x) { _Point2d[0]=x; }
+  /*! Sets the 2D y value */
+  inline void SetY(real y) { _Point2d[1]=y; }
+  /*! Sets the 2D x and y values */
+  inline void SetPoint(real x, real y) { _Point2d[0]=x; _Point2d[1]=y;}
+  /*! Sets the 2D x and y values */
+  inline void SetPoint(const Vec2f& p) { _Point2d[0] = p[0];_Point2d[1] = p[1];}
+  /*! Returns a reference to the ith 2D point coordinate (i=0 or 1) */
+  inline real& operator[](const int i) { return _Point2d[i]; }
+  /*! Sets the attribute. */
+  inline void SetAttribute(const StrokeAttribute& iAttribute) { _Attribute = iAttribute; }
+  /*! Sets the curvilinear abscissa of this StrokeVertex in the Stroke */
+  inline void SetCurvilinearAbscissa(float iAbscissa) {_CurvilignAbscissa = iAbscissa;}
+  /*! Sets the Stroke's length (it's only a value stored by the Stroke Vertex, it won't
+   *  change the real Stroke's length.)
+   */
+  inline void SetStrokeLength(float iLength) {_StrokeLength = iLength;}
+  
+  /* interface definition */
+  /* inherited */  
+  
+};
+
+
+//
+//  Stroke
+//
+////////////////////////////////////////////////////////
+
+class StrokeRenderer;
+class StrokeRep;
+
+namespace StrokeInternal {
+  class vertex_const_traits ;
+  class vertex_nonconst_traits ;
+  template<class Traits> class vertex_iterator_base;
+  class StrokeVertexIterator;
+} // end of namespace StrokeInternal
+
+/*! Class to define a stroke.
+ *  A stroke is made of a set of 2D vertices (StrokeVertex), regularly spaced out.
+ *  This set of vertices defines the stroke's backbone geometry.
+ *  Each of these stroke vertices defines the stroke's shape and appearance 
+ *  at this vertex position.
+ */
+class LIB_STROKE_EXPORT Stroke : public Interface1D
+{
+public: // Implementation of Interface1D
+
+  /*! Returns the string "Stroke" */
+  virtual string getExactTypeName() const {
+    return "Stroke";
+  }
+
+  // Data access methods
+
+  /*! Returns the Id of the Stroke */
+  virtual Id getId() const {
+    return _id;
+  }
+  /*! The different blending modes
+   *  available to similate the interaction
+   *  media-medium.
+   */
+  typedef enum{
+    DRY_MEDIUM,/*!< To simulate a dry medium such as Pencil or Charcoal.*/
+    HUMID_MEDIUM,/*!< To simulate ink painting (color substraction blending).*/
+    OPAQUE_MEDIUM,  /*!< To simulate an opaque medium (oil, spray...).*/
+  } MediumType;
+
+  
+public:
+  typedef std::deque<StrokeVertex*> vertex_container; // the vertices container
+  typedef std::vector<ViewEdge*> viewedge_container; // the viewedges container
+  typedef StrokeInternal::vertex_iterator_base<StrokeInternal::vertex_nonconst_traits > vertex_iterator;
+  typedef StrokeInternal::vertex_iterator_base<StrokeInternal::vertex_const_traits> const_vertex_iterator;
+
+public:
+  //typedef StrokeVertex                                        vertex_type;
+private:
+  vertex_container _Vertices; //! The stroke's backbone vertices
+  Id _id;
+  float _Length; // The stroke length
+  viewedge_container _ViewEdges;
+  float _sampling;
+  StrokeRenderer *_renderer; // mark implementation OpenGL renderer
+  MediumType _mediumType;
+  unsigned int _textureId;
+  bool _tips;
+  Vec2r _extremityOrientations[2]; // the orientations of the first and last extermity
+  StrokeRep *_rep;
+
+public:
+  /*! default constructor */
+  Stroke();
+  /*! copy constructor */
+  Stroke(const Stroke& iBrother);
+  /*! Builds a stroke from a set of StrokeVertex.
+   *  This constructor is templated by an iterator type.
+   *  This iterator type must allow the vertices parsing
+   *  using the ++ operator.
+   *    \param iBegin
+   *      The iterator pointing to the first vertex.
+   *    \param iEnd
+   *      The iterator pointing to the end of the vertex list. 
+   */
+  template<class InputVertexIterator>
+  Stroke(InputVertexIterator iBegin, InputVertexIterator iEnd);
+
+  /*! Destructor */
+  virtual ~Stroke();
+  
+  /* operators */
+  /*! operator = */
+  Stroke& operator=(const Stroke& iBrother);
+
+  /*! Compute the sampling needed to get iNVertices
+   *  vertices.
+   *  If the specified number of vertices is less than the
+   *  actual number of vertices, the actual sampling value is returned.
+   *  (To remove Vertices, use the RemoveVertex() method of this class).
+   *  \param iNVertices
+   *    The number of StrokeVertices we eventually want
+   *    in our Stroke.
+   *  \return the sampling that must be used in the Resample(float) method.
+   *  @see Resample(int)
+   *  @see Resample(float)
+   */
+  float ComputeSampling(int iNVertices);
+  
+  /*! Resampling method.
+   *  Resamples the curve so that it eventually
+   *  has iNPoints. That means it is going 
+   *  to add iNPoints-vertices_size, if vertices_size
+   *  is the number of points we already have.
+   *  Is vertices_size >= iNPoints, no resampling is done.
+   *  \param iNPoints
+   *    The number of vertices we eventually want in our stroke.
+   */
+  void Resample(int iNPoints);
+
+  /*! Resampling method.
+   *  Resamples the curve with a given sampling.
+   *  If this sampling is < to the actual sampling
+   *  value, no resampling is done.
+   *  \param iSampling
+   *    The new sampling value.  
+   */
+  void Resample(float iSampling);
+
+  /*! Removes the stroke vertex iVertex 
+   *  from the stroke.
+   *  The length and curvilinear abscissa are updated
+   *  consequently.
+   */
+  void RemoveVertex(StrokeVertex *iVertex);
+
+  /*! Inserts the stroke vertex iVertex 
+   *  in the stroke before next.
+   *  The length, curvilinear abscissa are updated
+   *  consequently.
+   *  \param iVertex
+   *    The StrokeVertex to insert in the Stroke.
+   *  \param next
+   *    A StrokeVertexIterator pointing to the StrokeVeretx before
+   *    which iVertex must be inserted.
+   */
+  void InsertVertex(StrokeVertex *iVertex, StrokeInternal::StrokeVertexIterator next);
+
+  /* Render method */
+  void Render(const StrokeRenderer *iRenderer );
+  void RenderBasic(const StrokeRenderer *iRenderer );
+
+  /* Iterator definition */
+  
+  /* accessors */
+  /*! Returns the 2D length of the Stroke */
+  inline real getLength2D() const {return _Length;}
+  /*! Returns a reference to the time stamp value of the stroke. */
+  /*! Returns the MediumType used for this Stroke. */
+  inline MediumType getMediumType() const {return _mediumType;}
+  /*! Returns the id of the texture used to simulate th marks system
+   *  for this Stroke
+   */
+  inline unsigned int getTextureId() {return _textureId;}
+  /*! Returns true if this Stroke uses a texture with tips, false
+   *  otherwise.
+   */
+  inline bool hasTips() const {return _tips;}
+  /* these advanced iterators are used only in C++ */
+  inline int vertices_size() const {return _Vertices.size();}
+  inline viewedge_container::const_iterator viewedges_begin() const {return _ViewEdges.begin();}
+  inline viewedge_container::iterator viewedges_begin()  {return _ViewEdges.begin();}
+  inline viewedge_container::const_iterator viewedges_end() const {return _ViewEdges.end();}
+  inline viewedge_container::iterator viewedges_end()  {return _ViewEdges.end();}
+  inline int viewedges_size() const {return _ViewEdges.size();}
+  
+  inline Vec2r getBeginningOrientation() const {return _extremityOrientations[0];}
+  inline real getBeginningOrientationX() const {return _extremityOrientations[0].x();}
+  inline real getBeginningOrientationY() const {return _extremityOrientations[0].y();}
+  inline Vec2r getEndingOrientation() const {return _extremityOrientations[1];}
+  inline real getEndingOrientationX() const {return _extremityOrientations[1].x();}
+  inline real getEndingOrientationY() const {return _extremityOrientations[1].y();}
+
+
+  /* modifiers */
+  /*! Sets the Id of the Stroke. */
+  inline void SetId(const Id& id) {_id = id;}
+  /*! Sets the 2D length of the Stroke. */
+  void SetLength(float iLength);
+  /*! Sets the medium type that must be used for this Stroke. */
+  inline void SetMediumType(MediumType iType) {_mediumType = iType;}
+  /*! Sets the texture id to be used to simulate the marks system for this Stroke. */
+  inline void SetTextureId(unsigned int id) {_textureId = id;}
+  /*! Sets the flag telling whether this stroke is using a texture with
+   *  tips or not.
+   */
+  inline void SetTips(bool iTips) {_tips = iTips;}
+  
+  inline void push_back(StrokeVertex* iVertex) { _Vertices.push_back(iVertex); }
+  inline void push_front(StrokeVertex* iVertex) { _Vertices.push_front(iVertex); }
+  inline void AddViewEdge(ViewEdge *iViewEdge) {_ViewEdges.push_back(iViewEdge);}
+  inline void SetBeginningOrientation(const Vec2r& iOrientation) {_extremityOrientations[0] = iOrientation;}
+  inline void SetBeginningOrientation(real x, real y) {_extremityOrientations[0] = Vec2r(x,y);}
+  inline void SetEndingOrientation(const Vec2r& iOrientation) {_extremityOrientations[1] = iOrientation;}
+  inline void SetEndingOrientation(real x, real y) {_extremityOrientations[1] = Vec2r(x,y);}
+
+  /* Information access interface */
+  
+  // embedding vertex iterator
+  const_vertex_iterator vertices_begin() const;
+  vertex_iterator vertices_begin(float t=0.f);
+  const_vertex_iterator vertices_end() const;
+  vertex_iterator vertices_end();
+
+  /*! Returns a StrokeVertexIterator pointing on the first StrokeVertex of the
+   *  Stroke. One can specifly a sampling value to resample the Stroke
+   *  on the fly if needed.
+   *  \param t
+   *    The resampling value with which we want our Stroke to be resampled.
+   *    If 0 is specified, no resampling is done.
+   */
+  StrokeInternal::StrokeVertexIterator strokeVerticesBegin(float t=0.f);
+  /*! Returns a StrokeVertexIterator pointing after the last StrokeVertex of the
+   *  Stroke.
+   */
+  StrokeInternal::StrokeVertexIterator strokeVerticesEnd();
+  /*! Returns the number of StrokeVertex constituing the Stroke. */
+  inline unsigned int strokeVerticesSize() const {return _Vertices.size();}
+  
+  // Iterator access (Interface1D)
+  /*! Returns an Interface0DIterator pointing on the first StrokeVertex of the
+   *  Stroke.
+   */
+  virtual Interface0DIterator verticesBegin();
+  /*! Returns an Interface0DIterator pointing after the last StrokeVertex of the
+   *  Stroke.
+   */
+  virtual Interface0DIterator verticesEnd();
+
+  virtual Interface0DIterator pointsBegin(float t=0.f);
+  virtual Interface0DIterator pointsEnd(float t=0.f);
+};
+
+
+
+//
+//  Implementation
+//
+////////////////////////////////////////////////////////
+
+
+template<class InputVertexIterator>
+Stroke::Stroke(InputVertexIterator iBegin, InputVertexIterator iEnd)
+{
+  for(InputVertexIterator v=iBegin, vend=iEnd;
+  v!=vend;
+  v++)
+  {
+    _Vertices.push_back(*v);
+  }
+  _Length = 0;
+  _id = 0;
+}
+
+#endif // STROKE_H
diff --git a/extern/freestyle/src/stroke/StrokeAdvancedIterators.h b/extern/freestyle/src/stroke/StrokeAdvancedIterators.h
new file mode 100755
index 00000000000..279a0b12089
--- /dev/null
+++ b/extern/freestyle/src/stroke/StrokeAdvancedIterators.h
@@ -0,0 +1,142 @@
+//
+//  Filename         : StrokeAdvancedIterators.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Iterators used to iterate over the elements of the Stroke
+//                     Can't be used in python
+//  Date of creation : 01/07/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  STROKEADVANCEDITERATORS_H
+# define STROKEADVANCEDITERATORS_H
+
+# include "Stroke.h"
+
+namespace StrokeInternal {
+
+  class vertex_const_traits : public Const_traits<StrokeVertex*> {
+  public:
+    typedef std::deque<StrokeVertex*> vertex_container; 
+    typedef vertex_container::const_iterator vertex_container_iterator ;
+  };
+  class vertex_nonconst_traits : public Nonconst_traits<StrokeVertex*> {
+  public:
+    typedef std::deque<StrokeVertex*> vertex_container; //! the vertices container
+    typedef vertex_container::iterator vertex_container_iterator ;
+  };
+
+
+  template<class Traits>
+    class vertex_iterator_base : public IteratorBase<Traits,BidirectionalIteratorTag_Traits>
+  {
+  public:
+    typedef vertex_iterator_base<Traits>  Self;
+  protected:
+    typedef IteratorBase<Traits,BidirectionalIteratorTag_Traits> parent_class;
+    typedef typename Traits::vertex_container_iterator vertex_container_iterator;
+    typedef vertex_iterator_base<vertex_nonconst_traits> iterator;
+    typedef vertex_iterator_base<vertex_const_traits> const_iterator;
+    //protected:
+  public:
+    vertex_container_iterator _it;
+    vertex_container_iterator _begin;
+    vertex_container_iterator _end;
+  public:
+    friend class Stroke;
+    //friend class vertex_iterator;
+    inline vertex_iterator_base()
+      : parent_class()
+    {}
+    inline vertex_iterator_base(const iterator& iBrother) 
+      : parent_class()
+    {_it = iBrother._it;_begin = iBrother._begin;_end = iBrother._end;} 
+    inline vertex_iterator_base(const const_iterator& iBrother) 
+      : parent_class()
+    {_it = iBrother._it;_begin = iBrother._begin;_end = iBrother._end;} 
+  //protected://FIXME
+  public:
+    inline vertex_iterator_base(vertex_container_iterator it, vertex_container_iterator begin, vertex_container_iterator end)
+      : parent_class()
+    {
+      _it = it;
+      _begin = begin;
+      _end = end;
+    }
+    
+  public:
+    virtual ~vertex_iterator_base() {}
+    
+    virtual bool begin() const {return _it==_begin? true : false;}
+    virtual bool end() const {return _it==_end ? true : false;}
+    
+    // operators
+    inline Self& operator++()  // operator corresponding to ++i
+    { 
+      ++_it;
+      return *(this);
+    }
+    inline Self operator++(int)  // opérateur correspondant à i++ 
+    {
+      Self tmp = *this;        // C'est pour cela qu'on stocke la valeur
+      ++_it;                    // dans un temporaire. 
+      return tmp;
+    }
+    inline Self& operator--()  // operator corresponding to ++i
+    { 
+      --_it;
+      return *(this);
+    }
+    inline Self operator--(int)  // opérateur correspondant à i++ 
+    {                                  // c.a.d qui renvoie la valeur *puis* incrémente.
+      Self tmp = *this;        // C'est pour cela qu'on stocke la valeur
+      --_it;                    // dans un temporaire. 
+      return tmp;
+    }
+    
+    // comparibility
+    virtual bool operator!=(const Self& b) const
+    {
+      return (_it != b._it);
+    }
+    virtual bool operator==(const Self& b) const
+    {
+      return !(*this != b);
+    }
+    
+    // dereferencing
+    virtual typename Traits::reference operator*() const  {return *(_it);}
+    virtual typename Traits::pointer operator->() const { return &(operator*());}
+    
+    /*! accessors */
+    inline vertex_container_iterator it() const {return _it;}
+    inline vertex_container_iterator getBegin() const {return _begin;}
+    inline vertex_container_iterator getEnd() const {return _end;}
+  };
+
+} // end of namespace StrokeInternal
+
+
+#endif // STROKEADVANCEDITERATORS_H
+
+
diff --git a/extern/freestyle/src/stroke/StrokeIO.cpp b/extern/freestyle/src/stroke/StrokeIO.cpp
new file mode 100755
index 00000000000..7f540939fa1
--- /dev/null
+++ b/extern/freestyle/src/stroke/StrokeIO.cpp
@@ -0,0 +1,55 @@
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "StrokeIO.h"
+#include "StrokeAdvancedIterators.h"
+
+
+ostream& operator<<(ostream& out, const StrokeAttribute& iStrokeAttribute){
+  out << "    StrokeAttribute" << endl;
+  out << "      color     : (" << iStrokeAttribute.getColorR() << "," << iStrokeAttribute.getColorG() << "," << iStrokeAttribute.getColorB() << ")" << endl;
+  out << "      alpha     : " << iStrokeAttribute.getAlpha() << endl;
+  out << "      thickness : " << iStrokeAttribute.getThicknessR() << ", " << iStrokeAttribute.getThicknessL() << endl;
+  out << "      visible   : " << iStrokeAttribute.isVisible() << endl;
+  return out;
+}
+
+ostream& operator<<(ostream& out, const StrokeVertex& iStrokeVertex){
+  out << "  StrokeVertex" << endl;
+  out << "    id                 : " << iStrokeVertex.getId() << endl;
+  out << "    curvilinear length : " << iStrokeVertex.curvilinearAbscissa() << endl;
+  out << "    2d coordinates     : (" << iStrokeVertex.getProjectedX() << "," << iStrokeVertex.getProjectedY() << "," << iStrokeVertex.getProjectedZ() << ")" << endl;
+  out << "    3d coordinates     : (" << iStrokeVertex.getX() << "," << iStrokeVertex.getY() << "," << iStrokeVertex.getZ() << ")"<< endl;
+  out << iStrokeVertex.attribute() << endl;
+  return out;
+}
+
+ostream& operator<<(ostream& out, const Stroke& iStroke){
+  out << "Stroke" << endl;
+  out << "  id          : " << iStroke.getId() << endl;
+  out << "  length      : " << iStroke.getLength2D() << endl;
+  out << "  medium type : " << iStroke.getMediumType() << endl;
+  for(Stroke::const_vertex_iterator v=iStroke.vertices_begin(), vend=iStroke.vertices_end();
+    v!=vend;
+  ++v){
+    out << *(*v) << endl;
+  }
+  return out;
+}
\ No newline at end of file
diff --git a/extern/freestyle/src/stroke/StrokeIO.h b/extern/freestyle/src/stroke/StrokeIO.h
new file mode 100755
index 00000000000..42b99420f4a
--- /dev/null
+++ b/extern/freestyle/src/stroke/StrokeIO.h
@@ -0,0 +1,47 @@
+//
+//  Filename         : StrokeIO.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Functions to manage I/O for the stroke
+//  Date of creation : 03/02/2004
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  STROKEIO_H
+# define STROKEIO_H
+
+# include <iostream>
+# include "../system/FreestyleConfig.h"
+# include "Stroke.h"
+
+LIB_STROKE_EXPORT
+ostream& operator<<(ostream& out, const StrokeAttribute& iStrokeAttribute);
+
+LIB_STROKE_EXPORT
+ostream& operator<<(ostream& out, const StrokeVertex& iStrokeVertex);
+
+LIB_STROKE_EXPORT
+ostream& operator<<(ostream& out, const Stroke& iStroke);
+
+
+#endif // STROKEIO_H
\ No newline at end of file
diff --git a/extern/freestyle/src/stroke/StrokeIterators.h b/extern/freestyle/src/stroke/StrokeIterators.h
new file mode 100755
index 00000000000..9cc08a0532a
--- /dev/null
+++ b/extern/freestyle/src/stroke/StrokeIterators.h
@@ -0,0 +1,227 @@
+//
+//  Filename         : StrokeIterators.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Iterators used to iterate over the elements of the Stroke
+//  Date of creation : 01/07/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  STROKEITERATORS_H
+# define STROKEITERATORS_H
+
+# include "Stroke.h"
+
+namespace StrokeInternal {
+
+  //
+  // StrokeVertexIterator
+  //
+  /////////////////////////////////////////////////
+
+  /*! Class defining an iterator designed to iterate over
+   *  the StrokeVertex of a Stroke.
+   *  An instance of a StrokeVertexIterator can only be obtained
+   *  from a Stroke by calling strokeVerticesBegin() or strokeVerticesEnd().
+   *  It is iterating over the same vertices as an Interface0DIterator.
+   *  The difference resides in the object access. Indeed, an Interface0DIterator
+   *  allows only an access to an Interface0D whereas we could need
+   *  to access the specialized StrokeVertex type. In this case, one
+   *  should use a StrokeVertexIterator.
+   *  The castToInterface0DIterator() method is useful to get an Interface0DIterator
+   *  from a StrokeVertexIterator in order to call any functions of the
+   *  type UnaryFunction0D.
+   *  \attention In the scripting language, you must call
+   *  \code it2 = StrokeVertexIterator(it1) \endcode instead of
+   *  \code it2 = it1 \endcode
+   *  where \a it1 and \a it2 are 2 StrokeVertexIterator.
+   *  Otherwise, incrementing \a it1 will also increment \a it2.
+   */
+  class StrokeVertexIterator : public Interface0DIteratorNested
+  {
+  public:
+
+    /*! Default constructor. */
+    StrokeVertexIterator() {}
+
+    /*! Copy constructor. */
+    StrokeVertexIterator(const StrokeVertexIterator& vi) {
+      _it = vi._it;
+      _begin = vi._begin;
+      _end = vi._end;
+    }
+
+    StrokeVertexIterator(const ::Stroke::vertex_container::iterator& it,
+			 const ::Stroke::vertex_container::iterator& begin,
+			 const ::Stroke::vertex_container::iterator& end) {
+      _it = it;
+      _begin = begin;
+      _end = end;
+    }
+
+    virtual ~StrokeVertexIterator() {}
+
+    /*! Casts this StrokeVertexIterator into an Interface0DIterator.
+     *  Useful for any call to a function of the type UnaryFunction0D.
+     */
+    inline Interface0DIterator castToInterface0DIterator() const {
+      Interface0DIterator ret(new StrokeVertexIterator(*this));
+      return ret;
+    }
+    /*! operator=
+     *  \attention In the scripting language, you must call
+     *  \code it2 = StrokeVertexIterator(it1) \endcode instead of
+     *  \code it2 = it1 \endcode
+     *  where \a it1 and \a it2 are 2 StrokeVertexIterator.
+     *  Otherwise, incrementing \a it1 will also increment \a it2.
+     *  
+     */
+    StrokeVertexIterator& operator=(const StrokeVertexIterator& vi) {
+      _it = vi._it;
+      _begin = vi._begin;
+      _end = vi._end;
+      return *this;
+    }
+
+    /*! Returns the string "StrokeVertexIterator". */
+    virtual string getExactTypeName() const {
+      return "StrokeVertexIterator";
+    }
+
+    /*! Returns a reference to the pointed StrokeVertex.
+     *  In the scripting language, you must call
+     *  "getObject()"instead.
+     */
+    virtual StrokeVertex& operator*() {
+      return **_it;
+    }
+
+    /*! Returns a pointer to the pointed StrokeVertex.
+     * Can't be called in the scripting language.
+     */
+    virtual StrokeVertex* operator->() {
+      return &(operator*());
+    }
+
+    /*! Increments. In the scripting language, call
+     *  "increment()".
+     */
+    virtual StrokeVertexIterator& operator++() {
+      increment();
+      return *this;
+    }
+
+    /*! Increments. In the scripting language, call
+     *  "increment()".
+     */
+    virtual StrokeVertexIterator operator++(int) {
+      StrokeVertexIterator ret(*this);
+      increment();
+      return ret;
+    }
+
+    /*! Decrements. In the scripting language, call
+     *  "decrement()".
+     */
+    virtual StrokeVertexIterator& operator--() {
+      decrement();
+      return *this;
+    }
+
+    /*! Decrements. In the scripting language, call
+     *  "decrement()".
+     */
+    virtual StrokeVertexIterator operator--(int) {
+      StrokeVertexIterator ret(*this);
+      decrement();
+      return ret;
+    }
+
+    /*! Increments. */
+    virtual void increment() {
+      ++_it;
+    }
+
+    /*! Decrements. */
+    virtual void decrement() {
+      --_it;
+    }
+
+    /*! Returns true if the pointed StrokeVertex is the
+     * first of the Stroke.
+     */
+    bool isBegin() const {
+      return _it == _begin;
+    }
+
+    /*! Returns true if the pointed StrokeVertex is after the
+     * last StrokeVertex of the Stroke.
+     */
+    bool isEnd() const {
+      return _it == _end;
+    }
+
+    /*! operator == */
+    virtual bool operator==(const Interface0DIteratorNested& it) const {
+      const StrokeVertexIterator* it_exact = dynamic_cast<const StrokeVertexIterator*>(&it);
+      if (!it_exact)
+	return false;
+      return (_it == it_exact->_it);
+    }
+
+    /*! Returns the curvilinear abscissa of the current point */
+    virtual float t() const{
+      return (*_it)->curvilinearAbscissa();
+    }
+    /*! Returns the point's parameter in the stroke */
+    virtual float u() const{
+      return (*_it)->u();
+    }
+
+    /*! Cloning method */
+    virtual StrokeVertexIterator* copy() const {
+      return new StrokeVertexIterator(*this);
+    }
+
+  //
+  // Not exported in Python
+  //
+  //////////////////////////////////////////////////
+
+    const ::Stroke::vertex_container::iterator& getIt() {
+    return _it;
+  }
+
+  private:
+
+    ::Stroke::vertex_container::iterator _it;
+    ::Stroke::vertex_container::iterator _begin;
+    ::Stroke::vertex_container::iterator _end;
+  };
+
+} // end of namespace StrokeInternal
+
+
+#endif // STROKEITERATORS_H
+
+
diff --git a/extern/freestyle/src/stroke/StrokeLayer.cpp b/extern/freestyle/src/stroke/StrokeLayer.cpp
new file mode 100755
index 00000000000..8b469399ca8
--- /dev/null
+++ b/extern/freestyle/src/stroke/StrokeLayer.cpp
@@ -0,0 +1,55 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "StrokeLayer.h"
+#include "Stroke.h"
+#include "Canvas.h"
+
+StrokeLayer::~StrokeLayer()
+{
+  clear();
+}
+
+void StrokeLayer::Render(const StrokeRenderer *iRenderer )
+{
+  for(StrokeLayer::stroke_container::iterator s=_strokes.begin(), send=_strokes.end();
+      s!=send;
+      ++s){
+      (*s)->Render(iRenderer);
+  } 
+}
+
+void StrokeLayer::RenderBasic(const StrokeRenderer *iRenderer )
+{
+  for(StrokeLayer::stroke_container::iterator s=_strokes.begin(), send=_strokes.end();
+      s!=send;
+      ++s){
+      (*s)->RenderBasic(iRenderer);
+      }
+}
+void StrokeLayer::clear()
+{
+  for(stroke_container::iterator s=_strokes.begin(), send=_strokes.end();
+      s!=send;
+      ++s)
+    delete *s;
+  _strokes.clear();
+}
diff --git a/extern/freestyle/src/stroke/StrokeLayer.h b/extern/freestyle/src/stroke/StrokeLayer.h
new file mode 100755
index 00000000000..b89b77a85a7
--- /dev/null
+++ b/extern/freestyle/src/stroke/StrokeLayer.h
@@ -0,0 +1,75 @@
+//
+//  Filename         : StrokeLayer.h
+//  Author           : Stephane Grabli
+//  Purpose          : Class to define a layer of strokes.
+//  Date of creation : 18/12/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  STROKELAYER_H
+# define STROKELAYER_H
+
+# include <deque>
+
+class Stroke;
+class StrokeRenderer;
+class StrokeLayer 
+{
+public:
+  typedef std::deque<Stroke*> stroke_container;
+
+protected:
+  stroke_container _strokes;
+public:
+  StrokeLayer() {}
+  StrokeLayer(const stroke_container& iStrokes)
+  {
+    _strokes = iStrokes;
+  }
+  StrokeLayer(const StrokeLayer& iBrother)
+  {
+    _strokes = iBrother._strokes;
+  }
+  virtual ~StrokeLayer() ;
+
+  /*! Render method */
+  void Render(const StrokeRenderer *iRenderer );
+  void RenderBasic(const StrokeRenderer *iRenderer );
+
+  /*! clears the layer */
+  void clear() ;
+
+  /*! accessors */
+  inline stroke_container::iterator strokes_begin() {return _strokes.begin();}
+  inline stroke_container::iterator strokes_end() {return _strokes.end();}
+  inline int strokes_size() const {return _strokes.size();}
+  inline bool empty() const {return _strokes.empty();}
+
+  /*! modifiers */
+  inline void SetStrokes(stroke_container& iStrokes) {_strokes = iStrokes;}
+  inline void AddStroke(Stroke *iStroke) {_strokes.push_back(iStroke);}
+  
+};
+
+#endif // STROKELAYER_H
diff --git a/extern/freestyle/src/stroke/StrokeRenderer.cpp b/extern/freestyle/src/stroke/StrokeRenderer.cpp
new file mode 100755
index 00000000000..e747fb4f5cd
--- /dev/null
+++ b/extern/freestyle/src/stroke/StrokeRenderer.cpp
@@ -0,0 +1,146 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "StrokeRenderer.h"
+#include "../geometry/GeomUtils.h"
+using namespace std;
+
+/**********************************/
+/*                                */
+/*                                */
+/*         StrokeRenderer         */
+/*                                */
+/*                                */
+/**********************************/
+
+LIB_STROKE_EXPORT
+TextureManager *StrokeRenderer::_textureManager = 0;
+
+StrokeRenderer::StrokeRenderer ()
+{
+} 
+
+StrokeRenderer::~StrokeRenderer ()
+{
+}
+
+bool StrokeRenderer::loadTextures()
+{
+  _textureManager->load();
+  return true;
+}
+
+// unsigned int StrokeRenderer::getPaperTextureIndex(unsigned int index)
+// {
+  // return _textureManager->getPaperTextureIndex(index);
+// }
+
+
+/**********************************/
+/*                                */
+/*                                */
+/*         TextureManager         */
+/*                                */
+/*                                */
+/**********************************/
+
+
+LIB_STROKE_EXPORT
+TextureManager* TextureManager::_pInstance = 0;
+
+LIB_STROKE_EXPORT
+vector<string> TextureManager::_papertextures;
+
+LIB_STROKE_EXPORT
+string TextureManager::_patterns_path;
+
+LIB_STROKE_EXPORT
+string TextureManager::_brushes_path;
+
+TextureManager::TextureManager ()
+{
+  _papertexname = NULL;
+  _hasLoadedTextures=false;
+  _pInstance = this;
+  _defaultTextureId = 0;
+}
+
+TextureManager::~TextureManager ()
+{
+  if (_papertexname)
+    delete _papertexname;
+  if(!_brushesMap.empty())
+    _brushesMap.clear();
+  _pInstance = 0;
+}
+
+void TextureManager::load()
+{
+  if(_hasLoadedTextures)
+    return ;
+  loadPapers();
+  loadStandardBrushes();
+  _hasLoadedTextures = true;
+}
+
+unsigned TextureManager::getBrushTextureIndex(string name, Stroke::MediumType loadingMode)
+{
+  BrushTexture bt(name,loadingMode);
+  brushesMap::iterator b = _brushesMap.find(bt);
+  if(b == _brushesMap.end()){
+      unsigned texId = loadBrush(name, loadingMode);
+      _brushesMap[bt] = texId;
+      return texId;
+      cout << "brush file " << name << " not found" << endl;
+      return 0;
+  }else{
+    return _brushesMap[bt];
+  }
+}
+
+vector<string>& TextureManager::Options::getPaperTextures() {
+  return _papertextures;
+}
+
+void TextureManager::Options::setPaperTextures(const vector<string>& sl) {
+  _papertextures = sl;
+}
+
+void TextureManager::Options::setPatternsPath(const string& path) {
+  _patterns_path = path;
+}
+
+string TextureManager::Options::getPatternsPath() {
+  return _patterns_path;
+}
+
+void TextureManager::Options::setBrushesPath(const string& path) {
+  _brushes_path = path;
+}
+
+string TextureManager::Options::getBrushesPath() {
+  return _brushes_path;
+}
+
+unsigned TextureManager::getPaperTexturesNumber() {
+  return _papertextures.size();
+}
+
diff --git a/extern/freestyle/src/stroke/StrokeRenderer.h b/extern/freestyle/src/stroke/StrokeRenderer.h
new file mode 100755
index 00000000000..d192fe30145
--- /dev/null
+++ b/extern/freestyle/src/stroke/StrokeRenderer.h
@@ -0,0 +1,140 @@
+//
+//  Filename         : StrokeRenderer.h
+//  Author(s)        : Fredo Durand
+//  Purpose          : Classes to render a stroke with OpenGL
+//  Date of creation : 09/09/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  STROKE_RENDERER_H
+# define STROKE_RENDERER_H
+
+# include <vector>
+# include <map>
+# include <utility>
+# include "../system/FreestyleConfig.h"
+# include "Stroke.h"
+# include "StrokeRep.h"
+# include <string.h>
+
+
+/**********************************/
+/*                                */
+/*                                */
+/*         TextureManager         */
+/*                                */
+/*                                */
+/**********************************/
+
+
+/*! Class to load textures
+ */
+class LIB_STROKE_EXPORT TextureManager
+{
+public:
+
+  TextureManager ();
+  virtual ~TextureManager ();
+  static TextureManager * getInstance() {return _pInstance;}
+  void load () ;
+  unsigned getBrushTextureIndex(string name, Stroke::MediumType iType = Stroke::OPAQUE_MEDIUM) ;
+  unsigned getPaperTextureIndex(unsigned i) { return _papertexname[i]; }
+
+  static unsigned getPaperTexturesNumber();
+  inline bool hasLoaded() const {return _hasLoadedTextures;}
+  inline unsigned int getDefaultTextureId() const {return _defaultTextureId;}
+
+  struct LIB_STROKE_EXPORT Options
+  {
+    static void setPaperTextures(const vector<string>& sl);
+    static vector<string>& getPaperTextures();
+
+    static void setPatternsPath(const string& path);
+    static string getPatternsPath();
+
+    static void setBrushesPath(const string& path);
+    static string getBrushesPath();
+  };
+
+ protected:
+  virtual void loadPapers() = 0;
+  virtual void loadStandardBrushes() = 0;
+  virtual unsigned loadBrush(string fileName, Stroke::MediumType = Stroke::OPAQUE_MEDIUM) = 0;
+  
+  typedef std::pair<string,Stroke::MediumType> BrushTexture;
+  struct cmpBrushTexture{
+    bool operator()(const BrushTexture& bt1, const BrushTexture& bt2) const{
+      int r = strcmp(bt1.first.c_str(), bt2.first.c_str());
+      if(r != 0)
+        return (r<0);
+      else
+        return (bt1.second < bt2.second);
+    }
+  };
+  typedef std::map<BrushTexture, unsigned, cmpBrushTexture> brushesMap;
+
+  static TextureManager * _pInstance;
+  bool                  _hasLoadedTextures;
+  brushesMap            _brushesMap;
+  unsigned*		_papertexname;
+  static string		_patterns_path;
+  static string		_brushes_path;
+  static vector<string>	_papertextures;
+  unsigned int _defaultTextureId;
+};
+
+
+/**********************************/
+/*                                */
+/*                                */
+/*         StrokeRenderer         */
+/*                                */
+/*                                */
+/**********************************/
+
+/*! Class to render a stroke. 
+  Creates a triangle strip and stores it
+  strip is lazily created at the first rendering
+*/
+class LIB_STROKE_EXPORT StrokeRenderer
+{
+ public:
+  StrokeRenderer();
+  virtual ~StrokeRenderer ();
+
+  /*! Renders a stroke rep */
+  virtual void RenderStrokeRep(StrokeRep *iStrokeRep) const = 0;
+  virtual void RenderStrokeRepBasic(StrokeRep *iStrokeRep) const = 0;
+
+  // initializes the texture manager
+  // lazy, checks if it has already been done
+  static bool loadTextures() ;
+  
+  //static unsigned int getTextureIndex(unsigned int index)  ;
+  //static unsigned int getPaperTextureIndex(unsigned int index)  ;
+  static TextureManager *_textureManager;
+};
+
+
+#endif // STROKE_RENDERER_H
diff --git a/extern/freestyle/src/stroke/StrokeRep.cpp b/extern/freestyle/src/stroke/StrokeRep.cpp
new file mode 100755
index 00000000000..055e1fb1be4
--- /dev/null
+++ b/extern/freestyle/src/stroke/StrokeRep.cpp
@@ -0,0 +1,820 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "StrokeRep.h"
+#include "Stroke.h"
+#include "StrokeRenderer.h"
+#include "StrokeAdvancedIterators.h"
+#include "StrokeIterators.h"
+
+using namespace std;
+
+//
+// STROKE VERTEX REP
+/////////////////////////////////////
+StrokeVertexRep::StrokeVertexRep(const StrokeVertexRep& iBrother){
+  _point2d = iBrother._point2d;
+  _texCoord = iBrother._texCoord;
+  _color = iBrother._color;
+  _alpha = iBrother._alpha;
+}
+
+//
+// STRIP
+/////////////////////////////////////
+
+Strip::Strip(const vector<StrokeVertex*>& iStrokeVertices, bool hasTips, bool beginTip, bool endTip){
+  createStrip(iStrokeVertices);
+  if (!hasTips)
+	  computeTexCoord (iStrokeVertices);
+  else
+	  computeTexCoordWithTips (iStrokeVertices, beginTip, endTip);
+}
+Strip::Strip(const Strip& iBrother){
+  if(!iBrother._vertices.empty()){
+    for(vertex_container::const_iterator v=iBrother._vertices.begin(), vend=iBrother._vertices.end();
+    v!=vend;
+    ++v){
+      _vertices.push_back(new StrokeVertexRep(**v));
+    }
+  }
+  _averageThickness = iBrother._averageThickness;
+}
+
+Strip::~Strip(){
+  if(!_vertices.empty()){
+    for(vertex_container::iterator v=_vertices.begin(), vend=_vertices.end();
+    v!=vend;
+    ++v){
+      delete (*v);
+    }
+    _vertices.clear();
+  }
+}
+
+//////////////////////////
+// Strip creation
+//////////////////////////
+#define EPS_SINGULARITY_RENDERER 0.05
+#define ZERO 0.00001
+#define MAX_RATIO_LENGTH_SINGU 2
+#define HUGE_COORD 1e4
+
+bool notValid (Vec2r p)
+{
+  return (p[0]!=p[0]) || (p[1]!=p[1]) || (fabs(p[0])>HUGE_COORD) || (fabs(p[1])>HUGE_COORD) 
+    || (p[0] <-HUGE_COORD) || (p[1]<-HUGE_COORD);
+}
+
+real crossP(const Vec2r& A, const Vec2r& B){
+  return A[0]*B[1] - A[1]*B[0];
+}
+
+void
+Strip::createStrip (const vector<StrokeVertex*>& iStrokeVertices)
+{
+  //computeParameterization();
+  if (iStrokeVertices.size() <2) 
+    {
+      cerr << "Warning: strip has less than 2 vertices" << endl;
+      return;
+    }
+  _vertices.reserve(2*iStrokeVertices.size());
+  if(!_vertices.empty()){
+    for(vertex_container::iterator v=_vertices.begin(), vend=_vertices.end();
+    v!=vend;
+    ++v){
+      delete (*v);
+    }
+    _vertices.clear();
+  }
+  _averageThickness=0.0;
+
+  vector<StrokeVertex*>::const_iterator v ,vend, v2, vPrev;
+  StrokeVertex *sv, *sv2, *svPrev;
+
+  //special case of first vertex
+  v=iStrokeVertices.begin();
+  sv=*v;
+  vPrev=v; //in case the stroke has only 2 vertices;
+  ++v; sv2=*v;
+  Vec2r dir(sv2->getPoint()-sv->getPoint());
+  Vec2r orthDir(-dir[1], dir[0]);
+  if (orthDir.norm() > ZERO)
+    orthDir.normalize();
+   const float *thickness =  sv->attribute().getThickness();
+  _vertices.push_back(new StrokeVertexRep(sv->getPoint()+thickness[1]*orthDir)); 
+  _vertices.push_back(new StrokeVertexRep(sv->getPoint()-thickness[0]*orthDir)); 
+
+  Vec2r stripDir(orthDir);
+  // check whether the orientation
+  // was user defined
+  if(sv->attribute().isAttributeAvailableVec2f("orientation")){
+    Vec2r userDir = sv->attribute().getAttributeVec2f("orientation");
+    userDir.normalize();
+    Vec2r t(orthDir[1], -orthDir[0]);
+    real dp1 = userDir*orthDir;
+    real dp2 = userDir*t;
+    real h = (thickness[1]+thickness[0])/dp1;
+    real x = fabs(h*dp2/2.0);
+    if(dp1>0){
+      //i'm in the upper part of the unit circle
+      if(dp2>0){
+        //i'm in the upper-right part of the unit circle
+        // i must move vertex 1
+        _vertices[1]->setPoint2d(_vertices[0]->point2d()-userDir*(h));
+        //_vertices[0]->setPoint2d(_vertices[0]->point2d()+t*x);
+        //_vertices[1]->setPoint2d(_vertices[1]->point2d()-t*x);
+      }else{
+        //i'm in the upper-left part of the unit circle
+        // i must move vertex 0
+        _vertices[0]->setPoint2d(_vertices[1]->point2d()+userDir*(h));
+        //_vertices[0]->setPoint2d(_vertices[0]->point2d()-t*x);
+        //_vertices[1]->setPoint2d(_vertices[1]->point2d()+t*x);
+      }
+    }else{
+      //i'm in the lower part of the unit circle
+      if(dp2>0){
+        //i'm in the lower-right part of the unit circle
+        // i must move vertex 0
+        //_vertices[0]->setPoint2d(_vertices[1]->point2d()-userDir*(h));
+        _vertices[0]->setPoint2d(_vertices[0]->point2d()-t*x);
+        //_vertices[1]->setPoint2d(_vertices[1]->point2d()+t*x);
+      }else{
+        //i'm in the lower-left part of the unit circle
+        // i must move vertex 1
+        _vertices[1]->setPoint2d(_vertices[0]->point2d()+userDir*(h));
+        //_vertices[0]->setPoint2d(_vertices[0]->point2d()-t*x);
+        //_vertices[1]->setPoint2d(_vertices[1]->point2d()-t*x);
+      }
+    }
+  }
+  
+  
+  //  Vec2r userDir = _stroke->getBeginningOrientation();
+  //  if(userDir != Vec2r(0,0)){
+  //    userDir.normalize();
+  //    real o1 = (orthDir*userDir);
+  //    real o2 = crossP(orthDir,userDir);
+  //    real orientation = o1 * o2;
+  //    if(orientation > 0){
+  //      // then the vertex to move is v0
+  //      if(o1 > 0)
+  //        _vertex[0]=_vertex[1]+userDir;
+  //      else
+  //        _vertex[0]=_vertex[1]-userDir;
+  //    }
+  //    if(orientation < 0){
+  //      // then we must move v1
+  //      if(o1 < 0)
+  //        _vertex[1]=_vertex[0]+userDir;
+  //      else
+  //        _vertex[1]=_vertex[0]-userDir;
+  //    }
+  //  }
+  
+  int i=2; //2 because we have already processed the first vertex
+
+  for(vend=iStrokeVertices.end();
+  v!=vend;
+  v++){
+      v2=v; ++v2;
+      if (v2==vend) break;
+      sv= (*v); sv2 = (*v2); svPrev=(*vPrev);
+      Vec2r p(sv->getPoint()), p2(sv2->getPoint()), pPrev(svPrev->getPoint());
+			
+      //direction and orthogonal vector to the next segment
+      Vec2r dir(p2-p);
+      float dirNorm=dir.norm();
+      dir.normalize();
+      Vec2r orthDir(-dir[1], dir[0]);
+      Vec2r stripDir = orthDir;
+      if(sv->attribute().isAttributeAvailableVec2f("orientation")){
+        Vec2r userDir = sv->attribute().getAttributeVec2f("orientation");
+        userDir.normalize();
+        real dp = userDir*orthDir;
+        if(dp<0)
+          userDir = userDir*(-1.f);
+        stripDir = userDir;
+      } 
+
+      //direction and orthogonal vector to the previous segment
+      Vec2r dirPrev(p-pPrev);
+      float dirPrevNorm=dirPrev.norm();
+      dirPrev.normalize();
+      Vec2r orthDirPrev(-dirPrev[1], dirPrev[0]);
+      Vec2r stripDirPrev = orthDirPrev;
+      if(svPrev->attribute().isAttributeAvailableVec2f("orientation")){
+        Vec2r userDir = svPrev->attribute().getAttributeVec2f("orientation");
+        userDir.normalize();
+        real dp = userDir*orthDir;
+        if(dp<0)
+          userDir = userDir*(-1.f);
+        stripDirPrev = userDir;
+      } 
+
+      const float *thickness =  sv->attribute().getThickness();
+      _averageThickness+=thickness[0]+thickness[1];
+      Vec2r pInter;
+      int interResult;
+
+      interResult=GeomUtils::intersect2dLine2dLine(Vec2r(pPrev+thickness[1]*stripDirPrev), Vec2r(p+thickness[1]*stripDirPrev),
+						   Vec2r(p+thickness[1]*stripDir), Vec2r(p2+thickness[1]*stripDir),
+						   pInter);
+		
+      if (interResult==GeomUtils::DO_INTERSECT) 
+        _vertices.push_back(new StrokeVertexRep(pInter));
+      else 
+        _vertices.push_back(new StrokeVertexRep(p+thickness[1]*stripDir));
+      ++i;
+		
+      interResult=GeomUtils::intersect2dLine2dLine(Vec2r(pPrev-thickness[0]*stripDirPrev), Vec2r(p-thickness[0]*stripDirPrev),
+						   Vec2r(p-thickness[0]*stripDir), Vec2r(p2-thickness[0]*stripDir),
+						   pInter);
+      if (interResult==GeomUtils::DO_INTERSECT) 
+        _vertices.push_back(new StrokeVertexRep(pInter));
+      else 
+        _vertices.push_back(new StrokeVertexRep(p-thickness[0]*stripDir));
+      ++i;
+		
+      // if the angle is obtuse, we simply average the directions to avoid the singularity
+      stripDir=stripDir+stripDirPrev;
+      if ((dirNorm<ZERO) || (dirPrevNorm<ZERO) || (stripDir.norm() < ZERO)) {
+	      stripDir[0] = 0;
+	      stripDir[1] = 0;
+      }else
+	      stripDir.normalize();
+
+      Vec2r vec_tmp(_vertices[i-2]->point2d()-p);
+      if  ((vec_tmp.norm() > thickness[1]*MAX_RATIO_LENGTH_SINGU) || 
+	        (dirNorm<ZERO) || (dirPrevNorm<ZERO) ||
+	        notValid(_vertices[i-2]->point2d()) 
+	        || (fabs(stripDir * dir) < EPS_SINGULARITY_RENDERER))
+	      _vertices[i-2]->setPoint2d(p+thickness[1]*stripDir);
+		
+      vec_tmp = _vertices[i-1]->point2d()-p;
+      if  ((vec_tmp.norm() > thickness[1]*MAX_RATIO_LENGTH_SINGU) ||
+	        (dirNorm<ZERO) || (dirPrevNorm<ZERO) ||
+	        notValid(_vertices[i-1]->point2d())
+	        || (fabs(stripDir * dir)<EPS_SINGULARITY_RENDERER))
+	      _vertices[i-1]->setPoint2d(p-thickness[0]*stripDir);
+
+      vPrev=v;
+  } // end of for
+
+  //special case of last vertex
+  sv=*v;
+  sv2=*vPrev;
+  dir=Vec2r (sv->getPoint()-sv2->getPoint());
+  orthDir=Vec2r(-dir[1], dir[0]);
+  if (orthDir.norm() > ZERO)
+    orthDir.normalize();
+  const float *thicknessLast =  sv->attribute().getThickness();
+  _vertices.push_back(new StrokeVertexRep(sv->getPoint()+thicknessLast[1]*orthDir));
+  ++i;
+  _vertices.push_back(new StrokeVertexRep(sv->getPoint()-thicknessLast[0]*orthDir));
+  int n = i;
+  ++i;
+  
+  // check whether the orientation
+  // was user defined
+  if(sv->attribute().isAttributeAvailableVec2f("orientation")){
+    Vec2r userDir = sv->attribute().getAttributeVec2f("orientation");
+    userDir.normalize();
+    Vec2r t(orthDir[1], -orthDir[0]);
+    real dp1 = userDir*orthDir;
+    real dp2 = userDir*t;
+    real h = (thicknessLast[1]+thicknessLast[0])/dp1;
+    real x = fabs(h*dp2/2.0);
+    if(dp1>0){
+      //i'm in the upper part of the unit circle
+      if(dp2>0){
+        //i'm in the upper-right part of the unit circle
+        // i must move vertex n-1
+        _vertices[n-1]->setPoint2d(_vertices[n]->point2d()-userDir*(h));
+        //_vertices[n-1]->setPoint2d(_vertices[n-1]->point2d()+t*x);
+        //_vertices[n]->setPoint2d(_vertices[n]->point2d()-t*x);
+      }else{
+        //i'm in the upper-left part of the unit circle
+        // i must move vertex n
+        _vertices[n]->setPoint2d(_vertices[n-1]->point2d()+userDir*(h));
+        //_vertices[n-1]->setPoint2d(_vertices[n-1]->point2d()-t*x);
+        //_vertices[n]->setPoint2d(_vertices[n]->point2d()+t*x);
+      }
+    }else{
+      //i'm in the lower part of the unit circle
+      if(dp2>0){
+        //i'm in the lower-right part of the unit circle
+        // i must move vertex n
+        _vertices[n]->setPoint2d(_vertices[n-1]->point2d()-userDir*(h));
+        //_vertices[n-1]->setPoint2d(_vertices[n-1]->point2d()-t*x);
+        //_vertices[n]->setPoint2d(_vertices[n]->point2d()+t*x);
+      }else{
+        //i'm in the lower-left part of the unit circle
+        // i must move vertex n-1
+        _vertices[n-1]->setPoint2d(_vertices[n]->point2d()+userDir*(h));
+        //_vertices[n-1]->setPoint2d(_vertices[n-1]->point2d()+t*x);
+        //_vertices[n]->setPoint2d(_vertices[n]->point2d()-t*x);
+      }
+    }
+  }
+  
+	
+  // check whether the orientation of the extremity 
+  // was user defined
+  //  userDir = _stroke->getEndingOrientation();
+  //  if(userDir != Vec2r(0,0)){
+  //    userDir.normalize();
+  //    real o1 = (orthDir*userDir);
+  //    real o2 = crossP(orthDir,userDir);
+  //    real orientation = o1 * o2;
+  //    if(orientation > 0){
+  //      // then the vertex to move is vn
+  //      if(o1 < 0)
+  //        _vertex[n]=_vertex[n-1]+userDir;
+  //      else
+  //        _vertex[n]=_vertex[n-1]-userDir;
+  //    }
+  //    if(orientation < 0){
+  //      // then we must move vn-1
+  //      if(o1 > 0)
+  //        _vertex[n-1]=_vertex[n]+userDir;
+  //      else
+  //        _vertex[n-1]=_vertex[n]-userDir;
+  //    }
+  //  }
+
+  _averageThickness/=float(iStrokeVertices.size()-2); 
+  //I did not use the first and last vertex for the average
+  if (iStrokeVertices.size()<3)
+    _averageThickness=0.5*(thicknessLast[1]+thicknessLast[0]+thickness[0]+thickness[1]);
+
+  if (i!=2*iStrokeVertices.size())
+    cerr << "Warning: problem with stripe size\n";
+
+  cleanUpSingularities (iStrokeVertices);
+}	
+
+// CLEAN UP
+/////////////////////////
+
+void
+Strip::cleanUpSingularities (const vector<StrokeVertex*>& iStrokeVertices)
+{
+  int k;
+  unsigned sizeStrip = _vertices.size();
+
+  for (k=0; k<sizeStrip; k++)
+    if (notValid(_vertices[k]->point2d()))
+      {
+	cerr << "Warning: strip vertex " << k << " non valid" << endl;
+	return;
+      }
+
+  //return;
+  if (iStrokeVertices.size()<2) return;
+  int i=0, j;
+  vector<StrokeVertex*>::const_iterator v ,vend, v2, vPrev;
+  StrokeVertex *sv, *sv2, *svPrev;
+	
+  bool singu1=false, singu2=false;
+  int timeSinceSingu1=0, timeSinceSingu2=0;
+
+  //special case of first vertex
+  v=iStrokeVertices.begin();
+  for(vend=iStrokeVertices.end();
+      v!=vend;
+      v++)
+    {
+      v2=v; ++v2;
+      if (v2==vend) break;
+      sv= (*v); sv2 = (*v2); 
+      Vec2r p(sv->getPoint()), p2(sv2->getPoint());
+		
+      Vec2r dir(p2-p);
+      if (dir.norm() > ZERO)
+	dir.normalize();
+      Vec2r dir1, dir2;
+      dir1=_vertices[2*i+2]->point2d()-_vertices[2*i]->point2d();
+      dir2=_vertices[2*i+3]->point2d()-_vertices[2*i+1]->point2d();
+		
+      if ((dir1 * dir) < -ZERO)
+	{
+	  singu1=true;
+	  timeSinceSingu1++;
+	}
+      else
+	{
+	  if (singu1)
+	    {
+	      int toto=i-timeSinceSingu1;
+	      if (toto<0) 
+		cerr << "Stephane dit \"Toto\"" << endl;
+	      //traverse all the vertices of the singularity and average them
+	      Vec2r avP(0.0,0.0);
+	      for (j=i-timeSinceSingu1; j<i+1; j++)
+		avP=Vec2r(avP+_vertices[2*j]->point2d());
+	      avP=Vec2r(1.0/float(timeSinceSingu1+1)*avP);
+	      for (j=i-timeSinceSingu1; j<i+1; j++)
+		_vertices[2*j]->setPoint2d(avP);
+	      //_vertex[2*j]=_vertex[2*i];
+	      singu1=false; timeSinceSingu1=0;
+	    }
+	}
+      if ((dir2 * dir) < -ZERO)
+	{
+	  singu2=true;
+	  timeSinceSingu2++;
+	}
+      else
+	{
+	  if (singu2)
+	    {
+	      int toto=i-timeSinceSingu2;
+	      if (toto<0) 
+		cerr << "Stephane dit \"Toto\"" << endl;
+	      //traverse all the vertices of the singularity and average them
+	      Vec2r avP(0.0,0.0);
+	      for (j=i-timeSinceSingu2; j<i+1; j++)
+		avP=Vec2r(avP+_vertices[2*j+1]->point2d());
+	      avP=Vec2r(1.0/float(timeSinceSingu2+1)*avP);
+	      for (j=i-timeSinceSingu2; j<i+1; j++)
+		_vertices[2*j+1]->setPoint2d(avP);
+	      //_vertex[2*j+1]=_vertex[2*i+1];
+	      singu2=false; timeSinceSingu2=0;
+	    }
+	}	
+      i++;
+    }
+	
+  if (singu1)
+    {
+      //traverse all the vertices of the singularity and average them
+      Vec2r avP(0.0,0.0);
+      for (int j=i-timeSinceSingu1; j<i; j++)
+	avP=Vec2r(avP+_vertices[2*j]->point2d());
+      avP=Vec2r(1.0/float(timeSinceSingu1)*avP);
+      for (j=i-timeSinceSingu1; j<i; j++)
+	_vertices[2*j]->setPoint2d(avP);
+    }
+  if (singu2)
+    {
+      //traverse all the vertices of the singularity and average them
+      Vec2r avP(0.0,0.0);
+      for (j=i-timeSinceSingu2; j<i; j++)
+	avP=Vec2r(avP+_vertices[2*j+1]->point2d());
+      avP=Vec2r(1.0/float(timeSinceSingu2)*avP);
+      for (j=i-timeSinceSingu2; j<i; j++)
+	_vertices[2*j+1]->setPoint2d(avP);
+    }
+	
+
+  for (k=0; k<sizeStrip; k++)
+    if (notValid(_vertices[k]->point2d()))
+      {
+	cerr << "Warning: strip vertex " << k << " non valid after cleanup"<<endl;
+	return;
+      }
+}
+
+
+// Texture coordinates
+////////////////////////////////
+
+void
+Strip::computeTexCoord (const vector<StrokeVertex*>& iStrokeVertices)
+{
+  vector<StrokeVertex*>::const_iterator v ,vend;
+  StrokeVertex *sv;
+  int i=0;
+  for(v=iStrokeVertices.begin(), vend=iStrokeVertices.end();
+      v!=vend;	v++)
+    {
+      sv= (*v); 
+      _vertices[i]->setTexCoord(Vec2r((real)(sv->curvilinearAbscissa() / _averageThickness),0));
+      _vertices[i]->setColor(Vec3r(sv->attribute().getColor()[0],sv->attribute().getColor()[1],sv->attribute().getColor()[2]));
+      _vertices[i]->setAlpha(sv->attribute().getAlpha());
+      i++;
+      _vertices[i]->setTexCoord(Vec2r((real)(sv->curvilinearAbscissa() / _averageThickness),1));
+      _vertices[i]->setColor(Vec3r(sv->attribute().getColor()[0],sv->attribute().getColor()[1],sv->attribute().getColor()[2]));
+      _vertices[i]->setAlpha(sv->attribute().getAlpha());
+      i++;
+      //		cerr<<"col=("<<sv->attribute().getColor()[0]<<", "
+      //			<<sv->attribute().getColor()[1]<<", "<<sv->attribute().getColor()[2]<<")"<<endl;
+    }
+}
+
+void
+Strip::computeTexCoordWithTips (const vector<StrokeVertex*>& iStrokeVertices, bool tipBegin, bool tipEnd)
+{
+  unsigned int sizeStrip = _vertices.size()+8; //for the transition between the tip and the body
+  vector<StrokeVertex*>::const_iterator v ,vend;
+  StrokeVertex *sv;
+
+  v=iStrokeVertices.begin();
+  vend=iStrokeVertices.end();
+  float l=(*v)->strokeLength()/_averageThickness;
+  int tiles=int(l);
+  float fact=(float(tiles)+0.5)/l;
+  float uTip2=float(tiles)+0.25;
+  float u=0; 
+  float uPrev;
+  int i=0;
+  float t;
+  StrokeVertexRep *tvRep1, *tvRep2;
+
+  //		cerr<<"l="<<l<<"  tiles="<<tiles<<"    _averageThicnkess="
+  //			<<_averageThickness<<"    strokeLength="<<(*v)->strokeLength()<<endl;
+  //
+  vector<StrokeVertexRep*>::iterator currentSV = _vertices.begin();
+  StrokeVertexRep *svRep;
+  if(tipBegin){
+  for(;v!=vend; v++)
+    {
+      sv= (*v); 
+      svRep = *currentSV;
+      u=sv->curvilinearAbscissa()/_averageThickness*fact;
+      if (u>0.25) break;
+
+      
+      svRep->setTexCoord(Vec2r((real)u, 0.5));
+      svRep->setColor(Vec3r(sv->attribute().getColor()[0],sv->attribute().getColor()[1],sv->attribute().getColor()[2]));
+      svRep->setAlpha(sv->attribute().getAlpha());
+      i++;
+      ++currentSV;
+      
+      svRep = *currentSV;
+      svRep->setTexCoord(Vec2r((real)u, 1));
+      svRep->setColor(Vec3r(sv->attribute().getColor()[0],sv->attribute().getColor()[1],sv->attribute().getColor()[2]));
+      svRep->setAlpha(sv->attribute().getAlpha());
+      i++;
+      ++currentSV;
+      uPrev=u;
+    }
+  //first transition vertex
+  
+  if (fabs(u-uPrev)>ZERO)
+    t= (0.25-uPrev)/(u-uPrev);
+  else t=0;
+  //if (!tiles) t=0.5;
+  tvRep1 = new StrokeVertexRep(Vec2r((1-t)*_vertices[i-2]->point2d()+t*_vertices[i]->point2d()));
+  tvRep1->setTexCoord(Vec2r(0.25,0.5));
+  tvRep1->setColor(Vec3r((1-t)*_vertices[i-2]->color()+
+		  t*Vec3r(sv->attribute().getColor()[0],sv->attribute().getColor()[1],sv->attribute().getColor()[2])));
+  tvRep1->setAlpha((1-t)*_vertices[i-2]->alpha()+t*sv->attribute().getAlpha());
+  i++;
+  
+  tvRep2 = new StrokeVertexRep(Vec2r((1-t)*_vertices[i-2]->point2d()+t*_vertices[i]->point2d()));
+  tvRep2->setTexCoord(Vec2r(0.25,1));
+  tvRep2->setColor(Vec3r((1-t)*_vertices[i-2]->color()+
+		  t*Vec3r(sv->attribute().getColor()[0],sv->attribute().getColor()[1],sv->attribute().getColor()[2])));
+  tvRep2->setAlpha((1-t)*_vertices[i-2]->alpha()+t*sv->attribute().getAlpha());
+  i++;
+
+  currentSV = _vertices.insert(currentSV, tvRep1);
+  ++currentSV;
+  currentSV = _vertices.insert(currentSV, tvRep2);
+  ++currentSV;
+
+  //copy the vertices with different texture coordinates
+  tvRep1 = new StrokeVertexRep(_vertices[i-2]->point2d());
+  tvRep1->setTexCoord(Vec2r(0.25,0));
+  tvRep1->setColor(_vertices[i-2]->color());
+  tvRep1->setAlpha(_vertices[i-2]->alpha());
+  i++;
+
+  tvRep2 = new StrokeVertexRep(_vertices[i-2]->point2d());
+  tvRep2->setTexCoord(Vec2r(0.25,0.5));
+  tvRep2->setColor(_vertices[i-2]->color());
+  tvRep2->setAlpha(_vertices[i-2]->alpha());
+  i++;
+  
+  currentSV = _vertices.insert(currentSV, tvRep1);
+  ++currentSV;
+  currentSV = _vertices.insert(currentSV, tvRep2);
+  ++currentSV;
+  }
+  uPrev=0;
+
+  //body of the stroke
+  for(;v!=vend; v++)
+    {
+      sv= (*v); 
+      svRep = *currentSV;
+      u=sv->curvilinearAbscissa()/_averageThickness*fact-0.25;
+      if (u>tiles) break;
+
+      svRep->setTexCoord(Vec2r((real)u, 0));
+      svRep->setColor(Vec3r(sv->attribute().getColor()[0],sv->attribute().getColor()[1],sv->attribute().getColor()[2]));
+      svRep->setAlpha(sv->attribute().getAlpha());
+      i++;
+      ++currentSV;
+
+      svRep = *currentSV;
+      svRep->setTexCoord(Vec2r((real)u, 0.5));
+      svRep->setColor(Vec3r(sv->attribute().getColor()[0],sv->attribute().getColor()[1],sv->attribute().getColor()[2]));
+      svRep->setAlpha(sv->attribute().getAlpha());
+      i++;
+      ++currentSV;
+      
+      uPrev=u;
+    }
+  if(tipEnd){
+  //second transition vertex
+  if ((fabs(u-uPrev)>ZERO))
+    t= (float(tiles)-uPrev)/(u-uPrev);
+  else t=0;
+
+  tvRep1 = new StrokeVertexRep(Vec2r((1-t)*_vertices[i-2]->point2d()+t*_vertices[i]->point2d()));
+  tvRep1->setTexCoord(Vec2r((real)tiles,0));
+  tvRep1->setColor(Vec3r((1-t)*_vertices[i-2]->color()+
+		  t*Vec3r(sv->attribute().getColor()[0],sv->attribute().getColor()[1],sv->attribute().getColor()[2])));
+  tvRep1->setAlpha((1-t)*_vertices[i-2]->alpha()+t*sv->attribute().getAlpha());
+  i++;
+  
+  tvRep2 = new StrokeVertexRep(Vec2r((1-t)*_vertices[i-2]->point2d()+t*_vertices[i]->point2d()));
+  tvRep2->setTexCoord(Vec2r((real)tiles,0.5));
+  tvRep2->setColor(Vec3r((1-t)*_vertices[i-2]->color()+
+		  t*Vec3r(sv->attribute().getColor()[0],sv->attribute().getColor()[1],sv->attribute().getColor()[2])));
+  tvRep2->setAlpha((1-t)*_vertices[i-2]->alpha()+t*sv->attribute().getAlpha());
+  i++;
+
+  currentSV = _vertices.insert(currentSV, tvRep1);
+  ++currentSV;
+  currentSV = _vertices.insert(currentSV, tvRep2);
+  ++currentSV;
+
+  //copy the vertices with different texture coordinates
+  tvRep1 = new StrokeVertexRep(_vertices[i-2]->point2d());
+  tvRep1->setTexCoord(Vec2r(0.75,0.5));
+  tvRep1->setColor(_vertices[i-2]->color());
+  tvRep1->setAlpha(_vertices[i-2]->alpha());
+  i++;
+
+  tvRep2 = new StrokeVertexRep(_vertices[i-2]->point2d());
+  tvRep2->setTexCoord(Vec2r(0.75,1));
+  tvRep2->setColor(_vertices[i-2]->color());
+  tvRep2->setAlpha(_vertices[i-2]->alpha());
+  i++;
+  
+  currentSV = _vertices.insert(currentSV, tvRep1);
+  ++currentSV;
+  currentSV = _vertices.insert(currentSV, tvRep2);
+  ++currentSV;
+
+  //end tip
+  for(;v!=vend; v++)
+    {
+      sv= (*v); 
+      svRep = *currentSV;
+      u=0.75+sv->curvilinearAbscissa()/_averageThickness*fact-float(tiles)-0.25;
+      
+      svRep->setTexCoord(Vec2r((real)u, 0.5));
+      svRep->setColor(Vec3r(sv->attribute().getColor()[0],sv->attribute().getColor()[1],sv->attribute().getColor()[2]));
+      svRep->setAlpha(sv->attribute().getAlpha());
+      i++;
+      ++currentSV;
+      
+      svRep = *currentSV;
+      svRep->setTexCoord(Vec2r((real)u, 1));
+      svRep->setColor(Vec3r(sv->attribute().getColor()[0],sv->attribute().getColor()[1],sv->attribute().getColor()[2]));
+      svRep->setAlpha(sv->attribute().getAlpha());
+      i++;
+      ++currentSV;
+    }
+  }
+  //cerr<<"u="<<u<<"    i="<<i<<"/"<<_sizeStrip<<endl;;
+
+  //  for (i=0; i<_sizeStrip; i++)
+  //    _alpha[i]=1.0;
+
+  //	for (i=0; i<_sizeStrip; i++)
+  //			cerr<<"("<<_texCoord[i][0]<<", "<<_texCoord[i][1]<<") ";
+  //	cerr<<endl;
+
+  
+  //  Vec2r vec_tmp;
+  //  for (i=0; i<_sizeStrip/2; i++)
+  //    vec_tmp = _vertex[2*i] - _vertex[2*i+1];
+  //    if (vec_tmp.norm() > 4*_averageThickness)
+  //      cerr << "Warning (from Fredo): There is a pb in the texture coordinates computation" << endl;
+}
+
+//
+// StrokeRep
+/////////////////////////////////////
+
+StrokeRep::StrokeRep()
+{
+  _stroke = 0;
+  _strokeType=Stroke::OPAQUE_MEDIUM;
+  TextureManager * ptm = TextureManager::getInstance();
+  if(ptm)
+    _textureId = ptm->getDefaultTextureId();
+  // _averageTextureAlpha=0.5; //default value
+  // if (_strokeType==OIL_STROKE)
+    // _averageTextureAlpha=0.75; 
+  // if (_strokeType>=NO_BLEND_STROKE)
+    // _averageTextureAlpha=1.0
+} 
+
+StrokeRep::StrokeRep(Stroke *iStroke)
+{
+  _stroke = iStroke;
+  _strokeType = iStroke->getMediumType();
+  _textureId = iStroke->getTextureId();
+  if(_textureId == 0){
+    TextureManager * ptm = TextureManager::getInstance();
+    if(ptm)
+      _textureId = ptm->getDefaultTextureId();
+  }
+    
+  // _averageTextureAlpha=0.5; //default value
+  // if (_strokeType==OIL_STROKE)
+    // _averageTextureAlpha=0.75; 
+  // if (_strokeType>=NO_BLEND_STROKE)
+    // _averageTextureAlpha=1.0;
+  create();
+}
+
+StrokeRep::StrokeRep(const StrokeRep& iBrother)
+{
+  int i=0;
+  _stroke = iBrother._stroke;
+  _strokeType=iBrother._strokeType;
+  _textureId = iBrother._textureId;
+  for(vector<Strip*>::const_iterator s=iBrother._strips.begin(), send=iBrother._strips.end();
+  s!=send;
+  ++s){
+    _strips.push_back(new Strip(**s));
+  }
+}
+
+
+StrokeRep::~StrokeRep()
+{
+  if(!_strips.empty()){
+    for(vector<Strip*>::iterator s=_strips.begin(), send=_strips.end();
+    s!=send;
+    ++s){
+      delete (*s);
+    }
+    _strips.clear();
+  }
+}
+
+void StrokeRep::create(){
+  vector<StrokeVertex*> strip;
+  StrokeInternal::StrokeVertexIterator v = _stroke->strokeVerticesBegin();
+  StrokeInternal::StrokeVertexIterator vend = _stroke->strokeVerticesEnd();
+  
+  bool first=true;
+  bool end=false;
+  while(v!=vend){
+    while((v!=vend) && (!(*v).attribute().isVisible())){
+      ++v;
+      first = false;
+    }
+    while( (v!=vend) && ((*v).attribute().isVisible()) ) {
+      strip.push_back(&(*v));
+      ++v;
+    }
+    if(v!=vend){
+      // add the last vertex and create
+      strip.push_back(&(*v));
+    }else{
+      end=true;
+    }
+    if((!strip.empty()) && (strip.size()>1) ){
+      _strips.push_back(new Strip(strip, _stroke->hasTips(), first, end));
+      strip.clear();
+    }
+    first = false;
+  }
+} 
+
+void StrokeRep::Render(const StrokeRenderer *iRenderer)
+{
+  iRenderer->RenderStrokeRep(this);
+}
+
+
+
diff --git a/extern/freestyle/src/stroke/StrokeRep.h b/extern/freestyle/src/stroke/StrokeRep.h
new file mode 100755
index 00000000000..129769e5489
--- /dev/null
+++ b/extern/freestyle/src/stroke/StrokeRep.h
@@ -0,0 +1,138 @@
+//
+//  Filename         : StrokeRep.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Class to define the representation of a stroke
+//                     (for display purpose)
+//  Date of creation : 05/03/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  STROKEREP_H
+# define STROKEREP_H
+
+# include "../geometry/Geom.h"
+using namespace Geometry;
+
+//symbolic constant to call the appropriate renderers and textures
+// # define NO_TEXTURE_WITH_BLEND_STROKE	-2
+// # define NO_TEXTURE_STROKE		-1
+// # define PSEUDO_CHARCOAL_STROKE		0
+// # define WASH_BRUSH_STROKE		1
+// # define OIL_STROKE			2
+// # define NO_BLEND_STROKE		3
+// # define CHARCOAL_MIN_STROKE		4
+// # define BRUSH_MIN_STROKE		5
+// # define OPAQUE_DRY_STROKE		6
+// # define OPAQUE_STROKE			7
+// 
+// # define DEFAULT_STROKE			0
+// 
+// # define NUMBER_STROKE_RENDERER		8
+
+#include "Stroke.h"
+
+class StrokeVertexRep{
+public:
+  StrokeVertexRep(){}
+  StrokeVertexRep(const Vec2r& iPoint2d){_point2d=iPoint2d;}
+  StrokeVertexRep(const StrokeVertexRep& iBrother);
+  virtual ~StrokeVertexRep(){}
+
+  inline Vec2r& point2d() {return _point2d;}
+  inline Vec2r& texCoord() {return _texCoord;}
+  inline Vec3r& color() {return _color;}
+  inline float alpha() {return _alpha;}
+
+  inline void setPoint2d(const Vec2r& p){_point2d = p;}
+  inline void setTexCoord(const Vec2r& p){_texCoord = p;}
+  inline void setColor(const Vec3r& p){_color = p;}
+  inline void setAlpha(float a){_alpha = a;}
+protected:
+  Vec2r _point2d;
+  Vec2r _texCoord;
+  Vec3r _color;
+  float _alpha;
+};
+
+class Strip{
+public: 
+  typedef std::vector<StrokeVertexRep*> vertex_container;
+protected:
+  vertex_container _vertices;
+  float _averageThickness;
+
+
+public:
+  Strip(const std::vector<StrokeVertex*>& iStrokeVertices, bool hasTips=false, bool tipBegin=false, bool tipEnd=false) ;
+  Strip(const Strip& iBrother);
+  virtual ~Strip() ;
+
+protected:
+  void createStrip(const std::vector<StrokeVertex*>& iStrokeVertices);
+  void cleanUpSingularities(const std::vector<StrokeVertex*>& iStrokeVertices);
+  void computeTexCoord (const std::vector<StrokeVertex*>& iStrokeVertices);
+  void computeTexCoordWithTips (const std::vector<StrokeVertex*>& iStrokeVertices, bool tipBegin, bool tipEnd);
+public:
+  inline int sizeStrip() const {return _vertices.size();}
+  inline vertex_container& vertices() {return _vertices;}
+};
+
+class StrokeRep
+{
+protected:
+  Stroke *_stroke;
+  vector<Strip*> _strips;
+  Stroke::MediumType _strokeType;
+  unsigned int _textureId;
+
+  // float _averageTextureAlpha;
+  
+
+public:
+  StrokeRep();
+  StrokeRep(const StrokeRep&);
+  StrokeRep(Stroke *iStroke);
+  virtual ~StrokeRep();
+
+  /*! Creates the strips */
+  virtual void create() ;
+  
+  /*! Renders the stroke using a Renderer */
+  virtual void Render(const StrokeRenderer *iRenderer) ;
+
+  /*! accessors */
+  inline Stroke::MediumType getMediumType() const {return _strokeType;}
+  inline unsigned getTextureId() const {return _textureId;}
+  inline vector<Strip*>& getStrips() {return _strips;}
+  inline unsigned int getNumberOfStrips() const {return _strips.size();}
+  inline Stroke * getStroke() {return _stroke;}
+ 
+  /*! modifiers */
+  inline void setMediumType(Stroke::MediumType itype) {_strokeType=itype;}
+  inline void SetTextureId(unsigned textureId) {_textureId = textureId;}
+
+  
+};
+
+#endif // STROKEREP_H
diff --git a/extern/freestyle/src/stroke/StrokeShader.h b/extern/freestyle/src/stroke/StrokeShader.h
new file mode 100755
index 00000000000..fa1289f6e0f
--- /dev/null
+++ b/extern/freestyle/src/stroke/StrokeShader.h
@@ -0,0 +1,119 @@
+//
+//  Filename         : StrokeShader.h
+//  Author(s)        : Stephane Grabli, Emmanuel Turquin
+//  Purpose          : Class defining StrokeShader
+//  Date of creation : 01/07/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  SHADERS_H
+# define SHADERS_H
+
+# include <iostream>
+# include <vector>
+
+//
+//  StrokeShader base class
+//
+//////////////////////////////////////////////////////
+
+class Stroke;
+/*! Base class for Stroke Shaders.
+ *  Any Stroke Shader must inherit from
+ *  this class and overload the shade() method.
+ *  A StrokeShader is designed to modify any
+ *  Stroke's attribute such as Thickness, Color,
+ *  Geometry, Texture, Blending mode...
+ *  The basic way to achieve this operation consists
+ *  in iterating over the StrokeVertices of the Stroke
+ *  and to modify each one's StrokeAttribute.
+ *  Here is a python code example of such an iteration:
+ *  \code
+ *  it = ioStroke.strokeVerticesBegin()
+ *  while it.isEnd() == 0:
+ *      att = it.getObject().attribute()
+ *      ## perform here any attribute modification
+ *      it.increment()
+ *  \endcode
+ *  Here is a C++ code example of such an iteration:
+ *  \code
+ *  for(StrokeInternal::StrokeVertexIterator v=ioStroke.strokeVerticesBegin(), vend=ioStroke.strokeVerticesEnd();
+ *	v!=vend;
+ *	++v){
+ *    StrokeAttribute& att = v->attribute();
+ *    // perform any attribute modification here...
+ *  }
+ *  \endcode
+ */
+class LIB_STROKE_EXPORT StrokeShader
+{
+public:
+  /*! Default constructor. */
+  StrokeShader() {}
+  /*! Destructor. */
+  virtual ~StrokeShader() {}
+  /*! Returns the string corresponding to the
+   *  shader's name.
+   */
+  virtual string getName() const {
+    return "StrokeShader";
+  }
+  /*! The shading method. This method must
+   *  be overloaded by inherited classes.
+   *  The shading method is designed to modify any
+   *  Stroke's attribute such as Thickness, Color,
+   *  Geometry, Texture, Blending mode...
+   *  The basic way to achieve this operation consists
+   *  in iterating over the StrokeVertices of the Stroke
+   *  and to modify each one's StrokeAttribute.
+   *  Here is a python code example of such an iteration:
+   *  \code
+   *  it = ioStroke.strokeVerticesBegin()
+   *  while it.isEnd() == 0:
+   *      att = it.getObject().attribute()
+   *      ## perform here any attribute modification
+   *      it.increment()
+   *  \endcode
+   *  Here is a C++ code example of such an iteration:
+   *  \code
+   *  for(StrokeInternal::StrokeVertexIterator v=ioStroke.strokeVerticesBegin(), vend=ioStroke.strokeVerticesEnd();
+   *	v!=vend;
+   *	++v){
+   *    StrokeAttribute& att = v->attribute();
+   *    // perform any attribute modification here...
+   *  }
+   *  \endcode
+   *  \param ioStroke
+   *    The stroke we wish to shade. this Stroke
+   *    is modified by the Shader (which typically
+   *    modifies the Stroke's attribute's values such
+   *    as Color, Thickness, Geometry...)
+   */
+  virtual void shade(Stroke& ioStroke) const {
+    cerr << "Warning: method shade() not implemented" << endl;
+  }
+
+};
+
+# endif // SHADERS_H
diff --git a/extern/freestyle/src/stroke/StrokeTesselator.cpp b/extern/freestyle/src/stroke/StrokeTesselator.cpp
new file mode 100755
index 00000000000..6d0f5aa847c
--- /dev/null
+++ b/extern/freestyle/src/stroke/StrokeTesselator.cpp
@@ -0,0 +1,88 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "../scene_graph/OrientedLineRep.h"
+#include "../scene_graph/NodeGroup.h"
+#include "../scene_graph/NodeShape.h"
+#include "StrokeTesselator.h"
+#include "StrokeAdvancedIterators.h"
+
+LineRep* StrokeTesselator::Tesselate(Stroke *iStroke)
+{
+  if(0 == iStroke)
+    return 0;
+
+  LineRep* line;
+  line = new OrientedLineRep();
+  
+  Stroke::vertex_iterator v,vend;
+  if(2 == iStroke->vertices_size())
+  {
+    line->SetStyle(LineRep::LINES);
+    v = iStroke->vertices_begin();
+    StrokeVertex *svA= (*v);
+    v++;
+    StrokeVertex *svB = (*v);
+    Vec3r A((*svA)[0], (*svA)[1], 0);
+    Vec3r B((*svB)[0], (*svB)[1], 0);
+    line->AddVertex(A);
+    line->AddVertex(B);
+  }
+  else
+  {
+    if(_overloadMaterial)
+      line->SetMaterial(_Material);
+
+    line->SetStyle(LineRep::LINE_STRIP);
+
+    for(v=iStroke->vertices_begin(), vend=iStroke->vertices_end();
+    v!=vend;
+    v++)
+    {
+      StrokeVertex *sv= (*v);
+      Vec3r V((*sv)[0], (*sv)[1], 0);
+      line->AddVertex(V);         
+    } 
+  }
+  line->SetId(iStroke->getId());
+  line->ComputeBBox();
+
+  return line;
+}
+
+template<class StrokeVertexIterator>
+NodeGroup* StrokeTesselator::Tesselate(StrokeVertexIterator begin, StrokeVertexIterator end) 
+{
+  NodeGroup *group = new NodeGroup;
+  NodeShape *tshape = new NodeShape;
+  group->AddChild(tshape);
+  //tshape->material().SetDiffuse(0.f, 0.f, 0.f, 1.f);
+  tshape->SetMaterial(_Material);
+
+  for(StrokeVertexIterator c=begin, cend=end;
+  c!=cend;
+  c++)
+  {  
+      tshape->AddRep(Tesselate((*c)));
+  }
+  
+  return group;
+}
diff --git a/extern/freestyle/src/stroke/StrokeTesselator.h b/extern/freestyle/src/stroke/StrokeTesselator.h
new file mode 100755
index 00000000000..767d82d3d98
--- /dev/null
+++ b/extern/freestyle/src/stroke/StrokeTesselator.h
@@ -0,0 +1,67 @@
+//
+//  Filename         : StrokeTesselator.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Class to build a Node Tree designed to be displayed 
+//                     from a set of strokes structure.
+//  Date of creation : 26/03/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  STROKETESSELATOR_H
+# define STROKETESSELATOR_H
+
+# include "../scene_graph/LineRep.h"
+# include "Stroke.h"
+
+class StrokeTesselator
+{
+public:
+
+  inline StrokeTesselator() {_Material.SetDiffuse(0,0,0,1);_overloadMaterial=false;}
+  virtual ~StrokeTesselator() {}
+
+  /*! Builds a line rep contained from a Stroke
+   */
+  LineRep* Tesselate(Stroke* iStroke) ;
+
+  /*! Builds a set of lines rep contained under a 
+   *  a NodeShape, itself contained under a NodeGroup from a 
+   *  set of strokes
+   */
+  template<class StrokeIterator>
+  NodeGroup* Tesselate(StrokeIterator begin, StrokeIterator end) ;
+
+  
+  
+  inline void SetMaterial(const Material& iMaterial) {_Material=iMaterial;_overloadMaterial=true;}
+  inline const Material& material() const {return _Material;}
+
+private:
+
+  Material _Material;
+  bool _overloadMaterial;
+};
+
+#endif // STROKETESSELATOR_H
+
diff --git a/extern/freestyle/src/stroke/StyleModule.h b/extern/freestyle/src/stroke/StyleModule.h
new file mode 100755
index 00000000000..3d39e53515b
--- /dev/null
+++ b/extern/freestyle/src/stroke/StyleModule.h
@@ -0,0 +1,144 @@
+//
+//  Filename         : StyleModule.h
+//  Author(s)        : Stephane Grabli, Emmanuel Turquin
+//  Purpose          : Class representing a style module
+//  Date of creation : 01/07/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  STYLE_MODULE_H
+# define STYLE_MODULE_H
+
+# include <iostream>
+# include <string>
+# include "../system/StringUtils.h"
+# include "StrokeLayer.h"
+# include "../system/Interpreter.h"
+# include "Operators.h"
+# include "StrokeShader.h"
+
+using namespace std;
+
+class StyleModule
+{
+public:
+
+  StyleModule(const string& file_name,
+	      Interpreter* inter) : _file_name(file_name) {
+    _always_refresh = false;
+    _causal = false;
+    _drawable = true;
+    _modified = true;
+    _displayed = true;
+    _inter = inter;
+  }
+
+  ~StyleModule() {}
+
+  StrokeLayer* execute() {
+    if (!_inter) {
+      cerr << "Error: no interpreter was found to execute the script" << endl;
+      return NULL;
+    }
+    Operators::reset();
+    if (_inter->interpretFile(_file_name))
+      return NULL;
+    Operators::StrokesContainer* strokes_set = Operators::getStrokesSet();
+    if (!_drawable || strokes_set->empty())
+      return NULL;
+    StrokeLayer* sl = new StrokeLayer;
+    for (Operators::StrokesContainer::iterator it = strokes_set->begin();
+	 it != strokes_set->end();
+	 ++it)
+      sl->AddStroke(*it);
+
+   return sl;
+  }
+
+  // accessors
+
+  const string getFileName() const {
+    return _file_name;
+  }
+
+  bool getAlwaysRefresh() const {
+    return _always_refresh;
+  }
+
+  bool getCausal() const {
+    return _causal;
+  }
+
+  bool getDrawable() const {
+    return _drawable;
+  }
+
+  bool getModified() const {
+    return _modified;
+  }
+
+ bool getDisplayed() const {
+    return _displayed;
+  }
+
+  // modifiers
+
+  void setFileName(const string& file_name) {
+    _file_name = file_name;
+  }
+
+  void setAlwaysRefresh(bool b = true) {
+    _always_refresh = b;
+  }
+
+  void setCausal(bool b = true) {
+    _causal = b;
+  }
+
+  void setDrawable(bool b = true) {
+    _drawable = b;
+  }
+
+  void setModified(bool b = true) {
+    if (_always_refresh)
+      return;
+    _modified = b;
+  }
+
+  void setDisplayed(bool b = true) {
+    _displayed = b;
+  }
+
+private:
+
+  string	_file_name;
+  bool		_always_refresh;
+  bool		_causal;
+  bool		_drawable;
+  bool		_modified;
+  bool		_displayed;
+  Interpreter*	_inter;
+};
+
+#endif // STYLE_MODULE_H
diff --git a/extern/freestyle/src/stroke/TextStrokeRenderer.cpp b/extern/freestyle/src/stroke/TextStrokeRenderer.cpp
new file mode 100755
index 00000000000..ea5af287bbe
--- /dev/null
+++ b/extern/freestyle/src/stroke/TextStrokeRenderer.cpp
@@ -0,0 +1,73 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+# include "TextStrokeRenderer.h"
+# include "Canvas.h"
+# include "StrokeIterators.h"
+
+TextStrokeRenderer::TextStrokeRenderer(const char* iFileName)
+:StrokeRenderer(){
+  if(!iFileName)
+    iFileName = "freestyle.txt";
+  // open the stream:
+  _ofstream.open(iFileName, ios::out);
+  if(!_ofstream.is_open()){
+    cerr << "couldn't open the output file " << iFileName << endl;
+  }
+  _ofstream << "%!FREESTYLE" << endl;
+  _ofstream << "%Creator: Freestyle (http://artis.imag.fr/Software/Freestyle)" << endl;
+  // Bounding box
+  _ofstream << 0 << " "<< 0 << " " << Canvas::getInstance()->width() << " " << Canvas::getInstance()->height() << endl;
+  _ofstream << "%u x y z tleft tright r g b ..." << endl;
+}
+
+TextStrokeRenderer::~TextStrokeRenderer(){
+  Close();
+}
+
+void TextStrokeRenderer::RenderStrokeRep(StrokeRep *iStrokeRep) const{
+  RenderStrokeRepBasic(iStrokeRep);
+}
+
+void TextStrokeRenderer::RenderStrokeRepBasic(StrokeRep *iStrokeRep) const{
+  Stroke *stroke = iStrokeRep->getStroke();
+  if(!stroke){
+    cerr << "no stroke associated with Rep" << endl;
+    return;
+  }
+    
+  StrokeInternal::StrokeVertexIterator v = stroke->strokeVerticesBegin();
+  StrokeAttribute att;
+  while(!v.isEnd()){
+    att = v->attribute();
+    _ofstream << v->u() << " " << v->getProjectedX() << " " << v->getProjectedY() << " " << v->getProjectedZ() << " " \
+      << att.getThicknessL() << " " << att.getThicknessR() << " " \
+      << att.getColorR() << " " << att.getColorG() << " " << att.getColorB() << " ";
+    ++v;
+  }
+  _ofstream << endl;
+}
+
+void TextStrokeRenderer::Close(){
+  if(_ofstream.is_open())
+    _ofstream.close();
+}
+
diff --git a/extern/freestyle/src/stroke/TextStrokeRenderer.h b/extern/freestyle/src/stroke/TextStrokeRenderer.h
new file mode 100755
index 00000000000..ef610d63bdd
--- /dev/null
+++ b/extern/freestyle/src/stroke/TextStrokeRenderer.h
@@ -0,0 +1,68 @@
+//
+//  Filename         : TextStrokeRenderer.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Class to define the text rendering of a stroke
+//                     Format:
+//                     x y width height // bbox
+//                     //list of vertices : 
+//                     t x y z t1 t2 r g b alpha ...
+//                      ...
+//  Date of creation : 01/14/2005
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  TEXTSTROKERENDERER_H
+# define TEXTSTROKERENDERER_H
+
+# include "../system/FreestyleConfig.h"
+# include "StrokeRenderer.h"
+# include <fstream>
+
+/**********************************/
+/*                                */
+/*                                */
+/*         TextStrokeRenderer       */
+/*                                */
+/*                                */
+/**********************************/
+
+class LIB_STROKE_EXPORT TextStrokeRenderer : public StrokeRenderer
+{
+public:
+  TextStrokeRenderer(const char * iFileName = 0);
+  virtual ~TextStrokeRenderer();
+
+  /*! Renders a stroke rep */
+  virtual void RenderStrokeRep(StrokeRep *iStrokeRep) const;
+  virtual void RenderStrokeRepBasic(StrokeRep *iStrokeRep) const;
+
+  /*! Closes the output file */
+  void Close();
+
+protected:
+  mutable ofstream _ofstream;
+};
+
+#endif // TEXTSTROKERENDERER_H
+
diff --git a/extern/freestyle/src/stroke/src.pri b/extern/freestyle/src/stroke/src.pri
new file mode 100755
index 00000000000..09707f86dbc
--- /dev/null
+++ b/extern/freestyle/src/stroke/src.pri
@@ -0,0 +1,54 @@
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#			      W A R N I N G ! ! !                             #
+#             a u t h o r i z e d    p e r s o n a l    o n l y               #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+
+STROKE_DIR = ../stroke
+
+SOURCES *= $${STROKE_DIR}/AdvancedFunctions0D.cpp \
+           $${STROKE_DIR}/AdvancedFunctions1D.cpp \
+           $${STROKE_DIR}/AdvancedStrokeShaders.cpp \
+           $${STROKE_DIR}/BasicStrokeShaders.cpp \
+           $${STROKE_DIR}/Canvas.cpp \
+	   $${STROKE_DIR}/Chain.cpp \
+           $${STROKE_DIR}/ChainingIterators.cpp \
+           $${STROKE_DIR}/ContextFunctions.cpp \
+           $${STROKE_DIR}/Operators.cpp \
+           $${STROKE_DIR}/PSStrokeRenderer.cpp \
+	   $${STROKE_DIR}/Stroke.cpp \
+	   $${STROKE_DIR}/StrokeIO.cpp \			       
+	   $${STROKE_DIR}/StrokeLayer.cpp \		       
+	   $${STROKE_DIR}/StrokeRenderer.cpp \		       
+	   $${STROKE_DIR}/StrokeRep.cpp \
+	   $${STROKE_DIR}/StrokeTesselator.cpp \
+	   $${STROKE_DIR}/TextStrokeRenderer.cpp \
+           $${STROKE_DIR}/Curve.cpp 
+
+HEADERS *= $${STROKE_DIR}/AdvancedFunctions0D.h \
+           $${STROKE_DIR}/AdvancedFunctions1D.h \
+           $${STROKE_DIR}/AdvancedPredicates1D.h \
+           $${STROKE_DIR}/AdvancedStrokeShaders.h \
+           $${STROKE_DIR}/BasicStrokeShaders.h \
+	   $${STROKE_DIR}/Canvas.h \			       
+	   $${STROKE_DIR}/Chain.h \			       
+	   $${STROKE_DIR}/ChainingIterators.h \
+           $${STROKE_DIR}/ContextFunctions.h \
+	   $${STROKE_DIR}/Curve.h \
+           $${STROKE_DIR}/CurveIterators.h \
+           $${STROKE_DIR}/CurveAdvancedIterators.h \
+           $${STROKE_DIR}/Module.h \
+           $${STROKE_DIR}/Operators.h \
+	   $${STROKE_DIR}/Predicates1D.h \
+           $${STROKE_DIR}/Predicates0D.h \
+           $${STROKE_DIR}/PSStrokeRenderer.h \
+	   $${STROKE_DIR}/Stroke.h \
+	   $${STROKE_DIR}/StrokeIO.h \			       
+           $${STROKE_DIR}/StrokeIterators.h \
+           $${STROKE_DIR}/StrokeAdvancedIterators.h \
+	   $${STROKE_DIR}/StrokeShader.h \			       
+	   $${STROKE_DIR}/StrokeLayer.h \		       
+	   $${STROKE_DIR}/StrokeRenderer.h \		       
+	   $${STROKE_DIR}/StrokeRep.h \ 
+	   $${STROKE_DIR}/StrokeTesselator.h \
+	   $${STROKE_DIR}/StyleModule.h \
+	   $${STROKE_DIR}/TextStrokeRenderer.h
diff --git a/extern/freestyle/src/stroke/stroke.pro b/extern/freestyle/src/stroke/stroke.pro
new file mode 100755
index 00000000000..90c0cc96592
--- /dev/null
+++ b/extern/freestyle/src/stroke/stroke.pro
@@ -0,0 +1,89 @@
+# This file should be viewed as a -*- mode: Makefile -*-
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#			      W A R N I N G ! ! !                             #
+#             a u t h o r i z e d    p e r s o n a l    o n l y               #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+
+include(../Config.pri)
+
+TEMPLATE        = lib
+
+TARGET          = $${LIB_STROKE}
+VERSION         = $${APPVERSION}
+TARGET_VERSION_EXT = $${APPVERSION_MAJ}.$${APPVERSION_MID}
+
+#
+# CONFIG
+#
+#######################################
+
+CONFIG          *= dll
+
+#
+# DEFINES
+#
+#######################################
+
+win32:DEFINES           *= MAKE_LIB_STROKE_DLL
+
+#
+# INCLUDE PATH
+#
+#######################################
+
+#INCLUDEPATH     *= ../geometry ../image ../system ../view_map \
+#                   ../winged_edge ../scene_graph
+
+#
+# BUILD DIRECTORIES
+#
+#######################################
+
+BUILD_DIR       = ../../build
+
+OBJECTS_DIR     = $${BUILD_DIR}/$${REL_OBJECTS_DIR}
+!win32:DESTDIR  = $${BUILD_DIR}/$${REL_DESTDIR}/lib
+win32:DESTDIR   = $${BUILD_DIR}/$${REL_DESTDIR}
+
+#
+# LIBS
+#
+#######################################
+
+win32:LIBS              *= $${DESTDIR}/$${LIB_GEOMETRY}$${LIBVERSION}.lib \
+                           $${DESTDIR}/$${LIB_IMAGE}$${LIBVERSION}.lib \
+                           $${DESTDIR}/$${LIB_SCENE_GRAPH}$${LIBVERSION}.lib \
+                           $${DESTDIR}/$${LIB_SYSTEM}$${LIBVERSION}.lib \
+                           $${DESTDIR}/$${LIB_WINGED_EDGE}$${LIBVERSION}.lib \
+                           $${DESTDIR}/$${LIB_VIEW_MAP}$${LIBVERSION}.lib
+
+!win32 {
+  lib_bundle {
+    LIBS += -F$${DESTDIR} -framework $${LIB_GEOMETRY} -framework $${LIB_IMAGE} -framework $${LIB_SCENE_GRAPH} -framework $${LIB_SYSTEM} -framework $${LIB_WINGED_EDGE} -framework $${LIB_VIEW_MAP}
+  } else {
+    LIBS *= -L$${DESTDIR} -l$${LIB_GEOMETRY} -l$${LIB_IMAGE} -l$${LIB_SCENE_GRAPH} \
+                   -l$${LIB_SYSTEM} -l$${LIB_WINGED_EDGE} -l$${LIB_VIEW_MAP}
+  }
+}
+
+#
+# INSTALL
+#
+#######################################
+
+LIB_DIR       = ../../lib
+# install library
+target.path   = $$LIB_DIR
+# "make install" configuration options
+INSTALLS     += target
+
+#
+# SOURCES & HEADERS
+#
+#######################################
+
+
+!static {
+  include(src.pri)
+}
diff --git a/extern/freestyle/src/swig/Freestyle.i b/extern/freestyle/src/swig/Freestyle.i
new file mode 100755
index 00000000000..37daddc4e11
--- /dev/null
+++ b/extern/freestyle/src/swig/Freestyle.i
@@ -0,0 +1,283 @@
+//
+//  FileName         : Freestyle.i
+//  Author           : Emmanuel Turquin
+//  Purpose          : SWIG file used to generate Python binding
+//  Date Of Creation : 18/07/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+
+%module(directors="1") Freestyle
+%{
+ #include "../system/Cast.h"
+ #include "../stroke/Module.h"
+ #include "../system/Precision.h"
+ #include "../system/Id.h"
+ #include "../geometry/VecMat.h"
+ #include "../geometry/Geom.h"
+ #include "../geometry/Noise.h"
+ #include "../scene_graph/Material.h"
+ #include "../winged_edge/Nature.h"
+ #include "../view_map/Interface0D.h"
+ #include "../view_map/Interface1D.h"
+ #include "../view_map/Functions0D.h"
+ #include "../view_map/Functions1D.h"
+ #include "../view_map/Silhouette.h"
+ #include "../view_map/ViewMap.h"
+ #include "../view_map/ViewMapIterators.h"
+ #include "../stroke/AdvancedFunctions0D.h"
+ #include "../stroke/AdvancedFunctions1D.h"
+ #include "../stroke/ChainingIterators.h"
+ #include "../stroke/ContextFunctions.h"
+ #include "../stroke/Predicates0D.h"
+ #include "../stroke/Predicates1D.h"
+ #include "../stroke/AdvancedPredicates1D.h"
+ #include "../stroke/StrokeShader.h"
+// #include "../stroke/Curve.h"
+ #include "../stroke/CurveIterators.h"       
+ #include "../stroke/Stroke.h"
+ #include "../stroke/StrokeIterators.h"
+ #include "../stroke/BasicStrokeShaders.h"
+ #include "../stroke/AdvancedStrokeShaders.h"
+ #include "../stroke/Operators.h"
+ #include "../stroke/Canvas.h"
+%}
+
+%include "stl.i"
+%template(vectorInt)   std::vector<int>;
+
+#ifdef SWIG
+# define LIB_GEOMETRY_EXPORT
+# define LIB_VIEW_MAP_EXPORT
+# define LIB_STROKE_EXPORT
+# define LIB_GEOMETRY_EXPORT
+#endif // SWIG
+
+// Generic exception handler
+%exception {
+    try {
+        $action
+    }
+//    catch (Swig::DirectorTypeMismatch&) {
+//      cout << "Warning: return type mismatch" << endl;
+//    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+}
+
+// Precision
+%include "../system/Precision.h"
+
+// Id
+%include "../system/Id.h"
+
+// Vec
+%include "../geometry/VecMat.h"
+
+%template(Vec_2u)   VecMat::Vec<unsigned,2>;
+%template(Vec_2i)   VecMat::Vec<int,2>;
+%template(Vec_2d)   VecMat::Vec<double,2>;
+%template(Vec_2f)   VecMat::Vec<float,2>;
+
+%template(Vec2u)	VecMat::Vec2<unsigned>;
+%template(Vec2i)	VecMat::Vec2<int>;
+%template(Vec2f)	VecMat::Vec2<float>;
+%template(Vec2d)	VecMat::Vec2<double>;
+
+%template(Vec_3u)   VecMat::Vec<unsigned,3>;
+%template(Vec_3i)   VecMat::Vec<int,3>;
+%template(Vec_3d)   VecMat::Vec<double,3>;
+%template(Vec_3f)   VecMat::Vec<float,3>;
+
+%template(Vec3u)	VecMat::Vec3<unsigned>;
+%template(Vec3i)	VecMat::Vec3<int>;
+%template(Vec3f)	VecMat::Vec3<float>;
+%template(Vec3d)	VecMat::Vec3<double>;
+
+//%template(HVec3u) VecMat::HVec3<unsigned>;
+//%template(HVec3i) VecMat::HVec3<int>;
+//%template(HVec3f) VecMat::HVec3<float>;
+//%template(HVec3d) VecMat::HVec3<double>;
+//%template(HVec3r) VecMat::HVec3<real>;
+
+//%template(Matrix22u) VecMat::SquareMatrix<unsigned, 2>;
+//%template(Matrix22i) VecMat::SquareMatrix<int, 2>;
+//%template(Matrix22f) VecMat::SquareMatrix<float, 2>;
+//%template(Matrix22d) VecMat::SquareMatrix<double, 2>;
+
+//%template(Matrix22r) VecMat::SquareMatrix<real, 2>;
+//%template(Matrix33u) VecMat::SquareMatrix<unsigned, 3>;
+//%template(Matrix33i) VecMat::SquareMatrix<int, 3>;
+//%template(Matrix33f) VecMat::SquareMatrix<float, 3>;
+//%template(Matrix33d) VecMat::SquareMatrix<double, 3>;
+//%template(Matrix33r) VecMat::SquareMatrix<real, 3>;
+
+//%template(Matrix44u) VecMat::SquareMatrix<unsigned, 4>;
+//%template(Matrix44i) VecMat::SquareMatrix<int, 4>;
+//%template(Matrix44f) VecMat::SquareMatrix<float, 4>;
+//%template(Matrix44d) VecMat::SquareMatrix<double, 4>;
+//%template(Matrix44r) VecMat::SquareMatrix<real, 4>;
+
+%include "../geometry/Geom.h"
+
+// Noise
+%include "../geometry/Noise.h"
+
+// Material
+%include "../scene_graph/Material.h"
+
+// ViewMap Components
+%include "../winged_edge/Nature.h"
+
+%rename(getObject) Interface0DIterator::operator*;
+%rename(getObject) Interface0DIteratorNested::operator*;
+%include "../view_map/Interface0D.h"
+
+%include "../view_map/Interface1D.h"
+%template(integrateUnsigned)	integrate<unsigned>;
+%template(integrateFloat)	integrate<float>;
+%template(integrateDouble)	integrate<double>;
+//%template(integrateReal)	integrate<real>;
+
+%rename(getObject) FEdgeInternal::SVertexIterator::operator*;
+%rename(FEdgeSVertexIterator) FEdgeInternal::SVertexIterator;
+%include "../view_map/Silhouette.h"
+
+%template(ViewShapesContainer) std::vector<ViewShape*>;
+%template(ViewEdgesContainer) std::vector<ViewEdge*>;
+%template(FEdgesContainer) std::vector<FEdge*>;
+%template(ViewVerticesContainer) std::vector<ViewVertex*>;
+%template(SVerticesContainer) std::vector<SVertex*>;
+
+%ignore NonTVertex::edges_begin;
+%ignore NonTVertex::edges_last;
+%ignore NonTVertex::edges_iterator;
+%ignore TVertex::edges_begin;
+%ignore TVertex::edges_last;
+%ignore TVertex::edges_iterator;
+%ignore ViewEdge::ViewEdge_iterator;
+%ignore ViewEdge::fedge_iterator_begin;
+%ignore ViewEdge::fedge_iterator_last;
+%ignore ViewEdge::fedge_iterator_end;
+%ignore ViewEdge::vertices_begin;
+%ignore ViewEdge::vertices_last;
+%ignore ViewEdge::vertices_end;
+%rename(directedViewEdge) ViewVertex::directedViewEdge; 
+//%template(directedViewEdge) std::pair<ViewEdge*,bool>;
+%include "../view_map/ViewMap.h"
+
+
+%feature("director") ViewEdgeInternal::ViewEdgeIterator;
+%rename(getObject) ViewVertexInternal::orientedViewEdgeIterator::operator*;
+%rename(ViewVertexOrientedViewEdgeIterator) ViewVertexInternal::orientedViewEdgeIterator;
+%rename(getObject) ViewEdgeInternal::SVertexIterator::operator*;
+%rename(ViewEdgeSVertexIterator) ViewEdgeInternal::SVertexIterator;
+%rename(getObject) ViewEdgeInternal::ViewEdgeIterator::operator*;
+%rename(ViewEdgeViewEdgeIterator) ViewEdgeInternal::ViewEdgeIterator;
+%include "../view_map/ViewMapIterators.h"
+
+%include "../view_map/Interface0D.h"
+
+// SWIG directives in "../view_map/Functions0D.h"
+%ignore Functions0D::getFEdges;
+%ignore Functions0D::getViewEdges;
+%ignore Functions0D::getShapeF0D;
+%ignore Functions0D::getOccludersF0D;
+%ignore Functions0D::getOccludeeF0D;
+%include "../view_map/Functions0D.h"
+
+// SWIG directives in "../view_map/Functions1D.h"
+%ignore Functions1D::getOccludeeF1D;
+%ignore Functions1D::getOccludersF1D;
+%ignore Functions1D::getShapeF1D;
+%include "../view_map/Functions1D.h"
+
+// Module parameters
+%include "../stroke/Module.h"
+
+%include "../stroke/AdvancedFunctions0D.h"
+%include "../stroke/AdvancedFunctions1D.h"
+
+%include "../stroke/ContextFunctions.h"
+
+%rename(getObject) AdjacencyIterator::operator*;
+%rename(getObject) ViewEdgeInternal::ViewEdgeIterator::operator*;
+%feature("director") ChainingIterator;
+%feature("director") ChainSilhouetteIterator;
+%feature("director") ChainPredicateIterator;
+%include "../stroke/ChainingIterators.h"
+
+%feature("director") UnaryPredicate0D;
+%include "../stroke/Predicates0D.h"
+
+%feature("director") UnaryPredicate1D;
+%feature("director") BinaryPredicate1D;
+%include "../stroke/Predicates1D.h"
+%include "../stroke/AdvancedPredicates1D.h"
+
+%rename(getObject) CurveInternal::CurvePointIterator::operator*;
+%rename(CurvePointIterator) CurveInternal::CurvePointIterator;
+%include "../stroke/CurveIterators.h"
+
+%ignore Curve::points_begin;
+%ignore Curve::points_end;
+%ignore Curve::vertices_begin;
+%ignore Curve::vertices_end;
+%include "../stroke/Curve.h"
+
+%ignore Stroke::vertices_begin;
+%ignore Stroke::vertices_end;
+%include "../stroke/StrokeIterators.h"
+%include "../stroke/Stroke.h"
+
+%rename(getObject) StrokeInternal::StrokeVertexIterator::operator*;
+%rename(StrokeVertexIterator) StrokeInternal::StrokeVertexIterator;
+%include "../stroke/StrokeIterators.h"
+
+%feature("director") StrokeShader;
+%template(ShadersContainer) std::vector<StrokeShader*>;
+%include "../stroke/StrokeShader.h"
+
+%include "../stroke/BasicStrokeShaders.h"
+%include "../stroke/AdvancedStrokeShaders.h"
+
+%ignore Operators::getStrokesSet;
+%ignore Operators::reset;
+%include "../stroke/Operators.h"
+
+// Canvas.h
+%include "../stroke/Canvas.h"
+
+// Cast functions
+%include "../system/Cast.h"
+%template(castToSVertex)	Cast::cast<Interface0D, SVertex>;
+%template(castToViewVertex)	Cast::cast<Interface0D, ViewVertex>;
+%template(castToTVertex)	Cast::cast<Interface0D, TVertex>;
+%template(castToCurvePoint)	Cast::cast<Interface0D, CurvePoint>;
+%template(castToStrokeVertex)	Cast::cast<Interface0D, StrokeVertex>;
+%template(castToNonTVertex)	Cast::cast<Interface0D, NonTVertex>;
+%template(castToFEdge)		Cast::cast<Interface1D, FEdge>;
+%template(castToViewEdge)	Cast::cast<Interface1D, ViewEdge>;
+%template(castToStroke)		Cast::cast<Interface1D, Stroke>;
+%template(castToChain)		Cast::cast<Interface1D, Chain>;
diff --git a/extern/freestyle/src/swig/FreestyleWrapper.vc7.vcproj b/extern/freestyle/src/swig/FreestyleWrapper.vc7.vcproj
new file mode 100755
index 00000000000..060c1987ea1
--- /dev/null
+++ b/extern/freestyle/src/swig/FreestyleWrapper.vc7.vcproj
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="_Freestyle"
+	ProjectGUID="{3E3D60D3-0904-4DC7-BFC2-113735CA00DD}"
+	SccProjectName=""
+	SccLocalPath="">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\Release"
+			IntermediateDirectory=".\Release"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="$(PYTHON_INCLUDE),..\stroke,..\system,..\geometry,..\winged_edge,..\view_map,..\image,..\scene_graph"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESTYLEWRAPPER_EXPORTS"
+				StringPooling="TRUE"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\Release/FreestyleWrapper.vc6.pch"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="..\..\build\win32\release\FreestyleWingedEdge2.2.lib ..\..\build\win32\release\FreestyleViewMap2.2.lib ..\..\build\win32\release\FreestyleSystem2.2.lib ..\..\build\win32\release\FreestyleStroke2.2.lib ..\..\build\win32\release\FreestyleRendering2.2.lib ..\..\build\win32\release\FreestyleGeometry2.2.lib ..\..\build\win32\release\FreestyleImage2.2.lib odbc32.lib odbccp32.lib C:\python24\libs\python24.lib"
+				OutputFile="..\..\build\win32\release\python\_Freestyle.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				ProgramDatabaseFile=".\Release/_Freestyle.pdb"
+				ImportLibrary=".\Release/_Freestyle.lib"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/FreestyleWrapper.vc6.tlb"
+				HeaderFileName=""/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="copy   Freestyle.py   ..\..\build\win32\release\python\"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="2057"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\Debug"
+			IntermediateDirectory=".\Debug"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="$(PYTHON_INCLUDE),..\stroke,..\system,..\geometry,..\winged_edge,..\view_map,..\image,..\scene_graph"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESTYLEWRAPPER_EXPORTS;__WIN32__"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\Debug/FreestyleWrapper.vc6.pch"
+				AssemblerListingLocation=".\Debug/"
+				ObjectFile=".\Debug/"
+				ProgramDataBaseFileName=".\Debug/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="4"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="..\..\build\win32\debug\FreestyleWingedEdge_d2.2.lib ..\..\build\win32\debug\FreestyleViewMap_d2.2.lib ..\..\build\win32\debug\FreestyleSystem_d2.2.lib ..\..\build\win32\debug\FreestyleStroke_d2.2.lib ..\..\build\win32\debug\FreestyleRendering_d2.2.lib ..\..\build\win32\debug\FreestyleGeometry_d2.2.lib ..\..\build\win32\debug\FreestyleImage_d2.2.lib odbc32.lib odbccp32.lib C:\Python24\libs\python24_d.lib"
+				OutputFile="..\..\build\win32\debug\python\_Freestyle.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile=".\Debug/_Freestyle.pdb"
+				ImportLibrary=".\Debug/_Freestyle.lib"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Debug/FreestyleWrapper.vc6.tlb"
+				HeaderFileName=""/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="copy   Freestyle.py   ..\..\build\win32\debug\python\"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="2057"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			<File
+				RelativePath="ModuleWrapper.cpp">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;FREESTYLEWRAPPER_EXPORTS;$(NoInherit)"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;FREESTYLEWRAPPER_EXPORTS;__WIN32__;$(NoInherit)"
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl">
+			<File
+				RelativePath="ModuleWrapper.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+		</Filter>
+		<File
+			RelativePath="Freestyle.i">
+			<FileConfiguration
+				Name="Release|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					CommandLine="echo In order to function correctly, please ensure the following environment variables are correctly set:
+echo PYTHON_INCLUDE: %PYTHON_INCLUDE%
+echo PYTHON_LIB: %PYTHON_LIB%
+echo on
+swig -c++ -python  -I&quot;$(SWIG_INC)\python&quot; -I&quot;$(SWIG_INC)&quot; -o ModuleWrapper.cpp &quot;$(InputPath)&quot;
+"
+					Outputs="ModuleWrapper.cpp"/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					CommandLine="echo In order to function correctly, please ensure the following environment variables are correctly set:
+echo PYTHON_INCLUDE: %PYTHON_INCLUDE%
+echo PYTHON_LIB: %PYTHON_LIB%
+echo on
+swig -c++ -python -I&quot;$(SWIG_INC)\python&quot; -I&quot;$(SWIG_INC)&quot; -o ModuleWrapper.cpp &quot;$(InputPath)&quot;
+"
+					Outputs="ModuleWrapper.cpp"/>
+			</FileConfiguration>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/extern/freestyle/src/swig/FreestyleWrapper.vc8.vcproj b/extern/freestyle/src/swig/FreestyleWrapper.vc8.vcproj
new file mode 100755
index 00000000000..833a4f89aca
--- /dev/null
+++ b/extern/freestyle/src/swig/FreestyleWrapper.vc8.vcproj
@@ -0,0 +1,283 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8,00"
+	Name="_Freestyle"
+	ProjectGUID="{E6FFBB76-729F-4C64-8A85-A420C4555FAF}"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\Release"
+			IntermediateDirectory=".\Release"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/FreestyleWrapper.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="$(PYTHON_INCLUDE),..\stroke,..\system,..\geometry,..\winged_edge,..\view_map,..\image,..\scene_graph"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESTYLEWRAPPER_EXPORTS"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\Release/FreestyleWrapper.pch"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
+				WarningLevel="2"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="2057"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="..\..\build\win32\release\FreestyleWingedEdge2.2.lib ..\..\build\win32\release\FreestyleViewMap2.2.lib ..\..\build\win32\release\FreestyleSystem2.2.lib ..\..\build\win32\release\FreestyleStroke2.2.lib ..\..\build\win32\release\FreestyleRendering2.2.lib ..\..\build\win32\release\FreestyleGeometry2.2.lib ..\..\build\win32\release\FreestyleImage2.2.lib odbc32.lib odbccp32.lib $(PYTHON_LIB)"
+				OutputFile="..\..\build\win32\release\python\_Freestyle.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				ProgramDatabaseFile=".\Release/_Freestyle.pdb"
+				ImportLibrary=".\Release/_Freestyle.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+				OutputFile=".\Release/FreestyleWrapper.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="copy   Freestyle.py   ..\..\build\win32\release\python\&#x0D;&#x0A;copy   ..\..\build\win32\release\python\_Freestyle.dll   ..\..\build\win32\release\python\_Freestyle.pyd&#x0D;&#x0A;"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\Debug"
+			IntermediateDirectory=".\Debug"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Debug/FreestyleWrapper.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="$(PYTHON_INCLUDE),..\stroke,..\system,..\geometry,..\winged_edge,..\view_map,..\image,..\scene_graph"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESTYLEWRAPPER_EXPORTS;__WIN32__"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=".\Debug/FreestyleWrapper.pch"
+				AssemblerListingLocation=".\Debug/"
+				ObjectFile=".\Debug/"
+				ProgramDataBaseFileName=".\Debug/"
+				WarningLevel="2"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="2057"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="..\..\build\win32\debug\FreestyleWingedEdge_d2.2.lib ..\..\build\win32\debug\FreestyleViewMap_d2.2.lib ..\..\build\win32\debug\FreestyleSystem_d2.2.lib ..\..\build\win32\debug\FreestyleStroke_d2.2.lib ..\..\build\win32\debug\FreestyleRendering_d2.2.lib ..\..\build\win32\debug\FreestyleGeometry_d2.2.lib ..\..\build\win32\debug\FreestyleImage_d2.2.lib odbc32.lib odbccp32.lib $(PYTHON_LIB)"
+				OutputFile="..\..\build\win32\debug\python\_Freestyle.dll"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile=".\Debug/_Freestyle.pdb"
+				ImportLibrary=".\Debug/_Freestyle.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+				OutputFile=".\Debug/FreestyleWrapper.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="copy   Freestyle.py   ..\..\build\win32\debug\python\&#x0D;&#x0A;copy   ..\..\build\win32\debug\python\_Freestyle.dll   ..\..\build\win32\debug\python\_Freestyle.pyd&#x0D;&#x0A;"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
+			<File
+				RelativePath="ModuleWrapper.cpp"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						UsePrecompiledHeader="0"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl"
+			>
+			<File
+				RelativePath="ModuleWrapper.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
+		</Filter>
+		<File
+			RelativePath="Freestyle.i"
+			>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					CommandLine="echo In order to function correctly, please ensure the following environment variables are correctly set:&#x0D;&#x0A;echo PYTHON_INCLUDE: %PYTHON_INCLUDE%&#x0D;&#x0A;echo PYTHON_LIB: %PYTHON_LIB%&#x0D;&#x0A;echo on&#x0D;&#x0A;swig -c++ -python -I&quot;$(SWIG_INC)\python&quot; -I&quot;$(SWIG_INC)&quot; -o ModuleWrapper.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					Outputs="ModuleWrapper.cpp"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					CommandLine="echo In order to function correctly, please ensure the following environment variables are correctly set:&#x0D;&#x0A;echo PYTHON_INCLUDE: %PYTHON_INCLUDE%&#x0D;&#x0A;echo PYTHON_LIB: %PYTHON_LIB%&#x0D;&#x0A;echo on&#x0D;&#x0A;swig -c++ -python  -I&quot;$(SWIG_INC)\python&quot; -I&quot;$(SWIG_INC)&quot; -o ModuleWrapper.cpp &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					Outputs="ModuleWrapper.cpp"
+				/>
+			</FileConfiguration>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/extern/freestyle/src/swig/Makefile b/extern/freestyle/src/swig/Makefile
new file mode 100755
index 00000000000..01829434be0
--- /dev/null
+++ b/extern/freestyle/src/swig/Makefile
@@ -0,0 +1,90 @@
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#                             W A R N I N G ! ! !                             #
+#             a u t h o r i z e d    p e r s o n a l    o n l y               #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+
+CXX	  = g++
+RM	  = rm -f
+INSTALL	  = install
+SWIG	  = swig
+
+PYTHON_VERSION_MAJ = 2
+PYTHON_VERSION_MIN = 4
+
+BUILD     = debug
+PLATEFORM = linux-g++
+MODNAME   = Freestyle
+
+LIBNAME   = _${MODNAME}.so
+LIBDIR    = ../../build/${PLATEFORM}/${BUILD}/lib/python
+IPATH     = -I../geometry -I../image -I../scene_graph -I../stroke \
+            -I../system -I../view_map -I../winged_edge \
+            -I/usr/include/python${PYTHON_VERSION_MAJ}.${PYTHON_VERSION_MIN}
+# options to compile with static python : -lpthread -lm -lutil -shared -Xlinker -x -export-dynamic
+#OPTI      = -lpthread -lm -lutil -shared -Xlinker -x -export-dynamic #-O3 -funroll-loops -fomit-frame-pointer -ffast-math -march=i686
+DBUG      = #-ggdb #-pg
+WARN	  = -w #-W -Wall #-pedantic -ansi
+
+CFLAGS    = ${OPTI} ${DBUG} ${WARN} ${IPATH}
+LDFLAGS   = ${OPTI} ${DBUG} ${WARN} ${LPATH}
+
+SWIG_SRC  = Freestyle.i
+PY_SRC    = ${SWIG_SRC:.i=.py}
+CXX_SRC	  = ModuleWrapper.cpp
+CXX_INC	  = ${CXX_SRC:.cpp=.h}
+CXX_OBJ	  = ${CXX_SRC:.cpp=.o}
+
+ifndef DBUG
+  STRIP   = strip --strip-all ${LIBDIR}/${LIBNAME}
+endif
+
+# # # # # # # # # # # # # # # #   R u l e s   # # # # # # # # # # # # # # # # #
+
+all	: swig cxx
+
+.PHONY	: clean re
+
+clean	: swig_clean cxx_clean
+
+re	: swig_re cxx_re
+
+# # # # # # # # # # # # #   S W I G   r u l e s   # # # # # # # # # # # # # # #
+
+.SUFFIXES:
+.SUFFIXES: .i .py .cpp .h .o
+
+.IGNORE	:
+
+swig	: ${CXX_INC} ${CXX_SRC} ${PY_SRC}
+
+.i.py	: ${SWIG_SRC}
+	${SWIG} -c++ -python -o ${CXX_SRC} $<
+
+.PHONY	: swig_clean swig_re
+
+swig_clean	:
+	${RM} *~ \#* .\#* : ${CXX_INC} ${CXX_SRC} ${PY_SRC}
+
+swig_re	: swig_clean swig
+
+# # # # # # # # #   P y t h o n   &   C + +   r u l e s   # # # # # # # # # # #
+
+cxx	: ${CXX_OBJ} ${PY_SRC}
+	${INSTALL} -d ${LIBDIR}
+	${CC} -shared -o ${LIBDIR}/${LIBNAME} ${CXX_OBJ}
+	${INSTALL} ${PY_SRC} ${LIBDIR}
+	@${STRIP}
+
+.cpp.o	: ${CXX_INC} ${CXX_SRC}
+	${CXX} ${CFLAGS} -c $< -o $@
+
+${CXX_SRC}	: ${PY_SRC}
+
+${CXX_INC}	: ${PY_SRC}
+
+.PHONY	: cxx_clean cxx_re
+
+cxx_clean	:
+	${RM} *~ \#* .\#* *.core gmon.out ${CXX_OBJ} 
+
+cxx_re	: cxx_clean cxx_all
diff --git a/extern/freestyle/src/swig/Makefile.cygwin b/extern/freestyle/src/swig/Makefile.cygwin
new file mode 100755
index 00000000000..1f5b3ce2a79
--- /dev/null
+++ b/extern/freestyle/src/swig/Makefile.cygwin
@@ -0,0 +1,92 @@
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#                             W A R N I N G ! ! !                             #
+#             a u t h o r i z e d    p e r s o n a l    o n l y               #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+
+CXX	  = g++
+RM	  = rm -f
+INSTALL	  = install
+SWIG	  = swig
+
+PYTHON_VERSION_MAJ = 2
+PYTHON_VERSION_MIN = 5
+
+BUILD     = debug
+PLATEFORM = cygwin-g++
+MODNAME   = Freestyle
+
+LIBNAME   = _${MODNAME}.dll
+LIBDIR    = ../../build/${PLATEFORM}/${BUILD}/lib/python
+IPATH     = -I../geometry -I../image -I../scene_graph -I../stroke \
+            -I../system -I../view_map -I../winged_edge \
+            -I/usr/include/python${PYTHON_VERSION_MAJ}.${PYTHON_VERSION_MIN}
+LPATH     = -L/usr/lib/python${PYTHON_VERSION_MAJ}.${PYTHON_VERSION_MIN}/config -lpython${PYTHON_VERSION_MAJ}.${PYTHON_VERSION_MIN} \
+            -L../../build/${PLATEFORM}/${BUILD}/lib -lFreestyleSystem -lFreestyleImage -lFreestyleGeometry -lFreestyleSceneGraph -lFreestyleWingedEdge -lFreestyleViewMap -lFreestyleRendering -lFreestyleStroke
+# options to compile with static python : -lpthread -lm -lutil -shared -Xlinker -x -export-dynamic
+#OPTI      = -lpthread -lm -lutil -shared -Xlinker -x -export-dynamic #-O3 -funroll-loops -fomit-frame-pointer -ffast-math -march=i686
+DBUG      = #-ggdb #-pg
+WARN	  = -w #-W -Wall #-pedantic -ansi
+
+CFLAGS    = ${OPTI} ${DBUG} ${WARN} ${IPATH}
+LDFLAGS   = ${OPTI} ${DBUG} ${WARN} ${LPATH}
+
+SWIG_SRC  = Freestyle.i
+PY_SRC    = ${SWIG_SRC:.i=.py}
+CXX_SRC	  = ModuleWrapper.cpp
+CXX_INC	  = ${CXX_SRC:.cpp=.h}
+CXX_OBJ	  = ${CXX_SRC:.cpp=.o}
+
+ifndef DBUG
+  STRIP   = strip --strip-all ${LIBDIR}/${LIBNAME}
+endif
+
+# # # # # # # # # # # # # # # #   R u l e s   # # # # # # # # # # # # # # # # #
+
+all	: swig cxx
+
+.PHONY	: clean re
+
+clean	: swig_clean cxx_clean
+
+re	: swig_re cxx_re
+
+# # # # # # # # # # # # #   S W I G   r u l e s   # # # # # # # # # # # # # # #
+
+.SUFFIXES:
+.SUFFIXES: .i .py .cpp .h .o
+
+.IGNORE	:
+
+swig	: ${CXX_INC} ${CXX_SRC} ${PY_SRC}
+
+.i.py	: ${SWIG_SRC}
+	${SWIG} -c++ -python -o ${CXX_SRC} $<
+
+.PHONY	: swig_clean swig_re
+
+swig_clean	:
+	${RM} *~ \#* .\#* : ${CXX_INC} ${CXX_SRC} ${PY_SRC}
+
+swig_re	: swig_clean swig
+
+# # # # # # # # #   P y t h o n   &   C + +   r u l e s   # # # # # # # # # # #
+
+cxx	: ${CXX_OBJ} ${PY_SRC}
+	${INSTALL} -d ${LIBDIR}
+	${CXX} -shared ${LDFLAGS} -o ${LIBDIR}/${LIBNAME} ${CXX_OBJ}
+	${INSTALL} ${PY_SRC} ${LIBDIR}
+	@${STRIP}
+
+.cpp.o	: ${CXX_INC} ${CXX_SRC}
+	${CXX} ${CFLAGS} -c $< -o $@
+
+${CXX_SRC}	: ${PY_SRC}
+
+${CXX_INC}	: ${PY_SRC}
+
+.PHONY	: cxx_clean cxx_re
+
+cxx_clean	:
+	${RM} *~ \#* .\#* *.core gmon.out ${CXX_OBJ} 
+
+cxx_re	: cxx_clean cxx_all
diff --git a/extern/freestyle/src/swig/Makefile.linux b/extern/freestyle/src/swig/Makefile.linux
new file mode 100755
index 00000000000..2a93971ccd5
--- /dev/null
+++ b/extern/freestyle/src/swig/Makefile.linux
@@ -0,0 +1,91 @@
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#                             W A R N I N G ! ! !                             #
+#             a u t h o r i z e d    p e r s o n a l    o n l y               #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+
+CXX	  = g++
+RM	  = rm -f
+INSTALL	  = install
+SWIG	  = swig
+
+PYTHON_VERSION_MAJ = 2
+PYTHON_VERSION_MIN = 5
+
+BUILD     = debug
+PLATEFORM = linux-g++
+MODNAME   = Freestyle
+
+LIBNAME   = _${MODNAME}.so
+LIBDIR    = ../../build/${PLATEFORM}/${BUILD}/lib/python
+IPATH     = -I../geometry -I../image -I../scene_graph -I../stroke \
+            -I../system -I../view_map -I../winged_edge \
+            -I/usr/include/python${PYTHON_VERSION_MAJ}.${PYTHON_VERSION_MIN}
+LPATH     = -L/usr/lib/python${PYTHON_VERSION_MAJ}.${PYTHON_VERSION_MIN}/config -lpython${PYTHON_VERSION_MAJ}.${PYTHON_VERSION_MIN}
+# options to compile with static python : -lpthread -lm -lutil -shared -Xlinker -x -export-dynamic
+#OPTI      = -lpthread -lm -lutil -shared -Xlinker -x -export-dynamic #-O3 -funroll-loops -fomit-frame-pointer -ffast-math -march=i686
+DBUG      = #-ggdb #-pg
+WARN	  = -w #-W -Wall #-pedantic -ansi
+
+CFLAGS    = ${OPTI} ${DBUG} ${WARN} ${IPATH}
+LDFLAGS   = ${OPTI} ${DBUG} ${WARN} ${LPATH}
+
+SWIG_SRC  = Freestyle.i
+PY_SRC    = ${SWIG_SRC:.i=.py}
+CXX_SRC	  = ModuleWrapper.cpp
+CXX_INC	  = ${CXX_SRC:.cpp=.h}
+CXX_OBJ	  = ${CXX_SRC:.cpp=.o}
+
+ifndef DBUG
+  STRIP   = strip --strip-all ${LIBDIR}/${LIBNAME}
+endif
+
+# # # # # # # # # # # # # # # #   R u l e s   # # # # # # # # # # # # # # # # #
+
+all	: swig cxx
+
+.PHONY	: clean re
+
+clean	: swig_clean cxx_clean
+
+re	: swig_re cxx_re
+
+# # # # # # # # # # # # #   S W I G   r u l e s   # # # # # # # # # # # # # # #
+
+.SUFFIXES:
+.SUFFIXES: .i .py .cpp .h .o
+
+.IGNORE	:
+
+swig	: ${CXX_INC} ${CXX_SRC} ${PY_SRC}
+
+.i.py	: ${SWIG_SRC}
+	${SWIG} -c++ -python -o ${CXX_SRC} $<
+
+.PHONY	: swig_clean swig_re
+
+swig_clean	:
+	${RM} *~ \#* .\#* : ${CXX_INC} ${CXX_SRC} ${PY_SRC}
+
+swig_re	: swig_clean swig
+
+# # # # # # # # #   P y t h o n   &   C + +   r u l e s   # # # # # # # # # # #
+
+cxx	: ${CXX_OBJ} ${PY_SRC}
+	${INSTALL} -d ${LIBDIR}
+	${CXX} -shared ${LDFLAGS} -o ${LIBDIR}/${LIBNAME} ${CXX_OBJ}
+	${INSTALL} ${PY_SRC} ${LIBDIR}
+	@${STRIP}
+
+.cpp.o	: ${CXX_INC} ${CXX_SRC}
+	${CXX} ${CFLAGS} -c $< -o $@
+
+${CXX_SRC}	: ${PY_SRC}
+
+${CXX_INC}	: ${PY_SRC}
+
+.PHONY	: cxx_clean cxx_re
+
+cxx_clean	:
+	${RM} *~ \#* .\#* *.core gmon.out ${CXX_OBJ} 
+
+cxx_re	: cxx_clean cxx_all
diff --git a/extern/freestyle/src/swig/Makefile.mac b/extern/freestyle/src/swig/Makefile.mac
new file mode 100644
index 00000000000..2c46d74549e
--- /dev/null
+++ b/extern/freestyle/src/swig/Makefile.mac
@@ -0,0 +1,91 @@
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#                             W A R N I N G ! ! !                             #
+#             a u t h o r i z e d    p e r s o n a l    o n l y               #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+
+CXX	  = g++
+RM	  = rm -f
+INSTALL	  = install
+SWIG	  = swig
+
+PYTHON_VERSION_MAJ = 2
+PYTHON_VERSION_MIN = 5
+
+BUILD     = release
+PLATEFORM = macosx
+MODNAME   = Freestyle
+
+LIBNAME   = _${MODNAME}.so
+LIBDIR    = ../../build/${PLATEFORM}/${BUILD}/lib/python
+IPATH     = -I../geometry -I../image -I../scene_graph -I../stroke \
+            -I../system -I../view_map -I../winged_edge \
+            -I/usr/include/python${PYTHON_VERSION_MAJ}.${PYTHON_VERSION_MIN}
+LPATH     = -L/usr/lib/python${PYTHON_VERSION_MAJ}.${PYTHON_VERSION_MIN}/config -lpython${PYTHON_VERSION_MAJ}.${PYTHON_VERSION_MIN}
+# options to compile with static python : -lpthread -lm -lutil -shared -Xlinker -x -export-dynamic
+#OPTI      = -lpthread -lm -lutil -shared -Xlinker -x -export-dynamic #-O3 -funroll-loops -fomit-frame-pointer -ffast-math -march=i686
+DBUG      = #-ggdb #-pg
+WARN	  = -w #-W -Wall #-pedantic -ansi
+
+CFLAGS    = ${OPTI} ${DBUG} ${WARN} ${IPATH}
+LDFLAGS   = ${OPTI} ${DBUG} ${WARN} ${LPATH}
+
+SWIG_SRC  = Freestyle.i
+PY_SRC    = ${SWIG_SRC:.i=.py}
+CXX_SRC	  = ModuleWrapper.cpp
+CXX_INC	  = ${CXX_SRC:.cpp=.h}
+CXX_OBJ	  = ${CXX_SRC:.cpp=.o}
+
+ifndef DBUG
+  STRIP   = strip -x ${LIBDIR}/${LIBNAME}
+endif
+
+# # # # # # # # # # # # # # # #   R u l e s   # # # # # # # # # # # # # # # # #
+
+all	: swig cxx
+
+.PHONY	: clean re
+
+clean	: swig_clean cxx_clean
+
+re	: swig_re cxx_re
+
+# # # # # # # # # # # # #   S W I G   r u l e s   # # # # # # # # # # # # # # #
+
+.SUFFIXES:
+.SUFFIXES: .i .py .cpp .h .o
+
+.IGNORE	:
+
+swig	: ${CXX_INC} ${CXX_SRC} ${PY_SRC}
+
+.i.py	: ${SWIG_SRC}
+	${SWIG} -c++ -python -o ${CXX_SRC} $<
+
+.PHONY	: swig_clean swig_re
+
+swig_clean	:
+	${RM} *~ \#* .\#* : ${CXX_INC} ${CXX_SRC} ${PY_SRC}
+
+swig_re	: swig_clean swig
+
+# # # # # # # # #   P y t h o n   &   C + +   r u l e s   # # # # # # # # # # #
+
+cxx	: ${CXX_OBJ} ${PY_SRC}
+	${INSTALL} -d ${LIBDIR}
+	${CXX} -bundle -flat_namespace -undefined suppress ${LDFLAGS} -o ${LIBDIR}/${LIBNAME} ${CXX_OBJ}
+	${INSTALL} ${PY_SRC} ${LIBDIR}
+	@${STRIP}
+
+.cpp.o	: ${CXX_INC} ${CXX_SRC}
+	${CXX} ${CFLAGS} -c $< -o $@
+
+${CXX_SRC}	: ${PY_SRC}
+
+${CXX_INC}	: ${PY_SRC}
+
+.PHONY	: cxx_clean cxx_re
+
+cxx_clean	:
+	${RM} *~ \#* .\#* *.core gmon.out ${CXX_OBJ} 
+
+cxx_re	: cxx_clean cxx_all
diff --git a/extern/freestyle/src/swig/Makefile.noswig b/extern/freestyle/src/swig/Makefile.noswig
new file mode 100755
index 00000000000..368c4fb173b
--- /dev/null
+++ b/extern/freestyle/src/swig/Makefile.noswig
@@ -0,0 +1,64 @@
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#                             W A R N I N G ! ! !                             #
+#             a u t h o r i z e d    p e r s o n a l    o n l y               #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+
+CXX	  = g++
+RM	  = rm -f
+INSTALL	  = install
+
+PYTHON_VERSION_MAJ = 2
+PYTHON_VERSION_MIN = 2
+
+BUILD     = debug
+PLATEFORM = linux-g++
+MODNAME   = Freestyle
+
+LIBNAME   = _${MODNAME}.so
+LIBDIR    = ../../build/${PLATEFORM}/${BUILD}/lib/python
+IPATH     = -I../geometry -I../image -I../scene_graph -I../stroke \
+            -I../system -I../view_map -I../winged_edge \
+            -I/usr/include/python${PYTHON_VERSION_MAJ}.${PYTHON_VERSION_MIN}
+OPTI      = #-O3 -funroll-loops -fomit-frame-pointer -ffast-math -march=i686
+DBUG      = #-ggdb #-pg
+WARN	  = -w #-W -Wall #-pedantic -ansi
+
+CFLAGS    = ${OPTI} ${DBUG} ${WARN} ${IPATH}
+LDFLAGS   = ${OPTI} ${DBUG} ${WARN} ${LPATH}
+
+PY_SRC    = Freestyle.py
+CXX_SRC	  = ModuleWrapper.cpp
+CXX_INC	  = ${CXX_SRC:.cpp=.h}
+CXX_OBJ	  = ${CXX_SRC:.cpp=.o}
+
+ifndef DBUG
+  STRIP   = strip --strip-all ${LIBDIR}/${LIBNAME}
+endif
+
+# # # # # # # # # # # # # # # #   R u l e s   # # # # # # # # # # # # # # # # #
+
+all	: cxx
+
+.PHONY	: clean re
+
+clean	:  cxx_clean
+
+re	:  cxx_re
+
+# # # # # # # # #   P y t h o n   &   C + +   r u l e s   # # # # # # # # # # #
+
+cxx	: ${CXX_OBJ} ${PY_SRC}
+	${INSTALL} -d ${LIBDIR}
+	${CC} -shared -o ${LIBDIR}/${LIBNAME} ${CXX_OBJ}
+	${INSTALL} ${PY_SRC} ${LIBDIR}
+	@${STRIP}
+
+.cpp.o	: ${CXX_INC} ${CXX_SRC}
+	${CXX} ${CFLAGS} -c $< -o $@
+
+.PHONY	: cxx_clean cxx_re
+
+cxx_clean	:
+	${RM} *~ \#* .\#* *.core gmon.out ${CXX_OBJ} 
+
+cxx_re	: cxx_clean cxx_all
diff --git a/extern/freestyle/src/swig/ModuleWrapper.cpp b/extern/freestyle/src/swig/ModuleWrapper.cpp
new file mode 100755
index 00000000000..36bd39b2b15
--- /dev/null
+++ b/extern/freestyle/src/swig/ModuleWrapper.cpp
@@ -0,0 +1,111845 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 1.3.31
+ * 
+ * This file is not intended to be easily readable and contains a number of 
+ * coding conventions designed to improve portability and efficiency. Do not make
+ * changes to this file unless you know what you are doing--modify the SWIG 
+ * interface file instead. 
+ * ----------------------------------------------------------------------------- */
+
+#define SWIGPYTHON
+#define SWIG_DIRECTORS
+#define SWIG_PYTHON_DIRECTOR_NO_VTABLE
+
+#ifdef __cplusplus
+template<class T> class SwigValueWrapper {
+    T *tt;
+public:
+    SwigValueWrapper() : tt(0) { }
+    SwigValueWrapper(const SwigValueWrapper<T>& rhs) : tt(new T(*rhs.tt)) { }
+    SwigValueWrapper(const T& t) : tt(new T(t)) { }
+    ~SwigValueWrapper() { delete tt; } 
+    SwigValueWrapper& operator=(const T& t) { delete tt; tt = new T(t); return *this; }
+    operator T&() const { return *tt; }
+    T *operator&() { return tt; }
+private:
+    SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs);
+};
+#endif
+
+/* -----------------------------------------------------------------------------
+ *  This section contains generic SWIG labels for method/variable
+ *  declarations/attributes, and other compiler dependent labels.
+ * ----------------------------------------------------------------------------- */
+
+/* template workaround for compilers that cannot correctly implement the C++ standard */
+#ifndef SWIGTEMPLATEDISAMBIGUATOR
+# if defined(__SUNPRO_CC)
+#   if (__SUNPRO_CC <= 0x560)
+#     define SWIGTEMPLATEDISAMBIGUATOR template
+#   else
+#     define SWIGTEMPLATEDISAMBIGUATOR 
+#   endif
+# else
+#   define SWIGTEMPLATEDISAMBIGUATOR 
+# endif
+#endif
+
+/* inline attribute */
+#ifndef SWIGINLINE
+# if defined(__cplusplus) || (defined(__GNUC__) && !defined(__STRICT_ANSI__))
+#   define SWIGINLINE inline
+# else
+#   define SWIGINLINE
+# endif
+#endif
+
+/* attribute recognised by some compilers to avoid 'unused' warnings */
+#ifndef SWIGUNUSED
+# if defined(__GNUC__)
+#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
+#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#   else
+#     define SWIGUNUSED
+#   endif
+# elif defined(__ICC)
+#   define SWIGUNUSED __attribute__ ((__unused__)) 
+# else
+#   define SWIGUNUSED 
+# endif
+#endif
+
+#ifndef SWIGUNUSEDPARM
+# ifdef __cplusplus
+#   define SWIGUNUSEDPARM(p)
+# else
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+# endif
+#endif
+
+/* internal SWIG method */
+#ifndef SWIGINTERN
+# define SWIGINTERN static SWIGUNUSED
+#endif
+
+/* internal inline SWIG method */
+#ifndef SWIGINTERNINLINE
+# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE
+#endif
+
+/* exporting methods */
+#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
+#  ifndef GCC_HASCLASSVISIBILITY
+#    define GCC_HASCLASSVISIBILITY
+#  endif
+#endif
+
+#ifndef SWIGEXPORT
+# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+#   if defined(STATIC_LINKED)
+#     define SWIGEXPORT
+#   else
+#     define SWIGEXPORT __declspec(dllexport)
+#   endif
+# else
+#   if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY)
+#     define SWIGEXPORT __attribute__ ((visibility("default")))
+#   else
+#     define SWIGEXPORT
+#   endif
+# endif
+#endif
+
+/* calling conventions for Windows */
+#ifndef SWIGSTDCALL
+# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+#   define SWIGSTDCALL __stdcall
+# else
+#   define SWIGSTDCALL
+# endif 
+#endif
+
+/* Deal with Microsoft's attempt at deprecating C standard runtime functions */
+#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
+# define _CRT_SECURE_NO_DEPRECATE
+#endif
+
+
+/* Python.h has to appear first */
+#include <Python.h>
+
+/* -----------------------------------------------------------------------------
+ * swigrun.swg
+ *
+ * This file contains generic CAPI SWIG runtime support for pointer
+ * type checking.
+ * ----------------------------------------------------------------------------- */
+
+/* This should only be incremented when either the layout of swig_type_info changes,
+   or for whatever reason, the runtime changes incompatibly */
+#define SWIG_RUNTIME_VERSION "3"
+
+/* define SWIG_TYPE_TABLE_NAME as "SWIG_TYPE_TABLE" */
+#ifdef SWIG_TYPE_TABLE
+# define SWIG_QUOTE_STRING(x) #x
+# define SWIG_EXPAND_AND_QUOTE_STRING(x) SWIG_QUOTE_STRING(x)
+# define SWIG_TYPE_TABLE_NAME SWIG_EXPAND_AND_QUOTE_STRING(SWIG_TYPE_TABLE)
+#else
+# define SWIG_TYPE_TABLE_NAME
+#endif
+
+/*
+  You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
+  creating a static or dynamic library from the swig runtime code.
+  In 99.9% of the cases, swig just needs to declare them as 'static'.
+  
+  But only do this if is strictly necessary, ie, if you have problems
+  with your compiler or so.
+*/
+
+#ifndef SWIGRUNTIME
+# define SWIGRUNTIME SWIGINTERN
+#endif
+
+#ifndef SWIGRUNTIMEINLINE
+# define SWIGRUNTIMEINLINE SWIGRUNTIME SWIGINLINE
+#endif
+
+/*  Generic buffer size */
+#ifndef SWIG_BUFFER_SIZE
+# define SWIG_BUFFER_SIZE 1024
+#endif
+
+/* Flags for pointer conversions */
+#define SWIG_POINTER_DISOWN        0x1
+
+/* Flags for new pointer objects */
+#define SWIG_POINTER_OWN           0x1
+
+
+/* 
+   Flags/methods for returning states.
+   
+   The swig conversion methods, as ConvertPtr, return and integer 
+   that tells if the conversion was successful or not. And if not,
+   an error code can be returned (see swigerrors.swg for the codes).
+   
+   Use the following macros/flags to set or process the returning
+   states.
+   
+   In old swig versions, you usually write code as:
+
+     if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
+       // success code
+     } else {
+       //fail code
+     }
+
+   Now you can be more explicit as:
+
+    int res = SWIG_ConvertPtr(obj,vptr,ty.flags);
+    if (SWIG_IsOK(res)) {
+      // success code
+    } else {
+      // fail code
+    }
+
+   that seems to be the same, but now you can also do
+
+    Type *ptr;
+    int res = SWIG_ConvertPtr(obj,(void **)(&ptr),ty.flags);
+    if (SWIG_IsOK(res)) {
+      // success code
+      if (SWIG_IsNewObj(res) {
+        ...
+	delete *ptr;
+      } else {
+        ...
+      }
+    } else {
+      // fail code
+    }
+    
+   I.e., now SWIG_ConvertPtr can return new objects and you can
+   identify the case and take care of the deallocation. Of course that
+   requires also to SWIG_ConvertPtr to return new result values, as
+
+      int SWIG_ConvertPtr(obj, ptr,...) {         
+        if (<obj is ok>) {			       
+          if (<need new object>) {		       
+            *ptr = <ptr to new allocated object>; 
+            return SWIG_NEWOBJ;		       
+          } else {				       
+            *ptr = <ptr to old object>;	       
+            return SWIG_OLDOBJ;		       
+          } 				       
+        } else {				       
+          return SWIG_BADOBJ;		       
+        }					       
+      }
+
+   Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
+   more explicit by returning SWIG_BADOBJ, SWIG_ERROR or any of the
+   swig errors code.
+
+   Finally, if the SWIG_CASTRANK_MODE is enabled, the result code
+   allows to return the 'cast rank', for example, if you have this
+
+       int food(double)
+       int fooi(int);
+
+   and you call
+ 
+      food(1)   // cast rank '1'  (1 -> 1.0)
+      fooi(1)   // cast rank '0'
+
+   just use the SWIG_AddCast()/SWIG_CheckState()
+
+
+ */
+#define SWIG_OK                    (0) 
+#define SWIG_ERROR                 (-1)
+#define SWIG_IsOK(r)               (r >= 0)
+#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)  
+
+/* The CastRankLimit says how many bits are used for the cast rank */
+#define SWIG_CASTRANKLIMIT         (1 << 8)
+/* The NewMask denotes the object was created (using new/malloc) */
+#define SWIG_NEWOBJMASK            (SWIG_CASTRANKLIMIT  << 1)
+/* The TmpMask is for in/out typemaps that use temporal objects */
+#define SWIG_TMPOBJMASK            (SWIG_NEWOBJMASK << 1)
+/* Simple returning values */
+#define SWIG_BADOBJ                (SWIG_ERROR)
+#define SWIG_OLDOBJ                (SWIG_OK)
+#define SWIG_NEWOBJ                (SWIG_OK | SWIG_NEWOBJMASK)
+#define SWIG_TMPOBJ                (SWIG_OK | SWIG_TMPOBJMASK)
+/* Check, add and del mask methods */
+#define SWIG_AddNewMask(r)         (SWIG_IsOK(r) ? (r | SWIG_NEWOBJMASK) : r)
+#define SWIG_DelNewMask(r)         (SWIG_IsOK(r) ? (r & ~SWIG_NEWOBJMASK) : r)
+#define SWIG_IsNewObj(r)           (SWIG_IsOK(r) && (r & SWIG_NEWOBJMASK))
+#define SWIG_AddTmpMask(r)         (SWIG_IsOK(r) ? (r | SWIG_TMPOBJMASK) : r)
+#define SWIG_DelTmpMask(r)         (SWIG_IsOK(r) ? (r & ~SWIG_TMPOBJMASK) : r)
+#define SWIG_IsTmpObj(r)           (SWIG_IsOK(r) && (r & SWIG_TMPOBJMASK))
+
+
+/* Cast-Rank Mode */
+#if defined(SWIG_CASTRANK_MODE)
+#  ifndef SWIG_TypeRank
+#    define SWIG_TypeRank             unsigned long
+#  endif
+#  ifndef SWIG_MAXCASTRANK            /* Default cast allowed */
+#    define SWIG_MAXCASTRANK          (2)
+#  endif
+#  define SWIG_CASTRANKMASK          ((SWIG_CASTRANKLIMIT) -1)
+#  define SWIG_CastRank(r)           (r & SWIG_CASTRANKMASK)
+SWIGINTERNINLINE int SWIG_AddCast(int r) { 
+  return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r;
+}
+SWIGINTERNINLINE int SWIG_CheckState(int r) { 
+  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; 
+}
+#else /* no cast-rank mode */
+#  define SWIG_AddCast
+#  define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
+#endif
+
+
+
+
+#include <string.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef void *(*swig_converter_func)(void *);
+typedef struct swig_type_info *(*swig_dycast_func)(void **);
+
+/* Structure to store inforomation on one type */
+typedef struct swig_type_info {
+  const char             *name;			/* mangled name of this type */
+  const char             *str;			/* human readable name of this type */
+  swig_dycast_func        dcast;		/* dynamic cast function down a hierarchy */
+  struct swig_cast_info  *cast;			/* linked list of types that can cast into this type */
+  void                   *clientdata;		/* language specific type data */
+  int                    owndata;		/* flag if the structure owns the clientdata */
+} swig_type_info;
+
+/* Structure to store a type and conversion function used for casting */
+typedef struct swig_cast_info {
+  swig_type_info         *type;			/* pointer to type that is equivalent to this type */
+  swig_converter_func     converter;		/* function to cast the void pointers */
+  struct swig_cast_info  *next;			/* pointer to next cast in linked list */
+  struct swig_cast_info  *prev;			/* pointer to the previous cast */
+} swig_cast_info;
+
+/* Structure used to store module information
+ * Each module generates one structure like this, and the runtime collects
+ * all of these structures and stores them in a circularly linked list.*/
+typedef struct swig_module_info {
+  swig_type_info         **types;		/* Array of pointers to swig_type_info structures that are in this module */
+  size_t                 size;		        /* Number of types in this module */
+  struct swig_module_info *next;		/* Pointer to next element in circularly linked list */
+  swig_type_info         **type_initial;	/* Array of initially generated type structures */
+  swig_cast_info         **cast_initial;	/* Array of initially generated casting structures */
+  void                    *clientdata;		/* Language specific module data */
+} swig_module_info;
+
+/* 
+  Compare two type names skipping the space characters, therefore
+  "char*" == "char *" and "Class<int>" == "Class<int >", etc.
+
+  Return 0 when the two name types are equivalent, as in
+  strncmp, but skipping ' '.
+*/
+SWIGRUNTIME int
+SWIG_TypeNameComp(const char *f1, const char *l1,
+		  const char *f2, const char *l2) {
+  for (;(f1 != l1) && (f2 != l2); ++f1, ++f2) {
+    while ((*f1 == ' ') && (f1 != l1)) ++f1;
+    while ((*f2 == ' ') && (f2 != l2)) ++f2;
+    if (*f1 != *f2) return (*f1 > *f2) ? 1 : -1;
+  }
+  return (l1 - f1) - (l2 - f2);
+}
+
+/*
+  Check type equivalence in a name list like <name1>|<name2>|...
+  Return 0 if not equal, 1 if equal
+*/
+SWIGRUNTIME int
+SWIG_TypeEquiv(const char *nb, const char *tb) {
+  int equiv = 0;
+  const char* te = tb + strlen(tb);
+  const char* ne = nb;
+  while (!equiv && *ne) {
+    for (nb = ne; *ne; ++ne) {
+      if (*ne == '|') break;
+    }
+    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
+    if (*ne) ++ne;
+  }
+  return equiv;
+}
+
+/*
+  Check type equivalence in a name list like <name1>|<name2>|...
+  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
+*/
+SWIGRUNTIME int
+SWIG_TypeCompare(const char *nb, const char *tb) {
+  int equiv = 0;
+  const char* te = tb + strlen(tb);
+  const char* ne = nb;
+  while (!equiv && *ne) {
+    for (nb = ne; *ne; ++ne) {
+      if (*ne == '|') break;
+    }
+    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
+    if (*ne) ++ne;
+  }
+  return equiv;
+}
+
+
+/* think of this as a c++ template<> or a scheme macro */
+#define SWIG_TypeCheck_Template(comparison, ty)         \
+  if (ty) {                                             \
+    swig_cast_info *iter = ty->cast;                    \
+    while (iter) {                                      \
+      if (comparison) {                                 \
+        if (iter == ty->cast) return iter;              \
+        /* Move iter to the top of the linked list */   \
+        iter->prev->next = iter->next;                  \
+        if (iter->next)                                 \
+          iter->next->prev = iter->prev;                \
+        iter->next = ty->cast;                          \
+        iter->prev = 0;                                 \
+        if (ty->cast) ty->cast->prev = iter;            \
+        ty->cast = iter;                                \
+        return iter;                                    \
+      }                                                 \
+      iter = iter->next;                                \
+    }                                                   \
+  }                                                     \
+  return 0
+
+/*
+  Check the typename
+*/
+SWIGRUNTIME swig_cast_info *
+SWIG_TypeCheck(const char *c, swig_type_info *ty) {
+  SWIG_TypeCheck_Template(strcmp(iter->type->name, c) == 0, ty);
+}
+
+/* Same as previous function, except strcmp is replaced with a pointer comparison */
+SWIGRUNTIME swig_cast_info *
+SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *into) {
+  SWIG_TypeCheck_Template(iter->type == from, into);
+}
+
+/*
+  Cast a pointer up an inheritance hierarchy
+*/
+SWIGRUNTIMEINLINE void *
+SWIG_TypeCast(swig_cast_info *ty, void *ptr) {
+  return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr);
+}
+
+/* 
+   Dynamic pointer casting. Down an inheritance hierarchy
+*/
+SWIGRUNTIME swig_type_info *
+SWIG_TypeDynamicCast(swig_type_info *ty, void **ptr) {
+  swig_type_info *lastty = ty;
+  if (!ty || !ty->dcast) return ty;
+  while (ty && (ty->dcast)) {
+    ty = (*ty->dcast)(ptr);
+    if (ty) lastty = ty;
+  }
+  return lastty;
+}
+
+/*
+  Return the name associated with this type
+*/
+SWIGRUNTIMEINLINE const char *
+SWIG_TypeName(const swig_type_info *ty) {
+  return ty->name;
+}
+
+/*
+  Return the pretty name associated with this type,
+  that is an unmangled type name in a form presentable to the user.
+*/
+SWIGRUNTIME const char *
+SWIG_TypePrettyName(const swig_type_info *type) {
+  /* The "str" field contains the equivalent pretty names of the
+     type, separated by vertical-bar characters.  We choose
+     to print the last name, as it is often (?) the most
+     specific. */
+  if (!type) return NULL;
+  if (type->str != NULL) {
+    const char *last_name = type->str;
+    const char *s;
+    for (s = type->str; *s; s++)
+      if (*s == '|') last_name = s+1;
+    return last_name;
+  }
+  else
+    return type->name;
+}
+
+/* 
+   Set the clientdata field for a type
+*/
+SWIGRUNTIME void
+SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
+  swig_cast_info *cast = ti->cast;
+  /* if (ti->clientdata == clientdata) return; */
+  ti->clientdata = clientdata;
+  
+  while (cast) {
+    if (!cast->converter) {
+      swig_type_info *tc = cast->type;
+      if (!tc->clientdata) {
+	SWIG_TypeClientData(tc, clientdata);
+      }
+    }    
+    cast = cast->next;
+  }
+}
+SWIGRUNTIME void
+SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) {
+  SWIG_TypeClientData(ti, clientdata);
+  ti->owndata = 1;
+}
+  
+/*
+  Search for a swig_type_info structure only by mangled name
+  Search is a O(log #types)
+  
+  We start searching at module start, and finish searching when start == end.  
+  Note: if start == end at the beginning of the function, we go all the way around
+  the circular list.
+*/
+SWIGRUNTIME swig_type_info *
+SWIG_MangledTypeQueryModule(swig_module_info *start, 
+                            swig_module_info *end, 
+		            const char *name) {
+  swig_module_info *iter = start;
+  do {
+    if (iter->size) {
+      register size_t l = 0;
+      register size_t r = iter->size - 1;
+      do {
+	/* since l+r >= 0, we can (>> 1) instead (/ 2) */
+	register size_t i = (l + r) >> 1; 
+	const char *iname = iter->types[i]->name;
+	if (iname) {
+	  register int compare = strcmp(name, iname);
+	  if (compare == 0) {	    
+	    return iter->types[i];
+	  } else if (compare < 0) {
+	    if (i) {
+	      r = i - 1;
+	    } else {
+	      break;
+	    }
+	  } else if (compare > 0) {
+	    l = i + 1;
+	  }
+	} else {
+	  break; /* should never happen */
+	}
+      } while (l <= r);
+    }
+    iter = iter->next;
+  } while (iter != end);
+  return 0;
+}
+
+/*
+  Search for a swig_type_info structure for either a mangled name or a human readable name.
+  It first searches the mangled names of the types, which is a O(log #types)
+  If a type is not found it then searches the human readable names, which is O(#types).
+  
+  We start searching at module start, and finish searching when start == end.  
+  Note: if start == end at the beginning of the function, we go all the way around
+  the circular list.
+*/
+SWIGRUNTIME swig_type_info *
+SWIG_TypeQueryModule(swig_module_info *start, 
+                     swig_module_info *end, 
+		     const char *name) {
+  /* STEP 1: Search the name field using binary search */
+  swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name);
+  if (ret) {
+    return ret;
+  } else {
+    /* STEP 2: If the type hasn't been found, do a complete search
+       of the str field (the human readable name) */
+    swig_module_info *iter = start;
+    do {
+      register size_t i = 0;
+      for (; i < iter->size; ++i) {
+	if (iter->types[i]->str && (SWIG_TypeEquiv(iter->types[i]->str, name)))
+	  return iter->types[i];
+      }
+      iter = iter->next;
+    } while (iter != end);
+  }
+  
+  /* neither found a match */
+  return 0;
+}
+
+/* 
+   Pack binary data into a string
+*/
+SWIGRUNTIME char *
+SWIG_PackData(char *c, void *ptr, size_t sz) {
+  static const char hex[17] = "0123456789abcdef";
+  register const unsigned char *u = (unsigned char *) ptr;
+  register const unsigned char *eu =  u + sz;
+  for (; u != eu; ++u) {
+    register unsigned char uu = *u;
+    *(c++) = hex[(uu & 0xf0) >> 4];
+    *(c++) = hex[uu & 0xf];
+  }
+  return c;
+}
+
+/* 
+   Unpack binary data from a string
+*/
+SWIGRUNTIME const char *
+SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
+  register unsigned char *u = (unsigned char *) ptr;
+  register const unsigned char *eu = u + sz;
+  for (; u != eu; ++u) {
+    register char d = *(c++);
+    register unsigned char uu;
+    if ((d >= '0') && (d <= '9'))
+      uu = ((d - '0') << 4);
+    else if ((d >= 'a') && (d <= 'f'))
+      uu = ((d - ('a'-10)) << 4);
+    else 
+      return (char *) 0;
+    d = *(c++);
+    if ((d >= '0') && (d <= '9'))
+      uu |= (d - '0');
+    else if ((d >= 'a') && (d <= 'f'))
+      uu |= (d - ('a'-10));
+    else 
+      return (char *) 0;
+    *u = uu;
+  }
+  return c;
+}
+
+/* 
+   Pack 'void *' into a string buffer.
+*/
+SWIGRUNTIME char *
+SWIG_PackVoidPtr(char *buff, void *ptr, const char *name, size_t bsz) {
+  char *r = buff;
+  if ((2*sizeof(void *) + 2) > bsz) return 0;
+  *(r++) = '_';
+  r = SWIG_PackData(r,&ptr,sizeof(void *));
+  if (strlen(name) + 1 > (bsz - (r - buff))) return 0;
+  strcpy(r,name);
+  return buff;
+}
+
+SWIGRUNTIME const char *
+SWIG_UnpackVoidPtr(const char *c, void **ptr, const char *name) {
+  if (*c != '_') {
+    if (strcmp(c,"NULL") == 0) {
+      *ptr = (void *) 0;
+      return name;
+    } else {
+      return 0;
+    }
+  }
+  return SWIG_UnpackData(++c,ptr,sizeof(void *));
+}
+
+SWIGRUNTIME char *
+SWIG_PackDataName(char *buff, void *ptr, size_t sz, const char *name, size_t bsz) {
+  char *r = buff;
+  size_t lname = (name ? strlen(name) : 0);
+  if ((2*sz + 2 + lname) > bsz) return 0;
+  *(r++) = '_';
+  r = SWIG_PackData(r,ptr,sz);
+  if (lname) {
+    strncpy(r,name,lname+1);
+  } else {
+    *r = 0;
+  }
+  return buff;
+}
+
+SWIGRUNTIME const char *
+SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
+  if (*c != '_') {
+    if (strcmp(c,"NULL") == 0) {
+      memset(ptr,0,sz);
+      return name;
+    } else {
+      return 0;
+    }
+  }
+  return SWIG_UnpackData(++c,ptr,sz);
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+/*  Errors in SWIG */
+#define  SWIG_UnknownError    	   -1 
+#define  SWIG_IOError        	   -2 
+#define  SWIG_RuntimeError   	   -3 
+#define  SWIG_IndexError     	   -4 
+#define  SWIG_TypeError      	   -5 
+#define  SWIG_DivisionByZero 	   -6 
+#define  SWIG_OverflowError  	   -7 
+#define  SWIG_SyntaxError    	   -8 
+#define  SWIG_ValueError     	   -9 
+#define  SWIG_SystemError    	   -10
+#define  SWIG_AttributeError 	   -11
+#define  SWIG_MemoryError    	   -12 
+#define  SWIG_NullReferenceError   -13
+
+
+
+
+/* Add PyOS_snprintf for old Pythons */
+#if PY_VERSION_HEX < 0x02020000
+# if defined(_MSC_VER) || defined(__BORLANDC__) || defined(_WATCOM)
+#  define PyOS_snprintf _snprintf
+# else
+#  define PyOS_snprintf snprintf
+# endif
+#endif
+
+/* A crude PyString_FromFormat implementation for old Pythons */
+#if PY_VERSION_HEX < 0x02020000
+
+#ifndef SWIG_PYBUFFER_SIZE
+# define SWIG_PYBUFFER_SIZE 1024
+#endif
+
+static PyObject *
+PyString_FromFormat(const char *fmt, ...) {
+  va_list ap;
+  char buf[SWIG_PYBUFFER_SIZE * 2];
+  int res;
+  va_start(ap, fmt);
+  res = vsnprintf(buf, sizeof(buf), fmt, ap);
+  va_end(ap);
+  return (res < 0 || res >= (int)sizeof(buf)) ? 0 : PyString_FromString(buf);
+}
+#endif
+
+/* Add PyObject_Del for old Pythons */
+#if PY_VERSION_HEX < 0x01060000
+# define PyObject_Del(op) PyMem_DEL((op))
+#endif
+#ifndef PyObject_DEL
+# define PyObject_DEL PyObject_Del
+#endif
+
+/* A crude PyExc_StopIteration exception for old Pythons */
+#if PY_VERSION_HEX < 0x02020000
+# ifndef PyExc_StopIteration
+#  define PyExc_StopIteration PyExc_RuntimeError
+# endif
+# ifndef PyObject_GenericGetAttr
+#  define PyObject_GenericGetAttr 0
+# endif
+#endif
+/* Py_NotImplemented is defined in 2.1 and up. */
+#if PY_VERSION_HEX < 0x02010000
+# ifndef Py_NotImplemented
+#  define Py_NotImplemented PyExc_RuntimeError
+# endif
+#endif
+
+
+/* A crude PyString_AsStringAndSize implementation for old Pythons */
+#if PY_VERSION_HEX < 0x02010000
+# ifndef PyString_AsStringAndSize
+#  define PyString_AsStringAndSize(obj, s, len) {*s = PyString_AsString(obj); *len = *s ? strlen(*s) : 0;}
+# endif
+#endif
+
+/* PySequence_Size for old Pythons */
+#if PY_VERSION_HEX < 0x02000000
+# ifndef PySequence_Size
+#  define PySequence_Size PySequence_Length
+# endif
+#endif
+
+
+/* PyBool_FromLong for old Pythons */
+#if PY_VERSION_HEX < 0x02030000
+static
+PyObject *PyBool_FromLong(long ok)
+{
+  PyObject *result = ok ? Py_True : Py_False;
+  Py_INCREF(result);
+  return result;
+}
+#endif
+
+/* Py_ssize_t for old Pythons */
+/* This code is as recommended by: */
+/* http://www.python.org/dev/peps/pep-0353/#conversion-guidelines */
+#if PY_VERSION_HEX < 0x02050000 && !defined(PY_SSIZE_T_MIN)
+typedef int Py_ssize_t;
+# define PY_SSIZE_T_MAX INT_MAX
+# define PY_SSIZE_T_MIN INT_MIN
+#endif
+
+/* -----------------------------------------------------------------------------
+ * error manipulation
+ * ----------------------------------------------------------------------------- */
+
+SWIGRUNTIME PyObject*
+SWIG_Python_ErrorType(int code) {
+  PyObject* type = 0;
+  switch(code) {
+  case SWIG_MemoryError:
+    type = PyExc_MemoryError;
+    break;
+  case SWIG_IOError:
+    type = PyExc_IOError;
+    break;
+  case SWIG_RuntimeError:
+    type = PyExc_RuntimeError;
+    break;
+  case SWIG_IndexError:
+    type = PyExc_IndexError;
+    break;
+  case SWIG_TypeError:
+    type = PyExc_TypeError;
+    break;
+  case SWIG_DivisionByZero:
+    type = PyExc_ZeroDivisionError;
+    break;
+  case SWIG_OverflowError:
+    type = PyExc_OverflowError;
+    break;
+  case SWIG_SyntaxError:
+    type = PyExc_SyntaxError;
+    break;
+  case SWIG_ValueError:
+    type = PyExc_ValueError;
+    break;
+  case SWIG_SystemError:
+    type = PyExc_SystemError;
+    break;
+  case SWIG_AttributeError:
+    type = PyExc_AttributeError;
+    break;
+  default:
+    type = PyExc_RuntimeError;
+  }
+  return type;
+}
+
+
+SWIGRUNTIME void
+SWIG_Python_AddErrorMsg(const char* mesg)
+{
+  PyObject *type = 0;
+  PyObject *value = 0;
+  PyObject *traceback = 0;
+
+  if (PyErr_Occurred()) PyErr_Fetch(&type, &value, &traceback);
+  if (value) {
+    PyObject *old_str = PyObject_Str(value);
+    PyErr_Clear();
+    Py_XINCREF(type);
+    PyErr_Format(type, "%s %s", PyString_AsString(old_str), mesg);
+    Py_DECREF(old_str);
+    Py_DECREF(value);
+  } else {
+    PyErr_Format(PyExc_RuntimeError, mesg);
+  }
+}
+
+
+
+#if defined(SWIG_PYTHON_NO_THREADS)
+#  if defined(SWIG_PYTHON_THREADS)
+#    undef SWIG_PYTHON_THREADS
+#  endif
+#endif
+#if defined(SWIG_PYTHON_THREADS) /* Threading support is enabled */
+#  if !defined(SWIG_PYTHON_USE_GIL) && !defined(SWIG_PYTHON_NO_USE_GIL)
+#    if (PY_VERSION_HEX >= 0x02030000) /* For 2.3 or later, use the PyGILState calls */
+#      define SWIG_PYTHON_USE_GIL
+#    endif
+#  endif
+#  if defined(SWIG_PYTHON_USE_GIL) /* Use PyGILState threads calls */
+#    ifndef SWIG_PYTHON_INITIALIZE_THREADS
+#     define SWIG_PYTHON_INITIALIZE_THREADS  PyEval_InitThreads() 
+#    endif
+#    ifdef __cplusplus /* C++ code */
+       class SWIG_Python_Thread_Block {
+         bool status;
+         PyGILState_STATE state;
+       public:
+         void end() { if (status) { PyGILState_Release(state); status = false;} }
+         SWIG_Python_Thread_Block() : status(true), state(PyGILState_Ensure()) {}
+         ~SWIG_Python_Thread_Block() { end(); }
+       };
+       class SWIG_Python_Thread_Allow {
+         bool status;
+         PyThreadState *save;
+       public:
+         void end() { if (status) { PyEval_RestoreThread(save); status = false; }}
+         SWIG_Python_Thread_Allow() : status(true), save(PyEval_SaveThread()) {}
+         ~SWIG_Python_Thread_Allow() { end(); }
+       };
+#      define SWIG_PYTHON_THREAD_BEGIN_BLOCK   SWIG_Python_Thread_Block _swig_thread_block
+#      define SWIG_PYTHON_THREAD_END_BLOCK     _swig_thread_block.end()
+#      define SWIG_PYTHON_THREAD_BEGIN_ALLOW   SWIG_Python_Thread_Allow _swig_thread_allow
+#      define SWIG_PYTHON_THREAD_END_ALLOW     _swig_thread_allow.end()
+#    else /* C code */
+#      define SWIG_PYTHON_THREAD_BEGIN_BLOCK   PyGILState_STATE _swig_thread_block = PyGILState_Ensure()
+#      define SWIG_PYTHON_THREAD_END_BLOCK     PyGILState_Release(_swig_thread_block)
+#      define SWIG_PYTHON_THREAD_BEGIN_ALLOW   PyThreadState *_swig_thread_allow = PyEval_SaveThread()
+#      define SWIG_PYTHON_THREAD_END_ALLOW     PyEval_RestoreThread(_swig_thread_allow)
+#    endif
+#  else /* Old thread way, not implemented, user must provide it */
+#    if !defined(SWIG_PYTHON_INITIALIZE_THREADS)
+#      define SWIG_PYTHON_INITIALIZE_THREADS
+#    endif
+#    if !defined(SWIG_PYTHON_THREAD_BEGIN_BLOCK)
+#      define SWIG_PYTHON_THREAD_BEGIN_BLOCK
+#    endif
+#    if !defined(SWIG_PYTHON_THREAD_END_BLOCK)
+#      define SWIG_PYTHON_THREAD_END_BLOCK
+#    endif
+#    if !defined(SWIG_PYTHON_THREAD_BEGIN_ALLOW)
+#      define SWIG_PYTHON_THREAD_BEGIN_ALLOW
+#    endif
+#    if !defined(SWIG_PYTHON_THREAD_END_ALLOW)
+#      define SWIG_PYTHON_THREAD_END_ALLOW
+#    endif
+#  endif
+#else /* No thread support */
+#  define SWIG_PYTHON_INITIALIZE_THREADS
+#  define SWIG_PYTHON_THREAD_BEGIN_BLOCK
+#  define SWIG_PYTHON_THREAD_END_BLOCK
+#  define SWIG_PYTHON_THREAD_BEGIN_ALLOW
+#  define SWIG_PYTHON_THREAD_END_ALLOW
+#endif
+
+/* -----------------------------------------------------------------------------
+ * Python API portion that goes into the runtime
+ * ----------------------------------------------------------------------------- */
+
+#ifdef __cplusplus
+extern "C" {
+#if 0
+} /* cc-mode */
+#endif
+#endif
+
+/* -----------------------------------------------------------------------------
+ * Constant declarations
+ * ----------------------------------------------------------------------------- */
+
+/* Constant Types */
+#define SWIG_PY_POINTER 4
+#define SWIG_PY_BINARY  5
+
+/* Constant information structure */
+typedef struct swig_const_info {
+  int type;
+  char *name;
+  long lvalue;
+  double dvalue;
+  void   *pvalue;
+  swig_type_info **ptype;
+} swig_const_info;
+
+#ifdef __cplusplus
+#if 0
+{ /* cc-mode */
+#endif
+}
+#endif
+
+
+/* -----------------------------------------------------------------------------
+ * See the LICENSE file for information on copyright, usage and redistribution
+ * of SWIG, and the README file for authors - http://www.swig.org/release.html.
+ *
+ * pyrun.swg
+ *
+ * This file contains the runtime support for Python modules
+ * and includes code for managing global variables and pointer
+ * type checking.
+ *
+ * ----------------------------------------------------------------------------- */
+
+/* Common SWIG API */
+
+/* for raw pointers */
+#define SWIG_Python_ConvertPtr(obj, pptr, type, flags)  SWIG_Python_ConvertPtrAndOwn(obj, pptr, type, flags, 0)
+#define SWIG_ConvertPtr(obj, pptr, type, flags)         SWIG_Python_ConvertPtr(obj, pptr, type, flags)
+#define SWIG_ConvertPtrAndOwn(obj,pptr,type,flags,own)  SWIG_Python_ConvertPtrAndOwn(obj, pptr, type, flags, own)
+#define SWIG_NewPointerObj(ptr, type, flags)            SWIG_Python_NewPointerObj(ptr, type, flags)
+#define SWIG_CheckImplicit(ty)                          SWIG_Python_CheckImplicit(ty) 
+#define SWIG_AcquirePtr(ptr, src)                       SWIG_Python_AcquirePtr(ptr, src)
+#define swig_owntype                                    int
+
+/* for raw packed data */
+#define SWIG_ConvertPacked(obj, ptr, sz, ty)            SWIG_Python_ConvertPacked(obj, ptr, sz, ty)
+#define SWIG_NewPackedObj(ptr, sz, type)                SWIG_Python_NewPackedObj(ptr, sz, type)
+
+/* for class or struct pointers */
+#define SWIG_ConvertInstance(obj, pptr, type, flags)    SWIG_ConvertPtr(obj, pptr, type, flags)
+#define SWIG_NewInstanceObj(ptr, type, flags)           SWIG_NewPointerObj(ptr, type, flags)
+
+/* for C or C++ function pointers */
+#define SWIG_ConvertFunctionPtr(obj, pptr, type)        SWIG_Python_ConvertFunctionPtr(obj, pptr, type)
+#define SWIG_NewFunctionPtrObj(ptr, type)               SWIG_Python_NewPointerObj(ptr, type, 0)
+
+/* for C++ member pointers, ie, member methods */
+#define SWIG_ConvertMember(obj, ptr, sz, ty)            SWIG_Python_ConvertPacked(obj, ptr, sz, ty)
+#define SWIG_NewMemberObj(ptr, sz, type)                SWIG_Python_NewPackedObj(ptr, sz, type)
+
+
+/* Runtime API */
+
+#define SWIG_GetModule(clientdata)                      SWIG_Python_GetModule()
+#define SWIG_SetModule(clientdata, pointer)             SWIG_Python_SetModule(pointer)
+#define SWIG_NewClientData(obj)                         PySwigClientData_New(obj)
+
+#define SWIG_SetErrorObj                                SWIG_Python_SetErrorObj                            
+#define SWIG_SetErrorMsg                        	SWIG_Python_SetErrorMsg				   
+#define SWIG_ErrorType(code)                    	SWIG_Python_ErrorType(code)                        
+#define SWIG_Error(code, msg)            		SWIG_Python_SetErrorMsg(SWIG_ErrorType(code), msg) 
+#define SWIG_fail                        		goto fail					   
+
+
+/* Runtime API implementation */
+
+/* Error manipulation */
+
+SWIGINTERN void 
+SWIG_Python_SetErrorObj(PyObject *errtype, PyObject *obj) {
+  SWIG_PYTHON_THREAD_BEGIN_BLOCK; 
+  PyErr_SetObject(errtype, obj);
+  Py_DECREF(obj);
+  SWIG_PYTHON_THREAD_END_BLOCK;
+}
+
+SWIGINTERN void 
+SWIG_Python_SetErrorMsg(PyObject *errtype, const char *msg) {
+  SWIG_PYTHON_THREAD_BEGIN_BLOCK;
+  PyErr_SetString(errtype, (char *) msg);
+  SWIG_PYTHON_THREAD_END_BLOCK;
+}
+
+#define SWIG_Python_Raise(obj, type, desc)  SWIG_Python_SetErrorObj(SWIG_Python_ExceptionType(desc), obj)
+
+/* Set a constant value */
+
+SWIGINTERN void
+SWIG_Python_SetConstant(PyObject *d, const char *name, PyObject *obj) {   
+  PyDict_SetItemString(d, (char*) name, obj);
+  Py_DECREF(obj);                            
+}
+
+/* Append a value to the result obj */
+
+SWIGINTERN PyObject*
+SWIG_Python_AppendOutput(PyObject* result, PyObject* obj) {
+#if !defined(SWIG_PYTHON_OUTPUT_TUPLE)
+  if (!result) {
+    result = obj;
+  } else if (result == Py_None) {
+    Py_DECREF(result);
+    result = obj;
+  } else {
+    if (!PyList_Check(result)) {
+      PyObject *o2 = result;
+      result = PyList_New(1);
+      PyList_SetItem(result, 0, o2);
+    }
+    PyList_Append(result,obj);
+    Py_DECREF(obj);
+  }
+  return result;
+#else
+  PyObject*   o2;
+  PyObject*   o3;
+  if (!result) {
+    result = obj;
+  } else if (result == Py_None) {
+    Py_DECREF(result);
+    result = obj;
+  } else {
+    if (!PyTuple_Check(result)) {
+      o2 = result;
+      result = PyTuple_New(1);
+      PyTuple_SET_ITEM(result, 0, o2);
+    }
+    o3 = PyTuple_New(1);
+    PyTuple_SET_ITEM(o3, 0, obj);
+    o2 = result;
+    result = PySequence_Concat(o2, o3);
+    Py_DECREF(o2);
+    Py_DECREF(o3);
+  }
+  return result;
+#endif
+}
+
+/* Unpack the argument tuple */
+
+SWIGINTERN int
+SWIG_Python_UnpackTuple(PyObject *args, const char *name, int min, int max, PyObject **objs)
+{
+  if (!args) {
+    if (!min && !max) {
+      return 1;
+    } else {
+      PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got none", 
+		   name, (min == max ? "" : "at least "), min);
+      return 0;
+    }
+  }  
+  if (!PyTuple_Check(args)) {
+    PyErr_SetString(PyExc_SystemError, "UnpackTuple() argument list is not a tuple");
+    return 0;
+  } else {
+    register int l = PyTuple_GET_SIZE(args);
+    if (l < min) {
+      PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got %d", 
+		   name, (min == max ? "" : "at least "), min, l);
+      return 0;
+    } else if (l > max) {
+      PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got %d", 
+		   name, (min == max ? "" : "at most "), max, l);
+      return 0;
+    } else {
+      register int i;
+      for (i = 0; i < l; ++i) {
+	objs[i] = PyTuple_GET_ITEM(args, i);
+      }
+      for (; l < max; ++l) {
+	objs[l] = 0;
+      }
+      return i + 1;
+    }    
+  }
+}
+
+/* A functor is a function object with one single object argument */
+#if PY_VERSION_HEX >= 0x02020000
+#define SWIG_Python_CallFunctor(functor, obj)	        PyObject_CallFunctionObjArgs(functor, obj, NULL);
+#else
+#define SWIG_Python_CallFunctor(functor, obj)	        PyObject_CallFunction(functor, "O", obj);
+#endif
+
+/*
+  Helper for static pointer initialization for both C and C++ code, for example
+  static PyObject *SWIG_STATIC_POINTER(MyVar) = NewSomething(...);
+*/
+#ifdef __cplusplus
+#define SWIG_STATIC_POINTER(var)  var
+#else
+#define SWIG_STATIC_POINTER(var)  var = 0; if (!var) var
+#endif
+
+/* -----------------------------------------------------------------------------
+ * Pointer declarations
+ * ----------------------------------------------------------------------------- */
+
+/* Flags for new pointer objects */
+#define SWIG_POINTER_NOSHADOW       (SWIG_POINTER_OWN      << 1)
+#define SWIG_POINTER_NEW            (SWIG_POINTER_NOSHADOW | SWIG_POINTER_OWN)
+
+#define SWIG_POINTER_IMPLICIT_CONV  (SWIG_POINTER_DISOWN   << 1)
+
+#ifdef __cplusplus
+extern "C" {
+#if 0
+} /* cc-mode */
+#endif
+#endif
+
+/*  How to access Py_None */
+#if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+#  ifndef SWIG_PYTHON_NO_BUILD_NONE
+#    ifndef SWIG_PYTHON_BUILD_NONE
+#      define SWIG_PYTHON_BUILD_NONE
+#    endif
+#  endif
+#endif
+
+#ifdef SWIG_PYTHON_BUILD_NONE
+#  ifdef Py_None
+#   undef Py_None
+#   define Py_None SWIG_Py_None()
+#  endif
+SWIGRUNTIMEINLINE PyObject * 
+_SWIG_Py_None(void)
+{
+  PyObject *none = Py_BuildValue((char*)"");
+  Py_DECREF(none);
+  return none;
+}
+SWIGRUNTIME PyObject * 
+SWIG_Py_None(void)
+{
+  static PyObject *SWIG_STATIC_POINTER(none) = _SWIG_Py_None();
+  return none;
+}
+#endif
+
+/* The python void return value */
+
+SWIGRUNTIMEINLINE PyObject * 
+SWIG_Py_Void(void)
+{
+  PyObject *none = Py_None;
+  Py_INCREF(none);
+  return none;
+}
+
+/* PySwigClientData */
+
+typedef struct {
+  PyObject *klass;
+  PyObject *newraw;
+  PyObject *newargs;
+  PyObject *destroy;
+  int delargs;
+  int implicitconv;
+} PySwigClientData;
+
+SWIGRUNTIMEINLINE int 
+SWIG_Python_CheckImplicit(swig_type_info *ty)
+{
+  PySwigClientData *data = (PySwigClientData *)ty->clientdata;
+  return data ? data->implicitconv : 0;
+}
+
+SWIGRUNTIMEINLINE PyObject *
+SWIG_Python_ExceptionType(swig_type_info *desc) {
+  PySwigClientData *data = desc ? (PySwigClientData *) desc->clientdata : 0;
+  PyObject *klass = data ? data->klass : 0;
+  return (klass ? klass : PyExc_RuntimeError);
+}
+
+
+SWIGRUNTIME PySwigClientData * 
+PySwigClientData_New(PyObject* obj)
+{
+  if (!obj) {
+    return 0;
+  } else {
+    PySwigClientData *data = (PySwigClientData *)malloc(sizeof(PySwigClientData));
+    /* the klass element */
+    data->klass = obj;
+    Py_INCREF(data->klass);
+    /* the newraw method and newargs arguments used to create a new raw instance */
+    if (PyClass_Check(obj)) {
+      data->newraw = 0;
+      data->newargs = obj;
+      Py_INCREF(obj);
+    } else {
+#if (PY_VERSION_HEX < 0x02020000)
+      data->newraw = 0;
+#else
+      data->newraw = PyObject_GetAttrString(data->klass, (char *)"__new__");
+#endif
+      if (data->newraw) {
+	Py_INCREF(data->newraw);
+	data->newargs = PyTuple_New(1);
+	PyTuple_SetItem(data->newargs, 0, obj);
+      } else {
+	data->newargs = obj;
+      }
+      Py_INCREF(data->newargs);
+    }
+    /* the destroy method, aka as the C++ delete method */
+    data->destroy = PyObject_GetAttrString(data->klass, (char *)"__swig_destroy__");
+    if (PyErr_Occurred()) {
+      PyErr_Clear();
+      data->destroy = 0;
+    }
+    if (data->destroy) {
+      int flags;
+      Py_INCREF(data->destroy);
+      flags = PyCFunction_GET_FLAGS(data->destroy);
+#ifdef METH_O
+      data->delargs = !(flags & (METH_O));
+#else
+      data->delargs = 0;
+#endif
+    } else {
+      data->delargs = 0;
+    }
+    data->implicitconv = 0;
+    return data;
+  }
+}
+
+SWIGRUNTIME void 
+PySwigClientData_Del(PySwigClientData* data)
+{
+  Py_XDECREF(data->newraw);
+  Py_XDECREF(data->newargs);
+  Py_XDECREF(data->destroy);
+}
+
+/* =============== PySwigObject =====================*/
+
+typedef struct {
+  PyObject_HEAD
+  void *ptr;
+  swig_type_info *ty;
+  int own;
+  PyObject *next;
+} PySwigObject;
+
+SWIGRUNTIME PyObject *
+PySwigObject_long(PySwigObject *v)
+{
+  return PyLong_FromVoidPtr(v->ptr);
+}
+
+SWIGRUNTIME PyObject *
+PySwigObject_format(const char* fmt, PySwigObject *v)
+{
+  PyObject *res = NULL;
+  PyObject *args = PyTuple_New(1);
+  if (args) {
+    if (PyTuple_SetItem(args, 0, PySwigObject_long(v)) == 0) {
+      PyObject *ofmt = PyString_FromString(fmt);
+      if (ofmt) {
+	res = PyString_Format(ofmt,args);
+	Py_DECREF(ofmt);
+      }
+      Py_DECREF(args);
+    }
+  }
+  return res;
+}
+
+SWIGRUNTIME PyObject *
+PySwigObject_oct(PySwigObject *v)
+{
+  return PySwigObject_format("%o",v);
+}
+
+SWIGRUNTIME PyObject *
+PySwigObject_hex(PySwigObject *v)
+{
+  return PySwigObject_format("%x",v);
+}
+
+SWIGRUNTIME PyObject *
+#ifdef METH_NOARGS
+PySwigObject_repr(PySwigObject *v)
+#else
+PySwigObject_repr(PySwigObject *v, PyObject *args)
+#endif
+{
+  const char *name = SWIG_TypePrettyName(v->ty);
+  PyObject *hex = PySwigObject_hex(v);    
+  PyObject *repr = PyString_FromFormat("<Swig Object of type '%s' at 0x%s>", name, PyString_AsString(hex));
+  Py_DECREF(hex);
+  if (v->next) {
+#ifdef METH_NOARGS
+    PyObject *nrep = PySwigObject_repr((PySwigObject *)v->next);
+#else
+    PyObject *nrep = PySwigObject_repr((PySwigObject *)v->next, args);
+#endif
+    PyString_ConcatAndDel(&repr,nrep);
+  }
+  return repr;  
+}
+
+SWIGRUNTIME int
+PySwigObject_print(PySwigObject *v, FILE *fp, int SWIGUNUSEDPARM(flags))
+{
+#ifdef METH_NOARGS
+  PyObject *repr = PySwigObject_repr(v);
+#else
+  PyObject *repr = PySwigObject_repr(v, NULL);
+#endif
+  if (repr) {
+    fputs(PyString_AsString(repr), fp);
+    Py_DECREF(repr);
+    return 0; 
+  } else {
+    return 1; 
+  }
+}
+
+SWIGRUNTIME PyObject *
+PySwigObject_str(PySwigObject *v)
+{
+  char result[SWIG_BUFFER_SIZE];
+  return SWIG_PackVoidPtr(result, v->ptr, v->ty->name, sizeof(result)) ?
+    PyString_FromString(result) : 0;
+}
+
+SWIGRUNTIME int
+PySwigObject_compare(PySwigObject *v, PySwigObject *w)
+{
+  void *i = v->ptr;
+  void *j = w->ptr;
+  return (i < j) ? -1 : ((i > j) ? 1 : 0);
+}
+
+SWIGRUNTIME PyTypeObject* _PySwigObject_type(void);
+
+SWIGRUNTIME PyTypeObject*
+PySwigObject_type(void) {
+  static PyTypeObject *SWIG_STATIC_POINTER(type) = _PySwigObject_type();
+  return type;
+}
+
+SWIGRUNTIMEINLINE int
+PySwigObject_Check(PyObject *op) {
+  return ((op)->ob_type == PySwigObject_type())
+    || (strcmp((op)->ob_type->tp_name,"PySwigObject") == 0);
+}
+
+SWIGRUNTIME PyObject *
+PySwigObject_New(void *ptr, swig_type_info *ty, int own);
+
+SWIGRUNTIME void
+PySwigObject_dealloc(PyObject *v)
+{
+  PySwigObject *sobj = (PySwigObject *) v;
+  PyObject *next = sobj->next;
+  if (sobj->own) {
+    swig_type_info *ty = sobj->ty;
+    PySwigClientData *data = ty ? (PySwigClientData *) ty->clientdata : 0;
+    PyObject *destroy = data ? data->destroy : 0;
+    if (destroy) {
+      /* destroy is always a VARARGS method */
+      PyObject *res;
+      if (data->delargs) {
+	/* we need to create a temporal object to carry the destroy operation */
+	PyObject *tmp = PySwigObject_New(sobj->ptr, ty, 0);
+	res = SWIG_Python_CallFunctor(destroy, tmp);
+	Py_DECREF(tmp);
+      } else {
+	PyCFunction meth = PyCFunction_GET_FUNCTION(destroy);
+	PyObject *mself = PyCFunction_GET_SELF(destroy);
+	res = ((*meth)(mself, v));
+      }
+      Py_XDECREF(res);
+    } else {
+      const char *name = SWIG_TypePrettyName(ty);
+#if !defined(SWIG_PYTHON_SILENT_MEMLEAK)
+      printf("swig/python detected a memory leak of type '%s', no destructor found.\n", name);
+#endif
+    }
+  } 
+  Py_XDECREF(next);
+  PyObject_DEL(v);
+}
+
+SWIGRUNTIME PyObject* 
+PySwigObject_append(PyObject* v, PyObject* next)
+{
+  PySwigObject *sobj = (PySwigObject *) v;
+#ifndef METH_O
+  PyObject *tmp = 0;
+  if (!PyArg_ParseTuple(next,(char *)"O:append", &tmp)) return NULL;
+  next = tmp;
+#endif
+  if (!PySwigObject_Check(next)) {
+    return NULL;
+  }
+  sobj->next = next;
+  Py_INCREF(next);
+  return SWIG_Py_Void();
+}
+
+SWIGRUNTIME PyObject* 
+#ifdef METH_NOARGS
+PySwigObject_next(PyObject* v)
+#else
+PySwigObject_next(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
+#endif
+{
+  PySwigObject *sobj = (PySwigObject *) v;
+  if (sobj->next) {    
+    Py_INCREF(sobj->next);
+    return sobj->next;
+  } else {
+    return SWIG_Py_Void();
+  }
+}
+
+SWIGINTERN PyObject*
+#ifdef METH_NOARGS
+PySwigObject_disown(PyObject *v)
+#else
+PySwigObject_disown(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
+#endif
+{
+  PySwigObject *sobj = (PySwigObject *)v;
+  sobj->own = 0;
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject*
+#ifdef METH_NOARGS
+PySwigObject_acquire(PyObject *v)
+#else
+PySwigObject_acquire(PyObject* v, PyObject *SWIGUNUSEDPARM(args))
+#endif
+{
+  PySwigObject *sobj = (PySwigObject *)v;
+  sobj->own = SWIG_POINTER_OWN;
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject*
+PySwigObject_own(PyObject *v, PyObject *args)
+{
+  PyObject *val = 0;
+#if (PY_VERSION_HEX < 0x02020000)
+  if (!PyArg_ParseTuple(args,(char *)"|O:own",&val))
+#else
+  if (!PyArg_UnpackTuple(args, (char *)"own", 0, 1, &val)) 
+#endif
+    {
+      return NULL;
+    } 
+  else
+    {
+      PySwigObject *sobj = (PySwigObject *)v;
+      PyObject *obj = PyBool_FromLong(sobj->own);
+      if (val) {
+#ifdef METH_NOARGS
+	if (PyObject_IsTrue(val)) {
+	  PySwigObject_acquire(v);
+	} else {
+	  PySwigObject_disown(v);
+	}
+#else
+	if (PyObject_IsTrue(val)) {
+	  PySwigObject_acquire(v,args);
+	} else {
+	  PySwigObject_disown(v,args);
+	}
+#endif
+      } 
+      return obj;
+    }
+}
+
+#ifdef METH_O
+static PyMethodDef
+swigobject_methods[] = {
+  {(char *)"disown",  (PyCFunction)PySwigObject_disown,  METH_NOARGS,  (char *)"releases ownership of the pointer"},
+  {(char *)"acquire", (PyCFunction)PySwigObject_acquire, METH_NOARGS,  (char *)"aquires ownership of the pointer"},
+  {(char *)"own",     (PyCFunction)PySwigObject_own,     METH_VARARGS, (char *)"returns/sets ownership of the pointer"},
+  {(char *)"append",  (PyCFunction)PySwigObject_append,  METH_O,       (char *)"appends another 'this' object"},
+  {(char *)"next",    (PyCFunction)PySwigObject_next,    METH_NOARGS,  (char *)"returns the next 'this' object"},
+  {(char *)"__repr__",(PyCFunction)PySwigObject_repr,    METH_NOARGS,  (char *)"returns object representation"},
+  {0, 0, 0, 0}  
+};
+#else
+static PyMethodDef
+swigobject_methods[] = {
+  {(char *)"disown",  (PyCFunction)PySwigObject_disown,  METH_VARARGS,  (char *)"releases ownership of the pointer"},
+  {(char *)"acquire", (PyCFunction)PySwigObject_acquire, METH_VARARGS,  (char *)"aquires ownership of the pointer"},
+  {(char *)"own",     (PyCFunction)PySwigObject_own,     METH_VARARGS,  (char *)"returns/sets ownership of the pointer"},
+  {(char *)"append",  (PyCFunction)PySwigObject_append,  METH_VARARGS,  (char *)"appends another 'this' object"},
+  {(char *)"next",    (PyCFunction)PySwigObject_next,    METH_VARARGS,  (char *)"returns the next 'this' object"},
+  {(char *)"__repr__",(PyCFunction)PySwigObject_repr,   METH_VARARGS,  (char *)"returns object representation"},
+  {0, 0, 0, 0}  
+};
+#endif
+
+#if PY_VERSION_HEX < 0x02020000
+SWIGINTERN PyObject *
+PySwigObject_getattr(PySwigObject *sobj,char *name)
+{
+  return Py_FindMethod(swigobject_methods, (PyObject *)sobj, name);
+}
+#endif
+
+SWIGRUNTIME PyTypeObject*
+_PySwigObject_type(void) {
+  static char swigobject_doc[] = "Swig object carries a C/C++ instance pointer";
+  
+  static PyNumberMethods PySwigObject_as_number = {
+    (binaryfunc)0, /*nb_add*/
+    (binaryfunc)0, /*nb_subtract*/
+    (binaryfunc)0, /*nb_multiply*/
+    (binaryfunc)0, /*nb_divide*/
+    (binaryfunc)0, /*nb_remainder*/
+    (binaryfunc)0, /*nb_divmod*/
+    (ternaryfunc)0,/*nb_power*/
+    (unaryfunc)0,  /*nb_negative*/
+    (unaryfunc)0,  /*nb_positive*/
+    (unaryfunc)0,  /*nb_absolute*/
+    (inquiry)0,    /*nb_nonzero*/
+    0,		   /*nb_invert*/
+    0,		   /*nb_lshift*/
+    0,		   /*nb_rshift*/
+    0,		   /*nb_and*/
+    0,		   /*nb_xor*/
+    0,		   /*nb_or*/
+    (coercion)0,   /*nb_coerce*/
+    (unaryfunc)PySwigObject_long, /*nb_int*/
+    (unaryfunc)PySwigObject_long, /*nb_long*/
+    (unaryfunc)0,                 /*nb_float*/
+    (unaryfunc)PySwigObject_oct,  /*nb_oct*/
+    (unaryfunc)PySwigObject_hex,  /*nb_hex*/
+#if PY_VERSION_HEX >= 0x02020000
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_true_divide */ 
+#elif PY_VERSION_HEX >= 0x02000000
+    0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_or */
+#endif
+  };
+
+  static PyTypeObject pyswigobject_type;  
+  static int type_init = 0;
+  if (!type_init) {
+    const PyTypeObject tmp
+      = {
+	PyObject_HEAD_INIT(NULL)
+	0,				    /* ob_size */
+	(char *)"PySwigObject",		    /* tp_name */
+	sizeof(PySwigObject),		    /* tp_basicsize */
+	0,			            /* tp_itemsize */
+	(destructor)PySwigObject_dealloc,   /* tp_dealloc */
+	(printfunc)PySwigObject_print,	    /* tp_print */
+#if PY_VERSION_HEX < 0x02020000
+	(getattrfunc)PySwigObject_getattr,  /* tp_getattr */ 
+#else
+	(getattrfunc)0,			    /* tp_getattr */ 
+#endif
+	(setattrfunc)0,			    /* tp_setattr */ 
+	(cmpfunc)PySwigObject_compare,	    /* tp_compare */ 
+	(reprfunc)PySwigObject_repr,	    /* tp_repr */    
+	&PySwigObject_as_number,	    /* tp_as_number */
+	0,				    /* tp_as_sequence */
+	0,				    /* tp_as_mapping */
+	(hashfunc)0,			    /* tp_hash */
+	(ternaryfunc)0,			    /* tp_call */
+	(reprfunc)PySwigObject_str,	    /* tp_str */
+	PyObject_GenericGetAttr,            /* tp_getattro */
+	0,				    /* tp_setattro */
+	0,		                    /* tp_as_buffer */
+	Py_TPFLAGS_DEFAULT,	            /* tp_flags */
+	swigobject_doc, 	            /* tp_doc */        
+	0,                                  /* tp_traverse */
+	0,                                  /* tp_clear */
+	0,                                  /* tp_richcompare */
+	0,                                  /* tp_weaklistoffset */
+#if PY_VERSION_HEX >= 0x02020000
+	0,                                  /* tp_iter */
+	0,                                  /* tp_iternext */
+	swigobject_methods,		    /* tp_methods */ 
+	0,			            /* tp_members */
+	0,				    /* tp_getset */	    	
+	0,			            /* tp_base */	        
+	0,				    /* tp_dict */	    	
+	0,				    /* tp_descr_get */  	
+	0,				    /* tp_descr_set */  	
+	0,				    /* tp_dictoffset */ 	
+	0,				    /* tp_init */	    	
+	0,				    /* tp_alloc */	    	
+	0,			            /* tp_new */	    	
+	0,	                            /* tp_free */	   
+        0,                                  /* tp_is_gc */  
+	0,				    /* tp_bases */   
+	0,				    /* tp_mro */
+	0,				    /* tp_cache */   
+ 	0,				    /* tp_subclasses */
+	0,				    /* tp_weaklist */
+#endif
+#if PY_VERSION_HEX >= 0x02030000
+	0,                                  /* tp_del */
+#endif
+#ifdef COUNT_ALLOCS
+	0,0,0,0                             /* tp_alloc -> tp_next */
+#endif
+      };
+    pyswigobject_type = tmp;
+    pyswigobject_type.ob_type = &PyType_Type;
+    type_init = 1;
+  }
+  return &pyswigobject_type;
+}
+
+SWIGRUNTIME PyObject *
+PySwigObject_New(void *ptr, swig_type_info *ty, int own)
+{
+  PySwigObject *sobj = PyObject_NEW(PySwigObject, PySwigObject_type());
+  if (sobj) {
+    sobj->ptr  = ptr;
+    sobj->ty   = ty;
+    sobj->own  = own;
+    sobj->next = 0;
+  }
+  return (PyObject *)sobj;
+}
+
+/* -----------------------------------------------------------------------------
+ * Implements a simple Swig Packed type, and use it instead of string
+ * ----------------------------------------------------------------------------- */
+
+typedef struct {
+  PyObject_HEAD
+  void *pack;
+  swig_type_info *ty;
+  size_t size;
+} PySwigPacked;
+
+SWIGRUNTIME int
+PySwigPacked_print(PySwigPacked *v, FILE *fp, int SWIGUNUSEDPARM(flags))
+{
+  char result[SWIG_BUFFER_SIZE];
+  fputs("<Swig Packed ", fp); 
+  if (SWIG_PackDataName(result, v->pack, v->size, 0, sizeof(result))) {
+    fputs("at ", fp); 
+    fputs(result, fp); 
+  }
+  fputs(v->ty->name,fp); 
+  fputs(">", fp);
+  return 0; 
+}
+  
+SWIGRUNTIME PyObject *
+PySwigPacked_repr(PySwigPacked *v)
+{
+  char result[SWIG_BUFFER_SIZE];
+  if (SWIG_PackDataName(result, v->pack, v->size, 0, sizeof(result))) {
+    return PyString_FromFormat("<Swig Packed at %s%s>", result, v->ty->name);
+  } else {
+    return PyString_FromFormat("<Swig Packed %s>", v->ty->name);
+  }  
+}
+
+SWIGRUNTIME PyObject *
+PySwigPacked_str(PySwigPacked *v)
+{
+  char result[SWIG_BUFFER_SIZE];
+  if (SWIG_PackDataName(result, v->pack, v->size, 0, sizeof(result))){
+    return PyString_FromFormat("%s%s", result, v->ty->name);
+  } else {
+    return PyString_FromString(v->ty->name);
+  }  
+}
+
+SWIGRUNTIME int
+PySwigPacked_compare(PySwigPacked *v, PySwigPacked *w)
+{
+  size_t i = v->size;
+  size_t j = w->size;
+  int s = (i < j) ? -1 : ((i > j) ? 1 : 0);
+  return s ? s : strncmp((char *)v->pack, (char *)w->pack, 2*v->size);
+}
+
+SWIGRUNTIME PyTypeObject* _PySwigPacked_type(void);
+
+SWIGRUNTIME PyTypeObject*
+PySwigPacked_type(void) {
+  static PyTypeObject *SWIG_STATIC_POINTER(type) = _PySwigPacked_type();
+  return type;
+}
+
+SWIGRUNTIMEINLINE int
+PySwigPacked_Check(PyObject *op) {
+  return ((op)->ob_type == _PySwigPacked_type()) 
+    || (strcmp((op)->ob_type->tp_name,"PySwigPacked") == 0);
+}
+
+SWIGRUNTIME void
+PySwigPacked_dealloc(PyObject *v)
+{
+  if (PySwigPacked_Check(v)) {
+    PySwigPacked *sobj = (PySwigPacked *) v;
+    free(sobj->pack);
+  }
+  PyObject_DEL(v);
+}
+
+SWIGRUNTIME PyTypeObject*
+_PySwigPacked_type(void) {
+  static char swigpacked_doc[] = "Swig object carries a C/C++ instance pointer";
+  static PyTypeObject pyswigpacked_type;
+  static int type_init = 0;  
+  if (!type_init) {
+    const PyTypeObject tmp
+      = {
+	PyObject_HEAD_INIT(NULL)
+	0,				    /* ob_size */	
+	(char *)"PySwigPacked",		    /* tp_name */	
+	sizeof(PySwigPacked),		    /* tp_basicsize */	
+	0,				    /* tp_itemsize */	
+	(destructor)PySwigPacked_dealloc,   /* tp_dealloc */	
+	(printfunc)PySwigPacked_print,	    /* tp_print */   	
+	(getattrfunc)0,			    /* tp_getattr */ 	
+	(setattrfunc)0,			    /* tp_setattr */ 	
+	(cmpfunc)PySwigPacked_compare,	    /* tp_compare */ 	
+	(reprfunc)PySwigPacked_repr,	    /* tp_repr */    	
+	0,	                            /* tp_as_number */	
+	0,				    /* tp_as_sequence */
+	0,				    /* tp_as_mapping */	
+	(hashfunc)0,			    /* tp_hash */	
+	(ternaryfunc)0,			    /* tp_call */	
+	(reprfunc)PySwigPacked_str,	    /* tp_str */	
+	PyObject_GenericGetAttr,            /* tp_getattro */
+	0,				    /* tp_setattro */
+	0,		                    /* tp_as_buffer */
+	Py_TPFLAGS_DEFAULT,	            /* tp_flags */
+	swigpacked_doc, 	            /* tp_doc */
+	0,                                  /* tp_traverse */
+	0,                                  /* tp_clear */
+	0,                                  /* tp_richcompare */
+	0,                                  /* tp_weaklistoffset */
+#if PY_VERSION_HEX >= 0x02020000
+	0,                                  /* tp_iter */
+	0,                                  /* tp_iternext */
+	0,		                    /* tp_methods */ 
+	0,			            /* tp_members */
+	0,				    /* tp_getset */	    	
+	0,			            /* tp_base */	        
+	0,				    /* tp_dict */	    	
+	0,				    /* tp_descr_get */  	
+	0,				    /* tp_descr_set */  	
+	0,				    /* tp_dictoffset */ 	
+	0,				    /* tp_init */	    	
+	0,				    /* tp_alloc */	    	
+	0,			            /* tp_new */	    	
+	0, 	                            /* tp_free */	   
+        0,                                  /* tp_is_gc */  
+	0,				    /* tp_bases */   
+	0,				    /* tp_mro */
+	0,				    /* tp_cache */   
+ 	0,				    /* tp_subclasses */
+	0,				    /* tp_weaklist */
+#endif
+#if PY_VERSION_HEX >= 0x02030000
+	0,                                  /* tp_del */
+#endif
+#ifdef COUNT_ALLOCS
+	0,0,0,0                             /* tp_alloc -> tp_next */
+#endif
+      };
+    pyswigpacked_type = tmp;
+    pyswigpacked_type.ob_type = &PyType_Type;
+    type_init = 1;
+  }
+  return &pyswigpacked_type;
+}
+
+SWIGRUNTIME PyObject *
+PySwigPacked_New(void *ptr, size_t size, swig_type_info *ty)
+{
+  PySwigPacked *sobj = PyObject_NEW(PySwigPacked, PySwigPacked_type());
+  if (sobj) {
+    void *pack = malloc(size);
+    if (pack) {
+      memcpy(pack, ptr, size);
+      sobj->pack = pack;
+      sobj->ty   = ty;
+      sobj->size = size;
+    } else {
+      PyObject_DEL((PyObject *) sobj);
+      sobj = 0;
+    }
+  }
+  return (PyObject *) sobj;
+}
+
+SWIGRUNTIME swig_type_info *
+PySwigPacked_UnpackData(PyObject *obj, void *ptr, size_t size)
+{
+  if (PySwigPacked_Check(obj)) {
+    PySwigPacked *sobj = (PySwigPacked *)obj;
+    if (sobj->size != size) return 0;
+    memcpy(ptr, sobj->pack, size);
+    return sobj->ty;
+  } else {
+    return 0;
+  }
+}
+
+/* -----------------------------------------------------------------------------
+ * pointers/data manipulation
+ * ----------------------------------------------------------------------------- */
+
+SWIGRUNTIMEINLINE PyObject *
+_SWIG_This(void)
+{
+  return PyString_FromString("this");
+}
+
+SWIGRUNTIME PyObject *
+SWIG_This(void)
+{
+  static PyObject *SWIG_STATIC_POINTER(swig_this) = _SWIG_This();
+  return swig_this;
+}
+
+/* #define SWIG_PYTHON_SLOW_GETSET_THIS */
+
+SWIGRUNTIME PySwigObject *
+SWIG_Python_GetSwigThis(PyObject *pyobj) 
+{
+  if (PySwigObject_Check(pyobj)) {
+    return (PySwigObject *) pyobj;
+  } else {
+    PyObject *obj = 0;
+#if (!defined(SWIG_PYTHON_SLOW_GETSET_THIS) && (PY_VERSION_HEX >= 0x02030000))
+    if (PyInstance_Check(pyobj)) {
+      obj = _PyInstance_Lookup(pyobj, SWIG_This());      
+    } else {
+      PyObject **dictptr = _PyObject_GetDictPtr(pyobj);
+      if (dictptr != NULL) {
+	PyObject *dict = *dictptr;
+	obj = dict ? PyDict_GetItem(dict, SWIG_This()) : 0;
+      } else {
+#ifdef PyWeakref_CheckProxy
+	if (PyWeakref_CheckProxy(pyobj)) {
+	  PyObject *wobj = PyWeakref_GET_OBJECT(pyobj);
+	  return wobj ? SWIG_Python_GetSwigThis(wobj) : 0;
+	}
+#endif
+	obj = PyObject_GetAttr(pyobj,SWIG_This());
+	if (obj) {
+	  Py_DECREF(obj);
+	} else {
+	  if (PyErr_Occurred()) PyErr_Clear();
+	  return 0;
+	}
+      }
+    }
+#else
+    obj = PyObject_GetAttr(pyobj,SWIG_This());
+    if (obj) {
+      Py_DECREF(obj);
+    } else {
+      if (PyErr_Occurred()) PyErr_Clear();
+      return 0;
+    }
+#endif
+    if (obj && !PySwigObject_Check(obj)) {
+      /* a PyObject is called 'this', try to get the 'real this'
+	 PySwigObject from it */ 
+      return SWIG_Python_GetSwigThis(obj);
+    }
+    return (PySwigObject *)obj;
+  }
+}
+
+/* Acquire a pointer value */
+
+SWIGRUNTIME int
+SWIG_Python_AcquirePtr(PyObject *obj, int own) {
+  if (own) {
+    PySwigObject *sobj = SWIG_Python_GetSwigThis(obj);
+    if (sobj) {
+      int oldown = sobj->own;
+      sobj->own = own;
+      return oldown;
+    }
+  }
+  return 0;
+}
+
+/* Convert a pointer value */
+
+SWIGRUNTIME int
+SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int flags, int *own) {
+  if (!obj) return SWIG_ERROR;
+  if (obj == Py_None) {
+    if (ptr) *ptr = 0;
+    return SWIG_OK;
+  } else {
+    PySwigObject *sobj = SWIG_Python_GetSwigThis(obj);
+    while (sobj) {
+      void *vptr = sobj->ptr;
+      if (ty) {
+	swig_type_info *to = sobj->ty;
+	if (to == ty) {
+	  /* no type cast needed */
+	  if (ptr) *ptr = vptr;
+	  break;
+	} else {
+	  swig_cast_info *tc = SWIG_TypeCheck(to->name,ty);
+	  if (!tc) {
+	    sobj = (PySwigObject *)sobj->next;
+	  } else {
+	    if (ptr) *ptr = SWIG_TypeCast(tc,vptr);
+	    break;
+	  }
+	}
+      } else {
+	if (ptr) *ptr = vptr;
+	break;
+      }
+    }
+    if (sobj) {
+      if (own) *own = sobj->own;
+      if (flags & SWIG_POINTER_DISOWN) {
+	sobj->own = 0;
+      }
+      return SWIG_OK;
+    } else {
+      int res = SWIG_ERROR;
+      if (flags & SWIG_POINTER_IMPLICIT_CONV) {
+	PySwigClientData *data = ty ? (PySwigClientData *) ty->clientdata : 0;
+	if (data && !data->implicitconv) {
+	  PyObject *klass = data->klass;
+	  if (klass) {
+	    PyObject *impconv;
+	    data->implicitconv = 1; /* avoid recursion and call 'explicit' constructors*/
+	    impconv = SWIG_Python_CallFunctor(klass, obj);
+	    data->implicitconv = 0;
+	    if (PyErr_Occurred()) {
+	      PyErr_Clear();
+	      impconv = 0;
+	    }
+	    if (impconv) {
+	      PySwigObject *iobj = SWIG_Python_GetSwigThis(impconv);
+	      if (iobj) {
+		void *vptr;
+		res = SWIG_Python_ConvertPtrAndOwn((PyObject*)iobj, &vptr, ty, 0, 0);
+		if (SWIG_IsOK(res)) {
+		  if (ptr) {
+		    *ptr = vptr;
+		    /* transfer the ownership to 'ptr' */
+		    iobj->own = 0;
+		    res = SWIG_AddCast(res);
+		    res = SWIG_AddNewMask(res);
+		  } else {
+		    res = SWIG_AddCast(res);		    
+		  }
+		}
+	      }
+	      Py_DECREF(impconv);
+	    }
+	  }
+	}
+      }
+      return res;
+    }
+  }
+}
+
+/* Convert a function ptr value */
+
+SWIGRUNTIME int
+SWIG_Python_ConvertFunctionPtr(PyObject *obj, void **ptr, swig_type_info *ty) {
+  if (!PyCFunction_Check(obj)) {
+    return SWIG_ConvertPtr(obj, ptr, ty, 0);
+  } else {
+    void *vptr = 0;
+    
+    /* here we get the method pointer for callbacks */
+    const char *doc = (((PyCFunctionObject *)obj) -> m_ml -> ml_doc);
+    const char *desc = doc ? strstr(doc, "swig_ptr: ") : 0;
+    if (desc) {
+      desc = ty ? SWIG_UnpackVoidPtr(desc + 10, &vptr, ty->name) : 0;
+      if (!desc) return SWIG_ERROR;
+    }
+    if (ty) {
+      swig_cast_info *tc = SWIG_TypeCheck(desc,ty);
+      if (!tc) return SWIG_ERROR;
+      *ptr = SWIG_TypeCast(tc,vptr);
+    } else {
+      *ptr = vptr;
+    }
+    return SWIG_OK;
+  }
+}
+
+/* Convert a packed value value */
+
+SWIGRUNTIME int
+SWIG_Python_ConvertPacked(PyObject *obj, void *ptr, size_t sz, swig_type_info *ty) {
+  swig_type_info *to = PySwigPacked_UnpackData(obj, ptr, sz);
+  if (!to) return SWIG_ERROR;
+  if (ty) {
+    if (to != ty) {
+      /* check type cast? */
+      swig_cast_info *tc = SWIG_TypeCheck(to->name,ty);
+      if (!tc) return SWIG_ERROR;
+    }
+  }
+  return SWIG_OK;
+}  
+
+/* -----------------------------------------------------------------------------
+ * Create a new pointer object
+ * ----------------------------------------------------------------------------- */
+
+/*
+  Create a new instance object, whitout calling __init__, and set the
+  'this' attribute.
+*/
+
+SWIGRUNTIME PyObject* 
+SWIG_Python_NewShadowInstance(PySwigClientData *data, PyObject *swig_this)
+{
+#if (PY_VERSION_HEX >= 0x02020000)
+  PyObject *inst = 0;
+  PyObject *newraw = data->newraw;
+  if (newraw) {
+    inst = PyObject_Call(newraw, data->newargs, NULL);
+    if (inst) {
+#if !defined(SWIG_PYTHON_SLOW_GETSET_THIS)
+      PyObject **dictptr = _PyObject_GetDictPtr(inst);
+      if (dictptr != NULL) {
+	PyObject *dict = *dictptr;
+	if (dict == NULL) {
+	  dict = PyDict_New();
+	  *dictptr = dict;
+	  PyDict_SetItem(dict, SWIG_This(), swig_this);
+	}
+      }
+#else
+      PyObject *key = SWIG_This();
+      PyObject_SetAttr(inst, key, swig_this);
+#endif
+    }
+  } else {
+    PyObject *dict = PyDict_New();
+    PyDict_SetItem(dict, SWIG_This(), swig_this);
+    inst = PyInstance_NewRaw(data->newargs, dict);
+    Py_DECREF(dict);
+  }
+  return inst;
+#else
+#if (PY_VERSION_HEX >= 0x02010000)
+  PyObject *inst;
+  PyObject *dict = PyDict_New();
+  PyDict_SetItem(dict, SWIG_This(), swig_this);
+  inst = PyInstance_NewRaw(data->newargs, dict);
+  Py_DECREF(dict);
+  return (PyObject *) inst;
+#else
+  PyInstanceObject *inst = PyObject_NEW(PyInstanceObject, &PyInstance_Type);
+  if (inst == NULL) {
+    return NULL;
+  }
+  inst->in_class = (PyClassObject *)data->newargs;
+  Py_INCREF(inst->in_class);
+  inst->in_dict = PyDict_New();
+  if (inst->in_dict == NULL) {
+    Py_DECREF(inst);
+    return NULL;
+  }
+#ifdef Py_TPFLAGS_HAVE_WEAKREFS
+  inst->in_weakreflist = NULL;
+#endif
+#ifdef Py_TPFLAGS_GC
+  PyObject_GC_Init(inst);
+#endif
+  PyDict_SetItem(inst->in_dict, SWIG_This(), swig_this);
+  return (PyObject *) inst;
+#endif
+#endif
+}
+
+SWIGRUNTIME void
+SWIG_Python_SetSwigThis(PyObject *inst, PyObject *swig_this)
+{
+ PyObject *dict;
+#if (PY_VERSION_HEX >= 0x02020000) && !defined(SWIG_PYTHON_SLOW_GETSET_THIS)
+ PyObject **dictptr = _PyObject_GetDictPtr(inst);
+ if (dictptr != NULL) {
+   dict = *dictptr;
+   if (dict == NULL) {
+     dict = PyDict_New();
+     *dictptr = dict;
+   }
+   PyDict_SetItem(dict, SWIG_This(), swig_this);
+   return;
+ }
+#endif
+ dict = PyObject_GetAttrString(inst, (char*)"__dict__");
+ PyDict_SetItem(dict, SWIG_This(), swig_this);
+ Py_DECREF(dict);
+} 
+
+
+SWIGINTERN PyObject *
+SWIG_Python_InitShadowInstance(PyObject *args) {
+  PyObject *obj[2];
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swiginit", 2, 2, obj)) {
+    return NULL;
+  } else {
+    PySwigObject *sthis = SWIG_Python_GetSwigThis(obj[0]);
+    if (sthis) {
+      PySwigObject_append((PyObject*) sthis, obj[1]);
+    } else {
+      SWIG_Python_SetSwigThis(obj[0], obj[1]);
+    }
+    return SWIG_Py_Void();
+  }
+}
+
+/* Create a new pointer object */
+
+SWIGRUNTIME PyObject *
+SWIG_Python_NewPointerObj(void *ptr, swig_type_info *type, int flags) {
+  if (!ptr) {
+    return SWIG_Py_Void();
+  } else {
+    int own = (flags & SWIG_POINTER_OWN) ? SWIG_POINTER_OWN : 0;
+    PyObject *robj = PySwigObject_New(ptr, type, own);
+    PySwigClientData *clientdata = type ? (PySwigClientData *)(type->clientdata) : 0;
+    if (clientdata && !(flags & SWIG_POINTER_NOSHADOW)) {
+      PyObject *inst = SWIG_Python_NewShadowInstance(clientdata, robj);
+      if (inst) {
+	Py_DECREF(robj);
+	robj = inst;
+      }
+    }
+    return robj;
+  }
+}
+
+/* Create a new packed object */
+
+SWIGRUNTIMEINLINE PyObject *
+SWIG_Python_NewPackedObj(void *ptr, size_t sz, swig_type_info *type) {
+  return ptr ? PySwigPacked_New((void *) ptr, sz, type) : SWIG_Py_Void();
+}
+
+/* -----------------------------------------------------------------------------*
+ *  Get type list 
+ * -----------------------------------------------------------------------------*/
+
+#ifdef SWIG_LINK_RUNTIME
+void *SWIG_ReturnGlobalTypeList(void *);
+#endif
+
+SWIGRUNTIME swig_module_info *
+SWIG_Python_GetModule(void) {
+  static void *type_pointer = (void *)0;
+  /* first check if module already created */
+  if (!type_pointer) {
+#ifdef SWIG_LINK_RUNTIME
+    type_pointer = SWIG_ReturnGlobalTypeList((void *)0);
+#else
+    type_pointer = PyCObject_Import((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION,
+				    (char*)"type_pointer" SWIG_TYPE_TABLE_NAME);
+    if (PyErr_Occurred()) {
+      PyErr_Clear();
+      type_pointer = (void *)0;
+    }
+#endif
+  }
+  return (swig_module_info *) type_pointer;
+}
+
+#if PY_MAJOR_VERSION < 2
+/* PyModule_AddObject function was introduced in Python 2.0.  The following function
+   is copied out of Python/modsupport.c in python version 2.3.4 */
+SWIGINTERN int
+PyModule_AddObject(PyObject *m, char *name, PyObject *o)
+{
+  PyObject *dict;
+  if (!PyModule_Check(m)) {
+    PyErr_SetString(PyExc_TypeError,
+		    "PyModule_AddObject() needs module as first arg");
+    return SWIG_ERROR;
+  }
+  if (!o) {
+    PyErr_SetString(PyExc_TypeError,
+		    "PyModule_AddObject() needs non-NULL value");
+    return SWIG_ERROR;
+  }
+  
+  dict = PyModule_GetDict(m);
+  if (dict == NULL) {
+    /* Internal error -- modules must have a dict! */
+    PyErr_Format(PyExc_SystemError, "module '%s' has no __dict__",
+		 PyModule_GetName(m));
+    return SWIG_ERROR;
+  }
+  if (PyDict_SetItemString(dict, name, o))
+    return SWIG_ERROR;
+  Py_DECREF(o);
+  return SWIG_OK;
+}
+#endif
+
+SWIGRUNTIME void
+SWIG_Python_DestroyModule(void *vptr)
+{
+  swig_module_info *swig_module = (swig_module_info *) vptr;
+  swig_type_info **types = swig_module->types;
+  size_t i;
+  for (i =0; i < swig_module->size; ++i) {
+    swig_type_info *ty = types[i];
+    if (ty->owndata) {
+      PySwigClientData *data = (PySwigClientData *) ty->clientdata;
+      if (data) PySwigClientData_Del(data);
+    }
+  }
+  Py_DECREF(SWIG_This());
+}
+
+SWIGRUNTIME void
+SWIG_Python_SetModule(swig_module_info *swig_module) {
+  static PyMethodDef swig_empty_runtime_method_table[] = { {NULL, NULL, 0, NULL} };/* Sentinel */
+
+  PyObject *module = Py_InitModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION,
+				   swig_empty_runtime_method_table);
+  PyObject *pointer = PyCObject_FromVoidPtr((void *) swig_module, SWIG_Python_DestroyModule);
+  if (pointer && module) {
+    PyModule_AddObject(module, (char*)"type_pointer" SWIG_TYPE_TABLE_NAME, pointer);
+  } else {
+    Py_XDECREF(pointer);
+  }
+}
+
+/* The python cached type query */
+SWIGRUNTIME PyObject *
+SWIG_Python_TypeCache(void) {
+  static PyObject *SWIG_STATIC_POINTER(cache) = PyDict_New();
+  return cache;
+}
+
+SWIGRUNTIME swig_type_info *
+SWIG_Python_TypeQuery(const char *type)
+{
+  PyObject *cache = SWIG_Python_TypeCache();
+  PyObject *key = PyString_FromString(type); 
+  PyObject *obj = PyDict_GetItem(cache, key);
+  swig_type_info *descriptor;
+  if (obj) {
+    descriptor = (swig_type_info *) PyCObject_AsVoidPtr(obj);
+  } else {
+    swig_module_info *swig_module = SWIG_Python_GetModule();
+    descriptor = SWIG_TypeQueryModule(swig_module, swig_module, type);
+    if (descriptor) {
+      obj = PyCObject_FromVoidPtr(descriptor, NULL);
+      PyDict_SetItem(cache, key, obj);
+      Py_DECREF(obj);
+    }
+  }
+  Py_DECREF(key);
+  return descriptor;
+}
+
+/* 
+   For backward compatibility only
+*/
+#define SWIG_POINTER_EXCEPTION  0
+#define SWIG_arg_fail(arg)      SWIG_Python_ArgFail(arg)
+#define SWIG_MustGetPtr(p, type, argnum, flags)  SWIG_Python_MustGetPtr(p, type, argnum, flags)
+
+SWIGRUNTIME int
+SWIG_Python_AddErrMesg(const char* mesg, int infront)
+{
+  if (PyErr_Occurred()) {
+    PyObject *type = 0;
+    PyObject *value = 0;
+    PyObject *traceback = 0;
+    PyErr_Fetch(&type, &value, &traceback);
+    if (value) {
+      PyObject *old_str = PyObject_Str(value);
+      Py_XINCREF(type);
+      PyErr_Clear();
+      if (infront) {
+	PyErr_Format(type, "%s %s", mesg, PyString_AsString(old_str));
+      } else {
+	PyErr_Format(type, "%s %s", PyString_AsString(old_str), mesg);
+      }
+      Py_DECREF(old_str);
+    }
+    return 1;
+  } else {
+    return 0;
+  }
+}
+  
+SWIGRUNTIME int
+SWIG_Python_ArgFail(int argnum)
+{
+  if (PyErr_Occurred()) {
+    /* add information about failing argument */
+    char mesg[256];
+    PyOS_snprintf(mesg, sizeof(mesg), "argument number %d:", argnum);
+    return SWIG_Python_AddErrMesg(mesg, 1);
+  } else {
+    return 0;
+  }
+}
+
+SWIGRUNTIMEINLINE const char *
+PySwigObject_GetDesc(PyObject *self)
+{
+  PySwigObject *v = (PySwigObject *)self;
+  swig_type_info *ty = v ? v->ty : 0;
+  return ty ? ty->str : (char*)"";
+}
+
+SWIGRUNTIME void
+SWIG_Python_TypeError(const char *type, PyObject *obj)
+{
+  if (type) {
+#if defined(SWIG_COBJECT_TYPES)
+    if (obj && PySwigObject_Check(obj)) {
+      const char *otype = (const char *) PySwigObject_GetDesc(obj);
+      if (otype) {
+	PyErr_Format(PyExc_TypeError, "a '%s' is expected, 'PySwigObject(%s)' is received",
+		     type, otype);
+	return;
+      }
+    } else 
+#endif      
+    {
+      const char *otype = (obj ? obj->ob_type->tp_name : 0); 
+      if (otype) {
+	PyObject *str = PyObject_Str(obj);
+	const char *cstr = str ? PyString_AsString(str) : 0;
+	if (cstr) {
+	  PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s(%s)' is received",
+		       type, otype, cstr);
+	} else {
+	  PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received",
+		       type, otype);
+	}
+	Py_XDECREF(str);
+	return;
+      }
+    }   
+    PyErr_Format(PyExc_TypeError, "a '%s' is expected", type);
+  } else {
+    PyErr_Format(PyExc_TypeError, "unexpected type is received");
+  }
+}
+
+
+/* Convert a pointer value, signal an exception on a type mismatch */
+SWIGRUNTIME void *
+SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags) {
+  void *result;
+  if (SWIG_Python_ConvertPtr(obj, &result, ty, flags) == -1) {
+    PyErr_Clear();
+    if (flags & SWIG_POINTER_EXCEPTION) {
+      SWIG_Python_TypeError(SWIG_TypePrettyName(ty), obj);
+      SWIG_Python_ArgFail(argnum);
+    }
+  }
+  return result;
+}
+
+
+#ifdef __cplusplus
+#if 0
+{ /* cc-mode */
+#endif
+}
+#endif
+
+
+
+#define SWIG_exception_fail(code, msg) do { SWIG_Error(code, msg); SWIG_fail; } while(0) 
+
+#define SWIG_contract_assert(expr, msg) if (!(expr)) { SWIG_Error(SWIG_RuntimeError, msg); SWIG_fail; } else 
+
+
+
+  #define SWIG_exception(code, msg) do { SWIG_Error(code, msg); SWIG_fail;; } while(0) 
+
+/* -----------------------------------------------------------------------------
+ * See the LICENSE file for information on copyright, usage and redistribution
+ * of SWIG, and the README file for authors - http://www.swig.org/release.html.
+ *
+ * director.swg
+ *
+ * This file contains support for director classes that proxy
+ * method calls from C++ to Python extensions.
+ * ----------------------------------------------------------------------------- */
+
+#ifndef SWIG_DIRECTOR_PYTHON_HEADER_
+#define SWIG_DIRECTOR_PYTHON_HEADER_
+
+#ifdef __cplusplus
+
+#include <string>
+#include <iostream>
+#include <exception>
+#include <vector>
+#include <map>
+
+
+/*
+  Use -DSWIG_PYTHON_DIRECTOR_NO_VTABLE if you don't want to generate a 'virtual
+  table', and avoid multiple GetAttr calls to retrieve the python
+  methods.
+*/
+
+#ifndef SWIG_PYTHON_DIRECTOR_NO_VTABLE
+#ifndef SWIG_PYTHON_DIRECTOR_VTABLE
+#define SWIG_PYTHON_DIRECTOR_VTABLE
+#endif
+#endif
+
+
+
+/*
+  Use -DSWIG_DIRECTOR_NO_UEH if you prefer to avoid the use of the
+  Undefined Exception Handler provided by swift
+*/
+#ifndef SWIG_DIRECTOR_NO_UEH
+#ifndef SWIG_DIRECTOR_UEH
+#define SWIG_DIRECTOR_UEH
+#endif
+#endif
+
+
+/*
+  Use -DSWIG_DIRECTOR_STATIC if you prefer to avoid the use of the
+  'Swig' namespace. This could be usefull for multi-modules projects.
+*/
+#ifdef SWIG_DIRECTOR_STATIC
+/* Force anonymous (static) namespace */
+#define Swig
+#endif
+
+
+/*
+  Use -DSWIG_DIRECTOR_NORTTI if you prefer to avoid the use of the
+  native C++ RTTI and dynamic_cast<>. But be aware that directors
+  could stop working when using this option.
+*/
+#ifdef SWIG_DIRECTOR_NORTTI
+/* 
+   When we don't use the native C++ RTTI, we implement a minimal one
+   only for Directors.
+*/
+# ifndef SWIG_DIRECTOR_RTDIR
+# define SWIG_DIRECTOR_RTDIR
+#include <map>
+
+namespace Swig {
+  class Director;
+  SWIGINTERN std::map<void*,Director*>& get_rtdir_map() {
+    static std::map<void*,Director*> rtdir_map;
+    return rtdir_map;
+  }
+
+  SWIGINTERNINLINE void set_rtdir(void *vptr, Director *rtdir) {
+    get_rtdir_map()[vptr] = rtdir;
+  }
+
+  SWIGINTERNINLINE Director *get_rtdir(void *vptr) {
+    std::map<void*,Director*>::const_iterator pos = get_rtdir_map().find(vptr);
+    Director *rtdir = (pos != get_rtdir_map().end()) ? pos->second : 0;
+    return rtdir;
+  }
+}
+# endif /* SWIG_DIRECTOR_RTDIR */
+
+# define SWIG_DIRECTOR_CAST(Arg) Swig::get_rtdir(static_cast<void*>(Arg))
+# define SWIG_DIRECTOR_RGTR(Arg1, Arg2) Swig::set_rtdir(static_cast<void*>(Arg1), Arg2)
+
+#else
+
+# define SWIG_DIRECTOR_CAST(Arg) dynamic_cast<Swig::Director*>(Arg)
+# define SWIG_DIRECTOR_RGTR(Arg1, Arg2)
+
+#endif /* SWIG_DIRECTOR_NORTTI */
+
+extern "C" {
+  struct swig_type_info;
+}
+
+namespace Swig {  
+
+  /* memory handler */
+  struct GCItem 
+  {
+    virtual ~GCItem() = 0;
+
+    virtual int get_own() const
+    {
+      return 0;
+    }
+  };
+
+  GCItem::~GCItem()
+  {
+  }
+
+  struct GCItem_var
+  {
+    GCItem_var(GCItem *item = 0) : _item(item)
+    {
+    }
+
+    GCItem_var& operator=(GCItem *item)
+    {
+      GCItem *tmp = _item;
+      _item = item;
+      delete tmp;
+      return *this;
+    }
+
+    ~GCItem_var() 
+    {
+      delete _item;
+    }
+    
+    GCItem * operator->() const
+    {
+      return _item;
+    }
+    
+  private:
+    GCItem *_item;
+  };
+  
+  struct GCItem_Object : GCItem
+  {
+    GCItem_Object(int own) : _own(own)
+    {
+    }
+    
+    virtual ~GCItem_Object() 
+    {
+    }
+
+    int get_own() const
+    {
+      return _own;
+    }
+    
+  private:
+    int _own;
+  };
+
+  template <typename Type>
+  struct GCItem_T : GCItem
+  {
+    GCItem_T(Type *ptr) : _ptr(ptr)
+    {
+    }
+    
+    virtual ~GCItem_T() 
+    {
+      delete _ptr;
+    }
+    
+  private:
+    Type *_ptr;
+  };
+
+  template <typename Type>
+  struct GCArray_T : GCItem
+  {
+    GCArray_T(Type *ptr) : _ptr(ptr)
+    {
+    }
+    
+    virtual ~GCArray_T() 
+    {
+      delete[] _ptr;
+    }
+    
+  private:
+    Type *_ptr;
+  };
+
+  /* base class for director exceptions */
+  class DirectorException {
+  protected:
+    std::string swig_msg;
+  public:
+    DirectorException(PyObject *error, const char* hdr ="", const char* msg ="") 
+      : swig_msg(hdr)
+    {
+      SWIG_PYTHON_THREAD_BEGIN_BLOCK; 
+      if (strlen(msg)) {
+        swig_msg += " ";
+        swig_msg += msg;
+      }
+      if (!PyErr_Occurred()) {
+        PyErr_SetString(error, getMessage());
+      } else {
+        SWIG_Python_AddErrorMsg(getMessage());
+      }
+      SWIG_PYTHON_THREAD_END_BLOCK; 
+    }
+
+    const char *getMessage() const
+    { 
+      return swig_msg.c_str(); 
+    }
+
+    static void raise(PyObject *error, const char *msg) 
+    {
+      throw DirectorException(error, msg);
+    }
+
+    static void raise(const char *msg) 
+    {
+      raise(PyExc_RuntimeError, msg);
+    }
+  };
+
+  /* unknown exception handler  */
+  class UnknownExceptionHandler 
+  {
+#ifdef SWIG_DIRECTOR_UEH
+    static void handler()  {
+      try {
+        throw;
+      } catch (DirectorException& e) {
+        std::cerr << "Swig Director exception caught:" << std::endl
+                  << e.getMessage() << std::endl;
+      } catch (std::exception& e) {
+        std::cerr << "std::exception caught: "<< e.what() << std::endl;
+      } catch (...) {
+        std::cerr << "Unknown exception caught." << std::endl;
+      }
+      
+      std::cerr << std::endl
+                << "Python interpreter traceback:" << std::endl;
+      PyErr_Print();
+      std::cerr << std::endl;
+      
+      std::cerr << "This exception was caught by the SWIG unexpected exception handler." << std::endl
+                << "Try using %feature(\"director:except\") to avoid reaching this point." << std::endl
+                << std::endl
+                << "Exception is being re-thrown, program will like abort/terminate." << std::endl;
+      throw;
+    }
+
+  public:
+    
+    std::unexpected_handler old;
+    UnknownExceptionHandler(std::unexpected_handler nh = handler)
+    {
+      old = std::set_unexpected(nh);
+    }
+
+    ~UnknownExceptionHandler()
+    {
+      std::set_unexpected(old);
+    }
+#endif
+  };
+
+  /* type mismatch in the return value from a python method call */
+  class DirectorTypeMismatchException : public Swig::DirectorException {
+  public:
+    DirectorTypeMismatchException(PyObject *error, const char* msg="") 
+      : Swig::DirectorException(error, "Swig director type mismatch", msg)
+    {
+    }
+
+    DirectorTypeMismatchException(const char* msg="") 
+      : Swig::DirectorException(PyExc_TypeError, "Swig director type mismatch", msg)
+    {
+    }
+
+    static void raise(PyObject *error, const char *msg)
+    {
+      throw DirectorTypeMismatchException(error, msg);
+    }
+
+    static void raise(const char *msg)
+    {
+      throw DirectorTypeMismatchException(msg);
+    }
+  };
+
+  /* any python exception that occurs during a director method call */
+  class DirectorMethodException : public Swig::DirectorException {
+  public:
+    DirectorMethodException(const char* msg = "") 
+      : DirectorException(PyExc_RuntimeError, "Swig director method error", msg)
+    {
+    }    
+
+    static void raise(const char *msg)
+    {
+      throw DirectorMethodException(msg);
+    }
+  };
+
+  /* attempt to call a pure virtual method via a director method */
+  class DirectorPureVirtualException : public Swig::DirectorException
+  {
+  public:
+    DirectorPureVirtualException(const char* msg = "") 
+      : DirectorException(PyExc_RuntimeError, "Swig director pure virtual method called", msg)
+    { 
+    }
+
+    static void raise(const char *msg) 
+    {
+      throw DirectorPureVirtualException(msg);
+    }
+  };
+
+
+#if defined(SWIG_PYTHON_THREADS)
+/*  __THREAD__ is the old macro to activate some thread support */
+# if !defined(__THREAD__)
+#   define __THREAD__ 1
+# endif
+#endif
+
+/* simple thread abstraction for pthreads on win32 */
+#ifdef __THREAD__
+# define __PTHREAD__
+# if defined(_WIN32) || defined(__WIN32__)
+#  define pthread_mutex_lock EnterCriticalSection
+#  define pthread_mutex_unlock LeaveCriticalSection
+#  define pthread_mutex_t CRITICAL_SECTION
+#  define SWIG_MUTEX_INIT(var) var
+# else
+#  include <pthread.h>
+#  define SWIG_MUTEX_INIT(var) var = PTHREAD_MUTEX_INITIALIZER 
+# endif
+#endif
+
+#ifdef  __PTHREAD__
+  struct Guard
+  {
+    pthread_mutex_t *_mutex;
+    
+    Guard(pthread_mutex_t &mutex) : _mutex(&mutex)
+    {
+      pthread_mutex_lock(_mutex);
+    }
+    
+    ~Guard()
+    {
+      pthread_mutex_unlock(_mutex);
+    }
+  };
+# define SWIG_GUARD(mutex) Guard _guard(mutex)
+#else
+# define SWIG_GUARD(mutex) 
+#endif
+
+  /* director base class */
+  class Director {
+  private:
+    /* pointer to the wrapped python object */
+    PyObject* swig_self;
+    /* flag indicating whether the object is owned by python or c++ */
+    mutable bool swig_disown_flag;
+
+    /* decrement the reference count of the wrapped python object */
+    void swig_decref() const { 
+      if (swig_disown_flag) {
+        SWIG_PYTHON_THREAD_BEGIN_BLOCK; 
+        Py_DECREF(swig_self); 
+        SWIG_PYTHON_THREAD_END_BLOCK; 
+      }
+    }
+
+  public:
+    /* wrap a python object, optionally taking ownership */
+    Director(PyObject* self) : swig_self(self), swig_disown_flag(false) {
+      swig_incref();
+    }
+
+
+    /* discard our reference at destruction */
+    virtual ~Director() {
+      swig_decref(); 
+    }
+
+
+    /* return a pointer to the wrapped python object */
+    PyObject *swig_get_self() const { 
+      return swig_self; 
+    }
+
+    /* acquire ownership of the wrapped python object (the sense of "disown"
+     * is from python) */
+    void swig_disown() const { 
+      if (!swig_disown_flag) { 
+        swig_disown_flag=true;
+        swig_incref(); 
+      } 
+    }
+
+    /* increase the reference count of the wrapped python object */
+    void swig_incref() const { 
+      if (swig_disown_flag) {
+        Py_INCREF(swig_self); 
+      }
+    }
+
+    /* methods to implement pseudo protected director members */
+    virtual bool swig_get_inner(const char* /* name */) const {
+      return true;
+    }
+    
+    virtual void swig_set_inner(const char* /* name */, bool /* val */) const {
+    }
+
+  /* ownership management */
+  private:
+    typedef std::map<void*, GCItem_var> ownership_map;
+    mutable ownership_map owner;
+#ifdef __PTHREAD__
+    static pthread_mutex_t swig_mutex_own;
+#endif
+
+  public:
+    template <typename Type>
+    void swig_acquire_ownership_array(Type *vptr)  const
+    {
+      if (vptr) {
+        SWIG_GUARD(swig_mutex_own);
+        owner[vptr] = new GCArray_T<Type>(vptr);
+      }
+    }
+    
+    template <typename Type>
+    void swig_acquire_ownership(Type *vptr)  const
+    {
+      if (vptr) {
+        SWIG_GUARD(swig_mutex_own);
+        owner[vptr] = new GCItem_T<Type>(vptr);
+      }
+    }
+
+    void swig_acquire_ownership_obj(void *vptr, int own) const
+    {
+      if (vptr && own) {
+        SWIG_GUARD(swig_mutex_own);
+        owner[vptr] = new GCItem_Object(own);
+      }
+    }
+    
+    int swig_release_ownership(void *vptr) const
+    {
+      int own = 0;
+      if (vptr) {
+        SWIG_GUARD(swig_mutex_own);
+        ownership_map::iterator iter = owner.find(vptr);
+        if (iter != owner.end()) {
+          own = iter->second->get_own();
+          owner.erase(iter);
+        }
+      }
+      return own;
+    }
+  };
+
+#ifdef __PTHREAD__
+  pthread_mutex_t SWIG_MUTEX_INIT(Director::swig_mutex_own);
+#endif
+}
+
+#endif /* __cplusplus */
+
+
+#endif
+
+/* -------- TYPES TABLE (BEGIN) -------- */
+
+#define SWIGTYPE_p_AdjacencyIterator swig_types[0]
+#define SWIGTYPE_p_BBoxTVecMat__Vec3Tdouble_t_t swig_types[1]
+#define SWIGTYPE_p_BinaryPredicate0D swig_types[2]
+#define SWIGTYPE_p_BinaryPredicate1D swig_types[3]
+#define SWIGTYPE_p_CalligraphicShader swig_types[4]
+#define SWIGTYPE_p_Canvas swig_types[5]
+#define SWIGTYPE_p_Chain swig_types[6]
+#define SWIGTYPE_p_ChainPredicateIterator swig_types[7]
+#define SWIGTYPE_p_ChainSilhouetteIterator swig_types[8]
+#define SWIGTYPE_p_ChainingIterator swig_types[9]
+#define SWIGTYPE_p_CurvatureInfo swig_types[10]
+#define SWIGTYPE_p_Curve swig_types[11]
+#define SWIGTYPE_p_CurveInternal__CurvePointIterator swig_types[12]
+#define SWIGTYPE_p_CurvePoint swig_types[13]
+#define SWIGTYPE_p_Curve__vertex_container__iterator swig_types[14]
+#define SWIGTYPE_p_FEdge swig_types[15]
+#define SWIGTYPE_p_FEdgeInternal__SVertexIterator swig_types[16]
+#define SWIGTYPE_p_FEdgeSharp swig_types[17]
+#define SWIGTYPE_p_FEdgeSmooth swig_types[18]
+#define SWIGTYPE_p_Functions0D__Curvature2DAngleF0D swig_types[19]
+#define SWIGTYPE_p_Functions0D__CurveNatureF0D swig_types[20]
+#define SWIGTYPE_p_Functions0D__DensityF0D swig_types[21]
+#define SWIGTYPE_p_Functions0D__GetCurvilinearAbscissaF0D swig_types[22]
+#define SWIGTYPE_p_Functions0D__GetOccludeeF0D swig_types[23]
+#define SWIGTYPE_p_Functions0D__GetOccludersF0D swig_types[24]
+#define SWIGTYPE_p_Functions0D__GetParameterF0D swig_types[25]
+#define SWIGTYPE_p_Functions0D__GetProjectedXF0D swig_types[26]
+#define SWIGTYPE_p_Functions0D__GetProjectedYF0D swig_types[27]
+#define SWIGTYPE_p_Functions0D__GetProjectedZF0D swig_types[28]
+#define SWIGTYPE_p_Functions0D__GetShapeF0D swig_types[29]
+#define SWIGTYPE_p_Functions0D__GetViewMapGradientNormF0D swig_types[30]
+#define SWIGTYPE_p_Functions0D__GetXF0D swig_types[31]
+#define SWIGTYPE_p_Functions0D__GetYF0D swig_types[32]
+#define SWIGTYPE_p_Functions0D__GetZF0D swig_types[33]
+#define SWIGTYPE_p_Functions0D__LocalAverageDepthF0D swig_types[34]
+#define SWIGTYPE_p_Functions0D__MaterialF0D swig_types[35]
+#define SWIGTYPE_p_Functions0D__Normal2DF0D swig_types[36]
+#define SWIGTYPE_p_Functions0D__QuantitativeInvisibilityF0D swig_types[37]
+#define SWIGTYPE_p_Functions0D__ReadCompleteViewMapPixelF0D swig_types[38]
+#define SWIGTYPE_p_Functions0D__ReadMapPixelF0D swig_types[39]
+#define SWIGTYPE_p_Functions0D__ReadSteerableViewMapPixelF0D swig_types[40]
+#define SWIGTYPE_p_Functions0D__ShapeIdF0D swig_types[41]
+#define SWIGTYPE_p_Functions0D__VertexOrientation2DF0D swig_types[42]
+#define SWIGTYPE_p_Functions0D__VertexOrientation3DF0D swig_types[43]
+#define SWIGTYPE_p_Functions0D__ZDiscontinuityF0D swig_types[44]
+#define SWIGTYPE_p_Functions1D__ChainingTimeStampF1D swig_types[45]
+#define SWIGTYPE_p_Functions1D__Curvature2DAngleF1D swig_types[46]
+#define SWIGTYPE_p_Functions1D__CurveNatureF1D swig_types[47]
+#define SWIGTYPE_p_Functions1D__DensityF1D swig_types[48]
+#define SWIGTYPE_p_Functions1D__GetCompleteViewMapDensityF1D swig_types[49]
+#define SWIGTYPE_p_Functions1D__GetDirectionalViewMapDensityF1D swig_types[50]
+#define SWIGTYPE_p_Functions1D__GetOccludeeF1D swig_types[51]
+#define SWIGTYPE_p_Functions1D__GetOccludersF1D swig_types[52]
+#define SWIGTYPE_p_Functions1D__GetProjectedXF1D swig_types[53]
+#define SWIGTYPE_p_Functions1D__GetProjectedYF1D swig_types[54]
+#define SWIGTYPE_p_Functions1D__GetProjectedZF1D swig_types[55]
+#define SWIGTYPE_p_Functions1D__GetShapeF1D swig_types[56]
+#define SWIGTYPE_p_Functions1D__GetSteerableViewMapDensityF1D swig_types[57]
+#define SWIGTYPE_p_Functions1D__GetViewMapGradientNormF1D swig_types[58]
+#define SWIGTYPE_p_Functions1D__GetXF1D swig_types[59]
+#define SWIGTYPE_p_Functions1D__GetYF1D swig_types[60]
+#define SWIGTYPE_p_Functions1D__GetZF1D swig_types[61]
+#define SWIGTYPE_p_Functions1D__IncrementChainingTimeStampF1D swig_types[62]
+#define SWIGTYPE_p_Functions1D__LocalAverageDepthF1D swig_types[63]
+#define SWIGTYPE_p_Functions1D__Normal2DF1D swig_types[64]
+#define SWIGTYPE_p_Functions1D__Orientation2DF1D swig_types[65]
+#define SWIGTYPE_p_Functions1D__Orientation3DF1D swig_types[66]
+#define SWIGTYPE_p_Functions1D__QuantitativeInvisibilityF1D swig_types[67]
+#define SWIGTYPE_p_Functions1D__TimeStampF1D swig_types[68]
+#define SWIGTYPE_p_Functions1D__ZDiscontinuityF1D swig_types[69]
+#define SWIGTYPE_p_GrayImage swig_types[70]
+#define SWIGTYPE_p_I1DContainer swig_types[71]
+#define SWIGTYPE_p_Id swig_types[72]
+#define SWIGTYPE_p_IntegrationType swig_types[73]
+#define SWIGTYPE_p_Interface0D swig_types[74]
+#define SWIGTYPE_p_Interface0DIterator swig_types[75]
+#define SWIGTYPE_p_Interface0DIteratorNested swig_types[76]
+#define SWIGTYPE_p_Interface1D swig_types[77]
+#define SWIGTYPE_p_Material swig_types[78]
+#define SWIGTYPE_p_MediumType swig_types[79]
+#define SWIGTYPE_p_Module swig_types[80]
+#define SWIGTYPE_p_Noise swig_types[81]
+#define SWIGTYPE_p_NonTVertex swig_types[82]
+#define SWIGTYPE_p_OmissionShader swig_types[83]
+#define SWIGTYPE_p_Omitter swig_types[84]
+#define SWIGTYPE_p_Operators swig_types[85]
+#define SWIGTYPE_p_Point swig_types[86]
+#define SWIGTYPE_p_Polygon3r swig_types[87]
+#define SWIGTYPE_p_Predicates0D__FalseUP0D swig_types[88]
+#define SWIGTYPE_p_Predicates0D__TrueUP0D swig_types[89]
+#define SWIGTYPE_p_Predicates1D__ContourUP1D swig_types[90]
+#define SWIGTYPE_p_Predicates1D__DensityLowerThanUP1D swig_types[91]
+#define SWIGTYPE_p_Predicates1D__EqualToChainingTimeStampUP1D swig_types[92]
+#define SWIGTYPE_p_Predicates1D__EqualToTimeStampUP1D swig_types[93]
+#define SWIGTYPE_p_Predicates1D__ExternalContourUP1D swig_types[94]
+#define SWIGTYPE_p_Predicates1D__FalseBP1D swig_types[95]
+#define SWIGTYPE_p_Predicates1D__FalseUP1D swig_types[96]
+#define SWIGTYPE_p_Predicates1D__Length2DBP1D swig_types[97]
+#define SWIGTYPE_p_Predicates1D__QuantitativeInvisibilityUP1D swig_types[98]
+#define SWIGTYPE_p_Predicates1D__SameShapeIdBP1D swig_types[99]
+#define SWIGTYPE_p_Predicates1D__ShapeUP1D swig_types[100]
+#define SWIGTYPE_p_Predicates1D__TrueBP1D swig_types[101]
+#define SWIGTYPE_p_Predicates1D__TrueUP1D swig_types[102]
+#define SWIGTYPE_p_Predicates1D__ViewMapGradientNormBP1D swig_types[103]
+#define SWIGTYPE_p_RGBImage swig_types[104]
+#define SWIGTYPE_p_ReturnedValueType swig_types[105]
+#define SWIGTYPE_p_SShape swig_types[106]
+#define SWIGTYPE_p_SVertex swig_types[107]
+#define SWIGTYPE_p_SVertex__fedges_container__iterator swig_types[108]
+#define SWIGTYPE_p_Smoother swig_types[109]
+#define SWIGTYPE_p_SmoothingShader swig_types[110]
+#define SWIGTYPE_p_SpatialNoiseShader swig_types[111]
+#define SWIGTYPE_p_SteerableViewMap swig_types[112]
+#define SWIGTYPE_p_Stroke swig_types[113]
+#define SWIGTYPE_p_StrokeAttribute swig_types[114]
+#define SWIGTYPE_p_StrokeInternal__StrokeVertexIterator swig_types[115]
+#define SWIGTYPE_p_StrokeLayer swig_types[116]
+#define SWIGTYPE_p_StrokeRenderer swig_types[117]
+#define SWIGTYPE_p_StrokeShader swig_types[118]
+#define SWIGTYPE_p_StrokeShaders__BSplineShader swig_types[119]
+#define SWIGTYPE_p_StrokeShaders__BackboneStretcherShader swig_types[120]
+#define SWIGTYPE_p_StrokeShaders__BezierCurveShader swig_types[121]
+#define SWIGTYPE_p_StrokeShaders__CalligraphicColorShader swig_types[122]
+#define SWIGTYPE_p_StrokeShaders__ColorNoiseShader swig_types[123]
+#define SWIGTYPE_p_StrokeShaders__ColorVariationPatternShader swig_types[124]
+#define SWIGTYPE_p_StrokeShaders__ConstantColorShader swig_types[125]
+#define SWIGTYPE_p_StrokeShaders__ConstantExternThicknessShader swig_types[126]
+#define SWIGTYPE_p_StrokeShaders__ConstantThicknessShader swig_types[127]
+#define SWIGTYPE_p_StrokeShaders__ConstrainedIncreasingThicknessShader swig_types[128]
+#define SWIGTYPE_p_StrokeShaders__ExternalContourStretcherShader swig_types[129]
+#define SWIGTYPE_p_StrokeShaders__GuidingLinesShader swig_types[130]
+#define SWIGTYPE_p_StrokeShaders__IncreasingColorShader swig_types[131]
+#define SWIGTYPE_p_StrokeShaders__IncreasingThicknessShader swig_types[132]
+#define SWIGTYPE_p_StrokeShaders__InflateShader swig_types[133]
+#define SWIGTYPE_p_StrokeShaders__LengthDependingThicknessShader swig_types[134]
+#define SWIGTYPE_p_StrokeShaders__MaterialColorShader swig_types[135]
+#define SWIGTYPE_p_StrokeShaders__PolygonalizationShader swig_types[136]
+#define SWIGTYPE_p_StrokeShaders__SamplingShader swig_types[137]
+#define SWIGTYPE_p_StrokeShaders__StrokeTextureShader swig_types[138]
+#define SWIGTYPE_p_StrokeShaders__TextureAssignerShader swig_types[139]
+#define SWIGTYPE_p_StrokeShaders__ThicknessNoiseShader swig_types[140]
+#define SWIGTYPE_p_StrokeShaders__ThicknessVariationPatternShader swig_types[141]
+#define SWIGTYPE_p_StrokeShaders__TipRemoverShader swig_types[142]
+#define SWIGTYPE_p_StrokeShaders__fstreamShader swig_types[143]
+#define SWIGTYPE_p_StrokeShaders__streamShader swig_types[144]
+#define SWIGTYPE_p_StrokeVertex swig_types[145]
+#define SWIGTYPE_p_Stroke__vertex_container__iterator swig_types[146]
+#define SWIGTYPE_p_Stroke__viewedge_container__const_iterator swig_types[147]
+#define SWIGTYPE_p_Stroke__viewedge_container__iterator swig_types[148]
+#define SWIGTYPE_p_StrokesContainer swig_types[149]
+#define SWIGTYPE_p_StyleModule swig_types[150]
+#define SWIGTYPE_p_TVertex swig_types[151]
+#define SWIGTYPE_p_UnaryFunction0DTId_t swig_types[152]
+#define SWIGTYPE_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t swig_types[153]
+#define SWIGTYPE_p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t swig_types[154]
+#define SWIGTYPE_p_UnaryFunction0DTViewShape_p_t swig_types[155]
+#define SWIGTYPE_p_UnaryFunction0DTdouble_t swig_types[156]
+#define SWIGTYPE_p_UnaryFunction0DTfloat_t swig_types[157]
+#define SWIGTYPE_p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t swig_types[158]
+#define SWIGTYPE_p_UnaryFunction0DTunsigned_int_t swig_types[159]
+#define SWIGTYPE_p_UnaryFunction0DTvoid_t swig_types[160]
+#define SWIGTYPE_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t swig_types[161]
+#define SWIGTYPE_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t swig_types[162]
+#define SWIGTYPE_p_UnaryFunction1DTdouble_t swig_types[163]
+#define SWIGTYPE_p_UnaryFunction1DTfloat_t swig_types[164]
+#define SWIGTYPE_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t swig_types[165]
+#define SWIGTYPE_p_UnaryFunction1DTunsigned_int_t swig_types[166]
+#define SWIGTYPE_p_UnaryFunction1DTvoid_t swig_types[167]
+#define SWIGTYPE_p_UnaryPredicate0D swig_types[168]
+#define SWIGTYPE_p_UnaryPredicate1D swig_types[169]
+#define SWIGTYPE_p_VecMat__HVec3Tdouble_t swig_types[170]
+#define SWIGTYPE_p_VecMat__HVec3Tfloat_t swig_types[171]
+#define SWIGTYPE_p_VecMat__HVec3Tint_t swig_types[172]
+#define SWIGTYPE_p_VecMat__HVec3Tunsigned_int_t swig_types[173]
+#define SWIGTYPE_p_VecMat__SquareMatrixTdouble_2_t swig_types[174]
+#define SWIGTYPE_p_VecMat__SquareMatrixTdouble_3_t swig_types[175]
+#define SWIGTYPE_p_VecMat__SquareMatrixTdouble_4_t swig_types[176]
+#define SWIGTYPE_p_VecMat__SquareMatrixTfloat_2_t swig_types[177]
+#define SWIGTYPE_p_VecMat__SquareMatrixTfloat_3_t swig_types[178]
+#define SWIGTYPE_p_VecMat__SquareMatrixTfloat_4_t swig_types[179]
+#define SWIGTYPE_p_VecMat__SquareMatrixTint_2_t swig_types[180]
+#define SWIGTYPE_p_VecMat__SquareMatrixTint_3_t swig_types[181]
+#define SWIGTYPE_p_VecMat__SquareMatrixTint_4_t swig_types[182]
+#define SWIGTYPE_p_VecMat__SquareMatrixTunsigned_int_2_t swig_types[183]
+#define SWIGTYPE_p_VecMat__SquareMatrixTunsigned_int_3_t swig_types[184]
+#define SWIGTYPE_p_VecMat__SquareMatrixTunsigned_int_4_t swig_types[185]
+#define SWIGTYPE_p_VecMat__Vec2Tdouble_t swig_types[186]
+#define SWIGTYPE_p_VecMat__Vec2Tfloat_t swig_types[187]
+#define SWIGTYPE_p_VecMat__Vec2Tint_t swig_types[188]
+#define SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t swig_types[189]
+#define SWIGTYPE_p_VecMat__Vec3Tdouble_t swig_types[190]
+#define SWIGTYPE_p_VecMat__Vec3Tfloat_t swig_types[191]
+#define SWIGTYPE_p_VecMat__Vec3Tint_t swig_types[192]
+#define SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t swig_types[193]
+#define SWIGTYPE_p_VecMat__VecTdouble_2_t swig_types[194]
+#define SWIGTYPE_p_VecMat__VecTdouble_3_t swig_types[195]
+#define SWIGTYPE_p_VecMat__VecTfloat_2_t swig_types[196]
+#define SWIGTYPE_p_VecMat__VecTfloat_3_t swig_types[197]
+#define SWIGTYPE_p_VecMat__VecTint_2_t swig_types[198]
+#define SWIGTYPE_p_VecMat__VecTint_3_t swig_types[199]
+#define SWIGTYPE_p_VecMat__VecTunsigned_int_2_t swig_types[200]
+#define SWIGTYPE_p_VecMat__VecTunsigned_int_3_t swig_types[201]
+#define SWIGTYPE_p_Vertex swig_types[202]
+#define SWIGTYPE_p_ViewEdge swig_types[203]
+#define SWIGTYPE_p_ViewEdgeInternal__SVertexIterator swig_types[204]
+#define SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator swig_types[205]
+#define SWIGTYPE_p_ViewMap swig_types[206]
+#define SWIGTYPE_p_ViewShape swig_types[207]
+#define SWIGTYPE_p_ViewVertex swig_types[208]
+#define SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t swig_types[209]
+#define SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t swig_types[210]
+#define SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator swig_types[211]
+#define SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator__edge_pointers_container__iterator swig_types[212]
+#define SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator__edges_container__iterator swig_types[213]
+#define SWIGTYPE_p_allocator_type swig_types[214]
+#define SWIGTYPE_p_char swig_types[215]
+#define SWIGTYPE_p_const_edge_iterator swig_types[216]
+#define SWIGTYPE_p_const_fedge_iterator swig_types[217]
+#define SWIGTYPE_p_const_point_iterator swig_types[218]
+#define SWIGTYPE_p_const_reference swig_types[219]
+#define SWIGTYPE_p_const_vertex_iterator swig_types[220]
+#define SWIGTYPE_p_difference_type swig_types[221]
+#define SWIGTYPE_p_directedViewEdge swig_types[222]
+#define SWIGTYPE_p_double swig_types[223]
+#define SWIGTYPE_p_edge_iterator swig_types[224]
+#define SWIGTYPE_p_edge_pointers_container swig_types[225]
+#define SWIGTYPE_p_edges_container swig_types[226]
+#define SWIGTYPE_p_fedge_iterator swig_types[227]
+#define SWIGTYPE_p_fedges_container swig_types[228]
+#define SWIGTYPE_p_float swig_types[229]
+#define SWIGTYPE_p_id_type swig_types[230]
+#define SWIGTYPE_p_int swig_types[231]
+#define SWIGTYPE_p_ltstr swig_types[232]
+#define SWIGTYPE_p_mapsMap swig_types[233]
+#define SWIGTYPE_p_occluder_container__const_iterator swig_types[234]
+#define SWIGTYPE_p_p_PyObject swig_types[235]
+#define SWIGTYPE_p_point_iterator swig_types[236]
+#define SWIGTYPE_p_point_type swig_types[237]
+#define SWIGTYPE_p_reference swig_types[238]
+#define SWIGTYPE_p_setTVecMat__Vec3Tdouble_t_t swig_types[239]
+#define SWIGTYPE_p_size_type swig_types[240]
+#define SWIGTYPE_p_std__invalid_argument swig_types[241]
+#define SWIGTYPE_p_std__pairTViewEdge_p_bool_t swig_types[242]
+#define SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t swig_types[243]
+#define SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__allocator_type swig_types[244]
+#define SWIGTYPE_p_std__vectorTMaterial_std__allocatorTMaterial_t_t swig_types[245]
+#define SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t swig_types[246]
+#define SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__allocator_type swig_types[247]
+#define SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t swig_types[248]
+#define SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__allocator_type swig_types[249]
+#define SWIGTYPE_p_std__vectorTTVertex_p_std__allocatorTTVertex_p_t_t swig_types[250]
+#define SWIGTYPE_p_std__vectorTVecMat__Vec2Tdouble_t_std__allocatorTVecMat__Vec2Tdouble_t_t_t swig_types[251]
+#define SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t swig_types[252]
+#define SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__allocator_type swig_types[253]
+#define SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t swig_types[254]
+#define SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__allocator_type swig_types[255]
+#define SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t swig_types[256]
+#define SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__allocator_type swig_types[257]
+#define SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t swig_types[258]
+#define SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t__allocator_type swig_types[259]
+#define SWIGTYPE_p_std__vectorTstd__pairTViewEdge_p_bool_t_std__allocatorTstd__pairTViewEdge_p_bool_t_t_t swig_types[260]
+#define SWIGTYPE_p_std__vectorTunsigned_int_std__allocatorTunsigned_int_t_t swig_types[261]
+#define SWIGTYPE_p_svertices_container swig_types[262]
+#define SWIGTYPE_p_swig__PySwigIterator swig_types[263]
+#define SWIGTYPE_p_unsigned_int swig_types[264]
+#define SWIGTYPE_p_unsigned_short swig_types[265]
+#define SWIGTYPE_p_value_type swig_types[266]
+#define SWIGTYPE_p_vertex_container swig_types[267]
+#define SWIGTYPE_p_vertex_iterator swig_types[268]
+#define SWIGTYPE_p_vertex_type swig_types[269]
+#define SWIGTYPE_p_viewedge_container swig_types[270]
+#define SWIGTYPE_p_viewedges_container swig_types[271]
+#define SWIGTYPE_p_viewshapes_container swig_types[272]
+#define SWIGTYPE_p_viewvertices_container swig_types[273]
+#define SWIGTYPE_p_void swig_types[274]
+#define SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type swig_types[275]
+#define SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type swig_types[276]
+#define SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type swig_types[277]
+#define SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type swig_types[278]
+#define SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type swig_types[279]
+#define SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type swig_types[280]
+static swig_type_info *swig_types[282];
+static swig_module_info swig_module = {swig_types, 281, 0, 0, 0, 0};
+#define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
+#define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
+
+/* -------- TYPES TABLE (END) -------- */
+
+#if (PY_VERSION_HEX <= 0x02000000)
+# if !defined(SWIG_PYTHON_CLASSIC)
+#  error "This python version requires swig to be run with the '-classic' option"
+# endif
+#endif
+
+/*-----------------------------------------------
+              @(target):= _Freestyle.so
+  ------------------------------------------------*/
+#define SWIG_init    init_Freestyle
+
+#define SWIG_name    "_Freestyle"
+
+#define SWIGVERSION 0x010331 
+#define SWIG_VERSION SWIGVERSION
+
+
+#define SWIG_as_voidptr(a) const_cast< void * >(static_cast< const void * >(a)) 
+#define SWIG_as_voidptrptr(a) ((void)SWIG_as_voidptr(*a),reinterpret_cast< void** >(a)) 
+
+
+#include <stdexcept>
+
+
+namespace swig {
+  class PyObject_ptr {
+  protected:
+    PyObject *_obj;
+
+  public:
+    PyObject_ptr() :_obj(0)
+    {
+    }
+
+    PyObject_ptr(const PyObject_ptr& item) : _obj(item._obj)
+    {
+      Py_XINCREF(_obj);      
+    }
+    
+    PyObject_ptr(PyObject *obj, bool initial_ref = true) :_obj(obj)
+    {
+      if (initial_ref) Py_XINCREF(_obj);
+    }
+    
+    PyObject_ptr & operator=(const PyObject_ptr& item) 
+    {
+      Py_XINCREF(item._obj);
+      Py_XDECREF(_obj);
+      _obj = item._obj;
+      return *this;      
+    }
+    
+    ~PyObject_ptr() 
+    {
+      Py_XDECREF(_obj);
+    }
+    
+    operator PyObject *() const
+    {
+      return _obj;
+    }
+
+    PyObject *operator->() const
+    {
+      return _obj;
+    }
+  };
+}
+
+
+namespace swig {
+  struct PyObject_var : PyObject_ptr {
+    PyObject_var(PyObject* obj = 0) : PyObject_ptr(obj, false) { }
+    
+    PyObject_var & operator = (PyObject* obj)
+    {
+      Py_XDECREF(_obj);
+      _obj = obj;
+      return *this;      
+    }
+  };
+}
+
+
+ #include "../system/Cast.h"
+ #include "../stroke/Module.h"
+ #include "../system/Precision.h"
+ #include "../system/Id.h"
+ #include "../geometry/VecMat.h"
+ #include "../geometry/Geom.h"
+ #include "../geometry/Noise.h"
+ #include "../scene_graph/Material.h"
+ #include "../winged_edge/Nature.h"
+ #include "../view_map/Interface0D.h"
+ #include "../view_map/Interface1D.h"
+ #include "../view_map/Functions0D.h"
+ #include "../view_map/Functions1D.h"
+ #include "../view_map/Silhouette.h"
+ #include "../view_map/ViewMap.h"
+ #include "../view_map/ViewMapIterators.h"
+ #include "../stroke/AdvancedFunctions0D.h"
+ #include "../stroke/AdvancedFunctions1D.h"
+ #include "../stroke/ChainingIterators.h"
+ #include "../stroke/ContextFunctions.h"
+ #include "../stroke/Predicates0D.h"
+ #include "../stroke/Predicates1D.h"
+ #include "../stroke/AdvancedPredicates1D.h"
+ #include "../stroke/StrokeShader.h"
+// #include "../stroke/Curve.h"
+ #include "../stroke/CurveIterators.h"       
+ #include "../stroke/Stroke.h"
+ #include "../stroke/StrokeIterators.h"
+ #include "../stroke/BasicStrokeShaders.h"
+ #include "../stroke/AdvancedStrokeShaders.h"
+ #include "../stroke/Operators.h"
+ #include "../stroke/Canvas.h"
+
+
+#include <stdexcept>
+
+
+  
+#if defined(__SUNPRO_CC) && defined(_RWSTD_VER)
+#  define SWIG_STD_NOASSIGN_STL
+#  define SWIG_STD_NOINSERT_TEMPLATE_STL
+#  define SWIG_STD_NOITERATOR_TRAITS_STL
+#endif
+
+#if defined(__GNUC__)
+#  if __GNUC__ == 2 && __GNUC_MINOR <= 96
+#     define SWIG_STD_NOMODERN_STL
+#  endif
+#endif
+
+
+
+
+#include <string>
+#include <stdexcept>
+
+
+#include <string>
+
+
+#include <iostream>
+
+  
+namespace swig {
+  struct stop_iteration {
+  };
+
+  struct PySwigIterator {
+  private:
+    PyObject_ptr _seq;
+
+  protected:
+    PySwigIterator(PyObject *seq) : _seq(seq)
+    {
+    }
+      
+  public:
+    virtual ~PySwigIterator() {}
+
+    // Access iterator method, required by Python
+    virtual PyObject *value() const = 0;
+
+    // Forward iterator method, required by Python
+    virtual PySwigIterator *incr(size_t n = 1) = 0;
+    
+    // Backward iterator method, very common in C++, but not required in Python
+    virtual PySwigIterator *decr(size_t n = 1)
+    {
+      throw stop_iteration();
+    }
+
+    // Random access iterator methods, but not required in Python
+    virtual ptrdiff_t distance(const PySwigIterator &x) const
+    {
+      throw std::invalid_argument("operation not supported");
+    }
+
+    virtual bool equal (const PySwigIterator &x) const
+    {
+      throw std::invalid_argument("operation not supported");
+    }
+    
+    // C++ common/needed methods
+    virtual PySwigIterator *copy() const = 0;
+
+    PyObject *next()
+    {
+      PyObject *obj = value();
+      incr();
+      return obj;
+    }
+
+    PyObject *previous()
+    {
+      decr();
+      return value();
+    }
+
+    PySwigIterator *advance(ptrdiff_t n)
+    {
+      return  (n > 0) ?  incr(n) : decr(-n);
+    }
+      
+    bool operator == (const PySwigIterator& x)  const
+    {
+      return equal(x);
+    }
+      
+    bool operator != (const PySwigIterator& x) const
+    {
+      return ! operator==(x);
+    }
+      
+    PySwigIterator& operator += (ptrdiff_t n)
+    {
+      return *advance(n);
+    }
+
+    PySwigIterator& operator -= (ptrdiff_t n)
+    {
+      return *advance(-n);
+    }
+      
+    PySwigIterator* operator + (ptrdiff_t n) const
+    {
+      return copy()->advance(n);
+    }
+
+    PySwigIterator* operator - (ptrdiff_t n) const
+    {
+      return copy()->advance(-n);
+    }
+      
+    ptrdiff_t operator - (const PySwigIterator& x) const
+    {
+      return x.distance(*this);
+    }
+      
+    static swig_type_info* descriptor() {
+      static int init = 0;
+      static swig_type_info* desc = 0;
+      if (!init) {
+	desc = SWIG_TypeQuery("swig::PySwigIterator *");
+	init = 1;
+      }	
+      return desc;
+    }    
+  };
+}
+
+
+SWIGINTERN int
+SWIG_AsVal_double (PyObject *obj, double *val)
+{
+  int res = SWIG_TypeError;
+  if (PyFloat_Check(obj)) {
+    if (val) *val = PyFloat_AsDouble(obj);
+    return SWIG_OK;
+  } else if (PyInt_Check(obj)) {
+    if (val) *val = PyInt_AsLong(obj);
+    return SWIG_OK;
+  } else if (PyLong_Check(obj)) {
+    double v = PyLong_AsDouble(obj);
+    if (!PyErr_Occurred()) {
+      if (val) *val = v;
+      return SWIG_OK;
+    } else {
+      PyErr_Clear();
+    }
+  }
+#ifdef SWIG_PYTHON_CAST_MODE
+  {
+    int dispatch = 0;
+    double d = PyFloat_AsDouble(obj);
+    if (!PyErr_Occurred()) {
+      if (val) *val = d;
+      return SWIG_AddCast(SWIG_OK);
+    } else {
+      PyErr_Clear();
+    }
+    if (!dispatch) {
+      long v = PyLong_AsLong(obj);
+      if (!PyErr_Occurred()) {
+	if (val) *val = v;
+	return SWIG_AddCast(SWIG_AddCast(SWIG_OK));
+      } else {
+	PyErr_Clear();
+      }
+    }
+  }
+#endif
+  return res;
+}
+
+
+#include <float.h>
+
+
+#include <math.h>
+
+
+SWIGINTERNINLINE int
+SWIG_CanCastAsInteger(double *d, double min, double max) {
+  double x = *d;
+  if ((min <= x && x <= max)) {
+   double fx = floor(x);
+   double cx = ceil(x);
+   double rd =  ((x - fx) < 0.5) ? fx : cx; /* simple rint */
+   if ((errno == EDOM) || (errno == ERANGE)) {
+     errno = 0;
+   } else {
+     double summ, reps, diff;
+     if (rd < x) {
+       diff = x - rd;
+     } else if (rd > x) {
+       diff = rd - x;
+     } else {
+       return 1;
+     }
+     summ = rd + x;
+     reps = diff/summ;
+     if (reps < 8*DBL_EPSILON) {
+       *d = rd;
+       return 1;
+     }
+   }
+  }
+  return 0;
+}
+
+
+SWIGINTERN int
+SWIG_AsVal_unsigned_SS_long (PyObject *obj, unsigned long *val) 
+{
+  if (PyInt_Check(obj)) {
+    long v = PyInt_AsLong(obj);
+    if (v >= 0) {
+      if (val) *val = v;
+      return SWIG_OK;
+    } else {
+      return SWIG_OverflowError;
+    }
+  } else if (PyLong_Check(obj)) {
+    unsigned long v = PyLong_AsUnsignedLong(obj);
+    if (!PyErr_Occurred()) {
+      if (val) *val = v;
+      return SWIG_OK;
+    } else {
+      PyErr_Clear();
+    }
+  }
+#ifdef SWIG_PYTHON_CAST_MODE
+  {
+    int dispatch = 0;
+    unsigned long v = PyLong_AsUnsignedLong(obj);
+    if (!PyErr_Occurred()) {
+      if (val) *val = v;
+      return SWIG_AddCast(SWIG_OK);
+    } else {
+      PyErr_Clear();
+    }
+    if (!dispatch) {
+      double d;
+      int res = SWIG_AddCast(SWIG_AsVal_double (obj,&d));
+      if (SWIG_IsOK(res) && SWIG_CanCastAsInteger(&d, 0, ULONG_MAX)) {
+	if (val) *val = (unsigned long)(d);
+	return res;
+      }
+    }
+  }
+#endif
+  return SWIG_TypeError;
+}
+
+
+SWIGINTERNINLINE int
+SWIG_AsVal_size_t (PyObject * obj, size_t *val)
+{
+  unsigned long v;
+  int res = SWIG_AsVal_unsigned_SS_long (obj, val ? &v : 0);
+  if (SWIG_IsOK(res) && val) *val = static_cast< size_t >(v);
+  return res;
+}
+
+
+  #define SWIG_From_long   PyInt_FromLong 
+
+
+SWIGINTERNINLINE PyObject *
+SWIG_From_ptrdiff_t  (ptrdiff_t value)
+{    
+  return SWIG_From_long  (static_cast< long >(value));
+}
+
+
+SWIGINTERNINLINE PyObject*
+  SWIG_From_bool  (bool value)
+{
+  return PyBool_FromLong(value ? 1 : 0);
+}
+
+
+SWIGINTERN int
+SWIG_AsVal_long (PyObject *obj, long* val)
+{
+  if (PyInt_Check(obj)) {
+    if (val) *val = PyInt_AsLong(obj);
+    return SWIG_OK;
+  } else if (PyLong_Check(obj)) {
+    long v = PyLong_AsLong(obj);
+    if (!PyErr_Occurred()) {
+      if (val) *val = v;
+      return SWIG_OK;
+    } else {
+      PyErr_Clear();
+    }
+  }
+#ifdef SWIG_PYTHON_CAST_MODE
+  {
+    int dispatch = 0;
+    long v = PyInt_AsLong(obj);
+    if (!PyErr_Occurred()) {
+      if (val) *val = v;
+      return SWIG_AddCast(SWIG_OK);
+    } else {
+      PyErr_Clear();
+    }
+    if (!dispatch) {
+      double d;
+      int res = SWIG_AddCast(SWIG_AsVal_double (obj,&d));
+      if (SWIG_IsOK(res) && SWIG_CanCastAsInteger(&d, LONG_MIN, LONG_MAX)) {
+	if (val) *val = (long)(d);
+	return res;
+      }
+    }
+  }
+#endif
+  return SWIG_TypeError;
+}
+
+
+SWIGINTERNINLINE int
+SWIG_AsVal_ptrdiff_t (PyObject * obj, ptrdiff_t *val)
+{
+  long v;
+  int res = SWIG_AsVal_long (obj, val ? &v : 0);
+  if (SWIG_IsOK(res) && val) *val = static_cast< ptrdiff_t >(v);
+  return res;
+}
+
+
+#include <stdexcept>
+
+
+#include <algorithm>
+
+
+#include <vector>
+
+
+#include <utility>
+
+
+#include <map>
+#include <algorithm>
+#include <stdexcept>
+
+
+namespace swig {  
+  template <class Type>
+  struct noconst_traits {
+    typedef Type noconst_type;
+  };
+
+  template <class Type>
+  struct noconst_traits<const Type> {
+    typedef Type noconst_type;
+  };
+
+  /*
+    type categories
+  */
+  struct pointer_category { };  
+  struct value_category { };
+
+  /*
+    General traits that provides type_name and type_info
+  */
+  template <class Type> struct traits { };
+
+  template <class Type>
+  inline const char* type_name() {
+    return traits<typename noconst_traits<Type >::noconst_type >::type_name();
+  }
+
+  template <class Type> 
+  struct traits_info {
+    static swig_type_info *type_query(std::string name) {
+      name += " *";
+      return SWIG_TypeQuery(name.c_str());
+    }    
+    static swig_type_info *type_info() {
+      static swig_type_info *info = type_query(type_name<Type>());
+      return info;
+    }
+  };
+
+  template <class Type>
+  inline swig_type_info *type_info() {
+    return traits_info<Type>::type_info();
+  }
+
+  /*
+    Partial specialization for pointers
+  */
+  template <class Type> struct traits <Type *> {
+    typedef pointer_category category;
+    static std::string make_ptr_name(const char* name) {
+      std::string ptrname = name;
+      ptrname += " *";
+      return ptrname;
+    }    
+    static const char* type_name() {
+      static std::string name = make_ptr_name(swig::type_name<Type>());
+      return name.c_str();
+    }
+  };
+
+  template <class Type, class Category> 
+  struct traits_as { };
+ 
+  template <class Type, class Category> 
+  struct traits_check { };
+
+}
+
+
+namespace swig {  
+  /*
+    Traits that provides the from method
+  */
+  template <class Type> struct traits_from_ptr {
+    static PyObject *from(Type *val, int owner = 0) {
+      return SWIG_NewPointerObj(val, type_info<Type>(), owner);
+    }
+  };
+
+  template <class Type> struct traits_from {
+    static PyObject *from(const Type& val) {
+      return traits_from_ptr<Type>::from(new Type(val), 1);
+    }
+  };
+
+  template <class Type> struct traits_from<Type *> {
+    static PyObject *from(Type* val) {
+      return traits_from_ptr<Type>::from(val, 0);
+    }
+  };
+
+  template <class Type> struct traits_from<const Type *> {
+    static PyObject *from(const Type* val) {
+      return traits_from_ptr<Type>::from(const_cast<Type*>(val), 0);
+    }
+  };
+
+
+  template <class Type>
+  inline PyObject *from(const Type& val) {
+    return traits_from<Type>::from(val);
+  }
+
+  template <class Type>
+  inline PyObject *from_ptr(Type* val, int owner) {
+    return traits_from_ptr<Type>::from(val, owner);
+  }
+
+  /*
+    Traits that provides the asval/as/check method
+  */
+  template <class Type>
+  struct traits_asptr {   
+    static int asptr(PyObject *obj, Type **val) {
+      Type *p;
+      int res = (SWIG_ConvertPtr(obj, (void**)&p, type_info<Type>(), 0) == SWIG_OK) ? SWIG_OLDOBJ : 0;
+      if (SWIG_IsOK(res)) {
+	if (val) *val = p;
+      }
+      return res;
+    }
+  }; 
+
+  template <class Type>
+  inline int asptr(PyObject *obj, Type **vptr) {
+    return traits_asptr<Type>::asptr(obj, vptr);
+  }
+
+  template <class Type> 
+  struct traits_asval {
+    static int asval(PyObject *obj, Type *val) {
+      if (val) {
+	Type *p = 0;
+	int res = traits_asptr<Type>::asptr(obj, &p);
+	if (!SWIG_IsOK(res)) return res;	
+	if (p) {
+	  typedef typename noconst_traits<Type>::noconst_type noconst_type;
+	  *(const_cast<noconst_type*>(val)) = *p;
+	  if (SWIG_IsNewObj(res)){
+	    delete p;
+	    res = SWIG_DelNewMask(res);
+	  }
+	  return res;
+	} else {
+	  return SWIG_ERROR;
+	}
+      } else {
+	return traits_asptr<Type>::asptr(obj, (Type **)(0));
+      }
+    }
+  };
+
+  template <class Type> struct traits_asval<Type*> {
+    static int asval(PyObject *obj, Type **val) {
+      if (val) {
+        typedef typename noconst_traits<Type>::noconst_type noconst_type;
+        noconst_type *p = 0;
+        int res = traits_asptr<noconst_type>::asptr(obj,  &p);
+        if (SWIG_IsOK(res)) {
+          *(const_cast<noconst_type**>(val)) = p;
+	}
+	return res;
+      } else {
+	return traits_asptr<Type>::asptr(obj, (Type **)(0));
+      }
+    }
+  };
+  
+  template <class Type>
+  inline int asval(PyObject *obj, Type *val) {
+    return traits_asval<Type>::asval(obj, val);
+  }
+
+  template <class Type> 
+  struct traits_as<Type, value_category> {
+    static Type as(PyObject *obj, bool throw_error) {
+      Type v;
+      int res = asval(obj, &v);
+      if (!obj || !SWIG_IsOK(res)) {
+	if (!PyErr_Occurred()) {
+	  SWIG_Error(SWIG_TypeError,  swig::type_name<Type>());
+	}
+	if (throw_error) throw std::invalid_argument("bad type");
+      }
+      return v;
+    }
+  };
+
+  template <class Type> 
+  struct traits_as<Type, pointer_category> {
+    static Type as(PyObject *obj, bool throw_error) {
+      Type *v = 0;      
+      int res = (obj ? traits_asptr<Type>::asptr(obj, &v) : SWIG_ERROR);
+      if (SWIG_IsOK(res) && v) {
+	if (SWIG_IsNewObj(res)) {
+	  Type r(*v);
+	  delete v;
+	  return r;
+	} else {
+	  return *v;
+	}
+      } else {
+	// Uninitialized return value, no Type() constructor required.
+	static Type *v_def = (Type*) malloc(sizeof(Type));
+	if (!PyErr_Occurred()) {
+	  SWIG_Error(SWIG_TypeError,  swig::type_name<Type>());
+	}
+	if (throw_error) throw std::invalid_argument("bad type");
+	memset(v_def,0,sizeof(Type));
+	return *v_def;
+      }
+    }
+  };
+
+  template <class Type> 
+  struct traits_as<Type*, pointer_category> {
+    static Type* as(PyObject *obj, bool throw_error) {
+      Type *v = 0;      
+      int res = (obj ? traits_asptr<Type>::asptr(obj, &v) : SWIG_ERROR);
+      if (SWIG_IsOK(res)) {
+	return v;
+      } else {
+	if (!PyErr_Occurred()) {
+	  SWIG_Error(SWIG_TypeError,  swig::type_name<Type>());
+	}
+	if (throw_error) throw std::invalid_argument("bad type");
+	return 0;
+      }
+    }
+  };
+    
+  template <class Type>
+  inline Type as(PyObject *obj, bool te = false) {
+    return traits_as<Type, typename traits<Type>::category>::as(obj, te);
+  }
+
+  template <class Type> 
+  struct traits_check<Type, value_category> {
+    static bool check(PyObject *obj) {
+      int res = obj ? asval(obj, (Type *)(0)) : SWIG_ERROR;
+      return SWIG_IsOK(res) ? true : false;
+    }
+  };
+
+  template <class Type> 
+  struct traits_check<Type, pointer_category> {
+    static bool check(PyObject *obj) {
+      int res = obj ? asptr(obj, (Type **)(0)) : SWIG_ERROR;
+      return SWIG_IsOK(res) ? true : false;
+    }
+  };
+
+  template <class Type>
+  inline bool check(PyObject *obj) {
+    return traits_check<Type, typename traits<Type>::category>::check(obj);
+  }
+}
+
+
+#include <functional>
+
+namespace std {
+  template <>
+  struct less <PyObject *>: public binary_function<PyObject *, PyObject *, bool>
+  {
+    bool
+    operator()(PyObject * v, PyObject *w) const
+    { 
+      bool res;
+      SWIG_PYTHON_THREAD_BEGIN_BLOCK;
+      res = PyObject_Compare(v, w) < 0;
+      SWIG_PYTHON_THREAD_END_BLOCK;
+      return res;
+    }
+  };
+
+  template <>
+  struct less <swig::PyObject_ptr>: public binary_function<swig::PyObject_ptr, swig::PyObject_ptr, bool>
+  {
+    bool
+    operator()(const swig::PyObject_ptr& v, const swig::PyObject_ptr& w) const
+    {
+      return std::less<PyObject *>()(v, w);
+    }
+  };
+
+  template <>
+  struct less <swig::PyObject_var>: public binary_function<swig::PyObject_var, swig::PyObject_var, bool>
+  {
+    bool
+    operator()(const swig::PyObject_var& v, const swig::PyObject_var& w) const
+    {
+      return std::less<PyObject *>()(v, w);
+    }
+  };
+
+}
+
+namespace swig {
+  template <> struct traits<PyObject *> {
+    typedef value_category category;
+    static const char* type_name() { return "PyObject *"; }
+  };  
+
+  template <>  struct traits_asval<PyObject * > {   
+    typedef PyObject * value_type;
+    static int asval(PyObject *obj, value_type *val) {
+      if (val) *val = obj;
+      return SWIG_OK;
+    }
+  };
+
+  template <> 
+  struct traits_check<PyObject *, value_category> {
+    static bool check(PyObject *) {
+      return true;
+    }
+  };
+
+  template <>  struct traits_from<PyObject *> {
+    typedef PyObject * value_type;
+    static PyObject *from(const value_type& val) {
+      Py_XINCREF(val);
+      return val;
+    }
+  };
+  
+}
+
+namespace swig {
+  inline size_t
+  check_index(ptrdiff_t i, size_t size, bool insert = false) {
+    if ( i < 0 ) {
+      if ((size_t) (-i) <= size)
+	return (size_t) (i + size);
+    } else if ( (size_t) i < size ) {
+      return (size_t) i;
+    } else if (insert && ((size_t) i == size)) {
+      return size;
+    }
+    
+    throw std::out_of_range("index out of range");
+  }
+
+  inline size_t
+  slice_index(ptrdiff_t i, size_t size) {
+    if ( i < 0 ) {
+      if ((size_t) (-i) <= size) {
+	return (size_t) (i + size);
+      } else {
+	throw std::out_of_range("index out of range");
+      }
+    } else {
+      return ( (size_t) i < size ) ? ((size_t) i) : size;
+    }
+  }
+
+  template <class Sequence, class Difference>
+  inline typename Sequence::iterator
+  getpos(Sequence* self, Difference i)  {
+    typename Sequence::iterator pos = self->begin();
+    std::advance(pos, check_index(i,self->size()));
+    return pos;
+  }
+
+  template <class Sequence, class Difference>
+  inline typename Sequence::const_iterator
+  cgetpos(const Sequence* self, Difference i)  {
+    typename Sequence::const_iterator pos = self->begin();
+    std::advance(pos, check_index(i,self->size()));
+    return pos;
+  }
+
+  template <class Sequence, class Difference>
+  inline Sequence*
+  getslice(const Sequence* self, Difference i, Difference j) {
+    typename Sequence::size_type size = self->size();
+    typename Sequence::size_type ii = swig::check_index(i, size);
+    typename Sequence::size_type jj = swig::slice_index(j, size);
+
+    if (jj > ii) {
+      typename Sequence::const_iterator vb = self->begin();
+      typename Sequence::const_iterator ve = self->begin();
+      std::advance(vb,ii);
+      std::advance(ve,jj);
+      return new Sequence(vb, ve);
+    } else {
+      return new Sequence();
+    }
+  }
+
+  template <class Sequence, class Difference, class InputSeq>
+  inline void
+  setslice(Sequence* self, Difference i, Difference j, const InputSeq& v) {
+    typename Sequence::size_type size = self->size();
+    typename Sequence::size_type ii = swig::check_index(i, size, true);
+    typename Sequence::size_type jj = swig::slice_index(j, size);
+    if (jj < ii) jj = ii;
+    size_t ssize = jj - ii;
+    if (ssize <= v.size()) {
+      typename Sequence::iterator sb = self->begin();
+      typename InputSeq::const_iterator vmid = v.begin();
+      std::advance(sb,ii);
+      std::advance(vmid, jj - ii);
+      self->insert(std::copy(v.begin(), vmid, sb), vmid, v.end());
+    } else {
+      typename Sequence::iterator sb = self->begin();
+      typename Sequence::iterator se = self->begin();
+      std::advance(sb,ii);
+      std::advance(se,jj);
+      self->erase(sb,se);
+      self->insert(sb, v.begin(), v.end());
+    }
+  }
+
+  template <class Sequence, class Difference>
+  inline void
+  delslice(Sequence* self, Difference i, Difference j) {
+    typename Sequence::size_type size = self->size();
+    typename Sequence::size_type ii = swig::check_index(i, size, true);
+    typename Sequence::size_type jj = swig::slice_index(j, size);
+    if (jj > ii) {
+      typename Sequence::iterator sb = self->begin();
+      typename Sequence::iterator se = self->begin();
+      std::advance(sb,ii);
+      std::advance(se,jj);
+      self->erase(sb,se);
+    }
+  }
+}
+
+
+#if !defined(SWIG_STD_NOITERATOR_TRAITS_STL)
+#include <iterator>
+#else
+namespace std  {
+  template <class Iterator>
+  struct iterator_traits {
+    typedef ptrdiff_t difference_type;
+    typedef typename Iterator::value_type value_type;
+  };
+
+#if defined(__SUNPRO_CC) && defined(_RWSTD_VER)
+  template <class Iterator, class Category,class T, class Reference, class Pointer, class Distance>
+  struct iterator_traits<__reverse_bi_iterator<Iterator,Category,T,Reference,Pointer,Distance> > {
+    typedef Distance difference_type;
+    typedef T value_type;
+  };
+#endif  
+
+  template <class T>
+  struct iterator_traits<T*> {
+    typedef T value_type;
+    typedef ptrdiff_t difference_type;
+  };
+
+  template<typename _InputIterator>
+  inline typename iterator_traits<_InputIterator>::difference_type
+  distance(_InputIterator __first, _InputIterator __last)
+  {
+    typename iterator_traits<_InputIterator>::difference_type __n = 0;
+    while (__first != __last) {
+      ++__first; ++__n;
+    }
+    return __n;
+  }
+
+} 
+#endif
+
+
+namespace swig {
+  template<typename OutIterator>
+  class PySwigIterator_T :  public PySwigIterator
+  {
+  public:
+    typedef OutIterator out_iterator;
+    typedef typename std::iterator_traits<out_iterator>::value_type value_type;    
+    typedef PySwigIterator_T<out_iterator> self_type;
+
+    PySwigIterator_T(out_iterator curr, PyObject *seq)
+      : PySwigIterator(seq), current(curr)
+    {
+    }
+
+    const out_iterator& get_current() const
+    {
+      return current;
+    }
+
+    
+    bool equal (const PySwigIterator &iter) const
+    {
+      const self_type *iters = dynamic_cast<const self_type *>(&iter);
+      if (iters) {
+	return (current == iters->get_current());
+      } else {
+	throw std::invalid_argument("bad iterator type");
+      }
+    }
+    
+    ptrdiff_t distance(const PySwigIterator &iter) const
+    {
+      const self_type *iters = dynamic_cast<const self_type *>(&iter);
+      if (iters) {
+	return std::distance(current, iters->get_current());
+      } else {
+	throw std::invalid_argument("bad iterator type");
+      }
+    }    
+    
+  protected:
+    out_iterator current;
+  };
+  
+  template <class ValueType>
+  struct from_oper 
+  {
+    typedef const ValueType& argument_type;
+    typedef PyObject *result_type;
+    result_type operator()(argument_type v) const
+    {
+      return swig::from(v);
+    }
+  };
+
+  template<typename OutIterator, 
+	   typename ValueType = typename std::iterator_traits<OutIterator>::value_type,
+	   typename FromOper = from_oper<ValueType> >
+  class PySwigIteratorOpen_T :  public PySwigIterator_T<OutIterator>
+  {
+  public:
+    FromOper from;
+    typedef OutIterator out_iterator;
+    typedef ValueType value_type;
+    typedef PySwigIterator_T<out_iterator>  base;
+    typedef PySwigIteratorOpen_T<OutIterator, ValueType, FromOper> self_type;
+    
+    PySwigIteratorOpen_T(out_iterator curr, PyObject *seq)
+      : PySwigIterator_T<OutIterator>(curr, seq)
+    {
+    }
+    
+    PyObject *value() const {
+      return from(static_cast<const value_type&>(*(base::current)));
+    }
+    
+    PySwigIterator *copy() const
+    {
+      return new self_type(*this);
+    }
+
+    PySwigIterator *incr(size_t n = 1)
+    {
+      while (n--) {
+	++base::current;
+      }
+      return this;
+    }
+
+    PySwigIterator *decr(size_t n = 1)
+    {
+      while (n--) {
+	--base::current;
+      }
+      return this;
+    }
+  };
+
+  template<typename OutIterator, 
+	   typename ValueType = typename std::iterator_traits<OutIterator>::value_type,
+	   typename FromOper = from_oper<ValueType> >
+  class PySwigIteratorClosed_T :  public PySwigIterator_T<OutIterator>
+  {
+  public:
+    FromOper from;
+    typedef OutIterator out_iterator;
+    typedef ValueType value_type;
+    typedef PySwigIterator_T<out_iterator>  base;    
+    typedef PySwigIteratorClosed_T<OutIterator, ValueType, FromOper> self_type;
+    
+    PySwigIteratorClosed_T(out_iterator curr, out_iterator first, out_iterator last, PyObject *seq)
+      : PySwigIterator_T<OutIterator>(curr, seq), begin(first), end(last)
+    {
+    }
+    
+    PyObject *value() const {
+      if (base::current == end) {
+	throw stop_iteration();
+      } else {
+	return from(static_cast<const value_type&>(*(base::current)));
+      }
+    }
+    
+    PySwigIterator *copy() const
+    {
+      return new self_type(*this);
+    }
+
+    PySwigIterator *incr(size_t n = 1)
+    {
+      while (n--) {
+	if (base::current == end) {
+	  throw stop_iteration();
+	} else {
+	  ++base::current;
+	}
+      }
+      return this;
+    }
+
+    PySwigIterator *decr(size_t n = 1)
+    {
+      while (n--) {
+	if (base::current == begin) {
+	  throw stop_iteration();
+	} else {
+	  --base::current;
+	}
+      }
+      return this;
+    }
+
+  private:
+    out_iterator begin;
+    out_iterator end;
+  };
+
+  template<typename OutIter>
+  inline PySwigIterator*
+  make_output_iterator(const OutIter& current, const OutIter& begin,const OutIter& end, PyObject *seq = 0)
+  {
+    return new PySwigIteratorClosed_T<OutIter>(current, begin, end, seq);
+  }
+
+  template<typename OutIter>
+  inline PySwigIterator*
+  make_output_iterator(const OutIter& current, PyObject *seq = 0)
+  {
+    return new PySwigIteratorOpen_T<OutIter>(current, seq);
+  }
+}
+
+
+namespace swig
+{
+  template <class T>
+  struct PySequence_Ref
+  {
+    PySequence_Ref(PyObject* seq, int index)
+      : _seq(seq), _index(index)
+    {
+    }
+    
+    operator T () const
+    {
+      swig::PyObject_var item = PySequence_GetItem(_seq, _index);
+      try {
+	return swig::as<T>(item, true);
+      } catch (std::exception& e) {
+	char msg[1024];
+	sprintf(msg, "in sequence element %d ", _index);
+	if (!PyErr_Occurred()) {
+	  SWIG_Error(SWIG_TypeError,  swig::type_name<T>());
+	}
+	SWIG_Python_AddErrorMsg(msg);
+	SWIG_Python_AddErrorMsg(e.what());
+	throw;
+      }
+    }
+
+    PySequence_Ref& operator=(const T& v)
+    {
+      PySequence_SetItem(_seq, _index, swig::from<T>(v));
+      return *this;
+    }
+
+  private:
+    PyObject* _seq;
+    int _index;
+  };
+
+  template <class T>
+  struct PySequence_ArrowProxy
+  {
+    PySequence_ArrowProxy(const T& x): m_value(x) {}
+    const T* operator->() const { return &m_value; }
+    operator const T*() const { return &m_value; }
+    T m_value;
+  };
+
+  template <class T, class Reference >
+  struct PySequence_InputIterator
+  {
+    typedef PySequence_InputIterator<T, Reference > self;
+
+    typedef std::random_access_iterator_tag iterator_category;
+    typedef Reference reference;
+    typedef T value_type;
+    typedef T* pointer;
+    typedef int difference_type;
+
+    PySequence_InputIterator()
+    {
+    }
+
+    PySequence_InputIterator(PyObject* seq, int index)
+      : _seq(seq), _index(index)
+    {
+    }
+
+    reference operator*() const
+    {
+      return reference(_seq, _index);
+    }
+
+    PySequence_ArrowProxy<T>
+    operator->() const {
+      return PySequence_ArrowProxy<T>(operator*());
+    }
+
+    bool operator==(const self& ri) const
+    {
+      return (_index == ri._index) && (_seq == ri._seq);
+    }
+
+    bool operator!=(const self& ri) const
+    {
+      return !(operator==(ri));
+    }
+
+    self& operator ++ ()
+    {
+      ++_index;
+      return *this;
+    }
+
+    self& operator -- ()
+    {
+      --_index;
+      return *this;
+    }
+
+    self& operator += (difference_type n)
+    {
+      _index += n;
+      return *this;
+    }
+
+    self operator +(difference_type n) const
+    {
+      return self(_seq, _index + n);
+    }
+
+    self& operator -= (difference_type n)
+    {
+      _index -= n;
+      return *this;
+    }
+
+    self operator -(difference_type n) const
+    {
+      return self(_seq, _index - n);
+    }
+
+    difference_type operator - (const self& ri) const
+    {
+      return _index - ri._index;
+    }
+
+    bool operator < (const self& ri) const
+    {
+      return _index < ri._index;
+    }
+
+    reference
+    operator[](difference_type n) const
+    {
+      return reference(_seq, _index + n);
+    }
+
+  private:
+    PyObject* _seq;
+    difference_type _index;
+  };
+
+  template <class T>
+  struct PySequence_Cont
+  {
+    typedef PySequence_Ref<T> reference;
+    typedef const PySequence_Ref<T> const_reference;
+    typedef T value_type;
+    typedef T* pointer;
+    typedef int difference_type;
+    typedef int size_type;
+    typedef const pointer const_pointer;
+    typedef PySequence_InputIterator<T, reference> iterator;
+    typedef PySequence_InputIterator<T, const_reference> const_iterator;
+
+    PySequence_Cont(PyObject* seq) : _seq(0)
+    {
+      if (!PySequence_Check(seq)) {
+	throw std::invalid_argument("a sequence is expected");
+      }
+      _seq = seq;
+      Py_INCREF(_seq);
+    }
+
+    ~PySequence_Cont()
+    {
+      if (_seq) Py_DECREF(_seq);
+    }
+
+    size_type size() const
+    {
+      return PySequence_Size(_seq);
+    }
+
+    bool empty() const
+    {
+      return size() == 0;
+    }
+
+    iterator begin()
+    {
+      return iterator(_seq, 0);
+    }
+
+    const_iterator begin() const
+    {
+      return const_iterator(_seq, 0);
+    }
+
+    iterator end()
+    {
+      return iterator(_seq, size());
+    }
+
+    const_iterator end() const
+    {
+      return const_iterator(_seq, size());
+    }
+
+    reference operator[](difference_type n)
+    {
+      return reference(_seq, n);
+    }
+
+    const_reference operator[](difference_type n)  const
+    {
+      return const_reference(_seq, n);
+    }
+
+    bool check(bool set_err = true) const
+    {
+      int s = size();
+      for (int i = 0; i < s; ++i) {
+	swig::PyObject_var item = PySequence_GetItem(_seq, i);
+	if (!swig::check<value_type>(item)) {
+	  if (set_err) {
+	    char msg[1024];
+	    sprintf(msg, "in sequence element %d", i);
+	    SWIG_Error(SWIG_RuntimeError, msg);
+	  }
+	  return false;
+	}
+      }
+      return true;
+    }
+
+  private:
+    PyObject* _seq;
+  };
+
+}
+
+
+#include <limits.h>
+#ifndef LLONG_MIN
+# define LLONG_MIN	LONG_LONG_MIN
+#endif
+#ifndef LLONG_MAX
+# define LLONG_MAX	LONG_LONG_MAX
+#endif
+#ifndef ULLONG_MAX
+# define ULLONG_MAX	ULONG_LONG_MAX
+#endif
+
+
+SWIGINTERN int
+SWIG_AsVal_int (PyObject * obj, int *val)
+{
+  long v;
+  int res = SWIG_AsVal_long (obj, &v);
+  if (SWIG_IsOK(res)) {
+    if ((v < INT_MIN || v > INT_MAX)) {
+      return SWIG_OverflowError;
+    } else {
+      if (val) *val = static_cast< int >(v);
+    }
+  }  
+  return res;
+}
+
+
+SWIGINTERNINLINE PyObject *
+SWIG_From_int  (int value)
+{    
+  return SWIG_From_long  (value);
+}
+
+
+namespace swig {
+  template <> struct traits<int > {
+    typedef value_category category;
+    static const char* type_name() { return"int"; }
+  };  
+  template <>  struct traits_asval<int > {   
+    typedef int value_type;
+    static int asval(PyObject *obj, value_type *val) { 
+      return SWIG_AsVal_int (obj, val);
+    }
+  };
+  template <>  struct traits_from<int > {
+    typedef int value_type;
+    static PyObject *from(const value_type& val) {
+      return SWIG_From_int  (val);
+    }
+  };
+}
+
+
+namespace swig {
+  template <class PySeq, class Seq>
+  inline void
+  assign(const PySeq& pyseq, Seq* seq) {
+#ifdef SWIG_STD_NOASSIGN_STL
+    typedef typename PySeq::value_type value_type;
+    typename PySeq::const_iterator it = pyseq.begin();
+    for (;it != pyseq.end(); ++it) {
+      seq->insert(seq->end(),(value_type)(*it));
+    }
+#else
+    seq->assign(pyseq.begin(), pyseq.end());
+#endif
+  }
+
+  template <class Seq, class T = typename Seq::value_type >
+  struct traits_asptr_stdseq {
+    typedef Seq sequence;
+    typedef T value_type;
+
+    static int asptr(PyObject *obj, sequence **seq) {
+      if (PySequence_Check(obj)) {
+	try {
+	  PySequence_Cont<value_type> pyseq(obj);
+	  if (seq) {
+	    sequence *pseq = new sequence();
+	    assign(pyseq, pseq);
+	    *seq = pseq;
+	    return SWIG_NEWOBJ;
+	  } else {
+	    return pyseq.check() ? SWIG_OK : SWIG_ERROR;
+	  }
+	} catch (std::exception& e) {
+	  if (seq) {
+	    if (!PyErr_Occurred()) {
+	      PyErr_SetString(PyExc_TypeError, e.what());
+	    }
+	  }
+	  return SWIG_ERROR;
+	}
+      } else {
+	sequence *p;
+	if (SWIG_ConvertPtr(obj,(void**)&p,
+			    swig::type_info<sequence>(),0) == SWIG_OK) {
+	  if (seq) *seq = p;
+	  return SWIG_OLDOBJ;
+	}
+      }
+      return SWIG_ERROR;
+    }
+  };
+
+  template <class Seq, class T = typename Seq::value_type >
+  struct traits_from_stdseq {
+    typedef Seq sequence;
+    typedef T value_type;
+    typedef typename Seq::size_type size_type;
+    typedef typename sequence::const_iterator const_iterator;
+
+    static PyObject *from(const sequence& seq) {
+
+
+
+
+
+
+      size_type size = seq.size();
+      if (size <= (size_type)INT_MAX) {
+	PyObject *obj = PyTuple_New((int)size);
+	int i = 0;
+	for (const_iterator it = seq.begin();
+	     it != seq.end(); ++it, ++i) {
+	  PyTuple_SetItem(obj,i,swig::from<value_type>(*it));
+	}
+	return obj;
+      } else {
+	PyErr_SetString(PyExc_OverflowError,"sequence size not valid in python");
+	return NULL;
+      }
+    }
+  };
+}
+
+
+  namespace swig {
+    template <class T>
+    struct traits_asptr<std::vector<T> >  {
+      static int asptr(PyObject *obj, std::vector<T> **vec) {
+	return traits_asptr_stdseq<std::vector<T> >::asptr(obj, vec);
+      }
+    };
+    
+    template <class T>
+    struct traits_from<std::vector<T> > {
+      static PyObject *from(const std::vector<T>& vec) {
+	return traits_from_stdseq<std::vector<T> >::from(vec);
+      }
+    };
+  }
+
+
+      namespace swig {
+	template <>  struct traits<std::vector<int, std::allocator<int > > > {
+	  typedef pointer_category category;
+	  static const char* type_name() {
+	    return "std::vector<" "int" "," "std::allocator<int >" " >";
+	  }
+	};
+      }
+    
+SWIGINTERN swig::PySwigIterator *std_vector_Sl_int_Sg__iterator(std::vector<int > *self,PyObject **PYTHON_SELF){
+      return swig::make_output_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
+    }
+SWIGINTERN bool std_vector_Sl_int_Sg____nonzero__(std::vector<int > const *self){
+      return !(self->empty());
+    }
+SWIGINTERN std::vector<int >::size_type std_vector_Sl_int_Sg____len__(std::vector<int > const *self){
+      return self->size();
+    }
+
+SWIGINTERNINLINE PyObject* 
+SWIG_From_unsigned_SS_long  (unsigned long value)
+{
+  return (value > LONG_MAX) ?
+    PyLong_FromUnsignedLong(value) : PyInt_FromLong(static_cast< long >(value)); 
+}
+
+
+SWIGINTERNINLINE PyObject *
+SWIG_From_size_t  (size_t value)
+{    
+  return SWIG_From_unsigned_SS_long  (static_cast< unsigned long >(value));
+}
+
+SWIGINTERN std::vector<int >::value_type std_vector_Sl_int_Sg__pop(std::vector<int > *self){
+      if (self->size() == 0)
+	throw std::out_of_range("pop from empty container");
+      std::vector<int,std::allocator<int > >::value_type x = self->back();
+      self->pop_back();
+      return x;
+    }
+SWIGINTERN std::vector<int,std::allocator<int > > *std_vector_Sl_int_Sg____getslice__(std::vector<int > *self,std::vector<int >::difference_type i,std::vector<int >::difference_type j){
+      return swig::getslice(self, i, j);
+    }
+SWIGINTERN void std_vector_Sl_int_Sg____setslice__(std::vector<int > *self,std::vector<int >::difference_type i,std::vector<int >::difference_type j,std::vector<int,std::allocator<int > > const &v){
+      swig::setslice(self, i, j, v);
+    }
+SWIGINTERN void std_vector_Sl_int_Sg____delslice__(std::vector<int > *self,std::vector<int >::difference_type i,std::vector<int >::difference_type j){
+      swig::delslice(self, i, j);
+    }
+SWIGINTERN void std_vector_Sl_int_Sg____delitem__(std::vector<int > *self,std::vector<int >::difference_type i){
+      self->erase(swig::getpos(self,i));
+    }
+SWIGINTERN std::vector<int >::value_type const &std_vector_Sl_int_Sg____getitem__(std::vector<int > const *self,std::vector<int >::difference_type i){
+      return *(swig::cgetpos(self, i));
+    }
+SWIGINTERN void std_vector_Sl_int_Sg____setitem__(std::vector<int > *self,std::vector<int >::difference_type i,std::vector<int >::value_type const &x){
+      *(swig::getpos(self,i)) = x;
+    }
+SWIGINTERN void std_vector_Sl_int_Sg__append(std::vector<int > *self,std::vector<int >::value_type const &x){
+      self->push_back(x);
+    }
+
+SWIGINTERN int
+SWIG_AsVal_unsigned_SS_int (PyObject * obj, unsigned int *val)
+{
+  unsigned long v;
+  int res = SWIG_AsVal_unsigned_SS_long (obj, &v);
+  if (SWIG_IsOK(res)) {
+    if ((v > UINT_MAX)) {
+      return SWIG_OverflowError;
+    } else {
+      if (val) *val = static_cast< unsigned int >(v);
+    }
+  }  
+  return res;
+}
+
+
+SWIGINTERNINLINE PyObject *
+SWIG_From_unsigned_SS_int  (unsigned int value)
+{    
+  return SWIG_From_unsigned_SS_long  (value);
+}
+
+
+  #define SWIG_From_double   PyFloat_FromDouble 
+
+
+SWIGINTERNINLINE PyObject *
+SWIG_From_float  (float value)
+{    
+  return SWIG_From_double  (value);
+}
+
+
+SWIGINTERN int
+SWIG_AsVal_float (PyObject * obj, float *val)
+{
+  double v;
+  int res = SWIG_AsVal_double (obj, &v);
+  if (SWIG_IsOK(res)) {
+    if ((v < -FLT_MAX || v > FLT_MAX)) {
+      return SWIG_OverflowError;
+    } else {
+      if (val) *val = static_cast< float >(v);
+    }
+  }  
+  return res;
+}
+
+
+SWIGINTERNINLINE PyObject *
+SWIG_From_unsigned_SS_short  (unsigned short value)
+{    
+  return SWIG_From_unsigned_SS_long  (value);
+}
+
+
+SWIGINTERN swig_type_info*
+SWIG_pchar_descriptor(void)
+{
+  static int init = 0;
+  static swig_type_info* info = 0;
+  if (!init) {
+    info = SWIG_TypeQuery("_p_char");
+    init = 1;
+  }
+  return info;
+}
+
+
+SWIGINTERNINLINE PyObject *
+SWIG_FromCharPtrAndSize(const char* carray, size_t size)
+{
+  if (carray) {
+    if (size > INT_MAX) {
+      swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
+      return pchar_descriptor ? 
+	SWIG_NewPointerObj(const_cast< char * >(carray), pchar_descriptor, 0) : SWIG_Py_Void();
+    } else {
+      return PyString_FromStringAndSize(carray, static_cast< int >(size));
+    }
+  } else {
+    return SWIG_Py_Void();
+  }
+}
+
+
+SWIGINTERNINLINE PyObject *
+SWIG_From_std_string  (const std::string& s)
+{
+  if (s.size()) {
+    return SWIG_FromCharPtrAndSize(s.data(), s.size());
+  } else {
+    return SWIG_FromCharPtrAndSize(s.c_str(), 0);
+  }
+}
+
+
+SWIGINTERN int
+SWIG_AsVal_unsigned_SS_short (PyObject * obj, unsigned short *val)
+{
+  unsigned long v;
+  int res = SWIG_AsVal_unsigned_SS_long (obj, &v);
+  if (SWIG_IsOK(res)) {
+    if ((v > USHRT_MAX)) {
+      return SWIG_OverflowError;
+    } else {
+      if (val) *val = static_cast< unsigned short >(v);
+    }
+  }  
+  return res;
+}
+
+
+SWIGINTERN int
+SWIG_AsVal_bool (PyObject *obj, bool *val)
+{
+  if (obj == Py_True) {
+    if (val) *val = true;
+    return SWIG_OK;
+  } else if (obj == Py_False) {
+    if (val) *val = false;
+    return SWIG_OK;
+  } else {
+    long v = 0;
+    int res = SWIG_AddCast(SWIG_AsVal_long (obj, val ? &v : 0));
+    if (SWIG_IsOK(res) && val) *val = v ? true : false;
+    return res;
+  }
+}
+
+
+  namespace swig {
+    template <>  struct traits<ViewShape > {
+      typedef pointer_category category;
+      static const char* type_name() { return"ViewShape"; }
+    };
+  }
+
+
+      namespace swig {
+	template <>  struct traits<std::vector<ViewShape*, std::allocator<ViewShape * > > > {
+	  typedef value_category category;
+	  static const char* type_name() {
+	    return "std::vector<" "ViewShape" " *," "std::allocator<ViewShape * >" " >";
+	  }
+	};
+      }
+    
+SWIGINTERN swig::PySwigIterator *std_vector_Sl_ViewShape_Sm__Sg__iterator(std::vector<ViewShape * > *self,PyObject **PYTHON_SELF){
+      return swig::make_output_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
+    }
+SWIGINTERN bool std_vector_Sl_ViewShape_Sm__Sg____nonzero__(std::vector<ViewShape * > const *self){
+      return !(self->empty());
+    }
+SWIGINTERN std::vector<ViewShape * >::size_type std_vector_Sl_ViewShape_Sm__Sg____len__(std::vector<ViewShape * > const *self){
+      return self->size();
+    }
+SWIGINTERN std::vector<ViewShape * >::value_type std_vector_Sl_ViewShape_Sm__Sg__pop(std::vector<ViewShape * > *self){
+      if (self->size() == 0)
+	throw std::out_of_range("pop from empty container");
+      std::vector<ViewShape*,std::allocator<ViewShape * > >::value_type x = self->back();
+      self->pop_back();
+      return x;
+    }
+SWIGINTERN std::vector<ViewShape *,std::allocator<ViewShape * > > *std_vector_Sl_ViewShape_Sm__Sg____getslice__(std::vector<ViewShape * > *self,std::vector<ViewShape * >::difference_type i,std::vector<ViewShape * >::difference_type j){
+      return swig::getslice(self, i, j);
+    }
+SWIGINTERN void std_vector_Sl_ViewShape_Sm__Sg____setslice__(std::vector<ViewShape * > *self,std::vector<ViewShape * >::difference_type i,std::vector<ViewShape * >::difference_type j,std::vector<ViewShape *,std::allocator<ViewShape * > > const &v){
+      swig::setslice(self, i, j, v);
+    }
+SWIGINTERN void std_vector_Sl_ViewShape_Sm__Sg____delslice__(std::vector<ViewShape * > *self,std::vector<ViewShape * >::difference_type i,std::vector<ViewShape * >::difference_type j){
+      swig::delslice(self, i, j);
+    }
+SWIGINTERN void std_vector_Sl_ViewShape_Sm__Sg____delitem__(std::vector<ViewShape * > *self,std::vector<ViewShape * >::difference_type i){
+      self->erase(swig::getpos(self,i));
+    }
+SWIGINTERN std::vector<ViewShape * >::value_type std_vector_Sl_ViewShape_Sm__Sg____getitem__(std::vector<ViewShape * > *self,std::vector<ViewShape * >::difference_type i){
+      return *(swig::cgetpos(self, i));
+    }
+SWIGINTERN void std_vector_Sl_ViewShape_Sm__Sg____setitem__(std::vector<ViewShape * > *self,std::vector<ViewShape * >::difference_type i,std::vector<ViewShape * >::value_type x){
+      *(swig::getpos(self,i)) = x;
+    }
+SWIGINTERN void std_vector_Sl_ViewShape_Sm__Sg__append(std::vector<ViewShape * > *self,std::vector<ViewShape * >::value_type x){
+      self->push_back(x);
+    }
+
+  namespace swig {
+    template <>  struct traits<ViewEdge > {
+      typedef pointer_category category;
+      static const char* type_name() { return"ViewEdge"; }
+    };
+  }
+
+
+      namespace swig {
+	template <>  struct traits<std::vector<ViewEdge*, std::allocator<ViewEdge * > > > {
+	  typedef value_category category;
+	  static const char* type_name() {
+	    return "std::vector<" "ViewEdge" " *," "std::allocator<ViewEdge * >" " >";
+	  }
+	};
+      }
+    
+SWIGINTERN swig::PySwigIterator *std_vector_Sl_ViewEdge_Sm__Sg__iterator(std::vector<ViewEdge * > *self,PyObject **PYTHON_SELF){
+      return swig::make_output_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
+    }
+SWIGINTERN bool std_vector_Sl_ViewEdge_Sm__Sg____nonzero__(std::vector<ViewEdge * > const *self){
+      return !(self->empty());
+    }
+SWIGINTERN std::vector<ViewEdge * >::size_type std_vector_Sl_ViewEdge_Sm__Sg____len__(std::vector<ViewEdge * > const *self){
+      return self->size();
+    }
+SWIGINTERN std::vector<ViewEdge * >::value_type std_vector_Sl_ViewEdge_Sm__Sg__pop(std::vector<ViewEdge * > *self){
+      if (self->size() == 0)
+	throw std::out_of_range("pop from empty container");
+      std::vector<ViewEdge*,std::allocator<ViewEdge * > >::value_type x = self->back();
+      self->pop_back();
+      return x;
+    }
+SWIGINTERN std::vector<ViewEdge *,std::allocator<ViewEdge * > > *std_vector_Sl_ViewEdge_Sm__Sg____getslice__(std::vector<ViewEdge * > *self,std::vector<ViewEdge * >::difference_type i,std::vector<ViewEdge * >::difference_type j){
+      return swig::getslice(self, i, j);
+    }
+SWIGINTERN void std_vector_Sl_ViewEdge_Sm__Sg____setslice__(std::vector<ViewEdge * > *self,std::vector<ViewEdge * >::difference_type i,std::vector<ViewEdge * >::difference_type j,std::vector<ViewEdge *,std::allocator<ViewEdge * > > const &v){
+      swig::setslice(self, i, j, v);
+    }
+SWIGINTERN void std_vector_Sl_ViewEdge_Sm__Sg____delslice__(std::vector<ViewEdge * > *self,std::vector<ViewEdge * >::difference_type i,std::vector<ViewEdge * >::difference_type j){
+      swig::delslice(self, i, j);
+    }
+SWIGINTERN void std_vector_Sl_ViewEdge_Sm__Sg____delitem__(std::vector<ViewEdge * > *self,std::vector<ViewEdge * >::difference_type i){
+      self->erase(swig::getpos(self,i));
+    }
+SWIGINTERN std::vector<ViewEdge * >::value_type std_vector_Sl_ViewEdge_Sm__Sg____getitem__(std::vector<ViewEdge * > *self,std::vector<ViewEdge * >::difference_type i){
+      return *(swig::cgetpos(self, i));
+    }
+SWIGINTERN void std_vector_Sl_ViewEdge_Sm__Sg____setitem__(std::vector<ViewEdge * > *self,std::vector<ViewEdge * >::difference_type i,std::vector<ViewEdge * >::value_type x){
+      *(swig::getpos(self,i)) = x;
+    }
+SWIGINTERN void std_vector_Sl_ViewEdge_Sm__Sg__append(std::vector<ViewEdge * > *self,std::vector<ViewEdge * >::value_type x){
+      self->push_back(x);
+    }
+
+  namespace swig {
+    template <>  struct traits<FEdge > {
+      typedef pointer_category category;
+      static const char* type_name() { return"FEdge"; }
+    };
+  }
+
+
+      namespace swig {
+	template <>  struct traits<std::vector<FEdge*, std::allocator<FEdge * > > > {
+	  typedef value_category category;
+	  static const char* type_name() {
+	    return "std::vector<" "FEdge" " *," "std::allocator<FEdge * >" " >";
+	  }
+	};
+      }
+    
+SWIGINTERN swig::PySwigIterator *std_vector_Sl_FEdge_Sm__Sg__iterator(std::vector<FEdge * > *self,PyObject **PYTHON_SELF){
+      return swig::make_output_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
+    }
+SWIGINTERN bool std_vector_Sl_FEdge_Sm__Sg____nonzero__(std::vector<FEdge * > const *self){
+      return !(self->empty());
+    }
+SWIGINTERN std::vector<FEdge * >::size_type std_vector_Sl_FEdge_Sm__Sg____len__(std::vector<FEdge * > const *self){
+      return self->size();
+    }
+SWIGINTERN std::vector<FEdge * >::value_type std_vector_Sl_FEdge_Sm__Sg__pop(std::vector<FEdge * > *self){
+      if (self->size() == 0)
+	throw std::out_of_range("pop from empty container");
+      std::vector<FEdge*,std::allocator<FEdge * > >::value_type x = self->back();
+      self->pop_back();
+      return x;
+    }
+SWIGINTERN std::vector<FEdge *,std::allocator<FEdge * > > *std_vector_Sl_FEdge_Sm__Sg____getslice__(std::vector<FEdge * > *self,std::vector<FEdge * >::difference_type i,std::vector<FEdge * >::difference_type j){
+      return swig::getslice(self, i, j);
+    }
+SWIGINTERN void std_vector_Sl_FEdge_Sm__Sg____setslice__(std::vector<FEdge * > *self,std::vector<FEdge * >::difference_type i,std::vector<FEdge * >::difference_type j,std::vector<FEdge *,std::allocator<FEdge * > > const &v){
+      swig::setslice(self, i, j, v);
+    }
+SWIGINTERN void std_vector_Sl_FEdge_Sm__Sg____delslice__(std::vector<FEdge * > *self,std::vector<FEdge * >::difference_type i,std::vector<FEdge * >::difference_type j){
+      swig::delslice(self, i, j);
+    }
+SWIGINTERN void std_vector_Sl_FEdge_Sm__Sg____delitem__(std::vector<FEdge * > *self,std::vector<FEdge * >::difference_type i){
+      self->erase(swig::getpos(self,i));
+    }
+SWIGINTERN std::vector<FEdge * >::value_type std_vector_Sl_FEdge_Sm__Sg____getitem__(std::vector<FEdge * > *self,std::vector<FEdge * >::difference_type i){
+      return *(swig::cgetpos(self, i));
+    }
+SWIGINTERN void std_vector_Sl_FEdge_Sm__Sg____setitem__(std::vector<FEdge * > *self,std::vector<FEdge * >::difference_type i,std::vector<FEdge * >::value_type x){
+      *(swig::getpos(self,i)) = x;
+    }
+SWIGINTERN void std_vector_Sl_FEdge_Sm__Sg__append(std::vector<FEdge * > *self,std::vector<FEdge * >::value_type x){
+      self->push_back(x);
+    }
+
+  namespace swig {
+    template <>  struct traits<ViewVertex > {
+      typedef pointer_category category;
+      static const char* type_name() { return"ViewVertex"; }
+    };
+  }
+
+
+      namespace swig {
+	template <>  struct traits<std::vector<ViewVertex*, std::allocator<ViewVertex * > > > {
+	  typedef value_category category;
+	  static const char* type_name() {
+	    return "std::vector<" "ViewVertex" " *," "std::allocator<ViewVertex * >" " >";
+	  }
+	};
+      }
+    
+SWIGINTERN swig::PySwigIterator *std_vector_Sl_ViewVertex_Sm__Sg__iterator(std::vector<ViewVertex * > *self,PyObject **PYTHON_SELF){
+      return swig::make_output_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
+    }
+SWIGINTERN bool std_vector_Sl_ViewVertex_Sm__Sg____nonzero__(std::vector<ViewVertex * > const *self){
+      return !(self->empty());
+    }
+SWIGINTERN std::vector<ViewVertex * >::size_type std_vector_Sl_ViewVertex_Sm__Sg____len__(std::vector<ViewVertex * > const *self){
+      return self->size();
+    }
+SWIGINTERN std::vector<ViewVertex * >::value_type std_vector_Sl_ViewVertex_Sm__Sg__pop(std::vector<ViewVertex * > *self){
+      if (self->size() == 0)
+	throw std::out_of_range("pop from empty container");
+      std::vector<ViewVertex*,std::allocator<ViewVertex * > >::value_type x = self->back();
+      self->pop_back();
+      return x;
+    }
+SWIGINTERN std::vector<ViewVertex *,std::allocator<ViewVertex * > > *std_vector_Sl_ViewVertex_Sm__Sg____getslice__(std::vector<ViewVertex * > *self,std::vector<ViewVertex * >::difference_type i,std::vector<ViewVertex * >::difference_type j){
+      return swig::getslice(self, i, j);
+    }
+SWIGINTERN void std_vector_Sl_ViewVertex_Sm__Sg____setslice__(std::vector<ViewVertex * > *self,std::vector<ViewVertex * >::difference_type i,std::vector<ViewVertex * >::difference_type j,std::vector<ViewVertex *,std::allocator<ViewVertex * > > const &v){
+      swig::setslice(self, i, j, v);
+    }
+SWIGINTERN void std_vector_Sl_ViewVertex_Sm__Sg____delslice__(std::vector<ViewVertex * > *self,std::vector<ViewVertex * >::difference_type i,std::vector<ViewVertex * >::difference_type j){
+      swig::delslice(self, i, j);
+    }
+SWIGINTERN void std_vector_Sl_ViewVertex_Sm__Sg____delitem__(std::vector<ViewVertex * > *self,std::vector<ViewVertex * >::difference_type i){
+      self->erase(swig::getpos(self,i));
+    }
+SWIGINTERN std::vector<ViewVertex * >::value_type std_vector_Sl_ViewVertex_Sm__Sg____getitem__(std::vector<ViewVertex * > *self,std::vector<ViewVertex * >::difference_type i){
+      return *(swig::cgetpos(self, i));
+    }
+SWIGINTERN void std_vector_Sl_ViewVertex_Sm__Sg____setitem__(std::vector<ViewVertex * > *self,std::vector<ViewVertex * >::difference_type i,std::vector<ViewVertex * >::value_type x){
+      *(swig::getpos(self,i)) = x;
+    }
+SWIGINTERN void std_vector_Sl_ViewVertex_Sm__Sg__append(std::vector<ViewVertex * > *self,std::vector<ViewVertex * >::value_type x){
+      self->push_back(x);
+    }
+
+  namespace swig {
+    template <>  struct traits<SVertex > {
+      typedef pointer_category category;
+      static const char* type_name() { return"SVertex"; }
+    };
+  }
+
+
+      namespace swig {
+	template <>  struct traits<std::vector<SVertex*, std::allocator<SVertex * > > > {
+	  typedef value_category category;
+	  static const char* type_name() {
+	    return "std::vector<" "SVertex" " *," "std::allocator<SVertex * >" " >";
+	  }
+	};
+      }
+    
+SWIGINTERN swig::PySwigIterator *std_vector_Sl_SVertex_Sm__Sg__iterator(std::vector<SVertex * > *self,PyObject **PYTHON_SELF){
+      return swig::make_output_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
+    }
+SWIGINTERN bool std_vector_Sl_SVertex_Sm__Sg____nonzero__(std::vector<SVertex * > const *self){
+      return !(self->empty());
+    }
+SWIGINTERN std::vector<SVertex * >::size_type std_vector_Sl_SVertex_Sm__Sg____len__(std::vector<SVertex * > const *self){
+      return self->size();
+    }
+SWIGINTERN std::vector<SVertex * >::value_type std_vector_Sl_SVertex_Sm__Sg__pop(std::vector<SVertex * > *self){
+      if (self->size() == 0)
+	throw std::out_of_range("pop from empty container");
+      std::vector<SVertex*,std::allocator<SVertex * > >::value_type x = self->back();
+      self->pop_back();
+      return x;
+    }
+SWIGINTERN std::vector<SVertex *,std::allocator<SVertex * > > *std_vector_Sl_SVertex_Sm__Sg____getslice__(std::vector<SVertex * > *self,std::vector<SVertex * >::difference_type i,std::vector<SVertex * >::difference_type j){
+      return swig::getslice(self, i, j);
+    }
+SWIGINTERN void std_vector_Sl_SVertex_Sm__Sg____setslice__(std::vector<SVertex * > *self,std::vector<SVertex * >::difference_type i,std::vector<SVertex * >::difference_type j,std::vector<SVertex *,std::allocator<SVertex * > > const &v){
+      swig::setslice(self, i, j, v);
+    }
+SWIGINTERN void std_vector_Sl_SVertex_Sm__Sg____delslice__(std::vector<SVertex * > *self,std::vector<SVertex * >::difference_type i,std::vector<SVertex * >::difference_type j){
+      swig::delslice(self, i, j);
+    }
+SWIGINTERN void std_vector_Sl_SVertex_Sm__Sg____delitem__(std::vector<SVertex * > *self,std::vector<SVertex * >::difference_type i){
+      self->erase(swig::getpos(self,i));
+    }
+SWIGINTERN std::vector<SVertex * >::value_type std_vector_Sl_SVertex_Sm__Sg____getitem__(std::vector<SVertex * > *self,std::vector<SVertex * >::difference_type i){
+      return *(swig::cgetpos(self, i));
+    }
+SWIGINTERN void std_vector_Sl_SVertex_Sm__Sg____setitem__(std::vector<SVertex * > *self,std::vector<SVertex * >::difference_type i,std::vector<SVertex * >::value_type x){
+      *(swig::getpos(self,i)) = x;
+    }
+SWIGINTERN void std_vector_Sl_SVertex_Sm__Sg__append(std::vector<SVertex * > *self,std::vector<SVertex * >::value_type x){
+      self->push_back(x);
+    }
+
+SWIGINTERN int
+SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
+{
+  if (PyString_Check(obj)) {
+    char *cstr; Py_ssize_t len;
+    PyString_AsStringAndSize(obj, &cstr, &len);
+    if (cptr)  {
+      if (alloc) {
+	/* 
+	   In python the user should not be able to modify the inner
+	   string representation. To warranty that, if you define
+	   SWIG_PYTHON_SAFE_CSTRINGS, a new/copy of the python string
+	   buffer is always returned.
+
+	   The default behavior is just to return the pointer value,
+	   so, be careful.
+	*/ 
+#if defined(SWIG_PYTHON_SAFE_CSTRINGS)
+	if (*alloc != SWIG_OLDOBJ) 
+#else
+	if (*alloc == SWIG_NEWOBJ) 
+#endif
+	  {
+	    *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, sizeof(char)*(len + 1)));
+	    *alloc = SWIG_NEWOBJ;
+	  }
+	else {
+	  *cptr = cstr;
+	  *alloc = SWIG_OLDOBJ;
+	}
+      } else {
+	*cptr = PyString_AsString(obj);
+      }
+    }
+    if (psize) *psize = len + 1;
+    return SWIG_OK;
+  } else {
+    swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
+    if (pchar_descriptor) {
+      void* vptr = 0;
+      if (SWIG_ConvertPtr(obj, &vptr, pchar_descriptor, 0) == SWIG_OK) {
+	if (cptr) *cptr = (char *) vptr;
+	if (psize) *psize = vptr ? (strlen((char *)vptr) + 1) : 0;
+	if (alloc) *alloc = SWIG_OLDOBJ;
+	return SWIG_OK;
+      }
+    }
+  }
+  return SWIG_TypeError;
+}
+
+
+SWIGINTERN int
+SWIG_AsPtr_std_string (PyObject * obj, std::string **val) 
+{
+  char* buf = 0 ; size_t size = 0; int alloc = SWIG_OLDOBJ;
+  if (SWIG_IsOK((SWIG_AsCharPtrAndSize(obj, &buf, &size, &alloc)))) {
+    if (buf) {
+      if (val) *val = new std::string(buf, size - 1);
+      if (alloc == SWIG_NEWOBJ) delete[] buf;
+      return SWIG_NEWOBJ;
+    } else {
+      if (val) *val = 0;
+      return SWIG_OLDOBJ;
+    }
+  } else {
+    static int init = 0;
+    static swig_type_info* descriptor = 0;
+    if (!init) {
+      descriptor = SWIG_TypeQuery("std::string" " *");
+      init = 1;
+    }
+    if (descriptor) {
+      std::string *vptr;
+      int res = SWIG_ConvertPtr(obj, (void**)&vptr, descriptor, 0);
+      if (SWIG_IsOK(res) && val) *val = vptr;
+      return res;
+    }
+  }
+  return SWIG_ERROR;
+}
+
+
+
+
+
+  namespace swig {
+    template <>  struct traits<StrokeShader > {
+      typedef pointer_category category;
+      static const char* type_name() { return"StrokeShader"; }
+    };
+  }
+
+
+      namespace swig {
+	template <>  struct traits<std::vector<StrokeShader*, std::allocator<StrokeShader * > > > {
+	  typedef value_category category;
+	  static const char* type_name() {
+	    return "std::vector<" "StrokeShader" " *," "std::allocator<StrokeShader * >" " >";
+	  }
+	};
+      }
+    
+SWIGINTERN swig::PySwigIterator *std_vector_Sl_StrokeShader_Sm__Sg__iterator(std::vector<StrokeShader * > *self,PyObject **PYTHON_SELF){
+      return swig::make_output_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
+    }
+SWIGINTERN bool std_vector_Sl_StrokeShader_Sm__Sg____nonzero__(std::vector<StrokeShader * > const *self){
+      return !(self->empty());
+    }
+SWIGINTERN std::vector<StrokeShader * >::size_type std_vector_Sl_StrokeShader_Sm__Sg____len__(std::vector<StrokeShader * > const *self){
+      return self->size();
+    }
+SWIGINTERN std::vector<StrokeShader * >::value_type std_vector_Sl_StrokeShader_Sm__Sg__pop(std::vector<StrokeShader * > *self){
+      if (self->size() == 0)
+	throw std::out_of_range("pop from empty container");
+      std::vector<StrokeShader*,std::allocator<StrokeShader * > >::value_type x = self->back();
+      self->pop_back();
+      return x;
+    }
+SWIGINTERN std::vector<StrokeShader *,std::allocator<StrokeShader * > > *std_vector_Sl_StrokeShader_Sm__Sg____getslice__(std::vector<StrokeShader * > *self,std::vector<StrokeShader * >::difference_type i,std::vector<StrokeShader * >::difference_type j){
+      return swig::getslice(self, i, j);
+    }
+SWIGINTERN void std_vector_Sl_StrokeShader_Sm__Sg____setslice__(std::vector<StrokeShader * > *self,std::vector<StrokeShader * >::difference_type i,std::vector<StrokeShader * >::difference_type j,std::vector<StrokeShader *,std::allocator<StrokeShader * > > const &v){
+      swig::setslice(self, i, j, v);
+    }
+SWIGINTERN void std_vector_Sl_StrokeShader_Sm__Sg____delslice__(std::vector<StrokeShader * > *self,std::vector<StrokeShader * >::difference_type i,std::vector<StrokeShader * >::difference_type j){
+      swig::delslice(self, i, j);
+    }
+SWIGINTERN void std_vector_Sl_StrokeShader_Sm__Sg____delitem__(std::vector<StrokeShader * > *self,std::vector<StrokeShader * >::difference_type i){
+      self->erase(swig::getpos(self,i));
+    }
+SWIGINTERN std::vector<StrokeShader * >::value_type std_vector_Sl_StrokeShader_Sm__Sg____getitem__(std::vector<StrokeShader * > *self,std::vector<StrokeShader * >::difference_type i){
+      return *(swig::cgetpos(self, i));
+    }
+SWIGINTERN void std_vector_Sl_StrokeShader_Sm__Sg____setitem__(std::vector<StrokeShader * > *self,std::vector<StrokeShader * >::difference_type i,std::vector<StrokeShader * >::value_type x){
+      *(swig::getpos(self,i)) = x;
+    }
+SWIGINTERN void std_vector_Sl_StrokeShader_Sm__Sg__append(std::vector<StrokeShader * > *self,std::vector<StrokeShader * >::value_type x){
+      self->push_back(x);
+    }
+
+
+/* ---------------------------------------------------
+ * C++ director class methods
+ * --------------------------------------------------- */
+
+#include "ModuleWrapper.h"
+
+SwigDirector_ViewEdgeViewEdgeIterator::SwigDirector_ViewEdgeViewEdgeIterator(PyObject *self, ViewEdge *begin, bool orientation): ViewEdgeInternal::ViewEdgeIterator(begin, orientation), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((ViewEdgeInternal::ViewEdgeIterator *)this, this); 
+}
+
+
+
+
+SwigDirector_ViewEdgeViewEdgeIterator::SwigDirector_ViewEdgeViewEdgeIterator(PyObject *self, ViewEdgeInternal::ViewEdgeIterator const &it): ViewEdgeInternal::ViewEdgeIterator(it), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((ViewEdgeInternal::ViewEdgeIterator *)this, this); 
+}
+
+
+
+
+SwigDirector_ViewEdgeViewEdgeIterator::~SwigDirector_ViewEdgeViewEdgeIterator() {
+}
+
+std::string SwigDirector_ViewEdgeViewEdgeIterator::getExactTypeName() const {
+  std::string c_result;
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ViewEdgeViewEdgeIterator.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 0;
+  const char * const swig_method_name = "getExactTypeName";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "getExactTypeName", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'ViewEdgeViewEdgeIterator.getExactTypeName'");
+    }
+  }
+  std::string *swig_optr = 0;
+  int swig_ores = SWIG_AsPtr_std_string(result, &swig_optr);
+  if (!SWIG_IsOK(swig_ores) || !swig_optr) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError((swig_optr ? swig_ores : SWIG_TypeError))), "in output value of type '""std::string""'");
+  }
+  c_result = *swig_optr;
+  if (SWIG_IsNewObj(swig_ores)) delete swig_optr;
+  return (std::string) c_result;
+}
+
+
+ViewEdge *SwigDirector_ViewEdgeViewEdgeIterator::operator *() {
+  void *swig_argp ;
+  int swig_res ;
+  swig_owntype own ;
+  
+  ViewEdge *c_result;
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ViewEdgeViewEdgeIterator.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 1;
+  const char * const swig_method_name = "getObject";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "getObject", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'ViewEdgeViewEdgeIterator.getObject'");
+    }
+  }
+  swig_res = SWIG_ConvertPtrAndOwn(result, &swig_argp, SWIGTYPE_p_ViewEdge,  0  | SWIG_POINTER_DISOWN, &own);
+  if (!SWIG_IsOK(swig_res)) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""ViewEdge *""'");
+  }
+  c_result = reinterpret_cast< ViewEdge * >(swig_argp);
+  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own);
+  return (ViewEdge *) c_result;
+}
+
+
+ViewEdge *SwigDirector_ViewEdgeViewEdgeIterator::operator ->() {
+  void *swig_argp ;
+  int swig_res ;
+  swig_owntype own ;
+  
+  ViewEdge *c_result;
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ViewEdgeViewEdgeIterator.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 2;
+  const char * const swig_method_name = "__deref__";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "__deref__", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'ViewEdgeViewEdgeIterator.__deref__'");
+    }
+  }
+  swig_res = SWIG_ConvertPtrAndOwn(result, &swig_argp, SWIGTYPE_p_ViewEdge,  0  | SWIG_POINTER_DISOWN, &own);
+  if (!SWIG_IsOK(swig_res)) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""ViewEdge *""'");
+  }
+  c_result = reinterpret_cast< ViewEdge * >(swig_argp);
+  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own);
+  return (ViewEdge *) c_result;
+}
+
+
+ViewEdgeInternal::ViewEdgeIterator &SwigDirector_ViewEdgeViewEdgeIterator::operator ++() {
+  return ViewEdgeInternal::ViewEdgeIterator::operator ++();
+}
+
+
+ViewEdgeInternal::ViewEdgeIterator SwigDirector_ViewEdgeViewEdgeIterator::operator ++(int arg0) {
+  return ViewEdgeInternal::ViewEdgeIterator::operator ++(arg0);
+}
+
+
+void SwigDirector_ViewEdgeViewEdgeIterator::increment() {
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ViewEdgeViewEdgeIterator.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 3;
+  const char * const swig_method_name = "increment";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "increment", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'ViewEdgeViewEdgeIterator.increment'");
+    }
+  }
+}
+
+
+ViewEdgeInternal::ViewEdgeIterator &SwigDirector_ViewEdgeViewEdgeIterator::operator --() {
+  return ViewEdgeInternal::ViewEdgeIterator::operator --();
+}
+
+
+ViewEdgeInternal::ViewEdgeIterator SwigDirector_ViewEdgeViewEdgeIterator::operator --(int arg0) {
+  return ViewEdgeInternal::ViewEdgeIterator::operator --(arg0);
+}
+
+
+void SwigDirector_ViewEdgeViewEdgeIterator::decrement() {
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ViewEdgeViewEdgeIterator.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 4;
+  const char * const swig_method_name = "decrement";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "decrement", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'ViewEdgeViewEdgeIterator.decrement'");
+    }
+  }
+}
+
+
+bool SwigDirector_ViewEdgeViewEdgeIterator::isBegin() const {
+  bool c_result;
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ViewEdgeViewEdgeIterator.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 5;
+  const char * const swig_method_name = "isBegin";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "isBegin", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'ViewEdgeViewEdgeIterator.isBegin'");
+    }
+  }
+  bool swig_val;
+  int swig_res = SWIG_AsVal_bool(result, &swig_val);
+  if (!SWIG_IsOK(swig_res)) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""bool""'");
+  }
+  c_result = static_cast< bool >(swig_val);
+  return (bool) c_result;
+}
+
+
+bool SwigDirector_ViewEdgeViewEdgeIterator::isEnd() const {
+  bool c_result;
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ViewEdgeViewEdgeIterator.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 6;
+  const char * const swig_method_name = "isEnd";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "isEnd", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'ViewEdgeViewEdgeIterator.isEnd'");
+    }
+  }
+  bool swig_val;
+  int swig_res = SWIG_AsVal_bool(result, &swig_val);
+  if (!SWIG_IsOK(swig_res)) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""bool""'");
+  }
+  c_result = static_cast< bool >(swig_val);
+  return (bool) c_result;
+}
+
+
+bool SwigDirector_ViewEdgeViewEdgeIterator::operator ==(ViewEdgeInternal::ViewEdgeIterator &it) const {
+  bool c_result;
+  swig::PyObject_var obj0;
+  obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&it), SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator,  0 );
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ViewEdgeViewEdgeIterator.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 7;
+  const char * const swig_method_name = "__eq__";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *)"__eq__", (char *)"(O)" ,(PyObject *)obj0);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'ViewEdgeViewEdgeIterator.__eq__'");
+    }
+  }
+  bool swig_val;
+  int swig_res = SWIG_AsVal_bool(result, &swig_val);
+  if (!SWIG_IsOK(swig_res)) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""bool""'");
+  }
+  c_result = static_cast< bool >(swig_val);
+  return (bool) c_result;
+}
+
+
+bool SwigDirector_ViewEdgeViewEdgeIterator::operator !=(ViewEdgeInternal::ViewEdgeIterator &it) const {
+  bool c_result;
+  swig::PyObject_var obj0;
+  obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&it), SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator,  0 );
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ViewEdgeViewEdgeIterator.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 8;
+  const char * const swig_method_name = "__ne__";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *)"__ne__", (char *)"(O)" ,(PyObject *)obj0);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'ViewEdgeViewEdgeIterator.__ne__'");
+    }
+  }
+  bool swig_val;
+  int swig_res = SWIG_AsVal_bool(result, &swig_val);
+  if (!SWIG_IsOK(swig_res)) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""bool""'");
+  }
+  c_result = static_cast< bool >(swig_val);
+  return (bool) c_result;
+}
+
+
+SwigDirector_UnaryFunction0DVoid::SwigDirector_UnaryFunction0DVoid(PyObject *self): UnaryFunction0D<void >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction0D<void > *)this, this); 
+}
+
+
+
+
+SwigDirector_UnaryFunction0DVoid::~SwigDirector_UnaryFunction0DVoid() {
+}
+
+std::string SwigDirector_UnaryFunction0DVoid::getName() const {
+  std::string c_result;
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call UnaryFunction0DVoid.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 0;
+  const char * const swig_method_name = "getName";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "getName", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'UnaryFunction0DVoid.getName'");
+    }
+  }
+  std::string *swig_optr = 0;
+  int swig_ores = SWIG_AsPtr_std_string(result, &swig_optr);
+  if (!SWIG_IsOK(swig_ores) || !swig_optr) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError((swig_optr ? swig_ores : SWIG_TypeError))), "in output value of type '""std::string""'");
+  }
+  c_result = *swig_optr;
+  if (SWIG_IsNewObj(swig_ores)) delete swig_optr;
+  return (std::string) c_result;
+}
+
+
+void SwigDirector_UnaryFunction0DVoid::operator ()(Interface0DIterator &iter) {
+  swig::PyObject_var obj0;
+  obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&iter), SWIGTYPE_p_Interface0DIterator,  0 );
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call UnaryFunction0DVoid.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 1;
+  const char * const swig_method_name = "__call__";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *)"__call__", (char *)"(O)" ,(PyObject *)obj0);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'UnaryFunction0DVoid.__call__'");
+    }
+  }
+}
+
+
+SwigDirector_UnaryFunction0DUnsigned::SwigDirector_UnaryFunction0DUnsigned(PyObject *self): UnaryFunction0D<unsigned int >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction0D<unsigned int > *)this, this); 
+}
+
+
+
+
+SwigDirector_UnaryFunction0DUnsigned::~SwigDirector_UnaryFunction0DUnsigned() {
+}
+
+std::string SwigDirector_UnaryFunction0DUnsigned::getName() const {
+  std::string c_result;
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call UnaryFunction0DUnsigned.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 0;
+  const char * const swig_method_name = "getName";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "getName", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'UnaryFunction0DUnsigned.getName'");
+    }
+  }
+  std::string *swig_optr = 0;
+  int swig_ores = SWIG_AsPtr_std_string(result, &swig_optr);
+  if (!SWIG_IsOK(swig_ores) || !swig_optr) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError((swig_optr ? swig_ores : SWIG_TypeError))), "in output value of type '""std::string""'");
+  }
+  c_result = *swig_optr;
+  if (SWIG_IsNewObj(swig_ores)) delete swig_optr;
+  return (std::string) c_result;
+}
+
+
+unsigned int SwigDirector_UnaryFunction0DUnsigned::operator ()(Interface0DIterator &iter) {
+  unsigned int c_result;
+  swig::PyObject_var obj0;
+  obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&iter), SWIGTYPE_p_Interface0DIterator,  0 );
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call UnaryFunction0DUnsigned.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 1;
+  const char * const swig_method_name = "__call__";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *)"__call__", (char *)"(O)" ,(PyObject *)obj0);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'UnaryFunction0DUnsigned.__call__'");
+    }
+  }
+  unsigned int swig_val;
+  int swig_res = SWIG_AsVal_unsigned_SS_int(result, &swig_val);
+  if (!SWIG_IsOK(swig_res)) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""unsigned int""'");
+  }
+  c_result = static_cast< unsigned int >(swig_val);
+  return (unsigned int) c_result;
+}
+
+
+SwigDirector_UnaryFunction0DFloat::SwigDirector_UnaryFunction0DFloat(PyObject *self): UnaryFunction0D<float >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction0D<float > *)this, this); 
+}
+
+
+
+
+SwigDirector_UnaryFunction0DFloat::~SwigDirector_UnaryFunction0DFloat() {
+}
+
+std::string SwigDirector_UnaryFunction0DFloat::getName() const {
+  std::string c_result;
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call UnaryFunction0DFloat.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 0;
+  const char * const swig_method_name = "getName";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "getName", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'UnaryFunction0DFloat.getName'");
+    }
+  }
+  std::string *swig_optr = 0;
+  int swig_ores = SWIG_AsPtr_std_string(result, &swig_optr);
+  if (!SWIG_IsOK(swig_ores) || !swig_optr) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError((swig_optr ? swig_ores : SWIG_TypeError))), "in output value of type '""std::string""'");
+  }
+  c_result = *swig_optr;
+  if (SWIG_IsNewObj(swig_ores)) delete swig_optr;
+  return (std::string) c_result;
+}
+
+
+float SwigDirector_UnaryFunction0DFloat::operator ()(Interface0DIterator &iter) {
+  float c_result;
+  swig::PyObject_var obj0;
+  obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&iter), SWIGTYPE_p_Interface0DIterator,  0 );
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call UnaryFunction0DFloat.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 1;
+  const char * const swig_method_name = "__call__";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *)"__call__", (char *)"(O)" ,(PyObject *)obj0);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'UnaryFunction0DFloat.__call__'");
+    }
+  }
+  float swig_val;
+  int swig_res = SWIG_AsVal_float(result, &swig_val);
+  if (!SWIG_IsOK(swig_res)) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""float""'");
+  }
+  c_result = static_cast< float >(swig_val);
+  return (float) c_result;
+}
+
+
+SwigDirector_UnaryFunction0DDouble::SwigDirector_UnaryFunction0DDouble(PyObject *self): UnaryFunction0D<double >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction0D<double > *)this, this); 
+}
+
+
+
+
+SwigDirector_UnaryFunction0DDouble::~SwigDirector_UnaryFunction0DDouble() {
+}
+
+std::string SwigDirector_UnaryFunction0DDouble::getName() const {
+  std::string c_result;
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call UnaryFunction0DDouble.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 0;
+  const char * const swig_method_name = "getName";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "getName", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'UnaryFunction0DDouble.getName'");
+    }
+  }
+  std::string *swig_optr = 0;
+  int swig_ores = SWIG_AsPtr_std_string(result, &swig_optr);
+  if (!SWIG_IsOK(swig_ores) || !swig_optr) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError((swig_optr ? swig_ores : SWIG_TypeError))), "in output value of type '""std::string""'");
+  }
+  c_result = *swig_optr;
+  if (SWIG_IsNewObj(swig_ores)) delete swig_optr;
+  return (std::string) c_result;
+}
+
+
+double SwigDirector_UnaryFunction0DDouble::operator ()(Interface0DIterator &iter) {
+  double c_result;
+  swig::PyObject_var obj0;
+  obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&iter), SWIGTYPE_p_Interface0DIterator,  0 );
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call UnaryFunction0DDouble.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 1;
+  const char * const swig_method_name = "__call__";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *)"__call__", (char *)"(O)" ,(PyObject *)obj0);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'UnaryFunction0DDouble.__call__'");
+    }
+  }
+  double swig_val;
+  int swig_res = SWIG_AsVal_double(result, &swig_val);
+  if (!SWIG_IsOK(swig_res)) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""double""'");
+  }
+  c_result = static_cast< double >(swig_val);
+  return (double) c_result;
+}
+
+
+SwigDirector_UnaryFunction0DVec2f::SwigDirector_UnaryFunction0DVec2f(PyObject *self): UnaryFunction0D<Geometry::Vec2f >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction0D<Geometry::Vec2f > *)this, this); 
+}
+
+
+
+
+SwigDirector_UnaryFunction0DVec2f::~SwigDirector_UnaryFunction0DVec2f() {
+}
+
+std::string SwigDirector_UnaryFunction0DVec2f::getName() const {
+  std::string c_result;
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call UnaryFunction0DVec2f.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 0;
+  const char * const swig_method_name = "getName";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "getName", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'UnaryFunction0DVec2f.getName'");
+    }
+  }
+  std::string *swig_optr = 0;
+  int swig_ores = SWIG_AsPtr_std_string(result, &swig_optr);
+  if (!SWIG_IsOK(swig_ores) || !swig_optr) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError((swig_optr ? swig_ores : SWIG_TypeError))), "in output value of type '""std::string""'");
+  }
+  c_result = *swig_optr;
+  if (SWIG_IsNewObj(swig_ores)) delete swig_optr;
+  return (std::string) c_result;
+}
+
+
+VecMat::Vec2<float > SwigDirector_UnaryFunction0DVec2f::operator ()(Interface0DIterator &iter) {
+  void *swig_argp ;
+  int swig_res = 0 ;
+  
+  VecMat::Vec2<float > c_result;
+  swig::PyObject_var obj0;
+  obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&iter), SWIGTYPE_p_Interface0DIterator,  0 );
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call UnaryFunction0DVec2f.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 1;
+  const char * const swig_method_name = "__call__";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *)"__call__", (char *)"(O)" ,(PyObject *)obj0);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'UnaryFunction0DVec2f.__call__'");
+    }
+  }
+  swig_res = SWIG_ConvertPtr(result,&swig_argp,SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0  | 0);
+  if (!SWIG_IsOK(swig_res)) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""VecMat::Vec2<float >""'");
+  }
+  c_result = *(reinterpret_cast< VecMat::Vec2<float > * >(swig_argp));
+  if (SWIG_IsNewObj(swig_res)) delete reinterpret_cast< VecMat::Vec2<float > * >(swig_argp);
+  return (VecMat::Vec2<float >) c_result;
+}
+
+
+SwigDirector_UnaryFunction0DVec3f::SwigDirector_UnaryFunction0DVec3f(PyObject *self): UnaryFunction0D<Geometry::Vec3f >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction0D<Geometry::Vec3f > *)this, this); 
+}
+
+
+
+
+SwigDirector_UnaryFunction0DVec3f::~SwigDirector_UnaryFunction0DVec3f() {
+}
+
+std::string SwigDirector_UnaryFunction0DVec3f::getName() const {
+  std::string c_result;
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call UnaryFunction0DVec3f.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 0;
+  const char * const swig_method_name = "getName";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "getName", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'UnaryFunction0DVec3f.getName'");
+    }
+  }
+  std::string *swig_optr = 0;
+  int swig_ores = SWIG_AsPtr_std_string(result, &swig_optr);
+  if (!SWIG_IsOK(swig_ores) || !swig_optr) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError((swig_optr ? swig_ores : SWIG_TypeError))), "in output value of type '""std::string""'");
+  }
+  c_result = *swig_optr;
+  if (SWIG_IsNewObj(swig_ores)) delete swig_optr;
+  return (std::string) c_result;
+}
+
+
+VecMat::Vec3<float > SwigDirector_UnaryFunction0DVec3f::operator ()(Interface0DIterator &iter) {
+  void *swig_argp ;
+  int swig_res = 0 ;
+  
+  VecMat::Vec3<float > c_result;
+  swig::PyObject_var obj0;
+  obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&iter), SWIGTYPE_p_Interface0DIterator,  0 );
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call UnaryFunction0DVec3f.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 1;
+  const char * const swig_method_name = "__call__";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *)"__call__", (char *)"(O)" ,(PyObject *)obj0);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'UnaryFunction0DVec3f.__call__'");
+    }
+  }
+  swig_res = SWIG_ConvertPtr(result,&swig_argp,SWIGTYPE_p_VecMat__Vec3Tfloat_t,  0  | 0);
+  if (!SWIG_IsOK(swig_res)) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""VecMat::Vec3<float >""'");
+  }
+  c_result = *(reinterpret_cast< VecMat::Vec3<float > * >(swig_argp));
+  if (SWIG_IsNewObj(swig_res)) delete reinterpret_cast< VecMat::Vec3<float > * >(swig_argp);
+  return (VecMat::Vec3<float >) c_result;
+}
+
+
+SwigDirector_UnaryFunction0DId::SwigDirector_UnaryFunction0DId(PyObject *self): UnaryFunction0D<Id >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction0D<Id > *)this, this); 
+}
+
+
+
+
+SwigDirector_UnaryFunction0DId::~SwigDirector_UnaryFunction0DId() {
+}
+
+std::string SwigDirector_UnaryFunction0DId::getName() const {
+  std::string c_result;
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call UnaryFunction0DId.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 0;
+  const char * const swig_method_name = "getName";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "getName", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'UnaryFunction0DId.getName'");
+    }
+  }
+  std::string *swig_optr = 0;
+  int swig_ores = SWIG_AsPtr_std_string(result, &swig_optr);
+  if (!SWIG_IsOK(swig_ores) || !swig_optr) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError((swig_optr ? swig_ores : SWIG_TypeError))), "in output value of type '""std::string""'");
+  }
+  c_result = *swig_optr;
+  if (SWIG_IsNewObj(swig_ores)) delete swig_optr;
+  return (std::string) c_result;
+}
+
+
+Id SwigDirector_UnaryFunction0DId::operator ()(Interface0DIterator &iter) {
+  void *swig_argp ;
+  int swig_res = 0 ;
+  
+  Id c_result;
+  swig::PyObject_var obj0;
+  obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&iter), SWIGTYPE_p_Interface0DIterator,  0 );
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call UnaryFunction0DId.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 1;
+  const char * const swig_method_name = "__call__";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *)"__call__", (char *)"(O)" ,(PyObject *)obj0);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'UnaryFunction0DId.__call__'");
+    }
+  }
+  swig_res = SWIG_ConvertPtr(result,&swig_argp,SWIGTYPE_p_Id,  0  | 0);
+  if (!SWIG_IsOK(swig_res)) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""Id""'");
+  }
+  c_result = *(reinterpret_cast< Id * >(swig_argp));
+  if (SWIG_IsNewObj(swig_res)) delete reinterpret_cast< Id * >(swig_argp);
+  return (Id) c_result;
+}
+
+
+SwigDirector_UnaryFunction1DVoid::SwigDirector_UnaryFunction1DVoid(PyObject *self): UnaryFunction1D<void >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D<void > *)this, this); 
+}
+
+
+
+
+SwigDirector_UnaryFunction1DVoid::SwigDirector_UnaryFunction1DVoid(PyObject *self, IntegrationType iType): UnaryFunction1D<void >(iType), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D<void > *)this, this); 
+}
+
+
+
+
+SwigDirector_UnaryFunction1DVoid::~SwigDirector_UnaryFunction1DVoid() {
+}
+
+std::string SwigDirector_UnaryFunction1DVoid::getName() const {
+  std::string c_result;
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call UnaryFunction1DVoid.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 0;
+  const char * const swig_method_name = "getName";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "getName", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'UnaryFunction1DVoid.getName'");
+    }
+  }
+  std::string *swig_optr = 0;
+  int swig_ores = SWIG_AsPtr_std_string(result, &swig_optr);
+  if (!SWIG_IsOK(swig_ores) || !swig_optr) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError((swig_optr ? swig_ores : SWIG_TypeError))), "in output value of type '""std::string""'");
+  }
+  c_result = *swig_optr;
+  if (SWIG_IsNewObj(swig_ores)) delete swig_optr;
+  return (std::string) c_result;
+}
+
+
+void SwigDirector_UnaryFunction1DVoid::operator ()(Interface1D &inter) {
+  swig::PyObject_var obj0;
+  obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&inter), SWIGTYPE_p_Interface1D,  0 );
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call UnaryFunction1DVoid.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 1;
+  const char * const swig_method_name = "__call__";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *)"__call__", (char *)"(O)" ,(PyObject *)obj0);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'UnaryFunction1DVoid.__call__'");
+    }
+  }
+}
+
+
+SwigDirector_UnaryFunction1DUnsigned::SwigDirector_UnaryFunction1DUnsigned(PyObject *self): UnaryFunction1D<unsigned int >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D<unsigned int > *)this, this); 
+}
+
+
+
+
+SwigDirector_UnaryFunction1DUnsigned::SwigDirector_UnaryFunction1DUnsigned(PyObject *self, IntegrationType iType): UnaryFunction1D<unsigned int >(iType), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D<unsigned int > *)this, this); 
+}
+
+
+
+
+SwigDirector_UnaryFunction1DUnsigned::~SwigDirector_UnaryFunction1DUnsigned() {
+}
+
+std::string SwigDirector_UnaryFunction1DUnsigned::getName() const {
+  std::string c_result;
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call UnaryFunction1DUnsigned.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 0;
+  const char * const swig_method_name = "getName";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "getName", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'UnaryFunction1DUnsigned.getName'");
+    }
+  }
+  std::string *swig_optr = 0;
+  int swig_ores = SWIG_AsPtr_std_string(result, &swig_optr);
+  if (!SWIG_IsOK(swig_ores) || !swig_optr) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError((swig_optr ? swig_ores : SWIG_TypeError))), "in output value of type '""std::string""'");
+  }
+  c_result = *swig_optr;
+  if (SWIG_IsNewObj(swig_ores)) delete swig_optr;
+  return (std::string) c_result;
+}
+
+
+unsigned int SwigDirector_UnaryFunction1DUnsigned::operator ()(Interface1D &inter) {
+  unsigned int c_result;
+  swig::PyObject_var obj0;
+  obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&inter), SWIGTYPE_p_Interface1D,  0 );
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call UnaryFunction1DUnsigned.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 1;
+  const char * const swig_method_name = "__call__";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *)"__call__", (char *)"(O)" ,(PyObject *)obj0);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'UnaryFunction1DUnsigned.__call__'");
+    }
+  }
+  unsigned int swig_val;
+  int swig_res = SWIG_AsVal_unsigned_SS_int(result, &swig_val);
+  if (!SWIG_IsOK(swig_res)) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""unsigned int""'");
+  }
+  c_result = static_cast< unsigned int >(swig_val);
+  return (unsigned int) c_result;
+}
+
+
+SwigDirector_UnaryFunction1DFloat::SwigDirector_UnaryFunction1DFloat(PyObject *self): UnaryFunction1D<float >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D<float > *)this, this); 
+}
+
+
+
+
+SwigDirector_UnaryFunction1DFloat::SwigDirector_UnaryFunction1DFloat(PyObject *self, IntegrationType iType): UnaryFunction1D<float >(iType), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D<float > *)this, this); 
+}
+
+
+
+
+SwigDirector_UnaryFunction1DFloat::~SwigDirector_UnaryFunction1DFloat() {
+}
+
+std::string SwigDirector_UnaryFunction1DFloat::getName() const {
+  std::string c_result;
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call UnaryFunction1DFloat.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 0;
+  const char * const swig_method_name = "getName";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "getName", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'UnaryFunction1DFloat.getName'");
+    }
+  }
+  std::string *swig_optr = 0;
+  int swig_ores = SWIG_AsPtr_std_string(result, &swig_optr);
+  if (!SWIG_IsOK(swig_ores) || !swig_optr) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError((swig_optr ? swig_ores : SWIG_TypeError))), "in output value of type '""std::string""'");
+  }
+  c_result = *swig_optr;
+  if (SWIG_IsNewObj(swig_ores)) delete swig_optr;
+  return (std::string) c_result;
+}
+
+
+float SwigDirector_UnaryFunction1DFloat::operator ()(Interface1D &inter) {
+  float c_result;
+  swig::PyObject_var obj0;
+  obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&inter), SWIGTYPE_p_Interface1D,  0 );
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call UnaryFunction1DFloat.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 1;
+  const char * const swig_method_name = "__call__";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *)"__call__", (char *)"(O)" ,(PyObject *)obj0);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'UnaryFunction1DFloat.__call__'");
+    }
+  }
+  float swig_val;
+  int swig_res = SWIG_AsVal_float(result, &swig_val);
+  if (!SWIG_IsOK(swig_res)) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""float""'");
+  }
+  c_result = static_cast< float >(swig_val);
+  return (float) c_result;
+}
+
+
+SwigDirector_UnaryFunction1DDouble::SwigDirector_UnaryFunction1DDouble(PyObject *self): UnaryFunction1D<double >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D<double > *)this, this); 
+}
+
+
+
+
+SwigDirector_UnaryFunction1DDouble::SwigDirector_UnaryFunction1DDouble(PyObject *self, IntegrationType iType): UnaryFunction1D<double >(iType), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D<double > *)this, this); 
+}
+
+
+
+
+SwigDirector_UnaryFunction1DDouble::~SwigDirector_UnaryFunction1DDouble() {
+}
+
+std::string SwigDirector_UnaryFunction1DDouble::getName() const {
+  std::string c_result;
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call UnaryFunction1DDouble.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 0;
+  const char * const swig_method_name = "getName";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "getName", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'UnaryFunction1DDouble.getName'");
+    }
+  }
+  std::string *swig_optr = 0;
+  int swig_ores = SWIG_AsPtr_std_string(result, &swig_optr);
+  if (!SWIG_IsOK(swig_ores) || !swig_optr) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError((swig_optr ? swig_ores : SWIG_TypeError))), "in output value of type '""std::string""'");
+  }
+  c_result = *swig_optr;
+  if (SWIG_IsNewObj(swig_ores)) delete swig_optr;
+  return (std::string) c_result;
+}
+
+
+double SwigDirector_UnaryFunction1DDouble::operator ()(Interface1D &inter) {
+  double c_result;
+  swig::PyObject_var obj0;
+  obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&inter), SWIGTYPE_p_Interface1D,  0 );
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call UnaryFunction1DDouble.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 1;
+  const char * const swig_method_name = "__call__";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *)"__call__", (char *)"(O)" ,(PyObject *)obj0);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'UnaryFunction1DDouble.__call__'");
+    }
+  }
+  double swig_val;
+  int swig_res = SWIG_AsVal_double(result, &swig_val);
+  if (!SWIG_IsOK(swig_res)) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""double""'");
+  }
+  c_result = static_cast< double >(swig_val);
+  return (double) c_result;
+}
+
+
+SwigDirector_UnaryFunction1DVec2f::SwigDirector_UnaryFunction1DVec2f(PyObject *self): UnaryFunction1D<Geometry::Vec2f >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D<Geometry::Vec2f > *)this, this); 
+}
+
+
+
+
+SwigDirector_UnaryFunction1DVec2f::SwigDirector_UnaryFunction1DVec2f(PyObject *self, IntegrationType iType): UnaryFunction1D<Geometry::Vec2f >(iType), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D<Geometry::Vec2f > *)this, this); 
+}
+
+
+
+
+SwigDirector_UnaryFunction1DVec2f::~SwigDirector_UnaryFunction1DVec2f() {
+}
+
+std::string SwigDirector_UnaryFunction1DVec2f::getName() const {
+  std::string c_result;
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call UnaryFunction1DVec2f.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 0;
+  const char * const swig_method_name = "getName";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "getName", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'UnaryFunction1DVec2f.getName'");
+    }
+  }
+  std::string *swig_optr = 0;
+  int swig_ores = SWIG_AsPtr_std_string(result, &swig_optr);
+  if (!SWIG_IsOK(swig_ores) || !swig_optr) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError((swig_optr ? swig_ores : SWIG_TypeError))), "in output value of type '""std::string""'");
+  }
+  c_result = *swig_optr;
+  if (SWIG_IsNewObj(swig_ores)) delete swig_optr;
+  return (std::string) c_result;
+}
+
+
+VecMat::Vec2<float > SwigDirector_UnaryFunction1DVec2f::operator ()(Interface1D &inter) {
+  void *swig_argp ;
+  int swig_res = 0 ;
+  
+  VecMat::Vec2<float > c_result;
+  swig::PyObject_var obj0;
+  obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&inter), SWIGTYPE_p_Interface1D,  0 );
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call UnaryFunction1DVec2f.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 1;
+  const char * const swig_method_name = "__call__";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *)"__call__", (char *)"(O)" ,(PyObject *)obj0);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'UnaryFunction1DVec2f.__call__'");
+    }
+  }
+  swig_res = SWIG_ConvertPtr(result,&swig_argp,SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0  | 0);
+  if (!SWIG_IsOK(swig_res)) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""VecMat::Vec2<float >""'");
+  }
+  c_result = *(reinterpret_cast< VecMat::Vec2<float > * >(swig_argp));
+  if (SWIG_IsNewObj(swig_res)) delete reinterpret_cast< VecMat::Vec2<float > * >(swig_argp);
+  return (VecMat::Vec2<float >) c_result;
+}
+
+
+SwigDirector_UnaryFunction1DVec3f::SwigDirector_UnaryFunction1DVec3f(PyObject *self): UnaryFunction1D<Geometry::Vec3f >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D<Geometry::Vec3f > *)this, this); 
+}
+
+
+
+
+SwigDirector_UnaryFunction1DVec3f::SwigDirector_UnaryFunction1DVec3f(PyObject *self, IntegrationType iType): UnaryFunction1D<Geometry::Vec3f >(iType), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D<Geometry::Vec3f > *)this, this); 
+}
+
+
+
+
+SwigDirector_UnaryFunction1DVec3f::~SwigDirector_UnaryFunction1DVec3f() {
+}
+
+std::string SwigDirector_UnaryFunction1DVec3f::getName() const {
+  std::string c_result;
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call UnaryFunction1DVec3f.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 0;
+  const char * const swig_method_name = "getName";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "getName", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'UnaryFunction1DVec3f.getName'");
+    }
+  }
+  std::string *swig_optr = 0;
+  int swig_ores = SWIG_AsPtr_std_string(result, &swig_optr);
+  if (!SWIG_IsOK(swig_ores) || !swig_optr) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError((swig_optr ? swig_ores : SWIG_TypeError))), "in output value of type '""std::string""'");
+  }
+  c_result = *swig_optr;
+  if (SWIG_IsNewObj(swig_ores)) delete swig_optr;
+  return (std::string) c_result;
+}
+
+
+VecMat::Vec3<float > SwigDirector_UnaryFunction1DVec3f::operator ()(Interface1D &inter) {
+  void *swig_argp ;
+  int swig_res = 0 ;
+  
+  VecMat::Vec3<float > c_result;
+  swig::PyObject_var obj0;
+  obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&inter), SWIGTYPE_p_Interface1D,  0 );
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call UnaryFunction1DVec3f.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 1;
+  const char * const swig_method_name = "__call__";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *)"__call__", (char *)"(O)" ,(PyObject *)obj0);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'UnaryFunction1DVec3f.__call__'");
+    }
+  }
+  swig_res = SWIG_ConvertPtr(result,&swig_argp,SWIGTYPE_p_VecMat__Vec3Tfloat_t,  0  | 0);
+  if (!SWIG_IsOK(swig_res)) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""VecMat::Vec3<float >""'");
+  }
+  c_result = *(reinterpret_cast< VecMat::Vec3<float > * >(swig_argp));
+  if (SWIG_IsNewObj(swig_res)) delete reinterpret_cast< VecMat::Vec3<float > * >(swig_argp);
+  return (VecMat::Vec3<float >) c_result;
+}
+
+
+SwigDirector_ChainingIterator::SwigDirector_ChainingIterator(PyObject *self, bool iRestrictToSelection, bool iRestrictToUnvisited, ViewEdge *begin, bool orientation): ChainingIterator(iRestrictToSelection, iRestrictToUnvisited, begin, orientation), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((ChainingIterator *)this, this); 
+}
+
+
+
+
+SwigDirector_ChainingIterator::SwigDirector_ChainingIterator(PyObject *self, ChainingIterator const &brother): ChainingIterator(brother), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((ChainingIterator *)this, this); 
+}
+
+
+
+
+SwigDirector_ChainingIterator::~SwigDirector_ChainingIterator() {
+}
+
+std::string SwigDirector_ChainingIterator::getExactTypeName() const {
+  std::string c_result;
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ChainingIterator.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 0;
+  const char * const swig_method_name = "getExactTypeName";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "getExactTypeName", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'ChainingIterator.getExactTypeName'");
+    }
+  }
+  std::string *swig_optr = 0;
+  int swig_ores = SWIG_AsPtr_std_string(result, &swig_optr);
+  if (!SWIG_IsOK(swig_ores) || !swig_optr) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError((swig_optr ? swig_ores : SWIG_TypeError))), "in output value of type '""std::string""'");
+  }
+  c_result = *swig_optr;
+  if (SWIG_IsNewObj(swig_ores)) delete swig_optr;
+  return (std::string) c_result;
+}
+
+
+ViewEdge *SwigDirector_ChainingIterator::operator *() {
+  void *swig_argp ;
+  int swig_res ;
+  swig_owntype own ;
+  
+  ViewEdge *c_result;
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ChainingIterator.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 1;
+  const char * const swig_method_name = "getObject";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "getObject", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'ChainingIterator.getObject'");
+    }
+  }
+  swig_res = SWIG_ConvertPtrAndOwn(result, &swig_argp, SWIGTYPE_p_ViewEdge,  0  | SWIG_POINTER_DISOWN, &own);
+  if (!SWIG_IsOK(swig_res)) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""ViewEdge *""'");
+  }
+  c_result = reinterpret_cast< ViewEdge * >(swig_argp);
+  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own);
+  return (ViewEdge *) c_result;
+}
+
+
+ViewEdge *SwigDirector_ChainingIterator::operator ->() {
+  void *swig_argp ;
+  int swig_res ;
+  swig_owntype own ;
+  
+  ViewEdge *c_result;
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ChainingIterator.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 2;
+  const char * const swig_method_name = "__deref__";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "__deref__", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'ChainingIterator.__deref__'");
+    }
+  }
+  swig_res = SWIG_ConvertPtrAndOwn(result, &swig_argp, SWIGTYPE_p_ViewEdge,  0  | SWIG_POINTER_DISOWN, &own);
+  if (!SWIG_IsOK(swig_res)) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""ViewEdge *""'");
+  }
+  c_result = reinterpret_cast< ViewEdge * >(swig_argp);
+  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own);
+  return (ViewEdge *) c_result;
+}
+
+
+ViewEdgeInternal::ViewEdgeIterator &SwigDirector_ChainingIterator::operator ++() {
+  return ViewEdgeInternal::ViewEdgeIterator::operator ++();
+}
+
+
+ViewEdgeInternal::ViewEdgeIterator SwigDirector_ChainingIterator::operator ++(int arg0) {
+  return ViewEdgeInternal::ViewEdgeIterator::operator ++(arg0);
+}
+
+
+void SwigDirector_ChainingIterator::increment() {
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ChainingIterator.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 3;
+  const char * const swig_method_name = "increment";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "increment", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'ChainingIterator.increment'");
+    }
+  }
+}
+
+
+ViewEdgeInternal::ViewEdgeIterator &SwigDirector_ChainingIterator::operator --() {
+  return ViewEdgeInternal::ViewEdgeIterator::operator --();
+}
+
+
+ViewEdgeInternal::ViewEdgeIterator SwigDirector_ChainingIterator::operator --(int arg0) {
+  return ViewEdgeInternal::ViewEdgeIterator::operator --(arg0);
+}
+
+
+void SwigDirector_ChainingIterator::decrement() {
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ChainingIterator.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 4;
+  const char * const swig_method_name = "decrement";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "decrement", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'ChainingIterator.decrement'");
+    }
+  }
+}
+
+
+bool SwigDirector_ChainingIterator::isBegin() const {
+  bool c_result;
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ChainingIterator.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 5;
+  const char * const swig_method_name = "isBegin";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "isBegin", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'ChainingIterator.isBegin'");
+    }
+  }
+  bool swig_val;
+  int swig_res = SWIG_AsVal_bool(result, &swig_val);
+  if (!SWIG_IsOK(swig_res)) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""bool""'");
+  }
+  c_result = static_cast< bool >(swig_val);
+  return (bool) c_result;
+}
+
+
+bool SwigDirector_ChainingIterator::isEnd() const {
+  bool c_result;
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ChainingIterator.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 6;
+  const char * const swig_method_name = "isEnd";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "isEnd", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'ChainingIterator.isEnd'");
+    }
+  }
+  bool swig_val;
+  int swig_res = SWIG_AsVal_bool(result, &swig_val);
+  if (!SWIG_IsOK(swig_res)) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""bool""'");
+  }
+  c_result = static_cast< bool >(swig_val);
+  return (bool) c_result;
+}
+
+
+bool SwigDirector_ChainingIterator::operator ==(ViewEdgeInternal::ViewEdgeIterator &it) const {
+  bool c_result;
+  swig::PyObject_var obj0;
+  obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&it), SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator,  0 );
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ChainingIterator.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 7;
+  const char * const swig_method_name = "__eq__";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *)"__eq__", (char *)"(O)" ,(PyObject *)obj0);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'ChainingIterator.__eq__'");
+    }
+  }
+  bool swig_val;
+  int swig_res = SWIG_AsVal_bool(result, &swig_val);
+  if (!SWIG_IsOK(swig_res)) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""bool""'");
+  }
+  c_result = static_cast< bool >(swig_val);
+  return (bool) c_result;
+}
+
+
+bool SwigDirector_ChainingIterator::operator !=(ViewEdgeInternal::ViewEdgeIterator &it) const {
+  bool c_result;
+  swig::PyObject_var obj0;
+  obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&it), SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator,  0 );
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ChainingIterator.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 8;
+  const char * const swig_method_name = "__ne__";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *)"__ne__", (char *)"(O)" ,(PyObject *)obj0);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'ChainingIterator.__ne__'");
+    }
+  }
+  bool swig_val;
+  int swig_res = SWIG_AsVal_bool(result, &swig_val);
+  if (!SWIG_IsOK(swig_res)) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""bool""'");
+  }
+  c_result = static_cast< bool >(swig_val);
+  return (bool) c_result;
+}
+
+
+void SwigDirector_ChainingIterator::init() {
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ChainingIterator.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 9;
+  const char * const swig_method_name = "init";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "init", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'ChainingIterator.init'");
+    }
+  }
+}
+
+
+ViewEdge *SwigDirector_ChainingIterator::traverse(AdjacencyIterator const &it) {
+  void *swig_argp ;
+  int swig_res ;
+  swig_owntype own ;
+  
+  ViewEdge *c_result;
+  swig::PyObject_var obj0;
+  obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&it), SWIGTYPE_p_AdjacencyIterator,  0 );
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ChainingIterator.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 10;
+  const char * const swig_method_name = "traverse";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *)"traverse", (char *)"(O)" ,(PyObject *)obj0);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'ChainingIterator.traverse'");
+    }
+  }
+  swig_res = SWIG_ConvertPtrAndOwn(result, &swig_argp, SWIGTYPE_p_ViewEdge,  0  | SWIG_POINTER_DISOWN, &own);
+  if (!SWIG_IsOK(swig_res)) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""ViewEdge *""'");
+  }
+  c_result = reinterpret_cast< ViewEdge * >(swig_argp);
+  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own);
+  return (ViewEdge *) c_result;
+}
+
+
+SwigDirector_ChainSilhouetteIterator::SwigDirector_ChainSilhouetteIterator(PyObject *self, bool iRestrictToSelection, ViewEdge *begin, bool orientation): ChainSilhouetteIterator(iRestrictToSelection, begin, orientation), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((ChainSilhouetteIterator *)this, this); 
+}
+
+
+
+
+SwigDirector_ChainSilhouetteIterator::SwigDirector_ChainSilhouetteIterator(PyObject *self, ChainSilhouetteIterator const &brother): ChainSilhouetteIterator(brother), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((ChainSilhouetteIterator *)this, this); 
+}
+
+
+
+
+SwigDirector_ChainSilhouetteIterator::~SwigDirector_ChainSilhouetteIterator() {
+}
+
+std::string SwigDirector_ChainSilhouetteIterator::getExactTypeName() const {
+  std::string c_result;
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ChainSilhouetteIterator.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 0;
+  const char * const swig_method_name = "getExactTypeName";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "getExactTypeName", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'ChainSilhouetteIterator.getExactTypeName'");
+    }
+  }
+  std::string *swig_optr = 0;
+  int swig_ores = SWIG_AsPtr_std_string(result, &swig_optr);
+  if (!SWIG_IsOK(swig_ores) || !swig_optr) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError((swig_optr ? swig_ores : SWIG_TypeError))), "in output value of type '""std::string""'");
+  }
+  c_result = *swig_optr;
+  if (SWIG_IsNewObj(swig_ores)) delete swig_optr;
+  return (std::string) c_result;
+}
+
+
+ViewEdge *SwigDirector_ChainSilhouetteIterator::operator *() {
+  void *swig_argp ;
+  int swig_res ;
+  swig_owntype own ;
+  
+  ViewEdge *c_result;
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ChainSilhouetteIterator.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 1;
+  const char * const swig_method_name = "getObject";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "getObject", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'ChainSilhouetteIterator.getObject'");
+    }
+  }
+  swig_res = SWIG_ConvertPtrAndOwn(result, &swig_argp, SWIGTYPE_p_ViewEdge,  0  | SWIG_POINTER_DISOWN, &own);
+  if (!SWIG_IsOK(swig_res)) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""ViewEdge *""'");
+  }
+  c_result = reinterpret_cast< ViewEdge * >(swig_argp);
+  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own);
+  return (ViewEdge *) c_result;
+}
+
+
+ViewEdge *SwigDirector_ChainSilhouetteIterator::operator ->() {
+  void *swig_argp ;
+  int swig_res ;
+  swig_owntype own ;
+  
+  ViewEdge *c_result;
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ChainSilhouetteIterator.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 2;
+  const char * const swig_method_name = "__deref__";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "__deref__", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'ChainSilhouetteIterator.__deref__'");
+    }
+  }
+  swig_res = SWIG_ConvertPtrAndOwn(result, &swig_argp, SWIGTYPE_p_ViewEdge,  0  | SWIG_POINTER_DISOWN, &own);
+  if (!SWIG_IsOK(swig_res)) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""ViewEdge *""'");
+  }
+  c_result = reinterpret_cast< ViewEdge * >(swig_argp);
+  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own);
+  return (ViewEdge *) c_result;
+}
+
+
+ViewEdgeInternal::ViewEdgeIterator &SwigDirector_ChainSilhouetteIterator::operator ++() {
+  return ViewEdgeInternal::ViewEdgeIterator::operator ++();
+}
+
+
+ViewEdgeInternal::ViewEdgeIterator SwigDirector_ChainSilhouetteIterator::operator ++(int arg0) {
+  return ViewEdgeInternal::ViewEdgeIterator::operator ++(arg0);
+}
+
+
+void SwigDirector_ChainSilhouetteIterator::increment() {
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ChainSilhouetteIterator.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 3;
+  const char * const swig_method_name = "increment";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "increment", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'ChainSilhouetteIterator.increment'");
+    }
+  }
+}
+
+
+ViewEdgeInternal::ViewEdgeIterator &SwigDirector_ChainSilhouetteIterator::operator --() {
+  return ViewEdgeInternal::ViewEdgeIterator::operator --();
+}
+
+
+ViewEdgeInternal::ViewEdgeIterator SwigDirector_ChainSilhouetteIterator::operator --(int arg0) {
+  return ViewEdgeInternal::ViewEdgeIterator::operator --(arg0);
+}
+
+
+void SwigDirector_ChainSilhouetteIterator::decrement() {
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ChainSilhouetteIterator.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 4;
+  const char * const swig_method_name = "decrement";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "decrement", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'ChainSilhouetteIterator.decrement'");
+    }
+  }
+}
+
+
+bool SwigDirector_ChainSilhouetteIterator::isBegin() const {
+  bool c_result;
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ChainSilhouetteIterator.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 5;
+  const char * const swig_method_name = "isBegin";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "isBegin", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'ChainSilhouetteIterator.isBegin'");
+    }
+  }
+  bool swig_val;
+  int swig_res = SWIG_AsVal_bool(result, &swig_val);
+  if (!SWIG_IsOK(swig_res)) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""bool""'");
+  }
+  c_result = static_cast< bool >(swig_val);
+  return (bool) c_result;
+}
+
+
+bool SwigDirector_ChainSilhouetteIterator::isEnd() const {
+  bool c_result;
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ChainSilhouetteIterator.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 6;
+  const char * const swig_method_name = "isEnd";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "isEnd", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'ChainSilhouetteIterator.isEnd'");
+    }
+  }
+  bool swig_val;
+  int swig_res = SWIG_AsVal_bool(result, &swig_val);
+  if (!SWIG_IsOK(swig_res)) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""bool""'");
+  }
+  c_result = static_cast< bool >(swig_val);
+  return (bool) c_result;
+}
+
+
+bool SwigDirector_ChainSilhouetteIterator::operator ==(ViewEdgeInternal::ViewEdgeIterator &it) const {
+  bool c_result;
+  swig::PyObject_var obj0;
+  obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&it), SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator,  0 );
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ChainSilhouetteIterator.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 7;
+  const char * const swig_method_name = "__eq__";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *)"__eq__", (char *)"(O)" ,(PyObject *)obj0);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'ChainSilhouetteIterator.__eq__'");
+    }
+  }
+  bool swig_val;
+  int swig_res = SWIG_AsVal_bool(result, &swig_val);
+  if (!SWIG_IsOK(swig_res)) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""bool""'");
+  }
+  c_result = static_cast< bool >(swig_val);
+  return (bool) c_result;
+}
+
+
+bool SwigDirector_ChainSilhouetteIterator::operator !=(ViewEdgeInternal::ViewEdgeIterator &it) const {
+  bool c_result;
+  swig::PyObject_var obj0;
+  obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&it), SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator,  0 );
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ChainSilhouetteIterator.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 8;
+  const char * const swig_method_name = "__ne__";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *)"__ne__", (char *)"(O)" ,(PyObject *)obj0);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'ChainSilhouetteIterator.__ne__'");
+    }
+  }
+  bool swig_val;
+  int swig_res = SWIG_AsVal_bool(result, &swig_val);
+  if (!SWIG_IsOK(swig_res)) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""bool""'");
+  }
+  c_result = static_cast< bool >(swig_val);
+  return (bool) c_result;
+}
+
+
+void SwigDirector_ChainSilhouetteIterator::init() {
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ChainSilhouetteIterator.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 9;
+  const char * const swig_method_name = "init";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "init", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'ChainSilhouetteIterator.init'");
+    }
+  }
+}
+
+
+ViewEdge *SwigDirector_ChainSilhouetteIterator::traverse(AdjacencyIterator const &it) {
+  void *swig_argp ;
+  int swig_res ;
+  swig_owntype own ;
+  
+  ViewEdge *c_result;
+  swig::PyObject_var obj0;
+  obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&it), SWIGTYPE_p_AdjacencyIterator,  0 );
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ChainSilhouetteIterator.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 10;
+  const char * const swig_method_name = "traverse";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *)"traverse", (char *)"(O)" ,(PyObject *)obj0);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'ChainSilhouetteIterator.traverse'");
+    }
+  }
+  swig_res = SWIG_ConvertPtrAndOwn(result, &swig_argp, SWIGTYPE_p_ViewEdge,  0  | SWIG_POINTER_DISOWN, &own);
+  if (!SWIG_IsOK(swig_res)) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""ViewEdge *""'");
+  }
+  c_result = reinterpret_cast< ViewEdge * >(swig_argp);
+  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own);
+  return (ViewEdge *) c_result;
+}
+
+
+SwigDirector_ChainPredicateIterator::SwigDirector_ChainPredicateIterator(PyObject *self, bool iRestrictToSelection, bool iRestrictToUnvisited, ViewEdge *begin, bool orientation): ChainPredicateIterator(iRestrictToSelection, iRestrictToUnvisited, begin, orientation), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((ChainPredicateIterator *)this, this); 
+}
+
+
+
+
+SwigDirector_ChainPredicateIterator::SwigDirector_ChainPredicateIterator(PyObject *self, UnaryPredicate1D &upred, BinaryPredicate1D &bpred, bool iRestrictToSelection, bool iRestrictToUnvisited, ViewEdge *begin, bool orientation): ChainPredicateIterator(upred, bpred, iRestrictToSelection, iRestrictToUnvisited, begin, orientation), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((ChainPredicateIterator *)this, this); 
+}
+
+
+
+
+SwigDirector_ChainPredicateIterator::SwigDirector_ChainPredicateIterator(PyObject *self, ChainPredicateIterator const &brother): ChainPredicateIterator(brother), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((ChainPredicateIterator *)this, this); 
+}
+
+
+
+
+SwigDirector_ChainPredicateIterator::~SwigDirector_ChainPredicateIterator() {
+}
+
+std::string SwigDirector_ChainPredicateIterator::getExactTypeName() const {
+  std::string c_result;
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ChainPredicateIterator.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 0;
+  const char * const swig_method_name = "getExactTypeName";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "getExactTypeName", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'ChainPredicateIterator.getExactTypeName'");
+    }
+  }
+  std::string *swig_optr = 0;
+  int swig_ores = SWIG_AsPtr_std_string(result, &swig_optr);
+  if (!SWIG_IsOK(swig_ores) || !swig_optr) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError((swig_optr ? swig_ores : SWIG_TypeError))), "in output value of type '""std::string""'");
+  }
+  c_result = *swig_optr;
+  if (SWIG_IsNewObj(swig_ores)) delete swig_optr;
+  return (std::string) c_result;
+}
+
+
+ViewEdge *SwigDirector_ChainPredicateIterator::operator *() {
+  void *swig_argp ;
+  int swig_res ;
+  swig_owntype own ;
+  
+  ViewEdge *c_result;
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ChainPredicateIterator.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 1;
+  const char * const swig_method_name = "getObject";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "getObject", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'ChainPredicateIterator.getObject'");
+    }
+  }
+  swig_res = SWIG_ConvertPtrAndOwn(result, &swig_argp, SWIGTYPE_p_ViewEdge,  0  | SWIG_POINTER_DISOWN, &own);
+  if (!SWIG_IsOK(swig_res)) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""ViewEdge *""'");
+  }
+  c_result = reinterpret_cast< ViewEdge * >(swig_argp);
+  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own);
+  return (ViewEdge *) c_result;
+}
+
+
+ViewEdge *SwigDirector_ChainPredicateIterator::operator ->() {
+  void *swig_argp ;
+  int swig_res ;
+  swig_owntype own ;
+  
+  ViewEdge *c_result;
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ChainPredicateIterator.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 2;
+  const char * const swig_method_name = "__deref__";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "__deref__", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'ChainPredicateIterator.__deref__'");
+    }
+  }
+  swig_res = SWIG_ConvertPtrAndOwn(result, &swig_argp, SWIGTYPE_p_ViewEdge,  0  | SWIG_POINTER_DISOWN, &own);
+  if (!SWIG_IsOK(swig_res)) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""ViewEdge *""'");
+  }
+  c_result = reinterpret_cast< ViewEdge * >(swig_argp);
+  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own);
+  return (ViewEdge *) c_result;
+}
+
+
+ViewEdgeInternal::ViewEdgeIterator &SwigDirector_ChainPredicateIterator::operator ++() {
+  return ViewEdgeInternal::ViewEdgeIterator::operator ++();
+}
+
+
+ViewEdgeInternal::ViewEdgeIterator SwigDirector_ChainPredicateIterator::operator ++(int arg0) {
+  return ViewEdgeInternal::ViewEdgeIterator::operator ++(arg0);
+}
+
+
+void SwigDirector_ChainPredicateIterator::increment() {
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ChainPredicateIterator.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 3;
+  const char * const swig_method_name = "increment";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "increment", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'ChainPredicateIterator.increment'");
+    }
+  }
+}
+
+
+ViewEdgeInternal::ViewEdgeIterator &SwigDirector_ChainPredicateIterator::operator --() {
+  return ViewEdgeInternal::ViewEdgeIterator::operator --();
+}
+
+
+ViewEdgeInternal::ViewEdgeIterator SwigDirector_ChainPredicateIterator::operator --(int arg0) {
+  return ViewEdgeInternal::ViewEdgeIterator::operator --(arg0);
+}
+
+
+void SwigDirector_ChainPredicateIterator::decrement() {
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ChainPredicateIterator.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 4;
+  const char * const swig_method_name = "decrement";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "decrement", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'ChainPredicateIterator.decrement'");
+    }
+  }
+}
+
+
+bool SwigDirector_ChainPredicateIterator::isBegin() const {
+  bool c_result;
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ChainPredicateIterator.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 5;
+  const char * const swig_method_name = "isBegin";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "isBegin", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'ChainPredicateIterator.isBegin'");
+    }
+  }
+  bool swig_val;
+  int swig_res = SWIG_AsVal_bool(result, &swig_val);
+  if (!SWIG_IsOK(swig_res)) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""bool""'");
+  }
+  c_result = static_cast< bool >(swig_val);
+  return (bool) c_result;
+}
+
+
+bool SwigDirector_ChainPredicateIterator::isEnd() const {
+  bool c_result;
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ChainPredicateIterator.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 6;
+  const char * const swig_method_name = "isEnd";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "isEnd", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'ChainPredicateIterator.isEnd'");
+    }
+  }
+  bool swig_val;
+  int swig_res = SWIG_AsVal_bool(result, &swig_val);
+  if (!SWIG_IsOK(swig_res)) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""bool""'");
+  }
+  c_result = static_cast< bool >(swig_val);
+  return (bool) c_result;
+}
+
+
+bool SwigDirector_ChainPredicateIterator::operator ==(ViewEdgeInternal::ViewEdgeIterator &it) const {
+  bool c_result;
+  swig::PyObject_var obj0;
+  obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&it), SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator,  0 );
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ChainPredicateIterator.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 7;
+  const char * const swig_method_name = "__eq__";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *)"__eq__", (char *)"(O)" ,(PyObject *)obj0);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'ChainPredicateIterator.__eq__'");
+    }
+  }
+  bool swig_val;
+  int swig_res = SWIG_AsVal_bool(result, &swig_val);
+  if (!SWIG_IsOK(swig_res)) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""bool""'");
+  }
+  c_result = static_cast< bool >(swig_val);
+  return (bool) c_result;
+}
+
+
+bool SwigDirector_ChainPredicateIterator::operator !=(ViewEdgeInternal::ViewEdgeIterator &it) const {
+  bool c_result;
+  swig::PyObject_var obj0;
+  obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&it), SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator,  0 );
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ChainPredicateIterator.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 8;
+  const char * const swig_method_name = "__ne__";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *)"__ne__", (char *)"(O)" ,(PyObject *)obj0);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'ChainPredicateIterator.__ne__'");
+    }
+  }
+  bool swig_val;
+  int swig_res = SWIG_AsVal_bool(result, &swig_val);
+  if (!SWIG_IsOK(swig_res)) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""bool""'");
+  }
+  c_result = static_cast< bool >(swig_val);
+  return (bool) c_result;
+}
+
+
+void SwigDirector_ChainPredicateIterator::init() {
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ChainPredicateIterator.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 9;
+  const char * const swig_method_name = "init";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "init", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'ChainPredicateIterator.init'");
+    }
+  }
+}
+
+
+ViewEdge *SwigDirector_ChainPredicateIterator::traverse(AdjacencyIterator const &it) {
+  void *swig_argp ;
+  int swig_res ;
+  swig_owntype own ;
+  
+  ViewEdge *c_result;
+  swig::PyObject_var obj0;
+  obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&it), SWIGTYPE_p_AdjacencyIterator,  0 );
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call ChainPredicateIterator.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 10;
+  const char * const swig_method_name = "traverse";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *)"traverse", (char *)"(O)" ,(PyObject *)obj0);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'ChainPredicateIterator.traverse'");
+    }
+  }
+  swig_res = SWIG_ConvertPtrAndOwn(result, &swig_argp, SWIGTYPE_p_ViewEdge,  0  | SWIG_POINTER_DISOWN, &own);
+  if (!SWIG_IsOK(swig_res)) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""ViewEdge *""'");
+  }
+  c_result = reinterpret_cast< ViewEdge * >(swig_argp);
+  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own);
+  return (ViewEdge *) c_result;
+}
+
+
+SwigDirector_UnaryPredicate0D::SwigDirector_UnaryPredicate0D(PyObject *self): UnaryPredicate0D(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryPredicate0D *)this, this); 
+}
+
+
+
+
+SwigDirector_UnaryPredicate0D::~SwigDirector_UnaryPredicate0D() {
+}
+
+std::string SwigDirector_UnaryPredicate0D::getName() const {
+  std::string c_result;
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call UnaryPredicate0D.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 0;
+  const char * const swig_method_name = "getName";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "getName", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'UnaryPredicate0D.getName'");
+    }
+  }
+  std::string *swig_optr = 0;
+  int swig_ores = SWIG_AsPtr_std_string(result, &swig_optr);
+  if (!SWIG_IsOK(swig_ores) || !swig_optr) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError((swig_optr ? swig_ores : SWIG_TypeError))), "in output value of type '""std::string""'");
+  }
+  c_result = *swig_optr;
+  if (SWIG_IsNewObj(swig_ores)) delete swig_optr;
+  return (std::string) c_result;
+}
+
+
+bool SwigDirector_UnaryPredicate0D::operator ()(Interface0DIterator &it) {
+  bool c_result;
+  swig::PyObject_var obj0;
+  obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&it), SWIGTYPE_p_Interface0DIterator,  0 );
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call UnaryPredicate0D.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 1;
+  const char * const swig_method_name = "__call__";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *)"__call__", (char *)"(O)" ,(PyObject *)obj0);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'UnaryPredicate0D.__call__'");
+    }
+  }
+  bool swig_val;
+  int swig_res = SWIG_AsVal_bool(result, &swig_val);
+  if (!SWIG_IsOK(swig_res)) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""bool""'");
+  }
+  c_result = static_cast< bool >(swig_val);
+  return (bool) c_result;
+}
+
+
+SwigDirector_UnaryPredicate1D::SwigDirector_UnaryPredicate1D(PyObject *self): UnaryPredicate1D(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryPredicate1D *)this, this); 
+}
+
+
+
+
+SwigDirector_UnaryPredicate1D::~SwigDirector_UnaryPredicate1D() {
+}
+
+std::string SwigDirector_UnaryPredicate1D::getName() const {
+  std::string c_result;
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call UnaryPredicate1D.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 0;
+  const char * const swig_method_name = "getName";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "getName", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'UnaryPredicate1D.getName'");
+    }
+  }
+  std::string *swig_optr = 0;
+  int swig_ores = SWIG_AsPtr_std_string(result, &swig_optr);
+  if (!SWIG_IsOK(swig_ores) || !swig_optr) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError((swig_optr ? swig_ores : SWIG_TypeError))), "in output value of type '""std::string""'");
+  }
+  c_result = *swig_optr;
+  if (SWIG_IsNewObj(swig_ores)) delete swig_optr;
+  return (std::string) c_result;
+}
+
+
+bool SwigDirector_UnaryPredicate1D::operator ()(Interface1D &inter) {
+  bool c_result;
+  swig::PyObject_var obj0;
+  obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&inter), SWIGTYPE_p_Interface1D,  0 );
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call UnaryPredicate1D.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 1;
+  const char * const swig_method_name = "__call__";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *)"__call__", (char *)"(O)" ,(PyObject *)obj0);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'UnaryPredicate1D.__call__'");
+    }
+  }
+  bool swig_val;
+  int swig_res = SWIG_AsVal_bool(result, &swig_val);
+  if (!SWIG_IsOK(swig_res)) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""bool""'");
+  }
+  c_result = static_cast< bool >(swig_val);
+  return (bool) c_result;
+}
+
+
+SwigDirector_BinaryPredicate1D::SwigDirector_BinaryPredicate1D(PyObject *self): BinaryPredicate1D(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((BinaryPredicate1D *)this, this); 
+}
+
+
+
+
+SwigDirector_BinaryPredicate1D::~SwigDirector_BinaryPredicate1D() {
+}
+
+std::string SwigDirector_BinaryPredicate1D::getName() const {
+  std::string c_result;
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call BinaryPredicate1D.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 0;
+  const char * const swig_method_name = "getName";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "getName", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'BinaryPredicate1D.getName'");
+    }
+  }
+  std::string *swig_optr = 0;
+  int swig_ores = SWIG_AsPtr_std_string(result, &swig_optr);
+  if (!SWIG_IsOK(swig_ores) || !swig_optr) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError((swig_optr ? swig_ores : SWIG_TypeError))), "in output value of type '""std::string""'");
+  }
+  c_result = *swig_optr;
+  if (SWIG_IsNewObj(swig_ores)) delete swig_optr;
+  return (std::string) c_result;
+}
+
+
+bool SwigDirector_BinaryPredicate1D::operator ()(Interface1D &inter1, Interface1D &inter2) {
+  bool c_result;
+  swig::PyObject_var obj0;
+  obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&inter1), SWIGTYPE_p_Interface1D,  0 );
+  swig::PyObject_var obj1;
+  obj1 = SWIG_NewPointerObj(SWIG_as_voidptr(&inter2), SWIGTYPE_p_Interface1D,  0 );
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call BinaryPredicate1D.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 1;
+  const char * const swig_method_name = "__call__";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, (char *)"(OO)" ,(PyObject *)obj0,(PyObject *)obj1);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *)"__call__", (char *)"(OO)" ,(PyObject *)obj0,(PyObject *)obj1);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'BinaryPredicate1D.__call__'");
+    }
+  }
+  bool swig_val;
+  int swig_res = SWIG_AsVal_bool(result, &swig_val);
+  if (!SWIG_IsOK(swig_res)) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""bool""'");
+  }
+  c_result = static_cast< bool >(swig_val);
+  return (bool) c_result;
+}
+
+
+SwigDirector_StrokeShader::SwigDirector_StrokeShader(PyObject *self): StrokeShader(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((StrokeShader *)this, this); 
+}
+
+
+
+
+SwigDirector_StrokeShader::~SwigDirector_StrokeShader() {
+}
+
+std::string SwigDirector_StrokeShader::getName() const {
+  std::string c_result;
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call StrokeShader.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 0;
+  const char * const swig_method_name = "getName";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, NULL, NULL);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *) "getName", NULL);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'StrokeShader.getName'");
+    }
+  }
+  std::string *swig_optr = 0;
+  int swig_ores = SWIG_AsPtr_std_string(result, &swig_optr);
+  if (!SWIG_IsOK(swig_ores) || !swig_optr) {
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError((swig_optr ? swig_ores : SWIG_TypeError))), "in output value of type '""std::string""'");
+  }
+  c_result = *swig_optr;
+  if (SWIG_IsNewObj(swig_ores)) delete swig_optr;
+  return (std::string) c_result;
+}
+
+
+void SwigDirector_StrokeShader::shade(Stroke &ioStroke) const {
+  swig::PyObject_var obj0;
+  obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&ioStroke), SWIGTYPE_p_Stroke,  0 );
+  if (!swig_get_self()) {
+    Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call StrokeShader.__init__.");
+  }
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+  const size_t swig_method_index = 1;
+  const char * const swig_method_name = "shade";
+  PyObject* method = swig_get_method(swig_method_index, swig_method_name);
+  swig::PyObject_var result = PyObject_CallFunction(method, (char *)"(O)" ,(PyObject *)obj0);
+#else
+  swig::PyObject_var result = PyObject_CallMethod(swig_get_self(), (char *)"shade", (char *)"(O)" ,(PyObject *)obj0);
+#endif
+  if (result == NULL) {
+    PyObject *error = PyErr_Occurred();
+    if (error != NULL) {
+      Swig::DirectorMethodException::raise("Error detected when calling 'StrokeShader.shade'");
+    }
+  }
+}
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+SWIGINTERN PyObject *_wrap_delete_PySwigIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  swig::PySwigIterator *arg1 = (swig::PySwigIterator *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_PySwigIterator",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__PySwigIterator, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_PySwigIterator" "', argument " "1"" of type '" "swig::PySwigIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< swig::PySwigIterator * >(argp1);
+  delete arg1;
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_PySwigIterator_value(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  swig::PySwigIterator *arg1 = (swig::PySwigIterator *) 0 ;
+  PyObject *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:PySwigIterator_value",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__PySwigIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PySwigIterator_value" "', argument " "1"" of type '" "swig::PySwigIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< swig::PySwigIterator * >(argp1);
+  try {
+    result = (PyObject *)((swig::PySwigIterator const *)arg1)->value();
+  }
+  catch(swig::stop_iteration &_e) {
+    {
+      (void)_e;
+      SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void());
+      SWIG_fail;
+    }
+  }
+  
+  resultobj = result;
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_PySwigIterator_incr__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  swig::PySwigIterator *arg1 = (swig::PySwigIterator *) 0 ;
+  size_t arg2 ;
+  swig::PySwigIterator *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  size_t val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:PySwigIterator_incr",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__PySwigIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PySwigIterator_incr" "', argument " "1"" of type '" "swig::PySwigIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< swig::PySwigIterator * >(argp1);
+  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PySwigIterator_incr" "', argument " "2"" of type '" "size_t""'");
+  } 
+  arg2 = static_cast< size_t >(val2);
+  try {
+    result = (swig::PySwigIterator *)(arg1)->incr(arg2);
+  }
+  catch(swig::stop_iteration &_e) {
+    {
+      (void)_e;
+      SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void());
+      SWIG_fail;
+    }
+  }
+  
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__PySwigIterator, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_PySwigIterator_incr__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  swig::PySwigIterator *arg1 = (swig::PySwigIterator *) 0 ;
+  swig::PySwigIterator *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:PySwigIterator_incr",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__PySwigIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PySwigIterator_incr" "', argument " "1"" of type '" "swig::PySwigIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< swig::PySwigIterator * >(argp1);
+  try {
+    result = (swig::PySwigIterator *)(arg1)->incr();
+  }
+  catch(swig::stop_iteration &_e) {
+    {
+      (void)_e;
+      SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void());
+      SWIG_fail;
+    }
+  }
+  
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__PySwigIterator, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_PySwigIterator_incr(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_swig__PySwigIterator, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_PySwigIterator_incr__SWIG_1(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_swig__PySwigIterator, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_size_t(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_PySwigIterator_incr__SWIG_0(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'PySwigIterator_incr'.\n  Possible C/C++ prototypes are:\n    incr(size_t)\n    incr()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_PySwigIterator_decr__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  swig::PySwigIterator *arg1 = (swig::PySwigIterator *) 0 ;
+  size_t arg2 ;
+  swig::PySwigIterator *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  size_t val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:PySwigIterator_decr",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__PySwigIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PySwigIterator_decr" "', argument " "1"" of type '" "swig::PySwigIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< swig::PySwigIterator * >(argp1);
+  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PySwigIterator_decr" "', argument " "2"" of type '" "size_t""'");
+  } 
+  arg2 = static_cast< size_t >(val2);
+  try {
+    result = (swig::PySwigIterator *)(arg1)->decr(arg2);
+  }
+  catch(swig::stop_iteration &_e) {
+    {
+      (void)_e;
+      SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void());
+      SWIG_fail;
+    }
+  }
+  
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__PySwigIterator, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_PySwigIterator_decr__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  swig::PySwigIterator *arg1 = (swig::PySwigIterator *) 0 ;
+  swig::PySwigIterator *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:PySwigIterator_decr",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__PySwigIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PySwigIterator_decr" "', argument " "1"" of type '" "swig::PySwigIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< swig::PySwigIterator * >(argp1);
+  try {
+    result = (swig::PySwigIterator *)(arg1)->decr();
+  }
+  catch(swig::stop_iteration &_e) {
+    {
+      (void)_e;
+      SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void());
+      SWIG_fail;
+    }
+  }
+  
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__PySwigIterator, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_PySwigIterator_decr(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_swig__PySwigIterator, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_PySwigIterator_decr__SWIG_1(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_swig__PySwigIterator, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_size_t(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_PySwigIterator_decr__SWIG_0(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'PySwigIterator_decr'.\n  Possible C/C++ prototypes are:\n    decr(size_t)\n    decr()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_PySwigIterator_distance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  swig::PySwigIterator *arg1 = (swig::PySwigIterator *) 0 ;
+  swig::PySwigIterator *arg2 = 0 ;
+  ptrdiff_t result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:PySwigIterator_distance",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__PySwigIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PySwigIterator_distance" "', argument " "1"" of type '" "swig::PySwigIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< swig::PySwigIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_swig__PySwigIterator,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PySwigIterator_distance" "', argument " "2"" of type '" "swig::PySwigIterator const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "PySwigIterator_distance" "', argument " "2"" of type '" "swig::PySwigIterator const &""'"); 
+  }
+  arg2 = reinterpret_cast< swig::PySwigIterator * >(argp2);
+  try {
+    result = ((swig::PySwigIterator const *)arg1)->distance((swig::PySwigIterator const &)*arg2);
+  }
+  catch(std::invalid_argument &_e) {
+    SWIG_Python_Raise(SWIG_NewPointerObj((new std::invalid_argument(static_cast< const std::invalid_argument& >(_e))),SWIGTYPE_p_std__invalid_argument,SWIG_POINTER_OWN), "std::invalid_argument", SWIGTYPE_p_std__invalid_argument); SWIG_fail;
+  }
+  
+  resultobj = SWIG_From_ptrdiff_t(static_cast< ptrdiff_t >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_PySwigIterator_equal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  swig::PySwigIterator *arg1 = (swig::PySwigIterator *) 0 ;
+  swig::PySwigIterator *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:PySwigIterator_equal",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__PySwigIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PySwigIterator_equal" "', argument " "1"" of type '" "swig::PySwigIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< swig::PySwigIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_swig__PySwigIterator,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PySwigIterator_equal" "', argument " "2"" of type '" "swig::PySwigIterator const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "PySwigIterator_equal" "', argument " "2"" of type '" "swig::PySwigIterator const &""'"); 
+  }
+  arg2 = reinterpret_cast< swig::PySwigIterator * >(argp2);
+  try {
+    result = (bool)((swig::PySwigIterator const *)arg1)->equal((swig::PySwigIterator const &)*arg2);
+  }
+  catch(std::invalid_argument &_e) {
+    SWIG_Python_Raise(SWIG_NewPointerObj((new std::invalid_argument(static_cast< const std::invalid_argument& >(_e))),SWIGTYPE_p_std__invalid_argument,SWIG_POINTER_OWN), "std::invalid_argument", SWIGTYPE_p_std__invalid_argument); SWIG_fail;
+  }
+  
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_PySwigIterator_copy(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  swig::PySwigIterator *arg1 = (swig::PySwigIterator *) 0 ;
+  swig::PySwigIterator *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:PySwigIterator_copy",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__PySwigIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PySwigIterator_copy" "', argument " "1"" of type '" "swig::PySwigIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< swig::PySwigIterator * >(argp1);
+  result = (swig::PySwigIterator *)((swig::PySwigIterator const *)arg1)->copy();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__PySwigIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_PySwigIterator_next(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  swig::PySwigIterator *arg1 = (swig::PySwigIterator *) 0 ;
+  PyObject *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:PySwigIterator_next",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__PySwigIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PySwigIterator_next" "', argument " "1"" of type '" "swig::PySwigIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< swig::PySwigIterator * >(argp1);
+  try {
+    result = (PyObject *)(arg1)->next();
+  }
+  catch(swig::stop_iteration &_e) {
+    {
+      (void)_e;
+      SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void());
+      SWIG_fail;
+    }
+  }
+  
+  resultobj = result;
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_PySwigIterator_previous(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  swig::PySwigIterator *arg1 = (swig::PySwigIterator *) 0 ;
+  PyObject *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:PySwigIterator_previous",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__PySwigIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PySwigIterator_previous" "', argument " "1"" of type '" "swig::PySwigIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< swig::PySwigIterator * >(argp1);
+  try {
+    result = (PyObject *)(arg1)->previous();
+  }
+  catch(swig::stop_iteration &_e) {
+    {
+      (void)_e;
+      SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void());
+      SWIG_fail;
+    }
+  }
+  
+  resultobj = result;
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_PySwigIterator_advance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  swig::PySwigIterator *arg1 = (swig::PySwigIterator *) 0 ;
+  ptrdiff_t arg2 ;
+  swig::PySwigIterator *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:PySwigIterator_advance",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__PySwigIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PySwigIterator_advance" "', argument " "1"" of type '" "swig::PySwigIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< swig::PySwigIterator * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PySwigIterator_advance" "', argument " "2"" of type '" "ptrdiff_t""'");
+  } 
+  arg2 = static_cast< ptrdiff_t >(val2);
+  try {
+    result = (swig::PySwigIterator *)(arg1)->advance(arg2);
+  }
+  catch(swig::stop_iteration &_e) {
+    {
+      (void)_e;
+      SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void());
+      SWIG_fail;
+    }
+  }
+  
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__PySwigIterator, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_PySwigIterator___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  swig::PySwigIterator *arg1 = (swig::PySwigIterator *) 0 ;
+  swig::PySwigIterator *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:PySwigIterator___eq__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__PySwigIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PySwigIterator___eq__" "', argument " "1"" of type '" "swig::PySwigIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< swig::PySwigIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_swig__PySwigIterator,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PySwigIterator___eq__" "', argument " "2"" of type '" "swig::PySwigIterator const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "PySwigIterator___eq__" "', argument " "2"" of type '" "swig::PySwigIterator const &""'"); 
+  }
+  arg2 = reinterpret_cast< swig::PySwigIterator * >(argp2);
+  result = (bool)((swig::PySwigIterator const *)arg1)->operator ==((swig::PySwigIterator const &)*arg2);
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_PySwigIterator___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  swig::PySwigIterator *arg1 = (swig::PySwigIterator *) 0 ;
+  swig::PySwigIterator *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:PySwigIterator___ne__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__PySwigIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PySwigIterator___ne__" "', argument " "1"" of type '" "swig::PySwigIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< swig::PySwigIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_swig__PySwigIterator,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PySwigIterator___ne__" "', argument " "2"" of type '" "swig::PySwigIterator const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "PySwigIterator___ne__" "', argument " "2"" of type '" "swig::PySwigIterator const &""'"); 
+  }
+  arg2 = reinterpret_cast< swig::PySwigIterator * >(argp2);
+  result = (bool)((swig::PySwigIterator const *)arg1)->operator !=((swig::PySwigIterator const &)*arg2);
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_PySwigIterator___iadd__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  swig::PySwigIterator *arg1 = (swig::PySwigIterator *) 0 ;
+  ptrdiff_t arg2 ;
+  swig::PySwigIterator *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:PySwigIterator___iadd__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__PySwigIterator, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PySwigIterator___iadd__" "', argument " "1"" of type '" "swig::PySwigIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< swig::PySwigIterator * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PySwigIterator___iadd__" "', argument " "2"" of type '" "ptrdiff_t""'");
+  } 
+  arg2 = static_cast< ptrdiff_t >(val2);
+  try {
+    {
+      swig::PySwigIterator &_result_ref = (arg1)->operator +=(arg2);
+      result = (swig::PySwigIterator *) &_result_ref;
+    }
+  }
+  catch(swig::stop_iteration &_e) {
+    {
+      (void)_e;
+      SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void());
+      SWIG_fail;
+    }
+  }
+  
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__PySwigIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_PySwigIterator___isub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  swig::PySwigIterator *arg1 = (swig::PySwigIterator *) 0 ;
+  ptrdiff_t arg2 ;
+  swig::PySwigIterator *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:PySwigIterator___isub__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__PySwigIterator, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PySwigIterator___isub__" "', argument " "1"" of type '" "swig::PySwigIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< swig::PySwigIterator * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PySwigIterator___isub__" "', argument " "2"" of type '" "ptrdiff_t""'");
+  } 
+  arg2 = static_cast< ptrdiff_t >(val2);
+  try {
+    {
+      swig::PySwigIterator &_result_ref = (arg1)->operator -=(arg2);
+      result = (swig::PySwigIterator *) &_result_ref;
+    }
+  }
+  catch(swig::stop_iteration &_e) {
+    {
+      (void)_e;
+      SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void());
+      SWIG_fail;
+    }
+  }
+  
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__PySwigIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_PySwigIterator___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  swig::PySwigIterator *arg1 = (swig::PySwigIterator *) 0 ;
+  ptrdiff_t arg2 ;
+  swig::PySwigIterator *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:PySwigIterator___add__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__PySwigIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PySwigIterator___add__" "', argument " "1"" of type '" "swig::PySwigIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< swig::PySwigIterator * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PySwigIterator___add__" "', argument " "2"" of type '" "ptrdiff_t""'");
+  } 
+  arg2 = static_cast< ptrdiff_t >(val2);
+  try {
+    result = (swig::PySwigIterator *)((swig::PySwigIterator const *)arg1)->operator +(arg2);
+  }
+  catch(swig::stop_iteration &_e) {
+    {
+      (void)_e;
+      SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void());
+      SWIG_fail;
+    }
+  }
+  
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__PySwigIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_PySwigIterator___sub____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  swig::PySwigIterator *arg1 = (swig::PySwigIterator *) 0 ;
+  ptrdiff_t arg2 ;
+  swig::PySwigIterator *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:PySwigIterator___sub__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__PySwigIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PySwigIterator___sub__" "', argument " "1"" of type '" "swig::PySwigIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< swig::PySwigIterator * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PySwigIterator___sub__" "', argument " "2"" of type '" "ptrdiff_t""'");
+  } 
+  arg2 = static_cast< ptrdiff_t >(val2);
+  try {
+    result = (swig::PySwigIterator *)((swig::PySwigIterator const *)arg1)->operator -(arg2);
+  }
+  catch(swig::stop_iteration &_e) {
+    {
+      (void)_e;
+      SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void());
+      SWIG_fail;
+    }
+  }
+  
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__PySwigIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_PySwigIterator___sub____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  swig::PySwigIterator *arg1 = (swig::PySwigIterator *) 0 ;
+  swig::PySwigIterator *arg2 = 0 ;
+  ptrdiff_t result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:PySwigIterator___sub__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_swig__PySwigIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PySwigIterator___sub__" "', argument " "1"" of type '" "swig::PySwigIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< swig::PySwigIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_swig__PySwigIterator,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PySwigIterator___sub__" "', argument " "2"" of type '" "swig::PySwigIterator const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "PySwigIterator___sub__" "', argument " "2"" of type '" "swig::PySwigIterator const &""'"); 
+  }
+  arg2 = reinterpret_cast< swig::PySwigIterator * >(argp2);
+  result = ((swig::PySwigIterator const *)arg1)->operator -((swig::PySwigIterator const &)*arg2);
+  resultobj = SWIG_From_ptrdiff_t(static_cast< ptrdiff_t >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_PySwigIterator___sub__(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_swig__PySwigIterator, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_swig__PySwigIterator, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_PySwigIterator___sub____SWIG_1(self, args);
+      }
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_swig__PySwigIterator, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_ptrdiff_t(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_PySwigIterator___sub____SWIG_0(self, args);
+      }
+    }
+  }
+  
+fail:
+  Py_INCREF(Py_NotImplemented);
+  return Py_NotImplemented;
+}
+
+
+SWIGINTERN PyObject *PySwigIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_swig__PySwigIterator, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_vectorInt_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  PyObject **arg2 = (PyObject **) 0 ;
+  swig::PySwigIterator *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  arg2 = &obj0;
+  if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_iterator",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_iterator" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  result = (swig::PySwigIterator *)std_vector_Sl_int_Sg__iterator(arg1,arg2);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__PySwigIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt___nonzero__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:vectorInt___nonzero__",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___nonzero__" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  result = (bool)std_vector_Sl_int_Sg____nonzero__((std::vector<int > const *)arg1);
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt___len__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::size_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:vectorInt___len__",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___len__" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  result = std_vector_Sl_int_Sg____len__((std::vector<int > const *)arg1);
+  resultobj = SWIG_From_size_t(static_cast< size_t >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_pop",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_pop" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  try {
+    result = (std::vector<int >::value_type)std_vector_Sl_int_Sg__pop(arg1);
+  }
+  catch(std::out_of_range &_e) {
+    SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+  }
+  
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::difference_type arg2 ;
+  std::vector<int >::difference_type arg3 ;
+  std::vector<int,std::allocator<int > > *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  ptrdiff_t val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:vectorInt___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___getslice__" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt___getslice__" "', argument " "2"" of type '" "std::vector<int >::difference_type""'");
+  } 
+  arg2 = static_cast< std::vector<int >::difference_type >(val2);
+  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt___getslice__" "', argument " "3"" of type '" "std::vector<int >::difference_type""'");
+  } 
+  arg3 = static_cast< std::vector<int >::difference_type >(val3);
+  try {
+    result = (std::vector<int,std::allocator<int > > *)std_vector_Sl_int_Sg____getslice__(arg1,arg2,arg3);
+  }
+  catch(std::out_of_range &_e) {
+    SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+  }
+  
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt___setslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::difference_type arg2 ;
+  std::vector<int >::difference_type arg3 ;
+  std::vector<int,std::allocator<int > > *arg4 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  ptrdiff_t val3 ;
+  int ecode3 = 0 ;
+  int res4 = SWIG_OLDOBJ ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOO:vectorInt___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___setslice__" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt___setslice__" "', argument " "2"" of type '" "std::vector<int >::difference_type""'");
+  } 
+  arg2 = static_cast< std::vector<int >::difference_type >(val2);
+  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt___setslice__" "', argument " "3"" of type '" "std::vector<int >::difference_type""'");
+  } 
+  arg3 = static_cast< std::vector<int >::difference_type >(val3);
+  {
+    std::vector<int,std::allocator<int > > *ptr = (std::vector<int,std::allocator<int > > *)0;
+    res4 = swig::asptr(obj3, &ptr);
+    if (!SWIG_IsOK(res4)) {
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vectorInt___setslice__" "', argument " "4"" of type '" "std::vector<int,std::allocator<int > > const &""'"); 
+    }
+    if (!ptr) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vectorInt___setslice__" "', argument " "4"" of type '" "std::vector<int,std::allocator<int > > const &""'"); 
+    }
+    arg4 = ptr;
+  }
+  try {
+    std_vector_Sl_int_Sg____setslice__(arg1,arg2,arg3,(std::vector<int,std::allocator<int > > const &)*arg4);
+  }
+  catch(std::out_of_range &_e) {
+    SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+  }
+  catch(std::invalid_argument &_e) {
+    SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
+  }
+  
+  resultobj = SWIG_Py_Void();
+  if (SWIG_IsNewObj(res4)) delete arg4;
+  return resultobj;
+fail:
+  if (SWIG_IsNewObj(res4)) delete arg4;
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt___delslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::difference_type arg2 ;
+  std::vector<int >::difference_type arg3 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  ptrdiff_t val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:vectorInt___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___delslice__" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt___delslice__" "', argument " "2"" of type '" "std::vector<int >::difference_type""'");
+  } 
+  arg2 = static_cast< std::vector<int >::difference_type >(val2);
+  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt___delslice__" "', argument " "3"" of type '" "std::vector<int >::difference_type""'");
+  } 
+  arg3 = static_cast< std::vector<int >::difference_type >(val3);
+  try {
+    std_vector_Sl_int_Sg____delslice__(arg1,arg2,arg3);
+  }
+  catch(std::out_of_range &_e) {
+    SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+  }
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt___delitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::difference_type arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:vectorInt___delitem__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___delitem__" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt___delitem__" "', argument " "2"" of type '" "std::vector<int >::difference_type""'");
+  } 
+  arg2 = static_cast< std::vector<int >::difference_type >(val2);
+  try {
+    std_vector_Sl_int_Sg____delitem__(arg1,arg2);
+  }
+  catch(std::out_of_range &_e) {
+    SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+  }
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt___getitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::difference_type arg2 ;
+  std::vector<int >::value_type *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:vectorInt___getitem__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___getitem__" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt___getitem__" "', argument " "2"" of type '" "std::vector<int >::difference_type""'");
+  } 
+  arg2 = static_cast< std::vector<int >::difference_type >(val2);
+  try {
+    {
+      std::vector<int >::value_type const &_result_ref = std_vector_Sl_int_Sg____getitem__((std::vector<int > const *)arg1,arg2);
+      result = (std::vector<int >::value_type *) &_result_ref;
+    }
+  }
+  catch(std::out_of_range &_e) {
+    SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+  }
+  
+  resultobj = SWIG_From_int(static_cast< int >(*result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt___setitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::difference_type arg2 ;
+  std::vector<int >::value_type *arg3 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  std::vector<int >::value_type temp3 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:vectorInt___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___setitem__" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt___setitem__" "', argument " "2"" of type '" "std::vector<int >::difference_type""'");
+  } 
+  arg2 = static_cast< std::vector<int >::difference_type >(val2);
+  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt___setitem__" "', argument " "3"" of type '" "std::vector<int >::value_type""'");
+  } 
+  temp3 = static_cast< std::vector<int >::value_type >(val3);
+  arg3 = &temp3;
+  try {
+    std_vector_Sl_int_Sg____setitem__(arg1,arg2,(int const &)*arg3);
+  }
+  catch(std::out_of_range &_e) {
+    SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+  }
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::value_type *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  std::vector<int >::value_type temp2 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:vectorInt_append",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_append" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt_append" "', argument " "2"" of type '" "std::vector<int >::value_type""'");
+  } 
+  temp2 = static_cast< std::vector<int >::value_type >(val2);
+  arg2 = &temp2;
+  std_vector_Sl_int_Sg__append(arg1,(int const &)*arg2);
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_vectorInt__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<int > *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_vectorInt")) SWIG_fail;
+  result = (std::vector<int > *)new std::vector<int >();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_vectorInt__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<int > *arg1 = 0 ;
+  std::vector<int > *result = 0 ;
+  int res1 = SWIG_OLDOBJ ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_vectorInt",&obj0)) SWIG_fail;
+  {
+    std::vector<int,std::allocator<int > > *ptr = (std::vector<int,std::allocator<int > > *)0;
+    res1 = swig::asptr(obj0, &ptr);
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_vectorInt" "', argument " "1"" of type '" "std::vector<int > const &""'"); 
+    }
+    if (!ptr) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_vectorInt" "', argument " "1"" of type '" "std::vector<int > const &""'"); 
+    }
+    arg1 = ptr;
+  }
+  result = (std::vector<int > *)new std::vector<int >((std::vector<int > const &)*arg1);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, SWIG_POINTER_NEW |  0 );
+  if (SWIG_IsNewObj(res1)) delete arg1;
+  return resultobj;
+fail:
+  if (SWIG_IsNewObj(res1)) delete arg1;
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_empty",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_empty" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  result = (bool)((std::vector<int > const *)arg1)->empty();
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::size_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_size",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_size" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  result = ((std::vector<int > const *)arg1)->size();
+  resultobj = SWIG_From_size_t(static_cast< size_t >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_clear",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_clear" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  (arg1)->clear();
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int > *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:vectorInt_swap",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_swap" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vectorInt_swap" "', argument " "2"" of type '" "std::vector<int > &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vectorInt_swap" "', argument " "2"" of type '" "std::vector<int > &""'"); 
+  }
+  arg2 = reinterpret_cast< std::vector<int > * >(argp2);
+  (arg1)->swap(*arg2);
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  SwigValueWrapper<std::allocator<int > > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_get_allocator",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_get_allocator" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  result = ((std::vector<int > const *)arg1)->get_allocator();
+  resultobj = SWIG_NewPointerObj((new std::vector<int >::allocator_type(static_cast< const std::vector<int >::allocator_type& >(result))), SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt_begin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_begin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_begin" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  result = (arg1)->begin();
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<int >::iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt_begin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_begin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_begin" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  result = ((std::vector<int > const *)arg1)->begin();
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<int >::const_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt_begin(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_vectorInt_begin__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_vectorInt_begin__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'vectorInt_begin'.\n  Possible C/C++ prototypes are:\n    begin()\n    begin()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_end",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_end" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  result = (arg1)->end();
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<int >::iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_end",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_end" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  result = ((std::vector<int > const *)arg1)->end();
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<int >::const_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt_end(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_vectorInt_end__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_vectorInt_end__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'vectorInt_end'.\n  Possible C/C++ prototypes are:\n    end()\n    end()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt_rbegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::reverse_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_rbegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_rbegin" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  result = (arg1)->rbegin();
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<int >::reverse_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt_rbegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::const_reverse_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_rbegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_rbegin" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  result = ((std::vector<int > const *)arg1)->rbegin();
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<int >::const_reverse_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt_rbegin(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_vectorInt_rbegin__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_vectorInt_rbegin__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'vectorInt_rbegin'.\n  Possible C/C++ prototypes are:\n    rbegin()\n    rbegin()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt_rend__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::reverse_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_rend",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_rend" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  result = (arg1)->rend();
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<int >::reverse_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt_rend__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::const_reverse_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_rend",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_rend" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  result = ((std::vector<int > const *)arg1)->rend();
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<int >::const_reverse_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt_rend(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_vectorInt_rend__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_vectorInt_rend__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'vectorInt_rend'.\n  Possible C/C++ prototypes are:\n    rend()\n    rend()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_vectorInt__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<int >::size_type arg1 ;
+  std::vector<int > *result = 0 ;
+  size_t val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_vectorInt",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vectorInt" "', argument " "1"" of type '" "std::vector<int >::size_type""'");
+  } 
+  arg1 = static_cast< std::vector<int >::size_type >(val1);
+  result = (std::vector<int > *)new std::vector<int >(arg1);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt_pop_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_pop_back",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_pop_back" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  (arg1)->pop_back();
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::size_type arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  size_t val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:vectorInt_resize",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_resize" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt_resize" "', argument " "2"" of type '" "std::vector<int >::size_type""'");
+  } 
+  arg2 = static_cast< std::vector<int >::size_type >(val2);
+  (arg1)->resize(arg2);
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::iterator arg2 ;
+  std::vector<int >::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  swig::PySwigIterator *iter2 = 0 ;
+  int res2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:vectorInt_erase",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_erase" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
+  if (!SWIG_IsOK(res2) || !iter2) {
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_erase" "', argument " "2"" of type '" "std::vector<int >::iterator""'");
+  } else {
+    swig::PySwigIterator_T<std::vector<int >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<int >::iterator > *>(iter2);
+    if (iter_t) {
+      arg2 = iter_t->get_current();
+    } else {
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_erase" "', argument " "2"" of type '" "std::vector<int >::iterator""'");
+    }
+  }
+  result = (arg1)->erase(arg2);
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<int >::iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::iterator arg2 ;
+  std::vector<int >::iterator arg3 ;
+  std::vector<int >::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  swig::PySwigIterator *iter2 = 0 ;
+  int res2 ;
+  swig::PySwigIterator *iter3 = 0 ;
+  int res3 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:vectorInt_erase",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_erase" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
+  if (!SWIG_IsOK(res2) || !iter2) {
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_erase" "', argument " "2"" of type '" "std::vector<int >::iterator""'");
+  } else {
+    swig::PySwigIterator_T<std::vector<int >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<int >::iterator > *>(iter2);
+    if (iter_t) {
+      arg2 = iter_t->get_current();
+    } else {
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_erase" "', argument " "2"" of type '" "std::vector<int >::iterator""'");
+    }
+  }
+  res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::PySwigIterator::descriptor(), 0);
+  if (!SWIG_IsOK(res3) || !iter3) {
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_erase" "', argument " "3"" of type '" "std::vector<int >::iterator""'");
+  } else {
+    swig::PySwigIterator_T<std::vector<int >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<int >::iterator > *>(iter3);
+    if (iter_t) {
+      arg3 = iter_t->get_current();
+    } else {
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_erase" "', argument " "3"" of type '" "std::vector<int >::iterator""'");
+    }
+  }
+  result = (arg1)->erase(arg2,arg3);
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<int >::iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt_erase(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      swig::PySwigIterator *iter = 0;
+      int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<int >::iterator > *>(iter) != 0));
+      if (_v) {
+        return _wrap_vectorInt_erase__SWIG_0(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      swig::PySwigIterator *iter = 0;
+      int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<int >::iterator > *>(iter) != 0));
+      if (_v) {
+        swig::PySwigIterator *iter = 0;
+        int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
+        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<int >::iterator > *>(iter) != 0));
+        if (_v) {
+          return _wrap_vectorInt_erase__SWIG_1(self, args);
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'vectorInt_erase'.\n  Possible C/C++ prototypes are:\n    erase(std::vector<int >::iterator)\n    erase(std::vector<int >::iterator,std::vector<int >::iterator)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_vectorInt__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<int >::size_type arg1 ;
+  std::vector<int >::value_type *arg2 = 0 ;
+  std::vector<int > *result = 0 ;
+  size_t val1 ;
+  int ecode1 = 0 ;
+  std::vector<int >::value_type temp2 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_vectorInt",&obj0,&obj1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vectorInt" "', argument " "1"" of type '" "std::vector<int >::size_type""'");
+  } 
+  arg1 = static_cast< std::vector<int >::size_type >(val1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_vectorInt" "', argument " "2"" of type '" "std::vector<int >::value_type""'");
+  } 
+  temp2 = static_cast< std::vector<int >::value_type >(val2);
+  arg2 = &temp2;
+  result = (std::vector<int > *)new std::vector<int >(arg1,(std::vector<int >::value_type const &)*arg2);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_vectorInt(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_vectorInt__SWIG_0(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_size_t(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_vectorInt__SWIG_2(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_new_vectorInt__SWIG_1(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    {
+      int res = SWIG_AsVal_size_t(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      {
+        int res = SWIG_AsVal_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_new_vectorInt__SWIG_3(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_vectorInt'.\n  Possible C/C++ prototypes are:\n    std::vector<(int)>()\n    std::vector<(int)>(std::vector<int > const &)\n    std::vector<(int)>(std::vector<int >::size_type)\n    std::vector<(int)>(std::vector<int >::size_type,std::vector<int >::value_type const &)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt_push_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::value_type *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  std::vector<int >::value_type temp2 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:vectorInt_push_back",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_push_back" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt_push_back" "', argument " "2"" of type '" "std::vector<int >::value_type""'");
+  } 
+  temp2 = static_cast< std::vector<int >::value_type >(val2);
+  arg2 = &temp2;
+  (arg1)->push_back((std::vector<int >::value_type const &)*arg2);
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt_front(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::value_type *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_front",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_front" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  {
+    std::vector<int >::value_type const &_result_ref = ((std::vector<int > const *)arg1)->front();
+    result = (std::vector<int >::value_type *) &_result_ref;
+  }
+  resultobj = SWIG_From_int(static_cast< int >(*result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::value_type *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_back",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_back" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  {
+    std::vector<int >::value_type const &_result_ref = ((std::vector<int > const *)arg1)->back();
+    result = (std::vector<int >::value_type *) &_result_ref;
+  }
+  resultobj = SWIG_From_int(static_cast< int >(*result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt_assign(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::size_type arg2 ;
+  std::vector<int >::value_type *arg3 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  size_t val2 ;
+  int ecode2 = 0 ;
+  std::vector<int >::value_type temp3 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:vectorInt_assign",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_assign" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt_assign" "', argument " "2"" of type '" "std::vector<int >::size_type""'");
+  } 
+  arg2 = static_cast< std::vector<int >::size_type >(val2);
+  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt_assign" "', argument " "3"" of type '" "std::vector<int >::value_type""'");
+  } 
+  temp3 = static_cast< std::vector<int >::value_type >(val3);
+  arg3 = &temp3;
+  (arg1)->assign(arg2,(std::vector<int >::value_type const &)*arg3);
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::size_type arg2 ;
+  std::vector<int >::value_type *arg3 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  size_t val2 ;
+  int ecode2 = 0 ;
+  std::vector<int >::value_type temp3 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:vectorInt_resize",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_resize" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt_resize" "', argument " "2"" of type '" "std::vector<int >::size_type""'");
+  } 
+  arg2 = static_cast< std::vector<int >::size_type >(val2);
+  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt_resize" "', argument " "3"" of type '" "std::vector<int >::value_type""'");
+  } 
+  temp3 = static_cast< std::vector<int >::value_type >(val3);
+  arg3 = &temp3;
+  (arg1)->resize(arg2,(std::vector<int >::value_type const &)*arg3);
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt_resize(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_size_t(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_vectorInt_resize__SWIG_0(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_size_t(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          return _wrap_vectorInt_resize__SWIG_1(self, args);
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'vectorInt_resize'.\n  Possible C/C++ prototypes are:\n    resize(std::vector<int >::size_type)\n    resize(std::vector<int >::size_type,std::vector<int >::value_type const &)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::iterator arg2 ;
+  std::vector<int >::value_type *arg3 = 0 ;
+  std::vector<int >::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  swig::PySwigIterator *iter2 = 0 ;
+  int res2 ;
+  std::vector<int >::value_type temp3 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:vectorInt_insert",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_insert" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
+  if (!SWIG_IsOK(res2) || !iter2) {
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_insert" "', argument " "2"" of type '" "std::vector<int >::iterator""'");
+  } else {
+    swig::PySwigIterator_T<std::vector<int >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<int >::iterator > *>(iter2);
+    if (iter_t) {
+      arg2 = iter_t->get_current();
+    } else {
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_insert" "', argument " "2"" of type '" "std::vector<int >::iterator""'");
+    }
+  }
+  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt_insert" "', argument " "3"" of type '" "std::vector<int >::value_type""'");
+  } 
+  temp3 = static_cast< std::vector<int >::value_type >(val3);
+  arg3 = &temp3;
+  result = (arg1)->insert(arg2,(std::vector<int >::value_type const &)*arg3);
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<int >::iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::iterator arg2 ;
+  std::vector<int >::size_type arg3 ;
+  std::vector<int >::value_type *arg4 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  swig::PySwigIterator *iter2 = 0 ;
+  int res2 ;
+  size_t val3 ;
+  int ecode3 = 0 ;
+  std::vector<int >::value_type temp4 ;
+  int val4 ;
+  int ecode4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOO:vectorInt_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_insert" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
+  if (!SWIG_IsOK(res2) || !iter2) {
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_insert" "', argument " "2"" of type '" "std::vector<int >::iterator""'");
+  } else {
+    swig::PySwigIterator_T<std::vector<int >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<int >::iterator > *>(iter2);
+    if (iter_t) {
+      arg2 = iter_t->get_current();
+    } else {
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_insert" "', argument " "2"" of type '" "std::vector<int >::iterator""'");
+    }
+  }
+  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt_insert" "', argument " "3"" of type '" "std::vector<int >::size_type""'");
+  } 
+  arg3 = static_cast< std::vector<int >::size_type >(val3);
+  ecode4 = SWIG_AsVal_int(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "vectorInt_insert" "', argument " "4"" of type '" "std::vector<int >::value_type""'");
+  } 
+  temp4 = static_cast< std::vector<int >::value_type >(val4);
+  arg4 = &temp4;
+  (arg1)->insert(arg2,arg3,(std::vector<int >::value_type const &)*arg4);
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt_insert(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[5];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 4); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 3) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      swig::PySwigIterator *iter = 0;
+      int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<int >::iterator > *>(iter) != 0));
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          return _wrap_vectorInt_insert__SWIG_0(self, args);
+        }
+      }
+    }
+  }
+  if (argc == 4) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      swig::PySwigIterator *iter = 0;
+      int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<int >::iterator > *>(iter) != 0));
+      if (_v) {
+        {
+          int res = SWIG_AsVal_size_t(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          {
+            int res = SWIG_AsVal_int(argv[3], NULL);
+            _v = SWIG_CheckState(res);
+          }
+          if (_v) {
+            return _wrap_vectorInt_insert__SWIG_1(self, args);
+          }
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'vectorInt_insert'.\n  Possible C/C++ prototypes are:\n    insert(std::vector<int >::iterator,std::vector<int >::value_type const &)\n    insert(std::vector<int >::iterator,std::vector<int >::size_type,std::vector<int >::value_type const &)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt_reserve(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::size_type arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  size_t val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:vectorInt_reserve",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_reserve" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt_reserve" "', argument " "2"" of type '" "std::vector<int >::size_type""'");
+  } 
+  arg2 = static_cast< std::vector<int >::size_type >(val2);
+  (arg1)->reserve(arg2);
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt_capacity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::size_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_capacity",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_capacity" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  result = ((std::vector<int > const *)arg1)->capacity();
+  resultobj = SWIG_From_size_t(static_cast< size_t >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_vectorInt(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_vectorInt",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_vectorInt" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *vectorInt_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_Id__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Id *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_Id")) SWIG_fail;
+  {
+    try {
+      result = (Id *)new Id();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Id, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Id__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Id::id_type arg1 ;
+  Id *result = 0 ;
+  unsigned int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_Id",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_unsigned_SS_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Id" "', argument " "1"" of type '" "Id::id_type""'");
+  } 
+  arg1 = static_cast< Id::id_type >(val1);
+  {
+    try {
+      result = (Id *)new Id(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Id, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Id__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Id::id_type arg1 ;
+  Id::id_type arg2 ;
+  Id *result = 0 ;
+  unsigned int val1 ;
+  int ecode1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_Id",&obj0,&obj1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_unsigned_SS_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Id" "', argument " "1"" of type '" "Id::id_type""'");
+  } 
+  arg1 = static_cast< Id::id_type >(val1);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Id" "', argument " "2"" of type '" "Id::id_type""'");
+  } 
+  arg2 = static_cast< Id::id_type >(val2);
+  {
+    try {
+      result = (Id *)new Id(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Id, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Id__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Id *arg1 = 0 ;
+  Id *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_Id",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_Id,  0  | 0);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_Id" "', argument " "1"" of type '" "Id const &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_Id" "', argument " "1"" of type '" "Id const &""'"); 
+  }
+  arg1 = reinterpret_cast< Id * >(argp1);
+  {
+    try {
+      result = (Id *)new Id((Id const &)*arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Id, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Id(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_Id__SWIG_0(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Id, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_new_Id__SWIG_3(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_unsigned_SS_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_Id__SWIG_1(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    {
+      int res = SWIG_AsVal_unsigned_SS_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      {
+        int res = SWIG_AsVal_unsigned_SS_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_new_Id__SWIG_2(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Id'.\n  Possible C/C++ prototypes are:\n    Id()\n    Id(Id::id_type)\n    Id(Id::id_type,Id::id_type)\n    Id(Id const &)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Id_getFirst(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Id *arg1 = (Id *) 0 ;
+  Id::id_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Id_getFirst",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Id, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Id_getFirst" "', argument " "1"" of type '" "Id const *""'"); 
+  }
+  arg1 = reinterpret_cast< Id * >(argp1);
+  {
+    try {
+      result = (Id::id_type)((Id const *)arg1)->getFirst();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Id_getSecond(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Id *arg1 = (Id *) 0 ;
+  Id::id_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Id_getSecond",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Id, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Id_getSecond" "', argument " "1"" of type '" "Id const *""'"); 
+  }
+  arg1 = reinterpret_cast< Id * >(argp1);
+  {
+    try {
+      result = (Id::id_type)((Id const *)arg1)->getSecond();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Id_setFirst(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Id *arg1 = (Id *) 0 ;
+  Id::id_type arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Id_setFirst",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Id, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Id_setFirst" "', argument " "1"" of type '" "Id *""'"); 
+  }
+  arg1 = reinterpret_cast< Id * >(argp1);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Id_setFirst" "', argument " "2"" of type '" "Id::id_type""'");
+  } 
+  arg2 = static_cast< Id::id_type >(val2);
+  {
+    try {
+      (arg1)->setFirst(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Id_setSecond(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Id *arg1 = (Id *) 0 ;
+  Id::id_type arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Id_setSecond",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Id, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Id_setSecond" "', argument " "1"" of type '" "Id *""'"); 
+  }
+  arg1 = reinterpret_cast< Id * >(argp1);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Id_setSecond" "', argument " "2"" of type '" "Id::id_type""'");
+  } 
+  arg2 = static_cast< Id::id_type >(val2);
+  {
+    try {
+      (arg1)->setSecond(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Id___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Id *arg1 = (Id *) 0 ;
+  Id *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Id___eq__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Id, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Id___eq__" "', argument " "1"" of type '" "Id const *""'"); 
+  }
+  arg1 = reinterpret_cast< Id * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Id,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Id___eq__" "', argument " "2"" of type '" "Id const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Id___eq__" "', argument " "2"" of type '" "Id const &""'"); 
+  }
+  arg2 = reinterpret_cast< Id * >(argp2);
+  {
+    try {
+      result = (bool)((Id const *)arg1)->operator ==((Id const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Id___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Id *arg1 = (Id *) 0 ;
+  Id *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Id___ne__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Id, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Id___ne__" "', argument " "1"" of type '" "Id const *""'"); 
+  }
+  arg1 = reinterpret_cast< Id * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Id,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Id___ne__" "', argument " "2"" of type '" "Id const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Id___ne__" "', argument " "2"" of type '" "Id const &""'"); 
+  }
+  arg2 = reinterpret_cast< Id * >(argp2);
+  {
+    try {
+      result = (bool)((Id const *)arg1)->operator !=((Id const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Id___lt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Id *arg1 = (Id *) 0 ;
+  Id *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Id___lt__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Id, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Id___lt__" "', argument " "1"" of type '" "Id const *""'"); 
+  }
+  arg1 = reinterpret_cast< Id * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Id,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Id___lt__" "', argument " "2"" of type '" "Id const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Id___lt__" "', argument " "2"" of type '" "Id const &""'"); 
+  }
+  arg2 = reinterpret_cast< Id * >(argp2);
+  {
+    try {
+      result = (bool)((Id const *)arg1)->operator <((Id const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_Id(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Id *arg1 = (Id *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_Id",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Id, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Id" "', argument " "1"" of type '" "Id *""'"); 
+  }
+  arg1 = reinterpret_cast< Id * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *Id_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Id, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_Vec_2u(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<unsigned int,2 > *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_Vec_2u")) SWIG_fail;
+  {
+    try {
+      result = (VecMat::Vec<unsigned int,2 > *)new VecMat::Vec<unsigned int,2 >();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_Vec_2u(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec_2u",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_2u" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2u_dim(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  unsigned int result;
+  
+  if (!PyArg_ParseTuple(args,(char *)":Vec_2u_dim")) SWIG_fail;
+  {
+    try {
+      result = (unsigned int)VecMat::Vec<unsigned int,2 >::SWIGTEMPLATEDISAMBIGUATOR dim();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2u_norm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
+  VecMat::Vec<unsigned int,2 >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec_2u_norm",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u_norm" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
+  {
+    try {
+      result = (VecMat::Vec<unsigned int,2 >::value_type)((VecMat::Vec<unsigned int,2 > const *)arg1)->norm();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2u_squareNorm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
+  VecMat::Vec<unsigned int,2 >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec_2u_squareNorm",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u_squareNorm" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
+  {
+    try {
+      result = (VecMat::Vec<unsigned int,2 >::value_type)((VecMat::Vec<unsigned int,2 > const *)arg1)->squareNorm();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2u_normalize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
+  VecMat::Vec<unsigned int,2 > *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec_2u_normalize",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u_normalize" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
+  {
+    try {
+      {
+        VecMat::Vec<unsigned int,2 > &_result_ref = (arg1)->normalize();
+        result = (VecMat::Vec<unsigned int,2 > *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2u_normalizeSafe(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
+  VecMat::Vec<unsigned int,2 > *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec_2u_normalizeSafe",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
+  {
+    try {
+      {
+        VecMat::Vec<unsigned int,2 > &_result_ref = (arg1)->normalizeSafe();
+        result = (VecMat::Vec<unsigned int,2 > *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2u___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
+  VecMat::Vec<unsigned int,2 > *arg2 = 0 ;
+  VecMat::Vec<unsigned int,2 > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2u___add__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___add__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_2_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___add__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___add__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp2);
+  {
+    try {
+      result = ((VecMat::Vec<unsigned int,2 > const *)arg1)->operator +((VecMat::Vec<unsigned int,2 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<unsigned int,2 >(static_cast< const VecMat::Vec<unsigned int,2 >& >(result))), SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2u___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
+  VecMat::Vec<unsigned int,2 > *arg2 = 0 ;
+  VecMat::Vec<unsigned int,2 > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2u___sub__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___sub__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_2_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___sub__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___sub__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp2);
+  {
+    try {
+      result = ((VecMat::Vec<unsigned int,2 > const *)arg1)->operator -((VecMat::Vec<unsigned int,2 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<unsigned int,2 >(static_cast< const VecMat::Vec<unsigned int,2 >& >(result))), SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2u___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
+  VecMat::Vec<unsigned int,2 >::value_type arg2 ;
+  VecMat::Vec<unsigned int,2 > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2u___mul__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___mul__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2u___mul__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec<unsigned int,2 >::value_type >(val2);
+  {
+    try {
+      result = ((VecMat::Vec<unsigned int,2 > const *)arg1)->operator *(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<unsigned int,2 >(static_cast< const VecMat::Vec<unsigned int,2 >& >(result))), SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2u___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
+  VecMat::Vec<unsigned int,2 >::value_type arg2 ;
+  VecMat::Vec<unsigned int,2 > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2u___div__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___div__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2u___div__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec<unsigned int,2 >::value_type >(val2);
+  {
+    try {
+      result = ((VecMat::Vec<unsigned int,2 > const *)arg1)->operator /(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<unsigned int,2 >(static_cast< const VecMat::Vec<unsigned int,2 >& >(result))), SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2u___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
+  VecMat::Vec<unsigned int,2 > *arg2 = 0 ;
+  VecMat::Vec<unsigned int,2 >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2u___mul__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___mul__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_2_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___mul__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___mul__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp2);
+  {
+    try {
+      result = (VecMat::Vec<unsigned int,2 >::value_type)((VecMat::Vec<unsigned int,2 > const *)arg1)->operator *((VecMat::Vec<unsigned int,2 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2u___mul__(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_Vec_2u___mul____SWIG_1(self, args);
+      }
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_unsigned_SS_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_Vec_2u___mul____SWIG_0(self, args);
+      }
+    }
+  }
+  
+fail:
+  Py_INCREF(Py_NotImplemented);
+  return Py_NotImplemented;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2u___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
+  VecMat::Vec<unsigned int,2 > *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2u___eq__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___eq__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_2_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___eq__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___eq__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp2);
+  {
+    try {
+      result = (bool)((VecMat::Vec<unsigned int,2 > const *)arg1)->operator ==((VecMat::Vec<unsigned int,2 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2u___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
+  VecMat::Vec<unsigned int,2 > *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2u___ne__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___ne__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_2_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___ne__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___ne__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp2);
+  {
+    try {
+      result = (bool)((VecMat::Vec<unsigned int,2 > const *)arg1)->operator !=((VecMat::Vec<unsigned int,2 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2u___lt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
+  VecMat::Vec<unsigned int,2 > *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2u___lt__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___lt__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_2_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___lt__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___lt__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp2);
+  {
+    try {
+      result = (bool)((VecMat::Vec<unsigned int,2 > const *)arg1)->operator <((VecMat::Vec<unsigned int,2 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2u___gt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
+  VecMat::Vec<unsigned int,2 > *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2u___gt__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___gt__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_2_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___gt__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___gt__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp2);
+  {
+    try {
+      result = (bool)((VecMat::Vec<unsigned int,2 > const *)arg1)->operator >((VecMat::Vec<unsigned int,2 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *Vec_2u_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_Vec_2i(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<int,2 > *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_Vec_2i")) SWIG_fail;
+  {
+    try {
+      result = (VecMat::Vec<int,2 > *)new VecMat::Vec<int,2 >();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTint_2_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_Vec_2i(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec_2i",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_2i" "', argument " "1"" of type '" "VecMat::Vec<int,2 > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2i_dim(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  unsigned int result;
+  
+  if (!PyArg_ParseTuple(args,(char *)":Vec_2i_dim")) SWIG_fail;
+  {
+    try {
+      result = (unsigned int)VecMat::Vec<int,2 >::SWIGTEMPLATEDISAMBIGUATOR dim();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2i_norm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
+  VecMat::Vec<int,2 >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec_2i_norm",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i_norm" "', argument " "1"" of type '" "VecMat::Vec<int,2 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
+  {
+    try {
+      result = (VecMat::Vec<int,2 >::value_type)((VecMat::Vec<int,2 > const *)arg1)->norm();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2i_squareNorm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
+  VecMat::Vec<int,2 >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec_2i_squareNorm",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i_squareNorm" "', argument " "1"" of type '" "VecMat::Vec<int,2 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
+  {
+    try {
+      result = (VecMat::Vec<int,2 >::value_type)((VecMat::Vec<int,2 > const *)arg1)->squareNorm();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2i_normalize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
+  VecMat::Vec<int,2 > *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec_2i_normalize",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i_normalize" "', argument " "1"" of type '" "VecMat::Vec<int,2 > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
+  {
+    try {
+      {
+        VecMat::Vec<int,2 > &_result_ref = (arg1)->normalize();
+        result = (VecMat::Vec<int,2 > *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2i_normalizeSafe(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
+  VecMat::Vec<int,2 > *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec_2i_normalizeSafe",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec<int,2 > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
+  {
+    try {
+      {
+        VecMat::Vec<int,2 > &_result_ref = (arg1)->normalizeSafe();
+        result = (VecMat::Vec<int,2 > *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2i___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
+  VecMat::Vec<int,2 > *arg2 = 0 ;
+  VecMat::Vec<int,2 > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2i___add__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___add__" "', argument " "1"" of type '" "VecMat::Vec<int,2 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_2_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___add__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___add__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp2);
+  {
+    try {
+      result = ((VecMat::Vec<int,2 > const *)arg1)->operator +((VecMat::Vec<int,2 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<int,2 >(static_cast< const VecMat::Vec<int,2 >& >(result))), SWIGTYPE_p_VecMat__VecTint_2_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2i___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
+  VecMat::Vec<int,2 > *arg2 = 0 ;
+  VecMat::Vec<int,2 > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2i___sub__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___sub__" "', argument " "1"" of type '" "VecMat::Vec<int,2 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_2_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___sub__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___sub__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp2);
+  {
+    try {
+      result = ((VecMat::Vec<int,2 > const *)arg1)->operator -((VecMat::Vec<int,2 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<int,2 >(static_cast< const VecMat::Vec<int,2 >& >(result))), SWIGTYPE_p_VecMat__VecTint_2_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2i___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
+  VecMat::Vec<int,2 >::value_type arg2 ;
+  VecMat::Vec<int,2 > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2i___mul__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___mul__" "', argument " "1"" of type '" "VecMat::Vec<int,2 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2i___mul__" "', argument " "2"" of type '" "VecMat::Vec<int,2 >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec<int,2 >::value_type >(val2);
+  {
+    try {
+      result = ((VecMat::Vec<int,2 > const *)arg1)->operator *(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<int,2 >(static_cast< const VecMat::Vec<int,2 >& >(result))), SWIGTYPE_p_VecMat__VecTint_2_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2i___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
+  VecMat::Vec<int,2 >::value_type arg2 ;
+  VecMat::Vec<int,2 > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2i___div__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___div__" "', argument " "1"" of type '" "VecMat::Vec<int,2 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2i___div__" "', argument " "2"" of type '" "VecMat::Vec<int,2 >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec<int,2 >::value_type >(val2);
+  {
+    try {
+      result = ((VecMat::Vec<int,2 > const *)arg1)->operator /(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<int,2 >(static_cast< const VecMat::Vec<int,2 >& >(result))), SWIGTYPE_p_VecMat__VecTint_2_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2i___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
+  VecMat::Vec<int,2 > *arg2 = 0 ;
+  VecMat::Vec<int,2 >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2i___mul__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___mul__" "', argument " "1"" of type '" "VecMat::Vec<int,2 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_2_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___mul__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___mul__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp2);
+  {
+    try {
+      result = (VecMat::Vec<int,2 >::value_type)((VecMat::Vec<int,2 > const *)arg1)->operator *((VecMat::Vec<int,2 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2i___mul__(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTint_2_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecTint_2_t, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_Vec_2i___mul____SWIG_1(self, args);
+      }
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTint_2_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_Vec_2i___mul____SWIG_0(self, args);
+      }
+    }
+  }
+  
+fail:
+  Py_INCREF(Py_NotImplemented);
+  return Py_NotImplemented;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2i___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
+  VecMat::Vec<int,2 > *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2i___eq__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___eq__" "', argument " "1"" of type '" "VecMat::Vec<int,2 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_2_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___eq__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___eq__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp2);
+  {
+    try {
+      result = (bool)((VecMat::Vec<int,2 > const *)arg1)->operator ==((VecMat::Vec<int,2 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2i___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
+  VecMat::Vec<int,2 > *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2i___ne__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___ne__" "', argument " "1"" of type '" "VecMat::Vec<int,2 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_2_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___ne__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___ne__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp2);
+  {
+    try {
+      result = (bool)((VecMat::Vec<int,2 > const *)arg1)->operator !=((VecMat::Vec<int,2 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2i___lt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
+  VecMat::Vec<int,2 > *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2i___lt__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___lt__" "', argument " "1"" of type '" "VecMat::Vec<int,2 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_2_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___lt__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___lt__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp2);
+  {
+    try {
+      result = (bool)((VecMat::Vec<int,2 > const *)arg1)->operator <((VecMat::Vec<int,2 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2i___gt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
+  VecMat::Vec<int,2 > *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2i___gt__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___gt__" "', argument " "1"" of type '" "VecMat::Vec<int,2 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_2_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___gt__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___gt__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp2);
+  {
+    try {
+      result = (bool)((VecMat::Vec<int,2 > const *)arg1)->operator >((VecMat::Vec<int,2 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *Vec_2i_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecTint_2_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_Vec_2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<double,2 > *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_Vec_2d")) SWIG_fail;
+  {
+    try {
+      result = (VecMat::Vec<double,2 > *)new VecMat::Vec<double,2 >();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTdouble_2_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_Vec_2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec_2d",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_2d" "', argument " "1"" of type '" "VecMat::Vec<double,2 > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2d_dim(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  unsigned int result;
+  
+  if (!PyArg_ParseTuple(args,(char *)":Vec_2d_dim")) SWIG_fail;
+  {
+    try {
+      result = (unsigned int)VecMat::Vec<double,2 >::SWIGTEMPLATEDISAMBIGUATOR dim();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2d_norm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
+  VecMat::Vec<double,2 >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec_2d_norm",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d_norm" "', argument " "1"" of type '" "VecMat::Vec<double,2 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
+  {
+    try {
+      result = (VecMat::Vec<double,2 >::value_type)((VecMat::Vec<double,2 > const *)arg1)->norm();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2d_squareNorm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
+  VecMat::Vec<double,2 >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec_2d_squareNorm",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d_squareNorm" "', argument " "1"" of type '" "VecMat::Vec<double,2 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
+  {
+    try {
+      result = (VecMat::Vec<double,2 >::value_type)((VecMat::Vec<double,2 > const *)arg1)->squareNorm();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2d_normalize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
+  VecMat::Vec<double,2 > *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec_2d_normalize",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d_normalize" "', argument " "1"" of type '" "VecMat::Vec<double,2 > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
+  {
+    try {
+      {
+        VecMat::Vec<double,2 > &_result_ref = (arg1)->normalize();
+        result = (VecMat::Vec<double,2 > *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2d_normalizeSafe(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
+  VecMat::Vec<double,2 > *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec_2d_normalizeSafe",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec<double,2 > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
+  {
+    try {
+      {
+        VecMat::Vec<double,2 > &_result_ref = (arg1)->normalizeSafe();
+        result = (VecMat::Vec<double,2 > *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2d___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
+  VecMat::Vec<double,2 > *arg2 = 0 ;
+  VecMat::Vec<double,2 > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2d___add__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___add__" "', argument " "1"" of type '" "VecMat::Vec<double,2 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_2_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___add__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___add__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp2);
+  {
+    try {
+      result = ((VecMat::Vec<double,2 > const *)arg1)->operator +((VecMat::Vec<double,2 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<double,2 >(static_cast< const VecMat::Vec<double,2 >& >(result))), SWIGTYPE_p_VecMat__VecTdouble_2_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2d___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
+  VecMat::Vec<double,2 > *arg2 = 0 ;
+  VecMat::Vec<double,2 > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2d___sub__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___sub__" "', argument " "1"" of type '" "VecMat::Vec<double,2 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_2_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___sub__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___sub__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp2);
+  {
+    try {
+      result = ((VecMat::Vec<double,2 > const *)arg1)->operator -((VecMat::Vec<double,2 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<double,2 >(static_cast< const VecMat::Vec<double,2 >& >(result))), SWIGTYPE_p_VecMat__VecTdouble_2_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2d___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
+  VecMat::Vec<double,2 >::value_type arg2 ;
+  VecMat::Vec<double,2 > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2d___mul__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___mul__" "', argument " "1"" of type '" "VecMat::Vec<double,2 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
+  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2d___mul__" "', argument " "2"" of type '" "VecMat::Vec<double,2 >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec<double,2 >::value_type >(val2);
+  {
+    try {
+      result = ((VecMat::Vec<double,2 > const *)arg1)->operator *(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<double,2 >(static_cast< const VecMat::Vec<double,2 >& >(result))), SWIGTYPE_p_VecMat__VecTdouble_2_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2d___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
+  VecMat::Vec<double,2 >::value_type arg2 ;
+  VecMat::Vec<double,2 > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2d___div__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___div__" "', argument " "1"" of type '" "VecMat::Vec<double,2 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
+  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2d___div__" "', argument " "2"" of type '" "VecMat::Vec<double,2 >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec<double,2 >::value_type >(val2);
+  {
+    try {
+      result = ((VecMat::Vec<double,2 > const *)arg1)->operator /(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<double,2 >(static_cast< const VecMat::Vec<double,2 >& >(result))), SWIGTYPE_p_VecMat__VecTdouble_2_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2d___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
+  VecMat::Vec<double,2 > *arg2 = 0 ;
+  VecMat::Vec<double,2 >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2d___mul__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___mul__" "', argument " "1"" of type '" "VecMat::Vec<double,2 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_2_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___mul__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___mul__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp2);
+  {
+    try {
+      result = (VecMat::Vec<double,2 >::value_type)((VecMat::Vec<double,2 > const *)arg1)->operator *((VecMat::Vec<double,2 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2d___mul__(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTdouble_2_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecTdouble_2_t, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_Vec_2d___mul____SWIG_1(self, args);
+      }
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTdouble_2_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_double(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_Vec_2d___mul____SWIG_0(self, args);
+      }
+    }
+  }
+  
+fail:
+  Py_INCREF(Py_NotImplemented);
+  return Py_NotImplemented;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2d___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
+  VecMat::Vec<double,2 > *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2d___eq__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___eq__" "', argument " "1"" of type '" "VecMat::Vec<double,2 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_2_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___eq__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___eq__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp2);
+  {
+    try {
+      result = (bool)((VecMat::Vec<double,2 > const *)arg1)->operator ==((VecMat::Vec<double,2 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2d___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
+  VecMat::Vec<double,2 > *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2d___ne__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___ne__" "', argument " "1"" of type '" "VecMat::Vec<double,2 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_2_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___ne__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___ne__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp2);
+  {
+    try {
+      result = (bool)((VecMat::Vec<double,2 > const *)arg1)->operator !=((VecMat::Vec<double,2 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2d___lt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
+  VecMat::Vec<double,2 > *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2d___lt__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___lt__" "', argument " "1"" of type '" "VecMat::Vec<double,2 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_2_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___lt__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___lt__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp2);
+  {
+    try {
+      result = (bool)((VecMat::Vec<double,2 > const *)arg1)->operator <((VecMat::Vec<double,2 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2d___gt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
+  VecMat::Vec<double,2 > *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2d___gt__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___gt__" "', argument " "1"" of type '" "VecMat::Vec<double,2 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_2_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___gt__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___gt__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp2);
+  {
+    try {
+      result = (bool)((VecMat::Vec<double,2 > const *)arg1)->operator >((VecMat::Vec<double,2 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *Vec_2d_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecTdouble_2_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_Vec_2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<float,2 > *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_Vec_2f")) SWIG_fail;
+  {
+    try {
+      result = (VecMat::Vec<float,2 > *)new VecMat::Vec<float,2 >();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTfloat_2_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_Vec_2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec_2f",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_2f" "', argument " "1"" of type '" "VecMat::Vec<float,2 > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2f_dim(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  unsigned int result;
+  
+  if (!PyArg_ParseTuple(args,(char *)":Vec_2f_dim")) SWIG_fail;
+  {
+    try {
+      result = (unsigned int)VecMat::Vec<float,2 >::SWIGTEMPLATEDISAMBIGUATOR dim();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2f_norm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
+  VecMat::Vec<float,2 >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec_2f_norm",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f_norm" "', argument " "1"" of type '" "VecMat::Vec<float,2 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
+  {
+    try {
+      result = (VecMat::Vec<float,2 >::value_type)((VecMat::Vec<float,2 > const *)arg1)->norm();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2f_squareNorm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
+  VecMat::Vec<float,2 >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec_2f_squareNorm",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f_squareNorm" "', argument " "1"" of type '" "VecMat::Vec<float,2 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
+  {
+    try {
+      result = (VecMat::Vec<float,2 >::value_type)((VecMat::Vec<float,2 > const *)arg1)->squareNorm();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2f_normalize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
+  VecMat::Vec<float,2 > *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec_2f_normalize",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f_normalize" "', argument " "1"" of type '" "VecMat::Vec<float,2 > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
+  {
+    try {
+      {
+        VecMat::Vec<float,2 > &_result_ref = (arg1)->normalize();
+        result = (VecMat::Vec<float,2 > *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2f_normalizeSafe(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
+  VecMat::Vec<float,2 > *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec_2f_normalizeSafe",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec<float,2 > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
+  {
+    try {
+      {
+        VecMat::Vec<float,2 > &_result_ref = (arg1)->normalizeSafe();
+        result = (VecMat::Vec<float,2 > *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2f___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
+  VecMat::Vec<float,2 > *arg2 = 0 ;
+  VecMat::Vec<float,2 > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2f___add__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___add__" "', argument " "1"" of type '" "VecMat::Vec<float,2 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_2_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___add__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___add__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp2);
+  {
+    try {
+      result = ((VecMat::Vec<float,2 > const *)arg1)->operator +((VecMat::Vec<float,2 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<float,2 >(static_cast< const VecMat::Vec<float,2 >& >(result))), SWIGTYPE_p_VecMat__VecTfloat_2_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2f___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
+  VecMat::Vec<float,2 > *arg2 = 0 ;
+  VecMat::Vec<float,2 > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2f___sub__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___sub__" "', argument " "1"" of type '" "VecMat::Vec<float,2 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_2_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___sub__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___sub__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp2);
+  {
+    try {
+      result = ((VecMat::Vec<float,2 > const *)arg1)->operator -((VecMat::Vec<float,2 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<float,2 >(static_cast< const VecMat::Vec<float,2 >& >(result))), SWIGTYPE_p_VecMat__VecTfloat_2_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2f___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
+  VecMat::Vec<float,2 >::value_type arg2 ;
+  VecMat::Vec<float,2 > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2f___mul__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___mul__" "', argument " "1"" of type '" "VecMat::Vec<float,2 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2f___mul__" "', argument " "2"" of type '" "VecMat::Vec<float,2 >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec<float,2 >::value_type >(val2);
+  {
+    try {
+      result = ((VecMat::Vec<float,2 > const *)arg1)->operator *(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<float,2 >(static_cast< const VecMat::Vec<float,2 >& >(result))), SWIGTYPE_p_VecMat__VecTfloat_2_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2f___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
+  VecMat::Vec<float,2 >::value_type arg2 ;
+  VecMat::Vec<float,2 > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2f___div__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___div__" "', argument " "1"" of type '" "VecMat::Vec<float,2 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2f___div__" "', argument " "2"" of type '" "VecMat::Vec<float,2 >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec<float,2 >::value_type >(val2);
+  {
+    try {
+      result = ((VecMat::Vec<float,2 > const *)arg1)->operator /(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<float,2 >(static_cast< const VecMat::Vec<float,2 >& >(result))), SWIGTYPE_p_VecMat__VecTfloat_2_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2f___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
+  VecMat::Vec<float,2 > *arg2 = 0 ;
+  VecMat::Vec<float,2 >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2f___mul__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___mul__" "', argument " "1"" of type '" "VecMat::Vec<float,2 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_2_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___mul__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___mul__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp2);
+  {
+    try {
+      result = (VecMat::Vec<float,2 >::value_type)((VecMat::Vec<float,2 > const *)arg1)->operator *((VecMat::Vec<float,2 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2f___mul__(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTfloat_2_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecTfloat_2_t, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_Vec_2f___mul____SWIG_1(self, args);
+      }
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTfloat_2_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_float(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_Vec_2f___mul____SWIG_0(self, args);
+      }
+    }
+  }
+  
+fail:
+  Py_INCREF(Py_NotImplemented);
+  return Py_NotImplemented;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2f___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
+  VecMat::Vec<float,2 > *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2f___eq__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___eq__" "', argument " "1"" of type '" "VecMat::Vec<float,2 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_2_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___eq__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___eq__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp2);
+  {
+    try {
+      result = (bool)((VecMat::Vec<float,2 > const *)arg1)->operator ==((VecMat::Vec<float,2 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2f___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
+  VecMat::Vec<float,2 > *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2f___ne__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___ne__" "', argument " "1"" of type '" "VecMat::Vec<float,2 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_2_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___ne__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___ne__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp2);
+  {
+    try {
+      result = (bool)((VecMat::Vec<float,2 > const *)arg1)->operator !=((VecMat::Vec<float,2 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2f___lt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
+  VecMat::Vec<float,2 > *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2f___lt__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___lt__" "', argument " "1"" of type '" "VecMat::Vec<float,2 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_2_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___lt__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___lt__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp2);
+  {
+    try {
+      result = (bool)((VecMat::Vec<float,2 > const *)arg1)->operator <((VecMat::Vec<float,2 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_2f___gt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
+  VecMat::Vec<float,2 > *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2f___gt__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___gt__" "', argument " "1"" of type '" "VecMat::Vec<float,2 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_2_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___gt__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___gt__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp2);
+  {
+    try {
+      result = (bool)((VecMat::Vec<float,2 > const *)arg1)->operator >((VecMat::Vec<float,2 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *Vec_2f_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecTfloat_2_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_Vec2u__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<unsigned int > *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_Vec2u")) SWIG_fail;
+  {
+    try {
+      result = (VecMat::Vec2<unsigned int > *)new VecMat::Vec2<unsigned int >();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Vec2u__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<unsigned int >::value_type arg1 ;
+  VecMat::Vec2<unsigned int >::value_type arg2 ;
+  VecMat::Vec2<unsigned int > *result = 0 ;
+  unsigned int val1 ;
+  int ecode1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_Vec2u",&obj0,&obj1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_unsigned_SS_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2u" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int >::value_type""'");
+  } 
+  arg1 = static_cast< VecMat::Vec2<unsigned int >::value_type >(val1);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec2u" "', argument " "2"" of type '" "VecMat::Vec2<unsigned int >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec2<unsigned int >::value_type >(val2);
+  {
+    try {
+      result = (VecMat::Vec2<unsigned int > *)new VecMat::Vec2<unsigned int >(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Vec2u__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<unsigned int >::value_type arg1 ;
+  VecMat::Vec2<unsigned int > *result = 0 ;
+  unsigned int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_Vec2u",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_unsigned_SS_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2u" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int >::value_type""'");
+  } 
+  arg1 = static_cast< VecMat::Vec2<unsigned int >::value_type >(val1);
+  {
+    try {
+      result = (VecMat::Vec2<unsigned int > *)new VecMat::Vec2<unsigned int >(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Vec2u(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_Vec2u__SWIG_0(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_unsigned_SS_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_Vec2u__SWIG_2(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    {
+      int res = SWIG_AsVal_unsigned_SS_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      {
+        int res = SWIG_AsVal_unsigned_SS_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_new_Vec2u__SWIG_1(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec2u'.\n  Possible C/C++ prototypes are:\n    VecMat::Vec2<(unsigned int)>()\n    VecMat::Vec2<(unsigned int)>(VecMat::Vec2<unsigned int >::value_type const,VecMat::Vec2<unsigned int >::value_type const)\n    VecMat::Vec2<(unsigned int)>(VecMat::Vec2<unsigned int >::value_type const)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2u_x__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
+  VecMat::Vec2<unsigned int >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec2u_x",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u_x" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
+  {
+    try {
+      result = (VecMat::Vec2<unsigned int >::value_type)((VecMat::Vec2<unsigned int > const *)arg1)->x();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2u_x__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
+  VecMat::Vec2<unsigned int >::value_type *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec2u_x",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u_x" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
+  {
+    try {
+      {
+        VecMat::Vec2<unsigned int >::value_type &_result_ref = (arg1)->x();
+        result = (VecMat::Vec2<unsigned int >::value_type *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_unsigned_int, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2u_x(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Vec2u_x__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Vec2u_x__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2u_x'.\n  Possible C/C++ prototypes are:\n    x()\n    x()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2u_y__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
+  VecMat::Vec2<unsigned int >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec2u_y",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u_y" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
+  {
+    try {
+      result = (VecMat::Vec2<unsigned int >::value_type)((VecMat::Vec2<unsigned int > const *)arg1)->y();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2u_y__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
+  VecMat::Vec2<unsigned int >::value_type *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec2u_y",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u_y" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
+  {
+    try {
+      {
+        VecMat::Vec2<unsigned int >::value_type &_result_ref = (arg1)->y();
+        result = (VecMat::Vec2<unsigned int >::value_type *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_unsigned_int, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2u_y(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Vec2u_y__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Vec2u_y__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2u_y'.\n  Possible C/C++ prototypes are:\n    y()\n    y()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2u_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
+  VecMat::Vec2<unsigned int >::value_type arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec2u_setX",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u_setX" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2u_setX" "', argument " "2"" of type '" "VecMat::Vec2<unsigned int >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec2<unsigned int >::value_type >(val2);
+  {
+    try {
+      (arg1)->setX(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2u_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
+  VecMat::Vec2<unsigned int >::value_type arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec2u_setY",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u_setY" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2u_setY" "', argument " "2"" of type '" "VecMat::Vec2<unsigned int >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec2<unsigned int >::value_type >(val2);
+  {
+    try {
+      (arg1)->setY(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2u___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
+  VecMat::Vec2<unsigned int > *arg2 = 0 ;
+  VecMat::Vec2<unsigned int > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec2u___add__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u___add__" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2u___add__" "', argument " "2"" of type '" "VecMat::Vec2<unsigned int > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2u___add__" "', argument " "2"" of type '" "VecMat::Vec2<unsigned int > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp2);
+  {
+    try {
+      result = ((VecMat::Vec2<unsigned int > const *)arg1)->operator +((VecMat::Vec2<unsigned int > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<unsigned int >(static_cast< const VecMat::Vec2<unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2u___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
+  VecMat::Vec2<unsigned int > *arg2 = 0 ;
+  VecMat::Vec2<unsigned int > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec2u___sub__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u___sub__" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2u___sub__" "', argument " "2"" of type '" "VecMat::Vec2<unsigned int > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2u___sub__" "', argument " "2"" of type '" "VecMat::Vec2<unsigned int > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp2);
+  {
+    try {
+      result = ((VecMat::Vec2<unsigned int > const *)arg1)->operator -((VecMat::Vec2<unsigned int > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<unsigned int >(static_cast< const VecMat::Vec2<unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2u___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
+  VecMat::Vec2<unsigned int >::value_type arg2 ;
+  VecMat::Vec2<unsigned int > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec2u___mul__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u___mul__" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2u___mul__" "', argument " "2"" of type '" "VecMat::Vec2<unsigned int >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec2<unsigned int >::value_type >(val2);
+  {
+    try {
+      result = ((VecMat::Vec2<unsigned int > const *)arg1)->operator *(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<unsigned int >(static_cast< const VecMat::Vec2<unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2u___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
+  VecMat::Vec2<unsigned int >::value_type arg2 ;
+  VecMat::Vec2<unsigned int > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec2u___div__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u___div__" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2u___div__" "', argument " "2"" of type '" "VecMat::Vec2<unsigned int >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec2<unsigned int >::value_type >(val2);
+  {
+    try {
+      result = ((VecMat::Vec2<unsigned int > const *)arg1)->operator /(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<unsigned int >(static_cast< const VecMat::Vec2<unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2u___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
+  VecMat::Vec2<unsigned int > *arg2 = 0 ;
+  VecMat::Vec2<unsigned int >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec2u___mul__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u___mul__" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2u___mul__" "', argument " "2"" of type '" "VecMat::Vec2<unsigned int > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2u___mul__" "', argument " "2"" of type '" "VecMat::Vec2<unsigned int > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp2);
+  {
+    try {
+      result = (VecMat::Vec2<unsigned int >::value_type)((VecMat::Vec2<unsigned int > const *)arg1)->operator *((VecMat::Vec2<unsigned int > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2u___mul__(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_Vec2u___mul____SWIG_1(self, args);
+      }
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_unsigned_SS_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_Vec2u___mul____SWIG_0(self, args);
+      }
+    }
+  }
+  
+fail:
+  Py_INCREF(Py_NotImplemented);
+  return Py_NotImplemented;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_Vec2u(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec2u",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec2u" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *Vec2u_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_Vec2i__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<int > *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_Vec2i")) SWIG_fail;
+  {
+    try {
+      result = (VecMat::Vec2<int > *)new VecMat::Vec2<int >();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tint_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Vec2i__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<int >::value_type arg1 ;
+  VecMat::Vec2<int >::value_type arg2 ;
+  VecMat::Vec2<int > *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_Vec2i",&obj0,&obj1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2i" "', argument " "1"" of type '" "VecMat::Vec2<int >::value_type""'");
+  } 
+  arg1 = static_cast< VecMat::Vec2<int >::value_type >(val1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec2i" "', argument " "2"" of type '" "VecMat::Vec2<int >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec2<int >::value_type >(val2);
+  {
+    try {
+      result = (VecMat::Vec2<int > *)new VecMat::Vec2<int >(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tint_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Vec2i__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<int >::value_type arg1 ;
+  VecMat::Vec2<int > *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_Vec2i",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2i" "', argument " "1"" of type '" "VecMat::Vec2<int >::value_type""'");
+  } 
+  arg1 = static_cast< VecMat::Vec2<int >::value_type >(val1);
+  {
+    try {
+      result = (VecMat::Vec2<int > *)new VecMat::Vec2<int >(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tint_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Vec2i(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_Vec2i__SWIG_0(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_Vec2i__SWIG_2(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    {
+      int res = SWIG_AsVal_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      {
+        int res = SWIG_AsVal_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_new_Vec2i__SWIG_1(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec2i'.\n  Possible C/C++ prototypes are:\n    VecMat::Vec2<(int)>()\n    VecMat::Vec2<(int)>(VecMat::Vec2<int >::value_type const,VecMat::Vec2<int >::value_type const)\n    VecMat::Vec2<(int)>(VecMat::Vec2<int >::value_type const)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2i_x__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
+  VecMat::Vec2<int >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec2i_x",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i_x" "', argument " "1"" of type '" "VecMat::Vec2<int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
+  {
+    try {
+      result = (VecMat::Vec2<int >::value_type)((VecMat::Vec2<int > const *)arg1)->x();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2i_x__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
+  VecMat::Vec2<int >::value_type *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec2i_x",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i_x" "', argument " "1"" of type '" "VecMat::Vec2<int > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
+  {
+    try {
+      {
+        VecMat::Vec2<int >::value_type &_result_ref = (arg1)->x();
+        result = (VecMat::Vec2<int >::value_type *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_int, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2i_x(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tint_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Vec2i_x__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tint_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Vec2i_x__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2i_x'.\n  Possible C/C++ prototypes are:\n    x()\n    x()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2i_y__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
+  VecMat::Vec2<int >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec2i_y",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i_y" "', argument " "1"" of type '" "VecMat::Vec2<int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
+  {
+    try {
+      result = (VecMat::Vec2<int >::value_type)((VecMat::Vec2<int > const *)arg1)->y();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2i_y__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
+  VecMat::Vec2<int >::value_type *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec2i_y",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i_y" "', argument " "1"" of type '" "VecMat::Vec2<int > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
+  {
+    try {
+      {
+        VecMat::Vec2<int >::value_type &_result_ref = (arg1)->y();
+        result = (VecMat::Vec2<int >::value_type *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_int, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2i_y(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tint_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Vec2i_y__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tint_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Vec2i_y__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2i_y'.\n  Possible C/C++ prototypes are:\n    y()\n    y()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2i_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
+  VecMat::Vec2<int >::value_type arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec2i_setX",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i_setX" "', argument " "1"" of type '" "VecMat::Vec2<int > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2i_setX" "', argument " "2"" of type '" "VecMat::Vec2<int >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec2<int >::value_type >(val2);
+  {
+    try {
+      (arg1)->setX(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2i_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
+  VecMat::Vec2<int >::value_type arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec2i_setY",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i_setY" "', argument " "1"" of type '" "VecMat::Vec2<int > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2i_setY" "', argument " "2"" of type '" "VecMat::Vec2<int >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec2<int >::value_type >(val2);
+  {
+    try {
+      (arg1)->setY(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2i___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
+  VecMat::Vec2<int > *arg2 = 0 ;
+  VecMat::Vec2<int > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec2i___add__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i___add__" "', argument " "1"" of type '" "VecMat::Vec2<int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tint_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2i___add__" "', argument " "2"" of type '" "VecMat::Vec2<int > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2i___add__" "', argument " "2"" of type '" "VecMat::Vec2<int > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec2<int > * >(argp2);
+  {
+    try {
+      result = ((VecMat::Vec2<int > const *)arg1)->operator +((VecMat::Vec2<int > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<int >(static_cast< const VecMat::Vec2<int >& >(result))), SWIGTYPE_p_VecMat__Vec2Tint_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2i___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
+  VecMat::Vec2<int > *arg2 = 0 ;
+  VecMat::Vec2<int > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec2i___sub__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i___sub__" "', argument " "1"" of type '" "VecMat::Vec2<int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tint_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2i___sub__" "', argument " "2"" of type '" "VecMat::Vec2<int > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2i___sub__" "', argument " "2"" of type '" "VecMat::Vec2<int > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec2<int > * >(argp2);
+  {
+    try {
+      result = ((VecMat::Vec2<int > const *)arg1)->operator -((VecMat::Vec2<int > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<int >(static_cast< const VecMat::Vec2<int >& >(result))), SWIGTYPE_p_VecMat__Vec2Tint_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2i___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
+  VecMat::Vec2<int >::value_type arg2 ;
+  VecMat::Vec2<int > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec2i___mul__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i___mul__" "', argument " "1"" of type '" "VecMat::Vec2<int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2i___mul__" "', argument " "2"" of type '" "VecMat::Vec2<int >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec2<int >::value_type >(val2);
+  {
+    try {
+      result = ((VecMat::Vec2<int > const *)arg1)->operator *(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<int >(static_cast< const VecMat::Vec2<int >& >(result))), SWIGTYPE_p_VecMat__Vec2Tint_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2i___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
+  VecMat::Vec2<int >::value_type arg2 ;
+  VecMat::Vec2<int > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec2i___div__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i___div__" "', argument " "1"" of type '" "VecMat::Vec2<int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2i___div__" "', argument " "2"" of type '" "VecMat::Vec2<int >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec2<int >::value_type >(val2);
+  {
+    try {
+      result = ((VecMat::Vec2<int > const *)arg1)->operator /(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<int >(static_cast< const VecMat::Vec2<int >& >(result))), SWIGTYPE_p_VecMat__Vec2Tint_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2i___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
+  VecMat::Vec2<int > *arg2 = 0 ;
+  VecMat::Vec2<int >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec2i___mul__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i___mul__" "', argument " "1"" of type '" "VecMat::Vec2<int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tint_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2i___mul__" "', argument " "2"" of type '" "VecMat::Vec2<int > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2i___mul__" "', argument " "2"" of type '" "VecMat::Vec2<int > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec2<int > * >(argp2);
+  {
+    try {
+      result = (VecMat::Vec2<int >::value_type)((VecMat::Vec2<int > const *)arg1)->operator *((VecMat::Vec2<int > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2i___mul__(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tint_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2Tint_t, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_Vec2i___mul____SWIG_1(self, args);
+      }
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tint_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_Vec2i___mul____SWIG_0(self, args);
+      }
+    }
+  }
+  
+fail:
+  Py_INCREF(Py_NotImplemented);
+  return Py_NotImplemented;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_Vec2i(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec2i",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec2i" "', argument " "1"" of type '" "VecMat::Vec2<int > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *Vec2i_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec2Tint_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_Vec2f__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<float > *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_Vec2f")) SWIG_fail;
+  {
+    try {
+      result = (VecMat::Vec2<float > *)new VecMat::Vec2<float >();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Vec2f__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<float >::value_type arg1 ;
+  VecMat::Vec2<float >::value_type arg2 ;
+  VecMat::Vec2<float > *result = 0 ;
+  float val1 ;
+  int ecode1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_Vec2f",&obj0,&obj1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_float(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2f" "', argument " "1"" of type '" "VecMat::Vec2<float >::value_type""'");
+  } 
+  arg1 = static_cast< VecMat::Vec2<float >::value_type >(val1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec2f" "', argument " "2"" of type '" "VecMat::Vec2<float >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec2<float >::value_type >(val2);
+  {
+    try {
+      result = (VecMat::Vec2<float > *)new VecMat::Vec2<float >(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Vec2f__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<float >::value_type arg1 ;
+  VecMat::Vec2<float > *result = 0 ;
+  float val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_Vec2f",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_float(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2f" "', argument " "1"" of type '" "VecMat::Vec2<float >::value_type""'");
+  } 
+  arg1 = static_cast< VecMat::Vec2<float >::value_type >(val1);
+  {
+    try {
+      result = (VecMat::Vec2<float > *)new VecMat::Vec2<float >(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Vec2f(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_Vec2f__SWIG_0(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_float(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_Vec2f__SWIG_2(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    {
+      int res = SWIG_AsVal_float(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      {
+        int res = SWIG_AsVal_float(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_new_Vec2f__SWIG_1(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec2f'.\n  Possible C/C++ prototypes are:\n    VecMat::Vec2<(float)>()\n    VecMat::Vec2<(float)>(VecMat::Vec2<float >::value_type const,VecMat::Vec2<float >::value_type const)\n    VecMat::Vec2<(float)>(VecMat::Vec2<float >::value_type const)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2f_x__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
+  VecMat::Vec2<float >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec2f_x",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f_x" "', argument " "1"" of type '" "VecMat::Vec2<float > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
+  {
+    try {
+      result = (VecMat::Vec2<float >::value_type)((VecMat::Vec2<float > const *)arg1)->x();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2f_x__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
+  VecMat::Vec2<float >::value_type *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec2f_x",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f_x" "', argument " "1"" of type '" "VecMat::Vec2<float > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
+  {
+    try {
+      {
+        VecMat::Vec2<float >::value_type &_result_ref = (arg1)->x();
+        result = (VecMat::Vec2<float >::value_type *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_float, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2f_x(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Vec2f_x__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Vec2f_x__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2f_x'.\n  Possible C/C++ prototypes are:\n    x()\n    x()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2f_y__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
+  VecMat::Vec2<float >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec2f_y",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f_y" "', argument " "1"" of type '" "VecMat::Vec2<float > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
+  {
+    try {
+      result = (VecMat::Vec2<float >::value_type)((VecMat::Vec2<float > const *)arg1)->y();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2f_y__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
+  VecMat::Vec2<float >::value_type *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec2f_y",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f_y" "', argument " "1"" of type '" "VecMat::Vec2<float > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
+  {
+    try {
+      {
+        VecMat::Vec2<float >::value_type &_result_ref = (arg1)->y();
+        result = (VecMat::Vec2<float >::value_type *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_float, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2f_y(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Vec2f_y__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Vec2f_y__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2f_y'.\n  Possible C/C++ prototypes are:\n    y()\n    y()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2f_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
+  VecMat::Vec2<float >::value_type arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec2f_setX",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f_setX" "', argument " "1"" of type '" "VecMat::Vec2<float > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2f_setX" "', argument " "2"" of type '" "VecMat::Vec2<float >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec2<float >::value_type >(val2);
+  {
+    try {
+      (arg1)->setX(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2f_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
+  VecMat::Vec2<float >::value_type arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec2f_setY",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f_setY" "', argument " "1"" of type '" "VecMat::Vec2<float > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2f_setY" "', argument " "2"" of type '" "VecMat::Vec2<float >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec2<float >::value_type >(val2);
+  {
+    try {
+      (arg1)->setY(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2f___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
+  VecMat::Vec2<float > *arg2 = 0 ;
+  VecMat::Vec2<float > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec2f___add__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f___add__" "', argument " "1"" of type '" "VecMat::Vec2<float > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2f___add__" "', argument " "2"" of type '" "VecMat::Vec2<float > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2f___add__" "', argument " "2"" of type '" "VecMat::Vec2<float > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec2<float > * >(argp2);
+  {
+    try {
+      result = ((VecMat::Vec2<float > const *)arg1)->operator +((VecMat::Vec2<float > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<float >(static_cast< const VecMat::Vec2<float >& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2f___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
+  VecMat::Vec2<float > *arg2 = 0 ;
+  VecMat::Vec2<float > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec2f___sub__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f___sub__" "', argument " "1"" of type '" "VecMat::Vec2<float > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2f___sub__" "', argument " "2"" of type '" "VecMat::Vec2<float > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2f___sub__" "', argument " "2"" of type '" "VecMat::Vec2<float > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec2<float > * >(argp2);
+  {
+    try {
+      result = ((VecMat::Vec2<float > const *)arg1)->operator -((VecMat::Vec2<float > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<float >(static_cast< const VecMat::Vec2<float >& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2f___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
+  VecMat::Vec2<float >::value_type arg2 ;
+  VecMat::Vec2<float > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec2f___mul__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f___mul__" "', argument " "1"" of type '" "VecMat::Vec2<float > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2f___mul__" "', argument " "2"" of type '" "VecMat::Vec2<float >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec2<float >::value_type >(val2);
+  {
+    try {
+      result = ((VecMat::Vec2<float > const *)arg1)->operator *(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<float >(static_cast< const VecMat::Vec2<float >& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2f___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
+  VecMat::Vec2<float >::value_type arg2 ;
+  VecMat::Vec2<float > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec2f___div__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f___div__" "', argument " "1"" of type '" "VecMat::Vec2<float > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2f___div__" "', argument " "2"" of type '" "VecMat::Vec2<float >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec2<float >::value_type >(val2);
+  {
+    try {
+      result = ((VecMat::Vec2<float > const *)arg1)->operator /(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<float >(static_cast< const VecMat::Vec2<float >& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2f___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
+  VecMat::Vec2<float > *arg2 = 0 ;
+  VecMat::Vec2<float >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec2f___mul__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f___mul__" "', argument " "1"" of type '" "VecMat::Vec2<float > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2f___mul__" "', argument " "2"" of type '" "VecMat::Vec2<float > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2f___mul__" "', argument " "2"" of type '" "VecMat::Vec2<float > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec2<float > * >(argp2);
+  {
+    try {
+      result = (VecMat::Vec2<float >::value_type)((VecMat::Vec2<float > const *)arg1)->operator *((VecMat::Vec2<float > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2f___mul__(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_Vec2f___mul____SWIG_1(self, args);
+      }
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_float(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_Vec2f___mul____SWIG_0(self, args);
+      }
+    }
+  }
+  
+fail:
+  Py_INCREF(Py_NotImplemented);
+  return Py_NotImplemented;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_Vec2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec2f",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec2f" "', argument " "1"" of type '" "VecMat::Vec2<float > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *Vec2f_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_Vec2d__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<double > *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_Vec2d")) SWIG_fail;
+  {
+    try {
+      result = (VecMat::Vec2<double > *)new VecMat::Vec2<double >();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Vec2d__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<double >::value_type arg1 ;
+  VecMat::Vec2<double >::value_type arg2 ;
+  VecMat::Vec2<double > *result = 0 ;
+  double val1 ;
+  int ecode1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_Vec2d",&obj0,&obj1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2d" "', argument " "1"" of type '" "VecMat::Vec2<double >::value_type""'");
+  } 
+  arg1 = static_cast< VecMat::Vec2<double >::value_type >(val1);
+  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec2d" "', argument " "2"" of type '" "VecMat::Vec2<double >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec2<double >::value_type >(val2);
+  {
+    try {
+      result = (VecMat::Vec2<double > *)new VecMat::Vec2<double >(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Vec2d__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<double >::value_type arg1 ;
+  VecMat::Vec2<double > *result = 0 ;
+  double val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_Vec2d",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2d" "', argument " "1"" of type '" "VecMat::Vec2<double >::value_type""'");
+  } 
+  arg1 = static_cast< VecMat::Vec2<double >::value_type >(val1);
+  {
+    try {
+      result = (VecMat::Vec2<double > *)new VecMat::Vec2<double >(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Vec2d(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_Vec2d__SWIG_0(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_double(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_Vec2d__SWIG_2(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    {
+      int res = SWIG_AsVal_double(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      {
+        int res = SWIG_AsVal_double(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_new_Vec2d__SWIG_1(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec2d'.\n  Possible C/C++ prototypes are:\n    VecMat::Vec2<(double)>()\n    VecMat::Vec2<(double)>(VecMat::Vec2<double >::value_type const,VecMat::Vec2<double >::value_type const)\n    VecMat::Vec2<(double)>(VecMat::Vec2<double >::value_type const)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2d_x__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
+  VecMat::Vec2<double >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec2d_x",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d_x" "', argument " "1"" of type '" "VecMat::Vec2<double > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
+  {
+    try {
+      result = (VecMat::Vec2<double >::value_type)((VecMat::Vec2<double > const *)arg1)->x();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2d_x__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
+  VecMat::Vec2<double >::value_type *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec2d_x",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d_x" "', argument " "1"" of type '" "VecMat::Vec2<double > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
+  {
+    try {
+      {
+        VecMat::Vec2<double >::value_type &_result_ref = (arg1)->x();
+        result = (VecMat::Vec2<double >::value_type *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_double, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2d_x(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Vec2d_x__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Vec2d_x__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2d_x'.\n  Possible C/C++ prototypes are:\n    x()\n    x()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2d_y__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
+  VecMat::Vec2<double >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec2d_y",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d_y" "', argument " "1"" of type '" "VecMat::Vec2<double > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
+  {
+    try {
+      result = (VecMat::Vec2<double >::value_type)((VecMat::Vec2<double > const *)arg1)->y();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2d_y__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
+  VecMat::Vec2<double >::value_type *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec2d_y",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d_y" "', argument " "1"" of type '" "VecMat::Vec2<double > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
+  {
+    try {
+      {
+        VecMat::Vec2<double >::value_type &_result_ref = (arg1)->y();
+        result = (VecMat::Vec2<double >::value_type *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_double, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2d_y(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Vec2d_y__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Vec2d_y__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2d_y'.\n  Possible C/C++ prototypes are:\n    y()\n    y()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2d_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
+  VecMat::Vec2<double >::value_type arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec2d_setX",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d_setX" "', argument " "1"" of type '" "VecMat::Vec2<double > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
+  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2d_setX" "', argument " "2"" of type '" "VecMat::Vec2<double >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec2<double >::value_type >(val2);
+  {
+    try {
+      (arg1)->setX(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2d_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
+  VecMat::Vec2<double >::value_type arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec2d_setY",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d_setY" "', argument " "1"" of type '" "VecMat::Vec2<double > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
+  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2d_setY" "', argument " "2"" of type '" "VecMat::Vec2<double >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec2<double >::value_type >(val2);
+  {
+    try {
+      (arg1)->setY(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2d___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
+  VecMat::Vec2<double > *arg2 = 0 ;
+  VecMat::Vec2<double > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec2d___add__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d___add__" "', argument " "1"" of type '" "VecMat::Vec2<double > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2d___add__" "', argument " "2"" of type '" "VecMat::Vec2<double > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2d___add__" "', argument " "2"" of type '" "VecMat::Vec2<double > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec2<double > * >(argp2);
+  {
+    try {
+      result = ((VecMat::Vec2<double > const *)arg1)->operator +((VecMat::Vec2<double > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<double >(static_cast< const VecMat::Vec2<double >& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2d___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
+  VecMat::Vec2<double > *arg2 = 0 ;
+  VecMat::Vec2<double > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec2d___sub__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d___sub__" "', argument " "1"" of type '" "VecMat::Vec2<double > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2d___sub__" "', argument " "2"" of type '" "VecMat::Vec2<double > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2d___sub__" "', argument " "2"" of type '" "VecMat::Vec2<double > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec2<double > * >(argp2);
+  {
+    try {
+      result = ((VecMat::Vec2<double > const *)arg1)->operator -((VecMat::Vec2<double > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<double >(static_cast< const VecMat::Vec2<double >& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2d___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
+  VecMat::Vec2<double >::value_type arg2 ;
+  VecMat::Vec2<double > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec2d___mul__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d___mul__" "', argument " "1"" of type '" "VecMat::Vec2<double > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
+  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2d___mul__" "', argument " "2"" of type '" "VecMat::Vec2<double >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec2<double >::value_type >(val2);
+  {
+    try {
+      result = ((VecMat::Vec2<double > const *)arg1)->operator *(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<double >(static_cast< const VecMat::Vec2<double >& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2d___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
+  VecMat::Vec2<double >::value_type arg2 ;
+  VecMat::Vec2<double > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec2d___div__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d___div__" "', argument " "1"" of type '" "VecMat::Vec2<double > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
+  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2d___div__" "', argument " "2"" of type '" "VecMat::Vec2<double >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec2<double >::value_type >(val2);
+  {
+    try {
+      result = ((VecMat::Vec2<double > const *)arg1)->operator /(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<double >(static_cast< const VecMat::Vec2<double >& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2d___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
+  VecMat::Vec2<double > *arg2 = 0 ;
+  VecMat::Vec2<double >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec2d___mul__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d___mul__" "', argument " "1"" of type '" "VecMat::Vec2<double > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2d___mul__" "', argument " "2"" of type '" "VecMat::Vec2<double > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2d___mul__" "', argument " "2"" of type '" "VecMat::Vec2<double > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec2<double > * >(argp2);
+  {
+    try {
+      result = (VecMat::Vec2<double >::value_type)((VecMat::Vec2<double > const *)arg1)->operator *((VecMat::Vec2<double > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec2d___mul__(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_Vec2d___mul____SWIG_1(self, args);
+      }
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_double(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_Vec2d___mul____SWIG_0(self, args);
+      }
+    }
+  }
+  
+fail:
+  Py_INCREF(Py_NotImplemented);
+  return Py_NotImplemented;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_Vec2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec2d",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec2d" "', argument " "1"" of type '" "VecMat::Vec2<double > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *Vec2d_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_Vec_3u(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<unsigned int,3 > *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_Vec_3u")) SWIG_fail;
+  {
+    try {
+      result = (VecMat::Vec<unsigned int,3 > *)new VecMat::Vec<unsigned int,3 >();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_Vec_3u(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec_3u",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_3u" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3u_dim(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  unsigned int result;
+  
+  if (!PyArg_ParseTuple(args,(char *)":Vec_3u_dim")) SWIG_fail;
+  {
+    try {
+      result = (unsigned int)VecMat::Vec<unsigned int,3 >::SWIGTEMPLATEDISAMBIGUATOR dim();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3u_norm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
+  VecMat::Vec<unsigned int,3 >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec_3u_norm",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u_norm" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
+  {
+    try {
+      result = (VecMat::Vec<unsigned int,3 >::value_type)((VecMat::Vec<unsigned int,3 > const *)arg1)->norm();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3u_squareNorm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
+  VecMat::Vec<unsigned int,3 >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec_3u_squareNorm",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u_squareNorm" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
+  {
+    try {
+      result = (VecMat::Vec<unsigned int,3 >::value_type)((VecMat::Vec<unsigned int,3 > const *)arg1)->squareNorm();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3u_normalize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
+  VecMat::Vec<unsigned int,3 > *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec_3u_normalize",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u_normalize" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
+  {
+    try {
+      {
+        VecMat::Vec<unsigned int,3 > &_result_ref = (arg1)->normalize();
+        result = (VecMat::Vec<unsigned int,3 > *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3u_normalizeSafe(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
+  VecMat::Vec<unsigned int,3 > *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec_3u_normalizeSafe",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
+  {
+    try {
+      {
+        VecMat::Vec<unsigned int,3 > &_result_ref = (arg1)->normalizeSafe();
+        result = (VecMat::Vec<unsigned int,3 > *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3u___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
+  VecMat::Vec<unsigned int,3 > *arg2 = 0 ;
+  VecMat::Vec<unsigned int,3 > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3u___add__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___add__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_3_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___add__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___add__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp2);
+  {
+    try {
+      result = ((VecMat::Vec<unsigned int,3 > const *)arg1)->operator +((VecMat::Vec<unsigned int,3 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<unsigned int,3 >(static_cast< const VecMat::Vec<unsigned int,3 >& >(result))), SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3u___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
+  VecMat::Vec<unsigned int,3 > *arg2 = 0 ;
+  VecMat::Vec<unsigned int,3 > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3u___sub__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___sub__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_3_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___sub__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___sub__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp2);
+  {
+    try {
+      result = ((VecMat::Vec<unsigned int,3 > const *)arg1)->operator -((VecMat::Vec<unsigned int,3 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<unsigned int,3 >(static_cast< const VecMat::Vec<unsigned int,3 >& >(result))), SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3u___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
+  VecMat::Vec<unsigned int,3 >::value_type arg2 ;
+  VecMat::Vec<unsigned int,3 > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3u___mul__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___mul__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3u___mul__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec<unsigned int,3 >::value_type >(val2);
+  {
+    try {
+      result = ((VecMat::Vec<unsigned int,3 > const *)arg1)->operator *(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<unsigned int,3 >(static_cast< const VecMat::Vec<unsigned int,3 >& >(result))), SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3u___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
+  VecMat::Vec<unsigned int,3 >::value_type arg2 ;
+  VecMat::Vec<unsigned int,3 > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3u___div__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___div__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3u___div__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec<unsigned int,3 >::value_type >(val2);
+  {
+    try {
+      result = ((VecMat::Vec<unsigned int,3 > const *)arg1)->operator /(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<unsigned int,3 >(static_cast< const VecMat::Vec<unsigned int,3 >& >(result))), SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3u___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
+  VecMat::Vec<unsigned int,3 > *arg2 = 0 ;
+  VecMat::Vec<unsigned int,3 >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3u___mul__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___mul__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_3_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___mul__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___mul__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp2);
+  {
+    try {
+      result = (VecMat::Vec<unsigned int,3 >::value_type)((VecMat::Vec<unsigned int,3 > const *)arg1)->operator *((VecMat::Vec<unsigned int,3 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3u___mul__(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_Vec_3u___mul____SWIG_1(self, args);
+      }
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_unsigned_SS_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_Vec_3u___mul____SWIG_0(self, args);
+      }
+    }
+  }
+  
+fail:
+  Py_INCREF(Py_NotImplemented);
+  return Py_NotImplemented;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3u___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
+  VecMat::Vec<unsigned int,3 > *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3u___eq__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___eq__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_3_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___eq__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___eq__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp2);
+  {
+    try {
+      result = (bool)((VecMat::Vec<unsigned int,3 > const *)arg1)->operator ==((VecMat::Vec<unsigned int,3 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3u___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
+  VecMat::Vec<unsigned int,3 > *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3u___ne__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___ne__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_3_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___ne__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___ne__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp2);
+  {
+    try {
+      result = (bool)((VecMat::Vec<unsigned int,3 > const *)arg1)->operator !=((VecMat::Vec<unsigned int,3 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3u___lt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
+  VecMat::Vec<unsigned int,3 > *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3u___lt__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___lt__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_3_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___lt__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___lt__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp2);
+  {
+    try {
+      result = (bool)((VecMat::Vec<unsigned int,3 > const *)arg1)->operator <((VecMat::Vec<unsigned int,3 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3u___gt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
+  VecMat::Vec<unsigned int,3 > *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3u___gt__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___gt__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_3_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___gt__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___gt__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp2);
+  {
+    try {
+      result = (bool)((VecMat::Vec<unsigned int,3 > const *)arg1)->operator >((VecMat::Vec<unsigned int,3 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *Vec_3u_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_Vec_3i(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<int,3 > *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_Vec_3i")) SWIG_fail;
+  {
+    try {
+      result = (VecMat::Vec<int,3 > *)new VecMat::Vec<int,3 >();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTint_3_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_Vec_3i(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec_3i",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_3i" "', argument " "1"" of type '" "VecMat::Vec<int,3 > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3i_dim(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  unsigned int result;
+  
+  if (!PyArg_ParseTuple(args,(char *)":Vec_3i_dim")) SWIG_fail;
+  {
+    try {
+      result = (unsigned int)VecMat::Vec<int,3 >::SWIGTEMPLATEDISAMBIGUATOR dim();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3i_norm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
+  VecMat::Vec<int,3 >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec_3i_norm",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i_norm" "', argument " "1"" of type '" "VecMat::Vec<int,3 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
+  {
+    try {
+      result = (VecMat::Vec<int,3 >::value_type)((VecMat::Vec<int,3 > const *)arg1)->norm();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3i_squareNorm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
+  VecMat::Vec<int,3 >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec_3i_squareNorm",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i_squareNorm" "', argument " "1"" of type '" "VecMat::Vec<int,3 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
+  {
+    try {
+      result = (VecMat::Vec<int,3 >::value_type)((VecMat::Vec<int,3 > const *)arg1)->squareNorm();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3i_normalize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
+  VecMat::Vec<int,3 > *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec_3i_normalize",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i_normalize" "', argument " "1"" of type '" "VecMat::Vec<int,3 > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
+  {
+    try {
+      {
+        VecMat::Vec<int,3 > &_result_ref = (arg1)->normalize();
+        result = (VecMat::Vec<int,3 > *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3i_normalizeSafe(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
+  VecMat::Vec<int,3 > *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec_3i_normalizeSafe",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec<int,3 > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
+  {
+    try {
+      {
+        VecMat::Vec<int,3 > &_result_ref = (arg1)->normalizeSafe();
+        result = (VecMat::Vec<int,3 > *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3i___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
+  VecMat::Vec<int,3 > *arg2 = 0 ;
+  VecMat::Vec<int,3 > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3i___add__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___add__" "', argument " "1"" of type '" "VecMat::Vec<int,3 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_3_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___add__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___add__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp2);
+  {
+    try {
+      result = ((VecMat::Vec<int,3 > const *)arg1)->operator +((VecMat::Vec<int,3 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<int,3 >(static_cast< const VecMat::Vec<int,3 >& >(result))), SWIGTYPE_p_VecMat__VecTint_3_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3i___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
+  VecMat::Vec<int,3 > *arg2 = 0 ;
+  VecMat::Vec<int,3 > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3i___sub__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___sub__" "', argument " "1"" of type '" "VecMat::Vec<int,3 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_3_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___sub__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___sub__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp2);
+  {
+    try {
+      result = ((VecMat::Vec<int,3 > const *)arg1)->operator -((VecMat::Vec<int,3 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<int,3 >(static_cast< const VecMat::Vec<int,3 >& >(result))), SWIGTYPE_p_VecMat__VecTint_3_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3i___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
+  VecMat::Vec<int,3 >::value_type arg2 ;
+  VecMat::Vec<int,3 > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3i___mul__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___mul__" "', argument " "1"" of type '" "VecMat::Vec<int,3 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3i___mul__" "', argument " "2"" of type '" "VecMat::Vec<int,3 >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec<int,3 >::value_type >(val2);
+  {
+    try {
+      result = ((VecMat::Vec<int,3 > const *)arg1)->operator *(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<int,3 >(static_cast< const VecMat::Vec<int,3 >& >(result))), SWIGTYPE_p_VecMat__VecTint_3_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3i___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
+  VecMat::Vec<int,3 >::value_type arg2 ;
+  VecMat::Vec<int,3 > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3i___div__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___div__" "', argument " "1"" of type '" "VecMat::Vec<int,3 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3i___div__" "', argument " "2"" of type '" "VecMat::Vec<int,3 >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec<int,3 >::value_type >(val2);
+  {
+    try {
+      result = ((VecMat::Vec<int,3 > const *)arg1)->operator /(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<int,3 >(static_cast< const VecMat::Vec<int,3 >& >(result))), SWIGTYPE_p_VecMat__VecTint_3_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3i___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
+  VecMat::Vec<int,3 > *arg2 = 0 ;
+  VecMat::Vec<int,3 >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3i___mul__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___mul__" "', argument " "1"" of type '" "VecMat::Vec<int,3 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_3_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___mul__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___mul__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp2);
+  {
+    try {
+      result = (VecMat::Vec<int,3 >::value_type)((VecMat::Vec<int,3 > const *)arg1)->operator *((VecMat::Vec<int,3 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3i___mul__(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTint_3_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecTint_3_t, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_Vec_3i___mul____SWIG_1(self, args);
+      }
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTint_3_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_Vec_3i___mul____SWIG_0(self, args);
+      }
+    }
+  }
+  
+fail:
+  Py_INCREF(Py_NotImplemented);
+  return Py_NotImplemented;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3i___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
+  VecMat::Vec<int,3 > *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3i___eq__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___eq__" "', argument " "1"" of type '" "VecMat::Vec<int,3 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_3_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___eq__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___eq__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp2);
+  {
+    try {
+      result = (bool)((VecMat::Vec<int,3 > const *)arg1)->operator ==((VecMat::Vec<int,3 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3i___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
+  VecMat::Vec<int,3 > *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3i___ne__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___ne__" "', argument " "1"" of type '" "VecMat::Vec<int,3 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_3_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___ne__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___ne__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp2);
+  {
+    try {
+      result = (bool)((VecMat::Vec<int,3 > const *)arg1)->operator !=((VecMat::Vec<int,3 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3i___lt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
+  VecMat::Vec<int,3 > *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3i___lt__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___lt__" "', argument " "1"" of type '" "VecMat::Vec<int,3 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_3_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___lt__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___lt__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp2);
+  {
+    try {
+      result = (bool)((VecMat::Vec<int,3 > const *)arg1)->operator <((VecMat::Vec<int,3 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3i___gt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
+  VecMat::Vec<int,3 > *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3i___gt__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___gt__" "', argument " "1"" of type '" "VecMat::Vec<int,3 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_3_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___gt__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___gt__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp2);
+  {
+    try {
+      result = (bool)((VecMat::Vec<int,3 > const *)arg1)->operator >((VecMat::Vec<int,3 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *Vec_3i_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecTint_3_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_Vec_3d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<double,3 > *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_Vec_3d")) SWIG_fail;
+  {
+    try {
+      result = (VecMat::Vec<double,3 > *)new VecMat::Vec<double,3 >();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTdouble_3_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_Vec_3d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec_3d",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_3d" "', argument " "1"" of type '" "VecMat::Vec<double,3 > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3d_dim(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  unsigned int result;
+  
+  if (!PyArg_ParseTuple(args,(char *)":Vec_3d_dim")) SWIG_fail;
+  {
+    try {
+      result = (unsigned int)VecMat::Vec<double,3 >::SWIGTEMPLATEDISAMBIGUATOR dim();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3d_norm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
+  VecMat::Vec<double,3 >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec_3d_norm",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d_norm" "', argument " "1"" of type '" "VecMat::Vec<double,3 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
+  {
+    try {
+      result = (VecMat::Vec<double,3 >::value_type)((VecMat::Vec<double,3 > const *)arg1)->norm();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3d_squareNorm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
+  VecMat::Vec<double,3 >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec_3d_squareNorm",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d_squareNorm" "', argument " "1"" of type '" "VecMat::Vec<double,3 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
+  {
+    try {
+      result = (VecMat::Vec<double,3 >::value_type)((VecMat::Vec<double,3 > const *)arg1)->squareNorm();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3d_normalize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
+  VecMat::Vec<double,3 > *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec_3d_normalize",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d_normalize" "', argument " "1"" of type '" "VecMat::Vec<double,3 > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
+  {
+    try {
+      {
+        VecMat::Vec<double,3 > &_result_ref = (arg1)->normalize();
+        result = (VecMat::Vec<double,3 > *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3d_normalizeSafe(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
+  VecMat::Vec<double,3 > *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec_3d_normalizeSafe",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec<double,3 > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
+  {
+    try {
+      {
+        VecMat::Vec<double,3 > &_result_ref = (arg1)->normalizeSafe();
+        result = (VecMat::Vec<double,3 > *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3d___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
+  VecMat::Vec<double,3 > *arg2 = 0 ;
+  VecMat::Vec<double,3 > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3d___add__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___add__" "', argument " "1"" of type '" "VecMat::Vec<double,3 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_3_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___add__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___add__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp2);
+  {
+    try {
+      result = ((VecMat::Vec<double,3 > const *)arg1)->operator +((VecMat::Vec<double,3 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<double,3 >(static_cast< const VecMat::Vec<double,3 >& >(result))), SWIGTYPE_p_VecMat__VecTdouble_3_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3d___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
+  VecMat::Vec<double,3 > *arg2 = 0 ;
+  VecMat::Vec<double,3 > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3d___sub__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___sub__" "', argument " "1"" of type '" "VecMat::Vec<double,3 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_3_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___sub__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___sub__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp2);
+  {
+    try {
+      result = ((VecMat::Vec<double,3 > const *)arg1)->operator -((VecMat::Vec<double,3 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<double,3 >(static_cast< const VecMat::Vec<double,3 >& >(result))), SWIGTYPE_p_VecMat__VecTdouble_3_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3d___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
+  VecMat::Vec<double,3 >::value_type arg2 ;
+  VecMat::Vec<double,3 > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3d___mul__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___mul__" "', argument " "1"" of type '" "VecMat::Vec<double,3 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
+  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3d___mul__" "', argument " "2"" of type '" "VecMat::Vec<double,3 >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec<double,3 >::value_type >(val2);
+  {
+    try {
+      result = ((VecMat::Vec<double,3 > const *)arg1)->operator *(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<double,3 >(static_cast< const VecMat::Vec<double,3 >& >(result))), SWIGTYPE_p_VecMat__VecTdouble_3_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3d___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
+  VecMat::Vec<double,3 >::value_type arg2 ;
+  VecMat::Vec<double,3 > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3d___div__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___div__" "', argument " "1"" of type '" "VecMat::Vec<double,3 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
+  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3d___div__" "', argument " "2"" of type '" "VecMat::Vec<double,3 >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec<double,3 >::value_type >(val2);
+  {
+    try {
+      result = ((VecMat::Vec<double,3 > const *)arg1)->operator /(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<double,3 >(static_cast< const VecMat::Vec<double,3 >& >(result))), SWIGTYPE_p_VecMat__VecTdouble_3_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3d___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
+  VecMat::Vec<double,3 > *arg2 = 0 ;
+  VecMat::Vec<double,3 >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3d___mul__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___mul__" "', argument " "1"" of type '" "VecMat::Vec<double,3 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_3_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___mul__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___mul__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp2);
+  {
+    try {
+      result = (VecMat::Vec<double,3 >::value_type)((VecMat::Vec<double,3 > const *)arg1)->operator *((VecMat::Vec<double,3 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3d___mul__(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTdouble_3_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecTdouble_3_t, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_Vec_3d___mul____SWIG_1(self, args);
+      }
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTdouble_3_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_double(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_Vec_3d___mul____SWIG_0(self, args);
+      }
+    }
+  }
+  
+fail:
+  Py_INCREF(Py_NotImplemented);
+  return Py_NotImplemented;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3d___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
+  VecMat::Vec<double,3 > *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3d___eq__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___eq__" "', argument " "1"" of type '" "VecMat::Vec<double,3 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_3_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___eq__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___eq__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp2);
+  {
+    try {
+      result = (bool)((VecMat::Vec<double,3 > const *)arg1)->operator ==((VecMat::Vec<double,3 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3d___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
+  VecMat::Vec<double,3 > *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3d___ne__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___ne__" "', argument " "1"" of type '" "VecMat::Vec<double,3 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_3_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___ne__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___ne__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp2);
+  {
+    try {
+      result = (bool)((VecMat::Vec<double,3 > const *)arg1)->operator !=((VecMat::Vec<double,3 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3d___lt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
+  VecMat::Vec<double,3 > *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3d___lt__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___lt__" "', argument " "1"" of type '" "VecMat::Vec<double,3 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_3_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___lt__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___lt__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp2);
+  {
+    try {
+      result = (bool)((VecMat::Vec<double,3 > const *)arg1)->operator <((VecMat::Vec<double,3 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3d___gt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
+  VecMat::Vec<double,3 > *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3d___gt__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___gt__" "', argument " "1"" of type '" "VecMat::Vec<double,3 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_3_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___gt__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___gt__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp2);
+  {
+    try {
+      result = (bool)((VecMat::Vec<double,3 > const *)arg1)->operator >((VecMat::Vec<double,3 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *Vec_3d_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecTdouble_3_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_Vec_3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<float,3 > *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_Vec_3f")) SWIG_fail;
+  {
+    try {
+      result = (VecMat::Vec<float,3 > *)new VecMat::Vec<float,3 >();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTfloat_3_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_Vec_3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec_3f",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_3f" "', argument " "1"" of type '" "VecMat::Vec<float,3 > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3f_dim(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  unsigned int result;
+  
+  if (!PyArg_ParseTuple(args,(char *)":Vec_3f_dim")) SWIG_fail;
+  {
+    try {
+      result = (unsigned int)VecMat::Vec<float,3 >::SWIGTEMPLATEDISAMBIGUATOR dim();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3f_norm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
+  VecMat::Vec<float,3 >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec_3f_norm",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f_norm" "', argument " "1"" of type '" "VecMat::Vec<float,3 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
+  {
+    try {
+      result = (VecMat::Vec<float,3 >::value_type)((VecMat::Vec<float,3 > const *)arg1)->norm();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3f_squareNorm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
+  VecMat::Vec<float,3 >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec_3f_squareNorm",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f_squareNorm" "', argument " "1"" of type '" "VecMat::Vec<float,3 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
+  {
+    try {
+      result = (VecMat::Vec<float,3 >::value_type)((VecMat::Vec<float,3 > const *)arg1)->squareNorm();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3f_normalize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
+  VecMat::Vec<float,3 > *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec_3f_normalize",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f_normalize" "', argument " "1"" of type '" "VecMat::Vec<float,3 > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
+  {
+    try {
+      {
+        VecMat::Vec<float,3 > &_result_ref = (arg1)->normalize();
+        result = (VecMat::Vec<float,3 > *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3f_normalizeSafe(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
+  VecMat::Vec<float,3 > *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec_3f_normalizeSafe",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec<float,3 > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
+  {
+    try {
+      {
+        VecMat::Vec<float,3 > &_result_ref = (arg1)->normalizeSafe();
+        result = (VecMat::Vec<float,3 > *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3f___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
+  VecMat::Vec<float,3 > *arg2 = 0 ;
+  VecMat::Vec<float,3 > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3f___add__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___add__" "', argument " "1"" of type '" "VecMat::Vec<float,3 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_3_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___add__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___add__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp2);
+  {
+    try {
+      result = ((VecMat::Vec<float,3 > const *)arg1)->operator +((VecMat::Vec<float,3 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<float,3 >(static_cast< const VecMat::Vec<float,3 >& >(result))), SWIGTYPE_p_VecMat__VecTfloat_3_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3f___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
+  VecMat::Vec<float,3 > *arg2 = 0 ;
+  VecMat::Vec<float,3 > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3f___sub__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___sub__" "', argument " "1"" of type '" "VecMat::Vec<float,3 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_3_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___sub__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___sub__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp2);
+  {
+    try {
+      result = ((VecMat::Vec<float,3 > const *)arg1)->operator -((VecMat::Vec<float,3 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<float,3 >(static_cast< const VecMat::Vec<float,3 >& >(result))), SWIGTYPE_p_VecMat__VecTfloat_3_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3f___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
+  VecMat::Vec<float,3 >::value_type arg2 ;
+  VecMat::Vec<float,3 > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3f___mul__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___mul__" "', argument " "1"" of type '" "VecMat::Vec<float,3 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3f___mul__" "', argument " "2"" of type '" "VecMat::Vec<float,3 >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec<float,3 >::value_type >(val2);
+  {
+    try {
+      result = ((VecMat::Vec<float,3 > const *)arg1)->operator *(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<float,3 >(static_cast< const VecMat::Vec<float,3 >& >(result))), SWIGTYPE_p_VecMat__VecTfloat_3_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3f___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
+  VecMat::Vec<float,3 >::value_type arg2 ;
+  VecMat::Vec<float,3 > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3f___div__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___div__" "', argument " "1"" of type '" "VecMat::Vec<float,3 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3f___div__" "', argument " "2"" of type '" "VecMat::Vec<float,3 >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec<float,3 >::value_type >(val2);
+  {
+    try {
+      result = ((VecMat::Vec<float,3 > const *)arg1)->operator /(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<float,3 >(static_cast< const VecMat::Vec<float,3 >& >(result))), SWIGTYPE_p_VecMat__VecTfloat_3_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3f___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
+  VecMat::Vec<float,3 > *arg2 = 0 ;
+  VecMat::Vec<float,3 >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3f___mul__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___mul__" "', argument " "1"" of type '" "VecMat::Vec<float,3 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_3_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___mul__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___mul__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp2);
+  {
+    try {
+      result = (VecMat::Vec<float,3 >::value_type)((VecMat::Vec<float,3 > const *)arg1)->operator *((VecMat::Vec<float,3 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3f___mul__(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTfloat_3_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecTfloat_3_t, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_Vec_3f___mul____SWIG_1(self, args);
+      }
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTfloat_3_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_float(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_Vec_3f___mul____SWIG_0(self, args);
+      }
+    }
+  }
+  
+fail:
+  Py_INCREF(Py_NotImplemented);
+  return Py_NotImplemented;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3f___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
+  VecMat::Vec<float,3 > *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3f___eq__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___eq__" "', argument " "1"" of type '" "VecMat::Vec<float,3 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_3_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___eq__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___eq__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp2);
+  {
+    try {
+      result = (bool)((VecMat::Vec<float,3 > const *)arg1)->operator ==((VecMat::Vec<float,3 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3f___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
+  VecMat::Vec<float,3 > *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3f___ne__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___ne__" "', argument " "1"" of type '" "VecMat::Vec<float,3 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_3_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___ne__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___ne__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp2);
+  {
+    try {
+      result = (bool)((VecMat::Vec<float,3 > const *)arg1)->operator !=((VecMat::Vec<float,3 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3f___lt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
+  VecMat::Vec<float,3 > *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3f___lt__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___lt__" "', argument " "1"" of type '" "VecMat::Vec<float,3 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_3_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___lt__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___lt__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp2);
+  {
+    try {
+      result = (bool)((VecMat::Vec<float,3 > const *)arg1)->operator <((VecMat::Vec<float,3 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec_3f___gt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
+  VecMat::Vec<float,3 > *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3f___gt__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___gt__" "', argument " "1"" of type '" "VecMat::Vec<float,3 > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_3_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___gt__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___gt__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp2);
+  {
+    try {
+      result = (bool)((VecMat::Vec<float,3 > const *)arg1)->operator >((VecMat::Vec<float,3 > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *Vec_3f_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecTfloat_3_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_Vec3u__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<unsigned int > *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_Vec3u")) SWIG_fail;
+  {
+    try {
+      result = (VecMat::Vec3<unsigned int > *)new VecMat::Vec3<unsigned int >();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Vec3u__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<unsigned int >::value_type arg1 ;
+  VecMat::Vec3<unsigned int >::value_type arg2 ;
+  VecMat::Vec3<unsigned int >::value_type arg3 ;
+  VecMat::Vec3<unsigned int > *result = 0 ;
+  unsigned int val1 ;
+  int ecode1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
+  unsigned int val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:new_Vec3u",&obj0,&obj1,&obj2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_unsigned_SS_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3u" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int >::value_type""'");
+  } 
+  arg1 = static_cast< VecMat::Vec3<unsigned int >::value_type >(val1);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3u" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec3<unsigned int >::value_type >(val2);
+  ecode3 = SWIG_AsVal_unsigned_SS_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_Vec3u" "', argument " "3"" of type '" "VecMat::Vec3<unsigned int >::value_type""'");
+  } 
+  arg3 = static_cast< VecMat::Vec3<unsigned int >::value_type >(val3);
+  {
+    try {
+      result = (VecMat::Vec3<unsigned int > *)new VecMat::Vec3<unsigned int >(arg1,arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Vec3u__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<unsigned int >::value_type arg1 ;
+  VecMat::Vec3<unsigned int >::value_type arg2 ;
+  VecMat::Vec3<unsigned int > *result = 0 ;
+  unsigned int val1 ;
+  int ecode1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_Vec3u",&obj0,&obj1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_unsigned_SS_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3u" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int >::value_type""'");
+  } 
+  arg1 = static_cast< VecMat::Vec3<unsigned int >::value_type >(val1);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3u" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec3<unsigned int >::value_type >(val2);
+  {
+    try {
+      result = (VecMat::Vec3<unsigned int > *)new VecMat::Vec3<unsigned int >(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Vec3u__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<unsigned int >::value_type arg1 ;
+  VecMat::Vec3<unsigned int > *result = 0 ;
+  unsigned int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_Vec3u",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_unsigned_SS_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3u" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int >::value_type""'");
+  } 
+  arg1 = static_cast< VecMat::Vec3<unsigned int >::value_type >(val1);
+  {
+    try {
+      result = (VecMat::Vec3<unsigned int > *)new VecMat::Vec3<unsigned int >(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Vec3u(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_Vec3u__SWIG_0(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_unsigned_SS_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_Vec3u__SWIG_3(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    {
+      int res = SWIG_AsVal_unsigned_SS_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      {
+        int res = SWIG_AsVal_unsigned_SS_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_new_Vec3u__SWIG_2(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    {
+      int res = SWIG_AsVal_unsigned_SS_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      {
+        int res = SWIG_AsVal_unsigned_SS_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        {
+          int res = SWIG_AsVal_unsigned_SS_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          return _wrap_new_Vec3u__SWIG_1(self, args);
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec3u'.\n  Possible C/C++ prototypes are:\n    VecMat::Vec3<(unsigned int)>()\n    VecMat::Vec3<(unsigned int)>(VecMat::Vec3<unsigned int >::value_type const,VecMat::Vec3<unsigned int >::value_type const,VecMat::Vec3<unsigned int >::value_type const)\n    VecMat::Vec3<(unsigned int)>(VecMat::Vec3<unsigned int >::value_type const,VecMat::Vec3<unsigned int >::value_type const)\n    VecMat::Vec3<(unsigned int)>(VecMat::Vec3<unsigned int >::value_type const)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3u_x__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
+  VecMat::Vec3<unsigned int >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec3u_x",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_x" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
+  {
+    try {
+      result = (VecMat::Vec3<unsigned int >::value_type)((VecMat::Vec3<unsigned int > const *)arg1)->x();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3u_x__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
+  VecMat::Vec3<unsigned int >::value_type *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec3u_x",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_x" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
+  {
+    try {
+      {
+        VecMat::Vec3<unsigned int >::value_type &_result_ref = (arg1)->x();
+        result = (VecMat::Vec3<unsigned int >::value_type *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_unsigned_int, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3u_x(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Vec3u_x__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Vec3u_x__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3u_x'.\n  Possible C/C++ prototypes are:\n    x()\n    x()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3u_y__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
+  VecMat::Vec3<unsigned int >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec3u_y",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_y" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
+  {
+    try {
+      result = (VecMat::Vec3<unsigned int >::value_type)((VecMat::Vec3<unsigned int > const *)arg1)->y();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3u_y__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
+  VecMat::Vec3<unsigned int >::value_type *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec3u_y",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_y" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
+  {
+    try {
+      {
+        VecMat::Vec3<unsigned int >::value_type &_result_ref = (arg1)->y();
+        result = (VecMat::Vec3<unsigned int >::value_type *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_unsigned_int, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3u_y(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Vec3u_y__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Vec3u_y__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3u_y'.\n  Possible C/C++ prototypes are:\n    y()\n    y()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3u_z__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
+  VecMat::Vec3<unsigned int >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec3u_z",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_z" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
+  {
+    try {
+      result = (VecMat::Vec3<unsigned int >::value_type)((VecMat::Vec3<unsigned int > const *)arg1)->z();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3u_z__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
+  VecMat::Vec3<unsigned int >::value_type *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec3u_z",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_z" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
+  {
+    try {
+      {
+        VecMat::Vec3<unsigned int >::value_type &_result_ref = (arg1)->z();
+        result = (VecMat::Vec3<unsigned int >::value_type *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_unsigned_int, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3u_z(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Vec3u_z__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Vec3u_z__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3u_z'.\n  Possible C/C++ prototypes are:\n    z()\n    z()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3u_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
+  VecMat::Vec3<unsigned int >::value_type arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec3u_setX",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_setX" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3u_setX" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec3<unsigned int >::value_type >(val2);
+  {
+    try {
+      (arg1)->setX(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3u_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
+  VecMat::Vec3<unsigned int >::value_type arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec3u_setY",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_setY" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3u_setY" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec3<unsigned int >::value_type >(val2);
+  {
+    try {
+      (arg1)->setY(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3u_setZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
+  VecMat::Vec3<unsigned int >::value_type arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec3u_setZ",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_setZ" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3u_setZ" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec3<unsigned int >::value_type >(val2);
+  {
+    try {
+      (arg1)->setZ(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3u___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
+  VecMat::Vec3<unsigned int > *arg2 = 0 ;
+  VecMat::Vec3<unsigned int > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec3u___add__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u___add__" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3u___add__" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3u___add__" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp2);
+  {
+    try {
+      result = ((VecMat::Vec3<unsigned int > const *)arg1)->operator +((VecMat::Vec3<unsigned int > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<unsigned int >(static_cast< const VecMat::Vec3<unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3u___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
+  VecMat::Vec3<unsigned int > *arg2 = 0 ;
+  VecMat::Vec3<unsigned int > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec3u___sub__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u___sub__" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3u___sub__" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3u___sub__" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp2);
+  {
+    try {
+      result = ((VecMat::Vec3<unsigned int > const *)arg1)->operator -((VecMat::Vec3<unsigned int > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<unsigned int >(static_cast< const VecMat::Vec3<unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3u___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
+  VecMat::Vec3<unsigned int >::value_type arg2 ;
+  VecMat::Vec3<unsigned int > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec3u___mul__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u___mul__" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3u___mul__" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec3<unsigned int >::value_type >(val2);
+  {
+    try {
+      result = ((VecMat::Vec3<unsigned int > const *)arg1)->operator *(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<unsigned int >(static_cast< const VecMat::Vec3<unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3u___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
+  VecMat::Vec3<unsigned int >::value_type arg2 ;
+  VecMat::Vec3<unsigned int > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec3u___div__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u___div__" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3u___div__" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec3<unsigned int >::value_type >(val2);
+  {
+    try {
+      result = ((VecMat::Vec3<unsigned int > const *)arg1)->operator /(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<unsigned int >(static_cast< const VecMat::Vec3<unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3u___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
+  VecMat::Vec3<unsigned int > *arg2 = 0 ;
+  VecMat::Vec3<unsigned int >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec3u___mul__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u___mul__" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3u___mul__" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3u___mul__" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp2);
+  {
+    try {
+      result = (VecMat::Vec3<unsigned int >::value_type)((VecMat::Vec3<unsigned int > const *)arg1)->operator *((VecMat::Vec3<unsigned int > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3u___mul__(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_Vec3u___mul____SWIG_1(self, args);
+      }
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_unsigned_SS_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_Vec3u___mul____SWIG_0(self, args);
+      }
+    }
+  }
+  
+fail:
+  Py_INCREF(Py_NotImplemented);
+  return Py_NotImplemented;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3u___xor__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
+  VecMat::Vec3<unsigned int > *arg2 = 0 ;
+  VecMat::Vec3<unsigned int > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec3u___xor__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u___xor__" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3u___xor__" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3u___xor__" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp2);
+  {
+    try {
+      result = ((VecMat::Vec3<unsigned int > const *)arg1)->operator ^((VecMat::Vec3<unsigned int > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<unsigned int >(static_cast< const VecMat::Vec3<unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_Vec3u(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec3u",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec3u" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *Vec3u_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_Vec3i__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<int > *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_Vec3i")) SWIG_fail;
+  {
+    try {
+      result = (VecMat::Vec3<int > *)new VecMat::Vec3<int >();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tint_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Vec3i__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<int >::value_type arg1 ;
+  VecMat::Vec3<int >::value_type arg2 ;
+  VecMat::Vec3<int >::value_type arg3 ;
+  VecMat::Vec3<int > *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:new_Vec3i",&obj0,&obj1,&obj2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3i" "', argument " "1"" of type '" "VecMat::Vec3<int >::value_type""'");
+  } 
+  arg1 = static_cast< VecMat::Vec3<int >::value_type >(val1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3i" "', argument " "2"" of type '" "VecMat::Vec3<int >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec3<int >::value_type >(val2);
+  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_Vec3i" "', argument " "3"" of type '" "VecMat::Vec3<int >::value_type""'");
+  } 
+  arg3 = static_cast< VecMat::Vec3<int >::value_type >(val3);
+  {
+    try {
+      result = (VecMat::Vec3<int > *)new VecMat::Vec3<int >(arg1,arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tint_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Vec3i__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<int >::value_type arg1 ;
+  VecMat::Vec3<int >::value_type arg2 ;
+  VecMat::Vec3<int > *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_Vec3i",&obj0,&obj1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3i" "', argument " "1"" of type '" "VecMat::Vec3<int >::value_type""'");
+  } 
+  arg1 = static_cast< VecMat::Vec3<int >::value_type >(val1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3i" "', argument " "2"" of type '" "VecMat::Vec3<int >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec3<int >::value_type >(val2);
+  {
+    try {
+      result = (VecMat::Vec3<int > *)new VecMat::Vec3<int >(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tint_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Vec3i__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<int >::value_type arg1 ;
+  VecMat::Vec3<int > *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_Vec3i",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3i" "', argument " "1"" of type '" "VecMat::Vec3<int >::value_type""'");
+  } 
+  arg1 = static_cast< VecMat::Vec3<int >::value_type >(val1);
+  {
+    try {
+      result = (VecMat::Vec3<int > *)new VecMat::Vec3<int >(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tint_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Vec3i(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_Vec3i__SWIG_0(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_Vec3i__SWIG_3(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    {
+      int res = SWIG_AsVal_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      {
+        int res = SWIG_AsVal_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_new_Vec3i__SWIG_2(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    {
+      int res = SWIG_AsVal_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      {
+        int res = SWIG_AsVal_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          return _wrap_new_Vec3i__SWIG_1(self, args);
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec3i'.\n  Possible C/C++ prototypes are:\n    VecMat::Vec3<(int)>()\n    VecMat::Vec3<(int)>(VecMat::Vec3<int >::value_type const,VecMat::Vec3<int >::value_type const,VecMat::Vec3<int >::value_type const)\n    VecMat::Vec3<(int)>(VecMat::Vec3<int >::value_type const,VecMat::Vec3<int >::value_type const)\n    VecMat::Vec3<(int)>(VecMat::Vec3<int >::value_type const)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3i_x__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
+  VecMat::Vec3<int >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec3i_x",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_x" "', argument " "1"" of type '" "VecMat::Vec3<int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
+  {
+    try {
+      result = (VecMat::Vec3<int >::value_type)((VecMat::Vec3<int > const *)arg1)->x();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3i_x__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
+  VecMat::Vec3<int >::value_type *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec3i_x",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_x" "', argument " "1"" of type '" "VecMat::Vec3<int > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
+  {
+    try {
+      {
+        VecMat::Vec3<int >::value_type &_result_ref = (arg1)->x();
+        result = (VecMat::Vec3<int >::value_type *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_int, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3i_x(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tint_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Vec3i_x__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tint_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Vec3i_x__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3i_x'.\n  Possible C/C++ prototypes are:\n    x()\n    x()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3i_y__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
+  VecMat::Vec3<int >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec3i_y",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_y" "', argument " "1"" of type '" "VecMat::Vec3<int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
+  {
+    try {
+      result = (VecMat::Vec3<int >::value_type)((VecMat::Vec3<int > const *)arg1)->y();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3i_y__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
+  VecMat::Vec3<int >::value_type *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec3i_y",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_y" "', argument " "1"" of type '" "VecMat::Vec3<int > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
+  {
+    try {
+      {
+        VecMat::Vec3<int >::value_type &_result_ref = (arg1)->y();
+        result = (VecMat::Vec3<int >::value_type *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_int, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3i_y(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tint_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Vec3i_y__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tint_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Vec3i_y__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3i_y'.\n  Possible C/C++ prototypes are:\n    y()\n    y()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3i_z__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
+  VecMat::Vec3<int >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec3i_z",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_z" "', argument " "1"" of type '" "VecMat::Vec3<int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
+  {
+    try {
+      result = (VecMat::Vec3<int >::value_type)((VecMat::Vec3<int > const *)arg1)->z();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3i_z__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
+  VecMat::Vec3<int >::value_type *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec3i_z",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_z" "', argument " "1"" of type '" "VecMat::Vec3<int > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
+  {
+    try {
+      {
+        VecMat::Vec3<int >::value_type &_result_ref = (arg1)->z();
+        result = (VecMat::Vec3<int >::value_type *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_int, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3i_z(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tint_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Vec3i_z__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tint_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Vec3i_z__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3i_z'.\n  Possible C/C++ prototypes are:\n    z()\n    z()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3i_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
+  VecMat::Vec3<int >::value_type arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec3i_setX",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_setX" "', argument " "1"" of type '" "VecMat::Vec3<int > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3i_setX" "', argument " "2"" of type '" "VecMat::Vec3<int >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec3<int >::value_type >(val2);
+  {
+    try {
+      (arg1)->setX(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3i_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
+  VecMat::Vec3<int >::value_type arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec3i_setY",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_setY" "', argument " "1"" of type '" "VecMat::Vec3<int > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3i_setY" "', argument " "2"" of type '" "VecMat::Vec3<int >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec3<int >::value_type >(val2);
+  {
+    try {
+      (arg1)->setY(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3i_setZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
+  VecMat::Vec3<int >::value_type arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec3i_setZ",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_setZ" "', argument " "1"" of type '" "VecMat::Vec3<int > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3i_setZ" "', argument " "2"" of type '" "VecMat::Vec3<int >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec3<int >::value_type >(val2);
+  {
+    try {
+      (arg1)->setZ(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3i___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
+  VecMat::Vec3<int > *arg2 = 0 ;
+  VecMat::Vec3<int > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec3i___add__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i___add__" "', argument " "1"" of type '" "VecMat::Vec3<int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tint_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3i___add__" "', argument " "2"" of type '" "VecMat::Vec3<int > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3i___add__" "', argument " "2"" of type '" "VecMat::Vec3<int > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec3<int > * >(argp2);
+  {
+    try {
+      result = ((VecMat::Vec3<int > const *)arg1)->operator +((VecMat::Vec3<int > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<int >(static_cast< const VecMat::Vec3<int >& >(result))), SWIGTYPE_p_VecMat__Vec3Tint_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3i___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
+  VecMat::Vec3<int > *arg2 = 0 ;
+  VecMat::Vec3<int > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec3i___sub__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i___sub__" "', argument " "1"" of type '" "VecMat::Vec3<int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tint_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3i___sub__" "', argument " "2"" of type '" "VecMat::Vec3<int > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3i___sub__" "', argument " "2"" of type '" "VecMat::Vec3<int > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec3<int > * >(argp2);
+  {
+    try {
+      result = ((VecMat::Vec3<int > const *)arg1)->operator -((VecMat::Vec3<int > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<int >(static_cast< const VecMat::Vec3<int >& >(result))), SWIGTYPE_p_VecMat__Vec3Tint_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3i___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
+  VecMat::Vec3<int >::value_type arg2 ;
+  VecMat::Vec3<int > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec3i___mul__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i___mul__" "', argument " "1"" of type '" "VecMat::Vec3<int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3i___mul__" "', argument " "2"" of type '" "VecMat::Vec3<int >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec3<int >::value_type >(val2);
+  {
+    try {
+      result = ((VecMat::Vec3<int > const *)arg1)->operator *(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<int >(static_cast< const VecMat::Vec3<int >& >(result))), SWIGTYPE_p_VecMat__Vec3Tint_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3i___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
+  VecMat::Vec3<int >::value_type arg2 ;
+  VecMat::Vec3<int > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec3i___div__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i___div__" "', argument " "1"" of type '" "VecMat::Vec3<int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3i___div__" "', argument " "2"" of type '" "VecMat::Vec3<int >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec3<int >::value_type >(val2);
+  {
+    try {
+      result = ((VecMat::Vec3<int > const *)arg1)->operator /(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<int >(static_cast< const VecMat::Vec3<int >& >(result))), SWIGTYPE_p_VecMat__Vec3Tint_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3i___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
+  VecMat::Vec3<int > *arg2 = 0 ;
+  VecMat::Vec3<int >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec3i___mul__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i___mul__" "', argument " "1"" of type '" "VecMat::Vec3<int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tint_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3i___mul__" "', argument " "2"" of type '" "VecMat::Vec3<int > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3i___mul__" "', argument " "2"" of type '" "VecMat::Vec3<int > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec3<int > * >(argp2);
+  {
+    try {
+      result = (VecMat::Vec3<int >::value_type)((VecMat::Vec3<int > const *)arg1)->operator *((VecMat::Vec3<int > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3i___mul__(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tint_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec3Tint_t, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_Vec3i___mul____SWIG_1(self, args);
+      }
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tint_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_Vec3i___mul____SWIG_0(self, args);
+      }
+    }
+  }
+  
+fail:
+  Py_INCREF(Py_NotImplemented);
+  return Py_NotImplemented;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3i___xor__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
+  VecMat::Vec3<int > *arg2 = 0 ;
+  VecMat::Vec3<int > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec3i___xor__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i___xor__" "', argument " "1"" of type '" "VecMat::Vec3<int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tint_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3i___xor__" "', argument " "2"" of type '" "VecMat::Vec3<int > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3i___xor__" "', argument " "2"" of type '" "VecMat::Vec3<int > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec3<int > * >(argp2);
+  {
+    try {
+      result = ((VecMat::Vec3<int > const *)arg1)->operator ^((VecMat::Vec3<int > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<int >(static_cast< const VecMat::Vec3<int >& >(result))), SWIGTYPE_p_VecMat__Vec3Tint_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_Vec3i(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec3i",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec3i" "', argument " "1"" of type '" "VecMat::Vec3<int > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *Vec3i_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec3Tint_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_Vec3f__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<float > *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_Vec3f")) SWIG_fail;
+  {
+    try {
+      result = (VecMat::Vec3<float > *)new VecMat::Vec3<float >();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Vec3f__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<float >::value_type arg1 ;
+  VecMat::Vec3<float >::value_type arg2 ;
+  VecMat::Vec3<float >::value_type arg3 ;
+  VecMat::Vec3<float > *result = 0 ;
+  float val1 ;
+  int ecode1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  float val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:new_Vec3f",&obj0,&obj1,&obj2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_float(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3f" "', argument " "1"" of type '" "VecMat::Vec3<float >::value_type""'");
+  } 
+  arg1 = static_cast< VecMat::Vec3<float >::value_type >(val1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3f" "', argument " "2"" of type '" "VecMat::Vec3<float >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec3<float >::value_type >(val2);
+  ecode3 = SWIG_AsVal_float(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_Vec3f" "', argument " "3"" of type '" "VecMat::Vec3<float >::value_type""'");
+  } 
+  arg3 = static_cast< VecMat::Vec3<float >::value_type >(val3);
+  {
+    try {
+      result = (VecMat::Vec3<float > *)new VecMat::Vec3<float >(arg1,arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Vec3f__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<float >::value_type arg1 ;
+  VecMat::Vec3<float >::value_type arg2 ;
+  VecMat::Vec3<float > *result = 0 ;
+  float val1 ;
+  int ecode1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_Vec3f",&obj0,&obj1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_float(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3f" "', argument " "1"" of type '" "VecMat::Vec3<float >::value_type""'");
+  } 
+  arg1 = static_cast< VecMat::Vec3<float >::value_type >(val1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3f" "', argument " "2"" of type '" "VecMat::Vec3<float >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec3<float >::value_type >(val2);
+  {
+    try {
+      result = (VecMat::Vec3<float > *)new VecMat::Vec3<float >(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Vec3f__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<float >::value_type arg1 ;
+  VecMat::Vec3<float > *result = 0 ;
+  float val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_Vec3f",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_float(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3f" "', argument " "1"" of type '" "VecMat::Vec3<float >::value_type""'");
+  } 
+  arg1 = static_cast< VecMat::Vec3<float >::value_type >(val1);
+  {
+    try {
+      result = (VecMat::Vec3<float > *)new VecMat::Vec3<float >(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Vec3f(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_Vec3f__SWIG_0(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_float(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_Vec3f__SWIG_3(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    {
+      int res = SWIG_AsVal_float(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      {
+        int res = SWIG_AsVal_float(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_new_Vec3f__SWIG_2(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    {
+      int res = SWIG_AsVal_float(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      {
+        int res = SWIG_AsVal_float(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        {
+          int res = SWIG_AsVal_float(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          return _wrap_new_Vec3f__SWIG_1(self, args);
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec3f'.\n  Possible C/C++ prototypes are:\n    VecMat::Vec3<(float)>()\n    VecMat::Vec3<(float)>(VecMat::Vec3<float >::value_type const,VecMat::Vec3<float >::value_type const,VecMat::Vec3<float >::value_type const)\n    VecMat::Vec3<(float)>(VecMat::Vec3<float >::value_type const,VecMat::Vec3<float >::value_type const)\n    VecMat::Vec3<(float)>(VecMat::Vec3<float >::value_type const)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3f_x__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
+  VecMat::Vec3<float >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec3f_x",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_x" "', argument " "1"" of type '" "VecMat::Vec3<float > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
+  {
+    try {
+      result = (VecMat::Vec3<float >::value_type)((VecMat::Vec3<float > const *)arg1)->x();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3f_x__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
+  VecMat::Vec3<float >::value_type *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec3f_x",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_x" "', argument " "1"" of type '" "VecMat::Vec3<float > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
+  {
+    try {
+      {
+        VecMat::Vec3<float >::value_type &_result_ref = (arg1)->x();
+        result = (VecMat::Vec3<float >::value_type *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_float, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3f_x(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Vec3f_x__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Vec3f_x__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3f_x'.\n  Possible C/C++ prototypes are:\n    x()\n    x()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3f_y__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
+  VecMat::Vec3<float >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec3f_y",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_y" "', argument " "1"" of type '" "VecMat::Vec3<float > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
+  {
+    try {
+      result = (VecMat::Vec3<float >::value_type)((VecMat::Vec3<float > const *)arg1)->y();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3f_y__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
+  VecMat::Vec3<float >::value_type *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec3f_y",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_y" "', argument " "1"" of type '" "VecMat::Vec3<float > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
+  {
+    try {
+      {
+        VecMat::Vec3<float >::value_type &_result_ref = (arg1)->y();
+        result = (VecMat::Vec3<float >::value_type *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_float, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3f_y(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Vec3f_y__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Vec3f_y__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3f_y'.\n  Possible C/C++ prototypes are:\n    y()\n    y()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3f_z__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
+  VecMat::Vec3<float >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec3f_z",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_z" "', argument " "1"" of type '" "VecMat::Vec3<float > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
+  {
+    try {
+      result = (VecMat::Vec3<float >::value_type)((VecMat::Vec3<float > const *)arg1)->z();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3f_z__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
+  VecMat::Vec3<float >::value_type *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec3f_z",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_z" "', argument " "1"" of type '" "VecMat::Vec3<float > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
+  {
+    try {
+      {
+        VecMat::Vec3<float >::value_type &_result_ref = (arg1)->z();
+        result = (VecMat::Vec3<float >::value_type *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_float, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3f_z(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Vec3f_z__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Vec3f_z__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3f_z'.\n  Possible C/C++ prototypes are:\n    z()\n    z()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3f_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
+  VecMat::Vec3<float >::value_type arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec3f_setX",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_setX" "', argument " "1"" of type '" "VecMat::Vec3<float > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3f_setX" "', argument " "2"" of type '" "VecMat::Vec3<float >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec3<float >::value_type >(val2);
+  {
+    try {
+      (arg1)->setX(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3f_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
+  VecMat::Vec3<float >::value_type arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec3f_setY",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_setY" "', argument " "1"" of type '" "VecMat::Vec3<float > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3f_setY" "', argument " "2"" of type '" "VecMat::Vec3<float >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec3<float >::value_type >(val2);
+  {
+    try {
+      (arg1)->setY(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3f_setZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
+  VecMat::Vec3<float >::value_type arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec3f_setZ",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_setZ" "', argument " "1"" of type '" "VecMat::Vec3<float > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3f_setZ" "', argument " "2"" of type '" "VecMat::Vec3<float >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec3<float >::value_type >(val2);
+  {
+    try {
+      (arg1)->setZ(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3f___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
+  VecMat::Vec3<float > *arg2 = 0 ;
+  VecMat::Vec3<float > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec3f___add__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f___add__" "', argument " "1"" of type '" "VecMat::Vec3<float > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tfloat_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3f___add__" "', argument " "2"" of type '" "VecMat::Vec3<float > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3f___add__" "', argument " "2"" of type '" "VecMat::Vec3<float > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec3<float > * >(argp2);
+  {
+    try {
+      result = ((VecMat::Vec3<float > const *)arg1)->operator +((VecMat::Vec3<float > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<float >(static_cast< const VecMat::Vec3<float >& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3f___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
+  VecMat::Vec3<float > *arg2 = 0 ;
+  VecMat::Vec3<float > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec3f___sub__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f___sub__" "', argument " "1"" of type '" "VecMat::Vec3<float > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tfloat_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3f___sub__" "', argument " "2"" of type '" "VecMat::Vec3<float > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3f___sub__" "', argument " "2"" of type '" "VecMat::Vec3<float > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec3<float > * >(argp2);
+  {
+    try {
+      result = ((VecMat::Vec3<float > const *)arg1)->operator -((VecMat::Vec3<float > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<float >(static_cast< const VecMat::Vec3<float >& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3f___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
+  VecMat::Vec3<float >::value_type arg2 ;
+  VecMat::Vec3<float > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec3f___mul__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f___mul__" "', argument " "1"" of type '" "VecMat::Vec3<float > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3f___mul__" "', argument " "2"" of type '" "VecMat::Vec3<float >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec3<float >::value_type >(val2);
+  {
+    try {
+      result = ((VecMat::Vec3<float > const *)arg1)->operator *(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<float >(static_cast< const VecMat::Vec3<float >& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3f___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
+  VecMat::Vec3<float >::value_type arg2 ;
+  VecMat::Vec3<float > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec3f___div__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f___div__" "', argument " "1"" of type '" "VecMat::Vec3<float > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3f___div__" "', argument " "2"" of type '" "VecMat::Vec3<float >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec3<float >::value_type >(val2);
+  {
+    try {
+      result = ((VecMat::Vec3<float > const *)arg1)->operator /(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<float >(static_cast< const VecMat::Vec3<float >& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3f___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
+  VecMat::Vec3<float > *arg2 = 0 ;
+  VecMat::Vec3<float >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec3f___mul__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f___mul__" "', argument " "1"" of type '" "VecMat::Vec3<float > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tfloat_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3f___mul__" "', argument " "2"" of type '" "VecMat::Vec3<float > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3f___mul__" "', argument " "2"" of type '" "VecMat::Vec3<float > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec3<float > * >(argp2);
+  {
+    try {
+      result = (VecMat::Vec3<float >::value_type)((VecMat::Vec3<float > const *)arg1)->operator *((VecMat::Vec3<float > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3f___mul__(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_Vec3f___mul____SWIG_1(self, args);
+      }
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_float(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_Vec3f___mul____SWIG_0(self, args);
+      }
+    }
+  }
+  
+fail:
+  Py_INCREF(Py_NotImplemented);
+  return Py_NotImplemented;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3f___xor__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
+  VecMat::Vec3<float > *arg2 = 0 ;
+  VecMat::Vec3<float > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec3f___xor__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f___xor__" "', argument " "1"" of type '" "VecMat::Vec3<float > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tfloat_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3f___xor__" "', argument " "2"" of type '" "VecMat::Vec3<float > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3f___xor__" "', argument " "2"" of type '" "VecMat::Vec3<float > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec3<float > * >(argp2);
+  {
+    try {
+      result = ((VecMat::Vec3<float > const *)arg1)->operator ^((VecMat::Vec3<float > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<float >(static_cast< const VecMat::Vec3<float >& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_Vec3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec3f",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec3f" "', argument " "1"" of type '" "VecMat::Vec3<float > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *Vec3f_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_Vec3d__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<double > *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_Vec3d")) SWIG_fail;
+  {
+    try {
+      result = (VecMat::Vec3<double > *)new VecMat::Vec3<double >();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Vec3d__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<double >::value_type arg1 ;
+  VecMat::Vec3<double >::value_type arg2 ;
+  VecMat::Vec3<double >::value_type arg3 ;
+  VecMat::Vec3<double > *result = 0 ;
+  double val1 ;
+  int ecode1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  double val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:new_Vec3d",&obj0,&obj1,&obj2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3d" "', argument " "1"" of type '" "VecMat::Vec3<double >::value_type""'");
+  } 
+  arg1 = static_cast< VecMat::Vec3<double >::value_type >(val1);
+  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3d" "', argument " "2"" of type '" "VecMat::Vec3<double >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec3<double >::value_type >(val2);
+  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_Vec3d" "', argument " "3"" of type '" "VecMat::Vec3<double >::value_type""'");
+  } 
+  arg3 = static_cast< VecMat::Vec3<double >::value_type >(val3);
+  {
+    try {
+      result = (VecMat::Vec3<double > *)new VecMat::Vec3<double >(arg1,arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Vec3d__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<double >::value_type arg1 ;
+  VecMat::Vec3<double >::value_type arg2 ;
+  VecMat::Vec3<double > *result = 0 ;
+  double val1 ;
+  int ecode1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_Vec3d",&obj0,&obj1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3d" "', argument " "1"" of type '" "VecMat::Vec3<double >::value_type""'");
+  } 
+  arg1 = static_cast< VecMat::Vec3<double >::value_type >(val1);
+  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3d" "', argument " "2"" of type '" "VecMat::Vec3<double >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec3<double >::value_type >(val2);
+  {
+    try {
+      result = (VecMat::Vec3<double > *)new VecMat::Vec3<double >(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Vec3d__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<double >::value_type arg1 ;
+  VecMat::Vec3<double > *result = 0 ;
+  double val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_Vec3d",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3d" "', argument " "1"" of type '" "VecMat::Vec3<double >::value_type""'");
+  } 
+  arg1 = static_cast< VecMat::Vec3<double >::value_type >(val1);
+  {
+    try {
+      result = (VecMat::Vec3<double > *)new VecMat::Vec3<double >(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Vec3d(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_Vec3d__SWIG_0(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_double(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_Vec3d__SWIG_3(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    {
+      int res = SWIG_AsVal_double(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      {
+        int res = SWIG_AsVal_double(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_new_Vec3d__SWIG_2(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    {
+      int res = SWIG_AsVal_double(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      {
+        int res = SWIG_AsVal_double(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        {
+          int res = SWIG_AsVal_double(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          return _wrap_new_Vec3d__SWIG_1(self, args);
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec3d'.\n  Possible C/C++ prototypes are:\n    VecMat::Vec3<(double)>()\n    VecMat::Vec3<(double)>(VecMat::Vec3<double >::value_type const,VecMat::Vec3<double >::value_type const,VecMat::Vec3<double >::value_type const)\n    VecMat::Vec3<(double)>(VecMat::Vec3<double >::value_type const,VecMat::Vec3<double >::value_type const)\n    VecMat::Vec3<(double)>(VecMat::Vec3<double >::value_type const)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3d_x__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
+  VecMat::Vec3<double >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec3d_x",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_x" "', argument " "1"" of type '" "VecMat::Vec3<double > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
+  {
+    try {
+      result = (VecMat::Vec3<double >::value_type)((VecMat::Vec3<double > const *)arg1)->x();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3d_x__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
+  VecMat::Vec3<double >::value_type *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec3d_x",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_x" "', argument " "1"" of type '" "VecMat::Vec3<double > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
+  {
+    try {
+      {
+        VecMat::Vec3<double >::value_type &_result_ref = (arg1)->x();
+        result = (VecMat::Vec3<double >::value_type *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_double, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3d_x(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Vec3d_x__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Vec3d_x__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3d_x'.\n  Possible C/C++ prototypes are:\n    x()\n    x()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3d_y__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
+  VecMat::Vec3<double >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec3d_y",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_y" "', argument " "1"" of type '" "VecMat::Vec3<double > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
+  {
+    try {
+      result = (VecMat::Vec3<double >::value_type)((VecMat::Vec3<double > const *)arg1)->y();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3d_y__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
+  VecMat::Vec3<double >::value_type *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec3d_y",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_y" "', argument " "1"" of type '" "VecMat::Vec3<double > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
+  {
+    try {
+      {
+        VecMat::Vec3<double >::value_type &_result_ref = (arg1)->y();
+        result = (VecMat::Vec3<double >::value_type *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_double, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3d_y(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Vec3d_y__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Vec3d_y__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3d_y'.\n  Possible C/C++ prototypes are:\n    y()\n    y()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3d_z__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
+  VecMat::Vec3<double >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec3d_z",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_z" "', argument " "1"" of type '" "VecMat::Vec3<double > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
+  {
+    try {
+      result = (VecMat::Vec3<double >::value_type)((VecMat::Vec3<double > const *)arg1)->z();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3d_z__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
+  VecMat::Vec3<double >::value_type *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Vec3d_z",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_z" "', argument " "1"" of type '" "VecMat::Vec3<double > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
+  {
+    try {
+      {
+        VecMat::Vec3<double >::value_type &_result_ref = (arg1)->z();
+        result = (VecMat::Vec3<double >::value_type *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_double, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3d_z(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Vec3d_z__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Vec3d_z__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3d_z'.\n  Possible C/C++ prototypes are:\n    z()\n    z()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3d_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
+  VecMat::Vec3<double >::value_type arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec3d_setX",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_setX" "', argument " "1"" of type '" "VecMat::Vec3<double > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
+  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3d_setX" "', argument " "2"" of type '" "VecMat::Vec3<double >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec3<double >::value_type >(val2);
+  {
+    try {
+      (arg1)->setX(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3d_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
+  VecMat::Vec3<double >::value_type arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec3d_setY",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_setY" "', argument " "1"" of type '" "VecMat::Vec3<double > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
+  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3d_setY" "', argument " "2"" of type '" "VecMat::Vec3<double >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec3<double >::value_type >(val2);
+  {
+    try {
+      (arg1)->setY(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3d_setZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
+  VecMat::Vec3<double >::value_type arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec3d_setZ",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_setZ" "', argument " "1"" of type '" "VecMat::Vec3<double > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
+  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3d_setZ" "', argument " "2"" of type '" "VecMat::Vec3<double >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec3<double >::value_type >(val2);
+  {
+    try {
+      (arg1)->setZ(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3d___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
+  VecMat::Vec3<double > *arg2 = 0 ;
+  VecMat::Vec3<double > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec3d___add__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d___add__" "', argument " "1"" of type '" "VecMat::Vec3<double > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3d___add__" "', argument " "2"" of type '" "VecMat::Vec3<double > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3d___add__" "', argument " "2"" of type '" "VecMat::Vec3<double > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec3<double > * >(argp2);
+  {
+    try {
+      result = ((VecMat::Vec3<double > const *)arg1)->operator +((VecMat::Vec3<double > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<double >(static_cast< const VecMat::Vec3<double >& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3d___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
+  VecMat::Vec3<double > *arg2 = 0 ;
+  VecMat::Vec3<double > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec3d___sub__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d___sub__" "', argument " "1"" of type '" "VecMat::Vec3<double > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3d___sub__" "', argument " "2"" of type '" "VecMat::Vec3<double > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3d___sub__" "', argument " "2"" of type '" "VecMat::Vec3<double > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec3<double > * >(argp2);
+  {
+    try {
+      result = ((VecMat::Vec3<double > const *)arg1)->operator -((VecMat::Vec3<double > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<double >(static_cast< const VecMat::Vec3<double >& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3d___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
+  VecMat::Vec3<double >::value_type arg2 ;
+  VecMat::Vec3<double > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec3d___mul__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d___mul__" "', argument " "1"" of type '" "VecMat::Vec3<double > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
+  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3d___mul__" "', argument " "2"" of type '" "VecMat::Vec3<double >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec3<double >::value_type >(val2);
+  {
+    try {
+      result = ((VecMat::Vec3<double > const *)arg1)->operator *(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<double >(static_cast< const VecMat::Vec3<double >& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3d___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
+  VecMat::Vec3<double >::value_type arg2 ;
+  VecMat::Vec3<double > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec3d___div__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d___div__" "', argument " "1"" of type '" "VecMat::Vec3<double > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
+  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3d___div__" "', argument " "2"" of type '" "VecMat::Vec3<double >::value_type""'");
+  } 
+  arg2 = static_cast< VecMat::Vec3<double >::value_type >(val2);
+  {
+    try {
+      result = ((VecMat::Vec3<double > const *)arg1)->operator /(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<double >(static_cast< const VecMat::Vec3<double >& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3d___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
+  VecMat::Vec3<double > *arg2 = 0 ;
+  VecMat::Vec3<double >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec3d___mul__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d___mul__" "', argument " "1"" of type '" "VecMat::Vec3<double > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3d___mul__" "', argument " "2"" of type '" "VecMat::Vec3<double > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3d___mul__" "', argument " "2"" of type '" "VecMat::Vec3<double > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec3<double > * >(argp2);
+  {
+    try {
+      result = (VecMat::Vec3<double >::value_type)((VecMat::Vec3<double > const *)arg1)->operator *((VecMat::Vec3<double > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3d___mul__(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_Vec3d___mul____SWIG_1(self, args);
+      }
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_double(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_Vec3d___mul____SWIG_0(self, args);
+      }
+    }
+  }
+  
+fail:
+  Py_INCREF(Py_NotImplemented);
+  return Py_NotImplemented;
+}
+
+
+SWIGINTERN PyObject *_wrap_Vec3d___xor__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
+  VecMat::Vec3<double > *arg2 = 0 ;
+  VecMat::Vec3<double > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Vec3d___xor__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d___xor__" "', argument " "1"" of type '" "VecMat::Vec3<double > const *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3d___xor__" "', argument " "2"" of type '" "VecMat::Vec3<double > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3d___xor__" "', argument " "2"" of type '" "VecMat::Vec3<double > const &""'"); 
+  }
+  arg2 = reinterpret_cast< VecMat::Vec3<double > * >(argp2);
+  {
+    try {
+      result = ((VecMat::Vec3<double > const *)arg1)->operator ^((VecMat::Vec3<double > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<double >(static_cast< const VecMat::Vec3<double >& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_Vec3d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec3d",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec3d" "', argument " "1"" of type '" "VecMat::Vec3<double > *""'"); 
+  }
+  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *Vec3d_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_Noise(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Noise *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_Noise")) SWIG_fail;
+  {
+    try {
+      result = (Noise *)new Noise();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Noise, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_Noise(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Noise *arg1 = (Noise *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_Noise",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Noise, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Noise" "', argument " "1"" of type '" "Noise *""'"); 
+  }
+  arg1 = reinterpret_cast< Noise * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Noise_turbulence1__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Noise *arg1 = (Noise *) 0 ;
+  float arg2 ;
+  float arg3 ;
+  float arg4 ;
+  unsigned int arg5 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  float val3 ;
+  int ecode3 = 0 ;
+  float val4 ;
+  int ecode4 = 0 ;
+  unsigned int val5 ;
+  int ecode5 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOOO:Noise_turbulence1",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Noise, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Noise_turbulence1" "', argument " "1"" of type '" "Noise *""'"); 
+  }
+  arg1 = reinterpret_cast< Noise * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Noise_turbulence1" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  ecode3 = SWIG_AsVal_float(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Noise_turbulence1" "', argument " "3"" of type '" "float""'");
+  } 
+  arg3 = static_cast< float >(val3);
+  ecode4 = SWIG_AsVal_float(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Noise_turbulence1" "', argument " "4"" of type '" "float""'");
+  } 
+  arg4 = static_cast< float >(val4);
+  ecode5 = SWIG_AsVal_unsigned_SS_int(obj4, &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "Noise_turbulence1" "', argument " "5"" of type '" "unsigned int""'");
+  } 
+  arg5 = static_cast< unsigned int >(val5);
+  {
+    try {
+      result = (float)(arg1)->turbulence1(arg2,arg3,arg4,arg5);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Noise_turbulence1__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Noise *arg1 = (Noise *) 0 ;
+  float arg2 ;
+  float arg3 ;
+  float arg4 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  float val3 ;
+  int ecode3 = 0 ;
+  float val4 ;
+  int ecode4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOO:Noise_turbulence1",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Noise, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Noise_turbulence1" "', argument " "1"" of type '" "Noise *""'"); 
+  }
+  arg1 = reinterpret_cast< Noise * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Noise_turbulence1" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  ecode3 = SWIG_AsVal_float(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Noise_turbulence1" "', argument " "3"" of type '" "float""'");
+  } 
+  arg3 = static_cast< float >(val3);
+  ecode4 = SWIG_AsVal_float(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Noise_turbulence1" "', argument " "4"" of type '" "float""'");
+  } 
+  arg4 = static_cast< float >(val4);
+  {
+    try {
+      result = (float)(arg1)->turbulence1(arg2,arg3,arg4);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Noise_turbulence1(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[6];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 5); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 4) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Noise, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_float(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        {
+          int res = SWIG_AsVal_float(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          {
+            int res = SWIG_AsVal_float(argv[3], NULL);
+            _v = SWIG_CheckState(res);
+          }
+          if (_v) {
+            return _wrap_Noise_turbulence1__SWIG_1(self, args);
+          }
+        }
+      }
+    }
+  }
+  if (argc == 5) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Noise, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_float(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        {
+          int res = SWIG_AsVal_float(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          {
+            int res = SWIG_AsVal_float(argv[3], NULL);
+            _v = SWIG_CheckState(res);
+          }
+          if (_v) {
+            {
+              int res = SWIG_AsVal_unsigned_SS_int(argv[4], NULL);
+              _v = SWIG_CheckState(res);
+            }
+            if (_v) {
+              return _wrap_Noise_turbulence1__SWIG_0(self, args);
+            }
+          }
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Noise_turbulence1'.\n  Possible C/C++ prototypes are:\n    turbulence1(float,float,float,unsigned int)\n    turbulence1(float,float,float)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Noise_turbulence2__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Noise *arg1 = (Noise *) 0 ;
+  Geometry::Vec2f *arg2 = 0 ;
+  float arg3 ;
+  float arg4 ;
+  unsigned int arg5 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  float val3 ;
+  int ecode3 = 0 ;
+  float val4 ;
+  int ecode4 = 0 ;
+  unsigned int val5 ;
+  int ecode5 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOOO:Noise_turbulence2",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Noise, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Noise_turbulence2" "', argument " "1"" of type '" "Noise *""'"); 
+  }
+  arg1 = reinterpret_cast< Noise * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Noise_turbulence2" "', argument " "2"" of type '" "Geometry::Vec2f &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Noise_turbulence2" "', argument " "2"" of type '" "Geometry::Vec2f &""'"); 
+  }
+  arg2 = reinterpret_cast< Geometry::Vec2f * >(argp2);
+  ecode3 = SWIG_AsVal_float(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Noise_turbulence2" "', argument " "3"" of type '" "float""'");
+  } 
+  arg3 = static_cast< float >(val3);
+  ecode4 = SWIG_AsVal_float(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Noise_turbulence2" "', argument " "4"" of type '" "float""'");
+  } 
+  arg4 = static_cast< float >(val4);
+  ecode5 = SWIG_AsVal_unsigned_SS_int(obj4, &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "Noise_turbulence2" "', argument " "5"" of type '" "unsigned int""'");
+  } 
+  arg5 = static_cast< unsigned int >(val5);
+  {
+    try {
+      result = (float)(arg1)->turbulence2(*arg2,arg3,arg4,arg5);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Noise_turbulence2__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Noise *arg1 = (Noise *) 0 ;
+  Geometry::Vec2f *arg2 = 0 ;
+  float arg3 ;
+  float arg4 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  float val3 ;
+  int ecode3 = 0 ;
+  float val4 ;
+  int ecode4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOO:Noise_turbulence2",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Noise, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Noise_turbulence2" "', argument " "1"" of type '" "Noise *""'"); 
+  }
+  arg1 = reinterpret_cast< Noise * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Noise_turbulence2" "', argument " "2"" of type '" "Geometry::Vec2f &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Noise_turbulence2" "', argument " "2"" of type '" "Geometry::Vec2f &""'"); 
+  }
+  arg2 = reinterpret_cast< Geometry::Vec2f * >(argp2);
+  ecode3 = SWIG_AsVal_float(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Noise_turbulence2" "', argument " "3"" of type '" "float""'");
+  } 
+  arg3 = static_cast< float >(val3);
+  ecode4 = SWIG_AsVal_float(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Noise_turbulence2" "', argument " "4"" of type '" "float""'");
+  } 
+  arg4 = static_cast< float >(val4);
+  {
+    try {
+      result = (float)(arg1)->turbulence2(*arg2,arg3,arg4);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Noise_turbulence2(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[6];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 5); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 4) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Noise, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_float(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          {
+            int res = SWIG_AsVal_float(argv[3], NULL);
+            _v = SWIG_CheckState(res);
+          }
+          if (_v) {
+            return _wrap_Noise_turbulence2__SWIG_1(self, args);
+          }
+        }
+      }
+    }
+  }
+  if (argc == 5) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Noise, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_float(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          {
+            int res = SWIG_AsVal_float(argv[3], NULL);
+            _v = SWIG_CheckState(res);
+          }
+          if (_v) {
+            {
+              int res = SWIG_AsVal_unsigned_SS_int(argv[4], NULL);
+              _v = SWIG_CheckState(res);
+            }
+            if (_v) {
+              return _wrap_Noise_turbulence2__SWIG_0(self, args);
+            }
+          }
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Noise_turbulence2'.\n  Possible C/C++ prototypes are:\n    turbulence2(Geometry::Vec2f &,float,float,unsigned int)\n    turbulence2(Geometry::Vec2f &,float,float)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Noise_turbulence3__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Noise *arg1 = (Noise *) 0 ;
+  Geometry::Vec3f *arg2 = 0 ;
+  float arg3 ;
+  float arg4 ;
+  unsigned int arg5 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  float val3 ;
+  int ecode3 = 0 ;
+  float val4 ;
+  int ecode4 = 0 ;
+  unsigned int val5 ;
+  int ecode5 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOOO:Noise_turbulence3",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Noise, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Noise_turbulence3" "', argument " "1"" of type '" "Noise *""'"); 
+  }
+  arg1 = reinterpret_cast< Noise * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tfloat_t,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Noise_turbulence3" "', argument " "2"" of type '" "Geometry::Vec3f &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Noise_turbulence3" "', argument " "2"" of type '" "Geometry::Vec3f &""'"); 
+  }
+  arg2 = reinterpret_cast< Geometry::Vec3f * >(argp2);
+  ecode3 = SWIG_AsVal_float(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Noise_turbulence3" "', argument " "3"" of type '" "float""'");
+  } 
+  arg3 = static_cast< float >(val3);
+  ecode4 = SWIG_AsVal_float(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Noise_turbulence3" "', argument " "4"" of type '" "float""'");
+  } 
+  arg4 = static_cast< float >(val4);
+  ecode5 = SWIG_AsVal_unsigned_SS_int(obj4, &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "Noise_turbulence3" "', argument " "5"" of type '" "unsigned int""'");
+  } 
+  arg5 = static_cast< unsigned int >(val5);
+  {
+    try {
+      result = (float)(arg1)->turbulence3(*arg2,arg3,arg4,arg5);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Noise_turbulence3__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Noise *arg1 = (Noise *) 0 ;
+  Geometry::Vec3f *arg2 = 0 ;
+  float arg3 ;
+  float arg4 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  float val3 ;
+  int ecode3 = 0 ;
+  float val4 ;
+  int ecode4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOO:Noise_turbulence3",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Noise, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Noise_turbulence3" "', argument " "1"" of type '" "Noise *""'"); 
+  }
+  arg1 = reinterpret_cast< Noise * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tfloat_t,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Noise_turbulence3" "', argument " "2"" of type '" "Geometry::Vec3f &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Noise_turbulence3" "', argument " "2"" of type '" "Geometry::Vec3f &""'"); 
+  }
+  arg2 = reinterpret_cast< Geometry::Vec3f * >(argp2);
+  ecode3 = SWIG_AsVal_float(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Noise_turbulence3" "', argument " "3"" of type '" "float""'");
+  } 
+  arg3 = static_cast< float >(val3);
+  ecode4 = SWIG_AsVal_float(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Noise_turbulence3" "', argument " "4"" of type '" "float""'");
+  } 
+  arg4 = static_cast< float >(val4);
+  {
+    try {
+      result = (float)(arg1)->turbulence3(*arg2,arg3,arg4);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Noise_turbulence3(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[6];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 5); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 4) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Noise, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_float(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          {
+            int res = SWIG_AsVal_float(argv[3], NULL);
+            _v = SWIG_CheckState(res);
+          }
+          if (_v) {
+            return _wrap_Noise_turbulence3__SWIG_1(self, args);
+          }
+        }
+      }
+    }
+  }
+  if (argc == 5) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Noise, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_float(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          {
+            int res = SWIG_AsVal_float(argv[3], NULL);
+            _v = SWIG_CheckState(res);
+          }
+          if (_v) {
+            {
+              int res = SWIG_AsVal_unsigned_SS_int(argv[4], NULL);
+              _v = SWIG_CheckState(res);
+            }
+            if (_v) {
+              return _wrap_Noise_turbulence3__SWIG_0(self, args);
+            }
+          }
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Noise_turbulence3'.\n  Possible C/C++ prototypes are:\n    turbulence3(Geometry::Vec3f &,float,float,unsigned int)\n    turbulence3(Geometry::Vec3f &,float,float)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Noise_smoothNoise1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Noise *arg1 = (Noise *) 0 ;
+  float arg2 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Noise_smoothNoise1",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Noise, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Noise_smoothNoise1" "', argument " "1"" of type '" "Noise *""'"); 
+  }
+  arg1 = reinterpret_cast< Noise * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Noise_smoothNoise1" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  {
+    try {
+      result = (float)(arg1)->smoothNoise1(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Noise_smoothNoise2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Noise *arg1 = (Noise *) 0 ;
+  Geometry::Vec2f *arg2 = 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Noise_smoothNoise2",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Noise, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Noise_smoothNoise2" "', argument " "1"" of type '" "Noise *""'"); 
+  }
+  arg1 = reinterpret_cast< Noise * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Noise_smoothNoise2" "', argument " "2"" of type '" "Geometry::Vec2f &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Noise_smoothNoise2" "', argument " "2"" of type '" "Geometry::Vec2f &""'"); 
+  }
+  arg2 = reinterpret_cast< Geometry::Vec2f * >(argp2);
+  {
+    try {
+      result = (float)(arg1)->smoothNoise2(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Noise_smoothNoise3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Noise *arg1 = (Noise *) 0 ;
+  Geometry::Vec3f *arg2 = 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Noise_smoothNoise3",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Noise, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Noise_smoothNoise3" "', argument " "1"" of type '" "Noise *""'"); 
+  }
+  arg1 = reinterpret_cast< Noise * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tfloat_t,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Noise_smoothNoise3" "', argument " "2"" of type '" "Geometry::Vec3f &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Noise_smoothNoise3" "', argument " "2"" of type '" "Geometry::Vec3f &""'"); 
+  }
+  arg2 = reinterpret_cast< Geometry::Vec3f * >(argp2);
+  {
+    try {
+      result = (float)(arg1)->smoothNoise3(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *Noise_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Noise, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_Material__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Material *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_Material")) SWIG_fail;
+  {
+    try {
+      result = (Material *)new Material();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Material, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Material__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  float *arg1 = (float *) 0 ;
+  float *arg2 = (float *) 0 ;
+  float *arg3 = (float *) 0 ;
+  float *arg4 = (float *) 0 ;
+  float arg5 ;
+  Material *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  float val5 ;
+  int ecode5 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOOO:new_Material",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_float, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_Material" "', argument " "1"" of type '" "float const *""'"); 
+  }
+  arg1 = reinterpret_cast< float * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_float, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_Material" "', argument " "2"" of type '" "float const *""'"); 
+  }
+  arg2 = reinterpret_cast< float * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_float, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_Material" "', argument " "3"" of type '" "float const *""'"); 
+  }
+  arg3 = reinterpret_cast< float * >(argp3);
+  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_p_float, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "new_Material" "', argument " "4"" of type '" "float const *""'"); 
+  }
+  arg4 = reinterpret_cast< float * >(argp4);
+  ecode5 = SWIG_AsVal_float(obj4, &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_Material" "', argument " "5"" of type '" "float""'");
+  } 
+  arg5 = static_cast< float >(val5);
+  {
+    try {
+      result = (Material *)new Material((float const *)arg1,(float const *)arg2,(float const *)arg3,(float const *)arg4,arg5);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Material, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Material__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Material *arg1 = 0 ;
+  Material *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_Material",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_Material,  0  | 0);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_Material" "', argument " "1"" of type '" "Material const &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_Material" "', argument " "1"" of type '" "Material const &""'"); 
+  }
+  arg1 = reinterpret_cast< Material * >(argp1);
+  {
+    try {
+      result = (Material *)new Material((Material const &)*arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Material, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Material(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[6];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 5); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_Material__SWIG_0(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Material, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_new_Material__SWIG_2(self, args);
+    }
+  }
+  if (argc == 5) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_float, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_float, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_float, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_float, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            {
+              int res = SWIG_AsVal_float(argv[4], NULL);
+              _v = SWIG_CheckState(res);
+            }
+            if (_v) {
+              return _wrap_new_Material__SWIG_1(self, args);
+            }
+          }
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Material'.\n  Possible C/C++ prototypes are:\n    Material()\n    Material(float const *,float const *,float const *,float const *,float const)\n    Material(Material const &)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_Material(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Material *arg1 = (Material *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_Material",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Material" "', argument " "1"" of type '" "Material *""'"); 
+  }
+  arg1 = reinterpret_cast< Material * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_diffuse(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Material *arg1 = (Material *) 0 ;
+  float *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Material_diffuse",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_diffuse" "', argument " "1"" of type '" "Material const *""'"); 
+  }
+  arg1 = reinterpret_cast< Material * >(argp1);
+  {
+    try {
+      result = (float *)((Material const *)arg1)->diffuse();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_float, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_diffuseR(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Material *arg1 = (Material *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Material_diffuseR",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_diffuseR" "', argument " "1"" of type '" "Material const *""'"); 
+  }
+  arg1 = reinterpret_cast< Material * >(argp1);
+  {
+    try {
+      result = (float)((Material const *)arg1)->diffuseR();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_diffuseG(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Material *arg1 = (Material *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Material_diffuseG",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_diffuseG" "', argument " "1"" of type '" "Material const *""'"); 
+  }
+  arg1 = reinterpret_cast< Material * >(argp1);
+  {
+    try {
+      result = (float)((Material const *)arg1)->diffuseG();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_diffuseB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Material *arg1 = (Material *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Material_diffuseB",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_diffuseB" "', argument " "1"" of type '" "Material const *""'"); 
+  }
+  arg1 = reinterpret_cast< Material * >(argp1);
+  {
+    try {
+      result = (float)((Material const *)arg1)->diffuseB();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_diffuseA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Material *arg1 = (Material *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Material_diffuseA",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_diffuseA" "', argument " "1"" of type '" "Material const *""'"); 
+  }
+  arg1 = reinterpret_cast< Material * >(argp1);
+  {
+    try {
+      result = (float)((Material const *)arg1)->diffuseA();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_specular(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Material *arg1 = (Material *) 0 ;
+  float *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Material_specular",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_specular" "', argument " "1"" of type '" "Material const *""'"); 
+  }
+  arg1 = reinterpret_cast< Material * >(argp1);
+  {
+    try {
+      result = (float *)((Material const *)arg1)->specular();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_float, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_specularR(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Material *arg1 = (Material *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Material_specularR",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_specularR" "', argument " "1"" of type '" "Material const *""'"); 
+  }
+  arg1 = reinterpret_cast< Material * >(argp1);
+  {
+    try {
+      result = (float)((Material const *)arg1)->specularR();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_specularG(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Material *arg1 = (Material *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Material_specularG",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_specularG" "', argument " "1"" of type '" "Material const *""'"); 
+  }
+  arg1 = reinterpret_cast< Material * >(argp1);
+  {
+    try {
+      result = (float)((Material const *)arg1)->specularG();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_specularB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Material *arg1 = (Material *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Material_specularB",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_specularB" "', argument " "1"" of type '" "Material const *""'"); 
+  }
+  arg1 = reinterpret_cast< Material * >(argp1);
+  {
+    try {
+      result = (float)((Material const *)arg1)->specularB();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_specularA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Material *arg1 = (Material *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Material_specularA",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_specularA" "', argument " "1"" of type '" "Material const *""'"); 
+  }
+  arg1 = reinterpret_cast< Material * >(argp1);
+  {
+    try {
+      result = (float)((Material const *)arg1)->specularA();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_ambient(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Material *arg1 = (Material *) 0 ;
+  float *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Material_ambient",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_ambient" "', argument " "1"" of type '" "Material const *""'"); 
+  }
+  arg1 = reinterpret_cast< Material * >(argp1);
+  {
+    try {
+      result = (float *)((Material const *)arg1)->ambient();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_float, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_ambientR(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Material *arg1 = (Material *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Material_ambientR",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_ambientR" "', argument " "1"" of type '" "Material const *""'"); 
+  }
+  arg1 = reinterpret_cast< Material * >(argp1);
+  {
+    try {
+      result = (float)((Material const *)arg1)->ambientR();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_ambientG(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Material *arg1 = (Material *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Material_ambientG",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_ambientG" "', argument " "1"" of type '" "Material const *""'"); 
+  }
+  arg1 = reinterpret_cast< Material * >(argp1);
+  {
+    try {
+      result = (float)((Material const *)arg1)->ambientG();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_ambientB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Material *arg1 = (Material *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Material_ambientB",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_ambientB" "', argument " "1"" of type '" "Material const *""'"); 
+  }
+  arg1 = reinterpret_cast< Material * >(argp1);
+  {
+    try {
+      result = (float)((Material const *)arg1)->ambientB();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_ambientA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Material *arg1 = (Material *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Material_ambientA",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_ambientA" "', argument " "1"" of type '" "Material const *""'"); 
+  }
+  arg1 = reinterpret_cast< Material * >(argp1);
+  {
+    try {
+      result = (float)((Material const *)arg1)->ambientA();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_emission(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Material *arg1 = (Material *) 0 ;
+  float *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Material_emission",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_emission" "', argument " "1"" of type '" "Material const *""'"); 
+  }
+  arg1 = reinterpret_cast< Material * >(argp1);
+  {
+    try {
+      result = (float *)((Material const *)arg1)->emission();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_float, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_emissionR(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Material *arg1 = (Material *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Material_emissionR",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_emissionR" "', argument " "1"" of type '" "Material const *""'"); 
+  }
+  arg1 = reinterpret_cast< Material * >(argp1);
+  {
+    try {
+      result = (float)((Material const *)arg1)->emissionR();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_emissionG(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Material *arg1 = (Material *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Material_emissionG",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_emissionG" "', argument " "1"" of type '" "Material const *""'"); 
+  }
+  arg1 = reinterpret_cast< Material * >(argp1);
+  {
+    try {
+      result = (float)((Material const *)arg1)->emissionG();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_emissionB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Material *arg1 = (Material *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Material_emissionB",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_emissionB" "', argument " "1"" of type '" "Material const *""'"); 
+  }
+  arg1 = reinterpret_cast< Material * >(argp1);
+  {
+    try {
+      result = (float)((Material const *)arg1)->emissionB();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_emissionA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Material *arg1 = (Material *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Material_emissionA",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_emissionA" "', argument " "1"" of type '" "Material const *""'"); 
+  }
+  arg1 = reinterpret_cast< Material * >(argp1);
+  {
+    try {
+      result = (float)((Material const *)arg1)->emissionA();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_shininess(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Material *arg1 = (Material *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Material_shininess",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_shininess" "', argument " "1"" of type '" "Material const *""'"); 
+  }
+  arg1 = reinterpret_cast< Material * >(argp1);
+  {
+    try {
+      result = (float)((Material const *)arg1)->shininess();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_SetDiffuse(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Material *arg1 = (Material *) 0 ;
+  float arg2 ;
+  float arg3 ;
+  float arg4 ;
+  float arg5 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  float val3 ;
+  int ecode3 = 0 ;
+  float val4 ;
+  int ecode4 = 0 ;
+  float val5 ;
+  int ecode5 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOOO:Material_SetDiffuse",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_SetDiffuse" "', argument " "1"" of type '" "Material *""'"); 
+  }
+  arg1 = reinterpret_cast< Material * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Material_SetDiffuse" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  ecode3 = SWIG_AsVal_float(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Material_SetDiffuse" "', argument " "3"" of type '" "float""'");
+  } 
+  arg3 = static_cast< float >(val3);
+  ecode4 = SWIG_AsVal_float(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Material_SetDiffuse" "', argument " "4"" of type '" "float""'");
+  } 
+  arg4 = static_cast< float >(val4);
+  ecode5 = SWIG_AsVal_float(obj4, &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "Material_SetDiffuse" "', argument " "5"" of type '" "float""'");
+  } 
+  arg5 = static_cast< float >(val5);
+  {
+    try {
+      (arg1)->SetDiffuse(arg2,arg3,arg4,arg5);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_SetSpecular(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Material *arg1 = (Material *) 0 ;
+  float arg2 ;
+  float arg3 ;
+  float arg4 ;
+  float arg5 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  float val3 ;
+  int ecode3 = 0 ;
+  float val4 ;
+  int ecode4 = 0 ;
+  float val5 ;
+  int ecode5 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOOO:Material_SetSpecular",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_SetSpecular" "', argument " "1"" of type '" "Material *""'"); 
+  }
+  arg1 = reinterpret_cast< Material * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Material_SetSpecular" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  ecode3 = SWIG_AsVal_float(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Material_SetSpecular" "', argument " "3"" of type '" "float""'");
+  } 
+  arg3 = static_cast< float >(val3);
+  ecode4 = SWIG_AsVal_float(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Material_SetSpecular" "', argument " "4"" of type '" "float""'");
+  } 
+  arg4 = static_cast< float >(val4);
+  ecode5 = SWIG_AsVal_float(obj4, &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "Material_SetSpecular" "', argument " "5"" of type '" "float""'");
+  } 
+  arg5 = static_cast< float >(val5);
+  {
+    try {
+      (arg1)->SetSpecular(arg2,arg3,arg4,arg5);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_SetAmbient(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Material *arg1 = (Material *) 0 ;
+  float arg2 ;
+  float arg3 ;
+  float arg4 ;
+  float arg5 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  float val3 ;
+  int ecode3 = 0 ;
+  float val4 ;
+  int ecode4 = 0 ;
+  float val5 ;
+  int ecode5 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOOO:Material_SetAmbient",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_SetAmbient" "', argument " "1"" of type '" "Material *""'"); 
+  }
+  arg1 = reinterpret_cast< Material * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Material_SetAmbient" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  ecode3 = SWIG_AsVal_float(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Material_SetAmbient" "', argument " "3"" of type '" "float""'");
+  } 
+  arg3 = static_cast< float >(val3);
+  ecode4 = SWIG_AsVal_float(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Material_SetAmbient" "', argument " "4"" of type '" "float""'");
+  } 
+  arg4 = static_cast< float >(val4);
+  ecode5 = SWIG_AsVal_float(obj4, &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "Material_SetAmbient" "', argument " "5"" of type '" "float""'");
+  } 
+  arg5 = static_cast< float >(val5);
+  {
+    try {
+      (arg1)->SetAmbient(arg2,arg3,arg4,arg5);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_SetEmission(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Material *arg1 = (Material *) 0 ;
+  float arg2 ;
+  float arg3 ;
+  float arg4 ;
+  float arg5 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  float val3 ;
+  int ecode3 = 0 ;
+  float val4 ;
+  int ecode4 = 0 ;
+  float val5 ;
+  int ecode5 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOOO:Material_SetEmission",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_SetEmission" "', argument " "1"" of type '" "Material *""'"); 
+  }
+  arg1 = reinterpret_cast< Material * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Material_SetEmission" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  ecode3 = SWIG_AsVal_float(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Material_SetEmission" "', argument " "3"" of type '" "float""'");
+  } 
+  arg3 = static_cast< float >(val3);
+  ecode4 = SWIG_AsVal_float(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Material_SetEmission" "', argument " "4"" of type '" "float""'");
+  } 
+  arg4 = static_cast< float >(val4);
+  ecode5 = SWIG_AsVal_float(obj4, &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "Material_SetEmission" "', argument " "5"" of type '" "float""'");
+  } 
+  arg5 = static_cast< float >(val5);
+  {
+    try {
+      (arg1)->SetEmission(arg2,arg3,arg4,arg5);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_SetShininess(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Material *arg1 = (Material *) 0 ;
+  float arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Material_SetShininess",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_SetShininess" "', argument " "1"" of type '" "Material *""'"); 
+  }
+  arg1 = reinterpret_cast< Material * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Material_SetShininess" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  {
+    try {
+      (arg1)->SetShininess(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Material___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Material *arg1 = (Material *) 0 ;
+  Material *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Material___ne__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material___ne__" "', argument " "1"" of type '" "Material const *""'"); 
+  }
+  arg1 = reinterpret_cast< Material * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Material,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Material___ne__" "', argument " "2"" of type '" "Material const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Material___ne__" "', argument " "2"" of type '" "Material const &""'"); 
+  }
+  arg2 = reinterpret_cast< Material * >(argp2);
+  {
+    try {
+      result = (bool)((Material const *)arg1)->operator !=((Material const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Material___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Material *arg1 = (Material *) 0 ;
+  Material *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Material___eq__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material___eq__" "', argument " "1"" of type '" "Material const *""'"); 
+  }
+  arg1 = reinterpret_cast< Material * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Material,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Material___eq__" "', argument " "2"" of type '" "Material const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Material___eq__" "', argument " "2"" of type '" "Material const &""'"); 
+  }
+  arg2 = reinterpret_cast< Material * >(argp2);
+  {
+    try {
+      result = (bool)((Material const *)arg1)->operator ==((Material const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *Material_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Material, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN int POINT_set(PyObject *) {
+  SWIG_Error(SWIG_AttributeError,"Variable POINT is read-only.");
+  return 1;
+}
+
+
+SWIGINTERN PyObject *POINT_get(void) {
+  PyObject *pyobj = 0;
+  
+  pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::POINT));
+  return pyobj;
+}
+
+
+SWIGINTERN int S_VERTEX_set(PyObject *) {
+  SWIG_Error(SWIG_AttributeError,"Variable S_VERTEX is read-only.");
+  return 1;
+}
+
+
+SWIGINTERN PyObject *S_VERTEX_get(void) {
+  PyObject *pyobj = 0;
+  
+  pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::S_VERTEX));
+  return pyobj;
+}
+
+
+SWIGINTERN int VIEW_VERTEX_set(PyObject *) {
+  SWIG_Error(SWIG_AttributeError,"Variable VIEW_VERTEX is read-only.");
+  return 1;
+}
+
+
+SWIGINTERN PyObject *VIEW_VERTEX_get(void) {
+  PyObject *pyobj = 0;
+  
+  pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::VIEW_VERTEX));
+  return pyobj;
+}
+
+
+SWIGINTERN int NON_T_VERTEX_set(PyObject *) {
+  SWIG_Error(SWIG_AttributeError,"Variable NON_T_VERTEX is read-only.");
+  return 1;
+}
+
+
+SWIGINTERN PyObject *NON_T_VERTEX_get(void) {
+  PyObject *pyobj = 0;
+  
+  pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::NON_T_VERTEX));
+  return pyobj;
+}
+
+
+SWIGINTERN int T_VERTEX_set(PyObject *) {
+  SWIG_Error(SWIG_AttributeError,"Variable T_VERTEX is read-only.");
+  return 1;
+}
+
+
+SWIGINTERN PyObject *T_VERTEX_get(void) {
+  PyObject *pyobj = 0;
+  
+  pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::T_VERTEX));
+  return pyobj;
+}
+
+
+SWIGINTERN int CUSP_set(PyObject *) {
+  SWIG_Error(SWIG_AttributeError,"Variable CUSP is read-only.");
+  return 1;
+}
+
+
+SWIGINTERN PyObject *CUSP_get(void) {
+  PyObject *pyobj = 0;
+  
+  pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::CUSP));
+  return pyobj;
+}
+
+
+SWIGINTERN int NO_FEATURE_set(PyObject *) {
+  SWIG_Error(SWIG_AttributeError,"Variable NO_FEATURE is read-only.");
+  return 1;
+}
+
+
+SWIGINTERN PyObject *NO_FEATURE_get(void) {
+  PyObject *pyobj = 0;
+  
+  pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::NO_FEATURE));
+  return pyobj;
+}
+
+
+SWIGINTERN int SILHOUETTE_set(PyObject *) {
+  SWIG_Error(SWIG_AttributeError,"Variable SILHOUETTE is read-only.");
+  return 1;
+}
+
+
+SWIGINTERN PyObject *SILHOUETTE_get(void) {
+  PyObject *pyobj = 0;
+  
+  pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::SILHOUETTE));
+  return pyobj;
+}
+
+
+SWIGINTERN int BORDER_set(PyObject *) {
+  SWIG_Error(SWIG_AttributeError,"Variable BORDER is read-only.");
+  return 1;
+}
+
+
+SWIGINTERN PyObject *BORDER_get(void) {
+  PyObject *pyobj = 0;
+  
+  pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::BORDER));
+  return pyobj;
+}
+
+
+SWIGINTERN int CREASE_set(PyObject *) {
+  SWIG_Error(SWIG_AttributeError,"Variable CREASE is read-only.");
+  return 1;
+}
+
+
+SWIGINTERN PyObject *CREASE_get(void) {
+  PyObject *pyobj = 0;
+  
+  pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::CREASE));
+  return pyobj;
+}
+
+
+SWIGINTERN int RIDGE_set(PyObject *) {
+  SWIG_Error(SWIG_AttributeError,"Variable RIDGE is read-only.");
+  return 1;
+}
+
+
+SWIGINTERN PyObject *RIDGE_get(void) {
+  PyObject *pyobj = 0;
+  
+  pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::RIDGE));
+  return pyobj;
+}
+
+
+SWIGINTERN int VALLEY_set(PyObject *) {
+  SWIG_Error(SWIG_AttributeError,"Variable VALLEY is read-only.");
+  return 1;
+}
+
+
+SWIGINTERN PyObject *VALLEY_get(void) {
+  PyObject *pyobj = 0;
+  
+  pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::VALLEY));
+  return pyobj;
+}
+
+
+SWIGINTERN int SUGGESTIVE_CONTOUR_set(PyObject *) {
+  SWIG_Error(SWIG_AttributeError,"Variable SUGGESTIVE_CONTOUR is read-only.");
+  return 1;
+}
+
+
+SWIGINTERN PyObject *SUGGESTIVE_CONTOUR_get(void) {
+  PyObject *pyobj = 0;
+  
+  pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::SUGGESTIVE_CONTOUR));
+  return pyobj;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0D_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0D *arg1 = (Interface0D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0D_getExactTypeName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0D_getExactTypeName" "', argument " "1"" of type '" "Interface0D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0D * >(argp1);
+  {
+    try {
+      result = ((Interface0D const *)arg1)->getExactTypeName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0D_getX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0D *arg1 = (Interface0D *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0D_getX",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0D_getX" "', argument " "1"" of type '" "Interface0D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0D * >(argp1);
+  {
+    try {
+      result = (real)((Interface0D const *)arg1)->getX();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0D_getY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0D *arg1 = (Interface0D *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0D_getY",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0D_getY" "', argument " "1"" of type '" "Interface0D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0D * >(argp1);
+  {
+    try {
+      result = (real)((Interface0D const *)arg1)->getY();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0D_getZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0D *arg1 = (Interface0D *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0D_getZ",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0D_getZ" "', argument " "1"" of type '" "Interface0D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0D * >(argp1);
+  {
+    try {
+      result = (real)((Interface0D const *)arg1)->getZ();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0D_getPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0D *arg1 = (Interface0D *) 0 ;
+  Geometry::Vec3f result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0D_getPoint3D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0D_getPoint3D" "', argument " "1"" of type '" "Interface0D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0D * >(argp1);
+  {
+    try {
+      result = ((Interface0D const *)arg1)->getPoint3D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0D_getProjectedX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0D *arg1 = (Interface0D *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0D_getProjectedX",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0D_getProjectedX" "', argument " "1"" of type '" "Interface0D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0D * >(argp1);
+  {
+    try {
+      result = (real)((Interface0D const *)arg1)->getProjectedX();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0D_getProjectedY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0D *arg1 = (Interface0D *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0D_getProjectedY",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0D_getProjectedY" "', argument " "1"" of type '" "Interface0D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0D * >(argp1);
+  {
+    try {
+      result = (real)((Interface0D const *)arg1)->getProjectedY();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0D_getProjectedZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0D *arg1 = (Interface0D *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0D_getProjectedZ",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0D_getProjectedZ" "', argument " "1"" of type '" "Interface0D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0D * >(argp1);
+  {
+    try {
+      result = (real)((Interface0D const *)arg1)->getProjectedZ();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0D_getPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0D *arg1 = (Interface0D *) 0 ;
+  Geometry::Vec2f result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0D_getPoint2D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0D_getPoint2D" "', argument " "1"" of type '" "Interface0D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0D * >(argp1);
+  {
+    try {
+      result = ((Interface0D const *)arg1)->getPoint2D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0D_getFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0D *arg1 = (Interface0D *) 0 ;
+  Interface0D *arg2 = 0 ;
+  FEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Interface0D_getFEdge",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0D_getFEdge" "', argument " "1"" of type '" "Interface0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Interface0D_getFEdge" "', argument " "2"" of type '" "Interface0D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Interface0D_getFEdge" "', argument " "2"" of type '" "Interface0D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0D * >(argp2);
+  {
+    try {
+      result = (FEdge *)(arg1)->getFEdge(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FEdge, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0D_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0D *arg1 = (Interface0D *) 0 ;
+  Id result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0D_getId",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0D_getId" "', argument " "1"" of type '" "Interface0D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0D * >(argp1);
+  {
+    try {
+      result = ((Interface0D const *)arg1)->getId();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Id(static_cast< const Id& >(result))), SWIGTYPE_p_Id, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0D_getNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0D *arg1 = (Interface0D *) 0 ;
+  Nature::VertexNature result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0D_getNature",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0D_getNature" "', argument " "1"" of type '" "Interface0D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0D * >(argp1);
+  {
+    try {
+      result = (Nature::VertexNature)((Interface0D const *)arg1)->getNature();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0D_castToSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0D *arg1 = (Interface0D *) 0 ;
+  SVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0D_castToSVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0D_castToSVertex" "', argument " "1"" of type '" "Interface0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0D * >(argp1);
+  {
+    try {
+      result = (SVertex *)(arg1)->castToSVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0D_castToViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0D *arg1 = (Interface0D *) 0 ;
+  ViewVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0D_castToViewVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0D_castToViewVertex" "', argument " "1"" of type '" "Interface0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0D * >(argp1);
+  {
+    try {
+      result = (ViewVertex *)(arg1)->castToViewVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0D_castToNonTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0D *arg1 = (Interface0D *) 0 ;
+  NonTVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0D_castToNonTVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0D_castToNonTVertex" "', argument " "1"" of type '" "Interface0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0D * >(argp1);
+  {
+    try {
+      result = (NonTVertex *)(arg1)->castToNonTVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_NonTVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0D_castToTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0D *arg1 = (Interface0D *) 0 ;
+  TVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0D_castToTVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0D_castToTVertex" "', argument " "1"" of type '" "Interface0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0D * >(argp1);
+  {
+    try {
+      result = (TVertex *)(arg1)->castToTVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_TVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Interface0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_Interface0D")) SWIG_fail;
+  {
+    try {
+      result = (Interface0D *)new Interface0D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Interface0D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_Interface0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0D *arg1 = (Interface0D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_Interface0D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Interface0D" "', argument " "1"" of type '" "Interface0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *Interface0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Interface0D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_delete_Interface0DIteratorNested(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIteratorNested *arg1 = (Interface0DIteratorNested *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_Interface0DIteratorNested",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIteratorNested, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Interface0DIteratorNested" "', argument " "1"" of type '" "Interface0DIteratorNested *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIteratorNested * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIteratorNested_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIteratorNested *arg1 = (Interface0DIteratorNested *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIteratorNested_getExactTypeName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIteratorNested, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIteratorNested_getExactTypeName" "', argument " "1"" of type '" "Interface0DIteratorNested const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIteratorNested * >(argp1);
+  {
+    try {
+      result = ((Interface0DIteratorNested const *)arg1)->getExactTypeName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIteratorNested_getObject(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIteratorNested *arg1 = (Interface0DIteratorNested *) 0 ;
+  Interface0D *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIteratorNested_getObject",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIteratorNested, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIteratorNested_getObject" "', argument " "1"" of type '" "Interface0DIteratorNested *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIteratorNested * >(argp1);
+  {
+    try {
+      {
+        Interface0D &_result_ref = (arg1)->operator *();
+        result = (Interface0D *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Interface0D, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIteratorNested___deref__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIteratorNested *arg1 = (Interface0DIteratorNested *) 0 ;
+  Interface0D *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIteratorNested___deref__",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIteratorNested, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIteratorNested___deref__" "', argument " "1"" of type '" "Interface0DIteratorNested *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIteratorNested * >(argp1);
+  {
+    try {
+      result = (Interface0D *)(arg1)->operator ->();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Interface0D, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIteratorNested_increment(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIteratorNested *arg1 = (Interface0DIteratorNested *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIteratorNested_increment",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIteratorNested, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIteratorNested_increment" "', argument " "1"" of type '" "Interface0DIteratorNested *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIteratorNested * >(argp1);
+  {
+    try {
+      (arg1)->increment();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIteratorNested_decrement(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIteratorNested *arg1 = (Interface0DIteratorNested *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIteratorNested_decrement",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIteratorNested, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIteratorNested_decrement" "', argument " "1"" of type '" "Interface0DIteratorNested *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIteratorNested * >(argp1);
+  {
+    try {
+      (arg1)->decrement();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIteratorNested_isBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIteratorNested *arg1 = (Interface0DIteratorNested *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIteratorNested_isBegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIteratorNested, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIteratorNested_isBegin" "', argument " "1"" of type '" "Interface0DIteratorNested const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIteratorNested * >(argp1);
+  {
+    try {
+      result = (bool)((Interface0DIteratorNested const *)arg1)->isBegin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIteratorNested_isEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIteratorNested *arg1 = (Interface0DIteratorNested *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIteratorNested_isEnd",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIteratorNested, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIteratorNested_isEnd" "', argument " "1"" of type '" "Interface0DIteratorNested const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIteratorNested * >(argp1);
+  {
+    try {
+      result = (bool)((Interface0DIteratorNested const *)arg1)->isEnd();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIteratorNested___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIteratorNested *arg1 = (Interface0DIteratorNested *) 0 ;
+  Interface0DIteratorNested *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Interface0DIteratorNested___eq__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIteratorNested, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIteratorNested___eq__" "', argument " "1"" of type '" "Interface0DIteratorNested const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIteratorNested * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIteratorNested,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Interface0DIteratorNested___eq__" "', argument " "2"" of type '" "Interface0DIteratorNested const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Interface0DIteratorNested___eq__" "', argument " "2"" of type '" "Interface0DIteratorNested const &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0DIteratorNested * >(argp2);
+  {
+    try {
+      result = (bool)((Interface0DIteratorNested const *)arg1)->operator ==((Interface0DIteratorNested const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIteratorNested___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIteratorNested *arg1 = (Interface0DIteratorNested *) 0 ;
+  Interface0DIteratorNested *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Interface0DIteratorNested___ne__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIteratorNested, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIteratorNested___ne__" "', argument " "1"" of type '" "Interface0DIteratorNested const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIteratorNested * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIteratorNested,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Interface0DIteratorNested___ne__" "', argument " "2"" of type '" "Interface0DIteratorNested const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Interface0DIteratorNested___ne__" "', argument " "2"" of type '" "Interface0DIteratorNested const &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0DIteratorNested * >(argp2);
+  {
+    try {
+      result = (bool)((Interface0DIteratorNested const *)arg1)->operator !=((Interface0DIteratorNested const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIteratorNested_t(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIteratorNested *arg1 = (Interface0DIteratorNested *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIteratorNested_t",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIteratorNested, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIteratorNested_t" "', argument " "1"" of type '" "Interface0DIteratorNested const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIteratorNested * >(argp1);
+  {
+    try {
+      result = (float)((Interface0DIteratorNested const *)arg1)->t();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIteratorNested_u(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIteratorNested *arg1 = (Interface0DIteratorNested *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIteratorNested_u",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIteratorNested, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIteratorNested_u" "', argument " "1"" of type '" "Interface0DIteratorNested const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIteratorNested * >(argp1);
+  {
+    try {
+      result = (float)((Interface0DIteratorNested const *)arg1)->u();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIteratorNested_copy(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIteratorNested *arg1 = (Interface0DIteratorNested *) 0 ;
+  Interface0DIteratorNested *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIteratorNested_copy",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIteratorNested, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIteratorNested_copy" "', argument " "1"" of type '" "Interface0DIteratorNested const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIteratorNested * >(argp1);
+  {
+    try {
+      result = (Interface0DIteratorNested *)((Interface0DIteratorNested const *)arg1)->copy();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Interface0DIteratorNested, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIteratorNested_getX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIteratorNested *arg1 = (Interface0DIteratorNested *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIteratorNested_getX",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIteratorNested, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIteratorNested_getX" "', argument " "1"" of type '" "Interface0DIteratorNested const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIteratorNested * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->getX();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIteratorNested_getY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIteratorNested *arg1 = (Interface0DIteratorNested *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIteratorNested_getY",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIteratorNested, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIteratorNested_getY" "', argument " "1"" of type '" "Interface0DIteratorNested const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIteratorNested * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->getY();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIteratorNested_getZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIteratorNested *arg1 = (Interface0DIteratorNested *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIteratorNested_getZ",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIteratorNested, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIteratorNested_getZ" "', argument " "1"" of type '" "Interface0DIteratorNested const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIteratorNested * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->getZ();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIteratorNested_getPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIteratorNested *arg1 = (Interface0DIteratorNested *) 0 ;
+  Geometry::Vec3f result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIteratorNested_getPoint3D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIteratorNested, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIteratorNested_getPoint3D" "', argument " "1"" of type '" "Interface0DIteratorNested const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIteratorNested * >(argp1);
+  {
+    try {
+      result = (*arg1)->getPoint3D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIteratorNested_getProjectedX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIteratorNested *arg1 = (Interface0DIteratorNested *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIteratorNested_getProjectedX",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIteratorNested, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIteratorNested_getProjectedX" "', argument " "1"" of type '" "Interface0DIteratorNested const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIteratorNested * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->getProjectedX();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIteratorNested_getProjectedY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIteratorNested *arg1 = (Interface0DIteratorNested *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIteratorNested_getProjectedY",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIteratorNested, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIteratorNested_getProjectedY" "', argument " "1"" of type '" "Interface0DIteratorNested const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIteratorNested * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->getProjectedY();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIteratorNested_getProjectedZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIteratorNested *arg1 = (Interface0DIteratorNested *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIteratorNested_getProjectedZ",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIteratorNested, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIteratorNested_getProjectedZ" "', argument " "1"" of type '" "Interface0DIteratorNested const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIteratorNested * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->getProjectedZ();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIteratorNested_getPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIteratorNested *arg1 = (Interface0DIteratorNested *) 0 ;
+  Geometry::Vec2f result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIteratorNested_getPoint2D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIteratorNested, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIteratorNested_getPoint2D" "', argument " "1"" of type '" "Interface0DIteratorNested const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIteratorNested * >(argp1);
+  {
+    try {
+      result = (*arg1)->getPoint2D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIteratorNested_getFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIteratorNested *arg1 = (Interface0DIteratorNested *) 0 ;
+  Interface0D *arg2 = 0 ;
+  FEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Interface0DIteratorNested_getFEdge",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIteratorNested, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIteratorNested_getFEdge" "', argument " "1"" of type '" "Interface0DIteratorNested *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIteratorNested * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Interface0DIteratorNested_getFEdge" "', argument " "2"" of type '" "Interface0D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Interface0DIteratorNested_getFEdge" "', argument " "2"" of type '" "Interface0D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0D * >(argp2);
+  {
+    try {
+      result = (FEdge *)(*arg1)->getFEdge(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FEdge, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIteratorNested_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIteratorNested *arg1 = (Interface0DIteratorNested *) 0 ;
+  Id result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIteratorNested_getId",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIteratorNested, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIteratorNested_getId" "', argument " "1"" of type '" "Interface0DIteratorNested const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIteratorNested * >(argp1);
+  {
+    try {
+      result = (*arg1)->getId();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Id(static_cast< const Id& >(result))), SWIGTYPE_p_Id, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIteratorNested_getNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIteratorNested *arg1 = (Interface0DIteratorNested *) 0 ;
+  Nature::VertexNature result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIteratorNested_getNature",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIteratorNested, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIteratorNested_getNature" "', argument " "1"" of type '" "Interface0DIteratorNested const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIteratorNested * >(argp1);
+  {
+    try {
+      result = (Nature::VertexNature)(*arg1)->getNature();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIteratorNested_castToSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIteratorNested *arg1 = (Interface0DIteratorNested *) 0 ;
+  SVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIteratorNested_castToSVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIteratorNested, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIteratorNested_castToSVertex" "', argument " "1"" of type '" "Interface0DIteratorNested *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIteratorNested * >(argp1);
+  {
+    try {
+      result = (SVertex *)(*arg1)->castToSVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIteratorNested_castToViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIteratorNested *arg1 = (Interface0DIteratorNested *) 0 ;
+  ViewVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIteratorNested_castToViewVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIteratorNested, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIteratorNested_castToViewVertex" "', argument " "1"" of type '" "Interface0DIteratorNested *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIteratorNested * >(argp1);
+  {
+    try {
+      result = (ViewVertex *)(*arg1)->castToViewVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIteratorNested_castToNonTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIteratorNested *arg1 = (Interface0DIteratorNested *) 0 ;
+  NonTVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIteratorNested_castToNonTVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIteratorNested, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIteratorNested_castToNonTVertex" "', argument " "1"" of type '" "Interface0DIteratorNested *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIteratorNested * >(argp1);
+  {
+    try {
+      result = (NonTVertex *)(*arg1)->castToNonTVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_NonTVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIteratorNested_castToTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIteratorNested *arg1 = (Interface0DIteratorNested *) 0 ;
+  TVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIteratorNested_castToTVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIteratorNested, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIteratorNested_castToTVertex" "', argument " "1"" of type '" "Interface0DIteratorNested *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIteratorNested * >(argp1);
+  {
+    try {
+      result = (TVertex *)(*arg1)->castToTVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_TVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *Interface0DIteratorNested_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Interface0DIteratorNested, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_Interface0DIterator__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIteratorNested *arg1 = (Interface0DIteratorNested *) 0 ;
+  Interface0DIterator *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_Interface0DIterator",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIteratorNested, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_Interface0DIterator" "', argument " "1"" of type '" "Interface0DIteratorNested *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIteratorNested * >(argp1);
+  {
+    try {
+      result = (Interface0DIterator *)new Interface0DIterator(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Interface0DIterator__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIterator *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_Interface0DIterator")) SWIG_fail;
+  {
+    try {
+      result = (Interface0DIterator *)new Interface0DIterator();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Interface0DIterator__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIterator *arg1 = 0 ;
+  Interface0DIterator *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_Interface0DIterator",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_Interface0DIterator,  0  | 0);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_Interface0DIterator" "', argument " "1"" of type '" "Interface0DIterator const &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_Interface0DIterator" "', argument " "1"" of type '" "Interface0DIterator const &""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIterator * >(argp1);
+  {
+    try {
+      result = (Interface0DIterator *)new Interface0DIterator((Interface0DIterator const &)*arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Interface0DIterator(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_Interface0DIterator__SWIG_1(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Interface0DIteratorNested, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_new_Interface0DIterator__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Interface0DIterator, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_new_Interface0DIterator__SWIG_2(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Interface0DIterator'.\n  Possible C/C++ prototypes are:\n    Interface0DIterator(Interface0DIteratorNested *)\n    Interface0DIterator()\n    Interface0DIterator(Interface0DIterator const &)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_Interface0DIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIterator *arg1 = (Interface0DIterator *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_Interface0DIterator",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Interface0DIterator" "', argument " "1"" of type '" "Interface0DIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIterator * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIterator *arg1 = (Interface0DIterator *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIterator_getExactTypeName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIterator_getExactTypeName" "', argument " "1"" of type '" "Interface0DIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIterator * >(argp1);
+  {
+    try {
+      result = ((Interface0DIterator const *)arg1)->getExactTypeName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator_getObject(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIterator *arg1 = (Interface0DIterator *) 0 ;
+  Interface0D *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIterator_getObject",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIterator_getObject" "', argument " "1"" of type '" "Interface0DIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIterator * >(argp1);
+  {
+    try {
+      {
+        Interface0D &_result_ref = (arg1)->operator *();
+        result = (Interface0D *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Interface0D, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator___deref__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIterator *arg1 = (Interface0DIterator *) 0 ;
+  Interface0D *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIterator___deref__",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIterator___deref__" "', argument " "1"" of type '" "Interface0DIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIterator * >(argp1);
+  {
+    try {
+      result = (Interface0D *)(arg1)->operator ->();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Interface0D, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator_increment(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIterator *arg1 = (Interface0DIterator *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIterator_increment",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIterator_increment" "', argument " "1"" of type '" "Interface0DIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIterator * >(argp1);
+  {
+    try {
+      (arg1)->increment();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator_decrement(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIterator *arg1 = (Interface0DIterator *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIterator_decrement",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIterator_decrement" "', argument " "1"" of type '" "Interface0DIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIterator * >(argp1);
+  {
+    try {
+      (arg1)->decrement();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator_isBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIterator *arg1 = (Interface0DIterator *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIterator_isBegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIterator_isBegin" "', argument " "1"" of type '" "Interface0DIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIterator * >(argp1);
+  {
+    try {
+      result = (bool)((Interface0DIterator const *)arg1)->isBegin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator_isEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIterator *arg1 = (Interface0DIterator *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIterator_isEnd",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIterator_isEnd" "', argument " "1"" of type '" "Interface0DIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIterator * >(argp1);
+  {
+    try {
+      result = (bool)((Interface0DIterator const *)arg1)->isEnd();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIterator *arg1 = (Interface0DIterator *) 0 ;
+  Interface0DIterator *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Interface0DIterator___eq__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIterator___eq__" "', argument " "1"" of type '" "Interface0DIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Interface0DIterator___eq__" "', argument " "2"" of type '" "Interface0DIterator const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Interface0DIterator___eq__" "', argument " "2"" of type '" "Interface0DIterator const &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0DIterator * >(argp2);
+  {
+    try {
+      result = (bool)((Interface0DIterator const *)arg1)->operator ==((Interface0DIterator const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIterator *arg1 = (Interface0DIterator *) 0 ;
+  Interface0DIterator *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Interface0DIterator___ne__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIterator___ne__" "', argument " "1"" of type '" "Interface0DIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Interface0DIterator___ne__" "', argument " "2"" of type '" "Interface0DIterator const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Interface0DIterator___ne__" "', argument " "2"" of type '" "Interface0DIterator const &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0DIterator * >(argp2);
+  {
+    try {
+      result = (bool)((Interface0DIterator const *)arg1)->operator !=((Interface0DIterator const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator_t(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIterator *arg1 = (Interface0DIterator *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIterator_t",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIterator_t" "', argument " "1"" of type '" "Interface0DIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIterator * >(argp1);
+  {
+    try {
+      result = (float)((Interface0DIterator const *)arg1)->t();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator_u(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIterator *arg1 = (Interface0DIterator *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIterator_u",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIterator_u" "', argument " "1"" of type '" "Interface0DIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIterator * >(argp1);
+  {
+    try {
+      result = (float)((Interface0DIterator const *)arg1)->u();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator_getX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIterator *arg1 = (Interface0DIterator *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIterator_getX",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIterator_getX" "', argument " "1"" of type '" "Interface0DIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIterator * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->getX();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator_getY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIterator *arg1 = (Interface0DIterator *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIterator_getY",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIterator_getY" "', argument " "1"" of type '" "Interface0DIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIterator * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->getY();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator_getZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIterator *arg1 = (Interface0DIterator *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIterator_getZ",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIterator_getZ" "', argument " "1"" of type '" "Interface0DIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIterator * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->getZ();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator_getPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIterator *arg1 = (Interface0DIterator *) 0 ;
+  Geometry::Vec3f result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIterator_getPoint3D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIterator_getPoint3D" "', argument " "1"" of type '" "Interface0DIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->getPoint3D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator_getProjectedX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIterator *arg1 = (Interface0DIterator *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIterator_getProjectedX",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIterator_getProjectedX" "', argument " "1"" of type '" "Interface0DIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIterator * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->getProjectedX();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator_getProjectedY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIterator *arg1 = (Interface0DIterator *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIterator_getProjectedY",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIterator_getProjectedY" "', argument " "1"" of type '" "Interface0DIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIterator * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->getProjectedY();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator_getProjectedZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIterator *arg1 = (Interface0DIterator *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIterator_getProjectedZ",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIterator_getProjectedZ" "', argument " "1"" of type '" "Interface0DIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIterator * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->getProjectedZ();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator_getPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIterator *arg1 = (Interface0DIterator *) 0 ;
+  Geometry::Vec2f result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIterator_getPoint2D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIterator_getPoint2D" "', argument " "1"" of type '" "Interface0DIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->getPoint2D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator_getFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIterator *arg1 = (Interface0DIterator *) 0 ;
+  Interface0D *arg2 = 0 ;
+  FEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Interface0DIterator_getFEdge",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIterator_getFEdge" "', argument " "1"" of type '" "Interface0DIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Interface0DIterator_getFEdge" "', argument " "2"" of type '" "Interface0D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Interface0DIterator_getFEdge" "', argument " "2"" of type '" "Interface0D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0D * >(argp2);
+  {
+    try {
+      result = (FEdge *)(*arg1)->getFEdge(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FEdge, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIterator *arg1 = (Interface0DIterator *) 0 ;
+  Id result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIterator_getId",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIterator_getId" "', argument " "1"" of type '" "Interface0DIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->getId();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Id(static_cast< const Id& >(result))), SWIGTYPE_p_Id, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator_getNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIterator *arg1 = (Interface0DIterator *) 0 ;
+  Nature::VertexNature result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIterator_getNature",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIterator_getNature" "', argument " "1"" of type '" "Interface0DIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIterator * >(argp1);
+  {
+    try {
+      result = (Nature::VertexNature)(*arg1)->getNature();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator_castToSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIterator *arg1 = (Interface0DIterator *) 0 ;
+  SVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIterator_castToSVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIterator_castToSVertex" "', argument " "1"" of type '" "Interface0DIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIterator * >(argp1);
+  {
+    try {
+      result = (SVertex *)(*arg1)->castToSVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator_castToViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIterator *arg1 = (Interface0DIterator *) 0 ;
+  ViewVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIterator_castToViewVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIterator_castToViewVertex" "', argument " "1"" of type '" "Interface0DIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIterator * >(argp1);
+  {
+    try {
+      result = (ViewVertex *)(*arg1)->castToViewVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator_castToNonTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIterator *arg1 = (Interface0DIterator *) 0 ;
+  NonTVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIterator_castToNonTVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIterator_castToNonTVertex" "', argument " "1"" of type '" "Interface0DIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIterator * >(argp1);
+  {
+    try {
+      result = (NonTVertex *)(*arg1)->castToNonTVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_NonTVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator_castToTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0DIterator *arg1 = (Interface0DIterator *) 0 ;
+  TVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface0DIterator_castToTVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0DIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface0DIterator_castToTVertex" "', argument " "1"" of type '" "Interface0DIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0DIterator * >(argp1);
+  {
+    try {
+      result = (TVertex *)(*arg1)->castToTVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_TVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *Interface0DIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Interface0DIterator, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_Interface1D_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface1D *arg1 = (Interface1D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface1D_getExactTypeName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface1D_getExactTypeName" "', argument " "1"" of type '" "Interface1D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface1D * >(argp1);
+  {
+    try {
+      result = ((Interface1D const *)arg1)->getExactTypeName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface1D_verticesBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface1D *arg1 = (Interface1D *) 0 ;
+  Interface0DIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface1D_verticesBegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface1D_verticesBegin" "', argument " "1"" of type '" "Interface1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface1D * >(argp1);
+  {
+    try {
+      result = (arg1)->verticesBegin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Interface0DIterator(static_cast< const Interface0DIterator& >(result))), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface1D_verticesEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface1D *arg1 = (Interface1D *) 0 ;
+  Interface0DIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface1D_verticesEnd",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface1D_verticesEnd" "', argument " "1"" of type '" "Interface1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface1D * >(argp1);
+  {
+    try {
+      result = (arg1)->verticesEnd();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Interface0DIterator(static_cast< const Interface0DIterator& >(result))), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface1D_pointsBegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface1D *arg1 = (Interface1D *) 0 ;
+  float arg2 ;
+  Interface0DIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Interface1D_pointsBegin",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface1D_pointsBegin" "', argument " "1"" of type '" "Interface1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface1D * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Interface1D_pointsBegin" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  {
+    try {
+      result = (arg1)->pointsBegin(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Interface0DIterator(static_cast< const Interface0DIterator& >(result))), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface1D_pointsBegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface1D *arg1 = (Interface1D *) 0 ;
+  Interface0DIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface1D_pointsBegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface1D_pointsBegin" "', argument " "1"" of type '" "Interface1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface1D * >(argp1);
+  {
+    try {
+      result = (arg1)->pointsBegin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Interface0DIterator(static_cast< const Interface0DIterator& >(result))), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface1D_pointsBegin(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Interface1D, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Interface1D_pointsBegin__SWIG_1(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Interface1D, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_float(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_Interface1D_pointsBegin__SWIG_0(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Interface1D_pointsBegin'.\n  Possible C/C++ prototypes are:\n    pointsBegin(float)\n    pointsBegin()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface1D_pointsEnd__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface1D *arg1 = (Interface1D *) 0 ;
+  float arg2 ;
+  Interface0DIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Interface1D_pointsEnd",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface1D_pointsEnd" "', argument " "1"" of type '" "Interface1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface1D * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Interface1D_pointsEnd" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  {
+    try {
+      result = (arg1)->pointsEnd(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Interface0DIterator(static_cast< const Interface0DIterator& >(result))), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface1D_pointsEnd__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface1D *arg1 = (Interface1D *) 0 ;
+  Interface0DIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface1D_pointsEnd",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface1D_pointsEnd" "', argument " "1"" of type '" "Interface1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface1D * >(argp1);
+  {
+    try {
+      result = (arg1)->pointsEnd();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Interface0DIterator(static_cast< const Interface0DIterator& >(result))), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface1D_pointsEnd(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Interface1D, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Interface1D_pointsEnd__SWIG_1(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Interface1D, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_float(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_Interface1D_pointsEnd__SWIG_0(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Interface1D_pointsEnd'.\n  Possible C/C++ prototypes are:\n    pointsEnd(float)\n    pointsEnd()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface1D_getLength2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface1D *arg1 = (Interface1D *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface1D_getLength2D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface1D_getLength2D" "', argument " "1"" of type '" "Interface1D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface1D * >(argp1);
+  {
+    try {
+      result = (real)((Interface1D const *)arg1)->getLength2D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface1D_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface1D *arg1 = (Interface1D *) 0 ;
+  Id result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface1D_getId",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface1D_getId" "', argument " "1"" of type '" "Interface1D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface1D * >(argp1);
+  {
+    try {
+      result = ((Interface1D const *)arg1)->getId();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Id(static_cast< const Id& >(result))), SWIGTYPE_p_Id, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface1D_getNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface1D *arg1 = (Interface1D *) 0 ;
+  Nature::EdgeNature result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface1D_getNature",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface1D_getNature" "', argument " "1"" of type '" "Interface1D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface1D * >(argp1);
+  {
+    try {
+      result = (Nature::EdgeNature)((Interface1D const *)arg1)->getNature();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface1D_getTimeStamp(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface1D *arg1 = (Interface1D *) 0 ;
+  unsigned int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Interface1D_getTimeStamp",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface1D_getTimeStamp" "', argument " "1"" of type '" "Interface1D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface1D * >(argp1);
+  {
+    try {
+      result = (unsigned int)((Interface1D const *)arg1)->getTimeStamp();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface1D_setTimeStamp(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface1D *arg1 = (Interface1D *) 0 ;
+  unsigned int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Interface1D_setTimeStamp",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Interface1D_setTimeStamp" "', argument " "1"" of type '" "Interface1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface1D * >(argp1);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Interface1D_setTimeStamp" "', argument " "2"" of type '" "unsigned int""'");
+  } 
+  arg2 = static_cast< unsigned int >(val2);
+  {
+    try {
+      (arg1)->setTimeStamp(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_Interface1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface1D *arg1 = (Interface1D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_Interface1D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface1D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Interface1D" "', argument " "1"" of type '" "Interface1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface1D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *Interface1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Interface1D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_integrateUnsigned__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction0D<unsigned int > *arg1 = 0 ;
+  Interface0DIterator arg2 ;
+  Interface0DIterator arg3 ;
+  IntegrationType arg4 ;
+  unsigned int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 ;
+  int res2 = 0 ;
+  void *argp3 ;
+  int res3 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOO:integrateUnsigned",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DTunsigned_int_t,  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "integrateUnsigned" "', argument " "1"" of type '" "UnaryFunction0D<unsigned int > &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateUnsigned" "', argument " "1"" of type '" "UnaryFunction0D<unsigned int > &""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction0D<unsigned int > * >(argp1);
+  {
+    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0  | 0);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "integrateUnsigned" "', argument " "2"" of type '" "Interface0DIterator""'"); 
+    }  
+    if (!argp2) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateUnsigned" "', argument " "2"" of type '" "Interface0DIterator""'");
+    } else {
+      Interface0DIterator * temp = reinterpret_cast< Interface0DIterator * >(argp2);
+      arg2 = *temp;
+      if (SWIG_IsNewObj(res2)) delete temp;
+    }
+  }
+  {
+    res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_Interface0DIterator,  0  | 0);
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "integrateUnsigned" "', argument " "3"" of type '" "Interface0DIterator""'"); 
+    }  
+    if (!argp3) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateUnsigned" "', argument " "3"" of type '" "Interface0DIterator""'");
+    } else {
+      Interface0DIterator * temp = reinterpret_cast< Interface0DIterator * >(argp3);
+      arg3 = *temp;
+      if (SWIG_IsNewObj(res3)) delete temp;
+    }
+  }
+  ecode4 = SWIG_AsVal_int(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "integrateUnsigned" "', argument " "4"" of type '" "IntegrationType""'");
+  } 
+  arg4 = static_cast< IntegrationType >(val4);
+  {
+    try {
+      result = (unsigned int)integrate<unsigned int >(*arg1,arg2,arg3,arg4);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_integrateUnsigned__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction0D<unsigned int > *arg1 = 0 ;
+  Interface0DIterator arg2 ;
+  Interface0DIterator arg3 ;
+  unsigned int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 ;
+  int res2 = 0 ;
+  void *argp3 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:integrateUnsigned",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DTunsigned_int_t,  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "integrateUnsigned" "', argument " "1"" of type '" "UnaryFunction0D<unsigned int > &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateUnsigned" "', argument " "1"" of type '" "UnaryFunction0D<unsigned int > &""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction0D<unsigned int > * >(argp1);
+  {
+    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0  | 0);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "integrateUnsigned" "', argument " "2"" of type '" "Interface0DIterator""'"); 
+    }  
+    if (!argp2) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateUnsigned" "', argument " "2"" of type '" "Interface0DIterator""'");
+    } else {
+      Interface0DIterator * temp = reinterpret_cast< Interface0DIterator * >(argp2);
+      arg2 = *temp;
+      if (SWIG_IsNewObj(res2)) delete temp;
+    }
+  }
+  {
+    res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_Interface0DIterator,  0  | 0);
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "integrateUnsigned" "', argument " "3"" of type '" "Interface0DIterator""'"); 
+    }  
+    if (!argp3) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateUnsigned" "', argument " "3"" of type '" "Interface0DIterator""'");
+    } else {
+      Interface0DIterator * temp = reinterpret_cast< Interface0DIterator * >(argp3);
+      arg3 = *temp;
+      if (SWIG_IsNewObj(res3)) delete temp;
+    }
+  }
+  {
+    try {
+      result = (unsigned int)integrate<unsigned int >(*arg1,arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_integrateUnsigned(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[5];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 4); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 3) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DTunsigned_int_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Interface0DIterator, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_Interface0DIterator, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          return _wrap_integrateUnsigned__SWIG_1(self, args);
+        }
+      }
+    }
+  }
+  if (argc == 4) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DTunsigned_int_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Interface0DIterator, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_Interface0DIterator, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          {
+            int res = SWIG_AsVal_int(argv[3], NULL);
+            _v = SWIG_CheckState(res);
+          }
+          if (_v) {
+            return _wrap_integrateUnsigned__SWIG_0(self, args);
+          }
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'integrateUnsigned'.\n  Possible C/C++ prototypes are:\n    integrate<(unsigned int)>(UnaryFunction0D<unsigned int > &,Interface0DIterator,Interface0DIterator,IntegrationType)\n    integrate<(unsigned int)>(UnaryFunction0D<unsigned int > &,Interface0DIterator,Interface0DIterator)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_integrateFloat__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction0D<float > *arg1 = 0 ;
+  Interface0DIterator arg2 ;
+  Interface0DIterator arg3 ;
+  IntegrationType arg4 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 ;
+  int res2 = 0 ;
+  void *argp3 ;
+  int res3 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOO:integrateFloat",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DTfloat_t,  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "integrateFloat" "', argument " "1"" of type '" "UnaryFunction0D<float > &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateFloat" "', argument " "1"" of type '" "UnaryFunction0D<float > &""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction0D<float > * >(argp1);
+  {
+    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0  | 0);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "integrateFloat" "', argument " "2"" of type '" "Interface0DIterator""'"); 
+    }  
+    if (!argp2) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateFloat" "', argument " "2"" of type '" "Interface0DIterator""'");
+    } else {
+      Interface0DIterator * temp = reinterpret_cast< Interface0DIterator * >(argp2);
+      arg2 = *temp;
+      if (SWIG_IsNewObj(res2)) delete temp;
+    }
+  }
+  {
+    res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_Interface0DIterator,  0  | 0);
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "integrateFloat" "', argument " "3"" of type '" "Interface0DIterator""'"); 
+    }  
+    if (!argp3) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateFloat" "', argument " "3"" of type '" "Interface0DIterator""'");
+    } else {
+      Interface0DIterator * temp = reinterpret_cast< Interface0DIterator * >(argp3);
+      arg3 = *temp;
+      if (SWIG_IsNewObj(res3)) delete temp;
+    }
+  }
+  ecode4 = SWIG_AsVal_int(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "integrateFloat" "', argument " "4"" of type '" "IntegrationType""'");
+  } 
+  arg4 = static_cast< IntegrationType >(val4);
+  {
+    try {
+      result = (float)integrate<float >(*arg1,arg2,arg3,arg4);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_integrateFloat__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction0D<float > *arg1 = 0 ;
+  Interface0DIterator arg2 ;
+  Interface0DIterator arg3 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 ;
+  int res2 = 0 ;
+  void *argp3 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:integrateFloat",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DTfloat_t,  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "integrateFloat" "', argument " "1"" of type '" "UnaryFunction0D<float > &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateFloat" "', argument " "1"" of type '" "UnaryFunction0D<float > &""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction0D<float > * >(argp1);
+  {
+    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0  | 0);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "integrateFloat" "', argument " "2"" of type '" "Interface0DIterator""'"); 
+    }  
+    if (!argp2) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateFloat" "', argument " "2"" of type '" "Interface0DIterator""'");
+    } else {
+      Interface0DIterator * temp = reinterpret_cast< Interface0DIterator * >(argp2);
+      arg2 = *temp;
+      if (SWIG_IsNewObj(res2)) delete temp;
+    }
+  }
+  {
+    res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_Interface0DIterator,  0  | 0);
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "integrateFloat" "', argument " "3"" of type '" "Interface0DIterator""'"); 
+    }  
+    if (!argp3) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateFloat" "', argument " "3"" of type '" "Interface0DIterator""'");
+    } else {
+      Interface0DIterator * temp = reinterpret_cast< Interface0DIterator * >(argp3);
+      arg3 = *temp;
+      if (SWIG_IsNewObj(res3)) delete temp;
+    }
+  }
+  {
+    try {
+      result = (float)integrate<float >(*arg1,arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_integrateFloat(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[5];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 4); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 3) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DTfloat_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Interface0DIterator, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_Interface0DIterator, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          return _wrap_integrateFloat__SWIG_1(self, args);
+        }
+      }
+    }
+  }
+  if (argc == 4) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DTfloat_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Interface0DIterator, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_Interface0DIterator, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          {
+            int res = SWIG_AsVal_int(argv[3], NULL);
+            _v = SWIG_CheckState(res);
+          }
+          if (_v) {
+            return _wrap_integrateFloat__SWIG_0(self, args);
+          }
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'integrateFloat'.\n  Possible C/C++ prototypes are:\n    integrate<(float)>(UnaryFunction0D<float > &,Interface0DIterator,Interface0DIterator,IntegrationType)\n    integrate<(float)>(UnaryFunction0D<float > &,Interface0DIterator,Interface0DIterator)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_integrateDouble__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction0D<double > *arg1 = 0 ;
+  Interface0DIterator arg2 ;
+  Interface0DIterator arg3 ;
+  IntegrationType arg4 ;
+  double result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 ;
+  int res2 = 0 ;
+  void *argp3 ;
+  int res3 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOO:integrateDouble",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DTdouble_t,  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "integrateDouble" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateDouble" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction0D<double > * >(argp1);
+  {
+    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0  | 0);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "integrateDouble" "', argument " "2"" of type '" "Interface0DIterator""'"); 
+    }  
+    if (!argp2) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateDouble" "', argument " "2"" of type '" "Interface0DIterator""'");
+    } else {
+      Interface0DIterator * temp = reinterpret_cast< Interface0DIterator * >(argp2);
+      arg2 = *temp;
+      if (SWIG_IsNewObj(res2)) delete temp;
+    }
+  }
+  {
+    res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_Interface0DIterator,  0  | 0);
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "integrateDouble" "', argument " "3"" of type '" "Interface0DIterator""'"); 
+    }  
+    if (!argp3) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateDouble" "', argument " "3"" of type '" "Interface0DIterator""'");
+    } else {
+      Interface0DIterator * temp = reinterpret_cast< Interface0DIterator * >(argp3);
+      arg3 = *temp;
+      if (SWIG_IsNewObj(res3)) delete temp;
+    }
+  }
+  ecode4 = SWIG_AsVal_int(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "integrateDouble" "', argument " "4"" of type '" "IntegrationType""'");
+  } 
+  arg4 = static_cast< IntegrationType >(val4);
+  {
+    try {
+      result = (double)integrate<double >(*arg1,arg2,arg3,arg4);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_integrateDouble__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction0D<double > *arg1 = 0 ;
+  Interface0DIterator arg2 ;
+  Interface0DIterator arg3 ;
+  double result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 ;
+  int res2 = 0 ;
+  void *argp3 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:integrateDouble",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DTdouble_t,  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "integrateDouble" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateDouble" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction0D<double > * >(argp1);
+  {
+    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0  | 0);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "integrateDouble" "', argument " "2"" of type '" "Interface0DIterator""'"); 
+    }  
+    if (!argp2) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateDouble" "', argument " "2"" of type '" "Interface0DIterator""'");
+    } else {
+      Interface0DIterator * temp = reinterpret_cast< Interface0DIterator * >(argp2);
+      arg2 = *temp;
+      if (SWIG_IsNewObj(res2)) delete temp;
+    }
+  }
+  {
+    res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_Interface0DIterator,  0  | 0);
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "integrateDouble" "', argument " "3"" of type '" "Interface0DIterator""'"); 
+    }  
+    if (!argp3) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateDouble" "', argument " "3"" of type '" "Interface0DIterator""'");
+    } else {
+      Interface0DIterator * temp = reinterpret_cast< Interface0DIterator * >(argp3);
+      arg3 = *temp;
+      if (SWIG_IsNewObj(res3)) delete temp;
+    }
+  }
+  {
+    try {
+      result = (double)integrate<double >(*arg1,arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_integrateDouble(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[5];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 4); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 3) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DTdouble_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Interface0DIterator, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_Interface0DIterator, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          return _wrap_integrateDouble__SWIG_1(self, args);
+        }
+      }
+    }
+  }
+  if (argc == 4) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DTdouble_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Interface0DIterator, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_Interface0DIterator, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          {
+            int res = SWIG_AsVal_int(argv[3], NULL);
+            _v = SWIG_CheckState(res);
+          }
+          if (_v) {
+            return _wrap_integrateDouble__SWIG_0(self, args);
+          }
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'integrateDouble'.\n  Possible C/C++ prototypes are:\n    integrate<(double)>(UnaryFunction0D<double > &,Interface0DIterator,Interface0DIterator,IntegrationType)\n    integrate<(double)>(UnaryFunction0D<double > &,Interface0DIterator,Interface0DIterator)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_getExactTypeName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_getExactTypeName" "', argument " "1"" of type '" "SVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      result = ((SVertex const *)arg1)->getExactTypeName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_getX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_getX",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_getX" "', argument " "1"" of type '" "SVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      result = (real)((SVertex const *)arg1)->getX();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_getY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_getY",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_getY" "', argument " "1"" of type '" "SVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      result = (real)((SVertex const *)arg1)->getY();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_getZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_getZ",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_getZ" "', argument " "1"" of type '" "SVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      result = (real)((SVertex const *)arg1)->getZ();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_getPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  Geometry::Vec3f result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_getPoint3D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_getPoint3D" "', argument " "1"" of type '" "SVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      result = ((SVertex const *)arg1)->getPoint3D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_getProjectedX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_getProjectedX",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_getProjectedX" "', argument " "1"" of type '" "SVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      result = (real)((SVertex const *)arg1)->getProjectedX();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_getProjectedY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_getProjectedY",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_getProjectedY" "', argument " "1"" of type '" "SVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      result = (real)((SVertex const *)arg1)->getProjectedY();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_getProjectedZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_getProjectedZ",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_getProjectedZ" "', argument " "1"" of type '" "SVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      result = (real)((SVertex const *)arg1)->getProjectedZ();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_getPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  Geometry::Vec2f result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_getPoint2D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_getPoint2D" "', argument " "1"" of type '" "SVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      result = ((SVertex const *)arg1)->getPoint2D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_getFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  Interface0D *arg2 = 0 ;
+  FEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:SVertex_getFEdge",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_getFEdge" "', argument " "1"" of type '" "SVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVertex_getFEdge" "', argument " "2"" of type '" "Interface0D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SVertex_getFEdge" "', argument " "2"" of type '" "Interface0D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0D * >(argp2);
+  {
+    try {
+      result = (FEdge *)(arg1)->getFEdge(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FEdge, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  Id result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_getId",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_getId" "', argument " "1"" of type '" "SVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      result = ((SVertex const *)arg1)->getId();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Id(static_cast< const Id& >(result))), SWIGTYPE_p_Id, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_getNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  Nature::VertexNature result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_getNature",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_getNature" "', argument " "1"" of type '" "SVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      result = (Nature::VertexNature)((SVertex const *)arg1)->getNature();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_castToSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  SVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_castToSVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_castToSVertex" "', argument " "1"" of type '" "SVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      result = (SVertex *)(arg1)->castToSVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_castToViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  ViewVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_castToViewVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_castToViewVertex" "', argument " "1"" of type '" "SVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      result = (ViewVertex *)(arg1)->castToViewVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_castToNonTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  NonTVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_castToNonTVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_castToNonTVertex" "', argument " "1"" of type '" "SVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      result = (NonTVertex *)(arg1)->castToNonTVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_NonTVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_castToTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  TVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_castToTVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_castToTVertex" "', argument " "1"" of type '" "SVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      result = (TVertex *)(arg1)->castToTVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_TVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_userdata_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  void *arg2 = (void *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:SVertex_userdata_set",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_userdata_set" "', argument " "1"" of type '" "SVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2), 0, SWIG_POINTER_DISOWN);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVertex_userdata_set" "', argument " "2"" of type '" "void *""'"); 
+  }
+  if (arg1) (arg1)->userdata = arg2;
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_userdata_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  void *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_userdata_get",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_userdata_get" "', argument " "1"" of type '" "SVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  result = (void *) ((arg1)->userdata);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_SVertex__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_SVertex")) SWIG_fail;
+  {
+    try {
+      result = (SVertex *)new SVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SVertex, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_SVertex__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Geometry::Vec3r *arg1 = 0 ;
+  Id *arg2 = 0 ;
+  SVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_SVertex",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_SVertex" "', argument " "1"" of type '" "Geometry::Vec3r const &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_SVertex" "', argument " "1"" of type '" "Geometry::Vec3r const &""'"); 
+  }
+  arg1 = reinterpret_cast< Geometry::Vec3r * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Id,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_SVertex" "', argument " "2"" of type '" "Id const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_SVertex" "', argument " "2"" of type '" "Id const &""'"); 
+  }
+  arg2 = reinterpret_cast< Id * >(argp2);
+  {
+    try {
+      result = (SVertex *)new SVertex((Geometry::Vec3r const &)*arg1,(Id const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SVertex, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_SVertex__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = 0 ;
+  SVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_SVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_SVertex,  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_SVertex" "', argument " "1"" of type '" "SVertex &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_SVertex" "', argument " "1"" of type '" "SVertex &""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      result = (SVertex *)new SVertex(*arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SVertex, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_SVertex(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_SVertex__SWIG_0(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_SVertex, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_new_SVertex__SWIG_2(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Id, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_new_SVertex__SWIG_1(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_SVertex'.\n  Possible C/C++ prototypes are:\n    SVertex()\n    SVertex(Geometry::Vec3r const &,Id const &)\n    SVertex(SVertex &)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_SVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_SVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_SVertex" "', argument " "1"" of type '" "SVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_dupplicate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  SVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_dupplicate",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_dupplicate" "', argument " "1"" of type '" "SVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      result = (SVertex *)(arg1)->dupplicate();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  SVertex *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:SVertex___eq__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex___eq__" "', argument " "1"" of type '" "SVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_SVertex,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVertex___eq__" "', argument " "2"" of type '" "SVertex const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SVertex___eq__" "', argument " "2"" of type '" "SVertex const &""'"); 
+  }
+  arg2 = reinterpret_cast< SVertex * >(argp2);
+  {
+    try {
+      result = (bool)(arg1)->operator ==((SVertex const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_point3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  Geometry::Vec3r *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_point3D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_point3D" "', argument " "1"" of type '" "SVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      {
+        Geometry::Vec3r const &_result_ref = ((SVertex const *)arg1)->point3D();
+        result = (Geometry::Vec3r *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_point2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  Geometry::Vec3r *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_point2D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_point2D" "', argument " "1"" of type '" "SVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      {
+        Geometry::Vec3r const &_result_ref = ((SVertex const *)arg1)->point2D();
+        result = (Geometry::Vec3r *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_normals(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  SwigValueWrapper<set<VecMat::Vec3<double > > > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_normals",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_normals" "', argument " "1"" of type '" "SVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      result = (arg1)->normals();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new set<Geometry::Vec3r >(static_cast< const set<Geometry::Vec3r >& >(result))), SWIGTYPE_p_setTVecMat__Vec3Tdouble_t_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_normalsSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  unsigned int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_normalsSize",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_normalsSize" "', argument " "1"" of type '" "SVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      result = (unsigned int)((SVertex const *)arg1)->normalsSize();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_fedges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  std::vector<FEdge * > *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_fedges",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_fedges" "', argument " "1"" of type '" "SVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      {
+        std::vector<FEdge * > const &_result_ref = (arg1)->fedges();
+        result = (std::vector<FEdge * > *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_fedges_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  SVertex::fedges_container::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_fedges_begin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_fedges_begin" "', argument " "1"" of type '" "SVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      result = (arg1)->fedges_begin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new SVertex::fedges_container::iterator(static_cast< const SVertex::fedges_container::iterator& >(result))), SWIGTYPE_p_SVertex__fedges_container__iterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_fedges_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  SVertex::fedges_container::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_fedges_end",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_fedges_end" "', argument " "1"" of type '" "SVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      result = (arg1)->fedges_end();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new SVertex::fedges_container::iterator(static_cast< const SVertex::fedges_container::iterator& >(result))), SWIGTYPE_p_SVertex__fedges_container__iterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_shape__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  SShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_shape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_shape" "', argument " "1"" of type '" "SVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      result = (SShape *)(arg1)->shape();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SShape, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_z(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_z",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_z" "', argument " "1"" of type '" "SVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      result = (real)((SVertex const *)arg1)->z();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_viewvertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  ViewVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_viewvertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_viewvertex" "', argument " "1"" of type '" "SVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      result = (ViewVertex *)(arg1)->viewvertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_SetPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  Geometry::Vec3r *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:SVertex_SetPoint3D",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_SetPoint3D" "', argument " "1"" of type '" "SVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVertex_SetPoint3D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SVertex_SetPoint3D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+  }
+  arg2 = reinterpret_cast< Geometry::Vec3r * >(argp2);
+  {
+    try {
+      (arg1)->SetPoint3D((Geometry::Vec3r const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_SetPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  Geometry::Vec3r *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:SVertex_SetPoint2D",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_SetPoint2D" "', argument " "1"" of type '" "SVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVertex_SetPoint2D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SVertex_SetPoint2D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+  }
+  arg2 = reinterpret_cast< Geometry::Vec3r * >(argp2);
+  {
+    try {
+      (arg1)->SetPoint2D((Geometry::Vec3r const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_AddNormal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  Geometry::Vec3r *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:SVertex_AddNormal",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_AddNormal" "', argument " "1"" of type '" "SVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVertex_AddNormal" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SVertex_AddNormal" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+  }
+  arg2 = reinterpret_cast< Geometry::Vec3r * >(argp2);
+  {
+    try {
+      (arg1)->AddNormal((Geometry::Vec3r const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_setCurvatureInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  CurvatureInfo *arg2 = (CurvatureInfo *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:SVertex_setCurvatureInfo",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_setCurvatureInfo" "', argument " "1"" of type '" "SVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_CurvatureInfo, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVertex_setCurvatureInfo" "', argument " "2"" of type '" "CurvatureInfo *""'"); 
+  }
+  arg2 = reinterpret_cast< CurvatureInfo * >(argp2);
+  {
+    try {
+      (arg1)->setCurvatureInfo(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_getCurvatureInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  CurvatureInfo *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_getCurvatureInfo",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_getCurvatureInfo" "', argument " "1"" of type '" "SVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      result = (CurvatureInfo *)((SVertex const *)arg1)->getCurvatureInfo();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CurvatureInfo, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_setCurvatureFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  real arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:SVertex_setCurvatureFredo",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_setCurvatureFredo" "', argument " "1"" of type '" "SVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVertex_setCurvatureFredo" "', argument " "2"" of type '" "real""'");
+  } 
+  arg2 = static_cast< real >(val2);
+  {
+    try {
+      (arg1)->setCurvatureFredo(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_setDirectionFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  Geometry::Vec2r arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:SVertex_setDirectionFredo",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_setDirectionFredo" "', argument " "1"" of type '" "SVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVertex_setDirectionFredo" "', argument " "2"" of type '" "Geometry::Vec2r""'"); 
+    }  
+    if (!argp2) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SVertex_setDirectionFredo" "', argument " "2"" of type '" "Geometry::Vec2r""'");
+    } else {
+      Geometry::Vec2r * temp = reinterpret_cast< Geometry::Vec2r * >(argp2);
+      arg2 = *temp;
+      if (SWIG_IsNewObj(res2)) delete temp;
+    }
+  }
+  {
+    try {
+      (arg1)->setDirectionFredo(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_curvatureFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_curvatureFredo",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_curvatureFredo" "', argument " "1"" of type '" "SVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      result = (real)(arg1)->curvatureFredo();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_directionFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  Geometry::Vec2r result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_directionFredo",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_directionFredo" "', argument " "1"" of type '" "SVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      result = (arg1)->directionFredo();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2r(static_cast< const Geometry::Vec2r& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_SetId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  Id *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:SVertex_SetId",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_SetId" "', argument " "1"" of type '" "SVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Id,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVertex_SetId" "', argument " "2"" of type '" "Id const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SVertex_SetId" "', argument " "2"" of type '" "Id const &""'"); 
+  }
+  arg2 = reinterpret_cast< Id * >(argp2);
+  {
+    try {
+      (arg1)->SetId((Id const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_SetFEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  std::vector<FEdge * > *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:SVertex_SetFEdges",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_SetFEdges" "', argument " "1"" of type '" "SVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVertex_SetFEdges" "', argument " "2"" of type '" "std::vector<FEdge * > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SVertex_SetFEdges" "', argument " "2"" of type '" "std::vector<FEdge * > const &""'"); 
+  }
+  arg2 = reinterpret_cast< std::vector<FEdge * > * >(argp2);
+  {
+    try {
+      (arg1)->SetFEdges((std::vector<FEdge * > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_SetShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  SShape *arg2 = (SShape *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:SVertex_SetShape",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_SetShape" "', argument " "1"" of type '" "SVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SShape, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVertex_SetShape" "', argument " "2"" of type '" "SShape *""'"); 
+  }
+  arg2 = reinterpret_cast< SShape * >(argp2);
+  {
+    try {
+      (arg1)->SetShape(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_SetViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  ViewVertex *arg2 = (ViewVertex *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:SVertex_SetViewVertex",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_SetViewVertex" "', argument " "1"" of type '" "SVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewVertex, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVertex_SetViewVertex" "', argument " "2"" of type '" "ViewVertex *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewVertex * >(argp2);
+  {
+    try {
+      (arg1)->SetViewVertex(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_AddFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  FEdge *arg2 = (FEdge *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:SVertex_AddFEdge",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_AddFEdge" "', argument " "1"" of type '" "SVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVertex_AddFEdge" "', argument " "2"" of type '" "FEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< FEdge * >(argp2);
+  {
+    try {
+      (arg1)->AddFEdge(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_Replace(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  FEdge *arg2 = (FEdge *) 0 ;
+  FEdge *arg3 = (FEdge *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:SVertex_Replace",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_Replace" "', argument " "1"" of type '" "SVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVertex_Replace" "', argument " "2"" of type '" "FEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< FEdge * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SVertex_Replace" "', argument " "3"" of type '" "FEdge *""'"); 
+  }
+  arg3 = reinterpret_cast< FEdge * >(argp3);
+  {
+    try {
+      (arg1)->Replace(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_fedge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  FEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_fedge",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_fedge" "', argument " "1"" of type '" "SVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      result = (FEdge *)(arg1)->fedge();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FEdge, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_point2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  Geometry::Vec3r *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_point2d",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_point2d" "', argument " "1"" of type '" "SVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      {
+        Geometry::Vec3r const &_result_ref = ((SVertex const *)arg1)->point2d();
+        result = (Geometry::Vec3r *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_point3d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  Geometry::Vec3r *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_point3d",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_point3d" "', argument " "1"" of type '" "SVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      {
+        Geometry::Vec3r const &_result_ref = ((SVertex const *)arg1)->point3d();
+        result = (Geometry::Vec3r *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_normal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  Geometry::Vec3r result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_normal",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_normal" "', argument " "1"" of type '" "SVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      result = ((SVertex const *)arg1)->normal();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_shape_id(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  Id result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_shape_id",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_shape_id" "', argument " "1"" of type '" "SVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      result = ((SVertex const *)arg1)->shape_id();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Id(static_cast< const Id& >(result))), SWIGTYPE_p_Id, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_shape__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  SShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_shape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_shape" "', argument " "1"" of type '" "SVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      result = (SShape *)((SVertex const *)arg1)->shape();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SShape, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_shape(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_SVertex, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_SVertex_shape__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_SVertex, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_SVertex_shape__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SVertex_shape'.\n  Possible C/C++ prototypes are:\n    shape()\n    shape()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_shape_importance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_shape_importance",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_shape_importance" "', argument " "1"" of type '" "SVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      result = (float)((SVertex const *)arg1)->shape_importance();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_qi(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_qi",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_qi" "', argument " "1"" of type '" "SVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      result = (int)((SVertex const *)arg1)->qi();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_occluders_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  occluder_container::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_occluders_begin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_occluders_begin" "', argument " "1"" of type '" "SVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      result = ((SVertex const *)arg1)->occluders_begin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new occluder_container::const_iterator(static_cast< const occluder_container::const_iterator& >(result))), SWIGTYPE_p_occluder_container__const_iterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_occluders_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  occluder_container::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_occluders_end",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_occluders_end" "', argument " "1"" of type '" "SVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      result = ((SVertex const *)arg1)->occluders_end();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new occluder_container::const_iterator(static_cast< const occluder_container::const_iterator& >(result))), SWIGTYPE_p_occluder_container__const_iterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_occluders_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_occluders_empty",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_occluders_empty" "', argument " "1"" of type '" "SVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      result = (bool)((SVertex const *)arg1)->occluders_empty();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_occluders_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_occluders_size",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_occluders_size" "', argument " "1"" of type '" "SVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      result = (int)((SVertex const *)arg1)->occluders_size();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_occludee(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  Polygon3r *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_occludee",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_occludee" "', argument " "1"" of type '" "SVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      {
+        Polygon3r const &_result_ref = ((SVertex const *)arg1)->occludee();
+        result = (Polygon3r *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Polygon3r, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_occluded_shape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  SShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_occluded_shape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_occluded_shape" "', argument " "1"" of type '" "SVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      result = (SShape *)((SVertex const *)arg1)->occluded_shape();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SShape, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_occludee_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_occludee_empty",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_occludee_empty" "', argument " "1"" of type '" "SVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      result = (bool)((SVertex const *)arg1)->occludee_empty();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_z_discontinuity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_z_discontinuity",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_z_discontinuity" "', argument " "1"" of type '" "SVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      result = (real)((SVertex const *)arg1)->z_discontinuity();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *SVertex_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_SVertex, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_FEdge_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdge_getExactTypeName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_getExactTypeName" "', argument " "1"" of type '" "FEdge const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  {
+    try {
+      result = ((FEdge const *)arg1)->getExactTypeName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_getLength2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdge_getLength2D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_getLength2D" "', argument " "1"" of type '" "FEdge const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  {
+    try {
+      result = (real)((FEdge const *)arg1)->getLength2D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  Id result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdge_getId",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_getId" "', argument " "1"" of type '" "FEdge const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  {
+    try {
+      result = ((FEdge const *)arg1)->getId();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Id(static_cast< const Id& >(result))), SWIGTYPE_p_Id, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_userdata_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  void *arg2 = (void *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdge_userdata_set",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_userdata_set" "', argument " "1"" of type '" "FEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2), 0, SWIG_POINTER_DISOWN);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdge_userdata_set" "', argument " "2"" of type '" "void *""'"); 
+  }
+  if (arg1) (arg1)->userdata = arg2;
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_userdata_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  void *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdge_userdata_get",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_userdata_get" "', argument " "1"" of type '" "FEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  result = (void *) ((arg1)->userdata);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FEdge__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_FEdge")) SWIG_fail;
+  {
+    try {
+      result = (FEdge *)new FEdge();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FEdge, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FEdge__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  SVertex *arg2 = (SVertex *) 0 ;
+  FEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_FEdge",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_FEdge" "', argument " "1"" of type '" "SVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_FEdge" "', argument " "2"" of type '" "SVertex *""'"); 
+  }
+  arg2 = reinterpret_cast< SVertex * >(argp2);
+  {
+    try {
+      result = (FEdge *)new FEdge(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FEdge, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FEdge__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = 0 ;
+  FEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_FEdge",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_FEdge,  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_FEdge" "', argument " "1"" of type '" "FEdge &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_FEdge" "', argument " "1"" of type '" "FEdge &""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  {
+    try {
+      result = (FEdge *)new FEdge(*arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FEdge, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FEdge(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_FEdge__SWIG_0(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_FEdge, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_new_FEdge__SWIG_2(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_SVertex, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_SVertex, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_new_FEdge__SWIG_1(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_FEdge'.\n  Possible C/C++ prototypes are:\n    FEdge()\n    FEdge(SVertex *,SVertex *)\n    FEdge(FEdge &)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_FEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_FEdge",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FEdge" "', argument " "1"" of type '" "FEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_dupplicate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  FEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdge_dupplicate",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_dupplicate" "', argument " "1"" of type '" "FEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  {
+    try {
+      result = (FEdge *)(arg1)->dupplicate();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FEdge, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_vertexA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  SVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdge_vertexA",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_vertexA" "', argument " "1"" of type '" "FEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  {
+    try {
+      result = (SVertex *)(arg1)->vertexA();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_vertexB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  SVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdge_vertexB",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_vertexB" "', argument " "1"" of type '" "FEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  {
+    try {
+      result = (SVertex *)(arg1)->vertexB();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_getNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  Nature::EdgeNature result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdge_getNature",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_getNature" "', argument " "1"" of type '" "FEdge const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  {
+    try {
+      result = (Nature::EdgeNature)((FEdge const *)arg1)->getNature();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_nextEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  FEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdge_nextEdge",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_nextEdge" "', argument " "1"" of type '" "FEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  {
+    try {
+      result = (FEdge *)(arg1)->nextEdge();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FEdge, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_previousEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  FEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdge_previousEdge",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_previousEdge" "', argument " "1"" of type '" "FEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  {
+    try {
+      result = (FEdge *)(arg1)->previousEdge();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FEdge, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_shape__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  SShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdge_shape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_shape" "', argument " "1"" of type '" "FEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  {
+    try {
+      result = (SShape *)(arg1)->shape();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SShape, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_invisibility(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdge_invisibility",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_invisibility" "', argument " "1"" of type '" "FEdge const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  {
+    try {
+      result = (int)((FEdge const *)arg1)->invisibility();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_viewedge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  ViewEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdge_viewedge",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_viewedge" "', argument " "1"" of type '" "FEdge const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  {
+    try {
+      result = (ViewEdge *)((FEdge const *)arg1)->viewedge();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewEdge, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_center3d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  Geometry::Vec3r result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdge_center3d",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_center3d" "', argument " "1"" of type '" "FEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  {
+    try {
+      result = (arg1)->center3d();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_center2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  Geometry::Vec3r result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdge_center2d",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_center2d" "', argument " "1"" of type '" "FEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  {
+    try {
+      result = (arg1)->center2d();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_aFace(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  Polygon3r *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdge_aFace",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_aFace" "', argument " "1"" of type '" "FEdge const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  {
+    try {
+      {
+        Polygon3r const &_result_ref = ((FEdge const *)arg1)->aFace();
+        result = (Polygon3r *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Polygon3r, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_getOccludeeIntersection(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  Geometry::Vec3r *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdge_getOccludeeIntersection",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_getOccludeeIntersection" "', argument " "1"" of type '" "FEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  {
+    try {
+      {
+        Geometry::Vec3r const &_result_ref = (arg1)->getOccludeeIntersection();
+        result = (Geometry::Vec3r *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_getOccludeeEmpty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdge_getOccludeeEmpty",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_getOccludeeEmpty" "', argument " "1"" of type '" "FEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  {
+    try {
+      result = (bool)(arg1)->getOccludeeEmpty();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_isSmooth(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdge_isSmooth",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_isSmooth" "', argument " "1"" of type '" "FEdge const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  {
+    try {
+      result = (bool)((FEdge const *)arg1)->isSmooth();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_SetVertexA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  SVertex *arg2 = (SVertex *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdge_SetVertexA",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_SetVertexA" "', argument " "1"" of type '" "FEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdge_SetVertexA" "', argument " "2"" of type '" "SVertex *""'"); 
+  }
+  arg2 = reinterpret_cast< SVertex * >(argp2);
+  {
+    try {
+      (arg1)->SetVertexA(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_SetVertexB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  SVertex *arg2 = (SVertex *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdge_SetVertexB",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_SetVertexB" "', argument " "1"" of type '" "FEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdge_SetVertexB" "', argument " "2"" of type '" "SVertex *""'"); 
+  }
+  arg2 = reinterpret_cast< SVertex * >(argp2);
+  {
+    try {
+      (arg1)->SetVertexB(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_SetId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  Id *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdge_SetId",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_SetId" "', argument " "1"" of type '" "FEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Id,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdge_SetId" "', argument " "2"" of type '" "Id const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdge_SetId" "', argument " "2"" of type '" "Id const &""'"); 
+  }
+  arg2 = reinterpret_cast< Id * >(argp2);
+  {
+    try {
+      (arg1)->SetId((Id const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_SetNextEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  FEdge *arg2 = (FEdge *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdge_SetNextEdge",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_SetNextEdge" "', argument " "1"" of type '" "FEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdge_SetNextEdge" "', argument " "2"" of type '" "FEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< FEdge * >(argp2);
+  {
+    try {
+      (arg1)->SetNextEdge(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_SetPreviousEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  FEdge *arg2 = (FEdge *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdge_SetPreviousEdge",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_SetPreviousEdge" "', argument " "1"" of type '" "FEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdge_SetPreviousEdge" "', argument " "2"" of type '" "FEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< FEdge * >(argp2);
+  {
+    try {
+      (arg1)->SetPreviousEdge(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_SetNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  Nature::EdgeNature arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned short val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdge_SetNature",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_SetNature" "', argument " "1"" of type '" "FEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  ecode2 = SWIG_AsVal_unsigned_SS_short(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdge_SetNature" "', argument " "2"" of type '" "Nature::EdgeNature""'");
+  } 
+  arg2 = static_cast< Nature::EdgeNature >(val2);
+  {
+    try {
+      (arg1)->SetNature(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_SetViewEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  ViewEdge *arg2 = (ViewEdge *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdge_SetViewEdge",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_SetViewEdge" "', argument " "1"" of type '" "FEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdge_SetViewEdge" "', argument " "2"" of type '" "ViewEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewEdge * >(argp2);
+  {
+    try {
+      (arg1)->SetViewEdge(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_SetaFace(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  Polygon3r *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdge_SetaFace",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_SetaFace" "', argument " "1"" of type '" "FEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Polygon3r,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdge_SetaFace" "', argument " "2"" of type '" "Polygon3r &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdge_SetaFace" "', argument " "2"" of type '" "Polygon3r &""'"); 
+  }
+  arg2 = reinterpret_cast< Polygon3r * >(argp2);
+  {
+    try {
+      (arg1)->SetaFace(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_SetOccludeeIntersection(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  Geometry::Vec3r *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdge_SetOccludeeIntersection",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_SetOccludeeIntersection" "', argument " "1"" of type '" "FEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdge_SetOccludeeIntersection" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdge_SetOccludeeIntersection" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+  }
+  arg2 = reinterpret_cast< Geometry::Vec3r * >(argp2);
+  {
+    try {
+      (arg1)->SetOccludeeIntersection((Geometry::Vec3r const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_SetOccludeeEmpty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  bool arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdge_SetOccludeeEmpty",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_SetOccludeeEmpty" "', argument " "1"" of type '" "FEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdge_SetOccludeeEmpty" "', argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = static_cast< bool >(val2);
+  {
+    try {
+      (arg1)->SetOccludeeEmpty(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_SetSmooth(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  bool arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdge_SetSmooth",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_SetSmooth" "', argument " "1"" of type '" "FEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdge_SetSmooth" "', argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = static_cast< bool >(val2);
+  {
+    try {
+      (arg1)->SetSmooth(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_CommonVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  FEdge *arg2 = (FEdge *) 0 ;
+  SVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdge_CommonVertex",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_CommonVertex" "', argument " "1"" of type '" "FEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdge_CommonVertex" "', argument " "2"" of type '" "FEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< FEdge * >(argp2);
+  {
+    try {
+      result = (SVertex *)FEdge::CommonVertex(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_min2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  SVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdge_min2d",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_min2d" "', argument " "1"" of type '" "FEdge const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  {
+    try {
+      result = (SVertex *)((FEdge const *)arg1)->min2d();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_max2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  SVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdge_max2d",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_max2d" "', argument " "1"" of type '" "FEdge const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  {
+    try {
+      result = (SVertex *)((FEdge const *)arg1)->max2d();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_shape_id(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  Id result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdge_shape_id",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_shape_id" "', argument " "1"" of type '" "FEdge const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  {
+    try {
+      result = ((FEdge const *)arg1)->shape_id();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Id(static_cast< const Id& >(result))), SWIGTYPE_p_Id, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_shape__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  SShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdge_shape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_shape" "', argument " "1"" of type '" "FEdge const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  {
+    try {
+      result = (SShape *)((FEdge const *)arg1)->shape();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SShape, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_shape(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_FEdge, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_FEdge_shape__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_FEdge, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_FEdge_shape__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdge_shape'.\n  Possible C/C++ prototypes are:\n    shape()\n    shape()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_shape_importance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdge_shape_importance",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_shape_importance" "', argument " "1"" of type '" "FEdge const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  {
+    try {
+      result = (float)((FEdge const *)arg1)->shape_importance();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_qi(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdge_qi",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_qi" "', argument " "1"" of type '" "FEdge const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  {
+    try {
+      result = (int)((FEdge const *)arg1)->qi();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_occluders_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  occluder_container::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdge_occluders_begin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_occluders_begin" "', argument " "1"" of type '" "FEdge const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  {
+    try {
+      result = ((FEdge const *)arg1)->occluders_begin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new occluder_container::const_iterator(static_cast< const occluder_container::const_iterator& >(result))), SWIGTYPE_p_occluder_container__const_iterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_occluders_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  occluder_container::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdge_occluders_end",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_occluders_end" "', argument " "1"" of type '" "FEdge const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  {
+    try {
+      result = ((FEdge const *)arg1)->occluders_end();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new occluder_container::const_iterator(static_cast< const occluder_container::const_iterator& >(result))), SWIGTYPE_p_occluder_container__const_iterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_occluders_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdge_occluders_empty",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_occluders_empty" "', argument " "1"" of type '" "FEdge const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  {
+    try {
+      result = (bool)((FEdge const *)arg1)->occluders_empty();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_occluders_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdge_occluders_size",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_occluders_size" "', argument " "1"" of type '" "FEdge const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  {
+    try {
+      result = (int)((FEdge const *)arg1)->occluders_size();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_occludee(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  Polygon3r *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdge_occludee",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_occludee" "', argument " "1"" of type '" "FEdge const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  {
+    try {
+      {
+        Polygon3r const &_result_ref = ((FEdge const *)arg1)->occludee();
+        result = (Polygon3r *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Polygon3r, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_occluded_shape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  SShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdge_occluded_shape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_occluded_shape" "', argument " "1"" of type '" "FEdge const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  {
+    try {
+      result = (SShape *)((FEdge const *)arg1)->occluded_shape();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SShape, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_occludee_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdge_occludee_empty",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_occludee_empty" "', argument " "1"" of type '" "FEdge const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  {
+    try {
+      result = (bool)((FEdge const *)arg1)->occludee_empty();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_z_discontinuity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdge_z_discontinuity",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_z_discontinuity" "', argument " "1"" of type '" "FEdge const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  {
+    try {
+      result = (real)((FEdge const *)arg1)->z_discontinuity();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_viewedge_nature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdge_viewedge_nature",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_viewedge_nature" "', argument " "1"" of type '" "FEdge const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  {
+    try {
+      result = (int)((FEdge const *)arg1)->viewedge_nature();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_orientation2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  Geometry::Vec3r result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdge_orientation2d",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_orientation2d" "', argument " "1"" of type '" "FEdge const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  {
+    try {
+      result = ((FEdge const *)arg1)->orientation2d();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_orientation3d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  Geometry::Vec3r result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdge_orientation3d",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_orientation3d" "', argument " "1"" of type '" "FEdge const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  {
+    try {
+      result = ((FEdge const *)arg1)->orientation3d();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_verticesBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  Interface0DIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdge_verticesBegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_verticesBegin" "', argument " "1"" of type '" "FEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  {
+    try {
+      result = (arg1)->verticesBegin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Interface0DIterator(static_cast< const Interface0DIterator& >(result))), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_verticesEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  Interface0DIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdge_verticesEnd",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_verticesEnd" "', argument " "1"" of type '" "FEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  {
+    try {
+      result = (arg1)->verticesEnd();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Interface0DIterator(static_cast< const Interface0DIterator& >(result))), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_pointsBegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  float arg2 ;
+  Interface0DIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdge_pointsBegin",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_pointsBegin" "', argument " "1"" of type '" "FEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdge_pointsBegin" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  {
+    try {
+      result = (arg1)->pointsBegin(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Interface0DIterator(static_cast< const Interface0DIterator& >(result))), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_pointsBegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  Interface0DIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdge_pointsBegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_pointsBegin" "', argument " "1"" of type '" "FEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  {
+    try {
+      result = (arg1)->pointsBegin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Interface0DIterator(static_cast< const Interface0DIterator& >(result))), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_pointsBegin(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_FEdge, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_FEdge_pointsBegin__SWIG_1(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_FEdge, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_float(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_FEdge_pointsBegin__SWIG_0(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdge_pointsBegin'.\n  Possible C/C++ prototypes are:\n    pointsBegin(float)\n    pointsBegin()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_pointsEnd__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  float arg2 ;
+  Interface0DIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdge_pointsEnd",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_pointsEnd" "', argument " "1"" of type '" "FEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdge_pointsEnd" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  {
+    try {
+      result = (arg1)->pointsEnd(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Interface0DIterator(static_cast< const Interface0DIterator& >(result))), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_pointsEnd__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *arg1 = (FEdge *) 0 ;
+  Interface0DIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdge_pointsEnd",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_pointsEnd" "', argument " "1"" of type '" "FEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdge * >(argp1);
+  {
+    try {
+      result = (arg1)->pointsEnd();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Interface0DIterator(static_cast< const Interface0DIterator& >(result))), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_pointsEnd(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_FEdge, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_FEdge_pointsEnd__SWIG_1(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_FEdge, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_float(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_FEdge_pointsEnd__SWIG_0(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdge_pointsEnd'.\n  Possible C/C++ prototypes are:\n    pointsEnd(float)\n    pointsEnd()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *FEdge_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_FEdge, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_FEdgeSVertexIterator__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_FEdgeSVertexIterator")) SWIG_fail;
+  {
+    try {
+      result = (FEdgeInternal::SVertexIterator *)new FEdgeInternal::SVertexIterator();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FEdgeInternal__SVertexIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FEdgeSVertexIterator__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = 0 ;
+  FEdgeInternal::SVertexIterator *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_FEdgeSVertexIterator",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_FEdgeInternal__SVertexIterator,  0  | 0);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_FEdgeSVertexIterator" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator const &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_FEdgeSVertexIterator" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator const &""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (FEdgeInternal::SVertexIterator *)new FEdgeInternal::SVertexIterator((FEdgeInternal::SVertexIterator const &)*arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FEdgeInternal__SVertexIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FEdgeSVertexIterator__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  FEdge *arg2 = (FEdge *) 0 ;
+  FEdgeInternal::SVertexIterator *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_FEdgeSVertexIterator",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_FEdgeSVertexIterator" "', argument " "1"" of type '" "SVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_FEdgeSVertexIterator" "', argument " "2"" of type '" "FEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< FEdge * >(argp2);
+  {
+    try {
+      result = (FEdgeInternal::SVertexIterator *)new FEdgeInternal::SVertexIterator(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FEdgeInternal__SVertexIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FEdgeSVertexIterator(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_FEdgeSVertexIterator__SWIG_0(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_new_FEdgeSVertexIterator__SWIG_1(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_SVertex, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_FEdge, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_new_FEdgeSVertexIterator__SWIG_2(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_FEdgeSVertexIterator'.\n  Possible C/C++ prototypes are:\n    FEdgeInternal::SVertexIterator()\n    FEdgeInternal::SVertexIterator(FEdgeInternal::SVertexIterator const &)\n    FEdgeInternal::SVertexIterator(SVertex *,FEdge *)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_getExactTypeName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_getExactTypeName" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = ((FEdgeInternal::SVertexIterator const *)arg1)->getExactTypeName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_getObject(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  SVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_getObject",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_getObject" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      {
+        SVertex &_result_ref = (arg1)->operator *();
+        result = (SVertex *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator___deref__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  SVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator___deref__",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator___deref__" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (SVertex *)(arg1)->operator ->();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_increment(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_increment",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_increment" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      (arg1)->increment();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_decrement(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_decrement",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_decrement" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      (arg1)->decrement();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_isBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_isBegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_isBegin" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (bool)((FEdgeInternal::SVertexIterator const *)arg1)->isBegin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_isEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_isEnd",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_isEnd" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (bool)((FEdgeInternal::SVertexIterator const *)arg1)->isEnd();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  Interface0DIteratorNested *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSVertexIterator___eq__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator___eq__" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIteratorNested,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSVertexIterator___eq__" "', argument " "2"" of type '" "Interface0DIteratorNested const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdgeSVertexIterator___eq__" "', argument " "2"" of type '" "Interface0DIteratorNested const &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0DIteratorNested * >(argp2);
+  {
+    try {
+      result = (bool)((FEdgeInternal::SVertexIterator const *)arg1)->operator ==((Interface0DIteratorNested const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_t(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_t",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_t" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (float)((FEdgeInternal::SVertexIterator const *)arg1)->t();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_u(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_u",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_u" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (float)((FEdgeInternal::SVertexIterator const *)arg1)->u();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_copy(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  FEdgeInternal::SVertexIterator *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_copy",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_copy" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (FEdgeInternal::SVertexIterator *)((FEdgeInternal::SVertexIterator const *)arg1)->copy();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_FEdgeSVertexIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_FEdgeSVertexIterator",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FEdgeSVertexIterator" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_getX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_getX",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_getX" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->getX();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_getY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_getY",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_getY" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->getY();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_getZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_getZ",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_getZ" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->getZ();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_getPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  Geometry::Vec3f result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_getPoint3D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_getPoint3D" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->getPoint3D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_getProjectedX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_getProjectedX",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_getProjectedX" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->getProjectedX();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_getProjectedY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_getProjectedY",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_getProjectedY" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->getProjectedY();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_getProjectedZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_getProjectedZ",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_getProjectedZ" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->getProjectedZ();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_getPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  Geometry::Vec2f result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_getPoint2D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_getPoint2D" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->getPoint2D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_getFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  Interface0D *arg2 = 0 ;
+  FEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSVertexIterator_getFEdge",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_getFEdge" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSVertexIterator_getFEdge" "', argument " "2"" of type '" "Interface0D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdgeSVertexIterator_getFEdge" "', argument " "2"" of type '" "Interface0D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0D * >(argp2);
+  {
+    try {
+      result = (FEdge *)(*arg1)->getFEdge(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FEdge, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  Id result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_getId",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_getId" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->getId();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Id(static_cast< const Id& >(result))), SWIGTYPE_p_Id, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_getNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  Nature::VertexNature result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_getNature",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_getNature" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (Nature::VertexNature)(*arg1)->getNature();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_castToSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  SVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_castToSVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_castToSVertex" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (SVertex *)(*arg1)->castToSVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_castToViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  ViewVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_castToViewVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_castToViewVertex" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (ViewVertex *)(*arg1)->castToViewVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_castToNonTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  NonTVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_castToNonTVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_castToNonTVertex" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (NonTVertex *)(*arg1)->castToNonTVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_NonTVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_castToTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  TVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_castToTVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_castToTVertex" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (TVertex *)(*arg1)->castToTVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_TVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_userdata_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  void *arg2 = (void *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSVertexIterator_userdata_set",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_userdata_set" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2), 0, SWIG_POINTER_DISOWN);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSVertexIterator_userdata_set" "', argument " "2"" of type '" "void *""'"); 
+  }
+  if (arg1) (*arg1)->userdata = arg2;
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_userdata_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  void *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_userdata_get",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_userdata_get" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  result = (void *) ((*arg1)->userdata);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_dupplicate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  SVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_dupplicate",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_dupplicate" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (SVertex *)(*arg1)->dupplicate();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_point3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  Geometry::Vec3r *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_point3D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_point3D" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      {
+        Geometry::Vec3r const &_result_ref = (*arg1)->point3D();
+        result = (Geometry::Vec3r *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_point2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  Geometry::Vec3r *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_point2D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_point2D" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      {
+        Geometry::Vec3r const &_result_ref = (*arg1)->point2D();
+        result = (Geometry::Vec3r *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_normals(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  SwigValueWrapper<set<VecMat::Vec3<double > > > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_normals",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_normals" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->normals();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new set<Geometry::Vec3r >(static_cast< const set<Geometry::Vec3r >& >(result))), SWIGTYPE_p_setTVecMat__Vec3Tdouble_t_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_normalsSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  unsigned int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_normalsSize",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_normalsSize" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (unsigned int)(*arg1)->normalsSize();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_fedges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  std::vector<FEdge * > *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_fedges",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_fedges" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      {
+        std::vector<FEdge * > const &_result_ref = (*arg1)->fedges();
+        result = (std::vector<FEdge * > *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_fedges_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  SVertex::fedges_container::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_fedges_begin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_fedges_begin" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->fedges_begin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new SVertex::fedges_container::iterator(static_cast< const SVertex::fedges_container::iterator& >(result))), SWIGTYPE_p_SVertex__fedges_container__iterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_fedges_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  SVertex::fedges_container::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_fedges_end",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_fedges_end" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->fedges_end();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new SVertex::fedges_container::iterator(static_cast< const SVertex::fedges_container::iterator& >(result))), SWIGTYPE_p_SVertex__fedges_container__iterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_shape__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  SShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_shape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_shape" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (SShape *)(*arg1)->shape();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SShape, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_shape__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  SShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_shape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_shape" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (SShape *)(*arg1)->shape();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SShape, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_shape(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_FEdgeSVertexIterator_shape__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_FEdgeSVertexIterator_shape__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdgeSVertexIterator_shape'.\n  Possible C/C++ prototypes are:\n    shape()\n    shape()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_z(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_z",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_z" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->z();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_viewvertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  ViewVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_viewvertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_viewvertex" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (ViewVertex *)(*arg1)->viewvertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_SetPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  Geometry::Vec3r *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSVertexIterator_SetPoint3D",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_SetPoint3D" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSVertexIterator_SetPoint3D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdgeSVertexIterator_SetPoint3D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+  }
+  arg2 = reinterpret_cast< Geometry::Vec3r * >(argp2);
+  {
+    try {
+      (*arg1)->SetPoint3D((Geometry::Vec3r const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_SetPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  Geometry::Vec3r *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSVertexIterator_SetPoint2D",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_SetPoint2D" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSVertexIterator_SetPoint2D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdgeSVertexIterator_SetPoint2D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+  }
+  arg2 = reinterpret_cast< Geometry::Vec3r * >(argp2);
+  {
+    try {
+      (*arg1)->SetPoint2D((Geometry::Vec3r const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_AddNormal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  Geometry::Vec3r *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSVertexIterator_AddNormal",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_AddNormal" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSVertexIterator_AddNormal" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdgeSVertexIterator_AddNormal" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+  }
+  arg2 = reinterpret_cast< Geometry::Vec3r * >(argp2);
+  {
+    try {
+      (*arg1)->AddNormal((Geometry::Vec3r const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_setCurvatureInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  CurvatureInfo *arg2 = (CurvatureInfo *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSVertexIterator_setCurvatureInfo",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_setCurvatureInfo" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_CurvatureInfo, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSVertexIterator_setCurvatureInfo" "', argument " "2"" of type '" "CurvatureInfo *""'"); 
+  }
+  arg2 = reinterpret_cast< CurvatureInfo * >(argp2);
+  {
+    try {
+      (*arg1)->setCurvatureInfo(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_getCurvatureInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  CurvatureInfo *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_getCurvatureInfo",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_getCurvatureInfo" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (CurvatureInfo *)(*arg1)->getCurvatureInfo();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CurvatureInfo, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_setCurvatureFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  real arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSVertexIterator_setCurvatureFredo",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_setCurvatureFredo" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgeSVertexIterator_setCurvatureFredo" "', argument " "2"" of type '" "real""'");
+  } 
+  arg2 = static_cast< real >(val2);
+  {
+    try {
+      (*arg1)->setCurvatureFredo(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_setDirectionFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  Geometry::Vec2r arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSVertexIterator_setDirectionFredo",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_setDirectionFredo" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSVertexIterator_setDirectionFredo" "', argument " "2"" of type '" "Geometry::Vec2r""'"); 
+    }  
+    if (!argp2) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdgeSVertexIterator_setDirectionFredo" "', argument " "2"" of type '" "Geometry::Vec2r""'");
+    } else {
+      Geometry::Vec2r * temp = reinterpret_cast< Geometry::Vec2r * >(argp2);
+      arg2 = *temp;
+      if (SWIG_IsNewObj(res2)) delete temp;
+    }
+  }
+  {
+    try {
+      (*arg1)->setDirectionFredo(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_curvatureFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_curvatureFredo",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_curvatureFredo" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->curvatureFredo();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_directionFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  Geometry::Vec2r result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_directionFredo",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_directionFredo" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->directionFredo();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2r(static_cast< const Geometry::Vec2r& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_SetId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  Id *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSVertexIterator_SetId",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_SetId" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Id,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSVertexIterator_SetId" "', argument " "2"" of type '" "Id const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdgeSVertexIterator_SetId" "', argument " "2"" of type '" "Id const &""'"); 
+  }
+  arg2 = reinterpret_cast< Id * >(argp2);
+  {
+    try {
+      (*arg1)->SetId((Id const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_SetFEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  std::vector<FEdge * > *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSVertexIterator_SetFEdges",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_SetFEdges" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSVertexIterator_SetFEdges" "', argument " "2"" of type '" "std::vector<FEdge * > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdgeSVertexIterator_SetFEdges" "', argument " "2"" of type '" "std::vector<FEdge * > const &""'"); 
+  }
+  arg2 = reinterpret_cast< std::vector<FEdge * > * >(argp2);
+  {
+    try {
+      (*arg1)->SetFEdges((std::vector<FEdge * > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_SetShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  SShape *arg2 = (SShape *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSVertexIterator_SetShape",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_SetShape" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SShape, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSVertexIterator_SetShape" "', argument " "2"" of type '" "SShape *""'"); 
+  }
+  arg2 = reinterpret_cast< SShape * >(argp2);
+  {
+    try {
+      (*arg1)->SetShape(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_SetViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  ViewVertex *arg2 = (ViewVertex *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSVertexIterator_SetViewVertex",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_SetViewVertex" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewVertex, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSVertexIterator_SetViewVertex" "', argument " "2"" of type '" "ViewVertex *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewVertex * >(argp2);
+  {
+    try {
+      (*arg1)->SetViewVertex(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_AddFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  FEdge *arg2 = (FEdge *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSVertexIterator_AddFEdge",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_AddFEdge" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSVertexIterator_AddFEdge" "', argument " "2"" of type '" "FEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< FEdge * >(argp2);
+  {
+    try {
+      (*arg1)->AddFEdge(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_Replace(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  FEdge *arg2 = (FEdge *) 0 ;
+  FEdge *arg3 = (FEdge *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:FEdgeSVertexIterator_Replace",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_Replace" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSVertexIterator_Replace" "', argument " "2"" of type '" "FEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< FEdge * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FEdgeSVertexIterator_Replace" "', argument " "3"" of type '" "FEdge *""'"); 
+  }
+  arg3 = reinterpret_cast< FEdge * >(argp3);
+  {
+    try {
+      (*arg1)->Replace(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_fedge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  FEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_fedge",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_fedge" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (FEdge *)(*arg1)->fedge();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FEdge, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_point2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  Geometry::Vec3r *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_point2d",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_point2d" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      {
+        Geometry::Vec3r const &_result_ref = (*arg1)->point2d();
+        result = (Geometry::Vec3r *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_point3d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  Geometry::Vec3r *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_point3d",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_point3d" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      {
+        Geometry::Vec3r const &_result_ref = (*arg1)->point3d();
+        result = (Geometry::Vec3r *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_normal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  Geometry::Vec3r result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_normal",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_normal" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->normal();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_shape_id(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  Id result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_shape_id",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_shape_id" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->shape_id();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Id(static_cast< const Id& >(result))), SWIGTYPE_p_Id, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_shape_importance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_shape_importance",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_shape_importance" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (float)(*arg1)->shape_importance();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_qi(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_qi",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_qi" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (int)(*arg1)->qi();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_occluders_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  occluder_container::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_occluders_begin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_occluders_begin" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->occluders_begin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new occluder_container::const_iterator(static_cast< const occluder_container::const_iterator& >(result))), SWIGTYPE_p_occluder_container__const_iterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_occluders_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  occluder_container::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_occluders_end",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_occluders_end" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->occluders_end();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new occluder_container::const_iterator(static_cast< const occluder_container::const_iterator& >(result))), SWIGTYPE_p_occluder_container__const_iterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_occluders_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_occluders_empty",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_occluders_empty" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (bool)(*arg1)->occluders_empty();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_occluders_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_occluders_size",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_occluders_size" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (int)(*arg1)->occluders_size();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_occludee(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  Polygon3r *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_occludee",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_occludee" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      {
+        Polygon3r const &_result_ref = (*arg1)->occludee();
+        result = (Polygon3r *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Polygon3r, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_occluded_shape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  SShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_occluded_shape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_occluded_shape" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (SShape *)(*arg1)->occluded_shape();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SShape, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_occludee_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_occludee_empty",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_occludee_empty" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (bool)(*arg1)->occludee_empty();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_z_discontinuity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_z_discontinuity",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_z_discontinuity" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->z_discontinuity();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *FEdgeSVertexIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_FEdgeInternal__SVertexIterator, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_FEdgeSharp__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeSharp *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_FEdgeSharp")) SWIG_fail;
+  {
+    try {
+      result = (FEdgeSharp *)new FEdgeSharp();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FEdgeSharp, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FEdgeSharp__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  SVertex *arg2 = (SVertex *) 0 ;
+  FEdgeSharp *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_FEdgeSharp",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_FEdgeSharp" "', argument " "1"" of type '" "SVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_FEdgeSharp" "', argument " "2"" of type '" "SVertex *""'"); 
+  }
+  arg2 = reinterpret_cast< SVertex * >(argp2);
+  {
+    try {
+      result = (FEdgeSharp *)new FEdgeSharp(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FEdgeSharp, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FEdgeSharp__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeSharp *arg1 = 0 ;
+  FEdgeSharp *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_FEdgeSharp",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_FEdgeSharp,  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_FEdgeSharp" "', argument " "1"" of type '" "FEdgeSharp &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_FEdgeSharp" "', argument " "1"" of type '" "FEdgeSharp &""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeSharp * >(argp1);
+  {
+    try {
+      result = (FEdgeSharp *)new FEdgeSharp(*arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FEdgeSharp, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FEdgeSharp(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_FEdgeSharp__SWIG_0(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_FEdgeSharp, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_new_FEdgeSharp__SWIG_2(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_SVertex, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_SVertex, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_new_FEdgeSharp__SWIG_1(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_FEdgeSharp'.\n  Possible C/C++ prototypes are:\n    FEdgeSharp()\n    FEdgeSharp(SVertex *,SVertex *)\n    FEdgeSharp(FEdgeSharp &)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_FEdgeSharp(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeSharp *arg1 = (FEdgeSharp *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_FEdgeSharp",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeSharp, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FEdgeSharp" "', argument " "1"" of type '" "FEdgeSharp *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeSharp * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSharp_dupplicate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeSharp *arg1 = (FEdgeSharp *) 0 ;
+  FEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSharp_dupplicate",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeSharp, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSharp_dupplicate" "', argument " "1"" of type '" "FEdgeSharp *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeSharp * >(argp1);
+  {
+    try {
+      result = (FEdge *)(arg1)->dupplicate();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FEdge, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSharp_normalA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeSharp *arg1 = (FEdgeSharp *) 0 ;
+  Geometry::Vec3r *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSharp_normalA",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeSharp, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSharp_normalA" "', argument " "1"" of type '" "FEdgeSharp *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeSharp * >(argp1);
+  {
+    try {
+      {
+        Geometry::Vec3r const &_result_ref = (arg1)->normalA();
+        result = (Geometry::Vec3r *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSharp_normalB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeSharp *arg1 = (FEdgeSharp *) 0 ;
+  Geometry::Vec3r *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSharp_normalB",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeSharp, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSharp_normalB" "', argument " "1"" of type '" "FEdgeSharp *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeSharp * >(argp1);
+  {
+    try {
+      {
+        Geometry::Vec3r const &_result_ref = (arg1)->normalB();
+        result = (Geometry::Vec3r *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSharp_aMaterialIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeSharp *arg1 = (FEdgeSharp *) 0 ;
+  unsigned int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSharp_aMaterialIndex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeSharp, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSharp_aMaterialIndex" "', argument " "1"" of type '" "FEdgeSharp const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeSharp * >(argp1);
+  {
+    try {
+      result = (unsigned int)((FEdgeSharp const *)arg1)->aMaterialIndex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSharp_aMaterial(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeSharp *arg1 = (FEdgeSharp *) 0 ;
+  Material *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSharp_aMaterial",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeSharp, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSharp_aMaterial" "', argument " "1"" of type '" "FEdgeSharp const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeSharp * >(argp1);
+  {
+    try {
+      {
+        Material const &_result_ref = ((FEdgeSharp const *)arg1)->aMaterial();
+        result = (Material *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Material, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSharp_bMaterialIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeSharp *arg1 = (FEdgeSharp *) 0 ;
+  unsigned int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSharp_bMaterialIndex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeSharp, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSharp_bMaterialIndex" "', argument " "1"" of type '" "FEdgeSharp const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeSharp * >(argp1);
+  {
+    try {
+      result = (unsigned int)((FEdgeSharp const *)arg1)->bMaterialIndex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSharp_bMaterial(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeSharp *arg1 = (FEdgeSharp *) 0 ;
+  Material *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSharp_bMaterial",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeSharp, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSharp_bMaterial" "', argument " "1"" of type '" "FEdgeSharp const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeSharp * >(argp1);
+  {
+    try {
+      {
+        Material const &_result_ref = ((FEdgeSharp const *)arg1)->bMaterial();
+        result = (Material *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Material, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSharp_SetNormalA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeSharp *arg1 = (FEdgeSharp *) 0 ;
+  Geometry::Vec3r *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSharp_SetNormalA",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeSharp, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSharp_SetNormalA" "', argument " "1"" of type '" "FEdgeSharp *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeSharp * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSharp_SetNormalA" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdgeSharp_SetNormalA" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+  }
+  arg2 = reinterpret_cast< Geometry::Vec3r * >(argp2);
+  {
+    try {
+      (arg1)->SetNormalA((Geometry::Vec3r const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSharp_SetNormalB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeSharp *arg1 = (FEdgeSharp *) 0 ;
+  Geometry::Vec3r *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSharp_SetNormalB",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeSharp, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSharp_SetNormalB" "', argument " "1"" of type '" "FEdgeSharp *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeSharp * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSharp_SetNormalB" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdgeSharp_SetNormalB" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+  }
+  arg2 = reinterpret_cast< Geometry::Vec3r * >(argp2);
+  {
+    try {
+      (arg1)->SetNormalB((Geometry::Vec3r const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSharp_SetaMaterialIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeSharp *arg1 = (FEdgeSharp *) 0 ;
+  unsigned int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSharp_SetaMaterialIndex",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeSharp, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSharp_SetaMaterialIndex" "', argument " "1"" of type '" "FEdgeSharp *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeSharp * >(argp1);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgeSharp_SetaMaterialIndex" "', argument " "2"" of type '" "unsigned int""'");
+  } 
+  arg2 = static_cast< unsigned int >(val2);
+  {
+    try {
+      (arg1)->SetaMaterialIndex(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSharp_SetbMaterialIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeSharp *arg1 = (FEdgeSharp *) 0 ;
+  unsigned int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSharp_SetbMaterialIndex",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeSharp, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSharp_SetbMaterialIndex" "', argument " "1"" of type '" "FEdgeSharp *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeSharp * >(argp1);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgeSharp_SetbMaterialIndex" "', argument " "2"" of type '" "unsigned int""'");
+  } 
+  arg2 = static_cast< unsigned int >(val2);
+  {
+    try {
+      (arg1)->SetbMaterialIndex(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *FEdgeSharp_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_FEdgeSharp, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_FEdgeSmooth__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeSmooth *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_FEdgeSmooth")) SWIG_fail;
+  {
+    try {
+      result = (FEdgeSmooth *)new FEdgeSmooth();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FEdgeSmooth, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FEdgeSmooth__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  SVertex *arg2 = (SVertex *) 0 ;
+  FEdgeSmooth *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_FEdgeSmooth",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_FEdgeSmooth" "', argument " "1"" of type '" "SVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_FEdgeSmooth" "', argument " "2"" of type '" "SVertex *""'"); 
+  }
+  arg2 = reinterpret_cast< SVertex * >(argp2);
+  {
+    try {
+      result = (FEdgeSmooth *)new FEdgeSmooth(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FEdgeSmooth, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FEdgeSmooth__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeSmooth *arg1 = 0 ;
+  FEdgeSmooth *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_FEdgeSmooth",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_FEdgeSmooth,  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_FEdgeSmooth" "', argument " "1"" of type '" "FEdgeSmooth &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_FEdgeSmooth" "', argument " "1"" of type '" "FEdgeSmooth &""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeSmooth * >(argp1);
+  {
+    try {
+      result = (FEdgeSmooth *)new FEdgeSmooth(*arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FEdgeSmooth, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FEdgeSmooth(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_FEdgeSmooth__SWIG_0(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_FEdgeSmooth, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_new_FEdgeSmooth__SWIG_2(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_SVertex, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_SVertex, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_new_FEdgeSmooth__SWIG_1(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_FEdgeSmooth'.\n  Possible C/C++ prototypes are:\n    FEdgeSmooth()\n    FEdgeSmooth(SVertex *,SVertex *)\n    FEdgeSmooth(FEdgeSmooth &)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_FEdgeSmooth(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeSmooth *arg1 = (FEdgeSmooth *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_FEdgeSmooth",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeSmooth, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FEdgeSmooth" "', argument " "1"" of type '" "FEdgeSmooth *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeSmooth * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSmooth_dupplicate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeSmooth *arg1 = (FEdgeSmooth *) 0 ;
+  FEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSmooth_dupplicate",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeSmooth, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSmooth_dupplicate" "', argument " "1"" of type '" "FEdgeSmooth *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeSmooth * >(argp1);
+  {
+    try {
+      result = (FEdge *)(arg1)->dupplicate();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FEdge, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSmooth_face(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeSmooth *arg1 = (FEdgeSmooth *) 0 ;
+  void *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSmooth_face",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeSmooth, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSmooth_face" "', argument " "1"" of type '" "FEdgeSmooth const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeSmooth * >(argp1);
+  {
+    try {
+      result = (void *)((FEdgeSmooth const *)arg1)->face();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSmooth_normal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeSmooth *arg1 = (FEdgeSmooth *) 0 ;
+  Geometry::Vec3r *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSmooth_normal",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeSmooth, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSmooth_normal" "', argument " "1"" of type '" "FEdgeSmooth *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeSmooth * >(argp1);
+  {
+    try {
+      {
+        Geometry::Vec3r const &_result_ref = (arg1)->normal();
+        result = (Geometry::Vec3r *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSmooth_materialIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeSmooth *arg1 = (FEdgeSmooth *) 0 ;
+  unsigned int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSmooth_materialIndex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeSmooth, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSmooth_materialIndex" "', argument " "1"" of type '" "FEdgeSmooth const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeSmooth * >(argp1);
+  {
+    try {
+      result = (unsigned int)((FEdgeSmooth const *)arg1)->materialIndex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSmooth_material(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeSmooth *arg1 = (FEdgeSmooth *) 0 ;
+  Material *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSmooth_material",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeSmooth, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSmooth_material" "', argument " "1"" of type '" "FEdgeSmooth const *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeSmooth * >(argp1);
+  {
+    try {
+      {
+        Material const &_result_ref = ((FEdgeSmooth const *)arg1)->material();
+        result = (Material *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Material, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSmooth_SetFace(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeSmooth *arg1 = (FEdgeSmooth *) 0 ;
+  void *arg2 = (void *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSmooth_SetFace",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeSmooth, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSmooth_SetFace" "', argument " "1"" of type '" "FEdgeSmooth *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeSmooth * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2), 0, 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSmooth_SetFace" "', argument " "2"" of type '" "void *""'"); 
+  }
+  {
+    try {
+      (arg1)->SetFace(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSmooth_SetNormal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeSmooth *arg1 = (FEdgeSmooth *) 0 ;
+  Geometry::Vec3r *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSmooth_SetNormal",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeSmooth, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSmooth_SetNormal" "', argument " "1"" of type '" "FEdgeSmooth *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeSmooth * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSmooth_SetNormal" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdgeSmooth_SetNormal" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+  }
+  arg2 = reinterpret_cast< Geometry::Vec3r * >(argp2);
+  {
+    try {
+      (arg1)->SetNormal((Geometry::Vec3r const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSmooth_SetMaterialIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdgeSmooth *arg1 = (FEdgeSmooth *) 0 ;
+  unsigned int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSmooth_SetMaterialIndex",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeSmooth, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSmooth_SetMaterialIndex" "', argument " "1"" of type '" "FEdgeSmooth *""'"); 
+  }
+  arg1 = reinterpret_cast< FEdgeSmooth * >(argp1);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgeSmooth_SetMaterialIndex" "', argument " "2"" of type '" "unsigned int""'");
+  } 
+  arg2 = static_cast< unsigned int >(val2);
+  {
+    try {
+      (arg1)->SetMaterialIndex(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *FEdgeSmooth_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_FEdgeSmooth, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_SShape_userdata_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SShape *arg1 = (SShape *) 0 ;
+  void *arg2 = (void *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:SShape_userdata_set",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SShape, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_userdata_set" "', argument " "1"" of type '" "SShape *""'"); 
+  }
+  arg1 = reinterpret_cast< SShape * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2), 0, SWIG_POINTER_DISOWN);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SShape_userdata_set" "', argument " "2"" of type '" "void *""'"); 
+  }
+  if (arg1) (arg1)->userdata = arg2;
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_userdata_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SShape *arg1 = (SShape *) 0 ;
+  void *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SShape_userdata_get",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SShape, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_userdata_get" "', argument " "1"" of type '" "SShape *""'"); 
+  }
+  arg1 = reinterpret_cast< SShape * >(argp1);
+  result = (void *) ((arg1)->userdata);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_SShape__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SShape *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_SShape")) SWIG_fail;
+  {
+    try {
+      result = (SShape *)new SShape();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SShape, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_SShape__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SShape *arg1 = 0 ;
+  SShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_SShape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_SShape,  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_SShape" "', argument " "1"" of type '" "SShape &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_SShape" "', argument " "1"" of type '" "SShape &""'"); 
+  }
+  arg1 = reinterpret_cast< SShape * >(argp1);
+  {
+    try {
+      result = (SShape *)new SShape(*arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SShape, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_SShape(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_SShape__SWIG_0(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_SShape, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_new_SShape__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_SShape'.\n  Possible C/C++ prototypes are:\n    SShape()\n    SShape(SShape &)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_dupplicate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SShape *arg1 = (SShape *) 0 ;
+  SShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SShape_dupplicate",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SShape, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_dupplicate" "', argument " "1"" of type '" "SShape *""'"); 
+  }
+  arg1 = reinterpret_cast< SShape * >(argp1);
+  {
+    try {
+      result = (SShape *)(arg1)->dupplicate();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SShape, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_SShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SShape *arg1 = (SShape *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_SShape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SShape, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_SShape" "', argument " "1"" of type '" "SShape *""'"); 
+  }
+  arg1 = reinterpret_cast< SShape * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_AddEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SShape *arg1 = (SShape *) 0 ;
+  FEdge *arg2 = (FEdge *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:SShape_AddEdge",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SShape, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_AddEdge" "', argument " "1"" of type '" "SShape *""'"); 
+  }
+  arg1 = reinterpret_cast< SShape * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SShape_AddEdge" "', argument " "2"" of type '" "FEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< FEdge * >(argp2);
+  {
+    try {
+      (arg1)->AddEdge(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_AddNewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SShape *arg1 = (SShape *) 0 ;
+  SVertex *arg2 = (SVertex *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:SShape_AddNewVertex",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SShape, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_AddNewVertex" "', argument " "1"" of type '" "SShape *""'"); 
+  }
+  arg1 = reinterpret_cast< SShape * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SShape_AddNewVertex" "', argument " "2"" of type '" "SVertex *""'"); 
+  }
+  arg2 = reinterpret_cast< SVertex * >(argp2);
+  {
+    try {
+      (arg1)->AddNewVertex(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_AddChain(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SShape *arg1 = (SShape *) 0 ;
+  FEdge *arg2 = (FEdge *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:SShape_AddChain",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SShape, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_AddChain" "', argument " "1"" of type '" "SShape *""'"); 
+  }
+  arg1 = reinterpret_cast< SShape * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SShape_AddChain" "', argument " "2"" of type '" "FEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< FEdge * >(argp2);
+  {
+    try {
+      (arg1)->AddChain(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_CreateSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SShape *arg1 = (SShape *) 0 ;
+  Geometry::Vec3r *arg2 = 0 ;
+  Geometry::Vec3r *arg3 = 0 ;
+  Id *arg4 = 0 ;
+  SVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOO:SShape_CreateSVertex",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SShape, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_CreateSVertex" "', argument " "1"" of type '" "SShape *""'"); 
+  }
+  arg1 = reinterpret_cast< SShape * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SShape_CreateSVertex" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SShape_CreateSVertex" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+  }
+  arg2 = reinterpret_cast< Geometry::Vec3r * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SShape_CreateSVertex" "', argument " "3"" of type '" "Geometry::Vec3r const &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SShape_CreateSVertex" "', argument " "3"" of type '" "Geometry::Vec3r const &""'"); 
+  }
+  arg3 = reinterpret_cast< Geometry::Vec3r * >(argp3);
+  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_Id,  0  | 0);
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "SShape_CreateSVertex" "', argument " "4"" of type '" "Id const &""'"); 
+  }
+  if (!argp4) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SShape_CreateSVertex" "', argument " "4"" of type '" "Id const &""'"); 
+  }
+  arg4 = reinterpret_cast< Id * >(argp4);
+  {
+    try {
+      result = (SVertex *)(arg1)->CreateSVertex((Geometry::Vec3r const &)*arg2,(Geometry::Vec3r const &)*arg3,(Id const &)*arg4);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_SplitEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SShape *arg1 = (SShape *) 0 ;
+  FEdge *arg2 = (FEdge *) 0 ;
+  std::vector<Geometry::Vec2r > *arg3 = 0 ;
+  std::vector<FEdge * > *arg4 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOO:SShape_SplitEdge",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SShape, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_SplitEdge" "', argument " "1"" of type '" "SShape *""'"); 
+  }
+  arg1 = reinterpret_cast< SShape * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SShape_SplitEdge" "', argument " "2"" of type '" "FEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< FEdge * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_std__vectorTVecMat__Vec2Tdouble_t_std__allocatorTVecMat__Vec2Tdouble_t_t_t,  0  | 0);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SShape_SplitEdge" "', argument " "3"" of type '" "std::vector<Geometry::Vec2r > const &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SShape_SplitEdge" "', argument " "3"" of type '" "std::vector<Geometry::Vec2r > const &""'"); 
+  }
+  arg3 = reinterpret_cast< std::vector<Geometry::Vec2r > * >(argp3);
+  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t,  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "SShape_SplitEdge" "', argument " "4"" of type '" "std::vector<FEdge * > &""'"); 
+  }
+  if (!argp4) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SShape_SplitEdge" "', argument " "4"" of type '" "std::vector<FEdge * > &""'"); 
+  }
+  arg4 = reinterpret_cast< std::vector<FEdge * > * >(argp4);
+  {
+    try {
+      (arg1)->SplitEdge(arg2,(std::vector<Geometry::Vec2r > const &)*arg3,*arg4);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_SplitEdgeIn2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SShape *arg1 = (SShape *) 0 ;
+  FEdge *arg2 = (FEdge *) 0 ;
+  SVertex *arg3 = (SVertex *) 0 ;
+  FEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:SShape_SplitEdgeIn2",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SShape, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_SplitEdgeIn2" "', argument " "1"" of type '" "SShape *""'"); 
+  }
+  arg1 = reinterpret_cast< SShape * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SShape_SplitEdgeIn2" "', argument " "2"" of type '" "FEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< FEdge * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SShape_SplitEdgeIn2" "', argument " "3"" of type '" "SVertex *""'"); 
+  }
+  arg3 = reinterpret_cast< SVertex * >(argp3);
+  {
+    try {
+      result = (FEdge *)(arg1)->SplitEdgeIn2(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FEdge, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_SetBBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SShape *arg1 = (SShape *) 0 ;
+  BBox<Geometry::Vec3r > *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:SShape_SetBBox",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SShape, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_SetBBox" "', argument " "1"" of type '" "SShape *""'"); 
+  }
+  arg1 = reinterpret_cast< SShape * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BBoxTVecMat__Vec3Tdouble_t_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SShape_SetBBox" "', argument " "2"" of type '" "BBox<Geometry::Vec3r > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SShape_SetBBox" "', argument " "2"" of type '" "BBox<Geometry::Vec3r > const &""'"); 
+  }
+  arg2 = reinterpret_cast< BBox<Geometry::Vec3r > * >(argp2);
+  {
+    try {
+      (arg1)->SetBBox((BBox<Geometry::Vec3r > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_ComputeBBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SShape *arg1 = (SShape *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SShape_ComputeBBox",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SShape, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_ComputeBBox" "', argument " "1"" of type '" "SShape *""'"); 
+  }
+  arg1 = reinterpret_cast< SShape * >(argp1);
+  {
+    try {
+      (arg1)->ComputeBBox();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_RemoveEdgeFromChain(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SShape *arg1 = (SShape *) 0 ;
+  FEdge *arg2 = (FEdge *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:SShape_RemoveEdgeFromChain",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SShape, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_RemoveEdgeFromChain" "', argument " "1"" of type '" "SShape *""'"); 
+  }
+  arg1 = reinterpret_cast< SShape * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SShape_RemoveEdgeFromChain" "', argument " "2"" of type '" "FEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< FEdge * >(argp2);
+  {
+    try {
+      (arg1)->RemoveEdgeFromChain(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_RemoveEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SShape *arg1 = (SShape *) 0 ;
+  FEdge *arg2 = (FEdge *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:SShape_RemoveEdge",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SShape, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_RemoveEdge" "', argument " "1"" of type '" "SShape *""'"); 
+  }
+  arg1 = reinterpret_cast< SShape * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SShape_RemoveEdge" "', argument " "2"" of type '" "FEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< FEdge * >(argp2);
+  {
+    try {
+      (arg1)->RemoveEdge(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_GetVertexList(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SShape *arg1 = (SShape *) 0 ;
+  std::vector<SVertex * > *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SShape_GetVertexList",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SShape, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_GetVertexList" "', argument " "1"" of type '" "SShape *""'"); 
+  }
+  arg1 = reinterpret_cast< SShape * >(argp1);
+  {
+    try {
+      {
+        std::vector<SVertex * > &_result_ref = (arg1)->GetVertexList();
+        result = (std::vector<SVertex * > *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_GetEdgeList(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SShape *arg1 = (SShape *) 0 ;
+  std::vector<FEdge * > *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SShape_GetEdgeList",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SShape, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_GetEdgeList" "', argument " "1"" of type '" "SShape *""'"); 
+  }
+  arg1 = reinterpret_cast< SShape * >(argp1);
+  {
+    try {
+      {
+        std::vector<FEdge * > &_result_ref = (arg1)->GetEdgeList();
+        result = (std::vector<FEdge * > *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_GetChains(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SShape *arg1 = (SShape *) 0 ;
+  std::vector<FEdge * > *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SShape_GetChains",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SShape, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_GetChains" "', argument " "1"" of type '" "SShape *""'"); 
+  }
+  arg1 = reinterpret_cast< SShape * >(argp1);
+  {
+    try {
+      {
+        std::vector<FEdge * > &_result_ref = (arg1)->GetChains();
+        result = (std::vector<FEdge * > *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_bbox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SShape *arg1 = (SShape *) 0 ;
+  BBox<Geometry::Vec3r > *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SShape_bbox",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SShape, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_bbox" "', argument " "1"" of type '" "SShape *""'"); 
+  }
+  arg1 = reinterpret_cast< SShape * >(argp1);
+  {
+    try {
+      {
+        BBox<Geometry::Vec3r > const &_result_ref = (arg1)->bbox();
+        result = (BBox<Geometry::Vec3r > *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_BBoxTVecMat__Vec3Tdouble_t_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_material(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SShape *arg1 = (SShape *) 0 ;
+  unsigned int arg2 ;
+  Material *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:SShape_material",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SShape, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_material" "', argument " "1"" of type '" "SShape const *""'"); 
+  }
+  arg1 = reinterpret_cast< SShape * >(argp1);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SShape_material" "', argument " "2"" of type '" "unsigned int""'");
+  } 
+  arg2 = static_cast< unsigned int >(val2);
+  {
+    try {
+      {
+        Material const &_result_ref = ((SShape const *)arg1)->material(arg2);
+        result = (Material *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Material, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_materials(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SShape *arg1 = (SShape *) 0 ;
+  std::vector<Material > *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SShape_materials",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SShape, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_materials" "', argument " "1"" of type '" "SShape const *""'"); 
+  }
+  arg1 = reinterpret_cast< SShape * >(argp1);
+  {
+    try {
+      {
+        std::vector<Material > const &_result_ref = ((SShape const *)arg1)->materials();
+        result = (std::vector<Material > *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTMaterial_std__allocatorTMaterial_t_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_viewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SShape *arg1 = (SShape *) 0 ;
+  ViewShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SShape_viewShape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SShape, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_viewShape" "', argument " "1"" of type '" "SShape *""'"); 
+  }
+  arg1 = reinterpret_cast< SShape * >(argp1);
+  {
+    try {
+      result = (ViewShape *)(arg1)->viewShape();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewShape, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_importance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SShape *arg1 = (SShape *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SShape_importance",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SShape, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_importance" "', argument " "1"" of type '" "SShape const *""'"); 
+  }
+  arg1 = reinterpret_cast< SShape * >(argp1);
+  {
+    try {
+      result = (float)((SShape const *)arg1)->importance();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SShape *arg1 = (SShape *) 0 ;
+  Id result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SShape_getId",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SShape, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_getId" "', argument " "1"" of type '" "SShape const *""'"); 
+  }
+  arg1 = reinterpret_cast< SShape * >(argp1);
+  {
+    try {
+      result = ((SShape const *)arg1)->getId();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Id(static_cast< const Id& >(result))), SWIGTYPE_p_Id, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_SetId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SShape *arg1 = (SShape *) 0 ;
+  Id arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:SShape_SetId",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SShape, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_SetId" "', argument " "1"" of type '" "SShape *""'"); 
+  }
+  arg1 = reinterpret_cast< SShape * >(argp1);
+  {
+    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Id,  0  | 0);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SShape_SetId" "', argument " "2"" of type '" "Id""'"); 
+    }  
+    if (!argp2) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SShape_SetId" "', argument " "2"" of type '" "Id""'");
+    } else {
+      Id * temp = reinterpret_cast< Id * >(argp2);
+      arg2 = *temp;
+      if (SWIG_IsNewObj(res2)) delete temp;
+    }
+  }
+  {
+    try {
+      (arg1)->SetId(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_SetMaterials(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SShape *arg1 = (SShape *) 0 ;
+  std::vector<Material > *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:SShape_SetMaterials",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SShape, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_SetMaterials" "', argument " "1"" of type '" "SShape *""'"); 
+  }
+  arg1 = reinterpret_cast< SShape * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTMaterial_std__allocatorTMaterial_t_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SShape_SetMaterials" "', argument " "2"" of type '" "std::vector<Material > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SShape_SetMaterials" "', argument " "2"" of type '" "std::vector<Material > const &""'"); 
+  }
+  arg2 = reinterpret_cast< std::vector<Material > * >(argp2);
+  {
+    try {
+      (arg1)->SetMaterials((std::vector<Material > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_SetViewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SShape *arg1 = (SShape *) 0 ;
+  ViewShape *arg2 = (ViewShape *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:SShape_SetViewShape",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SShape, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_SetViewShape" "', argument " "1"" of type '" "SShape *""'"); 
+  }
+  arg1 = reinterpret_cast< SShape * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewShape, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SShape_SetViewShape" "', argument " "2"" of type '" "ViewShape *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewShape * >(argp2);
+  {
+    try {
+      (arg1)->SetViewShape(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_SetImportance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SShape *arg1 = (SShape *) 0 ;
+  float arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:SShape_SetImportance",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SShape, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_SetImportance" "', argument " "1"" of type '" "SShape *""'"); 
+  }
+  arg1 = reinterpret_cast< SShape * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SShape_SetImportance" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  {
+    try {
+      (arg1)->SetImportance(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *SShape_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_SShape, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  PyObject **arg2 = (PyObject **) 0 ;
+  swig::PySwigIterator *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  arg2 = &obj0;
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_iterator",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_iterator" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  {
+    try {
+      result = (swig::PySwigIterator *)std_vector_Sl_ViewShape_Sm__Sg__iterator(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__PySwigIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer___nonzero__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer___nonzero__",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___nonzero__" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  {
+    try {
+      result = (bool)std_vector_Sl_ViewShape_Sm__Sg____nonzero__((std::vector<ViewShape * > const *)arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer___len__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::size_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer___len__",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___len__" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  {
+    try {
+      result = std_vector_Sl_ViewShape_Sm__Sg____len__((std::vector<ViewShape * > const *)arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_size_t(static_cast< size_t >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_pop",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_pop" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  {
+    try {
+      try {
+        result = (std::vector<ViewShape * >::value_type)std_vector_Sl_ViewShape_Sm__Sg__pop(arg1);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::difference_type arg2 ;
+  std::vector<ViewShape * >::difference_type arg3 ;
+  std::vector<ViewShape *,std::allocator<ViewShape * > > *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  ptrdiff_t val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:ViewShapesContainer___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___getslice__" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer___getslice__" "', argument " "2"" of type '" "std::vector<ViewShape * >::difference_type""'");
+  } 
+  arg2 = static_cast< std::vector<ViewShape * >::difference_type >(val2);
+  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewShapesContainer___getslice__" "', argument " "3"" of type '" "std::vector<ViewShape * >::difference_type""'");
+  } 
+  arg3 = static_cast< std::vector<ViewShape * >::difference_type >(val3);
+  {
+    try {
+      try {
+        result = (std::vector<ViewShape *,std::allocator<ViewShape * > > *)std_vector_Sl_ViewShape_Sm__Sg____getslice__(arg1,arg2,arg3);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer___setslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::difference_type arg2 ;
+  std::vector<ViewShape * >::difference_type arg3 ;
+  std::vector<ViewShape *,std::allocator<ViewShape * > > *arg4 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  ptrdiff_t val3 ;
+  int ecode3 = 0 ;
+  int res4 = SWIG_OLDOBJ ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOO:ViewShapesContainer___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___setslice__" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer___setslice__" "', argument " "2"" of type '" "std::vector<ViewShape * >::difference_type""'");
+  } 
+  arg2 = static_cast< std::vector<ViewShape * >::difference_type >(val2);
+  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewShapesContainer___setslice__" "', argument " "3"" of type '" "std::vector<ViewShape * >::difference_type""'");
+  } 
+  arg3 = static_cast< std::vector<ViewShape * >::difference_type >(val3);
+  {
+    std::vector<ViewShape*,std::allocator<ViewShape * > > *ptr = (std::vector<ViewShape*,std::allocator<ViewShape * > > *)0;
+    res4 = swig::asptr(obj3, &ptr);
+    if (!SWIG_IsOK(res4)) {
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewShapesContainer___setslice__" "', argument " "4"" of type '" "std::vector<ViewShape *,std::allocator<ViewShape * > > const &""'"); 
+    }
+    if (!ptr) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShapesContainer___setslice__" "', argument " "4"" of type '" "std::vector<ViewShape *,std::allocator<ViewShape * > > const &""'"); 
+    }
+    arg4 = ptr;
+  }
+  {
+    try {
+      try {
+        std_vector_Sl_ViewShape_Sm__Sg____setslice__(arg1,arg2,arg3,(std::vector<ViewShape *,std::allocator<ViewShape * > > const &)*arg4);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+      }
+      catch(std::invalid_argument &_e) {
+        SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  if (SWIG_IsNewObj(res4)) delete arg4;
+  return resultobj;
+fail:
+  if (SWIG_IsNewObj(res4)) delete arg4;
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer___delslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::difference_type arg2 ;
+  std::vector<ViewShape * >::difference_type arg3 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  ptrdiff_t val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:ViewShapesContainer___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___delslice__" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer___delslice__" "', argument " "2"" of type '" "std::vector<ViewShape * >::difference_type""'");
+  } 
+  arg2 = static_cast< std::vector<ViewShape * >::difference_type >(val2);
+  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewShapesContainer___delslice__" "', argument " "3"" of type '" "std::vector<ViewShape * >::difference_type""'");
+  } 
+  arg3 = static_cast< std::vector<ViewShape * >::difference_type >(val3);
+  {
+    try {
+      try {
+        std_vector_Sl_ViewShape_Sm__Sg____delslice__(arg1,arg2,arg3);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer___delitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::difference_type arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewShapesContainer___delitem__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___delitem__" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer___delitem__" "', argument " "2"" of type '" "std::vector<ViewShape * >::difference_type""'");
+  } 
+  arg2 = static_cast< std::vector<ViewShape * >::difference_type >(val2);
+  {
+    try {
+      try {
+        std_vector_Sl_ViewShape_Sm__Sg____delitem__(arg1,arg2);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer___getitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::difference_type arg2 ;
+  std::vector<ViewShape * >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewShapesContainer___getitem__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___getitem__" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer___getitem__" "', argument " "2"" of type '" "std::vector<ViewShape * >::difference_type""'");
+  } 
+  arg2 = static_cast< std::vector<ViewShape * >::difference_type >(val2);
+  {
+    try {
+      try {
+        result = (std::vector<ViewShape * >::value_type)std_vector_Sl_ViewShape_Sm__Sg____getitem__(arg1,arg2);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer___setitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::difference_type arg2 ;
+  std::vector<ViewShape * >::value_type arg3 = (std::vector<ViewShape * >::value_type) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:ViewShapesContainer___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___setitem__" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer___setitem__" "', argument " "2"" of type '" "std::vector<ViewShape * >::difference_type""'");
+  } 
+  arg2 = static_cast< std::vector<ViewShape * >::difference_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewShapesContainer___setitem__" "', argument " "3"" of type '" "std::vector<ViewShape * >::value_type""'"); 
+  }
+  arg3 = reinterpret_cast< std::vector<ViewShape * >::value_type >(argp3);
+  {
+    try {
+      try {
+        std_vector_Sl_ViewShape_Sm__Sg____setitem__(arg1,arg2,arg3);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::value_type arg2 = (std::vector<ViewShape * >::value_type) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewShapesContainer_append",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_append" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShapesContainer_append" "', argument " "2"" of type '" "std::vector<ViewShape * >::value_type""'"); 
+  }
+  arg2 = reinterpret_cast< std::vector<ViewShape * >::value_type >(argp2);
+  {
+    try {
+      std_vector_Sl_ViewShape_Sm__Sg__append(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewShapesContainer__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewShape * > *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_ViewShapesContainer")) SWIG_fail;
+  {
+    try {
+      result = (std::vector<ViewShape * > *)new std::vector<ViewShape * >();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewShapesContainer__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewShape * > *arg1 = 0 ;
+  std::vector<ViewShape * > *result = 0 ;
+  int res1 = SWIG_OLDOBJ ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_ViewShapesContainer",&obj0)) SWIG_fail;
+  {
+    std::vector<ViewShape*,std::allocator<ViewShape * > > *ptr = (std::vector<ViewShape*,std::allocator<ViewShape * > > *)0;
+    res1 = swig::asptr(obj0, &ptr);
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ViewShapesContainer" "', argument " "1"" of type '" "std::vector<ViewShape * > const &""'"); 
+    }
+    if (!ptr) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ViewShapesContainer" "', argument " "1"" of type '" "std::vector<ViewShape * > const &""'"); 
+    }
+    arg1 = ptr;
+  }
+  {
+    try {
+      result = (std::vector<ViewShape * > *)new std::vector<ViewShape * >((std::vector<ViewShape * > const &)*arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, SWIG_POINTER_NEW |  0 );
+  if (SWIG_IsNewObj(res1)) delete arg1;
+  return resultobj;
+fail:
+  if (SWIG_IsNewObj(res1)) delete arg1;
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_empty",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_empty" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  {
+    try {
+      result = (bool)((std::vector<ViewShape * > const *)arg1)->empty();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::size_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_size",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_size" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<ViewShape * > const *)arg1)->size();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_size_t(static_cast< size_t >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_clear",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_clear" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  {
+    try {
+      (arg1)->clear();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * > *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewShapesContainer_swap",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_swap" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShapesContainer_swap" "', argument " "2"" of type '" "std::vector<ViewShape * > &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShapesContainer_swap" "', argument " "2"" of type '" "std::vector<ViewShape * > &""'"); 
+  }
+  arg2 = reinterpret_cast< std::vector<ViewShape * > * >(argp2);
+  {
+    try {
+      (arg1)->swap(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  SwigValueWrapper<std::allocator<ViewShape * > > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_get_allocator",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_get_allocator" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<ViewShape * > const *)arg1)->get_allocator();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new std::vector<ViewShape * >::allocator_type(static_cast< const std::vector<ViewShape * >::allocator_type& >(result))), SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_begin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_begin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_begin" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  {
+    try {
+      result = (arg1)->begin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewShape * >::iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_begin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_begin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_begin" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<ViewShape * > const *)arg1)->begin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewShape * >::const_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_begin(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewShapesContainer_begin__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewShapesContainer_begin__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewShapesContainer_begin'.\n  Possible C/C++ prototypes are:\n    begin()\n    begin()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_end",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_end" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  {
+    try {
+      result = (arg1)->end();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewShape * >::iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_end",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_end" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<ViewShape * > const *)arg1)->end();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewShape * >::const_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_end(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewShapesContainer_end__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewShapesContainer_end__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewShapesContainer_end'.\n  Possible C/C++ prototypes are:\n    end()\n    end()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_rbegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::reverse_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_rbegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_rbegin" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  {
+    try {
+      result = (arg1)->rbegin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewShape * >::reverse_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_rbegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::const_reverse_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_rbegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_rbegin" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<ViewShape * > const *)arg1)->rbegin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewShape * >::const_reverse_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_rbegin(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewShapesContainer_rbegin__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewShapesContainer_rbegin__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewShapesContainer_rbegin'.\n  Possible C/C++ prototypes are:\n    rbegin()\n    rbegin()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_rend__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::reverse_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_rend",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_rend" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  {
+    try {
+      result = (arg1)->rend();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewShape * >::reverse_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_rend__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::const_reverse_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_rend",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_rend" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<ViewShape * > const *)arg1)->rend();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewShape * >::const_reverse_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_rend(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewShapesContainer_rend__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewShapesContainer_rend__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewShapesContainer_rend'.\n  Possible C/C++ prototypes are:\n    rend()\n    rend()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewShapesContainer__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewShape * >::size_type arg1 ;
+  std::vector<ViewShape * > *result = 0 ;
+  size_t val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_ViewShapesContainer",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ViewShapesContainer" "', argument " "1"" of type '" "std::vector<ViewShape * >::size_type""'");
+  } 
+  arg1 = static_cast< std::vector<ViewShape * >::size_type >(val1);
+  {
+    try {
+      result = (std::vector<ViewShape * > *)new std::vector<ViewShape * >(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_pop_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_pop_back",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_pop_back" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  {
+    try {
+      (arg1)->pop_back();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::size_type arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  size_t val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewShapesContainer_resize",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_resize" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer_resize" "', argument " "2"" of type '" "std::vector<ViewShape * >::size_type""'");
+  } 
+  arg2 = static_cast< std::vector<ViewShape * >::size_type >(val2);
+  {
+    try {
+      (arg1)->resize(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::iterator arg2 ;
+  std::vector<ViewShape * >::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  swig::PySwigIterator *iter2 = 0 ;
+  int res2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewShapesContainer_erase",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_erase" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
+  if (!SWIG_IsOK(res2) || !iter2) {
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewShape * >::iterator""'");
+  } else {
+    swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *>(iter2);
+    if (iter_t) {
+      arg2 = iter_t->get_current();
+    } else {
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewShape * >::iterator""'");
+    }
+  }
+  {
+    try {
+      result = (arg1)->erase(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewShape * >::iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::iterator arg2 ;
+  std::vector<ViewShape * >::iterator arg3 ;
+  std::vector<ViewShape * >::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  swig::PySwigIterator *iter2 = 0 ;
+  int res2 ;
+  swig::PySwigIterator *iter3 = 0 ;
+  int res3 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:ViewShapesContainer_erase",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_erase" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
+  if (!SWIG_IsOK(res2) || !iter2) {
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewShape * >::iterator""'");
+  } else {
+    swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *>(iter2);
+    if (iter_t) {
+      arg2 = iter_t->get_current();
+    } else {
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewShape * >::iterator""'");
+    }
+  }
+  res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::PySwigIterator::descriptor(), 0);
+  if (!SWIG_IsOK(res3) || !iter3) {
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_erase" "', argument " "3"" of type '" "std::vector<ViewShape * >::iterator""'");
+  } else {
+    swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *>(iter3);
+    if (iter_t) {
+      arg3 = iter_t->get_current();
+    } else {
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_erase" "', argument " "3"" of type '" "std::vector<ViewShape * >::iterator""'");
+    }
+  }
+  {
+    try {
+      result = (arg1)->erase(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewShape * >::iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_erase(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      swig::PySwigIterator *iter = 0;
+      int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *>(iter) != 0));
+      if (_v) {
+        return _wrap_ViewShapesContainer_erase__SWIG_0(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      swig::PySwigIterator *iter = 0;
+      int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *>(iter) != 0));
+      if (_v) {
+        swig::PySwigIterator *iter = 0;
+        int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
+        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *>(iter) != 0));
+        if (_v) {
+          return _wrap_ViewShapesContainer_erase__SWIG_1(self, args);
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewShapesContainer_erase'.\n  Possible C/C++ prototypes are:\n    erase(std::vector<ViewShape * >::iterator)\n    erase(std::vector<ViewShape * >::iterator,std::vector<ViewShape * >::iterator)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewShapesContainer__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewShape * >::size_type arg1 ;
+  std::vector<ViewShape * >::value_type arg2 = (std::vector<ViewShape * >::value_type) 0 ;
+  std::vector<ViewShape * > *result = 0 ;
+  size_t val1 ;
+  int ecode1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_ViewShapesContainer",&obj0,&obj1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ViewShapesContainer" "', argument " "1"" of type '" "std::vector<ViewShape * >::size_type""'");
+  } 
+  arg1 = static_cast< std::vector<ViewShape * >::size_type >(val1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ViewShapesContainer" "', argument " "2"" of type '" "std::vector<ViewShape * >::value_type""'"); 
+  }
+  arg2 = reinterpret_cast< std::vector<ViewShape * >::value_type >(argp2);
+  {
+    try {
+      result = (std::vector<ViewShape * > *)new std::vector<ViewShape * >(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewShapesContainer(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_ViewShapesContainer__SWIG_0(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_size_t(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_ViewShapesContainer__SWIG_2(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_new_ViewShapesContainer__SWIG_1(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    {
+      int res = SWIG_AsVal_size_t(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_new_ViewShapesContainer__SWIG_3(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewShapesContainer'.\n  Possible C/C++ prototypes are:\n    std::vector<(p.ViewShape)>()\n    std::vector<(p.ViewShape)>(std::vector<ViewShape * > const &)\n    std::vector<(p.ViewShape)>(std::vector<ViewShape * >::size_type)\n    std::vector<(p.ViewShape)>(std::vector<ViewShape * >::size_type,std::vector<ViewShape * >::value_type)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_push_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::value_type arg2 = (std::vector<ViewShape * >::value_type) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewShapesContainer_push_back",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_push_back" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShapesContainer_push_back" "', argument " "2"" of type '" "std::vector<ViewShape * >::value_type""'"); 
+  }
+  arg2 = reinterpret_cast< std::vector<ViewShape * >::value_type >(argp2);
+  {
+    try {
+      (arg1)->push_back(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_front(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_front",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_front" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  {
+    try {
+      result = (std::vector<ViewShape * >::value_type)((std::vector<ViewShape * > const *)arg1)->front();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_back",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_back" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  {
+    try {
+      result = (std::vector<ViewShape * >::value_type)((std::vector<ViewShape * > const *)arg1)->back();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_assign(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::size_type arg2 ;
+  std::vector<ViewShape * >::value_type arg3 = (std::vector<ViewShape * >::value_type) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  size_t val2 ;
+  int ecode2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:ViewShapesContainer_assign",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_assign" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer_assign" "', argument " "2"" of type '" "std::vector<ViewShape * >::size_type""'");
+  } 
+  arg2 = static_cast< std::vector<ViewShape * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewShapesContainer_assign" "', argument " "3"" of type '" "std::vector<ViewShape * >::value_type""'"); 
+  }
+  arg3 = reinterpret_cast< std::vector<ViewShape * >::value_type >(argp3);
+  {
+    try {
+      (arg1)->assign(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::size_type arg2 ;
+  std::vector<ViewShape * >::value_type arg3 = (std::vector<ViewShape * >::value_type) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  size_t val2 ;
+  int ecode2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:ViewShapesContainer_resize",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_resize" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer_resize" "', argument " "2"" of type '" "std::vector<ViewShape * >::size_type""'");
+  } 
+  arg2 = static_cast< std::vector<ViewShape * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewShapesContainer_resize" "', argument " "3"" of type '" "std::vector<ViewShape * >::value_type""'"); 
+  }
+  arg3 = reinterpret_cast< std::vector<ViewShape * >::value_type >(argp3);
+  {
+    try {
+      (arg1)->resize(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_resize(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_size_t(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_ViewShapesContainer_resize__SWIG_0(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_size_t(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          return _wrap_ViewShapesContainer_resize__SWIG_1(self, args);
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewShapesContainer_resize'.\n  Possible C/C++ prototypes are:\n    resize(std::vector<ViewShape * >::size_type)\n    resize(std::vector<ViewShape * >::size_type,std::vector<ViewShape * >::value_type)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::iterator arg2 ;
+  std::vector<ViewShape * >::value_type arg3 = (std::vector<ViewShape * >::value_type) 0 ;
+  std::vector<ViewShape * >::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  swig::PySwigIterator *iter2 = 0 ;
+  int res2 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:ViewShapesContainer_insert",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_insert" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
+  if (!SWIG_IsOK(res2) || !iter2) {
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewShape * >::iterator""'");
+  } else {
+    swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *>(iter2);
+    if (iter_t) {
+      arg2 = iter_t->get_current();
+    } else {
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewShape * >::iterator""'");
+    }
+  }
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewShapesContainer_insert" "', argument " "3"" of type '" "std::vector<ViewShape * >::value_type""'"); 
+  }
+  arg3 = reinterpret_cast< std::vector<ViewShape * >::value_type >(argp3);
+  {
+    try {
+      result = (arg1)->insert(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewShape * >::iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::iterator arg2 ;
+  std::vector<ViewShape * >::size_type arg3 ;
+  std::vector<ViewShape * >::value_type arg4 = (std::vector<ViewShape * >::value_type) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  swig::PySwigIterator *iter2 = 0 ;
+  int res2 ;
+  size_t val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOO:ViewShapesContainer_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_insert" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
+  if (!SWIG_IsOK(res2) || !iter2) {
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewShape * >::iterator""'");
+  } else {
+    swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *>(iter2);
+    if (iter_t) {
+      arg2 = iter_t->get_current();
+    } else {
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewShape * >::iterator""'");
+    }
+  }
+  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewShapesContainer_insert" "', argument " "3"" of type '" "std::vector<ViewShape * >::size_type""'");
+  } 
+  arg3 = static_cast< std::vector<ViewShape * >::size_type >(val3);
+  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewShapesContainer_insert" "', argument " "4"" of type '" "std::vector<ViewShape * >::value_type""'"); 
+  }
+  arg4 = reinterpret_cast< std::vector<ViewShape * >::value_type >(argp4);
+  {
+    try {
+      (arg1)->insert(arg2,arg3,arg4);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_insert(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[5];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 4); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 3) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      swig::PySwigIterator *iter = 0;
+      int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *>(iter) != 0));
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          return _wrap_ViewShapesContainer_insert__SWIG_0(self, args);
+        }
+      }
+    }
+  }
+  if (argc == 4) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      swig::PySwigIterator *iter = 0;
+      int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *>(iter) != 0));
+      if (_v) {
+        {
+          int res = SWIG_AsVal_size_t(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            return _wrap_ViewShapesContainer_insert__SWIG_1(self, args);
+          }
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewShapesContainer_insert'.\n  Possible C/C++ prototypes are:\n    insert(std::vector<ViewShape * >::iterator,std::vector<ViewShape * >::value_type)\n    insert(std::vector<ViewShape * >::iterator,std::vector<ViewShape * >::size_type,std::vector<ViewShape * >::value_type)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_reserve(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::size_type arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  size_t val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewShapesContainer_reserve",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_reserve" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer_reserve" "', argument " "2"" of type '" "std::vector<ViewShape * >::size_type""'");
+  } 
+  arg2 = static_cast< std::vector<ViewShape * >::size_type >(val2);
+  {
+    try {
+      (arg1)->reserve(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_capacity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::size_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_capacity",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_capacity" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<ViewShape * > const *)arg1)->capacity();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_size_t(static_cast< size_t >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ViewShapesContainer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_ViewShapesContainer",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ViewShapesContainer" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *ViewShapesContainer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  PyObject **arg2 = (PyObject **) 0 ;
+  swig::PySwigIterator *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  arg2 = &obj0;
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_iterator",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_iterator" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  {
+    try {
+      result = (swig::PySwigIterator *)std_vector_Sl_ViewEdge_Sm__Sg__iterator(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__PySwigIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer___nonzero__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer___nonzero__",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___nonzero__" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  {
+    try {
+      result = (bool)std_vector_Sl_ViewEdge_Sm__Sg____nonzero__((std::vector<ViewEdge * > const *)arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer___len__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::size_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer___len__",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___len__" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  {
+    try {
+      result = std_vector_Sl_ViewEdge_Sm__Sg____len__((std::vector<ViewEdge * > const *)arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_size_t(static_cast< size_t >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_pop",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_pop" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  {
+    try {
+      try {
+        result = (std::vector<ViewEdge * >::value_type)std_vector_Sl_ViewEdge_Sm__Sg__pop(arg1);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::difference_type arg2 ;
+  std::vector<ViewEdge * >::difference_type arg3 ;
+  std::vector<ViewEdge *,std::allocator<ViewEdge * > > *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  ptrdiff_t val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:ViewEdgesContainer___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___getslice__" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer___getslice__" "', argument " "2"" of type '" "std::vector<ViewEdge * >::difference_type""'");
+  } 
+  arg2 = static_cast< std::vector<ViewEdge * >::difference_type >(val2);
+  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewEdgesContainer___getslice__" "', argument " "3"" of type '" "std::vector<ViewEdge * >::difference_type""'");
+  } 
+  arg3 = static_cast< std::vector<ViewEdge * >::difference_type >(val3);
+  {
+    try {
+      try {
+        result = (std::vector<ViewEdge *,std::allocator<ViewEdge * > > *)std_vector_Sl_ViewEdge_Sm__Sg____getslice__(arg1,arg2,arg3);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer___setslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::difference_type arg2 ;
+  std::vector<ViewEdge * >::difference_type arg3 ;
+  std::vector<ViewEdge *,std::allocator<ViewEdge * > > *arg4 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  ptrdiff_t val3 ;
+  int ecode3 = 0 ;
+  int res4 = SWIG_OLDOBJ ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOO:ViewEdgesContainer___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___setslice__" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer___setslice__" "', argument " "2"" of type '" "std::vector<ViewEdge * >::difference_type""'");
+  } 
+  arg2 = static_cast< std::vector<ViewEdge * >::difference_type >(val2);
+  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewEdgesContainer___setslice__" "', argument " "3"" of type '" "std::vector<ViewEdge * >::difference_type""'");
+  } 
+  arg3 = static_cast< std::vector<ViewEdge * >::difference_type >(val3);
+  {
+    std::vector<ViewEdge*,std::allocator<ViewEdge * > > *ptr = (std::vector<ViewEdge*,std::allocator<ViewEdge * > > *)0;
+    res4 = swig::asptr(obj3, &ptr);
+    if (!SWIG_IsOK(res4)) {
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewEdgesContainer___setslice__" "', argument " "4"" of type '" "std::vector<ViewEdge *,std::allocator<ViewEdge * > > const &""'"); 
+    }
+    if (!ptr) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgesContainer___setslice__" "', argument " "4"" of type '" "std::vector<ViewEdge *,std::allocator<ViewEdge * > > const &""'"); 
+    }
+    arg4 = ptr;
+  }
+  {
+    try {
+      try {
+        std_vector_Sl_ViewEdge_Sm__Sg____setslice__(arg1,arg2,arg3,(std::vector<ViewEdge *,std::allocator<ViewEdge * > > const &)*arg4);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+      }
+      catch(std::invalid_argument &_e) {
+        SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  if (SWIG_IsNewObj(res4)) delete arg4;
+  return resultobj;
+fail:
+  if (SWIG_IsNewObj(res4)) delete arg4;
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer___delslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::difference_type arg2 ;
+  std::vector<ViewEdge * >::difference_type arg3 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  ptrdiff_t val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:ViewEdgesContainer___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___delslice__" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer___delslice__" "', argument " "2"" of type '" "std::vector<ViewEdge * >::difference_type""'");
+  } 
+  arg2 = static_cast< std::vector<ViewEdge * >::difference_type >(val2);
+  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewEdgesContainer___delslice__" "', argument " "3"" of type '" "std::vector<ViewEdge * >::difference_type""'");
+  } 
+  arg3 = static_cast< std::vector<ViewEdge * >::difference_type >(val3);
+  {
+    try {
+      try {
+        std_vector_Sl_ViewEdge_Sm__Sg____delslice__(arg1,arg2,arg3);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer___delitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::difference_type arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgesContainer___delitem__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___delitem__" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer___delitem__" "', argument " "2"" of type '" "std::vector<ViewEdge * >::difference_type""'");
+  } 
+  arg2 = static_cast< std::vector<ViewEdge * >::difference_type >(val2);
+  {
+    try {
+      try {
+        std_vector_Sl_ViewEdge_Sm__Sg____delitem__(arg1,arg2);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer___getitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::difference_type arg2 ;
+  std::vector<ViewEdge * >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgesContainer___getitem__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___getitem__" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer___getitem__" "', argument " "2"" of type '" "std::vector<ViewEdge * >::difference_type""'");
+  } 
+  arg2 = static_cast< std::vector<ViewEdge * >::difference_type >(val2);
+  {
+    try {
+      try {
+        result = (std::vector<ViewEdge * >::value_type)std_vector_Sl_ViewEdge_Sm__Sg____getitem__(arg1,arg2);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer___setitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::difference_type arg2 ;
+  std::vector<ViewEdge * >::value_type arg3 = (std::vector<ViewEdge * >::value_type) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:ViewEdgesContainer___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___setitem__" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer___setitem__" "', argument " "2"" of type '" "std::vector<ViewEdge * >::difference_type""'");
+  } 
+  arg2 = static_cast< std::vector<ViewEdge * >::difference_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewEdgesContainer___setitem__" "', argument " "3"" of type '" "std::vector<ViewEdge * >::value_type""'"); 
+  }
+  arg3 = reinterpret_cast< std::vector<ViewEdge * >::value_type >(argp3);
+  {
+    try {
+      try {
+        std_vector_Sl_ViewEdge_Sm__Sg____setitem__(arg1,arg2,arg3);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::value_type arg2 = (std::vector<ViewEdge * >::value_type) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgesContainer_append",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_append" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgesContainer_append" "', argument " "2"" of type '" "std::vector<ViewEdge * >::value_type""'"); 
+  }
+  arg2 = reinterpret_cast< std::vector<ViewEdge * >::value_type >(argp2);
+  {
+    try {
+      std_vector_Sl_ViewEdge_Sm__Sg__append(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewEdge * > *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_ViewEdgesContainer")) SWIG_fail;
+  {
+    try {
+      result = (std::vector<ViewEdge * > *)new std::vector<ViewEdge * >();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewEdge * > *arg1 = 0 ;
+  std::vector<ViewEdge * > *result = 0 ;
+  int res1 = SWIG_OLDOBJ ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_ViewEdgesContainer",&obj0)) SWIG_fail;
+  {
+    std::vector<ViewEdge*,std::allocator<ViewEdge * > > *ptr = (std::vector<ViewEdge*,std::allocator<ViewEdge * > > *)0;
+    res1 = swig::asptr(obj0, &ptr);
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ViewEdgesContainer" "', argument " "1"" of type '" "std::vector<ViewEdge * > const &""'"); 
+    }
+    if (!ptr) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ViewEdgesContainer" "', argument " "1"" of type '" "std::vector<ViewEdge * > const &""'"); 
+    }
+    arg1 = ptr;
+  }
+  {
+    try {
+      result = (std::vector<ViewEdge * > *)new std::vector<ViewEdge * >((std::vector<ViewEdge * > const &)*arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, SWIG_POINTER_NEW |  0 );
+  if (SWIG_IsNewObj(res1)) delete arg1;
+  return resultobj;
+fail:
+  if (SWIG_IsNewObj(res1)) delete arg1;
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_empty",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_empty" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  {
+    try {
+      result = (bool)((std::vector<ViewEdge * > const *)arg1)->empty();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::size_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_size",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_size" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<ViewEdge * > const *)arg1)->size();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_size_t(static_cast< size_t >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_clear",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_clear" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  {
+    try {
+      (arg1)->clear();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * > *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgesContainer_swap",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_swap" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgesContainer_swap" "', argument " "2"" of type '" "std::vector<ViewEdge * > &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgesContainer_swap" "', argument " "2"" of type '" "std::vector<ViewEdge * > &""'"); 
+  }
+  arg2 = reinterpret_cast< std::vector<ViewEdge * > * >(argp2);
+  {
+    try {
+      (arg1)->swap(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  SwigValueWrapper<std::allocator<ViewEdge * > > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_get_allocator",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_get_allocator" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<ViewEdge * > const *)arg1)->get_allocator();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new std::vector<ViewEdge * >::allocator_type(static_cast< const std::vector<ViewEdge * >::allocator_type& >(result))), SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_begin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_begin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_begin" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  {
+    try {
+      result = (arg1)->begin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewEdge * >::iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_begin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_begin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_begin" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<ViewEdge * > const *)arg1)->begin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewEdge * >::const_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_begin(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewEdgesContainer_begin__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewEdgesContainer_begin__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgesContainer_begin'.\n  Possible C/C++ prototypes are:\n    begin()\n    begin()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_end",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_end" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  {
+    try {
+      result = (arg1)->end();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewEdge * >::iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_end",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_end" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<ViewEdge * > const *)arg1)->end();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewEdge * >::const_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_end(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewEdgesContainer_end__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewEdgesContainer_end__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgesContainer_end'.\n  Possible C/C++ prototypes are:\n    end()\n    end()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_rbegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::reverse_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_rbegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_rbegin" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  {
+    try {
+      result = (arg1)->rbegin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewEdge * >::reverse_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_rbegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::const_reverse_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_rbegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_rbegin" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<ViewEdge * > const *)arg1)->rbegin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewEdge * >::const_reverse_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_rbegin(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewEdgesContainer_rbegin__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewEdgesContainer_rbegin__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgesContainer_rbegin'.\n  Possible C/C++ prototypes are:\n    rbegin()\n    rbegin()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_rend__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::reverse_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_rend",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_rend" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  {
+    try {
+      result = (arg1)->rend();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewEdge * >::reverse_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_rend__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::const_reverse_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_rend",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_rend" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<ViewEdge * > const *)arg1)->rend();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewEdge * >::const_reverse_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_rend(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewEdgesContainer_rend__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewEdgesContainer_rend__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgesContainer_rend'.\n  Possible C/C++ prototypes are:\n    rend()\n    rend()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewEdge * >::size_type arg1 ;
+  std::vector<ViewEdge * > *result = 0 ;
+  size_t val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_ViewEdgesContainer",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ViewEdgesContainer" "', argument " "1"" of type '" "std::vector<ViewEdge * >::size_type""'");
+  } 
+  arg1 = static_cast< std::vector<ViewEdge * >::size_type >(val1);
+  {
+    try {
+      result = (std::vector<ViewEdge * > *)new std::vector<ViewEdge * >(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_pop_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_pop_back",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_pop_back" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  {
+    try {
+      (arg1)->pop_back();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::size_type arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  size_t val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgesContainer_resize",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_resize" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer_resize" "', argument " "2"" of type '" "std::vector<ViewEdge * >::size_type""'");
+  } 
+  arg2 = static_cast< std::vector<ViewEdge * >::size_type >(val2);
+  {
+    try {
+      (arg1)->resize(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::iterator arg2 ;
+  std::vector<ViewEdge * >::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  swig::PySwigIterator *iter2 = 0 ;
+  int res2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgesContainer_erase",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_erase" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
+  if (!SWIG_IsOK(res2) || !iter2) {
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewEdge * >::iterator""'");
+  } else {
+    swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *>(iter2);
+    if (iter_t) {
+      arg2 = iter_t->get_current();
+    } else {
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewEdge * >::iterator""'");
+    }
+  }
+  {
+    try {
+      result = (arg1)->erase(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewEdge * >::iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::iterator arg2 ;
+  std::vector<ViewEdge * >::iterator arg3 ;
+  std::vector<ViewEdge * >::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  swig::PySwigIterator *iter2 = 0 ;
+  int res2 ;
+  swig::PySwigIterator *iter3 = 0 ;
+  int res3 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:ViewEdgesContainer_erase",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_erase" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
+  if (!SWIG_IsOK(res2) || !iter2) {
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewEdge * >::iterator""'");
+  } else {
+    swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *>(iter2);
+    if (iter_t) {
+      arg2 = iter_t->get_current();
+    } else {
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewEdge * >::iterator""'");
+    }
+  }
+  res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::PySwigIterator::descriptor(), 0);
+  if (!SWIG_IsOK(res3) || !iter3) {
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_erase" "', argument " "3"" of type '" "std::vector<ViewEdge * >::iterator""'");
+  } else {
+    swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *>(iter3);
+    if (iter_t) {
+      arg3 = iter_t->get_current();
+    } else {
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_erase" "', argument " "3"" of type '" "std::vector<ViewEdge * >::iterator""'");
+    }
+  }
+  {
+    try {
+      result = (arg1)->erase(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewEdge * >::iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_erase(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      swig::PySwigIterator *iter = 0;
+      int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *>(iter) != 0));
+      if (_v) {
+        return _wrap_ViewEdgesContainer_erase__SWIG_0(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      swig::PySwigIterator *iter = 0;
+      int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *>(iter) != 0));
+      if (_v) {
+        swig::PySwigIterator *iter = 0;
+        int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
+        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *>(iter) != 0));
+        if (_v) {
+          return _wrap_ViewEdgesContainer_erase__SWIG_1(self, args);
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgesContainer_erase'.\n  Possible C/C++ prototypes are:\n    erase(std::vector<ViewEdge * >::iterator)\n    erase(std::vector<ViewEdge * >::iterator,std::vector<ViewEdge * >::iterator)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewEdge * >::size_type arg1 ;
+  std::vector<ViewEdge * >::value_type arg2 = (std::vector<ViewEdge * >::value_type) 0 ;
+  std::vector<ViewEdge * > *result = 0 ;
+  size_t val1 ;
+  int ecode1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_ViewEdgesContainer",&obj0,&obj1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ViewEdgesContainer" "', argument " "1"" of type '" "std::vector<ViewEdge * >::size_type""'");
+  } 
+  arg1 = static_cast< std::vector<ViewEdge * >::size_type >(val1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ViewEdgesContainer" "', argument " "2"" of type '" "std::vector<ViewEdge * >::value_type""'"); 
+  }
+  arg2 = reinterpret_cast< std::vector<ViewEdge * >::value_type >(argp2);
+  {
+    try {
+      result = (std::vector<ViewEdge * > *)new std::vector<ViewEdge * >(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_ViewEdgesContainer__SWIG_0(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_size_t(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_ViewEdgesContainer__SWIG_2(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_new_ViewEdgesContainer__SWIG_1(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    {
+      int res = SWIG_AsVal_size_t(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_new_ViewEdgesContainer__SWIG_3(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewEdgesContainer'.\n  Possible C/C++ prototypes are:\n    std::vector<(p.ViewEdge)>()\n    std::vector<(p.ViewEdge)>(std::vector<ViewEdge * > const &)\n    std::vector<(p.ViewEdge)>(std::vector<ViewEdge * >::size_type)\n    std::vector<(p.ViewEdge)>(std::vector<ViewEdge * >::size_type,std::vector<ViewEdge * >::value_type)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_push_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::value_type arg2 = (std::vector<ViewEdge * >::value_type) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgesContainer_push_back",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_push_back" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgesContainer_push_back" "', argument " "2"" of type '" "std::vector<ViewEdge * >::value_type""'"); 
+  }
+  arg2 = reinterpret_cast< std::vector<ViewEdge * >::value_type >(argp2);
+  {
+    try {
+      (arg1)->push_back(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_front(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_front",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_front" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  {
+    try {
+      result = (std::vector<ViewEdge * >::value_type)((std::vector<ViewEdge * > const *)arg1)->front();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_back",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_back" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  {
+    try {
+      result = (std::vector<ViewEdge * >::value_type)((std::vector<ViewEdge * > const *)arg1)->back();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_assign(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::size_type arg2 ;
+  std::vector<ViewEdge * >::value_type arg3 = (std::vector<ViewEdge * >::value_type) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  size_t val2 ;
+  int ecode2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:ViewEdgesContainer_assign",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_assign" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer_assign" "', argument " "2"" of type '" "std::vector<ViewEdge * >::size_type""'");
+  } 
+  arg2 = static_cast< std::vector<ViewEdge * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewEdgesContainer_assign" "', argument " "3"" of type '" "std::vector<ViewEdge * >::value_type""'"); 
+  }
+  arg3 = reinterpret_cast< std::vector<ViewEdge * >::value_type >(argp3);
+  {
+    try {
+      (arg1)->assign(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::size_type arg2 ;
+  std::vector<ViewEdge * >::value_type arg3 = (std::vector<ViewEdge * >::value_type) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  size_t val2 ;
+  int ecode2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:ViewEdgesContainer_resize",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_resize" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer_resize" "', argument " "2"" of type '" "std::vector<ViewEdge * >::size_type""'");
+  } 
+  arg2 = static_cast< std::vector<ViewEdge * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewEdgesContainer_resize" "', argument " "3"" of type '" "std::vector<ViewEdge * >::value_type""'"); 
+  }
+  arg3 = reinterpret_cast< std::vector<ViewEdge * >::value_type >(argp3);
+  {
+    try {
+      (arg1)->resize(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_resize(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_size_t(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_ViewEdgesContainer_resize__SWIG_0(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_size_t(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          return _wrap_ViewEdgesContainer_resize__SWIG_1(self, args);
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgesContainer_resize'.\n  Possible C/C++ prototypes are:\n    resize(std::vector<ViewEdge * >::size_type)\n    resize(std::vector<ViewEdge * >::size_type,std::vector<ViewEdge * >::value_type)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::iterator arg2 ;
+  std::vector<ViewEdge * >::value_type arg3 = (std::vector<ViewEdge * >::value_type) 0 ;
+  std::vector<ViewEdge * >::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  swig::PySwigIterator *iter2 = 0 ;
+  int res2 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:ViewEdgesContainer_insert",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_insert" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
+  if (!SWIG_IsOK(res2) || !iter2) {
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewEdge * >::iterator""'");
+  } else {
+    swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *>(iter2);
+    if (iter_t) {
+      arg2 = iter_t->get_current();
+    } else {
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewEdge * >::iterator""'");
+    }
+  }
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewEdgesContainer_insert" "', argument " "3"" of type '" "std::vector<ViewEdge * >::value_type""'"); 
+  }
+  arg3 = reinterpret_cast< std::vector<ViewEdge * >::value_type >(argp3);
+  {
+    try {
+      result = (arg1)->insert(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewEdge * >::iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::iterator arg2 ;
+  std::vector<ViewEdge * >::size_type arg3 ;
+  std::vector<ViewEdge * >::value_type arg4 = (std::vector<ViewEdge * >::value_type) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  swig::PySwigIterator *iter2 = 0 ;
+  int res2 ;
+  size_t val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOO:ViewEdgesContainer_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_insert" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
+  if (!SWIG_IsOK(res2) || !iter2) {
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewEdge * >::iterator""'");
+  } else {
+    swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *>(iter2);
+    if (iter_t) {
+      arg2 = iter_t->get_current();
+    } else {
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewEdge * >::iterator""'");
+    }
+  }
+  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewEdgesContainer_insert" "', argument " "3"" of type '" "std::vector<ViewEdge * >::size_type""'");
+  } 
+  arg3 = static_cast< std::vector<ViewEdge * >::size_type >(val3);
+  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewEdgesContainer_insert" "', argument " "4"" of type '" "std::vector<ViewEdge * >::value_type""'"); 
+  }
+  arg4 = reinterpret_cast< std::vector<ViewEdge * >::value_type >(argp4);
+  {
+    try {
+      (arg1)->insert(arg2,arg3,arg4);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_insert(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[5];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 4); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 3) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      swig::PySwigIterator *iter = 0;
+      int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *>(iter) != 0));
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          return _wrap_ViewEdgesContainer_insert__SWIG_0(self, args);
+        }
+      }
+    }
+  }
+  if (argc == 4) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      swig::PySwigIterator *iter = 0;
+      int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *>(iter) != 0));
+      if (_v) {
+        {
+          int res = SWIG_AsVal_size_t(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            return _wrap_ViewEdgesContainer_insert__SWIG_1(self, args);
+          }
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgesContainer_insert'.\n  Possible C/C++ prototypes are:\n    insert(std::vector<ViewEdge * >::iterator,std::vector<ViewEdge * >::value_type)\n    insert(std::vector<ViewEdge * >::iterator,std::vector<ViewEdge * >::size_type,std::vector<ViewEdge * >::value_type)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_reserve(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::size_type arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  size_t val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgesContainer_reserve",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_reserve" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer_reserve" "', argument " "2"" of type '" "std::vector<ViewEdge * >::size_type""'");
+  } 
+  arg2 = static_cast< std::vector<ViewEdge * >::size_type >(val2);
+  {
+    try {
+      (arg1)->reserve(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_capacity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::size_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_capacity",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_capacity" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<ViewEdge * > const *)arg1)->capacity();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_size_t(static_cast< size_t >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ViewEdgesContainer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_ViewEdgesContainer",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ViewEdgesContainer" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *ViewEdgesContainer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  PyObject **arg2 = (PyObject **) 0 ;
+  swig::PySwigIterator *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  arg2 = &obj0;
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_iterator",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_iterator" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  {
+    try {
+      result = (swig::PySwigIterator *)std_vector_Sl_FEdge_Sm__Sg__iterator(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__PySwigIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer___nonzero__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer___nonzero__",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___nonzero__" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  {
+    try {
+      result = (bool)std_vector_Sl_FEdge_Sm__Sg____nonzero__((std::vector<FEdge * > const *)arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer___len__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::size_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer___len__",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___len__" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  {
+    try {
+      result = std_vector_Sl_FEdge_Sm__Sg____len__((std::vector<FEdge * > const *)arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_size_t(static_cast< size_t >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_pop",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_pop" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  {
+    try {
+      try {
+        result = (std::vector<FEdge * >::value_type)std_vector_Sl_FEdge_Sm__Sg__pop(arg1);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::difference_type arg2 ;
+  std::vector<FEdge * >::difference_type arg3 ;
+  std::vector<FEdge *,std::allocator<FEdge * > > *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  ptrdiff_t val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:FEdgesContainer___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___getslice__" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer___getslice__" "', argument " "2"" of type '" "std::vector<FEdge * >::difference_type""'");
+  } 
+  arg2 = static_cast< std::vector<FEdge * >::difference_type >(val2);
+  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FEdgesContainer___getslice__" "', argument " "3"" of type '" "std::vector<FEdge * >::difference_type""'");
+  } 
+  arg3 = static_cast< std::vector<FEdge * >::difference_type >(val3);
+  {
+    try {
+      try {
+        result = (std::vector<FEdge *,std::allocator<FEdge * > > *)std_vector_Sl_FEdge_Sm__Sg____getslice__(arg1,arg2,arg3);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer___setslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::difference_type arg2 ;
+  std::vector<FEdge * >::difference_type arg3 ;
+  std::vector<FEdge *,std::allocator<FEdge * > > *arg4 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  ptrdiff_t val3 ;
+  int ecode3 = 0 ;
+  int res4 = SWIG_OLDOBJ ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOO:FEdgesContainer___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___setslice__" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer___setslice__" "', argument " "2"" of type '" "std::vector<FEdge * >::difference_type""'");
+  } 
+  arg2 = static_cast< std::vector<FEdge * >::difference_type >(val2);
+  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FEdgesContainer___setslice__" "', argument " "3"" of type '" "std::vector<FEdge * >::difference_type""'");
+  } 
+  arg3 = static_cast< std::vector<FEdge * >::difference_type >(val3);
+  {
+    std::vector<FEdge*,std::allocator<FEdge * > > *ptr = (std::vector<FEdge*,std::allocator<FEdge * > > *)0;
+    res4 = swig::asptr(obj3, &ptr);
+    if (!SWIG_IsOK(res4)) {
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "FEdgesContainer___setslice__" "', argument " "4"" of type '" "std::vector<FEdge *,std::allocator<FEdge * > > const &""'"); 
+    }
+    if (!ptr) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdgesContainer___setslice__" "', argument " "4"" of type '" "std::vector<FEdge *,std::allocator<FEdge * > > const &""'"); 
+    }
+    arg4 = ptr;
+  }
+  {
+    try {
+      try {
+        std_vector_Sl_FEdge_Sm__Sg____setslice__(arg1,arg2,arg3,(std::vector<FEdge *,std::allocator<FEdge * > > const &)*arg4);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+      }
+      catch(std::invalid_argument &_e) {
+        SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  if (SWIG_IsNewObj(res4)) delete arg4;
+  return resultobj;
+fail:
+  if (SWIG_IsNewObj(res4)) delete arg4;
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer___delslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::difference_type arg2 ;
+  std::vector<FEdge * >::difference_type arg3 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  ptrdiff_t val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:FEdgesContainer___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___delslice__" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer___delslice__" "', argument " "2"" of type '" "std::vector<FEdge * >::difference_type""'");
+  } 
+  arg2 = static_cast< std::vector<FEdge * >::difference_type >(val2);
+  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FEdgesContainer___delslice__" "', argument " "3"" of type '" "std::vector<FEdge * >::difference_type""'");
+  } 
+  arg3 = static_cast< std::vector<FEdge * >::difference_type >(val3);
+  {
+    try {
+      try {
+        std_vector_Sl_FEdge_Sm__Sg____delslice__(arg1,arg2,arg3);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer___delitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::difference_type arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgesContainer___delitem__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___delitem__" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer___delitem__" "', argument " "2"" of type '" "std::vector<FEdge * >::difference_type""'");
+  } 
+  arg2 = static_cast< std::vector<FEdge * >::difference_type >(val2);
+  {
+    try {
+      try {
+        std_vector_Sl_FEdge_Sm__Sg____delitem__(arg1,arg2);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer___getitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::difference_type arg2 ;
+  std::vector<FEdge * >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgesContainer___getitem__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___getitem__" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer___getitem__" "', argument " "2"" of type '" "std::vector<FEdge * >::difference_type""'");
+  } 
+  arg2 = static_cast< std::vector<FEdge * >::difference_type >(val2);
+  {
+    try {
+      try {
+        result = (std::vector<FEdge * >::value_type)std_vector_Sl_FEdge_Sm__Sg____getitem__(arg1,arg2);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer___setitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::difference_type arg2 ;
+  std::vector<FEdge * >::value_type arg3 = (std::vector<FEdge * >::value_type) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:FEdgesContainer___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___setitem__" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer___setitem__" "', argument " "2"" of type '" "std::vector<FEdge * >::difference_type""'");
+  } 
+  arg2 = static_cast< std::vector<FEdge * >::difference_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FEdgesContainer___setitem__" "', argument " "3"" of type '" "std::vector<FEdge * >::value_type""'"); 
+  }
+  arg3 = reinterpret_cast< std::vector<FEdge * >::value_type >(argp3);
+  {
+    try {
+      try {
+        std_vector_Sl_FEdge_Sm__Sg____setitem__(arg1,arg2,arg3);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::value_type arg2 = (std::vector<FEdge * >::value_type) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgesContainer_append",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_append" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgesContainer_append" "', argument " "2"" of type '" "std::vector<FEdge * >::value_type""'"); 
+  }
+  arg2 = reinterpret_cast< std::vector<FEdge * >::value_type >(argp2);
+  {
+    try {
+      std_vector_Sl_FEdge_Sm__Sg__append(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FEdgesContainer__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<FEdge * > *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_FEdgesContainer")) SWIG_fail;
+  {
+    try {
+      result = (std::vector<FEdge * > *)new std::vector<FEdge * >();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FEdgesContainer__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<FEdge * > *arg1 = 0 ;
+  std::vector<FEdge * > *result = 0 ;
+  int res1 = SWIG_OLDOBJ ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_FEdgesContainer",&obj0)) SWIG_fail;
+  {
+    std::vector<FEdge*,std::allocator<FEdge * > > *ptr = (std::vector<FEdge*,std::allocator<FEdge * > > *)0;
+    res1 = swig::asptr(obj0, &ptr);
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_FEdgesContainer" "', argument " "1"" of type '" "std::vector<FEdge * > const &""'"); 
+    }
+    if (!ptr) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_FEdgesContainer" "', argument " "1"" of type '" "std::vector<FEdge * > const &""'"); 
+    }
+    arg1 = ptr;
+  }
+  {
+    try {
+      result = (std::vector<FEdge * > *)new std::vector<FEdge * >((std::vector<FEdge * > const &)*arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, SWIG_POINTER_NEW |  0 );
+  if (SWIG_IsNewObj(res1)) delete arg1;
+  return resultobj;
+fail:
+  if (SWIG_IsNewObj(res1)) delete arg1;
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_empty",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_empty" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  {
+    try {
+      result = (bool)((std::vector<FEdge * > const *)arg1)->empty();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::size_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_size",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_size" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<FEdge * > const *)arg1)->size();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_size_t(static_cast< size_t >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_clear",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_clear" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  {
+    try {
+      (arg1)->clear();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * > *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgesContainer_swap",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_swap" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgesContainer_swap" "', argument " "2"" of type '" "std::vector<FEdge * > &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdgesContainer_swap" "', argument " "2"" of type '" "std::vector<FEdge * > &""'"); 
+  }
+  arg2 = reinterpret_cast< std::vector<FEdge * > * >(argp2);
+  {
+    try {
+      (arg1)->swap(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  SwigValueWrapper<std::allocator<FEdge * > > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_get_allocator",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_get_allocator" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<FEdge * > const *)arg1)->get_allocator();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new std::vector<FEdge * >::allocator_type(static_cast< const std::vector<FEdge * >::allocator_type& >(result))), SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer_begin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_begin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_begin" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  {
+    try {
+      result = (arg1)->begin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<FEdge * >::iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer_begin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_begin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_begin" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<FEdge * > const *)arg1)->begin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<FEdge * >::const_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer_begin(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_FEdgesContainer_begin__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_FEdgesContainer_begin__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdgesContainer_begin'.\n  Possible C/C++ prototypes are:\n    begin()\n    begin()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_end",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_end" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  {
+    try {
+      result = (arg1)->end();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<FEdge * >::iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_end",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_end" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<FEdge * > const *)arg1)->end();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<FEdge * >::const_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer_end(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_FEdgesContainer_end__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_FEdgesContainer_end__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdgesContainer_end'.\n  Possible C/C++ prototypes are:\n    end()\n    end()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer_rbegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::reverse_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_rbegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_rbegin" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  {
+    try {
+      result = (arg1)->rbegin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<FEdge * >::reverse_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer_rbegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::const_reverse_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_rbegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_rbegin" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<FEdge * > const *)arg1)->rbegin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<FEdge * >::const_reverse_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer_rbegin(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_FEdgesContainer_rbegin__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_FEdgesContainer_rbegin__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdgesContainer_rbegin'.\n  Possible C/C++ prototypes are:\n    rbegin()\n    rbegin()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer_rend__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::reverse_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_rend",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_rend" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  {
+    try {
+      result = (arg1)->rend();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<FEdge * >::reverse_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer_rend__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::const_reverse_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_rend",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_rend" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<FEdge * > const *)arg1)->rend();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<FEdge * >::const_reverse_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer_rend(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_FEdgesContainer_rend__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_FEdgesContainer_rend__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdgesContainer_rend'.\n  Possible C/C++ prototypes are:\n    rend()\n    rend()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FEdgesContainer__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<FEdge * >::size_type arg1 ;
+  std::vector<FEdge * > *result = 0 ;
+  size_t val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_FEdgesContainer",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FEdgesContainer" "', argument " "1"" of type '" "std::vector<FEdge * >::size_type""'");
+  } 
+  arg1 = static_cast< std::vector<FEdge * >::size_type >(val1);
+  {
+    try {
+      result = (std::vector<FEdge * > *)new std::vector<FEdge * >(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer_pop_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_pop_back",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_pop_back" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  {
+    try {
+      (arg1)->pop_back();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::size_type arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  size_t val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgesContainer_resize",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_resize" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer_resize" "', argument " "2"" of type '" "std::vector<FEdge * >::size_type""'");
+  } 
+  arg2 = static_cast< std::vector<FEdge * >::size_type >(val2);
+  {
+    try {
+      (arg1)->resize(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::iterator arg2 ;
+  std::vector<FEdge * >::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  swig::PySwigIterator *iter2 = 0 ;
+  int res2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgesContainer_erase",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_erase" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
+  if (!SWIG_IsOK(res2) || !iter2) {
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_erase" "', argument " "2"" of type '" "std::vector<FEdge * >::iterator""'");
+  } else {
+    swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *>(iter2);
+    if (iter_t) {
+      arg2 = iter_t->get_current();
+    } else {
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_erase" "', argument " "2"" of type '" "std::vector<FEdge * >::iterator""'");
+    }
+  }
+  {
+    try {
+      result = (arg1)->erase(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<FEdge * >::iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::iterator arg2 ;
+  std::vector<FEdge * >::iterator arg3 ;
+  std::vector<FEdge * >::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  swig::PySwigIterator *iter2 = 0 ;
+  int res2 ;
+  swig::PySwigIterator *iter3 = 0 ;
+  int res3 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:FEdgesContainer_erase",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_erase" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
+  if (!SWIG_IsOK(res2) || !iter2) {
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_erase" "', argument " "2"" of type '" "std::vector<FEdge * >::iterator""'");
+  } else {
+    swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *>(iter2);
+    if (iter_t) {
+      arg2 = iter_t->get_current();
+    } else {
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_erase" "', argument " "2"" of type '" "std::vector<FEdge * >::iterator""'");
+    }
+  }
+  res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::PySwigIterator::descriptor(), 0);
+  if (!SWIG_IsOK(res3) || !iter3) {
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_erase" "', argument " "3"" of type '" "std::vector<FEdge * >::iterator""'");
+  } else {
+    swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *>(iter3);
+    if (iter_t) {
+      arg3 = iter_t->get_current();
+    } else {
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_erase" "', argument " "3"" of type '" "std::vector<FEdge * >::iterator""'");
+    }
+  }
+  {
+    try {
+      result = (arg1)->erase(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<FEdge * >::iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer_erase(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      swig::PySwigIterator *iter = 0;
+      int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *>(iter) != 0));
+      if (_v) {
+        return _wrap_FEdgesContainer_erase__SWIG_0(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      swig::PySwigIterator *iter = 0;
+      int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *>(iter) != 0));
+      if (_v) {
+        swig::PySwigIterator *iter = 0;
+        int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
+        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *>(iter) != 0));
+        if (_v) {
+          return _wrap_FEdgesContainer_erase__SWIG_1(self, args);
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdgesContainer_erase'.\n  Possible C/C++ prototypes are:\n    erase(std::vector<FEdge * >::iterator)\n    erase(std::vector<FEdge * >::iterator,std::vector<FEdge * >::iterator)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FEdgesContainer__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<FEdge * >::size_type arg1 ;
+  std::vector<FEdge * >::value_type arg2 = (std::vector<FEdge * >::value_type) 0 ;
+  std::vector<FEdge * > *result = 0 ;
+  size_t val1 ;
+  int ecode1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_FEdgesContainer",&obj0,&obj1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FEdgesContainer" "', argument " "1"" of type '" "std::vector<FEdge * >::size_type""'");
+  } 
+  arg1 = static_cast< std::vector<FEdge * >::size_type >(val1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_FEdgesContainer" "', argument " "2"" of type '" "std::vector<FEdge * >::value_type""'"); 
+  }
+  arg2 = reinterpret_cast< std::vector<FEdge * >::value_type >(argp2);
+  {
+    try {
+      result = (std::vector<FEdge * > *)new std::vector<FEdge * >(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FEdgesContainer(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_FEdgesContainer__SWIG_0(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_size_t(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_FEdgesContainer__SWIG_2(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_new_FEdgesContainer__SWIG_1(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    {
+      int res = SWIG_AsVal_size_t(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_new_FEdgesContainer__SWIG_3(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_FEdgesContainer'.\n  Possible C/C++ prototypes are:\n    std::vector<(p.FEdge)>()\n    std::vector<(p.FEdge)>(std::vector<FEdge * > const &)\n    std::vector<(p.FEdge)>(std::vector<FEdge * >::size_type)\n    std::vector<(p.FEdge)>(std::vector<FEdge * >::size_type,std::vector<FEdge * >::value_type)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer_push_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::value_type arg2 = (std::vector<FEdge * >::value_type) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgesContainer_push_back",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_push_back" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgesContainer_push_back" "', argument " "2"" of type '" "std::vector<FEdge * >::value_type""'"); 
+  }
+  arg2 = reinterpret_cast< std::vector<FEdge * >::value_type >(argp2);
+  {
+    try {
+      (arg1)->push_back(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer_front(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_front",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_front" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  {
+    try {
+      result = (std::vector<FEdge * >::value_type)((std::vector<FEdge * > const *)arg1)->front();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_back",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_back" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  {
+    try {
+      result = (std::vector<FEdge * >::value_type)((std::vector<FEdge * > const *)arg1)->back();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer_assign(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::size_type arg2 ;
+  std::vector<FEdge * >::value_type arg3 = (std::vector<FEdge * >::value_type) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  size_t val2 ;
+  int ecode2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:FEdgesContainer_assign",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_assign" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer_assign" "', argument " "2"" of type '" "std::vector<FEdge * >::size_type""'");
+  } 
+  arg2 = static_cast< std::vector<FEdge * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FEdgesContainer_assign" "', argument " "3"" of type '" "std::vector<FEdge * >::value_type""'"); 
+  }
+  arg3 = reinterpret_cast< std::vector<FEdge * >::value_type >(argp3);
+  {
+    try {
+      (arg1)->assign(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::size_type arg2 ;
+  std::vector<FEdge * >::value_type arg3 = (std::vector<FEdge * >::value_type) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  size_t val2 ;
+  int ecode2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:FEdgesContainer_resize",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_resize" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer_resize" "', argument " "2"" of type '" "std::vector<FEdge * >::size_type""'");
+  } 
+  arg2 = static_cast< std::vector<FEdge * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FEdgesContainer_resize" "', argument " "3"" of type '" "std::vector<FEdge * >::value_type""'"); 
+  }
+  arg3 = reinterpret_cast< std::vector<FEdge * >::value_type >(argp3);
+  {
+    try {
+      (arg1)->resize(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer_resize(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_size_t(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_FEdgesContainer_resize__SWIG_0(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_size_t(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          return _wrap_FEdgesContainer_resize__SWIG_1(self, args);
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdgesContainer_resize'.\n  Possible C/C++ prototypes are:\n    resize(std::vector<FEdge * >::size_type)\n    resize(std::vector<FEdge * >::size_type,std::vector<FEdge * >::value_type)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::iterator arg2 ;
+  std::vector<FEdge * >::value_type arg3 = (std::vector<FEdge * >::value_type) 0 ;
+  std::vector<FEdge * >::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  swig::PySwigIterator *iter2 = 0 ;
+  int res2 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:FEdgesContainer_insert",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_insert" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
+  if (!SWIG_IsOK(res2) || !iter2) {
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_insert" "', argument " "2"" of type '" "std::vector<FEdge * >::iterator""'");
+  } else {
+    swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *>(iter2);
+    if (iter_t) {
+      arg2 = iter_t->get_current();
+    } else {
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_insert" "', argument " "2"" of type '" "std::vector<FEdge * >::iterator""'");
+    }
+  }
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FEdgesContainer_insert" "', argument " "3"" of type '" "std::vector<FEdge * >::value_type""'"); 
+  }
+  arg3 = reinterpret_cast< std::vector<FEdge * >::value_type >(argp3);
+  {
+    try {
+      result = (arg1)->insert(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<FEdge * >::iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::iterator arg2 ;
+  std::vector<FEdge * >::size_type arg3 ;
+  std::vector<FEdge * >::value_type arg4 = (std::vector<FEdge * >::value_type) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  swig::PySwigIterator *iter2 = 0 ;
+  int res2 ;
+  size_t val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOO:FEdgesContainer_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_insert" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
+  if (!SWIG_IsOK(res2) || !iter2) {
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_insert" "', argument " "2"" of type '" "std::vector<FEdge * >::iterator""'");
+  } else {
+    swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *>(iter2);
+    if (iter_t) {
+      arg2 = iter_t->get_current();
+    } else {
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_insert" "', argument " "2"" of type '" "std::vector<FEdge * >::iterator""'");
+    }
+  }
+  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FEdgesContainer_insert" "', argument " "3"" of type '" "std::vector<FEdge * >::size_type""'");
+  } 
+  arg3 = static_cast< std::vector<FEdge * >::size_type >(val3);
+  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "FEdgesContainer_insert" "', argument " "4"" of type '" "std::vector<FEdge * >::value_type""'"); 
+  }
+  arg4 = reinterpret_cast< std::vector<FEdge * >::value_type >(argp4);
+  {
+    try {
+      (arg1)->insert(arg2,arg3,arg4);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer_insert(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[5];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 4); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 3) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      swig::PySwigIterator *iter = 0;
+      int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *>(iter) != 0));
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          return _wrap_FEdgesContainer_insert__SWIG_0(self, args);
+        }
+      }
+    }
+  }
+  if (argc == 4) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      swig::PySwigIterator *iter = 0;
+      int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *>(iter) != 0));
+      if (_v) {
+        {
+          int res = SWIG_AsVal_size_t(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            return _wrap_FEdgesContainer_insert__SWIG_1(self, args);
+          }
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdgesContainer_insert'.\n  Possible C/C++ prototypes are:\n    insert(std::vector<FEdge * >::iterator,std::vector<FEdge * >::value_type)\n    insert(std::vector<FEdge * >::iterator,std::vector<FEdge * >::size_type,std::vector<FEdge * >::value_type)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer_reserve(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::size_type arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  size_t val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgesContainer_reserve",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_reserve" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer_reserve" "', argument " "2"" of type '" "std::vector<FEdge * >::size_type""'");
+  } 
+  arg2 = static_cast< std::vector<FEdge * >::size_type >(val2);
+  {
+    try {
+      (arg1)->reserve(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer_capacity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::size_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_capacity",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_capacity" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<FEdge * > const *)arg1)->capacity();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_size_t(static_cast< size_t >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_FEdgesContainer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_FEdgesContainer",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FEdgesContainer" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *FEdgesContainer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  PyObject **arg2 = (PyObject **) 0 ;
+  swig::PySwigIterator *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  arg2 = &obj0;
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_iterator",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_iterator" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  {
+    try {
+      result = (swig::PySwigIterator *)std_vector_Sl_ViewVertex_Sm__Sg__iterator(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__PySwigIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer___nonzero__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer___nonzero__",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___nonzero__" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  {
+    try {
+      result = (bool)std_vector_Sl_ViewVertex_Sm__Sg____nonzero__((std::vector<ViewVertex * > const *)arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer___len__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::size_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer___len__",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___len__" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  {
+    try {
+      result = std_vector_Sl_ViewVertex_Sm__Sg____len__((std::vector<ViewVertex * > const *)arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_size_t(static_cast< size_t >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_pop",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_pop" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  {
+    try {
+      try {
+        result = (std::vector<ViewVertex * >::value_type)std_vector_Sl_ViewVertex_Sm__Sg__pop(arg1);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::difference_type arg2 ;
+  std::vector<ViewVertex * >::difference_type arg3 ;
+  std::vector<ViewVertex *,std::allocator<ViewVertex * > > *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  ptrdiff_t val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:ViewVerticesContainer___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___getslice__" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer___getslice__" "', argument " "2"" of type '" "std::vector<ViewVertex * >::difference_type""'");
+  } 
+  arg2 = static_cast< std::vector<ViewVertex * >::difference_type >(val2);
+  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewVerticesContainer___getslice__" "', argument " "3"" of type '" "std::vector<ViewVertex * >::difference_type""'");
+  } 
+  arg3 = static_cast< std::vector<ViewVertex * >::difference_type >(val3);
+  {
+    try {
+      try {
+        result = (std::vector<ViewVertex *,std::allocator<ViewVertex * > > *)std_vector_Sl_ViewVertex_Sm__Sg____getslice__(arg1,arg2,arg3);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer___setslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::difference_type arg2 ;
+  std::vector<ViewVertex * >::difference_type arg3 ;
+  std::vector<ViewVertex *,std::allocator<ViewVertex * > > *arg4 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  ptrdiff_t val3 ;
+  int ecode3 = 0 ;
+  int res4 = SWIG_OLDOBJ ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOO:ViewVerticesContainer___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___setslice__" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer___setslice__" "', argument " "2"" of type '" "std::vector<ViewVertex * >::difference_type""'");
+  } 
+  arg2 = static_cast< std::vector<ViewVertex * >::difference_type >(val2);
+  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewVerticesContainer___setslice__" "', argument " "3"" of type '" "std::vector<ViewVertex * >::difference_type""'");
+  } 
+  arg3 = static_cast< std::vector<ViewVertex * >::difference_type >(val3);
+  {
+    std::vector<ViewVertex*,std::allocator<ViewVertex * > > *ptr = (std::vector<ViewVertex*,std::allocator<ViewVertex * > > *)0;
+    res4 = swig::asptr(obj3, &ptr);
+    if (!SWIG_IsOK(res4)) {
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewVerticesContainer___setslice__" "', argument " "4"" of type '" "std::vector<ViewVertex *,std::allocator<ViewVertex * > > const &""'"); 
+    }
+    if (!ptr) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewVerticesContainer___setslice__" "', argument " "4"" of type '" "std::vector<ViewVertex *,std::allocator<ViewVertex * > > const &""'"); 
+    }
+    arg4 = ptr;
+  }
+  {
+    try {
+      try {
+        std_vector_Sl_ViewVertex_Sm__Sg____setslice__(arg1,arg2,arg3,(std::vector<ViewVertex *,std::allocator<ViewVertex * > > const &)*arg4);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+      }
+      catch(std::invalid_argument &_e) {
+        SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  if (SWIG_IsNewObj(res4)) delete arg4;
+  return resultobj;
+fail:
+  if (SWIG_IsNewObj(res4)) delete arg4;
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer___delslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::difference_type arg2 ;
+  std::vector<ViewVertex * >::difference_type arg3 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  ptrdiff_t val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:ViewVerticesContainer___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___delslice__" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer___delslice__" "', argument " "2"" of type '" "std::vector<ViewVertex * >::difference_type""'");
+  } 
+  arg2 = static_cast< std::vector<ViewVertex * >::difference_type >(val2);
+  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewVerticesContainer___delslice__" "', argument " "3"" of type '" "std::vector<ViewVertex * >::difference_type""'");
+  } 
+  arg3 = static_cast< std::vector<ViewVertex * >::difference_type >(val3);
+  {
+    try {
+      try {
+        std_vector_Sl_ViewVertex_Sm__Sg____delslice__(arg1,arg2,arg3);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer___delitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::difference_type arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewVerticesContainer___delitem__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___delitem__" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer___delitem__" "', argument " "2"" of type '" "std::vector<ViewVertex * >::difference_type""'");
+  } 
+  arg2 = static_cast< std::vector<ViewVertex * >::difference_type >(val2);
+  {
+    try {
+      try {
+        std_vector_Sl_ViewVertex_Sm__Sg____delitem__(arg1,arg2);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer___getitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::difference_type arg2 ;
+  std::vector<ViewVertex * >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewVerticesContainer___getitem__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___getitem__" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer___getitem__" "', argument " "2"" of type '" "std::vector<ViewVertex * >::difference_type""'");
+  } 
+  arg2 = static_cast< std::vector<ViewVertex * >::difference_type >(val2);
+  {
+    try {
+      try {
+        result = (std::vector<ViewVertex * >::value_type)std_vector_Sl_ViewVertex_Sm__Sg____getitem__(arg1,arg2);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer___setitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::difference_type arg2 ;
+  std::vector<ViewVertex * >::value_type arg3 = (std::vector<ViewVertex * >::value_type) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:ViewVerticesContainer___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___setitem__" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer___setitem__" "', argument " "2"" of type '" "std::vector<ViewVertex * >::difference_type""'");
+  } 
+  arg2 = static_cast< std::vector<ViewVertex * >::difference_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewVerticesContainer___setitem__" "', argument " "3"" of type '" "std::vector<ViewVertex * >::value_type""'"); 
+  }
+  arg3 = reinterpret_cast< std::vector<ViewVertex * >::value_type >(argp3);
+  {
+    try {
+      try {
+        std_vector_Sl_ViewVertex_Sm__Sg____setitem__(arg1,arg2,arg3);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::value_type arg2 = (std::vector<ViewVertex * >::value_type) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewVerticesContainer_append",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_append" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewVerticesContainer_append" "', argument " "2"" of type '" "std::vector<ViewVertex * >::value_type""'"); 
+  }
+  arg2 = reinterpret_cast< std::vector<ViewVertex * >::value_type >(argp2);
+  {
+    try {
+      std_vector_Sl_ViewVertex_Sm__Sg__append(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewVertex * > *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_ViewVerticesContainer")) SWIG_fail;
+  {
+    try {
+      result = (std::vector<ViewVertex * > *)new std::vector<ViewVertex * >();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewVertex * > *arg1 = 0 ;
+  std::vector<ViewVertex * > *result = 0 ;
+  int res1 = SWIG_OLDOBJ ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_ViewVerticesContainer",&obj0)) SWIG_fail;
+  {
+    std::vector<ViewVertex*,std::allocator<ViewVertex * > > *ptr = (std::vector<ViewVertex*,std::allocator<ViewVertex * > > *)0;
+    res1 = swig::asptr(obj0, &ptr);
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ViewVerticesContainer" "', argument " "1"" of type '" "std::vector<ViewVertex * > const &""'"); 
+    }
+    if (!ptr) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ViewVerticesContainer" "', argument " "1"" of type '" "std::vector<ViewVertex * > const &""'"); 
+    }
+    arg1 = ptr;
+  }
+  {
+    try {
+      result = (std::vector<ViewVertex * > *)new std::vector<ViewVertex * >((std::vector<ViewVertex * > const &)*arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, SWIG_POINTER_NEW |  0 );
+  if (SWIG_IsNewObj(res1)) delete arg1;
+  return resultobj;
+fail:
+  if (SWIG_IsNewObj(res1)) delete arg1;
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_empty",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_empty" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  {
+    try {
+      result = (bool)((std::vector<ViewVertex * > const *)arg1)->empty();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::size_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_size",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_size" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<ViewVertex * > const *)arg1)->size();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_size_t(static_cast< size_t >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_clear",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_clear" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  {
+    try {
+      (arg1)->clear();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * > *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewVerticesContainer_swap",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_swap" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewVerticesContainer_swap" "', argument " "2"" of type '" "std::vector<ViewVertex * > &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewVerticesContainer_swap" "', argument " "2"" of type '" "std::vector<ViewVertex * > &""'"); 
+  }
+  arg2 = reinterpret_cast< std::vector<ViewVertex * > * >(argp2);
+  {
+    try {
+      (arg1)->swap(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  SwigValueWrapper<std::allocator<ViewVertex * > > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_get_allocator",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_get_allocator" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<ViewVertex * > const *)arg1)->get_allocator();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new std::vector<ViewVertex * >::allocator_type(static_cast< const std::vector<ViewVertex * >::allocator_type& >(result))), SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_begin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_begin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_begin" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  {
+    try {
+      result = (arg1)->begin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewVertex * >::iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_begin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_begin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_begin" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<ViewVertex * > const *)arg1)->begin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewVertex * >::const_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_begin(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewVerticesContainer_begin__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewVerticesContainer_begin__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVerticesContainer_begin'.\n  Possible C/C++ prototypes are:\n    begin()\n    begin()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_end",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_end" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  {
+    try {
+      result = (arg1)->end();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewVertex * >::iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_end",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_end" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<ViewVertex * > const *)arg1)->end();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewVertex * >::const_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_end(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewVerticesContainer_end__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewVerticesContainer_end__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVerticesContainer_end'.\n  Possible C/C++ prototypes are:\n    end()\n    end()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_rbegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::reverse_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_rbegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_rbegin" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  {
+    try {
+      result = (arg1)->rbegin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewVertex * >::reverse_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_rbegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::const_reverse_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_rbegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_rbegin" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<ViewVertex * > const *)arg1)->rbegin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewVertex * >::const_reverse_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_rbegin(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewVerticesContainer_rbegin__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewVerticesContainer_rbegin__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVerticesContainer_rbegin'.\n  Possible C/C++ prototypes are:\n    rbegin()\n    rbegin()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_rend__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::reverse_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_rend",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_rend" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  {
+    try {
+      result = (arg1)->rend();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewVertex * >::reverse_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_rend__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::const_reverse_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_rend",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_rend" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<ViewVertex * > const *)arg1)->rend();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewVertex * >::const_reverse_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_rend(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewVerticesContainer_rend__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewVerticesContainer_rend__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVerticesContainer_rend'.\n  Possible C/C++ prototypes are:\n    rend()\n    rend()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewVertex * >::size_type arg1 ;
+  std::vector<ViewVertex * > *result = 0 ;
+  size_t val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_ViewVerticesContainer",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ViewVerticesContainer" "', argument " "1"" of type '" "std::vector<ViewVertex * >::size_type""'");
+  } 
+  arg1 = static_cast< std::vector<ViewVertex * >::size_type >(val1);
+  {
+    try {
+      result = (std::vector<ViewVertex * > *)new std::vector<ViewVertex * >(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_pop_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_pop_back",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_pop_back" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  {
+    try {
+      (arg1)->pop_back();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::size_type arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  size_t val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewVerticesContainer_resize",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_resize" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer_resize" "', argument " "2"" of type '" "std::vector<ViewVertex * >::size_type""'");
+  } 
+  arg2 = static_cast< std::vector<ViewVertex * >::size_type >(val2);
+  {
+    try {
+      (arg1)->resize(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::iterator arg2 ;
+  std::vector<ViewVertex * >::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  swig::PySwigIterator *iter2 = 0 ;
+  int res2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewVerticesContainer_erase",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_erase" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
+  if (!SWIG_IsOK(res2) || !iter2) {
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewVertex * >::iterator""'");
+  } else {
+    swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *>(iter2);
+    if (iter_t) {
+      arg2 = iter_t->get_current();
+    } else {
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewVertex * >::iterator""'");
+    }
+  }
+  {
+    try {
+      result = (arg1)->erase(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewVertex * >::iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::iterator arg2 ;
+  std::vector<ViewVertex * >::iterator arg3 ;
+  std::vector<ViewVertex * >::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  swig::PySwigIterator *iter2 = 0 ;
+  int res2 ;
+  swig::PySwigIterator *iter3 = 0 ;
+  int res3 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:ViewVerticesContainer_erase",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_erase" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
+  if (!SWIG_IsOK(res2) || !iter2) {
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewVertex * >::iterator""'");
+  } else {
+    swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *>(iter2);
+    if (iter_t) {
+      arg2 = iter_t->get_current();
+    } else {
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewVertex * >::iterator""'");
+    }
+  }
+  res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::PySwigIterator::descriptor(), 0);
+  if (!SWIG_IsOK(res3) || !iter3) {
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_erase" "', argument " "3"" of type '" "std::vector<ViewVertex * >::iterator""'");
+  } else {
+    swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *>(iter3);
+    if (iter_t) {
+      arg3 = iter_t->get_current();
+    } else {
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_erase" "', argument " "3"" of type '" "std::vector<ViewVertex * >::iterator""'");
+    }
+  }
+  {
+    try {
+      result = (arg1)->erase(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewVertex * >::iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_erase(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      swig::PySwigIterator *iter = 0;
+      int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *>(iter) != 0));
+      if (_v) {
+        return _wrap_ViewVerticesContainer_erase__SWIG_0(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      swig::PySwigIterator *iter = 0;
+      int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *>(iter) != 0));
+      if (_v) {
+        swig::PySwigIterator *iter = 0;
+        int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
+        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *>(iter) != 0));
+        if (_v) {
+          return _wrap_ViewVerticesContainer_erase__SWIG_1(self, args);
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVerticesContainer_erase'.\n  Possible C/C++ prototypes are:\n    erase(std::vector<ViewVertex * >::iterator)\n    erase(std::vector<ViewVertex * >::iterator,std::vector<ViewVertex * >::iterator)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewVertex * >::size_type arg1 ;
+  std::vector<ViewVertex * >::value_type arg2 = (std::vector<ViewVertex * >::value_type) 0 ;
+  std::vector<ViewVertex * > *result = 0 ;
+  size_t val1 ;
+  int ecode1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_ViewVerticesContainer",&obj0,&obj1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ViewVerticesContainer" "', argument " "1"" of type '" "std::vector<ViewVertex * >::size_type""'");
+  } 
+  arg1 = static_cast< std::vector<ViewVertex * >::size_type >(val1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ViewVerticesContainer" "', argument " "2"" of type '" "std::vector<ViewVertex * >::value_type""'"); 
+  }
+  arg2 = reinterpret_cast< std::vector<ViewVertex * >::value_type >(argp2);
+  {
+    try {
+      result = (std::vector<ViewVertex * > *)new std::vector<ViewVertex * >(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_ViewVerticesContainer__SWIG_0(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_size_t(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_ViewVerticesContainer__SWIG_2(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_new_ViewVerticesContainer__SWIG_1(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    {
+      int res = SWIG_AsVal_size_t(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_new_ViewVerticesContainer__SWIG_3(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewVerticesContainer'.\n  Possible C/C++ prototypes are:\n    std::vector<(p.ViewVertex)>()\n    std::vector<(p.ViewVertex)>(std::vector<ViewVertex * > const &)\n    std::vector<(p.ViewVertex)>(std::vector<ViewVertex * >::size_type)\n    std::vector<(p.ViewVertex)>(std::vector<ViewVertex * >::size_type,std::vector<ViewVertex * >::value_type)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_push_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::value_type arg2 = (std::vector<ViewVertex * >::value_type) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewVerticesContainer_push_back",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_push_back" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewVerticesContainer_push_back" "', argument " "2"" of type '" "std::vector<ViewVertex * >::value_type""'"); 
+  }
+  arg2 = reinterpret_cast< std::vector<ViewVertex * >::value_type >(argp2);
+  {
+    try {
+      (arg1)->push_back(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_front(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_front",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_front" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  {
+    try {
+      result = (std::vector<ViewVertex * >::value_type)((std::vector<ViewVertex * > const *)arg1)->front();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_back",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_back" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  {
+    try {
+      result = (std::vector<ViewVertex * >::value_type)((std::vector<ViewVertex * > const *)arg1)->back();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_assign(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::size_type arg2 ;
+  std::vector<ViewVertex * >::value_type arg3 = (std::vector<ViewVertex * >::value_type) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  size_t val2 ;
+  int ecode2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:ViewVerticesContainer_assign",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_assign" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer_assign" "', argument " "2"" of type '" "std::vector<ViewVertex * >::size_type""'");
+  } 
+  arg2 = static_cast< std::vector<ViewVertex * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewVerticesContainer_assign" "', argument " "3"" of type '" "std::vector<ViewVertex * >::value_type""'"); 
+  }
+  arg3 = reinterpret_cast< std::vector<ViewVertex * >::value_type >(argp3);
+  {
+    try {
+      (arg1)->assign(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::size_type arg2 ;
+  std::vector<ViewVertex * >::value_type arg3 = (std::vector<ViewVertex * >::value_type) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  size_t val2 ;
+  int ecode2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:ViewVerticesContainer_resize",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_resize" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer_resize" "', argument " "2"" of type '" "std::vector<ViewVertex * >::size_type""'");
+  } 
+  arg2 = static_cast< std::vector<ViewVertex * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewVerticesContainer_resize" "', argument " "3"" of type '" "std::vector<ViewVertex * >::value_type""'"); 
+  }
+  arg3 = reinterpret_cast< std::vector<ViewVertex * >::value_type >(argp3);
+  {
+    try {
+      (arg1)->resize(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_resize(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_size_t(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_ViewVerticesContainer_resize__SWIG_0(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_size_t(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          return _wrap_ViewVerticesContainer_resize__SWIG_1(self, args);
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVerticesContainer_resize'.\n  Possible C/C++ prototypes are:\n    resize(std::vector<ViewVertex * >::size_type)\n    resize(std::vector<ViewVertex * >::size_type,std::vector<ViewVertex * >::value_type)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::iterator arg2 ;
+  std::vector<ViewVertex * >::value_type arg3 = (std::vector<ViewVertex * >::value_type) 0 ;
+  std::vector<ViewVertex * >::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  swig::PySwigIterator *iter2 = 0 ;
+  int res2 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:ViewVerticesContainer_insert",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_insert" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
+  if (!SWIG_IsOK(res2) || !iter2) {
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewVertex * >::iterator""'");
+  } else {
+    swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *>(iter2);
+    if (iter_t) {
+      arg2 = iter_t->get_current();
+    } else {
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewVertex * >::iterator""'");
+    }
+  }
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewVerticesContainer_insert" "', argument " "3"" of type '" "std::vector<ViewVertex * >::value_type""'"); 
+  }
+  arg3 = reinterpret_cast< std::vector<ViewVertex * >::value_type >(argp3);
+  {
+    try {
+      result = (arg1)->insert(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewVertex * >::iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::iterator arg2 ;
+  std::vector<ViewVertex * >::size_type arg3 ;
+  std::vector<ViewVertex * >::value_type arg4 = (std::vector<ViewVertex * >::value_type) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  swig::PySwigIterator *iter2 = 0 ;
+  int res2 ;
+  size_t val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOO:ViewVerticesContainer_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_insert" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
+  if (!SWIG_IsOK(res2) || !iter2) {
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewVertex * >::iterator""'");
+  } else {
+    swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *>(iter2);
+    if (iter_t) {
+      arg2 = iter_t->get_current();
+    } else {
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewVertex * >::iterator""'");
+    }
+  }
+  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewVerticesContainer_insert" "', argument " "3"" of type '" "std::vector<ViewVertex * >::size_type""'");
+  } 
+  arg3 = static_cast< std::vector<ViewVertex * >::size_type >(val3);
+  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewVerticesContainer_insert" "', argument " "4"" of type '" "std::vector<ViewVertex * >::value_type""'"); 
+  }
+  arg4 = reinterpret_cast< std::vector<ViewVertex * >::value_type >(argp4);
+  {
+    try {
+      (arg1)->insert(arg2,arg3,arg4);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_insert(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[5];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 4); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 3) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      swig::PySwigIterator *iter = 0;
+      int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *>(iter) != 0));
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          return _wrap_ViewVerticesContainer_insert__SWIG_0(self, args);
+        }
+      }
+    }
+  }
+  if (argc == 4) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      swig::PySwigIterator *iter = 0;
+      int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *>(iter) != 0));
+      if (_v) {
+        {
+          int res = SWIG_AsVal_size_t(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            return _wrap_ViewVerticesContainer_insert__SWIG_1(self, args);
+          }
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVerticesContainer_insert'.\n  Possible C/C++ prototypes are:\n    insert(std::vector<ViewVertex * >::iterator,std::vector<ViewVertex * >::value_type)\n    insert(std::vector<ViewVertex * >::iterator,std::vector<ViewVertex * >::size_type,std::vector<ViewVertex * >::value_type)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_reserve(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::size_type arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  size_t val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewVerticesContainer_reserve",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_reserve" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer_reserve" "', argument " "2"" of type '" "std::vector<ViewVertex * >::size_type""'");
+  } 
+  arg2 = static_cast< std::vector<ViewVertex * >::size_type >(val2);
+  {
+    try {
+      (arg1)->reserve(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_capacity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::size_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_capacity",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_capacity" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<ViewVertex * > const *)arg1)->capacity();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_size_t(static_cast< size_t >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ViewVerticesContainer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_ViewVerticesContainer",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ViewVerticesContainer" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *ViewVerticesContainer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  PyObject **arg2 = (PyObject **) 0 ;
+  swig::PySwigIterator *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  arg2 = &obj0;
+  if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_iterator",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_iterator" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  {
+    try {
+      result = (swig::PySwigIterator *)std_vector_Sl_SVertex_Sm__Sg__iterator(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__PySwigIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer___nonzero__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer___nonzero__",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___nonzero__" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  {
+    try {
+      result = (bool)std_vector_Sl_SVertex_Sm__Sg____nonzero__((std::vector<SVertex * > const *)arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer___len__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::size_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer___len__",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___len__" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  {
+    try {
+      result = std_vector_Sl_SVertex_Sm__Sg____len__((std::vector<SVertex * > const *)arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_size_t(static_cast< size_t >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_pop",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_pop" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  {
+    try {
+      try {
+        result = (std::vector<SVertex * >::value_type)std_vector_Sl_SVertex_Sm__Sg__pop(arg1);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::difference_type arg2 ;
+  std::vector<SVertex * >::difference_type arg3 ;
+  std::vector<SVertex *,std::allocator<SVertex * > > *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  ptrdiff_t val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:SVerticesContainer___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___getslice__" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer___getslice__" "', argument " "2"" of type '" "std::vector<SVertex * >::difference_type""'");
+  } 
+  arg2 = static_cast< std::vector<SVertex * >::difference_type >(val2);
+  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SVerticesContainer___getslice__" "', argument " "3"" of type '" "std::vector<SVertex * >::difference_type""'");
+  } 
+  arg3 = static_cast< std::vector<SVertex * >::difference_type >(val3);
+  {
+    try {
+      try {
+        result = (std::vector<SVertex *,std::allocator<SVertex * > > *)std_vector_Sl_SVertex_Sm__Sg____getslice__(arg1,arg2,arg3);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer___setslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::difference_type arg2 ;
+  std::vector<SVertex * >::difference_type arg3 ;
+  std::vector<SVertex *,std::allocator<SVertex * > > *arg4 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  ptrdiff_t val3 ;
+  int ecode3 = 0 ;
+  int res4 = SWIG_OLDOBJ ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOO:SVerticesContainer___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___setslice__" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer___setslice__" "', argument " "2"" of type '" "std::vector<SVertex * >::difference_type""'");
+  } 
+  arg2 = static_cast< std::vector<SVertex * >::difference_type >(val2);
+  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SVerticesContainer___setslice__" "', argument " "3"" of type '" "std::vector<SVertex * >::difference_type""'");
+  } 
+  arg3 = static_cast< std::vector<SVertex * >::difference_type >(val3);
+  {
+    std::vector<SVertex*,std::allocator<SVertex * > > *ptr = (std::vector<SVertex*,std::allocator<SVertex * > > *)0;
+    res4 = swig::asptr(obj3, &ptr);
+    if (!SWIG_IsOK(res4)) {
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "SVerticesContainer___setslice__" "', argument " "4"" of type '" "std::vector<SVertex *,std::allocator<SVertex * > > const &""'"); 
+    }
+    if (!ptr) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SVerticesContainer___setslice__" "', argument " "4"" of type '" "std::vector<SVertex *,std::allocator<SVertex * > > const &""'"); 
+    }
+    arg4 = ptr;
+  }
+  {
+    try {
+      try {
+        std_vector_Sl_SVertex_Sm__Sg____setslice__(arg1,arg2,arg3,(std::vector<SVertex *,std::allocator<SVertex * > > const &)*arg4);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+      }
+      catch(std::invalid_argument &_e) {
+        SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  if (SWIG_IsNewObj(res4)) delete arg4;
+  return resultobj;
+fail:
+  if (SWIG_IsNewObj(res4)) delete arg4;
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer___delslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::difference_type arg2 ;
+  std::vector<SVertex * >::difference_type arg3 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  ptrdiff_t val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:SVerticesContainer___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___delslice__" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer___delslice__" "', argument " "2"" of type '" "std::vector<SVertex * >::difference_type""'");
+  } 
+  arg2 = static_cast< std::vector<SVertex * >::difference_type >(val2);
+  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SVerticesContainer___delslice__" "', argument " "3"" of type '" "std::vector<SVertex * >::difference_type""'");
+  } 
+  arg3 = static_cast< std::vector<SVertex * >::difference_type >(val3);
+  {
+    try {
+      try {
+        std_vector_Sl_SVertex_Sm__Sg____delslice__(arg1,arg2,arg3);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer___delitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::difference_type arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:SVerticesContainer___delitem__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___delitem__" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer___delitem__" "', argument " "2"" of type '" "std::vector<SVertex * >::difference_type""'");
+  } 
+  arg2 = static_cast< std::vector<SVertex * >::difference_type >(val2);
+  {
+    try {
+      try {
+        std_vector_Sl_SVertex_Sm__Sg____delitem__(arg1,arg2);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer___getitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::difference_type arg2 ;
+  std::vector<SVertex * >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:SVerticesContainer___getitem__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___getitem__" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer___getitem__" "', argument " "2"" of type '" "std::vector<SVertex * >::difference_type""'");
+  } 
+  arg2 = static_cast< std::vector<SVertex * >::difference_type >(val2);
+  {
+    try {
+      try {
+        result = (std::vector<SVertex * >::value_type)std_vector_Sl_SVertex_Sm__Sg____getitem__(arg1,arg2);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer___setitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::difference_type arg2 ;
+  std::vector<SVertex * >::value_type arg3 = (std::vector<SVertex * >::value_type) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:SVerticesContainer___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___setitem__" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer___setitem__" "', argument " "2"" of type '" "std::vector<SVertex * >::difference_type""'");
+  } 
+  arg2 = static_cast< std::vector<SVertex * >::difference_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SVerticesContainer___setitem__" "', argument " "3"" of type '" "std::vector<SVertex * >::value_type""'"); 
+  }
+  arg3 = reinterpret_cast< std::vector<SVertex * >::value_type >(argp3);
+  {
+    try {
+      try {
+        std_vector_Sl_SVertex_Sm__Sg____setitem__(arg1,arg2,arg3);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::value_type arg2 = (std::vector<SVertex * >::value_type) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:SVerticesContainer_append",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_append" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVerticesContainer_append" "', argument " "2"" of type '" "std::vector<SVertex * >::value_type""'"); 
+  }
+  arg2 = reinterpret_cast< std::vector<SVertex * >::value_type >(argp2);
+  {
+    try {
+      std_vector_Sl_SVertex_Sm__Sg__append(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_SVerticesContainer__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<SVertex * > *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_SVerticesContainer")) SWIG_fail;
+  {
+    try {
+      result = (std::vector<SVertex * > *)new std::vector<SVertex * >();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_SVerticesContainer__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<SVertex * > *arg1 = 0 ;
+  std::vector<SVertex * > *result = 0 ;
+  int res1 = SWIG_OLDOBJ ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_SVerticesContainer",&obj0)) SWIG_fail;
+  {
+    std::vector<SVertex*,std::allocator<SVertex * > > *ptr = (std::vector<SVertex*,std::allocator<SVertex * > > *)0;
+    res1 = swig::asptr(obj0, &ptr);
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_SVerticesContainer" "', argument " "1"" of type '" "std::vector<SVertex * > const &""'"); 
+    }
+    if (!ptr) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_SVerticesContainer" "', argument " "1"" of type '" "std::vector<SVertex * > const &""'"); 
+    }
+    arg1 = ptr;
+  }
+  {
+    try {
+      result = (std::vector<SVertex * > *)new std::vector<SVertex * >((std::vector<SVertex * > const &)*arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, SWIG_POINTER_NEW |  0 );
+  if (SWIG_IsNewObj(res1)) delete arg1;
+  return resultobj;
+fail:
+  if (SWIG_IsNewObj(res1)) delete arg1;
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_empty",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_empty" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  {
+    try {
+      result = (bool)((std::vector<SVertex * > const *)arg1)->empty();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::size_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_size",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_size" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<SVertex * > const *)arg1)->size();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_size_t(static_cast< size_t >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_clear",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_clear" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  {
+    try {
+      (arg1)->clear();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * > *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:SVerticesContainer_swap",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_swap" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVerticesContainer_swap" "', argument " "2"" of type '" "std::vector<SVertex * > &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SVerticesContainer_swap" "', argument " "2"" of type '" "std::vector<SVertex * > &""'"); 
+  }
+  arg2 = reinterpret_cast< std::vector<SVertex * > * >(argp2);
+  {
+    try {
+      (arg1)->swap(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  SwigValueWrapper<std::allocator<SVertex * > > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_get_allocator",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_get_allocator" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<SVertex * > const *)arg1)->get_allocator();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new std::vector<SVertex * >::allocator_type(static_cast< const std::vector<SVertex * >::allocator_type& >(result))), SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer_begin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_begin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_begin" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  {
+    try {
+      result = (arg1)->begin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<SVertex * >::iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer_begin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_begin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_begin" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<SVertex * > const *)arg1)->begin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<SVertex * >::const_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer_begin(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_SVerticesContainer_begin__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_SVerticesContainer_begin__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SVerticesContainer_begin'.\n  Possible C/C++ prototypes are:\n    begin()\n    begin()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_end",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_end" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  {
+    try {
+      result = (arg1)->end();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<SVertex * >::iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_end",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_end" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<SVertex * > const *)arg1)->end();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<SVertex * >::const_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer_end(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_SVerticesContainer_end__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_SVerticesContainer_end__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SVerticesContainer_end'.\n  Possible C/C++ prototypes are:\n    end()\n    end()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer_rbegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::reverse_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_rbegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_rbegin" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  {
+    try {
+      result = (arg1)->rbegin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<SVertex * >::reverse_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer_rbegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::const_reverse_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_rbegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_rbegin" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<SVertex * > const *)arg1)->rbegin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<SVertex * >::const_reverse_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer_rbegin(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_SVerticesContainer_rbegin__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_SVerticesContainer_rbegin__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SVerticesContainer_rbegin'.\n  Possible C/C++ prototypes are:\n    rbegin()\n    rbegin()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer_rend__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::reverse_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_rend",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_rend" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  {
+    try {
+      result = (arg1)->rend();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<SVertex * >::reverse_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer_rend__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::const_reverse_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_rend",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_rend" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<SVertex * > const *)arg1)->rend();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<SVertex * >::const_reverse_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer_rend(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_SVerticesContainer_rend__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_SVerticesContainer_rend__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SVerticesContainer_rend'.\n  Possible C/C++ prototypes are:\n    rend()\n    rend()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_SVerticesContainer__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<SVertex * >::size_type arg1 ;
+  std::vector<SVertex * > *result = 0 ;
+  size_t val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_SVerticesContainer",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_SVerticesContainer" "', argument " "1"" of type '" "std::vector<SVertex * >::size_type""'");
+  } 
+  arg1 = static_cast< std::vector<SVertex * >::size_type >(val1);
+  {
+    try {
+      result = (std::vector<SVertex * > *)new std::vector<SVertex * >(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer_pop_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_pop_back",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_pop_back" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  {
+    try {
+      (arg1)->pop_back();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::size_type arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  size_t val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:SVerticesContainer_resize",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_resize" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer_resize" "', argument " "2"" of type '" "std::vector<SVertex * >::size_type""'");
+  } 
+  arg2 = static_cast< std::vector<SVertex * >::size_type >(val2);
+  {
+    try {
+      (arg1)->resize(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::iterator arg2 ;
+  std::vector<SVertex * >::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  swig::PySwigIterator *iter2 = 0 ;
+  int res2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:SVerticesContainer_erase",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_erase" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
+  if (!SWIG_IsOK(res2) || !iter2) {
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_erase" "', argument " "2"" of type '" "std::vector<SVertex * >::iterator""'");
+  } else {
+    swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *>(iter2);
+    if (iter_t) {
+      arg2 = iter_t->get_current();
+    } else {
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_erase" "', argument " "2"" of type '" "std::vector<SVertex * >::iterator""'");
+    }
+  }
+  {
+    try {
+      result = (arg1)->erase(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<SVertex * >::iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::iterator arg2 ;
+  std::vector<SVertex * >::iterator arg3 ;
+  std::vector<SVertex * >::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  swig::PySwigIterator *iter2 = 0 ;
+  int res2 ;
+  swig::PySwigIterator *iter3 = 0 ;
+  int res3 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:SVerticesContainer_erase",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_erase" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
+  if (!SWIG_IsOK(res2) || !iter2) {
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_erase" "', argument " "2"" of type '" "std::vector<SVertex * >::iterator""'");
+  } else {
+    swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *>(iter2);
+    if (iter_t) {
+      arg2 = iter_t->get_current();
+    } else {
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_erase" "', argument " "2"" of type '" "std::vector<SVertex * >::iterator""'");
+    }
+  }
+  res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::PySwigIterator::descriptor(), 0);
+  if (!SWIG_IsOK(res3) || !iter3) {
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_erase" "', argument " "3"" of type '" "std::vector<SVertex * >::iterator""'");
+  } else {
+    swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *>(iter3);
+    if (iter_t) {
+      arg3 = iter_t->get_current();
+    } else {
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_erase" "', argument " "3"" of type '" "std::vector<SVertex * >::iterator""'");
+    }
+  }
+  {
+    try {
+      result = (arg1)->erase(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<SVertex * >::iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer_erase(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      swig::PySwigIterator *iter = 0;
+      int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *>(iter) != 0));
+      if (_v) {
+        return _wrap_SVerticesContainer_erase__SWIG_0(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      swig::PySwigIterator *iter = 0;
+      int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *>(iter) != 0));
+      if (_v) {
+        swig::PySwigIterator *iter = 0;
+        int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
+        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *>(iter) != 0));
+        if (_v) {
+          return _wrap_SVerticesContainer_erase__SWIG_1(self, args);
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SVerticesContainer_erase'.\n  Possible C/C++ prototypes are:\n    erase(std::vector<SVertex * >::iterator)\n    erase(std::vector<SVertex * >::iterator,std::vector<SVertex * >::iterator)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_SVerticesContainer__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<SVertex * >::size_type arg1 ;
+  std::vector<SVertex * >::value_type arg2 = (std::vector<SVertex * >::value_type) 0 ;
+  std::vector<SVertex * > *result = 0 ;
+  size_t val1 ;
+  int ecode1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_SVerticesContainer",&obj0,&obj1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_SVerticesContainer" "', argument " "1"" of type '" "std::vector<SVertex * >::size_type""'");
+  } 
+  arg1 = static_cast< std::vector<SVertex * >::size_type >(val1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_SVerticesContainer" "', argument " "2"" of type '" "std::vector<SVertex * >::value_type""'"); 
+  }
+  arg2 = reinterpret_cast< std::vector<SVertex * >::value_type >(argp2);
+  {
+    try {
+      result = (std::vector<SVertex * > *)new std::vector<SVertex * >(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_SVerticesContainer(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_SVerticesContainer__SWIG_0(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_size_t(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_SVerticesContainer__SWIG_2(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_new_SVerticesContainer__SWIG_1(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    {
+      int res = SWIG_AsVal_size_t(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_new_SVerticesContainer__SWIG_3(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_SVerticesContainer'.\n  Possible C/C++ prototypes are:\n    std::vector<(p.SVertex)>()\n    std::vector<(p.SVertex)>(std::vector<SVertex * > const &)\n    std::vector<(p.SVertex)>(std::vector<SVertex * >::size_type)\n    std::vector<(p.SVertex)>(std::vector<SVertex * >::size_type,std::vector<SVertex * >::value_type)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer_push_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::value_type arg2 = (std::vector<SVertex * >::value_type) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:SVerticesContainer_push_back",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_push_back" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVerticesContainer_push_back" "', argument " "2"" of type '" "std::vector<SVertex * >::value_type""'"); 
+  }
+  arg2 = reinterpret_cast< std::vector<SVertex * >::value_type >(argp2);
+  {
+    try {
+      (arg1)->push_back(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer_front(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_front",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_front" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  {
+    try {
+      result = (std::vector<SVertex * >::value_type)((std::vector<SVertex * > const *)arg1)->front();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_back",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_back" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  {
+    try {
+      result = (std::vector<SVertex * >::value_type)((std::vector<SVertex * > const *)arg1)->back();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer_assign(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::size_type arg2 ;
+  std::vector<SVertex * >::value_type arg3 = (std::vector<SVertex * >::value_type) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  size_t val2 ;
+  int ecode2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:SVerticesContainer_assign",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_assign" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer_assign" "', argument " "2"" of type '" "std::vector<SVertex * >::size_type""'");
+  } 
+  arg2 = static_cast< std::vector<SVertex * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SVerticesContainer_assign" "', argument " "3"" of type '" "std::vector<SVertex * >::value_type""'"); 
+  }
+  arg3 = reinterpret_cast< std::vector<SVertex * >::value_type >(argp3);
+  {
+    try {
+      (arg1)->assign(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::size_type arg2 ;
+  std::vector<SVertex * >::value_type arg3 = (std::vector<SVertex * >::value_type) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  size_t val2 ;
+  int ecode2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:SVerticesContainer_resize",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_resize" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer_resize" "', argument " "2"" of type '" "std::vector<SVertex * >::size_type""'");
+  } 
+  arg2 = static_cast< std::vector<SVertex * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SVerticesContainer_resize" "', argument " "3"" of type '" "std::vector<SVertex * >::value_type""'"); 
+  }
+  arg3 = reinterpret_cast< std::vector<SVertex * >::value_type >(argp3);
+  {
+    try {
+      (arg1)->resize(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer_resize(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_size_t(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_SVerticesContainer_resize__SWIG_0(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_size_t(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          return _wrap_SVerticesContainer_resize__SWIG_1(self, args);
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SVerticesContainer_resize'.\n  Possible C/C++ prototypes are:\n    resize(std::vector<SVertex * >::size_type)\n    resize(std::vector<SVertex * >::size_type,std::vector<SVertex * >::value_type)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::iterator arg2 ;
+  std::vector<SVertex * >::value_type arg3 = (std::vector<SVertex * >::value_type) 0 ;
+  std::vector<SVertex * >::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  swig::PySwigIterator *iter2 = 0 ;
+  int res2 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:SVerticesContainer_insert",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_insert" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
+  if (!SWIG_IsOK(res2) || !iter2) {
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_insert" "', argument " "2"" of type '" "std::vector<SVertex * >::iterator""'");
+  } else {
+    swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *>(iter2);
+    if (iter_t) {
+      arg2 = iter_t->get_current();
+    } else {
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_insert" "', argument " "2"" of type '" "std::vector<SVertex * >::iterator""'");
+    }
+  }
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SVerticesContainer_insert" "', argument " "3"" of type '" "std::vector<SVertex * >::value_type""'"); 
+  }
+  arg3 = reinterpret_cast< std::vector<SVertex * >::value_type >(argp3);
+  {
+    try {
+      result = (arg1)->insert(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<SVertex * >::iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::iterator arg2 ;
+  std::vector<SVertex * >::size_type arg3 ;
+  std::vector<SVertex * >::value_type arg4 = (std::vector<SVertex * >::value_type) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  swig::PySwigIterator *iter2 = 0 ;
+  int res2 ;
+  size_t val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOO:SVerticesContainer_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_insert" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
+  if (!SWIG_IsOK(res2) || !iter2) {
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_insert" "', argument " "2"" of type '" "std::vector<SVertex * >::iterator""'");
+  } else {
+    swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *>(iter2);
+    if (iter_t) {
+      arg2 = iter_t->get_current();
+    } else {
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_insert" "', argument " "2"" of type '" "std::vector<SVertex * >::iterator""'");
+    }
+  }
+  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SVerticesContainer_insert" "', argument " "3"" of type '" "std::vector<SVertex * >::size_type""'");
+  } 
+  arg3 = static_cast< std::vector<SVertex * >::size_type >(val3);
+  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "SVerticesContainer_insert" "', argument " "4"" of type '" "std::vector<SVertex * >::value_type""'"); 
+  }
+  arg4 = reinterpret_cast< std::vector<SVertex * >::value_type >(argp4);
+  {
+    try {
+      (arg1)->insert(arg2,arg3,arg4);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer_insert(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[5];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 4); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 3) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      swig::PySwigIterator *iter = 0;
+      int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *>(iter) != 0));
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          return _wrap_SVerticesContainer_insert__SWIG_0(self, args);
+        }
+      }
+    }
+  }
+  if (argc == 4) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      swig::PySwigIterator *iter = 0;
+      int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *>(iter) != 0));
+      if (_v) {
+        {
+          int res = SWIG_AsVal_size_t(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            return _wrap_SVerticesContainer_insert__SWIG_1(self, args);
+          }
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SVerticesContainer_insert'.\n  Possible C/C++ prototypes are:\n    insert(std::vector<SVertex * >::iterator,std::vector<SVertex * >::value_type)\n    insert(std::vector<SVertex * >::iterator,std::vector<SVertex * >::size_type,std::vector<SVertex * >::value_type)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer_reserve(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::size_type arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  size_t val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:SVerticesContainer_reserve",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_reserve" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer_reserve" "', argument " "2"" of type '" "std::vector<SVertex * >::size_type""'");
+  } 
+  arg2 = static_cast< std::vector<SVertex * >::size_type >(val2);
+  {
+    try {
+      (arg1)->reserve(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer_capacity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::size_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_capacity",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_capacity" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<SVertex * > const *)arg1)->capacity();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_size_t(static_cast< size_t >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_SVerticesContainer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_SVerticesContainer",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_SVerticesContainer" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *SVerticesContainer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_ViewMap_userdata_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewMap *arg1 = (ViewMap *) 0 ;
+  void *arg2 = (void *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewMap_userdata_set",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewMap, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewMap_userdata_set" "', argument " "1"" of type '" "ViewMap *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewMap * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2), 0, SWIG_POINTER_DISOWN);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewMap_userdata_set" "', argument " "2"" of type '" "void *""'"); 
+  }
+  if (arg1) (arg1)->userdata = arg2;
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMap_userdata_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewMap *arg1 = (ViewMap *) 0 ;
+  void *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewMap_userdata_get",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewMap, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewMap_userdata_get" "', argument " "1"" of type '" "ViewMap *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewMap * >(argp1);
+  result = (void *) ((arg1)->userdata);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewMap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewMap *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_ViewMap")) SWIG_fail;
+  {
+    try {
+      result = (ViewMap *)new ViewMap();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewMap, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ViewMap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewMap *arg1 = (ViewMap *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_ViewMap",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewMap, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ViewMap" "', argument " "1"" of type '" "ViewMap *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewMap * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMap_GetClosestViewEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewMap *arg1 = (ViewMap *) 0 ;
+  real arg2 ;
+  real arg3 ;
+  ViewEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  double val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:ViewMap_GetClosestViewEdge",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewMap, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewMap_GetClosestViewEdge" "', argument " "1"" of type '" "ViewMap const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewMap * >(argp1);
+  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewMap_GetClosestViewEdge" "', argument " "2"" of type '" "real""'");
+  } 
+  arg2 = static_cast< real >(val2);
+  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewMap_GetClosestViewEdge" "', argument " "3"" of type '" "real""'");
+  } 
+  arg3 = static_cast< real >(val3);
+  {
+    try {
+      result = (ViewEdge *)((ViewMap const *)arg1)->GetClosestViewEdge(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewEdge, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMap_GetClosestFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewMap *arg1 = (ViewMap *) 0 ;
+  real arg2 ;
+  real arg3 ;
+  FEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  double val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:ViewMap_GetClosestFEdge",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewMap, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewMap_GetClosestFEdge" "', argument " "1"" of type '" "ViewMap const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewMap * >(argp1);
+  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewMap_GetClosestFEdge" "', argument " "2"" of type '" "real""'");
+  } 
+  arg2 = static_cast< real >(val2);
+  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewMap_GetClosestFEdge" "', argument " "3"" of type '" "real""'");
+  } 
+  arg3 = static_cast< real >(val3);
+  {
+    try {
+      result = (FEdge *)((ViewMap const *)arg1)->GetClosestFEdge(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FEdge, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMap_getInstance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewMap *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":ViewMap_getInstance")) SWIG_fail;
+  {
+    try {
+      result = (ViewMap *)ViewMap::getInstance();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewMap, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMap_ViewShapes(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewMap *arg1 = (ViewMap *) 0 ;
+  ViewMap::viewshapes_container *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewMap_ViewShapes",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewMap, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewMap_ViewShapes" "', argument " "1"" of type '" "ViewMap *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewMap * >(argp1);
+  {
+    try {
+      {
+        ViewMap::viewshapes_container &_result_ref = (arg1)->ViewShapes();
+        result = (ViewMap::viewshapes_container *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMap_ViewEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewMap *arg1 = (ViewMap *) 0 ;
+  ViewMap::viewedges_container *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewMap_ViewEdges",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewMap, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewMap_ViewEdges" "', argument " "1"" of type '" "ViewMap *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewMap * >(argp1);
+  {
+    try {
+      {
+        ViewMap::viewedges_container &_result_ref = (arg1)->ViewEdges();
+        result = (ViewMap::viewedges_container *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMap_ViewVertices(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewMap *arg1 = (ViewMap *) 0 ;
+  ViewMap::viewvertices_container *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewMap_ViewVertices",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewMap, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewMap_ViewVertices" "', argument " "1"" of type '" "ViewMap *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewMap * >(argp1);
+  {
+    try {
+      {
+        ViewMap::viewvertices_container &_result_ref = (arg1)->ViewVertices();
+        result = (ViewMap::viewvertices_container *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMap_FEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewMap *arg1 = (ViewMap *) 0 ;
+  ViewMap::fedges_container *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewMap_FEdges",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewMap, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewMap_FEdges" "', argument " "1"" of type '" "ViewMap *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewMap * >(argp1);
+  {
+    try {
+      {
+        ViewMap::fedges_container &_result_ref = (arg1)->FEdges();
+        result = (ViewMap::fedges_container *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMap_SVertices(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewMap *arg1 = (ViewMap *) 0 ;
+  ViewMap::svertices_container *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewMap_SVertices",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewMap, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewMap_SVertices" "', argument " "1"" of type '" "ViewMap *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewMap * >(argp1);
+  {
+    try {
+      {
+        ViewMap::svertices_container &_result_ref = (arg1)->SVertices();
+        result = (ViewMap::svertices_container *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMap_viewedges_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewMap *arg1 = (ViewMap *) 0 ;
+  ViewMap::viewedges_container::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewMap_viewedges_begin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewMap, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewMap_viewedges_begin" "', argument " "1"" of type '" "ViewMap *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewMap * >(argp1);
+  {
+    try {
+      result = (arg1)->viewedges_begin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const ViewMap::viewedges_container::iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMap_viewedges_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewMap *arg1 = (ViewMap *) 0 ;
+  ViewMap::viewedges_container::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewMap_viewedges_end",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewMap, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewMap_viewedges_end" "', argument " "1"" of type '" "ViewMap *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewMap * >(argp1);
+  {
+    try {
+      result = (arg1)->viewedges_end();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const ViewMap::viewedges_container::iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMap_viewedges_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewMap *arg1 = (ViewMap *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewMap_viewedges_size",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewMap, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewMap_viewedges_size" "', argument " "1"" of type '" "ViewMap *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewMap * >(argp1);
+  {
+    try {
+      result = (int)(arg1)->viewedges_size();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMap_viewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewMap *arg1 = (ViewMap *) 0 ;
+  unsigned int arg2 ;
+  ViewShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewMap_viewShape",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewMap, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewMap_viewShape" "', argument " "1"" of type '" "ViewMap *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewMap * >(argp1);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewMap_viewShape" "', argument " "2"" of type '" "unsigned int""'");
+  } 
+  arg2 = static_cast< unsigned int >(val2);
+  {
+    try {
+      result = (ViewShape *)(arg1)->viewShape(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewShape, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMap_getScene3dBBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewMap *arg1 = (ViewMap *) 0 ;
+  SwigValueWrapper<BBox<VecMat::Vec3<double > > > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewMap_getScene3dBBox",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewMap, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewMap_getScene3dBBox" "', argument " "1"" of type '" "ViewMap const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewMap * >(argp1);
+  {
+    try {
+      result = ((ViewMap const *)arg1)->getScene3dBBox();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new BBox<Geometry::Vec3r >(static_cast< const BBox<Geometry::Vec3r >& >(result))), SWIGTYPE_p_BBoxTVecMat__Vec3Tdouble_t_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMap_AddViewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewMap *arg1 = (ViewMap *) 0 ;
+  ViewShape *arg2 = (ViewShape *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewMap_AddViewShape",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewMap, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewMap_AddViewShape" "', argument " "1"" of type '" "ViewMap *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewMap * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewShape, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewMap_AddViewShape" "', argument " "2"" of type '" "ViewShape *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewShape * >(argp2);
+  {
+    try {
+      (arg1)->AddViewShape(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMap_AddViewEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewMap *arg1 = (ViewMap *) 0 ;
+  ViewEdge *arg2 = (ViewEdge *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewMap_AddViewEdge",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewMap, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewMap_AddViewEdge" "', argument " "1"" of type '" "ViewMap *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewMap * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewMap_AddViewEdge" "', argument " "2"" of type '" "ViewEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewEdge * >(argp2);
+  {
+    try {
+      (arg1)->AddViewEdge(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMap_AddViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewMap *arg1 = (ViewMap *) 0 ;
+  ViewVertex *arg2 = (ViewVertex *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewMap_AddViewVertex",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewMap, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewMap_AddViewVertex" "', argument " "1"" of type '" "ViewMap *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewMap * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewVertex, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewMap_AddViewVertex" "', argument " "2"" of type '" "ViewVertex *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewVertex * >(argp2);
+  {
+    try {
+      (arg1)->AddViewVertex(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMap_AddFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewMap *arg1 = (ViewMap *) 0 ;
+  FEdge *arg2 = (FEdge *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewMap_AddFEdge",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewMap, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewMap_AddFEdge" "', argument " "1"" of type '" "ViewMap *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewMap * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewMap_AddFEdge" "', argument " "2"" of type '" "FEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< FEdge * >(argp2);
+  {
+    try {
+      (arg1)->AddFEdge(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMap_AddSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewMap *arg1 = (ViewMap *) 0 ;
+  SVertex *arg2 = (SVertex *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewMap_AddSVertex",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewMap, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewMap_AddSVertex" "', argument " "1"" of type '" "ViewMap *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewMap * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewMap_AddSVertex" "', argument " "2"" of type '" "SVertex *""'"); 
+  }
+  arg2 = reinterpret_cast< SVertex * >(argp2);
+  {
+    try {
+      (arg1)->AddSVertex(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMap_setScene3dBBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewMap *arg1 = (ViewMap *) 0 ;
+  BBox<Geometry::Vec3r > *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewMap_setScene3dBBox",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewMap, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewMap_setScene3dBBox" "', argument " "1"" of type '" "ViewMap *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewMap * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BBoxTVecMat__Vec3Tdouble_t_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewMap_setScene3dBBox" "', argument " "2"" of type '" "BBox<Geometry::Vec3r > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewMap_setScene3dBBox" "', argument " "2"" of type '" "BBox<Geometry::Vec3r > const &""'"); 
+  }
+  arg2 = reinterpret_cast< BBox<Geometry::Vec3r > * >(argp2);
+  {
+    try {
+      (arg1)->setScene3dBBox((BBox<Geometry::Vec3r > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMap_CreateTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewMap *arg1 = (ViewMap *) 0 ;
+  Geometry::Vec3r *arg2 = 0 ;
+  Geometry::Vec3r *arg3 = 0 ;
+  FEdge *arg4 = (FEdge *) 0 ;
+  Geometry::Vec3r *arg5 = 0 ;
+  Geometry::Vec3r *arg6 = 0 ;
+  FEdge *arg7 = (FEdge *) 0 ;
+  Id *arg8 = 0 ;
+  TVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
+  void *argp7 = 0 ;
+  int res7 = 0 ;
+  void *argp8 = 0 ;
+  int res8 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
+  PyObject * obj6 = 0 ;
+  PyObject * obj7 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOOOOOO:ViewMap_CreateTVertex",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewMap, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewMap_CreateTVertex" "', argument " "1"" of type '" "ViewMap *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewMap * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewMap_CreateTVertex" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewMap_CreateTVertex" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+  }
+  arg2 = reinterpret_cast< Geometry::Vec3r * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewMap_CreateTVertex" "', argument " "3"" of type '" "Geometry::Vec3r const &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewMap_CreateTVertex" "', argument " "3"" of type '" "Geometry::Vec3r const &""'"); 
+  }
+  arg3 = reinterpret_cast< Geometry::Vec3r * >(argp3);
+  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewMap_CreateTVertex" "', argument " "4"" of type '" "FEdge *""'"); 
+  }
+  arg4 = reinterpret_cast< FEdge * >(argp4);
+  res5 = SWIG_ConvertPtr(obj4, &argp5, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "ViewMap_CreateTVertex" "', argument " "5"" of type '" "Geometry::Vec3r const &""'"); 
+  }
+  if (!argp5) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewMap_CreateTVertex" "', argument " "5"" of type '" "Geometry::Vec3r const &""'"); 
+  }
+  arg5 = reinterpret_cast< Geometry::Vec3r * >(argp5);
+  res6 = SWIG_ConvertPtr(obj5, &argp6, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "ViewMap_CreateTVertex" "', argument " "6"" of type '" "Geometry::Vec3r const &""'"); 
+  }
+  if (!argp6) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewMap_CreateTVertex" "', argument " "6"" of type '" "Geometry::Vec3r const &""'"); 
+  }
+  arg6 = reinterpret_cast< Geometry::Vec3r * >(argp6);
+  res7 = SWIG_ConvertPtr(obj6, &argp7,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res7)) {
+    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "ViewMap_CreateTVertex" "', argument " "7"" of type '" "FEdge *""'"); 
+  }
+  arg7 = reinterpret_cast< FEdge * >(argp7);
+  res8 = SWIG_ConvertPtr(obj7, &argp8, SWIGTYPE_p_Id,  0  | 0);
+  if (!SWIG_IsOK(res8)) {
+    SWIG_exception_fail(SWIG_ArgError(res8), "in method '" "ViewMap_CreateTVertex" "', argument " "8"" of type '" "Id const &""'"); 
+  }
+  if (!argp8) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewMap_CreateTVertex" "', argument " "8"" of type '" "Id const &""'"); 
+  }
+  arg8 = reinterpret_cast< Id * >(argp8);
+  {
+    try {
+      result = (TVertex *)(arg1)->CreateTVertex((Geometry::Vec3r const &)*arg2,(Geometry::Vec3r const &)*arg3,arg4,(Geometry::Vec3r const &)*arg5,(Geometry::Vec3r const &)*arg6,arg7,(Id const &)*arg8);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_TVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMap_InsertViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewMap *arg1 = (ViewMap *) 0 ;
+  SVertex *arg2 = (SVertex *) 0 ;
+  std::vector<ViewEdge * > *arg3 = 0 ;
+  ViewVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:ViewMap_InsertViewVertex",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewMap, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewMap_InsertViewVertex" "', argument " "1"" of type '" "ViewMap *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewMap * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewMap_InsertViewVertex" "', argument " "2"" of type '" "SVertex *""'"); 
+  }
+  arg2 = reinterpret_cast< SVertex * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t,  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewMap_InsertViewVertex" "', argument " "3"" of type '" "std::vector<ViewEdge * > &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewMap_InsertViewVertex" "', argument " "3"" of type '" "std::vector<ViewEdge * > &""'"); 
+  }
+  arg3 = reinterpret_cast< std::vector<ViewEdge * > * >(argp3);
+  {
+    try {
+      result = (ViewVertex *)(arg1)->InsertViewVertex(arg2,*arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *ViewMap_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_ViewMap, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_ViewVertex_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewVertex *arg1 = (ViewVertex *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewVertex_getExactTypeName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVertex_getExactTypeName" "', argument " "1"" of type '" "ViewVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewVertex * >(argp1);
+  {
+    try {
+      result = ((ViewVertex const *)arg1)->getExactTypeName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVertex_userdata_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewVertex *arg1 = (ViewVertex *) 0 ;
+  void *arg2 = (void *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewVertex_userdata_set",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVertex_userdata_set" "', argument " "1"" of type '" "ViewVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2), 0, SWIG_POINTER_DISOWN);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewVertex_userdata_set" "', argument " "2"" of type '" "void *""'"); 
+  }
+  if (arg1) (arg1)->userdata = arg2;
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVertex_userdata_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewVertex *arg1 = (ViewVertex *) 0 ;
+  void *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewVertex_userdata_get",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVertex_userdata_get" "', argument " "1"" of type '" "ViewVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewVertex * >(argp1);
+  result = (void *) ((arg1)->userdata);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewVertex *arg1 = (ViewVertex *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_ViewVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewVertex, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ViewVertex" "', argument " "1"" of type '" "ViewVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewVertex * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVertex_getNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewVertex *arg1 = (ViewVertex *) 0 ;
+  Nature::VertexNature result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewVertex_getNature",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVertex_getNature" "', argument " "1"" of type '" "ViewVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewVertex * >(argp1);
+  {
+    try {
+      result = (Nature::VertexNature)((ViewVertex const *)arg1)->getNature();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVertex_setNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewVertex *arg1 = (ViewVertex *) 0 ;
+  Nature::VertexNature arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned short val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewVertex_setNature",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVertex_setNature" "', argument " "1"" of type '" "ViewVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewVertex * >(argp1);
+  ecode2 = SWIG_AsVal_unsigned_SS_short(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVertex_setNature" "', argument " "2"" of type '" "Nature::VertexNature""'");
+  } 
+  arg2 = static_cast< Nature::VertexNature >(val2);
+  {
+    try {
+      (arg1)->setNature(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVertex_Replace(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewVertex *arg1 = (ViewVertex *) 0 ;
+  ViewEdge *arg2 = (ViewEdge *) 0 ;
+  ViewEdge *arg3 = (ViewEdge *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:ViewVertex_Replace",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVertex_Replace" "', argument " "1"" of type '" "ViewVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewVertex_Replace" "', argument " "2"" of type '" "ViewEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewEdge * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewVertex_Replace" "', argument " "3"" of type '" "ViewEdge *""'"); 
+  }
+  arg3 = reinterpret_cast< ViewEdge * >(argp3);
+  {
+    try {
+      (arg1)->Replace(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVertex_edges_begin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewVertex *arg1 = (ViewVertex *) 0 ;
+  SwigValueWrapper<ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_nonconst_traits > > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewVertex_edges_begin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVertex_edges_begin" "', argument " "1"" of type '" "ViewVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewVertex * >(argp1);
+  {
+    try {
+      result = (arg1)->edges_begin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new ViewVertex::edge_iterator(static_cast< const ViewVertex::edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVertex_edges_begin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewVertex *arg1 = (ViewVertex *) 0 ;
+  SwigValueWrapper<ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_const_traits > > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewVertex_edges_begin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVertex_edges_begin" "', argument " "1"" of type '" "ViewVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewVertex * >(argp1);
+  {
+    try {
+      result = ((ViewVertex const *)arg1)->edges_begin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new ViewVertex::const_edge_iterator(static_cast< const ViewVertex::const_edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVertex_edges_begin(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ViewVertex, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewVertex_edges_begin__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ViewVertex, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewVertex_edges_begin__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVertex_edges_begin'.\n  Possible C/C++ prototypes are:\n    edges_begin()\n    edges_begin()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVertex_edges_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewVertex *arg1 = (ViewVertex *) 0 ;
+  SwigValueWrapper<ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_nonconst_traits > > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewVertex_edges_end",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVertex_edges_end" "', argument " "1"" of type '" "ViewVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewVertex * >(argp1);
+  {
+    try {
+      result = (arg1)->edges_end();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new ViewVertex::edge_iterator(static_cast< const ViewVertex::edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVertex_edges_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewVertex *arg1 = (ViewVertex *) 0 ;
+  SwigValueWrapper<ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_const_traits > > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewVertex_edges_end",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVertex_edges_end" "', argument " "1"" of type '" "ViewVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewVertex * >(argp1);
+  {
+    try {
+      result = ((ViewVertex const *)arg1)->edges_end();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new ViewVertex::const_edge_iterator(static_cast< const ViewVertex::const_edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVertex_edges_end(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ViewVertex, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewVertex_edges_end__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ViewVertex, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewVertex_edges_end__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVertex_edges_end'.\n  Possible C/C++ prototypes are:\n    edges_end()\n    edges_end()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVertex_edges_iterator__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewVertex *arg1 = (ViewVertex *) 0 ;
+  ViewEdge *arg2 = (ViewEdge *) 0 ;
+  SwigValueWrapper<ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_nonconst_traits > > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewVertex_edges_iterator",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVertex_edges_iterator" "', argument " "1"" of type '" "ViewVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewVertex_edges_iterator" "', argument " "2"" of type '" "ViewEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewEdge * >(argp2);
+  {
+    try {
+      result = (arg1)->edges_iterator(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new ViewVertex::edge_iterator(static_cast< const ViewVertex::edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVertex_edges_iterator__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewVertex *arg1 = (ViewVertex *) 0 ;
+  ViewEdge *arg2 = (ViewEdge *) 0 ;
+  SwigValueWrapper<ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_const_traits > > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewVertex_edges_iterator",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVertex_edges_iterator" "', argument " "1"" of type '" "ViewVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewVertex_edges_iterator" "', argument " "2"" of type '" "ViewEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewEdge * >(argp2);
+  {
+    try {
+      result = ((ViewVertex const *)arg1)->edges_iterator(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new ViewVertex::const_edge_iterator(static_cast< const ViewVertex::const_edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVertex_edges_iterator(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ViewVertex, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_ViewEdge, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_ViewVertex_edges_iterator__SWIG_0(self, args);
+      }
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ViewVertex, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_ViewEdge, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_ViewVertex_edges_iterator__SWIG_1(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVertex_edges_iterator'.\n  Possible C/C++ prototypes are:\n    edges_iterator(ViewEdge *)\n    edges_iterator(ViewEdge *)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVertex_edgesBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewVertex *arg1 = (ViewVertex *) 0 ;
+  ViewVertexInternal::orientedViewEdgeIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewVertex_edgesBegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVertex_edgesBegin" "', argument " "1"" of type '" "ViewVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewVertex * >(argp1);
+  {
+    try {
+      result = (arg1)->edgesBegin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new ViewVertexInternal::orientedViewEdgeIterator(static_cast< const ViewVertexInternal::orientedViewEdgeIterator& >(result))), SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVertex_edgesEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewVertex *arg1 = (ViewVertex *) 0 ;
+  ViewVertexInternal::orientedViewEdgeIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewVertex_edgesEnd",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVertex_edgesEnd" "', argument " "1"" of type '" "ViewVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewVertex * >(argp1);
+  {
+    try {
+      result = (arg1)->edgesEnd();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new ViewVertexInternal::orientedViewEdgeIterator(static_cast< const ViewVertexInternal::orientedViewEdgeIterator& >(result))), SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVertex_edgesIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewVertex *arg1 = (ViewVertex *) 0 ;
+  ViewEdge *arg2 = (ViewEdge *) 0 ;
+  ViewVertexInternal::orientedViewEdgeIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewVertex_edgesIterator",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVertex_edgesIterator" "', argument " "1"" of type '" "ViewVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewVertex_edgesIterator" "', argument " "2"" of type '" "ViewEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewEdge * >(argp2);
+  {
+    try {
+      result = (arg1)->edgesIterator(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new ViewVertexInternal::orientedViewEdgeIterator(static_cast< const ViewVertexInternal::orientedViewEdgeIterator& >(result))), SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *ViewVertex_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_ViewVertex, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_TVertex_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  TVertex *arg1 = (TVertex *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:TVertex_getExactTypeName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_getExactTypeName" "', argument " "1"" of type '" "TVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< TVertex * >(argp1);
+  {
+    try {
+      result = ((TVertex const *)arg1)->getExactTypeName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_getX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  TVertex *arg1 = (TVertex *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:TVertex_getX",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_getX" "', argument " "1"" of type '" "TVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< TVertex * >(argp1);
+  {
+    try {
+      result = (real)((TVertex const *)arg1)->getX();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_getY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  TVertex *arg1 = (TVertex *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:TVertex_getY",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_getY" "', argument " "1"" of type '" "TVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< TVertex * >(argp1);
+  {
+    try {
+      result = (real)((TVertex const *)arg1)->getY();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_getZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  TVertex *arg1 = (TVertex *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:TVertex_getZ",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_getZ" "', argument " "1"" of type '" "TVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< TVertex * >(argp1);
+  {
+    try {
+      result = (real)((TVertex const *)arg1)->getZ();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_getPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  TVertex *arg1 = (TVertex *) 0 ;
+  Geometry::Vec3f result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:TVertex_getPoint3D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_getPoint3D" "', argument " "1"" of type '" "TVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< TVertex * >(argp1);
+  {
+    try {
+      result = ((TVertex const *)arg1)->getPoint3D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_getProjectedX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  TVertex *arg1 = (TVertex *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:TVertex_getProjectedX",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_getProjectedX" "', argument " "1"" of type '" "TVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< TVertex * >(argp1);
+  {
+    try {
+      result = (real)((TVertex const *)arg1)->getProjectedX();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_getProjectedY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  TVertex *arg1 = (TVertex *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:TVertex_getProjectedY",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_getProjectedY" "', argument " "1"" of type '" "TVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< TVertex * >(argp1);
+  {
+    try {
+      result = (real)((TVertex const *)arg1)->getProjectedY();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_getProjectedZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  TVertex *arg1 = (TVertex *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:TVertex_getProjectedZ",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_getProjectedZ" "', argument " "1"" of type '" "TVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< TVertex * >(argp1);
+  {
+    try {
+      result = (real)((TVertex const *)arg1)->getProjectedZ();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_getPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  TVertex *arg1 = (TVertex *) 0 ;
+  Geometry::Vec2f result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:TVertex_getPoint2D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_getPoint2D" "', argument " "1"" of type '" "TVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< TVertex * >(argp1);
+  {
+    try {
+      result = ((TVertex const *)arg1)->getPoint2D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  TVertex *arg1 = (TVertex *) 0 ;
+  Id result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:TVertex_getId",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_getId" "', argument " "1"" of type '" "TVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< TVertex * >(argp1);
+  {
+    try {
+      result = ((TVertex const *)arg1)->getId();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Id(static_cast< const Id& >(result))), SWIGTYPE_p_Id, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_castToViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  TVertex *arg1 = (TVertex *) 0 ;
+  ViewVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:TVertex_castToViewVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_castToViewVertex" "', argument " "1"" of type '" "TVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< TVertex * >(argp1);
+  {
+    try {
+      result = (ViewVertex *)(arg1)->castToViewVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_castToTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  TVertex *arg1 = (TVertex *) 0 ;
+  TVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:TVertex_castToTVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_castToTVertex" "', argument " "1"" of type '" "TVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< TVertex * >(argp1);
+  {
+    try {
+      result = (TVertex *)(arg1)->castToTVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_TVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_TVertex__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  TVertex *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_TVertex")) SWIG_fail;
+  {
+    try {
+      result = (TVertex *)new TVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_TVertex, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_TVertex__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  SVertex *arg2 = (SVertex *) 0 ;
+  TVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_TVertex",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_TVertex" "', argument " "1"" of type '" "SVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_TVertex" "', argument " "2"" of type '" "SVertex *""'"); 
+  }
+  arg2 = reinterpret_cast< SVertex * >(argp2);
+  {
+    try {
+      result = (TVertex *)new TVertex(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_TVertex, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_TVertex(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_TVertex__SWIG_0(self, args);
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_SVertex, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_SVertex, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_new_TVertex__SWIG_1(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_TVertex'.\n  Possible C/C++ prototypes are:\n    TVertex()\n    TVertex(SVertex *,SVertex *)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_frontSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  TVertex *arg1 = (TVertex *) 0 ;
+  SVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:TVertex_frontSVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_frontSVertex" "', argument " "1"" of type '" "TVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< TVertex * >(argp1);
+  {
+    try {
+      result = (SVertex *)(arg1)->frontSVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_backSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  TVertex *arg1 = (TVertex *) 0 ;
+  SVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:TVertex_backSVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_backSVertex" "', argument " "1"" of type '" "TVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< TVertex * >(argp1);
+  {
+    try {
+      result = (SVertex *)(arg1)->backSVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_frontEdgeA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  TVertex *arg1 = (TVertex *) 0 ;
+  ViewVertex::directedViewEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:TVertex_frontEdgeA",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_frontEdgeA" "', argument " "1"" of type '" "TVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< TVertex * >(argp1);
+  {
+    try {
+      {
+        ViewVertex::directedViewEdge &_result_ref = (arg1)->frontEdgeA();
+        result = (ViewVertex::directedViewEdge *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairTViewEdge_p_bool_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_frontEdgeB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  TVertex *arg1 = (TVertex *) 0 ;
+  ViewVertex::directedViewEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:TVertex_frontEdgeB",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_frontEdgeB" "', argument " "1"" of type '" "TVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< TVertex * >(argp1);
+  {
+    try {
+      {
+        ViewVertex::directedViewEdge &_result_ref = (arg1)->frontEdgeB();
+        result = (ViewVertex::directedViewEdge *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairTViewEdge_p_bool_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_backEdgeA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  TVertex *arg1 = (TVertex *) 0 ;
+  ViewVertex::directedViewEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:TVertex_backEdgeA",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_backEdgeA" "', argument " "1"" of type '" "TVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< TVertex * >(argp1);
+  {
+    try {
+      {
+        ViewVertex::directedViewEdge &_result_ref = (arg1)->backEdgeA();
+        result = (ViewVertex::directedViewEdge *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairTViewEdge_p_bool_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_backEdgeB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  TVertex *arg1 = (TVertex *) 0 ;
+  ViewVertex::directedViewEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:TVertex_backEdgeB",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_backEdgeB" "', argument " "1"" of type '" "TVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< TVertex * >(argp1);
+  {
+    try {
+      {
+        ViewVertex::directedViewEdge &_result_ref = (arg1)->backEdgeB();
+        result = (ViewVertex::directedViewEdge *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairTViewEdge_p_bool_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_SetFrontVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  TVertex *arg1 = (TVertex *) 0 ;
+  SVertex *arg2 = (SVertex *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:TVertex_SetFrontVertex",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_SetFrontVertex" "', argument " "1"" of type '" "TVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< TVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TVertex_SetFrontVertex" "', argument " "2"" of type '" "SVertex *""'"); 
+  }
+  arg2 = reinterpret_cast< SVertex * >(argp2);
+  {
+    try {
+      (arg1)->SetFrontVertex(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_SetBackSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  TVertex *arg1 = (TVertex *) 0 ;
+  SVertex *arg2 = (SVertex *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:TVertex_SetBackSVertex",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_SetBackSVertex" "', argument " "1"" of type '" "TVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< TVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TVertex_SetBackSVertex" "', argument " "2"" of type '" "SVertex *""'"); 
+  }
+  arg2 = reinterpret_cast< SVertex * >(argp2);
+  {
+    try {
+      (arg1)->SetBackSVertex(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_SetFrontEdgeA__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  TVertex *arg1 = (TVertex *) 0 ;
+  ViewEdge *arg2 = (ViewEdge *) 0 ;
+  bool arg3 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  bool val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:TVertex_SetFrontEdgeA",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_SetFrontEdgeA" "', argument " "1"" of type '" "TVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< TVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TVertex_SetFrontEdgeA" "', argument " "2"" of type '" "ViewEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewEdge * >(argp2);
+  ecode3 = SWIG_AsVal_bool(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TVertex_SetFrontEdgeA" "', argument " "3"" of type '" "bool""'");
+  } 
+  arg3 = static_cast< bool >(val3);
+  {
+    try {
+      (arg1)->SetFrontEdgeA(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_SetFrontEdgeA__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  TVertex *arg1 = (TVertex *) 0 ;
+  ViewEdge *arg2 = (ViewEdge *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:TVertex_SetFrontEdgeA",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_SetFrontEdgeA" "', argument " "1"" of type '" "TVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< TVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TVertex_SetFrontEdgeA" "', argument " "2"" of type '" "ViewEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewEdge * >(argp2);
+  {
+    try {
+      (arg1)->SetFrontEdgeA(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_SetFrontEdgeA(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_TVertex, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_ViewEdge, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_TVertex_SetFrontEdgeA__SWIG_1(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_TVertex, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_ViewEdge, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_bool(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          return _wrap_TVertex_SetFrontEdgeA__SWIG_0(self, args);
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'TVertex_SetFrontEdgeA'.\n  Possible C/C++ prototypes are:\n    SetFrontEdgeA(ViewEdge *,bool)\n    SetFrontEdgeA(ViewEdge *)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_SetFrontEdgeB__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  TVertex *arg1 = (TVertex *) 0 ;
+  ViewEdge *arg2 = (ViewEdge *) 0 ;
+  bool arg3 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  bool val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:TVertex_SetFrontEdgeB",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_SetFrontEdgeB" "', argument " "1"" of type '" "TVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< TVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TVertex_SetFrontEdgeB" "', argument " "2"" of type '" "ViewEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewEdge * >(argp2);
+  ecode3 = SWIG_AsVal_bool(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TVertex_SetFrontEdgeB" "', argument " "3"" of type '" "bool""'");
+  } 
+  arg3 = static_cast< bool >(val3);
+  {
+    try {
+      (arg1)->SetFrontEdgeB(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_SetFrontEdgeB__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  TVertex *arg1 = (TVertex *) 0 ;
+  ViewEdge *arg2 = (ViewEdge *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:TVertex_SetFrontEdgeB",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_SetFrontEdgeB" "', argument " "1"" of type '" "TVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< TVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TVertex_SetFrontEdgeB" "', argument " "2"" of type '" "ViewEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewEdge * >(argp2);
+  {
+    try {
+      (arg1)->SetFrontEdgeB(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_SetFrontEdgeB(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_TVertex, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_ViewEdge, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_TVertex_SetFrontEdgeB__SWIG_1(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_TVertex, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_ViewEdge, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_bool(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          return _wrap_TVertex_SetFrontEdgeB__SWIG_0(self, args);
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'TVertex_SetFrontEdgeB'.\n  Possible C/C++ prototypes are:\n    SetFrontEdgeB(ViewEdge *,bool)\n    SetFrontEdgeB(ViewEdge *)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_SetBackEdgeA__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  TVertex *arg1 = (TVertex *) 0 ;
+  ViewEdge *arg2 = (ViewEdge *) 0 ;
+  bool arg3 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  bool val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:TVertex_SetBackEdgeA",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_SetBackEdgeA" "', argument " "1"" of type '" "TVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< TVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TVertex_SetBackEdgeA" "', argument " "2"" of type '" "ViewEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewEdge * >(argp2);
+  ecode3 = SWIG_AsVal_bool(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TVertex_SetBackEdgeA" "', argument " "3"" of type '" "bool""'");
+  } 
+  arg3 = static_cast< bool >(val3);
+  {
+    try {
+      (arg1)->SetBackEdgeA(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_SetBackEdgeA__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  TVertex *arg1 = (TVertex *) 0 ;
+  ViewEdge *arg2 = (ViewEdge *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:TVertex_SetBackEdgeA",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_SetBackEdgeA" "', argument " "1"" of type '" "TVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< TVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TVertex_SetBackEdgeA" "', argument " "2"" of type '" "ViewEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewEdge * >(argp2);
+  {
+    try {
+      (arg1)->SetBackEdgeA(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_SetBackEdgeA(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_TVertex, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_ViewEdge, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_TVertex_SetBackEdgeA__SWIG_1(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_TVertex, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_ViewEdge, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_bool(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          return _wrap_TVertex_SetBackEdgeA__SWIG_0(self, args);
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'TVertex_SetBackEdgeA'.\n  Possible C/C++ prototypes are:\n    SetBackEdgeA(ViewEdge *,bool)\n    SetBackEdgeA(ViewEdge *)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_SetBackEdgeB__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  TVertex *arg1 = (TVertex *) 0 ;
+  ViewEdge *arg2 = (ViewEdge *) 0 ;
+  bool arg3 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  bool val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:TVertex_SetBackEdgeB",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_SetBackEdgeB" "', argument " "1"" of type '" "TVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< TVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TVertex_SetBackEdgeB" "', argument " "2"" of type '" "ViewEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewEdge * >(argp2);
+  ecode3 = SWIG_AsVal_bool(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TVertex_SetBackEdgeB" "', argument " "3"" of type '" "bool""'");
+  } 
+  arg3 = static_cast< bool >(val3);
+  {
+    try {
+      (arg1)->SetBackEdgeB(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_SetBackEdgeB__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  TVertex *arg1 = (TVertex *) 0 ;
+  ViewEdge *arg2 = (ViewEdge *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:TVertex_SetBackEdgeB",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_SetBackEdgeB" "', argument " "1"" of type '" "TVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< TVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TVertex_SetBackEdgeB" "', argument " "2"" of type '" "ViewEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewEdge * >(argp2);
+  {
+    try {
+      (arg1)->SetBackEdgeB(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_SetBackEdgeB(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_TVertex, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_ViewEdge, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_TVertex_SetBackEdgeB__SWIG_1(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_TVertex, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_ViewEdge, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_bool(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          return _wrap_TVertex_SetBackEdgeB__SWIG_0(self, args);
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'TVertex_SetBackEdgeB'.\n  Possible C/C++ prototypes are:\n    SetBackEdgeB(ViewEdge *,bool)\n    SetBackEdgeB(ViewEdge *)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_SetId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  TVertex *arg1 = (TVertex *) 0 ;
+  Id *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:TVertex_SetId",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_SetId" "', argument " "1"" of type '" "TVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< TVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Id,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TVertex_SetId" "', argument " "2"" of type '" "Id const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TVertex_SetId" "', argument " "2"" of type '" "Id const &""'"); 
+  }
+  arg2 = reinterpret_cast< Id * >(argp2);
+  {
+    try {
+      (arg1)->SetId((Id const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_GetSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  TVertex *arg1 = (TVertex *) 0 ;
+  FEdge *arg2 = (FEdge *) 0 ;
+  SVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:TVertex_GetSVertex",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_GetSVertex" "', argument " "1"" of type '" "TVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< TVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TVertex_GetSVertex" "', argument " "2"" of type '" "FEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< FEdge * >(argp2);
+  {
+    try {
+      result = (SVertex *)(arg1)->GetSVertex(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_Replace(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  TVertex *arg1 = (TVertex *) 0 ;
+  ViewEdge *arg2 = (ViewEdge *) 0 ;
+  ViewEdge *arg3 = (ViewEdge *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:TVertex_Replace",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_Replace" "', argument " "1"" of type '" "TVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< TVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TVertex_Replace" "', argument " "2"" of type '" "ViewEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewEdge * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "TVertex_Replace" "', argument " "3"" of type '" "ViewEdge *""'"); 
+  }
+  arg3 = reinterpret_cast< ViewEdge * >(argp3);
+  {
+    try {
+      (arg1)->Replace(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_mate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  TVertex *arg1 = (TVertex *) 0 ;
+  ViewEdge *arg2 = (ViewEdge *) 0 ;
+  ViewEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:TVertex_mate",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_mate" "', argument " "1"" of type '" "TVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< TVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TVertex_mate" "', argument " "2"" of type '" "ViewEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewEdge * >(argp2);
+  {
+    try {
+      result = (ViewEdge *)(arg1)->mate(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewEdge, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_edges_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  TVertex *arg1 = (TVertex *) 0 ;
+  SwigValueWrapper<ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_nonconst_traits > > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:TVertex_edges_end",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_edges_end" "', argument " "1"" of type '" "TVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< TVertex * >(argp1);
+  {
+    try {
+      result = (arg1)->edges_end();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new ViewVertex::edge_iterator(static_cast< const ViewVertex::edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_edges_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  TVertex *arg1 = (TVertex *) 0 ;
+  SwigValueWrapper<ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_const_traits > > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:TVertex_edges_end",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_edges_end" "', argument " "1"" of type '" "TVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< TVertex * >(argp1);
+  {
+    try {
+      result = ((TVertex const *)arg1)->edges_end();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new ViewVertex::const_edge_iterator(static_cast< const ViewVertex::const_edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_edges_end(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_TVertex, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_TVertex_edges_end__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_TVertex, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_TVertex_edges_end__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'TVertex_edges_end'.\n  Possible C/C++ prototypes are:\n    edges_end()\n    edges_end()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_edgesBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  TVertex *arg1 = (TVertex *) 0 ;
+  ViewVertexInternal::orientedViewEdgeIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:TVertex_edgesBegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_edgesBegin" "', argument " "1"" of type '" "TVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< TVertex * >(argp1);
+  {
+    try {
+      result = (arg1)->edgesBegin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new ViewVertexInternal::orientedViewEdgeIterator(static_cast< const ViewVertexInternal::orientedViewEdgeIterator& >(result))), SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_edgesEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  TVertex *arg1 = (TVertex *) 0 ;
+  ViewVertexInternal::orientedViewEdgeIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:TVertex_edgesEnd",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_edgesEnd" "', argument " "1"" of type '" "TVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< TVertex * >(argp1);
+  {
+    try {
+      result = (arg1)->edgesEnd();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new ViewVertexInternal::orientedViewEdgeIterator(static_cast< const ViewVertexInternal::orientedViewEdgeIterator& >(result))), SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_edgesIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  TVertex *arg1 = (TVertex *) 0 ;
+  ViewEdge *arg2 = (ViewEdge *) 0 ;
+  ViewVertexInternal::orientedViewEdgeIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:TVertex_edgesIterator",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_edgesIterator" "', argument " "1"" of type '" "TVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< TVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TVertex_edgesIterator" "', argument " "2"" of type '" "ViewEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewEdge * >(argp2);
+  {
+    try {
+      result = (arg1)->edgesIterator(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new ViewVertexInternal::orientedViewEdgeIterator(static_cast< const ViewVertexInternal::orientedViewEdgeIterator& >(result))), SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_TVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  TVertex *arg1 = (TVertex *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_TVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_TVertex" "', argument " "1"" of type '" "TVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< TVertex * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *TVertex_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_TVertex, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_NonTVertex_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  NonTVertex *arg1 = (NonTVertex *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:NonTVertex_getExactTypeName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_NonTVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NonTVertex_getExactTypeName" "', argument " "1"" of type '" "NonTVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< NonTVertex * >(argp1);
+  {
+    try {
+      result = ((NonTVertex const *)arg1)->getExactTypeName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_getX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  NonTVertex *arg1 = (NonTVertex *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:NonTVertex_getX",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_NonTVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NonTVertex_getX" "', argument " "1"" of type '" "NonTVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< NonTVertex * >(argp1);
+  {
+    try {
+      result = (real)((NonTVertex const *)arg1)->getX();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_getY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  NonTVertex *arg1 = (NonTVertex *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:NonTVertex_getY",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_NonTVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NonTVertex_getY" "', argument " "1"" of type '" "NonTVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< NonTVertex * >(argp1);
+  {
+    try {
+      result = (real)((NonTVertex const *)arg1)->getY();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_getZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  NonTVertex *arg1 = (NonTVertex *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:NonTVertex_getZ",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_NonTVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NonTVertex_getZ" "', argument " "1"" of type '" "NonTVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< NonTVertex * >(argp1);
+  {
+    try {
+      result = (real)((NonTVertex const *)arg1)->getZ();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_getPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  NonTVertex *arg1 = (NonTVertex *) 0 ;
+  Geometry::Vec3f result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:NonTVertex_getPoint3D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_NonTVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NonTVertex_getPoint3D" "', argument " "1"" of type '" "NonTVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< NonTVertex * >(argp1);
+  {
+    try {
+      result = ((NonTVertex const *)arg1)->getPoint3D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_getProjectedX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  NonTVertex *arg1 = (NonTVertex *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:NonTVertex_getProjectedX",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_NonTVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NonTVertex_getProjectedX" "', argument " "1"" of type '" "NonTVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< NonTVertex * >(argp1);
+  {
+    try {
+      result = (real)((NonTVertex const *)arg1)->getProjectedX();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_getProjectedY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  NonTVertex *arg1 = (NonTVertex *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:NonTVertex_getProjectedY",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_NonTVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NonTVertex_getProjectedY" "', argument " "1"" of type '" "NonTVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< NonTVertex * >(argp1);
+  {
+    try {
+      result = (real)((NonTVertex const *)arg1)->getProjectedY();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_getProjectedZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  NonTVertex *arg1 = (NonTVertex *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:NonTVertex_getProjectedZ",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_NonTVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NonTVertex_getProjectedZ" "', argument " "1"" of type '" "NonTVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< NonTVertex * >(argp1);
+  {
+    try {
+      result = (real)((NonTVertex const *)arg1)->getProjectedZ();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_getPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  NonTVertex *arg1 = (NonTVertex *) 0 ;
+  Geometry::Vec2f result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:NonTVertex_getPoint2D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_NonTVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NonTVertex_getPoint2D" "', argument " "1"" of type '" "NonTVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< NonTVertex * >(argp1);
+  {
+    try {
+      result = ((NonTVertex const *)arg1)->getPoint2D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  NonTVertex *arg1 = (NonTVertex *) 0 ;
+  Id result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:NonTVertex_getId",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_NonTVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NonTVertex_getId" "', argument " "1"" of type '" "NonTVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< NonTVertex * >(argp1);
+  {
+    try {
+      result = ((NonTVertex const *)arg1)->getId();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Id(static_cast< const Id& >(result))), SWIGTYPE_p_Id, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_castToSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  NonTVertex *arg1 = (NonTVertex *) 0 ;
+  SVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:NonTVertex_castToSVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_NonTVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NonTVertex_castToSVertex" "', argument " "1"" of type '" "NonTVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< NonTVertex * >(argp1);
+  {
+    try {
+      result = (SVertex *)(arg1)->castToSVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_castToViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  NonTVertex *arg1 = (NonTVertex *) 0 ;
+  ViewVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:NonTVertex_castToViewVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_NonTVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NonTVertex_castToViewVertex" "', argument " "1"" of type '" "NonTVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< NonTVertex * >(argp1);
+  {
+    try {
+      result = (ViewVertex *)(arg1)->castToViewVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_castToNonTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  NonTVertex *arg1 = (NonTVertex *) 0 ;
+  NonTVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:NonTVertex_castToNonTVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_NonTVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NonTVertex_castToNonTVertex" "', argument " "1"" of type '" "NonTVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< NonTVertex * >(argp1);
+  {
+    try {
+      result = (NonTVertex *)(arg1)->castToNonTVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_NonTVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_NonTVertex__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  NonTVertex *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_NonTVertex")) SWIG_fail;
+  {
+    try {
+      result = (NonTVertex *)new NonTVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_NonTVertex, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_NonTVertex__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  NonTVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_NonTVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_NonTVertex" "', argument " "1"" of type '" "SVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      result = (NonTVertex *)new NonTVertex(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_NonTVertex, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_NonTVertex(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_NonTVertex__SWIG_0(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_SVertex, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_new_NonTVertex__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_NonTVertex'.\n  Possible C/C++ prototypes are:\n    NonTVertex()\n    NonTVertex(SVertex *)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_NonTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  NonTVertex *arg1 = (NonTVertex *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_NonTVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_NonTVertex, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_NonTVertex" "', argument " "1"" of type '" "NonTVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< NonTVertex * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_svertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  NonTVertex *arg1 = (NonTVertex *) 0 ;
+  SVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:NonTVertex_svertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_NonTVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NonTVertex_svertex" "', argument " "1"" of type '" "NonTVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< NonTVertex * >(argp1);
+  {
+    try {
+      result = (SVertex *)(arg1)->svertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_viewedges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  NonTVertex *arg1 = (NonTVertex *) 0 ;
+  NonTVertex::edges_container *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:NonTVertex_viewedges",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_NonTVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NonTVertex_viewedges" "', argument " "1"" of type '" "NonTVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< NonTVertex * >(argp1);
+  {
+    try {
+      {
+        NonTVertex::edges_container &_result_ref = (arg1)->viewedges();
+        result = (NonTVertex::edges_container *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTstd__pairTViewEdge_p_bool_t_std__allocatorTstd__pairTViewEdge_p_bool_t_t_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_SetSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  NonTVertex *arg1 = (NonTVertex *) 0 ;
+  SVertex *arg2 = (SVertex *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:NonTVertex_SetSVertex",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_NonTVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NonTVertex_SetSVertex" "', argument " "1"" of type '" "NonTVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< NonTVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "NonTVertex_SetSVertex" "', argument " "2"" of type '" "SVertex *""'"); 
+  }
+  arg2 = reinterpret_cast< SVertex * >(argp2);
+  {
+    try {
+      (arg1)->SetSVertex(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_SetViewEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  NonTVertex *arg1 = (NonTVertex *) 0 ;
+  std::vector<ViewVertex::directedViewEdge > *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:NonTVertex_SetViewEdges",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_NonTVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NonTVertex_SetViewEdges" "', argument " "1"" of type '" "NonTVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< NonTVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTstd__pairTViewEdge_p_bool_t_std__allocatorTstd__pairTViewEdge_p_bool_t_t_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "NonTVertex_SetViewEdges" "', argument " "2"" of type '" "std::vector<ViewVertex::directedViewEdge > const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "NonTVertex_SetViewEdges" "', argument " "2"" of type '" "std::vector<ViewVertex::directedViewEdge > const &""'"); 
+  }
+  arg2 = reinterpret_cast< std::vector<ViewVertex::directedViewEdge > * >(argp2);
+  {
+    try {
+      (arg1)->SetViewEdges((std::vector<ViewVertex::directedViewEdge > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_AddIncomingViewEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  NonTVertex *arg1 = (NonTVertex *) 0 ;
+  ViewEdge *arg2 = (ViewEdge *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:NonTVertex_AddIncomingViewEdge",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_NonTVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NonTVertex_AddIncomingViewEdge" "', argument " "1"" of type '" "NonTVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< NonTVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "NonTVertex_AddIncomingViewEdge" "', argument " "2"" of type '" "ViewEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewEdge * >(argp2);
+  {
+    try {
+      (arg1)->AddIncomingViewEdge(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_AddOutgoingViewEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  NonTVertex *arg1 = (NonTVertex *) 0 ;
+  ViewEdge *arg2 = (ViewEdge *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:NonTVertex_AddOutgoingViewEdge",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_NonTVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NonTVertex_AddOutgoingViewEdge" "', argument " "1"" of type '" "NonTVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< NonTVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "NonTVertex_AddOutgoingViewEdge" "', argument " "2"" of type '" "ViewEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewEdge * >(argp2);
+  {
+    try {
+      (arg1)->AddOutgoingViewEdge(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_AddViewEdge__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  NonTVertex *arg1 = (NonTVertex *) 0 ;
+  ViewEdge *arg2 = (ViewEdge *) 0 ;
+  bool arg3 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  bool val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:NonTVertex_AddViewEdge",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_NonTVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NonTVertex_AddViewEdge" "', argument " "1"" of type '" "NonTVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< NonTVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "NonTVertex_AddViewEdge" "', argument " "2"" of type '" "ViewEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewEdge * >(argp2);
+  ecode3 = SWIG_AsVal_bool(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "NonTVertex_AddViewEdge" "', argument " "3"" of type '" "bool""'");
+  } 
+  arg3 = static_cast< bool >(val3);
+  {
+    try {
+      (arg1)->AddViewEdge(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_AddViewEdge__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  NonTVertex *arg1 = (NonTVertex *) 0 ;
+  ViewEdge *arg2 = (ViewEdge *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:NonTVertex_AddViewEdge",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_NonTVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NonTVertex_AddViewEdge" "', argument " "1"" of type '" "NonTVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< NonTVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "NonTVertex_AddViewEdge" "', argument " "2"" of type '" "ViewEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewEdge * >(argp2);
+  {
+    try {
+      (arg1)->AddViewEdge(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_AddViewEdge(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_NonTVertex, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_ViewEdge, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_NonTVertex_AddViewEdge__SWIG_1(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_NonTVertex, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_ViewEdge, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_bool(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          return _wrap_NonTVertex_AddViewEdge__SWIG_0(self, args);
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'NonTVertex_AddViewEdge'.\n  Possible C/C++ prototypes are:\n    AddViewEdge(ViewEdge *,bool)\n    AddViewEdge(ViewEdge *)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_Replace(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  NonTVertex *arg1 = (NonTVertex *) 0 ;
+  ViewEdge *arg2 = (ViewEdge *) 0 ;
+  ViewEdge *arg3 = (ViewEdge *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:NonTVertex_Replace",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_NonTVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NonTVertex_Replace" "', argument " "1"" of type '" "NonTVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< NonTVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "NonTVertex_Replace" "', argument " "2"" of type '" "ViewEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewEdge * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "NonTVertex_Replace" "', argument " "3"" of type '" "ViewEdge *""'"); 
+  }
+  arg3 = reinterpret_cast< ViewEdge * >(argp3);
+  {
+    try {
+      (arg1)->Replace(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_edges_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  NonTVertex *arg1 = (NonTVertex *) 0 ;
+  SwigValueWrapper<ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_nonconst_traits > > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:NonTVertex_edges_end",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_NonTVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NonTVertex_edges_end" "', argument " "1"" of type '" "NonTVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< NonTVertex * >(argp1);
+  {
+    try {
+      result = (arg1)->edges_end();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new ViewVertex::edge_iterator(static_cast< const ViewVertex::edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_edges_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  NonTVertex *arg1 = (NonTVertex *) 0 ;
+  SwigValueWrapper<ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_const_traits > > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:NonTVertex_edges_end",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_NonTVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NonTVertex_edges_end" "', argument " "1"" of type '" "NonTVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< NonTVertex * >(argp1);
+  {
+    try {
+      result = ((NonTVertex const *)arg1)->edges_end();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new ViewVertex::const_edge_iterator(static_cast< const ViewVertex::const_edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_edges_end(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_NonTVertex, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_NonTVertex_edges_end__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_NonTVertex, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_NonTVertex_edges_end__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'NonTVertex_edges_end'.\n  Possible C/C++ prototypes are:\n    edges_end()\n    edges_end()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_edgesBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  NonTVertex *arg1 = (NonTVertex *) 0 ;
+  ViewVertexInternal::orientedViewEdgeIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:NonTVertex_edgesBegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_NonTVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NonTVertex_edgesBegin" "', argument " "1"" of type '" "NonTVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< NonTVertex * >(argp1);
+  {
+    try {
+      result = (arg1)->edgesBegin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new ViewVertexInternal::orientedViewEdgeIterator(static_cast< const ViewVertexInternal::orientedViewEdgeIterator& >(result))), SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_edgesEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  NonTVertex *arg1 = (NonTVertex *) 0 ;
+  ViewVertexInternal::orientedViewEdgeIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:NonTVertex_edgesEnd",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_NonTVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NonTVertex_edgesEnd" "', argument " "1"" of type '" "NonTVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< NonTVertex * >(argp1);
+  {
+    try {
+      result = (arg1)->edgesEnd();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new ViewVertexInternal::orientedViewEdgeIterator(static_cast< const ViewVertexInternal::orientedViewEdgeIterator& >(result))), SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_edgesIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  NonTVertex *arg1 = (NonTVertex *) 0 ;
+  ViewEdge *arg2 = (ViewEdge *) 0 ;
+  ViewVertexInternal::orientedViewEdgeIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:NonTVertex_edgesIterator",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_NonTVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NonTVertex_edgesIterator" "', argument " "1"" of type '" "NonTVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< NonTVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "NonTVertex_edgesIterator" "', argument " "2"" of type '" "ViewEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewEdge * >(argp2);
+  {
+    try {
+      result = (arg1)->edgesIterator(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new ViewVertexInternal::orientedViewEdgeIterator(static_cast< const ViewVertexInternal::orientedViewEdgeIterator& >(result))), SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *NonTVertex_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_NonTVertex, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_ViewEdge_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdge_getExactTypeName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_getExactTypeName" "', argument " "1"" of type '" "ViewEdge const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  {
+    try {
+      result = ((ViewEdge const *)arg1)->getExactTypeName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  Id result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdge_getId",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_getId" "', argument " "1"" of type '" "ViewEdge const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  {
+    try {
+      result = ((ViewEdge const *)arg1)->getId();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Id(static_cast< const Id& >(result))), SWIGTYPE_p_Id, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_getNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  Nature::EdgeNature result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdge_getNature",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_getNature" "', argument " "1"" of type '" "ViewEdge const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  {
+    try {
+      result = (Nature::EdgeNature)((ViewEdge const *)arg1)->getNature();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_userdata_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  void *arg2 = (void *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdge_userdata_set",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_userdata_set" "', argument " "1"" of type '" "ViewEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2), 0, SWIG_POINTER_DISOWN);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdge_userdata_set" "', argument " "2"" of type '" "void *""'"); 
+  }
+  if (arg1) (arg1)->userdata = arg2;
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_userdata_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  void *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdge_userdata_get",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_userdata_get" "', argument " "1"" of type '" "ViewEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  result = (void *) ((arg1)->userdata);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewEdge__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_ViewEdge")) SWIG_fail;
+  {
+    try {
+      result = (ViewEdge *)new ViewEdge();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewEdge, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewEdge__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewVertex *arg1 = (ViewVertex *) 0 ;
+  ViewVertex *arg2 = (ViewVertex *) 0 ;
+  ViewEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_ViewEdge",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ViewEdge" "', argument " "1"" of type '" "ViewVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewVertex, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ViewEdge" "', argument " "2"" of type '" "ViewVertex *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewVertex * >(argp2);
+  {
+    try {
+      result = (ViewEdge *)new ViewEdge(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewEdge, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewEdge__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewVertex *arg1 = (ViewVertex *) 0 ;
+  ViewVertex *arg2 = (ViewVertex *) 0 ;
+  FEdge *arg3 = (FEdge *) 0 ;
+  ViewEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:new_ViewEdge",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ViewEdge" "', argument " "1"" of type '" "ViewVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewVertex, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ViewEdge" "', argument " "2"" of type '" "ViewVertex *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewVertex * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_ViewEdge" "', argument " "3"" of type '" "FEdge *""'"); 
+  }
+  arg3 = reinterpret_cast< FEdge * >(argp3);
+  {
+    try {
+      result = (ViewEdge *)new ViewEdge(arg1,arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewEdge, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewEdge__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewVertex *arg1 = (ViewVertex *) 0 ;
+  ViewVertex *arg2 = (ViewVertex *) 0 ;
+  FEdge *arg3 = (FEdge *) 0 ;
+  FEdge *arg4 = (FEdge *) 0 ;
+  ViewShape *arg5 = (ViewShape *) 0 ;
+  ViewEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOOO:new_ViewEdge",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ViewEdge" "', argument " "1"" of type '" "ViewVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewVertex, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ViewEdge" "', argument " "2"" of type '" "ViewVertex *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewVertex * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_ViewEdge" "', argument " "3"" of type '" "FEdge *""'"); 
+  }
+  arg3 = reinterpret_cast< FEdge * >(argp3);
+  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "new_ViewEdge" "', argument " "4"" of type '" "FEdge *""'"); 
+  }
+  arg4 = reinterpret_cast< FEdge * >(argp4);
+  res5 = SWIG_ConvertPtr(obj4, &argp5,SWIGTYPE_p_ViewShape, 0 |  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "new_ViewEdge" "', argument " "5"" of type '" "ViewShape *""'"); 
+  }
+  arg5 = reinterpret_cast< ViewShape * >(argp5);
+  {
+    try {
+      result = (ViewEdge *)new ViewEdge(arg1,arg2,arg3,arg4,arg5);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewEdge, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewEdge(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[6];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 5); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_ViewEdge__SWIG_0(self, args);
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ViewVertex, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_ViewVertex, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_new_ViewEdge__SWIG_1(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ViewVertex, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_ViewVertex, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_FEdge, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          return _wrap_new_ViewEdge__SWIG_2(self, args);
+        }
+      }
+    }
+  }
+  if (argc == 5) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ViewVertex, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_ViewVertex, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_FEdge, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_FEdge, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            void *vptr = 0;
+            int res = SWIG_ConvertPtr(argv[4], &vptr, SWIGTYPE_p_ViewShape, 0);
+            _v = SWIG_CheckState(res);
+            if (_v) {
+              return _wrap_new_ViewEdge__SWIG_3(self, args);
+            }
+          }
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewEdge'.\n  Possible C/C++ prototypes are:\n    ViewEdge()\n    ViewEdge(ViewVertex *,ViewVertex *)\n    ViewEdge(ViewVertex *,ViewVertex *,FEdge *)\n    ViewEdge(ViewVertex *,ViewVertex *,FEdge *,FEdge *,ViewShape *)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ViewEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_ViewEdge",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ViewEdge" "', argument " "1"" of type '" "ViewEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_A(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  ViewVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdge_A",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_A" "', argument " "1"" of type '" "ViewEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  {
+    try {
+      result = (ViewVertex *)(arg1)->A();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_B(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  ViewVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdge_B",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_B" "', argument " "1"" of type '" "ViewEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  {
+    try {
+      result = (ViewVertex *)(arg1)->B();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_fedgeA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  FEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdge_fedgeA",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_fedgeA" "', argument " "1"" of type '" "ViewEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  {
+    try {
+      result = (FEdge *)(arg1)->fedgeA();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FEdge, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_fedgeB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  FEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdge_fedgeB",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_fedgeB" "', argument " "1"" of type '" "ViewEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  {
+    try {
+      result = (FEdge *)(arg1)->fedgeB();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FEdge, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_viewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  ViewShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdge_viewShape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_viewShape" "', argument " "1"" of type '" "ViewEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  {
+    try {
+      result = (ViewShape *)(arg1)->viewShape();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewShape, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_aShape__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  ViewShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdge_aShape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_aShape" "', argument " "1"" of type '" "ViewEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  {
+    try {
+      result = (ViewShape *)(arg1)->aShape();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewShape, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_isClosed(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdge_isClosed",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_isClosed" "', argument " "1"" of type '" "ViewEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  {
+    try {
+      result = (bool)(arg1)->isClosed();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_getChainingTimeStamp(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  unsigned int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdge_getChainingTimeStamp",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_getChainingTimeStamp" "', argument " "1"" of type '" "ViewEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  {
+    try {
+      result = (unsigned int)(arg1)->getChainingTimeStamp();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_aShape__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  ViewShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdge_aShape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_aShape" "', argument " "1"" of type '" "ViewEdge const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  {
+    try {
+      result = (ViewShape *)((ViewEdge const *)arg1)->aShape();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewShape, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_aShape(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ViewEdge, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewEdge_aShape__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ViewEdge, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewEdge_aShape__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdge_aShape'.\n  Possible C/C++ prototypes are:\n    aShape()\n    aShape()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_bShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  ViewShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdge_bShape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_bShape" "', argument " "1"" of type '" "ViewEdge const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  {
+    try {
+      result = (ViewShape *)((ViewEdge const *)arg1)->bShape();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewShape, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_occluders(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  std::vector<ViewShape * > *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdge_occluders",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_occluders" "', argument " "1"" of type '" "ViewEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  {
+    try {
+      {
+        std::vector<ViewShape * > &_result_ref = (arg1)->occluders();
+        result = (std::vector<ViewShape * > *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_splittingId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  Id *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdge_splittingId",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_splittingId" "', argument " "1"" of type '" "ViewEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  {
+    try {
+      result = (Id *)(arg1)->splittingId();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Id, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_SetA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  ViewVertex *arg2 = (ViewVertex *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdge_SetA",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_SetA" "', argument " "1"" of type '" "ViewEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewVertex, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdge_SetA" "', argument " "2"" of type '" "ViewVertex *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewVertex * >(argp2);
+  {
+    try {
+      (arg1)->SetA(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_SetB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  ViewVertex *arg2 = (ViewVertex *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdge_SetB",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_SetB" "', argument " "1"" of type '" "ViewEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewVertex, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdge_SetB" "', argument " "2"" of type '" "ViewVertex *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewVertex * >(argp2);
+  {
+    try {
+      (arg1)->SetB(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_SetNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  Nature::EdgeNature arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned short val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdge_SetNature",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_SetNature" "', argument " "1"" of type '" "ViewEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  ecode2 = SWIG_AsVal_unsigned_SS_short(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdge_SetNature" "', argument " "2"" of type '" "Nature::EdgeNature""'");
+  } 
+  arg2 = static_cast< Nature::EdgeNature >(val2);
+  {
+    try {
+      (arg1)->SetNature(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_SetFEdgeA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  FEdge *arg2 = (FEdge *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdge_SetFEdgeA",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_SetFEdgeA" "', argument " "1"" of type '" "ViewEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdge_SetFEdgeA" "', argument " "2"" of type '" "FEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< FEdge * >(argp2);
+  {
+    try {
+      (arg1)->SetFEdgeA(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_SetFEdgeB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  FEdge *arg2 = (FEdge *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdge_SetFEdgeB",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_SetFEdgeB" "', argument " "1"" of type '" "ViewEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdge_SetFEdgeB" "', argument " "2"" of type '" "FEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< FEdge * >(argp2);
+  {
+    try {
+      (arg1)->SetFEdgeB(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_SetShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  ViewShape *arg2 = (ViewShape *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdge_SetShape",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_SetShape" "', argument " "1"" of type '" "ViewEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewShape, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdge_SetShape" "', argument " "2"" of type '" "ViewShape *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewShape * >(argp2);
+  {
+    try {
+      (arg1)->SetShape(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_SetId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  Id *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdge_SetId",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_SetId" "', argument " "1"" of type '" "ViewEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Id,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdge_SetId" "', argument " "2"" of type '" "Id const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdge_SetId" "', argument " "2"" of type '" "Id const &""'"); 
+  }
+  arg2 = reinterpret_cast< Id * >(argp2);
+  {
+    try {
+      (arg1)->SetId((Id const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_UpdateFEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdge_UpdateFEdges",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_UpdateFEdges" "', argument " "1"" of type '" "ViewEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  {
+    try {
+      (arg1)->UpdateFEdges();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_SetaShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  ViewShape *arg2 = (ViewShape *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdge_SetaShape",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_SetaShape" "', argument " "1"" of type '" "ViewEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewShape, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdge_SetaShape" "', argument " "2"" of type '" "ViewShape *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewShape * >(argp2);
+  {
+    try {
+      (arg1)->SetaShape(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_SetQI(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdge_SetQI",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_SetQI" "', argument " "1"" of type '" "ViewEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdge_SetQI" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  {
+    try {
+      (arg1)->SetQI(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_setChainingTimeStamp(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  unsigned int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdge_setChainingTimeStamp",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_setChainingTimeStamp" "', argument " "1"" of type '" "ViewEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdge_setChainingTimeStamp" "', argument " "2"" of type '" "unsigned int""'");
+  } 
+  arg2 = static_cast< unsigned int >(val2);
+  {
+    try {
+      (arg1)->setChainingTimeStamp(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_AddOccluder(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  ViewShape *arg2 = (ViewShape *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdge_AddOccluder",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_AddOccluder" "', argument " "1"" of type '" "ViewEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewShape, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdge_AddOccluder" "', argument " "2"" of type '" "ViewShape *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewShape * >(argp2);
+  {
+    try {
+      (arg1)->AddOccluder(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_setSplittingId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  Id *arg2 = (Id *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdge_setSplittingId",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_setSplittingId" "', argument " "1"" of type '" "ViewEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_Id, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdge_setSplittingId" "', argument " "2"" of type '" "Id *""'"); 
+  }
+  arg2 = reinterpret_cast< Id * >(argp2);
+  {
+    try {
+      (arg1)->setSplittingId(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_intersect_2d_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  Geometry::Vec2r *arg2 = 0 ;
+  Geometry::Vec2r *arg3 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:ViewEdge_intersect_2d_area",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_intersect_2d_area" "', argument " "1"" of type '" "ViewEdge const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdge_intersect_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdge_intersect_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
+  }
+  arg2 = reinterpret_cast< Geometry::Vec2r * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewEdge_intersect_2d_area" "', argument " "3"" of type '" "Geometry::Vec2r const &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdge_intersect_2d_area" "', argument " "3"" of type '" "Geometry::Vec2r const &""'"); 
+  }
+  arg3 = reinterpret_cast< Geometry::Vec2r * >(argp3);
+  {
+    try {
+      result = (bool)((ViewEdge const *)arg1)->intersect_2d_area((Geometry::Vec2r const &)*arg2,(Geometry::Vec2r const &)*arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_include_in_2d_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  Geometry::Vec2r *arg2 = 0 ;
+  Geometry::Vec2r *arg3 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:ViewEdge_include_in_2d_area",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_include_in_2d_area" "', argument " "1"" of type '" "ViewEdge const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdge_include_in_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdge_include_in_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
+  }
+  arg2 = reinterpret_cast< Geometry::Vec2r * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewEdge_include_in_2d_area" "', argument " "3"" of type '" "Geometry::Vec2r const &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdge_include_in_2d_area" "', argument " "3"" of type '" "Geometry::Vec2r const &""'"); 
+  }
+  arg3 = reinterpret_cast< Geometry::Vec2r * >(argp3);
+  {
+    try {
+      result = (bool)((ViewEdge const *)arg1)->include_in_2d_area((Geometry::Vec2r const &)*arg2,(Geometry::Vec2r const &)*arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_getLength2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdge_getLength2D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_getLength2D" "', argument " "1"" of type '" "ViewEdge const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  {
+    try {
+      result = (real)((ViewEdge const *)arg1)->getLength2D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_qi(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdge_qi",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_qi" "', argument " "1"" of type '" "ViewEdge const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  {
+    try {
+      result = (int)((ViewEdge const *)arg1)->qi();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_occluders_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  occluder_container::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdge_occluders_begin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_occluders_begin" "', argument " "1"" of type '" "ViewEdge const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  {
+    try {
+      result = ((ViewEdge const *)arg1)->occluders_begin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new occluder_container::const_iterator(static_cast< const occluder_container::const_iterator& >(result))), SWIGTYPE_p_occluder_container__const_iterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_occluders_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  occluder_container::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdge_occluders_end",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_occluders_end" "', argument " "1"" of type '" "ViewEdge const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  {
+    try {
+      result = ((ViewEdge const *)arg1)->occluders_end();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new occluder_container::const_iterator(static_cast< const occluder_container::const_iterator& >(result))), SWIGTYPE_p_occluder_container__const_iterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_occluders_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdge_occluders_size",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_occluders_size" "', argument " "1"" of type '" "ViewEdge const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  {
+    try {
+      result = (int)((ViewEdge const *)arg1)->occluders_size();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_occluders_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdge_occluders_empty",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_occluders_empty" "', argument " "1"" of type '" "ViewEdge const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  {
+    try {
+      result = (bool)((ViewEdge const *)arg1)->occluders_empty();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_occludee(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  Polygon3r *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdge_occludee",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_occludee" "', argument " "1"" of type '" "ViewEdge const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  {
+    try {
+      {
+        Polygon3r const &_result_ref = ((ViewEdge const *)arg1)->occludee();
+        result = (Polygon3r *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Polygon3r, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_occluded_shape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  SShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdge_occluded_shape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_occluded_shape" "', argument " "1"" of type '" "ViewEdge const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  {
+    try {
+      result = (SShape *)((ViewEdge const *)arg1)->occluded_shape();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SShape, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_occludee_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdge_occludee_empty",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_occludee_empty" "', argument " "1"" of type '" "ViewEdge const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  {
+    try {
+      result = (bool)((ViewEdge const *)arg1)->occludee_empty();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_shape_id(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  Id result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdge_shape_id",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_shape_id" "', argument " "1"" of type '" "ViewEdge const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  {
+    try {
+      result = ((ViewEdge const *)arg1)->shape_id();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Id(static_cast< const Id& >(result))), SWIGTYPE_p_Id, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_shape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  SShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdge_shape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_shape" "', argument " "1"" of type '" "ViewEdge const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  {
+    try {
+      result = (SShape *)((ViewEdge const *)arg1)->shape();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SShape, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_shape_importance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdge_shape_importance",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_shape_importance" "', argument " "1"" of type '" "ViewEdge const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  {
+    try {
+      result = (float)((ViewEdge const *)arg1)->shape_importance();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_verticesBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  Interface0DIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdge_verticesBegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_verticesBegin" "', argument " "1"" of type '" "ViewEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  {
+    try {
+      result = (arg1)->verticesBegin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Interface0DIterator(static_cast< const Interface0DIterator& >(result))), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_verticesEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  Interface0DIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdge_verticesEnd",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_verticesEnd" "', argument " "1"" of type '" "ViewEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  {
+    try {
+      result = (arg1)->verticesEnd();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Interface0DIterator(static_cast< const Interface0DIterator& >(result))), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_pointsBegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  float arg2 ;
+  Interface0DIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdge_pointsBegin",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_pointsBegin" "', argument " "1"" of type '" "ViewEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdge_pointsBegin" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  {
+    try {
+      result = (arg1)->pointsBegin(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Interface0DIterator(static_cast< const Interface0DIterator& >(result))), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_pointsBegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  Interface0DIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdge_pointsBegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_pointsBegin" "', argument " "1"" of type '" "ViewEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  {
+    try {
+      result = (arg1)->pointsBegin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Interface0DIterator(static_cast< const Interface0DIterator& >(result))), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_pointsBegin(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ViewEdge, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewEdge_pointsBegin__SWIG_1(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ViewEdge, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_float(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_ViewEdge_pointsBegin__SWIG_0(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdge_pointsBegin'.\n  Possible C/C++ prototypes are:\n    pointsBegin(float)\n    pointsBegin()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_pointsEnd__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  float arg2 ;
+  Interface0DIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdge_pointsEnd",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_pointsEnd" "', argument " "1"" of type '" "ViewEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdge_pointsEnd" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  {
+    try {
+      result = (arg1)->pointsEnd(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Interface0DIterator(static_cast< const Interface0DIterator& >(result))), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_pointsEnd__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  Interface0DIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdge_pointsEnd",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_pointsEnd" "', argument " "1"" of type '" "ViewEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  {
+    try {
+      result = (arg1)->pointsEnd();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Interface0DIterator(static_cast< const Interface0DIterator& >(result))), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_pointsEnd(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ViewEdge, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewEdge_pointsEnd__SWIG_1(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ViewEdge, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_float(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_ViewEdge_pointsEnd__SWIG_0(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdge_pointsEnd'.\n  Possible C/C++ prototypes are:\n    pointsEnd(float)\n    pointsEnd()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *ViewEdge_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_ViewEdge, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_ViewShape_userdata_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewShape *arg1 = (ViewShape *) 0 ;
+  void *arg2 = (void *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewShape_userdata_set",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewShape, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShape_userdata_set" "', argument " "1"" of type '" "ViewShape *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewShape * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2), 0, SWIG_POINTER_DISOWN);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShape_userdata_set" "', argument " "2"" of type '" "void *""'"); 
+  }
+  if (arg1) (arg1)->userdata = arg2;
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShape_userdata_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewShape *arg1 = (ViewShape *) 0 ;
+  void *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewShape_userdata_get",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewShape, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShape_userdata_get" "', argument " "1"" of type '" "ViewShape *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewShape * >(argp1);
+  result = (void *) ((arg1)->userdata);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewShape__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewShape *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_ViewShape")) SWIG_fail;
+  {
+    try {
+      result = (ViewShape *)new ViewShape();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewShape, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewShape__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SShape *arg1 = (SShape *) 0 ;
+  ViewShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_ViewShape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SShape, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ViewShape" "', argument " "1"" of type '" "SShape *""'"); 
+  }
+  arg1 = reinterpret_cast< SShape * >(argp1);
+  {
+    try {
+      result = (ViewShape *)new ViewShape(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewShape, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewShape__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewShape *arg1 = 0 ;
+  ViewShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_ViewShape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_ViewShape,  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ViewShape" "', argument " "1"" of type '" "ViewShape &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ViewShape" "', argument " "1"" of type '" "ViewShape &""'"); 
+  }
+  arg1 = reinterpret_cast< ViewShape * >(argp1);
+  {
+    try {
+      result = (ViewShape *)new ViewShape(*arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewShape, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewShape(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_ViewShape__SWIG_0(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_SShape, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_new_ViewShape__SWIG_1(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ViewShape, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_new_ViewShape__SWIG_2(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewShape'.\n  Possible C/C++ prototypes are:\n    ViewShape()\n    ViewShape(SShape *)\n    ViewShape(ViewShape &)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShape_dupplicate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewShape *arg1 = (ViewShape *) 0 ;
+  ViewShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewShape_dupplicate",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewShape, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShape_dupplicate" "', argument " "1"" of type '" "ViewShape *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewShape * >(argp1);
+  {
+    try {
+      result = (ViewShape *)(arg1)->dupplicate();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewShape, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ViewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewShape *arg1 = (ViewShape *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_ViewShape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewShape, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ViewShape" "', argument " "1"" of type '" "ViewShape *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewShape * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShape_SplitEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewShape *arg1 = (ViewShape *) 0 ;
+  FEdge *arg2 = (FEdge *) 0 ;
+  std::vector<TVertex * > *arg3 = 0 ;
+  std::vector<FEdge * > *arg4 = 0 ;
+  std::vector<ViewEdge * > *arg5 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOOO:ViewShape_SplitEdge",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewShape, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShape_SplitEdge" "', argument " "1"" of type '" "ViewShape *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewShape * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShape_SplitEdge" "', argument " "2"" of type '" "FEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< FEdge * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_std__vectorTTVertex_p_std__allocatorTTVertex_p_t_t,  0  | 0);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewShape_SplitEdge" "', argument " "3"" of type '" "std::vector<TVertex * > const &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShape_SplitEdge" "', argument " "3"" of type '" "std::vector<TVertex * > const &""'"); 
+  }
+  arg3 = reinterpret_cast< std::vector<TVertex * > * >(argp3);
+  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t,  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewShape_SplitEdge" "', argument " "4"" of type '" "std::vector<FEdge * > &""'"); 
+  }
+  if (!argp4) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShape_SplitEdge" "', argument " "4"" of type '" "std::vector<FEdge * > &""'"); 
+  }
+  arg4 = reinterpret_cast< std::vector<FEdge * > * >(argp4);
+  res5 = SWIG_ConvertPtr(obj4, &argp5, SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t,  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "ViewShape_SplitEdge" "', argument " "5"" of type '" "std::vector<ViewEdge * > &""'"); 
+  }
+  if (!argp5) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShape_SplitEdge" "', argument " "5"" of type '" "std::vector<ViewEdge * > &""'"); 
+  }
+  arg5 = reinterpret_cast< std::vector<ViewEdge * > * >(argp5);
+  {
+    try {
+      (arg1)->SplitEdge(arg2,(std::vector<TVertex * > const &)*arg3,*arg4,*arg5);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShape_sshape__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewShape *arg1 = (ViewShape *) 0 ;
+  SShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewShape_sshape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewShape, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShape_sshape" "', argument " "1"" of type '" "ViewShape *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewShape * >(argp1);
+  {
+    try {
+      result = (SShape *)(arg1)->sshape();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SShape, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShape_sshape__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewShape *arg1 = (ViewShape *) 0 ;
+  SShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewShape_sshape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewShape, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShape_sshape" "', argument " "1"" of type '" "ViewShape const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewShape * >(argp1);
+  {
+    try {
+      result = (SShape *)((ViewShape const *)arg1)->sshape();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SShape, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShape_sshape(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ViewShape, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewShape_sshape__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ViewShape, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewShape_sshape__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewShape_sshape'.\n  Possible C/C++ prototypes are:\n    sshape()\n    sshape()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShape_vertices(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewShape *arg1 = (ViewShape *) 0 ;
+  std::vector<ViewVertex * > *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewShape_vertices",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewShape, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShape_vertices" "', argument " "1"" of type '" "ViewShape *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewShape * >(argp1);
+  {
+    try {
+      {
+        std::vector<ViewVertex * > &_result_ref = (arg1)->vertices();
+        result = (std::vector<ViewVertex * > *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShape_edges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewShape *arg1 = (ViewShape *) 0 ;
+  std::vector<ViewEdge * > *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewShape_edges",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewShape, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShape_edges" "', argument " "1"" of type '" "ViewShape *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewShape * >(argp1);
+  {
+    try {
+      {
+        std::vector<ViewEdge * > &_result_ref = (arg1)->edges();
+        result = (std::vector<ViewEdge * > *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShape_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewShape *arg1 = (ViewShape *) 0 ;
+  Id result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewShape_getId",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewShape, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShape_getId" "', argument " "1"" of type '" "ViewShape const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewShape * >(argp1);
+  {
+    try {
+      result = ((ViewShape const *)arg1)->getId();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Id(static_cast< const Id& >(result))), SWIGTYPE_p_Id, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShape_SetSShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewShape *arg1 = (ViewShape *) 0 ;
+  SShape *arg2 = (SShape *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewShape_SetSShape",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewShape, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShape_SetSShape" "', argument " "1"" of type '" "ViewShape *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewShape * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SShape, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShape_SetSShape" "', argument " "2"" of type '" "SShape *""'"); 
+  }
+  arg2 = reinterpret_cast< SShape * >(argp2);
+  {
+    try {
+      (arg1)->SetSShape(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShape_SetVertices(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewShape *arg1 = (ViewShape *) 0 ;
+  std::vector<ViewVertex * > *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 = SWIG_OLDOBJ ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewShape_SetVertices",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewShape, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShape_SetVertices" "', argument " "1"" of type '" "ViewShape *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewShape * >(argp1);
+  {
+    std::vector<ViewVertex*,std::allocator<ViewVertex * > > *ptr = (std::vector<ViewVertex*,std::allocator<ViewVertex * > > *)0;
+    res2 = swig::asptr(obj1, &ptr);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShape_SetVertices" "', argument " "2"" of type '" "std::vector<ViewVertex * > const &""'"); 
+    }
+    if (!ptr) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShape_SetVertices" "', argument " "2"" of type '" "std::vector<ViewVertex * > const &""'"); 
+    }
+    arg2 = ptr;
+  }
+  {
+    try {
+      (arg1)->SetVertices((std::vector<ViewVertex * > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  if (SWIG_IsNewObj(res2)) delete arg2;
+  return resultobj;
+fail:
+  if (SWIG_IsNewObj(res2)) delete arg2;
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShape_SetEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewShape *arg1 = (ViewShape *) 0 ;
+  std::vector<ViewEdge * > *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 = SWIG_OLDOBJ ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewShape_SetEdges",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewShape, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShape_SetEdges" "', argument " "1"" of type '" "ViewShape *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewShape * >(argp1);
+  {
+    std::vector<ViewEdge*,std::allocator<ViewEdge * > > *ptr = (std::vector<ViewEdge*,std::allocator<ViewEdge * > > *)0;
+    res2 = swig::asptr(obj1, &ptr);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShape_SetEdges" "', argument " "2"" of type '" "std::vector<ViewEdge * > const &""'"); 
+    }
+    if (!ptr) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShape_SetEdges" "', argument " "2"" of type '" "std::vector<ViewEdge * > const &""'"); 
+    }
+    arg2 = ptr;
+  }
+  {
+    try {
+      (arg1)->SetEdges((std::vector<ViewEdge * > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  if (SWIG_IsNewObj(res2)) delete arg2;
+  return resultobj;
+fail:
+  if (SWIG_IsNewObj(res2)) delete arg2;
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShape_AddVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewShape *arg1 = (ViewShape *) 0 ;
+  ViewVertex *arg2 = (ViewVertex *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewShape_AddVertex",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewShape, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShape_AddVertex" "', argument " "1"" of type '" "ViewShape *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewShape * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewVertex, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShape_AddVertex" "', argument " "2"" of type '" "ViewVertex *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewVertex * >(argp2);
+  {
+    try {
+      (arg1)->AddVertex(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShape_AddEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewShape *arg1 = (ViewShape *) 0 ;
+  ViewEdge *arg2 = (ViewEdge *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewShape_AddEdge",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewShape, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShape_AddEdge" "', argument " "1"" of type '" "ViewShape *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewShape * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShape_AddEdge" "', argument " "2"" of type '" "ViewEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewEdge * >(argp2);
+  {
+    try {
+      (arg1)->AddEdge(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShape_RemoveEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewShape *arg1 = (ViewShape *) 0 ;
+  ViewEdge *arg2 = (ViewEdge *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewShape_RemoveEdge",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewShape, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShape_RemoveEdge" "', argument " "1"" of type '" "ViewShape *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewShape * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShape_RemoveEdge" "', argument " "2"" of type '" "ViewEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewEdge * >(argp2);
+  {
+    try {
+      (arg1)->RemoveEdge(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShape_RemoveVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewShape *arg1 = (ViewShape *) 0 ;
+  ViewVertex *arg2 = (ViewVertex *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewShape_RemoveVertex",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewShape, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShape_RemoveVertex" "', argument " "1"" of type '" "ViewShape *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewShape * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewVertex, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShape_RemoveVertex" "', argument " "2"" of type '" "ViewVertex *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewVertex * >(argp2);
+  {
+    try {
+      (arg1)->RemoveVertex(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *ViewShape_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_ViewShape, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_ViewVertexOrientedViewEdgeIterator__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewVertexInternal::orientedViewEdgeIterator *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_ViewVertexOrientedViewEdgeIterator")) SWIG_fail;
+  {
+    try {
+      result = (ViewVertexInternal::orientedViewEdgeIterator *)new ViewVertexInternal::orientedViewEdgeIterator();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewVertexOrientedViewEdgeIterator__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Nature::VertexNature arg1 ;
+  ViewVertexInternal::orientedViewEdgeIterator *result = 0 ;
+  unsigned short val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_ViewVertexOrientedViewEdgeIterator",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_unsigned_SS_short(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ViewVertexOrientedViewEdgeIterator" "', argument " "1"" of type '" "Nature::VertexNature""'");
+  } 
+  arg1 = static_cast< Nature::VertexNature >(val1);
+  {
+    try {
+      result = (ViewVertexInternal::orientedViewEdgeIterator *)new ViewVertexInternal::orientedViewEdgeIterator(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewVertexOrientedViewEdgeIterator__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewVertexInternal::orientedViewEdgeIterator *arg1 = 0 ;
+  ViewVertexInternal::orientedViewEdgeIterator *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_ViewVertexOrientedViewEdgeIterator",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator,  0  | 0);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ViewVertexOrientedViewEdgeIterator" "', argument " "1"" of type '" "ViewVertexInternal::orientedViewEdgeIterator const &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ViewVertexOrientedViewEdgeIterator" "', argument " "1"" of type '" "ViewVertexInternal::orientedViewEdgeIterator const &""'"); 
+  }
+  arg1 = reinterpret_cast< ViewVertexInternal::orientedViewEdgeIterator * >(argp1);
+  {
+    try {
+      result = (ViewVertexInternal::orientedViewEdgeIterator *)new ViewVertexInternal::orientedViewEdgeIterator((ViewVertexInternal::orientedViewEdgeIterator const &)*arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ViewVertexOrientedViewEdgeIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewVertexInternal::orientedViewEdgeIterator *arg1 = (ViewVertexInternal::orientedViewEdgeIterator *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_ViewVertexOrientedViewEdgeIterator",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ViewVertexOrientedViewEdgeIterator" "', argument " "1"" of type '" "ViewVertexInternal::orientedViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewVertexInternal::orientedViewEdgeIterator * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewVertexOrientedViewEdgeIterator__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewVertexInternal::orientedViewEdgeIterator::edge_pointers_container::iterator arg1 ;
+  ViewVertexInternal::orientedViewEdgeIterator::edge_pointers_container::iterator arg2 ;
+  ViewVertexInternal::orientedViewEdgeIterator::edge_pointers_container::iterator arg3 ;
+  ViewVertexInternal::orientedViewEdgeIterator *result = 0 ;
+  void *argp1 ;
+  int res1 = 0 ;
+  void *argp2 ;
+  int res2 = 0 ;
+  void *argp3 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:new_ViewVertexOrientedViewEdgeIterator",&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator__edge_pointers_container__iterator,  0  | 0);
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ViewVertexOrientedViewEdgeIterator" "', argument " "1"" of type '" "ViewVertexInternal::orientedViewEdgeIterator::edge_pointers_container::iterator""'"); 
+    }  
+    if (!argp1) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ViewVertexOrientedViewEdgeIterator" "', argument " "1"" of type '" "ViewVertexInternal::orientedViewEdgeIterator::edge_pointers_container::iterator""'");
+    } else {
+      ViewVertexInternal::orientedViewEdgeIterator::edge_pointers_container::iterator * temp = reinterpret_cast< ViewVertexInternal::orientedViewEdgeIterator::edge_pointers_container::iterator * >(argp1);
+      arg1 = *temp;
+      if (SWIG_IsNewObj(res1)) delete temp;
+    }
+  }
+  {
+    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator__edge_pointers_container__iterator,  0  | 0);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ViewVertexOrientedViewEdgeIterator" "', argument " "2"" of type '" "ViewVertexInternal::orientedViewEdgeIterator::edge_pointers_container::iterator""'"); 
+    }  
+    if (!argp2) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ViewVertexOrientedViewEdgeIterator" "', argument " "2"" of type '" "ViewVertexInternal::orientedViewEdgeIterator::edge_pointers_container::iterator""'");
+    } else {
+      ViewVertexInternal::orientedViewEdgeIterator::edge_pointers_container::iterator * temp = reinterpret_cast< ViewVertexInternal::orientedViewEdgeIterator::edge_pointers_container::iterator * >(argp2);
+      arg2 = *temp;
+      if (SWIG_IsNewObj(res2)) delete temp;
+    }
+  }
+  {
+    res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator__edge_pointers_container__iterator,  0  | 0);
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_ViewVertexOrientedViewEdgeIterator" "', argument " "3"" of type '" "ViewVertexInternal::orientedViewEdgeIterator::edge_pointers_container::iterator""'"); 
+    }  
+    if (!argp3) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ViewVertexOrientedViewEdgeIterator" "', argument " "3"" of type '" "ViewVertexInternal::orientedViewEdgeIterator::edge_pointers_container::iterator""'");
+    } else {
+      ViewVertexInternal::orientedViewEdgeIterator::edge_pointers_container::iterator * temp = reinterpret_cast< ViewVertexInternal::orientedViewEdgeIterator::edge_pointers_container::iterator * >(argp3);
+      arg3 = *temp;
+      if (SWIG_IsNewObj(res3)) delete temp;
+    }
+  }
+  {
+    try {
+      result = (ViewVertexInternal::orientedViewEdgeIterator *)new ViewVertexInternal::orientedViewEdgeIterator(arg1,arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewVertexOrientedViewEdgeIterator__SWIG_4(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewVertexInternal::orientedViewEdgeIterator::edges_container::iterator arg1 ;
+  ViewVertexInternal::orientedViewEdgeIterator::edges_container::iterator arg2 ;
+  ViewVertexInternal::orientedViewEdgeIterator::edges_container::iterator arg3 ;
+  ViewVertexInternal::orientedViewEdgeIterator *result = 0 ;
+  void *argp1 ;
+  int res1 = 0 ;
+  void *argp2 ;
+  int res2 = 0 ;
+  void *argp3 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:new_ViewVertexOrientedViewEdgeIterator",&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator__edges_container__iterator,  0  | 0);
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ViewVertexOrientedViewEdgeIterator" "', argument " "1"" of type '" "ViewVertexInternal::orientedViewEdgeIterator::edges_container::iterator""'"); 
+    }  
+    if (!argp1) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ViewVertexOrientedViewEdgeIterator" "', argument " "1"" of type '" "ViewVertexInternal::orientedViewEdgeIterator::edges_container::iterator""'");
+    } else {
+      ViewVertexInternal::orientedViewEdgeIterator::edges_container::iterator * temp = reinterpret_cast< ViewVertexInternal::orientedViewEdgeIterator::edges_container::iterator * >(argp1);
+      arg1 = *temp;
+      if (SWIG_IsNewObj(res1)) delete temp;
+    }
+  }
+  {
+    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator__edges_container__iterator,  0  | 0);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ViewVertexOrientedViewEdgeIterator" "', argument " "2"" of type '" "ViewVertexInternal::orientedViewEdgeIterator::edges_container::iterator""'"); 
+    }  
+    if (!argp2) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ViewVertexOrientedViewEdgeIterator" "', argument " "2"" of type '" "ViewVertexInternal::orientedViewEdgeIterator::edges_container::iterator""'");
+    } else {
+      ViewVertexInternal::orientedViewEdgeIterator::edges_container::iterator * temp = reinterpret_cast< ViewVertexInternal::orientedViewEdgeIterator::edges_container::iterator * >(argp2);
+      arg2 = *temp;
+      if (SWIG_IsNewObj(res2)) delete temp;
+    }
+  }
+  {
+    res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator__edges_container__iterator,  0  | 0);
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_ViewVertexOrientedViewEdgeIterator" "', argument " "3"" of type '" "ViewVertexInternal::orientedViewEdgeIterator::edges_container::iterator""'"); 
+    }  
+    if (!argp3) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ViewVertexOrientedViewEdgeIterator" "', argument " "3"" of type '" "ViewVertexInternal::orientedViewEdgeIterator::edges_container::iterator""'");
+    } else {
+      ViewVertexInternal::orientedViewEdgeIterator::edges_container::iterator * temp = reinterpret_cast< ViewVertexInternal::orientedViewEdgeIterator::edges_container::iterator * >(argp3);
+      arg3 = *temp;
+      if (SWIG_IsNewObj(res3)) delete temp;
+    }
+  }
+  {
+    try {
+      result = (ViewVertexInternal::orientedViewEdgeIterator *)new ViewVertexInternal::orientedViewEdgeIterator(arg1,arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewVertexOrientedViewEdgeIterator(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_ViewVertexOrientedViewEdgeIterator__SWIG_0(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_new_ViewVertexOrientedViewEdgeIterator__SWIG_2(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_unsigned_SS_short(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_ViewVertexOrientedViewEdgeIterator__SWIG_1(self, args);
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator__edge_pointers_container__iterator, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator__edge_pointers_container__iterator, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator__edge_pointers_container__iterator, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          return _wrap_new_ViewVertexOrientedViewEdgeIterator__SWIG_3(self, args);
+        }
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator__edges_container__iterator, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator__edges_container__iterator, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator__edges_container__iterator, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          return _wrap_new_ViewVertexOrientedViewEdgeIterator__SWIG_4(self, args);
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewVertexOrientedViewEdgeIterator'.\n  Possible C/C++ prototypes are:\n    ViewVertexInternal::orientedViewEdgeIterator()\n    ViewVertexInternal::orientedViewEdgeIterator(Nature::VertexNature)\n    ViewVertexInternal::orientedViewEdgeIterator(ViewVertexInternal::orientedViewEdgeIterator const &)\n    ViewVertexInternal::orientedViewEdgeIterator(ViewVertexInternal::orientedViewEdgeIterator::edge_pointers_container::iterator,ViewVertexInternal::orientedViewEdgeIterator::edge_pointers_container::iterator,ViewVertexInternal::orientedViewEdgeIterator::edge_pointers_container::iterator)\n    ViewVertexInternal::orientedViewEdgeIterator(ViewVertexInternal::orientedViewEdgeIterator::edges_container::iterator,ViewVertexInternal::orientedViewEdgeIterator::edges_container::iterator,ViewVertexInternal::orientedViewEdgeIterator::edges_container::iterator)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVertexOrientedViewEdgeIterator_isBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewVertexInternal::orientedViewEdgeIterator *arg1 = (ViewVertexInternal::orientedViewEdgeIterator *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewVertexOrientedViewEdgeIterator_isBegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVertexOrientedViewEdgeIterator_isBegin" "', argument " "1"" of type '" "ViewVertexInternal::orientedViewEdgeIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewVertexInternal::orientedViewEdgeIterator * >(argp1);
+  {
+    try {
+      result = (bool)((ViewVertexInternal::orientedViewEdgeIterator const *)arg1)->isBegin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVertexOrientedViewEdgeIterator_isEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewVertexInternal::orientedViewEdgeIterator *arg1 = (ViewVertexInternal::orientedViewEdgeIterator *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewVertexOrientedViewEdgeIterator_isEnd",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVertexOrientedViewEdgeIterator_isEnd" "', argument " "1"" of type '" "ViewVertexInternal::orientedViewEdgeIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewVertexInternal::orientedViewEdgeIterator * >(argp1);
+  {
+    try {
+      result = (bool)((ViewVertexInternal::orientedViewEdgeIterator const *)arg1)->isEnd();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVertexOrientedViewEdgeIterator___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewVertexInternal::orientedViewEdgeIterator *arg1 = (ViewVertexInternal::orientedViewEdgeIterator *) 0 ;
+  ViewVertexInternal::orientedViewEdgeIterator *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewVertexOrientedViewEdgeIterator___ne__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVertexOrientedViewEdgeIterator___ne__" "', argument " "1"" of type '" "ViewVertexInternal::orientedViewEdgeIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewVertexInternal::orientedViewEdgeIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewVertexOrientedViewEdgeIterator___ne__" "', argument " "2"" of type '" "ViewVertexInternal::orientedViewEdgeIterator const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewVertexOrientedViewEdgeIterator___ne__" "', argument " "2"" of type '" "ViewVertexInternal::orientedViewEdgeIterator const &""'"); 
+  }
+  arg2 = reinterpret_cast< ViewVertexInternal::orientedViewEdgeIterator * >(argp2);
+  {
+    try {
+      result = (bool)((ViewVertexInternal::orientedViewEdgeIterator const *)arg1)->operator !=((ViewVertexInternal::orientedViewEdgeIterator const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVertexOrientedViewEdgeIterator___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewVertexInternal::orientedViewEdgeIterator *arg1 = (ViewVertexInternal::orientedViewEdgeIterator *) 0 ;
+  ViewVertexInternal::orientedViewEdgeIterator *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewVertexOrientedViewEdgeIterator___eq__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVertexOrientedViewEdgeIterator___eq__" "', argument " "1"" of type '" "ViewVertexInternal::orientedViewEdgeIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewVertexInternal::orientedViewEdgeIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewVertexOrientedViewEdgeIterator___eq__" "', argument " "2"" of type '" "ViewVertexInternal::orientedViewEdgeIterator const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewVertexOrientedViewEdgeIterator___eq__" "', argument " "2"" of type '" "ViewVertexInternal::orientedViewEdgeIterator const &""'"); 
+  }
+  arg2 = reinterpret_cast< ViewVertexInternal::orientedViewEdgeIterator * >(argp2);
+  {
+    try {
+      result = (bool)((ViewVertexInternal::orientedViewEdgeIterator const *)arg1)->operator ==((ViewVertexInternal::orientedViewEdgeIterator const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVertexOrientedViewEdgeIterator_getObject(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewVertexInternal::orientedViewEdgeIterator *arg1 = (ViewVertexInternal::orientedViewEdgeIterator *) 0 ;
+  ViewVertex::directedViewEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewVertexOrientedViewEdgeIterator_getObject",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVertexOrientedViewEdgeIterator_getObject" "', argument " "1"" of type '" "ViewVertexInternal::orientedViewEdgeIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewVertexInternal::orientedViewEdgeIterator * >(argp1);
+  {
+    try {
+      {
+        ViewVertex::directedViewEdge &_result_ref = ((ViewVertexInternal::orientedViewEdgeIterator const *)arg1)->operator *();
+        result = (ViewVertex::directedViewEdge *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairTViewEdge_p_bool_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVertexOrientedViewEdgeIterator___deref__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewVertexInternal::orientedViewEdgeIterator *arg1 = (ViewVertexInternal::orientedViewEdgeIterator *) 0 ;
+  ViewVertex::directedViewEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewVertexOrientedViewEdgeIterator___deref__",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVertexOrientedViewEdgeIterator___deref__" "', argument " "1"" of type '" "ViewVertexInternal::orientedViewEdgeIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewVertexInternal::orientedViewEdgeIterator * >(argp1);
+  {
+    try {
+      result = (ViewVertex::directedViewEdge *)((ViewVertexInternal::orientedViewEdgeIterator const *)arg1)->operator ->();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairTViewEdge_p_bool_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVertexOrientedViewEdgeIterator_increment(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewVertexInternal::orientedViewEdgeIterator *arg1 = (ViewVertexInternal::orientedViewEdgeIterator *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewVertexOrientedViewEdgeIterator_increment",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVertexOrientedViewEdgeIterator_increment" "', argument " "1"" of type '" "ViewVertexInternal::orientedViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewVertexInternal::orientedViewEdgeIterator * >(argp1);
+  {
+    try {
+      (arg1)->increment();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *ViewVertexOrientedViewEdgeIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_ViewEdgeSVertexIterator__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_ViewEdgeSVertexIterator")) SWIG_fail;
+  {
+    try {
+      result = (ViewEdgeInternal::SVertexIterator *)new ViewEdgeInternal::SVertexIterator();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewEdgeSVertexIterator__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = 0 ;
+  ViewEdgeInternal::SVertexIterator *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_ViewEdgeSVertexIterator",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_ViewEdgeInternal__SVertexIterator,  0  | 0);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ViewEdgeSVertexIterator" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator const &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ViewEdgeSVertexIterator" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator const &""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (ViewEdgeInternal::SVertexIterator *)new ViewEdgeInternal::SVertexIterator((ViewEdgeInternal::SVertexIterator const &)*arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewEdgeSVertexIterator__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  SVertex *arg2 = (SVertex *) 0 ;
+  FEdge *arg3 = (FEdge *) 0 ;
+  FEdge *arg4 = (FEdge *) 0 ;
+  float arg5 ;
+  ViewEdgeInternal::SVertexIterator *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  float val5 ;
+  int ecode5 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOOO:new_ViewEdgeSVertexIterator",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ViewEdgeSVertexIterator" "', argument " "1"" of type '" "SVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ViewEdgeSVertexIterator" "', argument " "2"" of type '" "SVertex *""'"); 
+  }
+  arg2 = reinterpret_cast< SVertex * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_ViewEdgeSVertexIterator" "', argument " "3"" of type '" "FEdge *""'"); 
+  }
+  arg3 = reinterpret_cast< FEdge * >(argp3);
+  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "new_ViewEdgeSVertexIterator" "', argument " "4"" of type '" "FEdge *""'"); 
+  }
+  arg4 = reinterpret_cast< FEdge * >(argp4);
+  ecode5 = SWIG_AsVal_float(obj4, &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_ViewEdgeSVertexIterator" "', argument " "5"" of type '" "float""'");
+  } 
+  arg5 = static_cast< float >(val5);
+  {
+    try {
+      result = (ViewEdgeInternal::SVertexIterator *)new ViewEdgeInternal::SVertexIterator(arg1,arg2,arg3,arg4,arg5);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewEdgeSVertexIterator(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[6];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 5); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_ViewEdgeSVertexIterator__SWIG_0(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_new_ViewEdgeSVertexIterator__SWIG_1(self, args);
+    }
+  }
+  if (argc == 5) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_SVertex, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_SVertex, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_FEdge, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_FEdge, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            {
+              int res = SWIG_AsVal_float(argv[4], NULL);
+              _v = SWIG_CheckState(res);
+            }
+            if (_v) {
+              return _wrap_new_ViewEdgeSVertexIterator__SWIG_2(self, args);
+            }
+          }
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewEdgeSVertexIterator'.\n  Possible C/C++ prototypes are:\n    ViewEdgeInternal::SVertexIterator()\n    ViewEdgeInternal::SVertexIterator(ViewEdgeInternal::SVertexIterator const &)\n    ViewEdgeInternal::SVertexIterator(SVertex *,SVertex *,FEdge *,FEdge *,float)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ViewEdgeSVertexIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_ViewEdgeSVertexIterator",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ViewEdgeSVertexIterator" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_getExactTypeName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_getExactTypeName" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = ((ViewEdgeInternal::SVertexIterator const *)arg1)->getExactTypeName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_getObject(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  SVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_getObject",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_getObject" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      {
+        SVertex &_result_ref = (arg1)->operator *();
+        result = (SVertex *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator___deref__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  SVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator___deref__",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator___deref__" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (SVertex *)(arg1)->operator ->();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_increment(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_increment",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_increment" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      (arg1)->increment();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_decrement(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_decrement",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_decrement" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      (arg1)->decrement();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_isBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_isBegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_isBegin" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (bool)((ViewEdgeInternal::SVertexIterator const *)arg1)->isBegin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_isEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_isEnd",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_isEnd" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (bool)((ViewEdgeInternal::SVertexIterator const *)arg1)->isEnd();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_t(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_t",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_t" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (float)((ViewEdgeInternal::SVertexIterator const *)arg1)->t();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_u(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_u",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_u" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (float)((ViewEdgeInternal::SVertexIterator const *)arg1)->u();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  Interface0DIteratorNested *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeSVertexIterator___eq__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator___eq__" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIteratorNested,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeSVertexIterator___eq__" "', argument " "2"" of type '" "Interface0DIteratorNested const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgeSVertexIterator___eq__" "', argument " "2"" of type '" "Interface0DIteratorNested const &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0DIteratorNested * >(argp2);
+  {
+    try {
+      result = (bool)((ViewEdgeInternal::SVertexIterator const *)arg1)->operator ==((Interface0DIteratorNested const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_copy(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  ViewEdgeInternal::SVertexIterator *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_copy",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_copy" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (ViewEdgeInternal::SVertexIterator *)((ViewEdgeInternal::SVertexIterator const *)arg1)->copy();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_getX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_getX",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_getX" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->getX();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_getY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_getY",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_getY" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->getY();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_getZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_getZ",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_getZ" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->getZ();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_getPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  Geometry::Vec3f result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_getPoint3D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_getPoint3D" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->getPoint3D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_getProjectedX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_getProjectedX",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_getProjectedX" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->getProjectedX();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_getProjectedY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_getProjectedY",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_getProjectedY" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->getProjectedY();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_getProjectedZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_getProjectedZ",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_getProjectedZ" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->getProjectedZ();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_getPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  Geometry::Vec2f result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_getPoint2D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_getPoint2D" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->getPoint2D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_getFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  Interface0D *arg2 = 0 ;
+  FEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeSVertexIterator_getFEdge",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_getFEdge" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeSVertexIterator_getFEdge" "', argument " "2"" of type '" "Interface0D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgeSVertexIterator_getFEdge" "', argument " "2"" of type '" "Interface0D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0D * >(argp2);
+  {
+    try {
+      result = (FEdge *)(*arg1)->getFEdge(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FEdge, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  Id result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_getId",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_getId" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->getId();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Id(static_cast< const Id& >(result))), SWIGTYPE_p_Id, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_getNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  Nature::VertexNature result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_getNature",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_getNature" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (Nature::VertexNature)(*arg1)->getNature();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_castToSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  SVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_castToSVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_castToSVertex" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (SVertex *)(*arg1)->castToSVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_castToViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  ViewVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_castToViewVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_castToViewVertex" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (ViewVertex *)(*arg1)->castToViewVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_castToNonTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  NonTVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_castToNonTVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_castToNonTVertex" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (NonTVertex *)(*arg1)->castToNonTVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_NonTVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_castToTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  TVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_castToTVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_castToTVertex" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (TVertex *)(*arg1)->castToTVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_TVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_userdata_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  void *arg2 = (void *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeSVertexIterator_userdata_set",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_userdata_set" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2), 0, SWIG_POINTER_DISOWN);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeSVertexIterator_userdata_set" "', argument " "2"" of type '" "void *""'"); 
+  }
+  if (arg1) (*arg1)->userdata = arg2;
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_userdata_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  void *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_userdata_get",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_userdata_get" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  result = (void *) ((*arg1)->userdata);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_dupplicate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  SVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_dupplicate",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_dupplicate" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (SVertex *)(*arg1)->dupplicate();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_point3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  Geometry::Vec3r *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_point3D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_point3D" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      {
+        Geometry::Vec3r const &_result_ref = (*arg1)->point3D();
+        result = (Geometry::Vec3r *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_point2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  Geometry::Vec3r *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_point2D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_point2D" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      {
+        Geometry::Vec3r const &_result_ref = (*arg1)->point2D();
+        result = (Geometry::Vec3r *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_normals(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  SwigValueWrapper<set<VecMat::Vec3<double > > > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_normals",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_normals" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->normals();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new set<Geometry::Vec3r >(static_cast< const set<Geometry::Vec3r >& >(result))), SWIGTYPE_p_setTVecMat__Vec3Tdouble_t_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_normalsSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  unsigned int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_normalsSize",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_normalsSize" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (unsigned int)(*arg1)->normalsSize();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_fedges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  std::vector<FEdge * > *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_fedges",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_fedges" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      {
+        std::vector<FEdge * > const &_result_ref = (*arg1)->fedges();
+        result = (std::vector<FEdge * > *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = swig::from(static_cast< std::vector<FEdge*,std::allocator<FEdge * > > >(*result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_fedges_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  SVertex::fedges_container::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_fedges_begin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_fedges_begin" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->fedges_begin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new SVertex::fedges_container::iterator(static_cast< const SVertex::fedges_container::iterator& >(result))), SWIGTYPE_p_SVertex__fedges_container__iterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_fedges_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  SVertex::fedges_container::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_fedges_end",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_fedges_end" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->fedges_end();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new SVertex::fedges_container::iterator(static_cast< const SVertex::fedges_container::iterator& >(result))), SWIGTYPE_p_SVertex__fedges_container__iterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_shape__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  SShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_shape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_shape" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (SShape *)(*arg1)->shape();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SShape, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_shape__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  SShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_shape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_shape" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (SShape *)(*arg1)->shape();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SShape, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_shape(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewEdgeSVertexIterator_shape__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewEdgeSVertexIterator_shape__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgeSVertexIterator_shape'.\n  Possible C/C++ prototypes are:\n    shape()\n    shape()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_z(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_z",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_z" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->z();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_viewvertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  ViewVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_viewvertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_viewvertex" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (ViewVertex *)(*arg1)->viewvertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_SetPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  Geometry::Vec3r *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeSVertexIterator_SetPoint3D",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_SetPoint3D" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeSVertexIterator_SetPoint3D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgeSVertexIterator_SetPoint3D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+  }
+  arg2 = reinterpret_cast< Geometry::Vec3r * >(argp2);
+  {
+    try {
+      (*arg1)->SetPoint3D((Geometry::Vec3r const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_SetPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  Geometry::Vec3r *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeSVertexIterator_SetPoint2D",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_SetPoint2D" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeSVertexIterator_SetPoint2D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgeSVertexIterator_SetPoint2D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+  }
+  arg2 = reinterpret_cast< Geometry::Vec3r * >(argp2);
+  {
+    try {
+      (*arg1)->SetPoint2D((Geometry::Vec3r const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_AddNormal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  Geometry::Vec3r *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeSVertexIterator_AddNormal",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_AddNormal" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeSVertexIterator_AddNormal" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgeSVertexIterator_AddNormal" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+  }
+  arg2 = reinterpret_cast< Geometry::Vec3r * >(argp2);
+  {
+    try {
+      (*arg1)->AddNormal((Geometry::Vec3r const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_setCurvatureInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  CurvatureInfo *arg2 = (CurvatureInfo *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeSVertexIterator_setCurvatureInfo",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_setCurvatureInfo" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_CurvatureInfo, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeSVertexIterator_setCurvatureInfo" "', argument " "2"" of type '" "CurvatureInfo *""'"); 
+  }
+  arg2 = reinterpret_cast< CurvatureInfo * >(argp2);
+  {
+    try {
+      (*arg1)->setCurvatureInfo(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_getCurvatureInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  CurvatureInfo *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_getCurvatureInfo",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_getCurvatureInfo" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (CurvatureInfo *)(*arg1)->getCurvatureInfo();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CurvatureInfo, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_setCurvatureFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  real arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeSVertexIterator_setCurvatureFredo",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_setCurvatureFredo" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgeSVertexIterator_setCurvatureFredo" "', argument " "2"" of type '" "real""'");
+  } 
+  arg2 = static_cast< real >(val2);
+  {
+    try {
+      (*arg1)->setCurvatureFredo(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_setDirectionFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  Geometry::Vec2r arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeSVertexIterator_setDirectionFredo",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_setDirectionFredo" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeSVertexIterator_setDirectionFredo" "', argument " "2"" of type '" "Geometry::Vec2r""'"); 
+    }  
+    if (!argp2) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgeSVertexIterator_setDirectionFredo" "', argument " "2"" of type '" "Geometry::Vec2r""'");
+    } else {
+      Geometry::Vec2r * temp = reinterpret_cast< Geometry::Vec2r * >(argp2);
+      arg2 = *temp;
+      if (SWIG_IsNewObj(res2)) delete temp;
+    }
+  }
+  {
+    try {
+      (*arg1)->setDirectionFredo(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_curvatureFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_curvatureFredo",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_curvatureFredo" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->curvatureFredo();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_directionFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  Geometry::Vec2r result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_directionFredo",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_directionFredo" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->directionFredo();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2r(static_cast< const Geometry::Vec2r& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_SetId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  Id *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeSVertexIterator_SetId",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_SetId" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Id,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeSVertexIterator_SetId" "', argument " "2"" of type '" "Id const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgeSVertexIterator_SetId" "', argument " "2"" of type '" "Id const &""'"); 
+  }
+  arg2 = reinterpret_cast< Id * >(argp2);
+  {
+    try {
+      (*arg1)->SetId((Id const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_SetFEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  std::vector<FEdge * > *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 = SWIG_OLDOBJ ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeSVertexIterator_SetFEdges",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_SetFEdges" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    std::vector<FEdge*,std::allocator<FEdge * > > *ptr = (std::vector<FEdge*,std::allocator<FEdge * > > *)0;
+    res2 = swig::asptr(obj1, &ptr);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeSVertexIterator_SetFEdges" "', argument " "2"" of type '" "std::vector<FEdge * > const &""'"); 
+    }
+    if (!ptr) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgeSVertexIterator_SetFEdges" "', argument " "2"" of type '" "std::vector<FEdge * > const &""'"); 
+    }
+    arg2 = ptr;
+  }
+  {
+    try {
+      (*arg1)->SetFEdges((std::vector<FEdge * > const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  if (SWIG_IsNewObj(res2)) delete arg2;
+  return resultobj;
+fail:
+  if (SWIG_IsNewObj(res2)) delete arg2;
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_SetShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  SShape *arg2 = (SShape *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeSVertexIterator_SetShape",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_SetShape" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SShape, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeSVertexIterator_SetShape" "', argument " "2"" of type '" "SShape *""'"); 
+  }
+  arg2 = reinterpret_cast< SShape * >(argp2);
+  {
+    try {
+      (*arg1)->SetShape(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_SetViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  ViewVertex *arg2 = (ViewVertex *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeSVertexIterator_SetViewVertex",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_SetViewVertex" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewVertex, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeSVertexIterator_SetViewVertex" "', argument " "2"" of type '" "ViewVertex *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewVertex * >(argp2);
+  {
+    try {
+      (*arg1)->SetViewVertex(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_AddFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  FEdge *arg2 = (FEdge *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeSVertexIterator_AddFEdge",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_AddFEdge" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeSVertexIterator_AddFEdge" "', argument " "2"" of type '" "FEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< FEdge * >(argp2);
+  {
+    try {
+      (*arg1)->AddFEdge(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_Replace(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  FEdge *arg2 = (FEdge *) 0 ;
+  FEdge *arg3 = (FEdge *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:ViewEdgeSVertexIterator_Replace",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_Replace" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeSVertexIterator_Replace" "', argument " "2"" of type '" "FEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< FEdge * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewEdgeSVertexIterator_Replace" "', argument " "3"" of type '" "FEdge *""'"); 
+  }
+  arg3 = reinterpret_cast< FEdge * >(argp3);
+  {
+    try {
+      (*arg1)->Replace(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_fedge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  FEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_fedge",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_fedge" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (FEdge *)(*arg1)->fedge();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FEdge, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_point2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  Geometry::Vec3r *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_point2d",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_point2d" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      {
+        Geometry::Vec3r const &_result_ref = (*arg1)->point2d();
+        result = (Geometry::Vec3r *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_point3d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  Geometry::Vec3r *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_point3d",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_point3d" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      {
+        Geometry::Vec3r const &_result_ref = (*arg1)->point3d();
+        result = (Geometry::Vec3r *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_normal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  Geometry::Vec3r result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_normal",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_normal" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->normal();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_shape_id(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  Id result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_shape_id",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_shape_id" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->shape_id();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Id(static_cast< const Id& >(result))), SWIGTYPE_p_Id, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_shape_importance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_shape_importance",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_shape_importance" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (float)(*arg1)->shape_importance();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_qi(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_qi",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_qi" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (int)(*arg1)->qi();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_occluders_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  occluder_container::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_occluders_begin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_occluders_begin" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->occluders_begin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new occluder_container::const_iterator(static_cast< const occluder_container::const_iterator& >(result))), SWIGTYPE_p_occluder_container__const_iterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_occluders_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  occluder_container::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_occluders_end",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_occluders_end" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->occluders_end();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new occluder_container::const_iterator(static_cast< const occluder_container::const_iterator& >(result))), SWIGTYPE_p_occluder_container__const_iterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_occluders_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_occluders_empty",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_occluders_empty" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (bool)(*arg1)->occluders_empty();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_occluders_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_occluders_size",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_occluders_size" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (int)(*arg1)->occluders_size();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_occludee(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  Polygon3r *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_occludee",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_occludee" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      {
+        Polygon3r const &_result_ref = (*arg1)->occludee();
+        result = (Polygon3r *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Polygon3r, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_occluded_shape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  SShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_occluded_shape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_occluded_shape" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (SShape *)(*arg1)->occluded_shape();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SShape, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_occludee_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_occludee_empty",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_occludee_empty" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (bool)(*arg1)->occludee_empty();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_z_discontinuity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_z_discontinuity",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_z_discontinuity" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->z_discontinuity();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *ViewEdgeSVertexIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_ViewEdgeViewEdgeIterator__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  ViewEdge *arg2 = (ViewEdge *) 0 ;
+  bool arg3 ;
+  ViewEdgeInternal::ViewEdgeIterator *result = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  bool val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:new_ViewEdgeViewEdgeIterator",&obj0,&obj1,&obj2)) SWIG_fail;
+  arg1 = obj0;
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ViewEdgeViewEdgeIterator" "', argument " "2"" of type '" "ViewEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewEdge * >(argp2);
+  ecode3 = SWIG_AsVal_bool(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_ViewEdgeViewEdgeIterator" "', argument " "3"" of type '" "bool""'");
+  } 
+  arg3 = static_cast< bool >(val3);
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (ViewEdgeInternal::ViewEdgeIterator *)new SwigDirector_ViewEdgeViewEdgeIterator(arg1,arg2,arg3); 
+      } else {
+        result = (ViewEdgeInternal::ViewEdgeIterator *)new ViewEdgeInternal::ViewEdgeIterator(arg2,arg3); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewEdgeViewEdgeIterator__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  ViewEdge *arg2 = (ViewEdge *) 0 ;
+  ViewEdgeInternal::ViewEdgeIterator *result = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_ViewEdgeViewEdgeIterator",&obj0,&obj1)) SWIG_fail;
+  arg1 = obj0;
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ViewEdgeViewEdgeIterator" "', argument " "2"" of type '" "ViewEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewEdge * >(argp2);
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (ViewEdgeInternal::ViewEdgeIterator *)new SwigDirector_ViewEdgeViewEdgeIterator(arg1,arg2); 
+      } else {
+        result = (ViewEdgeInternal::ViewEdgeIterator *)new ViewEdgeInternal::ViewEdgeIterator(arg2); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewEdgeViewEdgeIterator__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  ViewEdgeInternal::ViewEdgeIterator *result = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_ViewEdgeViewEdgeIterator",&obj0)) SWIG_fail;
+  arg1 = obj0;
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (ViewEdgeInternal::ViewEdgeIterator *)new SwigDirector_ViewEdgeViewEdgeIterator(arg1); 
+      } else {
+        result = (ViewEdgeInternal::ViewEdgeIterator *)new ViewEdgeInternal::ViewEdgeIterator(); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewEdgeViewEdgeIterator__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  ViewEdgeInternal::ViewEdgeIterator *arg2 = 0 ;
+  ViewEdgeInternal::ViewEdgeIterator *result = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_ViewEdgeViewEdgeIterator",&obj0,&obj1)) SWIG_fail;
+  arg1 = obj0;
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ViewEdgeViewEdgeIterator" "', argument " "2"" of type '" "ViewEdgeInternal::ViewEdgeIterator const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ViewEdgeViewEdgeIterator" "', argument " "2"" of type '" "ViewEdgeInternal::ViewEdgeIterator const &""'"); 
+  }
+  arg2 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp2);
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (ViewEdgeInternal::ViewEdgeIterator *)new SwigDirector_ViewEdgeViewEdgeIterator(arg1,(ViewEdgeInternal::ViewEdgeIterator const &)*arg2); 
+      } else {
+        result = (ViewEdgeInternal::ViewEdgeIterator *)new ViewEdgeInternal::ViewEdgeIterator((ViewEdgeInternal::ViewEdgeIterator const &)*arg2); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewEdgeViewEdgeIterator(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    _v = (argv[0] != 0);
+    if (_v) {
+      return _wrap_new_ViewEdgeViewEdgeIterator__SWIG_2(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    _v = (argv[0] != 0);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_ViewEdge, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_new_ViewEdgeViewEdgeIterator__SWIG_1(self, args);
+      }
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    _v = (argv[0] != 0);
+    if (_v) {
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_new_ViewEdgeViewEdgeIterator__SWIG_3(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    _v = (argv[0] != 0);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_ViewEdge, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_bool(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          return _wrap_new_ViewEdgeViewEdgeIterator__SWIG_0(self, args);
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewEdgeViewEdgeIterator'.\n  Possible C/C++ prototypes are:\n    ViewEdgeInternal::ViewEdgeIterator(PyObject *,ViewEdge *,bool)\n    ViewEdgeInternal::ViewEdgeIterator(PyObject *,ViewEdge *)\n    ViewEdgeInternal::ViewEdgeIterator(PyObject *)\n    ViewEdgeInternal::ViewEdgeIterator(PyObject *,ViewEdgeInternal::ViewEdgeIterator const &)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ViewEdgeViewEdgeIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_ViewEdgeViewEdgeIterator",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ViewEdgeViewEdgeIterator" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeViewEdgeIterator_getExactTypeName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_getExactTypeName" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          result = ((ViewEdgeInternal::ViewEdgeIterator const *)arg1)->ViewEdgeInternal::ViewEdgeIterator::getExactTypeName();
+        } else {
+          result = ((ViewEdgeInternal::ViewEdgeIterator const *)arg1)->getExactTypeName();
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_getCurrentEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  ViewEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeViewEdgeIterator_getCurrentEdge",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_getCurrentEdge" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  {
+    try {
+      result = (ViewEdge *)(arg1)->getCurrentEdge();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewEdge, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_setCurrentEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  ViewEdge *arg2 = (ViewEdge *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeViewEdgeIterator_setCurrentEdge",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_setCurrentEdge" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeViewEdgeIterator_setCurrentEdge" "', argument " "2"" of type '" "ViewEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewEdge * >(argp2);
+  {
+    try {
+      (arg1)->setCurrentEdge(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_getBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  ViewEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeViewEdgeIterator_getBegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_getBegin" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  {
+    try {
+      result = (ViewEdge *)(arg1)->getBegin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewEdge, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_setBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  ViewEdge *arg2 = (ViewEdge *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeViewEdgeIterator_setBegin",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_setBegin" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeViewEdgeIterator_setBegin" "', argument " "2"" of type '" "ViewEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewEdge * >(argp2);
+  {
+    try {
+      (arg1)->setBegin(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_getOrientation(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeViewEdgeIterator_getOrientation",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_getOrientation" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  {
+    try {
+      result = (bool)((ViewEdgeInternal::ViewEdgeIterator const *)arg1)->getOrientation();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_setOrientation(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  bool arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeViewEdgeIterator_setOrientation",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_setOrientation" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgeViewEdgeIterator_setOrientation" "', argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = static_cast< bool >(val2);
+  {
+    try {
+      (arg1)->setOrientation(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_changeOrientation(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeViewEdgeIterator_changeOrientation",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_changeOrientation" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  {
+    try {
+      (arg1)->changeOrientation();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_getObject(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  ViewEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeViewEdgeIterator_getObject",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_getObject" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          result = (ViewEdge *)(arg1)->ViewEdgeInternal::ViewEdgeIterator::operator *();
+        } else {
+          result = (ViewEdge *)(arg1)->operator *();
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (director) {
+    SWIG_AcquirePtr(resultobj, director->swig_release_ownership(SWIG_as_voidptr(result)));
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator___deref__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  ViewEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeViewEdgeIterator___deref__",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator___deref__" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          result = (ViewEdge *)(arg1)->ViewEdgeInternal::ViewEdgeIterator::operator ->();
+        } else {
+          result = (ViewEdge *)(arg1)->operator ->();
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (director) {
+    SWIG_AcquirePtr(resultobj, director->swig_release_ownership(SWIG_as_voidptr(result)));
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_increment(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeViewEdgeIterator_increment",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_increment" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          (arg1)->ViewEdgeInternal::ViewEdgeIterator::increment();
+        } else {
+          (arg1)->increment();
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_decrement(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeViewEdgeIterator_decrement",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_decrement" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          (arg1)->ViewEdgeInternal::ViewEdgeIterator::decrement();
+        } else {
+          (arg1)->decrement();
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_isBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeViewEdgeIterator_isBegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_isBegin" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          result = (bool)((ViewEdgeInternal::ViewEdgeIterator const *)arg1)->ViewEdgeInternal::ViewEdgeIterator::isBegin();
+        } else {
+          result = (bool)((ViewEdgeInternal::ViewEdgeIterator const *)arg1)->isBegin();
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_isEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeViewEdgeIterator_isEnd",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_isEnd" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          result = (bool)((ViewEdgeInternal::ViewEdgeIterator const *)arg1)->ViewEdgeInternal::ViewEdgeIterator::isEnd();
+        } else {
+          result = (bool)((ViewEdgeInternal::ViewEdgeIterator const *)arg1)->isEnd();
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  ViewEdgeInternal::ViewEdgeIterator *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeViewEdgeIterator___eq__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator___eq__" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeViewEdgeIterator___eq__" "', argument " "2"" of type '" "ViewEdgeInternal::ViewEdgeIterator &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgeViewEdgeIterator___eq__" "', argument " "2"" of type '" "ViewEdgeInternal::ViewEdgeIterator &""'"); 
+  }
+  arg2 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp2);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          result = (bool)((ViewEdgeInternal::ViewEdgeIterator const *)arg1)->ViewEdgeInternal::ViewEdgeIterator::operator ==(*arg2);
+        } else {
+          result = (bool)((ViewEdgeInternal::ViewEdgeIterator const *)arg1)->operator ==(*arg2);
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  ViewEdgeInternal::ViewEdgeIterator *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeViewEdgeIterator___ne__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator___ne__" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeViewEdgeIterator___ne__" "', argument " "2"" of type '" "ViewEdgeInternal::ViewEdgeIterator &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgeViewEdgeIterator___ne__" "', argument " "2"" of type '" "ViewEdgeInternal::ViewEdgeIterator &""'"); 
+  }
+  arg2 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp2);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          result = (bool)((ViewEdgeInternal::ViewEdgeIterator const *)arg1)->ViewEdgeInternal::ViewEdgeIterator::operator !=(*arg2);
+        } else {
+          result = (bool)((ViewEdgeInternal::ViewEdgeIterator const *)arg1)->operator !=(*arg2);
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  Id result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeViewEdgeIterator_getId",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_getId" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->getId();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Id(static_cast< const Id& >(result))), SWIGTYPE_p_Id, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_getNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  Nature::EdgeNature result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeViewEdgeIterator_getNature",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_getNature" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  {
+    try {
+      result = (Nature::EdgeNature)(*arg1)->getNature();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_userdata_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  void *arg2 = (void *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeViewEdgeIterator_userdata_set",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_userdata_set" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2), 0, SWIG_POINTER_DISOWN);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeViewEdgeIterator_userdata_set" "', argument " "2"" of type '" "void *""'"); 
+  }
+  if (arg1) (*arg1)->userdata = arg2;
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_userdata_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  void *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeViewEdgeIterator_userdata_get",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_userdata_get" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  result = (void *) ((*arg1)->userdata);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_A(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  ViewVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeViewEdgeIterator_A",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_A" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  {
+    try {
+      result = (ViewVertex *)(*arg1)->A();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_B(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  ViewVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeViewEdgeIterator_B",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_B" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  {
+    try {
+      result = (ViewVertex *)(*arg1)->B();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_fedgeA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  FEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeViewEdgeIterator_fedgeA",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_fedgeA" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  {
+    try {
+      result = (FEdge *)(*arg1)->fedgeA();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FEdge, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_fedgeB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  FEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeViewEdgeIterator_fedgeB",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_fedgeB" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  {
+    try {
+      result = (FEdge *)(*arg1)->fedgeB();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FEdge, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_viewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  ViewShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeViewEdgeIterator_viewShape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_viewShape" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  {
+    try {
+      result = (ViewShape *)(*arg1)->viewShape();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewShape, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_aShape__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  ViewShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeViewEdgeIterator_aShape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_aShape" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  {
+    try {
+      result = (ViewShape *)(*arg1)->aShape();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewShape, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_aShape__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  ViewShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeViewEdgeIterator_aShape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_aShape" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  {
+    try {
+      result = (ViewShape *)(*arg1)->aShape();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewShape, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_aShape(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewEdgeViewEdgeIterator_aShape__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewEdgeViewEdgeIterator_aShape__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgeViewEdgeIterator_aShape'.\n  Possible C/C++ prototypes are:\n    aShape()\n    aShape()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_isClosed(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeViewEdgeIterator_isClosed",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_isClosed" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  {
+    try {
+      result = (bool)(*arg1)->isClosed();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_getChainingTimeStamp(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  unsigned int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeViewEdgeIterator_getChainingTimeStamp",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_getChainingTimeStamp" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  {
+    try {
+      result = (unsigned int)(*arg1)->getChainingTimeStamp();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_bShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  ViewShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeViewEdgeIterator_bShape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_bShape" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  {
+    try {
+      result = (ViewShape *)(*arg1)->bShape();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewShape, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_occluders(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  std::vector<ViewShape * > *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeViewEdgeIterator_occluders",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_occluders" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  {
+    try {
+      {
+        std::vector<ViewShape * > &_result_ref = (*arg1)->occluders();
+        result = (std::vector<ViewShape * > *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_splittingId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  Id *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeViewEdgeIterator_splittingId",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_splittingId" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  {
+    try {
+      result = (Id *)(*arg1)->splittingId();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Id, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_SetA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  ViewVertex *arg2 = (ViewVertex *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeViewEdgeIterator_SetA",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_SetA" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewVertex, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeViewEdgeIterator_SetA" "', argument " "2"" of type '" "ViewVertex *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewVertex * >(argp2);
+  {
+    try {
+      (*arg1)->SetA(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_SetB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  ViewVertex *arg2 = (ViewVertex *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeViewEdgeIterator_SetB",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_SetB" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewVertex, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeViewEdgeIterator_SetB" "', argument " "2"" of type '" "ViewVertex *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewVertex * >(argp2);
+  {
+    try {
+      (*arg1)->SetB(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_SetNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  Nature::EdgeNature arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned short val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeViewEdgeIterator_SetNature",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_SetNature" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  ecode2 = SWIG_AsVal_unsigned_SS_short(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgeViewEdgeIterator_SetNature" "', argument " "2"" of type '" "Nature::EdgeNature""'");
+  } 
+  arg2 = static_cast< Nature::EdgeNature >(val2);
+  {
+    try {
+      (*arg1)->SetNature(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_SetFEdgeA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  FEdge *arg2 = (FEdge *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeViewEdgeIterator_SetFEdgeA",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_SetFEdgeA" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeViewEdgeIterator_SetFEdgeA" "', argument " "2"" of type '" "FEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< FEdge * >(argp2);
+  {
+    try {
+      (*arg1)->SetFEdgeA(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_SetFEdgeB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  FEdge *arg2 = (FEdge *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeViewEdgeIterator_SetFEdgeB",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_SetFEdgeB" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeViewEdgeIterator_SetFEdgeB" "', argument " "2"" of type '" "FEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< FEdge * >(argp2);
+  {
+    try {
+      (*arg1)->SetFEdgeB(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_SetShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  ViewShape *arg2 = (ViewShape *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeViewEdgeIterator_SetShape",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_SetShape" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewShape, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeViewEdgeIterator_SetShape" "', argument " "2"" of type '" "ViewShape *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewShape * >(argp2);
+  {
+    try {
+      (*arg1)->SetShape(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_SetId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  Id *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeViewEdgeIterator_SetId",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_SetId" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Id,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeViewEdgeIterator_SetId" "', argument " "2"" of type '" "Id const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgeViewEdgeIterator_SetId" "', argument " "2"" of type '" "Id const &""'"); 
+  }
+  arg2 = reinterpret_cast< Id * >(argp2);
+  {
+    try {
+      (*arg1)->SetId((Id const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_UpdateFEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeViewEdgeIterator_UpdateFEdges",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_UpdateFEdges" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  {
+    try {
+      (*arg1)->UpdateFEdges();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_SetaShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  ViewShape *arg2 = (ViewShape *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeViewEdgeIterator_SetaShape",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_SetaShape" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewShape, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeViewEdgeIterator_SetaShape" "', argument " "2"" of type '" "ViewShape *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewShape * >(argp2);
+  {
+    try {
+      (*arg1)->SetaShape(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_SetQI(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeViewEdgeIterator_SetQI",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_SetQI" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgeViewEdgeIterator_SetQI" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  {
+    try {
+      (*arg1)->SetQI(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_setChainingTimeStamp(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  unsigned int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeViewEdgeIterator_setChainingTimeStamp",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_setChainingTimeStamp" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgeViewEdgeIterator_setChainingTimeStamp" "', argument " "2"" of type '" "unsigned int""'");
+  } 
+  arg2 = static_cast< unsigned int >(val2);
+  {
+    try {
+      (*arg1)->setChainingTimeStamp(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_AddOccluder(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  ViewShape *arg2 = (ViewShape *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeViewEdgeIterator_AddOccluder",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_AddOccluder" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewShape, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeViewEdgeIterator_AddOccluder" "', argument " "2"" of type '" "ViewShape *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewShape * >(argp2);
+  {
+    try {
+      (*arg1)->AddOccluder(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_setSplittingId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  Id *arg2 = (Id *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeViewEdgeIterator_setSplittingId",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_setSplittingId" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_Id, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeViewEdgeIterator_setSplittingId" "', argument " "2"" of type '" "Id *""'"); 
+  }
+  arg2 = reinterpret_cast< Id * >(argp2);
+  {
+    try {
+      (*arg1)->setSplittingId(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_intersect_2d_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  Geometry::Vec2r *arg2 = 0 ;
+  Geometry::Vec2r *arg3 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:ViewEdgeViewEdgeIterator_intersect_2d_area",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_intersect_2d_area" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeViewEdgeIterator_intersect_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgeViewEdgeIterator_intersect_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
+  }
+  arg2 = reinterpret_cast< Geometry::Vec2r * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewEdgeViewEdgeIterator_intersect_2d_area" "', argument " "3"" of type '" "Geometry::Vec2r const &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgeViewEdgeIterator_intersect_2d_area" "', argument " "3"" of type '" "Geometry::Vec2r const &""'"); 
+  }
+  arg3 = reinterpret_cast< Geometry::Vec2r * >(argp3);
+  {
+    try {
+      result = (bool)(*arg1)->intersect_2d_area((Geometry::Vec2r const &)*arg2,(Geometry::Vec2r const &)*arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_include_in_2d_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  Geometry::Vec2r *arg2 = 0 ;
+  Geometry::Vec2r *arg3 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:ViewEdgeViewEdgeIterator_include_in_2d_area",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_include_in_2d_area" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeViewEdgeIterator_include_in_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgeViewEdgeIterator_include_in_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
+  }
+  arg2 = reinterpret_cast< Geometry::Vec2r * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewEdgeViewEdgeIterator_include_in_2d_area" "', argument " "3"" of type '" "Geometry::Vec2r const &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgeViewEdgeIterator_include_in_2d_area" "', argument " "3"" of type '" "Geometry::Vec2r const &""'"); 
+  }
+  arg3 = reinterpret_cast< Geometry::Vec2r * >(argp3);
+  {
+    try {
+      result = (bool)(*arg1)->include_in_2d_area((Geometry::Vec2r const &)*arg2,(Geometry::Vec2r const &)*arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_getLength2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeViewEdgeIterator_getLength2D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_getLength2D" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->getLength2D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_qi(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeViewEdgeIterator_qi",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_qi" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  {
+    try {
+      result = (int)(*arg1)->qi();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_occluders_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  occluder_container::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeViewEdgeIterator_occluders_begin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_occluders_begin" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->occluders_begin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new occluder_container::const_iterator(static_cast< const occluder_container::const_iterator& >(result))), SWIGTYPE_p_occluder_container__const_iterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_occluders_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  occluder_container::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeViewEdgeIterator_occluders_end",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_occluders_end" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->occluders_end();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new occluder_container::const_iterator(static_cast< const occluder_container::const_iterator& >(result))), SWIGTYPE_p_occluder_container__const_iterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_occluders_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeViewEdgeIterator_occluders_size",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_occluders_size" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  {
+    try {
+      result = (int)(*arg1)->occluders_size();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_occluders_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeViewEdgeIterator_occluders_empty",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_occluders_empty" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  {
+    try {
+      result = (bool)(*arg1)->occluders_empty();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_occludee(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  Polygon3r *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeViewEdgeIterator_occludee",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_occludee" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  {
+    try {
+      {
+        Polygon3r const &_result_ref = (*arg1)->occludee();
+        result = (Polygon3r *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Polygon3r, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_occluded_shape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  SShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeViewEdgeIterator_occluded_shape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_occluded_shape" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  {
+    try {
+      result = (SShape *)(*arg1)->occluded_shape();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SShape, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_occludee_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeViewEdgeIterator_occludee_empty",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_occludee_empty" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  {
+    try {
+      result = (bool)(*arg1)->occludee_empty();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_shape_id(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  Id result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeViewEdgeIterator_shape_id",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_shape_id" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->shape_id();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Id(static_cast< const Id& >(result))), SWIGTYPE_p_Id, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_shape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  SShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeViewEdgeIterator_shape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_shape" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  {
+    try {
+      result = (SShape *)(*arg1)->shape();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SShape, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_shape_importance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeViewEdgeIterator_shape_importance",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_shape_importance" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  {
+    try {
+      result = (float)(*arg1)->shape_importance();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_verticesBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  Interface0DIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeViewEdgeIterator_verticesBegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_verticesBegin" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->verticesBegin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Interface0DIterator(static_cast< const Interface0DIterator& >(result))), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_verticesEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  Interface0DIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeViewEdgeIterator_verticesEnd",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_verticesEnd" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->verticesEnd();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Interface0DIterator(static_cast< const Interface0DIterator& >(result))), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_pointsBegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  float arg2 ;
+  Interface0DIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeViewEdgeIterator_pointsBegin",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_pointsBegin" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgeViewEdgeIterator_pointsBegin" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  {
+    try {
+      result = (*arg1)->pointsBegin(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Interface0DIterator(static_cast< const Interface0DIterator& >(result))), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_pointsBegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  Interface0DIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeViewEdgeIterator_pointsBegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_pointsBegin" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->pointsBegin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Interface0DIterator(static_cast< const Interface0DIterator& >(result))), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_pointsBegin(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewEdgeViewEdgeIterator_pointsBegin__SWIG_1(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_float(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_ViewEdgeViewEdgeIterator_pointsBegin__SWIG_0(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgeViewEdgeIterator_pointsBegin'.\n  Possible C/C++ prototypes are:\n    pointsBegin(float)\n    pointsBegin()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_pointsEnd__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  float arg2 ;
+  Interface0DIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeViewEdgeIterator_pointsEnd",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_pointsEnd" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgeViewEdgeIterator_pointsEnd" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  {
+    try {
+      result = (*arg1)->pointsEnd(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Interface0DIterator(static_cast< const Interface0DIterator& >(result))), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_pointsEnd__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  Interface0DIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeViewEdgeIterator_pointsEnd",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_pointsEnd" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->pointsEnd();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Interface0DIterator(static_cast< const Interface0DIterator& >(result))), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_pointsEnd(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewEdgeViewEdgeIterator_pointsEnd__SWIG_1(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_float(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_ViewEdgeViewEdgeIterator_pointsEnd__SWIG_0(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgeViewEdgeIterator_pointsEnd'.\n  Possible C/C++ prototypes are:\n    pointsEnd(float)\n    pointsEnd()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_getTimeStamp(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  unsigned int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeViewEdgeIterator_getTimeStamp",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_getTimeStamp" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  {
+    try {
+      result = (unsigned int)(*arg1)->getTimeStamp();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_setTimeStamp(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  unsigned int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeViewEdgeIterator_setTimeStamp",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_setTimeStamp" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgeViewEdgeIterator_setTimeStamp" "', argument " "2"" of type '" "unsigned int""'");
+  } 
+  arg2 = static_cast< unsigned int >(val2);
+  {
+    try {
+      (*arg1)->setTimeStamp(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_disown_ViewEdgeViewEdgeIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:disown_ViewEdgeViewEdgeIterator",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_ViewEdgeViewEdgeIterator" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  {
+    Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
+    if (director) director->swig_disown();
+  }
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *ViewEdgeViewEdgeIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_UnaryFunction0DVoid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  UnaryFunction0D<void > *result = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction0DVoid",&obj0)) SWIG_fail;
+  arg1 = obj0;
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (UnaryFunction0D<void > *)new SwigDirector_UnaryFunction0DVoid(arg1); 
+      } else {
+        result = (UnaryFunction0D<void > *)new UnaryFunction0D<void >(); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DTvoid_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_UnaryFunction0DVoid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction0D<void > *arg1 = (UnaryFunction0D<void > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction0DVoid",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTvoid_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DVoid" "', argument " "1"" of type '" "UnaryFunction0D<void > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction0D<void > * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction0DVoid_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction0D<void > *arg1 = (UnaryFunction0D<void > *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction0DVoid_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTvoid_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVoid_getName" "', argument " "1"" of type '" "UnaryFunction0D<void > const *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction0D<void > * >(argp1);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          result = ((UnaryFunction0D<void > const *)arg1)->UnaryFunction0D<void >::getName();
+        } else {
+          result = ((UnaryFunction0D<void > const *)arg1)->getName();
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction0DVoid___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction0D<void > *arg1 = (UnaryFunction0D<void > *) 0 ;
+  Interface0DIterator *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction0DVoid___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTvoid_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVoid___call__" "', argument " "1"" of type '" "UnaryFunction0D<void > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction0D<void > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction0DVoid___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "UnaryFunction0DVoid___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0DIterator * >(argp2);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          (arg1)->UnaryFunction0D<void >::operator ()(*arg2);
+        } else {
+          (arg1)->operator ()(*arg2);
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DVoid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction0D<void > *arg1 = (UnaryFunction0D<void > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction0DVoid",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTvoid_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DVoid" "', argument " "1"" of type '" "UnaryFunction0D<void > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction0D<void > * >(argp1);
+  {
+    Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
+    if (director) director->swig_disown();
+  }
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *UnaryFunction0DVoid_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DTvoid_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_UnaryFunction0DUnsigned(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  UnaryFunction0D<unsigned int > *result = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction0DUnsigned",&obj0)) SWIG_fail;
+  arg1 = obj0;
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (UnaryFunction0D<unsigned int > *)new SwigDirector_UnaryFunction0DUnsigned(arg1); 
+      } else {
+        result = (UnaryFunction0D<unsigned int > *)new UnaryFunction0D<unsigned int >(); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DTunsigned_int_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_UnaryFunction0DUnsigned(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction0D<unsigned int > *arg1 = (UnaryFunction0D<unsigned int > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction0DUnsigned",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTunsigned_int_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DUnsigned" "', argument " "1"" of type '" "UnaryFunction0D<unsigned int > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction0D<unsigned int > * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction0DUnsigned_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction0D<unsigned int > *arg1 = (UnaryFunction0D<unsigned int > *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction0DUnsigned_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTunsigned_int_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DUnsigned_getName" "', argument " "1"" of type '" "UnaryFunction0D<unsigned int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction0D<unsigned int > * >(argp1);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          result = ((UnaryFunction0D<unsigned int > const *)arg1)->UnaryFunction0D<unsigned int >::getName();
+        } else {
+          result = ((UnaryFunction0D<unsigned int > const *)arg1)->getName();
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction0DUnsigned___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction0D<unsigned int > *arg1 = (UnaryFunction0D<unsigned int > *) 0 ;
+  Interface0DIterator *arg2 = 0 ;
+  unsigned int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction0DUnsigned___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTunsigned_int_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DUnsigned___call__" "', argument " "1"" of type '" "UnaryFunction0D<unsigned int > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction0D<unsigned int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction0DUnsigned___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "UnaryFunction0DUnsigned___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0DIterator * >(argp2);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          result = (unsigned int)(arg1)->UnaryFunction0D<unsigned int >::operator ()(*arg2);
+        } else {
+          result = (unsigned int)(arg1)->operator ()(*arg2);
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DUnsigned(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction0D<unsigned int > *arg1 = (UnaryFunction0D<unsigned int > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction0DUnsigned",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTunsigned_int_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DUnsigned" "', argument " "1"" of type '" "UnaryFunction0D<unsigned int > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction0D<unsigned int > * >(argp1);
+  {
+    Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
+    if (director) director->swig_disown();
+  }
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *UnaryFunction0DUnsigned_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DTunsigned_int_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_UnaryFunction0DFloat(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  UnaryFunction0D<float > *result = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction0DFloat",&obj0)) SWIG_fail;
+  arg1 = obj0;
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (UnaryFunction0D<float > *)new SwigDirector_UnaryFunction0DFloat(arg1); 
+      } else {
+        result = (UnaryFunction0D<float > *)new UnaryFunction0D<float >(); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DTfloat_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_UnaryFunction0DFloat(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction0D<float > *arg1 = (UnaryFunction0D<float > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction0DFloat",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTfloat_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DFloat" "', argument " "1"" of type '" "UnaryFunction0D<float > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction0D<float > * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction0DFloat_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction0D<float > *arg1 = (UnaryFunction0D<float > *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction0DFloat_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTfloat_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DFloat_getName" "', argument " "1"" of type '" "UnaryFunction0D<float > const *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction0D<float > * >(argp1);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          result = ((UnaryFunction0D<float > const *)arg1)->UnaryFunction0D<float >::getName();
+        } else {
+          result = ((UnaryFunction0D<float > const *)arg1)->getName();
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction0DFloat___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction0D<float > *arg1 = (UnaryFunction0D<float > *) 0 ;
+  Interface0DIterator *arg2 = 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction0DFloat___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTfloat_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DFloat___call__" "', argument " "1"" of type '" "UnaryFunction0D<float > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction0D<float > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction0DFloat___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "UnaryFunction0DFloat___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0DIterator * >(argp2);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          result = (float)(arg1)->UnaryFunction0D<float >::operator ()(*arg2);
+        } else {
+          result = (float)(arg1)->operator ()(*arg2);
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DFloat(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction0D<float > *arg1 = (UnaryFunction0D<float > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction0DFloat",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTfloat_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DFloat" "', argument " "1"" of type '" "UnaryFunction0D<float > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction0D<float > * >(argp1);
+  {
+    Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
+    if (director) director->swig_disown();
+  }
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *UnaryFunction0DFloat_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DTfloat_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_UnaryFunction0DDouble(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  UnaryFunction0D<double > *result = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction0DDouble",&obj0)) SWIG_fail;
+  arg1 = obj0;
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (UnaryFunction0D<double > *)new SwigDirector_UnaryFunction0DDouble(arg1); 
+      } else {
+        result = (UnaryFunction0D<double > *)new UnaryFunction0D<double >(); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DTdouble_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_UnaryFunction0DDouble(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction0D<double > *arg1 = (UnaryFunction0D<double > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction0DDouble",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTdouble_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DDouble" "', argument " "1"" of type '" "UnaryFunction0D<double > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction0D<double > * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction0DDouble_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction0D<double > *arg1 = (UnaryFunction0D<double > *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction0DDouble_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTdouble_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DDouble_getName" "', argument " "1"" of type '" "UnaryFunction0D<double > const *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction0D<double > * >(argp1);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          result = ((UnaryFunction0D<double > const *)arg1)->UnaryFunction0D<double >::getName();
+        } else {
+          result = ((UnaryFunction0D<double > const *)arg1)->getName();
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction0DDouble___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction0D<double > *arg1 = (UnaryFunction0D<double > *) 0 ;
+  Interface0DIterator *arg2 = 0 ;
+  double result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction0DDouble___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTdouble_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DDouble___call__" "', argument " "1"" of type '" "UnaryFunction0D<double > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction0D<double > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction0DDouble___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "UnaryFunction0DDouble___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0DIterator * >(argp2);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          result = (double)(arg1)->UnaryFunction0D<double >::operator ()(*arg2);
+        } else {
+          result = (double)(arg1)->operator ()(*arg2);
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DDouble(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction0D<double > *arg1 = (UnaryFunction0D<double > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction0DDouble",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTdouble_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DDouble" "', argument " "1"" of type '" "UnaryFunction0D<double > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction0D<double > * >(argp1);
+  {
+    Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
+    if (director) director->swig_disown();
+  }
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *UnaryFunction0DDouble_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DTdouble_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_UnaryFunction0DVec2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  UnaryFunction0D<Geometry::Vec2f > *result = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction0DVec2f",&obj0)) SWIG_fail;
+  arg1 = obj0;
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (UnaryFunction0D<Geometry::Vec2f > *)new SwigDirector_UnaryFunction0DVec2f(arg1); 
+      } else {
+        result = (UnaryFunction0D<Geometry::Vec2f > *)new UnaryFunction0D<Geometry::Vec2f >(); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_UnaryFunction0DVec2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction0D<Geometry::Vec2f > *arg1 = (UnaryFunction0D<Geometry::Vec2f > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction0DVec2f",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DVec2f" "', argument " "1"" of type '" "UnaryFunction0D<Geometry::Vec2f > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction0D<Geometry::Vec2f > * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction0DVec2f_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction0D<Geometry::Vec2f > *arg1 = (UnaryFunction0D<Geometry::Vec2f > *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction0DVec2f_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVec2f_getName" "', argument " "1"" of type '" "UnaryFunction0D<Geometry::Vec2f > const *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction0D<Geometry::Vec2f > * >(argp1);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          result = ((UnaryFunction0D<Geometry::Vec2f > const *)arg1)->UnaryFunction0D<VecMat::Vec2<float > >::getName();
+        } else {
+          result = ((UnaryFunction0D<Geometry::Vec2f > const *)arg1)->getName();
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction0DVec2f___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction0D<Geometry::Vec2f > *arg1 = (UnaryFunction0D<Geometry::Vec2f > *) 0 ;
+  Interface0DIterator *arg2 = 0 ;
+  VecMat::Vec2<float > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction0DVec2f___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVec2f___call__" "', argument " "1"" of type '" "UnaryFunction0D<Geometry::Vec2f > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction0D<Geometry::Vec2f > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction0DVec2f___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "UnaryFunction0DVec2f___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0DIterator * >(argp2);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          result = (arg1)->UnaryFunction0D<VecMat::Vec2<float > >::operator ()(*arg2);
+        } else {
+          result = (arg1)->operator ()(*arg2);
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<float >(static_cast< const VecMat::Vec2<float >& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DVec2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction0D<Geometry::Vec2f > *arg1 = (UnaryFunction0D<Geometry::Vec2f > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction0DVec2f",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DVec2f" "', argument " "1"" of type '" "UnaryFunction0D<Geometry::Vec2f > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction0D<Geometry::Vec2f > * >(argp1);
+  {
+    Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
+    if (director) director->swig_disown();
+  }
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *UnaryFunction0DVec2f_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_UnaryFunction0DVec3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  UnaryFunction0D<Geometry::Vec3f > *result = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction0DVec3f",&obj0)) SWIG_fail;
+  arg1 = obj0;
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (UnaryFunction0D<Geometry::Vec3f > *)new SwigDirector_UnaryFunction0DVec3f(arg1); 
+      } else {
+        result = (UnaryFunction0D<Geometry::Vec3f > *)new UnaryFunction0D<Geometry::Vec3f >(); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_UnaryFunction0DVec3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction0D<Geometry::Vec3f > *arg1 = (UnaryFunction0D<Geometry::Vec3f > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction0DVec3f",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DVec3f" "', argument " "1"" of type '" "UnaryFunction0D<Geometry::Vec3f > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction0D<Geometry::Vec3f > * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction0DVec3f_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction0D<Geometry::Vec3f > *arg1 = (UnaryFunction0D<Geometry::Vec3f > *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction0DVec3f_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVec3f_getName" "', argument " "1"" of type '" "UnaryFunction0D<Geometry::Vec3f > const *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction0D<Geometry::Vec3f > * >(argp1);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          result = ((UnaryFunction0D<Geometry::Vec3f > const *)arg1)->UnaryFunction0D<VecMat::Vec3<float > >::getName();
+        } else {
+          result = ((UnaryFunction0D<Geometry::Vec3f > const *)arg1)->getName();
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction0DVec3f___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction0D<Geometry::Vec3f > *arg1 = (UnaryFunction0D<Geometry::Vec3f > *) 0 ;
+  Interface0DIterator *arg2 = 0 ;
+  VecMat::Vec3<float > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction0DVec3f___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVec3f___call__" "', argument " "1"" of type '" "UnaryFunction0D<Geometry::Vec3f > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction0D<Geometry::Vec3f > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction0DVec3f___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "UnaryFunction0DVec3f___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0DIterator * >(argp2);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          result = (arg1)->UnaryFunction0D<VecMat::Vec3<float > >::operator ()(*arg2);
+        } else {
+          result = (arg1)->operator ()(*arg2);
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<float >(static_cast< const VecMat::Vec3<float >& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DVec3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction0D<Geometry::Vec3f > *arg1 = (UnaryFunction0D<Geometry::Vec3f > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction0DVec3f",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DVec3f" "', argument " "1"" of type '" "UnaryFunction0D<Geometry::Vec3f > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction0D<Geometry::Vec3f > * >(argp1);
+  {
+    Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
+    if (director) director->swig_disown();
+  }
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *UnaryFunction0DVec3f_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_UnaryFunction0DId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  UnaryFunction0D<Id > *result = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction0DId",&obj0)) SWIG_fail;
+  arg1 = obj0;
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (UnaryFunction0D<Id > *)new SwigDirector_UnaryFunction0DId(arg1); 
+      } else {
+        result = (UnaryFunction0D<Id > *)new UnaryFunction0D<Id >(); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DTId_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_UnaryFunction0DId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction0D<Id > *arg1 = (UnaryFunction0D<Id > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction0DId",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTId_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DId" "', argument " "1"" of type '" "UnaryFunction0D<Id > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction0D<Id > * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction0DId_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction0D<Id > *arg1 = (UnaryFunction0D<Id > *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction0DId_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTId_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DId_getName" "', argument " "1"" of type '" "UnaryFunction0D<Id > const *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction0D<Id > * >(argp1);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          result = ((UnaryFunction0D<Id > const *)arg1)->UnaryFunction0D<Id >::getName();
+        } else {
+          result = ((UnaryFunction0D<Id > const *)arg1)->getName();
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction0DId___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction0D<Id > *arg1 = (UnaryFunction0D<Id > *) 0 ;
+  Interface0DIterator *arg2 = 0 ;
+  Id result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction0DId___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTId_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DId___call__" "', argument " "1"" of type '" "UnaryFunction0D<Id > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction0D<Id > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction0DId___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "UnaryFunction0DId___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0DIterator * >(argp2);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          result = (arg1)->UnaryFunction0D<Id >::operator ()(*arg2);
+        } else {
+          result = (arg1)->operator ()(*arg2);
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new Id(static_cast< const Id& >(result))), SWIGTYPE_p_Id, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction0D<Id > *arg1 = (UnaryFunction0D<Id > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction0DId",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTId_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DId" "', argument " "1"" of type '" "UnaryFunction0D<Id > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction0D<Id > * >(argp1);
+  {
+    Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
+    if (director) director->swig_disown();
+  }
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *UnaryFunction0DId_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DTId_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_UnaryFunction0DViewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction0D<ViewShape * > *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_UnaryFunction0DViewShape")) SWIG_fail;
+  {
+    try {
+      result = (UnaryFunction0D<ViewShape * > *)new UnaryFunction0D<ViewShape * >();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DTViewShape_p_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_UnaryFunction0DViewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction0D<ViewShape * > *arg1 = (UnaryFunction0D<ViewShape * > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction0DViewShape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTViewShape_p_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DViewShape" "', argument " "1"" of type '" "UnaryFunction0D<ViewShape * > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction0D<ViewShape * > * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction0DViewShape_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction0D<ViewShape * > *arg1 = (UnaryFunction0D<ViewShape * > *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction0DViewShape_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTViewShape_p_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DViewShape_getName" "', argument " "1"" of type '" "UnaryFunction0D<ViewShape * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction0D<ViewShape * > * >(argp1);
+  {
+    try {
+      result = ((UnaryFunction0D<ViewShape * > const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction0DViewShape___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction0D<ViewShape * > *arg1 = (UnaryFunction0D<ViewShape * > *) 0 ;
+  Interface0DIterator *arg2 = 0 ;
+  ViewShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction0DViewShape___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTViewShape_p_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DViewShape___call__" "', argument " "1"" of type '" "UnaryFunction0D<ViewShape * > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction0D<ViewShape * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction0DViewShape___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "UnaryFunction0DViewShape___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0DIterator * >(argp2);
+  {
+    try {
+      result = (ViewShape *)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewShape, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *UnaryFunction0DViewShape_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DTViewShape_p_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_UnaryFunction0DVectorViewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction0D<std::vector<ViewShape * > > *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_UnaryFunction0DVectorViewShape")) SWIG_fail;
+  {
+    try {
+      result = (UnaryFunction0D<std::vector<ViewShape * > > *)new UnaryFunction0D<std::vector<ViewShape * > >();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_UnaryFunction0DVectorViewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction0D<std::vector<ViewShape * > > *arg1 = (UnaryFunction0D<std::vector<ViewShape * > > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction0DVectorViewShape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DVectorViewShape" "', argument " "1"" of type '" "UnaryFunction0D<std::vector<ViewShape * > > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction0D<std::vector<ViewShape * > > * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction0DVectorViewShape_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction0D<std::vector<ViewShape * > > *arg1 = (UnaryFunction0D<std::vector<ViewShape * > > *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction0DVectorViewShape_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVectorViewShape_getName" "', argument " "1"" of type '" "UnaryFunction0D<std::vector<ViewShape * > > const *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction0D<std::vector<ViewShape * > > * >(argp1);
+  {
+    try {
+      result = ((UnaryFunction0D<std::vector<ViewShape * > > const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction0DVectorViewShape___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction0D<std::vector<ViewShape * > > *arg1 = (UnaryFunction0D<std::vector<ViewShape * > > *) 0 ;
+  Interface0DIterator *arg2 = 0 ;
+  std::vector<ViewShape *,std::allocator<ViewShape * > > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction0DVectorViewShape___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVectorViewShape___call__" "', argument " "1"" of type '" "UnaryFunction0D<std::vector<ViewShape * > > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction0D<std::vector<ViewShape * > > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction0DVectorViewShape___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "UnaryFunction0DVectorViewShape___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0DIterator * >(argp2);
+  {
+    try {
+      result = (arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = swig::from(static_cast< std::vector<ViewShape*,std::allocator<ViewShape * > > >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *UnaryFunction0DVectorViewShape_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_GetXF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetXF0D *arg1 = (Functions0D::GetXF0D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:GetXF0D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__GetXF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetXF0D_getName" "', argument " "1"" of type '" "Functions0D::GetXF0D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::GetXF0D * >(argp1);
+  {
+    try {
+      result = ((Functions0D::GetXF0D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_GetXF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetXF0D *arg1 = (Functions0D::GetXF0D *) 0 ;
+  Interface0DIterator *arg2 = 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:GetXF0D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__GetXF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetXF0D___call__" "', argument " "1"" of type '" "Functions0D::GetXF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::GetXF0D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GetXF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GetXF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0DIterator * >(argp2);
+  {
+    try {
+      result = (real)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_GetXF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetXF0D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_GetXF0D")) SWIG_fail;
+  {
+    try {
+      result = (Functions0D::GetXF0D *)new Functions0D::GetXF0D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions0D__GetXF0D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetXF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetXF0D *arg1 = (Functions0D::GetXF0D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_GetXF0D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__GetXF0D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_GetXF0D" "', argument " "1"" of type '" "Functions0D::GetXF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::GetXF0D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *GetXF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetXF0D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_GetYF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetYF0D *arg1 = (Functions0D::GetYF0D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:GetYF0D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__GetYF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetYF0D_getName" "', argument " "1"" of type '" "Functions0D::GetYF0D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::GetYF0D * >(argp1);
+  {
+    try {
+      result = ((Functions0D::GetYF0D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_GetYF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetYF0D *arg1 = (Functions0D::GetYF0D *) 0 ;
+  Interface0DIterator *arg2 = 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:GetYF0D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__GetYF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetYF0D___call__" "', argument " "1"" of type '" "Functions0D::GetYF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::GetYF0D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GetYF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GetYF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0DIterator * >(argp2);
+  {
+    try {
+      result = (real)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_GetYF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetYF0D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_GetYF0D")) SWIG_fail;
+  {
+    try {
+      result = (Functions0D::GetYF0D *)new Functions0D::GetYF0D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions0D__GetYF0D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetYF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetYF0D *arg1 = (Functions0D::GetYF0D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_GetYF0D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__GetYF0D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_GetYF0D" "', argument " "1"" of type '" "Functions0D::GetYF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::GetYF0D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *GetYF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetYF0D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_GetZF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetZF0D *arg1 = (Functions0D::GetZF0D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:GetZF0D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__GetZF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetZF0D_getName" "', argument " "1"" of type '" "Functions0D::GetZF0D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::GetZF0D * >(argp1);
+  {
+    try {
+      result = ((Functions0D::GetZF0D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_GetZF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetZF0D *arg1 = (Functions0D::GetZF0D *) 0 ;
+  Interface0DIterator *arg2 = 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:GetZF0D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__GetZF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetZF0D___call__" "', argument " "1"" of type '" "Functions0D::GetZF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::GetZF0D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GetZF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GetZF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0DIterator * >(argp2);
+  {
+    try {
+      result = (real)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_GetZF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetZF0D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_GetZF0D")) SWIG_fail;
+  {
+    try {
+      result = (Functions0D::GetZF0D *)new Functions0D::GetZF0D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions0D__GetZF0D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetZF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetZF0D *arg1 = (Functions0D::GetZF0D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_GetZF0D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__GetZF0D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_GetZF0D" "', argument " "1"" of type '" "Functions0D::GetZF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::GetZF0D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *GetZF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetZF0D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_GetProjectedXF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetProjectedXF0D *arg1 = (Functions0D::GetProjectedXF0D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:GetProjectedXF0D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__GetProjectedXF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetProjectedXF0D_getName" "', argument " "1"" of type '" "Functions0D::GetProjectedXF0D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::GetProjectedXF0D * >(argp1);
+  {
+    try {
+      result = ((Functions0D::GetProjectedXF0D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_GetProjectedXF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetProjectedXF0D *arg1 = (Functions0D::GetProjectedXF0D *) 0 ;
+  Interface0DIterator *arg2 = 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:GetProjectedXF0D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__GetProjectedXF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetProjectedXF0D___call__" "', argument " "1"" of type '" "Functions0D::GetProjectedXF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::GetProjectedXF0D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GetProjectedXF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GetProjectedXF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0DIterator * >(argp2);
+  {
+    try {
+      result = (real)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_GetProjectedXF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetProjectedXF0D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_GetProjectedXF0D")) SWIG_fail;
+  {
+    try {
+      result = (Functions0D::GetProjectedXF0D *)new Functions0D::GetProjectedXF0D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions0D__GetProjectedXF0D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetProjectedXF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetProjectedXF0D *arg1 = (Functions0D::GetProjectedXF0D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_GetProjectedXF0D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__GetProjectedXF0D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_GetProjectedXF0D" "', argument " "1"" of type '" "Functions0D::GetProjectedXF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::GetProjectedXF0D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *GetProjectedXF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetProjectedXF0D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_GetProjectedYF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetProjectedYF0D *arg1 = (Functions0D::GetProjectedYF0D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:GetProjectedYF0D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__GetProjectedYF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetProjectedYF0D_getName" "', argument " "1"" of type '" "Functions0D::GetProjectedYF0D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::GetProjectedYF0D * >(argp1);
+  {
+    try {
+      result = ((Functions0D::GetProjectedYF0D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_GetProjectedYF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetProjectedYF0D *arg1 = (Functions0D::GetProjectedYF0D *) 0 ;
+  Interface0DIterator *arg2 = 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:GetProjectedYF0D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__GetProjectedYF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetProjectedYF0D___call__" "', argument " "1"" of type '" "Functions0D::GetProjectedYF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::GetProjectedYF0D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GetProjectedYF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GetProjectedYF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0DIterator * >(argp2);
+  {
+    try {
+      result = (real)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_GetProjectedYF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetProjectedYF0D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_GetProjectedYF0D")) SWIG_fail;
+  {
+    try {
+      result = (Functions0D::GetProjectedYF0D *)new Functions0D::GetProjectedYF0D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions0D__GetProjectedYF0D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetProjectedYF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetProjectedYF0D *arg1 = (Functions0D::GetProjectedYF0D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_GetProjectedYF0D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__GetProjectedYF0D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_GetProjectedYF0D" "', argument " "1"" of type '" "Functions0D::GetProjectedYF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::GetProjectedYF0D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *GetProjectedYF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetProjectedYF0D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_GetProjectedZF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetProjectedZF0D *arg1 = (Functions0D::GetProjectedZF0D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:GetProjectedZF0D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__GetProjectedZF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetProjectedZF0D_getName" "', argument " "1"" of type '" "Functions0D::GetProjectedZF0D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::GetProjectedZF0D * >(argp1);
+  {
+    try {
+      result = ((Functions0D::GetProjectedZF0D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_GetProjectedZF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetProjectedZF0D *arg1 = (Functions0D::GetProjectedZF0D *) 0 ;
+  Interface0DIterator *arg2 = 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:GetProjectedZF0D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__GetProjectedZF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetProjectedZF0D___call__" "', argument " "1"" of type '" "Functions0D::GetProjectedZF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::GetProjectedZF0D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GetProjectedZF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GetProjectedZF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0DIterator * >(argp2);
+  {
+    try {
+      result = (real)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_GetProjectedZF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetProjectedZF0D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_GetProjectedZF0D")) SWIG_fail;
+  {
+    try {
+      result = (Functions0D::GetProjectedZF0D *)new Functions0D::GetProjectedZF0D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions0D__GetProjectedZF0D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetProjectedZF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetProjectedZF0D *arg1 = (Functions0D::GetProjectedZF0D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_GetProjectedZF0D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__GetProjectedZF0D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_GetProjectedZF0D" "', argument " "1"" of type '" "Functions0D::GetProjectedZF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::GetProjectedZF0D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *GetProjectedZF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetProjectedZF0D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_GetCurvilinearAbscissaF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetCurvilinearAbscissaF0D *arg1 = (Functions0D::GetCurvilinearAbscissaF0D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:GetCurvilinearAbscissaF0D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__GetCurvilinearAbscissaF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetCurvilinearAbscissaF0D_getName" "', argument " "1"" of type '" "Functions0D::GetCurvilinearAbscissaF0D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::GetCurvilinearAbscissaF0D * >(argp1);
+  {
+    try {
+      result = ((Functions0D::GetCurvilinearAbscissaF0D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_GetCurvilinearAbscissaF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetCurvilinearAbscissaF0D *arg1 = (Functions0D::GetCurvilinearAbscissaF0D *) 0 ;
+  Interface0DIterator *arg2 = 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:GetCurvilinearAbscissaF0D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__GetCurvilinearAbscissaF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetCurvilinearAbscissaF0D___call__" "', argument " "1"" of type '" "Functions0D::GetCurvilinearAbscissaF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::GetCurvilinearAbscissaF0D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GetCurvilinearAbscissaF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GetCurvilinearAbscissaF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0DIterator * >(argp2);
+  {
+    try {
+      result = (float)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_GetCurvilinearAbscissaF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetCurvilinearAbscissaF0D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_GetCurvilinearAbscissaF0D")) SWIG_fail;
+  {
+    try {
+      result = (Functions0D::GetCurvilinearAbscissaF0D *)new Functions0D::GetCurvilinearAbscissaF0D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions0D__GetCurvilinearAbscissaF0D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetCurvilinearAbscissaF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetCurvilinearAbscissaF0D *arg1 = (Functions0D::GetCurvilinearAbscissaF0D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_GetCurvilinearAbscissaF0D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__GetCurvilinearAbscissaF0D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_GetCurvilinearAbscissaF0D" "', argument " "1"" of type '" "Functions0D::GetCurvilinearAbscissaF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::GetCurvilinearAbscissaF0D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *GetCurvilinearAbscissaF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetCurvilinearAbscissaF0D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_GetParameterF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetParameterF0D *arg1 = (Functions0D::GetParameterF0D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:GetParameterF0D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__GetParameterF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetParameterF0D_getName" "', argument " "1"" of type '" "Functions0D::GetParameterF0D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::GetParameterF0D * >(argp1);
+  {
+    try {
+      result = ((Functions0D::GetParameterF0D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_GetParameterF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetParameterF0D *arg1 = (Functions0D::GetParameterF0D *) 0 ;
+  Interface0DIterator *arg2 = 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:GetParameterF0D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__GetParameterF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetParameterF0D___call__" "', argument " "1"" of type '" "Functions0D::GetParameterF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::GetParameterF0D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GetParameterF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GetParameterF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0DIterator * >(argp2);
+  {
+    try {
+      result = (float)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_GetParameterF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetParameterF0D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_GetParameterF0D")) SWIG_fail;
+  {
+    try {
+      result = (Functions0D::GetParameterF0D *)new Functions0D::GetParameterF0D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions0D__GetParameterF0D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetParameterF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetParameterF0D *arg1 = (Functions0D::GetParameterF0D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_GetParameterF0D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__GetParameterF0D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_GetParameterF0D" "', argument " "1"" of type '" "Functions0D::GetParameterF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::GetParameterF0D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *GetParameterF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetParameterF0D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_VertexOrientation2DF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::VertexOrientation2DF0D *arg1 = (Functions0D::VertexOrientation2DF0D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:VertexOrientation2DF0D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__VertexOrientation2DF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VertexOrientation2DF0D_getName" "', argument " "1"" of type '" "Functions0D::VertexOrientation2DF0D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::VertexOrientation2DF0D * >(argp1);
+  {
+    try {
+      result = ((Functions0D::VertexOrientation2DF0D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_VertexOrientation2DF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::VertexOrientation2DF0D *arg1 = (Functions0D::VertexOrientation2DF0D *) 0 ;
+  Interface0DIterator *arg2 = 0 ;
+  Geometry::Vec2f result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:VertexOrientation2DF0D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__VertexOrientation2DF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VertexOrientation2DF0D___call__" "', argument " "1"" of type '" "Functions0D::VertexOrientation2DF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::VertexOrientation2DF0D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "VertexOrientation2DF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "VertexOrientation2DF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0DIterator * >(argp2);
+  {
+    try {
+      result = (arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_VertexOrientation2DF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::VertexOrientation2DF0D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_VertexOrientation2DF0D")) SWIG_fail;
+  {
+    try {
+      result = (Functions0D::VertexOrientation2DF0D *)new Functions0D::VertexOrientation2DF0D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions0D__VertexOrientation2DF0D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_VertexOrientation2DF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::VertexOrientation2DF0D *arg1 = (Functions0D::VertexOrientation2DF0D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_VertexOrientation2DF0D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__VertexOrientation2DF0D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_VertexOrientation2DF0D" "', argument " "1"" of type '" "Functions0D::VertexOrientation2DF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::VertexOrientation2DF0D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *VertexOrientation2DF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__VertexOrientation2DF0D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_VertexOrientation3DF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::VertexOrientation3DF0D *arg1 = (Functions0D::VertexOrientation3DF0D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:VertexOrientation3DF0D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__VertexOrientation3DF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VertexOrientation3DF0D_getName" "', argument " "1"" of type '" "Functions0D::VertexOrientation3DF0D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::VertexOrientation3DF0D * >(argp1);
+  {
+    try {
+      result = ((Functions0D::VertexOrientation3DF0D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_VertexOrientation3DF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::VertexOrientation3DF0D *arg1 = (Functions0D::VertexOrientation3DF0D *) 0 ;
+  Interface0DIterator *arg2 = 0 ;
+  Geometry::Vec3f result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:VertexOrientation3DF0D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__VertexOrientation3DF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "VertexOrientation3DF0D___call__" "', argument " "1"" of type '" "Functions0D::VertexOrientation3DF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::VertexOrientation3DF0D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "VertexOrientation3DF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "VertexOrientation3DF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0DIterator * >(argp2);
+  {
+    try {
+      result = (arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_VertexOrientation3DF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::VertexOrientation3DF0D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_VertexOrientation3DF0D")) SWIG_fail;
+  {
+    try {
+      result = (Functions0D::VertexOrientation3DF0D *)new Functions0D::VertexOrientation3DF0D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions0D__VertexOrientation3DF0D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_VertexOrientation3DF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::VertexOrientation3DF0D *arg1 = (Functions0D::VertexOrientation3DF0D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_VertexOrientation3DF0D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__VertexOrientation3DF0D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_VertexOrientation3DF0D" "', argument " "1"" of type '" "Functions0D::VertexOrientation3DF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::VertexOrientation3DF0D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *VertexOrientation3DF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__VertexOrientation3DF0D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_Curvature2DAngleF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::Curvature2DAngleF0D *arg1 = (Functions0D::Curvature2DAngleF0D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Curvature2DAngleF0D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__Curvature2DAngleF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Curvature2DAngleF0D_getName" "', argument " "1"" of type '" "Functions0D::Curvature2DAngleF0D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::Curvature2DAngleF0D * >(argp1);
+  {
+    try {
+      result = ((Functions0D::Curvature2DAngleF0D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Curvature2DAngleF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::Curvature2DAngleF0D *arg1 = (Functions0D::Curvature2DAngleF0D *) 0 ;
+  Interface0DIterator *arg2 = 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Curvature2DAngleF0D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__Curvature2DAngleF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Curvature2DAngleF0D___call__" "', argument " "1"" of type '" "Functions0D::Curvature2DAngleF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::Curvature2DAngleF0D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Curvature2DAngleF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Curvature2DAngleF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0DIterator * >(argp2);
+  {
+    try {
+      result = (real)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Curvature2DAngleF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::Curvature2DAngleF0D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_Curvature2DAngleF0D")) SWIG_fail;
+  {
+    try {
+      result = (Functions0D::Curvature2DAngleF0D *)new Functions0D::Curvature2DAngleF0D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions0D__Curvature2DAngleF0D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_Curvature2DAngleF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::Curvature2DAngleF0D *arg1 = (Functions0D::Curvature2DAngleF0D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_Curvature2DAngleF0D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__Curvature2DAngleF0D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Curvature2DAngleF0D" "', argument " "1"" of type '" "Functions0D::Curvature2DAngleF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::Curvature2DAngleF0D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *Curvature2DAngleF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__Curvature2DAngleF0D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_ZDiscontinuityF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::ZDiscontinuityF0D *arg1 = (Functions0D::ZDiscontinuityF0D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ZDiscontinuityF0D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__ZDiscontinuityF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ZDiscontinuityF0D_getName" "', argument " "1"" of type '" "Functions0D::ZDiscontinuityF0D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::ZDiscontinuityF0D * >(argp1);
+  {
+    try {
+      result = ((Functions0D::ZDiscontinuityF0D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ZDiscontinuityF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::ZDiscontinuityF0D *arg1 = (Functions0D::ZDiscontinuityF0D *) 0 ;
+  Interface0DIterator *arg2 = 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ZDiscontinuityF0D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__ZDiscontinuityF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ZDiscontinuityF0D___call__" "', argument " "1"" of type '" "Functions0D::ZDiscontinuityF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::ZDiscontinuityF0D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ZDiscontinuityF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ZDiscontinuityF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0DIterator * >(argp2);
+  {
+    try {
+      result = (real)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ZDiscontinuityF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::ZDiscontinuityF0D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_ZDiscontinuityF0D")) SWIG_fail;
+  {
+    try {
+      result = (Functions0D::ZDiscontinuityF0D *)new Functions0D::ZDiscontinuityF0D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions0D__ZDiscontinuityF0D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ZDiscontinuityF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::ZDiscontinuityF0D *arg1 = (Functions0D::ZDiscontinuityF0D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_ZDiscontinuityF0D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__ZDiscontinuityF0D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ZDiscontinuityF0D" "', argument " "1"" of type '" "Functions0D::ZDiscontinuityF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::ZDiscontinuityF0D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *ZDiscontinuityF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__ZDiscontinuityF0D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_Normal2DF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::Normal2DF0D *arg1 = (Functions0D::Normal2DF0D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Normal2DF0D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__Normal2DF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Normal2DF0D_getName" "', argument " "1"" of type '" "Functions0D::Normal2DF0D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::Normal2DF0D * >(argp1);
+  {
+    try {
+      result = ((Functions0D::Normal2DF0D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Normal2DF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::Normal2DF0D *arg1 = (Functions0D::Normal2DF0D *) 0 ;
+  Interface0DIterator *arg2 = 0 ;
+  Geometry::Vec2f result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Normal2DF0D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__Normal2DF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Normal2DF0D___call__" "', argument " "1"" of type '" "Functions0D::Normal2DF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::Normal2DF0D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Normal2DF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Normal2DF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0DIterator * >(argp2);
+  {
+    try {
+      result = (arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Normal2DF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::Normal2DF0D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_Normal2DF0D")) SWIG_fail;
+  {
+    try {
+      result = (Functions0D::Normal2DF0D *)new Functions0D::Normal2DF0D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions0D__Normal2DF0D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_Normal2DF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::Normal2DF0D *arg1 = (Functions0D::Normal2DF0D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_Normal2DF0D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__Normal2DF0D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Normal2DF0D" "', argument " "1"" of type '" "Functions0D::Normal2DF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::Normal2DF0D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *Normal2DF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__Normal2DF0D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_MaterialF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::MaterialF0D *arg1 = (Functions0D::MaterialF0D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:MaterialF0D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__MaterialF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MaterialF0D_getName" "', argument " "1"" of type '" "Functions0D::MaterialF0D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::MaterialF0D * >(argp1);
+  {
+    try {
+      result = ((Functions0D::MaterialF0D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_MaterialF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::MaterialF0D *arg1 = (Functions0D::MaterialF0D *) 0 ;
+  Interface0DIterator *arg2 = 0 ;
+  Material result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:MaterialF0D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__MaterialF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MaterialF0D___call__" "', argument " "1"" of type '" "Functions0D::MaterialF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::MaterialF0D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MaterialF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "MaterialF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0DIterator * >(argp2);
+  {
+    try {
+      result = (arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Material(static_cast< const Material& >(result))), SWIGTYPE_p_Material, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_MaterialF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::MaterialF0D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_MaterialF0D")) SWIG_fail;
+  {
+    try {
+      result = (Functions0D::MaterialF0D *)new Functions0D::MaterialF0D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions0D__MaterialF0D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_MaterialF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::MaterialF0D *arg1 = (Functions0D::MaterialF0D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_MaterialF0D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__MaterialF0D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_MaterialF0D" "', argument " "1"" of type '" "Functions0D::MaterialF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::MaterialF0D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *MaterialF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__MaterialF0D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_ShapeIdF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::ShapeIdF0D *arg1 = (Functions0D::ShapeIdF0D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ShapeIdF0D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__ShapeIdF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShapeIdF0D_getName" "', argument " "1"" of type '" "Functions0D::ShapeIdF0D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::ShapeIdF0D * >(argp1);
+  {
+    try {
+      result = ((Functions0D::ShapeIdF0D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShapeIdF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::ShapeIdF0D *arg1 = (Functions0D::ShapeIdF0D *) 0 ;
+  Interface0DIterator *arg2 = 0 ;
+  Id result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ShapeIdF0D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__ShapeIdF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShapeIdF0D___call__" "', argument " "1"" of type '" "Functions0D::ShapeIdF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::ShapeIdF0D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ShapeIdF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ShapeIdF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0DIterator * >(argp2);
+  {
+    try {
+      result = (arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Id(static_cast< const Id& >(result))), SWIGTYPE_p_Id, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ShapeIdF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::ShapeIdF0D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_ShapeIdF0D")) SWIG_fail;
+  {
+    try {
+      result = (Functions0D::ShapeIdF0D *)new Functions0D::ShapeIdF0D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions0D__ShapeIdF0D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ShapeIdF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::ShapeIdF0D *arg1 = (Functions0D::ShapeIdF0D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_ShapeIdF0D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__ShapeIdF0D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ShapeIdF0D" "', argument " "1"" of type '" "Functions0D::ShapeIdF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::ShapeIdF0D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *ShapeIdF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__ShapeIdF0D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_QuantitativeInvisibilityF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::QuantitativeInvisibilityF0D *arg1 = (Functions0D::QuantitativeInvisibilityF0D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:QuantitativeInvisibilityF0D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__QuantitativeInvisibilityF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "QuantitativeInvisibilityF0D_getName" "', argument " "1"" of type '" "Functions0D::QuantitativeInvisibilityF0D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::QuantitativeInvisibilityF0D * >(argp1);
+  {
+    try {
+      result = ((Functions0D::QuantitativeInvisibilityF0D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_QuantitativeInvisibilityF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::QuantitativeInvisibilityF0D *arg1 = (Functions0D::QuantitativeInvisibilityF0D *) 0 ;
+  Interface0DIterator *arg2 = 0 ;
+  unsigned int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:QuantitativeInvisibilityF0D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__QuantitativeInvisibilityF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "QuantitativeInvisibilityF0D___call__" "', argument " "1"" of type '" "Functions0D::QuantitativeInvisibilityF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::QuantitativeInvisibilityF0D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "QuantitativeInvisibilityF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "QuantitativeInvisibilityF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0DIterator * >(argp2);
+  {
+    try {
+      result = (unsigned int)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_QuantitativeInvisibilityF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::QuantitativeInvisibilityF0D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_QuantitativeInvisibilityF0D")) SWIG_fail;
+  {
+    try {
+      result = (Functions0D::QuantitativeInvisibilityF0D *)new Functions0D::QuantitativeInvisibilityF0D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions0D__QuantitativeInvisibilityF0D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_QuantitativeInvisibilityF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::QuantitativeInvisibilityF0D *arg1 = (Functions0D::QuantitativeInvisibilityF0D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_QuantitativeInvisibilityF0D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__QuantitativeInvisibilityF0D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_QuantitativeInvisibilityF0D" "', argument " "1"" of type '" "Functions0D::QuantitativeInvisibilityF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::QuantitativeInvisibilityF0D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *QuantitativeInvisibilityF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__QuantitativeInvisibilityF0D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_CurveNatureF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::CurveNatureF0D *arg1 = (Functions0D::CurveNatureF0D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurveNatureF0D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__CurveNatureF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurveNatureF0D_getName" "', argument " "1"" of type '" "Functions0D::CurveNatureF0D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::CurveNatureF0D * >(argp1);
+  {
+    try {
+      result = ((Functions0D::CurveNatureF0D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurveNatureF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::CurveNatureF0D *arg1 = (Functions0D::CurveNatureF0D *) 0 ;
+  Interface0DIterator *arg2 = 0 ;
+  Nature::EdgeNature result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:CurveNatureF0D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__CurveNatureF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurveNatureF0D___call__" "', argument " "1"" of type '" "Functions0D::CurveNatureF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::CurveNatureF0D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CurveNatureF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CurveNatureF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0DIterator * >(argp2);
+  {
+    try {
+      result = (Nature::EdgeNature)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_CurveNatureF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::CurveNatureF0D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_CurveNatureF0D")) SWIG_fail;
+  {
+    try {
+      result = (Functions0D::CurveNatureF0D *)new Functions0D::CurveNatureF0D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions0D__CurveNatureF0D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_CurveNatureF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::CurveNatureF0D *arg1 = (Functions0D::CurveNatureF0D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_CurveNatureF0D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__CurveNatureF0D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CurveNatureF0D" "', argument " "1"" of type '" "Functions0D::CurveNatureF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::CurveNatureF0D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *CurveNatureF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__CurveNatureF0D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_GetShapeF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetShapeF0D *arg1 = (Functions0D::GetShapeF0D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:GetShapeF0D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__GetShapeF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetShapeF0D_getName" "', argument " "1"" of type '" "Functions0D::GetShapeF0D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::GetShapeF0D * >(argp1);
+  {
+    try {
+      result = ((Functions0D::GetShapeF0D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_GetShapeF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetShapeF0D *arg1 = (Functions0D::GetShapeF0D *) 0 ;
+  Interface0DIterator *arg2 = 0 ;
+  ViewShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:GetShapeF0D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__GetShapeF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetShapeF0D___call__" "', argument " "1"" of type '" "Functions0D::GetShapeF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::GetShapeF0D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GetShapeF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GetShapeF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0DIterator * >(argp2);
+  {
+    try {
+      result = (ViewShape *)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewShape, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_GetShapeF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetShapeF0D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_GetShapeF0D")) SWIG_fail;
+  {
+    try {
+      result = (Functions0D::GetShapeF0D *)new Functions0D::GetShapeF0D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions0D__GetShapeF0D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetShapeF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetShapeF0D *arg1 = (Functions0D::GetShapeF0D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_GetShapeF0D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__GetShapeF0D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_GetShapeF0D" "', argument " "1"" of type '" "Functions0D::GetShapeF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::GetShapeF0D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *GetShapeF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetShapeF0D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_GetOccludersF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetOccludersF0D *arg1 = (Functions0D::GetOccludersF0D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:GetOccludersF0D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__GetOccludersF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetOccludersF0D_getName" "', argument " "1"" of type '" "Functions0D::GetOccludersF0D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::GetOccludersF0D * >(argp1);
+  {
+    try {
+      result = ((Functions0D::GetOccludersF0D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_GetOccludersF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetOccludersF0D *arg1 = (Functions0D::GetOccludersF0D *) 0 ;
+  Interface0DIterator *arg2 = 0 ;
+  std::vector<ViewShape *,std::allocator<ViewShape * > > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:GetOccludersF0D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__GetOccludersF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetOccludersF0D___call__" "', argument " "1"" of type '" "Functions0D::GetOccludersF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::GetOccludersF0D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GetOccludersF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GetOccludersF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0DIterator * >(argp2);
+  {
+    try {
+      result = (arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = swig::from(static_cast< std::vector<ViewShape*,std::allocator<ViewShape * > > >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_GetOccludersF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetOccludersF0D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_GetOccludersF0D")) SWIG_fail;
+  {
+    try {
+      result = (Functions0D::GetOccludersF0D *)new Functions0D::GetOccludersF0D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions0D__GetOccludersF0D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetOccludersF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetOccludersF0D *arg1 = (Functions0D::GetOccludersF0D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_GetOccludersF0D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__GetOccludersF0D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_GetOccludersF0D" "', argument " "1"" of type '" "Functions0D::GetOccludersF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::GetOccludersF0D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *GetOccludersF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetOccludersF0D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_GetOccludeeF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetOccludeeF0D *arg1 = (Functions0D::GetOccludeeF0D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:GetOccludeeF0D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__GetOccludeeF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetOccludeeF0D_getName" "', argument " "1"" of type '" "Functions0D::GetOccludeeF0D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::GetOccludeeF0D * >(argp1);
+  {
+    try {
+      result = ((Functions0D::GetOccludeeF0D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_GetOccludeeF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetOccludeeF0D *arg1 = (Functions0D::GetOccludeeF0D *) 0 ;
+  Interface0DIterator *arg2 = 0 ;
+  ViewShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:GetOccludeeF0D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__GetOccludeeF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetOccludeeF0D___call__" "', argument " "1"" of type '" "Functions0D::GetOccludeeF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::GetOccludeeF0D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GetOccludeeF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GetOccludeeF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0DIterator * >(argp2);
+  {
+    try {
+      result = (ViewShape *)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewShape, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_GetOccludeeF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetOccludeeF0D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_GetOccludeeF0D")) SWIG_fail;
+  {
+    try {
+      result = (Functions0D::GetOccludeeF0D *)new Functions0D::GetOccludeeF0D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions0D__GetOccludeeF0D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetOccludeeF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetOccludeeF0D *arg1 = (Functions0D::GetOccludeeF0D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_GetOccludeeF0D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__GetOccludeeF0D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_GetOccludeeF0D" "', argument " "1"" of type '" "Functions0D::GetOccludeeF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::GetOccludeeF0D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *GetOccludeeF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetOccludeeF0D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_getFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0D *arg1 = 0 ;
+  Interface0D *arg2 = 0 ;
+  FEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:getFEdge",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_Interface0D,  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "getFEdge" "', argument " "1"" of type '" "Interface0D &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "getFEdge" "', argument " "1"" of type '" "Interface0D &""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "getFEdge" "', argument " "2"" of type '" "Interface0D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "getFEdge" "', argument " "2"" of type '" "Interface0D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0D * >(argp2);
+  {
+    try {
+      result = (FEdge *)Functions0D::getFEdge(*arg1,*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FEdge, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVoid__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  UnaryFunction1D<void > *result = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction1DVoid",&obj0)) SWIG_fail;
+  arg1 = obj0;
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (UnaryFunction1D<void > *)new SwigDirector_UnaryFunction1DVoid(arg1); 
+      } else {
+        result = (UnaryFunction1D<void > *)new UnaryFunction1D<void >(); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTvoid_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVoid__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  IntegrationType arg2 ;
+  UnaryFunction1D<void > *result = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_UnaryFunction1DVoid",&obj0,&obj1)) SWIG_fail;
+  arg1 = obj0;
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_UnaryFunction1DVoid" "', argument " "2"" of type '" "IntegrationType""'");
+  } 
+  arg2 = static_cast< IntegrationType >(val2);
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (UnaryFunction1D<void > *)new SwigDirector_UnaryFunction1DVoid(arg1,arg2); 
+      } else {
+        result = (UnaryFunction1D<void > *)new UnaryFunction1D<void >(arg2); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTvoid_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVoid(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    _v = (argv[0] != 0);
+    if (_v) {
+      return _wrap_new_UnaryFunction1DVoid__SWIG_0(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    _v = (argv[0] != 0);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_new_UnaryFunction1DVoid__SWIG_1(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DVoid'.\n  Possible C/C++ prototypes are:\n    UnaryFunction1D<(void)>(PyObject *)\n    UnaryFunction1D<(void)>(PyObject *,IntegrationType)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_UnaryFunction1DVoid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction1D<void > *arg1 = (UnaryFunction1D<void > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction1DVoid",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTvoid_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DVoid" "', argument " "1"" of type '" "UnaryFunction1D<void > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction1D<void > * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DVoid_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction1D<void > *arg1 = (UnaryFunction1D<void > *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DVoid_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTvoid_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVoid_getName" "', argument " "1"" of type '" "UnaryFunction1D<void > const *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction1D<void > * >(argp1);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          result = ((UnaryFunction1D<void > const *)arg1)->UnaryFunction1D<void >::getName();
+        } else {
+          result = ((UnaryFunction1D<void > const *)arg1)->getName();
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DVoid___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction1D<void > *arg1 = (UnaryFunction1D<void > *) 0 ;
+  Interface1D *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DVoid___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTvoid_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVoid___call__" "', argument " "1"" of type '" "UnaryFunction1D<void > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction1D<void > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction1DVoid___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "UnaryFunction1DVoid___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          (arg1)->UnaryFunction1D<void >::operator ()(*arg2);
+        } else {
+          (arg1)->operator ()(*arg2);
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DVoid_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction1D<void > *arg1 = (UnaryFunction1D<void > *) 0 ;
+  IntegrationType arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DVoid_setIntegrationType",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTvoid_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVoid_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<void > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction1D<void > * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "UnaryFunction1DVoid_setIntegrationType" "', argument " "2"" of type '" "IntegrationType""'");
+  } 
+  arg2 = static_cast< IntegrationType >(val2);
+  {
+    try {
+      (arg1)->setIntegrationType(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DVoid_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction1D<void > *arg1 = (UnaryFunction1D<void > *) 0 ;
+  IntegrationType result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DVoid_getIntegrationType",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTvoid_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVoid_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<void > const *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction1D<void > * >(argp1);
+  {
+    try {
+      result = (IntegrationType)((UnaryFunction1D<void > const *)arg1)->getIntegrationType();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_disown_UnaryFunction1DVoid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction1D<void > *arg1 = (UnaryFunction1D<void > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction1DVoid",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTvoid_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction1DVoid" "', argument " "1"" of type '" "UnaryFunction1D<void > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction1D<void > * >(argp1);
+  {
+    Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
+    if (director) director->swig_disown();
+  }
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *UnaryFunction1DVoid_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DTvoid_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_UnaryFunction1DUnsigned__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  UnaryFunction1D<unsigned int > *result = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction1DUnsigned",&obj0)) SWIG_fail;
+  arg1 = obj0;
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (UnaryFunction1D<unsigned int > *)new SwigDirector_UnaryFunction1DUnsigned(arg1); 
+      } else {
+        result = (UnaryFunction1D<unsigned int > *)new UnaryFunction1D<unsigned int >(); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTunsigned_int_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_UnaryFunction1DUnsigned__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  IntegrationType arg2 ;
+  UnaryFunction1D<unsigned int > *result = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_UnaryFunction1DUnsigned",&obj0,&obj1)) SWIG_fail;
+  arg1 = obj0;
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_UnaryFunction1DUnsigned" "', argument " "2"" of type '" "IntegrationType""'");
+  } 
+  arg2 = static_cast< IntegrationType >(val2);
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (UnaryFunction1D<unsigned int > *)new SwigDirector_UnaryFunction1DUnsigned(arg1,arg2); 
+      } else {
+        result = (UnaryFunction1D<unsigned int > *)new UnaryFunction1D<unsigned int >(arg2); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTunsigned_int_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_UnaryFunction1DUnsigned(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    _v = (argv[0] != 0);
+    if (_v) {
+      return _wrap_new_UnaryFunction1DUnsigned__SWIG_0(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    _v = (argv[0] != 0);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_new_UnaryFunction1DUnsigned__SWIG_1(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DUnsigned'.\n  Possible C/C++ prototypes are:\n    UnaryFunction1D<(unsigned int)>(PyObject *)\n    UnaryFunction1D<(unsigned int)>(PyObject *,IntegrationType)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_UnaryFunction1DUnsigned(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction1D<unsigned int > *arg1 = (UnaryFunction1D<unsigned int > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction1DUnsigned",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTunsigned_int_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DUnsigned" "', argument " "1"" of type '" "UnaryFunction1D<unsigned int > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction1D<unsigned int > * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DUnsigned_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction1D<unsigned int > *arg1 = (UnaryFunction1D<unsigned int > *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DUnsigned_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTunsigned_int_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DUnsigned_getName" "', argument " "1"" of type '" "UnaryFunction1D<unsigned int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction1D<unsigned int > * >(argp1);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          result = ((UnaryFunction1D<unsigned int > const *)arg1)->UnaryFunction1D<unsigned int >::getName();
+        } else {
+          result = ((UnaryFunction1D<unsigned int > const *)arg1)->getName();
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DUnsigned___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction1D<unsigned int > *arg1 = (UnaryFunction1D<unsigned int > *) 0 ;
+  Interface1D *arg2 = 0 ;
+  unsigned int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DUnsigned___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTunsigned_int_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DUnsigned___call__" "', argument " "1"" of type '" "UnaryFunction1D<unsigned int > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction1D<unsigned int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction1DUnsigned___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "UnaryFunction1DUnsigned___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          result = (unsigned int)(arg1)->UnaryFunction1D<unsigned int >::operator ()(*arg2);
+        } else {
+          result = (unsigned int)(arg1)->operator ()(*arg2);
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DUnsigned_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction1D<unsigned int > *arg1 = (UnaryFunction1D<unsigned int > *) 0 ;
+  IntegrationType arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DUnsigned_setIntegrationType",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTunsigned_int_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DUnsigned_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<unsigned int > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction1D<unsigned int > * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "UnaryFunction1DUnsigned_setIntegrationType" "', argument " "2"" of type '" "IntegrationType""'");
+  } 
+  arg2 = static_cast< IntegrationType >(val2);
+  {
+    try {
+      (arg1)->setIntegrationType(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DUnsigned_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction1D<unsigned int > *arg1 = (UnaryFunction1D<unsigned int > *) 0 ;
+  IntegrationType result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DUnsigned_getIntegrationType",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTunsigned_int_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DUnsigned_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<unsigned int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction1D<unsigned int > * >(argp1);
+  {
+    try {
+      result = (IntegrationType)((UnaryFunction1D<unsigned int > const *)arg1)->getIntegrationType();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_disown_UnaryFunction1DUnsigned(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction1D<unsigned int > *arg1 = (UnaryFunction1D<unsigned int > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction1DUnsigned",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTunsigned_int_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction1DUnsigned" "', argument " "1"" of type '" "UnaryFunction1D<unsigned int > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction1D<unsigned int > * >(argp1);
+  {
+    Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
+    if (director) director->swig_disown();
+  }
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *UnaryFunction1DUnsigned_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DTunsigned_int_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_UnaryFunction1DFloat__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  UnaryFunction1D<float > *result = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction1DFloat",&obj0)) SWIG_fail;
+  arg1 = obj0;
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (UnaryFunction1D<float > *)new SwigDirector_UnaryFunction1DFloat(arg1); 
+      } else {
+        result = (UnaryFunction1D<float > *)new UnaryFunction1D<float >(); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTfloat_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_UnaryFunction1DFloat__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  IntegrationType arg2 ;
+  UnaryFunction1D<float > *result = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_UnaryFunction1DFloat",&obj0,&obj1)) SWIG_fail;
+  arg1 = obj0;
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_UnaryFunction1DFloat" "', argument " "2"" of type '" "IntegrationType""'");
+  } 
+  arg2 = static_cast< IntegrationType >(val2);
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (UnaryFunction1D<float > *)new SwigDirector_UnaryFunction1DFloat(arg1,arg2); 
+      } else {
+        result = (UnaryFunction1D<float > *)new UnaryFunction1D<float >(arg2); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTfloat_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_UnaryFunction1DFloat(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    _v = (argv[0] != 0);
+    if (_v) {
+      return _wrap_new_UnaryFunction1DFloat__SWIG_0(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    _v = (argv[0] != 0);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_new_UnaryFunction1DFloat__SWIG_1(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DFloat'.\n  Possible C/C++ prototypes are:\n    UnaryFunction1D<(float)>(PyObject *)\n    UnaryFunction1D<(float)>(PyObject *,IntegrationType)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_UnaryFunction1DFloat(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction1D<float > *arg1 = (UnaryFunction1D<float > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction1DFloat",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTfloat_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DFloat" "', argument " "1"" of type '" "UnaryFunction1D<float > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction1D<float > * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DFloat_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction1D<float > *arg1 = (UnaryFunction1D<float > *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DFloat_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTfloat_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DFloat_getName" "', argument " "1"" of type '" "UnaryFunction1D<float > const *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction1D<float > * >(argp1);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          result = ((UnaryFunction1D<float > const *)arg1)->UnaryFunction1D<float >::getName();
+        } else {
+          result = ((UnaryFunction1D<float > const *)arg1)->getName();
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DFloat___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction1D<float > *arg1 = (UnaryFunction1D<float > *) 0 ;
+  Interface1D *arg2 = 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DFloat___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTfloat_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DFloat___call__" "', argument " "1"" of type '" "UnaryFunction1D<float > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction1D<float > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction1DFloat___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "UnaryFunction1DFloat___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          result = (float)(arg1)->UnaryFunction1D<float >::operator ()(*arg2);
+        } else {
+          result = (float)(arg1)->operator ()(*arg2);
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DFloat_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction1D<float > *arg1 = (UnaryFunction1D<float > *) 0 ;
+  IntegrationType arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DFloat_setIntegrationType",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTfloat_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DFloat_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<float > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction1D<float > * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "UnaryFunction1DFloat_setIntegrationType" "', argument " "2"" of type '" "IntegrationType""'");
+  } 
+  arg2 = static_cast< IntegrationType >(val2);
+  {
+    try {
+      (arg1)->setIntegrationType(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DFloat_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction1D<float > *arg1 = (UnaryFunction1D<float > *) 0 ;
+  IntegrationType result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DFloat_getIntegrationType",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTfloat_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DFloat_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<float > const *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction1D<float > * >(argp1);
+  {
+    try {
+      result = (IntegrationType)((UnaryFunction1D<float > const *)arg1)->getIntegrationType();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_disown_UnaryFunction1DFloat(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction1D<float > *arg1 = (UnaryFunction1D<float > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction1DFloat",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTfloat_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction1DFloat" "', argument " "1"" of type '" "UnaryFunction1D<float > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction1D<float > * >(argp1);
+  {
+    Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
+    if (director) director->swig_disown();
+  }
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *UnaryFunction1DFloat_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DTfloat_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_UnaryFunction1DDouble__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  UnaryFunction1D<double > *result = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction1DDouble",&obj0)) SWIG_fail;
+  arg1 = obj0;
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (UnaryFunction1D<double > *)new SwigDirector_UnaryFunction1DDouble(arg1); 
+      } else {
+        result = (UnaryFunction1D<double > *)new UnaryFunction1D<double >(); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTdouble_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_UnaryFunction1DDouble__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  IntegrationType arg2 ;
+  UnaryFunction1D<double > *result = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_UnaryFunction1DDouble",&obj0,&obj1)) SWIG_fail;
+  arg1 = obj0;
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_UnaryFunction1DDouble" "', argument " "2"" of type '" "IntegrationType""'");
+  } 
+  arg2 = static_cast< IntegrationType >(val2);
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (UnaryFunction1D<double > *)new SwigDirector_UnaryFunction1DDouble(arg1,arg2); 
+      } else {
+        result = (UnaryFunction1D<double > *)new UnaryFunction1D<double >(arg2); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTdouble_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_UnaryFunction1DDouble(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    _v = (argv[0] != 0);
+    if (_v) {
+      return _wrap_new_UnaryFunction1DDouble__SWIG_0(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    _v = (argv[0] != 0);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_new_UnaryFunction1DDouble__SWIG_1(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DDouble'.\n  Possible C/C++ prototypes are:\n    UnaryFunction1D<(double)>(PyObject *)\n    UnaryFunction1D<(double)>(PyObject *,IntegrationType)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_UnaryFunction1DDouble(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction1D<double > *arg1 = (UnaryFunction1D<double > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction1DDouble",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTdouble_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DDouble" "', argument " "1"" of type '" "UnaryFunction1D<double > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction1D<double > * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DDouble_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction1D<double > *arg1 = (UnaryFunction1D<double > *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DDouble_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTdouble_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DDouble_getName" "', argument " "1"" of type '" "UnaryFunction1D<double > const *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction1D<double > * >(argp1);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          result = ((UnaryFunction1D<double > const *)arg1)->UnaryFunction1D<double >::getName();
+        } else {
+          result = ((UnaryFunction1D<double > const *)arg1)->getName();
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DDouble___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction1D<double > *arg1 = (UnaryFunction1D<double > *) 0 ;
+  Interface1D *arg2 = 0 ;
+  double result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DDouble___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTdouble_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DDouble___call__" "', argument " "1"" of type '" "UnaryFunction1D<double > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction1D<double > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction1DDouble___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "UnaryFunction1DDouble___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          result = (double)(arg1)->UnaryFunction1D<double >::operator ()(*arg2);
+        } else {
+          result = (double)(arg1)->operator ()(*arg2);
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DDouble_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction1D<double > *arg1 = (UnaryFunction1D<double > *) 0 ;
+  IntegrationType arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DDouble_setIntegrationType",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTdouble_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DDouble_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<double > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction1D<double > * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "UnaryFunction1DDouble_setIntegrationType" "', argument " "2"" of type '" "IntegrationType""'");
+  } 
+  arg2 = static_cast< IntegrationType >(val2);
+  {
+    try {
+      (arg1)->setIntegrationType(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DDouble_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction1D<double > *arg1 = (UnaryFunction1D<double > *) 0 ;
+  IntegrationType result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DDouble_getIntegrationType",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTdouble_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DDouble_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<double > const *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction1D<double > * >(argp1);
+  {
+    try {
+      result = (IntegrationType)((UnaryFunction1D<double > const *)arg1)->getIntegrationType();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_disown_UnaryFunction1DDouble(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction1D<double > *arg1 = (UnaryFunction1D<double > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction1DDouble",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTdouble_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction1DDouble" "', argument " "1"" of type '" "UnaryFunction1D<double > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction1D<double > * >(argp1);
+  {
+    Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
+    if (director) director->swig_disown();
+  }
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *UnaryFunction1DDouble_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DTdouble_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec2f__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  UnaryFunction1D<Geometry::Vec2f > *result = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction1DVec2f",&obj0)) SWIG_fail;
+  arg1 = obj0;
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (UnaryFunction1D<Geometry::Vec2f > *)new SwigDirector_UnaryFunction1DVec2f(arg1); 
+      } else {
+        result = (UnaryFunction1D<Geometry::Vec2f > *)new UnaryFunction1D<Geometry::Vec2f >(); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec2f__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  IntegrationType arg2 ;
+  UnaryFunction1D<Geometry::Vec2f > *result = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_UnaryFunction1DVec2f",&obj0,&obj1)) SWIG_fail;
+  arg1 = obj0;
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_UnaryFunction1DVec2f" "', argument " "2"" of type '" "IntegrationType""'");
+  } 
+  arg2 = static_cast< IntegrationType >(val2);
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (UnaryFunction1D<Geometry::Vec2f > *)new SwigDirector_UnaryFunction1DVec2f(arg1,arg2); 
+      } else {
+        result = (UnaryFunction1D<Geometry::Vec2f > *)new UnaryFunction1D<Geometry::Vec2f >(arg2); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec2f(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    _v = (argv[0] != 0);
+    if (_v) {
+      return _wrap_new_UnaryFunction1DVec2f__SWIG_0(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    _v = (argv[0] != 0);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_new_UnaryFunction1DVec2f__SWIG_1(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DVec2f'.\n  Possible C/C++ prototypes are:\n    UnaryFunction1D<(Geometry::Vec2f)>(PyObject *)\n    UnaryFunction1D<(Geometry::Vec2f)>(PyObject *,IntegrationType)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_UnaryFunction1DVec2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction1D<Geometry::Vec2f > *arg1 = (UnaryFunction1D<Geometry::Vec2f > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction1DVec2f",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DVec2f" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec2f > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec2f > * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DVec2f_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction1D<Geometry::Vec2f > *arg1 = (UnaryFunction1D<Geometry::Vec2f > *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DVec2f_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec2f_getName" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec2f > const *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec2f > * >(argp1);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          result = ((UnaryFunction1D<Geometry::Vec2f > const *)arg1)->UnaryFunction1D<VecMat::Vec2<float > >::getName();
+        } else {
+          result = ((UnaryFunction1D<Geometry::Vec2f > const *)arg1)->getName();
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DVec2f___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction1D<Geometry::Vec2f > *arg1 = (UnaryFunction1D<Geometry::Vec2f > *) 0 ;
+  Interface1D *arg2 = 0 ;
+  VecMat::Vec2<float > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DVec2f___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec2f___call__" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec2f > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec2f > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction1DVec2f___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "UnaryFunction1DVec2f___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          result = (arg1)->UnaryFunction1D<VecMat::Vec2<float > >::operator ()(*arg2);
+        } else {
+          result = (arg1)->operator ()(*arg2);
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<float >(static_cast< const VecMat::Vec2<float >& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DVec2f_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction1D<Geometry::Vec2f > *arg1 = (UnaryFunction1D<Geometry::Vec2f > *) 0 ;
+  IntegrationType arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DVec2f_setIntegrationType",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec2f_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec2f > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec2f > * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "UnaryFunction1DVec2f_setIntegrationType" "', argument " "2"" of type '" "IntegrationType""'");
+  } 
+  arg2 = static_cast< IntegrationType >(val2);
+  {
+    try {
+      (arg1)->setIntegrationType(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DVec2f_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction1D<Geometry::Vec2f > *arg1 = (UnaryFunction1D<Geometry::Vec2f > *) 0 ;
+  IntegrationType result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DVec2f_getIntegrationType",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec2f_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec2f > const *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec2f > * >(argp1);
+  {
+    try {
+      result = (IntegrationType)((UnaryFunction1D<Geometry::Vec2f > const *)arg1)->getIntegrationType();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_disown_UnaryFunction1DVec2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction1D<Geometry::Vec2f > *arg1 = (UnaryFunction1D<Geometry::Vec2f > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction1DVec2f",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction1DVec2f" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec2f > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec2f > * >(argp1);
+  {
+    Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
+    if (director) director->swig_disown();
+  }
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *UnaryFunction1DVec2f_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec3f__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  UnaryFunction1D<Geometry::Vec3f > *result = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction1DVec3f",&obj0)) SWIG_fail;
+  arg1 = obj0;
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (UnaryFunction1D<Geometry::Vec3f > *)new SwigDirector_UnaryFunction1DVec3f(arg1); 
+      } else {
+        result = (UnaryFunction1D<Geometry::Vec3f > *)new UnaryFunction1D<Geometry::Vec3f >(); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec3f__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  IntegrationType arg2 ;
+  UnaryFunction1D<Geometry::Vec3f > *result = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_UnaryFunction1DVec3f",&obj0,&obj1)) SWIG_fail;
+  arg1 = obj0;
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_UnaryFunction1DVec3f" "', argument " "2"" of type '" "IntegrationType""'");
+  } 
+  arg2 = static_cast< IntegrationType >(val2);
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (UnaryFunction1D<Geometry::Vec3f > *)new SwigDirector_UnaryFunction1DVec3f(arg1,arg2); 
+      } else {
+        result = (UnaryFunction1D<Geometry::Vec3f > *)new UnaryFunction1D<Geometry::Vec3f >(arg2); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec3f(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    _v = (argv[0] != 0);
+    if (_v) {
+      return _wrap_new_UnaryFunction1DVec3f__SWIG_0(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    _v = (argv[0] != 0);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_new_UnaryFunction1DVec3f__SWIG_1(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DVec3f'.\n  Possible C/C++ prototypes are:\n    UnaryFunction1D<(Geometry::Vec3f)>(PyObject *)\n    UnaryFunction1D<(Geometry::Vec3f)>(PyObject *,IntegrationType)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_UnaryFunction1DVec3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction1D<Geometry::Vec3f > *arg1 = (UnaryFunction1D<Geometry::Vec3f > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction1DVec3f",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DVec3f" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec3f > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec3f > * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DVec3f_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction1D<Geometry::Vec3f > *arg1 = (UnaryFunction1D<Geometry::Vec3f > *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DVec3f_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec3f_getName" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec3f > const *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec3f > * >(argp1);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          result = ((UnaryFunction1D<Geometry::Vec3f > const *)arg1)->UnaryFunction1D<VecMat::Vec3<float > >::getName();
+        } else {
+          result = ((UnaryFunction1D<Geometry::Vec3f > const *)arg1)->getName();
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DVec3f___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction1D<Geometry::Vec3f > *arg1 = (UnaryFunction1D<Geometry::Vec3f > *) 0 ;
+  Interface1D *arg2 = 0 ;
+  VecMat::Vec3<float > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DVec3f___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec3f___call__" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec3f > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec3f > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction1DVec3f___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "UnaryFunction1DVec3f___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          result = (arg1)->UnaryFunction1D<VecMat::Vec3<float > >::operator ()(*arg2);
+        } else {
+          result = (arg1)->operator ()(*arg2);
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<float >(static_cast< const VecMat::Vec3<float >& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DVec3f_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction1D<Geometry::Vec3f > *arg1 = (UnaryFunction1D<Geometry::Vec3f > *) 0 ;
+  IntegrationType arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DVec3f_setIntegrationType",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec3f_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec3f > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec3f > * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "UnaryFunction1DVec3f_setIntegrationType" "', argument " "2"" of type '" "IntegrationType""'");
+  } 
+  arg2 = static_cast< IntegrationType >(val2);
+  {
+    try {
+      (arg1)->setIntegrationType(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DVec3f_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction1D<Geometry::Vec3f > *arg1 = (UnaryFunction1D<Geometry::Vec3f > *) 0 ;
+  IntegrationType result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DVec3f_getIntegrationType",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec3f_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec3f > const *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec3f > * >(argp1);
+  {
+    try {
+      result = (IntegrationType)((UnaryFunction1D<Geometry::Vec3f > const *)arg1)->getIntegrationType();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_disown_UnaryFunction1DVec3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction1D<Geometry::Vec3f > *arg1 = (UnaryFunction1D<Geometry::Vec3f > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction1DVec3f",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction1DVec3f" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec3f > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec3f > * >(argp1);
+  {
+    Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
+    if (director) director->swig_disown();
+  }
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *UnaryFunction1DVec3f_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVectorViewShape__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction1D<std::vector<ViewShape * > > *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_UnaryFunction1DVectorViewShape")) SWIG_fail;
+  {
+    try {
+      result = (UnaryFunction1D<std::vector<ViewShape * > > *)new UnaryFunction1D<std::vector<ViewShape * > >();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVectorViewShape__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  IntegrationType arg1 ;
+  UnaryFunction1D<std::vector<ViewShape * > > *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction1DVectorViewShape",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_UnaryFunction1DVectorViewShape" "', argument " "1"" of type '" "IntegrationType""'");
+  } 
+  arg1 = static_cast< IntegrationType >(val1);
+  {
+    try {
+      result = (UnaryFunction1D<std::vector<ViewShape * > > *)new UnaryFunction1D<std::vector<ViewShape * > >(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVectorViewShape(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_UnaryFunction1DVectorViewShape__SWIG_0(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_UnaryFunction1DVectorViewShape__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DVectorViewShape'.\n  Possible C/C++ prototypes are:\n    UnaryFunction1D<(std::vector<(p.ViewShape)>)>()\n    UnaryFunction1D<(std::vector<(p.ViewShape)>)>(IntegrationType)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_UnaryFunction1DVectorViewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction1D<std::vector<ViewShape * > > *arg1 = (UnaryFunction1D<std::vector<ViewShape * > > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction1DVectorViewShape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DVectorViewShape" "', argument " "1"" of type '" "UnaryFunction1D<std::vector<ViewShape * > > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction1D<std::vector<ViewShape * > > * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DVectorViewShape_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction1D<std::vector<ViewShape * > > *arg1 = (UnaryFunction1D<std::vector<ViewShape * > > *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DVectorViewShape_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVectorViewShape_getName" "', argument " "1"" of type '" "UnaryFunction1D<std::vector<ViewShape * > > const *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction1D<std::vector<ViewShape * > > * >(argp1);
+  {
+    try {
+      result = ((UnaryFunction1D<std::vector<ViewShape * > > const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DVectorViewShape___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction1D<std::vector<ViewShape * > > *arg1 = (UnaryFunction1D<std::vector<ViewShape * > > *) 0 ;
+  Interface1D *arg2 = 0 ;
+  std::vector<ViewShape *,std::allocator<ViewShape * > > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DVectorViewShape___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVectorViewShape___call__" "', argument " "1"" of type '" "UnaryFunction1D<std::vector<ViewShape * > > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction1D<std::vector<ViewShape * > > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction1DVectorViewShape___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "UnaryFunction1DVectorViewShape___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  {
+    try {
+      result = (arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = swig::from(static_cast< std::vector<ViewShape*,std::allocator<ViewShape * > > >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DVectorViewShape_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction1D<std::vector<ViewShape * > > *arg1 = (UnaryFunction1D<std::vector<ViewShape * > > *) 0 ;
+  IntegrationType arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DVectorViewShape_setIntegrationType",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVectorViewShape_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<std::vector<ViewShape * > > *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction1D<std::vector<ViewShape * > > * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "UnaryFunction1DVectorViewShape_setIntegrationType" "', argument " "2"" of type '" "IntegrationType""'");
+  } 
+  arg2 = static_cast< IntegrationType >(val2);
+  {
+    try {
+      (arg1)->setIntegrationType(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DVectorViewShape_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction1D<std::vector<ViewShape * > > *arg1 = (UnaryFunction1D<std::vector<ViewShape * > > *) 0 ;
+  IntegrationType result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DVectorViewShape_getIntegrationType",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVectorViewShape_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<std::vector<ViewShape * > > const *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction1D<std::vector<ViewShape * > > * >(argp1);
+  {
+    try {
+      result = (IntegrationType)((UnaryFunction1D<std::vector<ViewShape * > > const *)arg1)->getIntegrationType();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *UnaryFunction1DVectorViewShape_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_GetXF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  IntegrationType arg1 ;
+  Functions1D::GetXF1D *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_GetXF1D",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_GetXF1D" "', argument " "1"" of type '" "IntegrationType""'");
+  } 
+  arg1 = static_cast< IntegrationType >(val1);
+  {
+    try {
+      result = (Functions1D::GetXF1D *)new Functions1D::GetXF1D(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__GetXF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_GetXF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetXF1D *arg1 = (Functions1D::GetXF1D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:GetXF1D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__GetXF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetXF1D_getName" "', argument " "1"" of type '" "Functions1D::GetXF1D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::GetXF1D * >(argp1);
+  {
+    try {
+      result = ((Functions1D::GetXF1D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_GetXF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetXF1D *arg1 = (Functions1D::GetXF1D *) 0 ;
+  Interface1D *arg2 = 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:GetXF1D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__GetXF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetXF1D___call__" "', argument " "1"" of type '" "Functions1D::GetXF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::GetXF1D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GetXF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GetXF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  {
+    try {
+      result = (real)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetXF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetXF1D *arg1 = (Functions1D::GetXF1D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_GetXF1D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__GetXF1D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_GetXF1D" "', argument " "1"" of type '" "Functions1D::GetXF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::GetXF1D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *GetXF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetXF1D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_GetYF1D__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  IntegrationType arg1 ;
+  Functions1D::GetYF1D *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_GetYF1D",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_GetYF1D" "', argument " "1"" of type '" "IntegrationType""'");
+  } 
+  arg1 = static_cast< IntegrationType >(val1);
+  {
+    try {
+      result = (Functions1D::GetYF1D *)new Functions1D::GetYF1D(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__GetYF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_GetYF1D__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetYF1D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_GetYF1D")) SWIG_fail;
+  {
+    try {
+      result = (Functions1D::GetYF1D *)new Functions1D::GetYF1D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__GetYF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_GetYF1D(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_GetYF1D__SWIG_1(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_GetYF1D__SWIG_0(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetYF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::GetYF1D(IntegrationType)\n    Functions1D::GetYF1D()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_GetYF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetYF1D *arg1 = (Functions1D::GetYF1D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:GetYF1D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__GetYF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetYF1D_getName" "', argument " "1"" of type '" "Functions1D::GetYF1D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::GetYF1D * >(argp1);
+  {
+    try {
+      result = ((Functions1D::GetYF1D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_GetYF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetYF1D *arg1 = (Functions1D::GetYF1D *) 0 ;
+  Interface1D *arg2 = 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:GetYF1D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__GetYF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetYF1D___call__" "', argument " "1"" of type '" "Functions1D::GetYF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::GetYF1D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GetYF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GetYF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  {
+    try {
+      result = (real)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetYF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetYF1D *arg1 = (Functions1D::GetYF1D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_GetYF1D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__GetYF1D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_GetYF1D" "', argument " "1"" of type '" "Functions1D::GetYF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::GetYF1D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *GetYF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetYF1D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_GetZF1D__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  IntegrationType arg1 ;
+  Functions1D::GetZF1D *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_GetZF1D",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_GetZF1D" "', argument " "1"" of type '" "IntegrationType""'");
+  } 
+  arg1 = static_cast< IntegrationType >(val1);
+  {
+    try {
+      result = (Functions1D::GetZF1D *)new Functions1D::GetZF1D(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__GetZF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_GetZF1D__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetZF1D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_GetZF1D")) SWIG_fail;
+  {
+    try {
+      result = (Functions1D::GetZF1D *)new Functions1D::GetZF1D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__GetZF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_GetZF1D(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_GetZF1D__SWIG_1(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_GetZF1D__SWIG_0(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetZF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::GetZF1D(IntegrationType)\n    Functions1D::GetZF1D()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_GetZF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetZF1D *arg1 = (Functions1D::GetZF1D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:GetZF1D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__GetZF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetZF1D_getName" "', argument " "1"" of type '" "Functions1D::GetZF1D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::GetZF1D * >(argp1);
+  {
+    try {
+      result = ((Functions1D::GetZF1D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_GetZF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetZF1D *arg1 = (Functions1D::GetZF1D *) 0 ;
+  Interface1D *arg2 = 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:GetZF1D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__GetZF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetZF1D___call__" "', argument " "1"" of type '" "Functions1D::GetZF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::GetZF1D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GetZF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GetZF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  {
+    try {
+      result = (real)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetZF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetZF1D *arg1 = (Functions1D::GetZF1D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_GetZF1D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__GetZF1D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_GetZF1D" "', argument " "1"" of type '" "Functions1D::GetZF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::GetZF1D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *GetZF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetZF1D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_GetProjectedXF1D__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  IntegrationType arg1 ;
+  Functions1D::GetProjectedXF1D *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_GetProjectedXF1D",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_GetProjectedXF1D" "', argument " "1"" of type '" "IntegrationType""'");
+  } 
+  arg1 = static_cast< IntegrationType >(val1);
+  {
+    try {
+      result = (Functions1D::GetProjectedXF1D *)new Functions1D::GetProjectedXF1D(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__GetProjectedXF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_GetProjectedXF1D__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetProjectedXF1D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_GetProjectedXF1D")) SWIG_fail;
+  {
+    try {
+      result = (Functions1D::GetProjectedXF1D *)new Functions1D::GetProjectedXF1D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__GetProjectedXF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_GetProjectedXF1D(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_GetProjectedXF1D__SWIG_1(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_GetProjectedXF1D__SWIG_0(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetProjectedXF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::GetProjectedXF1D(IntegrationType)\n    Functions1D::GetProjectedXF1D()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_GetProjectedXF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetProjectedXF1D *arg1 = (Functions1D::GetProjectedXF1D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:GetProjectedXF1D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__GetProjectedXF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetProjectedXF1D_getName" "', argument " "1"" of type '" "Functions1D::GetProjectedXF1D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::GetProjectedXF1D * >(argp1);
+  {
+    try {
+      result = ((Functions1D::GetProjectedXF1D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_GetProjectedXF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetProjectedXF1D *arg1 = (Functions1D::GetProjectedXF1D *) 0 ;
+  Interface1D *arg2 = 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:GetProjectedXF1D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__GetProjectedXF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetProjectedXF1D___call__" "', argument " "1"" of type '" "Functions1D::GetProjectedXF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::GetProjectedXF1D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GetProjectedXF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GetProjectedXF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  {
+    try {
+      result = (real)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetProjectedXF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetProjectedXF1D *arg1 = (Functions1D::GetProjectedXF1D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_GetProjectedXF1D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__GetProjectedXF1D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_GetProjectedXF1D" "', argument " "1"" of type '" "Functions1D::GetProjectedXF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::GetProjectedXF1D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *GetProjectedXF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetProjectedXF1D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_GetProjectedYF1D__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  IntegrationType arg1 ;
+  Functions1D::GetProjectedYF1D *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_GetProjectedYF1D",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_GetProjectedYF1D" "', argument " "1"" of type '" "IntegrationType""'");
+  } 
+  arg1 = static_cast< IntegrationType >(val1);
+  {
+    try {
+      result = (Functions1D::GetProjectedYF1D *)new Functions1D::GetProjectedYF1D(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__GetProjectedYF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_GetProjectedYF1D__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetProjectedYF1D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_GetProjectedYF1D")) SWIG_fail;
+  {
+    try {
+      result = (Functions1D::GetProjectedYF1D *)new Functions1D::GetProjectedYF1D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__GetProjectedYF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_GetProjectedYF1D(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_GetProjectedYF1D__SWIG_1(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_GetProjectedYF1D__SWIG_0(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetProjectedYF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::GetProjectedYF1D(IntegrationType)\n    Functions1D::GetProjectedYF1D()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_GetProjectedYF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetProjectedYF1D *arg1 = (Functions1D::GetProjectedYF1D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:GetProjectedYF1D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__GetProjectedYF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetProjectedYF1D_getName" "', argument " "1"" of type '" "Functions1D::GetProjectedYF1D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::GetProjectedYF1D * >(argp1);
+  {
+    try {
+      result = ((Functions1D::GetProjectedYF1D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_GetProjectedYF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetProjectedYF1D *arg1 = (Functions1D::GetProjectedYF1D *) 0 ;
+  Interface1D *arg2 = 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:GetProjectedYF1D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__GetProjectedYF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetProjectedYF1D___call__" "', argument " "1"" of type '" "Functions1D::GetProjectedYF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::GetProjectedYF1D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GetProjectedYF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GetProjectedYF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  {
+    try {
+      result = (real)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetProjectedYF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetProjectedYF1D *arg1 = (Functions1D::GetProjectedYF1D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_GetProjectedYF1D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__GetProjectedYF1D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_GetProjectedYF1D" "', argument " "1"" of type '" "Functions1D::GetProjectedYF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::GetProjectedYF1D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *GetProjectedYF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetProjectedYF1D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_GetProjectedZF1D__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  IntegrationType arg1 ;
+  Functions1D::GetProjectedZF1D *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_GetProjectedZF1D",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_GetProjectedZF1D" "', argument " "1"" of type '" "IntegrationType""'");
+  } 
+  arg1 = static_cast< IntegrationType >(val1);
+  {
+    try {
+      result = (Functions1D::GetProjectedZF1D *)new Functions1D::GetProjectedZF1D(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__GetProjectedZF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_GetProjectedZF1D__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetProjectedZF1D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_GetProjectedZF1D")) SWIG_fail;
+  {
+    try {
+      result = (Functions1D::GetProjectedZF1D *)new Functions1D::GetProjectedZF1D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__GetProjectedZF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_GetProjectedZF1D(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_GetProjectedZF1D__SWIG_1(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_GetProjectedZF1D__SWIG_0(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetProjectedZF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::GetProjectedZF1D(IntegrationType)\n    Functions1D::GetProjectedZF1D()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_GetProjectedZF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetProjectedZF1D *arg1 = (Functions1D::GetProjectedZF1D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:GetProjectedZF1D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__GetProjectedZF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetProjectedZF1D_getName" "', argument " "1"" of type '" "Functions1D::GetProjectedZF1D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::GetProjectedZF1D * >(argp1);
+  {
+    try {
+      result = ((Functions1D::GetProjectedZF1D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_GetProjectedZF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetProjectedZF1D *arg1 = (Functions1D::GetProjectedZF1D *) 0 ;
+  Interface1D *arg2 = 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:GetProjectedZF1D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__GetProjectedZF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetProjectedZF1D___call__" "', argument " "1"" of type '" "Functions1D::GetProjectedZF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::GetProjectedZF1D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GetProjectedZF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GetProjectedZF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  {
+    try {
+      result = (real)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetProjectedZF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetProjectedZF1D *arg1 = (Functions1D::GetProjectedZF1D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_GetProjectedZF1D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__GetProjectedZF1D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_GetProjectedZF1D" "', argument " "1"" of type '" "Functions1D::GetProjectedZF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::GetProjectedZF1D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *GetProjectedZF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetProjectedZF1D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_Orientation2DF1D__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  IntegrationType arg1 ;
+  Functions1D::Orientation2DF1D *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_Orientation2DF1D",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Orientation2DF1D" "', argument " "1"" of type '" "IntegrationType""'");
+  } 
+  arg1 = static_cast< IntegrationType >(val1);
+  {
+    try {
+      result = (Functions1D::Orientation2DF1D *)new Functions1D::Orientation2DF1D(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__Orientation2DF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Orientation2DF1D__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::Orientation2DF1D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_Orientation2DF1D")) SWIG_fail;
+  {
+    try {
+      result = (Functions1D::Orientation2DF1D *)new Functions1D::Orientation2DF1D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__Orientation2DF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Orientation2DF1D(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_Orientation2DF1D__SWIG_1(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_Orientation2DF1D__SWIG_0(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Orientation2DF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::Orientation2DF1D(IntegrationType)\n    Functions1D::Orientation2DF1D()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Orientation2DF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::Orientation2DF1D *arg1 = (Functions1D::Orientation2DF1D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Orientation2DF1D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__Orientation2DF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Orientation2DF1D_getName" "', argument " "1"" of type '" "Functions1D::Orientation2DF1D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::Orientation2DF1D * >(argp1);
+  {
+    try {
+      result = ((Functions1D::Orientation2DF1D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Orientation2DF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::Orientation2DF1D *arg1 = (Functions1D::Orientation2DF1D *) 0 ;
+  Interface1D *arg2 = 0 ;
+  Geometry::Vec2f result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Orientation2DF1D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__Orientation2DF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Orientation2DF1D___call__" "', argument " "1"" of type '" "Functions1D::Orientation2DF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::Orientation2DF1D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Orientation2DF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Orientation2DF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  {
+    try {
+      result = (arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_Orientation2DF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::Orientation2DF1D *arg1 = (Functions1D::Orientation2DF1D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_Orientation2DF1D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__Orientation2DF1D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Orientation2DF1D" "', argument " "1"" of type '" "Functions1D::Orientation2DF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::Orientation2DF1D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *Orientation2DF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__Orientation2DF1D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_Orientation3DF1D__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  IntegrationType arg1 ;
+  Functions1D::Orientation3DF1D *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_Orientation3DF1D",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Orientation3DF1D" "', argument " "1"" of type '" "IntegrationType""'");
+  } 
+  arg1 = static_cast< IntegrationType >(val1);
+  {
+    try {
+      result = (Functions1D::Orientation3DF1D *)new Functions1D::Orientation3DF1D(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__Orientation3DF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Orientation3DF1D__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::Orientation3DF1D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_Orientation3DF1D")) SWIG_fail;
+  {
+    try {
+      result = (Functions1D::Orientation3DF1D *)new Functions1D::Orientation3DF1D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__Orientation3DF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Orientation3DF1D(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_Orientation3DF1D__SWIG_1(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_Orientation3DF1D__SWIG_0(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Orientation3DF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::Orientation3DF1D(IntegrationType)\n    Functions1D::Orientation3DF1D()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Orientation3DF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::Orientation3DF1D *arg1 = (Functions1D::Orientation3DF1D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Orientation3DF1D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__Orientation3DF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Orientation3DF1D_getName" "', argument " "1"" of type '" "Functions1D::Orientation3DF1D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::Orientation3DF1D * >(argp1);
+  {
+    try {
+      result = ((Functions1D::Orientation3DF1D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Orientation3DF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::Orientation3DF1D *arg1 = (Functions1D::Orientation3DF1D *) 0 ;
+  Interface1D *arg2 = 0 ;
+  Geometry::Vec3f result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Orientation3DF1D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__Orientation3DF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Orientation3DF1D___call__" "', argument " "1"" of type '" "Functions1D::Orientation3DF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::Orientation3DF1D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Orientation3DF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Orientation3DF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  {
+    try {
+      result = (arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_Orientation3DF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::Orientation3DF1D *arg1 = (Functions1D::Orientation3DF1D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_Orientation3DF1D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__Orientation3DF1D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Orientation3DF1D" "', argument " "1"" of type '" "Functions1D::Orientation3DF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::Orientation3DF1D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *Orientation3DF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__Orientation3DF1D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_ZDiscontinuityF1D__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  IntegrationType arg1 ;
+  Functions1D::ZDiscontinuityF1D *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_ZDiscontinuityF1D",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ZDiscontinuityF1D" "', argument " "1"" of type '" "IntegrationType""'");
+  } 
+  arg1 = static_cast< IntegrationType >(val1);
+  {
+    try {
+      result = (Functions1D::ZDiscontinuityF1D *)new Functions1D::ZDiscontinuityF1D(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__ZDiscontinuityF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ZDiscontinuityF1D__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::ZDiscontinuityF1D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_ZDiscontinuityF1D")) SWIG_fail;
+  {
+    try {
+      result = (Functions1D::ZDiscontinuityF1D *)new Functions1D::ZDiscontinuityF1D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__ZDiscontinuityF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ZDiscontinuityF1D(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_ZDiscontinuityF1D__SWIG_1(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_ZDiscontinuityF1D__SWIG_0(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ZDiscontinuityF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::ZDiscontinuityF1D(IntegrationType)\n    Functions1D::ZDiscontinuityF1D()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ZDiscontinuityF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::ZDiscontinuityF1D *arg1 = (Functions1D::ZDiscontinuityF1D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ZDiscontinuityF1D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__ZDiscontinuityF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ZDiscontinuityF1D_getName" "', argument " "1"" of type '" "Functions1D::ZDiscontinuityF1D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::ZDiscontinuityF1D * >(argp1);
+  {
+    try {
+      result = ((Functions1D::ZDiscontinuityF1D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ZDiscontinuityF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::ZDiscontinuityF1D *arg1 = (Functions1D::ZDiscontinuityF1D *) 0 ;
+  Interface1D *arg2 = 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ZDiscontinuityF1D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__ZDiscontinuityF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ZDiscontinuityF1D___call__" "', argument " "1"" of type '" "Functions1D::ZDiscontinuityF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::ZDiscontinuityF1D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ZDiscontinuityF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ZDiscontinuityF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  {
+    try {
+      result = (real)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ZDiscontinuityF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::ZDiscontinuityF1D *arg1 = (Functions1D::ZDiscontinuityF1D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_ZDiscontinuityF1D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__ZDiscontinuityF1D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ZDiscontinuityF1D" "', argument " "1"" of type '" "Functions1D::ZDiscontinuityF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::ZDiscontinuityF1D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *ZDiscontinuityF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__ZDiscontinuityF1D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_QuantitativeInvisibilityF1D__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  IntegrationType arg1 ;
+  Functions1D::QuantitativeInvisibilityF1D *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_QuantitativeInvisibilityF1D",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_QuantitativeInvisibilityF1D" "', argument " "1"" of type '" "IntegrationType""'");
+  } 
+  arg1 = static_cast< IntegrationType >(val1);
+  {
+    try {
+      result = (Functions1D::QuantitativeInvisibilityF1D *)new Functions1D::QuantitativeInvisibilityF1D(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__QuantitativeInvisibilityF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_QuantitativeInvisibilityF1D__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::QuantitativeInvisibilityF1D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_QuantitativeInvisibilityF1D")) SWIG_fail;
+  {
+    try {
+      result = (Functions1D::QuantitativeInvisibilityF1D *)new Functions1D::QuantitativeInvisibilityF1D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__QuantitativeInvisibilityF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_QuantitativeInvisibilityF1D(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_QuantitativeInvisibilityF1D__SWIG_1(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_QuantitativeInvisibilityF1D__SWIG_0(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_QuantitativeInvisibilityF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::QuantitativeInvisibilityF1D(IntegrationType)\n    Functions1D::QuantitativeInvisibilityF1D()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_QuantitativeInvisibilityF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::QuantitativeInvisibilityF1D *arg1 = (Functions1D::QuantitativeInvisibilityF1D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:QuantitativeInvisibilityF1D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__QuantitativeInvisibilityF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "QuantitativeInvisibilityF1D_getName" "', argument " "1"" of type '" "Functions1D::QuantitativeInvisibilityF1D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::QuantitativeInvisibilityF1D * >(argp1);
+  {
+    try {
+      result = ((Functions1D::QuantitativeInvisibilityF1D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_QuantitativeInvisibilityF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::QuantitativeInvisibilityF1D *arg1 = (Functions1D::QuantitativeInvisibilityF1D *) 0 ;
+  Interface1D *arg2 = 0 ;
+  unsigned int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:QuantitativeInvisibilityF1D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__QuantitativeInvisibilityF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "QuantitativeInvisibilityF1D___call__" "', argument " "1"" of type '" "Functions1D::QuantitativeInvisibilityF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::QuantitativeInvisibilityF1D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "QuantitativeInvisibilityF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "QuantitativeInvisibilityF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  {
+    try {
+      result = (unsigned int)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_QuantitativeInvisibilityF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::QuantitativeInvisibilityF1D *arg1 = (Functions1D::QuantitativeInvisibilityF1D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_QuantitativeInvisibilityF1D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__QuantitativeInvisibilityF1D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_QuantitativeInvisibilityF1D" "', argument " "1"" of type '" "Functions1D::QuantitativeInvisibilityF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::QuantitativeInvisibilityF1D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *QuantitativeInvisibilityF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__QuantitativeInvisibilityF1D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_CurveNatureF1D__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  IntegrationType arg1 ;
+  Functions1D::CurveNatureF1D *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_CurveNatureF1D",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_CurveNatureF1D" "', argument " "1"" of type '" "IntegrationType""'");
+  } 
+  arg1 = static_cast< IntegrationType >(val1);
+  {
+    try {
+      result = (Functions1D::CurveNatureF1D *)new Functions1D::CurveNatureF1D(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__CurveNatureF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_CurveNatureF1D__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::CurveNatureF1D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_CurveNatureF1D")) SWIG_fail;
+  {
+    try {
+      result = (Functions1D::CurveNatureF1D *)new Functions1D::CurveNatureF1D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__CurveNatureF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_CurveNatureF1D(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_CurveNatureF1D__SWIG_1(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_CurveNatureF1D__SWIG_0(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CurveNatureF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::CurveNatureF1D(IntegrationType)\n    Functions1D::CurveNatureF1D()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurveNatureF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::CurveNatureF1D *arg1 = (Functions1D::CurveNatureF1D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurveNatureF1D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__CurveNatureF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurveNatureF1D_getName" "', argument " "1"" of type '" "Functions1D::CurveNatureF1D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::CurveNatureF1D * >(argp1);
+  {
+    try {
+      result = ((Functions1D::CurveNatureF1D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurveNatureF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::CurveNatureF1D *arg1 = (Functions1D::CurveNatureF1D *) 0 ;
+  Interface1D *arg2 = 0 ;
+  Nature::EdgeNature result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:CurveNatureF1D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__CurveNatureF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurveNatureF1D___call__" "', argument " "1"" of type '" "Functions1D::CurveNatureF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::CurveNatureF1D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CurveNatureF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CurveNatureF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  {
+    try {
+      result = (Nature::EdgeNature)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_CurveNatureF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::CurveNatureF1D *arg1 = (Functions1D::CurveNatureF1D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_CurveNatureF1D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__CurveNatureF1D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CurveNatureF1D" "', argument " "1"" of type '" "Functions1D::CurveNatureF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::CurveNatureF1D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *CurveNatureF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__CurveNatureF1D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_TimeStampF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::TimeStampF1D *arg1 = (Functions1D::TimeStampF1D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:TimeStampF1D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__TimeStampF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TimeStampF1D_getName" "', argument " "1"" of type '" "Functions1D::TimeStampF1D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::TimeStampF1D * >(argp1);
+  {
+    try {
+      result = ((Functions1D::TimeStampF1D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TimeStampF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::TimeStampF1D *arg1 = (Functions1D::TimeStampF1D *) 0 ;
+  Interface1D *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:TimeStampF1D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__TimeStampF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TimeStampF1D___call__" "', argument " "1"" of type '" "Functions1D::TimeStampF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::TimeStampF1D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TimeStampF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TimeStampF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  {
+    try {
+      (arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_TimeStampF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::TimeStampF1D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_TimeStampF1D")) SWIG_fail;
+  {
+    try {
+      result = (Functions1D::TimeStampF1D *)new Functions1D::TimeStampF1D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__TimeStampF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_TimeStampF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::TimeStampF1D *arg1 = (Functions1D::TimeStampF1D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_TimeStampF1D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__TimeStampF1D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_TimeStampF1D" "', argument " "1"" of type '" "Functions1D::TimeStampF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::TimeStampF1D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *TimeStampF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__TimeStampF1D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_IncrementChainingTimeStampF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::IncrementChainingTimeStampF1D *arg1 = (Functions1D::IncrementChainingTimeStampF1D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:IncrementChainingTimeStampF1D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__IncrementChainingTimeStampF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IncrementChainingTimeStampF1D_getName" "', argument " "1"" of type '" "Functions1D::IncrementChainingTimeStampF1D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::IncrementChainingTimeStampF1D * >(argp1);
+  {
+    try {
+      result = ((Functions1D::IncrementChainingTimeStampF1D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_IncrementChainingTimeStampF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::IncrementChainingTimeStampF1D *arg1 = (Functions1D::IncrementChainingTimeStampF1D *) 0 ;
+  Interface1D *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:IncrementChainingTimeStampF1D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__IncrementChainingTimeStampF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IncrementChainingTimeStampF1D___call__" "', argument " "1"" of type '" "Functions1D::IncrementChainingTimeStampF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::IncrementChainingTimeStampF1D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IncrementChainingTimeStampF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "IncrementChainingTimeStampF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  {
+    try {
+      (arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_IncrementChainingTimeStampF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::IncrementChainingTimeStampF1D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_IncrementChainingTimeStampF1D")) SWIG_fail;
+  {
+    try {
+      result = (Functions1D::IncrementChainingTimeStampF1D *)new Functions1D::IncrementChainingTimeStampF1D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__IncrementChainingTimeStampF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_IncrementChainingTimeStampF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::IncrementChainingTimeStampF1D *arg1 = (Functions1D::IncrementChainingTimeStampF1D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_IncrementChainingTimeStampF1D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__IncrementChainingTimeStampF1D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IncrementChainingTimeStampF1D" "', argument " "1"" of type '" "Functions1D::IncrementChainingTimeStampF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::IncrementChainingTimeStampF1D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *IncrementChainingTimeStampF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__IncrementChainingTimeStampF1D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_ChainingTimeStampF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::ChainingTimeStampF1D *arg1 = (Functions1D::ChainingTimeStampF1D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ChainingTimeStampF1D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__ChainingTimeStampF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ChainingTimeStampF1D_getName" "', argument " "1"" of type '" "Functions1D::ChainingTimeStampF1D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::ChainingTimeStampF1D * >(argp1);
+  {
+    try {
+      result = ((Functions1D::ChainingTimeStampF1D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ChainingTimeStampF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::ChainingTimeStampF1D *arg1 = (Functions1D::ChainingTimeStampF1D *) 0 ;
+  Interface1D *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ChainingTimeStampF1D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__ChainingTimeStampF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ChainingTimeStampF1D___call__" "', argument " "1"" of type '" "Functions1D::ChainingTimeStampF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::ChainingTimeStampF1D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ChainingTimeStampF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ChainingTimeStampF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  {
+    try {
+      (arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ChainingTimeStampF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::ChainingTimeStampF1D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_ChainingTimeStampF1D")) SWIG_fail;
+  {
+    try {
+      result = (Functions1D::ChainingTimeStampF1D *)new Functions1D::ChainingTimeStampF1D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__ChainingTimeStampF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ChainingTimeStampF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::ChainingTimeStampF1D *arg1 = (Functions1D::ChainingTimeStampF1D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_ChainingTimeStampF1D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__ChainingTimeStampF1D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ChainingTimeStampF1D" "', argument " "1"" of type '" "Functions1D::ChainingTimeStampF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::ChainingTimeStampF1D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *ChainingTimeStampF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__ChainingTimeStampF1D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_Curvature2DAngleF1D__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  IntegrationType arg1 ;
+  Functions1D::Curvature2DAngleF1D *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_Curvature2DAngleF1D",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Curvature2DAngleF1D" "', argument " "1"" of type '" "IntegrationType""'");
+  } 
+  arg1 = static_cast< IntegrationType >(val1);
+  {
+    try {
+      result = (Functions1D::Curvature2DAngleF1D *)new Functions1D::Curvature2DAngleF1D(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__Curvature2DAngleF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Curvature2DAngleF1D__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::Curvature2DAngleF1D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_Curvature2DAngleF1D")) SWIG_fail;
+  {
+    try {
+      result = (Functions1D::Curvature2DAngleF1D *)new Functions1D::Curvature2DAngleF1D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__Curvature2DAngleF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Curvature2DAngleF1D(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_Curvature2DAngleF1D__SWIG_1(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_Curvature2DAngleF1D__SWIG_0(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Curvature2DAngleF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::Curvature2DAngleF1D(IntegrationType)\n    Functions1D::Curvature2DAngleF1D()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Curvature2DAngleF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::Curvature2DAngleF1D *arg1 = (Functions1D::Curvature2DAngleF1D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Curvature2DAngleF1D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__Curvature2DAngleF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Curvature2DAngleF1D_getName" "', argument " "1"" of type '" "Functions1D::Curvature2DAngleF1D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::Curvature2DAngleF1D * >(argp1);
+  {
+    try {
+      result = ((Functions1D::Curvature2DAngleF1D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Curvature2DAngleF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::Curvature2DAngleF1D *arg1 = (Functions1D::Curvature2DAngleF1D *) 0 ;
+  Interface1D *arg2 = 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Curvature2DAngleF1D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__Curvature2DAngleF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Curvature2DAngleF1D___call__" "', argument " "1"" of type '" "Functions1D::Curvature2DAngleF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::Curvature2DAngleF1D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Curvature2DAngleF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Curvature2DAngleF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  {
+    try {
+      result = (real)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_Curvature2DAngleF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::Curvature2DAngleF1D *arg1 = (Functions1D::Curvature2DAngleF1D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_Curvature2DAngleF1D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__Curvature2DAngleF1D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Curvature2DAngleF1D" "', argument " "1"" of type '" "Functions1D::Curvature2DAngleF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::Curvature2DAngleF1D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *Curvature2DAngleF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__Curvature2DAngleF1D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_Normal2DF1D__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  IntegrationType arg1 ;
+  Functions1D::Normal2DF1D *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_Normal2DF1D",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Normal2DF1D" "', argument " "1"" of type '" "IntegrationType""'");
+  } 
+  arg1 = static_cast< IntegrationType >(val1);
+  {
+    try {
+      result = (Functions1D::Normal2DF1D *)new Functions1D::Normal2DF1D(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__Normal2DF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Normal2DF1D__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::Normal2DF1D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_Normal2DF1D")) SWIG_fail;
+  {
+    try {
+      result = (Functions1D::Normal2DF1D *)new Functions1D::Normal2DF1D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__Normal2DF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Normal2DF1D(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_Normal2DF1D__SWIG_1(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_Normal2DF1D__SWIG_0(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Normal2DF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::Normal2DF1D(IntegrationType)\n    Functions1D::Normal2DF1D()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Normal2DF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::Normal2DF1D *arg1 = (Functions1D::Normal2DF1D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Normal2DF1D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__Normal2DF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Normal2DF1D_getName" "', argument " "1"" of type '" "Functions1D::Normal2DF1D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::Normal2DF1D * >(argp1);
+  {
+    try {
+      result = ((Functions1D::Normal2DF1D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Normal2DF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::Normal2DF1D *arg1 = (Functions1D::Normal2DF1D *) 0 ;
+  Interface1D *arg2 = 0 ;
+  Geometry::Vec2f result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Normal2DF1D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__Normal2DF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Normal2DF1D___call__" "', argument " "1"" of type '" "Functions1D::Normal2DF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::Normal2DF1D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Normal2DF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Normal2DF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  {
+    try {
+      result = (arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_Normal2DF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::Normal2DF1D *arg1 = (Functions1D::Normal2DF1D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_Normal2DF1D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__Normal2DF1D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Normal2DF1D" "', argument " "1"" of type '" "Functions1D::Normal2DF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::Normal2DF1D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *Normal2DF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__Normal2DF1D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_GetShapeF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetShapeF1D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_GetShapeF1D")) SWIG_fail;
+  {
+    try {
+      result = (Functions1D::GetShapeF1D *)new Functions1D::GetShapeF1D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__GetShapeF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_GetShapeF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetShapeF1D *arg1 = (Functions1D::GetShapeF1D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:GetShapeF1D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__GetShapeF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetShapeF1D_getName" "', argument " "1"" of type '" "Functions1D::GetShapeF1D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::GetShapeF1D * >(argp1);
+  {
+    try {
+      result = ((Functions1D::GetShapeF1D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_GetShapeF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetShapeF1D *arg1 = (Functions1D::GetShapeF1D *) 0 ;
+  Interface1D *arg2 = 0 ;
+  std::vector<ViewShape *,std::allocator<ViewShape * > > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:GetShapeF1D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__GetShapeF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetShapeF1D___call__" "', argument " "1"" of type '" "Functions1D::GetShapeF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::GetShapeF1D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GetShapeF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GetShapeF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  {
+    try {
+      result = (arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = swig::from(static_cast< std::vector<ViewShape*,std::allocator<ViewShape * > > >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetShapeF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetShapeF1D *arg1 = (Functions1D::GetShapeF1D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_GetShapeF1D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__GetShapeF1D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_GetShapeF1D" "', argument " "1"" of type '" "Functions1D::GetShapeF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::GetShapeF1D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *GetShapeF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetShapeF1D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_GetOccludersF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetOccludersF1D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_GetOccludersF1D")) SWIG_fail;
+  {
+    try {
+      result = (Functions1D::GetOccludersF1D *)new Functions1D::GetOccludersF1D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__GetOccludersF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_GetOccludersF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetOccludersF1D *arg1 = (Functions1D::GetOccludersF1D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:GetOccludersF1D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__GetOccludersF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetOccludersF1D_getName" "', argument " "1"" of type '" "Functions1D::GetOccludersF1D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::GetOccludersF1D * >(argp1);
+  {
+    try {
+      result = ((Functions1D::GetOccludersF1D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_GetOccludersF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetOccludersF1D *arg1 = (Functions1D::GetOccludersF1D *) 0 ;
+  Interface1D *arg2 = 0 ;
+  std::vector<ViewShape *,std::allocator<ViewShape * > > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:GetOccludersF1D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__GetOccludersF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetOccludersF1D___call__" "', argument " "1"" of type '" "Functions1D::GetOccludersF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::GetOccludersF1D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GetOccludersF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GetOccludersF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  {
+    try {
+      result = (arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = swig::from(static_cast< std::vector<ViewShape*,std::allocator<ViewShape * > > >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetOccludersF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetOccludersF1D *arg1 = (Functions1D::GetOccludersF1D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_GetOccludersF1D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__GetOccludersF1D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_GetOccludersF1D" "', argument " "1"" of type '" "Functions1D::GetOccludersF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::GetOccludersF1D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *GetOccludersF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetOccludersF1D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_GetOccludeeF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetOccludeeF1D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_GetOccludeeF1D")) SWIG_fail;
+  {
+    try {
+      result = (Functions1D::GetOccludeeF1D *)new Functions1D::GetOccludeeF1D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__GetOccludeeF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_GetOccludeeF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetOccludeeF1D *arg1 = (Functions1D::GetOccludeeF1D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:GetOccludeeF1D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__GetOccludeeF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetOccludeeF1D_getName" "', argument " "1"" of type '" "Functions1D::GetOccludeeF1D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::GetOccludeeF1D * >(argp1);
+  {
+    try {
+      result = ((Functions1D::GetOccludeeF1D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_GetOccludeeF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetOccludeeF1D *arg1 = (Functions1D::GetOccludeeF1D *) 0 ;
+  Interface1D *arg2 = 0 ;
+  std::vector<ViewShape *,std::allocator<ViewShape * > > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:GetOccludeeF1D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__GetOccludeeF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetOccludeeF1D___call__" "', argument " "1"" of type '" "Functions1D::GetOccludeeF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::GetOccludeeF1D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GetOccludeeF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GetOccludeeF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  {
+    try {
+      result = (arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = swig::from(static_cast< std::vector<ViewShape*,std::allocator<ViewShape * > > >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetOccludeeF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetOccludeeF1D *arg1 = (Functions1D::GetOccludeeF1D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_GetOccludeeF1D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__GetOccludeeF1D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_GetOccludeeF1D" "', argument " "1"" of type '" "Functions1D::GetOccludeeF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::GetOccludeeF1D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *GetOccludeeF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetOccludeeF1D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_Module_setAlwaysRefresh__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  bool arg1 ;
+  bool val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Module_setAlwaysRefresh",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_bool(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "Module_setAlwaysRefresh" "', argument " "1"" of type '" "bool""'");
+  } 
+  arg1 = static_cast< bool >(val1);
+  {
+    try {
+      Module::setAlwaysRefresh(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Module_setAlwaysRefresh__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  
+  if (!PyArg_ParseTuple(args,(char *)":Module_setAlwaysRefresh")) SWIG_fail;
+  {
+    try {
+      Module::setAlwaysRefresh();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Module_setAlwaysRefresh(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_Module_setAlwaysRefresh__SWIG_1(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_bool(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_Module_setAlwaysRefresh__SWIG_0(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Module_setAlwaysRefresh'.\n  Possible C/C++ prototypes are:\n    setAlwaysRefresh(bool)\n    Module::setAlwaysRefresh()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Module_setCausal__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  bool arg1 ;
+  bool val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Module_setCausal",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_bool(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "Module_setCausal" "', argument " "1"" of type '" "bool""'");
+  } 
+  arg1 = static_cast< bool >(val1);
+  {
+    try {
+      Module::setCausal(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Module_setCausal__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  
+  if (!PyArg_ParseTuple(args,(char *)":Module_setCausal")) SWIG_fail;
+  {
+    try {
+      Module::setCausal();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Module_setCausal(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_Module_setCausal__SWIG_1(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_bool(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_Module_setCausal__SWIG_0(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Module_setCausal'.\n  Possible C/C++ prototypes are:\n    setCausal(bool)\n    Module::setCausal()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Module_setDrawable__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  bool arg1 ;
+  bool val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Module_setDrawable",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_bool(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "Module_setDrawable" "', argument " "1"" of type '" "bool""'");
+  } 
+  arg1 = static_cast< bool >(val1);
+  {
+    try {
+      Module::setDrawable(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Module_setDrawable__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  
+  if (!PyArg_ParseTuple(args,(char *)":Module_setDrawable")) SWIG_fail;
+  {
+    try {
+      Module::setDrawable();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Module_setDrawable(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_Module_setDrawable__SWIG_1(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_bool(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_Module_setDrawable__SWIG_0(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Module_setDrawable'.\n  Possible C/C++ prototypes are:\n    setDrawable(bool)\n    Module::setDrawable()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Module_getAlwaysRefresh(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  bool result;
+  
+  if (!PyArg_ParseTuple(args,(char *)":Module_getAlwaysRefresh")) SWIG_fail;
+  {
+    try {
+      result = (bool)Module::getAlwaysRefresh();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Module_getCausal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  bool result;
+  
+  if (!PyArg_ParseTuple(args,(char *)":Module_getCausal")) SWIG_fail;
+  {
+    try {
+      result = (bool)Module::getCausal();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Module_getDrawable(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  bool result;
+  
+  if (!PyArg_ParseTuple(args,(char *)":Module_getDrawable")) SWIG_fail;
+  {
+    try {
+      result = (bool)Module::getDrawable();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Module(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Module *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_Module")) SWIG_fail;
+  {
+    try {
+      result = (Module *)new Module();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Module, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_Module(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Module *arg1 = (Module *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_Module",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Module, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Module" "', argument " "1"" of type '" "Module *""'"); 
+  }
+  arg1 = reinterpret_cast< Module * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *Module_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Module, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_DensityF0D__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  double arg1 ;
+  Functions0D::DensityF0D *result = 0 ;
+  double val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_DensityF0D",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_DensityF0D" "', argument " "1"" of type '" "double""'");
+  } 
+  arg1 = static_cast< double >(val1);
+  {
+    try {
+      result = (Functions0D::DensityF0D *)new Functions0D::DensityF0D(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions0D__DensityF0D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_DensityF0D__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::DensityF0D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_DensityF0D")) SWIG_fail;
+  {
+    try {
+      result = (Functions0D::DensityF0D *)new Functions0D::DensityF0D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions0D__DensityF0D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_DensityF0D(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_DensityF0D__SWIG_1(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_double(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_DensityF0D__SWIG_0(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_DensityF0D'.\n  Possible C/C++ prototypes are:\n    Functions0D::DensityF0D(double)\n    Functions0D::DensityF0D()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_DensityF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::DensityF0D *arg1 = (Functions0D::DensityF0D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:DensityF0D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__DensityF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DensityF0D_getName" "', argument " "1"" of type '" "Functions0D::DensityF0D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::DensityF0D * >(argp1);
+  {
+    try {
+      result = ((Functions0D::DensityF0D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_DensityF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::DensityF0D *arg1 = (Functions0D::DensityF0D *) 0 ;
+  Interface0DIterator *arg2 = 0 ;
+  double result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:DensityF0D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__DensityF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DensityF0D___call__" "', argument " "1"" of type '" "Functions0D::DensityF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::DensityF0D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "DensityF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "DensityF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0DIterator * >(argp2);
+  {
+    try {
+      result = (double)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_DensityF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::DensityF0D *arg1 = (Functions0D::DensityF0D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_DensityF0D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__DensityF0D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_DensityF0D" "', argument " "1"" of type '" "Functions0D::DensityF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::DensityF0D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *DensityF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__DensityF0D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_LocalAverageDepthF0D__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  real arg1 ;
+  Functions0D::LocalAverageDepthF0D *result = 0 ;
+  double val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_LocalAverageDepthF0D",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_LocalAverageDepthF0D" "', argument " "1"" of type '" "real""'");
+  } 
+  arg1 = static_cast< real >(val1);
+  {
+    try {
+      result = (Functions0D::LocalAverageDepthF0D *)new Functions0D::LocalAverageDepthF0D(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions0D__LocalAverageDepthF0D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_LocalAverageDepthF0D__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::LocalAverageDepthF0D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_LocalAverageDepthF0D")) SWIG_fail;
+  {
+    try {
+      result = (Functions0D::LocalAverageDepthF0D *)new Functions0D::LocalAverageDepthF0D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions0D__LocalAverageDepthF0D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_LocalAverageDepthF0D(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_LocalAverageDepthF0D__SWIG_1(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_double(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_LocalAverageDepthF0D__SWIG_0(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_LocalAverageDepthF0D'.\n  Possible C/C++ prototypes are:\n    Functions0D::LocalAverageDepthF0D(real)\n    Functions0D::LocalAverageDepthF0D()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_LocalAverageDepthF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::LocalAverageDepthF0D *arg1 = (Functions0D::LocalAverageDepthF0D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:LocalAverageDepthF0D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__LocalAverageDepthF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "LocalAverageDepthF0D_getName" "', argument " "1"" of type '" "Functions0D::LocalAverageDepthF0D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::LocalAverageDepthF0D * >(argp1);
+  {
+    try {
+      result = ((Functions0D::LocalAverageDepthF0D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_LocalAverageDepthF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::LocalAverageDepthF0D *arg1 = (Functions0D::LocalAverageDepthF0D *) 0 ;
+  Interface0DIterator *arg2 = 0 ;
+  double result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:LocalAverageDepthF0D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__LocalAverageDepthF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "LocalAverageDepthF0D___call__" "', argument " "1"" of type '" "Functions0D::LocalAverageDepthF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::LocalAverageDepthF0D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "LocalAverageDepthF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "LocalAverageDepthF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0DIterator * >(argp2);
+  {
+    try {
+      result = (double)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_LocalAverageDepthF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::LocalAverageDepthF0D *arg1 = (Functions0D::LocalAverageDepthF0D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_LocalAverageDepthF0D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__LocalAverageDepthF0D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_LocalAverageDepthF0D" "', argument " "1"" of type '" "Functions0D::LocalAverageDepthF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::LocalAverageDepthF0D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *LocalAverageDepthF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__LocalAverageDepthF0D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_ReadMapPixelF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  char *arg1 = (char *) 0 ;
+  int arg2 ;
+  Functions0D::ReadMapPixelF0D *result = 0 ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_ReadMapPixelF0D",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ReadMapPixelF0D" "', argument " "1"" of type '" "char const *""'");
+  }
+  arg1 = reinterpret_cast< char * >(buf1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_ReadMapPixelF0D" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  {
+    try {
+      result = (Functions0D::ReadMapPixelF0D *)new Functions0D::ReadMapPixelF0D((char const *)arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions0D__ReadMapPixelF0D, SWIG_POINTER_NEW |  0 );
+  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+  return resultobj;
+fail:
+  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ReadMapPixelF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::ReadMapPixelF0D *arg1 = (Functions0D::ReadMapPixelF0D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ReadMapPixelF0D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__ReadMapPixelF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ReadMapPixelF0D_getName" "', argument " "1"" of type '" "Functions0D::ReadMapPixelF0D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::ReadMapPixelF0D * >(argp1);
+  {
+    try {
+      result = ((Functions0D::ReadMapPixelF0D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ReadMapPixelF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::ReadMapPixelF0D *arg1 = (Functions0D::ReadMapPixelF0D *) 0 ;
+  Interface0DIterator *arg2 = 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ReadMapPixelF0D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__ReadMapPixelF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ReadMapPixelF0D___call__" "', argument " "1"" of type '" "Functions0D::ReadMapPixelF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::ReadMapPixelF0D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ReadMapPixelF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ReadMapPixelF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0DIterator * >(argp2);
+  {
+    try {
+      result = (float)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ReadMapPixelF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::ReadMapPixelF0D *arg1 = (Functions0D::ReadMapPixelF0D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_ReadMapPixelF0D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__ReadMapPixelF0D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ReadMapPixelF0D" "', argument " "1"" of type '" "Functions0D::ReadMapPixelF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::ReadMapPixelF0D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *ReadMapPixelF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__ReadMapPixelF0D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_ReadSteerableViewMapPixelF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  unsigned int arg1 ;
+  int arg2 ;
+  Functions0D::ReadSteerableViewMapPixelF0D *result = 0 ;
+  unsigned int val1 ;
+  int ecode1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_ReadSteerableViewMapPixelF0D",&obj0,&obj1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_unsigned_SS_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ReadSteerableViewMapPixelF0D" "', argument " "1"" of type '" "unsigned int""'");
+  } 
+  arg1 = static_cast< unsigned int >(val1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_ReadSteerableViewMapPixelF0D" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  {
+    try {
+      result = (Functions0D::ReadSteerableViewMapPixelF0D *)new Functions0D::ReadSteerableViewMapPixelF0D(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions0D__ReadSteerableViewMapPixelF0D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ReadSteerableViewMapPixelF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::ReadSteerableViewMapPixelF0D *arg1 = (Functions0D::ReadSteerableViewMapPixelF0D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ReadSteerableViewMapPixelF0D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__ReadSteerableViewMapPixelF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ReadSteerableViewMapPixelF0D_getName" "', argument " "1"" of type '" "Functions0D::ReadSteerableViewMapPixelF0D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::ReadSteerableViewMapPixelF0D * >(argp1);
+  {
+    try {
+      result = ((Functions0D::ReadSteerableViewMapPixelF0D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ReadSteerableViewMapPixelF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::ReadSteerableViewMapPixelF0D *arg1 = (Functions0D::ReadSteerableViewMapPixelF0D *) 0 ;
+  Interface0DIterator *arg2 = 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ReadSteerableViewMapPixelF0D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__ReadSteerableViewMapPixelF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ReadSteerableViewMapPixelF0D___call__" "', argument " "1"" of type '" "Functions0D::ReadSteerableViewMapPixelF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::ReadSteerableViewMapPixelF0D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ReadSteerableViewMapPixelF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ReadSteerableViewMapPixelF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0DIterator * >(argp2);
+  {
+    try {
+      result = (float)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ReadSteerableViewMapPixelF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::ReadSteerableViewMapPixelF0D *arg1 = (Functions0D::ReadSteerableViewMapPixelF0D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_ReadSteerableViewMapPixelF0D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__ReadSteerableViewMapPixelF0D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ReadSteerableViewMapPixelF0D" "', argument " "1"" of type '" "Functions0D::ReadSteerableViewMapPixelF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::ReadSteerableViewMapPixelF0D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *ReadSteerableViewMapPixelF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__ReadSteerableViewMapPixelF0D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_ReadCompleteViewMapPixelF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  int arg1 ;
+  Functions0D::ReadCompleteViewMapPixelF0D *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_ReadCompleteViewMapPixelF0D",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ReadCompleteViewMapPixelF0D" "', argument " "1"" of type '" "int""'");
+  } 
+  arg1 = static_cast< int >(val1);
+  {
+    try {
+      result = (Functions0D::ReadCompleteViewMapPixelF0D *)new Functions0D::ReadCompleteViewMapPixelF0D(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions0D__ReadCompleteViewMapPixelF0D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ReadCompleteViewMapPixelF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::ReadCompleteViewMapPixelF0D *arg1 = (Functions0D::ReadCompleteViewMapPixelF0D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ReadCompleteViewMapPixelF0D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__ReadCompleteViewMapPixelF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ReadCompleteViewMapPixelF0D_getName" "', argument " "1"" of type '" "Functions0D::ReadCompleteViewMapPixelF0D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::ReadCompleteViewMapPixelF0D * >(argp1);
+  {
+    try {
+      result = ((Functions0D::ReadCompleteViewMapPixelF0D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ReadCompleteViewMapPixelF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::ReadCompleteViewMapPixelF0D *arg1 = (Functions0D::ReadCompleteViewMapPixelF0D *) 0 ;
+  Interface0DIterator *arg2 = 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ReadCompleteViewMapPixelF0D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__ReadCompleteViewMapPixelF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ReadCompleteViewMapPixelF0D___call__" "', argument " "1"" of type '" "Functions0D::ReadCompleteViewMapPixelF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::ReadCompleteViewMapPixelF0D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ReadCompleteViewMapPixelF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ReadCompleteViewMapPixelF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0DIterator * >(argp2);
+  {
+    try {
+      result = (float)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ReadCompleteViewMapPixelF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::ReadCompleteViewMapPixelF0D *arg1 = (Functions0D::ReadCompleteViewMapPixelF0D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_ReadCompleteViewMapPixelF0D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__ReadCompleteViewMapPixelF0D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ReadCompleteViewMapPixelF0D" "', argument " "1"" of type '" "Functions0D::ReadCompleteViewMapPixelF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::ReadCompleteViewMapPixelF0D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *ReadCompleteViewMapPixelF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__ReadCompleteViewMapPixelF0D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_GetViewMapGradientNormF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  int arg1 ;
+  Functions0D::GetViewMapGradientNormF0D *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_GetViewMapGradientNormF0D",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_GetViewMapGradientNormF0D" "', argument " "1"" of type '" "int""'");
+  } 
+  arg1 = static_cast< int >(val1);
+  {
+    try {
+      result = (Functions0D::GetViewMapGradientNormF0D *)new Functions0D::GetViewMapGradientNormF0D(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions0D__GetViewMapGradientNormF0D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_GetViewMapGradientNormF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetViewMapGradientNormF0D *arg1 = (Functions0D::GetViewMapGradientNormF0D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:GetViewMapGradientNormF0D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__GetViewMapGradientNormF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetViewMapGradientNormF0D_getName" "', argument " "1"" of type '" "Functions0D::GetViewMapGradientNormF0D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::GetViewMapGradientNormF0D * >(argp1);
+  {
+    try {
+      result = ((Functions0D::GetViewMapGradientNormF0D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_GetViewMapGradientNormF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetViewMapGradientNormF0D *arg1 = (Functions0D::GetViewMapGradientNormF0D *) 0 ;
+  Interface0DIterator *arg2 = 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:GetViewMapGradientNormF0D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__GetViewMapGradientNormF0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetViewMapGradientNormF0D___call__" "', argument " "1"" of type '" "Functions0D::GetViewMapGradientNormF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::GetViewMapGradientNormF0D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GetViewMapGradientNormF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GetViewMapGradientNormF0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0DIterator * >(argp2);
+  {
+    try {
+      result = (float)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetViewMapGradientNormF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions0D::GetViewMapGradientNormF0D *arg1 = (Functions0D::GetViewMapGradientNormF0D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_GetViewMapGradientNormF0D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions0D__GetViewMapGradientNormF0D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_GetViewMapGradientNormF0D" "', argument " "1"" of type '" "Functions0D::GetViewMapGradientNormF0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions0D::GetViewMapGradientNormF0D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *GetViewMapGradientNormF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetViewMapGradientNormF0D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_DensityF1D__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  double arg1 ;
+  IntegrationType arg2 ;
+  float arg3 ;
+  Functions1D::DensityF1D *result = 0 ;
+  double val1 ;
+  int ecode1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  float val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:new_DensityF1D",&obj0,&obj1,&obj2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_DensityF1D" "', argument " "1"" of type '" "double""'");
+  } 
+  arg1 = static_cast< double >(val1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_DensityF1D" "', argument " "2"" of type '" "IntegrationType""'");
+  } 
+  arg2 = static_cast< IntegrationType >(val2);
+  ecode3 = SWIG_AsVal_float(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_DensityF1D" "', argument " "3"" of type '" "float""'");
+  } 
+  arg3 = static_cast< float >(val3);
+  {
+    try {
+      result = (Functions1D::DensityF1D *)new Functions1D::DensityF1D(arg1,arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__DensityF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_DensityF1D__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  double arg1 ;
+  IntegrationType arg2 ;
+  Functions1D::DensityF1D *result = 0 ;
+  double val1 ;
+  int ecode1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_DensityF1D",&obj0,&obj1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_DensityF1D" "', argument " "1"" of type '" "double""'");
+  } 
+  arg1 = static_cast< double >(val1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_DensityF1D" "', argument " "2"" of type '" "IntegrationType""'");
+  } 
+  arg2 = static_cast< IntegrationType >(val2);
+  {
+    try {
+      result = (Functions1D::DensityF1D *)new Functions1D::DensityF1D(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__DensityF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_DensityF1D__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  double arg1 ;
+  Functions1D::DensityF1D *result = 0 ;
+  double val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_DensityF1D",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_DensityF1D" "', argument " "1"" of type '" "double""'");
+  } 
+  arg1 = static_cast< double >(val1);
+  {
+    try {
+      result = (Functions1D::DensityF1D *)new Functions1D::DensityF1D(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__DensityF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_DensityF1D__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::DensityF1D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_DensityF1D")) SWIG_fail;
+  {
+    try {
+      result = (Functions1D::DensityF1D *)new Functions1D::DensityF1D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__DensityF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_DensityF1D(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_DensityF1D__SWIG_3(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_double(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_DensityF1D__SWIG_2(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    {
+      int res = SWIG_AsVal_double(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      {
+        int res = SWIG_AsVal_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_new_DensityF1D__SWIG_1(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    {
+      int res = SWIG_AsVal_double(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      {
+        int res = SWIG_AsVal_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        {
+          int res = SWIG_AsVal_float(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          return _wrap_new_DensityF1D__SWIG_0(self, args);
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_DensityF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::DensityF1D(double,IntegrationType,float)\n    Functions1D::DensityF1D(double,IntegrationType)\n    Functions1D::DensityF1D(double)\n    Functions1D::DensityF1D()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_DensityF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::DensityF1D *arg1 = (Functions1D::DensityF1D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_DensityF1D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__DensityF1D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_DensityF1D" "', argument " "1"" of type '" "Functions1D::DensityF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::DensityF1D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_DensityF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::DensityF1D *arg1 = (Functions1D::DensityF1D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:DensityF1D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__DensityF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DensityF1D_getName" "', argument " "1"" of type '" "Functions1D::DensityF1D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::DensityF1D * >(argp1);
+  {
+    try {
+      result = ((Functions1D::DensityF1D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_DensityF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::DensityF1D *arg1 = (Functions1D::DensityF1D *) 0 ;
+  Interface1D *arg2 = 0 ;
+  double result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:DensityF1D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__DensityF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DensityF1D___call__" "', argument " "1"" of type '" "Functions1D::DensityF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::DensityF1D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "DensityF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "DensityF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  {
+    try {
+      result = (double)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *DensityF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__DensityF1D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_LocalAverageDepthF1D__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  real arg1 ;
+  IntegrationType arg2 ;
+  Functions1D::LocalAverageDepthF1D *result = 0 ;
+  double val1 ;
+  int ecode1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_LocalAverageDepthF1D",&obj0,&obj1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_LocalAverageDepthF1D" "', argument " "1"" of type '" "real""'");
+  } 
+  arg1 = static_cast< real >(val1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_LocalAverageDepthF1D" "', argument " "2"" of type '" "IntegrationType""'");
+  } 
+  arg2 = static_cast< IntegrationType >(val2);
+  {
+    try {
+      result = (Functions1D::LocalAverageDepthF1D *)new Functions1D::LocalAverageDepthF1D(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__LocalAverageDepthF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_LocalAverageDepthF1D__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  real arg1 ;
+  Functions1D::LocalAverageDepthF1D *result = 0 ;
+  double val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_LocalAverageDepthF1D",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_LocalAverageDepthF1D" "', argument " "1"" of type '" "real""'");
+  } 
+  arg1 = static_cast< real >(val1);
+  {
+    try {
+      result = (Functions1D::LocalAverageDepthF1D *)new Functions1D::LocalAverageDepthF1D(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__LocalAverageDepthF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_LocalAverageDepthF1D(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_double(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_LocalAverageDepthF1D__SWIG_1(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    {
+      int res = SWIG_AsVal_double(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      {
+        int res = SWIG_AsVal_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_new_LocalAverageDepthF1D__SWIG_0(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_LocalAverageDepthF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::LocalAverageDepthF1D(real,IntegrationType)\n    Functions1D::LocalAverageDepthF1D(real)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_LocalAverageDepthF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::LocalAverageDepthF1D *arg1 = (Functions1D::LocalAverageDepthF1D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:LocalAverageDepthF1D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__LocalAverageDepthF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "LocalAverageDepthF1D_getName" "', argument " "1"" of type '" "Functions1D::LocalAverageDepthF1D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::LocalAverageDepthF1D * >(argp1);
+  {
+    try {
+      result = ((Functions1D::LocalAverageDepthF1D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_LocalAverageDepthF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::LocalAverageDepthF1D *arg1 = (Functions1D::LocalAverageDepthF1D *) 0 ;
+  Interface1D *arg2 = 0 ;
+  double result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:LocalAverageDepthF1D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__LocalAverageDepthF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "LocalAverageDepthF1D___call__" "', argument " "1"" of type '" "Functions1D::LocalAverageDepthF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::LocalAverageDepthF1D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "LocalAverageDepthF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "LocalAverageDepthF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  {
+    try {
+      result = (double)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_LocalAverageDepthF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::LocalAverageDepthF1D *arg1 = (Functions1D::LocalAverageDepthF1D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_LocalAverageDepthF1D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__LocalAverageDepthF1D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_LocalAverageDepthF1D" "', argument " "1"" of type '" "Functions1D::LocalAverageDepthF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::LocalAverageDepthF1D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *LocalAverageDepthF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__LocalAverageDepthF1D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_GetCompleteViewMapDensityF1D__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  unsigned int arg1 ;
+  IntegrationType arg2 ;
+  float arg3 ;
+  Functions1D::GetCompleteViewMapDensityF1D *result = 0 ;
+  unsigned int val1 ;
+  int ecode1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  float val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:new_GetCompleteViewMapDensityF1D",&obj0,&obj1,&obj2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_unsigned_SS_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_GetCompleteViewMapDensityF1D" "', argument " "1"" of type '" "unsigned int""'");
+  } 
+  arg1 = static_cast< unsigned int >(val1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_GetCompleteViewMapDensityF1D" "', argument " "2"" of type '" "IntegrationType""'");
+  } 
+  arg2 = static_cast< IntegrationType >(val2);
+  ecode3 = SWIG_AsVal_float(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_GetCompleteViewMapDensityF1D" "', argument " "3"" of type '" "float""'");
+  } 
+  arg3 = static_cast< float >(val3);
+  {
+    try {
+      result = (Functions1D::GetCompleteViewMapDensityF1D *)new Functions1D::GetCompleteViewMapDensityF1D(arg1,arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__GetCompleteViewMapDensityF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_GetCompleteViewMapDensityF1D__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  unsigned int arg1 ;
+  IntegrationType arg2 ;
+  Functions1D::GetCompleteViewMapDensityF1D *result = 0 ;
+  unsigned int val1 ;
+  int ecode1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_GetCompleteViewMapDensityF1D",&obj0,&obj1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_unsigned_SS_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_GetCompleteViewMapDensityF1D" "', argument " "1"" of type '" "unsigned int""'");
+  } 
+  arg1 = static_cast< unsigned int >(val1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_GetCompleteViewMapDensityF1D" "', argument " "2"" of type '" "IntegrationType""'");
+  } 
+  arg2 = static_cast< IntegrationType >(val2);
+  {
+    try {
+      result = (Functions1D::GetCompleteViewMapDensityF1D *)new Functions1D::GetCompleteViewMapDensityF1D(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__GetCompleteViewMapDensityF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_GetCompleteViewMapDensityF1D__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  unsigned int arg1 ;
+  Functions1D::GetCompleteViewMapDensityF1D *result = 0 ;
+  unsigned int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_GetCompleteViewMapDensityF1D",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_unsigned_SS_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_GetCompleteViewMapDensityF1D" "', argument " "1"" of type '" "unsigned int""'");
+  } 
+  arg1 = static_cast< unsigned int >(val1);
+  {
+    try {
+      result = (Functions1D::GetCompleteViewMapDensityF1D *)new Functions1D::GetCompleteViewMapDensityF1D(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__GetCompleteViewMapDensityF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_GetCompleteViewMapDensityF1D(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_unsigned_SS_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_GetCompleteViewMapDensityF1D__SWIG_2(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    {
+      int res = SWIG_AsVal_unsigned_SS_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      {
+        int res = SWIG_AsVal_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_new_GetCompleteViewMapDensityF1D__SWIG_1(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    {
+      int res = SWIG_AsVal_unsigned_SS_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      {
+        int res = SWIG_AsVal_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        {
+          int res = SWIG_AsVal_float(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          return _wrap_new_GetCompleteViewMapDensityF1D__SWIG_0(self, args);
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetCompleteViewMapDensityF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::GetCompleteViewMapDensityF1D(unsigned int,IntegrationType,float)\n    Functions1D::GetCompleteViewMapDensityF1D(unsigned int,IntegrationType)\n    Functions1D::GetCompleteViewMapDensityF1D(unsigned int)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_GetCompleteViewMapDensityF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetCompleteViewMapDensityF1D *arg1 = (Functions1D::GetCompleteViewMapDensityF1D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:GetCompleteViewMapDensityF1D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__GetCompleteViewMapDensityF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetCompleteViewMapDensityF1D_getName" "', argument " "1"" of type '" "Functions1D::GetCompleteViewMapDensityF1D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::GetCompleteViewMapDensityF1D * >(argp1);
+  {
+    try {
+      result = ((Functions1D::GetCompleteViewMapDensityF1D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_GetCompleteViewMapDensityF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetCompleteViewMapDensityF1D *arg1 = (Functions1D::GetCompleteViewMapDensityF1D *) 0 ;
+  Interface1D *arg2 = 0 ;
+  double result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:GetCompleteViewMapDensityF1D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__GetCompleteViewMapDensityF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetCompleteViewMapDensityF1D___call__" "', argument " "1"" of type '" "Functions1D::GetCompleteViewMapDensityF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::GetCompleteViewMapDensityF1D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GetCompleteViewMapDensityF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GetCompleteViewMapDensityF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  {
+    try {
+      result = (double)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetCompleteViewMapDensityF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetCompleteViewMapDensityF1D *arg1 = (Functions1D::GetCompleteViewMapDensityF1D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_GetCompleteViewMapDensityF1D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__GetCompleteViewMapDensityF1D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_GetCompleteViewMapDensityF1D" "', argument " "1"" of type '" "Functions1D::GetCompleteViewMapDensityF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::GetCompleteViewMapDensityF1D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *GetCompleteViewMapDensityF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetCompleteViewMapDensityF1D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_GetDirectionalViewMapDensityF1D__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  unsigned int arg1 ;
+  unsigned int arg2 ;
+  IntegrationType arg3 ;
+  float arg4 ;
+  Functions1D::GetDirectionalViewMapDensityF1D *result = 0 ;
+  unsigned int val1 ;
+  int ecode1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  float val4 ;
+  int ecode4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOO:new_GetDirectionalViewMapDensityF1D",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  ecode1 = SWIG_AsVal_unsigned_SS_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_GetDirectionalViewMapDensityF1D" "', argument " "1"" of type '" "unsigned int""'");
+  } 
+  arg1 = static_cast< unsigned int >(val1);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_GetDirectionalViewMapDensityF1D" "', argument " "2"" of type '" "unsigned int""'");
+  } 
+  arg2 = static_cast< unsigned int >(val2);
+  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_GetDirectionalViewMapDensityF1D" "', argument " "3"" of type '" "IntegrationType""'");
+  } 
+  arg3 = static_cast< IntegrationType >(val3);
+  ecode4 = SWIG_AsVal_float(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_GetDirectionalViewMapDensityF1D" "', argument " "4"" of type '" "float""'");
+  } 
+  arg4 = static_cast< float >(val4);
+  {
+    try {
+      result = (Functions1D::GetDirectionalViewMapDensityF1D *)new Functions1D::GetDirectionalViewMapDensityF1D(arg1,arg2,arg3,arg4);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__GetDirectionalViewMapDensityF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_GetDirectionalViewMapDensityF1D__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  unsigned int arg1 ;
+  unsigned int arg2 ;
+  IntegrationType arg3 ;
+  Functions1D::GetDirectionalViewMapDensityF1D *result = 0 ;
+  unsigned int val1 ;
+  int ecode1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:new_GetDirectionalViewMapDensityF1D",&obj0,&obj1,&obj2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_unsigned_SS_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_GetDirectionalViewMapDensityF1D" "', argument " "1"" of type '" "unsigned int""'");
+  } 
+  arg1 = static_cast< unsigned int >(val1);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_GetDirectionalViewMapDensityF1D" "', argument " "2"" of type '" "unsigned int""'");
+  } 
+  arg2 = static_cast< unsigned int >(val2);
+  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_GetDirectionalViewMapDensityF1D" "', argument " "3"" of type '" "IntegrationType""'");
+  } 
+  arg3 = static_cast< IntegrationType >(val3);
+  {
+    try {
+      result = (Functions1D::GetDirectionalViewMapDensityF1D *)new Functions1D::GetDirectionalViewMapDensityF1D(arg1,arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__GetDirectionalViewMapDensityF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_GetDirectionalViewMapDensityF1D__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  unsigned int arg1 ;
+  unsigned int arg2 ;
+  Functions1D::GetDirectionalViewMapDensityF1D *result = 0 ;
+  unsigned int val1 ;
+  int ecode1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_GetDirectionalViewMapDensityF1D",&obj0,&obj1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_unsigned_SS_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_GetDirectionalViewMapDensityF1D" "', argument " "1"" of type '" "unsigned int""'");
+  } 
+  arg1 = static_cast< unsigned int >(val1);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_GetDirectionalViewMapDensityF1D" "', argument " "2"" of type '" "unsigned int""'");
+  } 
+  arg2 = static_cast< unsigned int >(val2);
+  {
+    try {
+      result = (Functions1D::GetDirectionalViewMapDensityF1D *)new Functions1D::GetDirectionalViewMapDensityF1D(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__GetDirectionalViewMapDensityF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_GetDirectionalViewMapDensityF1D(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[5];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 4); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    {
+      int res = SWIG_AsVal_unsigned_SS_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      {
+        int res = SWIG_AsVal_unsigned_SS_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_new_GetDirectionalViewMapDensityF1D__SWIG_2(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    {
+      int res = SWIG_AsVal_unsigned_SS_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      {
+        int res = SWIG_AsVal_unsigned_SS_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          return _wrap_new_GetDirectionalViewMapDensityF1D__SWIG_1(self, args);
+        }
+      }
+    }
+  }
+  if (argc == 4) {
+    int _v;
+    {
+      int res = SWIG_AsVal_unsigned_SS_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      {
+        int res = SWIG_AsVal_unsigned_SS_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          {
+            int res = SWIG_AsVal_float(argv[3], NULL);
+            _v = SWIG_CheckState(res);
+          }
+          if (_v) {
+            return _wrap_new_GetDirectionalViewMapDensityF1D__SWIG_0(self, args);
+          }
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetDirectionalViewMapDensityF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::GetDirectionalViewMapDensityF1D(unsigned int,unsigned int,IntegrationType,float)\n    Functions1D::GetDirectionalViewMapDensityF1D(unsigned int,unsigned int,IntegrationType)\n    Functions1D::GetDirectionalViewMapDensityF1D(unsigned int,unsigned int)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_GetDirectionalViewMapDensityF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetDirectionalViewMapDensityF1D *arg1 = (Functions1D::GetDirectionalViewMapDensityF1D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:GetDirectionalViewMapDensityF1D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__GetDirectionalViewMapDensityF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetDirectionalViewMapDensityF1D_getName" "', argument " "1"" of type '" "Functions1D::GetDirectionalViewMapDensityF1D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::GetDirectionalViewMapDensityF1D * >(argp1);
+  {
+    try {
+      result = ((Functions1D::GetDirectionalViewMapDensityF1D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_GetDirectionalViewMapDensityF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetDirectionalViewMapDensityF1D *arg1 = (Functions1D::GetDirectionalViewMapDensityF1D *) 0 ;
+  Interface1D *arg2 = 0 ;
+  double result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:GetDirectionalViewMapDensityF1D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__GetDirectionalViewMapDensityF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetDirectionalViewMapDensityF1D___call__" "', argument " "1"" of type '" "Functions1D::GetDirectionalViewMapDensityF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::GetDirectionalViewMapDensityF1D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GetDirectionalViewMapDensityF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GetDirectionalViewMapDensityF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  {
+    try {
+      result = (double)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetDirectionalViewMapDensityF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetDirectionalViewMapDensityF1D *arg1 = (Functions1D::GetDirectionalViewMapDensityF1D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_GetDirectionalViewMapDensityF1D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__GetDirectionalViewMapDensityF1D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_GetDirectionalViewMapDensityF1D" "', argument " "1"" of type '" "Functions1D::GetDirectionalViewMapDensityF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::GetDirectionalViewMapDensityF1D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *GetDirectionalViewMapDensityF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetDirectionalViewMapDensityF1D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_GetSteerableViewMapDensityF1D__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  int arg1 ;
+  IntegrationType arg2 ;
+  float arg3 ;
+  Functions1D::GetSteerableViewMapDensityF1D *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  float val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:new_GetSteerableViewMapDensityF1D",&obj0,&obj1,&obj2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_GetSteerableViewMapDensityF1D" "', argument " "1"" of type '" "int""'");
+  } 
+  arg1 = static_cast< int >(val1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_GetSteerableViewMapDensityF1D" "', argument " "2"" of type '" "IntegrationType""'");
+  } 
+  arg2 = static_cast< IntegrationType >(val2);
+  ecode3 = SWIG_AsVal_float(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_GetSteerableViewMapDensityF1D" "', argument " "3"" of type '" "float""'");
+  } 
+  arg3 = static_cast< float >(val3);
+  {
+    try {
+      result = (Functions1D::GetSteerableViewMapDensityF1D *)new Functions1D::GetSteerableViewMapDensityF1D(arg1,arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__GetSteerableViewMapDensityF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_GetSteerableViewMapDensityF1D__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  int arg1 ;
+  IntegrationType arg2 ;
+  Functions1D::GetSteerableViewMapDensityF1D *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_GetSteerableViewMapDensityF1D",&obj0,&obj1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_GetSteerableViewMapDensityF1D" "', argument " "1"" of type '" "int""'");
+  } 
+  arg1 = static_cast< int >(val1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_GetSteerableViewMapDensityF1D" "', argument " "2"" of type '" "IntegrationType""'");
+  } 
+  arg2 = static_cast< IntegrationType >(val2);
+  {
+    try {
+      result = (Functions1D::GetSteerableViewMapDensityF1D *)new Functions1D::GetSteerableViewMapDensityF1D(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__GetSteerableViewMapDensityF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_GetSteerableViewMapDensityF1D__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  int arg1 ;
+  Functions1D::GetSteerableViewMapDensityF1D *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_GetSteerableViewMapDensityF1D",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_GetSteerableViewMapDensityF1D" "', argument " "1"" of type '" "int""'");
+  } 
+  arg1 = static_cast< int >(val1);
+  {
+    try {
+      result = (Functions1D::GetSteerableViewMapDensityF1D *)new Functions1D::GetSteerableViewMapDensityF1D(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__GetSteerableViewMapDensityF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_GetSteerableViewMapDensityF1D(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_GetSteerableViewMapDensityF1D__SWIG_2(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    {
+      int res = SWIG_AsVal_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      {
+        int res = SWIG_AsVal_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_new_GetSteerableViewMapDensityF1D__SWIG_1(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    {
+      int res = SWIG_AsVal_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      {
+        int res = SWIG_AsVal_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        {
+          int res = SWIG_AsVal_float(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          return _wrap_new_GetSteerableViewMapDensityF1D__SWIG_0(self, args);
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetSteerableViewMapDensityF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::GetSteerableViewMapDensityF1D(int,IntegrationType,float)\n    Functions1D::GetSteerableViewMapDensityF1D(int,IntegrationType)\n    Functions1D::GetSteerableViewMapDensityF1D(int)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetSteerableViewMapDensityF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetSteerableViewMapDensityF1D *arg1 = (Functions1D::GetSteerableViewMapDensityF1D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_GetSteerableViewMapDensityF1D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__GetSteerableViewMapDensityF1D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_GetSteerableViewMapDensityF1D" "', argument " "1"" of type '" "Functions1D::GetSteerableViewMapDensityF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::GetSteerableViewMapDensityF1D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_GetSteerableViewMapDensityF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetSteerableViewMapDensityF1D *arg1 = (Functions1D::GetSteerableViewMapDensityF1D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:GetSteerableViewMapDensityF1D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__GetSteerableViewMapDensityF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetSteerableViewMapDensityF1D_getName" "', argument " "1"" of type '" "Functions1D::GetSteerableViewMapDensityF1D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::GetSteerableViewMapDensityF1D * >(argp1);
+  {
+    try {
+      result = ((Functions1D::GetSteerableViewMapDensityF1D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_GetSteerableViewMapDensityF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetSteerableViewMapDensityF1D *arg1 = (Functions1D::GetSteerableViewMapDensityF1D *) 0 ;
+  Interface1D *arg2 = 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:GetSteerableViewMapDensityF1D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__GetSteerableViewMapDensityF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetSteerableViewMapDensityF1D___call__" "', argument " "1"" of type '" "Functions1D::GetSteerableViewMapDensityF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::GetSteerableViewMapDensityF1D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GetSteerableViewMapDensityF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GetSteerableViewMapDensityF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  {
+    try {
+      result = (real)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *GetSteerableViewMapDensityF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetSteerableViewMapDensityF1D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_GetViewMapGradientNormF1D__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  int arg1 ;
+  IntegrationType arg2 ;
+  float arg3 ;
+  Functions1D::GetViewMapGradientNormF1D *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  float val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:new_GetViewMapGradientNormF1D",&obj0,&obj1,&obj2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_GetViewMapGradientNormF1D" "', argument " "1"" of type '" "int""'");
+  } 
+  arg1 = static_cast< int >(val1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_GetViewMapGradientNormF1D" "', argument " "2"" of type '" "IntegrationType""'");
+  } 
+  arg2 = static_cast< IntegrationType >(val2);
+  ecode3 = SWIG_AsVal_float(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_GetViewMapGradientNormF1D" "', argument " "3"" of type '" "float""'");
+  } 
+  arg3 = static_cast< float >(val3);
+  {
+    try {
+      result = (Functions1D::GetViewMapGradientNormF1D *)new Functions1D::GetViewMapGradientNormF1D(arg1,arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__GetViewMapGradientNormF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_GetViewMapGradientNormF1D__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  int arg1 ;
+  IntegrationType arg2 ;
+  Functions1D::GetViewMapGradientNormF1D *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_GetViewMapGradientNormF1D",&obj0,&obj1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_GetViewMapGradientNormF1D" "', argument " "1"" of type '" "int""'");
+  } 
+  arg1 = static_cast< int >(val1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_GetViewMapGradientNormF1D" "', argument " "2"" of type '" "IntegrationType""'");
+  } 
+  arg2 = static_cast< IntegrationType >(val2);
+  {
+    try {
+      result = (Functions1D::GetViewMapGradientNormF1D *)new Functions1D::GetViewMapGradientNormF1D(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__GetViewMapGradientNormF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_GetViewMapGradientNormF1D__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  int arg1 ;
+  Functions1D::GetViewMapGradientNormF1D *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_GetViewMapGradientNormF1D",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_GetViewMapGradientNormF1D" "', argument " "1"" of type '" "int""'");
+  } 
+  arg1 = static_cast< int >(val1);
+  {
+    try {
+      result = (Functions1D::GetViewMapGradientNormF1D *)new Functions1D::GetViewMapGradientNormF1D(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Functions1D__GetViewMapGradientNormF1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_GetViewMapGradientNormF1D(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_GetViewMapGradientNormF1D__SWIG_2(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    {
+      int res = SWIG_AsVal_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      {
+        int res = SWIG_AsVal_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_new_GetViewMapGradientNormF1D__SWIG_1(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    {
+      int res = SWIG_AsVal_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      {
+        int res = SWIG_AsVal_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        {
+          int res = SWIG_AsVal_float(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          return _wrap_new_GetViewMapGradientNormF1D__SWIG_0(self, args);
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetViewMapGradientNormF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::GetViewMapGradientNormF1D(int,IntegrationType,float)\n    Functions1D::GetViewMapGradientNormF1D(int,IntegrationType)\n    Functions1D::GetViewMapGradientNormF1D(int)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_GetViewMapGradientNormF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetViewMapGradientNormF1D *arg1 = (Functions1D::GetViewMapGradientNormF1D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:GetViewMapGradientNormF1D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__GetViewMapGradientNormF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetViewMapGradientNormF1D_getName" "', argument " "1"" of type '" "Functions1D::GetViewMapGradientNormF1D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::GetViewMapGradientNormF1D * >(argp1);
+  {
+    try {
+      result = ((Functions1D::GetViewMapGradientNormF1D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_GetViewMapGradientNormF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetViewMapGradientNormF1D *arg1 = (Functions1D::GetViewMapGradientNormF1D *) 0 ;
+  Interface1D *arg2 = 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:GetViewMapGradientNormF1D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__GetViewMapGradientNormF1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetViewMapGradientNormF1D___call__" "', argument " "1"" of type '" "Functions1D::GetViewMapGradientNormF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::GetViewMapGradientNormF1D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GetViewMapGradientNormF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GetViewMapGradientNormF1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  {
+    try {
+      result = (real)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetViewMapGradientNormF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Functions1D::GetViewMapGradientNormF1D *arg1 = (Functions1D::GetViewMapGradientNormF1D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_GetViewMapGradientNormF1D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Functions1D__GetViewMapGradientNormF1D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_GetViewMapGradientNormF1D" "', argument " "1"" of type '" "Functions1D::GetViewMapGradientNormF1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Functions1D::GetViewMapGradientNormF1D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *GetViewMapGradientNormF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetViewMapGradientNormF1D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_GetTimeStampCF(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  unsigned int result;
+  
+  if (!PyArg_ParseTuple(args,(char *)":GetTimeStampCF")) SWIG_fail;
+  {
+    try {
+      result = (unsigned int)ContextFunctions::GetTimeStampCF();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_GetCanvasWidthCF(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  unsigned int result;
+  
+  if (!PyArg_ParseTuple(args,(char *)":GetCanvasWidthCF")) SWIG_fail;
+  {
+    try {
+      result = (unsigned int)ContextFunctions::GetCanvasWidthCF();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_GetCanvasHeightCF(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  unsigned int result;
+  
+  if (!PyArg_ParseTuple(args,(char *)":GetCanvasHeightCF")) SWIG_fail;
+  {
+    try {
+      result = (unsigned int)ContextFunctions::GetCanvasHeightCF();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_LoadMapCF__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  unsigned int arg3 ;
+  float arg4 ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  unsigned int val3 ;
+  int ecode3 = 0 ;
+  float val4 ;
+  int ecode4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOO:LoadMapCF",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "LoadMapCF" "', argument " "1"" of type '" "char const *""'");
+  }
+  arg1 = reinterpret_cast< char * >(buf1);
+  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "LoadMapCF" "', argument " "2"" of type '" "char const *""'");
+  }
+  arg2 = reinterpret_cast< char * >(buf2);
+  ecode3 = SWIG_AsVal_unsigned_SS_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "LoadMapCF" "', argument " "3"" of type '" "unsigned int""'");
+  } 
+  arg3 = static_cast< unsigned int >(val3);
+  ecode4 = SWIG_AsVal_float(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "LoadMapCF" "', argument " "4"" of type '" "float""'");
+  } 
+  arg4 = static_cast< float >(val4);
+  {
+    try {
+      ContextFunctions::LoadMapCF((char const *)arg1,(char const *)arg2,arg3,arg4);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  return resultobj;
+fail:
+  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_LoadMapCF__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  unsigned int arg3 ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  unsigned int val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:LoadMapCF",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "LoadMapCF" "', argument " "1"" of type '" "char const *""'");
+  }
+  arg1 = reinterpret_cast< char * >(buf1);
+  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "LoadMapCF" "', argument " "2"" of type '" "char const *""'");
+  }
+  arg2 = reinterpret_cast< char * >(buf2);
+  ecode3 = SWIG_AsVal_unsigned_SS_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "LoadMapCF" "', argument " "3"" of type '" "unsigned int""'");
+  } 
+  arg3 = static_cast< unsigned int >(val3);
+  {
+    try {
+      ContextFunctions::LoadMapCF((char const *)arg1,(char const *)arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  return resultobj;
+fail:
+  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_LoadMapCF__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:LoadMapCF",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "LoadMapCF" "', argument " "1"" of type '" "char const *""'");
+  }
+  arg1 = reinterpret_cast< char * >(buf1);
+  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "LoadMapCF" "', argument " "2"" of type '" "char const *""'");
+  }
+  arg2 = reinterpret_cast< char * >(buf2);
+  {
+    try {
+      ContextFunctions::LoadMapCF((char const *)arg1,(char const *)arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  return resultobj;
+fail:
+  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_LoadMapCF(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[5];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 4); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    int res = SWIG_AsCharPtrAndSize(argv[0], 0, NULL, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_AsCharPtrAndSize(argv[1], 0, NULL, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_LoadMapCF__SWIG_2(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    int res = SWIG_AsCharPtrAndSize(argv[0], 0, NULL, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_AsCharPtrAndSize(argv[1], 0, NULL, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_unsigned_SS_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          return _wrap_LoadMapCF__SWIG_1(self, args);
+        }
+      }
+    }
+  }
+  if (argc == 4) {
+    int _v;
+    int res = SWIG_AsCharPtrAndSize(argv[0], 0, NULL, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_AsCharPtrAndSize(argv[1], 0, NULL, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_unsigned_SS_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          {
+            int res = SWIG_AsVal_float(argv[3], NULL);
+            _v = SWIG_CheckState(res);
+          }
+          if (_v) {
+            return _wrap_LoadMapCF__SWIG_0(self, args);
+          }
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'LoadMapCF'.\n  Possible C/C++ prototypes are:\n    ContextFunctions::LoadMapCF(char const *,char const *,unsigned int,float)\n    ContextFunctions::LoadMapCF(char const *,char const *,unsigned int)\n    ContextFunctions::LoadMapCF(char const *,char const *)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ReadMapPixelCF(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  char *arg1 = (char *) 0 ;
+  int arg2 ;
+  unsigned int arg3 ;
+  unsigned int arg4 ;
+  float result;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  unsigned int val3 ;
+  int ecode3 = 0 ;
+  unsigned int val4 ;
+  int ecode4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOO:ReadMapPixelCF",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ReadMapPixelCF" "', argument " "1"" of type '" "char const *""'");
+  }
+  arg1 = reinterpret_cast< char * >(buf1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ReadMapPixelCF" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  ecode3 = SWIG_AsVal_unsigned_SS_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ReadMapPixelCF" "', argument " "3"" of type '" "unsigned int""'");
+  } 
+  arg3 = static_cast< unsigned int >(val3);
+  ecode4 = SWIG_AsVal_unsigned_SS_int(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "ReadMapPixelCF" "', argument " "4"" of type '" "unsigned int""'");
+  } 
+  arg4 = static_cast< unsigned int >(val4);
+  {
+    try {
+      result = (float)ContextFunctions::ReadMapPixelCF((char const *)arg1,arg2,arg3,arg4);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+  return resultobj;
+fail:
+  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ReadCompleteViewMapPixelCF(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  int arg1 ;
+  unsigned int arg2 ;
+  unsigned int arg3 ;
+  float result;
+  int val1 ;
+  int ecode1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
+  unsigned int val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:ReadCompleteViewMapPixelCF",&obj0,&obj1,&obj2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "ReadCompleteViewMapPixelCF" "', argument " "1"" of type '" "int""'");
+  } 
+  arg1 = static_cast< int >(val1);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ReadCompleteViewMapPixelCF" "', argument " "2"" of type '" "unsigned int""'");
+  } 
+  arg2 = static_cast< unsigned int >(val2);
+  ecode3 = SWIG_AsVal_unsigned_SS_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ReadCompleteViewMapPixelCF" "', argument " "3"" of type '" "unsigned int""'");
+  } 
+  arg3 = static_cast< unsigned int >(val3);
+  {
+    try {
+      result = (float)ContextFunctions::ReadCompleteViewMapPixelCF(arg1,arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ReadDirectionalViewMapPixelCF(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  int arg1 ;
+  int arg2 ;
+  unsigned int arg3 ;
+  unsigned int arg4 ;
+  float result;
+  int val1 ;
+  int ecode1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  unsigned int val3 ;
+  int ecode3 = 0 ;
+  unsigned int val4 ;
+  int ecode4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOO:ReadDirectionalViewMapPixelCF",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "ReadDirectionalViewMapPixelCF" "', argument " "1"" of type '" "int""'");
+  } 
+  arg1 = static_cast< int >(val1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ReadDirectionalViewMapPixelCF" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  ecode3 = SWIG_AsVal_unsigned_SS_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ReadDirectionalViewMapPixelCF" "', argument " "3"" of type '" "unsigned int""'");
+  } 
+  arg3 = static_cast< unsigned int >(val3);
+  ecode4 = SWIG_AsVal_unsigned_SS_int(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "ReadDirectionalViewMapPixelCF" "', argument " "4"" of type '" "unsigned int""'");
+  } 
+  arg4 = static_cast< unsigned int >(val4);
+  {
+    try {
+      result = (float)ContextFunctions::ReadDirectionalViewMapPixelCF(arg1,arg2,arg3,arg4);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_GetSelectedFEdgeCF(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  FEdge *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":GetSelectedFEdgeCF")) SWIG_fail;
+  {
+    try {
+      result = (FEdge *)ContextFunctions::GetSelectedFEdgeCF();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FEdge, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_AdjacencyIterator__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_AdjacencyIterator")) SWIG_fail;
+  {
+    try {
+      result = (AdjacencyIterator *)new AdjacencyIterator();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_AdjacencyIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_AdjacencyIterator__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewVertex *arg1 = (ViewVertex *) 0 ;
+  bool arg2 ;
+  bool arg3 ;
+  AdjacencyIterator *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  bool val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:new_AdjacencyIterator",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_AdjacencyIterator" "', argument " "1"" of type '" "ViewVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewVertex * >(argp1);
+  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_AdjacencyIterator" "', argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = static_cast< bool >(val2);
+  ecode3 = SWIG_AsVal_bool(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_AdjacencyIterator" "', argument " "3"" of type '" "bool""'");
+  } 
+  arg3 = static_cast< bool >(val3);
+  {
+    try {
+      result = (AdjacencyIterator *)new AdjacencyIterator(arg1,arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_AdjacencyIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_AdjacencyIterator__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewVertex *arg1 = (ViewVertex *) 0 ;
+  bool arg2 ;
+  AdjacencyIterator *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_AdjacencyIterator",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_AdjacencyIterator" "', argument " "1"" of type '" "ViewVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewVertex * >(argp1);
+  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_AdjacencyIterator" "', argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = static_cast< bool >(val2);
+  {
+    try {
+      result = (AdjacencyIterator *)new AdjacencyIterator(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_AdjacencyIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_AdjacencyIterator__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewVertex *arg1 = (ViewVertex *) 0 ;
+  AdjacencyIterator *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_AdjacencyIterator",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_AdjacencyIterator" "', argument " "1"" of type '" "ViewVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewVertex * >(argp1);
+  {
+    try {
+      result = (AdjacencyIterator *)new AdjacencyIterator(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_AdjacencyIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_AdjacencyIterator__SWIG_4(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = 0 ;
+  AdjacencyIterator *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_AdjacencyIterator",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_AdjacencyIterator,  0  | 0);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_AdjacencyIterator" "', argument " "1"" of type '" "AdjacencyIterator const &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_AdjacencyIterator" "', argument " "1"" of type '" "AdjacencyIterator const &""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  {
+    try {
+      result = (AdjacencyIterator *)new AdjacencyIterator((AdjacencyIterator const &)*arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_AdjacencyIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_AdjacencyIterator(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_AdjacencyIterator__SWIG_0(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ViewVertex, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_new_AdjacencyIterator__SWIG_3(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_AdjacencyIterator, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_new_AdjacencyIterator__SWIG_4(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ViewVertex, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_bool(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_new_AdjacencyIterator__SWIG_2(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ViewVertex, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_bool(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        {
+          int res = SWIG_AsVal_bool(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          return _wrap_new_AdjacencyIterator__SWIG_1(self, args);
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_AdjacencyIterator'.\n  Possible C/C++ prototypes are:\n    AdjacencyIterator()\n    AdjacencyIterator(ViewVertex *,bool,bool)\n    AdjacencyIterator(ViewVertex *,bool)\n    AdjacencyIterator(ViewVertex *)\n    AdjacencyIterator(AdjacencyIterator const &)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_AdjacencyIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_AdjacencyIterator",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_AdjacencyIterator" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_isEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:AdjacencyIterator_isEnd",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_isEnd" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  {
+    try {
+      result = (bool)(arg1)->isEnd();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_isBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:AdjacencyIterator_isBegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_isBegin" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  {
+    try {
+      result = (bool)(arg1)->isBegin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_isIncoming(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:AdjacencyIterator_isIncoming",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_isIncoming" "', argument " "1"" of type '" "AdjacencyIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  {
+    try {
+      result = (bool)((AdjacencyIterator const *)arg1)->isIncoming();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_getObject(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  ViewEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:AdjacencyIterator_getObject",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_getObject" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  {
+    try {
+      result = (ViewEdge *)(arg1)->operator *();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewEdge, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator___deref__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  ViewEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:AdjacencyIterator___deref__",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator___deref__" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  {
+    try {
+      result = (ViewEdge *)(arg1)->operator ->();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewEdge, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_increment(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:AdjacencyIterator_increment",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_increment" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  {
+    try {
+      (arg1)->increment();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:AdjacencyIterator_getExactTypeName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_getExactTypeName" "', argument " "1"" of type '" "AdjacencyIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->getExactTypeName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  Id result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:AdjacencyIterator_getId",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_getId" "', argument " "1"" of type '" "AdjacencyIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->getId();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Id(static_cast< const Id& >(result))), SWIGTYPE_p_Id, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_getNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  Nature::EdgeNature result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:AdjacencyIterator_getNature",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_getNature" "', argument " "1"" of type '" "AdjacencyIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  {
+    try {
+      result = (Nature::EdgeNature)(*arg1)->getNature();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_userdata_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  void *arg2 = (void *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:AdjacencyIterator_userdata_set",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_userdata_set" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2), 0, SWIG_POINTER_DISOWN);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AdjacencyIterator_userdata_set" "', argument " "2"" of type '" "void *""'"); 
+  }
+  if (arg1) (*arg1)->userdata = arg2;
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_userdata_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  void *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:AdjacencyIterator_userdata_get",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_userdata_get" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  result = (void *) ((*arg1)->userdata);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_void, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_A(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  ViewVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:AdjacencyIterator_A",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_A" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  {
+    try {
+      result = (ViewVertex *)(*arg1)->A();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_B(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  ViewVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:AdjacencyIterator_B",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_B" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  {
+    try {
+      result = (ViewVertex *)(*arg1)->B();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_fedgeA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  FEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:AdjacencyIterator_fedgeA",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_fedgeA" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  {
+    try {
+      result = (FEdge *)(*arg1)->fedgeA();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FEdge, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_fedgeB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  FEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:AdjacencyIterator_fedgeB",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_fedgeB" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  {
+    try {
+      result = (FEdge *)(*arg1)->fedgeB();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FEdge, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_viewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  ViewShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:AdjacencyIterator_viewShape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_viewShape" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  {
+    try {
+      result = (ViewShape *)(*arg1)->viewShape();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewShape, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_aShape__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  ViewShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:AdjacencyIterator_aShape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_aShape" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  {
+    try {
+      result = (ViewShape *)(*arg1)->aShape();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewShape, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_aShape__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  ViewShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:AdjacencyIterator_aShape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_aShape" "', argument " "1"" of type '" "AdjacencyIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  {
+    try {
+      result = (ViewShape *)(*arg1)->aShape();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewShape, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_aShape(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_AdjacencyIterator, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_AdjacencyIterator_aShape__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_AdjacencyIterator, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_AdjacencyIterator_aShape__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'AdjacencyIterator_aShape'.\n  Possible C/C++ prototypes are:\n    aShape()\n    aShape()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_isClosed(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:AdjacencyIterator_isClosed",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_isClosed" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  {
+    try {
+      result = (bool)(*arg1)->isClosed();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_getChainingTimeStamp(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  unsigned int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:AdjacencyIterator_getChainingTimeStamp",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_getChainingTimeStamp" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  {
+    try {
+      result = (unsigned int)(*arg1)->getChainingTimeStamp();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_bShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  ViewShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:AdjacencyIterator_bShape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_bShape" "', argument " "1"" of type '" "AdjacencyIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  {
+    try {
+      result = (ViewShape *)(*arg1)->bShape();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewShape, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_occluders(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  std::vector<ViewShape * > *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:AdjacencyIterator_occluders",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_occluders" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  {
+    try {
+      {
+        std::vector<ViewShape * > &_result_ref = (*arg1)->occluders();
+        result = (std::vector<ViewShape * > *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_splittingId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  Id *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:AdjacencyIterator_splittingId",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_splittingId" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  {
+    try {
+      result = (Id *)(*arg1)->splittingId();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Id, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_SetA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  ViewVertex *arg2 = (ViewVertex *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:AdjacencyIterator_SetA",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_SetA" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewVertex, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AdjacencyIterator_SetA" "', argument " "2"" of type '" "ViewVertex *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewVertex * >(argp2);
+  {
+    try {
+      (*arg1)->SetA(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_SetB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  ViewVertex *arg2 = (ViewVertex *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:AdjacencyIterator_SetB",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_SetB" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewVertex, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AdjacencyIterator_SetB" "', argument " "2"" of type '" "ViewVertex *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewVertex * >(argp2);
+  {
+    try {
+      (*arg1)->SetB(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_SetNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  Nature::EdgeNature arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned short val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:AdjacencyIterator_SetNature",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_SetNature" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  ecode2 = SWIG_AsVal_unsigned_SS_short(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "AdjacencyIterator_SetNature" "', argument " "2"" of type '" "Nature::EdgeNature""'");
+  } 
+  arg2 = static_cast< Nature::EdgeNature >(val2);
+  {
+    try {
+      (*arg1)->SetNature(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_SetFEdgeA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  FEdge *arg2 = (FEdge *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:AdjacencyIterator_SetFEdgeA",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_SetFEdgeA" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AdjacencyIterator_SetFEdgeA" "', argument " "2"" of type '" "FEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< FEdge * >(argp2);
+  {
+    try {
+      (*arg1)->SetFEdgeA(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_SetFEdgeB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  FEdge *arg2 = (FEdge *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:AdjacencyIterator_SetFEdgeB",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_SetFEdgeB" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AdjacencyIterator_SetFEdgeB" "', argument " "2"" of type '" "FEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< FEdge * >(argp2);
+  {
+    try {
+      (*arg1)->SetFEdgeB(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_SetShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  ViewShape *arg2 = (ViewShape *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:AdjacencyIterator_SetShape",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_SetShape" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewShape, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AdjacencyIterator_SetShape" "', argument " "2"" of type '" "ViewShape *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewShape * >(argp2);
+  {
+    try {
+      (*arg1)->SetShape(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_SetId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  Id *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:AdjacencyIterator_SetId",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_SetId" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Id,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AdjacencyIterator_SetId" "', argument " "2"" of type '" "Id const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AdjacencyIterator_SetId" "', argument " "2"" of type '" "Id const &""'"); 
+  }
+  arg2 = reinterpret_cast< Id * >(argp2);
+  {
+    try {
+      (*arg1)->SetId((Id const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_UpdateFEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:AdjacencyIterator_UpdateFEdges",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_UpdateFEdges" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  {
+    try {
+      (*arg1)->UpdateFEdges();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_SetaShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  ViewShape *arg2 = (ViewShape *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:AdjacencyIterator_SetaShape",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_SetaShape" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewShape, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AdjacencyIterator_SetaShape" "', argument " "2"" of type '" "ViewShape *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewShape * >(argp2);
+  {
+    try {
+      (*arg1)->SetaShape(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_SetQI(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:AdjacencyIterator_SetQI",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_SetQI" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "AdjacencyIterator_SetQI" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  {
+    try {
+      (*arg1)->SetQI(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_setChainingTimeStamp(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  unsigned int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:AdjacencyIterator_setChainingTimeStamp",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_setChainingTimeStamp" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "AdjacencyIterator_setChainingTimeStamp" "', argument " "2"" of type '" "unsigned int""'");
+  } 
+  arg2 = static_cast< unsigned int >(val2);
+  {
+    try {
+      (*arg1)->setChainingTimeStamp(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_AddOccluder(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  ViewShape *arg2 = (ViewShape *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:AdjacencyIterator_AddOccluder",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_AddOccluder" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewShape, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AdjacencyIterator_AddOccluder" "', argument " "2"" of type '" "ViewShape *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewShape * >(argp2);
+  {
+    try {
+      (*arg1)->AddOccluder(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_setSplittingId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  Id *arg2 = (Id *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:AdjacencyIterator_setSplittingId",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_setSplittingId" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_Id, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AdjacencyIterator_setSplittingId" "', argument " "2"" of type '" "Id *""'"); 
+  }
+  arg2 = reinterpret_cast< Id * >(argp2);
+  {
+    try {
+      (*arg1)->setSplittingId(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_intersect_2d_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  Geometry::Vec2r *arg2 = 0 ;
+  Geometry::Vec2r *arg3 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:AdjacencyIterator_intersect_2d_area",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_intersect_2d_area" "', argument " "1"" of type '" "AdjacencyIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AdjacencyIterator_intersect_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AdjacencyIterator_intersect_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
+  }
+  arg2 = reinterpret_cast< Geometry::Vec2r * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "AdjacencyIterator_intersect_2d_area" "', argument " "3"" of type '" "Geometry::Vec2r const &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AdjacencyIterator_intersect_2d_area" "', argument " "3"" of type '" "Geometry::Vec2r const &""'"); 
+  }
+  arg3 = reinterpret_cast< Geometry::Vec2r * >(argp3);
+  {
+    try {
+      result = (bool)(*arg1)->intersect_2d_area((Geometry::Vec2r const &)*arg2,(Geometry::Vec2r const &)*arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_include_in_2d_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  Geometry::Vec2r *arg2 = 0 ;
+  Geometry::Vec2r *arg3 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:AdjacencyIterator_include_in_2d_area",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_include_in_2d_area" "', argument " "1"" of type '" "AdjacencyIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AdjacencyIterator_include_in_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AdjacencyIterator_include_in_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
+  }
+  arg2 = reinterpret_cast< Geometry::Vec2r * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "AdjacencyIterator_include_in_2d_area" "', argument " "3"" of type '" "Geometry::Vec2r const &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AdjacencyIterator_include_in_2d_area" "', argument " "3"" of type '" "Geometry::Vec2r const &""'"); 
+  }
+  arg3 = reinterpret_cast< Geometry::Vec2r * >(argp3);
+  {
+    try {
+      result = (bool)(*arg1)->include_in_2d_area((Geometry::Vec2r const &)*arg2,(Geometry::Vec2r const &)*arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_getLength2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:AdjacencyIterator_getLength2D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_getLength2D" "', argument " "1"" of type '" "AdjacencyIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->getLength2D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_qi(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:AdjacencyIterator_qi",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_qi" "', argument " "1"" of type '" "AdjacencyIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  {
+    try {
+      result = (int)(*arg1)->qi();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_occluders_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  occluder_container::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:AdjacencyIterator_occluders_begin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_occluders_begin" "', argument " "1"" of type '" "AdjacencyIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->occluders_begin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new occluder_container::const_iterator(static_cast< const occluder_container::const_iterator& >(result))), SWIGTYPE_p_occluder_container__const_iterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_occluders_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  occluder_container::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:AdjacencyIterator_occluders_end",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_occluders_end" "', argument " "1"" of type '" "AdjacencyIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->occluders_end();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new occluder_container::const_iterator(static_cast< const occluder_container::const_iterator& >(result))), SWIGTYPE_p_occluder_container__const_iterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_occluders_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:AdjacencyIterator_occluders_size",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_occluders_size" "', argument " "1"" of type '" "AdjacencyIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  {
+    try {
+      result = (int)(*arg1)->occluders_size();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_occluders_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:AdjacencyIterator_occluders_empty",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_occluders_empty" "', argument " "1"" of type '" "AdjacencyIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  {
+    try {
+      result = (bool)(*arg1)->occluders_empty();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_occludee(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  Polygon3r *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:AdjacencyIterator_occludee",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_occludee" "', argument " "1"" of type '" "AdjacencyIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  {
+    try {
+      {
+        Polygon3r const &_result_ref = (*arg1)->occludee();
+        result = (Polygon3r *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Polygon3r, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_occluded_shape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  SShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:AdjacencyIterator_occluded_shape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_occluded_shape" "', argument " "1"" of type '" "AdjacencyIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  {
+    try {
+      result = (SShape *)(*arg1)->occluded_shape();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SShape, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_occludee_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:AdjacencyIterator_occludee_empty",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_occludee_empty" "', argument " "1"" of type '" "AdjacencyIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  {
+    try {
+      result = (bool)(*arg1)->occludee_empty();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_shape_id(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  Id result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:AdjacencyIterator_shape_id",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_shape_id" "', argument " "1"" of type '" "AdjacencyIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->shape_id();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Id(static_cast< const Id& >(result))), SWIGTYPE_p_Id, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_shape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  SShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:AdjacencyIterator_shape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_shape" "', argument " "1"" of type '" "AdjacencyIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  {
+    try {
+      result = (SShape *)(*arg1)->shape();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SShape, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_shape_importance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:AdjacencyIterator_shape_importance",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_shape_importance" "', argument " "1"" of type '" "AdjacencyIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  {
+    try {
+      result = (float)(*arg1)->shape_importance();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_verticesBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  Interface0DIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:AdjacencyIterator_verticesBegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_verticesBegin" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->verticesBegin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Interface0DIterator(static_cast< const Interface0DIterator& >(result))), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_verticesEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  Interface0DIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:AdjacencyIterator_verticesEnd",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_verticesEnd" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->verticesEnd();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Interface0DIterator(static_cast< const Interface0DIterator& >(result))), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_pointsBegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  float arg2 ;
+  Interface0DIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:AdjacencyIterator_pointsBegin",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_pointsBegin" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "AdjacencyIterator_pointsBegin" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  {
+    try {
+      result = (*arg1)->pointsBegin(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Interface0DIterator(static_cast< const Interface0DIterator& >(result))), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_pointsBegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  Interface0DIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:AdjacencyIterator_pointsBegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_pointsBegin" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->pointsBegin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Interface0DIterator(static_cast< const Interface0DIterator& >(result))), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_pointsBegin(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_AdjacencyIterator, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_AdjacencyIterator_pointsBegin__SWIG_1(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_AdjacencyIterator, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_float(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_AdjacencyIterator_pointsBegin__SWIG_0(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'AdjacencyIterator_pointsBegin'.\n  Possible C/C++ prototypes are:\n    pointsBegin(float)\n    pointsBegin()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_pointsEnd__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  float arg2 ;
+  Interface0DIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:AdjacencyIterator_pointsEnd",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_pointsEnd" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "AdjacencyIterator_pointsEnd" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  {
+    try {
+      result = (*arg1)->pointsEnd(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Interface0DIterator(static_cast< const Interface0DIterator& >(result))), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_pointsEnd__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  Interface0DIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:AdjacencyIterator_pointsEnd",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_pointsEnd" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->pointsEnd();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Interface0DIterator(static_cast< const Interface0DIterator& >(result))), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_pointsEnd(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_AdjacencyIterator, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_AdjacencyIterator_pointsEnd__SWIG_1(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_AdjacencyIterator, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_float(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_AdjacencyIterator_pointsEnd__SWIG_0(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'AdjacencyIterator_pointsEnd'.\n  Possible C/C++ prototypes are:\n    pointsEnd(float)\n    pointsEnd()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_getTimeStamp(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  unsigned int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:AdjacencyIterator_getTimeStamp",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_getTimeStamp" "', argument " "1"" of type '" "AdjacencyIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  {
+    try {
+      result = (unsigned int)(*arg1)->getTimeStamp();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_setTimeStamp(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  unsigned int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:AdjacencyIterator_setTimeStamp",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_setTimeStamp" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "AdjacencyIterator_setTimeStamp" "', argument " "2"" of type '" "unsigned int""'");
+  } 
+  arg2 = static_cast< unsigned int >(val2);
+  {
+    try {
+      (*arg1)->setTimeStamp(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *AdjacencyIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_AdjacencyIterator, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_ChainingIterator__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  bool arg2 ;
+  bool arg3 ;
+  ViewEdge *arg4 = (ViewEdge *) 0 ;
+  bool arg5 ;
+  ChainingIterator *result = 0 ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  bool val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  bool val5 ;
+  int ecode5 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOOO:new_ChainingIterator",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  arg1 = obj0;
+  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_ChainingIterator" "', argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = static_cast< bool >(val2);
+  ecode3 = SWIG_AsVal_bool(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_ChainingIterator" "', argument " "3"" of type '" "bool""'");
+  } 
+  arg3 = static_cast< bool >(val3);
+  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "new_ChainingIterator" "', argument " "4"" of type '" "ViewEdge *""'"); 
+  }
+  arg4 = reinterpret_cast< ViewEdge * >(argp4);
+  ecode5 = SWIG_AsVal_bool(obj4, &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_ChainingIterator" "', argument " "5"" of type '" "bool""'");
+  } 
+  arg5 = static_cast< bool >(val5);
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (ChainingIterator *)new SwigDirector_ChainingIterator(arg1,arg2,arg3,arg4,arg5); 
+      } else {
+        result = (ChainingIterator *)new ChainingIterator(arg2,arg3,arg4,arg5); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ChainingIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ChainingIterator__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  bool arg2 ;
+  bool arg3 ;
+  ViewEdge *arg4 = (ViewEdge *) 0 ;
+  ChainingIterator *result = 0 ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  bool val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOO:new_ChainingIterator",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  arg1 = obj0;
+  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_ChainingIterator" "', argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = static_cast< bool >(val2);
+  ecode3 = SWIG_AsVal_bool(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_ChainingIterator" "', argument " "3"" of type '" "bool""'");
+  } 
+  arg3 = static_cast< bool >(val3);
+  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "new_ChainingIterator" "', argument " "4"" of type '" "ViewEdge *""'"); 
+  }
+  arg4 = reinterpret_cast< ViewEdge * >(argp4);
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (ChainingIterator *)new SwigDirector_ChainingIterator(arg1,arg2,arg3,arg4); 
+      } else {
+        result = (ChainingIterator *)new ChainingIterator(arg2,arg3,arg4); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ChainingIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ChainingIterator__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  bool arg2 ;
+  bool arg3 ;
+  ChainingIterator *result = 0 ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  bool val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:new_ChainingIterator",&obj0,&obj1,&obj2)) SWIG_fail;
+  arg1 = obj0;
+  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_ChainingIterator" "', argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = static_cast< bool >(val2);
+  ecode3 = SWIG_AsVal_bool(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_ChainingIterator" "', argument " "3"" of type '" "bool""'");
+  } 
+  arg3 = static_cast< bool >(val3);
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (ChainingIterator *)new SwigDirector_ChainingIterator(arg1,arg2,arg3); 
+      } else {
+        result = (ChainingIterator *)new ChainingIterator(arg2,arg3); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ChainingIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ChainingIterator__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  bool arg2 ;
+  ChainingIterator *result = 0 ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_ChainingIterator",&obj0,&obj1)) SWIG_fail;
+  arg1 = obj0;
+  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_ChainingIterator" "', argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = static_cast< bool >(val2);
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (ChainingIterator *)new SwigDirector_ChainingIterator(arg1,arg2); 
+      } else {
+        result = (ChainingIterator *)new ChainingIterator(arg2); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ChainingIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ChainingIterator__SWIG_4(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  ChainingIterator *result = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_ChainingIterator",&obj0)) SWIG_fail;
+  arg1 = obj0;
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (ChainingIterator *)new SwigDirector_ChainingIterator(arg1); 
+      } else {
+        result = (ChainingIterator *)new ChainingIterator(); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ChainingIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ChainingIterator__SWIG_5(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  ChainingIterator *arg2 = 0 ;
+  ChainingIterator *result = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_ChainingIterator",&obj0,&obj1)) SWIG_fail;
+  arg1 = obj0;
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_ChainingIterator,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ChainingIterator" "', argument " "2"" of type '" "ChainingIterator const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ChainingIterator" "', argument " "2"" of type '" "ChainingIterator const &""'"); 
+  }
+  arg2 = reinterpret_cast< ChainingIterator * >(argp2);
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (ChainingIterator *)new SwigDirector_ChainingIterator(arg1,(ChainingIterator const &)*arg2); 
+      } else {
+        result = (ChainingIterator *)new ChainingIterator((ChainingIterator const &)*arg2); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ChainingIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ChainingIterator(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[6];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 5); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    _v = (argv[0] != 0);
+    if (_v) {
+      return _wrap_new_ChainingIterator__SWIG_4(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    _v = (argv[0] != 0);
+    if (_v) {
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_ChainingIterator, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_new_ChainingIterator__SWIG_5(self, args);
+      }
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    _v = (argv[0] != 0);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_bool(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_new_ChainingIterator__SWIG_3(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    _v = (argv[0] != 0);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_bool(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        {
+          int res = SWIG_AsVal_bool(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          return _wrap_new_ChainingIterator__SWIG_2(self, args);
+        }
+      }
+    }
+  }
+  if (argc == 4) {
+    int _v;
+    _v = (argv[0] != 0);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_bool(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        {
+          int res = SWIG_AsVal_bool(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_ViewEdge, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            return _wrap_new_ChainingIterator__SWIG_1(self, args);
+          }
+        }
+      }
+    }
+  }
+  if (argc == 5) {
+    int _v;
+    _v = (argv[0] != 0);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_bool(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        {
+          int res = SWIG_AsVal_bool(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_ViewEdge, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            {
+              int res = SWIG_AsVal_bool(argv[4], NULL);
+              _v = SWIG_CheckState(res);
+            }
+            if (_v) {
+              return _wrap_new_ChainingIterator__SWIG_0(self, args);
+            }
+          }
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ChainingIterator'.\n  Possible C/C++ prototypes are:\n    ChainingIterator(PyObject *,bool,bool,ViewEdge *,bool)\n    ChainingIterator(PyObject *,bool,bool,ViewEdge *)\n    ChainingIterator(PyObject *,bool,bool)\n    ChainingIterator(PyObject *,bool)\n    ChainingIterator(PyObject *)\n    ChainingIterator(PyObject *,ChainingIterator const &)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ChainingIterator_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ChainingIterator *arg1 = (ChainingIterator *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ChainingIterator_getExactTypeName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ChainingIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ChainingIterator_getExactTypeName" "', argument " "1"" of type '" "ChainingIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ChainingIterator * >(argp1);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          result = ((ChainingIterator const *)arg1)->ChainingIterator::getExactTypeName();
+        } else {
+          result = ((ChainingIterator const *)arg1)->getExactTypeName();
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ChainingIterator_init(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ChainingIterator *arg1 = (ChainingIterator *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ChainingIterator_init",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ChainingIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ChainingIterator_init" "', argument " "1"" of type '" "ChainingIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ChainingIterator * >(argp1);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          (arg1)->ChainingIterator::init();
+        } else {
+          (arg1)->init();
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ChainingIterator_traverse(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ChainingIterator *arg1 = (ChainingIterator *) 0 ;
+  AdjacencyIterator *arg2 = 0 ;
+  ViewEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ChainingIterator_traverse",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ChainingIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ChainingIterator_traverse" "', argument " "1"" of type '" "ChainingIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ChainingIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_AdjacencyIterator,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ChainingIterator_traverse" "', argument " "2"" of type '" "AdjacencyIterator const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ChainingIterator_traverse" "', argument " "2"" of type '" "AdjacencyIterator const &""'"); 
+  }
+  arg2 = reinterpret_cast< AdjacencyIterator * >(argp2);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          result = (ViewEdge *)(arg1)->ChainingIterator::traverse((AdjacencyIterator const &)*arg2);
+        } else {
+          result = (ViewEdge *)(arg1)->traverse((AdjacencyIterator const &)*arg2);
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (director) {
+    SWIG_AcquirePtr(resultobj, director->swig_release_ownership(SWIG_as_voidptr(result)));
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ChainingIterator_getVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ChainingIterator *arg1 = (ChainingIterator *) 0 ;
+  ViewVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ChainingIterator_getVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ChainingIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ChainingIterator_getVertex" "', argument " "1"" of type '" "ChainingIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ChainingIterator * >(argp1);
+  {
+    try {
+      result = (ViewVertex *)(arg1)->getVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ChainingIterator_isIncrementing(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ChainingIterator *arg1 = (ChainingIterator *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ChainingIterator_isIncrementing",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ChainingIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ChainingIterator_isIncrementing" "', argument " "1"" of type '" "ChainingIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ChainingIterator * >(argp1);
+  {
+    try {
+      result = (bool)((ChainingIterator const *)arg1)->isIncrementing();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ChainingIterator_increment(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ChainingIterator *arg1 = (ChainingIterator *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ChainingIterator_increment",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ChainingIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ChainingIterator_increment" "', argument " "1"" of type '" "ChainingIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ChainingIterator * >(argp1);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          (arg1)->ChainingIterator::increment();
+        } else {
+          (arg1)->increment();
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ChainingIterator_decrement(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ChainingIterator *arg1 = (ChainingIterator *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ChainingIterator_decrement",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ChainingIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ChainingIterator_decrement" "', argument " "1"" of type '" "ChainingIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ChainingIterator * >(argp1);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          (arg1)->ChainingIterator::decrement();
+        } else {
+          (arg1)->decrement();
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ChainingIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ChainingIterator *arg1 = (ChainingIterator *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_ChainingIterator",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ChainingIterator, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ChainingIterator" "', argument " "1"" of type '" "ChainingIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ChainingIterator * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_disown_ChainingIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ChainingIterator *arg1 = (ChainingIterator *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:disown_ChainingIterator",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ChainingIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_ChainingIterator" "', argument " "1"" of type '" "ChainingIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ChainingIterator * >(argp1);
+  {
+    Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
+    if (director) director->swig_disown();
+  }
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *ChainingIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_ChainingIterator, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_ChainSilhouetteIterator__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  bool arg2 ;
+  ViewEdge *arg3 = (ViewEdge *) 0 ;
+  bool arg4 ;
+  ChainSilhouetteIterator *result = 0 ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  bool val4 ;
+  int ecode4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOO:new_ChainSilhouetteIterator",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  arg1 = obj0;
+  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_ChainSilhouetteIterator" "', argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = static_cast< bool >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_ChainSilhouetteIterator" "', argument " "3"" of type '" "ViewEdge *""'"); 
+  }
+  arg3 = reinterpret_cast< ViewEdge * >(argp3);
+  ecode4 = SWIG_AsVal_bool(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_ChainSilhouetteIterator" "', argument " "4"" of type '" "bool""'");
+  } 
+  arg4 = static_cast< bool >(val4);
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (ChainSilhouetteIterator *)new SwigDirector_ChainSilhouetteIterator(arg1,arg2,arg3,arg4); 
+      } else {
+        result = (ChainSilhouetteIterator *)new ChainSilhouetteIterator(arg2,arg3,arg4); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ChainSilhouetteIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ChainSilhouetteIterator__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  bool arg2 ;
+  ViewEdge *arg3 = (ViewEdge *) 0 ;
+  ChainSilhouetteIterator *result = 0 ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:new_ChainSilhouetteIterator",&obj0,&obj1,&obj2)) SWIG_fail;
+  arg1 = obj0;
+  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_ChainSilhouetteIterator" "', argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = static_cast< bool >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_ChainSilhouetteIterator" "', argument " "3"" of type '" "ViewEdge *""'"); 
+  }
+  arg3 = reinterpret_cast< ViewEdge * >(argp3);
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (ChainSilhouetteIterator *)new SwigDirector_ChainSilhouetteIterator(arg1,arg2,arg3); 
+      } else {
+        result = (ChainSilhouetteIterator *)new ChainSilhouetteIterator(arg2,arg3); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ChainSilhouetteIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ChainSilhouetteIterator__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  bool arg2 ;
+  ChainSilhouetteIterator *result = 0 ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_ChainSilhouetteIterator",&obj0,&obj1)) SWIG_fail;
+  arg1 = obj0;
+  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_ChainSilhouetteIterator" "', argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = static_cast< bool >(val2);
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (ChainSilhouetteIterator *)new SwigDirector_ChainSilhouetteIterator(arg1,arg2); 
+      } else {
+        result = (ChainSilhouetteIterator *)new ChainSilhouetteIterator(arg2); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ChainSilhouetteIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ChainSilhouetteIterator__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  ChainSilhouetteIterator *result = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_ChainSilhouetteIterator",&obj0)) SWIG_fail;
+  arg1 = obj0;
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (ChainSilhouetteIterator *)new SwigDirector_ChainSilhouetteIterator(arg1); 
+      } else {
+        result = (ChainSilhouetteIterator *)new ChainSilhouetteIterator(); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ChainSilhouetteIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ChainSilhouetteIterator__SWIG_4(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  ChainSilhouetteIterator *arg2 = 0 ;
+  ChainSilhouetteIterator *result = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_ChainSilhouetteIterator",&obj0,&obj1)) SWIG_fail;
+  arg1 = obj0;
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_ChainSilhouetteIterator,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ChainSilhouetteIterator" "', argument " "2"" of type '" "ChainSilhouetteIterator const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ChainSilhouetteIterator" "', argument " "2"" of type '" "ChainSilhouetteIterator const &""'"); 
+  }
+  arg2 = reinterpret_cast< ChainSilhouetteIterator * >(argp2);
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (ChainSilhouetteIterator *)new SwigDirector_ChainSilhouetteIterator(arg1,(ChainSilhouetteIterator const &)*arg2); 
+      } else {
+        result = (ChainSilhouetteIterator *)new ChainSilhouetteIterator((ChainSilhouetteIterator const &)*arg2); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ChainSilhouetteIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ChainSilhouetteIterator(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[5];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 4); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    _v = (argv[0] != 0);
+    if (_v) {
+      return _wrap_new_ChainSilhouetteIterator__SWIG_3(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    _v = (argv[0] != 0);
+    if (_v) {
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_ChainSilhouetteIterator, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_new_ChainSilhouetteIterator__SWIG_4(self, args);
+      }
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    _v = (argv[0] != 0);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_bool(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_new_ChainSilhouetteIterator__SWIG_2(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    _v = (argv[0] != 0);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_bool(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_ViewEdge, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          return _wrap_new_ChainSilhouetteIterator__SWIG_1(self, args);
+        }
+      }
+    }
+  }
+  if (argc == 4) {
+    int _v;
+    _v = (argv[0] != 0);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_bool(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_ViewEdge, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          {
+            int res = SWIG_AsVal_bool(argv[3], NULL);
+            _v = SWIG_CheckState(res);
+          }
+          if (_v) {
+            return _wrap_new_ChainSilhouetteIterator__SWIG_0(self, args);
+          }
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ChainSilhouetteIterator'.\n  Possible C/C++ prototypes are:\n    ChainSilhouetteIterator(PyObject *,bool,ViewEdge *,bool)\n    ChainSilhouetteIterator(PyObject *,bool,ViewEdge *)\n    ChainSilhouetteIterator(PyObject *,bool)\n    ChainSilhouetteIterator(PyObject *)\n    ChainSilhouetteIterator(PyObject *,ChainSilhouetteIterator const &)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ChainSilhouetteIterator_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ChainSilhouetteIterator *arg1 = (ChainSilhouetteIterator *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ChainSilhouetteIterator_getExactTypeName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ChainSilhouetteIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ChainSilhouetteIterator_getExactTypeName" "', argument " "1"" of type '" "ChainSilhouetteIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ChainSilhouetteIterator * >(argp1);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          result = ((ChainSilhouetteIterator const *)arg1)->ChainSilhouetteIterator::getExactTypeName();
+        } else {
+          result = ((ChainSilhouetteIterator const *)arg1)->getExactTypeName();
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ChainSilhouetteIterator_traverse(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ChainSilhouetteIterator *arg1 = (ChainSilhouetteIterator *) 0 ;
+  AdjacencyIterator *arg2 = 0 ;
+  ViewEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ChainSilhouetteIterator_traverse",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ChainSilhouetteIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ChainSilhouetteIterator_traverse" "', argument " "1"" of type '" "ChainSilhouetteIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ChainSilhouetteIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_AdjacencyIterator,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ChainSilhouetteIterator_traverse" "', argument " "2"" of type '" "AdjacencyIterator const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ChainSilhouetteIterator_traverse" "', argument " "2"" of type '" "AdjacencyIterator const &""'"); 
+  }
+  arg2 = reinterpret_cast< AdjacencyIterator * >(argp2);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          result = (ViewEdge *)(arg1)->ChainSilhouetteIterator::traverse((AdjacencyIterator const &)*arg2);
+        } else {
+          result = (ViewEdge *)(arg1)->traverse((AdjacencyIterator const &)*arg2);
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (director) {
+    SWIG_AcquirePtr(resultobj, director->swig_release_ownership(SWIG_as_voidptr(result)));
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ChainSilhouetteIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ChainSilhouetteIterator *arg1 = (ChainSilhouetteIterator *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_ChainSilhouetteIterator",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ChainSilhouetteIterator, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ChainSilhouetteIterator" "', argument " "1"" of type '" "ChainSilhouetteIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ChainSilhouetteIterator * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_disown_ChainSilhouetteIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ChainSilhouetteIterator *arg1 = (ChainSilhouetteIterator *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:disown_ChainSilhouetteIterator",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ChainSilhouetteIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_ChainSilhouetteIterator" "', argument " "1"" of type '" "ChainSilhouetteIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ChainSilhouetteIterator * >(argp1);
+  {
+    Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
+    if (director) director->swig_disown();
+  }
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *ChainSilhouetteIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_ChainSilhouetteIterator, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_ChainPredicateIterator__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  bool arg2 ;
+  bool arg3 ;
+  ViewEdge *arg4 = (ViewEdge *) 0 ;
+  bool arg5 ;
+  ChainPredicateIterator *result = 0 ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  bool val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  bool val5 ;
+  int ecode5 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOOO:new_ChainPredicateIterator",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  arg1 = obj0;
+  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_ChainPredicateIterator" "', argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = static_cast< bool >(val2);
+  ecode3 = SWIG_AsVal_bool(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_ChainPredicateIterator" "', argument " "3"" of type '" "bool""'");
+  } 
+  arg3 = static_cast< bool >(val3);
+  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "new_ChainPredicateIterator" "', argument " "4"" of type '" "ViewEdge *""'"); 
+  }
+  arg4 = reinterpret_cast< ViewEdge * >(argp4);
+  ecode5 = SWIG_AsVal_bool(obj4, &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_ChainPredicateIterator" "', argument " "5"" of type '" "bool""'");
+  } 
+  arg5 = static_cast< bool >(val5);
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (ChainPredicateIterator *)new SwigDirector_ChainPredicateIterator(arg1,arg2,arg3,arg4,arg5); 
+      } else {
+        result = (ChainPredicateIterator *)new ChainPredicateIterator(arg2,arg3,arg4,arg5); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ChainPredicateIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ChainPredicateIterator__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  bool arg2 ;
+  bool arg3 ;
+  ViewEdge *arg4 = (ViewEdge *) 0 ;
+  ChainPredicateIterator *result = 0 ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  bool val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOO:new_ChainPredicateIterator",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  arg1 = obj0;
+  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_ChainPredicateIterator" "', argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = static_cast< bool >(val2);
+  ecode3 = SWIG_AsVal_bool(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_ChainPredicateIterator" "', argument " "3"" of type '" "bool""'");
+  } 
+  arg3 = static_cast< bool >(val3);
+  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "new_ChainPredicateIterator" "', argument " "4"" of type '" "ViewEdge *""'"); 
+  }
+  arg4 = reinterpret_cast< ViewEdge * >(argp4);
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (ChainPredicateIterator *)new SwigDirector_ChainPredicateIterator(arg1,arg2,arg3,arg4); 
+      } else {
+        result = (ChainPredicateIterator *)new ChainPredicateIterator(arg2,arg3,arg4); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ChainPredicateIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ChainPredicateIterator__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  bool arg2 ;
+  bool arg3 ;
+  ChainPredicateIterator *result = 0 ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  bool val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:new_ChainPredicateIterator",&obj0,&obj1,&obj2)) SWIG_fail;
+  arg1 = obj0;
+  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_ChainPredicateIterator" "', argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = static_cast< bool >(val2);
+  ecode3 = SWIG_AsVal_bool(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_ChainPredicateIterator" "', argument " "3"" of type '" "bool""'");
+  } 
+  arg3 = static_cast< bool >(val3);
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (ChainPredicateIterator *)new SwigDirector_ChainPredicateIterator(arg1,arg2,arg3); 
+      } else {
+        result = (ChainPredicateIterator *)new ChainPredicateIterator(arg2,arg3); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ChainPredicateIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ChainPredicateIterator__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  bool arg2 ;
+  ChainPredicateIterator *result = 0 ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_ChainPredicateIterator",&obj0,&obj1)) SWIG_fail;
+  arg1 = obj0;
+  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_ChainPredicateIterator" "', argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = static_cast< bool >(val2);
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (ChainPredicateIterator *)new SwigDirector_ChainPredicateIterator(arg1,arg2); 
+      } else {
+        result = (ChainPredicateIterator *)new ChainPredicateIterator(arg2); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ChainPredicateIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ChainPredicateIterator__SWIG_4(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  ChainPredicateIterator *result = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_ChainPredicateIterator",&obj0)) SWIG_fail;
+  arg1 = obj0;
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (ChainPredicateIterator *)new SwigDirector_ChainPredicateIterator(arg1); 
+      } else {
+        result = (ChainPredicateIterator *)new ChainPredicateIterator(); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ChainPredicateIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ChainPredicateIterator__SWIG_5(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  UnaryPredicate1D *arg2 = 0 ;
+  BinaryPredicate1D *arg3 = 0 ;
+  bool arg4 ;
+  bool arg5 ;
+  ViewEdge *arg6 = (ViewEdge *) 0 ;
+  bool arg7 ;
+  ChainPredicateIterator *result = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  bool val4 ;
+  int ecode4 = 0 ;
+  bool val5 ;
+  int ecode5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
+  bool val7 ;
+  int ecode7 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
+  PyObject * obj6 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOOOOO:new_ChainPredicateIterator",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
+  arg1 = obj0;
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_UnaryPredicate1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ChainPredicateIterator" "', argument " "2"" of type '" "UnaryPredicate1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ChainPredicateIterator" "', argument " "2"" of type '" "UnaryPredicate1D &""'"); 
+  }
+  arg2 = reinterpret_cast< UnaryPredicate1D * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_BinaryPredicate1D,  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_ChainPredicateIterator" "', argument " "3"" of type '" "BinaryPredicate1D &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ChainPredicateIterator" "', argument " "3"" of type '" "BinaryPredicate1D &""'"); 
+  }
+  arg3 = reinterpret_cast< BinaryPredicate1D * >(argp3);
+  ecode4 = SWIG_AsVal_bool(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_ChainPredicateIterator" "', argument " "4"" of type '" "bool""'");
+  } 
+  arg4 = static_cast< bool >(val4);
+  ecode5 = SWIG_AsVal_bool(obj4, &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_ChainPredicateIterator" "', argument " "5"" of type '" "bool""'");
+  } 
+  arg5 = static_cast< bool >(val5);
+  res6 = SWIG_ConvertPtr(obj5, &argp6,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "new_ChainPredicateIterator" "', argument " "6"" of type '" "ViewEdge *""'"); 
+  }
+  arg6 = reinterpret_cast< ViewEdge * >(argp6);
+  ecode7 = SWIG_AsVal_bool(obj6, &val7);
+  if (!SWIG_IsOK(ecode7)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "new_ChainPredicateIterator" "', argument " "7"" of type '" "bool""'");
+  } 
+  arg7 = static_cast< bool >(val7);
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (ChainPredicateIterator *)new SwigDirector_ChainPredicateIterator(arg1,*arg2,*arg3,arg4,arg5,arg6,arg7); 
+      } else {
+        result = (ChainPredicateIterator *)new ChainPredicateIterator(*arg2,*arg3,arg4,arg5,arg6,arg7); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ChainPredicateIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ChainPredicateIterator__SWIG_6(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  UnaryPredicate1D *arg2 = 0 ;
+  BinaryPredicate1D *arg3 = 0 ;
+  bool arg4 ;
+  bool arg5 ;
+  ViewEdge *arg6 = (ViewEdge *) 0 ;
+  ChainPredicateIterator *result = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  bool val4 ;
+  int ecode4 = 0 ;
+  bool val5 ;
+  int ecode5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOOOO:new_ChainPredicateIterator",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  arg1 = obj0;
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_UnaryPredicate1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ChainPredicateIterator" "', argument " "2"" of type '" "UnaryPredicate1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ChainPredicateIterator" "', argument " "2"" of type '" "UnaryPredicate1D &""'"); 
+  }
+  arg2 = reinterpret_cast< UnaryPredicate1D * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_BinaryPredicate1D,  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_ChainPredicateIterator" "', argument " "3"" of type '" "BinaryPredicate1D &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ChainPredicateIterator" "', argument " "3"" of type '" "BinaryPredicate1D &""'"); 
+  }
+  arg3 = reinterpret_cast< BinaryPredicate1D * >(argp3);
+  ecode4 = SWIG_AsVal_bool(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_ChainPredicateIterator" "', argument " "4"" of type '" "bool""'");
+  } 
+  arg4 = static_cast< bool >(val4);
+  ecode5 = SWIG_AsVal_bool(obj4, &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_ChainPredicateIterator" "', argument " "5"" of type '" "bool""'");
+  } 
+  arg5 = static_cast< bool >(val5);
+  res6 = SWIG_ConvertPtr(obj5, &argp6,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "new_ChainPredicateIterator" "', argument " "6"" of type '" "ViewEdge *""'"); 
+  }
+  arg6 = reinterpret_cast< ViewEdge * >(argp6);
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (ChainPredicateIterator *)new SwigDirector_ChainPredicateIterator(arg1,*arg2,*arg3,arg4,arg5,arg6); 
+      } else {
+        result = (ChainPredicateIterator *)new ChainPredicateIterator(*arg2,*arg3,arg4,arg5,arg6); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ChainPredicateIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ChainPredicateIterator__SWIG_7(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  UnaryPredicate1D *arg2 = 0 ;
+  BinaryPredicate1D *arg3 = 0 ;
+  bool arg4 ;
+  bool arg5 ;
+  ChainPredicateIterator *result = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  bool val4 ;
+  int ecode4 = 0 ;
+  bool val5 ;
+  int ecode5 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOOO:new_ChainPredicateIterator",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  arg1 = obj0;
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_UnaryPredicate1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ChainPredicateIterator" "', argument " "2"" of type '" "UnaryPredicate1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ChainPredicateIterator" "', argument " "2"" of type '" "UnaryPredicate1D &""'"); 
+  }
+  arg2 = reinterpret_cast< UnaryPredicate1D * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_BinaryPredicate1D,  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_ChainPredicateIterator" "', argument " "3"" of type '" "BinaryPredicate1D &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ChainPredicateIterator" "', argument " "3"" of type '" "BinaryPredicate1D &""'"); 
+  }
+  arg3 = reinterpret_cast< BinaryPredicate1D * >(argp3);
+  ecode4 = SWIG_AsVal_bool(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_ChainPredicateIterator" "', argument " "4"" of type '" "bool""'");
+  } 
+  arg4 = static_cast< bool >(val4);
+  ecode5 = SWIG_AsVal_bool(obj4, &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_ChainPredicateIterator" "', argument " "5"" of type '" "bool""'");
+  } 
+  arg5 = static_cast< bool >(val5);
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (ChainPredicateIterator *)new SwigDirector_ChainPredicateIterator(arg1,*arg2,*arg3,arg4,arg5); 
+      } else {
+        result = (ChainPredicateIterator *)new ChainPredicateIterator(*arg2,*arg3,arg4,arg5); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ChainPredicateIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ChainPredicateIterator__SWIG_8(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  UnaryPredicate1D *arg2 = 0 ;
+  BinaryPredicate1D *arg3 = 0 ;
+  bool arg4 ;
+  ChainPredicateIterator *result = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  bool val4 ;
+  int ecode4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOO:new_ChainPredicateIterator",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  arg1 = obj0;
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_UnaryPredicate1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ChainPredicateIterator" "', argument " "2"" of type '" "UnaryPredicate1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ChainPredicateIterator" "', argument " "2"" of type '" "UnaryPredicate1D &""'"); 
+  }
+  arg2 = reinterpret_cast< UnaryPredicate1D * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_BinaryPredicate1D,  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_ChainPredicateIterator" "', argument " "3"" of type '" "BinaryPredicate1D &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ChainPredicateIterator" "', argument " "3"" of type '" "BinaryPredicate1D &""'"); 
+  }
+  arg3 = reinterpret_cast< BinaryPredicate1D * >(argp3);
+  ecode4 = SWIG_AsVal_bool(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_ChainPredicateIterator" "', argument " "4"" of type '" "bool""'");
+  } 
+  arg4 = static_cast< bool >(val4);
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (ChainPredicateIterator *)new SwigDirector_ChainPredicateIterator(arg1,*arg2,*arg3,arg4); 
+      } else {
+        result = (ChainPredicateIterator *)new ChainPredicateIterator(*arg2,*arg3,arg4); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ChainPredicateIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ChainPredicateIterator__SWIG_9(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  UnaryPredicate1D *arg2 = 0 ;
+  BinaryPredicate1D *arg3 = 0 ;
+  ChainPredicateIterator *result = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:new_ChainPredicateIterator",&obj0,&obj1,&obj2)) SWIG_fail;
+  arg1 = obj0;
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_UnaryPredicate1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ChainPredicateIterator" "', argument " "2"" of type '" "UnaryPredicate1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ChainPredicateIterator" "', argument " "2"" of type '" "UnaryPredicate1D &""'"); 
+  }
+  arg2 = reinterpret_cast< UnaryPredicate1D * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_BinaryPredicate1D,  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_ChainPredicateIterator" "', argument " "3"" of type '" "BinaryPredicate1D &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ChainPredicateIterator" "', argument " "3"" of type '" "BinaryPredicate1D &""'"); 
+  }
+  arg3 = reinterpret_cast< BinaryPredicate1D * >(argp3);
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (ChainPredicateIterator *)new SwigDirector_ChainPredicateIterator(arg1,*arg2,*arg3); 
+      } else {
+        result = (ChainPredicateIterator *)new ChainPredicateIterator(*arg2,*arg3); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ChainPredicateIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ChainPredicateIterator__SWIG_10(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  ChainPredicateIterator *arg2 = 0 ;
+  ChainPredicateIterator *result = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_ChainPredicateIterator",&obj0,&obj1)) SWIG_fail;
+  arg1 = obj0;
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_ChainPredicateIterator,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ChainPredicateIterator" "', argument " "2"" of type '" "ChainPredicateIterator const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ChainPredicateIterator" "', argument " "2"" of type '" "ChainPredicateIterator const &""'"); 
+  }
+  arg2 = reinterpret_cast< ChainPredicateIterator * >(argp2);
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (ChainPredicateIterator *)new SwigDirector_ChainPredicateIterator(arg1,(ChainPredicateIterator const &)*arg2); 
+      } else {
+        result = (ChainPredicateIterator *)new ChainPredicateIterator((ChainPredicateIterator const &)*arg2); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ChainPredicateIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ChainPredicateIterator(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[8];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 7); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    _v = (argv[0] != 0);
+    if (_v) {
+      return _wrap_new_ChainPredicateIterator__SWIG_4(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    _v = (argv[0] != 0);
+    if (_v) {
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_ChainPredicateIterator, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_new_ChainPredicateIterator__SWIG_10(self, args);
+      }
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    _v = (argv[0] != 0);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_bool(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_new_ChainPredicateIterator__SWIG_3(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    _v = (argv[0] != 0);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_UnaryPredicate1D, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_BinaryPredicate1D, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          return _wrap_new_ChainPredicateIterator__SWIG_9(self, args);
+        }
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    _v = (argv[0] != 0);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_bool(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        {
+          int res = SWIG_AsVal_bool(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          return _wrap_new_ChainPredicateIterator__SWIG_2(self, args);
+        }
+      }
+    }
+  }
+  if (argc == 4) {
+    int _v;
+    _v = (argv[0] != 0);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_UnaryPredicate1D, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_BinaryPredicate1D, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          {
+            int res = SWIG_AsVal_bool(argv[3], NULL);
+            _v = SWIG_CheckState(res);
+          }
+          if (_v) {
+            return _wrap_new_ChainPredicateIterator__SWIG_8(self, args);
+          }
+        }
+      }
+    }
+  }
+  if (argc == 4) {
+    int _v;
+    _v = (argv[0] != 0);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_bool(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        {
+          int res = SWIG_AsVal_bool(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_ViewEdge, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            return _wrap_new_ChainPredicateIterator__SWIG_1(self, args);
+          }
+        }
+      }
+    }
+  }
+  if (argc == 5) {
+    int _v;
+    _v = (argv[0] != 0);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_UnaryPredicate1D, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_BinaryPredicate1D, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          {
+            int res = SWIG_AsVal_bool(argv[3], NULL);
+            _v = SWIG_CheckState(res);
+          }
+          if (_v) {
+            {
+              int res = SWIG_AsVal_bool(argv[4], NULL);
+              _v = SWIG_CheckState(res);
+            }
+            if (_v) {
+              return _wrap_new_ChainPredicateIterator__SWIG_7(self, args);
+            }
+          }
+        }
+      }
+    }
+  }
+  if (argc == 5) {
+    int _v;
+    _v = (argv[0] != 0);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_bool(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        {
+          int res = SWIG_AsVal_bool(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_ViewEdge, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            {
+              int res = SWIG_AsVal_bool(argv[4], NULL);
+              _v = SWIG_CheckState(res);
+            }
+            if (_v) {
+              return _wrap_new_ChainPredicateIterator__SWIG_0(self, args);
+            }
+          }
+        }
+      }
+    }
+  }
+  if (argc == 6) {
+    int _v;
+    _v = (argv[0] != 0);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_UnaryPredicate1D, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_BinaryPredicate1D, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          {
+            int res = SWIG_AsVal_bool(argv[3], NULL);
+            _v = SWIG_CheckState(res);
+          }
+          if (_v) {
+            {
+              int res = SWIG_AsVal_bool(argv[4], NULL);
+              _v = SWIG_CheckState(res);
+            }
+            if (_v) {
+              void *vptr = 0;
+              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_ViewEdge, 0);
+              _v = SWIG_CheckState(res);
+              if (_v) {
+                return _wrap_new_ChainPredicateIterator__SWIG_6(self, args);
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  if (argc == 7) {
+    int _v;
+    _v = (argv[0] != 0);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_UnaryPredicate1D, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_BinaryPredicate1D, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          {
+            int res = SWIG_AsVal_bool(argv[3], NULL);
+            _v = SWIG_CheckState(res);
+          }
+          if (_v) {
+            {
+              int res = SWIG_AsVal_bool(argv[4], NULL);
+              _v = SWIG_CheckState(res);
+            }
+            if (_v) {
+              void *vptr = 0;
+              int res = SWIG_ConvertPtr(argv[5], &vptr, SWIGTYPE_p_ViewEdge, 0);
+              _v = SWIG_CheckState(res);
+              if (_v) {
+                {
+                  int res = SWIG_AsVal_bool(argv[6], NULL);
+                  _v = SWIG_CheckState(res);
+                }
+                if (_v) {
+                  return _wrap_new_ChainPredicateIterator__SWIG_5(self, args);
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ChainPredicateIterator'.\n  Possible C/C++ prototypes are:\n    ChainPredicateIterator(PyObject *,bool,bool,ViewEdge *,bool)\n    ChainPredicateIterator(PyObject *,bool,bool,ViewEdge *)\n    ChainPredicateIterator(PyObject *,bool,bool)\n    ChainPredicateIterator(PyObject *,bool)\n    ChainPredicateIterator(PyObject *)\n    ChainPredicateIterator(PyObject *,UnaryPredicate1D &,BinaryPredicate1D &,bool,bool,ViewEdge *,bool)\n    ChainPredicateIterator(PyObject *,UnaryPredicate1D &,BinaryPredicate1D &,bool,bool,ViewEdge *)\n    ChainPredicateIterator(PyObject *,UnaryPredicate1D &,BinaryPredicate1D &,bool,bool)\n    ChainPredicateIterator(PyObject *,UnaryPredicate1D &,BinaryPredicate1D &,bool)\n    ChainPredicateIterator(PyObject *,UnaryPredicate1D &,BinaryPredicate1D &)\n    ChainPredicateIterator(PyObject *,ChainPredicateIterator const &)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ChainPredicateIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ChainPredicateIterator *arg1 = (ChainPredicateIterator *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_ChainPredicateIterator",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ChainPredicateIterator, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ChainPredicateIterator" "', argument " "1"" of type '" "ChainPredicateIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ChainPredicateIterator * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ChainPredicateIterator_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ChainPredicateIterator *arg1 = (ChainPredicateIterator *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ChainPredicateIterator_getExactTypeName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ChainPredicateIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ChainPredicateIterator_getExactTypeName" "', argument " "1"" of type '" "ChainPredicateIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< ChainPredicateIterator * >(argp1);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          result = ((ChainPredicateIterator const *)arg1)->ChainPredicateIterator::getExactTypeName();
+        } else {
+          result = ((ChainPredicateIterator const *)arg1)->getExactTypeName();
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ChainPredicateIterator_traverse(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ChainPredicateIterator *arg1 = (ChainPredicateIterator *) 0 ;
+  AdjacencyIterator *arg2 = 0 ;
+  ViewEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ChainPredicateIterator_traverse",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ChainPredicateIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ChainPredicateIterator_traverse" "', argument " "1"" of type '" "ChainPredicateIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ChainPredicateIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_AdjacencyIterator,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ChainPredicateIterator_traverse" "', argument " "2"" of type '" "AdjacencyIterator const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ChainPredicateIterator_traverse" "', argument " "2"" of type '" "AdjacencyIterator const &""'"); 
+  }
+  arg2 = reinterpret_cast< AdjacencyIterator * >(argp2);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          result = (ViewEdge *)(arg1)->ChainPredicateIterator::traverse((AdjacencyIterator const &)*arg2);
+        } else {
+          result = (ViewEdge *)(arg1)->traverse((AdjacencyIterator const &)*arg2);
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (director) {
+    SWIG_AcquirePtr(resultobj, director->swig_release_ownership(SWIG_as_voidptr(result)));
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_disown_ChainPredicateIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ChainPredicateIterator *arg1 = (ChainPredicateIterator *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:disown_ChainPredicateIterator",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ChainPredicateIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_ChainPredicateIterator" "', argument " "1"" of type '" "ChainPredicateIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ChainPredicateIterator * >(argp1);
+  {
+    Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
+    if (director) director->swig_disown();
+  }
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *ChainPredicateIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_ChainPredicateIterator, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_UnaryPredicate0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  UnaryPredicate0D *result = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryPredicate0D",&obj0)) SWIG_fail;
+  arg1 = obj0;
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (UnaryPredicate0D *)new SwigDirector_UnaryPredicate0D(arg1); 
+      } else {
+        result = (UnaryPredicate0D *)new UnaryPredicate0D(); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryPredicate0D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_UnaryPredicate0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryPredicate0D *arg1 = (UnaryPredicate0D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryPredicate0D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryPredicate0D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryPredicate0D" "', argument " "1"" of type '" "UnaryPredicate0D *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryPredicate0D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryPredicate0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryPredicate0D *arg1 = (UnaryPredicate0D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:UnaryPredicate0D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryPredicate0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryPredicate0D_getName" "', argument " "1"" of type '" "UnaryPredicate0D const *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryPredicate0D * >(argp1);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          result = ((UnaryPredicate0D const *)arg1)->UnaryPredicate0D::getName();
+        } else {
+          result = ((UnaryPredicate0D const *)arg1)->getName();
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryPredicate0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryPredicate0D *arg1 = (UnaryPredicate0D *) 0 ;
+  Interface0DIterator *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:UnaryPredicate0D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryPredicate0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryPredicate0D___call__" "', argument " "1"" of type '" "UnaryPredicate0D *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryPredicate0D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryPredicate0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "UnaryPredicate0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0DIterator * >(argp2);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          result = (bool)(arg1)->UnaryPredicate0D::operator ()(*arg2);
+        } else {
+          result = (bool)(arg1)->operator ()(*arg2);
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_disown_UnaryPredicate0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryPredicate0D *arg1 = (UnaryPredicate0D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryPredicate0D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryPredicate0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryPredicate0D" "', argument " "1"" of type '" "UnaryPredicate0D *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryPredicate0D * >(argp1);
+  {
+    Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
+    if (director) director->swig_disown();
+  }
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *UnaryPredicate0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryPredicate0D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_BinaryPredicate0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  BinaryPredicate0D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_BinaryPredicate0D")) SWIG_fail;
+  {
+    try {
+      result = (BinaryPredicate0D *)new BinaryPredicate0D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_BinaryPredicate0D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_BinaryPredicate0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  BinaryPredicate0D *arg1 = (BinaryPredicate0D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_BinaryPredicate0D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BinaryPredicate0D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_BinaryPredicate0D" "', argument " "1"" of type '" "BinaryPredicate0D *""'"); 
+  }
+  arg1 = reinterpret_cast< BinaryPredicate0D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_BinaryPredicate0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  BinaryPredicate0D *arg1 = (BinaryPredicate0D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:BinaryPredicate0D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BinaryPredicate0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BinaryPredicate0D_getName" "', argument " "1"" of type '" "BinaryPredicate0D const *""'"); 
+  }
+  arg1 = reinterpret_cast< BinaryPredicate0D * >(argp1);
+  {
+    try {
+      result = ((BinaryPredicate0D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_BinaryPredicate0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  BinaryPredicate0D *arg1 = (BinaryPredicate0D *) 0 ;
+  Interface0D *arg2 = 0 ;
+  Interface0D *arg3 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:BinaryPredicate0D___call__",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BinaryPredicate0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BinaryPredicate0D___call__" "', argument " "1"" of type '" "BinaryPredicate0D *""'"); 
+  }
+  arg1 = reinterpret_cast< BinaryPredicate0D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "BinaryPredicate0D___call__" "', argument " "2"" of type '" "Interface0D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "BinaryPredicate0D___call__" "', argument " "2"" of type '" "Interface0D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0D * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_Interface0D,  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "BinaryPredicate0D___call__" "', argument " "3"" of type '" "Interface0D &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "BinaryPredicate0D___call__" "', argument " "3"" of type '" "Interface0D &""'"); 
+  }
+  arg3 = reinterpret_cast< Interface0D * >(argp3);
+  {
+    try {
+      result = (bool)(arg1)->operator ()(*arg2,*arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *BinaryPredicate0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_BinaryPredicate0D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_TrueUP0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates0D::TrueUP0D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_TrueUP0D")) SWIG_fail;
+  {
+    try {
+      result = (Predicates0D::TrueUP0D *)new Predicates0D::TrueUP0D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Predicates0D__TrueUP0D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TrueUP0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates0D::TrueUP0D *arg1 = (Predicates0D::TrueUP0D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:TrueUP0D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates0D__TrueUP0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TrueUP0D_getName" "', argument " "1"" of type '" "Predicates0D::TrueUP0D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates0D::TrueUP0D * >(argp1);
+  {
+    try {
+      result = ((Predicates0D::TrueUP0D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TrueUP0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates0D::TrueUP0D *arg1 = (Predicates0D::TrueUP0D *) 0 ;
+  Interface0DIterator *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:TrueUP0D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates0D__TrueUP0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TrueUP0D___call__" "', argument " "1"" of type '" "Predicates0D::TrueUP0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates0D::TrueUP0D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TrueUP0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TrueUP0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0DIterator * >(argp2);
+  {
+    try {
+      result = (bool)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_TrueUP0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates0D::TrueUP0D *arg1 = (Predicates0D::TrueUP0D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_TrueUP0D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates0D__TrueUP0D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_TrueUP0D" "', argument " "1"" of type '" "Predicates0D::TrueUP0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates0D::TrueUP0D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *TrueUP0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Predicates0D__TrueUP0D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_FalseUP0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates0D::FalseUP0D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_FalseUP0D")) SWIG_fail;
+  {
+    try {
+      result = (Predicates0D::FalseUP0D *)new Predicates0D::FalseUP0D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Predicates0D__FalseUP0D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FalseUP0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates0D::FalseUP0D *arg1 = (Predicates0D::FalseUP0D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FalseUP0D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates0D__FalseUP0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FalseUP0D_getName" "', argument " "1"" of type '" "Predicates0D::FalseUP0D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates0D::FalseUP0D * >(argp1);
+  {
+    try {
+      result = ((Predicates0D::FalseUP0D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FalseUP0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates0D::FalseUP0D *arg1 = (Predicates0D::FalseUP0D *) 0 ;
+  Interface0DIterator *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FalseUP0D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates0D__FalseUP0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FalseUP0D___call__" "', argument " "1"" of type '" "Predicates0D::FalseUP0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates0D::FalseUP0D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FalseUP0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FalseUP0D___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0DIterator * >(argp2);
+  {
+    try {
+      result = (bool)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_FalseUP0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates0D::FalseUP0D *arg1 = (Predicates0D::FalseUP0D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_FalseUP0D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates0D__FalseUP0D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FalseUP0D" "', argument " "1"" of type '" "Predicates0D::FalseUP0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates0D::FalseUP0D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *FalseUP0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Predicates0D__FalseUP0D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_UnaryPredicate1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  UnaryPredicate1D *result = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryPredicate1D",&obj0)) SWIG_fail;
+  arg1 = obj0;
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (UnaryPredicate1D *)new SwigDirector_UnaryPredicate1D(arg1); 
+      } else {
+        result = (UnaryPredicate1D *)new UnaryPredicate1D(); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryPredicate1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_UnaryPredicate1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryPredicate1D *arg1 = (UnaryPredicate1D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryPredicate1D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryPredicate1D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryPredicate1D" "', argument " "1"" of type '" "UnaryPredicate1D *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryPredicate1D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryPredicate1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryPredicate1D *arg1 = (UnaryPredicate1D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:UnaryPredicate1D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryPredicate1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryPredicate1D_getName" "', argument " "1"" of type '" "UnaryPredicate1D const *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryPredicate1D * >(argp1);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          result = ((UnaryPredicate1D const *)arg1)->UnaryPredicate1D::getName();
+        } else {
+          result = ((UnaryPredicate1D const *)arg1)->getName();
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryPredicate1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryPredicate1D *arg1 = (UnaryPredicate1D *) 0 ;
+  Interface1D *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:UnaryPredicate1D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryPredicate1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryPredicate1D___call__" "', argument " "1"" of type '" "UnaryPredicate1D *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryPredicate1D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryPredicate1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "UnaryPredicate1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          result = (bool)(arg1)->UnaryPredicate1D::operator ()(*arg2);
+        } else {
+          result = (bool)(arg1)->operator ()(*arg2);
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_disown_UnaryPredicate1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryPredicate1D *arg1 = (UnaryPredicate1D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryPredicate1D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryPredicate1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryPredicate1D" "', argument " "1"" of type '" "UnaryPredicate1D *""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryPredicate1D * >(argp1);
+  {
+    Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
+    if (director) director->swig_disown();
+  }
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *UnaryPredicate1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryPredicate1D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_BinaryPredicate1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  BinaryPredicate1D *result = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_BinaryPredicate1D",&obj0)) SWIG_fail;
+  arg1 = obj0;
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (BinaryPredicate1D *)new SwigDirector_BinaryPredicate1D(arg1); 
+      } else {
+        result = (BinaryPredicate1D *)new BinaryPredicate1D(); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_BinaryPredicate1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_BinaryPredicate1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  BinaryPredicate1D *arg1 = (BinaryPredicate1D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_BinaryPredicate1D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BinaryPredicate1D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_BinaryPredicate1D" "', argument " "1"" of type '" "BinaryPredicate1D *""'"); 
+  }
+  arg1 = reinterpret_cast< BinaryPredicate1D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_BinaryPredicate1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  BinaryPredicate1D *arg1 = (BinaryPredicate1D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:BinaryPredicate1D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BinaryPredicate1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BinaryPredicate1D_getName" "', argument " "1"" of type '" "BinaryPredicate1D const *""'"); 
+  }
+  arg1 = reinterpret_cast< BinaryPredicate1D * >(argp1);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          result = ((BinaryPredicate1D const *)arg1)->BinaryPredicate1D::getName();
+        } else {
+          result = ((BinaryPredicate1D const *)arg1)->getName();
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_BinaryPredicate1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  BinaryPredicate1D *arg1 = (BinaryPredicate1D *) 0 ;
+  Interface1D *arg2 = 0 ;
+  Interface1D *arg3 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:BinaryPredicate1D___call__",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BinaryPredicate1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BinaryPredicate1D___call__" "', argument " "1"" of type '" "BinaryPredicate1D *""'"); 
+  }
+  arg1 = reinterpret_cast< BinaryPredicate1D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "BinaryPredicate1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "BinaryPredicate1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "BinaryPredicate1D___call__" "', argument " "3"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "BinaryPredicate1D___call__" "', argument " "3"" of type '" "Interface1D &""'"); 
+  }
+  arg3 = reinterpret_cast< Interface1D * >(argp3);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          result = (bool)(arg1)->BinaryPredicate1D::operator ()(*arg2,*arg3);
+        } else {
+          result = (bool)(arg1)->operator ()(*arg2,*arg3);
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_disown_BinaryPredicate1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  BinaryPredicate1D *arg1 = (BinaryPredicate1D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:disown_BinaryPredicate1D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_BinaryPredicate1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_BinaryPredicate1D" "', argument " "1"" of type '" "BinaryPredicate1D *""'"); 
+  }
+  arg1 = reinterpret_cast< BinaryPredicate1D * >(argp1);
+  {
+    Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
+    if (director) director->swig_disown();
+  }
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *BinaryPredicate1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_BinaryPredicate1D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_TrueUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::TrueUP1D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_TrueUP1D")) SWIG_fail;
+  {
+    try {
+      result = (Predicates1D::TrueUP1D *)new Predicates1D::TrueUP1D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Predicates1D__TrueUP1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TrueUP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::TrueUP1D *arg1 = (Predicates1D::TrueUP1D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:TrueUP1D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates1D__TrueUP1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TrueUP1D_getName" "', argument " "1"" of type '" "Predicates1D::TrueUP1D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates1D::TrueUP1D * >(argp1);
+  {
+    try {
+      result = ((Predicates1D::TrueUP1D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TrueUP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::TrueUP1D *arg1 = (Predicates1D::TrueUP1D *) 0 ;
+  Interface1D *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:TrueUP1D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates1D__TrueUP1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TrueUP1D___call__" "', argument " "1"" of type '" "Predicates1D::TrueUP1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates1D::TrueUP1D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TrueUP1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TrueUP1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  {
+    try {
+      result = (bool)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_TrueUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::TrueUP1D *arg1 = (Predicates1D::TrueUP1D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_TrueUP1D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates1D__TrueUP1D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_TrueUP1D" "', argument " "1"" of type '" "Predicates1D::TrueUP1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates1D::TrueUP1D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *TrueUP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__TrueUP1D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_FalseUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::FalseUP1D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_FalseUP1D")) SWIG_fail;
+  {
+    try {
+      result = (Predicates1D::FalseUP1D *)new Predicates1D::FalseUP1D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Predicates1D__FalseUP1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FalseUP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::FalseUP1D *arg1 = (Predicates1D::FalseUP1D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FalseUP1D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates1D__FalseUP1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FalseUP1D_getName" "', argument " "1"" of type '" "Predicates1D::FalseUP1D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates1D::FalseUP1D * >(argp1);
+  {
+    try {
+      result = ((Predicates1D::FalseUP1D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FalseUP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::FalseUP1D *arg1 = (Predicates1D::FalseUP1D *) 0 ;
+  Interface1D *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:FalseUP1D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates1D__FalseUP1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FalseUP1D___call__" "', argument " "1"" of type '" "Predicates1D::FalseUP1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates1D::FalseUP1D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FalseUP1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FalseUP1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  {
+    try {
+      result = (bool)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_FalseUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::FalseUP1D *arg1 = (Predicates1D::FalseUP1D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_FalseUP1D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates1D__FalseUP1D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FalseUP1D" "', argument " "1"" of type '" "Predicates1D::FalseUP1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates1D::FalseUP1D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *FalseUP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__FalseUP1D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_QuantitativeInvisibilityUP1D__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  unsigned int arg1 ;
+  Predicates1D::QuantitativeInvisibilityUP1D *result = 0 ;
+  unsigned int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_QuantitativeInvisibilityUP1D",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_unsigned_SS_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_QuantitativeInvisibilityUP1D" "', argument " "1"" of type '" "unsigned int""'");
+  } 
+  arg1 = static_cast< unsigned int >(val1);
+  {
+    try {
+      result = (Predicates1D::QuantitativeInvisibilityUP1D *)new Predicates1D::QuantitativeInvisibilityUP1D(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Predicates1D__QuantitativeInvisibilityUP1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_QuantitativeInvisibilityUP1D__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::QuantitativeInvisibilityUP1D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_QuantitativeInvisibilityUP1D")) SWIG_fail;
+  {
+    try {
+      result = (Predicates1D::QuantitativeInvisibilityUP1D *)new Predicates1D::QuantitativeInvisibilityUP1D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Predicates1D__QuantitativeInvisibilityUP1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_QuantitativeInvisibilityUP1D(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_QuantitativeInvisibilityUP1D__SWIG_1(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_unsigned_SS_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_QuantitativeInvisibilityUP1D__SWIG_0(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_QuantitativeInvisibilityUP1D'.\n  Possible C/C++ prototypes are:\n    Predicates1D::QuantitativeInvisibilityUP1D(unsigned int)\n    Predicates1D::QuantitativeInvisibilityUP1D()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_QuantitativeInvisibilityUP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::QuantitativeInvisibilityUP1D *arg1 = (Predicates1D::QuantitativeInvisibilityUP1D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:QuantitativeInvisibilityUP1D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates1D__QuantitativeInvisibilityUP1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "QuantitativeInvisibilityUP1D_getName" "', argument " "1"" of type '" "Predicates1D::QuantitativeInvisibilityUP1D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates1D::QuantitativeInvisibilityUP1D * >(argp1);
+  {
+    try {
+      result = ((Predicates1D::QuantitativeInvisibilityUP1D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_QuantitativeInvisibilityUP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::QuantitativeInvisibilityUP1D *arg1 = (Predicates1D::QuantitativeInvisibilityUP1D *) 0 ;
+  Interface1D *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:QuantitativeInvisibilityUP1D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates1D__QuantitativeInvisibilityUP1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "QuantitativeInvisibilityUP1D___call__" "', argument " "1"" of type '" "Predicates1D::QuantitativeInvisibilityUP1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates1D::QuantitativeInvisibilityUP1D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "QuantitativeInvisibilityUP1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "QuantitativeInvisibilityUP1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  {
+    try {
+      result = (bool)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_QuantitativeInvisibilityUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::QuantitativeInvisibilityUP1D *arg1 = (Predicates1D::QuantitativeInvisibilityUP1D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_QuantitativeInvisibilityUP1D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates1D__QuantitativeInvisibilityUP1D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_QuantitativeInvisibilityUP1D" "', argument " "1"" of type '" "Predicates1D::QuantitativeInvisibilityUP1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates1D::QuantitativeInvisibilityUP1D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *QuantitativeInvisibilityUP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__QuantitativeInvisibilityUP1D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_ContourUP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::ContourUP1D *arg1 = (Predicates1D::ContourUP1D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ContourUP1D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates1D__ContourUP1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ContourUP1D_getName" "', argument " "1"" of type '" "Predicates1D::ContourUP1D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates1D::ContourUP1D * >(argp1);
+  {
+    try {
+      result = ((Predicates1D::ContourUP1D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ContourUP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::ContourUP1D *arg1 = (Predicates1D::ContourUP1D *) 0 ;
+  Interface1D *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ContourUP1D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates1D__ContourUP1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ContourUP1D___call__" "', argument " "1"" of type '" "Predicates1D::ContourUP1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates1D::ContourUP1D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ContourUP1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ContourUP1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  {
+    try {
+      result = (bool)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ContourUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::ContourUP1D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_ContourUP1D")) SWIG_fail;
+  {
+    try {
+      result = (Predicates1D::ContourUP1D *)new Predicates1D::ContourUP1D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Predicates1D__ContourUP1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ContourUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::ContourUP1D *arg1 = (Predicates1D::ContourUP1D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_ContourUP1D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates1D__ContourUP1D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ContourUP1D" "', argument " "1"" of type '" "Predicates1D::ContourUP1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates1D::ContourUP1D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *ContourUP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__ContourUP1D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_ExternalContourUP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::ExternalContourUP1D *arg1 = (Predicates1D::ExternalContourUP1D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ExternalContourUP1D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates1D__ExternalContourUP1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ExternalContourUP1D_getName" "', argument " "1"" of type '" "Predicates1D::ExternalContourUP1D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates1D::ExternalContourUP1D * >(argp1);
+  {
+    try {
+      result = ((Predicates1D::ExternalContourUP1D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ExternalContourUP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::ExternalContourUP1D *arg1 = (Predicates1D::ExternalContourUP1D *) 0 ;
+  Interface1D *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ExternalContourUP1D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates1D__ExternalContourUP1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ExternalContourUP1D___call__" "', argument " "1"" of type '" "Predicates1D::ExternalContourUP1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates1D::ExternalContourUP1D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ExternalContourUP1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ExternalContourUP1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  {
+    try {
+      result = (bool)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ExternalContourUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::ExternalContourUP1D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_ExternalContourUP1D")) SWIG_fail;
+  {
+    try {
+      result = (Predicates1D::ExternalContourUP1D *)new Predicates1D::ExternalContourUP1D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Predicates1D__ExternalContourUP1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ExternalContourUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::ExternalContourUP1D *arg1 = (Predicates1D::ExternalContourUP1D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_ExternalContourUP1D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates1D__ExternalContourUP1D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ExternalContourUP1D" "', argument " "1"" of type '" "Predicates1D::ExternalContourUP1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates1D::ExternalContourUP1D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *ExternalContourUP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__ExternalContourUP1D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_EqualToTimeStampUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  unsigned int arg1 ;
+  Predicates1D::EqualToTimeStampUP1D *result = 0 ;
+  unsigned int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_EqualToTimeStampUP1D",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_unsigned_SS_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_EqualToTimeStampUP1D" "', argument " "1"" of type '" "unsigned int""'");
+  } 
+  arg1 = static_cast< unsigned int >(val1);
+  {
+    try {
+      result = (Predicates1D::EqualToTimeStampUP1D *)new Predicates1D::EqualToTimeStampUP1D(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Predicates1D__EqualToTimeStampUP1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_EqualToTimeStampUP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::EqualToTimeStampUP1D *arg1 = (Predicates1D::EqualToTimeStampUP1D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:EqualToTimeStampUP1D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates1D__EqualToTimeStampUP1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "EqualToTimeStampUP1D_getName" "', argument " "1"" of type '" "Predicates1D::EqualToTimeStampUP1D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates1D::EqualToTimeStampUP1D * >(argp1);
+  {
+    try {
+      result = ((Predicates1D::EqualToTimeStampUP1D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_EqualToTimeStampUP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::EqualToTimeStampUP1D *arg1 = (Predicates1D::EqualToTimeStampUP1D *) 0 ;
+  Interface1D *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:EqualToTimeStampUP1D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates1D__EqualToTimeStampUP1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "EqualToTimeStampUP1D___call__" "', argument " "1"" of type '" "Predicates1D::EqualToTimeStampUP1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates1D::EqualToTimeStampUP1D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "EqualToTimeStampUP1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "EqualToTimeStampUP1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  {
+    try {
+      result = (bool)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_EqualToTimeStampUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::EqualToTimeStampUP1D *arg1 = (Predicates1D::EqualToTimeStampUP1D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_EqualToTimeStampUP1D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates1D__EqualToTimeStampUP1D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_EqualToTimeStampUP1D" "', argument " "1"" of type '" "Predicates1D::EqualToTimeStampUP1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates1D::EqualToTimeStampUP1D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *EqualToTimeStampUP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__EqualToTimeStampUP1D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_EqualToChainingTimeStampUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  unsigned int arg1 ;
+  Predicates1D::EqualToChainingTimeStampUP1D *result = 0 ;
+  unsigned int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_EqualToChainingTimeStampUP1D",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_unsigned_SS_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_EqualToChainingTimeStampUP1D" "', argument " "1"" of type '" "unsigned int""'");
+  } 
+  arg1 = static_cast< unsigned int >(val1);
+  {
+    try {
+      result = (Predicates1D::EqualToChainingTimeStampUP1D *)new Predicates1D::EqualToChainingTimeStampUP1D(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Predicates1D__EqualToChainingTimeStampUP1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_EqualToChainingTimeStampUP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::EqualToChainingTimeStampUP1D *arg1 = (Predicates1D::EqualToChainingTimeStampUP1D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:EqualToChainingTimeStampUP1D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates1D__EqualToChainingTimeStampUP1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "EqualToChainingTimeStampUP1D_getName" "', argument " "1"" of type '" "Predicates1D::EqualToChainingTimeStampUP1D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates1D::EqualToChainingTimeStampUP1D * >(argp1);
+  {
+    try {
+      result = ((Predicates1D::EqualToChainingTimeStampUP1D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_EqualToChainingTimeStampUP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::EqualToChainingTimeStampUP1D *arg1 = (Predicates1D::EqualToChainingTimeStampUP1D *) 0 ;
+  Interface1D *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:EqualToChainingTimeStampUP1D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates1D__EqualToChainingTimeStampUP1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "EqualToChainingTimeStampUP1D___call__" "', argument " "1"" of type '" "Predicates1D::EqualToChainingTimeStampUP1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates1D::EqualToChainingTimeStampUP1D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "EqualToChainingTimeStampUP1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "EqualToChainingTimeStampUP1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  {
+    try {
+      result = (bool)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_EqualToChainingTimeStampUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::EqualToChainingTimeStampUP1D *arg1 = (Predicates1D::EqualToChainingTimeStampUP1D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_EqualToChainingTimeStampUP1D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates1D__EqualToChainingTimeStampUP1D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_EqualToChainingTimeStampUP1D" "', argument " "1"" of type '" "Predicates1D::EqualToChainingTimeStampUP1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates1D::EqualToChainingTimeStampUP1D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *EqualToChainingTimeStampUP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__EqualToChainingTimeStampUP1D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_ShapeUP1D__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  unsigned int arg1 ;
+  unsigned int arg2 ;
+  Predicates1D::ShapeUP1D *result = 0 ;
+  unsigned int val1 ;
+  int ecode1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_ShapeUP1D",&obj0,&obj1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_unsigned_SS_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ShapeUP1D" "', argument " "1"" of type '" "unsigned int""'");
+  } 
+  arg1 = static_cast< unsigned int >(val1);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_ShapeUP1D" "', argument " "2"" of type '" "unsigned int""'");
+  } 
+  arg2 = static_cast< unsigned int >(val2);
+  {
+    try {
+      result = (Predicates1D::ShapeUP1D *)new Predicates1D::ShapeUP1D(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Predicates1D__ShapeUP1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ShapeUP1D__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  unsigned int arg1 ;
+  Predicates1D::ShapeUP1D *result = 0 ;
+  unsigned int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_ShapeUP1D",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_unsigned_SS_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ShapeUP1D" "', argument " "1"" of type '" "unsigned int""'");
+  } 
+  arg1 = static_cast< unsigned int >(val1);
+  {
+    try {
+      result = (Predicates1D::ShapeUP1D *)new Predicates1D::ShapeUP1D(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Predicates1D__ShapeUP1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ShapeUP1D(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_unsigned_SS_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_ShapeUP1D__SWIG_1(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    {
+      int res = SWIG_AsVal_unsigned_SS_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      {
+        int res = SWIG_AsVal_unsigned_SS_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_new_ShapeUP1D__SWIG_0(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ShapeUP1D'.\n  Possible C/C++ prototypes are:\n    Predicates1D::ShapeUP1D(unsigned int,unsigned int)\n    Predicates1D::ShapeUP1D(unsigned int)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShapeUP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::ShapeUP1D *arg1 = (Predicates1D::ShapeUP1D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ShapeUP1D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates1D__ShapeUP1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShapeUP1D_getName" "', argument " "1"" of type '" "Predicates1D::ShapeUP1D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates1D::ShapeUP1D * >(argp1);
+  {
+    try {
+      result = ((Predicates1D::ShapeUP1D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShapeUP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::ShapeUP1D *arg1 = (Predicates1D::ShapeUP1D *) 0 ;
+  Interface1D *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ShapeUP1D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates1D__ShapeUP1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShapeUP1D___call__" "', argument " "1"" of type '" "Predicates1D::ShapeUP1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates1D::ShapeUP1D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ShapeUP1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ShapeUP1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  {
+    try {
+      result = (bool)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ShapeUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::ShapeUP1D *arg1 = (Predicates1D::ShapeUP1D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_ShapeUP1D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates1D__ShapeUP1D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ShapeUP1D" "', argument " "1"" of type '" "Predicates1D::ShapeUP1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates1D::ShapeUP1D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *ShapeUP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__ShapeUP1D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_TrueBP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::TrueBP1D *arg1 = (Predicates1D::TrueBP1D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:TrueBP1D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates1D__TrueBP1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TrueBP1D_getName" "', argument " "1"" of type '" "Predicates1D::TrueBP1D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates1D::TrueBP1D * >(argp1);
+  {
+    try {
+      result = ((Predicates1D::TrueBP1D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TrueBP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::TrueBP1D *arg1 = (Predicates1D::TrueBP1D *) 0 ;
+  Interface1D *arg2 = 0 ;
+  Interface1D *arg3 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:TrueBP1D___call__",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates1D__TrueBP1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TrueBP1D___call__" "', argument " "1"" of type '" "Predicates1D::TrueBP1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates1D::TrueBP1D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TrueBP1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TrueBP1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "TrueBP1D___call__" "', argument " "3"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TrueBP1D___call__" "', argument " "3"" of type '" "Interface1D &""'"); 
+  }
+  arg3 = reinterpret_cast< Interface1D * >(argp3);
+  {
+    try {
+      result = (bool)(arg1)->operator ()(*arg2,*arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_TrueBP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::TrueBP1D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_TrueBP1D")) SWIG_fail;
+  {
+    try {
+      result = (Predicates1D::TrueBP1D *)new Predicates1D::TrueBP1D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Predicates1D__TrueBP1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_TrueBP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::TrueBP1D *arg1 = (Predicates1D::TrueBP1D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_TrueBP1D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates1D__TrueBP1D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_TrueBP1D" "', argument " "1"" of type '" "Predicates1D::TrueBP1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates1D::TrueBP1D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *TrueBP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__TrueBP1D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_FalseBP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::FalseBP1D *arg1 = (Predicates1D::FalseBP1D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FalseBP1D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates1D__FalseBP1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FalseBP1D_getName" "', argument " "1"" of type '" "Predicates1D::FalseBP1D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates1D::FalseBP1D * >(argp1);
+  {
+    try {
+      result = ((Predicates1D::FalseBP1D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FalseBP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::FalseBP1D *arg1 = (Predicates1D::FalseBP1D *) 0 ;
+  Interface1D *arg2 = 0 ;
+  Interface1D *arg3 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:FalseBP1D___call__",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates1D__FalseBP1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FalseBP1D___call__" "', argument " "1"" of type '" "Predicates1D::FalseBP1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates1D::FalseBP1D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FalseBP1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FalseBP1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FalseBP1D___call__" "', argument " "3"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FalseBP1D___call__" "', argument " "3"" of type '" "Interface1D &""'"); 
+  }
+  arg3 = reinterpret_cast< Interface1D * >(argp3);
+  {
+    try {
+      result = (bool)(arg1)->operator ()(*arg2,*arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FalseBP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::FalseBP1D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_FalseBP1D")) SWIG_fail;
+  {
+    try {
+      result = (Predicates1D::FalseBP1D *)new Predicates1D::FalseBP1D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Predicates1D__FalseBP1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_FalseBP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::FalseBP1D *arg1 = (Predicates1D::FalseBP1D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_FalseBP1D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates1D__FalseBP1D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FalseBP1D" "', argument " "1"" of type '" "Predicates1D::FalseBP1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates1D::FalseBP1D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *FalseBP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__FalseBP1D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_Length2DBP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::Length2DBP1D *arg1 = (Predicates1D::Length2DBP1D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Length2DBP1D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates1D__Length2DBP1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Length2DBP1D_getName" "', argument " "1"" of type '" "Predicates1D::Length2DBP1D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates1D::Length2DBP1D * >(argp1);
+  {
+    try {
+      result = ((Predicates1D::Length2DBP1D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Length2DBP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::Length2DBP1D *arg1 = (Predicates1D::Length2DBP1D *) 0 ;
+  Interface1D *arg2 = 0 ;
+  Interface1D *arg3 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:Length2DBP1D___call__",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates1D__Length2DBP1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Length2DBP1D___call__" "', argument " "1"" of type '" "Predicates1D::Length2DBP1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates1D::Length2DBP1D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Length2DBP1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Length2DBP1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Length2DBP1D___call__" "', argument " "3"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Length2DBP1D___call__" "', argument " "3"" of type '" "Interface1D &""'"); 
+  }
+  arg3 = reinterpret_cast< Interface1D * >(argp3);
+  {
+    try {
+      result = (bool)(arg1)->operator ()(*arg2,*arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Length2DBP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::Length2DBP1D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_Length2DBP1D")) SWIG_fail;
+  {
+    try {
+      result = (Predicates1D::Length2DBP1D *)new Predicates1D::Length2DBP1D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Predicates1D__Length2DBP1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_Length2DBP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::Length2DBP1D *arg1 = (Predicates1D::Length2DBP1D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_Length2DBP1D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates1D__Length2DBP1D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Length2DBP1D" "', argument " "1"" of type '" "Predicates1D::Length2DBP1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates1D::Length2DBP1D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *Length2DBP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__Length2DBP1D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_SameShapeIdBP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::SameShapeIdBP1D *arg1 = (Predicates1D::SameShapeIdBP1D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SameShapeIdBP1D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates1D__SameShapeIdBP1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SameShapeIdBP1D_getName" "', argument " "1"" of type '" "Predicates1D::SameShapeIdBP1D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates1D::SameShapeIdBP1D * >(argp1);
+  {
+    try {
+      result = ((Predicates1D::SameShapeIdBP1D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SameShapeIdBP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::SameShapeIdBP1D *arg1 = (Predicates1D::SameShapeIdBP1D *) 0 ;
+  Interface1D *arg2 = 0 ;
+  Interface1D *arg3 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:SameShapeIdBP1D___call__",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates1D__SameShapeIdBP1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SameShapeIdBP1D___call__" "', argument " "1"" of type '" "Predicates1D::SameShapeIdBP1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates1D::SameShapeIdBP1D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SameShapeIdBP1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SameShapeIdBP1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SameShapeIdBP1D___call__" "', argument " "3"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SameShapeIdBP1D___call__" "', argument " "3"" of type '" "Interface1D &""'"); 
+  }
+  arg3 = reinterpret_cast< Interface1D * >(argp3);
+  {
+    try {
+      result = (bool)(arg1)->operator ()(*arg2,*arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_SameShapeIdBP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::SameShapeIdBP1D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_SameShapeIdBP1D")) SWIG_fail;
+  {
+    try {
+      result = (Predicates1D::SameShapeIdBP1D *)new Predicates1D::SameShapeIdBP1D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Predicates1D__SameShapeIdBP1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_SameShapeIdBP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::SameShapeIdBP1D *arg1 = (Predicates1D::SameShapeIdBP1D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_SameShapeIdBP1D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates1D__SameShapeIdBP1D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_SameShapeIdBP1D" "', argument " "1"" of type '" "Predicates1D::SameShapeIdBP1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates1D::SameShapeIdBP1D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *SameShapeIdBP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__SameShapeIdBP1D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_ViewMapGradientNormBP1D__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  int arg1 ;
+  IntegrationType arg2 ;
+  float arg3 ;
+  Predicates1D::ViewMapGradientNormBP1D *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  float val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:new_ViewMapGradientNormBP1D",&obj0,&obj1,&obj2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ViewMapGradientNormBP1D" "', argument " "1"" of type '" "int""'");
+  } 
+  arg1 = static_cast< int >(val1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_ViewMapGradientNormBP1D" "', argument " "2"" of type '" "IntegrationType""'");
+  } 
+  arg2 = static_cast< IntegrationType >(val2);
+  ecode3 = SWIG_AsVal_float(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_ViewMapGradientNormBP1D" "', argument " "3"" of type '" "float""'");
+  } 
+  arg3 = static_cast< float >(val3);
+  {
+    try {
+      result = (Predicates1D::ViewMapGradientNormBP1D *)new Predicates1D::ViewMapGradientNormBP1D(arg1,arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Predicates1D__ViewMapGradientNormBP1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewMapGradientNormBP1D__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  int arg1 ;
+  IntegrationType arg2 ;
+  Predicates1D::ViewMapGradientNormBP1D *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_ViewMapGradientNormBP1D",&obj0,&obj1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ViewMapGradientNormBP1D" "', argument " "1"" of type '" "int""'");
+  } 
+  arg1 = static_cast< int >(val1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_ViewMapGradientNormBP1D" "', argument " "2"" of type '" "IntegrationType""'");
+  } 
+  arg2 = static_cast< IntegrationType >(val2);
+  {
+    try {
+      result = (Predicates1D::ViewMapGradientNormBP1D *)new Predicates1D::ViewMapGradientNormBP1D(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Predicates1D__ViewMapGradientNormBP1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewMapGradientNormBP1D__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  int arg1 ;
+  Predicates1D::ViewMapGradientNormBP1D *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_ViewMapGradientNormBP1D",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ViewMapGradientNormBP1D" "', argument " "1"" of type '" "int""'");
+  } 
+  arg1 = static_cast< int >(val1);
+  {
+    try {
+      result = (Predicates1D::ViewMapGradientNormBP1D *)new Predicates1D::ViewMapGradientNormBP1D(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Predicates1D__ViewMapGradientNormBP1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewMapGradientNormBP1D(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_ViewMapGradientNormBP1D__SWIG_2(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    {
+      int res = SWIG_AsVal_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      {
+        int res = SWIG_AsVal_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_new_ViewMapGradientNormBP1D__SWIG_1(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    {
+      int res = SWIG_AsVal_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      {
+        int res = SWIG_AsVal_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        {
+          int res = SWIG_AsVal_float(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          return _wrap_new_ViewMapGradientNormBP1D__SWIG_0(self, args);
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewMapGradientNormBP1D'.\n  Possible C/C++ prototypes are:\n    Predicates1D::ViewMapGradientNormBP1D(int,IntegrationType,float)\n    Predicates1D::ViewMapGradientNormBP1D(int,IntegrationType)\n    Predicates1D::ViewMapGradientNormBP1D(int)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMapGradientNormBP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::ViewMapGradientNormBP1D *arg1 = (Predicates1D::ViewMapGradientNormBP1D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewMapGradientNormBP1D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates1D__ViewMapGradientNormBP1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewMapGradientNormBP1D_getName" "', argument " "1"" of type '" "Predicates1D::ViewMapGradientNormBP1D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates1D::ViewMapGradientNormBP1D * >(argp1);
+  {
+    try {
+      result = ((Predicates1D::ViewMapGradientNormBP1D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMapGradientNormBP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::ViewMapGradientNormBP1D *arg1 = (Predicates1D::ViewMapGradientNormBP1D *) 0 ;
+  Interface1D *arg2 = 0 ;
+  Interface1D *arg3 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:ViewMapGradientNormBP1D___call__",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates1D__ViewMapGradientNormBP1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewMapGradientNormBP1D___call__" "', argument " "1"" of type '" "Predicates1D::ViewMapGradientNormBP1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates1D::ViewMapGradientNormBP1D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewMapGradientNormBP1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewMapGradientNormBP1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewMapGradientNormBP1D___call__" "', argument " "3"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewMapGradientNormBP1D___call__" "', argument " "3"" of type '" "Interface1D &""'"); 
+  }
+  arg3 = reinterpret_cast< Interface1D * >(argp3);
+  {
+    try {
+      result = (bool)(arg1)->operator ()(*arg2,*arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ViewMapGradientNormBP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::ViewMapGradientNormBP1D *arg1 = (Predicates1D::ViewMapGradientNormBP1D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_ViewMapGradientNormBP1D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates1D__ViewMapGradientNormBP1D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ViewMapGradientNormBP1D" "', argument " "1"" of type '" "Predicates1D::ViewMapGradientNormBP1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates1D::ViewMapGradientNormBP1D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *ViewMapGradientNormBP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__ViewMapGradientNormBP1D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_DensityLowerThanUP1D__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  double arg1 ;
+  double arg2 ;
+  Predicates1D::DensityLowerThanUP1D *result = 0 ;
+  double val1 ;
+  int ecode1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_DensityLowerThanUP1D",&obj0,&obj1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_DensityLowerThanUP1D" "', argument " "1"" of type '" "double""'");
+  } 
+  arg1 = static_cast< double >(val1);
+  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_DensityLowerThanUP1D" "', argument " "2"" of type '" "double""'");
+  } 
+  arg2 = static_cast< double >(val2);
+  {
+    try {
+      result = (Predicates1D::DensityLowerThanUP1D *)new Predicates1D::DensityLowerThanUP1D(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Predicates1D__DensityLowerThanUP1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_DensityLowerThanUP1D__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  double arg1 ;
+  Predicates1D::DensityLowerThanUP1D *result = 0 ;
+  double val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_DensityLowerThanUP1D",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_DensityLowerThanUP1D" "', argument " "1"" of type '" "double""'");
+  } 
+  arg1 = static_cast< double >(val1);
+  {
+    try {
+      result = (Predicates1D::DensityLowerThanUP1D *)new Predicates1D::DensityLowerThanUP1D(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Predicates1D__DensityLowerThanUP1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_DensityLowerThanUP1D(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_double(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_DensityLowerThanUP1D__SWIG_1(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    {
+      int res = SWIG_AsVal_double(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      {
+        int res = SWIG_AsVal_double(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_new_DensityLowerThanUP1D__SWIG_0(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_DensityLowerThanUP1D'.\n  Possible C/C++ prototypes are:\n    Predicates1D::DensityLowerThanUP1D(double,double)\n    Predicates1D::DensityLowerThanUP1D(double)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_DensityLowerThanUP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::DensityLowerThanUP1D *arg1 = (Predicates1D::DensityLowerThanUP1D *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:DensityLowerThanUP1D_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates1D__DensityLowerThanUP1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DensityLowerThanUP1D_getName" "', argument " "1"" of type '" "Predicates1D::DensityLowerThanUP1D const *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates1D::DensityLowerThanUP1D * >(argp1);
+  {
+    try {
+      result = ((Predicates1D::DensityLowerThanUP1D const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_DensityLowerThanUP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::DensityLowerThanUP1D *arg1 = (Predicates1D::DensityLowerThanUP1D *) 0 ;
+  Interface1D *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:DensityLowerThanUP1D___call__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates1D__DensityLowerThanUP1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DensityLowerThanUP1D___call__" "', argument " "1"" of type '" "Predicates1D::DensityLowerThanUP1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates1D::DensityLowerThanUP1D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "DensityLowerThanUP1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "DensityLowerThanUP1D___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface1D * >(argp2);
+  {
+    try {
+      result = (bool)(arg1)->operator ()(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_DensityLowerThanUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Predicates1D::DensityLowerThanUP1D *arg1 = (Predicates1D::DensityLowerThanUP1D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_DensityLowerThanUP1D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Predicates1D__DensityLowerThanUP1D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_DensityLowerThanUP1D" "', argument " "1"" of type '" "Predicates1D::DensityLowerThanUP1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Predicates1D::DensityLowerThanUP1D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *DensityLowerThanUP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__DensityLowerThanUP1D, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator__CurvilinearLength_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  float arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:CurvePointIterator__CurvilinearLength_set",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator__CurvilinearLength_set" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CurvePointIterator__CurvilinearLength_set" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  if (arg1) (arg1)->_CurvilinearLength = arg2;
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator__CurvilinearLength_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator__CurvilinearLength_get",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator__CurvilinearLength_get" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  result = (float) ((arg1)->_CurvilinearLength);
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator__step_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  float arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:CurvePointIterator__step_set",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator__step_set" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CurvePointIterator__step_set" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  if (arg1) (arg1)->_step = arg2;
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator__step_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator__step_get",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator__step_get" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  result = (float) ((arg1)->_step);
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator___A_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  Curve::vertex_container::iterator arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:CurvePointIterator___A_set",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator___A_set" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Curve__vertex_container__iterator,  0  | 0);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CurvePointIterator___A_set" "', argument " "2"" of type '" "Curve::vertex_container::iterator""'"); 
+    }  
+    if (!argp2) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CurvePointIterator___A_set" "', argument " "2"" of type '" "Curve::vertex_container::iterator""'");
+    } else {
+      Curve::vertex_container::iterator * temp = reinterpret_cast< Curve::vertex_container::iterator * >(argp2);
+      arg2 = *temp;
+      if (SWIG_IsNewObj(res2)) delete temp;
+    }
+  }
+  if (arg1) (arg1)->__A = arg2;
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator___A_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  Curve::vertex_container::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator___A_get",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator___A_get" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  result =  ((arg1)->__A);
+  resultobj = SWIG_NewPointerObj((new Curve::vertex_container::iterator(static_cast< const Curve::vertex_container::iterator& >(result))), SWIGTYPE_p_Curve__vertex_container__iterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator___B_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  Curve::vertex_container::iterator arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:CurvePointIterator___B_set",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator___B_set" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Curve__vertex_container__iterator,  0  | 0);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CurvePointIterator___B_set" "', argument " "2"" of type '" "Curve::vertex_container::iterator""'"); 
+    }  
+    if (!argp2) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CurvePointIterator___B_set" "', argument " "2"" of type '" "Curve::vertex_container::iterator""'");
+    } else {
+      Curve::vertex_container::iterator * temp = reinterpret_cast< Curve::vertex_container::iterator * >(argp2);
+      arg2 = *temp;
+      if (SWIG_IsNewObj(res2)) delete temp;
+    }
+  }
+  if (arg1) (arg1)->__B = arg2;
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator___B_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  Curve::vertex_container::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator___B_get",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator___B_get" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  result =  ((arg1)->__B);
+  resultobj = SWIG_NewPointerObj((new Curve::vertex_container::iterator(static_cast< const Curve::vertex_container::iterator& >(result))), SWIGTYPE_p_Curve__vertex_container__iterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator__begin_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  Curve::vertex_container::iterator arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:CurvePointIterator__begin_set",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator__begin_set" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Curve__vertex_container__iterator,  0  | 0);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CurvePointIterator__begin_set" "', argument " "2"" of type '" "Curve::vertex_container::iterator""'"); 
+    }  
+    if (!argp2) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CurvePointIterator__begin_set" "', argument " "2"" of type '" "Curve::vertex_container::iterator""'");
+    } else {
+      Curve::vertex_container::iterator * temp = reinterpret_cast< Curve::vertex_container::iterator * >(argp2);
+      arg2 = *temp;
+      if (SWIG_IsNewObj(res2)) delete temp;
+    }
+  }
+  if (arg1) (arg1)->_begin = arg2;
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator__begin_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  Curve::vertex_container::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator__begin_get",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator__begin_get" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  result =  ((arg1)->_begin);
+  resultobj = SWIG_NewPointerObj((new Curve::vertex_container::iterator(static_cast< const Curve::vertex_container::iterator& >(result))), SWIGTYPE_p_Curve__vertex_container__iterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator__end_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  Curve::vertex_container::iterator arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:CurvePointIterator__end_set",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator__end_set" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Curve__vertex_container__iterator,  0  | 0);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CurvePointIterator__end_set" "', argument " "2"" of type '" "Curve::vertex_container::iterator""'"); 
+    }  
+    if (!argp2) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CurvePointIterator__end_set" "', argument " "2"" of type '" "Curve::vertex_container::iterator""'");
+    } else {
+      Curve::vertex_container::iterator * temp = reinterpret_cast< Curve::vertex_container::iterator * >(argp2);
+      arg2 = *temp;
+      if (SWIG_IsNewObj(res2)) delete temp;
+    }
+  }
+  if (arg1) (arg1)->_end = arg2;
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator__end_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  Curve::vertex_container::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator__end_get",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator__end_get" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  result =  ((arg1)->_end);
+  resultobj = SWIG_NewPointerObj((new Curve::vertex_container::iterator(static_cast< const Curve::vertex_container::iterator& >(result))), SWIGTYPE_p_Curve__vertex_container__iterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator__n_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:CurvePointIterator__n_set",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator__n_set" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CurvePointIterator__n_set" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  if (arg1) (arg1)->_n = arg2;
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator__n_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator__n_get",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator__n_get" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  result = (int) ((arg1)->_n);
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator__currentn_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:CurvePointIterator__currentn_set",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator__currentn_set" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CurvePointIterator__currentn_set" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  if (arg1) (arg1)->_currentn = arg2;
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator__currentn_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator__currentn_get",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator__currentn_get" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  result = (int) ((arg1)->_currentn);
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator__t_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  float arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:CurvePointIterator__t_set",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator__t_set" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CurvePointIterator__t_set" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  if (arg1) (arg1)->_t = arg2;
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator__t_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator__t_get",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator__t_get" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  result = (float) ((arg1)->_t);
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator__Point_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  CurvePoint *arg2 = (CurvePoint *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:CurvePointIterator__Point_set",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator__Point_set" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_CurvePoint, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CurvePointIterator__Point_set" "', argument " "2"" of type '" "CurvePoint *""'"); 
+  }
+  arg2 = reinterpret_cast< CurvePoint * >(argp2);
+  if (arg1) (arg1)->_Point = *arg2;
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator__Point_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  CurvePoint *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator__Point_get",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator__Point_get" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  result = (CurvePoint *)& ((arg1)->_Point);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CurvePoint, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator__CurveLength_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  float arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:CurvePointIterator__CurveLength_set",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator__CurveLength_set" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CurvePointIterator__CurveLength_set" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  if (arg1) (arg1)->_CurveLength = arg2;
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator__CurveLength_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator__CurveLength_get",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator__CurveLength_get" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  result = (float) ((arg1)->_CurveLength);
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_CurvePointIterator__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  float arg1 ;
+  CurveInternal::CurvePointIterator *result = 0 ;
+  float val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_CurvePointIterator",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_float(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_CurvePointIterator" "', argument " "1"" of type '" "float""'");
+  } 
+  arg1 = static_cast< float >(val1);
+  {
+    try {
+      result = (CurveInternal::CurvePointIterator *)new CurveInternal::CurvePointIterator(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CurveInternal__CurvePointIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_CurvePointIterator__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_CurvePointIterator")) SWIG_fail;
+  {
+    try {
+      result = (CurveInternal::CurvePointIterator *)new CurveInternal::CurvePointIterator();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CurveInternal__CurvePointIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_CurvePointIterator__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = 0 ;
+  CurveInternal::CurvePointIterator *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_CurvePointIterator",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_CurveInternal__CurvePointIterator,  0  | 0);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CurvePointIterator" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator const &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_CurvePointIterator" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator const &""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    try {
+      result = (CurveInternal::CurvePointIterator *)new CurveInternal::CurvePointIterator((CurveInternal::CurvePointIterator const &)*arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CurveInternal__CurvePointIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_CurvePointIterator(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_CurvePointIterator__SWIG_1(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_CurveInternal__CurvePointIterator, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_new_CurvePointIterator__SWIG_2(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_float(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_CurvePointIterator__SWIG_0(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CurvePointIterator'.\n  Possible C/C++ prototypes are:\n    CurveInternal::CurvePointIterator(float)\n    CurveInternal::CurvePointIterator()\n    CurveInternal::CurvePointIterator(CurveInternal::CurvePointIterator const &)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_CurvePointIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_CurvePointIterator",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CurvePointIterator" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_copy(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  CurveInternal::CurvePointIterator *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator_copy",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_copy" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    try {
+      result = (CurveInternal::CurvePointIterator *)((CurveInternal::CurvePointIterator const *)arg1)->copy();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_CastToInterface0DIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  Interface0DIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator_CastToInterface0DIterator",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_CastToInterface0DIterator" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    try {
+      result = ((CurveInternal::CurvePointIterator const *)arg1)->CastToInterface0DIterator();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Interface0DIterator(static_cast< const Interface0DIterator& >(result))), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator_getExactTypeName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_getExactTypeName" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    try {
+      result = ((CurveInternal::CurvePointIterator const *)arg1)->getExactTypeName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  Interface0DIteratorNested *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:CurvePointIterator___eq__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator___eq__" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIteratorNested,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CurvePointIterator___eq__" "', argument " "2"" of type '" "Interface0DIteratorNested const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CurvePointIterator___eq__" "', argument " "2"" of type '" "Interface0DIteratorNested const &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0DIteratorNested * >(argp2);
+  {
+    try {
+      result = (bool)((CurveInternal::CurvePointIterator const *)arg1)->operator ==((Interface0DIteratorNested const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_getObject(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  CurvePoint *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator_getObject",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_getObject" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    try {
+      {
+        CurvePoint &_result_ref = (arg1)->operator *();
+        result = (CurvePoint *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CurvePoint, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator___deref__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  CurvePoint *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator___deref__",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator___deref__" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    try {
+      result = (CurvePoint *)(arg1)->operator ->();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CurvePoint, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_isBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator_isBegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_isBegin" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    try {
+      result = (bool)((CurveInternal::CurvePointIterator const *)arg1)->isBegin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_isEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator_isEnd",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_isEnd" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    try {
+      result = (bool)((CurveInternal::CurvePointIterator const *)arg1)->isEnd();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_getX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator_getX",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_getX" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->getX();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_getY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator_getY",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_getY" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->getY();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_getZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator_getZ",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_getZ" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->getZ();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_getPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  Geometry::Vec3f result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator_getPoint3D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_getPoint3D" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->getPoint3D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_getProjectedX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator_getProjectedX",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_getProjectedX" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->getProjectedX();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_getProjectedY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator_getProjectedY",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_getProjectedY" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->getProjectedY();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_getProjectedZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator_getProjectedZ",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_getProjectedZ" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->getProjectedZ();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_getPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  Geometry::Vec2f result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator_getPoint2D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_getPoint2D" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->getPoint2D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_getFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  Interface0D *arg2 = 0 ;
+  FEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:CurvePointIterator_getFEdge",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_getFEdge" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CurvePointIterator_getFEdge" "', argument " "2"" of type '" "Interface0D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CurvePointIterator_getFEdge" "', argument " "2"" of type '" "Interface0D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0D * >(argp2);
+  {
+    try {
+      result = (FEdge *)(*arg1)->getFEdge(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FEdge, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  Id result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator_getId",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_getId" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->getId();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Id(static_cast< const Id& >(result))), SWIGTYPE_p_Id, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_getNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  Nature::VertexNature result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator_getNature",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_getNature" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    try {
+      result = (Nature::VertexNature)(*arg1)->getNature();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_castToSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  SVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator_castToSVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_castToSVertex" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    try {
+      result = (SVertex *)(*arg1)->castToSVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_castToViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  ViewVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator_castToViewVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_castToViewVertex" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    try {
+      result = (ViewVertex *)(*arg1)->castToViewVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_castToNonTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  NonTVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator_castToNonTVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_castToNonTVertex" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    try {
+      result = (NonTVertex *)(*arg1)->castToNonTVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_NonTVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_castToTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  TVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator_castToTVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_castToTVertex" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    try {
+      result = (TVertex *)(*arg1)->castToTVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_TVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_A(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  SVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator_A",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_A" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    try {
+      result = (SVertex *)(*arg1)->A();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_B(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  SVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator_B",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_B" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    try {
+      result = (SVertex *)(*arg1)->B();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_t2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator_t2d",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_t2d" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    try {
+      result = (float)(*arg1)->t2d();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_SetA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  SVertex *arg2 = (SVertex *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:CurvePointIterator_SetA",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_SetA" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CurvePointIterator_SetA" "', argument " "2"" of type '" "SVertex *""'"); 
+  }
+  arg2 = reinterpret_cast< SVertex * >(argp2);
+  {
+    try {
+      (*arg1)->SetA(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_SetB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  SVertex *arg2 = (SVertex *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:CurvePointIterator_SetB",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_SetB" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CurvePointIterator_SetB" "', argument " "2"" of type '" "SVertex *""'"); 
+  }
+  arg2 = reinterpret_cast< SVertex * >(argp2);
+  {
+    try {
+      (*arg1)->SetB(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_SetT2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  float arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:CurvePointIterator_SetT2d",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_SetT2d" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CurvePointIterator_SetT2d" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  {
+    try {
+      (*arg1)->SetT2d(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_fedge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  FEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator_fedge",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_fedge" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    try {
+      result = (FEdge *)(*arg1)->fedge();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FEdge, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_point2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  Geometry::Vec3r *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator_point2d",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_point2d" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    try {
+      {
+        Geometry::Vec3r const &_result_ref = (*arg1)->point2d();
+        result = (Geometry::Vec3r *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_point3d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  Geometry::Vec3r *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator_point3d",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_point3d" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    try {
+      {
+        Geometry::Vec3r const &_result_ref = (*arg1)->point3d();
+        result = (Geometry::Vec3r *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_normal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  Geometry::Vec3r result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator_normal",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_normal" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->normal();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_shape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  SShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator_shape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_shape" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    try {
+      result = (SShape *)(*arg1)->shape();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SShape, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_occluders_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  occluder_container::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator_occluders_begin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_occluders_begin" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->occluders_begin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new occluder_container::const_iterator(static_cast< const occluder_container::const_iterator& >(result))), SWIGTYPE_p_occluder_container__const_iterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_occluders_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  occluder_container::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator_occluders_end",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_occluders_end" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->occluders_end();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new occluder_container::const_iterator(static_cast< const occluder_container::const_iterator& >(result))), SWIGTYPE_p_occluder_container__const_iterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_occluders_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator_occluders_empty",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_occluders_empty" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    try {
+      result = (bool)(*arg1)->occluders_empty();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_occluders_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator_occluders_size",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_occluders_size" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    try {
+      result = (int)(*arg1)->occluders_size();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_occludee(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  Polygon3r *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator_occludee",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_occludee" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    try {
+      {
+        Polygon3r const &_result_ref = (*arg1)->occludee();
+        result = (Polygon3r *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Polygon3r, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_occluded_shape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  SShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator_occluded_shape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_occluded_shape" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    try {
+      result = (SShape *)(*arg1)->occluded_shape();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SShape, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_occludee_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator_occludee_empty",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_occludee_empty" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    try {
+      result = (bool)(*arg1)->occludee_empty();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_z_discontinuity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator_z_discontinuity",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_z_discontinuity" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->z_discontinuity();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_curvatureFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator_curvatureFredo",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_curvatureFredo" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->curvatureFredo();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_directionFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  Geometry::Vec2d result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator_directionFredo",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_directionFredo" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->directionFredo();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2d(static_cast< const Geometry::Vec2d& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *CurvePointIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_CurveInternal__CurvePointIterator, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_CurvePoint_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurvePoint *arg1 = (CurvePoint *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePoint_getExactTypeName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurvePoint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePoint_getExactTypeName" "', argument " "1"" of type '" "CurvePoint const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurvePoint * >(argp1);
+  {
+    try {
+      result = ((CurvePoint const *)arg1)->getExactTypeName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_getX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurvePoint *arg1 = (CurvePoint *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePoint_getX",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurvePoint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePoint_getX" "', argument " "1"" of type '" "CurvePoint const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurvePoint * >(argp1);
+  {
+    try {
+      result = (real)((CurvePoint const *)arg1)->getX();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_getY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurvePoint *arg1 = (CurvePoint *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePoint_getY",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurvePoint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePoint_getY" "', argument " "1"" of type '" "CurvePoint const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurvePoint * >(argp1);
+  {
+    try {
+      result = (real)((CurvePoint const *)arg1)->getY();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_getZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurvePoint *arg1 = (CurvePoint *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePoint_getZ",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurvePoint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePoint_getZ" "', argument " "1"" of type '" "CurvePoint const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurvePoint * >(argp1);
+  {
+    try {
+      result = (real)((CurvePoint const *)arg1)->getZ();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_getPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurvePoint *arg1 = (CurvePoint *) 0 ;
+  Geometry::Vec3f result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePoint_getPoint3D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurvePoint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePoint_getPoint3D" "', argument " "1"" of type '" "CurvePoint const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurvePoint * >(argp1);
+  {
+    try {
+      result = ((CurvePoint const *)arg1)->getPoint3D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_getProjectedX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurvePoint *arg1 = (CurvePoint *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePoint_getProjectedX",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurvePoint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePoint_getProjectedX" "', argument " "1"" of type '" "CurvePoint const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurvePoint * >(argp1);
+  {
+    try {
+      result = (real)((CurvePoint const *)arg1)->getProjectedX();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_getProjectedY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurvePoint *arg1 = (CurvePoint *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePoint_getProjectedY",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurvePoint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePoint_getProjectedY" "', argument " "1"" of type '" "CurvePoint const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurvePoint * >(argp1);
+  {
+    try {
+      result = (real)((CurvePoint const *)arg1)->getProjectedY();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_getProjectedZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurvePoint *arg1 = (CurvePoint *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePoint_getProjectedZ",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurvePoint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePoint_getProjectedZ" "', argument " "1"" of type '" "CurvePoint const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurvePoint * >(argp1);
+  {
+    try {
+      result = (real)((CurvePoint const *)arg1)->getProjectedZ();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_getPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurvePoint *arg1 = (CurvePoint *) 0 ;
+  Geometry::Vec2f result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePoint_getPoint2D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurvePoint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePoint_getPoint2D" "', argument " "1"" of type '" "CurvePoint const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurvePoint * >(argp1);
+  {
+    try {
+      result = ((CurvePoint const *)arg1)->getPoint2D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_getFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurvePoint *arg1 = (CurvePoint *) 0 ;
+  Interface0D *arg2 = 0 ;
+  FEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:CurvePoint_getFEdge",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurvePoint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePoint_getFEdge" "', argument " "1"" of type '" "CurvePoint *""'"); 
+  }
+  arg1 = reinterpret_cast< CurvePoint * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CurvePoint_getFEdge" "', argument " "2"" of type '" "Interface0D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CurvePoint_getFEdge" "', argument " "2"" of type '" "Interface0D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0D * >(argp2);
+  {
+    try {
+      result = (FEdge *)(arg1)->getFEdge(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FEdge, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurvePoint *arg1 = (CurvePoint *) 0 ;
+  Id result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePoint_getId",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurvePoint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePoint_getId" "', argument " "1"" of type '" "CurvePoint const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurvePoint * >(argp1);
+  {
+    try {
+      result = ((CurvePoint const *)arg1)->getId();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Id(static_cast< const Id& >(result))), SWIGTYPE_p_Id, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_getNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurvePoint *arg1 = (CurvePoint *) 0 ;
+  Nature::VertexNature result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePoint_getNature",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurvePoint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePoint_getNature" "', argument " "1"" of type '" "CurvePoint const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurvePoint * >(argp1);
+  {
+    try {
+      result = (Nature::VertexNature)((CurvePoint const *)arg1)->getNature();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_castToSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurvePoint *arg1 = (CurvePoint *) 0 ;
+  SVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePoint_castToSVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurvePoint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePoint_castToSVertex" "', argument " "1"" of type '" "CurvePoint *""'"); 
+  }
+  arg1 = reinterpret_cast< CurvePoint * >(argp1);
+  {
+    try {
+      result = (SVertex *)(arg1)->castToSVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_castToViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurvePoint *arg1 = (CurvePoint *) 0 ;
+  ViewVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePoint_castToViewVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurvePoint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePoint_castToViewVertex" "', argument " "1"" of type '" "CurvePoint *""'"); 
+  }
+  arg1 = reinterpret_cast< CurvePoint * >(argp1);
+  {
+    try {
+      result = (ViewVertex *)(arg1)->castToViewVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_castToNonTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurvePoint *arg1 = (CurvePoint *) 0 ;
+  NonTVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePoint_castToNonTVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurvePoint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePoint_castToNonTVertex" "', argument " "1"" of type '" "CurvePoint *""'"); 
+  }
+  arg1 = reinterpret_cast< CurvePoint * >(argp1);
+  {
+    try {
+      result = (NonTVertex *)(arg1)->castToNonTVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_NonTVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_castToTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurvePoint *arg1 = (CurvePoint *) 0 ;
+  TVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePoint_castToTVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurvePoint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePoint_castToTVertex" "', argument " "1"" of type '" "CurvePoint *""'"); 
+  }
+  arg1 = reinterpret_cast< CurvePoint * >(argp1);
+  {
+    try {
+      result = (TVertex *)(arg1)->castToTVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_TVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_CurvePoint__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurvePoint *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_CurvePoint")) SWIG_fail;
+  {
+    try {
+      result = (CurvePoint *)new CurvePoint();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CurvePoint, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_CurvePoint__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  SVertex *arg2 = (SVertex *) 0 ;
+  float arg3 ;
+  CurvePoint *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  float val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:new_CurvePoint",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CurvePoint" "', argument " "1"" of type '" "SVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_CurvePoint" "', argument " "2"" of type '" "SVertex *""'"); 
+  }
+  arg2 = reinterpret_cast< SVertex * >(argp2);
+  ecode3 = SWIG_AsVal_float(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_CurvePoint" "', argument " "3"" of type '" "float""'");
+  } 
+  arg3 = static_cast< float >(val3);
+  {
+    try {
+      result = (CurvePoint *)new CurvePoint(arg1,arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CurvePoint, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_CurvePoint__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurvePoint *arg1 = (CurvePoint *) 0 ;
+  CurvePoint *arg2 = (CurvePoint *) 0 ;
+  float arg3 ;
+  CurvePoint *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  float val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:new_CurvePoint",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurvePoint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CurvePoint" "', argument " "1"" of type '" "CurvePoint *""'"); 
+  }
+  arg1 = reinterpret_cast< CurvePoint * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_CurvePoint, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_CurvePoint" "', argument " "2"" of type '" "CurvePoint *""'"); 
+  }
+  arg2 = reinterpret_cast< CurvePoint * >(argp2);
+  ecode3 = SWIG_AsVal_float(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_CurvePoint" "', argument " "3"" of type '" "float""'");
+  } 
+  arg3 = static_cast< float >(val3);
+  {
+    try {
+      result = (CurvePoint *)new CurvePoint(arg1,arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CurvePoint, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_CurvePoint__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurvePoint *arg1 = 0 ;
+  CurvePoint *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_CurvePoint",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_CurvePoint,  0  | 0);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CurvePoint" "', argument " "1"" of type '" "CurvePoint const &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_CurvePoint" "', argument " "1"" of type '" "CurvePoint const &""'"); 
+  }
+  arg1 = reinterpret_cast< CurvePoint * >(argp1);
+  {
+    try {
+      result = (CurvePoint *)new CurvePoint((CurvePoint const &)*arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CurvePoint, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_CurvePoint(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_CurvePoint__SWIG_0(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_CurvePoint, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_new_CurvePoint__SWIG_3(self, args);
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CurvePoint, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CurvePoint, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_float(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          return _wrap_new_CurvePoint__SWIG_2(self, args);
+        }
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_SVertex, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_SVertex, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_float(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          return _wrap_new_CurvePoint__SWIG_1(self, args);
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CurvePoint'.\n  Possible C/C++ prototypes are:\n    CurvePoint()\n    CurvePoint(SVertex *,SVertex *,float)\n    CurvePoint(CurvePoint *,CurvePoint *,float)\n    CurvePoint(CurvePoint const &)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_CurvePoint(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurvePoint *arg1 = (CurvePoint *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_CurvePoint",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurvePoint, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CurvePoint" "', argument " "1"" of type '" "CurvePoint *""'"); 
+  }
+  arg1 = reinterpret_cast< CurvePoint * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurvePoint *arg1 = (CurvePoint *) 0 ;
+  CurvePoint *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:CurvePoint___eq__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurvePoint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePoint___eq__" "', argument " "1"" of type '" "CurvePoint *""'"); 
+  }
+  arg1 = reinterpret_cast< CurvePoint * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_CurvePoint,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CurvePoint___eq__" "', argument " "2"" of type '" "CurvePoint const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CurvePoint___eq__" "', argument " "2"" of type '" "CurvePoint const &""'"); 
+  }
+  arg2 = reinterpret_cast< CurvePoint * >(argp2);
+  {
+    try {
+      result = (bool)(arg1)->operator ==((CurvePoint const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_A(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurvePoint *arg1 = (CurvePoint *) 0 ;
+  SVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePoint_A",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurvePoint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePoint_A" "', argument " "1"" of type '" "CurvePoint *""'"); 
+  }
+  arg1 = reinterpret_cast< CurvePoint * >(argp1);
+  {
+    try {
+      result = (SVertex *)(arg1)->A();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_B(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurvePoint *arg1 = (CurvePoint *) 0 ;
+  SVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePoint_B",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurvePoint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePoint_B" "', argument " "1"" of type '" "CurvePoint *""'"); 
+  }
+  arg1 = reinterpret_cast< CurvePoint * >(argp1);
+  {
+    try {
+      result = (SVertex *)(arg1)->B();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_t2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurvePoint *arg1 = (CurvePoint *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePoint_t2d",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurvePoint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePoint_t2d" "', argument " "1"" of type '" "CurvePoint const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurvePoint * >(argp1);
+  {
+    try {
+      result = (float)((CurvePoint const *)arg1)->t2d();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_SetA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurvePoint *arg1 = (CurvePoint *) 0 ;
+  SVertex *arg2 = (SVertex *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:CurvePoint_SetA",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurvePoint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePoint_SetA" "', argument " "1"" of type '" "CurvePoint *""'"); 
+  }
+  arg1 = reinterpret_cast< CurvePoint * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CurvePoint_SetA" "', argument " "2"" of type '" "SVertex *""'"); 
+  }
+  arg2 = reinterpret_cast< SVertex * >(argp2);
+  {
+    try {
+      (arg1)->SetA(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_SetB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurvePoint *arg1 = (CurvePoint *) 0 ;
+  SVertex *arg2 = (SVertex *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:CurvePoint_SetB",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurvePoint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePoint_SetB" "', argument " "1"" of type '" "CurvePoint *""'"); 
+  }
+  arg1 = reinterpret_cast< CurvePoint * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CurvePoint_SetB" "', argument " "2"" of type '" "SVertex *""'"); 
+  }
+  arg2 = reinterpret_cast< SVertex * >(argp2);
+  {
+    try {
+      (arg1)->SetB(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_SetT2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurvePoint *arg1 = (CurvePoint *) 0 ;
+  float arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:CurvePoint_SetT2d",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurvePoint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePoint_SetT2d" "', argument " "1"" of type '" "CurvePoint *""'"); 
+  }
+  arg1 = reinterpret_cast< CurvePoint * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CurvePoint_SetT2d" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  {
+    try {
+      (arg1)->SetT2d(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_fedge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurvePoint *arg1 = (CurvePoint *) 0 ;
+  FEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePoint_fedge",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurvePoint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePoint_fedge" "', argument " "1"" of type '" "CurvePoint *""'"); 
+  }
+  arg1 = reinterpret_cast< CurvePoint * >(argp1);
+  {
+    try {
+      result = (FEdge *)(arg1)->fedge();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FEdge, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_point2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurvePoint *arg1 = (CurvePoint *) 0 ;
+  Geometry::Vec3r *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePoint_point2d",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurvePoint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePoint_point2d" "', argument " "1"" of type '" "CurvePoint const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurvePoint * >(argp1);
+  {
+    try {
+      {
+        Geometry::Vec3r const &_result_ref = ((CurvePoint const *)arg1)->point2d();
+        result = (Geometry::Vec3r *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_point3d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurvePoint *arg1 = (CurvePoint *) 0 ;
+  Geometry::Vec3r *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePoint_point3d",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurvePoint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePoint_point3d" "', argument " "1"" of type '" "CurvePoint const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurvePoint * >(argp1);
+  {
+    try {
+      {
+        Geometry::Vec3r const &_result_ref = ((CurvePoint const *)arg1)->point3d();
+        result = (Geometry::Vec3r *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_normal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurvePoint *arg1 = (CurvePoint *) 0 ;
+  Geometry::Vec3r result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePoint_normal",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurvePoint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePoint_normal" "', argument " "1"" of type '" "CurvePoint const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurvePoint * >(argp1);
+  {
+    try {
+      result = ((CurvePoint const *)arg1)->normal();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_shape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurvePoint *arg1 = (CurvePoint *) 0 ;
+  SShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePoint_shape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurvePoint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePoint_shape" "', argument " "1"" of type '" "CurvePoint const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurvePoint * >(argp1);
+  {
+    try {
+      result = (SShape *)((CurvePoint const *)arg1)->shape();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SShape, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_occluders_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurvePoint *arg1 = (CurvePoint *) 0 ;
+  occluder_container::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePoint_occluders_begin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurvePoint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePoint_occluders_begin" "', argument " "1"" of type '" "CurvePoint const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurvePoint * >(argp1);
+  {
+    try {
+      result = ((CurvePoint const *)arg1)->occluders_begin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new occluder_container::const_iterator(static_cast< const occluder_container::const_iterator& >(result))), SWIGTYPE_p_occluder_container__const_iterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_occluders_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurvePoint *arg1 = (CurvePoint *) 0 ;
+  occluder_container::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePoint_occluders_end",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurvePoint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePoint_occluders_end" "', argument " "1"" of type '" "CurvePoint const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurvePoint * >(argp1);
+  {
+    try {
+      result = ((CurvePoint const *)arg1)->occluders_end();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new occluder_container::const_iterator(static_cast< const occluder_container::const_iterator& >(result))), SWIGTYPE_p_occluder_container__const_iterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_occluders_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurvePoint *arg1 = (CurvePoint *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePoint_occluders_empty",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurvePoint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePoint_occluders_empty" "', argument " "1"" of type '" "CurvePoint const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurvePoint * >(argp1);
+  {
+    try {
+      result = (bool)((CurvePoint const *)arg1)->occluders_empty();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_occluders_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurvePoint *arg1 = (CurvePoint *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePoint_occluders_size",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurvePoint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePoint_occluders_size" "', argument " "1"" of type '" "CurvePoint const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurvePoint * >(argp1);
+  {
+    try {
+      result = (int)((CurvePoint const *)arg1)->occluders_size();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_occludee(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurvePoint *arg1 = (CurvePoint *) 0 ;
+  Polygon3r *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePoint_occludee",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurvePoint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePoint_occludee" "', argument " "1"" of type '" "CurvePoint const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurvePoint * >(argp1);
+  {
+    try {
+      {
+        Polygon3r const &_result_ref = ((CurvePoint const *)arg1)->occludee();
+        result = (Polygon3r *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Polygon3r, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_occluded_shape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurvePoint *arg1 = (CurvePoint *) 0 ;
+  SShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePoint_occluded_shape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurvePoint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePoint_occluded_shape" "', argument " "1"" of type '" "CurvePoint const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurvePoint * >(argp1);
+  {
+    try {
+      result = (SShape *)((CurvePoint const *)arg1)->occluded_shape();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SShape, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_occludee_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurvePoint *arg1 = (CurvePoint *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePoint_occludee_empty",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurvePoint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePoint_occludee_empty" "', argument " "1"" of type '" "CurvePoint const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurvePoint * >(argp1);
+  {
+    try {
+      result = (bool)((CurvePoint const *)arg1)->occludee_empty();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_z_discontinuity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurvePoint *arg1 = (CurvePoint *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePoint_z_discontinuity",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurvePoint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePoint_z_discontinuity" "', argument " "1"" of type '" "CurvePoint const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurvePoint * >(argp1);
+  {
+    try {
+      result = (real)((CurvePoint const *)arg1)->z_discontinuity();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_curvatureFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurvePoint *arg1 = (CurvePoint *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePoint_curvatureFredo",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurvePoint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePoint_curvatureFredo" "', argument " "1"" of type '" "CurvePoint const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurvePoint * >(argp1);
+  {
+    try {
+      result = (real)((CurvePoint const *)arg1)->curvatureFredo();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_directionFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurvePoint *arg1 = (CurvePoint *) 0 ;
+  Geometry::Vec2d result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePoint_directionFredo",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurvePoint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePoint_directionFredo" "', argument " "1"" of type '" "CurvePoint const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurvePoint * >(argp1);
+  {
+    try {
+      result = ((CurvePoint const *)arg1)->directionFredo();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2d(static_cast< const Geometry::Vec2d& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *CurvePoint_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_CurvePoint, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_Curve__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Curve *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_Curve")) SWIG_fail;
+  {
+    try {
+      result = (Curve *)new Curve();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Curve, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Curve__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Id *arg1 = 0 ;
+  Curve *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_Curve",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_Id,  0  | 0);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_Curve" "', argument " "1"" of type '" "Id const &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_Curve" "', argument " "1"" of type '" "Id const &""'"); 
+  }
+  arg1 = reinterpret_cast< Id * >(argp1);
+  {
+    try {
+      result = (Curve *)new Curve((Id const &)*arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Curve, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Curve__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Curve *arg1 = 0 ;
+  Curve *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_Curve",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_Curve,  0  | 0);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_Curve" "', argument " "1"" of type '" "Curve const &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_Curve" "', argument " "1"" of type '" "Curve const &""'"); 
+  }
+  arg1 = reinterpret_cast< Curve * >(argp1);
+  {
+    try {
+      result = (Curve *)new Curve((Curve const &)*arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Curve, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Curve(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_Curve__SWIG_0(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Id, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_new_Curve__SWIG_1(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Curve, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_new_Curve__SWIG_2(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Curve'.\n  Possible C/C++ prototypes are:\n    Curve()\n    Curve(Id const &)\n    Curve(Curve const &)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_Curve(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Curve *arg1 = (Curve *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_Curve",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Curve, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Curve" "', argument " "1"" of type '" "Curve *""'"); 
+  }
+  arg1 = reinterpret_cast< Curve * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_computeCurvatureAndOrientation(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Curve *arg1 = (Curve *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Curve_computeCurvatureAndOrientation",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Curve, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Curve_computeCurvatureAndOrientation" "', argument " "1"" of type '" "Curve *""'"); 
+  }
+  arg1 = reinterpret_cast< Curve * >(argp1);
+  {
+    try {
+      (arg1)->computeCurvatureAndOrientation();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_push_vertex_back__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Curve *arg1 = (Curve *) 0 ;
+  Curve::Vertex *arg2 = (Curve::Vertex *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Curve_push_vertex_back",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Curve, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Curve_push_vertex_back" "', argument " "1"" of type '" "Curve *""'"); 
+  }
+  arg1 = reinterpret_cast< Curve * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_CurvePoint, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Curve_push_vertex_back" "', argument " "2"" of type '" "Curve::Vertex *""'"); 
+  }
+  arg2 = reinterpret_cast< Curve::Vertex * >(argp2);
+  {
+    try {
+      (arg1)->push_vertex_back(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_push_vertex_back__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Curve *arg1 = (Curve *) 0 ;
+  SVertex *arg2 = (SVertex *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Curve_push_vertex_back",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Curve, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Curve_push_vertex_back" "', argument " "1"" of type '" "Curve *""'"); 
+  }
+  arg1 = reinterpret_cast< Curve * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Curve_push_vertex_back" "', argument " "2"" of type '" "SVertex *""'"); 
+  }
+  arg2 = reinterpret_cast< SVertex * >(argp2);
+  {
+    try {
+      (arg1)->push_vertex_back(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_push_vertex_back(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Curve, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CurvePoint, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_Curve_push_vertex_back__SWIG_0(self, args);
+      }
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Curve, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_SVertex, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_Curve_push_vertex_back__SWIG_1(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Curve_push_vertex_back'.\n  Possible C/C++ prototypes are:\n    push_vertex_back(Curve::Vertex *)\n    push_vertex_back(SVertex *)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_push_vertex_front__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Curve *arg1 = (Curve *) 0 ;
+  Curve::Vertex *arg2 = (Curve::Vertex *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Curve_push_vertex_front",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Curve, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Curve_push_vertex_front" "', argument " "1"" of type '" "Curve *""'"); 
+  }
+  arg1 = reinterpret_cast< Curve * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_CurvePoint, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Curve_push_vertex_front" "', argument " "2"" of type '" "Curve::Vertex *""'"); 
+  }
+  arg2 = reinterpret_cast< Curve::Vertex * >(argp2);
+  {
+    try {
+      (arg1)->push_vertex_front(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_push_vertex_front__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Curve *arg1 = (Curve *) 0 ;
+  SVertex *arg2 = (SVertex *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Curve_push_vertex_front",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Curve, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Curve_push_vertex_front" "', argument " "1"" of type '" "Curve *""'"); 
+  }
+  arg1 = reinterpret_cast< Curve * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Curve_push_vertex_front" "', argument " "2"" of type '" "SVertex *""'"); 
+  }
+  arg2 = reinterpret_cast< SVertex * >(argp2);
+  {
+    try {
+      (arg1)->push_vertex_front(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_push_vertex_front(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Curve, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_CurvePoint, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_Curve_push_vertex_front__SWIG_0(self, args);
+      }
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Curve, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_SVertex, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_Curve_push_vertex_front__SWIG_1(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Curve_push_vertex_front'.\n  Possible C/C++ prototypes are:\n    push_vertex_front(Curve::Vertex *)\n    push_vertex_front(SVertex *)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Curve *arg1 = (Curve *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Curve_empty",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Curve, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Curve_empty" "', argument " "1"" of type '" "Curve const *""'"); 
+  }
+  arg1 = reinterpret_cast< Curve * >(argp1);
+  {
+    try {
+      result = (bool)((Curve const *)arg1)->empty();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_getLength2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Curve *arg1 = (Curve *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Curve_getLength2D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Curve, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Curve_getLength2D" "', argument " "1"" of type '" "Curve const *""'"); 
+  }
+  arg1 = reinterpret_cast< Curve * >(argp1);
+  {
+    try {
+      result = (real)((Curve const *)arg1)->getLength2D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Curve *arg1 = (Curve *) 0 ;
+  Id result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Curve_getId",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Curve, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Curve_getId" "', argument " "1"" of type '" "Curve const *""'"); 
+  }
+  arg1 = reinterpret_cast< Curve * >(argp1);
+  {
+    try {
+      result = ((Curve const *)arg1)->getId();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Id(static_cast< const Id& >(result))), SWIGTYPE_p_Id, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_nSegments(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Curve *arg1 = (Curve *) 0 ;
+  unsigned int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Curve_nSegments",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Curve, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Curve_nSegments" "', argument " "1"" of type '" "Curve const *""'"); 
+  }
+  arg1 = reinterpret_cast< Curve * >(argp1);
+  {
+    try {
+      result = (unsigned int)((Curve const *)arg1)->nSegments();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_setId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Curve *arg1 = (Curve *) 0 ;
+  Id *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Curve_setId",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Curve, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Curve_setId" "', argument " "1"" of type '" "Curve *""'"); 
+  }
+  arg1 = reinterpret_cast< Curve * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Id,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Curve_setId" "', argument " "2"" of type '" "Id const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Curve_setId" "', argument " "2"" of type '" "Id const &""'"); 
+  }
+  arg2 = reinterpret_cast< Id * >(argp2);
+  {
+    try {
+      (arg1)->setId((Id const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_curvePointsBegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Curve *arg1 = (Curve *) 0 ;
+  float arg2 ;
+  CurveInternal::CurvePointIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Curve_curvePointsBegin",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Curve, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Curve_curvePointsBegin" "', argument " "1"" of type '" "Curve *""'"); 
+  }
+  arg1 = reinterpret_cast< Curve * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Curve_curvePointsBegin" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  {
+    try {
+      result = (arg1)->curvePointsBegin(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new CurveInternal::CurvePointIterator(static_cast< const CurveInternal::CurvePointIterator& >(result))), SWIGTYPE_p_CurveInternal__CurvePointIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_curvePointsBegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Curve *arg1 = (Curve *) 0 ;
+  CurveInternal::CurvePointIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Curve_curvePointsBegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Curve, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Curve_curvePointsBegin" "', argument " "1"" of type '" "Curve *""'"); 
+  }
+  arg1 = reinterpret_cast< Curve * >(argp1);
+  {
+    try {
+      result = (arg1)->curvePointsBegin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new CurveInternal::CurvePointIterator(static_cast< const CurveInternal::CurvePointIterator& >(result))), SWIGTYPE_p_CurveInternal__CurvePointIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_curvePointsBegin(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Curve, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Curve_curvePointsBegin__SWIG_1(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Curve, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_float(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_Curve_curvePointsBegin__SWIG_0(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Curve_curvePointsBegin'.\n  Possible C/C++ prototypes are:\n    curvePointsBegin(float)\n    curvePointsBegin()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_curvePointsEnd__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Curve *arg1 = (Curve *) 0 ;
+  float arg2 ;
+  CurveInternal::CurvePointIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Curve_curvePointsEnd",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Curve, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Curve_curvePointsEnd" "', argument " "1"" of type '" "Curve *""'"); 
+  }
+  arg1 = reinterpret_cast< Curve * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Curve_curvePointsEnd" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  {
+    try {
+      result = (arg1)->curvePointsEnd(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new CurveInternal::CurvePointIterator(static_cast< const CurveInternal::CurvePointIterator& >(result))), SWIGTYPE_p_CurveInternal__CurvePointIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_curvePointsEnd__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Curve *arg1 = (Curve *) 0 ;
+  CurveInternal::CurvePointIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Curve_curvePointsEnd",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Curve, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Curve_curvePointsEnd" "', argument " "1"" of type '" "Curve *""'"); 
+  }
+  arg1 = reinterpret_cast< Curve * >(argp1);
+  {
+    try {
+      result = (arg1)->curvePointsEnd();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new CurveInternal::CurvePointIterator(static_cast< const CurveInternal::CurvePointIterator& >(result))), SWIGTYPE_p_CurveInternal__CurvePointIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_curvePointsEnd(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Curve, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Curve_curvePointsEnd__SWIG_1(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Curve, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_float(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_Curve_curvePointsEnd__SWIG_0(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Curve_curvePointsEnd'.\n  Possible C/C++ prototypes are:\n    curvePointsEnd(float)\n    curvePointsEnd()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_curveVerticesBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Curve *arg1 = (Curve *) 0 ;
+  CurveInternal::CurvePointIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Curve_curveVerticesBegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Curve, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Curve_curveVerticesBegin" "', argument " "1"" of type '" "Curve *""'"); 
+  }
+  arg1 = reinterpret_cast< Curve * >(argp1);
+  {
+    try {
+      result = (arg1)->curveVerticesBegin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new CurveInternal::CurvePointIterator(static_cast< const CurveInternal::CurvePointIterator& >(result))), SWIGTYPE_p_CurveInternal__CurvePointIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_curveVerticesEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Curve *arg1 = (Curve *) 0 ;
+  CurveInternal::CurvePointIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Curve_curveVerticesEnd",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Curve, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Curve_curveVerticesEnd" "', argument " "1"" of type '" "Curve *""'"); 
+  }
+  arg1 = reinterpret_cast< Curve * >(argp1);
+  {
+    try {
+      result = (arg1)->curveVerticesEnd();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new CurveInternal::CurvePointIterator(static_cast< const CurveInternal::CurvePointIterator& >(result))), SWIGTYPE_p_CurveInternal__CurvePointIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_verticesBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Curve *arg1 = (Curve *) 0 ;
+  Interface0DIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Curve_verticesBegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Curve, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Curve_verticesBegin" "', argument " "1"" of type '" "Curve *""'"); 
+  }
+  arg1 = reinterpret_cast< Curve * >(argp1);
+  {
+    try {
+      result = (arg1)->verticesBegin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Interface0DIterator(static_cast< const Interface0DIterator& >(result))), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_verticesEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Curve *arg1 = (Curve *) 0 ;
+  Interface0DIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Curve_verticesEnd",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Curve, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Curve_verticesEnd" "', argument " "1"" of type '" "Curve *""'"); 
+  }
+  arg1 = reinterpret_cast< Curve * >(argp1);
+  {
+    try {
+      result = (arg1)->verticesEnd();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Interface0DIterator(static_cast< const Interface0DIterator& >(result))), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_pointsBegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Curve *arg1 = (Curve *) 0 ;
+  float arg2 ;
+  Interface0DIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Curve_pointsBegin",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Curve, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Curve_pointsBegin" "', argument " "1"" of type '" "Curve *""'"); 
+  }
+  arg1 = reinterpret_cast< Curve * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Curve_pointsBegin" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  {
+    try {
+      result = (arg1)->pointsBegin(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Interface0DIterator(static_cast< const Interface0DIterator& >(result))), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_pointsBegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Curve *arg1 = (Curve *) 0 ;
+  Interface0DIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Curve_pointsBegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Curve, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Curve_pointsBegin" "', argument " "1"" of type '" "Curve *""'"); 
+  }
+  arg1 = reinterpret_cast< Curve * >(argp1);
+  {
+    try {
+      result = (arg1)->pointsBegin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Interface0DIterator(static_cast< const Interface0DIterator& >(result))), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_pointsBegin(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Curve, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Curve_pointsBegin__SWIG_1(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Curve, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_float(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_Curve_pointsBegin__SWIG_0(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Curve_pointsBegin'.\n  Possible C/C++ prototypes are:\n    pointsBegin(float)\n    pointsBegin()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_pointsEnd__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Curve *arg1 = (Curve *) 0 ;
+  float arg2 ;
+  Interface0DIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Curve_pointsEnd",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Curve, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Curve_pointsEnd" "', argument " "1"" of type '" "Curve *""'"); 
+  }
+  arg1 = reinterpret_cast< Curve * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Curve_pointsEnd" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  {
+    try {
+      result = (arg1)->pointsEnd(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Interface0DIterator(static_cast< const Interface0DIterator& >(result))), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_pointsEnd__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Curve *arg1 = (Curve *) 0 ;
+  Interface0DIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Curve_pointsEnd",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Curve, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Curve_pointsEnd" "', argument " "1"" of type '" "Curve *""'"); 
+  }
+  arg1 = reinterpret_cast< Curve * >(argp1);
+  {
+    try {
+      result = (arg1)->pointsEnd();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Interface0DIterator(static_cast< const Interface0DIterator& >(result))), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_pointsEnd(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Curve, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Curve_pointsEnd__SWIG_1(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Curve, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_float(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_Curve_pointsEnd__SWIG_0(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Curve_pointsEnd'.\n  Possible C/C++ prototypes are:\n    pointsEnd(float)\n    pointsEnd()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *Curve_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Curve, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_StrokeVertexIterator__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_StrokeVertexIterator")) SWIG_fail;
+  {
+    try {
+      result = (StrokeInternal::StrokeVertexIterator *)new StrokeInternal::StrokeVertexIterator();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_StrokeVertexIterator__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = 0 ;
+  StrokeInternal::StrokeVertexIterator *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_StrokeVertexIterator",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_StrokeInternal__StrokeVertexIterator,  0  | 0);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_StrokeVertexIterator" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator const &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_StrokeVertexIterator" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator const &""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      result = (StrokeInternal::StrokeVertexIterator *)new StrokeInternal::StrokeVertexIterator((StrokeInternal::StrokeVertexIterator const &)*arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_StrokeVertexIterator__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke::vertex_container::iterator *arg1 = 0 ;
+  Stroke::vertex_container::iterator *arg2 = 0 ;
+  Stroke::vertex_container::iterator *arg3 = 0 ;
+  StrokeInternal::StrokeVertexIterator *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:new_StrokeVertexIterator",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_Stroke__vertex_container__iterator,  0  | 0);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_StrokeVertexIterator" "', argument " "1"" of type '" "Stroke::vertex_container::iterator const &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_StrokeVertexIterator" "', argument " "1"" of type '" "Stroke::vertex_container::iterator const &""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke::vertex_container::iterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Stroke__vertex_container__iterator,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_StrokeVertexIterator" "', argument " "2"" of type '" "Stroke::vertex_container::iterator const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_StrokeVertexIterator" "', argument " "2"" of type '" "Stroke::vertex_container::iterator const &""'"); 
+  }
+  arg2 = reinterpret_cast< Stroke::vertex_container::iterator * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_Stroke__vertex_container__iterator,  0  | 0);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_StrokeVertexIterator" "', argument " "3"" of type '" "Stroke::vertex_container::iterator const &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_StrokeVertexIterator" "', argument " "3"" of type '" "Stroke::vertex_container::iterator const &""'"); 
+  }
+  arg3 = reinterpret_cast< Stroke::vertex_container::iterator * >(argp3);
+  {
+    try {
+      result = (StrokeInternal::StrokeVertexIterator *)new StrokeInternal::StrokeVertexIterator((Stroke::vertex_container::iterator const &)*arg1,(Stroke::vertex_container::iterator const &)*arg2,(Stroke::vertex_container::iterator const &)*arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_StrokeVertexIterator(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_StrokeVertexIterator__SWIG_0(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_new_StrokeVertexIterator__SWIG_1(self, args);
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Stroke__vertex_container__iterator, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Stroke__vertex_container__iterator, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_Stroke__vertex_container__iterator, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          return _wrap_new_StrokeVertexIterator__SWIG_2(self, args);
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_StrokeVertexIterator'.\n  Possible C/C++ prototypes are:\n    StrokeInternal::StrokeVertexIterator()\n    StrokeInternal::StrokeVertexIterator(StrokeInternal::StrokeVertexIterator const &)\n    StrokeInternal::StrokeVertexIterator(Stroke::vertex_container::iterator const &,Stroke::vertex_container::iterator const &,Stroke::vertex_container::iterator const &)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_StrokeVertexIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_StrokeVertexIterator",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_StrokeVertexIterator" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_castToInterface0DIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  Interface0DIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_castToInterface0DIterator",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_castToInterface0DIterator" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      result = ((StrokeInternal::StrokeVertexIterator const *)arg1)->castToInterface0DIterator();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Interface0DIterator(static_cast< const Interface0DIterator& >(result))), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_getExactTypeName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_getExactTypeName" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      result = ((StrokeInternal::StrokeVertexIterator const *)arg1)->getExactTypeName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getObject(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  StrokeVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_getObject",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_getObject" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      {
+        StrokeVertex &_result_ref = (arg1)->operator *();
+        result = (StrokeVertex *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator___deref__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  StrokeVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator___deref__",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator___deref__" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      result = (StrokeVertex *)(arg1)->operator ->();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_increment(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_increment",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_increment" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      (arg1)->increment();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_decrement(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_decrement",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_decrement" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      (arg1)->decrement();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_isBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_isBegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_isBegin" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      result = (bool)((StrokeInternal::StrokeVertexIterator const *)arg1)->isBegin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_isEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_isEnd",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_isEnd" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      result = (bool)((StrokeInternal::StrokeVertexIterator const *)arg1)->isEnd();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  Interface0DIteratorNested *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertexIterator___eq__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator___eq__" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIteratorNested,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeVertexIterator___eq__" "', argument " "2"" of type '" "Interface0DIteratorNested const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "StrokeVertexIterator___eq__" "', argument " "2"" of type '" "Interface0DIteratorNested const &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0DIteratorNested * >(argp2);
+  {
+    try {
+      result = (bool)((StrokeInternal::StrokeVertexIterator const *)arg1)->operator ==((Interface0DIteratorNested const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_t(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_t",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_t" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      result = (float)((StrokeInternal::StrokeVertexIterator const *)arg1)->t();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_u(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_u",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_u" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      result = (float)((StrokeInternal::StrokeVertexIterator const *)arg1)->u();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_copy(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  StrokeInternal::StrokeVertexIterator *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_copy",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_copy" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      result = (StrokeInternal::StrokeVertexIterator *)((StrokeInternal::StrokeVertexIterator const *)arg1)->copy();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getIt(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  Stroke::vertex_container::iterator *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_getIt",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_getIt" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      {
+        Stroke::vertex_container::iterator const &_result_ref = (arg1)->getIt();
+        result = (Stroke::vertex_container::iterator *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Stroke__vertex_container__iterator, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_x(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_x",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_x" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->x();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_y(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_y",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_y" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->y();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getPoint(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  Geometry::Vec2f result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_getPoint",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_getPoint" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->getPoint();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_attribute__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  StrokeAttribute *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_attribute",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_attribute" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      {
+        StrokeAttribute const &_result_ref = (*arg1)->attribute();
+        result = (StrokeAttribute *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeAttribute, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_attribute__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  StrokeAttribute *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_attribute",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_attribute" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      {
+        StrokeAttribute &_result_ref = (*arg1)->attribute();
+        result = (StrokeAttribute *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeAttribute, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_attribute(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_StrokeVertexIterator_attribute__SWIG_1(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_StrokeVertexIterator_attribute__SWIG_0(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'StrokeVertexIterator_attribute'.\n  Possible C/C++ prototypes are:\n    attribute()\n    attribute()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_curvilinearAbscissa(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_curvilinearAbscissa",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_curvilinearAbscissa" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      result = (float)(*arg1)->curvilinearAbscissa();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_strokeLength(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_strokeLength",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_strokeLength" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      result = (float)(*arg1)->strokeLength();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  real arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertexIterator_SetX",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_SetX" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "StrokeVertexIterator_SetX" "', argument " "2"" of type '" "real""'");
+  } 
+  arg2 = static_cast< real >(val2);
+  {
+    try {
+      (*arg1)->SetX(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  real arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertexIterator_SetY",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_SetY" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "StrokeVertexIterator_SetY" "', argument " "2"" of type '" "real""'");
+  } 
+  arg2 = static_cast< real >(val2);
+  {
+    try {
+      (*arg1)->SetY(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetPoint__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  real arg2 ;
+  real arg3 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  double val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:StrokeVertexIterator_SetPoint",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_SetPoint" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "StrokeVertexIterator_SetPoint" "', argument " "2"" of type '" "real""'");
+  } 
+  arg2 = static_cast< real >(val2);
+  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "StrokeVertexIterator_SetPoint" "', argument " "3"" of type '" "real""'");
+  } 
+  arg3 = static_cast< real >(val3);
+  {
+    try {
+      (*arg1)->SetPoint(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetPoint__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  Geometry::Vec2f *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertexIterator_SetPoint",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_SetPoint" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeVertexIterator_SetPoint" "', argument " "2"" of type '" "Geometry::Vec2f const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "StrokeVertexIterator_SetPoint" "', argument " "2"" of type '" "Geometry::Vec2f const &""'"); 
+  }
+  arg2 = reinterpret_cast< Geometry::Vec2f * >(argp2);
+  {
+    try {
+      (*arg1)->SetPoint((Geometry::Vec2f const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetPoint(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_StrokeVertexIterator_SetPoint__SWIG_1(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_double(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        {
+          int res = SWIG_AsVal_double(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          return _wrap_StrokeVertexIterator_SetPoint__SWIG_0(self, args);
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'StrokeVertexIterator_SetPoint'.\n  Possible C/C++ prototypes are:\n    SetPoint(real,real)\n    SetPoint(Geometry::Vec2f const &)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetAttribute(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  StrokeAttribute *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertexIterator_SetAttribute",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_SetAttribute" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_StrokeAttribute,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeVertexIterator_SetAttribute" "', argument " "2"" of type '" "StrokeAttribute const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "StrokeVertexIterator_SetAttribute" "', argument " "2"" of type '" "StrokeAttribute const &""'"); 
+  }
+  arg2 = reinterpret_cast< StrokeAttribute * >(argp2);
+  {
+    try {
+      (*arg1)->SetAttribute((StrokeAttribute const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetCurvilinearAbscissa(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  float arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertexIterator_SetCurvilinearAbscissa",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_SetCurvilinearAbscissa" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "StrokeVertexIterator_SetCurvilinearAbscissa" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  {
+    try {
+      (*arg1)->SetCurvilinearAbscissa(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetStrokeLength(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  float arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertexIterator_SetStrokeLength",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_SetStrokeLength" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "StrokeVertexIterator_SetStrokeLength" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  {
+    try {
+      (*arg1)->SetStrokeLength(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_getX",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_getX" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->getX();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_getY",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_getY" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->getY();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_getZ",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_getZ" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->getZ();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  Geometry::Vec3f result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_getPoint3D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_getPoint3D" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->getPoint3D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getProjectedX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_getProjectedX",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_getProjectedX" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->getProjectedX();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getProjectedY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_getProjectedY",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_getProjectedY" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->getProjectedY();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getProjectedZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_getProjectedZ",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_getProjectedZ" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->getProjectedZ();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  Geometry::Vec2f result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_getPoint2D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_getPoint2D" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->getPoint2D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  Interface0D *arg2 = 0 ;
+  FEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertexIterator_getFEdge",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_getFEdge" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeVertexIterator_getFEdge" "', argument " "2"" of type '" "Interface0D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "StrokeVertexIterator_getFEdge" "', argument " "2"" of type '" "Interface0D &""'"); 
+  }
+  arg2 = reinterpret_cast< Interface0D * >(argp2);
+  {
+    try {
+      result = (FEdge *)(*arg1)->getFEdge(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FEdge, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  Id result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_getId",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_getId" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->getId();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Id(static_cast< const Id& >(result))), SWIGTYPE_p_Id, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  Nature::VertexNature result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_getNature",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_getNature" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      result = (Nature::VertexNature)(*arg1)->getNature();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_castToSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  SVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_castToSVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_castToSVertex" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      result = (SVertex *)(*arg1)->castToSVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_castToViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  ViewVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_castToViewVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_castToViewVertex" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      result = (ViewVertex *)(*arg1)->castToViewVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_castToNonTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  NonTVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_castToNonTVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_castToNonTVertex" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      result = (NonTVertex *)(*arg1)->castToNonTVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_NonTVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_castToTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  TVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_castToTVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_castToTVertex" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      result = (TVertex *)(*arg1)->castToTVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_TVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_A(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  SVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_A",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_A" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      result = (SVertex *)(*arg1)->A();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_B(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  SVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_B",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_B" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      result = (SVertex *)(*arg1)->B();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_t2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_t2d",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_t2d" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      result = (float)(*arg1)->t2d();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  SVertex *arg2 = (SVertex *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertexIterator_SetA",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_SetA" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeVertexIterator_SetA" "', argument " "2"" of type '" "SVertex *""'"); 
+  }
+  arg2 = reinterpret_cast< SVertex * >(argp2);
+  {
+    try {
+      (*arg1)->SetA(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  SVertex *arg2 = (SVertex *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertexIterator_SetB",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_SetB" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeVertexIterator_SetB" "', argument " "2"" of type '" "SVertex *""'"); 
+  }
+  arg2 = reinterpret_cast< SVertex * >(argp2);
+  {
+    try {
+      (*arg1)->SetB(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetT2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  float arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertexIterator_SetT2d",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_SetT2d" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "StrokeVertexIterator_SetT2d" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  {
+    try {
+      (*arg1)->SetT2d(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_fedge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  FEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_fedge",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_fedge" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      result = (FEdge *)(*arg1)->fedge();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FEdge, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_point2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  Geometry::Vec3r *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_point2d",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_point2d" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      {
+        Geometry::Vec3r const &_result_ref = (*arg1)->point2d();
+        result = (Geometry::Vec3r *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_point3d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  Geometry::Vec3r *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_point3d",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_point3d" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      {
+        Geometry::Vec3r const &_result_ref = (*arg1)->point3d();
+        result = (Geometry::Vec3r *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_normal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  Geometry::Vec3r result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_normal",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_normal" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->normal();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_shape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  SShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_shape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_shape" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      result = (SShape *)(*arg1)->shape();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SShape, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_occluders_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  occluder_container::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_occluders_begin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_occluders_begin" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->occluders_begin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new occluder_container::const_iterator(static_cast< const occluder_container::const_iterator& >(result))), SWIGTYPE_p_occluder_container__const_iterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_occluders_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  occluder_container::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_occluders_end",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_occluders_end" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->occluders_end();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new occluder_container::const_iterator(static_cast< const occluder_container::const_iterator& >(result))), SWIGTYPE_p_occluder_container__const_iterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_occluders_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_occluders_empty",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_occluders_empty" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      result = (bool)(*arg1)->occluders_empty();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_occluders_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_occluders_size",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_occluders_size" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      result = (int)(*arg1)->occluders_size();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_occludee(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  Polygon3r *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_occludee",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_occludee" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      {
+        Polygon3r const &_result_ref = (*arg1)->occludee();
+        result = (Polygon3r *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Polygon3r, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_occluded_shape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  SShape *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_occluded_shape",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_occluded_shape" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      result = (SShape *)(*arg1)->occluded_shape();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SShape, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_occludee_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_occludee_empty",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_occludee_empty" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      result = (bool)(*arg1)->occludee_empty();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_z_discontinuity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_z_discontinuity",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_z_discontinuity" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->z_discontinuity();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_curvatureFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_curvatureFredo",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_curvatureFredo" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      result = (real)(*arg1)->curvatureFredo();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_directionFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
+  Geometry::Vec2d result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertexIterator_directionFredo",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_directionFredo" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
+  {
+    try {
+      result = (*arg1)->directionFredo();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2d(static_cast< const Geometry::Vec2d& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *StrokeVertexIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_StrokeAttribute__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeAttribute *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_StrokeAttribute")) SWIG_fail;
+  {
+    try {
+      result = (StrokeAttribute *)new StrokeAttribute();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeAttribute, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_StrokeAttribute__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeAttribute *arg1 = 0 ;
+  StrokeAttribute *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_StrokeAttribute",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_StrokeAttribute,  0  | 0);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_StrokeAttribute" "', argument " "1"" of type '" "StrokeAttribute const &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_StrokeAttribute" "', argument " "1"" of type '" "StrokeAttribute const &""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeAttribute * >(argp1);
+  {
+    try {
+      result = (StrokeAttribute *)new StrokeAttribute((StrokeAttribute const &)*arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeAttribute, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_StrokeAttribute__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  float arg1 ;
+  float arg2 ;
+  float arg3 ;
+  float arg4 ;
+  float arg5 ;
+  float arg6 ;
+  StrokeAttribute *result = 0 ;
+  float val1 ;
+  int ecode1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  float val3 ;
+  int ecode3 = 0 ;
+  float val4 ;
+  int ecode4 = 0 ;
+  float val5 ;
+  int ecode5 = 0 ;
+  float val6 ;
+  int ecode6 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOOOO:new_StrokeAttribute",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  ecode1 = SWIG_AsVal_float(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_StrokeAttribute" "', argument " "1"" of type '" "float""'");
+  } 
+  arg1 = static_cast< float >(val1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_StrokeAttribute" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  ecode3 = SWIG_AsVal_float(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_StrokeAttribute" "', argument " "3"" of type '" "float""'");
+  } 
+  arg3 = static_cast< float >(val3);
+  ecode4 = SWIG_AsVal_float(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_StrokeAttribute" "', argument " "4"" of type '" "float""'");
+  } 
+  arg4 = static_cast< float >(val4);
+  ecode5 = SWIG_AsVal_float(obj4, &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_StrokeAttribute" "', argument " "5"" of type '" "float""'");
+  } 
+  arg5 = static_cast< float >(val5);
+  ecode6 = SWIG_AsVal_float(obj5, &val6);
+  if (!SWIG_IsOK(ecode6)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "new_StrokeAttribute" "', argument " "6"" of type '" "float""'");
+  } 
+  arg6 = static_cast< float >(val6);
+  {
+    try {
+      result = (StrokeAttribute *)new StrokeAttribute(arg1,arg2,arg3,arg4,arg5,arg6);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeAttribute, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_StrokeAttribute__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeAttribute *arg1 = 0 ;
+  StrokeAttribute *arg2 = 0 ;
+  float arg3 ;
+  StrokeAttribute *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  float val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:new_StrokeAttribute",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_StrokeAttribute,  0  | 0);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_StrokeAttribute" "', argument " "1"" of type '" "StrokeAttribute const &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_StrokeAttribute" "', argument " "1"" of type '" "StrokeAttribute const &""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeAttribute * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_StrokeAttribute,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_StrokeAttribute" "', argument " "2"" of type '" "StrokeAttribute const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_StrokeAttribute" "', argument " "2"" of type '" "StrokeAttribute const &""'"); 
+  }
+  arg2 = reinterpret_cast< StrokeAttribute * >(argp2);
+  ecode3 = SWIG_AsVal_float(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_StrokeAttribute" "', argument " "3"" of type '" "float""'");
+  } 
+  arg3 = static_cast< float >(val3);
+  {
+    try {
+      result = (StrokeAttribute *)new StrokeAttribute((StrokeAttribute const &)*arg1,(StrokeAttribute const &)*arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeAttribute, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_StrokeAttribute(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[7];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 6); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_StrokeAttribute__SWIG_0(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_StrokeAttribute, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_new_StrokeAttribute__SWIG_1(self, args);
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_StrokeAttribute, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_StrokeAttribute, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_float(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          return _wrap_new_StrokeAttribute__SWIG_3(self, args);
+        }
+      }
+    }
+  }
+  if (argc == 6) {
+    int _v;
+    {
+      int res = SWIG_AsVal_float(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      {
+        int res = SWIG_AsVal_float(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        {
+          int res = SWIG_AsVal_float(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          {
+            int res = SWIG_AsVal_float(argv[3], NULL);
+            _v = SWIG_CheckState(res);
+          }
+          if (_v) {
+            {
+              int res = SWIG_AsVal_float(argv[4], NULL);
+              _v = SWIG_CheckState(res);
+            }
+            if (_v) {
+              {
+                int res = SWIG_AsVal_float(argv[5], NULL);
+                _v = SWIG_CheckState(res);
+              }
+              if (_v) {
+                return _wrap_new_StrokeAttribute__SWIG_2(self, args);
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_StrokeAttribute'.\n  Possible C/C++ prototypes are:\n    StrokeAttribute()\n    StrokeAttribute(StrokeAttribute const &)\n    StrokeAttribute(float,float,float,float,float,float)\n    StrokeAttribute(StrokeAttribute const &,StrokeAttribute const &,float)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_StrokeAttribute(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeAttribute *arg1 = (StrokeAttribute *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_StrokeAttribute",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeAttribute, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_StrokeAttribute" "', argument " "1"" of type '" "StrokeAttribute *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeAttribute * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_getColor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeAttribute *arg1 = (StrokeAttribute *) 0 ;
+  float *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeAttribute_getColor",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeAttribute, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeAttribute_getColor" "', argument " "1"" of type '" "StrokeAttribute const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeAttribute * >(argp1);
+  {
+    try {
+      result = (float *)((StrokeAttribute const *)arg1)->getColor();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_float, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_getColorR(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeAttribute *arg1 = (StrokeAttribute *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeAttribute_getColorR",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeAttribute, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeAttribute_getColorR" "', argument " "1"" of type '" "StrokeAttribute const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeAttribute * >(argp1);
+  {
+    try {
+      result = (float)((StrokeAttribute const *)arg1)->getColorR();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_getColorG(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeAttribute *arg1 = (StrokeAttribute *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeAttribute_getColorG",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeAttribute, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeAttribute_getColorG" "', argument " "1"" of type '" "StrokeAttribute const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeAttribute * >(argp1);
+  {
+    try {
+      result = (float)((StrokeAttribute const *)arg1)->getColorG();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_getColorB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeAttribute *arg1 = (StrokeAttribute *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeAttribute_getColorB",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeAttribute, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeAttribute_getColorB" "', argument " "1"" of type '" "StrokeAttribute const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeAttribute * >(argp1);
+  {
+    try {
+      result = (float)((StrokeAttribute const *)arg1)->getColorB();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_getColorRGB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeAttribute *arg1 = (StrokeAttribute *) 0 ;
+  Geometry::Vec3f result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeAttribute_getColorRGB",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeAttribute, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeAttribute_getColorRGB" "', argument " "1"" of type '" "StrokeAttribute const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeAttribute * >(argp1);
+  {
+    try {
+      result = ((StrokeAttribute const *)arg1)->getColorRGB();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_getAlpha(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeAttribute *arg1 = (StrokeAttribute *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeAttribute_getAlpha",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeAttribute, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeAttribute_getAlpha" "', argument " "1"" of type '" "StrokeAttribute const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeAttribute * >(argp1);
+  {
+    try {
+      result = (float)((StrokeAttribute const *)arg1)->getAlpha();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_getThickness(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeAttribute *arg1 = (StrokeAttribute *) 0 ;
+  float *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeAttribute_getThickness",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeAttribute, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeAttribute_getThickness" "', argument " "1"" of type '" "StrokeAttribute const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeAttribute * >(argp1);
+  {
+    try {
+      result = (float *)((StrokeAttribute const *)arg1)->getThickness();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_float, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_getThicknessR(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeAttribute *arg1 = (StrokeAttribute *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeAttribute_getThicknessR",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeAttribute, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeAttribute_getThicknessR" "', argument " "1"" of type '" "StrokeAttribute const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeAttribute * >(argp1);
+  {
+    try {
+      result = (float)((StrokeAttribute const *)arg1)->getThicknessR();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_getThicknessL(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeAttribute *arg1 = (StrokeAttribute *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeAttribute_getThicknessL",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeAttribute, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeAttribute_getThicknessL" "', argument " "1"" of type '" "StrokeAttribute const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeAttribute * >(argp1);
+  {
+    try {
+      result = (float)((StrokeAttribute const *)arg1)->getThicknessL();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_getThicknessRL(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeAttribute *arg1 = (StrokeAttribute *) 0 ;
+  Geometry::Vec2f result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeAttribute_getThicknessRL",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeAttribute, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeAttribute_getThicknessRL" "', argument " "1"" of type '" "StrokeAttribute const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeAttribute * >(argp1);
+  {
+    try {
+      result = ((StrokeAttribute const *)arg1)->getThicknessRL();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_isVisible(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeAttribute *arg1 = (StrokeAttribute *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeAttribute_isVisible",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeAttribute, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeAttribute_isVisible" "', argument " "1"" of type '" "StrokeAttribute const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeAttribute * >(argp1);
+  {
+    try {
+      result = (bool)((StrokeAttribute const *)arg1)->isVisible();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_getAttributeReal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeAttribute *arg1 = (StrokeAttribute *) 0 ;
+  char *arg2 = (char *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeAttribute_getAttributeReal",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeAttribute, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeAttribute_getAttributeReal" "', argument " "1"" of type '" "StrokeAttribute const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeAttribute * >(argp1);
+  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeAttribute_getAttributeReal" "', argument " "2"" of type '" "char const *""'");
+  }
+  arg2 = reinterpret_cast< char * >(buf2);
+  {
+    try {
+      result = (float)((StrokeAttribute const *)arg1)->getAttributeReal((char const *)arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  return resultobj;
+fail:
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_getAttributeVec2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeAttribute *arg1 = (StrokeAttribute *) 0 ;
+  char *arg2 = (char *) 0 ;
+  Geometry::Vec2f result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeAttribute_getAttributeVec2f",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeAttribute, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeAttribute_getAttributeVec2f" "', argument " "1"" of type '" "StrokeAttribute const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeAttribute * >(argp1);
+  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeAttribute_getAttributeVec2f" "', argument " "2"" of type '" "char const *""'");
+  }
+  arg2 = reinterpret_cast< char * >(buf2);
+  {
+    try {
+      result = ((StrokeAttribute const *)arg1)->getAttributeVec2f((char const *)arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  return resultobj;
+fail:
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_getAttributeVec3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeAttribute *arg1 = (StrokeAttribute *) 0 ;
+  char *arg2 = (char *) 0 ;
+  Geometry::Vec3f result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeAttribute_getAttributeVec3f",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeAttribute, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeAttribute_getAttributeVec3f" "', argument " "1"" of type '" "StrokeAttribute const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeAttribute * >(argp1);
+  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeAttribute_getAttributeVec3f" "', argument " "2"" of type '" "char const *""'");
+  }
+  arg2 = reinterpret_cast< char * >(buf2);
+  {
+    try {
+      result = ((StrokeAttribute const *)arg1)->getAttributeVec3f((char const *)arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  return resultobj;
+fail:
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_isAttributeAvailableReal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeAttribute *arg1 = (StrokeAttribute *) 0 ;
+  char *arg2 = (char *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeAttribute_isAttributeAvailableReal",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeAttribute, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeAttribute_isAttributeAvailableReal" "', argument " "1"" of type '" "StrokeAttribute const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeAttribute * >(argp1);
+  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeAttribute_isAttributeAvailableReal" "', argument " "2"" of type '" "char const *""'");
+  }
+  arg2 = reinterpret_cast< char * >(buf2);
+  {
+    try {
+      result = (bool)((StrokeAttribute const *)arg1)->isAttributeAvailableReal((char const *)arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  return resultobj;
+fail:
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_isAttributeAvailableVec2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeAttribute *arg1 = (StrokeAttribute *) 0 ;
+  char *arg2 = (char *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeAttribute_isAttributeAvailableVec2f",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeAttribute, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeAttribute_isAttributeAvailableVec2f" "', argument " "1"" of type '" "StrokeAttribute const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeAttribute * >(argp1);
+  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeAttribute_isAttributeAvailableVec2f" "', argument " "2"" of type '" "char const *""'");
+  }
+  arg2 = reinterpret_cast< char * >(buf2);
+  {
+    try {
+      result = (bool)((StrokeAttribute const *)arg1)->isAttributeAvailableVec2f((char const *)arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  return resultobj;
+fail:
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_isAttributeAvailableVec3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeAttribute *arg1 = (StrokeAttribute *) 0 ;
+  char *arg2 = (char *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeAttribute_isAttributeAvailableVec3f",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeAttribute, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeAttribute_isAttributeAvailableVec3f" "', argument " "1"" of type '" "StrokeAttribute const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeAttribute * >(argp1);
+  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeAttribute_isAttributeAvailableVec3f" "', argument " "2"" of type '" "char const *""'");
+  }
+  arg2 = reinterpret_cast< char * >(buf2);
+  {
+    try {
+      result = (bool)((StrokeAttribute const *)arg1)->isAttributeAvailableVec3f((char const *)arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  return resultobj;
+fail:
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_setColor__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeAttribute *arg1 = (StrokeAttribute *) 0 ;
+  float arg2 ;
+  float arg3 ;
+  float arg4 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  float val3 ;
+  int ecode3 = 0 ;
+  float val4 ;
+  int ecode4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOO:StrokeAttribute_setColor",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeAttribute, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeAttribute_setColor" "', argument " "1"" of type '" "StrokeAttribute *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeAttribute * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "StrokeAttribute_setColor" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  ecode3 = SWIG_AsVal_float(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "StrokeAttribute_setColor" "', argument " "3"" of type '" "float""'");
+  } 
+  arg3 = static_cast< float >(val3);
+  ecode4 = SWIG_AsVal_float(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "StrokeAttribute_setColor" "', argument " "4"" of type '" "float""'");
+  } 
+  arg4 = static_cast< float >(val4);
+  {
+    try {
+      (arg1)->setColor(arg2,arg3,arg4);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_setColor__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeAttribute *arg1 = (StrokeAttribute *) 0 ;
+  Geometry::Vec3f *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeAttribute_setColor",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeAttribute, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeAttribute_setColor" "', argument " "1"" of type '" "StrokeAttribute *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeAttribute * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tfloat_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeAttribute_setColor" "', argument " "2"" of type '" "Geometry::Vec3f const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "StrokeAttribute_setColor" "', argument " "2"" of type '" "Geometry::Vec3f const &""'"); 
+  }
+  arg2 = reinterpret_cast< Geometry::Vec3f * >(argp2);
+  {
+    try {
+      (arg1)->setColor((Geometry::Vec3f const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_setColor(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[5];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 4); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_StrokeAttribute, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_StrokeAttribute_setColor__SWIG_1(self, args);
+      }
+    }
+  }
+  if (argc == 4) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_StrokeAttribute, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_float(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        {
+          int res = SWIG_AsVal_float(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          {
+            int res = SWIG_AsVal_float(argv[3], NULL);
+            _v = SWIG_CheckState(res);
+          }
+          if (_v) {
+            return _wrap_StrokeAttribute_setColor__SWIG_0(self, args);
+          }
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'StrokeAttribute_setColor'.\n  Possible C/C++ prototypes are:\n    setColor(float,float,float)\n    setColor(Geometry::Vec3f const &)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_setAlpha(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeAttribute *arg1 = (StrokeAttribute *) 0 ;
+  float arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeAttribute_setAlpha",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeAttribute, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeAttribute_setAlpha" "', argument " "1"" of type '" "StrokeAttribute *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeAttribute * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "StrokeAttribute_setAlpha" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  {
+    try {
+      (arg1)->setAlpha(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_setThickness__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeAttribute *arg1 = (StrokeAttribute *) 0 ;
+  float arg2 ;
+  float arg3 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  float val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:StrokeAttribute_setThickness",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeAttribute, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeAttribute_setThickness" "', argument " "1"" of type '" "StrokeAttribute *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeAttribute * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "StrokeAttribute_setThickness" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  ecode3 = SWIG_AsVal_float(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "StrokeAttribute_setThickness" "', argument " "3"" of type '" "float""'");
+  } 
+  arg3 = static_cast< float >(val3);
+  {
+    try {
+      (arg1)->setThickness(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_setThickness__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeAttribute *arg1 = (StrokeAttribute *) 0 ;
+  Geometry::Vec2f *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeAttribute_setThickness",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeAttribute, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeAttribute_setThickness" "', argument " "1"" of type '" "StrokeAttribute *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeAttribute * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeAttribute_setThickness" "', argument " "2"" of type '" "Geometry::Vec2f const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "StrokeAttribute_setThickness" "', argument " "2"" of type '" "Geometry::Vec2f const &""'"); 
+  }
+  arg2 = reinterpret_cast< Geometry::Vec2f * >(argp2);
+  {
+    try {
+      (arg1)->setThickness((Geometry::Vec2f const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_setThickness(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_StrokeAttribute, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_StrokeAttribute_setThickness__SWIG_1(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_StrokeAttribute, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_float(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        {
+          int res = SWIG_AsVal_float(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          return _wrap_StrokeAttribute_setThickness__SWIG_0(self, args);
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'StrokeAttribute_setThickness'.\n  Possible C/C++ prototypes are:\n    setThickness(float,float)\n    setThickness(Geometry::Vec2f const &)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_SetVisible(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeAttribute *arg1 = (StrokeAttribute *) 0 ;
+  bool arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeAttribute_SetVisible",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeAttribute, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeAttribute_SetVisible" "', argument " "1"" of type '" "StrokeAttribute *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeAttribute * >(argp1);
+  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "StrokeAttribute_SetVisible" "', argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = static_cast< bool >(val2);
+  {
+    try {
+      (arg1)->SetVisible(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_setAttributeReal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeAttribute *arg1 = (StrokeAttribute *) 0 ;
+  char *arg2 = (char *) 0 ;
+  float arg3 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  float val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:StrokeAttribute_setAttributeReal",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeAttribute, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeAttribute_setAttributeReal" "', argument " "1"" of type '" "StrokeAttribute *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeAttribute * >(argp1);
+  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeAttribute_setAttributeReal" "', argument " "2"" of type '" "char const *""'");
+  }
+  arg2 = reinterpret_cast< char * >(buf2);
+  ecode3 = SWIG_AsVal_float(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "StrokeAttribute_setAttributeReal" "', argument " "3"" of type '" "float""'");
+  } 
+  arg3 = static_cast< float >(val3);
+  {
+    try {
+      (arg1)->setAttributeReal((char const *)arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  return resultobj;
+fail:
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_setAttributeVec2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeAttribute *arg1 = (StrokeAttribute *) 0 ;
+  char *arg2 = (char *) 0 ;
+  Geometry::Vec2f *arg3 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:StrokeAttribute_setAttributeVec2f",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeAttribute, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeAttribute_setAttributeVec2f" "', argument " "1"" of type '" "StrokeAttribute *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeAttribute * >(argp1);
+  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeAttribute_setAttributeVec2f" "', argument " "2"" of type '" "char const *""'");
+  }
+  arg2 = reinterpret_cast< char * >(buf2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0  | 0);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "StrokeAttribute_setAttributeVec2f" "', argument " "3"" of type '" "Geometry::Vec2f const &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "StrokeAttribute_setAttributeVec2f" "', argument " "3"" of type '" "Geometry::Vec2f const &""'"); 
+  }
+  arg3 = reinterpret_cast< Geometry::Vec2f * >(argp3);
+  {
+    try {
+      (arg1)->setAttributeVec2f((char const *)arg2,(Geometry::Vec2f const &)*arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  return resultobj;
+fail:
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_setAttributeVec3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeAttribute *arg1 = (StrokeAttribute *) 0 ;
+  char *arg2 = (char *) 0 ;
+  Geometry::Vec3f *arg3 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:StrokeAttribute_setAttributeVec3f",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeAttribute, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeAttribute_setAttributeVec3f" "', argument " "1"" of type '" "StrokeAttribute *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeAttribute * >(argp1);
+  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeAttribute_setAttributeVec3f" "', argument " "2"" of type '" "char const *""'");
+  }
+  arg2 = reinterpret_cast< char * >(buf2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec3Tfloat_t,  0  | 0);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "StrokeAttribute_setAttributeVec3f" "', argument " "3"" of type '" "Geometry::Vec3f const &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "StrokeAttribute_setAttributeVec3f" "', argument " "3"" of type '" "Geometry::Vec3f const &""'"); 
+  }
+  arg3 = reinterpret_cast< Geometry::Vec3f * >(argp3);
+  {
+    try {
+      (arg1)->setAttributeVec3f((char const *)arg2,(Geometry::Vec3f const &)*arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  return resultobj;
+fail:
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *StrokeAttribute_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_StrokeAttribute, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_StrokeVertex_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeVertex *arg1 = (StrokeVertex *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertex_getExactTypeName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertex_getExactTypeName" "', argument " "1"" of type '" "StrokeVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeVertex * >(argp1);
+  {
+    try {
+      result = ((StrokeVertex const *)arg1)->getExactTypeName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_StrokeVertex__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeVertex *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_StrokeVertex")) SWIG_fail;
+  {
+    try {
+      result = (StrokeVertex *)new StrokeVertex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeVertex, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_StrokeVertex__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeVertex *arg1 = 0 ;
+  StrokeVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_StrokeVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_StrokeVertex,  0  | 0);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_StrokeVertex" "', argument " "1"" of type '" "StrokeVertex const &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_StrokeVertex" "', argument " "1"" of type '" "StrokeVertex const &""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeVertex * >(argp1);
+  {
+    try {
+      result = (StrokeVertex *)new StrokeVertex((StrokeVertex const &)*arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeVertex, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_StrokeVertex__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  StrokeVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_StrokeVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_StrokeVertex" "', argument " "1"" of type '" "SVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  {
+    try {
+      result = (StrokeVertex *)new StrokeVertex(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeVertex, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_StrokeVertex__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurvePoint *arg1 = (CurvePoint *) 0 ;
+  StrokeVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_StrokeVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurvePoint, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_StrokeVertex" "', argument " "1"" of type '" "CurvePoint *""'"); 
+  }
+  arg1 = reinterpret_cast< CurvePoint * >(argp1);
+  {
+    try {
+      result = (StrokeVertex *)new StrokeVertex(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeVertex, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_StrokeVertex__SWIG_4(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeVertex *arg1 = (StrokeVertex *) 0 ;
+  StrokeVertex *arg2 = (StrokeVertex *) 0 ;
+  float arg3 ;
+  StrokeVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  float val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:new_StrokeVertex",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_StrokeVertex" "', argument " "1"" of type '" "StrokeVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_StrokeVertex, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_StrokeVertex" "', argument " "2"" of type '" "StrokeVertex *""'"); 
+  }
+  arg2 = reinterpret_cast< StrokeVertex * >(argp2);
+  ecode3 = SWIG_AsVal_float(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_StrokeVertex" "', argument " "3"" of type '" "float""'");
+  } 
+  arg3 = static_cast< float >(val3);
+  {
+    try {
+      result = (StrokeVertex *)new StrokeVertex(arg1,arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeVertex, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_StrokeVertex__SWIG_5(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SVertex *arg1 = (SVertex *) 0 ;
+  StrokeAttribute *arg2 = 0 ;
+  StrokeVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_StrokeVertex",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_StrokeVertex" "', argument " "1"" of type '" "SVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< SVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_StrokeAttribute,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_StrokeVertex" "', argument " "2"" of type '" "StrokeAttribute const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_StrokeVertex" "', argument " "2"" of type '" "StrokeAttribute const &""'"); 
+  }
+  arg2 = reinterpret_cast< StrokeAttribute * >(argp2);
+  {
+    try {
+      result = (StrokeVertex *)new StrokeVertex(arg1,(StrokeAttribute const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeVertex, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_StrokeVertex(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_StrokeVertex__SWIG_0(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_StrokeVertex, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_new_StrokeVertex__SWIG_1(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_SVertex, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_new_StrokeVertex__SWIG_2(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CurvePoint, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_new_StrokeVertex__SWIG_3(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_SVertex, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_StrokeAttribute, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_new_StrokeVertex__SWIG_5(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_StrokeVertex, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_StrokeVertex, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_float(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          return _wrap_new_StrokeVertex__SWIG_4(self, args);
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_StrokeVertex'.\n  Possible C/C++ prototypes are:\n    StrokeVertex()\n    StrokeVertex(StrokeVertex const &)\n    StrokeVertex(SVertex *)\n    StrokeVertex(CurvePoint *)\n    StrokeVertex(StrokeVertex *,StrokeVertex *,float)\n    StrokeVertex(SVertex *,StrokeAttribute const &)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_StrokeVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeVertex *arg1 = (StrokeVertex *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_StrokeVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeVertex, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_StrokeVertex" "', argument " "1"" of type '" "StrokeVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeVertex * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertex_x(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeVertex *arg1 = (StrokeVertex *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertex_x",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertex_x" "', argument " "1"" of type '" "StrokeVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeVertex * >(argp1);
+  {
+    try {
+      result = (real)((StrokeVertex const *)arg1)->x();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertex_y(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeVertex *arg1 = (StrokeVertex *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertex_y",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertex_y" "', argument " "1"" of type '" "StrokeVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeVertex * >(argp1);
+  {
+    try {
+      result = (real)((StrokeVertex const *)arg1)->y();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertex_getPoint(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeVertex *arg1 = (StrokeVertex *) 0 ;
+  Geometry::Vec2f result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertex_getPoint",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertex_getPoint" "', argument " "1"" of type '" "StrokeVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeVertex * >(argp1);
+  {
+    try {
+      result = (arg1)->getPoint();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertex_attribute__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeVertex *arg1 = (StrokeVertex *) 0 ;
+  StrokeAttribute *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertex_attribute",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertex_attribute" "', argument " "1"" of type '" "StrokeVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeVertex * >(argp1);
+  {
+    try {
+      {
+        StrokeAttribute const &_result_ref = ((StrokeVertex const *)arg1)->attribute();
+        result = (StrokeAttribute *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeAttribute, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertex_attribute__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeVertex *arg1 = (StrokeVertex *) 0 ;
+  StrokeAttribute *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertex_attribute",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertex_attribute" "', argument " "1"" of type '" "StrokeVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeVertex * >(argp1);
+  {
+    try {
+      {
+        StrokeAttribute &_result_ref = (arg1)->attribute();
+        result = (StrokeAttribute *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeAttribute, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertex_attribute(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_StrokeVertex, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_StrokeVertex_attribute__SWIG_1(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_StrokeVertex, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_StrokeVertex_attribute__SWIG_0(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'StrokeVertex_attribute'.\n  Possible C/C++ prototypes are:\n    attribute()\n    attribute()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertex_curvilinearAbscissa(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeVertex *arg1 = (StrokeVertex *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertex_curvilinearAbscissa",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertex_curvilinearAbscissa" "', argument " "1"" of type '" "StrokeVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeVertex * >(argp1);
+  {
+    try {
+      result = (float)((StrokeVertex const *)arg1)->curvilinearAbscissa();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertex_strokeLength(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeVertex *arg1 = (StrokeVertex *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertex_strokeLength",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertex_strokeLength" "', argument " "1"" of type '" "StrokeVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeVertex * >(argp1);
+  {
+    try {
+      result = (float)((StrokeVertex const *)arg1)->strokeLength();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertex_u(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeVertex *arg1 = (StrokeVertex *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeVertex_u",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertex_u" "', argument " "1"" of type '" "StrokeVertex const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeVertex * >(argp1);
+  {
+    try {
+      result = (float)((StrokeVertex const *)arg1)->u();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertex_SetX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeVertex *arg1 = (StrokeVertex *) 0 ;
+  real arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertex_SetX",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertex_SetX" "', argument " "1"" of type '" "StrokeVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeVertex * >(argp1);
+  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "StrokeVertex_SetX" "', argument " "2"" of type '" "real""'");
+  } 
+  arg2 = static_cast< real >(val2);
+  {
+    try {
+      (arg1)->SetX(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertex_SetY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeVertex *arg1 = (StrokeVertex *) 0 ;
+  real arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertex_SetY",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertex_SetY" "', argument " "1"" of type '" "StrokeVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeVertex * >(argp1);
+  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "StrokeVertex_SetY" "', argument " "2"" of type '" "real""'");
+  } 
+  arg2 = static_cast< real >(val2);
+  {
+    try {
+      (arg1)->SetY(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertex_SetPoint__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeVertex *arg1 = (StrokeVertex *) 0 ;
+  real arg2 ;
+  real arg3 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  double val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:StrokeVertex_SetPoint",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertex_SetPoint" "', argument " "1"" of type '" "StrokeVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeVertex * >(argp1);
+  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "StrokeVertex_SetPoint" "', argument " "2"" of type '" "real""'");
+  } 
+  arg2 = static_cast< real >(val2);
+  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "StrokeVertex_SetPoint" "', argument " "3"" of type '" "real""'");
+  } 
+  arg3 = static_cast< real >(val3);
+  {
+    try {
+      (arg1)->SetPoint(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertex_SetPoint__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeVertex *arg1 = (StrokeVertex *) 0 ;
+  Geometry::Vec2f *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertex_SetPoint",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertex_SetPoint" "', argument " "1"" of type '" "StrokeVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeVertex_SetPoint" "', argument " "2"" of type '" "Geometry::Vec2f const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "StrokeVertex_SetPoint" "', argument " "2"" of type '" "Geometry::Vec2f const &""'"); 
+  }
+  arg2 = reinterpret_cast< Geometry::Vec2f * >(argp2);
+  {
+    try {
+      (arg1)->SetPoint((Geometry::Vec2f const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertex_SetPoint(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_StrokeVertex, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_StrokeVertex_SetPoint__SWIG_1(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_StrokeVertex, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_double(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        {
+          int res = SWIG_AsVal_double(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          return _wrap_StrokeVertex_SetPoint__SWIG_0(self, args);
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'StrokeVertex_SetPoint'.\n  Possible C/C++ prototypes are:\n    SetPoint(real,real)\n    SetPoint(Geometry::Vec2f const &)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertex_SetAttribute(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeVertex *arg1 = (StrokeVertex *) 0 ;
+  StrokeAttribute *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertex_SetAttribute",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertex_SetAttribute" "', argument " "1"" of type '" "StrokeVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeVertex * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_StrokeAttribute,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeVertex_SetAttribute" "', argument " "2"" of type '" "StrokeAttribute const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "StrokeVertex_SetAttribute" "', argument " "2"" of type '" "StrokeAttribute const &""'"); 
+  }
+  arg2 = reinterpret_cast< StrokeAttribute * >(argp2);
+  {
+    try {
+      (arg1)->SetAttribute((StrokeAttribute const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertex_SetCurvilinearAbscissa(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeVertex *arg1 = (StrokeVertex *) 0 ;
+  float arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertex_SetCurvilinearAbscissa",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertex_SetCurvilinearAbscissa" "', argument " "1"" of type '" "StrokeVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeVertex * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "StrokeVertex_SetCurvilinearAbscissa" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  {
+    try {
+      (arg1)->SetCurvilinearAbscissa(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertex_SetStrokeLength(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeVertex *arg1 = (StrokeVertex *) 0 ;
+  float arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertex_SetStrokeLength",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeVertex, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertex_SetStrokeLength" "', argument " "1"" of type '" "StrokeVertex *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeVertex * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "StrokeVertex_SetStrokeLength" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  {
+    try {
+      (arg1)->SetStrokeLength(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *StrokeVertex_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_StrokeVertex, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_Stroke_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Stroke_getExactTypeName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_getExactTypeName" "', argument " "1"" of type '" "Stroke const *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  {
+    try {
+      result = ((Stroke const *)arg1)->getExactTypeName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  Id result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Stroke_getId",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_getId" "', argument " "1"" of type '" "Stroke const *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  {
+    try {
+      result = ((Stroke const *)arg1)->getId();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Id(static_cast< const Id& >(result))), SWIGTYPE_p_Id, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Stroke__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_Stroke")) SWIG_fail;
+  {
+    try {
+      result = (Stroke *)new Stroke();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Stroke, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Stroke__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = 0 ;
+  Stroke *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_Stroke",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_Stroke,  0  | 0);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_Stroke" "', argument " "1"" of type '" "Stroke const &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_Stroke" "', argument " "1"" of type '" "Stroke const &""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  {
+    try {
+      result = (Stroke *)new Stroke((Stroke const &)*arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Stroke, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Stroke(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_Stroke__SWIG_0(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Stroke, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_new_Stroke__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Stroke'.\n  Possible C/C++ prototypes are:\n    Stroke()\n    Stroke(Stroke const &)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_Stroke(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_Stroke",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Stroke" "', argument " "1"" of type '" "Stroke *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_ComputeSampling(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  int arg2 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Stroke_ComputeSampling",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_ComputeSampling" "', argument " "1"" of type '" "Stroke *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Stroke_ComputeSampling" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  {
+    try {
+      result = (float)(arg1)->ComputeSampling(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_Resample__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Stroke_Resample",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_Resample" "', argument " "1"" of type '" "Stroke *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Stroke_Resample" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  {
+    try {
+      (arg1)->Resample(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_Resample__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  float arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Stroke_Resample",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_Resample" "', argument " "1"" of type '" "Stroke *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Stroke_Resample" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  {
+    try {
+      (arg1)->Resample(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_Resample(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Stroke, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_Stroke_Resample__SWIG_0(self, args);
+      }
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Stroke, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_float(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_Stroke_Resample__SWIG_1(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_Resample'.\n  Possible C/C++ prototypes are:\n    Resample(int)\n    Resample(float)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_RemoveVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  StrokeVertex *arg2 = (StrokeVertex *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Stroke_RemoveVertex",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_RemoveVertex" "', argument " "1"" of type '" "Stroke *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_StrokeVertex, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Stroke_RemoveVertex" "', argument " "2"" of type '" "StrokeVertex *""'"); 
+  }
+  arg2 = reinterpret_cast< StrokeVertex * >(argp2);
+  {
+    try {
+      (arg1)->RemoveVertex(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_InsertVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  StrokeVertex *arg2 = (StrokeVertex *) 0 ;
+  StrokeInternal::StrokeVertexIterator arg3 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:Stroke_InsertVertex",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_InsertVertex" "', argument " "1"" of type '" "Stroke *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_StrokeVertex, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Stroke_InsertVertex" "', argument " "2"" of type '" "StrokeVertex *""'"); 
+  }
+  arg2 = reinterpret_cast< StrokeVertex * >(argp2);
+  {
+    res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_StrokeInternal__StrokeVertexIterator,  0  | 0);
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Stroke_InsertVertex" "', argument " "3"" of type '" "StrokeInternal::StrokeVertexIterator""'"); 
+    }  
+    if (!argp3) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Stroke_InsertVertex" "', argument " "3"" of type '" "StrokeInternal::StrokeVertexIterator""'");
+    } else {
+      StrokeInternal::StrokeVertexIterator * temp = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp3);
+      arg3 = *temp;
+      if (SWIG_IsNewObj(res3)) delete temp;
+    }
+  }
+  {
+    try {
+      (arg1)->InsertVertex(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_Render(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  StrokeRenderer *arg2 = (StrokeRenderer *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Stroke_Render",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_Render" "', argument " "1"" of type '" "Stroke *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_StrokeRenderer, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Stroke_Render" "', argument " "2"" of type '" "StrokeRenderer const *""'"); 
+  }
+  arg2 = reinterpret_cast< StrokeRenderer * >(argp2);
+  {
+    try {
+      (arg1)->Render((StrokeRenderer const *)arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_RenderBasic(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  StrokeRenderer *arg2 = (StrokeRenderer *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Stroke_RenderBasic",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_RenderBasic" "', argument " "1"" of type '" "Stroke *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_StrokeRenderer, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Stroke_RenderBasic" "', argument " "2"" of type '" "StrokeRenderer const *""'"); 
+  }
+  arg2 = reinterpret_cast< StrokeRenderer * >(argp2);
+  {
+    try {
+      (arg1)->RenderBasic((StrokeRenderer const *)arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_getLength2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Stroke_getLength2D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_getLength2D" "', argument " "1"" of type '" "Stroke const *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  {
+    try {
+      result = (real)((Stroke const *)arg1)->getLength2D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_getMediumType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  Stroke::MediumType result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Stroke_getMediumType",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_getMediumType" "', argument " "1"" of type '" "Stroke const *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  {
+    try {
+      result = (Stroke::MediumType)((Stroke const *)arg1)->getMediumType();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_getTextureId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  unsigned int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Stroke_getTextureId",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_getTextureId" "', argument " "1"" of type '" "Stroke *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  {
+    try {
+      result = (unsigned int)(arg1)->getTextureId();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_hasTips(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Stroke_hasTips",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_hasTips" "', argument " "1"" of type '" "Stroke const *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  {
+    try {
+      result = (bool)((Stroke const *)arg1)->hasTips();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_vertices_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Stroke_vertices_size",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_vertices_size" "', argument " "1"" of type '" "Stroke const *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  {
+    try {
+      result = (int)((Stroke const *)arg1)->vertices_size();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_viewedges_begin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  Stroke::viewedge_container::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Stroke_viewedges_begin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_viewedges_begin" "', argument " "1"" of type '" "Stroke const *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  {
+    try {
+      result = ((Stroke const *)arg1)->viewedges_begin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Stroke::viewedge_container::const_iterator(static_cast< const Stroke::viewedge_container::const_iterator& >(result))), SWIGTYPE_p_Stroke__viewedge_container__const_iterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_viewedges_begin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  Stroke::viewedge_container::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Stroke_viewedges_begin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_viewedges_begin" "', argument " "1"" of type '" "Stroke *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  {
+    try {
+      result = (arg1)->viewedges_begin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Stroke::viewedge_container::iterator(static_cast< const Stroke::viewedge_container::iterator& >(result))), SWIGTYPE_p_Stroke__viewedge_container__iterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_viewedges_begin(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Stroke, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Stroke_viewedges_begin__SWIG_1(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Stroke, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Stroke_viewedges_begin__SWIG_0(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_viewedges_begin'.\n  Possible C/C++ prototypes are:\n    viewedges_begin()\n    viewedges_begin()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_viewedges_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  Stroke::viewedge_container::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Stroke_viewedges_end",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_viewedges_end" "', argument " "1"" of type '" "Stroke const *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  {
+    try {
+      result = ((Stroke const *)arg1)->viewedges_end();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Stroke::viewedge_container::const_iterator(static_cast< const Stroke::viewedge_container::const_iterator& >(result))), SWIGTYPE_p_Stroke__viewedge_container__const_iterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_viewedges_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  Stroke::viewedge_container::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Stroke_viewedges_end",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_viewedges_end" "', argument " "1"" of type '" "Stroke *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  {
+    try {
+      result = (arg1)->viewedges_end();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Stroke::viewedge_container::iterator(static_cast< const Stroke::viewedge_container::iterator& >(result))), SWIGTYPE_p_Stroke__viewedge_container__iterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_viewedges_end(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Stroke, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Stroke_viewedges_end__SWIG_1(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Stroke, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Stroke_viewedges_end__SWIG_0(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_viewedges_end'.\n  Possible C/C++ prototypes are:\n    viewedges_end()\n    viewedges_end()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_viewedges_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Stroke_viewedges_size",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_viewedges_size" "', argument " "1"" of type '" "Stroke const *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  {
+    try {
+      result = (int)((Stroke const *)arg1)->viewedges_size();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_getBeginningOrientation(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  Geometry::Vec2r result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Stroke_getBeginningOrientation",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_getBeginningOrientation" "', argument " "1"" of type '" "Stroke const *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  {
+    try {
+      result = ((Stroke const *)arg1)->getBeginningOrientation();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2r(static_cast< const Geometry::Vec2r& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_getBeginningOrientationX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Stroke_getBeginningOrientationX",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_getBeginningOrientationX" "', argument " "1"" of type '" "Stroke const *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  {
+    try {
+      result = (real)((Stroke const *)arg1)->getBeginningOrientationX();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_getBeginningOrientationY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Stroke_getBeginningOrientationY",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_getBeginningOrientationY" "', argument " "1"" of type '" "Stroke const *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  {
+    try {
+      result = (real)((Stroke const *)arg1)->getBeginningOrientationY();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_getEndingOrientation(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  Geometry::Vec2r result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Stroke_getEndingOrientation",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_getEndingOrientation" "', argument " "1"" of type '" "Stroke const *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  {
+    try {
+      result = ((Stroke const *)arg1)->getEndingOrientation();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2r(static_cast< const Geometry::Vec2r& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_getEndingOrientationX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Stroke_getEndingOrientationX",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_getEndingOrientationX" "', argument " "1"" of type '" "Stroke const *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  {
+    try {
+      result = (real)((Stroke const *)arg1)->getEndingOrientationX();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_getEndingOrientationY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  real result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Stroke_getEndingOrientationY",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_getEndingOrientationY" "', argument " "1"" of type '" "Stroke const *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  {
+    try {
+      result = (real)((Stroke const *)arg1)->getEndingOrientationY();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_SetId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  Id *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Stroke_SetId",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_SetId" "', argument " "1"" of type '" "Stroke *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Id,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Stroke_SetId" "', argument " "2"" of type '" "Id const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Stroke_SetId" "', argument " "2"" of type '" "Id const &""'"); 
+  }
+  arg2 = reinterpret_cast< Id * >(argp2);
+  {
+    try {
+      (arg1)->SetId((Id const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_SetLength(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  float arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Stroke_SetLength",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_SetLength" "', argument " "1"" of type '" "Stroke *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Stroke_SetLength" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  {
+    try {
+      (arg1)->SetLength(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_SetMediumType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  Stroke::MediumType arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Stroke_SetMediumType",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_SetMediumType" "', argument " "1"" of type '" "Stroke *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Stroke_SetMediumType" "', argument " "2"" of type '" "Stroke::MediumType""'");
+  } 
+  arg2 = static_cast< Stroke::MediumType >(val2);
+  {
+    try {
+      (arg1)->SetMediumType(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_SetTextureId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  unsigned int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Stroke_SetTextureId",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_SetTextureId" "', argument " "1"" of type '" "Stroke *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Stroke_SetTextureId" "', argument " "2"" of type '" "unsigned int""'");
+  } 
+  arg2 = static_cast< unsigned int >(val2);
+  {
+    try {
+      (arg1)->SetTextureId(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_SetTips(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  bool arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Stroke_SetTips",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_SetTips" "', argument " "1"" of type '" "Stroke *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Stroke_SetTips" "', argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = static_cast< bool >(val2);
+  {
+    try {
+      (arg1)->SetTips(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_push_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  StrokeVertex *arg2 = (StrokeVertex *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Stroke_push_back",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_push_back" "', argument " "1"" of type '" "Stroke *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_StrokeVertex, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Stroke_push_back" "', argument " "2"" of type '" "StrokeVertex *""'"); 
+  }
+  arg2 = reinterpret_cast< StrokeVertex * >(argp2);
+  {
+    try {
+      (arg1)->push_back(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_push_front(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  StrokeVertex *arg2 = (StrokeVertex *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Stroke_push_front",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_push_front" "', argument " "1"" of type '" "Stroke *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_StrokeVertex, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Stroke_push_front" "', argument " "2"" of type '" "StrokeVertex *""'"); 
+  }
+  arg2 = reinterpret_cast< StrokeVertex * >(argp2);
+  {
+    try {
+      (arg1)->push_front(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_AddViewEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  ViewEdge *arg2 = (ViewEdge *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Stroke_AddViewEdge",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_AddViewEdge" "', argument " "1"" of type '" "Stroke *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Stroke_AddViewEdge" "', argument " "2"" of type '" "ViewEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< ViewEdge * >(argp2);
+  {
+    try {
+      (arg1)->AddViewEdge(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_SetBeginningOrientation__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  Geometry::Vec2r *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Stroke_SetBeginningOrientation",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_SetBeginningOrientation" "', argument " "1"" of type '" "Stroke *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Stroke_SetBeginningOrientation" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Stroke_SetBeginningOrientation" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
+  }
+  arg2 = reinterpret_cast< Geometry::Vec2r * >(argp2);
+  {
+    try {
+      (arg1)->SetBeginningOrientation((Geometry::Vec2r const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_SetBeginningOrientation__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  real arg2 ;
+  real arg3 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  double val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:Stroke_SetBeginningOrientation",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_SetBeginningOrientation" "', argument " "1"" of type '" "Stroke *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Stroke_SetBeginningOrientation" "', argument " "2"" of type '" "real""'");
+  } 
+  arg2 = static_cast< real >(val2);
+  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Stroke_SetBeginningOrientation" "', argument " "3"" of type '" "real""'");
+  } 
+  arg3 = static_cast< real >(val3);
+  {
+    try {
+      (arg1)->SetBeginningOrientation(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_SetBeginningOrientation(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Stroke, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_Stroke_SetBeginningOrientation__SWIG_0(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Stroke, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_double(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        {
+          int res = SWIG_AsVal_double(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          return _wrap_Stroke_SetBeginningOrientation__SWIG_1(self, args);
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_SetBeginningOrientation'.\n  Possible C/C++ prototypes are:\n    SetBeginningOrientation(Geometry::Vec2r const &)\n    SetBeginningOrientation(real,real)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_SetEndingOrientation__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  Geometry::Vec2r *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Stroke_SetEndingOrientation",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_SetEndingOrientation" "', argument " "1"" of type '" "Stroke *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Stroke_SetEndingOrientation" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Stroke_SetEndingOrientation" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
+  }
+  arg2 = reinterpret_cast< Geometry::Vec2r * >(argp2);
+  {
+    try {
+      (arg1)->SetEndingOrientation((Geometry::Vec2r const &)*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_SetEndingOrientation__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  real arg2 ;
+  real arg3 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  double val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:Stroke_SetEndingOrientation",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_SetEndingOrientation" "', argument " "1"" of type '" "Stroke *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Stroke_SetEndingOrientation" "', argument " "2"" of type '" "real""'");
+  } 
+  arg2 = static_cast< real >(val2);
+  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Stroke_SetEndingOrientation" "', argument " "3"" of type '" "real""'");
+  } 
+  arg3 = static_cast< real >(val3);
+  {
+    try {
+      (arg1)->SetEndingOrientation(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_SetEndingOrientation(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Stroke, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_Stroke_SetEndingOrientation__SWIG_0(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Stroke, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_double(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        {
+          int res = SWIG_AsVal_double(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          return _wrap_Stroke_SetEndingOrientation__SWIG_1(self, args);
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_SetEndingOrientation'.\n  Possible C/C++ prototypes are:\n    SetEndingOrientation(Geometry::Vec2r const &)\n    SetEndingOrientation(real,real)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_strokeVerticesBegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  float arg2 ;
+  StrokeInternal::StrokeVertexIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Stroke_strokeVerticesBegin",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_strokeVerticesBegin" "', argument " "1"" of type '" "Stroke *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Stroke_strokeVerticesBegin" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  {
+    try {
+      result = (arg1)->strokeVerticesBegin(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new StrokeInternal::StrokeVertexIterator(static_cast< const StrokeInternal::StrokeVertexIterator& >(result))), SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_strokeVerticesBegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  StrokeInternal::StrokeVertexIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Stroke_strokeVerticesBegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_strokeVerticesBegin" "', argument " "1"" of type '" "Stroke *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  {
+    try {
+      result = (arg1)->strokeVerticesBegin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new StrokeInternal::StrokeVertexIterator(static_cast< const StrokeInternal::StrokeVertexIterator& >(result))), SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_strokeVerticesBegin(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Stroke, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Stroke_strokeVerticesBegin__SWIG_1(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Stroke, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_float(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_Stroke_strokeVerticesBegin__SWIG_0(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_strokeVerticesBegin'.\n  Possible C/C++ prototypes are:\n    strokeVerticesBegin(float)\n    strokeVerticesBegin()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_strokeVerticesEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  StrokeInternal::StrokeVertexIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Stroke_strokeVerticesEnd",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_strokeVerticesEnd" "', argument " "1"" of type '" "Stroke *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  {
+    try {
+      result = (arg1)->strokeVerticesEnd();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new StrokeInternal::StrokeVertexIterator(static_cast< const StrokeInternal::StrokeVertexIterator& >(result))), SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_strokeVerticesSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  unsigned int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Stroke_strokeVerticesSize",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_strokeVerticesSize" "', argument " "1"" of type '" "Stroke const *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  {
+    try {
+      result = (unsigned int)((Stroke const *)arg1)->strokeVerticesSize();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_verticesBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  Interface0DIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Stroke_verticesBegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_verticesBegin" "', argument " "1"" of type '" "Stroke *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  {
+    try {
+      result = (arg1)->verticesBegin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Interface0DIterator(static_cast< const Interface0DIterator& >(result))), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_verticesEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  Interface0DIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Stroke_verticesEnd",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_verticesEnd" "', argument " "1"" of type '" "Stroke *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  {
+    try {
+      result = (arg1)->verticesEnd();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Interface0DIterator(static_cast< const Interface0DIterator& >(result))), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_pointsBegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  float arg2 ;
+  Interface0DIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Stroke_pointsBegin",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_pointsBegin" "', argument " "1"" of type '" "Stroke *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Stroke_pointsBegin" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  {
+    try {
+      result = (arg1)->pointsBegin(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Interface0DIterator(static_cast< const Interface0DIterator& >(result))), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_pointsBegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  Interface0DIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Stroke_pointsBegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_pointsBegin" "', argument " "1"" of type '" "Stroke *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  {
+    try {
+      result = (arg1)->pointsBegin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Interface0DIterator(static_cast< const Interface0DIterator& >(result))), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_pointsBegin(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Stroke, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Stroke_pointsBegin__SWIG_1(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Stroke, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_float(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_Stroke_pointsBegin__SWIG_0(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_pointsBegin'.\n  Possible C/C++ prototypes are:\n    pointsBegin(float)\n    pointsBegin()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_pointsEnd__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  float arg2 ;
+  Interface0DIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Stroke_pointsEnd",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_pointsEnd" "', argument " "1"" of type '" "Stroke *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Stroke_pointsEnd" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  {
+    try {
+      result = (arg1)->pointsEnd(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Interface0DIterator(static_cast< const Interface0DIterator& >(result))), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_pointsEnd__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = (Stroke *) 0 ;
+  Interface0DIterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Stroke_pointsEnd",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_pointsEnd" "', argument " "1"" of type '" "Stroke *""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  {
+    try {
+      result = (arg1)->pointsEnd();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new Interface0DIterator(static_cast< const Interface0DIterator& >(result))), SWIGTYPE_p_Interface0DIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_pointsEnd(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Stroke, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Stroke_pointsEnd__SWIG_1(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Stroke, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_float(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_Stroke_pointsEnd__SWIG_0(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_pointsEnd'.\n  Possible C/C++ prototypes are:\n    pointsEnd(float)\n    pointsEnd()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *Stroke_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Stroke, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_ShadersContainer_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  PyObject **arg2 = (PyObject **) 0 ;
+  swig::PySwigIterator *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  arg2 = &obj0;
+  if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_iterator",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_iterator" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  {
+    try {
+      result = (swig::PySwigIterator *)std_vector_Sl_StrokeShader_Sm__Sg__iterator(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__PySwigIterator, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer___nonzero__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer___nonzero__",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___nonzero__" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  {
+    try {
+      result = (bool)std_vector_Sl_StrokeShader_Sm__Sg____nonzero__((std::vector<StrokeShader * > const *)arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer___len__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::size_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer___len__",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___len__" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  {
+    try {
+      result = std_vector_Sl_StrokeShader_Sm__Sg____len__((std::vector<StrokeShader * > const *)arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_size_t(static_cast< size_t >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_pop",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_pop" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  {
+    try {
+      try {
+        result = (std::vector<StrokeShader * >::value_type)std_vector_Sl_StrokeShader_Sm__Sg__pop(arg1);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::difference_type arg2 ;
+  std::vector<StrokeShader * >::difference_type arg3 ;
+  std::vector<StrokeShader *,std::allocator<StrokeShader * > > *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  ptrdiff_t val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:ShadersContainer___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___getslice__" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer___getslice__" "', argument " "2"" of type '" "std::vector<StrokeShader * >::difference_type""'");
+  } 
+  arg2 = static_cast< std::vector<StrokeShader * >::difference_type >(val2);
+  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ShadersContainer___getslice__" "', argument " "3"" of type '" "std::vector<StrokeShader * >::difference_type""'");
+  } 
+  arg3 = static_cast< std::vector<StrokeShader * >::difference_type >(val3);
+  {
+    try {
+      try {
+        result = (std::vector<StrokeShader *,std::allocator<StrokeShader * > > *)std_vector_Sl_StrokeShader_Sm__Sg____getslice__(arg1,arg2,arg3);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer___setslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::difference_type arg2 ;
+  std::vector<StrokeShader * >::difference_type arg3 ;
+  std::vector<StrokeShader *,std::allocator<StrokeShader * > > *arg4 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  ptrdiff_t val3 ;
+  int ecode3 = 0 ;
+  int res4 = SWIG_OLDOBJ ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOO:ShadersContainer___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___setslice__" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer___setslice__" "', argument " "2"" of type '" "std::vector<StrokeShader * >::difference_type""'");
+  } 
+  arg2 = static_cast< std::vector<StrokeShader * >::difference_type >(val2);
+  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ShadersContainer___setslice__" "', argument " "3"" of type '" "std::vector<StrokeShader * >::difference_type""'");
+  } 
+  arg3 = static_cast< std::vector<StrokeShader * >::difference_type >(val3);
+  {
+    std::vector<StrokeShader*,std::allocator<StrokeShader * > > *ptr = (std::vector<StrokeShader*,std::allocator<StrokeShader * > > *)0;
+    res4 = swig::asptr(obj3, &ptr);
+    if (!SWIG_IsOK(res4)) {
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ShadersContainer___setslice__" "', argument " "4"" of type '" "std::vector<StrokeShader *,std::allocator<StrokeShader * > > const &""'"); 
+    }
+    if (!ptr) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ShadersContainer___setslice__" "', argument " "4"" of type '" "std::vector<StrokeShader *,std::allocator<StrokeShader * > > const &""'"); 
+    }
+    arg4 = ptr;
+  }
+  {
+    try {
+      try {
+        std_vector_Sl_StrokeShader_Sm__Sg____setslice__(arg1,arg2,arg3,(std::vector<StrokeShader *,std::allocator<StrokeShader * > > const &)*arg4);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+      }
+      catch(std::invalid_argument &_e) {
+        SWIG_exception_fail(SWIG_ValueError, (&_e)->what());
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  if (SWIG_IsNewObj(res4)) delete arg4;
+  return resultobj;
+fail:
+  if (SWIG_IsNewObj(res4)) delete arg4;
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer___delslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::difference_type arg2 ;
+  std::vector<StrokeShader * >::difference_type arg3 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  ptrdiff_t val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:ShadersContainer___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___delslice__" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer___delslice__" "', argument " "2"" of type '" "std::vector<StrokeShader * >::difference_type""'");
+  } 
+  arg2 = static_cast< std::vector<StrokeShader * >::difference_type >(val2);
+  ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ShadersContainer___delslice__" "', argument " "3"" of type '" "std::vector<StrokeShader * >::difference_type""'");
+  } 
+  arg3 = static_cast< std::vector<StrokeShader * >::difference_type >(val3);
+  {
+    try {
+      try {
+        std_vector_Sl_StrokeShader_Sm__Sg____delslice__(arg1,arg2,arg3);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer___delitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::difference_type arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ShadersContainer___delitem__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___delitem__" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer___delitem__" "', argument " "2"" of type '" "std::vector<StrokeShader * >::difference_type""'");
+  } 
+  arg2 = static_cast< std::vector<StrokeShader * >::difference_type >(val2);
+  {
+    try {
+      try {
+        std_vector_Sl_StrokeShader_Sm__Sg____delitem__(arg1,arg2);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer___getitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::difference_type arg2 ;
+  std::vector<StrokeShader * >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ShadersContainer___getitem__",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___getitem__" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer___getitem__" "', argument " "2"" of type '" "std::vector<StrokeShader * >::difference_type""'");
+  } 
+  arg2 = static_cast< std::vector<StrokeShader * >::difference_type >(val2);
+  {
+    try {
+      try {
+        result = (std::vector<StrokeShader * >::value_type)std_vector_Sl_StrokeShader_Sm__Sg____getitem__(arg1,arg2);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer___setitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::difference_type arg2 ;
+  std::vector<StrokeShader * >::value_type arg3 = (std::vector<StrokeShader * >::value_type) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  ptrdiff_t val2 ;
+  int ecode2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:ShadersContainer___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___setitem__" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer___setitem__" "', argument " "2"" of type '" "std::vector<StrokeShader * >::difference_type""'");
+  } 
+  arg2 = static_cast< std::vector<StrokeShader * >::difference_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ShadersContainer___setitem__" "', argument " "3"" of type '" "std::vector<StrokeShader * >::value_type""'"); 
+  }
+  arg3 = reinterpret_cast< std::vector<StrokeShader * >::value_type >(argp3);
+  {
+    try {
+      try {
+        std_vector_Sl_StrokeShader_Sm__Sg____setitem__(arg1,arg2,arg3);
+      }
+      catch(std::out_of_range &_e) {
+        SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::value_type arg2 = (std::vector<StrokeShader * >::value_type) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ShadersContainer_append",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_append" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ShadersContainer_append" "', argument " "2"" of type '" "std::vector<StrokeShader * >::value_type""'"); 
+  }
+  arg2 = reinterpret_cast< std::vector<StrokeShader * >::value_type >(argp2);
+  {
+    try {
+      std_vector_Sl_StrokeShader_Sm__Sg__append(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ShadersContainer__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<StrokeShader * > *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_ShadersContainer")) SWIG_fail;
+  {
+    try {
+      result = (std::vector<StrokeShader * > *)new std::vector<StrokeShader * >();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ShadersContainer__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<StrokeShader * > *arg1 = 0 ;
+  std::vector<StrokeShader * > *result = 0 ;
+  int res1 = SWIG_OLDOBJ ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_ShadersContainer",&obj0)) SWIG_fail;
+  {
+    std::vector<StrokeShader*,std::allocator<StrokeShader * > > *ptr = (std::vector<StrokeShader*,std::allocator<StrokeShader * > > *)0;
+    res1 = swig::asptr(obj0, &ptr);
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ShadersContainer" "', argument " "1"" of type '" "std::vector<StrokeShader * > const &""'"); 
+    }
+    if (!ptr) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ShadersContainer" "', argument " "1"" of type '" "std::vector<StrokeShader * > const &""'"); 
+    }
+    arg1 = ptr;
+  }
+  {
+    try {
+      result = (std::vector<StrokeShader * > *)new std::vector<StrokeShader * >((std::vector<StrokeShader * > const &)*arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, SWIG_POINTER_NEW |  0 );
+  if (SWIG_IsNewObj(res1)) delete arg1;
+  return resultobj;
+fail:
+  if (SWIG_IsNewObj(res1)) delete arg1;
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_empty",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_empty" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  {
+    try {
+      result = (bool)((std::vector<StrokeShader * > const *)arg1)->empty();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::size_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_size",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_size" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<StrokeShader * > const *)arg1)->size();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_size_t(static_cast< size_t >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_clear",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_clear" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  {
+    try {
+      (arg1)->clear();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * > *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ShadersContainer_swap",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_swap" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ShadersContainer_swap" "', argument " "2"" of type '" "std::vector<StrokeShader * > &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ShadersContainer_swap" "', argument " "2"" of type '" "std::vector<StrokeShader * > &""'"); 
+  }
+  arg2 = reinterpret_cast< std::vector<StrokeShader * > * >(argp2);
+  {
+    try {
+      (arg1)->swap(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  SwigValueWrapper<std::allocator<StrokeShader * > > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_get_allocator",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_get_allocator" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<StrokeShader * > const *)arg1)->get_allocator();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new std::vector<StrokeShader * >::allocator_type(static_cast< const std::vector<StrokeShader * >::allocator_type& >(result))), SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer_begin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_begin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_begin" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  {
+    try {
+      result = (arg1)->begin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<StrokeShader * >::iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer_begin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_begin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_begin" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<StrokeShader * > const *)arg1)->begin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<StrokeShader * >::const_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer_begin(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ShadersContainer_begin__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ShadersContainer_begin__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ShadersContainer_begin'.\n  Possible C/C++ prototypes are:\n    begin()\n    begin()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_end",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_end" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  {
+    try {
+      result = (arg1)->end();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<StrokeShader * >::iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_end",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_end" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<StrokeShader * > const *)arg1)->end();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<StrokeShader * >::const_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer_end(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ShadersContainer_end__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ShadersContainer_end__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ShadersContainer_end'.\n  Possible C/C++ prototypes are:\n    end()\n    end()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer_rbegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::reverse_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_rbegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_rbegin" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  {
+    try {
+      result = (arg1)->rbegin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<StrokeShader * >::reverse_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer_rbegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::const_reverse_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_rbegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_rbegin" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<StrokeShader * > const *)arg1)->rbegin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<StrokeShader * >::const_reverse_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer_rbegin(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ShadersContainer_rbegin__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ShadersContainer_rbegin__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ShadersContainer_rbegin'.\n  Possible C/C++ prototypes are:\n    rbegin()\n    rbegin()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer_rend__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::reverse_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_rend",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_rend" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  {
+    try {
+      result = (arg1)->rend();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<StrokeShader * >::reverse_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer_rend__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::const_reverse_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_rend",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_rend" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<StrokeShader * > const *)arg1)->rend();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<StrokeShader * >::const_reverse_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer_rend(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ShadersContainer_rend__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ShadersContainer_rend__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ShadersContainer_rend'.\n  Possible C/C++ prototypes are:\n    rend()\n    rend()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ShadersContainer__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<StrokeShader * >::size_type arg1 ;
+  std::vector<StrokeShader * > *result = 0 ;
+  size_t val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_ShadersContainer",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ShadersContainer" "', argument " "1"" of type '" "std::vector<StrokeShader * >::size_type""'");
+  } 
+  arg1 = static_cast< std::vector<StrokeShader * >::size_type >(val1);
+  {
+    try {
+      result = (std::vector<StrokeShader * > *)new std::vector<StrokeShader * >(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer_pop_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_pop_back",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_pop_back" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  {
+    try {
+      (arg1)->pop_back();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::size_type arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  size_t val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ShadersContainer_resize",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_resize" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer_resize" "', argument " "2"" of type '" "std::vector<StrokeShader * >::size_type""'");
+  } 
+  arg2 = static_cast< std::vector<StrokeShader * >::size_type >(val2);
+  {
+    try {
+      (arg1)->resize(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::iterator arg2 ;
+  std::vector<StrokeShader * >::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  swig::PySwigIterator *iter2 = 0 ;
+  int res2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ShadersContainer_erase",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_erase" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
+  if (!SWIG_IsOK(res2) || !iter2) {
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_erase" "', argument " "2"" of type '" "std::vector<StrokeShader * >::iterator""'");
+  } else {
+    swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *>(iter2);
+    if (iter_t) {
+      arg2 = iter_t->get_current();
+    } else {
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_erase" "', argument " "2"" of type '" "std::vector<StrokeShader * >::iterator""'");
+    }
+  }
+  {
+    try {
+      result = (arg1)->erase(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<StrokeShader * >::iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::iterator arg2 ;
+  std::vector<StrokeShader * >::iterator arg3 ;
+  std::vector<StrokeShader * >::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  swig::PySwigIterator *iter2 = 0 ;
+  int res2 ;
+  swig::PySwigIterator *iter3 = 0 ;
+  int res3 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:ShadersContainer_erase",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_erase" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
+  if (!SWIG_IsOK(res2) || !iter2) {
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_erase" "', argument " "2"" of type '" "std::vector<StrokeShader * >::iterator""'");
+  } else {
+    swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *>(iter2);
+    if (iter_t) {
+      arg2 = iter_t->get_current();
+    } else {
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_erase" "', argument " "2"" of type '" "std::vector<StrokeShader * >::iterator""'");
+    }
+  }
+  res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::PySwigIterator::descriptor(), 0);
+  if (!SWIG_IsOK(res3) || !iter3) {
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_erase" "', argument " "3"" of type '" "std::vector<StrokeShader * >::iterator""'");
+  } else {
+    swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *>(iter3);
+    if (iter_t) {
+      arg3 = iter_t->get_current();
+    } else {
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_erase" "', argument " "3"" of type '" "std::vector<StrokeShader * >::iterator""'");
+    }
+  }
+  {
+    try {
+      result = (arg1)->erase(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<StrokeShader * >::iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer_erase(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      swig::PySwigIterator *iter = 0;
+      int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *>(iter) != 0));
+      if (_v) {
+        return _wrap_ShadersContainer_erase__SWIG_0(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      swig::PySwigIterator *iter = 0;
+      int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *>(iter) != 0));
+      if (_v) {
+        swig::PySwigIterator *iter = 0;
+        int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
+        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *>(iter) != 0));
+        if (_v) {
+          return _wrap_ShadersContainer_erase__SWIG_1(self, args);
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ShadersContainer_erase'.\n  Possible C/C++ prototypes are:\n    erase(std::vector<StrokeShader * >::iterator)\n    erase(std::vector<StrokeShader * >::iterator,std::vector<StrokeShader * >::iterator)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ShadersContainer__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<StrokeShader * >::size_type arg1 ;
+  std::vector<StrokeShader * >::value_type arg2 = (std::vector<StrokeShader * >::value_type) 0 ;
+  std::vector<StrokeShader * > *result = 0 ;
+  size_t val1 ;
+  int ecode1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_ShadersContainer",&obj0,&obj1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_size_t(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ShadersContainer" "', argument " "1"" of type '" "std::vector<StrokeShader * >::size_type""'");
+  } 
+  arg1 = static_cast< std::vector<StrokeShader * >::size_type >(val1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ShadersContainer" "', argument " "2"" of type '" "std::vector<StrokeShader * >::value_type""'"); 
+  }
+  arg2 = reinterpret_cast< std::vector<StrokeShader * >::value_type >(argp2);
+  {
+    try {
+      result = (std::vector<StrokeShader * > *)new std::vector<StrokeShader * >(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ShadersContainer(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_ShadersContainer__SWIG_0(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_size_t(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_ShadersContainer__SWIG_2(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_new_ShadersContainer__SWIG_1(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    {
+      int res = SWIG_AsVal_size_t(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_new_ShadersContainer__SWIG_3(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ShadersContainer'.\n  Possible C/C++ prototypes are:\n    std::vector<(p.StrokeShader)>()\n    std::vector<(p.StrokeShader)>(std::vector<StrokeShader * > const &)\n    std::vector<(p.StrokeShader)>(std::vector<StrokeShader * >::size_type)\n    std::vector<(p.StrokeShader)>(std::vector<StrokeShader * >::size_type,std::vector<StrokeShader * >::value_type)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer_push_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::value_type arg2 = (std::vector<StrokeShader * >::value_type) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ShadersContainer_push_back",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_push_back" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ShadersContainer_push_back" "', argument " "2"" of type '" "std::vector<StrokeShader * >::value_type""'"); 
+  }
+  arg2 = reinterpret_cast< std::vector<StrokeShader * >::value_type >(argp2);
+  {
+    try {
+      (arg1)->push_back(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer_front(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_front",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_front" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  {
+    try {
+      result = (std::vector<StrokeShader * >::value_type)((std::vector<StrokeShader * > const *)arg1)->front();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::value_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_back",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_back" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  {
+    try {
+      result = (std::vector<StrokeShader * >::value_type)((std::vector<StrokeShader * > const *)arg1)->back();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer_assign(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::size_type arg2 ;
+  std::vector<StrokeShader * >::value_type arg3 = (std::vector<StrokeShader * >::value_type) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  size_t val2 ;
+  int ecode2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:ShadersContainer_assign",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_assign" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer_assign" "', argument " "2"" of type '" "std::vector<StrokeShader * >::size_type""'");
+  } 
+  arg2 = static_cast< std::vector<StrokeShader * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ShadersContainer_assign" "', argument " "3"" of type '" "std::vector<StrokeShader * >::value_type""'"); 
+  }
+  arg3 = reinterpret_cast< std::vector<StrokeShader * >::value_type >(argp3);
+  {
+    try {
+      (arg1)->assign(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::size_type arg2 ;
+  std::vector<StrokeShader * >::value_type arg3 = (std::vector<StrokeShader * >::value_type) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  size_t val2 ;
+  int ecode2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:ShadersContainer_resize",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_resize" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer_resize" "', argument " "2"" of type '" "std::vector<StrokeShader * >::size_type""'");
+  } 
+  arg2 = static_cast< std::vector<StrokeShader * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ShadersContainer_resize" "', argument " "3"" of type '" "std::vector<StrokeShader * >::value_type""'"); 
+  }
+  arg3 = reinterpret_cast< std::vector<StrokeShader * >::value_type >(argp3);
+  {
+    try {
+      (arg1)->resize(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer_resize(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_size_t(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_ShadersContainer_resize__SWIG_0(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_size_t(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          return _wrap_ShadersContainer_resize__SWIG_1(self, args);
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ShadersContainer_resize'.\n  Possible C/C++ prototypes are:\n    resize(std::vector<StrokeShader * >::size_type)\n    resize(std::vector<StrokeShader * >::size_type,std::vector<StrokeShader * >::value_type)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::iterator arg2 ;
+  std::vector<StrokeShader * >::value_type arg3 = (std::vector<StrokeShader * >::value_type) 0 ;
+  std::vector<StrokeShader * >::iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  swig::PySwigIterator *iter2 = 0 ;
+  int res2 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:ShadersContainer_insert",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_insert" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
+  if (!SWIG_IsOK(res2) || !iter2) {
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_insert" "', argument " "2"" of type '" "std::vector<StrokeShader * >::iterator""'");
+  } else {
+    swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *>(iter2);
+    if (iter_t) {
+      arg2 = iter_t->get_current();
+    } else {
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_insert" "', argument " "2"" of type '" "std::vector<StrokeShader * >::iterator""'");
+    }
+  }
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ShadersContainer_insert" "', argument " "3"" of type '" "std::vector<StrokeShader * >::value_type""'"); 
+  }
+  arg3 = reinterpret_cast< std::vector<StrokeShader * >::value_type >(argp3);
+  {
+    try {
+      result = (arg1)->insert(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<StrokeShader * >::iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::iterator arg2 ;
+  std::vector<StrokeShader * >::size_type arg3 ;
+  std::vector<StrokeShader * >::value_type arg4 = (std::vector<StrokeShader * >::value_type) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  swig::PySwigIterator *iter2 = 0 ;
+  int res2 ;
+  size_t val3 ;
+  int ecode3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOO:ShadersContainer_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_insert" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
+  if (!SWIG_IsOK(res2) || !iter2) {
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_insert" "', argument " "2"" of type '" "std::vector<StrokeShader * >::iterator""'");
+  } else {
+    swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *>(iter2);
+    if (iter_t) {
+      arg2 = iter_t->get_current();
+    } else {
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_insert" "', argument " "2"" of type '" "std::vector<StrokeShader * >::iterator""'");
+    }
+  }
+  ecode3 = SWIG_AsVal_size_t(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ShadersContainer_insert" "', argument " "3"" of type '" "std::vector<StrokeShader * >::size_type""'");
+  } 
+  arg3 = static_cast< std::vector<StrokeShader * >::size_type >(val3);
+  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ShadersContainer_insert" "', argument " "4"" of type '" "std::vector<StrokeShader * >::value_type""'"); 
+  }
+  arg4 = reinterpret_cast< std::vector<StrokeShader * >::value_type >(argp4);
+  {
+    try {
+      (arg1)->insert(arg2,arg3,arg4);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer_insert(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[5];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 4); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 3) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      swig::PySwigIterator *iter = 0;
+      int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *>(iter) != 0));
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          return _wrap_ShadersContainer_insert__SWIG_0(self, args);
+        }
+      }
+    }
+  }
+  if (argc == 4) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      swig::PySwigIterator *iter = 0;
+      int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *>(iter) != 0));
+      if (_v) {
+        {
+          int res = SWIG_AsVal_size_t(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          void *vptr = 0;
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0);
+          _v = SWIG_CheckState(res);
+          if (_v) {
+            return _wrap_ShadersContainer_insert__SWIG_1(self, args);
+          }
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ShadersContainer_insert'.\n  Possible C/C++ prototypes are:\n    insert(std::vector<StrokeShader * >::iterator,std::vector<StrokeShader * >::value_type)\n    insert(std::vector<StrokeShader * >::iterator,std::vector<StrokeShader * >::size_type,std::vector<StrokeShader * >::value_type)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer_reserve(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::size_type arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  size_t val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ShadersContainer_reserve",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_reserve" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer_reserve" "', argument " "2"" of type '" "std::vector<StrokeShader * >::size_type""'");
+  } 
+  arg2 = static_cast< std::vector<StrokeShader * >::size_type >(val2);
+  {
+    try {
+      (arg1)->reserve(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer_capacity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::size_type result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_capacity",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_capacity" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<StrokeShader * > const *)arg1)->capacity();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_size_t(static_cast< size_t >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ShadersContainer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_ShadersContainer",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ShadersContainer" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *ShadersContainer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_StrokeShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  PyObject *arg1 = (PyObject *) 0 ;
+  StrokeShader *result = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_StrokeShader",&obj0)) SWIG_fail;
+  arg1 = obj0;
+  {
+    try {
+      if ( arg1 != Py_None ) {
+        /* subclassed */
+        result = (StrokeShader *)new SwigDirector_StrokeShader(arg1); 
+      } else {
+        result = (StrokeShader *)new StrokeShader(); 
+      }
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeShader, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_StrokeShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShader *arg1 = (StrokeShader *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_StrokeShader",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShader, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_StrokeShader" "', argument " "1"" of type '" "StrokeShader *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShader * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeShader_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShader *arg1 = (StrokeShader *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:StrokeShader_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShader, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeShader_getName" "', argument " "1"" of type '" "StrokeShader const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShader * >(argp1);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          result = ((StrokeShader const *)arg1)->StrokeShader::getName();
+        } else {
+          result = ((StrokeShader const *)arg1)->getName();
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShader *arg1 = (StrokeShader *) 0 ;
+  Stroke *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  Swig::Director *director = 0;
+  bool upcall = false;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeShader_shade",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShader, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeShader_shade" "', argument " "1"" of type '" "StrokeShader const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShader * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Stroke,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "StrokeShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  arg2 = reinterpret_cast< Stroke * >(argp2);
+  director = SWIG_DIRECTOR_CAST(arg1);
+  upcall = (director && (director->swig_get_self()==obj0));
+  try {
+    {
+      try {
+        if (upcall) {
+          ((StrokeShader const *)arg1)->StrokeShader::shade(*arg2);
+        } else {
+          ((StrokeShader const *)arg1)->shade(*arg2);
+        }
+      }
+      //    catch (Swig::DirectorTypeMismatch&) {
+      //      cout << "Warning: return type mismatch" << endl;
+      //    }
+      catch (Swig::DirectorException&) {
+        cout << "Warning: director exception catched" << endl;
+      }
+    }
+  } catch (Swig::DirectorException&) {
+    SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_disown_StrokeShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShader *arg1 = (StrokeShader *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:disown_StrokeShader",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShader, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_StrokeShader" "', argument " "1"" of type '" "StrokeShader *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShader * >(argp1);
+  {
+    Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
+    if (director) director->swig_disown();
+  }
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *StrokeShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShader, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_ConstantThicknessShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  float arg1 ;
+  StrokeShaders::ConstantThicknessShader *result = 0 ;
+  float val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_ConstantThicknessShader",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_float(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ConstantThicknessShader" "', argument " "1"" of type '" "float""'");
+  } 
+  arg1 = static_cast< float >(val1);
+  {
+    try {
+      result = (StrokeShaders::ConstantThicknessShader *)new StrokeShaders::ConstantThicknessShader(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeShaders__ConstantThicknessShader, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ConstantThicknessShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::ConstantThicknessShader *arg1 = (StrokeShaders::ConstantThicknessShader *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_ConstantThicknessShader",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__ConstantThicknessShader, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ConstantThicknessShader" "', argument " "1"" of type '" "StrokeShaders::ConstantThicknessShader *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::ConstantThicknessShader * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ConstantThicknessShader_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::ConstantThicknessShader *arg1 = (StrokeShaders::ConstantThicknessShader *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ConstantThicknessShader_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__ConstantThicknessShader, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ConstantThicknessShader_getName" "', argument " "1"" of type '" "StrokeShaders::ConstantThicknessShader const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::ConstantThicknessShader * >(argp1);
+  {
+    try {
+      result = ((StrokeShaders::ConstantThicknessShader const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ConstantThicknessShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::ConstantThicknessShader *arg1 = (StrokeShaders::ConstantThicknessShader *) 0 ;
+  Stroke *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ConstantThicknessShader_shade",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__ConstantThicknessShader, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ConstantThicknessShader_shade" "', argument " "1"" of type '" "StrokeShaders::ConstantThicknessShader const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::ConstantThicknessShader * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Stroke,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ConstantThicknessShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ConstantThicknessShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  arg2 = reinterpret_cast< Stroke * >(argp2);
+  {
+    try {
+      ((StrokeShaders::ConstantThicknessShader const *)arg1)->shade(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *ConstantThicknessShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__ConstantThicknessShader, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_ConstantExternThicknessShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  float arg1 ;
+  StrokeShaders::ConstantExternThicknessShader *result = 0 ;
+  float val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_ConstantExternThicknessShader",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_float(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ConstantExternThicknessShader" "', argument " "1"" of type '" "float""'");
+  } 
+  arg1 = static_cast< float >(val1);
+  {
+    try {
+      result = (StrokeShaders::ConstantExternThicknessShader *)new StrokeShaders::ConstantExternThicknessShader(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeShaders__ConstantExternThicknessShader, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ConstantExternThicknessShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::ConstantExternThicknessShader *arg1 = (StrokeShaders::ConstantExternThicknessShader *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_ConstantExternThicknessShader",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__ConstantExternThicknessShader, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ConstantExternThicknessShader" "', argument " "1"" of type '" "StrokeShaders::ConstantExternThicknessShader *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::ConstantExternThicknessShader * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ConstantExternThicknessShader_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::ConstantExternThicknessShader *arg1 = (StrokeShaders::ConstantExternThicknessShader *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ConstantExternThicknessShader_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__ConstantExternThicknessShader, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ConstantExternThicknessShader_getName" "', argument " "1"" of type '" "StrokeShaders::ConstantExternThicknessShader const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::ConstantExternThicknessShader * >(argp1);
+  {
+    try {
+      result = ((StrokeShaders::ConstantExternThicknessShader const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ConstantExternThicknessShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::ConstantExternThicknessShader *arg1 = (StrokeShaders::ConstantExternThicknessShader *) 0 ;
+  Stroke *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ConstantExternThicknessShader_shade",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__ConstantExternThicknessShader, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ConstantExternThicknessShader_shade" "', argument " "1"" of type '" "StrokeShaders::ConstantExternThicknessShader const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::ConstantExternThicknessShader * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Stroke,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ConstantExternThicknessShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ConstantExternThicknessShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  arg2 = reinterpret_cast< Stroke * >(argp2);
+  {
+    try {
+      ((StrokeShaders::ConstantExternThicknessShader const *)arg1)->shade(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *ConstantExternThicknessShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__ConstantExternThicknessShader, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_IncreasingThicknessShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  float arg1 ;
+  float arg2 ;
+  StrokeShaders::IncreasingThicknessShader *result = 0 ;
+  float val1 ;
+  int ecode1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_IncreasingThicknessShader",&obj0,&obj1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_float(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_IncreasingThicknessShader" "', argument " "1"" of type '" "float""'");
+  } 
+  arg1 = static_cast< float >(val1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_IncreasingThicknessShader" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  {
+    try {
+      result = (StrokeShaders::IncreasingThicknessShader *)new StrokeShaders::IncreasingThicknessShader(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeShaders__IncreasingThicknessShader, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_IncreasingThicknessShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::IncreasingThicknessShader *arg1 = (StrokeShaders::IncreasingThicknessShader *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_IncreasingThicknessShader",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__IncreasingThicknessShader, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IncreasingThicknessShader" "', argument " "1"" of type '" "StrokeShaders::IncreasingThicknessShader *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::IncreasingThicknessShader * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_IncreasingThicknessShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::IncreasingThicknessShader *arg1 = (StrokeShaders::IncreasingThicknessShader *) 0 ;
+  Stroke *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:IncreasingThicknessShader_shade",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__IncreasingThicknessShader, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IncreasingThicknessShader_shade" "', argument " "1"" of type '" "StrokeShaders::IncreasingThicknessShader const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::IncreasingThicknessShader * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Stroke,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IncreasingThicknessShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "IncreasingThicknessShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  arg2 = reinterpret_cast< Stroke * >(argp2);
+  {
+    try {
+      ((StrokeShaders::IncreasingThicknessShader const *)arg1)->shade(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *IncreasingThicknessShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__IncreasingThicknessShader, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_ConstrainedIncreasingThicknessShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  float arg1 ;
+  float arg2 ;
+  float arg3 ;
+  StrokeShaders::ConstrainedIncreasingThicknessShader *result = 0 ;
+  float val1 ;
+  int ecode1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  float val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:new_ConstrainedIncreasingThicknessShader",&obj0,&obj1,&obj2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_float(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ConstrainedIncreasingThicknessShader" "', argument " "1"" of type '" "float""'");
+  } 
+  arg1 = static_cast< float >(val1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_ConstrainedIncreasingThicknessShader" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  ecode3 = SWIG_AsVal_float(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_ConstrainedIncreasingThicknessShader" "', argument " "3"" of type '" "float""'");
+  } 
+  arg3 = static_cast< float >(val3);
+  {
+    try {
+      result = (StrokeShaders::ConstrainedIncreasingThicknessShader *)new StrokeShaders::ConstrainedIncreasingThicknessShader(arg1,arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeShaders__ConstrainedIncreasingThicknessShader, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ConstrainedIncreasingThicknessShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::ConstrainedIncreasingThicknessShader *arg1 = (StrokeShaders::ConstrainedIncreasingThicknessShader *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_ConstrainedIncreasingThicknessShader",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__ConstrainedIncreasingThicknessShader, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ConstrainedIncreasingThicknessShader" "', argument " "1"" of type '" "StrokeShaders::ConstrainedIncreasingThicknessShader *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::ConstrainedIncreasingThicknessShader * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ConstrainedIncreasingThicknessShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::ConstrainedIncreasingThicknessShader *arg1 = (StrokeShaders::ConstrainedIncreasingThicknessShader *) 0 ;
+  Stroke *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ConstrainedIncreasingThicknessShader_shade",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__ConstrainedIncreasingThicknessShader, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ConstrainedIncreasingThicknessShader_shade" "', argument " "1"" of type '" "StrokeShaders::ConstrainedIncreasingThicknessShader const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::ConstrainedIncreasingThicknessShader * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Stroke,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ConstrainedIncreasingThicknessShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ConstrainedIncreasingThicknessShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  arg2 = reinterpret_cast< Stroke * >(argp2);
+  {
+    try {
+      ((StrokeShaders::ConstrainedIncreasingThicknessShader const *)arg1)->shade(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *ConstrainedIncreasingThicknessShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__ConstrainedIncreasingThicknessShader, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_LengthDependingThicknessShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  float arg1 ;
+  float arg2 ;
+  StrokeShaders::LengthDependingThicknessShader *result = 0 ;
+  float val1 ;
+  int ecode1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_LengthDependingThicknessShader",&obj0,&obj1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_float(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_LengthDependingThicknessShader" "', argument " "1"" of type '" "float""'");
+  } 
+  arg1 = static_cast< float >(val1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_LengthDependingThicknessShader" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  {
+    try {
+      result = (StrokeShaders::LengthDependingThicknessShader *)new StrokeShaders::LengthDependingThicknessShader(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeShaders__LengthDependingThicknessShader, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_LengthDependingThicknessShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::LengthDependingThicknessShader *arg1 = (StrokeShaders::LengthDependingThicknessShader *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_LengthDependingThicknessShader",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__LengthDependingThicknessShader, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_LengthDependingThicknessShader" "', argument " "1"" of type '" "StrokeShaders::LengthDependingThicknessShader *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::LengthDependingThicknessShader * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_LengthDependingThicknessShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::LengthDependingThicknessShader *arg1 = (StrokeShaders::LengthDependingThicknessShader *) 0 ;
+  Stroke *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:LengthDependingThicknessShader_shade",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__LengthDependingThicknessShader, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "LengthDependingThicknessShader_shade" "', argument " "1"" of type '" "StrokeShaders::LengthDependingThicknessShader const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::LengthDependingThicknessShader * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Stroke,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "LengthDependingThicknessShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "LengthDependingThicknessShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  arg2 = reinterpret_cast< Stroke * >(argp2);
+  {
+    try {
+      ((StrokeShaders::LengthDependingThicknessShader const *)arg1)->shade(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *LengthDependingThicknessShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__LengthDependingThicknessShader, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_ThicknessVariationPatternShader__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::string arg1 ;
+  float arg2 ;
+  float arg3 ;
+  bool arg4 ;
+  StrokeShaders::ThicknessVariationPatternShader *result = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  float val3 ;
+  int ecode3 = 0 ;
+  bool val4 ;
+  int ecode4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOO:new_ThicknessVariationPatternShader",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  {
+    std::string *ptr = (std::string *)0;
+    int res = SWIG_AsPtr_std_string(obj0, &ptr);
+    if (!SWIG_IsOK(res) || !ptr) {
+      SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_ThicknessVariationPatternShader" "', argument " "1"" of type '" "std::string const""'"); 
+    }
+    arg1 = *ptr;
+    if (SWIG_IsNewObj(res)) delete ptr;
+  }
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_ThicknessVariationPatternShader" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  ecode3 = SWIG_AsVal_float(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_ThicknessVariationPatternShader" "', argument " "3"" of type '" "float""'");
+  } 
+  arg3 = static_cast< float >(val3);
+  ecode4 = SWIG_AsVal_bool(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_ThicknessVariationPatternShader" "', argument " "4"" of type '" "bool""'");
+  } 
+  arg4 = static_cast< bool >(val4);
+  {
+    try {
+      result = (StrokeShaders::ThicknessVariationPatternShader *)new StrokeShaders::ThicknessVariationPatternShader(arg1,arg2,arg3,arg4);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeShaders__ThicknessVariationPatternShader, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ThicknessVariationPatternShader__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::string arg1 ;
+  float arg2 ;
+  float arg3 ;
+  StrokeShaders::ThicknessVariationPatternShader *result = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  float val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:new_ThicknessVariationPatternShader",&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    std::string *ptr = (std::string *)0;
+    int res = SWIG_AsPtr_std_string(obj0, &ptr);
+    if (!SWIG_IsOK(res) || !ptr) {
+      SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_ThicknessVariationPatternShader" "', argument " "1"" of type '" "std::string const""'"); 
+    }
+    arg1 = *ptr;
+    if (SWIG_IsNewObj(res)) delete ptr;
+  }
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_ThicknessVariationPatternShader" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  ecode3 = SWIG_AsVal_float(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_ThicknessVariationPatternShader" "', argument " "3"" of type '" "float""'");
+  } 
+  arg3 = static_cast< float >(val3);
+  {
+    try {
+      result = (StrokeShaders::ThicknessVariationPatternShader *)new StrokeShaders::ThicknessVariationPatternShader(arg1,arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeShaders__ThicknessVariationPatternShader, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ThicknessVariationPatternShader__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::string arg1 ;
+  float arg2 ;
+  StrokeShaders::ThicknessVariationPatternShader *result = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_ThicknessVariationPatternShader",&obj0,&obj1)) SWIG_fail;
+  {
+    std::string *ptr = (std::string *)0;
+    int res = SWIG_AsPtr_std_string(obj0, &ptr);
+    if (!SWIG_IsOK(res) || !ptr) {
+      SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_ThicknessVariationPatternShader" "', argument " "1"" of type '" "std::string const""'"); 
+    }
+    arg1 = *ptr;
+    if (SWIG_IsNewObj(res)) delete ptr;
+  }
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_ThicknessVariationPatternShader" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  {
+    try {
+      result = (StrokeShaders::ThicknessVariationPatternShader *)new StrokeShaders::ThicknessVariationPatternShader(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeShaders__ThicknessVariationPatternShader, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ThicknessVariationPatternShader__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::string arg1 ;
+  StrokeShaders::ThicknessVariationPatternShader *result = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_ThicknessVariationPatternShader",&obj0)) SWIG_fail;
+  {
+    std::string *ptr = (std::string *)0;
+    int res = SWIG_AsPtr_std_string(obj0, &ptr);
+    if (!SWIG_IsOK(res) || !ptr) {
+      SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_ThicknessVariationPatternShader" "', argument " "1"" of type '" "std::string const""'"); 
+    }
+    arg1 = *ptr;
+    if (SWIG_IsNewObj(res)) delete ptr;
+  }
+  {
+    try {
+      result = (StrokeShaders::ThicknessVariationPatternShader *)new StrokeShaders::ThicknessVariationPatternShader(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeShaders__ThicknessVariationPatternShader, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ThicknessVariationPatternShader(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[5];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 4); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = SWIG_AsPtr_std_string(argv[0], (std::string**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_new_ThicknessVariationPatternShader__SWIG_3(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    int res = SWIG_AsPtr_std_string(argv[0], (std::string**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_float(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_new_ThicknessVariationPatternShader__SWIG_2(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    int res = SWIG_AsPtr_std_string(argv[0], (std::string**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_float(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        {
+          int res = SWIG_AsVal_float(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          return _wrap_new_ThicknessVariationPatternShader__SWIG_1(self, args);
+        }
+      }
+    }
+  }
+  if (argc == 4) {
+    int _v;
+    int res = SWIG_AsPtr_std_string(argv[0], (std::string**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_float(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        {
+          int res = SWIG_AsVal_float(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          {
+            int res = SWIG_AsVal_bool(argv[3], NULL);
+            _v = SWIG_CheckState(res);
+          }
+          if (_v) {
+            return _wrap_new_ThicknessVariationPatternShader__SWIG_0(self, args);
+          }
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ThicknessVariationPatternShader'.\n  Possible C/C++ prototypes are:\n    StrokeShaders::ThicknessVariationPatternShader(std::string const,float,float,bool)\n    StrokeShaders::ThicknessVariationPatternShader(std::string const,float,float)\n    StrokeShaders::ThicknessVariationPatternShader(std::string const,float)\n    StrokeShaders::ThicknessVariationPatternShader(std::string const)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ThicknessVariationPatternShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::ThicknessVariationPatternShader *arg1 = (StrokeShaders::ThicknessVariationPatternShader *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_ThicknessVariationPatternShader",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__ThicknessVariationPatternShader, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ThicknessVariationPatternShader" "', argument " "1"" of type '" "StrokeShaders::ThicknessVariationPatternShader *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::ThicknessVariationPatternShader * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ThicknessVariationPatternShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::ThicknessVariationPatternShader *arg1 = (StrokeShaders::ThicknessVariationPatternShader *) 0 ;
+  Stroke *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ThicknessVariationPatternShader_shade",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__ThicknessVariationPatternShader, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ThicknessVariationPatternShader_shade" "', argument " "1"" of type '" "StrokeShaders::ThicknessVariationPatternShader const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::ThicknessVariationPatternShader * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Stroke,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ThicknessVariationPatternShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ThicknessVariationPatternShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  arg2 = reinterpret_cast< Stroke * >(argp2);
+  {
+    try {
+      ((StrokeShaders::ThicknessVariationPatternShader const *)arg1)->shade(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *ThicknessVariationPatternShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__ThicknessVariationPatternShader, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_ThicknessNoiseShader__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::ThicknessNoiseShader *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_ThicknessNoiseShader")) SWIG_fail;
+  {
+    try {
+      result = (StrokeShaders::ThicknessNoiseShader *)new StrokeShaders::ThicknessNoiseShader();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeShaders__ThicknessNoiseShader, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ThicknessNoiseShader__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  float arg1 ;
+  float arg2 ;
+  StrokeShaders::ThicknessNoiseShader *result = 0 ;
+  float val1 ;
+  int ecode1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_ThicknessNoiseShader",&obj0,&obj1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_float(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ThicknessNoiseShader" "', argument " "1"" of type '" "float""'");
+  } 
+  arg1 = static_cast< float >(val1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_ThicknessNoiseShader" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  {
+    try {
+      result = (StrokeShaders::ThicknessNoiseShader *)new StrokeShaders::ThicknessNoiseShader(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeShaders__ThicknessNoiseShader, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ThicknessNoiseShader(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_ThicknessNoiseShader__SWIG_0(self, args);
+  }
+  if (argc == 2) {
+    int _v;
+    {
+      int res = SWIG_AsVal_float(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      {
+        int res = SWIG_AsVal_float(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_new_ThicknessNoiseShader__SWIG_1(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ThicknessNoiseShader'.\n  Possible C/C++ prototypes are:\n    StrokeShaders::ThicknessNoiseShader()\n    StrokeShaders::ThicknessNoiseShader(float,float)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ThicknessNoiseShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::ThicknessNoiseShader *arg1 = (StrokeShaders::ThicknessNoiseShader *) 0 ;
+  Stroke *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ThicknessNoiseShader_shade",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__ThicknessNoiseShader, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ThicknessNoiseShader_shade" "', argument " "1"" of type '" "StrokeShaders::ThicknessNoiseShader const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::ThicknessNoiseShader * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Stroke,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ThicknessNoiseShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ThicknessNoiseShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  arg2 = reinterpret_cast< Stroke * >(argp2);
+  {
+    try {
+      ((StrokeShaders::ThicknessNoiseShader const *)arg1)->shade(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ThicknessNoiseShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::ThicknessNoiseShader *arg1 = (StrokeShaders::ThicknessNoiseShader *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_ThicknessNoiseShader",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__ThicknessNoiseShader, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ThicknessNoiseShader" "', argument " "1"" of type '" "StrokeShaders::ThicknessNoiseShader *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::ThicknessNoiseShader * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *ThicknessNoiseShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__ThicknessNoiseShader, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_ConstantColorShader__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  float arg1 ;
+  float arg2 ;
+  float arg3 ;
+  float arg4 ;
+  StrokeShaders::ConstantColorShader *result = 0 ;
+  float val1 ;
+  int ecode1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  float val3 ;
+  int ecode3 = 0 ;
+  float val4 ;
+  int ecode4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOO:new_ConstantColorShader",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  ecode1 = SWIG_AsVal_float(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ConstantColorShader" "', argument " "1"" of type '" "float""'");
+  } 
+  arg1 = static_cast< float >(val1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_ConstantColorShader" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  ecode3 = SWIG_AsVal_float(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_ConstantColorShader" "', argument " "3"" of type '" "float""'");
+  } 
+  arg3 = static_cast< float >(val3);
+  ecode4 = SWIG_AsVal_float(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_ConstantColorShader" "', argument " "4"" of type '" "float""'");
+  } 
+  arg4 = static_cast< float >(val4);
+  {
+    try {
+      result = (StrokeShaders::ConstantColorShader *)new StrokeShaders::ConstantColorShader(arg1,arg2,arg3,arg4);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeShaders__ConstantColorShader, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ConstantColorShader__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  float arg1 ;
+  float arg2 ;
+  float arg3 ;
+  StrokeShaders::ConstantColorShader *result = 0 ;
+  float val1 ;
+  int ecode1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  float val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:new_ConstantColorShader",&obj0,&obj1,&obj2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_float(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ConstantColorShader" "', argument " "1"" of type '" "float""'");
+  } 
+  arg1 = static_cast< float >(val1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_ConstantColorShader" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  ecode3 = SWIG_AsVal_float(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_ConstantColorShader" "', argument " "3"" of type '" "float""'");
+  } 
+  arg3 = static_cast< float >(val3);
+  {
+    try {
+      result = (StrokeShaders::ConstantColorShader *)new StrokeShaders::ConstantColorShader(arg1,arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeShaders__ConstantColorShader, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ConstantColorShader(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[5];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 4); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 3) {
+    int _v;
+    {
+      int res = SWIG_AsVal_float(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      {
+        int res = SWIG_AsVal_float(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        {
+          int res = SWIG_AsVal_float(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          return _wrap_new_ConstantColorShader__SWIG_1(self, args);
+        }
+      }
+    }
+  }
+  if (argc == 4) {
+    int _v;
+    {
+      int res = SWIG_AsVal_float(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      {
+        int res = SWIG_AsVal_float(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        {
+          int res = SWIG_AsVal_float(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          {
+            int res = SWIG_AsVal_float(argv[3], NULL);
+            _v = SWIG_CheckState(res);
+          }
+          if (_v) {
+            return _wrap_new_ConstantColorShader__SWIG_0(self, args);
+          }
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ConstantColorShader'.\n  Possible C/C++ prototypes are:\n    StrokeShaders::ConstantColorShader(float,float,float,float)\n    StrokeShaders::ConstantColorShader(float,float,float)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ConstantColorShader_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::ConstantColorShader *arg1 = (StrokeShaders::ConstantColorShader *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ConstantColorShader_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__ConstantColorShader, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ConstantColorShader_getName" "', argument " "1"" of type '" "StrokeShaders::ConstantColorShader const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::ConstantColorShader * >(argp1);
+  {
+    try {
+      result = ((StrokeShaders::ConstantColorShader const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ConstantColorShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::ConstantColorShader *arg1 = (StrokeShaders::ConstantColorShader *) 0 ;
+  Stroke *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ConstantColorShader_shade",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__ConstantColorShader, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ConstantColorShader_shade" "', argument " "1"" of type '" "StrokeShaders::ConstantColorShader const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::ConstantColorShader * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Stroke,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ConstantColorShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ConstantColorShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  arg2 = reinterpret_cast< Stroke * >(argp2);
+  {
+    try {
+      ((StrokeShaders::ConstantColorShader const *)arg1)->shade(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ConstantColorShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::ConstantColorShader *arg1 = (StrokeShaders::ConstantColorShader *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_ConstantColorShader",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__ConstantColorShader, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ConstantColorShader" "', argument " "1"" of type '" "StrokeShaders::ConstantColorShader *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::ConstantColorShader * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *ConstantColorShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__ConstantColorShader, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_IncreasingColorShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  float arg1 ;
+  float arg2 ;
+  float arg3 ;
+  float arg4 ;
+  float arg5 ;
+  float arg6 ;
+  float arg7 ;
+  float arg8 ;
+  StrokeShaders::IncreasingColorShader *result = 0 ;
+  float val1 ;
+  int ecode1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  float val3 ;
+  int ecode3 = 0 ;
+  float val4 ;
+  int ecode4 = 0 ;
+  float val5 ;
+  int ecode5 = 0 ;
+  float val6 ;
+  int ecode6 = 0 ;
+  float val7 ;
+  int ecode7 = 0 ;
+  float val8 ;
+  int ecode8 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
+  PyObject * obj6 = 0 ;
+  PyObject * obj7 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOOOOOO:new_IncreasingColorShader",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  ecode1 = SWIG_AsVal_float(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_IncreasingColorShader" "', argument " "1"" of type '" "float""'");
+  } 
+  arg1 = static_cast< float >(val1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_IncreasingColorShader" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  ecode3 = SWIG_AsVal_float(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_IncreasingColorShader" "', argument " "3"" of type '" "float""'");
+  } 
+  arg3 = static_cast< float >(val3);
+  ecode4 = SWIG_AsVal_float(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_IncreasingColorShader" "', argument " "4"" of type '" "float""'");
+  } 
+  arg4 = static_cast< float >(val4);
+  ecode5 = SWIG_AsVal_float(obj4, &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_IncreasingColorShader" "', argument " "5"" of type '" "float""'");
+  } 
+  arg5 = static_cast< float >(val5);
+  ecode6 = SWIG_AsVal_float(obj5, &val6);
+  if (!SWIG_IsOK(ecode6)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "new_IncreasingColorShader" "', argument " "6"" of type '" "float""'");
+  } 
+  arg6 = static_cast< float >(val6);
+  ecode7 = SWIG_AsVal_float(obj6, &val7);
+  if (!SWIG_IsOK(ecode7)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "new_IncreasingColorShader" "', argument " "7"" of type '" "float""'");
+  } 
+  arg7 = static_cast< float >(val7);
+  ecode8 = SWIG_AsVal_float(obj7, &val8);
+  if (!SWIG_IsOK(ecode8)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "new_IncreasingColorShader" "', argument " "8"" of type '" "float""'");
+  } 
+  arg8 = static_cast< float >(val8);
+  {
+    try {
+      result = (StrokeShaders::IncreasingColorShader *)new StrokeShaders::IncreasingColorShader(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeShaders__IncreasingColorShader, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_IncreasingColorShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::IncreasingColorShader *arg1 = (StrokeShaders::IncreasingColorShader *) 0 ;
+  Stroke *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:IncreasingColorShader_shade",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__IncreasingColorShader, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IncreasingColorShader_shade" "', argument " "1"" of type '" "StrokeShaders::IncreasingColorShader const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::IncreasingColorShader * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Stroke,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IncreasingColorShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "IncreasingColorShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  arg2 = reinterpret_cast< Stroke * >(argp2);
+  {
+    try {
+      ((StrokeShaders::IncreasingColorShader const *)arg1)->shade(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_IncreasingColorShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::IncreasingColorShader *arg1 = (StrokeShaders::IncreasingColorShader *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_IncreasingColorShader",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__IncreasingColorShader, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_IncreasingColorShader" "', argument " "1"" of type '" "StrokeShaders::IncreasingColorShader *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::IncreasingColorShader * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *IncreasingColorShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__IncreasingColorShader, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_ColorVariationPatternShader__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::string arg1 ;
+  bool arg2 ;
+  StrokeShaders::ColorVariationPatternShader *result = 0 ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_ColorVariationPatternShader",&obj0,&obj1)) SWIG_fail;
+  {
+    std::string *ptr = (std::string *)0;
+    int res = SWIG_AsPtr_std_string(obj0, &ptr);
+    if (!SWIG_IsOK(res) || !ptr) {
+      SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_ColorVariationPatternShader" "', argument " "1"" of type '" "std::string const""'"); 
+    }
+    arg1 = *ptr;
+    if (SWIG_IsNewObj(res)) delete ptr;
+  }
+  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_ColorVariationPatternShader" "', argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = static_cast< bool >(val2);
+  {
+    try {
+      result = (StrokeShaders::ColorVariationPatternShader *)new StrokeShaders::ColorVariationPatternShader(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeShaders__ColorVariationPatternShader, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ColorVariationPatternShader__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::string arg1 ;
+  StrokeShaders::ColorVariationPatternShader *result = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_ColorVariationPatternShader",&obj0)) SWIG_fail;
+  {
+    std::string *ptr = (std::string *)0;
+    int res = SWIG_AsPtr_std_string(obj0, &ptr);
+    if (!SWIG_IsOK(res) || !ptr) {
+      SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_ColorVariationPatternShader" "', argument " "1"" of type '" "std::string const""'"); 
+    }
+    arg1 = *ptr;
+    if (SWIG_IsNewObj(res)) delete ptr;
+  }
+  {
+    try {
+      result = (StrokeShaders::ColorVariationPatternShader *)new StrokeShaders::ColorVariationPatternShader(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeShaders__ColorVariationPatternShader, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ColorVariationPatternShader(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = SWIG_AsPtr_std_string(argv[0], (std::string**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_new_ColorVariationPatternShader__SWIG_1(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    int res = SWIG_AsPtr_std_string(argv[0], (std::string**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_bool(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_new_ColorVariationPatternShader__SWIG_0(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ColorVariationPatternShader'.\n  Possible C/C++ prototypes are:\n    StrokeShaders::ColorVariationPatternShader(std::string const,bool)\n    StrokeShaders::ColorVariationPatternShader(std::string const)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ColorVariationPatternShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::ColorVariationPatternShader *arg1 = (StrokeShaders::ColorVariationPatternShader *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_ColorVariationPatternShader",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__ColorVariationPatternShader, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ColorVariationPatternShader" "', argument " "1"" of type '" "StrokeShaders::ColorVariationPatternShader *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::ColorVariationPatternShader * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ColorVariationPatternShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::ColorVariationPatternShader *arg1 = (StrokeShaders::ColorVariationPatternShader *) 0 ;
+  Stroke *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ColorVariationPatternShader_shade",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__ColorVariationPatternShader, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ColorVariationPatternShader_shade" "', argument " "1"" of type '" "StrokeShaders::ColorVariationPatternShader const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::ColorVariationPatternShader * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Stroke,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ColorVariationPatternShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ColorVariationPatternShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  arg2 = reinterpret_cast< Stroke * >(argp2);
+  {
+    try {
+      ((StrokeShaders::ColorVariationPatternShader const *)arg1)->shade(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *ColorVariationPatternShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__ColorVariationPatternShader, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_MaterialColorShader__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  float arg1 ;
+  StrokeShaders::MaterialColorShader *result = 0 ;
+  float val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_MaterialColorShader",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_float(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_MaterialColorShader" "', argument " "1"" of type '" "float""'");
+  } 
+  arg1 = static_cast< float >(val1);
+  {
+    try {
+      result = (StrokeShaders::MaterialColorShader *)new StrokeShaders::MaterialColorShader(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeShaders__MaterialColorShader, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_MaterialColorShader__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::MaterialColorShader *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_MaterialColorShader")) SWIG_fail;
+  {
+    try {
+      result = (StrokeShaders::MaterialColorShader *)new StrokeShaders::MaterialColorShader();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeShaders__MaterialColorShader, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_MaterialColorShader(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_MaterialColorShader__SWIG_1(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_float(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_MaterialColorShader__SWIG_0(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_MaterialColorShader'.\n  Possible C/C++ prototypes are:\n    StrokeShaders::MaterialColorShader(float)\n    StrokeShaders::MaterialColorShader()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_MaterialColorShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::MaterialColorShader *arg1 = (StrokeShaders::MaterialColorShader *) 0 ;
+  Stroke *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:MaterialColorShader_shade",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__MaterialColorShader, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "MaterialColorShader_shade" "', argument " "1"" of type '" "StrokeShaders::MaterialColorShader const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::MaterialColorShader * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Stroke,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "MaterialColorShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "MaterialColorShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  arg2 = reinterpret_cast< Stroke * >(argp2);
+  {
+    try {
+      ((StrokeShaders::MaterialColorShader const *)arg1)->shade(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_MaterialColorShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::MaterialColorShader *arg1 = (StrokeShaders::MaterialColorShader *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_MaterialColorShader",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__MaterialColorShader, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_MaterialColorShader" "', argument " "1"" of type '" "StrokeShaders::MaterialColorShader *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::MaterialColorShader * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *MaterialColorShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__MaterialColorShader, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_CalligraphicColorShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Geometry::Vec2d *arg1 = 0 ;
+  StrokeShaders::CalligraphicColorShader *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_CalligraphicColorShader",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CalligraphicColorShader" "', argument " "1"" of type '" "Geometry::Vec2d const &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_CalligraphicColorShader" "', argument " "1"" of type '" "Geometry::Vec2d const &""'"); 
+  }
+  arg1 = reinterpret_cast< Geometry::Vec2d * >(argp1);
+  {
+    try {
+      result = (StrokeShaders::CalligraphicColorShader *)new StrokeShaders::CalligraphicColorShader((Geometry::Vec2d const &)*arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeShaders__CalligraphicColorShader, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CalligraphicColorShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::CalligraphicColorShader *arg1 = (StrokeShaders::CalligraphicColorShader *) 0 ;
+  Stroke *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:CalligraphicColorShader_shade",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__CalligraphicColorShader, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CalligraphicColorShader_shade" "', argument " "1"" of type '" "StrokeShaders::CalligraphicColorShader const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::CalligraphicColorShader * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Stroke,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CalligraphicColorShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CalligraphicColorShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  arg2 = reinterpret_cast< Stroke * >(argp2);
+  {
+    try {
+      ((StrokeShaders::CalligraphicColorShader const *)arg1)->shade(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_CalligraphicColorShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::CalligraphicColorShader *arg1 = (StrokeShaders::CalligraphicColorShader *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_CalligraphicColorShader",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__CalligraphicColorShader, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CalligraphicColorShader" "', argument " "1"" of type '" "StrokeShaders::CalligraphicColorShader *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::CalligraphicColorShader * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *CalligraphicColorShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__CalligraphicColorShader, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_ColorNoiseShader__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::ColorNoiseShader *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_ColorNoiseShader")) SWIG_fail;
+  {
+    try {
+      result = (StrokeShaders::ColorNoiseShader *)new StrokeShaders::ColorNoiseShader();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeShaders__ColorNoiseShader, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ColorNoiseShader__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  float arg1 ;
+  float arg2 ;
+  StrokeShaders::ColorNoiseShader *result = 0 ;
+  float val1 ;
+  int ecode1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_ColorNoiseShader",&obj0,&obj1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_float(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ColorNoiseShader" "', argument " "1"" of type '" "float""'");
+  } 
+  arg1 = static_cast< float >(val1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_ColorNoiseShader" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  {
+    try {
+      result = (StrokeShaders::ColorNoiseShader *)new StrokeShaders::ColorNoiseShader(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeShaders__ColorNoiseShader, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ColorNoiseShader(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_ColorNoiseShader__SWIG_0(self, args);
+  }
+  if (argc == 2) {
+    int _v;
+    {
+      int res = SWIG_AsVal_float(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      {
+        int res = SWIG_AsVal_float(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_new_ColorNoiseShader__SWIG_1(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ColorNoiseShader'.\n  Possible C/C++ prototypes are:\n    StrokeShaders::ColorNoiseShader()\n    StrokeShaders::ColorNoiseShader(float,float)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ColorNoiseShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::ColorNoiseShader *arg1 = (StrokeShaders::ColorNoiseShader *) 0 ;
+  Stroke *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ColorNoiseShader_shade",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__ColorNoiseShader, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ColorNoiseShader_shade" "', argument " "1"" of type '" "StrokeShaders::ColorNoiseShader const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::ColorNoiseShader * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Stroke,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ColorNoiseShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ColorNoiseShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  arg2 = reinterpret_cast< Stroke * >(argp2);
+  {
+    try {
+      ((StrokeShaders::ColorNoiseShader const *)arg1)->shade(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ColorNoiseShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::ColorNoiseShader *arg1 = (StrokeShaders::ColorNoiseShader *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_ColorNoiseShader",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__ColorNoiseShader, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ColorNoiseShader" "', argument " "1"" of type '" "StrokeShaders::ColorNoiseShader *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::ColorNoiseShader * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *ColorNoiseShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__ColorNoiseShader, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_TextureAssignerShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  int arg1 ;
+  StrokeShaders::TextureAssignerShader *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_TextureAssignerShader",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_TextureAssignerShader" "', argument " "1"" of type '" "int""'");
+  } 
+  arg1 = static_cast< int >(val1);
+  {
+    try {
+      result = (StrokeShaders::TextureAssignerShader *)new StrokeShaders::TextureAssignerShader(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeShaders__TextureAssignerShader, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TextureAssignerShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::TextureAssignerShader *arg1 = (StrokeShaders::TextureAssignerShader *) 0 ;
+  Stroke *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:TextureAssignerShader_shade",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__TextureAssignerShader, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TextureAssignerShader_shade" "', argument " "1"" of type '" "StrokeShaders::TextureAssignerShader const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::TextureAssignerShader * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Stroke,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TextureAssignerShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TextureAssignerShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  arg2 = reinterpret_cast< Stroke * >(argp2);
+  {
+    try {
+      ((StrokeShaders::TextureAssignerShader const *)arg1)->shade(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_TextureAssignerShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::TextureAssignerShader *arg1 = (StrokeShaders::TextureAssignerShader *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_TextureAssignerShader",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__TextureAssignerShader, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_TextureAssignerShader" "', argument " "1"" of type '" "StrokeShaders::TextureAssignerShader *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::TextureAssignerShader * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *TextureAssignerShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__TextureAssignerShader, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_StrokeTextureShader__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::string arg1 ;
+  Stroke::MediumType arg2 ;
+  bool arg3 ;
+  StrokeShaders::StrokeTextureShader *result = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  bool val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:new_StrokeTextureShader",&obj0,&obj1,&obj2)) SWIG_fail;
+  {
+    std::string *ptr = (std::string *)0;
+    int res = SWIG_AsPtr_std_string(obj0, &ptr);
+    if (!SWIG_IsOK(res) || !ptr) {
+      SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_StrokeTextureShader" "', argument " "1"" of type '" "std::string const""'"); 
+    }
+    arg1 = *ptr;
+    if (SWIG_IsNewObj(res)) delete ptr;
+  }
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_StrokeTextureShader" "', argument " "2"" of type '" "Stroke::MediumType""'");
+  } 
+  arg2 = static_cast< Stroke::MediumType >(val2);
+  ecode3 = SWIG_AsVal_bool(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_StrokeTextureShader" "', argument " "3"" of type '" "bool""'");
+  } 
+  arg3 = static_cast< bool >(val3);
+  {
+    try {
+      result = (StrokeShaders::StrokeTextureShader *)new StrokeShaders::StrokeTextureShader(arg1,arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeShaders__StrokeTextureShader, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_StrokeTextureShader__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::string arg1 ;
+  Stroke::MediumType arg2 ;
+  StrokeShaders::StrokeTextureShader *result = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_StrokeTextureShader",&obj0,&obj1)) SWIG_fail;
+  {
+    std::string *ptr = (std::string *)0;
+    int res = SWIG_AsPtr_std_string(obj0, &ptr);
+    if (!SWIG_IsOK(res) || !ptr) {
+      SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_StrokeTextureShader" "', argument " "1"" of type '" "std::string const""'"); 
+    }
+    arg1 = *ptr;
+    if (SWIG_IsNewObj(res)) delete ptr;
+  }
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_StrokeTextureShader" "', argument " "2"" of type '" "Stroke::MediumType""'");
+  } 
+  arg2 = static_cast< Stroke::MediumType >(val2);
+  {
+    try {
+      result = (StrokeShaders::StrokeTextureShader *)new StrokeShaders::StrokeTextureShader(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeShaders__StrokeTextureShader, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_StrokeTextureShader__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::string arg1 ;
+  StrokeShaders::StrokeTextureShader *result = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_StrokeTextureShader",&obj0)) SWIG_fail;
+  {
+    std::string *ptr = (std::string *)0;
+    int res = SWIG_AsPtr_std_string(obj0, &ptr);
+    if (!SWIG_IsOK(res) || !ptr) {
+      SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_StrokeTextureShader" "', argument " "1"" of type '" "std::string const""'"); 
+    }
+    arg1 = *ptr;
+    if (SWIG_IsNewObj(res)) delete ptr;
+  }
+  {
+    try {
+      result = (StrokeShaders::StrokeTextureShader *)new StrokeShaders::StrokeTextureShader(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeShaders__StrokeTextureShader, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_StrokeTextureShader(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = SWIG_AsPtr_std_string(argv[0], (std::string**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_new_StrokeTextureShader__SWIG_2(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    int res = SWIG_AsPtr_std_string(argv[0], (std::string**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_new_StrokeTextureShader__SWIG_1(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    int res = SWIG_AsPtr_std_string(argv[0], (std::string**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        {
+          int res = SWIG_AsVal_bool(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          return _wrap_new_StrokeTextureShader__SWIG_0(self, args);
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_StrokeTextureShader'.\n  Possible C/C++ prototypes are:\n    StrokeShaders::StrokeTextureShader(std::string const,Stroke::MediumType,bool)\n    StrokeShaders::StrokeTextureShader(std::string const,Stroke::MediumType)\n    StrokeShaders::StrokeTextureShader(std::string const)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeTextureShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::StrokeTextureShader *arg1 = (StrokeShaders::StrokeTextureShader *) 0 ;
+  Stroke *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeTextureShader_shade",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__StrokeTextureShader, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeTextureShader_shade" "', argument " "1"" of type '" "StrokeShaders::StrokeTextureShader const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::StrokeTextureShader * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Stroke,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeTextureShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "StrokeTextureShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  arg2 = reinterpret_cast< Stroke * >(argp2);
+  {
+    try {
+      ((StrokeShaders::StrokeTextureShader const *)arg1)->shade(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_StrokeTextureShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::StrokeTextureShader *arg1 = (StrokeShaders::StrokeTextureShader *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_StrokeTextureShader",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__StrokeTextureShader, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_StrokeTextureShader" "', argument " "1"" of type '" "StrokeShaders::StrokeTextureShader *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::StrokeTextureShader * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *StrokeTextureShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__StrokeTextureShader, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_BackboneStretcherShader__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  float arg1 ;
+  StrokeShaders::BackboneStretcherShader *result = 0 ;
+  float val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_BackboneStretcherShader",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_float(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_BackboneStretcherShader" "', argument " "1"" of type '" "float""'");
+  } 
+  arg1 = static_cast< float >(val1);
+  {
+    try {
+      result = (StrokeShaders::BackboneStretcherShader *)new StrokeShaders::BackboneStretcherShader(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeShaders__BackboneStretcherShader, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_BackboneStretcherShader__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::BackboneStretcherShader *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_BackboneStretcherShader")) SWIG_fail;
+  {
+    try {
+      result = (StrokeShaders::BackboneStretcherShader *)new StrokeShaders::BackboneStretcherShader();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeShaders__BackboneStretcherShader, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_BackboneStretcherShader(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_BackboneStretcherShader__SWIG_1(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_float(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_BackboneStretcherShader__SWIG_0(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_BackboneStretcherShader'.\n  Possible C/C++ prototypes are:\n    StrokeShaders::BackboneStretcherShader(float)\n    StrokeShaders::BackboneStretcherShader()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_BackboneStretcherShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::BackboneStretcherShader *arg1 = (StrokeShaders::BackboneStretcherShader *) 0 ;
+  Stroke *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:BackboneStretcherShader_shade",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__BackboneStretcherShader, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BackboneStretcherShader_shade" "', argument " "1"" of type '" "StrokeShaders::BackboneStretcherShader const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::BackboneStretcherShader * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Stroke,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "BackboneStretcherShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "BackboneStretcherShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  arg2 = reinterpret_cast< Stroke * >(argp2);
+  {
+    try {
+      ((StrokeShaders::BackboneStretcherShader const *)arg1)->shade(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_BackboneStretcherShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::BackboneStretcherShader *arg1 = (StrokeShaders::BackboneStretcherShader *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_BackboneStretcherShader",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__BackboneStretcherShader, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_BackboneStretcherShader" "', argument " "1"" of type '" "StrokeShaders::BackboneStretcherShader *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::BackboneStretcherShader * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *BackboneStretcherShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__BackboneStretcherShader, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_SamplingShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  float arg1 ;
+  StrokeShaders::SamplingShader *result = 0 ;
+  float val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_SamplingShader",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_float(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_SamplingShader" "', argument " "1"" of type '" "float""'");
+  } 
+  arg1 = static_cast< float >(val1);
+  {
+    try {
+      result = (StrokeShaders::SamplingShader *)new StrokeShaders::SamplingShader(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeShaders__SamplingShader, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SamplingShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::SamplingShader *arg1 = (StrokeShaders::SamplingShader *) 0 ;
+  Stroke *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:SamplingShader_shade",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__SamplingShader, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SamplingShader_shade" "', argument " "1"" of type '" "StrokeShaders::SamplingShader const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::SamplingShader * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Stroke,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SamplingShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SamplingShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  arg2 = reinterpret_cast< Stroke * >(argp2);
+  {
+    try {
+      ((StrokeShaders::SamplingShader const *)arg1)->shade(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_SamplingShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::SamplingShader *arg1 = (StrokeShaders::SamplingShader *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_SamplingShader",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__SamplingShader, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_SamplingShader" "', argument " "1"" of type '" "StrokeShaders::SamplingShader *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::SamplingShader * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *SamplingShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__SamplingShader, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_ExternalContourStretcherShader__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  float arg1 ;
+  StrokeShaders::ExternalContourStretcherShader *result = 0 ;
+  float val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_ExternalContourStretcherShader",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_float(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ExternalContourStretcherShader" "', argument " "1"" of type '" "float""'");
+  } 
+  arg1 = static_cast< float >(val1);
+  {
+    try {
+      result = (StrokeShaders::ExternalContourStretcherShader *)new StrokeShaders::ExternalContourStretcherShader(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeShaders__ExternalContourStretcherShader, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ExternalContourStretcherShader__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::ExternalContourStretcherShader *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_ExternalContourStretcherShader")) SWIG_fail;
+  {
+    try {
+      result = (StrokeShaders::ExternalContourStretcherShader *)new StrokeShaders::ExternalContourStretcherShader();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeShaders__ExternalContourStretcherShader, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ExternalContourStretcherShader(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_ExternalContourStretcherShader__SWIG_1(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_float(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_ExternalContourStretcherShader__SWIG_0(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ExternalContourStretcherShader'.\n  Possible C/C++ prototypes are:\n    StrokeShaders::ExternalContourStretcherShader(float)\n    StrokeShaders::ExternalContourStretcherShader()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ExternalContourStretcherShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::ExternalContourStretcherShader *arg1 = (StrokeShaders::ExternalContourStretcherShader *) 0 ;
+  Stroke *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:ExternalContourStretcherShader_shade",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__ExternalContourStretcherShader, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ExternalContourStretcherShader_shade" "', argument " "1"" of type '" "StrokeShaders::ExternalContourStretcherShader const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::ExternalContourStretcherShader * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Stroke,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ExternalContourStretcherShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ExternalContourStretcherShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  arg2 = reinterpret_cast< Stroke * >(argp2);
+  {
+    try {
+      ((StrokeShaders::ExternalContourStretcherShader const *)arg1)->shade(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ExternalContourStretcherShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::ExternalContourStretcherShader *arg1 = (StrokeShaders::ExternalContourStretcherShader *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_ExternalContourStretcherShader",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__ExternalContourStretcherShader, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ExternalContourStretcherShader" "', argument " "1"" of type '" "StrokeShaders::ExternalContourStretcherShader *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::ExternalContourStretcherShader * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *ExternalContourStretcherShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__ExternalContourStretcherShader, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_BSplineShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::BSplineShader *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_BSplineShader")) SWIG_fail;
+  {
+    try {
+      result = (StrokeShaders::BSplineShader *)new StrokeShaders::BSplineShader();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeShaders__BSplineShader, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_BSplineShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::BSplineShader *arg1 = (StrokeShaders::BSplineShader *) 0 ;
+  Stroke *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:BSplineShader_shade",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__BSplineShader, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BSplineShader_shade" "', argument " "1"" of type '" "StrokeShaders::BSplineShader const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::BSplineShader * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Stroke,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "BSplineShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "BSplineShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  arg2 = reinterpret_cast< Stroke * >(argp2);
+  {
+    try {
+      ((StrokeShaders::BSplineShader const *)arg1)->shade(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_BSplineShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::BSplineShader *arg1 = (StrokeShaders::BSplineShader *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_BSplineShader",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__BSplineShader, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_BSplineShader" "', argument " "1"" of type '" "StrokeShaders::BSplineShader *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::BSplineShader * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *BSplineShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__BSplineShader, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_BezierCurveShader__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  float arg1 ;
+  StrokeShaders::BezierCurveShader *result = 0 ;
+  float val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_BezierCurveShader",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_float(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_BezierCurveShader" "', argument " "1"" of type '" "float""'");
+  } 
+  arg1 = static_cast< float >(val1);
+  {
+    try {
+      result = (StrokeShaders::BezierCurveShader *)new StrokeShaders::BezierCurveShader(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeShaders__BezierCurveShader, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_BezierCurveShader__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::BezierCurveShader *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_BezierCurveShader")) SWIG_fail;
+  {
+    try {
+      result = (StrokeShaders::BezierCurveShader *)new StrokeShaders::BezierCurveShader();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeShaders__BezierCurveShader, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_BezierCurveShader(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 0) {
+    return _wrap_new_BezierCurveShader__SWIG_1(self, args);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_float(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_new_BezierCurveShader__SWIG_0(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_BezierCurveShader'.\n  Possible C/C++ prototypes are:\n    StrokeShaders::BezierCurveShader(float)\n    StrokeShaders::BezierCurveShader()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_BezierCurveShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::BezierCurveShader *arg1 = (StrokeShaders::BezierCurveShader *) 0 ;
+  Stroke *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:BezierCurveShader_shade",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__BezierCurveShader, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BezierCurveShader_shade" "', argument " "1"" of type '" "StrokeShaders::BezierCurveShader const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::BezierCurveShader * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Stroke,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "BezierCurveShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "BezierCurveShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  arg2 = reinterpret_cast< Stroke * >(argp2);
+  {
+    try {
+      ((StrokeShaders::BezierCurveShader const *)arg1)->shade(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_BezierCurveShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::BezierCurveShader *arg1 = (StrokeShaders::BezierCurveShader *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_BezierCurveShader",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__BezierCurveShader, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_BezierCurveShader" "', argument " "1"" of type '" "StrokeShaders::BezierCurveShader *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::BezierCurveShader * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *BezierCurveShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__BezierCurveShader, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_InflateShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  float arg1 ;
+  float arg2 ;
+  StrokeShaders::InflateShader *result = 0 ;
+  float val1 ;
+  int ecode1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:new_InflateShader",&obj0,&obj1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_float(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_InflateShader" "', argument " "1"" of type '" "float""'");
+  } 
+  arg1 = static_cast< float >(val1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_InflateShader" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  {
+    try {
+      result = (StrokeShaders::InflateShader *)new StrokeShaders::InflateShader(arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeShaders__InflateShader, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_InflateShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::InflateShader *arg1 = (StrokeShaders::InflateShader *) 0 ;
+  Stroke *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:InflateShader_shade",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__InflateShader, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "InflateShader_shade" "', argument " "1"" of type '" "StrokeShaders::InflateShader const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::InflateShader * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Stroke,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "InflateShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "InflateShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  arg2 = reinterpret_cast< Stroke * >(argp2);
+  {
+    try {
+      ((StrokeShaders::InflateShader const *)arg1)->shade(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_InflateShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::InflateShader *arg1 = (StrokeShaders::InflateShader *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_InflateShader",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__InflateShader, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_InflateShader" "', argument " "1"" of type '" "StrokeShaders::InflateShader *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::InflateShader * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *InflateShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__InflateShader, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_PolygonalizationShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  float arg1 ;
+  StrokeShaders::PolygonalizationShader *result = 0 ;
+  float val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_PolygonalizationShader",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_float(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_PolygonalizationShader" "', argument " "1"" of type '" "float""'");
+  } 
+  arg1 = static_cast< float >(val1);
+  {
+    try {
+      result = (StrokeShaders::PolygonalizationShader *)new StrokeShaders::PolygonalizationShader(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeShaders__PolygonalizationShader, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_PolygonalizationShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::PolygonalizationShader *arg1 = (StrokeShaders::PolygonalizationShader *) 0 ;
+  Stroke *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:PolygonalizationShader_shade",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__PolygonalizationShader, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PolygonalizationShader_shade" "', argument " "1"" of type '" "StrokeShaders::PolygonalizationShader const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::PolygonalizationShader * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Stroke,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PolygonalizationShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "PolygonalizationShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  arg2 = reinterpret_cast< Stroke * >(argp2);
+  {
+    try {
+      ((StrokeShaders::PolygonalizationShader const *)arg1)->shade(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_PolygonalizationShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::PolygonalizationShader *arg1 = (StrokeShaders::PolygonalizationShader *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_PolygonalizationShader",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__PolygonalizationShader, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_PolygonalizationShader" "', argument " "1"" of type '" "StrokeShaders::PolygonalizationShader *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::PolygonalizationShader * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *PolygonalizationShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__PolygonalizationShader, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_GuidingLinesShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  float arg1 ;
+  StrokeShaders::GuidingLinesShader *result = 0 ;
+  float val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_GuidingLinesShader",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_float(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_GuidingLinesShader" "', argument " "1"" of type '" "float""'");
+  } 
+  arg1 = static_cast< float >(val1);
+  {
+    try {
+      result = (StrokeShaders::GuidingLinesShader *)new StrokeShaders::GuidingLinesShader(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeShaders__GuidingLinesShader, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_GuidingLinesShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::GuidingLinesShader *arg1 = (StrokeShaders::GuidingLinesShader *) 0 ;
+  Stroke *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:GuidingLinesShader_shade",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__GuidingLinesShader, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GuidingLinesShader_shade" "', argument " "1"" of type '" "StrokeShaders::GuidingLinesShader const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::GuidingLinesShader * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Stroke,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "GuidingLinesShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "GuidingLinesShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  arg2 = reinterpret_cast< Stroke * >(argp2);
+  {
+    try {
+      ((StrokeShaders::GuidingLinesShader const *)arg1)->shade(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GuidingLinesShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::GuidingLinesShader *arg1 = (StrokeShaders::GuidingLinesShader *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_GuidingLinesShader",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__GuidingLinesShader, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_GuidingLinesShader" "', argument " "1"" of type '" "StrokeShaders::GuidingLinesShader *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::GuidingLinesShader * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *GuidingLinesShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__GuidingLinesShader, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_TipRemoverShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  real arg1 ;
+  StrokeShaders::TipRemoverShader *result = 0 ;
+  double val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_TipRemoverShader",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_TipRemoverShader" "', argument " "1"" of type '" "real""'");
+  } 
+  arg1 = static_cast< real >(val1);
+  {
+    try {
+      result = (StrokeShaders::TipRemoverShader *)new StrokeShaders::TipRemoverShader(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeShaders__TipRemoverShader, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_TipRemoverShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::TipRemoverShader *arg1 = (StrokeShaders::TipRemoverShader *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_TipRemoverShader",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__TipRemoverShader, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_TipRemoverShader" "', argument " "1"" of type '" "StrokeShaders::TipRemoverShader *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::TipRemoverShader * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TipRemoverShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::TipRemoverShader *arg1 = (StrokeShaders::TipRemoverShader *) 0 ;
+  Stroke *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:TipRemoverShader_shade",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__TipRemoverShader, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TipRemoverShader_shade" "', argument " "1"" of type '" "StrokeShaders::TipRemoverShader const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::TipRemoverShader * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Stroke,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TipRemoverShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TipRemoverShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  arg2 = reinterpret_cast< Stroke * >(argp2);
+  {
+    try {
+      ((StrokeShaders::TipRemoverShader const *)arg1)->shade(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *TipRemoverShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__TipRemoverShader, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_delete_streamShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::streamShader *arg1 = (StrokeShaders::streamShader *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_streamShader",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__streamShader, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_streamShader" "', argument " "1"" of type '" "StrokeShaders::streamShader *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::streamShader * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_streamShader_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::streamShader *arg1 = (StrokeShaders::streamShader *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:streamShader_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__streamShader, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "streamShader_getName" "', argument " "1"" of type '" "StrokeShaders::streamShader const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::streamShader * >(argp1);
+  {
+    try {
+      result = ((StrokeShaders::streamShader const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_streamShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::streamShader *arg1 = (StrokeShaders::streamShader *) 0 ;
+  Stroke *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:streamShader_shade",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__streamShader, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "streamShader_shade" "', argument " "1"" of type '" "StrokeShaders::streamShader const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::streamShader * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Stroke,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "streamShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "streamShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  arg2 = reinterpret_cast< Stroke * >(argp2);
+  {
+    try {
+      ((StrokeShaders::streamShader const *)arg1)->shade(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_streamShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::streamShader *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_streamShader")) SWIG_fail;
+  {
+    try {
+      result = (StrokeShaders::streamShader *)new StrokeShaders::streamShader();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeShaders__streamShader, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *streamShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__streamShader, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_fstreamShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  char *arg1 = (char *) 0 ;
+  StrokeShaders::fstreamShader *result = 0 ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_fstreamShader",&obj0)) SWIG_fail;
+  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_fstreamShader" "', argument " "1"" of type '" "char const *""'");
+  }
+  arg1 = reinterpret_cast< char * >(buf1);
+  {
+    try {
+      result = (StrokeShaders::fstreamShader *)new StrokeShaders::fstreamShader((char const *)arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeShaders__fstreamShader, SWIG_POINTER_NEW |  0 );
+  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+  return resultobj;
+fail:
+  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_fstreamShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::fstreamShader *arg1 = (StrokeShaders::fstreamShader *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_fstreamShader",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__fstreamShader, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_fstreamShader" "', argument " "1"" of type '" "StrokeShaders::fstreamShader *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::fstreamShader * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_fstreamShader_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::fstreamShader *arg1 = (StrokeShaders::fstreamShader *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:fstreamShader_getName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__fstreamShader, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "fstreamShader_getName" "', argument " "1"" of type '" "StrokeShaders::fstreamShader const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::fstreamShader * >(argp1);
+  {
+    try {
+      result = ((StrokeShaders::fstreamShader const *)arg1)->getName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_fstreamShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  StrokeShaders::fstreamShader *arg1 = (StrokeShaders::fstreamShader *) 0 ;
+  Stroke *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:fstreamShader_shade",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeShaders__fstreamShader, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "fstreamShader_shade" "', argument " "1"" of type '" "StrokeShaders::fstreamShader const *""'"); 
+  }
+  arg1 = reinterpret_cast< StrokeShaders::fstreamShader * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Stroke,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "fstreamShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "fstreamShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  arg2 = reinterpret_cast< Stroke * >(argp2);
+  {
+    try {
+      ((StrokeShaders::fstreamShader const *)arg1)->shade(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *fstreamShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__fstreamShader, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_CalligraphicShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  real arg1 ;
+  real arg2 ;
+  Geometry::Vec2f *arg3 = 0 ;
+  bool arg4 ;
+  CalligraphicShader *result = 0 ;
+  double val1 ;
+  int ecode1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  bool val4 ;
+  int ecode4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOO:new_CalligraphicShader",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_CalligraphicShader" "', argument " "1"" of type '" "real""'");
+  } 
+  arg1 = static_cast< real >(val1);
+  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CalligraphicShader" "', argument " "2"" of type '" "real""'");
+  } 
+  arg2 = static_cast< real >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0  | 0);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_CalligraphicShader" "', argument " "3"" of type '" "Geometry::Vec2f const &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_CalligraphicShader" "', argument " "3"" of type '" "Geometry::Vec2f const &""'"); 
+  }
+  arg3 = reinterpret_cast< Geometry::Vec2f * >(argp3);
+  ecode4 = SWIG_AsVal_bool(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_CalligraphicShader" "', argument " "4"" of type '" "bool""'");
+  } 
+  arg4 = static_cast< bool >(val4);
+  {
+    try {
+      result = (CalligraphicShader *)new CalligraphicShader(arg1,arg2,(Geometry::Vec2f const &)*arg3,arg4);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CalligraphicShader, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_CalligraphicShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CalligraphicShader *arg1 = (CalligraphicShader *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_CalligraphicShader",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CalligraphicShader, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_CalligraphicShader" "', argument " "1"" of type '" "CalligraphicShader *""'"); 
+  }
+  arg1 = reinterpret_cast< CalligraphicShader * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CalligraphicShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CalligraphicShader *arg1 = (CalligraphicShader *) 0 ;
+  Stroke *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:CalligraphicShader_shade",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CalligraphicShader, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CalligraphicShader_shade" "', argument " "1"" of type '" "CalligraphicShader const *""'"); 
+  }
+  arg1 = reinterpret_cast< CalligraphicShader * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Stroke,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CalligraphicShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CalligraphicShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  arg2 = reinterpret_cast< Stroke * >(argp2);
+  {
+    try {
+      ((CalligraphicShader const *)arg1)->shade(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *CalligraphicShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_CalligraphicShader, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_SpatialNoiseShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  float arg1 ;
+  float arg2 ;
+  int arg3 ;
+  bool arg4 ;
+  bool arg5 ;
+  SpatialNoiseShader *result = 0 ;
+  float val1 ;
+  int ecode1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  bool val4 ;
+  int ecode4 = 0 ;
+  bool val5 ;
+  int ecode5 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOOO:new_SpatialNoiseShader",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  ecode1 = SWIG_AsVal_float(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_SpatialNoiseShader" "', argument " "1"" of type '" "float""'");
+  } 
+  arg1 = static_cast< float >(val1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_SpatialNoiseShader" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_SpatialNoiseShader" "', argument " "3"" of type '" "int""'");
+  } 
+  arg3 = static_cast< int >(val3);
+  ecode4 = SWIG_AsVal_bool(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_SpatialNoiseShader" "', argument " "4"" of type '" "bool""'");
+  } 
+  arg4 = static_cast< bool >(val4);
+  ecode5 = SWIG_AsVal_bool(obj4, &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_SpatialNoiseShader" "', argument " "5"" of type '" "bool""'");
+  } 
+  arg5 = static_cast< bool >(val5);
+  {
+    try {
+      result = (SpatialNoiseShader *)new SpatialNoiseShader(arg1,arg2,arg3,arg4,arg5);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SpatialNoiseShader, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_SpatialNoiseShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SpatialNoiseShader *arg1 = (SpatialNoiseShader *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_SpatialNoiseShader",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SpatialNoiseShader, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_SpatialNoiseShader" "', argument " "1"" of type '" "SpatialNoiseShader *""'"); 
+  }
+  arg1 = reinterpret_cast< SpatialNoiseShader * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SpatialNoiseShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SpatialNoiseShader *arg1 = (SpatialNoiseShader *) 0 ;
+  Stroke *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:SpatialNoiseShader_shade",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SpatialNoiseShader, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SpatialNoiseShader_shade" "', argument " "1"" of type '" "SpatialNoiseShader const *""'"); 
+  }
+  arg1 = reinterpret_cast< SpatialNoiseShader * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Stroke,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SpatialNoiseShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SpatialNoiseShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  arg2 = reinterpret_cast< Stroke * >(argp2);
+  {
+    try {
+      ((SpatialNoiseShader const *)arg1)->shade(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *SpatialNoiseShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_SpatialNoiseShader, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_SmoothingShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  int arg1 ;
+  real arg2 ;
+  real arg3 ;
+  real arg4 ;
+  real arg5 ;
+  real arg6 ;
+  real arg7 ;
+  real arg8 ;
+  SmoothingShader *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  double val3 ;
+  int ecode3 = 0 ;
+  double val4 ;
+  int ecode4 = 0 ;
+  double val5 ;
+  int ecode5 = 0 ;
+  double val6 ;
+  int ecode6 = 0 ;
+  double val7 ;
+  int ecode7 = 0 ;
+  double val8 ;
+  int ecode8 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
+  PyObject * obj6 = 0 ;
+  PyObject * obj7 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOOOOOO:new_SmoothingShader",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_SmoothingShader" "', argument " "1"" of type '" "int""'");
+  } 
+  arg1 = static_cast< int >(val1);
+  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_SmoothingShader" "', argument " "2"" of type '" "real""'");
+  } 
+  arg2 = static_cast< real >(val2);
+  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_SmoothingShader" "', argument " "3"" of type '" "real""'");
+  } 
+  arg3 = static_cast< real >(val3);
+  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_SmoothingShader" "', argument " "4"" of type '" "real""'");
+  } 
+  arg4 = static_cast< real >(val4);
+  ecode5 = SWIG_AsVal_double(obj4, &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "new_SmoothingShader" "', argument " "5"" of type '" "real""'");
+  } 
+  arg5 = static_cast< real >(val5);
+  ecode6 = SWIG_AsVal_double(obj5, &val6);
+  if (!SWIG_IsOK(ecode6)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "new_SmoothingShader" "', argument " "6"" of type '" "real""'");
+  } 
+  arg6 = static_cast< real >(val6);
+  ecode7 = SWIG_AsVal_double(obj6, &val7);
+  if (!SWIG_IsOK(ecode7)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "new_SmoothingShader" "', argument " "7"" of type '" "real""'");
+  } 
+  arg7 = static_cast< real >(val7);
+  ecode8 = SWIG_AsVal_double(obj7, &val8);
+  if (!SWIG_IsOK(ecode8)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "new_SmoothingShader" "', argument " "8"" of type '" "real""'");
+  } 
+  arg8 = static_cast< real >(val8);
+  {
+    try {
+      result = (SmoothingShader *)new SmoothingShader(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SmoothingShader, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_SmoothingShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SmoothingShader *arg1 = (SmoothingShader *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_SmoothingShader",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SmoothingShader, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_SmoothingShader" "', argument " "1"" of type '" "SmoothingShader *""'"); 
+  }
+  arg1 = reinterpret_cast< SmoothingShader * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SmoothingShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  SmoothingShader *arg1 = (SmoothingShader *) 0 ;
+  Stroke *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:SmoothingShader_shade",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SmoothingShader, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SmoothingShader_shade" "', argument " "1"" of type '" "SmoothingShader const *""'"); 
+  }
+  arg1 = reinterpret_cast< SmoothingShader * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Stroke,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SmoothingShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SmoothingShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  arg2 = reinterpret_cast< Stroke * >(argp2);
+  {
+    try {
+      ((SmoothingShader const *)arg1)->shade(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *SmoothingShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_SmoothingShader, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_Smoother(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = 0 ;
+  Smoother *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_Smoother",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_Stroke,  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_Smoother" "', argument " "1"" of type '" "Stroke &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_Smoother" "', argument " "1"" of type '" "Stroke &""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  {
+    try {
+      result = (Smoother *)new Smoother(*arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Smoother, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_Smoother(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Smoother *arg1 = (Smoother *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_Smoother",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Smoother, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Smoother" "', argument " "1"" of type '" "Smoother *""'"); 
+  }
+  arg1 = reinterpret_cast< Smoother * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Smoother_smooth(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Smoother *arg1 = (Smoother *) 0 ;
+  int arg2 ;
+  real arg3 ;
+  real arg4 ;
+  real arg5 ;
+  real arg6 ;
+  real arg7 ;
+  real arg8 ;
+  real arg9 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  double val3 ;
+  int ecode3 = 0 ;
+  double val4 ;
+  int ecode4 = 0 ;
+  double val5 ;
+  int ecode5 = 0 ;
+  double val6 ;
+  int ecode6 = 0 ;
+  double val7 ;
+  int ecode7 = 0 ;
+  double val8 ;
+  int ecode8 = 0 ;
+  double val9 ;
+  int ecode9 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
+  PyObject * obj6 = 0 ;
+  PyObject * obj7 = 0 ;
+  PyObject * obj8 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOO:Smoother_smooth",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Smoother, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Smoother_smooth" "', argument " "1"" of type '" "Smoother *""'"); 
+  }
+  arg1 = reinterpret_cast< Smoother * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Smoother_smooth" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Smoother_smooth" "', argument " "3"" of type '" "real""'");
+  } 
+  arg3 = static_cast< real >(val3);
+  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Smoother_smooth" "', argument " "4"" of type '" "real""'");
+  } 
+  arg4 = static_cast< real >(val4);
+  ecode5 = SWIG_AsVal_double(obj4, &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "Smoother_smooth" "', argument " "5"" of type '" "real""'");
+  } 
+  arg5 = static_cast< real >(val5);
+  ecode6 = SWIG_AsVal_double(obj5, &val6);
+  if (!SWIG_IsOK(ecode6)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode6), "in method '" "Smoother_smooth" "', argument " "6"" of type '" "real""'");
+  } 
+  arg6 = static_cast< real >(val6);
+  ecode7 = SWIG_AsVal_double(obj6, &val7);
+  if (!SWIG_IsOK(ecode7)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "Smoother_smooth" "', argument " "7"" of type '" "real""'");
+  } 
+  arg7 = static_cast< real >(val7);
+  ecode8 = SWIG_AsVal_double(obj7, &val8);
+  if (!SWIG_IsOK(ecode8)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "Smoother_smooth" "', argument " "8"" of type '" "real""'");
+  } 
+  arg8 = static_cast< real >(val8);
+  ecode9 = SWIG_AsVal_double(obj8, &val9);
+  if (!SWIG_IsOK(ecode9)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode9), "in method '" "Smoother_smooth" "', argument " "9"" of type '" "real""'");
+  } 
+  arg9 = static_cast< real >(val9);
+  {
+    try {
+      (arg1)->smooth(arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Smoother_computeCurvature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Smoother *arg1 = (Smoother *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Smoother_computeCurvature",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Smoother, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Smoother_computeCurvature" "', argument " "1"" of type '" "Smoother *""'"); 
+  }
+  arg1 = reinterpret_cast< Smoother * >(argp1);
+  {
+    try {
+      (arg1)->computeCurvature();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *Smoother_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Smoother, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_Omitter(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Stroke *arg1 = 0 ;
+  Omitter *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_Omitter",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_Stroke,  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_Omitter" "', argument " "1"" of type '" "Stroke &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_Omitter" "', argument " "1"" of type '" "Stroke &""'"); 
+  }
+  arg1 = reinterpret_cast< Stroke * >(argp1);
+  {
+    try {
+      result = (Omitter *)new Omitter(*arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Omitter, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_Omitter(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Omitter *arg1 = (Omitter *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_Omitter",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Omitter, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Omitter" "', argument " "1"" of type '" "Omitter *""'"); 
+  }
+  arg1 = reinterpret_cast< Omitter * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Omitter_omit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Omitter *arg1 = (Omitter *) 0 ;
+  real arg2 ;
+  real arg3 ;
+  real arg4 ;
+  real arg5 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  double val3 ;
+  int ecode3 = 0 ;
+  double val4 ;
+  int ecode4 = 0 ;
+  double val5 ;
+  int ecode5 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOOO:Omitter_omit",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Omitter, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Omitter_omit" "', argument " "1"" of type '" "Omitter *""'"); 
+  }
+  arg1 = reinterpret_cast< Omitter * >(argp1);
+  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Omitter_omit" "', argument " "2"" of type '" "real""'");
+  } 
+  arg2 = static_cast< real >(val2);
+  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Omitter_omit" "', argument " "3"" of type '" "real""'");
+  } 
+  arg3 = static_cast< real >(val3);
+  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Omitter_omit" "', argument " "4"" of type '" "real""'");
+  } 
+  arg4 = static_cast< real >(val4);
+  ecode5 = SWIG_AsVal_double(obj4, &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "Omitter_omit" "', argument " "5"" of type '" "real""'");
+  } 
+  arg5 = static_cast< real >(val5);
+  {
+    try {
+      (arg1)->omit(arg2,arg3,arg4,arg5);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *Omitter_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Omitter, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_new_OmissionShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  real arg1 ;
+  real arg2 ;
+  real arg3 ;
+  real arg4 ;
+  OmissionShader *result = 0 ;
+  double val1 ;
+  int ecode1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  double val3 ;
+  int ecode3 = 0 ;
+  double val4 ;
+  int ecode4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOO:new_OmissionShader",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_OmissionShader" "', argument " "1"" of type '" "real""'");
+  } 
+  arg1 = static_cast< real >(val1);
+  ecode2 = SWIG_AsVal_double(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_OmissionShader" "', argument " "2"" of type '" "real""'");
+  } 
+  arg2 = static_cast< real >(val2);
+  ecode3 = SWIG_AsVal_double(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_OmissionShader" "', argument " "3"" of type '" "real""'");
+  } 
+  arg3 = static_cast< real >(val3);
+  ecode4 = SWIG_AsVal_double(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "new_OmissionShader" "', argument " "4"" of type '" "real""'");
+  } 
+  arg4 = static_cast< real >(val4);
+  {
+    try {
+      result = (OmissionShader *)new OmissionShader(arg1,arg2,arg3,arg4);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_OmissionShader, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_OmissionShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  OmissionShader *arg1 = (OmissionShader *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_OmissionShader",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OmissionShader, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_OmissionShader" "', argument " "1"" of type '" "OmissionShader *""'"); 
+  }
+  arg1 = reinterpret_cast< OmissionShader * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_OmissionShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  OmissionShader *arg1 = (OmissionShader *) 0 ;
+  Stroke *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:OmissionShader_shade",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_OmissionShader, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "OmissionShader_shade" "', argument " "1"" of type '" "OmissionShader const *""'"); 
+  }
+  arg1 = reinterpret_cast< OmissionShader * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Stroke,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "OmissionShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "OmissionShader_shade" "', argument " "2"" of type '" "Stroke &""'"); 
+  }
+  arg2 = reinterpret_cast< Stroke * >(argp2);
+  {
+    try {
+      ((OmissionShader const *)arg1)->shade(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *OmissionShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_OmissionShader, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_Operators_select(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryPredicate1D *arg1 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Operators_select",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryPredicate1D,  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Operators_select" "', argument " "1"" of type '" "UnaryPredicate1D &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_select" "', argument " "1"" of type '" "UnaryPredicate1D &""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryPredicate1D * >(argp1);
+  {
+    try {
+      Operators::select(*arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_chain__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = 0 ;
+  UnaryPredicate1D *arg2 = 0 ;
+  UnaryFunction1D<void > *arg3 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:Operators_chain",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator,  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Operators_chain" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_chain" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator &""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_UnaryPredicate1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Operators_chain" "', argument " "2"" of type '" "UnaryPredicate1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_chain" "', argument " "2"" of type '" "UnaryPredicate1D &""'"); 
+  }
+  arg2 = reinterpret_cast< UnaryPredicate1D * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_UnaryFunction1DTvoid_t,  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Operators_chain" "', argument " "3"" of type '" "UnaryFunction1D<void > &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_chain" "', argument " "3"" of type '" "UnaryFunction1D<void > &""'"); 
+  }
+  arg3 = reinterpret_cast< UnaryFunction1D<void > * >(argp3);
+  {
+    try {
+      Operators::chain(*arg1,*arg2,*arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_chain__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = 0 ;
+  UnaryPredicate1D *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Operators_chain",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator,  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Operators_chain" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_chain" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator &""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_UnaryPredicate1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Operators_chain" "', argument " "2"" of type '" "UnaryPredicate1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_chain" "', argument " "2"" of type '" "UnaryPredicate1D &""'"); 
+  }
+  arg2 = reinterpret_cast< UnaryPredicate1D * >(argp2);
+  {
+    try {
+      Operators::chain(*arg1,*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_chain(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_UnaryPredicate1D, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_Operators_chain__SWIG_1(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_UnaryPredicate1D, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_UnaryFunction1DTvoid_t, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          return _wrap_Operators_chain__SWIG_0(self, args);
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Operators_chain'.\n  Possible C/C++ prototypes are:\n    chain(ViewEdgeInternal::ViewEdgeIterator &,UnaryPredicate1D &,UnaryFunction1D<void > &)\n    Operators::chain(ViewEdgeInternal::ViewEdgeIterator &,UnaryPredicate1D &)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_bidirectionalChain__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ChainingIterator *arg1 = 0 ;
+  UnaryPredicate1D *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Operators_bidirectionalChain",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_ChainingIterator,  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Operators_bidirectionalChain" "', argument " "1"" of type '" "ChainingIterator &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_bidirectionalChain" "', argument " "1"" of type '" "ChainingIterator &""'"); 
+  }
+  arg1 = reinterpret_cast< ChainingIterator * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_UnaryPredicate1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Operators_bidirectionalChain" "', argument " "2"" of type '" "UnaryPredicate1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_bidirectionalChain" "', argument " "2"" of type '" "UnaryPredicate1D &""'"); 
+  }
+  arg2 = reinterpret_cast< UnaryPredicate1D * >(argp2);
+  {
+    try {
+      Operators::bidirectionalChain(*arg1,*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_bidirectionalChain__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ChainingIterator *arg1 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Operators_bidirectionalChain",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_ChainingIterator,  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Operators_bidirectionalChain" "', argument " "1"" of type '" "ChainingIterator &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_bidirectionalChain" "', argument " "1"" of type '" "ChainingIterator &""'"); 
+  }
+  arg1 = reinterpret_cast< ChainingIterator * >(argp1);
+  {
+    try {
+      Operators::bidirectionalChain(*arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_bidirectionalChain(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ChainingIterator, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Operators_bidirectionalChain__SWIG_1(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ChainingIterator, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_UnaryPredicate1D, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_Operators_bidirectionalChain__SWIG_0(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Operators_bidirectionalChain'.\n  Possible C/C++ prototypes are:\n    bidirectionalChain(ChainingIterator &,UnaryPredicate1D &)\n    Operators::bidirectionalChain(ChainingIterator &)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_sequentialSplit__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryPredicate0D *arg1 = 0 ;
+  UnaryPredicate0D *arg2 = 0 ;
+  float arg3 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  float val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:Operators_sequentialSplit",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryPredicate0D,  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Operators_sequentialSplit" "', argument " "1"" of type '" "UnaryPredicate0D &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_sequentialSplit" "', argument " "1"" of type '" "UnaryPredicate0D &""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryPredicate0D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_UnaryPredicate0D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Operators_sequentialSplit" "', argument " "2"" of type '" "UnaryPredicate0D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_sequentialSplit" "', argument " "2"" of type '" "UnaryPredicate0D &""'"); 
+  }
+  arg2 = reinterpret_cast< UnaryPredicate0D * >(argp2);
+  ecode3 = SWIG_AsVal_float(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Operators_sequentialSplit" "', argument " "3"" of type '" "float""'");
+  } 
+  arg3 = static_cast< float >(val3);
+  {
+    try {
+      Operators::sequentialSplit(*arg1,*arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_sequentialSplit__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryPredicate0D *arg1 = 0 ;
+  UnaryPredicate0D *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Operators_sequentialSplit",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryPredicate0D,  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Operators_sequentialSplit" "', argument " "1"" of type '" "UnaryPredicate0D &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_sequentialSplit" "', argument " "1"" of type '" "UnaryPredicate0D &""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryPredicate0D * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_UnaryPredicate0D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Operators_sequentialSplit" "', argument " "2"" of type '" "UnaryPredicate0D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_sequentialSplit" "', argument " "2"" of type '" "UnaryPredicate0D &""'"); 
+  }
+  arg2 = reinterpret_cast< UnaryPredicate0D * >(argp2);
+  {
+    try {
+      Operators::sequentialSplit(*arg1,*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_sequentialSplit__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryPredicate0D *arg1 = 0 ;
+  float arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  float val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Operators_sequentialSplit",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryPredicate0D,  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Operators_sequentialSplit" "', argument " "1"" of type '" "UnaryPredicate0D &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_sequentialSplit" "', argument " "1"" of type '" "UnaryPredicate0D &""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryPredicate0D * >(argp1);
+  ecode2 = SWIG_AsVal_float(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Operators_sequentialSplit" "', argument " "2"" of type '" "float""'");
+  } 
+  arg2 = static_cast< float >(val2);
+  {
+    try {
+      Operators::sequentialSplit(*arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_sequentialSplit__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryPredicate0D *arg1 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Operators_sequentialSplit",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryPredicate0D,  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Operators_sequentialSplit" "', argument " "1"" of type '" "UnaryPredicate0D &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_sequentialSplit" "', argument " "1"" of type '" "UnaryPredicate0D &""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryPredicate0D * >(argp1);
+  {
+    try {
+      Operators::sequentialSplit(*arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_sequentialSplit(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryPredicate0D, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Operators_sequentialSplit__SWIG_3(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryPredicate0D, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_UnaryPredicate0D, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_Operators_sequentialSplit__SWIG_1(self, args);
+      }
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryPredicate0D, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_float(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_Operators_sequentialSplit__SWIG_2(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryPredicate0D, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_UnaryPredicate0D, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_float(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          return _wrap_Operators_sequentialSplit__SWIG_0(self, args);
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Operators_sequentialSplit'.\n  Possible C/C++ prototypes are:\n    sequentialSplit(UnaryPredicate0D &,UnaryPredicate0D &,float)\n    sequentialSplit(UnaryPredicate0D &,UnaryPredicate0D &)\n    sequentialSplit(UnaryPredicate0D &,float)\n    Operators::sequentialSplit(UnaryPredicate0D &)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_recursiveSplit__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction0D<double > *arg1 = 0 ;
+  UnaryPredicate1D *arg2 = 0 ;
+  float arg3 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  float val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:Operators_recursiveSplit",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DTdouble_t,  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction0D<double > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_UnaryPredicate1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Operators_recursiveSplit" "', argument " "2"" of type '" "UnaryPredicate1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_recursiveSplit" "', argument " "2"" of type '" "UnaryPredicate1D &""'"); 
+  }
+  arg2 = reinterpret_cast< UnaryPredicate1D * >(argp2);
+  ecode3 = SWIG_AsVal_float(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Operators_recursiveSplit" "', argument " "3"" of type '" "float""'");
+  } 
+  arg3 = static_cast< float >(val3);
+  {
+    try {
+      Operators::recursiveSplit(*arg1,*arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_recursiveSplit__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction0D<double > *arg1 = 0 ;
+  UnaryPredicate1D *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Operators_recursiveSplit",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DTdouble_t,  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction0D<double > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_UnaryPredicate1D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Operators_recursiveSplit" "', argument " "2"" of type '" "UnaryPredicate1D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_recursiveSplit" "', argument " "2"" of type '" "UnaryPredicate1D &""'"); 
+  }
+  arg2 = reinterpret_cast< UnaryPredicate1D * >(argp2);
+  {
+    try {
+      Operators::recursiveSplit(*arg1,*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_recursiveSplit__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction0D<double > *arg1 = 0 ;
+  UnaryPredicate0D *arg2 = 0 ;
+  UnaryPredicate1D *arg3 = 0 ;
+  float arg4 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  float val4 ;
+  int ecode4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOO:Operators_recursiveSplit",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DTdouble_t,  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction0D<double > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_UnaryPredicate0D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Operators_recursiveSplit" "', argument " "2"" of type '" "UnaryPredicate0D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_recursiveSplit" "', argument " "2"" of type '" "UnaryPredicate0D &""'"); 
+  }
+  arg2 = reinterpret_cast< UnaryPredicate0D * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_UnaryPredicate1D,  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Operators_recursiveSplit" "', argument " "3"" of type '" "UnaryPredicate1D &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_recursiveSplit" "', argument " "3"" of type '" "UnaryPredicate1D &""'"); 
+  }
+  arg3 = reinterpret_cast< UnaryPredicate1D * >(argp3);
+  ecode4 = SWIG_AsVal_float(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Operators_recursiveSplit" "', argument " "4"" of type '" "float""'");
+  } 
+  arg4 = static_cast< float >(val4);
+  {
+    try {
+      Operators::recursiveSplit(*arg1,*arg2,*arg3,arg4);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_recursiveSplit__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryFunction0D<double > *arg1 = 0 ;
+  UnaryPredicate0D *arg2 = 0 ;
+  UnaryPredicate1D *arg3 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:Operators_recursiveSplit",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DTdouble_t,  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryFunction0D<double > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_UnaryPredicate0D,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Operators_recursiveSplit" "', argument " "2"" of type '" "UnaryPredicate0D &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_recursiveSplit" "', argument " "2"" of type '" "UnaryPredicate0D &""'"); 
+  }
+  arg2 = reinterpret_cast< UnaryPredicate0D * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_UnaryPredicate1D,  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Operators_recursiveSplit" "', argument " "3"" of type '" "UnaryPredicate1D &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_recursiveSplit" "', argument " "3"" of type '" "UnaryPredicate1D &""'"); 
+  }
+  arg3 = reinterpret_cast< UnaryPredicate1D * >(argp3);
+  {
+    try {
+      Operators::recursiveSplit(*arg1,*arg2,*arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_recursiveSplit(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[5];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 4); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DTdouble_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_UnaryPredicate1D, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_Operators_recursiveSplit__SWIG_1(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DTdouble_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_UnaryPredicate1D, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_float(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          return _wrap_Operators_recursiveSplit__SWIG_0(self, args);
+        }
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DTdouble_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_UnaryPredicate0D, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_UnaryPredicate1D, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          return _wrap_Operators_recursiveSplit__SWIG_3(self, args);
+        }
+      }
+    }
+  }
+  if (argc == 4) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DTdouble_t, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_UnaryPredicate0D, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        void *vptr = 0;
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_UnaryPredicate1D, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          {
+            int res = SWIG_AsVal_float(argv[3], NULL);
+            _v = SWIG_CheckState(res);
+          }
+          if (_v) {
+            return _wrap_Operators_recursiveSplit__SWIG_2(self, args);
+          }
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Operators_recursiveSplit'.\n  Possible C/C++ prototypes are:\n    recursiveSplit(UnaryFunction0D<double > &,UnaryPredicate1D &,float)\n    recursiveSplit(UnaryFunction0D<double > &,UnaryPredicate1D &)\n    recursiveSplit(UnaryFunction0D<double > &,UnaryPredicate0D &,UnaryPredicate1D &,float)\n    Operators::recursiveSplit(UnaryFunction0D<double > &,UnaryPredicate0D &,UnaryPredicate1D &)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_sort(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  BinaryPredicate1D *arg1 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Operators_sort",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_BinaryPredicate1D,  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Operators_sort" "', argument " "1"" of type '" "BinaryPredicate1D &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_sort" "', argument " "1"" of type '" "BinaryPredicate1D &""'"); 
+  }
+  arg1 = reinterpret_cast< BinaryPredicate1D * >(argp1);
+  {
+    try {
+      Operators::sort(*arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_create(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  UnaryPredicate1D *arg1 = 0 ;
+  std::vector<StrokeShader * > arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Operators_create",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryPredicate1D,  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Operators_create" "', argument " "1"" of type '" "UnaryPredicate1D &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_create" "', argument " "1"" of type '" "UnaryPredicate1D &""'"); 
+  }
+  arg1 = reinterpret_cast< UnaryPredicate1D * >(argp1);
+  {
+    std::vector<StrokeShader*,std::allocator<StrokeShader * > > *ptr = (std::vector<StrokeShader*,std::allocator<StrokeShader * > > *)0;
+    int res = swig::asptr(obj1, &ptr);
+    if (!SWIG_IsOK(res) || !ptr) {
+      SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "Operators_create" "', argument " "2"" of type '" "std::vector<StrokeShader * >""'"); 
+    }
+    arg2 = *ptr;
+    if (SWIG_IsNewObj(res)) delete ptr;
+  }
+  {
+    try {
+      Operators::create(*arg1,arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_getViewEdgeFromIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  unsigned int arg1 ;
+  ViewEdge *result = 0 ;
+  unsigned int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Operators_getViewEdgeFromIndex",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_unsigned_SS_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "Operators_getViewEdgeFromIndex" "', argument " "1"" of type '" "unsigned int""'");
+  } 
+  arg1 = static_cast< unsigned int >(val1);
+  {
+    try {
+      result = (ViewEdge *)Operators::getViewEdgeFromIndex(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewEdge, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_getChainFromIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  unsigned int arg1 ;
+  Chain *result = 0 ;
+  unsigned int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Operators_getChainFromIndex",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_unsigned_SS_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "Operators_getChainFromIndex" "', argument " "1"" of type '" "unsigned int""'");
+  } 
+  arg1 = static_cast< unsigned int >(val1);
+  {
+    try {
+      result = (Chain *)Operators::getChainFromIndex(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Chain, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_getStrokeFromIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  unsigned int arg1 ;
+  Stroke *result = 0 ;
+  unsigned int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Operators_getStrokeFromIndex",&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_unsigned_SS_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "Operators_getStrokeFromIndex" "', argument " "1"" of type '" "unsigned int""'");
+  } 
+  arg1 = static_cast< unsigned int >(val1);
+  {
+    try {
+      result = (Stroke *)Operators::getStrokeFromIndex(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Stroke, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_getViewEdgesSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  unsigned int result;
+  
+  if (!PyArg_ParseTuple(args,(char *)":Operators_getViewEdgesSize")) SWIG_fail;
+  {
+    try {
+      result = (unsigned int)Operators::getViewEdgesSize();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_getChainsSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  unsigned int result;
+  
+  if (!PyArg_ParseTuple(args,(char *)":Operators_getChainsSize")) SWIG_fail;
+  {
+    try {
+      result = (unsigned int)Operators::getChainsSize();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_getStrokesSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  unsigned int result;
+  
+  if (!PyArg_ParseTuple(args,(char *)":Operators_getStrokesSize")) SWIG_fail;
+  {
+    try {
+      result = (unsigned int)Operators::getStrokesSize();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_Operators(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Operators *arg1 = (Operators *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_Operators",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Operators, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Operators" "', argument " "1"" of type '" "Operators *""'"); 
+  }
+  arg1 = reinterpret_cast< Operators * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *Operators_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Operators, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_ltstr___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ltstr *arg1 = (ltstr *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  int res3 ;
+  char *buf3 = 0 ;
+  int alloc3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:ltstr___call__",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ltstr, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ltstr___call__" "', argument " "1"" of type '" "ltstr const *""'"); 
+  }
+  arg1 = reinterpret_cast< ltstr * >(argp1);
+  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ltstr___call__" "', argument " "2"" of type '" "char const *""'");
+  }
+  arg2 = reinterpret_cast< char * >(buf2);
+  res3 = SWIG_AsCharPtrAndSize(obj2, &buf3, NULL, &alloc3);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ltstr___call__" "', argument " "3"" of type '" "char const *""'");
+  }
+  arg3 = reinterpret_cast< char * >(buf3);
+  {
+    try {
+      result = (bool)((ltstr const *)arg1)->operator ()((char const *)arg2,(char const *)arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
+  return resultobj;
+fail:
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ltstr(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ltstr *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_ltstr")) SWIG_fail;
+  {
+    try {
+      result = (ltstr *)new ltstr();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ltstr, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ltstr(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ltstr *arg1 = (ltstr *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_ltstr",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ltstr, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ltstr" "', argument " "1"" of type '" "ltstr *""'"); 
+  }
+  arg1 = reinterpret_cast< ltstr * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *ltstr_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_ltstr, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_Canvas_getInstance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Canvas *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":Canvas_getInstance")) SWIG_fail;
+  {
+    try {
+      result = (Canvas *)Canvas::getInstance();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Canvas, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_Canvas(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Canvas *arg1 = (Canvas *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_Canvas",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Canvas" "', argument " "1"" of type '" "Canvas *""'"); 
+  }
+  arg1 = reinterpret_cast< Canvas * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_preDraw(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Canvas *arg1 = (Canvas *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Canvas_preDraw",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_preDraw" "', argument " "1"" of type '" "Canvas *""'"); 
+  }
+  arg1 = reinterpret_cast< Canvas * >(argp1);
+  {
+    try {
+      (arg1)->preDraw();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_Draw(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Canvas *arg1 = (Canvas *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Canvas_Draw",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_Draw" "', argument " "1"" of type '" "Canvas *""'"); 
+  }
+  arg1 = reinterpret_cast< Canvas * >(argp1);
+  {
+    try {
+      (arg1)->Draw();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_postDraw(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Canvas *arg1 = (Canvas *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Canvas_postDraw",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_postDraw" "', argument " "1"" of type '" "Canvas *""'"); 
+  }
+  arg1 = reinterpret_cast< Canvas * >(argp1);
+  {
+    try {
+      (arg1)->postDraw();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_Render(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Canvas *arg1 = (Canvas *) 0 ;
+  StrokeRenderer *arg2 = (StrokeRenderer *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Canvas_Render",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_Render" "', argument " "1"" of type '" "Canvas *""'"); 
+  }
+  arg1 = reinterpret_cast< Canvas * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_StrokeRenderer, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Canvas_Render" "', argument " "2"" of type '" "StrokeRenderer const *""'"); 
+  }
+  arg2 = reinterpret_cast< StrokeRenderer * >(argp2);
+  {
+    try {
+      (arg1)->Render((StrokeRenderer const *)arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_RenderBasic(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Canvas *arg1 = (Canvas *) 0 ;
+  StrokeRenderer *arg2 = (StrokeRenderer *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Canvas_RenderBasic",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_RenderBasic" "', argument " "1"" of type '" "Canvas *""'"); 
+  }
+  arg1 = reinterpret_cast< Canvas * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_StrokeRenderer, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Canvas_RenderBasic" "', argument " "2"" of type '" "StrokeRenderer const *""'"); 
+  }
+  arg2 = reinterpret_cast< StrokeRenderer * >(argp2);
+  {
+    try {
+      (arg1)->RenderBasic((StrokeRenderer const *)arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_RenderStroke(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Canvas *arg1 = (Canvas *) 0 ;
+  Stroke *arg2 = (Stroke *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Canvas_RenderStroke",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_RenderStroke" "', argument " "1"" of type '" "Canvas *""'"); 
+  }
+  arg1 = reinterpret_cast< Canvas * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_Stroke, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Canvas_RenderStroke" "', argument " "2"" of type '" "Stroke *""'"); 
+  }
+  arg2 = reinterpret_cast< Stroke * >(argp2);
+  {
+    try {
+      (arg1)->RenderStroke(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_init(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Canvas *arg1 = (Canvas *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Canvas_init",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_init" "', argument " "1"" of type '" "Canvas *""'"); 
+  }
+  arg1 = reinterpret_cast< Canvas * >(argp1);
+  {
+    try {
+      (arg1)->init();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_Clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Canvas *arg1 = (Canvas *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Canvas_Clear",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_Clear" "', argument " "1"" of type '" "Canvas *""'"); 
+  }
+  arg1 = reinterpret_cast< Canvas * >(argp1);
+  {
+    try {
+      (arg1)->Clear();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_Erase(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Canvas *arg1 = (Canvas *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Canvas_Erase",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_Erase" "', argument " "1"" of type '" "Canvas *""'"); 
+  }
+  arg1 = reinterpret_cast< Canvas * >(argp1);
+  {
+    try {
+      (arg1)->Erase();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_readColorPixels(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Canvas *arg1 = (Canvas *) 0 ;
+  int arg2 ;
+  int arg3 ;
+  int arg4 ;
+  int arg5 ;
+  RGBImage *arg6 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;
+  int val5 ;
+  int ecode5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOOOO:Canvas_readColorPixels",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_readColorPixels" "', argument " "1"" of type '" "Canvas const *""'"); 
+  }
+  arg1 = reinterpret_cast< Canvas * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Canvas_readColorPixels" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Canvas_readColorPixels" "', argument " "3"" of type '" "int""'");
+  } 
+  arg3 = static_cast< int >(val3);
+  ecode4 = SWIG_AsVal_int(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Canvas_readColorPixels" "', argument " "4"" of type '" "int""'");
+  } 
+  arg4 = static_cast< int >(val4);
+  ecode5 = SWIG_AsVal_int(obj4, &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "Canvas_readColorPixels" "', argument " "5"" of type '" "int""'");
+  } 
+  arg5 = static_cast< int >(val5);
+  res6 = SWIG_ConvertPtr(obj5, &argp6, SWIGTYPE_p_RGBImage,  0 );
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "Canvas_readColorPixels" "', argument " "6"" of type '" "RGBImage &""'"); 
+  }
+  if (!argp6) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Canvas_readColorPixels" "', argument " "6"" of type '" "RGBImage &""'"); 
+  }
+  arg6 = reinterpret_cast< RGBImage * >(argp6);
+  {
+    try {
+      ((Canvas const *)arg1)->readColorPixels(arg2,arg3,arg4,arg5,*arg6);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_readDepthPixels(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Canvas *arg1 = (Canvas *) 0 ;
+  int arg2 ;
+  int arg3 ;
+  int arg4 ;
+  int arg5 ;
+  GrayImage *arg6 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;
+  int val5 ;
+  int ecode5 = 0 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOOOO:Canvas_readDepthPixels",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_readDepthPixels" "', argument " "1"" of type '" "Canvas const *""'"); 
+  }
+  arg1 = reinterpret_cast< Canvas * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Canvas_readDepthPixels" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Canvas_readDepthPixels" "', argument " "3"" of type '" "int""'");
+  } 
+  arg3 = static_cast< int >(val3);
+  ecode4 = SWIG_AsVal_int(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Canvas_readDepthPixels" "', argument " "4"" of type '" "int""'");
+  } 
+  arg4 = static_cast< int >(val4);
+  ecode5 = SWIG_AsVal_int(obj4, &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "Canvas_readDepthPixels" "', argument " "5"" of type '" "int""'");
+  } 
+  arg5 = static_cast< int >(val5);
+  res6 = SWIG_ConvertPtr(obj5, &argp6, SWIGTYPE_p_GrayImage,  0 );
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "Canvas_readDepthPixels" "', argument " "6"" of type '" "GrayImage &""'"); 
+  }
+  if (!argp6) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Canvas_readDepthPixels" "', argument " "6"" of type '" "GrayImage &""'"); 
+  }
+  arg6 = reinterpret_cast< GrayImage * >(argp6);
+  {
+    try {
+      ((Canvas const *)arg1)->readDepthPixels(arg2,arg3,arg4,arg5,*arg6);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_update(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Canvas *arg1 = (Canvas *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Canvas_update",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_update" "', argument " "1"" of type '" "Canvas *""'"); 
+  }
+  arg1 = reinterpret_cast< Canvas * >(argp1);
+  {
+    try {
+      (arg1)->update();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_isEmpty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Canvas *arg1 = (Canvas *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Canvas_isEmpty",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_isEmpty" "', argument " "1"" of type '" "Canvas const *""'"); 
+  }
+  arg1 = reinterpret_cast< Canvas * >(argp1);
+  {
+    try {
+      result = (bool)((Canvas const *)arg1)->isEmpty();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_loadMap__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Canvas *arg1 = (Canvas *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  unsigned int arg4 ;
+  float arg5 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  int res3 ;
+  char *buf3 = 0 ;
+  int alloc3 = 0 ;
+  unsigned int val4 ;
+  int ecode4 = 0 ;
+  float val5 ;
+  int ecode5 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOOO:Canvas_loadMap",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_loadMap" "', argument " "1"" of type '" "Canvas *""'"); 
+  }
+  arg1 = reinterpret_cast< Canvas * >(argp1);
+  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Canvas_loadMap" "', argument " "2"" of type '" "char const *""'");
+  }
+  arg2 = reinterpret_cast< char * >(buf2);
+  res3 = SWIG_AsCharPtrAndSize(obj2, &buf3, NULL, &alloc3);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Canvas_loadMap" "', argument " "3"" of type '" "char const *""'");
+  }
+  arg3 = reinterpret_cast< char * >(buf3);
+  ecode4 = SWIG_AsVal_unsigned_SS_int(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Canvas_loadMap" "', argument " "4"" of type '" "unsigned int""'");
+  } 
+  arg4 = static_cast< unsigned int >(val4);
+  ecode5 = SWIG_AsVal_float(obj4, &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "Canvas_loadMap" "', argument " "5"" of type '" "float""'");
+  } 
+  arg5 = static_cast< float >(val5);
+  {
+    try {
+      (arg1)->loadMap((char const *)arg2,(char const *)arg3,arg4,arg5);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
+  return resultobj;
+fail:
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_loadMap__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Canvas *arg1 = (Canvas *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  unsigned int arg4 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  int res3 ;
+  char *buf3 = 0 ;
+  int alloc3 = 0 ;
+  unsigned int val4 ;
+  int ecode4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOO:Canvas_loadMap",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_loadMap" "', argument " "1"" of type '" "Canvas *""'"); 
+  }
+  arg1 = reinterpret_cast< Canvas * >(argp1);
+  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Canvas_loadMap" "', argument " "2"" of type '" "char const *""'");
+  }
+  arg2 = reinterpret_cast< char * >(buf2);
+  res3 = SWIG_AsCharPtrAndSize(obj2, &buf3, NULL, &alloc3);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Canvas_loadMap" "', argument " "3"" of type '" "char const *""'");
+  }
+  arg3 = reinterpret_cast< char * >(buf3);
+  ecode4 = SWIG_AsVal_unsigned_SS_int(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Canvas_loadMap" "', argument " "4"" of type '" "unsigned int""'");
+  } 
+  arg4 = static_cast< unsigned int >(val4);
+  {
+    try {
+      (arg1)->loadMap((char const *)arg2,(char const *)arg3,arg4);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
+  return resultobj;
+fail:
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_loadMap__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Canvas *arg1 = (Canvas *) 0 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  int res3 ;
+  char *buf3 = 0 ;
+  int alloc3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:Canvas_loadMap",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_loadMap" "', argument " "1"" of type '" "Canvas *""'"); 
+  }
+  arg1 = reinterpret_cast< Canvas * >(argp1);
+  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Canvas_loadMap" "', argument " "2"" of type '" "char const *""'");
+  }
+  arg2 = reinterpret_cast< char * >(buf2);
+  res3 = SWIG_AsCharPtrAndSize(obj2, &buf3, NULL, &alloc3);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Canvas_loadMap" "', argument " "3"" of type '" "char const *""'");
+  }
+  arg3 = reinterpret_cast< char * >(buf3);
+  {
+    try {
+      (arg1)->loadMap((char const *)arg2,(char const *)arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
+  return resultobj;
+fail:
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  if (alloc3 == SWIG_NEWOBJ) delete[] buf3;
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_loadMap(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[6];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 5); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 3) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Canvas, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_AsCharPtrAndSize(argv[1], 0, NULL, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        int res = SWIG_AsCharPtrAndSize(argv[2], 0, NULL, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          return _wrap_Canvas_loadMap__SWIG_2(self, args);
+        }
+      }
+    }
+  }
+  if (argc == 4) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Canvas, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_AsCharPtrAndSize(argv[1], 0, NULL, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        int res = SWIG_AsCharPtrAndSize(argv[2], 0, NULL, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          {
+            int res = SWIG_AsVal_unsigned_SS_int(argv[3], NULL);
+            _v = SWIG_CheckState(res);
+          }
+          if (_v) {
+            return _wrap_Canvas_loadMap__SWIG_1(self, args);
+          }
+        }
+      }
+    }
+  }
+  if (argc == 5) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Canvas, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_AsCharPtrAndSize(argv[1], 0, NULL, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        int res = SWIG_AsCharPtrAndSize(argv[2], 0, NULL, 0);
+        _v = SWIG_CheckState(res);
+        if (_v) {
+          {
+            int res = SWIG_AsVal_unsigned_SS_int(argv[3], NULL);
+            _v = SWIG_CheckState(res);
+          }
+          if (_v) {
+            {
+              int res = SWIG_AsVal_float(argv[4], NULL);
+              _v = SWIG_CheckState(res);
+            }
+            if (_v) {
+              return _wrap_Canvas_loadMap__SWIG_0(self, args);
+            }
+          }
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Canvas_loadMap'.\n  Possible C/C++ prototypes are:\n    loadMap(char const *,char const *,unsigned int,float)\n    loadMap(char const *,char const *,unsigned int)\n    loadMap(char const *,char const *)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_readMapPixel(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Canvas *arg1 = (Canvas *) 0 ;
+  char *arg2 = (char *) 0 ;
+  int arg3 ;
+  int arg4 ;
+  int arg5 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;
+  int val5 ;
+  int ecode5 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOOOO:Canvas_readMapPixel",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_readMapPixel" "', argument " "1"" of type '" "Canvas *""'"); 
+  }
+  arg1 = reinterpret_cast< Canvas * >(argp1);
+  res2 = SWIG_AsCharPtrAndSize(obj1, &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Canvas_readMapPixel" "', argument " "2"" of type '" "char const *""'");
+  }
+  arg2 = reinterpret_cast< char * >(buf2);
+  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Canvas_readMapPixel" "', argument " "3"" of type '" "int""'");
+  } 
+  arg3 = static_cast< int >(val3);
+  ecode4 = SWIG_AsVal_int(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Canvas_readMapPixel" "', argument " "4"" of type '" "int""'");
+  } 
+  arg4 = static_cast< int >(val4);
+  ecode5 = SWIG_AsVal_int(obj4, &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "Canvas_readMapPixel" "', argument " "5"" of type '" "int""'");
+  } 
+  arg5 = static_cast< int >(val5);
+  {
+    try {
+      result = (float)(arg1)->readMapPixel((char const *)arg2,arg3,arg4,arg5);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  return resultobj;
+fail:
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_loadSteerableViewMap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Canvas *arg1 = (Canvas *) 0 ;
+  SteerableViewMap *arg2 = (SteerableViewMap *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Canvas_loadSteerableViewMap",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_loadSteerableViewMap" "', argument " "1"" of type '" "Canvas *""'"); 
+  }
+  arg1 = reinterpret_cast< Canvas * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SteerableViewMap, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Canvas_loadSteerableViewMap" "', argument " "2"" of type '" "SteerableViewMap *""'"); 
+  }
+  arg2 = reinterpret_cast< SteerableViewMap * >(argp2);
+  {
+    try {
+      (arg1)->loadSteerableViewMap(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_getSteerableViewMap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Canvas *arg1 = (Canvas *) 0 ;
+  SteerableViewMap *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Canvas_getSteerableViewMap",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_getSteerableViewMap" "', argument " "1"" of type '" "Canvas *""'"); 
+  }
+  arg1 = reinterpret_cast< Canvas * >(argp1);
+  {
+    try {
+      result = (SteerableViewMap *)(arg1)->getSteerableViewMap();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SteerableViewMap, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_selectedFEdge__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Canvas *arg1 = (Canvas *) 0 ;
+  FEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Canvas_selectedFEdge",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_selectedFEdge" "', argument " "1"" of type '" "Canvas const *""'"); 
+  }
+  arg1 = reinterpret_cast< Canvas * >(argp1);
+  {
+    try {
+      result = (FEdge *)((Canvas const *)arg1)->selectedFEdge();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FEdge, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_selectedFEdge__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Canvas *arg1 = (Canvas *) 0 ;
+  FEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Canvas_selectedFEdge",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_selectedFEdge" "', argument " "1"" of type '" "Canvas *""'"); 
+  }
+  arg1 = reinterpret_cast< Canvas * >(argp1);
+  {
+    try {
+      result = (FEdge *)(arg1)->selectedFEdge();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FEdge, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_selectedFEdge(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Canvas, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Canvas_selectedFEdge__SWIG_1(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Canvas, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Canvas_selectedFEdge__SWIG_0(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Canvas_selectedFEdge'.\n  Possible C/C++ prototypes are:\n    selectedFEdge()\n    selectedFEdge()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_width(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Canvas *arg1 = (Canvas *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Canvas_width",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_width" "', argument " "1"" of type '" "Canvas const *""'"); 
+  }
+  arg1 = reinterpret_cast< Canvas * >(argp1);
+  {
+    try {
+      result = (int)((Canvas const *)arg1)->width();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_height(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Canvas *arg1 = (Canvas *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Canvas_height",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_height" "', argument " "1"" of type '" "Canvas const *""'"); 
+  }
+  arg1 = reinterpret_cast< Canvas * >(argp1);
+  {
+    try {
+      result = (int)((Canvas const *)arg1)->height();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_currentPaperTextureIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Canvas *arg1 = (Canvas *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Canvas_currentPaperTextureIndex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_currentPaperTextureIndex" "', argument " "1"" of type '" "Canvas const *""'"); 
+  }
+  arg1 = reinterpret_cast< Canvas * >(argp1);
+  {
+    try {
+      result = (int)((Canvas const *)arg1)->currentPaperTextureIndex();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_scene3DBBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Canvas *arg1 = (Canvas *) 0 ;
+  SwigValueWrapper<BBox<VecMat::Vec3<double > > > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Canvas_scene3DBBox",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_scene3DBBox" "', argument " "1"" of type '" "Canvas const *""'"); 
+  }
+  arg1 = reinterpret_cast< Canvas * >(argp1);
+  {
+    try {
+      result = ((Canvas const *)arg1)->scene3DBBox();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj((new BBox<Geometry::Vec3r >(static_cast< const BBox<Geometry::Vec3r >& >(result))), SWIGTYPE_p_BBoxTVecMat__Vec3Tdouble_t_t, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_renderer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Canvas *arg1 = (Canvas *) 0 ;
+  StrokeRenderer *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Canvas_renderer",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_renderer" "', argument " "1"" of type '" "Canvas const *""'"); 
+  }
+  arg1 = reinterpret_cast< Canvas * >(argp1);
+  {
+    try {
+      result = (StrokeRenderer *)((Canvas const *)arg1)->renderer();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeRenderer, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_getCurrentStyleModule(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Canvas *arg1 = (Canvas *) 0 ;
+  StyleModule *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Canvas_getCurrentStyleModule",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_getCurrentStyleModule" "', argument " "1"" of type '" "Canvas *""'"); 
+  }
+  arg1 = reinterpret_cast< Canvas * >(argp1);
+  {
+    try {
+      result = (StyleModule *)(arg1)->getCurrentStyleModule();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StyleModule, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_getRecordFlag(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Canvas *arg1 = (Canvas *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Canvas_getRecordFlag",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_getRecordFlag" "', argument " "1"" of type '" "Canvas const *""'"); 
+  }
+  arg1 = reinterpret_cast< Canvas * >(argp1);
+  {
+    try {
+      result = (bool)((Canvas const *)arg1)->getRecordFlag();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_SetSelectedFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Canvas *arg1 = (Canvas *) 0 ;
+  FEdge *arg2 = (FEdge *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Canvas_SetSelectedFEdge",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_SetSelectedFEdge" "', argument " "1"" of type '" "Canvas *""'"); 
+  }
+  arg1 = reinterpret_cast< Canvas * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FEdge, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Canvas_SetSelectedFEdge" "', argument " "2"" of type '" "FEdge *""'"); 
+  }
+  arg2 = reinterpret_cast< FEdge * >(argp2);
+  {
+    try {
+      (arg1)->SetSelectedFEdge(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_InsertStyleModule(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Canvas *arg1 = (Canvas *) 0 ;
+  unsigned int arg2 ;
+  StyleModule *arg3 = (StyleModule *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:Canvas_InsertStyleModule",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_InsertStyleModule" "', argument " "1"" of type '" "Canvas *""'"); 
+  }
+  arg1 = reinterpret_cast< Canvas * >(argp1);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Canvas_InsertStyleModule" "', argument " "2"" of type '" "unsigned int""'");
+  } 
+  arg2 = static_cast< unsigned int >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_StyleModule, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Canvas_InsertStyleModule" "', argument " "3"" of type '" "StyleModule *""'"); 
+  }
+  arg3 = reinterpret_cast< StyleModule * >(argp3);
+  {
+    try {
+      (arg1)->InsertStyleModule(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_RemoveStyleModule(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Canvas *arg1 = (Canvas *) 0 ;
+  unsigned int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Canvas_RemoveStyleModule",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_RemoveStyleModule" "', argument " "1"" of type '" "Canvas *""'"); 
+  }
+  arg1 = reinterpret_cast< Canvas * >(argp1);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Canvas_RemoveStyleModule" "', argument " "2"" of type '" "unsigned int""'");
+  } 
+  arg2 = static_cast< unsigned int >(val2);
+  {
+    try {
+      (arg1)->RemoveStyleModule(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_SwapStyleModules(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Canvas *arg1 = (Canvas *) 0 ;
+  unsigned int arg2 ;
+  unsigned int arg3 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
+  unsigned int val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:Canvas_SwapStyleModules",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_SwapStyleModules" "', argument " "1"" of type '" "Canvas *""'"); 
+  }
+  arg1 = reinterpret_cast< Canvas * >(argp1);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Canvas_SwapStyleModules" "', argument " "2"" of type '" "unsigned int""'");
+  } 
+  arg2 = static_cast< unsigned int >(val2);
+  ecode3 = SWIG_AsVal_unsigned_SS_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Canvas_SwapStyleModules" "', argument " "3"" of type '" "unsigned int""'");
+  } 
+  arg3 = static_cast< unsigned int >(val3);
+  {
+    try {
+      (arg1)->SwapStyleModules(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_ReplaceStyleModule(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Canvas *arg1 = (Canvas *) 0 ;
+  unsigned int arg2 ;
+  StyleModule *arg3 = (StyleModule *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:Canvas_ReplaceStyleModule",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_ReplaceStyleModule" "', argument " "1"" of type '" "Canvas *""'"); 
+  }
+  arg1 = reinterpret_cast< Canvas * >(argp1);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Canvas_ReplaceStyleModule" "', argument " "2"" of type '" "unsigned int""'");
+  } 
+  arg2 = static_cast< unsigned int >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_StyleModule, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Canvas_ReplaceStyleModule" "', argument " "3"" of type '" "StyleModule *""'"); 
+  }
+  arg3 = reinterpret_cast< StyleModule * >(argp3);
+  {
+    try {
+      (arg1)->ReplaceStyleModule(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_SetVisible(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Canvas *arg1 = (Canvas *) 0 ;
+  unsigned int arg2 ;
+  bool arg3 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
+  bool val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:Canvas_SetVisible",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_SetVisible" "', argument " "1"" of type '" "Canvas *""'"); 
+  }
+  arg1 = reinterpret_cast< Canvas * >(argp1);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Canvas_SetVisible" "', argument " "2"" of type '" "unsigned int""'");
+  } 
+  arg2 = static_cast< unsigned int >(val2);
+  ecode3 = SWIG_AsVal_bool(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Canvas_SetVisible" "', argument " "3"" of type '" "bool""'");
+  } 
+  arg3 = static_cast< bool >(val3);
+  {
+    try {
+      (arg1)->SetVisible(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_AddLayer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Canvas *arg1 = (Canvas *) 0 ;
+  StrokeLayer *arg2 = (StrokeLayer *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Canvas_AddLayer",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_AddLayer" "', argument " "1"" of type '" "Canvas *""'"); 
+  }
+  arg1 = reinterpret_cast< Canvas * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_StrokeLayer, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Canvas_AddLayer" "', argument " "2"" of type '" "StrokeLayer *""'"); 
+  }
+  arg2 = reinterpret_cast< StrokeLayer * >(argp2);
+  {
+    try {
+      (arg1)->AddLayer(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_SetCurrentPaperTextureIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Canvas *arg1 = (Canvas *) 0 ;
+  int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Canvas_SetCurrentPaperTextureIndex",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_SetCurrentPaperTextureIndex" "', argument " "1"" of type '" "Canvas *""'"); 
+  }
+  arg1 = reinterpret_cast< Canvas * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Canvas_SetCurrentPaperTextureIndex" "', argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  {
+    try {
+      (arg1)->SetCurrentPaperTextureIndex(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_changePaperTexture__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Canvas *arg1 = (Canvas *) 0 ;
+  bool arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Canvas_changePaperTexture",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_changePaperTexture" "', argument " "1"" of type '" "Canvas *""'"); 
+  }
+  arg1 = reinterpret_cast< Canvas * >(argp1);
+  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Canvas_changePaperTexture" "', argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = static_cast< bool >(val2);
+  {
+    try {
+      (arg1)->changePaperTexture(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_changePaperTexture__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Canvas *arg1 = (Canvas *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Canvas_changePaperTexture",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_changePaperTexture" "', argument " "1"" of type '" "Canvas *""'"); 
+  }
+  arg1 = reinterpret_cast< Canvas * >(argp1);
+  {
+    try {
+      (arg1)->changePaperTexture();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_changePaperTexture(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Canvas, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Canvas_changePaperTexture__SWIG_1(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Canvas, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_bool(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_Canvas_changePaperTexture__SWIG_0(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Canvas_changePaperTexture'.\n  Possible C/C++ prototypes are:\n    changePaperTexture(bool)\n    changePaperTexture()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_togglePaperTexture(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Canvas *arg1 = (Canvas *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Canvas_togglePaperTexture",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_togglePaperTexture" "', argument " "1"" of type '" "Canvas *""'"); 
+  }
+  arg1 = reinterpret_cast< Canvas * >(argp1);
+  {
+    try {
+      (arg1)->togglePaperTexture();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_resetModified__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Canvas *arg1 = (Canvas *) 0 ;
+  bool arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Canvas_resetModified",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_resetModified" "', argument " "1"" of type '" "Canvas *""'"); 
+  }
+  arg1 = reinterpret_cast< Canvas * >(argp1);
+  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Canvas_resetModified" "', argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = static_cast< bool >(val2);
+  {
+    try {
+      (arg1)->resetModified(arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_resetModified__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Canvas *arg1 = (Canvas *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:Canvas_resetModified",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_resetModified" "', argument " "1"" of type '" "Canvas *""'"); 
+  }
+  arg1 = reinterpret_cast< Canvas * >(argp1);
+  {
+    try {
+      (arg1)->resetModified();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_resetModified(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[3];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 2); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Canvas, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Canvas_resetModified__SWIG_1(self, args);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Canvas, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_bool(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_Canvas_resetModified__SWIG_0(self, args);
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Canvas_resetModified'.\n  Possible C/C++ prototypes are:\n    resetModified(bool)\n    resetModified()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_causalStyleModules__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Canvas *arg1 = (Canvas *) 0 ;
+  std::vector<unsigned int,std::allocator<unsigned int > > *arg2 = 0 ;
+  unsigned int arg3 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  unsigned int val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:Canvas_causalStyleModules",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_causalStyleModules" "', argument " "1"" of type '" "Canvas *""'"); 
+  }
+  arg1 = reinterpret_cast< Canvas * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTunsigned_int_std__allocatorTunsigned_int_t_t,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Canvas_causalStyleModules" "', argument " "2"" of type '" "std::vector<unsigned int,std::allocator<unsigned int > > &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Canvas_causalStyleModules" "', argument " "2"" of type '" "std::vector<unsigned int,std::allocator<unsigned int > > &""'"); 
+  }
+  arg2 = reinterpret_cast< std::vector<unsigned int,std::allocator<unsigned int > > * >(argp2);
+  ecode3 = SWIG_AsVal_unsigned_SS_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Canvas_causalStyleModules" "', argument " "3"" of type '" "unsigned int""'");
+  } 
+  arg3 = static_cast< unsigned int >(val3);
+  {
+    try {
+      (arg1)->causalStyleModules(*arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_causalStyleModules__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Canvas *arg1 = (Canvas *) 0 ;
+  std::vector<unsigned int,std::allocator<unsigned int > > *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OO:Canvas_causalStyleModules",&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_causalStyleModules" "', argument " "1"" of type '" "Canvas *""'"); 
+  }
+  arg1 = reinterpret_cast< Canvas * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTunsigned_int_std__allocatorTunsigned_int_t_t,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Canvas_causalStyleModules" "', argument " "2"" of type '" "std::vector<unsigned int,std::allocator<unsigned int > > &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Canvas_causalStyleModules" "', argument " "2"" of type '" "std::vector<unsigned int,std::allocator<unsigned int > > &""'"); 
+  }
+  arg2 = reinterpret_cast< std::vector<unsigned int,std::allocator<unsigned int > > * >(argp2);
+  {
+    try {
+      (arg1)->causalStyleModules(*arg2);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_causalStyleModules(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[4];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 3); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Canvas, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_std__vectorTunsigned_int_std__allocatorTunsigned_int_t_t, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_Canvas_causalStyleModules__SWIG_1(self, args);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Canvas, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      void *vptr = 0;
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_std__vectorTunsigned_int_std__allocatorTunsigned_int_t_t, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        {
+          int res = SWIG_AsVal_unsigned_SS_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          return _wrap_Canvas_causalStyleModules__SWIG_0(self, args);
+        }
+      }
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Canvas_causalStyleModules'.\n  Possible C/C++ prototypes are:\n    causalStyleModules(std::vector<unsigned int,std::allocator<unsigned int > > &,unsigned int)\n    causalStyleModules(std::vector<unsigned int,std::allocator<unsigned int > > &)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Canvas_setModified(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Canvas *arg1 = (Canvas *) 0 ;
+  unsigned int arg2 ;
+  bool arg3 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 0 ;
+  bool val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"OOO:Canvas_setModified",&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_setModified" "', argument " "1"" of type '" "Canvas *""'"); 
+  }
+  arg1 = reinterpret_cast< Canvas * >(argp1);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Canvas_setModified" "', argument " "2"" of type '" "unsigned int""'");
+  } 
+  arg2 = static_cast< unsigned int >(val2);
+  ecode3 = SWIG_AsVal_bool(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Canvas_setModified" "', argument " "3"" of type '" "bool""'");
+  } 
+  arg3 = static_cast< bool >(val3);
+  {
+    try {
+      (arg1)->setModified(arg2,arg3);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *Canvas_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_Canvas, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *_wrap_castToSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0D *arg1 = (Interface0D *) 0 ;
+  SVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:castToSVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "castToSVertex" "', argument " "1"" of type '" "Interface0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0D * >(argp1);
+  {
+    try {
+      result = (SVertex *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast<Interface0D,SVertex >(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_castToViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0D *arg1 = (Interface0D *) 0 ;
+  ViewVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:castToViewVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "castToViewVertex" "', argument " "1"" of type '" "Interface0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0D * >(argp1);
+  {
+    try {
+      result = (ViewVertex *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast<Interface0D,ViewVertex >(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_castToTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0D *arg1 = (Interface0D *) 0 ;
+  TVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:castToTVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "castToTVertex" "', argument " "1"" of type '" "Interface0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0D * >(argp1);
+  {
+    try {
+      result = (TVertex *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast<Interface0D,TVertex >(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_TVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_castToCurvePoint(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0D *arg1 = (Interface0D *) 0 ;
+  CurvePoint *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:castToCurvePoint",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "castToCurvePoint" "', argument " "1"" of type '" "Interface0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0D * >(argp1);
+  {
+    try {
+      result = (CurvePoint *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast<Interface0D,CurvePoint >(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_CurvePoint, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_castToStrokeVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0D *arg1 = (Interface0D *) 0 ;
+  StrokeVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:castToStrokeVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "castToStrokeVertex" "', argument " "1"" of type '" "Interface0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0D * >(argp1);
+  {
+    try {
+      result = (StrokeVertex *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast<Interface0D,StrokeVertex >(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_StrokeVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_castToNonTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0D *arg1 = (Interface0D *) 0 ;
+  NonTVertex *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:castToNonTVertex",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "castToNonTVertex" "', argument " "1"" of type '" "Interface0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0D * >(argp1);
+  {
+    try {
+      result = (NonTVertex *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast<Interface0D,NonTVertex >(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_NonTVertex, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_castToFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface1D *arg1 = (Interface1D *) 0 ;
+  FEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:castToFEdge",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "castToFEdge" "', argument " "1"" of type '" "Interface1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface1D * >(argp1);
+  {
+    try {
+      result = (FEdge *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast<Interface1D,FEdge >(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_FEdge, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_castToViewEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface1D *arg1 = (Interface1D *) 0 ;
+  ViewEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:castToViewEdge",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "castToViewEdge" "', argument " "1"" of type '" "Interface1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface1D * >(argp1);
+  {
+    try {
+      result = (ViewEdge *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast<Interface1D,ViewEdge >(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewEdge, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_castToStroke(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface1D *arg1 = (Interface1D *) 0 ;
+  Stroke *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:castToStroke",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "castToStroke" "', argument " "1"" of type '" "Interface1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface1D * >(argp1);
+  {
+    try {
+      result = (Stroke *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast<Interface1D,Stroke >(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Stroke, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_castToChain(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface1D *arg1 = (Interface1D *) 0 ;
+  Chain *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:castToChain",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface1D, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "castToChain" "', argument " "1"" of type '" "Interface1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface1D * >(argp1);
+  {
+    try {
+      result = (Chain *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast<Interface1D,Chain >(arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Chain, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+static PyMethodDef SwigMethods[] = {
+	 { (char *)"delete_PySwigIterator", _wrap_delete_PySwigIterator, METH_VARARGS, NULL},
+	 { (char *)"PySwigIterator_value", _wrap_PySwigIterator_value, METH_VARARGS, NULL},
+	 { (char *)"PySwigIterator_incr", _wrap_PySwigIterator_incr, METH_VARARGS, NULL},
+	 { (char *)"PySwigIterator_decr", _wrap_PySwigIterator_decr, METH_VARARGS, NULL},
+	 { (char *)"PySwigIterator_distance", _wrap_PySwigIterator_distance, METH_VARARGS, NULL},
+	 { (char *)"PySwigIterator_equal", _wrap_PySwigIterator_equal, METH_VARARGS, NULL},
+	 { (char *)"PySwigIterator_copy", _wrap_PySwigIterator_copy, METH_VARARGS, NULL},
+	 { (char *)"PySwigIterator_next", _wrap_PySwigIterator_next, METH_VARARGS, NULL},
+	 { (char *)"PySwigIterator_previous", _wrap_PySwigIterator_previous, METH_VARARGS, NULL},
+	 { (char *)"PySwigIterator_advance", _wrap_PySwigIterator_advance, METH_VARARGS, NULL},
+	 { (char *)"PySwigIterator___eq__", _wrap_PySwigIterator___eq__, METH_VARARGS, NULL},
+	 { (char *)"PySwigIterator___ne__", _wrap_PySwigIterator___ne__, METH_VARARGS, NULL},
+	 { (char *)"PySwigIterator___iadd__", _wrap_PySwigIterator___iadd__, METH_VARARGS, NULL},
+	 { (char *)"PySwigIterator___isub__", _wrap_PySwigIterator___isub__, METH_VARARGS, NULL},
+	 { (char *)"PySwigIterator___add__", _wrap_PySwigIterator___add__, METH_VARARGS, NULL},
+	 { (char *)"PySwigIterator___sub__", _wrap_PySwigIterator___sub__, METH_VARARGS, NULL},
+	 { (char *)"PySwigIterator_swigregister", PySwigIterator_swigregister, METH_VARARGS, NULL},
+	 { (char *)"vectorInt_iterator", _wrap_vectorInt_iterator, METH_VARARGS, NULL},
+	 { (char *)"vectorInt___nonzero__", _wrap_vectorInt___nonzero__, METH_VARARGS, NULL},
+	 { (char *)"vectorInt___len__", _wrap_vectorInt___len__, METH_VARARGS, NULL},
+	 { (char *)"vectorInt_pop", _wrap_vectorInt_pop, METH_VARARGS, NULL},
+	 { (char *)"vectorInt___getslice__", _wrap_vectorInt___getslice__, METH_VARARGS, NULL},
+	 { (char *)"vectorInt___setslice__", _wrap_vectorInt___setslice__, METH_VARARGS, NULL},
+	 { (char *)"vectorInt___delslice__", _wrap_vectorInt___delslice__, METH_VARARGS, NULL},
+	 { (char *)"vectorInt___delitem__", _wrap_vectorInt___delitem__, METH_VARARGS, NULL},
+	 { (char *)"vectorInt___getitem__", _wrap_vectorInt___getitem__, METH_VARARGS, NULL},
+	 { (char *)"vectorInt___setitem__", _wrap_vectorInt___setitem__, METH_VARARGS, NULL},
+	 { (char *)"vectorInt_append", _wrap_vectorInt_append, METH_VARARGS, NULL},
+	 { (char *)"vectorInt_empty", _wrap_vectorInt_empty, METH_VARARGS, NULL},
+	 { (char *)"vectorInt_size", _wrap_vectorInt_size, METH_VARARGS, NULL},
+	 { (char *)"vectorInt_clear", _wrap_vectorInt_clear, METH_VARARGS, NULL},
+	 { (char *)"vectorInt_swap", _wrap_vectorInt_swap, METH_VARARGS, NULL},
+	 { (char *)"vectorInt_get_allocator", _wrap_vectorInt_get_allocator, METH_VARARGS, NULL},
+	 { (char *)"vectorInt_begin", _wrap_vectorInt_begin, METH_VARARGS, NULL},
+	 { (char *)"vectorInt_end", _wrap_vectorInt_end, METH_VARARGS, NULL},
+	 { (char *)"vectorInt_rbegin", _wrap_vectorInt_rbegin, METH_VARARGS, NULL},
+	 { (char *)"vectorInt_rend", _wrap_vectorInt_rend, METH_VARARGS, NULL},
+	 { (char *)"vectorInt_pop_back", _wrap_vectorInt_pop_back, METH_VARARGS, NULL},
+	 { (char *)"vectorInt_erase", _wrap_vectorInt_erase, METH_VARARGS, NULL},
+	 { (char *)"new_vectorInt", _wrap_new_vectorInt, METH_VARARGS, NULL},
+	 { (char *)"vectorInt_push_back", _wrap_vectorInt_push_back, METH_VARARGS, NULL},
+	 { (char *)"vectorInt_front", _wrap_vectorInt_front, METH_VARARGS, NULL},
+	 { (char *)"vectorInt_back", _wrap_vectorInt_back, METH_VARARGS, NULL},
+	 { (char *)"vectorInt_assign", _wrap_vectorInt_assign, METH_VARARGS, NULL},
+	 { (char *)"vectorInt_resize", _wrap_vectorInt_resize, METH_VARARGS, NULL},
+	 { (char *)"vectorInt_insert", _wrap_vectorInt_insert, METH_VARARGS, NULL},
+	 { (char *)"vectorInt_reserve", _wrap_vectorInt_reserve, METH_VARARGS, NULL},
+	 { (char *)"vectorInt_capacity", _wrap_vectorInt_capacity, METH_VARARGS, NULL},
+	 { (char *)"delete_vectorInt", _wrap_delete_vectorInt, METH_VARARGS, NULL},
+	 { (char *)"vectorInt_swigregister", vectorInt_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_Id", _wrap_new_Id, METH_VARARGS, NULL},
+	 { (char *)"Id_getFirst", _wrap_Id_getFirst, METH_VARARGS, NULL},
+	 { (char *)"Id_getSecond", _wrap_Id_getSecond, METH_VARARGS, NULL},
+	 { (char *)"Id_setFirst", _wrap_Id_setFirst, METH_VARARGS, NULL},
+	 { (char *)"Id_setSecond", _wrap_Id_setSecond, METH_VARARGS, NULL},
+	 { (char *)"Id___eq__", _wrap_Id___eq__, METH_VARARGS, NULL},
+	 { (char *)"Id___ne__", _wrap_Id___ne__, METH_VARARGS, NULL},
+	 { (char *)"Id___lt__", _wrap_Id___lt__, METH_VARARGS, NULL},
+	 { (char *)"delete_Id", _wrap_delete_Id, METH_VARARGS, NULL},
+	 { (char *)"Id_swigregister", Id_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_Vec_2u", _wrap_new_Vec_2u, METH_VARARGS, NULL},
+	 { (char *)"delete_Vec_2u", _wrap_delete_Vec_2u, METH_VARARGS, NULL},
+	 { (char *)"Vec_2u_dim", _wrap_Vec_2u_dim, METH_VARARGS, NULL},
+	 { (char *)"Vec_2u_norm", _wrap_Vec_2u_norm, METH_VARARGS, NULL},
+	 { (char *)"Vec_2u_squareNorm", _wrap_Vec_2u_squareNorm, METH_VARARGS, NULL},
+	 { (char *)"Vec_2u_normalize", _wrap_Vec_2u_normalize, METH_VARARGS, NULL},
+	 { (char *)"Vec_2u_normalizeSafe", _wrap_Vec_2u_normalizeSafe, METH_VARARGS, NULL},
+	 { (char *)"Vec_2u___add__", _wrap_Vec_2u___add__, METH_VARARGS, NULL},
+	 { (char *)"Vec_2u___sub__", _wrap_Vec_2u___sub__, METH_VARARGS, NULL},
+	 { (char *)"Vec_2u___div__", _wrap_Vec_2u___div__, METH_VARARGS, NULL},
+	 { (char *)"Vec_2u___mul__", _wrap_Vec_2u___mul__, METH_VARARGS, NULL},
+	 { (char *)"Vec_2u___eq__", _wrap_Vec_2u___eq__, METH_VARARGS, NULL},
+	 { (char *)"Vec_2u___ne__", _wrap_Vec_2u___ne__, METH_VARARGS, NULL},
+	 { (char *)"Vec_2u___lt__", _wrap_Vec_2u___lt__, METH_VARARGS, NULL},
+	 { (char *)"Vec_2u___gt__", _wrap_Vec_2u___gt__, METH_VARARGS, NULL},
+	 { (char *)"Vec_2u_swigregister", Vec_2u_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_Vec_2i", _wrap_new_Vec_2i, METH_VARARGS, NULL},
+	 { (char *)"delete_Vec_2i", _wrap_delete_Vec_2i, METH_VARARGS, NULL},
+	 { (char *)"Vec_2i_dim", _wrap_Vec_2i_dim, METH_VARARGS, NULL},
+	 { (char *)"Vec_2i_norm", _wrap_Vec_2i_norm, METH_VARARGS, NULL},
+	 { (char *)"Vec_2i_squareNorm", _wrap_Vec_2i_squareNorm, METH_VARARGS, NULL},
+	 { (char *)"Vec_2i_normalize", _wrap_Vec_2i_normalize, METH_VARARGS, NULL},
+	 { (char *)"Vec_2i_normalizeSafe", _wrap_Vec_2i_normalizeSafe, METH_VARARGS, NULL},
+	 { (char *)"Vec_2i___add__", _wrap_Vec_2i___add__, METH_VARARGS, NULL},
+	 { (char *)"Vec_2i___sub__", _wrap_Vec_2i___sub__, METH_VARARGS, NULL},
+	 { (char *)"Vec_2i___div__", _wrap_Vec_2i___div__, METH_VARARGS, NULL},
+	 { (char *)"Vec_2i___mul__", _wrap_Vec_2i___mul__, METH_VARARGS, NULL},
+	 { (char *)"Vec_2i___eq__", _wrap_Vec_2i___eq__, METH_VARARGS, NULL},
+	 { (char *)"Vec_2i___ne__", _wrap_Vec_2i___ne__, METH_VARARGS, NULL},
+	 { (char *)"Vec_2i___lt__", _wrap_Vec_2i___lt__, METH_VARARGS, NULL},
+	 { (char *)"Vec_2i___gt__", _wrap_Vec_2i___gt__, METH_VARARGS, NULL},
+	 { (char *)"Vec_2i_swigregister", Vec_2i_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_Vec_2d", _wrap_new_Vec_2d, METH_VARARGS, NULL},
+	 { (char *)"delete_Vec_2d", _wrap_delete_Vec_2d, METH_VARARGS, NULL},
+	 { (char *)"Vec_2d_dim", _wrap_Vec_2d_dim, METH_VARARGS, NULL},
+	 { (char *)"Vec_2d_norm", _wrap_Vec_2d_norm, METH_VARARGS, NULL},
+	 { (char *)"Vec_2d_squareNorm", _wrap_Vec_2d_squareNorm, METH_VARARGS, NULL},
+	 { (char *)"Vec_2d_normalize", _wrap_Vec_2d_normalize, METH_VARARGS, NULL},
+	 { (char *)"Vec_2d_normalizeSafe", _wrap_Vec_2d_normalizeSafe, METH_VARARGS, NULL},
+	 { (char *)"Vec_2d___add__", _wrap_Vec_2d___add__, METH_VARARGS, NULL},
+	 { (char *)"Vec_2d___sub__", _wrap_Vec_2d___sub__, METH_VARARGS, NULL},
+	 { (char *)"Vec_2d___div__", _wrap_Vec_2d___div__, METH_VARARGS, NULL},
+	 { (char *)"Vec_2d___mul__", _wrap_Vec_2d___mul__, METH_VARARGS, NULL},
+	 { (char *)"Vec_2d___eq__", _wrap_Vec_2d___eq__, METH_VARARGS, NULL},
+	 { (char *)"Vec_2d___ne__", _wrap_Vec_2d___ne__, METH_VARARGS, NULL},
+	 { (char *)"Vec_2d___lt__", _wrap_Vec_2d___lt__, METH_VARARGS, NULL},
+	 { (char *)"Vec_2d___gt__", _wrap_Vec_2d___gt__, METH_VARARGS, NULL},
+	 { (char *)"Vec_2d_swigregister", Vec_2d_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_Vec_2f", _wrap_new_Vec_2f, METH_VARARGS, NULL},
+	 { (char *)"delete_Vec_2f", _wrap_delete_Vec_2f, METH_VARARGS, NULL},
+	 { (char *)"Vec_2f_dim", _wrap_Vec_2f_dim, METH_VARARGS, NULL},
+	 { (char *)"Vec_2f_norm", _wrap_Vec_2f_norm, METH_VARARGS, NULL},
+	 { (char *)"Vec_2f_squareNorm", _wrap_Vec_2f_squareNorm, METH_VARARGS, NULL},
+	 { (char *)"Vec_2f_normalize", _wrap_Vec_2f_normalize, METH_VARARGS, NULL},
+	 { (char *)"Vec_2f_normalizeSafe", _wrap_Vec_2f_normalizeSafe, METH_VARARGS, NULL},
+	 { (char *)"Vec_2f___add__", _wrap_Vec_2f___add__, METH_VARARGS, NULL},
+	 { (char *)"Vec_2f___sub__", _wrap_Vec_2f___sub__, METH_VARARGS, NULL},
+	 { (char *)"Vec_2f___div__", _wrap_Vec_2f___div__, METH_VARARGS, NULL},
+	 { (char *)"Vec_2f___mul__", _wrap_Vec_2f___mul__, METH_VARARGS, NULL},
+	 { (char *)"Vec_2f___eq__", _wrap_Vec_2f___eq__, METH_VARARGS, NULL},
+	 { (char *)"Vec_2f___ne__", _wrap_Vec_2f___ne__, METH_VARARGS, NULL},
+	 { (char *)"Vec_2f___lt__", _wrap_Vec_2f___lt__, METH_VARARGS, NULL},
+	 { (char *)"Vec_2f___gt__", _wrap_Vec_2f___gt__, METH_VARARGS, NULL},
+	 { (char *)"Vec_2f_swigregister", Vec_2f_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_Vec2u", _wrap_new_Vec2u, METH_VARARGS, NULL},
+	 { (char *)"Vec2u_x", _wrap_Vec2u_x, METH_VARARGS, NULL},
+	 { (char *)"Vec2u_y", _wrap_Vec2u_y, METH_VARARGS, NULL},
+	 { (char *)"Vec2u_setX", _wrap_Vec2u_setX, METH_VARARGS, NULL},
+	 { (char *)"Vec2u_setY", _wrap_Vec2u_setY, METH_VARARGS, NULL},
+	 { (char *)"Vec2u___add__", _wrap_Vec2u___add__, METH_VARARGS, NULL},
+	 { (char *)"Vec2u___sub__", _wrap_Vec2u___sub__, METH_VARARGS, NULL},
+	 { (char *)"Vec2u___div__", _wrap_Vec2u___div__, METH_VARARGS, NULL},
+	 { (char *)"Vec2u___mul__", _wrap_Vec2u___mul__, METH_VARARGS, NULL},
+	 { (char *)"delete_Vec2u", _wrap_delete_Vec2u, METH_VARARGS, NULL},
+	 { (char *)"Vec2u_swigregister", Vec2u_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_Vec2i", _wrap_new_Vec2i, METH_VARARGS, NULL},
+	 { (char *)"Vec2i_x", _wrap_Vec2i_x, METH_VARARGS, NULL},
+	 { (char *)"Vec2i_y", _wrap_Vec2i_y, METH_VARARGS, NULL},
+	 { (char *)"Vec2i_setX", _wrap_Vec2i_setX, METH_VARARGS, NULL},
+	 { (char *)"Vec2i_setY", _wrap_Vec2i_setY, METH_VARARGS, NULL},
+	 { (char *)"Vec2i___add__", _wrap_Vec2i___add__, METH_VARARGS, NULL},
+	 { (char *)"Vec2i___sub__", _wrap_Vec2i___sub__, METH_VARARGS, NULL},
+	 { (char *)"Vec2i___div__", _wrap_Vec2i___div__, METH_VARARGS, NULL},
+	 { (char *)"Vec2i___mul__", _wrap_Vec2i___mul__, METH_VARARGS, NULL},
+	 { (char *)"delete_Vec2i", _wrap_delete_Vec2i, METH_VARARGS, NULL},
+	 { (char *)"Vec2i_swigregister", Vec2i_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_Vec2f", _wrap_new_Vec2f, METH_VARARGS, NULL},
+	 { (char *)"Vec2f_x", _wrap_Vec2f_x, METH_VARARGS, NULL},
+	 { (char *)"Vec2f_y", _wrap_Vec2f_y, METH_VARARGS, NULL},
+	 { (char *)"Vec2f_setX", _wrap_Vec2f_setX, METH_VARARGS, NULL},
+	 { (char *)"Vec2f_setY", _wrap_Vec2f_setY, METH_VARARGS, NULL},
+	 { (char *)"Vec2f___add__", _wrap_Vec2f___add__, METH_VARARGS, NULL},
+	 { (char *)"Vec2f___sub__", _wrap_Vec2f___sub__, METH_VARARGS, NULL},
+	 { (char *)"Vec2f___div__", _wrap_Vec2f___div__, METH_VARARGS, NULL},
+	 { (char *)"Vec2f___mul__", _wrap_Vec2f___mul__, METH_VARARGS, NULL},
+	 { (char *)"delete_Vec2f", _wrap_delete_Vec2f, METH_VARARGS, NULL},
+	 { (char *)"Vec2f_swigregister", Vec2f_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_Vec2d", _wrap_new_Vec2d, METH_VARARGS, NULL},
+	 { (char *)"Vec2d_x", _wrap_Vec2d_x, METH_VARARGS, NULL},
+	 { (char *)"Vec2d_y", _wrap_Vec2d_y, METH_VARARGS, NULL},
+	 { (char *)"Vec2d_setX", _wrap_Vec2d_setX, METH_VARARGS, NULL},
+	 { (char *)"Vec2d_setY", _wrap_Vec2d_setY, METH_VARARGS, NULL},
+	 { (char *)"Vec2d___add__", _wrap_Vec2d___add__, METH_VARARGS, NULL},
+	 { (char *)"Vec2d___sub__", _wrap_Vec2d___sub__, METH_VARARGS, NULL},
+	 { (char *)"Vec2d___div__", _wrap_Vec2d___div__, METH_VARARGS, NULL},
+	 { (char *)"Vec2d___mul__", _wrap_Vec2d___mul__, METH_VARARGS, NULL},
+	 { (char *)"delete_Vec2d", _wrap_delete_Vec2d, METH_VARARGS, NULL},
+	 { (char *)"Vec2d_swigregister", Vec2d_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_Vec_3u", _wrap_new_Vec_3u, METH_VARARGS, NULL},
+	 { (char *)"delete_Vec_3u", _wrap_delete_Vec_3u, METH_VARARGS, NULL},
+	 { (char *)"Vec_3u_dim", _wrap_Vec_3u_dim, METH_VARARGS, NULL},
+	 { (char *)"Vec_3u_norm", _wrap_Vec_3u_norm, METH_VARARGS, NULL},
+	 { (char *)"Vec_3u_squareNorm", _wrap_Vec_3u_squareNorm, METH_VARARGS, NULL},
+	 { (char *)"Vec_3u_normalize", _wrap_Vec_3u_normalize, METH_VARARGS, NULL},
+	 { (char *)"Vec_3u_normalizeSafe", _wrap_Vec_3u_normalizeSafe, METH_VARARGS, NULL},
+	 { (char *)"Vec_3u___add__", _wrap_Vec_3u___add__, METH_VARARGS, NULL},
+	 { (char *)"Vec_3u___sub__", _wrap_Vec_3u___sub__, METH_VARARGS, NULL},
+	 { (char *)"Vec_3u___div__", _wrap_Vec_3u___div__, METH_VARARGS, NULL},
+	 { (char *)"Vec_3u___mul__", _wrap_Vec_3u___mul__, METH_VARARGS, NULL},
+	 { (char *)"Vec_3u___eq__", _wrap_Vec_3u___eq__, METH_VARARGS, NULL},
+	 { (char *)"Vec_3u___ne__", _wrap_Vec_3u___ne__, METH_VARARGS, NULL},
+	 { (char *)"Vec_3u___lt__", _wrap_Vec_3u___lt__, METH_VARARGS, NULL},
+	 { (char *)"Vec_3u___gt__", _wrap_Vec_3u___gt__, METH_VARARGS, NULL},
+	 { (char *)"Vec_3u_swigregister", Vec_3u_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_Vec_3i", _wrap_new_Vec_3i, METH_VARARGS, NULL},
+	 { (char *)"delete_Vec_3i", _wrap_delete_Vec_3i, METH_VARARGS, NULL},
+	 { (char *)"Vec_3i_dim", _wrap_Vec_3i_dim, METH_VARARGS, NULL},
+	 { (char *)"Vec_3i_norm", _wrap_Vec_3i_norm, METH_VARARGS, NULL},
+	 { (char *)"Vec_3i_squareNorm", _wrap_Vec_3i_squareNorm, METH_VARARGS, NULL},
+	 { (char *)"Vec_3i_normalize", _wrap_Vec_3i_normalize, METH_VARARGS, NULL},
+	 { (char *)"Vec_3i_normalizeSafe", _wrap_Vec_3i_normalizeSafe, METH_VARARGS, NULL},
+	 { (char *)"Vec_3i___add__", _wrap_Vec_3i___add__, METH_VARARGS, NULL},
+	 { (char *)"Vec_3i___sub__", _wrap_Vec_3i___sub__, METH_VARARGS, NULL},
+	 { (char *)"Vec_3i___div__", _wrap_Vec_3i___div__, METH_VARARGS, NULL},
+	 { (char *)"Vec_3i___mul__", _wrap_Vec_3i___mul__, METH_VARARGS, NULL},
+	 { (char *)"Vec_3i___eq__", _wrap_Vec_3i___eq__, METH_VARARGS, NULL},
+	 { (char *)"Vec_3i___ne__", _wrap_Vec_3i___ne__, METH_VARARGS, NULL},
+	 { (char *)"Vec_3i___lt__", _wrap_Vec_3i___lt__, METH_VARARGS, NULL},
+	 { (char *)"Vec_3i___gt__", _wrap_Vec_3i___gt__, METH_VARARGS, NULL},
+	 { (char *)"Vec_3i_swigregister", Vec_3i_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_Vec_3d", _wrap_new_Vec_3d, METH_VARARGS, NULL},
+	 { (char *)"delete_Vec_3d", _wrap_delete_Vec_3d, METH_VARARGS, NULL},
+	 { (char *)"Vec_3d_dim", _wrap_Vec_3d_dim, METH_VARARGS, NULL},
+	 { (char *)"Vec_3d_norm", _wrap_Vec_3d_norm, METH_VARARGS, NULL},
+	 { (char *)"Vec_3d_squareNorm", _wrap_Vec_3d_squareNorm, METH_VARARGS, NULL},
+	 { (char *)"Vec_3d_normalize", _wrap_Vec_3d_normalize, METH_VARARGS, NULL},
+	 { (char *)"Vec_3d_normalizeSafe", _wrap_Vec_3d_normalizeSafe, METH_VARARGS, NULL},
+	 { (char *)"Vec_3d___add__", _wrap_Vec_3d___add__, METH_VARARGS, NULL},
+	 { (char *)"Vec_3d___sub__", _wrap_Vec_3d___sub__, METH_VARARGS, NULL},
+	 { (char *)"Vec_3d___div__", _wrap_Vec_3d___div__, METH_VARARGS, NULL},
+	 { (char *)"Vec_3d___mul__", _wrap_Vec_3d___mul__, METH_VARARGS, NULL},
+	 { (char *)"Vec_3d___eq__", _wrap_Vec_3d___eq__, METH_VARARGS, NULL},
+	 { (char *)"Vec_3d___ne__", _wrap_Vec_3d___ne__, METH_VARARGS, NULL},
+	 { (char *)"Vec_3d___lt__", _wrap_Vec_3d___lt__, METH_VARARGS, NULL},
+	 { (char *)"Vec_3d___gt__", _wrap_Vec_3d___gt__, METH_VARARGS, NULL},
+	 { (char *)"Vec_3d_swigregister", Vec_3d_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_Vec_3f", _wrap_new_Vec_3f, METH_VARARGS, NULL},
+	 { (char *)"delete_Vec_3f", _wrap_delete_Vec_3f, METH_VARARGS, NULL},
+	 { (char *)"Vec_3f_dim", _wrap_Vec_3f_dim, METH_VARARGS, NULL},
+	 { (char *)"Vec_3f_norm", _wrap_Vec_3f_norm, METH_VARARGS, NULL},
+	 { (char *)"Vec_3f_squareNorm", _wrap_Vec_3f_squareNorm, METH_VARARGS, NULL},
+	 { (char *)"Vec_3f_normalize", _wrap_Vec_3f_normalize, METH_VARARGS, NULL},
+	 { (char *)"Vec_3f_normalizeSafe", _wrap_Vec_3f_normalizeSafe, METH_VARARGS, NULL},
+	 { (char *)"Vec_3f___add__", _wrap_Vec_3f___add__, METH_VARARGS, NULL},
+	 { (char *)"Vec_3f___sub__", _wrap_Vec_3f___sub__, METH_VARARGS, NULL},
+	 { (char *)"Vec_3f___div__", _wrap_Vec_3f___div__, METH_VARARGS, NULL},
+	 { (char *)"Vec_3f___mul__", _wrap_Vec_3f___mul__, METH_VARARGS, NULL},
+	 { (char *)"Vec_3f___eq__", _wrap_Vec_3f___eq__, METH_VARARGS, NULL},
+	 { (char *)"Vec_3f___ne__", _wrap_Vec_3f___ne__, METH_VARARGS, NULL},
+	 { (char *)"Vec_3f___lt__", _wrap_Vec_3f___lt__, METH_VARARGS, NULL},
+	 { (char *)"Vec_3f___gt__", _wrap_Vec_3f___gt__, METH_VARARGS, NULL},
+	 { (char *)"Vec_3f_swigregister", Vec_3f_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_Vec3u", _wrap_new_Vec3u, METH_VARARGS, NULL},
+	 { (char *)"Vec3u_x", _wrap_Vec3u_x, METH_VARARGS, NULL},
+	 { (char *)"Vec3u_y", _wrap_Vec3u_y, METH_VARARGS, NULL},
+	 { (char *)"Vec3u_z", _wrap_Vec3u_z, METH_VARARGS, NULL},
+	 { (char *)"Vec3u_setX", _wrap_Vec3u_setX, METH_VARARGS, NULL},
+	 { (char *)"Vec3u_setY", _wrap_Vec3u_setY, METH_VARARGS, NULL},
+	 { (char *)"Vec3u_setZ", _wrap_Vec3u_setZ, METH_VARARGS, NULL},
+	 { (char *)"Vec3u___add__", _wrap_Vec3u___add__, METH_VARARGS, NULL},
+	 { (char *)"Vec3u___sub__", _wrap_Vec3u___sub__, METH_VARARGS, NULL},
+	 { (char *)"Vec3u___div__", _wrap_Vec3u___div__, METH_VARARGS, NULL},
+	 { (char *)"Vec3u___mul__", _wrap_Vec3u___mul__, METH_VARARGS, NULL},
+	 { (char *)"Vec3u___xor__", _wrap_Vec3u___xor__, METH_VARARGS, NULL},
+	 { (char *)"delete_Vec3u", _wrap_delete_Vec3u, METH_VARARGS, NULL},
+	 { (char *)"Vec3u_swigregister", Vec3u_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_Vec3i", _wrap_new_Vec3i, METH_VARARGS, NULL},
+	 { (char *)"Vec3i_x", _wrap_Vec3i_x, METH_VARARGS, NULL},
+	 { (char *)"Vec3i_y", _wrap_Vec3i_y, METH_VARARGS, NULL},
+	 { (char *)"Vec3i_z", _wrap_Vec3i_z, METH_VARARGS, NULL},
+	 { (char *)"Vec3i_setX", _wrap_Vec3i_setX, METH_VARARGS, NULL},
+	 { (char *)"Vec3i_setY", _wrap_Vec3i_setY, METH_VARARGS, NULL},
+	 { (char *)"Vec3i_setZ", _wrap_Vec3i_setZ, METH_VARARGS, NULL},
+	 { (char *)"Vec3i___add__", _wrap_Vec3i___add__, METH_VARARGS, NULL},
+	 { (char *)"Vec3i___sub__", _wrap_Vec3i___sub__, METH_VARARGS, NULL},
+	 { (char *)"Vec3i___div__", _wrap_Vec3i___div__, METH_VARARGS, NULL},
+	 { (char *)"Vec3i___mul__", _wrap_Vec3i___mul__, METH_VARARGS, NULL},
+	 { (char *)"Vec3i___xor__", _wrap_Vec3i___xor__, METH_VARARGS, NULL},
+	 { (char *)"delete_Vec3i", _wrap_delete_Vec3i, METH_VARARGS, NULL},
+	 { (char *)"Vec3i_swigregister", Vec3i_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_Vec3f", _wrap_new_Vec3f, METH_VARARGS, NULL},
+	 { (char *)"Vec3f_x", _wrap_Vec3f_x, METH_VARARGS, NULL},
+	 { (char *)"Vec3f_y", _wrap_Vec3f_y, METH_VARARGS, NULL},
+	 { (char *)"Vec3f_z", _wrap_Vec3f_z, METH_VARARGS, NULL},
+	 { (char *)"Vec3f_setX", _wrap_Vec3f_setX, METH_VARARGS, NULL},
+	 { (char *)"Vec3f_setY", _wrap_Vec3f_setY, METH_VARARGS, NULL},
+	 { (char *)"Vec3f_setZ", _wrap_Vec3f_setZ, METH_VARARGS, NULL},
+	 { (char *)"Vec3f___add__", _wrap_Vec3f___add__, METH_VARARGS, NULL},
+	 { (char *)"Vec3f___sub__", _wrap_Vec3f___sub__, METH_VARARGS, NULL},
+	 { (char *)"Vec3f___div__", _wrap_Vec3f___div__, METH_VARARGS, NULL},
+	 { (char *)"Vec3f___mul__", _wrap_Vec3f___mul__, METH_VARARGS, NULL},
+	 { (char *)"Vec3f___xor__", _wrap_Vec3f___xor__, METH_VARARGS, NULL},
+	 { (char *)"delete_Vec3f", _wrap_delete_Vec3f, METH_VARARGS, NULL},
+	 { (char *)"Vec3f_swigregister", Vec3f_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_Vec3d", _wrap_new_Vec3d, METH_VARARGS, NULL},
+	 { (char *)"Vec3d_x", _wrap_Vec3d_x, METH_VARARGS, NULL},
+	 { (char *)"Vec3d_y", _wrap_Vec3d_y, METH_VARARGS, NULL},
+	 { (char *)"Vec3d_z", _wrap_Vec3d_z, METH_VARARGS, NULL},
+	 { (char *)"Vec3d_setX", _wrap_Vec3d_setX, METH_VARARGS, NULL},
+	 { (char *)"Vec3d_setY", _wrap_Vec3d_setY, METH_VARARGS, NULL},
+	 { (char *)"Vec3d_setZ", _wrap_Vec3d_setZ, METH_VARARGS, NULL},
+	 { (char *)"Vec3d___add__", _wrap_Vec3d___add__, METH_VARARGS, NULL},
+	 { (char *)"Vec3d___sub__", _wrap_Vec3d___sub__, METH_VARARGS, NULL},
+	 { (char *)"Vec3d___div__", _wrap_Vec3d___div__, METH_VARARGS, NULL},
+	 { (char *)"Vec3d___mul__", _wrap_Vec3d___mul__, METH_VARARGS, NULL},
+	 { (char *)"Vec3d___xor__", _wrap_Vec3d___xor__, METH_VARARGS, NULL},
+	 { (char *)"delete_Vec3d", _wrap_delete_Vec3d, METH_VARARGS, NULL},
+	 { (char *)"Vec3d_swigregister", Vec3d_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_Noise", _wrap_new_Noise, METH_VARARGS, NULL},
+	 { (char *)"delete_Noise", _wrap_delete_Noise, METH_VARARGS, NULL},
+	 { (char *)"Noise_turbulence1", _wrap_Noise_turbulence1, METH_VARARGS, NULL},
+	 { (char *)"Noise_turbulence2", _wrap_Noise_turbulence2, METH_VARARGS, NULL},
+	 { (char *)"Noise_turbulence3", _wrap_Noise_turbulence3, METH_VARARGS, NULL},
+	 { (char *)"Noise_smoothNoise1", _wrap_Noise_smoothNoise1, METH_VARARGS, NULL},
+	 { (char *)"Noise_smoothNoise2", _wrap_Noise_smoothNoise2, METH_VARARGS, NULL},
+	 { (char *)"Noise_smoothNoise3", _wrap_Noise_smoothNoise3, METH_VARARGS, NULL},
+	 { (char *)"Noise_swigregister", Noise_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_Material", _wrap_new_Material, METH_VARARGS, NULL},
+	 { (char *)"delete_Material", _wrap_delete_Material, METH_VARARGS, NULL},
+	 { (char *)"Material_diffuse", _wrap_Material_diffuse, METH_VARARGS, NULL},
+	 { (char *)"Material_diffuseR", _wrap_Material_diffuseR, METH_VARARGS, NULL},
+	 { (char *)"Material_diffuseG", _wrap_Material_diffuseG, METH_VARARGS, NULL},
+	 { (char *)"Material_diffuseB", _wrap_Material_diffuseB, METH_VARARGS, NULL},
+	 { (char *)"Material_diffuseA", _wrap_Material_diffuseA, METH_VARARGS, NULL},
+	 { (char *)"Material_specular", _wrap_Material_specular, METH_VARARGS, NULL},
+	 { (char *)"Material_specularR", _wrap_Material_specularR, METH_VARARGS, NULL},
+	 { (char *)"Material_specularG", _wrap_Material_specularG, METH_VARARGS, NULL},
+	 { (char *)"Material_specularB", _wrap_Material_specularB, METH_VARARGS, NULL},
+	 { (char *)"Material_specularA", _wrap_Material_specularA, METH_VARARGS, NULL},
+	 { (char *)"Material_ambient", _wrap_Material_ambient, METH_VARARGS, NULL},
+	 { (char *)"Material_ambientR", _wrap_Material_ambientR, METH_VARARGS, NULL},
+	 { (char *)"Material_ambientG", _wrap_Material_ambientG, METH_VARARGS, NULL},
+	 { (char *)"Material_ambientB", _wrap_Material_ambientB, METH_VARARGS, NULL},
+	 { (char *)"Material_ambientA", _wrap_Material_ambientA, METH_VARARGS, NULL},
+	 { (char *)"Material_emission", _wrap_Material_emission, METH_VARARGS, NULL},
+	 { (char *)"Material_emissionR", _wrap_Material_emissionR, METH_VARARGS, NULL},
+	 { (char *)"Material_emissionG", _wrap_Material_emissionG, METH_VARARGS, NULL},
+	 { (char *)"Material_emissionB", _wrap_Material_emissionB, METH_VARARGS, NULL},
+	 { (char *)"Material_emissionA", _wrap_Material_emissionA, METH_VARARGS, NULL},
+	 { (char *)"Material_shininess", _wrap_Material_shininess, METH_VARARGS, NULL},
+	 { (char *)"Material_SetDiffuse", _wrap_Material_SetDiffuse, METH_VARARGS, NULL},
+	 { (char *)"Material_SetSpecular", _wrap_Material_SetSpecular, METH_VARARGS, NULL},
+	 { (char *)"Material_SetAmbient", _wrap_Material_SetAmbient, METH_VARARGS, NULL},
+	 { (char *)"Material_SetEmission", _wrap_Material_SetEmission, METH_VARARGS, NULL},
+	 { (char *)"Material_SetShininess", _wrap_Material_SetShininess, METH_VARARGS, NULL},
+	 { (char *)"Material___ne__", _wrap_Material___ne__, METH_VARARGS, NULL},
+	 { (char *)"Material___eq__", _wrap_Material___eq__, METH_VARARGS, NULL},
+	 { (char *)"Material_swigregister", Material_swigregister, METH_VARARGS, NULL},
+	 { (char *)"Interface0D_getExactTypeName", _wrap_Interface0D_getExactTypeName, METH_VARARGS, NULL},
+	 { (char *)"Interface0D_getX", _wrap_Interface0D_getX, METH_VARARGS, NULL},
+	 { (char *)"Interface0D_getY", _wrap_Interface0D_getY, METH_VARARGS, NULL},
+	 { (char *)"Interface0D_getZ", _wrap_Interface0D_getZ, METH_VARARGS, NULL},
+	 { (char *)"Interface0D_getPoint3D", _wrap_Interface0D_getPoint3D, METH_VARARGS, NULL},
+	 { (char *)"Interface0D_getProjectedX", _wrap_Interface0D_getProjectedX, METH_VARARGS, NULL},
+	 { (char *)"Interface0D_getProjectedY", _wrap_Interface0D_getProjectedY, METH_VARARGS, NULL},
+	 { (char *)"Interface0D_getProjectedZ", _wrap_Interface0D_getProjectedZ, METH_VARARGS, NULL},
+	 { (char *)"Interface0D_getPoint2D", _wrap_Interface0D_getPoint2D, METH_VARARGS, NULL},
+	 { (char *)"Interface0D_getFEdge", _wrap_Interface0D_getFEdge, METH_VARARGS, NULL},
+	 { (char *)"Interface0D_getId", _wrap_Interface0D_getId, METH_VARARGS, NULL},
+	 { (char *)"Interface0D_getNature", _wrap_Interface0D_getNature, METH_VARARGS, NULL},
+	 { (char *)"Interface0D_castToSVertex", _wrap_Interface0D_castToSVertex, METH_VARARGS, NULL},
+	 { (char *)"Interface0D_castToViewVertex", _wrap_Interface0D_castToViewVertex, METH_VARARGS, NULL},
+	 { (char *)"Interface0D_castToNonTVertex", _wrap_Interface0D_castToNonTVertex, METH_VARARGS, NULL},
+	 { (char *)"Interface0D_castToTVertex", _wrap_Interface0D_castToTVertex, METH_VARARGS, NULL},
+	 { (char *)"new_Interface0D", _wrap_new_Interface0D, METH_VARARGS, NULL},
+	 { (char *)"delete_Interface0D", _wrap_delete_Interface0D, METH_VARARGS, NULL},
+	 { (char *)"Interface0D_swigregister", Interface0D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"delete_Interface0DIteratorNested", _wrap_delete_Interface0DIteratorNested, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIteratorNested_getExactTypeName", _wrap_Interface0DIteratorNested_getExactTypeName, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIteratorNested_getObject", _wrap_Interface0DIteratorNested_getObject, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIteratorNested___deref__", _wrap_Interface0DIteratorNested___deref__, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIteratorNested_increment", _wrap_Interface0DIteratorNested_increment, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIteratorNested_decrement", _wrap_Interface0DIteratorNested_decrement, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIteratorNested_isBegin", _wrap_Interface0DIteratorNested_isBegin, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIteratorNested_isEnd", _wrap_Interface0DIteratorNested_isEnd, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIteratorNested___eq__", _wrap_Interface0DIteratorNested___eq__, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIteratorNested___ne__", _wrap_Interface0DIteratorNested___ne__, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIteratorNested_t", _wrap_Interface0DIteratorNested_t, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIteratorNested_u", _wrap_Interface0DIteratorNested_u, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIteratorNested_copy", _wrap_Interface0DIteratorNested_copy, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIteratorNested_getX", _wrap_Interface0DIteratorNested_getX, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIteratorNested_getY", _wrap_Interface0DIteratorNested_getY, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIteratorNested_getZ", _wrap_Interface0DIteratorNested_getZ, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIteratorNested_getPoint3D", _wrap_Interface0DIteratorNested_getPoint3D, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIteratorNested_getProjectedX", _wrap_Interface0DIteratorNested_getProjectedX, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIteratorNested_getProjectedY", _wrap_Interface0DIteratorNested_getProjectedY, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIteratorNested_getProjectedZ", _wrap_Interface0DIteratorNested_getProjectedZ, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIteratorNested_getPoint2D", _wrap_Interface0DIteratorNested_getPoint2D, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIteratorNested_getFEdge", _wrap_Interface0DIteratorNested_getFEdge, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIteratorNested_getId", _wrap_Interface0DIteratorNested_getId, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIteratorNested_getNature", _wrap_Interface0DIteratorNested_getNature, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIteratorNested_castToSVertex", _wrap_Interface0DIteratorNested_castToSVertex, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIteratorNested_castToViewVertex", _wrap_Interface0DIteratorNested_castToViewVertex, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIteratorNested_castToNonTVertex", _wrap_Interface0DIteratorNested_castToNonTVertex, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIteratorNested_castToTVertex", _wrap_Interface0DIteratorNested_castToTVertex, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIteratorNested_swigregister", Interface0DIteratorNested_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_Interface0DIterator", _wrap_new_Interface0DIterator, METH_VARARGS, NULL},
+	 { (char *)"delete_Interface0DIterator", _wrap_delete_Interface0DIterator, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIterator_getExactTypeName", _wrap_Interface0DIterator_getExactTypeName, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIterator_getObject", _wrap_Interface0DIterator_getObject, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIterator___deref__", _wrap_Interface0DIterator___deref__, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIterator_increment", _wrap_Interface0DIterator_increment, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIterator_decrement", _wrap_Interface0DIterator_decrement, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIterator_isBegin", _wrap_Interface0DIterator_isBegin, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIterator_isEnd", _wrap_Interface0DIterator_isEnd, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIterator___eq__", _wrap_Interface0DIterator___eq__, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIterator___ne__", _wrap_Interface0DIterator___ne__, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIterator_t", _wrap_Interface0DIterator_t, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIterator_u", _wrap_Interface0DIterator_u, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIterator_getX", _wrap_Interface0DIterator_getX, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIterator_getY", _wrap_Interface0DIterator_getY, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIterator_getZ", _wrap_Interface0DIterator_getZ, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIterator_getPoint3D", _wrap_Interface0DIterator_getPoint3D, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIterator_getProjectedX", _wrap_Interface0DIterator_getProjectedX, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIterator_getProjectedY", _wrap_Interface0DIterator_getProjectedY, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIterator_getProjectedZ", _wrap_Interface0DIterator_getProjectedZ, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIterator_getPoint2D", _wrap_Interface0DIterator_getPoint2D, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIterator_getFEdge", _wrap_Interface0DIterator_getFEdge, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIterator_getId", _wrap_Interface0DIterator_getId, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIterator_getNature", _wrap_Interface0DIterator_getNature, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIterator_castToSVertex", _wrap_Interface0DIterator_castToSVertex, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIterator_castToViewVertex", _wrap_Interface0DIterator_castToViewVertex, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIterator_castToNonTVertex", _wrap_Interface0DIterator_castToNonTVertex, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIterator_castToTVertex", _wrap_Interface0DIterator_castToTVertex, METH_VARARGS, NULL},
+	 { (char *)"Interface0DIterator_swigregister", Interface0DIterator_swigregister, METH_VARARGS, NULL},
+	 { (char *)"Interface1D_getExactTypeName", _wrap_Interface1D_getExactTypeName, METH_VARARGS, NULL},
+	 { (char *)"Interface1D_verticesBegin", _wrap_Interface1D_verticesBegin, METH_VARARGS, NULL},
+	 { (char *)"Interface1D_verticesEnd", _wrap_Interface1D_verticesEnd, METH_VARARGS, NULL},
+	 { (char *)"Interface1D_pointsBegin", _wrap_Interface1D_pointsBegin, METH_VARARGS, NULL},
+	 { (char *)"Interface1D_pointsEnd", _wrap_Interface1D_pointsEnd, METH_VARARGS, NULL},
+	 { (char *)"Interface1D_getLength2D", _wrap_Interface1D_getLength2D, METH_VARARGS, NULL},
+	 { (char *)"Interface1D_getId", _wrap_Interface1D_getId, METH_VARARGS, NULL},
+	 { (char *)"Interface1D_getNature", _wrap_Interface1D_getNature, METH_VARARGS, NULL},
+	 { (char *)"Interface1D_getTimeStamp", _wrap_Interface1D_getTimeStamp, METH_VARARGS, NULL},
+	 { (char *)"Interface1D_setTimeStamp", _wrap_Interface1D_setTimeStamp, METH_VARARGS, NULL},
+	 { (char *)"delete_Interface1D", _wrap_delete_Interface1D, METH_VARARGS, NULL},
+	 { (char *)"Interface1D_swigregister", Interface1D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"integrateUnsigned", _wrap_integrateUnsigned, METH_VARARGS, NULL},
+	 { (char *)"integrateFloat", _wrap_integrateFloat, METH_VARARGS, NULL},
+	 { (char *)"integrateDouble", _wrap_integrateDouble, METH_VARARGS, NULL},
+	 { (char *)"SVertex_getExactTypeName", _wrap_SVertex_getExactTypeName, METH_VARARGS, NULL},
+	 { (char *)"SVertex_getX", _wrap_SVertex_getX, METH_VARARGS, NULL},
+	 { (char *)"SVertex_getY", _wrap_SVertex_getY, METH_VARARGS, NULL},
+	 { (char *)"SVertex_getZ", _wrap_SVertex_getZ, METH_VARARGS, NULL},
+	 { (char *)"SVertex_getPoint3D", _wrap_SVertex_getPoint3D, METH_VARARGS, NULL},
+	 { (char *)"SVertex_getProjectedX", _wrap_SVertex_getProjectedX, METH_VARARGS, NULL},
+	 { (char *)"SVertex_getProjectedY", _wrap_SVertex_getProjectedY, METH_VARARGS, NULL},
+	 { (char *)"SVertex_getProjectedZ", _wrap_SVertex_getProjectedZ, METH_VARARGS, NULL},
+	 { (char *)"SVertex_getPoint2D", _wrap_SVertex_getPoint2D, METH_VARARGS, NULL},
+	 { (char *)"SVertex_getFEdge", _wrap_SVertex_getFEdge, METH_VARARGS, NULL},
+	 { (char *)"SVertex_getId", _wrap_SVertex_getId, METH_VARARGS, NULL},
+	 { (char *)"SVertex_getNature", _wrap_SVertex_getNature, METH_VARARGS, NULL},
+	 { (char *)"SVertex_castToSVertex", _wrap_SVertex_castToSVertex, METH_VARARGS, NULL},
+	 { (char *)"SVertex_castToViewVertex", _wrap_SVertex_castToViewVertex, METH_VARARGS, NULL},
+	 { (char *)"SVertex_castToNonTVertex", _wrap_SVertex_castToNonTVertex, METH_VARARGS, NULL},
+	 { (char *)"SVertex_castToTVertex", _wrap_SVertex_castToTVertex, METH_VARARGS, NULL},
+	 { (char *)"SVertex_userdata_set", _wrap_SVertex_userdata_set, METH_VARARGS, NULL},
+	 { (char *)"SVertex_userdata_get", _wrap_SVertex_userdata_get, METH_VARARGS, NULL},
+	 { (char *)"new_SVertex", _wrap_new_SVertex, METH_VARARGS, NULL},
+	 { (char *)"delete_SVertex", _wrap_delete_SVertex, METH_VARARGS, NULL},
+	 { (char *)"SVertex_dupplicate", _wrap_SVertex_dupplicate, METH_VARARGS, NULL},
+	 { (char *)"SVertex___eq__", _wrap_SVertex___eq__, METH_VARARGS, NULL},
+	 { (char *)"SVertex_point3D", _wrap_SVertex_point3D, METH_VARARGS, NULL},
+	 { (char *)"SVertex_point2D", _wrap_SVertex_point2D, METH_VARARGS, NULL},
+	 { (char *)"SVertex_normals", _wrap_SVertex_normals, METH_VARARGS, NULL},
+	 { (char *)"SVertex_normalsSize", _wrap_SVertex_normalsSize, METH_VARARGS, NULL},
+	 { (char *)"SVertex_fedges", _wrap_SVertex_fedges, METH_VARARGS, NULL},
+	 { (char *)"SVertex_fedges_begin", _wrap_SVertex_fedges_begin, METH_VARARGS, NULL},
+	 { (char *)"SVertex_fedges_end", _wrap_SVertex_fedges_end, METH_VARARGS, NULL},
+	 { (char *)"SVertex_z", _wrap_SVertex_z, METH_VARARGS, NULL},
+	 { (char *)"SVertex_viewvertex", _wrap_SVertex_viewvertex, METH_VARARGS, NULL},
+	 { (char *)"SVertex_SetPoint3D", _wrap_SVertex_SetPoint3D, METH_VARARGS, NULL},
+	 { (char *)"SVertex_SetPoint2D", _wrap_SVertex_SetPoint2D, METH_VARARGS, NULL},
+	 { (char *)"SVertex_AddNormal", _wrap_SVertex_AddNormal, METH_VARARGS, NULL},
+	 { (char *)"SVertex_setCurvatureInfo", _wrap_SVertex_setCurvatureInfo, METH_VARARGS, NULL},
+	 { (char *)"SVertex_getCurvatureInfo", _wrap_SVertex_getCurvatureInfo, METH_VARARGS, NULL},
+	 { (char *)"SVertex_setCurvatureFredo", _wrap_SVertex_setCurvatureFredo, METH_VARARGS, NULL},
+	 { (char *)"SVertex_setDirectionFredo", _wrap_SVertex_setDirectionFredo, METH_VARARGS, NULL},
+	 { (char *)"SVertex_curvatureFredo", _wrap_SVertex_curvatureFredo, METH_VARARGS, NULL},
+	 { (char *)"SVertex_directionFredo", _wrap_SVertex_directionFredo, METH_VARARGS, NULL},
+	 { (char *)"SVertex_SetId", _wrap_SVertex_SetId, METH_VARARGS, NULL},
+	 { (char *)"SVertex_SetFEdges", _wrap_SVertex_SetFEdges, METH_VARARGS, NULL},
+	 { (char *)"SVertex_SetShape", _wrap_SVertex_SetShape, METH_VARARGS, NULL},
+	 { (char *)"SVertex_SetViewVertex", _wrap_SVertex_SetViewVertex, METH_VARARGS, NULL},
+	 { (char *)"SVertex_AddFEdge", _wrap_SVertex_AddFEdge, METH_VARARGS, NULL},
+	 { (char *)"SVertex_Replace", _wrap_SVertex_Replace, METH_VARARGS, NULL},
+	 { (char *)"SVertex_fedge", _wrap_SVertex_fedge, METH_VARARGS, NULL},
+	 { (char *)"SVertex_point2d", _wrap_SVertex_point2d, METH_VARARGS, NULL},
+	 { (char *)"SVertex_point3d", _wrap_SVertex_point3d, METH_VARARGS, NULL},
+	 { (char *)"SVertex_normal", _wrap_SVertex_normal, METH_VARARGS, NULL},
+	 { (char *)"SVertex_shape_id", _wrap_SVertex_shape_id, METH_VARARGS, NULL},
+	 { (char *)"SVertex_shape", _wrap_SVertex_shape, METH_VARARGS, NULL},
+	 { (char *)"SVertex_shape_importance", _wrap_SVertex_shape_importance, METH_VARARGS, NULL},
+	 { (char *)"SVertex_qi", _wrap_SVertex_qi, METH_VARARGS, NULL},
+	 { (char *)"SVertex_occluders_begin", _wrap_SVertex_occluders_begin, METH_VARARGS, NULL},
+	 { (char *)"SVertex_occluders_end", _wrap_SVertex_occluders_end, METH_VARARGS, NULL},
+	 { (char *)"SVertex_occluders_empty", _wrap_SVertex_occluders_empty, METH_VARARGS, NULL},
+	 { (char *)"SVertex_occluders_size", _wrap_SVertex_occluders_size, METH_VARARGS, NULL},
+	 { (char *)"SVertex_occludee", _wrap_SVertex_occludee, METH_VARARGS, NULL},
+	 { (char *)"SVertex_occluded_shape", _wrap_SVertex_occluded_shape, METH_VARARGS, NULL},
+	 { (char *)"SVertex_occludee_empty", _wrap_SVertex_occludee_empty, METH_VARARGS, NULL},
+	 { (char *)"SVertex_z_discontinuity", _wrap_SVertex_z_discontinuity, METH_VARARGS, NULL},
+	 { (char *)"SVertex_swigregister", SVertex_swigregister, METH_VARARGS, NULL},
+	 { (char *)"FEdge_getExactTypeName", _wrap_FEdge_getExactTypeName, METH_VARARGS, NULL},
+	 { (char *)"FEdge_getLength2D", _wrap_FEdge_getLength2D, METH_VARARGS, NULL},
+	 { (char *)"FEdge_getId", _wrap_FEdge_getId, METH_VARARGS, NULL},
+	 { (char *)"FEdge_userdata_set", _wrap_FEdge_userdata_set, METH_VARARGS, NULL},
+	 { (char *)"FEdge_userdata_get", _wrap_FEdge_userdata_get, METH_VARARGS, NULL},
+	 { (char *)"new_FEdge", _wrap_new_FEdge, METH_VARARGS, NULL},
+	 { (char *)"delete_FEdge", _wrap_delete_FEdge, METH_VARARGS, NULL},
+	 { (char *)"FEdge_dupplicate", _wrap_FEdge_dupplicate, METH_VARARGS, NULL},
+	 { (char *)"FEdge_vertexA", _wrap_FEdge_vertexA, METH_VARARGS, NULL},
+	 { (char *)"FEdge_vertexB", _wrap_FEdge_vertexB, METH_VARARGS, NULL},
+	 { (char *)"FEdge_getNature", _wrap_FEdge_getNature, METH_VARARGS, NULL},
+	 { (char *)"FEdge_nextEdge", _wrap_FEdge_nextEdge, METH_VARARGS, NULL},
+	 { (char *)"FEdge_previousEdge", _wrap_FEdge_previousEdge, METH_VARARGS, NULL},
+	 { (char *)"FEdge_invisibility", _wrap_FEdge_invisibility, METH_VARARGS, NULL},
+	 { (char *)"FEdge_viewedge", _wrap_FEdge_viewedge, METH_VARARGS, NULL},
+	 { (char *)"FEdge_center3d", _wrap_FEdge_center3d, METH_VARARGS, NULL},
+	 { (char *)"FEdge_center2d", _wrap_FEdge_center2d, METH_VARARGS, NULL},
+	 { (char *)"FEdge_aFace", _wrap_FEdge_aFace, METH_VARARGS, NULL},
+	 { (char *)"FEdge_getOccludeeIntersection", _wrap_FEdge_getOccludeeIntersection, METH_VARARGS, NULL},
+	 { (char *)"FEdge_getOccludeeEmpty", _wrap_FEdge_getOccludeeEmpty, METH_VARARGS, NULL},
+	 { (char *)"FEdge_isSmooth", _wrap_FEdge_isSmooth, METH_VARARGS, NULL},
+	 { (char *)"FEdge_SetVertexA", _wrap_FEdge_SetVertexA, METH_VARARGS, NULL},
+	 { (char *)"FEdge_SetVertexB", _wrap_FEdge_SetVertexB, METH_VARARGS, NULL},
+	 { (char *)"FEdge_SetId", _wrap_FEdge_SetId, METH_VARARGS, NULL},
+	 { (char *)"FEdge_SetNextEdge", _wrap_FEdge_SetNextEdge, METH_VARARGS, NULL},
+	 { (char *)"FEdge_SetPreviousEdge", _wrap_FEdge_SetPreviousEdge, METH_VARARGS, NULL},
+	 { (char *)"FEdge_SetNature", _wrap_FEdge_SetNature, METH_VARARGS, NULL},
+	 { (char *)"FEdge_SetViewEdge", _wrap_FEdge_SetViewEdge, METH_VARARGS, NULL},
+	 { (char *)"FEdge_SetaFace", _wrap_FEdge_SetaFace, METH_VARARGS, NULL},
+	 { (char *)"FEdge_SetOccludeeIntersection", _wrap_FEdge_SetOccludeeIntersection, METH_VARARGS, NULL},
+	 { (char *)"FEdge_SetOccludeeEmpty", _wrap_FEdge_SetOccludeeEmpty, METH_VARARGS, NULL},
+	 { (char *)"FEdge_SetSmooth", _wrap_FEdge_SetSmooth, METH_VARARGS, NULL},
+	 { (char *)"FEdge_CommonVertex", _wrap_FEdge_CommonVertex, METH_VARARGS, NULL},
+	 { (char *)"FEdge_min2d", _wrap_FEdge_min2d, METH_VARARGS, NULL},
+	 { (char *)"FEdge_max2d", _wrap_FEdge_max2d, METH_VARARGS, NULL},
+	 { (char *)"FEdge_shape_id", _wrap_FEdge_shape_id, METH_VARARGS, NULL},
+	 { (char *)"FEdge_shape", _wrap_FEdge_shape, METH_VARARGS, NULL},
+	 { (char *)"FEdge_shape_importance", _wrap_FEdge_shape_importance, METH_VARARGS, NULL},
+	 { (char *)"FEdge_qi", _wrap_FEdge_qi, METH_VARARGS, NULL},
+	 { (char *)"FEdge_occluders_begin", _wrap_FEdge_occluders_begin, METH_VARARGS, NULL},
+	 { (char *)"FEdge_occluders_end", _wrap_FEdge_occluders_end, METH_VARARGS, NULL},
+	 { (char *)"FEdge_occluders_empty", _wrap_FEdge_occluders_empty, METH_VARARGS, NULL},
+	 { (char *)"FEdge_occluders_size", _wrap_FEdge_occluders_size, METH_VARARGS, NULL},
+	 { (char *)"FEdge_occludee", _wrap_FEdge_occludee, METH_VARARGS, NULL},
+	 { (char *)"FEdge_occluded_shape", _wrap_FEdge_occluded_shape, METH_VARARGS, NULL},
+	 { (char *)"FEdge_occludee_empty", _wrap_FEdge_occludee_empty, METH_VARARGS, NULL},
+	 { (char *)"FEdge_z_discontinuity", _wrap_FEdge_z_discontinuity, METH_VARARGS, NULL},
+	 { (char *)"FEdge_viewedge_nature", _wrap_FEdge_viewedge_nature, METH_VARARGS, NULL},
+	 { (char *)"FEdge_orientation2d", _wrap_FEdge_orientation2d, METH_VARARGS, NULL},
+	 { (char *)"FEdge_orientation3d", _wrap_FEdge_orientation3d, METH_VARARGS, NULL},
+	 { (char *)"FEdge_verticesBegin", _wrap_FEdge_verticesBegin, METH_VARARGS, NULL},
+	 { (char *)"FEdge_verticesEnd", _wrap_FEdge_verticesEnd, METH_VARARGS, NULL},
+	 { (char *)"FEdge_pointsBegin", _wrap_FEdge_pointsBegin, METH_VARARGS, NULL},
+	 { (char *)"FEdge_pointsEnd", _wrap_FEdge_pointsEnd, METH_VARARGS, NULL},
+	 { (char *)"FEdge_swigregister", FEdge_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_FEdgeSVertexIterator", _wrap_new_FEdgeSVertexIterator, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_getExactTypeName", _wrap_FEdgeSVertexIterator_getExactTypeName, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_getObject", _wrap_FEdgeSVertexIterator_getObject, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator___deref__", _wrap_FEdgeSVertexIterator___deref__, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_increment", _wrap_FEdgeSVertexIterator_increment, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_decrement", _wrap_FEdgeSVertexIterator_decrement, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_isBegin", _wrap_FEdgeSVertexIterator_isBegin, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_isEnd", _wrap_FEdgeSVertexIterator_isEnd, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator___eq__", _wrap_FEdgeSVertexIterator___eq__, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_t", _wrap_FEdgeSVertexIterator_t, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_u", _wrap_FEdgeSVertexIterator_u, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_copy", _wrap_FEdgeSVertexIterator_copy, METH_VARARGS, NULL},
+	 { (char *)"delete_FEdgeSVertexIterator", _wrap_delete_FEdgeSVertexIterator, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_getX", _wrap_FEdgeSVertexIterator_getX, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_getY", _wrap_FEdgeSVertexIterator_getY, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_getZ", _wrap_FEdgeSVertexIterator_getZ, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_getPoint3D", _wrap_FEdgeSVertexIterator_getPoint3D, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_getProjectedX", _wrap_FEdgeSVertexIterator_getProjectedX, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_getProjectedY", _wrap_FEdgeSVertexIterator_getProjectedY, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_getProjectedZ", _wrap_FEdgeSVertexIterator_getProjectedZ, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_getPoint2D", _wrap_FEdgeSVertexIterator_getPoint2D, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_getFEdge", _wrap_FEdgeSVertexIterator_getFEdge, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_getId", _wrap_FEdgeSVertexIterator_getId, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_getNature", _wrap_FEdgeSVertexIterator_getNature, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_castToSVertex", _wrap_FEdgeSVertexIterator_castToSVertex, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_castToViewVertex", _wrap_FEdgeSVertexIterator_castToViewVertex, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_castToNonTVertex", _wrap_FEdgeSVertexIterator_castToNonTVertex, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_castToTVertex", _wrap_FEdgeSVertexIterator_castToTVertex, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_userdata_set", _wrap_FEdgeSVertexIterator_userdata_set, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_userdata_get", _wrap_FEdgeSVertexIterator_userdata_get, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_dupplicate", _wrap_FEdgeSVertexIterator_dupplicate, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_point3D", _wrap_FEdgeSVertexIterator_point3D, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_point2D", _wrap_FEdgeSVertexIterator_point2D, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_normals", _wrap_FEdgeSVertexIterator_normals, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_normalsSize", _wrap_FEdgeSVertexIterator_normalsSize, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_fedges", _wrap_FEdgeSVertexIterator_fedges, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_fedges_begin", _wrap_FEdgeSVertexIterator_fedges_begin, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_fedges_end", _wrap_FEdgeSVertexIterator_fedges_end, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_shape", _wrap_FEdgeSVertexIterator_shape, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_z", _wrap_FEdgeSVertexIterator_z, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_viewvertex", _wrap_FEdgeSVertexIterator_viewvertex, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_SetPoint3D", _wrap_FEdgeSVertexIterator_SetPoint3D, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_SetPoint2D", _wrap_FEdgeSVertexIterator_SetPoint2D, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_AddNormal", _wrap_FEdgeSVertexIterator_AddNormal, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_setCurvatureInfo", _wrap_FEdgeSVertexIterator_setCurvatureInfo, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_getCurvatureInfo", _wrap_FEdgeSVertexIterator_getCurvatureInfo, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_setCurvatureFredo", _wrap_FEdgeSVertexIterator_setCurvatureFredo, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_setDirectionFredo", _wrap_FEdgeSVertexIterator_setDirectionFredo, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_curvatureFredo", _wrap_FEdgeSVertexIterator_curvatureFredo, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_directionFredo", _wrap_FEdgeSVertexIterator_directionFredo, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_SetId", _wrap_FEdgeSVertexIterator_SetId, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_SetFEdges", _wrap_FEdgeSVertexIterator_SetFEdges, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_SetShape", _wrap_FEdgeSVertexIterator_SetShape, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_SetViewVertex", _wrap_FEdgeSVertexIterator_SetViewVertex, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_AddFEdge", _wrap_FEdgeSVertexIterator_AddFEdge, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_Replace", _wrap_FEdgeSVertexIterator_Replace, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_fedge", _wrap_FEdgeSVertexIterator_fedge, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_point2d", _wrap_FEdgeSVertexIterator_point2d, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_point3d", _wrap_FEdgeSVertexIterator_point3d, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_normal", _wrap_FEdgeSVertexIterator_normal, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_shape_id", _wrap_FEdgeSVertexIterator_shape_id, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_shape_importance", _wrap_FEdgeSVertexIterator_shape_importance, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_qi", _wrap_FEdgeSVertexIterator_qi, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_occluders_begin", _wrap_FEdgeSVertexIterator_occluders_begin, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_occluders_end", _wrap_FEdgeSVertexIterator_occluders_end, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_occluders_empty", _wrap_FEdgeSVertexIterator_occluders_empty, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_occluders_size", _wrap_FEdgeSVertexIterator_occluders_size, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_occludee", _wrap_FEdgeSVertexIterator_occludee, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_occluded_shape", _wrap_FEdgeSVertexIterator_occluded_shape, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_occludee_empty", _wrap_FEdgeSVertexIterator_occludee_empty, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_z_discontinuity", _wrap_FEdgeSVertexIterator_z_discontinuity, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_swigregister", FEdgeSVertexIterator_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_FEdgeSharp", _wrap_new_FEdgeSharp, METH_VARARGS, NULL},
+	 { (char *)"delete_FEdgeSharp", _wrap_delete_FEdgeSharp, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSharp_dupplicate", _wrap_FEdgeSharp_dupplicate, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSharp_normalA", _wrap_FEdgeSharp_normalA, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSharp_normalB", _wrap_FEdgeSharp_normalB, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSharp_aMaterialIndex", _wrap_FEdgeSharp_aMaterialIndex, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSharp_aMaterial", _wrap_FEdgeSharp_aMaterial, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSharp_bMaterialIndex", _wrap_FEdgeSharp_bMaterialIndex, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSharp_bMaterial", _wrap_FEdgeSharp_bMaterial, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSharp_SetNormalA", _wrap_FEdgeSharp_SetNormalA, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSharp_SetNormalB", _wrap_FEdgeSharp_SetNormalB, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSharp_SetaMaterialIndex", _wrap_FEdgeSharp_SetaMaterialIndex, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSharp_SetbMaterialIndex", _wrap_FEdgeSharp_SetbMaterialIndex, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSharp_swigregister", FEdgeSharp_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_FEdgeSmooth", _wrap_new_FEdgeSmooth, METH_VARARGS, NULL},
+	 { (char *)"delete_FEdgeSmooth", _wrap_delete_FEdgeSmooth, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSmooth_dupplicate", _wrap_FEdgeSmooth_dupplicate, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSmooth_face", _wrap_FEdgeSmooth_face, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSmooth_normal", _wrap_FEdgeSmooth_normal, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSmooth_materialIndex", _wrap_FEdgeSmooth_materialIndex, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSmooth_material", _wrap_FEdgeSmooth_material, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSmooth_SetFace", _wrap_FEdgeSmooth_SetFace, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSmooth_SetNormal", _wrap_FEdgeSmooth_SetNormal, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSmooth_SetMaterialIndex", _wrap_FEdgeSmooth_SetMaterialIndex, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSmooth_swigregister", FEdgeSmooth_swigregister, METH_VARARGS, NULL},
+	 { (char *)"SShape_userdata_set", _wrap_SShape_userdata_set, METH_VARARGS, NULL},
+	 { (char *)"SShape_userdata_get", _wrap_SShape_userdata_get, METH_VARARGS, NULL},
+	 { (char *)"new_SShape", _wrap_new_SShape, METH_VARARGS, NULL},
+	 { (char *)"SShape_dupplicate", _wrap_SShape_dupplicate, METH_VARARGS, NULL},
+	 { (char *)"delete_SShape", _wrap_delete_SShape, METH_VARARGS, NULL},
+	 { (char *)"SShape_AddEdge", _wrap_SShape_AddEdge, METH_VARARGS, NULL},
+	 { (char *)"SShape_AddNewVertex", _wrap_SShape_AddNewVertex, METH_VARARGS, NULL},
+	 { (char *)"SShape_AddChain", _wrap_SShape_AddChain, METH_VARARGS, NULL},
+	 { (char *)"SShape_CreateSVertex", _wrap_SShape_CreateSVertex, METH_VARARGS, NULL},
+	 { (char *)"SShape_SplitEdge", _wrap_SShape_SplitEdge, METH_VARARGS, NULL},
+	 { (char *)"SShape_SplitEdgeIn2", _wrap_SShape_SplitEdgeIn2, METH_VARARGS, NULL},
+	 { (char *)"SShape_SetBBox", _wrap_SShape_SetBBox, METH_VARARGS, NULL},
+	 { (char *)"SShape_ComputeBBox", _wrap_SShape_ComputeBBox, METH_VARARGS, NULL},
+	 { (char *)"SShape_RemoveEdgeFromChain", _wrap_SShape_RemoveEdgeFromChain, METH_VARARGS, NULL},
+	 { (char *)"SShape_RemoveEdge", _wrap_SShape_RemoveEdge, METH_VARARGS, NULL},
+	 { (char *)"SShape_GetVertexList", _wrap_SShape_GetVertexList, METH_VARARGS, NULL},
+	 { (char *)"SShape_GetEdgeList", _wrap_SShape_GetEdgeList, METH_VARARGS, NULL},
+	 { (char *)"SShape_GetChains", _wrap_SShape_GetChains, METH_VARARGS, NULL},
+	 { (char *)"SShape_bbox", _wrap_SShape_bbox, METH_VARARGS, NULL},
+	 { (char *)"SShape_material", _wrap_SShape_material, METH_VARARGS, NULL},
+	 { (char *)"SShape_materials", _wrap_SShape_materials, METH_VARARGS, NULL},
+	 { (char *)"SShape_viewShape", _wrap_SShape_viewShape, METH_VARARGS, NULL},
+	 { (char *)"SShape_importance", _wrap_SShape_importance, METH_VARARGS, NULL},
+	 { (char *)"SShape_getId", _wrap_SShape_getId, METH_VARARGS, NULL},
+	 { (char *)"SShape_SetId", _wrap_SShape_SetId, METH_VARARGS, NULL},
+	 { (char *)"SShape_SetMaterials", _wrap_SShape_SetMaterials, METH_VARARGS, NULL},
+	 { (char *)"SShape_SetViewShape", _wrap_SShape_SetViewShape, METH_VARARGS, NULL},
+	 { (char *)"SShape_SetImportance", _wrap_SShape_SetImportance, METH_VARARGS, NULL},
+	 { (char *)"SShape_swigregister", SShape_swigregister, METH_VARARGS, NULL},
+	 { (char *)"ViewShapesContainer_iterator", _wrap_ViewShapesContainer_iterator, METH_VARARGS, NULL},
+	 { (char *)"ViewShapesContainer___nonzero__", _wrap_ViewShapesContainer___nonzero__, METH_VARARGS, NULL},
+	 { (char *)"ViewShapesContainer___len__", _wrap_ViewShapesContainer___len__, METH_VARARGS, NULL},
+	 { (char *)"ViewShapesContainer_pop", _wrap_ViewShapesContainer_pop, METH_VARARGS, NULL},
+	 { (char *)"ViewShapesContainer___getslice__", _wrap_ViewShapesContainer___getslice__, METH_VARARGS, NULL},
+	 { (char *)"ViewShapesContainer___setslice__", _wrap_ViewShapesContainer___setslice__, METH_VARARGS, NULL},
+	 { (char *)"ViewShapesContainer___delslice__", _wrap_ViewShapesContainer___delslice__, METH_VARARGS, NULL},
+	 { (char *)"ViewShapesContainer___delitem__", _wrap_ViewShapesContainer___delitem__, METH_VARARGS, NULL},
+	 { (char *)"ViewShapesContainer___getitem__", _wrap_ViewShapesContainer___getitem__, METH_VARARGS, NULL},
+	 { (char *)"ViewShapesContainer___setitem__", _wrap_ViewShapesContainer___setitem__, METH_VARARGS, NULL},
+	 { (char *)"ViewShapesContainer_append", _wrap_ViewShapesContainer_append, METH_VARARGS, NULL},
+	 { (char *)"ViewShapesContainer_empty", _wrap_ViewShapesContainer_empty, METH_VARARGS, NULL},
+	 { (char *)"ViewShapesContainer_size", _wrap_ViewShapesContainer_size, METH_VARARGS, NULL},
+	 { (char *)"ViewShapesContainer_clear", _wrap_ViewShapesContainer_clear, METH_VARARGS, NULL},
+	 { (char *)"ViewShapesContainer_swap", _wrap_ViewShapesContainer_swap, METH_VARARGS, NULL},
+	 { (char *)"ViewShapesContainer_get_allocator", _wrap_ViewShapesContainer_get_allocator, METH_VARARGS, NULL},
+	 { (char *)"ViewShapesContainer_begin", _wrap_ViewShapesContainer_begin, METH_VARARGS, NULL},
+	 { (char *)"ViewShapesContainer_end", _wrap_ViewShapesContainer_end, METH_VARARGS, NULL},
+	 { (char *)"ViewShapesContainer_rbegin", _wrap_ViewShapesContainer_rbegin, METH_VARARGS, NULL},
+	 { (char *)"ViewShapesContainer_rend", _wrap_ViewShapesContainer_rend, METH_VARARGS, NULL},
+	 { (char *)"ViewShapesContainer_pop_back", _wrap_ViewShapesContainer_pop_back, METH_VARARGS, NULL},
+	 { (char *)"ViewShapesContainer_erase", _wrap_ViewShapesContainer_erase, METH_VARARGS, NULL},
+	 { (char *)"new_ViewShapesContainer", _wrap_new_ViewShapesContainer, METH_VARARGS, NULL},
+	 { (char *)"ViewShapesContainer_push_back", _wrap_ViewShapesContainer_push_back, METH_VARARGS, NULL},
+	 { (char *)"ViewShapesContainer_front", _wrap_ViewShapesContainer_front, METH_VARARGS, NULL},
+	 { (char *)"ViewShapesContainer_back", _wrap_ViewShapesContainer_back, METH_VARARGS, NULL},
+	 { (char *)"ViewShapesContainer_assign", _wrap_ViewShapesContainer_assign, METH_VARARGS, NULL},
+	 { (char *)"ViewShapesContainer_resize", _wrap_ViewShapesContainer_resize, METH_VARARGS, NULL},
+	 { (char *)"ViewShapesContainer_insert", _wrap_ViewShapesContainer_insert, METH_VARARGS, NULL},
+	 { (char *)"ViewShapesContainer_reserve", _wrap_ViewShapesContainer_reserve, METH_VARARGS, NULL},
+	 { (char *)"ViewShapesContainer_capacity", _wrap_ViewShapesContainer_capacity, METH_VARARGS, NULL},
+	 { (char *)"delete_ViewShapesContainer", _wrap_delete_ViewShapesContainer, METH_VARARGS, NULL},
+	 { (char *)"ViewShapesContainer_swigregister", ViewShapesContainer_swigregister, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgesContainer_iterator", _wrap_ViewEdgesContainer_iterator, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgesContainer___nonzero__", _wrap_ViewEdgesContainer___nonzero__, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgesContainer___len__", _wrap_ViewEdgesContainer___len__, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgesContainer_pop", _wrap_ViewEdgesContainer_pop, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgesContainer___getslice__", _wrap_ViewEdgesContainer___getslice__, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgesContainer___setslice__", _wrap_ViewEdgesContainer___setslice__, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgesContainer___delslice__", _wrap_ViewEdgesContainer___delslice__, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgesContainer___delitem__", _wrap_ViewEdgesContainer___delitem__, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgesContainer___getitem__", _wrap_ViewEdgesContainer___getitem__, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgesContainer___setitem__", _wrap_ViewEdgesContainer___setitem__, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgesContainer_append", _wrap_ViewEdgesContainer_append, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgesContainer_empty", _wrap_ViewEdgesContainer_empty, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgesContainer_size", _wrap_ViewEdgesContainer_size, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgesContainer_clear", _wrap_ViewEdgesContainer_clear, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgesContainer_swap", _wrap_ViewEdgesContainer_swap, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgesContainer_get_allocator", _wrap_ViewEdgesContainer_get_allocator, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgesContainer_begin", _wrap_ViewEdgesContainer_begin, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgesContainer_end", _wrap_ViewEdgesContainer_end, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgesContainer_rbegin", _wrap_ViewEdgesContainer_rbegin, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgesContainer_rend", _wrap_ViewEdgesContainer_rend, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgesContainer_pop_back", _wrap_ViewEdgesContainer_pop_back, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgesContainer_erase", _wrap_ViewEdgesContainer_erase, METH_VARARGS, NULL},
+	 { (char *)"new_ViewEdgesContainer", _wrap_new_ViewEdgesContainer, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgesContainer_push_back", _wrap_ViewEdgesContainer_push_back, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgesContainer_front", _wrap_ViewEdgesContainer_front, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgesContainer_back", _wrap_ViewEdgesContainer_back, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgesContainer_assign", _wrap_ViewEdgesContainer_assign, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgesContainer_resize", _wrap_ViewEdgesContainer_resize, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgesContainer_insert", _wrap_ViewEdgesContainer_insert, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgesContainer_reserve", _wrap_ViewEdgesContainer_reserve, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgesContainer_capacity", _wrap_ViewEdgesContainer_capacity, METH_VARARGS, NULL},
+	 { (char *)"delete_ViewEdgesContainer", _wrap_delete_ViewEdgesContainer, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgesContainer_swigregister", ViewEdgesContainer_swigregister, METH_VARARGS, NULL},
+	 { (char *)"FEdgesContainer_iterator", _wrap_FEdgesContainer_iterator, METH_VARARGS, NULL},
+	 { (char *)"FEdgesContainer___nonzero__", _wrap_FEdgesContainer___nonzero__, METH_VARARGS, NULL},
+	 { (char *)"FEdgesContainer___len__", _wrap_FEdgesContainer___len__, METH_VARARGS, NULL},
+	 { (char *)"FEdgesContainer_pop", _wrap_FEdgesContainer_pop, METH_VARARGS, NULL},
+	 { (char *)"FEdgesContainer___getslice__", _wrap_FEdgesContainer___getslice__, METH_VARARGS, NULL},
+	 { (char *)"FEdgesContainer___setslice__", _wrap_FEdgesContainer___setslice__, METH_VARARGS, NULL},
+	 { (char *)"FEdgesContainer___delslice__", _wrap_FEdgesContainer___delslice__, METH_VARARGS, NULL},
+	 { (char *)"FEdgesContainer___delitem__", _wrap_FEdgesContainer___delitem__, METH_VARARGS, NULL},
+	 { (char *)"FEdgesContainer___getitem__", _wrap_FEdgesContainer___getitem__, METH_VARARGS, NULL},
+	 { (char *)"FEdgesContainer___setitem__", _wrap_FEdgesContainer___setitem__, METH_VARARGS, NULL},
+	 { (char *)"FEdgesContainer_append", _wrap_FEdgesContainer_append, METH_VARARGS, NULL},
+	 { (char *)"FEdgesContainer_empty", _wrap_FEdgesContainer_empty, METH_VARARGS, NULL},
+	 { (char *)"FEdgesContainer_size", _wrap_FEdgesContainer_size, METH_VARARGS, NULL},
+	 { (char *)"FEdgesContainer_clear", _wrap_FEdgesContainer_clear, METH_VARARGS, NULL},
+	 { (char *)"FEdgesContainer_swap", _wrap_FEdgesContainer_swap, METH_VARARGS, NULL},
+	 { (char *)"FEdgesContainer_get_allocator", _wrap_FEdgesContainer_get_allocator, METH_VARARGS, NULL},
+	 { (char *)"FEdgesContainer_begin", _wrap_FEdgesContainer_begin, METH_VARARGS, NULL},
+	 { (char *)"FEdgesContainer_end", _wrap_FEdgesContainer_end, METH_VARARGS, NULL},
+	 { (char *)"FEdgesContainer_rbegin", _wrap_FEdgesContainer_rbegin, METH_VARARGS, NULL},
+	 { (char *)"FEdgesContainer_rend", _wrap_FEdgesContainer_rend, METH_VARARGS, NULL},
+	 { (char *)"FEdgesContainer_pop_back", _wrap_FEdgesContainer_pop_back, METH_VARARGS, NULL},
+	 { (char *)"FEdgesContainer_erase", _wrap_FEdgesContainer_erase, METH_VARARGS, NULL},
+	 { (char *)"new_FEdgesContainer", _wrap_new_FEdgesContainer, METH_VARARGS, NULL},
+	 { (char *)"FEdgesContainer_push_back", _wrap_FEdgesContainer_push_back, METH_VARARGS, NULL},
+	 { (char *)"FEdgesContainer_front", _wrap_FEdgesContainer_front, METH_VARARGS, NULL},
+	 { (char *)"FEdgesContainer_back", _wrap_FEdgesContainer_back, METH_VARARGS, NULL},
+	 { (char *)"FEdgesContainer_assign", _wrap_FEdgesContainer_assign, METH_VARARGS, NULL},
+	 { (char *)"FEdgesContainer_resize", _wrap_FEdgesContainer_resize, METH_VARARGS, NULL},
+	 { (char *)"FEdgesContainer_insert", _wrap_FEdgesContainer_insert, METH_VARARGS, NULL},
+	 { (char *)"FEdgesContainer_reserve", _wrap_FEdgesContainer_reserve, METH_VARARGS, NULL},
+	 { (char *)"FEdgesContainer_capacity", _wrap_FEdgesContainer_capacity, METH_VARARGS, NULL},
+	 { (char *)"delete_FEdgesContainer", _wrap_delete_FEdgesContainer, METH_VARARGS, NULL},
+	 { (char *)"FEdgesContainer_swigregister", FEdgesContainer_swigregister, METH_VARARGS, NULL},
+	 { (char *)"ViewVerticesContainer_iterator", _wrap_ViewVerticesContainer_iterator, METH_VARARGS, NULL},
+	 { (char *)"ViewVerticesContainer___nonzero__", _wrap_ViewVerticesContainer___nonzero__, METH_VARARGS, NULL},
+	 { (char *)"ViewVerticesContainer___len__", _wrap_ViewVerticesContainer___len__, METH_VARARGS, NULL},
+	 { (char *)"ViewVerticesContainer_pop", _wrap_ViewVerticesContainer_pop, METH_VARARGS, NULL},
+	 { (char *)"ViewVerticesContainer___getslice__", _wrap_ViewVerticesContainer___getslice__, METH_VARARGS, NULL},
+	 { (char *)"ViewVerticesContainer___setslice__", _wrap_ViewVerticesContainer___setslice__, METH_VARARGS, NULL},
+	 { (char *)"ViewVerticesContainer___delslice__", _wrap_ViewVerticesContainer___delslice__, METH_VARARGS, NULL},
+	 { (char *)"ViewVerticesContainer___delitem__", _wrap_ViewVerticesContainer___delitem__, METH_VARARGS, NULL},
+	 { (char *)"ViewVerticesContainer___getitem__", _wrap_ViewVerticesContainer___getitem__, METH_VARARGS, NULL},
+	 { (char *)"ViewVerticesContainer___setitem__", _wrap_ViewVerticesContainer___setitem__, METH_VARARGS, NULL},
+	 { (char *)"ViewVerticesContainer_append", _wrap_ViewVerticesContainer_append, METH_VARARGS, NULL},
+	 { (char *)"ViewVerticesContainer_empty", _wrap_ViewVerticesContainer_empty, METH_VARARGS, NULL},
+	 { (char *)"ViewVerticesContainer_size", _wrap_ViewVerticesContainer_size, METH_VARARGS, NULL},
+	 { (char *)"ViewVerticesContainer_clear", _wrap_ViewVerticesContainer_clear, METH_VARARGS, NULL},
+	 { (char *)"ViewVerticesContainer_swap", _wrap_ViewVerticesContainer_swap, METH_VARARGS, NULL},
+	 { (char *)"ViewVerticesContainer_get_allocator", _wrap_ViewVerticesContainer_get_allocator, METH_VARARGS, NULL},
+	 { (char *)"ViewVerticesContainer_begin", _wrap_ViewVerticesContainer_begin, METH_VARARGS, NULL},
+	 { (char *)"ViewVerticesContainer_end", _wrap_ViewVerticesContainer_end, METH_VARARGS, NULL},
+	 { (char *)"ViewVerticesContainer_rbegin", _wrap_ViewVerticesContainer_rbegin, METH_VARARGS, NULL},
+	 { (char *)"ViewVerticesContainer_rend", _wrap_ViewVerticesContainer_rend, METH_VARARGS, NULL},
+	 { (char *)"ViewVerticesContainer_pop_back", _wrap_ViewVerticesContainer_pop_back, METH_VARARGS, NULL},
+	 { (char *)"ViewVerticesContainer_erase", _wrap_ViewVerticesContainer_erase, METH_VARARGS, NULL},
+	 { (char *)"new_ViewVerticesContainer", _wrap_new_ViewVerticesContainer, METH_VARARGS, NULL},
+	 { (char *)"ViewVerticesContainer_push_back", _wrap_ViewVerticesContainer_push_back, METH_VARARGS, NULL},
+	 { (char *)"ViewVerticesContainer_front", _wrap_ViewVerticesContainer_front, METH_VARARGS, NULL},
+	 { (char *)"ViewVerticesContainer_back", _wrap_ViewVerticesContainer_back, METH_VARARGS, NULL},
+	 { (char *)"ViewVerticesContainer_assign", _wrap_ViewVerticesContainer_assign, METH_VARARGS, NULL},
+	 { (char *)"ViewVerticesContainer_resize", _wrap_ViewVerticesContainer_resize, METH_VARARGS, NULL},
+	 { (char *)"ViewVerticesContainer_insert", _wrap_ViewVerticesContainer_insert, METH_VARARGS, NULL},
+	 { (char *)"ViewVerticesContainer_reserve", _wrap_ViewVerticesContainer_reserve, METH_VARARGS, NULL},
+	 { (char *)"ViewVerticesContainer_capacity", _wrap_ViewVerticesContainer_capacity, METH_VARARGS, NULL},
+	 { (char *)"delete_ViewVerticesContainer", _wrap_delete_ViewVerticesContainer, METH_VARARGS, NULL},
+	 { (char *)"ViewVerticesContainer_swigregister", ViewVerticesContainer_swigregister, METH_VARARGS, NULL},
+	 { (char *)"SVerticesContainer_iterator", _wrap_SVerticesContainer_iterator, METH_VARARGS, NULL},
+	 { (char *)"SVerticesContainer___nonzero__", _wrap_SVerticesContainer___nonzero__, METH_VARARGS, NULL},
+	 { (char *)"SVerticesContainer___len__", _wrap_SVerticesContainer___len__, METH_VARARGS, NULL},
+	 { (char *)"SVerticesContainer_pop", _wrap_SVerticesContainer_pop, METH_VARARGS, NULL},
+	 { (char *)"SVerticesContainer___getslice__", _wrap_SVerticesContainer___getslice__, METH_VARARGS, NULL},
+	 { (char *)"SVerticesContainer___setslice__", _wrap_SVerticesContainer___setslice__, METH_VARARGS, NULL},
+	 { (char *)"SVerticesContainer___delslice__", _wrap_SVerticesContainer___delslice__, METH_VARARGS, NULL},
+	 { (char *)"SVerticesContainer___delitem__", _wrap_SVerticesContainer___delitem__, METH_VARARGS, NULL},
+	 { (char *)"SVerticesContainer___getitem__", _wrap_SVerticesContainer___getitem__, METH_VARARGS, NULL},
+	 { (char *)"SVerticesContainer___setitem__", _wrap_SVerticesContainer___setitem__, METH_VARARGS, NULL},
+	 { (char *)"SVerticesContainer_append", _wrap_SVerticesContainer_append, METH_VARARGS, NULL},
+	 { (char *)"SVerticesContainer_empty", _wrap_SVerticesContainer_empty, METH_VARARGS, NULL},
+	 { (char *)"SVerticesContainer_size", _wrap_SVerticesContainer_size, METH_VARARGS, NULL},
+	 { (char *)"SVerticesContainer_clear", _wrap_SVerticesContainer_clear, METH_VARARGS, NULL},
+	 { (char *)"SVerticesContainer_swap", _wrap_SVerticesContainer_swap, METH_VARARGS, NULL},
+	 { (char *)"SVerticesContainer_get_allocator", _wrap_SVerticesContainer_get_allocator, METH_VARARGS, NULL},
+	 { (char *)"SVerticesContainer_begin", _wrap_SVerticesContainer_begin, METH_VARARGS, NULL},
+	 { (char *)"SVerticesContainer_end", _wrap_SVerticesContainer_end, METH_VARARGS, NULL},
+	 { (char *)"SVerticesContainer_rbegin", _wrap_SVerticesContainer_rbegin, METH_VARARGS, NULL},
+	 { (char *)"SVerticesContainer_rend", _wrap_SVerticesContainer_rend, METH_VARARGS, NULL},
+	 { (char *)"SVerticesContainer_pop_back", _wrap_SVerticesContainer_pop_back, METH_VARARGS, NULL},
+	 { (char *)"SVerticesContainer_erase", _wrap_SVerticesContainer_erase, METH_VARARGS, NULL},
+	 { (char *)"new_SVerticesContainer", _wrap_new_SVerticesContainer, METH_VARARGS, NULL},
+	 { (char *)"SVerticesContainer_push_back", _wrap_SVerticesContainer_push_back, METH_VARARGS, NULL},
+	 { (char *)"SVerticesContainer_front", _wrap_SVerticesContainer_front, METH_VARARGS, NULL},
+	 { (char *)"SVerticesContainer_back", _wrap_SVerticesContainer_back, METH_VARARGS, NULL},
+	 { (char *)"SVerticesContainer_assign", _wrap_SVerticesContainer_assign, METH_VARARGS, NULL},
+	 { (char *)"SVerticesContainer_resize", _wrap_SVerticesContainer_resize, METH_VARARGS, NULL},
+	 { (char *)"SVerticesContainer_insert", _wrap_SVerticesContainer_insert, METH_VARARGS, NULL},
+	 { (char *)"SVerticesContainer_reserve", _wrap_SVerticesContainer_reserve, METH_VARARGS, NULL},
+	 { (char *)"SVerticesContainer_capacity", _wrap_SVerticesContainer_capacity, METH_VARARGS, NULL},
+	 { (char *)"delete_SVerticesContainer", _wrap_delete_SVerticesContainer, METH_VARARGS, NULL},
+	 { (char *)"SVerticesContainer_swigregister", SVerticesContainer_swigregister, METH_VARARGS, NULL},
+	 { (char *)"ViewMap_userdata_set", _wrap_ViewMap_userdata_set, METH_VARARGS, NULL},
+	 { (char *)"ViewMap_userdata_get", _wrap_ViewMap_userdata_get, METH_VARARGS, NULL},
+	 { (char *)"new_ViewMap", _wrap_new_ViewMap, METH_VARARGS, NULL},
+	 { (char *)"delete_ViewMap", _wrap_delete_ViewMap, METH_VARARGS, NULL},
+	 { (char *)"ViewMap_GetClosestViewEdge", _wrap_ViewMap_GetClosestViewEdge, METH_VARARGS, NULL},
+	 { (char *)"ViewMap_GetClosestFEdge", _wrap_ViewMap_GetClosestFEdge, METH_VARARGS, NULL},
+	 { (char *)"ViewMap_getInstance", _wrap_ViewMap_getInstance, METH_VARARGS, NULL},
+	 { (char *)"ViewMap_ViewShapes", _wrap_ViewMap_ViewShapes, METH_VARARGS, NULL},
+	 { (char *)"ViewMap_ViewEdges", _wrap_ViewMap_ViewEdges, METH_VARARGS, NULL},
+	 { (char *)"ViewMap_ViewVertices", _wrap_ViewMap_ViewVertices, METH_VARARGS, NULL},
+	 { (char *)"ViewMap_FEdges", _wrap_ViewMap_FEdges, METH_VARARGS, NULL},
+	 { (char *)"ViewMap_SVertices", _wrap_ViewMap_SVertices, METH_VARARGS, NULL},
+	 { (char *)"ViewMap_viewedges_begin", _wrap_ViewMap_viewedges_begin, METH_VARARGS, NULL},
+	 { (char *)"ViewMap_viewedges_end", _wrap_ViewMap_viewedges_end, METH_VARARGS, NULL},
+	 { (char *)"ViewMap_viewedges_size", _wrap_ViewMap_viewedges_size, METH_VARARGS, NULL},
+	 { (char *)"ViewMap_viewShape", _wrap_ViewMap_viewShape, METH_VARARGS, NULL},
+	 { (char *)"ViewMap_getScene3dBBox", _wrap_ViewMap_getScene3dBBox, METH_VARARGS, NULL},
+	 { (char *)"ViewMap_AddViewShape", _wrap_ViewMap_AddViewShape, METH_VARARGS, NULL},
+	 { (char *)"ViewMap_AddViewEdge", _wrap_ViewMap_AddViewEdge, METH_VARARGS, NULL},
+	 { (char *)"ViewMap_AddViewVertex", _wrap_ViewMap_AddViewVertex, METH_VARARGS, NULL},
+	 { (char *)"ViewMap_AddFEdge", _wrap_ViewMap_AddFEdge, METH_VARARGS, NULL},
+	 { (char *)"ViewMap_AddSVertex", _wrap_ViewMap_AddSVertex, METH_VARARGS, NULL},
+	 { (char *)"ViewMap_setScene3dBBox", _wrap_ViewMap_setScene3dBBox, METH_VARARGS, NULL},
+	 { (char *)"ViewMap_CreateTVertex", _wrap_ViewMap_CreateTVertex, METH_VARARGS, NULL},
+	 { (char *)"ViewMap_InsertViewVertex", _wrap_ViewMap_InsertViewVertex, METH_VARARGS, NULL},
+	 { (char *)"ViewMap_swigregister", ViewMap_swigregister, METH_VARARGS, NULL},
+	 { (char *)"ViewVertex_getExactTypeName", _wrap_ViewVertex_getExactTypeName, METH_VARARGS, NULL},
+	 { (char *)"ViewVertex_userdata_set", _wrap_ViewVertex_userdata_set, METH_VARARGS, NULL},
+	 { (char *)"ViewVertex_userdata_get", _wrap_ViewVertex_userdata_get, METH_VARARGS, NULL},
+	 { (char *)"delete_ViewVertex", _wrap_delete_ViewVertex, METH_VARARGS, NULL},
+	 { (char *)"ViewVertex_getNature", _wrap_ViewVertex_getNature, METH_VARARGS, NULL},
+	 { (char *)"ViewVertex_setNature", _wrap_ViewVertex_setNature, METH_VARARGS, NULL},
+	 { (char *)"ViewVertex_Replace", _wrap_ViewVertex_Replace, METH_VARARGS, NULL},
+	 { (char *)"ViewVertex_edges_begin", _wrap_ViewVertex_edges_begin, METH_VARARGS, NULL},
+	 { (char *)"ViewVertex_edges_end", _wrap_ViewVertex_edges_end, METH_VARARGS, NULL},
+	 { (char *)"ViewVertex_edges_iterator", _wrap_ViewVertex_edges_iterator, METH_VARARGS, NULL},
+	 { (char *)"ViewVertex_edgesBegin", _wrap_ViewVertex_edgesBegin, METH_VARARGS, NULL},
+	 { (char *)"ViewVertex_edgesEnd", _wrap_ViewVertex_edgesEnd, METH_VARARGS, NULL},
+	 { (char *)"ViewVertex_edgesIterator", _wrap_ViewVertex_edgesIterator, METH_VARARGS, NULL},
+	 { (char *)"ViewVertex_swigregister", ViewVertex_swigregister, METH_VARARGS, NULL},
+	 { (char *)"TVertex_getExactTypeName", _wrap_TVertex_getExactTypeName, METH_VARARGS, NULL},
+	 { (char *)"TVertex_getX", _wrap_TVertex_getX, METH_VARARGS, NULL},
+	 { (char *)"TVertex_getY", _wrap_TVertex_getY, METH_VARARGS, NULL},
+	 { (char *)"TVertex_getZ", _wrap_TVertex_getZ, METH_VARARGS, NULL},
+	 { (char *)"TVertex_getPoint3D", _wrap_TVertex_getPoint3D, METH_VARARGS, NULL},
+	 { (char *)"TVertex_getProjectedX", _wrap_TVertex_getProjectedX, METH_VARARGS, NULL},
+	 { (char *)"TVertex_getProjectedY", _wrap_TVertex_getProjectedY, METH_VARARGS, NULL},
+	 { (char *)"TVertex_getProjectedZ", _wrap_TVertex_getProjectedZ, METH_VARARGS, NULL},
+	 { (char *)"TVertex_getPoint2D", _wrap_TVertex_getPoint2D, METH_VARARGS, NULL},
+	 { (char *)"TVertex_getId", _wrap_TVertex_getId, METH_VARARGS, NULL},
+	 { (char *)"TVertex_castToViewVertex", _wrap_TVertex_castToViewVertex, METH_VARARGS, NULL},
+	 { (char *)"TVertex_castToTVertex", _wrap_TVertex_castToTVertex, METH_VARARGS, NULL},
+	 { (char *)"new_TVertex", _wrap_new_TVertex, METH_VARARGS, NULL},
+	 { (char *)"TVertex_frontSVertex", _wrap_TVertex_frontSVertex, METH_VARARGS, NULL},
+	 { (char *)"TVertex_backSVertex", _wrap_TVertex_backSVertex, METH_VARARGS, NULL},
+	 { (char *)"TVertex_frontEdgeA", _wrap_TVertex_frontEdgeA, METH_VARARGS, NULL},
+	 { (char *)"TVertex_frontEdgeB", _wrap_TVertex_frontEdgeB, METH_VARARGS, NULL},
+	 { (char *)"TVertex_backEdgeA", _wrap_TVertex_backEdgeA, METH_VARARGS, NULL},
+	 { (char *)"TVertex_backEdgeB", _wrap_TVertex_backEdgeB, METH_VARARGS, NULL},
+	 { (char *)"TVertex_SetFrontVertex", _wrap_TVertex_SetFrontVertex, METH_VARARGS, NULL},
+	 { (char *)"TVertex_SetBackSVertex", _wrap_TVertex_SetBackSVertex, METH_VARARGS, NULL},
+	 { (char *)"TVertex_SetFrontEdgeA", _wrap_TVertex_SetFrontEdgeA, METH_VARARGS, NULL},
+	 { (char *)"TVertex_SetFrontEdgeB", _wrap_TVertex_SetFrontEdgeB, METH_VARARGS, NULL},
+	 { (char *)"TVertex_SetBackEdgeA", _wrap_TVertex_SetBackEdgeA, METH_VARARGS, NULL},
+	 { (char *)"TVertex_SetBackEdgeB", _wrap_TVertex_SetBackEdgeB, METH_VARARGS, NULL},
+	 { (char *)"TVertex_SetId", _wrap_TVertex_SetId, METH_VARARGS, NULL},
+	 { (char *)"TVertex_GetSVertex", _wrap_TVertex_GetSVertex, METH_VARARGS, NULL},
+	 { (char *)"TVertex_Replace", _wrap_TVertex_Replace, METH_VARARGS, NULL},
+	 { (char *)"TVertex_mate", _wrap_TVertex_mate, METH_VARARGS, NULL},
+	 { (char *)"TVertex_edges_end", _wrap_TVertex_edges_end, METH_VARARGS, NULL},
+	 { (char *)"TVertex_edgesBegin", _wrap_TVertex_edgesBegin, METH_VARARGS, NULL},
+	 { (char *)"TVertex_edgesEnd", _wrap_TVertex_edgesEnd, METH_VARARGS, NULL},
+	 { (char *)"TVertex_edgesIterator", _wrap_TVertex_edgesIterator, METH_VARARGS, NULL},
+	 { (char *)"delete_TVertex", _wrap_delete_TVertex, METH_VARARGS, NULL},
+	 { (char *)"TVertex_swigregister", TVertex_swigregister, METH_VARARGS, NULL},
+	 { (char *)"NonTVertex_getExactTypeName", _wrap_NonTVertex_getExactTypeName, METH_VARARGS, NULL},
+	 { (char *)"NonTVertex_getX", _wrap_NonTVertex_getX, METH_VARARGS, NULL},
+	 { (char *)"NonTVertex_getY", _wrap_NonTVertex_getY, METH_VARARGS, NULL},
+	 { (char *)"NonTVertex_getZ", _wrap_NonTVertex_getZ, METH_VARARGS, NULL},
+	 { (char *)"NonTVertex_getPoint3D", _wrap_NonTVertex_getPoint3D, METH_VARARGS, NULL},
+	 { (char *)"NonTVertex_getProjectedX", _wrap_NonTVertex_getProjectedX, METH_VARARGS, NULL},
+	 { (char *)"NonTVertex_getProjectedY", _wrap_NonTVertex_getProjectedY, METH_VARARGS, NULL},
+	 { (char *)"NonTVertex_getProjectedZ", _wrap_NonTVertex_getProjectedZ, METH_VARARGS, NULL},
+	 { (char *)"NonTVertex_getPoint2D", _wrap_NonTVertex_getPoint2D, METH_VARARGS, NULL},
+	 { (char *)"NonTVertex_getId", _wrap_NonTVertex_getId, METH_VARARGS, NULL},
+	 { (char *)"NonTVertex_castToSVertex", _wrap_NonTVertex_castToSVertex, METH_VARARGS, NULL},
+	 { (char *)"NonTVertex_castToViewVertex", _wrap_NonTVertex_castToViewVertex, METH_VARARGS, NULL},
+	 { (char *)"NonTVertex_castToNonTVertex", _wrap_NonTVertex_castToNonTVertex, METH_VARARGS, NULL},
+	 { (char *)"new_NonTVertex", _wrap_new_NonTVertex, METH_VARARGS, NULL},
+	 { (char *)"delete_NonTVertex", _wrap_delete_NonTVertex, METH_VARARGS, NULL},
+	 { (char *)"NonTVertex_svertex", _wrap_NonTVertex_svertex, METH_VARARGS, NULL},
+	 { (char *)"NonTVertex_viewedges", _wrap_NonTVertex_viewedges, METH_VARARGS, NULL},
+	 { (char *)"NonTVertex_SetSVertex", _wrap_NonTVertex_SetSVertex, METH_VARARGS, NULL},
+	 { (char *)"NonTVertex_SetViewEdges", _wrap_NonTVertex_SetViewEdges, METH_VARARGS, NULL},
+	 { (char *)"NonTVertex_AddIncomingViewEdge", _wrap_NonTVertex_AddIncomingViewEdge, METH_VARARGS, NULL},
+	 { (char *)"NonTVertex_AddOutgoingViewEdge", _wrap_NonTVertex_AddOutgoingViewEdge, METH_VARARGS, NULL},
+	 { (char *)"NonTVertex_AddViewEdge", _wrap_NonTVertex_AddViewEdge, METH_VARARGS, NULL},
+	 { (char *)"NonTVertex_Replace", _wrap_NonTVertex_Replace, METH_VARARGS, NULL},
+	 { (char *)"NonTVertex_edges_end", _wrap_NonTVertex_edges_end, METH_VARARGS, NULL},
+	 { (char *)"NonTVertex_edgesBegin", _wrap_NonTVertex_edgesBegin, METH_VARARGS, NULL},
+	 { (char *)"NonTVertex_edgesEnd", _wrap_NonTVertex_edgesEnd, METH_VARARGS, NULL},
+	 { (char *)"NonTVertex_edgesIterator", _wrap_NonTVertex_edgesIterator, METH_VARARGS, NULL},
+	 { (char *)"NonTVertex_swigregister", NonTVertex_swigregister, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_getExactTypeName", _wrap_ViewEdge_getExactTypeName, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_getId", _wrap_ViewEdge_getId, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_getNature", _wrap_ViewEdge_getNature, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_userdata_set", _wrap_ViewEdge_userdata_set, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_userdata_get", _wrap_ViewEdge_userdata_get, METH_VARARGS, NULL},
+	 { (char *)"new_ViewEdge", _wrap_new_ViewEdge, METH_VARARGS, NULL},
+	 { (char *)"delete_ViewEdge", _wrap_delete_ViewEdge, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_A", _wrap_ViewEdge_A, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_B", _wrap_ViewEdge_B, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_fedgeA", _wrap_ViewEdge_fedgeA, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_fedgeB", _wrap_ViewEdge_fedgeB, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_viewShape", _wrap_ViewEdge_viewShape, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_isClosed", _wrap_ViewEdge_isClosed, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_getChainingTimeStamp", _wrap_ViewEdge_getChainingTimeStamp, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_aShape", _wrap_ViewEdge_aShape, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_bShape", _wrap_ViewEdge_bShape, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_occluders", _wrap_ViewEdge_occluders, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_splittingId", _wrap_ViewEdge_splittingId, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_SetA", _wrap_ViewEdge_SetA, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_SetB", _wrap_ViewEdge_SetB, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_SetNature", _wrap_ViewEdge_SetNature, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_SetFEdgeA", _wrap_ViewEdge_SetFEdgeA, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_SetFEdgeB", _wrap_ViewEdge_SetFEdgeB, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_SetShape", _wrap_ViewEdge_SetShape, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_SetId", _wrap_ViewEdge_SetId, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_UpdateFEdges", _wrap_ViewEdge_UpdateFEdges, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_SetaShape", _wrap_ViewEdge_SetaShape, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_SetQI", _wrap_ViewEdge_SetQI, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_setChainingTimeStamp", _wrap_ViewEdge_setChainingTimeStamp, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_AddOccluder", _wrap_ViewEdge_AddOccluder, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_setSplittingId", _wrap_ViewEdge_setSplittingId, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_intersect_2d_area", _wrap_ViewEdge_intersect_2d_area, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_include_in_2d_area", _wrap_ViewEdge_include_in_2d_area, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_getLength2D", _wrap_ViewEdge_getLength2D, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_qi", _wrap_ViewEdge_qi, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_occluders_begin", _wrap_ViewEdge_occluders_begin, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_occluders_end", _wrap_ViewEdge_occluders_end, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_occluders_size", _wrap_ViewEdge_occluders_size, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_occluders_empty", _wrap_ViewEdge_occluders_empty, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_occludee", _wrap_ViewEdge_occludee, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_occluded_shape", _wrap_ViewEdge_occluded_shape, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_occludee_empty", _wrap_ViewEdge_occludee_empty, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_shape_id", _wrap_ViewEdge_shape_id, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_shape", _wrap_ViewEdge_shape, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_shape_importance", _wrap_ViewEdge_shape_importance, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_verticesBegin", _wrap_ViewEdge_verticesBegin, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_verticesEnd", _wrap_ViewEdge_verticesEnd, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_pointsBegin", _wrap_ViewEdge_pointsBegin, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_pointsEnd", _wrap_ViewEdge_pointsEnd, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_swigregister", ViewEdge_swigregister, METH_VARARGS, NULL},
+	 { (char *)"ViewShape_userdata_set", _wrap_ViewShape_userdata_set, METH_VARARGS, NULL},
+	 { (char *)"ViewShape_userdata_get", _wrap_ViewShape_userdata_get, METH_VARARGS, NULL},
+	 { (char *)"new_ViewShape", _wrap_new_ViewShape, METH_VARARGS, NULL},
+	 { (char *)"ViewShape_dupplicate", _wrap_ViewShape_dupplicate, METH_VARARGS, NULL},
+	 { (char *)"delete_ViewShape", _wrap_delete_ViewShape, METH_VARARGS, NULL},
+	 { (char *)"ViewShape_SplitEdge", _wrap_ViewShape_SplitEdge, METH_VARARGS, NULL},
+	 { (char *)"ViewShape_sshape", _wrap_ViewShape_sshape, METH_VARARGS, NULL},
+	 { (char *)"ViewShape_vertices", _wrap_ViewShape_vertices, METH_VARARGS, NULL},
+	 { (char *)"ViewShape_edges", _wrap_ViewShape_edges, METH_VARARGS, NULL},
+	 { (char *)"ViewShape_getId", _wrap_ViewShape_getId, METH_VARARGS, NULL},
+	 { (char *)"ViewShape_SetSShape", _wrap_ViewShape_SetSShape, METH_VARARGS, NULL},
+	 { (char *)"ViewShape_SetVertices", _wrap_ViewShape_SetVertices, METH_VARARGS, NULL},
+	 { (char *)"ViewShape_SetEdges", _wrap_ViewShape_SetEdges, METH_VARARGS, NULL},
+	 { (char *)"ViewShape_AddVertex", _wrap_ViewShape_AddVertex, METH_VARARGS, NULL},
+	 { (char *)"ViewShape_AddEdge", _wrap_ViewShape_AddEdge, METH_VARARGS, NULL},
+	 { (char *)"ViewShape_RemoveEdge", _wrap_ViewShape_RemoveEdge, METH_VARARGS, NULL},
+	 { (char *)"ViewShape_RemoveVertex", _wrap_ViewShape_RemoveVertex, METH_VARARGS, NULL},
+	 { (char *)"ViewShape_swigregister", ViewShape_swigregister, METH_VARARGS, NULL},
+	 { (char *)"delete_ViewVertexOrientedViewEdgeIterator", _wrap_delete_ViewVertexOrientedViewEdgeIterator, METH_VARARGS, NULL},
+	 { (char *)"new_ViewVertexOrientedViewEdgeIterator", _wrap_new_ViewVertexOrientedViewEdgeIterator, METH_VARARGS, NULL},
+	 { (char *)"ViewVertexOrientedViewEdgeIterator_isBegin", _wrap_ViewVertexOrientedViewEdgeIterator_isBegin, METH_VARARGS, NULL},
+	 { (char *)"ViewVertexOrientedViewEdgeIterator_isEnd", _wrap_ViewVertexOrientedViewEdgeIterator_isEnd, METH_VARARGS, NULL},
+	 { (char *)"ViewVertexOrientedViewEdgeIterator___ne__", _wrap_ViewVertexOrientedViewEdgeIterator___ne__, METH_VARARGS, NULL},
+	 { (char *)"ViewVertexOrientedViewEdgeIterator___eq__", _wrap_ViewVertexOrientedViewEdgeIterator___eq__, METH_VARARGS, NULL},
+	 { (char *)"ViewVertexOrientedViewEdgeIterator_getObject", _wrap_ViewVertexOrientedViewEdgeIterator_getObject, METH_VARARGS, NULL},
+	 { (char *)"ViewVertexOrientedViewEdgeIterator___deref__", _wrap_ViewVertexOrientedViewEdgeIterator___deref__, METH_VARARGS, NULL},
+	 { (char *)"ViewVertexOrientedViewEdgeIterator_increment", _wrap_ViewVertexOrientedViewEdgeIterator_increment, METH_VARARGS, NULL},
+	 { (char *)"ViewVertexOrientedViewEdgeIterator_swigregister", ViewVertexOrientedViewEdgeIterator_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_ViewEdgeSVertexIterator", _wrap_new_ViewEdgeSVertexIterator, METH_VARARGS, NULL},
+	 { (char *)"delete_ViewEdgeSVertexIterator", _wrap_delete_ViewEdgeSVertexIterator, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_getExactTypeName", _wrap_ViewEdgeSVertexIterator_getExactTypeName, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_getObject", _wrap_ViewEdgeSVertexIterator_getObject, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator___deref__", _wrap_ViewEdgeSVertexIterator___deref__, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_increment", _wrap_ViewEdgeSVertexIterator_increment, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_decrement", _wrap_ViewEdgeSVertexIterator_decrement, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_isBegin", _wrap_ViewEdgeSVertexIterator_isBegin, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_isEnd", _wrap_ViewEdgeSVertexIterator_isEnd, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_t", _wrap_ViewEdgeSVertexIterator_t, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_u", _wrap_ViewEdgeSVertexIterator_u, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator___eq__", _wrap_ViewEdgeSVertexIterator___eq__, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_copy", _wrap_ViewEdgeSVertexIterator_copy, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_getX", _wrap_ViewEdgeSVertexIterator_getX, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_getY", _wrap_ViewEdgeSVertexIterator_getY, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_getZ", _wrap_ViewEdgeSVertexIterator_getZ, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_getPoint3D", _wrap_ViewEdgeSVertexIterator_getPoint3D, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_getProjectedX", _wrap_ViewEdgeSVertexIterator_getProjectedX, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_getProjectedY", _wrap_ViewEdgeSVertexIterator_getProjectedY, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_getProjectedZ", _wrap_ViewEdgeSVertexIterator_getProjectedZ, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_getPoint2D", _wrap_ViewEdgeSVertexIterator_getPoint2D, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_getFEdge", _wrap_ViewEdgeSVertexIterator_getFEdge, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_getId", _wrap_ViewEdgeSVertexIterator_getId, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_getNature", _wrap_ViewEdgeSVertexIterator_getNature, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_castToSVertex", _wrap_ViewEdgeSVertexIterator_castToSVertex, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_castToViewVertex", _wrap_ViewEdgeSVertexIterator_castToViewVertex, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_castToNonTVertex", _wrap_ViewEdgeSVertexIterator_castToNonTVertex, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_castToTVertex", _wrap_ViewEdgeSVertexIterator_castToTVertex, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_userdata_set", _wrap_ViewEdgeSVertexIterator_userdata_set, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_userdata_get", _wrap_ViewEdgeSVertexIterator_userdata_get, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_dupplicate", _wrap_ViewEdgeSVertexIterator_dupplicate, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_point3D", _wrap_ViewEdgeSVertexIterator_point3D, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_point2D", _wrap_ViewEdgeSVertexIterator_point2D, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_normals", _wrap_ViewEdgeSVertexIterator_normals, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_normalsSize", _wrap_ViewEdgeSVertexIterator_normalsSize, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_fedges", _wrap_ViewEdgeSVertexIterator_fedges, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_fedges_begin", _wrap_ViewEdgeSVertexIterator_fedges_begin, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_fedges_end", _wrap_ViewEdgeSVertexIterator_fedges_end, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_shape", _wrap_ViewEdgeSVertexIterator_shape, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_z", _wrap_ViewEdgeSVertexIterator_z, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_viewvertex", _wrap_ViewEdgeSVertexIterator_viewvertex, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_SetPoint3D", _wrap_ViewEdgeSVertexIterator_SetPoint3D, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_SetPoint2D", _wrap_ViewEdgeSVertexIterator_SetPoint2D, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_AddNormal", _wrap_ViewEdgeSVertexIterator_AddNormal, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_setCurvatureInfo", _wrap_ViewEdgeSVertexIterator_setCurvatureInfo, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_getCurvatureInfo", _wrap_ViewEdgeSVertexIterator_getCurvatureInfo, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_setCurvatureFredo", _wrap_ViewEdgeSVertexIterator_setCurvatureFredo, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_setDirectionFredo", _wrap_ViewEdgeSVertexIterator_setDirectionFredo, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_curvatureFredo", _wrap_ViewEdgeSVertexIterator_curvatureFredo, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_directionFredo", _wrap_ViewEdgeSVertexIterator_directionFredo, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_SetId", _wrap_ViewEdgeSVertexIterator_SetId, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_SetFEdges", _wrap_ViewEdgeSVertexIterator_SetFEdges, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_SetShape", _wrap_ViewEdgeSVertexIterator_SetShape, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_SetViewVertex", _wrap_ViewEdgeSVertexIterator_SetViewVertex, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_AddFEdge", _wrap_ViewEdgeSVertexIterator_AddFEdge, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_Replace", _wrap_ViewEdgeSVertexIterator_Replace, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_fedge", _wrap_ViewEdgeSVertexIterator_fedge, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_point2d", _wrap_ViewEdgeSVertexIterator_point2d, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_point3d", _wrap_ViewEdgeSVertexIterator_point3d, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_normal", _wrap_ViewEdgeSVertexIterator_normal, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_shape_id", _wrap_ViewEdgeSVertexIterator_shape_id, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_shape_importance", _wrap_ViewEdgeSVertexIterator_shape_importance, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_qi", _wrap_ViewEdgeSVertexIterator_qi, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_occluders_begin", _wrap_ViewEdgeSVertexIterator_occluders_begin, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_occluders_end", _wrap_ViewEdgeSVertexIterator_occluders_end, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_occluders_empty", _wrap_ViewEdgeSVertexIterator_occluders_empty, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_occluders_size", _wrap_ViewEdgeSVertexIterator_occluders_size, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_occludee", _wrap_ViewEdgeSVertexIterator_occludee, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_occluded_shape", _wrap_ViewEdgeSVertexIterator_occluded_shape, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_occludee_empty", _wrap_ViewEdgeSVertexIterator_occludee_empty, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_z_discontinuity", _wrap_ViewEdgeSVertexIterator_z_discontinuity, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_swigregister", ViewEdgeSVertexIterator_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_ViewEdgeViewEdgeIterator", _wrap_new_ViewEdgeViewEdgeIterator, METH_VARARGS, NULL},
+	 { (char *)"delete_ViewEdgeViewEdgeIterator", _wrap_delete_ViewEdgeViewEdgeIterator, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_getExactTypeName", _wrap_ViewEdgeViewEdgeIterator_getExactTypeName, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_getCurrentEdge", _wrap_ViewEdgeViewEdgeIterator_getCurrentEdge, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_setCurrentEdge", _wrap_ViewEdgeViewEdgeIterator_setCurrentEdge, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_getBegin", _wrap_ViewEdgeViewEdgeIterator_getBegin, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_setBegin", _wrap_ViewEdgeViewEdgeIterator_setBegin, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_getOrientation", _wrap_ViewEdgeViewEdgeIterator_getOrientation, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_setOrientation", _wrap_ViewEdgeViewEdgeIterator_setOrientation, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_changeOrientation", _wrap_ViewEdgeViewEdgeIterator_changeOrientation, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_getObject", _wrap_ViewEdgeViewEdgeIterator_getObject, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator___deref__", _wrap_ViewEdgeViewEdgeIterator___deref__, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_increment", _wrap_ViewEdgeViewEdgeIterator_increment, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_decrement", _wrap_ViewEdgeViewEdgeIterator_decrement, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_isBegin", _wrap_ViewEdgeViewEdgeIterator_isBegin, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_isEnd", _wrap_ViewEdgeViewEdgeIterator_isEnd, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator___eq__", _wrap_ViewEdgeViewEdgeIterator___eq__, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator___ne__", _wrap_ViewEdgeViewEdgeIterator___ne__, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_getId", _wrap_ViewEdgeViewEdgeIterator_getId, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_getNature", _wrap_ViewEdgeViewEdgeIterator_getNature, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_userdata_set", _wrap_ViewEdgeViewEdgeIterator_userdata_set, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_userdata_get", _wrap_ViewEdgeViewEdgeIterator_userdata_get, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_A", _wrap_ViewEdgeViewEdgeIterator_A, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_B", _wrap_ViewEdgeViewEdgeIterator_B, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_fedgeA", _wrap_ViewEdgeViewEdgeIterator_fedgeA, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_fedgeB", _wrap_ViewEdgeViewEdgeIterator_fedgeB, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_viewShape", _wrap_ViewEdgeViewEdgeIterator_viewShape, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_aShape", _wrap_ViewEdgeViewEdgeIterator_aShape, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_isClosed", _wrap_ViewEdgeViewEdgeIterator_isClosed, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_getChainingTimeStamp", _wrap_ViewEdgeViewEdgeIterator_getChainingTimeStamp, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_bShape", _wrap_ViewEdgeViewEdgeIterator_bShape, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_occluders", _wrap_ViewEdgeViewEdgeIterator_occluders, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_splittingId", _wrap_ViewEdgeViewEdgeIterator_splittingId, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_SetA", _wrap_ViewEdgeViewEdgeIterator_SetA, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_SetB", _wrap_ViewEdgeViewEdgeIterator_SetB, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_SetNature", _wrap_ViewEdgeViewEdgeIterator_SetNature, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_SetFEdgeA", _wrap_ViewEdgeViewEdgeIterator_SetFEdgeA, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_SetFEdgeB", _wrap_ViewEdgeViewEdgeIterator_SetFEdgeB, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_SetShape", _wrap_ViewEdgeViewEdgeIterator_SetShape, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_SetId", _wrap_ViewEdgeViewEdgeIterator_SetId, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_UpdateFEdges", _wrap_ViewEdgeViewEdgeIterator_UpdateFEdges, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_SetaShape", _wrap_ViewEdgeViewEdgeIterator_SetaShape, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_SetQI", _wrap_ViewEdgeViewEdgeIterator_SetQI, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_setChainingTimeStamp", _wrap_ViewEdgeViewEdgeIterator_setChainingTimeStamp, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_AddOccluder", _wrap_ViewEdgeViewEdgeIterator_AddOccluder, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_setSplittingId", _wrap_ViewEdgeViewEdgeIterator_setSplittingId, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_intersect_2d_area", _wrap_ViewEdgeViewEdgeIterator_intersect_2d_area, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_include_in_2d_area", _wrap_ViewEdgeViewEdgeIterator_include_in_2d_area, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_getLength2D", _wrap_ViewEdgeViewEdgeIterator_getLength2D, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_qi", _wrap_ViewEdgeViewEdgeIterator_qi, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_occluders_begin", _wrap_ViewEdgeViewEdgeIterator_occluders_begin, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_occluders_end", _wrap_ViewEdgeViewEdgeIterator_occluders_end, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_occluders_size", _wrap_ViewEdgeViewEdgeIterator_occluders_size, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_occluders_empty", _wrap_ViewEdgeViewEdgeIterator_occluders_empty, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_occludee", _wrap_ViewEdgeViewEdgeIterator_occludee, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_occluded_shape", _wrap_ViewEdgeViewEdgeIterator_occluded_shape, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_occludee_empty", _wrap_ViewEdgeViewEdgeIterator_occludee_empty, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_shape_id", _wrap_ViewEdgeViewEdgeIterator_shape_id, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_shape", _wrap_ViewEdgeViewEdgeIterator_shape, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_shape_importance", _wrap_ViewEdgeViewEdgeIterator_shape_importance, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_verticesBegin", _wrap_ViewEdgeViewEdgeIterator_verticesBegin, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_verticesEnd", _wrap_ViewEdgeViewEdgeIterator_verticesEnd, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_pointsBegin", _wrap_ViewEdgeViewEdgeIterator_pointsBegin, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_pointsEnd", _wrap_ViewEdgeViewEdgeIterator_pointsEnd, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_getTimeStamp", _wrap_ViewEdgeViewEdgeIterator_getTimeStamp, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_setTimeStamp", _wrap_ViewEdgeViewEdgeIterator_setTimeStamp, METH_VARARGS, NULL},
+	 { (char *)"disown_ViewEdgeViewEdgeIterator", _wrap_disown_ViewEdgeViewEdgeIterator, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_swigregister", ViewEdgeViewEdgeIterator_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_UnaryFunction0DVoid", _wrap_new_UnaryFunction0DVoid, METH_VARARGS, NULL},
+	 { (char *)"delete_UnaryFunction0DVoid", _wrap_delete_UnaryFunction0DVoid, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction0DVoid_getName", _wrap_UnaryFunction0DVoid_getName, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction0DVoid___call__", _wrap_UnaryFunction0DVoid___call__, METH_VARARGS, NULL},
+	 { (char *)"disown_UnaryFunction0DVoid", _wrap_disown_UnaryFunction0DVoid, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction0DVoid_swigregister", UnaryFunction0DVoid_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_UnaryFunction0DUnsigned", _wrap_new_UnaryFunction0DUnsigned, METH_VARARGS, NULL},
+	 { (char *)"delete_UnaryFunction0DUnsigned", _wrap_delete_UnaryFunction0DUnsigned, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction0DUnsigned_getName", _wrap_UnaryFunction0DUnsigned_getName, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction0DUnsigned___call__", _wrap_UnaryFunction0DUnsigned___call__, METH_VARARGS, NULL},
+	 { (char *)"disown_UnaryFunction0DUnsigned", _wrap_disown_UnaryFunction0DUnsigned, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction0DUnsigned_swigregister", UnaryFunction0DUnsigned_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_UnaryFunction0DFloat", _wrap_new_UnaryFunction0DFloat, METH_VARARGS, NULL},
+	 { (char *)"delete_UnaryFunction0DFloat", _wrap_delete_UnaryFunction0DFloat, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction0DFloat_getName", _wrap_UnaryFunction0DFloat_getName, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction0DFloat___call__", _wrap_UnaryFunction0DFloat___call__, METH_VARARGS, NULL},
+	 { (char *)"disown_UnaryFunction0DFloat", _wrap_disown_UnaryFunction0DFloat, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction0DFloat_swigregister", UnaryFunction0DFloat_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_UnaryFunction0DDouble", _wrap_new_UnaryFunction0DDouble, METH_VARARGS, NULL},
+	 { (char *)"delete_UnaryFunction0DDouble", _wrap_delete_UnaryFunction0DDouble, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction0DDouble_getName", _wrap_UnaryFunction0DDouble_getName, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction0DDouble___call__", _wrap_UnaryFunction0DDouble___call__, METH_VARARGS, NULL},
+	 { (char *)"disown_UnaryFunction0DDouble", _wrap_disown_UnaryFunction0DDouble, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction0DDouble_swigregister", UnaryFunction0DDouble_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_UnaryFunction0DVec2f", _wrap_new_UnaryFunction0DVec2f, METH_VARARGS, NULL},
+	 { (char *)"delete_UnaryFunction0DVec2f", _wrap_delete_UnaryFunction0DVec2f, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction0DVec2f_getName", _wrap_UnaryFunction0DVec2f_getName, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction0DVec2f___call__", _wrap_UnaryFunction0DVec2f___call__, METH_VARARGS, NULL},
+	 { (char *)"disown_UnaryFunction0DVec2f", _wrap_disown_UnaryFunction0DVec2f, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction0DVec2f_swigregister", UnaryFunction0DVec2f_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_UnaryFunction0DVec3f", _wrap_new_UnaryFunction0DVec3f, METH_VARARGS, NULL},
+	 { (char *)"delete_UnaryFunction0DVec3f", _wrap_delete_UnaryFunction0DVec3f, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction0DVec3f_getName", _wrap_UnaryFunction0DVec3f_getName, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction0DVec3f___call__", _wrap_UnaryFunction0DVec3f___call__, METH_VARARGS, NULL},
+	 { (char *)"disown_UnaryFunction0DVec3f", _wrap_disown_UnaryFunction0DVec3f, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction0DVec3f_swigregister", UnaryFunction0DVec3f_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_UnaryFunction0DId", _wrap_new_UnaryFunction0DId, METH_VARARGS, NULL},
+	 { (char *)"delete_UnaryFunction0DId", _wrap_delete_UnaryFunction0DId, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction0DId_getName", _wrap_UnaryFunction0DId_getName, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction0DId___call__", _wrap_UnaryFunction0DId___call__, METH_VARARGS, NULL},
+	 { (char *)"disown_UnaryFunction0DId", _wrap_disown_UnaryFunction0DId, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction0DId_swigregister", UnaryFunction0DId_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_UnaryFunction0DViewShape", _wrap_new_UnaryFunction0DViewShape, METH_VARARGS, NULL},
+	 { (char *)"delete_UnaryFunction0DViewShape", _wrap_delete_UnaryFunction0DViewShape, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction0DViewShape_getName", _wrap_UnaryFunction0DViewShape_getName, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction0DViewShape___call__", _wrap_UnaryFunction0DViewShape___call__, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction0DViewShape_swigregister", UnaryFunction0DViewShape_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_UnaryFunction0DVectorViewShape", _wrap_new_UnaryFunction0DVectorViewShape, METH_VARARGS, NULL},
+	 { (char *)"delete_UnaryFunction0DVectorViewShape", _wrap_delete_UnaryFunction0DVectorViewShape, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction0DVectorViewShape_getName", _wrap_UnaryFunction0DVectorViewShape_getName, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction0DVectorViewShape___call__", _wrap_UnaryFunction0DVectorViewShape___call__, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction0DVectorViewShape_swigregister", UnaryFunction0DVectorViewShape_swigregister, METH_VARARGS, NULL},
+	 { (char *)"GetXF0D_getName", _wrap_GetXF0D_getName, METH_VARARGS, NULL},
+	 { (char *)"GetXF0D___call__", _wrap_GetXF0D___call__, METH_VARARGS, NULL},
+	 { (char *)"new_GetXF0D", _wrap_new_GetXF0D, METH_VARARGS, NULL},
+	 { (char *)"delete_GetXF0D", _wrap_delete_GetXF0D, METH_VARARGS, NULL},
+	 { (char *)"GetXF0D_swigregister", GetXF0D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"GetYF0D_getName", _wrap_GetYF0D_getName, METH_VARARGS, NULL},
+	 { (char *)"GetYF0D___call__", _wrap_GetYF0D___call__, METH_VARARGS, NULL},
+	 { (char *)"new_GetYF0D", _wrap_new_GetYF0D, METH_VARARGS, NULL},
+	 { (char *)"delete_GetYF0D", _wrap_delete_GetYF0D, METH_VARARGS, NULL},
+	 { (char *)"GetYF0D_swigregister", GetYF0D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"GetZF0D_getName", _wrap_GetZF0D_getName, METH_VARARGS, NULL},
+	 { (char *)"GetZF0D___call__", _wrap_GetZF0D___call__, METH_VARARGS, NULL},
+	 { (char *)"new_GetZF0D", _wrap_new_GetZF0D, METH_VARARGS, NULL},
+	 { (char *)"delete_GetZF0D", _wrap_delete_GetZF0D, METH_VARARGS, NULL},
+	 { (char *)"GetZF0D_swigregister", GetZF0D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"GetProjectedXF0D_getName", _wrap_GetProjectedXF0D_getName, METH_VARARGS, NULL},
+	 { (char *)"GetProjectedXF0D___call__", _wrap_GetProjectedXF0D___call__, METH_VARARGS, NULL},
+	 { (char *)"new_GetProjectedXF0D", _wrap_new_GetProjectedXF0D, METH_VARARGS, NULL},
+	 { (char *)"delete_GetProjectedXF0D", _wrap_delete_GetProjectedXF0D, METH_VARARGS, NULL},
+	 { (char *)"GetProjectedXF0D_swigregister", GetProjectedXF0D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"GetProjectedYF0D_getName", _wrap_GetProjectedYF0D_getName, METH_VARARGS, NULL},
+	 { (char *)"GetProjectedYF0D___call__", _wrap_GetProjectedYF0D___call__, METH_VARARGS, NULL},
+	 { (char *)"new_GetProjectedYF0D", _wrap_new_GetProjectedYF0D, METH_VARARGS, NULL},
+	 { (char *)"delete_GetProjectedYF0D", _wrap_delete_GetProjectedYF0D, METH_VARARGS, NULL},
+	 { (char *)"GetProjectedYF0D_swigregister", GetProjectedYF0D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"GetProjectedZF0D_getName", _wrap_GetProjectedZF0D_getName, METH_VARARGS, NULL},
+	 { (char *)"GetProjectedZF0D___call__", _wrap_GetProjectedZF0D___call__, METH_VARARGS, NULL},
+	 { (char *)"new_GetProjectedZF0D", _wrap_new_GetProjectedZF0D, METH_VARARGS, NULL},
+	 { (char *)"delete_GetProjectedZF0D", _wrap_delete_GetProjectedZF0D, METH_VARARGS, NULL},
+	 { (char *)"GetProjectedZF0D_swigregister", GetProjectedZF0D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"GetCurvilinearAbscissaF0D_getName", _wrap_GetCurvilinearAbscissaF0D_getName, METH_VARARGS, NULL},
+	 { (char *)"GetCurvilinearAbscissaF0D___call__", _wrap_GetCurvilinearAbscissaF0D___call__, METH_VARARGS, NULL},
+	 { (char *)"new_GetCurvilinearAbscissaF0D", _wrap_new_GetCurvilinearAbscissaF0D, METH_VARARGS, NULL},
+	 { (char *)"delete_GetCurvilinearAbscissaF0D", _wrap_delete_GetCurvilinearAbscissaF0D, METH_VARARGS, NULL},
+	 { (char *)"GetCurvilinearAbscissaF0D_swigregister", GetCurvilinearAbscissaF0D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"GetParameterF0D_getName", _wrap_GetParameterF0D_getName, METH_VARARGS, NULL},
+	 { (char *)"GetParameterF0D___call__", _wrap_GetParameterF0D___call__, METH_VARARGS, NULL},
+	 { (char *)"new_GetParameterF0D", _wrap_new_GetParameterF0D, METH_VARARGS, NULL},
+	 { (char *)"delete_GetParameterF0D", _wrap_delete_GetParameterF0D, METH_VARARGS, NULL},
+	 { (char *)"GetParameterF0D_swigregister", GetParameterF0D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"VertexOrientation2DF0D_getName", _wrap_VertexOrientation2DF0D_getName, METH_VARARGS, NULL},
+	 { (char *)"VertexOrientation2DF0D___call__", _wrap_VertexOrientation2DF0D___call__, METH_VARARGS, NULL},
+	 { (char *)"new_VertexOrientation2DF0D", _wrap_new_VertexOrientation2DF0D, METH_VARARGS, NULL},
+	 { (char *)"delete_VertexOrientation2DF0D", _wrap_delete_VertexOrientation2DF0D, METH_VARARGS, NULL},
+	 { (char *)"VertexOrientation2DF0D_swigregister", VertexOrientation2DF0D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"VertexOrientation3DF0D_getName", _wrap_VertexOrientation3DF0D_getName, METH_VARARGS, NULL},
+	 { (char *)"VertexOrientation3DF0D___call__", _wrap_VertexOrientation3DF0D___call__, METH_VARARGS, NULL},
+	 { (char *)"new_VertexOrientation3DF0D", _wrap_new_VertexOrientation3DF0D, METH_VARARGS, NULL},
+	 { (char *)"delete_VertexOrientation3DF0D", _wrap_delete_VertexOrientation3DF0D, METH_VARARGS, NULL},
+	 { (char *)"VertexOrientation3DF0D_swigregister", VertexOrientation3DF0D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"Curvature2DAngleF0D_getName", _wrap_Curvature2DAngleF0D_getName, METH_VARARGS, NULL},
+	 { (char *)"Curvature2DAngleF0D___call__", _wrap_Curvature2DAngleF0D___call__, METH_VARARGS, NULL},
+	 { (char *)"new_Curvature2DAngleF0D", _wrap_new_Curvature2DAngleF0D, METH_VARARGS, NULL},
+	 { (char *)"delete_Curvature2DAngleF0D", _wrap_delete_Curvature2DAngleF0D, METH_VARARGS, NULL},
+	 { (char *)"Curvature2DAngleF0D_swigregister", Curvature2DAngleF0D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"ZDiscontinuityF0D_getName", _wrap_ZDiscontinuityF0D_getName, METH_VARARGS, NULL},
+	 { (char *)"ZDiscontinuityF0D___call__", _wrap_ZDiscontinuityF0D___call__, METH_VARARGS, NULL},
+	 { (char *)"new_ZDiscontinuityF0D", _wrap_new_ZDiscontinuityF0D, METH_VARARGS, NULL},
+	 { (char *)"delete_ZDiscontinuityF0D", _wrap_delete_ZDiscontinuityF0D, METH_VARARGS, NULL},
+	 { (char *)"ZDiscontinuityF0D_swigregister", ZDiscontinuityF0D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"Normal2DF0D_getName", _wrap_Normal2DF0D_getName, METH_VARARGS, NULL},
+	 { (char *)"Normal2DF0D___call__", _wrap_Normal2DF0D___call__, METH_VARARGS, NULL},
+	 { (char *)"new_Normal2DF0D", _wrap_new_Normal2DF0D, METH_VARARGS, NULL},
+	 { (char *)"delete_Normal2DF0D", _wrap_delete_Normal2DF0D, METH_VARARGS, NULL},
+	 { (char *)"Normal2DF0D_swigregister", Normal2DF0D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"MaterialF0D_getName", _wrap_MaterialF0D_getName, METH_VARARGS, NULL},
+	 { (char *)"MaterialF0D___call__", _wrap_MaterialF0D___call__, METH_VARARGS, NULL},
+	 { (char *)"new_MaterialF0D", _wrap_new_MaterialF0D, METH_VARARGS, NULL},
+	 { (char *)"delete_MaterialF0D", _wrap_delete_MaterialF0D, METH_VARARGS, NULL},
+	 { (char *)"MaterialF0D_swigregister", MaterialF0D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"ShapeIdF0D_getName", _wrap_ShapeIdF0D_getName, METH_VARARGS, NULL},
+	 { (char *)"ShapeIdF0D___call__", _wrap_ShapeIdF0D___call__, METH_VARARGS, NULL},
+	 { (char *)"new_ShapeIdF0D", _wrap_new_ShapeIdF0D, METH_VARARGS, NULL},
+	 { (char *)"delete_ShapeIdF0D", _wrap_delete_ShapeIdF0D, METH_VARARGS, NULL},
+	 { (char *)"ShapeIdF0D_swigregister", ShapeIdF0D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"QuantitativeInvisibilityF0D_getName", _wrap_QuantitativeInvisibilityF0D_getName, METH_VARARGS, NULL},
+	 { (char *)"QuantitativeInvisibilityF0D___call__", _wrap_QuantitativeInvisibilityF0D___call__, METH_VARARGS, NULL},
+	 { (char *)"new_QuantitativeInvisibilityF0D", _wrap_new_QuantitativeInvisibilityF0D, METH_VARARGS, NULL},
+	 { (char *)"delete_QuantitativeInvisibilityF0D", _wrap_delete_QuantitativeInvisibilityF0D, METH_VARARGS, NULL},
+	 { (char *)"QuantitativeInvisibilityF0D_swigregister", QuantitativeInvisibilityF0D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"CurveNatureF0D_getName", _wrap_CurveNatureF0D_getName, METH_VARARGS, NULL},
+	 { (char *)"CurveNatureF0D___call__", _wrap_CurveNatureF0D___call__, METH_VARARGS, NULL},
+	 { (char *)"new_CurveNatureF0D", _wrap_new_CurveNatureF0D, METH_VARARGS, NULL},
+	 { (char *)"delete_CurveNatureF0D", _wrap_delete_CurveNatureF0D, METH_VARARGS, NULL},
+	 { (char *)"CurveNatureF0D_swigregister", CurveNatureF0D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"GetShapeF0D_getName", _wrap_GetShapeF0D_getName, METH_VARARGS, NULL},
+	 { (char *)"GetShapeF0D___call__", _wrap_GetShapeF0D___call__, METH_VARARGS, NULL},
+	 { (char *)"new_GetShapeF0D", _wrap_new_GetShapeF0D, METH_VARARGS, NULL},
+	 { (char *)"delete_GetShapeF0D", _wrap_delete_GetShapeF0D, METH_VARARGS, NULL},
+	 { (char *)"GetShapeF0D_swigregister", GetShapeF0D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"GetOccludersF0D_getName", _wrap_GetOccludersF0D_getName, METH_VARARGS, NULL},
+	 { (char *)"GetOccludersF0D___call__", _wrap_GetOccludersF0D___call__, METH_VARARGS, NULL},
+	 { (char *)"new_GetOccludersF0D", _wrap_new_GetOccludersF0D, METH_VARARGS, NULL},
+	 { (char *)"delete_GetOccludersF0D", _wrap_delete_GetOccludersF0D, METH_VARARGS, NULL},
+	 { (char *)"GetOccludersF0D_swigregister", GetOccludersF0D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"GetOccludeeF0D_getName", _wrap_GetOccludeeF0D_getName, METH_VARARGS, NULL},
+	 { (char *)"GetOccludeeF0D___call__", _wrap_GetOccludeeF0D___call__, METH_VARARGS, NULL},
+	 { (char *)"new_GetOccludeeF0D", _wrap_new_GetOccludeeF0D, METH_VARARGS, NULL},
+	 { (char *)"delete_GetOccludeeF0D", _wrap_delete_GetOccludeeF0D, METH_VARARGS, NULL},
+	 { (char *)"GetOccludeeF0D_swigregister", GetOccludeeF0D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"getFEdge", _wrap_getFEdge, METH_VARARGS, NULL},
+	 { (char *)"new_UnaryFunction1DVoid", _wrap_new_UnaryFunction1DVoid, METH_VARARGS, NULL},
+	 { (char *)"delete_UnaryFunction1DVoid", _wrap_delete_UnaryFunction1DVoid, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction1DVoid_getName", _wrap_UnaryFunction1DVoid_getName, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction1DVoid___call__", _wrap_UnaryFunction1DVoid___call__, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction1DVoid_setIntegrationType", _wrap_UnaryFunction1DVoid_setIntegrationType, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction1DVoid_getIntegrationType", _wrap_UnaryFunction1DVoid_getIntegrationType, METH_VARARGS, NULL},
+	 { (char *)"disown_UnaryFunction1DVoid", _wrap_disown_UnaryFunction1DVoid, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction1DVoid_swigregister", UnaryFunction1DVoid_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_UnaryFunction1DUnsigned", _wrap_new_UnaryFunction1DUnsigned, METH_VARARGS, NULL},
+	 { (char *)"delete_UnaryFunction1DUnsigned", _wrap_delete_UnaryFunction1DUnsigned, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction1DUnsigned_getName", _wrap_UnaryFunction1DUnsigned_getName, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction1DUnsigned___call__", _wrap_UnaryFunction1DUnsigned___call__, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction1DUnsigned_setIntegrationType", _wrap_UnaryFunction1DUnsigned_setIntegrationType, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction1DUnsigned_getIntegrationType", _wrap_UnaryFunction1DUnsigned_getIntegrationType, METH_VARARGS, NULL},
+	 { (char *)"disown_UnaryFunction1DUnsigned", _wrap_disown_UnaryFunction1DUnsigned, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction1DUnsigned_swigregister", UnaryFunction1DUnsigned_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_UnaryFunction1DFloat", _wrap_new_UnaryFunction1DFloat, METH_VARARGS, NULL},
+	 { (char *)"delete_UnaryFunction1DFloat", _wrap_delete_UnaryFunction1DFloat, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction1DFloat_getName", _wrap_UnaryFunction1DFloat_getName, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction1DFloat___call__", _wrap_UnaryFunction1DFloat___call__, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction1DFloat_setIntegrationType", _wrap_UnaryFunction1DFloat_setIntegrationType, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction1DFloat_getIntegrationType", _wrap_UnaryFunction1DFloat_getIntegrationType, METH_VARARGS, NULL},
+	 { (char *)"disown_UnaryFunction1DFloat", _wrap_disown_UnaryFunction1DFloat, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction1DFloat_swigregister", UnaryFunction1DFloat_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_UnaryFunction1DDouble", _wrap_new_UnaryFunction1DDouble, METH_VARARGS, NULL},
+	 { (char *)"delete_UnaryFunction1DDouble", _wrap_delete_UnaryFunction1DDouble, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction1DDouble_getName", _wrap_UnaryFunction1DDouble_getName, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction1DDouble___call__", _wrap_UnaryFunction1DDouble___call__, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction1DDouble_setIntegrationType", _wrap_UnaryFunction1DDouble_setIntegrationType, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction1DDouble_getIntegrationType", _wrap_UnaryFunction1DDouble_getIntegrationType, METH_VARARGS, NULL},
+	 { (char *)"disown_UnaryFunction1DDouble", _wrap_disown_UnaryFunction1DDouble, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction1DDouble_swigregister", UnaryFunction1DDouble_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_UnaryFunction1DVec2f", _wrap_new_UnaryFunction1DVec2f, METH_VARARGS, NULL},
+	 { (char *)"delete_UnaryFunction1DVec2f", _wrap_delete_UnaryFunction1DVec2f, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction1DVec2f_getName", _wrap_UnaryFunction1DVec2f_getName, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction1DVec2f___call__", _wrap_UnaryFunction1DVec2f___call__, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction1DVec2f_setIntegrationType", _wrap_UnaryFunction1DVec2f_setIntegrationType, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction1DVec2f_getIntegrationType", _wrap_UnaryFunction1DVec2f_getIntegrationType, METH_VARARGS, NULL},
+	 { (char *)"disown_UnaryFunction1DVec2f", _wrap_disown_UnaryFunction1DVec2f, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction1DVec2f_swigregister", UnaryFunction1DVec2f_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_UnaryFunction1DVec3f", _wrap_new_UnaryFunction1DVec3f, METH_VARARGS, NULL},
+	 { (char *)"delete_UnaryFunction1DVec3f", _wrap_delete_UnaryFunction1DVec3f, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction1DVec3f_getName", _wrap_UnaryFunction1DVec3f_getName, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction1DVec3f___call__", _wrap_UnaryFunction1DVec3f___call__, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction1DVec3f_setIntegrationType", _wrap_UnaryFunction1DVec3f_setIntegrationType, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction1DVec3f_getIntegrationType", _wrap_UnaryFunction1DVec3f_getIntegrationType, METH_VARARGS, NULL},
+	 { (char *)"disown_UnaryFunction1DVec3f", _wrap_disown_UnaryFunction1DVec3f, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction1DVec3f_swigregister", UnaryFunction1DVec3f_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_UnaryFunction1DVectorViewShape", _wrap_new_UnaryFunction1DVectorViewShape, METH_VARARGS, NULL},
+	 { (char *)"delete_UnaryFunction1DVectorViewShape", _wrap_delete_UnaryFunction1DVectorViewShape, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction1DVectorViewShape_getName", _wrap_UnaryFunction1DVectorViewShape_getName, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction1DVectorViewShape___call__", _wrap_UnaryFunction1DVectorViewShape___call__, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction1DVectorViewShape_setIntegrationType", _wrap_UnaryFunction1DVectorViewShape_setIntegrationType, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction1DVectorViewShape_getIntegrationType", _wrap_UnaryFunction1DVectorViewShape_getIntegrationType, METH_VARARGS, NULL},
+	 { (char *)"UnaryFunction1DVectorViewShape_swigregister", UnaryFunction1DVectorViewShape_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_GetXF1D", _wrap_new_GetXF1D, METH_VARARGS, NULL},
+	 { (char *)"GetXF1D_getName", _wrap_GetXF1D_getName, METH_VARARGS, NULL},
+	 { (char *)"GetXF1D___call__", _wrap_GetXF1D___call__, METH_VARARGS, NULL},
+	 { (char *)"delete_GetXF1D", _wrap_delete_GetXF1D, METH_VARARGS, NULL},
+	 { (char *)"GetXF1D_swigregister", GetXF1D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_GetYF1D", _wrap_new_GetYF1D, METH_VARARGS, NULL},
+	 { (char *)"GetYF1D_getName", _wrap_GetYF1D_getName, METH_VARARGS, NULL},
+	 { (char *)"GetYF1D___call__", _wrap_GetYF1D___call__, METH_VARARGS, NULL},
+	 { (char *)"delete_GetYF1D", _wrap_delete_GetYF1D, METH_VARARGS, NULL},
+	 { (char *)"GetYF1D_swigregister", GetYF1D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_GetZF1D", _wrap_new_GetZF1D, METH_VARARGS, NULL},
+	 { (char *)"GetZF1D_getName", _wrap_GetZF1D_getName, METH_VARARGS, NULL},
+	 { (char *)"GetZF1D___call__", _wrap_GetZF1D___call__, METH_VARARGS, NULL},
+	 { (char *)"delete_GetZF1D", _wrap_delete_GetZF1D, METH_VARARGS, NULL},
+	 { (char *)"GetZF1D_swigregister", GetZF1D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_GetProjectedXF1D", _wrap_new_GetProjectedXF1D, METH_VARARGS, NULL},
+	 { (char *)"GetProjectedXF1D_getName", _wrap_GetProjectedXF1D_getName, METH_VARARGS, NULL},
+	 { (char *)"GetProjectedXF1D___call__", _wrap_GetProjectedXF1D___call__, METH_VARARGS, NULL},
+	 { (char *)"delete_GetProjectedXF1D", _wrap_delete_GetProjectedXF1D, METH_VARARGS, NULL},
+	 { (char *)"GetProjectedXF1D_swigregister", GetProjectedXF1D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_GetProjectedYF1D", _wrap_new_GetProjectedYF1D, METH_VARARGS, NULL},
+	 { (char *)"GetProjectedYF1D_getName", _wrap_GetProjectedYF1D_getName, METH_VARARGS, NULL},
+	 { (char *)"GetProjectedYF1D___call__", _wrap_GetProjectedYF1D___call__, METH_VARARGS, NULL},
+	 { (char *)"delete_GetProjectedYF1D", _wrap_delete_GetProjectedYF1D, METH_VARARGS, NULL},
+	 { (char *)"GetProjectedYF1D_swigregister", GetProjectedYF1D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_GetProjectedZF1D", _wrap_new_GetProjectedZF1D, METH_VARARGS, NULL},
+	 { (char *)"GetProjectedZF1D_getName", _wrap_GetProjectedZF1D_getName, METH_VARARGS, NULL},
+	 { (char *)"GetProjectedZF1D___call__", _wrap_GetProjectedZF1D___call__, METH_VARARGS, NULL},
+	 { (char *)"delete_GetProjectedZF1D", _wrap_delete_GetProjectedZF1D, METH_VARARGS, NULL},
+	 { (char *)"GetProjectedZF1D_swigregister", GetProjectedZF1D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_Orientation2DF1D", _wrap_new_Orientation2DF1D, METH_VARARGS, NULL},
+	 { (char *)"Orientation2DF1D_getName", _wrap_Orientation2DF1D_getName, METH_VARARGS, NULL},
+	 { (char *)"Orientation2DF1D___call__", _wrap_Orientation2DF1D___call__, METH_VARARGS, NULL},
+	 { (char *)"delete_Orientation2DF1D", _wrap_delete_Orientation2DF1D, METH_VARARGS, NULL},
+	 { (char *)"Orientation2DF1D_swigregister", Orientation2DF1D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_Orientation3DF1D", _wrap_new_Orientation3DF1D, METH_VARARGS, NULL},
+	 { (char *)"Orientation3DF1D_getName", _wrap_Orientation3DF1D_getName, METH_VARARGS, NULL},
+	 { (char *)"Orientation3DF1D___call__", _wrap_Orientation3DF1D___call__, METH_VARARGS, NULL},
+	 { (char *)"delete_Orientation3DF1D", _wrap_delete_Orientation3DF1D, METH_VARARGS, NULL},
+	 { (char *)"Orientation3DF1D_swigregister", Orientation3DF1D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_ZDiscontinuityF1D", _wrap_new_ZDiscontinuityF1D, METH_VARARGS, NULL},
+	 { (char *)"ZDiscontinuityF1D_getName", _wrap_ZDiscontinuityF1D_getName, METH_VARARGS, NULL},
+	 { (char *)"ZDiscontinuityF1D___call__", _wrap_ZDiscontinuityF1D___call__, METH_VARARGS, NULL},
+	 { (char *)"delete_ZDiscontinuityF1D", _wrap_delete_ZDiscontinuityF1D, METH_VARARGS, NULL},
+	 { (char *)"ZDiscontinuityF1D_swigregister", ZDiscontinuityF1D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_QuantitativeInvisibilityF1D", _wrap_new_QuantitativeInvisibilityF1D, METH_VARARGS, NULL},
+	 { (char *)"QuantitativeInvisibilityF1D_getName", _wrap_QuantitativeInvisibilityF1D_getName, METH_VARARGS, NULL},
+	 { (char *)"QuantitativeInvisibilityF1D___call__", _wrap_QuantitativeInvisibilityF1D___call__, METH_VARARGS, NULL},
+	 { (char *)"delete_QuantitativeInvisibilityF1D", _wrap_delete_QuantitativeInvisibilityF1D, METH_VARARGS, NULL},
+	 { (char *)"QuantitativeInvisibilityF1D_swigregister", QuantitativeInvisibilityF1D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_CurveNatureF1D", _wrap_new_CurveNatureF1D, METH_VARARGS, NULL},
+	 { (char *)"CurveNatureF1D_getName", _wrap_CurveNatureF1D_getName, METH_VARARGS, NULL},
+	 { (char *)"CurveNatureF1D___call__", _wrap_CurveNatureF1D___call__, METH_VARARGS, NULL},
+	 { (char *)"delete_CurveNatureF1D", _wrap_delete_CurveNatureF1D, METH_VARARGS, NULL},
+	 { (char *)"CurveNatureF1D_swigregister", CurveNatureF1D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"TimeStampF1D_getName", _wrap_TimeStampF1D_getName, METH_VARARGS, NULL},
+	 { (char *)"TimeStampF1D___call__", _wrap_TimeStampF1D___call__, METH_VARARGS, NULL},
+	 { (char *)"new_TimeStampF1D", _wrap_new_TimeStampF1D, METH_VARARGS, NULL},
+	 { (char *)"delete_TimeStampF1D", _wrap_delete_TimeStampF1D, METH_VARARGS, NULL},
+	 { (char *)"TimeStampF1D_swigregister", TimeStampF1D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"IncrementChainingTimeStampF1D_getName", _wrap_IncrementChainingTimeStampF1D_getName, METH_VARARGS, NULL},
+	 { (char *)"IncrementChainingTimeStampF1D___call__", _wrap_IncrementChainingTimeStampF1D___call__, METH_VARARGS, NULL},
+	 { (char *)"new_IncrementChainingTimeStampF1D", _wrap_new_IncrementChainingTimeStampF1D, METH_VARARGS, NULL},
+	 { (char *)"delete_IncrementChainingTimeStampF1D", _wrap_delete_IncrementChainingTimeStampF1D, METH_VARARGS, NULL},
+	 { (char *)"IncrementChainingTimeStampF1D_swigregister", IncrementChainingTimeStampF1D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"ChainingTimeStampF1D_getName", _wrap_ChainingTimeStampF1D_getName, METH_VARARGS, NULL},
+	 { (char *)"ChainingTimeStampF1D___call__", _wrap_ChainingTimeStampF1D___call__, METH_VARARGS, NULL},
+	 { (char *)"new_ChainingTimeStampF1D", _wrap_new_ChainingTimeStampF1D, METH_VARARGS, NULL},
+	 { (char *)"delete_ChainingTimeStampF1D", _wrap_delete_ChainingTimeStampF1D, METH_VARARGS, NULL},
+	 { (char *)"ChainingTimeStampF1D_swigregister", ChainingTimeStampF1D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_Curvature2DAngleF1D", _wrap_new_Curvature2DAngleF1D, METH_VARARGS, NULL},
+	 { (char *)"Curvature2DAngleF1D_getName", _wrap_Curvature2DAngleF1D_getName, METH_VARARGS, NULL},
+	 { (char *)"Curvature2DAngleF1D___call__", _wrap_Curvature2DAngleF1D___call__, METH_VARARGS, NULL},
+	 { (char *)"delete_Curvature2DAngleF1D", _wrap_delete_Curvature2DAngleF1D, METH_VARARGS, NULL},
+	 { (char *)"Curvature2DAngleF1D_swigregister", Curvature2DAngleF1D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_Normal2DF1D", _wrap_new_Normal2DF1D, METH_VARARGS, NULL},
+	 { (char *)"Normal2DF1D_getName", _wrap_Normal2DF1D_getName, METH_VARARGS, NULL},
+	 { (char *)"Normal2DF1D___call__", _wrap_Normal2DF1D___call__, METH_VARARGS, NULL},
+	 { (char *)"delete_Normal2DF1D", _wrap_delete_Normal2DF1D, METH_VARARGS, NULL},
+	 { (char *)"Normal2DF1D_swigregister", Normal2DF1D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_GetShapeF1D", _wrap_new_GetShapeF1D, METH_VARARGS, NULL},
+	 { (char *)"GetShapeF1D_getName", _wrap_GetShapeF1D_getName, METH_VARARGS, NULL},
+	 { (char *)"GetShapeF1D___call__", _wrap_GetShapeF1D___call__, METH_VARARGS, NULL},
+	 { (char *)"delete_GetShapeF1D", _wrap_delete_GetShapeF1D, METH_VARARGS, NULL},
+	 { (char *)"GetShapeF1D_swigregister", GetShapeF1D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_GetOccludersF1D", _wrap_new_GetOccludersF1D, METH_VARARGS, NULL},
+	 { (char *)"GetOccludersF1D_getName", _wrap_GetOccludersF1D_getName, METH_VARARGS, NULL},
+	 { (char *)"GetOccludersF1D___call__", _wrap_GetOccludersF1D___call__, METH_VARARGS, NULL},
+	 { (char *)"delete_GetOccludersF1D", _wrap_delete_GetOccludersF1D, METH_VARARGS, NULL},
+	 { (char *)"GetOccludersF1D_swigregister", GetOccludersF1D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_GetOccludeeF1D", _wrap_new_GetOccludeeF1D, METH_VARARGS, NULL},
+	 { (char *)"GetOccludeeF1D_getName", _wrap_GetOccludeeF1D_getName, METH_VARARGS, NULL},
+	 { (char *)"GetOccludeeF1D___call__", _wrap_GetOccludeeF1D___call__, METH_VARARGS, NULL},
+	 { (char *)"delete_GetOccludeeF1D", _wrap_delete_GetOccludeeF1D, METH_VARARGS, NULL},
+	 { (char *)"GetOccludeeF1D_swigregister", GetOccludeeF1D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"Module_setAlwaysRefresh", _wrap_Module_setAlwaysRefresh, METH_VARARGS, NULL},
+	 { (char *)"Module_setCausal", _wrap_Module_setCausal, METH_VARARGS, NULL},
+	 { (char *)"Module_setDrawable", _wrap_Module_setDrawable, METH_VARARGS, NULL},
+	 { (char *)"Module_getAlwaysRefresh", _wrap_Module_getAlwaysRefresh, METH_VARARGS, NULL},
+	 { (char *)"Module_getCausal", _wrap_Module_getCausal, METH_VARARGS, NULL},
+	 { (char *)"Module_getDrawable", _wrap_Module_getDrawable, METH_VARARGS, NULL},
+	 { (char *)"new_Module", _wrap_new_Module, METH_VARARGS, NULL},
+	 { (char *)"delete_Module", _wrap_delete_Module, METH_VARARGS, NULL},
+	 { (char *)"Module_swigregister", Module_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_DensityF0D", _wrap_new_DensityF0D, METH_VARARGS, NULL},
+	 { (char *)"DensityF0D_getName", _wrap_DensityF0D_getName, METH_VARARGS, NULL},
+	 { (char *)"DensityF0D___call__", _wrap_DensityF0D___call__, METH_VARARGS, NULL},
+	 { (char *)"delete_DensityF0D", _wrap_delete_DensityF0D, METH_VARARGS, NULL},
+	 { (char *)"DensityF0D_swigregister", DensityF0D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_LocalAverageDepthF0D", _wrap_new_LocalAverageDepthF0D, METH_VARARGS, NULL},
+	 { (char *)"LocalAverageDepthF0D_getName", _wrap_LocalAverageDepthF0D_getName, METH_VARARGS, NULL},
+	 { (char *)"LocalAverageDepthF0D___call__", _wrap_LocalAverageDepthF0D___call__, METH_VARARGS, NULL},
+	 { (char *)"delete_LocalAverageDepthF0D", _wrap_delete_LocalAverageDepthF0D, METH_VARARGS, NULL},
+	 { (char *)"LocalAverageDepthF0D_swigregister", LocalAverageDepthF0D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_ReadMapPixelF0D", _wrap_new_ReadMapPixelF0D, METH_VARARGS, NULL},
+	 { (char *)"ReadMapPixelF0D_getName", _wrap_ReadMapPixelF0D_getName, METH_VARARGS, NULL},
+	 { (char *)"ReadMapPixelF0D___call__", _wrap_ReadMapPixelF0D___call__, METH_VARARGS, NULL},
+	 { (char *)"delete_ReadMapPixelF0D", _wrap_delete_ReadMapPixelF0D, METH_VARARGS, NULL},
+	 { (char *)"ReadMapPixelF0D_swigregister", ReadMapPixelF0D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_ReadSteerableViewMapPixelF0D", _wrap_new_ReadSteerableViewMapPixelF0D, METH_VARARGS, NULL},
+	 { (char *)"ReadSteerableViewMapPixelF0D_getName", _wrap_ReadSteerableViewMapPixelF0D_getName, METH_VARARGS, NULL},
+	 { (char *)"ReadSteerableViewMapPixelF0D___call__", _wrap_ReadSteerableViewMapPixelF0D___call__, METH_VARARGS, NULL},
+	 { (char *)"delete_ReadSteerableViewMapPixelF0D", _wrap_delete_ReadSteerableViewMapPixelF0D, METH_VARARGS, NULL},
+	 { (char *)"ReadSteerableViewMapPixelF0D_swigregister", ReadSteerableViewMapPixelF0D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_ReadCompleteViewMapPixelF0D", _wrap_new_ReadCompleteViewMapPixelF0D, METH_VARARGS, NULL},
+	 { (char *)"ReadCompleteViewMapPixelF0D_getName", _wrap_ReadCompleteViewMapPixelF0D_getName, METH_VARARGS, NULL},
+	 { (char *)"ReadCompleteViewMapPixelF0D___call__", _wrap_ReadCompleteViewMapPixelF0D___call__, METH_VARARGS, NULL},
+	 { (char *)"delete_ReadCompleteViewMapPixelF0D", _wrap_delete_ReadCompleteViewMapPixelF0D, METH_VARARGS, NULL},
+	 { (char *)"ReadCompleteViewMapPixelF0D_swigregister", ReadCompleteViewMapPixelF0D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_GetViewMapGradientNormF0D", _wrap_new_GetViewMapGradientNormF0D, METH_VARARGS, NULL},
+	 { (char *)"GetViewMapGradientNormF0D_getName", _wrap_GetViewMapGradientNormF0D_getName, METH_VARARGS, NULL},
+	 { (char *)"GetViewMapGradientNormF0D___call__", _wrap_GetViewMapGradientNormF0D___call__, METH_VARARGS, NULL},
+	 { (char *)"delete_GetViewMapGradientNormF0D", _wrap_delete_GetViewMapGradientNormF0D, METH_VARARGS, NULL},
+	 { (char *)"GetViewMapGradientNormF0D_swigregister", GetViewMapGradientNormF0D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_DensityF1D", _wrap_new_DensityF1D, METH_VARARGS, NULL},
+	 { (char *)"delete_DensityF1D", _wrap_delete_DensityF1D, METH_VARARGS, NULL},
+	 { (char *)"DensityF1D_getName", _wrap_DensityF1D_getName, METH_VARARGS, NULL},
+	 { (char *)"DensityF1D___call__", _wrap_DensityF1D___call__, METH_VARARGS, NULL},
+	 { (char *)"DensityF1D_swigregister", DensityF1D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_LocalAverageDepthF1D", _wrap_new_LocalAverageDepthF1D, METH_VARARGS, NULL},
+	 { (char *)"LocalAverageDepthF1D_getName", _wrap_LocalAverageDepthF1D_getName, METH_VARARGS, NULL},
+	 { (char *)"LocalAverageDepthF1D___call__", _wrap_LocalAverageDepthF1D___call__, METH_VARARGS, NULL},
+	 { (char *)"delete_LocalAverageDepthF1D", _wrap_delete_LocalAverageDepthF1D, METH_VARARGS, NULL},
+	 { (char *)"LocalAverageDepthF1D_swigregister", LocalAverageDepthF1D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_GetCompleteViewMapDensityF1D", _wrap_new_GetCompleteViewMapDensityF1D, METH_VARARGS, NULL},
+	 { (char *)"GetCompleteViewMapDensityF1D_getName", _wrap_GetCompleteViewMapDensityF1D_getName, METH_VARARGS, NULL},
+	 { (char *)"GetCompleteViewMapDensityF1D___call__", _wrap_GetCompleteViewMapDensityF1D___call__, METH_VARARGS, NULL},
+	 { (char *)"delete_GetCompleteViewMapDensityF1D", _wrap_delete_GetCompleteViewMapDensityF1D, METH_VARARGS, NULL},
+	 { (char *)"GetCompleteViewMapDensityF1D_swigregister", GetCompleteViewMapDensityF1D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_GetDirectionalViewMapDensityF1D", _wrap_new_GetDirectionalViewMapDensityF1D, METH_VARARGS, NULL},
+	 { (char *)"GetDirectionalViewMapDensityF1D_getName", _wrap_GetDirectionalViewMapDensityF1D_getName, METH_VARARGS, NULL},
+	 { (char *)"GetDirectionalViewMapDensityF1D___call__", _wrap_GetDirectionalViewMapDensityF1D___call__, METH_VARARGS, NULL},
+	 { (char *)"delete_GetDirectionalViewMapDensityF1D", _wrap_delete_GetDirectionalViewMapDensityF1D, METH_VARARGS, NULL},
+	 { (char *)"GetDirectionalViewMapDensityF1D_swigregister", GetDirectionalViewMapDensityF1D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_GetSteerableViewMapDensityF1D", _wrap_new_GetSteerableViewMapDensityF1D, METH_VARARGS, NULL},
+	 { (char *)"delete_GetSteerableViewMapDensityF1D", _wrap_delete_GetSteerableViewMapDensityF1D, METH_VARARGS, NULL},
+	 { (char *)"GetSteerableViewMapDensityF1D_getName", _wrap_GetSteerableViewMapDensityF1D_getName, METH_VARARGS, NULL},
+	 { (char *)"GetSteerableViewMapDensityF1D___call__", _wrap_GetSteerableViewMapDensityF1D___call__, METH_VARARGS, NULL},
+	 { (char *)"GetSteerableViewMapDensityF1D_swigregister", GetSteerableViewMapDensityF1D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_GetViewMapGradientNormF1D", _wrap_new_GetViewMapGradientNormF1D, METH_VARARGS, NULL},
+	 { (char *)"GetViewMapGradientNormF1D_getName", _wrap_GetViewMapGradientNormF1D_getName, METH_VARARGS, NULL},
+	 { (char *)"GetViewMapGradientNormF1D___call__", _wrap_GetViewMapGradientNormF1D___call__, METH_VARARGS, NULL},
+	 { (char *)"delete_GetViewMapGradientNormF1D", _wrap_delete_GetViewMapGradientNormF1D, METH_VARARGS, NULL},
+	 { (char *)"GetViewMapGradientNormF1D_swigregister", GetViewMapGradientNormF1D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"GetTimeStampCF", _wrap_GetTimeStampCF, METH_VARARGS, NULL},
+	 { (char *)"GetCanvasWidthCF", _wrap_GetCanvasWidthCF, METH_VARARGS, NULL},
+	 { (char *)"GetCanvasHeightCF", _wrap_GetCanvasHeightCF, METH_VARARGS, NULL},
+	 { (char *)"LoadMapCF", _wrap_LoadMapCF, METH_VARARGS, NULL},
+	 { (char *)"ReadMapPixelCF", _wrap_ReadMapPixelCF, METH_VARARGS, NULL},
+	 { (char *)"ReadCompleteViewMapPixelCF", _wrap_ReadCompleteViewMapPixelCF, METH_VARARGS, NULL},
+	 { (char *)"ReadDirectionalViewMapPixelCF", _wrap_ReadDirectionalViewMapPixelCF, METH_VARARGS, NULL},
+	 { (char *)"GetSelectedFEdgeCF", _wrap_GetSelectedFEdgeCF, METH_VARARGS, NULL},
+	 { (char *)"new_AdjacencyIterator", _wrap_new_AdjacencyIterator, METH_VARARGS, NULL},
+	 { (char *)"delete_AdjacencyIterator", _wrap_delete_AdjacencyIterator, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_isEnd", _wrap_AdjacencyIterator_isEnd, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_isBegin", _wrap_AdjacencyIterator_isBegin, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_isIncoming", _wrap_AdjacencyIterator_isIncoming, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_getObject", _wrap_AdjacencyIterator_getObject, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator___deref__", _wrap_AdjacencyIterator___deref__, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_increment", _wrap_AdjacencyIterator_increment, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_getExactTypeName", _wrap_AdjacencyIterator_getExactTypeName, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_getId", _wrap_AdjacencyIterator_getId, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_getNature", _wrap_AdjacencyIterator_getNature, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_userdata_set", _wrap_AdjacencyIterator_userdata_set, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_userdata_get", _wrap_AdjacencyIterator_userdata_get, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_A", _wrap_AdjacencyIterator_A, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_B", _wrap_AdjacencyIterator_B, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_fedgeA", _wrap_AdjacencyIterator_fedgeA, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_fedgeB", _wrap_AdjacencyIterator_fedgeB, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_viewShape", _wrap_AdjacencyIterator_viewShape, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_aShape", _wrap_AdjacencyIterator_aShape, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_isClosed", _wrap_AdjacencyIterator_isClosed, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_getChainingTimeStamp", _wrap_AdjacencyIterator_getChainingTimeStamp, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_bShape", _wrap_AdjacencyIterator_bShape, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_occluders", _wrap_AdjacencyIterator_occluders, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_splittingId", _wrap_AdjacencyIterator_splittingId, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_SetA", _wrap_AdjacencyIterator_SetA, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_SetB", _wrap_AdjacencyIterator_SetB, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_SetNature", _wrap_AdjacencyIterator_SetNature, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_SetFEdgeA", _wrap_AdjacencyIterator_SetFEdgeA, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_SetFEdgeB", _wrap_AdjacencyIterator_SetFEdgeB, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_SetShape", _wrap_AdjacencyIterator_SetShape, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_SetId", _wrap_AdjacencyIterator_SetId, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_UpdateFEdges", _wrap_AdjacencyIterator_UpdateFEdges, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_SetaShape", _wrap_AdjacencyIterator_SetaShape, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_SetQI", _wrap_AdjacencyIterator_SetQI, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_setChainingTimeStamp", _wrap_AdjacencyIterator_setChainingTimeStamp, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_AddOccluder", _wrap_AdjacencyIterator_AddOccluder, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_setSplittingId", _wrap_AdjacencyIterator_setSplittingId, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_intersect_2d_area", _wrap_AdjacencyIterator_intersect_2d_area, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_include_in_2d_area", _wrap_AdjacencyIterator_include_in_2d_area, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_getLength2D", _wrap_AdjacencyIterator_getLength2D, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_qi", _wrap_AdjacencyIterator_qi, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_occluders_begin", _wrap_AdjacencyIterator_occluders_begin, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_occluders_end", _wrap_AdjacencyIterator_occluders_end, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_occluders_size", _wrap_AdjacencyIterator_occluders_size, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_occluders_empty", _wrap_AdjacencyIterator_occluders_empty, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_occludee", _wrap_AdjacencyIterator_occludee, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_occluded_shape", _wrap_AdjacencyIterator_occluded_shape, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_occludee_empty", _wrap_AdjacencyIterator_occludee_empty, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_shape_id", _wrap_AdjacencyIterator_shape_id, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_shape", _wrap_AdjacencyIterator_shape, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_shape_importance", _wrap_AdjacencyIterator_shape_importance, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_verticesBegin", _wrap_AdjacencyIterator_verticesBegin, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_verticesEnd", _wrap_AdjacencyIterator_verticesEnd, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_pointsBegin", _wrap_AdjacencyIterator_pointsBegin, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_pointsEnd", _wrap_AdjacencyIterator_pointsEnd, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_getTimeStamp", _wrap_AdjacencyIterator_getTimeStamp, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_setTimeStamp", _wrap_AdjacencyIterator_setTimeStamp, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_swigregister", AdjacencyIterator_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_ChainingIterator", _wrap_new_ChainingIterator, METH_VARARGS, NULL},
+	 { (char *)"ChainingIterator_getExactTypeName", _wrap_ChainingIterator_getExactTypeName, METH_VARARGS, NULL},
+	 { (char *)"ChainingIterator_init", _wrap_ChainingIterator_init, METH_VARARGS, NULL},
+	 { (char *)"ChainingIterator_traverse", _wrap_ChainingIterator_traverse, METH_VARARGS, NULL},
+	 { (char *)"ChainingIterator_getVertex", _wrap_ChainingIterator_getVertex, METH_VARARGS, NULL},
+	 { (char *)"ChainingIterator_isIncrementing", _wrap_ChainingIterator_isIncrementing, METH_VARARGS, NULL},
+	 { (char *)"ChainingIterator_increment", _wrap_ChainingIterator_increment, METH_VARARGS, NULL},
+	 { (char *)"ChainingIterator_decrement", _wrap_ChainingIterator_decrement, METH_VARARGS, NULL},
+	 { (char *)"delete_ChainingIterator", _wrap_delete_ChainingIterator, METH_VARARGS, NULL},
+	 { (char *)"disown_ChainingIterator", _wrap_disown_ChainingIterator, METH_VARARGS, NULL},
+	 { (char *)"ChainingIterator_swigregister", ChainingIterator_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_ChainSilhouetteIterator", _wrap_new_ChainSilhouetteIterator, METH_VARARGS, NULL},
+	 { (char *)"ChainSilhouetteIterator_getExactTypeName", _wrap_ChainSilhouetteIterator_getExactTypeName, METH_VARARGS, NULL},
+	 { (char *)"ChainSilhouetteIterator_traverse", _wrap_ChainSilhouetteIterator_traverse, METH_VARARGS, NULL},
+	 { (char *)"delete_ChainSilhouetteIterator", _wrap_delete_ChainSilhouetteIterator, METH_VARARGS, NULL},
+	 { (char *)"disown_ChainSilhouetteIterator", _wrap_disown_ChainSilhouetteIterator, METH_VARARGS, NULL},
+	 { (char *)"ChainSilhouetteIterator_swigregister", ChainSilhouetteIterator_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_ChainPredicateIterator", _wrap_new_ChainPredicateIterator, METH_VARARGS, NULL},
+	 { (char *)"delete_ChainPredicateIterator", _wrap_delete_ChainPredicateIterator, METH_VARARGS, NULL},
+	 { (char *)"ChainPredicateIterator_getExactTypeName", _wrap_ChainPredicateIterator_getExactTypeName, METH_VARARGS, NULL},
+	 { (char *)"ChainPredicateIterator_traverse", _wrap_ChainPredicateIterator_traverse, METH_VARARGS, NULL},
+	 { (char *)"disown_ChainPredicateIterator", _wrap_disown_ChainPredicateIterator, METH_VARARGS, NULL},
+	 { (char *)"ChainPredicateIterator_swigregister", ChainPredicateIterator_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_UnaryPredicate0D", _wrap_new_UnaryPredicate0D, METH_VARARGS, NULL},
+	 { (char *)"delete_UnaryPredicate0D", _wrap_delete_UnaryPredicate0D, METH_VARARGS, NULL},
+	 { (char *)"UnaryPredicate0D_getName", _wrap_UnaryPredicate0D_getName, METH_VARARGS, NULL},
+	 { (char *)"UnaryPredicate0D___call__", _wrap_UnaryPredicate0D___call__, METH_VARARGS, NULL},
+	 { (char *)"disown_UnaryPredicate0D", _wrap_disown_UnaryPredicate0D, METH_VARARGS, NULL},
+	 { (char *)"UnaryPredicate0D_swigregister", UnaryPredicate0D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_BinaryPredicate0D", _wrap_new_BinaryPredicate0D, METH_VARARGS, NULL},
+	 { (char *)"delete_BinaryPredicate0D", _wrap_delete_BinaryPredicate0D, METH_VARARGS, NULL},
+	 { (char *)"BinaryPredicate0D_getName", _wrap_BinaryPredicate0D_getName, METH_VARARGS, NULL},
+	 { (char *)"BinaryPredicate0D___call__", _wrap_BinaryPredicate0D___call__, METH_VARARGS, NULL},
+	 { (char *)"BinaryPredicate0D_swigregister", BinaryPredicate0D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_TrueUP0D", _wrap_new_TrueUP0D, METH_VARARGS, NULL},
+	 { (char *)"TrueUP0D_getName", _wrap_TrueUP0D_getName, METH_VARARGS, NULL},
+	 { (char *)"TrueUP0D___call__", _wrap_TrueUP0D___call__, METH_VARARGS, NULL},
+	 { (char *)"delete_TrueUP0D", _wrap_delete_TrueUP0D, METH_VARARGS, NULL},
+	 { (char *)"TrueUP0D_swigregister", TrueUP0D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_FalseUP0D", _wrap_new_FalseUP0D, METH_VARARGS, NULL},
+	 { (char *)"FalseUP0D_getName", _wrap_FalseUP0D_getName, METH_VARARGS, NULL},
+	 { (char *)"FalseUP0D___call__", _wrap_FalseUP0D___call__, METH_VARARGS, NULL},
+	 { (char *)"delete_FalseUP0D", _wrap_delete_FalseUP0D, METH_VARARGS, NULL},
+	 { (char *)"FalseUP0D_swigregister", FalseUP0D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_UnaryPredicate1D", _wrap_new_UnaryPredicate1D, METH_VARARGS, NULL},
+	 { (char *)"delete_UnaryPredicate1D", _wrap_delete_UnaryPredicate1D, METH_VARARGS, NULL},
+	 { (char *)"UnaryPredicate1D_getName", _wrap_UnaryPredicate1D_getName, METH_VARARGS, NULL},
+	 { (char *)"UnaryPredicate1D___call__", _wrap_UnaryPredicate1D___call__, METH_VARARGS, NULL},
+	 { (char *)"disown_UnaryPredicate1D", _wrap_disown_UnaryPredicate1D, METH_VARARGS, NULL},
+	 { (char *)"UnaryPredicate1D_swigregister", UnaryPredicate1D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_BinaryPredicate1D", _wrap_new_BinaryPredicate1D, METH_VARARGS, NULL},
+	 { (char *)"delete_BinaryPredicate1D", _wrap_delete_BinaryPredicate1D, METH_VARARGS, NULL},
+	 { (char *)"BinaryPredicate1D_getName", _wrap_BinaryPredicate1D_getName, METH_VARARGS, NULL},
+	 { (char *)"BinaryPredicate1D___call__", _wrap_BinaryPredicate1D___call__, METH_VARARGS, NULL},
+	 { (char *)"disown_BinaryPredicate1D", _wrap_disown_BinaryPredicate1D, METH_VARARGS, NULL},
+	 { (char *)"BinaryPredicate1D_swigregister", BinaryPredicate1D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_TrueUP1D", _wrap_new_TrueUP1D, METH_VARARGS, NULL},
+	 { (char *)"TrueUP1D_getName", _wrap_TrueUP1D_getName, METH_VARARGS, NULL},
+	 { (char *)"TrueUP1D___call__", _wrap_TrueUP1D___call__, METH_VARARGS, NULL},
+	 { (char *)"delete_TrueUP1D", _wrap_delete_TrueUP1D, METH_VARARGS, NULL},
+	 { (char *)"TrueUP1D_swigregister", TrueUP1D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_FalseUP1D", _wrap_new_FalseUP1D, METH_VARARGS, NULL},
+	 { (char *)"FalseUP1D_getName", _wrap_FalseUP1D_getName, METH_VARARGS, NULL},
+	 { (char *)"FalseUP1D___call__", _wrap_FalseUP1D___call__, METH_VARARGS, NULL},
+	 { (char *)"delete_FalseUP1D", _wrap_delete_FalseUP1D, METH_VARARGS, NULL},
+	 { (char *)"FalseUP1D_swigregister", FalseUP1D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_QuantitativeInvisibilityUP1D", _wrap_new_QuantitativeInvisibilityUP1D, METH_VARARGS, NULL},
+	 { (char *)"QuantitativeInvisibilityUP1D_getName", _wrap_QuantitativeInvisibilityUP1D_getName, METH_VARARGS, NULL},
+	 { (char *)"QuantitativeInvisibilityUP1D___call__", _wrap_QuantitativeInvisibilityUP1D___call__, METH_VARARGS, NULL},
+	 { (char *)"delete_QuantitativeInvisibilityUP1D", _wrap_delete_QuantitativeInvisibilityUP1D, METH_VARARGS, NULL},
+	 { (char *)"QuantitativeInvisibilityUP1D_swigregister", QuantitativeInvisibilityUP1D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"ContourUP1D_getName", _wrap_ContourUP1D_getName, METH_VARARGS, NULL},
+	 { (char *)"ContourUP1D___call__", _wrap_ContourUP1D___call__, METH_VARARGS, NULL},
+	 { (char *)"new_ContourUP1D", _wrap_new_ContourUP1D, METH_VARARGS, NULL},
+	 { (char *)"delete_ContourUP1D", _wrap_delete_ContourUP1D, METH_VARARGS, NULL},
+	 { (char *)"ContourUP1D_swigregister", ContourUP1D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"ExternalContourUP1D_getName", _wrap_ExternalContourUP1D_getName, METH_VARARGS, NULL},
+	 { (char *)"ExternalContourUP1D___call__", _wrap_ExternalContourUP1D___call__, METH_VARARGS, NULL},
+	 { (char *)"new_ExternalContourUP1D", _wrap_new_ExternalContourUP1D, METH_VARARGS, NULL},
+	 { (char *)"delete_ExternalContourUP1D", _wrap_delete_ExternalContourUP1D, METH_VARARGS, NULL},
+	 { (char *)"ExternalContourUP1D_swigregister", ExternalContourUP1D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_EqualToTimeStampUP1D", _wrap_new_EqualToTimeStampUP1D, METH_VARARGS, NULL},
+	 { (char *)"EqualToTimeStampUP1D_getName", _wrap_EqualToTimeStampUP1D_getName, METH_VARARGS, NULL},
+	 { (char *)"EqualToTimeStampUP1D___call__", _wrap_EqualToTimeStampUP1D___call__, METH_VARARGS, NULL},
+	 { (char *)"delete_EqualToTimeStampUP1D", _wrap_delete_EqualToTimeStampUP1D, METH_VARARGS, NULL},
+	 { (char *)"EqualToTimeStampUP1D_swigregister", EqualToTimeStampUP1D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_EqualToChainingTimeStampUP1D", _wrap_new_EqualToChainingTimeStampUP1D, METH_VARARGS, NULL},
+	 { (char *)"EqualToChainingTimeStampUP1D_getName", _wrap_EqualToChainingTimeStampUP1D_getName, METH_VARARGS, NULL},
+	 { (char *)"EqualToChainingTimeStampUP1D___call__", _wrap_EqualToChainingTimeStampUP1D___call__, METH_VARARGS, NULL},
+	 { (char *)"delete_EqualToChainingTimeStampUP1D", _wrap_delete_EqualToChainingTimeStampUP1D, METH_VARARGS, NULL},
+	 { (char *)"EqualToChainingTimeStampUP1D_swigregister", EqualToChainingTimeStampUP1D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_ShapeUP1D", _wrap_new_ShapeUP1D, METH_VARARGS, NULL},
+	 { (char *)"ShapeUP1D_getName", _wrap_ShapeUP1D_getName, METH_VARARGS, NULL},
+	 { (char *)"ShapeUP1D___call__", _wrap_ShapeUP1D___call__, METH_VARARGS, NULL},
+	 { (char *)"delete_ShapeUP1D", _wrap_delete_ShapeUP1D, METH_VARARGS, NULL},
+	 { (char *)"ShapeUP1D_swigregister", ShapeUP1D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"TrueBP1D_getName", _wrap_TrueBP1D_getName, METH_VARARGS, NULL},
+	 { (char *)"TrueBP1D___call__", _wrap_TrueBP1D___call__, METH_VARARGS, NULL},
+	 { (char *)"new_TrueBP1D", _wrap_new_TrueBP1D, METH_VARARGS, NULL},
+	 { (char *)"delete_TrueBP1D", _wrap_delete_TrueBP1D, METH_VARARGS, NULL},
+	 { (char *)"TrueBP1D_swigregister", TrueBP1D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"FalseBP1D_getName", _wrap_FalseBP1D_getName, METH_VARARGS, NULL},
+	 { (char *)"FalseBP1D___call__", _wrap_FalseBP1D___call__, METH_VARARGS, NULL},
+	 { (char *)"new_FalseBP1D", _wrap_new_FalseBP1D, METH_VARARGS, NULL},
+	 { (char *)"delete_FalseBP1D", _wrap_delete_FalseBP1D, METH_VARARGS, NULL},
+	 { (char *)"FalseBP1D_swigregister", FalseBP1D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"Length2DBP1D_getName", _wrap_Length2DBP1D_getName, METH_VARARGS, NULL},
+	 { (char *)"Length2DBP1D___call__", _wrap_Length2DBP1D___call__, METH_VARARGS, NULL},
+	 { (char *)"new_Length2DBP1D", _wrap_new_Length2DBP1D, METH_VARARGS, NULL},
+	 { (char *)"delete_Length2DBP1D", _wrap_delete_Length2DBP1D, METH_VARARGS, NULL},
+	 { (char *)"Length2DBP1D_swigregister", Length2DBP1D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"SameShapeIdBP1D_getName", _wrap_SameShapeIdBP1D_getName, METH_VARARGS, NULL},
+	 { (char *)"SameShapeIdBP1D___call__", _wrap_SameShapeIdBP1D___call__, METH_VARARGS, NULL},
+	 { (char *)"new_SameShapeIdBP1D", _wrap_new_SameShapeIdBP1D, METH_VARARGS, NULL},
+	 { (char *)"delete_SameShapeIdBP1D", _wrap_delete_SameShapeIdBP1D, METH_VARARGS, NULL},
+	 { (char *)"SameShapeIdBP1D_swigregister", SameShapeIdBP1D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_ViewMapGradientNormBP1D", _wrap_new_ViewMapGradientNormBP1D, METH_VARARGS, NULL},
+	 { (char *)"ViewMapGradientNormBP1D_getName", _wrap_ViewMapGradientNormBP1D_getName, METH_VARARGS, NULL},
+	 { (char *)"ViewMapGradientNormBP1D___call__", _wrap_ViewMapGradientNormBP1D___call__, METH_VARARGS, NULL},
+	 { (char *)"delete_ViewMapGradientNormBP1D", _wrap_delete_ViewMapGradientNormBP1D, METH_VARARGS, NULL},
+	 { (char *)"ViewMapGradientNormBP1D_swigregister", ViewMapGradientNormBP1D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_DensityLowerThanUP1D", _wrap_new_DensityLowerThanUP1D, METH_VARARGS, NULL},
+	 { (char *)"DensityLowerThanUP1D_getName", _wrap_DensityLowerThanUP1D_getName, METH_VARARGS, NULL},
+	 { (char *)"DensityLowerThanUP1D___call__", _wrap_DensityLowerThanUP1D___call__, METH_VARARGS, NULL},
+	 { (char *)"delete_DensityLowerThanUP1D", _wrap_delete_DensityLowerThanUP1D, METH_VARARGS, NULL},
+	 { (char *)"DensityLowerThanUP1D_swigregister", DensityLowerThanUP1D_swigregister, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator__CurvilinearLength_set", _wrap_CurvePointIterator__CurvilinearLength_set, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator__CurvilinearLength_get", _wrap_CurvePointIterator__CurvilinearLength_get, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator__step_set", _wrap_CurvePointIterator__step_set, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator__step_get", _wrap_CurvePointIterator__step_get, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator___A_set", _wrap_CurvePointIterator___A_set, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator___A_get", _wrap_CurvePointIterator___A_get, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator___B_set", _wrap_CurvePointIterator___B_set, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator___B_get", _wrap_CurvePointIterator___B_get, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator__begin_set", _wrap_CurvePointIterator__begin_set, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator__begin_get", _wrap_CurvePointIterator__begin_get, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator__end_set", _wrap_CurvePointIterator__end_set, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator__end_get", _wrap_CurvePointIterator__end_get, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator__n_set", _wrap_CurvePointIterator__n_set, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator__n_get", _wrap_CurvePointIterator__n_get, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator__currentn_set", _wrap_CurvePointIterator__currentn_set, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator__currentn_get", _wrap_CurvePointIterator__currentn_get, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator__t_set", _wrap_CurvePointIterator__t_set, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator__t_get", _wrap_CurvePointIterator__t_get, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator__Point_set", _wrap_CurvePointIterator__Point_set, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator__Point_get", _wrap_CurvePointIterator__Point_get, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator__CurveLength_set", _wrap_CurvePointIterator__CurveLength_set, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator__CurveLength_get", _wrap_CurvePointIterator__CurveLength_get, METH_VARARGS, NULL},
+	 { (char *)"new_CurvePointIterator", _wrap_new_CurvePointIterator, METH_VARARGS, NULL},
+	 { (char *)"delete_CurvePointIterator", _wrap_delete_CurvePointIterator, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_copy", _wrap_CurvePointIterator_copy, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_CastToInterface0DIterator", _wrap_CurvePointIterator_CastToInterface0DIterator, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_getExactTypeName", _wrap_CurvePointIterator_getExactTypeName, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator___eq__", _wrap_CurvePointIterator___eq__, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_getObject", _wrap_CurvePointIterator_getObject, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator___deref__", _wrap_CurvePointIterator___deref__, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_isBegin", _wrap_CurvePointIterator_isBegin, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_isEnd", _wrap_CurvePointIterator_isEnd, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_getX", _wrap_CurvePointIterator_getX, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_getY", _wrap_CurvePointIterator_getY, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_getZ", _wrap_CurvePointIterator_getZ, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_getPoint3D", _wrap_CurvePointIterator_getPoint3D, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_getProjectedX", _wrap_CurvePointIterator_getProjectedX, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_getProjectedY", _wrap_CurvePointIterator_getProjectedY, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_getProjectedZ", _wrap_CurvePointIterator_getProjectedZ, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_getPoint2D", _wrap_CurvePointIterator_getPoint2D, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_getFEdge", _wrap_CurvePointIterator_getFEdge, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_getId", _wrap_CurvePointIterator_getId, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_getNature", _wrap_CurvePointIterator_getNature, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_castToSVertex", _wrap_CurvePointIterator_castToSVertex, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_castToViewVertex", _wrap_CurvePointIterator_castToViewVertex, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_castToNonTVertex", _wrap_CurvePointIterator_castToNonTVertex, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_castToTVertex", _wrap_CurvePointIterator_castToTVertex, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_A", _wrap_CurvePointIterator_A, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_B", _wrap_CurvePointIterator_B, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_t2d", _wrap_CurvePointIterator_t2d, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_SetA", _wrap_CurvePointIterator_SetA, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_SetB", _wrap_CurvePointIterator_SetB, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_SetT2d", _wrap_CurvePointIterator_SetT2d, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_fedge", _wrap_CurvePointIterator_fedge, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_point2d", _wrap_CurvePointIterator_point2d, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_point3d", _wrap_CurvePointIterator_point3d, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_normal", _wrap_CurvePointIterator_normal, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_shape", _wrap_CurvePointIterator_shape, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_occluders_begin", _wrap_CurvePointIterator_occluders_begin, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_occluders_end", _wrap_CurvePointIterator_occluders_end, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_occluders_empty", _wrap_CurvePointIterator_occluders_empty, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_occluders_size", _wrap_CurvePointIterator_occluders_size, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_occludee", _wrap_CurvePointIterator_occludee, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_occluded_shape", _wrap_CurvePointIterator_occluded_shape, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_occludee_empty", _wrap_CurvePointIterator_occludee_empty, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_z_discontinuity", _wrap_CurvePointIterator_z_discontinuity, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_curvatureFredo", _wrap_CurvePointIterator_curvatureFredo, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_directionFredo", _wrap_CurvePointIterator_directionFredo, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_swigregister", CurvePointIterator_swigregister, METH_VARARGS, NULL},
+	 { (char *)"CurvePoint_getExactTypeName", _wrap_CurvePoint_getExactTypeName, METH_VARARGS, NULL},
+	 { (char *)"CurvePoint_getX", _wrap_CurvePoint_getX, METH_VARARGS, NULL},
+	 { (char *)"CurvePoint_getY", _wrap_CurvePoint_getY, METH_VARARGS, NULL},
+	 { (char *)"CurvePoint_getZ", _wrap_CurvePoint_getZ, METH_VARARGS, NULL},
+	 { (char *)"CurvePoint_getPoint3D", _wrap_CurvePoint_getPoint3D, METH_VARARGS, NULL},
+	 { (char *)"CurvePoint_getProjectedX", _wrap_CurvePoint_getProjectedX, METH_VARARGS, NULL},
+	 { (char *)"CurvePoint_getProjectedY", _wrap_CurvePoint_getProjectedY, METH_VARARGS, NULL},
+	 { (char *)"CurvePoint_getProjectedZ", _wrap_CurvePoint_getProjectedZ, METH_VARARGS, NULL},
+	 { (char *)"CurvePoint_getPoint2D", _wrap_CurvePoint_getPoint2D, METH_VARARGS, NULL},
+	 { (char *)"CurvePoint_getFEdge", _wrap_CurvePoint_getFEdge, METH_VARARGS, NULL},
+	 { (char *)"CurvePoint_getId", _wrap_CurvePoint_getId, METH_VARARGS, NULL},
+	 { (char *)"CurvePoint_getNature", _wrap_CurvePoint_getNature, METH_VARARGS, NULL},
+	 { (char *)"CurvePoint_castToSVertex", _wrap_CurvePoint_castToSVertex, METH_VARARGS, NULL},
+	 { (char *)"CurvePoint_castToViewVertex", _wrap_CurvePoint_castToViewVertex, METH_VARARGS, NULL},
+	 { (char *)"CurvePoint_castToNonTVertex", _wrap_CurvePoint_castToNonTVertex, METH_VARARGS, NULL},
+	 { (char *)"CurvePoint_castToTVertex", _wrap_CurvePoint_castToTVertex, METH_VARARGS, NULL},
+	 { (char *)"new_CurvePoint", _wrap_new_CurvePoint, METH_VARARGS, NULL},
+	 { (char *)"delete_CurvePoint", _wrap_delete_CurvePoint, METH_VARARGS, NULL},
+	 { (char *)"CurvePoint___eq__", _wrap_CurvePoint___eq__, METH_VARARGS, NULL},
+	 { (char *)"CurvePoint_A", _wrap_CurvePoint_A, METH_VARARGS, NULL},
+	 { (char *)"CurvePoint_B", _wrap_CurvePoint_B, METH_VARARGS, NULL},
+	 { (char *)"CurvePoint_t2d", _wrap_CurvePoint_t2d, METH_VARARGS, NULL},
+	 { (char *)"CurvePoint_SetA", _wrap_CurvePoint_SetA, METH_VARARGS, NULL},
+	 { (char *)"CurvePoint_SetB", _wrap_CurvePoint_SetB, METH_VARARGS, NULL},
+	 { (char *)"CurvePoint_SetT2d", _wrap_CurvePoint_SetT2d, METH_VARARGS, NULL},
+	 { (char *)"CurvePoint_fedge", _wrap_CurvePoint_fedge, METH_VARARGS, NULL},
+	 { (char *)"CurvePoint_point2d", _wrap_CurvePoint_point2d, METH_VARARGS, NULL},
+	 { (char *)"CurvePoint_point3d", _wrap_CurvePoint_point3d, METH_VARARGS, NULL},
+	 { (char *)"CurvePoint_normal", _wrap_CurvePoint_normal, METH_VARARGS, NULL},
+	 { (char *)"CurvePoint_shape", _wrap_CurvePoint_shape, METH_VARARGS, NULL},
+	 { (char *)"CurvePoint_occluders_begin", _wrap_CurvePoint_occluders_begin, METH_VARARGS, NULL},
+	 { (char *)"CurvePoint_occluders_end", _wrap_CurvePoint_occluders_end, METH_VARARGS, NULL},
+	 { (char *)"CurvePoint_occluders_empty", _wrap_CurvePoint_occluders_empty, METH_VARARGS, NULL},
+	 { (char *)"CurvePoint_occluders_size", _wrap_CurvePoint_occluders_size, METH_VARARGS, NULL},
+	 { (char *)"CurvePoint_occludee", _wrap_CurvePoint_occludee, METH_VARARGS, NULL},
+	 { (char *)"CurvePoint_occluded_shape", _wrap_CurvePoint_occluded_shape, METH_VARARGS, NULL},
+	 { (char *)"CurvePoint_occludee_empty", _wrap_CurvePoint_occludee_empty, METH_VARARGS, NULL},
+	 { (char *)"CurvePoint_z_discontinuity", _wrap_CurvePoint_z_discontinuity, METH_VARARGS, NULL},
+	 { (char *)"CurvePoint_curvatureFredo", _wrap_CurvePoint_curvatureFredo, METH_VARARGS, NULL},
+	 { (char *)"CurvePoint_directionFredo", _wrap_CurvePoint_directionFredo, METH_VARARGS, NULL},
+	 { (char *)"CurvePoint_swigregister", CurvePoint_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_Curve", _wrap_new_Curve, METH_VARARGS, NULL},
+	 { (char *)"delete_Curve", _wrap_delete_Curve, METH_VARARGS, NULL},
+	 { (char *)"Curve_computeCurvatureAndOrientation", _wrap_Curve_computeCurvatureAndOrientation, METH_VARARGS, NULL},
+	 { (char *)"Curve_push_vertex_back", _wrap_Curve_push_vertex_back, METH_VARARGS, NULL},
+	 { (char *)"Curve_push_vertex_front", _wrap_Curve_push_vertex_front, METH_VARARGS, NULL},
+	 { (char *)"Curve_empty", _wrap_Curve_empty, METH_VARARGS, NULL},
+	 { (char *)"Curve_getLength2D", _wrap_Curve_getLength2D, METH_VARARGS, NULL},
+	 { (char *)"Curve_getId", _wrap_Curve_getId, METH_VARARGS, NULL},
+	 { (char *)"Curve_nSegments", _wrap_Curve_nSegments, METH_VARARGS, NULL},
+	 { (char *)"Curve_setId", _wrap_Curve_setId, METH_VARARGS, NULL},
+	 { (char *)"Curve_curvePointsBegin", _wrap_Curve_curvePointsBegin, METH_VARARGS, NULL},
+	 { (char *)"Curve_curvePointsEnd", _wrap_Curve_curvePointsEnd, METH_VARARGS, NULL},
+	 { (char *)"Curve_curveVerticesBegin", _wrap_Curve_curveVerticesBegin, METH_VARARGS, NULL},
+	 { (char *)"Curve_curveVerticesEnd", _wrap_Curve_curveVerticesEnd, METH_VARARGS, NULL},
+	 { (char *)"Curve_verticesBegin", _wrap_Curve_verticesBegin, METH_VARARGS, NULL},
+	 { (char *)"Curve_verticesEnd", _wrap_Curve_verticesEnd, METH_VARARGS, NULL},
+	 { (char *)"Curve_pointsBegin", _wrap_Curve_pointsBegin, METH_VARARGS, NULL},
+	 { (char *)"Curve_pointsEnd", _wrap_Curve_pointsEnd, METH_VARARGS, NULL},
+	 { (char *)"Curve_swigregister", Curve_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_StrokeVertexIterator", _wrap_new_StrokeVertexIterator, METH_VARARGS, NULL},
+	 { (char *)"delete_StrokeVertexIterator", _wrap_delete_StrokeVertexIterator, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_castToInterface0DIterator", _wrap_StrokeVertexIterator_castToInterface0DIterator, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_getExactTypeName", _wrap_StrokeVertexIterator_getExactTypeName, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_getObject", _wrap_StrokeVertexIterator_getObject, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator___deref__", _wrap_StrokeVertexIterator___deref__, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_increment", _wrap_StrokeVertexIterator_increment, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_decrement", _wrap_StrokeVertexIterator_decrement, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_isBegin", _wrap_StrokeVertexIterator_isBegin, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_isEnd", _wrap_StrokeVertexIterator_isEnd, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator___eq__", _wrap_StrokeVertexIterator___eq__, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_t", _wrap_StrokeVertexIterator_t, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_u", _wrap_StrokeVertexIterator_u, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_copy", _wrap_StrokeVertexIterator_copy, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_getIt", _wrap_StrokeVertexIterator_getIt, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_x", _wrap_StrokeVertexIterator_x, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_y", _wrap_StrokeVertexIterator_y, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_getPoint", _wrap_StrokeVertexIterator_getPoint, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_attribute", _wrap_StrokeVertexIterator_attribute, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_curvilinearAbscissa", _wrap_StrokeVertexIterator_curvilinearAbscissa, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_strokeLength", _wrap_StrokeVertexIterator_strokeLength, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_SetX", _wrap_StrokeVertexIterator_SetX, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_SetY", _wrap_StrokeVertexIterator_SetY, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_SetPoint", _wrap_StrokeVertexIterator_SetPoint, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_SetAttribute", _wrap_StrokeVertexIterator_SetAttribute, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_SetCurvilinearAbscissa", _wrap_StrokeVertexIterator_SetCurvilinearAbscissa, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_SetStrokeLength", _wrap_StrokeVertexIterator_SetStrokeLength, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_getX", _wrap_StrokeVertexIterator_getX, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_getY", _wrap_StrokeVertexIterator_getY, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_getZ", _wrap_StrokeVertexIterator_getZ, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_getPoint3D", _wrap_StrokeVertexIterator_getPoint3D, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_getProjectedX", _wrap_StrokeVertexIterator_getProjectedX, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_getProjectedY", _wrap_StrokeVertexIterator_getProjectedY, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_getProjectedZ", _wrap_StrokeVertexIterator_getProjectedZ, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_getPoint2D", _wrap_StrokeVertexIterator_getPoint2D, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_getFEdge", _wrap_StrokeVertexIterator_getFEdge, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_getId", _wrap_StrokeVertexIterator_getId, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_getNature", _wrap_StrokeVertexIterator_getNature, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_castToSVertex", _wrap_StrokeVertexIterator_castToSVertex, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_castToViewVertex", _wrap_StrokeVertexIterator_castToViewVertex, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_castToNonTVertex", _wrap_StrokeVertexIterator_castToNonTVertex, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_castToTVertex", _wrap_StrokeVertexIterator_castToTVertex, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_A", _wrap_StrokeVertexIterator_A, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_B", _wrap_StrokeVertexIterator_B, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_t2d", _wrap_StrokeVertexIterator_t2d, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_SetA", _wrap_StrokeVertexIterator_SetA, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_SetB", _wrap_StrokeVertexIterator_SetB, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_SetT2d", _wrap_StrokeVertexIterator_SetT2d, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_fedge", _wrap_StrokeVertexIterator_fedge, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_point2d", _wrap_StrokeVertexIterator_point2d, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_point3d", _wrap_StrokeVertexIterator_point3d, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_normal", _wrap_StrokeVertexIterator_normal, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_shape", _wrap_StrokeVertexIterator_shape, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_occluders_begin", _wrap_StrokeVertexIterator_occluders_begin, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_occluders_end", _wrap_StrokeVertexIterator_occluders_end, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_occluders_empty", _wrap_StrokeVertexIterator_occluders_empty, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_occluders_size", _wrap_StrokeVertexIterator_occluders_size, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_occludee", _wrap_StrokeVertexIterator_occludee, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_occluded_shape", _wrap_StrokeVertexIterator_occluded_shape, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_occludee_empty", _wrap_StrokeVertexIterator_occludee_empty, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_z_discontinuity", _wrap_StrokeVertexIterator_z_discontinuity, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_curvatureFredo", _wrap_StrokeVertexIterator_curvatureFredo, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_directionFredo", _wrap_StrokeVertexIterator_directionFredo, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_swigregister", StrokeVertexIterator_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_StrokeAttribute", _wrap_new_StrokeAttribute, METH_VARARGS, NULL},
+	 { (char *)"delete_StrokeAttribute", _wrap_delete_StrokeAttribute, METH_VARARGS, NULL},
+	 { (char *)"StrokeAttribute_getColor", _wrap_StrokeAttribute_getColor, METH_VARARGS, NULL},
+	 { (char *)"StrokeAttribute_getColorR", _wrap_StrokeAttribute_getColorR, METH_VARARGS, NULL},
+	 { (char *)"StrokeAttribute_getColorG", _wrap_StrokeAttribute_getColorG, METH_VARARGS, NULL},
+	 { (char *)"StrokeAttribute_getColorB", _wrap_StrokeAttribute_getColorB, METH_VARARGS, NULL},
+	 { (char *)"StrokeAttribute_getColorRGB", _wrap_StrokeAttribute_getColorRGB, METH_VARARGS, NULL},
+	 { (char *)"StrokeAttribute_getAlpha", _wrap_StrokeAttribute_getAlpha, METH_VARARGS, NULL},
+	 { (char *)"StrokeAttribute_getThickness", _wrap_StrokeAttribute_getThickness, METH_VARARGS, NULL},
+	 { (char *)"StrokeAttribute_getThicknessR", _wrap_StrokeAttribute_getThicknessR, METH_VARARGS, NULL},
+	 { (char *)"StrokeAttribute_getThicknessL", _wrap_StrokeAttribute_getThicknessL, METH_VARARGS, NULL},
+	 { (char *)"StrokeAttribute_getThicknessRL", _wrap_StrokeAttribute_getThicknessRL, METH_VARARGS, NULL},
+	 { (char *)"StrokeAttribute_isVisible", _wrap_StrokeAttribute_isVisible, METH_VARARGS, NULL},
+	 { (char *)"StrokeAttribute_getAttributeReal", _wrap_StrokeAttribute_getAttributeReal, METH_VARARGS, NULL},
+	 { (char *)"StrokeAttribute_getAttributeVec2f", _wrap_StrokeAttribute_getAttributeVec2f, METH_VARARGS, NULL},
+	 { (char *)"StrokeAttribute_getAttributeVec3f", _wrap_StrokeAttribute_getAttributeVec3f, METH_VARARGS, NULL},
+	 { (char *)"StrokeAttribute_isAttributeAvailableReal", _wrap_StrokeAttribute_isAttributeAvailableReal, METH_VARARGS, NULL},
+	 { (char *)"StrokeAttribute_isAttributeAvailableVec2f", _wrap_StrokeAttribute_isAttributeAvailableVec2f, METH_VARARGS, NULL},
+	 { (char *)"StrokeAttribute_isAttributeAvailableVec3f", _wrap_StrokeAttribute_isAttributeAvailableVec3f, METH_VARARGS, NULL},
+	 { (char *)"StrokeAttribute_setColor", _wrap_StrokeAttribute_setColor, METH_VARARGS, NULL},
+	 { (char *)"StrokeAttribute_setAlpha", _wrap_StrokeAttribute_setAlpha, METH_VARARGS, NULL},
+	 { (char *)"StrokeAttribute_setThickness", _wrap_StrokeAttribute_setThickness, METH_VARARGS, NULL},
+	 { (char *)"StrokeAttribute_SetVisible", _wrap_StrokeAttribute_SetVisible, METH_VARARGS, NULL},
+	 { (char *)"StrokeAttribute_setAttributeReal", _wrap_StrokeAttribute_setAttributeReal, METH_VARARGS, NULL},
+	 { (char *)"StrokeAttribute_setAttributeVec2f", _wrap_StrokeAttribute_setAttributeVec2f, METH_VARARGS, NULL},
+	 { (char *)"StrokeAttribute_setAttributeVec3f", _wrap_StrokeAttribute_setAttributeVec3f, METH_VARARGS, NULL},
+	 { (char *)"StrokeAttribute_swigregister", StrokeAttribute_swigregister, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertex_getExactTypeName", _wrap_StrokeVertex_getExactTypeName, METH_VARARGS, NULL},
+	 { (char *)"new_StrokeVertex", _wrap_new_StrokeVertex, METH_VARARGS, NULL},
+	 { (char *)"delete_StrokeVertex", _wrap_delete_StrokeVertex, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertex_x", _wrap_StrokeVertex_x, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertex_y", _wrap_StrokeVertex_y, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertex_getPoint", _wrap_StrokeVertex_getPoint, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertex_attribute", _wrap_StrokeVertex_attribute, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertex_curvilinearAbscissa", _wrap_StrokeVertex_curvilinearAbscissa, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertex_strokeLength", _wrap_StrokeVertex_strokeLength, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertex_u", _wrap_StrokeVertex_u, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertex_SetX", _wrap_StrokeVertex_SetX, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertex_SetY", _wrap_StrokeVertex_SetY, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertex_SetPoint", _wrap_StrokeVertex_SetPoint, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertex_SetAttribute", _wrap_StrokeVertex_SetAttribute, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertex_SetCurvilinearAbscissa", _wrap_StrokeVertex_SetCurvilinearAbscissa, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertex_SetStrokeLength", _wrap_StrokeVertex_SetStrokeLength, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertex_swigregister", StrokeVertex_swigregister, METH_VARARGS, NULL},
+	 { (char *)"Stroke_getExactTypeName", _wrap_Stroke_getExactTypeName, METH_VARARGS, NULL},
+	 { (char *)"Stroke_getId", _wrap_Stroke_getId, METH_VARARGS, NULL},
+	 { (char *)"new_Stroke", _wrap_new_Stroke, METH_VARARGS, NULL},
+	 { (char *)"delete_Stroke", _wrap_delete_Stroke, METH_VARARGS, NULL},
+	 { (char *)"Stroke_ComputeSampling", _wrap_Stroke_ComputeSampling, METH_VARARGS, NULL},
+	 { (char *)"Stroke_Resample", _wrap_Stroke_Resample, METH_VARARGS, NULL},
+	 { (char *)"Stroke_RemoveVertex", _wrap_Stroke_RemoveVertex, METH_VARARGS, NULL},
+	 { (char *)"Stroke_InsertVertex", _wrap_Stroke_InsertVertex, METH_VARARGS, NULL},
+	 { (char *)"Stroke_Render", _wrap_Stroke_Render, METH_VARARGS, NULL},
+	 { (char *)"Stroke_RenderBasic", _wrap_Stroke_RenderBasic, METH_VARARGS, NULL},
+	 { (char *)"Stroke_getLength2D", _wrap_Stroke_getLength2D, METH_VARARGS, NULL},
+	 { (char *)"Stroke_getMediumType", _wrap_Stroke_getMediumType, METH_VARARGS, NULL},
+	 { (char *)"Stroke_getTextureId", _wrap_Stroke_getTextureId, METH_VARARGS, NULL},
+	 { (char *)"Stroke_hasTips", _wrap_Stroke_hasTips, METH_VARARGS, NULL},
+	 { (char *)"Stroke_vertices_size", _wrap_Stroke_vertices_size, METH_VARARGS, NULL},
+	 { (char *)"Stroke_viewedges_begin", _wrap_Stroke_viewedges_begin, METH_VARARGS, NULL},
+	 { (char *)"Stroke_viewedges_end", _wrap_Stroke_viewedges_end, METH_VARARGS, NULL},
+	 { (char *)"Stroke_viewedges_size", _wrap_Stroke_viewedges_size, METH_VARARGS, NULL},
+	 { (char *)"Stroke_getBeginningOrientation", _wrap_Stroke_getBeginningOrientation, METH_VARARGS, NULL},
+	 { (char *)"Stroke_getBeginningOrientationX", _wrap_Stroke_getBeginningOrientationX, METH_VARARGS, NULL},
+	 { (char *)"Stroke_getBeginningOrientationY", _wrap_Stroke_getBeginningOrientationY, METH_VARARGS, NULL},
+	 { (char *)"Stroke_getEndingOrientation", _wrap_Stroke_getEndingOrientation, METH_VARARGS, NULL},
+	 { (char *)"Stroke_getEndingOrientationX", _wrap_Stroke_getEndingOrientationX, METH_VARARGS, NULL},
+	 { (char *)"Stroke_getEndingOrientationY", _wrap_Stroke_getEndingOrientationY, METH_VARARGS, NULL},
+	 { (char *)"Stroke_SetId", _wrap_Stroke_SetId, METH_VARARGS, NULL},
+	 { (char *)"Stroke_SetLength", _wrap_Stroke_SetLength, METH_VARARGS, NULL},
+	 { (char *)"Stroke_SetMediumType", _wrap_Stroke_SetMediumType, METH_VARARGS, NULL},
+	 { (char *)"Stroke_SetTextureId", _wrap_Stroke_SetTextureId, METH_VARARGS, NULL},
+	 { (char *)"Stroke_SetTips", _wrap_Stroke_SetTips, METH_VARARGS, NULL},
+	 { (char *)"Stroke_push_back", _wrap_Stroke_push_back, METH_VARARGS, NULL},
+	 { (char *)"Stroke_push_front", _wrap_Stroke_push_front, METH_VARARGS, NULL},
+	 { (char *)"Stroke_AddViewEdge", _wrap_Stroke_AddViewEdge, METH_VARARGS, NULL},
+	 { (char *)"Stroke_SetBeginningOrientation", _wrap_Stroke_SetBeginningOrientation, METH_VARARGS, NULL},
+	 { (char *)"Stroke_SetEndingOrientation", _wrap_Stroke_SetEndingOrientation, METH_VARARGS, NULL},
+	 { (char *)"Stroke_strokeVerticesBegin", _wrap_Stroke_strokeVerticesBegin, METH_VARARGS, NULL},
+	 { (char *)"Stroke_strokeVerticesEnd", _wrap_Stroke_strokeVerticesEnd, METH_VARARGS, NULL},
+	 { (char *)"Stroke_strokeVerticesSize", _wrap_Stroke_strokeVerticesSize, METH_VARARGS, NULL},
+	 { (char *)"Stroke_verticesBegin", _wrap_Stroke_verticesBegin, METH_VARARGS, NULL},
+	 { (char *)"Stroke_verticesEnd", _wrap_Stroke_verticesEnd, METH_VARARGS, NULL},
+	 { (char *)"Stroke_pointsBegin", _wrap_Stroke_pointsBegin, METH_VARARGS, NULL},
+	 { (char *)"Stroke_pointsEnd", _wrap_Stroke_pointsEnd, METH_VARARGS, NULL},
+	 { (char *)"Stroke_swigregister", Stroke_swigregister, METH_VARARGS, NULL},
+	 { (char *)"ShadersContainer_iterator", _wrap_ShadersContainer_iterator, METH_VARARGS, NULL},
+	 { (char *)"ShadersContainer___nonzero__", _wrap_ShadersContainer___nonzero__, METH_VARARGS, NULL},
+	 { (char *)"ShadersContainer___len__", _wrap_ShadersContainer___len__, METH_VARARGS, NULL},
+	 { (char *)"ShadersContainer_pop", _wrap_ShadersContainer_pop, METH_VARARGS, NULL},
+	 { (char *)"ShadersContainer___getslice__", _wrap_ShadersContainer___getslice__, METH_VARARGS, NULL},
+	 { (char *)"ShadersContainer___setslice__", _wrap_ShadersContainer___setslice__, METH_VARARGS, NULL},
+	 { (char *)"ShadersContainer___delslice__", _wrap_ShadersContainer___delslice__, METH_VARARGS, NULL},
+	 { (char *)"ShadersContainer___delitem__", _wrap_ShadersContainer___delitem__, METH_VARARGS, NULL},
+	 { (char *)"ShadersContainer___getitem__", _wrap_ShadersContainer___getitem__, METH_VARARGS, NULL},
+	 { (char *)"ShadersContainer___setitem__", _wrap_ShadersContainer___setitem__, METH_VARARGS, NULL},
+	 { (char *)"ShadersContainer_append", _wrap_ShadersContainer_append, METH_VARARGS, NULL},
+	 { (char *)"ShadersContainer_empty", _wrap_ShadersContainer_empty, METH_VARARGS, NULL},
+	 { (char *)"ShadersContainer_size", _wrap_ShadersContainer_size, METH_VARARGS, NULL},
+	 { (char *)"ShadersContainer_clear", _wrap_ShadersContainer_clear, METH_VARARGS, NULL},
+	 { (char *)"ShadersContainer_swap", _wrap_ShadersContainer_swap, METH_VARARGS, NULL},
+	 { (char *)"ShadersContainer_get_allocator", _wrap_ShadersContainer_get_allocator, METH_VARARGS, NULL},
+	 { (char *)"ShadersContainer_begin", _wrap_ShadersContainer_begin, METH_VARARGS, NULL},
+	 { (char *)"ShadersContainer_end", _wrap_ShadersContainer_end, METH_VARARGS, NULL},
+	 { (char *)"ShadersContainer_rbegin", _wrap_ShadersContainer_rbegin, METH_VARARGS, NULL},
+	 { (char *)"ShadersContainer_rend", _wrap_ShadersContainer_rend, METH_VARARGS, NULL},
+	 { (char *)"ShadersContainer_pop_back", _wrap_ShadersContainer_pop_back, METH_VARARGS, NULL},
+	 { (char *)"ShadersContainer_erase", _wrap_ShadersContainer_erase, METH_VARARGS, NULL},
+	 { (char *)"new_ShadersContainer", _wrap_new_ShadersContainer, METH_VARARGS, NULL},
+	 { (char *)"ShadersContainer_push_back", _wrap_ShadersContainer_push_back, METH_VARARGS, NULL},
+	 { (char *)"ShadersContainer_front", _wrap_ShadersContainer_front, METH_VARARGS, NULL},
+	 { (char *)"ShadersContainer_back", _wrap_ShadersContainer_back, METH_VARARGS, NULL},
+	 { (char *)"ShadersContainer_assign", _wrap_ShadersContainer_assign, METH_VARARGS, NULL},
+	 { (char *)"ShadersContainer_resize", _wrap_ShadersContainer_resize, METH_VARARGS, NULL},
+	 { (char *)"ShadersContainer_insert", _wrap_ShadersContainer_insert, METH_VARARGS, NULL},
+	 { (char *)"ShadersContainer_reserve", _wrap_ShadersContainer_reserve, METH_VARARGS, NULL},
+	 { (char *)"ShadersContainer_capacity", _wrap_ShadersContainer_capacity, METH_VARARGS, NULL},
+	 { (char *)"delete_ShadersContainer", _wrap_delete_ShadersContainer, METH_VARARGS, NULL},
+	 { (char *)"ShadersContainer_swigregister", ShadersContainer_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_StrokeShader", _wrap_new_StrokeShader, METH_VARARGS, NULL},
+	 { (char *)"delete_StrokeShader", _wrap_delete_StrokeShader, METH_VARARGS, NULL},
+	 { (char *)"StrokeShader_getName", _wrap_StrokeShader_getName, METH_VARARGS, NULL},
+	 { (char *)"StrokeShader_shade", _wrap_StrokeShader_shade, METH_VARARGS, NULL},
+	 { (char *)"disown_StrokeShader", _wrap_disown_StrokeShader, METH_VARARGS, NULL},
+	 { (char *)"StrokeShader_swigregister", StrokeShader_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_ConstantThicknessShader", _wrap_new_ConstantThicknessShader, METH_VARARGS, NULL},
+	 { (char *)"delete_ConstantThicknessShader", _wrap_delete_ConstantThicknessShader, METH_VARARGS, NULL},
+	 { (char *)"ConstantThicknessShader_getName", _wrap_ConstantThicknessShader_getName, METH_VARARGS, NULL},
+	 { (char *)"ConstantThicknessShader_shade", _wrap_ConstantThicknessShader_shade, METH_VARARGS, NULL},
+	 { (char *)"ConstantThicknessShader_swigregister", ConstantThicknessShader_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_ConstantExternThicknessShader", _wrap_new_ConstantExternThicknessShader, METH_VARARGS, NULL},
+	 { (char *)"delete_ConstantExternThicknessShader", _wrap_delete_ConstantExternThicknessShader, METH_VARARGS, NULL},
+	 { (char *)"ConstantExternThicknessShader_getName", _wrap_ConstantExternThicknessShader_getName, METH_VARARGS, NULL},
+	 { (char *)"ConstantExternThicknessShader_shade", _wrap_ConstantExternThicknessShader_shade, METH_VARARGS, NULL},
+	 { (char *)"ConstantExternThicknessShader_swigregister", ConstantExternThicknessShader_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_IncreasingThicknessShader", _wrap_new_IncreasingThicknessShader, METH_VARARGS, NULL},
+	 { (char *)"delete_IncreasingThicknessShader", _wrap_delete_IncreasingThicknessShader, METH_VARARGS, NULL},
+	 { (char *)"IncreasingThicknessShader_shade", _wrap_IncreasingThicknessShader_shade, METH_VARARGS, NULL},
+	 { (char *)"IncreasingThicknessShader_swigregister", IncreasingThicknessShader_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_ConstrainedIncreasingThicknessShader", _wrap_new_ConstrainedIncreasingThicknessShader, METH_VARARGS, NULL},
+	 { (char *)"delete_ConstrainedIncreasingThicknessShader", _wrap_delete_ConstrainedIncreasingThicknessShader, METH_VARARGS, NULL},
+	 { (char *)"ConstrainedIncreasingThicknessShader_shade", _wrap_ConstrainedIncreasingThicknessShader_shade, METH_VARARGS, NULL},
+	 { (char *)"ConstrainedIncreasingThicknessShader_swigregister", ConstrainedIncreasingThicknessShader_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_LengthDependingThicknessShader", _wrap_new_LengthDependingThicknessShader, METH_VARARGS, NULL},
+	 { (char *)"delete_LengthDependingThicknessShader", _wrap_delete_LengthDependingThicknessShader, METH_VARARGS, NULL},
+	 { (char *)"LengthDependingThicknessShader_shade", _wrap_LengthDependingThicknessShader_shade, METH_VARARGS, NULL},
+	 { (char *)"LengthDependingThicknessShader_swigregister", LengthDependingThicknessShader_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_ThicknessVariationPatternShader", _wrap_new_ThicknessVariationPatternShader, METH_VARARGS, NULL},
+	 { (char *)"delete_ThicknessVariationPatternShader", _wrap_delete_ThicknessVariationPatternShader, METH_VARARGS, NULL},
+	 { (char *)"ThicknessVariationPatternShader_shade", _wrap_ThicknessVariationPatternShader_shade, METH_VARARGS, NULL},
+	 { (char *)"ThicknessVariationPatternShader_swigregister", ThicknessVariationPatternShader_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_ThicknessNoiseShader", _wrap_new_ThicknessNoiseShader, METH_VARARGS, NULL},
+	 { (char *)"ThicknessNoiseShader_shade", _wrap_ThicknessNoiseShader_shade, METH_VARARGS, NULL},
+	 { (char *)"delete_ThicknessNoiseShader", _wrap_delete_ThicknessNoiseShader, METH_VARARGS, NULL},
+	 { (char *)"ThicknessNoiseShader_swigregister", ThicknessNoiseShader_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_ConstantColorShader", _wrap_new_ConstantColorShader, METH_VARARGS, NULL},
+	 { (char *)"ConstantColorShader_getName", _wrap_ConstantColorShader_getName, METH_VARARGS, NULL},
+	 { (char *)"ConstantColorShader_shade", _wrap_ConstantColorShader_shade, METH_VARARGS, NULL},
+	 { (char *)"delete_ConstantColorShader", _wrap_delete_ConstantColorShader, METH_VARARGS, NULL},
+	 { (char *)"ConstantColorShader_swigregister", ConstantColorShader_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_IncreasingColorShader", _wrap_new_IncreasingColorShader, METH_VARARGS, NULL},
+	 { (char *)"IncreasingColorShader_shade", _wrap_IncreasingColorShader_shade, METH_VARARGS, NULL},
+	 { (char *)"delete_IncreasingColorShader", _wrap_delete_IncreasingColorShader, METH_VARARGS, NULL},
+	 { (char *)"IncreasingColorShader_swigregister", IncreasingColorShader_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_ColorVariationPatternShader", _wrap_new_ColorVariationPatternShader, METH_VARARGS, NULL},
+	 { (char *)"delete_ColorVariationPatternShader", _wrap_delete_ColorVariationPatternShader, METH_VARARGS, NULL},
+	 { (char *)"ColorVariationPatternShader_shade", _wrap_ColorVariationPatternShader_shade, METH_VARARGS, NULL},
+	 { (char *)"ColorVariationPatternShader_swigregister", ColorVariationPatternShader_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_MaterialColorShader", _wrap_new_MaterialColorShader, METH_VARARGS, NULL},
+	 { (char *)"MaterialColorShader_shade", _wrap_MaterialColorShader_shade, METH_VARARGS, NULL},
+	 { (char *)"delete_MaterialColorShader", _wrap_delete_MaterialColorShader, METH_VARARGS, NULL},
+	 { (char *)"MaterialColorShader_swigregister", MaterialColorShader_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_CalligraphicColorShader", _wrap_new_CalligraphicColorShader, METH_VARARGS, NULL},
+	 { (char *)"CalligraphicColorShader_shade", _wrap_CalligraphicColorShader_shade, METH_VARARGS, NULL},
+	 { (char *)"delete_CalligraphicColorShader", _wrap_delete_CalligraphicColorShader, METH_VARARGS, NULL},
+	 { (char *)"CalligraphicColorShader_swigregister", CalligraphicColorShader_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_ColorNoiseShader", _wrap_new_ColorNoiseShader, METH_VARARGS, NULL},
+	 { (char *)"ColorNoiseShader_shade", _wrap_ColorNoiseShader_shade, METH_VARARGS, NULL},
+	 { (char *)"delete_ColorNoiseShader", _wrap_delete_ColorNoiseShader, METH_VARARGS, NULL},
+	 { (char *)"ColorNoiseShader_swigregister", ColorNoiseShader_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_TextureAssignerShader", _wrap_new_TextureAssignerShader, METH_VARARGS, NULL},
+	 { (char *)"TextureAssignerShader_shade", _wrap_TextureAssignerShader_shade, METH_VARARGS, NULL},
+	 { (char *)"delete_TextureAssignerShader", _wrap_delete_TextureAssignerShader, METH_VARARGS, NULL},
+	 { (char *)"TextureAssignerShader_swigregister", TextureAssignerShader_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_StrokeTextureShader", _wrap_new_StrokeTextureShader, METH_VARARGS, NULL},
+	 { (char *)"StrokeTextureShader_shade", _wrap_StrokeTextureShader_shade, METH_VARARGS, NULL},
+	 { (char *)"delete_StrokeTextureShader", _wrap_delete_StrokeTextureShader, METH_VARARGS, NULL},
+	 { (char *)"StrokeTextureShader_swigregister", StrokeTextureShader_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_BackboneStretcherShader", _wrap_new_BackboneStretcherShader, METH_VARARGS, NULL},
+	 { (char *)"BackboneStretcherShader_shade", _wrap_BackboneStretcherShader_shade, METH_VARARGS, NULL},
+	 { (char *)"delete_BackboneStretcherShader", _wrap_delete_BackboneStretcherShader, METH_VARARGS, NULL},
+	 { (char *)"BackboneStretcherShader_swigregister", BackboneStretcherShader_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_SamplingShader", _wrap_new_SamplingShader, METH_VARARGS, NULL},
+	 { (char *)"SamplingShader_shade", _wrap_SamplingShader_shade, METH_VARARGS, NULL},
+	 { (char *)"delete_SamplingShader", _wrap_delete_SamplingShader, METH_VARARGS, NULL},
+	 { (char *)"SamplingShader_swigregister", SamplingShader_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_ExternalContourStretcherShader", _wrap_new_ExternalContourStretcherShader, METH_VARARGS, NULL},
+	 { (char *)"ExternalContourStretcherShader_shade", _wrap_ExternalContourStretcherShader_shade, METH_VARARGS, NULL},
+	 { (char *)"delete_ExternalContourStretcherShader", _wrap_delete_ExternalContourStretcherShader, METH_VARARGS, NULL},
+	 { (char *)"ExternalContourStretcherShader_swigregister", ExternalContourStretcherShader_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_BSplineShader", _wrap_new_BSplineShader, METH_VARARGS, NULL},
+	 { (char *)"BSplineShader_shade", _wrap_BSplineShader_shade, METH_VARARGS, NULL},
+	 { (char *)"delete_BSplineShader", _wrap_delete_BSplineShader, METH_VARARGS, NULL},
+	 { (char *)"BSplineShader_swigregister", BSplineShader_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_BezierCurveShader", _wrap_new_BezierCurveShader, METH_VARARGS, NULL},
+	 { (char *)"BezierCurveShader_shade", _wrap_BezierCurveShader_shade, METH_VARARGS, NULL},
+	 { (char *)"delete_BezierCurveShader", _wrap_delete_BezierCurveShader, METH_VARARGS, NULL},
+	 { (char *)"BezierCurveShader_swigregister", BezierCurveShader_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_InflateShader", _wrap_new_InflateShader, METH_VARARGS, NULL},
+	 { (char *)"InflateShader_shade", _wrap_InflateShader_shade, METH_VARARGS, NULL},
+	 { (char *)"delete_InflateShader", _wrap_delete_InflateShader, METH_VARARGS, NULL},
+	 { (char *)"InflateShader_swigregister", InflateShader_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_PolygonalizationShader", _wrap_new_PolygonalizationShader, METH_VARARGS, NULL},
+	 { (char *)"PolygonalizationShader_shade", _wrap_PolygonalizationShader_shade, METH_VARARGS, NULL},
+	 { (char *)"delete_PolygonalizationShader", _wrap_delete_PolygonalizationShader, METH_VARARGS, NULL},
+	 { (char *)"PolygonalizationShader_swigregister", PolygonalizationShader_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_GuidingLinesShader", _wrap_new_GuidingLinesShader, METH_VARARGS, NULL},
+	 { (char *)"GuidingLinesShader_shade", _wrap_GuidingLinesShader_shade, METH_VARARGS, NULL},
+	 { (char *)"delete_GuidingLinesShader", _wrap_delete_GuidingLinesShader, METH_VARARGS, NULL},
+	 { (char *)"GuidingLinesShader_swigregister", GuidingLinesShader_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_TipRemoverShader", _wrap_new_TipRemoverShader, METH_VARARGS, NULL},
+	 { (char *)"delete_TipRemoverShader", _wrap_delete_TipRemoverShader, METH_VARARGS, NULL},
+	 { (char *)"TipRemoverShader_shade", _wrap_TipRemoverShader_shade, METH_VARARGS, NULL},
+	 { (char *)"TipRemoverShader_swigregister", TipRemoverShader_swigregister, METH_VARARGS, NULL},
+	 { (char *)"delete_streamShader", _wrap_delete_streamShader, METH_VARARGS, NULL},
+	 { (char *)"streamShader_getName", _wrap_streamShader_getName, METH_VARARGS, NULL},
+	 { (char *)"streamShader_shade", _wrap_streamShader_shade, METH_VARARGS, NULL},
+	 { (char *)"new_streamShader", _wrap_new_streamShader, METH_VARARGS, NULL},
+	 { (char *)"streamShader_swigregister", streamShader_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_fstreamShader", _wrap_new_fstreamShader, METH_VARARGS, NULL},
+	 { (char *)"delete_fstreamShader", _wrap_delete_fstreamShader, METH_VARARGS, NULL},
+	 { (char *)"fstreamShader_getName", _wrap_fstreamShader_getName, METH_VARARGS, NULL},
+	 { (char *)"fstreamShader_shade", _wrap_fstreamShader_shade, METH_VARARGS, NULL},
+	 { (char *)"fstreamShader_swigregister", fstreamShader_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_CalligraphicShader", _wrap_new_CalligraphicShader, METH_VARARGS, NULL},
+	 { (char *)"delete_CalligraphicShader", _wrap_delete_CalligraphicShader, METH_VARARGS, NULL},
+	 { (char *)"CalligraphicShader_shade", _wrap_CalligraphicShader_shade, METH_VARARGS, NULL},
+	 { (char *)"CalligraphicShader_swigregister", CalligraphicShader_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_SpatialNoiseShader", _wrap_new_SpatialNoiseShader, METH_VARARGS, NULL},
+	 { (char *)"delete_SpatialNoiseShader", _wrap_delete_SpatialNoiseShader, METH_VARARGS, NULL},
+	 { (char *)"SpatialNoiseShader_shade", _wrap_SpatialNoiseShader_shade, METH_VARARGS, NULL},
+	 { (char *)"SpatialNoiseShader_swigregister", SpatialNoiseShader_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_SmoothingShader", _wrap_new_SmoothingShader, METH_VARARGS, NULL},
+	 { (char *)"delete_SmoothingShader", _wrap_delete_SmoothingShader, METH_VARARGS, NULL},
+	 { (char *)"SmoothingShader_shade", _wrap_SmoothingShader_shade, METH_VARARGS, NULL},
+	 { (char *)"SmoothingShader_swigregister", SmoothingShader_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_Smoother", _wrap_new_Smoother, METH_VARARGS, NULL},
+	 { (char *)"delete_Smoother", _wrap_delete_Smoother, METH_VARARGS, NULL},
+	 { (char *)"Smoother_smooth", _wrap_Smoother_smooth, METH_VARARGS, NULL},
+	 { (char *)"Smoother_computeCurvature", _wrap_Smoother_computeCurvature, METH_VARARGS, NULL},
+	 { (char *)"Smoother_swigregister", Smoother_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_Omitter", _wrap_new_Omitter, METH_VARARGS, NULL},
+	 { (char *)"delete_Omitter", _wrap_delete_Omitter, METH_VARARGS, NULL},
+	 { (char *)"Omitter_omit", _wrap_Omitter_omit, METH_VARARGS, NULL},
+	 { (char *)"Omitter_swigregister", Omitter_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_OmissionShader", _wrap_new_OmissionShader, METH_VARARGS, NULL},
+	 { (char *)"delete_OmissionShader", _wrap_delete_OmissionShader, METH_VARARGS, NULL},
+	 { (char *)"OmissionShader_shade", _wrap_OmissionShader_shade, METH_VARARGS, NULL},
+	 { (char *)"OmissionShader_swigregister", OmissionShader_swigregister, METH_VARARGS, NULL},
+	 { (char *)"Operators_select", _wrap_Operators_select, METH_VARARGS, NULL},
+	 { (char *)"Operators_chain", _wrap_Operators_chain, METH_VARARGS, NULL},
+	 { (char *)"Operators_bidirectionalChain", _wrap_Operators_bidirectionalChain, METH_VARARGS, NULL},
+	 { (char *)"Operators_sequentialSplit", _wrap_Operators_sequentialSplit, METH_VARARGS, NULL},
+	 { (char *)"Operators_recursiveSplit", _wrap_Operators_recursiveSplit, METH_VARARGS, NULL},
+	 { (char *)"Operators_sort", _wrap_Operators_sort, METH_VARARGS, NULL},
+	 { (char *)"Operators_create", _wrap_Operators_create, METH_VARARGS, NULL},
+	 { (char *)"Operators_getViewEdgeFromIndex", _wrap_Operators_getViewEdgeFromIndex, METH_VARARGS, NULL},
+	 { (char *)"Operators_getChainFromIndex", _wrap_Operators_getChainFromIndex, METH_VARARGS, NULL},
+	 { (char *)"Operators_getStrokeFromIndex", _wrap_Operators_getStrokeFromIndex, METH_VARARGS, NULL},
+	 { (char *)"Operators_getViewEdgesSize", _wrap_Operators_getViewEdgesSize, METH_VARARGS, NULL},
+	 { (char *)"Operators_getChainsSize", _wrap_Operators_getChainsSize, METH_VARARGS, NULL},
+	 { (char *)"Operators_getStrokesSize", _wrap_Operators_getStrokesSize, METH_VARARGS, NULL},
+	 { (char *)"delete_Operators", _wrap_delete_Operators, METH_VARARGS, NULL},
+	 { (char *)"Operators_swigregister", Operators_swigregister, METH_VARARGS, NULL},
+	 { (char *)"ltstr___call__", _wrap_ltstr___call__, METH_VARARGS, NULL},
+	 { (char *)"new_ltstr", _wrap_new_ltstr, METH_VARARGS, NULL},
+	 { (char *)"delete_ltstr", _wrap_delete_ltstr, METH_VARARGS, NULL},
+	 { (char *)"ltstr_swigregister", ltstr_swigregister, METH_VARARGS, NULL},
+	 { (char *)"Canvas_getInstance", _wrap_Canvas_getInstance, METH_VARARGS, NULL},
+	 { (char *)"delete_Canvas", _wrap_delete_Canvas, METH_VARARGS, NULL},
+	 { (char *)"Canvas_preDraw", _wrap_Canvas_preDraw, METH_VARARGS, NULL},
+	 { (char *)"Canvas_Draw", _wrap_Canvas_Draw, METH_VARARGS, NULL},
+	 { (char *)"Canvas_postDraw", _wrap_Canvas_postDraw, METH_VARARGS, NULL},
+	 { (char *)"Canvas_Render", _wrap_Canvas_Render, METH_VARARGS, NULL},
+	 { (char *)"Canvas_RenderBasic", _wrap_Canvas_RenderBasic, METH_VARARGS, NULL},
+	 { (char *)"Canvas_RenderStroke", _wrap_Canvas_RenderStroke, METH_VARARGS, NULL},
+	 { (char *)"Canvas_init", _wrap_Canvas_init, METH_VARARGS, NULL},
+	 { (char *)"Canvas_Clear", _wrap_Canvas_Clear, METH_VARARGS, NULL},
+	 { (char *)"Canvas_Erase", _wrap_Canvas_Erase, METH_VARARGS, NULL},
+	 { (char *)"Canvas_readColorPixels", _wrap_Canvas_readColorPixels, METH_VARARGS, NULL},
+	 { (char *)"Canvas_readDepthPixels", _wrap_Canvas_readDepthPixels, METH_VARARGS, NULL},
+	 { (char *)"Canvas_update", _wrap_Canvas_update, METH_VARARGS, NULL},
+	 { (char *)"Canvas_isEmpty", _wrap_Canvas_isEmpty, METH_VARARGS, NULL},
+	 { (char *)"Canvas_loadMap", _wrap_Canvas_loadMap, METH_VARARGS, NULL},
+	 { (char *)"Canvas_readMapPixel", _wrap_Canvas_readMapPixel, METH_VARARGS, NULL},
+	 { (char *)"Canvas_loadSteerableViewMap", _wrap_Canvas_loadSteerableViewMap, METH_VARARGS, NULL},
+	 { (char *)"Canvas_getSteerableViewMap", _wrap_Canvas_getSteerableViewMap, METH_VARARGS, NULL},
+	 { (char *)"Canvas_selectedFEdge", _wrap_Canvas_selectedFEdge, METH_VARARGS, NULL},
+	 { (char *)"Canvas_width", _wrap_Canvas_width, METH_VARARGS, NULL},
+	 { (char *)"Canvas_height", _wrap_Canvas_height, METH_VARARGS, NULL},
+	 { (char *)"Canvas_currentPaperTextureIndex", _wrap_Canvas_currentPaperTextureIndex, METH_VARARGS, NULL},
+	 { (char *)"Canvas_scene3DBBox", _wrap_Canvas_scene3DBBox, METH_VARARGS, NULL},
+	 { (char *)"Canvas_renderer", _wrap_Canvas_renderer, METH_VARARGS, NULL},
+	 { (char *)"Canvas_getCurrentStyleModule", _wrap_Canvas_getCurrentStyleModule, METH_VARARGS, NULL},
+	 { (char *)"Canvas_getRecordFlag", _wrap_Canvas_getRecordFlag, METH_VARARGS, NULL},
+	 { (char *)"Canvas_SetSelectedFEdge", _wrap_Canvas_SetSelectedFEdge, METH_VARARGS, NULL},
+	 { (char *)"Canvas_InsertStyleModule", _wrap_Canvas_InsertStyleModule, METH_VARARGS, NULL},
+	 { (char *)"Canvas_RemoveStyleModule", _wrap_Canvas_RemoveStyleModule, METH_VARARGS, NULL},
+	 { (char *)"Canvas_SwapStyleModules", _wrap_Canvas_SwapStyleModules, METH_VARARGS, NULL},
+	 { (char *)"Canvas_ReplaceStyleModule", _wrap_Canvas_ReplaceStyleModule, METH_VARARGS, NULL},
+	 { (char *)"Canvas_SetVisible", _wrap_Canvas_SetVisible, METH_VARARGS, NULL},
+	 { (char *)"Canvas_AddLayer", _wrap_Canvas_AddLayer, METH_VARARGS, NULL},
+	 { (char *)"Canvas_SetCurrentPaperTextureIndex", _wrap_Canvas_SetCurrentPaperTextureIndex, METH_VARARGS, NULL},
+	 { (char *)"Canvas_changePaperTexture", _wrap_Canvas_changePaperTexture, METH_VARARGS, NULL},
+	 { (char *)"Canvas_togglePaperTexture", _wrap_Canvas_togglePaperTexture, METH_VARARGS, NULL},
+	 { (char *)"Canvas_resetModified", _wrap_Canvas_resetModified, METH_VARARGS, NULL},
+	 { (char *)"Canvas_causalStyleModules", _wrap_Canvas_causalStyleModules, METH_VARARGS, NULL},
+	 { (char *)"Canvas_setModified", _wrap_Canvas_setModified, METH_VARARGS, NULL},
+	 { (char *)"Canvas_swigregister", Canvas_swigregister, METH_VARARGS, NULL},
+	 { (char *)"castToSVertex", _wrap_castToSVertex, METH_VARARGS, NULL},
+	 { (char *)"castToViewVertex", _wrap_castToViewVertex, METH_VARARGS, NULL},
+	 { (char *)"castToTVertex", _wrap_castToTVertex, METH_VARARGS, NULL},
+	 { (char *)"castToCurvePoint", _wrap_castToCurvePoint, METH_VARARGS, NULL},
+	 { (char *)"castToStrokeVertex", _wrap_castToStrokeVertex, METH_VARARGS, NULL},
+	 { (char *)"castToNonTVertex", _wrap_castToNonTVertex, METH_VARARGS, NULL},
+	 { (char *)"castToFEdge", _wrap_castToFEdge, METH_VARARGS, NULL},
+	 { (char *)"castToViewEdge", _wrap_castToViewEdge, METH_VARARGS, NULL},
+	 { (char *)"castToStroke", _wrap_castToStroke, METH_VARARGS, NULL},
+	 { (char *)"castToChain", _wrap_castToChain, METH_VARARGS, NULL},
+	 { NULL, NULL, 0, NULL }
+};
+
+
+/* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
+
+static void *_p_Functions0D__GetOccludersF0DTo_p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t(void *x) {
+    return (void *)((UnaryFunction0D<std::vector<ViewShape *,std::allocator<ViewShape * > > > *)  ((Functions0D::GetOccludersF0D *) x));
+}
+static void *_p_Functions1D__GetOccludeeF1DTo_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t(void *x) {
+    return (void *)((UnaryFunction1D<std::vector<ViewShape *,std::allocator<ViewShape * > > > *)  ((Functions1D::GetOccludeeF1D *) x));
+}
+static void *_p_Functions1D__GetShapeF1DTo_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t(void *x) {
+    return (void *)((UnaryFunction1D<std::vector<ViewShape *,std::allocator<ViewShape * > > > *)  ((Functions1D::GetShapeF1D *) x));
+}
+static void *_p_Functions1D__GetOccludersF1DTo_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t(void *x) {
+    return (void *)((UnaryFunction1D<std::vector<ViewShape *,std::allocator<ViewShape * > > > *)  ((Functions1D::GetOccludersF1D *) x));
+}
+static void *_p_TVertexTo_p_Interface0D(void *x) {
+    return (void *)((Interface0D *) (ViewVertex *) ((TVertex *) x));
+}
+static void *_p_NonTVertexTo_p_Interface0D(void *x) {
+    return (void *)((Interface0D *) (ViewVertex *) ((NonTVertex *) x));
+}
+static void *_p_SVertexTo_p_Interface0D(void *x) {
+    return (void *)((Interface0D *)  ((SVertex *) x));
+}
+static void *_p_ViewVertexTo_p_Interface0D(void *x) {
+    return (void *)((Interface0D *)  ((ViewVertex *) x));
+}
+static void *_p_StrokeVertexTo_p_Interface0D(void *x) {
+    return (void *)((Interface0D *) (CurvePoint *) ((StrokeVertex *) x));
+}
+static void *_p_CurvePointTo_p_Interface0D(void *x) {
+    return (void *)((Interface0D *)  ((CurvePoint *) x));
+}
+static void *_p_Functions0D__GetShapeF0DTo_p_UnaryFunction0DTViewShape_p_t(void *x) {
+    return (void *)((UnaryFunction0D<ViewShape * > *)  ((Functions0D::GetShapeF0D *) x));
+}
+static void *_p_Functions0D__GetOccludeeF0DTo_p_UnaryFunction0DTViewShape_p_t(void *x) {
+    return (void *)((UnaryFunction0D<ViewShape * > *)  ((Functions0D::GetOccludeeF0D *) x));
+}
+static void *_p_ChainSilhouetteIteratorTo_p_ChainingIterator(void *x) {
+    return (void *)((ChainingIterator *)  ((ChainSilhouetteIterator *) x));
+}
+static void *_p_ChainPredicateIteratorTo_p_ChainingIterator(void *x) {
+    return (void *)((ChainingIterator *)  ((ChainPredicateIterator *) x));
+}
+static void *_p_ChainingIteratorTo_p_ViewEdgeInternal__ViewEdgeIterator(void *x) {
+    return (void *)((ViewEdgeInternal::ViewEdgeIterator *)  ((ChainingIterator *) x));
+}
+static void *_p_ChainSilhouetteIteratorTo_p_ViewEdgeInternal__ViewEdgeIterator(void *x) {
+    return (void *)((ViewEdgeInternal::ViewEdgeIterator *) (ChainingIterator *) ((ChainSilhouetteIterator *) x));
+}
+static void *_p_ChainPredicateIteratorTo_p_ViewEdgeInternal__ViewEdgeIterator(void *x) {
+    return (void *)((ViewEdgeInternal::ViewEdgeIterator *) (ChainingIterator *) ((ChainPredicateIterator *) x));
+}
+static void *_p_ViewEdgeTo_p_Interface1D(void *x) {
+    return (void *)((Interface1D *)  ((ViewEdge *) x));
+}
+static void *_p_StrokeTo_p_Interface1D(void *x) {
+    return (void *)((Interface1D *)  ((Stroke *) x));
+}
+static void *_p_CurveTo_p_Interface1D(void *x) {
+    return (void *)((Interface1D *)  ((Curve *) x));
+}
+static void *_p_FEdgeSharpTo_p_Interface1D(void *x) {
+    return (void *)((Interface1D *) (FEdge *) ((FEdgeSharp *) x));
+}
+static void *_p_FEdgeSmoothTo_p_Interface1D(void *x) {
+    return (void *)((Interface1D *) (FEdge *) ((FEdgeSmooth *) x));
+}
+static void *_p_FEdgeTo_p_Interface1D(void *x) {
+    return (void *)((Interface1D *)  ((FEdge *) x));
+}
+static void *_p_VecMat__Vec2Tint_tTo_p_VecMat__VecTint_2_t(void *x) {
+    return (void *)((VecMat::Vec<int,2 > *)  ((VecMat::Vec2<int > *) x));
+}
+static void *_p_VecMat__Vec2Tunsigned_int_tTo_p_VecMat__VecTunsigned_int_2_t(void *x) {
+    return (void *)((VecMat::Vec<unsigned int,2 > *)  ((VecMat::Vec2<unsigned int > *) x));
+}
+static void *_p_VecMat__Vec3Tint_tTo_p_VecMat__VecTint_3_t(void *x) {
+    return (void *)((VecMat::Vec<int,3 > *)  ((VecMat::Vec3<int > *) x));
+}
+static void *_p_VecMat__Vec3Tunsigned_int_tTo_p_VecMat__VecTunsigned_int_3_t(void *x) {
+    return (void *)((VecMat::Vec<unsigned int,3 > *)  ((VecMat::Vec3<unsigned int > *) x));
+}
+static void *_p_StrokeVertexTo_p_CurvePoint(void *x) {
+    return (void *)((CurvePoint *)  ((StrokeVertex *) x));
+}
+static void *_p_Predicates0D__TrueUP0DTo_p_UnaryPredicate0D(void *x) {
+    return (void *)((UnaryPredicate0D *)  ((Predicates0D::TrueUP0D *) x));
+}
+static void *_p_Predicates0D__FalseUP0DTo_p_UnaryPredicate0D(void *x) {
+    return (void *)((UnaryPredicate0D *)  ((Predicates0D::FalseUP0D *) x));
+}
+static void *_p_FEdgeSharpTo_p_FEdge(void *x) {
+    return (void *)((FEdge *)  ((FEdgeSharp *) x));
+}
+static void *_p_FEdgeSmoothTo_p_FEdge(void *x) {
+    return (void *)((FEdge *)  ((FEdgeSmooth *) x));
+}
+static void *_p_StrokeShaders__ConstrainedIncreasingThicknessShaderTo_p_StrokeShader(void *x) {
+    return (void *)((StrokeShader *)  ((StrokeShaders::ConstrainedIncreasingThicknessShader *) x));
+}
+static void *_p_StrokeShaders__ColorNoiseShaderTo_p_StrokeShader(void *x) {
+    return (void *)((StrokeShader *)  ((StrokeShaders::ColorNoiseShader *) x));
+}
+static void *_p_StrokeShaders__ThicknessNoiseShaderTo_p_StrokeShader(void *x) {
+    return (void *)((StrokeShader *)  ((StrokeShaders::ThicknessNoiseShader *) x));
+}
+static void *_p_StrokeShaders__LengthDependingThicknessShaderTo_p_StrokeShader(void *x) {
+    return (void *)((StrokeShader *)  ((StrokeShaders::LengthDependingThicknessShader *) x));
+}
+static void *_p_StrokeShaders__IncreasingThicknessShaderTo_p_StrokeShader(void *x) {
+    return (void *)((StrokeShader *)  ((StrokeShaders::IncreasingThicknessShader *) x));
+}
+static void *_p_StrokeShaders__ConstantExternThicknessShaderTo_p_StrokeShader(void *x) {
+    return (void *)((StrokeShader *)  ((StrokeShaders::ConstantExternThicknessShader *) x));
+}
+static void *_p_StrokeShaders__ConstantThicknessShaderTo_p_StrokeShader(void *x) {
+    return (void *)((StrokeShader *)  ((StrokeShaders::ConstantThicknessShader *) x));
+}
+static void *_p_StrokeShaders__StrokeTextureShaderTo_p_StrokeShader(void *x) {
+    return (void *)((StrokeShader *)  ((StrokeShaders::StrokeTextureShader *) x));
+}
+static void *_p_StrokeShaders__SamplingShaderTo_p_StrokeShader(void *x) {
+    return (void *)((StrokeShader *)  ((StrokeShaders::SamplingShader *) x));
+}
+static void *_p_StrokeShaders__BSplineShaderTo_p_StrokeShader(void *x) {
+    return (void *)((StrokeShader *)  ((StrokeShaders::BSplineShader *) x));
+}
+static void *_p_StrokeShaders__BezierCurveShaderTo_p_StrokeShader(void *x) {
+    return (void *)((StrokeShader *)  ((StrokeShaders::BezierCurveShader *) x));
+}
+static void *_p_StrokeShaders__InflateShaderTo_p_StrokeShader(void *x) {
+    return (void *)((StrokeShader *)  ((StrokeShaders::InflateShader *) x));
+}
+static void *_p_StrokeShaders__GuidingLinesShaderTo_p_StrokeShader(void *x) {
+    return (void *)((StrokeShader *)  ((StrokeShaders::GuidingLinesShader *) x));
+}
+static void *_p_StrokeShaders__streamShaderTo_p_StrokeShader(void *x) {
+    return (void *)((StrokeShader *)  ((StrokeShaders::streamShader *) x));
+}
+static void *_p_StrokeShaders__fstreamShaderTo_p_StrokeShader(void *x) {
+    return (void *)((StrokeShader *)  ((StrokeShaders::fstreamShader *) x));
+}
+static void *_p_CalligraphicShaderTo_p_StrokeShader(void *x) {
+    return (void *)((StrokeShader *)  ((CalligraphicShader *) x));
+}
+static void *_p_SpatialNoiseShaderTo_p_StrokeShader(void *x) {
+    return (void *)((StrokeShader *)  ((SpatialNoiseShader *) x));
+}
+static void *_p_SmoothingShaderTo_p_StrokeShader(void *x) {
+    return (void *)((StrokeShader *)  ((SmoothingShader *) x));
+}
+static void *_p_StrokeShaders__TextureAssignerShaderTo_p_StrokeShader(void *x) {
+    return (void *)((StrokeShader *)  ((StrokeShaders::TextureAssignerShader *) x));
+}
+static void *_p_StrokeShaders__CalligraphicColorShaderTo_p_StrokeShader(void *x) {
+    return (void *)((StrokeShader *)  ((StrokeShaders::CalligraphicColorShader *) x));
+}
+static void *_p_StrokeShaders__MaterialColorShaderTo_p_StrokeShader(void *x) {
+    return (void *)((StrokeShader *)  ((StrokeShaders::MaterialColorShader *) x));
+}
+static void *_p_StrokeShaders__ColorVariationPatternShaderTo_p_StrokeShader(void *x) {
+    return (void *)((StrokeShader *)  ((StrokeShaders::ColorVariationPatternShader *) x));
+}
+static void *_p_StrokeShaders__IncreasingColorShaderTo_p_StrokeShader(void *x) {
+    return (void *)((StrokeShader *)  ((StrokeShaders::IncreasingColorShader *) x));
+}
+static void *_p_StrokeShaders__ConstantColorShaderTo_p_StrokeShader(void *x) {
+    return (void *)((StrokeShader *)  ((StrokeShaders::ConstantColorShader *) x));
+}
+static void *_p_StrokeShaders__ThicknessVariationPatternShaderTo_p_StrokeShader(void *x) {
+    return (void *)((StrokeShader *)  ((StrokeShaders::ThicknessVariationPatternShader *) x));
+}
+static void *_p_StrokeShaders__BackboneStretcherShaderTo_p_StrokeShader(void *x) {
+    return (void *)((StrokeShader *)  ((StrokeShaders::BackboneStretcherShader *) x));
+}
+static void *_p_StrokeShaders__ExternalContourStretcherShaderTo_p_StrokeShader(void *x) {
+    return (void *)((StrokeShader *)  ((StrokeShaders::ExternalContourStretcherShader *) x));
+}
+static void *_p_StrokeShaders__PolygonalizationShaderTo_p_StrokeShader(void *x) {
+    return (void *)((StrokeShader *)  ((StrokeShaders::PolygonalizationShader *) x));
+}
+static void *_p_StrokeShaders__TipRemoverShaderTo_p_StrokeShader(void *x) {
+    return (void *)((StrokeShader *)  ((StrokeShaders::TipRemoverShader *) x));
+}
+static void *_p_OmissionShaderTo_p_StrokeShader(void *x) {
+    return (void *)((StrokeShader *)  ((OmissionShader *) x));
+}
+static void *_p_OmitterTo_p_Smoother(void *x) {
+    return (void *)((Smoother *)  ((Omitter *) x));
+}
+static void *_p_Predicates1D__Length2DBP1DTo_p_BinaryPredicate1D(void *x) {
+    return (void *)((BinaryPredicate1D *)  ((Predicates1D::Length2DBP1D *) x));
+}
+static void *_p_Predicates1D__FalseBP1DTo_p_BinaryPredicate1D(void *x) {
+    return (void *)((BinaryPredicate1D *)  ((Predicates1D::FalseBP1D *) x));
+}
+static void *_p_Predicates1D__ViewMapGradientNormBP1DTo_p_BinaryPredicate1D(void *x) {
+    return (void *)((BinaryPredicate1D *)  ((Predicates1D::ViewMapGradientNormBP1D *) x));
+}
+static void *_p_Predicates1D__TrueBP1DTo_p_BinaryPredicate1D(void *x) {
+    return (void *)((BinaryPredicate1D *)  ((Predicates1D::TrueBP1D *) x));
+}
+static void *_p_Predicates1D__SameShapeIdBP1DTo_p_BinaryPredicate1D(void *x) {
+    return (void *)((BinaryPredicate1D *)  ((Predicates1D::SameShapeIdBP1D *) x));
+}
+static void *_p_Predicates1D__FalseUP1DTo_p_UnaryPredicate1D(void *x) {
+    return (void *)((UnaryPredicate1D *)  ((Predicates1D::FalseUP1D *) x));
+}
+static void *_p_Predicates1D__ShapeUP1DTo_p_UnaryPredicate1D(void *x) {
+    return (void *)((UnaryPredicate1D *)  ((Predicates1D::ShapeUP1D *) x));
+}
+static void *_p_Predicates1D__DensityLowerThanUP1DTo_p_UnaryPredicate1D(void *x) {
+    return (void *)((UnaryPredicate1D *)  ((Predicates1D::DensityLowerThanUP1D *) x));
+}
+static void *_p_Predicates1D__EqualToTimeStampUP1DTo_p_UnaryPredicate1D(void *x) {
+    return (void *)((UnaryPredicate1D *)  ((Predicates1D::EqualToTimeStampUP1D *) x));
+}
+static void *_p_Predicates1D__EqualToChainingTimeStampUP1DTo_p_UnaryPredicate1D(void *x) {
+    return (void *)((UnaryPredicate1D *)  ((Predicates1D::EqualToChainingTimeStampUP1D *) x));
+}
+static void *_p_Predicates1D__TrueUP1DTo_p_UnaryPredicate1D(void *x) {
+    return (void *)((UnaryPredicate1D *)  ((Predicates1D::TrueUP1D *) x));
+}
+static void *_p_Predicates1D__QuantitativeInvisibilityUP1DTo_p_UnaryPredicate1D(void *x) {
+    return (void *)((UnaryPredicate1D *)  ((Predicates1D::QuantitativeInvisibilityUP1D *) x));
+}
+static void *_p_Predicates1D__ContourUP1DTo_p_UnaryPredicate1D(void *x) {
+    return (void *)((UnaryPredicate1D *)  ((Predicates1D::ContourUP1D *) x));
+}
+static void *_p_Predicates1D__ExternalContourUP1DTo_p_UnaryPredicate1D(void *x) {
+    return (void *)((UnaryPredicate1D *)  ((Predicates1D::ExternalContourUP1D *) x));
+}
+static void *_p_VecMat__Vec2Tfloat_tTo_p_VecMat__VecTfloat_2_t(void *x) {
+    return (void *)((VecMat::Vec<float,2 > *)  ((VecMat::Vec2<float > *) x));
+}
+static void *_p_Functions1D__TimeStampF1DTo_p_UnaryFunction1DTvoid_t(void *x) {
+    return (void *)((UnaryFunction1D<void > *)  ((Functions1D::TimeStampF1D *) x));
+}
+static void *_p_Functions1D__IncrementChainingTimeStampF1DTo_p_UnaryFunction1DTvoid_t(void *x) {
+    return (void *)((UnaryFunction1D<void > *)  ((Functions1D::IncrementChainingTimeStampF1D *) x));
+}
+static void *_p_Functions1D__ChainingTimeStampF1DTo_p_UnaryFunction1DTvoid_t(void *x) {
+    return (void *)((UnaryFunction1D<void > *)  ((Functions1D::ChainingTimeStampF1D *) x));
+}
+static void *_p_VecMat__Vec3Tfloat_tTo_p_VecMat__VecTfloat_3_t(void *x) {
+    return (void *)((VecMat::Vec<float,3 > *)  ((VecMat::Vec3<float > *) x));
+}
+static void *_p_FEdgeInternal__SVertexIteratorTo_p_Interface0DIteratorNested(void *x) {
+    return (void *)((Interface0DIteratorNested *)  ((FEdgeInternal::SVertexIterator *) x));
+}
+static void *_p_ViewEdgeInternal__SVertexIteratorTo_p_Interface0DIteratorNested(void *x) {
+    return (void *)((Interface0DIteratorNested *)  ((ViewEdgeInternal::SVertexIterator *) x));
+}
+static void *_p_CurveInternal__CurvePointIteratorTo_p_Interface0DIteratorNested(void *x) {
+    return (void *)((Interface0DIteratorNested *)  ((CurveInternal::CurvePointIterator *) x));
+}
+static void *_p_StrokeInternal__StrokeVertexIteratorTo_p_Interface0DIteratorNested(void *x) {
+    return (void *)((Interface0DIteratorNested *)  ((StrokeInternal::StrokeVertexIterator *) x));
+}
+static void *_p_Functions0D__VertexOrientation2DF0DTo_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t(void *x) {
+    return (void *)((UnaryFunction0D<VecMat::Vec2<float > > *)  ((Functions0D::VertexOrientation2DF0D *) x));
+}
+static void *_p_Functions0D__Normal2DF0DTo_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t(void *x) {
+    return (void *)((UnaryFunction0D<VecMat::Vec2<float > > *)  ((Functions0D::Normal2DF0D *) x));
+}
+static void *_p_Functions0D__VertexOrientation3DF0DTo_p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t(void *x) {
+    return (void *)((UnaryFunction0D<VecMat::Vec3<float > > *)  ((Functions0D::VertexOrientation3DF0D *) x));
+}
+static void *_p_Functions1D__Orientation2DF1DTo_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t(void *x) {
+    return (void *)((UnaryFunction1D<VecMat::Vec2<float > > *)  ((Functions1D::Orientation2DF1D *) x));
+}
+static void *_p_Functions1D__Normal2DF1DTo_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t(void *x) {
+    return (void *)((UnaryFunction1D<VecMat::Vec2<float > > *)  ((Functions1D::Normal2DF1D *) x));
+}
+static void *_p_Functions1D__Orientation3DF1DTo_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t(void *x) {
+    return (void *)((UnaryFunction1D<VecMat::Vec3<float > > *)  ((Functions1D::Orientation3DF1D *) x));
+}
+static void *_p_Functions0D__QuantitativeInvisibilityF0DTo_p_UnaryFunction0DTunsigned_int_t(void *x) {
+    return (void *)((UnaryFunction0D<unsigned int > *)  ((Functions0D::QuantitativeInvisibilityF0D *) x));
+}
+static void *_p_Functions1D__QuantitativeInvisibilityF1DTo_p_UnaryFunction1DTunsigned_int_t(void *x) {
+    return (void *)((UnaryFunction1D<unsigned int > *)  ((Functions1D::QuantitativeInvisibilityF1D *) x));
+}
+static void *_p_Functions0D__ShapeIdF0DTo_p_UnaryFunction0DTId_t(void *x) {
+    return (void *)((UnaryFunction0D<Id > *)  ((Functions0D::ShapeIdF0D *) x));
+}
+static void *_p_VecMat__Vec2Tdouble_tTo_p_VecMat__VecTdouble_2_t(void *x) {
+    return (void *)((VecMat::Vec<double,2 > *)  ((VecMat::Vec2<double > *) x));
+}
+static void *_p_TVertexTo_p_ViewVertex(void *x) {
+    return (void *)((ViewVertex *)  ((TVertex *) x));
+}
+static void *_p_NonTVertexTo_p_ViewVertex(void *x) {
+    return (void *)((ViewVertex *)  ((NonTVertex *) x));
+}
+static void *_p_Functions0D__ZDiscontinuityF0DTo_p_UnaryFunction0DTdouble_t(void *x) {
+    return (void *)((UnaryFunction0D<double > *)  ((Functions0D::ZDiscontinuityF0D *) x));
+}
+static void *_p_Functions0D__DensityF0DTo_p_UnaryFunction0DTdouble_t(void *x) {
+    return (void *)((UnaryFunction0D<double > *)  ((Functions0D::DensityF0D *) x));
+}
+static void *_p_Functions0D__GetXF0DTo_p_UnaryFunction0DTdouble_t(void *x) {
+    return (void *)((UnaryFunction0D<double > *)  ((Functions0D::GetXF0D *) x));
+}
+static void *_p_Functions0D__GetProjectedXF0DTo_p_UnaryFunction0DTdouble_t(void *x) {
+    return (void *)((UnaryFunction0D<double > *)  ((Functions0D::GetProjectedXF0D *) x));
+}
+static void *_p_Functions0D__Curvature2DAngleF0DTo_p_UnaryFunction0DTdouble_t(void *x) {
+    return (void *)((UnaryFunction0D<double > *)  ((Functions0D::Curvature2DAngleF0D *) x));
+}
+static void *_p_Functions0D__GetYF0DTo_p_UnaryFunction0DTdouble_t(void *x) {
+    return (void *)((UnaryFunction0D<double > *)  ((Functions0D::GetYF0D *) x));
+}
+static void *_p_Functions0D__GetProjectedYF0DTo_p_UnaryFunction0DTdouble_t(void *x) {
+    return (void *)((UnaryFunction0D<double > *)  ((Functions0D::GetProjectedYF0D *) x));
+}
+static void *_p_Functions0D__GetZF0DTo_p_UnaryFunction0DTdouble_t(void *x) {
+    return (void *)((UnaryFunction0D<double > *)  ((Functions0D::GetZF0D *) x));
+}
+static void *_p_Functions0D__GetProjectedZF0DTo_p_UnaryFunction0DTdouble_t(void *x) {
+    return (void *)((UnaryFunction0D<double > *)  ((Functions0D::GetProjectedZF0D *) x));
+}
+static void *_p_Functions0D__LocalAverageDepthF0DTo_p_UnaryFunction0DTdouble_t(void *x) {
+    return (void *)((UnaryFunction0D<double > *)  ((Functions0D::LocalAverageDepthF0D *) x));
+}
+static void *_p_Functions1D__GetSteerableViewMapDensityF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
+    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::GetSteerableViewMapDensityF1D *) x));
+}
+static void *_p_Functions1D__GetDirectionalViewMapDensityF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
+    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::GetDirectionalViewMapDensityF1D *) x));
+}
+static void *_p_Functions1D__GetCompleteViewMapDensityF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
+    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::GetCompleteViewMapDensityF1D *) x));
+}
+static void *_p_Functions1D__DensityF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
+    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::DensityF1D *) x));
+}
+static void *_p_Functions1D__ZDiscontinuityF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
+    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::ZDiscontinuityF1D *) x));
+}
+static void *_p_Functions1D__GetXF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
+    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::GetXF1D *) x));
+}
+static void *_p_Functions1D__GetZF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
+    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::GetZF1D *) x));
+}
+static void *_p_Functions1D__GetViewMapGradientNormF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
+    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::GetViewMapGradientNormF1D *) x));
+}
+static void *_p_Functions1D__GetProjectedYF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
+    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::GetProjectedYF1D *) x));
+}
+static void *_p_Functions1D__Curvature2DAngleF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
+    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::Curvature2DAngleF1D *) x));
+}
+static void *_p_Functions1D__GetYF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
+    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::GetYF1D *) x));
+}
+static void *_p_Functions1D__GetProjectedXF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
+    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::GetProjectedXF1D *) x));
+}
+static void *_p_Functions1D__LocalAverageDepthF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
+    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::LocalAverageDepthF1D *) x));
+}
+static void *_p_Functions1D__GetProjectedZF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
+    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::GetProjectedZF1D *) x));
+}
+static void *_p_Functions0D__GetCurvilinearAbscissaF0DTo_p_UnaryFunction0DTfloat_t(void *x) {
+    return (void *)((UnaryFunction0D<float > *)  ((Functions0D::GetCurvilinearAbscissaF0D *) x));
+}
+static void *_p_Functions0D__ReadMapPixelF0DTo_p_UnaryFunction0DTfloat_t(void *x) {
+    return (void *)((UnaryFunction0D<float > *)  ((Functions0D::ReadMapPixelF0D *) x));
+}
+static void *_p_Functions0D__ReadSteerableViewMapPixelF0DTo_p_UnaryFunction0DTfloat_t(void *x) {
+    return (void *)((UnaryFunction0D<float > *)  ((Functions0D::ReadSteerableViewMapPixelF0D *) x));
+}
+static void *_p_Functions0D__ReadCompleteViewMapPixelF0DTo_p_UnaryFunction0DTfloat_t(void *x) {
+    return (void *)((UnaryFunction0D<float > *)  ((Functions0D::ReadCompleteViewMapPixelF0D *) x));
+}
+static void *_p_Functions0D__GetViewMapGradientNormF0DTo_p_UnaryFunction0DTfloat_t(void *x) {
+    return (void *)((UnaryFunction0D<float > *)  ((Functions0D::GetViewMapGradientNormF0D *) x));
+}
+static void *_p_Functions0D__GetParameterF0DTo_p_UnaryFunction0DTfloat_t(void *x) {
+    return (void *)((UnaryFunction0D<float > *)  ((Functions0D::GetParameterF0D *) x));
+}
+static void *_p_VecMat__Vec3Tdouble_tTo_p_VecMat__VecTdouble_3_t(void *x) {
+    return (void *)((VecMat::Vec<double,3 > *)  ((VecMat::Vec3<double > *) x));
+}
+static swig_type_info _swigt__p_AdjacencyIterator = {"_p_AdjacencyIterator", "AdjacencyIterator *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_BBoxTVecMat__Vec3Tdouble_t_t = {"_p_BBoxTVecMat__Vec3Tdouble_t_t", "BBox<VecMat::Vec3<double > > *|BBox<Geometry::Vec3r > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_BinaryPredicate0D = {"_p_BinaryPredicate0D", "BinaryPredicate0D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_BinaryPredicate1D = {"_p_BinaryPredicate1D", "BinaryPredicate1D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_CalligraphicShader = {"_p_CalligraphicShader", "CalligraphicShader *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Canvas = {"_p_Canvas", "Canvas *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Chain = {"_p_Chain", "Chain *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_ChainPredicateIterator = {"_p_ChainPredicateIterator", "ChainPredicateIterator *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_ChainSilhouetteIterator = {"_p_ChainSilhouetteIterator", "ChainSilhouetteIterator *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_ChainingIterator = {"_p_ChainingIterator", "ChainingIterator *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_CurvatureInfo = {"_p_CurvatureInfo", "CurvatureInfo *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Curve = {"_p_Curve", "Curve *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_CurveInternal__CurvePointIterator = {"_p_CurveInternal__CurvePointIterator", "CurveInternal::CurvePointIterator *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_CurvePoint = {"_p_CurvePoint", "CurvePoint *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Curve__vertex_container__iterator = {"_p_Curve__vertex_container__iterator", "Curve::vertex_container::iterator *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_FEdge = {"_p_FEdge", "FEdge *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_FEdgeInternal__SVertexIterator = {"_p_FEdgeInternal__SVertexIterator", "FEdgeInternal::SVertexIterator *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_FEdgeSharp = {"_p_FEdgeSharp", "FEdgeSharp *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_FEdgeSmooth = {"_p_FEdgeSmooth", "FEdgeSmooth *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions0D__Curvature2DAngleF0D = {"_p_Functions0D__Curvature2DAngleF0D", "Functions0D::Curvature2DAngleF0D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions0D__CurveNatureF0D = {"_p_Functions0D__CurveNatureF0D", "Functions0D::CurveNatureF0D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions0D__DensityF0D = {"_p_Functions0D__DensityF0D", "Functions0D::DensityF0D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions0D__GetCurvilinearAbscissaF0D = {"_p_Functions0D__GetCurvilinearAbscissaF0D", "Functions0D::GetCurvilinearAbscissaF0D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions0D__GetOccludeeF0D = {"_p_Functions0D__GetOccludeeF0D", "Functions0D::GetOccludeeF0D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions0D__GetOccludersF0D = {"_p_Functions0D__GetOccludersF0D", "Functions0D::GetOccludersF0D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions0D__GetParameterF0D = {"_p_Functions0D__GetParameterF0D", "Functions0D::GetParameterF0D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions0D__GetProjectedXF0D = {"_p_Functions0D__GetProjectedXF0D", "Functions0D::GetProjectedXF0D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions0D__GetProjectedYF0D = {"_p_Functions0D__GetProjectedYF0D", "Functions0D::GetProjectedYF0D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions0D__GetProjectedZF0D = {"_p_Functions0D__GetProjectedZF0D", "Functions0D::GetProjectedZF0D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions0D__GetShapeF0D = {"_p_Functions0D__GetShapeF0D", "Functions0D::GetShapeF0D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions0D__GetViewMapGradientNormF0D = {"_p_Functions0D__GetViewMapGradientNormF0D", "Functions0D::GetViewMapGradientNormF0D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions0D__GetXF0D = {"_p_Functions0D__GetXF0D", "Functions0D::GetXF0D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions0D__GetYF0D = {"_p_Functions0D__GetYF0D", "Functions0D::GetYF0D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions0D__GetZF0D = {"_p_Functions0D__GetZF0D", "Functions0D::GetZF0D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions0D__LocalAverageDepthF0D = {"_p_Functions0D__LocalAverageDepthF0D", "Functions0D::LocalAverageDepthF0D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions0D__MaterialF0D = {"_p_Functions0D__MaterialF0D", "Functions0D::MaterialF0D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions0D__Normal2DF0D = {"_p_Functions0D__Normal2DF0D", "Functions0D::Normal2DF0D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions0D__QuantitativeInvisibilityF0D = {"_p_Functions0D__QuantitativeInvisibilityF0D", "Functions0D::QuantitativeInvisibilityF0D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions0D__ReadCompleteViewMapPixelF0D = {"_p_Functions0D__ReadCompleteViewMapPixelF0D", "Functions0D::ReadCompleteViewMapPixelF0D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions0D__ReadMapPixelF0D = {"_p_Functions0D__ReadMapPixelF0D", "Functions0D::ReadMapPixelF0D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions0D__ReadSteerableViewMapPixelF0D = {"_p_Functions0D__ReadSteerableViewMapPixelF0D", "Functions0D::ReadSteerableViewMapPixelF0D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions0D__ShapeIdF0D = {"_p_Functions0D__ShapeIdF0D", "Functions0D::ShapeIdF0D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions0D__VertexOrientation2DF0D = {"_p_Functions0D__VertexOrientation2DF0D", "Functions0D::VertexOrientation2DF0D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions0D__VertexOrientation3DF0D = {"_p_Functions0D__VertexOrientation3DF0D", "Functions0D::VertexOrientation3DF0D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions0D__ZDiscontinuityF0D = {"_p_Functions0D__ZDiscontinuityF0D", "Functions0D::ZDiscontinuityF0D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions1D__ChainingTimeStampF1D = {"_p_Functions1D__ChainingTimeStampF1D", "Functions1D::ChainingTimeStampF1D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions1D__Curvature2DAngleF1D = {"_p_Functions1D__Curvature2DAngleF1D", "Functions1D::Curvature2DAngleF1D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions1D__CurveNatureF1D = {"_p_Functions1D__CurveNatureF1D", "Functions1D::CurveNatureF1D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions1D__DensityF1D = {"_p_Functions1D__DensityF1D", "Functions1D::DensityF1D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions1D__GetCompleteViewMapDensityF1D = {"_p_Functions1D__GetCompleteViewMapDensityF1D", "Functions1D::GetCompleteViewMapDensityF1D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions1D__GetDirectionalViewMapDensityF1D = {"_p_Functions1D__GetDirectionalViewMapDensityF1D", "Functions1D::GetDirectionalViewMapDensityF1D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions1D__GetOccludeeF1D = {"_p_Functions1D__GetOccludeeF1D", "Functions1D::GetOccludeeF1D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions1D__GetOccludersF1D = {"_p_Functions1D__GetOccludersF1D", "Functions1D::GetOccludersF1D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions1D__GetProjectedXF1D = {"_p_Functions1D__GetProjectedXF1D", "Functions1D::GetProjectedXF1D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions1D__GetProjectedYF1D = {"_p_Functions1D__GetProjectedYF1D", "Functions1D::GetProjectedYF1D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions1D__GetProjectedZF1D = {"_p_Functions1D__GetProjectedZF1D", "Functions1D::GetProjectedZF1D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions1D__GetShapeF1D = {"_p_Functions1D__GetShapeF1D", "Functions1D::GetShapeF1D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions1D__GetSteerableViewMapDensityF1D = {"_p_Functions1D__GetSteerableViewMapDensityF1D", "Functions1D::GetSteerableViewMapDensityF1D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions1D__GetViewMapGradientNormF1D = {"_p_Functions1D__GetViewMapGradientNormF1D", "Functions1D::GetViewMapGradientNormF1D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions1D__GetXF1D = {"_p_Functions1D__GetXF1D", "Functions1D::GetXF1D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions1D__GetYF1D = {"_p_Functions1D__GetYF1D", "Functions1D::GetYF1D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions1D__GetZF1D = {"_p_Functions1D__GetZF1D", "Functions1D::GetZF1D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions1D__IncrementChainingTimeStampF1D = {"_p_Functions1D__IncrementChainingTimeStampF1D", "Functions1D::IncrementChainingTimeStampF1D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions1D__LocalAverageDepthF1D = {"_p_Functions1D__LocalAverageDepthF1D", "Functions1D::LocalAverageDepthF1D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions1D__Normal2DF1D = {"_p_Functions1D__Normal2DF1D", "Functions1D::Normal2DF1D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions1D__Orientation2DF1D = {"_p_Functions1D__Orientation2DF1D", "Functions1D::Orientation2DF1D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions1D__Orientation3DF1D = {"_p_Functions1D__Orientation3DF1D", "Functions1D::Orientation3DF1D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions1D__QuantitativeInvisibilityF1D = {"_p_Functions1D__QuantitativeInvisibilityF1D", "Functions1D::QuantitativeInvisibilityF1D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions1D__TimeStampF1D = {"_p_Functions1D__TimeStampF1D", "Functions1D::TimeStampF1D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Functions1D__ZDiscontinuityF1D = {"_p_Functions1D__ZDiscontinuityF1D", "Functions1D::ZDiscontinuityF1D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_GrayImage = {"_p_GrayImage", "GrayImage *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_I1DContainer = {"_p_I1DContainer", "I1DContainer *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Id = {"_p_Id", "Id *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_IntegrationType = {"_p_IntegrationType", "enum IntegrationType *|IntegrationType *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Interface0D = {"_p_Interface0D", "Interface0D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Interface0DIterator = {"_p_Interface0DIterator", "Interface0DIterator *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Interface0DIteratorNested = {"_p_Interface0DIteratorNested", "Interface0DIteratorNested *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Interface1D = {"_p_Interface1D", "Interface1D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Material = {"_p_Material", "Material *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_MediumType = {"_p_MediumType", "MediumType *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Module = {"_p_Module", "Module *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Noise = {"_p_Noise", "Noise *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_NonTVertex = {"_p_NonTVertex", "NonTVertex *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_OmissionShader = {"_p_OmissionShader", "OmissionShader *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Omitter = {"_p_Omitter", "Omitter *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Operators = {"_p_Operators", "Operators *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Point = {"_p_Point", "Point *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Polygon3r = {"_p_Polygon3r", "Polygon3r *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Predicates0D__FalseUP0D = {"_p_Predicates0D__FalseUP0D", "Predicates0D::FalseUP0D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Predicates0D__TrueUP0D = {"_p_Predicates0D__TrueUP0D", "Predicates0D::TrueUP0D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Predicates1D__ContourUP1D = {"_p_Predicates1D__ContourUP1D", "Predicates1D::ContourUP1D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Predicates1D__DensityLowerThanUP1D = {"_p_Predicates1D__DensityLowerThanUP1D", "Predicates1D::DensityLowerThanUP1D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Predicates1D__EqualToChainingTimeStampUP1D = {"_p_Predicates1D__EqualToChainingTimeStampUP1D", "Predicates1D::EqualToChainingTimeStampUP1D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Predicates1D__EqualToTimeStampUP1D = {"_p_Predicates1D__EqualToTimeStampUP1D", "Predicates1D::EqualToTimeStampUP1D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Predicates1D__ExternalContourUP1D = {"_p_Predicates1D__ExternalContourUP1D", "Predicates1D::ExternalContourUP1D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Predicates1D__FalseBP1D = {"_p_Predicates1D__FalseBP1D", "Predicates1D::FalseBP1D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Predicates1D__FalseUP1D = {"_p_Predicates1D__FalseUP1D", "Predicates1D::FalseUP1D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Predicates1D__Length2DBP1D = {"_p_Predicates1D__Length2DBP1D", "Predicates1D::Length2DBP1D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Predicates1D__QuantitativeInvisibilityUP1D = {"_p_Predicates1D__QuantitativeInvisibilityUP1D", "Predicates1D::QuantitativeInvisibilityUP1D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Predicates1D__SameShapeIdBP1D = {"_p_Predicates1D__SameShapeIdBP1D", "Predicates1D::SameShapeIdBP1D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Predicates1D__ShapeUP1D = {"_p_Predicates1D__ShapeUP1D", "Predicates1D::ShapeUP1D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Predicates1D__TrueBP1D = {"_p_Predicates1D__TrueBP1D", "Predicates1D::TrueBP1D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Predicates1D__TrueUP1D = {"_p_Predicates1D__TrueUP1D", "Predicates1D::TrueUP1D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Predicates1D__ViewMapGradientNormBP1D = {"_p_Predicates1D__ViewMapGradientNormBP1D", "Predicates1D::ViewMapGradientNormBP1D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_RGBImage = {"_p_RGBImage", "RGBImage *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_ReturnedValueType = {"_p_ReturnedValueType", "ReturnedValueType *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_SShape = {"_p_SShape", "SShape *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_SVertex = {"_p_SVertex", "SVertex *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_SVertex__fedges_container__iterator = {"_p_SVertex__fedges_container__iterator", "SVertex::fedges_container::iterator *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Smoother = {"_p_Smoother", "Smoother *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_SmoothingShader = {"_p_SmoothingShader", "SmoothingShader *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_SpatialNoiseShader = {"_p_SpatialNoiseShader", "SpatialNoiseShader *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_SteerableViewMap = {"_p_SteerableViewMap", "SteerableViewMap *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Stroke = {"_p_Stroke", "Stroke *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_StrokeAttribute = {"_p_StrokeAttribute", "StrokeAttribute *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_StrokeInternal__StrokeVertexIterator = {"_p_StrokeInternal__StrokeVertexIterator", "StrokeInternal::StrokeVertexIterator *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_StrokeLayer = {"_p_StrokeLayer", "StrokeLayer *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_StrokeRenderer = {"_p_StrokeRenderer", "StrokeRenderer *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_StrokeShader = {"_p_StrokeShader", "StrokeShader *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_StrokeShaders__BSplineShader = {"_p_StrokeShaders__BSplineShader", "StrokeShaders::BSplineShader *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_StrokeShaders__BackboneStretcherShader = {"_p_StrokeShaders__BackboneStretcherShader", "StrokeShaders::BackboneStretcherShader *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_StrokeShaders__BezierCurveShader = {"_p_StrokeShaders__BezierCurveShader", "StrokeShaders::BezierCurveShader *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_StrokeShaders__CalligraphicColorShader = {"_p_StrokeShaders__CalligraphicColorShader", "StrokeShaders::CalligraphicColorShader *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_StrokeShaders__ColorNoiseShader = {"_p_StrokeShaders__ColorNoiseShader", "StrokeShaders::ColorNoiseShader *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_StrokeShaders__ColorVariationPatternShader = {"_p_StrokeShaders__ColorVariationPatternShader", "StrokeShaders::ColorVariationPatternShader *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_StrokeShaders__ConstantColorShader = {"_p_StrokeShaders__ConstantColorShader", "StrokeShaders::ConstantColorShader *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_StrokeShaders__ConstantExternThicknessShader = {"_p_StrokeShaders__ConstantExternThicknessShader", "StrokeShaders::ConstantExternThicknessShader *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_StrokeShaders__ConstantThicknessShader = {"_p_StrokeShaders__ConstantThicknessShader", "StrokeShaders::ConstantThicknessShader *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_StrokeShaders__ConstrainedIncreasingThicknessShader = {"_p_StrokeShaders__ConstrainedIncreasingThicknessShader", "StrokeShaders::ConstrainedIncreasingThicknessShader *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_StrokeShaders__ExternalContourStretcherShader = {"_p_StrokeShaders__ExternalContourStretcherShader", "StrokeShaders::ExternalContourStretcherShader *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_StrokeShaders__GuidingLinesShader = {"_p_StrokeShaders__GuidingLinesShader", "StrokeShaders::GuidingLinesShader *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_StrokeShaders__IncreasingColorShader = {"_p_StrokeShaders__IncreasingColorShader", "StrokeShaders::IncreasingColorShader *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_StrokeShaders__IncreasingThicknessShader = {"_p_StrokeShaders__IncreasingThicknessShader", "StrokeShaders::IncreasingThicknessShader *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_StrokeShaders__InflateShader = {"_p_StrokeShaders__InflateShader", "StrokeShaders::InflateShader *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_StrokeShaders__LengthDependingThicknessShader = {"_p_StrokeShaders__LengthDependingThicknessShader", "StrokeShaders::LengthDependingThicknessShader *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_StrokeShaders__MaterialColorShader = {"_p_StrokeShaders__MaterialColorShader", "StrokeShaders::MaterialColorShader *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_StrokeShaders__PolygonalizationShader = {"_p_StrokeShaders__PolygonalizationShader", "StrokeShaders::PolygonalizationShader *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_StrokeShaders__SamplingShader = {"_p_StrokeShaders__SamplingShader", "StrokeShaders::SamplingShader *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_StrokeShaders__StrokeTextureShader = {"_p_StrokeShaders__StrokeTextureShader", "StrokeShaders::StrokeTextureShader *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_StrokeShaders__TextureAssignerShader = {"_p_StrokeShaders__TextureAssignerShader", "StrokeShaders::TextureAssignerShader *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_StrokeShaders__ThicknessNoiseShader = {"_p_StrokeShaders__ThicknessNoiseShader", "StrokeShaders::ThicknessNoiseShader *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_StrokeShaders__ThicknessVariationPatternShader = {"_p_StrokeShaders__ThicknessVariationPatternShader", "StrokeShaders::ThicknessVariationPatternShader *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_StrokeShaders__TipRemoverShader = {"_p_StrokeShaders__TipRemoverShader", "StrokeShaders::TipRemoverShader *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_StrokeShaders__fstreamShader = {"_p_StrokeShaders__fstreamShader", "StrokeShaders::fstreamShader *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_StrokeShaders__streamShader = {"_p_StrokeShaders__streamShader", "StrokeShaders::streamShader *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_StrokeVertex = {"_p_StrokeVertex", "StrokeVertex *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Stroke__vertex_container__iterator = {"_p_Stroke__vertex_container__iterator", "Stroke::vertex_container::iterator *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Stroke__viewedge_container__const_iterator = {"_p_Stroke__viewedge_container__const_iterator", "Stroke::viewedge_container::const_iterator *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Stroke__viewedge_container__iterator = {"_p_Stroke__viewedge_container__iterator", "Stroke::viewedge_container::iterator *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_StrokesContainer = {"_p_StrokesContainer", "StrokesContainer *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_StyleModule = {"_p_StyleModule", "StyleModule *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_TVertex = {"_p_TVertex", "TVertex *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction0DTId_t = {"_p_UnaryFunction0DTId_t", "UnaryFunction0D<Id > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t = {"_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t", "UnaryFunction0D<VecMat::Vec2<float > > *|UnaryFunction0D<Geometry::Vec2f > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t = {"_p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t", "UnaryFunction0D<VecMat::Vec3<float > > *|UnaryFunction0D<Geometry::Vec3f > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction0DTViewShape_p_t = {"_p_UnaryFunction0DTViewShape_p_t", "UnaryFunction0D<ViewShape * > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction0DTdouble_t = {"_p_UnaryFunction0DTdouble_t", "UnaryFunction0D<double > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction0DTfloat_t = {"_p_UnaryFunction0DTfloat_t", "UnaryFunction0D<float > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t = {"_p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t", "UnaryFunction0D<std::vector<ViewShape * > > *|UnaryFunction0D<std::vector<ViewShape *,std::allocator<ViewShape * > > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction0DTunsigned_int_t = {"_p_UnaryFunction0DTunsigned_int_t", "UnaryFunction0D<unsigned int > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction0DTvoid_t = {"_p_UnaryFunction0DTvoid_t", "UnaryFunction0D<void > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t = {"_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t", "UnaryFunction1D<VecMat::Vec2<float > > *|UnaryFunction1D<Geometry::Vec2f > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t = {"_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t", "UnaryFunction1D<VecMat::Vec3<float > > *|UnaryFunction1D<Geometry::Vec3f > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction1DTdouble_t = {"_p_UnaryFunction1DTdouble_t", "UnaryFunction1D<double > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction1DTfloat_t = {"_p_UnaryFunction1DTfloat_t", "UnaryFunction1D<float > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t = {"_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t", "UnaryFunction1D<std::vector<ViewShape * > > *|UnaryFunction1D<std::vector<ViewShape *,std::allocator<ViewShape * > > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction1DTunsigned_int_t = {"_p_UnaryFunction1DTunsigned_int_t", "UnaryFunction1D<unsigned int > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction1DTvoid_t = {"_p_UnaryFunction1DTvoid_t", "UnaryFunction1D<void > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryPredicate0D = {"_p_UnaryPredicate0D", "UnaryPredicate0D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryPredicate1D = {"_p_UnaryPredicate1D", "UnaryPredicate1D *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__HVec3Tdouble_t = {"_p_VecMat__HVec3Tdouble_t", "VecMat::HVec3<double > *|Geometry::HVec3r *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__HVec3Tfloat_t = {"_p_VecMat__HVec3Tfloat_t", "VecMat::HVec3<float > *|Geometry::HVec3f *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__HVec3Tint_t = {"_p_VecMat__HVec3Tint_t", "VecMat::HVec3<int > *|Geometry::HVec3i *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__HVec3Tunsigned_int_t = {"_p_VecMat__HVec3Tunsigned_int_t", "VecMat::HVec3<unsigned int > *|Geometry::HVec3u *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixTdouble_2_t = {"_p_VecMat__SquareMatrixTdouble_2_t", "VecMat::SquareMatrix<double,2 > *|Geometry::Matrix22r *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixTdouble_3_t = {"_p_VecMat__SquareMatrixTdouble_3_t", "VecMat::SquareMatrix<double,3 > *|Geometry::Matrix33r *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixTdouble_4_t = {"_p_VecMat__SquareMatrixTdouble_4_t", "VecMat::SquareMatrix<double,4 > *|Geometry::Matrix44r *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixTfloat_2_t = {"_p_VecMat__SquareMatrixTfloat_2_t", "VecMat::SquareMatrix<float,2 > *|Geometry::Matrix22f *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixTfloat_3_t = {"_p_VecMat__SquareMatrixTfloat_3_t", "VecMat::SquareMatrix<float,3 > *|Geometry::Matrix33f *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixTfloat_4_t = {"_p_VecMat__SquareMatrixTfloat_4_t", "VecMat::SquareMatrix<float,4 > *|Geometry::Matrix44f *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixTint_2_t = {"_p_VecMat__SquareMatrixTint_2_t", "VecMat::SquareMatrix<int,2 > *|Geometry::Matrix22i *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixTint_3_t = {"_p_VecMat__SquareMatrixTint_3_t", "VecMat::SquareMatrix<int,3 > *|Geometry::Matrix33i *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixTint_4_t = {"_p_VecMat__SquareMatrixTint_4_t", "VecMat::SquareMatrix<int,4 > *|Geometry::Matrix44i *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixTunsigned_int_2_t = {"_p_VecMat__SquareMatrixTunsigned_int_2_t", "VecMat::SquareMatrix<unsigned int,2 > *|Geometry::Matrix22u *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixTunsigned_int_3_t = {"_p_VecMat__SquareMatrixTunsigned_int_3_t", "VecMat::SquareMatrix<unsigned int,3 > *|Geometry::Matrix33u *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixTunsigned_int_4_t = {"_p_VecMat__SquareMatrixTunsigned_int_4_t", "VecMat::SquareMatrix<unsigned int,4 > *|Geometry::Matrix44u *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__Vec2Tdouble_t = {"_p_VecMat__Vec2Tdouble_t", "VecMat::Vec2<double > *|Geometry::Vec2d *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__Vec2Tfloat_t = {"_p_VecMat__Vec2Tfloat_t", "VecMat::Vec2<float > *|Geometry::Vec2f *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__Vec2Tint_t = {"_p_VecMat__Vec2Tint_t", "VecMat::Vec2<int > *|Geometry::Vec2i *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__Vec2Tunsigned_int_t = {"_p_VecMat__Vec2Tunsigned_int_t", "VecMat::Vec2<unsigned int > *|Geometry::Vec2u *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__Vec3Tdouble_t = {"_p_VecMat__Vec3Tdouble_t", "VecMat::Vec3<double > *|Geometry::Vec3r *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__Vec3Tfloat_t = {"_p_VecMat__Vec3Tfloat_t", "VecMat::Vec3<float > *|Geometry::Vec3f *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__Vec3Tint_t = {"_p_VecMat__Vec3Tint_t", "VecMat::Vec3<int > *|Geometry::Vec3i *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__Vec3Tunsigned_int_t = {"_p_VecMat__Vec3Tunsigned_int_t", "VecMat::Vec3<unsigned int > *|Geometry::Vec3u *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__VecTdouble_2_t = {"_p_VecMat__VecTdouble_2_t", "VecMat::Vec<double,2 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__VecTdouble_3_t = {"_p_VecMat__VecTdouble_3_t", "VecMat::Vec<double,3 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__VecTfloat_2_t = {"_p_VecMat__VecTfloat_2_t", "VecMat::Vec<float,2 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__VecTfloat_3_t = {"_p_VecMat__VecTfloat_3_t", "VecMat::Vec<float,3 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__VecTint_2_t = {"_p_VecMat__VecTint_2_t", "VecMat::Vec<int,2 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__VecTint_3_t = {"_p_VecMat__VecTint_3_t", "VecMat::Vec<int,3 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__VecTunsigned_int_2_t = {"_p_VecMat__VecTunsigned_int_2_t", "VecMat::Vec<unsigned int,2 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__VecTunsigned_int_3_t = {"_p_VecMat__VecTunsigned_int_3_t", "VecMat::Vec<unsigned int,3 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Vertex = {"_p_Vertex", "Vertex *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_ViewEdge = {"_p_ViewEdge", "ViewEdge *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_ViewEdgeInternal__SVertexIterator = {"_p_ViewEdgeInternal__SVertexIterator", "ViewEdgeInternal::SVertexIterator *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_ViewEdgeInternal__ViewEdgeIterator = {"_p_ViewEdgeInternal__ViewEdgeIterator", "ViewEdgeInternal::ViewEdgeIterator *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_ViewMap = {"_p_ViewMap", "ViewMap *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_ViewShape = {"_p_ViewShape", "ViewShape *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_ViewVertex = {"_p_ViewVertex", "ViewVertex *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t = {"_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t", "ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_const_traits > *|ViewVertex::const_edge_iterator *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t = {"_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t", "ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_nonconst_traits > *|ViewVertex::edge_iterator *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_ViewVertexInternal__orientedViewEdgeIterator = {"_p_ViewVertexInternal__orientedViewEdgeIterator", "ViewVertexInternal::orientedViewEdgeIterator *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_ViewVertexInternal__orientedViewEdgeIterator__edge_pointers_container__iterator = {"_p_ViewVertexInternal__orientedViewEdgeIterator__edge_pointers_container__iterator", "ViewVertexInternal::orientedViewEdgeIterator::edge_pointers_container::iterator *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_ViewVertexInternal__orientedViewEdgeIterator__edges_container__iterator = {"_p_ViewVertexInternal__orientedViewEdgeIterator__edges_container__iterator", "ViewVertexInternal::orientedViewEdgeIterator::edges_container::iterator *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_allocator_type = {"_p_allocator_type", "allocator_type *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_const_edge_iterator = {"_p_const_edge_iterator", "const_edge_iterator *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_const_fedge_iterator = {"_p_const_fedge_iterator", "const_fedge_iterator *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_const_point_iterator = {"_p_const_point_iterator", "const_point_iterator *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_const_reference = {"_p_const_reference", "const_reference *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_const_vertex_iterator = {"_p_const_vertex_iterator", "const_vertex_iterator *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_difference_type = {"_p_difference_type", "difference_type *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_directedViewEdge = {"_p_directedViewEdge", "directedViewEdge *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_double = {"_p_double", "double *|VecMat::Vec3<double >::value_type *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_edge_iterator = {"_p_edge_iterator", "edge_iterator *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_edge_pointers_container = {"_p_edge_pointers_container", "edge_pointers_container *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_edges_container = {"_p_edges_container", "edges_container *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_fedge_iterator = {"_p_fedge_iterator", "fedge_iterator *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_fedges_container = {"_p_fedges_container", "fedges_container *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_float = {"_p_float", "float *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_id_type = {"_p_id_type", "id_type *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_int = {"_p_int", "int *|VecMat::Vec3<int >::value_type *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_ltstr = {"_p_ltstr", "ltstr *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_mapsMap = {"_p_mapsMap", "mapsMap *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_occluder_container__const_iterator = {"_p_occluder_container__const_iterator", "occluder_container::const_iterator *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_p_PyObject = {"_p_p_PyObject", "PyObject **", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_point_iterator = {"_p_point_iterator", "point_iterator *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_point_type = {"_p_point_type", "point_type *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_reference = {"_p_reference", "reference *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_setTVecMat__Vec3Tdouble_t_t = {"_p_setTVecMat__Vec3Tdouble_t_t", "set<VecMat::Vec3<double > > *|set<Geometry::Vec3r > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_size_type = {"_p_size_type", "size_type *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__invalid_argument = {"_p_std__invalid_argument", "std::invalid_argument *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__pairTViewEdge_p_bool_t = {"_p_std__pairTViewEdge_p_bool_t", "std::pair<ViewEdge *,bool > *|ViewVertex::directedViewEdge *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t = {"_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t", "std::vector<FEdge * > *|std::vector<FEdge *,std::allocator<FEdge * > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__allocator_type = {"_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__allocator_type", "std::allocator<FEdge * > *|std::vector<FEdge * >::allocator_type *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorTMaterial_std__allocatorTMaterial_t_t = {"_p_std__vectorTMaterial_std__allocatorTMaterial_t_t", "std::vector<Material > *|std::vector<Material,std::allocator<Material > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t = {"_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t", "std::vector<SVertex * > *|ViewMap::svertices_container *|std::vector<SVertex *,std::allocator<SVertex * > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__allocator_type = {"_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__allocator_type", "std::allocator<SVertex * > *|std::vector<SVertex * >::allocator_type *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t = {"_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t", "std::vector<StrokeShader * > *|std::vector<StrokeShader *,std::allocator<StrokeShader * > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__allocator_type = {"_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__allocator_type", "std::allocator<StrokeShader * > *|std::vector<StrokeShader * >::allocator_type *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorTTVertex_p_std__allocatorTTVertex_p_t_t = {"_p_std__vectorTTVertex_p_std__allocatorTTVertex_p_t_t", "std::vector<TVertex * > *|std::vector<TVertex *,std::allocator<TVertex * > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorTVecMat__Vec2Tdouble_t_std__allocatorTVecMat__Vec2Tdouble_t_t_t = {"_p_std__vectorTVecMat__Vec2Tdouble_t_std__allocatorTVecMat__Vec2Tdouble_t_t_t", "std::vector<VecMat::Vec2<double > > *|std::vector<Geometry::Vec2r > *|std::vector<VecMat::Vec2<double >,std::allocator<VecMat::Vec2<double > > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t = {"_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t", "std::vector<ViewEdge * > *|std::vector<ViewEdge *,std::allocator<ViewEdge * > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__allocator_type = {"_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__allocator_type", "std::allocator<ViewEdge * > *|std::vector<ViewEdge * >::allocator_type *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t = {"_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t", "std::vector<ViewShape * > *|std::vector<ViewShape *,std::allocator<ViewShape * > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__allocator_type = {"_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__allocator_type", "std::allocator<ViewShape * > *|std::vector<ViewShape * >::allocator_type *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t = {"_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t", "std::vector<ViewVertex * > *|std::vector<ViewVertex *,std::allocator<ViewVertex * > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__allocator_type = {"_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__allocator_type", "std::allocator<ViewVertex * > *|std::vector<ViewVertex * >::allocator_type *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorTint_std__allocatorTint_t_t = {"_p_std__vectorTint_std__allocatorTint_t_t", "std::vector<int > *|std::vector<int,std::allocator<int > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorTint_std__allocatorTint_t_t__allocator_type = {"_p_std__vectorTint_std__allocatorTint_t_t__allocator_type", "std::allocator<int > *|std::vector<int >::allocator_type *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorTstd__pairTViewEdge_p_bool_t_std__allocatorTstd__pairTViewEdge_p_bool_t_t_t = {"_p_std__vectorTstd__pairTViewEdge_p_bool_t_std__allocatorTstd__pairTViewEdge_p_bool_t_t_t", "std::vector<std::pair<ViewEdge *,bool > > *|std::vector<ViewVertex::directedViewEdge > *|std::vector<std::pair<ViewEdge *,bool >,std::allocator<std::pair<ViewEdge *,bool > > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorTunsigned_int_std__allocatorTunsigned_int_t_t = {"_p_std__vectorTunsigned_int_std__allocatorTunsigned_int_t_t", "std::vector<unsigned int,std::allocator<unsigned int > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_svertices_container = {"_p_svertices_container", "svertices_container *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_swig__PySwigIterator = {"_p_swig__PySwigIterator", "swig::PySwigIterator *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_unsigned_int = {"_p_unsigned_int", "unsigned int *|VecMat::Vec3<unsigned int >::value_type *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_unsigned_short = {"_p_unsigned_short", "unsigned short *|Nature::EdgeNature *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_value_type = {"_p_value_type", "value_type *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_vertex_container = {"_p_vertex_container", "vertex_container *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_vertex_iterator = {"_p_vertex_iterator", "vertex_iterator *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_vertex_type = {"_p_vertex_type", "vertex_type *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_viewedge_container = {"_p_viewedge_container", "viewedge_container *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_viewedges_container = {"_p_viewedges_container", "viewedges_container *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_viewshapes_container = {"_p_viewshapes_container", "viewshapes_container *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_viewvertices_container = {"_p_viewvertices_container", "viewvertices_container *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_void = {"_p_void", "void *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type = {"_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type", "FEdge *|std::vector<FEdge * >::value_type", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type = {"_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type", "SVertex *|std::vector<SVertex * >::value_type", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type = {"_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type", "StrokeShader *|std::vector<StrokeShader * >::value_type", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type = {"_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type", "ViewEdge *|std::vector<ViewEdge * >::value_type", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type = {"_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type", "ViewShape *|std::vector<ViewShape * >::value_type", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type = {"_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type", "ViewVertex *|std::vector<ViewVertex * >::value_type", 0, 0, (void*)0, 0};
+
+static swig_type_info *swig_type_initial[] = {
+  &_swigt__p_AdjacencyIterator,
+  &_swigt__p_BBoxTVecMat__Vec3Tdouble_t_t,
+  &_swigt__p_BinaryPredicate0D,
+  &_swigt__p_BinaryPredicate1D,
+  &_swigt__p_CalligraphicShader,
+  &_swigt__p_Canvas,
+  &_swigt__p_Chain,
+  &_swigt__p_ChainPredicateIterator,
+  &_swigt__p_ChainSilhouetteIterator,
+  &_swigt__p_ChainingIterator,
+  &_swigt__p_CurvatureInfo,
+  &_swigt__p_Curve,
+  &_swigt__p_CurveInternal__CurvePointIterator,
+  &_swigt__p_CurvePoint,
+  &_swigt__p_Curve__vertex_container__iterator,
+  &_swigt__p_FEdge,
+  &_swigt__p_FEdgeInternal__SVertexIterator,
+  &_swigt__p_FEdgeSharp,
+  &_swigt__p_FEdgeSmooth,
+  &_swigt__p_Functions0D__Curvature2DAngleF0D,
+  &_swigt__p_Functions0D__CurveNatureF0D,
+  &_swigt__p_Functions0D__DensityF0D,
+  &_swigt__p_Functions0D__GetCurvilinearAbscissaF0D,
+  &_swigt__p_Functions0D__GetOccludeeF0D,
+  &_swigt__p_Functions0D__GetOccludersF0D,
+  &_swigt__p_Functions0D__GetParameterF0D,
+  &_swigt__p_Functions0D__GetProjectedXF0D,
+  &_swigt__p_Functions0D__GetProjectedYF0D,
+  &_swigt__p_Functions0D__GetProjectedZF0D,
+  &_swigt__p_Functions0D__GetShapeF0D,
+  &_swigt__p_Functions0D__GetViewMapGradientNormF0D,
+  &_swigt__p_Functions0D__GetXF0D,
+  &_swigt__p_Functions0D__GetYF0D,
+  &_swigt__p_Functions0D__GetZF0D,
+  &_swigt__p_Functions0D__LocalAverageDepthF0D,
+  &_swigt__p_Functions0D__MaterialF0D,
+  &_swigt__p_Functions0D__Normal2DF0D,
+  &_swigt__p_Functions0D__QuantitativeInvisibilityF0D,
+  &_swigt__p_Functions0D__ReadCompleteViewMapPixelF0D,
+  &_swigt__p_Functions0D__ReadMapPixelF0D,
+  &_swigt__p_Functions0D__ReadSteerableViewMapPixelF0D,
+  &_swigt__p_Functions0D__ShapeIdF0D,
+  &_swigt__p_Functions0D__VertexOrientation2DF0D,
+  &_swigt__p_Functions0D__VertexOrientation3DF0D,
+  &_swigt__p_Functions0D__ZDiscontinuityF0D,
+  &_swigt__p_Functions1D__ChainingTimeStampF1D,
+  &_swigt__p_Functions1D__Curvature2DAngleF1D,
+  &_swigt__p_Functions1D__CurveNatureF1D,
+  &_swigt__p_Functions1D__DensityF1D,
+  &_swigt__p_Functions1D__GetCompleteViewMapDensityF1D,
+  &_swigt__p_Functions1D__GetDirectionalViewMapDensityF1D,
+  &_swigt__p_Functions1D__GetOccludeeF1D,
+  &_swigt__p_Functions1D__GetOccludersF1D,
+  &_swigt__p_Functions1D__GetProjectedXF1D,
+  &_swigt__p_Functions1D__GetProjectedYF1D,
+  &_swigt__p_Functions1D__GetProjectedZF1D,
+  &_swigt__p_Functions1D__GetShapeF1D,
+  &_swigt__p_Functions1D__GetSteerableViewMapDensityF1D,
+  &_swigt__p_Functions1D__GetViewMapGradientNormF1D,
+  &_swigt__p_Functions1D__GetXF1D,
+  &_swigt__p_Functions1D__GetYF1D,
+  &_swigt__p_Functions1D__GetZF1D,
+  &_swigt__p_Functions1D__IncrementChainingTimeStampF1D,
+  &_swigt__p_Functions1D__LocalAverageDepthF1D,
+  &_swigt__p_Functions1D__Normal2DF1D,
+  &_swigt__p_Functions1D__Orientation2DF1D,
+  &_swigt__p_Functions1D__Orientation3DF1D,
+  &_swigt__p_Functions1D__QuantitativeInvisibilityF1D,
+  &_swigt__p_Functions1D__TimeStampF1D,
+  &_swigt__p_Functions1D__ZDiscontinuityF1D,
+  &_swigt__p_GrayImage,
+  &_swigt__p_I1DContainer,
+  &_swigt__p_Id,
+  &_swigt__p_IntegrationType,
+  &_swigt__p_Interface0D,
+  &_swigt__p_Interface0DIterator,
+  &_swigt__p_Interface0DIteratorNested,
+  &_swigt__p_Interface1D,
+  &_swigt__p_Material,
+  &_swigt__p_MediumType,
+  &_swigt__p_Module,
+  &_swigt__p_Noise,
+  &_swigt__p_NonTVertex,
+  &_swigt__p_OmissionShader,
+  &_swigt__p_Omitter,
+  &_swigt__p_Operators,
+  &_swigt__p_Point,
+  &_swigt__p_Polygon3r,
+  &_swigt__p_Predicates0D__FalseUP0D,
+  &_swigt__p_Predicates0D__TrueUP0D,
+  &_swigt__p_Predicates1D__ContourUP1D,
+  &_swigt__p_Predicates1D__DensityLowerThanUP1D,
+  &_swigt__p_Predicates1D__EqualToChainingTimeStampUP1D,
+  &_swigt__p_Predicates1D__EqualToTimeStampUP1D,
+  &_swigt__p_Predicates1D__ExternalContourUP1D,
+  &_swigt__p_Predicates1D__FalseBP1D,
+  &_swigt__p_Predicates1D__FalseUP1D,
+  &_swigt__p_Predicates1D__Length2DBP1D,
+  &_swigt__p_Predicates1D__QuantitativeInvisibilityUP1D,
+  &_swigt__p_Predicates1D__SameShapeIdBP1D,
+  &_swigt__p_Predicates1D__ShapeUP1D,
+  &_swigt__p_Predicates1D__TrueBP1D,
+  &_swigt__p_Predicates1D__TrueUP1D,
+  &_swigt__p_Predicates1D__ViewMapGradientNormBP1D,
+  &_swigt__p_RGBImage,
+  &_swigt__p_ReturnedValueType,
+  &_swigt__p_SShape,
+  &_swigt__p_SVertex,
+  &_swigt__p_SVertex__fedges_container__iterator,
+  &_swigt__p_Smoother,
+  &_swigt__p_SmoothingShader,
+  &_swigt__p_SpatialNoiseShader,
+  &_swigt__p_SteerableViewMap,
+  &_swigt__p_Stroke,
+  &_swigt__p_StrokeAttribute,
+  &_swigt__p_StrokeInternal__StrokeVertexIterator,
+  &_swigt__p_StrokeLayer,
+  &_swigt__p_StrokeRenderer,
+  &_swigt__p_StrokeShader,
+  &_swigt__p_StrokeShaders__BSplineShader,
+  &_swigt__p_StrokeShaders__BackboneStretcherShader,
+  &_swigt__p_StrokeShaders__BezierCurveShader,
+  &_swigt__p_StrokeShaders__CalligraphicColorShader,
+  &_swigt__p_StrokeShaders__ColorNoiseShader,
+  &_swigt__p_StrokeShaders__ColorVariationPatternShader,
+  &_swigt__p_StrokeShaders__ConstantColorShader,
+  &_swigt__p_StrokeShaders__ConstantExternThicknessShader,
+  &_swigt__p_StrokeShaders__ConstantThicknessShader,
+  &_swigt__p_StrokeShaders__ConstrainedIncreasingThicknessShader,
+  &_swigt__p_StrokeShaders__ExternalContourStretcherShader,
+  &_swigt__p_StrokeShaders__GuidingLinesShader,
+  &_swigt__p_StrokeShaders__IncreasingColorShader,
+  &_swigt__p_StrokeShaders__IncreasingThicknessShader,
+  &_swigt__p_StrokeShaders__InflateShader,
+  &_swigt__p_StrokeShaders__LengthDependingThicknessShader,
+  &_swigt__p_StrokeShaders__MaterialColorShader,
+  &_swigt__p_StrokeShaders__PolygonalizationShader,
+  &_swigt__p_StrokeShaders__SamplingShader,
+  &_swigt__p_StrokeShaders__StrokeTextureShader,
+  &_swigt__p_StrokeShaders__TextureAssignerShader,
+  &_swigt__p_StrokeShaders__ThicknessNoiseShader,
+  &_swigt__p_StrokeShaders__ThicknessVariationPatternShader,
+  &_swigt__p_StrokeShaders__TipRemoverShader,
+  &_swigt__p_StrokeShaders__fstreamShader,
+  &_swigt__p_StrokeShaders__streamShader,
+  &_swigt__p_StrokeVertex,
+  &_swigt__p_Stroke__vertex_container__iterator,
+  &_swigt__p_Stroke__viewedge_container__const_iterator,
+  &_swigt__p_Stroke__viewedge_container__iterator,
+  &_swigt__p_StrokesContainer,
+  &_swigt__p_StyleModule,
+  &_swigt__p_TVertex,
+  &_swigt__p_UnaryFunction0DTId_t,
+  &_swigt__p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t,
+  &_swigt__p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t,
+  &_swigt__p_UnaryFunction0DTViewShape_p_t,
+  &_swigt__p_UnaryFunction0DTdouble_t,
+  &_swigt__p_UnaryFunction0DTfloat_t,
+  &_swigt__p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t,
+  &_swigt__p_UnaryFunction0DTunsigned_int_t,
+  &_swigt__p_UnaryFunction0DTvoid_t,
+  &_swigt__p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t,
+  &_swigt__p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t,
+  &_swigt__p_UnaryFunction1DTdouble_t,
+  &_swigt__p_UnaryFunction1DTfloat_t,
+  &_swigt__p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t,
+  &_swigt__p_UnaryFunction1DTunsigned_int_t,
+  &_swigt__p_UnaryFunction1DTvoid_t,
+  &_swigt__p_UnaryPredicate0D,
+  &_swigt__p_UnaryPredicate1D,
+  &_swigt__p_VecMat__HVec3Tdouble_t,
+  &_swigt__p_VecMat__HVec3Tfloat_t,
+  &_swigt__p_VecMat__HVec3Tint_t,
+  &_swigt__p_VecMat__HVec3Tunsigned_int_t,
+  &_swigt__p_VecMat__SquareMatrixTdouble_2_t,
+  &_swigt__p_VecMat__SquareMatrixTdouble_3_t,
+  &_swigt__p_VecMat__SquareMatrixTdouble_4_t,
+  &_swigt__p_VecMat__SquareMatrixTfloat_2_t,
+  &_swigt__p_VecMat__SquareMatrixTfloat_3_t,
+  &_swigt__p_VecMat__SquareMatrixTfloat_4_t,
+  &_swigt__p_VecMat__SquareMatrixTint_2_t,
+  &_swigt__p_VecMat__SquareMatrixTint_3_t,
+  &_swigt__p_VecMat__SquareMatrixTint_4_t,
+  &_swigt__p_VecMat__SquareMatrixTunsigned_int_2_t,
+  &_swigt__p_VecMat__SquareMatrixTunsigned_int_3_t,
+  &_swigt__p_VecMat__SquareMatrixTunsigned_int_4_t,
+  &_swigt__p_VecMat__Vec2Tdouble_t,
+  &_swigt__p_VecMat__Vec2Tfloat_t,
+  &_swigt__p_VecMat__Vec2Tint_t,
+  &_swigt__p_VecMat__Vec2Tunsigned_int_t,
+  &_swigt__p_VecMat__Vec3Tdouble_t,
+  &_swigt__p_VecMat__Vec3Tfloat_t,
+  &_swigt__p_VecMat__Vec3Tint_t,
+  &_swigt__p_VecMat__Vec3Tunsigned_int_t,
+  &_swigt__p_VecMat__VecTdouble_2_t,
+  &_swigt__p_VecMat__VecTdouble_3_t,
+  &_swigt__p_VecMat__VecTfloat_2_t,
+  &_swigt__p_VecMat__VecTfloat_3_t,
+  &_swigt__p_VecMat__VecTint_2_t,
+  &_swigt__p_VecMat__VecTint_3_t,
+  &_swigt__p_VecMat__VecTunsigned_int_2_t,
+  &_swigt__p_VecMat__VecTunsigned_int_3_t,
+  &_swigt__p_Vertex,
+  &_swigt__p_ViewEdge,
+  &_swigt__p_ViewEdgeInternal__SVertexIterator,
+  &_swigt__p_ViewEdgeInternal__ViewEdgeIterator,
+  &_swigt__p_ViewMap,
+  &_swigt__p_ViewShape,
+  &_swigt__p_ViewVertex,
+  &_swigt__p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t,
+  &_swigt__p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t,
+  &_swigt__p_ViewVertexInternal__orientedViewEdgeIterator,
+  &_swigt__p_ViewVertexInternal__orientedViewEdgeIterator__edge_pointers_container__iterator,
+  &_swigt__p_ViewVertexInternal__orientedViewEdgeIterator__edges_container__iterator,
+  &_swigt__p_allocator_type,
+  &_swigt__p_char,
+  &_swigt__p_const_edge_iterator,
+  &_swigt__p_const_fedge_iterator,
+  &_swigt__p_const_point_iterator,
+  &_swigt__p_const_reference,
+  &_swigt__p_const_vertex_iterator,
+  &_swigt__p_difference_type,
+  &_swigt__p_directedViewEdge,
+  &_swigt__p_double,
+  &_swigt__p_edge_iterator,
+  &_swigt__p_edge_pointers_container,
+  &_swigt__p_edges_container,
+  &_swigt__p_fedge_iterator,
+  &_swigt__p_fedges_container,
+  &_swigt__p_float,
+  &_swigt__p_id_type,
+  &_swigt__p_int,
+  &_swigt__p_ltstr,
+  &_swigt__p_mapsMap,
+  &_swigt__p_occluder_container__const_iterator,
+  &_swigt__p_p_PyObject,
+  &_swigt__p_point_iterator,
+  &_swigt__p_point_type,
+  &_swigt__p_reference,
+  &_swigt__p_setTVecMat__Vec3Tdouble_t_t,
+  &_swigt__p_size_type,
+  &_swigt__p_std__invalid_argument,
+  &_swigt__p_std__pairTViewEdge_p_bool_t,
+  &_swigt__p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t,
+  &_swigt__p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__allocator_type,
+  &_swigt__p_std__vectorTMaterial_std__allocatorTMaterial_t_t,
+  &_swigt__p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t,
+  &_swigt__p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__allocator_type,
+  &_swigt__p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t,
+  &_swigt__p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__allocator_type,
+  &_swigt__p_std__vectorTTVertex_p_std__allocatorTTVertex_p_t_t,
+  &_swigt__p_std__vectorTVecMat__Vec2Tdouble_t_std__allocatorTVecMat__Vec2Tdouble_t_t_t,
+  &_swigt__p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t,
+  &_swigt__p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__allocator_type,
+  &_swigt__p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t,
+  &_swigt__p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__allocator_type,
+  &_swigt__p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t,
+  &_swigt__p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__allocator_type,
+  &_swigt__p_std__vectorTint_std__allocatorTint_t_t,
+  &_swigt__p_std__vectorTint_std__allocatorTint_t_t__allocator_type,
+  &_swigt__p_std__vectorTstd__pairTViewEdge_p_bool_t_std__allocatorTstd__pairTViewEdge_p_bool_t_t_t,
+  &_swigt__p_std__vectorTunsigned_int_std__allocatorTunsigned_int_t_t,
+  &_swigt__p_svertices_container,
+  &_swigt__p_swig__PySwigIterator,
+  &_swigt__p_unsigned_int,
+  &_swigt__p_unsigned_short,
+  &_swigt__p_value_type,
+  &_swigt__p_vertex_container,
+  &_swigt__p_vertex_iterator,
+  &_swigt__p_vertex_type,
+  &_swigt__p_viewedge_container,
+  &_swigt__p_viewedges_container,
+  &_swigt__p_viewshapes_container,
+  &_swigt__p_viewvertices_container,
+  &_swigt__p_void,
+  &_swigt__std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type,
+  &_swigt__std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type,
+  &_swigt__std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type,
+  &_swigt__std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type,
+  &_swigt__std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type,
+  &_swigt__std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type,
+};
+
+static swig_cast_info _swigc__p_AdjacencyIterator[] = {  {&_swigt__p_AdjacencyIterator, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_BBoxTVecMat__Vec3Tdouble_t_t[] = {  {&_swigt__p_BBoxTVecMat__Vec3Tdouble_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_BinaryPredicate0D[] = {  {&_swigt__p_BinaryPredicate0D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_BinaryPredicate1D[] = {  {&_swigt__p_Predicates1D__Length2DBP1D, _p_Predicates1D__Length2DBP1DTo_p_BinaryPredicate1D, 0, 0},  {&_swigt__p_Predicates1D__FalseBP1D, _p_Predicates1D__FalseBP1DTo_p_BinaryPredicate1D, 0, 0},  {&_swigt__p_BinaryPredicate1D, 0, 0, 0},  {&_swigt__p_Predicates1D__ViewMapGradientNormBP1D, _p_Predicates1D__ViewMapGradientNormBP1DTo_p_BinaryPredicate1D, 0, 0},  {&_swigt__p_Predicates1D__TrueBP1D, _p_Predicates1D__TrueBP1DTo_p_BinaryPredicate1D, 0, 0},  {&_swigt__p_Predicates1D__SameShapeIdBP1D, _p_Predicates1D__SameShapeIdBP1DTo_p_BinaryPredicate1D, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_CalligraphicShader[] = {  {&_swigt__p_CalligraphicShader, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Canvas[] = {  {&_swigt__p_Canvas, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Chain[] = {  {&_swigt__p_Chain, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_ChainPredicateIterator[] = {  {&_swigt__p_ChainPredicateIterator, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_ChainSilhouetteIterator[] = {  {&_swigt__p_ChainSilhouetteIterator, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_ChainingIterator[] = {  {&_swigt__p_ChainingIterator, 0, 0, 0},  {&_swigt__p_ChainSilhouetteIterator, _p_ChainSilhouetteIteratorTo_p_ChainingIterator, 0, 0},  {&_swigt__p_ChainPredicateIterator, _p_ChainPredicateIteratorTo_p_ChainingIterator, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_CurvatureInfo[] = {  {&_swigt__p_CurvatureInfo, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Curve[] = {  {&_swigt__p_Curve, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_CurveInternal__CurvePointIterator[] = {  {&_swigt__p_CurveInternal__CurvePointIterator, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_CurvePoint[] = {  {&_swigt__p_StrokeVertex, _p_StrokeVertexTo_p_CurvePoint, 0, 0},  {&_swigt__p_CurvePoint, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Curve__vertex_container__iterator[] = {  {&_swigt__p_Curve__vertex_container__iterator, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_FEdge[] = {  {&_swigt__p_FEdge, 0, 0, 0},  {&_swigt__p_FEdgeSharp, _p_FEdgeSharpTo_p_FEdge, 0, 0},  {&_swigt__p_FEdgeSmooth, _p_FEdgeSmoothTo_p_FEdge, 0, 0},  {&_swigt__std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_FEdgeInternal__SVertexIterator[] = {  {&_swigt__p_FEdgeInternal__SVertexIterator, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_FEdgeSharp[] = {  {&_swigt__p_FEdgeSharp, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_FEdgeSmooth[] = {  {&_swigt__p_FEdgeSmooth, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions0D__Curvature2DAngleF0D[] = {  {&_swigt__p_Functions0D__Curvature2DAngleF0D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions0D__CurveNatureF0D[] = {  {&_swigt__p_Functions0D__CurveNatureF0D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions0D__DensityF0D[] = {  {&_swigt__p_Functions0D__DensityF0D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions0D__GetCurvilinearAbscissaF0D[] = {  {&_swigt__p_Functions0D__GetCurvilinearAbscissaF0D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions0D__GetOccludeeF0D[] = {  {&_swigt__p_Functions0D__GetOccludeeF0D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions0D__GetOccludersF0D[] = {  {&_swigt__p_Functions0D__GetOccludersF0D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions0D__GetParameterF0D[] = {  {&_swigt__p_Functions0D__GetParameterF0D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions0D__GetProjectedXF0D[] = {  {&_swigt__p_Functions0D__GetProjectedXF0D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions0D__GetProjectedYF0D[] = {  {&_swigt__p_Functions0D__GetProjectedYF0D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions0D__GetProjectedZF0D[] = {  {&_swigt__p_Functions0D__GetProjectedZF0D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions0D__GetShapeF0D[] = {  {&_swigt__p_Functions0D__GetShapeF0D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions0D__GetViewMapGradientNormF0D[] = {  {&_swigt__p_Functions0D__GetViewMapGradientNormF0D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions0D__GetXF0D[] = {  {&_swigt__p_Functions0D__GetXF0D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions0D__GetYF0D[] = {  {&_swigt__p_Functions0D__GetYF0D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions0D__GetZF0D[] = {  {&_swigt__p_Functions0D__GetZF0D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions0D__LocalAverageDepthF0D[] = {  {&_swigt__p_Functions0D__LocalAverageDepthF0D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions0D__MaterialF0D[] = {  {&_swigt__p_Functions0D__MaterialF0D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions0D__Normal2DF0D[] = {  {&_swigt__p_Functions0D__Normal2DF0D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions0D__QuantitativeInvisibilityF0D[] = {  {&_swigt__p_Functions0D__QuantitativeInvisibilityF0D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions0D__ReadCompleteViewMapPixelF0D[] = {  {&_swigt__p_Functions0D__ReadCompleteViewMapPixelF0D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions0D__ReadMapPixelF0D[] = {  {&_swigt__p_Functions0D__ReadMapPixelF0D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions0D__ReadSteerableViewMapPixelF0D[] = {  {&_swigt__p_Functions0D__ReadSteerableViewMapPixelF0D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions0D__ShapeIdF0D[] = {  {&_swigt__p_Functions0D__ShapeIdF0D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions0D__VertexOrientation2DF0D[] = {  {&_swigt__p_Functions0D__VertexOrientation2DF0D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions0D__VertexOrientation3DF0D[] = {  {&_swigt__p_Functions0D__VertexOrientation3DF0D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions0D__ZDiscontinuityF0D[] = {  {&_swigt__p_Functions0D__ZDiscontinuityF0D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions1D__ChainingTimeStampF1D[] = {  {&_swigt__p_Functions1D__ChainingTimeStampF1D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions1D__Curvature2DAngleF1D[] = {  {&_swigt__p_Functions1D__Curvature2DAngleF1D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions1D__CurveNatureF1D[] = {  {&_swigt__p_Functions1D__CurveNatureF1D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions1D__DensityF1D[] = {  {&_swigt__p_Functions1D__DensityF1D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions1D__GetCompleteViewMapDensityF1D[] = {  {&_swigt__p_Functions1D__GetCompleteViewMapDensityF1D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions1D__GetDirectionalViewMapDensityF1D[] = {  {&_swigt__p_Functions1D__GetDirectionalViewMapDensityF1D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions1D__GetOccludeeF1D[] = {  {&_swigt__p_Functions1D__GetOccludeeF1D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions1D__GetOccludersF1D[] = {  {&_swigt__p_Functions1D__GetOccludersF1D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions1D__GetProjectedXF1D[] = {  {&_swigt__p_Functions1D__GetProjectedXF1D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions1D__GetProjectedYF1D[] = {  {&_swigt__p_Functions1D__GetProjectedYF1D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions1D__GetProjectedZF1D[] = {  {&_swigt__p_Functions1D__GetProjectedZF1D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions1D__GetShapeF1D[] = {  {&_swigt__p_Functions1D__GetShapeF1D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions1D__GetSteerableViewMapDensityF1D[] = {  {&_swigt__p_Functions1D__GetSteerableViewMapDensityF1D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions1D__GetViewMapGradientNormF1D[] = {  {&_swigt__p_Functions1D__GetViewMapGradientNormF1D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions1D__GetXF1D[] = {  {&_swigt__p_Functions1D__GetXF1D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions1D__GetYF1D[] = {  {&_swigt__p_Functions1D__GetYF1D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions1D__GetZF1D[] = {  {&_swigt__p_Functions1D__GetZF1D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions1D__IncrementChainingTimeStampF1D[] = {  {&_swigt__p_Functions1D__IncrementChainingTimeStampF1D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions1D__LocalAverageDepthF1D[] = {  {&_swigt__p_Functions1D__LocalAverageDepthF1D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions1D__Normal2DF1D[] = {  {&_swigt__p_Functions1D__Normal2DF1D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions1D__Orientation2DF1D[] = {  {&_swigt__p_Functions1D__Orientation2DF1D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions1D__Orientation3DF1D[] = {  {&_swigt__p_Functions1D__Orientation3DF1D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions1D__QuantitativeInvisibilityF1D[] = {  {&_swigt__p_Functions1D__QuantitativeInvisibilityF1D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions1D__TimeStampF1D[] = {  {&_swigt__p_Functions1D__TimeStampF1D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Functions1D__ZDiscontinuityF1D[] = {  {&_swigt__p_Functions1D__ZDiscontinuityF1D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_GrayImage[] = {  {&_swigt__p_GrayImage, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_I1DContainer[] = {  {&_swigt__p_I1DContainer, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Id[] = {  {&_swigt__p_Id, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_IntegrationType[] = {  {&_swigt__p_IntegrationType, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Interface0D[] = {  {&_swigt__std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, _p_SVertexTo_p_Interface0D, 0, 0},  {&_swigt__p_TVertex, _p_TVertexTo_p_Interface0D, 0, 0},  {&_swigt__p_NonTVertex, _p_NonTVertexTo_p_Interface0D, 0, 0},  {&_swigt__p_Interface0D, 0, 0, 0},  {&_swigt__p_SVertex, _p_SVertexTo_p_Interface0D, 0, 0},  {&_swigt__p_ViewVertex, _p_ViewVertexTo_p_Interface0D, 0, 0},  {&_swigt__std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, _p_ViewVertexTo_p_Interface0D, 0, 0},  {&_swigt__p_StrokeVertex, _p_StrokeVertexTo_p_Interface0D, 0, 0},  {&_swigt__p_CurvePoint, _p_CurvePointTo_p_Interface0D, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Interface0DIterator[] = {  {&_swigt__p_Interface0DIterator, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Interface0DIteratorNested[] = {  {&_swigt__p_Interface0DIteratorNested, 0, 0, 0},  {&_swigt__p_FEdgeInternal__SVertexIterator, _p_FEdgeInternal__SVertexIteratorTo_p_Interface0DIteratorNested, 0, 0},  {&_swigt__p_ViewEdgeInternal__SVertexIterator, _p_ViewEdgeInternal__SVertexIteratorTo_p_Interface0DIteratorNested, 0, 0},  {&_swigt__p_CurveInternal__CurvePointIterator, _p_CurveInternal__CurvePointIteratorTo_p_Interface0DIteratorNested, 0, 0},  {&_swigt__p_StrokeInternal__StrokeVertexIterator, _p_StrokeInternal__StrokeVertexIteratorTo_p_Interface0DIteratorNested, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Interface1D[] = {  {&_swigt__p_Interface1D, 0, 0, 0},  {&_swigt__p_ViewEdge, _p_ViewEdgeTo_p_Interface1D, 0, 0},  {&_swigt__std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_Curve, _p_CurveTo_p_Interface1D, 0, 0},  {&_swigt__p_Stroke, _p_StrokeTo_p_Interface1D, 0, 0},  {&_swigt__p_FEdgeSharp, _p_FEdgeSharpTo_p_Interface1D, 0, 0},  {&_swigt__p_FEdgeSmooth, _p_FEdgeSmoothTo_p_Interface1D, 0, 0},  {&_swigt__p_FEdge, _p_FEdgeTo_p_Interface1D, 0, 0},  {&_swigt__std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Material[] = {  {&_swigt__p_Material, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_MediumType[] = {  {&_swigt__p_MediumType, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Module[] = {  {&_swigt__p_Module, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Noise[] = {  {&_swigt__p_Noise, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_NonTVertex[] = {  {&_swigt__p_NonTVertex, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_OmissionShader[] = {  {&_swigt__p_OmissionShader, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Omitter[] = {  {&_swigt__p_Omitter, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Operators[] = {  {&_swigt__p_Operators, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Point[] = {  {&_swigt__p_Point, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Polygon3r[] = {  {&_swigt__p_Polygon3r, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Predicates0D__FalseUP0D[] = {  {&_swigt__p_Predicates0D__FalseUP0D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Predicates0D__TrueUP0D[] = {  {&_swigt__p_Predicates0D__TrueUP0D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Predicates1D__ContourUP1D[] = {  {&_swigt__p_Predicates1D__ContourUP1D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Predicates1D__DensityLowerThanUP1D[] = {  {&_swigt__p_Predicates1D__DensityLowerThanUP1D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Predicates1D__EqualToChainingTimeStampUP1D[] = {  {&_swigt__p_Predicates1D__EqualToChainingTimeStampUP1D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Predicates1D__EqualToTimeStampUP1D[] = {  {&_swigt__p_Predicates1D__EqualToTimeStampUP1D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Predicates1D__ExternalContourUP1D[] = {  {&_swigt__p_Predicates1D__ExternalContourUP1D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Predicates1D__FalseBP1D[] = {  {&_swigt__p_Predicates1D__FalseBP1D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Predicates1D__FalseUP1D[] = {  {&_swigt__p_Predicates1D__FalseUP1D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Predicates1D__Length2DBP1D[] = {  {&_swigt__p_Predicates1D__Length2DBP1D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Predicates1D__QuantitativeInvisibilityUP1D[] = {  {&_swigt__p_Predicates1D__QuantitativeInvisibilityUP1D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Predicates1D__SameShapeIdBP1D[] = {  {&_swigt__p_Predicates1D__SameShapeIdBP1D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Predicates1D__ShapeUP1D[] = {  {&_swigt__p_Predicates1D__ShapeUP1D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Predicates1D__TrueBP1D[] = {  {&_swigt__p_Predicates1D__TrueBP1D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Predicates1D__TrueUP1D[] = {  {&_swigt__p_Predicates1D__TrueUP1D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Predicates1D__ViewMapGradientNormBP1D[] = {  {&_swigt__p_Predicates1D__ViewMapGradientNormBP1D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_RGBImage[] = {  {&_swigt__p_RGBImage, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_ReturnedValueType[] = {  {&_swigt__p_ReturnedValueType, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_SShape[] = {  {&_swigt__p_SShape, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_SVertex[] = {  {&_swigt__std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_SVertex, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_SVertex__fedges_container__iterator[] = {  {&_swigt__p_SVertex__fedges_container__iterator, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Smoother[] = {  {&_swigt__p_Smoother, 0, 0, 0},  {&_swigt__p_Omitter, _p_OmitterTo_p_Smoother, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_SmoothingShader[] = {  {&_swigt__p_SmoothingShader, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_SpatialNoiseShader[] = {  {&_swigt__p_SpatialNoiseShader, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_SteerableViewMap[] = {  {&_swigt__p_SteerableViewMap, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Stroke[] = {  {&_swigt__p_Stroke, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_StrokeAttribute[] = {  {&_swigt__p_StrokeAttribute, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_StrokeInternal__StrokeVertexIterator[] = {  {&_swigt__p_StrokeInternal__StrokeVertexIterator, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_StrokeLayer[] = {  {&_swigt__p_StrokeLayer, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_StrokeRenderer[] = {  {&_swigt__p_StrokeRenderer, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_StrokeShader[] = {  {&_swigt__p_StrokeShaders__ConstrainedIncreasingThicknessShader, _p_StrokeShaders__ConstrainedIncreasingThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_StrokeShaders__ColorNoiseShader, _p_StrokeShaders__ColorNoiseShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ThicknessNoiseShader, _p_StrokeShaders__ThicknessNoiseShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__LengthDependingThicknessShader, _p_StrokeShaders__LengthDependingThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__IncreasingThicknessShader, _p_StrokeShaders__IncreasingThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ConstantExternThicknessShader, _p_StrokeShaders__ConstantExternThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ConstantThicknessShader, _p_StrokeShaders__ConstantThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__StrokeTextureShader, _p_StrokeShaders__StrokeTextureShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__SamplingShader, _p_StrokeShaders__SamplingShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__BSplineShader, _p_StrokeShaders__BSplineShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__BezierCurveShader, _p_StrokeShaders__BezierCurveShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__InflateShader, _p_StrokeShaders__InflateShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShader, 0, 0, 0},  {&_swigt__p_StrokeShaders__GuidingLinesShader, _p_StrokeShaders__GuidingLinesShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__streamShader, _p_StrokeShaders__streamShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__fstreamShader, _p_StrokeShaders__fstreamShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_CalligraphicShader, _p_CalligraphicShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_SpatialNoiseShader, _p_SpatialNoiseShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_SmoothingShader, _p_SmoothingShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__TextureAssignerShader, _p_StrokeShaders__TextureAssignerShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__CalligraphicColorShader, _p_StrokeShaders__CalligraphicColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__MaterialColorShader, _p_StrokeShaders__MaterialColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ColorVariationPatternShader, _p_StrokeShaders__ColorVariationPatternShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__IncreasingColorShader, _p_StrokeShaders__IncreasingColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ConstantColorShader, _p_StrokeShaders__ConstantColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ThicknessVariationPatternShader, _p_StrokeShaders__ThicknessVariationPatternShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__BackboneStretcherShader, _p_StrokeShaders__BackboneStretcherShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ExternalContourStretcherShader, _p_StrokeShaders__ExternalContourStretcherShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__PolygonalizationShader, _p_StrokeShaders__PolygonalizationShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__TipRemoverShader, _p_StrokeShaders__TipRemoverShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_OmissionShader, _p_OmissionShaderTo_p_StrokeShader, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_StrokeShaders__BSplineShader[] = {  {&_swigt__p_StrokeShaders__BSplineShader, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_StrokeShaders__BackboneStretcherShader[] = {  {&_swigt__p_StrokeShaders__BackboneStretcherShader, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_StrokeShaders__BezierCurveShader[] = {  {&_swigt__p_StrokeShaders__BezierCurveShader, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_StrokeShaders__CalligraphicColorShader[] = {  {&_swigt__p_StrokeShaders__CalligraphicColorShader, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_StrokeShaders__ColorNoiseShader[] = {  {&_swigt__p_StrokeShaders__ColorNoiseShader, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_StrokeShaders__ColorVariationPatternShader[] = {  {&_swigt__p_StrokeShaders__ColorVariationPatternShader, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_StrokeShaders__ConstantColorShader[] = {  {&_swigt__p_StrokeShaders__ConstantColorShader, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_StrokeShaders__ConstantExternThicknessShader[] = {  {&_swigt__p_StrokeShaders__ConstantExternThicknessShader, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_StrokeShaders__ConstantThicknessShader[] = {  {&_swigt__p_StrokeShaders__ConstantThicknessShader, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_StrokeShaders__ConstrainedIncreasingThicknessShader[] = {  {&_swigt__p_StrokeShaders__ConstrainedIncreasingThicknessShader, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_StrokeShaders__ExternalContourStretcherShader[] = {  {&_swigt__p_StrokeShaders__ExternalContourStretcherShader, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_StrokeShaders__GuidingLinesShader[] = {  {&_swigt__p_StrokeShaders__GuidingLinesShader, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_StrokeShaders__IncreasingColorShader[] = {  {&_swigt__p_StrokeShaders__IncreasingColorShader, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_StrokeShaders__IncreasingThicknessShader[] = {  {&_swigt__p_StrokeShaders__IncreasingThicknessShader, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_StrokeShaders__InflateShader[] = {  {&_swigt__p_StrokeShaders__InflateShader, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_StrokeShaders__LengthDependingThicknessShader[] = {  {&_swigt__p_StrokeShaders__LengthDependingThicknessShader, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_StrokeShaders__MaterialColorShader[] = {  {&_swigt__p_StrokeShaders__MaterialColorShader, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_StrokeShaders__PolygonalizationShader[] = {  {&_swigt__p_StrokeShaders__PolygonalizationShader, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_StrokeShaders__SamplingShader[] = {  {&_swigt__p_StrokeShaders__SamplingShader, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_StrokeShaders__StrokeTextureShader[] = {  {&_swigt__p_StrokeShaders__StrokeTextureShader, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_StrokeShaders__TextureAssignerShader[] = {  {&_swigt__p_StrokeShaders__TextureAssignerShader, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_StrokeShaders__ThicknessNoiseShader[] = {  {&_swigt__p_StrokeShaders__ThicknessNoiseShader, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_StrokeShaders__ThicknessVariationPatternShader[] = {  {&_swigt__p_StrokeShaders__ThicknessVariationPatternShader, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_StrokeShaders__TipRemoverShader[] = {  {&_swigt__p_StrokeShaders__TipRemoverShader, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_StrokeShaders__fstreamShader[] = {  {&_swigt__p_StrokeShaders__fstreamShader, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_StrokeShaders__streamShader[] = {  {&_swigt__p_StrokeShaders__streamShader, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_StrokeVertex[] = {  {&_swigt__p_StrokeVertex, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Stroke__vertex_container__iterator[] = {  {&_swigt__p_Stroke__vertex_container__iterator, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Stroke__viewedge_container__const_iterator[] = {  {&_swigt__p_Stroke__viewedge_container__const_iterator, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Stroke__viewedge_container__iterator[] = {  {&_swigt__p_Stroke__viewedge_container__iterator, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_StrokesContainer[] = {  {&_swigt__p_StrokesContainer, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_StyleModule[] = {  {&_swigt__p_StyleModule, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_TVertex[] = {  {&_swigt__p_TVertex, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction0DTId_t[] = {  {&_swigt__p_UnaryFunction0DTId_t, 0, 0, 0},  {&_swigt__p_Functions0D__ShapeIdF0D, _p_Functions0D__ShapeIdF0DTo_p_UnaryFunction0DTId_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t[] = {  {&_swigt__p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t, 0, 0, 0},  {&_swigt__p_Functions0D__VertexOrientation2DF0D, _p_Functions0D__VertexOrientation2DF0DTo_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t, 0, 0},  {&_swigt__p_Functions0D__Normal2DF0D, _p_Functions0D__Normal2DF0DTo_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t[] = {  {&_swigt__p_Functions0D__VertexOrientation3DF0D, _p_Functions0D__VertexOrientation3DF0DTo_p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t, 0, 0},  {&_swigt__p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction0DTViewShape_p_t[] = {  {&_swigt__p_Functions0D__GetShapeF0D, _p_Functions0D__GetShapeF0DTo_p_UnaryFunction0DTViewShape_p_t, 0, 0},  {&_swigt__p_Functions0D__GetOccludeeF0D, _p_Functions0D__GetOccludeeF0DTo_p_UnaryFunction0DTViewShape_p_t, 0, 0},  {&_swigt__p_UnaryFunction0DTViewShape_p_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction0DTdouble_t[] = {  {&_swigt__p_UnaryFunction0DTdouble_t, 0, 0, 0},  {&_swigt__p_Functions0D__ZDiscontinuityF0D, _p_Functions0D__ZDiscontinuityF0DTo_p_UnaryFunction0DTdouble_t, 0, 0},  {&_swigt__p_Functions0D__DensityF0D, _p_Functions0D__DensityF0DTo_p_UnaryFunction0DTdouble_t, 0, 0},  {&_swigt__p_Functions0D__GetXF0D, _p_Functions0D__GetXF0DTo_p_UnaryFunction0DTdouble_t, 0, 0},  {&_swigt__p_Functions0D__GetProjectedXF0D, _p_Functions0D__GetProjectedXF0DTo_p_UnaryFunction0DTdouble_t, 0, 0},  {&_swigt__p_Functions0D__Curvature2DAngleF0D, _p_Functions0D__Curvature2DAngleF0DTo_p_UnaryFunction0DTdouble_t, 0, 0},  {&_swigt__p_Functions0D__GetYF0D, _p_Functions0D__GetYF0DTo_p_UnaryFunction0DTdouble_t, 0, 0},  {&_swigt__p_Functions0D__GetProjectedYF0D, _p_Functions0D__GetProjectedYF0DTo_p_UnaryFunction0DTdouble_t, 0, 0},  {&_swigt__p_Functions0D__GetZF0D, _p_Functions0D__GetZF0DTo_p_UnaryFunction0DTdouble_t, 0, 0},  {&_swigt__p_Functions0D__GetProjectedZF0D, _p_Functions0D__GetProjectedZF0DTo_p_UnaryFunction0DTdouble_t, 0, 0},  {&_swigt__p_Functions0D__LocalAverageDepthF0D, _p_Functions0D__LocalAverageDepthF0DTo_p_UnaryFunction0DTdouble_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction0DTfloat_t[] = {  {&_swigt__p_Functions0D__GetCurvilinearAbscissaF0D, _p_Functions0D__GetCurvilinearAbscissaF0DTo_p_UnaryFunction0DTfloat_t, 0, 0},  {&_swigt__p_Functions0D__ReadMapPixelF0D, _p_Functions0D__ReadMapPixelF0DTo_p_UnaryFunction0DTfloat_t, 0, 0},  {&_swigt__p_Functions0D__ReadSteerableViewMapPixelF0D, _p_Functions0D__ReadSteerableViewMapPixelF0DTo_p_UnaryFunction0DTfloat_t, 0, 0},  {&_swigt__p_Functions0D__ReadCompleteViewMapPixelF0D, _p_Functions0D__ReadCompleteViewMapPixelF0DTo_p_UnaryFunction0DTfloat_t, 0, 0},  {&_swigt__p_Functions0D__GetViewMapGradientNormF0D, _p_Functions0D__GetViewMapGradientNormF0DTo_p_UnaryFunction0DTfloat_t, 0, 0},  {&_swigt__p_UnaryFunction0DTfloat_t, 0, 0, 0},  {&_swigt__p_Functions0D__GetParameterF0D, _p_Functions0D__GetParameterF0DTo_p_UnaryFunction0DTfloat_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t[] = {  {&_swigt__p_Functions0D__GetOccludersF0D, _p_Functions0D__GetOccludersF0DTo_p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0, 0},  {&_swigt__p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction0DTunsigned_int_t[] = {  {&_swigt__p_Functions0D__QuantitativeInvisibilityF0D, _p_Functions0D__QuantitativeInvisibilityF0DTo_p_UnaryFunction0DTunsigned_int_t, 0, 0},  {&_swigt__p_UnaryFunction0DTunsigned_int_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction0DTvoid_t[] = {  {&_swigt__p_UnaryFunction0DTvoid_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t[] = {  {&_swigt__p_Functions1D__Orientation2DF1D, _p_Functions1D__Orientation2DF1DTo_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, 0, 0},  {&_swigt__p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, 0, 0, 0},  {&_swigt__p_Functions1D__Normal2DF1D, _p_Functions1D__Normal2DF1DTo_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t[] = {  {&_swigt__p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t, 0, 0, 0},  {&_swigt__p_Functions1D__Orientation3DF1D, _p_Functions1D__Orientation3DF1DTo_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction1DTdouble_t[] = {  {&_swigt__p_Functions1D__GetSteerableViewMapDensityF1D, _p_Functions1D__GetSteerableViewMapDensityF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__GetDirectionalViewMapDensityF1D, _p_Functions1D__GetDirectionalViewMapDensityF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__GetCompleteViewMapDensityF1D, _p_Functions1D__GetCompleteViewMapDensityF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__DensityF1D, _p_Functions1D__DensityF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__ZDiscontinuityF1D, _p_Functions1D__ZDiscontinuityF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__GetXF1D, _p_Functions1D__GetXF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__GetZF1D, _p_Functions1D__GetZF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__GetViewMapGradientNormF1D, _p_Functions1D__GetViewMapGradientNormF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__GetProjectedYF1D, _p_Functions1D__GetProjectedYF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_UnaryFunction1DTdouble_t, 0, 0, 0},  {&_swigt__p_Functions1D__Curvature2DAngleF1D, _p_Functions1D__Curvature2DAngleF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__GetYF1D, _p_Functions1D__GetYF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__GetProjectedXF1D, _p_Functions1D__GetProjectedXF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__LocalAverageDepthF1D, _p_Functions1D__LocalAverageDepthF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__GetProjectedZF1D, _p_Functions1D__GetProjectedZF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction1DTfloat_t[] = {  {&_swigt__p_UnaryFunction1DTfloat_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t[] = {  {&_swigt__p_Functions1D__GetOccludeeF1D, _p_Functions1D__GetOccludeeF1DTo_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0, 0},  {&_swigt__p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0, 0, 0},  {&_swigt__p_Functions1D__GetShapeF1D, _p_Functions1D__GetShapeF1DTo_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0, 0},  {&_swigt__p_Functions1D__GetOccludersF1D, _p_Functions1D__GetOccludersF1DTo_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction1DTunsigned_int_t[] = {  {&_swigt__p_Functions1D__QuantitativeInvisibilityF1D, _p_Functions1D__QuantitativeInvisibilityF1DTo_p_UnaryFunction1DTunsigned_int_t, 0, 0},  {&_swigt__p_UnaryFunction1DTunsigned_int_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction1DTvoid_t[] = {  {&_swigt__p_UnaryFunction1DTvoid_t, 0, 0, 0},  {&_swigt__p_Functions1D__TimeStampF1D, _p_Functions1D__TimeStampF1DTo_p_UnaryFunction1DTvoid_t, 0, 0},  {&_swigt__p_Functions1D__IncrementChainingTimeStampF1D, _p_Functions1D__IncrementChainingTimeStampF1DTo_p_UnaryFunction1DTvoid_t, 0, 0},  {&_swigt__p_Functions1D__ChainingTimeStampF1D, _p_Functions1D__ChainingTimeStampF1DTo_p_UnaryFunction1DTvoid_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryPredicate0D[] = {  {&_swigt__p_Predicates0D__TrueUP0D, _p_Predicates0D__TrueUP0DTo_p_UnaryPredicate0D, 0, 0},  {&_swigt__p_Predicates0D__FalseUP0D, _p_Predicates0D__FalseUP0DTo_p_UnaryPredicate0D, 0, 0},  {&_swigt__p_UnaryPredicate0D, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryPredicate1D[] = {  {&_swigt__p_Predicates1D__FalseUP1D, _p_Predicates1D__FalseUP1DTo_p_UnaryPredicate1D, 0, 0},  {&_swigt__p_Predicates1D__ShapeUP1D, _p_Predicates1D__ShapeUP1DTo_p_UnaryPredicate1D, 0, 0},  {&_swigt__p_Predicates1D__DensityLowerThanUP1D, _p_Predicates1D__DensityLowerThanUP1DTo_p_UnaryPredicate1D, 0, 0},  {&_swigt__p_UnaryPredicate1D, 0, 0, 0},  {&_swigt__p_Predicates1D__EqualToTimeStampUP1D, _p_Predicates1D__EqualToTimeStampUP1DTo_p_UnaryPredicate1D, 0, 0},  {&_swigt__p_Predicates1D__EqualToChainingTimeStampUP1D, _p_Predicates1D__EqualToChainingTimeStampUP1DTo_p_UnaryPredicate1D, 0, 0},  {&_swigt__p_Predicates1D__TrueUP1D, _p_Predicates1D__TrueUP1DTo_p_UnaryPredicate1D, 0, 0},  {&_swigt__p_Predicates1D__QuantitativeInvisibilityUP1D, _p_Predicates1D__QuantitativeInvisibilityUP1DTo_p_UnaryPredicate1D, 0, 0},  {&_swigt__p_Predicates1D__ContourUP1D, _p_Predicates1D__ContourUP1DTo_p_UnaryPredicate1D, 0, 0},  {&_swigt__p_Predicates1D__ExternalContourUP1D, _p_Predicates1D__ExternalContourUP1DTo_p_UnaryPredicate1D, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__HVec3Tdouble_t[] = {  {&_swigt__p_VecMat__HVec3Tdouble_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__HVec3Tfloat_t[] = {  {&_swigt__p_VecMat__HVec3Tfloat_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__HVec3Tint_t[] = {  {&_swigt__p_VecMat__HVec3Tint_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__HVec3Tunsigned_int_t[] = {  {&_swigt__p_VecMat__HVec3Tunsigned_int_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixTdouble_2_t[] = {  {&_swigt__p_VecMat__SquareMatrixTdouble_2_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixTdouble_3_t[] = {  {&_swigt__p_VecMat__SquareMatrixTdouble_3_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixTdouble_4_t[] = {  {&_swigt__p_VecMat__SquareMatrixTdouble_4_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixTfloat_2_t[] = {  {&_swigt__p_VecMat__SquareMatrixTfloat_2_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixTfloat_3_t[] = {  {&_swigt__p_VecMat__SquareMatrixTfloat_3_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixTfloat_4_t[] = {  {&_swigt__p_VecMat__SquareMatrixTfloat_4_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixTint_2_t[] = {  {&_swigt__p_VecMat__SquareMatrixTint_2_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixTint_3_t[] = {  {&_swigt__p_VecMat__SquareMatrixTint_3_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixTint_4_t[] = {  {&_swigt__p_VecMat__SquareMatrixTint_4_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixTunsigned_int_2_t[] = {  {&_swigt__p_VecMat__SquareMatrixTunsigned_int_2_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixTunsigned_int_3_t[] = {  {&_swigt__p_VecMat__SquareMatrixTunsigned_int_3_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixTunsigned_int_4_t[] = {  {&_swigt__p_VecMat__SquareMatrixTunsigned_int_4_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__Vec2Tdouble_t[] = {  {&_swigt__p_VecMat__Vec2Tdouble_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__Vec2Tfloat_t[] = {  {&_swigt__p_VecMat__Vec2Tfloat_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__Vec2Tint_t[] = {  {&_swigt__p_VecMat__Vec2Tint_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__Vec2Tunsigned_int_t[] = {  {&_swigt__p_VecMat__Vec2Tunsigned_int_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__Vec3Tdouble_t[] = {  {&_swigt__p_VecMat__Vec3Tdouble_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__Vec3Tfloat_t[] = {  {&_swigt__p_VecMat__Vec3Tfloat_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__Vec3Tint_t[] = {  {&_swigt__p_VecMat__Vec3Tint_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__Vec3Tunsigned_int_t[] = {  {&_swigt__p_VecMat__Vec3Tunsigned_int_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__VecTdouble_2_t[] = {  {&_swigt__p_VecMat__VecTdouble_2_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec2Tdouble_t, _p_VecMat__Vec2Tdouble_tTo_p_VecMat__VecTdouble_2_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__VecTdouble_3_t[] = {  {&_swigt__p_VecMat__Vec3Tdouble_t, _p_VecMat__Vec3Tdouble_tTo_p_VecMat__VecTdouble_3_t, 0, 0},  {&_swigt__p_VecMat__VecTdouble_3_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__VecTfloat_2_t[] = {  {&_swigt__p_VecMat__VecTfloat_2_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec2Tfloat_t, _p_VecMat__Vec2Tfloat_tTo_p_VecMat__VecTfloat_2_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__VecTfloat_3_t[] = {  {&_swigt__p_VecMat__VecTfloat_3_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec3Tfloat_t, _p_VecMat__Vec3Tfloat_tTo_p_VecMat__VecTfloat_3_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__VecTint_2_t[] = {  {&_swigt__p_VecMat__VecTint_2_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec2Tint_t, _p_VecMat__Vec2Tint_tTo_p_VecMat__VecTint_2_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__VecTint_3_t[] = {  {&_swigt__p_VecMat__VecTint_3_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec3Tint_t, _p_VecMat__Vec3Tint_tTo_p_VecMat__VecTint_3_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__VecTunsigned_int_2_t[] = {  {&_swigt__p_VecMat__VecTunsigned_int_2_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec2Tunsigned_int_t, _p_VecMat__Vec2Tunsigned_int_tTo_p_VecMat__VecTunsigned_int_2_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__VecTunsigned_int_3_t[] = {  {&_swigt__p_VecMat__VecTunsigned_int_3_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec3Tunsigned_int_t, _p_VecMat__Vec3Tunsigned_int_tTo_p_VecMat__VecTunsigned_int_3_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Vertex[] = {  {&_swigt__p_Vertex, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_ViewEdge[] = {  {&_swigt__p_ViewEdge, 0, 0, 0},  {&_swigt__std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_ViewEdgeInternal__SVertexIterator[] = {  {&_swigt__p_ViewEdgeInternal__SVertexIterator, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_ViewEdgeInternal__ViewEdgeIterator[] = {  {&_swigt__p_ViewEdgeInternal__ViewEdgeIterator, 0, 0, 0},  {&_swigt__p_ChainingIterator, _p_ChainingIteratorTo_p_ViewEdgeInternal__ViewEdgeIterator, 0, 0},  {&_swigt__p_ChainSilhouetteIterator, _p_ChainSilhouetteIteratorTo_p_ViewEdgeInternal__ViewEdgeIterator, 0, 0},  {&_swigt__p_ChainPredicateIterator, _p_ChainPredicateIteratorTo_p_ViewEdgeInternal__ViewEdgeIterator, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_ViewMap[] = {  {&_swigt__p_ViewMap, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_ViewShape[] = {  {&_swigt__p_ViewShape, 0, 0, 0},  {&_swigt__std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_ViewVertex[] = {  {&_swigt__p_TVertex, _p_TVertexTo_p_ViewVertex, 0, 0},  {&_swigt__p_NonTVertex, _p_NonTVertexTo_p_ViewVertex, 0, 0},  {&_swigt__p_ViewVertex, 0, 0, 0},  {&_swigt__std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t[] = {  {&_swigt__p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t[] = {  {&_swigt__p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_ViewVertexInternal__orientedViewEdgeIterator[] = {  {&_swigt__p_ViewVertexInternal__orientedViewEdgeIterator, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_ViewVertexInternal__orientedViewEdgeIterator__edge_pointers_container__iterator[] = {  {&_swigt__p_ViewVertexInternal__orientedViewEdgeIterator__edge_pointers_container__iterator, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_ViewVertexInternal__orientedViewEdgeIterator__edges_container__iterator[] = {  {&_swigt__p_ViewVertexInternal__orientedViewEdgeIterator__edges_container__iterator, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_allocator_type[] = {  {&_swigt__p_allocator_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_char[] = {  {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_const_edge_iterator[] = {  {&_swigt__p_const_edge_iterator, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_const_fedge_iterator[] = {  {&_swigt__p_const_fedge_iterator, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_const_point_iterator[] = {  {&_swigt__p_const_point_iterator, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_const_reference[] = {  {&_swigt__p_const_reference, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_const_vertex_iterator[] = {  {&_swigt__p_const_vertex_iterator, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_difference_type[] = {  {&_swigt__p_difference_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_directedViewEdge[] = {  {&_swigt__p_directedViewEdge, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_double[] = {  {&_swigt__p_double, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_edge_iterator[] = {  {&_swigt__p_edge_iterator, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_edge_pointers_container[] = {  {&_swigt__p_edge_pointers_container, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_edges_container[] = {  {&_swigt__p_edges_container, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_fedge_iterator[] = {  {&_swigt__p_fedge_iterator, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_fedges_container[] = {  {&_swigt__p_fedges_container, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_float[] = {  {&_swigt__p_float, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_id_type[] = {  {&_swigt__p_id_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_int[] = {  {&_swigt__p_int, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_ltstr[] = {  {&_swigt__p_ltstr, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_mapsMap[] = {  {&_swigt__p_mapsMap, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_occluder_container__const_iterator[] = {  {&_swigt__p_occluder_container__const_iterator, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_p_PyObject[] = {  {&_swigt__p_p_PyObject, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_point_iterator[] = {  {&_swigt__p_point_iterator, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_point_type[] = {  {&_swigt__p_point_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_reference[] = {  {&_swigt__p_reference, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_setTVecMat__Vec3Tdouble_t_t[] = {  {&_swigt__p_setTVecMat__Vec3Tdouble_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_size_type[] = {  {&_swigt__p_size_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__invalid_argument[] = {  {&_swigt__p_std__invalid_argument, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__pairTViewEdge_p_bool_t[] = {  {&_swigt__p_std__pairTViewEdge_p_bool_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t[] = {  {&_swigt__p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__allocator_type[] = {  {&_swigt__p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorTMaterial_std__allocatorTMaterial_t_t[] = {  {&_swigt__p_std__vectorTMaterial_std__allocatorTMaterial_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t[] = {  {&_swigt__p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__allocator_type[] = {  {&_swigt__p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t[] = {  {&_swigt__p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__allocator_type[] = {  {&_swigt__p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorTTVertex_p_std__allocatorTTVertex_p_t_t[] = {  {&_swigt__p_std__vectorTTVertex_p_std__allocatorTTVertex_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorTVecMat__Vec2Tdouble_t_std__allocatorTVecMat__Vec2Tdouble_t_t_t[] = {  {&_swigt__p_std__vectorTVecMat__Vec2Tdouble_t_std__allocatorTVecMat__Vec2Tdouble_t_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t[] = {  {&_swigt__p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__allocator_type[] = {  {&_swigt__p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t[] = {  {&_swigt__p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__allocator_type[] = {  {&_swigt__p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t[] = {  {&_swigt__p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__allocator_type[] = {  {&_swigt__p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorTint_std__allocatorTint_t_t[] = {  {&_swigt__p_std__vectorTint_std__allocatorTint_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorTint_std__allocatorTint_t_t__allocator_type[] = {  {&_swigt__p_std__vectorTint_std__allocatorTint_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorTstd__pairTViewEdge_p_bool_t_std__allocatorTstd__pairTViewEdge_p_bool_t_t_t[] = {  {&_swigt__p_std__vectorTstd__pairTViewEdge_p_bool_t_std__allocatorTstd__pairTViewEdge_p_bool_t_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorTunsigned_int_std__allocatorTunsigned_int_t_t[] = {  {&_swigt__p_std__vectorTunsigned_int_std__allocatorTunsigned_int_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_svertices_container[] = {  {&_swigt__p_svertices_container, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_swig__PySwigIterator[] = {  {&_swigt__p_swig__PySwigIterator, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_unsigned_int[] = {  {&_swigt__p_unsigned_int, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_unsigned_short[] = {  {&_swigt__p_unsigned_short, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_value_type[] = {  {&_swigt__p_value_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_vertex_container[] = {  {&_swigt__p_vertex_container, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_vertex_iterator[] = {  {&_swigt__p_vertex_iterator, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_vertex_type[] = {  {&_swigt__p_vertex_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_viewedge_container[] = {  {&_swigt__p_viewedge_container, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_viewedges_container[] = {  {&_swigt__p_viewedges_container, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_viewshapes_container[] = {  {&_swigt__p_viewshapes_container, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_viewvertices_container[] = {  {&_swigt__p_viewvertices_container, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_void[] = {  {&_swigt__p_void, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type[] = {  {&_swigt__p_FEdge, 0, 0, 0},  {&_swigt__p_FEdgeSharp, _p_FEdgeSharpTo_p_FEdge, 0, 0},  {&_swigt__p_FEdgeSmooth, _p_FEdgeSmoothTo_p_FEdge, 0, 0},  {&_swigt__std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type[] = {  {&_swigt__std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_SVertex, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type[] = {  {&_swigt__p_StrokeShaders__ConstrainedIncreasingThicknessShader, _p_StrokeShaders__ConstrainedIncreasingThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_StrokeShader, 0, 0, 0},  {&_swigt__p_StrokeShaders__ColorNoiseShader, _p_StrokeShaders__ColorNoiseShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ThicknessNoiseShader, _p_StrokeShaders__ThicknessNoiseShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__LengthDependingThicknessShader, _p_StrokeShaders__LengthDependingThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__IncreasingThicknessShader, _p_StrokeShaders__IncreasingThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ConstantExternThicknessShader, _p_StrokeShaders__ConstantExternThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ConstantThicknessShader, _p_StrokeShaders__ConstantThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__StrokeTextureShader, _p_StrokeShaders__StrokeTextureShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__SamplingShader, _p_StrokeShaders__SamplingShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__BSplineShader, _p_StrokeShaders__BSplineShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__BezierCurveShader, _p_StrokeShaders__BezierCurveShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__InflateShader, _p_StrokeShaders__InflateShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__GuidingLinesShader, _p_StrokeShaders__GuidingLinesShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__streamShader, _p_StrokeShaders__streamShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__fstreamShader, _p_StrokeShaders__fstreamShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_CalligraphicShader, _p_CalligraphicShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_SpatialNoiseShader, _p_SpatialNoiseShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_SmoothingShader, _p_SmoothingShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__TextureAssignerShader, _p_StrokeShaders__TextureAssignerShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__CalligraphicColorShader, _p_StrokeShaders__CalligraphicColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__MaterialColorShader, _p_StrokeShaders__MaterialColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ColorVariationPatternShader, _p_StrokeShaders__ColorVariationPatternShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__IncreasingColorShader, _p_StrokeShaders__IncreasingColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ConstantColorShader, _p_StrokeShaders__ConstantColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ThicknessVariationPatternShader, _p_StrokeShaders__ThicknessVariationPatternShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__BackboneStretcherShader, _p_StrokeShaders__BackboneStretcherShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ExternalContourStretcherShader, _p_StrokeShaders__ExternalContourStretcherShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__PolygonalizationShader, _p_StrokeShaders__PolygonalizationShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__TipRemoverShader, _p_StrokeShaders__TipRemoverShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_OmissionShader, _p_OmissionShaderTo_p_StrokeShader, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type[] = {  {&_swigt__std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_ViewEdge, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type[] = {  {&_swigt__p_ViewShape, 0, 0, 0},  {&_swigt__std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type[] = {  {&_swigt__p_TVertex, _p_TVertexTo_p_ViewVertex, 0, 0},  {&_swigt__p_NonTVertex, _p_NonTVertexTo_p_ViewVertex, 0, 0},  {&_swigt__std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_ViewVertex, 0, 0, 0},{0, 0, 0, 0}};
+
+static swig_cast_info *swig_cast_initial[] = {
+  _swigc__p_AdjacencyIterator,
+  _swigc__p_BBoxTVecMat__Vec3Tdouble_t_t,
+  _swigc__p_BinaryPredicate0D,
+  _swigc__p_BinaryPredicate1D,
+  _swigc__p_CalligraphicShader,
+  _swigc__p_Canvas,
+  _swigc__p_Chain,
+  _swigc__p_ChainPredicateIterator,
+  _swigc__p_ChainSilhouetteIterator,
+  _swigc__p_ChainingIterator,
+  _swigc__p_CurvatureInfo,
+  _swigc__p_Curve,
+  _swigc__p_CurveInternal__CurvePointIterator,
+  _swigc__p_CurvePoint,
+  _swigc__p_Curve__vertex_container__iterator,
+  _swigc__p_FEdge,
+  _swigc__p_FEdgeInternal__SVertexIterator,
+  _swigc__p_FEdgeSharp,
+  _swigc__p_FEdgeSmooth,
+  _swigc__p_Functions0D__Curvature2DAngleF0D,
+  _swigc__p_Functions0D__CurveNatureF0D,
+  _swigc__p_Functions0D__DensityF0D,
+  _swigc__p_Functions0D__GetCurvilinearAbscissaF0D,
+  _swigc__p_Functions0D__GetOccludeeF0D,
+  _swigc__p_Functions0D__GetOccludersF0D,
+  _swigc__p_Functions0D__GetParameterF0D,
+  _swigc__p_Functions0D__GetProjectedXF0D,
+  _swigc__p_Functions0D__GetProjectedYF0D,
+  _swigc__p_Functions0D__GetProjectedZF0D,
+  _swigc__p_Functions0D__GetShapeF0D,
+  _swigc__p_Functions0D__GetViewMapGradientNormF0D,
+  _swigc__p_Functions0D__GetXF0D,
+  _swigc__p_Functions0D__GetYF0D,
+  _swigc__p_Functions0D__GetZF0D,
+  _swigc__p_Functions0D__LocalAverageDepthF0D,
+  _swigc__p_Functions0D__MaterialF0D,
+  _swigc__p_Functions0D__Normal2DF0D,
+  _swigc__p_Functions0D__QuantitativeInvisibilityF0D,
+  _swigc__p_Functions0D__ReadCompleteViewMapPixelF0D,
+  _swigc__p_Functions0D__ReadMapPixelF0D,
+  _swigc__p_Functions0D__ReadSteerableViewMapPixelF0D,
+  _swigc__p_Functions0D__ShapeIdF0D,
+  _swigc__p_Functions0D__VertexOrientation2DF0D,
+  _swigc__p_Functions0D__VertexOrientation3DF0D,
+  _swigc__p_Functions0D__ZDiscontinuityF0D,
+  _swigc__p_Functions1D__ChainingTimeStampF1D,
+  _swigc__p_Functions1D__Curvature2DAngleF1D,
+  _swigc__p_Functions1D__CurveNatureF1D,
+  _swigc__p_Functions1D__DensityF1D,
+  _swigc__p_Functions1D__GetCompleteViewMapDensityF1D,
+  _swigc__p_Functions1D__GetDirectionalViewMapDensityF1D,
+  _swigc__p_Functions1D__GetOccludeeF1D,
+  _swigc__p_Functions1D__GetOccludersF1D,
+  _swigc__p_Functions1D__GetProjectedXF1D,
+  _swigc__p_Functions1D__GetProjectedYF1D,
+  _swigc__p_Functions1D__GetProjectedZF1D,
+  _swigc__p_Functions1D__GetShapeF1D,
+  _swigc__p_Functions1D__GetSteerableViewMapDensityF1D,
+  _swigc__p_Functions1D__GetViewMapGradientNormF1D,
+  _swigc__p_Functions1D__GetXF1D,
+  _swigc__p_Functions1D__GetYF1D,
+  _swigc__p_Functions1D__GetZF1D,
+  _swigc__p_Functions1D__IncrementChainingTimeStampF1D,
+  _swigc__p_Functions1D__LocalAverageDepthF1D,
+  _swigc__p_Functions1D__Normal2DF1D,
+  _swigc__p_Functions1D__Orientation2DF1D,
+  _swigc__p_Functions1D__Orientation3DF1D,
+  _swigc__p_Functions1D__QuantitativeInvisibilityF1D,
+  _swigc__p_Functions1D__TimeStampF1D,
+  _swigc__p_Functions1D__ZDiscontinuityF1D,
+  _swigc__p_GrayImage,
+  _swigc__p_I1DContainer,
+  _swigc__p_Id,
+  _swigc__p_IntegrationType,
+  _swigc__p_Interface0D,
+  _swigc__p_Interface0DIterator,
+  _swigc__p_Interface0DIteratorNested,
+  _swigc__p_Interface1D,
+  _swigc__p_Material,
+  _swigc__p_MediumType,
+  _swigc__p_Module,
+  _swigc__p_Noise,
+  _swigc__p_NonTVertex,
+  _swigc__p_OmissionShader,
+  _swigc__p_Omitter,
+  _swigc__p_Operators,
+  _swigc__p_Point,
+  _swigc__p_Polygon3r,
+  _swigc__p_Predicates0D__FalseUP0D,
+  _swigc__p_Predicates0D__TrueUP0D,
+  _swigc__p_Predicates1D__ContourUP1D,
+  _swigc__p_Predicates1D__DensityLowerThanUP1D,
+  _swigc__p_Predicates1D__EqualToChainingTimeStampUP1D,
+  _swigc__p_Predicates1D__EqualToTimeStampUP1D,
+  _swigc__p_Predicates1D__ExternalContourUP1D,
+  _swigc__p_Predicates1D__FalseBP1D,
+  _swigc__p_Predicates1D__FalseUP1D,
+  _swigc__p_Predicates1D__Length2DBP1D,
+  _swigc__p_Predicates1D__QuantitativeInvisibilityUP1D,
+  _swigc__p_Predicates1D__SameShapeIdBP1D,
+  _swigc__p_Predicates1D__ShapeUP1D,
+  _swigc__p_Predicates1D__TrueBP1D,
+  _swigc__p_Predicates1D__TrueUP1D,
+  _swigc__p_Predicates1D__ViewMapGradientNormBP1D,
+  _swigc__p_RGBImage,
+  _swigc__p_ReturnedValueType,
+  _swigc__p_SShape,
+  _swigc__p_SVertex,
+  _swigc__p_SVertex__fedges_container__iterator,
+  _swigc__p_Smoother,
+  _swigc__p_SmoothingShader,
+  _swigc__p_SpatialNoiseShader,
+  _swigc__p_SteerableViewMap,
+  _swigc__p_Stroke,
+  _swigc__p_StrokeAttribute,
+  _swigc__p_StrokeInternal__StrokeVertexIterator,
+  _swigc__p_StrokeLayer,
+  _swigc__p_StrokeRenderer,
+  _swigc__p_StrokeShader,
+  _swigc__p_StrokeShaders__BSplineShader,
+  _swigc__p_StrokeShaders__BackboneStretcherShader,
+  _swigc__p_StrokeShaders__BezierCurveShader,
+  _swigc__p_StrokeShaders__CalligraphicColorShader,
+  _swigc__p_StrokeShaders__ColorNoiseShader,
+  _swigc__p_StrokeShaders__ColorVariationPatternShader,
+  _swigc__p_StrokeShaders__ConstantColorShader,
+  _swigc__p_StrokeShaders__ConstantExternThicknessShader,
+  _swigc__p_StrokeShaders__ConstantThicknessShader,
+  _swigc__p_StrokeShaders__ConstrainedIncreasingThicknessShader,
+  _swigc__p_StrokeShaders__ExternalContourStretcherShader,
+  _swigc__p_StrokeShaders__GuidingLinesShader,
+  _swigc__p_StrokeShaders__IncreasingColorShader,
+  _swigc__p_StrokeShaders__IncreasingThicknessShader,
+  _swigc__p_StrokeShaders__InflateShader,
+  _swigc__p_StrokeShaders__LengthDependingThicknessShader,
+  _swigc__p_StrokeShaders__MaterialColorShader,
+  _swigc__p_StrokeShaders__PolygonalizationShader,
+  _swigc__p_StrokeShaders__SamplingShader,
+  _swigc__p_StrokeShaders__StrokeTextureShader,
+  _swigc__p_StrokeShaders__TextureAssignerShader,
+  _swigc__p_StrokeShaders__ThicknessNoiseShader,
+  _swigc__p_StrokeShaders__ThicknessVariationPatternShader,
+  _swigc__p_StrokeShaders__TipRemoverShader,
+  _swigc__p_StrokeShaders__fstreamShader,
+  _swigc__p_StrokeShaders__streamShader,
+  _swigc__p_StrokeVertex,
+  _swigc__p_Stroke__vertex_container__iterator,
+  _swigc__p_Stroke__viewedge_container__const_iterator,
+  _swigc__p_Stroke__viewedge_container__iterator,
+  _swigc__p_StrokesContainer,
+  _swigc__p_StyleModule,
+  _swigc__p_TVertex,
+  _swigc__p_UnaryFunction0DTId_t,
+  _swigc__p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t,
+  _swigc__p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t,
+  _swigc__p_UnaryFunction0DTViewShape_p_t,
+  _swigc__p_UnaryFunction0DTdouble_t,
+  _swigc__p_UnaryFunction0DTfloat_t,
+  _swigc__p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t,
+  _swigc__p_UnaryFunction0DTunsigned_int_t,
+  _swigc__p_UnaryFunction0DTvoid_t,
+  _swigc__p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t,
+  _swigc__p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t,
+  _swigc__p_UnaryFunction1DTdouble_t,
+  _swigc__p_UnaryFunction1DTfloat_t,
+  _swigc__p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t,
+  _swigc__p_UnaryFunction1DTunsigned_int_t,
+  _swigc__p_UnaryFunction1DTvoid_t,
+  _swigc__p_UnaryPredicate0D,
+  _swigc__p_UnaryPredicate1D,
+  _swigc__p_VecMat__HVec3Tdouble_t,
+  _swigc__p_VecMat__HVec3Tfloat_t,
+  _swigc__p_VecMat__HVec3Tint_t,
+  _swigc__p_VecMat__HVec3Tunsigned_int_t,
+  _swigc__p_VecMat__SquareMatrixTdouble_2_t,
+  _swigc__p_VecMat__SquareMatrixTdouble_3_t,
+  _swigc__p_VecMat__SquareMatrixTdouble_4_t,
+  _swigc__p_VecMat__SquareMatrixTfloat_2_t,
+  _swigc__p_VecMat__SquareMatrixTfloat_3_t,
+  _swigc__p_VecMat__SquareMatrixTfloat_4_t,
+  _swigc__p_VecMat__SquareMatrixTint_2_t,
+  _swigc__p_VecMat__SquareMatrixTint_3_t,
+  _swigc__p_VecMat__SquareMatrixTint_4_t,
+  _swigc__p_VecMat__SquareMatrixTunsigned_int_2_t,
+  _swigc__p_VecMat__SquareMatrixTunsigned_int_3_t,
+  _swigc__p_VecMat__SquareMatrixTunsigned_int_4_t,
+  _swigc__p_VecMat__Vec2Tdouble_t,
+  _swigc__p_VecMat__Vec2Tfloat_t,
+  _swigc__p_VecMat__Vec2Tint_t,
+  _swigc__p_VecMat__Vec2Tunsigned_int_t,
+  _swigc__p_VecMat__Vec3Tdouble_t,
+  _swigc__p_VecMat__Vec3Tfloat_t,
+  _swigc__p_VecMat__Vec3Tint_t,
+  _swigc__p_VecMat__Vec3Tunsigned_int_t,
+  _swigc__p_VecMat__VecTdouble_2_t,
+  _swigc__p_VecMat__VecTdouble_3_t,
+  _swigc__p_VecMat__VecTfloat_2_t,
+  _swigc__p_VecMat__VecTfloat_3_t,
+  _swigc__p_VecMat__VecTint_2_t,
+  _swigc__p_VecMat__VecTint_3_t,
+  _swigc__p_VecMat__VecTunsigned_int_2_t,
+  _swigc__p_VecMat__VecTunsigned_int_3_t,
+  _swigc__p_Vertex,
+  _swigc__p_ViewEdge,
+  _swigc__p_ViewEdgeInternal__SVertexIterator,
+  _swigc__p_ViewEdgeInternal__ViewEdgeIterator,
+  _swigc__p_ViewMap,
+  _swigc__p_ViewShape,
+  _swigc__p_ViewVertex,
+  _swigc__p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t,
+  _swigc__p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t,
+  _swigc__p_ViewVertexInternal__orientedViewEdgeIterator,
+  _swigc__p_ViewVertexInternal__orientedViewEdgeIterator__edge_pointers_container__iterator,
+  _swigc__p_ViewVertexInternal__orientedViewEdgeIterator__edges_container__iterator,
+  _swigc__p_allocator_type,
+  _swigc__p_char,
+  _swigc__p_const_edge_iterator,
+  _swigc__p_const_fedge_iterator,
+  _swigc__p_const_point_iterator,
+  _swigc__p_const_reference,
+  _swigc__p_const_vertex_iterator,
+  _swigc__p_difference_type,
+  _swigc__p_directedViewEdge,
+  _swigc__p_double,
+  _swigc__p_edge_iterator,
+  _swigc__p_edge_pointers_container,
+  _swigc__p_edges_container,
+  _swigc__p_fedge_iterator,
+  _swigc__p_fedges_container,
+  _swigc__p_float,
+  _swigc__p_id_type,
+  _swigc__p_int,
+  _swigc__p_ltstr,
+  _swigc__p_mapsMap,
+  _swigc__p_occluder_container__const_iterator,
+  _swigc__p_p_PyObject,
+  _swigc__p_point_iterator,
+  _swigc__p_point_type,
+  _swigc__p_reference,
+  _swigc__p_setTVecMat__Vec3Tdouble_t_t,
+  _swigc__p_size_type,
+  _swigc__p_std__invalid_argument,
+  _swigc__p_std__pairTViewEdge_p_bool_t,
+  _swigc__p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t,
+  _swigc__p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__allocator_type,
+  _swigc__p_std__vectorTMaterial_std__allocatorTMaterial_t_t,
+  _swigc__p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t,
+  _swigc__p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__allocator_type,
+  _swigc__p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t,
+  _swigc__p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__allocator_type,
+  _swigc__p_std__vectorTTVertex_p_std__allocatorTTVertex_p_t_t,
+  _swigc__p_std__vectorTVecMat__Vec2Tdouble_t_std__allocatorTVecMat__Vec2Tdouble_t_t_t,
+  _swigc__p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t,
+  _swigc__p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__allocator_type,
+  _swigc__p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t,
+  _swigc__p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__allocator_type,
+  _swigc__p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t,
+  _swigc__p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__allocator_type,
+  _swigc__p_std__vectorTint_std__allocatorTint_t_t,
+  _swigc__p_std__vectorTint_std__allocatorTint_t_t__allocator_type,
+  _swigc__p_std__vectorTstd__pairTViewEdge_p_bool_t_std__allocatorTstd__pairTViewEdge_p_bool_t_t_t,
+  _swigc__p_std__vectorTunsigned_int_std__allocatorTunsigned_int_t_t,
+  _swigc__p_svertices_container,
+  _swigc__p_swig__PySwigIterator,
+  _swigc__p_unsigned_int,
+  _swigc__p_unsigned_short,
+  _swigc__p_value_type,
+  _swigc__p_vertex_container,
+  _swigc__p_vertex_iterator,
+  _swigc__p_vertex_type,
+  _swigc__p_viewedge_container,
+  _swigc__p_viewedges_container,
+  _swigc__p_viewshapes_container,
+  _swigc__p_viewvertices_container,
+  _swigc__p_void,
+  _swigc__std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type,
+  _swigc__std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type,
+  _swigc__std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type,
+  _swigc__std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type,
+  _swigc__std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type,
+  _swigc__std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type,
+};
+
+
+/* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */
+
+static swig_const_info swig_const_table[] = {
+{0, 0, 0, 0.0, 0, 0}};
+
+#ifdef __cplusplus
+}
+#endif
+/* -----------------------------------------------------------------------------
+ * Type initialization:
+ * This problem is tough by the requirement that no dynamic 
+ * memory is used. Also, since swig_type_info structures store pointers to 
+ * swig_cast_info structures and swig_cast_info structures store pointers back
+ * to swig_type_info structures, we need some lookup code at initialization. 
+ * The idea is that swig generates all the structures that are needed. 
+ * The runtime then collects these partially filled structures. 
+ * The SWIG_InitializeModule function takes these initial arrays out of 
+ * swig_module, and does all the lookup, filling in the swig_module.types
+ * array with the correct data and linking the correct swig_cast_info
+ * structures together.
+ *
+ * The generated swig_type_info structures are assigned staticly to an initial 
+ * array. We just loop through that array, and handle each type individually.
+ * First we lookup if this type has been already loaded, and if so, use the
+ * loaded structure instead of the generated one. Then we have to fill in the
+ * cast linked list. The cast data is initially stored in something like a
+ * two-dimensional array. Each row corresponds to a type (there are the same
+ * number of rows as there are in the swig_type_initial array). Each entry in
+ * a column is one of the swig_cast_info structures for that type.
+ * The cast_initial array is actually an array of arrays, because each row has
+ * a variable number of columns. So to actually build the cast linked list,
+ * we find the array of casts associated with the type, and loop through it 
+ * adding the casts to the list. The one last trick we need to do is making
+ * sure the type pointer in the swig_cast_info struct is correct.
+ *
+ * First off, we lookup the cast->type name to see if it is already loaded. 
+ * There are three cases to handle:
+ *  1) If the cast->type has already been loaded AND the type we are adding
+ *     casting info to has not been loaded (it is in this module), THEN we
+ *     replace the cast->type pointer with the type pointer that has already
+ *     been loaded.
+ *  2) If BOTH types (the one we are adding casting info to, and the 
+ *     cast->type) are loaded, THEN the cast info has already been loaded by
+ *     the previous module so we just ignore it.
+ *  3) Finally, if cast->type has not already been loaded, then we add that
+ *     swig_cast_info to the linked list (because the cast->type) pointer will
+ *     be correct.
+ * ----------------------------------------------------------------------------- */
+
+#ifdef __cplusplus
+extern "C" {
+#if 0
+} /* c-mode */
+#endif
+#endif
+
+#if 0
+#define SWIGRUNTIME_DEBUG
+#endif
+
+
+SWIGRUNTIME void
+SWIG_InitializeModule(void *clientdata) {
+  size_t i;
+  swig_module_info *module_head, *iter;
+  int found;
+  
+  clientdata = clientdata;
+  
+  /* check to see if the circular list has been setup, if not, set it up */
+  if (swig_module.next==0) {
+    /* Initialize the swig_module */
+    swig_module.type_initial = swig_type_initial;
+    swig_module.cast_initial = swig_cast_initial;
+    swig_module.next = &swig_module;
+  }
+  
+  /* Try and load any already created modules */
+  module_head = SWIG_GetModule(clientdata);
+  if (!module_head) {
+    /* This is the first module loaded for this interpreter */
+    /* so set the swig module into the interpreter */
+    SWIG_SetModule(clientdata, &swig_module);
+    module_head = &swig_module;
+  } else {
+    /* the interpreter has loaded a SWIG module, but has it loaded this one? */
+    found=0;
+    iter=module_head;
+    do {
+      if (iter==&swig_module) {
+        found=1;
+        break;
+      }
+      iter=iter->next;
+    } while (iter!= module_head);
+    
+    /* if the is found in the list, then all is done and we may leave */
+    if (found) return;
+    /* otherwise we must add out module into the list */
+    swig_module.next = module_head->next;
+    module_head->next = &swig_module;
+  }
+  
+  /* Now work on filling in swig_module.types */
+#ifdef SWIGRUNTIME_DEBUG
+  printf("SWIG_InitializeModule: size %d\n", swig_module.size);
+#endif
+  for (i = 0; i < swig_module.size; ++i) {
+    swig_type_info *type = 0;
+    swig_type_info *ret;
+    swig_cast_info *cast;
+    
+#ifdef SWIGRUNTIME_DEBUG
+    printf("SWIG_InitializeModule: type %d %s\n", i, swig_module.type_initial[i]->name);
+#endif
+    
+    /* if there is another module already loaded */
+    if (swig_module.next != &swig_module) {
+      type = SWIG_MangledTypeQueryModule(swig_module.next, &swig_module, swig_module.type_initial[i]->name);
+    }
+    if (type) {
+      /* Overwrite clientdata field */
+#ifdef SWIGRUNTIME_DEBUG
+      printf("SWIG_InitializeModule: found type %s\n", type->name);
+#endif
+      if (swig_module.type_initial[i]->clientdata) {
+        type->clientdata = swig_module.type_initial[i]->clientdata;
+#ifdef SWIGRUNTIME_DEBUG
+        printf("SWIG_InitializeModule: found and overwrite type %s \n", type->name);
+#endif
+      }
+    } else {
+      type = swig_module.type_initial[i];
+    }
+    
+    /* Insert casting types */
+    cast = swig_module.cast_initial[i];
+    while (cast->type) {
+      /* Don't need to add information already in the list */
+      ret = 0;
+#ifdef SWIGRUNTIME_DEBUG
+      printf("SWIG_InitializeModule: look cast %s\n", cast->type->name);
+#endif
+      if (swig_module.next != &swig_module) {
+        ret = SWIG_MangledTypeQueryModule(swig_module.next, &swig_module, cast->type->name);
+#ifdef SWIGRUNTIME_DEBUG
+        if (ret) printf("SWIG_InitializeModule: found cast %s\n", ret->name);
+#endif
+      }
+      if (ret) {
+        if (type == swig_module.type_initial[i]) {
+#ifdef SWIGRUNTIME_DEBUG
+          printf("SWIG_InitializeModule: skip old type %s\n", ret->name);
+#endif
+          cast->type = ret;
+          ret = 0;
+        } else {
+          /* Check for casting already in the list */
+          swig_cast_info *ocast = SWIG_TypeCheck(ret->name, type);
+#ifdef SWIGRUNTIME_DEBUG
+          if (ocast) printf("SWIG_InitializeModule: skip old cast %s\n", ret->name);
+#endif
+          if (!ocast) ret = 0;
+        }
+      }
+      
+      if (!ret) {
+#ifdef SWIGRUNTIME_DEBUG
+        printf("SWIG_InitializeModule: adding cast %s\n", cast->type->name);
+#endif
+        if (type->cast) {
+          type->cast->prev = cast;
+          cast->next = type->cast;
+        }
+        type->cast = cast;
+      }
+      cast++;
+    }
+    /* Set entry in modules->types array equal to the type */
+    swig_module.types[i] = type;
+  }
+  swig_module.types[i] = 0;
+  
+#ifdef SWIGRUNTIME_DEBUG
+  printf("**** SWIG_InitializeModule: Cast List ******\n");
+  for (i = 0; i < swig_module.size; ++i) {
+    int j = 0;
+    swig_cast_info *cast = swig_module.cast_initial[i];
+    printf("SWIG_InitializeModule: type %d %s\n", i, swig_module.type_initial[i]->name);
+    while (cast->type) {
+      printf("SWIG_InitializeModule: cast type %s\n", cast->type->name);
+      cast++;
+      ++j;
+    }
+    printf("---- Total casts: %d\n",j);
+  }
+  printf("**** SWIG_InitializeModule: Cast List ******\n");
+#endif
+}
+
+/* This function will propagate the clientdata field of type to
+* any new swig_type_info structures that have been added into the list
+* of equivalent types.  It is like calling
+* SWIG_TypeClientData(type, clientdata) a second time.
+*/
+SWIGRUNTIME void
+SWIG_PropagateClientData(void) {
+  size_t i;
+  swig_cast_info *equiv;
+  static int init_run = 0;
+  
+  if (init_run) return;
+  init_run = 1;
+  
+  for (i = 0; i < swig_module.size; i++) {
+    if (swig_module.types[i]->clientdata) {
+      equiv = swig_module.types[i]->cast;
+      while (equiv) {
+        if (!equiv->converter) {
+          if (equiv->type && !equiv->type->clientdata)
+          SWIG_TypeClientData(equiv->type, swig_module.types[i]->clientdata);
+        }
+        equiv = equiv->next;
+      }
+    }
+  }
+}
+
+#ifdef __cplusplus
+#if 0
+{
+  /* c-mode */
+#endif
+}
+#endif
+
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+  
+  /* Python-specific SWIG API */
+#define SWIG_newvarlink()                             SWIG_Python_newvarlink()
+#define SWIG_addvarlink(p, name, get_attr, set_attr)  SWIG_Python_addvarlink(p, name, get_attr, set_attr)
+#define SWIG_InstallConstants(d, constants)           SWIG_Python_InstallConstants(d, constants)
+  
+  /* -----------------------------------------------------------------------------
+   * global variable support code.
+   * ----------------------------------------------------------------------------- */
+  
+  typedef struct swig_globalvar {
+    char       *name;                  /* Name of global variable */
+    PyObject *(*get_attr)(void);       /* Return the current value */
+    int       (*set_attr)(PyObject *); /* Set the value */
+    struct swig_globalvar *next;
+  } swig_globalvar;
+  
+  typedef struct swig_varlinkobject {
+    PyObject_HEAD
+    swig_globalvar *vars;
+  } swig_varlinkobject;
+  
+  SWIGINTERN PyObject *
+  swig_varlink_repr(swig_varlinkobject *SWIGUNUSEDPARM(v)) {
+    return PyString_FromString("<Swig global variables>");
+  }
+  
+  SWIGINTERN PyObject *
+  swig_varlink_str(swig_varlinkobject *v) {
+    PyObject *str = PyString_FromString("(");
+    swig_globalvar  *var;
+    for (var = v->vars; var; var=var->next) {
+      PyString_ConcatAndDel(&str,PyString_FromString(var->name));
+      if (var->next) PyString_ConcatAndDel(&str,PyString_FromString(", "));
+    }
+    PyString_ConcatAndDel(&str,PyString_FromString(")"));
+    return str;
+  }
+  
+  SWIGINTERN int
+  swig_varlink_print(swig_varlinkobject *v, FILE *fp, int SWIGUNUSEDPARM(flags)) {
+    PyObject *str = swig_varlink_str(v);
+    fprintf(fp,"Swig global variables ");
+    fprintf(fp,"%s\n", PyString_AsString(str));
+    Py_DECREF(str);
+    return 0;
+  }
+  
+  SWIGINTERN void
+  swig_varlink_dealloc(swig_varlinkobject *v) {
+    swig_globalvar *var = v->vars;
+    while (var) {
+      swig_globalvar *n = var->next;
+      free(var->name);
+      free(var);
+      var = n;
+    }
+  }
+  
+  SWIGINTERN PyObject *
+  swig_varlink_getattr(swig_varlinkobject *v, char *n) {
+    PyObject *res = NULL;
+    swig_globalvar *var = v->vars;
+    while (var) {
+      if (strcmp(var->name,n) == 0) {
+        res = (*var->get_attr)();
+        break;
+      }
+      var = var->next;
+    }
+    if (res == NULL && !PyErr_Occurred()) {
+      PyErr_SetString(PyExc_NameError,"Unknown C global variable");
+    }
+    return res;
+  }
+  
+  SWIGINTERN int
+  swig_varlink_setattr(swig_varlinkobject *v, char *n, PyObject *p) {
+    int res = 1;
+    swig_globalvar *var = v->vars;
+    while (var) {
+      if (strcmp(var->name,n) == 0) {
+        res = (*var->set_attr)(p);
+        break;
+      }
+      var = var->next;
+    }
+    if (res == 1 && !PyErr_Occurred()) {
+      PyErr_SetString(PyExc_NameError,"Unknown C global variable");
+    }
+    return res;
+  }
+  
+  SWIGINTERN PyTypeObject*
+  swig_varlink_type(void) {
+    static char varlink__doc__[] = "Swig var link object";
+    static PyTypeObject varlink_type;
+    static int type_init = 0;  
+    if (!type_init) {
+      const PyTypeObject tmp
+      = {
+        PyObject_HEAD_INIT(NULL)
+        0,                                  /* Number of items in variable part (ob_size) */
+        (char *)"swigvarlink",              /* Type name (tp_name) */
+        sizeof(swig_varlinkobject),         /* Basic size (tp_basicsize) */
+        0,                                  /* Itemsize (tp_itemsize) */
+        (destructor) swig_varlink_dealloc,   /* Deallocator (tp_dealloc) */ 
+        (printfunc) swig_varlink_print,     /* Print (tp_print) */
+        (getattrfunc) swig_varlink_getattr, /* get attr (tp_getattr) */
+        (setattrfunc) swig_varlink_setattr, /* Set attr (tp_setattr) */
+        0,                                  /* tp_compare */
+        (reprfunc) swig_varlink_repr,       /* tp_repr */
+        0,                                  /* tp_as_number */
+        0,                                  /* tp_as_sequence */
+        0,                                  /* tp_as_mapping */
+        0,                                  /* tp_hash */
+        0,                                  /* tp_call */
+        (reprfunc)swig_varlink_str,        /* tp_str */
+        0,                                  /* tp_getattro */
+        0,                                  /* tp_setattro */
+        0,                                  /* tp_as_buffer */
+        0,                                  /* tp_flags */
+        varlink__doc__,                     /* tp_doc */
+        0,                                  /* tp_traverse */
+        0,                                  /* tp_clear */
+        0,                                  /* tp_richcompare */
+        0,                                  /* tp_weaklistoffset */
+#if PY_VERSION_HEX >= 0x02020000
+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* tp_iter -> tp_weaklist */
+#endif
+#if PY_VERSION_HEX >= 0x02030000
+        0,                                  /* tp_del */
+#endif
+#ifdef COUNT_ALLOCS
+        0,0,0,0                             /* tp_alloc -> tp_next */
+#endif
+      };
+      varlink_type = tmp;
+      varlink_type.ob_type = &PyType_Type;
+      type_init = 1;
+    }
+    return &varlink_type;
+  }
+  
+  /* Create a variable linking object for use later */
+  SWIGINTERN PyObject *
+  SWIG_Python_newvarlink(void) {
+    swig_varlinkobject *result = PyObject_NEW(swig_varlinkobject, swig_varlink_type());
+    if (result) {
+      result->vars = 0;
+    }
+    return ((PyObject*) result);
+  }
+  
+  SWIGINTERN void 
+  SWIG_Python_addvarlink(PyObject *p, char *name, PyObject *(*get_attr)(void), int (*set_attr)(PyObject *p)) {
+    swig_varlinkobject *v = (swig_varlinkobject *) p;
+    swig_globalvar *gv = (swig_globalvar *) malloc(sizeof(swig_globalvar));
+    if (gv) {
+      size_t size = strlen(name)+1;
+      gv->name = (char *)malloc(size);
+      if (gv->name) {
+        strncpy(gv->name,name,size);
+        gv->get_attr = get_attr;
+        gv->set_attr = set_attr;
+        gv->next = v->vars;
+      }
+    }
+    v->vars = gv;
+  }
+  
+  SWIGINTERN PyObject *
+  SWIG_globals(void) {
+    static PyObject *_SWIG_globals = 0; 
+    if (!_SWIG_globals) _SWIG_globals = SWIG_newvarlink();  
+    return _SWIG_globals;
+  }
+  
+  /* -----------------------------------------------------------------------------
+   * constants/methods manipulation
+   * ----------------------------------------------------------------------------- */
+  
+  /* Install Constants */
+  SWIGINTERN void
+  SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]) {
+    PyObject *obj = 0;
+    size_t i;
+    for (i = 0; constants[i].type; ++i) {
+      switch(constants[i].type) {
+      case SWIG_PY_POINTER:
+        obj = SWIG_NewPointerObj(constants[i].pvalue, *(constants[i]).ptype,0);
+        break;
+      case SWIG_PY_BINARY:
+        obj = SWIG_NewPackedObj(constants[i].pvalue, constants[i].lvalue, *(constants[i].ptype));
+        break;
+      default:
+        obj = 0;
+        break;
+      }
+      if (obj) {
+        PyDict_SetItemString(d, constants[i].name, obj);
+        Py_DECREF(obj);
+      }
+    }
+  }
+  
+  /* -----------------------------------------------------------------------------*/
+  /* Fix SwigMethods to carry the callback ptrs when needed */
+  /* -----------------------------------------------------------------------------*/
+  
+  SWIGINTERN void
+  SWIG_Python_FixMethods(PyMethodDef *methods,
+    swig_const_info *const_table,
+    swig_type_info **types,
+    swig_type_info **types_initial) {
+    size_t i;
+    for (i = 0; methods[i].ml_name; ++i) {
+      const char *c = methods[i].ml_doc;
+      if (c && (c = strstr(c, "swig_ptr: "))) {
+        int j;
+        swig_const_info *ci = 0;
+        const char *name = c + 10;
+        for (j = 0; const_table[j].type; ++j) {
+          if (strncmp(const_table[j].name, name, 
+              strlen(const_table[j].name)) == 0) {
+            ci = &(const_table[j]);
+            break;
+          }
+        }
+        if (ci) {
+          size_t shift = (ci->ptype) - types;
+          swig_type_info *ty = types_initial[shift];
+          size_t ldoc = (c - methods[i].ml_doc);
+          size_t lptr = strlen(ty->name)+2*sizeof(void*)+2;
+          char *ndoc = (char*)malloc(ldoc + lptr + 10);
+          if (ndoc) {
+            char *buff = ndoc;
+            void *ptr = (ci->type == SWIG_PY_POINTER) ? ci->pvalue : 0;
+            if (ptr) {
+              strncpy(buff, methods[i].ml_doc, ldoc);
+              buff += ldoc;
+              strncpy(buff, "swig_ptr: ", 10);
+              buff += 10;
+              SWIG_PackVoidPtr(buff, ptr, ty->name, lptr);
+              methods[i].ml_doc = ndoc;
+            }
+          }
+        }
+      }
+    }
+  } 
+  
+#ifdef __cplusplus
+}
+#endif
+
+/* -----------------------------------------------------------------------------*
+ *  Partial Init method
+ * -----------------------------------------------------------------------------*/
+
+#ifdef __cplusplus
+extern "C"
+#endif
+SWIGEXPORT void SWIG_init(void) {
+  PyObject *m, *d;
+  
+  /* Fix SwigMethods to carry the callback ptrs when needed */
+  SWIG_Python_FixMethods(SwigMethods, swig_const_table, swig_types, swig_type_initial);
+  
+  m = Py_InitModule((char *) SWIG_name, SwigMethods);
+  d = PyModule_GetDict(m);
+  
+  SWIG_InitializeModule(0);
+  SWIG_InstallConstants(d,swig_const_table);
+  
+  
+  SWIG_Python_SetConstant(d, "_Noise_B_",SWIG_From_int(static_cast< int >(0x100)));
+  PyDict_SetItemString(d,(char*)"cvar", SWIG_globals());
+  SWIG_addvarlink(SWIG_globals(),(char*)"POINT",POINT_get, POINT_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"S_VERTEX",S_VERTEX_get, S_VERTEX_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"VIEW_VERTEX",VIEW_VERTEX_get, VIEW_VERTEX_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"NON_T_VERTEX",NON_T_VERTEX_get, NON_T_VERTEX_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"T_VERTEX",T_VERTEX_get, T_VERTEX_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"CUSP",CUSP_get, CUSP_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"NO_FEATURE",NO_FEATURE_get, NO_FEATURE_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"SILHOUETTE",SILHOUETTE_get, SILHOUETTE_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"BORDER",BORDER_get, BORDER_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"CREASE",CREASE_get, CREASE_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"RIDGE",RIDGE_get, RIDGE_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"VALLEY",VALLEY_get, VALLEY_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"SUGGESTIVE_CONTOUR",SUGGESTIVE_CONTOUR_get, SUGGESTIVE_CONTOUR_set);
+  SWIG_Python_SetConstant(d, "MEAN",SWIG_From_int(static_cast< int >(MEAN)));
+  SWIG_Python_SetConstant(d, "MIN",SWIG_From_int(static_cast< int >(MIN)));
+  SWIG_Python_SetConstant(d, "MAX",SWIG_From_int(static_cast< int >(MAX)));
+  SWIG_Python_SetConstant(d, "FIRST",SWIG_From_int(static_cast< int >(FIRST)));
+  SWIG_Python_SetConstant(d, "LAST",SWIG_From_int(static_cast< int >(LAST)));
+  SWIG_Python_SetConstant(d, "Stroke_DRY_MEDIUM",SWIG_From_int(static_cast< int >(Stroke::DRY_MEDIUM)));
+  SWIG_Python_SetConstant(d, "Stroke_HUMID_MEDIUM",SWIG_From_int(static_cast< int >(Stroke::HUMID_MEDIUM)));
+  SWIG_Python_SetConstant(d, "Stroke_OPAQUE_MEDIUM",SWIG_From_int(static_cast< int >(Stroke::OPAQUE_MEDIUM)));
+  SWIG_Python_SetConstant(d, "Canvas_NB_STEERABLE_VIEWMAP",SWIG_From_int(static_cast< int >(Canvas::NB_STEERABLE_VIEWMAP)));
+}
+
diff --git a/extern/freestyle/src/swig/ModuleWrapper.h b/extern/freestyle/src/swig/ModuleWrapper.h
new file mode 100755
index 00000000000..06ca8c90f37
--- /dev/null
+++ b/extern/freestyle/src/swig/ModuleWrapper.h
@@ -0,0 +1,1045 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 1.3.31
+ * 
+ * This file is not intended to be easily readable and contains a number of 
+ * coding conventions designed to improve portability and efficiency. Do not make
+ * changes to this file unless you know what you are doing--modify the SWIG 
+ * interface file instead. 
+ * ----------------------------------------------------------------------------- */
+
+#ifndef SWIG_Freestyle_WRAP_H_
+#define SWIG_Freestyle_WRAP_H_
+
+#include <map>
+#include <string>
+
+
+class SwigDirector_ViewEdgeViewEdgeIterator : public ViewEdgeInternal::ViewEdgeIterator, public Swig::Director {
+
+public:
+    SwigDirector_ViewEdgeViewEdgeIterator(PyObject *self, ViewEdge *begin = 0, bool orientation = true);
+    SwigDirector_ViewEdgeViewEdgeIterator(PyObject *self, ViewEdgeInternal::ViewEdgeIterator const &it);
+    virtual ~SwigDirector_ViewEdgeViewEdgeIterator();
+    virtual std::string getExactTypeName() const;
+    virtual ViewEdge *operator *();
+    virtual ViewEdge *operator ->();
+    virtual ViewEdgeInternal::ViewEdgeIterator &operator ++();
+    virtual ViewEdgeInternal::ViewEdgeIterator operator ++(int arg0);
+    virtual void increment();
+    virtual ViewEdgeInternal::ViewEdgeIterator &operator --();
+    virtual ViewEdgeInternal::ViewEdgeIterator operator --(int arg0);
+    virtual void decrement();
+    virtual bool isBegin() const;
+    virtual bool isEnd() const;
+    virtual bool operator ==(ViewEdgeInternal::ViewEdgeIterator &it) const;
+    virtual bool operator !=(ViewEdgeInternal::ViewEdgeIterator &it) const;
+
+
+/* Internal Director utilities */
+public:
+    bool swig_get_inner(const char* name) const {
+      std::map<std::string, bool>::const_iterator iv = inner.find(name);
+      return (iv != inner.end() ? iv->second : false);
+    }
+
+    void swig_set_inner(const char* name, bool val) const
+    { inner[name] = val;}
+
+private:
+    mutable std::map<std::string, bool> inner;
+
+
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+/* VTable implementation */
+    PyObject *swig_get_method(size_t method_index, const char *method_name) const {
+      PyObject *method = vtable[method_index];
+      if (!method) {
+        swig::PyObject_var name = PyString_FromString(method_name);
+        method = PyObject_GetAttr(swig_get_self(), name);
+        if (method == NULL) {
+          std::string msg = "Method in class ViewEdgeViewEdgeIterator doesn't exist, undefined ";
+          msg += method_name;
+          Swig::DirectorMethodException::raise(msg.c_str());
+        }
+        vtable[method_index] = method;
+      };
+      return method;
+    }
+private:
+    mutable swig::PyObject_var vtable[9];
+#endif
+
+};
+
+
+class SwigDirector_UnaryFunction0DVoid : public UnaryFunction0D<void >, public Swig::Director {
+
+public:
+    SwigDirector_UnaryFunction0DVoid(PyObject *self);
+    virtual ~SwigDirector_UnaryFunction0DVoid();
+    virtual std::string getName() const;
+    virtual void operator ()(Interface0DIterator &iter);
+
+
+/* Internal Director utilities */
+public:
+    bool swig_get_inner(const char* name) const {
+      std::map<std::string, bool>::const_iterator iv = inner.find(name);
+      return (iv != inner.end() ? iv->second : false);
+    }
+
+    void swig_set_inner(const char* name, bool val) const
+    { inner[name] = val;}
+
+private:
+    mutable std::map<std::string, bool> inner;
+
+
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+/* VTable implementation */
+    PyObject *swig_get_method(size_t method_index, const char *method_name) const {
+      PyObject *method = vtable[method_index];
+      if (!method) {
+        swig::PyObject_var name = PyString_FromString(method_name);
+        method = PyObject_GetAttr(swig_get_self(), name);
+        if (method == NULL) {
+          std::string msg = "Method in class UnaryFunction0DVoid doesn't exist, undefined ";
+          msg += method_name;
+          Swig::DirectorMethodException::raise(msg.c_str());
+        }
+        vtable[method_index] = method;
+      };
+      return method;
+    }
+private:
+    mutable swig::PyObject_var vtable[2];
+#endif
+
+};
+
+
+class SwigDirector_UnaryFunction0DUnsigned : public UnaryFunction0D<unsigned int >, public Swig::Director {
+
+public:
+    SwigDirector_UnaryFunction0DUnsigned(PyObject *self);
+    virtual ~SwigDirector_UnaryFunction0DUnsigned();
+    virtual std::string getName() const;
+    virtual unsigned int operator ()(Interface0DIterator &iter);
+
+
+/* Internal Director utilities */
+public:
+    bool swig_get_inner(const char* name) const {
+      std::map<std::string, bool>::const_iterator iv = inner.find(name);
+      return (iv != inner.end() ? iv->second : false);
+    }
+
+    void swig_set_inner(const char* name, bool val) const
+    { inner[name] = val;}
+
+private:
+    mutable std::map<std::string, bool> inner;
+
+
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+/* VTable implementation */
+    PyObject *swig_get_method(size_t method_index, const char *method_name) const {
+      PyObject *method = vtable[method_index];
+      if (!method) {
+        swig::PyObject_var name = PyString_FromString(method_name);
+        method = PyObject_GetAttr(swig_get_self(), name);
+        if (method == NULL) {
+          std::string msg = "Method in class UnaryFunction0DUnsigned doesn't exist, undefined ";
+          msg += method_name;
+          Swig::DirectorMethodException::raise(msg.c_str());
+        }
+        vtable[method_index] = method;
+      };
+      return method;
+    }
+private:
+    mutable swig::PyObject_var vtable[2];
+#endif
+
+};
+
+
+class SwigDirector_UnaryFunction0DFloat : public UnaryFunction0D<float >, public Swig::Director {
+
+public:
+    SwigDirector_UnaryFunction0DFloat(PyObject *self);
+    virtual ~SwigDirector_UnaryFunction0DFloat();
+    virtual std::string getName() const;
+    virtual float operator ()(Interface0DIterator &iter);
+
+
+/* Internal Director utilities */
+public:
+    bool swig_get_inner(const char* name) const {
+      std::map<std::string, bool>::const_iterator iv = inner.find(name);
+      return (iv != inner.end() ? iv->second : false);
+    }
+
+    void swig_set_inner(const char* name, bool val) const
+    { inner[name] = val;}
+
+private:
+    mutable std::map<std::string, bool> inner;
+
+
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+/* VTable implementation */
+    PyObject *swig_get_method(size_t method_index, const char *method_name) const {
+      PyObject *method = vtable[method_index];
+      if (!method) {
+        swig::PyObject_var name = PyString_FromString(method_name);
+        method = PyObject_GetAttr(swig_get_self(), name);
+        if (method == NULL) {
+          std::string msg = "Method in class UnaryFunction0DFloat doesn't exist, undefined ";
+          msg += method_name;
+          Swig::DirectorMethodException::raise(msg.c_str());
+        }
+        vtable[method_index] = method;
+      };
+      return method;
+    }
+private:
+    mutable swig::PyObject_var vtable[2];
+#endif
+
+};
+
+
+class SwigDirector_UnaryFunction0DDouble : public UnaryFunction0D<double >, public Swig::Director {
+
+public:
+    SwigDirector_UnaryFunction0DDouble(PyObject *self);
+    virtual ~SwigDirector_UnaryFunction0DDouble();
+    virtual std::string getName() const;
+    virtual double operator ()(Interface0DIterator &iter);
+
+
+/* Internal Director utilities */
+public:
+    bool swig_get_inner(const char* name) const {
+      std::map<std::string, bool>::const_iterator iv = inner.find(name);
+      return (iv != inner.end() ? iv->second : false);
+    }
+
+    void swig_set_inner(const char* name, bool val) const
+    { inner[name] = val;}
+
+private:
+    mutable std::map<std::string, bool> inner;
+
+
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+/* VTable implementation */
+    PyObject *swig_get_method(size_t method_index, const char *method_name) const {
+      PyObject *method = vtable[method_index];
+      if (!method) {
+        swig::PyObject_var name = PyString_FromString(method_name);
+        method = PyObject_GetAttr(swig_get_self(), name);
+        if (method == NULL) {
+          std::string msg = "Method in class UnaryFunction0DDouble doesn't exist, undefined ";
+          msg += method_name;
+          Swig::DirectorMethodException::raise(msg.c_str());
+        }
+        vtable[method_index] = method;
+      };
+      return method;
+    }
+private:
+    mutable swig::PyObject_var vtable[2];
+#endif
+
+};
+
+
+class SwigDirector_UnaryFunction0DVec2f : public UnaryFunction0D<Geometry::Vec2f >, public Swig::Director {
+
+public:
+    SwigDirector_UnaryFunction0DVec2f(PyObject *self);
+    virtual ~SwigDirector_UnaryFunction0DVec2f();
+    virtual std::string getName() const;
+    virtual VecMat::Vec2<float > operator ()(Interface0DIterator &iter);
+
+
+/* Internal Director utilities */
+public:
+    bool swig_get_inner(const char* name) const {
+      std::map<std::string, bool>::const_iterator iv = inner.find(name);
+      return (iv != inner.end() ? iv->second : false);
+    }
+
+    void swig_set_inner(const char* name, bool val) const
+    { inner[name] = val;}
+
+private:
+    mutable std::map<std::string, bool> inner;
+
+
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+/* VTable implementation */
+    PyObject *swig_get_method(size_t method_index, const char *method_name) const {
+      PyObject *method = vtable[method_index];
+      if (!method) {
+        swig::PyObject_var name = PyString_FromString(method_name);
+        method = PyObject_GetAttr(swig_get_self(), name);
+        if (method == NULL) {
+          std::string msg = "Method in class UnaryFunction0DVec2f doesn't exist, undefined ";
+          msg += method_name;
+          Swig::DirectorMethodException::raise(msg.c_str());
+        }
+        vtable[method_index] = method;
+      };
+      return method;
+    }
+private:
+    mutable swig::PyObject_var vtable[2];
+#endif
+
+};
+
+
+class SwigDirector_UnaryFunction0DVec3f : public UnaryFunction0D<Geometry::Vec3f >, public Swig::Director {
+
+public:
+    SwigDirector_UnaryFunction0DVec3f(PyObject *self);
+    virtual ~SwigDirector_UnaryFunction0DVec3f();
+    virtual std::string getName() const;
+    virtual VecMat::Vec3<float > operator ()(Interface0DIterator &iter);
+
+
+/* Internal Director utilities */
+public:
+    bool swig_get_inner(const char* name) const {
+      std::map<std::string, bool>::const_iterator iv = inner.find(name);
+      return (iv != inner.end() ? iv->second : false);
+    }
+
+    void swig_set_inner(const char* name, bool val) const
+    { inner[name] = val;}
+
+private:
+    mutable std::map<std::string, bool> inner;
+
+
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+/* VTable implementation */
+    PyObject *swig_get_method(size_t method_index, const char *method_name) const {
+      PyObject *method = vtable[method_index];
+      if (!method) {
+        swig::PyObject_var name = PyString_FromString(method_name);
+        method = PyObject_GetAttr(swig_get_self(), name);
+        if (method == NULL) {
+          std::string msg = "Method in class UnaryFunction0DVec3f doesn't exist, undefined ";
+          msg += method_name;
+          Swig::DirectorMethodException::raise(msg.c_str());
+        }
+        vtable[method_index] = method;
+      };
+      return method;
+    }
+private:
+    mutable swig::PyObject_var vtable[2];
+#endif
+
+};
+
+
+class SwigDirector_UnaryFunction0DId : public UnaryFunction0D<Id >, public Swig::Director {
+
+public:
+    SwigDirector_UnaryFunction0DId(PyObject *self);
+    virtual ~SwigDirector_UnaryFunction0DId();
+    virtual std::string getName() const;
+    virtual Id operator ()(Interface0DIterator &iter);
+
+
+/* Internal Director utilities */
+public:
+    bool swig_get_inner(const char* name) const {
+      std::map<std::string, bool>::const_iterator iv = inner.find(name);
+      return (iv != inner.end() ? iv->second : false);
+    }
+
+    void swig_set_inner(const char* name, bool val) const
+    { inner[name] = val;}
+
+private:
+    mutable std::map<std::string, bool> inner;
+
+
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+/* VTable implementation */
+    PyObject *swig_get_method(size_t method_index, const char *method_name) const {
+      PyObject *method = vtable[method_index];
+      if (!method) {
+        swig::PyObject_var name = PyString_FromString(method_name);
+        method = PyObject_GetAttr(swig_get_self(), name);
+        if (method == NULL) {
+          std::string msg = "Method in class UnaryFunction0DId doesn't exist, undefined ";
+          msg += method_name;
+          Swig::DirectorMethodException::raise(msg.c_str());
+        }
+        vtable[method_index] = method;
+      };
+      return method;
+    }
+private:
+    mutable swig::PyObject_var vtable[2];
+#endif
+
+};
+
+
+class SwigDirector_UnaryFunction1DVoid : public UnaryFunction1D<void >, public Swig::Director {
+
+public:
+    SwigDirector_UnaryFunction1DVoid(PyObject *self);
+    SwigDirector_UnaryFunction1DVoid(PyObject *self, IntegrationType iType);
+    virtual ~SwigDirector_UnaryFunction1DVoid();
+    virtual std::string getName() const;
+    virtual void operator ()(Interface1D &inter);
+
+
+/* Internal Director utilities */
+public:
+    bool swig_get_inner(const char* name) const {
+      std::map<std::string, bool>::const_iterator iv = inner.find(name);
+      return (iv != inner.end() ? iv->second : false);
+    }
+
+    void swig_set_inner(const char* name, bool val) const
+    { inner[name] = val;}
+
+private:
+    mutable std::map<std::string, bool> inner;
+
+
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+/* VTable implementation */
+    PyObject *swig_get_method(size_t method_index, const char *method_name) const {
+      PyObject *method = vtable[method_index];
+      if (!method) {
+        swig::PyObject_var name = PyString_FromString(method_name);
+        method = PyObject_GetAttr(swig_get_self(), name);
+        if (method == NULL) {
+          std::string msg = "Method in class UnaryFunction1DVoid doesn't exist, undefined ";
+          msg += method_name;
+          Swig::DirectorMethodException::raise(msg.c_str());
+        }
+        vtable[method_index] = method;
+      };
+      return method;
+    }
+private:
+    mutable swig::PyObject_var vtable[2];
+#endif
+
+};
+
+
+class SwigDirector_UnaryFunction1DUnsigned : public UnaryFunction1D<unsigned int >, public Swig::Director {
+
+public:
+    SwigDirector_UnaryFunction1DUnsigned(PyObject *self);
+    SwigDirector_UnaryFunction1DUnsigned(PyObject *self, IntegrationType iType);
+    virtual ~SwigDirector_UnaryFunction1DUnsigned();
+    virtual std::string getName() const;
+    virtual unsigned int operator ()(Interface1D &inter);
+
+
+/* Internal Director utilities */
+public:
+    bool swig_get_inner(const char* name) const {
+      std::map<std::string, bool>::const_iterator iv = inner.find(name);
+      return (iv != inner.end() ? iv->second : false);
+    }
+
+    void swig_set_inner(const char* name, bool val) const
+    { inner[name] = val;}
+
+private:
+    mutable std::map<std::string, bool> inner;
+
+
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+/* VTable implementation */
+    PyObject *swig_get_method(size_t method_index, const char *method_name) const {
+      PyObject *method = vtable[method_index];
+      if (!method) {
+        swig::PyObject_var name = PyString_FromString(method_name);
+        method = PyObject_GetAttr(swig_get_self(), name);
+        if (method == NULL) {
+          std::string msg = "Method in class UnaryFunction1DUnsigned doesn't exist, undefined ";
+          msg += method_name;
+          Swig::DirectorMethodException::raise(msg.c_str());
+        }
+        vtable[method_index] = method;
+      };
+      return method;
+    }
+private:
+    mutable swig::PyObject_var vtable[2];
+#endif
+
+};
+
+
+class SwigDirector_UnaryFunction1DFloat : public UnaryFunction1D<float >, public Swig::Director {
+
+public:
+    SwigDirector_UnaryFunction1DFloat(PyObject *self);
+    SwigDirector_UnaryFunction1DFloat(PyObject *self, IntegrationType iType);
+    virtual ~SwigDirector_UnaryFunction1DFloat();
+    virtual std::string getName() const;
+    virtual float operator ()(Interface1D &inter);
+
+
+/* Internal Director utilities */
+public:
+    bool swig_get_inner(const char* name) const {
+      std::map<std::string, bool>::const_iterator iv = inner.find(name);
+      return (iv != inner.end() ? iv->second : false);
+    }
+
+    void swig_set_inner(const char* name, bool val) const
+    { inner[name] = val;}
+
+private:
+    mutable std::map<std::string, bool> inner;
+
+
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+/* VTable implementation */
+    PyObject *swig_get_method(size_t method_index, const char *method_name) const {
+      PyObject *method = vtable[method_index];
+      if (!method) {
+        swig::PyObject_var name = PyString_FromString(method_name);
+        method = PyObject_GetAttr(swig_get_self(), name);
+        if (method == NULL) {
+          std::string msg = "Method in class UnaryFunction1DFloat doesn't exist, undefined ";
+          msg += method_name;
+          Swig::DirectorMethodException::raise(msg.c_str());
+        }
+        vtable[method_index] = method;
+      };
+      return method;
+    }
+private:
+    mutable swig::PyObject_var vtable[2];
+#endif
+
+};
+
+
+class SwigDirector_UnaryFunction1DDouble : public UnaryFunction1D<double >, public Swig::Director {
+
+public:
+    SwigDirector_UnaryFunction1DDouble(PyObject *self);
+    SwigDirector_UnaryFunction1DDouble(PyObject *self, IntegrationType iType);
+    virtual ~SwigDirector_UnaryFunction1DDouble();
+    virtual std::string getName() const;
+    virtual double operator ()(Interface1D &inter);
+
+
+/* Internal Director utilities */
+public:
+    bool swig_get_inner(const char* name) const {
+      std::map<std::string, bool>::const_iterator iv = inner.find(name);
+      return (iv != inner.end() ? iv->second : false);
+    }
+
+    void swig_set_inner(const char* name, bool val) const
+    { inner[name] = val;}
+
+private:
+    mutable std::map<std::string, bool> inner;
+
+
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+/* VTable implementation */
+    PyObject *swig_get_method(size_t method_index, const char *method_name) const {
+      PyObject *method = vtable[method_index];
+      if (!method) {
+        swig::PyObject_var name = PyString_FromString(method_name);
+        method = PyObject_GetAttr(swig_get_self(), name);
+        if (method == NULL) {
+          std::string msg = "Method in class UnaryFunction1DDouble doesn't exist, undefined ";
+          msg += method_name;
+          Swig::DirectorMethodException::raise(msg.c_str());
+        }
+        vtable[method_index] = method;
+      };
+      return method;
+    }
+private:
+    mutable swig::PyObject_var vtable[2];
+#endif
+
+};
+
+
+class SwigDirector_UnaryFunction1DVec2f : public UnaryFunction1D<Geometry::Vec2f >, public Swig::Director {
+
+public:
+    SwigDirector_UnaryFunction1DVec2f(PyObject *self);
+    SwigDirector_UnaryFunction1DVec2f(PyObject *self, IntegrationType iType);
+    virtual ~SwigDirector_UnaryFunction1DVec2f();
+    virtual std::string getName() const;
+    virtual VecMat::Vec2<float > operator ()(Interface1D &inter);
+
+
+/* Internal Director utilities */
+public:
+    bool swig_get_inner(const char* name) const {
+      std::map<std::string, bool>::const_iterator iv = inner.find(name);
+      return (iv != inner.end() ? iv->second : false);
+    }
+
+    void swig_set_inner(const char* name, bool val) const
+    { inner[name] = val;}
+
+private:
+    mutable std::map<std::string, bool> inner;
+
+
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+/* VTable implementation */
+    PyObject *swig_get_method(size_t method_index, const char *method_name) const {
+      PyObject *method = vtable[method_index];
+      if (!method) {
+        swig::PyObject_var name = PyString_FromString(method_name);
+        method = PyObject_GetAttr(swig_get_self(), name);
+        if (method == NULL) {
+          std::string msg = "Method in class UnaryFunction1DVec2f doesn't exist, undefined ";
+          msg += method_name;
+          Swig::DirectorMethodException::raise(msg.c_str());
+        }
+        vtable[method_index] = method;
+      };
+      return method;
+    }
+private:
+    mutable swig::PyObject_var vtable[2];
+#endif
+
+};
+
+
+class SwigDirector_UnaryFunction1DVec3f : public UnaryFunction1D<Geometry::Vec3f >, public Swig::Director {
+
+public:
+    SwigDirector_UnaryFunction1DVec3f(PyObject *self);
+    SwigDirector_UnaryFunction1DVec3f(PyObject *self, IntegrationType iType);
+    virtual ~SwigDirector_UnaryFunction1DVec3f();
+    virtual std::string getName() const;
+    virtual VecMat::Vec3<float > operator ()(Interface1D &inter);
+
+
+/* Internal Director utilities */
+public:
+    bool swig_get_inner(const char* name) const {
+      std::map<std::string, bool>::const_iterator iv = inner.find(name);
+      return (iv != inner.end() ? iv->second : false);
+    }
+
+    void swig_set_inner(const char* name, bool val) const
+    { inner[name] = val;}
+
+private:
+    mutable std::map<std::string, bool> inner;
+
+
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+/* VTable implementation */
+    PyObject *swig_get_method(size_t method_index, const char *method_name) const {
+      PyObject *method = vtable[method_index];
+      if (!method) {
+        swig::PyObject_var name = PyString_FromString(method_name);
+        method = PyObject_GetAttr(swig_get_self(), name);
+        if (method == NULL) {
+          std::string msg = "Method in class UnaryFunction1DVec3f doesn't exist, undefined ";
+          msg += method_name;
+          Swig::DirectorMethodException::raise(msg.c_str());
+        }
+        vtable[method_index] = method;
+      };
+      return method;
+    }
+private:
+    mutable swig::PyObject_var vtable[2];
+#endif
+
+};
+
+
+class SwigDirector_ChainingIterator : public ChainingIterator, public Swig::Director {
+
+public:
+    SwigDirector_ChainingIterator(PyObject *self, bool iRestrictToSelection = true, bool iRestrictToUnvisited = true, ViewEdge *begin = 0, bool orientation = true);
+    SwigDirector_ChainingIterator(PyObject *self, ChainingIterator const &brother);
+    virtual ~SwigDirector_ChainingIterator();
+    virtual std::string getExactTypeName() const;
+    virtual ViewEdge *operator *();
+    virtual ViewEdge *operator ->();
+    virtual ViewEdgeInternal::ViewEdgeIterator &operator ++();
+    virtual ViewEdgeInternal::ViewEdgeIterator operator ++(int arg0);
+    virtual void increment();
+    virtual ViewEdgeInternal::ViewEdgeIterator &operator --();
+    virtual ViewEdgeInternal::ViewEdgeIterator operator --(int arg0);
+    virtual void decrement();
+    virtual bool isBegin() const;
+    virtual bool isEnd() const;
+    virtual bool operator ==(ViewEdgeInternal::ViewEdgeIterator &it) const;
+    virtual bool operator !=(ViewEdgeInternal::ViewEdgeIterator &it) const;
+    virtual void init();
+    virtual ViewEdge *traverse(AdjacencyIterator const &it);
+
+
+/* Internal Director utilities */
+public:
+    bool swig_get_inner(const char* name) const {
+      std::map<std::string, bool>::const_iterator iv = inner.find(name);
+      return (iv != inner.end() ? iv->second : false);
+    }
+
+    void swig_set_inner(const char* name, bool val) const
+    { inner[name] = val;}
+
+private:
+    mutable std::map<std::string, bool> inner;
+
+
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+/* VTable implementation */
+    PyObject *swig_get_method(size_t method_index, const char *method_name) const {
+      PyObject *method = vtable[method_index];
+      if (!method) {
+        swig::PyObject_var name = PyString_FromString(method_name);
+        method = PyObject_GetAttr(swig_get_self(), name);
+        if (method == NULL) {
+          std::string msg = "Method in class ChainingIterator doesn't exist, undefined ";
+          msg += method_name;
+          Swig::DirectorMethodException::raise(msg.c_str());
+        }
+        vtable[method_index] = method;
+      };
+      return method;
+    }
+private:
+    mutable swig::PyObject_var vtable[11];
+#endif
+
+};
+
+
+class SwigDirector_ChainSilhouetteIterator : public ChainSilhouetteIterator, public Swig::Director {
+
+public:
+    SwigDirector_ChainSilhouetteIterator(PyObject *self, bool iRestrictToSelection = true, ViewEdge *begin = NULL, bool orientation = true);
+    SwigDirector_ChainSilhouetteIterator(PyObject *self, ChainSilhouetteIterator const &brother);
+    virtual ~SwigDirector_ChainSilhouetteIterator();
+    virtual std::string getExactTypeName() const;
+    virtual ViewEdge *operator *();
+    virtual ViewEdge *operator ->();
+    virtual ViewEdgeInternal::ViewEdgeIterator &operator ++();
+    virtual ViewEdgeInternal::ViewEdgeIterator operator ++(int arg0);
+    virtual void increment();
+    virtual ViewEdgeInternal::ViewEdgeIterator &operator --();
+    virtual ViewEdgeInternal::ViewEdgeIterator operator --(int arg0);
+    virtual void decrement();
+    virtual bool isBegin() const;
+    virtual bool isEnd() const;
+    virtual bool operator ==(ViewEdgeInternal::ViewEdgeIterator &it) const;
+    virtual bool operator !=(ViewEdgeInternal::ViewEdgeIterator &it) const;
+    virtual void init();
+    virtual ViewEdge *traverse(AdjacencyIterator const &it);
+
+
+/* Internal Director utilities */
+public:
+    bool swig_get_inner(const char* name) const {
+      std::map<std::string, bool>::const_iterator iv = inner.find(name);
+      return (iv != inner.end() ? iv->second : false);
+    }
+
+    void swig_set_inner(const char* name, bool val) const
+    { inner[name] = val;}
+
+private:
+    mutable std::map<std::string, bool> inner;
+
+
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+/* VTable implementation */
+    PyObject *swig_get_method(size_t method_index, const char *method_name) const {
+      PyObject *method = vtable[method_index];
+      if (!method) {
+        swig::PyObject_var name = PyString_FromString(method_name);
+        method = PyObject_GetAttr(swig_get_self(), name);
+        if (method == NULL) {
+          std::string msg = "Method in class ChainSilhouetteIterator doesn't exist, undefined ";
+          msg += method_name;
+          Swig::DirectorMethodException::raise(msg.c_str());
+        }
+        vtable[method_index] = method;
+      };
+      return method;
+    }
+private:
+    mutable swig::PyObject_var vtable[11];
+#endif
+
+};
+
+
+class SwigDirector_ChainPredicateIterator : public ChainPredicateIterator, public Swig::Director {
+
+public:
+    SwigDirector_ChainPredicateIterator(PyObject *self, bool iRestrictToSelection = true, bool iRestrictToUnvisited = true, ViewEdge *begin = NULL, bool orientation = true);
+    SwigDirector_ChainPredicateIterator(PyObject *self, UnaryPredicate1D &upred, BinaryPredicate1D &bpred, bool iRestrictToSelection = true, bool iRestrictToUnvisited = true, ViewEdge *begin = NULL, bool orientation = true);
+    SwigDirector_ChainPredicateIterator(PyObject *self, ChainPredicateIterator const &brother);
+    virtual ~SwigDirector_ChainPredicateIterator();
+    virtual std::string getExactTypeName() const;
+    virtual ViewEdge *operator *();
+    virtual ViewEdge *operator ->();
+    virtual ViewEdgeInternal::ViewEdgeIterator &operator ++();
+    virtual ViewEdgeInternal::ViewEdgeIterator operator ++(int arg0);
+    virtual void increment();
+    virtual ViewEdgeInternal::ViewEdgeIterator &operator --();
+    virtual ViewEdgeInternal::ViewEdgeIterator operator --(int arg0);
+    virtual void decrement();
+    virtual bool isBegin() const;
+    virtual bool isEnd() const;
+    virtual bool operator ==(ViewEdgeInternal::ViewEdgeIterator &it) const;
+    virtual bool operator !=(ViewEdgeInternal::ViewEdgeIterator &it) const;
+    virtual void init();
+    virtual ViewEdge *traverse(AdjacencyIterator const &it);
+
+
+/* Internal Director utilities */
+public:
+    bool swig_get_inner(const char* name) const {
+      std::map<std::string, bool>::const_iterator iv = inner.find(name);
+      return (iv != inner.end() ? iv->second : false);
+    }
+
+    void swig_set_inner(const char* name, bool val) const
+    { inner[name] = val;}
+
+private:
+    mutable std::map<std::string, bool> inner;
+
+
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+/* VTable implementation */
+    PyObject *swig_get_method(size_t method_index, const char *method_name) const {
+      PyObject *method = vtable[method_index];
+      if (!method) {
+        swig::PyObject_var name = PyString_FromString(method_name);
+        method = PyObject_GetAttr(swig_get_self(), name);
+        if (method == NULL) {
+          std::string msg = "Method in class ChainPredicateIterator doesn't exist, undefined ";
+          msg += method_name;
+          Swig::DirectorMethodException::raise(msg.c_str());
+        }
+        vtable[method_index] = method;
+      };
+      return method;
+    }
+private:
+    mutable swig::PyObject_var vtable[11];
+#endif
+
+};
+
+
+class SwigDirector_UnaryPredicate0D : public UnaryPredicate0D, public Swig::Director {
+
+public:
+    SwigDirector_UnaryPredicate0D(PyObject *self);
+    virtual ~SwigDirector_UnaryPredicate0D();
+    virtual std::string getName() const;
+    virtual bool operator ()(Interface0DIterator &it);
+
+
+/* Internal Director utilities */
+public:
+    bool swig_get_inner(const char* name) const {
+      std::map<std::string, bool>::const_iterator iv = inner.find(name);
+      return (iv != inner.end() ? iv->second : false);
+    }
+
+    void swig_set_inner(const char* name, bool val) const
+    { inner[name] = val;}
+
+private:
+    mutable std::map<std::string, bool> inner;
+
+
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+/* VTable implementation */
+    PyObject *swig_get_method(size_t method_index, const char *method_name) const {
+      PyObject *method = vtable[method_index];
+      if (!method) {
+        swig::PyObject_var name = PyString_FromString(method_name);
+        method = PyObject_GetAttr(swig_get_self(), name);
+        if (method == NULL) {
+          std::string msg = "Method in class UnaryPredicate0D doesn't exist, undefined ";
+          msg += method_name;
+          Swig::DirectorMethodException::raise(msg.c_str());
+        }
+        vtable[method_index] = method;
+      };
+      return method;
+    }
+private:
+    mutable swig::PyObject_var vtable[2];
+#endif
+
+};
+
+
+class SwigDirector_UnaryPredicate1D : public UnaryPredicate1D, public Swig::Director {
+
+public:
+    SwigDirector_UnaryPredicate1D(PyObject *self);
+    virtual ~SwigDirector_UnaryPredicate1D();
+    virtual std::string getName() const;
+    virtual bool operator ()(Interface1D &inter);
+
+
+/* Internal Director utilities */
+public:
+    bool swig_get_inner(const char* name) const {
+      std::map<std::string, bool>::const_iterator iv = inner.find(name);
+      return (iv != inner.end() ? iv->second : false);
+    }
+
+    void swig_set_inner(const char* name, bool val) const
+    { inner[name] = val;}
+
+private:
+    mutable std::map<std::string, bool> inner;
+
+
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+/* VTable implementation */
+    PyObject *swig_get_method(size_t method_index, const char *method_name) const {
+      PyObject *method = vtable[method_index];
+      if (!method) {
+        swig::PyObject_var name = PyString_FromString(method_name);
+        method = PyObject_GetAttr(swig_get_self(), name);
+        if (method == NULL) {
+          std::string msg = "Method in class UnaryPredicate1D doesn't exist, undefined ";
+          msg += method_name;
+          Swig::DirectorMethodException::raise(msg.c_str());
+        }
+        vtable[method_index] = method;
+      };
+      return method;
+    }
+private:
+    mutable swig::PyObject_var vtable[2];
+#endif
+
+};
+
+
+class SwigDirector_BinaryPredicate1D : public BinaryPredicate1D, public Swig::Director {
+
+public:
+    SwigDirector_BinaryPredicate1D(PyObject *self);
+    virtual ~SwigDirector_BinaryPredicate1D();
+    virtual std::string getName() const;
+    virtual bool operator ()(Interface1D &inter1, Interface1D &inter2);
+
+
+/* Internal Director utilities */
+public:
+    bool swig_get_inner(const char* name) const {
+      std::map<std::string, bool>::const_iterator iv = inner.find(name);
+      return (iv != inner.end() ? iv->second : false);
+    }
+
+    void swig_set_inner(const char* name, bool val) const
+    { inner[name] = val;}
+
+private:
+    mutable std::map<std::string, bool> inner;
+
+
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+/* VTable implementation */
+    PyObject *swig_get_method(size_t method_index, const char *method_name) const {
+      PyObject *method = vtable[method_index];
+      if (!method) {
+        swig::PyObject_var name = PyString_FromString(method_name);
+        method = PyObject_GetAttr(swig_get_self(), name);
+        if (method == NULL) {
+          std::string msg = "Method in class BinaryPredicate1D doesn't exist, undefined ";
+          msg += method_name;
+          Swig::DirectorMethodException::raise(msg.c_str());
+        }
+        vtable[method_index] = method;
+      };
+      return method;
+    }
+private:
+    mutable swig::PyObject_var vtable[2];
+#endif
+
+};
+
+
+class SwigDirector_StrokeShader : public StrokeShader, public Swig::Director {
+
+public:
+    SwigDirector_StrokeShader(PyObject *self);
+    virtual ~SwigDirector_StrokeShader();
+    virtual std::string getName() const;
+    virtual void shade(Stroke &ioStroke) const;
+
+
+/* Internal Director utilities */
+public:
+    bool swig_get_inner(const char* name) const {
+      std::map<std::string, bool>::const_iterator iv = inner.find(name);
+      return (iv != inner.end() ? iv->second : false);
+    }
+
+    void swig_set_inner(const char* name, bool val) const
+    { inner[name] = val;}
+
+private:
+    mutable std::map<std::string, bool> inner;
+
+
+#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
+/* VTable implementation */
+    PyObject *swig_get_method(size_t method_index, const char *method_name) const {
+      PyObject *method = vtable[method_index];
+      if (!method) {
+        swig::PyObject_var name = PyString_FromString(method_name);
+        method = PyObject_GetAttr(swig_get_self(), name);
+        if (method == NULL) {
+          std::string msg = "Method in class StrokeShader doesn't exist, undefined ";
+          msg += method_name;
+          Swig::DirectorMethodException::raise(msg.c_str());
+        }
+        vtable[method_index] = method;
+      };
+      return method;
+    }
+private:
+    mutable swig::PyObject_var vtable[2];
+#endif
+
+};
+
+
+#endif
diff --git a/extern/freestyle/src/system/BaseIterator.h b/extern/freestyle/src/system/BaseIterator.h
new file mode 100755
index 00000000000..45cc19df4fe
--- /dev/null
+++ b/extern/freestyle/src/system/BaseIterator.h
@@ -0,0 +1,90 @@
+//
+//  Filename         : BaseIterator.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Classes defining the basic "Iterator" design pattern
+//  Date of creation : 18/03/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  BASEITERATOR_H
+# define BASEITERATOR_H
+
+# include <iterator>
+
+// use for iterators defintions
+template <class Element>
+class Nonconst_traits;
+
+template <class Element>
+class Const_traits {
+public:
+  typedef Element value_type;
+  typedef const Element&  reference;
+  typedef const Element*  pointer;
+  typedef ptrdiff_t       difference_type;
+  typedef Nonconst_traits<Element> Non_const_traits;
+};
+
+template <class Element>
+class Nonconst_traits {
+public:
+  typedef Element value_type;
+  typedef Element& reference;
+  typedef Element* pointer;
+  typedef ptrdiff_t       difference_type;
+  typedef Nonconst_traits<Element> Non_const_traits;
+};
+
+class InputIteratorTag_Traits {
+public:
+  typedef std::input_iterator_tag iterator_category;
+};
+
+class BidirectionalIteratorTag_Traits {
+public:
+  typedef std::bidirectional_iterator_tag iterator_category;
+};
+
+template<class Traits, class IteratorTagTraits>
+class IteratorBase
+{
+public:
+
+  virtual ~IteratorBase() {}
+
+  virtual bool begin() const = 0;
+  virtual bool end() const = 0;
+
+  typedef typename IteratorTagTraits::iterator_category     iterator_category;
+  typedef typename Traits::value_type                       value_type;
+  typedef typename Traits::difference_type                  difference_type;
+  typedef typename Traits::pointer                          pointer;
+  typedef typename Traits::reference                        reference;
+
+protected:
+
+  IteratorBase() {}
+};
+
+#endif // BASEITERATOR_H
diff --git a/extern/freestyle/src/system/BaseObject.cpp b/extern/freestyle/src/system/BaseObject.cpp
new file mode 100755
index 00000000000..21d8a77b268
--- /dev/null
+++ b/extern/freestyle/src/system/BaseObject.cpp
@@ -0,0 +1 @@
+#include "BaseObject.h"
\ No newline at end of file
diff --git a/extern/freestyle/src/system/BaseObject.h b/extern/freestyle/src/system/BaseObject.h
new file mode 100755
index 00000000000..a8515f98385
--- /dev/null
+++ b/extern/freestyle/src/system/BaseObject.h
@@ -0,0 +1,73 @@
+//
+//  Filename         : BaseObject.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Base Class for most shared objects (Node, Rep).
+//                     Defines the addRef, release system.
+//                     Inspired by COM IUnknown system.
+//  Date of creation : 06/02/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  BASEOBJECT_H
+# define BASEOBJECT_H
+
+#include "FreestyleConfig.h"
+
+class LIB_SYSTEM_EXPORT BaseObject
+{
+public:
+
+  inline BaseObject() {
+    _ref_counter = 0;
+  }
+
+  virtual ~BaseObject() {}
+
+  /*! At least makes a release on this.
+   *  The BaseObject::destroy method must be 
+   *  explicitely called at the end of any 
+   *  overloaded destroy
+   */
+  virtual int destroy() {
+    return release();
+  }
+
+  /*! Increments the reference counter */
+  inline int addRef() {
+    return ++_ref_counter;
+  }
+
+  /*! Decrements the reference counter */
+  inline int release() { 
+    if (_ref_counter)
+      _ref_counter--;
+    return _ref_counter;
+  }
+
+private:
+
+  unsigned _ref_counter;  
+};
+
+#endif // BASEOBJECT_H
diff --git a/extern/freestyle/src/system/Cast.h b/extern/freestyle/src/system/Cast.h
new file mode 100755
index 00000000000..15af767443e
--- /dev/null
+++ b/extern/freestyle/src/system/Cast.h
@@ -0,0 +1,44 @@
+//
+//  Filename         : Cast.h
+//  Author(s)        : Emmanuel Turquin
+//  Purpose          : Cast function
+//  Date of creation : 01/07/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  CAST_HPP
+# define CAST_HPP
+
+namespace Cast {
+
+  template <class T, class U>
+  U* cast(T* in) {
+    if (!in)
+      return NULL;
+    return dynamic_cast<U*>(in);
+  }
+
+} // end of namespace Cast
+
+#endif // CAST_HPP
diff --git a/extern/freestyle/src/system/Exception.cpp b/extern/freestyle/src/system/Exception.cpp
new file mode 100755
index 00000000000..d1d12d18297
--- /dev/null
+++ b/extern/freestyle/src/system/Exception.cpp
@@ -0,0 +1,24 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "Exception.h"
+
+Exception::exception_type Exception::_exception = Exception::NO_EXCEPTION;
diff --git a/extern/freestyle/src/system/Exception.h b/extern/freestyle/src/system/Exception.h
new file mode 100755
index 00000000000..378de6b558f
--- /dev/null
+++ b/extern/freestyle/src/system/Exception.h
@@ -0,0 +1,64 @@
+//
+//  Filename         : Exception.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Singleton to manage exceptions
+//  Date of creation : 10/01/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  EXCEPTION_H
+# define EXCEPTION_H
+
+# include "FreestyleConfig.h"
+
+class LIB_SYSTEM_EXPORT Exception
+{
+public:
+
+  typedef enum {
+    NO_EXCEPTION,
+    UNDEFINED
+  } exception_type;
+
+  static int getException() {
+    exception_type e = _exception;
+    _exception = NO_EXCEPTION;
+    return e;
+  } 
+
+  static int raiseException(exception_type exception = UNDEFINED) {
+    _exception = exception;
+    return _exception;
+  }
+
+  static void reset() {
+    _exception = NO_EXCEPTION;
+  }
+
+private:
+
+  static exception_type _exception;
+};
+
+#endif // EXCEPTION_H
diff --git a/extern/freestyle/src/system/FreestyleConfig.h b/extern/freestyle/src/system/FreestyleConfig.h
new file mode 100755
index 00000000000..45bd00a402e
--- /dev/null
+++ b/extern/freestyle/src/system/FreestyleConfig.h
@@ -0,0 +1,152 @@
+//
+//  Filename         : Config.h
+//  Author(s)        : Emmanuel Turquin
+//  Purpose          : Configuration definitions
+//  Date of creation : 25/02/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+#ifndef  CONFIG_H
+# define CONFIG_H
+
+# include <string>
+
+using namespace std;
+
+namespace Config {
+
+  // Pi definition
+# ifndef M_PI
+#  define M_PI 3.14159265
+# endif // M_PI
+
+  // Directory separators
+# ifdef WIN32
+  static const string DIR_SEP("\\");
+  static const string PATH_SEP(";");
+# else
+  static const string DIR_SEP("/");
+  static const string PATH_SEP(":");
+# endif // WIN32
+
+  // DLL import/export macros for Win32
+
+# ifdef WIN32
+#  ifdef MAKE_LIB_SYSTEM_DLL
+#   define LIB_SYSTEM_EXPORT __declspec(dllexport)
+#  else
+#   define LIB_SYSTEM_EXPORT __declspec(dllimport)
+#  endif // MAKE_LIB_SYSTEM_DLL
+
+#  ifdef MAKE_LIB_IMAGE_DLL
+#   define LIB_IMAGE_EXPORT __declspec(dllexport)
+#  else
+#   define LIB_IMAGE_EXPORT __declspec(dllimport)
+#  endif // MAKE_LIB_IMAGE_DLL
+
+#  ifdef MAKE_LIB_GEOMETRY_DLL
+#   define LIB_GEOMETRY_EXPORT __declspec(dllexport)
+#  else
+#   define LIB_GEOMETRY_EXPORT __declspec(dllimport)
+#  endif // MAKE_LIB_GEOMETRY_DLL
+
+#  ifdef MAKE_LIB_SCENE_GRAPH_DLL
+#   define LIB_SCENE_GRAPH_EXPORT __declspec(dllexport)
+#  else
+#   define LIB_SCENE_GRAPH_EXPORT __declspec(dllimport)
+#  endif // MAKE_LIB_SCENE_GRAPH_DLL
+
+#  ifdef MAKE_LIB_WINGED_EDGE_DLL
+#   define LIB_WINGED_EDGE_EXPORT __declspec(dllexport)
+#  else
+#   define LIB_WINGED_EDGE_EXPORT __declspec(dllimport)
+#  endif // MAKE_LIB_WINGED_EDGE_DLL
+
+#  ifdef MAKE_LIB_VIEW_MAP_DLL
+#   define LIB_VIEW_MAP_EXPORT __declspec(dllexport)
+#  else
+#   define LIB_VIEW_MAP_EXPORT __declspec(dllimport)
+#  endif // MAKE_LIB_VIEW_MAP_DLL
+
+#  ifdef MAKE_LIB_STROKE_DLL
+#   define LIB_STROKE_EXPORT __declspec(dllexport)
+#  else
+#   define LIB_STROKE_EXPORT __declspec(dllimport)
+#  endif // MAKE_LIB_STROKE_DLL
+
+#  ifdef MAKE_LIB_RENDERING_DLL
+#   define LIB_RENDERING_EXPORT __declspec(dllexport)
+#  else
+#   define LIB_RENDERING_EXPORT __declspec(dllimport)
+#  endif // MAKE_LIB_RENDERING_DLL
+
+#  ifdef MAKE_LIB_WRAPPER_DLL
+#   define LIB_WRAPPER_EXPORT __declspec(dllexport)
+#  else
+#   define LIB_WRAPPER_EXPORT __declspec(dllimport)
+#  endif // MAKE_LIB_WRAPPER_DLL
+
+# else
+#  ifndef LIB_SYSTEM_EXPORT
+#   define LIB_SYSTEM_EXPORT
+#  endif // LIB_SYSTEM_EXPORT
+
+#  ifndef LIB_IMAGE_EXPORT
+#   define LIB_IMAGE_EXPORT
+#  endif // LIB_IMAGE_EXPORT
+
+#  ifndef LIB_GEOMETRY_EXPORT
+#   define LIB_GEOMETRY_EXPORT
+#  endif // LIB_GEOMETRY_EXPORT
+
+#  ifndef LIB_SCENE_GRAPH_EXPORT
+#   define LIB_SCENE_GRAPH_EXPORT
+#  endif // LIB_SCENE_GRAPH_EXPORT
+
+#  ifndef LIB_WINGED_EDGE_EXPORT
+#   define LIB_WINGED_EDGE_EXPORT
+#  endif // LIB_WINGED_EDGE_EXPORT
+
+#  ifndef LIB_VIEW_MAP_EXPORT
+#   define LIB_VIEW_MAP_EXPORT
+#  endif // LIB_VIEW_MAP_EXPORT
+
+#  ifndef LIB_STROKE_EXPORT
+#   define LIB_STROKE_EXPORT
+#  endif // LIB_STROKE_EXPORT
+
+#  ifndef LIB_RENDERING_EXPORT
+#   define LIB_RENDERING_EXPORT
+#  endif // LIB_RENDERING_EXPORT
+
+#  ifndef LIB_WRAPPER_EXPORT
+#   define LIB_WRAPPER_EXPORT
+#  endif // LIB_WRAPPER_EXPORT
+
+# endif // WIN32
+
+} // end of namespace Config
+
+#endif // CONFIG_H
diff --git a/extern/freestyle/src/system/Id.h b/extern/freestyle/src/system/Id.h
new file mode 100755
index 00000000000..1f2206ed337
--- /dev/null
+++ b/extern/freestyle/src/system/Id.h
@@ -0,0 +1,126 @@
+//
+//  Filename         : Id.h
+//  Author(s)        : Emmanuel Turquin
+//  Purpose          : Identification system
+//  Date of creation : 01/07/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  ID_H
+# define ID_H
+
+/*! Class used to tag any object by an id .
+ *  It is made of two unsigned integers.
+ */
+class Id
+{
+public:
+
+  typedef unsigned id_type;
+
+  /*! Default constructor */
+  Id() {
+    _first = 0;
+    _second = 0;
+  }
+
+  /*! Builds an Id from an integer.
+   *  The second number is set to 0.
+   */
+  Id(id_type id) {
+    _first = id;
+    _second = 0;
+  }
+
+  /*! Builds the Id from the two numbers */
+  Id(id_type ifirst, id_type isecond) {
+    _first = ifirst;
+    _second = isecond;
+  }
+
+  /*! Copy constructor */
+  Id(const Id& iBrother) {
+    _first = iBrother._first;
+    _second = iBrother._second;
+  }
+
+  /*! Operator= */
+  Id& operator=(const Id& iBrother) {
+   _first = iBrother._first;
+   _second = iBrother._second;
+    return *this;
+  } 
+
+  /*! Returns the first Id number */
+  id_type getFirst() const {
+    return _first;
+  }
+
+  /*! Returns the second Id number */
+  id_type getSecond() const {
+    return _second;
+  }
+
+  /*! Sets the first number constituing the Id */
+  void setFirst(id_type first) {
+    _first = first;
+  }
+
+  /*! Sets the second number constituing the Id */
+  void setSecond(id_type second) {
+    _second = second;
+  }
+  
+  /*! Operator== */
+  bool operator==(const Id& id) const {
+    return ((_first == id._first) && (_second == id._second));
+  }
+
+  /*! Operator!= */
+  bool operator!=(const Id& id) const {
+    return !((*this)==id);
+  }
+  
+  /*! Operator< */
+  bool operator<(const Id& id) const {
+    if (_first < id._first)
+      return true;
+    if (_first == id._first && _second < id._second)
+      return true;
+    return false;
+}
+
+private:
+
+  id_type _first;
+  id_type _second;
+};
+
+// stream operator
+inline std::ostream& operator<<(std::ostream& s, const Id& id) {
+  s << "[" << id.getFirst() << ", " << id.getSecond() << "]";
+  return s;
+}
+
+# endif // ID_H
diff --git a/extern/freestyle/src/system/Interpreter.h b/extern/freestyle/src/system/Interpreter.h
new file mode 100755
index 00000000000..ce603b17238
--- /dev/null
+++ b/extern/freestyle/src/system/Interpreter.h
@@ -0,0 +1,56 @@
+//
+//  Filename         : Interpreter.h
+//  Author(s)        : Emmanuel Turquin
+//  Purpose          : Base Class of all script interpreters
+//  Date of creation : 17/04/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  INTERPRETER_H
+# define INTERPRETER_H
+
+# include <string>
+
+using namespace std;
+
+class LIB_SYSTEM_EXPORT Interpreter
+{
+ public:
+
+  Interpreter() { _language = "Unknown"; }
+
+  virtual int interpretCmd(const string& cmd) = 0;
+
+  virtual int interpretFile(const string& filename) = 0;
+
+  virtual string getLanguage() const { return _language; }
+
+  virtual void reset() = 0;
+
+ protected:
+
+  string _language;
+};
+
+#endif // INTERPRETER_H
diff --git a/extern/freestyle/src/system/Precision.h b/extern/freestyle/src/system/Precision.h
new file mode 100755
index 00000000000..24327a280df
--- /dev/null
+++ b/extern/freestyle/src/system/Precision.h
@@ -0,0 +1,39 @@
+//
+//  Filename         : Precision.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Define the float precision used in the program
+//  Date of creation : 30/07/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  PRECISION_H
+# define PRECISION_H
+
+typedef double real;
+
+# ifndef SWIG
+static const real M_EPSILON  = 0.00000001;
+# endif // SWIG
+
+#endif // PRECISION_H
diff --git a/extern/freestyle/src/system/ProgressBar.h b/extern/freestyle/src/system/ProgressBar.h
new file mode 100755
index 00000000000..5b61f936c90
--- /dev/null
+++ b/extern/freestyle/src/system/ProgressBar.h
@@ -0,0 +1,85 @@
+//
+//  Filename         : ProgressBar.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Class to encapsulate a progress bar
+//  Date of creation : 27/08/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  PROGRESSBAR_H
+# define PROGRESSBAR_H
+
+# include <string>
+
+using namespace std;
+
+class ProgressBar
+{
+public:
+
+  inline ProgressBar() {
+    _numtotalsteps = 0;
+    _progress = 0;
+  }
+
+  virtual ~ProgressBar() {}
+
+  virtual void reset() {
+    _numtotalsteps = 0;
+    _progress = 0;
+  }
+
+  virtual void setTotalSteps(unsigned n) {
+    _numtotalsteps = n;
+  }
+
+  virtual void setProgress(unsigned i) {
+    _progress = i;
+  }
+
+  virtual void setLabelText(const string& s) {
+    _label = s;
+  }
+
+  /*! accessors */
+  inline unsigned int getTotalSteps() const {
+    return _numtotalsteps;
+  }
+
+  inline unsigned int getProgress() const {
+    return _progress;
+  }
+
+  inline string getLabelText() const {
+    return _label;
+  }
+ 
+protected:
+
+  unsigned _numtotalsteps;
+  unsigned _progress;
+  string _label;
+};
+
+#endif // PROGRESSBAR_H
diff --git a/extern/freestyle/src/system/PseudoNoise.cpp b/extern/freestyle/src/system/PseudoNoise.cpp
new file mode 100755
index 00000000000..59332229ae2
--- /dev/null
+++ b/extern/freestyle/src/system/PseudoNoise.cpp
@@ -0,0 +1,108 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include <math.h>
+#include "RandGen.h"
+#include "PseudoNoise.h"
+
+static const unsigned NB_VALUE_NOISE = 512;
+
+real *PseudoNoise::_values;
+
+PseudoNoise::PseudoNoise ()
+{
+}
+
+void
+PseudoNoise::init (long seed)
+{
+  _values = new real[NB_VALUE_NOISE];
+  RandGen::srand48(seed);
+  for (int i=0; i<NB_VALUE_NOISE; i++)
+    _values[i] = -1.0 + 2.0 * RandGen::drand48();
+}
+
+real 
+PseudoNoise::linearNoise (real x)
+{
+  int i = x*NB_VALUE_NOISE;
+  real x1=_values[i%NB_VALUE_NOISE], x2=_values[(i+1)%NB_VALUE_NOISE];
+  real t=x*real(NB_VALUE_NOISE)-real(i);
+  return x1*(1-t)+x2*t;
+}
+
+real 
+LanczosWindowed(real t)
+{
+  if (fabs(t)>2) return 0;
+  if (fabs(t)<M_EPSILON) return 1.0;
+  return sin(M_PI*t)/(M_PI*t) * sin(M_PI*t/2.0)/(M_PI*t/2.0);
+}
+
+real 
+PseudoNoise::smoothNoise (real x)
+{
+  int i = x*NB_VALUE_NOISE;
+  real t=x*real(NB_VALUE_NOISE)-real(i);
+  if (i - 1 < 0)
+    {
+      int plus=-i/NB_VALUE_NOISE;
+      i=i+NB_VALUE_NOISE*(plus+2);
+      t=(x+plus+2)*real(NB_VALUE_NOISE)-real(i);
+    }
+
+  real x1=_values[i%NB_VALUE_NOISE], x2=_values[(i+1)%NB_VALUE_NOISE];
+  real x0=_values[(i-1)%NB_VALUE_NOISE], x3=_values[(i+2)%NB_VALUE_NOISE];
+
+  real y0=LanczosWindowed(-1-t);
+  real y1=LanczosWindowed(-t);
+  real y2=LanczosWindowed(1-t);
+  real y3=LanczosWindowed(2-t);
+  //	cerr<<"x0="<<x0<<"  x1="<<x1<<"  x2="<<x2<<"  x3="<<x3<<endl;
+  //	cerr<<"y0="<<y0<<"  y1="<<y1<<"  y2="<<y2<<"  y3="<<y3<<"  :";
+  return (x0*y0+x1*y1+x2*y2+x3*y3)/(y0+y1+y2+y3);
+}
+
+real 
+PseudoNoise::turbulenceSmooth (real x, unsigned nbOctave)
+{
+  real y=0;
+  real k=1.0;
+  for (unsigned i=0; i<nbOctave; i++)
+    {
+      y=y+k*smoothNoise(x*k);
+      k=k/2.0;
+    }
+  return y;
+}
+
+real 
+PseudoNoise::turbulenceLinear (real x, unsigned nbOctave)
+{
+  real y=0;
+  real k=1.0;
+  for (unsigned i=0; i<nbOctave; i++)
+    {
+      y=y+k*linearNoise(x*k);
+      k=k/2.0;
+    }
+  return y;
+}
diff --git a/extern/freestyle/src/system/PseudoNoise.h b/extern/freestyle/src/system/PseudoNoise.h
new file mode 100755
index 00000000000..43143865600
--- /dev/null
+++ b/extern/freestyle/src/system/PseudoNoise.h
@@ -0,0 +1,58 @@
+//
+//  Filename         : PseudoNoise.h
+//  Author(s)        : Fredo Durand
+//  Purpose          : Class to define a pseudo Perlin noise
+//  Date of creation : 16/06/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  PSEUDONOISE_H
+# define PSEUDONOISE_H
+
+# include "FreestyleConfig.h"
+# include "Precision.h"
+
+class LIB_SYSTEM_EXPORT PseudoNoise 
+{
+public:
+
+  PseudoNoise ();
+
+  virtual ~PseudoNoise () {}
+	
+  real smoothNoise (real x);
+  real linearNoise (real x);
+
+  real turbulenceSmooth (real x, unsigned nbOctave = 8);
+  real turbulenceLinear (real x, unsigned nbOctave = 8);
+
+  static void init (long seed);
+
+protected:
+
+  static real *_values;
+};
+
+#endif // PSEUDONOISE_H
+
diff --git a/extern/freestyle/src/system/PythonInterpreter.cpp b/extern/freestyle/src/system/PythonInterpreter.cpp
new file mode 100755
index 00000000000..821bd32b40b
--- /dev/null
+++ b/extern/freestyle/src/system/PythonInterpreter.cpp
@@ -0,0 +1,25 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "PythonInterpreter.h"
+
+string	PythonInterpreter::_path = "";
+bool	PythonInterpreter::_initialized = false;
diff --git a/extern/freestyle/src/system/PythonInterpreter.h b/extern/freestyle/src/system/PythonInterpreter.h
new file mode 100755
index 00000000000..f9a573ffb86
--- /dev/null
+++ b/extern/freestyle/src/system/PythonInterpreter.h
@@ -0,0 +1,111 @@
+//
+//  Filename         : PythonInterpreter.h
+//  Author(s)        : Emmanuel Turquin
+//  Purpose          : Python Interpreter
+//  Date of creation : 17/04/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  PYTHON_INTERPRETER_H
+# define PYTHON_INTERPRETER_H
+
+# include <iostream>
+# include <Python.h>
+# include "StringUtils.h"
+# include "Interpreter.h"
+
+class LIB_SYSTEM_EXPORT PythonInterpreter : public Interpreter
+{
+ public:
+
+  PythonInterpreter() {
+    _language = "Python";
+    Py_Initialize();
+  }
+
+  virtual ~PythonInterpreter() {
+    Py_Finalize();
+  }
+
+  int interpretCmd(const string& cmd) {
+    initPath();
+    char* c_cmd = strdup(cmd.c_str());
+    int err = PyRun_SimpleString(c_cmd);
+    free(c_cmd);
+    return err;
+  }
+
+  int interpretFile(const string& filename) {
+    initPath();
+    string cmd("execfile(\"" + filename + "\")");
+    char* c_cmd = strdup(cmd.c_str());
+    int err = PyRun_SimpleString(c_cmd);
+    free(c_cmd);
+    return err;
+  }
+
+  struct Options
+  {
+    static void setPythonPath(const string& path) {
+      _path = path;
+    }
+
+    static string getPythonPath() {
+      return _path;
+    }
+  };
+
+  void reset() {
+    Py_Finalize();
+    Py_Initialize();
+    _initialized = false;
+  }
+
+private:
+
+  static void initPath() {
+    if (_initialized)
+      return;
+    PyRun_SimpleString("import sys");
+    vector<string> pathnames;
+    StringUtils::getPathName(_path, "", pathnames);
+    string cmd;
+    char* c_cmd;
+    for (vector<string>::const_iterator it = pathnames.begin();
+	 it != pathnames.end();
+	 ++it) {
+      cmd = "sys.path.append(\"" + *it + "\")";
+      c_cmd = strdup(cmd.c_str());
+      PyRun_SimpleString(c_cmd);
+      free(c_cmd);
+    }
+    //    PyRun_SimpleString("from Freestyle import *");
+    _initialized = true;
+  }
+
+  static bool	_initialized;
+  static string _path;
+};
+
+#endif // PYTHON_INTERPRETER_H
diff --git a/extern/freestyle/src/system/RandGen.cpp b/extern/freestyle/src/system/RandGen.cpp
new file mode 100755
index 00000000000..a328cb7f583
--- /dev/null
+++ b/extern/freestyle/src/system/RandGen.cpp
@@ -0,0 +1,86 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "RandGen.h"
+
+//
+// Macro definitions
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#define N	16
+#define MASK	((unsigned)(1 << (N - 1)) + (1 << (N - 1)) - 1)
+#define X0	0x330E
+#define X1	0xABCD
+#define X2	0x1234
+#define A0	0xE66D
+#define A1	0xDEEC
+#define A2	0x5
+#define C	0xB
+#define HI_BIT	(1L << (2 * N - 1))
+
+#define LOW(x)	((unsigned)(x) & MASK)
+#define HIGH(x)	LOW((x) >> N)
+#define MUL(x, y, z)	{ long l = (long)(x) * (long)(y); \
+		(z)[0] = LOW(l); (z)[1] = HIGH(l); }
+#define CARRY(x, y)	((unsigned long)((long)(x) + (long)(y)) > MASK)
+#define ADDEQU(x, y, z)	(z = CARRY(x, (y)), x = LOW(x + (y)))
+#define SET3(x, x0, x1, x2)	((x)[0] = (x0), (x)[1] = (x1), (x)[2] = (x2))
+#define SETLOW(x, y, n) SET3(x, LOW((y)[n]), LOW((y)[(n)+1]), LOW((y)[(n)+2]))
+#define SEED(x0, x1, x2) (SET3(x, x0, x1, x2), SET3(a, A0, A1, A2), c = C)
+#define REST(v)	for (i = 0; i < 3; i++) { xsubi[i] = x[i]; x[i] = temp[i]; } \
+		return (v);
+#define NEST(TYPE, f, F)	TYPE f(register unsigned short *xsubi) { \
+	register int i; register TYPE v; unsigned temp[3]; \
+	for (i = 0; i < 3; i++) { temp[i] = x[i]; x[i] = LOW(xsubi[i]); }  \
+	v = F(); REST(v); }
+
+static unsigned x[3] = { X0, X1, X2 }, a[3] = { A0, A1, A2 }, c = C;
+
+//
+// Methods implementation
+//
+///////////////////////////////////////////////////////////////////////////////
+
+real RandGen::drand48() {
+  static real two16m = 1.0 / (1L << N);
+  next();
+  return (two16m * (two16m * (two16m * x[0] + x[1]) + x[2]));
+}
+
+void RandGen::srand48(long seedval) {
+  SEED(X0, LOW(seedval), HIGH(seedval));
+}
+
+void RandGen::next() {
+  unsigned p[2], q[2], r[2], carry0, carry1;
+  
+  MUL(a[0], x[0], p);
+  ADDEQU(p[0], c, carry0);
+  ADDEQU(p[1], carry0, carry1);
+  MUL(a[0], x[1], q);
+  ADDEQU(p[1], q[0], carry0);
+  MUL(a[1], x[0], r);
+  x[2] = LOW(carry0 + carry1 + CARRY(p[1], r[0]) + q[1] + r[1] +
+	     a[0] * x[2] + a[1] * x[1] + a[2] * x[0]);
+  x[1] = LOW(p[1] + r[0]);
+  x[0] = LOW(p[0]);
+}
diff --git a/extern/freestyle/src/system/RandGen.h b/extern/freestyle/src/system/RandGen.h
new file mode 100755
index 00000000000..409d3b79609
--- /dev/null
+++ b/extern/freestyle/src/system/RandGen.h
@@ -0,0 +1,48 @@
+//
+//  Filename         : RandGen.h
+//  Author(s)        : Fredo Durand
+//  Purpose          : Pseudo-random number generator
+//  Date of creation : 20/05/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  RAND_GEN_H
+# define RAND_GEN_H
+
+# include "FreestyleConfig.h"
+# include "../system/Precision.h"
+
+class LIB_SYSTEM_EXPORT RandGen
+{
+public:
+
+  static real	drand48();
+  static void	srand48(long value);
+
+private:
+
+  static void	next();
+};
+
+#endif // RAND_GEN_H
diff --git a/extern/freestyle/src/system/StringUtils.cpp b/extern/freestyle/src/system/StringUtils.cpp
new file mode 100755
index 00000000000..2af76feeb37
--- /dev/null
+++ b/extern/freestyle/src/system/StringUtils.cpp
@@ -0,0 +1,46 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include <qfileinfo.h>
+#include "FreestyleConfig.h"
+#include "StringUtils.h"
+
+namespace StringUtils {
+
+  void getPathName(const string& path, const string& base, vector<string>& pathnames) {
+    string dir;
+    unsigned size = path.size();
+    pathnames.push_back(base);
+    for (unsigned pos = 0, sep = path.find(Config::PATH_SEP, pos);
+	 pos < size;
+	 pos = sep + 1, sep = path.find(Config::PATH_SEP, pos)) {
+      if (sep == (unsigned)string::npos)
+	sep = size;
+      dir = path.substr(pos, sep - pos);
+      QFileInfo fi(dir.c_str());
+      string res = (const char*)fi.absoluteFilePath().toAscii();
+      if (!base.empty())
+	res += Config::DIR_SEP + base;
+      pathnames.push_back(res);
+    }
+  }
+
+} // end of namespace StringUtils
diff --git a/extern/freestyle/src/system/StringUtils.h b/extern/freestyle/src/system/StringUtils.h
new file mode 100755
index 00000000000..44adfc2b044
--- /dev/null
+++ b/extern/freestyle/src/system/StringUtils.h
@@ -0,0 +1,51 @@
+//
+//  Filename         : StringUtils.h
+//  Author(s)        : Emmanuel Turquin
+//  Purpose          : String utilities
+//  Date of creation : 20/05/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  STRING_UTILS_H
+# define STRING_UTILS_H
+
+# include <vector>
+# include <string>
+# include "FreestyleConfig.h"
+
+using namespace std;
+
+namespace StringUtils {
+
+  LIB_SYSTEM_EXPORT 
+  void getPathName(const string& path, const string& base, vector<string>& pathnames);
+
+  // STL related
+  struct ltstr{
+  bool operator()(const char* s1, const char* s2) const{
+    return strcmp(s1, s2) < 0;
+  }
+};
+
+} // end of namespace StringUtils
+
+#endif // STRING_UTILS_H
diff --git a/extern/freestyle/src/system/TimeStamp.cpp b/extern/freestyle/src/system/TimeStamp.cpp
new file mode 100755
index 00000000000..c66e1131611
--- /dev/null
+++ b/extern/freestyle/src/system/TimeStamp.cpp
@@ -0,0 +1,25 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "TimeStamp.h"
+
+LIB_SYSTEM_EXPORT 
+TimeStamp* TimeStamp::_instance = 0;
diff --git a/extern/freestyle/src/system/TimeStamp.h b/extern/freestyle/src/system/TimeStamp.h
new file mode 100755
index 00000000000..568a7851e30
--- /dev/null
+++ b/extern/freestyle/src/system/TimeStamp.h
@@ -0,0 +1,71 @@
+//
+//  Filename         : TimeStamp.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Class defining a singleton used as timestamp
+//  Date of creation : 12/12/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  TIMESTAMP_H
+# define TIMESTAMP_H
+
+# include "FreestyleConfig.h"
+
+class LIB_SYSTEM_EXPORT TimeStamp 
+{
+ public:
+
+  static inline TimeStamp* instance() {
+    if (_instance == 0)
+      _instance = new TimeStamp;
+    return _instance;
+  }
+
+  inline unsigned getTimeStamp() const {
+    return _time_stamp;
+  }
+
+  inline void increment() {
+    ++_time_stamp;
+  }
+
+  inline void reset() {
+    _time_stamp = 1;
+  }
+
+ protected:
+  
+  TimeStamp() {
+    _time_stamp = 1;
+  }
+
+  TimeStamp(const TimeStamp&) {}
+
+ private:
+
+  static TimeStamp* _instance;
+  unsigned _time_stamp;
+};
+
+#endif // TIMESTAMP_H
diff --git a/extern/freestyle/src/system/TimeUtils.h b/extern/freestyle/src/system/TimeUtils.h
new file mode 100755
index 00000000000..99dd5b0a669
--- /dev/null
+++ b/extern/freestyle/src/system/TimeUtils.h
@@ -0,0 +1,58 @@
+//
+//  Filename         : TimeUtils.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Class to measure ellapsed time
+//  Date of creation : 10/04/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  TIMEUTILS_H
+# define TIMEUTILS_H
+
+#include <time.h>
+#include "FreestyleConfig.h"
+
+class Chronometer 
+{
+ public:
+
+  inline Chronometer() {}
+  inline ~Chronometer() {}
+
+  inline clock_t start() {
+    _start = clock();
+    return _start;
+  }
+
+  inline double stop() {
+    clock_t stop = clock();
+    return (double)(stop - _start) / CLOCKS_PER_SEC ;
+  }
+
+ private:
+
+  clock_t _start;
+};
+
+#endif // TIMEUTILS_H
diff --git a/extern/freestyle/src/system/src.pri b/extern/freestyle/src/system/src.pri
new file mode 100755
index 00000000000..e7d69e142b4
--- /dev/null
+++ b/extern/freestyle/src/system/src.pri
@@ -0,0 +1,30 @@
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#			      W A R N I N G ! ! !                             #
+#             a u t h o r i z e d    p e r s o n a l    o n l y               #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+
+SYSTEM_DIR = ../system
+
+SOURCES *= $${SYSTEM_DIR}/Exception.cpp \
+	   $${SYSTEM_DIR}/PythonInterpreter.cpp \
+	   $${SYSTEM_DIR}/RandGen.cpp \
+	   $${SYSTEM_DIR}/StringUtils.cpp \
+	   $${SYSTEM_DIR}/TimeStamp.cpp \
+	   $${SYSTEM_DIR}/PseudoNoise.cpp \
+           $${SYSTEM_DIR}/BaseObject.cpp
+
+HEADERS *= $${SYSTEM_DIR}/BaseObject.h \
+	   $${SYSTEM_DIR}/BaseIterator.h \
+	   $${SYSTEM_DIR}/Cast.h \
+	   $${SYSTEM_DIR}/FreestyleConfig.h \
+	   $${SYSTEM_DIR}/Exception.h \
+	   $${SYSTEM_DIR}/Id.h \
+	   $${SYSTEM_DIR}/Interpreter.h \
+	   $${SYSTEM_DIR}/ProgressBar.h \
+	   $${SYSTEM_DIR}/PythonInterpreter.h \
+	   $${SYSTEM_DIR}/RandGen.h \
+	   $${SYSTEM_DIR}/StringUtils.h \
+	   $${SYSTEM_DIR}/TimeStamp.h \
+	   $${SYSTEM_DIR}/TimeUtils.h \
+	   $${SYSTEM_DIR}/PseudoNoise.h \
+	   $${SYSTEM_DIR}/Precision.h
diff --git a/extern/freestyle/src/system/system.pro b/extern/freestyle/src/system/system.pro
new file mode 100755
index 00000000000..495cdf47105
--- /dev/null
+++ b/extern/freestyle/src/system/system.pro
@@ -0,0 +1,73 @@
+# This file should be viewed as a -*- mode: Makefile -*-
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#			      W A R N I N G ! ! !                             #
+#             a u t h o r i z e d    p e r s o n a l    o n l y               #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+
+include(../Config.pri)
+
+FOO_LIB_VERSION	= $${APPVERSION_MAJ}$${APPVERSION_MID}
+TEMPLATE        = lib
+TARGET          = $${LIB_SYSTEM}
+VERSION         = $${APPVERSION}
+TARGET_VERSION_EXT = $${APPVERSION_MAJ}.$${APPVERSION_MID}
+
+#
+# CONFIG
+#
+#######################################
+
+CONFIG          *= dll python$${PYTHON_VERSION_MAJ}.$${PYTHON_VERSION_MIN}
+QT += xml
+
+exists (../libconfig.pri) {
+  include (../libconfig.pri)
+}
+#
+# INCLUDE PATH
+#
+#######################################
+
+
+#
+# DEFINES
+#
+#######################################
+
+win32:DEFINES   *= MAKE_LIB_SYSTEM_DLL
+
+#
+# BUILD DIRECTORIES
+#
+#######################################
+
+BUILD_DIR       = ../../build/
+
+OBJECTS_DIR     = $${BUILD_DIR}/$${REL_OBJECTS_DIR}
+!win32:DESTDIR  = $${BUILD_DIR}/$${REL_DESTDIR}/lib
+win32:DESTDIR   = $${BUILD_DIR}/$${REL_DESTDIR}
+
+#win32:QMAKE_POST_LINK = "$$QMAKE_MOVE $${DESTDIR}/$${TARGET}$${LIBVERSION}.lib $${DESTDIR}\$${TARGET}$${FOO_LIB_VERSION}.lib"
+
+#
+# INSTALL
+#
+#######################################
+
+LIB_DIR       = ../../lib
+# install library
+target.path   = $$LIB_DIR
+# "make install" configuration options
+INSTALLS     += target
+
+
+#
+# SOURCES & HEADERS
+#
+#######################################
+
+!static {
+  include(src.pri)
+}
+
diff --git a/extern/freestyle/src/view_map/FEdgeXDetector.cpp b/extern/freestyle/src/view_map/FEdgeXDetector.cpp
new file mode 100755
index 00000000000..628b3ad77aa
--- /dev/null
+++ b/extern/freestyle/src/view_map/FEdgeXDetector.cpp
@@ -0,0 +1,677 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "FEdgeXDetector.h"
+#include "float.h"
+#include "../geometry/GeomUtils.h"
+#include <math.h>
+#include "../geometry/normal_cycle.h"
+
+void FEdgeXDetector::processShapes(WingedEdge& we) {
+  bool progressBarDisplay = false;
+  Vec3r Min, Max;
+  vector<WShape*> wshapes = we.getWShapes();
+  WXShape * wxs;
+
+  if(_pProgressBar != NULL) {
+    _pProgressBar->reset();
+    _pProgressBar->setLabelText("Detecting feature lines");
+    _pProgressBar->setTotalSteps(wshapes.size() * 3);
+    _pProgressBar->setProgress(0);
+    progressBarDisplay = true;
+  }
+
+  for(vector<WShape*>::const_iterator it = wshapes.begin();
+  it != wshapes.end();
+  it++){
+    wxs = dynamic_cast<WXShape*>(*it);
+    wxs->bbox(Min, Max);
+    _bbox_diagonal = (Max-Min).norm();
+    if(_changes){
+      vector<WFace*>& wfaces = wxs->GetFaceList();
+      for(vector<WFace*>::iterator wf=wfaces.begin(), wfend=wfaces.end();
+      wf!=wfend;
+      ++wf){
+        WXFace* wxf = dynamic_cast<WXFace*>(*wf);
+        wxf->Clear();
+      }
+      _computeViewIndependant = true;
+    } else if (!(wxs)->getComputeViewIndependantFlag()) {
+      wxs->Reset();
+      _computeViewIndependant = false;
+    } else {
+      _computeViewIndependant = true;
+    }
+    preProcessShape(wxs);
+    if (progressBarDisplay)
+      _pProgressBar->setProgress(_pProgressBar->getProgress() + 1);
+    processBorderShape(wxs);
+    processCreaseShape(wxs);
+    if(_computeRidgesAndValleys)
+      processRidgesAndValleysShape(wxs);
+    if(_computeSuggestiveContours)
+      processSuggestiveContourShape(wxs);
+    processSilhouetteShape(wxs);
+    if (progressBarDisplay)
+      _pProgressBar->setProgress(_pProgressBar->getProgress() + 1);
+
+    // build smooth edges:
+    buildSmoothEdges(wxs);
+
+    // Post processing for suggestive contours
+    if(_computeSuggestiveContours)
+      postProcessSuggestiveContourShape(wxs);
+    if (progressBarDisplay)
+      _pProgressBar->setProgress(_pProgressBar->getProgress() + 1);
+
+    wxs->setComputeViewIndependantFlag(false);
+    _computeViewIndependant = false;
+    _changes = false;
+
+    // reset user data
+    (*it)->ResetUserData();
+  }
+}
+
+// GENERAL STUFF
+////////////////
+void FEdgeXDetector::preProcessShape(WXShape* iWShape) {
+  _meanK1 = 0;
+  _meanKr = 0;
+  _minK1 = FLT_MAX;
+  _maxK1 = -FLT_MAX;
+  _minKr = FLT_MAX;
+  _maxKr = -FLT_MAX;
+  _nPoints = 0;
+  _meanEdgeSize = iWShape->getMeanEdgeSize();
+  
+  vector<WFace*>& wfaces = iWShape->GetFaceList();
+  vector<WFace*>::iterator f,fend;
+  // view dependant stuff
+  for(f=wfaces.begin(), fend=wfaces.end();
+  f!=fend;
+  ++f){
+    preProcessFace((WXFace*)(*f));
+  }
+
+  vector<WVertex*>& wvertices = iWShape->GetVertexList();
+  for(vector<WVertex*>::iterator wv=wvertices.begin(), wvend=wvertices.end(); 
+  wv!=wvend;
+  ++wv){
+    // Compute curvatures
+    WXVertex * wxv = dynamic_cast<WXVertex*>(*wv);
+    computeCurvatures(wxv);
+  }
+  _meanK1 /= (real)(_nPoints);
+  _meanKr /= (real)(_nPoints);
+}
+
+void FEdgeXDetector::preProcessFace(WXFace *iFace){
+  Vec3r firstPoint = iFace->GetVertex(0)->GetVertex();
+  Vec3r N = iFace->GetNormal();
+
+  // Compute the dot product between V (=_Viewpoint - firstPoint) and N:
+  Vec3r V(_Viewpoint - firstPoint);
+  N.normalize();
+  V.normalize();
+  iFace->SetDotP(N * V);
+  
+  // compute the distance between the face center and the viewpoint:
+  Vec3r dist_vec(iFace->center() - _Viewpoint);
+  iFace->SetZ(dist_vec.norm());
+}
+
+void FEdgeXDetector::computeCurvatures(WXVertex *vertex){
+   // CURVATURE LAYER
+  // store all the curvature datas for each vertex
+
+  real K1, K2, cos2theta, sin2theta;
+  Vec3r e1, n, v;
+  // one vertex curvature info :
+  CurvatureInfo *C;
+  float radius = _sphereRadius*_meanEdgeSize; 
+  
+  // view independant stuff
+  if(_computeViewIndependant){
+    C = new CurvatureInfo();   
+    vertex->setCurvatures(C);
+    OGF::NormalCycle ncycle ;
+    ncycle.begin() ;
+    if(radius > 0) {
+      OGF::compute_curvature_tensor(vertex, radius, ncycle) ;
+    } else {
+      OGF::compute_curvature_tensor_one_ring(vertex, ncycle) ;
+    }
+    ncycle.end() ;
+    C->K1 = ncycle.kmin();
+    C->K2 = ncycle.kmax();
+    C->e1 = ncycle.Kmax(); //ncycle.kmin() * ncycle.Kmax();
+    C->e2 = ncycle.Kmin(); //ncycle.kmax() * ncycle.Kmin() ;
+
+    real absK1 = fabs(C->K1);
+    _meanK1 += absK1;
+    if(absK1 > _maxK1)
+      _maxK1 = absK1;
+    if(absK1 < _minK1)
+      _minK1 = absK1;
+  }
+  // view dependant
+  C = vertex->curvatures();
+  if(C == 0)
+    return;
+    
+  // compute radial curvature :
+  n = C->e1 ^ C->e2;
+  v = _Viewpoint - vertex->GetVertex();
+  C->er = v - (v * n) * n;
+  C->er.normalize();
+  e1 = C->e1;
+  e1.normalize();
+  cos2theta = C->er * e1;
+  cos2theta *= cos2theta;
+  sin2theta = 1 - cos2theta;
+  C->Kr = C->K1 * cos2theta + C->K2 * sin2theta;
+  real absKr = fabs(C->Kr);
+  _meanKr += absKr;
+  if(absKr > _maxKr)
+    _maxKr = absKr;
+  if(absKr < _minKr)
+    _minKr = absKr;
+
+  ++_nPoints;
+}
+
+// SILHOUETTE
+/////////////
+void FEdgeXDetector::processSilhouetteShape(WXShape* iWShape) {
+  // Make a first pass on every polygons in order 
+  // to compute all their silhouette relative values:
+  //------------------------------------------------
+  vector<WFace*>& wfaces = iWShape->GetFaceList();
+  vector<WFace*>::iterator f,fend;
+  for(f=wfaces.begin(), fend=wfaces.end();
+  f!=fend;
+  ++f)
+  {
+    ProcessSilhouetteFace((WXFace*)(*f));
+  }
+
+  // Make a pass on the edges to detect 
+  // the silhouette edges that are not smooth
+  // --------------------
+  vector<WEdge*>::iterator we, weend;
+  vector<WEdge*> &wedges = iWShape->GetEdgeList();
+  for(we=wedges.begin(), weend=wedges.end();
+  we!=weend;
+  ++we)
+  {
+    ProcessSilhouetteEdge((WXEdge*)(*we));
+  }
+}
+
+void FEdgeXDetector::ProcessSilhouetteFace(WXFace *iFace)
+{
+  
+  // SILHOUETTE LAYER
+  Vec3r normal;
+  // Compute the dot products between View direction and N at each vertex
+  // of the face:
+  Vec3r point;
+  int closestPointId = 0;
+  real dist, minDist = FLT_MAX;
+  int numVertices = iFace->numberOfVertices();
+  WXFaceLayer * faceLayer = new WXFaceLayer(iFace, Nature::SILHOUETTE, true);
+  for(int i=0; i<numVertices; i++){
+    point = iFace->GetVertex(i)->GetVertex();
+    normal = iFace->GetVertexNormal(i);
+    Vec3r V(_Viewpoint - point);
+    normal.normalize();
+    V.normalize();
+    real d = normal * V;
+    faceLayer->PushDotP(d);
+    // Find the point the closest to the viewpoint
+    Vec3r dist_vec(point - _Viewpoint);
+    dist = dist_vec.norm();
+    if(dist < minDist) {
+      minDist = dist;
+      closestPointId = i;
+    }
+  }
+  // Set the closest point id:
+  faceLayer->SetClosestPointIndex(closestPointId);
+  // Add this layer to the face:
+  iFace->AddSmoothLayer(faceLayer);
+}
+
+void FEdgeXDetector::ProcessSilhouetteEdge(WXEdge *iEdge)
+{
+  if(iEdge->nature() & Nature::BORDER)
+    return;
+  // SILHOUETTE ?
+  //-------------
+  WXFace * fA = (WXFace *)iEdge->GetaOEdge()->GetaFace();
+  WXFace * fB = (WXFace *)iEdge->GetaOEdge()->GetbFace();
+
+  if((fA->front())^(fB->front())){ // fA->visible XOR fB->visible (true if one is 0 and the other is 1)
+    // The only edges we want to set as silhouette edges in this 
+    // way are the ones with 2 different normals for 1 vertex 
+    // for these two faces
+    //--------------------
+    // In reality we only test the normals for 1 of the 2 vertices.
+    if(fA->GetVertexNormal(iEdge->GetaVertex()) == fB->GetVertexNormal(iEdge->GetaVertex()))
+      return;
+    iEdge->AddNature(Nature::SILHOUETTE);
+    if(fB->front())
+      iEdge->SetOrder(1);
+    else
+      iEdge->SetOrder(-1);
+  }
+}
+
+
+// BORDER
+/////////
+void FEdgeXDetector::processBorderShape(WXShape* iWShape) {
+
+  if(!_computeViewIndependant)
+    return;
+  // Make a pass on the edges to detect 
+  // the BORDER
+  // --------------------
+  vector<WEdge*>::iterator we, weend;
+  vector<WEdge*> &wedges = iWShape->GetEdgeList();
+  for(we=wedges.begin(), weend=wedges.end();
+  we!=weend;
+  ++we){
+    ProcessBorderEdge((WXEdge*)(*we));
+  }
+}
+
+void FEdgeXDetector::ProcessBorderEdge(WXEdge *iEdge)
+{
+  // first check whether it is a border edge:
+  // BORDER ?
+  //---------
+  if(iEdge->GetaFace() == 0){
+    // it is a border edge
+    iEdge->AddNature(Nature::BORDER);
+  }
+}
+
+
+// CREASE
+/////////
+void FEdgeXDetector::processCreaseShape(WXShape* iWShape) {
+  if(!_computeViewIndependant)
+    return;
+
+  // Make a pass on the edges to detect 
+  // the CREASE 
+  // --------------------
+  vector<WEdge*>::iterator we, weend;
+  vector<WEdge*> &wedges = iWShape->GetEdgeList();
+  for(we=wedges.begin(), weend=wedges.end();
+  we!=weend;
+  ++we){
+    ProcessCreaseEdge((WXEdge*)(*we));
+  }
+}
+
+void FEdgeXDetector::ProcessCreaseEdge(WXEdge *iEdge)
+{
+  // CREASE ?
+  //---------
+  if(iEdge->nature() & Nature::BORDER)
+    return;
+  WXFace * fA = (WXFace *)iEdge->GetaOEdge()->GetaFace();
+  WXFace * fB = (WXFace *)iEdge->GetaOEdge()->GetbFace();
+
+  WVertex * aVertex = iEdge->GetaVertex();
+  if((fA->GetVertexNormal(aVertex) * fB->GetVertexNormal(aVertex)) <= 0.7) // angle of 140 degrees
+    iEdge->AddNature(Nature::CREASE);
+}
+
+// RIDGES AND VALLEYS
+/////////////////////
+
+void FEdgeXDetector::processRidgesAndValleysShape(WXShape* iWShape) {
+  // Don't forget to add the built layer to the face at the end
+  // of the ProcessFace:
+  //iFace->AddSmoothLayer(faceLayer);
+
+  if((!_computeViewIndependant))
+    return;
+  
+  // Here the curvatures must already have been computed
+  vector<WFace*>& wfaces = iWShape->GetFaceList();
+  vector<WFace*>::iterator f, fend;
+  for(f=wfaces.begin(), fend=wfaces.end();
+	f!=fend;
+	++f)
+  { 
+	ProcessRidgeFace((WXFace*)(*f));
+  }
+}
+
+
+// RIDGES
+/////////
+
+void FEdgeXDetector::ProcessRidgeFace(WXFace *iFace)
+{
+  WXFaceLayer * flayer = new WXFaceLayer(iFace, Nature::RIDGE|Nature::VALLEY, false);
+  iFace->AddSmoothLayer(flayer);
+  
+  unsigned int numVertices = iFace->numberOfVertices();
+  for(unsigned int i=0; i<numVertices; ++i){
+    WVertex *wv = iFace->GetVertex(i);
+    WXVertex * wxv = dynamic_cast<WXVertex*>(wv);
+    flayer->PushDotP(wxv->curvatures()->K1);
+  }
+
+  real threshold = 0;
+  //real threshold = _maxK1 - (_maxK1-_meanK1)/20.0;
+  
+  if(flayer->nPosDotP()!=numVertices){
+    if((fabs(flayer->dotP(0)) < threshold) && (fabs(flayer->dotP(1)) < threshold) && (fabs(flayer->dotP(2)) < threshold)){
+      flayer->ReplaceDotP(0, 0);
+      flayer->ReplaceDotP(1, 0);
+      flayer->ReplaceDotP(2, 0);
+    }
+  }
+}
+
+// void FEdgeXDetector::ProcessRidgeFace(WXFace *iFace)
+// {
+ 
+//  //  RIDGE LAYER
+//  //    compute the RidgeFunction, that is the derivative of the ppal curvature
+//  //    along e1 at each vertex of the face
+ 
+//  WVertex *v;
+//  Vec3r v1v2;
+//  real t;
+//  vector<WXFaceLayer*> SmoothLayers;
+//  WXFaceLayer *faceLayer;
+//  Face_Curvature_Info *layer_info;
+//  real K1_a(0), K1_b(0);
+//  Vec3r Inter_a, Inter_b;
+
+//  //  find the ridge layer of the face
+//  iFace->retrieveSmoothLayers(Nature::RIDGE, SmoothLayers);
+//  if(SmoothLayers.size()!=1)
+//    return;
+//  faceLayer = SmoothLayers[0];
+//  //  retrieve the curvature info of this layer
+//  layer_info = (Face_Curvature_Info *)faceLayer->userdata;
+ 
+//  int numVertices = iFace->numberOfVertices();
+//  for(int i=0; i<numVertices; i++){
+//    v = iFace->GetVertex(i);
+//    //    vec_curvature_info[i] contains the curvature info of this vertex
+//    Vec3r e2 = layer_info->vec_curvature_info[i]->K2*layer_info->vec_curvature_info[i]->e2;
+//    Vec3r e1 = layer_info->vec_curvature_info[i]->K1*layer_info->vec_curvature_info[i]->e1;
+//    e2.normalize();
+   
+//    WVertex::face_iterator fit = v->faces_begin();
+//    WVertex::face_iterator fitend = v->faces_end();
+//    for(; fit!=fitend; ++fit){  
+//      WXFace * wxf = dynamic_cast<WXFace*>(*fit);
+//      WOEdge * oppositeEdge;
+//      if(!(wxf->getOppositeEdge(v, oppositeEdge)))
+//        continue;
+//      v1v2 = oppositeEdge->GetbVertex()->GetVertex() - oppositeEdge->GetaVertex()->GetVertex();
+//      GeomUtils::intersection_test res;
+//      res = GeomUtils::intersectRayPlane(oppositeEdge->GetaVertex()->GetVertex(), v1v2,
+//        e2, -(v->GetVertex()*e2),
+//        t,1.e-06);
+//      if((res == GeomUtils::DO_INTERSECT) && (t>=0.0) && (t<=1.0)){
+//        vector<WXFaceLayer*> second_ridge_layer;
+//        wxf->retrieveSmoothLayers(Nature::RIDGE, second_ridge_layer);
+//        if(second_ridge_layer.size()!=1)
+//          continue;
+//        Face_Curvature_Info *second_layer_info = (Face_Curvature_Info*)second_ridge_layer[0]->userdata;
+       
+//        unsigned index1 = wxf->GetIndex(oppositeEdge->GetaVertex());
+//        unsigned index2 = wxf->GetIndex(oppositeEdge->GetbVertex());
+//        real K1_1 = second_layer_info->vec_curvature_info[index1]->K1;
+//        real K1_2 = second_layer_info->vec_curvature_info[index2]->K1;
+//        real K1 = (1.0-t)*K1_1 + t*K1_2;
+//        Vec3r inter((1.0-t)*oppositeEdge->GetaVertex()->GetVertex() + t*oppositeEdge->GetbVertex()->GetVertex());
+//        Vec3r vtmp(inter - v->GetVertex());
+//        // is it K1_a or K1_b ?
+//        if(vtmp*e1 > 0){
+//          K1_b = K1;
+//          Inter_b = inter;
+//        }else{
+//          K1_a = K1;
+//          Inter_a = inter;
+//        }
+//      }  
+//    }  
+//    //    Once we have K1 along the the ppal direction
+//    //      compute the derivative : K1b - K1a
+//    //      put it in DotP
+//    //real d = fabs(K1_b)-fabs(K1_a);
+//    real d = 0;
+//    real threshold = _meanK1 + (_maxK1-_meanK1)/7.0;
+//    //real threshold = _meanK1;
+//    //if((fabs(K1_b) > threshold) || ((fabs(K1_a) > threshold)))
+//      d = (K1_b)-(K1_a)/(Inter_b-Inter_a).norm();
+//    faceLayer->PushDotP(d);
+//    //faceLayer->PushDotP(layer_info->vec_curvature_info[i]->K1);
+//  } 
+
+//  // Make the values relevant by checking whether all principal 
+//  // directions have the "same" direction:
+//  Vec3r e0((layer_info->vec_curvature_info[0]->K1*layer_info->vec_curvature_info[0]->e1));
+//  e0.normalize();
+//  Vec3r e1((layer_info->vec_curvature_info[1]->K1*layer_info->vec_curvature_info[1]->e1));
+//  e1.normalize();
+//  Vec3r e2((layer_info->vec_curvature_info[2]->K1*layer_info->vec_curvature_info[2]->e1));
+//  e2.normalize();
+//  if (e0 * e1 < 0)
+//    // invert dotP[1]
+//    faceLayer->ReplaceDotP(1, -faceLayer->dotP(1));
+//  if (e0 * e2 < 0)
+//    // invert dotP[2]
+//    faceLayer->ReplaceDotP(2, -faceLayer->dotP(2));
+
+//  // remove the weakest values;
+//  //real minDiff = (_maxK1 - _minK1)/10.0;
+//  //  real minDiff = _meanK1;
+//  //  if((faceLayer->dotP(0) < minDiff) && (faceLayer->dotP(1) < minDiff) && (faceLayer->dotP(2) < minDiff)){
+//  //    faceLayer->ReplaceDotP(0, 0);
+//  //    faceLayer->ReplaceDotP(1, 0);
+//  //    faceLayer->ReplaceDotP(2, 0);
+//  //  } 
+// }
+
+// SUGGESTIVE CONTOURS
+//////////////////////
+
+void FEdgeXDetector::processSuggestiveContourShape(WXShape* iWShape) {
+  
+  // Here the curvatures must already have been computed
+  vector<WFace*>& wfaces = iWShape->GetFaceList();
+  vector<WFace*>::iterator f, fend;
+  for(f=wfaces.begin(), fend=wfaces.end();
+	f!=fend;
+	++f)
+  {
+	  ProcessSuggestiveContourFace((WXFace*)(*f));
+  }
+}
+
+void FEdgeXDetector::ProcessSuggestiveContourFace(WXFace *iFace)
+{
+  WXFaceLayer *faceLayer = new WXFaceLayer(iFace, Nature::SUGGESTIVE_CONTOUR, true);
+  iFace->AddSmoothLayer(faceLayer);
+
+  unsigned int numVertices = iFace->numberOfVertices();
+  for(unsigned int i=0; i<numVertices; ++i){
+    WVertex *wv = iFace->GetVertex(i);
+    WXVertex * wxv = dynamic_cast<WXVertex*>(wv);
+    faceLayer->PushDotP(wxv->curvatures()->Kr);
+  }
+  
+  // FIXME: find a more clever way to compute the threshold
+//   real threshold = _meanKr;
+//   if(faceLayer->nPosDotP()!=numVertices){
+//     if((fabs(faceLayer->dotP(0)) < threshold) && (fabs(faceLayer->dotP(1)) < threshold) && (fabs(faceLayer->dotP(2)) < threshold)){
+//       faceLayer->ReplaceDotP(0, 0);
+//       faceLayer->ReplaceDotP(1, 0);
+//       faceLayer->ReplaceDotP(2, 0);
+//     }
+//   }
+}
+
+void FEdgeXDetector::postProcessSuggestiveContourShape(WXShape* iShape) {
+  vector<WFace*>& wfaces = iShape->GetFaceList();
+  vector<WFace*>::iterator f, fend;
+  for(f=wfaces.begin(), fend=wfaces.end();
+      f!=fend;
+      ++f)
+    {
+      postProcessSuggestiveContourFace((WXFace*)(*f));
+    }
+}
+
+void FEdgeXDetector::postProcessSuggestiveContourFace(WXFace *iFace) {
+
+  // Compute the derivative of the radial curvature in the radial direction,
+  // at the two extremities of the smooth edge.
+  // If the derivative is smaller than a given threshold _kr_derivative_epsilon,
+  // discard the edge.
+ 
+  // Find the suggestive contour layer of the face (zero or one edge).
+  vector<WXFaceLayer*> sc_layers;
+  iFace->retrieveSmoothEdgesLayers(Nature::SUGGESTIVE_CONTOUR, sc_layers);
+  if(sc_layers.empty())
+    return;
+
+  WXFaceLayer *sc_layer;
+  sc_layer = sc_layers[0];
+
+  // Compute the derivative value at each vertex of the face, and add it in a vector.
+  vector<real> kr_derivatives;
+
+  unsigned vertices_nb = iFace->numberOfVertices();
+  WXVertex *v, *opposite_vertex_a, *opposite_vertex_b;
+  WXFace *wxf;
+  WOEdge *opposite_edge;
+  Vec3r opposite_edge_vec, normal_vec, radial_normal_vec, er_vec, v_vec, inter, inter1, inter2, tmp_vec;
+  GeomUtils::intersection_test res;
+  real kr(0), kr1(0), kr2(0), t;
+
+  for (unsigned i = 0; i < vertices_nb; ++i) {
+    v = (WXVertex*)(iFace->GetVertex(i));
+
+    // v is a singular vertex, skip it.
+    if (v->isBoundary()) {
+      kr_derivatives.push_back(0);
+      continue;
+    }
+
+    v_vec = v->GetVertex();
+    er_vec = v->curvatures()->er;
+    
+    // For each vertex, iterate on its adjacent faces.
+    for (WVertex::face_iterator fit = v->faces_begin(), fitend = v->faces_end();
+	 fit != fitend;
+	 ++fit) {  
+      wxf = dynamic_cast<WXFace*>(*fit);
+      if(!(wxf->getOppositeEdge(v, opposite_edge)))
+	continue;
+      
+      opposite_vertex_a = (WXVertex*)opposite_edge->GetaVertex();
+      opposite_vertex_b = (WXVertex*)opposite_edge->GetbVertex();
+      opposite_edge_vec = opposite_vertex_b->GetVertex() - opposite_vertex_a->GetVertex();
+      normal_vec = wxf->GetVertexNormal(v); // FIXME: what about e1 ^ e2 ?
+      radial_normal_vec = er_vec ^ normal_vec;
+
+      // Test wether the radial plan intersects with the edge at the opposite of v.
+      res = GeomUtils::intersectRayPlane(opposite_vertex_a->GetVertex(), opposite_edge_vec,
+					 radial_normal_vec, -(v_vec * radial_normal_vec),
+					 t,
+					 1.e-06);
+      
+      // If there is an intersection, compute the value of the derivative ath that point.
+      if ((res == GeomUtils::DO_INTERSECT) && (t >= 0) && (t <= 1)) {
+	kr = t * opposite_vertex_a->curvatures()->Kr + (1 - t) * opposite_vertex_b->curvatures()->Kr;
+	inter = opposite_vertex_a->GetVertex() + t * opposite_edge_vec;
+	tmp_vec = inter - v->GetVertex();
+	// Is it kr1 or kr2?
+	if (tmp_vec * er_vec > 0) {
+	  kr2 = kr;
+	  inter2 = inter;
+	} else {
+	  kr1 = kr;
+	  inter1 = inter;
+	}
+      }
+    }
+
+    // Now we have kr1 and kr2 along the radial direction, for one vertex of iFace.
+    // We have to compute the derivative of kr for that vertex, equal to:
+    // (kr2 - kr1) / dist(inter1, inter2).
+    // Then we add it to the vector of derivatives.
+    v->curvatures()->dKr = (kr2 - kr1) / (inter2 - inter1).norm();
+    kr_derivatives.push_back(v->curvatures()->dKr);
+  }
+
+  // At that point, we have the derivatives for each vertex of iFace.
+  // All we have to do now is to use linear interpolation to compute the values at
+  // the extremities of the smooth edge.
+  WXSmoothEdge *sc_edge = sc_layer->getSmoothEdge();
+  WOEdge *sc_oedge = sc_edge->woea();
+  t = sc_edge->ta();
+  if (t * kr_derivatives[iFace->GetIndex(sc_oedge->GetaVertex())] +
+      (1 - t) * kr_derivatives[iFace->GetIndex(sc_oedge->GetbVertex())] < _kr_derivative_epsilon) {
+    sc_layer->removeSmoothEdge();
+    return;
+  }
+  sc_oedge = sc_edge->woeb();
+  t = sc_edge->tb();
+  if (t * kr_derivatives[iFace->GetIndex(sc_oedge->GetaVertex())] +
+      (1 - t) * kr_derivatives[iFace->GetIndex(sc_oedge->GetbVertex())] < _kr_derivative_epsilon)
+    sc_layer->removeSmoothEdge();
+}
+
+
+// Build Smooth edges
+/////////////////////
+void FEdgeXDetector::buildSmoothEdges(WXShape* iShape){
+  // Make a last pass to build smooth edges from the previous stored values:
+  //--------------------------------------------------------------------------
+  vector<WFace*>& wfaces = iShape->GetFaceList();
+  for(vector<WFace*>::iterator f=wfaces.begin(), fend=wfaces.end();
+  f!=fend;
+  ++f)
+  {
+    vector<WXFaceLayer*>& faceLayers = ((WXFace*)(*f))->getSmoothLayers();
+    for(vector<WXFaceLayer*>::iterator wxfl = faceLayers.begin(), wxflend=faceLayers.end();
+    wxfl!=wxflend;
+    ++wxfl){
+      (*wxfl)->BuildSmoothEdge();
+    }
+  }
+}
diff --git a/extern/freestyle/src/view_map/FEdgeXDetector.h b/extern/freestyle/src/view_map/FEdgeXDetector.h
new file mode 100755
index 00000000000..38d0f34e21f
--- /dev/null
+++ b/extern/freestyle/src/view_map/FEdgeXDetector.h
@@ -0,0 +1,150 @@
+//
+//  Filename         : FEdgeXDetector.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Detects/flags/builds extended features edges on the
+//                     WXEdge structure
+//  Date of creation : 26/10/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+#ifndef  FEDGEXDETECTOR_H
+# define FEDGEXDETECTOR_H
+
+# include <vector>
+# include "../system/FreestyleConfig.h"
+# include "../geometry/Geom.h"
+# include "../winged_edge/WXEdge.h"
+# include "../winged_edge/Curvature.h"
+# include "../system/ProgressBar.h"
+
+using namespace Geometry;
+
+/*! This class takes as input a WXEdge structure and fills it
+ */
+
+class LIB_VIEW_MAP_EXPORT FEdgeXDetector
+{
+public:
+
+  FEdgeXDetector() {
+    _pProgressBar = 0;
+    _computeViewIndependant = true;
+    _bbox_diagonal = 1.0;
+    _meanEdgeSize = 0;
+    _computeRidgesAndValleys = true;
+    _computeSuggestiveContours = true;
+    _sphereRadius = 1.0;
+    _changes = false;
+    _kr_derivative_epsilon = 0.0;
+  }
+  virtual ~FEdgeXDetector() {}
+
+  /*! Process shapes from a WingedEdge containing a list of WShapes */
+  virtual void processShapes(WingedEdge&);
+
+  // GENERAL STUFF
+  virtual void preProcessShape(WXShape* iShape);
+  virtual void preProcessFace(WXFace* iFace);
+  virtual void computeCurvatures(WXVertex *iVertex);
+
+  // SILHOUETTE
+  virtual void processSilhouetteShape(WXShape* iShape);
+  virtual void ProcessSilhouetteFace(WXFace *iFace);
+  virtual void ProcessSilhouetteEdge(WXEdge *iEdge);
+
+  // CREASE
+  virtual void processCreaseShape(WXShape* iShape);
+  virtual void ProcessCreaseEdge(WXEdge *iEdge);
+
+  // BORDER
+  virtual void processBorderShape(WXShape* iShape);
+  virtual void ProcessBorderEdge(WXEdge *iEdge);
+
+  // RIDGES AND VALLEYS
+  virtual void processRidgesAndValleysShape(WXShape* iShape);
+  virtual void ProcessRidgeFace(WXFace *iFace);
+
+  // SUGGESTIVE CONTOURS
+  virtual void processSuggestiveContourShape(WXShape* iShape);
+  virtual void ProcessSuggestiveContourFace(WXFace *iFace);
+  virtual void postProcessSuggestiveContourShape(WXShape* iShape);
+  virtual void postProcessSuggestiveContourFace(WXFace *iFace);
+  /*! Sets the minimal derivative of the radial curvature for suggestive contours
+   *  \param dkr
+   *    The minimal derivative of the radial curvature
+   */
+  inline void setSuggestiveContourKrDerivativeEpsilon(real dkr) {
+    if (dkr != _kr_derivative_epsilon){
+      _kr_derivative_epsilon = dkr;
+      _changes = true;
+    }
+  }
+
+  // EVERYBODY
+  virtual void buildSmoothEdges(WXShape* iShape);
+
+  /*! Sets the current viewpoint */
+  inline void SetViewpoint(const Vec3r& ivp) {_Viewpoint = ivp;}
+  inline void enableRidgesAndValleysFlag(bool b) {_computeRidgesAndValleys = b;}
+  inline void enableSuggestiveContours(bool b) {_computeSuggestiveContours = b;}
+  /*! Sets the radius of the geodesic sphere around each vertex (for the curvature computation)
+   *  \param r
+   *    The radius of the sphere expressed as a ratio of the mean edge size
+   */
+  inline void setSphereRadius(real r) {
+    if(r!=_sphereRadius){
+      _sphereRadius = r;
+      _changes=true;
+    }
+  }
+
+  inline void SetProgressBar(ProgressBar *iProgressBar) {_pProgressBar = iProgressBar;}
+
+protected:
+
+  Vec3r _Viewpoint;
+  real _bbox_diagonal; // diagonal of the current processed shape bbox
+  //tmp values
+  bool _computeViewIndependant;
+  real _meanK1;
+  real _meanKr;
+  real _minK1;
+  real _minKr;
+  real _maxK1;
+  real _maxKr;
+  unsigned _nPoints;
+  real _meanEdgeSize;
+
+  bool _computeRidgesAndValleys;
+  bool _computeSuggestiveContours;
+  real _sphereRadius; // expressed as a ratio of the mean edge size
+  bool _changes;
+
+  real _kr_derivative_epsilon;
+
+  ProgressBar *_pProgressBar;
+};
+
+#endif // FEDGEDXETECTOR_H
diff --git a/extern/freestyle/src/view_map/Functions0D.cpp b/extern/freestyle/src/view_map/Functions0D.cpp
new file mode 100755
index 00000000000..c868510624c
--- /dev/null
+++ b/extern/freestyle/src/view_map/Functions0D.cpp
@@ -0,0 +1,356 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+# include "Functions0D.h"
+# include "ViewMap.h"
+
+using namespace std;
+
+namespace Functions0D {
+
+  // Internal function
+  FEdge* getFEdge(Interface0D& it1, Interface0D& it2){
+    return it1.getFEdge(it2);
+  }
+
+  void getFEdges(Interface0DIterator& it,
+                 FEdge*& fe1,
+                 FEdge*& fe2) {
+    // count number of vertices
+    Interface0DIterator prev = it, next = it;
+    ++next;
+    int count = 1;
+    while((!prev.isBegin()) && (count < 3))
+      { 
+        --prev;
+        ++count;
+      }
+    while((!next.isEnd()) && (count < 3))
+      {
+        ++next;
+        ++count;
+      } 
+    if(count < 3)
+      {
+        // if we only have 2 vertices
+        FEdge * fe = 0;
+        Interface0DIterator tmp = it;
+        if(it.isBegin())
+          {
+            ++tmp;
+            fe = it->getFEdge(*tmp);
+          }
+        else
+          {
+            --tmp;
+            fe = it->getFEdge(*tmp);
+          }
+        fe1 = fe;
+        fe2 = 0;
+      }  
+    else 
+      {
+        // we have more than 2 vertices
+        bool begin=false,last=false;
+        Interface0DIterator previous = it;
+        if(!previous.isBegin())
+          --previous;
+        else
+          begin=true;
+        Interface0DIterator next = it;
+        ++next;
+        if(next.isEnd())
+          last = true;
+        if(begin)
+          {
+            fe1 = it->getFEdge(*next);
+            fe2 = 0;
+          }
+        else if(last)
+          {
+            fe1 = previous->getFEdge(*it);
+            fe2 = 0;
+          }
+        else
+          {
+            fe1 = previous->getFEdge(*it);
+            fe2 = it->getFEdge(*next);
+          }
+      }
+  }
+
+  void getViewEdges(Interface0DIterator &it,
+                    ViewEdge *&ve1,
+                    ViewEdge *&ve2)
+  {
+    FEdge * fe1, *fe2;
+    getFEdges(it, fe1, fe2);
+    ve1 = fe1->viewedge();
+    if(fe2 != 0)
+      {
+        ve2 = fe2->viewedge();
+        if(ve2 == ve1)
+          ve2 = 0;
+      }
+    else
+      ve2 = 0;
+  }
+
+  ViewShape* getShapeF0D(Interface0DIterator& it)
+  {
+    ViewEdge *ve1, *ve2;
+    getViewEdges(it, ve1, ve2);
+    return ve1->viewShape();
+  }
+
+  void getOccludersF0D(Interface0DIterator& it, set<ViewShape*>& oOccluders){
+    ViewEdge * ve1, *ve2;
+    getViewEdges(it, ve1, ve2);
+    occluder_container::const_iterator oit = ve1->occluders_begin();
+    occluder_container::const_iterator oitend = ve1->occluders_end();
+
+    for(;oit!=oitend; ++oit)
+      oOccluders.insert((*oit));  
+
+    if(ve2!=0){
+      oit = ve2->occluders_begin();
+      oitend = ve2->occluders_end();
+      for(;oit!=oitend; ++oit)
+        oOccluders.insert((*oit)); 
+    }
+  }
+
+  ViewShape * getOccludeeF0D(Interface0DIterator& it){
+    ViewEdge * ve1, *ve2;
+    getViewEdges(it, ve1, ve2);
+    ViewShape *aShape = ve1->aShape();
+    return aShape;
+  }
+    
+  //
+  Vec2f VertexOrientation2DF0D::operator()(Interface0DIterator& iter) {
+    Vec2f A,C;
+    Vec2f B(iter->getProjectedX(), iter->getProjectedY());
+    if(iter.isBegin())
+      A = Vec2f(iter->getProjectedX(), iter->getProjectedY());
+    else
+      {
+	Interface0DIterator previous = iter;
+	--previous ;
+	A = Vec2f(previous->getProjectedX(), previous->getProjectedY());
+      }
+    Interface0DIterator next = iter;
+    ++next ;
+    if(next.isEnd())
+      C = Vec2f(iter->getProjectedX(), iter->getProjectedY());
+    else
+      C = Vec2f(next->getProjectedX(), next->getProjectedY());
+
+    Vec2f AB(B-A);
+    if(AB.norm() != 0)
+      AB.normalize();
+    Vec2f BC(C-B);
+    if(BC.norm() != 0)
+      BC.normalize();
+    Vec2f res (AB + BC);
+    if(res.norm() != 0)
+      res.normalize();
+    return res;
+  }
+
+  Vec3f VertexOrientation3DF0D::operator()(Interface0DIterator& iter) {
+    Vec3r A,C;
+    Vec3r B(iter->getX(), iter->getY(), iter->getZ());
+    if(iter.isBegin())
+      A = Vec3r(iter->getX(), iter->getY(), iter->getZ());
+    else
+      {
+	Interface0DIterator previous = iter;
+	--previous ;
+	A = Vec3r(previous->getX(), previous->getY(), previous->getZ());
+      }
+    Interface0DIterator next = iter;
+    ++next ;
+    if(next.isEnd())
+      C = Vec3r(iter->getX(), iter->getY(), iter->getZ());
+    else
+      C = Vec3r(next->getX(), next->getY(), next->getZ());
+
+    Vec3r AB(B-A);
+    if(AB.norm() != 0)
+      AB.normalize();
+    Vec3r BC(C-B);
+    if(BC.norm() != 0)
+      BC.normalize();
+    Vec3f res (AB + BC);
+    if(res.norm() != 0)
+      res.normalize();
+    return res;
+  }
+
+  real Curvature2DAngleF0D::operator()(Interface0DIterator& iter) {
+    Interface0DIterator tmp1 = iter, tmp2 = iter;
+    ++tmp2;
+    unsigned count = 1;
+    while((!tmp1.isBegin()) && (count < 3))
+      {
+	--tmp1;
+	++count;
+      }
+    while((!tmp2.isEnd()) && (count < 3))
+      {
+	++tmp2;
+	++count;
+      }
+    if(count < 3)
+      return 0; // if we only have 2 vertices
+
+    Interface0DIterator v = iter;
+    if(iter.isBegin())
+      ++v;
+    Interface0DIterator next=v;
+    ++next;
+    if(next.isEnd())
+      {
+	next = v;
+	--v;
+      }
+    Interface0DIterator prev=v;
+    --prev;
+
+    Vec2r A(prev->getProjectedX(), prev->getProjectedY());
+    Vec2r B(v->getProjectedX(), v->getProjectedY());
+    Vec2r C(next->getProjectedX(), next->getProjectedY());
+    Vec2r AB(B-A);
+    Vec2r BC(C-B);
+    Vec2r N1(-AB[1], AB[0]);
+    if(N1.norm() != 0)
+      N1.normalize();
+    Vec2r N2(-BC[1], BC[0]);
+    if(N2.norm() != 0)
+      N2.normalize();
+    if((N1.norm() == 0) && (N2.norm() == 0))
+      {
+	Exception::raiseException();
+	return 0; 
+      }
+    double cosin = N1*N2;
+    if(cosin > 1)
+      cosin = 1;
+    if(cosin < -1)
+      cosin = -1;
+    return acos(cosin);
+  }
+
+  real ZDiscontinuityF0D::operator()(Interface0DIterator& iter) {
+    FEdge *fe1, *fe2;
+    getFEdges(iter, fe1, fe2);
+    real result ;
+    result = fe1->z_discontinuity();
+    if(fe2!=0){
+      result += fe2->z_discontinuity();
+      result /= 2.f;
+    }
+    return result;
+  }
+
+  Vec2f Normal2DF0D::operator()(Interface0DIterator& iter) {
+    FEdge *fe1, *fe2;
+    getFEdges(iter,fe1,fe2);
+    Vec3f e1(fe1->orientation2d());
+    Vec2f n1(e1[1], -e1[0]);
+    Vec2f n(n1);
+    if(fe2 != 0)
+      {
+	Vec3f e2(fe2->orientation2d());
+	Vec2f n2(e2[1], -e2[0]);
+	n += n2;
+      }
+    n.normalize();
+    return n;
+  }
+
+  Material MaterialF0D::operator()(Interface0DIterator& iter) {
+    FEdge *fe1, *fe2;
+    getFEdges(iter,fe1,fe2);
+    
+    if(fe1 == 0)
+      getFEdges(iter, fe1, fe2);
+    Material mat;
+    if(fe1->isSmooth())
+      mat = ((FEdgeSmooth*)fe1)->material();
+    else
+      mat = ((FEdgeSharp*)fe1)->bMaterial();
+    //    const SShape * sshape = getShapeF0D(iter);
+    //    return sshape->material();
+    return mat;
+  }
+
+  Id ShapeIdF0D::operator()(Interface0DIterator& iter) {
+    ViewShape * vshape = getShapeF0D(iter);
+    return vshape->getId();
+  }
+
+  unsigned int QuantitativeInvisibilityF0D::operator()(Interface0DIterator& iter) {
+    ViewEdge * ve1, *ve2;
+    getViewEdges(iter,ve1,ve2);
+    unsigned int qi1, qi2;
+    qi1 = ve1->qi();
+    if(ve2 != 0){
+      qi2 = ve2->qi();
+      if(qi2!=qi1)
+        cout << "QuantitativeInvisibilityF0D: ambiguous evaluation for point " << iter->getId() << endl;
+    }
+    return qi1;
+  }
+
+  Nature::EdgeNature CurveNatureF0D::operator()(Interface0DIterator& iter) {
+    Nature::EdgeNature nat = 0;
+    ViewEdge * ve1, *ve2;
+    getViewEdges(iter, ve1, ve2);
+    nat |= ve1->getNature();
+    if(ve2!=0)
+      nat |= ve2->getNature();
+    return nat;
+  }
+
+  vector<ViewShape*> GetOccludersF0D::operator()(Interface0DIterator& iter) {
+    set<ViewShape*> occluders;
+    getOccludersF0D(iter,occluders);
+    vector<ViewShape*> vsOccluders;
+    // vsOccluders.insert(vsOccluders.begin(), occluders.begin(), occluders.end());
+    for(set<ViewShape*>::iterator it=occluders.begin(), itend=occluders.end();
+    it!=itend;
+    ++it){
+      vsOccluders.push_back((*it));
+    }
+    return vsOccluders;
+  }
+
+  ViewShape* GetShapeF0D::operator()(Interface0DIterator& iter) {
+    return getShapeF0D(iter);
+  }
+
+  ViewShape* GetOccludeeF0D::operator()(Interface0DIterator& iter) {
+    return getOccludeeF0D(iter);
+  }
+
+} // end of namespace Functions0D
diff --git a/extern/freestyle/src/view_map/Functions0D.h b/extern/freestyle/src/view_map/Functions0D.h
new file mode 100755
index 00000000000..3160546da2f
--- /dev/null
+++ b/extern/freestyle/src/view_map/Functions0D.h
@@ -0,0 +1,487 @@
+//
+//  Filename         : Functions0D.h
+//  Author(s)        : Stephane Grabli, Emmanuel Turquin
+//  Purpose          : Functions taking 0D input
+//  Date of creation : 01/07/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  FUNCTIONS0D_H
+# define FUNCTIONS0D_H
+
+# include "../system/Precision.h"
+# include "Interface0D.h"
+# include "../geometry/Geom.h"
+# include "../system/Exception.h"
+# include "../scene_graph/Material.h"
+# include <set>
+# include <vector>
+class FEdge;
+class ViewEdge;
+class SShape;
+
+using namespace Geometry;
+
+//
+// UnaryFunction0D (base class for functions in 0D)
+//
+///////////////////////////////////////////////////////////
+
+template <class T>
+/*! Base class for Unary Functions (functors) working
+ *  on Interface0DIterator.
+ *  A unary function will be used by calling
+ *  its operator() on an Interface0DIterator.
+ *  \attention In the scripting language, there exists
+ *  several prototypes depending on the returned value type.
+ *  For example, you would inherit from a UnaryFunction0DDouble
+ *  if you wish to define a function that returns a double.
+ *  The different existing prototypes are:
+ *    - UnaryFunction0DVoid
+ *    - UnaryFunction0DUnsigned
+ *    - UnaryFunction0DReal
+ *    - UnaryFunction0DFloat
+ *    - UnaryFunction0DDouble
+ *    - UnaryFunction0DVec2f
+ *    - UnaryFunction0DVec3f
+ */
+class /*LIB_VIEW_MAP_EXPORT*/ UnaryFunction0D
+{
+public:
+
+  /*! The type of the value
+   *  returned by the functor.
+   */
+  typedef T ReturnedValueType;
+  /*! Default constructor. */
+  UnaryFunction0D() {}
+  /*! Destructor; */
+  virtual ~UnaryFunction0D() {}
+  /*! Returns the string "UnaryFunction0D" */
+  virtual string getName() const {
+    return "UnaryFunction0D";
+  }
+  /*! The operator ().
+   *  \param iter 
+   *    An Interface0DIterator pointing onto
+   *    the point at which we wish to evaluate
+   *    the function.
+   *  \return the result of the function of type T.
+   */
+  virtual T operator()(Interface0DIterator& iter) {
+    cerr << "Warning: operator() not implemented" << endl;
+    return T();
+  }
+};
+
+# ifdef SWIG
+%feature("director")			UnaryFunction0D<void>;
+%feature("director")			UnaryFunction0D<unsigned>;
+%feature("director")			UnaryFunction0D<float>;
+%feature("director")			UnaryFunction0D<double>;
+%feature("director")			UnaryFunction0D<Vec2f>;
+%feature("director")			UnaryFunction0D<Vec3f>;
+%feature("director")			UnaryFunction0D<Id>;
+
+%template(UnaryFunction0DVoid)		UnaryFunction0D<void>;
+%template(UnaryFunction0DUnsigned)	UnaryFunction0D<unsigned>;
+%template(UnaryFunction0DFloat)		UnaryFunction0D<float>;
+%template(UnaryFunction0DDouble)	UnaryFunction0D<double>;
+%template(UnaryFunction0DVec2f)		UnaryFunction0D<Vec2f>;
+%template(UnaryFunction0DVec3f)		UnaryFunction0D<Vec3f>;
+%template(UnaryFunction0DId)		UnaryFunction0D<Id>;
+%template(UnaryFunction0DViewShape)		UnaryFunction0D<ViewShape*>;
+%template(UnaryFunction0DVectorViewShape)		UnaryFunction0D<std::vector<ViewShape*> >;
+# endif // SWIG
+
+
+//
+// Functions definitions
+//
+///////////////////////////////////////////////////////////
+class ViewShape;
+namespace Functions0D {
+
+  // GetXF0D
+  /*! Returns the X 3D coordinate of an Interface0D. */
+  class LIB_VIEW_MAP_EXPORT GetXF0D : public UnaryFunction0D<real>
+  {
+  public:
+    /*! Returns the string "GetXF0D"*/
+    string getName() const {
+      return "GetXF0D";
+    }
+    /*! the () operator.*/
+    real operator()(Interface0DIterator& iter) {
+      return iter->getX();
+    }
+  };
+
+  // GetYF0D
+  /*! Returns the Y 3D coordinate of an Interface0D. */
+  class LIB_VIEW_MAP_EXPORT GetYF0D : public UnaryFunction0D<real>
+  {
+  public:
+    /*! Returns the string "GetYF0D"*/
+    string getName() const {
+      return "GetYF0D";
+    }
+    /*! the () operator.*/
+    real operator()(Interface0DIterator& iter) {
+      return iter->getY();
+    }
+  };
+
+  // GetZF0D
+  /*! Returns the Z 3D coordinate of an Interface0D. */
+  class LIB_VIEW_MAP_EXPORT GetZF0D : public UnaryFunction0D<real>
+  {
+  public:
+    /*! Returns the string "GetZF0D"*/
+    string getName() const {
+      return "GetZF0D";
+    }
+    /*! the () operator.*/
+    real operator()(Interface0DIterator& iter) {
+      return iter->getZ();
+    }
+  };
+
+  // GetProjectedXF0D
+  /*! Returns the X 3D projected coordinate of an Interface0D. */
+  class LIB_VIEW_MAP_EXPORT GetProjectedXF0D : public UnaryFunction0D<real>
+  {
+  public:
+    /*! Returns the string "GetProjectedXF0D"*/
+    string getName() const {
+      return "GetProjectedXF0D";
+    }
+    /*! the () operator.*/
+    real operator()(Interface0DIterator& iter) {
+      return iter->getProjectedX();
+    }
+  };
+
+  // GetProjectedYF0D
+  /*! Returns the Y projected 3D coordinate of an Interface0D. */
+  class LIB_VIEW_MAP_EXPORT GetProjectedYF0D : public UnaryFunction0D<real>
+  {
+  public:
+    /*! Returns the string "GetProjectedYF0D"*/
+    string getName() const {
+      return "GetProjectedYF0D";
+    }
+    /*! the () operator.*/
+    real operator()(Interface0DIterator& iter) {
+      return iter->getProjectedY();
+    }
+  };
+
+  // GetProjectedZF0D
+  /*! Returns the Z projected 3D coordinate of an Interface0D. */
+  class LIB_VIEW_MAP_EXPORT GetProjectedZF0D : public UnaryFunction0D<real>
+  {
+  public:
+    /*! Returns the string "GetProjectedZF0D"*/
+    string getName() const {
+      return "GetProjectedZF0D";
+    }
+    /*! the () operator.*/
+    real operator()(Interface0DIterator& iter) {
+      return iter->getProjectedZ();
+    }
+  };
+
+  // GetCurvilinearAbscissaF0D
+  /*! Returns the curvilinear abscissa of an Interface0D in the context of its 1D element. */
+  class LIB_VIEW_MAP_EXPORT GetCurvilinearAbscissaF0D : public UnaryFunction0D<float>
+  {
+  public:
+    /*! Returns the string "GetCurvilinearAbscissaF0D"*/
+    string getName() const {
+      return "GetCurvilinearAbscissaF0D";
+    }
+    /*! the () operator.*/
+    float operator()(Interface0DIterator& iter) {
+      return iter.t();
+    }
+  };
+
+  // GetParameterF0D
+  /*! Returns the parameter of an Interface0D in the context of its 1D element. */
+  class LIB_VIEW_MAP_EXPORT GetParameterF0D : public UnaryFunction0D<float>
+  {
+  public:
+    /*! Returns the string "GetCurvilinearAbscissaF0D"*/
+    string getName() const {
+      return "GetParameterF0D";
+    }
+    /*! the () operator.*/
+    float operator()(Interface0DIterator& iter) {
+      return iter.u();
+    }
+  };
+
+  // VertexOrientation2DF0D
+  /*! Returns a Vec2r giving the 2D oriented tangent to the 1D element
+   *  to which the Interface0DIterator& belongs to and
+   *  evaluated at the Interface0D pointed by this Interface0DIterator&.
+   */
+  class LIB_VIEW_MAP_EXPORT VertexOrientation2DF0D : public UnaryFunction0D<Vec2f>
+  {
+  public:
+    /*! Returns the string "VertexOrientation2DF0D"*/
+    string getName() const {
+      return "VertexOrientation2DF0D";
+    }
+    /*! the () operator.*/
+    Vec2f operator()(Interface0DIterator& iter);
+  };
+
+  // VertexOrientation3DF0D
+  /*! Returns a Vec3r giving the 3D oriented tangent to the 1D element
+   *  to which the Interface0DIterator& belongs to and
+   *  evaluated at the Interface0D pointed by this Interface0DIterator&.
+   */
+  class LIB_VIEW_MAP_EXPORT VertexOrientation3DF0D : public UnaryFunction0D<Vec3f>
+  {
+  public:
+    /*! Returns the string "VertexOrientation3DF0D"*/
+    string getName() const {
+      return "VertexOrientation3DF0D";
+    }
+    /*! the () operator.*/
+    Vec3f operator()(Interface0DIterator& iter);
+  };
+
+  // Curvature2DAngleF0D
+  /*! Returns a real giving the 2D curvature (as an angle) of the 1D element
+   *  to which the Interface0DIterator& belongs to and
+   *  evaluated at the Interface0D pointed by this Interface0DIterator&.
+   */
+  class LIB_VIEW_MAP_EXPORT Curvature2DAngleF0D : public UnaryFunction0D<real>
+  {
+  public:
+    /*! Returns the string "Curvature2DAngleF0D"*/
+    string getName() const {
+      return "Curvature2DAngleF0D";
+    }
+    /*! the () operator.*/
+    real operator()(Interface0DIterator& iter);
+  };
+
+  // ZDiscontinuity
+  /*! Returns a real giving the distance between
+   *  and Interface0D and the shape that lies behind (occludee).
+   *  This distance is evaluated in the camera space and normalized
+   *  between 0 and 1. Therefore, if no oject is occluded by the
+   *  shape to which the Interface0D belongs to, 1 is returned.
+   */
+  class LIB_VIEW_MAP_EXPORT ZDiscontinuityF0D : public UnaryFunction0D<real>
+  {
+  public:
+    /*! Returns the string "ZDiscontinuityF0D"*/
+    string getName() const {
+      return "ZDiscontinuityF0D";
+    }
+    /*! the () operator.*/
+    real operator()(Interface0DIterator& iter);
+  };
+
+  // Normal2DF0D
+  /*! Returns a Vec2f giving the normalized 2D normal to the 1D element
+   *  to which the Interface0DIterator& belongs to and
+   *  evaluated at the Interface0D pointed by this Interface0DIterator&.
+   */
+  class LIB_VIEW_MAP_EXPORT Normal2DF0D : public UnaryFunction0D<Vec2f>
+  {
+  public:
+    /*! Returns the string "Normal2DF0D"*/
+    string getName() const {
+      return "Normal2DF0D";
+    }
+    /*! the () operator.*/
+    Vec2f operator()(Interface0DIterator& iter);
+  };
+
+  // MaterialF0D
+  /*! Returns the material of the object evaluated at the Interface0D.
+   *  This evaluation can be ambiguous (in the case of a TVertex for example.
+   *  This functor tries to remove this ambiguity using the context
+   *  offered by the 1D element to which the Interface0DIterator& belongs
+   *  to and by arbitrary chosing the material of the face
+   *  that lies on its left when following the 1D element if there
+   *  are two different materials on each side of the point.
+   *  However, there still can be problematic cases, and the user willing
+   *  to deal with this cases in a specific way should implement
+   *  its own getMaterial functor.
+   */
+  class LIB_VIEW_MAP_EXPORT MaterialF0D : public UnaryFunction0D<Material>
+  {
+  public:
+    /*! Returns the string "MaterialF0D"*/
+    string getName() const {
+      return "MaterialF0D";
+    }
+    /*! the () operator.*/
+    Material operator()(Interface0DIterator& iter);
+  };
+
+  // ShapeIdF0D
+  /*! Returns the Id of the Shape the Interface0D belongs to.
+   *  This evaluation can be ambiguous (in the case of a TVertex for example).
+   *  This functor tries to remove this ambiguity using the context
+   *  offered by the 1D element to which the Interface0DIterator& belongs
+   *  to.
+   *  However, there still can be problematic cases, and the user willing
+   *  to deal with this cases in a specific way should implement
+   *  its own getShapeIdF0D functor.
+   */
+  class LIB_VIEW_MAP_EXPORT ShapeIdF0D : public UnaryFunction0D<Id>
+  {
+  public:
+    /*! Returns the string "ShapeIdF0D"*/
+    string getName() const {
+      return "ShapeIdF0D";
+    }
+    /*! the () operator.*/
+    Id operator()(Interface0DIterator& iter);
+  };
+
+  // QiF0D
+  /*! Returns the quantitative invisibility of this Interface0D.
+   *  This evaluation can be ambiguous (in the case of a TVertex for example).
+   *  This functor tries to remove this ambiguity using the context
+   *  offered by the 1D element to which the Interface0DIterator& belongs
+   *  to.
+   *  However, there still can be problematic cases, and the user willing
+   *  to deal with this cases in a specific way should implement
+   *  its own getQIF0D functor.
+   */
+  class LIB_VIEW_MAP_EXPORT QuantitativeInvisibilityF0D : public UnaryFunction0D<unsigned int>
+  {
+  public:
+    /*! Returns the string "QuantitativeInvisibilityF0D"*/
+    string getName() const {
+      return "QuantitativeInvisibilityF0D";
+    }
+    /*! the () operator.*/
+    unsigned int operator()(Interface0DIterator& iter);
+  };
+
+  // CurveNatureF0D
+  /*! Returns the Nature::EdgeNature of the 1D element the
+   *  Interface0DIterator& belongs to.
+   */
+  class LIB_VIEW_MAP_EXPORT CurveNatureF0D : public UnaryFunction0D<Nature::EdgeNature>
+  {
+  public:
+    /*! Returns the string "QuantitativeInvisibilityF0D"*/
+    string getName() const {
+      return "CurveNatureF0D";
+    }
+    /*! the () operator.*/
+    Nature::EdgeNature operator()(Interface0DIterator& iter);
+  };
+  
+  // GetShapeF0D
+  /*! Returns the ViewShape* 
+   *  containing the Interface0D
+   */
+  class LIB_VIEW_MAP_EXPORT GetShapeF0D : public UnaryFunction0D< ViewShape*>
+  {
+  public:
+    /*! Returns the string "GetShapeF0D"*/
+    string getName() const {
+      return "GetShapeF0D";
+    }
+    /*! the () operator.*/
+    ViewShape* operator()(Interface0DIterator& iter);
+  };
+
+  // GetOccludersF0D
+  /*! Returns a vector containing the ViewShape* 
+   *  occluding the Interface0D
+   */
+  class LIB_VIEW_MAP_EXPORT GetOccludersF0D : public UnaryFunction0D< std::vector<ViewShape*> >
+  {
+  public:
+    /*! Returns the string "GetOccludersF0D"*/
+    string getName() const {
+      return "GetOccludersF0D";
+    }
+    /*! the () operator.*/
+    std::vector<ViewShape*> operator()(Interface0DIterator& iter);
+  };
+
+  // GetOccludeeF0D
+  /*! Returns the ViewShape* 
+   *  "occluded" by the Interface0D
+   */
+  class LIB_VIEW_MAP_EXPORT GetOccludeeF0D: public UnaryFunction0D< ViewShape*>
+  {
+  public:
+    /*! Returns the string "GetOccludeeF0D"*/
+    string getName() const {
+      return "GetOccludeeF0D";
+    }
+    /*! the () operator.*/
+    ViewShape* operator()(Interface0DIterator& iter);
+  };
+
+  
+
+  /////////////////////////// Internal ////////////////////////////
+
+  // getFEdge
+  LIB_VIEW_MAP_EXPORT
+  FEdge* getFEdge(Interface0D& it1, Interface0D& it2);
+
+  // getFEdges
+  LIB_VIEW_MAP_EXPORT
+  void  getFEdges(Interface0DIterator& it,
+                 FEdge*& fe1,
+                 FEdge*& fe2);
+
+  // getViewEdges
+  LIB_VIEW_MAP_EXPORT
+  void  getViewEdges(Interface0DIterator& it,
+                    ViewEdge *&ve1,
+                    ViewEdge *&ve2);
+
+  // getShapeF0D
+  LIB_VIEW_MAP_EXPORT
+  ViewShape* getShapeF0D(Interface0DIterator& it);
+
+  // getOccludersF0D
+  LIB_VIEW_MAP_EXPORT
+  void getOccludersF0D(Interface0DIterator& it, std::set<ViewShape*>& oOccluders);
+
+  // getOccludeeF0D
+  LIB_VIEW_MAP_EXPORT
+  ViewShape* getOccludeeF0D(Interface0DIterator& it);
+
+} // end of namespace Functions0D
+
+#endif // FUNCTIONS0D_H
diff --git a/extern/freestyle/src/view_map/Functions1D.cpp b/extern/freestyle/src/view_map/Functions1D.cpp
new file mode 100755
index 00000000000..a34124ded31
--- /dev/null
+++ b/extern/freestyle/src/view_map/Functions1D.cpp
@@ -0,0 +1,209 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+# include "Functions1D.h"
+using namespace std;
+
+namespace Functions1D {
+
+  real GetXF1D::operator()(Interface1D& inter) {
+    return integrate(_func, inter.verticesBegin(), inter.verticesEnd(), _integration);
+  }
+
+  real GetYF1D::operator()(Interface1D& inter) {
+    return integrate(_func, inter.verticesBegin(), inter.verticesEnd(), _integration);
+  }
+
+  real GetZF1D::operator()(Interface1D& inter) {
+    return integrate(_func, inter.verticesBegin(), inter.verticesEnd(), _integration);
+  }
+
+  real GetProjectedXF1D::operator()(Interface1D& inter) {
+    return integrate(_func, inter.verticesBegin(), inter.verticesEnd(), _integration);
+  }
+
+  real GetProjectedYF1D::operator()(Interface1D& inter) {
+    return integrate(_func, inter.verticesBegin(), inter.verticesEnd(), _integration);
+  }
+
+  real GetProjectedZF1D::operator()(Interface1D& inter) {
+    return integrate(_func, inter.verticesBegin(), inter.verticesEnd(), _integration);
+  }
+
+  Vec2f Orientation2DF1D::operator()(Interface1D& inter) {
+    FEdge * fe = dynamic_cast<FEdge*>(&inter);
+    if(fe){
+      Vec3r res = fe->orientation2d();
+      return Vec2f(res[0], res[1]);
+    }
+    return integrate(_func, inter.verticesBegin(), inter.verticesEnd(), _integration);
+  }
+
+  Vec3f Orientation3DF1D::operator()(Interface1D& inter) {
+    return integrate(_func, inter.verticesBegin(), inter.verticesEnd(), _integration);
+  }
+
+  real ZDiscontinuityF1D::operator()(Interface1D& inter) {
+    return integrate(_func, inter.verticesBegin(), inter.verticesEnd(), _integration);
+  }
+  
+  unsigned QuantitativeInvisibilityF1D::operator()(Interface1D& inter) {
+    ViewEdge* ve = dynamic_cast<ViewEdge*>(&inter);
+    if (ve)
+      return ve->qi();
+    FEdge *fe = dynamic_cast<FEdge*>(&inter);
+    if(fe)
+      return ve->qi();
+    return integrate(_func, inter.verticesBegin(), inter.verticesEnd(), _integration);
+  }
+
+  Nature::EdgeNature CurveNatureF1D::operator()(Interface1D& inter) {
+    ViewEdge* ve = dynamic_cast<ViewEdge*>(&inter);
+    if (ve)
+      return ve->getNature();
+    else{
+      // we return a nature that contains every 
+      // natures of the viewedges spanned by the chain.
+      Nature::EdgeNature nat = Nature::NO_FEATURE;
+      Interface0DIterator it = inter.verticesBegin();
+      while(!it.isEnd()){
+        nat |= _func(it);
+        ++it;
+      }
+      return nat;
+    }
+  }
+  
+  void TimeStampF1D::operator()(Interface1D& inter) {
+    TimeStamp *timestamp = TimeStamp::instance();
+    inter.setTimeStamp(timestamp->getTimeStamp());
+  }
+
+  void ChainingTimeStampF1D::operator()(Interface1D& inter) {
+    TimeStamp *timestamp = TimeStamp::instance();
+    ViewEdge *ve = dynamic_cast<ViewEdge*>(&inter);
+    if(ve)
+      ve->setChainingTimeStamp(timestamp->getTimeStamp());
+  }
+  
+  void IncrementChainingTimeStampF1D::operator()(Interface1D& inter) {
+    ViewEdge *ve = dynamic_cast<ViewEdge*>(&inter);
+    if(ve)
+      ve->setChainingTimeStamp(ve->getChainingTimeStamp()+1);
+  }
+
+  vector<ViewShape*> GetShapeF1D::operator()(Interface1D& inter) {
+    vector<ViewShape*> shapesVector;
+    set<ViewShape*> shapesSet;
+    ViewEdge* ve = dynamic_cast<ViewEdge*>(&inter);
+    if (ve){
+      shapesVector.push_back(ve->viewShape());
+    }else{
+      Interface0DIterator it=inter.verticesBegin(), itend=inter.verticesEnd();
+      for(;it!=itend;++it)
+        shapesSet.insert(Functions0D::getShapeF0D(it));
+      shapesVector.insert<set<ViewShape*>::iterator>(shapesVector.begin(), shapesSet.begin(), shapesSet.end());
+    }
+    return shapesVector;
+  }
+
+  vector<ViewShape*> GetOccludersF1D::operator()(Interface1D& inter) {
+    vector<ViewShape*> shapesVector;
+    set<ViewShape*> shapesSet;
+    ViewEdge* ve = dynamic_cast<ViewEdge*>(&inter);
+    if (ve){
+      return ve->occluders();
+    }else{
+      Interface0DIterator it=inter.verticesBegin(), itend=inter.verticesEnd();
+      for(;it!=itend;++it){
+        Functions0D::getOccludersF0D(it, shapesSet);
+      }
+      shapesVector.insert(shapesVector.begin(), shapesSet.begin(), shapesSet.end());
+    }
+    return shapesVector;
+  }
+
+  vector<ViewShape*> GetOccludeeF1D::operator()(Interface1D& inter) {
+    vector<ViewShape*> shapesVector;
+    set<ViewShape*> shapesSet;
+    ViewEdge* ve = dynamic_cast<ViewEdge*>(&inter);
+    if (ve){
+      ViewShape * aShape = ve->aShape();
+      shapesVector.push_back(aShape);
+    }else{
+      Interface0DIterator it=inter.verticesBegin(), itend=inter.verticesEnd();
+      for(;it!=itend;++it){
+        shapesSet.insert(Functions0D::getOccludeeF0D(it));
+      }
+    shapesVector.insert<set<ViewShape*>::iterator>(shapesVector.begin(), shapesSet.begin(), shapesSet.end());
+    }
+    return shapesVector;
+  }
+  // Internal
+  ////////////
+
+  void getOccludeeF1D(Interface1D& inter, set<ViewShape*>& oShapes){
+    ViewEdge* ve = dynamic_cast<ViewEdge*>(&inter);
+    if (ve){
+      ViewShape * aShape = ve->aShape();
+      if(aShape == 0){
+        oShapes.insert(0);
+        return;
+      }
+      oShapes.insert(aShape);
+    }
+    else{
+      Interface0DIterator it=inter.verticesBegin(), itend=inter.verticesEnd();
+      for(;it!=itend;++it)
+        oShapes.insert(Functions0D::getOccludeeF0D(it));
+    }
+  }
+
+  void getOccludersF1D(Interface1D& inter, set<ViewShape*>& oShapes){
+    ViewEdge* ve = dynamic_cast<ViewEdge*>(&inter);
+    if (ve){
+      vector<ViewShape*>& occluders = ve->occluders();
+      oShapes.insert<vector<ViewShape*>::iterator>(occluders.begin(), occluders.end());
+    }
+    else{
+      Interface0DIterator it=inter.verticesBegin(), itend=inter.verticesEnd();
+      for(;it!=itend;++it){
+        set<ViewShape*> shapes;
+        Functions0D::getOccludersF0D(it, shapes);
+        for(set<ViewShape*>::iterator s=shapes.begin(), send=shapes.end();
+            s!=send;
+            ++s)
+          oShapes.insert(*s);
+      }
+    }
+  }
+
+  void getShapeF1D(Interface1D& inter, set<ViewShape*>& oShapes){
+    ViewEdge* ve = dynamic_cast<ViewEdge*>(&inter);
+    if (ve){
+      oShapes.insert(ve->viewShape());
+    }else{
+      Interface0DIterator it=inter.verticesBegin(), itend=inter.verticesEnd();
+      for(;it!=itend;++it)
+        oShapes.insert(Functions0D::getShapeF0D(it));
+    }
+  }
+} // end of namespace Functions1D
diff --git a/extern/freestyle/src/view_map/Functions1D.h b/extern/freestyle/src/view_map/Functions1D.h
new file mode 100755
index 00000000000..c92d12ff330
--- /dev/null
+++ b/extern/freestyle/src/view_map/Functions1D.h
@@ -0,0 +1,537 @@
+//
+//  Filename         : Functions1D.h
+//  Author(s)        : Stephane Grabli, Emmanuel Turquin
+//  Purpose          : Functions taking 1D input
+//  Date of creation : 01/07/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  FUNCTIONS1D_HPP
+# define FUNCTIONS1D_HPP
+
+# include "../system/Precision.h"
+# include "../system/TimeStamp.h"
+# include "ViewMap.h"
+# include "Functions0D.h"
+# include "Interface1D.h"
+# include "../system/FreestyleConfig.h"
+//
+// UnaryFunction1D (base class for functions in 1D)
+//
+///////////////////////////////////////////////////////////
+
+/*! Base class for Unary Functions (functors) working
+ *  on Interface1D.
+ *  A unary function will be used by calling
+ *  its operator() on an Interface1D.
+ *  \attention In the scripting language, there exists
+ *  several prototypes depending on the returned value type.
+ *  For example, you would inherit from a UnaryFunction1DDouble
+ *  if you wish to define a function that returns a double.
+ *  The different existing prototypes are:
+ *    - UnaryFunction1DVoid
+ *    - UnaryFunction1DUnsigned
+ *    - UnaryFunction1DReal
+ *    - UnaryFunction1DFloat
+ *    - UnaryFunction1DDouble
+ *    - UnaryFunction1DVec2f
+ *    - UnaryFunction1DVec3f
+ */
+template <class T>
+class /*LIB_VIEW_MAP_EXPORT*/ UnaryFunction1D
+{
+public:
+  /*! The type of the value
+   *  returned by the functor.
+   */
+  typedef T ReturnedValueType;
+  
+  /*! Default constructor */
+  UnaryFunction1D(){_integration = MEAN;}
+  /*! Builds a UnaryFunction1D from an integration type.
+   *  \param iType
+   *    In case the result for the Interface1D would be
+   *    obtained by evaluating a 0D function over the different
+   *    Interface0D of the Interface1D, \a iType tells which
+   *    integration method to use.
+   *    The default integration method is the MEAN.
+   */
+  UnaryFunction1D(IntegrationType iType){_integration = iType;}
+  /*! destructor. */
+  virtual ~UnaryFunction1D() {}
+
+  /*! returns the string "UnaryFunction1D". */
+  virtual string getName() const {
+    return "UnaryFunction1D";
+  }
+  /*! The operator ().
+   *  \param inter 
+   *    The Interface1D on which we wish to evaluate
+   *    the function.
+   *  \return the result of the function of type T.
+   */
+  virtual T operator()(Interface1D& inter) {
+    cerr << "Warning: operator() not implemented" << endl;
+    return T(0);
+  }
+  /*! Sets the integration method */
+  void setIntegrationType(IntegrationType integration) {
+    _integration = integration;
+  }
+  /*! Returns the integration method. */
+  IntegrationType getIntegrationType() const {
+    return _integration;
+  }
+
+protected:
+
+  IntegrationType _integration;
+};
+
+# ifdef SWIG
+%feature("director")			UnaryFunction1D<void>;
+%feature("director")			UnaryFunction1D<unsigned>;
+%feature("director")			UnaryFunction1D<float>;
+%feature("director")			UnaryFunction1D<double>;
+%feature("director")			UnaryFunction1D<Vec2f>;
+%feature("director")			UnaryFunction1D<Vec3f>;
+
+%template(UnaryFunction1DVoid)		UnaryFunction1D<void>;
+%template(UnaryFunction1DUnsigned)	UnaryFunction1D<unsigned>;
+%template(UnaryFunction1DFloat)		UnaryFunction1D<float>;
+%template(UnaryFunction1DDouble)	UnaryFunction1D<double>;
+%template(UnaryFunction1DVec2f)		UnaryFunction1D<Vec2f>;
+%template(UnaryFunction1DVec3f)		UnaryFunction1D<Vec3f>;
+%template(UnaryFunction1DVectorViewShape)		UnaryFunction1D<std::vector<ViewShape*> >;
+# endif // SWIG
+
+
+//
+// Functions definitions
+//
+///////////////////////////////////////////////////////////
+
+namespace Functions1D {
+
+  // GetXF1D
+  /*! Returns the X 3D coordinate of an Interface1D. */
+  class LIB_VIEW_MAP_EXPORT GetXF1D : public UnaryFunction1D<real>
+  {
+  private:
+    Functions0D::GetXF0D _func;
+  public:
+    /*! Builds the functor.
+     *  \param iType
+     *    The integration method used to compute
+     *    a single value from a set of values.
+     */
+    GetXF1D(IntegrationType iType) : UnaryFunction1D<real>(iType){}
+    /*! Returns the string "GetXF1D"*/
+    string getName() const {
+      return "GetXF1D";
+    }
+    /*! the () operator.*/
+    real operator()(Interface1D& inter) ;
+  };
+
+  // GetYF1D
+  /*! Returns the Y 3D coordinate of an Interface1D. */
+  class LIB_VIEW_MAP_EXPORT GetYF1D : public UnaryFunction1D<real>
+  {
+  private:
+    Functions0D::GetYF0D _func;
+  public:
+    /*! Builds the functor.
+     *  \param iType
+     *    The integration method used to compute
+     *    a single value from a set of values.
+     */
+    GetYF1D(IntegrationType iType = MEAN) : UnaryFunction1D<real>(iType){}
+    /*! Returns the string "GetYF1D"*/
+    string getName() const {
+      return "GetYF1D";
+    }
+    /*! the () operator.*/
+    real operator()(Interface1D& inter) ;
+  };
+
+  // GetZF1D
+  /*! Returns the Z 3D coordinate of an Interface1D. */
+  class LIB_VIEW_MAP_EXPORT GetZF1D : public UnaryFunction1D<real>
+  {
+  private:
+    Functions0D::GetZF0D _func;
+  public:
+    /*! Builds the functor.
+     *  \param iType
+     *    The integration method used to compute
+     *    a single value from a set of values.
+     */
+    GetZF1D(IntegrationType iType = MEAN) : UnaryFunction1D<real>(iType){}
+    /*! Returns the string "GetZF1D"*/
+    string getName() const {
+      return "GetZF1D";
+    }
+    /*! the () operator.*/
+    real operator()(Interface1D& inter) ;
+  };
+
+  // GetProjectedXF1D
+  /*! Returns the projected X 3D coordinate of an Interface1D. */
+  class LIB_VIEW_MAP_EXPORT GetProjectedXF1D : public UnaryFunction1D<real>
+  {
+  private:
+    Functions0D::GetProjectedXF0D _func;
+  public:
+    /*! Builds the functor.
+     *  \param iType
+     *    The integration method used to compute
+     *    a single value from a set of values.
+     */
+    GetProjectedXF1D(IntegrationType iType = MEAN) : UnaryFunction1D<real>(iType){}
+  public:
+    /*! Returns the string "GetProjectedXF1D"*/
+    string getName() const {
+      return "GetProjectedXF1D";
+    }
+    /*! the () operator.*/
+    real operator()(Interface1D& inter);
+  };
+  
+  // GetProjectedYF1D
+  /*! Returns the projected Y 3D coordinate of an Interface1D. */
+  class LIB_VIEW_MAP_EXPORT GetProjectedYF1D : public UnaryFunction1D<real>
+  {
+  private:
+    Functions0D::GetProjectedYF0D _func;
+  public:
+    /*! Builds the functor.
+     *  \param iType
+     *    The integration method used to compute
+     *    a single value from a set of values.
+     */
+    GetProjectedYF1D(IntegrationType iType = MEAN) : UnaryFunction1D<real>(iType){}
+  public:
+    /*! Returns the string "GetProjectedYF1D"*/
+    string getName() const {
+      return "GetProjectedYF1D";
+    }
+    /*! the () operator.*/
+    real operator()(Interface1D& inter);
+  };
+
+  // GetProjectedZF1D
+  /*! Returns the projected Z 3D coordinate of an Interface1D. */
+  class LIB_VIEW_MAP_EXPORT GetProjectedZF1D : public UnaryFunction1D<real>
+  {
+  private:
+    Functions0D::GetProjectedZF0D _func;
+  public:
+    /*! Builds the functor.
+     *  \param iType
+     *    The integration method used to compute
+     *    a single value from a set of values.
+     */
+    GetProjectedZF1D(IntegrationType iType = MEAN) : UnaryFunction1D<real>(iType){}
+  public:
+    /*! Returns the string "GetProjectedZF1D"*/
+    string getName() const {
+      return "GetProjectedZF1D";
+    }
+    /*! the () operator.*/
+    real operator()(Interface1D& inter);
+  };
+  
+  // Orientation2DF1D
+  /*! Returns the 2D orientation as a Vec2f*/
+  class LIB_VIEW_MAP_EXPORT Orientation2DF1D : public UnaryFunction1D<Vec2f>
+  {
+  private:
+    Functions0D::VertexOrientation2DF0D _func;
+  public:
+    /*! Builds the functor.
+     *  \param iType
+     *    The integration method used to compute
+     *    a single value from a set of values.
+     */
+    Orientation2DF1D(IntegrationType iType = MEAN) : UnaryFunction1D<Vec2f>(iType){}
+    /*! Returns the string "Orientation2DF1D"*/
+    string getName() const {
+      return "Orientation2DF1D";
+    }
+    /*! the () operator.*/
+    Vec2f operator()(Interface1D& inter);
+  };
+
+  // Orientation3DF1D
+  /*! Returns the 3D orientation as a Vec3f. */
+  class LIB_VIEW_MAP_EXPORT Orientation3DF1D : public UnaryFunction1D<Vec3f>
+  {
+  private:
+    Functions0D::VertexOrientation3DF0D _func;
+  public:
+    /*! Builds the functor.
+     *  \param iType
+     *    The integration method used to compute
+     *    a single value from a set of values.
+     */
+    Orientation3DF1D(IntegrationType iType = MEAN) : UnaryFunction1D<Vec3f>(iType){}
+    /*! Returns the string "Orientation3DF1D"*/
+    string getName() const {
+      return "Orientation3DF1D";
+    }
+    /*! the () operator.*/    
+    Vec3f operator()(Interface1D& inter);
+  };
+
+  // ZDiscontinuityF1D
+  /*! Returns a real giving the distance between
+   *  and Interface1D and the shape that lies behind (occludee).
+   *  This distance is evaluated in the camera space and normalized
+   *  between 0 and 1. Therefore, if no oject is occluded by the
+   *  shape to which the Interface1D belongs to, 1 is returned.
+   */
+  class LIB_VIEW_MAP_EXPORT ZDiscontinuityF1D : public UnaryFunction1D<real>
+  {
+  private:
+    Functions0D::ZDiscontinuityF0D _func;
+  public:
+    /*! Builds the functor.
+     *  \param iType
+     *    The integration method used to compute
+     *    a single value from a set of values.
+     */
+    ZDiscontinuityF1D(IntegrationType iType = MEAN) : UnaryFunction1D<real>(iType){}
+    /*! Returns the string "ZDiscontinuityF1D"*/
+    string getName() const {
+      return "ZDiscontinuityF1D";
+    }
+    /*! the () operator.*/        
+    real operator()(Interface1D& inter);
+  };
+  
+  // QuantitativeInvisibilityF1D
+  /*! Returns the Quantitative Invisibility of an Interface1D element.
+   *  If the Interface1D is a ViewEdge, then there is no ambiguity
+   *  concerning the result. But, if the Interface1D results of a chaining
+   *  (chain, stroke), then it might be made of several 1D elements
+   *  of different Quantitative Invisibilities.
+   */
+  class LIB_VIEW_MAP_EXPORT QuantitativeInvisibilityF1D : public UnaryFunction1D<unsigned>
+  {
+  private:
+    Functions0D::QuantitativeInvisibilityF0D _func;
+  public:
+  /*! Builds the functor.
+     *  \param iType
+     *    The integration method used to compute
+     *    a single value from a set of values.
+     */
+    QuantitativeInvisibilityF1D(IntegrationType iType = MEAN) : UnaryFunction1D<unsigned int>(iType) {}
+   /*! Returns the string "QuantitativeInvisibilityF1D"*/
+    string getName() const {
+      return "QuantitativeInvisibilityF1D";
+    }
+  /*! the () operator.*/        
+    unsigned operator()(Interface1D& inter);
+  };
+
+  // CurveNatureF1D
+/*! Returns the nature of the Interface1D (silhouette, ridge, crease...).
+ *  Except if the Interface1D is a ViewEdge, this result might be ambiguous.
+ *  Indeed, the Interface1D might result from the gathering of several 1D elements,
+ *  each one being of a different nature. An integration method, such as
+ *  the MEAN, might give, in this case, irrelevant results.
+ */
+  class LIB_VIEW_MAP_EXPORT CurveNatureF1D : public UnaryFunction1D<Nature::EdgeNature>
+  {
+  private:
+    Functions0D::CurveNatureF0D _func;
+  public:
+    /*! Builds the functor.
+     *  \param iType
+     *    The integration method used to compute
+     *    a single value from a set of values.
+     */
+    CurveNatureF1D(IntegrationType iType = MEAN) : UnaryFunction1D<Nature::EdgeNature>(iType) {}
+    /*! Returns the string "CurveNatureF1D"*/
+    string getName() const {
+      return "CurveNatureF1D";
+    }
+    /*! the () operator.*/        
+    Nature::EdgeNature operator()(Interface1D& inter);
+  };
+
+  // TimeStampF1D
+/*! Returns the time stamp of the Interface1D. */
+  class LIB_VIEW_MAP_EXPORT TimeStampF1D : public UnaryFunction1D<void>
+  {
+  public:
+    /*! Returns the string "TimeStampF1D"*/
+    string getName() const {
+      return "TimeStampF1D";
+    }
+    /*! the () operator.*/        
+    void operator()(Interface1D& inter);
+  };
+
+  // IncrementChainingTimeStampF1D
+/*! Increments the chaining time stamp of the Interface1D. */
+  class LIB_VIEW_MAP_EXPORT IncrementChainingTimeStampF1D : public UnaryFunction1D<void>
+  {
+  public:
+    /*! Returns the string "IncrementChainingTimeStampF1D"*/
+    string getName() const {
+      return "IncrementChainingTimeStampF1D";
+    }
+    /*! the () operator.*/        
+    void operator()(Interface1D& inter);
+  };
+
+  // ChainingTimeStampF1D
+/*! Sets the chaining time stamp of the Interface1D. */
+  class LIB_VIEW_MAP_EXPORT ChainingTimeStampF1D : public UnaryFunction1D<void>
+  {
+  public:
+    /*! Returns the string "ChainingTimeStampF1D"*/
+    string getName() const {
+      return "ChainingTimeStampF1D";
+    }
+    /*! the () operator.*/        
+    void operator()(Interface1D& inter);
+  };
+  
+
+  // Curvature2DAngleF1D
+/*! Returns the 2D curvature as an angle for an Interface1D. */
+  class LIB_VIEW_MAP_EXPORT Curvature2DAngleF1D : public UnaryFunction1D<real>
+  {
+  public:
+    /*! Builds the functor.
+     *  \param iType
+     *    The integration method used to compute
+     *    a single value from a set of values.
+     */
+    Curvature2DAngleF1D(IntegrationType iType = MEAN) : UnaryFunction1D<real>(iType) {}
+    /*! Returns the string "Curvature2DAngleF1D"*/
+    string getName() const {
+      return "Curvature2DAngleF1D";
+    }
+    /*! the () operator.*/        
+    real operator()(Interface1D& inter) {
+      return integrate(_fun, inter.verticesBegin(), inter.verticesEnd(), _integration);
+    }
+  private:
+    Functions0D::Curvature2DAngleF0D	_fun;
+  };
+
+  // Normal2DF1D
+  /*! Returns the 2D normal for an interface 1D. */
+  class LIB_VIEW_MAP_EXPORT Normal2DF1D : public UnaryFunction1D<Vec2f>
+  {
+  public:
+    /*! Builds the functor.
+     *  \param iType
+     *    The integration method used to compute
+     *    a single value from a set of values.
+     */
+    Normal2DF1D(IntegrationType iType = MEAN) : UnaryFunction1D<Vec2f>(iType) {}
+    /*! Returns the string "Normal2DF1D"*/
+    string getName() const {
+      return "Normal2DF1D";
+    }
+    /*! the () operator.*/        
+    Vec2f operator()(Interface1D& inter) {
+      return integrate(_fun, inter.verticesBegin(), inter.verticesEnd(), _integration);
+    }
+  private:
+    Functions0D::Normal2DF0D	_fun;
+  };
+
+  // GetShapeF1D
+  /*! Returns list of shapes covered by this Interface1D. */
+  class LIB_VIEW_MAP_EXPORT GetShapeF1D : public UnaryFunction1D<std::vector<ViewShape*> >
+  {
+  public:
+    /*! Builds the functor.
+     */
+    GetShapeF1D() : UnaryFunction1D<std::vector<ViewShape*> >() {}
+    /*! Returns the string "GetShapeF1D"*/
+    string getName() const {
+      return "GetShapeF1D";
+    }
+    /*! the () operator.*/        
+    std::vector<ViewShape*> operator()(Interface1D& inter);
+  };
+
+  // GetOccludersF1D
+  /*! Returns list of occluding shapes covered by this Interface1D. */
+  class LIB_VIEW_MAP_EXPORT GetOccludersF1D : public UnaryFunction1D<std::vector<ViewShape*> >
+  {
+  public:
+    /*! Builds the functor.
+     */
+    GetOccludersF1D() : UnaryFunction1D<std::vector<ViewShape*> >() {}
+    /*! Returns the string "GetOccludersF1D"*/
+    string getName() const {
+      return "GetOccludersF1D";
+    }
+    /*! the () operator.*/        
+    std::vector<ViewShape*> operator()(Interface1D& inter);
+  };
+
+  // GetOccludeeF1D
+  /*! Returns list of occluded shapes covered by this Interface1D. */
+  class LIB_VIEW_MAP_EXPORT GetOccludeeF1D : public UnaryFunction1D<std::vector<ViewShape*> >
+  {
+  public:
+    /*! Builds the functor.
+     */
+    GetOccludeeF1D() : UnaryFunction1D<std::vector<ViewShape*> >() {}
+    /*! Returns the string "GetOccludeeF1D"*/
+    string getName() const {
+      return "GetOccludeeF1D";
+    }
+    /*! the () operator.*/        
+    std::vector<ViewShape*> operator()(Interface1D& inter);
+  };
+
+  // internal
+  ////////////
+
+  // getOccludeeF1D
+  LIB_VIEW_MAP_EXPORT
+  void getOccludeeF1D(Interface1D& inter, set<ViewShape*>& oShapes);
+
+  // getOccludersF1D
+  LIB_VIEW_MAP_EXPORT
+  void getOccludersF1D(Interface1D& inter, set<ViewShape*>& oShapes);
+
+  // getShapeF1D
+  LIB_VIEW_MAP_EXPORT
+  void getShapeF1D(Interface1D& inter, set<ViewShape*>& oShapes);
+  
+} // end of namespace Functions1D
+
+#endif // FUNCTIONS1D_HPP
diff --git a/extern/freestyle/src/view_map/Interface0D.h b/extern/freestyle/src/view_map/Interface0D.h
new file mode 100755
index 00000000000..eec39d2f7bc
--- /dev/null
+++ b/extern/freestyle/src/view_map/Interface0D.h
@@ -0,0 +1,351 @@
+//
+//  Filename         : Interface0D.h
+//  Author(s)        : Emmanuel Turquin
+//  Purpose          : Interface to 0D elts
+//  Date of creation : 01/07/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  INTERFACE0D_H
+# define INTERFACE0D_H
+
+# include <string>
+# include <iostream>
+# include "../system/Id.h"
+# include "../system/Precision.h"
+# include "../winged_edge/Nature.h"
+# include "../geometry/Geom.h"
+using namespace std;
+
+//
+// Interface0D
+//
+//////////////////////////////////////////////////
+
+class FEdge;
+class SVertex;
+class ViewVertex;
+class NonTVertex;
+class TVertex;
+/*! Base class for any 0D element. */
+class Interface0D
+{
+public:
+
+  /*! Returns the string "Interface0D".*/
+  virtual string getExactTypeName() const {
+    return "Interface0D";
+  }
+
+  // Data access methods
+
+  /*! Returns the 3D x coordinate of the point. */ 
+  virtual real getX() const {
+    cerr << "Warning: method getX() not implemented" << endl;
+    return 0;
+  }
+
+  /*! Returns the 3D y coordinate of the point. */ 
+  virtual real getY() const {
+    cerr << "Warning: method getY() not implemented" << endl;
+    return 0;
+  }
+
+  /*!  Returns the 3D z coordinate of the point. */ 
+  virtual real getZ() const {
+    cerr << "Warning: method getZ() not implemented" << endl;
+    return 0;
+  }
+
+  /*!  Returns the 3D point. */ 
+  virtual Geometry::Vec3f getPoint3D() const {
+    cerr << "Warning: method getPoint3D() not implemented" << endl;
+    return 0;
+  }
+
+  /*! Returns the 2D x coordinate of the point. */ 
+  virtual real getProjectedX() const {
+    cerr << "Warning: method getProjectedX() not implemented" << endl;
+    return 0;
+  }
+
+  /*! Returns the 2D y coordinate of the point. */ 
+  virtual real getProjectedY() const {
+    cerr << "Warning: method getProjectedY() not implemented" << endl;
+    return 0;
+  }
+
+  /*! Returns the 2D z coordinate of the point. */ 
+  virtual real getProjectedZ() const {
+    cerr << "Warning: method getProjectedZ() not implemented" << endl;
+    return 0;
+  }
+
+  /*!  Returns the 2D point. */ 
+  virtual Geometry::Vec2f getPoint2D() const {
+    cerr << "Warning: method getPoint2D() not implemented" << endl;
+    return 0;
+  }
+
+  /*! Returns the FEdge that lies between this Interface0D and the
+   *  Interface0D given as argument. */
+  virtual FEdge* getFEdge(Interface0D&) {
+    cerr << "Warning: method getFEdge() not implemented" << endl;
+    return 0;
+  }
+
+  /*! Returns the Id of the point. */ 
+  virtual Id getId() const {
+    cerr << "Warning: method getId() not implemented" << endl;
+    return Id(0, 0);
+  }
+
+  /*! Returns the nature of the point. */ 
+  virtual Nature::VertexNature getNature() const {
+    cerr << "Warning: method getNature() not implemented" << endl;
+    return Nature::POINT;
+  }
+
+  /*! Cast the Interface0D in SVertex if it can be. */ 
+  virtual SVertex * castToSVertex(){
+    cerr << "Warning: can't cast this Interface0D in SVertex" << endl;
+    return 0;
+  }
+
+  /*! Cast the Interface0D in ViewVertex if it can be. */ 
+  virtual ViewVertex * castToViewVertex(){
+    cerr << "Warning: can't cast this Interface0D in ViewVertex" << endl;
+    return 0;
+  }
+
+  /*! Cast the Interface0D in NonTVertex if it can be. */ 
+  virtual NonTVertex * castToNonTVertex(){
+    cerr << "Warning: can't cast this Interface0D in NonTVertex" << endl;
+    return 0;
+  }
+
+  /*! Cast the Interface0D in TVertex if it can be. */ 
+  virtual TVertex * castToTVertex(){
+    cerr << "Warning: can't cast this Interface0D in TVertex" << endl;
+    return 0;
+  }
+};
+
+
+//
+// Interface0DIteratorNested
+//
+//////////////////////////////////////////////////
+
+class Interface0DIteratorNested
+{
+public:
+
+  virtual ~Interface0DIteratorNested() {}
+
+  virtual string getExactTypeName() const {
+    return "Interface0DIteratorNested";
+  }
+
+  virtual Interface0D& operator*() = 0;
+
+  virtual Interface0D* operator->() {
+    return &(operator*());
+  }
+
+  virtual void increment() = 0;
+
+  virtual void decrement() = 0;
+
+  virtual bool isBegin() const = 0;
+
+  virtual bool isEnd() const = 0;
+
+  virtual bool operator==(const Interface0DIteratorNested& it) const = 0;
+
+  virtual bool operator!=(const Interface0DIteratorNested& it) const {
+    return !(*this == it);
+  }
+
+  /*! Returns the curvilinear abscissa */
+  virtual float t() const = 0;
+  /*! Returns the point parameter 0<u<1 */
+  virtual float u() const = 0;
+
+  virtual Interface0DIteratorNested* copy() const = 0;
+};
+
+
+//
+// Interface0DIterator
+//
+//////////////////////////////////////////////////
+
+/*! Class defining an iterator over Interface0D elements.
+ *  An instance of this iterator is always obtained
+ *  from a 1D element.
+ *  \attention In the scripting language, you must call
+ *  \code it2 = Interface0DIterator(it1) \endcode instead of \code it2 = it1 \endcode
+ *  where \a it1 and \a it2 are 2 Interface0DIterator.
+ *  Otherwise, incrementing \a it1 will also increment \a it2.
+ */
+class Interface0DIterator
+{
+public:
+
+  Interface0DIterator(Interface0DIteratorNested* it = NULL) {
+    _iterator = it;
+  }
+
+  /*! Copy constructor */
+  Interface0DIterator(const Interface0DIterator& it) {
+    _iterator = it._iterator->copy();
+  }
+
+  /*! Destructor */
+  virtual ~Interface0DIterator() {
+    if (_iterator)
+      delete _iterator;
+  }
+
+  /*! Operator =
+   *  \attention In the scripting language, you must call
+   *  \code it2 = Interface0DIterator(it1) \endcode instead of \code it2 = it1 \endcode
+   *  where \a it1 and \a it2 are 2 Interface0DIterator.
+   *  Otherwise, incrementing \a it1 will also increment \a it2.
+   */
+  Interface0DIterator& operator=(const Interface0DIterator& it) {
+    if(_iterator)
+      delete _iterator;
+    _iterator = it._iterator->copy();
+    return *this;
+  }
+
+  /*! Returns the string "Interface0DIterator". */
+  string getExactTypeName() const {
+    if (!_iterator)
+      return "Interface0DIterator";
+    return _iterator->getExactTypeName() + "Proxy";
+  }
+
+  // FIXME test it != 0 (exceptions ?)
+
+  /*! Returns a reference to the pointed Interface0D.
+   *  In the scripting language, you must call
+   *  "getObject()" instead using this operator.
+   */ 
+  Interface0D& operator*() {
+    return _iterator->operator*();
+  }
+
+  /*! Returns a pointer to the pointed Interface0D.
+   *  Can't be called in the scripting language.
+   */
+  Interface0D* operator->() {
+    return &(operator*());
+  }
+
+  /*! Increments. In the scripting language, call
+   *  "increment()".
+   */
+  Interface0DIterator& operator++() {
+    _iterator->increment();
+    return *this;
+  }
+
+  /*! Increments. In the scripting language, call
+   *  "increment()".
+   */
+  Interface0DIterator operator++(int) {
+    Interface0DIterator ret(*this);
+    _iterator->increment();
+    return ret;
+  }
+
+  /*! Decrements. In the scripting language, call
+   *  "decrement()".
+   */
+  Interface0DIterator& operator--() {
+    _iterator->decrement();
+    return *this;
+  }
+
+  /*! Decrements. In the scripting language, call
+   *  "decrement()".
+   */
+  Interface0DIterator operator--(int) {
+    Interface0DIterator ret(*this);
+    _iterator->decrement();
+    return ret;
+  }
+
+  /*! Increments. */
+  void increment() {
+    _iterator->increment();
+  }
+  
+  /*! Decrements. */
+  void decrement() {
+    _iterator->decrement();
+  }
+
+  /*! Returns true if the pointed Interface0D is the
+   * first of the 1D element containing the points over
+   * which we're iterating.
+   */
+  bool isBegin() const {
+    return _iterator->isBegin();
+  }
+
+  /*! Returns true if the pointed Interface0D is after the
+   * after the last point of the 1D element we're iterating from.
+   */
+  bool isEnd() const {
+    return _iterator->isEnd();
+  }
+
+  /*! operator == . */
+  bool operator==(const Interface0DIterator& it) const {
+    return _iterator->operator==(*(it._iterator));
+  }
+
+  /*! operator != . */
+  bool operator!=(const Interface0DIterator& it) const {
+    return !(*this == it);
+  }
+
+  /*! Returns the curvilinear abscissa. */
+  inline float t() const {
+    return _iterator->t();
+  }
+  /*! Returns the point parameter in the curve 0<=u<=1. */
+  inline float u() const {
+    return _iterator->u();
+  }
+protected:
+
+  Interface0DIteratorNested* _iterator;
+};
+
+#endif // INTERFACE0D_H
diff --git a/extern/freestyle/src/view_map/Interface1D.h b/extern/freestyle/src/view_map/Interface1D.h
new file mode 100755
index 00000000000..812187e5ec1
--- /dev/null
+++ b/extern/freestyle/src/view_map/Interface1D.h
@@ -0,0 +1,202 @@
+//
+//  Filename         : Interface1D.h
+//  Author(s)        : Emmanuel Turquin
+//  Purpose          : Interface to 1D elts
+//  Date of creation : 01/07/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  INTERFACE1D_H
+# define INTERFACE1D_H
+
+# include <string>
+# include <iostream>
+# include <float.h>
+# include "../system/Id.h"
+# include "../system/Precision.h"
+# include "../winged_edge/Nature.h"
+# include "Functions0D.h"
+
+using namespace std;
+/*! \file Interface1D.h
+ *  Interface1D and related tools definitions
+ */
+// Integration method
+/*! The different integration
+ *  methods that can be invoked
+ *  to integrate into a single value the set of values obtained
+ *  from each 0D element of a 1D element.
+ */
+typedef enum {
+  MEAN,/*!< The value computed for the 1D element is the mean of the values obtained for the 0D elements.*/
+  MIN,/*!< The value computed for the 1D element is the minimum of the values obtained for the 0D elements.*/
+  MAX,/*!< The value computed for the 1D element is the maximum of the values obtained for the 0D elements.*/
+  FIRST,/*!< The value computed for the 1D element is the first of the values obtained for the 0D elements.*/
+  LAST/*!< The value computed for the 1D element is the last of the values obtained for the 0D elements.*/
+} IntegrationType;
+
+/*! Returns a single
+ *  value from a set of values evaluated at each 0D element
+ *  of this 1D element.
+ *  \param fun
+ *    The UnaryFunction0D used to compute a value at each Interface0D.
+ *  \param it
+ *    The Interface0DIterator used to iterate over the 0D elements of
+ *    this 1D element. The integration will occur over the 0D elements
+ *    starting from the one pointed by it.
+ *  \param it_end
+ *    The Interface0DIterator pointing the end of the 0D elements of the
+ *    1D element.
+ *  \param integration_type
+ *    The integration method used to compute a single value from
+ *    a set of values.
+ *  \return the single value obtained for the 1D element.
+ */
+template <class T>
+T integrate(UnaryFunction0D<T>& fun,
+	    Interface0DIterator it,
+	    Interface0DIterator it_end,
+	    IntegrationType integration_type = MEAN) {
+  T res;
+  T res_tmp;
+  unsigned size;
+  switch (integration_type) {
+  case MIN:
+    res = fun(it);++it;
+    for (; !it.isEnd(); ++it) {
+      res_tmp = fun(it);
+      if (res_tmp < res)
+	res = res_tmp;
+    }
+    break;
+  case MAX:
+    res = fun(it);++it;
+    for (; !it.isEnd(); ++it) {
+      res_tmp = fun(it);
+      if (res_tmp > res)
+	res = res_tmp;
+    }
+    break;
+  case FIRST:
+    res = fun(it);
+    break;
+  case LAST:
+    res = fun(--it_end);
+    break;
+  case MEAN:
+  default:
+    res = fun(it);++it;
+    for (size = 1; !it.isEnd(); ++it, ++size)
+      res += fun(it);
+    res /= (size ? size : 1);
+    break;
+  }
+  return res;
+}
+
+//
+// Interface1D
+//
+//////////////////////////////////////////////////
+
+/*! Base class for any 1D element. */
+class Interface1D
+{
+public:
+
+  /*! Default constructor */
+  Interface1D() {_timeStamp=0;}
+
+  /*! Returns the string "Interface1D" .*/
+  virtual string getExactTypeName() const {
+    return "Interface1D";
+  }
+
+  // Iterator access
+
+  /*! Returns an iterator over the Interface1D vertices,
+   *  pointing to the first vertex.
+   */
+  virtual Interface0DIterator verticesBegin() = 0;
+  /*! Returns an iterator over the Interface1D vertices,
+   *  pointing after the last vertex.
+   */
+  virtual Interface0DIterator verticesEnd() = 0;
+  /*! Returns an iterator over the Interface1D points,
+   *  pointing to the first point. The difference with
+   *  verticesBegin() is that here we can iterate over
+   *  points of the 1D element at a any given sampling.
+   *  Indeed, for each iteration, a virtual point is created.
+   *  \param t
+   *    The sampling with which we want to iterate over points of
+   *    this 1D element.
+   */
+  virtual Interface0DIterator pointsBegin(float t=0.f) = 0;
+  /*! Returns an iterator over the Interface1D points,
+   *  pointing after the last point. The difference with
+   *  verticesEnd() is that here we can iterate over
+   *  points of the 1D element at a any given sampling.
+   *  Indeed, for each iteration, a virtual point is created.
+   *  \param t
+   *    The sampling with which we want to iterate over points of
+   *    this 1D element.
+   */
+  virtual Interface0DIterator pointsEnd(float t=0.f) = 0;
+
+  // Data access methods
+
+  /*! Returns the 2D length of the 1D element. */
+  virtual real getLength2D() const {
+    cerr << "Warning: method getLength2D() not implemented" << endl;
+    return 0;
+  }
+
+  /*! Returns the Id of the 1D element .*/
+  virtual Id getId() const {
+    cerr << "Warning: method getId() not implemented" << endl;
+    return Id(0, 0);
+  }
+
+  // FIXME: ce truc n'a rien a faire la...(c une requete complexe qui doit etre ds les Function1D)
+  /*! Returns the nature of the 1D element. */
+  virtual Nature::EdgeNature getNature() const {
+    cerr << "Warning: method getNature() not implemented" << endl;
+    return Nature::NO_FEATURE;
+  }
+  
+  /*! Returns the time stamp of the 1D element. Mainly used for selection. */
+  virtual unsigned getTimeStamp() const {
+    return _timeStamp;
+  }
+  
+  /*! Sets the time stamp for the 1D element. */
+  inline void setTimeStamp(unsigned iTimeStamp){
+    _timeStamp = iTimeStamp;
+  }
+
+protected:
+  unsigned _timeStamp;
+};
+
+#endif // INTERFACE1D_H
diff --git a/extern/freestyle/src/view_map/Silhouette.cpp b/extern/freestyle/src/view_map/Silhouette.cpp
new file mode 100755
index 00000000000..db4f82d369e
--- /dev/null
+++ b/extern/freestyle/src/view_map/Silhouette.cpp
@@ -0,0 +1,370 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "Silhouette.h"
+#include "ViewMap.h"
+
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             SVertex            */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+Nature::VertexNature SVertex::getNature() const {
+  Nature::VertexNature nature = Nature::S_VERTEX;
+  if (_pViewVertex)
+    nature |= _pViewVertex->getNature();
+  return nature;
+}
+
+SVertex * SVertex::castToSVertex(){
+  return this;
+}
+
+ViewVertex * SVertex::castToViewVertex(){
+  return _pViewVertex;
+}
+
+NonTVertex * SVertex::castToNonTVertex(){
+  return dynamic_cast<NonTVertex*>(_pViewVertex);
+}
+
+TVertex * SVertex::castToTVertex(){
+  return dynamic_cast<TVertex*>(_pViewVertex);
+}
+
+float SVertex::shape_importance() const 
+{
+  return shape()->importance();
+}
+ 
+//Material SVertex::material() const {return _Shape->material();}
+Id SVertex::shape_id() const {return _Shape->getId();}
+const SShape *  SVertex::shape() const {return _Shape;}
+
+const int SVertex::qi() const 
+{
+  if (getNature() & Nature::T_VERTEX)
+    Exception::raiseException();
+  return (_FEdges[0])->qi();
+}
+
+occluder_container::const_iterator SVertex::occluders_begin() const 
+{
+  if (getNature() & Nature::T_VERTEX)
+    Exception::raiseException();
+  return (_FEdges[0])->occluders_begin();
+}
+
+occluder_container::const_iterator SVertex::occluders_end() const 
+{
+  if (getNature() & Nature::T_VERTEX)
+    Exception::raiseException();
+  return (_FEdges[0])->occluders_end();
+}
+
+bool SVertex::occluders_empty() const 
+{
+  if (getNature() & Nature::T_VERTEX)
+    Exception::raiseException();
+  return (_FEdges[0])->occluders_empty();
+}
+
+int SVertex::occluders_size() const 
+{
+  if (getNature() & Nature::T_VERTEX)
+    Exception::raiseException();
+  return (_FEdges[0])->occluders_size();
+}
+
+const Polygon3r& SVertex::occludee() const 
+{
+  if (getNature() & Nature::T_VERTEX)
+    Exception::raiseException();
+  return (_FEdges[0])->occludee();
+}
+
+const SShape* SVertex::occluded_shape() const 
+{
+  if (getNature() & Nature::T_VERTEX)
+    Exception::raiseException();
+  return (_FEdges[0])->occluded_shape();
+}
+
+const bool  SVertex::occludee_empty() const
+{
+  if (getNature() & Nature::T_VERTEX)
+    Exception::raiseException();
+  return (_FEdges[0])->occludee_empty();
+}
+
+real SVertex::z_discontinuity() const 
+{
+  if (getNature() & Nature::T_VERTEX)
+    Exception::raiseException();
+  return (_FEdges[0])->z_discontinuity();
+}
+
+FEdge* SVertex::fedge()
+{
+  if (getNature() & Nature::T_VERTEX)
+    return 0;
+  return _FEdges[0];
+}
+
+FEdge* SVertex::getFEdge(Interface0D& inter)
+{
+  FEdge * result = 0;
+  SVertex* iVertexB = dynamic_cast<SVertex*>(&inter);
+  if (!iVertexB)
+    return result;
+  vector<FEdge*>::const_iterator fe=_FEdges.begin(), feend=_FEdges.end();
+  for(;
+  fe!=feend;
+  ++fe)
+  {
+    if(  (((*fe)->vertexA() == this) && ((*fe)->vertexB() == iVertexB))
+      || (((*fe)->vertexB() == this) && ((*fe)->vertexA() == iVertexB)))
+      result = (*fe);
+  }
+  if((result == 0) && (getNature() & Nature::T_VERTEX))
+  {
+    SVertex *brother;
+    ViewVertex *vvertex = viewvertex();
+    TVertex * tvertex = dynamic_cast<TVertex*>(vvertex);
+    if(tvertex)
+    {
+      brother = tvertex->frontSVertex();
+      if(this == brother)
+        brother = tvertex->backSVertex();
+      const vector<FEdge*>& fedges = brother->fedges();
+      for(fe=fedges.begin(),feend=fedges.end();
+      fe!=feend;
+      ++fe)
+      {
+        if(  (((*fe)->vertexA() == brother) && ((*fe)->vertexB() == iVertexB))
+          || (((*fe)->vertexB() == brother) && ((*fe)->vertexA() == iVertexB)))
+        result = (*fe);
+      }
+    }
+  }
+  if((result == 0) && (iVertexB->getNature() & Nature::T_VERTEX))
+  {
+    SVertex *brother;
+    ViewVertex *vvertex = iVertexB->viewvertex();
+    TVertex * tvertex = dynamic_cast<TVertex*>(vvertex);
+    if(tvertex)
+    {
+      brother = tvertex->frontSVertex();
+      if(iVertexB == brother)
+        brother = tvertex->backSVertex();
+      for(fe=_FEdges.begin(),feend=_FEdges.end();
+      fe!=feend;
+      ++fe)
+      {
+        if(  (((*fe)->vertexA() == this) && ((*fe)->vertexB() == brother))
+          || (((*fe)->vertexB() == this) && ((*fe)->vertexA() == brother)))
+        result = (*fe);
+      }
+    }
+  }
+  
+  return result;
+}
+
+
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             FEdge              */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+
+int FEdge::viewedge_nature() const {return _ViewEdge->getNature();}
+//float FEdge::viewedge_length() const {return _ViewEdge->viewedge_length();}
+const SShape* FEdge::occluded_shape() const 
+{
+  ViewShape * aShape = _ViewEdge->aShape(); 
+  if(aShape == 0) 
+    return 0;
+  return aShape->sshape();
+}
+
+float FEdge::shape_importance() const 
+{
+  return _VertexA->shape()->importance();
+} 
+
+int FEdge::invisibility() const 
+{
+  return _ViewEdge->qi();
+}
+
+occluder_container::const_iterator FEdge::occluders_begin() const {return _ViewEdge->occluders_begin();}
+occluder_container::const_iterator FEdge::occluders_end() const {return _ViewEdge->occluders_end();}
+bool FEdge::occluders_empty() const {return _ViewEdge->occluders_empty();}
+int FEdge::occluders_size() const {return _ViewEdge->occluders_size();}
+const bool  FEdge::occludee_empty() const
+{
+  return _ViewEdge->occludee_empty();
+}
+
+
+
+Id FEdge::shape_id() const 
+{
+  return _VertexA->shape()->getId();
+}
+const SShape* FEdge::shape() const 
+{
+  return _VertexA->shape();
+}
+
+real FEdge::z_discontinuity() const 
+{
+  if(!(getNature() & Nature::SILHOUETTE) && !(getNature() & Nature::BORDER))
+  {
+    return 0;
+  }
+
+  BBox<Vec3r> box = ViewMap::getInstance()->getScene3dBBox();
+
+  Vec3r bbox_size_vec(box.getMax() - box.getMin());
+  real bboxsize = bbox_size_vec.norm();
+  if(occludee_empty())
+
+  {
+    //return FLT_MAX;
+
+    return 1.0;
+
+    //return bboxsize;
+
+  }
+  //  real result;
+  //  z_discontinuity_functor<SVertex> _functor;
+
+  //  Evaluate<SVertex,z_discontinuity_functor<SVertex> >(&_functor, iCombination, result )
+  Vec3r middle((_VertexB->point3d()-_VertexA->point3d()));
+
+  middle /= 2;
+  Vec3r disc_vec(middle - _occludeeIntersection);
+  real res = disc_vec.norm() / bboxsize;
+  return res;
+  
+  //return fabs((middle.z()-_occludeeIntersection.z()));
+}
+
+
+//float FEdge::local_average_depth(int iCombination ) const 
+//{
+//
+//  float result;
+//  local_average_depth_functor<SVertex> functor;
+//  Evaluate(&functor, iCombination, result);
+//
+//  return result;
+//}
+//float FEdge::local_depth_variance(int iCombination ) const
+//{
+//  float result;
+//
+//  local_depth_variance_functor<SVertex> functor;
+//
+//  Evaluate(&functor, iCombination, result);
+//
+//  return result;
+//}
+//
+//
+//real FEdge::local_average_density( float sigma, int iCombination) const 
+//{
+//  float result;
+//
+//  density_functor<SVertex> functor(sigma);
+//
+//  Evaluate(&functor, iCombination, result);
+//
+//  return result;
+//}
+//
+////Vec3r FEdge::normal(int& oException /* = Exception::NO_EXCEPTION */)
+////{
+////  Vec3r Na = _VertexA->normal(oException);
+////  if(oException != Exception::NO_EXCEPTION)
+////    return Na;
+////  Vec3r Nb = _VertexB->normal(oException);
+////  if(oException != Exception::NO_EXCEPTION)
+////    return Nb;
+////  return (Na+Nb)/2.0;
+////}  
+//
+//Vec3r FEdge::curvature2d_as_vector(int iCombination) const 
+//{
+//  Vec3r result;
+//  curvature2d_as_vector_functor<SVertex> _functor;
+//  Evaluate<Vec3r,curvature2d_as_vector_functor<SVertex> >(&_functor, iCombination, result );
+//  return result;
+//}
+//
+//real FEdge::curvature2d_as_angle(int iCombination) const 
+//{
+//  real result;
+//  curvature2d_as_angle_functor<SVertex> _functor;
+//  Evaluate<real,curvature2d_as_angle_functor<SVertex> >(&_functor, iCombination, result );
+//  return result;
+//}
+
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             FEdgeSharp        */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+//Material FEdge::material() const 
+//{
+//  return _VertexA->shape()->material();
+//}
+const Material& FEdgeSharp::aMaterial() const {
+  return _VertexA->shape()->material(_aMaterialIndex);
+}
+
+const Material& FEdgeSharp::bMaterial() const {
+  return _VertexA->shape()->material(_bMaterialIndex);
+}
+
+                 /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             FEdgeSmooth         */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+const Material& FEdgeSmooth::material() const {
+  return _VertexA->shape()->material(_MaterialIndex);
+}
diff --git a/extern/freestyle/src/view_map/Silhouette.h b/extern/freestyle/src/view_map/Silhouette.h
new file mode 100755
index 00000000000..e88bf23b210
--- /dev/null
+++ b/extern/freestyle/src/view_map/Silhouette.h
@@ -0,0 +1,1417 @@
+//
+//  Filename         : Silhouette.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Classes to define a silhouette structure
+//  Date of creation : 25/03/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  SILHOUETTE_H
+# define SILHOUETTE_H
+
+# include <iostream>
+# include <string>
+# include <vector>
+# include <set>
+# include <float.h>
+# include "../system/FreestyleConfig.h"
+# include "../geometry/Geom.h"
+# include "../geometry/BBox.h"
+# include "../scene_graph/Material.h"
+# include "../geometry/Polygon.h"
+# include "../system/Exception.h"
+# include "Interface0D.h"
+# include "Interface1D.h"
+# include "../winged_edge/Curvature.h"
+
+using namespace std;
+using namespace Geometry;
+
+class ViewShape;
+typedef vector<ViewShape*> occluder_container;
+
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             SVertex            */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+class FEdge;
+class ViewVertex;
+class SShape;
+
+/*! Class to define a vertex of the embedding. */
+class LIB_VIEW_MAP_EXPORT SVertex : public Interface0D
+{
+public: // Implementation of Interface0D
+
+  /*! Returns the string "SVertex" .*/
+  virtual string getExactTypeName() const {
+    return "SVertex";
+  }
+
+  // Data access methods
+
+  /*! Returns the 3D x coordinate of the vertex .*/
+  virtual real getX() const {
+    return _Point3D.x();
+  }
+
+  /*! Returns the 3D y coordinate of the vertex .*/
+  virtual real getY() const {
+    return _Point3D.y();
+  }
+
+  /*! Returns the 3D z coordinate of the vertex .*/
+  virtual real getZ() const {
+    return _Point3D.z();
+  }
+
+  /*!  Returns the 3D point. */ 
+  virtual Vec3f getPoint3D() const {
+    return _Point3D;
+  }
+
+  /*! Returns the projected 3D  x coordinate of the vertex .*/
+  virtual real getProjectedX() const {
+    return _Point2D.x();
+  }
+
+  /*! Returns the projected 3D  y coordinate of the vertex .*/
+  virtual real getProjectedY() const {
+    return _Point2D.y();
+  }
+
+  /*! Returns the projected 3D  z coordinate of the vertex .*/
+  virtual real getProjectedZ() const {
+    return _Point2D.z();
+  }
+
+  /*!  Returns the 2D point. */ 
+  virtual Vec2f getPoint2D() const {
+    return Vec2f((float)_Point2D.x(),(float)_Point2D.y());
+  }
+
+  /*! Returns the FEdge that lies between this Svertex and the
+   *  Interface0D given as argument. */
+  virtual FEdge* getFEdge(Interface0D&);
+
+  /*! Returns the Id of the vertex .*/
+  virtual Id getId() const {
+    return _Id;
+  }
+
+  /*! Returns the nature of the vertex .*/
+  virtual Nature::VertexNature getNature() const;
+
+  /*! Cast the Interface0D in SVertex if it can be. */ 
+  virtual SVertex * castToSVertex();
+
+  /*! Cast the Interface0D in ViewVertex if it can be. */ 
+  virtual ViewVertex * castToViewVertex();
+
+  /*! Cast the Interface0D in NonTVertex if it can be. */ 
+  virtual NonTVertex * castToNonTVertex();
+
+  /*! Cast the Interface0D in TVertex if it can be. */ 
+  virtual TVertex * castToTVertex();
+
+public:
+
+  typedef vector<FEdge*> fedges_container;
+
+private:
+
+  Id _Id;
+  Vec3r _Point3D;
+  Vec3r _Point2D;
+  set<Vec3r> _Normals; 
+  vector<FEdge*> _FEdges; // the edges containing this vertex
+  SShape *_Shape;  // the shape to which belongs the vertex
+  ViewVertex *_pViewVertex; // The associated viewvertex, in case there is one.
+  real _curvatureFredo;
+  Vec2r _directionFredo;
+  CurvatureInfo* _curvature_info;
+
+public:
+
+  /*! A field that can be used by the user to store any data.
+   *  This field must be reseted afterwards using ResetUserData().
+   */
+  void *userdata;
+
+  /*! Default constructor.*/
+  inline SVertex() {
+    _Id = 0;
+    userdata = NULL;
+    _Shape = NULL;
+    _pViewVertex = 0;
+    _curvature_info = 0;
+  }
+
+  /*! Builds a SVertex from 3D coordinates and an Id. */
+  inline SVertex(const Vec3r &iPoint3D, const Id& id) {
+    _Point3D = iPoint3D;
+    _Id=id;
+    userdata = NULL;
+    _Shape = NULL;
+    _pViewVertex=0;
+    _curvature_info = 0;
+  }
+
+  /*! Copy constructor. */
+  inline SVertex(SVertex& iBrother) {
+    _Id = iBrother._Id;
+    _Point3D =  iBrother.point3D();
+    _Point2D = iBrother.point2D();
+    _Normals = iBrother._Normals;
+    _FEdges = iBrother.fedges();
+    _Shape = iBrother.shape();
+    _pViewVertex = iBrother._pViewVertex;
+    if (!(iBrother._curvature_info))
+      _curvature_info = 0;
+    else
+      _curvature_info = new CurvatureInfo(*(iBrother._curvature_info));
+    iBrother.userdata = this;
+    userdata = 0;
+  }
+
+  /*! Destructor. */
+  virtual ~SVertex() {
+    if (_curvature_info)
+      delete _curvature_info;
+  }
+
+  /*! Cloning method. */
+  virtual SVertex * dupplicate() {
+    SVertex *clone = new SVertex(*this);
+    return clone;
+  }
+
+  /*! operator == */
+  virtual bool operator==(const SVertex& iBrother) {
+    return ((_Point2D == iBrother._Point2D) &&
+	    (_Point3D == iBrother._Point3D));
+  }
+
+  /* accessors */
+  inline const Vec3r& point3D() const {return _Point3D;}
+  inline const Vec3r& point2D() const {return _Point2D;}
+  /*! Returns the set of normals for this Vertex.
+   *  In a smooth surface, a vertex has exactly one normal.
+   *  In a sharp surface, a vertex can have any number of normals.
+   */
+  inline set<Vec3r> normals() {return _Normals;}
+  /*! Returns the number of different normals for this vertex. */
+  inline unsigned normalsSize() const {return _Normals.size();}
+  inline const vector<FEdge*>& fedges() {return _FEdges;}
+  inline fedges_container::iterator fedges_begin() {return _FEdges.begin();}
+  inline fedges_container::iterator fedges_end() {return _FEdges.end();}
+  inline SShape * shape() {return _Shape;}
+  inline real z() const {return _Point2D[2];}
+  /*! If this SVertex is also a ViewVertex, this method
+   *  returns a pointer onto this ViewVertex. 0 is returned
+   *  otherwise.
+   */
+  inline ViewVertex * viewvertex() {return _pViewVertex;}
+
+  /*! modifiers */
+  /*! Sets the 3D coordinates of the SVertex. */
+  inline void SetPoint3D(const Vec3r &iPoint3D) {_Point3D = iPoint3D;}
+  /*! Sets the 3D projected coordinates of the SVertex. */
+  inline void SetPoint2D(const Vec3r &iPoint2D) {_Point2D = iPoint2D;}
+  /*! Adds a normal to the Svertex's set of normals. If the same
+   * normal is already in the set, nothing changes.
+   */
+  inline void AddNormal(const Vec3r& iNormal) 
+  {
+    _Normals.insert(iNormal); // if iNormal in the set already exists, nothing is done
+  }
+
+  void setCurvatureInfo(CurvatureInfo* ci) {
+    _curvature_info = ci;
+  }
+
+  const CurvatureInfo* getCurvatureInfo() const {
+    return _curvature_info;
+  }
+
+  /* Fredo's normal and curvature*/
+  void setCurvatureFredo(real c) {_curvatureFredo=c;}
+  void setDirectionFredo(Vec2r d) {_directionFredo=d;}
+  real curvatureFredo () {return _curvatureFredo;}
+  const Vec2r directionFredo () {return _directionFredo;}
+
+  /*! Sets the Id */
+  inline void SetId(const Id& id) {_Id = id;}
+  inline void SetFEdges(const vector<FEdge*>& iFEdges) {_FEdges = iFEdges;}
+  inline void SetShape(SShape *iShape) {_Shape = iShape;}
+  inline void SetViewVertex(ViewVertex *iViewVertex) {_pViewVertex = iViewVertex;}
+  /*! Add an FEdge to the list of edges emanating from this SVertex. */
+  inline void AddFEdge(FEdge* iFEdge) {_FEdges.push_back(iFEdge);}
+  /* replaces edge 1 by edge 2 in the list of edges */
+  inline void Replace(FEdge *e1, FEdge *e2)
+  {
+    vector<FEdge*>::iterator insertedfe;
+    for(vector<FEdge*>::iterator fe=_FEdges.begin(),fend=_FEdges.end();
+        fe!=fend;
+        fe++)
+      {
+        if((*fe) == e1)
+          {
+            insertedfe = _FEdges.insert(fe, e2);// inserts e2 before fe.
+                                                // returns an iterator pointing toward e2. fe is invalidated.
+            // we want to remove e1, but we can't use fe anymore:
+            insertedfe++; // insertedfe points now to e1
+            _FEdges.erase(insertedfe);
+            return;
+          }
+      }
+  }
+
+public:
+
+  /* Information access interface */
+
+  FEdge *fedge() ; // for non T vertex
+  inline const Vec3r& point2d() const {return point2D();}
+  inline const Vec3r& point3d() const {return point3D();}
+  inline Vec3r normal() const {if(_Normals.size() == 1) return (*(_Normals.begin())); Exception::raiseException(); return *(_Normals.begin());}
+  //Material material() const ;
+  Id shape_id() const ;
+  const SShape* shape() const ;
+  float shape_importance() const ;
+  
+  const int qi() const ;
+  occluder_container::const_iterator occluders_begin() const ;
+  occluder_container::const_iterator occluders_end() const ;
+  bool occluders_empty() const ;
+  int occluders_size() const ;
+  const Polygon3r& occludee() const ;
+  const SShape * occluded_shape() const ;
+  const bool  occludee_empty() const ;
+  real z_discontinuity() const ;
+  //inline float local_average_depth() const ;
+  //  inline float local_depth_variance() const ;
+  //  inline real local_average_density(float sigma = 2.3f) const ;
+  //inline Vec3r shaded_color() const ;
+  //  inline Vec3r orientation2d() const ; 
+  //  inline Vec3r orientation3d() const ;
+  //  inline Vec3r curvature2d_as_vector() const ;
+  /*! angle in radians */
+  //  inline real curvature2d_as_angle() const ;
+  
+};
+
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             FEdge              */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+
+class ViewEdge;
+/*! Base Class for feature edges.
+ *  This FEdge can represent a silhouette, a crease,
+ *  a ridge/valley, a border or a suggestive contour.
+ *  For silhouettes,  the FEdge is oriented
+ *  such as, the visible face lies on the left of the edge.
+ *  For borders, the FEdge is oriented
+ *  such as, the face lies on the left of the edge.
+ *  An FEdge can represent an initial edge of the mesh
+ *  or runs accross a face of the initial mesh depending
+ *  on the smoothness or sharpness of the mesh.
+ *  This class is specialized into a smooth and a sharp
+ *  version since their properties slightly vary from
+ *  one to the other.
+ */
+class LIB_VIEW_MAP_EXPORT FEdge : public Interface1D
+{
+public: // Implementation of Interface0D
+
+  /*! Returns the string "FEdge" . */
+  virtual string getExactTypeName() const {
+    return "FEdge";
+  }
+
+  // Data access methods
+
+  /*! Returns the 2D length of the FEdge. */
+  virtual real getLength2D() const {
+    if (!_VertexA || !_VertexB)
+      return 0;
+    return (_VertexB->getPoint2D() - _VertexA->getPoint2D()).norm();
+  }
+
+  /*! Returns the Id of the FEdge. */
+  virtual Id getId() const {
+    return _Id;
+  }
+
+public:
+
+  // An edge can only be of one kind (SILHOUETTE or BORDER, etc...)
+  // For an multi-nature edge there must be several different FEdge.
+   // DEBUG:
+  //  Vec3r A;
+  //  Vec3r u;
+  //  vector<Polygon3r> _Occludees;
+  //  Vec3r intersection;
+  //  vector<Vec3i> _Cells;
+
+protected:
+  SVertex *_VertexA;
+  SVertex *_VertexB;
+  Id _Id;
+  Nature::EdgeNature _Nature;
+  //vector<Polygon3r> _Occluders; // visibility // NON GERE PAR LE COPY CONSTRUCTOR!!
+  
+  FEdge *_NextEdge; // next edge on the chain
+  FEdge *_PreviousEdge;
+  ViewEdge *_ViewEdge;
+  // Sometimes we need to deport the visibility computation onto another 
+  // edge. For example the exact edges use edges of the mesh to 
+  // compute their visibility
+  
+  Polygon3r _aFace; // The occluded face which lies on the right of a silhouette edge
+  Vec3r _occludeeIntersection;
+  bool _occludeeEmpty;
+
+  bool _isSmooth;
+
+public:
+  /*! A field that can be used by the user to store any data.
+   *  This field must be reseted afterwards using ResetUserData().
+   */
+  void *userdata;
+  /*! Default constructor */
+  inline FEdge() {
+    userdata = NULL;
+    _Nature = Nature::NO_FEATURE;
+    _NextEdge = NULL;
+    _PreviousEdge = NULL;
+    _ViewEdge = NULL;
+    //_hasVisibilityPoint=false;
+    _occludeeEmpty = true;
+    _isSmooth = false;
+  }
+  /*! Builds an FEdge going from vA to vB. */  
+  inline FEdge(SVertex *vA, SVertex *vB) {
+    userdata = NULL;
+    _VertexA = vA;
+    _VertexB = vB;
+    _Nature = Nature::NO_FEATURE;
+    _NextEdge=NULL;
+    _PreviousEdge=NULL;
+    _ViewEdge = NULL;
+    //_hasVisibilityPoint=false;
+    _occludeeEmpty = true;
+    _isSmooth = false;
+  }
+  /*! Copy constructor */
+  inline FEdge(FEdge& iBrother)
+  {
+    _VertexA = iBrother.vertexA();
+    _VertexB = iBrother.vertexB();
+    _NextEdge = iBrother.nextEdge();
+    _PreviousEdge = iBrother._PreviousEdge;
+    _Nature = iBrother.getNature();
+    _Id = iBrother._Id;
+    _ViewEdge = iBrother._ViewEdge;
+    //_hasVisibilityPoint = iBrother._hasVisibilityPoint;
+    //_VisibilityPointA = iBrother._VisibilityPointA;
+    //_VisibilityPointB = iBrother._VisibilityPointB;
+    _aFace = iBrother._aFace;
+    _occludeeEmpty = iBrother._occludeeEmpty;
+    _isSmooth = iBrother._isSmooth;
+    iBrother.userdata = this;
+    userdata = 0;
+  }
+  /*! Destructor */
+  virtual ~FEdge() {}
+  /*! Cloning method. */
+  virtual FEdge* dupplicate()
+  {
+    FEdge *clone = new FEdge(*this);
+    return clone;
+  }
+  /* accessors */
+  /*! Returns the first SVertex. */
+  inline SVertex* vertexA() {return _VertexA;}
+  /*! Returns the second SVertex. */
+  inline SVertex* vertexB() {return _VertexB;}
+  /*! Returns the first SVertex if i=0, the seccond SVertex
+   *  if i=1. */
+  inline SVertex* operator[](const unsigned short int& i) const{ 
+      return i%2==0 ? _VertexA : _VertexB;
+  }
+  /*! Returns the nature of the FEdge. */
+  inline Nature::EdgeNature getNature() const {return _Nature;}
+  /*! Returns the FEdge following this one in the ViewEdge.
+   *  If this FEdge is the last of the ViewEdge, 0 is returned.
+   */
+  inline FEdge * nextEdge() {return _NextEdge;}
+  /*! Returns the Edge preceding this one in the ViewEdge.
+   *  If this FEdge is the first one of the ViewEdge, 0 is returned.
+   */
+  inline FEdge * previousEdge() {return _PreviousEdge;}
+  inline SShape * shape() {return _VertexA->shape();}
+  //inline int invisibility() const {return _Occluders.size();}
+  int invisibility() const ;
+  //inline const vector<Polygon3r>& occluders() const {return _Occluders;}
+  /*! Returns a pointer to the ViewEdge to which this FEdge belongs to. */
+  inline ViewEdge * viewedge() const {return _ViewEdge;}
+  inline Vec3r center3d() {return Vec3r((_VertexA->point3D()+_VertexB->point3D())/2.0);}
+  inline Vec3r center2d() {return Vec3r((_VertexA->point2D()+_VertexB->point2D())/2.0);}
+  //  inline bool hasVisibilityPoint() const {return _hasVisibilityPoint;}
+  //  inline Vec3r visibilityPointA() const {return _VisibilityPointA;}
+  //  inline Vec3r visibilityPointB() const {return _VisibilityPointB;}
+  inline const Polygon3r& aFace() const {return _aFace;}
+  inline const Vec3r& getOccludeeIntersection() { return _occludeeIntersection; }
+  inline bool getOccludeeEmpty() { return _occludeeEmpty; }
+  /*! Returns true if this FEdge is a smooth FEdge. */
+  inline bool isSmooth() const {return _isSmooth;}
+
+  /* modifiers */
+  /*! Sets the first SVertex. */
+  inline void SetVertexA(SVertex *vA) {_VertexA = vA;}
+  /*! Sets the second SVertex. */
+  inline void SetVertexB(SVertex *vB) {_VertexB = vB;}
+  /*! Sets the FEdge Id . */
+  inline void SetId(const Id& id) {_Id = id;}
+  /*! Sets the pointer to the next FEdge. */
+  inline void SetNextEdge(FEdge* iEdge) {_NextEdge = iEdge;}
+  /*! Sets the pointer to the previous FEdge. */
+  inline void SetPreviousEdge(FEdge *iEdge) {_PreviousEdge = iEdge;}
+  /*! Sets the nature of this FEdge. */
+  inline void SetNature(Nature::EdgeNature iNature) {_Nature = iNature;}
+  //inline void AddOccluder(Polygon3r& iPolygon) {_Occluders.push_back(iPolygon);}
+  /*! Sets the ViewEdge to which this FEdge belongs to. */
+  inline void SetViewEdge(ViewEdge *iViewEdge) {_ViewEdge = iViewEdge;}
+  //  inline void SetHasVisibilityPoint(bool iBool) {_hasVisibilityPoint = iBool;}
+  //  inline void SetVisibilityPointA(const Vec3r& iPoint) {_VisibilityPointA = iPoint;}
+  //  inline void SetVisibilityPointB(const Vec3r& iPoint) {_VisibilityPointB = iPoint;}
+  inline void SetaFace(Polygon3r& iFace) {_aFace = iFace;}
+  inline void SetOccludeeIntersection(const Vec3r& iPoint) {_occludeeIntersection = iPoint;}
+  inline void SetOccludeeEmpty(bool iempty) {_occludeeEmpty = iempty;}
+  /*! Sets the flag telling whether this FEdge is smooth or sharp.
+   *  true for Smooth, false for Sharp.
+   */
+  inline void SetSmooth(bool iFlag) {_isSmooth = iFlag;}
+  
+  /* checks whether two FEdge have a common vertex.
+   *  Returns a pointer on the common vertex if it exists, 
+   *  NULL otherwise.
+   */
+  static inline SVertex* CommonVertex(FEdge *iEdge1, FEdge* iEdge2)
+  {
+    if((NULL == iEdge1) || (NULL == iEdge2))
+      return NULL;
+
+    SVertex *sv1 = iEdge1->vertexA();
+    SVertex *sv2 = iEdge1->vertexB();
+    SVertex *sv3 = iEdge2->vertexA();
+    SVertex *sv4 = iEdge2->vertexB();
+
+    if((sv1 == sv3) || (sv1 == sv4))
+    {
+      return sv1;
+    }
+    else if((sv2 == sv3) || (sv2 == sv4))
+    {
+      return sv2;
+    }
+
+    return NULL;
+  }
+
+  inline const SVertex* min2d() const 
+  {
+    if(_VertexA->point2D() < _VertexB->point2D())
+      return _VertexA;
+    else
+      return _VertexB;
+  }
+  inline const SVertex* max2d() const 
+  {
+    if(_VertexA->point2D() < _VertexB->point2D())
+      return _VertexB;
+    else
+      return _VertexA;
+  }
+ 
+  /* Information access interface */
+  /* Information access interface */
+ 
+  //Material material() const ;
+  Id shape_id() const ;
+  const SShape * shape() const ;
+  float shape_importance() const ;
+  inline const int qi() const {return invisibility();}
+  occluder_container::const_iterator occluders_begin() const ;
+  occluder_container::const_iterator occluders_end() const ;
+  bool occluders_empty() const ;
+  int occluders_size() const ;
+  inline const Polygon3r& occludee() const {return aFace();}
+  const SShape * occluded_shape() const ;
+  //inline const bool  occludee_empty() const {return _occludeeEmpty;}
+  const bool  occludee_empty() const ;
+  real z_discontinuity() const ;
+  //  inline float local_average_depth(int iCombination = 0) const ;
+  //  inline float local_depth_variance(int iCombination = 0) const ;
+  //  inline real local_average_density(float sigma = 2.3f, int iCombination = 0) const ;
+  //inline Vec3r shaded_color(int iCombination = 0) const {}
+  int viewedge_nature() const ;
+  //float viewedge_length() const ;
+  inline Vec3r orientation2d() const {return Vec3r(_VertexB->point2d()-_VertexA->point2d());}
+  inline Vec3r orientation3d() const {return Vec3r(_VertexB->point3d()-_VertexA->point3d());}
+  //  //inline real curvature2d() const {return viewedge()->curvature2d((_VertexA->point2d()+_VertexB->point2d())/2.0);}
+  //  inline Vec3r curvature2d_as_vector(int iCombination = 0) const ;
+  //  /* angle in degrees*/
+  //  inline real curvature2d_as_angle(int iCombination = 0) const ;  
+
+
+  // Iterator access (Interface1D)
+  /*! Returns an iterator over the 2 (!) SVertex
+   *  pointing to the first SVertex. */
+  virtual inline Interface0DIterator verticesBegin();
+  /*! Returns an iterator over the 2 (!) SVertex
+   *  pointing after the last SVertex. */
+  virtual inline Interface0DIterator verticesEnd();
+
+  /*! Returns an iterator over the FEdge points,
+   *  pointing to the first point. The difference with
+   *  verticesBegin() is that here we can iterate over
+   *  points of the FEdge at a any given sampling.
+   *  Indeed, for each iteration, a virtual point is created.
+   *  \param t
+   *    The sampling with which we want to iterate over points of
+   *    this FEdge.
+   */
+  virtual inline Interface0DIterator pointsBegin(float t=0.f);
+  /*! Returns an iterator over the FEdge points,
+   *  pointing after the last point. The difference with
+   *  verticesEnd() is that here we can iterate over
+   *  points of the FEdge at a any given sampling.
+   *  Indeed, for each iteration, a virtual point is created.
+   *  \param t
+   *    The sampling with which we want to iterate over points of
+   *    this FEdge.
+   */
+  virtual inline Interface0DIterator pointsEnd(float t=0.f);
+};
+
+//
+// SVertexIterator
+//
+/////////////////////////////////////////////////
+
+namespace FEdgeInternal {
+
+  class SVertexIterator : public Interface0DIteratorNested
+  {
+  public:
+
+    SVertexIterator() {
+      _vertex = NULL;
+      _edge = NULL;
+    }
+
+    SVertexIterator(const SVertexIterator& vi) {
+      _vertex = vi._vertex;
+      _edge = vi._edge;
+    }
+
+    SVertexIterator(SVertex* v, FEdge* edge) {
+      _vertex = v;
+      _edge = edge;
+    }
+
+    SVertexIterator& operator=(const SVertexIterator& vi) {
+      _vertex = vi._vertex;
+      _edge = vi._edge;
+      return *this;
+    }
+
+    virtual string getExactTypeName() const {
+      return "SVertexIterator";
+    }
+
+    virtual SVertex& operator*() {
+      return *_vertex;
+    }
+
+    virtual SVertex* operator->() {
+      return &(operator*());
+    }
+
+    virtual SVertexIterator& operator++() {
+      increment();
+      return *this;
+    }
+
+    virtual SVertexIterator operator++(int) {
+      SVertexIterator ret(*this);
+      increment();
+      return ret;
+    }
+
+    virtual SVertexIterator& operator--() {
+      decrement();
+      return *this;
+    }
+
+    virtual SVertexIterator operator--(int) {
+      SVertexIterator ret(*this);
+      decrement();
+      return ret;
+    }
+
+    virtual void increment() {
+      if (_vertex == _edge->vertexB()) {
+	_vertex = 0;
+	return;
+      }
+
+      _vertex = _edge->vertexB();
+    }
+
+    virtual void decrement() {
+      if (_vertex == _edge->vertexA()) {
+	_vertex = 0;
+	return;
+      }
+      _vertex = _edge->vertexA();
+    }
+
+    virtual bool isBegin() const {
+      return _vertex == _edge->vertexA();
+    }
+
+    virtual bool isEnd() const {
+      return _vertex == _edge->vertexB();
+    }
+
+    virtual bool operator==(const Interface0DIteratorNested& it) const {
+      const SVertexIterator* it_exact = dynamic_cast<const SVertexIterator*>(&it);
+      if (!it_exact)
+	return false;
+      return ((_vertex == it_exact->_vertex) &&
+	      (_edge == it_exact->_edge));
+    }
+
+    virtual float t() const{
+      if(_vertex == _edge->vertexA()){
+        return 0;
+      }
+      return ((float)_edge->getLength2D());
+    }
+    virtual float u() const{
+      if(_vertex == _edge->vertexA()){
+        return 0;
+      }
+      return 1.0;
+    }
+    virtual SVertexIterator* copy() const {
+      return new SVertexIterator(*this);
+    }
+
+  private:
+
+    SVertex*	_vertex;
+    FEdge*	_edge;
+  };
+
+} // end of namespace FEdgeInternal
+
+// Iterator access (implementation)
+
+Interface0DIterator FEdge::verticesBegin() {
+  Interface0DIterator ret(new FEdgeInternal::SVertexIterator(_VertexA, this));
+  return ret;
+}
+
+Interface0DIterator FEdge::verticesEnd() {
+  Interface0DIterator ret(new FEdgeInternal::SVertexIterator(0, this));
+  return ret;
+}
+
+Interface0DIterator FEdge::pointsBegin(float t) {
+  return verticesBegin();
+}
+
+Interface0DIterator FEdge::pointsEnd(float t) {
+  return verticesEnd();
+}
+
+/*! Class defining a sharp FEdge. A Sharp FEdge
+ *  corresponds to an initial edge of the input mesh.
+ *  It can be a silhouette, a crease or a border.
+ *  If it is a crease edge, then it is borded
+ *  by two faces of the mesh. Face a lies on its right
+ *  whereas Face b lies on its left.
+ *  If it is a border edge, then it doesn't have any
+ *  face on its right, and thus Face a = 0.
+ */
+class LIB_VIEW_MAP_EXPORT FEdgeSharp : public FEdge
+{
+protected:
+  Vec3r _aNormal; // When following the edge, normal of the right face
+  Vec3r _bNormal; // When following the edge, normal of the left face
+  unsigned _aMaterialIndex;
+  unsigned _bMaterialIndex;
+  
+public:
+  /*! Default constructor. */
+  inline FEdgeSharp() : FEdge(){
+    _aMaterialIndex = _bMaterialIndex = 0;
+  }
+  /*! Builds an FEdgeSharp going from vA to vB. */ 
+  inline FEdgeSharp(SVertex *vA, SVertex *vB) : FEdge(vA, vB){
+    _aMaterialIndex = _bMaterialIndex = 0;
+  }
+  /*! Copy constructor. */
+  inline FEdgeSharp(FEdgeSharp& iBrother) : FEdge(iBrother){
+    _aNormal = iBrother._aNormal;
+    _bNormal = iBrother._bNormal;
+    _aMaterialIndex = iBrother._aMaterialIndex;
+    _bMaterialIndex = iBrother._bMaterialIndex;
+  }
+  /*! Destructor. */
+  virtual ~FEdgeSharp() {}
+  /*! Cloning method. */
+  virtual FEdge* dupplicate(){
+    FEdge *clone = new FEdgeSharp(*this);
+    return clone;
+  }
+  /*! Returns the normal to the face lying on the
+   *  right of the FEdge. If this FEdge is a border,
+   *  it has no Face on its right and therefore, no normal.
+   */
+  inline const Vec3r& normalA() {return _aNormal;}
+  /*! Returns the normal to the face lying on the
+   *  left of the FEdge.
+   */
+  inline const Vec3r& normalB() {return _bNormal;}
+  /*! Returns the index of the material of the face lying on the
+   *  right of the FEdge. If this FEdge is a border,
+   *  it has no Face on its right and therefore, no material.
+   */
+  inline unsigned aMaterialIndex() const {return _aMaterialIndex;}
+  /*! Returns the material of the face lying on the
+   *  right of the FEdge. If this FEdge is a border,
+   *  it has no Face on its right and therefore, no material.
+   */
+  const Material& aMaterial() const ;
+  /*! Returns the index of the material of the face lying on the
+   *  left of the FEdge.
+   */
+  inline unsigned bMaterialIndex() const {return _bMaterialIndex;}
+  /*! Returns the  material of the face lying on the
+   *  left of the FEdge.
+   */
+  const Material& bMaterial() const ;
+
+  /*! Sets the normal to the face lying on the right of the FEdge. */
+  inline void SetNormalA(const Vec3r& iNormal) {_aNormal = iNormal;}
+  /*! Sets the normal to the face lying on the left of the FEdge. */ 
+  inline void SetNormalB(const Vec3r& iNormal) {_bNormal = iNormal;}
+  /*! Sets the index of the material lying on the right of the FEdge.*/
+  inline void SetaMaterialIndex(unsigned i) {_aMaterialIndex = i;}
+  /*! Sets the index of the material lying on the left of the FEdge.*/
+  inline void SetbMaterialIndex(unsigned i) {_bMaterialIndex = i;}
+  
+};
+
+/*! Class defining a smooth edge. This kind of edge typically
+ *  runs across a face of the input mesh. It can be
+ *  a silhouette, a ridge or valley, a suggestive contour.
+ */
+class LIB_VIEW_MAP_EXPORT FEdgeSmooth : public FEdge
+{
+protected:
+  Vec3r _Normal;
+  unsigned _MaterialIndex;
+  //  bool _hasVisibilityPoint;
+  //  Vec3r _VisibilityPointA;  // The edge on which the visibility will be computed represented 
+  //  Vec3r _VisibilityPointB;  // using its 2 extremity points A and B
+  void * _Face; // In case of exact silhouette, Face is the WFace crossed by Fedge 
+               // NON GERE PAR LE COPY CONSTRUCTEUR
+public:
+  /*! Default constructor. */
+  inline FEdgeSmooth() : FEdge(){
+    _Face=0;
+    _MaterialIndex = 0;
+    _isSmooth = true;
+  }
+  /*! Builds an FEdgeSmooth going from vA to vB. */  
+  inline FEdgeSmooth(SVertex *vA, SVertex *vB) : FEdge(vA, vB){
+    _Face=0;
+    _MaterialIndex = 0;
+    _isSmooth = true;
+
+  }
+  /*! Copy constructor. */
+  inline FEdgeSmooth(FEdgeSmooth& iBrother) : FEdge(iBrother){
+    _Normal = iBrother._Normal;
+    _Face = iBrother._Face;
+    _MaterialIndex = iBrother._MaterialIndex;
+    _isSmooth = true;
+  }
+  /*! Destructor. */
+  virtual ~FEdgeSmooth() {}
+  /*! Cloning method. */
+  virtual FEdge* dupplicate(){
+    FEdge *clone = new FEdgeSmooth(*this);
+    return clone;
+  }
+
+  inline void * face() const {return _Face;}
+  /*! Returns the normal to the Face it is running accross. */
+  inline const Vec3r& normal() {return _Normal;}
+  /*! Returns the index of the material of the face it is running accross. */
+  inline unsigned materialIndex() const {return _MaterialIndex;}
+  /*! Returns the material of the face it is running accross. */
+  const Material& material() const ;
+
+  inline void SetFace(void * iFace) {_Face = iFace;}
+  /*! Sets the normal to the Face it is running accross. */
+  inline void SetNormal(const Vec3r& iNormal) {_Normal = iNormal;}
+  /*! Sets the index of the material of the face it is running accross. */
+  inline void SetMaterialIndex(unsigned i) {_MaterialIndex = i;}
+};
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             SShape             */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+
+/*! Class to define a feature shape. It is the gathering 
+ *  of feature elements from an identified input shape
+ */
+class LIB_VIEW_MAP_EXPORT SShape
+{
+private:
+  vector<FEdge*> _chains;          // list of fedges that are chains starting points.
+  vector<SVertex*> _verticesList;  // list of all vertices
+  vector<FEdge*>   _edgesList;     // list of all edges
+  Id _Id;
+  BBox<Vec3r> _BBox;
+  vector<Material> _Materials;  
+
+  float _importance;
+
+  ViewShape *_ViewShape;
+
+public:
+  /*! A field that can be used by the user to store any data.
+   *  This field must be reseted afterwards using ResetUserData().
+   */
+  void* userdata; // added by E.T.
+  /*! Default constructor */
+  inline SShape()
+  {
+    userdata = 0;
+
+    _importance = 0.f;
+    _ViewShape = 0;
+  }
+  /*! Copy constructor */
+  inline SShape(SShape& iBrother)
+  {
+    userdata = 0;
+    _Id = iBrother._Id;
+    _BBox = iBrother.bbox();
+    _Materials = iBrother._Materials;
+
+    _importance = iBrother._importance;
+
+    _ViewShape = iBrother._ViewShape;
+
+     
+    //---------
+    // vertices
+    //---------
+    vector<SVertex*>::iterator sv,svend;
+    vector<SVertex*>& verticesList = iBrother.GetVertexList();
+    for(sv=verticesList.begin(), svend=verticesList.end();
+        sv!=svend;
+        sv++)
+      {
+        SVertex *newv = new SVertex(*(*sv));
+        newv->SetShape(this);
+        _verticesList.push_back(newv);
+      }
+    
+    //------
+    // edges
+    //------
+    vector<FEdge*>::iterator e,eend;
+    vector<FEdge*>& edgesList = iBrother.GetEdgeList();
+    for(e=edgesList.begin(),eend=edgesList.end();
+        e!=eend;
+        e++)
+      {
+        FEdge *newe = (*e)->dupplicate();
+        _edgesList.push_back(newe);
+      } 
+
+        //-------------------------
+        // starting chain edges
+        //-------------------------
+        vector<FEdge*>::iterator fe,fend;
+        vector<FEdge*>& fedges = iBrother.GetChains();
+        for(fe=fedges.begin(),fend=fedges.end();
+        fe!=fend;
+        fe++)
+        {
+          _chains.push_back((FEdge*)((*fe)->userdata));
+        }
+        
+    
+    //-------------------------
+    // remap edges in vertices:
+    //-------------------------
+    for(sv=_verticesList.begin(),svend=_verticesList.end();
+        sv!=svend;
+        sv++)
+      {
+        const vector<FEdge*>& fedgeList = (*sv)->fedges();
+        vector<FEdge*> newfedgelist;
+        for(vector<FEdge*>::const_iterator fed=fedgeList.begin(),fedend=fedgeList.end();
+            fed!=fedend;
+            fed++)
+          {
+            FEdge *current = *fed;
+            newfedgelist.push_back((FEdge*)current->userdata);
+          }
+        (*sv)->SetFEdges(newfedgelist); 
+      }
+    
+    //-------------------------------------
+    // remap vertices and nextedge in edges:
+    //-------------------------------------
+    for(e=_edgesList.begin(),eend=_edgesList.end();
+        e!=eend;
+        e++)
+      {
+        (*e)->SetVertexA((SVertex*)((*e)->vertexA()->userdata));
+        (*e)->SetVertexB((SVertex*)((*e)->vertexB()->userdata));
+        (*e)->SetNextEdge((FEdge*)((*e)->nextEdge()->userdata));
+        (*e)->SetPreviousEdge((FEdge*)((*e)->previousEdge()->userdata));
+      }
+    
+
+    // reset all brothers userdata to NULL:
+    //-------------------------------------
+    //---------
+    // vertices
+    //---------
+    for(sv=_verticesList.begin(),svend=_verticesList.end();
+        sv!=svend;
+        sv++)
+      {
+        (*sv)->userdata = NULL;
+      }
+
+    //------
+    // edges
+    //------
+    for(e=_edgesList.begin(),eend=_edgesList.end();
+        e!=eend;
+        e++)
+      {
+        (*e)->userdata = NULL;
+      }  
+  }
+  /*! Cloning method. */
+  virtual SShape * dupplicate()
+  {
+    SShape *clone = new SShape(*this);
+    return clone;
+  }
+  /*! Destructor. */
+  virtual inline ~SShape()
+  {
+    vector<SVertex*>::iterator sv,svend;
+    vector<FEdge*>::iterator e,eend;
+    if(0 != _verticesList.size())
+      {
+        for(sv=_verticesList.begin(),svend=_verticesList.end();
+            sv!=svend;
+            sv++)
+          {
+            delete (*sv);
+          }
+        _verticesList.clear();
+      }
+
+    if(0 != _edgesList.size())
+      {
+        for(e=_edgesList.begin(),eend=_edgesList.end();
+            e!=eend;
+            e++)
+          {
+            delete (*e);
+          }
+        _edgesList.clear();
+      }
+
+    //! Clear the chains list
+    //-----------------------
+    if(0 != _chains.size())
+      {
+        _chains.clear();
+      }
+  }
+
+  /*! Adds a FEdge to the list of FEdges. */
+  inline void AddEdge(FEdge *iEdge)
+    {
+      _edgesList.push_back(iEdge);
+    }
+
+  /*! Adds a SVertex to the list of SVertex of this Shape.
+   * The SShape attribute of the SVertex is also set to 'this'.
+   */
+  inline void AddNewVertex(SVertex* iv) {iv->SetShape(this);_verticesList.push_back(iv);}
+  inline void AddChain(FEdge *iEdge){
+    _chains.push_back(iEdge);
+  }
+
+  inline SVertex * CreateSVertex(const Vec3r& P3D, const Vec3r& P2D, const Id& id)
+  {
+    SVertex *Ia = new SVertex(P3D, id);
+    Ia->SetPoint2D(P2D);
+    AddNewVertex(Ia);
+    return Ia;
+  }
+  /* splits an edge into several edges. 
+   *  The edge's vertices are passed rather than 
+   *  the edge itself. This way, all feature edges (SILHOUETTE,
+   *  CREASE, BORDER) are splitted in the same time.
+   *  The processed edges are flagged as done (using the userdata
+   *  flag).One single new vertex is created whereas 
+   *  several splitted edges might created for the different 
+   *  kinds of edges. These new elements are added to the lists
+   *  maintained by the shape.
+   *  new chains are also created.
+   *    ioA
+   *      The first vertex for the edge that gets splitted
+   *    ioB
+   *      The second vertex for the edge that gets splitted
+   *    iParameters
+   *      A vector containing 2D real vectors indicating the parameters
+   *      giving the intersections coordinates in 3D and in 2D.
+   *      These intersections points must be sorted from B to A.
+   *      Each parameter defines the intersection point I as I=A+T*AB.
+   *      T<0 and T>1 are then incorrect insofar as they give intersections
+   *      points that lie outside the segment.
+   *    ioNewEdges
+   *      The edges that are newly created (the initial edges are not 
+   *      included) are added to this list.
+   */
+  inline void SplitEdge(FEdge *fe, const vector<Vec2r>& iParameters, vector<FEdge*>& ioNewEdges)
+    {
+    
+    SVertex *ioA = fe->vertexA();
+    SVertex *ioB = fe->vertexB();
+    Vec3r A = ioA->point3D();
+    Vec3r B = ioB->point3D();
+    Vec3r a = ioA->point2D();
+    Vec3r b = ioB->point2D();
+    SVertex *svA, *svB;
+
+    Vec3r newpoint3d,newpoint2d;
+    vector<SVertex*> intersections;
+    real t,T;
+    for(vector<Vec2r>::const_iterator p=iParameters.begin(),pend=iParameters.end();
+    p!=pend;
+    p++)
+    {
+      T=(*p)[0];
+      t=(*p)[1];
+
+      if((t < 0) || (t > 1))
+        cerr << "Warning: Intersection out of range for edge " << ioA->getId() << " - " << ioB->getId() << endl;
+    
+      // compute the 3D and 2D coordinates for the intersections points:
+      newpoint3d = Vec3r(A + T*(B-A));
+      newpoint2d = Vec3r(a + t*(b-a));
+
+      // create new SVertex:
+      // (we keep B's id)
+      SVertex* newVertex = new SVertex(newpoint3d, ioB->getId());
+      newVertex->SetPoint2D(newpoint2d);
+      
+      // Add this vertex to the intersections list:
+      intersections.push_back(newVertex);
+
+      // Add this vertex to this sshape:
+      AddNewVertex(newVertex);
+    }
+    
+    for(vector<SVertex*>::iterator sv=intersections.begin(),svend=intersections.end();
+    sv!=svend;
+    sv++)
+    {
+      svA = fe->vertexA();
+      svB = fe->vertexB();
+        
+      // We split edge AB into AA' and A'B. A' and A'B are created.
+      // AB becomes (address speaking) AA'. B is updated.
+      //--------------------------------------------------
+      // The edge AB becomes edge AA'.
+      (fe)->SetVertexB((*sv));
+      // a new edge, A'B is created.
+      FEdge *newEdge;
+      if(fe->isSmooth()){
+        newEdge = new FEdgeSmooth((*sv), svB);
+        FEdgeSmooth * se = dynamic_cast<FEdgeSmooth*>(newEdge);
+        FEdgeSmooth * fes = dynamic_cast<FEdgeSmooth*>(fe);
+        se->SetMaterialIndex(fes->materialIndex());
+      }else{
+        newEdge = new FEdgeSharp((*sv), svB);
+        FEdgeSharp * se = dynamic_cast<FEdgeSharp*>(newEdge);
+        FEdgeSharp * fes = dynamic_cast<FEdgeSharp*>(fe);
+        se->SetaMaterialIndex(fes->aMaterialIndex());
+        se->SetbMaterialIndex(fes->bMaterialIndex());
+      }
+        
+      newEdge->SetNature((fe)->getNature());
+      
+
+      // to build a new chain:
+      AddChain(newEdge);
+      // add the new edge to the sshape edges list.
+      AddEdge(newEdge);
+      // add new edge to the list of new edges passed as argument:
+      ioNewEdges.push_back(newEdge);
+
+      // update edge A'B for the next pointing edge
+      newEdge->SetNextEdge((fe)->nextEdge());
+      fe->nextEdge()->SetPreviousEdge(newEdge);
+      Id id(fe->getId().getFirst(), fe->getId().getSecond()+1);
+      newEdge->SetId(fe->getId());
+      fe->SetId(id);
+
+      // update edge AA' for the next pointing edge
+      //ioEdge->SetNextEdge(newEdge);
+      (fe)->SetNextEdge(NULL);
+
+      // update vertex pointing edges list:
+      // -- vertex B --
+      svB->Replace((fe), newEdge);
+      // -- vertex A' --
+      (*sv)->AddFEdge((fe));
+      (*sv)->AddFEdge(newEdge);
+    }
+          
+    }
+
+  /* splits an edge into 2 edges. The new vertex and edge are added
+   *  to the sshape list of vertices and edges
+   *  a new chain is also created.
+   *  returns the new edge.
+   *    ioEdge
+   *      The edge that gets splitted
+   *    newpoint
+   *      x,y,z coordinates of the new point.
+   */
+  inline FEdge* SplitEdgeIn2(FEdge* ioEdge, SVertex * ioNewVertex)
+    {
+      SVertex *A = ioEdge->vertexA();
+      SVertex *B = ioEdge->vertexB();
+
+      
+      // We split edge AB into AA' and A'B. A' and A'B are created.
+      // AB becomes (address speaking) AA'. B is updated.
+      //--------------------------------------------------
+      
+      // a new edge, A'B is created.
+      FEdge *newEdge;
+      if(ioEdge->isSmooth()){
+        newEdge = new FEdgeSmooth(ioNewVertex, B);
+        FEdgeSmooth * se = dynamic_cast<FEdgeSmooth*>(newEdge);
+        FEdgeSmooth * fes = dynamic_cast<FEdgeSmooth*>(ioEdge);
+        se->SetMaterialIndex(fes->materialIndex());
+      }else{
+        newEdge = new FEdgeSharp(ioNewVertex, B);
+        FEdgeSharp * se = dynamic_cast<FEdgeSharp*>(newEdge);
+        FEdgeSharp * fes = dynamic_cast<FEdgeSharp*>(ioEdge);
+        se->SetaMaterialIndex(fes->aMaterialIndex());
+        se->SetbMaterialIndex(fes->bMaterialIndex());
+      }
+      newEdge->SetNature(ioEdge->getNature());
+      
+      
+      if(ioEdge->nextEdge() != 0)
+        ioEdge->nextEdge()->SetPreviousEdge(newEdge);
+
+      // update edge A'B for the next pointing edge
+      newEdge->SetNextEdge(ioEdge->nextEdge());
+      // update edge A'B for the previous pointing edge
+      newEdge->SetPreviousEdge(0); // because it is now a TVertex
+      Id id(ioEdge->getId().getFirst(), ioEdge->getId().getSecond()+1);
+      newEdge->SetId(ioEdge->getId());
+      ioEdge->SetId(id);
+   
+      // update edge AA' for the next pointing edge
+      ioEdge->SetNextEdge(0); // because it is now a TVertex
+
+      // update vertex pointing edges list:
+      // -- vertex B --
+      B->Replace(ioEdge, newEdge);
+      // -- vertex A' --
+      ioNewVertex->AddFEdge(ioEdge);
+      ioNewVertex->AddFEdge(newEdge);
+
+      // to build a new chain:
+      AddChain(newEdge);
+      AddEdge(newEdge); // FIXME ??
+      
+      // The edge AB becomes edge AA'.
+      ioEdge->SetVertexB(ioNewVertex);
+      
+      if(ioEdge->isSmooth()){
+        ((FEdgeSmooth*)newEdge)->SetFace(((FEdgeSmooth*)ioEdge)->face());
+      }
+      
+      return newEdge;
+    }
+
+  /*! Sets the Bounding Box of the Shape */
+  inline void SetBBox(const BBox<Vec3r>& iBBox) {_BBox = iBBox;}
+
+  /*! Compute the bbox of the sshape */
+  inline void ComputeBBox()
+  {
+    if(0 == _verticesList.size())
+      return;
+
+    Vec3r firstVertex = _verticesList[0]->point3D();
+    real XMax = firstVertex[0];
+    real YMax = firstVertex[1];
+    real ZMax = firstVertex[2];
+
+    real XMin = firstVertex[0];
+    real YMin = firstVertex[1];
+    real ZMin = firstVertex[2];
+
+    vector<SVertex*>::iterator v,vend;
+    // parse all the coordinates to find 
+    // the Xmax, YMax, ZMax
+    for(v=_verticesList.begin(),vend=_verticesList.end();
+        v!=vend;
+        v++)
+      {
+        Vec3r vertex = (*v)->point3D();
+        // X
+        real x = vertex[0];
+        if(x > XMax)
+          XMax = x;
+        if(x < XMin)
+          XMin = x;
+        
+        // Y
+        real y = vertex[1];
+        if(y > YMax)
+          YMax = y;
+        if(y < YMin)
+          YMin = y;
+        
+        // Z
+        real z = vertex[2];
+        if(z > ZMax)
+          ZMax = z;
+        if(z < ZMin)
+          ZMin = z;
+      }
+    
+    
+    SetBBox(BBox<Vec3r>(Vec3r(XMin, YMin, ZMin), Vec3r(XMax, YMax, ZMax)));
+  }
+
+  inline void RemoveEdgeFromChain(FEdge *iEdge)
+  {
+    for(vector<FEdge*>::iterator fe=_chains.begin(), feend=_chains.end();
+    fe!=feend;
+    fe++)
+    {
+      if(iEdge == (*fe))
+      {
+        _chains.erase(fe);
+        break;
+      }
+    }
+  }
+
+  inline void RemoveEdge(FEdge *iEdge)
+  {
+    for(vector<FEdge*>::iterator fe=_edgesList.begin(), feend=_edgesList.end();
+    fe!=feend;
+    fe++)
+    {
+      if(iEdge == (*fe))
+      {
+        _edgesList.erase(fe);
+        break;
+      }
+    }
+  }
+
+  /* accessors */
+  /*! Returns the list of SVertex of the Shape. */
+  inline vector<SVertex*>& GetVertexList() {return _verticesList;} // Get vertices list
+  /*! Returns the list of FEdges of the Shape. */
+  inline vector<FEdge*>& GetEdgeList() {return _edgesList;} // Get edges list
+  inline vector<FEdge*>& GetChains() {return _chains;}
+  /*! Returns the bounding box of the shape. */
+  inline const BBox<Vec3r>& bbox() {return _BBox;}
+  /*! Returns the ith material of the shape. */
+  inline const Material& material(unsigned i) const {return _Materials[i];}
+  /*! Returns the list of materials of the Shape. */
+  inline const vector<Material>& materials() const {return _Materials;}
+  inline ViewShape * viewShape() {return _ViewShape;}
+  inline float importance() const {return _importance;}
+  /*! Returns the Id of the Shape. */
+  inline Id getId() const { return _Id; }
+  
+  /* Modififers */
+  /*! Sets the Id of the shape.*/
+  inline void SetId(Id id) {_Id = id;}
+  /*! Sets the list of materials for the shape */
+  inline void SetMaterials(const vector<Material>& iMaterials) {_Materials = iMaterials;}
+  inline void SetViewShape(ViewShape *iShape) {_ViewShape = iShape;}
+  inline void SetImportance(float importance){_importance = importance;}
+};
+
+#endif // SILHOUETTE_H
diff --git a/extern/freestyle/src/view_map/SilhouetteGeomEngine.cpp b/extern/freestyle/src/view_map/SilhouetteGeomEngine.cpp
new file mode 100755
index 00000000000..19b8a632ffe
--- /dev/null
+++ b/extern/freestyle/src/view_map/SilhouetteGeomEngine.cpp
@@ -0,0 +1,185 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "SilhouetteGeomEngine.h"
+#include "Silhouette.h"
+#include "../geometry/GeomUtils.h"
+
+using namespace std;
+
+Vec3r SilhouetteGeomEngine::_Viewpoint = Vec3r(0,0,0);
+real SilhouetteGeomEngine::_translation[3] = {0,0,0};
+real SilhouetteGeomEngine::_modelViewMatrix[4][4] = {{1,0,0,0},
+						     {0,1,0,0},
+						     {0,0,1,0},
+						     {0,0,0,1}};
+real SilhouetteGeomEngine::_projectionMatrix[4][4] = {{1,0,0,0},
+						     {0,1,0,0},
+						     {0,0,1,0},
+						     {0,0,0,1}};
+real SilhouetteGeomEngine::_transform[4][4] = {{1,0,0,0},
+					       {0,1,0,0},
+					       {0,0,1,0},
+					       {0,0,0,1}};
+int SilhouetteGeomEngine::_viewport[4] = {1,1,1,1};              // the viewport
+real SilhouetteGeomEngine::_Focal = 0.0;
+  
+real SilhouetteGeomEngine::_glProjectionMatrix[4][4] = {{1,0,0,0},
+							{0,1,0,0},
+							{0,0,1,0},
+							{0,0,0,1}};
+real SilhouetteGeomEngine::_glModelViewMatrix[4][4] = {{1,0,0,0},
+						       {0,1,0,0},
+						       {0,0,1,0},
+						       {0,0,0,1}};
+real SilhouetteGeomEngine::_znear = 0.0;
+real SilhouetteGeomEngine::_zfar = 100.0;
+  
+SilhouetteGeomEngine * SilhouetteGeomEngine::_pInstance = 0;
+
+void SilhouetteGeomEngine::SetTransform(const real iModelViewMatrix[4][4], const real iProjectionMatrix[4][4], const int iViewport[4], real iFocal) 
+{
+  unsigned int i,j;
+  _translation[0] = iModelViewMatrix[3][0];
+  _translation[1] = iModelViewMatrix[3][1];
+  _translation[2] = iModelViewMatrix[3][2];
+  
+  for(i=0; i<4; i++){
+    for(j=0; j<4; j++)
+    {
+      _modelViewMatrix[i][j] = iModelViewMatrix[j][i];
+      _glModelViewMatrix[i][j] = iModelViewMatrix[i][j];
+    }
+  }
+
+  for(i=0; i<4; i++){
+    for(j=0; j<4; j++)
+    {
+      _projectionMatrix[i][j] = iProjectionMatrix[j][i];
+      _glProjectionMatrix[i][j] = iProjectionMatrix[i][j];
+    }
+  }
+      
+  for(i=0; i<4; i++){
+    for(j=0; j<4; j++)
+    {
+      _transform[i][j] = 0;
+      for(unsigned int k=0; k<4; k++)
+        _transform[i][j] += _projectionMatrix[i][k] * _modelViewMatrix[k][j];
+    }
+  }
+      
+  for(i=0; i<4; i++){
+    _viewport[i] = iViewport[i];
+  }
+  _Focal = iFocal;
+}
+
+void SilhouetteGeomEngine::SetFrustum(real iZNear, real iZFar) 
+{
+  _znear = iZNear;
+  _zfar = iZFar;
+}
+
+void SilhouetteGeomEngine::retrieveViewport(int viewport[4]){
+  memcpy(viewport, _viewport, 4*sizeof(int));
+}
+//#define HUGE 1e9
+
+void SilhouetteGeomEngine::ProjectSilhouette(vector<SVertex*>& ioVertices)
+{
+  Vec3r newPoint;
+  //  real min=HUGE;
+  //  real max=-HUGE;
+  vector<SVertex*>::iterator sv, svend;
+  
+  for(sv=ioVertices.begin(), svend=ioVertices.end();
+      sv!=svend;
+      sv++)
+    {
+      GeomUtils::fromWorldToImage((*sv)->point3D(), newPoint, _modelViewMatrix, _projectionMatrix, _viewport);
+      newPoint[2] = (-newPoint[2]-_znear)/(_zfar-_znear); // normalize Z between 0 and 1
+      (*sv)->SetPoint2D(newPoint);  
+      //cerr << (*sv)->point2d().z() << "  ";
+      //      real d=(*sv)->point2d()[2];
+      //      if (d>max) max =d;
+      //      if (d<min) min =d;
+    }
+      //  for(sv=ioVertices.begin(), svend=ioVertices.end();
+      //      sv!=svend;
+      //      sv++)
+      //    {
+      //      Vec3r P((*sv)->point2d());
+      //      (*sv)->SetPoint2D(Vec3r(P[0], P[1], 1.0-(P[2]-min)/(max-min)));
+      //      //cerr<<(*sv)->point2d()[2]<<"  ";
+      //    }
+}
+
+void SilhouetteGeomEngine::ProjectSilhouette(SVertex* ioVertex)
+{
+  Vec3r newPoint;
+  //  real min=HUGE;
+  //  real max=-HUGE;
+  vector<SVertex*>::iterator sv, svend;
+  GeomUtils::fromWorldToImage(ioVertex->point3D(), newPoint, _modelViewMatrix, _projectionMatrix, _viewport);
+  newPoint[2] = (-newPoint[2]-_znear)/(_zfar-_znear); // normalize Z between 0 and 1
+  ioVertex->SetPoint2D(newPoint);  
+}
+
+real SilhouetteGeomEngine::ImageToWorldParameter(FEdge *fe, real t)
+{
+  // we need to compute for each parameter t the corresponding 
+  // parameter T which gives the intersection in 3D.
+  //currentEdge = (*fe);
+  Vec3r A = (fe)->vertexA()->point3D();
+  Vec3r B = (fe)->vertexB()->point3D();
+  Vec3r Ai = (fe)->vertexA()->point2D();
+  Vec3r Bi = (fe)->vertexB()->point2D();
+  Vec3r AB = Vec3r((B-A)); // the edge
+  Vec3r ABi(Bi-Ai);
+  Vec3r Ac, Bc;
+  GeomUtils::fromWorldToCamera(A, Ac, _modelViewMatrix);
+  GeomUtils::fromWorldToCamera(B, Bc, _modelViewMatrix);
+      
+  Vec3r Ii = Vec3r((Ai+t*ABi)); // I image
+  // let us compute the 3D point corresponding to the 2D intersection point
+  // and lying on the edge:
+  Vec3r Ir, Ic;
+  GeomUtils::fromImageToRetina(Ii, Ir, _viewport);
+  GeomUtils::fromRetinaToCamera(Ir, Ic, -_Focal, _projectionMatrix);
+  
+  real T;
+  T = (Ic[2]*Ac[1] - Ic[1]*Ac[2])/(Ic[1]*(Bc[2]-Ac[2])-Ic[2]*(Bc[1]-Ac[1]));
+  
+  return T;
+}
+
+Vec3r SilhouetteGeomEngine::WorldToImage(const Vec3r& M)
+
+{
+
+  Vec3r newPoint;
+  GeomUtils::fromWorldToImage(M, newPoint, _transform, _viewport);
+  newPoint[2] = (-newPoint[2]-_znear)/(_zfar-_znear); // normalize Z between 0 and 1
+  return newPoint;
+
+}
+
diff --git a/extern/freestyle/src/view_map/SilhouetteGeomEngine.h b/extern/freestyle/src/view_map/SilhouetteGeomEngine.h
new file mode 100755
index 00000000000..159dda1afc0
--- /dev/null
+++ b/extern/freestyle/src/view_map/SilhouetteGeomEngine.h
@@ -0,0 +1,122 @@
+//
+//  Filename         : SilhouetteGeomEngine.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Class to perform all geometric operations dedicated 
+//                     to silhouette. That, for example, implies that
+//                     this geom engine has as member data the viewpoint, 
+//                     transformations, projections...
+//  Date of creation : 03/09/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  SILHOUETTEGEOMENGINE_H
+# define SILHOUETTEGEOMENGINE_H
+
+# include <vector>
+# include "../system/FreestyleConfig.h"
+# include "../geometry/Geom.h"
+
+using namespace Geometry;
+
+class SVertex;
+class FEdge;
+
+class LIB_VIEW_MAP_EXPORT SilhouetteGeomEngine 
+{
+private:
+  static Vec3r _Viewpoint;   // The viewpoint under which the silhouette has to be computed
+  static real _translation[3];
+  static real _modelViewMatrix[4][4];  // the model view matrix (_modelViewMatrix[i][j] means element of line i and column j)
+  static real _projectionMatrix[4][4]; // the projection matrix (_projectionMatrix[i][j] means element of line i and column j)
+  static real _transform[4][4];        // the global transformation from world to screen (projection included) (_transform[i][j] means element of line i and column j)
+  static int _viewport[4];              // the viewport
+  static real _Focal;
+  
+  static real _znear;
+  static real _zfar;
+
+  static real _glProjectionMatrix[4][4];  // GL style (column major) projection matrix
+  static real _glModelViewMatrix[4][4];  // GL style (column major) model view matrix
+
+  
+  
+  static SilhouetteGeomEngine *_pInstance;
+public:
+  
+  /*! retrieves an instance on the singleton */
+  static SilhouetteGeomEngine * getInstance() 
+  {
+    if(0 == _pInstance)
+    {
+      _pInstance = new SilhouetteGeomEngine;
+    }
+    return _pInstance;
+  }
+
+  /*! Sets the current viewpoint */
+  static inline void SetViewpoint(const Vec3r& ivp) {_Viewpoint = ivp;}
+
+  /*! Sets the current transformation
+   *    iModelViewMatrix
+   *      The 4x4 model view matrix, in column major order (openGL like).
+   *    iProjection matrix
+   *      The 4x4 projection matrix, in column major order (openGL like).
+   *    iViewport
+   *      The viewport. 4 real array: origin.x, origin.y, width, length
+   *    iFocal
+   *      The focal length
+   */
+  static void SetTransform(const real iModelViewMatrix[4][4], const real iProjectionMatrix[4][4], const int iViewport[4], real iFocal) ;  
+
+  /*! Sets the current znear and zfar
+   */
+  static void SetFrustum(real iZNear, real iZFar) ;  
+
+  /* accessors */
+  static void retrieveViewport(int viewport[4]);
+
+  /*! Projects the silhouette in camera coordinates
+   *  This method modifies the ioEdges passed as argument.
+   *    ioVertices
+   *      The vertices to project. It is modified during the 
+   *      operation.
+   */
+  static void ProjectSilhouette(std::vector<SVertex*>& ioVertices);  
+  static void ProjectSilhouette(SVertex* ioVertex);
+
+  /*! transforms the parameter t defining a 2D intersection for edge fe in order to obtain 
+   *  the parameter giving the corresponding 3D intersection.
+   *  Returns the 3D parameter
+   *    fe
+   *      The edge
+   *    t
+   *      The parameter for the 2D intersection.
+   */
+  static real ImageToWorldParameter(FEdge *fe, real t);
+
+  /*! From world to image */
+  static Vec3r WorldToImage(const Vec3r& M);
+};
+
+#endif // SILHOUETTEGEOMENGINE_H
diff --git a/extern/freestyle/src/view_map/SteerableViewMap.cpp b/extern/freestyle/src/view_map/SteerableViewMap.cpp
new file mode 100755
index 00000000000..b2604606aa7
--- /dev/null
+++ b/extern/freestyle/src/view_map/SteerableViewMap.cpp
@@ -0,0 +1,243 @@
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "SteerableViewMap.h"
+#include "../image/ImagePyramid.h"
+#include "../image/Image.h"
+#include "Silhouette.h"
+#include <math.h>
+#include "../geometry/Geom.h"
+using namespace Geometry;
+
+#include <qstring.h>
+#include <qimage.h>
+
+SteerableViewMap::SteerableViewMap(unsigned int nbOrientations){
+  _nbOrientations = nbOrientations;
+  _bound = cos(M_PI/(float)_nbOrientations);
+  for(unsigned i=0; i<_nbOrientations; ++i){
+    _directions.push_back(Vec2d(cos((float)i*M_PI/(float)_nbOrientations), sin((float)i*M_PI/(float)_nbOrientations)));
+  }
+  Build();
+}
+
+void SteerableViewMap::Build(){
+  _imagesPyramids = new ImagePyramid*[_nbOrientations+1]; // one more map to store the complete visible VM
+  memset((_imagesPyramids),0,(_nbOrientations+1)*sizeof(ImagePyramid*));
+}
+
+SteerableViewMap::SteerableViewMap(const SteerableViewMap& iBrother){
+  _nbOrientations = iBrother._nbOrientations;
+  unsigned i;
+  _bound = iBrother._bound;
+  _directions = iBrother._directions;
+  _mapping = iBrother._mapping;
+  _imagesPyramids = new ImagePyramid*[_nbOrientations+1]; // one more map to store the complete visible VM
+  for(i=0;i<_nbOrientations+1;++i)
+    _imagesPyramids[i] = new GaussianPyramid(*(dynamic_cast<GaussianPyramid*>(iBrother._imagesPyramids[i])));
+}
+
+SteerableViewMap::~SteerableViewMap(){
+  Clear(); 
+}
+
+void SteerableViewMap::Clear(){
+  unsigned i;
+  if(_imagesPyramids){
+    for(i=0; i<=_nbOrientations; ++i){
+      if(_imagesPyramids[i])
+        delete (_imagesPyramids)[i];
+    } 
+    delete [] _imagesPyramids;
+    _imagesPyramids = 0;
+  } 
+  if(!_mapping.empty()){
+    for(map<unsigned int, double*>::iterator m=_mapping.begin(), mend=_mapping.end(); 
+    m!=mend;
+    ++m){
+      delete [] (*m).second;
+    }
+    _mapping.clear();
+  }
+}
+
+void SteerableViewMap::Reset(){
+  Clear();
+  Build();
+}
+
+double SteerableViewMap::ComputeWeight(const Vec2d& dir, unsigned i){ 
+  double dotp = fabs(dir*_directions[i]);
+  if(dotp < _bound)
+    return 0;
+  if(dotp>1)
+    dotp = 1;
+
+  return cos((float)_nbOrientations/2.0*acos(dotp));
+}
+
+double * SteerableViewMap::AddFEdge(FEdge *iFEdge){
+  unsigned i;
+  unsigned id = iFEdge->getId().getFirst();
+  map<unsigned int, double* >::iterator o = _mapping.find(id);
+  if(o!=_mapping.end()){
+    return (*o).second;
+  }
+  double * res = new double[_nbOrientations];
+  for(i=0; i<_nbOrientations; ++i){
+    res[i] = 0;
+  }
+  Vec3r o2d3 = iFEdge->orientation2d();
+  Vec2r o2d2(o2d3.x(), o2d3.y());
+  real norm = o2d2.norm();
+  if(norm < 1e-6){
+    return res;
+  }
+  o2d2/=norm;
+
+  for(i=0; i<_nbOrientations; ++i){
+    res[i] = ComputeWeight(o2d2, i);
+  }
+  _mapping[id] = res;
+  return res;
+}
+
+unsigned SteerableViewMap::getSVMNumber(const Vec2f& orient){
+  Vec2f dir(orient);
+  unsigned res = 0;
+  real norm = dir.norm();
+  if(norm < 1e-6){
+    return _nbOrientations+1;
+  }
+  dir/=norm;
+  double maxw = 0.f; 
+  unsigned winner = _nbOrientations+1;
+  for(unsigned i=0; i<_nbOrientations; ++i){
+    double w = ComputeWeight(dir, i);
+    if(w>maxw){
+      maxw = w;
+      winner = i;
+    }
+  }
+  return winner;
+}
+
+
+unsigned SteerableViewMap::getSVMNumber(unsigned id){
+  map<unsigned int, double* >::iterator o = _mapping.find(id);
+  if(o!=_mapping.end()){
+    double* wvalues=  (*o).second;
+    double maxw = 0.f; 
+    unsigned winner = _nbOrientations+1;
+    for(unsigned i=0; i<_nbOrientations; ++i){
+      double w = wvalues[i];
+      if(w>maxw){
+        maxw = w;
+        winner = i;
+      } 
+    }  
+    return winner;
+  }
+  return _nbOrientations+1;
+}
+
+void SteerableViewMap::buildImagesPyramids(GrayImage **steerableBases, bool copy, unsigned iNbLevels, float iSigma){
+  for(unsigned i=0; i<=_nbOrientations; ++i){
+    ImagePyramid * svm = (_imagesPyramids)[i];
+    if(svm)
+      delete svm;
+    if(copy)
+      svm = new GaussianPyramid(*(steerableBases[i]), iNbLevels, iSigma);
+    else
+      svm = new GaussianPyramid(steerableBases[i], iNbLevels, iSigma);
+    _imagesPyramids[i] = svm;
+  }
+}
+
+float SteerableViewMap::readSteerableViewMapPixel(unsigned iOrientation, int iLevel, int x, int y){
+  ImagePyramid *pyramid = _imagesPyramids[iOrientation];
+  if(pyramid==0){
+    cout << "Warning: this steerable ViewMap level doesn't exist" << endl;
+    return 0;
+  }
+  if((x<0) || (x>=pyramid->width()) || (y<0) || (y>=pyramid->height()))
+    return 0;
+  //float v = pyramid->pixel(x,pyramid->height()-1-y,iLevel)*255.f;
+  float v = pyramid->pixel(x,pyramid->height()-1-y,iLevel)/32.f; // we encode both the directionality and the lines counting on 8 bits 
+                                                                 // (because of frame buffer). Thus, we allow until 8 lines to pass through
+                                                                 // the same pixel, so that we can discretize the Pi/_nbOrientations angle into 
+                                                                 // 32 slices. Therefore, for example, in the vertical direction, a vertical line
+                                                                 // will have the value 32 on each pixel it passes through.
+  return v;
+}
+
+float SteerableViewMap::readCompleteViewMapPixel(int iLevel, int x, int y){
+  return readSteerableViewMapPixel(_nbOrientations,iLevel,x,y);
+}
+
+unsigned int SteerableViewMap::getNumberOfPyramidLevels() const{
+  if(_imagesPyramids[0])
+    return _imagesPyramids[0]->getNumberOfLevels();
+  return 0;
+}
+void SteerableViewMap::saveSteerableViewMap() const {
+  for(unsigned i=0; i<=_nbOrientations; ++i){
+    if(_imagesPyramids[i] == 0){
+      cerr << "SteerableViewMap warning: orientation " << i <<" of steerable View Map whas not been computed yet" << endl;
+      continue;
+    }
+    int ow = _imagesPyramids[i]->width(0);
+    int oh = _imagesPyramids[i]->height(0);
+    QString base("SteerableViewMap");
+    for(unsigned j=0; j<_imagesPyramids[i]->getNumberOfLevels(); ++j){
+      float coeff = 1;//1/255.f; //100*255;//*pow(2,j);
+	  QImage qtmp(ow, oh, QImage::Format_RGB32);
+      for(unsigned y=0;y<oh;++y){
+        for(unsigned x=0;x<ow;++x){
+          int c = (int)(coeff*_imagesPyramids[i]->pixel(x,y,j));
+          if(c>255)
+            c=255;
+          //int c = (int)(_imagesPyramids[i]->pixel(x,y,j));
+          qtmp.setPixel(x,y,qRgb(c,c,c));
+        }
+      }
+      qtmp.save(base+QString::number(i)+"-"+QString::number(j)+".png", "PNG");
+    }
+    //    QString base("SteerableViewMap");
+    //    for(unsigned j=0; j<_imagesPyramids[i]->getNumberOfLevels(); ++j){
+    //      GrayImage * img = _imagesPyramids[i]->getLevel(j);
+    //      int ow = img->width();
+    //      int oh = img->height();
+    //      float coeff = 1; //100*255;//*pow(2,j);
+    //      QImage qtmp(ow, oh, 32);
+    //      for(unsigned y=0;y<oh;++y){
+    //        for(unsigned x=0;x<ow;++x){
+    //          int c = (int)(coeff*img->pixel(x,y));
+    //          if(c>255)
+    //            c=255;
+    //          //int c = (int)(_imagesPyramids[i]->pixel(x,y,j));
+    //          qtmp.setPixel(x,y,qRgb(c,c,c));
+    //        }
+    //      }
+    //      qtmp.save(base+QString::number(i)+"-"+QString::number(j)+".png", "PNG");
+    //    }
+    //    
+  }
+}
diff --git a/extern/freestyle/src/view_map/SteerableViewMap.h b/extern/freestyle/src/view_map/SteerableViewMap.h
new file mode 100755
index 00000000000..fe7c2493752
--- /dev/null
+++ b/extern/freestyle/src/view_map/SteerableViewMap.h
@@ -0,0 +1,153 @@
+//
+//  Filename         : SteerbaleViewMap.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Convenient access to the steerable ViewMap
+//                     to which any element of the ViewMap belongs to.
+//  Date of creation : 01/07/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+#ifndef  STEERABLEVIEWMAP_H
+# define STEERABLEVIEWMAP_H
+ 
+#include <map>
+#include "../system/FreestyleConfig.h"
+#include "../geometry/Geom.h"
+using namespace Geometry;
+
+using namespace std;
+
+class FEdge;
+class ImagePyramid;
+class GrayImage;
+/*! This class checks for every FEdge in which steerable 
+ *  it belongs and stores the mapping allowing to retrieve 
+ *  this information from the FEdge Id 
+ */
+class LIB_VIEW_MAP_EXPORT SteerableViewMap{
+protected:
+  map<unsigned int, double* > _mapping; // for each vector the list of nbOrientations weigths corresponding to its contributions to the nbOrientations directional maps
+  unsigned _nbOrientations;
+  ImagePyramid **_imagesPyramids; // the pyramids of images storing the different SVM
+
+  // internal
+  double _bound; // cos(Pi/N)
+  vector<Vec2d> _directions;
+
+public:
+  SteerableViewMap(unsigned int nbOrientations = 4);
+  SteerableViewMap(const SteerableViewMap& iBrother);
+  virtual ~SteerableViewMap();
+
+  /*! Resets everything */
+  virtual void Reset();
+
+  /*! Adds a FEdge to steerable VM.
+   *  Returns the nbOrientations weigths corresponding to 
+   *  the FEdge contributions to the nbOrientations directional maps.
+   */
+  double* AddFEdge(FEdge *iFEdge);
+
+  /*! Compute the weight of direction dir for orientation iNOrientation */
+  double ComputeWeight(const Vec2d& dir, unsigned iNOrientation);
+
+  /*! Returns the number of the SVM to which a direction belongs 
+   *  to.
+   *  \param dir
+   *    The direction
+   */
+  unsigned getSVMNumber(const Vec2f& dir);
+
+  /*! Returns the number of the SVM to which a FEdge belongs 
+   *  most.
+   *  \param id
+   *    The First element of the Id struct of the FEdge 
+   *    we're intersted in.
+   */
+  unsigned getSVMNumber(unsigned id);
+
+  /*! Builds _nbOrientations+1 pyramids of images from the _nbOrientations+1 base images 
+   *  of the steerable viewmap.
+   *  \param steerableBases
+   *    The _nbOrientations+1 images constituing the basis for the steerable
+   *    pyramid.
+   *  \param copy
+   *    If false, the data is not duplicated, and Canvas deals
+   *    with the memory management of these _nbOrientations+1 images. If true, data 
+   *    is copied, and it's up to the caller to delete the images.
+   *  \params iNbLevels
+   *    The number of levels desired for each pyramid.
+   *    If iNbLevels == 0, the complete pyramid is built.
+   *  \param iSigma
+   *    The sigma that will be used for the gaussian blur
+   */
+  void buildImagesPyramids(GrayImage **steerableBases, bool copy = false, unsigned iNbLevels=4, float iSigma = 1.f);
+
+  /*! Reads a pixel value in one of the VewMap density steerable pyramids.
+   *  Returns a value between 0 and 1.
+   *  \param iOrientation
+   *    the number telling which orientation we need to check.
+   *    There are _nbOrientations+1 oriented ViewMaps:
+   *    0 -> the ViewMap containing every horizontal lines
+   *    1 -> the ViewMap containing every lines whose orientation is around PI/4
+   *    2 -> the ViewMap containing every vertical lines
+   *    3 -> the ViewMap containing every lines whose orientation is around 3PI/4
+   *    4 -> the complete ViewMap
+   *  \param iLevel
+   *    The level of the pyramid we want to read
+   *  \param x
+   *    The abscissa of the desired pixel specified in level0 coordinate 
+   *    system. The origin is the lower left corner.
+   *  \param y
+   *    The ordinate of the desired pixel specified in level0 coordinate 
+   *    system. The origin is the lower left corner.
+   */
+  float readSteerableViewMapPixel(unsigned iOrientation, int iLevel, int x, int y);
+
+  /*! Reads a pixel in the one of the level of the 
+   *  pyramid containing the images of the complete 
+   *  ViewMap.
+   *  Returns a value between 0 and 1.
+   *  Equivalent to : readSteerableViewMapPixel(nbOrientations, x,y)
+   */
+  float readCompleteViewMapPixel(int iLevel, int x, int y);
+
+  /*! Returns the number of levels in the pyramids */
+  unsigned int getNumberOfPyramidLevels() const;
+  
+  /*! Returns the number of orientations */
+  unsigned int getNumberOfOrientations() const{
+    return _nbOrientations;
+  }
+
+  /*! for debug purposes */
+  void saveSteerableViewMap() const ;
+
+protected:
+  void Clear();
+  void Build();
+
+
+};
+
+#endif // STEERABLEVIEWMAP_H
diff --git a/extern/freestyle/src/view_map/ViewEdgeXBuilder.cpp b/extern/freestyle/src/view_map/ViewEdgeXBuilder.cpp
new file mode 100755
index 00000000000..20b3aeb144d
--- /dev/null
+++ b/extern/freestyle/src/view_map/ViewEdgeXBuilder.cpp
@@ -0,0 +1,666 @@
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "ViewEdgeXBuilder.h"
+#include "../winged_edge/WXEdge.h"
+#include "ViewMap.h"
+#include "SilhouetteGeomEngine.h"
+#include <list>
+
+using namespace std;
+
+void ViewEdgeXBuilder::Init(ViewShape *oVShape){
+  if(0 == oVShape)
+    return;
+
+  // for design conveniance, we store the current SShape.
+  _pCurrentSShape = oVShape->sshape();
+  if(0 == _pCurrentSShape)
+    return;
+
+  _pCurrentVShape = oVShape;
+  
+  // Reset previous data
+  //--------------------
+  if(!_SVertexMap.empty())
+    _SVertexMap.clear();
+}
+
+void ViewEdgeXBuilder::BuildViewEdges( WXShape *iWShape, ViewShape *oVShape, 
+                                      vector<ViewEdge*>& ioVEdges, 
+                                      vector<ViewVertex*>& ioVVertices,
+                                      vector<FEdge*>& ioFEdges,
+                                      vector<SVertex*>& ioSVertices){
+  // Reinit structures
+  Init(oVShape);
+
+  ViewEdge *vedge ;
+  // Let us build the smooth stuff 
+  //----------------------------------------  
+  // We parse all faces to find the ones 
+  // that contain smooth edges
+  vector<WFace*>& wfaces = iWShape->GetFaceList();
+  vector<WFace*>::iterator wf, wfend;
+  WXFace *wxf;
+  for(wf=wfaces.begin(), wfend=wfaces.end();
+  wf!=wfend;
+  wf++){
+    wxf = dynamic_cast<WXFace*>(*wf);
+    if(false == ((wxf))->hasSmoothEdges()) // does it contain at least one smooth edge ?
+      continue;
+    // parse all smooth layers:
+    vector<WXFaceLayer*>& smoothLayers = wxf->getSmoothLayers();
+    for(vector<WXFaceLayer*>::iterator sl = smoothLayers.begin(), slend=smoothLayers.end();
+    sl!=slend;
+    ++sl){
+      if(!(*sl)->hasSmoothEdge())
+        continue;
+      if(stopSmoothViewEdge((*sl))) // has it been parsed already ?
+        continue;
+      // here we know that we're dealing with a face layer that has not been 
+      // processed yet and that contains a smooth edge.
+      vedge = BuildSmoothViewEdge(OWXFaceLayer(*sl, true));
+    }
+  }
+  
+  // Now let's build sharp view edges:
+  //----------------------------------
+  // Reset all userdata for WXEdge structure
+  //----------------------------------------
+  //iWShape->ResetUserData();
+  
+  WXEdge * wxe;
+  vector<WEdge*>& wedges = iWShape->GetEdgeList();
+  // 
+  //------------------------------
+  for(vector<WEdge*>::iterator we=wedges.begin(),weend=wedges.end();
+  we!=weend;
+  we++){
+    wxe = dynamic_cast<WXEdge*>(*we);
+    if(Nature::NO_FEATURE == wxe->nature())
+      continue;
+    
+    if(!stopSharpViewEdge(wxe)){
+      bool b=true;
+      if(wxe->order() == -1)
+        b = false;
+      BuildSharpViewEdge(OWXEdge(wxe,b));
+    }
+  }
+
+  // Reset all userdata for WXEdge structure
+  //----------------------------------------
+  iWShape->ResetUserData();
+ 
+  // Add all these new edges to the scene's feature edges list:
+  //-----------------------------------------------------------
+  vector<FEdge*>& newedges = _pCurrentSShape->GetEdgeList();
+  vector<SVertex*>& newVertices = _pCurrentSShape->GetVertexList();
+  vector<ViewVertex*>& newVVertices = _pCurrentVShape->vertices();
+  vector<ViewEdge*>& newVEdges = _pCurrentVShape->edges();
+
+  // inserts in ioFEdges, at its end, all the edges of newedges
+  ioFEdges.insert(ioFEdges.end(), newedges.begin(), newedges.end());
+  ioSVertices.insert(ioSVertices.end(), newVertices.begin(), newVertices.end());
+  ioVVertices.insert(ioVVertices.end(), newVVertices.begin(), newVVertices.end());
+  ioVEdges.insert(ioVEdges.end(), newVEdges.begin(), newVEdges.end());
+
+}
+
+ViewEdge * ViewEdgeXBuilder::BuildSmoothViewEdge(const OWXFaceLayer& iFaceLayer){
+  // Find first edge:
+  OWXFaceLayer first = iFaceLayer;
+  OWXFaceLayer currentFace = first;
+  
+  // bidirectional chaining.
+  // first direction
+  list<OWXFaceLayer> facesChain;
+  unsigned size  = 0;
+  while(!stopSmoothViewEdge(currentFace.fl)){
+    facesChain.push_back(currentFace);
+    ++size;
+    currentFace.fl->userdata = (void*)1; // processed
+    // Find the next edge!
+    currentFace =  FindNextFaceLayer(currentFace);
+  }
+  OWXFaceLayer end = facesChain.back();
+  // second direction
+  currentFace = FindPreviousFaceLayer(first);
+  while(!stopSmoothViewEdge(currentFace.fl)){
+    facesChain.push_front(currentFace);
+    ++size;
+    currentFace.fl->userdata = (void*)1; // processed
+    // Find the previous edge!
+    currentFace =  FindPreviousFaceLayer(currentFace);
+  }
+  first = facesChain.front();
+  
+  if(iFaceLayer.fl->nature() & Nature::RIDGE){
+    if(size<4){
+      return 0;
+    }
+  }
+  
+  // Start a new chain edges
+  ViewEdge * newVEdge = new ViewEdge;
+  newVEdge->SetId(_currentViewId);
+  ++_currentViewId;
+  
+  _pCurrentVShape->AddEdge(newVEdge);
+  
+
+  // build FEdges
+  FEdge * feprevious = 0;
+  FEdge * fefirst = 0;
+  FEdge * fe;
+  for(list<OWXFaceLayer>::iterator fl = facesChain.begin(), flend=facesChain.end();
+  fl!=flend;
+  ++fl){
+    fe = BuildSmoothFEdge(feprevious, (*fl));
+    fe->SetViewEdge(newVEdge);
+    if(!fefirst)
+      fefirst = fe;
+    feprevious = fe;
+  }
+  // Store the chain starting edge:
+  _pCurrentSShape->AddChain(fefirst);
+  newVEdge->SetNature(iFaceLayer.fl->nature());
+  newVEdge->SetFEdgeA(fefirst);
+  newVEdge->SetFEdgeB(fe);
+
+  // is it a closed loop ?
+  if((first == end) && (size != 1)){
+    fefirst->SetPreviousEdge(fe);
+    fe->SetNextEdge(fefirst);
+    newVEdge->SetA(0);
+    newVEdge->SetB(0);
+  }else{
+    ViewVertex *vva = MakeViewVertex(fefirst->vertexA());
+    ViewVertex *vvb = MakeViewVertex(fe->vertexB());
+        
+    ((NonTVertex*)vva)->AddOutgoingViewEdge(newVEdge);
+    ((NonTVertex*)vvb)->AddIncomingViewEdge(newVEdge);
+
+    newVEdge->SetA(vva);
+    newVEdge->SetB(vvb);
+  } 
+  
+  return newVEdge;
+}
+
+ViewEdge * ViewEdgeXBuilder::BuildSharpViewEdge(const OWXEdge& iWEdge) {
+  // Start a new sharp chain edges
+  ViewEdge * newVEdge = new ViewEdge;
+  newVEdge->SetId(_currentViewId);
+  ++_currentViewId;
+  unsigned size=0;
+  
+  _pCurrentVShape->AddEdge(newVEdge);
+  
+  // Find first edge:
+  OWXEdge firstWEdge = iWEdge;
+  OWXEdge previousWEdge = firstWEdge;
+  OWXEdge currentWEdge = firstWEdge;
+  list<OWXEdge> edgesChain;
+  // bidirectional chaining
+  // first direction:
+  while(!stopSharpViewEdge(currentWEdge.e)){
+    edgesChain.push_back(currentWEdge);
+    ++size;
+    currentWEdge.e->userdata = (void*)1; // processed
+    // Find the next edge!
+    currentWEdge =  FindNextWEdge(currentWEdge);
+  }
+  OWXEdge endWEdge = edgesChain.back();
+  // second direction
+  currentWEdge = FindPreviousWEdge(firstWEdge);
+  while(!stopSharpViewEdge(currentWEdge.e)){
+    edgesChain.push_front(currentWEdge);
+    ++size;
+    currentWEdge.e->userdata = (void*)1; // processed
+    // Find the previous edge!
+    currentWEdge =  FindPreviousWEdge(currentWEdge);
+  }
+  firstWEdge = edgesChain.front();
+
+  // build FEdges
+  FEdge * feprevious = 0;
+  FEdge * fefirst = 0;
+  FEdge * fe;
+  for(list<OWXEdge>::iterator we = edgesChain.begin(), weend=edgesChain.end();
+  we!=weend;
+  ++we){
+    fe = BuildSharpFEdge(feprevious, (*we));
+    fe->SetViewEdge(newVEdge);
+    if(!fefirst)
+      fefirst = fe;
+    feprevious = fe;
+  }
+  // Store the chain starting edge:
+  _pCurrentSShape->AddChain(fefirst);
+  newVEdge->SetNature(iWEdge.e->nature());
+  newVEdge->SetFEdgeA(fefirst);
+  newVEdge->SetFEdgeB(fe);
+
+  // is it a closed loop ?
+  if((firstWEdge == endWEdge) && (size!=1)){
+    fefirst->SetPreviousEdge(fe);
+    fe->SetNextEdge(fefirst);
+    newVEdge->SetA(0);
+    newVEdge->SetB(0);
+  }else{
+    ViewVertex *vva = MakeViewVertex(fefirst->vertexA());
+    ViewVertex *vvb = MakeViewVertex(fe->vertexB());
+        
+    ((NonTVertex*)vva)->AddOutgoingViewEdge(newVEdge);
+    ((NonTVertex*)vvb)->AddIncomingViewEdge(newVEdge);
+
+    newVEdge->SetA(vva);
+    newVEdge->SetB(vvb);
+  }
+
+  return newVEdge;
+}
+
+OWXFaceLayer ViewEdgeXBuilder::FindNextFaceLayer(const OWXFaceLayer& iFaceLayer){
+  WXFace *nextFace = 0;
+  WOEdge * woeend;
+  real tend;
+  if(iFaceLayer.order){
+    woeend = iFaceLayer.fl->getSmoothEdge()->woeb();
+    tend = iFaceLayer.fl->getSmoothEdge()->tb();
+  }else{
+    woeend = iFaceLayer.fl->getSmoothEdge()->woea();
+    tend = iFaceLayer.fl->getSmoothEdge()->ta();
+  }
+  // special case of EDGE_VERTEX config:
+  if((tend == 0.0) || (tend == 1.0)){
+    WVertex *nextVertex;
+    if(tend == 0.0)
+      nextVertex = woeend->GetaVertex();
+    else
+      nextVertex = woeend->GetbVertex();
+    if(nextVertex->isBoundary()) // if it's a non-manifold vertex -> ignore
+      return OWXFaceLayer(0,true);
+    bool found = false;
+    WVertex::face_iterator f=nextVertex->faces_begin();
+    WVertex::face_iterator fend=nextVertex->faces_end();
+    while((!found) && (f!=fend)){
+      nextFace = dynamic_cast<WXFace*>(*f);
+      if((0 != nextFace) && (nextFace!=iFaceLayer.fl->getFace())){
+        vector<WXFaceLayer*> sameNatureLayers;
+        nextFace->retrieveSmoothEdgesLayers(iFaceLayer.fl->nature(), sameNatureLayers);
+        if(sameNatureLayers.size() == 1) {// don't know 
+          // maybe should test whether this face has 
+          // also a vertex_edge configuration
+          WXFaceLayer * winner = sameNatureLayers[0];
+          if(woeend == winner->getSmoothEdge()->woea()->twin())
+            return OWXFaceLayer(winner,true);
+          else
+            return OWXFaceLayer(winner,false);
+        }
+      }
+      ++f;
+    }
+  }else{
+    nextFace = dynamic_cast<WXFace*>(iFaceLayer.fl->getFace()->GetBordingFace(woeend));
+    if(0 == nextFace)
+      return OWXFaceLayer(0,true);
+    // if the next face layer has either no smooth edge or 
+    // no smooth edge of same nature, no next face
+    if(!nextFace->hasSmoothEdges())
+      return OWXFaceLayer(0,true);
+    vector<WXFaceLayer*> sameNatureLayers;
+    nextFace->retrieveSmoothEdgesLayers(iFaceLayer.fl->nature(), sameNatureLayers);
+    if((sameNatureLayers.empty()) || (sameNatureLayers.size() != 1)) // don't know how to deal with several edges of same nature on a single face
+      return OWXFaceLayer(0,true);
+    else{
+      WXFaceLayer * winner = sameNatureLayers[0];
+      if(woeend == winner->getSmoothEdge()->woea()->twin())
+        return OWXFaceLayer(winner,true);
+      else
+        return OWXFaceLayer(winner,false);
+    } 
+  }
+  return OWXFaceLayer(0,true);
+}
+
+OWXFaceLayer ViewEdgeXBuilder::FindPreviousFaceLayer(const OWXFaceLayer& iFaceLayer) {
+  WXFace *previousFace = 0;
+  WOEdge * woebegin;
+  real tend;
+  if(iFaceLayer.order){
+    woebegin = iFaceLayer.fl->getSmoothEdge()->woea();
+    tend = iFaceLayer.fl->getSmoothEdge()->ta();
+  }else{
+    woebegin = iFaceLayer.fl->getSmoothEdge()->woeb();
+    tend = iFaceLayer.fl->getSmoothEdge()->tb();
+  }
+
+  // special case of EDGE_VERTEX config:
+  if((tend == 0.0) || (tend == 1.0)){
+    WVertex *previousVertex;
+    if(tend == 0.0)
+      previousVertex = woebegin->GetaVertex();
+    else
+      previousVertex = woebegin->GetbVertex();
+    if(previousVertex->isBoundary()) // if it's a non-manifold vertex -> ignore
+      return OWXFaceLayer(0,true);
+    bool found = false;
+    WVertex::face_iterator f=previousVertex->faces_begin();
+    WVertex::face_iterator fend=previousVertex->faces_end();
+    while((!found) && (f!=fend)){
+      previousFace = dynamic_cast<WXFace*>(*f);
+      if((0 != previousFace) && (previousFace!=iFaceLayer.fl->getFace())){
+        vector<WXFaceLayer*> sameNatureLayers;
+        previousFace->retrieveSmoothEdgesLayers(iFaceLayer.fl->nature(), sameNatureLayers);
+        if(sameNatureLayers.size() == 1) {// don't know 
+          // maybe should test whether this face has 
+          // also a vertex_edge configuration
+          WXFaceLayer * winner = sameNatureLayers[0];
+          if(woebegin == winner->getSmoothEdge()->woeb()->twin())
+            return OWXFaceLayer(winner,true);
+          else
+            return OWXFaceLayer(winner,false);
+        }
+      }
+      ++f;
+    }
+  }else{
+    previousFace = dynamic_cast<WXFace*>(iFaceLayer.fl->getFace()->GetBordingFace(woebegin));
+    if(0 == previousFace)
+      return OWXFaceLayer(0,true);
+    
+    // if the next face layer has either no smooth edge or 
+    // no smooth edge of same nature, no next face
+    if(!previousFace->hasSmoothEdges())
+      return OWXFaceLayer(0,true);
+    vector<WXFaceLayer*> sameNatureLayers;
+    previousFace->retrieveSmoothEdgesLayers(iFaceLayer.fl->nature(), sameNatureLayers);
+    if((sameNatureLayers.empty()) || (sameNatureLayers.size() != 1)) // don't know how to deal with several edges of same nature on a single face
+      return OWXFaceLayer(0,true);
+    else{
+      WXFaceLayer * winner = sameNatureLayers[0];
+      if(woebegin == winner->getSmoothEdge()->woeb()->twin())
+        return OWXFaceLayer(winner,true);
+      else
+        return OWXFaceLayer(winner,false);
+    }
+  }
+  return OWXFaceLayer(0,true);
+}
+
+FEdge * ViewEdgeXBuilder::BuildSmoothFEdge(FEdge *feprevious, const OWXFaceLayer& ifl){
+  SVertex *va, *vb;
+  FEdgeSmooth *fe;
+  // retrieve exact silhouette data
+  WXSmoothEdge *se = ifl.fl->getSmoothEdge();
+
+  Vec3r normal;
+  // Make the 2 Svertices
+  if(feprevious == 0){ // that means that we don't have any vertex already built for that face
+    real ta = se->ta();
+    Vec3r A1(se->woea()->GetaVertex()->GetVertex());
+    Vec3r A2(se->woea()->GetbVertex()->GetVertex());
+    Vec3r A(A1+ta*(A2-A1));
+    
+    va = MakeSVertex(A);
+    // Set normal:
+    Vec3r NA1(ifl.fl->getFace()->GetVertexNormal(se->woea()->GetaVertex()));
+    Vec3r NA2(ifl.fl->getFace()->GetVertexNormal(se->woea()->GetbVertex()));
+    Vec3r na((1 - ta) * NA1 + ta * NA2);
+    na.normalize();
+    va->AddNormal(na);
+    normal = na;
+
+    // Set CurvatureInfo
+    CurvatureInfo* curvature_info_a = new CurvatureInfo(*(dynamic_cast<WXVertex*>(se->woea()->GetaVertex())->curvatures()),
+							*(dynamic_cast<WXVertex*>(se->woea()->GetbVertex())->curvatures()),
+							ta);
+    va->setCurvatureInfo(curvature_info_a);
+  }
+  else
+    va = feprevious->vertexB();
+
+  real tb = se->tb();
+  Vec3r B1(se->woeb()->GetaVertex()->GetVertex());
+  Vec3r B2(se->woeb()->GetbVertex()->GetVertex());
+  Vec3r B(B1+tb*(B2-B1));
+
+  vb = MakeSVertex(B);
+  // Set normal:
+  Vec3r NB1(ifl.fl->getFace()->GetVertexNormal(se->woeb()->GetaVertex()));
+  Vec3r NB2(ifl.fl->getFace()->GetVertexNormal(se->woeb()->GetbVertex()));
+  Vec3r nb((1 - tb) * NB1 + tb * NB2);
+  nb.normalize();
+  normal += nb;
+  vb->AddNormal(nb);
+
+  // Set CurvatureInfo
+  CurvatureInfo* curvature_info_b = new CurvatureInfo(*(dynamic_cast<WXVertex*>(se->woeb()->GetaVertex())->curvatures()),
+						      *(dynamic_cast<WXVertex*>(se->woeb()->GetbVertex())->curvatures()),
+						      tb);
+  vb->setCurvatureInfo(curvature_info_b);
+
+  // if the order is false we must swap va and vb
+  if(!ifl.order){
+    SVertex *tmp = va;
+    va = vb;
+    vb = tmp;
+  }
+  
+  // Creates the corresponding feature edge
+  fe = new FEdgeSmooth(va, vb);
+  fe->SetNature(ifl.fl->nature());
+  fe->SetId(_currentFId);
+  fe->SetMaterialIndex(ifl.fl->getFace()->materialIndex());
+  fe->SetFace(ifl.fl->getFace());
+  fe->SetNormal(normal);
+  fe->SetPreviousEdge(feprevious);
+  if(feprevious)
+    feprevious->SetNextEdge(fe);
+  _pCurrentSShape->AddEdge(fe);
+  va->AddFEdge(fe);
+  vb->AddFEdge(fe);
+  
+  ++_currentFId;
+  ifl.fl->userdata = fe;
+  return fe;
+}
+
+bool ViewEdgeXBuilder::stopSmoothViewEdge(WXFaceLayer *iFaceLayer){
+  if(0 == iFaceLayer)
+    return true;
+  if(iFaceLayer->userdata == 0)
+    return false;
+  return true;
+}
+
+OWXEdge ViewEdgeXBuilder::FindNextWEdge(const OWXEdge& iEdge){
+  if(Nature::NO_FEATURE == iEdge.e->nature())
+    return OWXEdge(0, true);
+
+  WVertex *v;
+  if(true == iEdge.order)
+    v = iEdge.e->GetbVertex();
+  else
+    v = iEdge.e->GetaVertex();
+
+  if(((WXVertex*)v)->isFeature())
+    return 0;
+
+  
+  vector<WEdge*>& vEdges = (v)->GetEdges();
+  for(vector<WEdge*>::iterator ve=vEdges.begin(),veend=vEdges.end();
+  ve!=veend;
+  ve++){ 
+    WXEdge *wxe = dynamic_cast<WXEdge*>(*ve);
+    if(wxe == iEdge.e)
+      continue; // same edge as the one processed
+
+    if(wxe->nature() != iEdge.e->nature())
+      continue;
+      
+    if(wxe->GetaVertex() == v){
+     // That means that the face necesarily lies on the edge left.
+     // So the vertex order is OK.
+      return OWXEdge(wxe, true);
+    }else{
+      // That means that the face necesarily lies on the edge left.
+      // So the vertex order is OK.
+      return OWXEdge(wxe, false);
+    }  
+  }   
+  // we did not find:
+  return OWXEdge(0, true);
+}
+
+OWXEdge ViewEdgeXBuilder::FindPreviousWEdge(const OWXEdge& iEdge){
+  if(Nature::NO_FEATURE == iEdge.e->nature())
+    return OWXEdge(0, true);
+
+  WVertex *v;
+  if(true == iEdge.order)
+    v = iEdge.e->GetaVertex();
+  else
+    v = iEdge.e->GetbVertex();
+
+  if(((WXVertex*)v)->isFeature())
+    return 0;
+
+  
+  vector<WEdge*>& vEdges = (v)->GetEdges();
+  for(vector<WEdge*>::iterator ve=vEdges.begin(),veend=vEdges.end();
+  ve!=veend;
+  ve++){ 
+    WXEdge *wxe = dynamic_cast<WXEdge*>(*ve);
+    if(wxe == iEdge.e)
+      continue; // same edge as the one processed
+
+    if(wxe->nature() != iEdge.e->nature())
+      continue;
+      
+    if(wxe->GetbVertex() == v){
+      return OWXEdge(wxe, true);
+    }else{
+      return OWXEdge(wxe, false);
+    }  
+  }   
+  // we did not find:
+  return OWXEdge(0, true);
+}
+
+FEdge * ViewEdgeXBuilder::BuildSharpFEdge(FEdge *feprevious, const OWXEdge& iwe){
+  SVertex *va, *vb;
+  FEdgeSharp *fe;
+  WXVertex *wxVA, *wxVB;
+  if(iwe.order){
+    wxVA = (WXVertex*)iwe.e->GetaVertex();
+    wxVB = (WXVertex*)iwe.e->GetbVertex();
+  }else{
+    wxVA = (WXVertex*)iwe.e->GetbVertex();
+    wxVB = (WXVertex*)iwe.e->GetaVertex();
+  }
+  // Make the 2 SVertex
+  va = MakeSVertex(wxVA->GetVertex());
+  vb = MakeSVertex(wxVB->GetVertex());
+
+  // get the faces normals and the material indices
+  Vec3r normalA, normalB;
+  unsigned matA(0), matB(0);
+  if(iwe.order){
+    normalB = (iwe.e->GetbFace()->GetNormal());
+    matB    = (iwe.e->GetbFace()->materialIndex());
+    if(!(iwe.e->nature() & Nature::BORDER)) {  
+      normalA = (iwe.e->GetaFace()->GetNormal());
+      matA    = (iwe.e->GetaFace()->materialIndex());
+    }
+  }else{
+    normalA = (iwe.e->GetbFace()->GetNormal());
+    matA    = (iwe.e->GetbFace()->materialIndex());
+    if(!(iwe.e->nature() & Nature::BORDER)) { 
+      normalB = (iwe.e->GetaFace()->GetNormal());
+      matB    = (iwe.e->GetaFace()->materialIndex());
+    }
+  }
+  // Creates the corresponding feature edge
+  // Creates the corresponding feature edge
+  fe = new FEdgeSharp(va, vb);
+  fe->SetNature(iwe.e->nature());
+  fe->SetId(_currentFId);
+  fe->SetaMaterialIndex(matA);
+  fe->SetbMaterialIndex(matB);
+  fe->SetNormalA(normalA);
+  fe->SetNormalB(normalB);
+  fe->SetPreviousEdge(feprevious);
+  if(feprevious)
+    feprevious->SetNextEdge(fe);
+  _pCurrentSShape->AddEdge(fe);
+  va->AddFEdge(fe);
+  vb->AddFEdge(fe);
+  //Add normals:
+  va->AddNormal(normalA);
+  va->AddNormal(normalB);
+  vb->AddNormal(normalA);
+  vb->AddNormal(normalB);
+  
+  ++_currentFId;
+  iwe.e->userdata = fe;
+  return fe;
+}
+
+bool ViewEdgeXBuilder::stopSharpViewEdge(WXEdge *iEdge){
+  if(0 == iEdge)
+    return true;
+  if(iEdge->userdata == 0)
+    return false;
+  return true;
+}
+
+SVertex * ViewEdgeXBuilder::MakeSVertex(Vec3r& iPoint){
+  SVertex *va;
+  // Check whether the vertices are already in the table:
+  // fisrt vertex
+  // -------------
+  SVertexMap::const_iterator found = _SVertexMap.find(iPoint);
+  if (found != _SVertexMap.end()) {
+    va = (*found).second;
+  }else{
+    va = new SVertex(iPoint, _currentSVertexId);
+    SilhouetteGeomEngine::ProjectSilhouette(va);
+    ++_currentSVertexId;
+    // Add the svertex to the SShape svertex list:
+    _pCurrentSShape->AddNewVertex(va);
+    // Add the svertex in the table using its id:
+    _SVertexMap[iPoint] = va; 
+  }
+  return va;
+}
+
+ViewVertex * ViewEdgeXBuilder::MakeViewVertex(SVertex *iSVertex){
+  ViewVertex *vva = iSVertex->viewvertex();  
+  if(vva != 0)
+    return vva;
+  vva = new NonTVertex(iSVertex);
+  // Add the view vertex to the ViewShape svertex list:
+  _pCurrentVShape->AddVertex(vva);    
+  return vva;
+}
+
diff --git a/extern/freestyle/src/view_map/ViewEdgeXBuilder.h b/extern/freestyle/src/view_map/ViewEdgeXBuilder.h
new file mode 100755
index 00000000000..9e2837b49a7
--- /dev/null
+++ b/extern/freestyle/src/view_map/ViewEdgeXBuilder.h
@@ -0,0 +1,214 @@
+//
+//  Filename         : ViewEdgeXBuilder.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Class to build view edges and the underlying chains
+//                     of feature edges...
+//  Date of creation : 27/10/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  VIEWEDGEXBUILDER_H
+# define VIEWEDGEXBUILDER_H
+
+# include <map>
+# include <utility>
+# include <vector>
+
+# if defined(__GNUC__) && (__GNUC__ >= 3)
+//hash_map is not part of the C++ standard anymore; hash_map.h has been kept though for backward compatibility
+#  include <hash_map.h>
+# else
+#  include <hash_map>
+# endif
+
+# include "../system/FreestyleConfig.h"
+# include "../geometry/Geom.h"
+# include "Interface1D.h"
+
+using namespace Geometry;
+using namespace std;
+
+class SVertex;
+/*! Defines a hash table used for searching the SVertex */
+struct SVertexHasher {
+#define _MUL 950706376UL
+#define _MOD 2147483647UL
+  inline size_t operator() (const Vec3r& p) const {
+    size_t res = ((unsigned long) (p[0] * _MUL)) % _MOD;
+    res = ((res + (unsigned long) (p[1]) * _MUL)) % _MOD;
+    return ((res +(unsigned long) (p[2]) * _MUL)) % _MOD;
+  }
+};
+
+// Key_compare predicate for hash_map. In particular, return false if equal.
+struct epsilonEquals{
+  bool operator()(const Vec3r& v1, const Vec3r& v2) const{
+    real norm = (v1-v2).norm();
+    return (norm<1e-06);
+  }
+};
+
+
+// typedef hash_map<Vec3r, SVertex*, SVertexHasher, epsilonEquals> SVertexMap;
+typedef map<Vec3r , SVertex*> SVertexMap;
+
+class WXFaceLayer;
+/*! class to describe an oriented smooth edge */
+class OWXFaceLayer{
+public:
+  WXFaceLayer * fl;
+  bool order;
+
+  OWXFaceLayer() {fl=0;order=true;}
+  OWXFaceLayer(WXFaceLayer *ifl, bool iOrder=true){fl = ifl;order=iOrder;}
+  OWXFaceLayer& operator=(const OWXFaceLayer& iBrother){
+    fl = iBrother.fl;
+    order = iBrother.order;
+    return *this;
+  }
+  bool operator==(const OWXFaceLayer& b){
+    return ((fl == b.fl) && (order == b.order));
+  }
+  bool operator!=(const OWXFaceLayer& b){
+    return !(*this==b);
+  }
+};
+
+class WXEdge;
+/*! class to describe an oriented sharp edge */
+class OWXEdge{
+public:
+  WXEdge * e;
+  bool order;
+
+  OWXEdge() {e=0;order=true;}
+  OWXEdge(WXEdge *ie, bool iOrder=true){e = ie;order=iOrder;}
+  OWXEdge& operator=(const OWXEdge& iBrother){
+    e = iBrother.e;
+    order = iBrother.order;
+    return *this;
+  }
+  bool operator==(const OWXEdge& b){
+    return ((e == b.e) && (order == b.order));
+  }
+  bool operator!=(const OWXEdge& b){
+    return !(*this==b);
+  }
+};
+
+class WOEdge;
+class WXEdge;
+class WXShape;
+class SVertex;
+class FEdge;
+class ViewVertex;
+class ViewEdge;
+class ViewShape;
+class LIB_VIEW_MAP_EXPORT ViewEdgeXBuilder
+{
+protected:
+  int _currentViewId; // Id for view edges
+  int _currentFId;    // Id for FEdges
+  int _currentSVertexId;    // Id for SVertex
+public:
+  
+  inline ViewEdgeXBuilder() 
+  {_currentViewId = 1;_currentFId=0;_currentSVertexId=0;}
+  virtual ~ViewEdgeXBuilder(){}
+
+  /*! Builds a view shape from a WXShape in which the feature edges 
+   *  are flagged
+   *  Builds chains of feature edges (so ViewEdges) from a WXShape
+   *    iWShape
+   *      The Winged Edge structure in which all silhouette edges
+   *      and vertices are flagged.
+   *    oViewShape
+   *      The Silhouette Shape in which the chains must be added.
+   *    ioVEdges
+   *      The list of new ViewEdges.
+   *    ioVVertices
+   *      THe new ViewVertices
+   *    ioFEdges
+   *      A list in which all new FEdges are added
+   *    ioSVertices
+   *      A list of SVertex where all created SVertex are added.
+   */
+  virtual void BuildViewEdges(WXShape *iWShape, ViewShape *oVShape, 
+                      std::vector<ViewEdge*>& ioVEdges, 
+                      std::vector<ViewVertex*>& ioVVertices,
+                      std::vector<FEdge*>& ioFEdges,
+                      std::vector<SVertex*>& ioSVertices) ;
+
+  /*! Builds a smooth view edge, starting the face iFace.*/
+  ViewEdge * BuildSmoothViewEdge(const OWXFaceLayer& iFaceLayer);
+
+  /*! Makes a sharp viewedge 
+   */
+  ViewEdge * BuildSharpViewEdge(const OWXEdge& iWEdge) ;
+
+
+public:
+  /*! accessors */
+  inline int currentViewId() const { return _currentViewId; }
+  inline int currentFId() const { return _currentFId; }
+  inline int currentSVertexId() const { return _currentSVertexId; }
+  /*! modifiers */
+  inline void SetCurrentViewId(int id) { _currentViewId = id; }
+  inline void SetCurrentFId(int id) { _currentFId = id; }
+  inline void SetCurrentSVertexId(int id) { _currentSVertexId = id; }
+
+protected:
+  /*! Init the view edges building */
+  virtual void Init(ViewShape *oVShape) ;
+
+  // SMOOTH //
+  /*! checks whether a face has already been processed or not */
+  bool stopSmoothViewEdge(WXFaceLayer *iFaceLayer);
+  OWXFaceLayer FindNextFaceLayer(const OWXFaceLayer& iFaceLayer);
+  OWXFaceLayer FindPreviousFaceLayer(const OWXFaceLayer& iFaceLayer);
+  FEdge * BuildSmoothFEdge(FEdge *feprevious, const OWXFaceLayer& ifl);
+
+  // SHARP //
+  /*! checks whether a WEdge has already been processed or not */
+  bool stopSharpViewEdge(WXEdge *iFace);
+  OWXEdge FindNextWEdge(const OWXEdge& iEdge);
+  OWXEdge FindPreviousWEdge(const OWXEdge& iEdge);
+  FEdge * BuildSharpFEdge(FEdge *feprevious, const OWXEdge& iwe);
+
+  // GENERAL //
+  /*! Instanciate a SVertex if it hasn't been already created */
+  SVertex * MakeSVertex(Vec3r& iPoint);
+  /*! instanciate a ViewVertex from a SVertex, if it doesn't exist yet */
+  ViewVertex * MakeViewVertex(SVertex *iSVertex);
+
+  //tmp values
+  //  IdHashTable _hashtable;
+  //  VVIdHashTable _multivertexHashTable;
+  SVertexMap _SVertexMap;
+  SShape *_pCurrentSShape;
+  ViewShape * _pCurrentVShape;
+};
+
+#endif
+
diff --git a/extern/freestyle/src/view_map/ViewMap.cpp b/extern/freestyle/src/view_map/ViewMap.cpp
new file mode 100755
index 00000000000..9a2d262b703
--- /dev/null
+++ b/extern/freestyle/src/view_map/ViewMap.cpp
@@ -0,0 +1,703 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "ViewMap.h"
+#include "../geometry/GeomUtils.h"
+#include <float.h>
+#include "ViewMapIterators.h"
+#include "ViewMapAdvancedIterators.h"
+
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             ViewMap            */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+ViewMap * ViewMap::_pInstance = 0;
+
+ViewMap::~ViewMap()  
+{
+    // The view vertices must be deleted here as some of them
+    // are shared between two shapes:
+    for(vector<ViewVertex*>::iterator vv=_VVertices.begin(), vvend=_VVertices.end();
+    vv!=vvend;
+    vv++)
+    {
+      delete (*vv);
+    }
+    _VVertices.clear();
+
+    for(vector<ViewShape*>::iterator vs=_VShapes.begin(),vsend=_VShapes.end();
+    vs!=vsend;
+    vs++)
+    {
+      delete (*vs);
+    }
+    _VShapes.clear();
+
+    _FEdges.clear();
+    _SVertices.clear();
+    _VEdges.clear();
+}
+
+ViewShape * ViewMap::viewShape(unsigned id) 
+{
+  int index = _shapeIdToIndex[id];
+  return _VShapes[ index ];
+}
+void  ViewMap::AddViewShape(ViewShape *iVShape) {
+    _shapeIdToIndex[iVShape->getId().getFirst()] = _VShapes.size(); 
+    _VShapes.push_back(iVShape);
+}
+const FEdge * ViewMap::GetClosestFEdge(real x, real y) const
+{
+  // find the closest of this candidates:
+  real minDist = DBL_MAX;
+  FEdge * winner = 0;
+  for(fedges_container::const_iterator fe=_FEdges.begin(),feend=_FEdges.end();
+  fe!=feend;
+  fe++)
+  {
+    Vec2d A((*fe)->vertexA()->point2D()[0], (*fe)->vertexA()->point2D()[1]);
+    Vec2d B((*fe)->vertexB()->point2D()[0], (*fe)->vertexB()->point2D()[1]);
+    real dist = GeomUtils::distPointSegment<Vec2r>(Vec2r(x,y),A, B);
+    if(dist < minDist)
+    {
+      minDist = dist;
+      winner = (*fe);
+    }
+    
+  }
+  if(winner==0)
+    return 0;
+  
+  return winner;
+}
+
+const ViewEdge * ViewMap::GetClosestViewEdge(real x, real y) const
+{
+  // find the closest of this candidates:
+  real minDist = DBL_MAX;
+  FEdge * winner = 0;
+  for(fedges_container::const_iterator fe=_FEdges.begin(),feend=_FEdges.end();
+  fe!=feend;
+  fe++)
+  {
+    Vec2d A((*fe)->vertexA()->point2D()[0], (*fe)->vertexA()->point2D()[1]);
+    Vec2d B((*fe)->vertexB()->point2D()[0], (*fe)->vertexB()->point2D()[1]);
+    real dist = GeomUtils::distPointSegment<Vec2r>(Vec2r(x,y),A, B);
+    if(dist < minDist)
+    {
+      minDist = dist;
+      winner = (*fe);
+    }
+    
+  }
+  if(winner==0)
+    return 0;
+  
+  return winner->viewedge();
+}
+
+
+TVertex* ViewMap::CreateTVertex(const Vec3r& iA3D, const Vec3r& iA2D, FEdge *iFEdgeA,
+                                const Vec3r& iB3D, const Vec3r& iB2D, FEdge *iFEdgeB,
+                                const Id& id)
+{
+  ViewShape *vshapeA = iFEdgeA->viewedge()->viewShape();
+  SShape *shapeA = iFEdgeA->shape();
+  ViewShape *vshapeB = iFEdgeB->viewedge()->viewShape();
+  SShape *shapeB = iFEdgeB->shape();
+  
+  SVertex * Ia = shapeA->CreateSVertex(iA3D, iA2D, iFEdgeA->vertexA()->getId());
+  SVertex * Ib = shapeB->CreateSVertex(iB3D, iB2D, iFEdgeB->vertexA()->getId());
+  
+    // depending on which of these 2 svertices is the nearest from the 
+    // viewpoint, we're going to build the TVertex by giving them in 
+    // an order or another (the first one must be the nearest)
+    real dista = Ia->point2D()[2];
+    real distb = Ib->point2D()[2];
+
+    TVertex * tvertex;
+    if(dista < distb)
+      tvertex = new TVertex(Ia, Ib);
+    else
+      tvertex = new TVertex(Ib,Ia);
+
+    tvertex->SetId(id);
+    
+    // add these vertices to the view map
+    AddViewVertex(tvertex);
+    AddSVertex(Ia);
+    AddSVertex(Ib);
+
+    // and this T Vertex to the view shapes:
+    vshapeA->AddVertex(tvertex);
+    vshapeB->AddVertex(tvertex);
+
+    return tvertex;
+}
+
+ViewVertex * ViewMap::InsertViewVertex(SVertex *iVertex, 
+                                       vector<ViewEdge*>& newViewEdges){
+  NonTVertex *vva = dynamic_cast<NonTVertex*>(iVertex->viewvertex());  
+  if(vva != 0)
+    return vva;
+  // beacuse it is not already a ViewVertex, this SVertex must have only 
+  // 2 FEdges. The incoming one still belongs to ioEdge, the outgoing one 
+  // now belongs to newVEdge
+  const vector<FEdge*>& fedges = iVertex->fedges();
+  if(fedges.size()!=2){
+    cerr << "ViewMap warning: Can't split the ViewEdge" << endl;
+    return 0;
+  }
+  FEdge * fend(0), * fbegin(0);
+  for(vector<FEdge*>::const_iterator fe=fedges.begin(), feend=fedges.end();
+  fe!=feend;
+  ++fe){
+    if((*fe)->vertexB() == iVertex){
+      fend   = (*fe);
+    }
+    if((*fe)->vertexA() == iVertex){
+      fbegin = (*fe);
+    }
+    if((fbegin!=0) && (fend!=0))
+      break;
+  }
+  ViewEdge *ioEdge = fbegin->viewedge();
+  ViewShape * vshape = ioEdge->viewShape();
+  vva = new NonTVertex(iVertex);
+  // if the ViewEdge is a closed loop, we don't create
+  // a new VEdge
+  if(ioEdge->A() == 0){
+    // closed loop
+    ioEdge->SetA(vva);
+    ioEdge->SetB(vva);
+    // update sshape
+    vshape->sshape()->RemoveEdgeFromChain(ioEdge->fedgeA());
+    vshape->sshape()->RemoveEdgeFromChain(ioEdge->fedgeB());
+
+    ioEdge->SetFEdgeA(fbegin);
+    ioEdge->SetFEdgeB(fend);
+
+    // Update FEdges
+    fend->SetNextEdge(0);
+    fbegin->SetPreviousEdge(0);
+    
+    // update new View Vertex:
+    vva->AddOutgoingViewEdge(ioEdge);
+    vva->AddIncomingViewEdge(ioEdge);
+
+    vshape->sshape()->AddChain(ioEdge->fedgeA());
+    vshape->sshape()->AddChain(ioEdge->fedgeB());
+  }else{
+    // Create new ViewEdge
+    ViewEdge * newVEdge = new ViewEdge(vva, ioEdge->B(), fbegin, ioEdge->fedgeB(), vshape);
+    newVEdge->SetId(Id(ioEdge->getId().getFirst(), ioEdge->getId().getSecond()+1));
+    newVEdge->SetNature(ioEdge->getNature());
+    //newVEdge->UpdateFEdges(); // done in the ViewEdge constructor
+    // Update old ViewEdge
+    ioEdge->SetB(vva);
+    ioEdge->SetFEdgeB(fend);
+
+    // Update FEdges
+    fend->SetNextEdge(0);
+    fbegin->SetPreviousEdge(0);
+
+    // update new View Vertex:
+    vva->AddOutgoingViewEdge(newVEdge);
+    vva->AddIncomingViewEdge(ioEdge);
+    // update ViewShape
+    //vshape->AddEdge(newVEdge);
+    // update SShape
+    vshape->sshape()->AddChain(fbegin);
+    // update ViewMap
+    //_VEdges.push_back(newVEdge);
+    newViewEdges.push_back(newVEdge);
+  }
+  
+  // update ViewShape
+  vshape->AddVertex(vva);
+  
+  // update ViewMap
+  _VVertices.push_back(vva);
+  
+  return vva;
+}
+
+//FEdge * ViewMap::Connect(FEdge *ioEdge, SVertex *ioVertex, vector<ViewEdge*>& oNewVEdges){
+//  SShape * sshape = ioEdge->shape();
+//  FEdge *newFEdge = sshape->SplitEdgeIn2(ioEdge, ioVertex);
+//  AddFEdge(newFEdge);
+//  InsertViewVertex(ioVertex, oNewVEdges);
+//  return  newFEdge;
+//}
+
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             TVertex            */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+// is dve1 before dve2 ? (does it have a smaller angle ?)
+bool ViewEdgeComp(ViewVertex::directedViewEdge& dve1, ViewVertex::directedViewEdge& dve2){
+  FEdge *fe1;
+  if(dve1.second)
+    fe1 = dve1.first->fedgeB();
+  else
+    fe1 = dve1.first->fedgeA();
+  FEdge *fe2;
+  if(dve2.second)
+    fe2 = dve2.first->fedgeB();
+  else
+    fe2 = dve2.first->fedgeA();
+
+  Vec3r V1 = fe1->orientation2d();
+  Vec2r v1(V1.x(), V1.y());v1.normalize();
+  Vec3r V2 = fe2->orientation2d();
+  Vec2r v2(V2.x(), V2.y());v2.normalize();
+  if(v1.y() > 0){
+    if(v2.y() < 0)
+      return true;
+    else 
+      return (v1.x() > v2.x());
+  }else{
+    if(v2.y() > 0)
+      return false;
+    else 
+      return (v1.x() < v2.x());
+  }
+  return false;
+}
+void TVertex::SetFrontEdgeA(ViewEdge *iFrontEdgeA, bool incoming) {
+  if (!iFrontEdgeA) {
+    cerr << "Warning: null pointer passed as argument of TVertex::SetFrontEdgeA()" << endl;
+    return;
+  }
+  _FrontEdgeA = directedViewEdge(iFrontEdgeA, incoming);
+  if(!_sortedEdges.empty()){
+    edge_pointers_container::iterator dve = _sortedEdges.begin(), dveend = _sortedEdges.end();
+    while((dve!=dveend) && ViewEdgeComp(**dve, _FrontEdgeA)){
+      ++dve;
+    }
+    _sortedEdges.insert( dve, &_FrontEdgeA);
+  }
+  else
+    _sortedEdges.push_back(&_FrontEdgeA);
+}
+void TVertex::SetFrontEdgeB(ViewEdge *iFrontEdgeB, bool incoming) {
+  if (!iFrontEdgeB) {
+    cerr << "Warning: null pointer passed as argument of TVertex::SetFrontEdgeB()" << endl;
+    return;
+  }
+  _FrontEdgeB = directedViewEdge(iFrontEdgeB, incoming);
+  if(!_sortedEdges.empty()){
+    edge_pointers_container::iterator dve = _sortedEdges.begin(), dveend = _sortedEdges.end();
+    while((dve!=dveend) && ViewEdgeComp(**dve, _FrontEdgeB)){
+      ++dve;
+    }
+    _sortedEdges.insert(dve, &_FrontEdgeB);
+  }
+  else
+    _sortedEdges.push_back(&_FrontEdgeB);
+}
+void TVertex::SetBackEdgeA(ViewEdge *iBackEdgeA, bool incoming) {
+  if (!iBackEdgeA) {
+    cerr << "Warning: null pointer passed as argument of TVertex::SetBackEdgeA()" << endl;
+    return;
+  }
+  _BackEdgeA = directedViewEdge(iBackEdgeA, incoming);
+  if(!_sortedEdges.empty()){
+    edge_pointers_container::iterator dve = _sortedEdges.begin(), dveend = _sortedEdges.end();
+    while((dve!=dveend) && ViewEdgeComp(**dve, _BackEdgeA)){
+      ++dve;
+    }
+    _sortedEdges.insert(dve, &_BackEdgeA);
+  }
+  else
+    _sortedEdges.push_back(&_BackEdgeA);
+}
+void TVertex::SetBackEdgeB(ViewEdge *iBackEdgeB, bool incoming) {
+  if (!iBackEdgeB) {
+    cerr << "Warning: null pointer passed as argument of TVertex::SetBackEdgeB()" << endl;
+    return;
+  }
+  _BackEdgeB = directedViewEdge(iBackEdgeB, incoming);
+  if(!_sortedEdges.empty()){
+    edge_pointers_container::iterator dve = _sortedEdges.begin(), dveend = _sortedEdges.end();
+    while((dve!=dveend) && ViewEdgeComp(**dve, _BackEdgeB)){
+      ++dve;
+    }
+    _sortedEdges.insert(dve, &_BackEdgeB);
+  }
+  else
+    _sortedEdges.push_back(&_BackEdgeB);
+}
+void TVertex::Replace(ViewEdge *iOld, ViewEdge *iNew)
+{
+    // theoritically, we only replace edges for which this 
+    // view vertex is the B vertex
+    if((iOld == _FrontEdgeA.first) && (_FrontEdgeA.first->B() == this))
+    {
+      _FrontEdgeA.first = iNew;
+      return; 
+    }
+    if((iOld == _FrontEdgeB.first) && (_FrontEdgeB.first->B() == this))
+    {
+      _FrontEdgeB.first = iNew;
+      return;
+    }
+    if((iOld == _BackEdgeA.first) && (_BackEdgeA.first->B() == this))
+    {
+      _BackEdgeA.first = iNew;
+      return;
+    }
+    if((iOld == _BackEdgeB.first) && (_BackEdgeB.first->B() == this))
+    {
+      _BackEdgeB.first = iNew;
+      return;
+    }
+}
+
+/*! iterators access */
+ViewVertex::edge_iterator TVertex::edges_begin()
+{
+    //return edge_iterator(_FrontEdgeA, _FrontEdgeB, _BackEdgeA, _BackEdgeB, _FrontEdgeA);
+  return edge_iterator(_sortedEdges.begin(), _sortedEdges.end(), _sortedEdges.begin());
+}
+ViewVertex::const_edge_iterator TVertex::edges_begin() const
+{
+    //return const_edge_iterator(_FrontEdgeA, _FrontEdgeB, _BackEdgeA, _BackEdgeB, _FrontEdgeA);
+  return const_edge_iterator(_sortedEdges.begin(), _sortedEdges.end(), _sortedEdges.begin());
+}
+ViewVertex::edge_iterator TVertex::edges_end()
+{ 
+    //return edge_iterator(_FrontEdgeA, _FrontEdgeB, _BackEdgeA, _BackEdgeB, directedViewEdge(0,true));
+  return edge_iterator(_sortedEdges.begin(), _sortedEdges.end(), _sortedEdges.end());
+}
+ViewVertex::const_edge_iterator TVertex::edges_end() const
+{ 
+    //return const_edge_iterator(_FrontEdgeA, _FrontEdgeB, _BackEdgeA, _BackEdgeB, directedViewEdge(0, true));
+  return const_edge_iterator(_sortedEdges.begin(), _sortedEdges.end(), _sortedEdges.end());
+}
+ViewVertex::edge_iterator TVertex::edges_iterator(ViewEdge *iEdge)
+{ 
+  for(edge_pointers_container::iterator it=_sortedEdges.begin(), itend=_sortedEdges.end();
+    it!=itend;
+    it++)
+    {
+      if((*it)->first == iEdge)
+        return edge_iterator(_sortedEdges.begin(), _sortedEdges.end(), it);
+    }
+    return edge_iterator(_sortedEdges.begin(), _sortedEdges.end(), _sortedEdges.begin());
+
+    //  directedViewEdge dEdge;
+    //  if(_FrontEdgeA.first == iEdge)
+    //    dEdge = _FrontEdgeA;
+    //  else if(_FrontEdgeB.first == iEdge)
+    //    dEdge = _FrontEdgeB;
+    //  else if(_BackEdgeA.first == iEdge)
+    //    dEdge = _BackEdgeA;
+    //  else if(_BackEdgeB.first == iEdge)
+    //    dEdge = _BackEdgeB;
+    //  return edge_iterator(_FrontEdgeA, _FrontEdgeB, _BackEdgeA, _BackEdgeB, dEdge);
+}
+ViewVertex::const_edge_iterator TVertex::edges_iterator(ViewEdge *iEdge) const
+{ 
+  for(edge_pointers_container::const_iterator it=_sortedEdges.begin(), itend=_sortedEdges.end();
+    it!=itend;
+    it++)
+    {
+      if((*it)->first == iEdge)
+        return const_edge_iterator(_sortedEdges.begin(), _sortedEdges.end(), it);
+    }
+    return const_edge_iterator(_sortedEdges.begin(), _sortedEdges.end(), _sortedEdges.begin());
+
+    //  directedViewEdge dEdge;
+    //  if(_FrontEdgeA.first == iEdge)
+    //    dEdge = _FrontEdgeA;
+    //  else if(_FrontEdgeB.first == iEdge)
+    //    dEdge = _FrontEdgeB;
+    //  else if(_BackEdgeA.first == iEdge)
+    //    dEdge = _BackEdgeA;
+    //  else if(_BackEdgeB.first == iEdge)
+    //    dEdge = _BackEdgeB;
+    //  return const_edge_iterator(_FrontEdgeA, _FrontEdgeB, _BackEdgeA, _BackEdgeB, dEdge);
+}
+ 
+ViewVertexInternal::orientedViewEdgeIterator TVertex::edgesBegin() {
+  return ViewVertexInternal::orientedViewEdgeIterator(_sortedEdges.begin(), _sortedEdges.end(), _sortedEdges.begin());
+}
+ViewVertexInternal::orientedViewEdgeIterator TVertex::edgesEnd() {
+ return ViewVertexInternal::orientedViewEdgeIterator(_sortedEdges.begin(), _sortedEdges.end(), _sortedEdges.end());
+}
+ViewVertexInternal::orientedViewEdgeIterator TVertex::edgesIterator(ViewEdge *iEdge) {
+  for(edge_pointers_container::iterator it=_sortedEdges.begin(), itend=_sortedEdges.end();
+    it!=itend;
+    it++)
+    {
+      if((*it)->first == iEdge)
+        return ViewVertexInternal::orientedViewEdgeIterator(_sortedEdges.begin(), _sortedEdges.end(), it);
+    }
+    return ViewVertexInternal::orientedViewEdgeIterator(_sortedEdges.begin(), _sortedEdges.end(), _sortedEdges.begin());
+}
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             NonTVertex         */ 
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+void NonTVertex::AddOutgoingViewEdge(ViewEdge * iVEdge){
+  // let's keep the viewedges ordered in CCW order 
+  // in the 2D image plan
+  directedViewEdge idve(iVEdge, false);
+  if(!_ViewEdges.empty()){
+    edges_container::iterator dve = _ViewEdges.begin(), dveend = _ViewEdges.end();
+    while((dve!=dveend) && ViewEdgeComp(*dve, idve)){
+      ++dve;
+    }
+    _ViewEdges.insert(dve, idve);
+  }
+  else
+    _ViewEdges.push_back(idve);
+}
+
+void NonTVertex::AddIncomingViewEdge(ViewEdge * iVEdge){
+  // let's keep the viewedges ordered in CCW order 
+  // in the 2D image plan
+  directedViewEdge idve(iVEdge, true);
+  if(!_ViewEdges.empty()){
+    edges_container::iterator dve = _ViewEdges.begin(), dveend = _ViewEdges.end();
+    while((dve!=dveend) && ViewEdgeComp(*dve, idve)){
+      ++dve;
+    }
+    _ViewEdges.insert(dve, idve);
+  }
+  else
+    _ViewEdges.push_back(idve);
+}
+
+/*! iterators access */
+ViewVertex::edge_iterator NonTVertex::edges_begin()
+{ 
+    return edge_iterator(_ViewEdges.begin(), _ViewEdges.end(), _ViewEdges.begin());
+}
+ViewVertex::const_edge_iterator NonTVertex::edges_begin() const
+{ 
+    return const_edge_iterator(_ViewEdges.begin(), _ViewEdges.end(), _ViewEdges.begin());
+}
+ViewVertex::edge_iterator NonTVertex::edges_end()
+{
+    return edge_iterator(_ViewEdges.begin(), _ViewEdges.end(), _ViewEdges.end());
+}
+ViewVertex::const_edge_iterator NonTVertex::edges_end() const
+{
+    return const_edge_iterator(_ViewEdges.begin(), _ViewEdges.end(), _ViewEdges.end());
+}
+ViewVertex::edge_iterator NonTVertex::edges_iterator(ViewEdge *iEdge)
+{
+    for(edges_container::iterator it=_ViewEdges.begin(), itend=_ViewEdges.end();
+    it!=itend;
+    it++)
+    {
+      if((it)->first == iEdge)
+        return edge_iterator(_ViewEdges.begin(), _ViewEdges.end(), it);
+    }
+    return edge_iterator(_ViewEdges.begin(), _ViewEdges.end(), _ViewEdges.begin());   
+}
+ViewVertex::const_edge_iterator NonTVertex::edges_iterator(ViewEdge *iEdge) const
+{
+    for(edges_container::const_iterator it=_ViewEdges.begin(), itend=_ViewEdges.end();
+    it!=itend;
+    it++)
+    {
+      if((it)->first == iEdge)
+        return const_edge_iterator(_ViewEdges.begin(), _ViewEdges.end(), it);
+    }
+    return const_edge_iterator(_ViewEdges.begin(), _ViewEdges.end(), _ViewEdges.begin());   
+}
+
+ViewVertexInternal::orientedViewEdgeIterator NonTVertex::edgesBegin() {
+  return ViewVertexInternal::orientedViewEdgeIterator(_ViewEdges.begin(), _ViewEdges.end(), _ViewEdges.begin());
+}
+ViewVertexInternal::orientedViewEdgeIterator NonTVertex::edgesEnd() {
+ return ViewVertexInternal::orientedViewEdgeIterator(_ViewEdges.begin(), _ViewEdges.end(), _ViewEdges.end());
+}
+ViewVertexInternal::orientedViewEdgeIterator NonTVertex::edgesIterator(ViewEdge *iEdge) {
+  for(edges_container::iterator it=_ViewEdges.begin(), itend=_ViewEdges.end();
+    it!=itend;
+    it++)
+    {
+      if((it)->first == iEdge)
+        return ViewVertexInternal::orientedViewEdgeIterator(_ViewEdges.begin(), _ViewEdges.end(), it);
+    }
+    return ViewVertexInternal::orientedViewEdgeIterator(_ViewEdges.begin(), _ViewEdges.end(), _ViewEdges.begin());   
+}
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             ViewEdge           */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+real ViewEdge::getLength2D() const 
+{
+  float length = 0.f;
+  ViewEdge::const_fedge_iterator itlast = fedge_iterator_last();
+  ViewEdge::const_fedge_iterator it = fedge_iterator_begin(), itend=fedge_iterator_end();
+  Vec2r seg;
+  do{
+    seg = Vec2r((*it)->orientation2d()[0], (*it)->orientation2d()[1]);
+    length += seg.norm();
+    ++it;
+  }while((it!=itend) && (it!=itlast));
+  return length;
+}
+
+
+//! view edge iterator
+ViewEdge::edge_iterator ViewEdge::ViewEdge_iterator() {return edge_iterator(this);}
+ViewEdge::const_edge_iterator ViewEdge::ViewEdge_iterator() const {return const_edge_iterator((ViewEdge*)this);}
+//! feature edge iterator
+ViewEdge::fedge_iterator ViewEdge::fedge_iterator_begin() {return fedge_iterator(this->_FEdgeA, this->_FEdgeB);}
+ViewEdge::const_fedge_iterator ViewEdge::fedge_iterator_begin() const {return const_fedge_iterator(this->_FEdgeA, this->_FEdgeB);}
+ViewEdge::fedge_iterator ViewEdge::fedge_iterator_last() {return fedge_iterator(this->_FEdgeB, this->_FEdgeB);}
+ViewEdge::const_fedge_iterator ViewEdge::fedge_iterator_last() const {return const_fedge_iterator(this->_FEdgeB, this->_FEdgeB);}
+ViewEdge::fedge_iterator ViewEdge::fedge_iterator_end() {return fedge_iterator(0, this->_FEdgeB);}
+ViewEdge::const_fedge_iterator ViewEdge::fedge_iterator_end() const {return const_fedge_iterator(0, this->_FEdgeB);}
+//! embedding vertex iterator
+ViewEdge::const_vertex_iterator ViewEdge::vertices_begin() const {return const_vertex_iterator(this->_FEdgeA->vertexA(), 0, _FEdgeA);}
+ViewEdge::vertex_iterator ViewEdge::vertices_begin() {return vertex_iterator(this->_FEdgeA->vertexA(), 0, _FEdgeA);}
+ViewEdge::const_vertex_iterator ViewEdge::vertices_last() const {return const_vertex_iterator(this->_FEdgeB->vertexB(), _FEdgeB, 0);}
+ViewEdge::vertex_iterator ViewEdge::vertices_last() {return vertex_iterator(this->_FEdgeB->vertexB(), _FEdgeB, 0);}
+ViewEdge::const_vertex_iterator ViewEdge::vertices_end() const {return const_vertex_iterator(0, _FEdgeB, 0);}
+ViewEdge::vertex_iterator ViewEdge::vertices_end() {return vertex_iterator(0, _FEdgeB, 0);}
+
+
+Interface0DIterator ViewEdge::verticesBegin() {
+  Interface0DIterator ret(new ViewEdgeInternal::SVertexIterator(this->_FEdgeA->vertexA(), this->_FEdgeA->vertexA(), 0, _FEdgeA, 0.f));
+  return ret;
+}
+
+Interface0DIterator ViewEdge::verticesEnd() {
+  Interface0DIterator ret(new ViewEdgeInternal::SVertexIterator(0, this->_FEdgeA->vertexA(), _FEdgeB, 0, getLength2D())); 
+  return ret;
+}
+
+Interface0DIterator ViewEdge::pointsBegin(float t) {
+  return verticesBegin();
+}
+
+Interface0DIterator ViewEdge::pointsEnd(float t) {
+  return verticesEnd();
+}
+
+
+
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             ViewShape          */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+
+ViewShape::~ViewShape()
+{
+  _Vertices.clear();
+
+  if(!(_Edges.empty()))
+  {
+    for(vector<ViewEdge*>::iterator e=_Edges.begin(), eend=_Edges.end();
+    e!=eend;
+    e++)
+    {
+      delete (*e);
+    }
+    _Edges.clear();
+  }
+
+  if(0 != _SShape)
+  {
+    delete _SShape;
+    _SShape = 0;
+  }
+}
+
+void ViewShape::RemoveEdge(ViewEdge * iViewEdge)
+{
+  FEdge * fedge = iViewEdge->fedgeA();
+  for(vector<ViewEdge*>::iterator ve=_Edges.begin(),veend=_Edges.end();
+  ve!=veend;
+  ve++)
+  {
+    if(iViewEdge == (*ve))
+    {
+      _Edges.erase(ve);
+      _SShape->RemoveEdge(fedge);
+      break;
+    }
+  }
+}
+
+void ViewShape::RemoveVertex(ViewVertex * iViewVertex)
+{
+  for(vector<ViewVertex*>::iterator vv=_Vertices.begin(), vvend=_Vertices.end();
+  vv!=vvend;
+  vv++)
+  {
+    if(iViewVertex == (*vv))
+    {
+      _Vertices.erase(vv);
+      break;
+    }
+  }
+}
+
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             ViewEdge           */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+
+void ViewEdge::UpdateFEdges()
+{
+  FEdge *currentEdge = _FEdgeA;
+  do
+  {
+    currentEdge->SetViewEdge(this);
+    currentEdge = currentEdge->nextEdge();
+  }while((currentEdge != NULL) && (currentEdge!= _FEdgeB));
+  // last one
+  _FEdgeB->SetViewEdge(this);
+
+}
diff --git a/extern/freestyle/src/view_map/ViewMap.h b/extern/freestyle/src/view_map/ViewMap.h
new file mode 100755
index 00000000000..bdbb140e130
--- /dev/null
+++ b/extern/freestyle/src/view_map/ViewMap.h
@@ -0,0 +1,1487 @@
+//
+//  Filename         : ViewMap.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Classes to define a View Map (ViewVertex, ViewEdge, etc.)
+//  Date of creation : 03/09/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  VIEWMAP_H
+# define VIEWMAP_H
+
+# include "../system/BaseIterator.h"
+# include "../system/FreestyleConfig.h"
+# include "../geometry/GeomUtils.h"
+# include "Interface0D.h"
+# include "Interface1D.h"
+# include "Silhouette.h" // defines the embedding
+# include <map>
+
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             ViewMap            */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+
+/*  Density
+    Mean area depth value
+    distance to a point
+    */
+
+class ViewVertex;
+class ViewEdge;
+class ViewShape;
+class TVertex;
+
+/*! Class defining the ViewMap.*/
+class LIB_VIEW_MAP_EXPORT ViewMap 
+{
+public:
+
+  typedef vector<ViewEdge*> viewedges_container;
+  typedef vector<ViewVertex*> viewvertices_container;
+  typedef vector<ViewShape*> viewshapes_container;
+  typedef vector<SVertex*> svertices_container;
+  typedef vector<FEdge*> fedges_container;
+  typedef map<int,int> id_to_index_map;
+
+private:
+
+  static ViewMap *_pInstance;
+  viewshapes_container _VShapes; // view shapes
+  viewedges_container _VEdges; // view edges
+  viewvertices_container _VVertices; // view vertices
+  fedges_container _FEdges; // feature edges (embedded edges)
+  svertices_container _SVertices; // embedded vertices
+  BBox<Vec3r> _scene3DBBox;
+  id_to_index_map _shapeIdToIndex; // Mapping between the WShape or VShape id to the VShape index in the 
+                                // _VShapes vector. Used in the method viewShape(int id) to access a shape from its id.
+
+public:
+
+  /*! A field that can be used by the user to store any data.
+   *  This field must be reseted afterwards using ResetUserData().
+   */
+  void* userdata;
+
+  /*! Default constructor. */
+  ViewMap() {
+    _pInstance = this;
+    userdata = 0;
+  }
+  /*! Destructor. */
+  virtual ~ViewMap();
+
+  /*! Gets the viewedge the nearest to the 
+   *  2D position specified as argument
+   */
+  const ViewEdge * GetClosestViewEdge(real x, real y) const ;
+
+  /*! Gets the Fedge the nearest to the 
+   *  2D position specified as argument
+   */
+  const FEdge * GetClosestFEdge(real x, real y) const ;
+
+  /* accessors */
+  /*! The ViewMap is a singleton class. This static method
+   * returns the instance of the ViewMap.
+   */
+  static inline ViewMap * getInstance() {return _pInstance;}
+  /* Returns the list of ViewShapes of the scene. */
+  inline viewshapes_container& ViewShapes() {return _VShapes;}
+  /* Returns the list of ViewEdges of the scene. */
+  inline viewedges_container& ViewEdges() {return _VEdges;}
+  /* Returns the list of ViewVertices of the scene. */
+  inline viewvertices_container& ViewVertices() {return _VVertices;}
+  /* Returns the list of FEdges of the scene. */
+  inline fedges_container& FEdges() {return _FEdges;}
+  /* Returns the list of SVertices of the scene. */
+  inline svertices_container& SVertices() {return _SVertices;}
+  /* Returns an iterator pointing onto the first ViewEdge of the list. */
+  inline viewedges_container::iterator viewedges_begin() {return _VEdges.begin();}
+  inline viewedges_container::iterator viewedges_end() {return _VEdges.end();}
+  inline int viewedges_size() {return _VEdges.size();}
+  ViewShape * viewShape(unsigned index);
+  id_to_index_map& shapeIdToIndexMap() {return _shapeIdToIndex;}
+
+  /*! Returns the scene 3D bounding box. */
+  inline BBox<Vec3r> getScene3dBBox() const {return _scene3DBBox;}
+
+  /* modifiers */
+  void AddViewShape(ViewShape *iVShape);
+  inline void AddViewEdge(ViewEdge *iVEdge) {_VEdges.push_back(iVEdge);}
+  inline void AddViewVertex(ViewVertex *iVVertex) {_VVertices.push_back(iVVertex);}
+  inline void AddFEdge(FEdge *iFEdge) {_FEdges.push_back(iFEdge);}
+  inline void AddSVertex(SVertex *iSVertex) {_SVertices.push_back(iSVertex);}
+  /*! Sets the scene 3D bounding box. */
+  inline void setScene3dBBox(const BBox<Vec3r>& bbox) {_scene3DBBox=bbox;}
+
+  /* Creates a T vertex in the view map.
+   *  A T vertex is the intersection between 2
+   *  FEdges (before these ones are splitted).
+   *  The TVertex is a 2D intersection but it 
+   *  corresponds to a 3D point on each of the 2 FEdges.
+   *    iA3D
+   *      The 3D coordinates of the point corresponding 
+   *      to the intersection on the first edge.
+   *    iA2D
+   *      The x,y,z 2D coordinates of the projection 
+   *      of iA3D
+   *    iFEdgeA
+   *      The first FEdge
+   *    iB3D
+   *      The 3D coordinates of the point corresponding 
+   *      to the intersection on the second edge.
+   *    iB2D
+   *      The x,y,z 2D coordinates of the projection 
+   *      of iB3D
+   *    iFEdgeB
+   *      The second FEdge   
+   *    id
+   *      The id that must be given to that TVertex
+   */
+  TVertex* CreateTVertex(const Vec3r& iA3D, const Vec3r& iA2D, FEdge *iFEdgeA,
+                         const Vec3r& iB3D, const Vec3r& iB2D, FEdge *iFEdgeB,
+                         const Id& id);
+
+  /* Updates the structures to take into account the fact 
+   *  that a SVertex must now be considered as a ViewVertex 
+   *    iVertex
+   *      The SVertex on top of which the ViewVertex is built (it is necessarily
+   *      a NonTVertex because it is a SVertex)
+   *    newViewEdges
+   *      The new ViewEdges that must be add to the ViewMap
+   */
+  ViewVertex * InsertViewVertex(SVertex *iVertex, vector<ViewEdge*>& newViewEdges);
+
+  /* connects a FEdge to the graph trough a SVertex */
+  //FEdge * Connect(FEdge *ioEdge, SVertex *ioVertex);
+};
+
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             ViewVertex         */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+class ViewEdge;
+class SShape;
+
+namespace ViewVertexInternal {
+  class edge_const_traits;
+  class edge_nonconst_traits;
+  template<class Traits> class edge_iterator_base ;
+  class orientedViewEdgeIterator;
+} // end of namespace ViewEdgeInternal
+/*! Class to define a view vertex 
+ *  A view vertex is a feature vertex corresponding 
+ *  to a point of the image graph, where the characteristics of an 
+ *  edge might change (nature, visibility, ...).
+ *  A ViewVertex can be of two kinds: a TVertex when
+ *  it corresponds to the intersection between two
+ *  ViewEdges or a NonTVertex when it corresponds to a
+ *  vertex of the initial input mesh (it is the case
+ *  for vertices such as corners for example).
+ *  Thus, this class can be specialized into two classes,
+ *  the TVertex class and the NonTVertex class.
+ */
+class LIB_VIEW_MAP_EXPORT ViewVertex : public Interface0D
+{
+public: // Implementation of Interface0D
+
+  /*! Returns the string "ViewVertex" .*/
+  virtual string getExactTypeName() const {
+    return "ViewVertex";
+  }
+
+public:  
+  friend class ViewShape;
+  typedef pair<ViewEdge*, bool> directedViewEdge; // if bool = true, the ViewEdge is incoming
+
+  typedef vector<directedViewEdge> edges_container;
+
+  typedef ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_nonconst_traits> edge_iterator;
+  typedef ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_const_traits> const_edge_iterator;
+
+private:
+
+  Nature::VertexNature _Nature;
+
+public:
+  /*! A field that can be used by the user to store any data.
+   *  This field must be reseted afterwards using ResetUserData().
+   */
+  void * userdata;
+  /*! Default constructor.*/
+  inline ViewVertex() {userdata = 0;_Nature = Nature::VIEW_VERTEX; }
+  inline ViewVertex(Nature::VertexNature nature) {
+    userdata = 0;
+    _Nature = Nature::VIEW_VERTEX | nature;
+  }
+
+protected:
+  /*! Copy constructor. */
+  inline ViewVertex(ViewVertex& iBrother)
+  {
+    _Nature = iBrother._Nature;
+    iBrother.userdata = this;
+    userdata = 0;
+  }
+  /*! Cloning method. */
+  virtual ViewVertex * dupplicate() = 0;
+  
+public:
+  /*! Destructor. */
+  virtual ~ViewVertex() {}
+
+  /* accessors */
+  /*! Returns the nature of the vertex .*/
+  virtual Nature::VertexNature getNature() const {
+    return _Nature;
+  }
+
+  /* modifiers */
+  /*! Sets the nature of the vertex. */
+  inline void setNature(Nature::VertexNature iNature) {_Nature = iNature;}
+  
+  /* Replaces old edge by new edge */
+  virtual void Replace(ViewEdge *, ViewEdge *) {}
+
+public:
+  
+  /* iterators access */
+  // allows iteration on the edges that comes from/goes to 
+  // this vertex in CCW order (order defined in 2D in the image plan)
+  virtual edge_iterator edges_begin() = 0;
+  virtual const_edge_iterator edges_begin() const = 0;
+  virtual edge_iterator edges_end()   = 0;
+  virtual const_edge_iterator edges_end() const   = 0;
+  virtual edge_iterator edges_iterator(ViewEdge *iEdge) = 0;
+  virtual const_edge_iterator edges_iterator(ViewEdge *iEdge) const = 0;
+
+  // Iterator access
+  /*! Returns an iterator over the ViewEdges that goes to or comes from
+   *  this ViewVertex pointing to the first ViewEdge of the list.
+   *  The orientedViewEdgeIterator allows to iterate in CCW order over these ViewEdges
+   *  and to get the orientation for each ViewEdge (incoming/outgoing).
+   */
+  virtual ViewVertexInternal::orientedViewEdgeIterator edgesBegin() = 0;
+  /*! Returns an orientedViewEdgeIterator over the ViewEdges around this ViewVertex,
+   *  pointing after the last ViewEdge.
+   */
+  virtual ViewVertexInternal::orientedViewEdgeIterator edgesEnd() = 0;
+  /*! Returns an orientedViewEdgeIterator pointing to the ViewEdge
+   *  given as argument.
+   */
+  virtual ViewVertexInternal::orientedViewEdgeIterator edgesIterator(ViewEdge *iEdge) = 0;
+  
+};
+
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             TVertex            */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+/*! class to define a T vertex, i.e. an intersection between 
+ *  two edges. 
+ *  It points towards 2 SVertex and 4 View edges.
+ *  Among these ViewEdges, 2 are front and 2 are back.
+ *  Basically the front edge hides part of the back edge.
+ *  So, among the back edges, 1 is of invisibility n
+ *  and the other of visibility n+1
+ */
+class LIB_VIEW_MAP_EXPORT TVertex : public ViewVertex
+{
+public:
+  typedef vector<directedViewEdge*> edge_pointers_container;
+public: // Implementation of Interface0D
+
+  /*! Returns the string "TVertex" .*/
+  virtual string getExactTypeName() const {
+    return "TVertex";
+  }
+
+  // Data access methods
+  /* Returns the 3D x coordinate of the vertex .
+   * Ambiguous in this case.
+   */
+  virtual real getX() const {
+    cerr << "Warning: getX() undefined for this point" << endl;
+    return _FrontSVertex->point3D().x();
+  }
+
+  virtual real getY() const {
+    cerr << "Warning: getX() undefined for this point" << endl;
+    return _FrontSVertex->point3D().y();
+  }
+
+  virtual real getZ() const {
+    cerr << "Warning: getX() undefined for this point" << endl;
+    return _FrontSVertex->point3D().z();
+  }
+
+  /*!  Returns the 3D point. */ 
+  virtual Vec3f getPoint3D() const {
+    cerr << "Warning: getPoint3D() undefined for this point" << endl;
+    return _FrontSVertex->getPoint3D();
+  }
+
+  /*! Returns the projected 3D  x coordinate of the vertex .*/
+  virtual real getProjectedX() const {
+    return _FrontSVertex->point2D().x();
+  }
+
+  /*! Returns the projected 3D  y coordinate of the vertex .*/
+  virtual real getProjectedY() const {
+    return _FrontSVertex->point2D().y();
+  }
+
+  virtual real getProjectedZ() const {
+    return _FrontSVertex->point2D().z();
+  }
+
+  /*!  Returns the 2D point. */ 
+  virtual Vec2f getPoint2D() const {
+    return _FrontSVertex->getPoint2D();
+  }
+
+  /*! Returns the Id of the TVertex .*/
+  virtual Id getId() const {
+    return _Id;
+  }
+
+  /*! Cast the Interface0D in SVertex if it can be. */ 
+  // it can't
+  /*! Cast the Interface0D in ViewVertex if it can be. */ 
+  virtual ViewVertex * castToViewVertex(){
+    return this;
+  }
+
+  /*! Cast the Interface0D in TVertex if it can be. */ 
+  virtual TVertex * castToTVertex(){
+    return this;
+  }
+
+private:
+  SVertex  *_FrontSVertex;
+  SVertex  *_BackSVertex;
+  directedViewEdge _FrontEdgeA;
+  directedViewEdge _FrontEdgeB;
+  directedViewEdge _BackEdgeA;
+  directedViewEdge _BackEdgeB;
+  Id _Id; // id to identify t vertices . these id will be negative in order not to be mixed with NonTVertex ids.
+  edge_pointers_container _sortedEdges; // the list of the four ViewEdges, ordered in CCW order (in the image plan)
+
+
+public:
+  /*! Default constructor.*/
+  inline TVertex() : ViewVertex(Nature::T_VERTEX) 
+  {
+    _FrontSVertex = 0;
+    _BackSVertex = 0;
+    _FrontEdgeA.first = 0;
+    _FrontEdgeB.first = 0;
+    _BackEdgeA.first = 0;
+    _BackEdgeB.first = 0;
+
+  }
+
+  inline TVertex(SVertex *svFront, SVertex *svBack)
+    : ViewVertex(Nature::T_VERTEX)
+  {
+    _FrontSVertex = svFront;
+    _BackSVertex = svBack;
+    _FrontEdgeA.first = 0;
+    _FrontEdgeB.first = 0;
+    _BackEdgeA.first = 0;
+    _BackEdgeB.first = 0;
+    svFront->SetViewVertex(this);
+    svBack->SetViewVertex(this);
+  }
+
+protected:
+  /*! Copy constructor. */
+  inline TVertex(TVertex& iBrother)
+    : ViewVertex(iBrother)
+  {
+    _FrontSVertex = iBrother._FrontSVertex;
+    _BackSVertex = iBrother._BackSVertex;
+    _FrontEdgeA = iBrother._FrontEdgeA;
+    _FrontEdgeB = iBrother._FrontEdgeB;
+    _BackEdgeA = iBrother._BackEdgeA;
+    _BackEdgeB = iBrother._BackEdgeB;
+    _sortedEdges = iBrother._sortedEdges;
+  }
+
+  /*! Cloning method. */
+  virtual ViewVertex * dupplicate()
+  {
+    TVertex *clone = new TVertex(*this);
+    return clone;
+  }
+
+public:
+  /* accessors */
+  /*! Returns the SVertex that is closer to the viewpoint. */
+  inline SVertex  *frontSVertex() {return _FrontSVertex;}
+  /*! Returns the SVertex that is further away from the viewpoint. */
+  inline SVertex  *backSVertex() {return _BackSVertex;}
+  inline directedViewEdge& frontEdgeA() {return _FrontEdgeA;}
+  inline directedViewEdge& frontEdgeB() {return _FrontEdgeB;}
+  inline directedViewEdge& backEdgeA() {return _BackEdgeA;}
+  inline directedViewEdge& backEdgeB() {return _BackEdgeB;}
+  
+  /* modifiers */
+  /*! Sets the SVertex that is closer to the viewpoint. */
+  inline void SetFrontVertex(SVertex  *iFrontSVertex) {_FrontSVertex = iFrontSVertex;_FrontSVertex->SetViewVertex(this);}
+  /*! Sets the SVertex that is further away from the viewpoint. */
+  inline void SetBackSVertex(SVertex  *iBackSVertex) {_BackSVertex = iBackSVertex;_BackSVertex->SetViewVertex(this);}
+  void SetFrontEdgeA(ViewEdge *iFrontEdgeA, bool incoming=true);
+  void SetFrontEdgeB(ViewEdge *iFrontEdgeB, bool incoming=true) ;
+  void SetBackEdgeA(ViewEdge *iBackEdgeA, bool incoming=true);
+  void SetBackEdgeB(ViewEdge *iBackEdgeB, bool incoming=true) ;
+  /*! Sets the Id. */
+  inline void SetId(const Id& iId) {_Id = iId;}
+  
+  /*! Returns the SVertex (among the 2) belonging to the FEdge iFEdge */
+  inline SVertex * GetSVertex(FEdge *iFEdge)
+  {
+    const vector<FEdge*>& vfEdges = _FrontSVertex->fedges();
+    vector<FEdge*>::const_iterator fe,fend;
+    for(fe=vfEdges.begin(),fend=vfEdges.end();
+    fe!=fend;
+    fe++)
+    {
+      if((*fe) == iFEdge)
+        return _FrontSVertex;
+    }
+
+    const vector<FEdge*>& vbEdges = _BackSVertex->fedges();
+    for(fe=vbEdges.begin(),fend=vbEdges.end();
+    fe!=fend;
+    fe++)
+    {
+      if((*fe) == iFEdge)
+        return _BackSVertex;
+    }
+    return 0;
+  }
+
+  virtual void Replace(ViewEdge *iOld, ViewEdge *iNew);
+  
+  /*! returns the mate edge of iEdgeA.
+   *  For example, if iEdgeA is frontEdgeA, 
+   *  then frontEdgeB is returned. If iEdgeA is 
+   *  frontEdgeB then frontEdgeA is returned.
+   *  Same for back edges
+   */
+  virtual ViewEdge * mate(ViewEdge* iEdgeA)
+  {
+    if(iEdgeA == _FrontEdgeA.first)
+      return _FrontEdgeB.first;
+    if(iEdgeA == _FrontEdgeB.first)
+      return _FrontEdgeA.first;
+    if(iEdgeA == _BackEdgeA.first)
+      return _BackEdgeB.first;
+    if(iEdgeA == _BackEdgeB.first)
+      return _BackEdgeA.first;
+    return 0;
+  }
+  
+  /* iterators access */
+  virtual edge_iterator edges_begin();
+  virtual const_edge_iterator edges_begin() const;
+  virtual edge_iterator edges_end();
+  virtual const_edge_iterator edges_end() const;
+  virtual edge_iterator edges_iterator(ViewEdge *iEdge);
+  virtual const_edge_iterator edges_iterator(ViewEdge *iEdge) const;
+
+  /*! Returns an iterator over the ViewEdges that goes to or comes from
+   *  this ViewVertex pointing to the first ViewEdge of the list.
+   *  The orientedViewEdgeIterator allows to iterate in CCW order over these ViewEdges
+   *  and to get the orientation for each ViewEdge (incoming/outgoing).
+   */
+  virtual ViewVertexInternal::orientedViewEdgeIterator edgesBegin() ;
+  /*! Returns an orientedViewEdgeIterator over the ViewEdges around this ViewVertex,
+   *  pointing after the last ViewEdge.
+   */
+  virtual ViewVertexInternal::orientedViewEdgeIterator edgesEnd() ;
+  /*! Returns an orientedViewEdgeIterator pointing to the ViewEdge
+   *  given as argument.
+   */
+  virtual ViewVertexInternal::orientedViewEdgeIterator edgesIterator(ViewEdge *iEdge) ;
+};
+
+
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             NonTVertex         */ 
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+
+// (non T vertex)
+/*! View vertex for corners, cusps, etc...
+ *  Associated to a single SVertex.
+ *  Can be associated to 2 or several view edges
+ */
+class LIB_VIEW_MAP_EXPORT NonTVertex : public ViewVertex
+{
+public:
+  typedef vector<directedViewEdge> edges_container;
+
+public: // Implementation of Interface0D
+
+  /*! Returns the string "ViewVertex" .*/
+  virtual string getExactTypeName() const {
+    return "NonTVertex";
+  }
+
+  // Data access methods
+  /*! Returns the 3D x coordinate of the vertex .*/
+  virtual real getX() const {
+    return _SVertex->point3D().x();
+  }
+  /*! Returns the 3D y coordinate of the vertex .*/
+  virtual real getY() const {
+    return _SVertex->point3D().y();
+  }
+
+  /*! Returns the 3D z coordinate of the vertex .*/
+  virtual real getZ() const {
+    return _SVertex->point3D().z();
+  }
+
+  /*!  Returns the 3D point. */ 
+  virtual Vec3f getPoint3D() const {
+    return _SVertex->getPoint3D();
+  }
+
+  /*! Returns the projected 3D  x coordinate of the vertex .*/
+  virtual real getProjectedX() const {
+    return _SVertex->point2D().x();
+  }
+
+  /*! Returns the projected 3D  y coordinate of the vertex .*/
+  virtual real getProjectedY() const {
+    return _SVertex->point2D().y();
+  }
+
+  /*! Returns the projected 3D  z coordinate of the vertex .*/
+  virtual real getProjectedZ() const {
+    return _SVertex->point2D().z();
+  }
+
+  /*!  Returns the 2D point. */ 
+  virtual Vec2f getPoint2D() const {
+    return _SVertex->getPoint2D();
+  }
+
+  /*! Returns the Id of the vertex .*/
+  virtual Id getId() const {
+    return _SVertex->getId();
+  }
+
+  /*! Cast the Interface0D in SVertex if it can be. */ 
+  virtual SVertex * castToSVertex(){
+    return _SVertex;
+  }
+
+  /*! Cast the Interface0D in ViewVertex if it can be. */ 
+  virtual ViewVertex * castToViewVertex(){
+    return this;
+  }
+
+  /*! Cast the Interface0D in NonTVertex if it can be. */ 
+  virtual NonTVertex * castToNonTVertex(){
+    return this;
+  }
+
+private:
+  SVertex *_SVertex;
+  edges_container _ViewEdges; 
+public:
+  /*! Default constructor.*/
+  inline NonTVertex() : ViewVertex(Nature::NON_T_VERTEX) { _SVertex = 0; }
+  /*! Builds a NonTVertex from a SVertex. */
+  inline NonTVertex(SVertex* iSVertex) : ViewVertex(Nature::NON_T_VERTEX)
+  {
+    _SVertex = iSVertex;
+    _SVertex->SetViewVertex(this);
+  }
+protected:
+  /*! Copy constructor. */
+  inline NonTVertex(NonTVertex& iBrother)
+    : ViewVertex(iBrother)
+  {
+    _SVertex = iBrother._SVertex;
+    _SVertex->SetViewVertex(this);
+    _ViewEdges = iBrother._ViewEdges;
+  }
+  /*! Cloning method. */
+  virtual ViewVertex * dupplicate()
+  {
+    NonTVertex *clone = new NonTVertex(*this);
+    return clone;
+  }
+public:
+  /*! destructor. */
+  virtual ~NonTVertex() {}
+  
+  /* accessors */
+  /*! Returns the SVertex on top of which this NonTVertex is built. */
+  inline SVertex * svertex() {return _SVertex;}
+  inline edges_container& viewedges() {return _ViewEdges;}
+  
+  /* modifiers */
+  /*! Sets the SVertex on top of which this NonTVertex is built. */
+  inline void SetSVertex(SVertex *iSVertex) {_SVertex = iSVertex;_SVertex->SetViewVertex(this);}
+  inline void SetViewEdges(const vector<directedViewEdge>& iViewEdges) {_ViewEdges = iViewEdges;}
+  void AddIncomingViewEdge(ViewEdge * iVEdge) ;
+  void AddOutgoingViewEdge(ViewEdge * iVEdge) ;
+  inline void AddViewEdge(ViewEdge * iVEdge, bool incoming=true) {
+    if(incoming)
+      AddIncomingViewEdge(iVEdge);
+    else
+      AddOutgoingViewEdge(iVEdge);
+  }
+  /* Replaces old edge by new edge */
+  virtual void Replace(ViewEdge *iOld, ViewEdge *iNew)
+  {
+    
+      edges_container::iterator insertedve;
+      for(edges_container::iterator ve=_ViewEdges.begin(),vend=_ViewEdges.end();
+      ve!=vend;
+      ve++)
+      {
+        if((ve)->first == iOld)
+        {
+          insertedve = _ViewEdges.insert(ve, directedViewEdge(iNew, ve->second));// inserts e2 before ve.
+                                              // returns an iterator pointing toward e2. ve is invalidated.
+          // we want to remove e1, but we can't use ve anymore:
+          insertedve++; // insertedve points now to e1
+          _ViewEdges.erase(insertedve);
+          return;
+        }
+      } 
+  }    
+
+  
+  /* iterators access */
+  virtual edge_iterator edges_begin();
+  virtual const_edge_iterator edges_begin() const;
+  virtual edge_iterator edges_end();
+  virtual const_edge_iterator edges_end() const;
+  virtual edge_iterator edges_iterator(ViewEdge *iEdge);
+  virtual const_edge_iterator edges_iterator(ViewEdge *iEdge) const;
+
+  /*! Returns an iterator over the ViewEdges that goes to or comes from
+   *  this ViewVertex pointing to the first ViewEdge of the list.
+   *  The orientedViewEdgeIterator allows to iterate in CCW order over these ViewEdges
+   *  and to get the orientation for each ViewEdge (incoming/outgoing).
+   */
+  virtual ViewVertexInternal::orientedViewEdgeIterator edgesBegin() ;
+  /*! Returns an orientedViewEdgeIterator over the ViewEdges around this ViewVertex,
+   *  pointing after the last ViewEdge.
+   */
+  virtual ViewVertexInternal::orientedViewEdgeIterator edgesEnd() ;
+  /*! Returns an orientedViewEdgeIterator pointing to the ViewEdge
+   *  given as argument.
+   */
+  virtual ViewVertexInternal::orientedViewEdgeIterator edgesIterator(ViewEdge *iEdge) ;
+};
+
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             ViewEdge           */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+/* Geometry(normals...)
+  Nature of edges
+  2D spaces (1or2, material, z...)
+  Parent Shape
+  3D Shading, material
+  Importance
+  Occluders
+  */
+class ViewShape;
+
+namespace ViewEdgeInternal {
+  template<class Traits> class edge_iterator_base ;
+  template<class Traits> class fedge_iterator_base ;
+  template<class Traits> class vertex_iterator_base ;
+} // end of namespace ViewEdgeInternal
+
+/*! Class defining a ViewEdge. A ViewEdge in an edge
+ *  of the image graph. it connnects two ViewVertex.
+ *  It is made by connecting a set of FEdges.
+ */
+class LIB_VIEW_MAP_EXPORT ViewEdge : public Interface1D
+{
+public: // Implementation of Interface0D
+
+  /*! Returns the string "ViewEdge" .*/
+  virtual string getExactTypeName() const {
+    return "ViewEdge";
+  }
+
+  // Data access methods
+  /*! Returns the Id of the vertex .*/
+  virtual Id getId() const {
+    return _Id;
+  }
+
+  /*! Returns the nature of the ViewEdge. */
+  virtual Nature::EdgeNature getNature() const {
+    return _Nature;
+  }
+
+public:
+  
+  typedef SVertex vertex_type;
+  friend class ViewShape;
+  // for ViewEdge iterator
+  typedef ViewEdgeInternal::edge_iterator_base<Nonconst_traits<ViewEdge*> > edge_iterator;
+  typedef ViewEdgeInternal::edge_iterator_base<Const_traits<ViewEdge*> > const_edge_iterator;
+  // for fedge iterator
+  typedef ViewEdgeInternal::fedge_iterator_base<Nonconst_traits<FEdge*> > fedge_iterator;
+  typedef ViewEdgeInternal::fedge_iterator_base<Const_traits<FEdge*> > const_fedge_iterator;
+  // for svertex iterator
+  typedef ViewEdgeInternal::vertex_iterator_base<Nonconst_traits<SVertex*> > vertex_iterator;
+  typedef ViewEdgeInternal::vertex_iterator_base<Const_traits<SVertex*> > const_vertex_iterator;
+private:
+
+  ViewVertex * __A; // edge starting vertex
+  ViewVertex * __B; // edge ending vertex
+  Nature::EdgeNature _Nature; // nature of view edge
+  ViewShape *_Shape; // shape to which the view edge belongs
+  FEdge * _FEdgeA; // first edge of the embedded fedges chain
+  FEdge * _FEdgeB; // last edge of the embedded fedges chain
+  Id _Id;
+  unsigned _ChainingTimeStamp;
+  ViewShape *_aShape; // The silhouette view edge separates 2 2D spaces. The one on the left is 
+  // necessarly the Shape _Shape (the one to which this edge belongs to)
+  // and _aShape is the one on its right // NON GERE PAR LE COPY CONSTRUCTEUR
+  int _qi;
+  vector<ViewShape*> _Occluders;
+
+  // tmp
+  Id * _splittingId;
+
+public:
+  /*! A field that can be used by the user to store any data.
+   *  This field must be reseted afterwards using ResetUserData().
+   */
+  void * userdata;
+  /*! Default constructor.*/
+  inline ViewEdge() {
+    __A=0;
+    __B=0;
+    _FEdgeA = 0;
+    _FEdgeB = 0;
+    _ChainingTimeStamp = 0;
+    _qi = 0;
+    _aShape=0;
+    userdata = 0;
+    _splittingId = 0;
+  }
+  inline ViewEdge(ViewVertex* iA, ViewVertex *iB)
+  {
+    __A = iA;
+    __B = iB;
+    _FEdgeA = 0;
+    _FEdgeB = 0;
+    _Shape = 0;
+    _ChainingTimeStamp = 0;
+    _aShape = 0;
+    _qi = 0;
+    userdata = 0;
+    _splittingId = 0;
+  }
+  inline ViewEdge(ViewVertex* iA, ViewVertex *iB, FEdge *iFEdgeA)
+  {
+    __A = iA;
+    __B = iB;
+    _FEdgeA = iFEdgeA;
+    _FEdgeB = 0;
+    _Shape = 0;
+    _ChainingTimeStamp = 0;
+    _aShape = 0;
+    _qi = 0;
+    userdata = 0;
+    _splittingId = 0;
+  }
+  inline ViewEdge(ViewVertex* iA, ViewVertex *iB, FEdge *iFEdgeA, FEdge *iFEdgeB, ViewShape *iShape)
+  {
+    __A = iA;
+    __B = iB;
+    _FEdgeA = iFEdgeA;
+    _FEdgeB = iFEdgeB;
+    _Shape = iShape;
+    _ChainingTimeStamp = 0;
+    _aShape = 0;
+    _qi = 0;
+    userdata = 0;
+    _splittingId = 0;
+    UpdateFEdges(); // tells every FEdge between iFEdgeA and iFEdgeB that this is theit ViewEdge
+  }
+protected:
+  /*! Copy constructor. */
+  inline ViewEdge(ViewEdge& iBrother)
+  {
+    __A = iBrother.__A;
+    __B = iBrother.__B;
+    _FEdgeA = iBrother._FEdgeA;
+    _FEdgeB = iBrother._FEdgeB;
+    _Nature = iBrother._Nature;
+    _Shape = 0;
+    _Id = iBrother._Id;
+    _ChainingTimeStamp = iBrother._ChainingTimeStamp;
+    _aShape = iBrother._aShape;
+    _qi = iBrother._qi;
+    _splittingId = 0;
+    iBrother.userdata = this;
+    userdata = 0;
+  }
+  /*! Cloning method. */
+  virtual ViewEdge * dupplicate()
+  {
+    ViewEdge *clone = new ViewEdge(*this);
+    return clone;
+  }
+
+public:
+  /*! Destructor. */
+  virtual ~ViewEdge()
+  {
+    //    if(0 != _aFace)
+    //    {
+    //      delete _aFace;
+    //      _aFace = 0;
+    //    }
+    // only the last splitted deletes this id
+    if(_splittingId){
+      if(*_splittingId == _Id)
+        delete _splittingId;
+    }
+  }
+
+  /* accessors */
+  /*! Returns the first ViewVertex. */
+  inline  ViewVertex* A()  {return __A;}
+  /*! Returns the second ViewVertex. */
+  inline  ViewVertex* B()  {return __B;}
+  /*! Returns the first FEdge that constitues this ViewEdge. */
+  inline  FEdge* fedgeA()  {return _FEdgeA;}
+  /*! Returns the last FEdge that constitues this ViewEdge. */
+  inline  FEdge* fedgeB()  {return _FEdgeB;}
+  /*! Returns the ViewShape to which this ViewEdge belongs to .*/
+  inline ViewShape * viewShape() {return _Shape;}
+  /*! Returns the shape that is occluded by the ViewShape
+   *  to which this ViewEdge belongs to. If no object is occluded,
+   *  0 is returned.
+   *  \return The occluded ViewShape.
+   */
+  inline ViewShape * aShape() {return _aShape;}
+  /*! Tells whether this ViewEdge forms a closed loop
+   *  or not.
+   */
+  inline bool isClosed() 
+  {
+    if(__B == 0)
+      return true;
+    return false;
+  }
+  /*! Returns the time stamp of this ViewEdge. */
+  inline unsigned getChainingTimeStamp() {return _ChainingTimeStamp;}
+  inline const ViewShape * aShape() const {return _aShape;}
+  inline const ViewShape * bShape() const {return _Shape;}
+  inline vector<ViewShape*>& occluders() {return _Occluders;}
+  inline Id * splittingId() {return _splittingId;}
+  
+  /* modifiers */
+  /*! Sets the first ViewVertex of the ViewEdge. */
+  inline void SetA(ViewVertex* iA) { __A = iA; }
+  /*! Sets the last ViewVertex of the ViewEdge. */
+  inline void SetB(ViewVertex* iB) { __B = iB; }
+  /*! Sets the nature of the ViewEdge. */
+  inline void SetNature(Nature::EdgeNature iNature) { _Nature = iNature; }
+  /*! Sets the first FEdge of the ViewEdge. */
+  inline void SetFEdgeA(FEdge* iFEdge) { _FEdgeA = iFEdge; }
+  /*! Sets the last FEdge of the ViewEdge. */
+  inline void SetFEdgeB(FEdge* iFEdge) { _FEdgeB = iFEdge; }
+  /*! Sets the ViewShape to which this ViewEdge belongs to.*/
+  inline void SetShape(ViewShape *iVShape) 
+  {
+    _Shape = iVShape;
+  }
+  /*! Sets the ViewEdge id. */
+  inline void SetId(const Id& id) {_Id = id;}
+  /*! Sets Viewedge to this for all embedded fedges */
+  void UpdateFEdges();
+  /*! Sets the occluded ViewShape */
+  inline void SetaShape(ViewShape * iShape) {_aShape = iShape;}
+  /*! Sets the quantitative invisibility value. */
+  inline void SetQI(int qi) {_qi = qi;}
+  /*! Sets the time stamp value. */
+  inline void setChainingTimeStamp(unsigned ts) {_ChainingTimeStamp = ts;}
+  inline void AddOccluder(ViewShape *iShape) {_Occluders.push_back(iShape);}
+  inline void setSplittingId(Id * id) {_splittingId = id;}
+
+  /* stroke interface definition */
+  inline bool intersect_2d_area(const Vec2r& iMin, const Vec2r& iMax) const
+  {
+    // parse edges to check if one of them is intersection the region:
+    FEdge * current = _FEdgeA;
+    do
+    {
+      if(GeomUtils::intersect2dSeg2dArea(iMin,iMax, 
+					 Vec2r(current->vertexA()->point2D()[0],current->vertexA()->point2D()[1]),
+					 Vec2r(current->vertexB()->point2D()[0],current->vertexB()->point2D()[1])))
+      
+        return true;
+      current = current->nextEdge();
+    }while((current != 0) && (current != _FEdgeA));
+
+    return false;
+  }
+  inline bool include_in_2d_area(const Vec2r& iMin, const Vec2r& iMax) const
+  {
+    // parse edges to check if all of them are intersection the region:
+    FEdge * current = _FEdgeA;
+    
+    do
+    {
+      if(!GeomUtils::include2dSeg2dArea(iMin,iMax, 
+					Vec2r(current->vertexA()->point2D()[0],current->vertexA()->point2D()[1]),
+					Vec2r(current->vertexB()->point2D()[0],current->vertexB()->point2D()[1])))
+        return false;
+      current = current->nextEdge();
+    }while((current != 0) && (current != _FEdgeA));
+    
+    return true;
+  }
+
+  /* Information access interface */
+  
+  //inline Nature::EdgeNature viewedge_nature() const {return getNature();}
+  //float viewedge_length() const ;
+  /*! Returns the 2D length of the Viewedge. */
+  real getLength2D() const;
+  //inline Material material() const {return _FEdgeA->vertexA()->shape()->material();}
+  inline int qi() const {return _qi;}
+  inline occluder_container::const_iterator occluders_begin() const {return _Occluders.begin();}
+  inline occluder_container::const_iterator occluders_end() const {return _Occluders.end();}
+  inline int occluders_size() const {return _Occluders.size();}
+  inline bool occluders_empty() const {return _Occluders.empty();}
+  inline const Polygon3r& occludee() const {return (_FEdgeA->aFace());}
+  inline const SShape * occluded_shape() const ;
+  inline const bool occludee_empty() const {if(_aShape == 0) return true; return false;}
+  //inline real z_discontinuity(int iCombination = 0) const ;
+  inline Id shape_id() const {return _FEdgeA->vertexA()->shape()->getId();}
+  inline const SShape * shape() const {return _FEdgeA->vertexA()->shape();}
+  inline float shape_importance() const {return _FEdgeA->shape_importance();} 
+
+  /* iterators access */
+  // view edge iterator
+  edge_iterator ViewEdge_iterator();
+  const_edge_iterator ViewEdge_iterator() const;
+  // feature edge iterator
+  fedge_iterator fedge_iterator_begin();
+  const_fedge_iterator fedge_iterator_begin() const;
+  fedge_iterator fedge_iterator_last();
+  const_fedge_iterator fedge_iterator_last() const;
+  fedge_iterator fedge_iterator_end();
+  const_fedge_iterator fedge_iterator_end() const;
+  // embedding vertex iterator
+  const_vertex_iterator vertices_begin() const;
+  vertex_iterator vertices_begin();
+  const_vertex_iterator vertices_last() const;
+  vertex_iterator vertices_last();
+  const_vertex_iterator vertices_end() const;
+  vertex_iterator vertices_end();
+
+  // Iterator access (Interface1D)
+  /*! Returns an Interface0DIterator to iterate over
+   *  the SVertex constituing the embedding of this ViewEdge.
+   *  The returned Interface0DIterator points to the first
+   *  SVertex of the ViewEdge.
+   */
+  virtual Interface0DIterator verticesBegin();
+  /*! Returns an Interface0DIterator to iterate over
+   *  the SVertex constituing the embedding of this ViewEdge.
+   *  The returned Interface0DIterator points after the last
+   *  SVertex of the ViewEdge.
+   */
+  virtual Interface0DIterator verticesEnd();
+
+  /*! Returns an Interface0DIterator to iterate over
+   *  the points of this ViewEdge at a given resolution.
+   *  The returned Interface0DIterator points on the first
+   *  Point of the ViewEdge.
+   *  \param t
+   *    the sampling value.
+   */
+  virtual Interface0DIterator pointsBegin(float t=0.f);
+  /*! Returns an Interface0DIterator to iterate over
+   *  the points of this ViewEdge at a given resolution.
+   *  The returned Interface0DIterator points after the last
+   *  Point of the ViewEdge.
+   *  \param t
+   *    the sampling value.
+   */
+  virtual Interface0DIterator pointsEnd(float t=0.f);
+};
+
+  
+
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             ViewShape          */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+/*! Class gathering the elements of the ViewMap (ViewVertex, ViewEdge)
+ *  that are issued from the same input shape.
+ */
+class LIB_VIEW_MAP_EXPORT ViewShape
+{
+private:
+  vector<ViewVertex*> _Vertices;
+  vector<ViewEdge*> _Edges;
+  SShape * _SShape;
+  
+
+public:
+  /*! A field that can be used by the user to store any data.
+   *  This field must be reseted afterwards using ResetUserData().
+   */
+  void* userdata;
+  /*! Default constructor.*/
+  inline ViewShape() { userdata = 0; _SShape = 0;}
+  /*! Builds a ViewShape from a SShape. */
+  inline ViewShape(SShape *iSShape) {userdata = 0; _SShape = iSShape;}//_SShape->SetViewShape(this);}
+  /*! Copy constructor. */
+  inline ViewShape(ViewShape& iBrother)
+  {
+    userdata = 0;
+    vector<ViewVertex*>::iterator vv,vvend;
+    vector<ViewEdge*>::iterator ve, veend;
+
+    _SShape = iBrother._SShape;
+
+    vector<ViewVertex*>& vvertices = iBrother.vertices();
+    // dupplicate vertices
+    for(vv=vvertices.begin(), vvend=vvertices.end();
+    vv!=vvend;
+    vv++)
+    {
+      ViewVertex * newVertex = (*vv)->dupplicate();
+      AddVertex(newVertex);
+    }
+
+    vector<ViewEdge*>& vvedges = iBrother.edges();
+    // dupplicate edges
+    for(ve=vvedges.begin(), veend=vvedges.end();
+    ve!=veend;
+    ve++)
+    {
+      ViewEdge * newEdge = (*ve)->dupplicate();
+      AddEdge(newEdge); // here the shape is set as the edge's shape
+    }
+
+    //-------------------------
+    // remap edges in vertices:
+    //-------------------------
+    for(vv=_Vertices.begin(), vvend=_Vertices.end();
+    vv!=vvend;
+    vv++)
+    {
+      switch((*vv)->getNature())
+      {  
+      case Nature::T_VERTEX:
+        {
+          TVertex *v = (TVertex*)(*vv);
+          ViewEdge *veFrontA = (ViewEdge*)(v)->frontEdgeA().first->userdata;
+          ViewEdge *veFrontB = (ViewEdge*)(v)->frontEdgeB().first->userdata;
+          ViewEdge *veBackA = (ViewEdge*)(v)->backEdgeA().first->userdata;
+          ViewEdge *veBackB = (ViewEdge*)(v)->backEdgeB().first->userdata;
+
+          v->SetFrontEdgeA(veFrontA, v->frontEdgeA().second);
+          v->SetFrontEdgeB(veFrontB, v->frontEdgeB().second);
+          v->SetBackEdgeA(veBackA, v->backEdgeA().second);
+          v->SetBackEdgeB(veBackB, v->backEdgeB().second);
+        }
+        break;
+      case Nature::NON_T_VERTEX:
+        {
+          NonTVertex * v = (NonTVertex*)(*vv);
+          vector<ViewVertex::directedViewEdge>& vedges = (v)->viewedges();
+          vector<ViewVertex::directedViewEdge> newEdges;
+          for(vector<ViewVertex::directedViewEdge>::iterator ve=vedges.begin(), veend=vedges.end();
+          ve!=veend;
+          ve++)
+          {
+            ViewEdge *current = (ViewEdge*)((ve)->first)->userdata;
+            newEdges.push_back(ViewVertex::directedViewEdge(current, ve->second));
+          }
+          (v)->SetViewEdges(newEdges);
+        }
+        break;
+      default:
+	;
+      }
+    }
+    
+    //-------------------------------------
+    // remap vertices in edges:
+    //-------------------------------------
+    for(ve=_Edges.begin(),veend=_Edges.end();
+        ve!=veend;
+        ve++)
+      {
+        (*ve)->SetA((ViewVertex*)((*ve)->A()->userdata));
+        (*ve)->SetB((ViewVertex*)((*ve)->B()->userdata));
+        //---------------------------------------
+        // Update all embedded FEdges
+        //---------------------------------------
+        (*ve)->UpdateFEdges();
+      }
+    
+    
+    // reset all brothers userdata to NULL:
+    //-------------------------------------
+    //---------
+    // vertices
+    //---------
+    for(vv=vvertices.begin(),vvend=vvertices.end();
+        vv!=vvend;
+        vv++)
+      {
+        (*vv)->userdata = NULL;
+      }
+
+    //------
+    // edges
+    //------
+    for(ve=vvedges.begin(),veend=vvedges.end();
+        ve!=veend;
+        ve++)
+      {
+        (*ve)->userdata = NULL;
+      }  
+  }
+
+  /*! Cloning method. */
+  virtual ViewShape * dupplicate()
+  {
+    ViewShape *clone = new ViewShape(*this);
+    return clone;
+  }
+
+  /*! Destructor. */
+  virtual ~ViewShape();
+
+  /* splits a view edge into several view edges. 
+   *    fe
+   *      The FEdge that gets splitted
+   *    iViewVertices
+   *      The view vertices corresponding to the different intersections for the edge fe.
+   *      This list need to be sorted such as the first view vertex is the 
+   *      farther away from fe->vertexA.
+   *    ioNewEdges
+   *      The feature edges that are newly created (the initial edges are not 
+   *      included) are added to this list.
+   *    ioNewViewEdges
+   *      The view edges that are newly created (the initial edges are not 
+   *      included) are added to this list.  
+   */
+  inline void SplitEdge(FEdge *fe, 
+                        const vector<TVertex*>& iViewVertices, 
+                        vector<FEdge*>& ioNewEdges,
+                        vector<ViewEdge*>& ioNewViewEdges);
+  /* accessors */
+  /*! Returns the SShape on top of which this ViewShape is built. */
+  inline  SShape * sshape()  {return _SShape;}
+    /*! Returns the SShape on top of which this ViewShape is built. */
+  inline  const SShape * sshape() const {return _SShape;}
+  /*! Returns the list of ViewVertex contained in this ViewShape. */
+  inline  vector<ViewVertex*>& vertices() {return _Vertices;}
+  /*! Returns the list of ViewEdge contained in this ViewShape. */
+  inline  vector<ViewEdge*>& edges() {return _Edges;}
+  /*! Returns the ViewShape id. */
+  inline  Id getId() const {return _SShape->getId();}
+
+  /* modifiers */
+  /*! Sets the SShape on top of which the ViewShape is built. */
+  inline void SetSShape(SShape* iSShape) {_SShape = iSShape;}
+  /*! Sets the list of ViewVertex contained in this ViewShape. */
+  inline void SetVertices(const vector<ViewVertex*>& iVertices) {_Vertices = iVertices;}
+  /*! Sets the list of ViewEdge contained in this ViewShape. */
+  inline void SetEdges(const vector<ViewEdge*>& iEdges) {_Edges = iEdges;}
+  /*! Adds a ViewVertex to the list. */
+  inline void AddVertex(ViewVertex *iVertex) 
+  {
+    _Vertices.push_back(iVertex);
+    //_SShape->AddNewVertex(iVertex->svertex());
+  }
+  /*! Adds a ViewEdge to the list */
+  inline void AddEdge(ViewEdge *iEdge) 
+  {
+    _Edges.push_back(iEdge);
+    iEdge->SetShape(this);
+    //_SShape->AddNewEdge(iEdge->fedge());
+  }
+
+  /* removes the view edge iViewEdge in the 
+   *  View Shape and the associated FEdge chain entry
+   *  in the underlying SShape 
+   */
+  void RemoveEdge(ViewEdge * iViewEdge);
+
+  /* removes the view vertex iViewVertex in the 
+   *  View Shape.
+   */
+  void RemoveVertex(ViewVertex * iViewVertex);
+};
+
+
+
+/*
+  
+  #############################################
+  #############################################
+  #############################################
+  ######                                 ######
+  ######   I M P L E M E N T A T I O N   ######
+  ######                                 ######
+  #############################################
+  #############################################
+  #############################################
+  
+*/
+/* for inline functions */
+
+void ViewShape::SplitEdge(FEdge *fe, 
+                        const vector<TVertex*>& iViewVertices, 
+                        vector<FEdge*>& ioNewEdges,
+                        vector<ViewEdge*>& ioNewViewEdges)
+{ 
+    ViewEdge *vEdge = fe->viewedge();
+
+    
+    // We first need to sort the view vertices from farther to closer to fe->vertexA
+    
+    SVertex *sv, *sv2; 
+    ViewVertex *vva, *vvb;
+    vector<TVertex*>::const_iterator vv, vvend;
+    for(vv=iViewVertices.begin(), vvend = iViewVertices.end();
+    vv!=vvend;
+    vv++)
+    {
+      // Add the viewvertices to the ViewShape
+      AddVertex((*vv));
+      
+      // retrieve the correct SVertex from the view vertex
+      //--------------------------------------------------
+      sv = (*vv)->frontSVertex();
+      sv2 = (*vv)->backSVertex();
+
+      if(sv->shape() != sv2->shape())
+      {
+        if(sv->shape() != _SShape)
+          sv = sv2;
+      }
+      else
+      {
+        // if the shape is the same we can safely differ 
+        // the two vertices using their ids:
+        if(sv->getId() != fe->vertexA()->getId())
+          sv = sv2;
+      }
+      
+      vva = vEdge->A();
+      vvb = vEdge->B();
+      
+      // We split Fedge AB into AA' and A'B. A' and A'B are created.
+      // AB becomes (address speaking) AA'. B is updated.
+      //--------------------------------------------------
+      SShape * shape = fe->shape();
+      
+      // a new edge, A'B is created.
+      FEdge *newEdge = shape->SplitEdgeIn2(fe, sv);
+
+      ioNewEdges.push_back(newEdge);
+      ViewEdge *newVEdge;
+
+      if((vva == 0) || (vvb == 0)) // that means we're dealing with a closed viewedge (loop)
+      {
+        // remove the chain that was starting by the fedge A of vEdge (which is different from fe !!!!)
+        shape->RemoveEdgeFromChain(vEdge->fedgeA());
+        // we set 
+        vEdge->SetA(*vv);
+        vEdge->SetB(*vv);
+        vEdge->SetFEdgeA(newEdge);
+        //FEdge *previousEdge = newEdge->previousEdge();  
+        vEdge->SetFEdgeB(fe);
+        newVEdge = vEdge;
+        vEdge->fedgeA()->SetViewEdge(newVEdge);
+      }
+      else
+      {
+        
+        // while we create the view edge, it updates the "ViewEdge" pointer 
+        // of every underlying FEdges to this.
+        newVEdge = new ViewEdge((*vv),vvb);//, newEdge, vEdge->fedgeB());
+        newVEdge->SetNature((fe)->getNature());
+        newVEdge->SetFEdgeA(newEdge);
+        //newVEdge->SetFEdgeB(fe);
+        // If our original viewedge is made of one FEdge, 
+        // then 
+        if((vEdge->fedgeA() == vEdge->fedgeB()) || (fe == vEdge->fedgeB()))
+          newVEdge->SetFEdgeB(newEdge);
+        else
+          newVEdge->SetFEdgeB(vEdge->fedgeB()); //MODIF
+
+        Id * newId = vEdge->splittingId();
+        if(newId == 0){
+          newId = new Id(vEdge->getId());
+          vEdge->setSplittingId(newId);
+        }
+        newId->setSecond(newId->getSecond()+1);
+        newVEdge->SetId(*newId);
+        newVEdge->setSplittingId(newId);
+        //        Id id(vEdge->getId().getFirst(), vEdge->getId().getSecond()+1);
+        //        newVEdge->SetId(vEdge->getId());
+        //        vEdge->SetId(id);
+        
+        AddEdge(newVEdge); // here this shape is set as the edge's shape
+      
+        // add new edge to the list of new edges passed as argument:
+        ioNewViewEdges.push_back(newVEdge);
+
+      
+        
+        if(0 != vvb) 
+          vvb->Replace((vEdge), newVEdge);
+
+        // we split the view edge:
+        vEdge->SetB((*vv));
+        vEdge->SetFEdgeB(fe); //MODIF
+      
+        // Update fedges so that they point to the new viewedge:
+        newVEdge->UpdateFEdges();
+
+      }
+      // check whether this vertex is a front vertex or a back
+      // one
+      
+      if(sv == (*vv)->frontSVertex())
+      { 
+        // -- View Vertex A' --
+        (*vv)->SetFrontEdgeA(vEdge, true);
+        (*vv)->SetFrontEdgeB(newVEdge, false);
+      }
+      else
+      {
+        // -- View Vertex A' --
+        (*vv)->SetBackEdgeA(vEdge, true);
+        (*vv)->SetBackEdgeB(newVEdge, false);
+      }
+    }
+} 
+    
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             ViewEdge           */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+                  
+// inline Vec3r ViewEdge::orientation2d(int iCombination) const
+// {
+//  return edge_orientation2d_function<ViewEdge>(*this, iCombination);
+// }
+
+// inline Vec3r  ViewEdge::orientation3d(int iCombination) const
+// {
+//  return edge_orientation3d_function<ViewEdge>(*this, iCombination);
+// }
+
+// inline real ViewEdge::z_discontinuity(int iCombination) const 
+// {
+//   return z_discontinuity_edge_function<ViewEdge>(*this, iCombination);
+// }
+
+// inline float ViewEdge::local_average_depth(int iCombination ) const
+// {
+//   return local_average_depth_edge_function<ViewEdge>(*this, iCombination);
+// }
+
+// inline float ViewEdge::local_depth_variance(int iCombination) const 
+// {
+//   return local_depth_variance_edge_function<ViewEdge>(*this, iCombination);
+// }
+
+// inline real ViewEdge::local_average_density(float sigma, int iCombination) const 
+// {
+//   return density_edge_function<ViewEdge>(*this, iCombination);
+// }
+
+inline const SShape * ViewEdge::occluded_shape() const 
+{
+  if(0 == _aShape)
+    return 0;
+  return _aShape->sshape();
+}  
+
+// inline Vec3r ViewEdge::curvature2d_as_vector(int iCombination) const 
+// {
+//   return curvature2d_as_vector_edge_function<ViewEdge>(*this, iCombination);
+// }
+
+// inline real ViewEdge::curvature2d_as_angle(int iCombination) const 
+// {
+//   return curvature2d_as_angle_edge_function<ViewEdge>(*this, iCombination);
+// }
+
+
+#endif // VIEWMAP_H
diff --git a/extern/freestyle/src/view_map/ViewMapAdvancedIterators.h b/extern/freestyle/src/view_map/ViewMapAdvancedIterators.h
new file mode 100755
index 00000000000..bb2d916f2df
--- /dev/null
+++ b/extern/freestyle/src/view_map/ViewMapAdvancedIterators.h
@@ -0,0 +1,691 @@
+//
+//  Filename         : ViewMapAdvancedIterators.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Iterators used to iterate over the various elements of the ViewMap
+//                     These iterators can't be exported to python.
+//  Date of creation : 01/07/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  VIEWMAPADVANCEDITERATORS_H
+# define VIEWMAPADVANCEDITERATORS_H
+
+#include "ViewMap.h"
+
+
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             ViewMap            */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             ViewVertex         */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+namespace ViewVertexInternal{
+
+  class edge_const_traits : public Const_traits< ::ViewVertex::directedViewEdge> {
+  public:
+     typedef vector< ::ViewVertex::directedViewEdge> edges_container;
+    typedef edges_container::const_iterator edges_container_iterator ;
+    typedef vector< ::ViewVertex::directedViewEdge*> edge_pointers_container;
+    typedef edge_pointers_container::const_iterator edge_pointers_container_iterator ;
+  }; 
+  class edge_nonconst_traits : public Nonconst_traits< ::ViewVertex::directedViewEdge> {
+  public:
+    typedef vector< ::ViewVertex::directedViewEdge> edges_container;
+    typedef edges_container::iterator edges_container_iterator ;
+    typedef vector< ::ViewVertex::directedViewEdge*> edge_pointers_container;
+    typedef edge_pointers_container::iterator edge_pointers_container_iterator ;
+  };
+  
+template<class Traits>
+  class edge_iterator_base : public IteratorBase<Traits,InputIteratorTag_Traits>
+  {
+  public:
+    typedef typename Traits::value_type                       value_type;
+    typedef typename Traits::difference_type                  difference_type;
+    typedef typename Traits::pointer                          pointer;
+    typedef typename Traits::reference                        reference;
+    typedef edge_iterator_base<Traits>  Self;
+    typedef typename Traits::edges_container_iterator  edges_container_iterator;
+    typedef typename Traits::edge_pointers_container_iterator  edge_pointers_container_iterator;
+    typedef edge_iterator_base<edge_nonconst_traits> iterator;
+    typedef edge_iterator_base<edge_const_traits> const_iterator;
+  public:
+    friend class ViewVertex;
+    friend class TVertex;
+    friend class NonTVertex;
+    friend class ViewEdge;
+    friend class edge_iterator;
+  protected:
+    Nature::VertexNature _Nature; // the nature of the underlying vertex
+    // T vertex attributes
+    edge_pointers_container_iterator _tbegin;
+    edge_pointers_container_iterator _tend;
+    edge_pointers_container_iterator _tvertex_iter;
+
+    //    mutable value_type _tvertex_iter;
+    //    value_type _feA;
+    //    value_type _feB;
+    //    value_type _beA;
+    //    value_type _beB;
+
+    // Non TVertex attributes
+    edges_container_iterator _begin;
+    edges_container_iterator _end;
+    edges_container_iterator _nontvertex_iter;
+
+    typedef IteratorBase<Traits,InputIteratorTag_Traits> parent_class;
+
+  public:
+    inline edge_iterator_base() : parent_class() {}
+    inline edge_iterator_base(Nature::VertexNature iNature)
+      : parent_class()
+    {_Nature = iNature;}
+    edge_iterator_base(const edge_iterator_base<edge_nonconst_traits>& iBrother)
+    : parent_class(iBrother)
+    {
+      _Nature = iBrother._Nature;
+      if(_Nature & Nature::T_VERTEX)
+      {
+        //        _feA = iBrother._feA;
+        //        _feB = iBrother._feB;
+        //        _beA = iBrother._beA;
+        //        _beB = iBrother._beB;
+        //        _tvertex_iter = iBrother._tvertex_iter;
+        _tbegin = iBrother._tbegin;
+        _tend = iBrother._tend;
+        _tvertex_iter = iBrother._tvertex_iter;
+      }
+      else
+      {
+        _begin = iBrother._begin;
+        _end = iBrother._end;
+        _nontvertex_iter = iBrother._nontvertex_iter;
+      }
+    }
+    edge_iterator_base(const edge_iterator_base<edge_const_traits>& iBrother)
+      : parent_class(iBrother)
+    {
+      _Nature = iBrother._Nature;
+      if(_Nature & Nature::T_VERTEX)
+      {
+        //        _feA = iBrother._feA;
+        //        _feB = iBrother._feB;
+        //        _beA = iBrother._beA;
+        //        _beB = iBrother._beB;
+        //        _tvertex_iter = iBrother._tvertex_iter;
+        _tbegin = iBrother._tbegin;
+        _tend = iBrother._tend;
+        _tvertex_iter = iBrother._tvertex_iter;
+      }
+      else
+      {
+        _begin = iBrother._begin;
+        _end = iBrother._end;
+        _nontvertex_iter = iBrother._nontvertex_iter;
+      }
+    }
+    virtual ~edge_iterator_base() {}
+  //protected://FIXME
+  public:
+    //    inline edge_iterator_base(value_type ifeA, 
+    //                         value_type ifeB, 
+    //                         value_type ibeA, 
+    //                         value_type ibeB,
+    //                         value_type iter)
+    //      : parent_class()
+    //    {
+    //      _Nature = Nature::T_VERTEX;
+    //      _feA = ifeA;
+    //      _feB = ifeB;
+    //      _beA = ibeA;
+    //      _beB = ibeB;
+    //      _tvertex_iter = iter;
+    //    }
+    inline edge_iterator_base(edge_pointers_container_iterator begin, 
+                         edge_pointers_container_iterator end,
+                         edge_pointers_container_iterator iter)
+                         : parent_class()
+    {
+      _Nature = Nature::T_VERTEX;
+      _tbegin = begin;
+      _tend = end;
+      _tvertex_iter = iter;
+    } 
+    inline edge_iterator_base(edges_container_iterator begin, 
+                         edges_container_iterator end,
+                         edges_container_iterator iter)
+                         : parent_class()
+    {
+      _Nature = Nature::NON_T_VERTEX;
+      _begin = begin;
+      _end = end;
+      _nontvertex_iter = iter;
+    } 
+
+  public:
+
+    
+    virtual bool begin() const 
+    {
+      if(_Nature & Nature::T_VERTEX)
+        return (_tvertex_iter == _tbegin);
+        //return (_tvertex_iter == _feA);
+      else
+        return (_nontvertex_iter == _begin);
+    }
+    virtual bool end() const 
+    {
+      if(_Nature & Nature::T_VERTEX)
+        //return (_tvertex_iter.first == 0);
+        return (_tvertex_iter == _tend);
+      else
+        return (_nontvertex_iter == _end);
+    }
+
+    // operators
+    virtual Self& operator++()  // operator corresponding to ++i
+    { 
+      increment();
+      return *this;
+    }
+    virtual Self operator++(int)  // opérateur correspondant à i++ 
+    {                                  // c.a.d qui renvoie la valeur *puis* incrémente.
+      Self tmp = *this;        // C'est pour cela qu'on stocke la valeur
+      increment();                    // dans un temporaire. 
+      return tmp;
+    } 
+  
+    // comparibility
+    virtual bool operator!=(const Self& b) const
+    {
+      if(_Nature & Nature::T_VERTEX)
+        return (_tvertex_iter != b._tvertex_iter);
+      else
+        return (_nontvertex_iter != b._nontvertex_iter);
+    }
+    
+    virtual bool operator==(const Self& b) const
+    {return !(*this != b);}
+    
+    // dereferencing
+    virtual reference operator*() const
+    {
+      if(_Nature & Nature::T_VERTEX)
+        //return _tvertex_iter;
+        return **_tvertex_iter;
+      else
+        return (*_nontvertex_iter);
+    }
+    virtual pointer operator->() const { return &(operator*());}
+
+  protected:
+    inline void increment()
+    {
+      if(_Nature & Nature::T_VERTEX)
+        {
+        value_type tmp = (**_tvertex_iter);
+        ++_tvertex_iter;
+        value_type tmp2 = (**_tvertex_iter);
+        if(tmp2.first == tmp.first)
+          ++_tvertex_iter;
+        //          // Hack to deal with cusp. the result of a cusp
+        //          // is a TVertex having two identical viewedges.
+        //          // In order to iterate properly, we chose to 
+        //          // to skip these last ones.
+        //          if(_feB.first == _beA.first)
+        //          {
+        //            if(_feA.first == _beB.first)
+        //            {
+        //              _tvertex_iter.first = 0;
+        //              return;
+        //            }
+        //            
+        //            if(_tvertex_iter.first == _feA.first)
+        //              _tvertex_iter.first = _beB.first;
+        //            else if(_tvertex_iter.first == _beB.first)
+        //              _tvertex_iter.first = 0;
+        //            else
+        //              _tvertex_iter.first = _feA.first;
+        //            return;
+        //          }
+        //          if(_feA.first == _beB.first)
+        //          {
+        //            if(_feB.first == _beA.first)
+        //            {
+        //              _tvertex_iter.first = 0;
+        //              return;
+        //            }
+        //            
+        //            if(_tvertex_iter.first == _feB.first)
+        //              _tvertex_iter.first = _beA.first;
+        //            else if(_tvertex_iter.first == _beA.first)
+        //              _tvertex_iter.first = 0;
+        //            else
+        //              _tvertex_iter.first = _feB.first;
+        //            return;
+        //          }
+        //          // End of hack
+        //
+        //          if(_tvertex_iter.first == _feA.first){
+        //            // we return bea or beb 
+        //            
+        //
+        //            // choose one of them
+        //            
+        //              _tvertex_iter.first = _feB.first;
+        //              return;
+        //            }
+        //          if(_tvertex_iter.first == _feB.first)
+        //            {
+        //              _tvertex_iter.first = _beA.first;
+        //              return;
+        //            }
+        //          if(_tvertex_iter.first == _beA.first)
+        //            {
+        //              _tvertex_iter.first = _beB.first;
+        //              return;
+        //            }
+        //          if(_tvertex_iter.first == _beB.first)
+        //            {
+        //              _tvertex_iter.first = 0;
+        //              return;
+        //            }
+        }
+      else
+        ++_nontvertex_iter;
+    }
+  };
+
+  }
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             ViewEdge           */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+namespace ViewEdgeInternal {
+
+  /*!----------------------*/
+  /*! Iterators definition */
+  /*!----------------------*/
+  template<class Traits>
+  class edge_iterator_base : public IteratorBase<Traits,BidirectionalIteratorTag_Traits>
+  {
+  public:
+    typedef typename Traits::value_type                       value_type;
+    typedef typename Traits::difference_type                  difference_type;
+    typedef typename Traits::pointer                          pointer;
+    typedef typename Traits::reference                        reference;
+    typedef edge_iterator_base<Traits>  Self;
+  public:
+    mutable value_type _ViewEdge;
+    //friend class edge_iterator_base<Nonconst_traits<ViewEdge*> >;
+    //friend class edge_iterator_base<Const_traits<ViewEdge*> >;
+    value_type _first;
+    bool _orientation;
+    typedef IteratorBase<Traits,BidirectionalIteratorTag_Traits> parent_class;
+
+  public:
+    friend class ViewEdge;
+    inline edge_iterator_base()
+      : parent_class()
+    {_orientation=true;_first=0;}
+
+    inline edge_iterator_base(const edge_iterator_base<Nonconst_traits< ::ViewEdge*> >& iBrother)
+      : parent_class()
+    {
+      _ViewEdge = iBrother._ViewEdge;
+      _first = iBrother._first;
+      _orientation = iBrother._orientation;
+    }
+
+    inline edge_iterator_base(const edge_iterator_base<Const_traits< ::ViewEdge*> >& iBrother)
+      : parent_class()
+    {
+      _ViewEdge = iBrother._ViewEdge;
+      _first = iBrother._first;
+      _orientation = iBrother._orientation;
+    }
+
+  //protected://FIXME
+  public:
+    inline edge_iterator_base(value_type iEdge, bool orientation = true)
+      : parent_class()
+    {
+      _ViewEdge = iEdge;
+      _first = iEdge;
+      _orientation = orientation;
+    }
+  
+    
+  public:
+    virtual Self* clone() const 
+    {
+      return new edge_iterator_base(*this);
+    }
+    virtual ~edge_iterator_base() {}
+
+  public:
+    
+    virtual bool orientation() {return _orientation;}
+    virtual void set_edge(value_type iVE) {_ViewEdge=iVE;}
+    virtual void set_orientation(bool iOrientation) {_orientation = iOrientation;}
+    virtual void change_orientation() {_orientation = !_orientation;}
+    
+    // operators
+    inline Self& operator++()  // operator corresponding to ++i
+    { 
+      //++_ViewEdge->getTimeStamp();
+      increment();
+      return *this;
+    }
+    inline Self operator++(int)  // opérateur correspondant à i++ 
+    {                                  // c.a.d qui renvoie la valeur *puis* incrémente.
+      //++_ViewEdge->getTimeStamp();
+      Self tmp = *this;        // C'est pour cela qu'on stocke la valeur
+      increment();                    // dans un temporaire. 
+      return tmp;
+    }
+    inline Self& operator--()  // operator corresponding to ++i
+    { 
+      //++_ViewEdge->getTimeStamp();
+      decrement();
+      return *this;
+    }
+    inline Self operator--(int)  // opérateur correspondant à i++ 
+    {                                  // c.a.d qui renvoie la valeur *puis* incrémente.
+      //++_ViewEdge->getTimeStamp();
+      Self tmp = *this;        // C'est pour cela qu'on stocke la valeur
+      decrement();                    // dans un temporaire. 
+      return tmp;
+    }
+
+    // comparibility
+    virtual bool operator!=(const Self& b) const
+    {
+      return (_ViewEdge != b._ViewEdge);
+    }
+    virtual bool operator==(const Self& b) const
+    {
+      return !(*this != b);
+    }
+    
+    // dereferencing
+    virtual reference operator*() const  {return (_ViewEdge);}
+    virtual pointer operator->() const { return &(operator*());}
+    
+  public:
+    virtual bool begin() const {return _ViewEdge==_first ? true : false;}
+    virtual bool end() const {return _ViewEdge==0 ? true : false;}
+
+  protected:
+    virtual void increment() {}
+    virtual void decrement() {}
+  };
+  
+  template<class Traits>
+  class fedge_iterator_base : public IteratorBase<Traits,BidirectionalIteratorTag_Traits>
+  {
+  public:
+    typedef typename Traits::value_type                       value_type;
+    typedef typename Traits::difference_type                  difference_type;
+    typedef typename Traits::pointer                          pointer;
+    typedef typename Traits::reference                        reference;
+    typedef fedge_iterator_base<Traits>  Self;
+  public:
+    typedef IteratorBase<Traits,BidirectionalIteratorTag_Traits> parent_class;
+    mutable value_type _FEdge;
+    value_type _first;
+    value_type _FEdgeB; // last fedge of the view edge
+ 
+  public:
+    friend class ::ViewEdge;
+    friend class fedge_iterator;
+    inline fedge_iterator_base()
+      : parent_class()
+    {}
+    inline fedge_iterator_base(const fedge_iterator_base<Nonconst_traits<FEdge*> >& iBrother)
+      : parent_class()
+    {
+      _FEdge = iBrother._FEdge;
+      _first = iBrother._first;
+      _FEdgeB = iBrother._FEdgeB;
+    }
+    inline fedge_iterator_base(const fedge_iterator_base<Const_traits<FEdge*> >& iBrother)
+      : parent_class()
+    {
+      _FEdge = iBrother._FEdge;
+      _first = iBrother._first;
+      _FEdgeB = iBrother._FEdgeB;
+    }
+  //protected://FIXME
+    public:
+    inline fedge_iterator_base(value_type iEdge, value_type iFEdgeB)
+      : parent_class()
+    {
+      _FEdge = iEdge;
+      _first = iEdge;
+      _FEdgeB = iFEdgeB;
+    }
+    
+  public:
+    virtual ~fedge_iterator_base() {}
+    // operators
+    inline Self& operator++()  // operator corresponding to ++i
+    { 
+      increment();
+      return *this;
+    }
+    inline Self operator++(int)  // opérateur correspondant à i++ 
+    {                                  // c.a.d qui renvoie la valeur *puis* incrémente.
+      Self tmp = *this;        // C'est pour cela qu'on stocke la valeur
+      increment();                    // dans un temporaire. 
+      return tmp;
+    }
+    inline Self& operator--()  // operator corresponding to ++i
+    { 
+      decrement();
+      return *this;
+    }
+    inline Self operator--(int)  // opérateur correspondant à i++ 
+    {                                  // c.a.d qui renvoie la valeur *puis* incrémente.
+      Self tmp = *this;        // C'est pour cela qu'on stocke la valeur
+      decrement();                    // dans un temporaire. 
+      return tmp;
+    }
+
+    // comparibility
+    virtual bool operator!=(const Self& b) const
+    {
+      return (_FEdge != b._FEdge);
+    }
+    virtual bool operator==(const Self& b) const
+    {
+      return !(*this != b);
+    }
+    
+    // dereferencing
+    virtual reference operator*() const  {return (_FEdge);}
+    virtual pointer operator->() const { return &(operator*());}
+
+
+  public:
+    virtual bool begin() const {return _FEdge==_first ? true : false;}
+    virtual bool end() const {return _FEdge==0 ? true : false;}
+  protected:
+    virtual void increment() 
+    {
+      _FEdge = _FEdge->nextEdge(); // we don't change or
+    }
+    
+    virtual void decrement() 
+    {
+      if(0 == _FEdge)
+	{
+	  _FEdge = _FEdgeB;
+	  return;
+	}
+      _FEdge = _FEdge->previousEdge(); // we don't change or
+    }
+  };
+  
+  template<class Traits>
+  class vertex_iterator_base : public IteratorBase<Traits,BidirectionalIteratorTag_Traits>
+  {
+  public:
+    typedef typename Traits::value_type                       value_type;
+    typedef typename Traits::difference_type                  difference_type;
+    typedef typename Traits::pointer                          pointer;
+    typedef typename Traits::reference                        reference;
+    typedef vertex_iterator_base<Traits>  Self;
+  protected:
+    typedef IteratorBase<Traits,BidirectionalIteratorTag_Traits> parent_class;
+  public:
+    mutable value_type _SVertex;
+    FEdge *_NextFEdge;
+    FEdge *_PreviousFEdge;
+  public:
+    friend class ViewEdge;
+    friend class vertex_iterator;
+    inline vertex_iterator_base()
+      : parent_class()
+    {}
+    inline vertex_iterator_base(const vertex_iterator_base<Const_traits<SVertex*> >& iBrother)
+      : parent_class()
+    {
+      _SVertex = iBrother._SVertex;
+      _NextFEdge = iBrother._NextFEdge;
+      _PreviousFEdge = iBrother._PreviousFEdge;
+    }
+    inline vertex_iterator_base(const vertex_iterator_base<Nonconst_traits<SVertex*> >& iBrother)
+      : parent_class()
+    {
+      _SVertex = iBrother._SVertex;
+      _NextFEdge = iBrother._NextFEdge;
+      _PreviousFEdge = iBrother._PreviousFEdge;
+    }
+    
+  //protected://FIXME
+  public:
+   
+    inline vertex_iterator_base(value_type iVertex, FEdge *iPreviousFEdge, FEdge *iNextFEdge)
+      : parent_class()
+    {
+      _SVertex = iVertex;
+      _NextFEdge = iNextFEdge;
+      _PreviousFEdge = iPreviousFEdge;
+    }
+    
+  public:
+    virtual ~vertex_iterator_base() {}
+
+    virtual bool begin() const {return _PreviousFEdge==0? true : false;}
+    virtual bool end() const {return _SVertex==0 ? true : false;}
+
+    // operators
+    inline Self& operator++()  // operator corresponding to ++i
+    { 
+      increment();
+      return *this;
+    }
+    inline Self operator++(int)  // opérateur correspondant à i++ 
+    {                                  // c.a.d qui renvoie la valeur *puis* incrémente.
+      Self tmp = *this;        // C'est pour cela qu'on stocke la valeur
+      increment();                    // dans un temporaire. 
+      return tmp;
+    }
+    inline Self& operator--()  // operator corresponding to ++i
+    { 
+      decrement();
+      return *this;
+    }
+    inline Self operator--(int)  // opérateur correspondant à i++ 
+    {                                  // c.a.d qui renvoie la valeur *puis* incrémente.
+      Self tmp = *this;        // C'est pour cela qu'on stocke la valeur
+      decrement();                    // dans un temporaire. 
+      return tmp;
+    }
+
+    // comparibility
+    virtual bool operator!=(const Self& b) const
+    {
+      return (_SVertex != b._SVertex);
+    }
+    virtual bool operator==(const Self& b) const
+    {
+      return !(*this != b);
+    }
+    
+    // dereferencing
+    virtual reference operator*() const   {return (_SVertex);}
+    virtual pointer operator->() const { return &(operator*());}
+    
+  protected:
+    virtual void increment() 
+    {
+      if(0 == _NextFEdge)
+	{
+	  _SVertex = 0;
+	  return;
+	}
+
+      _SVertex = _NextFEdge->vertexB();
+      _PreviousFEdge = _NextFEdge;
+      _NextFEdge = _NextFEdge->nextEdge();
+       
+    }
+    virtual void decrement() 
+    {
+      //      if(0 == _SVertex)
+      //      {
+      //        _SVertex = _PreviousFEdge->vertexB();
+      //        return;
+      //      }
+      if(0 == _PreviousFEdge)
+	{
+	  _SVertex = 0;
+	  return;
+	}
+      _SVertex = _PreviousFEdge->vertexA();
+      _NextFEdge = _PreviousFEdge;
+      _PreviousFEdge = _PreviousFEdge->previousEdge();
+    }
+  };
+
+  
+} // end of namespace ViewEdgeInternal
+
+#endif // VIEWMAPADVANCEDITERATORS_H
diff --git a/extern/freestyle/src/view_map/ViewMapBuilder.cpp b/extern/freestyle/src/view_map/ViewMapBuilder.cpp
new file mode 100755
index 00000000000..32f5283a63c
--- /dev/null
+++ b/extern/freestyle/src/view_map/ViewMapBuilder.cpp
@@ -0,0 +1,1027 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include <algorithm>
+#include "ViewMapBuilder.h"
+
+using namespace std;
+
+ViewMap* ViewMapBuilder::BuildViewMap(WingedEdge& we, visibility_algo iAlgo, real epsilon) {
+  _ViewMap = new ViewMap;
+  _currentId = 1;
+  _currentFId = 0;
+  _currentSVertexId = 0;
+  
+  // Builds initial view edges
+  computeInitialViewEdges(we);
+  
+  // Detects cusps
+  computeCusps(_ViewMap); 
+  
+  // Compute intersections
+  ComputeIntersections(_ViewMap, sweep_line, epsilon);
+  
+  // Compute visibility
+  ComputeEdgesVisibility(_ViewMap, iAlgo, _Grid, epsilon);
+  
+  return _ViewMap;
+}
+
+void ViewMapBuilder::computeInitialViewEdges(WingedEdge& we)
+{
+  vector<WShape*> wshapes = we.getWShapes();
+  SShape* psShape;
+
+  for (vector<WShape*>::const_iterator it = wshapes.begin();
+       it != wshapes.end();
+       it++) {
+    // create the embedding
+    psShape = new SShape;
+    psShape->SetId((*it)->GetId());
+    psShape->SetMaterials((*it)->materials()); // FIXME
+
+    // create the view shape
+    ViewShape * vshape = new ViewShape(psShape);
+    // add this view shape to the view map:
+    _ViewMap->AddViewShape(vshape);
+  
+    _pViewEdgeBuilder->SetCurrentViewId(_currentId); // we want to number the view edges in a unique way for the while scene.
+    _pViewEdgeBuilder->SetCurrentFId(_currentFId); // we want to number the feature edges in a unique way for the while scene.
+    _pViewEdgeBuilder->SetCurrentSVertexId(_currentFId); // we want to number the SVertex in a unique way for the while scene.
+    _pViewEdgeBuilder->BuildViewEdges(dynamic_cast<WXShape*>(*it), vshape, 
+				      _ViewMap->ViewEdges(), 
+				      _ViewMap->ViewVertices(), 
+				      _ViewMap->FEdges(), 
+				      _ViewMap->SVertices());
+  
+    _currentId = _pViewEdgeBuilder->currentViewId()+1;
+    _currentFId = _pViewEdgeBuilder->currentFId()+1;
+    _currentSVertexId = _pViewEdgeBuilder->currentSVertexId()+1;
+
+    psShape->ComputeBBox();
+  }
+}
+
+void ViewMapBuilder::computeCusps(ViewMap *ioViewMap){
+  vector<ViewVertex*> newVVertices;
+  vector<ViewEdge*> newVEdges;
+  ViewMap::viewedges_container& vedges = ioViewMap->ViewEdges();
+  ViewMap::viewedges_container::iterator ve=vedges.begin(), veend=vedges.end();
+  for(;
+  ve!=veend;
+  ++ve){
+    if((!((*ve)->getNature() & Nature::SILHOUETTE)) || (!((*ve)->fedgeA()->isSmooth())))
+      continue;
+    FEdge *fe = (*ve)->fedgeA();
+    FEdge * fefirst = fe;
+    bool first = true;
+    bool positive = true;
+    do{
+      FEdgeSmooth * fes = dynamic_cast<FEdgeSmooth*>(fe);
+      Vec3r A((fes)->vertexA()->point3d());
+      Vec3r B((fes)->vertexB()->point3d());
+      Vec3r AB(B-A);
+      AB.normalize();
+      Vec3r m((A+B)/2.0);
+      Vec3r crossP(AB^(fes)->normal()); 
+      crossP.normalize();
+      Vec3r viewvector(m-_viewpoint);
+      viewvector.normalize();
+      if(first){
+        if(((crossP)*(viewvector)) > 0)
+          positive = true;
+        else
+          positive = false;
+        first = false;
+      }
+      // If we're in a positive part, we need 
+      // a stronger negative value to change
+      NonTVertex *cusp = 0;
+      if(positive){
+        if(((crossP)*(viewvector)) < -0.1){
+          // state changes
+          positive = false;
+          // creates and insert cusp
+          cusp = dynamic_cast<NonTVertex*>(ioViewMap->InsertViewVertex(fes->vertexA(), newVEdges));
+          if(cusp!=0)
+            cusp->setNature(cusp->getNature()|Nature::CUSP);
+        }
+          
+      }else{
+        // If we're in a negative part, we need 
+        // a stronger negative value to change
+        if(((crossP)*(viewvector)) > 0.1){
+          positive = true;
+          cusp = dynamic_cast<NonTVertex*>(ioViewMap->InsertViewVertex(fes->vertexA(), newVEdges));
+          if(cusp!=0)
+            cusp->setNature(cusp->getNature()|Nature::CUSP);
+        }
+      }
+      fe = fe->nextEdge();
+    }while((fe!=0) && (fe!=fefirst));
+  }
+  for(ve=newVEdges.begin(), veend=newVEdges.end();
+  ve!=veend;
+  ++ve){
+    (*ve)->viewShape()->AddEdge(*ve);
+    vedges.push_back(*ve);
+  }
+}
+void ViewMapBuilder::ComputeEdgesVisibility(ViewMap *ioViewMap, visibility_algo iAlgo,  Grid *iGrid, real epsilon)
+{
+  if((iAlgo == ray_casting ||
+      iAlgo == ray_casting_fast ||
+      iAlgo == ray_casting_very_fast) && (NULL == iGrid))
+  {
+    cerr << "Error: can't cast ray, no grid defined" << endl;
+    return;
+  }
+
+  switch(iAlgo)
+  {
+  case ray_casting:
+    ComputeRayCastingVisibility(ioViewMap, iGrid, epsilon);
+    break;
+  case ray_casting_fast:
+    ComputeFastRayCastingVisibility(ioViewMap, iGrid, epsilon);
+    break;
+  case ray_casting_very_fast:
+    ComputeVeryFastRayCastingVisibility(ioViewMap, iGrid, epsilon);
+    break;
+  default:
+    break;
+  }
+}
+
+static const unsigned gProgressBarMaxSteps = 10;
+static const unsigned gProgressBarMinSize = 2000;
+
+void ViewMapBuilder::ComputeRayCastingVisibility(ViewMap *ioViewMap, Grid* iGrid, real epsilon)
+{
+  vector<ViewEdge*>& vedges = ioViewMap->ViewEdges();
+  bool progressBarDisplay = false;
+  unsigned progressBarStep = 0;
+  unsigned vEdgesSize = vedges.size();
+  unsigned fEdgesSize = ioViewMap->FEdges().size();
+
+  if(_pProgressBar != NULL && fEdgesSize > gProgressBarMinSize) {
+    unsigned progressBarSteps = min(gProgressBarMaxSteps, vEdgesSize);
+    progressBarStep = vEdgesSize / progressBarSteps;
+    _pProgressBar->reset();
+    _pProgressBar->setLabelText("Computing Ray casting Visibility");
+    _pProgressBar->setTotalSteps(progressBarSteps);
+    _pProgressBar->setProgress(0);
+    progressBarDisplay = true;
+  }
+  
+  unsigned counter = progressBarStep;
+  FEdge * fe, *festart;
+  int nSamples = 0;
+  vector<Polygon3r*> aFaces;
+  Polygon3r *aFace = 0;
+  unsigned tmpQI = 0;
+  unsigned qiClasses[256];
+  unsigned maxIndex, maxCard;
+  unsigned qiMajority;
+  static unsigned timestamp = 1;
+  for(vector<ViewEdge*>::iterator ve=vedges.begin(), veend=vedges.end();
+  ve!=veend;
+  ve++)
+  {
+    festart = (*ve)->fedgeA();
+    fe = (*ve)->fedgeA();
+    qiMajority = 1;
+    do {
+       qiMajority++;
+       fe = fe->nextEdge();
+    } while (fe && fe != festart);
+    qiMajority >>= 1;
+
+    tmpQI = 0;
+    maxIndex = 0;
+    maxCard = 0;
+    nSamples = 0;
+    fe = (*ve)->fedgeA();
+    memset(qiClasses, 0, 256 * sizeof(*qiClasses));
+    set<ViewShape*> occluders;
+    do
+    {
+      if((maxCard < qiMajority)) {
+	tmpQI = ComputeRayCastingVisibility(fe, iGrid, epsilon, occluders, &aFace, timestamp++);
+	
+	if(tmpQI >= 256)
+	  cerr << "Warning: too many occluding levels" << endl;
+
+	if (++qiClasses[tmpQI] > maxCard) {
+	  maxCard = qiClasses[tmpQI];
+	  maxIndex = tmpQI;
+	}
+      }
+      else
+	FindOccludee(fe, iGrid, epsilon, &aFace, timestamp++);
+
+      if(aFace) { 
+	fe->SetaFace(*aFace);
+	aFaces.push_back(aFace);
+	fe->SetOccludeeEmpty(false);
+      }
+      else
+	fe->SetOccludeeEmpty(true);
+
+      ++nSamples;
+      fe = fe->nextEdge();
+    }
+    while((maxCard < qiMajority) && (0!=fe) && (fe!=festart));
+
+    // ViewEdge
+    // qi --
+    (*ve)->SetQI(maxIndex);
+    // occluders --
+    for(set<ViewShape*>::iterator o=occluders.begin(), oend=occluders.end();
+    o!=oend;
+    ++o)
+      (*ve)->AddOccluder((*o));
+    // occludee --
+    if(!aFaces.empty())
+    {
+      if(aFaces.size() <= (float)nSamples/2.f)
+      {
+        (*ve)->SetaShape(0);
+      }
+      else
+      {
+        vector<Polygon3r*>::iterator p = aFaces.begin();
+        WFace * wface = (WFace*)((*p)->userdata);
+        ViewShape *vshape = ioViewMap->viewShape(wface->GetVertex(0)->shape()->GetId());
+        ++p;
+        (*ve)->SetaShape(vshape);
+      }
+    }
+    
+    if(progressBarDisplay) {  
+      counter--;
+      if (counter <= 0) {
+	counter = progressBarStep;
+	_pProgressBar->setProgress(_pProgressBar->getProgress() + 1);
+      }
+    }   
+    aFaces.clear();
+  }    
+}
+
+void ViewMapBuilder::ComputeFastRayCastingVisibility(ViewMap *ioViewMap, Grid* iGrid, real epsilon)
+{
+  vector<ViewEdge*>& vedges = ioViewMap->ViewEdges();
+  bool progressBarDisplay = false;
+  unsigned progressBarStep = 0;
+  unsigned vEdgesSize = vedges.size();
+  unsigned fEdgesSize = ioViewMap->FEdges().size();
+
+  if(_pProgressBar != NULL && fEdgesSize > gProgressBarMinSize) {
+    unsigned progressBarSteps = min(gProgressBarMaxSteps, vEdgesSize);
+    progressBarStep = vEdgesSize / progressBarSteps;
+    _pProgressBar->reset();
+    _pProgressBar->setLabelText("Computing Ray casting Visibility");
+    _pProgressBar->setTotalSteps(progressBarSteps);
+    _pProgressBar->setProgress(0);
+    progressBarDisplay = true;
+  }
+
+  unsigned counter = progressBarStep;  
+  FEdge * fe, *festart;
+  unsigned nSamples = 0;
+  vector<Polygon3r*> aFaces;
+  Polygon3r *aFace = 0;
+  unsigned tmpQI = 0;
+  unsigned qiClasses[256];
+  unsigned maxIndex, maxCard;
+  unsigned qiMajority;
+  static unsigned timestamp = 1;
+  bool even_test;
+  for(vector<ViewEdge*>::iterator ve=vedges.begin(), veend=vedges.end();
+  ve!=veend;
+  ve++)
+  {
+    festart = (*ve)->fedgeA();
+    fe = (*ve)->fedgeA();
+    qiMajority = 1;
+    do {
+       qiMajority++;
+       fe = fe->nextEdge();
+    } while (fe && fe != festart);
+    if (qiMajority >= 4)
+      qiMajority >>= 2;
+    else
+      qiMajority = 1;
+
+    set<ViewShape*> occluders;
+
+    even_test = true;
+    maxIndex = 0;
+    maxCard = 0;
+    nSamples = 0;
+    memset(qiClasses, 0, 256 * sizeof(*qiClasses));
+    fe = (*ve)->fedgeA();
+    do
+    {
+      if (even_test)
+      {
+	if((maxCard < qiMajority)) {
+	  tmpQI = ComputeRayCastingVisibility(fe, iGrid, epsilon, occluders, &aFace, timestamp++);
+	  
+	  if(tmpQI >= 256)
+	    cerr << "Warning: too many occluding levels" << endl;
+
+	  if (++qiClasses[tmpQI] > maxCard) {
+	    maxCard = qiClasses[tmpQI];
+	    maxIndex = tmpQI;
+	  }
+	}
+	else
+	  FindOccludee(fe, iGrid, epsilon, &aFace, timestamp++);
+
+        if(aFace)
+        { 
+          fe->SetaFace(*aFace);
+          aFaces.push_back(aFace);
+        } 
+        ++nSamples;
+	even_test = false;
+      }
+      else
+	even_test = true;
+      fe = fe->nextEdge();
+    } while ((maxCard < qiMajority) && (0!=fe) && (fe!=festart));
+
+    (*ve)->SetQI(maxIndex);
+
+    if(!aFaces.empty())
+    {
+      if(aFaces.size() < nSamples / 2)
+      {
+        (*ve)->SetaShape(0);
+      }
+      else
+      {
+        vector<Polygon3r*>::iterator p = aFaces.begin();
+        WFace * wface = (WFace*)((*p)->userdata);
+        ViewShape *vshape = ioViewMap->viewShape(wface->GetVertex(0)->shape()->GetId());
+        ++p;
+        //        for(;
+        //        p!=pend;
+        //        ++p)
+        //        { 
+        //          WFace *f = (WFace*)((*p)->userdata);
+        //          ViewShape *vs = ioViewMap->viewShape(f->GetVertex(0)->shape()->GetId());
+        //          if(vs != vshape)
+        //          { 
+        //            sameShape = false;
+        //            break;
+        //          } 
+        //        } 
+        //        if(sameShape)
+        (*ve)->SetaShape(vshape);
+      }
+    }
+    
+    //(*ve)->SetaFace(aFace);
+    
+    if(progressBarDisplay) {  
+      counter--;
+      if (counter <= 0) {
+	counter = progressBarStep;
+	_pProgressBar->setProgress(_pProgressBar->getProgress() + 1);
+      }
+    }
+    aFaces.clear();
+  }
+}
+
+void ViewMapBuilder::ComputeVeryFastRayCastingVisibility(ViewMap *ioViewMap, Grid* iGrid, real epsilon)
+{
+  vector<ViewEdge*>& vedges = ioViewMap->ViewEdges();
+  bool progressBarDisplay = false;
+  unsigned progressBarStep = 0;
+  unsigned vEdgesSize = vedges.size();
+  unsigned fEdgesSize = ioViewMap->FEdges().size();
+
+  if(_pProgressBar != NULL && fEdgesSize > gProgressBarMinSize) {
+    unsigned progressBarSteps = min(gProgressBarMaxSteps, vEdgesSize);
+    progressBarStep = vEdgesSize / progressBarSteps;
+    _pProgressBar->reset();
+    _pProgressBar->setLabelText("Computing Ray casting Visibility");
+    _pProgressBar->setTotalSteps(progressBarSteps);
+    _pProgressBar->setProgress(0);
+    progressBarDisplay = true;
+  }
+
+  unsigned counter = progressBarStep;
+  FEdge* fe;
+  unsigned qi = 0;
+  Polygon3r *aFace = 0;
+  static unsigned timestamp = 1;
+  for(vector<ViewEdge*>::iterator ve=vedges.begin(), veend=vedges.end();
+  ve!=veend;
+  ve++)
+  {
+    set<ViewShape*> occluders;
+
+    fe = (*ve)->fedgeA();
+    qi = ComputeRayCastingVisibility(fe, iGrid, epsilon, occluders, &aFace, timestamp++);
+    if(aFace)
+    { 
+      fe->SetaFace(*aFace);
+      WFace * wface = (WFace*)(aFace->userdata);
+      ViewShape *vshape = ioViewMap->viewShape(wface->GetVertex(0)->shape()->GetId());
+      (*ve)->SetaShape(vshape);
+    } 
+    else
+    {
+      (*ve)->SetaShape(0);
+    }
+
+    (*ve)->SetQI(qi);
+    
+    if(progressBarDisplay) {  
+      counter--;
+      if (counter <= 0) {
+	counter = progressBarStep;
+	_pProgressBar->setProgress(_pProgressBar->getProgress() + 1);
+      }
+    }
+  }  
+}
+
+
+void ViewMapBuilder::FindOccludee(FEdge *fe, Grid* iGrid, real epsilon, Polygon3r** oaPolygon, unsigned timestamp, 
+				  Vec3r& u, Vec3r& A, Vec3r& origin, Vec3r& edge, vector<WVertex*>& faceVertices)
+{
+  WFace *face = 0;
+  if(fe->isSmooth()){
+    FEdgeSmooth * fes = dynamic_cast<FEdgeSmooth*>(fe);
+    face = (WFace*)fes->face();
+  }
+  OccludersSet occluders;
+  WFace * oface;
+  bool skipFace;
+  
+  WVertex::incoming_edge_iterator ie;
+  OccludersSet::iterator p, pend;
+  
+  *oaPolygon = 0;
+  if(((fe)->getNature() & Nature::SILHOUETTE) || ((fe)->getNature() & Nature::BORDER))
+  {
+    occluders.clear();
+    // we cast a ray from A in the same direction but looking behind
+    Vec3r v(-u[0],-u[1],-u[2]);
+    iGrid->castInfiniteRay(A, v, occluders, timestamp);
+    
+    bool noIntersection = true;
+    real mint=FLT_MAX;
+    // we met some occluders, let us fill the aShape field 
+    // with the first intersected occluder
+    for(p=occluders.begin(),pend=occluders.end();
+    p!=pend;
+    p++)
+    { 
+      // check whether the edge and the polygon plane are coincident:
+      //-------------------------------------------------------------
+      //first let us compute the plane equation.
+      oface = (WFace*)(*p)->userdata;
+      Vec3r v1(((*p)->getVertices())[0]);
+      Vec3r normal((*p)->getNormal());
+      real d = -(v1 * normal);
+      real t,t_u,t_v;
+      
+      if(0 != face)
+      { 
+        skipFace = false;
+        
+        if(face == oface)
+          continue;
+        
+        if(faceVertices.empty())
+          continue;
+        
+        for(vector<WVertex*>::iterator fv=faceVertices.begin(), fvend=faceVertices.end();
+        fv!=fvend;
+        ++fv)
+        { 
+          if((*fv)->isBoundary())
+            continue;
+          WVertex::incoming_edge_iterator iebegin=(*fv)->incoming_edges_begin();
+          WVertex::incoming_edge_iterator ieend=(*fv)->incoming_edges_end();
+          for(ie=iebegin;ie!=ieend; ++ie)
+          {  
+            if((*ie) == 0)
+              continue;
+            
+            WFace * sface = (*ie)->GetbFace();
+            if(sface == oface)
+            { 
+              skipFace = true;
+              break;
+            } 
+          }  
+          if(skipFace)
+            break;
+        } 
+        if(skipFace)
+          continue;
+      }  
+      else
+      {
+        if(GeomUtils::COINCIDENT == GeomUtils::intersectRayPlane(origin, edge, normal, d, t, epsilon))
+          continue;
+      }
+      if((*p)->rayIntersect(A, v, t,t_u,t_v))
+      {
+        if (fabs(v * normal) > 0.0001)
+          if ((t>0.0)) // && (t<1.0))
+          {
+            if (t<mint)
+            {
+              *oaPolygon = (*p);
+              mint = t;
+              noIntersection = false;
+              fe->SetOccludeeIntersection(Vec3r(A+t*v));
+            }
+          }
+      }  
+    }
+    
+    if(noIntersection)
+      *oaPolygon = 0;
+  }
+}
+
+void ViewMapBuilder::FindOccludee(FEdge *fe, Grid* iGrid, real epsilon, Polygon3r** oaPolygon, unsigned timestamp)
+{
+  OccludersSet occluders;
+
+  Vec3r A;
+  Vec3r edge;
+  Vec3r origin;
+  A = Vec3r(((fe)->vertexA()->point3D() + (fe)->vertexB()->point3D())/2.0);
+  edge = Vec3r((fe)->vertexB()->point3D()-(fe)->vertexA()->point3D());
+  origin = Vec3r((fe)->vertexA()->point3D());
+  Vec3r u(_viewpoint-A);
+  u.normalize();
+  if(A < iGrid->getOrigin())
+    cerr << "Warning: point is out of the grid for fedge " << fe->getId().getFirst() << "-" << fe->getId().getSecond() << endl;
+
+  vector<WVertex*> faceVertices;
+     
+  WFace *face = 0;
+  if(fe->isSmooth()){
+    FEdgeSmooth * fes = dynamic_cast<FEdgeSmooth*>(fe);
+    face = (WFace*)fes->face();
+  }
+  if(0 != face)
+    face->RetrieveVertexList(faceVertices);
+  
+  return FindOccludee(fe,iGrid, epsilon, oaPolygon, timestamp, 
+		      u, A, origin, edge, faceVertices);
+}
+
+int ViewMapBuilder::ComputeRayCastingVisibility(FEdge *fe, Grid* iGrid, real epsilon, set<ViewShape*>& oOccluders,
+						Polygon3r** oaPolygon, unsigned timestamp)
+{
+  OccludersSet occluders;
+  int qi = 0;
+
+  Vec3r center;
+  Vec3r edge;
+  Vec3r origin;
+
+  center = fe->center3d();
+  edge = Vec3r(fe->vertexB()->point3D() - fe->vertexA()->point3D());
+  origin = Vec3r(fe->vertexA()->point3D());
+  //
+  //   // Is the edge outside the view frustum ?
+  Vec3r gridOrigin(iGrid->getOrigin());
+  Vec3r gridExtremity(iGrid->getOrigin()+iGrid->gridSize());
+  
+  if( (center.x() < gridOrigin.x()) || (center.y() < gridOrigin.y()) || (center.z() < gridOrigin.z())
+    ||(center.x() > gridExtremity.x()) || (center.y() > gridExtremity.y()) || (center.z() > gridExtremity.z())){
+     cerr << "Warning: point is out of the grid for fedge " << fe->getId() << endl;
+    //return 0;
+  }
+
+ 
+  //  Vec3r A(fe->vertexA()->point2d());
+  //  Vec3r B(fe->vertexB()->point2d());
+  //  int viewport[4];
+  //  SilhouetteGeomEngine::retrieveViewport(viewport);
+  //  if( (A.x() < viewport[0]) || (A.x() > viewport[2]) || (A.y() < viewport[1]) || (A.y() > viewport[3])
+  //    ||(B.x() < viewport[0]) || (B.x() > viewport[2]) || (B.y() < viewport[1]) || (B.y() > viewport[3])){
+  //    cerr << "Warning: point is out of the grid for fedge " << fe->getId() << endl;
+  //    //return 0;
+  //  }
+
+  Vec3r u(_viewpoint - center);
+  real raylength = u.norm();
+  u.normalize();
+  //cout << "grid origin " << iGrid->getOrigin().x() << "," << iGrid->getOrigin().y() << "," << iGrid->getOrigin().z() << endl;
+  //cout << "center " << center.x() << "," << center.y() << "," << center.z() << endl;
+  
+  iGrid->castRay(center, Vec3r(_viewpoint), occluders, timestamp);
+
+  WFace *face = 0;
+  if(fe->isSmooth()){
+    FEdgeSmooth * fes = dynamic_cast<FEdgeSmooth*>(fe);
+    face = (WFace*)fes->face();
+  }
+  vector<WVertex*> faceVertices;
+  WVertex::incoming_edge_iterator ie;
+            
+  WFace * oface;
+  bool skipFace;
+  OccludersSet::iterator p, pend;
+  if(face)
+    face->RetrieveVertexList(faceVertices);
+
+  for(p=occluders.begin(),pend=occluders.end();
+      p!=pend;
+      p++)
+    { 
+      // If we're dealing with an exact silhouette, check whether 
+      // we must take care of this occluder of not.
+      // (Indeed, we don't consider the occluders that 
+      // share at least one vertex with the face containing 
+      // this edge).
+      //-----------
+      oface = (WFace*)(*p)->userdata;
+      Vec3r v1(((*p)->getVertices())[0]);
+      Vec3r normal((*p)->getNormal());
+      real d = -(v1 * normal);
+      real t, t_u, t_v;
+            
+      if(0 != face)
+	{
+	  skipFace = false;
+              
+	  if(face == oface)
+	    continue;
+              
+              
+	  for(vector<WVertex*>::iterator fv=faceVertices.begin(), fvend=faceVertices.end();
+              fv!=fvend;
+              ++fv)
+	    {
+                if((*fv)->isBoundary())
+                  continue;
+
+	      WVertex::incoming_edge_iterator iebegin=(*fv)->incoming_edges_begin();
+	      WVertex::incoming_edge_iterator ieend=(*fv)->incoming_edges_end();
+	      for(ie=iebegin;ie!=ieend; ++ie)
+                { 
+                  if((*ie) == 0)
+                    continue;
+                  
+                  WFace * sface = (*ie)->GetbFace();
+                  //WFace * sfacea = (*ie)->GetaFace();
+                  //if((sface == oface) || (sfacea == oface))
+                  if(sface == oface)
+		    {
+		      skipFace = true;
+		      break;
+		    }
+                }
+	      if(skipFace)
+		break;
+	    }
+	  if(skipFace)
+	    continue;
+	}
+      else
+	{
+	  // check whether the edge and the polygon plane are coincident:
+	  //-------------------------------------------------------------
+	  //first let us compute the plane equation.
+           
+	  if(GeomUtils::COINCIDENT == GeomUtils::intersectRayPlane(origin, edge, normal, d, t, epsilon))
+	    continue;
+	}
+
+      if((*p)->rayIntersect(center, u, t, t_u, t_v))
+	{
+	  if (fabs(u * normal) > 0.0001)
+	    if ((t>0.0) && (t<raylength))
+	      {
+		WFace *f = (WFace*)((*p)->userdata);
+		ViewShape *vshape = _ViewMap->viewShape(f->GetVertex(0)->shape()->GetId());
+		oOccluders.insert(vshape);
+		++qi;
+    if(!_EnableQI)
+      break;
+	      }
+	}
+    }
+
+  // Find occludee
+  FindOccludee(fe,iGrid, epsilon, oaPolygon, timestamp, 
+	       u, center, edge, origin, faceVertices);
+
+  return qi;
+}
+
+void ViewMapBuilder::ComputeIntersections(ViewMap *ioViewMap, intersection_algo iAlgo, real epsilon)
+{
+  switch(iAlgo)
+  {
+  case sweep_line:
+    ComputeSweepLineIntersections(ioViewMap, epsilon);
+    break;
+  default:
+    break;
+  }
+  ViewMap::viewvertices_container& vvertices = ioViewMap->ViewVertices();
+  for(ViewMap::viewvertices_container::iterator vv=vvertices.begin(), vvend=vvertices.end();
+  vv!=vvend;
+  ++vv)
+  {
+    if((*vv)->getNature() == Nature::T_VERTEX)
+    {
+      TVertex *tvertex = (TVertex*)(*vv);
+      cout << "TVertex " << tvertex->getId() << " has :" << endl;
+      cout << "FrontEdgeA: " << tvertex->frontEdgeA().first << endl;
+      cout << "FrontEdgeB: " << tvertex->frontEdgeB().first << endl;
+      cout << "BackEdgeA: " << tvertex->backEdgeA().first << endl;
+      cout << "BackEdgeB: " << tvertex->backEdgeB().first << endl << endl;
+    }
+  }
+}
+
+struct less_SVertex2D : public binary_function<SVertex*, SVertex*, bool> 
+{
+  real epsilon;
+  less_SVertex2D(real eps)
+    : binary_function<SVertex*,SVertex*,bool>()
+  {
+    epsilon = eps;
+  }
+	bool operator()(SVertex* x, SVertex* y) 
+  {
+    Vec3r A = x->point2D();
+    Vec3r B = y->point2D();
+    for(unsigned int i=0; i<3; i++)
+    {
+      if((fabs(A[i] - B[i])) < epsilon)
+        continue;
+      if(A[i] < B[i])
+        return true;
+      if(A[i] > B[i])
+        return false;
+    }
+    
+    return false;
+  }
+};
+
+typedef Segment<FEdge*,Vec3r > segment;
+typedef Intersection<segment> intersection;
+
+struct less_Intersection : public binary_function<intersection*, intersection*, bool> 
+{
+  segment *edge;
+  less_Intersection(segment *iEdge)
+    : binary_function<intersection*,intersection*,bool>()
+  {
+    edge = iEdge;
+  }
+	bool operator()(intersection* x, intersection* y) 
+  {
+    real tx = x->getParameter(edge);
+    real ty = y->getParameter(edge);
+    if(tx > ty)
+      return true;
+    return false;
+  }
+};
+
+struct silhouette_binary_rule : public binary_rule<segment,segment>
+{
+  silhouette_binary_rule() : binary_rule<segment,segment>() {}
+  virtual bool operator() (segment& s1, segment& s2)
+  {
+    FEdge * f1 = s1.edge();
+    FEdge * f2 = s2.edge();
+
+    if((!(((f1)->getNature() & Nature::SILHOUETTE) || ((f1)->getNature() & Nature::BORDER))) && (!(((f2)->getNature() & Nature::SILHOUETTE) || ((f2)->getNature() & Nature::BORDER))))
+      return false;
+      
+    return true;
+  }
+};
+
+void ViewMapBuilder::ComputeSweepLineIntersections(ViewMap *ioViewMap, real epsilon)
+{
+  vector<SVertex*>& svertices = ioViewMap->SVertices();
+  bool progressBarDisplay = false;
+  unsigned sVerticesSize = svertices.size();
+  unsigned fEdgesSize = ioViewMap->FEdges().size();
+  //  ViewMap::fedges_container& fedges = ioViewMap->FEdges();
+  //  for(ViewMap::fedges_container::const_iterator f=fedges.begin(), end=fedges.end();
+  //  f!=end;
+  //  ++f){
+  //    cout << (*f)->aMaterialIndex() << "-" << (*f)->bMaterialIndex() << endl;
+  //  }
+    
+  unsigned progressBarStep = 0;
+  
+  if(_pProgressBar != NULL && fEdgesSize > gProgressBarMinSize) {
+    unsigned progressBarSteps = min(gProgressBarMaxSteps, sVerticesSize);
+    progressBarStep = sVerticesSize / progressBarSteps;
+    _pProgressBar->reset();
+    _pProgressBar->setLabelText("Computing Sweep Line Intersections");
+    _pProgressBar->setTotalSteps(progressBarSteps);
+    _pProgressBar->setProgress(0);
+    progressBarDisplay = true;
+  }
+  
+  unsigned counter = progressBarStep;
+
+  sort(svertices.begin(), svertices.end(), less_SVertex2D(epsilon));
+
+  SweepLine<FEdge*,Vec3r> SL;
+
+  vector<FEdge*>& ioEdges = ioViewMap->FEdges();
+
+  vector<segment* > segments;
+
+  vector<FEdge*>::iterator fe,fend;
+
+  for(fe=ioEdges.begin(), fend=ioEdges.end();
+  fe!=fend;
+  fe++)
+  {
+    segment * s = new segment((*fe), (*fe)->vertexA()->point2D(), (*fe)->vertexB()->point2D());
+    (*fe)->userdata = s;    
+    segments.push_back(s);
+  }
+
+  vector<segment*> vsegments;
+  for(vector<SVertex*>::iterator sv=svertices.begin(),svend=svertices.end();
+  sv!=svend;
+  sv++)
+  {
+    const vector<FEdge*>& vedges = (*sv)->fedges();
+    
+    for(vector<FEdge*>::const_iterator sve=vedges.begin(), sveend=vedges.end();
+    sve!=sveend;
+    sve++)
+    {
+      vsegments.push_back((segment*)((*sve)->userdata));
+    }
+
+    Vec3r evt((*sv)->point2D());
+    silhouette_binary_rule sbr;
+    SL.process(evt, vsegments, sbr);
+
+    if(progressBarDisplay) {  
+      counter--;
+      if (counter <= 0) {
+	counter = progressBarStep;
+	_pProgressBar->setProgress(_pProgressBar->getProgress() + 1);
+      }
+    }
+    vsegments.clear();
+  }
+
+  // reset userdata:
+  for(fe=ioEdges.begin(), fend=ioEdges.end();
+  fe!=fend;
+  fe++)
+    (*fe)->userdata = NULL;
+ 
+  // list containing the new edges resulting from splitting operations. 
+  vector<FEdge*> newEdges;
+  
+  // retrieve the intersected edges:
+  vector<segment* >& iedges = SL.intersectedEdges();
+  // retrieve the intersections:
+  vector<intersection*>& intersections = SL.intersections();
+  
+  int id=0;
+  // create a view vertex for each intersection and linked this one 
+  // with the intersection object
+  vector<intersection*>::iterator i, iend;
+  for(i=intersections.begin(),iend=intersections.end();
+  i!=iend;
+  i++)
+  {
+    FEdge *fA = (*i)->EdgeA->edge();
+    FEdge *fB = (*i)->EdgeB->edge();
+    
+    Vec3r A1 = fA->vertexA()->point3D();
+    Vec3r A2 = fA->vertexB()->point3D();
+    Vec3r B1 = fB->vertexA()->point3D();
+    Vec3r B2 = fB->vertexB()->point3D();
+
+    Vec3r a1 = fA->vertexA()->point2D();
+    Vec3r a2 = fA->vertexB()->point2D();
+    Vec3r b1 = fB->vertexA()->point2D();
+    Vec3r b2 = fB->vertexB()->point2D();
+
+    real ta = (*i)->tA;
+    real tb = (*i)->tB;
+
+    if((ta < -epsilon) || (ta > 1+epsilon))
+        cerr << "Warning: intersection out of range for edge " << fA->vertexA()->getId() << " - " << fA->vertexB()->getId() << endl;
+    
+    if((tb < -epsilon) || (tb > 1+epsilon))
+        cerr << "Warning: intersection out of range for edge " << fB->vertexA()->getId() << " - " << fB->vertexB()->getId() << endl;
+    
+    real Ta = SilhouetteGeomEngine::ImageToWorldParameter(fA, ta);
+    real Tb = SilhouetteGeomEngine::ImageToWorldParameter(fB, tb);
+
+    TVertex * tvertex = ioViewMap->CreateTVertex(Vec3r(A1 + Ta*(A2-A1)), Vec3r(a1 + ta*(a2-a1)), fA, 
+                                                 Vec3r(B1 + Tb*(B2-B1)), Vec3r(b1 + tb*(b2-b1)), fB, id);
+     
+    (*i)->userdata = tvertex;
+    ++id;
+  }
+
+  progressBarStep = 0;
+
+  if(progressBarDisplay) {
+    unsigned iEdgesSize = iedges.size();
+    unsigned progressBarSteps = min(gProgressBarMaxSteps, iEdgesSize);
+    progressBarStep = iEdgesSize / progressBarSteps;
+    _pProgressBar->reset();
+    _pProgressBar->setLabelText("Splitting intersected edges");
+    _pProgressBar->setTotalSteps(progressBarSteps);
+    _pProgressBar->setProgress(0);
+  }
+  
+  counter = progressBarStep;
+
+  vector<TVertex*> edgeVVertices;
+  vector<ViewEdge*> newVEdges;
+  vector<segment* >::iterator s, send;
+  for(s=iedges.begin(),send=iedges.end();
+  s!=send;
+  s++)
+  {
+    edgeVVertices.clear();
+    newEdges.clear();
+    newVEdges.clear();
+    
+    FEdge* fedge = (*s)->edge();
+    ViewEdge *vEdge = fedge->viewedge();
+    ViewShape *shape = vEdge->viewShape();
+    
+    vector<intersection*>& eIntersections = (*s)->intersections();
+    // we first need to sort these intersections from farther to closer to A
+    sort(eIntersections.begin(), eIntersections.end(), less_Intersection(*s));
+    for(i=eIntersections.begin(),iend=eIntersections.end();
+    i!=iend;
+    i++)
+      edgeVVertices.push_back((TVertex*)(*i)->userdata);
+
+    shape->SplitEdge(fedge, edgeVVertices, ioViewMap->FEdges(), ioViewMap->ViewEdges()); 
+
+    if(progressBarDisplay) {  
+      counter--;
+      if (counter <= 0) {
+	counter = progressBarStep;
+	_pProgressBar->setProgress(_pProgressBar->getProgress() + 1);
+      }
+    }
+  }
+
+  // reset userdata:
+  for(fe=ioEdges.begin(), fend=ioEdges.end();
+  fe!=fend;
+  fe++)
+    (*fe)->userdata = NULL;
+
+  // delete segments
+  //  if(!segments.empty()){
+  //    for(s=segments.begin(),send=segments.end();
+  //    s!=send;
+  //    s++){
+  //      delete *s;
+  //    }
+  //    segments.clear();
+  //  }
+}
diff --git a/extern/freestyle/src/view_map/ViewMapBuilder.h b/extern/freestyle/src/view_map/ViewMapBuilder.h
new file mode 100755
index 00000000000..ec52d4fdd7e
--- /dev/null
+++ b/extern/freestyle/src/view_map/ViewMapBuilder.h
@@ -0,0 +1,224 @@
+//
+//  Filename         : ViewMapBuilder.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Class to build silhouette edges from a
+//                     Winged-Edge structure
+//  Date of creation : 25/03/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  VIEWMAPBUILDER_H
+# define VIEWMAPBUILDER_H
+
+# include <vector>
+# include "../system/FreestyleConfig.h"
+# include "../geometry/Geom.h"
+# include "../scene_graph/NodeGroup.h"
+# include "../winged_edge/WXEdge.h"
+# include "Silhouette.h"
+# include "../geometry/GeomUtils.h"
+# include "../geometry/Grid.h"
+# include "../system/ProgressBar.h"
+# include "../geometry/SweepLine.h"
+# include "ViewMap.h"
+# include "SilhouetteGeomEngine.h"
+# include "../scene_graph/TriangleRep.h"
+# include "../winged_edge/WEdge.h"
+# include "ViewEdgeXBuilder.h"
+
+
+using namespace Geometry;
+
+class LIB_VIEW_MAP_EXPORT ViewMapBuilder
+{
+private:
+
+  ViewMap * _ViewMap; // result
+  //SilhouetteGeomEngine _GeomEngine;
+  ProgressBar *_pProgressBar;
+  Vec3r _viewpoint;
+  Grid* _Grid;
+  ViewEdgeXBuilder *_pViewEdgeBuilder;
+  bool _EnableQI;
+  double _epsilon;
+
+  // tmp values:
+  int _currentId;
+  int _currentFId;
+  int _currentSVertexId;
+  
+
+public:
+
+  typedef enum {
+    sweep_line
+  } intersection_algo;
+
+  typedef enum {
+    ray_casting,
+    ray_casting_fast,
+    ray_casting_very_fast
+  } visibility_algo;
+
+  inline ViewMapBuilder()
+  {
+    _pProgressBar = 0;
+    _Grid = 0;
+    _currentId = 1;
+    _currentFId = 0;
+    _currentSVertexId = 0;
+    _pViewEdgeBuilder = new ViewEdgeXBuilder;
+    _EnableQI = true;
+  }
+
+  inline ~ViewMapBuilder() 
+  {
+    if(_pViewEdgeBuilder){
+      delete _pViewEdgeBuilder;
+      _pViewEdgeBuilder = 0;
+    }
+  }
+
+  /*! Compute Shapes from a WingedEdge containing a list of WShapes */
+  void computeInitialViewEdges(WingedEdge&);
+
+  /*! Compute Cusps */
+  void computeCusps(ViewMap *ioViewMap);
+  /*! Detects cusps (for a single ViewEdge) among SVertices and builds a ViewVertex on top of 
+   *  each cusp SVertex
+   *  We use a hysteresis approach to avoid noise.
+   */
+  void DetectCusps(ViewEdge *ioEdge);
+
+
+  /*! Sets the current viewpoint */
+  inline void SetViewpoint(const Vec3r& ivp) {_viewpoint = ivp; SilhouetteGeomEngine::SetViewpoint(ivp);}
+
+  /*! Sets the current transformation
+   *    iModelViewMatrix
+   *      The 4x4 model view matrix, in column major order (openGL like).
+   *    iProjection matrix
+   *      The 4x4 projection matrix, in column major order (openGL like).
+   *    iViewport
+   *      The viewport. 4 real array: origin.x, origin.y, width, length
+   */
+  inline void SetTransform(const real iModelViewMatrix[4][4],
+			   const real iProjectionMatrix[4][4],
+			   const int iViewport[4],
+			   real iFocalLength,
+			   real iAspect,
+			   real iFovy) {
+    SilhouetteGeomEngine::SetTransform(iModelViewMatrix, iProjectionMatrix, iViewport, iFocalLength);
+  }
+  
+  inline void SetFrustum(real iZnear, real iZfar) {
+    SilhouetteGeomEngine::SetFrustum(iZnear, iZfar);
+  }
+
+  /*! Builds the scene view map
+   *  returns the list the view map
+   *  it is up to the caller to delete this ViewMap
+   *    iWRoot
+   *      The root group node containing the WEdge structured scene 
+   */
+
+  ViewMap* BuildViewMap(WingedEdge& we, visibility_algo iAlgo = ray_casting, real epsilon=1e-06) ;
+  /*! computes the intersection between all 2D
+   *  feature edges of the scene.
+   *    ioViewMap
+   *      The view map. It is modified by the method.
+   *      The list of all features edges of the scene.
+   *      Each time an intersection is found, the 2 intersecting
+   *      edges are splitted (creating 2 new vertices)
+   *      At the end, this list is updated with the adding
+   *      of all new created edges (resulting from splitting).
+   *    iAlgo
+   *      The algo to use for computing the intersections
+   */
+  void ComputeIntersections(ViewMap *ioViewMap, intersection_algo iAlgo = sweep_line, real epsilon=1e-06);
+
+  /*! Computes the 2D scene silhouette edges visibility
+   *    iGrid
+   *      For the Ray Casting algorithm. 
+   */
+  void ComputeEdgesVisibility(ViewMap *ioViewMap, visibility_algo iAlgo= ray_casting, Grid* iGrid = 0, real epsilon=1e-6);
+
+  void SetGrid(Grid *iGrid) {_Grid = iGrid;}
+  
+  /*! accessors */
+ 
+  /*! Modifiers */
+  inline void SetProgressBar(ProgressBar *iProgressBar) {_pProgressBar = iProgressBar;}
+  inline void SetEnableQI(bool iBool) {_EnableQI = iBool;}
+
+protected:
+
+  /*! Computes intersections on all edges of the scene using a sweep line 
+   *  algorithm*/
+  void ComputeSweepLineIntersections(ViewMap *ioViewMap, real epsilon = 1e-6);
+
+  /*! Computes the 2D scene silhouette edges visibility
+   *  using a ray casting. On each edge, a ray is cast
+   *  to check its quantitative invisibility. The list
+   *  of occluders are each time stored in the tested edge.
+   *    ioViewMap
+   *      The view map.
+   *      The 2D scene silhouette edges as FEdges.
+   *      These edges have already been splitted at their intersections points.
+   *      Thus, these edges do not intersect anymore.
+   *      The visibility corresponding to each edge of ioScene is set is this
+   *      edge.
+   */
+  void ComputeRayCastingVisibility(ViewMap *ioViewMap, Grid *iGrid, real epsilon=1e-6);
+  void ComputeFastRayCastingVisibility(ViewMap *ioViewMap, Grid *iGrid, real epsilon=1e-6);
+  void ComputeVeryFastRayCastingVisibility(ViewMap *ioViewMap, Grid *iGrid, real epsilon=1e-6);
+
+  /*! Compute the visibility for the FEdge fe.
+   *  The occluders are added to fe occluders list.
+   *    fe
+   *      The FEdge
+   *    iGrid
+   *      The grid used to compute the ray casting visibility
+   *    epsilon
+   *      The epsilon used for computation
+   *    oShapeId
+   *      fe is the border (in 2D) between 2 2D spaces.
+   *      if fe is a silhouette,
+   *      One of these 2D spaces is occupied by the shape
+   *      to which fe belongs (on its left) and the other one is either occupied 
+   *      by another shape or empty or occupied by the same shape.
+   *      We use this ray csating operation to determine which shape 
+   *      lies on fe's right.
+   *      The result is the shape id stored in oShapeId
+   */
+  int ComputeRayCastingVisibility(FEdge *fe, Grid* iGrid, real epsilon, set<ViewShape*>& oOccluders,
+                                  Polygon3r** oaPolygon, unsigned timestamp);
+  // FIXME
+  void FindOccludee(FEdge *fe, Grid* iGrid, real epsilon, Polygon3r** oaPolygon, unsigned timestamp);
+  void FindOccludee(FEdge *fe, Grid* iGrid, real epsilon, Polygon3r** oaPolygon, unsigned timestamp,
+                    Vec3r& u, Vec3r& A, Vec3r& origin, Vec3r& edge, vector<WVertex*>& faceVertices);
+
+};
+
+#endif // VIEWMAPBUILDER_H
diff --git a/extern/freestyle/src/view_map/ViewMapIO.cpp b/extern/freestyle/src/view_map/ViewMapIO.cpp
new file mode 100755
index 00000000000..d68164973a1
--- /dev/null
+++ b/extern/freestyle/src/view_map/ViewMapIO.cpp
@@ -0,0 +1,1245 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "ViewMapIO.h"
+
+#ifdef IRIX
+# define WRITE(n)			Internal::write<sizeof((n))>(out, (const char*)(&(n)))
+# define READ(n)			Internal::read<sizeof((n))>(in, (char*)(&(n)))
+#else
+# define WRITE(n)			out.write((const char*)(&(n)), sizeof((n)))
+# define READ(n)			in.read((char*)(&(n)), sizeof((n)))
+#endif
+
+#define WRITE_IF_NON_NULL(ptr)		if ((ptr) == NULL) { WRITE(ZERO); } else { WRITE((ptr)->userdata); }
+#define READ_IF_NON_NULL(ptr, array)	READ(tmp); if (tmp == ZERO) { (ptr) = NULL; } else { (ptr) = (array)[tmp]; }
+
+namespace ViewMapIO {
+
+  namespace Internal {
+
+    ViewMap* g_vm;
+
+    //////////////////// 'load' Functions ////////////////////
+
+    inline
+    int load(istream& in, Vec3r& v) {
+
+      if (Options::getFlags() & Options::FLOAT_VECTORS) {
+	float tmp;
+	READ(tmp);
+	v[0] = tmp;
+	READ(tmp);
+	v[1] = tmp;
+	READ(tmp);
+	v[2] = tmp;
+      } else {
+	Vec3r::value_type tmp;
+	READ(tmp);
+	v[0] = tmp;
+	READ(tmp);
+	v[1] = tmp;
+	READ(tmp);
+	v[2] = tmp;
+      }
+      return 0;
+    }
+
+
+    inline
+    int load(istream& in, Polygon3r& p) {
+
+      unsigned tmp;
+
+      // Id
+      READ(tmp);
+      p.setId(tmp);
+
+      // vertices (List)
+      vector<Vec3r> tmp_vec;
+      Vec3r v;
+      READ(tmp);
+      for (unsigned i = 0; i < tmp; i++) {
+	load(in, v);
+	tmp_vec.push_back(v);
+      }
+      p.setVertices(tmp_vec);
+
+      // min & max
+      // Already computed (in the SetVertices() method)
+
+      return 0;
+    }
+
+
+    inline
+    int load(istream& in, Material& m) {
+
+      float tmp_array[4];
+      int i;
+
+      // Diffuse
+      for (i = 0; i < 4; i++)
+	READ(tmp_array[i]);
+      m.SetDiffuse(tmp_array[0], tmp_array[1], tmp_array[2], tmp_array[3]);
+
+      // Specular
+      for (i = 0; i < 4; i++)
+	READ(tmp_array[i]);
+      m.SetSpecular(tmp_array[0], tmp_array[1], tmp_array[2], tmp_array[3]);
+
+      // Ambient
+      for (i = 0; i < 4; i++)
+	READ(tmp_array[i]);
+      m.SetAmbient(tmp_array[0], tmp_array[1], tmp_array[2], tmp_array[3]);
+
+      // Emission
+      for (i = 0; i < 4; i++)
+	READ(tmp_array[i]);
+      m.SetEmission(tmp_array[0], tmp_array[1], tmp_array[2], tmp_array[3]);
+
+      // Shininess
+      READ(tmp_array[0]);
+      m.SetShininess(tmp_array[0]);
+
+      return 0;
+    }
+
+
+    int load(istream& in, ViewShape* vs) {
+
+      if (!vs || !vs->sshape())
+	return 1;
+
+      // SShape
+
+      // -> Id
+      Id::id_type id1, id2;
+      READ(id1);
+      READ(id2);
+      vs->sshape()->SetId(Id(id1, id2));
+
+      // -> Importance
+      float importance;
+      READ(importance);
+      vs->sshape()->SetImportance(importance);
+
+      // -> BBox
+      //    Not necessary (only used during view map computatiom)
+
+      unsigned i, size, tmp;
+
+      // -> Material
+      READ(size);
+      vector<Material> materials;
+      Material m;
+      for(i=0; i<size; ++i){
+        load(in, m);
+        materials.push_back(m);
+      }
+      vs->sshape()->SetMaterials(materials);
+
+      
+
+      // -> VerticesList (List)
+      READ(size);
+      for (i = 0; i < size; i++) {
+	SVertex* sv;
+	READ_IF_NON_NULL(sv, g_vm->SVertices());
+	vs->sshape()->AddNewVertex(sv);
+      }
+
+       // -> Chains (List)
+      READ(size);
+      for (i = 0; i < size; i++) {
+	FEdge* fe;
+	READ_IF_NON_NULL(fe, g_vm->FEdges());
+	vs->sshape()->AddChain(fe);
+      }
+
+      // -> EdgesList (List)
+      READ(size);
+      for (i = 0; i < size; i++) {
+	FEdge* fe;
+	READ_IF_NON_NULL(fe, g_vm->FEdges());
+	vs->sshape()->AddEdge(fe);
+      }
+
+      // ViewEdges (List)
+      READ(size);
+      for (i = 0; i < size; i++) {
+	ViewEdge* ve;
+	READ_IF_NON_NULL(ve, g_vm->ViewEdges());
+	vs->AddEdge(ve);
+      }
+
+      // ViewVertices (List)
+      READ(size);
+      for (i = 0; i < size; i++) {
+	ViewVertex* vv;
+	READ_IF_NON_NULL(vv, g_vm->ViewVertices());
+	vs->AddVertex(vv);
+      }
+
+      return 0;
+    }
+
+
+    int load(istream& in, FEdge* fe) {
+
+      if (!fe)
+	return 1;
+
+      bool b;
+
+      FEdgeSmooth *fesmooth = 0;
+      FEdgeSharp * fesharp  = 0;
+      if(fe->isSmooth()){
+        fesmooth = dynamic_cast<FEdgeSmooth*>(fe);
+      }else{
+        fesharp = dynamic_cast<FEdgeSharp*>(fe);
+      }
+
+      // Id
+      Id::id_type id1, id2;
+      READ(id1);
+      READ(id2);
+      fe->SetId(Id(id1, id2));
+
+      // Nature
+      Nature::EdgeNature nature;
+      READ(nature);
+      fe->SetNature(nature);
+
+      // hasVisibilityPoint
+      //      bool b;
+      //      READ(b);
+      //      fe->SetHasVisibilityPoint(b);
+ 
+      Vec3r v;
+      unsigned int matindex;
+
+      // VisibilityPointA
+      //      load(in, v);
+      //      fe->SetVisibilityPointA(v);
+
+      // VisibilityPointB
+      //      load(in, v);
+      //      fe->SetVisibilityPointB(v);
+
+      if(fe->isSmooth()){
+        // Normal
+        load(in, v);
+        fesmooth->SetNormal(v);
+
+        // Material
+        READ(matindex);
+        fesmooth->SetMaterialIndex(matindex);
+      }else{
+        // aNormal
+        load(in, v);
+        fesharp->SetNormalA(v);
+
+        // bNormal
+        load(in, v);
+        fesharp->SetNormalB(v);
+
+        // Materials 
+        READ(matindex);
+        fesharp->SetaMaterialIndex(matindex);
+        READ(matindex);
+        fesharp->SetbMaterialIndex(matindex);
+      }
+      
+      unsigned tmp;
+
+      // VertexA
+      SVertex* sva;
+      READ_IF_NON_NULL(sva, g_vm->SVertices());
+      fe->SetVertexA(sva);
+     
+      // VertexB
+      SVertex* svb;
+      READ_IF_NON_NULL(svb, g_vm->SVertices());
+      fe->SetVertexB(svb);
+
+      // NextEdge
+      FEdge* nfe;
+      READ_IF_NON_NULL(nfe, g_vm->FEdges());
+      fe->SetNextEdge(nfe);
+
+      // PreviousEdge
+      FEdge* pfe;
+      READ_IF_NON_NULL(pfe, g_vm->FEdges());
+      fe->SetPreviousEdge(pfe);
+
+      // ViewEdge
+      ViewEdge* ve;
+      READ_IF_NON_NULL(ve, g_vm->ViewEdges());
+      fe->SetViewEdge(ve);
+
+      // Face
+      // Not necessary (only used during view map computatiom)
+
+      Polygon3r p;
+    
+      // aFace
+      load(in, p);
+      fe->SetaFace(p);
+
+      // occludeeEmpty
+      READ(b);
+      fe->SetOccludeeEmpty(b);
+      
+      // occludeeIntersection
+      load(in, v);
+      fe->SetOccludeeIntersection(v);
+
+      return 0;
+    }
+
+
+    int load(istream& in, SVertex* sv) {
+
+      if (!sv)
+	return 1;
+
+      // Id
+      Id::id_type id1, id2;
+      READ(id1);
+      READ(id2);
+      sv->SetId(Id(id1, id2));
+
+      Vec3r v;
+
+      // Point3D
+      load(in, v);
+      sv->SetPoint3D(v);
+
+      // Point2D
+      load(in, v);
+      sv->SetPoint2D(v);
+
+      unsigned tmp;
+
+      // Shape
+      ViewShape* vs;
+      READ_IF_NON_NULL(vs, g_vm->ViewShapes());
+      sv->SetShape(vs->sshape());
+
+      // pViewVertex
+      ViewVertex* vv;
+      READ_IF_NON_NULL(vv, g_vm->ViewVertices());
+      sv->SetViewVertex(vv);
+
+      unsigned i, size;
+
+      // Normals (List)
+      READ(size);
+      for (i = 0; i < size; i++) {
+	load(in, v);
+	sv->AddNormal(v);
+      }
+
+      // FEdges (List)
+      READ(size);
+      FEdge* fe;
+      for (i = 0; i < size; i++) {
+	READ_IF_NON_NULL(fe, g_vm->FEdges());
+	sv->AddFEdge(fe);
+      }
+
+      return 0;
+    }
+
+
+    int load(istream& in, ViewEdge* ve) {
+
+      if (!ve)
+	return 1;
+
+      unsigned tmp;
+
+      // Id
+      Id::id_type id1, id2;
+      READ(id1);
+      READ(id2);
+      ve->SetId(Id(id1, id2));
+
+      // Nature
+      Nature::EdgeNature nature;
+      READ(nature);
+      ve->SetNature(nature);
+
+      // QI
+      READ(tmp);
+      ve->SetQI(tmp);
+
+      // Shape
+      ViewShape* vs;
+      READ_IF_NON_NULL(vs, g_vm->ViewShapes());
+      ve->SetShape(vs);
+
+      // aShape
+      ViewShape* avs;
+      READ_IF_NON_NULL(avs, g_vm->ViewShapes());
+      ve->SetaShape(avs);
+
+      // FEdgeA
+      FEdge* fea;
+      READ_IF_NON_NULL(fea, g_vm->FEdges());
+      ve->SetFEdgeA(fea);
+
+      // FEdgeB
+      FEdge* feb;
+      READ_IF_NON_NULL(feb, g_vm->FEdges());
+      ve->SetFEdgeB(feb);
+
+      // A
+      ViewVertex* vva;
+      READ_IF_NON_NULL(vva, g_vm->ViewVertices());
+      ve->SetA(vva);
+
+      // B
+      ViewVertex* vvb;
+      READ_IF_NON_NULL(vvb, g_vm->ViewVertices());
+      ve->SetB(vvb);
+
+      // Occluders (List)
+      if (!(Options::getFlags() & Options::NO_OCCLUDERS)) {
+	unsigned size;
+	READ(size);
+	ViewShape* vso;
+	for (unsigned i = 0; i < size; i++) {
+	  READ_IF_NON_NULL(vso, g_vm->ViewShapes());
+	  ve->AddOccluder(vso);
+        }
+      }
+
+      return 0;
+    }
+
+
+    int load(istream& in, ViewVertex* vv) {
+
+      if (!vv)
+	return 1;
+
+      unsigned	tmp;
+      bool	b;
+
+      // Nature
+      Nature::VertexNature nature;
+      READ(nature);
+      vv->setNature(nature);
+      
+      if (vv->getNature() & Nature::T_VERTEX) {
+	TVertex* tv = dynamic_cast<TVertex*>(vv);
+
+	// Id
+	Id::id_type id1, id2;
+	READ(id1);
+	READ(id2);
+	tv->SetId(Id(id1, id2));
+
+	// FrontSVertex
+	SVertex* fsv;
+	READ_IF_NON_NULL(fsv, g_vm->SVertices());
+	tv->SetFrontVertex(fsv);
+
+	// BackSVertex
+	SVertex* bsv;
+	READ_IF_NON_NULL(bsv, g_vm->SVertices());
+	tv->SetBackSVertex(bsv);
+
+	// FrontEdgeA
+	ViewEdge* fea;
+	READ_IF_NON_NULL(fea, g_vm->ViewEdges());
+	READ(b);
+	tv->SetFrontEdgeA(fea, b);
+
+	// FrontEdgeB
+	ViewEdge* feb;
+	READ_IF_NON_NULL(feb, g_vm->ViewEdges());
+	READ(b);
+	tv->SetFrontEdgeB(feb, b);
+
+	// BackEdgeA
+	ViewEdge* bea;
+	READ_IF_NON_NULL(bea, g_vm->ViewEdges());
+	READ(b);
+	tv->SetBackEdgeA(bea, b);
+
+	// BackEdgeB
+	ViewEdge* beb;
+	READ_IF_NON_NULL(beb, g_vm->ViewEdges());
+	READ(b);
+	tv->SetBackEdgeB(beb, b);
+      }
+      else if (vv->getNature() & Nature::NON_T_VERTEX) {
+	NonTVertex* ntv = dynamic_cast<NonTVertex*>(vv);
+	
+	// SVertex
+	SVertex* sv;
+	READ_IF_NON_NULL(sv, g_vm->SVertices());
+	ntv->SetSVertex(sv);
+	
+	// ViewEdges (List)
+	unsigned size;
+	READ(size);
+	ViewEdge* ve;
+	for (unsigned i = 0; i < size; i++) {
+	  READ_IF_NON_NULL(ve, g_vm->ViewEdges());
+	  READ(b);
+	  ntv->AddViewEdge(ve, b);
+	}
+      }
+      
+      return 0;
+    }
+
+    //////////////////// 'save' Functions ////////////////////
+
+    inline
+    int save(ostream& out, const Vec3r& v) {
+
+      if (Options::getFlags() & Options::FLOAT_VECTORS) {
+	float tmp;
+
+	tmp = v[0];
+	WRITE(tmp);
+	tmp = v[1];
+	WRITE(tmp);
+	tmp = v[2];
+	WRITE(tmp);
+      } else {
+	Vec3r::value_type tmp;
+
+	tmp = v[0];
+	WRITE(tmp);
+	tmp = v[1];
+	WRITE(tmp);
+	tmp = v[2];
+	WRITE(tmp);
+      }
+      return 0;
+    }
+
+
+    inline
+    int save(ostream& out, const Polygon3r& p) {
+
+      unsigned tmp;
+
+      // Id
+      tmp = p.getId();
+      WRITE(tmp);
+
+      // vertices (List)
+      tmp = p.getVertices().size();
+      WRITE(tmp);
+      for (vector<Vec3r>::const_iterator i = p.getVertices().begin();
+	   i != p.getVertices().end(); i++) {
+	save(out, *i);
+      }
+
+      // min & max
+      // Do not need to be saved
+
+      return 0;
+    }
+
+
+    inline
+    int save(ostream& out, const Material& m) {
+
+      unsigned i;
+      
+      // Diffuse
+      for (i = 0; i < 4; i++)
+	WRITE(m.diffuse()[i]);
+      
+      // Specular
+      for (i = 0; i < 4; i++)
+	WRITE(m.specular()[i]);
+
+      // Ambient
+      for (i = 0; i < 4; i++)
+	WRITE(m.ambient()[i]);
+      
+      // Emission
+      for (i = 0; i < 4; i++)
+	WRITE(m.emission()[i]);
+
+      // Shininess
+      float shininess = m.shininess();      
+      WRITE(shininess);
+
+      return 0;
+    }
+
+
+    int save(ostream& out, ViewShape* vs) {
+
+      if (!vs || !vs->sshape()) {
+	cerr << "Warning: null ViewShape" << endl;
+	return 1;
+      }
+
+      unsigned tmp;
+
+      // SShape
+
+      // -> Id
+      Id::id_type id = vs->sshape()->getId().getFirst();
+      WRITE(id);
+      id = vs->sshape()->getId().getSecond();
+      WRITE(id);
+
+      // -> Importance
+      float importance = vs->sshape()->importance();
+      WRITE(importance);
+
+      // -> BBox
+      //    Not necessary (only used during view map computatiom)
+
+      // -> Material
+      unsigned size = vs->sshape()->materials().size();
+      WRITE(size);
+      for(unsigned i=0; i<size; ++i)
+        save(out, vs->sshape()->material(i));
+
+      // -> VerticesList (List)
+      tmp = vs->sshape()->GetVertexList().size();
+      WRITE(tmp);
+      for (vector<SVertex*>::const_iterator i1 = vs->sshape()->GetVertexList().begin();
+	   i1 != vs->sshape()->GetVertexList().end(); i1++)
+	WRITE_IF_NON_NULL(*i1);
+
+      // -> Chains (List)
+      tmp = vs->sshape()->GetChains().size();
+      WRITE(tmp);
+      for (vector<FEdge*>::const_iterator i2 = vs->sshape()->GetChains().begin();
+	   i2 != vs->sshape()->GetChains().end(); i2++)
+	WRITE_IF_NON_NULL(*i2);
+
+      // -> EdgesList (List)
+      tmp = vs->sshape()->GetEdgeList().size();
+      WRITE(tmp);
+      for (vector<FEdge*>::const_iterator i3 = vs->sshape()->GetEdgeList().begin();
+	   i3 != vs->sshape()->GetEdgeList().end(); i3++)
+	WRITE_IF_NON_NULL(*i3);
+
+      // ViewEdges (List)
+      tmp = vs->edges().size();
+      WRITE(tmp);
+      for (vector<ViewEdge*>::const_iterator i4 = vs->edges().begin();
+	   i4 != vs->edges().end(); i4++)
+	WRITE_IF_NON_NULL(*i4);
+
+      // ViewVertices (List)
+      tmp = vs->vertices().size();
+      WRITE(tmp);
+      for (vector<ViewVertex*>::const_iterator i5 = vs->vertices().begin();
+	   i5 != vs->vertices().end(); i5++)
+	WRITE_IF_NON_NULL(*i5);
+
+      
+      return 0;
+    }
+
+
+    int save(ostream& out, FEdge* fe) {
+
+      if (!fe) {
+	cerr << "Warning: null FEdge" << endl;
+	return 1;
+      }
+
+      FEdgeSmooth * fesmooth = dynamic_cast<FEdgeSmooth*>(fe);
+      FEdgeSharp * fesharp =  dynamic_cast<FEdgeSharp*>(fe);
+      
+      // Id
+      Id::id_type id = fe->getId().getFirst();
+      WRITE(id);
+      id = fe->getId().getSecond();
+      WRITE(id);
+
+      // Nature
+      Nature::EdgeNature nature = fe->getNature();
+      WRITE(nature);
+
+      bool b;
+
+      // hasVisibilityPoint
+      //      b = fe->hasVisibilityPoint();
+      //      WRITE(b);
+
+      // VisibilityPointA
+      //      save(out, fe->visibilityPointA());
+      //
+      //      // VisibilityPointB
+      //      save(out, fe->visibilityPointB());
+
+      unsigned index;
+      if(fe->isSmooth()){
+        // normal
+        save(out, fesmooth->normal());
+        // material
+        index = fesmooth->materialIndex();
+        WRITE(index);
+      }else{
+        // aNormal
+        save(out, fesharp->normalA());
+        // bNormal
+        save(out, fesharp->normalB());
+        // aMaterial
+        index = fesharp->aMaterialIndex();
+        WRITE(index);
+        // bMaterial
+        index = fesharp->bMaterialIndex();
+        WRITE(index);
+      }
+      
+
+      // VertexA
+      WRITE_IF_NON_NULL(fe->vertexA());
+
+      // VertexB
+      WRITE_IF_NON_NULL(fe->vertexB());
+
+      // NextEdge
+      WRITE_IF_NON_NULL(fe->nextEdge());
+
+      // PreviousEdge
+      WRITE_IF_NON_NULL(fe->previousEdge());
+
+      // ViewEdge
+      WRITE_IF_NON_NULL(fe->viewedge());
+
+      // Face
+      // Not necessary (only used during view map computatiom)
+
+      // aFace
+      save(out, (Polygon3r&)fe->aFace());
+
+      // occludeeEmpty
+      b = fe->getOccludeeEmpty();
+      WRITE(b);
+
+      // occludeeIntersection
+      save(out, fe->getOccludeeIntersection());
+
+      return 0;
+    }
+
+
+    int save(ostream& out, SVertex* sv) {
+
+      if (!sv) {
+	cerr << "Warning: null SVertex" << endl;
+	return 1;
+      }
+
+      unsigned tmp;
+
+      // Id
+      Id::id_type id = sv->getId().getFirst();
+      WRITE(id);
+      id = sv->getId().getSecond();
+      WRITE(id);
+
+      Vec3r v;
+
+      // Point3D
+      v = sv->point3D();
+      save(out, sv->point3D());
+
+      // Point2D
+      v = sv->point2D();
+      save(out, v);
+
+      // Shape
+      WRITE_IF_NON_NULL(sv->shape());
+
+      // pViewVertex
+      WRITE_IF_NON_NULL(sv->viewvertex());
+
+      // Normals (List)
+      // Note: the 'size()' method of a set doesn't seem to return the
+      // actual size of the given set, so we have to hack it...
+      set<Vec3r>::const_iterator i;
+      for (i = sv->normals().begin(), tmp = 0;
+	   i != sv->normals().end();
+	   i++, tmp++);
+      WRITE(tmp);
+      for (i = sv->normals().begin(); i != sv->normals().end(); i++)
+	save(out, *i);
+
+      // FEdges (List)
+      tmp = sv->fedges().size();
+      WRITE(tmp);
+      for (vector<FEdge*>::const_iterator j = sv->fedges_begin();
+	   j != sv->fedges_end(); j++)
+	WRITE_IF_NON_NULL(*j);
+
+      return 0;
+    }
+
+
+    int save(ostream& out, ViewEdge* ve) {
+
+      if (!ve) {
+	cerr << "Warning: null ViewEdge" << endl;
+	return 1;
+      }
+
+      unsigned tmp;
+
+      // Id
+      Id::id_type id = ve->getId().getFirst();
+      WRITE(id);
+      id = ve->getId().getSecond();
+      WRITE(id);
+
+      // Nature
+      Nature::EdgeNature nature = ve->getNature();
+      WRITE(nature);
+
+      // QI
+      unsigned qi = ve->qi();
+      WRITE(qi);
+
+      // Shape
+      WRITE_IF_NON_NULL(ve->shape());
+
+      // aShape
+      WRITE_IF_NON_NULL(ve->aShape());
+    
+      // FEdgeA
+      WRITE_IF_NON_NULL(ve->fedgeA());
+    
+      // FEdgeB
+      WRITE_IF_NON_NULL(ve->fedgeB());
+   
+      // A
+      WRITE_IF_NON_NULL(ve->A());
+
+      // B
+      WRITE_IF_NON_NULL(ve->B());
+
+      // Occluders (List)
+      if (!(Options::getFlags() & Options::NO_OCCLUDERS)) {
+        tmp = ve->occluders().size();
+        WRITE(tmp);
+        for (vector<ViewShape*>::const_iterator i = ve->occluders().begin();
+	     i != ve->occluders().end(); i++)
+          WRITE_IF_NON_NULL((*i));
+      }
+
+      return 0;
+    }
+
+
+    int save(ostream& out, ViewVertex* vv) {
+
+      if (!vv) {
+	cerr << "Warning: null ViewVertex" << endl;
+	return 1;
+      }
+
+      // Nature
+      Nature::VertexNature nature = vv->getNature();
+      WRITE(nature);
+      
+      if (vv->getNature() & Nature::T_VERTEX) {
+	TVertex* tv = dynamic_cast<TVertex*>(vv);
+	
+	// Id
+	Id::id_type id = tv->getId().getFirst();
+	WRITE(id);
+	id = tv->getId().getSecond();
+	WRITE(id);
+
+	// FrontSVertex
+	WRITE_IF_NON_NULL(tv->frontSVertex());
+	
+	// BackSVertex
+	WRITE_IF_NON_NULL(tv->backSVertex());
+	
+	// FrontEdgeA
+	WRITE_IF_NON_NULL(tv->frontEdgeA().first);
+	WRITE(tv->frontEdgeA().second);
+	
+	// FrontEdgeB
+	WRITE_IF_NON_NULL(tv->frontEdgeB().first);
+	WRITE(tv->frontEdgeB().second);
+	
+	// BackEdgeA
+	WRITE_IF_NON_NULL(tv->backEdgeA().first);
+	WRITE(tv->backEdgeA().second);
+	
+	// BackEdgeB
+	WRITE_IF_NON_NULL(tv->backEdgeB().first);
+	WRITE(tv->backEdgeB().second);
+	
+      } 
+      else if (vv->getNature() & Nature::NON_T_VERTEX) {
+	NonTVertex* ntv = dynamic_cast<NonTVertex*>(vv);
+	
+	// SVertex
+	WRITE_IF_NON_NULL(ntv->svertex());
+	
+	// ViewEdges (List)
+	unsigned size = ntv->viewedges().size();
+	WRITE(size);
+        vector<ViewVertex::directedViewEdge>::const_iterator i = ntv->viewedges().begin();
+	for ( ; i != ntv->viewedges().end(); i++){
+	  WRITE_IF_NON_NULL(i->first);
+	  WRITE(i->second);
+	}
+
+      } else {
+	cerr << "Warning: unexpected ViewVertex nature" << endl;
+	return 1;
+      }
+      
+      return 0;
+    }
+
+  } // End of namespace Internal
+  
+  
+  //////////////////// "Public" 'load' and 'save' functions ////////////////////
+
+#define SET_PROGRESS(n) if (pb) pb->setProgress((n))
+
+  int load(istream& in, ViewMap* vm, ProgressBar* pb) {
+
+    if (!vm)
+      return 1;
+
+    unsigned tmp;
+
+    int err = 0;
+
+    Internal::g_vm = vm;
+
+    // Management of the progress bar (if present)
+    if (pb) {
+      pb->reset();
+      pb->setLabelText("Loading View Map...");
+      pb->setTotalSteps(6);
+      pb->setProgress(0);
+    }
+
+    // Read and set the options
+    unsigned char flags;
+    READ(flags);
+    Options::setFlags(flags);
+
+    // Read the size of the five ViewMap's lists (with some extra informations for the ViewVertices)
+    // and instantiate them (with default costructors)
+    unsigned vs_s, fe_s, fe_rle1, fe_rle2, sv_s, ve_s, vv_s, vv_rle1, vv_rle2;
+    READ(vs_s);
+    READ(fe_s);
+    
+    if (fe_s) {
+      bool b;
+      READ(b);
+      for (READ(fe_rle1), fe_rle2 = 0;
+      fe_rle1 < fe_s+1;
+      fe_rle2 = fe_rle1, READ(fe_rle1)) {
+        if (b) {
+          for (unsigned i = fe_rle2; i < fe_rle1; i++) {
+            FEdgeSmooth * fes = new FEdgeSmooth;
+            vm->AddFEdge(fes);
+          }
+          b = !b;
+        }
+        else if (!b) {
+          for (unsigned i = fe_rle2; i < fe_rle1; i++) {
+            FEdgeSharp * fes = new FEdgeSharp;
+            vm->AddFEdge(fes);
+          }
+          b = !b;
+        }
+      }
+    }
+
+    READ(sv_s);
+    READ(ve_s);
+    READ(vv_s);
+
+    if (vv_s) {
+      Nature::VertexNature nature;
+      READ(nature);
+      for (READ(vv_rle1), vv_rle2 = 0;
+      vv_rle1 < vv_s+1;
+      vv_rle2 = vv_rle1, READ(vv_rle1)) {
+        if (nature & Nature::T_VERTEX) {
+          for (unsigned i = vv_rle2; i < vv_rle1; i++) {
+            TVertex* tv = new TVertex();
+            vm->AddViewVertex(tv);
+          }
+          nature = Nature::NON_T_VERTEX;
+        }
+        else if (nature & Nature::NON_T_VERTEX) {
+          for (unsigned i = vv_rle2; i < vv_rle1; i++) {
+            NonTVertex* ntv = new NonTVertex();
+            vm->AddViewVertex(ntv);
+          }
+          nature = Nature::T_VERTEX;
+        }
+      }
+    }
+
+    for (unsigned i0 = 0; i0 < vs_s; i0++) {
+      SShape* ss = new SShape();
+      ViewShape* vs = new ViewShape();
+      vs->SetSShape(ss);
+      ss->SetViewShape(vs);
+      vm->AddViewShape(vs);
+    }
+    //    for (unsigned i1 = 0; i1 < fe_s; i1++) {
+    //      FEdge* fe = new FEdge();
+    //      vm->AddFEdge(fe);
+    //    }
+    for (unsigned i2 = 0; i2 < sv_s; i2++) {
+      SVertex* sv = new SVertex();
+      vm->AddSVertex(sv);
+    }
+    for (unsigned i3 = 0; i3 < ve_s; i3++) {
+      ViewEdge* ve = new ViewEdge();
+      vm->AddViewEdge(ve);
+    }
+
+    
+    // Read the values for all the objects created above
+    SET_PROGRESS(1);
+    for (vector<ViewShape*>::const_iterator i4 = vm->ViewShapes().begin();
+	 i4 != vm->ViewShapes().end(); i4++)
+      err += Internal::load(in, *i4);
+    SET_PROGRESS(2);
+    for (vector<FEdge*>::const_iterator i5 = vm->FEdges().begin();
+	 i5 != vm->FEdges().end(); i5++)
+      err += Internal::load(in, *i5);
+    SET_PROGRESS(3);
+    for (vector<SVertex*>::const_iterator i6 = vm->SVertices().begin();
+	 i6 != vm->SVertices().end(); i6++)
+      err += Internal::load(in, *i6);
+    SET_PROGRESS(4);
+    for (vector<ViewEdge*>::const_iterator i7 = vm->ViewEdges().begin();
+	 i7 != vm->ViewEdges().end(); i7++)
+      err += Internal::load(in, *i7);
+    SET_PROGRESS(5);
+    for (vector<ViewVertex*>::const_iterator i8 = vm->ViewVertices().begin();
+	 i8 != vm->ViewVertices().end(); i8++)
+      err += Internal::load(in, *i8);
+    SET_PROGRESS(6);
+
+    // Read the shape id to index mapping
+    unsigned map_s;
+    READ(map_s);
+    unsigned id,index;
+    for(unsigned i4=0;i4<map_s;++i4){
+        READ(id);
+        READ(index);
+        vm->shapeIdToIndexMap()[id] = index;
+    }
+    
+    return err;
+  }
+
+
+  int save(ostream& out, ViewMap* vm, ProgressBar* pb) {
+
+    if (!vm)
+      return 1;
+
+    int err = 0;
+
+    // Management of the progress bar (if present)
+    if (pb) {
+      pb->reset();
+      pb->setLabelText("Saving View Map...");
+      pb->setTotalSteps(6);
+      pb->setProgress(0);
+    }
+
+    // For every object, initialize its userdata member to its index in the ViewMap list
+    for (unsigned i0 = 0; i0 < vm->ViewShapes().size(); i0++) {
+      vm->ViewShapes()[i0]->userdata = (void*)i0;
+      vm->ViewShapes()[i0]->sshape()->userdata = (void*)i0;
+    }
+    for (unsigned i1 = 0; i1 < vm->FEdges().size(); i1++)
+      vm->FEdges()[i1]->userdata = (void*)i1;
+    for (unsigned i2 = 0; i2 < vm->SVertices().size(); i2++)
+      vm->SVertices()[i2]->userdata = (void*)i2;
+    for (unsigned i3 = 0; i3 < vm->ViewEdges().size(); i3++)
+      vm->ViewEdges()[i3]->userdata = (void*)i3;
+    for (unsigned i4 = 0; i4 < vm->ViewVertices().size(); i4++)
+      vm->ViewVertices()[i4]->userdata = (void*)i4;
+
+    // Write the current options
+    unsigned char flags = Options::getFlags();
+    WRITE(flags);
+
+    // Write the size of the five lists (with some extra informations for the ViewVertices)
+    unsigned size;
+    size = vm->ViewShapes().size();
+    WRITE(size);
+    size = vm->FEdges().size();
+    WRITE(size);
+    if (size) {
+      bool b = vm->FEdges()[0]->isSmooth();
+      WRITE(b);
+      for (unsigned i = 0; i < size; i++) {
+	while (i < size && (vm->FEdges()[i]->isSmooth() == b))
+	  i++;
+	if (i < size) {
+	  WRITE(i);
+          b = !b;
+	}
+      }
+      WRITE(size);
+      size++;
+      WRITE(size);
+    }
+    size = vm->SVertices().size();
+    WRITE(size);
+    size = vm->ViewEdges().size();
+    WRITE(size);
+    size = vm->ViewVertices().size();
+    WRITE(size);
+    if (size) {
+      Nature::VertexNature nature = vm->ViewVertices()[0]->getNature();
+      WRITE(nature);
+      nature &= ~Nature::VIEW_VERTEX;
+      for (unsigned i = 0; i < size; i++) {
+	while (i < size && (vm->ViewVertices()[i]->getNature() & nature))
+	  i++;
+	if (i < size) {
+	  WRITE(i);
+	  nature = vm->ViewVertices()[i]->getNature() & ~Nature::VIEW_VERTEX;
+	}
+      }
+      WRITE(size);
+      size++;
+      WRITE(size);
+    }
+
+
+    // Write all the elts of the ViewShapes List
+    SET_PROGRESS(1);
+    for (vector<ViewShape*>::const_iterator i5 = vm->ViewShapes().begin();
+	 i5 != vm->ViewShapes().end(); i5++)
+      err += Internal::save(out, *i5);
+    SET_PROGRESS(2);
+    for (vector<FEdge*>::const_iterator i6 = vm->FEdges().begin();
+	 i6 != vm->FEdges().end(); i6++)
+      err += Internal::save(out, *i6);
+    SET_PROGRESS(3);
+    for (vector<SVertex*>::const_iterator i7 = vm->SVertices().begin();
+	 i7 != vm->SVertices().end(); i7++)
+      err += Internal::save(out, *i7);
+    SET_PROGRESS(4);
+    for (vector<ViewEdge*>::const_iterator i8 = vm->ViewEdges().begin();
+	 i8 != vm->ViewEdges().end(); i8++)
+      err += Internal::save(out, *i8);
+    SET_PROGRESS(5);
+    for (vector<ViewVertex*>::const_iterator i9 = vm->ViewVertices().begin();
+	 i9 != vm->ViewVertices().end(); i9++)
+      err += Internal::save(out, *i9);
+
+    // Write the shape id to index mapping
+    size = vm->shapeIdToIndexMap().size();
+    WRITE(size);
+    unsigned id,index;
+    for(ViewMap::id_to_index_map::iterator mit=vm->shapeIdToIndexMap().begin(), mitend=vm->shapeIdToIndexMap().end(); mit!=mitend; ++mit){
+        id = mit->first;
+        index = mit->second;
+        WRITE(id);
+        WRITE(index);
+    }
+
+    // Reset 'userdata' members
+    for (vector<ViewShape*>::const_iterator j0 = vm->ViewShapes().begin();
+	 j0 != vm->ViewShapes().end(); j0++) {
+      (*j0)->userdata = 0;
+      (*j0)->sshape()->userdata = 0;
+    }
+    for (vector<FEdge*>::const_iterator j1 = vm->FEdges().begin();
+	 j1 != vm->FEdges().end(); j1++)
+      (*j1)->userdata = 0;
+    for (vector<SVertex*>::const_iterator j2 = vm->SVertices().begin();
+	 j2 != vm->SVertices().end(); j2++)
+      (*j2)->userdata = 0;
+    for (vector<ViewEdge*>::const_iterator j3 = vm->ViewEdges().begin();
+	 j3 != vm->ViewEdges().end(); j3++)
+      (*j3)->userdata = 0;
+    for (vector<ViewVertex*>::const_iterator j4 = vm->ViewVertices().begin();
+	 j4 != vm->ViewVertices().end(); j4++)
+      (*j4)->userdata = 0;
+    SET_PROGRESS(6);
+
+    return err;
+  }
+
+
+  //////////////////// Options ////////////////////
+
+  namespace Options {
+
+  namespace Internal {
+
+    static unsigned char g_flags = 0;
+    static string        g_models_path;
+
+  } // End of namespace Internal
+
+    void setFlags(const unsigned char flags) {
+      Internal::g_flags = flags;
+    }
+
+    void addFlags(const unsigned char flags) {
+      Internal::g_flags |= flags;
+    }
+    
+    void rmFlags(const unsigned char flags) {
+      Internal::g_flags &= ~flags;
+    }
+    
+    unsigned char getFlags() {
+      return Internal::g_flags;
+    }
+
+    void		setModelsPath(const string& path) {
+      Internal::g_models_path = path;
+    }
+
+    string		getModelsPath() {
+      return Internal::g_models_path;
+    }
+
+  }; // End of namepace Options
+
+} // End of namespace ViewMapIO
diff --git a/extern/freestyle/src/view_map/ViewMapIO.h b/extern/freestyle/src/view_map/ViewMapIO.h
new file mode 100755
index 00000000000..33e168b537b
--- /dev/null
+++ b/extern/freestyle/src/view_map/ViewMapIO.h
@@ -0,0 +1,116 @@
+//
+//  Filename         : ViewMapIO.h
+//  Author(s)        : Emmanuel Turquin
+//  Purpose          : Functions to manage I/O for the view map
+//  Date of creation : 09/01/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  VIEWMAPIO_H
+# define VIEWMAPIO_H
+
+# include <fstream>
+# include <string>
+# include "../system/FreestyleConfig.h"
+# include "../system/ProgressBar.h"
+# include "ViewMap.h"
+
+namespace ViewMapIO {
+
+  static const unsigned ZERO  = UINT_MAX;
+
+  LIB_VIEW_MAP_EXPORT
+  int load(istream& in, ViewMap* vm, ProgressBar* pb = NULL);
+
+  LIB_VIEW_MAP_EXPORT
+  int save(ostream& out, ViewMap* vm, ProgressBar* pb = NULL);
+
+  namespace Options {
+    
+    static const unsigned char FLOAT_VECTORS = 1;
+    static const unsigned char NO_OCCLUDERS  = 2;
+    
+    LIB_VIEW_MAP_EXPORT
+    void		setFlags(const unsigned char flags);
+    
+    LIB_VIEW_MAP_EXPORT
+    void		addFlags(const unsigned char flags);
+
+    LIB_VIEW_MAP_EXPORT
+    void		rmFlags(const unsigned char flags);
+
+    LIB_VIEW_MAP_EXPORT
+    unsigned char	getFlags();
+    
+    LIB_VIEW_MAP_EXPORT
+    void		setModelsPath(const string& path);
+
+    LIB_VIEW_MAP_EXPORT
+    string		getModelsPath();
+
+  }; // End of namepace Options
+
+# ifdef IRIX
+  
+  namespace Internal {
+    
+    template <unsigned S>
+    ostream& write(ostream& out, const char* str) {
+      out.put(str[S - 1]);
+      return write<S - 1>(out, str);
+    }
+    
+    template<>
+    ostream& write<1>(ostream& out, const char* str) {
+      return out.put(str[0]);
+    }
+
+    template<>
+    ostream& write<0>(ostream& out, const char*) {
+      return out;
+    }
+
+    template <unsigned S>
+    istream& read(istream& in, char* str) {
+      in.get(str[S - 1]);
+      return read<S - 1>(in, str);
+    }
+    
+    template<>
+    istream& read<1>(istream& in, char* str) {
+      return in.get(str[0]);
+    }
+
+    template<>
+    istream& read<0>(istream& in, char*) {
+      return in;
+    }
+    
+  } // End of namespace Internal
+
+# endif // IRIX
+
+} // End of namespace ViewMapIO
+
+#endif // VIEWMAPIO_H
diff --git a/extern/freestyle/src/view_map/ViewMapIterators.h b/extern/freestyle/src/view_map/ViewMapIterators.h
new file mode 100755
index 00000000000..004674ba758
--- /dev/null
+++ b/extern/freestyle/src/view_map/ViewMapIterators.h
@@ -0,0 +1,542 @@
+//
+//  Filename         : ViewMapIterators.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Iterators used to iterate over the various elements
+//                     of the ViewMap
+//  Date of creation : 01/07/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  VIEWMAPITERATORS_H
+# define VIEWMAPITERATORS_H
+
+#include "ViewMap.h"
+
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             ViewMap            */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             ViewVertex         */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+namespace ViewVertexInternal{
+
+  /*! Class representing an iterator over oriented ViewEdges
+   *  around a ViewVertex. This iterator allows a CCW iteration
+   *  (in the image plane).
+   *  An instance of an orientedViewEdgeIterator can only
+   *  be obtained from a ViewVertex by calling edgesBegin() or edgesEnd().
+   */
+  class orientedViewEdgeIterator 
+  {
+  public:
+    friend class ViewVertex;
+    friend class TVertex;
+    friend class NonTVertex;
+    friend class ViewEdge;
+
+    // FIXME
+    typedef ::TVertex::edge_pointers_container edge_pointers_container;
+    typedef ::NonTVertex::edges_container edges_container;
+  protected:
+
+    Nature::VertexNature _Nature; // the nature of the underlying vertex
+    // T vertex attributes
+    edge_pointers_container::iterator _tbegin;
+    edge_pointers_container::iterator _tend;
+    edge_pointers_container::iterator _tvertex_iter;
+
+    // Non TVertex attributes
+    edges_container::iterator _begin;
+    edges_container::iterator _end;
+    edges_container::iterator _nontvertex_iter;
+
+  public:
+    /*! Default constructor */
+    inline orientedViewEdgeIterator() {}
+    inline orientedViewEdgeIterator(Nature::VertexNature iNature)
+    {_Nature = iNature;}
+    /*! Copy constructor */
+    orientedViewEdgeIterator(const orientedViewEdgeIterator& iBrother)
+    {
+      _Nature = iBrother._Nature;
+      if(_Nature & Nature::T_VERTEX)
+      {
+        _tbegin = iBrother._tbegin;
+        _tend = iBrother._tend;
+        _tvertex_iter = iBrother._tvertex_iter;
+      }
+      else
+      {
+        _begin = iBrother._begin;
+        _end = iBrother._end;
+        _nontvertex_iter = iBrother._nontvertex_iter;
+      }
+    }
+    virtual ~orientedViewEdgeIterator() {}
+ 
+  public:
+    inline orientedViewEdgeIterator(edge_pointers_container::iterator begin, 
+      edge_pointers_container::iterator end,
+      edge_pointers_container::iterator iter)
+    {
+      _Nature = Nature::T_VERTEX;
+      _tbegin = begin;
+      _tend = end;
+      _tvertex_iter = iter;
+    } 
+    inline orientedViewEdgeIterator(edges_container::iterator begin, 
+      edges_container::iterator end,
+      edges_container::iterator iter)
+    {
+      _Nature = Nature::NON_T_VERTEX;
+      _begin = begin;
+      _end = end;
+      _nontvertex_iter = iter;
+    } 
+
+  public:
+
+
+    /*! Tells whether the ViewEdge pointed
+     * by this iterator is the first one of the
+     * iteration list or not.
+     */
+    virtual bool isBegin() const 
+    {
+      if(_Nature & Nature::T_VERTEX)
+        return (_tvertex_iter == _tbegin);
+      else
+        return (_nontvertex_iter == _begin);
+    }
+    /*! Tells whether the ViewEdge pointed
+     * by this iterator is after the last one of the
+     * iteration list or not.
+     */
+    virtual bool isEnd() const 
+    {
+      if(_Nature & Nature::T_VERTEX)
+        return (_tvertex_iter == _tend);
+      else
+        return (_nontvertex_iter == _end);
+    }
+
+    // operators
+    /*! Increments.In the scripting language, call
+     *  "increment()".
+     */
+    virtual orientedViewEdgeIterator& operator++()  // operator corresponding to ++i
+    { 
+      increment();
+      return *this;
+    }
+    /*! Increments.In the scripting language, call
+     *  "increment()".
+     */
+    virtual orientedViewEdgeIterator operator++(int)  // opérateur correspondant à i++ 
+    {                                  // c.a.d qui renvoie la valeur *puis* incrémente.
+      orientedViewEdgeIterator tmp = *this;        // C'est pour cela qu'on stocke la valeur
+      increment();                    // dans un temporaire. 
+      return tmp;
+    } 
+  
+    // comparibility
+    /*! operator != */
+    virtual bool operator!=(const orientedViewEdgeIterator& b) const
+    {
+      if(_Nature & Nature::T_VERTEX)
+        return (_tvertex_iter != b._tvertex_iter);
+      else
+        return (_nontvertex_iter != b._nontvertex_iter);
+    }
+
+    /*! operator == */
+    virtual bool operator==(const orientedViewEdgeIterator& b) const
+    {return !(*this != b);}
+    
+    // dereferencing
+    /*! Returns a reference to the pointed orientedViewEdge.
+     *  In the scripting language, you must call
+     *  "getObject()"instead.
+     */
+    virtual ::ViewVertex::directedViewEdge& operator*() const
+    {
+      if(_Nature & Nature::T_VERTEX)
+        //return _tvertex_iter;
+        return **_tvertex_iter;
+      else
+        return (*_nontvertex_iter);
+    }
+    /*! Returns a pointer to the pointed orientedViewEdge.
+     * Can't be called in the scripting language.
+     */
+    virtual ::ViewVertex::directedViewEdge* operator->() const { return &(operator*());}
+
+  public:
+    /*! increments.*/
+    inline void increment()
+    {
+      if(_Nature & Nature::T_VERTEX)
+      { 
+        ::ViewVertex::directedViewEdge tmp = (**_tvertex_iter);
+        ++_tvertex_iter;
+        if(_tvertex_iter != _tend){
+          // FIXME : pquoi deja ?
+          ::ViewVertex::directedViewEdge tmp2 = (**_tvertex_iter);
+          if(tmp2.first == tmp.first)
+            ++_tvertex_iter;
+        }
+      }
+      else
+        ++_nontvertex_iter;
+    }
+  };
+
+  }
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             ViewEdge           */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+namespace ViewEdgeInternal {
+//
+// SVertexIterator
+//
+/////////////////////////////////////////////////
+
+  class SVertexIterator : public Interface0DIteratorNested
+  {
+  public:
+
+    SVertexIterator() {
+      _vertex = NULL;
+      _begin = NULL;
+      _previous_edge = NULL;
+      _next_edge = NULL;
+      _t = 0;
+    }
+
+    SVertexIterator(const SVertexIterator& vi) {
+      _vertex = vi._vertex;
+      _begin = vi._begin;
+      _previous_edge = vi._previous_edge;
+      _next_edge = vi._next_edge;
+      _t = vi._t;
+    }
+
+    SVertexIterator(SVertex* v, SVertex* begin, FEdge* prev, FEdge* next, float t) {
+      _vertex = v;
+      _begin = begin;
+      _previous_edge = prev;
+      _next_edge = next;
+      _t = t;
+    }
+
+    SVertexIterator& operator=(const SVertexIterator& vi) {
+      _vertex = vi._vertex;
+      _begin = vi._begin;
+      _previous_edge = vi._previous_edge;
+      _next_edge = vi._next_edge;
+      _t = vi._t;
+      return *this;
+    }
+
+    virtual ~SVertexIterator() {}
+
+    virtual string getExactTypeName() const {
+      return "SVertexIterator";
+    }
+
+    virtual SVertex& operator*() {
+      return *_vertex;
+    }
+
+    virtual SVertex* operator->() {
+      return &(operator*());
+    }
+
+    virtual SVertexIterator& operator++() {
+      increment();
+      return *this;
+    }
+
+    virtual SVertexIterator operator++(int) {
+      SVertexIterator ret(*this);
+      increment();
+      return ret;
+    }
+
+    virtual SVertexIterator& operator--() {
+      decrement();
+      return *this;
+    }
+
+    virtual SVertexIterator operator--(int) {
+      SVertexIterator ret(*this);
+      decrement();
+      return ret;
+    }
+
+    virtual void increment(){
+      if (!_next_edge) {
+	      _vertex = 0;
+	    return;
+      }
+      _t += (float)_next_edge->getLength2D();
+      _vertex = _next_edge->vertexB();
+      _previous_edge = _next_edge;
+      _next_edge = _next_edge->nextEdge();
+      
+    }
+    virtual void decrement(){
+      if (!_previous_edge) {
+	      _vertex = 0;
+	    return;
+      }
+      if((!_next_edge) && (!_vertex)){
+        _vertex = _previous_edge->vertexB();
+        return;
+      }
+      _t -= (float)_previous_edge->getLength2D();
+      _vertex = _previous_edge->vertexA();
+      _next_edge = _previous_edge;
+      _previous_edge = _previous_edge->previousEdge();
+  } 
+
+    bool isBegin() const {
+      return _vertex == _begin;
+    }
+
+    bool isEnd() const {
+      return (!_vertex) || (_vertex == _begin && _previous_edge);
+    }
+
+    virtual float t() const {
+      return _t;
+    }
+    virtual float u() const {
+      return _t/(float)_next_edge->viewedge()->getLength2D();
+    }
+
+    virtual bool operator==(const Interface0DIteratorNested& it) const {
+      const SVertexIterator* it_exact = dynamic_cast<const SVertexIterator*>(&it);
+      if (!it_exact)
+	return false;
+      return (_vertex == it_exact->_vertex);
+    }
+
+    virtual SVertexIterator* copy() const {
+      return new SVertexIterator(*this);
+    }
+
+  private:
+
+    SVertex*	_vertex;
+    SVertex*	_begin;
+    FEdge*	_previous_edge;
+    FEdge*	_next_edge;
+    float _t; // curvilinear abscissa
+  };
+
+
+
+//
+// ViewEdgeIterator (base class)
+//
+///////////////////////////////////////////////////////////
+
+  /*! Base class for iterators over ViewEdges of the ViewMap Graph.
+   *  Basically the "increment()" operator of this class should
+   *  be able to take the decision of "where" (on which ViewEdge) to go
+   *  when pointing on a given ViewEdge.
+   *  ::Caution::: the dereferencing operator returns a *pointer* to
+   *  the pointed ViewEdge.
+   */
+class ViewEdgeIterator
+{
+public:
+
+  /*! Builds a ViewEdgeIterator from a starting ViewEdge and its orientation.
+   *  \param begin
+   *    The ViewEdge from where to start the iteration.
+   *  \param orientation
+   *    If true, we'll look for the next ViewEdge among the
+   *    ViewEdges that surround the ending ViewVertex of begin.
+   *    If false, we'll search over the ViewEdges surrounding
+   *    the ending ViewVertex of begin.
+   */
+  ViewEdgeIterator(ViewEdge* begin = 0, bool orientation = true) {
+    _orientation = orientation;
+    _edge = begin;
+    _begin = begin;
+  }
+
+  /*! Copy constructor */
+  ViewEdgeIterator(const ViewEdgeIterator& it) {
+    _orientation = it._orientation;
+    _edge = it._edge;
+    _begin = it._begin;
+  }
+
+  virtual ~ViewEdgeIterator() {}
+
+  /*! Returns the string "ViewEdgeIterator" */
+  virtual string getExactTypeName() const {
+    return "ViewEdgeIterator";
+  }
+
+  /*! Returns the current pointed ViewEdge. */
+  ViewEdge* getCurrentEdge() {
+    return _edge;
+  }
+
+  /*! Sets the current pointed ViewEdge. */
+  void setCurrentEdge(ViewEdge* edge) {
+    _edge = edge;
+  }
+
+  /*! Returns the first ViewEdge used for the iteration. */
+  ViewEdge* getBegin() {
+    return _begin;
+  }
+
+  /*! Sets the first ViewEdge used for the iteration. */
+  void setBegin(ViewEdge* begin) {
+    _begin = begin;
+  }
+
+  /*! Gets the orientation of the pointed ViewEdge in the iteration. */
+  bool getOrientation() const {
+    return _orientation;
+  }
+
+  /*! Sets the orientation of the pointed ViewEdge in the iteration. */
+  void setOrientation(bool orientation) {
+    _orientation = orientation;
+  }
+
+  /*! Changes the current orientation. */
+  void changeOrientation() {
+    _orientation = !_orientation;
+  }
+
+  /*! Returns a *pointer* to the pointed ViewEdge. */
+  virtual ViewEdge* operator*() {
+    return _edge;
+  }
+
+  virtual ViewEdge* operator->() {
+    return operator*();
+  }
+
+  /*! Increments. In the scripting language, call
+   *  "increment()".
+   */
+  virtual ViewEdgeIterator& operator++() {
+    increment();
+    return *this;
+  }
+
+  /*! Increments. In the scripting language, call
+   *  "increment()".
+   */
+  virtual ViewEdgeIterator operator++(int) {
+    ViewEdgeIterator tmp(*this);
+    increment();
+    return tmp;
+  }
+
+  /*! increments. */
+  virtual void increment() {
+    cerr << "Warning: method increment() not implemented" << endl;
+  }
+
+  /*! Decrements. In the scripting language, call
+   *  "decrement()".
+   */
+  virtual ViewEdgeIterator& operator--() {
+    decrement();
+    return *this;
+  }
+
+  /*! Decrements. In the scripting language, call
+   *  "decrement()".
+   */
+  virtual ViewEdgeIterator operator--(int) {
+    ViewEdgeIterator tmp(*this);
+    decrement();
+    return tmp;
+  }
+
+  /*! decrements. */
+  virtual void decrement(){
+    cerr << "Warning: method decrement() not implemented" << endl;
+  }
+
+  /*! Returns true if the pointed ViewEdge is the
+   * first one used for the iteration.
+   */
+  virtual bool isBegin() const {
+    return _edge == _begin;
+  }
+
+  /*! Returns true if the pointed ViewEdge* equals 0. 
+   */
+  virtual bool isEnd() const {
+    return !_edge;
+  }
+
+  /*! operator == */
+  virtual bool operator==(ViewEdgeIterator& it) const {
+    return _edge == it._edge;
+  }
+
+  /*! operator != */
+  virtual bool operator!=(ViewEdgeIterator& it) const {
+    return !(*this == it);
+  }
+
+protected:
+
+  bool		_orientation;
+  ViewEdge*	_edge;
+  ViewEdge*	_begin;
+};
+
+} // end of namespace ViewEdgeInternal
+
+#endif // VIEWMAPITERATORS_H
+
diff --git a/extern/freestyle/src/view_map/ViewMapTesselator.cpp b/extern/freestyle/src/view_map/ViewMapTesselator.cpp
new file mode 100755
index 00000000000..6041f527d17
--- /dev/null
+++ b/extern/freestyle/src/view_map/ViewMapTesselator.cpp
@@ -0,0 +1,36 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "ViewMapTesselator.h"
+
+NodeGroup* ViewMapTesselator::Tesselate(ViewMap *iViewMap)
+{
+  if(0 == iViewMap->ViewEdges().size())
+    return NULL;
+
+  const vector<ViewEdge*>& viewedges = iViewMap->ViewEdges();
+  return Tesselate(viewedges.begin(), viewedges.end());
+}
+
+NodeGroup* ViewMapTesselator::Tesselate(WShape *)
+{
+  return NULL;
+}
diff --git a/extern/freestyle/src/view_map/ViewMapTesselator.h b/extern/freestyle/src/view_map/ViewMapTesselator.h
new file mode 100755
index 00000000000..fc1ec8e373e
--- /dev/null
+++ b/extern/freestyle/src/view_map/ViewMapTesselator.h
@@ -0,0 +1,196 @@
+//
+//  Filename         : ViewMapTesselator.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Class to build a Node Tree designed to be displayed 
+//                     from a Silhouette View Map structure.
+//  Date of creation : 26/03/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  VIEWMAPTESSELATOR_H
+# define VIEWMAPTESSELATOR_H
+
+# include "../scene_graph/NodeShape.h"
+# include "../winged_edge/WEdge.h"
+# include "Silhouette.h"
+# include "ViewMap.h"
+# include "../scene_graph/NodeGroup.h"
+# include "../scene_graph/LineRep.h"
+# include "../scene_graph/OrientedLineRep.h"
+# include "../scene_graph/VertexRep.h"
+
+class NodeShape;
+class NodeGroup;
+class SShape;
+class WShape;
+
+class LIB_VIEW_MAP_EXPORT ViewMapTesselator
+{
+public:
+
+  inline ViewMapTesselator() {_nature = Nature::SILHOUETTE | Nature::BORDER | Nature::CREASE;_Material.SetDiffuse(0,0,0,1);_overloadMaterial=false;}
+  virtual ~ViewMapTesselator() {}
+
+  /*! Builds a set of lines rep contained under a 
+   *  a NodeShape, itself contained under a NodeGroup from a ViewMap
+   */
+  NodeGroup* Tesselate(ViewMap* iViewMap) ;
+
+  /*! Builds a set of lines rep contained under a 
+   *  a NodeShape, itself contained under a NodeGroup from a 
+   *  set of view edges
+   */
+  template<class ViewEdgesIterator>
+  NodeGroup* Tesselate(ViewEdgesIterator begin, ViewEdgesIterator end) ;
+
+  /*! Builds a set of lines rep contained among a 
+   *  a NodeShape, from a WShape
+   */
+  NodeGroup* Tesselate(WShape* iWShape);
+
+  
+  inline void SetNature(Nature::EdgeNature iNature) {_nature = iNature;}
+  inline void SetMaterial(const Material& iMaterial) {_Material=iMaterial;_overloadMaterial=true;}
+  inline Nature::EdgeNature nature() {return _nature;}
+  inline const Material& material() const {return _Material;}
+
+protected:
+  virtual void AddVertexToLine(LineRep *iLine, SVertex *v) = 0;
+  
+private:
+  Nature::EdgeNature _nature;
+  Material _Material;
+  bool _overloadMaterial;
+};
+
+/*! Class to tesselate the 2D projected silhouette */
+class ViewMapTesselator2D : public ViewMapTesselator
+{
+public:
+  inline ViewMapTesselator2D() : ViewMapTesselator() {}
+  virtual ~ViewMapTesselator2D() {}
+
+protected:
+  virtual void AddVertexToLine(LineRep *iLine, SVertex *v)
+  {
+    iLine->AddVertex(v->point2D());
+  }
+};
+
+/*! Class to tesselate the 3D silhouette */
+class ViewMapTesselator3D : public ViewMapTesselator
+{
+public:
+  inline ViewMapTesselator3D() : ViewMapTesselator() {}
+  virtual ~ViewMapTesselator3D() {}
+
+protected:
+  virtual void AddVertexToLine(LineRep *iLine, SVertex *v)
+  {
+    iLine->AddVertex(v->point3D());
+  }
+};
+
+//
+// Implementation
+//
+///////////////////////////////////////////////
+
+template<class ViewEdgesIterator>
+NodeGroup * ViewMapTesselator::Tesselate(ViewEdgesIterator begin, ViewEdgesIterator end) 
+{
+  NodeGroup *group = new NodeGroup;
+  NodeShape *tshape = new NodeShape;
+  group->AddChild(tshape);
+  //tshape->material().SetDiffuse(0.f, 0.f, 0.f, 1.f);
+  tshape->SetMaterial(_Material);
+
+  LineRep* line;
+
+
+  FEdge *firstEdge;
+  FEdge *nextFEdge, *currentEdge;
+  
+  int id=0;
+  //  for(vector<ViewEdge*>::const_iterator c=viewedges.begin(),cend=viewedges.end();
+  //      c!=cend;
+  //      c++)
+  for(ViewEdgesIterator c=begin, cend=end;
+  c!=cend;
+  c++)
+    {
+    //    if((*c)->qi() > 0){
+    //      continue;
+    //    }
+        //      if(!((*c)->nature() & (_nature)))
+        //        continue;
+        //      
+      firstEdge = (*c)->fedgeA(); 
+
+      //      if(firstEdge->invisibility() > 0)
+      //        continue;
+      
+      line = new OrientedLineRep();
+      if(_overloadMaterial)
+        line->SetMaterial(_Material);
+
+      // there might be chains containing a single element
+      if(0 == (firstEdge)->nextEdge())
+      {
+        line->SetStyle(LineRep::LINES);
+        // line->AddVertex((*c)->vertexA()->point3D());
+        // line->AddVertex((*c)->vertexB()->point3D());
+        AddVertexToLine(line, firstEdge->vertexA());
+        AddVertexToLine(line, firstEdge->vertexB());
+      }
+      else
+      {
+        line->SetStyle(LineRep::LINE_STRIP);
+
+        //firstEdge = (*c);
+        nextFEdge = firstEdge;
+        currentEdge = firstEdge;
+        do
+        {
+          //line->AddVertex(nextFEdge->vertexA()->point3D());
+          AddVertexToLine(line, nextFEdge->vertexA());
+           currentEdge = nextFEdge;
+           nextFEdge = nextFEdge->nextEdge();
+         }while((nextFEdge != NULL) && (nextFEdge != firstEdge));
+        // Add the last vertex
+        //line->AddVertex(currentEdge->vertexB()->point3D());
+        AddVertexToLine(line, currentEdge->vertexB());
+                
+      }
+
+      line->SetId((*c)->getId().getFirst());
+      line->ComputeBBox();
+      tshape->AddRep(line);
+      id++;
+    }
+  
+  return group;
+}
+
+#endif // VIEWMAPTESSELATOR_H
diff --git a/extern/freestyle/src/view_map/src.pri b/extern/freestyle/src/view_map/src.pri
new file mode 100755
index 00000000000..2faf6a81fea
--- /dev/null
+++ b/extern/freestyle/src/view_map/src.pri
@@ -0,0 +1,34 @@
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#			      W A R N I N G ! ! !                             #
+#             a u t h o r i z e d    p e r s o n a l    o n l y               #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+
+VIEW_MAP_DIR = ../view_map
+
+SOURCES *= $${VIEW_MAP_DIR}/Functions0D.cpp \
+           $${VIEW_MAP_DIR}/Functions1D.cpp \
+	   $${VIEW_MAP_DIR}/Silhouette.cpp \
+	   $${VIEW_MAP_DIR}/SilhouetteGeomEngine.cpp \
+	   $${VIEW_MAP_DIR}/ViewMap.cpp \
+	   $${VIEW_MAP_DIR}/ViewMapBuilder.cpp \
+	   $${VIEW_MAP_DIR}/ViewMapIO.cpp \
+	   $${VIEW_MAP_DIR}/ViewMapTesselator.cpp \
+	   $${VIEW_MAP_DIR}/FEdgeXDetector.cpp \
+       $${VIEW_MAP_DIR}/ViewEdgeXBuilder.cpp \
+       $${VIEW_MAP_DIR}/SteerableViewMap.cpp 
+
+HEADERS *= $${VIEW_MAP_DIR}/Functions0D.h \
+           $${VIEW_MAP_DIR}/Functions1D.h \
+           $${VIEW_MAP_DIR}/Interface0D.h \
+           $${VIEW_MAP_DIR}/Interface1D.h \
+	   $${VIEW_MAP_DIR}/Silhouette.h \
+	   $${VIEW_MAP_DIR}/SilhouetteGeomEngine.h \
+	   $${VIEW_MAP_DIR}/ViewMap.h \
+           $${VIEW_MAP_DIR}/ViewMapAdvancedIterators.h \
+	   $${VIEW_MAP_DIR}/ViewMapBuilder.h \
+	   $${VIEW_MAP_DIR}/ViewMapIO.h \
+           $${VIEW_MAP_DIR}/ViewMapIterators.h \
+	   $${VIEW_MAP_DIR}/ViewMapTesselator.h \
+	   $${VIEW_MAP_DIR}/FEdgeXDetector.h \
+       $${VIEW_MAP_DIR}/ViewEdgeXBuilder.h \
+       $${VIEW_MAP_DIR}/SteerableViewMap.h 
diff --git a/extern/freestyle/src/view_map/view_map.pro b/extern/freestyle/src/view_map/view_map.pro
new file mode 100755
index 00000000000..ef629bcf6a7
--- /dev/null
+++ b/extern/freestyle/src/view_map/view_map.pro
@@ -0,0 +1,89 @@
+# This file should be viewed as a -*- mode: Makefile -*-
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#			      W A R N I N G ! ! !                             #
+#             a u t h o r i z e d    p e r s o n a l    o n l y               #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+
+include(../Config.pri)
+
+TEMPLATE        = lib
+
+TARGET          = $${LIB_VIEW_MAP}
+VERSION         = $${APPVERSION}
+TARGET_VERSION_EXT = $${APPVERSION_MAJ}.$${APPVERSION_MID}
+
+#
+# CONFIG
+#
+#######################################
+
+CONFIG          *= dll
+
+#
+# DEFINES
+#
+#######################################
+
+win32:DEFINES   *= MAKE_LIB_VIEW_MAP_DLL
+
+#
+# INCLUDE PATH
+#
+#######################################
+
+#INCLUDEPATH     *= ../geometry ../image ../scene_graph ../system ../winged_edge
+
+#
+# BUILD DIRECTORIES
+#
+#######################################
+
+BUILD_DIR       = ../../build
+
+OBJECTS_DIR     = $${BUILD_DIR}/$${REL_OBJECTS_DIR}
+!win32:DESTDIR  = $${BUILD_DIR}/$${REL_DESTDIR}/lib
+win32:DESTDIR   = $${BUILD_DIR}/$${REL_DESTDIR}
+
+#
+# LIBS
+#
+#######################################
+
+win32:LIBS      *= $${DESTDIR}/$${LIB_GEOMETRY}$${LIBVERSION}.lib \
+                   $${DESTDIR}/$${LIB_IMAGE}$${LIBVERSION}.lib \
+                   $${DESTDIR}/$${LIB_SCENE_GRAPH}$${LIBVERSION}.lib \
+                   $${DESTDIR}/$${LIB_SYSTEM}$${LIBVERSION}.lib \
+                   $${DESTDIR}/$${LIB_WINGED_EDGE}$${LIBVERSION}.lib
+
+!win32 {
+  lib_bundle {
+    LIBS += -F$${DESTDIR} -framework $${LIB_GEOMETRY} \
+	    -framework $${LIB_IMAGE} -framework $${LIB_SCENE_GRAPH} \
+                   -framework $${LIB_SYSTEM} -framework $${LIB_WINGED_EDGE}
+  } else {
+    LIBS *= -L$${DESTDIR} -l$${LIB_GEOMETRY} -l$${LIB_IMAGE} -l$${LIB_SCENE_GRAPH} \
+                   -l$${LIB_SYSTEM} -l$${LIB_WINGED_EDGE}
+  }
+}
+
+
+#
+# INSTALL
+#
+#######################################
+
+LIB_DIR       = ../../lib
+# install library
+target.path   = $$LIB_DIR
+# "make install" configuration options
+INSTALLS     += target
+
+#
+# SOURCES & HEADERS
+#
+#######################################
+
+!static {
+  include(src.pri)
+}
diff --git a/extern/freestyle/src/winged_edge/Curvature.cpp b/extern/freestyle/src/winged_edge/Curvature.cpp
new file mode 100755
index 00000000000..a890fb92c04
--- /dev/null
+++ b/extern/freestyle/src/winged_edge/Curvature.cpp
@@ -0,0 +1,647 @@
+/* GTS - Library for the manipulation of triangulated surfaces
+ * Copyright (C) 1999-2002 Ray Jones, Stéphane Popinet
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include "Curvature.h"
+#include <math.h>
+#include "WEdge.h"
+#include "../system/FreestyleConfig.h"
+#include "../geometry/normal_cycle.h"
+#include <set>
+#include <stack>
+
+static bool angle_obtuse (WVertex * v, WFace * f)
+{
+  WOEdge * e; 
+  f->getOppositeEdge (v, e);
+  
+  Vec3r vec1(e->GetaVertex()->GetVertex()-v->GetVertex());
+  Vec3r vec2(e->GetbVertex()->GetVertex()-v->GetVertex());
+  return ((vec1 * vec2) < 0);
+}
+
+// FIXME
+// WVvertex is useless but kept for history reasons
+static bool triangle_obtuse (WVertex*, WFace * f)
+{
+  bool b=false;
+  for (int i=0; i<3; i++)
+    b = b ||
+      ((f->GetEdgeList()[i]->getVec3r() * f->GetEdgeList()[(i+1)%3]->getVec3r()) < 0);
+  return b;
+}
+
+static real cotan (WVertex * vo, WVertex * v1, WVertex * v2)
+{
+  /* cf. Appendix B of [Meyer et al 2002] */
+  real udotv, denom;
+
+  Vec3r u(v1->GetVertex()- vo->GetVertex());
+  Vec3r v(v2->GetVertex()- vo->GetVertex());
+
+  udotv = u * v;
+  denom = sqrt(u.squareNorm() * v.squareNorm() - udotv * udotv);
+
+  /* denom can be zero if u==v.  Returning 0 is acceptable, based on
+   * the callers of this function below. */
+  if (denom == 0.0) return (0.0);
+
+  return (udotv / denom);
+}
+
+static real angle_from_cotan (WVertex * vo, WVertex * v1, WVertex * v2)
+{
+  /* cf. Appendix B and the caption of Table 1 from [Meyer et al 2002] */
+  real udotv, denom;
+
+  Vec3r u (v1->GetVertex()-vo->GetVertex());
+  Vec3r v(v2->GetVertex()-vo->GetVertex());
+
+  udotv = u * v;
+  denom = sqrt(u.squareNorm() * v.squareNorm() - udotv * udotv);
+
+  /* Note: I assume this is what they mean by using atan2 (). -Ray Jones */
+
+  /* tan = denom/udotv = y/x (see man page for atan2) */
+  return (fabs (atan2 (denom, udotv)));
+}
+
+/** 
+ * gts_vertex_mean_curvature_normal:
+ * @v: a #WVertex.  
+ * @s: a #GtsSurface.
+ * @Kh: the Mean Curvature Normal at @v.
+ *
+ * Computes the Discrete Mean Curvature Normal approximation at @v.
+ * The mean curvature at @v is half the magnitude of the vector @Kh.
+ *
+ * Note: the normal computed is not unit length, and may point either
+ * into or out of the surface, depending on the curvature at @v.  It
+ * is the responsibility of the caller of the function to use the mean
+ * curvature normal appropriately.
+ *
+ * This approximation is from the paper:
+ * Discrete Differential-Geometry Operators for Triangulated 2-Manifolds
+ * Mark Meyer, Mathieu Desbrun, Peter Schroder, Alan H. Barr
+ * VisMath '02, Berlin (Germany) 
+ * http://www-grail.usc.edu/pubs.html
+ *
+ * Returns: %TRUE if the operator could be evaluated, %FALSE if the
+ * evaluation failed for some reason (@v is boundary or is the
+ * endpoint of a non-manifold edge.)
+ */
+bool gts_vertex_mean_curvature_normal (WVertex * v, Vec3r &Kh)
+{
+	real area = 0.0;
+
+	if (!v) return false;
+
+	/* this operator is not defined for boundary edges */
+	if (v->isBoundary()) return false;
+    
+	WVertex::incoming_edge_iterator itE;
+
+	for (itE=v->incoming_edges_begin();
+	     itE!=v->incoming_edges_end(); itE++)
+			 area+=(*itE)->GetaFace()->getArea();
+
+	Kh=Vec3r(0.0, 0.0, 0.0);
+
+	for (itE=v->incoming_edges_begin();
+	     itE!=v->incoming_edges_end(); itE++)
+		{
+			WOEdge * e = (*itE)->getPrevOnFace();
+			//if ((e->GetaVertex()==v) || (e->GetbVertex()==v)) cerr<< "BUG ";
+
+			WVertex * v1 = e->GetaVertex();
+			WVertex * v2 = e->GetbVertex();
+			real temp;
+
+			temp = cotan (v1, v, v2);
+			Kh = Vec3r(Kh+temp*(v2->GetVertex()-v->GetVertex()));
+
+			temp = cotan (v2, v, v1);
+			Kh = Vec3r(Kh+temp*(v1->GetVertex()-v->GetVertex()));
+		}
+	if (area > 0.0) 
+	{
+		Kh[0] /= 2*area;
+		Kh[1] /= 2*area;
+		Kh[2] /= 2*area;
+	} 
+	else return false;
+
+	return true;
+}
+
+/** 
+ * gts_vertex_gaussian_curvature:
+ * @v: a #WVertex.  
+ * @s: a #GtsSurface.
+ * @Kg: the Discrete Gaussian Curvature approximation at @v.
+ *
+ * Computes the Discrete Gaussian Curvature approximation at @v.
+ *
+ * This approximation is from the paper:
+ * Discrete Differential-Geometry Operators for Triangulated 2-Manifolds
+ * Mark Meyer, Mathieu Desbrun, Peter Schroder, Alan H. Barr
+ * VisMath '02, Berlin (Germany) 
+ * http://www-grail.usc.edu/pubs.html
+ *
+ * Returns: %TRUE if the operator could be evaluated, %FALSE if the
+ * evaluation failed for some reason (@v is boundary or is the
+ * endpoint of a non-manifold edge.)
+ */
+bool gts_vertex_gaussian_curvature (WVertex * v,  real * Kg)
+{
+	real area = 0.0;
+	real angle_sum = 0.0;
+
+	if (!v) return false; 
+	if (!Kg) return false; 
+
+ 	/* this operator is not defined for boundary edges */
+	if (v->isBoundary()) {*Kg=0.0 ;return false;}
+    
+	WVertex::incoming_edge_iterator itE;
+	for (itE=v->incoming_edges_begin();
+	     itE!=v->incoming_edges_end(); itE++)
+			 area+=(*itE)->GetaFace()->getArea();
+
+ 	for (itE=v->incoming_edges_begin();
+	     itE!=v->incoming_edges_end(); itE++)
+		{
+			WOEdge * e = (*itE)->getPrevOnFace();
+			WVertex * v1 = e->GetaVertex();
+			WVertex * v2 = e->GetbVertex(); 
+			angle_sum += angle_from_cotan (v, v1, v2);
+		}
+ 
+	*Kg = (2.0*M_PI - angle_sum)/area;
+
+	return true;
+}
+
+/** 
+ * gts_vertex_principal_curvatures:
+ * @Kh: mean curvature.
+ * @Kg: Gaussian curvature.
+ * @K1: first principal curvature.
+ * @K2: second principal curvature.
+ *
+ * Computes the principal curvatures at a point given the mean and
+ * Gaussian curvatures at that point.  
+ *
+ * The mean curvature can be computed as one-half the magnitude of the
+ * vector computed by gts_vertex_mean_curvature_normal().
+ *
+ * The Gaussian curvature can be computed with
+ * gts_vertex_gaussian_curvature().
+ */
+void gts_vertex_principal_curvatures (real Kh, real Kg, 
+				      real * K1, real * K2)
+{
+  real temp = Kh*Kh - Kg;
+
+  if (!K1) return; 
+  if (!K1) return; 
+
+  if (temp < 0.0) temp = 0.0;
+  temp = sqrt (temp);
+  *K1 = Kh + temp;
+  *K2 = Kh - temp;
+}
+
+/* from Maple */
+static void linsolve (real m11, real m12, real b1,
+		      real m21, real m22, real b2,
+		      real * x1, real * x2)
+{
+  real temp;
+
+  temp = 1.0 / (m21*m12 - m11*m22);
+  *x1 = (m12*b2 - m22*b1)*temp;
+  *x2 = (m11*b2 - m21*b1)*temp;
+}
+                
+/* from Maple - largest eigenvector of [a b; b c] */
+static void eigenvector (real a, real b, real c,
+			 Vec3r e)
+{
+  if (b == 0.0) {
+    e[0] = 0.0;
+  } else {
+    e[0] = -(c - a - sqrt (c*c - 2*a*c + a*a + 4*b*b))/(2*b);
+  }
+  e[1] = 1.0;
+  e[2] = 0.0;
+}
+
+/** 
+ * gts_vertex_principal_directions:
+ * @v: a #WVertex.  
+ * @s: a #GtsSurface.
+ * @Kh: mean curvature normal (a #Vec3r).
+ * @Kg: Gaussian curvature (a real).
+ * @e1: first principal curvature direction (direction of largest curvature).
+ * @e2: second principal curvature direction.
+ *
+ * Computes the principal curvature directions at a point given @Kh
+ * and @Kg, the mean curvature normal and Gaussian curvatures at that
+ * point, computed with gts_vertex_mean_curvature_normal() and
+ * gts_vertex_gaussian_curvature(), respectively. 
+ *
+ * Note that this computation is very approximate and tends to be
+ * unstable.  Smoothing of the surface or the principal directions may
+ * be necessary to achieve reasonable results.  
+ */
+void gts_vertex_principal_directions (WVertex * v, 
+                                      Vec3r Kh, real Kg,
+									  Vec3r &e1, Vec3r &e2)
+{
+  Vec3r N;
+  real normKh;
+
+  Vec3r basis1, basis2, d, eig;
+  real ve2, vdotN;
+  real aterm_da, bterm_da, cterm_da, const_da;
+  real aterm_db, bterm_db, cterm_db, const_db;
+  real a, b, c;
+  real K1, K2;
+  real *weights, *kappas, *d1s, *d2s;
+  int edge_count;
+  real err_e1, err_e2;
+  int e;
+  WVertex::incoming_edge_iterator itE;
+
+  /* compute unit normal */
+  normKh = Kh.norm();
+
+  if (normKh > 0.0) {
+    Kh.normalize();
+  } else {
+    /* This vertex is a point of zero mean curvature (flat or saddle
+     * point).  Compute a normal by averaging the adjacent triangles
+     */
+    N[0] = N[1] = N[2] = 0.0;
+
+    for (itE=v->incoming_edges_begin();
+	 itE!=v->incoming_edges_end(); itE++)
+      N=Vec3r(N+(*itE)->GetaFace()->GetNormal());
+    real normN = N.norm();
+    if (normN <= 0.0)
+      return;
+    N.normalize();
+  }
+    
+
+  /* construct a basis from N: */
+  /* set basis1 to any component not the largest of N */
+  basis1[0] =  basis1[1] =  basis1[2] = 0.0;
+  if (fabs (N[0]) > fabs (N[1]))
+    basis1[1] = 1.0;
+  else
+    basis1[0] = 1.0;
+    
+  /* make basis2 orthogonal to N */
+  basis2 = (N ^ basis1);
+  basis2.normalize();
+
+  /* make basis1 orthogonal to N and basis2 */
+  basis1 = (N ^ basis2);
+  basis1.normalize();
+  
+  aterm_da = bterm_da = cterm_da = const_da = 0.0;
+  aterm_db = bterm_db = cterm_db = const_db = 0.0;
+  int nb_edges=v->GetEdges().size();
+
+  weights = (real *) malloc (sizeof (real)*nb_edges);
+  kappas = (real*) malloc (sizeof (real)*nb_edges);
+  d1s = (real*) malloc (sizeof (real)*nb_edges);
+  d2s = (real*) malloc (sizeof (real)*nb_edges);
+  edge_count = 0;
+
+  for (itE=v->incoming_edges_begin();
+	   itE!=v->incoming_edges_end(); itE++)
+	   {
+			WOEdge * e;
+			WFace * f1, * f2;
+			real weight, kappa, d1, d2;
+			Vec3r vec_edge;
+			if (! *itE) continue;
+			e = *itE;
+
+			/* since this vertex passed the tests in
+			* gts_vertex_mean_curvature_normal(), this should be true. */
+			//g_assert (gts_edge_face_number (e, s) == 2);
+
+			/* identify the two triangles bordering e in s */
+			f1=e->GetaFace();
+			f2=e->GetbFace();
+
+    /* We are solving for the values of the curvature tensor 
+     *     B = [ a b ; b c ].  
+     * The computations here are from section 5 of [Meyer et al 2002].  
+     *
+     * The first step is to calculate the linear equations governing
+     * the values of (a,b,c).  These can be computed by setting the
+     * derivatives of the error E to zero (section 5.3).
+     * 
+     * Since a + c = norm(Kh), we only compute the linear equations
+     * for dE/da and dE/db.  (NB: [Meyer et al 2002] has the
+     * equation a + b = norm(Kh), but I'm almost positive this is
+     * incorrect.)
+     *
+     * Note that the w_ij (defined in section 5.2) are all scaled by
+     * (1/8*A_mixed).  We drop this uniform scale factor because the
+     * solution of the linear equations doesn't rely on it.
+     *
+     * The terms of the linear equations are xterm_dy with x in
+     * {a,b,c} and y in {a,b}.  There are also const_dy terms that are
+     * the constant factors in the equations.  
+     */
+
+    /* find the vector from v along edge e */
+    vec_edge=Vec3r(-1*e->getVec3r());
+
+    ve2 = vec_edge.squareNorm();
+    vdotN = vec_edge * N;
+
+    /* section 5.2 - There is a typo in the computation of kappa.  The
+     * edges should be x_j-x_i.
+     */
+    kappa = 2.0 * vdotN / ve2;
+
+    /* section 5.2 */
+
+    /* I don't like performing a minimization where some of the
+     * weights can be negative (as can be the case if f1 or f2 are
+     * obtuse).  To ensure all-positive weights, we check for
+     * obtuseness. */
+    weight = 0.0;
+    if (! triangle_obtuse(v, f1)) {
+      weight += ve2 * 
+        cotan (f1->GetNextOEdge(e->twin())->GetbVertex(), 
+               e->GetaVertex(), e->GetbVertex()) / 8.0;
+    } else {
+      if (angle_obtuse (v, f1)) {
+        weight += ve2 * f1->getArea() / 4.0;
+      } else {
+        weight += ve2 * f1->getArea() / 8.0;
+      }
+    }
+
+    if (! triangle_obtuse(v, f2)) {
+      weight += ve2 * 
+        cotan (f2->GetNextOEdge(e)->GetbVertex(), 
+              e->GetaVertex(), e->GetbVertex()) / 8.0;
+    } else {
+      if (angle_obtuse (v, f2)) {
+        weight += ve2 * f1->getArea() / 4.0;
+      } else {
+        weight += ve2 * f1->getArea()  / 8.0;
+      }
+    }
+
+    /* projection of edge perpendicular to N (section 5.3) */
+    d[0] = vec_edge[0] - vdotN * N[0];
+    d[1] = vec_edge[1] - vdotN * N[1];
+    d[2] = vec_edge[2] - vdotN * N[2];
+    d.normalize();
+    
+    /* not explicit in the paper, but necessary.  Move d to 2D basis. */
+    d1 = d * basis1;
+    d2 = d * basis2;
+
+    /* store off the curvature, direction of edge, and weights for later use */
+    weights[edge_count] = weight;
+    kappas[edge_count] = kappa;
+    d1s[edge_count] = d1;
+    d2s[edge_count] = d2;
+    edge_count++;
+
+    /* Finally, update the linear equations */
+    aterm_da += weight * d1 * d1 * d1 * d1;
+    bterm_da += weight * d1 * d1 * 2 * d1 * d2;
+    cterm_da += weight * d1 * d1 * d2 * d2;
+    const_da += weight * d1 * d1 * (- kappa);
+
+    aterm_db += weight * d1 * d2 * d1 * d1;
+    bterm_db += weight * d1 * d2 * 2 * d1 * d2;
+    cterm_db += weight * d1 * d2 * d2 * d2;
+    const_db += weight * d1 * d2 * (- kappa);
+
+   }
+
+  /* now use the identity (Section 5.3) a + c = |Kh| = 2 * kappa_h */
+  aterm_da -= cterm_da;
+  const_da += cterm_da * normKh;
+
+  aterm_db -= cterm_db;
+  const_db += cterm_db * normKh;
+  
+  /* check for solvability of the linear system */
+  if (((aterm_da * bterm_db - aterm_db * bterm_da) != 0.0) &&
+      ((const_da != 0.0) || (const_db != 0.0))) {
+    linsolve (aterm_da, bterm_da, -const_da,
+              aterm_db, bterm_db, -const_db,
+              &a, &b);
+
+    c = normKh - a;
+
+    eigenvector (a, b, c, eig);
+  } else {
+    /* region of v is planar */
+    eig[0] = 1.0;
+    eig[1] = 0.0;
+  }
+
+  /* Although the eigenvectors of B are good estimates of the
+   * principal directions, it seems that which one is attached to
+   * which curvature direction is a bit arbitrary.  This may be a bug
+   * in my implementation, or just a side-effect of the inaccuracy of
+   * B due to the discrete nature of the sampling.
+   *
+   * To overcome this behavior, we'll evaluate which assignment best
+   * matches the given eigenvectors by comparing the curvature
+   * estimates computed above and the curvatures calculated from the
+   * discrete differential operators.  */
+
+  gts_vertex_principal_curvatures (0.5 * normKh, Kg, &K1, &K2);
+  
+  err_e1 = err_e2 = 0.0;
+  /* loop through the values previously saved */
+  for (e = 0; e < edge_count; e++) {
+    real weight, kappa, d1, d2;
+    real temp1, temp2;
+    real delta;
+
+    weight = weights[e];
+    kappa = kappas[e];
+    d1 = d1s[e];
+    d2 = d2s[e];
+
+    temp1 = fabs (eig[0] * d1 + eig[1] * d2);
+    temp1 = temp1 * temp1;
+    temp2 = fabs (eig[1] * d1 - eig[0] * d2);
+    temp2 = temp2 * temp2;
+
+    /* err_e1 is for K1 associated with e1 */
+    delta = K1 * temp1 + K2 * temp2 - kappa;
+    err_e1 += weight * delta * delta;
+
+    /* err_e2 is for K1 associated with e2 */
+    delta = K2 * temp1 + K1 * temp2 - kappa;
+    err_e2 += weight * delta * delta;
+  }
+  free (weights);
+  free (kappas);
+  free (d1s);
+  free (d2s);
+
+  /* rotate eig by a right angle if that would decrease the error */
+  if (err_e2 < err_e1) {
+    real temp = eig[0];
+
+    eig[0] = eig[1];
+    eig[1] = -temp;
+  }
+
+  e1[0] = eig[0] * basis1[0] + eig[1] * basis2[0];
+  e1[1] = eig[0] * basis1[1] + eig[1] * basis2[1];
+  e1[2] = eig[0] * basis1[2] + eig[1] * basis2[2];
+  e1.normalize();
+
+  /* make N,e1,e2 a right handed coordinate sytem */
+  e2 =  N ^ e1;
+  e2.normalize();
+}
+
+namespace OGF {
+    static real angle(WOEdge* h) {
+        Vec3r e(h->GetbVertex()->GetVertex()-h->GetaVertex()->GetVertex()) ;
+        Vec3r n1 = h->GetbFace()->GetNormal();
+        Vec3r n2 = h->GetaFace()->GetNormal();
+        real sine = (n1 ^ n2) * e / e.norm() ;
+        if(sine >= 1.0) {
+            return M_PI / 2.0 ;
+        }
+        if(sine <= -1.0) {
+            return -M_PI / 2.0 ;
+        }
+        return ::asin(sine) ;
+    }
+
+    // precondition1: P is inside the sphere
+    // precondition2: P,V points to the outside of 
+    //   the sphere (i.e. OP.V > 0)
+    static bool sphere_clip_vector(
+        const Vec3r& O, real r,
+        const Vec3r& P, Vec3r& V
+    ) {
+
+        Vec3r W = P - O ;
+        real a = V.squareNorm() ;
+        real b = 2.0 * V * W ;
+        real c = W.squareNorm() - r*r ;
+        real delta = b*b - 4*a*c ;
+        if(delta < 0) {
+            // Should not happen, but happens sometimes (numerical precision)
+            return true ;
+        }
+        real t = - b + ::sqrt(delta) / (2.0 * a) ;
+        if(t < 0.0) {
+            // Should not happen, but happens sometimes (numerical precision)
+            return true ;
+        }
+        if(t >= 1.0) {
+            // Inside the sphere
+            return false ;
+        }
+
+        V[0] = (t * V.x()) ;
+        V[1] = (t * V.y()) ;
+        V[2] = (t * V.z()) ;
+
+        return true ;
+    }
+
+    // TODO: check optimizations:
+    // use marking ? (measure *timings* ...)
+    void compute_curvature_tensor(
+        WVertex* start, real radius, NormalCycle& nc
+    ) {
+        // in case we have a non-manifold vertex, skip it...
+        if(start->isBoundary())
+          return;
+      
+        std::set<WVertex*> vertices ;
+        const Vec3r& O = start->GetVertex() ;
+        std::stack<WVertex*> S ;
+        S.push(start) ;
+        vertices.insert(start) ;
+        while(!S.empty()) {
+            WVertex* v = S.top() ;
+            S.pop() ;
+            if(v->isBoundary())
+              continue;
+            const Vec3r& P = v->GetVertex() ;
+            WVertex::incoming_edge_iterator woeit = v->incoming_edges_begin();
+            WVertex::incoming_edge_iterator woeitend = v->incoming_edges_end();
+            for(;woeit!=woeitend; ++woeit){
+              WOEdge *h = *woeit;
+              Vec3r V(h->GetaVertex()->GetVertex()-h->GetbVertex()->GetVertex()) ;
+              if((v == start) || V * (P - O) > 0.0) {
+                    bool isect = sphere_clip_vector(O, radius, P, V) ;
+                    if(h->GetOwner()->GetNumberOfOEdges() == 2) {
+                        real beta = angle(h) ;
+                        nc.accumulate_dihedral_angle(V, beta) ;
+                    }
+                    if(!isect) {
+                        WVertex* w = h->GetaVertex() ;
+                        if(vertices.find(w) == vertices.end()) {
+                            vertices.insert(w) ;
+                            S.push(w) ;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+
+    void compute_curvature_tensor_one_ring(
+        WVertex* start, NormalCycle& nc
+    ) {
+        // in case we have a non-manifold vertex, skip it...
+        if(start->isBoundary())
+          return;
+      
+        WVertex::incoming_edge_iterator woeit = start->incoming_edges_begin();
+        WVertex::incoming_edge_iterator woeitend = start->incoming_edges_end();
+        for(;woeit!=woeitend; ++woeit){
+          WOEdge *h = (*woeit)->twin();
+          Vec3r hvec(h->GetbVertex()->GetVertex()-h->GetaVertex()->GetVertex());
+          nc.accumulate_dihedral_angle(hvec, angle(h)) ;
+          WOEdge *hprev = h->getPrevOnFace();
+          Vec3r hprevvec(hprev->GetbVertex()->GetVertex()-hprev->GetaVertex()->GetVertex());
+          nc.accumulate_dihedral_angle(hprevvec, angle(hprev)) ;
+        }
+    }
+
+}
diff --git a/extern/freestyle/src/winged_edge/Curvature.h b/extern/freestyle/src/winged_edge/Curvature.h
new file mode 100755
index 00000000000..214a32ca922
--- /dev/null
+++ b/extern/freestyle/src/winged_edge/Curvature.h
@@ -0,0 +1,156 @@
+
+/* GTS - Library for the manipulation of triangulated surfaces
+ * Copyright (C) 1999 Stéphane Popinet
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __CURVATURE_H__
+#define __CURVATURE_H__
+
+# include "../system/FreestyleConfig.h"
+# include "../system/Precision.h"
+# include "../geometry/Geom.h"
+using namespace Geometry;
+
+class WVertex;
+
+class LIB_WINGED_EDGE_EXPORT CurvatureInfo
+{
+public:
+
+  CurvatureInfo()
+  {
+    K1 = 0.0;
+    K2 = 0.0;
+    e1 = Vec3r(0.0,0.0,0.0);
+    e2 = Vec3r(0.0,0.0,0.0);
+    Kr = 0.0;
+    dKr = 0.0;
+    er = Vec3r(0.0,0.0,0.0);
+  }
+
+  CurvatureInfo(const CurvatureInfo& iBrother){
+    K1 = iBrother.K1;
+    K2 = iBrother.K2;
+    e1 = iBrother.e1;
+    e2 = iBrother.e2;
+    Kr = iBrother.Kr;
+    dKr = iBrother.dKr;
+    er = iBrother.er;
+  }
+
+  CurvatureInfo(const CurvatureInfo& ca, const CurvatureInfo& cb, real t) {
+    K1 = ca.K1 + t * (cb.K1 - ca.K1);
+    K2 = ca.K2 + t * (cb.K2 - ca.K2);
+    e1 = ca.e1 + t * (cb.e1 - ca.e1);
+    e2 = ca.e2 + t * (cb.e2 - ca.e2);
+    Kr = ca.Kr + t * (cb.Kr - ca.Kr);
+    dKr = ca.dKr + t * (cb.dKr - ca.dKr);
+    er = ca.er + t * (cb.er - ca.er);
+  }
+
+  real K1; // maximum curvature
+  real K2; // minimum curvature
+  Vec3r e1; // maximum curvature direction
+  Vec3r e2; // minimum curvature direction
+  real Kr; // radial curvature
+  real dKr; // radial curvature
+  Vec3r er; // radial curvature direction
+};
+
+class Face_Curvature_Info{
+public:
+  Face_Curvature_Info() {}
+  ~Face_Curvature_Info(){
+    for(vector<CurvatureInfo*>::iterator ci=vec_curvature_info.begin(), ciend=vec_curvature_info.end();
+    ci!=ciend;
+    ++ci){
+      delete (*ci);
+    }
+    vec_curvature_info.clear();
+  }
+  vector<CurvatureInfo *> vec_curvature_info;
+};
+
+bool LIB_WINGED_EDGE_EXPORT gts_vertex_mean_curvature_normal  (WVertex * v, 
+					Vec3r &n);
+
+bool LIB_WINGED_EDGE_EXPORT gts_vertex_gaussian_curvature     (WVertex * v, 
+					real * Kg);
+
+void LIB_WINGED_EDGE_EXPORT gts_vertex_principal_curvatures   (real Kh, 
+					real Kg, 
+					real * K1, 
+					real * K2);
+
+void LIB_WINGED_EDGE_EXPORT gts_vertex_principal_directions   (WVertex * v, 
+					Vec3r Kh,
+					real Kg,
+					Vec3r &e1, 
+					Vec3r &e2);
+
+/*
+ *  OGF/Graphite: Geometry and Graphics Programming Library + Utilities
+ *  Copyright (C) 2000-2003 Bruno Levy
+ *
+ *  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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *  If you modify this software, you should include a notice giving the
+ *  name of the person performing the modification, the date of modification,
+ *  and the reason for such modification.
+ *
+ *  Contact: Bruno Levy
+ *
+ *     levy@loria.fr
+ *
+ *     ISA Project
+ *     LORIA, INRIA Lorraine, 
+ *     Campus Scientifique, BP 239
+ *     54506 VANDOEUVRE LES NANCY CEDEX 
+ *     FRANCE
+ *
+ *  Note that the GNU General Public License does not permit incorporating
+ *  the Software into proprietary programs. 
+ */
+ namespace OGF {
+
+    class NormalCycle ;
+
+    void LIB_WINGED_EDGE_EXPORT compute_curvature_tensor(
+            WVertex* start, double radius, NormalCycle& nc
+        ) ;
+
+    void LIB_WINGED_EDGE_EXPORT compute_curvature_tensor_one_ring(
+            WVertex* start, NormalCycle& nc
+        ) ;
+ }
+
+
+#endif /* __CURVATURE_H__ */
+
diff --git a/extern/freestyle/src/winged_edge/Nature.h b/extern/freestyle/src/winged_edge/Nature.h
new file mode 100755
index 00000000000..1f165e677f5
--- /dev/null
+++ b/extern/freestyle/src/winged_edge/Nature.h
@@ -0,0 +1,75 @@
+//
+//  Filename         : Nature.h
+//  Author(s)        : Emmanuel Turquin
+//  Purpose          : Different natures for both vertices and edges
+//  Date of creation : 01/07/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  NATURE_H
+# define NATURE_H
+
+/*! \file Nature.h
+ *  Definitions of Natures of the ViewMap's elements
+ */
+
+/*! Namespace gathering the different possible 
+ *  natures of 0D and 1D elements of the ViewMap
+ */
+namespace Nature {
+  
+  typedef unsigned short VertexNature;
+
+  /*! true for any 0D element */
+  static const VertexNature POINT		= 0;		// 0
+  /*! true for SVertex */
+  static const VertexNature S_VERTEX		= (1 << 0);	// 1
+  /*! true for ViewVertex */
+  static const VertexNature VIEW_VERTEX		= (1 << 1);	// 2
+  /*! true for NonTVertex */
+  static const VertexNature NON_T_VERTEX	= (1 << 2);	// 4
+  /*! true for TVertex */
+  static const VertexNature T_VERTEX		= (1 << 3);	// 8
+  /*! true for CUSP */
+  static const VertexNature CUSP		= (1 << 4);	// 16
+
+  typedef unsigned short EdgeNature;
+  /*! true for non feature edges (always false for 1D elements of the ViewMap) */
+  static const EdgeNature NO_FEATURE		= 0;		// 0
+  /*! true for silhouettes */
+  static const EdgeNature SILHOUETTE		= (1 << 0);	// 1
+  /*! true for borders */
+  static const EdgeNature BORDER		= (1 << 1);	// 2
+  /*! true for creases */
+  static const EdgeNature CREASE		= (1 << 2);	// 4
+  /*! true for ridges */
+  static const EdgeNature RIDGE			= (1 << 3);	// 8
+  /*! true for valleys */
+  static const EdgeNature VALLEY		= (1 << 4);	// 16
+  /*! true for suggestive contours */
+  static const EdgeNature SUGGESTIVE_CONTOUR	= (1 << 5);	// 32
+
+} // end of namespace Nature
+
+#endif // NATURE_H
diff --git a/extern/freestyle/src/winged_edge/WEdge.cpp b/extern/freestyle/src/winged_edge/WEdge.cpp
new file mode 100755
index 00000000000..79b3a8dae26
--- /dev/null
+++ b/extern/freestyle/src/winged_edge/WEdge.cpp
@@ -0,0 +1,732 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include <iostream>
+#include "WEdge.h"
+
+/*! Temporary structures */
+class vertexdata
+{
+public:
+  WVertex *_copy;
+};
+
+class oedgedata
+{
+public:
+  WOEdge *_copy;
+};
+
+class edgedata
+{
+public:
+  WEdge *_copy;
+};
+
+class facedata
+{
+public:
+  WFace *_copy;
+};
+
+
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             WVertex            */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+WVertex::WVertex(WVertex& iBrother)
+{
+  _Id = iBrother._Id;
+  _Vertex = iBrother._Vertex;
+  _EdgeList = iBrother._EdgeList;
+
+  _Shape = iBrother._Shape;
+  _Smooth = iBrother._Smooth;
+  _Border = iBrother._Border;
+  userdata = NULL;
+  iBrother.userdata = new vertexdata;
+  ((vertexdata*)(iBrother.userdata))->_copy = this;
+}
+
+WVertex* WVertex::dupplicate()
+{
+  WVertex *clone = new WVertex(*this);
+  return clone;
+}
+
+
+WOEdge* WVertex::incoming_edge_iterator::operator*()
+
+{ 
+      return _current;
+}
+void WVertex::incoming_edge_iterator::increment(){
+  WOEdge *twin = _current->twin();
+  if(!twin){
+    // we reached a hole
+    _current = 0;
+    return;
+  }
+  WOEdge *next = twin->getPrevOnFace();
+  if(next == _begin){
+    next = 0;
+  }
+  _current = next;
+}
+
+WFace* WVertex::face_iterator::operator*(){
+  WOEdge * woedge = *_edge_it;
+  if(woedge == 0)
+    return 0;
+  return (woedge)->GetbFace();
+}
+
+//bool WVertex::isBoundary () const{
+// return _Border;
+//}
+bool WVertex::isBoundary ()
+{
+    if(_Border == 1)
+        return true;
+    else if(_Border == 0)
+        return false;
+    
+	vector<WEdge *>::const_iterator it;
+    for(it=_EdgeList.begin(); it!=_EdgeList.end(); it++){
+        if((*it)->GetNumberOfOEdges() == 1){
+            _Border = 1;
+            return true;
+        }
+    }
+		//if (!(*it)->GetaOEdge()->GetaFace()) return true;
+    _Border = 0;
+	return false;
+}
+
+void WVertex::AddEdge(WEdge *iEdge) {
+  _EdgeList.push_back(iEdge);
+}
+
+WVertex::incoming_edge_iterator WVertex::incoming_edges_begin(){
+  WOEdge *begin;
+  WEdge * wedge = _EdgeList.front();
+  WOEdge* aOEdge = wedge->GetaOEdge();
+  if(aOEdge->GetbVertex() == this)
+    begin = aOEdge;
+  else
+    begin = _EdgeList.front()->GetbOEdge();
+  return incoming_edge_iterator(this, begin, begin);
+}
+WVertex::incoming_edge_iterator WVertex::incoming_edges_end(){
+  WOEdge *begin;
+  WOEdge* aOEdge = _EdgeList.front()->GetaOEdge();
+  if(aOEdge->GetbVertex() == this)
+    begin = aOEdge;
+  else
+    begin = _EdgeList.front()->GetbOEdge();
+  return incoming_edge_iterator(this, begin, 0);
+}
+//WOEdge** WVertex::incoming_edge_iterator::operator->()
+//{ 
+//      WOEdge ** ppaOEdge = (*_iter)->GetaOEdge();
+//      if(aOEdge->GetbVertex() == _vertex)
+//       return ppaOEdge;
+//      else
+//      {
+//        WOEdge *bOEdge = (*_iter)->GetbOEdge();
+//        return &bOEdge;
+//      }
+//       
+//}
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             WOEdge             */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+WOEdge::WOEdge(WOEdge& iBrother)
+{
+    _paVertex = iBrother.GetaVertex();
+    _pbVertex = iBrother.GetbVertex();
+    _paFace = iBrother.GetaFace();
+    _pbFace = iBrother.GetbFace();
+    _pOwner = iBrother.GetOwner();
+    userdata = NULL;
+    iBrother.userdata = new oedgedata;
+    ((oedgedata*)(iBrother.userdata))->_copy = this;
+}
+
+WOEdge * WOEdge::dupplicate()
+{
+  WOEdge *clone = new WOEdge(*this);
+  return clone;
+}
+
+Vec3r 
+WOEdge::getVec3r ()
+{
+   return Vec3r(_pbVertex->GetVertex() - _paVertex->GetVertex());
+} 
+
+WOEdge * WOEdge::twin ()
+{
+	 return GetOwner()->GetOtherOEdge(this);
+}
+
+WOEdge * 
+WOEdge::getPrevOnFace()
+{
+	return _pbFace->GetPrevOEdge(this);
+}
+
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             WEdge              */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+WEdge::WEdge(WEdge& iBrother)
+{
+  _paOEdge = NULL;
+  _pbOEdge = NULL;
+  WOEdge *aoedge = iBrother.GetaOEdge();
+  WOEdge *boedge = iBrother.GetbOEdge();
+  userdata = NULL;
+
+  if(NULL != aoedge)
+    //_paOEdge = new WOEdge(*aoedge);
+    _paOEdge = aoedge->dupplicate();
+  if(NULL != boedge)
+    //_pbOEdge = new WOEdge(*boedge);
+    _pbOEdge = boedge->dupplicate();
+  
+  _nOEdges = iBrother.GetNumberOfOEdges();
+  _Id = iBrother.GetId();
+  iBrother.userdata = new edgedata;
+  ((edgedata*)(iBrother.userdata))->_copy = this;
+}
+
+WEdge * WEdge::dupplicate()
+{
+  WEdge *clone = new WEdge(*this);
+  return clone;
+}
+
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             WFace              */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+
+WFace::WFace(WFace& iBrother)
+{
+  _OEdgeList = iBrother.GetEdgeList();
+  _Normal = iBrother.GetNormal();
+  _VerticesNormals = iBrother._VerticesNormals;
+  _VerticesTexCoords = iBrother._VerticesTexCoords;
+  _Id = iBrother.GetId();
+  _MaterialIndex = iBrother._MaterialIndex;
+  userdata = NULL;
+  iBrother.userdata = new facedata;
+  ((facedata*)(iBrother.userdata))->_copy = this;
+}
+
+WFace * WFace::dupplicate()
+{
+  WFace * clone = new WFace(*this);
+  return clone;
+}
+
+const Material& WFace::material() {
+  return getShape()->material(_MaterialIndex);
+}
+
+WOEdge * WFace::MakeEdge(WVertex *v1, WVertex *v2)
+{
+  // First check whether the same oriented edge already exists 
+  // or not:
+  vector<WEdge *>& v1Edges = v1->GetEdges();
+  for(vector<WEdge*>::iterator it1=v1Edges.begin(), end=v1Edges.end(); 
+  it1!=end; 
+  it1++)
+  {
+
+    WEdge *we=(*it1);
+
+    WOEdge *woea = we->GetaOEdge();
+
+    if((woea->GetaVertex() == v1) && (woea->GetbVertex() == v2))
+    //if((*it1)->GetbVertex() == v2)
+    {
+      // The oriented edge already exists
+      cerr << "Warning: edge " << v1->GetId() << " - " << v2->GetId() << " appears twice, correcting" << endl;
+      // Adds the edge to the face
+      //AddEdge((*it1)->GetaOEdge());
+      AddEdge(woea);
+      (*it1)->SetNumberOfOEdges((*it1)->GetNumberOfOEdges()+1);
+      //sets these vertices as border:
+      v1->SetBorder(true);
+      v2->SetBorder(true);
+      //return (*it1)->GetaOEdge();
+      return woea;
+    }
+
+    WOEdge *woeb = we->GetbOEdge();
+    if((woeb != 0) && (woeb->GetaVertex() == v1) && (woeb->GetbVertex() == v2))
+
+    //if((*it1)->GetbVertex() == v2)
+
+    {
+      // The oriented edge already exists
+      cerr << "Warning: edge " << v1->GetId() << " - " << v2->GetId() << " appears twice, correcting" << endl;
+      // Adds the edge to the face
+      //AddEdge((*it1)->GetaOEdge());
+      AddEdge(woeb);
+      (*it1)->SetNumberOfOEdges((*it1)->GetNumberOfOEdges()+1);
+      //sets these vertices as border:
+      v1->SetBorder(true);
+      v2->SetBorder(true);
+      //return (*it1)->GetaOEdge();
+      return woeb;
+    }
+  }
+  
+  // the oriented edge we're about to build
+  WOEdge *pOEdge = new WOEdge;
+  
+  WEdge * edge; // The edge containing the oriented edge.
+  
+  // checks whether this edge already exists or not
+  // If it exists, it points outward v2
+
+  bool exist = false;
+  WOEdge *pInvertEdge = NULL; // The inverted edge if it exists
+  vector<WEdge *>& v2Edges = v2->GetEdges();
+  vector<WEdge *>::iterator it;
+  for(it=v2Edges.begin(); it!=v2Edges.end(); it++)
+  {
+    if((*it)->GetbVertex() == v1)
+    {
+      // The invert edge already exists
+      exist = true;
+      pInvertEdge = (*it)->GetaOEdge();
+      break;
+    }
+  }
+
+  //DEBUG:
+  
+
+  if(true == exist) // The invert edge already exists
+  {
+    // Retrieves the corresponding edge
+    edge = pInvertEdge->GetOwner(); 
+    
+    // Sets the a Face (retrieved from pInvertEdge
+    pOEdge->SetaFace(pInvertEdge->GetbFace());
+    
+    // Updates the invert edge:
+    pInvertEdge->SetaFace(this);
+  }
+  else // The invert edge does not exist yet
+  {
+    // we must create a new edge
+    //edge = new WEdge;
+    edge = instanciateEdge();
+    
+    // updates the a,b vertex edges list:
+    v1->AddEdge(edge);
+    v2->AddEdge(edge);
+
+  }
+
+  pOEdge->SetOwner(edge);
+  // Add the vertices:
+  pOEdge->SetaVertex(v1);
+  pOEdge->SetbVertex(v2);
+
+  // Debug:
+  if(v1->GetId() == v2->GetId())
+    cerr << "Warning: edge " << this << " null with vertex " << v1->GetId() << endl;
+
+  edge->AddOEdge(pOEdge);
+  //edge->SetNumberOfOEdges(edge->GetNumberOfOEdges()+1);
+
+  // Add this face (the b face)
+  pOEdge->SetbFace(this);
+
+  // Adds the edge to the face
+  AddEdge(pOEdge);
+
+  return pOEdge;
+}
+
+
+bool 
+WFace::getOppositeEdge (const WVertex *v, WOEdge* &e)
+{
+	if (_OEdgeList.size()!=3) return false;
+
+	vector<WOEdge *>::iterator it;
+	e=NULL;
+	for(it=_OEdgeList.begin(); it!=_OEdgeList.end(); it++)
+		if ((*it)->GetaVertex()==v) e=*it;
+	if (!e) return false; 
+	e=NULL;
+	for(it=_OEdgeList.begin(); it!=_OEdgeList.end(); it++)
+		if (((*it)->GetaVertex()!=v) && ((*it)->GetbVertex()!=v)) e=*it;
+	if (!e) return false; 
+	else return true;
+}
+
+real
+WFace::getArea ()
+{
+	vector<WOEdge *>::iterator it;
+	Vec3r origin=(*(_OEdgeList.begin()))->GetaVertex()->GetVertex();
+	it=_OEdgeList.begin();
+	real a=0;
+	for (it=it++; it!=_OEdgeList.end(); it++) {
+	  Vec3r v1=Vec3r((*it)->GetaVertex()->GetVertex() - origin);		
+	  Vec3r v2=Vec3r((*it)->GetbVertex()->GetVertex() - origin);	
+	  a += (v1 ^ v2).norm() / 2.0;
+	}
+	return a;
+}
+
+
+WOEdge* 
+WFace::GetPrevOEdge(WOEdge* iOEdge)
+  {
+    vector<WOEdge*>::iterator woe,woend, woefirst;
+    woefirst = _OEdgeList.begin();
+	woend=_OEdgeList.end();
+	WOEdge *prev =*woefirst;
+    woe=woefirst;
+	woe++;
+    for(;
+        woe!=woend;
+        woe++)
+	{
+        if((*woe) == iOEdge)
+            return prev;
+		prev= *woe;
+	}
+    // We left the loop. That means that the first
+    // OEdge was the good one:
+    if((*woefirst)==iOEdge)
+      return prev;
+
+    return NULL;
+  }
+
+WShape * WFace::getShape()
+{
+  return GetVertex(0)->shape();
+}
+
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             WShape             */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+
+LIB_WINGED_EDGE_EXPORT
+unsigned WShape::_SceneCurrentId = 0;
+
+WShape * WShape::dupplicate()
+{
+  WShape *clone = new WShape(*this);
+  return clone;
+}
+
+WShape::WShape(WShape& iBrother)
+{
+  _Id = iBrother.GetId();
+  _Materials = iBrother._Materials;
+  _meanEdgeSize = iBrother._meanEdgeSize;
+  iBrother.bbox(_min, _max);
+  vector<WVertex*>& vertexList = iBrother.GetVertexList();
+  vector<WVertex*>::iterator v=vertexList.begin(), vend=vertexList.end();
+  for(;
+  v!=vend;
+  v++)
+  {
+    //WVertex *newVertex = new WVertex(*(*v));
+    WVertex *newVertex = (*v)->dupplicate();
+
+    newVertex->SetShape(this);
+    AddVertex(newVertex);
+  }
+
+  vector<WEdge*>& edgeList = iBrother.GetEdgeList();
+  vector<WEdge*>::iterator e=edgeList.begin(), eend=edgeList.end();
+  for(;
+  e!=eend;
+  e++)
+  {
+    //WEdge *newEdge = new WEdge(*(*e));
+    WEdge *newEdge = (*e)->dupplicate();
+    AddEdge(newEdge);
+  }
+
+  vector<WFace*>& faceList = iBrother.GetFaceList();
+  vector<WFace*>::iterator f=faceList.begin(), fend=faceList.end();
+  for(;
+  f!=fend;
+  f++)
+  {
+    //WFace *newFace = new WFace(*(*f));
+    WFace *newFace = (*f)->dupplicate();
+    AddFace(newFace);
+  }
+
+  // update all pointed addresses thanks to the newly created objects:
+  vend=_VertexList.end();
+  for(v=_VertexList.begin();
+  v!=vend;
+  v++)
+  {
+    const vector<WEdge*>& vedgeList = (*v)->GetEdges();
+    vector<WEdge*> newvedgelist;
+    unsigned int i;
+    for(i=0; i<vedgeList.size(); i++)
+    {
+      WEdge *current = vedgeList[i];
+      edgedata * currentvedata = (edgedata*)current->userdata;
+      newvedgelist.push_back(currentvedata->_copy);
+    }
+    (*v)->SetEdges(newvedgelist);
+  }
+
+  eend = _EdgeList.end();
+  for(e=_EdgeList.begin();
+  e!=eend;
+  e++)
+  {
+    // update aOedge:
+    WOEdge *aoEdge = (*e)->GetaOEdge();
+    aoEdge->SetaVertex(((vertexdata*)(aoEdge->GetaVertex()->userdata))->_copy);
+    aoEdge->SetbVertex(((vertexdata*)(aoEdge->GetbVertex()->userdata))->_copy);
+    if(NULL != aoEdge->GetaFace())
+      aoEdge->SetaFace(((facedata*)(aoEdge->GetaFace()->userdata))->_copy);
+    aoEdge->SetbFace(((facedata*)(aoEdge->GetbFace()->userdata))->_copy);
+    aoEdge->SetOwner(((edgedata*)(aoEdge->GetOwner()->userdata))->_copy);
+    // update bOedge:
+
+    WOEdge *boEdge = (*e)->GetbOEdge();
+    if(boEdge != 0)
+    {
+      boEdge->SetaVertex(((vertexdata*)(boEdge->GetaVertex()->userdata))->_copy);
+      boEdge->SetbVertex(((vertexdata*)(boEdge->GetbVertex()->userdata))->_copy);
+      if(NULL != boEdge->GetaFace())
+        boEdge->SetaFace(((facedata*)(boEdge->GetaFace()->userdata))->_copy);
+      boEdge->SetbFace(((facedata*)(boEdge->GetbFace()->userdata))->_copy);
+      boEdge->SetOwner(((edgedata*)(boEdge->GetOwner()->userdata))->_copy);
+    }
+  }
+
+  fend = _FaceList.end();
+  for(f=_FaceList.begin();
+  f!=fend;
+  f++)
+  {
+    unsigned i;
+    const vector<WOEdge*>& oedgeList = (*f)->GetEdgeList();
+    vector<WOEdge*> newoedgelist;
+
+    unsigned n = oedgeList.size();
+    for(i=0; i<n; i++)
+    {
+      WOEdge *current = oedgeList[i];
+      oedgedata * currentoedata = (oedgedata*)current->userdata;
+      newoedgelist.push_back(currentoedata->_copy);
+      //oedgeList[i] = currentoedata->_copy;
+      //oedgeList[i] = ((oedgedata*)(oedgeList[i]->userdata))->_copy;
+    }
+    (*f)->SetEdgeList(newoedgelist);
+  }
+
+  // Free all memory (arghh!)
+  // Vertex
+  vend = iBrother.GetVertexList().end();
+  for(v=iBrother.GetVertexList().begin();
+  v!=vend;
+  v++)
+  {
+    delete (vertexdata*)((*v)->userdata);
+    (*v)->userdata = NULL;
+  }
+
+  // Edges and OEdges:
+  eend = iBrother.GetEdgeList().end();
+  for(e=iBrother.GetEdgeList().begin();
+  e!=eend;
+  e++)
+  {
+    delete (edgedata*)((*e)->userdata);
+    (*e)->userdata = NULL;
+    // OEdge a :
+    delete (oedgedata*)((*e)->GetaOEdge()->userdata);
+    (*e)->GetaOEdge()->userdata = NULL;
+    // OEdge b:
+    WOEdge* oedgeb = (*e)->GetbOEdge();
+    if(NULL != oedgeb)
+    {
+      delete (oedgedata*)(oedgeb->userdata);
+      oedgeb->userdata = NULL;
+    }
+  }
+  // Faces
+  fend = iBrother.GetFaceList().end();
+  for(f=iBrother.GetFaceList().begin();
+  f!=fend;
+  f++)
+  {
+    delete (facedata*)((*f)->userdata);
+    (*f)->userdata = NULL;
+  }
+}
+
+WFace* WShape::MakeFace(vector<WVertex*>& iVertexList, unsigned iMaterial)
+{
+  // allocate the new face
+  WFace *face = instanciateFace();
+
+  return MakeFace(iVertexList, iMaterial, face);
+}
+
+WFace * WShape::MakeFace(vector<WVertex*>& iVertexList, vector<Vec3r>& iNormalsList, vector<Vec2r>& iTexCoordsList, unsigned iMaterial)
+{
+  // allocate the new face
+  WFace *face = MakeFace(iVertexList, iMaterial);
+
+  if(0 == face)
+
+    return 0;
+
+  // set the list of per-vertex normals
+  face->SetNormalList(iNormalsList);
+  // set the list of per-vertex tex coords
+  face->SetTexCoordsList(iTexCoordsList);
+
+  return face;
+}
+
+WFace* WShape::MakeFace(vector<WVertex*>& iVertexList, unsigned iMaterial, WFace *face)
+{
+
+  int id = _FaceList.size();
+
+  face->SetMaterialIndex(iMaterial);
+
+  // Check whether we have a degenerated face:
+
+  // LET'S HACK IT FOR THE TRIANGLE CASE:
+
+  if(3 == iVertexList.size())
+
+  {
+
+    if((iVertexList[0] == iVertexList[1]) 
+
+      || (iVertexList[0] == iVertexList[2]) 
+
+      || (iVertexList[2] == iVertexList[1]))
+
+    {
+
+      cerr << "Warning: degenerated triangle detected, correcting" << endl;
+      return 0;
+
+    }
+
+  }
+  // vertex pointers used to build each edge
+  vector<WVertex*>::iterator va, vb, it;
+
+  va = iVertexList.begin();
+  vb = va;
+  for(; va != iVertexList.end(); va = vb)
+  {
+		vb++;
+    // Adds va to the vertex list:
+    //face->AddVertex(*va);
+
+    WOEdge * oedge;
+    if(*va == iVertexList.back())
+      oedge = face->MakeEdge(*va, iVertexList.front()); //for the last (closing) edge
+    else
+     oedge = face->MakeEdge(*va, *vb);
+
+
+    if(oedge == 0)
+      return 0;
+
+
+    WEdge *edge = oedge->GetOwner();
+    if(1 == edge->GetNumberOfOEdges())
+    {
+      // means that we just created a new edge and that we must add it to the 
+      // shape's edges list
+      edge->SetId(_EdgeList.size());
+      AddEdge(edge);
+      // compute the mean edge value:
+      _meanEdgeSize += edge->GetaOEdge()->getVec3r().norm();
+    }
+  }
+  
+  // compute the face normal (v1v2 ^ v1v3)
+  WVertex *v1, *v2, *v3;
+  it = iVertexList.begin();
+  v1 = *it;
+  it++;
+  v2 = *it;
+  it++;
+  v3 = *it;
+
+  Vec3r vector1(v2->GetVertex()-v1->GetVertex());
+  Vec3r vector2(v3->GetVertex()-v1->GetVertex());
+
+  Vec3r normal(vector1 ^ vector2);
+  normal.normalize();
+  face->SetNormal(normal);
+
+  // Add the face to the shape's faces list:
+  face->SetId(id);
+  AddFace(face);
+
+  return face;
+}
diff --git a/extern/freestyle/src/winged_edge/WEdge.h b/extern/freestyle/src/winged_edge/WEdge.h
new file mode 100755
index 00000000000..2369caf4566
--- /dev/null
+++ b/extern/freestyle/src/winged_edge/WEdge.h
@@ -0,0 +1,952 @@
+//
+//  Filename         : WEdge.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Classes to define a Winged Edge data structure.
+//  Date of creation : 18/02/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  WEDGE_H
+# define WEDGE_H
+
+# include <vector>
+# include <iterator>
+# include "../system/FreestyleConfig.h"
+# include "../geometry/Geom.h"
+# include "../scene_graph/Material.h"
+
+using namespace std;
+using namespace Geometry;
+
+
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             WVertex            */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+
+class WOEdge;
+class WEdge;
+class WShape;
+class WFace;
+class LIB_WINGED_EDGE_EXPORT WVertex
+{
+protected:
+  int _Id;                    // an identificator
+  Vec3r _Vertex;
+  vector<WEdge*> _EdgeList;
+  WShape * _Shape; // the shape to which the vertex belongs
+  bool _Smooth; // flag to indicate whether the Vertex belongs to a smooth edge or not
+  int _Border; // 1 -> border, 0 -> no border, -1 -> not set
+  
+public:
+  void * userdata; // designed to store specific user data
+  inline WVertex(const Vec3r &v) {_Id = 0; _Vertex = v; userdata = NULL; _Shape = NULL;_Smooth=true;_Border=-1;}
+  /*! Copy constructor */
+  WVertex(WVertex& iBrother);
+  virtual WVertex * dupplicate(); 
+  virtual ~WVertex() {}
+
+  /*! accessors */
+  inline Vec3r& GetVertex() {return _Vertex;}
+  inline vector<WEdge*>& GetEdges() {return _EdgeList;}
+  inline int GetId() {return _Id;}
+  inline WShape * shape() const {return _Shape;}
+  inline bool isSmooth() const {return _Smooth;}
+  bool isBoundary();
+  
+  /*! modifiers */
+  inline void SetVertex(const Vec3r& v) {_Vertex = v;}
+  inline void SetEdges(const vector<WEdge *>& iEdgeList) {_EdgeList = iEdgeList;}
+  inline void SetId(int id) {_Id = id;}
+  inline void SetShape(WShape *iShape) {_Shape = iShape;}
+  inline void SetSmooth(bool b) {_Smooth = b;}
+  inline void SetBorder(bool b) {if(b) _Border= 1; else _Border = 0;}
+  
+  /*! Adds an edge to the edges list */
+  void AddEdge(WEdge *iEdge) ;
+
+  virtual void ResetUserData() {userdata = 0;}
+
+
+
+public:
+
+  
+
+  /*! Iterator to iterate over a vertex incoming edges in the CCW order*/
+# if defined(__GNUC__) && (__GNUC__ < 3)
+  class incoming_edge_iterator : public input_iterator<WOEdge*,ptrdiff_t>
+# else
+  class LIB_WINGED_EDGE_EXPORT incoming_edge_iterator : public iterator<input_iterator_tag, WOEdge*,ptrdiff_t>
+# endif
+  {
+  private:
+    WVertex *_vertex;
+    // 
+    WOEdge *_begin;
+    WOEdge *_current;
+
+    public:
+# if defined(__GNUC__) && (__GNUC__ < 3)
+    inline incoming_edge_iterator() : input_iterator<WOEdge*,ptrdiff_t>() {}
+# else
+    inline incoming_edge_iterator() : iterator<input_iterator_tag, WOEdge*,ptrdiff_t>() {}
+# endif
+
+  protected:
+    friend class WVertex;
+    inline incoming_edge_iterator(
+                         WVertex *iVertex,
+                         WOEdge * iBegin,
+                         WOEdge * iCurrent)
+# if defined(__GNUC__) && (__GNUC__ < 3)
+      : input_iterator<WOEdge*,ptrdiff_t>()
+# else
+      : iterator<input_iterator_tag, WOEdge*,ptrdiff_t>()
+# endif
+    {
+      _vertex = iVertex;
+      _begin = iBegin;
+      _current = iCurrent;
+    }
+
+  public:
+    inline incoming_edge_iterator(const incoming_edge_iterator& iBrother)
+# if defined(__GNUC__) && (__GNUC__ < 3)
+      : input_iterator<WOEdge*,ptrdiff_t>(iBrother)
+# else
+      : iterator<input_iterator_tag, WOEdge*,ptrdiff_t>(iBrother)
+# endif
+    {
+      _vertex = iBrother._vertex;
+      _begin = iBrother._begin;
+      _current = iBrother._current;
+    }
+
+  public:
+    // operators
+    virtual incoming_edge_iterator& operator++()  // operator corresponding to ++i
+    { 
+      increment();
+      return *this;
+    }
+    virtual incoming_edge_iterator operator++(int)  // opérateur correspondant à i++ 
+    {                                  // c.a.d qui renvoie la valeur *puis* incrémente.
+      incoming_edge_iterator tmp = *this;        // C'est pour cela qu'on stocke la valeur
+      increment();                    // dans un temporaire. 
+      return tmp;
+    } 
+  
+    // comparibility
+    virtual bool operator!=(const incoming_edge_iterator& b) const
+    {
+      return ((_current) != (b._current));
+    }
+
+    virtual bool operator==(const incoming_edge_iterator& b) const
+    {
+      return ((_current)== (b._current));
+    }
+
+    // dereferencing
+    virtual WOEdge* operator*();
+    //virtual WOEdge** operator->();
+  protected:
+    virtual void increment();
+  };
+
+
+    /*! Iterator to iterate over a vertex faces in the CCW order */
+# if defined(__GNUC__) && (__GNUC__ < 3)
+  class face_iterator : public input_iterator<WFace*,ptrdiff_t>
+# else
+  class LIB_WINGED_EDGE_EXPORT face_iterator : public iterator<input_iterator_tag, WFace*,ptrdiff_t>
+# endif
+  {
+  private:
+    incoming_edge_iterator _edge_it;
+
+    public:
+# if defined(__GNUC__) && (__GNUC__ < 3)
+    inline face_iterator() : input_iterator<WFace*,ptrdiff_t>() {}
+# else
+    inline face_iterator() : iterator<input_iterator_tag, WFace*,ptrdiff_t>() {}
+# endif
+
+  protected:
+    friend class WVertex;
+    inline face_iterator(
+                         incoming_edge_iterator it)
+# if defined(__GNUC__) && (__GNUC__ < 3)
+      : input_iterator<WFace*,ptrdiff_t>()
+# else
+      : iterator<input_iterator_tag, WFace*,ptrdiff_t>()
+# endif
+    {
+      _edge_it = it;
+    }
+
+  public:
+    inline face_iterator(const face_iterator& iBrother)
+# if defined(__GNUC__) && (__GNUC__ < 3)
+      : input_iterator<WFace*,ptrdiff_t>(iBrother)
+# else
+      : iterator<input_iterator_tag, WFace*,ptrdiff_t>(iBrother)
+# endif
+    {
+      _edge_it = iBrother._edge_it;
+    }
+
+  public:
+    // operators
+    virtual face_iterator& operator++()  // operator corresponding to ++i
+    { 
+      increment();
+      return *this;
+    }
+    virtual face_iterator operator++(int)  // opérateur correspondant à i++ 
+    {                                  // c.a.d qui renvoie la valeur *puis* incrémente.
+      face_iterator tmp = *this;        // C'est pour cela qu'on stocke la valeur
+      increment();                    // dans un temporaire. 
+      return tmp;
+    } 
+  
+    // comparibility
+    virtual bool operator!=(const face_iterator& b) const
+    {
+      return ((_edge_it) != (b._edge_it));
+    }
+
+    virtual bool operator==(const face_iterator& b) const
+    {
+      return ((_edge_it)== (b._edge_it));
+    }
+
+    // dereferencing
+    virtual WFace* operator*();
+    //virtual WOEdge** operator->();
+  protected:
+    inline void increment(){
+      ++_edge_it;
+    }
+  };
+
+public:
+  /*! iterators access */
+  virtual incoming_edge_iterator incoming_edges_begin();
+  virtual incoming_edge_iterator incoming_edges_end() ; 
+ 
+  virtual face_iterator faces_begin() {
+    return face_iterator(incoming_edges_begin());
+  }
+  virtual face_iterator faces_end()   {
+    return face_iterator(incoming_edges_end());
+  }
+};
+
+
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             WOEdge             */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+class WFace;
+class WEdge;
+
+class LIB_WINGED_EDGE_EXPORT WOEdge
+{
+protected:
+  //  WOEdge *_paCWEdge;     // edge reached when traveling clockwise on aFace from the edge
+  //  WOEdge *_pbCWEdge;     // edge reached when traveling clockwise on bFace from the edge
+  //  WOEdge *_paCCWEdge;    // edge reached when traveling counterclockwise on aFace from the edge
+  //  WOEdge *_pbCCWEdge;    // edge reached when traveling counterclockwise on bFace from the edge
+  WVertex *_paVertex;   // starting vertex
+  WVertex *_pbVertex;   // ending vertex
+  WFace   *_paFace;     // when following the edge, face on the right
+  WFace   *_pbFace;     // when following the edge, face on the left
+  WEdge *_pOwner;       // Edge 
+
+public:
+  void *userdata;
+  inline WOEdge()
+  {
+    //    _paCWEdge = NULL;
+    //    _pbCWEdge = NULL;
+    //    _paCCWEdge = NULL;
+    //    _pbCCWEdge = NULL;
+    _paVertex = NULL;
+    _pbVertex = NULL;
+    _paFace = NULL;
+    _pbFace = NULL;
+    _pOwner = NULL;
+    userdata = NULL;
+  }
+
+  /*! copy constructor */
+  WOEdge(WOEdge& iBrother);
+  virtual WOEdge * dupplicate();
+
+  /*! accessors */
+  //  inline WOEdge *GetaCWEdge() {return _paCWEdge;}
+  //  inline WOEdge *GetbCWEdge() {return _pbCWEdge;}
+  //  inline WOEdge *GetaCCWEdge() {return _paCCWEdge;}
+  //  inline WOEdge *GetbCCWEdge() {return _pbCCWEdge;}
+  inline WVertex *GetaVertex() {return _paVertex;}
+  inline WVertex *GetbVertex() {return _pbVertex;}
+  inline WFace *GetaFace() {return _paFace;}
+  inline WFace *GetbFace() {return _pbFace;}
+  inline WEdge *GetOwner() {return _pOwner;}
+  
+
+  /*! modifiers */
+  //  inline void SetaCWEdge(WOEdge *pe) {_paCWEdge = pe;}
+  //  inline void SetbCWEdge(WOEdge *pe) {_pbCWEdge = pe;}
+  //  inline void SetaCCWEdge(WOEdge *pe) {_paCCWEdge = pe;}
+  //  inline void SetbCCCWEdge(WOEdge *pe) {_pbCCWEdge = pe;}
+  inline void SetaVertex(WVertex *pv) {_paVertex = pv;}
+  inline void SetbVertex(WVertex *pv) {_pbVertex = pv;}
+  inline void SetaFace(WFace *pf) {_paFace = pf;}
+  inline void SetbFace(WFace *pf) {_pbFace = pf;}
+  inline void SetOwner(WEdge *pe) {_pOwner = pe;}
+
+  /*! Retrieves the list of edges in CW order */
+  inline void RetrieveCWOrderedEdges(vector<WEdge*>& oEdges);
+  /*! returns the vector between the two vertices */
+  Vec3r getVec3r (); 
+  WOEdge * twin (); 
+  WOEdge * getPrevOnFace();
+  virtual void ResetUserData() {userdata = 0;}
+};
+
+
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             WEdge              */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+class LIB_WINGED_EDGE_EXPORT WEdge
+{
+protected:
+  WOEdge *_paOEdge; // first oriented edge
+  WOEdge *_pbOEdge; // second oriented edge
+  int _nOEdges;     // number of oriented edges associated with this edge. (1 means border edge)
+  int    _Id;       // Identifier for the edge
+  
+public:
+  void * userdata; // designed to store specific user data
+  inline WEdge()
+  {
+    _paOEdge = NULL;
+    _pbOEdge = NULL;
+    _nOEdges = 0;
+    userdata = NULL;
+  }
+
+  inline WEdge(WOEdge *iOEdge)
+  {
+    _paOEdge = iOEdge;
+    _pbOEdge = NULL;
+    _nOEdges = 1;
+    userdata = NULL;
+  }
+
+  inline WEdge(WOEdge *iaOEdge, WOEdge *ibOEdge)
+  {
+    _paOEdge = iaOEdge;
+    _pbOEdge = ibOEdge;
+    _nOEdges = 2;
+    userdata = NULL;
+  }
+
+  /*! Copy constructor */
+  WEdge(WEdge& iBrother);
+  virtual WEdge * dupplicate();
+
+  virtual ~WEdge()
+  {
+    if(NULL != _paOEdge)
+    {
+      delete _paOEdge;
+      _paOEdge = NULL;
+    }
+
+    if(NULL != _pbOEdge)
+    {
+      delete _pbOEdge;
+      _pbOEdge = NULL;
+    }
+  }
+
+  /*! checks whether two WEdge have a common vertex.
+   *  Returns a pointer on the common vertex if it exists, 
+   *  NULL otherwise.
+   */
+  static inline WVertex* CommonVertex(WEdge *iEdge1, WEdge* iEdge2)
+  {
+    if((NULL == iEdge1) || (NULL == iEdge2))
+      return NULL;
+
+    WVertex *wv1 = iEdge1->GetaOEdge()->GetaVertex();
+    WVertex *wv2 = iEdge1->GetaOEdge()->GetbVertex();
+    WVertex *wv3 = iEdge2->GetaOEdge()->GetaVertex();
+    WVertex *wv4 = iEdge2->GetaOEdge()->GetbVertex();
+
+    if((wv1 == wv3) || (wv1 == wv4))
+    {
+      return wv1;
+    }
+    else if((wv2 == wv3) || (wv2 == wv4))
+    {
+      return wv2;
+    }
+
+    return NULL;
+  }
+  /*! accessors */
+  inline WOEdge * GetaOEdge() {return _paOEdge;}
+  inline WOEdge * GetbOEdge() {return _pbOEdge;}
+  inline int GetNumberOfOEdges() {return _nOEdges;}
+  inline int    GetId()    {return _Id;}
+  inline WVertex * GetaVertex() {return _paOEdge->GetaVertex();}
+  inline WVertex * GetbVertex() {return _paOEdge->GetbVertex();}
+  inline WFace * GetaFace() {return _paOEdge->GetaFace();}
+  inline WFace * GetbFace() {return _paOEdge->GetbFace();}
+  inline WOEdge* GetOtherOEdge(WOEdge* iOEdge)
+  {
+    if(iOEdge == _paOEdge)
+      return _pbOEdge;
+    else
+      return _paOEdge;
+  }
+
+  /*! modifiers */
+  inline void SetaOEdge(WOEdge *iEdge) {_paOEdge = iEdge;}
+  inline void SetbOEdge(WOEdge *iEdge) {_pbOEdge = iEdge;}
+  inline void AddOEdge(WOEdge *iEdge) 
+  {
+    if(NULL == _paOEdge)
+    {
+      _paOEdge = iEdge;
+      _nOEdges++;
+      return;
+    }
+    if(NULL == _pbOEdge)
+    {
+      _pbOEdge = iEdge;
+      _nOEdges++;
+      return;
+    }
+  }
+  inline void SetNumberOfOEdges(int n) {_nOEdges = n;}
+  inline void SetId(int id) {_Id = id;}
+  virtual void ResetUserData() {userdata = 0;}
+};
+
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             WFace              */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+
+class LIB_WINGED_EDGE_EXPORT WFace
+{
+protected:
+  vector<WOEdge *> _OEdgeList; // list of oriented edges of bording the face
+  Vec3r _Normal;              // normal to the face
+  vector<Vec3r> _VerticesNormals; // in case there is a normal per vertex.
+                                  // The normal number i corresponds to the 
+                                  // aVertex of the oedge number i, for that face
+  vector<Vec2r> _VerticesTexCoords;
+
+  int   _Id;
+  unsigned _MaterialIndex;
+
+public:
+  void *userdata;
+  inline WFace() {userdata = NULL;_MaterialIndex = 0;}
+  /*! copy constructor */
+  WFace(WFace& iBrother);
+  virtual WFace * dupplicate();
+  virtual ~WFace() {}
+
+  /*! accessors */
+  inline const vector<WOEdge*>& GetEdgeList() {return _OEdgeList;}
+  inline WOEdge * GetOEdge(int i) {return _OEdgeList[i];}
+  inline Vec3r& GetNormal() {return _Normal;}
+  inline int    GetId()     {return _Id;}
+  inline unsigned materialIndex() const {return _MaterialIndex;}
+  const Material& material()  ;
+
+  /*! The vertex of index i corresponds to the a vertex 
+   *  of the edge of index i
+   */
+  inline WVertex* GetVertex(unsigned int index)
+  {
+    //    if(index >= _OEdgeList.size())
+    //      return NULL;
+    return _OEdgeList[index]->GetaVertex();
+  }
+  /*! returns the index at which iVertex is stored in the 
+   * array.
+   * returns -1 if iVertex doesn't belong to the face.
+   */
+  inline int GetIndex(WVertex *iVertex){
+    int index = 0;
+    for(vector<WOEdge*>::iterator woe=_OEdgeList.begin(), woend=_OEdgeList.end();
+    woe!=woend;
+    woe++){
+      if((*woe)->GetaVertex() == iVertex)
+        return index;
+      ++index;
+    } 
+    return -1;
+  }
+  inline void RetrieveVertexList(vector<WVertex*>& oVertices)
+  {
+    for(vector<WOEdge*>::iterator woe=_OEdgeList.begin(), woend=_OEdgeList.end();
+        woe!=woend;
+        woe++)
+      {
+        oVertices.push_back((*woe)->GetaVertex());
+      }
+  }
+  inline void  RetrieveBorderFaces(vector<const WFace*>& oWFaces)
+  {
+    for(vector<WOEdge*>::iterator woe=_OEdgeList.begin(), woend=_OEdgeList.end();
+    woe!=woend;
+    woe++)
+    {
+      WFace *af;
+      if(NULL != (af = (*woe)->GetaFace()))
+      oWFaces.push_back(af);
+    }
+  }
+  inline WFace * GetBordingFace(int index)
+  {
+    //    if(index >= _OEdgeList.size())
+    //      return 0;
+    return _OEdgeList[index]->GetaFace();
+  }
+  inline WFace * GetBordingFace(WOEdge *iOEdge)
+  {
+    return iOEdge->GetaFace();
+  }
+  inline vector<Vec3r>& GetPerVertexNormals()
+  {
+    return _VerticesNormals;
+  }
+  inline vector<Vec2r>& GetPerVertexTexCoords()
+  {
+      return _VerticesTexCoords;
+  }
+  /*! Returns the normal of the vertex of index index */
+  inline Vec3r& GetVertexNormal(int index)
+  {
+      return _VerticesNormals[index];
+  }
+  /*! Returns the tex coords of the vertex of index index */
+  inline Vec2r& GetVertexTexCoords(int index)
+  {
+    return _VerticesTexCoords[index];
+  }
+  /*! Returns the normal of the vertex iVertex for that face */
+  inline Vec3r& GetVertexNormal(WVertex *iVertex)
+  {
+    int i = 0;
+    int index = 0;
+    for(vector<WOEdge*>::const_iterator woe=_OEdgeList.begin(), woend=_OEdgeList.end();
+        woe!=woend;
+        woe++)
+      {
+        if((*woe)->GetaVertex() == iVertex)
+        {
+          index = i;
+          break;
+        }
+        ++i;
+      }
+
+    return _VerticesNormals[index];
+  }
+  inline WOEdge* GetNextOEdge(WOEdge* iOEdge)
+  {
+    bool found = false;
+    vector<WOEdge*>::iterator woe,woend, woefirst;
+    woefirst = _OEdgeList.begin();
+    for(woe=woefirst,woend=_OEdgeList.end();
+        woe!=woend;
+        woe++)
+      {
+        if(true == found)
+          return (*woe);
+        
+        if((*woe) == iOEdge)
+          {
+            found = true;
+          }
+      }
+    
+    // We left the loop. That means that the first
+    // OEdge was the good one:
+    if(found)
+      return (*woefirst);
+
+    return NULL;
+  }
+  WOEdge* GetPrevOEdge(WOEdge* iOEdge);
+ 
+  inline int numberOfEdges() const { return _OEdgeList.size();}
+  inline int numberOfVertices() const { return _OEdgeList.size();}
+  /*! Returns true if the face has one ot its edge which is a border 
+   *  edge
+   */
+  inline bool isBorder() const 
+  {
+    for(vector<WOEdge*>::const_iterator woe=_OEdgeList.begin(), woeend=_OEdgeList.end();
+    woe!=woeend;
+    ++woe)
+    {
+      if((*woe)->GetOwner()->GetbOEdge() == 0)
+        return true;
+    }
+    return false;
+  }
+  /*! modifiers */
+  inline void SetEdgeList(const vector<WOEdge*>& iEdgeList) {_OEdgeList = iEdgeList;}
+  inline void SetNormal(const Vec3r& iNormal) {_Normal = iNormal;}
+  inline void SetNormalList(const vector<Vec3r>& iNormalsList) {_VerticesNormals = iNormalsList;}
+  inline void SetTexCoordsList(const vector<Vec2r>& iTexCoordsList) {_VerticesTexCoords = iTexCoordsList;}
+  inline void SetId(int id) {_Id = id;}
+  inline void SetMaterialIndex(unsigned iMaterialIndex) {_MaterialIndex = iMaterialIndex;}
+
+  /*! designed to build a specialized WEdge 
+   *  for use in MakeEdge
+   */
+  virtual WEdge * instanciateEdge() const {return new WEdge;}
+
+  /*! Builds an oriented edge
+   *  Returns the built edge.
+   *    v1, v2
+   *      Vertices at the edge's extremities
+   *      The edge is oriented from v1 to v2.
+   */
+  virtual WOEdge * MakeEdge(WVertex *v1, WVertex *v2);
+
+  /*! Adds an edge to the edges list */
+  inline void AddEdge(WOEdge *iEdge) {_OEdgeList.push_back(iEdge);}
+
+  /*! For triangles, returns the edge opposite to the vertex in e. 
+      returns flase if the face is not a triangle or if the vertex is not found*/
+  bool getOppositeEdge (const WVertex *v, WOEdge* &e); 
+
+  /*! compute the area of the face */
+  real getArea ();
+
+  WShape * getShape() ;
+  virtual void ResetUserData() {userdata = 0;}
+};
+
+
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             WShape             */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+
+class LIB_WINGED_EDGE_EXPORT WShape
+{
+protected:
+  vector<WVertex*> _VertexList;
+  vector<WEdge*>   _EdgeList;
+  vector<WFace*>   _FaceList;
+  int _Id; 
+  static unsigned _SceneCurrentId;
+  Vec3r _min;
+  Vec3r _max;
+  vector<Material> _Materials;
+  real _meanEdgeSize;
+
+public:
+  inline WShape() {_meanEdgeSize = 0;_Id = _SceneCurrentId; _SceneCurrentId++;}
+  /*! copy constructor */
+  WShape(WShape& iBrother);
+  virtual WShape * dupplicate();
+  virtual ~WShape()
+  {
+    if(_EdgeList.size() != 0)
+    {
+      vector<WEdge *>::iterator e;
+      for(e=_EdgeList.begin(); e!=_EdgeList.end(); e++)
+      {
+        delete (*e);
+      }
+      _EdgeList.clear();
+    }
+
+    if(_VertexList.size() != 0)
+    {
+      vector<WVertex *>::iterator v;
+      for(v=_VertexList.begin(); v!=_VertexList.end(); v++)
+      {
+        delete (*v);
+      }
+      _VertexList.clear();
+    }
+
+    if(_FaceList.size() != 0)
+    {
+      vector<WFace *>::iterator f;
+      for(f=_FaceList.begin(); f!=_FaceList.end(); f++)
+      {
+        delete (*f);
+      }
+      _FaceList.clear();
+    }
+  }
+
+  /*! accessors */
+  inline vector<WEdge *>& GetEdgeList() {return _EdgeList;}
+  inline vector<WVertex*>& GetVertexList() {return _VertexList;}
+  inline vector<WFace*>& GetFaceList() {return _FaceList;}
+  inline unsigned GetId() {return _Id;}
+  inline void bbox(Vec3r& min, Vec3r& max) {min=_min; max=_max;}
+  inline const Material& material(unsigned i) const  {return _Materials[i];}
+  inline const vector<Material>& materials() const {return _Materials;}
+  inline const real getMeanEdgeSize() const {return _meanEdgeSize;}
+  /*! modifiers */
+  static inline void SetCurrentId(const unsigned id) { _SceneCurrentId = id; }
+  inline void SetEdgeList(const vector<WEdge*>& iEdgeList) {_EdgeList = iEdgeList;}
+  inline void SetVertexList(const vector<WVertex*>& iVertexList) {_VertexList = iVertexList;}
+  inline void SetFaceList(const vector<WFace*>& iFaceList) {_FaceList = iFaceList;}
+  inline void SetId(int id) {_Id = id;}
+  inline void SetBBox(const Vec3r& min, const Vec3r& max) {_min = min; _max=max;}
+  inline void SetMaterial(const Material& material, unsigned i) {_Materials[i]=material;}
+  inline void SetMaterials(const vector<Material>& iMaterials) {_Materials = iMaterials;}
+
+  /*! designed to build a specialized WFace 
+   *  for use in MakeFace
+   */
+  virtual WFace * instanciateFace() const {return new WFace;}
+
+  /*! adds a new face to the shape 
+   *  returns the built face.
+   *   iVertexList 
+   *      List of face's vertices. These vertices are 
+   *      not added to the WShape vertex list; they are 
+   *      supposed to be already stored when calling MakeFace.
+   *      The order in which the vertices are stored in the list 
+   *      determines the face's edges orientation and (so) the 
+   *      face orientation.
+   *   iMaterialIndex
+   *      The material index for this face 
+   */
+  virtual WFace * MakeFace(vector<WVertex*>& iVertexList, unsigned iMaterialIndex);
+
+  /*! adds a new face to the shape. The difference with 
+   *  the previous method is that this one is designed 
+   *  to build a WingedEdge structure for which there are 
+   *  per vertex normals, opposed to per face normals.
+   *  returns the built face.
+   *   iVertexList 
+   *      List of face's vertices. These vertices are 
+   *      not added to the WShape vertex list; they are 
+   *      supposed to be already stored when calling MakeFace.
+   *      The order in which the vertices are stored in the list 
+   *      determines the face's edges orientation and (so) the 
+   *      face orientation.
+   *   iMaterialIndex
+   *      The materialIndex for this face
+   *   iNormalsList
+   *     The list of normals, iNormalsList[i] corresponding to the 
+   *     normal of the vertex iVertexList[i] for that face.
+   *   iTexCoordsList
+   *     The list of tex coords, iTexCoordsList[i] corresponding to the 
+   *     normal of the vertex iVertexList[i] for that face.
+   */
+  virtual WFace * MakeFace(vector<WVertex*>& iVertexList, vector<Vec3r>& iNormalsList, vector<Vec2r>& iTexCoordsList, unsigned iMaterialIndex);
+
+  inline void AddEdge(WEdge *iEdge) {_EdgeList.push_back(iEdge);}
+  inline void AddFace(WFace* iFace) {_FaceList.push_back(iFace);}
+  inline void AddVertex(WVertex *iVertex) {iVertex->SetShape(this); _VertexList.push_back(iVertex);}
+
+  inline void ResetUserData()
+  {
+    for(vector<WVertex*>::iterator v=_VertexList.begin(),vend=_VertexList.end();
+        v!=vend;
+        v++)
+      {
+        (*v)->ResetUserData();
+      }
+
+    for(vector<WEdge*>::iterator e=_EdgeList.begin(),eend=_EdgeList.end();
+        e!=eend;
+        e++)
+      {
+        (*e)->ResetUserData();
+        // manages WOEdge:
+        WOEdge *oe = (*e)->GetaOEdge();
+        if(oe != NULL)
+          oe->ResetUserData();
+        oe = (*e)->GetbOEdge();
+        if(oe != NULL)
+          oe->ResetUserData();
+      }
+
+    for(vector<WFace*>::iterator f=_FaceList.begin(),fend=_FaceList.end();
+        f!=fend;
+        f++)
+      {
+        (*f)->ResetUserData();
+      }
+    
+  }
+
+  inline void ComputeBBox()
+  {
+    _min = _VertexList[0]->GetVertex();
+    _max = _VertexList[0]->GetVertex();
+
+    Vec3r v;
+    for(vector<WVertex*>::iterator wv=_VertexList.begin(), wvend=_VertexList.end();
+    wv!=wvend;
+    wv++)
+    {
+      for(unsigned int i=0; i<3; i++)
+      {
+        v = (*wv)->GetVertex();
+        if(v[i] < _min[i])
+          _min[i] = v[i];
+        if(v[i] > _max[i])
+          _max[i] = v[i];
+      }
+    }
+  }
+
+  inline real ComputeMeanEdgeSize(){
+    _meanEdgeSize = _meanEdgeSize/(_EdgeList.size());
+    return _meanEdgeSize;
+  }
+
+protected:
+  /*! Builds the face passed as argument (which as already been allocated)
+   *    iVertexList
+   *      List of face's vertices. These vertices are 
+   *      not added to the WShape vertex list; they are 
+   *      supposed to be already stored when calling MakeFace.
+   *      The order in which the vertices are stored in the list 
+   *      determines the face's edges orientation and (so) the 
+   *      face orientation.
+   *    iMaterialIndex
+   *      The material index for this face
+   *    face
+   *      The Face that is filled in
+   */
+  virtual WFace * MakeFace(vector<WVertex*>& iVertexList, unsigned iMaterialIndex, WFace *face);
+};
+
+
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*          WingedEdge            */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+class WingedEdge {
+
+ public:
+
+  WingedEdge() {}
+
+  ~WingedEdge() {
+    clear();
+  }
+
+  void clear() {
+    for (vector<WShape*>::iterator it = _wshapes.begin();
+	 it != _wshapes.end();
+	 it++)
+      delete *it;
+    _wshapes.clear();
+  }
+
+  void addWShape(WShape* wshape) {
+    _wshapes.push_back(wshape);
+  }
+
+  vector<WShape*>& getWShapes() {
+    return _wshapes;
+  }
+
+ private:
+
+  vector<WShape*>	_wshapes;
+};
+
+
+
+/*
+  
+  #############################################
+  #############################################
+  #############################################
+  ######                                 ######
+  ######   I M P L E M E N T A T I O N   ######
+  ######                                 ######
+  #############################################
+  #############################################
+  #############################################
+  
+*/
+/* for inline functions */
+void WOEdge::RetrieveCWOrderedEdges(vector<WEdge*>& oEdges)
+{
+    
+    WOEdge *currentOEdge = this;
+    do
+      {
+        WOEdge* nextOEdge = currentOEdge->GetbFace()->GetNextOEdge(currentOEdge);
+        oEdges.push_back(nextOEdge->GetOwner());
+        currentOEdge = nextOEdge->GetOwner()->GetOtherOEdge(nextOEdge);
+        
+      } while((currentOEdge != NULL) && (currentOEdge->GetOwner() != GetOwner()));
+}
+
+#endif // WEDGE_H
diff --git a/extern/freestyle/src/winged_edge/WFillGrid.cpp b/extern/freestyle/src/winged_edge/WFillGrid.cpp
new file mode 100755
index 00000000000..7d0a2d3c561
--- /dev/null
+++ b/extern/freestyle/src/winged_edge/WFillGrid.cpp
@@ -0,0 +1,60 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "WEdge.h"
+#include "WFillGrid.h"
+
+void WFillGrid::fillGrid() {
+  if (!_winged_edge || !_grid)
+    return;
+
+  vector<WShape*>	wshapes = _winged_edge->getWShapes();
+  vector<WVertex*>	fvertices;
+  vector<Vec3r>		vectors;
+  vector<WFace*>	faces;
+
+  for (vector<WShape*>::const_iterator it = wshapes.begin();
+       it != wshapes.end();
+       it++) {
+    faces = (*it)->GetFaceList();
+
+    for (vector<WFace*>::const_iterator f = faces.begin();
+	 f != faces.end();
+	 f++) {
+      (*f)->RetrieveVertexList(fvertices);
+
+      for (vector<WVertex*>::const_iterator wv = fvertices.begin();
+	   wv != fvertices.end();
+	   wv++)
+        vectors.push_back(Vec3r((*wv)->GetVertex()));
+
+      // occluder will be deleted by the grid
+      Polygon3r *occluder =
+	new Polygon3r(vectors, (*f)->GetNormal());
+      occluder->setId(_polygon_id++);
+      occluder->userdata = (void*)(*f);
+      _grid->insertOccluder(occluder);
+      vectors.clear();
+      fvertices.clear();
+    }
+    faces.clear();
+  }
+}
diff --git a/extern/freestyle/src/winged_edge/WFillGrid.h b/extern/freestyle/src/winged_edge/WFillGrid.h
new file mode 100755
index 00000000000..2ebbc2f359a
--- /dev/null
+++ b/extern/freestyle/src/winged_edge/WFillGrid.h
@@ -0,0 +1,80 @@
+//
+//  Filename         : WFillGrid.h
+//  Author(s)        : Stephane Grabli
+//                     Emmanuel Turquin 
+//  Purpose          : Class to fill in a grid from a SceneGraph
+//                     (uses only the WingedEdge structures)
+//  Date of creation : 03/05/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  W_FILL_GRID_H
+# define W_FILL_GRID_H
+
+# include "../geometry/Grid.h" 
+# include "../geometry/Polygon.h"
+# include "WEdge.h"
+
+class LIB_WINGED_EDGE_EXPORT WFillGrid
+{
+public:
+
+  inline WFillGrid(Grid* grid = 0, WingedEdge* winged_edge = 0) {
+    _winged_edge = winged_edge;
+    _grid = grid;
+    _polygon_id = 0;
+  }
+
+  virtual ~WFillGrid() {}
+
+  void fillGrid();
+
+  /*! Accessors */
+  WingedEdge* getWingedEdge() {
+    return _winged_edge;
+  }
+
+  Grid* getGrid() {
+    return _grid;
+  }
+
+  /*! Modifiers */
+  void setWingedEdge(WingedEdge* winged_edge) {
+    if (winged_edge)
+      _winged_edge = winged_edge;
+  }
+
+  void setGrid(Grid* grid) {
+    if (grid)
+      _grid = grid;
+  }
+
+private:
+
+  Grid*		_grid;
+  WingedEdge*	_winged_edge;
+  unsigned	_polygon_id;
+};
+
+#endif // WS_FILL_GRID_H
diff --git a/extern/freestyle/src/winged_edge/WSFillGrid.cpp b/extern/freestyle/src/winged_edge/WSFillGrid.cpp
new file mode 100755
index 00000000000..cf3734b488e
--- /dev/null
+++ b/extern/freestyle/src/winged_edge/WSFillGrid.cpp
@@ -0,0 +1,60 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "WSEdge.h"
+#include "WSFillGrid.h"
+
+void WSFillGrid::fillGrid() {
+  if (!_winged_edge || !_grid)
+    return;
+
+  vector<WShape*>	wshapes = _winged_edge->getWShapes();
+  vector<WVertex*>	fvertices;
+  vector<Vec3r>		vectors;
+  vector<WFace*>	faces;
+
+  for (vector<WShape*>::const_iterator it = wshapes.begin();
+       it != wshapes.end();
+       it++) {
+    faces = (*it)->GetFaceList();
+
+    for (vector<WFace*>::const_iterator f = faces.begin();
+	 f != faces.end();
+	 f++) {
+      (*f)->RetrieveVertexList(fvertices);
+
+      for (vector<WVertex*>::const_iterator wv = fvertices.begin();
+	   wv != fvertices.end();
+	   wv++)
+        vectors.push_back(Vec3r((*wv)->GetVertex()));
+
+      // occluder will be deleted by the grid
+      Polygon3r *occluder =
+	new Polygon3r(vectors, (*f)->GetNormal());
+      occluder->setId(_polygon_id++);
+      occluder->userdata = (void*)(*f);
+      _grid->insertOccluder(occluder);
+      vectors.clear();
+      fvertices.clear();
+    }
+    faces.clear();
+  }
+}
diff --git a/extern/freestyle/src/winged_edge/WSFillGrid.h b/extern/freestyle/src/winged_edge/WSFillGrid.h
new file mode 100755
index 00000000000..976fdca8e46
--- /dev/null
+++ b/extern/freestyle/src/winged_edge/WSFillGrid.h
@@ -0,0 +1,79 @@
+//
+//  Filename         : WSFillGrid.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Class to fill in a grid from a SceneGraph
+//                     (uses only the WingedEdge structures)
+//  Date of creation : 03/05/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  WS_FILL_GRID_H
+# define WS_FILL_GRID_H
+
+# include "Grid.h" 
+# include "Polygon.h"
+# include "WEdge.h"
+
+class LIB_WINGED_EDGE_EXPORT WSFillGrid
+{
+public:
+
+  inline WSFillGrid(Grid* grid = 0, WingedEdge* winged_edge = 0) {
+    _winged_edge = winged_edge;
+    _grid = grid;
+    _polygon_id = 0;
+  }
+
+  virtual ~WSFillGrid() {}
+
+  void fillGrid();
+
+  /*! Accessors */
+  WingedEdge* getWingedEdge() {
+    return _winged_edge;
+  }
+
+  Grid* getGrid() {
+    return _grid;
+  }
+
+  /*! Modifiers */
+  void setWingedEdge(WingedEdge* winged_edge) {
+    if (winged_edge)
+      _winged_edge = winged_edge;
+  }
+
+  void setGrid(Grid* grid) {
+    if (grid)
+      _grid = grid;
+  }
+
+private:
+
+  Grid*		_grid;
+  WingedEdge*	_winged_edge;
+  unsigned	_polygon_id;
+};
+
+#endif // WS_FILL_GRID_H
diff --git a/extern/freestyle/src/winged_edge/WXEdge.cpp b/extern/freestyle/src/winged_edge/WXEdge.cpp
new file mode 100755
index 00000000000..115a4f61789
--- /dev/null
+++ b/extern/freestyle/src/winged_edge/WXEdge.cpp
@@ -0,0 +1,296 @@
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "WXEdge.h"
+
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             WXFace             */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+unsigned int WXFaceLayer::Get0VertexIndex() const {
+  int i = 0;
+  int nEdges = _pWXFace->numberOfEdges();
+  for(i=0; i<nEdges; ++i){
+    if(_DotP[i] == 0){
+      return i;
+    }
+  }
+  return -1;
+}
+unsigned int WXFaceLayer::GetSmoothEdgeIndex() const{
+  int i = 0;
+  int nEdges = _pWXFace->numberOfEdges();
+  for(i=0; i<nEdges; ++i){
+    if((_DotP[i] == 0) && (_DotP[(i+1)%nEdges] == 0)){
+      return i;
+    }
+  }
+ return -1;
+}
+
+void WXFaceLayer::RetrieveCuspEdgesIndices(vector<int>& oCuspEdges){
+  int i = 0;
+  int nEdges = _pWXFace->numberOfEdges();
+  for(i=0; i<nEdges; ++i){
+    if(_DotP[i]*_DotP[(i+1)%nEdges] < 0){
+      // we got one
+      oCuspEdges.push_back(i);
+    }
+  }
+}
+  
+WXSmoothEdge* WXFaceLayer::BuildSmoothEdge(){ 
+  // if the smooth edge has already been 
+  // built: exit
+  if(0 != _pSmoothEdge)
+    return _pSmoothEdge;
+  real ta, tb;
+  WOEdge *woea(0), *woeb(0);
+  bool ok = false;
+  vector<int> cuspEdgesIndices;
+  int indexStart, indexEnd;
+  unsigned nedges = _pWXFace->numberOfEdges();
+  if(_nNullDotP == nedges){
+    _pSmoothEdge = 0;
+    return _pSmoothEdge;
+  }
+  if((_nPosDotP != 0) && (_nPosDotP != _DotP.size()) && (_nNullDotP == 0)){
+    // that means that we have a smooth edge that starts from 
+    // an edge and ends at an edge
+    //-----------------------------
+    // We retrieve the 2 edges for which we have
+    // opposite signs for each extremity
+    RetrieveCuspEdgesIndices(cuspEdgesIndices);
+    if(cuspEdgesIndices.size() != 2) // we necessarly have 2 cusp edges
+      return 0;
+    
+    // let us determine which cusp edge corresponds to the starting:
+    // We can do that because we defined that 
+    // a silhouette edge had the back facing part on its right.
+    // So if the WOEdge woea is such that woea[0].dotp > 0 and 
+    // woea[1].dotp < 0, it is the starting edge.
+    //-------------------------------------------
+    
+    if(_DotP[cuspEdgesIndices[0]] > 0){
+      woea = _pWXFace->GetOEdge(cuspEdgesIndices[0]);
+      woeb = _pWXFace->GetOEdge(cuspEdgesIndices[1]);
+      indexStart = cuspEdgesIndices[0];
+      indexEnd = cuspEdgesIndices[1];
+    }else{
+      woea = _pWXFace->GetOEdge(cuspEdgesIndices[1]);
+      woeb = _pWXFace->GetOEdge(cuspEdgesIndices[0]);
+      indexStart = cuspEdgesIndices[1];
+      indexEnd = cuspEdgesIndices[0];
+    }
+    
+    // Compute the interpolation:
+    ta = _DotP[indexStart]/(_DotP[indexStart]-_DotP[(indexStart+1)%nedges]);
+    tb = _DotP[indexEnd]/(_DotP[indexEnd]-_DotP[(indexEnd+1)%nedges]);
+    ok = true;
+  }else if(_nNullDotP == 1){
+    // that means that we have exactly one of the 
+    // 2 extremities of our silhouette edge is 
+    // a vertex of the mesh
+    if((_nPosDotP == 2) || (_nPosDotP == 0)){
+      _pSmoothEdge = 0;
+      return _pSmoothEdge;
+    }
+    RetrieveCuspEdgesIndices(cuspEdgesIndices);
+    // We should have only one EdgeCusp:
+    if(cuspEdgesIndices.size() != 1){
+      cout << "Warning in BuildSmoothEdge: weird WXFace configuration" << endl;
+      _pSmoothEdge = 0;
+      return 0;
+    }
+    unsigned index0 = Get0VertexIndex(); // retrieve the 0 vertex index
+    unsigned nedges = _pWXFace->numberOfEdges();
+    if(_DotP[cuspEdgesIndices[0]] > 0){
+      woea = _pWXFace->GetOEdge(cuspEdgesIndices[0]);
+      woeb = _pWXFace->GetOEdge(index0);
+      indexStart = cuspEdgesIndices[0];
+      ta = _DotP[indexStart]/(_DotP[indexStart]-_DotP[(indexStart+1)%nedges]);
+      tb = 0.0;
+    }else{
+      woea = _pWXFace->GetOEdge(index0);
+      woeb = _pWXFace->GetOEdge(cuspEdgesIndices[0]);
+      indexEnd = cuspEdgesIndices[0];
+      ta = 0.0;
+      tb = _DotP[indexEnd]/(_DotP[indexEnd]-_DotP[(indexEnd+1)%nedges]);
+    }
+    ok = true;
+  }else if(_nNullDotP == 2){
+    // that means that the silhouette edge 
+    // is an edge of the mesh
+    int index = GetSmoothEdgeIndex();
+    if(!_pWXFace->front()) {// is it in the right order ?
+      // the order of the WOEdge index is wrong
+      woea = _pWXFace->GetOEdge((index+1)%nedges);
+      woeb = _pWXFace->GetOEdge((index-1)%nedges);
+      ta = 0;
+      tb = 1;
+      ok = true;
+    }else{
+      // here it's not good, our edge is a single point -> skip that face
+      ok = false;
+      // the order of the WOEdge index is good
+      //      woea = _pWXFace->GetOEdge((index-1)%nedges);
+      //      woeb = _pWXFace->GetOEdge((index+1)%nedges);
+      //      ta = 1;
+      //      tb = 0;
+    }
+  }
+  if(ok){
+    _pSmoothEdge = new WXSmoothEdge;
+    _pSmoothEdge->SetWOeA(woea);
+    _pSmoothEdge->SetWOeB(woeb);
+    _pSmoothEdge->SetTa(ta);
+    _pSmoothEdge->SetTb(tb);
+    if(_Nature & Nature::SILHOUETTE){
+      if(_nNullDotP != 2){
+        if(_DotP[_ClosestPointIndex] + 0.01 > 0)
+          _pSmoothEdge->SetFront(true);
+        else
+          _pSmoothEdge->SetFront(false); 
+      }
+    }
+  }
+    
+  // check bording edges to see if they have different dotp values 
+  // in bording faces.
+  //    for(int i=0; i<numberOfEdges(); i++)
+  //    {
+  //      WSFace * bface = (WSFace*)GetBordingFace(i);
+  //      if(bface != 0)
+  //      {
+  //        if((front())^(bface->front())) // fA->front XOR fB->front (true if one is 0 and the other is 1)
+  //        {
+  //          // that means that the edge i of the face is 
+  //          // a silhouette edge
+  //          // TESTER D'ABORD SI LE EXACTSILHOUETTEEDGE N'A PAS 
+  //          // ETE CONSTRUIT SUR L'AUTRE FACE.(1 suffit)
+  //          if(0 != ((WSExactFace*)bface)->exactSilhouetteEdge())
+  //          {
+  //            // that means that this silhouette edge has already been built
+  //            return ((WSExactFace*)bface)->exactSilhouetteEdge();
+  //          }
+  //          // Else we must build it
+  //          WOEdge *woea, *woeb;
+  //          real ta, tb;
+  //          if(!front()) // is it in the right order ?
+  //          { 
+  //            // the order of the WOEdge index is wrong
+  //            woea = _OEdgeList[(i+1)%numberOfEdges()];
+  //            if(0 == i)
+  //              woeb = _OEdgeList[numberOfEdges()-1];
+  //            else
+  //              woeb = _OEdgeList[(i-1)];
+  //            ta = 0;
+  //            tb = 1;
+  //          }
+  //          else
+  //          {
+  //            // the order of the WOEdge index is good
+  //            if(0 == i)
+  //              woea = _OEdgeList[numberOfEdges()-1];
+  //            else
+  //              woea = _OEdgeList[(i-1)];
+  //            woeb = _OEdgeList[(i+1)%numberOfEdges()];
+  //            ta = 1;
+  //            tb = 0;
+  //          } 
+  //      
+  //        _pSmoothEdge = new ExactSilhouetteEdge(ExactSilhouetteEdge::VERTEX_VERTEX);
+  //        _pSmoothEdge->SetWOeA(woea);
+  //        _pSmoothEdge->SetWOeA(woeb);
+  //        _pSmoothEdge->SetTa(ta);
+  //        _pSmoothEdge->SetTb(tb);
+  //
+  //        return _pSmoothEdge;
+  //        }
+  //  }
+  //}
+  return _pSmoothEdge;
+}
+ 
+
+void WXFace::ComputeCenter()
+{
+  vector<WVertex*> iVertexList;
+  RetrieveVertexList(iVertexList);
+  Vec3r center;
+  for(vector<WVertex*>::iterator wv=iVertexList.begin(),wvend=iVertexList.end();
+  wv!=wvend;
+  wv++)
+  {
+    center += (*wv)->GetVertex();
+  }
+  center /= (real)iVertexList.size();
+  SetCenter(center);
+}
+
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             WXShape            */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+
+WFace* WXShape::MakeFace(vector<WVertex*>& iVertexList, unsigned iMaterialIndex)
+{
+  WFace *face = WShape::MakeFace(iVertexList, iMaterialIndex);
+  if(0 == face)
+    return 0;
+  
+  Vec3r center;
+  for(vector<WVertex*>::iterator wv=iVertexList.begin(),wvend=iVertexList.end();
+  wv!=wvend;
+  wv++)
+  {
+    center += (*wv)->GetVertex();
+  }
+  center /= (real)iVertexList.size();
+  ((WXFace*)face)->SetCenter(center);
+
+  return face;
+}
+
+WFace * WXShape::MakeFace(vector<WVertex*>& iVertexList, vector<Vec3r>& iNormalsList, vector<Vec2r>& iTexCoordsList, unsigned iMaterialIndex)
+{
+  WFace *face = WShape::MakeFace(iVertexList, iNormalsList, iTexCoordsList, iMaterialIndex);
+  
+  //  Vec3r center;
+  //  for(vector<WVertex*>::iterator wv=iVertexList.begin(),wvend=iVertexList.end();
+  //  wv!=wvend;
+  //  wv++)
+  //  {
+  //    center += (*wv)->GetVertex();
+  //  }
+  //  center /= (real)iVertexList.size();
+  //  ((WSFace*)face)->SetCenter(center);
+
+  return face;
+}
+
diff --git a/extern/freestyle/src/winged_edge/WXEdge.h b/extern/freestyle/src/winged_edge/WXEdge.h
new file mode 100755
index 00000000000..beacb1a9ca9
--- /dev/null
+++ b/extern/freestyle/src/winged_edge/WXEdge.h
@@ -0,0 +1,582 @@
+//
+//  Filename         : WXEdge.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Classes to define an Extended Winged Edge data structure.
+//  Date of creation : 26/10/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  WXEDGE_H
+# define WXEDGE_H
+
+# include "WEdge.h"
+# include "Nature.h"
+# include "Curvature.h"
+
+typedef Nature::EdgeNature WXNature;
+
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             WXVertex           */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+class WXVertex : public WVertex
+{  
+private:
+  // Curvature info
+  CurvatureInfo *_curvatures;
+
+public:
+  inline WXVertex(const Vec3r &v)
+    : WVertex(v)
+  {_curvatures = 0;}
+  /*! Copy constructor */
+  WXVertex(WXVertex& iBrother)
+    : WVertex(iBrother)
+  {_curvatures = new CurvatureInfo(*iBrother._curvatures);}
+  virtual WVertex * dupplicate()
+  {
+    WXVertex *clone = new WXVertex(*this);
+    return clone;
+  }
+  virtual ~WXVertex() {if(_curvatures) delete _curvatures;}
+  virtual void Reset() {if(_curvatures) _curvatures->Kr = 0.0;}
+  inline void setCurvatures(CurvatureInfo *ci) {_curvatures = ci;}
+  
+  inline bool isFeature();
+  inline CurvatureInfo* curvatures() {return _curvatures;}
+
+};
+
+
+
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             WXEdge             */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+class WXEdge : public WEdge
+{
+private:
+  WXNature _nature; // flag to indicate whether the edge is a silhouette edge or not
+  int _order; // 0: the order doesn't matter. 1: the order is the orginal one. -1: the order is not good
+  bool _front;  // a front facing edge is an edge for which the bording face which is the nearest 
+                // from the viewpoint is front. A back facing edge is the opposite.
+   
+public:
+  inline WXEdge()
+    : WEdge(){
+    _nature = Nature::NO_FEATURE;
+    _front = false;
+    _order=0;
+  }
+
+  inline WXEdge(WOEdge *iOEdge)
+    : WEdge(iOEdge)
+  { _nature = Nature::NO_FEATURE;_front = false;_order=0;}
+
+  inline WXEdge(WOEdge *iaOEdge, WOEdge *ibOEdge)
+    : WEdge(iaOEdge, ibOEdge)
+  { _nature = Nature::NO_FEATURE;_front = false;_order=0;}
+
+  /*! Copy constructor */
+  inline WXEdge(WXEdge& iBrother)
+    : WEdge(iBrother)
+  {_nature = iBrother.nature();_front = iBrother._front;_order = iBrother._order;}
+  virtual WEdge * dupplicate()
+  {
+    WXEdge *clone = new WXEdge(*this);
+    return clone;
+  }
+
+  virtual ~WXEdge()
+  {}
+
+  virtual void Reset(){
+    _nature  = _nature & ~Nature::SILHOUETTE;
+    _nature  = _nature & ~Nature::SUGGESTIVE_CONTOUR;
+  }
+
+  /*! accessors */
+  inline WXNature nature() {return _nature;}
+  inline bool front() {return _front;}
+  inline int order() const {return _order;}
+  
+  /*! modifiers */
+  inline void SetFront(bool iFront) {_front = iFront;}
+  inline void SetNature(WXNature iNature) {_nature = iNature;}
+  inline void AddNature(WXNature iNature) {_nature = _nature|iNature;}
+  inline void SetOrder(int i) {_order = i;}
+  
+};
+
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             WXFace             */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+/*! Class to store a smooth edge (i.e Hertzman & Zorin smooth silhouette edges) */
+class WXSmoothEdge{
+public:
+  typedef enum{
+    EDGE_EDGE,
+    VERTEX_EDGE,
+    EDGE_VERTEX
+  } Configuration;
+
+  WOEdge *_woea; // Oriented edge from which the silhouette edge starts
+  WOEdge *_woeb; // Oriented edge where the silhouette edge ends
+  real _ta;    // The silhouette starting point's coordinates are : _woea[0]+ta*(_woea[1]-_woea[0])
+  real _tb;    // The silhouette ending point's coordinates are : _woeb[0]+ta*(_woeb[1]-_woeb[0])
+  bool _front;
+  Configuration _config;
+
+  WXSmoothEdge(){
+    _woea = 0;
+    _woeb = 0;
+    _ta = 0;
+    _tb = 0;
+    _front = false;
+    _config = EDGE_EDGE;
+  }
+  WXSmoothEdge(const WXSmoothEdge& iBrother){
+    _woea = iBrother._woea;
+    _woeb = iBrother._woeb;
+    _ta = iBrother._ta;
+    _tb = iBrother._tb;
+    _config = iBrother._config;
+    _front = iBrother._front;
+  }
+  ~WXSmoothEdge() {}
+
+  inline WOEdge * woea() {return _woea;}
+  inline WOEdge * woeb() {return _woeb;}
+  inline real ta() const {return _ta;}
+  inline real tb() const {return _tb;}
+  inline bool front() const {return _front;}
+  inline Configuration configuration() const {return _config;} 
+  
+  /*! modifiers */
+  inline void SetWOeA(WOEdge *iwoea) {_woea = iwoea;}
+  inline void SetWOeB(WOEdge *iwoeb) {_woeb = iwoeb;}
+  inline void SetTa(real ta) {_ta = ta;}
+  inline void SetTb(real tb) {_tb = tb;}
+  inline void SetFront(bool iFront) {_front = iFront;}
+  inline void SetConfiguration(Configuration iConf) {_config = iConf;}
+  
+};
+/* Class to store a value per vertex and a smooth edge. 
+ * The WXFace stores a list of these 
+ */
+class WXFace;
+class LIB_WINGED_EDGE_EXPORT WXFaceLayer{
+public:
+  void * userdata;
+  WXFace * _pWXFace;
+  vector<real> _DotP;// in case of silhouette: the values obtained when computing the normal-view direction 
+                         // dot product. _DotP[i] is this value for the vertex i for that 
+                          // face.
+  WXSmoothEdge * _pSmoothEdge;
+  WXNature _Nature;
+
+  //tmp values
+  unsigned _nPosDotP; // count the number of positive dot products for vertices.
+                      // if this number is != 0 and !=_DotP.size() -> it is a silhouette fac
+
+  unsigned _nNullDotP; // count the number of null dot products for vertices.
+  unsigned _ClosestPointIndex;
+  bool _viewDependant;
+
+  WXFaceLayer(WXFace *iFace, WXNature iNature, bool viewDependant){
+    _pWXFace = iFace;
+    _pSmoothEdge = 0;
+    _nPosDotP = 0;
+    _nNullDotP=0;
+    _Nature = iNature;
+    _viewDependant = viewDependant;
+    userdata = 0;
+  }
+  WXFaceLayer(const WXFaceLayer& iBrother){
+    _pWXFace = iBrother._pWXFace;
+    _pSmoothEdge = 0;
+    _DotP = iBrother._DotP;
+    _nPosDotP = iBrother._nPosDotP;
+    _nNullDotP = iBrother._nNullDotP;
+    _Nature = iBrother._Nature;
+    if(0 != iBrother._pSmoothEdge)
+    {
+      _pSmoothEdge = new WXSmoothEdge(*(iBrother._pSmoothEdge));
+    }
+    _viewDependant = iBrother._viewDependant;
+    userdata = 0;
+  }
+  virtual ~WXFaceLayer() {
+    if(!_DotP.empty())
+      _DotP.clear();
+    if(0 != _pSmoothEdge){
+      delete _pSmoothEdge;
+      _pSmoothEdge = 0;
+    }
+  }
+  inline const real dotP(int i) const {return _DotP[i];}
+  inline unsigned nPosDotP() const {return _nPosDotP;}
+  inline unsigned nNullDotP() const {return _nNullDotP;}
+  inline int closestPointIndex() const {return _ClosestPointIndex;}
+  inline Nature::EdgeNature nature() const {return _Nature;}
+  inline bool hasSmoothEdge() const {if(_pSmoothEdge) return true; return false;}
+  inline WXFace * getFace() {return _pWXFace;}
+  inline WXSmoothEdge * getSmoothEdge() {return _pSmoothEdge;}
+  inline bool isViewDependant() const {return _viewDependant;}
+  inline void SetClosestPointIndex(int iIndex) {_ClosestPointIndex = iIndex;}
+
+  inline void removeSmoothEdge() {
+    if(!_DotP.empty())
+      _DotP.clear();
+    if (_pSmoothEdge) {
+      delete _pSmoothEdge;
+      _pSmoothEdge = 0;
+    }
+  }
+
+  /*! If one of the face layer vertex has a DotP equal
+   *  to 0, this method returns the vertex where it happens
+   */
+  unsigned int Get0VertexIndex() const ;
+
+  /*! In case one of the edge of the triangle 
+   *  is a smooth edge, this method 
+   *  allows to retrieve the concerned edge
+   */
+  unsigned int GetSmoothEdgeIndex() const;
+  /*! retrieves the edges of the triangle for which 
+   *  the signs are different (a null value is not considered) for the dotp 
+   *  values at each edge extrimity
+   */
+  void RetrieveCuspEdgesIndices(vector<int>& oCuspEdges);
+  WXSmoothEdge * BuildSmoothEdge();
+  inline void SetDotP(const vector<real>& iDotP) {_DotP = iDotP;}
+  inline void PushDotP(real iDotP) {
+    _DotP.push_back(iDotP);
+    if(iDotP > 0)
+      ++_nPosDotP;
+    if(iDotP == 0)
+      ++_nNullDotP;
+  }
+  inline void ReplaceDotP(unsigned int index, real newDotP){
+    _DotP[index] = newDotP;
+    updateDotPInfos();
+  }
+  inline void updateDotPInfos() {
+    for(vector<real>::iterator d=_DotP.begin(), dend=_DotP.end();
+    d!=dend;
+    ++d){
+      _nPosDotP = 0;
+      _nNullDotP = 0;
+      if((*d) > 0)
+        ++_nPosDotP;
+      if((*d) == 0)
+        ++_nNullDotP;
+    }
+  }
+};
+
+
+class WXFace : public WFace
+{
+protected:
+  Vec3r _center; // center of the face
+  real _Z; // distance from viewpoint to the center of the face
+  bool _front; // flag to tell whether the face is front facing or back facing
+  real _dotp;  // value obtained when computing the normal-viewpoint dot product
+ 
+  vector<WXFaceLayer*> _SmoothLayers; // The data needed to store one or several smooth edges that traverse the face
+public:
+  inline WXFace() : WFace() {_Z=0.0;_front = false;}
+  /*! Copy constructor */
+  WXFace(WXFace& iBrother)
+    : WFace(iBrother)
+  {
+    _center = iBrother.center();
+    _Z = iBrother.Z();
+    _front = iBrother.front();
+    for(vector<WXFaceLayer*>::iterator wxf = iBrother._SmoothLayers.begin(), wxfend = iBrother._SmoothLayers.end();
+    wxf != wxfend;
+    ++wxf){
+      _SmoothLayers.push_back(new WXFaceLayer(**wxf));
+    }
+  }
+  virtual WFace * dupplicate()
+  {
+    WXFace * clone = new WXFace(*this);
+    return clone;
+  }
+
+  virtual ~WXFace() {
+    if(!_SmoothLayers.empty()){
+      for(vector<WXFaceLayer*>::iterator wxf = _SmoothLayers.begin(), wxfend = _SmoothLayers.end();
+      wxf != wxfend;
+      ++wxf){
+        delete (*wxf);
+      }
+      _SmoothLayers.clear();
+    } 
+  }
+
+  /*! designed to build a specialized WEdge 
+   *  for use in MakeEdge
+   */
+  virtual WEdge * instanciateEdge() const {return new WXEdge;}
+  
+  /*! accessors */
+  inline Vec3r& center() {return _center;}
+  inline real Z() {return _Z;}
+  inline bool front() {return _front;}
+  inline real dotp() {return _dotp;}
+  inline bool hasSmoothEdges() const {
+    for(vector<WXFaceLayer*>::const_iterator wxf = _SmoothLayers.begin(), wxfend = _SmoothLayers.end();
+    wxf != wxfend;
+    ++wxf){
+      if( ((*wxf)->hasSmoothEdge())){
+        return true;
+      }
+    }
+    return false;
+  }
+  vector<WXFaceLayer*>& getSmoothLayers() {return _SmoothLayers;}
+  /*! retrieve the smooth edges that match the Nature given as argument */
+  void retrieveSmoothEdges(WXNature iNature, vector<WXSmoothEdge*>& oSmoothEdges){
+    for(vector<WXFaceLayer*>::iterator wxf = _SmoothLayers.begin(), wxfend = _SmoothLayers.end();
+    wxf != wxfend;
+    ++wxf){
+      if( ((*wxf)->hasSmoothEdge()) && ((*wxf)->_Nature & iNature) ){
+        oSmoothEdges.push_back((*wxf)->_pSmoothEdge);
+      }
+    }
+  }
+  void retrieveSmoothEdgesLayers(WXNature iNature, vector<WXFaceLayer*>& oSmoothEdgesLayers){
+    for(vector<WXFaceLayer*>::iterator wxf = _SmoothLayers.begin(), wxfend = _SmoothLayers.end();
+    wxf != wxfend;
+    ++wxf){
+      if( ((*wxf)->hasSmoothEdge()) && ((*wxf)->_Nature & iNature) ){
+        oSmoothEdgesLayers.push_back((*wxf));
+      }
+    }
+  }
+  void retrieveSmoothLayers(WXNature iNature, vector<WXFaceLayer*>& oSmoothLayers){
+    for(vector<WXFaceLayer*>::iterator wxf = _SmoothLayers.begin(), wxfend = _SmoothLayers.end();
+    wxf != wxfend;
+    ++wxf){
+      if((*wxf)->_Nature & iNature){
+        oSmoothLayers.push_back(*wxf);
+      }
+    }
+  }
+  /*! modifiers */
+  inline void SetCenter(const Vec3r& iCenter) {_center = iCenter;}
+  void ComputeCenter();
+  inline void SetZ(real z) {_Z = z;}
+  inline void SetFront(bool iFront) {_front = iFront;}
+  inline void SetDotP(real iDotP) 
+  {
+    _dotp = iDotP;
+    if(_dotp > 0)
+      _front = true;
+    else
+      _front = false;
+  }
+  inline void AddSmoothLayer(WXFaceLayer * iLayer){
+    _SmoothLayers.push_back(iLayer);
+  }
+  inline void Reset() {
+    vector<WXFaceLayer*> layersToKeep;
+    for(vector<WXFaceLayer*>::iterator wxf = _SmoothLayers.begin(), wxfend = _SmoothLayers.end();
+    wxf != wxfend;
+    ++wxf){
+      if((*wxf)->isViewDependant())
+        delete (*wxf);
+      else
+        layersToKeep.push_back(*wxf);
+    }
+    _SmoothLayers = layersToKeep;
+  }
+  /*! Clears everything */
+  inline void Clear() {
+    for(vector<WXFaceLayer*>::iterator wxf = _SmoothLayers.begin(), wxfend = _SmoothLayers.end();
+    wxf != wxfend;
+    ++wxf){
+      delete (*wxf);
+    }
+    _SmoothLayers.clear();
+  }
+  virtual void ResetUserData() {
+    WFace::ResetUserData();
+    for(vector<WXFaceLayer*>::iterator wxf = _SmoothLayers.begin(), wxfend = _SmoothLayers.end();
+    wxf != wxfend;
+    ++wxf){
+      (*wxf)->userdata = 0;
+    }
+  }
+};
+
+
+                  /**********************************/
+                  /*                                */
+                  /*                                */
+                  /*             WXShape            */
+                  /*                                */
+                  /*                                */
+                  /**********************************/
+
+
+class WXShape : public WShape
+{
+public:
+  typedef WXShape type_name;
+protected:
+  bool _computeViewIndependant; // flag to indicate whether the view independant stuff must be computed or not
+public:
+  inline WXShape() : WShape() {_computeViewIndependant = true;}
+  /*! copy constructor */
+  inline WXShape(WXShape& iBrother)
+    :WShape(iBrother)
+  {
+    _computeViewIndependant = iBrother._computeViewIndependant;
+  }
+  virtual WShape * dupplicate()
+  {
+    WXShape *clone = new WXShape(*this);
+    return clone;
+  }
+  
+  virtual ~WXShape()
+  {
+  }
+ 
+  inline bool getComputeViewIndependantFlag() const {return _computeViewIndependant;}
+  inline void setComputeViewIndependantFlag(bool iFlag) {_computeViewIndependant = iFlag;}
+
+  /*! designed to build a specialized WFace 
+   *  for use in MakeFace
+   */
+  virtual WFace * instanciateFace() const {return new WXFace;}
+
+ /*! adds a new face to the shape 
+  *  returns the built face.
+  *   iVertexList 
+  *      List of face's vertices. These vertices are 
+  *      not added to the WShape vertex list; they are 
+  *      supposed to be already stored when calling MakeFace.
+  *      The order in which the vertices are stored in the list 
+  *      determines the face's edges orientation and (so) the 
+  *      face orientation.
+  */
+  virtual WFace * MakeFace(vector<WVertex*>& iVertexList, unsigned iMaterialIndex);
+
+  /*! adds a new face to the shape. The difference with 
+   *  the previous method is that this one is designed 
+   *  to build a WingedEdge structure for which there are 
+   *  per vertex normals, opposed to per face normals.
+   *  returns the built face.
+   *   iVertexList 
+   *      List of face's vertices. These vertices are 
+   *      not added to the WShape vertex list; they are 
+   *      supposed to be already stored when calling MakeFace.
+   *      The order in which the vertices are stored in the list 
+   *      determines the face's edges orientation and (so) the 
+   *      face orientation.
+   *   iNormalsList
+   *     The list of normals, iNormalsList[i] corresponding to the 
+   *     normal of the vertex iVertexList[i] for that face.
+   *   iTexCoordsList
+   *     The list of tex coords, iTexCoordsList[i] corresponding to the 
+   *     normal of the vertex iVertexList[i] for that face.
+   */
+  virtual WFace * MakeFace(vector<WVertex*>& iVertexList, vector<Vec3r>& iNormalsList, vector<Vec2r>& iTexCoordsList, unsigned iMaterialIndex);
+
+  /*! Reset all edges and vertices flags (which might
+   *  have been set up on a previous pass)
+   */
+  virtual void Reset(){
+    // Reset Edges
+    vector<WEdge*>& wedges = GetEdgeList();
+    for(vector<WEdge*>::iterator we=wedges.begin(),weend=wedges.end();
+    we!=weend;
+    we++){
+      ((WXEdge*)(*we))->Reset();
+    }
+
+    //Reset faces:
+    vector<WFace*>& wfaces = GetFaceList();
+    for(vector<WFace*>::iterator wf=wfaces.begin(),wfend=wfaces.end();
+    wf!=wfend;
+    wf++){
+      ((WXFace*)(*wf))->Reset();
+    }
+  }
+  /*! accessors */
+};
+
+/*
+  
+  #############################################
+  #############################################
+  #############################################
+  ######                                 ######
+  ######   I M P L E M E N T A T I O N   ######
+  ######                                 ######
+  #############################################
+  #############################################
+  #############################################
+  
+*/
+/* for inline functions */
+
+bool WXVertex::isFeature() 
+{ 
+  int counter = 0;
+  vector<WEdge*>& vedges = GetEdges();
+  for(vector<WEdge*>::iterator ve=vedges.begin(), vend=vedges.end();
+  ve!=vend;
+  ve++)
+  {
+    if(((WXEdge*)(*ve))->nature() != Nature::NO_FEATURE)
+      counter++;
+  }
+  
+  if((counter == 1) || (counter > 2))
+    return true;
+  
+  return false;
+}
+
+
+#endif
diff --git a/extern/freestyle/src/winged_edge/WXEdgeBuilder.cpp b/extern/freestyle/src/winged_edge/WXEdgeBuilder.cpp
new file mode 100755
index 00000000000..534c6e323a9
--- /dev/null
+++ b/extern/freestyle/src/winged_edge/WXEdgeBuilder.cpp
@@ -0,0 +1,43 @@
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "WXEdgeBuilder.h"
+#include "WXEdge.h"
+
+void WXEdgeBuilder::visitIndexedFaceSet(IndexedFaceSet& ifs)
+{
+  WXShape *shape = new WXShape;
+  buildWShape(*shape, ifs);
+  shape->SetId(ifs.getId().getFirst());
+  //ifs.SetId(shape->GetId());
+}
+
+void WXEdgeBuilder::buildWVertices(WShape& shape,
+			       const real *vertices,
+			       unsigned vsize) {
+  WXVertex *vertex;
+  for (unsigned i = 0; i < vsize; i += 3) {
+    vertex = new WXVertex(Vec3r(vertices[i],
+				      vertices[i + 1],
+				      vertices[i + 2]));
+    vertex->SetId(i / 3);
+    shape.AddVertex(vertex);
+  }
+}
diff --git a/extern/freestyle/src/winged_edge/WXEdgeBuilder.h b/extern/freestyle/src/winged_edge/WXEdgeBuilder.h
new file mode 100755
index 00000000000..b646d66a285
--- /dev/null
+++ b/extern/freestyle/src/winged_edge/WXEdgeBuilder.h
@@ -0,0 +1,51 @@
+#ifndef WXEDGEBUILDER_H
+# define WXEDGEBUILDER_H
+
+//
+//  Filename         : WSBuilder.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Class inherited from WingedEdgeBuilder and 
+//                     designed to build a WX (WingedEdge + extended info(silhouette etc...)) 
+//                     structure from a polygonal model
+//  Date of creation : 28/05/03
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+# include "WingedEdgeBuilder.h"
+# include "../scene_graph/IndexedFaceSet.h"
+
+class LIB_WINGED_EDGE_EXPORT WXEdgeBuilder : public WingedEdgeBuilder
+{
+public:
+	WXEdgeBuilder() : WingedEdgeBuilder() {}
+  virtual ~WXEdgeBuilder() {}
+  VISIT_DECL(IndexedFaceSet)
+
+protected:
+  virtual void buildWVertices(WShape& shape,
+			      const real *vertices,
+			      unsigned vsize);
+};
+
+#endif // WXEDGEBUILDER_H
diff --git a/extern/freestyle/src/winged_edge/WingedEdgeBuilder.cpp b/extern/freestyle/src/winged_edge/WingedEdgeBuilder.cpp
new file mode 100755
index 00000000000..98e7c269248
--- /dev/null
+++ b/extern/freestyle/src/winged_edge/WingedEdgeBuilder.cpp
@@ -0,0 +1,362 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "../geometry/GeomUtils.h"
+#include "../scene_graph/NodeShape.h"
+#include "WingedEdgeBuilder.h"
+#include <set>
+using namespace std;
+
+void WingedEdgeBuilder::visitIndexedFaceSet(IndexedFaceSet& ifs) {
+  WShape *shape = new WShape;
+  buildWShape(*shape, ifs);
+  shape->SetId(ifs.getId().getFirst());
+  //ifs.SetId(shape->GetId());
+}
+
+void WingedEdgeBuilder::visitNodeShape(NodeShape& ns) {
+  //Sets the current material to iShapeode->material:
+  _current_material = &(ns.material());
+}
+
+void WingedEdgeBuilder::visitNodeTransform(NodeTransform& tn) {
+  if(!_current_matrix) {
+    _current_matrix = new Matrix44r(tn.matrix());
+    return;
+  }
+
+  _matrices_stack.push_back(_current_matrix);
+  Matrix44r *new_matrix = new Matrix44r(*_current_matrix * tn.matrix());
+  _current_matrix = new_matrix;
+}
+
+void WingedEdgeBuilder::visitNodeTransformAfter(NodeTransform&) {
+  if(_current_matrix)
+    delete _current_matrix;
+
+  if(_matrices_stack.empty()) {
+    _current_matrix = NULL;
+    return;
+  }
+
+  _current_matrix = _matrices_stack.back();
+  _matrices_stack.pop_back();
+}
+
+void WingedEdgeBuilder::buildWShape(WShape& shape, IndexedFaceSet& ifs) {
+  unsigned	vsize = ifs.vsize();
+  unsigned	nsize = ifs.nsize();
+  unsigned	tsize = ifs.tsize();
+
+  const real*	vertices = ifs.vertices();
+  const real*	normals = ifs.normals();
+  const real*	texCoords = ifs.texCoords();
+
+  real*		new_vertices;
+  real*		new_normals;
+
+	new_vertices = new real[vsize];
+	new_normals = new real[nsize];
+
+  // transform coordinates from local to world system
+  if(_current_matrix) {
+    transformVertices(vertices, vsize, *_current_matrix, new_vertices);
+    transformNormals(normals, nsize, *_current_matrix, new_normals);
+  }
+  else {
+    memcpy(new_vertices, vertices, vsize * sizeof(*new_vertices));
+    memcpy(new_normals, normals, nsize * sizeof(*new_normals));
+  }
+
+  const IndexedFaceSet::TRIANGLES_STYLE*	faceStyle = ifs.trianglesStyle();
+
+	vector<Material> materials;
+	if(ifs.msize()){
+		const Material*const* mats = ifs.materials();
+		for(unsigned i=0; i<ifs.msize(); ++i)
+			materials.push_back(*(mats[i]));
+		shape.SetMaterials(materials);
+	}
+
+  //  const Material * mat = (ifs.material());
+  //  if (mat)
+  //    shape.SetMaterial(*mat);
+  //  else if(_current_material)
+  //    shape.SetMaterial(*_current_material);
+
+  // sets the current WShape to shape
+  _current_wshape = &shape;
+
+  // create a WVertex for each vertex
+  buildWVertices(shape, new_vertices, vsize);
+  
+  const unsigned*	vindices = ifs.vindices();
+  const unsigned*	nindices = ifs.nindices();
+  const unsigned*	tindices = 0;
+  if(ifs.tsize()){
+      tindices = ifs.tindices();
+  }
+  
+	const unsigned *mindices = 0;
+	if(ifs.msize())
+		mindices = ifs.mindices();
+	const unsigned*	numVertexPerFace = ifs.numVertexPerFaces();
+  const unsigned	numfaces = ifs.numFaces();
+
+  for (unsigned index = 0; index < numfaces; index++) {
+    switch(faceStyle[index]) {
+    case IndexedFaceSet::TRIANGLE_STRIP:
+      buildTriangleStrip(new_vertices,
+			 new_normals,
+       materials,
+       texCoords,
+			 vindices,
+			 nindices,
+       mindices,
+       tindices,
+			 numVertexPerFace[index]);
+      break;
+    case IndexedFaceSet::TRIANGLE_FAN:
+      buildTriangleFan(new_vertices,
+		       new_normals,
+           materials, 
+           texCoords,
+		       vindices,
+		       nindices,
+           mindices,
+           tindices,
+		       numVertexPerFace[index]);
+      break;
+    case IndexedFaceSet::TRIANGLES:
+      buildTriangles(new_vertices,
+		     new_normals,
+         materials,
+         texCoords,
+		     vindices,
+		     nindices,
+         mindices,
+         tindices,
+		     numVertexPerFace[index]);
+      break;
+    }
+    vindices += numVertexPerFace[index];
+    nindices += numVertexPerFace[index];
+		if(mindices)
+			mindices += numVertexPerFace[index];
+    if(tindices)
+        tindices += numVertexPerFace[index];
+  }
+
+  delete[] new_vertices;
+  delete[] new_normals;
+
+  // compute bbox
+  shape.ComputeBBox();
+  // compute mean edge size:
+  shape.ComputeMeanEdgeSize();
+
+  // Parse the built winged-edge shape to update post-flags
+  set<Vec3r> normalsSet;
+  vector<WVertex*>& wvertices = shape.GetVertexList();
+  for(vector<WVertex*>::iterator wv=wvertices.begin(), wvend=wvertices.end();
+  wv!=wvend;
+  ++wv){
+    if((*wv)->isBoundary())
+      continue;
+    normalsSet.clear();
+    WVertex::face_iterator fit = (*wv)->faces_begin();
+    WVertex::face_iterator fitend = (*wv)->faces_end();
+    while(fit!=fitend){
+      WFace *face = *fit;
+      normalsSet.insert(face->GetVertexNormal(*wv));
+      if(normalsSet.size()!=1){
+        break;
+      }
+      ++fit;
+    }
+    if(normalsSet.size()!=1){
+      (*wv)->SetSmooth(false);
+    }
+  }
+  // Adds the new WShape to the WingedEdge structure
+  _winged_edge->addWShape(&shape);
+}
+
+void WingedEdgeBuilder::buildWVertices(WShape& shape,
+				       const real *vertices,
+				       unsigned vsize) {
+  WVertex *vertex;
+  for (unsigned i = 0; i < vsize; i += 3) {
+    vertex = new WVertex(Vec3r(vertices[i],
+			       vertices[i + 1],
+			       vertices[i + 2]));
+    vertex->SetId(i / 3);
+    shape.AddVertex(vertex);
+  }
+}
+
+void WingedEdgeBuilder::buildTriangleStrip( const real *vertices, 
+			                                      const real *normals, 
+                                           vector<Material>& iMaterials, 
+                                           const real *texCoords, 
+			                                      const unsigned *vindices, 
+			                                      const unsigned *nindices,
+                                            const unsigned *mindices,
+                                            const unsigned *tindices,
+			                                      const unsigned nvertices) {
+  unsigned nDoneVertices = 2; // number of vertices already treated
+  unsigned nTriangle = 0;     // number of the triangle currently being treated
+  //int nVertex = 0;       // vertex number
+
+  WShape* currentShape = _current_wshape; // the current shape being built
+  vector<WVertex *> triangleVertices;
+  vector<Vec3r> triangleNormals;
+  vector<Vec2r> triangleTexCoords;
+
+  while(nDoneVertices < nvertices)
+  { 
+    //clear the vertices list:
+    triangleVertices.clear();
+    //Then rebuild it:
+    if(0 == nTriangle%2) // if nTriangle is even
+    {
+      triangleVertices.push_back(currentShape->GetVertexList()[vindices[nTriangle]/3]);
+      triangleVertices.push_back(currentShape->GetVertexList()[vindices[nTriangle+1]/3]);
+      triangleVertices.push_back(currentShape->GetVertexList()[vindices[nTriangle+2]/3]);
+
+      triangleNormals.push_back(Vec3r(normals[nindices[nTriangle]],normals[nindices[nTriangle]+1], normals[nindices[nTriangle]+2]));
+      triangleNormals.push_back(Vec3r(normals[nindices[nTriangle+1]],normals[nindices[nTriangle+1]+1],normals[nindices[nTriangle+1]+2]));
+      triangleNormals.push_back(Vec3r(normals[nindices[nTriangle+2]], normals[nindices[nTriangle+2]+1], normals[nindices[nTriangle+2]+2]));
+
+      if(texCoords){
+        triangleTexCoords.push_back(Vec2r(texCoords[tindices[nTriangle]],texCoords[tindices[nTriangle]+1]));
+        triangleTexCoords.push_back(Vec2r(texCoords[tindices[nTriangle+1]],texCoords[tindices[nTriangle+1]+1]));
+        triangleTexCoords.push_back(Vec2r(texCoords[tindices[nTriangle+2]], texCoords[tindices[nTriangle+2]+1]));
+      }
+    }
+    else                 // if nTriangle is odd
+    {
+      triangleVertices.push_back(currentShape->GetVertexList()[vindices[nTriangle]/3]);
+      triangleVertices.push_back(currentShape->GetVertexList()[vindices[nTriangle+2]/3]);
+      triangleVertices.push_back(currentShape->GetVertexList()[vindices[nTriangle+1]/3]);
+
+      triangleNormals.push_back(Vec3r(normals[nindices[nTriangle]],normals[nindices[nTriangle]+1], normals[nindices[nTriangle]+2]));
+      triangleNormals.push_back(Vec3r(normals[nindices[nTriangle+2]],normals[nindices[nTriangle+2]+1],normals[nindices[nTriangle+2]+2]));
+      triangleNormals.push_back(Vec3r(normals[nindices[nTriangle+1]], normals[nindices[nTriangle+1]+1], normals[nindices[nTriangle+1]+2]));
+
+      if(texCoords){
+          triangleTexCoords.push_back(Vec2r(texCoords[tindices[nTriangle]],texCoords[tindices[nTriangle]+1]));
+          triangleTexCoords.push_back(Vec2r(texCoords[tindices[nTriangle+2]],texCoords[tindices[nTriangle+2]+1]));
+          triangleTexCoords.push_back(Vec2r(texCoords[tindices[nTriangle+1]], texCoords[tindices[nTriangle+1]+1]));
+      }
+    }
+		if(mindices)
+			currentShape->MakeFace(triangleVertices, triangleNormals, triangleTexCoords, mindices[nTriangle/3]);
+		else
+			currentShape->MakeFace(triangleVertices, triangleNormals, triangleTexCoords, 0);
+    nDoneVertices++; // with a strip, each triangle is one vertex more
+    nTriangle++;
+  }
+}
+
+void WingedEdgeBuilder::buildTriangleFan( const real *vertices, 
+			                                      const real *normals, 
+                                            vector<Material>&  iMaterials, 
+                                            const real *texCoords, 
+			                                      const unsigned *vindices, 
+			                                      const unsigned *nindices,
+                                            const unsigned *mindices,
+                                            const unsigned *tindices,
+			                                      const unsigned nvertices) {
+  // Nothing to be done
+}
+
+void WingedEdgeBuilder::buildTriangles(const real *vertices, 
+			                                      const real *normals, 
+                                            vector<Material>&  iMaterials, 
+                                            const real *texCoords, 
+			                                      const unsigned *vindices, 
+			                                      const unsigned *nindices,
+                                            const unsigned *mindices,
+                                            const unsigned *tindices,
+			                                      const unsigned nvertices) {
+  WShape * currentShape = _current_wshape; // the current shape begin built
+  vector<WVertex *> triangleVertices;
+  vector<Vec3r> triangleNormals;
+  vector<Vec2r> triangleTexCoords;
+
+  // Each triplet of vertices is considered as an independent triangle
+  for(unsigned i = 0; i < nvertices / 3; i++)
+  {
+    triangleVertices.push_back(currentShape->GetVertexList()[vindices[3*i]/3]);
+    triangleVertices.push_back(currentShape->GetVertexList()[vindices[3*i+1]/3]);
+    triangleVertices.push_back(currentShape->GetVertexList()[vindices[3*i+2]/3]);
+
+    triangleNormals.push_back(Vec3r(normals[nindices[3*i]],normals[nindices[3*i]+1], normals[nindices[3*i]+2]));
+    triangleNormals.push_back(Vec3r(normals[nindices[3*i+1]],normals[nindices[3*i+1]+1],normals[nindices[3*i+1]+2]));
+    triangleNormals.push_back(Vec3r(normals[nindices[3*i+2]], normals[nindices[3*i+2]+1], normals[nindices[3*i+2]+2]));
+
+    if(texCoords){
+        triangleTexCoords.push_back(Vec2r(texCoords[tindices[3*i]],texCoords[tindices[3*i]+1]));
+        triangleTexCoords.push_back(Vec2r(texCoords[tindices[3*i+1]],texCoords[tindices[3*i+1]+1]));
+        triangleTexCoords.push_back(Vec2r(texCoords[tindices[3*i+2]], texCoords[tindices[3*i+2]+1]));
+    }
+  }
+	if(mindices)
+		currentShape->MakeFace(triangleVertices, triangleNormals, triangleTexCoords, mindices[0]);
+	else
+		currentShape->MakeFace(triangleVertices, triangleNormals, triangleTexCoords,0);
+  
+}
+
+void WingedEdgeBuilder::transformVertices(const real *vertices,
+					  unsigned vsize, 
+					  const Matrix44r& transform,
+					  real *res) {
+  const real *v = vertices;
+  real *pv = res;
+    
+  for (unsigned i = 0; i < vsize / 3; i++) {
+    HVec3r hv_tmp(v[0], v[1], v[2]);
+    HVec3r hv(transform * hv_tmp);
+    for (unsigned j = 0; j < 3; j++)
+      pv[j] = hv[j] / hv[3];
+    v += 3;
+    pv += 3;
+  }
+}
+
+void WingedEdgeBuilder::transformNormals(const real *normals,
+					 unsigned nsize,
+					 const Matrix44r& transform,
+					 real* res) {
+  const real *n = normals;
+  real *pn = res;
+    
+  for (unsigned i = 0; i < nsize / 3; i++) {
+    Vec3r hn(n[0], n[1], n[2]);
+    hn = GeomUtils::rotateVector(transform, hn);
+    for (unsigned j = 0; j < 3; j++)
+      pn[j] = hn[j];
+    n += 3;
+    pn += 3;
+  }
+}
diff --git a/extern/freestyle/src/winged_edge/WingedEdgeBuilder.h b/extern/freestyle/src/winged_edge/WingedEdgeBuilder.h
new file mode 100755
index 00000000000..fe033f2ea0b
--- /dev/null
+++ b/extern/freestyle/src/winged_edge/WingedEdgeBuilder.h
@@ -0,0 +1,160 @@
+//
+//  Filename         : WingedEdgeBuilder.h
+//  Author(s)        : Stephane Grabli
+//  Purpose          : Class to render a WingedEdge data structure
+//                     from a polyhedral data structure organized in
+//                     nodes of a scene graph
+//  Date of creation : 28/05/03
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  WINGED_EDGE_BUILDER_H
+# define WINGED_EDGE_BUILDER_H
+
+# include "../system/FreestyleConfig.h"
+# include "../scene_graph/SceneVisitor.h"
+# include "WEdge.h"
+# include "../scene_graph/IndexedFaceSet.h"
+# include "../scene_graph/NodeTransform.h"
+
+class LIB_WINGED_EDGE_EXPORT WingedEdgeBuilder : public SceneVisitor
+{
+ public:
+
+  inline WingedEdgeBuilder() : SceneVisitor() {
+    _current_wshape = NULL;
+    _current_material = NULL;
+    _current_matrix = NULL;
+    _winged_edge = new WingedEdge; // Not deleted by the destructor
+  }
+
+  virtual ~WingedEdgeBuilder() {
+    for (vector<Matrix44r*>::iterator it = _matrices_stack.begin();
+	 it != _matrices_stack.end();
+	 it++)
+      delete *it;
+    _matrices_stack.clear();
+  }
+
+  VISIT_DECL(IndexedFaceSet)
+  VISIT_DECL(NodeShape)
+  VISIT_DECL(NodeTransform)
+
+  virtual void visitNodeTransformAfter(NodeTransform&);
+
+  //
+  // Accessors
+  //
+  /////////////////////////////////////////////////////////////////////////////
+
+  inline WingedEdge*	getWingedEdge() {
+    return _winged_edge;
+  }
+
+  inline WShape*	getCurrentWShape() {
+    return _current_wshape;
+  }
+ 
+  inline Material*	getCurrentMaterial() {
+    return _current_material;
+  }
+
+  inline Matrix44r*	getCurrentMatrix() {
+    return _current_matrix;
+  }
+
+  //
+  // Modifiers
+  //
+  /////////////////////////////////////////////////////////////////////////////
+
+  inline void setCurrentWShape(WShape* wshape) {
+    _current_wshape = wshape;
+  }
+
+  inline void setCurrentMaterial(Material* mat) {
+    _current_material = mat;
+  }
+
+  //  inline void setCurrentMatrix(Matrix44r* matrix) {
+  //    _current_matrix = matrix;
+  //  }
+
+ protected:
+
+  virtual void buildWShape(WShape& shape, IndexedFaceSet& ifs);
+  virtual void buildWVertices(WShape& shape,
+			      const real *vertices,
+			      unsigned vsize);
+
+ private:
+
+  void buildTriangleStrip(const real *vertices, 
+			  const real *normals, 
+        vector<Material>&  iMaterials, 
+        const real *texCoords,
+			  const unsigned *vindices, 
+			  const unsigned *nindices,
+        const unsigned *mindices,
+        const unsigned *tindices,
+			  const unsigned nvertices);
+
+  void buildTriangleFan(const real *vertices, 
+			const real *normals, 
+      vector<Material>&  iMaterials,
+      const real *texCoords,
+			const unsigned *vindices, 
+			const unsigned *nindices,
+      const unsigned *mindices,
+      const unsigned *tindices,
+			const unsigned nvertices);
+
+  void buildTriangles(const real *vertices, 
+		      const real *normals, 
+          vector<Material>&  iMaterials,
+          const real *texCoords,
+		      const unsigned *vindices, 
+		      const unsigned *nindices,
+          const unsigned *mindices,
+          const unsigned *tindices,
+		      const unsigned nvertices);
+
+  void transformVertices(const real *vertices,
+			 unsigned vsize, 
+			 const Matrix44r& transform,
+			 real *res);
+
+  void transformNormals(const real *normals,
+			unsigned nsize,
+			const Matrix44r& transform,
+			real *res);
+ 
+  WShape*		_current_wshape;
+  Material*		_current_material;
+  WingedEdge*		_winged_edge;
+  Matrix44r*		_current_matrix;
+  vector<Matrix44r*>	_matrices_stack;
+};
+
+#endif // WINGED_EDGE_BUILDER_H
diff --git a/extern/freestyle/src/winged_edge/src.pri b/extern/freestyle/src/winged_edge/src.pri
new file mode 100755
index 00000000000..9cf40633dcf
--- /dev/null
+++ b/extern/freestyle/src/winged_edge/src.pri
@@ -0,0 +1,21 @@
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#			      W A R N I N G ! ! !                             #
+#             a u t h o r i z e d    p e r s o n a l    o n l y               #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+
+WINGED_EDGE_DIR = ../winged_edge
+
+SOURCES *= $${WINGED_EDGE_DIR}/Curvature.cpp \
+	   $${WINGED_EDGE_DIR}/WEdge.cpp \
+	   $${WINGED_EDGE_DIR}/WFillGrid.cpp \       
+	   $${WINGED_EDGE_DIR}/WingedEdgeBuilder.cpp \
+	   $${WINGED_EDGE_DIR}/WXEdgeBuilder.cpp \
+	   $${WINGED_EDGE_DIR}/WXEdge.cpp 
+
+HEADERS *= $${WINGED_EDGE_DIR}/Curvature.h \
+	   $${WINGED_EDGE_DIR}/Nature.h \
+	   $${WINGED_EDGE_DIR}/WEdge.h \
+	   $${WINGED_EDGE_DIR}/WFillGrid.h \
+	   $${WINGED_EDGE_DIR}/WingedEdgeBuilder.h \
+	   $${WINGED_EDGE_DIR}/WXEdgeBuilder.h \
+	   $${WINGED_EDGE_DIR}/WXEdge.h    
diff --git a/extern/freestyle/src/winged_edge/winged_edge.pro b/extern/freestyle/src/winged_edge/winged_edge.pro
new file mode 100755
index 00000000000..e36d69454b6
--- /dev/null
+++ b/extern/freestyle/src/winged_edge/winged_edge.pro
@@ -0,0 +1,84 @@
+# This file should be viewed as a -*- mode: Makefile -*-
+
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+#			      W A R N I N G ! ! !                             #
+#             a u t h o r i z e d    p e r s o n a l    o n l y               #
+# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+
+include(../Config.pri)
+
+TEMPLATE        = lib
+
+TARGET          = $${LIB_WINGED_EDGE}
+VERSION         = $${APPVERSION}
+TARGET_VERSION_EXT = $${APPVERSION_MAJ}.$${APPVERSION_MID}
+
+#
+# CONFIG
+#
+#######################################
+
+CONFIG          *= dll
+
+#
+# DEFINES
+#
+#######################################
+
+win32:DEFINES   *= MAKE_LIB_WINGED_EDGE_DLL
+
+#
+# INCLUDE PATH
+#
+#######################################
+
+#INCLUDEPATH     *= ../geometry ../scene_graph ../system
+
+#
+# BUILD DIRECTORIES
+#
+#######################################
+
+BUILD_DIR       = ../../build
+
+OBJECTS_DIR     = $${BUILD_DIR}/$${REL_OBJECTS_DIR}
+!win32:DESTDIR  = $${BUILD_DIR}/$${REL_DESTDIR}/lib
+win32:DESTDIR   = $${BUILD_DIR}/$${REL_DESTDIR}
+
+#
+# LIBS
+#
+#######################################
+
+win32:LIBS      *= $${DESTDIR}/$${LIB_GEOMETRY}$${LIBVERSION}.lib \
+                   $${DESTDIR}/$${LIB_SCENE_GRAPH}$${LIBVERSION}.lib \
+                   $${DESTDIR}/$${LIB_SYSTEM}$${LIBVERSION}.lib
+!win32 {
+  lib_bundle {
+    LIBS += -F$${DESTDIR} -framework $${LIB_GEOMETRY} \
+	    -framework $${LIB_SYSTEM} -framework $${LIB_SCENE_GRAPH}
+  } else {
+    LIBS += -L$${DESTDIR} -l$${LIB_GEOMETRY} -l$${LIB_SCENE_GRAPH} -l$${LIB_SYSTEM}
+  }
+}
+
+
+#
+# INSTALL
+#
+#######################################
+
+LIB_DIR       = ../../lib
+# install library
+target.path   = $$LIB_DIR
+# "make install" configuration options
+INSTALLS     += target
+
+#
+# SOURCES & HEADERS
+#
+#######################################
+
+!static {
+  include(src.pri)
+}
diff --git a/extern/freestyle/style_modules/ChainingIterators.py b/extern/freestyle/style_modules/ChainingIterators.py
new file mode 100755
index 00000000000..60255c3d094
--- /dev/null
+++ b/extern/freestyle/style_modules/ChainingIterators.py
@@ -0,0 +1,731 @@
+#
+#  Filename : ChainingIterators.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Chaining Iterators to be used with chaining operators
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Freestyle import *
+
+## the natural chaining iterator
+## It follows the edges of same nature following the topology of
+## objects with  preseance on silhouettes, then borders, 
+## then suggestive contours, then everything else. It doesn't chain the same ViewEdge twice
+## You can specify whether to stay in the selection or not.
+class pyChainSilhouetteIterator(ChainingIterator):
+	def __init__(self, stayInSelection=1):
+		ChainingIterator.__init__(self, stayInSelection, 1,None,1)
+	def getExactTypeName(self):
+		return "pyChainSilhouetteIterator"
+	def traverse(self, iter):
+		winner = None
+		it = AdjacencyIterator(iter)
+		nextVertex = self.getVertex()
+		if(nextVertex.getNature() & T_VERTEX != 0):
+			tvertex = nextVertex.castToTVertex()
+			mateVE = tvertex.mate(self.getCurrentEdge())
+			while(it.isEnd() == 0):
+				ve = it.getObject()
+				if(ve.getId() == mateVE.getId() ):
+					winner = ve
+					break
+				it.increment()
+		else:
+			## case of NonTVertex
+			natures = [SILHOUETTE,BORDER,CREASE,SUGGESTIVE_CONTOUR,VALLEY,RIDGE]
+			for i in range(len(natures)):
+				currentNature = self.getCurrentEdge().getNature()
+				if(natures[i] & currentNature):
+					count=0
+					while(it.isEnd() == 0):
+						visitNext = 0
+						oNature = it.getObject().getNature()
+						if(oNature & natures[i] != 0):
+							if(natures[i] != oNature):
+								for j in range(i):
+									if(natures[j] & oNature != 0):
+										visitNext = 1
+										break
+								if(visitNext != 0):
+									break	 
+							count = count+1
+							winner = it.getObject()
+						it.increment()
+					if(count != 1):
+						winner = None
+					break
+		return winner
+
+## the natural chaining iterator
+## It follows the edges of same nature on the same
+## objects with  preseance on silhouettes, then borders, 
+## then suggestive contours, then everything else. It doesn't chain the same ViewEdge twice
+## You can specify whether to stay in the selection or not.
+## You can specify whether to chain iterate over edges that were 
+## already visited or not.
+class pyChainSilhouetteGenericIterator(ChainingIterator):
+	def __init__(self, stayInSelection=1, stayInUnvisited=1):
+		ChainingIterator.__init__(self, stayInSelection, stayInUnvisited,None,1)
+	def getExactTypeName(self):
+		return "pyChainSilhouetteGenericIterator"
+	def traverse(self, iter):
+		winner = None
+		it = AdjacencyIterator(iter)
+		nextVertex = self.getVertex()
+		if(nextVertex.getNature() & T_VERTEX != 0):
+			tvertex = nextVertex.castToTVertex()
+			mateVE = tvertex.mate(self.getCurrentEdge())
+			while(it.isEnd() == 0):
+				ve = it.getObject()
+				if(ve.getId() == mateVE.getId() ):
+					winner = ve
+					break
+				it.increment()
+		else:
+			## case of NonTVertex
+			natures = [SILHOUETTE,BORDER,CREASE,SUGGESTIVE_CONTOUR,VALLEY,RIDGE]
+			for i in range(len(natures)):
+				currentNature = self.getCurrentEdge().getNature()
+				if(natures[i] & currentNature):
+					count=0
+					while(it.isEnd() == 0):
+						visitNext = 0
+						oNature = it.getObject().getNature()
+						ve = it.getObject()
+						if(ve.getId() == self.getCurrentEdge().getId()):
+							it.increment()
+							continue
+						if(oNature & natures[i] != 0):
+							if(natures[i] != oNature):
+								for j in range(i):
+									if(natures[j] & oNature != 0):
+										visitNext = 1
+										break
+								if(visitNext != 0):
+									break	 
+							count = count+1
+							winner = ve
+						it.increment()
+					if(count != 1):
+						winner = None
+					break
+		return winner
+			
+class pyExternalContourChainingIterator(ChainingIterator):
+	def __init__(self):
+		ChainingIterator.__init__(self, 0, 1,None,1)
+		self._isExternalContour = ExternalContourUP1D()
+		
+	def getExactTypeName(self):
+		return "pyExternalContourIterator"
+	
+	def init(self):
+		self._nEdges = 0
+		self._isInSelection = 1
+
+	def checkViewEdge(self, ve, orientation):
+		if(orientation != 0):
+			vertex = ve.B()
+		else:
+			vertex = ve.A()
+		it = AdjacencyIterator(vertex,1,1)
+		while(it.isEnd() == 0):
+			ave = it.getObject()
+			if(self._isExternalContour(ave)):
+				return 1
+			it.increment()
+		print "pyExternlContourChainingIterator : didn't find next edge"
+		return 0
+	def traverse(self, iter):
+		winner = None
+		it = AdjacencyIterator(iter)
+		while(it.isEnd() == 0):
+			ve = it.getObject()
+			if(self._isExternalContour(ve)):
+				if (ve.getTimeStamp() == GetTimeStampCF()):
+					winner = ve
+			it.increment()
+		
+		self._nEdges = self._nEdges+1
+		if(winner == None):
+			orient = 1
+			it = AdjacencyIterator(iter)
+			while(it.isEnd() == 0):
+				ve = it.getObject()
+				if(it.isIncoming() != 0):
+					orient = 0
+				good = self.checkViewEdge(ve,orient)
+				if(good != 0):
+					winner = ve
+				it.increment()
+		return winner
+
+## the natural chaining iterator
+## with a sketchy multiple touch
+class pySketchyChainSilhouetteIterator(ChainingIterator):
+	def __init__(self, nRounds=3,stayInSelection=1):
+		ChainingIterator.__init__(self, stayInSelection, 0,None,1)
+		self._timeStamp = GetTimeStampCF()+nRounds
+		self._nRounds = nRounds
+	def getExactTypeName(self):
+		return "pySketchyChainSilhouetteIterator"
+	def init(self):
+		self._timeStamp = GetTimeStampCF()+self._nRounds
+	def traverse(self, iter):
+		winner = None
+		it = AdjacencyIterator(iter)
+		nextVertex = self.getVertex()
+		if(nextVertex.getNature() & T_VERTEX != 0):
+			tvertex = nextVertex.castToTVertex()
+			mateVE = tvertex.mate(self.getCurrentEdge())
+			while(it.isEnd() == 0):
+				ve = it.getObject()
+				if(ve.getId() == mateVE.getId() ):
+					winner = ve
+					break
+				it.increment()
+		else:
+			## case of NonTVertex
+			natures = [SILHOUETTE,BORDER,CREASE,SUGGESTIVE_CONTOUR,VALLEY,RIDGE]
+			for i in range(len(natures)):
+				currentNature = self.getCurrentEdge().getNature()
+				if(natures[i] & currentNature):
+					count=0
+					while(it.isEnd() == 0):
+						visitNext = 0
+						oNature = it.getObject().getNature()
+						ve = it.getObject()
+						if(ve.getId() == self.getCurrentEdge().getId()):
+							it.increment()
+							continue
+						if(oNature & natures[i] != 0):
+							if(natures[i] != oNature):
+								for j in range(i):
+									if(natures[j] & oNature != 0):
+										visitNext = 1
+										break
+								if(visitNext != 0):
+									break	 
+							count = count+1
+							winner = ve
+						it.increment()
+					if(count != 1):
+						winner = None
+					break
+		if(winner == None):
+			winner = self.getCurrentEdge()
+		if(winner.getChainingTimeStamp() == self._timeStamp):
+			winner = None
+		return winner
+
+
+# Chaining iterator designed for sketchy style.
+# can chain several times the same ViewEdge
+# in order to produce multiple strokes per ViewEdge.
+class pySketchyChainingIterator(ChainingIterator):
+	def __init__(self, nRounds=3, stayInSelection=1):
+		ChainingIterator.__init__(self, stayInSelection, 0,None,1)
+		self._timeStamp = GetTimeStampCF()+nRounds
+		self._nRounds = nRounds
+	def getExactTypeName(self):
+		return "pySketchyChainingIterator"
+
+	def init(self):
+		self._timeStamp = GetTimeStampCF()+self._nRounds
+
+	def traverse(self, iter):
+		winner = None
+		it = AdjacencyIterator(iter)
+		while(it.isEnd() == 0):
+			ve = it.getObject()
+			if(ve.getId() == self.getCurrentEdge().getId()):
+				it.increment()
+				continue
+			winner = ve
+			it.increment()
+		if(winner == None):
+			winner = self.getCurrentEdge()
+		if(winner.getChainingTimeStamp() == self._timeStamp):
+			return None
+		return winner
+
+
+## Chaining iterator that fills small occlusions
+## 	percent
+##		The max length of the occluded part 
+##		expressed in % of the total chain length
+class pyFillOcclusionsRelativeChainingIterator(ChainingIterator):
+	def __init__(self, percent):
+		ChainingIterator.__init__(self, 0, 1,None,1)
+		self._length = 0
+		self._percent = float(percent)
+	def getExactTypeName(self):
+		return "pyFillOcclusionsChainingIterator"
+	def init(self):
+		# each time we're evaluating a chain length 
+		# we try to do it once. Thus we reinit 
+		# the chain length here:
+		self._length = 0
+	def traverse(self, iter):
+		winner = None
+		winnerOrientation = 0
+		print self.getCurrentEdge().getId().getFirst(), self.getCurrentEdge().getId().getSecond()
+		it = AdjacencyIterator(iter)
+		nextVertex = self.getVertex()
+		if(nextVertex.getNature() & T_VERTEX != 0):
+			tvertex = nextVertex.castToTVertex()
+			mateVE = tvertex.mate(self.getCurrentEdge())
+			while(it.isEnd() == 0):
+				ve = it.getObject()
+				if(ve.getId() == mateVE.getId() ):
+					winner = ve
+					if(it.isIncoming() == 0):
+						winnerOrientation = 1
+					else:
+						winnerOrientation = 0
+                                        break
+				it.increment()
+		else:
+			## case of NonTVertex
+			natures = [SILHOUETTE,BORDER,CREASE,SUGGESTIVE_CONTOUR,VALLEY,RIDGE]
+			for nat in natures:
+				if(self.getCurrentEdge().getNature() & nat != 0):
+					count=0
+					while(it.isEnd() == 0):
+						ve = it.getObject()
+						if(ve.getNature() & nat != 0):
+							count = count+1
+							winner = ve
+							if(it.isIncoming() == 0):
+								winnerOrientation = 1
+							else:
+								winnerOrientation = 0
+						it.increment()
+					if(count != 1):
+						winner = None
+					break
+		if(winner != None):
+			# check whether this edge was part of the selection
+			if(winner.getTimeStamp() != GetTimeStampCF()):
+				#print "---", winner.getId().getFirst(), winner.getId().getSecond()
+				# if not, let's check whether it's short enough with
+				# respect to the chain made without staying in the selection
+				#------------------------------------------------------------
+				# Did we compute the prospective chain length already ?
+				if(self._length == 0):
+					#if not, let's do it
+					_it = pyChainSilhouetteGenericIterator(0,0)
+					_it.setBegin(winner)
+					_it.setCurrentEdge(winner)
+					_it.setOrientation(winnerOrientation)
+					_it.init()
+					while(_it.isEnd() == 0):
+						ve = _it.getObject()
+						#print "--------", ve.getId().getFirst(), ve.getId().getSecond()
+						self._length = self._length + ve.getLength2D()
+						_it.increment()
+						if(_it.isBegin() != 0):
+							break;
+					_it.setBegin(winner)
+					_it.setCurrentEdge(winner)
+					_it.setOrientation(winnerOrientation)
+					if(_it.isBegin() == 0):
+						_it.decrement()
+						while ((_it.isEnd() == 0) and (_it.isBegin() == 0)):
+							ve = _it.getObject()
+							#print "--------", ve.getId().getFirst(), ve.getId().getSecond()
+							self._length = self._length + ve.getLength2D()
+							_it.decrement()
+
+				# let's do the comparison:
+				# nw let's compute the length of this connex non selected part:
+				connexl = 0
+				_cit = pyChainSilhouetteGenericIterator(0,0)
+				_cit.setBegin(winner)
+				_cit.setCurrentEdge(winner)
+				_cit.setOrientation(winnerOrientation)
+				_cit.init()
+				while((_cit.isEnd() == 0) and (_cit.getObject().getTimeStamp() != GetTimeStampCF())):
+					ve = _cit.getObject()
+					#print "-------- --------", ve.getId().getFirst(), ve.getId().getSecond()
+					connexl = connexl + ve.getLength2D()
+					_cit.increment()
+				if(connexl > self._percent * self._length):
+					winner = None
+		return winner
+
+## Chaining iterator that fills small occlusions
+## 	size
+##		The max length of the occluded part 
+##		expressed in pixels
+class pyFillOcclusionsAbsoluteChainingIterator(ChainingIterator):
+	def __init__(self, length):
+		ChainingIterator.__init__(self, 0, 1,None,1)
+		self._length = float(length)
+	def getExactTypeName(self):
+		return "pySmallFillOcclusionsChainingIterator"
+	def traverse(self, iter):
+		winner = None
+		winnerOrientation = 0
+		#print self.getCurrentEdge().getId().getFirst(), self.getCurrentEdge().getId().getSecond()
+		it = AdjacencyIterator(iter)
+		nextVertex = self.getVertex()
+		if(nextVertex.getNature() & T_VERTEX != 0):
+			tvertex = nextVertex.castToTVertex()
+			mateVE = tvertex.mate(self.getCurrentEdge())
+			while(it.isEnd() == 0):
+				ve = it.getObject()
+				if(ve.getId() == mateVE.getId() ):
+					winner = ve
+					if(it.isIncoming() == 0):
+						winnerOrientation = 1
+					else:
+						winnerOrientation = 0
+                                        break
+				it.increment()
+		else:
+			## case of NonTVertex
+			natures = [SILHOUETTE,BORDER,CREASE,SUGGESTIVE_CONTOUR,VALLEY,RIDGE]
+			for nat in natures:
+				if(self.getCurrentEdge().getNature() & nat != 0):
+					count=0
+					while(it.isEnd() == 0):
+						ve = it.getObject()
+						if(ve.getNature() & nat != 0):
+							count = count+1
+							winner = ve
+							if(it.isIncoming() == 0):
+								winnerOrientation = 1
+							else:
+								winnerOrientation = 0
+						it.increment()
+					if(count != 1):
+						winner = None
+					break
+		if(winner != None):
+			# check whether this edge was part of the selection
+			if(winner.getTimeStamp() != GetTimeStampCF()):
+				#print "---", winner.getId().getFirst(), winner.getId().getSecond()
+				# nw let's compute the length of this connex non selected part:
+				connexl = 0
+				_cit = pyChainSilhouetteGenericIterator(0,0)
+				_cit.setBegin(winner)
+				_cit.setCurrentEdge(winner)
+				_cit.setOrientation(winnerOrientation)
+				_cit.init()
+				while((_cit.isEnd() == 0) and (_cit.getObject().getTimeStamp() != GetTimeStampCF())):
+					ve = _cit.getObject()
+					#print "-------- --------", ve.getId().getFirst(), ve.getId().getSecond()
+					connexl = connexl + ve.getLength2D()
+					_cit.increment()
+				if(connexl > self._length):
+					winner = None
+		return winner
+
+
+## Chaining iterator that fills small occlusions
+## 	percent
+##		The max length of the occluded part 
+##		expressed in % of the total chain length
+class pyFillOcclusionsAbsoluteAndRelativeChainingIterator(ChainingIterator):
+	def __init__(self, percent, l):
+		ChainingIterator.__init__(self, 0, 1,None,1)
+		self._length = 0
+		self._absLength = l
+		self._percent = float(percent)
+	def getExactTypeName(self):
+		return "pyFillOcclusionsChainingIterator"
+	def init(self):
+		# each time we're evaluating a chain length 
+		# we try to do it once. Thus we reinit 
+		# the chain length here:
+		self._length = 0
+	def traverse(self, iter):
+		winner = None
+		winnerOrientation = 0
+		print self.getCurrentEdge().getId().getFirst(), self.getCurrentEdge().getId().getSecond()
+		it = AdjacencyIterator(iter)
+		nextVertex = self.getVertex()
+		if(nextVertex.getNature() & T_VERTEX != 0):
+			tvertex = nextVertex.castToTVertex()
+			mateVE = tvertex.mate(self.getCurrentEdge())
+			while(it.isEnd() == 0):
+				ve = it.getObject()
+				if(ve.getId() == mateVE.getId() ):
+					winner = ve
+					if(it.isIncoming() == 0):
+						winnerOrientation = 1
+					else:
+						winnerOrientation = 0
+                                        break
+				it.increment()
+		else:
+			## case of NonTVertex
+			natures = [SILHOUETTE,BORDER,CREASE,SUGGESTIVE_CONTOUR,VALLEY,RIDGE]
+			for nat in natures:
+				if(self.getCurrentEdge().getNature() & nat != 0):
+					count=0
+					while(it.isEnd() == 0):
+						ve = it.getObject()
+						if(ve.getNature() & nat != 0):
+							count = count+1
+							winner = ve
+							if(it.isIncoming() == 0):
+								winnerOrientation = 1
+							else:
+								winnerOrientation = 0
+						it.increment()
+					if(count != 1):
+						winner = None
+					break
+		if(winner != None):
+			# check whether this edge was part of the selection
+			if(winner.getTimeStamp() != GetTimeStampCF()):
+				#print "---", winner.getId().getFirst(), winner.getId().getSecond()
+				# if not, let's check whether it's short enough with
+				# respect to the chain made without staying in the selection
+				#------------------------------------------------------------
+				# Did we compute the prospective chain length already ?
+				if(self._length == 0):
+					#if not, let's do it
+					_it = pyChainSilhouetteGenericIterator(0,0)
+					_it.setBegin(winner)
+					_it.setCurrentEdge(winner)
+					_it.setOrientation(winnerOrientation)
+					_it.init()
+					while(_it.isEnd() == 0):
+						ve = _it.getObject()
+						#print "--------", ve.getId().getFirst(), ve.getId().getSecond()
+						self._length = self._length + ve.getLength2D()
+						_it.increment()
+						if(_it.isBegin() != 0):
+							break;
+					_it.setBegin(winner)
+					_it.setCurrentEdge(winner)
+					_it.setOrientation(winnerOrientation)
+					if(_it.isBegin() == 0):
+						_it.decrement()
+						while ((_it.isEnd() == 0) and (_it.isBegin() == 0)):
+							ve = _it.getObject()
+							#print "--------", ve.getId().getFirst(), ve.getId().getSecond()
+							self._length = self._length + ve.getLength2D()
+							_it.decrement()
+
+				# let's do the comparison:
+				# nw let's compute the length of this connex non selected part:
+				connexl = 0
+				_cit = pyChainSilhouetteGenericIterator(0,0)
+				_cit.setBegin(winner)
+				_cit.setCurrentEdge(winner)
+				_cit.setOrientation(winnerOrientation)
+				_cit.init()
+				while((_cit.isEnd() == 0) and (_cit.getObject().getTimeStamp() != GetTimeStampCF())):
+					ve = _cit.getObject()
+					#print "-------- --------", ve.getId().getFirst(), ve.getId().getSecond()
+					connexl = connexl + ve.getLength2D()
+					_cit.increment()
+				if((connexl > self._percent * self._length) or (connexl > self._absLength)):
+					winner = None
+		return winner
+
+## Chaining iterator that fills small occlusions without caring about the 
+## actual selection
+## 	percent
+##		The max length of the occluded part 
+##		expressed in % of the total chain length
+class pyFillQi0AbsoluteAndRelativeChainingIterator(ChainingIterator):
+	def __init__(self, percent, l):
+		ChainingIterator.__init__(self, 0, 1,None,1)
+		self._length = 0
+		self._absLength = l
+		self._percent = float(percent)
+	def getExactTypeName(self):
+		return "pyFillOcclusionsChainingIterator"
+	def init(self):
+		# each time we're evaluating a chain length 
+		# we try to do it once. Thus we reinit 
+		# the chain length here:
+		self._length = 0
+	def traverse(self, iter):
+		winner = None
+		winnerOrientation = 0
+		print self.getCurrentEdge().getId().getFirst(), self.getCurrentEdge().getId().getSecond()
+		it = AdjacencyIterator(iter)
+		nextVertex = self.getVertex()
+		if(nextVertex.getNature() & T_VERTEX != 0):
+			tvertex = nextVertex.castToTVertex()
+			mateVE = tvertex.mate(self.getCurrentEdge())
+			while(it.isEnd() == 0):
+				ve = it.getObject()
+				if(ve.getId() == mateVE.getId() ):
+					winner = ve
+					if(it.isIncoming() == 0):
+						winnerOrientation = 1
+					else:
+						winnerOrientation = 0
+                                        break
+				it.increment()
+		else:
+			## case of NonTVertex
+			natures = [SILHOUETTE,BORDER,CREASE,SUGGESTIVE_CONTOUR,VALLEY,RIDGE]
+			for nat in natures:
+				if(self.getCurrentEdge().getNature() & nat != 0):
+					count=0
+					while(it.isEnd() == 0):
+						ve = it.getObject()
+						if(ve.getNature() & nat != 0):
+							count = count+1
+							winner = ve
+							if(it.isIncoming() == 0):
+								winnerOrientation = 1
+							else:
+								winnerOrientation = 0
+						it.increment()
+					if(count != 1):
+						winner = None
+					break
+		if(winner != None):
+			# check whether this edge was part of the selection
+			if(winner.qi() != 0):
+				#print "---", winner.getId().getFirst(), winner.getId().getSecond()
+				# if not, let's check whether it's short enough with
+				# respect to the chain made without staying in the selection
+				#------------------------------------------------------------
+				# Did we compute the prospective chain length already ?
+				if(self._length == 0):
+					#if not, let's do it
+					_it = pyChainSilhouetteGenericIterator(0,0)
+					_it.setBegin(winner)
+					_it.setCurrentEdge(winner)
+					_it.setOrientation(winnerOrientation)
+					_it.init()
+					while(_it.isEnd() == 0):
+						ve = _it.getObject()
+						#print "--------", ve.getId().getFirst(), ve.getId().getSecond()
+						self._length = self._length + ve.getLength2D()
+						_it.increment()
+						if(_it.isBegin() != 0):
+							break;
+					_it.setBegin(winner)
+					_it.setCurrentEdge(winner)
+					_it.setOrientation(winnerOrientation)
+					if(_it.isBegin() == 0):
+						_it.decrement()
+						while ((_it.isEnd() == 0) and (_it.isBegin() == 0)):
+							ve = _it.getObject()
+							#print "--------", ve.getId().getFirst(), ve.getId().getSecond()
+							self._length = self._length + ve.getLength2D()
+							_it.decrement()
+
+				# let's do the comparison:
+				# nw let's compute the length of this connex non selected part:
+				connexl = 0
+				_cit = pyChainSilhouetteGenericIterator(0,0)
+				_cit.setBegin(winner)
+				_cit.setCurrentEdge(winner)
+				_cit.setOrientation(winnerOrientation)
+				_cit.init()
+				while((_cit.isEnd() == 0) and (_cit.getObject().qi() != 0)):
+					ve = _cit.getObject()
+					#print "-------- --------", ve.getId().getFirst(), ve.getId().getSecond()
+					connexl = connexl + ve.getLength2D()
+					_cit.increment()
+				if((connexl > self._percent * self._length) or (connexl > self._absLength)):
+					winner = None
+		return winner
+
+
+## the natural chaining iterator
+## It follows the edges of same nature on the same
+## objects with  preseance on silhouettes, then borders, 
+## then suggestive contours, then everything else. It doesn't chain the same ViewEdge twice
+## You can specify whether to stay in the selection or not.
+class pyNoIdChainSilhouetteIterator(ChainingIterator):
+	def __init__(self, stayInSelection=1):
+		ChainingIterator.__init__(self, stayInSelection, 1,None,1)
+	def getExactTypeName(self):
+		return "pyChainSilhouetteIterator"
+	def traverse(self, iter):
+		winner = None
+		it = AdjacencyIterator(iter)
+		nextVertex = self.getVertex()
+		if(nextVertex.getNature() & T_VERTEX != 0):
+			tvertex = nextVertex.castToTVertex()
+			mateVE = tvertex.mate(self.getCurrentEdge())
+			while(it.isEnd() == 0):
+				ve = it.getObject()
+				feB = self.getCurrentEdge().fedgeB()
+				feA = ve.fedgeA()
+				vB = feB.vertexB()
+				vA = feA.vertexA()
+				if vA.getId().getFirst() == vB.getId().getFirst():
+					winner = ve
+					break
+				feA = self.getCurrentEdge().fedgeA()
+				feB = ve.fedgeB()
+				vB = feB.vertexB()
+				vA = feA.vertexA()
+				if vA.getId().getFirst() == vB.getId().getFirst():
+					winner = ve
+					break
+				feA = self.getCurrentEdge().fedgeB()
+				feB = ve.fedgeB()
+				vB = feB.vertexB()
+				vA = feA.vertexB()
+				if vA.getId().getFirst() == vB.getId().getFirst():
+					winner = ve
+					break
+				feA = self.getCurrentEdge().fedgeA()
+				feB = ve.fedgeA()
+				vB = feB.vertexA()
+				vA = feA.vertexA()
+				if vA.getId().getFirst() == vB.getId().getFirst():
+					winner = ve
+					break
+				it.increment()
+		else:
+			## case of NonTVertex
+			natures = [SILHOUETTE,BORDER,CREASE,SUGGESTIVE_CONTOUR,VALLEY,RIDGE]
+			for i in range(len(natures)):
+				currentNature = self.getCurrentEdge().getNature()
+				if(natures[i] & currentNature):
+					count=0
+					while(it.isEnd() == 0):
+						visitNext = 0
+						oNature = it.getObject().getNature()
+						if(oNature & natures[i] != 0):
+							if(natures[i] != oNature):
+								for j in range(i):
+									if(natures[j] & oNature != 0):
+										visitNext = 1
+										break
+								if(visitNext != 0):
+									break	 
+							count = count+1
+							winner = it.getObject()
+						it.increment()
+					if(count != 1):
+						winner = None
+					break
+		return winner
+
diff --git a/extern/freestyle/style_modules/Functions0D.py b/extern/freestyle/style_modules/Functions0D.py
new file mode 100755
index 00000000000..c1ba591c789
--- /dev/null
+++ b/extern/freestyle/style_modules/Functions0D.py
@@ -0,0 +1,81 @@
+from Freestyle import *
+
+
+class pyInverseCurvature2DAngleF0D(UnaryFunction0DDouble):
+	def getName(self):
+		return "InverseCurvature2DAngleF0D"
+
+	def __call__(self, inter):
+		func = Curvature2DAngleF0D()
+		c = func(inter)
+		return (3.1415 - c)
+
+class pyCurvilinearLengthF0D(UnaryFunction0DDouble):
+	def getName(self):
+		return "CurvilinearLengthF0D"
+
+	def __call__(self, inter):
+		i0d = inter.getObject()
+		s = i0d.getExactTypeName()
+		if (string.find(s, "CurvePoint") == -1):
+			print "CurvilinearLengthF0D: not implemented yet for %s" % (s)
+			return -1
+		cp = castToCurvePoint(i0d)
+		return cp.t2d()
+
+## estimate anisotropy of density
+class pyDensityAnisotropyF0D(UnaryFunction0DDouble):
+	def __init__(self,level):
+		UnaryFunction0DDouble.__init__(self)
+		self.IsoDensity = ReadCompleteViewMapPixelF0D(level)
+		self.d0Density = ReadSteerableViewMapPixelF0D(0, level)
+		self.d1Density = ReadSteerableViewMapPixelF0D(1, level)
+		self.d2Density = ReadSteerableViewMapPixelF0D(2, level)
+		self.d3Density = ReadSteerableViewMapPixelF0D(3, level)
+	def getName(self):
+		return "pyDensityAnisotropyF0D"
+	def __call__(self, inter):
+		c_iso = self.IsoDensity(inter) 
+		c_0 = self.d0Density(inter) 
+		c_1 = self.d1Density(inter) 
+		c_2 = self.d2Density(inter) 
+		c_3 = self.d3Density(inter) 
+		cMax = max( max(c_0,c_1), max(c_2,c_3))
+		cMin = min( min(c_0,c_1), min(c_2,c_3))
+		if ( c_iso == 0 ):
+			v = 0
+		else:
+			v = (cMax-cMin)/c_iso
+		return (v)
+
+## Returns the gradient vector for a pixel 
+## 	l
+##	  the level at which one wants to compute the gradient
+class pyViewMapGradientVectorF0D(UnaryFunction0DVec2f):
+	def __init__(self, l):
+		UnaryFunction0DVec2f.__init__(self)
+		self._l = l
+		self._step = pow(2,self._l)
+	def getName(self):
+		return "pyViewMapGradientVectorF0D"
+	def __call__(self, iter):
+		p = iter.getObject().getPoint2D()
+		gx = ReadCompleteViewMapPixelCF(self._l, int(p.x()+self._step), int(p.y()))- ReadCompleteViewMapPixelCF(self._l, int(p.x()), int(p.y()))
+		gy = ReadCompleteViewMapPixelCF(self._l, int(p.x()), int(p.y()+self._step))- ReadCompleteViewMapPixelCF(self._l, int(p.x()), int(p.y()))
+		return Vec2f(gx, gy)
+
+class pyViewMapGradientNormF0D(UnaryFunction0DDouble):
+	def __init__(self, l):
+		UnaryFunction0DDouble.__init__(self)
+		self._l = l
+		self._step = pow(2,self._l)
+	def getName(self):
+		return "pyViewMapGradientNormF0D"
+	def __call__(self, iter):
+		p = iter.getObject().getPoint2D()
+		gx = ReadCompleteViewMapPixelCF(self._l, int(p.x()+self._step), int(p.y()))- ReadCompleteViewMapPixelCF(self._l, int(p.x()), int(p.y()))
+		gy = ReadCompleteViewMapPixelCF(self._l, int(p.x()), int(p.y()+self._step))- ReadCompleteViewMapPixelCF(self._l, int(p.x()), int(p.y()))
+		grad = Vec2f(gx, gy)
+		return grad.norm()
+
+
diff --git a/extern/freestyle/style_modules/Functions1D.py b/extern/freestyle/style_modules/Functions1D.py
new file mode 100755
index 00000000000..e2505466aae
--- /dev/null
+++ b/extern/freestyle/style_modules/Functions1D.py
@@ -0,0 +1,45 @@
+from Freestyle import *
+from Functions0D import *
+import string 
+
+class pyGetInverseProjectedZF1D(UnaryFunction1DDouble):
+	def getName(self):
+		return "pyGetInverseProjectedZF1D"
+
+	def __call__(self, inter):
+		func = GetProjectedZF1D()
+		z = func(inter)
+		return (1.0 - z)
+
+class pyGetSquareInverseProjectedZF1D(UnaryFunction1DDouble):
+	def getName(self):
+		return "pyGetInverseProjectedZF1D"
+
+	def __call__(self, inter):
+		func = GetProjectedZF1D()
+		z = func(inter)
+		return (1.0 - z*z)
+
+class pyDensityAnisotropyF1D(UnaryFunction1DDouble):
+	def __init__(self,level,  integrationType=MEAN, sampling=2.0):
+		UnaryFunction1DDouble.__init__(self, integrationType)
+		self._func = pyDensityAnisotropyF0D(level)
+		self._integration = integrationType
+		self._sampling = sampling
+	def getName(self):
+		return "pyDensityAnisotropyF1D"
+	def __call__(self, inter):
+		v =  integrateDouble(self._func, inter.pointsBegin(self._sampling), inter.pointsEnd(self._sampling), self._integration)
+		return v
+
+class pyViewMapGradientNormF1D(UnaryFunction1DDouble):
+	def __init__(self,l, integrationType, sampling=2.0):
+		UnaryFunction1DDouble.__init__(self, integrationType)
+		self._func = pyViewMapGradientNormF0D(l)
+		self._integration = integrationType
+		self._sampling = sampling
+	def getName(self):
+		return "pyViewMapGradientNormF1D"
+	def __call__(self, inter):
+		v =  integrateDouble(self._func, inter.pointsBegin(self._sampling), inter.pointsEnd(self._sampling), self._integration)
+		return v
diff --git a/extern/freestyle/style_modules/PredicatesB1D.py b/extern/freestyle/style_modules/PredicatesB1D.py
new file mode 100755
index 00000000000..dfc895e8d9b
--- /dev/null
+++ b/extern/freestyle/style_modules/PredicatesB1D.py
@@ -0,0 +1,70 @@
+from Freestyle import *
+from Functions1D import *
+from random import *
+
+class pyZBP1D(BinaryPredicate1D):
+	def getName(self):
+		return "pyZBP1D"
+
+ 	def __call__(self, i1, i2):
+		func = GetZF1D()
+		return (func(i1) > func(i2))
+
+class pyZDiscontinuityBP1D(BinaryPredicate1D):
+	def __init__(self, iType = MEAN):
+		BinaryPredicate1D.__init__(self)
+		self._GetZDiscontinuity = ZDiscontinuityF1D(iType)
+
+	def getName(self):
+		return "pyZDiscontinuityBP1D"
+
+ 	def __call__(self, i1, i2):
+		return (self._GetZDiscontinuity(i1) > self._GetZDiscontinuity(i2))
+
+class pyLengthBP1D(BinaryPredicate1D):
+	def getName(self):
+		return "LengthBP1D"
+
+ 	def __call__(self, i1, i2):
+		return (i1.getLength2D() > i2.getLength2D())
+
+class pySilhouetteFirstBP1D(BinaryPredicate1D):
+	def getName(self):
+		return "SilhouetteFirstBP1D"
+
+ 	def __call__(self, inter1, inter2):
+		bpred = SameShapeIdBP1D()
+		if (bpred(inter1, inter2) != 1):
+			return 0
+		if (inter1.getNature() & SILHOUETTE):
+			return (inter2.getNature() & SILHOUETTE)
+		return (inter1.getNature() == inter2.getNature())
+
+class pyNatureBP1D(BinaryPredicate1D):
+	def getName(self):
+		return "NatureBP1D"
+
+ 	def __call__(self, inter1, inter2):
+		return (inter1.getNature() & inter2.getNature())
+
+class pyViewMapGradientNormBP1D(BinaryPredicate1D):
+	def __init__(self,l, sampling=2.0):
+		BinaryPredicate1D.__init__(self)
+		self._GetGradient = pyViewMapGradientNormF1D(l, MEAN)
+	def getName(self):
+		return "pyViewMapGradientNormBP1D"
+	def __call__(self, i1,i2):
+		print "compare gradient"
+		return (self._GetGradient(i1) > self._GetGradient(i2))
+
+class pyShuffleBP1D(BinaryPredicate1D):
+	def __init__(self):
+		BinaryPredicate1D.__init__(self)
+		seed(1)
+	def getName(self):
+		return "pyNearAndContourFirstBP1D"
+
+ 	def __call__(self, inter1, inter2):
+		r1 = uniform(0,1)
+		r2 = uniform(0,1)
+		return (r1<r2)
diff --git a/extern/freestyle/style_modules/PredicatesU0D.py b/extern/freestyle/style_modules/PredicatesU0D.py
new file mode 100755
index 00000000000..10c4b85a6cf
--- /dev/null
+++ b/extern/freestyle/style_modules/PredicatesU0D.py
@@ -0,0 +1,103 @@
+from Freestyle import *
+from Functions0D import *
+
+class pyHigherCurvature2DAngleUP0D(UnaryPredicate0D):
+	def __init__(self,a):
+		UnaryPredicate0D.__init__(self)
+		self._a = a
+			
+	def getName(self):
+		return "HigherCurvature2DAngleUP0D"
+
+	def __call__(self, inter):
+		func = Curvature2DAngleF0D()
+		a = func(inter)
+		return ( a > self._a)
+
+class pyUEqualsUP0D(UnaryPredicate0D):
+	def __init__(self,u, w):
+		UnaryPredicate0D.__init__(self)
+		self._u = u
+		self._w = w
+			
+	def getName(self):
+		return "UEqualsUP0D"
+
+	def __call__(self, inter):
+		func = pyCurvilinearLengthF0D()
+		u = func(inter)
+		return ( ( u > (self._u-self._w) ) and ( u < (self._u+self._w) ) )
+
+class pyVertexNatureUP0D(UnaryPredicate0D):
+	def __init__(self,nature):
+		UnaryPredicate0D.__init__(self)
+		self._nature = nature
+			
+	def getName(self):
+		return "pyVertexNatureUP0D"
+
+	def __call__(self, inter):
+		v = inter.getObject()
+		nat = v.getNature()
+		if(nat & self._nature):
+			return 1;
+		return 0
+
+## check whether an Interface0DIterator
+## is a TVertex and is the one that is 
+## hidden (inferred from the context)
+class pyBackTVertexUP0D(UnaryPredicate0D):
+	def __init__(self):
+		UnaryPredicate0D.__init__(self)
+		self._getQI = QuantitativeInvisibilityF0D()
+	def getName(self):
+		return "pyBackTVertexUP0D"
+	def __call__(self, iter):
+		v = iter.getObject()
+		nat = v.getNature()
+		if(nat & T_VERTEX == 0):
+			return 0
+		next = iter
+		if(next.isEnd()):
+			return 0
+		if(self._getQI(next) != 0):
+			return 1
+		return 0
+
+class pyParameterUP0DGoodOne(UnaryPredicate0D):
+	def __init__(self,pmin,pmax):
+		UnaryPredicate0D.__init__(self)
+		self._m = pmin
+		self._M = pmax
+		#self.getCurvilinearAbscissa = GetCurvilinearAbscissaF0D()
+
+	def getName(self):
+		return "pyCurvilinearAbscissaHigherThanUP0D"
+
+	def __call__(self, inter):
+		#s = self.getCurvilinearAbscissa(inter)
+		u = inter.u()
+		#print u
+		return ((u>=self._m) and (u<=self._M))
+
+class pyParameterUP0D(UnaryPredicate0D):
+	def __init__(self,pmin,pmax):
+		UnaryPredicate0D.__init__(self)
+		self._m = pmin
+		self._M = pmax
+		#self.getCurvilinearAbscissa = GetCurvilinearAbscissaF0D()
+
+	def getName(self):
+		return "pyCurvilinearAbscissaHigherThanUP0D"
+
+	def __call__(self, inter):
+		func = Curvature2DAngleF0D()
+		c = func(inter)
+		b1 = (c>0.1)
+		#s = self.getCurvilinearAbscissa(inter)
+		u = inter.u()
+		#print u
+		b = ((u>=self._m) and (u<=self._M))
+		return b and b1
+
+
diff --git a/extern/freestyle/style_modules/PredicatesU1D.py b/extern/freestyle/style_modules/PredicatesU1D.py
new file mode 100755
index 00000000000..18e9686f9df
--- /dev/null
+++ b/extern/freestyle/style_modules/PredicatesU1D.py
@@ -0,0 +1,381 @@
+from Freestyle import *
+from Functions1D import *
+
+count = 0
+class pyNFirstUP1D(UnaryPredicate1D):
+	def __init__(self, n):
+		UnaryPredicate1D.__init__(self)
+		self.__n = n
+	def __call__(self, inter):
+		global count
+		count = count + 1
+		if count <= self.__n:
+			return 1
+		return 0
+
+class pyHigherLengthUP1D(UnaryPredicate1D):
+	def __init__(self,l):
+		UnaryPredicate1D.__init__(self)
+		self._l = l
+			
+	def getName(self):
+		return "HigherLengthUP1D"
+
+	def __call__(self, inter):
+		return (inter.getLength2D() > self._l)
+
+class pyNatureUP1D(UnaryPredicate1D):
+	def __init__(self,nature):
+		UnaryPredicate1D.__init__(self)
+		self._nature = nature
+		self._getNature = CurveNatureF1D()
+			
+	def getName(self):
+		return "pyNatureUP1D"
+
+	def __call__(self, inter):
+		if(self._getNature(inter) & self._nature):
+			return 1
+		return 0
+
+class pyHigherNumberOfTurnsUP1D(UnaryPredicate1D):
+	def __init__(self,n,a):
+		UnaryPredicate1D.__init__(self)
+		self._n = n
+		self._a = a
+
+	def getName(self):
+		return "HigherNumberOfTurnsUP1D"
+
+	def __call__(self, inter):
+		count = 0
+		func = Curvature2DAngleF0D()
+		it = inter.verticesBegin()
+		while(it.isEnd() == 0):
+			if(func(it) > self._a):
+				count = count+1
+			if(count > self._n):
+				return 1
+			it.increment()
+		return 0
+
+class pyDensityUP1D(UnaryPredicate1D):
+	def __init__(self,wsize,threshold, integration = MEAN, sampling=2.0):
+		UnaryPredicate1D.__init__(self)
+		self._wsize = wsize
+		self._threshold = threshold
+		self._integration = integration
+		self._func = DensityF1D(self._wsize, self._integration, sampling)
+			
+	def getName(self):
+		return "pyDensityUP1D"
+
+	def __call__(self, inter):
+		if(self._func(inter) < self._threshold):
+			return 1
+		return 0
+
+class pyLowSteerableViewMapDensityUP1D(UnaryPredicate1D):
+	def __init__(self,threshold, level,integration = MEAN):
+		UnaryPredicate1D.__init__(self)
+		self._threshold = threshold
+		self._level = level
+		self._integration = integration
+			
+	def getName(self):
+		return "pyLowSteerableViewMapDensityUP1D"
+
+	def __call__(self, inter):
+		func = GetSteerableViewMapDensityF1D(self._level, self._integration)
+		v = func(inter)
+		print v
+		if(v < self._threshold):
+			return 1
+		return 0
+
+class pyLowDirectionalViewMapDensityUP1D(UnaryPredicate1D):
+	def __init__(self,threshold, orientation, level,integration = MEAN):
+		UnaryPredicate1D.__init__(self)
+		self._threshold = threshold
+		self._orientation = orientation
+		self._level = level
+		self._integration = integration
+			
+	def getName(self):
+		return "pyLowDirectionalViewMapDensityUP1D"
+
+	def __call__(self, inter):
+		func = GetDirectionalViewMapDensityF1D(self._orientation, self._level, self._integration)
+		v = func(inter)
+		#print v
+		if(v < self._threshold):
+			return 1
+		return 0
+
+class pyHighSteerableViewMapDensityUP1D(UnaryPredicate1D):
+	def __init__(self,threshold, level,integration = MEAN):
+		UnaryPredicate1D.__init__(self)
+		self._threshold = threshold
+		self._level = level
+		self._integration = integration
+		self._func = GetSteerableViewMapDensityF1D(self._level, self._integration)	
+	def getName(self):
+		return "pyHighSteerableViewMapDensityUP1D"
+
+	def __call__(self, inter):
+		
+		v = self._func(inter)
+		if(v > self._threshold):
+			return 1
+		return 0
+
+class pyHighDirectionalViewMapDensityUP1D(UnaryPredicate1D):
+	def __init__(self,threshold, orientation, level,integration = MEAN, sampling=2.0):
+		UnaryPredicate1D.__init__(self)
+		self._threshold = threshold
+		self._orientation = orientation
+		self._level = level
+		self._integration = integration
+		self._sampling = sampling		
+	def getName(self):
+		return "pyLowDirectionalViewMapDensityUP1D"
+
+	def __call__(self, inter):
+		func = GetDirectionalViewMapDensityF1D(self._orientation, self._level, self._integration, self._sampling)
+		v = func(inter)
+		if(v > self._threshold):
+			return 1
+		return 0
+
+class pyHighViewMapDensityUP1D(UnaryPredicate1D):
+	def __init__(self,threshold, level,integration = MEAN, sampling=2.0):
+		UnaryPredicate1D.__init__(self)
+		self._threshold = threshold
+		self._level = level
+		self._integration = integration
+		self._sampling = sampling
+		self._func = GetCompleteViewMapDensityF1D(self._level, self._integration, self._sampling) # 2.0 is the smpling
+			
+	def getName(self):
+		return "pyHighViewMapDensityUP1D"
+
+	def __call__(self, inter):
+		#print "toto"
+		#print func.getName()
+		#print inter.getExactTypeName()
+		v= self._func(inter)
+		if(v > self._threshold):
+			return 1
+		return 0
+
+class pyDensityFunctorUP1D(UnaryPredicate1D):
+	def __init__(self,wsize,threshold, functor, funcmin=0.0, funcmax=1.0, integration = MEAN):
+		UnaryPredicate1D.__init__(self)
+		self._wsize = wsize
+		self._threshold = float(threshold)
+		self._functor = functor
+		self._funcmin = float(funcmin)
+		self._funcmax = float(funcmax)
+		self._integration = integration
+			
+	def getName(self):
+		return "pyDensityFunctorUP1D"
+
+	def __call__(self, inter):
+		func = DensityF1D(self._wsize, self._integration)
+		res = self._functor(inter)
+		k = (res-self._funcmin)/(self._funcmax-self._funcmin)
+		if(func(inter) < self._threshold*k):
+			return 1
+		return 0
+
+class pyZSmallerUP1D(UnaryPredicate1D):
+	def __init__(self,z, integration=MEAN):
+		UnaryPredicate1D.__init__(self)
+		self._z = z
+		self._integration = integration
+	def getName(self):
+		return "pyZSmallerUP1D"
+
+	def __call__(self, inter):
+		func = GetProjectedZF1D(self._integration)
+		if(func(inter) < self._z):
+			return 1
+		return 0
+
+class pyIsOccludedByUP1D(UnaryPredicate1D):
+	def __init__(self,id):
+		UnaryPredicate1D.__init__(self)
+		self._id = id
+	def getName(self):
+		return "pyIsOccludedByUP1D"
+	def __call__(self, inter):
+		func = GetShapeF1D()
+		shapes = func(inter)
+		for s in shapes:
+			if(s.getId() == self._id):
+				return 0
+		it = inter.verticesBegin()
+		itlast = inter.verticesEnd()
+		itlast.decrement()
+		v =  it.getObject()
+		vlast = itlast.getObject()
+		tvertex = v.castToTVertex()
+		if(tvertex != None):
+			#print "TVertex: [ ", tvertex.getId().getFirst(), ",",  tvertex.getId().getSecond()," ]"
+			eit = tvertex.edgesBegin()
+			while(eit.isEnd() == 0):
+				ve = eit.getObject().first
+				if(ve.shape_id() == self._id):
+					return 1
+				#print "-------", ve.getId().getFirst(), "-", ve.getId().getSecond()
+				eit.increment()
+		tvertex = vlast.castToTVertex()
+		if(tvertex != None):
+			#print "TVertex: [ ", tvertex.getId().getFirst(), ",",  tvertex.getId().getSecond()," ]"
+			eit = tvertex.edgesBegin()
+			while(eit.isEnd() == 0):
+				ve = eit.getObject().first
+				if(ve.shape_id() == self._id):
+					return 1
+				#print "-------", ve.getId().getFirst(), "-", ve.getId().getSecond()
+				eit.increment()
+		return 0
+
+class pyIsInOccludersListUP1D(UnaryPredicate1D):
+	def __init__(self,id):
+		UnaryPredicate1D.__init__(self)
+		self._id = id
+	def getName(self):
+		return "pyIsInOccludersListUP1D"
+	def __call__(self, inter):
+		func = GetOccludersF1D()
+		occluders = func(inter)
+		for a in occluders:
+			if(a.getId() == self._id):
+				return 1
+		return 0
+
+class pyIsOccludedByItselfUP1D(UnaryPredicate1D):
+	def __init__(self):
+		UnaryPredicate1D.__init__(self)
+		self.__func1 = GetOccludersF1D()
+		self.__func2 = GetShapeF1D()
+	def getName(self):
+		return "pyIsOccludedByItselfUP1D"
+	def __call__(self, inter):
+		lst1 = self.__func1(inter)
+		lst2 = self.__func2(inter)
+		for vs1 in lst1:
+			for vs2 in lst2:
+				if vs1.getId() == vs2.getId():
+					return 1
+		return 0
+
+class pyIsOccludedByIdListUP1D(UnaryPredicate1D):
+	def __init__(self, idlist):
+		UnaryPredicate1D.__init__(self)
+		self._idlist = idlist
+		self.__func1 = GetOccludersF1D()
+	def getName(self):
+		return "pyIsOccludedByIdListUP1D"
+	def __call__(self, inter):
+		lst1 = self.__func1(inter)
+		for vs1 in lst1:
+			for id in self._idlist:
+				if vs1.getId() == id:
+					return 1
+		return 0
+
+class pyShapeIdListUP1D(UnaryPredicate1D):
+	def __init__(self,idlist):
+		UnaryPredicate1D.__init__(self)
+		self._idlist = idlist
+		self._funcs = []
+		for id in idlist :
+			self._funcs.append(ShapeUP1D(id.getFirst(), id.getSecond()))
+		
+	def getName(self):
+		return "pyShapeIdUP1D"
+	def __call__(self, inter):
+		for func in self._funcs :
+			if(func(inter) == 1) :
+				return 1
+		return 0
+
+## deprecated
+class pyShapeIdUP1D(UnaryPredicate1D):
+	def __init__(self,id):
+		UnaryPredicate1D.__init__(self)
+		self._id = id
+	def getName(self):
+		return "pyShapeIdUP1D"
+	def __call__(self, inter):
+		func = GetShapeF1D()
+		shapes = func(inter)
+		for a in shapes:
+			if(a.getId() == self._id):
+				return 1
+		return 0
+
+class pyHighDensityAnisotropyUP1D(UnaryPredicate1D):
+	def __init__(self,threshold, level, sampling=2.0):
+		UnaryPredicate1D.__init__(self)
+		self._l = threshold
+		self.func = pyDensityAnisotropyF1D(level, MEAN, sampling)
+	def getName(self):
+		return "pyHighDensityAnisotropyUP1D"
+	def __call__(self, inter):
+		return (self.func(inter) > self._l)
+
+class pyHighViewMapGradientNormUP1D(UnaryPredicate1D):
+	def __init__(self,threshold, l, sampling=2.0):
+		UnaryPredicate1D.__init__(self)
+		self._threshold = threshold
+		self._GetGradient = pyViewMapGradientNormF1D(l, MEAN)
+	def getName(self):
+		return "pyHighViewMapGradientNormUP1D"
+	def __call__(self, inter):
+		gn = self._GetGradient(inter)
+		#print gn
+		return (gn > self._threshold)
+
+class pyDensityVariableSigmaUP1D(UnaryPredicate1D):
+	def __init__(self,functor, sigmaMin,sigmaMax, lmin, lmax, tmin, tmax, integration = MEAN, sampling=2.0):
+		UnaryPredicate1D.__init__(self)
+		self._functor = functor
+		self._sigmaMin = float(sigmaMin)
+		self._sigmaMax = float(sigmaMax)
+		self._lmin = float(lmin)
+		self._lmax = float(lmax)
+		self._tmin = tmin
+		self._tmax = tmax
+		self._integration = integration
+		self._sampling = sampling
+			
+	def getName(self):
+		return "pyDensityUP1D"
+
+	def __call__(self, inter):
+		sigma = (self._sigmaMax-self._sigmaMin)/(self._lmax-self._lmin)*(self._functor(inter)-self._lmin) + self._sigmaMin
+		t = (self._tmax-self._tmin)/(self._lmax-self._lmin)*(self._functor(inter)-self._lmin) + self._tmin
+		if(sigma<self._sigmaMin):
+			sigma = self._sigmaMin
+		self._func = DensityF1D(sigma, self._integration, self._sampling)
+		d = self._func(inter)
+		if(d<t):
+			return 1
+		return 0
+
+class pyClosedCurveUP1D(UnaryPredicate1D):
+	def __call__(self, inter):
+		it = inter.verticesBegin()
+		itlast = inter.verticesEnd()
+		itlast.decrement()	
+		vlast = itlast.getObject()
+		v = it.getObject()
+		print v.getId().getFirst(), v.getId().getSecond()
+		print vlast.getId().getFirst(), vlast.getId().getSecond()
+		if(v.getId() == vlast.getId()):
+			return 1
+		return 0
diff --git a/extern/freestyle/style_modules/anisotropic_diffusion.py b/extern/freestyle/style_modules/anisotropic_diffusion.py
new file mode 100755
index 00000000000..f8b68ee51a6
--- /dev/null
+++ b/extern/freestyle/style_modules/anisotropic_diffusion.py
@@ -0,0 +1,75 @@
+#
+#  Filename : anisotropic_diffusion.py
+#  Author   : Fredo Durand
+#  Date     : 12/08/2004
+#  Purpose  : Smoothes lines using an anisotropic diffusion scheme
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Freestyle import *
+from logical_operators import *
+from PredicatesB1D import *
+from shaders import *
+from vector import *
+from PredicatesU0D import *
+from math import *
+
+## thickness modifiers
+
+normalInfo=Normal2DF0D()
+curvatureInfo=Curvature2DAngleF0D()
+
+def edgestopping(x, sigma): 
+	return exp(- x*x/(2*sigma*sigma))
+
+class pyDiffusion2Shader(StrokeShader):
+	def __init__(self, lambda1, nbIter):
+		StrokeShader.__init__(self)
+		self._lambda = lambda1
+		self._nbIter = nbIter
+	def getName(self):
+		return "pyDiffusionShader"
+	def shade(self, stroke):
+		for i in range (1, self._nbIter):
+			it = stroke.strokeVerticesBegin()
+			while it.isEnd() == 0:
+				v=it.getObject()
+				p1 = v.getPoint()
+				p2 = normalInfo(it.castToInterface0DIterator())*self._lambda*curvatureInfo(it.castToInterface0DIterator())
+				v.SetPoint(p1+p2)
+				it.increment()
+
+upred = AndUP1D(QuantitativeInvisibilityUP1D(0), ExternalContourUP1D())
+Operators.select( upred )
+bpred = TrueBP1D();
+Operators.bidirectionalChain(ChainPredicateIterator(upred, bpred), NotUP1D(upred) )
+shaders_list = 	[
+		ConstantThicknessShader(4),
+		StrokeTextureShader("smoothAlpha.bmp", Stroke.OPAQUE_MEDIUM, 0),
+		SamplingShader(2),
+		pyDiffusion2Shader(-0.03, 30), 
+		IncreasingColorShader(1.0,0.0,0.0,1, 0, 1, 0, 1)
+		]
+Operators.create(TrueUP1D(), shaders_list)
+
+
+
diff --git a/extern/freestyle/style_modules/apriori_and_causal_density.py b/extern/freestyle/style_modules/apriori_and_causal_density.py
new file mode 100755
index 00000000000..e6bcf046bd0
--- /dev/null
+++ b/extern/freestyle/style_modules/apriori_and_causal_density.py
@@ -0,0 +1,45 @@
+#
+#  Filename : apriori_and_causal_density.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Selects the lines with high a priori density and 
+#             subjects them to the causal density so as to avoid 
+#             cluttering
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+
+from Freestyle import *
+from logical_operators import *
+from PredicatesB1D import *
+from PredicatesU1D import *
+from shaders import *
+
+Operators.select(AndUP1D(QuantitativeInvisibilityUP1D(0), pyHighViewMapDensityUP1D(0.3,4) ) )
+bpred = TrueBP1D()
+upred = AndUP1D(QuantitativeInvisibilityUP1D(0), pyHighViewMapDensityUP1D(0.3,4))
+Operators.bidirectionalChain(ChainPredicateIterator(upred, bpred), NotUP1D(QuantitativeInvisibilityUP1D(0)))
+shaders_list = 	[
+		ConstantThicknessShader(2), 
+		ConstantColorShader(0.0, 0.0, 0.0,1)
+		]
+Operators.create(pyDensityUP1D(1,0.1, MEAN), shaders_list)
diff --git a/extern/freestyle/style_modules/apriori_density.py b/extern/freestyle/style_modules/apriori_density.py
new file mode 100755
index 00000000000..77d41e7d04b
--- /dev/null
+++ b/extern/freestyle/style_modules/apriori_density.py
@@ -0,0 +1,43 @@
+#
+#  Filename : apriori_density.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Draws lines having a high a priori density
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+
+from Freestyle import *
+from logical_operators import *
+from PredicatesB1D import *
+from PredicatesU1D import *
+from shaders import *
+
+Operators.select(AndUP1D(QuantitativeInvisibilityUP1D(0), pyHighViewMapDensityUP1D(0.1,5)))
+bpred = TrueBP1D()
+upred = AndUP1D(QuantitativeInvisibilityUP1D(0), pyHighViewMapDensityUP1D(0.0007,5))
+Operators.bidirectionalChain(ChainPredicateIterator(upred, bpred), NotUP1D(QuantitativeInvisibilityUP1D(0)))
+shaders_list = 	[
+		ConstantThicknessShader(2), 
+		ConstantColorShader(0.0, 0.0, 0.0,1)
+		]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/extern/freestyle/style_modules/backbone_stretcher.py b/extern/freestyle/style_modules/backbone_stretcher.py
new file mode 100755
index 00000000000..db17f2574ff
--- /dev/null
+++ b/extern/freestyle/style_modules/backbone_stretcher.py
@@ -0,0 +1,36 @@
+#
+#  Filename : backbone_stretcher.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Stretches the geometry of visible lines
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Freestyle import *
+from logical_operators import *
+from PredicatesB1D import *
+from shaders import *
+
+Operators.select(QuantitativeInvisibilityUP1D(0))
+Operators.bidirectionalChain(ChainSilhouetteIterator(), NotUP1D(QuantitativeInvisibilityUP1D(0)))
+shaders_list = [TextureAssignerShader(4), ConstantColorShader(0.5, 0.5, 0.5), BackboneStretcherShader(20)]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/extern/freestyle/style_modules/blueprint_circles.py b/extern/freestyle/style_modules/blueprint_circles.py
new file mode 100755
index 00000000000..5eca00ff4ac
--- /dev/null
+++ b/extern/freestyle/style_modules/blueprint_circles.py
@@ -0,0 +1,46 @@
+#
+#  Filename : blueprint_circles.py
+#  Author   : Emmanuel Turquin
+#  Date     : 04/08/2005
+#  Purpose  : Produces a blueprint using circular contour strokes
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Freestyle import *
+from logical_operators import *
+from PredicatesB1D import *
+from PredicatesU1D import *
+from shaders import *
+
+upred = AndUP1D(QuantitativeInvisibilityUP1D(0), ContourUP1D())
+bpred = SameShapeIdBP1D()
+Operators.select(upred)
+Operators.bidirectionalChain(ChainPredicateIterator(upred,bpred), NotUP1D(upred))
+Operators.select(pyHigherLengthUP1D(200))
+shaders_list = [
+		ConstantThicknessShader(5),
+                pyBluePrintCirclesShader(3),
+		pyPerlinNoise1DShader(0.1, 15, 8),
+		TextureAssignerShader(4),
+		IncreasingColorShader(0.8, 0.8, 0.3, 0.4, 0.3, 0.3, 0.3, 0.1)
+               ]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/extern/freestyle/style_modules/blueprint_ellipses.py b/extern/freestyle/style_modules/blueprint_ellipses.py
new file mode 100755
index 00000000000..4e34310b3ca
--- /dev/null
+++ b/extern/freestyle/style_modules/blueprint_ellipses.py
@@ -0,0 +1,46 @@
+#
+#  Filename : blueprint_ellipses.py
+#  Author   : Emmanuel Turquin
+#  Date     : 04/08/2005
+#  Purpose  : Produces a blueprint using elliptic contour strokes
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Freestyle import *
+from logical_operators import *
+from PredicatesB1D import *
+from PredicatesU1D import *
+from shaders import *
+
+upred = AndUP1D(QuantitativeInvisibilityUP1D(0), ContourUP1D())
+bpred = SameShapeIdBP1D()
+Operators.select(upred)
+Operators.bidirectionalChain(ChainPredicateIterator(upred,bpred), NotUP1D(upred))
+Operators.select(pyHigherLengthUP1D(200))
+shaders_list = [
+		ConstantThicknessShader(5),
+                pyBluePrintEllipsesShader(3),
+		pyPerlinNoise1DShader(0.1, 10, 8),
+		TextureAssignerShader(4),
+		IncreasingColorShader(0.6, 0.3, 0.3, 0.7, 0.3, 0.3, 0.3, 0.1)
+               ]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/extern/freestyle/style_modules/blueprint_squares.py b/extern/freestyle/style_modules/blueprint_squares.py
new file mode 100755
index 00000000000..926f882456f
--- /dev/null
+++ b/extern/freestyle/style_modules/blueprint_squares.py
@@ -0,0 +1,45 @@
+#  Filename : blueprint_squares.py
+#  Author   : Emmanuel Turquin
+#  Date     : 04/08/2005
+#  Purpose  : Produces a blueprint using square contour strokes
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+from Freestyle import *
+from logical_operators import *
+from PredicatesB1D import *
+from PredicatesU1D import *
+from shaders import *
+
+upred = AndUP1D(QuantitativeInvisibilityUP1D(0), ContourUP1D())
+bpred = SameShapeIdBP1D()
+Operators.select(upred)
+Operators.bidirectionalChain(ChainPredicateIterator(upred,bpred), NotUP1D(upred))
+Operators.select(pyHigherLengthUP1D(200))
+shaders_list = [
+		ConstantThicknessShader(8),
+                pyBluePrintSquaresShader(2, 20),
+		pyPerlinNoise1DShader(0.07, 10, 8),
+		TextureAssignerShader(4),
+		IncreasingColorShader(0.6, 0.3, 0.3, 0.7, 0.6, 0.3, 0.3, 0.3),
+		ConstantThicknessShader(4)
+               ]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/extern/freestyle/style_modules/cartoon.py b/extern/freestyle/style_modules/cartoon.py
new file mode 100755
index 00000000000..0c49f854f7d
--- /dev/null
+++ b/extern/freestyle/style_modules/cartoon.py
@@ -0,0 +1,42 @@
+#
+#  Filename : cartoon.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Draws colored lines. The color is automatically 
+#             infered from each object's material in a cartoon-like
+#             fashion.
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Freestyle import *
+from logical_operators import *
+from PredicatesB1D import *
+from shaders import *
+
+Operators.select(QuantitativeInvisibilityUP1D(0))
+Operators.bidirectionalChain(ChainSilhouetteIterator(), NotUP1D(QuantitativeInvisibilityUP1D(0)))
+shaders_list = 	[
+		BezierCurveShader(3),
+		ConstantThicknessShader(4), 
+		pyMaterialColorShader(0.8)
+		]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/extern/freestyle/style_modules/contour.py b/extern/freestyle/style_modules/contour.py
new file mode 100755
index 00000000000..b7c97064cae
--- /dev/null
+++ b/extern/freestyle/style_modules/contour.py
@@ -0,0 +1,42 @@
+#
+#  Filename : contour.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Draws each object's visible contour
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Freestyle import *
+from logical_operators import *
+from PredicatesB1D import *
+from PredicatesU1D import *
+from shaders import *
+
+Operators.select(AndUP1D(QuantitativeInvisibilityUP1D(0), ContourUP1D() ) )
+bpred = SameShapeIdBP1D();
+upred = AndUP1D(QuantitativeInvisibilityUP1D(0), ContourUP1D())
+Operators.bidirectionalChain(ChainPredicateIterator(upred, bpred), NotUP1D(QuantitativeInvisibilityUP1D(0)))
+shaders_list =	 [
+		ConstantThicknessShader(5.0),
+		IncreasingColorShader(0.8,0,0,1,0.1,0,0,1)
+		]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/extern/freestyle/style_modules/curvature2d.py b/extern/freestyle/style_modules/curvature2d.py
new file mode 100755
index 00000000000..587c53071d0
--- /dev/null
+++ b/extern/freestyle/style_modules/curvature2d.py
@@ -0,0 +1,60 @@
+#
+#  Filename : curvature2d.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : The stroke points are colored in gray levels and depending
+#             on the 2d curvature value
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Freestyle import *
+from logical_operators import *
+from PredicatesB1D import *
+from shaders import *
+
+class py2DCurvatureColorShader(StrokeShader):
+	def getName(self):
+		return "py2DCurvatureColorShader"
+
+	def shade(self, stroke):
+		it = stroke.strokeVerticesBegin()
+		it_end = stroke.strokeVerticesEnd()
+		func = Curvature2DAngleF0D()
+		while it.isEnd() == 0:
+			it0D = it.castToInterface0DIterator()
+			sv = it.getObject()
+			att = sv.attribute()
+			c = func(it0D)
+			if (c<0):
+ 				print "negative 2D curvature"
+			color = 10.0 * c/3.1415
+			att.setColor(color,color,color);
+			it.increment()
+
+Operators.select(QuantitativeInvisibilityUP1D(0))
+Operators.bidirectionalChain(ChainSilhouetteIterator(), NotUP1D(QuantitativeInvisibilityUP1D(0)))
+shaders_list = 	[
+		StrokeTextureShader("smoothAlpha.bmp", Stroke.OPAQUE_MEDIUM, 0),
+		ConstantThicknessShader(5),
+		py2DCurvatureColorShader()
+		]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/extern/freestyle/style_modules/external_contour.py b/extern/freestyle/style_modules/external_contour.py
new file mode 100755
index 00000000000..ae49e18981e
--- /dev/null
+++ b/extern/freestyle/style_modules/external_contour.py
@@ -0,0 +1,43 @@
+#
+#  Filename : external_contour.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Draws the external contour of the scene
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Freestyle import *
+from logical_operators import *
+from PredicatesB1D import *
+from PredicatesU1D import *
+from ChainingIterators import *
+from shaders import *
+
+upred = AndUP1D(QuantitativeInvisibilityUP1D(0), ExternalContourUP1D())
+Operators.select(upred )
+bpred = TrueBP1D();
+Operators.bidirectionalChain(ChainPredicateIterator(upred, bpred), NotUP1D(upred))
+shaders_list = 	[
+		ConstantThicknessShader(3),
+		ConstantColorShader(0.0, 0.0, 0.0,1)
+		]
+Operators.create(TrueUP1D(), shaders_list)
\ No newline at end of file
diff --git a/extern/freestyle/style_modules/external_contour_sketchy.py b/extern/freestyle/style_modules/external_contour_sketchy.py
new file mode 100755
index 00000000000..1c3ffe94e1b
--- /dev/null
+++ b/extern/freestyle/style_modules/external_contour_sketchy.py
@@ -0,0 +1,48 @@
+#
+#  Filename : external_contour_sketchy.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Draws the external contour of the scene using a sketchy 
+#             chaining iterator (in particular each ViewEdge can be drawn 
+#             several times
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+
+from Freestyle import *
+from logical_operators import *
+from ChainingIterators import *
+from shaders import *
+
+
+upred = AndUP1D(QuantitativeInvisibilityUP1D(0), ExternalContourUP1D()) 
+Operators.select(upred)
+Operators.bidirectionalChain(pySketchyChainingIterator(), NotUP1D(upred))
+shaders_list = 	[
+		SamplingShader(4),
+		SpatialNoiseShader(10, 150, 2, 1, 1), 
+		IncreasingThicknessShader(4, 10), 
+		SmoothingShader(400, 0.1, 0, 0.2, 0, 0, 0, 1),
+		IncreasingColorShader(1,0,0,1,0,1,0,1),
+		TextureAssignerShader(4)
+		]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/extern/freestyle/style_modules/external_contour_smooth.py b/extern/freestyle/style_modules/external_contour_smooth.py
new file mode 100755
index 00000000000..59633a25063
--- /dev/null
+++ b/extern/freestyle/style_modules/external_contour_smooth.py
@@ -0,0 +1,44 @@
+#
+#  Filename : external_contour_smooth.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Draws a smooth external contour
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+from Freestyle import *
+from logical_operators import *
+from PredicatesB1D import *
+from PredicatesU1D import *
+from shaders import *
+from ChainingIterators import *
+
+upred = AndUP1D(QuantitativeInvisibilityUP1D(0), ExternalContourUP1D())
+Operators.select(upred)
+bpred = TrueBP1D();
+Operators.bidirectionalChain(ChainPredicateIterator(upred, bpred), NotUP1D(upred))
+shaders_list = 	[
+		SamplingShader(2),
+		IncreasingThicknessShader(4,20), 
+		IncreasingColorShader(1.0, 0.0, 0.5,1, 0.5,1, 0.3, 1),
+		SmoothingShader(100, 0.05, 0, 0.2, 0, 0, 0, 1)
+		]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/extern/freestyle/style_modules/extra-lines.sml b/extern/freestyle/style_modules/extra-lines.sml
new file mode 100755
index 00000000000..c63cd40945d
--- /dev/null
+++ b/extern/freestyle/style_modules/extra-lines.sml
@@ -0,0 +1,3 @@
+1suggestive.py
+1ridges.py
+1nor_suggestive_or_ridges.py
diff --git a/extern/freestyle/style_modules/haloing.py b/extern/freestyle/style_modules/haloing.py
new file mode 100755
index 00000000000..b64b2d967f7
--- /dev/null
+++ b/extern/freestyle/style_modules/haloing.py
@@ -0,0 +1,50 @@
+#
+#  Filename : haloing.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : This style module selects the lines that 
+#             are connected (in the image) to a specific 
+#             object and trims them in order to produce
+#             a haloing effect around the target shape
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Freestyle import *
+from logical_operators import *
+from PredicatesU1D import *
+from PredicatesB1D import *
+from shaders import *
+
+# id corresponds to the id of the target object 
+# (accessed by SHIFT+click)
+id = Id(3,0)
+upred = AndUP1D(QuantitativeInvisibilityUP1D(0) , pyIsOccludedByUP1D(id))
+Operators.select(upred)
+Operators.bidirectionalChain(ChainSilhouetteIterator(), NotUP1D(upred))
+shaders_list = 	[
+		IncreasingThicknessShader(3, 5), 
+		IncreasingColorShader(1,0,0, 1,0,1,0,1),
+		SamplingShader(1.0),
+		pyTVertexRemoverShader(),
+		TipRemoverShader(3.0)
+		]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/extern/freestyle/style_modules/ignore_small_occlusions.py b/extern/freestyle/style_modules/ignore_small_occlusions.py
new file mode 100755
index 00000000000..98c318a3757
--- /dev/null
+++ b/extern/freestyle/style_modules/ignore_small_occlusions.py
@@ -0,0 +1,41 @@
+#
+#  Filename : ignore_small_oclusions.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : The strokes are drawn through small occlusions
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Freestyle import *
+from logical_operators import *
+from ChainingIterators import *
+from shaders import *
+
+Operators.select(QuantitativeInvisibilityUP1D(0))
+#Operators.bidirectionalChain(pyFillOcclusionsChainingIterator(0.1))
+Operators.bidirectionalChain(pyFillOcclusionsAbsoluteChainingIterator(12))
+shaders_list = 	[
+		SamplingShader(5.0),
+		ConstantThicknessShader(3), 
+		ConstantColorShader(0.0,0.0,0.0),
+		]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/extern/freestyle/style_modules/invisible_lines.py b/extern/freestyle/style_modules/invisible_lines.py
new file mode 100755
index 00000000000..5cce741e91e
--- /dev/null
+++ b/extern/freestyle/style_modules/invisible_lines.py
@@ -0,0 +1,42 @@
+#
+#  Filename : invisible_lines.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Draws all lines whose Quantitative Invisibility 
+#             is different from 0
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Freestyle import *
+from logical_operators import *
+from ChainingIterators import *
+from shaders import *
+
+upred = NotUP1D(QuantitativeInvisibilityUP1D(0))
+Operators.select(upred)
+Operators.bidirectionalChain(ChainSilhouetteIterator(), NotUP1D(upred))
+shaders_list = 	[
+		SamplingShader(5.0),
+		ConstantThicknessShader(3.0), 
+		ConstantColorShader(0.7,0.7,0.7)
+		]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/extern/freestyle/style_modules/japanese_bigbrush.py b/extern/freestyle/style_modules/japanese_bigbrush.py
new file mode 100755
index 00000000000..e0985497e2c
--- /dev/null
+++ b/extern/freestyle/style_modules/japanese_bigbrush.py
@@ -0,0 +1,59 @@
+#
+#  Filename : japanese_bigbrush.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Simulates a big brush fr oriental painting
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Freestyle import *
+from logical_operators import *
+from PredicatesU1D import *
+from PredicatesB1D import *
+from Functions0D import *
+from shaders import *
+
+
+Operators.select(QuantitativeInvisibilityUP1D(0))
+Operators.bidirectionalChain(ChainSilhouetteIterator(),NotUP1D(QuantitativeInvisibilityUP1D(0)))
+## Splits strokes at points of highest 2D curavture 
+## when there are too many abrupt turns in it
+func = pyInverseCurvature2DAngleF0D()
+Operators.recursiveSplit(func,  pyParameterUP0D(0.2,0.8), NotUP1D(pyHigherNumberOfTurnsUP1D(3, 0.5)), 2)
+## Keeps only long enough strokes
+Operators.select(pyHigherLengthUP1D(100))
+## Sorts so as to draw the longest strokes first
+## (this will be done using the causal density)
+Operators.sort(pyLengthBP1D())
+shaders_list = 	[
+		pySamplingShader(10),
+		BezierCurveShader(30),
+		SamplingShader(50),
+		pyNonLinearVaryingThicknessShader(4,25, 0.6),
+		TextureAssignerShader(6),
+		ConstantColorShader(0.2, 0.2, 0.2,1.0),
+		TipRemoverShader(10)
+		]
+## Use the causal density to avoid cluttering
+Operators.create(pyDensityUP1D(8,0.4, MEAN), shaders_list)
+
+
diff --git a/extern/freestyle/style_modules/logical_operators.py b/extern/freestyle/style_modules/logical_operators.py
new file mode 100755
index 00000000000..63a0a9f9ed8
--- /dev/null
+++ b/extern/freestyle/style_modules/logical_operators.py
@@ -0,0 +1,36 @@
+from Freestyle import *
+
+class AndUP1D(UnaryPredicate1D):
+    def __init__(self, pred1, pred2):
+        UnaryPredicate1D.__init__(self)
+        self.__pred1 = pred1
+        self.__pred2 = pred2
+
+    def getName(self):
+        return "AndUP1D"
+
+    def __call__(self, inter):
+        return self.__pred1(inter) and self.__pred2(inter)
+    
+class OrUP1D(UnaryPredicate1D):
+    def __init__(self, pred1, pred2):
+        UnaryPredicate1D.__init__(self)
+        self.__pred1 = pred1
+        self.__pred2 = pred2
+
+    def getName(self):
+        return "OrUP1D"
+
+    def __call__(self, inter):
+        return self.__pred1(inter) or self.__pred2(inter)
+
+class NotUP1D(UnaryPredicate1D):
+	def __init__(self, pred):
+		UnaryPredicate1D.__init__(self)
+		self.__pred = pred
+
+	def getName(self):
+ 		return "NotUP1D"
+
+	def __call__(self, inter):
+		return self.__pred(inter) == 0
diff --git a/extern/freestyle/style_modules/long_anisotropically_dense.py b/extern/freestyle/style_modules/long_anisotropically_dense.py
new file mode 100755
index 00000000000..4bfeedf257f
--- /dev/null
+++ b/extern/freestyle/style_modules/long_anisotropically_dense.py
@@ -0,0 +1,81 @@
+#
+#  Filename : long_anisotropically_dense.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Selects the lines that are long and have a high anisotropic 
+#             a priori density and uses causal density 
+#             to draw without cluttering. Ideally, half of the
+#             selected lines are culled using the causal density.
+#
+#             ********************* WARNING *************************************
+#             ******** The Directional a priori density maps must          ****** 
+#             ******** have been computed prior to using this style module ******
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Freestyle import *
+from logical_operators import *
+from PredicatesU1D import *
+from PredicatesU0D import *
+from PredicatesB1D import *
+from Functions0D import *
+from Functions1D import *
+from shaders import *
+
+## custom density predicate
+class pyDensityUP1D(UnaryPredicate1D):
+	def __init__(self,wsize,threshold, integration = MEAN, sampling=2.0):
+ 		UnaryPredicate1D.__init__(self)
+		self._wsize = wsize
+		self._threshold = threshold
+		self._integration = integration
+		self._func = DensityF1D(self._wsize, self._integration, sampling)
+		self._func2 = DensityF1D(self._wsize, MAX, sampling)
+   
+	def getName(self):
+		return "pyDensityUP1D"
+
+	def __call__(self, inter):
+		c = self._func(inter)
+		m = self._func2(inter)
+		if(c < self._threshold):
+			return 1
+		if( m > 4* c ):
+			if ( c < 1.5*self._threshold ):
+				return 1
+		return 0
+
+Operators.select(QuantitativeInvisibilityUP1D(0))
+Operators.bidirectionalChain(ChainSilhouetteIterator(),NotUP1D(QuantitativeInvisibilityUP1D(0)))
+Operators.select(pyHigherLengthUP1D(40))
+## selects lines having a high anisotropic a priori density
+Operators.select(pyHighDensityAnisotropyUP1D(0.3,4))
+Operators.sort(pyLengthBP1D())
+shaders_list =  [
+	SamplingShader(2.0),
+	ConstantThicknessShader(2),
+	ConstantColorShader(0.2,0.2,0.25,1), 
+			]
+## uniform culling
+Operators.create(pyDensityUP1D(3.0,2.0e-2, MEAN, 0.1), shaders_list)
+
+ 
diff --git a/extern/freestyle/style_modules/multiple_parameterization.py b/extern/freestyle/style_modules/multiple_parameterization.py
new file mode 100755
index 00000000000..ff04c5930c5
--- /dev/null
+++ b/extern/freestyle/style_modules/multiple_parameterization.py
@@ -0,0 +1,51 @@
+#
+#  Filename : multiple_parameterization.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : The thickness and the color of the strokes vary continuously 
+#             independently from occlusions although only
+#             visible lines are actually drawn. This is equivalent
+#             to assigning the thickness using a parameterization covering
+#             the complete silhouette (visible+invisible) and drawing
+#             the strokes using a second parameterization that only
+#             covers the visible portions.
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Freestyle import *
+from logical_operators import *
+from ChainingIterators import *
+from shaders import *
+
+Operators.select(QuantitativeInvisibilityUP1D(0))
+## Chain following the same nature, but without the restriction
+## of staying inside the selection (0).
+Operators.bidirectionalChain(ChainSilhouetteIterator(0))
+shaders_list = 	[
+		SamplingShader(20),
+		IncreasingThicknessShader(1.5, 30), 
+		ConstantColorShader(0.0,0.0,0.0),
+		IncreasingColorShader(1,0,0,1,0,1,0,1),
+		TextureAssignerShader(-1),
+		pyHLRShader() ## this shader draws only visible portions
+		]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/extern/freestyle/style_modules/nature.py b/extern/freestyle/style_modules/nature.py
new file mode 100755
index 00000000000..8cfd480ba3b
--- /dev/null
+++ b/extern/freestyle/style_modules/nature.py
@@ -0,0 +1,43 @@
+#
+#  Filename : nature.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Uses the NatureUP1D predicate to select the lines
+#             of a given type (among SILHOUETTE, CREASE, SUGGESTIVE_CONTOURS,
+#             BORDERS).
+#             The suggestive contours must have been enabled in the 
+#             options dialog to appear in the View Map.
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Freestyle import *
+from logical_operators import *
+from PredicatesB1D import *
+from shaders import *
+
+Operators.select(pyNatureUP1D(SILHOUETTE))
+Operators.bidirectionalChain(ChainSilhouetteIterator(),NotUP1D( pyNatureUP1D( SILHOUETTE) ) )
+shaders_list = 	[
+		IncreasingThicknessShader(3, 10), 
+		IncreasingColorShader(0.0,0.0,0.0, 1, 0.8,0,0,1)
+		]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/extern/freestyle/style_modules/near_lines.py b/extern/freestyle/style_modules/near_lines.py
new file mode 100755
index 00000000000..b132f6b5802
--- /dev/null
+++ b/extern/freestyle/style_modules/near_lines.py
@@ -0,0 +1,44 @@
+#
+#  Filename : near_lines.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Draws the lines that are "closer" than a threshold 
+#             (between 0 and 1)
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+
+from Freestyle import *
+from logical_operators import *
+from PredicatesB1D import *
+from PredicatesU1D import *
+from shaders import *
+
+upred = AndUP1D(QuantitativeInvisibilityUP1D(0), pyZSmallerUP1D(0.5, MEAN)) 
+Operators.select(upred)
+Operators.bidirectionalChain(ChainSilhouetteIterator(), NotUP1D(upred))
+shaders_list = 	[
+		TextureAssignerShader(-1),
+		ConstantThicknessShader(5), 
+		ConstantColorShader(0.0, 0.0, 0.0)
+		]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/extern/freestyle/style_modules/occluded_by_specific_object.py b/extern/freestyle/style_modules/occluded_by_specific_object.py
new file mode 100755
index 00000000000..96f431c2c4e
--- /dev/null
+++ b/extern/freestyle/style_modules/occluded_by_specific_object.py
@@ -0,0 +1,45 @@
+#
+#  Filename : occluded_by_specific_object.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Draws only the lines that are occluded by a given object
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Freestyle import *
+from logical_operators import *
+from PredicatesU1D import *
+from shaders import *
+
+## the id of the occluder (use SHIFT+click on the ViewMap to
+## retrieve ids)
+id = Id(3,0)
+upred = AndUP1D(NotUP1D(QuantitativeInvisibilityUP1D(0)),
+pyIsInOccludersListUP1D(id))
+Operators.select(upred)
+Operators.bidirectionalChain(ChainSilhouetteIterator(), NotUP1D(upred))
+shaders_list = 	[
+		SamplingShader(5),
+		ConstantThicknessShader(3), 
+		ConstantColorShader(0.3,0.3,0.3,1)
+		]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/extern/freestyle/style_modules/polygonalize.py b/extern/freestyle/style_modules/polygonalize.py
new file mode 100755
index 00000000000..81d47178404
--- /dev/null
+++ b/extern/freestyle/style_modules/polygonalize.py
@@ -0,0 +1,40 @@
+#
+#  Filename : polygonalize.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Make the strokes more "polygonal"
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+from Freestyle import *
+from logical_operators import *
+from ChainingIterators import *
+from shaders import *
+
+Operators.select(QuantitativeInvisibilityUP1D(0))
+Operators.bidirectionalChain(ChainSilhouetteIterator(),NotUP1D(QuantitativeInvisibilityUP1D(0)))
+shaders_list = 	[
+		SamplingShader(2.0),
+		ConstantThicknessShader(3), 
+		ConstantColorShader(0.0,0.0,0.0),
+		PolygonalizationShader(8)
+		]
+Operators.create(TrueUP1D(), shaders_list)
\ No newline at end of file
diff --git a/extern/freestyle/style_modules/qi0.py b/extern/freestyle/style_modules/qi0.py
new file mode 100755
index 00000000000..f742b777738
--- /dev/null
+++ b/extern/freestyle/style_modules/qi0.py
@@ -0,0 +1,41 @@
+#
+#  Filename : qi0.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Draws the visible lines (chaining follows same nature lines)
+#             (most basic style module)
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Freestyle import *
+from logical_operators import *
+from ChainingIterators import *
+from shaders import *
+
+Operators.select(QuantitativeInvisibilityUP1D(0))
+Operators.bidirectionalChain(ChainSilhouetteIterator(), NotUP1D(QuantitativeInvisibilityUP1D(0)))
+shaders_list = 	[
+		SamplingShader(5.0),
+		ConstantThicknessShader(4.0), 
+		ConstantColorShader(0.0,0.0,0.0)
+		]
+Operators.create(TrueUP1D(), shaders_list)
\ No newline at end of file
diff --git a/extern/freestyle/style_modules/qi0_not_external_contour.py b/extern/freestyle/style_modules/qi0_not_external_contour.py
new file mode 100755
index 00000000000..047ab7e1a8e
--- /dev/null
+++ b/extern/freestyle/style_modules/qi0_not_external_contour.py
@@ -0,0 +1,43 @@
+#
+#  Filename : qi0_not_external_contour.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Draws the visible lines (chaining follows same nature lines)
+#             that do not belong to the external contour of the scene
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Freestyle import *
+from logical_operators import *
+
+upred = AndUP1D(QuantitativeInvisibilityUP1D(0), ExternalContourUP1D())
+Operators.select(upred)
+Operators.bidirectionalChain(ChainSilhouetteIterator(), NotUP1D(upred))
+shaders_list = 	[
+		SamplingShader(4),
+		SpatialNoiseShader(4, 150, 2, 1, 1), 
+		IncreasingThicknessShader(2, 5), 
+		BackboneStretcherShader(20),
+		IncreasingColorShader(1,0,0,1,0,1,0,1),
+		TextureAssignerShader(4)
+		]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/extern/freestyle/style_modules/qi1.py b/extern/freestyle/style_modules/qi1.py
new file mode 100755
index 00000000000..234d196f15e
--- /dev/null
+++ b/extern/freestyle/style_modules/qi1.py
@@ -0,0 +1,42 @@
+#
+#  Filename : qi1.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Draws lines hidden by one surface.
+#             *** Quantitative Invisibility must have been 
+#             enabled in the options dialog to use this style module ****
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Freestyle import *
+from logical_operators import *
+from PredicatesB1D import *
+from shaders import *
+
+Operators.select(QuantitativeInvisibilityUP1D(1))
+Operators.bidirectionalChain(ChainSilhouetteIterator(), NotUP1D(QuantitativeInvisibilityUP1D(1)))
+shaders_list = 	[
+		SamplingShader(5.0),
+		ConstantThicknessShader(3), 
+		ConstantColorShader(0.5,0.5,0.5, 1)
+		]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/extern/freestyle/style_modules/qi2.py b/extern/freestyle/style_modules/qi2.py
new file mode 100755
index 00000000000..8e45914c619
--- /dev/null
+++ b/extern/freestyle/style_modules/qi2.py
@@ -0,0 +1,42 @@
+#
+#  Filename : qi2.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Draws lines hidden by two surfaces.
+#             *** Quantitative Invisibility must have been 
+#             enabled in the options dialog to use this style module ****
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Freestyle import *
+from logical_operators import *
+from PredicatesB1D import *
+from shaders import *
+
+Operators.select(QuantitativeInvisibilityUP1D(2))
+Operators.bidirectionalChain(ChainSilhouetteIterator(), NotUP1D(QuantitativeInvisibilityUP1D(2)))
+shaders_list = 	[
+		SamplingShader(10),
+		ConstantThicknessShader(1.5), 
+		ConstantColorShader(0.7,0.7,0.7, 1)
+		]
+Operators.create(TrueUP1D(), shaders_list)
\ No newline at end of file
diff --git a/extern/freestyle/style_modules/sequentialsplit_sketchy.py b/extern/freestyle/style_modules/sequentialsplit_sketchy.py
new file mode 100755
index 00000000000..b33cd5d4043
--- /dev/null
+++ b/extern/freestyle/style_modules/sequentialsplit_sketchy.py
@@ -0,0 +1,68 @@
+#
+#  Filename : sequentialsplit_sketchy.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Use the sequential split with two different
+#             predicates to specify respectively the starting and
+#             the stopping extremities for strokes 
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Freestyle import *
+from logical_operators import *
+from PredicatesU1D import *
+from PredicatesU0D import *
+from Functions0D import *
+
+## Predicate to tell whether a TVertex
+## corresponds to a change from 0 to 1 or not.
+class pyBackTVertexUP0D(UnaryPredicate0D):
+	def __init__(self):
+		UnaryPredicate0D.__init__(self)
+		self._getQI = QuantitativeInvisibilityF0D()
+	def getName(self):
+		return "pyBackTVertexUP0D"
+	def __call__(self, iter):
+		v = iter.getObject()
+		nat = v.getNature()
+		if(nat & T_VERTEX == 0):
+			return 0
+		if(self._getQI(iter) != 0):
+			return 1
+		return 0
+
+
+upred = QuantitativeInvisibilityUP1D(0)
+Operators.select(upred)
+Operators.bidirectionalChain(ChainSilhouetteIterator(), NotUP1D(upred))
+## starting and stopping predicates:
+start = pyVertexNatureUP0D(NON_T_VERTEX)
+stop = pyBackTVertexUP0D()
+Operators.sequentialSplit(start, stop, 10)
+shaders_list = [
+		SpatialNoiseShader(7, 120, 2, 1, 1), 
+		IncreasingThicknessShader(5, 8), 
+		ConstantColorShader(0.2, 0.2, 0.2, 1), 
+		TextureAssignerShader(4)
+		]
+Operators.create(TrueUP1D(), shaders_list)
+
diff --git a/extern/freestyle/style_modules/shaders.py b/extern/freestyle/style_modules/shaders.py
new file mode 100755
index 00000000000..17ad31961d5
--- /dev/null
+++ b/extern/freestyle/style_modules/shaders.py
@@ -0,0 +1,1288 @@
+from Freestyle import *
+from PredicatesU0D import *
+from PredicatesB1D import *
+from PredicatesU1D import *
+from logical_operators import *
+from ChainingIterators import *
+from random import *
+from math import *
+from vector import *
+
+## thickness modifiers
+######################
+
+class pyDepthDiscontinuityThicknessShader(StrokeShader):
+	def __init__(self, min, max):
+		StrokeShader.__init__(self)
+		self.__min = float(min)
+		self.__max = float(max)
+		self.__func = ZDiscontinuityF0D()
+	def getName(self):
+		return "pyDepthDiscontinuityThicknessShader"
+	def shade(self, stroke):
+		it = stroke.strokeVerticesBegin()
+		z_min=0.0
+		z_max=1.0
+		a = (self.__max - self.__min)/(z_max-z_min)
+		b = (self.__min*z_max-self.__max*z_min)/(z_max-z_min)
+		it = stroke.strokeVerticesBegin()
+		while it.isEnd() == 0:
+			z = self.__func(it.castToInterface0DIterator())
+			thickness = a*z+b
+			it.getObject().attribute().setThickness(thickness, thickness)
+			it.increment()
+
+class pyConstantThicknessShader(StrokeShader):
+	def __init__(self, thickness):
+		StrokeShader.__init__(self)
+		self._thickness = thickness
+
+	def getName(self):
+		return "pyConstantThicknessShader"
+	def shade(self, stroke):
+		it = stroke.strokeVerticesBegin()
+		it_end = stroke.strokeVerticesEnd()
+		while it.isEnd() == 0:
+			att = it.getObject().attribute()
+			t = self._thickness/2.0
+			att.setThickness(t, t)
+			it.increment()
+
+class pyFXSThicknessShader(StrokeShader):
+	def __init__(self, thickness):
+		StrokeShader.__init__(self)
+		self._thickness = thickness
+
+	def getName(self):
+		return "pyFXSThicknessShader"
+	def shade(self, stroke):
+		it = stroke.strokeVerticesBegin()
+		it_end = stroke.strokeVerticesEnd()
+		while it.isEnd() == 0:
+			att = it.getObject().attribute()
+			t = self._thickness/2.0
+			att.setThickness(t, t)
+			it.increment()
+
+class pyFXSVaryingThicknessWithDensityShader(StrokeShader):
+	def __init__(self, wsize, threshold_min, threshold_max, thicknessMin, thicknessMax):
+		StrokeShader.__init__(self)
+		self.wsize= wsize
+		self.threshold_min= threshold_min
+		self.threshold_max= threshold_max
+		self._thicknessMin = thicknessMin
+		self._thicknessMax = thicknessMax
+
+	def getName(self):
+		return "pyVaryingThicknessWithDensityShader"
+	def shade(self, stroke):
+		n = stroke.strokeVerticesSize()
+		i = 0
+		it = stroke.strokeVerticesBegin()
+		it_end = stroke.strokeVerticesEnd()
+		func = DensityF0D(self.wsize)
+		while it.isEnd() == 0:
+			att = it.getObject().attribute()
+			toto = it.castToInterface0DIterator()
+			c= func(toto)
+			if (c < self.threshold_min ):
+				c = self.threshold_min
+			if (c > self.threshold_max ):
+				c = self.threshold_max
+##			t = (c - self.threshold_min)/(self.threshold_max - self.threshold_min)*(self._thicknessMax-self._thicknessMin) + self._thicknessMin
+			t = (self.threshold_max - c  )/(self.threshold_max - self.threshold_min)*(self._thicknessMax-self._thicknessMin) + self._thicknessMin
+			att.setThickness(t/2.0, t/2.0)
+			i = i+1
+			it.increment()
+class pyIncreasingThicknessShader(StrokeShader):
+	def __init__(self, thicknessMin, thicknessMax):
+		StrokeShader.__init__(self)
+		self._thicknessMin = thicknessMin
+		self._thicknessMax = thicknessMax
+
+	def getName(self):
+		return "pyIncreasingThicknessShader"
+	def shade(self, stroke):
+		n = stroke.strokeVerticesSize()
+		i = 0
+		it = stroke.strokeVerticesBegin()
+		it_end = stroke.strokeVerticesEnd()
+		while it.isEnd() == 0:
+			att = it.getObject().attribute()
+			c = float(i)/float(n)
+			if(i < float(n)/2.0):
+				t = (1.0 - c)*self._thicknessMin + c * self._thicknessMax
+			else:
+				t = (1.0 - c)*self._thicknessMax + c * self._thicknessMin
+			att.setThickness(t/2.0, t/2.0)
+			i = i+1
+			it.increment()
+
+class pyConstrainedIncreasingThicknessShader(StrokeShader):
+	def __init__(self, thicknessMin, thicknessMax, ratio):
+		StrokeShader.__init__(self)
+		self._thicknessMin = thicknessMin
+		self._thicknessMax = thicknessMax
+		self._ratio = ratio
+
+	def getName(self):
+		return "pyConstrainedIncreasingThicknessShader"
+	def shade(self, stroke):
+		slength = stroke.getLength2D()
+		tmp = self._ratio*slength
+		maxT = 0.0
+		if(tmp < self._thicknessMax):
+			maxT = tmp
+		else:
+			maxT = self._thicknessMax
+		n = stroke.strokeVerticesSize()
+		i = 0
+		it = stroke.strokeVerticesBegin()
+		it_end = stroke.strokeVerticesEnd()
+		while it.isEnd() == 0:
+			att = it.getObject().attribute()
+			c = float(i)/float(n)
+			if(i < float(n)/2.0):
+				t = (1.0 - c)*self._thicknessMin + c * maxT
+			else:
+				t = (1.0 - c)*maxT + c * self._thicknessMin
+			att.setThickness(t/2.0, t/2.0)
+			if(i == n-1):
+				att.setThickness(self._thicknessMin/2.0, self._thicknessMin/2.0)
+			i = i+1
+			it.increment()
+
+class pyDecreasingThicknessShader(StrokeShader):
+	def __init__(self, thicknessMax, thicknessMin):
+		StrokeShader.__init__(self)
+		self._thicknessMin = thicknessMin
+		self._thicknessMax = thicknessMax
+
+	def getName(self):
+		return "pyDecreasingThicknessShader"
+	def shade(self, stroke):
+		l = stroke.getLength2D()
+		tMax = self._thicknessMax
+		if(self._thicknessMax > 0.33*l):
+			tMax = 0.33*l
+		tMin = self._thicknessMin
+		if(self._thicknessMin > 0.1*l):
+			tMin = 0.1*l
+		n = stroke.strokeVerticesSize()
+		i = 0
+		it = stroke.strokeVerticesBegin()
+		it_end = stroke.strokeVerticesEnd()
+		while it.isEnd() == 0:
+			att = it.getObject().attribute()
+			c = float(i)/float(n)
+			t = (1.0 - c)*tMax +c*tMin
+			att.setThickness(t/2.0, t/2.0)
+			i = i+1
+			it.increment()
+
+def smoothC( a, exp ):
+	c = pow(float(a),exp)*pow(2.0,exp)
+	return c
+
+class pyNonLinearVaryingThicknessShader(StrokeShader):
+	def __init__(self, thicknessExtremity, thicknessMiddle, exponent):
+		StrokeShader.__init__(self)
+		self._thicknessMin = thicknessMiddle
+		self._thicknessMax = thicknessExtremity
+		self._exponent = exponent
+
+	def getName(self):
+		return "pyNonLinearVaryingThicknessShader"
+	def shade(self, stroke):
+		n = stroke.strokeVerticesSize()
+		i = 0
+		it = stroke.strokeVerticesBegin()
+		it_end = stroke.strokeVerticesEnd()
+		while it.isEnd() == 0:
+			att = it.getObject().attribute()
+			if(i < float(n)/2.0):
+				c = float(i)/float(n)
+			else:
+				c = float(n-i)/float(n)
+			c = smoothC(c, self._exponent)
+			t = (1.0 - c)*self._thicknessMax + c * self._thicknessMin
+			att.setThickness(t/2.0, t/2.0)
+			i = i+1
+			it.increment()
+
+## Spherical linear interpolation (cos)
+class pySLERPThicknessShader(StrokeShader):
+	def __init__(self, thicknessMin, thicknessMax, omega=1.2):
+		StrokeShader.__init__(self)
+		self._thicknessMin = thicknessMin
+		self._thicknessMax = thicknessMax
+		self._omega = omega
+
+	def getName(self):
+		return "pySLERPThicknessShader"
+	def shade(self, stroke):
+		slength = stroke.getLength2D()
+		tmp = 0.33*slength
+		maxT = self._thicknessMax
+		if(tmp < self._thicknessMax):
+			maxT = tmp
+		
+		n = stroke.strokeVerticesSize()
+		i = 0
+		it = stroke.strokeVerticesBegin()
+		it_end = stroke.strokeVerticesEnd()
+		while it.isEnd() == 0:
+			att = it.getObject().attribute()
+			c = float(i)/float(n)
+			if(i < float(n)/2.0):
+				t = sin((1-c)*self._omega)/sinh(self._omega)*self._thicknessMin + sin(c*self._omega)/sinh(self._omega) * maxT
+			else:
+				t = sin((1-c)*self._omega)/sinh(self._omega)*maxT + sin(c*self._omega)/sinh(self._omega) * self._thicknessMin
+			att.setThickness(t/2.0, t/2.0)
+			i = i+1
+			it.increment()
+
+class pyTVertexThickenerShader(StrokeShader): ## FIXME
+	def __init__(self, a=1.5, n=3):
+		StrokeShader.__init__(self)
+		self._a = a
+		self._n = n
+
+	def getName(self):
+		return "pyTVertexThickenerShader"
+
+	def shade(self, stroke):
+		it = stroke.strokeVerticesBegin()
+		predTVertex = pyVertexNatureUP0D(T_VERTEX)
+		while it.isEnd() == 0:
+			if(predTVertex(it) == 1):
+				it2 = StrokeVertexIterator(it)
+				it2.increment()
+				if not(it.isBegin() or it2.isEnd()):
+					it.increment()
+					continue
+				n = self._n
+				a = self._a
+				if(it.isBegin()):
+					it3 = StrokeVertexIterator(it)
+					count = 0
+					while (it3.isEnd() == 0 and count < n):
+						att = it3.getObject().attribute()
+						tr = att.getThicknessR();
+						tl = att.getThicknessL();
+						r = (a-1.0)/float(n-1)*(float(n)/float(count+1) - 1) + 1
+						#r = (1.0-a)/float(n-1)*count + a
+						att.setThickness(r*tr, r*tl)	
+						it3.increment()
+						count = count + 1
+				if(it2.isEnd()):
+					it4 = StrokeVertexIterator(it)
+					count = 0
+					while (it4.isBegin() == 0 and count < n):
+						att = it4.getObject().attribute()
+						tr = att.getThicknessR();
+						tl = att.getThicknessL();
+						r = (a-1.0)/float(n-1)*(float(n)/float(count+1) - 1) + 1
+						#r = (1.0-a)/float(n-1)*count + a
+						att.setThickness(r*tr, r*tl)	
+						it4.decrement()
+						count = count + 1
+					if ((it4.isBegin() == 1)):
+						att = it4.getObject().attribute()
+						tr = att.getThicknessR();
+						tl = att.getThicknessL();
+						r = (a-1.0)/float(n-1)*(float(n)/float(count+1) - 1) + 1
+						#r = (1.0-a)/float(n-1)*count + a
+						att.setThickness(r*tr, r*tl)	
+			it.increment()
+
+class pyImportance2DThicknessShader(StrokeShader):
+	def __init__(self, x, y, w, kmin, kmax):
+		StrokeShader.__init__(self)
+		self._x = x
+		self._y = y
+		self._w = float(w)
+		self._kmin = float(kmin)
+		self._kmax = float(kmax)
+
+	def getName(self):
+		return "pyImportanceThicknessShader"
+	def shade(self, stroke):
+		origin = Vec2(self._x, self._y)
+		it = stroke.strokeVerticesBegin()
+		while it.isEnd() == 0:
+			v = it.getObject()
+			p = Vec2(v.getProjectedX(), v.getProjectedY())
+			d = (p-origin).length()
+			if(d>self._w):
+				k = self._kmin
+			else:
+				k = (self._kmax*(self._w-d) + self._kmin*d)/self._w
+			att = v.attribute()
+			tr = att.getThicknessR()
+			tl = att.getThicknessL()
+			att.setThickness(k*tr/2.0, k*tl/2.0)
+			it.increment()
+
+class pyImportance3DThicknessShader(StrokeShader):
+	def __init__(self, x, y, z, w, kmin, kmax):
+		StrokeShader.__init__(self)
+		self._x = x
+		self._y = y
+		self._z = z
+		self._w = float(w)
+		self._kmin = float(kmin)
+		self._kmax = float(kmax)
+
+	def getName(self):
+		return "pyImportance3DThicknessShader"
+	def shade(self, stroke):
+		origin = Vec3(self._x, self._y, self._z)
+		it = stroke.strokeVerticesBegin()
+		while it.isEnd() == 0:
+			v = it.getObject()
+			p = Vec3(v.getX(), v.getY(), v.getZ())
+			d = (p-origin).length()
+			if(d>self._w):
+				k = self._kmin
+			else:
+				k = (self._kmax*(self._w-d) + self._kmin*d)/self._w
+			att = v.attribute()
+			tr = att.getThicknessR()
+			tl = att.getThicknessL()
+			att.setThickness(k*tr/2.0, k*tl/2.0)
+			it.increment()
+
+class pyZDependingThicknessShader(StrokeShader):
+	def __init__(self, min, max):
+		StrokeShader.__init__(self)
+		self.__min = min
+		self.__max = max
+		self.__func = GetProjectedZF0D()
+	def getName(self):
+		return "pyZDependingThicknessShader"
+	def shade(self, stroke):
+		it = stroke.strokeVerticesBegin()
+		z_min = 1
+		z_max = 0
+		while it.isEnd() == 0:
+			z = self.__func(it.castToInterface0DIterator())
+			if z < z_min:
+				z_min = z
+			elif z > z_max:
+				z_max = z
+			it.increment()
+		z_diff = 1 / (z_max - z_min)
+		it = stroke.strokeVerticesBegin()
+		while it.isEnd() == 0:
+			z = (self.__func(it.castToInterface0DIterator()) - z_min) * z_diff
+			thickness = (1 - z) * self.__max + z * self.__min
+			it.getObject().attribute().setThickness(thickness, thickness)
+			it.increment()
+
+
+## color modifiers
+##################
+
+class pyConstantColorShader(StrokeShader):
+	def __init__(self,r,g,b, a = 1):
+		StrokeShader.__init__(self)
+		self._r = r
+		self._g = g
+		self._b = b
+		self._a = a
+	def getName(self):
+		return "pyConstantColorShader"
+	def shade(self, stroke):
+		it = stroke.strokeVerticesBegin()
+		it_end = stroke.strokeVerticesEnd()
+		while it.isEnd() == 0:
+			att = it.getObject().attribute()
+			att.setColor(self._r, self._g, self._b)
+			att.setAlpha(self._a)
+			it.increment()
+
+#c1->c2
+class pyIncreasingColorShader(StrokeShader):
+	def __init__(self,r1,g1,b1,a1, r2,g2,b2,a2):
+		StrokeShader.__init__(self)
+		self._c1 = [r1,g1,b1,a1]
+		self._c2 = [r2,g2,b2,a2]
+	def getName(self):
+		return "pyIncreasingColorShader"
+	def shade(self, stroke):
+		n = stroke.strokeVerticesSize() - 1
+		inc = 0
+		it = stroke.strokeVerticesBegin()
+		it_end = stroke.strokeVerticesEnd()
+		while it.isEnd() == 0:
+			att = it.getObject().attribute()
+			c = float(inc)/float(n)
+
+			att.setColor(  (1-c)*self._c1[0] + c*self._c2[0], 
+				      (1-c)*self._c1[1] + c*self._c2[1],
+			                    (1-c)*self._c1[2] + c*self._c2[2],)
+			att.setAlpha((1-c)*self._c1[3] + c*self._c2[3],)
+			inc = inc+1
+			it.increment()
+
+# c1->c2->c1
+class pyInterpolateColorShader(StrokeShader):
+	def __init__(self,r1,g1,b1,a1, r2,g2,b2,a2):
+		StrokeShader.__init__(self)
+		self._c1 = [r1,g1,b1,a1]
+		self._c2 = [r2,g2,b2,a2]
+	def getName(self):
+		return "pyInterpolateColorShader"
+	def shade(self, stroke):
+		n = stroke.strokeVerticesSize() - 1
+		inc = 0
+		it = stroke.strokeVerticesBegin()
+		it_end = stroke.strokeVerticesEnd()
+		while it.isEnd() == 0:
+			att = it.getObject().attribute()
+			u = float(inc)/float(n)
+			c = 1-2*(fabs(u-0.5))
+			att.setColor(  (1-c)*self._c1[0] + c*self._c2[0], 
+				      (1-c)*self._c1[1] + c*self._c2[1],
+			                    (1-c)*self._c1[2] + c*self._c2[2],)
+			att.setAlpha((1-c)*self._c1[3] + c*self._c2[3],)
+			inc = inc+1
+			it.increment()
+
+class pyMaterialColorShader(StrokeShader):
+	def __init__(self, threshold=50):
+		StrokeShader.__init__(self)
+		self._threshold = threshold
+
+	def getName(self):
+		return "pyMaterialColorShader"
+
+	def shade(self, stroke):
+		it = stroke.strokeVerticesBegin()
+		it_end = stroke.strokeVerticesEnd()
+		func = MaterialF0D()
+		xn = 0.312713
+		yn = 0.329016
+		Yn = 1.0
+		un = 4.* xn/ ( -2.*xn + 12.*yn + 3. )
+		vn= 9.* yn/ ( -2.*xn + 12.*yn +3. )	
+		while it.isEnd() == 0:
+			toto = it.castToInterface0DIterator()
+			mat = func(toto)
+			
+			r = mat.diffuseR()
+			g = mat.diffuseG()
+			b = mat.diffuseB()
+
+			X = 0.412453*r + 0.35758 *g + 0.180423*b
+			Y = 0.212671*r + 0.71516 *g + 0.072169*b
+			Z = 0.019334*r + 0.119193*g + 0.950227*b
+
+			if((X == 0) and (Y == 0) and (Z == 0)):
+				X = 0.01
+				Y = 0.01
+				Z = 0.01
+			u = 4.*X / (X + 15.*Y + 3.*Z)
+			v = 9.*Y / (X + 15.*Y + 3.*Z)
+			
+			L= 116. * math.pow((Y/Yn),(1./3.)) -16
+			U = 13. * L * (u - un)
+			V = 13. * L * (v - vn)
+			
+			if (L > self._threshold):
+				L = L/1.3
+				U = U+10
+			else:
+				L = L +2.5*(100-L)/5.
+				U = U/3.0
+				V = V/3.0				
+			u = U / (13. * L) + un
+			v = V / (13. * L) + vn
+			
+			Y = Yn * math.pow( ((L+16.)/116.), 3.)
+			X = -9. * Y * u / ((u - 4.)* v - u * v)
+			Z = (9. * Y - 15*v*Y - v*X) /( 3. * v)
+			
+			r = 3.240479 * X - 1.53715 * Y - 0.498535 * Z
+			g = -0.969256 * X + 1.875991 * Y + 0.041556 * Z
+			b = 0.055648 * X - 0.204043 * Y + 1.057311 * Z
+
+			att = it.getObject().attribute()
+			att.setColor(r, g, b)
+			it.increment()
+
+class pyRandomColorShader(StrokeShader):
+	def getName(self):
+		return "pyRandomColorShader"
+	def __init__(self, s=1):
+		StrokeShader.__init__(self)
+		seed(s)
+	def shade(self, stroke):
+		## pick a random color
+		c0 = float(uniform(15,75))/100.0
+		c1 = float(uniform(15,75))/100.0
+		c2 = float(uniform(15,75))/100.0
+		print c0, c1, c2
+		it = stroke.strokeVerticesBegin()
+		while(it.isEnd() == 0):
+			it.getObject().attribute().setColor(c0,c1,c2)
+			it.increment()
+
+class py2DCurvatureColorShader(StrokeShader):
+	def getName(self):
+		return "py2DCurvatureColorShader"
+
+	def shade(self, stroke):
+		it = stroke.strokeVerticesBegin()
+		it_end = stroke.strokeVerticesEnd()
+		func = Curvature2DAngleF0D()
+		while it.isEnd() == 0:
+			toto = it.castToInterface0DIterator()
+			sv = it.getObject()
+			att = sv.attribute()
+			c = func(toto)
+			if (c<0):
+ 				print "negative 2D curvature"
+			color = 10.0 * c/3.1415
+			print color
+			att.setColor(color,color,color);
+			it.increment()
+
+class pyTimeColorShader(StrokeShader):
+	def __init__(self, step=0.01):
+		StrokeShader.__init__(self)
+		self._t = 0
+		self._step = step
+	def shade(self, stroke):
+		c = self._t*1.0
+		it = stroke.strokeVerticesBegin()
+		it_end = stroke.strokeVerticesEnd()
+		while it.isEnd() == 0:
+			att = it.getObject().attribute()
+			att.setColor(c,c,c)
+			it.increment()
+		self._t = self._t+self._step
+
+## geometry modifiers
+
+class pySamplingShader(StrokeShader):
+	def __init__(self, sampling):
+		StrokeShader.__init__(self)
+		self._sampling = sampling
+	def getName(self):
+		return "pySamplingShader"
+	def shade(self, stroke):
+		stroke.Resample(float(self._sampling)) 
+
+class pyBackboneStretcherShader(StrokeShader):
+	def __init__(self, l):
+		StrokeShader.__init__(self)
+		self._l = l
+	def getName(self):
+		return "pyBackboneStretcherShader"
+	def shade(self, stroke):
+		it0 = stroke.strokeVerticesBegin()
+		it1 = StrokeVertexIterator(it0)
+		it1.increment()
+		itn = stroke.strokeVerticesEnd()
+		itn.decrement()
+		itn_1 = StrokeVertexIterator(itn)
+		itn_1.decrement()
+		v0 = it0.getObject()
+		v1 = it1.getObject()
+		vn_1 = itn_1.getObject()
+		vn = itn.getObject()
+		p0 = Vec2f(v0.getProjectedX(), v0.getProjectedY())
+		pn = Vec2f(vn.getProjectedX(), vn.getProjectedY())
+		p1 = Vec2f(v1.getProjectedX(), v1.getProjectedY())
+		pn_1 = Vec2f(vn_1.getProjectedX(), vn_1.getProjectedY())
+		d1 = p0-p1
+		d1 = d1/d1.norm()
+		dn = pn-pn_1
+		dn = dn/dn.norm()
+		newFirst = p0+d1*float(self._l)
+		newLast = pn+dn*float(self._l)
+		v0.SetPoint(newFirst)
+		vn.SetPoint(newLast)
+		
+class pyLengthDependingBackboneStretcherShader(StrokeShader):
+	def __init__(self, l):
+		StrokeShader.__init__(self)
+		self._l = l
+	def getName(self):
+		return "pyBackboneStretcherShader"
+	def shade(self, stroke):
+		l = stroke.getLength2D()
+		stretch = self._l*l 
+		it0 = stroke.strokeVerticesBegin()
+		it1 = StrokeVertexIterator(it0)
+		it1.increment()
+		itn = stroke.strokeVerticesEnd()
+		itn.decrement()
+		itn_1 = StrokeVertexIterator(itn)
+		itn_1.decrement()
+		v0 = it0.getObject()
+		v1 = it1.getObject()
+		vn_1 = itn_1.getObject()
+		vn = itn.getObject()
+		p0 = Vec2f(v0.getProjectedX(), v0.getProjectedY())
+		pn = Vec2f(vn.getProjectedX(), vn.getProjectedY())
+		p1 = Vec2f(v1.getProjectedX(), v1.getProjectedY())
+		pn_1 = Vec2f(vn_1.getProjectedX(), vn_1.getProjectedY())
+		d1 = p0-p1
+		d1 = d1/d1.norm()
+		dn = pn-pn_1
+		dn = dn/dn.norm()
+		newFirst = p0+d1*float(stretch)
+		newLast = pn+dn*float(stretch)
+		v0.SetPoint(newFirst)
+		vn.SetPoint(newLast)
+
+
+## Shader to replace a stroke by its corresponding tangent
+class pyGuidingLineShader(StrokeShader):
+	def getName(self):
+		return "pyGuidingLineShader"
+	## shading method
+	def shade(self, stroke):
+		it = stroke.strokeVerticesBegin() 	## get the first vertex
+		itlast = stroke.strokeVerticesEnd() 	## 
+		itlast.decrement()			## get the last one
+		t = itlast.getObject().getPoint() - it.getObject().getPoint()	## tangent direction
+		itmiddle = StrokeVertexIterator(it)	## 
+		while(itmiddle.getObject().u()<0.5):	## look for the stroke middle vertex
+			itmiddle.increment()		##
+		it = StrokeVertexIterator(itmiddle)	
+		it.increment()
+		while(it.isEnd() == 0):			## position all the vertices along the tangent for the right part
+			it.getObject().SetPoint(itmiddle.getObject().getPoint() \
+			+t*(it.getObject().u()-itmiddle.getObject().u()))
+			it.increment()
+		it = StrokeVertexIterator(itmiddle)
+		it.decrement()
+		while(it.isBegin() == 0):		## position all the vertices along the tangent for the left part
+			it.getObject().SetPoint(itmiddle.getObject().getPoint() \
+			-t*(itmiddle.getObject().u()-it.getObject().u()))
+			it.decrement()
+		it.getObject().SetPoint(itmiddle.getObject().getPoint()-t*(itmiddle.getObject().u())) ## first vertex
+
+
+class pyBackboneStretcherNoCuspShader(StrokeShader):
+	def __init__(self, l):
+		StrokeShader.__init__(self)
+		self._l = l
+	def getName(self):
+		return "pyBackboneStretcherNoCuspShader"
+	def shade(self, stroke):
+		it0 = stroke.strokeVerticesBegin()
+		it1 = StrokeVertexIterator(it0)
+		it1.increment()
+		itn = stroke.strokeVerticesEnd()
+		itn.decrement()
+		itn_1 = StrokeVertexIterator(itn)
+		itn_1.decrement()
+		v0 = it0.getObject()
+		v1 = it1.getObject()
+		if((v0.getNature() & CUSP == 0) and (v1.getNature() & CUSP == 0)):
+			p0 = v0.getPoint()
+			p1 = v1.getPoint()
+			d1 = p0-p1
+			d1 = d1/d1.norm()
+			newFirst = p0+d1*float(self._l)
+			v0.SetPoint(newFirst)
+		vn_1 = itn_1.getObject()
+		vn = itn.getObject()
+		if((vn.getNature() & CUSP == 0) and (vn_1.getNature() & CUSP == 0)):
+			pn = vn.getPoint()
+			pn_1 = vn_1.getPoint()
+			dn = pn-pn_1
+			dn = dn/dn.norm()
+			newLast = pn+dn*float(self._l)	
+			vn.SetPoint(newLast)
+
+normalInfo=Normal2DF0D()
+curvatureInfo=Curvature2DAngleF0D()
+
+def edgestopping(x, sigma): 
+	return exp(- x*x/(2*sigma*sigma))
+
+class pyDiffusion2Shader(StrokeShader):
+	def __init__(self, lambda1, nbIter):
+		StrokeShader.__init__(self)
+		self._lambda = lambda1
+		self._nbIter = nbIter
+		self._normalInfo = Normal2DF0D()
+		self._curvatureInfo = Curvature2DAngleF0D()
+	def getName(self):
+		return "pyDiffusionShader"
+	def shade(self, stroke):
+		for i in range (1, self._nbIter):
+			it = stroke.strokeVerticesBegin()
+			while it.isEnd() == 0:
+				v=it.getObject()
+				p1 = v.getPoint()
+				p2 = self._normalInfo(it.castToInterface0DIterator())*self._lambda*self._curvatureInfo(it.castToInterface0DIterator())
+				v.SetPoint(p1+p2)
+				it.increment()
+
+class pyTipRemoverShader(StrokeShader):
+	def __init__(self, l):
+		StrokeShader.__init__(self)
+		self._l = l
+	def getName(self):
+		return "pyTipRemoverShader"
+	def shade(self, stroke):
+		originalSize = stroke.strokeVerticesSize()
+		if(originalSize<4):
+			return
+		verticesToRemove = []
+		oldAttributes = []
+		it = stroke.strokeVerticesBegin()
+		while(it.isEnd() == 0):
+			v = it.getObject()
+			if((v.curvilinearAbscissa() < self._l) or (v.strokeLength()-v.curvilinearAbscissa() < self._l)):
+				verticesToRemove.append(v)
+			oldAttributes.append(StrokeAttribute(v.attribute()))
+			it.increment()
+		if(originalSize-len(verticesToRemove) < 2):
+			return
+		for sv in verticesToRemove:
+			stroke.RemoveVertex(sv)
+		stroke.Resample(originalSize)
+		if(stroke.strokeVerticesSize() != originalSize):
+			print "pyTipRemover: Warning: resampling problem"
+		it = stroke.strokeVerticesBegin()
+		for a in oldAttributes:
+			if(it.isEnd() == 1):
+				break
+			v = it.getObject()
+			v.SetAttribute(a)
+			it.increment()
+
+class pyTVertexRemoverShader(StrokeShader):
+	def getName(self):
+		return "pyTVertexRemoverShader"
+	def shade(self, stroke):
+		if(stroke.strokeVerticesSize() <= 3 ):
+			return
+ 		predTVertex = pyVertexNatureUP0D(T_VERTEX)
+		it = stroke.strokeVerticesBegin()
+		itlast = stroke.strokeVerticesEnd()
+		itlast.decrement()
+		if(predTVertex(it) == 1):
+ 			stroke.RemoveVertex(it.getObject())
+		if(predTVertex(itlast) == 1):
+ 			stroke.RemoveVertex(itlast.getObject())
+
+class pyExtremitiesOrientationShader(StrokeShader):
+	def __init__(self, x1,y1,x2=0,y2=0):
+		StrokeShader.__init__(self)
+		self._v1 = Vec2(x1,y1)
+		self._v2 = Vec2(x2,y2)
+	def getName(self):
+		return "pyExtremitiesOrientationShader"
+	def shade(self, stroke):
+		print self._v1.x(),self._v1.y()
+		stroke.SetBeginningOrientation(self._v1.x(),self._v1.y())
+		stroke.SetEndingOrientation(self._v2.x(),self._v2.y())
+
+class pyHLRShader(StrokeShader):
+	def getName(self):
+		return "pyHLRShader"
+	def shade(self, stroke):
+		originalSize = stroke.strokeVerticesSize()
+		if(originalSize<4):
+			return
+		it = stroke.strokeVerticesBegin()
+		invisible = 0
+		it2 = StrokeVertexIterator(it)
+		it2.increment()
+		fe = getFEdge(it.getObject(), it2.getObject())
+		if(fe.qi() != 0):
+			invisible = 1
+		while(it2.isEnd() == 0):
+			v = it.getObject()
+			vnext = it2.getObject()
+			if(v.getNature() & VIEW_VERTEX):
+				#if(v.getNature() & T_VERTEX):
+				fe = getFEdge(v,vnext)
+				qi = fe.qi()
+				if(qi != 0):
+					invisible = 1
+				else:
+					invisible = 0
+			if(invisible == 1):		
+				v.attribute().SetVisible(0)
+			it.increment()
+			it2.increment()
+
+class pyTVertexOrientationShader(StrokeShader):
+	def __init__(self):
+		StrokeShader.__init__(self)
+		self._Get2dDirection = Orientation2DF1D()
+	def getName(self):
+		return "pyTVertexOrientationShader"
+	## finds the TVertex orientation from the TVertex and 
+	## the previous or next edge
+	def findOrientation(self, tv, ve):
+		mateVE = tv.mate(ve)
+		if((ve.qi() != 0) or (mateVE.qi() != 0)):
+			ait = AdjacencyIterator(tv,1,0)
+			winner = None
+			incoming = 1
+			while(ait.isEnd() == 0):
+				ave = ait.getObject()
+				if((ave.getId() != ve.getId()) and (ave.getId() != mateVE.getId())):
+					winner = ait.getObject()
+					if(ait.isIncoming() == 0):
+						incoming = 0
+						break
+				ait.increment()
+			if(winner != None):
+				if(incoming != 0):
+					direction = self._Get2dDirection(winner.fedgeB())
+				else:
+					direction = self._Get2dDirection(winner.fedgeA())
+				return direction
+	def shade(self, stroke):
+		it = stroke.strokeVerticesBegin()
+		it2 = StrokeVertexIterator(it)
+		it2.increment()
+		## case where the first vertex is a TVertex
+		v = it.getObject() 
+		if(v.getNature() & T_VERTEX):
+			tv = v.castToTVertex()
+			ve = getFEdge(v, it2.getObject()).viewedge()
+			if(tv != None):			
+				dir = self.findOrientation(tv, ve)
+				#print dir.x(), dir.y()
+				v.attribute().setAttributeVec2f("orientation", dir)
+		while(it2.isEnd() == 0):
+			vprevious = it.getObject()
+			v = it2.getObject()
+			if(v.getNature() & T_VERTEX):
+				tv = v.castToTVertex()
+				ve = getFEdge(vprevious, v).viewedge()
+				if(tv != None):	
+					dir = self.findOrientation(tv, ve)
+					#print dir.x(), dir.y()
+					v.attribute().setAttributeVec2f("orientation", dir)			
+			it.increment()
+			it2.increment()
+		## case where the last vertex is a TVertex
+		v = it.getObject() 
+		if(v.getNature() & T_VERTEX):
+			itPrevious = StrokeVertexIterator(it)
+			itPrevious.decrement()
+			tv = v.castToTVertex()
+			ve = getFEdge(itPrevious.getObject(), v).viewedge()
+			if(tv != None):			
+				dir = self.findOrientation(tv, ve)
+				#print dir.x(), dir.y()
+				v.attribute().setAttributeVec2f("orientation", dir)
+
+class pySinusDisplacementShader(StrokeShader):
+	def __init__(self, f, a):
+		StrokeShader.__init__(self)
+		self._f = f
+		self._a = a
+		self._getNormal = Normal2DF0D()
+
+	def getName(self):
+		return "pySinusDisplacementShader"
+	def shade(self, stroke):
+		it = stroke.strokeVerticesBegin()
+		while it.isEnd() == 0:
+			v = it.getObject()
+			#print self._getNormal.getName()
+			n = self._getNormal(it.castToInterface0DIterator())
+			p = v.getPoint()
+			u = v.u()
+			a = self._a*(1-2*(fabs(u-0.5)))
+			n = n*a*cos(self._f*u*6.28)
+			#print n.x(), n.y()
+			v.SetPoint(p+n)
+			#v.SetPoint(v.getPoint()+n*a*cos(f*v.u()))
+			it.increment()
+
+class pyPerlinNoise1DShader(StrokeShader):
+	def __init__(self, freq = 10, amp = 10, oct = 4):
+		StrokeShader.__init__(self)
+		self.__noise = Noise()
+		self.__freq = freq
+		self.__amp = amp
+		self.__oct = oct
+	def getName(self):
+		return "pyPerlinNoise1DShader"
+	def shade(self, stroke):
+		i = randint(0, 50)
+		it = stroke.strokeVerticesBegin()
+		while it.isEnd() == 0:
+			v = it.getObject()
+			nres = self.__noise.turbulence1(i, self.__freq, self.__amp, self.__oct)
+			v.SetPoint(v.getProjectedX() + nres, v.getProjectedY() + nres)
+			i = i+1
+			it.increment()
+
+class pyPerlinNoise2DShader(StrokeShader):
+	def __init__(self, freq = 10, amp = 10, oct = 4):
+		StrokeShader.__init__(self)
+		self.__noise = Noise()
+		self.__freq = freq
+		self.__amp = amp
+		self.__oct = oct
+	def getName(self):
+		return "pyPerlinNoise2DShader"
+	def shade(self, stroke):
+		it = stroke.strokeVerticesBegin()
+		while it.isEnd() == 0:
+			v = it.getObject()
+			vec = Vec2f(v.getProjectedX(), v.getProjectedY())
+			nres = self.__noise.turbulence2(vec, self.__freq, self.__amp, self.__oct)
+			v.SetPoint(v.getProjectedX() + nres, v.getProjectedY() + nres)
+			it.increment()
+
+class pyBluePrintCirclesShader(StrokeShader):
+	def __init__(self, turns = 1):
+		StrokeShader.__init__(self)
+		self.__turns = turns
+	def getName(self):
+		return "pyBluePrintCirclesShader"
+	def shade(self, stroke):
+		p_min = Vec2f(10000, 10000)
+		p_max = Vec2f(0, 0)
+		it = stroke.strokeVerticesBegin()
+		while it.isEnd() == 0:
+			p = it.getObject().getPoint()
+			if (p.x() < p_min.x()):
+				p_min.setX(p.x())
+			if (p.x() > p_max.x()):
+				p_max.setX(p.x())
+			if (p.y() < p_min.y()):
+				p_min.setY(p.y())
+			if (p.y() > p_max.y()):
+				p_max.setY(p.y())
+			it.increment()
+		stroke.Resample(32 * self.__turns)
+		sv_nb = stroke.strokeVerticesSize()
+#		print "min  :", p_min.x(), p_min.y() # DEBUG
+#		print "mean :", p_sum.x(), p_sum.y() # DEBUG
+#		print "max  :", p_max.x(), p_max.y() # DEBUG
+#		print "----------------------" # DEBUG
+#######################################################	
+		sv_nb = sv_nb / self.__turns
+		center = (p_min + p_max) / 2
+		radius = (center.x() - p_min.x() + center.y() - p_min.y()) / 2
+		p_new = Vec2f()
+#######################################################
+		it = stroke.strokeVerticesBegin()
+		for j in range(self.__turns):
+			radius = radius + randint(-3, 3)
+			center_x = center.x() + randint(-5, 5)
+			center_y = center.y() + randint(-5, 5)
+			center.setX(center_x)
+			center.setY(center_y)
+			i = 0
+			while i < sv_nb:
+				p_new.setX(center.x() + radius * cos(2 * pi * float(i) / float(sv_nb - 1)))
+   				p_new.setY(center.y() + radius * sin(2 * pi * float(i) / float(sv_nb - 1)))
+				it.getObject().SetPoint(p_new.x(), p_new.y())
+				i = i + 1
+				it.increment()
+		while it.isEnd() == 0:
+			stroke.RemoveVertex(it.getObject())
+			it.increment()
+
+
+class pyBluePrintEllipsesShader(StrokeShader):
+	def __init__(self, turns = 1):
+		StrokeShader.__init__(self)
+		self.__turns = turns
+	def getName(self):
+		return "pyBluePrintEllipsesShader"
+	def shade(self, stroke):
+		p_min = Vec2f(10000, 10000)
+		p_max = Vec2f(0, 0)
+		it = stroke.strokeVerticesBegin()
+		while it.isEnd() == 0:
+			p = it.getObject().getPoint()
+			if (p.x() < p_min.x()):
+				p_min.setX(p.x())
+			if (p.x() > p_max.x()):
+				p_max.setX(p.x())
+			if (p.y() < p_min.y()):
+				p_min.setY(p.y())
+			if (p.y() > p_max.y()):
+				p_max.setY(p.y())
+			it.increment()
+		stroke.Resample(32 * self.__turns)
+		sv_nb = stroke.strokeVerticesSize()
+#		print "min  :", p_min.x(), p_min.y() # DEBUG
+#		print "mean :", p_sum.x(), p_sum.y() # DEBUG
+#		print "max  :", p_max.x(), p_max.y() # DEBUG
+#		print "----------------------" # DEBUG
+#######################################################	
+		sv_nb = sv_nb / self.__turns
+		center = (p_min + p_max) / 2
+		radius_x = center.x() - p_min.x()
+		radius_y = center.y() - p_min.y()
+		p_new = Vec2f()
+#######################################################
+		it = stroke.strokeVerticesBegin()
+		for j in range(self.__turns):
+			radius_x = radius_x + randint(-3, 3)
+			radius_y = radius_y + randint(-3, 3)
+			center_x = center.x() + randint(-5, 5)
+			center_y = center.y() + randint(-5, 5)
+			center.setX(center_x)
+			center.setY(center_y)
+			i = 0
+			while i < sv_nb:
+				p_new.setX(center.x() + radius_x * cos(2 * pi * float(i) / float(sv_nb - 1)))
+   				p_new.setY(center.y() + radius_y * sin(2 * pi * float(i) / float(sv_nb - 1)))
+				it.getObject().SetPoint(p_new.x(), p_new.y())
+				i = i + 1
+				it.increment()
+		while it.isEnd() == 0:
+			stroke.RemoveVertex(it.getObject())
+			it.increment()
+
+
+class pyBluePrintSquaresShader(StrokeShader):
+	def __init__(self, turns = 1, bb_len = 10):
+		StrokeShader.__init__(self)
+		self.__turns = turns
+		self.__bb_len = bb_len
+	def getName(self):
+		return "pyBluePrintSquaresShader"
+	def shade(self, stroke):
+		p_min = Vec2f(10000, 10000)
+		p_max = Vec2f(0, 0)
+		it = stroke.strokeVerticesBegin()
+		while it.isEnd() == 0:
+			p = it.getObject().getPoint()
+			if (p.x() < p_min.x()):
+				p_min.setX(p.x())
+			if (p.x() > p_max.x()):
+				p_max.setX(p.x())
+			if (p.y() < p_min.y()):
+				p_min.setY(p.y())
+			if (p.y() > p_max.y()):
+				p_max.setY(p.y())
+			it.increment()
+		stroke.Resample(32 * self.__turns)
+		sv_nb = stroke.strokeVerticesSize()
+#######################################################	
+		sv_nb = sv_nb / self.__turns
+		first = sv_nb / 4
+		second = 2 * first
+		third = 3 * first
+		fourth = sv_nb
+		vec_first = Vec2f(p_max.x() - p_min.x() + 2 * self.__bb_len, 0)
+		vec_second = Vec2f(0, p_max.y() - p_min.y() + 2 * self.__bb_len)
+		vec_third = vec_first * -1
+		vec_fourth = vec_second * -1
+		p_first = Vec2f(p_min.x() - self.__bb_len, p_min.y())
+		p_second = Vec2f(p_max.x(), p_min.y() - self.__bb_len)
+		p_third = Vec2f(p_max.x() + self.__bb_len, p_max.y())
+		p_fourth = Vec2f(p_min.x(), p_max.y() + self.__bb_len)
+#######################################################
+		it = stroke.strokeVerticesBegin()
+		visible = 1
+		for j in range(self.__turns):
+			i = 0
+			while i < sv_nb:
+				if i < first:
+					p_new = p_first + vec_first * float(i)/float(first - 1)
+					if i == first - 1:
+						visible = 0
+				elif i < second:
+					p_new = p_second + vec_second * float(i - first)/float(second - first - 1)
+					if i == second - 1:
+						visible = 0
+				elif i < third:
+					p_new = p_third + vec_third * float(i - second)/float(third - second - 1)
+					if i == third - 1:
+						visible = 0
+				else:
+					p_new = p_fourth + vec_fourth * float(i - third)/float(fourth - third - 1)
+					if i == fourth - 1:
+						visible = 0
+				it.getObject().SetPoint(p_new.x(), p_new.y())
+				it.getObject().attribute().SetVisible(visible)
+				if visible == 0:
+					visible = 1
+				i = i + 1
+				it.increment()
+		while it.isEnd() == 0:
+			stroke.RemoveVertex(it.getObject())
+			it.increment()
+
+
+class pyBluePrintDirectedSquaresShader(StrokeShader):
+	def __init__(self, turns = 1, bb_len = 10, mult = 1):
+		StrokeShader.__init__(self)
+		self.__mult = mult
+		self.__turns = turns
+		self.__bb_len = 1 + float(bb_len) / 100
+	def getName(self):
+		return "pyBluePrintDirectedSquaresShader"
+	def shade(self, stroke):
+		stroke.Resample(32 * self.__turns)
+		p_mean = Vec2f(0, 0)
+		p_min = Vec2f(10000, 10000)
+		p_max = Vec2f(0, 0)
+		it = stroke.strokeVerticesBegin()
+		while it.isEnd() == 0:
+			p = it.getObject().getPoint()
+			p_mean = p_mean + p
+## 			if (p.x() < p_min.x()):
+## 				p_min.setX(p.x())
+## 			if (p.x() > p_max.x()):
+## 				p_max.setX(p.x())
+## 			if (p.y() < p_min.y()):
+## 				p_min.setY(p.y())
+## 			if (p.y() > p_max.y()):
+## 				p_max.setY(p.y())
+			it.increment()
+		sv_nb = stroke.strokeVerticesSize()
+		p_mean = p_mean / sv_nb
+		p_var_xx = 0
+		p_var_yy = 0
+		p_var_xy = 0
+		it = stroke.strokeVerticesBegin()
+		while it.isEnd() == 0:
+			p = it.getObject().getPoint()
+			p_var_xx = p_var_xx + pow(p.x() - p_mean.x(), 2)
+			p_var_yy = p_var_yy + pow(p.y() - p_mean.y(), 2)
+			p_var_xy = p_var_xy + (p.x() - p_mean.x()) * (p.y() - p_mean.y())
+			it.increment()
+		p_var_xx = p_var_xx / sv_nb
+		p_var_yy = p_var_yy / sv_nb
+		p_var_xy = p_var_xy / sv_nb
+##		print p_var_xx, p_var_yy, p_var_xy
+		trace = p_var_xx + p_var_yy
+		det = p_var_xx * p_var_yy - p_var_xy * p_var_xy
+		sqrt_coeff = sqrt(trace * trace - 4 * det)
+		lambda1 = (trace + sqrt_coeff) / 2
+		lambda2 = (trace - sqrt_coeff) / 2
+##		print lambda1, lambda2
+		theta = atan(2 * p_var_xy / (p_var_xx - p_var_yy)) / 2
+##		print theta
+		if p_var_yy > p_var_xx:
+			e1 = Vec2f(cos(theta + pi / 2), sin(theta + pi / 2)) * sqrt(lambda1) * self.__mult
+			e2 = Vec2f(cos(theta + pi), sin(theta + pi)) *  sqrt(lambda2) * self.__mult
+		else:
+			e1 = Vec2f(cos(theta), sin(theta)) * sqrt(lambda1) * self.__mult
+			e2 = Vec2f(cos(theta + pi / 2), sin(theta + pi / 2)) * sqrt(lambda2) * self.__mult
+#######################################################	
+		sv_nb = sv_nb / self.__turns
+		first = sv_nb / 4
+		second = 2 * first
+		third = 3 * first
+		fourth = sv_nb
+		bb_len1 = self.__bb_len
+		bb_len2 = 1 + (bb_len1 - 1) * sqrt(lambda1 / lambda2)
+		p_first = p_mean - e1 - e2 * bb_len2
+		p_second = p_mean - e1 * bb_len1 + e2
+		p_third = p_mean + e1 + e2 * bb_len2
+		p_fourth = p_mean + e1 * bb_len1 - e2
+		vec_first = e2 * bb_len2 * 2
+		vec_second = e1 * bb_len1 * 2
+		vec_third = vec_first * -1
+		vec_fourth = vec_second * -1
+#######################################################
+		it = stroke.strokeVerticesBegin()
+		visible = 1
+		for j in range(self.__turns):
+			i = 0
+			while i < sv_nb:
+				if i < first:
+					p_new = p_first + vec_first * float(i)/float(first - 1)
+					if i == first - 1:
+						visible = 0
+				elif i < second:
+					p_new = p_second + vec_second * float(i - first)/float(second - first - 1)
+					if i == second - 1:
+						visible = 0
+				elif i < third:
+					p_new = p_third + vec_third * float(i - second)/float(third - second - 1)
+					if i == third - 1:
+						visible = 0
+				else:
+					p_new = p_fourth + vec_fourth * float(i - third)/float(fourth - third - 1)
+					if i == fourth - 1:
+						visible = 0
+				it.getObject().SetPoint(p_new.x(), p_new.y())
+				it.getObject().attribute().SetVisible(visible)
+				if visible == 0:
+					visible = 1
+				i = i + 1
+				it.increment()
+		while it.isEnd() == 0:
+			stroke.RemoveVertex(it.getObject())
+			it.increment()
+
+class pyModulateAlphaShader(StrokeShader):
+	def __init__(self, min = 0, max = 1):
+		StrokeShader.__init__(self)
+		self.__min = min
+		self.__max = max
+	def getName(self):
+		return "pyModulateAlphaShader"
+	def shade(self, stroke):
+		it = stroke.strokeVerticesBegin()
+		while it.isEnd() == 0:
+			alpha = it.getObject().attribute().getAlpha()
+			p = it.getObject().getPoint()
+			alpha = alpha * p.y() / 400
+			if alpha < self.__min:
+				alpha = self.__min
+			elif alpha > self.__max:
+				alpha = self.__max
+			it.getObject().attribute().setAlpha(alpha)
+			it.increment()
+
+
+## various
+class pyDummyShader(StrokeShader):
+	def getName(self):
+		return "pyDummyShader"
+	def shade(self, stroke):
+		it = stroke.strokeVerticesBegin()
+		it_end = stroke.strokeVerticesEnd()
+		while it.isEnd() == 0:
+			toto = it.castToInterface0DIterator()
+			att = it.getObject().attribute()
+			att.setColor(0.3, 0.4, 0.4)
+			att.setThickness(0, 5)
+			it.increment()
+
+class pyDebugShader(StrokeShader):
+	def getName(self):
+		return "pyDebugShader"
+
+ 	def shade(self, stroke):
+		fe = GetSelectedFEdgeCF()
+		id1=fe.vertexA().getId()
+		id2=fe.vertexB().getId()
+		#print id1.getFirst(), id1.getSecond()
+		#print id2.getFirst(), id2.getSecond()
+		it = stroke.strokeVerticesBegin()
+		found = 0
+		foundfirst = 0
+		foundsecond = 0
+		while it.isEnd() == 0:
+			cp = it.getObject()
+			if((cp.A().getId() == id1) or (cp.B().getId() == id1)):
+				foundfirst = 1
+			if((cp.A().getId() == id2) or (cp.B().getId() == id2)):
+				foundsecond = 1
+			if((foundfirst != 0) and (foundsecond != 0)):
+				found = 1
+				break
+			it.increment()
+		if(found != 0):
+			print "The selected Stroke id is: ", stroke.getId().getFirst(), stroke.getId().getSecond()
+
diff --git a/extern/freestyle/style_modules/sketchy_multiple_parameterization.py b/extern/freestyle/style_modules/sketchy_multiple_parameterization.py
new file mode 100755
index 00000000000..69e6f11751d
--- /dev/null
+++ b/extern/freestyle/style_modules/sketchy_multiple_parameterization.py
@@ -0,0 +1,48 @@
+#
+#  Filename : sketchy_multiple_parameterization.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Builds sketchy strokes whose topology relies on a 
+#             parameterization that covers the complete lines (visible+invisible)
+#             whereas only the visible portions are actually drawn
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Freestyle import *
+from logical_operators import *
+from ChainingIterators import *
+from shaders import *
+
+
+Operators.select(QuantitativeInvisibilityUP1D(0))
+## 0: don't restrict to selection
+Operators.bidirectionalChain(pySketchyChainSilhouetteIterator(3,0))
+shaders_list = 	[
+		SamplingShader(2),
+		SpatialNoiseShader(15, 120, 2, 1, 1), 
+		IncreasingThicknessShader(5, 30), 
+		SmoothingShader(100, 0.05, 0, 0.2, 0, 0, 0, 1),
+		IncreasingColorShader(0,0.2,0,1,0.2,0.7,0.2,1),
+		TextureAssignerShader(6),
+		pyHLRShader()
+		]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/extern/freestyle/style_modules/sketchy_topology_broken.py b/extern/freestyle/style_modules/sketchy_topology_broken.py
new file mode 100755
index 00000000000..c1cefedfad2
--- /dev/null
+++ b/extern/freestyle/style_modules/sketchy_topology_broken.py
@@ -0,0 +1,89 @@
+#
+#  Filename : sketchy_topology_broken.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : The topology of the strokes is, first, built
+#             independantly from the 3D topology of objects, 
+#             and, second, so as to chain several times the same ViewEdge.
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Freestyle import *
+from logical_operators import *
+from ChainingIterators import *
+from shaders import *
+
+## Backbone stretcher that leaves cusps intact to avoid cracks
+class pyBackboneStretcherNoCuspShader(StrokeShader):
+	def __init__(self, l):
+		StrokeShader.__init__(self)
+		self._l = l
+	def getName(self):
+		return "pyBackboneStretcherNoCuspShader"
+	def shade(self, stroke):
+		it0 = stroke.strokeVerticesBegin()
+		it1 = StrokeVertexIterator(it0)
+		it1.increment()
+		itn = stroke.strokeVerticesEnd()
+		itn.decrement()
+		itn_1 = StrokeVertexIterator(itn)
+		itn_1.decrement()
+		v0 = it0.getObject()
+		v1 = it1.getObject()
+		if((v0.getNature() & CUSP == 0) and (v1.getNature() & CUSP == 0)):
+			p0 = v0.getPoint()
+			p1 = v1.getPoint()
+			d1 = p0-p1
+			d1 = d1/d1.norm()
+			newFirst = p0+d1*float(self._l)
+			v0.SetPoint(newFirst)
+		else:
+			print "got a v0 cusp"
+		vn_1 = itn_1.getObject()
+		vn = itn.getObject()
+		if((vn.getNature() & CUSP == 0) and (vn_1.getNature() & CUSP == 0)):
+			pn = vn.getPoint()
+			pn_1 = vn_1.getPoint()
+			dn = pn-pn_1
+			dn = dn/dn.norm()
+			newLast = pn+dn*float(self._l)	
+			vn.SetPoint(newLast)
+		else:
+			print "got a vn cusp"
+
+
+Operators.select(QuantitativeInvisibilityUP1D(0))
+## Chain 3 times each ViewEdge indpendantly from the 
+## initial objects topology
+Operators.bidirectionalChain(pySketchyChainingIterator(3))
+shaders_list = 	[
+		SamplingShader(4),
+		SpatialNoiseShader(6, 120, 2, 1, 1), 
+		IncreasingThicknessShader(4, 10), 
+		SmoothingShader(100, 0.1, 0, 0.2, 0, 0, 0, 1),
+		pyBackboneStretcherNoCuspShader(20),
+		#ConstantColorShader(0.0,0.0,0.0)
+		IncreasingColorShader(0.2,0.2,0.2,1,0.5,0.5,0.5,1),
+		#IncreasingColorShader(1,0,0,1,0,1,0,1),
+		TextureAssignerShader(4)
+		]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/extern/freestyle/style_modules/sketchy_topology_preserved.py b/extern/freestyle/style_modules/sketchy_topology_preserved.py
new file mode 100755
index 00000000000..bc56a272bd5
--- /dev/null
+++ b/extern/freestyle/style_modules/sketchy_topology_preserved.py
@@ -0,0 +1,49 @@
+#
+#  Filename : sketchy_topology_preserved.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : The topology of the strokes is built
+#             so as to chain several times the same ViewEdge.
+#             The topology of the objects is preserved
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Freestyle import *
+from logical_operators import *
+from ChainingIterators import *
+from PredicatesU1D import *
+from shaders import *
+
+upred = QuantitativeInvisibilityUP1D(0)
+Operators.select(upred)
+Operators.bidirectionalChain(pySketchyChainSilhouetteIterator(3,1))
+shaders_list = 	[
+		SamplingShader(4),
+		SpatialNoiseShader(20, 220, 2, 1, 1), 
+		IncreasingThicknessShader(4, 8), 
+		SmoothingShader(300, 0.05, 0, 0.2, 0, 0, 0, 0.5),
+		ConstantColorShader(0.6,0.2,0.0),
+		TextureAssignerShader(4),
+		]
+
+Operators.create(TrueUP1D(), shaders_list)
+
diff --git a/extern/freestyle/style_modules/split_at_highest_2d_curvatures.py b/extern/freestyle/style_modules/split_at_highest_2d_curvatures.py
new file mode 100755
index 00000000000..0f42080292b
--- /dev/null
+++ b/extern/freestyle/style_modules/split_at_highest_2d_curvatures.py
@@ -0,0 +1,40 @@
+#
+#  Filename : split_at_highest_2d_curvature.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Draws the visible lines (chaining follows same nature lines)
+#             (most basic style module)
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Freestyle import *
+from logical_operators import *
+from PredicatesU1D import *
+from Functions0D import *
+
+Operators.select(QuantitativeInvisibilityUP1D(0))
+Operators.bidirectionalChain(ChainSilhouetteIterator(), NotUP1D(QuantitativeInvisibilityUP1D(0)))
+func = pyInverseCurvature2DAngleF0D()
+Operators.recursiveSplit(func,  pyParameterUP0D(0.4,0.6), NotUP1D(pyHigherLengthUP1D(100)), 2)
+shaders_list = [ConstantThicknessShader(10), IncreasingColorShader(1,0,0,1,0,1,0,1), TextureAssignerShader(3)]
+Operators.create(TrueUP1D(), shaders_list)
+
diff --git a/extern/freestyle/style_modules/split_at_tvertices.py b/extern/freestyle/style_modules/split_at_tvertices.py
new file mode 100755
index 00000000000..dde586fd1f0
--- /dev/null
+++ b/extern/freestyle/style_modules/split_at_tvertices.py
@@ -0,0 +1,42 @@
+#
+#  Filename : split_at_tvertices.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Draws strokes that starts and stops at Tvertices (visible or not)
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Freestyle import *
+from logical_operators import *
+from PredicatesU1D import *
+from PredicatesU0D import *
+from Functions0D import *
+
+Operators.select(QuantitativeInvisibilityUP1D(0))
+Operators.bidirectionalChain(ChainSilhouetteIterator(), NotUP1D(QuantitativeInvisibilityUP1D(0)))
+start = pyVertexNatureUP0D(T_VERTEX)
+## use the same predicate to decide where to start and where to stop 
+## the strokes:
+Operators.sequentialSplit(start, start, 10)
+shaders_list = [ConstantThicknessShader(5), IncreasingColorShader(1,0,0,1,0,1,0,1), TextureAssignerShader(3)]
+Operators.create(TrueUP1D(), shaders_list)
+
diff --git a/extern/freestyle/style_modules/stroke_texture.py b/extern/freestyle/style_modules/stroke_texture.py
new file mode 100755
index 00000000000..d6c753bf9e6
--- /dev/null
+++ b/extern/freestyle/style_modules/stroke_texture.py
@@ -0,0 +1,43 @@
+#
+#  Filename : stroke_texture.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Draws textured strokes (illustrate the StrokeTextureShader shader)
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Freestyle import *
+from logical_operators import *
+from PredicatesB1D import *
+from shaders import *
+from ChainingIterators import *
+
+Operators.select(QuantitativeInvisibilityUP1D(0))
+Operators.bidirectionalChain(ChainSilhouetteIterator(), NotUP1D(QuantitativeInvisibilityUP1D(0)))
+shaders_list = 	[
+		SamplingShader(3),
+		BezierCurveShader(4),
+		StrokeTextureShader("washbrushAlpha.bmp", Stroke.DRY_MEDIUM, 1),
+		ConstantThicknessShader(40),
+		ConstantColorShader(0,0,0,1),
+		]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/extern/freestyle/style_modules/suggestive.py b/extern/freestyle/style_modules/suggestive.py
new file mode 100755
index 00000000000..99a419ca23f
--- /dev/null
+++ b/extern/freestyle/style_modules/suggestive.py
@@ -0,0 +1,43 @@
+#
+#  Filename : suggestive.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Draws the suggestive contours.
+#             ***** The suggestive contours must be enabled
+#             in the options dialog *****
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Freestyle import *
+from logical_operators import *
+from PredicatesB1D import *
+from PredicatesU1D import *
+from shaders import *
+
+upred = AndUP1D(pyNatureUP1D(SUGGESTIVE_CONTOUR), QuantitativeInvisibilityUP1D(0))
+Operators.select(upred)
+Operators.bidirectionalChain(ChainSilhouetteIterator(), NotUP1D(upred))
+shaders_list = 	[
+		IncreasingThicknessShader(1, 3), 
+		ConstantColorShader(0.2,0.2,0.2, 1)
+		]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/extern/freestyle/style_modules/thickness_fof_depth_discontinuity.py b/extern/freestyle/style_modules/thickness_fof_depth_discontinuity.py
new file mode 100755
index 00000000000..06687fd9a00
--- /dev/null
+++ b/extern/freestyle/style_modules/thickness_fof_depth_discontinuity.py
@@ -0,0 +1,62 @@
+#
+#  Filename : thickness_fof_depth_discontinuity.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Assigns to strokes a thickness that depends on the depth discontinuity
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Freestyle import *
+from logical_operators import *
+from ChainingIterators import *
+from shaders import *
+
+class pyDepthDiscontinuityThicknessShader(StrokeShader):
+	def __init__(self, min, max):
+		StrokeShader.__init__(self)
+		self.__min = float(min)
+		self.__max = float(max)
+		self.__func = ZDiscontinuityF0D()
+	def getName(self):
+		return "pyDepthDiscontinuityThicknessShader"
+	def shade(self, stroke):
+		it = stroke.strokeVerticesBegin()
+		z_min=0.0
+		z_max=1.0
+		a = (self.__max - self.__min)/(z_max-z_min)
+		b = (self.__min*z_max-self.__max*z_min)/(z_max-z_min)
+		it = stroke.strokeVerticesBegin()
+		while it.isEnd() == 0:
+			z = self.__func(it.castToInterface0DIterator())
+			thickness = a*z+b
+			it.getObject().attribute().setThickness(thickness, thickness)
+			it.increment()
+
+Operators.select(QuantitativeInvisibilityUP1D(0))
+Operators.bidirectionalChain(ChainSilhouetteIterator(), NotUP1D(QuantitativeInvisibilityUP1D(0)))
+shaders_list = 	[
+		SamplingShader(1),
+		ConstantThicknessShader(3), 
+		ConstantColorShader(0.0,0.0,0.0),
+		pyDepthDiscontinuityThicknessShader(0.8, 6)
+		]
+Operators.create(TrueUP1D(), shaders_list)
\ No newline at end of file
diff --git a/extern/freestyle/style_modules/tipremover.py b/extern/freestyle/style_modules/tipremover.py
new file mode 100755
index 00000000000..b87eb7a573a
--- /dev/null
+++ b/extern/freestyle/style_modules/tipremover.py
@@ -0,0 +1,42 @@
+#
+#  Filename : tipremover.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Removes strokes extremities
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+
+from Freestyle import *
+from logical_operators import *
+from ChainingIterators import *
+from shaders import *
+
+Operators.select(QuantitativeInvisibilityUP1D(0))
+Operators.bidirectionalChain(ChainSilhouetteIterator(), NotUP1D(QuantitativeInvisibilityUP1D(0)))
+shaders_list = 	[
+		SamplingShader(5),
+		ConstantThicknessShader(3), 
+		ConstantColorShader(0,0,0),
+		TipRemoverShader(20)
+		]
+Operators.create(TrueUP1D(), shaders_list)
\ No newline at end of file
diff --git a/extern/freestyle/style_modules/tvertex_remover.py b/extern/freestyle/style_modules/tvertex_remover.py
new file mode 100755
index 00000000000..b55754381f7
--- /dev/null
+++ b/extern/freestyle/style_modules/tvertex_remover.py
@@ -0,0 +1,42 @@
+#
+#  Filename : tvertex_remover.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Removes TVertices
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+
+from Freestyle import *
+from logical_operators import *
+from PredicatesB1D import *
+from shaders import *
+
+Operators.select(QuantitativeInvisibilityUP1D(0))
+Operators.bidirectionalChain(ChainSilhouetteIterator(), NotUP1D(QuantitativeInvisibilityUP1D(0)))
+shaders_list = 	[
+		IncreasingThicknessShader(3, 5), 
+		ConstantColorShader(0.2,0.2,0.2, 1),
+		SamplingShader(10.0),
+		pyTVertexRemoverShader()
+		]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/extern/freestyle/style_modules/uniformpruning_zsort.py b/extern/freestyle/style_modules/uniformpruning_zsort.py
new file mode 100755
index 00000000000..7e719417af0
--- /dev/null
+++ b/extern/freestyle/style_modules/uniformpruning_zsort.py
@@ -0,0 +1,40 @@
+from Freestyle import *
+from logical_operators import *
+from PredicatesU1D import *
+from PredicatesU0D import *
+from PredicatesB1D import *
+from Functions0D import *
+from Functions1D import *
+from shaders import *
+
+class pyDensityUP1D(UnaryPredicate1D):
+	def __init__(self,wsize,threshold, integration = MEAN, sampling=2.0):
+		UnaryPredicate1D.__init__(self)
+		self._wsize = wsize
+		self._threshold = threshold
+		self._integration = integration
+		self._func = DensityF1D(self._wsize, self._integration, sampling)
+			
+	def getName(self):
+		return "pyDensityUP1D"
+
+	def __call__(self, inter):
+		d = self._func(inter)
+		print "For Chain ", inter.getId().getFirst(), inter.getId().getSecond(), "density is ", d
+		if(d < self._threshold):
+			return 1
+		return 0
+
+Operators.select(QuantitativeInvisibilityUP1D(0))
+Operators.bidirectionalChain(ChainSilhouetteIterator())
+#Operators.sequentialSplit(pyVertexNatureUP0D(VIEW_VERTEX), 2)
+Operators.sort(pyZBP1D())
+shaders_list = 	[
+		StrokeTextureShader("smoothAlpha.bmp", Stroke.OPAQUE_MEDIUM, 0),
+		ConstantThicknessShader(3), 
+		SamplingShader(5.0),
+		ConstantColorShader(0,0,0,1)
+		]
+Operators.create(pyDensityUP1D(2,0.05, MEAN,4), shaders_list)
+#Operators.create(pyDensityFunctorUP1D(8,0.03, pyGetInverseProjectedZF1D(), 0,1, MEAN), shaders_list)
+
diff --git a/extern/freestyle/style_modules/vector.py b/extern/freestyle/style_modules/vector.py
new file mode 100755
index 00000000000..039f262546b
--- /dev/null
+++ b/extern/freestyle/style_modules/vector.py
@@ -0,0 +1,241 @@
+# This module defines 3d geometrical vectors with the standard
+# operations on them.
+#
+# Written by: Konrad Hinsen 
+# Last revision: 1996-1-26
+#
+
+"""This module defines three-dimensional geometrical vectors. Vectors support
+the usual mathematical operations (v1, v2: vectors, s: scalar): 
+  v1+v2		  addition
+  v1-v2		  subtraction
+  v1*v2		  scalar product
+  s*v1		  multiplication with a scalar
+  v1/s		  division by a scalar
+  v1.cross(v2)	  cross product
+  v1.length()	  length
+  v1.normal()	  normal vector in direction of v1
+  v1.angle(v2)	  angle between two vectors
+  v1.x(), v1[0]	  first element
+  v1.y(), v1[1]	  second element
+  v1.z(), v1[2]	  third element
+
+The module offers the following items for export:
+  Vec3D(x,y,z)	  the constructor for vectors
+  isVector(x)	  a type check function
+  ex, ey, ez	  unit vectors along the x-, y-, and z-axes (predefined constants)
+
+Note: vector elements can be any kind of numbers on which the operations
+addition, subtraction, multiplication, division, comparison, sqrt, and acos
+are defined. Integer elements are treated as floating point elements.
+"""
+
+import math, types
+
+class Vec3:
+
+    isVec3 = 1
+
+    def __init__(self, x=0., y=0., z=0.):
+	self.data = [x,y,z]
+
+    def __repr__(self):
+	return 'Vec3(%s,%s,%s)' % (`self.data[0]`,\
+				     `self.data[1]`,`self.data[2]`)
+
+    def __str__(self):
+	return `self.data`
+
+    def __add__(self, other):
+	return Vec3(self.data[0]+other.data[0],\
+		      self.data[1]+other.data[1],self.data[2]+other.data[2])
+    __radd__ = __add__
+
+    def __neg__(self):
+	return Vec3(-self.data[0], -self.data[1], -self.data[2])
+
+    def __sub__(self, other):
+	return Vec3(self.data[0]-other.data[0],\
+		      self.data[1]-other.data[1],self.data[2]-other.data[2])
+
+    def __rsub__(self, other):
+	return Vec3(other.data[0]-self.data[0],\
+		      other.data[1]-self.data[1],other.data[2]-self.data[2])
+
+    def __mul__(self, other):
+	if isVec3(other):
+	    return reduce(lambda a,b: a+b,
+			  map(lambda a,b: a*b, self.data, other.data))
+	else:
+	    return Vec3(self.data[0]*other, self.data[1]*other,
+			  self.data[2]*other)
+
+    def __rmul__(self, other):
+	if isVec3(other):
+	    return reduce(lambda a,b: a+b,
+			  map(lambda a,b: a*b, self.data, other.data))
+	else:
+	    return Vec3(other*self.data[0], other*self.data[1],
+			  other*self.data[2])
+
+    def __div__(self, other):
+	if isVec3(other):
+	    raise TypeError, "Can't divide by a vector"
+	else:
+	    return Vec3(_div(self.data[0],other), _div(self.data[1],other),
+			  _div(self.data[2],other))
+	    
+    def __rdiv__(self, other):
+	raise TypeError, "Can't divide by a vector"
+
+    def __cmp__(self, other):
+	return cmp(self.data[0],other.data[0]) \
+	       or cmp(self.data[1],other.data[1]) \
+	       or cmp(self.data[2],other.data[2])
+
+    def __getitem__(self, index):
+	return self.data[index]
+
+    def x(self):
+	return self.data[0]
+    def y(self):
+	return self.data[1]
+    def z(self):
+	return self.data[2]
+
+    def length(self):
+	return math.sqrt(self*self)
+
+    def normal(self):
+	len = self.length()
+	if len == 0:
+	    raise ZeroDivisionError, "Can't normalize a zero-length vector"
+	return self/len
+
+    def cross(self, other):
+	if not isVec3(other):
+	    raise TypeError, "Cross product with non-vector"
+	return Vec3(self.data[1]*other.data[2]-self.data[2]*other.data[1],
+		      self.data[2]*other.data[0]-self.data[0]*other.data[2],
+		      self.data[0]*other.data[1]-self.data[1]*other.data[0])
+
+    def angle(self, other):
+	if not isVec3(other):
+	    raise TypeError, "Angle between vector and non-vector"
+	cosa = (self*other)/(self.length()*other.length())
+	cosa = max(-1.,min(1.,cosa))
+	return math.acos(cosa)
+
+
+class Vec2:
+
+    isVec2 = 1
+
+    def __init__(self, x=0., y=0.):
+	self.data = [x,y]
+
+    def __repr__(self):
+	return 'Vec2(%s,%s,%s)' % (`self.data[0]`,\
+				     `self.data[1]`)
+
+    def __str__(self):
+	return `self.data`
+
+    def __add__(self, other):
+	return Vec2(self.data[0]+other.data[0],\
+		      self.data[1]+other.data[1])
+    __radd__ = __add__
+
+    def __neg__(self):
+	return Vec2(-self.data[0], -self.data[1])
+
+    def __sub__(self, other):
+	return Vec2(self.data[0]-other.data[0],\
+		      self.data[1]-other.data[1])
+
+    def __rsub__(self, other):
+	return Vec2(other.data[0]-self.data[0],\
+		      other.data[1]-self.data[1])
+
+    def __mul__(self, other):
+	if isVec2(other):
+	    return reduce(lambda a,b: a+b,
+			  map(lambda a,b: a*b, self.data, other.data))
+	else:
+	    return Vec2(self.data[0]*other, self.data[1]*other)
+
+    def __rmul__(self, other):
+	if isVec2(other):
+	    return reduce(lambda a,b: a+b,
+			  map(lambda a,b: a*b, self.data, other.data))
+	else:
+	    return Vec2(other*self.data[0], other*self.data[1])
+
+    def __div__(self, other):
+	if isVec2(other):
+	    raise TypeError, "Can't divide by a vector"
+	else:
+	    return Vec2(_div(self.data[0],other), _div(self.data[1],other))
+	    
+    def __rdiv__(self, other):
+	raise TypeError, "Can't divide by a vector"
+
+    def __cmp__(self, other):
+	return cmp(self.data[0],other.data[0]) \
+	       or cmp(self.data[1],other.data[1])
+
+    def __getitem__(self, index):
+	return self.data[index]
+
+    def x(self):
+	return self.data[0]
+    def y(self):
+	return self.data[1]
+
+    def length(self):
+	return math.sqrt(self*self)
+
+    def normal(self):
+	len = self.length()
+	if len == 0:
+	    raise ZeroDivisionError, "Can't normalize a zero-length vector"
+	return self/len
+
+    #def cross(self, other):
+#	if not isVec2(other):
+#	    raise TypeError, "Cross product with non-vector"
+#	return Vec2(self.data[1]*other.data[2]-self.data[2]*other.data[1],
+#		      self.data[2]*other.data[0]-self.data[0]*other.data[2],
+#		      self.data[0]*other.data[1]-self.data[1]*other.data[0])
+
+    def angle(self, other):
+	if not isVec2(other):
+	    raise TypeError, "Angle between vector and non-vector"
+	cosa = (self*other)/(self.length()*other.length())
+	cosa = max(-1.,min(1.,cosa))
+	return math.acos(cosa)
+
+
+
+# Type check
+
+def isVec3(x):
+    return hasattr(x,'isVec3')
+
+def isVec2(x):
+    return hasattr(x,'isVec2')
+
+# "Correct" division for arbitrary number types
+
+def _div(a,b):
+    if type(a) == types.IntType and type(b) == types.IntType:
+	return float(a)/float(b)
+    else:
+	return a/b
+
+
+# Some useful constants
+
+ex = Vec3(1.,0.,0.)
+ey = Vec3(0.,1.,0.)
+ez = Vec3(0.,0.,1.)

From 102868467b619734f985718c4b1e8a483c56e911 Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Mon, 5 May 2008 17:28:14 +0000
Subject: [PATCH 003/252] lib3ds, swig added to extern/freestyle

---
 extern/freestyle/SConscript | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 extern/freestyle/SConscript

diff --git a/extern/freestyle/SConscript b/extern/freestyle/SConscript
new file mode 100644
index 00000000000..e69de29bb2d

From 914a4d1a6c39b90ca631fa82742097749236322d Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Mon, 5 May 2008 19:26:10 +0000
Subject: [PATCH 004/252] soc-2008-mxcurioni: lib3ds compiles as an external
 library

---
 SConstruct                  | 2 +-
 config/darwin-config.py     | 2 +-
 extern/SConscript           | 3 +++
 extern/freestyle/SConscript | 0
 tools/Blender.py            | 2 +-
 5 files changed, 6 insertions(+), 3 deletions(-)
 delete mode 100644 extern/freestyle/SConscript

diff --git a/SConstruct b/SConstruct
index bb8773329b2..90092c51573 100644
--- a/SConstruct
+++ b/SConstruct
@@ -269,7 +269,7 @@ if not quickie and do_clean:
                 print "clean dir %s"%(B.root_build_dir+dir)
                 shutil.rmtree(B.root_build_dir+dir)
         for confile in ['extern/ffmpeg/config.mak', 'extern/x264/config.mak',
-                'extern/xvidcore/build/generic/platform.inc']:
+                'extern/xvidcore/build/generic/platform.inc','extern/freestyle/lib3ds/Makefile']:
             if os.path.exists(confile):
                 print "clean file %s"%confile
                 os.remove(confile)
diff --git a/config/darwin-config.py b/config/darwin-config.py
index 071a245202b..856317cd627 100644
--- a/config/darwin-config.py
+++ b/config/darwin-config.py
@@ -162,7 +162,7 @@ WITH_BF_YAFRAY = 'true'
 
 WITH_BF_FREESTYLE = 'true'
 BF_FREESTYLE = '#extern/freestyle'
-BF_FREESTYLE_SRC = '${BF_FREESTYLE}/src'
+BF_FREESTYLE_SRC = '#source/blender/freestyle/src'
 BF_SWIG = '${BF_FREESTYLE}/swig'
 BF_LIB3DS = '${BF_FREESTYLE}/lib3ds'
 BF_LIB3DS_LIB = 'extern_lib3ds'
diff --git a/extern/SConscript b/extern/SConscript
index 09eaf080c28..8ab451a8024 100644
--- a/extern/SConscript
+++ b/extern/SConscript
@@ -9,6 +9,9 @@ if env['WITH_BF_GAMEENGINE']:
 if env['WITH_BF_BULLET']:
     SConscript(['bullet2/src/SConscript'])
 
+if env['WITH_BF_FREESTYLE']:
+    SConscript(['freestyle/lib3ds/SConscript'])
+
 if env['WITH_BF_INTERNATIONAL']:
     SConscript(['bFTGL/SConscript'])
 
diff --git a/extern/freestyle/SConscript b/extern/freestyle/SConscript
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tools/Blender.py b/tools/Blender.py
index e4d143935a3..17010fcd308 100644
--- a/tools/Blender.py
+++ b/tools/Blender.py
@@ -163,7 +163,7 @@ def setup_syslibs(lenv):
         syslibs += Split(lenv['BF_OPENEXR_LIB'])
     if lenv['WITH_BF_FFMPEG']:
         syslibs += Split(lenv['BF_FFMPEG_LIB'])
-	if lenv['WITH_BF_FREESTYLE']:
+    if lenv['WITH_BF_FREESTYLE']:
         syslibs += Split(lenv['BF_LIB3DS_LIB'])
     syslibs += Split(lenv['BF_SDL_LIB'])
     if not lenv['WITH_BF_STATICOPENGL']:

From 959f1a0f92f09c08de88626e9958ab1cca37e02e Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Tue, 6 May 2008 17:23:27 +0000
Subject: [PATCH 005/252] soc-2008-mxcurioni: swig compiles as independent
 library

---
 SConstruct                          |  5 ++++-
 config/darwin-config.py             |  1 +
 config/linux2-config.py             | 10 ++++++++++
 config/linuxcross-config.py         | 12 ++++++++++++
 config/openbsd3-config.py           | 10 ++++++++++
 config/sunos5-config.py             | 10 ++++++++++
 config/win32-mingw-config.py        | 10 ++++++++++
 config/win32-vc-config.py           | 10 ++++++++++
 extern/SConscript                   |  1 +
 source/blender/freestyle/SConscript | 24 +++++++++++++++---------
 tools/btools.py                     |  5 +++--
 11 files changed, 86 insertions(+), 12 deletions(-)

diff --git a/SConstruct b/SConstruct
index 90092c51573..341638c0e0c 100644
--- a/SConstruct
+++ b/SConstruct
@@ -269,7 +269,7 @@ if not quickie and do_clean:
                 print "clean dir %s"%(B.root_build_dir+dir)
                 shutil.rmtree(B.root_build_dir+dir)
         for confile in ['extern/ffmpeg/config.mak', 'extern/x264/config.mak',
-                'extern/xvidcore/build/generic/platform.inc','extern/freestyle/lib3ds/Makefile']:
+                'extern/xvidcore/build/generic/platform.inc','extern/freestyle/lib3ds/Makefile','extern/freestyle/swig/Makefile']:
             if os.path.exists(confile):
                 print "clean file %s"%confile
                 os.remove(confile)
@@ -340,12 +340,15 @@ if env['WITH_BF_PLAYER']:
     playerlist = B.create_blender_liblist(env, 'player')
     env.BlenderProg(B.root_build_dir, "blenderplayer", dobj + playerlist + thestatlibs, [], thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blenderplayer')
 
+
+
 ##### Now define some targets
 
 
 #------------ INSTALL
 
 #-- binaries
+
 blenderinstall = []
 if  env['OURPLATFORM']=='darwin':
     for prg in B.program_list:
diff --git a/config/darwin-config.py b/config/darwin-config.py
index 856317cd627..9ceb1d1644b 100644
--- a/config/darwin-config.py
+++ b/config/darwin-config.py
@@ -164,6 +164,7 @@ WITH_BF_FREESTYLE = 'true'
 BF_FREESTYLE = '#extern/freestyle'
 BF_FREESTYLE_SRC = '#source/blender/freestyle/src'
 BF_SWIG = '${BF_FREESTYLE}/swig'
+BF_SWIG_LIB = 'extern_swig'
 BF_LIB3DS = '${BF_FREESTYLE}/lib3ds'
 BF_LIB3DS_LIB = 'extern_lib3ds'
 BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs'
diff --git a/config/linux2-config.py b/config/linux2-config.py
index 4d8b5c97512..3c8a48d12bc 100644
--- a/config/linux2-config.py
+++ b/config/linux2-config.py
@@ -86,6 +86,16 @@ BF_SOLID_LIB = 'extern_solid'
 
 WITH_BF_YAFRAY = 'true'
 
+WITH_BF_FREESTYLE = 'true'
+BF_FREESTYLE = '#extern/freestyle'
+BF_FREESTYLE_SRC = '#source/blender/freestyle/src'
+BF_SWIG = '${BF_FREESTYLE}/swig'
+BF_SWIG_LIB = 'extern_swig'
+BF_LIB3DS = '${BF_FREESTYLE}/lib3ds'
+BF_LIB3DS_LIB = 'extern_lib3ds'
+BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs'
+BF_LIB3DS_INC = '${BF_LIB3DS}/lib3ds'
+
 #WITH_BF_NSPR = 'true'
 #BF_NSPR = $(LIBDIR)/nspr
 #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
diff --git a/config/linuxcross-config.py b/config/linuxcross-config.py
index e6c4e8769b4..886b9f93f3f 100644
--- a/config/linuxcross-config.py
+++ b/config/linuxcross-config.py
@@ -6,6 +6,18 @@ BF_VERSE_INCLUDE = "#extern/verse/dist"
 
 WITH_BF_YAFRAY = 'true'
 
+WITH_BF_FREESTYLE = 'true'
+BF_FREESTYLE = '#extern/freestyle'
+BF_FREESTYLE_SRC = '#source/blender/freestyle/src'
+BF_SWIG = '${BF_FREESTYLE}/swig'
+BF_SWIG_LIB = 'extern_swig'
+BF_LIB3DS = '${BF_FREESTYLE}/lib3ds'
+BF_LIB3DS_LIB = 'extern_lib3ds'
+BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs'
+BF_LIB3DS_INC = '${BF_LIB3DS}/lib3ds'
+
+###########################
+
 BF_PYTHON = LIBDIR + '/python'
 BF_PYTHON_VERSION = '2.5'
 BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
diff --git a/config/openbsd3-config.py b/config/openbsd3-config.py
index f7f254973af..ad4891a0098 100644
--- a/config/openbsd3-config.py
+++ b/config/openbsd3-config.py
@@ -80,6 +80,16 @@ BF_SOLID_LIB = 'extern_solid'
 
 WITH_BF_YAFRAY = 'true'
 
+WITH_BF_FREESTYLE = 'true'
+BF_FREESTYLE = '#extern/freestyle'
+BF_FREESTYLE_SRC = '#source/blender/freestyle/src'
+BF_SWIG = '${BF_FREESTYLE}/swig'
+BF_SWIG_LIB = 'extern_swig'
+BF_LIB3DS = '${BF_FREESTYLE}/lib3ds'
+BF_LIB3DS_LIB = 'extern_lib3ds'
+BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs'
+BF_LIB3DS_INC = '${BF_LIB3DS}/lib3ds'
+
 #WITH_BF_NSPR = 'true'
 #BF_NSPR = $(LIBDIR)/nspr
 #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
diff --git a/config/sunos5-config.py b/config/sunos5-config.py
index b3ca0e267ff..6581ad2b692 100644
--- a/config/sunos5-config.py
+++ b/config/sunos5-config.py
@@ -82,6 +82,16 @@ BF_SOLID_LIB = 'extern_solid'
 
 WITH_BF_YAFRAY = 'true'
 
+WITH_BF_FREESTYLE = 'true'
+BF_FREESTYLE = '#extern/freestyle'
+BF_FREESTYLE_SRC = '#source/blender/freestyle/src'
+BF_SWIG = '${BF_FREESTYLE}/swig'
+BF_SWIG_LIB = 'extern_swig'
+BF_LIB3DS = '${BF_FREESTYLE}/lib3ds'
+BF_LIB3DS_LIB = 'extern_lib3ds'
+BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs'
+BF_LIB3DS_INC = '${BF_LIB3DS}/lib3ds'
+
 #WITH_BF_NSPR = 'true'
 #BF_NSPR = $(LIBDIR)/nspr
 #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py
index d9fd6ce8d4f..b0a3c3ae18d 100644
--- a/config/win32-mingw-config.py
+++ b/config/win32-mingw-config.py
@@ -97,6 +97,16 @@ BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE'
 
 WITH_BF_YAFRAY = 'true'
 
+WITH_BF_FREESTYLE = 'true'
+BF_FREESTYLE = '#extern/freestyle'
+BF_FREESTYLE_SRC = '#source/blender/freestyle/src'
+BF_SWIG = '${BF_FREESTYLE}/swig'
+BF_SWIG_LIB = 'extern_swig'
+BF_LIB3DS = '${BF_FREESTYLE}/lib3ds'
+BF_LIB3DS_LIB = 'extern_lib3ds'
+BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs'
+BF_LIB3DS_INC = '${BF_LIB3DS}/lib3ds'
+
 #WITH_BF_NSPR = 'true'
 #BF_NSPR = $(LIBDIR)/nspr
 #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py
index 32b6597b5d5..849b153378f 100644
--- a/config/win32-vc-config.py
+++ b/config/win32-vc-config.py
@@ -108,6 +108,16 @@ WITH_BF_YAFRAY = 'true'
 
 WITH_BF_BINRELOC = 'false'
 
+WITH_BF_FREESTYLE = 'true'
+BF_FREESTYLE = '#extern/freestyle'
+BF_FREESTYLE_SRC = '#source/blender/freestyle/src'
+BF_SWIG = '${BF_FREESTYLE}/swig'
+BF_SWIG_LIB = 'extern_swig'
+BF_LIB3DS = '${BF_FREESTYLE}/lib3ds'
+BF_LIB3DS_LIB = 'extern_lib3ds'
+BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs'
+BF_LIB3DS_INC = '${BF_LIB3DS}/lib3ds'
+
 #WITH_BF_NSPR = 'true'
 #BF_NSPR = $(LIBDIR)/nspr
 #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
diff --git a/extern/SConscript b/extern/SConscript
index 8ab451a8024..7997981b7f2 100644
--- a/extern/SConscript
+++ b/extern/SConscript
@@ -11,6 +11,7 @@ if env['WITH_BF_BULLET']:
 
 if env['WITH_BF_FREESTYLE']:
     SConscript(['freestyle/lib3ds/SConscript'])
+    SConscript(['freestyle/swig/SConscript'])
 
 if env['WITH_BF_INTERNATIONAL']:
     SConscript(['bFTGL/SConscript'])
diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript
index ce8b9d0f224..7e859e58c58 100644
--- a/source/blender/freestyle/SConscript
+++ b/source/blender/freestyle/SConscript
@@ -1,10 +1,16 @@
 #!/usr/bin/python
-# import sys
-# Import ('env')
-# 
-# sources = ['']
-# 
-# incs = ' '
-# incs += ' ' + env['BF_LIB3DS_INC']
-# 
-# env.BlenderLib ( 'bf_freestyle', sources, Split(incs), Split(defs), libtype=['international','player'], priority=[0, 205] )
+import sys
+Import ('env')
+
+sources = []
+defs = []
+
+incs = '#/extern/freestyle/lib3ds #/extern/freestyle/swig'
+incs += ' ' + env['BF_LIB3DS_INC']
+
+# env.BlenderLib (libname="bf_freestyle",
+# 				sources=sources,
+#                 includes=Split(incs),
+#                 defines=defs,
+#                 libtype=['blender'],
+#                 priority = [15] )
\ No newline at end of file
diff --git a/tools/btools.py b/tools/btools.py
index 8158bf6cfcc..deab2e687b6 100755
--- a/tools/btools.py
+++ b/tools/btools.py
@@ -66,7 +66,7 @@ def validate_arguments(args, bc):
             'BF_FANCY', 'BF_QUIET',
             'BF_X264_CONFIG',
             'BF_XVIDCORE_CONFIG',
-			'BF_WITH_BF_FREESTYLE', 'BF_FREESTYLE', 'BF_FREESTYLE_SRC', 'BF_SWIG', 'BF_LIB3DS', 'BF_LIB3DS_LIB', 'BF_LIB3DS_LIBPATH', 'BF_LIB3DS_INC'
+			'BF_WITH_BF_FREESTYLE', 'BF_FREESTYLE', 'BF_FREESTYLE_SRC', 'BF_SWIG', 'BF_SWIG_LIB', 'BF_LIB3DS', 'BF_LIB3DS_LIB', 'BF_LIB3DS_LIBPATH', 'BF_LIB3DS_INC'
             ]
 
     arg_list = ['BF_DEBUG', 'BF_QUIET', 'BF_CROSS', 'BF_UPDATE',
@@ -242,7 +242,8 @@ def read_opts(cfg, args):
         ('BF_FREESTYLE', 'Freestyle base path', ''),
         ('BF_FREESTYLE_SRC', 'Freestyle source path', ''),
         ('BF_SWIG', 'SWIG base path', ''),
-        ('BF_LIB3DS', 'SWIG base path', ''),
+        ('BF_SWIG_LIB', 'SWIG library', ''),
+        ('BF_LIB3DS', 'lib3ds base path', ''),
         ('BF_LIB3DS_LIB', 'lib3ds library', ''),
         ('BF_LIB3DS_LIBPATH', 'lib3ds library path', ''),
 		('BF_LIB3DS_INC', 'lib3ds include path', ''),

From cf2e1e2857cfc5b3c2848c7fc6c9d919ac72fabb Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Wed, 7 May 2008 03:37:16 +0000
Subject: [PATCH 006/252] soc=2008-mxcurioni: reverted back to compiling swig
 as a binary, instead of as a library

---
 tools/Blender.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/Blender.py b/tools/Blender.py
index 17010fcd308..92ee1e3e6ec 100644
--- a/tools/Blender.py
+++ b/tools/Blender.py
@@ -462,7 +462,8 @@ class BlenderEnvironment(SConsEnvironment):
         program_list.append(prog)
         if  lenv['OURPLATFORM']=='darwin':
             lenv['BINARYKIND'] = binarykind
-            lenv.AddPostAction(prog,Action(AppIt,strfunction=my_appit_print))
+            if progname != "swig":
+            	lenv.AddPostAction(prog,Action(AppIt,strfunction=my_appit_print))
         return prog
 
     def Glob(lenv, pattern):

From fd9ad582983939741a4c4fa5f2707f29365d6c09 Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Fri, 9 May 2008 23:06:28 +0000
Subject: [PATCH 007/252] soc-2008-mxcurioni: towards Freestyle compilation,
 removing Qt's QString and QImage dependencies. Up to this commit, the
 following directories compile well (and without any warning): system, image,
 geometry, graph, winged_edge, view_map, stroke. Modified code is commented by
 //soc and unused variables by //soc unused

---
 config/darwin-config.py                       |  2 +-
 config/linux2-config.py                       |  2 +-
 config/linuxcross-config.py                   |  2 +-
 config/openbsd3-config.py                     |  2 +-
 config/sunos5-config.py                       |  2 +-
 config/win32-mingw-config.py                  |  2 +-
 config/win32-vc-config.py                     |  2 +-
 source/blender/freestyle/SConscript           | 62 ++++++++++++--
 .../freestyle/intern/geometry/Grid.cpp        | 10 +--
 .../blender/freestyle/intern/geometry/Grid.h  | 24 +++---
 .../freestyle/intern/image/GaussianFilter.h   |  4 +-
 .../freestyle/intern/image/ImagePyramid.cpp   |  8 +-
 .../intern/scene_graph/MaxFileLoader.h        |  4 +
 .../intern/stroke/AdvancedFunctions1D.cpp     |  4 +-
 .../intern/stroke/BasicStrokeShaders.cpp      | 56 ++++++++-----
 .../freestyle/intern/stroke/Canvas.cpp        | 81 +++++++++++++------
 .../intern/stroke/ChainingIterators.cpp       |  2 +-
 .../freestyle/intern/stroke/Operators.cpp     | 12 +--
 .../freestyle/intern/stroke/Stroke.cpp        |  2 +-
 .../freestyle/intern/stroke/StrokeRep.cpp     | 20 ++---
 .../freestyle/intern/system/Interpreter.h     |  2 +
 .../freestyle/intern/system/PseudoNoise.cpp   |  2 +-
 .../freestyle/intern/system/StringUtils.cpp   | 20 +++--
 .../intern/view_map/FEdgeXDetector.cpp        |  3 +-
 .../intern/view_map/FEdgeXDetector.h          |  2 +-
 .../freestyle/intern/view_map/Interface0D.h   |  2 +
 .../freestyle/intern/view_map/Interface1D.h   |  1 +
 .../freestyle/intern/view_map/Silhouette.h    |  2 +-
 .../intern/view_map/SteerableViewMap.cpp      | 41 +++++++---
 .../intern/view_map/ViewEdgeXBuilder.cpp      |  4 +-
 .../intern/view_map/ViewEdgeXBuilder.h        | 15 ++--
 .../freestyle/intern/view_map/ViewMapIO.cpp   |  2 +-
 .../freestyle/intern/winged_edge/WEdge.h      |  3 +
 .../intern/winged_edge/WSFillGrid.cpp         |  2 +-
 .../freestyle/intern/winged_edge/WSFillGrid.h |  4 +-
 .../freestyle/intern/winged_edge/WXEdge.h     |  2 +-
 .../intern/winged_edge/WingedEdgeBuilder.cpp  |  2 +-
 37 files changed, 279 insertions(+), 133 deletions(-)

diff --git a/config/darwin-config.py b/config/darwin-config.py
index 9ceb1d1644b..115123f9984 100644
--- a/config/darwin-config.py
+++ b/config/darwin-config.py
@@ -168,7 +168,7 @@ BF_SWIG_LIB = 'extern_swig'
 BF_LIB3DS = '${BF_FREESTYLE}/lib3ds'
 BF_LIB3DS_LIB = 'extern_lib3ds'
 BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs'
-BF_LIB3DS_INC = '${BF_LIB3DS}/lib3ds'
+BF_LIB3DS_INC = '${BF_LIB3DS}'
 
 # WITH_BF_OPENEXR = 'true'
 # BF_OPENEXR = '${LCGDIR}/openexr'
diff --git a/config/linux2-config.py b/config/linux2-config.py
index 3c8a48d12bc..f59dcf266ee 100644
--- a/config/linux2-config.py
+++ b/config/linux2-config.py
@@ -94,7 +94,7 @@ BF_SWIG_LIB = 'extern_swig'
 BF_LIB3DS = '${BF_FREESTYLE}/lib3ds'
 BF_LIB3DS_LIB = 'extern_lib3ds'
 BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs'
-BF_LIB3DS_INC = '${BF_LIB3DS}/lib3ds'
+BF_LIB3DS_INC = '${BF_LIB3DS}'
 
 #WITH_BF_NSPR = 'true'
 #BF_NSPR = $(LIBDIR)/nspr
diff --git a/config/linuxcross-config.py b/config/linuxcross-config.py
index 886b9f93f3f..603f6a1a880 100644
--- a/config/linuxcross-config.py
+++ b/config/linuxcross-config.py
@@ -14,7 +14,7 @@ BF_SWIG_LIB = 'extern_swig'
 BF_LIB3DS = '${BF_FREESTYLE}/lib3ds'
 BF_LIB3DS_LIB = 'extern_lib3ds'
 BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs'
-BF_LIB3DS_INC = '${BF_LIB3DS}/lib3ds'
+BF_LIB3DS_INC = '${BF_LIB3DS}'
 
 ###########################
 
diff --git a/config/openbsd3-config.py b/config/openbsd3-config.py
index ad4891a0098..9a4c0d6f34e 100644
--- a/config/openbsd3-config.py
+++ b/config/openbsd3-config.py
@@ -88,7 +88,7 @@ BF_SWIG_LIB = 'extern_swig'
 BF_LIB3DS = '${BF_FREESTYLE}/lib3ds'
 BF_LIB3DS_LIB = 'extern_lib3ds'
 BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs'
-BF_LIB3DS_INC = '${BF_LIB3DS}/lib3ds'
+BF_LIB3DS_INC = '${BF_LIB3DS}'
 
 #WITH_BF_NSPR = 'true'
 #BF_NSPR = $(LIBDIR)/nspr
diff --git a/config/sunos5-config.py b/config/sunos5-config.py
index 6581ad2b692..cccc380f60c 100644
--- a/config/sunos5-config.py
+++ b/config/sunos5-config.py
@@ -90,7 +90,7 @@ BF_SWIG_LIB = 'extern_swig'
 BF_LIB3DS = '${BF_FREESTYLE}/lib3ds'
 BF_LIB3DS_LIB = 'extern_lib3ds'
 BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs'
-BF_LIB3DS_INC = '${BF_LIB3DS}/lib3ds'
+BF_LIB3DS_INC = '${BF_LIB3DS}'
 
 #WITH_BF_NSPR = 'true'
 #BF_NSPR = $(LIBDIR)/nspr
diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py
index b0a3c3ae18d..9757c0264b5 100644
--- a/config/win32-mingw-config.py
+++ b/config/win32-mingw-config.py
@@ -105,7 +105,7 @@ BF_SWIG_LIB = 'extern_swig'
 BF_LIB3DS = '${BF_FREESTYLE}/lib3ds'
 BF_LIB3DS_LIB = 'extern_lib3ds'
 BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs'
-BF_LIB3DS_INC = '${BF_LIB3DS}/lib3ds'
+BF_LIB3DS_INC = '${BF_LIB3DS}'
 
 #WITH_BF_NSPR = 'true'
 #BF_NSPR = $(LIBDIR)/nspr
diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py
index 849b153378f..8e7d6c56c13 100644
--- a/config/win32-vc-config.py
+++ b/config/win32-vc-config.py
@@ -116,7 +116,7 @@ BF_SWIG_LIB = 'extern_swig'
 BF_LIB3DS = '${BF_FREESTYLE}/lib3ds'
 BF_LIB3DS_LIB = 'extern_lib3ds'
 BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs'
-BF_LIB3DS_INC = '${BF_LIB3DS}/lib3ds'
+BF_LIB3DS_INC = '${BF_LIB3DS}'
 
 #WITH_BF_NSPR = 'true'
 #BF_NSPR = $(LIBDIR)/nspr
diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript
index 7e859e58c58..2bc08822a6e 100644
--- a/source/blender/freestyle/SConscript
+++ b/source/blender/freestyle/SConscript
@@ -4,13 +4,61 @@ Import ('env')
 
 sources = []
 defs = []
+incs = ''
 
-incs = '#/extern/freestyle/lib3ds #/extern/freestyle/swig'
+incs += '../blenkernel ../blenlib ../imbuf ../makesdna'
+# incs += ' #/extern/freestyle/lib3ds #/extern/freestyle/swig'
+incs += ' ' + env['BF_PYTHON_INC']
 incs += ' ' + env['BF_LIB3DS_INC']
+incs += ' ' + env['BF_PNG_INC']
 
-# env.BlenderLib (libname="bf_freestyle",
-# 				sources=sources,
-#                 includes=Split(incs),
-#                 defines=defs,
-#                 libtype=['blender'],
-#                 priority = [15] )
\ No newline at end of file
+########################################################
+#	folders sources 
+########################################################
+
+#	system
+prefix = 'intern/system'
+system_sources = env.Glob(prefix + '/*.cpp')
+
+#	image
+prefix = 'intern/image'
+image_sources = env.Glob(prefix + '/*.cpp')
+
+#	geometry
+prefix = 'intern/geometry'
+geometry_sources = env.Glob(prefix + '/*.cpp')
+
+#	scene_graph
+prefix = 'intern/scene_graph'
+scene_graph_sources = env.Glob(prefix + '/*.cpp')
+
+#	winged_edge
+prefix = 'intern/winged_edge'
+winged_edge_sources = env.Glob(prefix + '/*.cpp')
+
+#	view_map
+prefix = 'intern/view_map'
+view_map_sources = env.Glob(prefix + '/*.cpp')
+
+#	stroke
+prefix = 'intern/stroke'
+stroke_sources = env.Glob(prefix + '/*.cpp')
+
+#	rendering
+# 	app
+
+sources = 	system_sources + image_sources + geometry_sources + scene_graph_sources + \
+			winged_edge_sources + view_map_sources + stroke_sources
+#print sources
+
+env.BlenderLib (libname="bf_freestyle",
+				sources=sources,
+                includes=Split(incs),
+                defines=defs,
+                libtype=['blender'],
+                priority = [15] )
+
+########################################################
+# SWIG
+########################################################
+#	swig
\ No newline at end of file
diff --git a/source/blender/freestyle/intern/geometry/Grid.cpp b/source/blender/freestyle/intern/geometry/Grid.cpp
index 59b730358bc..2477227c410 100755
--- a/source/blender/freestyle/intern/geometry/Grid.cpp
+++ b/source/blender/freestyle/intern/geometry/Grid.cpp
@@ -46,7 +46,7 @@ void firstIntersectionGridVisitor::examineOccluder(Polygon3r *occ){
     //first let us compute the plane equation.
     Vec3r v1(((occ)->getVertices())[0]);           
     Vec3d normal((occ)->getNormal());
-    double d = -(v1 * normal);
+    //soc unused - double d = -(v1 * normal);
 
     double tmp_u, tmp_v, tmp_t;
     if((occ)->rayIntersect(ray_org_, ray_dir_, tmp_t, tmp_u, tmp_v)){
@@ -106,7 +106,7 @@ void Grid::configure(const Vec3r& orig,
 
   if(grid_vol == 0){
     double min=DBL_MAX;
-    int index;
+    int index=0;
     int nzeros=0;
     for(int i=0;i<3;++i){
         if(size[i] == 0){
@@ -336,7 +336,7 @@ void Grid::initRay (const Vec3r &orig,
 
   for(unsigned i = 0; i < 3; i++) {
     _current_cell[i] = (unsigned)floor((orig[i] - _orig[i]) / _cell_size[i]);
-    unsigned u = _current_cell[i];
+    //soc unused - unsigned u = _current_cell[i];
     _pt[i] = orig[i] - _orig[i] - _current_cell[i] * _cell_size[i];
   }
   //_ray_occluders.clear();
@@ -359,7 +359,7 @@ bool Grid::initInfiniteRay (const Vec3r &orig,
   if(box.inside(orig)){
       for(unsigned i = 0; i < 3; i++) {
           _current_cell[i] = (unsigned)floor((orig[i] - _orig[i]) / _cell_size[i]);
-          unsigned u = _current_cell[i];
+          //soc unused - unsigned u = _current_cell[i];
           _pt[i] = orig[i] - _orig[i] - _current_cell[i] * _cell_size[i];
       }
   }else{
@@ -372,7 +372,7 @@ bool Grid::initInfiniteRay (const Vec3r &orig,
             _current_cell[i] = (unsigned)floor((newOrig[i] - _orig[i]) / _cell_size[i]);
             if(_current_cell[i] == _cells_nb[i])
                 _current_cell[i] = _cells_nb[i] - 1;
-            unsigned u = _current_cell[i];
+            //soc unused - unsigned u = _current_cell[i];
             _pt[i] = newOrig[i] - _orig[i] - _current_cell[i] * _cell_size[i];
         }
 
diff --git a/source/blender/freestyle/intern/geometry/Grid.h b/source/blender/freestyle/intern/geometry/Grid.h
index 6197721bb45..fdca13d4ca4 100755
--- a/source/blender/freestyle/intern/geometry/Grid.h
+++ b/source/blender/freestyle/intern/geometry/Grid.h
@@ -81,6 +81,7 @@ class LIB_GEOMETRY_EXPORT Cell
 
 class GridVisitor{
 public:
+	virtual ~GridVisitor() {}; //soc
     virtual void discoverCell(Cell *cell) {}
     virtual void examineOccluder(Polygon3r *occ) {}
     virtual void finishCell(Cell *cell) {}
@@ -106,10 +107,21 @@ private:
  * the intersection information are stored and accessible.
  */
 class firstIntersectionGridVisitor : public GridVisitor {
+
+//soc - changed order to remove warnings
+public:
+    double u_, v_, t_;
+private:
+    Polygon3r *occluder_;
+	Vec3r ray_org_, ray_dir_, cell_size_;
+    Cell * current_cell_;
+
 public:
       firstIntersectionGridVisitor(const Vec3r& ray_org, const Vec3r& ray_dir, const Vec3r& cell_size) : 
-      GridVisitor(), ray_org_(ray_org), cell_size_(cell_size),ray_dir_(ray_dir),occluder_(0),
-            u_(0),v_(0),t_(DBL_MAX),current_cell_(0){}
+		 GridVisitor(), u_(0),v_(0),t_(DBL_MAX),
+		 occluder_(0),
+		 ray_org_(ray_org), ray_dir_(ray_dir), cell_size_(cell_size),
+      	 current_cell_(0) {}
       virtual ~firstIntersectionGridVisitor() {}
 
     virtual void discoverCell(Cell *cell) {current_cell_=cell;}
@@ -117,14 +129,6 @@ public:
     virtual bool stop();
 
     Polygon3r * occluder() {return occluder_;}
-    
-public:
-    double u_, v_, t_;
-private:
-    Polygon3r *occluder_;
-    Vec3r ray_org_, ray_dir_;
-    Vec3r cell_size_;
-    Cell * current_cell_;
 };
 
 //
diff --git a/source/blender/freestyle/intern/image/GaussianFilter.h b/source/blender/freestyle/intern/image/GaussianFilter.h
index c75177541d3..c9ad04d4b80 100755
--- a/source/blender/freestyle/intern/image/GaussianFilter.h
+++ b/source/blender/freestyle/intern/image/GaussianFilter.h
@@ -116,8 +116,8 @@ float GaussianFilter::getSmoothedPixel(Map * map, int x, int y)
 {
   float sum = 0.f;  
   float L=0.f;
-  unsigned w=map->width();
-  unsigned h=map->height();
+  int w = (int)map->width(); //soc
+  int h = (int)map->height(); //soc
 
   // Current pixel is x,y
   // Sum surrounding pixels L value:
diff --git a/source/blender/freestyle/intern/image/ImagePyramid.cpp b/source/blender/freestyle/intern/image/ImagePyramid.cpp
index 45c02004d1c..e3f84983055 100755
--- a/source/blender/freestyle/intern/image/ImagePyramid.cpp
+++ b/source/blender/freestyle/intern/image/ImagePyramid.cpp
@@ -58,9 +58,9 @@ float ImagePyramid::pixel(int x, int y, int level){
   if(0 == level){
     return img->pixel(x,y);
   }
-  int i  = 1<<level;
-  int sx = x>>level;
-  int sy = y>>level;
+  uint i  = 1<<level;
+  uint sx = x>>level;
+  uint sy = y>>level;
   if(sx >= img->width())
     sx = img->width()-1;
   if(sy >= img->height())
@@ -135,7 +135,7 @@ void GaussianPyramid::BuildPyramid(GrayImage* level0, unsigned nbLevels){
   unsigned h = pLevel->height();
   if(nbLevels!=0)
   {
-    for(unsigned i=0; i<nbLevels; ++i){
+    for(unsigned i=0; i<nbLevels; ++i){ //soc
       w = pLevel->width()>>1;
       h = pLevel->height()>>1;
       GrayImage *img = new GrayImage(w,h);
diff --git a/source/blender/freestyle/intern/scene_graph/MaxFileLoader.h b/source/blender/freestyle/intern/scene_graph/MaxFileLoader.h
index ab31e656d46..179f9a016df 100755
--- a/source/blender/freestyle/intern/scene_graph/MaxFileLoader.h
+++ b/source/blender/freestyle/intern/scene_graph/MaxFileLoader.h
@@ -32,6 +32,9 @@
 
 # include <string.h>              
 # include <float.h>
+
+//soc - modified to adapt Blender's in
+// lib3ds includes
 # include <lib3ds/file.h>
 # include <lib3ds/node.h>
 # include <lib3ds/camera.h>
@@ -40,6 +43,7 @@
 # include <lib3ds/matrix.h>
 # include <lib3ds/vector.h>
 # include <lib3ds/file.h>
+
 # include "../system/FreestyleConfig.h"
 # include "NodeGroup.h"
 # include "NodeTransform.h"
diff --git a/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.cpp b/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.cpp
index cf2982606e0..ca0e97e68c1 100755
--- a/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.cpp
+++ b/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.cpp
@@ -89,13 +89,13 @@ namespace Functions1D {
   }  
 
   double GetDirectionalViewMapDensityF1D::operator()(Interface1D& inter) {
-    unsigned size;
+    //soc unsigned size;
     double res =  integrate(_fun, inter.pointsBegin(_sampling), inter.pointsEnd(_sampling), _integration);
     return res;
   } 
   
   double GetCompleteViewMapDensityF1D::operator()(Interface1D& inter) {
-    unsigned size;
+    //soc unsigned size;
     Id id = inter.getId();
     double res =  integrate(_fun, inter.pointsBegin(_sampling), inter.pointsEnd(_sampling), _integration);
     return res;
diff --git a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp
index c3827ae3e36..40a0bbbc738 100755
--- a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp
+++ b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp
@@ -20,7 +20,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include <fstream>
-#include <qimage.h>
 #include "BasicStrokeShaders.h"
 #include "../system/PseudoNoise.h"
 #include "../system/RandGen.h"
@@ -32,16 +31,32 @@
 #include "../system/StringUtils.h"
 #include "StrokeRenderer.h"
 #include "StrokeIO.h"
-#include <QString>
+
+//soc #include <qimage.h>
+//soc #include <QString>
+#include "IMB_imbuf.h"
+#include "IMB_imbuf_types.h"
 
 // Internal function
-void convert(const QImage& iImage, float **oArray, unsigned &oSize) {
-  oSize = iImage.width();
-  *oArray = new float[oSize];
-  for(unsigned i=0; i<oSize; ++i) {
-    QRgb rgb = iImage.pixel(i,0);
-    (*oArray)[i] = ((float)qBlue(rgb))/255.f;
-  }
+
+// soc
+// void convert(const QImage& iImage, float **oArray, unsigned &oSize) {
+//   oSize = iImage.width();
+//   *oArray = new float[oSize];
+//   for(unsigned i=0; i<oSize; ++i) {
+//     QRgb rgb = iImage.pixel(i,0);
+//     (*oArray)[i] = ((float)qBlue(rgb))/255.f;
+//   }
+// }
+void convert(ImBuf *imBuf, float **oArray, unsigned &oSize) {
+	oSize = imBuf->x;
+  	*oArray = new float[oSize];
+
+	char *pix;
+	for(unsigned i=0; i < oSize; ++i) {
+		pix = (char*) imBuf->rect + i*4;
+    	(*oArray)[i] = ((float) pix[2] )/255.f;
+  	}
 }
 
 namespace StrokeShaders {
@@ -137,7 +152,7 @@ namespace StrokeShaders {
   {
     float step = (_maxThickness-_minThickness)/3.f;
     float l = stroke.getLength2D();
-    float thickness;
+    float thickness = 0.0;
     if(l>300.f)
       thickness = _minThickness+3.f*step;
     else if((l< 300.f) && (l>100.f))
@@ -172,7 +187,7 @@ namespace StrokeShaders {
     _stretch = stretch;
     _minThickness = iMinThickness;
     _maxThickness = iMaxThickness;
-    QImage image;
+    ImBuf *image = 0; //soc
     vector<string> pathnames;
     StringUtils::getPathName(TextureManager::Options::getPatternsPath(),
 			     pattern_name,
@@ -180,11 +195,12 @@ namespace StrokeShaders {
     for (vector<string>::const_iterator j = pathnames.begin(); j != pathnames.end(); j++) {
       ifstream ifs(j->c_str());
       if (ifs.is_open()) {
-	image.load(j->c_str());
-	break;
+		//soc image.load(j->c_str());
+		image = IMB_loadiffname(j->c_str(), 0);
+		break;
       }
     }
-    if (image.isNull())
+    if (image == 0) //soc
       cerr << "Error: cannot find pattern \"" << pattern_name
 	   << "\" - check the path in the Options" << endl;
     else
@@ -315,7 +331,7 @@ namespace StrokeShaders {
 							   bool stretch)
     : StrokeShader() {
     _stretch = stretch;
-    QImage image;
+    ImBuf *image = 0; //soc
     vector<string> pathnames;
     StringUtils::getPathName(TextureManager::Options::getPatternsPath(),
 			     pattern_name,
@@ -323,11 +339,11 @@ namespace StrokeShaders {
     for (vector<string>::const_iterator j = pathnames.begin(); j != pathnames.end(); j++) {
       ifstream ifs(j->c_str());
       if (ifs.is_open()) {
-	image.load(j->c_str());
-	break;
+		image = IMB_loadiffname(j->c_str(), 0); //soc
+		break;
       }
     }
-    if (image.isNull())
+    if (image == 0) //soc
       cerr << "Error: cannot find pattern \"" << pattern_name
 	   << "\" - check the path in the Options" << endl;
     else
@@ -558,7 +574,7 @@ namespace StrokeShaders {
 
   void ExternalContourStretcherShader::shade(Stroke& stroke) const
   { 
-    float l=stroke.getLength2D();
+    //float l=stroke.getLength2D();
     Interface0DIterator it=stroke.verticesBegin();
     Functions0D::Normal2DF0D fun;
     StrokeVertex* sv;
@@ -1074,7 +1090,7 @@ namespace StrokeShaders {
     // number of vertices than before
     stroke.Resample(originalSize);
   
-    if(stroke.strokeVerticesSize() != originalSize)
+    if((int)stroke.strokeVerticesSize() != originalSize) //soc
       cerr << "Warning: resampling problem" << endl;
 
     // assign old attributes to new stroke vertices:
diff --git a/source/blender/freestyle/intern/stroke/Canvas.cpp b/source/blender/freestyle/intern/stroke/Canvas.cpp
index ecb76c4a015..7e63d964cb5 100755
--- a/source/blender/freestyle/intern/stroke/Canvas.cpp
+++ b/source/blender/freestyle/intern/stroke/Canvas.cpp
@@ -25,14 +25,19 @@
 #include "../system/TimeStamp.h"
 #include "../system/PseudoNoise.h"
 #include "Canvas.h"
-#include <qimage.h>
-#include <QString>
 #include "../image/Image.h"
 #include "../image/GaussianFilter.h"
 #include "../image/ImagePyramid.h"
 #include "../view_map/SteerableViewMap.h"
 #include "StyleModule.h"
 
+//soc #include <qimage.h>
+//soc #include <QString>
+#include <sstream>	
+#include "IMB_imbuf.h"
+#include "IMB_imbuf_types.h"
+#include "intern/IMB_bmp.h"
+
 using namespace std;
 
 LIB_STROKE_EXPORT
@@ -326,21 +331,35 @@ void Canvas::loadMap(const char *iFileName, const char *iMapName, unsigned int i
   }else{
     filePath = iFileName;
   }
-  QImage * qimg;
-  QImage newMap(filePath.c_str()); 
-  if(newMap.isNull()){
-    cout << "Could not load image file " << filePath << endl;
-    return;
-  }
-  qimg = &newMap;
-  
+
+  //soc
+  // QImage *qimg;
+  // QImage newMap(filePath.c_str()); 
+  // if(newMap.isNull()){
+  //   cout << "Could not load image file " << filePath << endl;
+  //   return;
+  // }
+  // qimg = &newMap;
+  	ImBuf *qimg = IMB_loadiffname(filePath.c_str(), 0);;
+  	if( qimg == 0 ){
+		cout << "Could not load image file " << filePath << endl;
+    	return;	
+	}
+
+  // soc
   //resize
-  QImage scaledImg;
-  if((newMap.width()!=width()) || (newMap.height()!=height())){
-	  scaledImg = newMap.scaled(width(), height(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
-    qimg = &scaledImg;
+  // QImage scaledImg;
+  // if((newMap.width()!=width()) || (newMap.height()!=height())){
+  // 	  scaledImg = newMap.scaled(width(), height(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+  //   qimg = &scaledImg;
+  // }
+	ImBuf *scaledImg;
+  if( ( qimg->x != width() ) || ( qimg->y != height() ) ){
+	scaledImg = IMB_dupImBuf(qimg);
+	IMB_scaleImBuf(scaledImg, width(), height());
   }
 
+
   // deal with color image 
   //  if(newMap->depth() != 8){
   //    int w = newMap->width();
@@ -356,13 +375,17 @@ void Canvas::loadMap(const char *iFileName, const char *iMapName, unsigned int i
   //    newMap = tmp;
   //  }
 
-  unsigned x,y;
-  int w = qimg->width();
-  int h = qimg->height();
+  int x,y;
+  int w = qimg->x;
+  int h = qimg->y;
+int rowbytes = w*4;
   GrayImage tmp(w,h);
+  char *pix;
+  
   for(y=0; y<h;++y){
     for(x=0;x<w;++x){
-      float c = qGray(qimg->pixel(x,y));// /255.f;
+		pix = (char*)qimg->rect + y*rowbytes + x*4;
+	  float c = (pix[0]*11 + pix[1]*16 + pix[2]*5)/32;
       tmp.setPixel(x,y,c);
     }
   }
@@ -380,20 +403,30 @@ void Canvas::loadMap(const char *iFileName, const char *iMapName, unsigned int i
   GaussianPyramid *pyramid = new GaussianPyramid(tmp, iNbLevels, iSigma);
   int ow = pyramid->width(0);
   int oh = pyramid->height(0);
-  QString base(iMapName);
-  for(unsigned i=0; i<pyramid->getNumberOfLevels(); ++i){
+  string base(iMapName); //soc
+  for(int i=0; i<pyramid->getNumberOfLevels(); ++i){
     // save each image:
     //    w = pyramid.width(i);
     //    h = pyramid.height(i);
-	  QImage qtmp(ow, oh, QImage::Format_RGB32);
-    //int k = (1<<i);
+	
+	//soc  QImage qtmp(ow, oh, QImage::Format_RGB32);
+    ImBuf *qtmp = IMB_allocImBuf(ow, oh, 32, IB_rect, 0);
+
+//int k = (1<<i);
     for(y=0;y<oh;++y){
       for(x=0;x<ow;++x){
         int c = pyramid->pixel(x,y,i);//255*pyramid->pixel(x,y,i);
-        qtmp.setPixel(x,y,qRgb(c,c,c));
+        //soc qtmp.setPixel(x,y,qRgb(c,c,c));
+		pix = (char*)qtmp->rect + y*rowbytes + x*4;
+		pix[0] = pix [1] = pix[2] = c;
       }
     }
-    qtmp.save(base+QString::number(i)+".bmp", "BMP");
+    //soc qtmp.save(base+QString::number(i)+".bmp", "BMP");
+	stringstream filename;
+	filename << base;
+	filename << i << ".bmp";	
+	imb_savebmp(qtmp, const_cast<char *>(filename.str().c_str()), 0);
+	
   }
   //  QImage *qtmp = new QImage(w, h, 32);
   //  for(y=0;y<h;++y){
diff --git a/source/blender/freestyle/intern/stroke/ChainingIterators.cpp b/source/blender/freestyle/intern/stroke/ChainingIterators.cpp
index 206b6eb7364..ede3488c546 100755
--- a/source/blender/freestyle/intern/stroke/ChainingIterators.cpp
+++ b/source/blender/freestyle/intern/stroke/ChainingIterators.cpp
@@ -106,7 +106,7 @@ ViewEdge * ChainSilhouetteIterator::traverse(const AdjacencyIterator& ait){
     return 0;
   }
   if(nextVertex->getNature() & Nature::NON_T_VERTEX){
-    NonTVertex * nontvertex = (NonTVertex*)nextVertex;
+    //soc NonTVertex * nontvertex = (NonTVertex*)nextVertex;
     ViewEdge * newEdge(0);
     // we'll try to chain the edges by keeping the same nature...
     // the preseance order is : SILHOUETTE, BORDER, CREASE, SUGGESTIVE, VALLEY, RIDGE
diff --git a/source/blender/freestyle/intern/stroke/Operators.cpp b/source/blender/freestyle/intern/stroke/Operators.cpp
index 121dee3ba26..8e34d9c5197 100755
--- a/source/blender/freestyle/intern/stroke/Operators.cpp
+++ b/source/blender/freestyle/intern/stroke/Operators.cpp
@@ -71,7 +71,7 @@ void Operators::chain(ViewEdgeInternal::ViewEdgeIterator& it,
 
   unsigned id = 0;
   ViewEdge* edge;
-  Chain* new_chain;
+  //soc unused - Chain* new_chain;
 
   for (I1DContainer::iterator it_edge = _current_view_edges_set.begin();
        it_edge != _current_view_edges_set.end();
@@ -108,7 +108,7 @@ void Operators::chain(ViewEdgeInternal::ViewEdgeIterator& it,
   Predicates1D::EqualToChainingTimeStampUP1D pred_ts(TimeStamp::instance()->getTimeStamp()+1);
 
   ViewEdge* edge;
-  Chain* new_chain;
+  //soc Chain* new_chain;
 
   for (I1DContainer::iterator it_edge = _current_view_edges_set.begin();
        it_edge != _current_view_edges_set.end();
@@ -232,7 +232,7 @@ void Operators::bidirectionalChain(ChainingIterator& it, UnaryPredicate1D& pred)
   Predicates1D::EqualToChainingTimeStampUP1D pred_ts(TimeStamp::instance()->getTimeStamp()+1);
   
   ViewEdge* edge;
-  Chain* new_chain;
+  //soc unused - Chain* new_chain;
   
   for (I1DContainer::iterator it_edge = _current_view_edges_set.begin();
   it_edge != _current_view_edges_set.end();
@@ -279,7 +279,7 @@ void Operators::bidirectionalChain(ChainingIterator& it) {
   Predicates1D::EqualToChainingTimeStampUP1D pred_ts(TimeStamp::instance()->getTimeStamp()+1);
   
   ViewEdge* edge;
-  Chain* new_chain;
+  //soc unused - Chain* new_chain;
   
   for (I1DContainer::iterator it_edge = _current_view_edges_set.begin();
   it_edge != _current_view_edges_set.end();
@@ -604,7 +604,7 @@ void __recursiveSplit(Chain *_curve, UnaryFunction0D<double>& func, UnaryPredica
   //real _min                                           = func(it0d);++it;
   real _min                                           = FLT_MAX;++it;
   real mean                                           = 0.f;
-  real variance                                       = 0.f;
+  //soc unused - real variance                                       = 0.f;
   unsigned count                                      = 0;
   CurveInternal::CurvePointIterator next              = it;++next;
   real tmp;
@@ -767,7 +767,7 @@ Stroke* createStroke(Interface1D& inter) {
   Vec3r previous = current;
   SVertex* sv;
   CurvePoint* cp;
-  StrokeVertex* stroke_vertex;  
+  StrokeVertex* stroke_vertex = NULL;  
 
   do {
     cp = dynamic_cast<CurvePoint*>(&(*it));
diff --git a/source/blender/freestyle/intern/stroke/Stroke.cpp b/source/blender/freestyle/intern/stroke/Stroke.cpp
index d6ff4d255c4..7e7eb5ff3f0 100755
--- a/source/blender/freestyle/intern/stroke/Stroke.cpp
+++ b/source/blender/freestyle/intern/stroke/Stroke.cpp
@@ -463,7 +463,7 @@ void Stroke::SetLength(float iLength)
 
 float Stroke::ComputeSampling(int iNVertices)
 {
-  if(iNVertices <= _Vertices.size())
+  if(iNVertices <= (int)_Vertices.size()) //soc
     return _sampling;
 
   float sampling = _Length/(float)(iNVertices-_Vertices.size()+1);
diff --git a/source/blender/freestyle/intern/stroke/StrokeRep.cpp b/source/blender/freestyle/intern/stroke/StrokeRep.cpp
index 055e1fb1be4..51a1c8cfd4d 100755
--- a/source/blender/freestyle/intern/stroke/StrokeRep.cpp
+++ b/source/blender/freestyle/intern/stroke/StrokeRep.cpp
@@ -303,7 +303,7 @@ Strip::createStrip (const vector<StrokeVertex*>& iStrokeVertices)
     real dp1 = userDir*orthDir;
     real dp2 = userDir*t;
     real h = (thicknessLast[1]+thicknessLast[0])/dp1;
-    real x = fabs(h*dp2/2.0);
+    //soc unused - real x = fabs(h*dp2/2.0);
     if(dp1>0){
       //i'm in the upper part of the unit circle
       if(dp2>0){
@@ -367,7 +367,7 @@ Strip::createStrip (const vector<StrokeVertex*>& iStrokeVertices)
   if (iStrokeVertices.size()<3)
     _averageThickness=0.5*(thicknessLast[1]+thicknessLast[0]+thickness[0]+thickness[1]);
 
-  if (i!=2*iStrokeVertices.size())
+  if (i != 2*(int)iStrokeVertices.size())
     cerr << "Warning: problem with stripe size\n";
 
   cleanUpSingularities (iStrokeVertices);
@@ -380,7 +380,7 @@ void
 Strip::cleanUpSingularities (const vector<StrokeVertex*>& iStrokeVertices)
 {
   int k;
-  unsigned sizeStrip = _vertices.size();
+  int sizeStrip = _vertices.size();
 
   for (k=0; k<sizeStrip; k++)
     if (notValid(_vertices[k]->point2d()))
@@ -393,7 +393,7 @@ Strip::cleanUpSingularities (const vector<StrokeVertex*>& iStrokeVertices)
   if (iStrokeVertices.size()<2) return;
   int i=0, j;
   vector<StrokeVertex*>::const_iterator v ,vend, v2, vPrev;
-  StrokeVertex *sv, *sv2, *svPrev;
+StrokeVertex *sv, *sv2; //soc unused -  *svPrev;
 	
   bool singu1=false, singu2=false;
   int timeSinceSingu1=0, timeSinceSingu2=0;
@@ -469,7 +469,7 @@ Strip::cleanUpSingularities (const vector<StrokeVertex*>& iStrokeVertices)
     {
       //traverse all the vertices of the singularity and average them
       Vec2r avP(0.0,0.0);
-      for (int j=i-timeSinceSingu1; j<i; j++)
+      for (j=i-timeSinceSingu1; j<i; j++)
 	avP=Vec2r(avP+_vertices[2*j]->point2d());
       avP=Vec2r(1.0/float(timeSinceSingu1)*avP);
       for (j=i-timeSinceSingu1; j<i; j++)
@@ -525,18 +525,18 @@ Strip::computeTexCoord (const vector<StrokeVertex*>& iStrokeVertices)
 void
 Strip::computeTexCoordWithTips (const vector<StrokeVertex*>& iStrokeVertices, bool tipBegin, bool tipEnd)
 {
-  unsigned int sizeStrip = _vertices.size()+8; //for the transition between the tip and the body
+  //soc unused - unsigned int sizeStrip = _vertices.size()+8; //for the transition between the tip and the body
   vector<StrokeVertex*>::const_iterator v ,vend;
-  StrokeVertex *sv;
+  StrokeVertex *sv = 0;
 
   v=iStrokeVertices.begin();
   vend=iStrokeVertices.end();
   float l=(*v)->strokeLength()/_averageThickness;
   int tiles=int(l);
   float fact=(float(tiles)+0.5)/l;
-  float uTip2=float(tiles)+0.25;
+  //soc unused - float uTip2=float(tiles)+0.25;
   float u=0; 
-  float uPrev;
+  float uPrev=0;
   int i=0;
   float t;
   StrokeVertexRep *tvRep1, *tvRep2;
@@ -757,7 +757,7 @@ StrokeRep::StrokeRep(Stroke *iStroke)
 
 StrokeRep::StrokeRep(const StrokeRep& iBrother)
 {
-  int i=0;
+  //soc unused - int i=0;
   _stroke = iBrother._stroke;
   _strokeType=iBrother._strokeType;
   _textureId = iBrother._textureId;
diff --git a/source/blender/freestyle/intern/system/Interpreter.h b/source/blender/freestyle/intern/system/Interpreter.h
index ce603b17238..45cb7793cfd 100755
--- a/source/blender/freestyle/intern/system/Interpreter.h
+++ b/source/blender/freestyle/intern/system/Interpreter.h
@@ -40,6 +40,8 @@ class LIB_SYSTEM_EXPORT Interpreter
 
   Interpreter() { _language = "Unknown"; }
 
+  virtual ~Interpreter() {}; //soc
+
   virtual int interpretCmd(const string& cmd) = 0;
 
   virtual int interpretFile(const string& filename) = 0;
diff --git a/source/blender/freestyle/intern/system/PseudoNoise.cpp b/source/blender/freestyle/intern/system/PseudoNoise.cpp
index 59332229ae2..4d62f967cde 100755
--- a/source/blender/freestyle/intern/system/PseudoNoise.cpp
+++ b/source/blender/freestyle/intern/system/PseudoNoise.cpp
@@ -36,7 +36,7 @@ PseudoNoise::init (long seed)
 {
   _values = new real[NB_VALUE_NOISE];
   RandGen::srand48(seed);
-  for (int i=0; i<NB_VALUE_NOISE; i++)
+  for (uint i=0; i<NB_VALUE_NOISE; i++)
     _values[i] = -1.0 + 2.0 * RandGen::drand48();
 }
 
diff --git a/source/blender/freestyle/intern/system/StringUtils.cpp b/source/blender/freestyle/intern/system/StringUtils.cpp
index 2af76feeb37..1afee94d962 100755
--- a/source/blender/freestyle/intern/system/StringUtils.cpp
+++ b/source/blender/freestyle/intern/system/StringUtils.cpp
@@ -19,10 +19,14 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include <qfileinfo.h>
+//soc #include <qfileinfo.h>
 #include "FreestyleConfig.h"
 #include "StringUtils.h"
 
+//soc
+#include "BKE_utildefines.h"
+#include "BLI_blenlib.h"
+
 namespace StringUtils {
 
   void getPathName(const string& path, const string& base, vector<string>& pathnames) {
@@ -33,12 +37,18 @@ namespace StringUtils {
 	 pos < size;
 	 pos = sep + 1, sep = path.find(Config::PATH_SEP, pos)) {
       if (sep == (unsigned)string::npos)
-	sep = size;
+		sep = size;
       dir = path.substr(pos, sep - pos);
-      QFileInfo fi(dir.c_str());
-      string res = (const char*)fi.absoluteFilePath().toAscii();
+
+//soc      QFileInfo fi(dir.c_str());
+//soc      string res = (const char*)fi.absoluteFilePath().toAscii();
+	char cleaned[FILE_MAX];
+	BLI_strncpy(cleaned, dir.c_str(), FILE_MAX);
+	BLI_cleanup_file(NULL, cleaned);
+	string res(cleaned);
+	
       if (!base.empty())
-	res += Config::DIR_SEP + base;
+		res += Config::DIR_SEP + base;
       pathnames.push_back(res);
     }
   }
diff --git a/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp b/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp
index 628b3ad77aa..d9caee85e18 100755
--- a/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp
+++ b/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp
@@ -143,7 +143,8 @@ void FEdgeXDetector::computeCurvatures(WXVertex *vertex){
    // CURVATURE LAYER
   // store all the curvature datas for each vertex
 
-  real K1, K2, cos2theta, sin2theta;
+  //soc unused - real K1, K2
+  real cos2theta, sin2theta;
   Vec3r e1, n, v;
   // one vertex curvature info :
   CurvatureInfo *C;
diff --git a/source/blender/freestyle/intern/view_map/FEdgeXDetector.h b/source/blender/freestyle/intern/view_map/FEdgeXDetector.h
index 38d0f34e21f..a6235dd53b5 100755
--- a/source/blender/freestyle/intern/view_map/FEdgeXDetector.h
+++ b/source/blender/freestyle/intern/view_map/FEdgeXDetector.h
@@ -126,7 +126,7 @@ protected:
 
   Vec3r _Viewpoint;
   real _bbox_diagonal; // diagonal of the current processed shape bbox
-  //tmp values
+  //oldtmp values
   bool _computeViewIndependant;
   real _meanK1;
   real _meanKr;
diff --git a/source/blender/freestyle/intern/view_map/Interface0D.h b/source/blender/freestyle/intern/view_map/Interface0D.h
index eec39d2f7bc..fd2e882e9b6 100755
--- a/source/blender/freestyle/intern/view_map/Interface0D.h
+++ b/source/blender/freestyle/intern/view_map/Interface0D.h
@@ -52,6 +52,8 @@ class TVertex;
 class Interface0D
 {
 public:
+ 
+	virtual ~Interface0D() {}; //soc
 
   /*! Returns the string "Interface0D".*/
   virtual string getExactTypeName() const {
diff --git a/source/blender/freestyle/intern/view_map/Interface1D.h b/source/blender/freestyle/intern/view_map/Interface1D.h
index 812187e5ec1..96dd94c36f9 100755
--- a/source/blender/freestyle/intern/view_map/Interface1D.h
+++ b/source/blender/freestyle/intern/view_map/Interface1D.h
@@ -127,6 +127,7 @@ public:
 
   /*! Default constructor */
   Interface1D() {_timeStamp=0;}
+   virtual ~Interface1D() {}; //soc
 
   /*! Returns the string "Interface1D" .*/
   virtual string getExactTypeName() const {
diff --git a/source/blender/freestyle/intern/view_map/Silhouette.h b/source/blender/freestyle/intern/view_map/Silhouette.h
index e88bf23b210..958c0545d6d 100755
--- a/source/blender/freestyle/intern/view_map/Silhouette.h
+++ b/source/blender/freestyle/intern/view_map/Silhouette.h
@@ -1248,7 +1248,7 @@ public:
    */
   inline FEdge* SplitEdgeIn2(FEdge* ioEdge, SVertex * ioNewVertex)
     {
-      SVertex *A = ioEdge->vertexA();
+      //soc unused - SVertex *A = ioEdge->vertexA();
       SVertex *B = ioEdge->vertexB();
 
       
diff --git a/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp b/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
index b2604606aa7..3870edc2b75 100755
--- a/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
+++ b/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
@@ -26,8 +26,12 @@
 #include "../geometry/Geom.h"
 using namespace Geometry;
 
-#include <qstring.h>
-#include <qimage.h>
+//soc #include <qstring.h>
+//soc #include <qimage.h>
+#include <sstream>
+#include "IMB_imbuf.h"
+#include "IMB_imbuf_types.h"
+#include "intern/IMB_png.h"
 
 SteerableViewMap::SteerableViewMap(unsigned int nbOrientations){
   _nbOrientations = nbOrientations;
@@ -121,7 +125,7 @@ double * SteerableViewMap::AddFEdge(FEdge *iFEdge){
 
 unsigned SteerableViewMap::getSVMNumber(const Vec2f& orient){
   Vec2f dir(orient);
-  unsigned res = 0;
+  //soc unsigned res = 0;
   real norm = dir.norm();
   if(norm < 1e-6){
     return _nbOrientations+1;
@@ -205,20 +209,37 @@ void SteerableViewMap::saveSteerableViewMap() const {
     }
     int ow = _imagesPyramids[i]->width(0);
     int oh = _imagesPyramids[i]->height(0);
-    QString base("SteerableViewMap");
-    for(unsigned j=0; j<_imagesPyramids[i]->getNumberOfLevels(); ++j){
+
+    //soc QString base("SteerableViewMap");
+	string base("SteerableViewMap");
+	stringstream filename;
+	
+    for(int j=0; j<_imagesPyramids[i]->getNumberOfLevels(); ++j){ //soc
       float coeff = 1;//1/255.f; //100*255;//*pow(2,j);
-	  QImage qtmp(ow, oh, QImage::Format_RGB32);
-      for(unsigned y=0;y<oh;++y){
-        for(unsigned x=0;x<ow;++x){
+	  //soc QImage qtmp(ow, oh, QImage::Format_RGB32);
+	  ImBuf *ibuf = IMB_allocImBuf(ow, oh, 32, IB_rect, 0);
+	  int rowbytes = ow*4;
+	  char *pix;
+      
+	for(int y=0;y<oh;++y){ //soc
+		for(int x=0;x<ow;++x){ //soc
           int c = (int)(coeff*_imagesPyramids[i]->pixel(x,y,j));
           if(c>255)
             c=255;
           //int c = (int)(_imagesPyramids[i]->pixel(x,y,j));
-          qtmp.setPixel(x,y,qRgb(c,c,c));
+          
+		//soc qtmp.setPixel(x,y,qRgb(c,c,c));
+		  pix = (char*)ibuf->rect + y*rowbytes + x*4;
+		pix[0] = pix [1] = pix[2] = c;
         }
       }
-      qtmp.save(base+QString::number(i)+"-"+QString::number(j)+".png", "PNG");
+
+      //soc qtmp.save(base+QString::number(i)+"-"+QString::number(j)+".png", "PNG");
+	filename << base;
+	filename << i << "-" << j << ".png";
+	
+	imb_savepng(ibuf, const_cast<char *>(filename.str().c_str()), 0);
+	
     }
     //    QString base("SteerableViewMap");
     //    for(unsigned j=0; j<_imagesPyramids[i]->getNumberOfLevels(); ++j){
diff --git a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp
index 20b3aeb144d..bf4369bcf41 100755
--- a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp
@@ -169,7 +169,7 @@ ViewEdge * ViewEdgeXBuilder::BuildSmoothViewEdge(const OWXFaceLayer& iFaceLayer)
   // build FEdges
   FEdge * feprevious = 0;
   FEdge * fefirst = 0;
-  FEdge * fe;
+  FEdge * fe = 0;
   for(list<OWXFaceLayer>::iterator fl = facesChain.begin(), flend=facesChain.end();
   fl!=flend;
   ++fl){
@@ -243,7 +243,7 @@ ViewEdge * ViewEdgeXBuilder::BuildSharpViewEdge(const OWXEdge& iWEdge) {
   // build FEdges
   FEdge * feprevious = 0;
   FEdge * fefirst = 0;
-  FEdge * fe;
+  FEdge * fe = 0;
   for(list<OWXEdge>::iterator we = edgesChain.begin(), weend=edgesChain.end();
   we!=weend;
   ++we){
diff --git a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h
index 9e2837b49a7..da63fa2f515 100755
--- a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h
+++ b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h
@@ -35,12 +35,13 @@
 # include <utility>
 # include <vector>
 
-# if defined(__GNUC__) && (__GNUC__ >= 3)
-//hash_map is not part of the C++ standard anymore; hash_map.h has been kept though for backward compatibility
-#  include <hash_map.h>
-# else
-#  include <hash_map>
-# endif
+// soc
+// # if defined(__GNUC__) && (__GNUC__ >= 3)
+// //hash_map is not part of the C++ standard anymore; hash_map.h has been kept though for backward compatibility
+// #  include <hash_map.h>
+// # else
+// #  include <hash_map>
+// # endif
 
 # include "../system/FreestyleConfig.h"
 # include "../geometry/Geom.h"
@@ -202,7 +203,7 @@ protected:
   /*! instanciate a ViewVertex from a SVertex, if it doesn't exist yet */
   ViewVertex * MakeViewVertex(SVertex *iSVertex);
 
-  //tmp values
+  //oldtmp values
   //  IdHashTable _hashtable;
   //  VVIdHashTable _multivertexHashTable;
   SVertexMap _SVertexMap;
diff --git a/source/blender/freestyle/intern/view_map/ViewMapIO.cpp b/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
index d68164973a1..4e2796113c8 100755
--- a/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
@@ -937,7 +937,7 @@ namespace ViewMapIO {
     if (!vm)
       return 1;
 
-    unsigned tmp;
+    //soc unused - unsigned tmp;
 
     int err = 0;
 
diff --git a/source/blender/freestyle/intern/winged_edge/WEdge.h b/source/blender/freestyle/intern/winged_edge/WEdge.h
index 2369caf4566..1ab37246469 100755
--- a/source/blender/freestyle/intern/winged_edge/WEdge.h
+++ b/source/blender/freestyle/intern/winged_edge/WEdge.h
@@ -117,6 +117,7 @@ public:
 # else
     inline incoming_edge_iterator() : iterator<input_iterator_tag, WOEdge*,ptrdiff_t>() {}
 # endif
+	virtual ~incoming_edge_iterator() {}; //soc
 
   protected:
     friend class WVertex;
@@ -197,6 +198,7 @@ public:
 # else
     inline face_iterator() : iterator<input_iterator_tag, WFace*,ptrdiff_t>() {}
 # endif
+	virtual ~face_iterator() {}; //soc
 
   protected:
     friend class WVertex;
@@ -308,6 +310,7 @@ public:
     _pOwner = NULL;
     userdata = NULL;
   }
+  virtual ~WOEdge() {}; //soc
 
   /*! copy constructor */
   WOEdge(WOEdge& iBrother);
diff --git a/source/blender/freestyle/intern/winged_edge/WSFillGrid.cpp b/source/blender/freestyle/intern/winged_edge/WSFillGrid.cpp
index cf3734b488e..55fa418d4f5 100755
--- a/source/blender/freestyle/intern/winged_edge/WSFillGrid.cpp
+++ b/source/blender/freestyle/intern/winged_edge/WSFillGrid.cpp
@@ -19,7 +19,7 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "WSEdge.h"
+#include "WEdge.h"
 #include "WSFillGrid.h"
 
 void WSFillGrid::fillGrid() {
diff --git a/source/blender/freestyle/intern/winged_edge/WSFillGrid.h b/source/blender/freestyle/intern/winged_edge/WSFillGrid.h
index 976fdca8e46..2ea5bc6c621 100755
--- a/source/blender/freestyle/intern/winged_edge/WSFillGrid.h
+++ b/source/blender/freestyle/intern/winged_edge/WSFillGrid.h
@@ -31,8 +31,8 @@
 #ifndef  WS_FILL_GRID_H
 # define WS_FILL_GRID_H
 
-# include "Grid.h" 
-# include "Polygon.h"
+# include "../geometry/Grid.h" 
+# include "../geometry/Polygon.h"
 # include "WEdge.h"
 
 class LIB_WINGED_EDGE_EXPORT WSFillGrid
diff --git a/source/blender/freestyle/intern/winged_edge/WXEdge.h b/source/blender/freestyle/intern/winged_edge/WXEdge.h
index beacb1a9ca9..66204ba5e99 100755
--- a/source/blender/freestyle/intern/winged_edge/WXEdge.h
+++ b/source/blender/freestyle/intern/winged_edge/WXEdge.h
@@ -208,7 +208,7 @@ public:
   WXSmoothEdge * _pSmoothEdge;
   WXNature _Nature;
 
-  //tmp values
+  //oldtmp values
   unsigned _nPosDotP; // count the number of positive dot products for vertices.
                       // if this number is != 0 and !=_DotP.size() -> it is a silhouette fac
 
diff --git a/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp
index 98e7c269248..e611c1106f2 100755
--- a/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp
+++ b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp
@@ -64,7 +64,7 @@ void WingedEdgeBuilder::visitNodeTransformAfter(NodeTransform&) {
 void WingedEdgeBuilder::buildWShape(WShape& shape, IndexedFaceSet& ifs) {
   unsigned	vsize = ifs.vsize();
   unsigned	nsize = ifs.nsize();
-  unsigned	tsize = ifs.tsize();
+  //soc unused - unsigned	tsize = ifs.tsize();
 
   const real*	vertices = ifs.vertices();
   const real*	normals = ifs.normals();

From 6069124ac9ae87802503b1370868b3d8b239fc13 Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Sun, 11 May 2008 21:13:54 +0000
Subject: [PATCH 008/252] soc-2008-mxcurioni: lib3ds SConscript updated to
 compile under Win32 configs

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

diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript
index b56c0c66c6e..de97e261bfb 100644
--- a/source/blender/freestyle/SConscript
+++ b/source/blender/freestyle/SConscript
@@ -7,7 +7,7 @@ defs = []
 incs = ''
 
 incs += '../blenkernel ../blenlib ../imbuf ../makesdna'
-# incs += ' #/extern/freestyle/lib3ds #/extern/freestyle/swig'
+incs += ' #/extern/freestyle/lib3ds'
 incs += ' ' + env['BF_PYTHON_INC']
 incs += ' ' + env['BF_LIB3DS_INC']
 incs += ' ' + env['BF_PNG_INC']

From 29b2db85181414b2581dd303a654b8d61ac80fbd Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Sun, 11 May 2008 21:49:04 +0000
Subject: [PATCH 009/252] soc-2008-mxcurioni: swig SConscript updated to
 compile under all configs except Win32 (where binary is copied to build
 directory)

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

diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript
index de97e261bfb..6e13af06ee2 100644
--- a/source/blender/freestyle/SConscript
+++ b/source/blender/freestyle/SConscript
@@ -7,7 +7,7 @@ defs = []
 incs = ''
 
 incs += '../blenkernel ../blenlib ../imbuf ../makesdna'
-incs += ' #/extern/freestyle/lib3ds'
+incs += ' #/extern/freestyle/lib3ds' 
 incs += ' ' + env['BF_PYTHON_INC']
 incs += ' ' + env['BF_LIB3DS_INC']
 incs += ' ' + env['BF_PNG_INC']

From 55655a065943d67dbdb584e8426a60793e65d6f1 Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Sun, 18 May 2008 13:01:52 +0000
Subject: [PATCH 010/252] soc-2008-mxcurioni: towards Freestyle's first render:
 controller, config, appglwidget corrected. Freestyle is called but cannot be
 linked (ImBuf issues). This is an unstable commit.

---
 source/blender/freestyle/SConscript           |   18 +-
 source/blender/freestyle/intern/CHANGELOG.TXT |   47 -
 .../intern/app_blender/AppCanvas.cpp          |  404 +++++++
 .../freestyle/intern/app_blender/AppCanvas.h  |   55 +
 .../intern/app_blender/AppGLWidget.cpp        |  611 ++++++++++
 .../intern/app_blender/AppGLWidget.h          |  593 ++++++++++
 .../intern/app_blender/Controller.cpp         | 1050 +++++++++++++++++
 .../freestyle/intern/app_blender/Controller.h |  213 ++++
 .../intern/rendering/GLDebugRenderer.cpp      |    2 +-
 .../intern/view_map/SteerableViewMap.cpp      |    1 +
 .../freestyle/{intern => misc}/AUTHORS.TXT    |    0
 .../freestyle/{intern => misc}/BUGS.TXT       |    0
 .../freestyle/{intern => misc}/COPYRIGHT.TXT  |    0
 .../freestyle/{intern => misc}/Config.pri     |    0
 .../{intern => misc}/Freestyle-vc7-debug.sln  |    0
 .../Freestyle-vc7-release.sln                 |    0
 .../{intern => misc}/Freestyle-vc8-debug.sln  |    0
 .../Freestyle-vc8-release.sln                 |    0
 .../freestyle/{intern => misc}/INSTALL.TXT    |    0
 .../freestyle/{intern => misc}/LICENSE.TXT    |    0
 .../freestyle/{intern => misc}/Makefile.pro   |    0
 .../freestyle/{intern => misc}/README.TXT     |    0
 .../freestyle/{intern => misc}/THANKS.TXT     |    0
 .../freestyle/{intern => misc}/TODO.TXT       |    0
 .../{intern => misc}/build_bundle.macosx.py   |    0
 .../freestyle/{intern => misc}/libconfig.pri  |    0
 .../{intern => misc}/makedsp.vcnet.debug.bat  |    0
 .../makedsp.vcnet.release.bat                 |    0
 source/blender/imbuf/SConscript               |    2 +-
 source/blender/makesdna/DNA_scene_types.h     |    1 +
 source/blender/python/api2_2x/sceneRender.c   |    3 +
 source/blender/render/SConscript              |    1 +
 .../blender/render/intern/source/pipeline.c   |   17 +-
 source/blender/src/buttons_scene.c            |    4 +-
 source/blender/src/renderwin.c                |    2 +
 35 files changed, 2963 insertions(+), 61 deletions(-)
 delete mode 100755 source/blender/freestyle/intern/CHANGELOG.TXT
 create mode 100755 source/blender/freestyle/intern/app_blender/AppCanvas.cpp
 create mode 100755 source/blender/freestyle/intern/app_blender/AppCanvas.h
 create mode 100755 source/blender/freestyle/intern/app_blender/AppGLWidget.cpp
 create mode 100755 source/blender/freestyle/intern/app_blender/AppGLWidget.h
 create mode 100755 source/blender/freestyle/intern/app_blender/Controller.cpp
 create mode 100755 source/blender/freestyle/intern/app_blender/Controller.h
 rename source/blender/freestyle/{intern => misc}/AUTHORS.TXT (100%)
 rename source/blender/freestyle/{intern => misc}/BUGS.TXT (100%)
 rename source/blender/freestyle/{intern => misc}/COPYRIGHT.TXT (100%)
 rename source/blender/freestyle/{intern => misc}/Config.pri (100%)
 rename source/blender/freestyle/{intern => misc}/Freestyle-vc7-debug.sln (100%)
 rename source/blender/freestyle/{intern => misc}/Freestyle-vc7-release.sln (100%)
 rename source/blender/freestyle/{intern => misc}/Freestyle-vc8-debug.sln (100%)
 rename source/blender/freestyle/{intern => misc}/Freestyle-vc8-release.sln (100%)
 rename source/blender/freestyle/{intern => misc}/INSTALL.TXT (100%)
 rename source/blender/freestyle/{intern => misc}/LICENSE.TXT (100%)
 rename source/blender/freestyle/{intern => misc}/Makefile.pro (100%)
 rename source/blender/freestyle/{intern => misc}/README.TXT (100%)
 rename source/blender/freestyle/{intern => misc}/THANKS.TXT (100%)
 rename source/blender/freestyle/{intern => misc}/TODO.TXT (100%)
 rename source/blender/freestyle/{intern => misc}/build_bundle.macosx.py (100%)
 rename source/blender/freestyle/{intern => misc}/libconfig.pri (100%)
 rename source/blender/freestyle/{intern => misc}/makedsp.vcnet.debug.bat (100%)
 rename source/blender/freestyle/{intern => misc}/makedsp.vcnet.release.bat (100%)

diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript
index 6e13af06ee2..1f5359c5d39 100644
--- a/source/blender/freestyle/SConscript
+++ b/source/blender/freestyle/SConscript
@@ -46,23 +46,25 @@ stroke_sources = env.Glob(prefix + '/*.cpp')
 
 #	rendering
 prefix = 'intern/rendering'
-stroke_sources = env.Glob(prefix + '/GL*.cpp')
+rendering_sources = env.Glob(prefix + '/GL*.cpp')
 
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'):
-	stroke_sources = env.Glob(prefix + '/extgl.cpp')
+	rendering_sources = env.Glob(prefix + '/extgl.cpp')
 
-# 	app
+# 	app / app_blender
+prefix = 'intern/app_blender'
+app_sources = env.Glob(prefix + '/*.cpp')
 
-sources = 	system_sources + image_sources + geometry_sources + scene_graph_sources + \
-			winged_edge_sources + view_map_sources + stroke_sources
-#print sources
+sources = 	system_sources + image_sources + geometry_sources + scene_graph_sources \
+		  +	winged_edge_sources + view_map_sources + stroke_sources + rendering_sources \
+		  + app_sources
 
 env.BlenderLib (libname="bf_freestyle",
 				sources=sources,
                 includes=Split(incs),
                 defines=defs,
-                libtype=['blender'],
-                priority = [15] )
+				libtype=['blender'],
+                priority = [20] )
 
 ########################################################
 # SWIG
diff --git a/source/blender/freestyle/intern/CHANGELOG.TXT b/source/blender/freestyle/intern/CHANGELOG.TXT
deleted file mode 100755
index cb9f088bc1f..00000000000
--- a/source/blender/freestyle/intern/CHANGELOG.TXT
+++ /dev/null
@@ -1,47 +0,0 @@
-2008-03-06 - freestyle-2.2.0
-	* Fixed a bug related to the ViewShape IDs that caused the ray casting to crash.
-	* Fixed a bug in the style module insertion.
-                
-2008-03-02 - freestyle-2.1.1
-	* Added the management of texture coordinates in the scene graph and the rendering.
-	* The reps in the scene graph are now assigned ids based on the lib3ds nodes ids. These ids are transmitted to the WingedEdge Shapes.
-2007-10-05 - freestyle-2.0.1
-
-	* Enforced node construction from lib3ds (thanks to Thomas Netter)
-        * Reverted to not using bundles by default on MacOSX. Activating bundles can be made by uncommenting the lib_bundle line of the CONFIG variable in Config.pri
-        * Added a NodeCamera to the scene graph.
-        * Made sure the display lists were compiled AND executed (GL_COMPILE -> GL_COMPILE_AND_EXECUTE) for IndexedFaceSet.
-        * Added a visitor to deallocate memory on the graphics card (display lists right now).
-        * Modified the grid to use a visitor pattern for ray casting and grid traversal.
-        
-
-
-2007-05-06 - freestyle-2.0.0
-
-	* Switched to Qt 4.2.3, swig 1.3.31, visual c++ 2005, gcc 4.0.1, qglviewer 2.2.5-1
-	* Added texture coordinates to scene graph
-	* Made the grid more robust
-        * Now compiles on MacOSX
-        * Fixed the brush texture problem: the full path to the texture was used instead of the base name and that was breaking the search path algorithm
-
-
-2006-06-18 - freestyle-1.0.2
-
-	* Fixed a bug related to the loading of OpenGL extensions.
-
-
-2005-07-25 - freestyle-1.0.1
-
-	* Upgrade to QGLViewer 2.0.4
-	* Added the FREESTYLE_DIR environment variable.
-	  It must be set to the freestyle directory for
-	  all releases except the pre-compiled windows version.
-	* Fixed the unix path separator.
-	* Added the "Help>Control bindings" menu action.
-	* Fixed the style modules according to Python 2.4 standards.
-
-
-2005-04-05 - freestyle-1.0.0  
-
-	* Initial release
-
diff --git a/source/blender/freestyle/intern/app_blender/AppCanvas.cpp b/source/blender/freestyle/intern/app_blender/AppCanvas.cpp
new file mode 100755
index 00000000000..c9ea2d1391d
--- /dev/null
+++ b/source/blender/freestyle/intern/app_blender/AppCanvas.cpp
@@ -0,0 +1,404 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "AppGLWidget.h"
+#include "../image/Image.h"
+#include "../system/TimeStamp.h"
+#include "Controller.h"
+#include "../stroke/StrokeRenderer.h"
+#include "AppCanvas.h"
+#include "../rendering/GLRenderer.h"
+#include "../rendering/GLStrokeRenderer.h"
+#include "../rendering/GLUtils.h"
+#include "AppConfig.h"
+#include "../system/StringUtils.h"
+
+#ifdef WIN32
+# include <windows.h>
+# include "../rendering/extgl.h"
+#endif
+#ifdef __MACH__
+# include <OpenGL/gl.h>
+#else
+# include <GL/gl.h>
+#endif
+
+AppCanvas::AppCanvas()
+:Canvas()
+{
+  _pViewer = 0;
+  _blendEquation = true;
+	_MapsPath = StringUtils::toAscii( Config::Path::getInstance()->getMapsDir() ).c_str();
+}
+
+AppCanvas::AppCanvas(AppGLWidget* iViewer)
+:Canvas()
+{
+  _pViewer = iViewer;
+  _blendEquation = true;
+}
+
+AppCanvas::AppCanvas(const AppCanvas& iBrother)
+:Canvas(iBrother)
+{
+  _pViewer = iBrother._pViewer;
+  _blendEquation = iBrother._blendEquation;
+}
+
+AppCanvas::~AppCanvas()
+{
+  _pViewer = 0;
+}
+
+void AppCanvas::SetViewer(AppGLWidget *iViewer)
+{
+  _pViewer = iViewer;
+}  
+
+int AppCanvas::width() const 
+{
+  return _pViewer->width();
+}
+
+int AppCanvas::height() const
+{
+  return _pViewer->height();
+}
+
+BBox<Vec3r> AppCanvas::scene3DBBox() const 
+{
+  return _pViewer->scene3DBBox();
+}
+
+void AppCanvas::preDraw()
+{
+  Canvas::preDraw();
+
+  _pViewer->prepareCanvas();
+  glClearColor(0,0,0,0);
+	glClear(GL_COLOR_BUFFER_BIT);
+	glDisable(GL_LIGHTING);
+	glPolygonMode(GL_FRONT, GL_FILL);
+	glShadeModel(GL_SMOOTH);
+	glDisable(GL_DEPTH_TEST);
+	glEnable(GL_TEXTURE_2D);
+  glEnable(GL_BLEND);
+}
+
+void AppCanvas::init() 
+{
+#ifdef WIN32
+  static bool firsttime = true;
+  if (firsttime)
+    {
+      if (extgl_Initialize() != 0)
+	      cerr << "Error: problem occurred while initializing GL extensions" << endl;			
+      else
+	      cout << "GL extensions initialized" << endl;
+
+      if(!glutils_extgl_GetProcAddress("glBlendEquation")){
+        _blendEquation = false;
+        cout << "glBlendEquation unavailable on this hardware -> switching to strokes basic rendering mode" << endl;
+      }
+      firsttime=false;
+    }
+#endif
+
+  _Renderer = new GLStrokeRenderer;
+  if(!StrokeRenderer::loadTextures())
+    {
+      cerr << "unable to load stroke textures" << endl;
+      return;
+    }
+}
+
+void AppCanvas::postDraw()
+{
+  //inverse frame buffer
+  glDisable(GL_TEXTURE_2D);
+  glDisable(GL_BLEND);
+  _pViewer->releaseCanvas();
+
+  Canvas::postDraw();
+}
+
+void AppCanvas::Erase()
+{
+  Canvas::Erase();
+  //_pViewer->clear();
+}
+
+#include "../image/GaussianFilter.h"
+void AppCanvas::readColorPixels(int x,int y,int w, int h, RGBImage& oImage) const
+{
+  //static unsigned number = 0;
+  float *rgb = new float[3*w*h];
+  _pViewer->readPixels(x,y,w,h,AppGLWidget::RGB,rgb);
+  oImage.setArray(rgb, width(), height(), w,h, x, y, false);
+  // FIXME
+  //  QImage qtmp(w, h, 32);
+  //  for(unsigned py=0;py<h;++py){
+  //    for(unsigned px=0;px<w;++px){
+  //      int r = (int)255*(oImage.getR(x+px,y+py));
+  //      int g = (int)255*(oImage.getG(x+px,y+py));
+  //      int b = (int)255*(oImage.getB(x+px,y+py));
+  //      qtmp.setPixel(px,py,qRgb(r,g,b));
+  //    }
+  //  }
+  //  qtmp.save("densityQuery"+QString::number(number)+".png", "PNG");
+  //  if(number == 1090){
+  //    RGBImage img;
+  //    float *rgbtmp = new float[3*width()*height()];
+  //    _pViewer->readPixels(0,0,width(),height(),AppGLWidget::RGB,rgbtmp);
+  //    img.setArray(rgbtmp, width(), height(), width(), height(), 0, 0, false);
+  //    QImage qtmp(width(), height(), 32);
+  //    for(unsigned py=0;py<height();++py){
+  //      for(unsigned px=0;px<width();++px){
+  //        int r = (int)255*(img.getR(px,py));
+  //        int g = (int)255*(img.getG(px,py));
+  //        int b = (int)255*(img.getB(px,py));
+  //        qtmp.setPixel(px,height()-1-py,qRgb(r,g,b));
+  //      }
+  //    }
+  //    qtmp.save("densityQuery"+QString::number(number)+".png", "PNG");
+  //    
+  //    GaussianFilter filter;
+  //    filter.SetSigma(4.0);
+  //    int bound = filter.getBound();
+  //    QImage qtmp2(width(), height(), 32);
+  //    for(int py2=0;py2<height();++py2){
+  //      for(int px2=0;px2<width();++px2){  
+  //        if( (px2-bound < 0) || (px2+bound>width())
+  //	      || (py2-bound < 0) || (py2+bound>height()))
+  //          continue;
+  //        int g = 255*filter.getSmoothedPixel<RGBImage>(&img, px2,py2);
+  //        qtmp2.setPixel(px2,height()-1-py2,qRgb(g,g,g));
+  //      }
+  //    }
+  //    qtmp2.save("blurredCausalDensity"+QString::number(number)+".png", "PNG");
+  //  }
+  //  cout << number << endl;
+  //  ++number;
+}
+
+void AppCanvas::readDepthPixels(int x,int y,int w, int h, GrayImage& oImage) const
+{
+  float *rgb = new float[w*h];
+  _pViewer->readPixels(x,y,w,h,AppGLWidget::DEPTH,rgb);
+  oImage.setArray(rgb, width(), height(), w,h, x, y, false);
+}
+
+void AppCanvas::update()
+{
+//  static int counter = 0;
+//  char fileName[100] = "framebuffer";
+//  char number[10];
+//
+  _pViewer->updateGL();
+  _pViewer->swapBuffers();
+  //QImage fb = _pViewer->grabFrameBuffer();
+  //  sprintf(number, "%3d", counter);
+  //  strcat(fileName, number);
+  //  strcat(fileName, ".bmp");
+  //  fb.save(fileName, "BMP");
+  //counter++;
+}
+
+void AppCanvas::Render(const StrokeRenderer *iRenderer)
+{
+  if(!_blendEquation){
+    RenderBasic(iRenderer);
+    return;
+  }
+
+  glClearColor(1,1,1,1);
+  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+  glDisable(GL_LIGHTING);
+  glPolygonMode(GL_FRONT, GL_FILL);
+  glShadeModel(GL_SMOOTH);
+  
+  if(_pViewer->draw3DsceneEnabled())
+  {
+    glClearColor(1,1,1,0);
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+    glMatrixMode(GL_PROJECTION);
+    glPushMatrix();
+    glMatrixMode(GL_MODELVIEW);
+    glPushMatrix();
+    
+    glEnable(GL_LIGHTING);
+    glEnable(GL_DEPTH_TEST);
+    _pViewer->Set3DContext();
+    _pViewer->DrawScene(_pViewer->glRenderer());
+    glDisable(GL_DEPTH_TEST);
+    glDisable(GL_LIGHTING);
+    glMatrixMode(GL_PROJECTION);
+    glPopMatrix();
+    glMatrixMode(GL_MODELVIEW);
+    glPopMatrix();
+  }
+  
+  
+  glDisable(GL_DEPTH_TEST);
+  glBlendEquation(GL_ADD);
+  
+  glBlendFunc(GL_DST_COLOR, GL_ZERO);
+  
+  if(_drawPaper)
+  {
+    glEnable(GL_BLEND);
+    glEnable(GL_TEXTURE_2D);
+    float zfar = _pViewer->zfar();
+    zfar = zfar+0.1*zfar;
+    //draw background paper // FIXME
+    //glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+    glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+    glBindTexture(GL_TEXTURE_2D, StrokeRenderer::_textureManager->getPaperTextureIndex(_paperTextureIndex)); 
+    glColor4f(1,1,1,0.0);
+    glBegin(GL_TRIANGLE_STRIP);
+    { 
+      glTexCoord2f(0,0); glVertex3f(0, 0, -1);
+      glTexCoord2f(4,0); glVertex3f(2048, 0, -1);
+      glTexCoord2f(0,4); glVertex3f(0, 2048, -1);
+      glTexCoord2f(4,4); glVertex3f(2048, 2048, -1);
+    } 
+    glEnd();
+  }
+  
+  glPushAttrib(GL_COLOR_BUFFER_BIT);
+  glBlendEquation(GL_FUNC_SUBTRACT);
+  glBlendFunc(GL_ONE, GL_ONE);
+  
+  glDisable(GL_TEXTURE_2D);
+  glEnable(GL_BLEND);
+  glColor4f(1,1,1,1);
+  glBegin(GL_TRIANGLE_STRIP);
+  {  
+    glVertex2f(0, 0);
+    glVertex2f(2048, 0);
+    glVertex2f(0, 2048);
+    glVertex2f(2048, 2048);
+  }  
+  glEnd();
+  glPopAttrib();
+  
+  glDisable(GL_DEPTH_TEST);
+  glBlendEquation(GL_ADD);
+  glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+  
+  glEnable(GL_TEXTURE_2D);
+  Canvas::Render(iRenderer);
+  //  
+  glPushAttrib(GL_COLOR_BUFFER_BIT);
+  glBlendEquation(GL_FUNC_SUBTRACT);
+  glBlendFunc(GL_ONE, GL_ONE);
+  
+  glDisable(GL_TEXTURE_2D);
+  glEnable(GL_BLEND);
+  glColor3f(1,1,1);
+  glBegin(GL_TRIANGLE_STRIP);
+  { 
+    glVertex2f(0, 0);
+    glVertex2f(2048, 0);
+    glVertex2f(0, 2048);
+    glVertex2f(2048, 2048);
+  } 
+  glEnd();
+  glPopAttrib();
+  
+  glDisable(GL_TEXTURE_2D);
+  glDisable(GL_BLEND);
+}
+
+void AppCanvas::RenderBasic(const StrokeRenderer *iRenderer)
+{
+  glClearColor(1,1,1,1);
+  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+  glDisable(GL_LIGHTING);
+  glPolygonMode(GL_FRONT, GL_FILL);
+  glShadeModel(GL_SMOOTH);
+  
+  if(_pViewer->draw3DsceneEnabled())
+  {
+    glClearColor(1,1,1,0);
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+    glMatrixMode(GL_PROJECTION);
+    glPushMatrix();
+    glMatrixMode(GL_MODELVIEW);
+    glPushMatrix();
+    
+    glEnable(GL_LIGHTING);
+    glEnable(GL_DEPTH_TEST);
+    _pViewer->Set3DContext();
+    _pViewer->DrawScene(_pViewer->glRenderer());
+    glDisable(GL_DEPTH_TEST);
+    glDisable(GL_LIGHTING);
+    glMatrixMode(GL_PROJECTION);
+    glPopMatrix();
+    glMatrixMode(GL_MODELVIEW);
+    glPopMatrix();
+  }
+
+  glBlendFunc(GL_DST_COLOR, GL_ZERO);
+  if(_drawPaper)
+  {
+    glEnable(GL_BLEND);
+    glEnable(GL_TEXTURE_2D);
+    float zfar = _pViewer->zfar();
+    zfar = zfar+0.1*zfar;
+    //draw background paper // FIXME
+    //glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+    glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+    glBindTexture(GL_TEXTURE_2D, StrokeRenderer::_textureManager->getPaperTextureIndex(_paperTextureIndex)); 
+    glColor4f(1,1,1,0.0);
+    glBegin(GL_TRIANGLE_STRIP);
+    { 
+      glTexCoord2f(0,0); glVertex3f(0, 0, -1);
+      glTexCoord2f(4,0); glVertex3f(2048, 0, -1);
+      glTexCoord2f(0,4); glVertex3f(0, 2048, -1);
+      glTexCoord2f(4,4); glVertex3f(2048, 2048, -1);
+    } 
+    glEnd();
+  }
+
+  glDisable(GL_DEPTH_TEST);
+  glPushAttrib(GL_COLOR_BUFFER_BIT);
+  glEnable(GL_BLEND);
+  glPopAttrib();
+
+  glDisable(GL_DEPTH_TEST);
+  glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+  
+  glEnable(GL_TEXTURE_2D);
+  Canvas::RenderBasic(iRenderer);
+
+  glDisable(GL_TEXTURE_2D);
+  glDisable(GL_BLEND);
+}
+
+
+void AppCanvas::RenderStroke(Stroke *iStroke) {
+  iStroke->Render(_Renderer);
+  if(_pViewer->getRecordFlag()){
+    //Sleep(1000);
+     _pViewer->saveSnapshot(true);
+  }
+}
diff --git a/source/blender/freestyle/intern/app_blender/AppCanvas.h b/source/blender/freestyle/intern/app_blender/AppCanvas.h
new file mode 100755
index 00000000000..773bfc7f539
--- /dev/null
+++ b/source/blender/freestyle/intern/app_blender/AppCanvas.h
@@ -0,0 +1,55 @@
+#ifndef ARTCANVAS_H
+#define ARTCANVAS_H
+
+#include "../stroke/Canvas.h"
+
+//class AppGLWidget;
+class AppCanvas : public Canvas
+{
+private:
+  mutable AppGLWidget *_pViewer;
+  bool _blendEquation;
+public:
+  AppCanvas();
+  AppCanvas(AppGLWidget *iViewer);
+  AppCanvas(const AppCanvas& iBrother);
+  virtual ~AppCanvas();
+
+  /*! operations that need to be done before a draw */
+  virtual void preDraw();
+  
+  /*! operations that need to be done after a draw */
+  virtual void postDraw();
+  
+  /*! Erases the layers and clears the canvas */
+  virtual void Erase(); 
+  
+  /* init the canvas */
+  virtual void init();
+  
+  /*! Reads a pixel area from the canvas */
+  virtual void readColorPixels(int x,int y,int w, int h, RGBImage& oImage) const;
+  /*! Reads a depth pixel area from the canvas */
+  virtual void readDepthPixels(int x,int y,int w, int h, GrayImage& oImage) const;
+
+  virtual BBox<Vec3r> scene3DBBox() const ;
+
+  /*! update the canvas (display) */
+  virtual void update() ;
+
+  /*! Renders the created strokes */
+  virtual void Render(const StrokeRenderer *iRenderer);
+  virtual void RenderBasic(const StrokeRenderer *iRenderer);
+  virtual void RenderStroke(Stroke *iStroke) ;
+
+  /*! accessors */
+  virtual int width() const ;
+  virtual int height() const ;
+  inline const AppGLWidget * viewer() const {return _pViewer;}
+
+  /*! modifiers */
+  void SetViewer(AppGLWidget *iViewer) ;
+};
+
+
+#endif
diff --git a/source/blender/freestyle/intern/app_blender/AppGLWidget.cpp b/source/blender/freestyle/intern/app_blender/AppGLWidget.cpp
new file mode 100755
index 00000000000..44e25ee1321
--- /dev/null
+++ b/source/blender/freestyle/intern/app_blender/AppGLWidget.cpp
@@ -0,0 +1,611 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include <iostream>
+#include "../stroke/Canvas.h"
+#include "AppGLWidget.h"
+#include "../scene_graph/NodeLight.h"
+#include "../rendering/GLRenderer.h"
+#include "../rendering/GLSelectRenderer.h"
+#include "../rendering/GLBBoxRenderer.h"
+#include "../rendering/GLMonoColorRenderer.h"
+#include "Controller.h"
+#include "../view_map/Silhouette.h"
+#include "../view_map/ViewMap.h"
+#include "../scene_graph/LineRep.h"
+#include "../scene_graph/NodeShape.h"
+#include "../scene_graph/VertexRep.h"
+#include "AppConfig.h"
+
+#include "../system/StringUtils.h"
+#include "BLI_blenlib.h"
+#include "IMB_imbuf.h"
+#include "IMB_imbuf_types.h"
+
+// glut.h must be included last to avoid a conflict with stdlib.h on vc .net 2003 and 2005
+#ifdef __MACH__
+# include <GLUT/glut.h>
+#else
+# include <GL/glut.h>
+#endif
+
+GLuint texture = 0;
+
+bool AppGLWidget::_frontBufferFlag = false;
+bool AppGLWidget::_backBufferFlag = true;
+
+AppGLWidget::AppGLWidget(const char *iName)
+{
+  _Fovy        = 30.f;
+  //_SceneDepth = 2.f;
+  _RenderStyle = LINE;
+  //_ModelRootNode->SetBBox(BBox<Vec3f>(Vec3f(-10.f, -10.f, -10.f), Vec3f(10.f, 10.f, 10.f)));
+  _ModelRootNode = new NodeDrawingStyle;
+  _SilhouetteRootNode = new NodeDrawingStyle;
+  _DebugRootNode = new NodeDrawingStyle;
+  
+  _RootNode.AddChild(_ModelRootNode);
+  _SilhouetteRootNode->SetStyle(DrawingStyle::LINES);
+  _SilhouetteRootNode->SetLightingEnabled(false);
+  _SilhouetteRootNode->SetLineWidth(2.f);
+  _SilhouetteRootNode->SetPointSize(3.f);
+
+  _RootNode.AddChild(_SilhouetteRootNode);
+
+  _DebugRootNode->SetStyle(DrawingStyle::LINES);
+  _DebugRootNode->SetLightingEnabled(false);
+  _DebugRootNode->SetLineWidth(1.f);
+  
+  _RootNode.AddChild(_DebugRootNode);
+
+  _minBBox = __min(__min(_ModelRootNode->bbox().getMin()[0], 
+                            _ModelRootNode->bbox().getMin()[1]),
+                      _ModelRootNode->bbox().getMin()[2]);
+  _maxBBox = __max(__max(_ModelRootNode->bbox().getMax()[0], 
+                            _ModelRootNode->bbox().getMax()[1]),
+                      _ModelRootNode->bbox().getMax()[2]);
+
+  _maxAbs = __max(rabs(_minBBox), rabs(_maxBBox));
+  _minAbs = __min(rabs(_minBBox), rabs(_maxBBox));
+
+  _camera->setZNearCoefficient(0.1);
+
+  // 2D Scene
+  //  _pFENode = new NodeDrawingStyle;
+  //  _pFENode->SetStyle(DrawingStyle::LINES);
+  //  _pFENode->SetLightingEnabled(false);
+  //  _pFENode->SetLineWidth(1.f);
+  //
+  //  _p2DNode.AddChild(_pFENode);
+  //  
+  //  _pVisibleSilhouetteNode = new NodeDrawingStyle;
+  //  _pVisibleSilhouetteNode->SetStyle(DrawingStyle::LINES);
+  //  _pVisibleSilhouetteNode->SetLightingEnabled(false);
+  //  _pVisibleSilhouetteNode->SetLineWidth(3.f);
+  //
+  //  _p2DNode.AddChild(_pVisibleSilhouetteNode);
+  //  
+  _p2DSelectionNode = new NodeDrawingStyle;
+  _p2DSelectionNode->SetLightingEnabled(false);
+  _p2DSelectionNode->SetStyle(DrawingStyle::LINES);
+  _p2DSelectionNode->SetLineWidth(5.f);
+  
+  _p2DNode.AddChild(_p2DSelectionNode);
+
+  _pGLRenderer = new GLRenderer;
+  _pSelectRenderer = new GLSelectRenderer;
+  _pBBoxRenderer = new GLBBoxRenderer;
+  _pMonoColorRenderer = new GLMonoColorRenderer;
+  _pDebugRenderer = new GLDebugRenderer;
+
+  _pMainWindow = NULL;
+  _cameraStateSaved = false;
+  _drawBBox = false;
+  _silhouette = false;
+  _fedges = false;
+  _debug = false;
+  _selection_mode = false;
+  _Draw2DScene = true;
+  _Draw3DScene = true;
+  _drawEnvMap = false;
+  _currentEnvMap = 1;
+  _maxId = 0;
+  _blendFunc = 0;
+
+  const string sep(Config::DIR_SEP);
+  const string filename = Config::Path::getInstance()->getHomeDir() + sep +
+    Config::OPTIONS_DIR + sep + Config::OPTIONS_QGLVIEWER_FILE;
+  setStateFileName(filename);  
+
+  //get camera frame:
+  //qglviewer::Camera * cam = camera();
+  //qglviewer::ManipulatedFrame *  fr = cam->frame() ;
+  
+  //soc _enableupdateSilhouettes = false;
+
+  _captureMovie = false;
+  //  _frontBufferFlag = false;
+  //  _backBufferFlag = true;
+  _record = false;
+
+_camera = new Camera;
+
+}
+
+AppGLWidget::~AppGLWidget()
+{
+  int ref = _RootNode.destroy();
+  
+  _Light.destroy();
+  ref = _p2DNode.destroy();
+  
+  if(NULL != _pGLRenderer)
+    {
+      delete _pGLRenderer;
+      _pGLRenderer = NULL;
+    }
+
+  if(NULL != _pSelectRenderer)
+    {
+      delete _pSelectRenderer;
+      _pSelectRenderer = NULL;
+    }
+
+  if(NULL != _pBBoxRenderer)
+    {
+      delete _pBBoxRenderer;
+      _pBBoxRenderer = NULL;
+    }
+
+  if(NULL != _pMonoColorRenderer)
+    {
+      delete _pMonoColorRenderer;
+      _pMonoColorRenderer = NULL;
+    }
+
+  if(NULL != _pDebugRenderer)
+    {
+      delete _pDebugRenderer;
+      _pDebugRenderer = NULL;
+    }
+
+  makeCurrent();
+  //saveToFile(filename);
+}
+
+
+
+void AppGLWidget::LoadEnvMap(const char *filename)
+{
+  GLuint textureId;
+  //sgiImage img;
+  //cout << filename << endl;
+	ImBuf *image = IMB_loadiffname(filename, 0);
+
+  //data = img.read(filename); // tres beau bleu gris mauve!!
+  // allocate a texture name
+  glGenTextures( 1, &textureId );
+  if(textureId > (GLuint) _maxId)
+    _maxId = textureId;
+
+  // select our current texture
+  glBindTexture( GL_TEXTURE_2D, textureId );
+  
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, 
+                   GL_NEAREST);
+
+  glTexImage2D(GL_TEXTURE_2D, 0,GL_RGBA, image->x, image->y, 0,
+    GL_RGBA, GL_UNSIGNED_BYTE, image->rect );
+}
+
+void AppGLWidget::init()
+{
+  //setShortcut(QGLViewer::EXIT_VIEWER, 0);
+//  setShortcut(QGLViewer::DISPLAY_Z_BUFFER, 0);
+  //setShortcut(QGLViewer::STEREO, 0);
+  //setShortcut(QGLViewer::ANIMATION, 0);
+  //setShortcut(QGLViewer::EDIT_CAMERA, 0);
+
+  //restoreStateFromFile();
+
+  //trackball().fitBBox(_ModelRootNode->bbox().getMin(), _ModelRootNode->bbox().getMax(), _Fovy);
+
+   glClearColor(1,1,1,0);
+   glShadeModel(GL_SMOOTH);
+  
+   glCullFace(GL_BACK);
+   glEnable(GL_CULL_FACE);
+   glEnable(GL_DEPTH_TEST);
+
+   // open and read texture data
+   Config::Path * cpath = Config::Path::getInstance();
+   string envmapDir = cpath->getEnvMapDir();
+	LoadEnvMap( StringUtils::toAscii(envmapDir + string("gray00.png")).c_str() );
+   //LoadEnvMap(Config::ENV_MAP_DIR + "gray01.bmp");
+   LoadEnvMap( StringUtils::toAscii(envmapDir + string("gray02.png")).c_str() );
+   LoadEnvMap( StringUtils::toAscii(envmapDir + string("gray03.png")).c_str() );
+   LoadEnvMap( StringUtils::toAscii(envmapDir + string("brown00.png")).c_str() );
+   glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP) ;
+   glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP) ;
+
+   // gl settings for Environmental Texturing:
+   glColor3f(1, 1, 1);
+
+   // Use GL auto-computed enviroment texture coordinates
+   //glEnable(GL_TEXTURE_GEN_S);
+   //glEnable(GL_TEXTURE_GEN_T);
+
+   // Bind the texture to use
+   //glBindTexture(GL_TEXTURE_2D,texture);
+   glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+   //glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+   
+   // parametres de melange
+   //glBlendFunc(GL_ONE, GL_ONE);
+   glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 
+   //glBlendEquatio(GL_FUNC_ADD);
+     
+   //glEnable(GL_BLEND);
+   NodeLight *light = new NodeLight;
+   _Light.AddChild(light);
+
+   // Change QGLViewer's default shortcut for snapshots
+   //setShortcut(QGLViewer::SAVE_SCREENSHOT, Qt::CTRL + Qt::Key_W);
+   //   setShortcutKey (QGLViewer::SAVE_SCREENSHOT, Key_W);
+   //   setShortcutStateKey(QGLViewer::SAVE_SCREENSHOT, ControlButton);
+  
+   cout << "Renderer (GL)    : " << glGetString(GL_RENDERER) << endl
+	<< "Vendor (GL)      : " << glGetString(GL_VENDOR) << endl << endl;
+}
+
+void AppGLWidget::draw()
+{
+  if (true == _Draw3DScene)
+    {
+      if (true == _selection_mode) {
+	_pSelectRenderer->setSelectRendering(false);
+	_pSelectRenderer->resetColor();
+	DrawScene(_pSelectRenderer);
+      } else
+ 	DrawScene(_pGLRenderer);
+  
+      if (true == _silhouette)
+	DrawSilhouette();
+  
+      if (true == _drawBBox) {
+	glPushAttrib(GL_ALL_ATTRIB_BITS);
+	_ModelRootNode->accept(*_pBBoxRenderer);
+	glPopAttrib();
+      }
+
+      if (true == _debug) {
+	glPushAttrib(GL_ALL_ATTRIB_BITS);
+	_DebugRootNode->accept(*_pDebugRenderer);
+	glPopAttrib();
+      }
+    }
+
+  if (true == _Draw2DScene) {
+    Draw2DScene(_pGLRenderer);
+    Set3DContext();
+  }
+  if(_record){
+    saveSnapshot(true);
+  }
+}
+
+void AppGLWidget::DrawScene(SceneVisitor *iRenderer)
+{
+  glPushAttrib(GL_ALL_ATTRIB_BITS);
+
+  if(_drawEnvMap)
+  {
+    _ModelRootNode->SetLightingEnabled(false);
+    glEnable(GL_COLOR_MATERIAL);
+
+    glEnable(GL_TEXTURE_2D);
+    // Bind the texture to use
+    glBindTexture(GL_TEXTURE_2D,_currentEnvMap); 
+    switch(_blendFunc)
+    {
+    case 0:
+      glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE) ;
+      glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 
+      glEnable(GL_BLEND);
+      break;
+    case 1:
+      glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE) ;
+      glDisable(GL_BLEND);
+      break;
+      //    case 2:
+      //      glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE) ;
+      //      glBlendFunc(GL_ONE_MINUS_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 
+      //      glEnable(GL_BLEND);
+      //      break;
+      //    case 3:
+      //      glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE) ;
+      //      glBlendFunc(GL_ONE_MINUS_DST_COLOR, GL_ONE_MINUS_SRC_COLOR); 
+      //      glEnable(GL_BLEND);
+      //      break;
+      //    case 4:
+      //      glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE) ;
+      //      glBlendFunc(GL_DST_ALPHA, GL_ONE_MINUS_DST_ALPHA); 
+      //      glEnable(GL_BLEND);
+      //      break;
+    default:
+      break;
+    }
+
+    glEnable(GL_TEXTURE_GEN_S);
+    glEnable(GL_TEXTURE_GEN_T);
+  }
+
+  // FIXME
+  //  //_ModelRootNode->SetLightingEnabled(true);
+  //  if(_ModelRootNode->style() == DrawingStyle::LINES){
+  //    glPushAttrib(GL_ALL_ATTRIB_BITS);
+  //    //glDisable(GL_COLOR_MATERIAL);
+  //    _ModelRootNode->SetStyle(DrawingStyle::FILLED);
+  //    _ModelRootNode->SetLightingEnabled(true);
+  //    _ModelRootNode->accept(*iRenderer);  
+  //    _ModelRootNode->SetStyle(DrawingStyle::LINES);
+  //    _ModelRootNode->SetLightingEnabled(false);
+  //    _ModelRootNode->accept(*iRenderer);  
+  //    glPopAttrib();
+  //  }
+  //  else
+  _ModelRootNode->accept(*iRenderer);
+
+  glDisable(GL_TEXTURE_GEN_S);
+  glDisable(GL_TEXTURE_GEN_T);
+  glDisable(GL_TEXTURE_2D);
+  glDisable(GL_COLOR_MATERIAL);
+  _ModelRootNode->SetLightingEnabled(true);
+
+  if(_fedges == true)
+    _SilhouetteRootNode->accept(*iRenderer);
+
+  // FIXME: deprecated
+//   if(_debug == true)
+//     _DebugRootNode->accept(*iRenderer);
+  
+  glPopAttrib();
+}
+
+void AppGLWidget::prepareCanvas()
+{
+  makeCurrent();
+  glPushAttrib(GL_ALL_ATTRIB_BITS);
+
+  if(_frontBufferFlag){
+    if(_backBufferFlag)
+      glDrawBuffer(GL_FRONT_AND_BACK);
+    else
+      glDrawBuffer(GL_FRONT);
+  }
+  else if(_backBufferFlag)
+    glDrawBuffer(GL_BACK);
+  
+  // Projection Matrix
+  //==================
+  glMatrixMode(GL_PROJECTION);
+  glLoadIdentity();
+  
+  glOrtho(0,width(), 0, height(), -1.0, 1.0);
+  
+  //Modelview Matrix
+  //================
+  glMatrixMode(GL_MODELVIEW);
+  glLoadIdentity();
+}
+
+void AppGLWidget::releaseCanvas()
+{
+  makeCurrent();
+  glDrawBuffer(GL_BACK);
+  glPopAttrib();
+}
+
+void AppGLWidget::Draw2DScene(SceneVisitor *iRenderer)
+{
+  static bool first = 1;
+  glPushAttrib(GL_ALL_ATTRIB_BITS);
+
+//    // Projection Matrix
+//    //==================
+  glMatrixMode(GL_PROJECTION);
+  glLoadIdentity();
+  glOrtho(0,width(), 0, height(), -1.0, 1.0);
+
+//    //Modelview Matrix
+//    //================
+  glMatrixMode(GL_MODELVIEW);
+  glLoadIdentity();
+
+  //  glBegin(GL_LINE_LOOP);
+  //  glVertex2f(0,0);
+  //  glVertex2f(100,0);
+  //  glVertex2f(100,100);
+  //  glVertex2f(0,100);
+  //  glEnd();
+
+  //glDrawBuffer(GL_FRONT_AND_BACK);
+  // Draw visible silhouette
+  //_pVisibleSilhouetteNode->Render(iRenderer);
+  Canvas * canvas = Canvas::getInstance();
+  if((canvas) && (!canvas->isEmpty()))
+  {
+    if (first)
+    {
+      canvas->init();
+      first = false;
+    }
+    canvas->Render(canvas->renderer());
+  }
+  
+  glLoadIdentity();
+  //  glColor3f(0.f,1.f,0.f);
+  //  glLineWidth(5.f);
+  //glPolygonOffset(0.5f, 0.5f);
+  glPushAttrib(GL_DEPTH_BUFFER_BIT);
+  glDisable(GL_DEPTH_TEST);
+  _p2DSelectionNode->accept(*iRenderer);
+  glPopAttrib();
+  // Draw Feature edges
+  //  if(_fedges == true)
+  //  {
+  //    _pFENode->Render(iRenderer);
+  //  }
+ 
+  glPopAttrib();
+}
+
+void AppGLWidget::DrawSilhouette()
+{
+  glPushAttrib(GL_ALL_ATTRIB_BITS);
+  
+  glDepthFunc(GL_LESS);
+  glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
+  DrawScene(_pMonoColorRenderer);
+
+  glCullFace(GL_FRONT);
+  glDepthFunc(GL_LEQUAL);
+  glEnable(GL_POLYGON_OFFSET_FILL);
+  glLineWidth(3.0);
+  //glPolygonOffset(10.f, 10.f);
+  glPolygonOffset(0.5f, 0.5f);
+ 
+  glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+  _pMonoColorRenderer->setColor(0.f, 0.f, 0.f);
+  DrawScene(_pMonoColorRenderer);
+
+  //Restore old context
+  glPopAttrib();
+
+}
+
+void AppGLWidget::ReInitRenderers()
+{
+  // Debug Renderer
+  if(NULL != _pDebugRenderer)
+    _pDebugRenderer->ReInit(rabs(_ModelRootNode->bbox().getMax()[1] -
+				 _ModelRootNode->bbox().getMin()[1]));
+}
+
+void AppGLWidget::setFrontBufferFlag(bool iBool){
+  _frontBufferFlag = iBool;
+}
+bool AppGLWidget::getFrontBufferFlag() {
+  return _frontBufferFlag;
+}
+void AppGLWidget::setBackBufferFlag(bool iBool){
+  _backBufferFlag = iBool;
+}
+bool AppGLWidget::getBackBufferFlag() {
+  return _backBufferFlag;
+}
+
+//void AppGLWidget::DrawLines()
+//{
+//  //Antialiasing:
+//  glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+//  glEnable(GL_BLEND);
+//  glEnable(GL_LINE_SMOOTH);
+//  glPolygonMode(GL_FRONT, GL_LINE);
+//
+//  glColor3f(0.f, 0.f, 0.f);
+//  glLineWidth(2.f);
+//
+//  DrawScene();
+//}
+//
+//void AppGLWidget::DrawSurfacic()
+//{
+//  glPolygonMode(GL_FRONT, GL_FILL);
+//  glShadeModel(GL_SMOOTH);
+//  
+//  glEnable(GL_LIGHTING);
+//  glEnable(GL_LIGHT0);
+//
+//  
+//  GLreal diffuseV[] = {0.5, 0.7, 0.5, 1.0};
+//  glMaterialfv(GL_FRONT, GL_DIFFUSE, diffuseV);
+//
+//  //glColor3f(0.f, 0.f, 0.f);
+//
+//  DrawScene();
+//
+//  glDisable(GL_LIGHTING);
+//}
+//
+//void AppGLWidget::DrawDepthBuffer()
+//{
+//  GLint w = width();
+//  GLint h = height();
+//
+//  glPolygonMode(GL_FRONT, GL_FILL);
+//  
+//  //Disable the writing in the frame buffer
+//  glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
+//
+//  //This rendering will only fills the depth buffer
+//  DrawScene();
+//
+//  //Re-enable the frame buffer writing
+//  glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+//
+//
+//  GLreal *zPixels = new real[w*h];
+//  GLreal *colorPixels = new real[4*w*h];
+//
+// // glReadBuffer(GL_FRONT); //in reality: glReadBuffer and glDrawBuffer are both set to GL_BACK
+//  glReadPixels(0,0,w, h, GL_DEPTH_COMPONENT, GL_real, (GLreal*)zPixels);
+//
+//  real *tmpZ = zPixels;
+//  real *tmpColor = colorPixels;
+//
+//  for(int i=0; i<h; i++)
+//  {
+//    for(int j=0; j<w; j++)
+//    {
+//      //fprintf(test, " %.5f ", pixels[i*w+j]);
+//      tmpColor[0] = *tmpZ;
+//      tmpColor[1] = *tmpZ;
+//      tmpColor[2] = *tmpZ;
+//      tmpColor[3] = 1.f;
+//
+//      tmpColor += 4;
+//      tmpZ++;
+//    }
+//  }
+//  glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
+// // glDrawBuffer(GL_FRONT_AND_BACK);
+//  //glRasterPos2i(0, 0);
+//  //glLoadIdentity();
+//  glDrawPixels(w, h, GL_RGBA, GL_real, (GLreal *)colorPixels);
+//    
+//  delete [] zPixels;
+//  delete [] colorPixels;  
+//}
+
diff --git a/source/blender/freestyle/intern/app_blender/AppGLWidget.h b/source/blender/freestyle/intern/app_blender/AppGLWidget.h
new file mode 100755
index 00000000000..0d10049ee15
--- /dev/null
+++ b/source/blender/freestyle/intern/app_blender/AppGLWidget.h
@@ -0,0 +1,593 @@
+//
+//  Filename         : AppConfig.h
+//  Author           : Stephane Grabli
+//  Purpose          : Configuration file
+//  Date of creation : 26/02/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  ARTGLWIDGET_H
+# define ARTGLWIDGET_H
+
+# ifndef WIN32
+#  include <algorithm>
+using namespace std;
+#  define __min(x,y) (min(x,y))
+#  define __max(x,y) (max(x,y))
+# endif // WIN32
+
+
+//# include <qstringlist.h>
+# include "../geometry/Geom.h"
+# include "../geometry/BBox.h"
+# include "../scene_graph/NodeDrawingStyle.h"
+# include "../system/TimeUtils.h"
+# include "../system/Precision.h"
+# include "AppConfig.h"
+# include "../rendering/GLDebugRenderer.h"
+//# include <QGLViewer/qglviewer.h>
+
+using namespace Geometry;
+
+typedef enum {SURFACIC, LINE, DEPTHBUFFER} RenderStyle;
+
+class FEdge;
+class QMainWindow;
+class GLRenderer;
+class GLSelectRenderer;
+class GLBBoxRenderer;
+class GLMonoColorRenderer;
+class GLDebugRenderer;
+
+class Vec{
+public:
+	Vec() {};
+	Vec(float _x, float _y, float _z): x(_x), y(_y), z(_z) {};
+	~Vec() {}
+	
+	float operator[] (unsigned i) {
+		switch(i){
+		case 0: return x; break;
+		case 1: return y; break;
+		case 2: return z; break;
+		}
+		return 0.0;
+	}
+		
+	
+	float x,y,z;
+};
+
+class Quaternion{
+public:
+	Quaternion( float _x, float _y, float _z, float _s): x(_x), y(_y), z(_z), s(_s){};
+	~Quaternion() {}
+	
+	float operator[] (unsigned i) {
+		switch(i){
+		case 0: return x; break;
+		case 1: return y; break;
+		case 2: return z; break;
+		case 3: return s; break;
+		}
+		return 0.0;
+	}
+	
+	float x,y,z,s;
+};
+
+class Camera {
+	private:
+		float _position[3];
+		float _orientation[3];
+		
+	public:
+		Camera(){};
+	  	~Camera() {};
+		
+		void setZNearCoefficient(float f) {}
+		void playPath(int i) {}
+
+		void loadProjectionMatrix() {}
+		void loadModelViewMatrix() {}
+		real distanceToSceneCenter() { return 0;}
+		void showEntireScene() {} 
+		real zFar() {return 0;}
+		real zNear() {return 0;}
+		void setPosition(Vec v) {}
+		void setOrientation(Quaternion q) {}
+		float* position() { return _position; }
+		float* orientation()  { return _orientation; }
+		void getWorldCoordinatesOf(float *src, float *vp_tmp) {}
+
+};
+
+
+//class AppGLWidget : public QGLViewer
+class AppGLWidget
+{
+  //Q_OBJECT
+
+    
+public:
+
+  AppGLWidget(const char *iName = 0);
+  virtual ~AppGLWidget();
+  
+public:
+
+	inline void swapBuffers() {}
+  inline void updateGL() {}
+  inline void makeCurrent() {}
+  inline void setSceneBoundingBox(Vec &min_, Vec &max_) {}
+	inline void saveSnapshot(bool b) {}
+	inline real width() { return _width; }
+	inline real height() { return _height; }
+	 void setStateFileName(const string& name) { stateFileName_ = name; };
+	
+	
+Camera * _camera;
+
+  // captures a frame animation that was previously registered
+  void captureMovie();
+
+  /*! Sets the rendering style.
+        iStyle
+          The style used to render. Can be:
+          SURFACIC    : usual rendering
+          LINES       : line rendering
+          DEPTHBUFFER : grey-levels rendering of the depth buffer
+          */
+  inline void SetRenderStyle(RenderStyle iStyle)
+  {
+    _RenderStyle = iStyle;
+  }
+
+  /*! Sets the model to draw in the viewer 
+   *  iModel
+   *    The Root Node of the model 
+   */
+  inline void SetModel(NodeGroup *iModel)
+  {
+    if(0 != _ModelRootNode->numberOfChildren())
+    {
+      _ModelRootNode->DetachChildren();
+      _ModelRootNode->clearBBox();
+    }
+      
+    AddModel(iModel);
+  }
+
+  /*! Adds a model for displaying in the viewer */
+  inline void AddModel(NodeGroup *iModel) 
+  {
+    _ModelRootNode->AddChild(iModel);
+    
+    _ModelRootNode->UpdateBBox();
+
+    _minBBox = __min(__min(_ModelRootNode->bbox().getMin()[0], 
+                            _ModelRootNode->bbox().getMin()[1]),
+                      _ModelRootNode->bbox().getMin()[2]);
+    _maxBBox = __max(__max(_ModelRootNode->bbox().getMax()[0], 
+                            _ModelRootNode->bbox().getMax()[1]),
+                      _ModelRootNode->bbox().getMax()[2]);
+    
+     _maxAbs = __max(rabs(_minBBox), rabs(_maxBBox));
+
+     _minAbs = __min(rabs(_minBBox), rabs(_maxBBox));
+
+     // DEBUG:
+    ReInitRenderers();
+ 
+  }
+
+  inline void AddSilhouette(NodeGroup* iSilhouette)
+  {
+    _SilhouetteRootNode->AddChild(iSilhouette);
+    //ToggleSilhouette(true);
+    updateGL();
+  }
+
+  inline void Add2DSilhouette(NodeGroup *iSilhouette)
+  {
+    //_pFENode->AddChild(iSilhouette);
+    //ToggleSilhouette(true);
+    updateGL();
+  }
+
+  inline void Add2DVisibleSilhouette(NodeGroup *iVSilhouette)
+  {
+    //_pVisibleSilhouetteNode->AddChild(iVSilhouette);
+    updateGL();
+  }
+
+  inline void SetDebug(NodeGroup* iDebug)
+  {
+    if(0 != _DebugRootNode->numberOfChildren())
+    {
+      _DebugRootNode->DetachChildren();
+      _DebugRootNode->clearBBox();
+    }
+      
+    AddDebug(iDebug);
+  }
+
+  inline void AddDebug(NodeGroup* iDebug)
+  {
+    _DebugRootNode->AddChild(iDebug);
+    updateGL();
+  }
+
+  inline void DetachModel(Node *iModel)
+  {
+    _ModelRootNode->DetachChild(iModel);
+    _ModelRootNode->UpdateBBox();
+    
+    _minBBox = __min(__min(_ModelRootNode->bbox().getMin()[0], 
+                            _ModelRootNode->bbox().getMin()[1]),
+                      _ModelRootNode->bbox().getMin()[2]);
+    _maxBBox = __max(__max(_ModelRootNode->bbox().getMax()[0], 
+                            _ModelRootNode->bbox().getMax()[1]),
+                      _ModelRootNode->bbox().getMax()[2]);
+    
+     _maxAbs = __max(rabs(_minBBox), rabs(_maxBBox));
+     _minAbs = __min(rabs(_minBBox), rabs(_maxBBox));
+  } 
+
+  inline void DetachModel() 
+  {
+    _ModelRootNode->DetachChildren();
+    _ModelRootNode->clearBBox();
+    
+    // 2D Scene
+    //_p2DNode.DetachChildren();
+    //_pFENode->DetachChildren();
+    //_pVisibleSilhouetteNode->DetachChildren();
+    updateGL();
+  }
+
+  inline void DetachSilhouette()
+  {
+    _SilhouetteRootNode->DetachChildren();
+    //_pFENode->DetachChildren();
+    //_pVisibleSilhouetteNode->DetachChildren();
+    _p2DSelectionNode->destroy();
+    //updateGL(); //FIXME
+  }
+
+  inline void DetachVisibleSilhouette()
+  {
+    //_pVisibleSilhouetteNode->DetachChildren();
+    _p2DSelectionNode->destroy();
+    updateGL();
+  }
+
+  inline void DetachDebug()
+  {
+    _DebugRootNode->DetachChildren();
+    updateGL();
+  }
+
+  void SetMainWindow(QMainWindow *iMainWindow) ;
+
+  inline void Set3DContext()
+  {
+    // GL_PROJECTION matrix
+    _camera->loadProjectionMatrix();
+    // GL_MODELVIEW matrix
+    _camera->loadModelViewMatrix();
+  }
+  
+  inline void RetriveModelViewMatrix(float *p)
+  {
+    makeCurrent();
+    glGetFloatv(GL_MODELVIEW_MATRIX, p);
+  }
+  inline void RetriveModelViewMatrix(real *p)
+  {
+    makeCurrent();
+    glGetDoublev(GL_MODELVIEW_MATRIX, p);
+  }
+
+  inline void RetrieveProjectionMatrix(float *p)
+  {
+    makeCurrent();
+    glGetFloatv(GL_PROJECTION_MATRIX, p);
+
+  }
+  inline void RetrieveProjectionMatrix(real *p)
+  {
+    makeCurrent();
+    glGetDoublev(GL_PROJECTION_MATRIX, p);
+
+  }
+
+  inline void RetrieveViewport(int *p)
+  {
+    makeCurrent();
+    glGetIntegerv(GL_VIEWPORT,(GLint *)p);
+  }
+  
+  inline real GetFocalLength() const
+  {
+    real Near =  __max(0.1,(real)(-2.f*_maxAbs+_camera->distanceToSceneCenter()));
+    return Near;
+  }
+
+  inline real GetAspect() const
+  {
+    return ((real) _width/(real) _height);
+  }
+
+  inline real GetFovyRadian() const
+  {
+    return _Fovy/180.0 * M_PI;
+  }
+
+  inline real GetFovyDegrees() const
+  {
+    return _Fovy;
+  }
+
+  inline void FitBBox()
+  {
+	Vec min_(_ModelRootNode->bbox().getMin()[0],
+    			_ModelRootNode->bbox().getMin()[1],
+    			_ModelRootNode->bbox().getMin()[2]);
+	Vec max_(_ModelRootNode->bbox().getMax()[0],
+    			_ModelRootNode->bbox().getMax()[1],
+    			_ModelRootNode->bbox().getMax()[2]);
+    setSceneBoundingBox(min_, max_);
+    _camera->showEntireScene();
+  }
+  
+  inline void ToggleSilhouette(bool enabled) 
+  {
+    _fedges = enabled;
+    updateGL();
+  }
+  
+  // Reinit the renderers which need to be informed
+  // when a model is added to the scene.
+  void ReInitRenderers();
+
+  inline void SetSelectedFEdge(FEdge* iFEdge) { _pDebugRenderer->SetSelectedFEdge(iFEdge); }
+
+  inline GLDebugRenderer* debugRenderer() { return _pDebugRenderer; }
+  inline void toggle3D() { _Draw3DScene == true ? _Draw3DScene = false : _Draw3DScene = true; updateGL();}
+
+  /*! glReadPixels */
+  typedef enum{
+    RGB,
+    DEPTH
+  } PixelFormat;
+  void readPixels(int x,
+                  int y,
+                  int width,
+                  int height,
+                  PixelFormat format,
+                  float *pixels) 
+  {
+    makeCurrent();
+    //glReadBuffer(GL_FRONT); //in reality: glReadBuffer and glDrawBuffer are both set to GL_BACK
+    glReadBuffer(GL_BACK);
+    GLenum glformat;
+    switch(format)
+    {
+    case RGB:
+      glformat = GL_RGB;
+      break;
+    case DEPTH:
+      glformat = GL_DEPTH_COMPONENT;
+      break;
+    default:
+      break;
+    }
+    glReadPixels(x,y,width, height, glformat, GL_FLOAT, (GLfloat*)pixels);
+  }
+
+  void clear() { makeCurrent(); glClear(GL_COLOR_BUFFER_BIT ); }
+
+  void prepareCanvas();
+  void releaseCanvas();
+
+  typedef enum {
+    FRONT,
+    BACK
+  } GLBuffer;
+
+  void setReadPixelsBuffer(int iBuffer) 
+  {
+    makeCurrent();
+    switch(iBuffer)
+    {
+    case FRONT:
+      glReadBuffer(GL_FRONT);
+      break;
+    case BACK:
+      glReadBuffer(GL_BACK);
+      break;
+    default:
+      break;
+    }
+  }
+
+  BBox<Vec3r> scene3DBBox() const { return _ModelRootNode->bbox(); }
+
+  inline real znear() const {
+    return _camera->zNear();
+  }
+  
+  inline real zfar() const {
+    return _camera->zFar();
+  }
+
+  inline bool draw3DsceneEnabled() const { return _Draw3DScene; }
+
+  inline bool getRecordFlag() const {return _record;}
+
+  void setCameraState(const float* position, const float* orientation) {
+    _camera->setPosition(Vec(position[0], position[1], position[2]));
+    _camera->setOrientation(Quaternion(orientation[0], orientation[1], orientation[2], orientation[3]));
+  }
+
+  void getCameraState(float* position, float* orientation) const {
+    float* pos = _camera->position();
+    float* orient = _camera->orientation();
+    int i;
+    for(i=0;i<3;++i){
+      position[i] = pos[i];
+    }
+    for(i=0;i<4;++i){
+      orientation[i] = orient[i];
+    }
+  }
+
+  void saveCameraState() {
+    getCameraState(_cameraPosition, _cameraOrientation);
+    _cameraStateSaved = true;
+  }
+
+  void setUpdateMode(bool b) {
+    _enableUpdateSilhouettes = b;
+  }
+
+  bool getUpdateMode() const {
+    return _enableUpdateSilhouettes;
+  }
+  static void setFrontBufferFlag(bool iBool);
+  static bool getFrontBufferFlag();
+  static void setBackBufferFlag(bool iBool);
+  static bool getBackBufferFlag();
+
+protected:
+  virtual void	  init();
+  virtual void    draw();
+
+  /*! Loads an envmap */
+  void LoadEnvMap(const char *filename);
+
+public:
+  /*! Core scene drawing */
+  void            DrawScene(SceneVisitor *iRenderer);
+
+  /*! 2D Scene Drawing */
+  void            Draw2DScene(SceneVisitor *iRenderer);
+
+  /*! Draws scene silhouettes in real time */
+  void            DrawSilhouette();
+  
+  /*! Draws the Scene in lines style */
+  //  void            DrawLines();
+  //  /*! Draws the scene in surfacic style */
+  //  void            DrawSurfacic();
+  //  /*! Draws the scene as a depth buffer image */
+  //  void            DrawDepthBuffer();
+
+  GLRenderer* glRenderer() {return _pGLRenderer;}
+
+protected:
+
+
+  //QString shortcutBindingsString() const;
+
+  /*! fabs or abs */
+  inline int rabs(int x) {return abs(x);}
+  inline real rabs(real x) {return fabs(x);}
+
+  
+protected:
+  float _Fovy;
+  //float _SceneDepth;
+  //BBox<Vec3f> _BBox;
+  
+  RenderStyle _RenderStyle;
+
+  //The root node container
+  NodeGroup        _RootNode;
+  NodeDrawingStyle *_ModelRootNode;
+  NodeDrawingStyle *_SilhouetteRootNode;
+  NodeDrawingStyle *_DebugRootNode;
+  
+  bool _silhouette;
+  bool _fedges;
+  bool _debug;
+  bool _selection_mode;
+
+  //a Universal light:
+  NodeGroup _Light;
+
+  real _minBBox;
+  real _maxBBox;
+  real _maxAbs;
+
+  real _minAbs;
+  bool _drawBBox;
+
+  // OpenGL Renderer
+  GLRenderer *_pGLRenderer;
+  GLSelectRenderer *_pSelectRenderer;
+  GLBBoxRenderer *_pBBoxRenderer;
+  GLMonoColorRenderer *_pMonoColorRenderer;
+  GLDebugRenderer *_pDebugRenderer;
+  
+  QMainWindow *_pMainWindow;
+
+  Chronometer _Chrono;
+
+  // 2D Scene
+  bool _Draw2DScene;
+  bool _Draw3DScene;  NodeGroup _p2DNode;
+  //NodeDrawingStyle *_pFENode; // Feature edges node
+  //NodeDrawingStyle *_pVisibleSilhouetteNode;
+  NodeDrawingStyle *_p2DSelectionNode;
+
+  // EnvMap
+  bool _drawEnvMap;
+  int _currentEnvMap;
+  int _maxId;
+  int _blendFunc;
+
+  // Each time we compute the view map, the camera state is 
+  // saved in order to be able to restore it later
+  bool  _cameraStateSaved;
+  float _cameraPosition[3];
+  float _cameraOrientation[4];
+
+  // interactive silhouette update
+  bool _enableUpdateSilhouettes;
+  //capture movie
+  bool _captureMovie;
+  // 2D drawing buffers
+  static bool _frontBufferFlag;
+  static bool _backBufferFlag;
+
+  bool _record;
+
+
+real _width, _height;
+Vec _min,_max;
+string stateFileName_;
+};
+
+#endif // ARTGLWIDGET_H
diff --git a/source/blender/freestyle/intern/app_blender/Controller.cpp b/source/blender/freestyle/intern/app_blender/Controller.cpp
new file mode 100755
index 00000000000..edc1b7f663a
--- /dev/null
+++ b/source/blender/freestyle/intern/app_blender/Controller.cpp
@@ -0,0 +1,1050 @@
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+// Must be included before any QT header, because of moc
+#include "../system/PythonInterpreter.h"
+
+#include <string>
+#include <fstream>
+#include <float.h>
+
+#include "AppGLWidget.h"
+#include "AppCanvas.h"
+#include "AppConfig.h"
+
+
+#include "../system/StringUtils.h"
+#include "../scene_graph/MaxFileLoader.h"
+#include "../scene_graph/NodeShape.h"
+#include "../scene_graph/NodeTransform.h"
+#include "../scene_graph/NodeDrawingStyle.h"
+#include "../winged_edge/WingedEdgeBuilder.h"
+#include "../winged_edge/WEdge.h"
+#include "../scene_graph/VertexRep.h"
+#include "../winged_edge/WXEdgeBuilder.h"
+#include "../scene_graph/ScenePrettyPrinter.h"
+#include "../winged_edge/WFillGrid.h"
+
+#include "../view_map/ViewMapTesselator.h"
+#include "../stroke/StrokeTesselator.h"
+#include "../view_map/ViewMapIO.h"
+#include "Controller.h"
+#include "../view_map/ViewMap.h"
+#include "../winged_edge/Curvature.h"
+//#include "QGLBasicWidget.h"
+//#include <qimage.h>
+#include "../image/Image.h"
+#include "../view_map/SteerableViewMap.h"
+#include "../stroke/PSStrokeRenderer.h"
+#include "../stroke/TextStrokeRenderer.h"
+#include "../stroke/StyleModule.h"
+
+#ifndef WIN32
+//# include "GLXOffscreenBuffer.h"
+//# include "GLXOffscreenBuffer.h"
+#endif
+
+#include "../system/StringUtils.h"
+
+
+Controller::Controller()
+{
+  const string sep(Config::DIR_SEP.c_str());
+  const string filename = Config::Path::getInstance()->getHomeDir() + sep +
+    Config::OPTIONS_DIR + sep + Config::OPTIONS_CURRENT_DIRS_FILE;
+  //_current_dirs = new ConfigIO(filename, Config::APPLICATION_NAME + "CurrentDirs", true);
+
+  _RootNode = new NodeGroup;
+  _RootNode->addRef();
+  
+  _SilhouetteNode = NULL;
+  //_ProjectedSilhouette = NULL;
+  //_VisibleProjectedSilhouette = NULL;
+  
+  _DebugNode = new NodeGroup;
+  _DebugNode->addRef();
+
+  _winged_edge = NULL;
+  
+  _pView = NULL;
+
+  _edgeTesselationNature = (Nature::SILHOUETTE | Nature::BORDER | Nature::CREASE);
+
+  _SceneNumFaces = 0;
+  _minEdgeSize = DBL_MAX;
+  _bboxDiag = 0;
+  
+  _ViewMap = 0;
+
+  _Canvas = 0;
+
+  _VisibilityAlgo = ViewMapBuilder::ray_casting;
+  //_VisibilityAlgo = ViewMapBuilder::ray_casting_fast;
+
+  _Canvas = new AppCanvas;
+
+  _inter = new PythonInterpreter;
+  _EnableQI = true;
+  _ComputeRidges = true;
+  _ComputeSteerableViewMap = false;
+  _ComputeSuggestive = true;
+  _sphereRadius = 1.0;
+}
+
+Controller::~Controller()
+{
+  if(NULL != _RootNode)
+    {
+      int ref = _RootNode->destroy();
+      if(0 == ref)
+	delete _RootNode;
+    }
+  
+  if(NULL != _SilhouetteNode)
+    {
+      int ref = _SilhouetteNode->destroy();
+      if(0 == ref)
+	delete _SilhouetteNode;
+    }
+  
+  if(NULL != _DebugNode)
+    {
+      int ref = _DebugNode->destroy();
+      if(0 == ref)
+	delete _DebugNode;
+    }
+
+  if(_winged_edge) {
+    delete _winged_edge;
+    _winged_edge = NULL;
+  }
+
+  if(0 != _ViewMap)
+    {
+      delete _ViewMap;
+      _ViewMap = 0;
+    }
+
+  if(0 != _Canvas)
+    {
+      delete _Canvas;
+      _Canvas = 0;
+    }
+
+  if (_inter) {
+    delete _inter;
+    _inter = NULL;
+  }
+
+  //delete _current_dirs;
+}
+
+void Controller::SetView(AppGLWidget *iView)
+{
+  if(NULL == iView)
+    return;
+  
+  _pView = iView;
+  _Canvas->SetViewer(_pView);
+}
+
+
+int Controller::Load3DSFile(const char *iFileName)
+{
+  if (_pView)
+    _pView->setUpdateMode(false);
+  
+  MaxFileLoader loader3DS(iFileName);
+  //_RootNode->AddChild(BuildSceneTest());
+  
+  _Chrono.start();
+  
+  NodeGroup *maxScene = loader3DS.Load();
+
+  if (maxScene == NULL) {
+    return 1;
+  }
+
+  printf("Mesh cleaning    : %lf\n", _Chrono.stop());
+  _SceneNumFaces += loader3DS.numFacesRead();
+
+  if(loader3DS.minEdgeSize() < _minEdgeSize)
+    {
+      _minEdgeSize = loader3DS.minEdgeSize();
+      _EPSILON = _minEdgeSize*1e-6;
+      if(_EPSILON < DBL_MIN)
+	_EPSILON = 0.0;
+    }
+
+  cout << "Epsilon computed : " << _EPSILON << endl;
+
+  // DEBUG
+//   ScenePrettyPrinter spp;
+//   maxScene->accept(spp);
+
+  _RootNode->AddChild(maxScene);
+  _RootNode->UpdateBBox(); // FIXME: Correct that by making a Renderer to compute the bbox
+
+  _pView->SetModel(_RootNode);
+  _pView->FitBBox();
+
+  _Chrono.start();
+
+  
+  WXEdgeBuilder wx_builder;
+  maxScene->accept(wx_builder);
+  _winged_edge = wx_builder.getWingedEdge();
+
+  printf("WEdge building   : %lf\n", _Chrono.stop());
+
+ _Chrono.start();
+
+  _Grid.clear();
+  Vec3r size;
+  for(unsigned int i=0; i<3; i++)
+    {
+      size[i] = fabs(_RootNode->bbox().getMax()[i] - _RootNode->bbox().getMin()[i]);
+      size[i] += size[i]/10.0; // let make the grid 1/10 bigger to avoid numerical errors while computing triangles/cells intersections
+      if(size[i]==0){
+          cout << "Warning: the bbox size is 0 in dimension "<<i<<endl;
+      }
+    }
+  _Grid.configure(Vec3r(_RootNode->bbox().getMin() - size / 20.0), size,
+		  _SceneNumFaces);
+
+  // Fill in the grid:
+  WFillGrid fillGridRenderer(&_Grid, _winged_edge);
+  fillGridRenderer.fillGrid();
+
+  printf("Grid building    : %lf\n", _Chrono.stop());
+  
+  // DEBUG
+//   _Grid.displayDebug();
+   
+  _pView->SetDebug(_DebugNode);
+
+  //delete stuff
+  //  if(0 != ws_builder)
+  //    {
+  //      delete ws_builder;
+  //      ws_builder = 0;
+  //    }
+  _pView->updateGL();
+  
+
+	//soc QFileInfo qfi(iFileName);
+	//soc string basename((const char*)qfi.fileName().toAscii().data());
+	char cleaned[FILE_MAX];
+	BLI_strncpy(cleaned, iFileName, FILE_MAX);
+	BLI_cleanup_file(NULL, cleaned);
+	string basename = StringUtils::toAscii( string(cleaned) );
+
+  _ListOfModels.push_back(basename);
+
+  cout << "Triangles nb     : " << _SceneNumFaces << endl;
+  _bboxDiag = (_RootNode->bbox().getMax()-_RootNode->bbox().getMin()).norm();
+  cout << "Bounding Box     : " << _bboxDiag << endl;
+  return 0;
+}
+
+void Controller::CloseFile()
+{
+  WShape::SetCurrentId(0);
+  _pView->DetachModel();
+  _ListOfModels.clear();
+  if(NULL != _RootNode)
+    {
+      int ref = _RootNode->destroy();
+      if(0 == ref)
+	_RootNode->addRef();
+    
+      _RootNode->clearBBox();
+    }
+  
+  _pView->DetachSilhouette();
+  if (NULL != _SilhouetteNode)
+    {
+      int ref = _SilhouetteNode->destroy();
+      if(0 == ref)
+	{
+	  delete _SilhouetteNode;
+	  _SilhouetteNode = NULL;
+	}
+    }
+  //  if(NULL != _ProjectedSilhouette)
+  //    {
+  //      int ref = _ProjectedSilhouette->destroy();
+  //      if(0 == ref)
+  //	{
+  //	  delete _ProjectedSilhouette;
+  //	  _ProjectedSilhouette = NULL;
+  //	}
+  //    }
+  //  if(NULL != _VisibleProjectedSilhouette)
+  //    {
+  //      int ref = _VisibleProjectedSilhouette->destroy();
+  //      if(0 == ref)
+  //	{
+  //	  delete _VisibleProjectedSilhouette;
+  //	  _VisibleProjectedSilhouette = NULL;
+  //	}
+  //  }
+  
+  _pView->DetachDebug();
+  if(NULL != _DebugNode)
+    {
+      int ref = _DebugNode->destroy();
+      if(0 == ref)
+	_DebugNode->addRef();
+    }
+  
+  if(_winged_edge) {
+    delete _winged_edge;
+    _winged_edge = NULL;
+  }
+
+  // We deallocate the memory:
+  if(NULL != _ViewMap)
+    {
+      delete _ViewMap;
+      _ViewMap = 0;
+    }
+
+  // clears the canvas
+  _Canvas->Erase();
+
+  // clears the grid
+  _Grid.clear();
+  _SceneNumFaces = 0;
+  _minEdgeSize = DBL_MAX;
+  //  _pView2D->DetachScene();
+  //  if(NULL != _SRoot)
+  //  {
+  //    int ref = _SRoot->destroy();
+  //    if(0 == ref)
+  //    {
+  //      //_SRoot->addRef();
+  //      delete _SRoot;
+  //      _SRoot = NULL;
+  //    }
+  //  }
+}
+
+//  static const streamsize buffer_size = 512 * 1024;
+
+void Controller::SaveViewMapFile(const char *oFileName)
+{
+  if (!_ViewMap)
+    return;
+
+  ofstream ofs(oFileName, ios::binary);
+  if (!ofs.is_open()) {
+    cerr << "Error: Cannot save this file" << endl;
+    return;
+  }
+//    char buffer[buffer_size];
+//  #if defined(__GNUC__) && (__GNUC__ < 3)
+//    ofs.rdbuf()->setbuf(buffer, buffer_size);
+//  # else
+//    ofs.rdbuf()->pubsetbuf(buffer, buffer_size);
+//  #endif
+  _Chrono.start();
+
+  ofs << Config::VIEWMAP_MAGIC << endl << Config::VIEWMAP_VERSION << endl;
+
+  // Write the models filenames
+  ofs << _ListOfModels.size() << endl;
+  for (vector<string>::const_iterator i = _ListOfModels.begin(); i != _ListOfModels.end(); i++)
+    ofs << *i << "\n";
+
+  // Save the camera position
+  float position[3];
+  float orientation[4];
+  _pView->getCameraState(position, orientation);
+  ofs.write((char*)position, 3 * sizeof(*position));
+  ofs.write((char*)orientation, 4 * sizeof(*orientation));
+
+  // Write ViewMap
+  if (ViewMapIO::save(ofs, _ViewMap, 0)) {
+    _Chrono.stop();
+    cerr << "Error: Cannot save this file" << endl;
+    return;
+  }
+
+  real d = _Chrono.stop();
+  cout << "ViewMap saving   : " << d << endl;
+}
+
+void Controller::LoadViewMapFile(const char *iFileName, bool only_camera)
+{
+  ifstream ifs(iFileName, ios::binary);
+  if (!ifs.is_open()) {
+    cerr << "Error: Cannot load this file" << endl;
+    return;
+  }
+//    char buffer[buffer_size];
+//  #if defined(__GNUC__) && (__GNUC__ < 3)
+//    ifs.rdbuf()->setbuf(buffer, buffer_size);
+//  # else
+//    ifs.rdbuf()->pubsetbuf(buffer, buffer_size);
+//  #endif
+
+  // Test File Magic and version
+  char tmp_buffer[256];
+  string test;
+  
+  ifs.getline(tmp_buffer, 255);
+  test = tmp_buffer;
+  if (test != Config::VIEWMAP_MAGIC) {
+    cerr << "Error: This is not a valid ." << Config::VIEWMAP_EXTENSION << " file" << endl;
+    return;
+  }
+  ifs.getline(tmp_buffer, 255);
+  test = tmp_buffer;
+  if (test != Config::VIEWMAP_VERSION && !only_camera) {
+    cerr << "Error: This version of the ." << Config::VIEWMAP_EXTENSION << " file format is no longer supported" << endl;
+    return;
+  }
+
+  // Read the models filenames and open them (if not already done)
+  string tmp;
+  vector<string> tmp_vec;
+  unsigned models_nb, i;
+
+  ifs.getline(tmp_buffer, 255);
+  models_nb = atoi(tmp_buffer);
+  for (i = 0; i < models_nb; i++) {
+    ifs.getline(tmp_buffer, 255);
+    tmp = tmp_buffer;
+    tmp_vec.push_back(tmp);
+  }
+  if (_ListOfModels != tmp_vec && !only_camera) {
+    CloseFile();
+    vector<string> pathnames;
+    int err = 0;
+    for (vector<string>::const_iterator i = tmp_vec.begin(); i != tmp_vec.end(); i++)
+      {
+	pathnames.clear();
+	StringUtils::getPathName(ViewMapIO::Options::getModelsPath(), *i, pathnames);
+	for (vector<string>::const_iterator j = pathnames.begin(); j != pathnames.end(); j++)
+	  if (!(err = Load3DSFile(j->c_str())))
+	    break;
+	if (err) {
+	  cerr << "Error: cannot find model \"" << *i << "\" - check the path in the Options" << endl;
+	  return;
+	}
+      }
+  }
+
+  // Set the camera position
+  float position[3];
+  float orientation[4];
+  ifs.read((char*)position, 3 * sizeof(*position));
+  ifs.read((char*)orientation, 4 * sizeof(*orientation));
+  _pView->setCameraState(position, orientation);
+  _pView->saveCameraState();
+
+  if (only_camera) {
+    return;
+  }
+
+  // Reset ViewMap
+  if(NULL != _ViewMap)
+    {
+      delete _ViewMap;
+      _ViewMap = 0;
+    }
+  _pView->DetachSilhouette();
+  if (NULL != _SilhouetteNode)
+    {
+      int ref = _SilhouetteNode->destroy();
+      if(0 == ref)
+	delete _SilhouetteNode;
+    }
+  //  if(NULL != _ProjectedSilhouette)
+  //    {
+  //      int ref = _ProjectedSilhouette->destroy();
+  //      if(0 == ref)
+  //	delete _ProjectedSilhouette;
+  //    }
+  //  if(NULL != _VisibleProjectedSilhouette)
+  //    {
+  //      int ref = _VisibleProjectedSilhouette->destroy();
+  //      if(0 == ref)
+  //	{
+  //	  delete _VisibleProjectedSilhouette;
+  //	  _VisibleProjectedSilhouette = 0;
+  //	}
+   // }
+  _ViewMap = new ViewMap();
+
+  // Read ViewMap
+  _Chrono.start();
+  if (ViewMapIO::load(ifs, _ViewMap, 0)) {
+    _Chrono.stop();
+
+    cerr << "Error: This is not a valid ." << Config::VIEWMAP_EXTENSION << " file" << endl;
+    return;
+  }
+
+  // Update display
+  ViewMapTesselator3D sTesselator3d;
+  //ViewMapTesselator2D sTesselator2d;
+  //sTesselator2d.SetNature(_edgeTesselationNature);
+  sTesselator3d.SetNature(_edgeTesselationNature);
+  
+  // Tesselate the 3D edges:
+  _SilhouetteNode = sTesselator3d.Tesselate(_ViewMap);
+  _SilhouetteNode->addRef();
+  
+  // Tesselate 2D edges
+  //  _ProjectedSilhouette = sTesselator2d.Tesselate(_ViewMap);
+  //  _ProjectedSilhouette->addRef();
+  //  
+  _pView->AddSilhouette(_SilhouetteNode);
+  //_pView->Add2DSilhouette(_ProjectedSilhouette);
+
+  // Update options window
+  //_pOptionsWindow->updateViewMapFormat();
+
+  real d = _Chrono.stop();
+  cout << "ViewMap loading  : " << d << endl;
+
+  // Compute the Directional ViewMap:
+  if(_ComputeSteerableViewMap){
+    ComputeSteerableViewMap();
+  }
+
+  // Reset Style modules modification flags
+  resetModified(true);
+}
+
+void Controller::ComputeViewMap()
+{
+
+  if (!_ListOfModels.size())
+    return;
+  
+  if(NULL != _ViewMap)
+    {
+      delete _ViewMap;
+      _ViewMap = 0;
+    }
+
+  _pView->DetachDebug();
+  if(NULL != _DebugNode)
+    {
+      int ref = _DebugNode->destroy();
+      if(0 == ref)
+	_DebugNode->addRef();
+    }
+  
+
+  _pView->DetachSilhouette();
+  if (NULL != _SilhouetteNode)
+    {
+      int ref = _SilhouetteNode->destroy();
+      if(0 == ref)
+	delete _SilhouetteNode;
+    }
+  //  if(NULL != _ProjectedSilhouette)
+  //    {
+  //      int ref = _ProjectedSilhouette->destroy();
+  //      if(0 == ref)
+  //	delete _ProjectedSilhouette;
+  //    }
+  //  if(NULL != _VisibleProjectedSilhouette)
+  //    {
+  //      int ref = _VisibleProjectedSilhouette->destroy();
+  //      if(0 == ref)
+  //	{
+  //	  delete _VisibleProjectedSilhouette;
+  //	  _VisibleProjectedSilhouette = 0;
+  //	}
+  //  }
+  
+  // retrieve the 3D viewpoint and transformations information
+  //----------------------------------------------------------
+  // Save the viewpoint context at the view level in order 
+  // to be able to restore it later:
+  _pView->saveCameraState();
+
+  // Restore the context of view:
+  // we need to perform all these operations while the 
+  // 3D context is on.
+  _pView->Set3DContext();
+  float src[3] = { 0, 0, 0 };
+  float vp_tmp[3] = { 0, 0, 0 };
+  _pView->_camera->getWorldCoordinatesOf(src, vp_tmp);
+  Vec3r vp(vp_tmp[0], vp_tmp[1], vp_tmp[2]);
+
+  real mv[4][4];
+  _pView->RetriveModelViewMatrix((real *)mv);
+  // retrieve the projection matrix:
+  real proj[4][4];
+  _pView->RetrieveProjectionMatrix((real *)proj);
+  int viewport[4];
+  _pView->RetrieveViewport(viewport);  
+  real focalLength = _pView->GetFocalLength();
+
+  // Flag the WXEdge structure for silhouette edge detection:
+  //----------------------------------------------------------
+
+  _Chrono.start();
+ 
+  edgeDetector.SetViewpoint(Vec3r(vp));
+  edgeDetector.enableRidgesAndValleysFlag(_ComputeRidges);
+  edgeDetector.enableSuggestiveContours(_ComputeSuggestive);
+  edgeDetector.setSphereRadius(_sphereRadius);
+  edgeDetector.setSuggestiveContourKrDerivativeEpsilon(_suggestiveContourKrDerivativeEpsilon);
+  edgeDetector.processShapes(*_winged_edge);
+
+  real duration = _Chrono.stop();
+  printf("Feature lines    : %lf\n", duration);
+
+  // Builds the view map structure from the flagged WSEdge structure:
+  //----------------------------------------------------------
+  ViewMapBuilder vmBuilder;
+  vmBuilder.SetEnableQI(_EnableQI);
+  vmBuilder.SetViewpoint(Vec3r(vp));
+  
+  vmBuilder.SetTransform(mv, proj, viewport, focalLength, _pView->GetAspect(), _pView->GetFovyRadian());
+  vmBuilder.SetFrustum(_pView->znear(), _pView->zfar());
+  
+  vmBuilder.SetGrid(&_Grid);
+  
+  // Builds a tesselated form of the silhouette for display purpose:
+  //---------------------------------------------------------------
+  ViewMapTesselator3D sTesselator3d;
+  //ViewMapTesselator2D sTesselator2d;
+  //sTesselator2d.SetNature(_edgeTesselationNature);
+  sTesselator3d.SetNature(_edgeTesselationNature);
+    
+  _Chrono.start();
+  // Build View Map
+  _ViewMap = vmBuilder.BuildViewMap(*_winged_edge, _VisibilityAlgo, _EPSILON);
+  _ViewMap->setScene3dBBox(_RootNode->bbox());
+  
+  //Tesselate the 3D edges:
+  _SilhouetteNode = sTesselator3d.Tesselate(_ViewMap);
+  _SilhouetteNode->addRef();
+  
+  // Tesselate 2D edges
+  //  _ProjectedSilhouette = sTesselator2d.Tesselate(_ViewMap);
+  //  _ProjectedSilhouette->addRef();
+  
+  duration = _Chrono.stop();
+  printf("ViewMap building : %lf\n", duration);
+
+  
+  _pView->AddSilhouette(_SilhouetteNode);
+  //_pView->AddSilhouette(_WRoot);
+  //_pView->Add2DSilhouette(_ProjectedSilhouette);
+  //_pView->Add2DVisibleSilhouette(_VisibleProjectedSilhouette);  
+  _pView->AddDebug(_DebugNode);
+
+  // Draw the steerable density map:
+  //--------------------------------
+  if(_ComputeSteerableViewMap){
+    ComputeSteerableViewMap();
+  }
+  // Reset Style modules modification flags
+  resetModified(true);
+}
+
+void Controller::ComputeSteerableViewMap(){
+//soc
+  // if((!_Canvas) || (!_ViewMap))
+  //   return;
+  //   
+  // // Build 4 nodes containing the edges in the 4 directions
+  // NodeGroup *ng[Canvas::NB_STEERABLE_VIEWMAP];
+  // unsigned i;
+  // real c = 32.f/255.f; // see SteerableViewMap::readSteerableViewMapPixel() for information about this 32.
+  // for(i=0; i<Canvas::NB_STEERABLE_VIEWMAP; ++i){
+  //   ng[i] = new NodeGroup;
+  // }
+  // NodeShape *completeNS = new NodeShape;
+  // completeNS->material().SetDiffuse(c,c,c,1);
+  // ng[Canvas::NB_STEERABLE_VIEWMAP-1]->AddChild(completeNS);
+  // SteerableViewMap * svm = _Canvas->getSteerableViewMap();
+  // svm->Reset();
+  // 
+  // ViewMap::fedges_container& fedges = _ViewMap->FEdges();
+  // LineRep * fRep;
+  // NodeShape *ns;
+  // for(ViewMap::fedges_container::iterator f=fedges.begin(), fend=fedges.end();
+  // f!=fend;
+  // ++f){
+  //   if((*f)->viewedge()->qi() != 0)
+  //     continue;
+  //   fRep = new LineRep((*f)->vertexA()->point2d(),(*f)->vertexB()->point2d()) ;
+  //   completeNS->AddRep(fRep); // add to the complete map anyway
+  //   double *oweights = svm->AddFEdge(*f);
+  //   for(i=0; i<Canvas::NB_STEERABLE_VIEWMAP-1; ++i){
+  //     ns = new NodeShape;
+  //     double wc = oweights[i]*c;
+  //     if(oweights[i] == 0)
+  //       continue;
+  //     ns->material().SetDiffuse(wc, wc, wc, 1);
+  //     ns->AddRep(fRep);
+  //     ng[i]->AddChild(ns);
+  //   }
+  // }
+  // 
+  // GrayImage *img[Canvas::NB_STEERABLE_VIEWMAP];
+  // //#ifdef WIN32
+  // QGLBasicWidget offscreenBuffer(_pView, "SteerableViewMap", _pView->width(), _pView->height()); 
+  // QPixmap pm;
+  // QImage qimg;
+  // for(i=0; i<Canvas::NB_STEERABLE_VIEWMAP; ++i){
+  //   offscreenBuffer.AddNode(ng[i]);
+  //   //img[i] = new GrayImage(_pView->width(), _pView->height());
+  //   //offscreenBuffer.readPixels(0,0,_pView->width(), _pView->height(), img[i]->getArray());
+  //   pm = offscreenBuffer.renderPixmap(_pView->width(), _pView->height());
+  // 
+  //   if(pm.isNull())
+  //     cout << "BuildViewMap Warning: couldn't render the steerable ViewMap" << endl;
+  //   //pm.save(QString("steerable")+QString::number(i)+QString(".bmp"), "BMP");
+  //   // FIXME!! Lost of time !
+  //   qimg = pm.toImage();
+  //   // FIXME !! again!
+  //   img[i] = new GrayImage(_pView->width(), _pView->height());
+  //   for(unsigned y=0;y<img[i]->height();++y){
+  //     for(unsigned x=0;x<img[i]->width();++x){
+  //       //img[i]->setPixel(x,y,(float)qGray(qimg.pixel(x,y))/255.f);
+  //       img[i]->setPixel(x,y,(float)qGray(qimg.pixel(x,y)));
+  //       //        float c = qGray(qimg.pixel(x,y));
+  //       //        img[i]->setPixel(x,y,qGray(qimg.pixel(x,y)));
+  //     }
+  //   }
+  //   offscreenBuffer.DetachNode(ng[i]);
+  //   ng[i]->destroy();
+  //   delete ng[i];
+  //   // check
+  //   //    qimg = QImage(_pView->width(), _pView->height(), 32);
+  //   //    for(y=0;y<img[i]->height();++y){
+  //   //      for(unsigned x=0;x<img[i]->width();++x){
+  //   //        float v = img[i]->pixel(x,y);
+  //   //        qimg.setPixel(x,y,qRgb(v,v,v));
+  //   //      }
+  //   //    }
+  //   //    qimg.save(QString("newsteerable")+QString::number(i)+QString(".bmp"), "BMP");
+  // }
+  // 
+  // 
+  // svm->buildImagesPyramids(img,false,0,1.f);
+}
+
+void Controller::saveSteerableViewMapImages(){
+  SteerableViewMap * svm = _Canvas->getSteerableViewMap();
+  if(!svm){
+    cerr << "the Steerable ViewMap has not been computed yet" << endl;
+    return;
+  }
+  svm->saveSteerableViewMap();
+}
+
+void Controller::toggleVisibilityAlgo() 
+{
+  if(_VisibilityAlgo == ViewMapBuilder::ray_casting) {
+    _VisibilityAlgo = ViewMapBuilder::ray_casting_fast;
+  }
+  else if (_VisibilityAlgo == ViewMapBuilder::ray_casting_fast) {
+    _VisibilityAlgo = ViewMapBuilder::ray_casting_very_fast;
+  }
+  else {
+    _VisibilityAlgo = ViewMapBuilder::ray_casting;
+  }
+}
+
+void Controller::setQuantitativeInvisibility(bool iBool)
+{
+  _EnableQI = iBool;
+}
+
+bool Controller::getQuantitativeInvisibility() const
+{
+  return _EnableQI;
+}
+
+void Controller::setComputeRidgesAndValleysFlag(bool iBool){
+  _ComputeRidges = iBool;
+}
+
+bool Controller::getComputeRidgesAndValleysFlag() const {
+  return _ComputeRidges;
+}
+void Controller::setComputeSuggestiveContoursFlag(bool b){
+  _ComputeSuggestive = b;
+}
+  
+bool Controller::getComputeSuggestiveContoursFlag() const {
+  return _ComputeSuggestive;
+}
+void Controller::setComputeSteerableViewMapFlag(bool iBool){
+  _ComputeSteerableViewMap = iBool;
+}
+
+bool Controller::getComputeSteerableViewMapFlag() const {
+  return _ComputeSteerableViewMap;
+}
+void Controller::setFrontBufferFlag(bool iBool)
+{
+  AppGLWidget::setFrontBufferFlag(iBool);
+}
+
+bool Controller::getFrontBufferFlag() const
+{
+  return AppGLWidget::getFrontBufferFlag();
+}
+
+void Controller::setBackBufferFlag(bool iBool)
+{
+  AppGLWidget::setBackBufferFlag(iBool);
+}
+
+bool Controller::getBackBufferFlag() const
+{
+  return AppGLWidget::getBackBufferFlag();
+}
+
+void Controller::DrawStrokes()
+{
+  if(_ViewMap == 0)
+    return;
+
+  _Chrono.start();
+  _Canvas->Draw();
+  real d = _Chrono.stop();
+  cout << "Strokes drawing  : " << d << endl;
+  resetModified();
+}
+
+void Controller::InsertStyleModule(unsigned index, const char *iFileName)
+{
+  // QFileInfo fi(iFileName);
+  // string ext = fi.suffix();
+  // if (ext != "py") {
+  //   cerr << "Error: Cannot load \"" << fi.fileName().toAscii().data()
+  // 	 << "\", unknown extension" << endl;
+  //   return;
+  // }
+
+	if( !BLI_testextensie(iFileName, ".py") ) {
+		cerr << "Error: Cannot load \"" << StringUtils::toAscii( string(iFileName) )
+		  << "\", unknown extension" << endl;
+		  return;
+	}
+
+  StyleModule* sm = new StyleModule(iFileName, _inter);
+  _Canvas->InsertStyleModule(index, sm);
+  
+}
+
+void Controller::AddStyleModule(const char *iFileName)
+{
+  //_pStyleWindow->Add(iFileName);
+}
+
+void Controller::RemoveStyleModule(unsigned index)
+{
+  _Canvas->RemoveStyleModule(index);
+}
+
+void Controller::Clear()
+{
+  _Canvas->Clear();
+}
+
+void Controller::ReloadStyleModule(unsigned index, const char * iFileName)
+{
+  StyleModule* sm = new StyleModule(iFileName, _inter);
+  _Canvas->ReplaceStyleModule(index, sm);
+}
+
+void Controller::SwapStyleModules(unsigned i1, unsigned i2)
+{
+  _Canvas->SwapStyleModules(i1, i2);
+}
+
+
+void Controller::toggleLayer(unsigned index, bool iDisplay)
+{
+  _Canvas->SetVisible(index, iDisplay);
+  _pView->updateGL();
+}
+
+void Controller::setModified(unsigned index, bool iMod)
+{
+  //_pStyleWindow->setModified(index, iMod);
+  _Canvas->setModified(index, iMod);
+  updateCausalStyleModules(index + 1);
+}
+
+void Controller::updateCausalStyleModules(unsigned index) {
+  vector<unsigned> vec;
+  _Canvas->causalStyleModules(vec, index);
+  for (vector<unsigned>::const_iterator it = vec.begin(); it != vec.end(); it++) {
+    //_pStyleWindow->setModified(*it, true);
+    _Canvas->setModified(*it, true);
+  }
+}
+
+void Controller::saveSnapshot(bool b) {
+ _pView->saveSnapshot(b);
+}
+
+void Controller::resetModified(bool iMod)
+{
+  //_pStyleWindow->resetModified(iMod);
+  _Canvas->resetModified(iMod);
+}
+
+FEdge* Controller::SelectFEdge(real x, real y)
+{
+  if (!_ViewMap)
+    return NULL;
+
+  FEdge *fedge = (FEdge*)_ViewMap->GetClosestFEdge(x,y);
+  //ViewEdge *selection = fedge->viewedge();
+  _pView->SetSelectedFEdge(fedge);
+  _Canvas->SetSelectedFEdge(fedge);
+  return fedge;
+}
+
+ViewEdge* Controller::SelectViewEdge(real x, real y)
+{
+  if (!_ViewMap)
+    return NULL;
+
+  FEdge *fedge = (FEdge*)_ViewMap->GetClosestFEdge(x,y);
+  ViewEdge *selection = fedge->viewedge();
+  _pView->SetSelectedFEdge(fedge);
+  _Canvas->SetSelectedFEdge(fedge);
+  return selection;
+}
+
+NodeGroup * Controller::BuildRep(vector<ViewEdge*>::iterator vedges_begin, 
+                                       vector<ViewEdge*>::iterator vedges_end)
+{
+  ViewMapTesselator2D tesselator2D;
+  Material mat;
+  mat.SetDiffuse(1,1,0.3,1);
+  tesselator2D.SetMaterial(mat);
+
+  return (tesselator2D.Tesselate(vedges_begin, vedges_end));
+}
+
+void Controller::toggleEdgeTesselationNature(Nature::EdgeNature iNature)
+{
+  _edgeTesselationNature ^= (iNature);
+  ComputeViewMap();
+}
+
+void		Controller::setModelsDir(const string& dir) {
+  //_current_dirs->setValue("models/dir", dir);
+}
+
+string		Controller::getModelsDir() const {
+  string dir = ".";
+  //_current_dirs->getValue("models/dir", dir);
+  return dir;
+}
+
+void		Controller::setModulesDir(const string& dir) {
+  //_current_dirs->setValue("modules/dir", dir);
+}
+
+string		Controller::getModulesDir() const {
+  string dir = ".";
+  //_current_dirs->getValue("modules/dir", dir);
+  return dir;
+}
+
+void		Controller::setPapersDir(const string& dir) {
+  //_current_dirs->setValue("papers/dir", dir);
+}
+
+string		Controller::getPapersDir() const {
+  string dir = Config::Path::getInstance()->getPapersDir();
+  //_current_dirs->getValue("papers/dir", dir);
+  return dir;
+}
+
+void		Controller::setHelpIndex(const string& index) {
+  _help_index = index;
+}
+
+string		Controller::getHelpIndex() const {
+  return _help_index;
+}
+
+void		Controller::setBrowserCmd(const string& cmd) {
+  _browser_cmd = cmd;
+}
+
+string		Controller::getBrowserCmd() const {
+  return _browser_cmd;
+}
+
+void		Controller::resetInterpreter() {
+  if (_inter)
+    _inter->reset();
+}
+
+
+void Controller::displayDensityCurves(int x, int y){
+  SteerableViewMap * svm = _Canvas->getSteerableViewMap();
+  if(!svm)
+    return;
+
+  unsigned i,j;
+  typedef vector<Vec3r> densityCurve;
+  vector<densityCurve> curves(svm->getNumberOfOrientations()+1);
+  vector<densityCurve> curvesDirection(svm->getNumberOfPyramidLevels());
+
+  // collect the curves values
+  unsigned nbCurves = svm->getNumberOfOrientations()+1;
+  unsigned nbPoints = svm->getNumberOfPyramidLevels();
+  if(!nbPoints)
+    return;
+
+  // build the density/nbLevels curves for each orientation
+  for(i=0;i<nbCurves; ++i){
+    for(j=0; j<nbPoints; ++j){
+      curves[i].push_back(Vec3r(j, svm->readSteerableViewMapPixel(i, j, x, y), 0));
+    }
+  }
+  // build the density/nbOrientations curves for each level
+  for(i=0;i<nbPoints; ++i){
+    for(j=0; j<nbCurves; ++j){
+      curvesDirection[i].push_back(Vec3r(j, svm->readSteerableViewMapPixel(j, i, x, y), 0));
+    }
+  }
+
+  // display the curves
+  // for(i=0; i<nbCurves; ++i)
+  //     _pDensityCurvesWindow->SetOrientationCurve(i, Vec2d(0,0), Vec2d(nbPoints, 1), curves[i], "scale", "density");
+  //   for(i=1; i<=8; ++i)
+  //     _pDensityCurvesWindow->SetLevelCurve(i, Vec2d(0,0), Vec2d(nbCurves, 1), curvesDirection[i], "orientation", "density");
+  //   _pDensityCurvesWindow->show();
+}
diff --git a/source/blender/freestyle/intern/app_blender/Controller.h b/source/blender/freestyle/intern/app_blender/Controller.h
new file mode 100755
index 00000000000..55ef1968129
--- /dev/null
+++ b/source/blender/freestyle/intern/app_blender/Controller.h
@@ -0,0 +1,213 @@
+//
+//  Filename         : Controller.h
+//  Author           : Stephane Grabli
+//  Purpose          : The spinal tap of the system
+//  Date of creation : 01/07/2002
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  CONTROLLER_H
+# define CONTROLLER_H
+
+# include <string>
+//# include "ConfigIO.h"
+# include "../geometry/FastGrid.h"
+# include "../geometry/HashGrid.h"
+# include "../view_map/ViewMapBuilder.h"
+# include "../system/TimeUtils.h"
+# include "../system/Precision.h"
+# include "../system/Interpreter.h"
+# include "../view_map/FEdgeXDetector.h"
+
+class AppGLWidget;
+class NodeGroup;
+class WShape;
+class SShape;
+class ViewMap;
+class ViewEdge;
+class AppCanvas;
+class InteractiveShader;
+class Shader;
+
+class Controller
+{
+public:
+  Controller() ;
+  ~Controller() ;
+  
+  void SetView(AppGLWidget *iView);
+
+  int  Load3DSFile(const char *iFileName);
+  void CloseFile();
+  void LoadViewMapFile(const char *iFileName, bool only_camera = false);
+  void SaveViewMapFile(const char *iFileName);
+  void ComputeViewMap();
+  void ComputeSteerableViewMap();
+  void saveSteerableViewMapImages();
+  void toggleEdgeTesselationNature(Nature::EdgeNature iNature);
+  void DrawStrokes();
+  void SwapStyleModules(unsigned i1, unsigned i2);
+  void InsertStyleModule(unsigned index, const char *iFileName);
+  void AddStyleModule(const char *iFileName);
+  void RemoveStyleModule(unsigned index);
+  void ReloadStyleModule(unsigned index, const char * iFileName);
+  void Clear();
+  void toggleLayer(unsigned index, bool iDisplay);
+  void setModified(unsigned index, bool iMod);
+  void resetModified(bool iMod=false);
+  void updateCausalStyleModules(unsigned index);
+  void saveSnapshot(bool b = false);
+  void displayDensityCurves(int x, int y);
+ 
+  
+  ViewEdge * SelectViewEdge(real x, real y);
+  FEdge * SelectFEdge(real x, real y);
+  NodeGroup* BuildRep(vector<ViewEdge*>::iterator vedges_begin, 
+		      vector<ViewEdge*>::iterator vedges_end) ;
+  
+  NodeGroup* debugNode() {return _DebugNode;}
+  AppGLWidget * view() {return _pView;}
+  NodeGroup* debugScene() {return _DebugNode;}
+  Grid& grid() {return _Grid;}
+  
+  void toggleVisibilityAlgo();
+
+  void setQuantitativeInvisibility(bool iBool); // if true, we compute quantitativeInvisibility
+  bool getQuantitativeInvisibility() const;
+
+  void setFrontBufferFlag(bool b);
+  bool getFrontBufferFlag() const;
+  void setBackBufferFlag(bool b);
+  bool getBackBufferFlag() const;
+
+  void setComputeRidgesAndValleysFlag(bool b);
+  bool getComputeRidgesAndValleysFlag() const ;
+  void setComputeSuggestiveContoursFlag(bool b);
+  bool getComputeSuggestiveContoursFlag() const ;
+
+  void setComputeSteerableViewMapFlag(bool iBool);
+  bool getComputeSteerableViewMapFlag() const;
+  void setSphereRadius(real s){_sphereRadius=s;}
+  real getSphereRadius() const {return _sphereRadius;}
+  void setSuggestiveContourKrDerivativeEpsilon(real dkr){_suggestiveContourKrDerivativeEpsilon=dkr;}
+  real getSuggestiveContourKrDerivativeEpsilon() const {return _suggestiveContourKrDerivativeEpsilon;}
+
+  void		setModelsDir(const string& dir);
+  string	getModelsDir() const;
+  void		setModulesDir(const string& dir);
+  string	getModulesDir() const;
+  void		setPapersDir(const string& dir);
+  string	getPapersDir() const;
+  void		setHelpIndex(const string& dir);
+  string	getHelpIndex() const;
+  void		setBrowserCmd(const string& cmd);
+  string	getBrowserCmd() const;
+
+  void resetInterpreter();
+
+private:
+
+  // Main Window:
+  //AppMainWindow *_pMainWindow;
+
+  // List of models currently loaded
+  vector<string> _ListOfModels;
+
+  // Current directories
+  //ConfigIO* _current_dirs;
+
+  //View
+  // 3D
+  AppGLWidget *_pView;
+  
+  // 2D
+  //Viewer2DWindow *_pView2DWindow;
+  //Viewer2D *_pView2D;
+  
+  //Model
+  // Drawing Structure
+  NodeGroup *_RootNode;
+
+  // Winged-Edge structure
+  WingedEdge* _winged_edge;
+  
+  ViewMap * _ViewMap;
+
+  // Silhouette structure:
+  //std::vector<SShape*> _SShapes;
+  //NodeGroup *_SRoot;
+  
+  // Silhouette
+  NodeGroup *_SilhouetteNode;
+  NodeGroup *_ProjectedSilhouette;
+  NodeGroup *_VisibleProjectedSilhouette;
+  
+  // more Debug info
+  NodeGroup *_DebugNode;
+
+  // debug
+  //  NodeUser<ViewMap> *_ViewMapNode; // FIXME
+
+  // Chronometer:
+  Chronometer _Chrono;
+
+  // edges tesselation nature
+  int _edgeTesselationNature;
+
+  FastGrid _Grid;
+  //HashGrid _Grid;
+  
+  unsigned int _SceneNumFaces;
+  real _minEdgeSize;
+  real _EPSILON;
+  real _bboxDiag;
+
+  AppCanvas *_Canvas;
+
+  //AppStyleWindow *_pStyleWindow;
+  //AppOptionsWindow *_pOptionsWindow;
+  //AppDensityCurvesWindow *_pDensityCurvesWindow;
+
+  ViewMapBuilder::visibility_algo	_VisibilityAlgo;
+  
+  // Script Interpreter
+  Interpreter* _inter;
+
+  string	_help_index;
+  string	_browser_cmd;
+
+  bool _EnableQI;
+  bool _ComputeRidges;
+  bool _ComputeSuggestive;
+  real _sphereRadius;
+  real _suggestiveContourKrDerivativeEpsilon;
+
+  bool _ComputeSteerableViewMap;
+
+  FEdgeXDetector edgeDetector;
+};
+
+extern Controller	*g_pController;
+
+#endif // CONTROLLER_H
diff --git a/source/blender/freestyle/intern/rendering/GLDebugRenderer.cpp b/source/blender/freestyle/intern/rendering/GLDebugRenderer.cpp
index b396a0ce6d3..716db397e94 100755
--- a/source/blender/freestyle/intern/rendering/GLDebugRenderer.cpp
+++ b/source/blender/freestyle/intern/rendering/GLDebugRenderer.cpp
@@ -124,7 +124,7 @@ void GLDebugRenderer::renderBitmapString(real x,
   glScalef(textSize/200.0, textSize/200.0, textSize/200.0);
   for (c=string; *c != '\0'; c++) 
   {
-    glutStrokeCharacter(font, *c);
+    //soc glutStrokeCharacter(font, *c);
   }
   glPopMatrix();
 }
diff --git a/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp b/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
index 3870edc2b75..d7f2e5683c5 100755
--- a/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
+++ b/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
@@ -201,6 +201,7 @@ unsigned int SteerableViewMap::getNumberOfPyramidLevels() const{
     return _imagesPyramids[0]->getNumberOfLevels();
   return 0;
 }
+
 void SteerableViewMap::saveSteerableViewMap() const {
   for(unsigned i=0; i<=_nbOrientations; ++i){
     if(_imagesPyramids[i] == 0){
diff --git a/source/blender/freestyle/intern/AUTHORS.TXT b/source/blender/freestyle/misc/AUTHORS.TXT
similarity index 100%
rename from source/blender/freestyle/intern/AUTHORS.TXT
rename to source/blender/freestyle/misc/AUTHORS.TXT
diff --git a/source/blender/freestyle/intern/BUGS.TXT b/source/blender/freestyle/misc/BUGS.TXT
similarity index 100%
rename from source/blender/freestyle/intern/BUGS.TXT
rename to source/blender/freestyle/misc/BUGS.TXT
diff --git a/source/blender/freestyle/intern/COPYRIGHT.TXT b/source/blender/freestyle/misc/COPYRIGHT.TXT
similarity index 100%
rename from source/blender/freestyle/intern/COPYRIGHT.TXT
rename to source/blender/freestyle/misc/COPYRIGHT.TXT
diff --git a/source/blender/freestyle/intern/Config.pri b/source/blender/freestyle/misc/Config.pri
similarity index 100%
rename from source/blender/freestyle/intern/Config.pri
rename to source/blender/freestyle/misc/Config.pri
diff --git a/source/blender/freestyle/intern/Freestyle-vc7-debug.sln b/source/blender/freestyle/misc/Freestyle-vc7-debug.sln
similarity index 100%
rename from source/blender/freestyle/intern/Freestyle-vc7-debug.sln
rename to source/blender/freestyle/misc/Freestyle-vc7-debug.sln
diff --git a/source/blender/freestyle/intern/Freestyle-vc7-release.sln b/source/blender/freestyle/misc/Freestyle-vc7-release.sln
similarity index 100%
rename from source/blender/freestyle/intern/Freestyle-vc7-release.sln
rename to source/blender/freestyle/misc/Freestyle-vc7-release.sln
diff --git a/source/blender/freestyle/intern/Freestyle-vc8-debug.sln b/source/blender/freestyle/misc/Freestyle-vc8-debug.sln
similarity index 100%
rename from source/blender/freestyle/intern/Freestyle-vc8-debug.sln
rename to source/blender/freestyle/misc/Freestyle-vc8-debug.sln
diff --git a/source/blender/freestyle/intern/Freestyle-vc8-release.sln b/source/blender/freestyle/misc/Freestyle-vc8-release.sln
similarity index 100%
rename from source/blender/freestyle/intern/Freestyle-vc8-release.sln
rename to source/blender/freestyle/misc/Freestyle-vc8-release.sln
diff --git a/source/blender/freestyle/intern/INSTALL.TXT b/source/blender/freestyle/misc/INSTALL.TXT
similarity index 100%
rename from source/blender/freestyle/intern/INSTALL.TXT
rename to source/blender/freestyle/misc/INSTALL.TXT
diff --git a/source/blender/freestyle/intern/LICENSE.TXT b/source/blender/freestyle/misc/LICENSE.TXT
similarity index 100%
rename from source/blender/freestyle/intern/LICENSE.TXT
rename to source/blender/freestyle/misc/LICENSE.TXT
diff --git a/source/blender/freestyle/intern/Makefile.pro b/source/blender/freestyle/misc/Makefile.pro
similarity index 100%
rename from source/blender/freestyle/intern/Makefile.pro
rename to source/blender/freestyle/misc/Makefile.pro
diff --git a/source/blender/freestyle/intern/README.TXT b/source/blender/freestyle/misc/README.TXT
similarity index 100%
rename from source/blender/freestyle/intern/README.TXT
rename to source/blender/freestyle/misc/README.TXT
diff --git a/source/blender/freestyle/intern/THANKS.TXT b/source/blender/freestyle/misc/THANKS.TXT
similarity index 100%
rename from source/blender/freestyle/intern/THANKS.TXT
rename to source/blender/freestyle/misc/THANKS.TXT
diff --git a/source/blender/freestyle/intern/TODO.TXT b/source/blender/freestyle/misc/TODO.TXT
similarity index 100%
rename from source/blender/freestyle/intern/TODO.TXT
rename to source/blender/freestyle/misc/TODO.TXT
diff --git a/source/blender/freestyle/intern/build_bundle.macosx.py b/source/blender/freestyle/misc/build_bundle.macosx.py
similarity index 100%
rename from source/blender/freestyle/intern/build_bundle.macosx.py
rename to source/blender/freestyle/misc/build_bundle.macosx.py
diff --git a/source/blender/freestyle/intern/libconfig.pri b/source/blender/freestyle/misc/libconfig.pri
similarity index 100%
rename from source/blender/freestyle/intern/libconfig.pri
rename to source/blender/freestyle/misc/libconfig.pri
diff --git a/source/blender/freestyle/intern/makedsp.vcnet.debug.bat b/source/blender/freestyle/misc/makedsp.vcnet.debug.bat
similarity index 100%
rename from source/blender/freestyle/intern/makedsp.vcnet.debug.bat
rename to source/blender/freestyle/misc/makedsp.vcnet.debug.bat
diff --git a/source/blender/freestyle/intern/makedsp.vcnet.release.bat b/source/blender/freestyle/misc/makedsp.vcnet.release.bat
similarity index 100%
rename from source/blender/freestyle/intern/makedsp.vcnet.release.bat
rename to source/blender/freestyle/misc/makedsp.vcnet.release.bat
diff --git a/source/blender/imbuf/SConscript b/source/blender/imbuf/SConscript
index f9e46b20d9a..7d44f82a1d0 100644
--- a/source/blender/imbuf/SConscript
+++ b/source/blender/imbuf/SConscript
@@ -31,4 +31,4 @@ if env['WITH_BF_QUICKTIME']==1:
 	incs += ' ' + env['BF_QUICKTIME_INC']
 	defs.append('WITH_QUICKTIME')
 
-env.BlenderLib ( libname = 'bf_imbuf', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [80, 40] )
+env.BlenderLib ( libname = 'bf_imbuf', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player','blender'], priority = [80, 40, -1] )
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 45833695ffe..3d1641a2110 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -610,6 +610,7 @@ typedef struct Scene {
 /* yafray: renderer flag (not only exclusive to yafray) */
 #define R_INTERN	0
 #define R_YAFRAY	1
+#define R_FREESTYLE	2
 
 /* scemode (int now) */
 #define R_DOSEQ				0x0001
diff --git a/source/blender/python/api2_2x/sceneRender.c b/source/blender/python/api2_2x/sceneRender.c
index db5ad669255..fdc65608146 100644
--- a/source/blender/python/api2_2x/sceneRender.c
+++ b/source/blender/python/api2_2x/sceneRender.c
@@ -970,6 +970,8 @@ static int RenderData_setRenderer( BPy_RenderData * self, PyObject * value )
 		self->renderContext->renderer = R_INTERN;
 	else if( type == R_YAFRAY )
 		self->renderContext->renderer = R_YAFRAY;
+	else if( type == R_FREESTYLE )
+		self->renderContext->renderer = R_FREESTYLE;
 	else
 		return EXPP_ReturnIntError( PyExc_ValueError,
 				"expected constant INTERNAL or YAFRAY" );
@@ -3835,6 +3837,7 @@ PyObject *Render_Init( void )
 
 	PyModule_AddIntConstant( submodule, "INTERNAL", R_INTERN );
 	PyModule_AddIntConstant( submodule, "YAFRAY", R_YAFRAY );
+	PyModule_AddIntConstant( submodule, "FREESTYLE", R_FREESTYLE );
 	PyModule_AddIntConstant( submodule, "AVIRAW", R_AVIRAW );
 	PyModule_AddIntConstant( submodule, "AVIJPEG", R_AVIJPEG );
 	PyModule_AddIntConstant( submodule, "AVICODEC", R_AVICODEC );
diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript
index b1bc9673f23..ce00af8af43 100644
--- a/source/blender/render/SConscript
+++ b/source/blender/render/SConscript
@@ -7,6 +7,7 @@ sources = env.Glob('intern/source/*.c')
 incs = 'intern/include #/intern/guardedalloc ../blenlib ../makesdna'
 incs += ' extern/include ../blenkernel ../radiosity/extern/include ../imbuf'
 incs += ' ../quicktime ../include ../../kernel/gen_messaging'
+incs += ' ../freestyle'
 
 defs = []
 
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 93282e641d3..feccec6461f 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -70,6 +70,9 @@
 
 #endif /* disable yafray */
 
+#include "FST_freestyle.h"
+
+
 /* internal */
 #include "render_types.h"
 #include "renderpipeline.h"
@@ -2192,6 +2195,11 @@ static void do_render_composite_fields_blur_3d(Render *re)
 	re->display_draw(re->result, NULL);
 }
 
+static void freestyleRender(Render *re)
+{
+	FRS_execute();
+}
+
 #ifndef DISABLE_YAFRAY
 /* yafray: main yafray render/export call */
 static void yafrayRender(Render *re)
@@ -2286,10 +2294,15 @@ static void do_render_all_options(Render *re)
 #ifndef DISABLE_YAFRAY
 		if(re->r.renderer==R_YAFRAY)
 			yafrayRender(re);
+		else if(re->r.renderer==R_FREESTYLE)
+			freestyleRender(re);
 		else
 			do_render_composite_fields_blur_3d(re);
 #else
-		do_render_composite_fields_blur_3d(re);
+		if(re->r.renderer==R_FREESTYLE)
+			freestyleRender(re);
+		else
+			do_render_composite_fields_blur_3d(re);
 #endif
 	}
 	
@@ -2402,7 +2415,7 @@ static int is_rendering_allowed(Render *re)
 	}
 	
 	/* renderer */
-	if(!ELEM(re->r.renderer, R_INTERN, R_YAFRAY)) {
+	if(!ELEM3(re->r.renderer, R_INTERN, R_YAFRAY, R_FREESTYLE)) {
 		re->error("Unknown render engine set");
 		return 0;
 	}
diff --git a/source/blender/src/buttons_scene.c b/source/blender/src/buttons_scene.c
index b295cdd8481..e24101786a3 100644
--- a/source/blender/src/buttons_scene.c
+++ b/source/blender/src/buttons_scene.c
@@ -2180,10 +2180,10 @@ static void render_panel_render(void)
 	uiDefBut(block, BUT,B_DORENDER,"RENDER",	369, 164, 191,37, 0, 0, 0, 0, 0, "Render the current frame (F12)");
 #ifndef DISABLE_YAFRAY
 	/* yafray: on request, render engine menu is back again, and moved to Render panel */
-	uiDefButS(block, MENU, B_SWITCHRENDER, "Rendering Engine %t|Blender Internal %x0|YafRay %x1", 
+	uiDefButS(block, MENU, B_SWITCHRENDER, "Rendering Engine %t|Blender Internal %x0|YafRay %x1|Freestyle %x2", 
 												369, 142, 191, 20, &G.scene->r.renderer, 0, 0, 0, 0, "Choose rendering engine");	
 #else
-	uiDefButS(block, MENU, B_SWITCHRENDER, "Rendering Engine %t|Blender Internal %x0", 
+	uiDefButS(block, MENU, B_SWITCHRENDER, "Rendering Engine %t|Blender Internal %x0|Freestyle %x1", 
 												369, 142, 191, 20, &G.scene->r.renderer, 0, 0, 0, 0, "Choose rendering engine");	
 #endif /* disable yafray */
 
diff --git a/source/blender/src/renderwin.c b/source/blender/src/renderwin.c
index 7699de41381..4576e149ed2 100644
--- a/source/blender/src/renderwin.c
+++ b/source/blender/src/renderwin.c
@@ -645,10 +645,12 @@ static char *renderwin_get_title()
 	
 	if(BIF_show_render_spare()) {
 		if (G.scene->r.renderer==R_YAFRAY) title = "YafRay:Render (previous)";
+		else if (G.scene->r.renderer==R_FREESTYLE) title = "Freestyle:Render (previous)";
 		else title = "Blender:Render (previous)";
 	}
 	else {
 		if (G.scene->r.renderer==R_YAFRAY) title = "YafRay:Render";
+		else if (G.scene->r.renderer==R_FREESTYLE) title = "Freestyle:Render";
 		else title = "Blender:Render";
 	}
 

From 32918e4523aa1c251d352d83270c9b94294753fc Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Sun, 18 May 2008 14:10:44 +0000
Subject: [PATCH 011/252] corrected swig Sconscript to compile on unix-like
 machines

---
 source/blender/freestyle/SConscript | 4 ++--
 source/blender/imbuf/SConscript     | 2 +-
 source/blender/yafray/SConscript    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript
index 1f5359c5d39..3d9c1d2fd7c 100644
--- a/source/blender/freestyle/SConscript
+++ b/source/blender/freestyle/SConscript
@@ -63,8 +63,8 @@ env.BlenderLib (libname="bf_freestyle",
 				sources=sources,
                 includes=Split(incs),
                 defines=defs,
-				libtype=['blender'],
-                priority = [20] )
+				libtype=['player'],
+                priority = [280] )
 
 ########################################################
 # SWIG
diff --git a/source/blender/imbuf/SConscript b/source/blender/imbuf/SConscript
index 7d44f82a1d0..f9e46b20d9a 100644
--- a/source/blender/imbuf/SConscript
+++ b/source/blender/imbuf/SConscript
@@ -31,4 +31,4 @@ if env['WITH_BF_QUICKTIME']==1:
 	incs += ' ' + env['BF_QUICKTIME_INC']
 	defs.append('WITH_QUICKTIME')
 
-env.BlenderLib ( libname = 'bf_imbuf', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player','blender'], priority = [80, 40, -1] )
+env.BlenderLib ( libname = 'bf_imbuf', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [80, 40] )
diff --git a/source/blender/yafray/SConscript b/source/blender/yafray/SConscript
index dd744f92d39..d269661ab50 100644
--- a/source/blender/yafray/SConscript
+++ b/source/blender/yafray/SConscript
@@ -6,4 +6,4 @@ sources = env.Glob('intern/*.cpp')
 incs = '#/intern/guardedalloc ../blenlib ../makesdna ../blenkernel'
 incs += ' ../imbuf ../include ../render/extern/include ../render/intern/include'
 
-env.BlenderLib ( 'bf_yafray', sources, Split(incs), [], libtype=['blender','player'], priority=[5, 190] )
+env.BlenderLib ( 'bf_yafray', sources, Split(incs), [], libtype=['blender','player'], priority=[10, 190] )

From 09b36970bb584c1c72dd6166f2dde068b09e22bf Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Mon, 19 May 2008 05:34:31 +0000
Subject: [PATCH 012/252] soc-2008-mxcurioni: uploaded missing files. Still NOT
 linking so do not use this version yet :(

---
 source/blender/freestyle/FST_freestyle.h      |  14 ++
 source/blender/freestyle/SConscript           |   5 +-
 .../intern/app_blender/AppConfig.cpp          | 124 ++++++++++++++++++
 .../freestyle/intern/app_blender/AppConfig.h  | 111 ++++++++++++++++
 .../freestyle/intern/app_blender/api.cpp      |  21 +++
 5 files changed, 273 insertions(+), 2 deletions(-)
 create mode 100644 source/blender/freestyle/FST_freestyle.h
 create mode 100755 source/blender/freestyle/intern/app_blender/AppConfig.cpp
 create mode 100755 source/blender/freestyle/intern/app_blender/AppConfig.h
 create mode 100644 source/blender/freestyle/intern/app_blender/api.cpp

diff --git a/source/blender/freestyle/FST_freestyle.h b/source/blender/freestyle/FST_freestyle.h
new file mode 100644
index 00000000000..52940815fe4
--- /dev/null
+++ b/source/blender/freestyle/FST_freestyle.h
@@ -0,0 +1,14 @@
+#ifndef FRS_FREESTYLE_H
+#define FRS_FREESTYLE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif	
+	
+	void FRS_execute();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript
index 3d9c1d2fd7c..31a43bac58c 100644
--- a/source/blender/freestyle/SConscript
+++ b/source/blender/freestyle/SConscript
@@ -63,8 +63,9 @@ env.BlenderLib (libname="bf_freestyle",
 				sources=sources,
                 includes=Split(incs),
                 defines=defs,
-				libtype=['player'],
-                priority = [280] )
+				libtype=['blender'],
+                priority = [25]
+ )
 
 ########################################################
 # SWIG
diff --git a/source/blender/freestyle/intern/app_blender/AppConfig.cpp b/source/blender/freestyle/intern/app_blender/AppConfig.cpp
new file mode 100755
index 00000000000..baa847322d6
--- /dev/null
+++ b/source/blender/freestyle/intern/app_blender/AppConfig.cpp
@@ -0,0 +1,124 @@
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include "AppConfig.h"
+#include <iostream>
+
+#include "../system/StringUtils.h"
+
+using namespace std;
+
+namespace Config{
+  Path* Path::_pInstance = 0;
+  Path::Path(){
+    // get the home directory
+    _HomeDir = getEnvVar("HOME");
+    // get the root directory
+    setRootDir(getEnvVar("FREESTYLE_DIR"));
+    //setRootDir(QString("."));
+    _pInstance = this;
+  }
+  void Path::setRootDir(const string& iRootDir){
+    _ProjectDir = iRootDir;
+    _ModelsPath = "";
+    _PatternsPath = _ProjectDir +
+					     string(DIR_SEP.c_str()) +
+					     "data" +
+					     string(DIR_SEP.c_str()) +
+					     "textures" +
+					     string(DIR_SEP.c_str()) +
+					     "variation_patterns" +
+					     string(DIR_SEP.c_str());
+    _BrushesPath = _ProjectDir +
+					     string(DIR_SEP.c_str()) +
+					     "data" +
+					     string(DIR_SEP.c_str()) +
+					     "textures" +
+					     string(DIR_SEP.c_str()) +
+					     "brushes" +
+					     string(DIR_SEP.c_str());
+    _PythonPath = _ProjectDir + 
+              string(DIR_SEP.c_str()) + 
+              "python" + 
+              string(PATH_SEP.c_str()) +
+              _ProjectDir +
+					    string(DIR_SEP.c_str()) +
+              "style_modules" +
+              string(DIR_SEP.c_str()) ;
+    if (getenv("PYTHONPATH")) {
+      _PythonPath += string(PATH_SEP.c_str()) + string(getenv("PYTHONPATH"));
+    }
+#ifdef WIN32
+    _BrowserCmd = "C:\\Program Files\\Internet Explorer\\iexplore.exe %s";
+#else
+    _BrowserCmd = "mozilla %s";
+#endif
+    _HelpIndexPath = _ProjectDir +
+					  string(DIR_SEP.c_str()) +
+					  "doc" +
+					  string(DIR_SEP.c_str()) +
+					  "html" +
+					  string(DIR_SEP.c_str()) +
+					  "index.html";
+    _PapersDir = _ProjectDir +
+					  string(DIR_SEP.c_str()) +
+					  "data" +
+					  string(DIR_SEP.c_str()) +
+					  "textures" +
+					  string(DIR_SEP.c_str()) +
+					  "papers" +
+					  string(DIR_SEP.c_str());
+    _EnvMapDir = _ProjectDir +
+				   string(DIR_SEP.c_str()) +
+				   "data" +
+				   string(DIR_SEP.c_str()) +
+				   "env_map" +
+				   string(DIR_SEP.c_str());
+    _MapsDir = _ProjectDir +
+				   string(DIR_SEP.c_str()) +
+				   "data" +
+           string(DIR_SEP.c_str()) +
+				   "maps" +
+				   string(DIR_SEP.c_str());
+  }
+  void Path::setHomeDir(const string& iHomeDir){
+    _HomeDir = iHomeDir;
+  }
+  Path::~Path(){
+    _pInstance = 0;
+  }
+  Path* Path::getInstance() {
+    return _pInstance;
+  }
+  string Path::getEnvVar(const string& iEnvVarName){
+    string value;
+	if (!getenv( StringUtils::toAscii(iEnvVarName).c_str() ) ) {
+      cerr << "Warning: You may want to set the $"<< StringUtils::toAscii(iEnvVarName)
+		  << " environment variable to use " << string(Config::APPLICATION_NAME) << "." << endl
+	    << "         Otherwise, the current directory will be used instead." << endl;
+      value = ".";
+    }else{
+      value = getenv( StringUtils::toAscii(iEnvVarName).c_str()  );
+    } 
+    return value;
+  }
+
+} // End of namepace Config
+
diff --git a/source/blender/freestyle/intern/app_blender/AppConfig.h b/source/blender/freestyle/intern/app_blender/AppConfig.h
new file mode 100755
index 00000000000..8a6fef746dc
--- /dev/null
+++ b/source/blender/freestyle/intern/app_blender/AppConfig.h
@@ -0,0 +1,111 @@
+//
+//  Filename         : AppConfig.h
+//  Author           : Emmanuel Turquin
+//  Purpose          : Configuration file
+//  Date of creation : 26/02/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  APP_CONFIG_H
+# define APP_CONFIG_H
+
+# include <string>
+# include "../system/FreestyleConfig.h"
+# include "../system/Precision.h"
+
+using namespace std;
+
+namespace Config {
+
+  class Path{
+  protected:
+    static Path * _pInstance;
+    string _ProjectDir;
+    string _ModelsPath;
+    string _PatternsPath;
+    string _BrushesPath;
+    string _PythonPath;
+    string _BrowserCmd;
+    string _HelpIndexPath;
+    string _PapersDir;
+    string _EnvMapDir;
+    string _MapsDir;
+    string _HomeDir;
+  public:
+    Path();
+    virtual ~Path();
+    static Path* getInstance();
+
+    void setRootDir(const string& iRootDir) ;
+    void setHomeDir(const string& iHomeDir) ;
+
+    const string& getProjectDir() const {return _ProjectDir;}
+    const string& getModelsPath() const {return _ModelsPath;}
+    const string& getPatternsPath() const {return _PatternsPath;}
+    const string& getBrushesPath() const {return _BrushesPath;}
+    const string& getPythonPath() const {return _PythonPath;}
+    const string& getBrowserCmd() const {return _BrowserCmd;}
+    const string& getHelpIndexpath() const {return _HelpIndexPath;}
+    const string& getPapersDir() const {return _PapersDir;}
+    const string& getEnvMapDir() const {return _EnvMapDir;}
+    const string& getMapsDir() const {return _MapsDir;}
+    const string& getHomeDir() const {return _HomeDir;}
+
+    static string getEnvVar(const string& iEnvVarName);
+    
+  };
+
+  //
+  // Configuration, default values
+  //
+  //////////////////////////////////////////////////////////////
+
+  // Application
+  static const string APPLICATION_NAME("APPNAME");
+  static const string APPLICATION_VERSION("APPVERSION");
+
+  // ViewMap
+  static const string VIEWMAP_EXTENSION("vm");
+  static const string VIEWMAP_MAGIC("ViewMap File");
+  static const string VIEWMAP_VERSION("1.9");
+
+  // Style modules
+  static const string STYLE_MODULE_EXTENSION("py");
+  static const string STYLE_MODULES_LIST_EXTENSION("sml");
+
+  // Options
+  static const string OPTIONS_DIR("." + APPLICATION_NAME);
+  static const string OPTIONS_FILE("options.xml");
+  static const string OPTIONS_CURRENT_DIRS_FILE("current_dirs.xml");
+  static const string OPTIONS_QGLVIEWER_FILE("qglviewer.xml");
+
+  // Default options
+  static const real DEFAULT_SPHERE_RADIUS = 1.0;
+  static const real DEFAULT_DKR_EPSILON = 0.0;
+
+  // Papers
+  static const string DEFAULT_PAPER_TEXTURE("whitepaper.jpg");
+
+
+} // End of namepace Config
+
+#endif // APP_CONFIG_H
diff --git a/source/blender/freestyle/intern/app_blender/api.cpp b/source/blender/freestyle/intern/app_blender/api.cpp
new file mode 100644
index 00000000000..78ab50a7c4d
--- /dev/null
+++ b/source/blender/freestyle/intern/app_blender/api.cpp
@@ -0,0 +1,21 @@
+#include "Controller.h"
+#include <iostream>
+
+using namespace std;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+	void FRS_execute() {
+		cout << "Freestyle" << endl;
+	
+		Controller *c = new Controller;
+	
+		//c->Load3DSFile( "/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/soc-2008-mxcurioni/source/blender/freestyle/data/models/teapot.3DS" );
+
+	}
+	
+#ifdef __cplusplus
+}
+#endif

From 8ef2f1d524d81bce565d08f647805e6084de54de Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Mon, 19 May 2008 13:15:07 +0000
Subject: [PATCH 013/252] soc-2008-mxcurioni: resolved uint issues (replaced
 with unsigned int). Still NOT linking

---
 SConstruct                                             | 2 +-
 source/blender/freestyle/intern/image/ImagePyramid.cpp | 6 +++---
 source/blender/freestyle/intern/system/PseudoNoise.cpp | 2 +-
 source/blender/freestyle/intern/system/StringUtils.cpp | 2 +-
 source/blender/imbuf/SConscript                        | 2 +-
 source/blender/render/SConscript                       | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/SConstruct b/SConstruct
index 341638c0e0c..69908045173 100644
--- a/SConstruct
+++ b/SConstruct
@@ -492,7 +492,7 @@ if env['WITH_BF_PLAYER']:
     Depends(blenderplayer,installtarget)
 
 if not env['WITH_BF_GAMEENGINE']:
-    blendernogame = env.Alias('blendernogame', B.program_list)
+    blendernogame = env.Alias('blendernogame', B.game)
     Depends(blendernogame,installtarget)
 
 Depends(nsiscmd, allinstall)
diff --git a/source/blender/freestyle/intern/image/ImagePyramid.cpp b/source/blender/freestyle/intern/image/ImagePyramid.cpp
index e3f84983055..542ab7917e3 100755
--- a/source/blender/freestyle/intern/image/ImagePyramid.cpp
+++ b/source/blender/freestyle/intern/image/ImagePyramid.cpp
@@ -58,9 +58,9 @@ float ImagePyramid::pixel(int x, int y, int level){
   if(0 == level){
     return img->pixel(x,y);
   }
-  uint i  = 1<<level;
-  uint sx = x>>level;
-  uint sy = y>>level;
+  unsigned int i  = 1<<level;
+  unsigned int sx = x>>level;
+  unsigned int sy = y>>level;
   if(sx >= img->width())
     sx = img->width()-1;
   if(sy >= img->height())
diff --git a/source/blender/freestyle/intern/system/PseudoNoise.cpp b/source/blender/freestyle/intern/system/PseudoNoise.cpp
index 4d62f967cde..87ee45e69b2 100755
--- a/source/blender/freestyle/intern/system/PseudoNoise.cpp
+++ b/source/blender/freestyle/intern/system/PseudoNoise.cpp
@@ -36,7 +36,7 @@ PseudoNoise::init (long seed)
 {
   _values = new real[NB_VALUE_NOISE];
   RandGen::srand48(seed);
-  for (uint i=0; i<NB_VALUE_NOISE; i++)
+  for (unsigned int i=0; i<NB_VALUE_NOISE; i++)
     _values[i] = -1.0 + 2.0 * RandGen::drand48();
 }
 
diff --git a/source/blender/freestyle/intern/system/StringUtils.cpp b/source/blender/freestyle/intern/system/StringUtils.cpp
index 556299e45c5..bbdbef10a10 100755
--- a/source/blender/freestyle/intern/system/StringUtils.cpp
+++ b/source/blender/freestyle/intern/system/StringUtils.cpp
@@ -53,7 +53,7 @@ namespace StringUtils {
 		stringstream out("");
 		char s;
 		
-		for(uint i=0; i < str.size() ; i++){
+		for(unsigned int i=0; i < str.size() ; i++){
 			s =  ((char)(str.at(i) & 0x7F));
 			out << s;
 		}	
diff --git a/source/blender/imbuf/SConscript b/source/blender/imbuf/SConscript
index f9e46b20d9a..53ba2c3e661 100644
--- a/source/blender/imbuf/SConscript
+++ b/source/blender/imbuf/SConscript
@@ -31,4 +31,4 @@ if env['WITH_BF_QUICKTIME']==1:
 	incs += ' ' + env['BF_QUICKTIME_INC']
 	defs.append('WITH_QUICKTIME')
 
-env.BlenderLib ( libname = 'bf_imbuf', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [80, 40] )
+env.BlenderLib ( libname = 'bf_imbuf', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [80,40] )
diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript
index ce00af8af43..52f5042cd50 100644
--- a/source/blender/render/SConscript
+++ b/source/blender/render/SConscript
@@ -29,4 +29,4 @@ if env['WITH_BF_OPENEXR']:
 if env['OURPLATFORM']=='linux2':
     cflags='-pthread'
 
-env.BlenderLib ( libname = 'blender_render', sources = sources, includes = Split(incs), defines=defs, libtype='core', priority=45, compileflags=cflags )
+env.BlenderLib ( libname = 'blender_render', sources = sources, includes = Split(incs), defines=defs, libtype=['core'], priority=[45], compileflags=cflags )

From 8518e500d185e68f2c23015b835328e7c6564b13 Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Sun, 25 May 2008 17:34:21 +0000
Subject: [PATCH 014/252] =?UTF-8?q?soc-2008-mxcurioni:=20Big=20update.=20F?=
 =?UTF-8?q?inally=20works=20(links=20and=20compiles).=20So=20far,=20the=20?=
 =?UTF-8?q?following=20steps=20work:=201.=20instantiates=20the=20config=20?=
 =?UTF-8?q?path,=20the=20controller=20and=20the=20view=202.=20sets=20the?=
 =?UTF-8?q?=20controller=E2=80=99s=20view=203.=20loads=20a=203ds=20file=20?=
 =?UTF-8?q?(right=20now=20a=20fixed=20file)=204.=20inserts=20a=20style=20m?=
 =?UTF-8?q?odule=20(right=20now,=20also=20fixed)=205.=20computes=20the=20v?=
 =?UTF-8?q?iew=20map?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The next and final step is running the Python script. A lot of information are fixed and should be changed to test the following code: see source/blender/freestyle/app_blender/*.cpp and search for fixed paths (starting in /Users/).

I am currently evaluating whether it's worth making Python run on its own environment (right now, the program crashes because of PyImport_AddModule) or whether it should use Blender's Python capabilities. Also, I need to figure out how to integrate the SWIG wrapper dynamic library into the current scheme.
---
 source/blender/freestyle/SConscript           |   26 +-
 .../intern/app_blender/AppCanvas.cpp          |    1 +
 .../intern/app_blender/AppConfig.cpp          |   10 +-
 .../intern/app_blender/AppGLWidget.cpp        |   32 +-
 .../intern/app_blender/AppGLWidget.h          |  109 +-
 .../intern/app_blender/Controller.cpp         |   11 +-
 .../freestyle/intern/app_blender/Controller.h |    4 +
 .../freestyle/intern/app_blender/api.cpp      |   20 +-
 .../freestyle/intern/app_blender/camera.cpp   | 1799 ++++++
 .../freestyle/intern/app_blender/camera.h     |  565 ++
 .../freestyle/intern/app_blender/config.h     |   50 +
 .../freestyle/intern/app_blender/constraint.h |  341 ++
 .../freestyle/intern/app_blender/frame.cpp    | 1070 ++++
 .../freestyle/intern/app_blender/frame.h      |  408 ++
 .../app_blender/manipulatedCameraFrame.cpp    |   86 +
 .../app_blender/manipulatedCameraFrame.h      |  169 +
 .../intern/app_blender/manipulatedFrame.cpp   |  116 +
 .../intern/app_blender/manipulatedFrame.h     |  256 +
 .../app_blender/old_camera_vec_quaternion.txt |  593 ++
 .../freestyle/intern/app_blender/point.h      |  159 +
 .../intern/app_blender/quaternion.cpp         |  502 ++
 .../freestyle/intern/app_blender/quaternion.h |  304 +
 .../freestyle/intern/app_blender/vec.cpp      |   75 +
 .../freestyle/intern/app_blender/vec.h        |  366 ++
 .../intern/rendering/GLStrokeRenderer.cpp     |    4 +
 .../intern/stroke/BasicStrokeShaders.cpp      |    2 +
 .../freestyle/intern/stroke/Canvas.cpp        |    3 +
 .../freestyle/intern/system/StringUtils.h     |    2 +
 .../intern/view_map/SteerableViewMap.cpp      |    3 +
 source/blender/freestyle/python/Freestyle.py  | 4961 +++++++++++++++++
 30 files changed, 11954 insertions(+), 93 deletions(-)
 create mode 100644 source/blender/freestyle/intern/app_blender/camera.cpp
 create mode 100644 source/blender/freestyle/intern/app_blender/camera.h
 create mode 100644 source/blender/freestyle/intern/app_blender/config.h
 create mode 100644 source/blender/freestyle/intern/app_blender/constraint.h
 create mode 100644 source/blender/freestyle/intern/app_blender/frame.cpp
 create mode 100644 source/blender/freestyle/intern/app_blender/frame.h
 create mode 100644 source/blender/freestyle/intern/app_blender/manipulatedCameraFrame.cpp
 create mode 100644 source/blender/freestyle/intern/app_blender/manipulatedCameraFrame.h
 create mode 100644 source/blender/freestyle/intern/app_blender/manipulatedFrame.cpp
 create mode 100644 source/blender/freestyle/intern/app_blender/manipulatedFrame.h
 create mode 100644 source/blender/freestyle/intern/app_blender/old_camera_vec_quaternion.txt
 create mode 100644 source/blender/freestyle/intern/app_blender/point.h
 create mode 100644 source/blender/freestyle/intern/app_blender/quaternion.cpp
 create mode 100644 source/blender/freestyle/intern/app_blender/quaternion.h
 create mode 100644 source/blender/freestyle/intern/app_blender/vec.cpp
 create mode 100644 source/blender/freestyle/intern/app_blender/vec.h
 create mode 100755 source/blender/freestyle/python/Freestyle.py

diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript
index 31a43bac58c..97b7d4cf9f2 100644
--- a/source/blender/freestyle/SConscript
+++ b/source/blender/freestyle/SConscript
@@ -55,9 +55,14 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'):
 prefix = 'intern/app_blender'
 app_sources = env.Glob(prefix + '/*.cpp')
 
+# 	swig wrapper
+#prefix = 'intern/swig'
+#swig_sources = env.Glob(prefix + '/*.cpp')
+swig_sources = []
+
 sources = 	system_sources + image_sources + geometry_sources + scene_graph_sources \
 		  +	winged_edge_sources + view_map_sources + stroke_sources + rendering_sources \
-		  + app_sources
+		  + app_sources + swig_sources
 
 env.BlenderLib (libname="bf_freestyle",
 				sources=sources,
@@ -70,4 +75,21 @@ env.BlenderLib (libname="bf_freestyle",
 ########################################################
 # SWIG
 ########################################################
-#	swig
\ No newline at end of file
+#	swig
+
+# swig -c++ -python -o ModuleWrapper.cpp Freestyle.i
+#
+# g++   -w  -I../geometry -I../image -I../scene_graph -I../stroke -I../system -I../view_map -I../winged_edge -I/usr/include/python2.5 -c ModuleWrapper.cpp -o ModuleWrapper.o
+#
+# install -d ../../build/macosx/release/lib/python
+#
+# g++ -bundle -flat_namespace -undefined suppress  -w  -L/usr/lib/python2.5/config -lpython2.5 -o ../../build/macosx/release/lib/python/_Freestyle.so ModuleWrapper.o
+# 
+# install Freestyle.py ../../build/macosx/release/lib/python
+
+
+#================ MINE
+
+# g++ -w  -I../geometry -I../image -I../scene_graph -I../stroke -I../system -I../view_map -I../winged_edge -I/usr/include/python2.5 -I../../../blenlib -I../../../blenkernel -I../../../imbuf -I../../../makesdna -c ModuleWrapper.cpp -o ModuleWrapper.o
+# 
+# g++ -bundle -flat_namespace -undefined suppress  -w  -L/usr/lib/python2.5/config -lpython2.5 -o ../../python/_Freestyle.so ModuleWrapper.o
\ No newline at end of file
diff --git a/source/blender/freestyle/intern/app_blender/AppCanvas.cpp b/source/blender/freestyle/intern/app_blender/AppCanvas.cpp
index c9ea2d1391d..5125bf5f70b 100755
--- a/source/blender/freestyle/intern/app_blender/AppCanvas.cpp
+++ b/source/blender/freestyle/intern/app_blender/AppCanvas.cpp
@@ -29,6 +29,7 @@
 #include "../rendering/GLStrokeRenderer.h"
 #include "../rendering/GLUtils.h"
 #include "AppConfig.h"
+
 #include "../system/StringUtils.h"
 
 #ifdef WIN32
diff --git a/source/blender/freestyle/intern/app_blender/AppConfig.cpp b/source/blender/freestyle/intern/app_blender/AppConfig.cpp
index baa847322d6..de4b71c5241 100755
--- a/source/blender/freestyle/intern/app_blender/AppConfig.cpp
+++ b/source/blender/freestyle/intern/app_blender/AppConfig.cpp
@@ -31,8 +31,12 @@ namespace Config{
     // get the home directory
     _HomeDir = getEnvVar("HOME");
     // get the root directory
-    setRootDir(getEnvVar("FREESTYLE_DIR"));
-    //setRootDir(QString("."));
+	//soc
+	//setRootDir(getEnvVar("FREESTYLE_BLENDER_DIR"));
+	setRootDir("/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/soc-2008-mxcurioni/source/blender/freestyle");
+	cout << _PythonPath << endl;
+
+//setRootDir(QString("."));
     _pInstance = this;
   }
   void Path::setRootDir(const string& iRootDir){
@@ -59,7 +63,7 @@ namespace Config{
               "python" + 
               string(PATH_SEP.c_str()) +
               _ProjectDir +
-					    string(DIR_SEP.c_str()) +
+				string(DIR_SEP.c_str()) +
               "style_modules" +
               string(DIR_SEP.c_str()) ;
     if (getenv("PYTHONPATH")) {
diff --git a/source/blender/freestyle/intern/app_blender/AppGLWidget.cpp b/source/blender/freestyle/intern/app_blender/AppGLWidget.cpp
index 44e25ee1321..18e9639342d 100755
--- a/source/blender/freestyle/intern/app_blender/AppGLWidget.cpp
+++ b/source/blender/freestyle/intern/app_blender/AppGLWidget.cpp
@@ -36,9 +36,12 @@
 #include "AppConfig.h"
 
 #include "../system/StringUtils.h"
+
+extern "C" {
 #include "BLI_blenlib.h"
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
+}
 
 // glut.h must be included last to avoid a conflict with stdlib.h on vc .net 2003 and 2005
 #ifdef __MACH__
@@ -54,6 +57,9 @@ bool AppGLWidget::_backBufferFlag = true;
 
 AppGLWidget::AppGLWidget(const char *iName)
 {
+  //soc
+  _camera = new Camera;	
+
   _Fovy        = 30.f;
   //_SceneDepth = 2.f;
   _RenderStyle = LINE;
@@ -146,8 +152,6 @@ AppGLWidget::AppGLWidget(const char *iName)
   //  _backBufferFlag = true;
   _record = false;
 
-_camera = new Camera;
-
 }
 
 AppGLWidget::~AppGLWidget()
@@ -609,3 +613,27 @@ bool AppGLWidget::getBackBufferFlag() {
 //  delete [] colorPixels;  
 //}
 
+
+//*******************************
+// COPIED FROM LIBQGLVIEWER
+//*******************************
+
+	// inherited 
+	void AppGLWidget::swapBuffers() {}
+	
+	//Updates the display. Do not call draw() directly, use this method instead. 
+	void AppGLWidget::updateGL() {}
+
+	//Makes this widget's rendering context the current OpenGL rendering context. Useful with several viewers
+	void AppGLWidget::makeCurrent() {}
+
+
+	// not-inherited
+
+	//	Convenient way to call setSceneCenter() and setSceneRadius() from a (world axis aligned) bounding box of the scene.
+	void AppGLWidget::setSceneBoundingBox(const Vec& min, const Vec& max) { _camera->setSceneBoundingBox(min,max); }
+		
+	void AppGLWidget::saveSnapshot(bool b) {}
+
+	 void AppGLWidget::setStateFileName(const string& name) { stateFileName_ = name; };
+
diff --git a/source/blender/freestyle/intern/app_blender/AppGLWidget.h b/source/blender/freestyle/intern/app_blender/AppGLWidget.h
index 0d10049ee15..492fafc883a 100755
--- a/source/blender/freestyle/intern/app_blender/AppGLWidget.h
+++ b/source/blender/freestyle/intern/app_blender/AppGLWidget.h
@@ -47,6 +47,11 @@ using namespace std;
 # include "../rendering/GLDebugRenderer.h"
 //# include <QGLViewer/qglviewer.h>
 
+//soc
+#include "camera.h"
+#include "vec.h"
+#include "quaternion.h"
+
 using namespace Geometry;
 
 typedef enum {SURFACIC, LINE, DEPTHBUFFER} RenderStyle;
@@ -58,75 +63,9 @@ class GLSelectRenderer;
 class GLBBoxRenderer;
 class GLMonoColorRenderer;
 class GLDebugRenderer;
-
-class Vec{
-public:
-	Vec() {};
-	Vec(float _x, float _y, float _z): x(_x), y(_y), z(_z) {};
-	~Vec() {}
-	
-	float operator[] (unsigned i) {
-		switch(i){
-		case 0: return x; break;
-		case 1: return y; break;
-		case 2: return z; break;
-		}
-		return 0.0;
-	}
-		
-	
-	float x,y,z;
-};
-
-class Quaternion{
-public:
-	Quaternion( float _x, float _y, float _z, float _s): x(_x), y(_y), z(_z), s(_s){};
-	~Quaternion() {}
-	
-	float operator[] (unsigned i) {
-		switch(i){
-		case 0: return x; break;
-		case 1: return y; break;
-		case 2: return z; break;
-		case 3: return s; break;
-		}
-		return 0.0;
-	}
-	
-	float x,y,z,s;
-};
-
-class Camera {
-	private:
-		float _position[3];
-		float _orientation[3];
-		
-	public:
-		Camera(){};
-	  	~Camera() {};
-		
-		void setZNearCoefficient(float f) {}
-		void playPath(int i) {}
-
-		void loadProjectionMatrix() {}
-		void loadModelViewMatrix() {}
-		real distanceToSceneCenter() { return 0;}
-		void showEntireScene() {} 
-		real zFar() {return 0;}
-		real zNear() {return 0;}
-		void setPosition(Vec v) {}
-		void setOrientation(Quaternion q) {}
-		float* position() { return _position; }
-		float* orientation()  { return _orientation; }
-		void getWorldCoordinatesOf(float *src, float *vp_tmp) {}
-
-};
-
-
-//class AppGLWidget : public QGLViewer
+ 
 class AppGLWidget
 {
-  //Q_OBJECT
 
     
 public:
@@ -136,17 +75,27 @@ public:
   
 public:
 
-	inline void swapBuffers() {}
-  inline void updateGL() {}
-  inline void makeCurrent() {}
-  inline void setSceneBoundingBox(Vec &min_, Vec &max_) {}
-	inline void saveSnapshot(bool b) {}
-	inline real width() { return _width; }
-	inline real height() { return _height; }
-	 void setStateFileName(const string& name) { stateFileName_ = name; };
+	//inherited
+		inline real width() { return _width; }
+		inline real height() { return _height; }
+		void swapBuffers();
+		void updateGL();
+		void makeCurrent();
 	
+	// not-inherited
+		void setSceneBoundingBox(const Vec& min, const Vec& max);
+		void saveSnapshot(bool b);
+		void setStateFileName(const string& name);
 	
-Camera * _camera;
+
+		Camera * _camera;
+
+protected:
+	real _width, _height;
+	Vec _min,_max;
+	string stateFileName_;
+
+public:
 
   // captures a frame animation that was previously registered
   void captureMovie();
@@ -452,8 +401,8 @@ Camera * _camera;
   }
 
   void getCameraState(float* position, float* orientation) const {
-    float* pos = _camera->position();
-    float* orient = _camera->orientation();
+	Vec pos = _camera->position();
+	Quaternion orient = _camera->orientation();
     int i;
     for(i=0;i<3;++i){
       position[i] = pos[i];
@@ -585,9 +534,7 @@ protected:
   bool _record;
 
 
-real _width, _height;
-Vec _min,_max;
-string stateFileName_;
+
 };
 
 #endif // ARTGLWIDGET_H
diff --git a/source/blender/freestyle/intern/app_blender/Controller.cpp b/source/blender/freestyle/intern/app_blender/Controller.cpp
index edc1b7f663a..9401f1ae281 100755
--- a/source/blender/freestyle/intern/app_blender/Controller.cpp
+++ b/source/blender/freestyle/intern/app_blender/Controller.cpp
@@ -67,9 +67,9 @@
 
 Controller::Controller()
 {
+	
   const string sep(Config::DIR_SEP.c_str());
-  const string filename = Config::Path::getInstance()->getHomeDir() + sep +
-    Config::OPTIONS_DIR + sep + Config::OPTIONS_CURRENT_DIRS_FILE;
+  //const string filename = Config::Path::getInstance()->getHomeDir() + sep + Config::OPTIONS_DIR + sep + Config::OPTIONS_CURRENT_DIRS_FILE;
   //_current_dirs = new ConfigIO(filename, Config::APPLICATION_NAME + "CurrentDirs", true);
 
   _RootNode = new NodeGroup;
@@ -88,6 +88,7 @@ Controller::Controller()
 
   _edgeTesselationNature = (Nature::SILHOUETTE | Nature::BORDER | Nature::CREASE);
 
+  _ProgressBar = new ProgressBar;
   _SceneNumFaces = 0;
   _minEdgeSize = DBL_MAX;
   _bboxDiag = 0;
@@ -180,9 +181,12 @@ int Controller::Load3DSFile(const char *iFileName)
   NodeGroup *maxScene = loader3DS.Load();
 
   if (maxScene == NULL) {
+	cout << "Cannot load scene" << endl;
     return 1;
   }
 
+  cout << "Scene loaded\n" << endl;
+
   printf("Mesh cleaning    : %lf\n", _Chrono.stop());
   _SceneNumFaces += loader3DS.numFacesRead();
 
@@ -199,13 +203,14 @@ int Controller::Load3DSFile(const char *iFileName)
   // DEBUG
 //   ScenePrettyPrinter spp;
 //   maxScene->accept(spp);
-
+	
   _RootNode->AddChild(maxScene);
   _RootNode->UpdateBBox(); // FIXME: Correct that by making a Renderer to compute the bbox
 
   _pView->SetModel(_RootNode);
   _pView->FitBBox();
 
+
   _Chrono.start();
 
   
diff --git a/source/blender/freestyle/intern/app_blender/Controller.h b/source/blender/freestyle/intern/app_blender/Controller.h
index 55ef1968129..5727db5705a 100755
--- a/source/blender/freestyle/intern/app_blender/Controller.h
+++ b/source/blender/freestyle/intern/app_blender/Controller.h
@@ -36,6 +36,7 @@
 # include "../geometry/HashGrid.h"
 # include "../view_map/ViewMapBuilder.h"
 # include "../system/TimeUtils.h"
+# include "../system/ProgressBar.h"
 # include "../system/Precision.h"
 # include "../system/Interpreter.h"
 # include "../view_map/FEdgeXDetector.h"
@@ -172,6 +173,9 @@ private:
   // Chronometer:
   Chronometer _Chrono;
 
+	// Progress Bar
+  ProgressBar *_ProgressBar;
+
   // edges tesselation nature
   int _edgeTesselationNature;
 
diff --git a/source/blender/freestyle/intern/app_blender/api.cpp b/source/blender/freestyle/intern/app_blender/api.cpp
index 78ab50a7c4d..0601ce191f9 100644
--- a/source/blender/freestyle/intern/app_blender/api.cpp
+++ b/source/blender/freestyle/intern/app_blender/api.cpp
@@ -1,4 +1,8 @@
+
+#include "AppGLWidget.h"
 #include "Controller.h"
+#include "AppConfig.h"
+
 #include <iostream>
 
 using namespace std;
@@ -8,11 +12,23 @@ extern "C" {
 #endif
 
 	void FRS_execute() {
-		cout << "Freestyle" << endl;
+		cout << "Freestyle start" << endl;
 	
+		Config::Path pathconfig;
 		Controller *c = new Controller;
+		AppGLWidget *view = new AppGLWidget;
+		
+		c->SetView(view);
 	
-		//c->Load3DSFile( "/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/soc-2008-mxcurioni/source/blender/freestyle/data/models/teapot.3DS" );
+		c->Load3DSFile( "/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/soc-2008-mxcurioni/source/blender/freestyle/data/models/teapot.3DS" );
+		
+		c->InsertStyleModule( 0,  "/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules/contour.py" );
+		c->toggleLayer(0, true);
+		c->ComputeViewMap();
+		 
+		//c->DrawStrokes();
+		
+		cout << "Freestyle end" << endl;
 
 	}
 	
diff --git a/source/blender/freestyle/intern/app_blender/camera.cpp b/source/blender/freestyle/intern/app_blender/camera.cpp
new file mode 100644
index 00000000000..25af0550e6c
--- /dev/null
+++ b/source/blender/freestyle/intern/app_blender/camera.cpp
@@ -0,0 +1,1799 @@
+/****************************************************************************
+
+ Copyright (C) 2002-2007 Gilles Debunne (Gilles.Debunne@imag.fr)
+
+ This file is part of the QGLViewer library.
+ Version 2.2.6-3, released on August 28, 2007.
+
+ http://artis.imag.fr/Members/Gilles.Debunne/QGLViewer
+
+ libQGLViewer 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.
+
+ libQGLViewer 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 libQGLViewer; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*****************************************************************************/
+
+#include "camera.h"
+//#include "qglviewer.h"
+
+using namespace std;
+//using namespace qglviewer;
+
+/*! Default constructor.
+
+ sceneCenter() is set to (0,0,0) and sceneRadius() is set to 1.0. type() is Camera::PERSPECTIVE,
+ with a \c M_PI/4 fieldOfView().
+
+ See IODistance(), physicalDistanceToScreen(), physicalScreenWidth() and focusDistance()
+ documentations for default stereo parameter values. */
+Camera::Camera()
+  : fieldOfView_(M_PI/4.0f)
+{
+  // #CONNECTION# Camera copy constructor
+  //interpolationKfi_ = new KeyFrameInterpolator;
+  // Requires the interpolationKfi_
+  setFrame(new ManipulatedCameraFrame());
+
+  // #CONNECTION# All these default values identical in initFromDOMElement.
+
+  // Requires fieldOfView() to define focusDistance()
+  setSceneRadius(1.0);
+
+  // Initial value (only scaled after this)
+  orthoCoef_ = tan(fieldOfView()/2.0);
+
+  // Also defines the revolveAroundPoint(), which changes orthoCoef_. Requires a frame().
+  setSceneCenter(Vec(0.0, 0.0, 0.0));
+
+  // Requires fieldOfView() when called with ORTHOGRAPHIC. Attention to projectionMatrix_ below.
+  setType(PERSPECTIVE);
+
+  // #CONNECTION# initFromDOMElement default values
+  setZNearCoefficient(0.005f);
+  setZClippingCoefficient(sqrt(3.0));
+
+  // Dummy values
+  setScreenWidthAndHeight(600, 400);
+
+  // Stereo parameters
+  setIODistance(0.062f);
+  setPhysicalDistanceToScreen(0.5f);
+  setPhysicalScreenWidth(0.4f);
+  // focusDistance is set from setFieldOfView()
+
+  // #CONNECTION# Camera copy constructor
+  for (unsigned short j=0; j<16; ++j)
+    {
+      modelViewMatrix_[j] = ((j%5 == 0) ? 1.0 : 0.0);
+      // #CONNECTION# computeProjectionMatrix() is lazy and assumes 0.0 almost everywhere.
+      projectionMatrix_[j] = 0.0;
+    }
+  computeProjectionMatrix();
+}
+
+/*! Virtual destructor.
+
+ The frame() is deleted, but the different keyFrameInterpolator() are \e not deleted (in case they
+ are shared). */
+Camera::~Camera()
+{
+  delete frame_;
+  //delete interpolationKfi_;
+}
+
+
+/*! Copy constructor. Performs a deep copy using operator=(). */
+Camera::Camera(const Camera& camera)
+{
+  // #CONNECTION# Camera constructor
+  //interpolationKfi_ = new KeyFrameInterpolator;
+  // Requires the interpolationKfi_
+  setFrame(new ManipulatedCameraFrame());
+
+  for (unsigned short j=0; j<16; ++j)
+    {
+      modelViewMatrix_[j] = ((j%5 == 0) ? 1.0 : 0.0);
+      // #CONNECTION# computeProjectionMatrix() is lazy and assumes 0.0 almost everywhere.
+      projectionMatrix_[j] = 0.0;
+    }
+
+  (*this)=camera;
+}
+
+/*! Equal operator.
+
+ All the parameters of \p camera are copied. The frame() pointer is not modified, but its
+ Frame::position() and Frame::orientation() are set to those of \p camera.
+
+ \attention The Camera screenWidth() and screenHeight() are set to those of \p camera. If your
+ Camera is associated with a QGLViewer, you should update these value after the call to this method:
+ \code
+ *(camera()) = otherCamera;
+ camera()->setScreenWidthAndHeight(width(), height());
+ \endcode
+ The same applies to sceneCenter() and sceneRadius(), if needed. */
+Camera& Camera::operator=(const Camera& camera)
+{
+  setScreenWidthAndHeight(camera.screenWidth(), camera.screenHeight());
+  setFieldOfView(camera.fieldOfView());
+  setSceneRadius(camera.sceneRadius());
+  setSceneCenter(camera.sceneCenter());
+  setZNearCoefficient(camera.zNearCoefficient());
+  setZClippingCoefficient(camera.zClippingCoefficient());
+  setType(camera.type());
+
+  // Stereo parameters
+  setIODistance(camera.IODistance());
+  setFocusDistance(camera.focusDistance());
+  setPhysicalScreenWidth(camera.physicalScreenWidth());
+  setPhysicalDistanceToScreen(camera.physicalDistanceToScreen());
+
+  orthoCoef_ = camera.orthoCoef_;
+
+  // frame_ and interpolationKfi_ pointers are not shared.
+  frame_->setReferenceFrame(NULL);
+  frame_->setPosition(camera.position());
+  frame_->setOrientation(camera.orientation());
+
+  //interpolationKfi_->resetInterpolation();
+
+  //kfi_ = camera.kfi_;
+
+  computeProjectionMatrix();
+  computeModelViewMatrix();
+
+  return *this;
+}
+
+/*! Sets Camera screenWidth() and screenHeight() (expressed in pixels).
+
+You should not call this method when the Camera is associated with a QGLViewer, since the
+latter automatically updates these values when it is resized (hence overwritting your values).
+
+Non-positive dimension are silently replaced by a 1 pixel value to ensure frustrum coherence.
+
+If your Camera is used without a QGLViewer (offscreen rendering, shadow maps), use setAspectRatio()
+instead to define the projection matrix. */
+void Camera::setScreenWidthAndHeight(int width, int height)
+{
+  // Prevent negative and zero dimensions that would cause divisions by zero.
+	screenWidth_  = width > 0 ? width : 1;
+	screenHeight_ = height > 0 ? height : 1;
+}
+
+/*! Returns the near clipping plane distance used by the Camera projection matrix.
+
+ The clipping planes' positions depend on the sceneRadius() and sceneCenter() rather than being fixed
+ small-enough and large-enough values. A good scene dimension approximation will hence result in an
+ optimal precision of the z-buffer.
+
+ The near clipping plane is positioned at a distance equal to zClippingCoefficient() * sceneRadius()
+ in front of the sceneCenter():
+ \code
+ zNear = distanceToSceneCenter() - zClippingCoefficient()*sceneRadius();
+ \endcode
+
+ In order to prevent negative or too small zNear() values (which would degrade the z precision),
+ zNearCoefficient() is used when the Camera is inside the sceneRadius() sphere:
+ \code
+ const float zMin = zNearCoefficient() * zClippingCoefficient() * sceneRadius();
+ if (zNear < zMin)
+   zNear = zMin;
+ // With an ORTHOGRAPHIC type, the value is simply clamped to 0.0
+ \endcode
+
+ See also the zFar(), zClippingCoefficient() and zNearCoefficient() documentations.
+
+ If you need a completely different zNear computation, overload the zNear() and zFar() methods in a
+ new class that publicly inherits from Camera and use QGLViewer::setCamera():
+ \code
+ class myCamera :: public qglviewer::Camera
+ {
+   virtual float Camera::zNear() const { return 0.001; };
+   virtual float Camera::zFar() const { return 100.0; };
+ }
+ \endcode
+
+ See the <a href="../examples/standardCamera.html">standardCamera example</a> for an application.
+
+ \attention The value is always positive although the clipping plane is positioned at a negative z
+ value in the Camera coordinate system. This follows the \c gluPerspective standard. */
+float Camera::zNear() const
+{
+  float z = distanceToSceneCenter() - zClippingCoefficient()*sceneRadius();
+
+  // Prevents negative or null zNear values.
+  const float zMin = zNearCoefficient() * zClippingCoefficient() * sceneRadius();
+  if (z < zMin)
+    switch (type())
+      {
+      case Camera::PERSPECTIVE  : z = zMin; break;
+      case Camera::ORTHOGRAPHIC : z = 0.0;  break;
+      }
+  return z;
+}
+
+/*! Returns the far clipping plane distance used by the Camera projection matrix.
+
+The far clipping plane is positioned at a distance equal to zClippingCoefficient() * sceneRadius()
+behind the sceneCenter():
+\code
+zFar = distanceToSceneCenter() + zClippingCoefficient()*sceneRadius();
+\endcode
+
+See the zNear() documentation for details. */
+float Camera::zFar() const
+{
+  return distanceToSceneCenter() + zClippingCoefficient()*sceneRadius();
+}
+
+/*! Defines the Camera type().
+
+Prefix the type with Camera, as in: \code camera()->setType(Camera::ORTHOGRAPHIC); // or even
+qglviewer::Camera::ORTHOGRAPHIC if you do not use namespace \endcode */
+void Camera::setType(Type type)
+{
+  // make ORTHOGRAPHIC frustum fit PERSPECTIVE (at least in plane normal to viewDirection(), passing
+  // through RAP) Done only when CHANGING type since orthoCoef_ may have been changed with a
+  // setRevolveAroundPoint() in the meantime.
+  if ( (type == Camera::ORTHOGRAPHIC) && (type_ == Camera::PERSPECTIVE) )
+    orthoCoef_ = tan(fieldOfView()/2.0);
+  type_ = type;
+}
+
+/*! Sets the Camera frame().
+
+If you want to move the Camera, use setPosition() and setOrientation() or one of the Camera
+positioning methods (lookAt(), fitSphere(), showEntireScene()...) instead.
+
+If you want to save the Camera position(), there's no need to call this method either. Use
+addKeyFrameToPath() and playPath() instead.
+
+This method is actually mainly useful if you derive the ManipulatedCameraFrame class and want to
+use an instance of your new class to move the Camera.
+
+A \c NULL \p mcf pointer will silently be ignored. The calling method is responsible for
+deleting the previous frame() pointer if needed in order to prevent memory leaks. */
+void Camera::setFrame(ManipulatedCameraFrame* const mcf)
+{
+  if (!mcf)
+    return;
+
+  frame_ = mcf;
+  //interpolationKfi_->setFrame(frame());
+}
+
+/*! Returns the distance from the Camera center to sceneCenter(), projected along the Camera Z axis.
+  Used by zNear() and zFar() to optimize the Z range. */
+float Camera::distanceToSceneCenter() const
+{
+  return fabs((frame()->coordinatesOf(sceneCenter())).z);
+}
+
+
+/*! Returns the \p halfWidth and \p halfHeight of the Camera orthographic frustum.
+
+ These values are only valid and used when the Camera is of type() Camera::ORTHOGRAPHIC. They are
+ expressed in OpenGL units and are used by loadProjectionMatrix() to define the projection matrix
+ using:
+ \code
+ glOrtho( -halfWidth, halfWidth, -halfHeight, halfHeight, zNear(), zFar() )
+ \endcode
+
+ These values are proportional to the Camera (z projected) distance to the revolveAroundPoint().
+ When zooming on the object, the Camera is translated forward \e and its frustum is narrowed, making
+ the object appear bigger on screen, as intuitively expected.
+
+ Overload this method to change this behavior if desired, as is done in the 
+ <a href="../examples/standardCamera.html">standardCamera example</a>. */
+void Camera::getOrthoWidthHeight(GLdouble& halfWidth, GLdouble& halfHeight) const
+{
+  const float dist = orthoCoef_ * fabs(cameraCoordinatesOf(revolveAroundPoint()).z);
+  //#CONNECTION# fitScreenRegion
+  halfWidth  = dist * ((aspectRatio() < 1.0) ? 1.0 : aspectRatio());
+  halfHeight = dist * ((aspectRatio() < 1.0) ? 1.0/aspectRatio() : 1.0);
+}
+
+
+/*! Computes the projection matrix associated with the Camera.
+
+ If type() is Camera::PERSPECTIVE, defines a \c GL_PROJECTION matrix similar to what would \c
+ gluPerspective() do using the fieldOfView(), window aspectRatio(), zNear() and zFar() parameters.
+
+ If type() is Camera::ORTHOGRAPHIC, the projection matrix is as what \c glOrtho() would do.
+ Frustum's width and height are set using getOrthoWidthHeight().
+
+ Both types use zNear() and zFar() to place clipping planes. These values are determined from
+ sceneRadius() and sceneCenter() so that they best fit the scene size.
+
+ Use getProjectionMatrix() to retrieve this matrix. Overload loadProjectionMatrix() if you want your
+ Camera to use an exotic projection matrix.
+
+ \note You must call this method if your Camera is not associated with a QGLViewer and is used for
+ offscreen computations (using (un)projectedCoordinatesOf() for instance). loadProjectionMatrix()
+ does it otherwise. */
+void Camera::computeProjectionMatrix() const
+{
+  const float ZNear = zNear();
+  const float ZFar  = zFar();
+
+  switch (type())
+    {
+    case Camera::PERSPECTIVE:
+      {
+	// #CONNECTION# all non null coefficients were set to 0.0 in constructor.
+	const float f = 1.0/tan(fieldOfView()/2.0);
+	projectionMatrix_[0]  = f/aspectRatio();
+	projectionMatrix_[5]  = f;
+	projectionMatrix_[10] = (ZNear + ZFar) / (ZNear - ZFar);
+	projectionMatrix_[11] = -1.0;
+	projectionMatrix_[14] = 2.0 * ZNear * ZFar / (ZNear - ZFar);
+	projectionMatrix_[15] = 0.0;
+	// same as gluPerspective( 180.0*fieldOfView()/M_PI, aspectRatio(), zNear(), zFar() );
+	break;
+      }
+    case Camera::ORTHOGRAPHIC:
+      {
+	GLdouble w, h;
+	getOrthoWidthHeight(w,h);
+	projectionMatrix_[0]  = 1.0/w;
+	projectionMatrix_[5]  = 1.0/h;
+	projectionMatrix_[10] = -2.0/(ZFar - ZNear);
+	projectionMatrix_[11] = 0.0;
+	projectionMatrix_[14] = -(ZFar + ZNear)/(ZFar - ZNear);
+	projectionMatrix_[15] = 1.0;
+	// same as glOrtho( -w, w, -h, h, zNear(), zFar() );
+	break;
+      }
+    }
+}
+
+/*! Computes the modelView matrix associated with the Camera's position() and orientation().
+
+ This matrix converts from the world coordinates system to the Camera coordinates system, so that
+ coordinates can then be projected on screen using the projection matrix (see computeProjectionMatrix()).
+
+ Use getModelViewMatrix() to retrieve this matrix.
+
+ \note You must call this method if your Camera is not associated with a QGLViewer and is used for
+ offscreen computations (using (un)projectedCoordinatesOf() for instance). loadModelViewMatrix()
+ does it otherwise. */
+void Camera::computeModelViewMatrix() const
+{
+  const Quaternion q = frame()->orientation();
+
+  const double q00 = 2.0l * q[0] * q[0];
+  const double q11 = 2.0l * q[1] * q[1];
+  const double q22 = 2.0l * q[2] * q[2];
+
+  const double q01 = 2.0l * q[0] * q[1];
+  const double q02 = 2.0l * q[0] * q[2];
+  const double q03 = 2.0l * q[0] * q[3];
+
+  const double q12 = 2.0l * q[1] * q[2];
+  const double q13 = 2.0l * q[1] * q[3];
+
+  const double q23 = 2.0l * q[2] * q[3];
+
+  modelViewMatrix_[0] = 1.0l - q11 - q22;
+  modelViewMatrix_[1] =        q01 - q23;
+  modelViewMatrix_[2] =        q02 + q13;
+  modelViewMatrix_[3] = 0.0l;
+
+  modelViewMatrix_[4] =        q01 + q23;
+  modelViewMatrix_[5] = 1.0l - q22 - q00;
+  modelViewMatrix_[6] =        q12 - q03;
+  modelViewMatrix_[7] = 0.0l;
+
+  modelViewMatrix_[8] =        q02 - q13;
+  modelViewMatrix_[9] =        q12 + q03;
+  modelViewMatrix_[10] = 1.0l - q11 - q00;
+  modelViewMatrix_[11] = 0.0l;
+
+  const Vec t = q.inverseRotate(frame()->position());
+
+  modelViewMatrix_[12] = -t.x;
+  modelViewMatrix_[13] = -t.y;
+  modelViewMatrix_[14] = -t.z;
+  modelViewMatrix_[15] = 1.0l;
+}
+
+
+/*! Loads the OpenGL \c GL_PROJECTION matrix with the Camera projection matrix.
+
+ The Camera projection matrix is computed using computeProjectionMatrix().
+
+ When \p reset is \c true (default), the method clears the previous projection matrix by calling \c
+ glLoadIdentity before setting the matrix. Setting \p reset to \c false is useful for \c GL_SELECT
+ mode, to combine the pushed matrix with a picking matrix. See QGLViewer::beginSelection() for details.
+
+ This method is used by QGLViewer::preDraw() (called before user's QGLViewer::draw() method) to
+ set the \c GL_PROJECTION matrix according to the viewer's QGLViewer::camera() settings.
+
+ Use getProjectionMatrix() to retrieve this matrix. Overload this method if you want your Camera to
+ use an exotic projection matrix. See also loadModelViewMatrix().
+
+ \attention \c glMatrixMode is set to \c GL_PROJECTION.
+
+ \attention If you use several OpenGL contexts and bypass the Qt main refresh loop, you should call
+ QGLWidget::makeCurrent() before this method in order to activate the right OpenGL context. */
+void Camera::loadProjectionMatrix(bool reset) const
+{
+  // WARNING: makeCurrent must be called by every calling method
+  glMatrixMode(GL_PROJECTION);
+
+  if (reset)
+    glLoadIdentity();
+
+  computeProjectionMatrix();
+
+  glMultMatrixd(projectionMatrix_);
+}
+
+/*! Loads the OpenGL \c GL_MODELVIEW matrix with the modelView matrix corresponding to the Camera.
+
+ Calls computeModelViewMatrix() to compute the Camera's modelView matrix.
+
+ This method is used by QGLViewer::preDraw() (called before user's QGLViewer::draw() method) to
+ set the \c GL_MODELVIEW matrix according to the viewer's QGLViewer::camera() position() and
+ orientation().
+
+ As a result, the vertices used in QGLViewer::draw() can be defined in the so called world
+ coordinate system. They are multiplied by this matrix to get converted to the Camera coordinate
+ system, before getting projected using the \c GL_PROJECTION matrix (see loadProjectionMatrix()).
+
+ When \p reset is \c true (default), the method loads (overwrites) the \c GL_MODELVIEW matrix. Setting
+ \p reset to \c false simply calls \c glMultMatrixd (might be useful for some applications).
+
+ Overload this method or simply call glLoadMatrixd() at the beginning of QGLViewer::draw() if you
+ want your Camera to use an exotic modelView matrix. See also loadProjectionMatrix().
+
+ getModelViewMatrix() returns the 4x4 modelView matrix.
+
+ \attention glMatrixMode is set to \c GL_MODELVIEW
+
+ \attention If you use several OpenGL contexts and bypass the Qt main refresh loop, you should call
+ QGLWidget::makeCurrent() before this method in order to activate the right OpenGL context. */
+void Camera::loadModelViewMatrix(bool reset) const
+{
+  // WARNING: makeCurrent must be called by every calling method
+  glMatrixMode(GL_MODELVIEW);
+  computeModelViewMatrix();
+  if (reset)
+    glLoadMatrixd(modelViewMatrix_);
+  else
+    glMultMatrixd(modelViewMatrix_);
+}
+
+/*! Same as loadProjectionMatrix() but for a stereo setup.
+
+ Only the Camera::PERSPECTIVE type() is supported for stereo mode. See
+ QGLViewer::setStereoDisplay().
+
+ Uses focusDistance(), IODistance(), and physicalScreenWidth() to compute cameras
+ offset and asymmetric frustums.
+
+ When \p leftBuffer is \c true, computes the projection matrix associated to the left eye (right eye
+ otherwise). See also loadModelViewMatrixStereo().
+
+ See the <a href="../examples/stereoViewer.html">stereoViewer</a> and the <a
+ href="../examples/contribs.html#anaglyph">anaglyph</a> examples for an illustration.
+
+ To retrieve this matrix, use a code like:
+ \code
+ glMatrixMode(GL_PROJECTION);
+ glPushMatrix();
+ loadProjectionMatrixStereo(left_or_right);
+ glGetFloatv(GL_PROJECTION_MATRIX, m);
+ glPopMatrix();
+ \endcode
+ Note that getProjectionMatrix() always returns the mono-vision matrix.
+
+ \attention glMatrixMode is set to \c GL_PROJECTION. */
+void Camera::loadProjectionMatrixStereo(bool leftBuffer) const
+{
+  float left, right, bottom, top;
+  float screenHalfWidth, halfWidth, side, shift, delta;
+
+  glMatrixMode(GL_PROJECTION);
+  glLoadIdentity();
+
+  switch (type())
+    {
+    case Camera::PERSPECTIVE:
+      // compute half width of screen,
+      // corresponding to zero parallax plane to deduce decay of cameras
+      screenHalfWidth = focusDistance() * tan(horizontalFieldOfView() / 2.0);
+      shift = screenHalfWidth * IODistance() / physicalScreenWidth();
+      // should be * current y  / y total
+      // to take into account that the window doesn't cover the entire screen
+
+      // compute half width of "view" at znear and the delta corresponding to
+      // the shifted camera to deduce what to set for asymmetric frustums
+      halfWidth = zNear() * tan(horizontalFieldOfView() / 2.0);
+      delta  = shift * zNear() / focusDistance();
+      side   = leftBuffer ? -1.0 : 1.0;
+
+      left   = -halfWidth + side * delta;
+      right  =  halfWidth + side * delta;
+      top    = halfWidth / aspectRatio();
+      bottom = -top;
+      glFrustum(left, right, bottom, top, zNear(), zFar() );
+      break;
+
+    case Camera::ORTHOGRAPHIC:
+      cout << "Camera::setProjectionMatrixStereo: Stereo not available with Ortho mode";
+      break;
+    }
+}
+
+/*! Same as loadModelViewMatrix() but for a stereo setup.
+
+ Only the Camera::PERSPECTIVE type() is supported for stereo mode. See
+ QGLViewer::setStereoDisplay().
+
+ The modelView matrix is almost identical to the mono-vision one. It is simply translated along its
+ horizontal axis by a value that depends on stereo parameters (see focusDistance(),
+ IODistance(), and physicalScreenWidth()).
+
+ When \p leftBuffer is \c true, computes the modelView matrix associated to the left eye (right eye
+ otherwise).
+
+ loadProjectionMatrixStereo() explains how to retrieve to resulting matrix.
+
+ See the <a href="../examples/stereoViewer.html">stereoViewer</a> and the <a
+ href="../examples/contribs.html#anaglyph">anaglyph</a> examples for an illustration.
+
+ \attention glMatrixMode is set to \c GL_MODELVIEW. */
+void Camera::loadModelViewMatrixStereo(bool leftBuffer) const
+{
+  // WARNING: makeCurrent must be called by every calling method
+  glMatrixMode(GL_MODELVIEW);
+
+  float halfWidth = focusDistance() * tan(horizontalFieldOfView() / 2.0);
+  float shift     = halfWidth * IODistance() / physicalScreenWidth(); // * current window width / full screen width
+
+  computeModelViewMatrix();
+  if (leftBuffer)
+    modelViewMatrix_[12] -= shift;
+  else
+    modelViewMatrix_[12] += shift;
+  glLoadMatrixd(modelViewMatrix_);
+}
+
+/*! Fills \p m with the Camera projection matrix values.
+
+ Calls computeProjectionMatrix() to define the Camera projection matrix.
+
+ This matrix only reflects the Camera's internal parameters and it may differ from the \c
+ GL_PROJECTION matrix retrieved using \c glGetDoublev(GL_PROJECTION_MATRIX, m). It actually
+ represents the state of the \c GL_PROJECTION after QGLViewer::preDraw(), at the beginning of
+ QGLViewer::draw(). If you modified the \c GL_PROJECTION matrix (for instance using
+ QGLViewer::startScreenCoordinatesSystem()), the two results differ.
+ 
+ The result is an OpenGL 4x4 matrix, which is given in \e column-major order (see \c glMultMatrix
+ man page for details).
+
+ See also getModelViewMatrix() and setFromProjectionMatrix(). */
+void Camera::getProjectionMatrix(GLdouble m[16]) const
+{
+  // May not be needed, but easier and more robust like this.
+  computeProjectionMatrix();
+  for (unsigned short i=0; i<16; ++i)
+    m[i] = projectionMatrix_[i];
+}
+
+/*! Fills \p m with the Camera modelView matrix values.
+
+ First calls computeModelViewMatrix() to define the Camera modelView matrix.
+
+ Note that this matrix is usually \e not the one you would get from a \c
+ glGetDoublev(GL_MODELVIEW_MATRIX, m). It actually represents the state of the \c
+ GL_MODELVIEW after QGLViewer::preDraw(), at the beginning of QGLViewer::draw(). It converts from
+ the world to the Camera coordinate system. As soon as you modify the \c GL_MODELVIEW in your
+ QGLViewer::draw() method, the two matrices differ.
+
+ The result is an OpenGL 4x4 matrix, which is given in \e column-major order (see \c glMultMatrix
+ man page for details).
+
+ See also getProjectionMatrix() and setFromModelViewMatrix(). */
+void Camera::getModelViewMatrix(GLdouble m[16]) const
+{
+  // May not be needed, but easier like this.
+  // Prevents from retrieving matrix in stereo mode -> overwrites shifted value.
+  computeModelViewMatrix();
+  for (unsigned short i=0; i<16; ++i)
+    m[i] = modelViewMatrix_[i];
+}
+
+/*! Fills \p m with the product of the ModelView and Projection matrices.
+
+  Calls getModelViewMatrix() and getProjectionMatrix() and then fills \p m with the product of these two matrices. */
+void Camera::getModelViewProjectionMatrix(GLdouble m[16]) const
+{
+  GLdouble mv[16];
+  GLdouble proj[16];
+  getModelViewMatrix(mv);
+  getProjectionMatrix(proj);
+	
+  for (unsigned short i=0; i<4; ++i)
+  {
+    for (unsigned short j=0; j<4; ++j)
+    {
+      double sum = 0.0;
+      for (unsigned short k=0; k<4; ++k)
+        sum += proj[i+4*k]*mv[k+4*j];
+      m[i+4*j] = sum;
+    }
+  }
+}
+
+#ifndef DOXYGEN
+void Camera::getProjectionMatrix(GLfloat m[16]) const
+{
+  cout << "Warning : Camera::getProjectionMatrix requires a GLdouble matrix array";
+  static GLdouble mat[16];
+  getProjectionMatrix(mat);
+  for (int i=0; i<16; ++i)
+    m[i] = float(mat[i]);
+}
+
+void Camera::getModelViewMatrix(GLfloat m[16]) const
+{
+  cout << "Warning : Camera::getModelViewMatrix requires a GLdouble matrix array";
+  static GLdouble mat[16];
+  getModelViewMatrix(mat);
+  for (int i=0; i<16; ++i)
+    m[i] = float(mat[i]);
+}
+#endif
+
+/*! Sets the sceneRadius() value. Negative values are ignored.
+
+\attention This methods also sets focusDistance() to sceneRadius() / tan(fieldOfView()/2) and
+flySpeed() to 1% of sceneRadius(). */
+void Camera::setSceneRadius(float radius)
+{
+  if (radius <= 0.0)
+    {
+      cout << "Scene radius must be positive - Ignoring value";
+      return;
+    }
+
+  sceneRadius_ = radius;
+
+  setFocusDistance(sceneRadius() / tan(fieldOfView()/2.0));
+
+  frame()->setFlySpeed(0.01*sceneRadius());
+}
+
+/*! Similar to setSceneRadius() and setSceneCenter(), but the scene limits are defined by a (world
+  axis aligned) bounding box. */
+void Camera::setSceneBoundingBox(const Vec& min, const Vec& max)
+{
+  setSceneCenter((min+max)/2.0);
+  setSceneRadius(0.5*(max-min).norm());
+}
+
+
+/*! Sets the sceneCenter().
+
+ \attention This method also sets the revolveAroundPoint() to sceneCenter(). */
+void Camera::setSceneCenter(const Vec& center)
+{
+  sceneCenter_ = center;
+  setRevolveAroundPoint(sceneCenter());
+}
+
+/*! setSceneCenter() to the result of pointUnderPixel(\p pixel).
+
+  Returns \c true if a pointUnderPixel() was found and sceneCenter() was actually changed.
+
+  See also setRevolveAroundPointFromPixel(). See the pointUnderPixel() documentation. */
+bool Camera::setSceneCenterFromPixel(const Point& pixel)
+{
+  bool found;
+  Vec point = pointUnderPixel(pixel, found);
+  if (found)
+    setSceneCenter(point);
+  return found;
+}
+
+/*! Changes the revolveAroundPoint() to \p rap (defined in the world coordinate system). */
+void Camera::setRevolveAroundPoint(const Vec& rap)
+{
+  const float prevDist = fabs(cameraCoordinatesOf(revolveAroundPoint()).z);
+
+  frame()->setRevolveAroundPoint(rap);
+
+  // orthoCoef_ is used to compensate for changes of the revolveAroundPoint, so that the image does
+  // not change when the revolveAroundPoint is changed in ORTHOGRAPHIC mode.
+  const float newDist = fabs(cameraCoordinatesOf(revolveAroundPoint()).z);
+  // Prevents division by zero when rap is set to camera position
+  if ((prevDist > 1E-9) && (newDist > 1E-9))
+    orthoCoef_ *= prevDist / newDist;
+}
+
+/*! The revolveAroundPoint() is set to the point located under \p pixel on screen.
+
+Returns \c true if a pointUnderPixel() was found. If no point was found under \p pixel, the
+revolveAroundPoint() is left unchanged.
+
+\p pixel is expressed in Qt format (origin in the upper left corner of the window). See
+pointUnderPixel().
+
+See also setSceneCenterFromPixel(). */
+bool Camera::setRevolveAroundPointFromPixel(const Point& pixel)
+{
+  bool found;
+  Vec point = pointUnderPixel(pixel, found);
+  if (found)
+    setRevolveAroundPoint(point);
+  return found;
+}
+
+/*! Returns the ratio between pixel and OpenGL units at \p position.
+
+ A line of \c n * pixelGLRatio() OpenGL units, located at \p position in the world coordinates
+ system, will be projected with a length of \c n pixels on screen.
+
+ Use this method to scale objects so that they have a constant pixel size on screen. The following
+ code will draw a 20 pixel line, starting at sceneCenter() and always directed along the screen
+ vertical direction:
+ \code
+ glBegin(GL_LINES);
+ glVertex3fv(sceneCenter());
+ glVertex3fv(sceneCenter() + 20 * pixelGLRatio(sceneCenter()) * camera()->upVector());
+ glEnd();
+ \endcode */
+float Camera::pixelGLRatio(const Vec& position) const
+{
+  switch (type())
+    {
+    case Camera::PERSPECTIVE :
+      return 2.0 * fabs((frame()->coordinatesOf(position)).z) * tan(fieldOfView()/2.0) / screenHeight();
+    case Camera::ORTHOGRAPHIC :
+      {
+	GLdouble w, h;
+	getOrthoWidthHeight(w,h);
+	return 2.0 * h / screenHeight();
+      }
+    }
+  // Bad compilers complain
+  return 1.0;
+}
+
+/*! Changes the Camera fieldOfView() so that the entire scene (defined by QGLViewer::sceneCenter()
+ and QGLViewer::sceneRadius()) is visible from the Camera position().
+
+ The position() and orientation() of the Camera are not modified and you first have to orientate the
+ Camera in order to actually see the scene (see lookAt(), showEntireScene() or fitSphere()).
+
+ This method is especially useful for \e shadow \e maps computation. Use the Camera positioning
+ tools (setPosition(), lookAt()) to position a Camera at the light position. Then use this method to
+ define the fieldOfView() so that the shadow map resolution is optimally used:
+ \code
+ // The light camera needs size hints in order to optimize its fieldOfView
+ lightCamera->setSceneRadius(sceneRadius());
+ lightCamera->setSceneCenter(sceneCenter());
+
+ // Place the light camera.
+ lightCamera->setPosition(lightFrame->position());
+ lightCamera->lookAt(sceneCenter());
+ lightCamera->setFOVToFitScene();
+ \endcode
+
+ See the (soon available) shadowMap contribution example for a practical implementation.
+
+ \attention The fieldOfView() is clamped to M_PI/2.0. This happens when the Camera is at a distance
+ lower than sqrt(2.0) * sceneRadius() from the sceneCenter(). It optimizes the shadow map
+ resolution, although it may miss some parts of the scene. */
+void Camera::setFOVToFitScene()
+{
+  if (distanceToSceneCenter() > sqrt(2.0)*sceneRadius())
+    setFieldOfView(2.0 * asin(sceneRadius() / distanceToSceneCenter()));
+  else
+    setFieldOfView(M_PI / 2.0f);
+}
+
+/*! Makes the Camera smoothly zoom on the pointUnderPixel() \p pixel.
+
+ Nothing happens if no pointUnderPixel() is found. Otherwise a KeyFrameInterpolator is created that
+ animates the Camera on a one second path that brings the Camera closer to the point under \p pixel.
+
+ See also interpolateToFitScene(). */
+// void Camera::interpolateToZoomOnPixel(const Point& pixel)
+// {
+//   const float coef = 0.1f;
+// 
+//   bool found;
+//   Vec target = pointUnderPixel(pixel, found);
+// 
+//   if (!found)
+//     return;
+// 
+//   if (interpolationKfi_->interpolationIsStarted())
+//     interpolationKfi_->stopInterpolation();
+// 
+//   interpolationKfi_->deletePath();
+//   interpolationKfi_->addKeyFrame(*(frame()));
+// 
+//   interpolationKfi_->addKeyFrame(Frame(0.3f*frame()->position() + 0.7f*target, frame()->orientation()), 0.4f);
+// 
+//   // Small hack: attach a temporary frame to take advantage of lookAt without modifying frame
+//   static ManipulatedCameraFrame* tempFrame = new ManipulatedCameraFrame();
+//   ManipulatedCameraFrame* const originalFrame = frame();
+//   tempFrame->setPosition(coef*frame()->position() + (1.0-coef)*target);
+//   tempFrame->setOrientation(frame()->orientation());
+//   setFrame(tempFrame);
+//   lookAt(target);
+//   setFrame(originalFrame);
+// 
+//   interpolationKfi_->addKeyFrame(*(tempFrame), 1.0);
+// 
+//   interpolationKfi_->startInterpolation();
+// }
+
+/*! Interpolates the Camera on a one second KeyFrameInterpolator path so that the entire scene fits
+ the screen at the end.
+
+ The scene is defined by its sceneCenter() and its sceneRadius(). See showEntireScene().
+
+ The orientation() of the Camera is not modified. See also interpolateToZoomOnPixel(). */
+// void Camera::interpolateToFitScene()
+// {
+//   if (interpolationKfi_->interpolationIsStarted())
+//     interpolationKfi_->stopInterpolation();
+// 
+//   interpolationKfi_->deletePath();
+//   interpolationKfi_->addKeyFrame(*(frame()));
+// 
+//   // Small hack:  attach a temporary frame to take advantage of lookAt without modifying frame
+//   static ManipulatedCameraFrame* tempFrame = new ManipulatedCameraFrame();
+//   ManipulatedCameraFrame* const originalFrame = frame();
+//   tempFrame->setPosition(frame()->position());
+//   tempFrame->setOrientation(frame()->orientation());
+//   setFrame(tempFrame);
+//   showEntireScene();
+//   setFrame(originalFrame);
+// 
+//   //interpolationKfi_->addKeyFrame(*(tempFrame));
+// 
+//   //interpolationKfi_->startInterpolation();
+// }
+
+
+/*! Smoothly interpolates the Camera on a KeyFrameInterpolator path so that it goes to \p fr.
+ 
+  \p fr is expressed in world coordinates. \p duration tunes the interpolation speed (default is
+  1 second).
+  
+  See also interpolateToFitScene() and interpolateToZoomOnPixel(). */
+// void Camera::interpolateTo(const Frame& fr, float duration)
+// {
+//   if (interpolationKfi_->interpolationIsStarted())
+//     interpolationKfi_->stopInterpolation();
+// 
+//   interpolationKfi_->deletePath();
+//   interpolationKfi_->addKeyFrame(*(frame()));
+//   interpolationKfi_->addKeyFrame(fr, duration);
+// 
+//   interpolationKfi_->startInterpolation();
+// }
+
+
+/*! Returns the coordinates of the 3D point located at pixel (x,y) on screen.
+
+ Calls a \c glReadPixel to get the pixel depth and applies an unprojectedCoordinatesOf() to the
+ result. \p found indicates whether a point was found or not (i.e. background pixel, result's depth
+ is zFar() in that case).
+
+ \p x and \p y are expressed in pixel units with an origin in the upper left corner. Use
+ screenHeight() - y to convert to OpenGL standard.
+
+ \attention This method assumes that a GL context is available, and that its content was drawn using
+ the Camera (i.e. using its projection and modelview matrices). This method hence cannot be used for
+ offscreen Camera computations. Use cameraCoordinatesOf() and worldCoordinatesOf() to perform
+ similar operations in that case.
+
+ \note The precision of the z-Buffer highly depends on how the zNear() and zFar() values are fitted
+ to your scene. Loose boundaries will result in imprecision along the viewing direction. */
+Vec Camera::pointUnderPixel(const Point& pixel, bool& found) const
+{
+  float depth;
+  // Qt uses upper corner for its origin while GL uses the lower corner.
+  glReadPixels(pixel.x(), screenHeight()-1-pixel.y(), 1, 1, GL_DEPTH_COMPONENT, GL_FLOAT, &depth);
+  found = depth < 1.0;
+  Vec point(pixel.x(), pixel.y(), depth);
+  point = unprojectedCoordinatesOf(point);
+  return point;
+}
+
+/*! Moves the Camera so that the entire scene is visible.
+
+ Simply calls fitSphere() on a sphere defined by sceneCenter() and sceneRadius().
+
+ You will typically use this method in QGLViewer::init() after you defined a new sceneRadius(). */
+void Camera::showEntireScene()
+{
+  fitSphere(sceneCenter(), sceneRadius());
+}
+
+/*! Moves the Camera so that its sceneCenter() is projected on the center of the window. The
+ orientation() and fieldOfView() are unchanged.
+
+ Simply projects the current position on a line passing through sceneCenter(). See also
+ showEntireScene().*/
+void Camera::centerScene()
+{
+  frame()->projectOnLine(sceneCenter(), viewDirection());
+}
+
+/*! Sets the Camera orientation(), so that it looks at point \p target (defined in the world
+ coordinate system).
+
+ The Camera position() is not modified. Simply setViewDirection().
+
+ See also setUpVector(), setOrientation(), showEntireScene(), fitSphere() and fitBoundingBox(). */
+void Camera::lookAt(const Vec& target)
+{
+  setViewDirection(target - position());
+}
+
+/*! Moves the Camera so that the sphere defined by (\p center, \p radius) is visible and fits the window.
+
+ The Camera is simply translated along its viewDirection() so that the sphere fits the screen. Its
+ orientation() and its fieldOfView() are unchanged.
+
+ You should therefore orientate the Camera before you call this method. See lookAt(),
+ setOrientation() and setUpVector(). */
+void Camera::fitSphere(const Vec& center, float radius)
+{
+  float distance = 0.0f;
+  switch (type())
+    {
+    case Camera::PERSPECTIVE :
+      {
+	const float yview = radius / sin(fieldOfView()/2.0);
+	const float xview = radius / sin(horizontalFieldOfView()/2.0);
+	distance = qMax(xview,yview);
+	break;
+      }
+    case Camera::ORTHOGRAPHIC :
+      {
+	distance = ((center-revolveAroundPoint()) * viewDirection()) + (radius / orthoCoef_);
+	break;
+      }
+    }
+  Vec newPos(center - distance * viewDirection());
+  frame()->setPositionWithConstraint(newPos);
+}
+
+/*! Moves the Camera so that the (world axis aligned) bounding box (\p min, \p max) is entirely
+  visible, using fitSphere(). */
+void Camera::fitBoundingBox(const Vec& min, const Vec& max)
+{
+  float diameter = qMax(fabs(max[1]-min[1]), fabs(max[0]-min[0]));
+  diameter = qMax(fabsf(max[2]-min[2]), diameter);
+  fitSphere(0.5*(min+max), 0.5*diameter);
+}
+
+/*! Rotates the Camera so that its upVector() becomes \p up (defined in the world coordinate
+ system).
+
+ The Camera is rotated around an axis orthogonal to \p up and to the current upVector() direction.
+ Use this method in order to define the Camera horizontal plane.
+
+ When \p noMove is set to \c false, the orientation modification is compensated by a translation, so
+ that the revolveAroundPoint() stays projected at the same position on screen. This is especially
+ useful when the Camera is an observer of the scene (default mouse binding).
+
+ When \p noMove is \c true (default), the Camera position() is left unchanged, which is an intuitive
+ behavior when the Camera is in a walkthrough fly mode (see the QGLViewer::MOVE_FORWARD and
+ QGLViewer::MOVE_BACKWARD QGLViewer::MouseAction). */
+void Camera::setUpVector(const Vec& up, bool noMove)
+{
+  Quaternion q(Vec(0.0, 1.0, 0.0), frame()->transformOf(up));
+
+  if (!noMove)
+    frame()->setPosition(revolveAroundPoint() - (frame()->orientation()*q).rotate(frame()->coordinatesOf(revolveAroundPoint())));
+
+  frame()->rotate(q);
+
+  // Useful in fly mode to keep the horizontal direction.
+  //frame()->updateFlyUpVector();
+}
+
+/*! Sets the orientation() of the Camera using polar coordinates.
+
+ \p theta rotates the Camera around its Y axis, and \e then \p phi rotates it around its X axis.
+ The polar coordinates are defined in the world coordinates system: \p theta = \p phi = 0 means
+ that the Camera is directed towards the world Z axis. Both angles are expressed in radians.
+
+ See also setUpVector(). The position() of the Camera is unchanged, you may want to call showEntireScene()
+ after this method to move the Camera.
+
+ This method can be useful to create Quicktime VR panoramic sequences, see the
+ QGLViewer::saveSnapshot() documentation for details. */
+void Camera::setOrientation(float theta, float phi)
+{
+  Vec axis(0.0, 1.0, 0.0);
+  const Quaternion rot1(axis, theta);
+  axis = Vec(-cos(theta), 0., sin(theta));
+  const Quaternion rot2(axis, phi);
+  setOrientation(rot1 * rot2);
+}
+
+/*! Sets the Camera orientation(), defined in the world coordinate system. */
+void Camera::setOrientation(const Quaternion& q)
+{
+  frame()->setOrientation(q);
+  //frame()->updateFlyUpVector();
+}
+
+/*! Rotates the Camera so that its viewDirection() is \p direction (defined in the world coordinate
+ system).
+
+ The Camera position() is not modified. The Camera is rotated so that the horizon (defined by its
+ upVector()) is preserved. See also lookAt() and setUpVector(). */
+void Camera::setViewDirection(const Vec& direction)
+{
+  if (direction.squaredNorm() < 1E-10)
+    return;
+
+  Vec xAxis = direction ^ upVector();
+  if (xAxis.squaredNorm() < 1E-10)
+    {
+      // target is aligned with upVector, this means a rotation around X axis
+      // X axis is then unchanged, let's keep it !
+      xAxis = frame()->inverseTransformOf(Vec(1.0, 0.0, 0.0));
+    }
+
+  Quaternion q;
+  q.setFromRotatedBasis(xAxis, xAxis^direction, -direction);
+  frame()->setOrientationWithConstraint(q);
+}
+
+// Compute a 3 by 3 determinant.
+static float det(float m00,float m01,float m02,
+		 float m10,float m11,float m12,
+		 float m20,float m21,float m22)
+{
+  return m00*m11*m22 + m01*m12*m20 + m02*m10*m21 - m20*m11*m02 - m10*m01*m22 - m00*m21*m12;
+}
+
+// Computes the index of element [i][j] in a \c float matrix[3][4].
+static inline unsigned int ind(unsigned int i, unsigned int j)
+{
+  return (i*4+j);
+}
+
+
+/*! Sets the Camera's position() and orientation() from an OpenGL ModelView matrix.
+
+This enables a Camera initialisation from an other OpenGL application. \p modelView is a 16 GLdouble
+vector representing a valid OpenGL ModelView matrix, such as one can get using:
+\code
+GLdouble mvm[16];
+glGetDoublev(GL_MODELVIEW_MATRIX, mvm);
+myCamera->setFromModelViewMatrix(mvm);
+\endcode
+
+After this method has been called, getModelViewMatrix() returns a matrix equivalent to \p
+modelView.
+
+Only the orientation() and position() of the Camera are modified.
+
+\note If you defined your matrix as \c GLdouble \c mvm[4][4], pass \c &(mvm[0][0]) as a
+parameter. */
+void Camera::setFromModelViewMatrix(const GLdouble* const modelViewMatrix)
+{
+  // Get upper left (rotation) matrix
+  double upperLeft[3][3];
+  for (int i=0; i<3; ++i)
+    for (int j=0; j<3; ++j)
+      upperLeft[i][j] = modelViewMatrix[i*4+j];
+
+  // Transform upperLeft into the associated Quaternion
+  Quaternion q;
+  q.setFromRotationMatrix(upperLeft);
+
+  setOrientation(q);
+  setPosition(-q.rotate(Vec(modelViewMatrix[12], modelViewMatrix[13], modelViewMatrix[14])));
+}
+
+/*! Defines the Camera position(), orientation() and fieldOfView() from a projection matrix.
+
+ \p matrix has to be given in the format used by vision algorithm. It has 3 lines and 4 columns. It
+ transforms a point from the world homogeneous coordinate system (4 coordinates: \c sx, \c sy, \c sz
+ and \c s) into a point in the screen homogeneous coordinate system (3 coordinates: \c sx, \c sy,
+ and \c s, where \c x and \c y are the pixel coordinates on the screen).
+
+ Its three lines correspond to the homogeneous coordinates of the normals to the planes x=0, y=0 and
+ z=0, defined in the Camera coordinate system.
+
+ The elements of the matrix are ordered in line major order: you can call \c
+ setFromProjectionMatrix(&(matrix[0][0])) if you defined your matrix as a \c float \c matrix[3][4].
+
+ \attention Passing the result of getProjectionMatrix() or getModelViewMatrix() to this method is
+ not possible (purposefully incompatible matrix dimensions). \p matrix is more likely to be the
+ product of these two matrices, without the last line.
+
+ Use setFromModelViewMatrix() to set position() and orientation() from a \c GL_MODELVIEW matrix.
+ fieldOfView() can also be retrieved from a \e perspective \c GL_PROJECTION matrix using 2.0 *
+ atan(1.0/projectionMatrix[5]).
+
+ This code was written by Sylvain Paris. */
+void Camera::setFromProjectionMatrix(const float matrix[12])
+{
+  // The 3 lines of the matrix are the normals to the planes x=0, y=0, z=0
+  // in the camera CS. As we normalize them, we do not need the 4th coordinate.
+  Vec line_0(matrix[ind(0,0)],matrix[ind(0,1)],matrix[ind(0,2)]);
+  Vec line_1(matrix[ind(1,0)],matrix[ind(1,1)],matrix[ind(1,2)]);
+  Vec line_2(matrix[ind(2,0)],matrix[ind(2,1)],matrix[ind(2,2)]);
+
+  line_0.normalize();
+  line_1.normalize();
+  line_2.normalize();
+
+  // The camera position is at (0,0,0) in the camera CS so it is the
+  // intersection of the 3 planes. It can be seen as the kernel
+  // of the 3x4 projection matrix. We calculate it through 4 dimensional
+  // vectorial product. We go directly into 3D that is to say we directly
+  // divide the first 3 coordinates by the 4th one.
+
+  // We derive the 4 dimensional vectorial product formula from the
+  // computation of a 4x4 determinant that is developped according to
+  // its 4th column. This implies some 3x3 determinants.
+  const Vec cam_pos = Vec(det(matrix[ind(0,1)],matrix[ind(0,2)],matrix[ind(0,3)],
+			      matrix[ind(1,1)],matrix[ind(1,2)],matrix[ind(1,3)],
+			      matrix[ind(2,1)],matrix[ind(2,2)],matrix[ind(2,3)]),
+
+			   -det(matrix[ind(0,0)],matrix[ind(0,2)],matrix[ind(0,3)],
+				matrix[ind(1,0)],matrix[ind(1,2)],matrix[ind(1,3)],
+				matrix[ind(2,0)],matrix[ind(2,2)],matrix[ind(2,3)]),
+
+			   det(matrix[ind(0,0)],matrix[ind(0,1)],matrix[ind(0,3)],
+			       matrix[ind(1,0)],matrix[ind(1,1)],matrix[ind(1,3)],
+			       matrix[ind(2,0)],matrix[ind(2,1)],matrix[ind(2,3)])) /
+
+    (-det(matrix[ind(0,0)],matrix[ind(0,1)],matrix[ind(0,2)],
+	  matrix[ind(1,0)],matrix[ind(1,1)],matrix[ind(1,2)],
+	  matrix[ind(2,0)],matrix[ind(2,1)],matrix[ind(2,2)]));
+
+  // We compute the rotation matrix column by column.
+
+  // GL Z axis is front facing.
+  Vec column_2 = -line_2;
+
+  // X-axis is almost like line_0 but should be orthogonal to the Z axis.
+  Vec column_0 = ((column_2^line_0)^column_2);
+  column_0.normalize();
+
+  // Y-axis is almost like line_1 but should be orthogonal to the Z axis.
+  // Moreover line_1 is downward oriented as the screen CS.
+  Vec column_1 = -((column_2^line_1)^column_2);
+  column_1.normalize();
+
+  double rot[3][3];
+  rot[0][0] = column_0[0];
+  rot[1][0] = column_0[1];
+  rot[2][0] = column_0[2];
+
+  rot[0][1] = column_1[0];
+  rot[1][1] = column_1[1];
+  rot[2][1] = column_1[2];
+
+  rot[0][2] = column_2[0];
+  rot[1][2] = column_2[1];
+  rot[2][2] = column_2[2];
+
+  // We compute the field of view
+
+  // line_1^column_0 -> vector of intersection line between
+  // y_screen=0 and x_camera=0 plane.
+  // column_2*(...)  -> cos of the angle between Z vector et y_screen=0 plane
+  // * 2 -> field of view = 2 * half angle
+
+  // We need some intermediate values.
+  Vec dummy = line_1^column_0;
+  dummy.normalize();
+  float fov = acos(column_2*dummy) * 2.0;
+
+  // We set the camera.
+  Quaternion q;
+  q.setFromRotationMatrix(rot);
+  setOrientation(q);
+  setPosition(cam_pos);
+  setFieldOfView(fov);
+}
+
+
+/*
+	// persp : projectionMatrix_[0]  = f/aspectRatio();
+void Camera::setFromProjectionMatrix(const GLdouble* projectionMatrix)
+{
+  QString message;
+  if ((fabs(projectionMatrix[1]) > 1E-3) ||
+      (fabs(projectionMatrix[2]) > 1E-3) ||
+      (fabs(projectionMatrix[3]) > 1E-3) ||
+      (fabs(projectionMatrix[4]) > 1E-3) ||
+      (fabs(projectionMatrix[6]) > 1E-3) ||
+      (fabs(projectionMatrix[7]) > 1E-3) ||
+      (fabs(projectionMatrix[8]) > 1E-3) ||
+      (fabs(projectionMatrix[9]) > 1E-3))
+    message = "Non null coefficient in projection matrix - Aborting";
+  else
+    if ((fabs(projectionMatrix[11]+1.0) < 1E-5) && (fabs(projectionMatrix[15]) < 1E-5))
+      {
+	if (projectionMatrix[5] < 1E-4)
+	  message="Negative field of view in Camera::setFromProjectionMatrix";
+	else
+	  setType(Camera::PERSPECTIVE);
+      }
+    else
+      if ((fabs(projectionMatrix[11]) < 1E-5) && (fabs(projectionMatrix[15]-1.0) < 1E-5))
+	setType(Camera::ORTHOGRAPHIC);
+      else
+	message = "Unable to determine camera type in setFromProjectionMatrix - Aborting";
+
+  if (!message.isEmpty())
+    {
+      qWarning(message);
+      return;
+    }
+
+  switch (type())
+    {
+    case Camera::PERSPECTIVE:
+      {
+	setFieldOfView(2.0 * atan(1.0/projectionMatrix[5]));
+	const float far = projectionMatrix[14] / (2.0 * (1.0 + projectionMatrix[10]));
+	const float near = (projectionMatrix[10]+1.0) / (projectionMatrix[10]-1.0) * far;
+	setSceneRadius((far-near)/2.0);
+	setSceneCenter(position() + (near + sceneRadius())*viewDirection());
+	break;
+      }
+    case Camera::ORTHOGRAPHIC:
+      {
+	GLdouble w, h;
+	getOrthoWidthHeight(w,h);
+	projectionMatrix_[0]  = 1.0/w;
+	projectionMatrix_[5]  = 1.0/h;
+	projectionMatrix_[10] = -2.0/(ZFar - ZNear);
+	projectionMatrix_[11] = 0.0;
+	projectionMatrix_[14] = -(ZFar + ZNear)/(ZFar - ZNear);
+	projectionMatrix_[15] = 1.0;
+	// same as glOrtho( -w, w, -h, h, zNear(), zFar() );
+	break;
+      }
+    }
+}
+*/
+
+///////////////////////// Camera to world transform ///////////////////////
+
+/*! Same as cameraCoordinatesOf(), but with \c float[3] parameters (\p src and \p res may be identical pointers). */
+void Camera::getCameraCoordinatesOf(const float src[3], float res[3]) const
+{
+  Vec r = cameraCoordinatesOf(Vec(src));
+  for (int i=0; i<3; ++i)
+    res[i] = r[i];
+}
+
+/*! Same as worldCoordinatesOf(), but with \c float[3] parameters (\p src and \p res may be identical pointers). */
+void Camera::getWorldCoordinatesOf(const float src[3], float res[3]) const
+{
+  Vec r = worldCoordinatesOf(Vec(src));
+  for (int i=0; i<3; ++i)
+    res[i] = r[i];
+}
+
+/*! Fills \p viewport with the Camera OpenGL viewport.
+
+This method is mainly used in conjunction with \c gluProject, which requires such a viewport.
+Returned values are (0, screenHeight(), screenWidth(), - screenHeight()), so that the origin is
+located in the \e upper left corner of the window (Qt style coordinate system). */
+void Camera::getViewport(GLint viewport[4]) const
+{
+  viewport[0] = 0;
+  viewport[1] = screenHeight();
+  viewport[2] = screenWidth();
+  viewport[3] = -screenHeight();
+}
+
+/*! Returns the screen projected coordinates of a point \p src defined in the \p frame coordinate
+ system.
+
+ When \p frame in \c NULL (default), \p src is expressed in the world coordinate system.
+
+ The x and y coordinates of the returned Vec are expressed in pixel, (0,0) being the \e upper left
+ corner of the window. The z coordinate ranges between 0.0 (near plane) and 1.0 (excluded, far
+ plane). See the \c gluProject man page for details.
+
+ unprojectedCoordinatesOf() performs the inverse transformation.
+
+ See the <a href="../examples/screenCoordSystem.html">screenCoordSystem example</a>.
+
+ This method only uses the intrinsic Camera parameters (see getModelViewMatrix(),
+ getProjectionMatrix() and getViewport()) and is completely independent of the OpenGL \c
+ GL_MODELVIEW, \c GL_PROJECTION and viewport matrices. You can hence define a virtual Camera and use
+ this method to compute projections out of a classical rendering context.
+
+ \attention However, if your Camera is not attached to a QGLViewer (used for offscreen computations
+ for instance), make sure the Camera matrices are updated before calling this method. Call
+ computeModelViewMatrix() and computeProjectionMatrix() to do so.
+
+ If you call this method several times with no change in the matrices, consider precomputing the
+ projection times modelview matrix to save computation time if required (\c P x \c M in the \c
+ gluProject man page). */
+Vec Camera::projectedCoordinatesOf(const Vec& src, const Frame* frame) const
+{
+  GLdouble x,y,z;
+  static GLint viewport[4];
+  getViewport(viewport);
+
+  if (frame)
+    {
+      const Vec tmp = frame->inverseCoordinatesOf(src);
+      gluProject(tmp.x,tmp.y,tmp.z, modelViewMatrix_, projectionMatrix_, viewport,  &x,&y,&z);
+    }
+  else
+    gluProject(src.x,src.y,src.z, modelViewMatrix_, projectionMatrix_, viewport,  &x,&y,&z);
+
+  return Vec(x,y,z);
+}
+
+/*! Returns the world unprojected coordinates of a point \p src defined in the screen coordinate
+ system.
+
+ The \p src.x and \p src.y input values are expressed in pixels, (0,0) being the \e upper left corner
+ of the window. \p src.z is a depth value ranging in [0..1[ (near and far plane respectively). See
+ the \c gluUnProject man page for details.
+
+ The result is expressed in the \p frame coordinate system. When \p frame is \c NULL (default), the
+ result is expressed in the world coordinates system. The possible \p frame Frame::referenceFrame()
+ are taken into account.
+
+ projectedCoordinatesOf() performs the inverse transformation.
+
+ This method only uses the intrinsic Camera parameters (see getModelViewMatrix(),
+ getProjectionMatrix() and getViewport()) and is completely independent of the OpenGL \c
+ GL_MODELVIEW, \c GL_PROJECTION and viewport matrices. You can hence define a virtual Camera and use
+ this method to compute un-projections out of a classical rendering context.
+
+ \attention However, if your Camera is not attached to a QGLViewer (used for offscreen computations
+ for instance), make sure the Camera matrices are updated before calling this method (use
+ computeModelViewMatrix(), computeProjectionMatrix()). See also setScreenWidthAndHeight().
+
+ This method is not computationally optimized. If you call it several times with no change in the
+ matrices, you should buffer the entire inverse projection matrix (modelview, projection and then
+ viewport) to speed-up the queries. See the \c gluUnProject man page for details. */
+Vec Camera::unprojectedCoordinatesOf(const Vec& src, const Frame* frame) const
+{
+  GLdouble x,y,z;
+  static GLint viewport[4];
+  getViewport(viewport);
+  gluUnProject(src.x,src.y,src.z, modelViewMatrix_,  projectionMatrix_,  viewport,  &x,&y,&z);
+  if (frame)
+    return frame->coordinatesOf(Vec(x,y,z));
+  else
+    return Vec(x,y,z);
+}
+
+/*! Same as projectedCoordinatesOf(), but with \c float parameters (\p src and \p res can be identical pointers). */
+void Camera::getProjectedCoordinatesOf(const float src[3], float res[3], const Frame* frame) const
+{
+  Vec r = projectedCoordinatesOf(Vec(src), frame);
+  for (int i=0; i<3; ++i)
+    res[i] = r[i];
+}
+
+/*! Same as unprojectedCoordinatesOf(), but with \c float parameters (\p src and \p res can be identical pointers). */
+void Camera::getUnprojectedCoordinatesOf(const float src[3], float res[3], const Frame* frame) const
+{
+  Vec r = unprojectedCoordinatesOf(Vec(src), frame);
+  for (int i=0; i<3; ++i)
+    res[i] = r[i];
+}
+
+/////////////////////////////////////  KFI /////////////////////////////////////////
+
+/*! Returns the KeyFrameInterpolator that defines the Camera path number \p i.
+
+If path \p i is not defined for this index, the method returns a \c NULL pointer. */
+// KeyFrameInterpolator* Camera::keyFrameInterpolator(int i)
+// {	
+//   if ( kfi_.find(i) != kfi_.end())
+//     return kfi_[i];
+//   else
+//     return NULL;
+// }
+
+/*! Sets the KeyFrameInterpolator that defines the Camera path of index \p i.
+
+ The previous keyFrameInterpolator() is lost and should be deleted by the calling method if
+ needed.
+
+ The KeyFrameInterpolator::interpolated() signal of \p kfi probably needs to be connected to the
+ Camera's associated QGLViewer::updateGL() slot, so that when the Camera position is interpolated
+ using \p kfi, every interpolation step updates the display:
+ \code
+ myViewer.camera()->deletePath(3);
+ myViewer.camera()->setKeyFrameInterpolator(3, myKeyFrameInterpolator);
+ connect(myKeyFrameInterpolator, SIGNAL(interpolated()), myViewer, SLOT(updateGL());
+ \endcode
+
+ \note These connections are done automatically when a Camera is attached to a QGLViewer, or when a
+ new KeyFrameInterpolator is defined using the QGLViewer::addKeyFrameKeyboardModifiers() and
+ QGLViewer::pathKey() (default is Alt+F[1-12]). See the <a href="../keyboard.html">keyboard page</a>
+ for details. */
+// void Camera::setKeyFrameInterpolator(int i, KeyFrameInterpolator* const kfi)
+// {
+//   if (kfi)
+//     kfi_[i] = kfi;
+//   else
+//     kfi_.erase(i);
+// }
+
+/*! Adds the current Camera position() and orientation() as a keyFrame to the path number \p i.
+
+This method can also be used if you simply want to save a Camera point of view (a path made of a
+single keyFrame). Use playPath() to make the Camera play the keyFrame path (resp. restore
+the point of view). Use deletePath() to clear the path.
+
+The default keyboard shortcut for this method is Alt+F[1-12]. Set QGLViewer::pathKey() and
+QGLViewer::addKeyFrameKeyboardModifiers().
+
+If you use directly this method and the keyFrameInterpolator(i) does not exist, a new one is
+created. Its KeyFrameInterpolator::interpolated() signal should then be connected to the
+QGLViewer::updateGL() slot (see setKeyFrameInterpolator()). */
+// void Camera::addKeyFrameToPath(int i)
+// {
+//     if (kfi_.find(i) != kfi_.end())
+//     setKeyFrameInterpolator(i, new KeyFrameInterpolator(frame()));
+// 
+//   kfi_[i]->addKeyFrame(*(frame()));
+// }
+
+/*! Makes the Camera follow the path of keyFrameInterpolator() number \p i.
+
+ If the interpolation is started, it stops it instead.
+
+ This method silently ignores undefined (empty) paths (see keyFrameInterpolator()).
+
+ The default keyboard shortcut for this method is F[1-12]. Set QGLViewer::pathKey() and
+ QGLViewer::playPathKeyboardModifiers(). */
+// void Camera::playPath(int i)
+// {
+//    if (kfi_.find(i) != kfi_.end())
+//     if (kfi_[i]->interpolationIsStarted())
+//       kfi_[i]->stopInterpolation();
+//     else
+//       kfi_[i]->startInterpolation();
+// }
+
+/*! Resets the path of the keyFrameInterpolator() number \p i.
+
+If this path is \e not being played (see playPath() and
+KeyFrameInterpolator::interpolationIsStarted()), resets it to is its starting position (see
+KeyFrameInterpolator::resetInterpolation()). If the path is played, simply stops interpolation. */
+// void Camera::resetPath(int i)
+// {
+// //  if (kfi_.contains(i))
+//   if (kfi_.find(i) != kfi_.end())
+//     if ((kfi_[i]->interpolationIsStarted()))
+//       kfi_[i]->stopInterpolation();
+//     else
+//       {
+// 	kfi_[i]->resetInterpolation();
+// 	kfi_[i]->interpolateAtTime(kfi_[i]->interpolationTime());
+//       }
+// }
+
+/*! Deletes the keyFrameInterpolator() of index \p i.
+
+Disconnect the keyFrameInterpolator() KeyFrameInterpolator::interpolated() signal before deleting the
+keyFrameInterpolator() if needed:
+\code
+disconnect(camera()->keyFrameInterpolator(i), SIGNAL(interpolated()), this, SLOT(updateGL()));
+camera()->deletePath(i);
+\endcode */
+// void Camera::deletePath(int i)
+// {
+//   if (kfi_.find(i) != kfi_.end())
+//     {
+//       kfi_[i]->stopInterpolation();
+//       delete kfi_[i];
+//       kfi_.erase(i);
+//     }
+// }
+
+
+
+/*! Gives the coefficients of a 3D half-line passing through the Camera eye and pixel (x,y).
+
+ The origin of the half line (eye position) is stored in \p orig, while \p dir contains the properly
+ oriented and normalized direction of the half line.
+
+ \p x and \p y are expressed in Qt format (origin in the upper left corner). Use screenHeight() - y
+ to convert to OpenGL units.
+
+ This method is useful for analytical intersection in a selection method.
+
+ See the <a href="../examples/select.html">select example</a> for an illustration. */
+void Camera::convertClickToLine(const Point& pixel, Vec& orig, Vec& dir) const
+{
+  switch (type())
+    {
+    case Camera::PERSPECTIVE:
+      orig = position();
+      dir = Vec( ((2.0 * pixel.x() / screenWidth()) - 1.0) * tan(fieldOfView()/2.0) * aspectRatio(),
+		 ((2.0 * (screenHeight()-pixel.y()) / screenHeight()) - 1.0) * tan(fieldOfView()/2.0),
+		 -1.0 );
+      dir = worldCoordinatesOf(dir) - orig;
+      dir.normalize();
+      break;
+
+    case Camera::ORTHOGRAPHIC:
+      {
+	GLdouble w,h;
+	getOrthoWidthHeight(w,h);
+	orig = Vec((2.0 * pixel.x() / screenWidth() - 1.0)*w, -(2.0 * pixel.y() / screenHeight() - 1.0)*h, 0.0);
+	orig = worldCoordinatesOf(orig);
+	dir = viewDirection();
+	break;
+      }
+    }
+}
+
+#ifndef DOXYGEN
+/*! This method has been deprecated in libQGLViewer version 2.2.0 */
+void Camera::drawCamera(float, float, float)
+{
+  cout << "drawCamera is deprecated. Use Camera::draw() instead.";
+}
+#endif
+
+/*! Draws a representation of the Camera in the 3D world.
+
+The near and far planes are drawn as quads, the frustum is drawn using lines and the camera up
+vector is represented by an arrow to disambiguate the drawing. See the 
+<a href="../examples/standardCamera.html">standardCamera example</a> for an illustration.
+
+Note that the current \c glColor and \c glPolygonMode are used to draw the near and far planes. See
+the <a href="../examples/frustumCulling.html">frustumCulling example</a> for an example of
+semi-transparent plane drawing. Similarly, the current \c glLineWidth and \c glColor is used to draw
+the frustum outline.
+
+When \p drawFarPlane is \c false, only the near plane is drawn. \p scale can be used to scale the
+drawing: a value of 1.0 (default) will draw the Camera's frustum at its actual size.
+
+This method assumes that the \c glMatrixMode is \c GL_MODELVIEW and that the current ModelView
+matrix corresponds to the world coordinate system (as it is at the beginning of QGLViewer::draw()).
+The Camera is then correctly positioned and orientated.
+
+\note The drawing of a QGLViewer's own QGLViewer::camera() should not be visible, but may create
+artefacts due to numerical imprecisions. */
+void Camera::draw(bool drawFarPlane, float scale) const
+{
+  glPushMatrix();
+  glMultMatrixd(frame()->worldMatrix());
+
+  // 0 is the upper left coordinates of the near corner, 1 for the far one
+  Vec points[2];
+
+  points[0].z = scale * zNear();
+  points[1].z = scale * zFar();
+
+  switch (type())
+    {
+    case Camera::PERSPECTIVE:
+      {
+	points[0].y = points[0].z * tan(fieldOfView()/2.0);
+	points[0].x = points[0].y * aspectRatio();
+
+	const float ratio = points[1].z / points[0].z;
+
+	points[1].y = ratio * points[0].y;
+	points[1].x = ratio * points[0].x;
+	break;
+      }
+    case Camera::ORTHOGRAPHIC:
+      {
+	GLdouble hw, hh;
+	getOrthoWidthHeight(hw, hh);
+	points[0].x = points[1].x = scale * float(hw);
+	points[0].y = points[1].y = scale * float(hh);
+	break;
+      }
+    }
+
+  const int farIndex = drawFarPlane?1:0;
+
+  // Near and (optionally) far plane(s)
+  glBegin(GL_QUADS);
+  for (int i=farIndex; i>=0; --i)
+    {
+      glNormal3f(0.0, 0.0, (i==0)?1.0:-1.0);
+      glVertex3f( points[i].x,  points[i].y, -points[i].z);
+      glVertex3f(-points[i].x,  points[i].y, -points[i].z);
+      glVertex3f(-points[i].x, -points[i].y, -points[i].z);
+      glVertex3f( points[i].x, -points[i].y, -points[i].z);
+    }
+  glEnd();
+
+  // Up arrow
+  const float arrowHeight    = 1.5f * points[0].y;
+  const float baseHeight     = 1.2f * points[0].y;
+  const float arrowHalfWidth = 0.5f * points[0].x;
+  const float baseHalfWidth  = 0.3f * points[0].x;
+
+  glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
+  // Base
+  glBegin(GL_QUADS);
+  glVertex3f(-baseHalfWidth, points[0].y, -points[0].z);
+  glVertex3f( baseHalfWidth, points[0].y, -points[0].z);
+  glVertex3f( baseHalfWidth, baseHeight,  -points[0].z);
+  glVertex3f(-baseHalfWidth, baseHeight,  -points[0].z);
+  glEnd();
+
+  // Arrow
+  glBegin(GL_TRIANGLES);
+  glVertex3f( 0.0f,           arrowHeight, -points[0].z);
+  glVertex3f(-arrowHalfWidth, baseHeight,  -points[0].z);
+  glVertex3f( arrowHalfWidth, baseHeight,  -points[0].z);
+  glEnd();
+  
+  // Frustum lines
+  switch (type())
+    {
+    case Camera::PERSPECTIVE :
+      glBegin(GL_LINES);
+      glVertex3f(0.0f, 0.0f, 0.0f);
+      glVertex3f( points[farIndex].x,  points[farIndex].y, -points[farIndex].z);
+      glVertex3f(0.0f, 0.0f, 0.0f);
+      glVertex3f(-points[farIndex].x,  points[farIndex].y, -points[farIndex].z);
+      glVertex3f(0.0f, 0.0f, 0.0f);
+      glVertex3f(-points[farIndex].x, -points[farIndex].y, -points[farIndex].z);
+      glVertex3f(0.0f, 0.0f, 0.0f);
+      glVertex3f( points[farIndex].x, -points[farIndex].y, -points[farIndex].z);
+      glEnd();
+      break;
+    case Camera::ORTHOGRAPHIC :
+      if (drawFarPlane)
+	{
+	  glBegin(GL_LINES);
+	  glVertex3f( points[0].x,  points[0].y, -points[0].z);
+	  glVertex3f( points[1].x,  points[1].y, -points[1].z);
+	  glVertex3f(-points[0].x,  points[0].y, -points[0].z);
+	  glVertex3f(-points[1].x,  points[1].y, -points[1].z);
+	  glVertex3f(-points[0].x, -points[0].y, -points[0].z);
+	  glVertex3f(-points[1].x, -points[1].y, -points[1].z);
+	  glVertex3f( points[0].x, -points[0].y, -points[0].z);
+	  glVertex3f( points[1].x, -points[1].y, -points[1].z);
+	  glEnd();
+	}
+    }
+
+  glPopMatrix();
+}
+
+
+/*! Returns the 6 plane equations of the Camera frustum.
+
+The six 4-component vectors of \p coef respectively correspond to the left, right, near, far, top
+and bottom Camera frustum planes. Each vector holds a plane equation of the form:
+\code
+a*x + b*y + c*z + d = 0 
+\endcode
+where \c a, \c b, \c c and \c d are the 4 components of each vector, in that order.
+
+See the <a href="../examples/frustumCulling.html">frustumCulling example</a> for an application.
+
+This format is compatible with the \c glClipPlane() function. One camera frustum plane can hence be
+applied in an other viewer to visualize the culling results:
+\code
+ // Retrieve plance equations
+ GLdouble coef[6][4];
+ mainViewer->camera()->getFrustumPlanesCoefficients(coef);
+
+ // These two additional clipping planes (which must have been enabled)
+ // will reproduce the mainViewer's near and far clipping.
+ glClipPlane(GL_CLIP_PLANE0, coef[2]);
+ glClipPlane(GL_CLIP_PLANE1, coef[3]);
+\endcode */
+void Camera::getFrustumPlanesCoefficients(GLdouble coef[6][4]) const
+{
+  // Computed once and for all
+  const Vec pos          = position();
+  const Vec viewDir      = viewDirection();
+  const Vec up           = upVector();
+  const Vec right        = rightVector();
+  const float posViewDir = pos * viewDir;
+
+  static Vec normal[6];
+  static GLdouble dist[6];
+  
+  switch (type())
+    {
+    case Camera::PERSPECTIVE :
+      {
+	const float hhfov = horizontalFieldOfView() / 2.0;
+	const float chhfov = cos(hhfov);
+	const float shhfov = sin(hhfov);
+	normal[0] = - shhfov * viewDir;
+	normal[1] = normal[0] + chhfov * right;
+	normal[0] = normal[0] - chhfov * right;
+	
+	normal[2] = -viewDir;
+	normal[3] =  viewDir;
+	
+	const float hfov = fieldOfView() / 2.0;
+	const float chfov = cos(hfov);
+	const float shfov = sin(hfov);
+	normal[4] = - shfov * viewDir;
+	normal[5] = normal[4] - chfov * up;
+	normal[4] = normal[4] + chfov * up;
+
+	for (int i=0; i<2; ++i)
+	  dist[i] = pos * normal[i];
+	for (int j=4; j<6; ++j)
+	  dist[j] = pos * normal[j];
+
+	// Natural equations are:
+	// dist[0,1,4,5] = pos * normal[0,1,4,5];
+	// dist[2] = (pos + zNear() * viewDir) * normal[2];
+	// dist[3] = (pos + zFar()  * viewDir) * normal[3];
+
+	// 2 times less computations using expanded/merged equations. Dir vectors are normalized.
+	const float posRightCosHH = chhfov * pos * right;
+	dist[0] = -shhfov * posViewDir;
+	dist[1] = dist[0] + posRightCosHH;
+	dist[0] = dist[0] - posRightCosHH;
+	const float posUpCosH = chfov * pos * up;
+	dist[4] = - shfov * posViewDir;
+	dist[5] = dist[4] - posUpCosH;
+	dist[4] = dist[4] + posUpCosH;
+	
+	break;
+      }
+    case Camera::ORTHOGRAPHIC :
+      normal[0] = -right;
+      normal[1] =  right;
+      normal[4] =  up;
+      normal[5] = -up;
+
+      GLdouble hw, hh;
+      getOrthoWidthHeight(hw, hh);
+      dist[0] = (pos - hw * right) * normal[0];
+      dist[1] = (pos + hw * right) * normal[1];
+      dist[4] = (pos + hh * up) * normal[4];
+      dist[5] = (pos - hh * up) * normal[5];
+      break;
+    }
+
+  // Front and far planes are identical for both camera types.
+  normal[2] = -viewDir;
+  normal[3] =  viewDir;
+  dist[2] = -posViewDir - zNear();
+  dist[3] =  posViewDir + zFar();
+
+  for (int i=0; i<6; ++i)
+    {
+      coef[i][0] = GLdouble(normal[i].x);
+      coef[i][1] = GLdouble(normal[i].y);
+      coef[i][2] = GLdouble(normal[i].z);
+      coef[i][3] = dist[i];
+    }
+}
diff --git a/source/blender/freestyle/intern/app_blender/camera.h b/source/blender/freestyle/intern/app_blender/camera.h
new file mode 100644
index 00000000000..d6dad1dd895
--- /dev/null
+++ b/source/blender/freestyle/intern/app_blender/camera.h
@@ -0,0 +1,565 @@
+/****************************************************************************
+
+ Copyright (C) 2002-2007 Gilles Debunne (Gilles.Debunne@imag.fr)
+
+ This file is part of the QGLViewer library.
+ Version 2.2.6-3, released on August 28, 2007.
+
+ http://artis.imag.fr/Members/Gilles.Debunne/QGLViewer
+
+ libQGLViewer 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.
+
+ libQGLViewer 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 libQGLViewer; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*****************************************************************************/
+
+#ifndef QGLVIEWER_CAMERA_H
+#define QGLVIEWER_CAMERA_H
+
+#include "manipulatedCameraFrame.h"
+
+  /*! \brief A perspective or orthographic camera.
+  \class Camera camera.h QGLViewer/camera.h
+
+  A Camera defines some intrinsic parameters (fieldOfView(), position(), viewDirection(),
+  upVector()...) and useful positioning tools that ease its placement (showEntireScene(),
+  fitSphere(), lookAt()...). It exports its associated OpenGL projection and modelview matrices and
+  can interactively be modified using the mouse.
+
+  <h3>Mouse manipulation</h3>
+
+  The position() and orientation() of the Camera are defined by a ManipulatedCameraFrame (retrieved
+  using frame()). These methods are just convenient wrappers to the equivalent Frame methods. This
+  also means that the Camera frame() can be attached to a Frame::referenceFrame() which enables
+  complex Camera setups.
+
+  Different displacements can be performed using the mouse. The list of possible actions is defined
+  by the QGLViewer::MouseAction enum. Use QGLViewer::setMouseBinding() to attach a specific action
+  to an arbitrary mouse button-state key binding. These actions are detailed in the <a
+  href="../mouse.html">mouse page</a>.
+
+  The default button binding are: QGLViewer::ROTATE (left), QGLViewer::ZOOM (middle) and
+  QGLViewer::TRANSLATE (right). With this configuration, the Camera \e observes a scene and rotates
+  around its revolveAroundPoint(). You can switch between this mode and a fly mode using the
+  QGLViewer::CAMERA_MODE (see QGLViewer::toggleCameraMode()) keyboard shortcut (default is 'Space').
+
+  <h3>Other functionalities</h3>
+
+  The type() of the Camera can be Camera::ORTHOGRAPHIC or Camera::PERSPECTIVE (see Type()).
+  fieldOfView() is meaningless with Camera::ORTHOGRAPHIC.
+
+  The near and far planes of the Camera are fitted to the scene and determined from
+  QGLViewer::sceneRadius(), QGLViewer::sceneCenter() and zClippingCoefficient() by the zNear() and
+  zFar() methods. Reasonable values on the scene extends hence have to be provided to the QGLViewer
+  in order for the Camera to correctly display the scene. High level positioning methods also use
+  this information (showEntireScene(), centerScene()...).
+
+  A Camera holds KeyFrameInterpolator that can be used to save Camera positions and paths. You can
+  interactively addKeyFrameToPath() to a given path using the default \c Alt+F[1-12] shortcuts. Use
+  playPath() to make the Camera follow the path (default shortcut is F[1-12]). See the <a
+  href="../keyboard.html">keyboard page</a> for details on key customization.
+
+  Use cameraCoordinatesOf() and worldCoordinatesOf() to convert to and from the Camera frame()
+  coordinate system. projectedCoordinatesOf() and unprojectedCoordinatesOf() will convert from
+  screen to 3D coordinates. convertClickToLine() is very useful for analytical object selection.
+
+  Stereo display is possible on machines with quad buffer capabilities (with Camera::PERSPECTIVE
+  type() only). Test the <a href="../examples/stereoViewer.html">stereoViewer example</a> to check.
+
+  A Camera can also be used outside of a QGLViewer or even without OpenGL for its coordinate system
+  conversion capabilities. Note however that some of them explicitly rely on the presence of a
+  Z-buffer. \nosubgrouping */
+  class Camera
+  {
+
+  public:
+    Camera();
+    virtual ~Camera();
+
+    Camera(const Camera& camera);
+    Camera& operator=(const Camera& camera);
+
+
+    /*! Enumerates the two possible types of Camera.
+
+    See type() and setType(). This type mainly defines different Camera projection matrix (see
+    loadProjectionMatrix()). Many other methods (pointUnderPixel(), convertClickToLine(),
+    projectedCoordinatesOf(), pixelGLRatio()...) take this Type into account. */
+    enum Type { PERSPECTIVE, ORTHOGRAPHIC };
+
+    /*! @name Position and orientation */
+    //@{
+  public:
+    /*! Returns the Camera position (the eye), defined in the world coordinate system.
+
+    Use setPosition() to set the Camera position. Other convenient methods are showEntireScene() or
+    fitSphere(). Actually returns \c frame()->position().
+
+    This position corresponds to the projection center of a Camera::PERSPECTIVE Camera. It is not
+    located in the image plane, which is at a zNear() distance ahead. */
+    Vec position() const { return frame()->position(); };
+
+    /*! Returns the normalized up vector of the Camera, defined in the world coordinate system.
+
+    Set using setUpVector() or setOrientation(). It is orthogonal to viewDirection() and to
+    rightVector().
+
+    It corresponds to the Y axis of the associated frame() (actually returns
+    frame()->inverseTransformOf(Vec(0.0, 1.0, 0.0)) ). */
+    Vec upVector() const
+    {
+      return frame()->inverseTransformOf(Vec(0.0, 1.0, 0.0));
+    }
+    /*! Returns the normalized view direction of the Camera, defined in the world coordinate system.
+
+    Change this value using setViewDirection(), lookAt() or setOrientation(). It is orthogonal to
+    upVector() and to rightVector().
+
+    This corresponds to the negative Z axis of the frame() ( frame()->inverseTransformOf(Vec(0.0,
+    0.0, -1.0)) ). */
+    Vec viewDirection() const { return frame()->inverseTransformOf(Vec(0.0, 0.0, -1.0)); };
+
+    /*! Returns the normalized right vector of the Camera, defined in the world coordinate system.
+
+    This vector lies in the Camera horizontal plane, directed along the X axis (orthogonal to
+    upVector() and to viewDirection()). Set using setUpVector(), lookAt() or setOrientation().
+
+    Simply returns frame()->inverseTransformOf(Vec(1.0, 0.0, 0.0)). */
+    Vec rightVector() const
+    {
+      return frame()->inverseTransformOf(Vec(1.0, 0.0, 0.0));
+    }
+
+    /*! Returns the Camera orientation, defined in the world coordinate system.
+
+    Actually returns \c frame()->orientation(). Use setOrientation(), setUpVector() or lookAt() to
+    set the Camera orientation. */
+    Quaternion orientation() const { return frame()->orientation(); };
+
+    void setFromModelViewMatrix(const GLdouble* const modelViewMatrix);
+    void setFromProjectionMatrix(const float matrix[12]);
+
+  public:
+    /*! Sets the Camera position() (the eye), defined in the world coordinate system. */
+    void setPosition(const Vec& pos) { frame()->setPosition(pos); };
+    void setOrientation(const Quaternion& q);
+    void setOrientation(float theta, float phi);
+    void setUpVector(const Vec& up, bool noMove=true);
+    void setViewDirection(const Vec& direction);
+    //@}
+
+
+    /*! @name Positioning tools */
+    //@{
+  public:
+    void lookAt(const Vec& target);
+    void showEntireScene();
+    void fitSphere(const Vec& center, float radius);
+    void fitBoundingBox(const Vec& min, const Vec& max);
+    void centerScene();
+    void interpolateToZoomOnPixel(const Point& pixel);
+    void interpolateToFitScene();
+    void interpolateTo(const Frame& fr, float duration);
+    //@}
+
+
+    /*! @name Frustum */
+    //@{
+  public:
+    /*! Returns the Camera::Type of the Camera.
+
+    Set by setType(). Mainly used by loadProjectionMatrix().
+
+    A Camera::PERSPECTIVE Camera uses a classical projection mainly defined by its fieldOfView().
+
+    With a Camera::ORTHOGRAPHIC type(), the fieldOfView() is meaningless and the width and height of
+    the Camera frustum are inferred from the distance to the revolveAroundPoint() using
+    getOrthoWidthHeight().
+
+    Both types use zNear() and zFar() (to define their clipping planes) and aspectRatio() (for
+    frustum shape). */
+    Type type() const { return type_; };
+
+    /*! Returns the vertical field of view of the Camera (in radians).
+
+    Value is set using setFieldOfView(). Default value is pi/4 radians. This value is meaningless if
+    the Camera type() is Camera::ORTHOGRAPHIC.
+
+    The field of view corresponds the one used in \c gluPerspective (see manual). It sets the Y
+    (vertical) aperture of the Camera. The X (horizontal) angle is inferred from the window aspect
+    ratio (see aspectRatio() and horizontalFieldOfView()).
+
+    Use setFOVToFitScene() to adapt the fieldOfView() to a given scene. */
+    float fieldOfView() const { return fieldOfView_; };
+
+    /*! Returns the horizontal field of view of the Camera (in radians).
+
+    Value is set using setHorizontalFieldOfView() or setFieldOfView(). These values
+    are always linked by:
+    \code
+    horizontalFieldOfView() = 2.0 * atan ( tan(fieldOfView()/2.0) * aspectRatio() ).
+    \endcode */
+    float horizontalFieldOfView() const { return 2.0 * atan ( tan(fieldOfView()/2.0) * aspectRatio() ); };
+
+    /*! Returns the Camera aspect ratio defined by screenWidth() / screenHeight().
+
+    When the Camera is attached to a QGLViewer, these values and hence the aspectRatio() are
+    automatically fitted to the viewer's window aspect ratio using setScreenWidthAndHeight(). */
+    float aspectRatio() const { return static_cast<float>(screenWidth_)/static_cast<float>(screenHeight_); };
+    /*! Returns the width (in pixels) of the Camera screen.
+
+    Set using setScreenWidthAndHeight(). This value is automatically fitted to the QGLViewer's
+    window dimensions when the Camera is attached to a QGLViewer. See also QGLWidget::width() */
+    int screenWidth() const { return screenWidth_; };
+    /*! Returns the height (in pixels) of the Camera screen.
+
+    Set using setScreenWidthAndHeight(). This value is automatically fitted to the QGLViewer's
+    window dimensions when the Camera is attached to a QGLViewer. See also QGLWidget::height() */
+    int screenHeight() const { return screenHeight_; };
+    void getViewport(GLint viewport[4]) const;
+    float pixelGLRatio(const Vec& position) const;
+
+    /*! Returns the coefficient which is used to set zNear() when the Camera is inside the sphere
+    defined by sceneCenter() and zClippingCoefficient() * sceneRadius().
+
+    In that case, the zNear() value is set to zNearCoefficient() * zClippingCoefficient() *
+    sceneRadius(). See the zNear() documentation for details.
+
+    Default value is 0.005, which is appropriate for most applications. In case you need a high
+    dynamic ZBuffer precision, you can increase this value (~0.1). A lower value will prevent
+    clipping of very close objects at the expense of a worst Z precision.
+
+    Only meaningful when Camera type is Camera::PERSPECTIVE. */
+    float zNearCoefficient() const { return zNearCoef_; };
+    /*! Returns the coefficient used to position the near and far clipping planes.
+
+    The near (resp. far) clipping plane is positioned at a distance equal to zClippingCoefficient() *
+    sceneRadius() in front of (resp. behind) the sceneCenter(). This garantees an optimal use of
+    the z-buffer range and minimizes aliasing. See the zNear() and zFar() documentations.
+
+    Default value is square root of 3.0 (so that a cube of size sceneRadius() is not clipped).
+
+    However, since the sceneRadius() is used for other purposes (see showEntireScene(), flySpeed(),
+    ...) and you may want to change this value to define more precisely the location of the clipping
+    planes. See also zNearCoefficient().
+
+    For a total control on clipping planes' positions, an other option is to overload the zNear()
+    and zFar() methods. See the <a href="../examples/standardCamera.html">standardCamera example</a>.
+
+    \attention When QGLViewer::cameraPathAreEdited(), this value is set to 5.0 so that the Camera
+    paths are not clipped. The previous zClippingCoefficient() value is restored back when you leave
+    this mode. */
+    float zClippingCoefficient() const { return zClippingCoef_; }
+
+    virtual float zNear() const;
+    virtual float zFar()  const;
+    virtual void getOrthoWidthHeight(GLdouble& halfWidth, GLdouble& halfHeight) const;
+    void getFrustumPlanesCoefficients(GLdouble coef[6][4]) const;
+
+  public:
+    void setType(Type type);
+
+    /*! Sets the vertical fieldOfView() of the Camera (in radians).
+
+    Note that focusDistance() is set to sceneRadius() / tan(fieldOfView()/2) by this method. */
+    void setFieldOfView(float fov) { fieldOfView_ = fov; setFocusDistance(sceneRadius() / tan(fov/2.0)); };
+
+    /*! Sets the horizontalFieldOfView() of the Camera (in radians).
+
+    horizontalFieldOfView() and fieldOfView() are linked by the aspectRatio(). This method actually
+    calls setFieldOfView(( 2.0 * atan (tan(hfov / 2.0) / aspectRatio()) )) so that a call to
+    horizontalFieldOfView() returns the expected value. */
+    void setHorizontalFieldOfView(float hfov) { setFieldOfView( 2.0 * atan (tan(hfov / 2.0) / aspectRatio()) ); };
+
+    void setFOVToFitScene();
+
+    /*! Defines the Camera aspectRatio().
+
+    This value is actually inferred from the screenWidth() / screenHeight() ratio. You should use
+    setScreenWidthAndHeight() instead.
+
+    This method might however be convenient when the Camera is not associated with a QGLViewer. It
+    actually sets the screenHeight() to 100 and the screenWidth() accordingly. See also
+    setFOVToFitScene().
+
+    \note If you absolutely need an aspectRatio() that does not correspond to your viewer's window
+    dimensions, overload loadProjectionMatrix() or multiply the created GL_PROJECTION matrix by a
+    scaled diagonal matrix in your QGLViewer::draw() method. */
+    void setAspectRatio(float aspect) { setScreenWidthAndHeight(int(100.0*aspect), 100); };
+
+    void setScreenWidthAndHeight(int width, int height);
+    /*! Sets the zNearCoefficient() value. */
+    void setZNearCoefficient(float coef) { zNearCoef_ = coef; };
+    /*! Sets the zClippingCoefficient() value. */
+    void setZClippingCoefficient(float coef) { zClippingCoef_ = coef; }
+    //@}
+
+
+    /*! @name Scene radius and center */
+    //@{
+  public:
+    /*! Returns the radius of the scene observed by the Camera.
+
+    You need to provide such an approximation of the scene dimensions so that the Camera can adapt
+    its zNear() and zFar() values. See the sceneCenter() documentation.
+
+    See also setSceneBoundingBox().
+
+    Note that QGLViewer::sceneRadius() (resp. QGLViewer::setSceneRadius()) simply call this method
+    (resp. setSceneRadius()) on its associated QGLViewer::camera(). */
+    float sceneRadius() const { return sceneRadius_; };
+
+    /*! Returns the position of the scene center, defined in the world coordinate system.
+
+    The scene observed by the Camera should be roughly centered on this position, and included in a
+    sceneRadius() sphere. This approximate description of the scene permits a zNear() and zFar()
+    clipping planes definition, and allows convenient positioning methods such as showEntireScene().
+
+    Default value is (0,0,0) (world origin). Use setSceneCenter() to change it. See also
+    setSceneBoundingBox().
+
+    Note that QGLViewer::sceneCenter() (resp. QGLViewer::setSceneCenter()) simply call this method
+    (resp. setSceneCenter()) on its associated QGLViewer::camera(). */
+    Vec sceneCenter() const { return sceneCenter_; };
+    float distanceToSceneCenter() const;
+
+  public:
+    void setSceneRadius(float radius);
+    void setSceneCenter(const Vec& center);
+    bool setSceneCenterFromPixel(const Point& pixel);
+    void setSceneBoundingBox(const Vec& min, const Vec& max);
+    //@}
+
+
+    /*! @name Revolve Around Point */
+    //@{
+ public:
+    void setRevolveAroundPoint(const Vec& rap);
+    bool setRevolveAroundPointFromPixel(const Point& pixel);
+
+  public:
+    /*! The point the Camera revolves around with the QGLViewer::ROTATE mouse binding. Defined in world coordinate system.
+
+    Default value is the sceneCenter().
+
+    \attention setSceneCenter() changes this value. */
+    Vec revolveAroundPoint() const { return frame()->revolveAroundPoint(); };
+    //@}
+
+
+    /*! @name Associated frame */
+    //@{
+  public:
+    /*! Returns the ManipulatedCameraFrame attached to the Camera.
+
+    This ManipulatedCameraFrame defines its position() and orientation() and can translate mouse
+    events into Camera displacement. Set using setFrame(). */
+    ManipulatedCameraFrame* frame() const { return frame_; };
+  public:
+    void setFrame(ManipulatedCameraFrame* const mcf);
+    //@}
+
+
+    /*! @name KeyFramed paths */
+    //@{
+   public:
+    //KeyFrameInterpolator* keyFrameInterpolator(int i);
+
+public:
+    //void setKeyFrameInterpolator(int i, KeyFrameInterpolator* const kfi);
+
+    //virtual void addKeyFrameToPath(int i);
+    //virtual void playPath(int i);
+    //virtual void deletePath(int i);
+    //virtual void resetPath(int i);
+    //@}
+
+
+    /*! @name OpenGL matrices */
+    //@{
+  public:
+    virtual void loadProjectionMatrix(bool reset=true) const;
+    virtual void loadModelViewMatrix(bool reset=true) const;
+    void computeProjectionMatrix() const;
+    void computeModelViewMatrix() const;
+
+    virtual void loadProjectionMatrixStereo(bool leftBuffer=true) const;
+    virtual void loadModelViewMatrixStereo(bool leftBuffer=true) const;
+
+    void getProjectionMatrix(GLdouble m[16]) const;
+    void getModelViewMatrix(GLdouble m[16]) const;
+	void getModelViewProjectionMatrix(GLdouble m[16]) const;
+
+#ifndef DOXYGEN
+    // Required for windows which otherwise silently fills
+    void getProjectionMatrix(GLfloat m[16]) const;
+    void getModelViewMatrix(GLfloat m[16]) const;
+#endif
+    //@}
+
+    
+    /*! @name Drawing */
+    //@{
+#ifndef DOXYGEN
+    static void drawCamera(float scale=1.0, float aspectRatio=1.33, float fieldOfView=M_PI/4.0);
+#endif
+    virtual void draw(bool drawFarPlane=true, float scale=1.0) const;
+    //@}
+
+    
+    /*! @name World to Camera coordinate systems conversions */
+    //@{
+  public:
+    /*! Returns the Camera frame coordinates of a point \p src defined in world coordinates.
+
+    worldCoordinatesOf() performs the inverse transformation.
+
+    Note that the point coordinates are simply converted in a different coordinate system. They are
+    not projected on screen. Use projectedCoordinatesOf() for that. */
+    Vec cameraCoordinatesOf(const Vec& src) const { return frame()->coordinatesOf(src); };
+    /*! Returns the world coordinates of the point whose position \p src is defined in the Camera
+    coordinate system.
+
+    cameraCoordinatesOf() performs the inverse transformation. */
+    Vec worldCoordinatesOf(const Vec& src) const { return frame()->inverseCoordinatesOf(src); };
+    void getCameraCoordinatesOf(const float src[3], float res[3]) const;
+    void getWorldCoordinatesOf(const float src[3], float res[3]) const;
+    //@}
+
+
+    /*! @name 2D screen to 3D world coordinate systems conversions */
+    //@{
+  public:
+    Vec projectedCoordinatesOf(const Vec& src, const Frame* frame=NULL) const;
+    Vec unprojectedCoordinatesOf(const Vec& src, const Frame* frame=NULL) const;
+    void getProjectedCoordinatesOf(const float src[3], float res[3], const Frame* frame=NULL) const;
+    void getUnprojectedCoordinatesOf(const float src[3], float res[3], const Frame* frame=NULL) const;
+    void convertClickToLine(const Point& pixel, Vec& orig, Vec& dir) const;
+    Vec pointUnderPixel(const Point& pixel, bool& found) const;
+    //@}
+
+
+    /*! @name Fly speed */
+    //@{
+  public:
+    /*! Returns the fly speed of the Camera.
+
+    Simply returns frame()->flySpeed(). See the ManipulatedCameraFrame::flySpeed() documentation.
+    This value is only meaningful when the MouseAction bindings is QGLViewer::MOVE_FORWARD or
+    QGLViewer::MOVE_BACKWARD.
+
+    Set to 0.5% of the sceneRadius() by setSceneRadius(). See also setFlySpeed(). */
+    float flySpeed() const { return frame()->flySpeed(); };
+  public:
+    /*! Sets the Camera flySpeed().
+
+    \attention This value is modified by setSceneRadius(). */
+    void setFlySpeed(float speed) { frame()->setFlySpeed(speed); };
+    //@}
+
+
+    /*! @name Stereo parameters */
+    //@{
+  public:
+    /*! Returns the user's inter-ocular distance (in meters). Default value is 0.062m, which fits most people.
+
+    loadProjectionMatrixStereo() uses this value to define the Camera offset and frustum. See
+    setIODistance(). */
+    float IODistance() const { return IODistance_; };
+
+    /*! Returns the physical distance between the user's eyes and the screen (in meters).
+
+    Default value is 0.5m.
+
+    Used by loadModelViewMatrixStereo() and loadProjectionMatrixStereo() for stereo display. Value
+    is set using setPhysicalDistanceToScreen().
+
+    physicalDistanceToScreen() and focusDistance() represent the same distance. The first one is
+    expressed in physical real world units, while the latter is expressed in OpenGL virtual world
+    units. Use their ratio to convert distances between these worlds.
+
+    Use the following code to detect a reality center configuration (using its screen aspect ratio)
+    and to automatically set physical distances accordingly:
+    \code
+    QDesktopWidget screen;
+    if (fabs((float)screen.width() / (float)screen.height()) > 2.0)
+    {
+      camera()->setPhysicalDistanceToScreen(4.0);
+      camera()->setPhysicalScreenWidth(10.0);
+    }
+    \endcode */
+    float physicalDistanceToScreen() const { return physicalDistanceToScreen_; };
+
+    /*! Returns the physical screen width, in meters. Default value is 0.4m (average monitor).
+
+    Used for stereo display only (see loadModelViewMatrixStereo() and loadProjectionMatrixStereo()).
+    Set using setPhysicalScreenWidth().
+
+    See physicalDistanceToScreen() for reality center automatic configuration. */
+    float physicalScreenWidth() const { return physicalScreenWidth_; };
+
+    /*! Returns the focus distance used by stereo display, expressed in OpenGL units.
+
+    This is the distance in the virtual world between the Camera and the plane where the horizontal
+    stereo parallax is null (the stereo left and right images are superimposed).
+
+    This distance is the virtual world equivalent of the real-world physicalDistanceToScreen().
+
+    \attention This value is modified by QGLViewer::setSceneRadius(), setSceneRadius() and
+    setFieldOfView(). When one of these values is modified, focusDistance() is set to sceneRadius()
+    / tan(fieldOfView()/2), which provides good results. */
+    float focusDistance() const { return focusDistance_; };
+  public:
+    /*! Sets the IODistance(). */
+    void setIODistance(float distance) { IODistance_ = distance; };
+
+    /*! Sets the physicalDistanceToScreen(). */
+    void setPhysicalDistanceToScreen(float distance) { physicalDistanceToScreen_ = distance; };
+
+    /*! Sets the physical screen (monitor or projected wall) width (in meters). */
+    void setPhysicalScreenWidth(float width) { physicalScreenWidth_ = width; };
+
+    /*! Sets the focusDistance(), in OpenGL scene units. */
+    void setFocusDistance(float distance) { focusDistance_ = distance; };
+    //@}
+
+
+  private:
+    // F r a m e
+    ManipulatedCameraFrame* frame_;
+
+    // C a m e r a   p a r a m e t e r s
+    int screenWidth_, screenHeight_;  // size of the window, in pixels
+    float fieldOfView_; // in radians
+    Vec sceneCenter_;
+    float sceneRadius_; // OpenGL units
+    float zNearCoef_;
+    float zClippingCoef_;
+    float orthoCoef_;
+    Type type_; // PERSPECTIVE or ORTHOGRAPHIC
+    mutable GLdouble modelViewMatrix_[16]; // Buffered model view matrix.
+    mutable GLdouble projectionMatrix_[16]; // Buffered projection matrix.
+
+    // S t e r e o   p a r a m e t e r s
+    float IODistance_;		     // inter-ocular distance, in meters
+    float focusDistance_;	     // in scene units
+    float physicalDistanceToScreen_; // in meters
+    float physicalScreenWidth_;	     // in meters
+
+    // P o i n t s   o f   V i e w s   a n d   K e y F r a m e s
+    //map<int, KeyFrameInterpolator*> kfi_;
+    //KeyFrameInterpolator* interpolationKfi_;
+  };
+
+
+#endif // QGLVIEWER_CAMERA_H
diff --git a/source/blender/freestyle/intern/app_blender/config.h b/source/blender/freestyle/intern/app_blender/config.h
new file mode 100644
index 00000000000..c1b65aad560
--- /dev/null
+++ b/source/blender/freestyle/intern/app_blender/config.h
@@ -0,0 +1,50 @@
+///////////////////////////////////////////////////////////////////
+//               libQGLViewer configuration file                 //
+//  Modify these settings according to your local configuration  //
+///////////////////////////////////////////////////////////////////
+
+#ifndef QGLVIEWER_CONFIG_H
+#define QGLVIEWER_CONFIG_H
+
+
+
+
+
+#include <map>
+#include <ostream>
+
+#include <math.h>
+#include <iostream>
+
+using namespace std;
+
+#include "point.h"
+
+# ifdef WIN32
+#  include <windows.h>
+# endif
+# ifdef __MACH__
+#  include <OpenGL/gl.h>
+# else
+#  include <GL/gl.h>
+# endif
+
+#ifdef __APPLE_CC__
+	#include <GLUT/glut.h>
+#else
+	#include <GL/glut.h>
+#endif
+
+#ifndef Q_UNUSED
+        #  define Q_UNUSED(x) (void)x;
+#endif
+
+template <typename T>
+inline const T &qMin(const T &a, const T &b) { if (a < b) return a; return b; }
+template <typename T>
+inline const T &qMax(const T &a, const T &b) { if (a < b) return b; return a; }
+template <typename T>
+inline const T &qBound(const T &min, const T &val, const T &max)
+{ return qMax(min, qMin(max, val)); }
+
+#endif // QGLVIEWER_CONFIG_H
diff --git a/source/blender/freestyle/intern/app_blender/constraint.h b/source/blender/freestyle/intern/app_blender/constraint.h
new file mode 100644
index 00000000000..871cb2be098
--- /dev/null
+++ b/source/blender/freestyle/intern/app_blender/constraint.h
@@ -0,0 +1,341 @@
+/****************************************************************************
+
+ Copyright (C) 2002-2007 Gilles Debunne (Gilles.Debunne@imag.fr)
+
+ This file is part of the QGLViewer library.
+ Version 2.2.6-3, released on August 28, 2007.
+
+ http://artis.imag.fr/Members/Gilles.Debunne/QGLViewer
+
+ libQGLViewer 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.
+
+ libQGLViewer 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 libQGLViewer; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*****************************************************************************/
+
+#ifndef QGLVIEWER_CONSTRAINT_H
+#define QGLVIEWER_CONSTRAINT_H
+
+#include "vec.h"
+#include "quaternion.h"
+
+//namespace qglviewer {
+  class Frame;
+  class Camera;
+
+  /*! \brief An interface class for Frame constraints.
+  \class Constraint constraint.h QGLViewer/constraint.h
+
+  This class defines the interface for the Constraints that can be applied to a Frame to limit its
+  motion. Use Frame::setConstraint() to associate a Constraint to a Frame (default is a \c NULL
+  Frame::constraint()).
+
+  <h3>How does it work ?</h3>
+
+  The Constraint acts as a filter on the translation and rotation Frame increments.
+  constrainTranslation() and constrainRotation() should be overloaded to specify the constraint
+  behavior: the desired displacement is given as a parameter that can optionally be modified.
+
+  Here is how the Frame::translate() and Frame::rotate() methods use the Constraint:
+  \code
+  Frame::translate(Vec& T)
+  {
+    if (constraint())
+      constraint()->constrainTranslation(T, this);
+    t += T;
+  }
+
+  Frame::rotate(Quaternion& Q)
+  {
+    if (constraint())
+      constraint()->constrainRotation(Q, this);
+    q *= Q;
+  }
+  \endcode
+
+  The default behavior of constrainTranslation() and constrainRotation() is empty (meaning no
+  filtering).
+
+  The Frame which uses the Constraint is passed as a parameter to the constrainTranslation() and
+  constrainRotation() methods, so that they can have access to its current state (mainly
+  Frame::position() and Frame::orientation()). It is not \c const for versatility reasons, but
+  directly modifying it should be avoided.
+
+  \attention Frame::setTranslation(), Frame::setRotation() and similar methods will actually indeed
+  set the frame position and orientation, without taking the constraint into account. Use the \e
+  WithConstraint versions of these methods to enforce the Constraint.
+
+  <h3>Implemented Constraints</h3>
+
+  Classical axial and plane Constraints are provided for convenience: see the LocalConstraint,
+  WorldConstraint and CameraConstraint classes' documentations.
+
+  Try the <a href="../examples/constrainedFrame.html">constrainedFrame</a> and <a
+  href="../examples/constrainedCamera.html">constrainedCamera</a> examples for an illustration.
+
+  <h3>Creating new Constraints</h3>
+
+  The implementation of a new Constraint class simply consists in overloading the filtering methods:
+  \code
+  // This Constraint enforces that the Frame cannot have a negative z world coordinate.
+  class myConstraint : public Constraint
+  {
+  public:
+    virtual void constrainTranslation(Vec& t, Frame * const fr)
+      {
+        // Express t in the world coordinate system.
+        const Vec tWorld = fr->inverseTransformOf(t);
+	if (fr->position().z + tWorld.z < 0.0) // check the new fr z coordinate
+	  t.z = fr->transformOf(-fr->position().z); // t.z is clamped so that next z position is 0.0
+      }
+  };
+  \endcode
+
+  Note that the translation (resp. rotation) parameter passed to constrainTranslation() (resp.
+  constrainRotation()) is expressed in the \e local Frame coordinate system. Here, we use the
+  Frame::transformOf() and Frame::inverseTransformOf() method to convert it to and from the world
+  coordinate system.
+
+  Combined constraints can easily be achieved by creating a new class that applies the different
+  constraint filters:
+  \code
+  myConstraint::constrainTranslation(Vec& v, Frame* const fr)
+  {
+    constraint1->constrainTranslation(v, fr);
+    constraint2->constrainTranslation(v, fr);
+    // and so on, with possible branches, tests, loops...
+  }
+  \endcode
+  */
+  class Constraint
+  {
+  public:
+    /*! Virtual destructor. Empty. */
+    virtual ~Constraint() {};
+
+    /*! Filters the translation applied to the \p frame. This default implementation is empty (no
+      filtering).
+
+    Overload this method in your own Constraint class to define a new translation constraint. \p
+    frame is the Frame to which is applied the translation. It is not defined \c const, but you
+    should refrain from directly changing its value in the constraint. Use its Frame::position() and
+    update the \p translation accordingly instead.
+
+    \p translation is expressed in local frame coordinate system. Use Frame::inverseTransformOf() to
+    express it in the world coordinate system if needed. */
+    virtual void constrainTranslation(Vec& translation, Frame* const frame) { Q_UNUSED(translation); Q_UNUSED(frame); };
+    /*! Filters the rotation applied to the \p frame. This default implementation is empty (no
+      filtering).
+
+    Overload this method in your own Constraint class to define a new rotation constraint. See
+    constrainTranslation() for details.
+
+    Use Frame::inverseTransformOf() on the \p rotation Quaternion::axis() to express \p rotation in
+    the world coordinate system if needed. */
+    virtual void constrainRotation(Quaternion& rotation, Frame* const frame) { Q_UNUSED(rotation); Q_UNUSED(frame); };
+  };
+
+  /*!
+   \brief An abstract class for Frame Constraints defined by an axis or a plane.
+   \class AxisPlaneConstraint constraint.h QGLViewer/constraint.h
+
+   AxisPlaneConstraint is an interface for (translation and/or rotation) Constraint that are defined
+   by a direction. translationConstraintType() and rotationConstraintType() define how this
+   direction should be interpreted: as an axis (AxisPlaneConstraint::AXIS) or as a plane normal
+   (AxisPlaneConstraint::PLANE). See the Type() documentation for details.
+
+   The three implementations of this class: LocalConstraint, WorldConstraint and CameraConstraint
+   differ by the coordinate system in which this direction is expressed.
+
+   Different implementations of this class are illustrated in the
+   <a href="../examples/constrainedCamera.html">contrainedCamera</a> and
+   <a href="../examples/constrainedFrame.html">constrainedFrame</a> examples.
+
+   \attention When applied, the rotational Constraint may not intuitively follow the mouseQU
+   displacement. A solution would be to directly measure the rotation angle in screen coordinates,
+   but that would imply to know the QGLViewer::camera(), so that we can compute the projected
+   coordinates of the rotation center (as is done with the QGLViewer::SCREEN_ROTATE binding).
+   However, adding an extra pointer to the QGLViewer::camera() in all the AxisPlaneConstraint
+   derived classes (which the user would have to update in a multi-viewer application) was judged as
+   an overkill. */
+  class AxisPlaneConstraint : public Constraint
+  {
+  public:
+    AxisPlaneConstraint();
+    /*! Virtual destructor. Empty. */
+    virtual ~AxisPlaneConstraint() {};
+
+    /*! Type lists the different types of translation and rotation constraints that are available.
+
+    It specifies the meaning of the constraint direction (see translationConstraintDirection() and
+    rotationConstraintDirection()): as an axis direction (AxisPlaneConstraint::AXIS) or a plane
+    normal (AxisPlaneConstraint::PLANE). AxisPlaneConstraint::FREE means no constraint while
+    AxisPlaneConstraint::FORBIDDEN completely forbids the translation and/or the rotation.
+
+    See translationConstraintType() and rotationConstraintType().
+
+    \attention The AxisPlaneConstraint::PLANE Type is not valid for rotational constraint.
+
+    New derived classes can use their own extended enum for specific constraints:
+    \code
+    class MyAxisPlaneConstraint : public AxisPlaneConstraint
+    {
+    public:
+      enum MyType { FREE, AXIS, PLANE, FORBIDDEN, CUSTOM };
+      virtual void constrainTranslation(Vec &translation, Frame *const frame)
+      {
+        // translationConstraintType() is simply an int. CUSTOM Type is handled seamlessly.
+        switch (translationConstraintType())
+	{
+	case MyAxisPlaneConstraint::FREE: ... break;
+	case MyAxisPlaneConstraint::CUSTOM: ... break;
+	}
+      };
+
+      MyAxisPlaneConstraint* c = new MyAxisPlaneConstraint();
+      // Note the Type conversion
+      c->setTranslationConstraintType(AxisPlaneConstraint::Type(MyAxisPlaneConstraint::CUSTOM));
+    };
+    \endcode */
+    enum Type { FREE, AXIS, PLANE, FORBIDDEN };
+
+    /*! @name Translation constraint */
+    //@{
+    /*! Overloading of Constraint::constrainTranslation(). Empty */
+    virtual void constrainTranslation(Vec& translation, Frame* const frame) { Q_UNUSED(translation); Q_UNUSED(frame); };
+
+    void setTranslationConstraint(Type type, const Vec& direction);
+    /*! Sets the Type() of the translationConstraintType(). Default is AxisPlaneConstraint::FREE. */
+    void setTranslationConstraintType(Type type) { translationConstraintType_ = type; };
+    void setTranslationConstraintDirection(const Vec& direction);
+
+    /*! Returns the translation constraint Type().
+
+    Depending on this value, the Frame will freely translate (AxisPlaneConstraint::FREE), will only
+    be able to translate along an axis direction (AxisPlaneConstraint::AXIS), will be forced to stay
+    into a plane (AxisPlaneConstraint::PLANE) or will not able to translate at all
+    (AxisPlaneConstraint::FORBIDDEN).
+
+    Use Frame::setPosition() to define the position of the constrained Frame before it gets
+    constrained. */
+    Type translationConstraintType() const { return translationConstraintType_; };
+    /*! Returns the direction used by the translation constraint.
+
+    It represents the axis direction (AxisPlaneConstraint::AXIS) or the plane normal
+    (AxisPlaneConstraint::PLANE) depending on the translationConstraintType(). It is undefined for
+    AxisPlaneConstraint::FREE or AxisPlaneConstraint::FORBIDDEN.
+
+    The AxisPlaneConstraint derived classes express this direction in different coordinate system
+    (camera for CameraConstraint, local for LocalConstraint, and world for WorldConstraint). This
+    value can be modified with setTranslationConstraintDirection(). */
+    Vec translationConstraintDirection() const { return translationConstraintDir_; };
+    //@}
+
+    /*! @name Rotation constraint */
+    //@{
+    /*! Overloading of Constraint::constrainRotation(). Empty. */
+    virtual void constrainRotation(Quaternion& rotation, Frame* const frame) { Q_UNUSED(rotation); Q_UNUSED(frame); };
+
+    void setRotationConstraint(Type type, const Vec& direction);
+    void setRotationConstraintType(Type type);
+    void setRotationConstraintDirection(const Vec& direction);
+
+    /*! Returns the rotation constraint Type(). */
+    Type rotationConstraintType() const { return rotationConstraintType_; };
+    /*! Returns the axis direction used by the rotation constraint.
+
+    This direction is defined only when rotationConstraintType() is AxisPlaneConstraint::AXIS.
+
+    The AxisPlaneConstraint derived classes express this direction in different coordinate system
+    (camera for CameraConstraint, local for LocalConstraint, and world for WorldConstraint). This
+    value can be modified with setRotationConstraintDirection(). */
+    Vec rotationConstraintDirection() const { return rotationConstraintDir_; };
+    //@}
+
+  private:
+    // int and not Type to allow for overloading and new types definition.
+    Type translationConstraintType_;
+    Type rotationConstraintType_;
+
+    Vec translationConstraintDir_;
+    Vec rotationConstraintDir_;
+  };
+
+
+  /*! \brief An AxisPlaneConstraint defined in the Frame local coordinate system.
+  \class LocalConstraint constraint.h QGLViewer/constraint.h
+
+  The translationConstraintDirection() and rotationConstraintDirection() are expressed in the Frame
+  local coordinate system (see Frame::referenceFrame()).
+
+  See the <a href="../examples/constrainedFrame.html">constrainedFrame</a> example for an illustration. */
+  class LocalConstraint : public AxisPlaneConstraint
+  {
+  public:
+    /*! Virtual destructor. Empty. */
+    virtual ~LocalConstraint() {};
+
+    virtual void constrainTranslation(Vec&     translation, Frame* const frame);
+    virtual void constrainRotation   (Quaternion& rotation, Frame* const frame);
+  };
+
+
+
+  /*! \brief An AxisPlaneConstraint defined in the world coordinate system.
+    \class WorldConstraint constraint.h QGLViewer/constraint.h
+
+  The translationConstraintDirection() and rotationConstraintDirection() are expressed in world
+  coordinate system.
+
+  See the <a href="../examples/constrainedFrame.html">constrainedFrame</a> and <a
+  href="../examples/multiView.html">multiView</a> examples for an illustration. */
+  class WorldConstraint : public AxisPlaneConstraint
+  {
+  public:
+    /*! Virtual destructor. Empty. */
+    virtual ~WorldConstraint() {};
+
+    virtual void constrainTranslation(Vec&     translation, Frame* const frame);
+    virtual void constrainRotation   (Quaternion& rotation, Frame* const frame);
+  };
+
+
+
+  /*! \brief An AxisPlaneConstraint defined in the camera coordinate system.
+  \class CameraConstraint constraint.h QGLViewer/constraint.h
+
+  The translationConstraintDirection() and rotationConstraintDirection() are expressed in the
+  associated camera() coordinate system.
+
+  See the <a href="../examples/constrainedFrame.html">constrainedFrame</a> and <a
+  href="../examples/constrainedCamera.html">constrainedCamera</a> examples for an illustration. */
+  class CameraConstraint : public AxisPlaneConstraint
+  {
+  public:
+    explicit CameraConstraint(const Camera* const camera);
+    /*! Virtual destructor. Empty. */
+    virtual ~CameraConstraint() {};
+
+    virtual void constrainTranslation(Vec&     translation, Frame* const frame);
+    virtual void constrainRotation   (Quaternion& rotation, Frame* const frame);
+
+    /*! Returns the associated Camera. Set using the CameraConstraint constructor. */
+    const Camera* camera() const { return camera_; };
+
+  private:
+    const Camera* const camera_;
+  };
+
+//} // namespace qglviewer
+
+#endif // QGLVIEWER_CONSTRAINT_H
diff --git a/source/blender/freestyle/intern/app_blender/frame.cpp b/source/blender/freestyle/intern/app_blender/frame.cpp
new file mode 100644
index 00000000000..26c2ee5d2b4
--- /dev/null
+++ b/source/blender/freestyle/intern/app_blender/frame.cpp
@@ -0,0 +1,1070 @@
+/****************************************************************************
+
+ Copyright (C) 2002-2007 Gilles Debunne (Gilles.Debunne@imag.fr)
+
+ This file is part of the QGLViewer library.
+ Version 2.2.6-3, released on August 28, 2007.
+
+ http://artis.imag.fr/Members/Gilles.Debunne/QGLViewer
+
+ libQGLViewer 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.
+
+ libQGLViewer 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 libQGLViewer; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*****************************************************************************/
+
+#include "frame.h"
+#include <math.h>
+
+//using namespace qglviewer;
+using namespace std;
+
+
+/*! Creates a default Frame.
+
+  Its position() is (0,0,0) and it has an identity orientation() Quaternion. The referenceFrame()
+  and the constraint() are \c NULL. */
+Frame::Frame()
+  : constraint_(NULL), referenceFrame_(NULL)
+{}
+
+/*! Creates a Frame with a position() and an orientation().
+
+ See the Vec and Quaternion documentations for convenient constructors and methods.
+
+ The Frame is defined in the world coordinate system (its referenceFrame() is \c NULL). It
+ has a \c NULL associated constraint(). */
+Frame::Frame(const Vec& position, const Quaternion& orientation)
+  : t_(position), q_(orientation), constraint_(NULL), referenceFrame_(NULL)
+{}
+
+/*! Equal operator.
+
+  The referenceFrame() and constraint() pointers are copied.
+
+  \attention Signal and slot connections are not copied. */
+Frame& Frame::operator=(const Frame& frame)
+{
+  // Automatic compiler generated version would not emit the modified signals as is done in
+  // setTranslationAndRotation.
+  setTranslationAndRotation(frame.translation(), frame.rotation());
+  setConstraint(frame.constraint());
+  setReferenceFrame(frame.referenceFrame());
+  return *this;
+}
+
+/*! Copy constructor.
+
+  The translation() and rotation() as well as constraint() and referenceFrame() pointers are
+  copied. */
+Frame::Frame(const Frame& frame)
+{
+  (*this) = frame;
+}
+
+/////////////////////////////// MATRICES //////////////////////////////////////
+
+/*! Returns the 4x4 OpenGL transformation matrix represented by the Frame.
+
+  This method should be used in conjunction with \c glMultMatrixd() to modify the OpenGL modelview
+  matrix from a Frame hierarchy. With this Frame hierarchy:
+  \code
+  Frame* body     = new Frame();
+  Frame* leftArm  = new Frame();
+  Frame* rightArm = new Frame();
+  leftArm->setReferenceFrame(body);
+  rightArm->setReferenceFrame(body);
+  \endcode
+
+  The associated OpenGL drawing code should look like:
+  \code
+  void Viewer::draw()
+  {
+    glPushMatrix();
+    glMultMatrixd(body->matrix());
+    drawBody();
+
+    glPushMatrix();
+    glMultMatrixd(leftArm->matrix());
+    drawArm();
+    glPopMatrix();
+
+    glPushMatrix();
+    glMultMatrixd(rightArm->matrix());
+    drawArm();
+    glPopMatrix();
+
+    glPopMatrix();
+  }
+  \endcode
+  Note the use of nested \c glPushMatrix() and \c glPopMatrix() blocks to represent the frame hierarchy: \c
+  leftArm and \c rightArm are both correctly drawn with respect to the \c body coordinate system.
+
+  This matrix only represents the local Frame transformation (i.e. with respect to the
+  referenceFrame()). Use worldMatrix() to get the full Frame transformation matrix (i.e. from the
+  world to the Frame coordinate system). These two match when the referenceFrame() is \c NULL.
+
+  The result is only valid until the next call to matrix(), getMatrix(), worldMatrix() or
+  getWorldMatrix(). Use it immediately (as above) or use getMatrix() instead.
+
+  \attention The OpenGL format of the result is the transpose of the actual mathematical European
+  representation (translation is on the last \e line instead of the last \e column).
+
+  \note The scaling factor of the 4x4 matrix is 1.0. */
+const GLdouble* Frame::matrix() const
+{
+  static GLdouble m[4][4];
+  getMatrix(m);
+  return (const GLdouble*)(m);
+}
+
+/*! \c GLdouble[4][4] version of matrix(). See also getWorldMatrix() and matrix(). */
+void Frame::getMatrix(GLdouble m[4][4]) const
+{
+  q_.getMatrix(m);
+
+  m[3][0] = t_[0];
+  m[3][1] = t_[1];
+  m[3][2] = t_[2];
+}
+
+/*! \c GLdouble[16] version of matrix(). See also getWorldMatrix() and matrix(). */
+void Frame::getMatrix(GLdouble m[16]) const
+{
+  q_.getMatrix(m);
+
+  m[12] = t_[0];
+  m[13] = t_[1];
+  m[14] = t_[2];
+}
+
+/*! Returns a Frame representing the inverse of the Frame space transformation.
+
+  The rotation() of the new Frame is the Quaternion::inverse() of the original rotation.
+  Its translation() is the negated inverse rotated image of the original translation.
+
+  If a Frame is considered as a space rigid transformation (translation and rotation), the inverse()
+  Frame performs the inverse transformation.
+
+  Only the local Frame transformation (i.e. defined with respect to the referenceFrame()) is inverted.
+  Use worldInverse() for a global inverse.
+
+  The resulting Frame has the same referenceFrame() as the Frame and a \c NULL constraint().
+
+  \note The scaling factor of the 4x4 matrix is 1.0. */
+Frame Frame::inverse() const
+{
+  Frame fr(-(q_.inverseRotate(t_)), q_.inverse());
+  fr.setReferenceFrame(referenceFrame());
+  return fr;
+}
+
+/*! Returns the 4x4 OpenGL transformation matrix represented by the Frame.
+
+  This method should be used in conjunction with \c glMultMatrixd() to modify
+  the OpenGL modelview matrix from a Frame:
+  \code
+  // The modelview here corresponds to the world coordinate system.
+  Frame fr(pos, Quaternion(from, to));
+  glPushMatrix();
+  glMultMatrixd(fr.worldMatrix());
+  // draw object in the fr coordinate system.
+  glPopMatrix();
+  \endcode
+
+  This matrix represents the global Frame transformation: the entire referenceFrame() hierarchy is
+  taken into account to define the Frame transformation from the world coordinate system. Use
+  matrix() to get the local Frame transformation matrix (i.e. defined with respect to the
+  referenceFrame()). These two match when the referenceFrame() is \c NULL.
+
+  The OpenGL format of the result is the transpose of the actual mathematical European
+  representation (translation is on the last \e line instead of the last \e column).
+
+  \attention The result is only valid until the next call to matrix(), getMatrix(), worldMatrix() or
+  getWorldMatrix(). Use it immediately (as above) or use getWorldMatrix() instead.
+
+  \note The scaling factor of the 4x4 matrix is 1.0. */
+const GLdouble* Frame::worldMatrix() const
+{
+  // This test is done for efficiency reasons (creates lots of temp objects otherwise).
+  if (referenceFrame())
+  {
+    static Frame fr;
+    fr.setTranslation(position());
+    fr.setRotation(orientation());
+    return fr.matrix();
+  }
+  else
+    return matrix();
+}
+
+/*! float[4][4] parameter version of worldMatrix(). See also getMatrix() and matrix(). */
+void Frame::getWorldMatrix(GLdouble m[4][4]) const
+{
+  const GLdouble* mat = worldMatrix();
+  for (int i=0; i<4; ++i)
+    for (int j=0; j<4; ++j)
+      m[i][j] = mat[i*4+j];
+}
+
+/*! float[16] parameter version of worldMatrix(). See also getMatrix() and matrix(). */
+void Frame::getWorldMatrix(GLdouble m[16]) const
+{
+  const GLdouble* mat = worldMatrix();
+  for (int i=0; i<16; ++i)
+      m[i] = mat[i];
+}
+
+/*! This is an overloaded method provided for convenience. Same as setFromMatrix(). */
+void Frame::setFromMatrix(const GLdouble m[4][4])
+{
+  if (fabs(m[3][3]) < 1E-8)
+    {
+      cout << "Frame::setFromMatrix: Null homogeneous coefficient" << endl;
+      return;
+    }
+
+  double rot[3][3];
+  for (int i=0; i<3; ++i)
+    {
+      t_[i] = m[3][i] / m[3][3];
+      for (int j=0; j<3; ++j)
+	// Beware of the transposition (OpenGL to European math)
+	rot[i][j] = m[j][i] / m[3][3];
+    }
+  q_.setFromRotationMatrix(rot);
+}
+
+/*! Sets the Frame from an OpenGL matrix representation (rotation in the upper left 3x3 matrix and
+ translation on the last line).
+
+ Hence, if a code fragment looks like:
+ \code
+ GLdouble m[16]={...};
+ glMultMatrixd(m);
+ \endcode
+ It is equivalent to write:
+ \code
+ Frame fr;
+ fr.setFromMatrix(m);
+ glMultMatrixd(fr.matrix());
+ \endcode
+
+ Using this conversion, you can benefit from the powerful Frame transformation methods to translate
+ points and vectors to and from the Frame coordinate system to any other Frame coordinate system
+ (including the world coordinate system). See coordinatesOf() and transformOf().
+
+ Emits the modified() signal. See also matrix(), getMatrix() and
+ Quaternion::setFromRotationMatrix().
+
+ \attention A Frame does not contain a scale factor. The possible scaling in \p m will not be
+ converted into the Frame by this method. */
+void Frame::setFromMatrix(const GLdouble m[16])
+{
+  GLdouble mat[4][4];
+  for (int i=0; i<4; ++i)
+    for (int j=0; j<4; ++j)
+      mat[i][j] = m[i*4+j];
+  setFromMatrix(mat);
+}
+
+//////////////////// SET AND GET LOCAL TRANSLATION AND ROTATION ///////////////////////////////
+
+
+/*! Same as setTranslation(), but with \p float parameters. */
+void Frame::setTranslation(float x, float y, float z)
+{
+  setTranslation(Vec(x, y, z));
+}
+
+/*! Fill \c x, \c y and \c z with the translation() of the Frame. */
+void Frame::getTranslation(float& x, float& y, float& z) const
+{
+  const Vec t = translation();
+  x = t[0];
+  y = t[1];
+  z = t[2];
+}
+
+/*! Same as setRotation() but with \c float Quaternion parameters. */
+void Frame::setRotation(double q0, double q1, double q2, double q3)
+{
+  setRotation(Quaternion(q0, q1, q2, q3));
+}
+
+/*! The \p q are set to the rotation() of the Frame.
+
+See Quaternion::Quaternion(double, double, double, double) for details on \c q. */
+void Frame::getRotation(double& q0, double& q1, double& q2, double& q3) const
+{
+  const Quaternion q = rotation();
+  q0 = q[0];
+  q1 = q[1];
+  q2 = q[2];
+  q3 = q[3];
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+/*! Translates the Frame of \p t (defined in the Frame coordinate system).
+
+  The translation actually applied to the Frame may differ from \p t since it can be filtered by the
+  constraint(). Use translate(Vec&) or setTranslationWithConstraint() to retrieve the filtered
+  translation value. Use setTranslation() to directly translate the Frame without taking the
+  constraint() into account.
+
+  See also rotate(const Quaternion&). Emits the modified() signal. */
+void Frame::translate(const Vec& t)
+{
+  Vec tbis = t;
+  translate(tbis);
+}
+
+/*! Same as translate(const Vec&) but \p t may be modified to satisfy the translation constraint().
+  Its new value corresponds to the translation that has actually been applied to the Frame. */
+void Frame::translate(Vec& t)
+{
+  if (constraint())
+    constraint()->constrainTranslation(t, this);
+  t_ += t;
+}
+
+/*! Same as translate(const Vec&) but with \c float parameters. */
+void Frame::translate(float x, float y, float z)
+{
+  Vec t(x,y,z);
+  translate(t);
+}
+
+/*! Same as translate(Vec&) but with \c float parameters. */
+void Frame::translate(float& x, float& y, float& z)
+{
+  Vec t(x,y,z);
+  translate(t);
+  x = t[0];
+  y = t[1];
+  z = t[2];
+}
+
+/*! Rotates the Frame by \p q (defined in the Frame coordinate system): R = R*q.
+
+  The rotation actually applied to the Frame may differ from \p q since it can be filtered by the
+  constraint(). Use rotate(Quaternion&) or setRotationWithConstraint() to retrieve the filtered
+  rotation value. Use setRotation() to directly rotate the Frame without taking the constraint()
+  into account.
+
+  See also translate(const Vec&). Emits the modified() signal. */
+void Frame::rotate(const Quaternion& q)
+{
+  Quaternion qbis = q;
+  rotate(qbis);
+}
+
+/*! Same as rotate(const Quaternion&) but \p q may be modified to satisfy the rotation constraint().
+  Its new value corresponds to the rotation that has actually been applied to the Frame. */
+void Frame::rotate(Quaternion& q)
+{
+  if (constraint())
+    constraint()->constrainRotation(q, this);
+  q_ *= q;
+  q_.normalize(); // Prevents numerical drift
+}
+
+/*! Same as rotate(Quaternion&) but with \c float Quaternion parameters. */
+void Frame::rotate(double& q0, double& q1, double& q2, double& q3)
+{
+  Quaternion q(q0,q1,q2,q3);
+  rotate(q);
+  q0 = q[0];
+  q1 = q[1];
+  q2 = q[2];
+  q3 = q[3];
+}
+
+/*! Same as rotate(const Quaternion&) but with \c float Quaternion parameters. */
+void Frame::rotate(double q0, double q1, double q2, double q3)
+{
+  Quaternion q(q0,q1,q2,q3);
+  rotate(q);
+}
+
+/*! Makes the Frame rotate() by \p rotation around \p point.
+
+  \p point is defined in the world coordinate system, while the \p rotation axis is defined in the
+  Frame coordinate system.
+
+  If the Frame has a constraint(), \p rotation is first constrained using
+  Constraint::constrainRotation(). The translation which results from the filtered rotation around
+  \p point is then computed and filtered using Constraint::constrainTranslation(). The new \p
+  rotation value corresponds to the rotation that has actually been applied to the Frame.
+
+  Emits the modified() signal. */
+void Frame::rotateAroundPoint(Quaternion& rotation, const Vec& point)
+{
+  if (constraint())
+    constraint()->constrainRotation(rotation, this);
+  q_ *= rotation;
+  q_.normalize(); // Prevents numerical drift
+  Vec trans = point + Quaternion(inverseTransformOf(rotation.axis()), rotation.angle()).rotate(position()-point) - t_;
+  if (constraint())
+    constraint()->constrainTranslation(trans, this);
+  t_ += trans;
+}
+
+/*! Same as rotateAroundPoint(), but with a \c const \p rotation Quaternion. Note that the actual
+  rotation may differ since it can be filtered by the constraint(). */
+void Frame::rotateAroundPoint(const Quaternion& rotation, const Vec& point)
+{
+  Quaternion rot = rotation;
+  rotateAroundPoint(rot, point);
+}
+
+//////////////////// SET AND GET WORLD POSITION AND ORIENTATION ///////////////////////////////
+
+/*! Sets the position() of the Frame, defined in the world coordinate system. Emits the modified()
+  signal.
+
+Use setTranslation() to define the \e local frame translation (with respect to the
+referenceFrame()). The potential constraint() of the Frame is not taken into account, use
+setPositionWithConstraint() instead. */
+void Frame::setPosition(const Vec& position)
+{
+  if (referenceFrame())
+    setTranslation(referenceFrame()->coordinatesOf(position));
+  else
+    setTranslation(position);
+}
+
+/*! Same as setPosition(), but with \c float parameters. */
+void Frame::setPosition(float x, float y, float z)
+{
+  setPosition(Vec(x, y, z));
+}
+
+/*! Same as successive calls to setPosition() and then setOrientation().
+
+Only one modified() signal is emitted, which is convenient if this signal is connected to a
+QGLViewer::updateGL() slot. See also setTranslationAndRotation() and
+setPositionAndOrientationWithConstraint(). */
+void Frame::setPositionAndOrientation(const Vec& position, const Quaternion& orientation)
+{
+  if (referenceFrame())
+    {
+      t_ = referenceFrame()->coordinatesOf(position);
+      q_ = referenceFrame()->orientation().inverse() * orientation;
+    }
+  else
+    {
+      t_ = position;
+      q_ = orientation;
+    }
+}
+
+
+/*! Same as successive calls to setTranslation() and then setRotation().
+
+Only one modified() signal is emitted, which is convenient if this signal is connected to a
+QGLViewer::updateGL() slot. See also setPositionAndOrientation() and
+setTranslationAndRotationWithConstraint(). */
+void Frame::setTranslationAndRotation(const Vec& translation, const Quaternion& rotation)
+{
+  t_ = translation;
+  q_ = rotation;
+}
+
+
+/*! \p x, \p y and \p z are set to the position() of the Frame. */
+void Frame::getPosition(float& x, float& y, float& z) const
+{
+  Vec p = position();
+  x = p.x;
+  y = p.y;
+  z = p.z;
+}
+
+/*! Sets the orientation() of the Frame, defined in the world coordinate system. Emits the modified() signal.
+
+Use setRotation() to define the \e local frame rotation (with respect to the referenceFrame()). The
+potential constraint() of the Frame is not taken into account, use setOrientationWithConstraint()
+instead. */
+void Frame::setOrientation(const Quaternion& orientation)
+{
+  if (referenceFrame())
+    setRotation(referenceFrame()->orientation().inverse() * orientation);
+  else
+    setRotation(orientation);
+}
+
+/*! Same as setOrientation(), but with \c float parameters. */
+void Frame::setOrientation(double q0, double q1, double q2, double q3)
+{
+  setOrientation(Quaternion(q0, q1, q2, q3));
+}
+
+/*! Get the current orientation of the frame (same as orientation()).
+  Parameters are the orientation Quaternion values.
+  See also setOrientation(). */
+
+/*! The \p q are set to the orientation() of the Frame.
+
+See Quaternion::Quaternion(double, double, double, double) for details on \c q. */
+void Frame::getOrientation(double& q0, double& q1, double& q2, double& q3) const
+{
+  Quaternion o = orientation();
+  q0 = o[0];
+  q1 = o[1];
+  q2 = o[2];
+  q3 = o[3];
+}
+
+/*! Returns the orientation of the Frame, defined in the world coordinate system. See also
+  position(), setOrientation() and rotation(). */
+Quaternion Frame::orientation() const
+{
+  Quaternion res = rotation();
+  const Frame* fr = referenceFrame();
+  while (fr != NULL)
+    {
+      res = fr->rotation() * res;
+      fr  = fr->referenceFrame();
+    }
+  return res;
+}
+
+
+////////////////////// C o n s t r a i n t   V e r s i o n s  //////////////////////////
+
+/*! Same as setTranslation(), but \p translation is modified so that the potential constraint() of the
+  Frame is satisfied.
+
+  Emits the modified() signal. See also setRotationWithConstraint() and setPositionWithConstraint(). */
+void Frame::setTranslationWithConstraint(Vec& translation)
+{
+  Vec deltaT = translation - this->translation();
+  if (constraint())
+    constraint()->constrainTranslation(deltaT, this);
+
+  setTranslation(this->translation() + deltaT);
+  translation = this->translation();
+}
+
+/*! Same as setRotation(), but \p rotation is modified so that the potential constraint() of the
+  Frame is satisfied.
+
+  Emits the modified() signal. See also setTranslationWithConstraint() and setOrientationWithConstraint(). */
+void Frame::setRotationWithConstraint(Quaternion& rotation)
+{
+  Quaternion deltaQ = this->rotation().inverse() * rotation;
+  if (constraint())
+    constraint()->constrainRotation(deltaQ, this);
+
+  // Prevent numerical drift
+  deltaQ.normalize();
+
+  setRotation(this->rotation() * deltaQ);
+  q_.normalize();
+  rotation = this->rotation();
+}
+
+/*! Same as setTranslationAndRotation(), but \p translation and \p orientation are modified to
+  satisfy the constraint(). Emits the modified() signal. */
+void Frame::setTranslationAndRotationWithConstraint(Vec& translation, Quaternion& rotation)
+{
+  Vec deltaT = translation - this->translation();
+  Quaternion deltaQ = this->rotation().inverse() * rotation;
+
+  if (constraint())
+    {
+      constraint()->constrainTranslation(deltaT, this);
+      constraint()->constrainRotation(deltaQ, this);
+    }
+
+  // Prevent numerical drift
+  deltaQ.normalize();
+
+  t_ += deltaT;
+  q_ *= deltaQ;
+  q_.normalize();
+
+  translation = this->translation();
+  rotation = this->rotation();
+
+}
+
+/*! Same as setPosition(), but \p position is modified so that the potential constraint() of the
+  Frame is satisfied. See also setOrientationWithConstraint() and setTranslationWithConstraint(). */
+void Frame::setPositionWithConstraint(Vec& position)
+{
+  if (referenceFrame())
+    position = referenceFrame()->coordinatesOf(position);
+
+  setTranslationWithConstraint(position);
+}
+
+/*! Same as setOrientation(), but \p orientation is modified so that the potential constraint() of the Frame
+  is satisfied. See also setPositionWithConstraint() and setRotationWithConstraint(). */
+void Frame::setOrientationWithConstraint(Quaternion& orientation)
+{
+  if (referenceFrame())
+    orientation = referenceFrame()->orientation().inverse() * orientation;
+
+  setRotationWithConstraint(orientation);
+}
+
+/*! Same as setPositionAndOrientation() but \p position and \p orientation are modified to satisfy
+the constraint. Emits the modified() signal. */
+void Frame::setPositionAndOrientationWithConstraint(Vec& position, Quaternion& orientation)
+{
+  if (referenceFrame())
+    {
+      position = referenceFrame()->coordinatesOf(position);
+      orientation = referenceFrame()->orientation().inverse() * orientation;
+    }
+  setTranslationAndRotationWithConstraint(position, orientation);
+}
+
+
+///////////////////////////// REFERENCE FRAMES ///////////////////////////////////////
+
+/*! Sets the referenceFrame() of the Frame.
+
+The Frame translation() and rotation() are then defined in the referenceFrame() coordinate system.
+Use position() and orientation() to express these in the world coordinate system.
+
+Emits the modified() signal if \p refFrame differs from the current referenceFrame().
+
+Using this method, you can create a hierarchy of Frames. This hierarchy needs to be a tree, which
+root is the world coordinate system (i.e. a \c NULL referenceFrame()). A warning is printed and no
+action is performed if setting \p refFrame as the referenceFrame() would create a loop in the Frame
+hierarchy (see settingAsReferenceFrameWillCreateALoop()). */
+void Frame::setReferenceFrame(const Frame* const refFrame)
+{
+  if (settingAsReferenceFrameWillCreateALoop(refFrame))
+    cout << "Frame::setReferenceFrame would create a loop in Frame hierarchy" << endl;
+  else
+    {
+      bool identical = (referenceFrame_ == refFrame);
+      referenceFrame_ = refFrame;
+    }
+}
+
+/*! Returns \c true if setting \p frame as the Frame's referenceFrame() would create a loop in the
+  Frame hierarchy. */
+bool Frame::settingAsReferenceFrameWillCreateALoop(const Frame* const frame)
+{
+  const Frame* f = frame;
+  while (f != NULL)
+    {
+      if (f == this)
+	return true;
+      f = f->referenceFrame();
+    }
+  return false;
+}
+
+///////////////////////// FRAME TRANSFORMATIONS OF 3D POINTS //////////////////////////////
+
+/*! Returns the Frame coordinates of a point \p src defined in the world coordinate system (converts
+ from world to Frame).
+
+ inverseCoordinatesOf() performs the inverse convertion. transformOf() converts 3D vectors instead
+ of 3D coordinates.
+
+ See the <a href="../examples/frameTransform.html">frameTransform example</a> for an
+ illustration. */
+Vec Frame::coordinatesOf(const Vec& src) const
+{
+  if (referenceFrame())
+    return localCoordinatesOf(referenceFrame()->coordinatesOf(src));
+  else
+    return localCoordinatesOf(src);
+}
+
+/*! Returns the world coordinates of the point whose position in the Frame coordinate system is \p
+  src (converts from Frame to world).
+
+  coordinatesOf() performs the inverse convertion. Use inverseTransformOf() to transform 3D vectors
+  instead of 3D coordinates. */
+Vec Frame::inverseCoordinatesOf(const Vec& src) const
+{
+  const Frame* fr = this;
+  Vec res = src;
+  while (fr != NULL)
+    {
+      res = fr->localInverseCoordinatesOf(res);
+      fr  = fr->referenceFrame();
+    }
+  return res;
+}
+
+/*! Returns the Frame coordinates of a point \p src defined in the referenceFrame() coordinate
+  system (converts from referenceFrame() to Frame).
+
+  localInverseCoordinatesOf() performs the inverse convertion. See also localTransformOf(). */
+Vec Frame::localCoordinatesOf(const Vec& src) const
+{
+  return rotation().inverseRotate(src - translation());
+}
+
+/*! Returns the referenceFrame() coordinates of a point \p src defined in the Frame coordinate
+ system (converts from Frame to referenceFrame()).
+
+ localCoordinatesOf() performs the inverse convertion. See also localInverseTransformOf(). */
+Vec Frame::localInverseCoordinatesOf(const Vec& src) const
+{
+  return rotation().rotate(src) + translation();
+}
+
+/*! Returns the Frame coordinates of the point whose position in the \p from coordinate system is \p
+  src (converts from \p from to Frame).
+
+  coordinatesOfIn() performs the inverse transformation. */
+Vec Frame::coordinatesOfFrom(const Vec& src, const Frame* const from) const
+{
+  if (this == from)
+    return src;
+  else
+    if (referenceFrame())
+      return localCoordinatesOf(referenceFrame()->coordinatesOfFrom(src, from));
+    else
+      return localCoordinatesOf(from->inverseCoordinatesOf(src));
+}
+
+/*! Returns the \p in coordinates of the point whose position in the Frame coordinate system is \p
+  src (converts from Frame to \p in).
+
+  coordinatesOfFrom() performs the inverse transformation. */
+Vec Frame::coordinatesOfIn(const Vec& src, const Frame* const in) const
+{
+  const Frame* fr = this;
+  Vec res = src;
+  while ((fr != NULL) && (fr != in))
+    {
+      res = fr->localInverseCoordinatesOf(res);
+      fr  = fr->referenceFrame();
+    }
+
+  if (fr != in)
+    // in was not found in the branch of this, res is now expressed in the world
+    // coordinate system. Simply convert to in coordinate system.
+    res = in->coordinatesOf(res);
+
+  return res;
+}
+
+////// float[3] versions
+
+/*! Same as coordinatesOf(), but with \c float parameters. */
+void Frame::getCoordinatesOf(const float src[3], float res[3]) const
+{
+  const Vec r = coordinatesOf(Vec(src));
+  for (int i=0; i<3 ; ++i)
+    res[i] = r[i];
+}
+
+/*! Same as inverseCoordinatesOf(), but with \c float parameters. */
+void Frame::getInverseCoordinatesOf(const float src[3], float res[3]) const
+{
+  const Vec r = inverseCoordinatesOf(Vec(src));
+  for (int i=0; i<3 ; ++i)
+    res[i] = r[i];
+}
+
+/*! Same as localCoordinatesOf(), but with \c float parameters. */
+void Frame::getLocalCoordinatesOf(const float src[3], float res[3]) const
+{
+  const Vec r = localCoordinatesOf(Vec(src));
+  for (int i=0; i<3 ; ++i)
+    res[i] = r[i];
+}
+
+  /*! Same as localInverseCoordinatesOf(), but with \c float parameters. */
+void Frame::getLocalInverseCoordinatesOf(const float src[3], float res[3]) const
+{
+  const Vec r = localInverseCoordinatesOf(Vec(src));
+  for (int i=0; i<3 ; ++i)
+    res[i] = r[i];
+}
+
+/*! Same as coordinatesOfIn(), but with \c float parameters. */
+void Frame::getCoordinatesOfIn(const float src[3], float res[3], const Frame* const in) const
+{
+  const Vec r = coordinatesOfIn(Vec(src), in);
+  for (int i=0; i<3 ; ++i)
+    res[i] = r[i];
+}
+
+/*! Same as coordinatesOfFrom(), but with \c float parameters. */
+void Frame::getCoordinatesOfFrom(const float src[3], float res[3], const Frame* const from) const
+{
+  const Vec r = coordinatesOfFrom(Vec(src), from);
+  for (int i=0; i<3 ; ++i)
+    res[i] = r[i];
+}
+
+
+///////////////////////// FRAME TRANSFORMATIONS OF VECTORS //////////////////////////////
+
+/*! Returns the Frame transform of a vector \p src defined in the world coordinate system (converts
+ vectors from world to Frame).
+
+ inverseTransformOf() performs the inverse transformation. coordinatesOf() converts 3D coordinates
+ instead of 3D vectors (here only the rotational part of the transformation is taken into account).
+
+ See the <a href="../examples/frameTransform.html">frameTransform example</a> for an
+ illustration. */
+Vec Frame::transformOf(const Vec& src) const
+{
+  if (referenceFrame())
+    return localTransformOf(referenceFrame()->transformOf(src));
+  else
+    return localTransformOf(src);
+}
+
+/*! Returns the world transform of the vector whose coordinates in the Frame coordinate
+  system is \p src (converts vectors from Frame to world).
+
+  transformOf() performs the inverse transformation. Use inverseCoordinatesOf() to transform 3D
+  coordinates instead of 3D vectors. */
+Vec Frame::inverseTransformOf(const Vec& src) const
+{
+  const Frame* fr = this;
+  Vec res = src;
+  while (fr != NULL)
+    {
+      res = fr->localInverseTransformOf(res);
+      fr  = fr->referenceFrame();
+    }
+  return res;
+}
+
+/*! Returns the Frame transform of a vector \p src defined in the referenceFrame() coordinate system
+  (converts vectors from referenceFrame() to Frame).
+
+  localInverseTransformOf() performs the inverse transformation. See also localCoordinatesOf(). */
+Vec Frame::localTransformOf(const Vec& src) const
+{
+  return rotation().inverseRotate(src);
+}
+
+/*! Returns the referenceFrame() transform of a vector \p src defined in the Frame coordinate
+ system (converts vectors from Frame to referenceFrame()).
+
+ localTransformOf() performs the inverse transformation. See also localInverseCoordinatesOf(). */
+Vec Frame::localInverseTransformOf(const Vec& src) const
+{
+  return rotation().rotate(src);
+}
+
+/*! Returns the Frame transform of the vector whose coordinates in the \p from coordinate system is \p
+  src (converts vectors from \p from to Frame).
+
+  transformOfIn() performs the inverse transformation. */
+Vec Frame::transformOfFrom(const Vec& src, const Frame* const from) const
+{
+  if (this == from)
+    return src;
+  else
+    if (referenceFrame())
+      return localTransformOf(referenceFrame()->transformOfFrom(src, from));
+    else
+      return localTransformOf(from->inverseTransformOf(src));
+}
+
+/*! Returns the \p in transform of the vector whose coordinates in the Frame coordinate system is \p
+  src (converts vectors from Frame to \p in).
+
+  transformOfFrom() performs the inverse transformation. */
+Vec Frame::transformOfIn(const Vec& src, const Frame* const in) const
+{
+  const Frame* fr = this;
+  Vec    res = src;
+  while ((fr != NULL) && (fr != in))
+    {
+      res = fr->localInverseTransformOf(res);
+      fr  = fr->referenceFrame();
+    }
+
+  if (fr != in)
+    // in was not found in the branch of this, res is now expressed in the world
+    // coordinate system. Simply convert to in coordinate system.
+    res = in->transformOf(res);
+
+  return res;
+}
+
+/////////////////  float[3] versions  //////////////////////
+
+/*! Same as transformOf(), but with \c float parameters. */
+void Frame::getTransformOf(const float src[3], float res[3]) const
+{
+  Vec r = transformOf(Vec(src));
+  for (int i=0; i<3 ; ++i)
+    res[i] = r[i];
+}
+
+/*! Same as inverseTransformOf(), but with \c float parameters. */
+void Frame::getInverseTransformOf(const float src[3], float res[3]) const
+{
+  Vec r = inverseTransformOf(Vec(src));
+  for (int i=0; i<3 ; ++i)
+    res[i] = r[i];
+}
+
+/*! Same as localTransformOf(), but with \c float parameters. */
+void Frame::getLocalTransformOf(const float src[3], float res[3]) const
+{
+  Vec r = localTransformOf(Vec(src));
+  for (int i=0; i<3 ; ++i)
+    res[i] = r[i];
+}
+
+/*! Same as localInverseTransformOf(), but with \c float parameters. */
+void Frame::getLocalInverseTransformOf(const float src[3], float res[3]) const
+{
+  Vec r = localInverseTransformOf(Vec(src));
+  for (int i=0; i<3 ; ++i)
+    res[i] = r[i];
+}
+
+/*! Same as transformOfIn(), but with \c float parameters. */
+void Frame::getTransformOfIn(const float src[3], float res[3], const Frame* const in) const
+{
+  Vec r = transformOfIn(Vec(src), in);
+  for (int i=0; i<3 ; ++i)
+    res[i] = r[i];
+}
+
+/*! Same as transformOfFrom(), but with \c float parameters. */
+void Frame::getTransformOfFrom(const float src[3], float res[3], const Frame* const from) const
+{
+  Vec r = transformOfFrom(Vec(src), from);
+  for (int i=0; i<3 ; ++i)
+    res[i] = r[i];
+}
+
+/////////////////////////////////   ALIGN   /////////////////////////////////
+
+/*! Aligns the Frame with \p frame, so that two of their axis are parallel.
+
+If one of the X, Y and Z axis of the Frame is almost parallel to any of the X, Y, or Z axis of \p
+frame, the Frame is rotated so that these two axis actually become parallel.
+
+If, after this first rotation, two other axis are also almost parallel, a second alignment is
+performed. The two frames then have identical orientations, up to 90 degrees rotations.
+
+\p threshold measures how close two axis must be to be considered parallel. It is compared with the
+absolute values of the dot product of the normalized axis.
+
+When \p move is set to \c true, the Frame position() is also affected by the alignment. The new
+Frame position() is such that the \p frame position (computed with coordinatesOf(), in the Frame
+coordinates system) does not change.
+
+\p frame may be \c NULL and then represents the world coordinate system (same convention than for
+the referenceFrame()).
+
+The rotation (and translation when \p move is \c true) applied to the Frame are filtered by the
+possible constraint(). */
+void Frame::alignWithFrame(const Frame* const frame, bool move, float threshold)
+{
+  Vec directions[2][3];
+  for (int d=0; d<3; ++d)
+    {
+      Vec dir((d==0)? 1.0 : 0.0, (d==1)? 1.0 : 0.0, (d==2)? 1.0 : 0.0);
+      if (frame)
+	directions[0][d] = frame->inverseTransformOf(dir);
+      else
+	directions[0][d] = dir;
+      directions[1][d] = inverseTransformOf(dir);
+    }
+
+  float maxProj = 0.0f;
+  float proj;
+  unsigned short index[2];
+  index[0] = index[1] = 0;
+  for (int i=0; i<3; ++i)
+    for (int j=0; j<3; ++j)
+      if ( (proj=fabs(directions[0][i]*directions[1][j])) >= maxProj )
+	{
+	  index[0] = i;
+	  index[1] = j;
+	  maxProj  = proj;
+	}
+
+  Frame old;
+  old=*this;
+
+  float coef = directions[0][index[0]] * directions[1][index[1]];
+  if (fabs(coef) >= threshold)
+    {
+      const Vec axis = cross(directions[0][index[0]], directions[1][index[1]]);
+      float angle = asin(axis.norm());
+      if (coef >= 0.0)
+	angle = -angle;
+      // setOrientation(Quaternion(axis, angle) * orientation());
+      rotate(rotation().inverse() * Quaternion(axis, angle) * orientation());
+
+      // Try to align an other axis direction
+      unsigned short d = (index[1]+1) % 3;
+      Vec dir((d==0)? 1.0 : 0.0, (d==1)? 1.0 : 0.0, (d==2)? 1.0 : 0.0);
+      dir = inverseTransformOf(dir);
+
+      float max = 0.0f;
+      for (int i=0; i<3; ++i)
+	{
+	  float proj = fabs(directions[0][i]*dir);
+	  if (proj > max)
+	    {
+	      index[0] = i;
+	      max = proj;
+	    }
+	}
+
+      if (max >= threshold)
+	{
+	  const Vec axis = cross(directions[0][index[0]], dir);
+	  float angle = asin(axis.norm());
+	  if (directions[0][index[0]] * dir >= 0.0)
+	    angle = -angle;
+	  // setOrientation(Quaternion(axis, angle) * orientation());
+	  rotate(rotation().inverse() * Quaternion(axis, angle) * orientation());
+	}
+    }
+
+  if (move)
+    {
+      Vec center;
+      if (frame)
+	center = frame->position();
+
+      // setPosition(center - orientation().rotate(old.coordinatesOf(center)));
+      translate(center - orientation().rotate(old.coordinatesOf(center)) - translation());
+    }
+}
+
+/*! Translates the Frame so that its position() lies on the line defined by \p origin and \p
+  direction (defined in the world coordinate system).
+
+Simply uses an orthogonal projection. \p direction does not need to be normalized. */
+void Frame::projectOnLine(const Vec& origin, const Vec& direction)
+{
+  // If you are trying to find a bug here, because of memory problems, you waste your time.
+  // This is a bug in the gcc 3.3 compiler. Compile the library in debug mode and test.
+  // Uncommenting this line also seems to solve the problem. Horrible.
+  // cout << "position = " << position() << endl;
+  // If you found a problem or are using a different compiler, please let me know.
+  const Vec shift = origin - position();
+  Vec proj = shift;
+  proj.projectOnAxis(direction);
+  translate(shift-proj);
+}
diff --git a/source/blender/freestyle/intern/app_blender/frame.h b/source/blender/freestyle/intern/app_blender/frame.h
new file mode 100644
index 00000000000..1ff3d91f75c
--- /dev/null
+++ b/source/blender/freestyle/intern/app_blender/frame.h
@@ -0,0 +1,408 @@
+/****************************************************************************
+
+ Copyright (C) 2002-2007 Gilles Debunne (Gilles.Debunne@imag.fr)
+
+ This file is part of the QGLViewer library.
+ Version 2.2.6-3, released on August 28, 2007.
+
+ http://artis.imag.fr/Members/Gilles.Debunne/QGLViewer
+
+ libQGLViewer 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.
+
+ libQGLViewer 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 libQGLViewer; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*****************************************************************************/
+
+#ifndef QGLVIEWER_FRAME_H
+#define QGLVIEWER_FRAME_H
+
+#include "constraint.h"
+// #include "GL/gl.h" is now included in config.h for ease of configuration
+
+//namespace qglviewer {
+  /*! \brief The Frame class represents a coordinate system, defined by a position and an
+  orientation. \class Frame frame.h QGLViewer/frame.h
+
+  A Frame is a 3D coordinate system, represented by a position() and an orientation(). The order of
+  these transformations is important: the Frame is first translated \e and \e then rotated around
+  the new translated origin.
+
+  A Frame is useful to define the position and orientation of a 3D rigid object, using its matrix()
+  method, as shown below:
+  \code
+  // Builds a Frame at position (0.5,0,0) and oriented such that its Y axis is along the (1,1,1)
+  // direction. One could also have used setPosition() and setOrientation().
+  Frame fr(Vec(0.5,0,0), Quaternion(Vec(0,1,0), Vec(1,1,1)));
+  glPushMatrix();
+  glMultMatrixd(fr.matrix());
+  // Draw your object here, in the local fr coordinate system.
+  glPopMatrix();
+  \endcode
+
+  Many functions are provided to transform a 3D point from one coordinate system (Frame) to an
+  other: see coordinatesOf(), inverseCoordinatesOf(), coordinatesOfIn(), coordinatesOfFrom()...
+
+  You may also want to transform a 3D vector (such as a normal), which corresponds to applying only
+  the rotational part of the frame transformation: see transformOf() and inverseTransformOf(). See
+  the <a href="../examples/frameTransform.html">frameTransform example</a> for an illustration.
+
+  The translation() and the rotation() that are encapsulated in a Frame can also be used to
+  represent a \e rigid \e transformation of space. Such a transformation can also be interpreted as
+  a change of coordinate system, and the coordinate system conversion functions actually allow you
+  to use a Frame as a rigid transformation. Use inverseCoordinatesOf() (resp. coordinatesOf()) to
+  apply the transformation (resp. its inverse). Note the inversion.
+
+  <h3>Hierarchy of Frames</h3>
+
+  The position and the orientation of a Frame are actually defined with respect to a
+  referenceFrame(). The default referenceFrame() is the world coordinate system (represented by a \c
+  NULL referenceFrame()). If you setReferenceFrame() to a different Frame, you must then
+  differentiate:
+
+  \arg the \e local translation() and rotation(), defined with respect to the referenceFrame(),
+
+  \arg the \e global position() and orientation(), always defined with respect to the world
+  coordinate system.
+
+  A Frame is actually defined by its translation() with respect to its referenceFrame(), and then by
+  a rotation() of the coordinate system around the new translated origin.
+
+  This terminology for \e local (translation() and rotation()) and \e global (position() and
+  orientation()) definitions is used in all the methods' names and should be sufficient to prevent
+  ambiguities. These notions are obviously identical when the referenceFrame() is \c NULL, i.e. when
+  the Frame is defined in the world coordinate system (the one you are in at the beginning of the
+  QGLViewer::draw() method, see the <a href="../introduction.html">introduction page</a>).
+
+  Frames can hence easily be organized in a tree hierarchy, which root is the world coordinate
+  system. A loop in the hierarchy would result in an inconsistent (multiple) Frame definition.
+  settingAsReferenceFrameWillCreateALoop() checks this and prevents setReferenceFrame() from
+  creating such a loop.
+
+  This frame hierarchy is used in methods like coordinatesOfIn(), coordinatesOfFrom()... which allow
+  coordinates (or vector) conversions from a Frame to any other one (including the world coordinate
+  system).
+
+  However, one must note that this hierarchical representation is internal to the Frame classes.
+  When the Frames represent OpenGL coordinates system, one should map this hierarchical
+  representation to the OpenGL GL_MODELVIEW matrix stack. See the matrix() documentation for
+  details.
+
+  <h3>Constraints</h3>
+
+  An interesting feature of Frames is that their displacements can be constrained. When a Constraint
+  is attached to a Frame, it filters the input of translate() and rotate(), and only the resulting
+  filtered motion is applied to the Frame. The default constraint() is \c NULL resulting in no
+  filtering. Use setConstraint() to attach a Constraint to a frame.
+
+  Constraints are especially usefull for the ManipulatedFrame instances, in order to forbid some
+  mouse motions. See the <a href="../examples/constrainedFrame.html">constrainedFrame</a>, <a
+  href="../examples/constrainedCamera.html">constrainedCamera</a> and <a
+  href="../examples/luxo.html">luxo</a> examples for an illustration.
+
+  Classical constraints are provided for convenience (see LocalConstraint, WorldConstraint and
+  CameraConstraint) and new constraints can very easily be implemented.
+
+  <h3>Derived classes</h3>
+
+  The ManipulatedFrame class inherits Frame and implements a mouse motion convertion, so that a
+  Frame (and hence an object) can be manipulated in the scene with the mouse.
+
+  \nosubgrouping */
+  class Frame
+  {
+
+  public:
+    Frame();
+
+    /*! Virtual destructor. Empty. */
+    virtual ~Frame() {};
+
+    Frame(const Frame& frame);
+    Frame& operator=(const Frame& frame);
+
+    /*! This signal is emitted whenever the position() or the orientation() of the Frame is modified.
+
+    Connect this signal to any object that must be notified:
+    \code
+    QObject::connect(myFrame, SIGNAL(modified()), myObject, SLOT(update()));
+    \endcode
+    Use the QGLViewer::QGLViewerPool() to connect the signal to all the viewers.
+
+    \note If your Frame is part of a Frame hierarchy (see referenceFrame()), a modification of one
+    of the parents of this Frame will \e not emit this signal. Use code like this to change this
+    behavior (you can do this recursively for all the referenceFrame() until the \c NULL world root
+    frame is encountered):
+    \code
+    // Emits the Frame modified() signal when its referenceFrame() is modified().
+    connect(myFrame->referenceFrame(), SIGNAL(modified()), myFrame, SIGNAL(modified()));
+    \endcode
+
+    \attention Connecting this signal to a QGLWidget::updateGL() slot (or a method that calls it)
+    will prevent you from modifying the Frame \e inside your QGLViewer::draw() method as it would
+    result in an infinite loop. However, QGLViewer::draw() should not modify the scene.
+
+    \note For efficiency reasons, this signal is emitted even if the Frame is not actually modified, for
+    instance with translate(Vec(0,0,0)) or setPosition(position()). */
+    void modified();
+
+    /*! This signal is emitted when the Frame is interpolated by a KeyFrameInterpolator.
+
+    See the KeyFrameInterpolator documentation for details.
+
+    If a KeyFrameInterpolator is used to successively interpolate several Frames in your scene,
+    connect the KeyFrameInterpolator::interpolated() signal instead (identical, but independent of
+    the interpolated Frame). */
+    void interpolated();
+
+  public:
+    /*! @name World coordinates position and orientation */
+    //@{
+    Frame(const Vec& position, const Quaternion& orientation);
+
+    void setPosition(const Vec& position);
+    void setPosition(float x, float y, float z);
+    void setPositionWithConstraint(Vec& position);
+
+    void setOrientation(const Quaternion& orientation);
+    void setOrientation(double q0, double q1, double q2, double q3);
+    void setOrientationWithConstraint(Quaternion& orientation);
+
+    void setPositionAndOrientation(const Vec& position, const Quaternion& orientation);
+    void setPositionAndOrientationWithConstraint(Vec& position, Quaternion& orientation);
+
+    /*! Returns the position of the Frame, defined in the world coordinate system. See also
+      orientation(), setPosition() and translation(). */
+    Vec position() const { return inverseCoordinatesOf(Vec(0.0,0.0,0.0)); };
+    Quaternion orientation() const;
+
+    void getPosition(float& x, float& y, float& z) const;
+    void getOrientation(double& q0, double& q1, double& q2, double& q3) const;
+  //@}
+
+
+    public:
+    /*! @name Local translation and rotation w/r reference Frame */
+    //@{
+    /*! Sets the translation() of the frame, locally defined with respect to the referenceFrame().
+      Emits the modified() signal.
+
+    Use setPosition() to define the world coordinates position(). Use
+    setTranslationWithConstraint() to take into account the potential constraint() of the Frame. */
+    void setTranslation(const Vec& translation) { t_ = translation; };
+    void setTranslation(float x, float y, float z);
+    void setTranslationWithConstraint(Vec& translation);
+
+    /*! Set the current rotation Quaternion. See rotation() and the different Quaternion
+    constructors. Emits the modified() signal. See also setTranslation() and
+    setRotationWithConstraint(). */
+
+    /*! Sets the rotation() of the Frame, locally defined with respect to the referenceFrame().
+      Emits the modified() signal.
+
+     Use setOrientation() to define the world coordinates orientation(). The potential
+     constraint() of the Frame is not taken into account, use setRotationWithConstraint()
+     instead. */
+    void setRotation(const Quaternion& rotation) { q_ = rotation; };
+    void setRotation(double q0, double q1, double q2, double q3);
+    void setRotationWithConstraint(Quaternion& rotation);
+
+    void setTranslationAndRotation(const Vec& translation, const Quaternion& rotation);
+    void setTranslationAndRotationWithConstraint(Vec& translation, Quaternion& rotation);
+
+    /*! Returns the Frame translation, defined with respect to the referenceFrame().
+
+    Use position() to get the result in the world coordinates. These two values are identical
+    when the referenceFrame() is \c NULL (default).
+
+    See also setTranslation() and setTranslationWithConstraint(). */
+    Vec translation() const { return t_; };
+    /*! Returns the Frame rotation, defined with respect to the referenceFrame().
+
+    Use orientation() to get the result in the world coordinates. These two values are identical
+    when the referenceFrame() is \c NULL (default).
+
+    See also setRotation() and setRotationWithConstraint(). */
+
+    /*! Returns the current Quaternion orientation. See setRotation(). */
+    Quaternion rotation() const { return q_; };
+
+    void getTranslation(float& x, float& y, float& z) const;
+    void getRotation(double& q0, double& q1, double& q2, double& q3) const;
+    //@}
+
+    public:
+    /*! @name Frame hierarchy */
+    //@{
+    /*! Returns the reference Frame, in which coordinates system the Frame is defined.
+
+    The translation() and rotation() of the Frame are defined with respect to the referenceFrame()
+    coordinate system. A \c NULL referenceFrame() (default value) means that the Frame is defined in
+    the world coordinate system.
+
+    Use position() and orientation() to recursively convert values along the referenceFrame() chain
+    and to get values expressed in the world coordinate system. The values match when the
+    referenceFrame() is \c NULL.
+
+    Use setReferenceFrame() to set this value and create a Frame hierarchy. Convenient functions
+    allow you to convert 3D coordinates from one Frame to an other: see coordinatesOf(),
+    localCoordinatesOf(), coordinatesOfIn() and their inverse functions.
+
+    Vectors can also be converted using transformOf(), transformOfIn, localTransformOf() and their
+    inverse functions. */
+    const Frame* referenceFrame() const { return referenceFrame_; };
+    void setReferenceFrame(const Frame* const refFrame);
+    bool settingAsReferenceFrameWillCreateALoop(const Frame* const frame);
+    //@}
+
+
+    /*! @name Frame modification */
+    //@{
+    void translate(Vec& t);
+    void translate(const Vec& t);
+    // Some compilers complain about "overloading cannot distinguish from previous declaration"
+    // Simply comment out the following method and its associated implementation
+    void translate(float x, float y, float z);
+    void translate(float& x, float& y, float& z);
+
+    void rotate(Quaternion& q);
+    void rotate(const Quaternion& q);
+    // Some compilers complain about "overloading cannot distinguish from previous declaration"
+    // Simply comment out the following method and its associated implementation
+    void rotate(double q0, double q1, double q2, double q3);
+    void rotate(double& q0, double& q1, double& q2, double& q3);
+
+    void rotateAroundPoint(Quaternion& rotation, const Vec& point);
+    void rotateAroundPoint(const Quaternion& rotation, const Vec& point);
+
+    void alignWithFrame(const Frame* const frame, bool move=false, float threshold=0.85f);
+    void projectOnLine(const Vec& origin, const Vec& direction);
+    //@}
+
+
+    /*! @name Coordinate system transformation of 3D coordinates */
+    //@{
+    Vec coordinatesOf(const Vec& src) const;
+    Vec inverseCoordinatesOf(const Vec& src) const;
+    Vec localCoordinatesOf(const Vec& src) const;
+    Vec localInverseCoordinatesOf(const Vec& src) const;
+    Vec coordinatesOfIn(const Vec& src, const Frame* const in) const;
+    Vec coordinatesOfFrom(const Vec& src, const Frame* const from) const;
+
+    void getCoordinatesOf(const float src[3], float res[3]) const;
+    void getInverseCoordinatesOf(const float src[3], float res[3]) const;
+    void getLocalCoordinatesOf(const float src[3], float res[3]) const;
+    void getLocalInverseCoordinatesOf(const float src[3], float res[3]) const;
+    void getCoordinatesOfIn(const float src[3], float res[3], const Frame* const in) const;
+    void getCoordinatesOfFrom(const float src[3], float res[3], const Frame* const from) const;
+    //@}
+
+    /*! @name Coordinate system transformation of vectors */
+    // A frame is as a new coordinate system, defined with respect to a reference frame (the world
+    // coordinate system by default, see the "Composition of frame" section).
+
+    // The transformOf() (resp. inverseTransformOf()) functions transform a 3D vector from (resp.
+    // to) the world coordinates system. This section defines the 3D vector transformation
+    // functions. See the Coordinate system transformation of 3D points above for the transformation
+    // of 3D points. The difference between the two sets of functions is simple: for vectors, only
+    // the rotational part of the transformations is taken into account, while translation is also
+    // considered for 3D points.
+
+    // The length of the resulting transformed vector is identical to the one of the source vector
+    // for all the described functions.
+
+    // When local is prepended to the names of the functions, the functions simply transform from
+    // (and to) the reference frame.
+
+    // When In (resp. From) is appended to the names, the functions transform from (resp. To) the
+    // frame that is given as an argument. The frame does not need to be in the same branch or the
+    // hierarchical tree, and can be \c NULL (the world coordinates system).
+
+    // Combining any of these functions with its inverse (in any order) leads to the identity.
+    //@{
+    Vec transformOf(const Vec& src) const;
+    Vec inverseTransformOf(const Vec& src) const;
+    Vec localTransformOf(const Vec& src) const;
+    Vec localInverseTransformOf(const Vec& src) const;
+    Vec transformOfIn(const Vec& src, const Frame* const in) const;
+    Vec transformOfFrom(const Vec& src, const Frame* const from) const;
+
+    void getTransformOf(const float src[3], float res[3]) const;
+    void getInverseTransformOf(const float src[3], float res[3]) const;
+    void getLocalTransformOf(const float src[3], float res[3]) const;
+    void getLocalInverseTransformOf(const float src[3], float res[3]) const;
+    void getTransformOfIn(const float src[3], float res[3], const Frame* const in) const;
+    void getTransformOfFrom(const float src[3], float res[3], const Frame* const from) const;
+    //@}
+
+
+    /*! @name Constraint on the displacement */
+    //@{
+    /*! Returns the current constraint applied to the Frame.
+
+    A \c NULL value (default) means that no Constraint is used to filter Frame translation and
+    rotation. See the Constraint class documentation for details.
+
+    You may have to use a \c dynamic_cast to convert the result to a Constraint derived class. */
+    Constraint* constraint() const { return constraint_; }
+    /*! Sets the constraint() attached to the Frame.
+
+    A \c NULL value means no constraint. The previous constraint() should be deleted by the calling
+    method if needed. */
+    void setConstraint(Constraint* const constraint) { constraint_ = constraint; }
+    //@}
+
+    /*! @name Associated matrices */
+    //@{
+  public:
+    const GLdouble* matrix() const;
+    void getMatrix(GLdouble m[4][4]) const;
+    void getMatrix(GLdouble m[16]) const;
+
+    const GLdouble* worldMatrix() const;
+    void getWorldMatrix(GLdouble m[4][4]) const;
+    void getWorldMatrix(GLdouble m[16]) const;
+
+    void setFromMatrix(const GLdouble m[4][4]);
+    void setFromMatrix(const GLdouble m[16]);
+    //@}
+
+    /*! @name Inversion of the transformation */
+    //@{
+    Frame inverse() const;
+    /*! Returns the inverse() of the Frame world transformation.
+
+    The orientation() of the new Frame is the Quaternion::inverse() of the original orientation.
+    Its position() is the negated and inverse rotated image of the original position.
+
+    The result Frame has a \c NULL referenceFrame() and a \c NULL constraint().
+
+    Use inverse() for a local (i.e. with respect to referenceFrame()) transformation inverse. */
+    Frame worldInverse() const { return Frame(-(orientation().inverseRotate(position())), orientation().inverse()); }
+    //@}
+
+
+  private:
+    // P o s i t i o n   a n d   o r i e n t a t i o n
+    Vec t_;
+    Quaternion q_;
+
+    // C o n s t r a i n t s
+    Constraint* constraint_;
+
+    // F r a m e   c o m p o s i t i o n
+    const Frame* referenceFrame_;
+  };
+
+//} // namespace qglviewer
+
+#endif // QGLVIEWER_FRAME_H
diff --git a/source/blender/freestyle/intern/app_blender/manipulatedCameraFrame.cpp b/source/blender/freestyle/intern/app_blender/manipulatedCameraFrame.cpp
new file mode 100644
index 00000000000..c4e2e67b26a
--- /dev/null
+++ b/source/blender/freestyle/intern/app_blender/manipulatedCameraFrame.cpp
@@ -0,0 +1,86 @@
+/****************************************************************************
+
+ Copyright (C) 2002-2007 Gilles Debunne (Gilles.Debunne@imag.fr)
+
+ This file is part of the QGLViewer library.
+ Version 2.2.6-3, released on August 28, 2007.
+
+ http://artis.imag.fr/Members/Gilles.Debunne/QGLViewer
+
+ libQGLViewer 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.
+
+ libQGLViewer 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 libQGLViewer; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*****************************************************************************/
+
+#include "manipulatedCameraFrame.h"
+#include "camera.h"
+//#include "qglviewer.h"
+
+// #if QT_VERSION >= 0x040000
+// # include <QMouseEvent>
+// #endif
+// 
+// using namespace qglviewer;
+using namespace std;
+
+/*! Default constructor.
+
+ flySpeed() is set to 0.0 and flyUpVector() is (0,1,0). The revolveAroundPoint() is set to (0,0,0).
+
+  \attention Created object is removeFromMouseGrabberPool(). */
+ManipulatedCameraFrame::ManipulatedCameraFrame()
+  : driveSpeed_(0.0), flyUpVector_(0.0, 1.0, 0.0)
+{
+  setFlySpeed(0.0);
+  //removeFromMouseGrabberPool();
+
+  //connect(&flyTimer_, SIGNAL(timeout()), SLOT(flyUpdate()));
+}
+
+/*! Equal operator. Calls ManipulatedFrame::operator=() and then copy attributes. */
+ManipulatedCameraFrame& ManipulatedCameraFrame::operator=(const ManipulatedCameraFrame& mcf)
+{
+  ManipulatedFrame::operator=(mcf);
+
+  setFlySpeed(mcf.flySpeed());
+  setFlyUpVector(mcf.flyUpVector());
+
+  return *this;
+}
+
+/*! Copy constructor. Performs a deep copy of all members using operator=(). */
+ManipulatedCameraFrame::ManipulatedCameraFrame(const ManipulatedCameraFrame& mcf)
+  : ManipulatedFrame(mcf)
+{
+  //removeFromMouseGrabberPool();
+  (*this)=(mcf);
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+
+/*! Returns a Quaternion that is a rotation around current camera Y, proportionnal to the horizontal mouse position. */
+Quaternion ManipulatedCameraFrame::turnQuaternion(int x, const Camera* const camera)
+{
+  return Quaternion(Vec(0.0, 1.0, 0.0), rotationSensitivity()*(prevPos_.x()-x)/camera->screenWidth());
+}
+
+/*! Returns a Quaternion that is the composition of two rotations, inferred from the
+  mouse pitch (X axis) and yaw (flyUpVector() axis). */
+Quaternion ManipulatedCameraFrame::pitchYawQuaternion(int x, int y, const Camera* const camera)
+{
+  const Quaternion rotX(Vec(1.0, 0.0, 0.0), rotationSensitivity()*(prevPos_.y()-y)/camera->screenHeight());
+  const Quaternion rotY(transformOf(flyUpVector()), rotationSensitivity()*(prevPos_.x()-x)/camera->screenWidth());
+  return rotY * rotX;
+}
diff --git a/source/blender/freestyle/intern/app_blender/manipulatedCameraFrame.h b/source/blender/freestyle/intern/app_blender/manipulatedCameraFrame.h
new file mode 100644
index 00000000000..3c28edab622
--- /dev/null
+++ b/source/blender/freestyle/intern/app_blender/manipulatedCameraFrame.h
@@ -0,0 +1,169 @@
+/****************************************************************************
+
+ Copyright (C) 2002-2007 Gilles Debunne (Gilles.Debunne@imag.fr)
+
+ This file is part of the QGLViewer library.
+ Version 2.2.6-3, released on August 28, 2007.
+
+ http://artis.imag.fr/Members/Gilles.Debunne/QGLViewer
+
+ libQGLViewer 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.
+
+ libQGLViewer 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 libQGLViewer; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*****************************************************************************/
+
+#ifndef QGLVIEWER_MANIPULATED_CAMERA_FRAME_H
+#define QGLVIEWER_MANIPULATED_CAMERA_FRAME_H
+
+#include "manipulatedFrame.h"
+
+//namespace qglviewer {
+  /*! \brief The ManipulatedCameraFrame class represents a ManipulatedFrame with Camera specific mouse bindings.
+  \class ManipulatedCameraFrame manipulatedCameraFrame.h QGLViewer/manipulatedCameraFrame.h
+
+  A ManipulatedCameraFrame is a specialization of a ManipulatedFrame, designed to be set as the
+  Camera::frame(). Mouse motions are basically interpreted in a negated way: when the mouse goes to
+  the right, the ManipulatedFrame translation goes to the right, while the ManipulatedCameraFrame
+  has to go to the \e left, so that the \e scene seems to move to the right.
+
+  A ManipulatedCameraFrame rotates around its revolveAroundPoint(), which corresponds to the
+  associated Camera::revolveAroundPoint().
+
+  A ManipulatedCameraFrame can also "fly" in the scene. It basically moves forward, and turns
+  according to the mouse motion. See flySpeed(), flyUpVector() and the QGLViewer::MOVE_FORWARD and
+  QGLViewer::MOVE_BACKWARD QGLViewer::MouseAction.
+
+  See the <a href="../mouse.html">mouse page</a> for a description of the possible actions that can
+  be performed using the mouse and their bindings.
+  \nosubgrouping */
+  class ManipulatedCameraFrame : public ManipulatedFrame
+  {
+#ifndef DOXYGEN
+    friend class Camera;
+    //friend class ::QGLViewer;
+#endif
+
+    //Q_OBJECT
+
+  public:
+    ManipulatedCameraFrame();
+    /*! Virtual destructor. Empty. */
+    virtual ~ManipulatedCameraFrame() {};
+
+    ManipulatedCameraFrame(const ManipulatedCameraFrame& mcf);
+    ManipulatedCameraFrame& operator=(const ManipulatedCameraFrame& mcf);
+
+    /*! @name Revolve around point */
+    //@{
+  public:
+    /*! Returns the point the ManipulatedCameraFrame revolves around when rotated.
+
+    It is defined in the world coordinate system. Default value is (0,0,0).
+
+    When the ManipulatedCameraFrame is associated to a Camera, Camera::revolveAroundPoint() also
+    returns this value. This point can interactively be changed using the mouse (see
+    QGLViewer::RAP_FROM_PIXEL and QGLViewer::RAP_IS_CENTER in the <a href="../mouse.html">mouse
+    page</a>). */
+    Vec revolveAroundPoint() const { return revolveAroundPoint_; }
+    /*! Sets the revolveAroundPoint(), defined in the world coordinate system. */
+    void setRevolveAroundPoint(const Vec& revolveAroundPoint) { revolveAroundPoint_ = revolveAroundPoint; }
+    //@}
+
+    /*! @name Fly parameters */
+    //@{
+  public: //slots:
+    /*! Sets the flySpeed(), defined in OpenGL units.
+
+    Default value is 0.0, but it is modified according to the QGLViewer::sceneRadius() when the
+    ManipulatedCameraFrame is set as the Camera::frame(). */
+    void setFlySpeed(float speed) { flySpeed_ = speed; };
+
+    /*! Sets the flyUpVector(), defined in the world coordinate system.
+
+    Default value is (0,1,0), but it is updated by the Camera when set as its Camera::frame(). Use
+    Camera::setUpVector() instead in that case. */
+    void setFlyUpVector(const Vec& up) { flyUpVector_ = up; };
+
+  public:
+    /*! Returns the fly speed, expressed in OpenGL units.
+
+    It corresponds to the incremental displacement that is periodically applied to the
+    ManipulatedCameraFrame position when a QGLViewer::MOVE_FORWARD or QGLViewer::MOVE_BACKWARD
+    QGLViewer::MouseAction is proceeded.
+
+    \attention When the ManipulatedCameraFrame is set as the Camera::frame(), this value is set
+    according to the QGLViewer::sceneRadius() by QGLViewer::setSceneRadius(). */
+    float flySpeed() const { return flySpeed_; };
+
+    /*! Returns the up vector used in fly mode, expressed in the world coordinate system.
+
+    Fly mode corresponds to the QGLViewer::MOVE_FORWARD and QGLViewer::MOVE_BACKWARD
+    QGLViewer::MouseAction bindings. In these modes, horizontal displacements of the mouse rotate
+    the ManipulatedCameraFrame around this vector. Vertical displacements rotate always around the
+    Camera \c X axis.
+
+    Default value is (0,1,0), but it is updated by the Camera when set as its Camera::frame().
+    Camera::setOrientation() and Camera::setUpVector()) modify this value and should be used
+    instead. */
+    Vec flyUpVector() const { return flyUpVector_; };
+    //@}
+
+    /*! @name Mouse event handlers */
+    //@{
+  // protected:
+  //   virtual void mouseReleaseEvent(QMouseEvent* const event, Camera* const camera);
+  //   virtual void mouseMoveEvent   (QMouseEvent* const event, Camera* const camera);
+  //   virtual void wheelEvent       (QWheelEvent* const event, Camera* const camera);
+  //   //@}
+
+    /*! @name Spinning */
+    //@{
+  // protected slots:
+  //   virtual void spin();
+    //@}
+
+    /*! @name XML representation */
+    //@{
+  // public:
+  //   virtual QDomElement domElement(const QString& name, QDomDocument& document) const;
+  // public slots:
+  //   virtual void initFromDOMElement(const QDomElement& element);
+  //   //@}
+
+// #ifndef DOXYGEN
+//   protected:
+//     virtual void startAction(int ma, bool withConstraint=true); // int is really a QGLViewer::MouseAction
+// #endif
+
+  private: //slots:
+    //virtual void flyUpdate();
+
+  private:
+    void updateFlyUpVector();
+    Quaternion turnQuaternion(int x, const Camera* const camera);
+    Quaternion pitchYawQuaternion(int x, int y, const Camera* const camera);
+
+  private:
+    // Fly mode data
+    float flySpeed_;
+    float driveSpeed_;
+    Vec flyUpVector_;
+    //QTimer flyTimer_;
+
+    Vec revolveAroundPoint_;
+  };
+
+//} // namespace qglviewer
+
+#endif // QGLVIEWER_MANIPULATED_CAMERA_FRAME_H
diff --git a/source/blender/freestyle/intern/app_blender/manipulatedFrame.cpp b/source/blender/freestyle/intern/app_blender/manipulatedFrame.cpp
new file mode 100644
index 00000000000..6721204383d
--- /dev/null
+++ b/source/blender/freestyle/intern/app_blender/manipulatedFrame.cpp
@@ -0,0 +1,116 @@
+/****************************************************************************
+
+ Copyright (C) 2002-2007 Gilles Debunne (Gilles.Debunne@imag.fr)
+
+ This file is part of the QGLViewer library.
+ Version 2.2.6-3, released on August 28, 2007.
+
+ http://artis.imag.fr/Members/Gilles.Debunne/QGLViewer
+
+ libQGLViewer 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.
+
+ libQGLViewer 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 libQGLViewer; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*****************************************************************************/
+
+#include "manipulatedFrame.h"
+//#include "qglviewer.h"
+#include "camera.h"
+
+//using namespace qglviewer;
+using namespace std;
+
+/*! Default constructor.
+
+  The translation is set to (0,0,0), with an identity rotation (0,0,0,1) (see Frame constructor
+  for details).
+
+  The different sensitivities are set to their default values (see rotationSensitivity(),
+  translationSensitivity(), spinningSensitivity() and wheelSensitivity()). */
+ManipulatedFrame::ManipulatedFrame()
+{
+  // #CONNECTION# initFromDOMElement and accessor docs
+  setRotationSensitivity(1.0f);
+  setTranslationSensitivity(1.0f);
+  setSpinningSensitivity(0.3f);
+  setWheelSensitivity(1.0f);
+
+  isSpinning_ = false;
+  previousConstraint_ = false;
+
+  //connect(&spinningTimer_, SIGNAL(timeout()), SLOT(spinUpdate()));
+}
+
+/*! Equal operator. Calls Frame::operator=() and then copy attributes. */
+ManipulatedFrame& ManipulatedFrame::operator=(const ManipulatedFrame& mf)
+{
+  Frame::operator=(mf);
+
+  setRotationSensitivity(mf.rotationSensitivity());
+  setTranslationSensitivity(mf.translationSensitivity());
+  setSpinningSensitivity(mf.spinningSensitivity());
+  setWheelSensitivity(mf.wheelSensitivity());
+
+  mouseSpeed_ = 0.0;
+  dirIsFixed_ = false;
+  keepsGrabbingMouse_ = false;
+
+  return *this;
+}
+
+/*! Copy constructor. Performs a deep copy of all attributes using operator=(). */
+ManipulatedFrame::ManipulatedFrame(const ManipulatedFrame& mf)
+  : Frame(mf)
+{
+  (*this)=mf;
+}
+
+
+
+////////////////////////////////////////////////////////////////////////////////
+
+/*! Returns "pseudo-distance" from (x,y) to ball of radius size.
+\arg for a point inside the ball, it is proportional to the euclidean distance to the ball
+\arg for a point outside the ball, it is proportional to the inverse of this distance (tends to
+zero) on the ball, the function is continuous. */
+static float projectOnBall(float x, float y)
+{
+  // If you change the size value, change angle computation in deformedBallQuaternion().
+  const float size       = 1.0f;
+  const float size2      = size*size;
+  const float size_limit = size2*0.5;
+
+  const float d = x*x + y*y;
+  return d < size_limit ? sqrt(size2 - d) : size_limit/sqrt(d);
+}
+
+#ifndef DOXYGEN
+/*! Returns a quaternion computed according to the mouse motion. Mouse positions are projected on a
+deformed ball, centered on (\p cx,\p cy). */
+Quaternion ManipulatedFrame::deformedBallQuaternion(int x, int y, float cx, float cy, const Camera* const camera)
+{
+  // Points on the deformed ball
+  float px = rotationSensitivity() * (prevPos_.x()  - cx) / camera->screenWidth();
+  float py = rotationSensitivity() * (cy - prevPos_.y())  / camera->screenHeight();
+  float dx = rotationSensitivity() * (x - cx)	    / camera->screenWidth();
+  float dy = rotationSensitivity() * (cy - y)	    / camera->screenHeight();
+
+  const Vec p1(px, py, projectOnBall(px, py));
+  const Vec p2(dx, dy, projectOnBall(dx, dy));
+  // Approximation of rotation angle
+  // Should be divided by the projectOnBall size, but it is 1.0
+  const Vec axis = cross(p2,p1);
+  const float angle = 2.0 * asin(sqrt(axis.squaredNorm() / p1.squaredNorm() / p2.squaredNorm()));
+  return Quaternion(axis, angle);
+}
+#endif // DOXYGEN
diff --git a/source/blender/freestyle/intern/app_blender/manipulatedFrame.h b/source/blender/freestyle/intern/app_blender/manipulatedFrame.h
new file mode 100644
index 00000000000..8ad815f0a63
--- /dev/null
+++ b/source/blender/freestyle/intern/app_blender/manipulatedFrame.h
@@ -0,0 +1,256 @@
+/****************************************************************************
+
+ Copyright (C) 2002-2007 Gilles Debunne (Gilles.Debunne@imag.fr)
+
+ This file is part of the QGLViewer library.
+ Version 2.2.6-3, released on August 28, 2007.
+
+ http://artis.imag.fr/Members/Gilles.Debunne/QGLViewer
+
+ libQGLViewer 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.
+
+ libQGLViewer 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 libQGLViewer; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*****************************************************************************/
+
+#ifndef QGLVIEWER_MANIPULATED_FRAME_H
+#define QGLVIEWER_MANIPULATED_FRAME_H
+
+#include "frame.h"
+
+//namespace qglviewer {
+  /*! \brief A ManipulatedFrame is a Frame that can be rotated and translated using the mouse.
+  \class ManipulatedFrame manipulatedFrame.h QGLViewer/manipulatedFrame.h
+
+  It converts the mouse motion into a translation and an orientation updates. A ManipulatedFrame is
+  used to move an object in the scene. Combined with object selection, its MouseGrabber properties
+  and a dynamic update of the scene, the ManipulatedFrame introduces a great reactivity in your
+  applications.
+
+  A ManipulatedFrame is attached to a QGLViewer using QGLViewer::setManipulatedFrame():
+  \code
+  init() { setManipulatedFrame( new ManipulatedFrame() ); }
+
+  draw()
+  {
+    glPushMatrix();
+    glMultMatrixd(manipulatedFrame()->matrix());
+    // draw the manipulated object here
+    glPopMatrix();
+  }
+  \endcode
+  See the <a href="../examples/manipulatedFrame.html">manipulatedFrame example</a> for a complete
+  application.
+
+  Mouse events are normally sent to the QGLViewer::camera(). You have to press the QGLViewer::FRAME
+  state key (default is \c Control) to move the QGLViewer::manipulatedFrame() instead. See the <a
+  href="../mouse.html">mouse page</a> for a description of mouse button bindings.
+
+  <h3>Inherited functionalities</h3>
+
+  A ManipulatedFrame is an overloaded instance of a Frame. The powerful coordinate system
+  transformation functions (Frame::coordinatesOf(), Frame::transformOf(), ...) can hence be applied
+  to a ManipulatedFrame.
+
+  A ManipulatedFrame is also a MouseGrabber. If the mouse cursor gets within a distance of 10 pixels
+  from the projected position of the ManipulatedFrame, the ManipulatedFrame becomes the new
+  QGLViewer::mouseGrabber(). It can then be manipulated directly, without any specific state key,
+  object selection or GUI intervention. This is very convenient to directly move some objects in the
+  scene (typically a light). See the <a href="../examples/mouseGrabber.html">mouseGrabber
+  example</a> as an illustration. Note that QWidget::setMouseTracking() needs to be enabled in order
+  to use this feature (see the MouseGrabber documentation).
+
+  <h3>Advanced functionalities</h3>
+
+  A QGLViewer can handle at most one ManipulatedFrame at a time. If you want to move several objects
+  in the scene, you simply have to keep a list of the different ManipulatedFrames, and to activate
+  the right one (using QGLViewer::setManipulatedFrame()) when needed. This can for instance be done
+  according to an object selection: see the <a href="../examples/luxo.html">luxo example</a> for an
+  illustration.
+
+  When the ManipulatedFrame is being manipulated using the mouse (mouse pressed and not yet
+  released), isManipulated() returns \c true. This might be used to trigger a specific action or
+  display (as is done with QGLViewer::fastDraw()).
+
+  The ManipulatedFrame also emits a manipulated() signal each time its state is modified by the
+  mouse. This signal is automatically connected to the QGLViewer::updateGL() slot when the
+  ManipulatedFrame is attached to a viewer using QGLViewer::setManipulatedFrame().
+
+  You can make the ManipulatedFrame spin() if you release the rotation mouse button while moving the
+  mouse fast enough (see spinningSensitivity()). See also translationSensitivity() and
+  rotationSensitivity() for sensitivity tuning. \nosubgrouping */
+  class ManipulatedFrame : public Frame
+  {
+
+  public:
+    ManipulatedFrame();
+    /*! Virtual destructor. Empty. */
+    virtual ~ManipulatedFrame() {};
+
+    ManipulatedFrame(const ManipulatedFrame& mf);
+    ManipulatedFrame& operator=(const ManipulatedFrame& mf);
+
+    /*! This signal is emitted when ever the ManipulatedFrame is manipulated (i.e. rotated or
+    translated) using the mouse. Connect this signal to any object that should be notified.
+
+    Note that this signal is automatically connected to the QGLViewer::updateGL() slot, when the
+    ManipulatedFrame is attached to a viewer using QGLViewer::setManipulatedFrame(), which is
+    probably all you need.
+
+    Use the QGLViewer::QGLViewerPool() if you need to connect this signal to all the viewers.
+
+    See also the spun(), modified(), interpolated() and KeyFrameInterpolator::interpolated()
+    signals' documentations. */
+    void manipulated();
+
+    /*! This signal is emitted when the ManipulatedFrame isSpinning().
+
+    Note that for the QGLViewer::manipulatedFrame(), this signal is automatically connected to the
+    QGLViewer::updateGL() slot.
+
+    Connect this signal to any object that should be notified. Use the QGLViewer::QGLViewerPool() if
+    you need to connect this signal to all the viewers.
+
+    See also the manipulated(), modified(), interpolated() and KeyFrameInterpolator::interpolated()
+    signals' documentations. */
+    void spun();
+
+    /*! @name Manipulation sensitivity */
+    //@{
+  public:
+    /*! Defines the rotationSensitivity(). */
+    void setRotationSensitivity(float sensitivity) { rotSensitivity_ = sensitivity; };
+    /*! Defines the translationSensitivity(). */
+    void setTranslationSensitivity(float sensitivity) { transSensitivity_ = sensitivity; };
+    /*! Defines the spinningSensitivity(), in pixels per milliseconds. */
+    void setSpinningSensitivity(float sensitivity) { spinningSensitivity_ = sensitivity; };
+    /*! Defines the wheelSensitivity(). */
+    void setWheelSensitivity(float sensitivity) { wheelSensitivity_ = sensitivity; };
+  public:
+    /*! Returns the influence of a mouse displacement on the ManipulatedFrame rotation.
+
+    Default value is 1.0. With an identical mouse displacement, a higher value will generate a
+    larger rotation (and inversely for lower values). A 0.0 value will forbid ManipulatedFrame mouse
+    rotation (see also constraint()).
+
+    See also setRotationSensitivity(), translationSensitivity(), spinningSensitivity() and
+    wheelSensitivity(). */
+    float rotationSensitivity() const { return rotSensitivity_; };
+    /*! Returns the influence of a mouse displacement on the ManipulatedFrame translation.
+
+    Default value is 1.0. You should not have to modify this value, since with 1.0 the
+    ManipulatedFrame precisely stays under the mouse cursor.
+
+    With an identical mouse displacement, a higher value will generate a larger translation (and
+    inversely for lower values). A 0.0 value will forbid ManipulatedFrame mouse translation (see
+    also constraint()).
+
+    \note When the ManipulatedFrame is used to move a \e Camera (see the ManipulatedCameraFrame
+    class documentation), after zooming on a small region of your scene, the camera may translate
+    too fast. For a camera, it is the Camera::revolveAroundPoint() that exactly matches the mouse
+    displacement. Hence, instead of changing the translationSensitivity(), solve the problem by
+    (temporarily) setting the Camera::revolveAroundPoint() to a point on the zoomed region (see the
+    QGLViewer::RAP_FROM_PIXEL mouse binding in the <a href="../mouse.html">mouse page</a>).
+
+    See also setTranslationSensitivity(), rotationSensitivity(), spinningSensitivity() and
+    wheelSensitivity(). */
+    float translationSensitivity() const { return transSensitivity_; };
+    /*! Returns the minimum mouse speed required (at button release) to make the ManipulatedFrame
+      spin().
+
+    See spin(), spinningQuaternion() and startSpinning() for details.
+
+    Mouse speed is expressed in pixels per milliseconds. Default value is 0.3 (300 pixels per
+    second). Use setSpinningSensitivity() to tune this value. A higher value will make spinning more
+    difficult (a value of 100.0 forbids spinning in practice).
+
+    See also setSpinningSensitivity(), translationSensitivity(), rotationSensitivity() and
+    wheelSensitivity(). */
+    float spinningSensitivity() const { return spinningSensitivity_; };
+    /*! Returns the mouse wheel sensitivity.
+
+    Default value is 1.0. A higher value will make the wheel action more efficient (usually meaning
+    a faster zoom). Use a negative value to invert the zoom in and out directions.
+
+    See also setWheelSensitivity(), translationSensitivity(), rotationSensitivity() and
+    spinningSensitivity(). */
+    float wheelSensitivity() const { return wheelSensitivity_; };
+    //@}
+
+
+    /*! @name Spinning */
+    //@{
+      public:
+    /*! Returns \c true when the ManipulatedFrame is spinning.
+
+    During spinning, spin() rotates the ManipulatedFrame by its spinningQuaternion() at a frequency
+    defined when the ManipulatedFrame startSpinning().
+
+    Use startSpinning() and stopSpinning() to change this state. Default value is \c false. */
+    bool isSpinning() const { return isSpinning_; };
+    /*! Returns the incremental rotation that is applied by spin() to the ManipulatedFrame
+      orientation when it isSpinning().
+
+     Default value is a null rotation (identity Quaternion). Use setSpinningQuaternion() to change
+     this value.
+
+     The spinningQuaternion() axis is defined in the ManipulatedFrame coordinate system. You can use
+     Frame::transformOfFrom() to convert this axis from an other Frame coordinate system. */
+    Quaternion spinningQuaternion() const { return spinningQuaternion_; }
+  public:
+  /*! Defines the spinningQuaternion(). Its axis is defined in the ManipulatedFrame coordinate
+    system. */
+    void setSpinningQuaternion(const Quaternion& spinningQuaternion) { spinningQuaternion_ = spinningQuaternion; }
+  protected:
+    //virtual void spin();
+  private:
+    void spinUpdate();
+    //@}
+
+
+#ifndef DOXYGEN
+  protected:
+    Quaternion deformedBallQuaternion(int x, int y, float cx, float cy, const Camera* const camera);
+
+    int action_; // Should be a QGLViewer::MouseAction, but include loop
+    Constraint* previousConstraint_; // When manipulation is without Contraint.
+
+    //virtual void startAction(int ma, bool withConstraint=true); // int is really a QGLViewer::MouseAction
+
+    // Previous mouse position (used for incremental updates) and mouse press position.
+    Point prevPos_, pressPos_;
+#endif // DOXYGEN
+
+  private:
+    // Sensitivity
+    float rotSensitivity_;
+    float transSensitivity_;
+    float spinningSensitivity_;
+    float wheelSensitivity_;
+
+    // Mouse speed and spinning
+    float mouseSpeed_;
+    int delay_;
+    bool isSpinning_;
+    Quaternion spinningQuaternion_;
+
+    // Whether the SCREEN_TRANS direction (horizontal or vertical) is fixed or not.
+    bool dirIsFixed_;
+
+    // MouseGrabber
+    bool keepsGrabbingMouse_;
+  };
+
+//} // namespace qglviewer
+
+#endif // QGLVIEWER_MANIPULATED_FRAME_H
diff --git a/source/blender/freestyle/intern/app_blender/old_camera_vec_quaternion.txt b/source/blender/freestyle/intern/app_blender/old_camera_vec_quaternion.txt
new file mode 100644
index 00000000000..0d10049ee15
--- /dev/null
+++ b/source/blender/freestyle/intern/app_blender/old_camera_vec_quaternion.txt
@@ -0,0 +1,593 @@
+//
+//  Filename         : AppConfig.h
+//  Author           : Stephane Grabli
+//  Purpose          : Configuration file
+//  Date of creation : 26/02/2003
+//
+///////////////////////////////////////////////////////////////////////////////
+
+//
+//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+//   with this source distribution. 
+//
+//  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.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef  ARTGLWIDGET_H
+# define ARTGLWIDGET_H
+
+# ifndef WIN32
+#  include <algorithm>
+using namespace std;
+#  define __min(x,y) (min(x,y))
+#  define __max(x,y) (max(x,y))
+# endif // WIN32
+
+
+//# include <qstringlist.h>
+# include "../geometry/Geom.h"
+# include "../geometry/BBox.h"
+# include "../scene_graph/NodeDrawingStyle.h"
+# include "../system/TimeUtils.h"
+# include "../system/Precision.h"
+# include "AppConfig.h"
+# include "../rendering/GLDebugRenderer.h"
+//# include <QGLViewer/qglviewer.h>
+
+using namespace Geometry;
+
+typedef enum {SURFACIC, LINE, DEPTHBUFFER} RenderStyle;
+
+class FEdge;
+class QMainWindow;
+class GLRenderer;
+class GLSelectRenderer;
+class GLBBoxRenderer;
+class GLMonoColorRenderer;
+class GLDebugRenderer;
+
+class Vec{
+public:
+	Vec() {};
+	Vec(float _x, float _y, float _z): x(_x), y(_y), z(_z) {};
+	~Vec() {}
+	
+	float operator[] (unsigned i) {
+		switch(i){
+		case 0: return x; break;
+		case 1: return y; break;
+		case 2: return z; break;
+		}
+		return 0.0;
+	}
+		
+	
+	float x,y,z;
+};
+
+class Quaternion{
+public:
+	Quaternion( float _x, float _y, float _z, float _s): x(_x), y(_y), z(_z), s(_s){};
+	~Quaternion() {}
+	
+	float operator[] (unsigned i) {
+		switch(i){
+		case 0: return x; break;
+		case 1: return y; break;
+		case 2: return z; break;
+		case 3: return s; break;
+		}
+		return 0.0;
+	}
+	
+	float x,y,z,s;
+};
+
+class Camera {
+	private:
+		float _position[3];
+		float _orientation[3];
+		
+	public:
+		Camera(){};
+	  	~Camera() {};
+		
+		void setZNearCoefficient(float f) {}
+		void playPath(int i) {}
+
+		void loadProjectionMatrix() {}
+		void loadModelViewMatrix() {}
+		real distanceToSceneCenter() { return 0;}
+		void showEntireScene() {} 
+		real zFar() {return 0;}
+		real zNear() {return 0;}
+		void setPosition(Vec v) {}
+		void setOrientation(Quaternion q) {}
+		float* position() { return _position; }
+		float* orientation()  { return _orientation; }
+		void getWorldCoordinatesOf(float *src, float *vp_tmp) {}
+
+};
+
+
+//class AppGLWidget : public QGLViewer
+class AppGLWidget
+{
+  //Q_OBJECT
+
+    
+public:
+
+  AppGLWidget(const char *iName = 0);
+  virtual ~AppGLWidget();
+  
+public:
+
+	inline void swapBuffers() {}
+  inline void updateGL() {}
+  inline void makeCurrent() {}
+  inline void setSceneBoundingBox(Vec &min_, Vec &max_) {}
+	inline void saveSnapshot(bool b) {}
+	inline real width() { return _width; }
+	inline real height() { return _height; }
+	 void setStateFileName(const string& name) { stateFileName_ = name; };
+	
+	
+Camera * _camera;
+
+  // captures a frame animation that was previously registered
+  void captureMovie();
+
+  /*! Sets the rendering style.
+        iStyle
+          The style used to render. Can be:
+          SURFACIC    : usual rendering
+          LINES       : line rendering
+          DEPTHBUFFER : grey-levels rendering of the depth buffer
+          */
+  inline void SetRenderStyle(RenderStyle iStyle)
+  {
+    _RenderStyle = iStyle;
+  }
+
+  /*! Sets the model to draw in the viewer 
+   *  iModel
+   *    The Root Node of the model 
+   */
+  inline void SetModel(NodeGroup *iModel)
+  {
+    if(0 != _ModelRootNode->numberOfChildren())
+    {
+      _ModelRootNode->DetachChildren();
+      _ModelRootNode->clearBBox();
+    }
+      
+    AddModel(iModel);
+  }
+
+  /*! Adds a model for displaying in the viewer */
+  inline void AddModel(NodeGroup *iModel) 
+  {
+    _ModelRootNode->AddChild(iModel);
+    
+    _ModelRootNode->UpdateBBox();
+
+    _minBBox = __min(__min(_ModelRootNode->bbox().getMin()[0], 
+                            _ModelRootNode->bbox().getMin()[1]),
+                      _ModelRootNode->bbox().getMin()[2]);
+    _maxBBox = __max(__max(_ModelRootNode->bbox().getMax()[0], 
+                            _ModelRootNode->bbox().getMax()[1]),
+                      _ModelRootNode->bbox().getMax()[2]);
+    
+     _maxAbs = __max(rabs(_minBBox), rabs(_maxBBox));
+
+     _minAbs = __min(rabs(_minBBox), rabs(_maxBBox));
+
+     // DEBUG:
+    ReInitRenderers();
+ 
+  }
+
+  inline void AddSilhouette(NodeGroup* iSilhouette)
+  {
+    _SilhouetteRootNode->AddChild(iSilhouette);
+    //ToggleSilhouette(true);
+    updateGL();
+  }
+
+  inline void Add2DSilhouette(NodeGroup *iSilhouette)
+  {
+    //_pFENode->AddChild(iSilhouette);
+    //ToggleSilhouette(true);
+    updateGL();
+  }
+
+  inline void Add2DVisibleSilhouette(NodeGroup *iVSilhouette)
+  {
+    //_pVisibleSilhouetteNode->AddChild(iVSilhouette);
+    updateGL();
+  }
+
+  inline void SetDebug(NodeGroup* iDebug)
+  {
+    if(0 != _DebugRootNode->numberOfChildren())
+    {
+      _DebugRootNode->DetachChildren();
+      _DebugRootNode->clearBBox();
+    }
+      
+    AddDebug(iDebug);
+  }
+
+  inline void AddDebug(NodeGroup* iDebug)
+  {
+    _DebugRootNode->AddChild(iDebug);
+    updateGL();
+  }
+
+  inline void DetachModel(Node *iModel)
+  {
+    _ModelRootNode->DetachChild(iModel);
+    _ModelRootNode->UpdateBBox();
+    
+    _minBBox = __min(__min(_ModelRootNode->bbox().getMin()[0], 
+                            _ModelRootNode->bbox().getMin()[1]),
+                      _ModelRootNode->bbox().getMin()[2]);
+    _maxBBox = __max(__max(_ModelRootNode->bbox().getMax()[0], 
+                            _ModelRootNode->bbox().getMax()[1]),
+                      _ModelRootNode->bbox().getMax()[2]);
+    
+     _maxAbs = __max(rabs(_minBBox), rabs(_maxBBox));
+     _minAbs = __min(rabs(_minBBox), rabs(_maxBBox));
+  } 
+
+  inline void DetachModel() 
+  {
+    _ModelRootNode->DetachChildren();
+    _ModelRootNode->clearBBox();
+    
+    // 2D Scene
+    //_p2DNode.DetachChildren();
+    //_pFENode->DetachChildren();
+    //_pVisibleSilhouetteNode->DetachChildren();
+    updateGL();
+  }
+
+  inline void DetachSilhouette()
+  {
+    _SilhouetteRootNode->DetachChildren();
+    //_pFENode->DetachChildren();
+    //_pVisibleSilhouetteNode->DetachChildren();
+    _p2DSelectionNode->destroy();
+    //updateGL(); //FIXME
+  }
+
+  inline void DetachVisibleSilhouette()
+  {
+    //_pVisibleSilhouetteNode->DetachChildren();
+    _p2DSelectionNode->destroy();
+    updateGL();
+  }
+
+  inline void DetachDebug()
+  {
+    _DebugRootNode->DetachChildren();
+    updateGL();
+  }
+
+  void SetMainWindow(QMainWindow *iMainWindow) ;
+
+  inline void Set3DContext()
+  {
+    // GL_PROJECTION matrix
+    _camera->loadProjectionMatrix();
+    // GL_MODELVIEW matrix
+    _camera->loadModelViewMatrix();
+  }
+  
+  inline void RetriveModelViewMatrix(float *p)
+  {
+    makeCurrent();
+    glGetFloatv(GL_MODELVIEW_MATRIX, p);
+  }
+  inline void RetriveModelViewMatrix(real *p)
+  {
+    makeCurrent();
+    glGetDoublev(GL_MODELVIEW_MATRIX, p);
+  }
+
+  inline void RetrieveProjectionMatrix(float *p)
+  {
+    makeCurrent();
+    glGetFloatv(GL_PROJECTION_MATRIX, p);
+
+  }
+  inline void RetrieveProjectionMatrix(real *p)
+  {
+    makeCurrent();
+    glGetDoublev(GL_PROJECTION_MATRIX, p);
+
+  }
+
+  inline void RetrieveViewport(int *p)
+  {
+    makeCurrent();
+    glGetIntegerv(GL_VIEWPORT,(GLint *)p);
+  }
+  
+  inline real GetFocalLength() const
+  {
+    real Near =  __max(0.1,(real)(-2.f*_maxAbs+_camera->distanceToSceneCenter()));
+    return Near;
+  }
+
+  inline real GetAspect() const
+  {
+    return ((real) _width/(real) _height);
+  }
+
+  inline real GetFovyRadian() const
+  {
+    return _Fovy/180.0 * M_PI;
+  }
+
+  inline real GetFovyDegrees() const
+  {
+    return _Fovy;
+  }
+
+  inline void FitBBox()
+  {
+	Vec min_(_ModelRootNode->bbox().getMin()[0],
+    			_ModelRootNode->bbox().getMin()[1],
+    			_ModelRootNode->bbox().getMin()[2]);
+	Vec max_(_ModelRootNode->bbox().getMax()[0],
+    			_ModelRootNode->bbox().getMax()[1],
+    			_ModelRootNode->bbox().getMax()[2]);
+    setSceneBoundingBox(min_, max_);
+    _camera->showEntireScene();
+  }
+  
+  inline void ToggleSilhouette(bool enabled) 
+  {
+    _fedges = enabled;
+    updateGL();
+  }
+  
+  // Reinit the renderers which need to be informed
+  // when a model is added to the scene.
+  void ReInitRenderers();
+
+  inline void SetSelectedFEdge(FEdge* iFEdge) { _pDebugRenderer->SetSelectedFEdge(iFEdge); }
+
+  inline GLDebugRenderer* debugRenderer() { return _pDebugRenderer; }
+  inline void toggle3D() { _Draw3DScene == true ? _Draw3DScene = false : _Draw3DScene = true; updateGL();}
+
+  /*! glReadPixels */
+  typedef enum{
+    RGB,
+    DEPTH
+  } PixelFormat;
+  void readPixels(int x,
+                  int y,
+                  int width,
+                  int height,
+                  PixelFormat format,
+                  float *pixels) 
+  {
+    makeCurrent();
+    //glReadBuffer(GL_FRONT); //in reality: glReadBuffer and glDrawBuffer are both set to GL_BACK
+    glReadBuffer(GL_BACK);
+    GLenum glformat;
+    switch(format)
+    {
+    case RGB:
+      glformat = GL_RGB;
+      break;
+    case DEPTH:
+      glformat = GL_DEPTH_COMPONENT;
+      break;
+    default:
+      break;
+    }
+    glReadPixels(x,y,width, height, glformat, GL_FLOAT, (GLfloat*)pixels);
+  }
+
+  void clear() { makeCurrent(); glClear(GL_COLOR_BUFFER_BIT ); }
+
+  void prepareCanvas();
+  void releaseCanvas();
+
+  typedef enum {
+    FRONT,
+    BACK
+  } GLBuffer;
+
+  void setReadPixelsBuffer(int iBuffer) 
+  {
+    makeCurrent();
+    switch(iBuffer)
+    {
+    case FRONT:
+      glReadBuffer(GL_FRONT);
+      break;
+    case BACK:
+      glReadBuffer(GL_BACK);
+      break;
+    default:
+      break;
+    }
+  }
+
+  BBox<Vec3r> scene3DBBox() const { return _ModelRootNode->bbox(); }
+
+  inline real znear() const {
+    return _camera->zNear();
+  }
+  
+  inline real zfar() const {
+    return _camera->zFar();
+  }
+
+  inline bool draw3DsceneEnabled() const { return _Draw3DScene; }
+
+  inline bool getRecordFlag() const {return _record;}
+
+  void setCameraState(const float* position, const float* orientation) {
+    _camera->setPosition(Vec(position[0], position[1], position[2]));
+    _camera->setOrientation(Quaternion(orientation[0], orientation[1], orientation[2], orientation[3]));
+  }
+
+  void getCameraState(float* position, float* orientation) const {
+    float* pos = _camera->position();
+    float* orient = _camera->orientation();
+    int i;
+    for(i=0;i<3;++i){
+      position[i] = pos[i];
+    }
+    for(i=0;i<4;++i){
+      orientation[i] = orient[i];
+    }
+  }
+
+  void saveCameraState() {
+    getCameraState(_cameraPosition, _cameraOrientation);
+    _cameraStateSaved = true;
+  }
+
+  void setUpdateMode(bool b) {
+    _enableUpdateSilhouettes = b;
+  }
+
+  bool getUpdateMode() const {
+    return _enableUpdateSilhouettes;
+  }
+  static void setFrontBufferFlag(bool iBool);
+  static bool getFrontBufferFlag();
+  static void setBackBufferFlag(bool iBool);
+  static bool getBackBufferFlag();
+
+protected:
+  virtual void	  init();
+  virtual void    draw();
+
+  /*! Loads an envmap */
+  void LoadEnvMap(const char *filename);
+
+public:
+  /*! Core scene drawing */
+  void            DrawScene(SceneVisitor *iRenderer);
+
+  /*! 2D Scene Drawing */
+  void            Draw2DScene(SceneVisitor *iRenderer);
+
+  /*! Draws scene silhouettes in real time */
+  void            DrawSilhouette();
+  
+  /*! Draws the Scene in lines style */
+  //  void            DrawLines();
+  //  /*! Draws the scene in surfacic style */
+  //  void            DrawSurfacic();
+  //  /*! Draws the scene as a depth buffer image */
+  //  void            DrawDepthBuffer();
+
+  GLRenderer* glRenderer() {return _pGLRenderer;}
+
+protected:
+
+
+  //QString shortcutBindingsString() const;
+
+  /*! fabs or abs */
+  inline int rabs(int x) {return abs(x);}
+  inline real rabs(real x) {return fabs(x);}
+
+  
+protected:
+  float _Fovy;
+  //float _SceneDepth;
+  //BBox<Vec3f> _BBox;
+  
+  RenderStyle _RenderStyle;
+
+  //The root node container
+  NodeGroup        _RootNode;
+  NodeDrawingStyle *_ModelRootNode;
+  NodeDrawingStyle *_SilhouetteRootNode;
+  NodeDrawingStyle *_DebugRootNode;
+  
+  bool _silhouette;
+  bool _fedges;
+  bool _debug;
+  bool _selection_mode;
+
+  //a Universal light:
+  NodeGroup _Light;
+
+  real _minBBox;
+  real _maxBBox;
+  real _maxAbs;
+
+  real _minAbs;
+  bool _drawBBox;
+
+  // OpenGL Renderer
+  GLRenderer *_pGLRenderer;
+  GLSelectRenderer *_pSelectRenderer;
+  GLBBoxRenderer *_pBBoxRenderer;
+  GLMonoColorRenderer *_pMonoColorRenderer;
+  GLDebugRenderer *_pDebugRenderer;
+  
+  QMainWindow *_pMainWindow;
+
+  Chronometer _Chrono;
+
+  // 2D Scene
+  bool _Draw2DScene;
+  bool _Draw3DScene;  NodeGroup _p2DNode;
+  //NodeDrawingStyle *_pFENode; // Feature edges node
+  //NodeDrawingStyle *_pVisibleSilhouetteNode;
+  NodeDrawingStyle *_p2DSelectionNode;
+
+  // EnvMap
+  bool _drawEnvMap;
+  int _currentEnvMap;
+  int _maxId;
+  int _blendFunc;
+
+  // Each time we compute the view map, the camera state is 
+  // saved in order to be able to restore it later
+  bool  _cameraStateSaved;
+  float _cameraPosition[3];
+  float _cameraOrientation[4];
+
+  // interactive silhouette update
+  bool _enableUpdateSilhouettes;
+  //capture movie
+  bool _captureMovie;
+  // 2D drawing buffers
+  static bool _frontBufferFlag;
+  static bool _backBufferFlag;
+
+  bool _record;
+
+
+real _width, _height;
+Vec _min,_max;
+string stateFileName_;
+};
+
+#endif // ARTGLWIDGET_H
diff --git a/source/blender/freestyle/intern/app_blender/point.h b/source/blender/freestyle/intern/app_blender/point.h
new file mode 100644
index 00000000000..81903f174a8
--- /dev/null
+++ b/source/blender/freestyle/intern/app_blender/point.h
@@ -0,0 +1,159 @@
+#ifndef POINT_H
+#define POINT_H
+
+typedef int QCOORD; 
+
+class Point
+{
+public:
+    Point();
+    Point( int xpos, int ypos );
+
+    bool   isNull()	const;
+
+    int	   x()		const;
+    int	   y()		const;
+    void   setX( int x );
+    void   setY( int y );
+
+    int manhattanLength() const;
+
+    QCOORD &rx();
+    QCOORD &ry();
+
+    Point &operator+=( const Point &p );
+    Point &operator-=( const Point &p );
+    Point &operator*=( int c );
+    Point &operator*=( double c );
+    Point &operator/=( int c );
+    Point &operator/=( double c );
+
+    friend inline bool	 operator==( const Point &, const Point & );
+    friend inline bool	 operator!=( const Point &, const Point & );
+    friend inline const Point operator+( const Point &, const Point & );
+    friend inline const Point operator-( const Point &, const Point & );
+    friend inline const Point operator*( const Point &, int );
+    friend inline const Point operator*( int, const Point & );
+    friend inline const Point operator*( const Point &, double );
+    friend inline const Point operator*( double, const Point & );
+    friend inline const Point operator-( const Point & );
+    friend inline const Point operator/( const Point &, int );
+    friend inline const Point operator/( const Point &, double );
+
+private:
+    QCOORD xp;
+    QCOORD yp;
+};
+
+static void warningDivByZero() {
+	// cout << "warning: dividing by zero"
+}
+
+
+/*****************************************************************************
+  Point inline functions
+ *****************************************************************************/
+
+inline Point::Point()
+{ xp=0; yp=0; }
+
+inline Point::Point( int xpos, int ypos )
+{ xp=(QCOORD)xpos; yp=(QCOORD)ypos; }
+
+inline bool Point::isNull() const
+{ return xp == 0 && yp == 0; }
+
+inline int Point::x() const
+{ return xp; }
+
+inline int Point::y() const
+{ return yp; }
+
+inline void Point::setX( int x )
+{ xp = (QCOORD)x; }
+
+inline void Point::setY( int y )
+{ yp = (QCOORD)y; }
+
+inline QCOORD &Point::rx()
+{ return xp; }
+
+inline QCOORD &Point::ry()
+{ return yp; }
+
+inline Point &Point::operator+=( const Point &p )
+{ xp+=p.xp; yp+=p.yp; return *this; }
+
+inline Point &Point::operator-=( const Point &p )
+{ xp-=p.xp; yp-=p.yp; return *this; }
+
+inline Point &Point::operator*=( int c )
+{ xp*=(QCOORD)c; yp*=(QCOORD)c; return *this; }
+
+inline Point &Point::operator*=( double c )
+{ xp=(QCOORD)(xp*c); yp=(QCOORD)(yp*c); return *this; }
+
+inline bool operator==( const Point &p1, const Point &p2 )
+{ return p1.xp == p2.xp && p1.yp == p2.yp; }
+
+inline bool operator!=( const Point &p1, const Point &p2 )
+{ return p1.xp != p2.xp || p1.yp != p2.yp; }
+
+inline const Point operator+( const Point &p1, const Point &p2 )
+{ return Point(p1.xp+p2.xp, p1.yp+p2.yp); }
+
+inline const Point operator-( const Point &p1, const Point &p2 )
+{ return Point(p1.xp-p2.xp, p1.yp-p2.yp); }
+
+inline const Point operator*( const Point &p, int c )
+{ return Point(p.xp*c, p.yp*c); }
+
+inline const Point operator*( int c, const Point &p )
+{ return Point(p.xp*c, p.yp*c); }
+
+inline const Point operator*( const Point &p, double c )
+{ return Point((QCOORD)(p.xp*c), (QCOORD)(p.yp*c)); }
+
+inline const Point operator*( double c, const Point &p )
+{ return Point((QCOORD)(p.xp*c), (QCOORD)(p.yp*c)); }
+
+inline const Point operator-( const Point &p )
+{ return Point(-p.xp, -p.yp); }
+
+inline Point &Point::operator/=( int c )
+{
+    if ( c == 0 )
+		warningDivByZero();
+
+    xp/=(QCOORD)c;
+    yp/=(QCOORD)c;
+    return *this;
+}
+
+inline Point &Point::operator/=( double c )
+{
+    if ( c == 0.0 )
+		warningDivByZero();
+
+    xp=(QCOORD)(xp/c);
+    yp=(QCOORD)(yp/c);
+    return *this;
+}
+
+inline const Point operator/( const Point &p, int c )
+{
+    if ( c == 0 )
+		warningDivByZero();
+	
+    return Point(p.xp/c, p.yp/c);
+}
+
+inline const Point operator/( const Point &p, double c )
+{
+    if ( c == 0.0 )
+		warningDivByZero();
+
+    return Point((QCOORD)(p.xp/c), (QCOORD)(p.yp/c));
+}
+
+#endif // POINT_H
\ No newline at end of file
diff --git a/source/blender/freestyle/intern/app_blender/quaternion.cpp b/source/blender/freestyle/intern/app_blender/quaternion.cpp
new file mode 100644
index 00000000000..3dd42ed6ed3
--- /dev/null
+++ b/source/blender/freestyle/intern/app_blender/quaternion.cpp
@@ -0,0 +1,502 @@
+/****************************************************************************
+
+ Copyright (C) 2002-2007 Gilles Debunne (Gilles.Debunne@imag.fr)
+
+ This file is part of the QGLViewer library.
+ Version 2.2.6-3, released on August 28, 2007.
+
+ http://artis.imag.fr/Members/Gilles.Debunne/QGLViewer
+
+ libQGLViewer 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.
+
+ libQGLViewer 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 libQGLViewer; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*****************************************************************************/
+
+#include "quaternion.h"
+#include <stdlib.h> // RAND_MAX
+
+// All the methods are declared inline in Quaternion.h
+using namespace std;
+
+/*! Constructs a Quaternion that will rotate from the \p from direction to the \p to direction.
+
+Note that this rotation is not uniquely defined. The selected axis is usually orthogonal to \p from
+and \p to. However, this method is robust and can handle small or almost identical vectors. */
+Quaternion::Quaternion(const Vec& from, const Vec& to)
+{
+  const float epsilon = 1E-10f;
+
+  const float fromSqNorm = from.squaredNorm();
+  const float toSqNorm   = to.squaredNorm();
+  // Identity Quaternion when one vector is null
+  if ((fromSqNorm < epsilon) || (toSqNorm < epsilon))
+    {
+      q[0]=q[1]=q[2]=0.0;
+      q[3]=1.0;
+    }
+  else
+    {
+      Vec axis = cross(from, to);
+      const float axisSqNorm = axis.squaredNorm();
+
+      // Aligned vectors, pick any axis, not aligned with from or to
+      if (axisSqNorm < epsilon)
+	axis = from.orthogonalVec();
+
+      double angle = asin(sqrt(axisSqNorm / (fromSqNorm * toSqNorm)));
+
+      if (from*to < 0.0)
+	angle = M_PI-angle;
+
+      setAxisAngle(axis, angle);
+    }
+}
+
+/*! Returns the image of \p v by the Quaternion inverse() rotation.
+
+rotate() performs an inverse transformation. Same as inverse().rotate(v). */
+Vec Quaternion::inverseRotate(const Vec& v) const
+{
+  return inverse().rotate(v);
+}
+
+/*! Returns the image of \p v by the Quaternion rotation.
+
+See also inverseRotate() and operator*(const Quaternion&, const Vec&). */
+Vec Quaternion::rotate(const Vec& v) const
+{
+  const double q00 = 2.0l * q[0] * q[0];
+  const double q11 = 2.0l * q[1] * q[1];
+  const double q22 = 2.0l * q[2] * q[2];
+
+  const double q01 = 2.0l * q[0] * q[1];
+  const double q02 = 2.0l * q[0] * q[2];
+  const double q03 = 2.0l * q[0] * q[3];
+
+  const double q12 = 2.0l * q[1] * q[2];
+  const double q13 = 2.0l * q[1] * q[3];
+
+  const double q23 = 2.0l * q[2] * q[3];
+
+  return Vec((1.0 - q11 - q22)*v[0] + (      q01 - q23)*v[1] + (      q02 + q13)*v[2],
+	     (      q01 + q23)*v[0] + (1.0 - q22 - q00)*v[1] + (      q12 - q03)*v[2],
+	     (      q02 - q13)*v[0] + (      q12 + q03)*v[1] + (1.0 - q11 - q00)*v[2] );
+}
+
+/*! Set the Quaternion from a (supposedly correct) 3x3 rotation matrix.
+
+  The matrix is expressed in European format: its three \e columns are the images by the rotation of
+  the three vectors of an orthogonal basis. Note that OpenGL uses a symmetric representation for its
+  matrices.
+
+  setFromRotatedBasis() sets a Quaternion from the three axis of a rotated frame. It actually fills
+  the three columns of a matrix with these rotated basis vectors and calls this method. */
+void Quaternion::setFromRotationMatrix(const double m[3][3])
+{
+  // Compute one plus the trace of the matrix
+  const double onePlusTrace = 1.0 + m[0][0] + m[1][1] + m[2][2];
+
+  if (onePlusTrace > 1E-5)
+    {
+      // Direct computation
+      const double s = sqrt(onePlusTrace) * 2.0;
+      q[0] = (m[2][1] - m[1][2]) / s;
+      q[1] = (m[0][2] - m[2][0]) / s;
+      q[2] = (m[1][0] - m[0][1]) / s;
+      q[3] = 0.25 * s;
+    }
+  else
+    {
+      // Computation depends on major diagonal term
+      if ((m[0][0] > m[1][1])&(m[0][0] > m[2][2]))
+	{ 
+	  const double s = sqrt(1.0 + m[0][0] - m[1][1] - m[2][2]) * 2.0; 
+	  q[0] = 0.25 * s;
+	  q[1] = (m[0][1] + m[1][0]) / s; 
+	  q[2] = (m[0][2] + m[2][0]) / s; 
+	  q[3] = (m[1][2] - m[2][1]) / s;
+	}
+      else
+	if (m[1][1] > m[2][2])
+	  { 
+	    const double s = sqrt(1.0 + m[1][1] - m[0][0] - m[2][2]) * 2.0; 
+	    q[0] = (m[0][1] + m[1][0]) / s; 
+	    q[1] = 0.25 * s;
+	    q[2] = (m[1][2] + m[2][1]) / s; 
+	    q[3] = (m[0][2] - m[2][0]) / s;
+	  }
+	else
+	  { 
+	    const double s = sqrt(1.0 + m[2][2] - m[0][0] - m[1][1]) * 2.0; 
+	    q[0] = (m[0][2] + m[2][0]) / s; 
+	    q[1] = (m[1][2] + m[2][1]) / s; 
+	    q[2] = 0.25 * s;
+	    q[3] = (m[0][1] - m[1][0]) / s;
+	  }
+    }
+  normalize();
+}
+
+#ifndef DOXYGEN
+void Quaternion::setFromRotationMatrix(const float m[3][3])
+{
+  cout << "setFromRotationMatrix now waits for a double[3][3] parameter" << endl;
+
+  double mat[3][3];
+  for (int i=0; i<3; ++i)
+    for (int j=0; j<3; ++j)
+      mat[i][j] = double(m[i][j]);
+
+  setFromRotationMatrix(mat);
+}
+
+void Quaternion::setFromRotatedBase(const Vec& X, const Vec& Y, const Vec& Z)
+{
+  cout << "setFromRotatedBase is deprecated, use setFromRotatedBasis instead" << endl;
+  setFromRotatedBasis(X,Y,Z);
+}
+#endif
+
+/*! Sets the Quaternion from the three rotated vectors of an orthogonal basis.
+
+  The three vectors do not have to be normalized but must be orthogonal and direct (X^Y=k*Z, with k>0).
+
+  \code
+  Quaternion q;
+  q.setFromRotatedBasis(X, Y, Z);
+  // Now q.rotate(Vec(1,0,0)) == X and q.inverseRotate(X) == Vec(1,0,0)
+  // Same goes for Y and Z with Vec(0,1,0) and Vec(0,0,1).
+  \endcode
+
+  See also setFromRotationMatrix() and Quaternion(const Vec&, const Vec&). */
+void Quaternion::setFromRotatedBasis(const Vec& X, const Vec& Y, const Vec& Z)
+{
+  double m[3][3];
+  double normX = X.norm();
+  double normY = Y.norm();
+  double normZ = Z.norm();
+
+  for (int i=0; i<3; ++i)
+    {
+      m[i][0] = X[i] / normX;
+      m[i][1] = Y[i] / normY;
+      m[i][2] = Z[i] / normZ;
+    }
+  
+  setFromRotationMatrix(m);
+}
+
+/*! Returns the axis vector and the angle (in radians) of the rotation represented by the Quaternion.
+ See the axis() and angle() documentations. */
+void Quaternion::getAxisAngle(Vec& axis, float& angle) const
+{
+  angle = 2.0*acos(q[3]);
+  axis = Vec(q[0], q[1], q[2]);
+  const float sinus = axis.norm();
+  if (sinus > 1E-8)
+    axis /= sinus;
+
+  if (angle > M_PI)
+    {
+      angle = 2.0*M_PI - angle;
+      axis = -axis;
+    }
+}
+
+/*! Returns the normalized axis direction of the rotation represented by the Quaternion.
+
+It is null for an identity Quaternion. See also angle() and getAxisAngle(). */
+Vec Quaternion::axis() const
+{
+  Vec res = Vec(q[0], q[1], q[2]);
+  const float sinus = res.norm();
+  if (sinus > 1E-8)
+    res /= sinus;
+  return (acos(q[3]) <= M_PI/2.0) ? res : -res;
+}
+
+/*! Returns the angle (in radians) of the rotation represented by the Quaternion.
+
+ This value is always in the range [0-pi]. Larger rotational angles are obtained by inverting the
+ axis() direction.
+
+ See also axis() and getAxisAngle(). */
+float Quaternion::angle() const
+{
+  const float angle = 2.0 * acos(q[3]);
+  return (angle <= M_PI) ? angle : 2.0*M_PI - angle;
+}
+
+
+
+
+/*! Returns the Quaternion associated 4x4 OpenGL rotation matrix.
+
+ Use \c glMultMatrixd(q.matrix()) to apply the rotation represented by Quaternion \c q to the
+ current OpenGL matrix.
+
+ See also getMatrix(), getRotationMatrix() and inverseMatrix().
+
+ \attention The result is only valid until the next call to matrix(). Use it immediately (as shown
+ above) or consider using getMatrix() instead.
+
+ \attention The matrix is given in OpenGL format (row-major order) and is the transpose of the
+ actual mathematical European representation. Consider using getRotationMatrix() instead. */
+const GLdouble* Quaternion::matrix() const
+{
+  static GLdouble m[4][4];
+  getMatrix(m);
+  return (const GLdouble*)(m);
+}
+
+/*! Fills \p m with the OpenGL representation of the Quaternion rotation.
+
+Use matrix() if you do not need to store this matrix and simply want to alter the current OpenGL
+matrix. See also getInverseMatrix() and Frame::getMatrix(). */
+void Quaternion::getMatrix(GLdouble m[4][4]) const
+{
+  const double q00 = 2.0l * q[0] * q[0];
+  const double q11 = 2.0l * q[1] * q[1];
+  const double q22 = 2.0l * q[2] * q[2];
+
+  const double q01 = 2.0l * q[0] * q[1];
+  const double q02 = 2.0l * q[0] * q[2];
+  const double q03 = 2.0l * q[0] * q[3];
+
+  const double q12 = 2.0l * q[1] * q[2];
+  const double q13 = 2.0l * q[1] * q[3];
+
+  const double q23 = 2.0l * q[2] * q[3];
+
+  m[0][0] = 1.0l - q11 - q22;
+  m[1][0] =        q01 - q23;
+  m[2][0] =        q02 + q13;
+
+  m[0][1] =        q01 + q23;
+  m[1][1] = 1.0l - q22 - q00;
+  m[2][1] =        q12 - q03;
+
+  m[0][2] =        q02 - q13;
+  m[1][2] =        q12 + q03;
+  m[2][2] = 1.0l - q11 - q00;
+
+  m[0][3] = 0.0l;
+  m[1][3] = 0.0l;
+  m[2][3] = 0.0l;
+
+  m[3][0] = 0.0l;
+  m[3][1] = 0.0l;
+  m[3][2] = 0.0l;
+  m[3][3] = 1.0l;
+}
+
+/*! Same as getMatrix(), but with a \c GLdouble[16] parameter. See also getInverseMatrix() and Frame::getMatrix(). */
+void Quaternion::getMatrix(GLdouble m[16]) const
+{
+  static GLdouble mat[4][4];
+  getMatrix(mat);
+  int count = 0;
+  for (int i=0; i<4; ++i)
+    for (int j=0; j<4; ++j)
+      m[count++] = mat[i][j];
+}
+
+/*! Fills \p m with the 3x3 rotation matrix associated with the Quaternion.
+
+  See also getInverseRotationMatrix().
+
+  \attention \p m uses the European mathematical representation of the rotation matrix. Use matrix()
+  and getMatrix() to retrieve the OpenGL transposed version. */
+void Quaternion::getRotationMatrix(float m[3][3]) const
+{
+  static GLdouble mat[4][4];
+  getMatrix(mat);
+  for (int i=0; i<3; ++i)
+    for (int j=0; j<3; ++j)
+      // Beware of transposition
+      m[i][j] = mat[j][i];
+}
+
+/*! Returns the associated 4x4 OpenGL \e inverse rotation matrix. This is simply the matrix() of the
+  inverse().
+
+  \attention The result is only valid until the next call to inverseMatrix(). Use it immediately (as
+  in \c glMultMatrixd(q.inverseMatrix())) or use getInverseMatrix() instead.
+
+  \attention The matrix is given in OpenGL format (row-major order) and is the transpose of the
+  actual mathematical European representation. Consider using getInverseRotationMatrix() instead. */
+const GLdouble* Quaternion::inverseMatrix() const
+{
+  static GLdouble m[4][4];
+  getInverseMatrix(m);
+  return (const GLdouble*)(m);
+}
+
+/*! Fills \p m with the OpenGL matrix corresponding to the inverse() rotation.
+
+Use inverseMatrix() if you do not need to store this matrix and simply want to alter the current
+OpenGL matrix. See also getMatrix(). */
+void Quaternion::getInverseMatrix(GLdouble m[4][4]) const
+{
+  inverse().getMatrix(m);
+}
+
+/*! Same as getInverseMatrix(), but with a \c GLdouble[16] parameter. See also getMatrix(). */
+void Quaternion::getInverseMatrix(GLdouble m[16]) const
+{
+  inverse().getMatrix(m);
+}
+
+/*! \p m is set to the 3x3 \e inverse rotation matrix associated with the Quaternion.
+
+ \attention This is the classical mathematical rotation matrix. The OpenGL format uses its
+ transposed version. See inverseMatrix() and getInverseMatrix(). */
+void Quaternion::getInverseRotationMatrix(float m[3][3]) const
+{
+  static GLdouble mat[4][4];
+  getInverseMatrix(mat);
+  for (int i=0; i<3; ++i)
+    for (int j=0; j<3; ++j)
+      // Beware of transposition
+      m[i][j] = mat[j][i];
+}
+
+
+/*! Returns the slerp interpolation of Quaternions \p a and \p b, at time \p t.
+
+ \p t should range in [0,1]. Result is \p a when \p t=0 and \p b when \p t=1.
+
+ When \p allowFlip is \c true (default) the slerp interpolation will always use the "shortest path"
+ between the Quaternions' orientations, by "flipping" the source Quaternion if needed (see
+ negate()). */
+Quaternion Quaternion::slerp(const Quaternion& a, const Quaternion& b, float t, bool allowFlip)
+{
+  float cosAngle = Quaternion::dot(a, b);
+
+  float c1, c2;
+  // Linear interpolation for close orientations
+  if ((1.0 - fabs(cosAngle)) < 0.01)
+    {
+      c1 = 1.0 - t;
+      c2 = t;
+    }
+  else
+    {
+      // Spherical interpolation
+      float angle    = acos(fabs(cosAngle));
+      float sinAngle = sin(angle);
+      c1 = sin(angle * (1.0 - t)) / sinAngle;
+      c2 = sin(angle * t) / sinAngle;
+    }
+
+  // Use the shortest path
+  if (allowFlip && (cosAngle < 0.0))
+    c1 = -c1;
+
+  return Quaternion(c1*a[0] + c2*b[0], c1*a[1] + c2*b[1], c1*a[2] + c2*b[2], c1*a[3] + c2*b[3]);
+}
+
+/*! Returns the slerp interpolation of the two Quaternions \p a and \p b, at time \p t, using
+  tangents \p tgA and \p tgB.
+
+  The resulting Quaternion is "between" \p a and \p b (result is \p a when \p t=0 and \p b for \p
+  t=1).
+
+  Use squadTangent() to define the Quaternion tangents \p tgA and \p tgB. */
+Quaternion Quaternion::squad(const Quaternion& a, const Quaternion& tgA, const Quaternion& tgB, const Quaternion& b, float t)
+{
+  Quaternion ab = Quaternion::slerp(a, b, t);
+  Quaternion tg = Quaternion::slerp(tgA, tgB, t, false);
+  return Quaternion::slerp(ab, tg, 2.0*t*(1.0-t), false);
+}
+
+/*! Returns the logarithm of the Quaternion. See also exp(). */
+Quaternion Quaternion::log()
+{
+  float len = sqrt(q[0]*q[0] + q[1]*q[1] + q[2]*q[2]);
+
+  if (len < 1E-6)
+    return Quaternion(q[0], q[1], q[2], 0.0);
+  else
+    {
+      float coef = acos(q[3]) / len;
+      return Quaternion(q[0]*coef, q[1]*coef, q[2]*coef, 0.0);
+    }
+}
+
+/*! Returns the exponential of the Quaternion. See also log(). */
+Quaternion Quaternion::exp()
+{
+  float theta = sqrt(q[0]*q[0] + q[1]*q[1] + q[2]*q[2]);
+
+  if (theta < 1E-6)
+    return Quaternion(q[0], q[1], q[2], cos(theta));
+  else
+    {
+      float coef = sin(theta) / theta;
+      return Quaternion(q[0]*coef, q[1]*coef, q[2]*coef, cos(theta));
+    }
+}
+
+/*! Returns log(a. inverse() * b). Useful for squadTangent(). */
+Quaternion Quaternion::lnDif(const Quaternion& a, const Quaternion& b)
+{
+  Quaternion dif = a.inverse()*b;
+  dif.normalize();
+  return dif.log();
+}
+
+/*! Returns a tangent Quaternion for \p center, defined by \p before and \p after Quaternions.
+
+ Useful for smooth spline interpolation of Quaternion with squad() and slerp(). */
+Quaternion Quaternion::squadTangent(const Quaternion& before, const Quaternion& center, const Quaternion& after)
+{
+  Quaternion l1 = Quaternion::lnDif(center,before);
+  Quaternion l2 = Quaternion::lnDif(center,after);
+  Quaternion e;
+  for (int i=0; i<4; ++i)
+    e.q[i] = -0.25 * (l1.q[i] + l2.q[i]);
+  e = center*(e.exp());
+
+  // if (Quaternion::dot(e,b) < 0.0)
+    // e.negate();
+
+  return e;
+}
+
+ostream& operator<<(ostream& o, const Quaternion& Q)
+{
+  return o << Q[0] << '\t' << Q[1] << '\t' << Q[2] << '\t' << Q[3];
+}
+
+/*! Returns a random unit Quaternion.
+
+You can create a randomly directed unit vector using:
+\code
+Vec randomDir = Quaternion::randomQuaternion() * Vec(1.0, 0.0, 0.0); // or any other Vec
+\endcode
+
+\note This function uses rand() to create pseudo-random numbers and the random number generator can
+be initialized using srand().*/
+Quaternion Quaternion::randomQuaternion()
+{
+  // The rand() function is not very portable and may not be available on your system.
+  // Add the appropriate include or replace by an other random function in case of problem.
+  double seed = rand()/(float)RAND_MAX;
+  double r1 = sqrt(1.0 - seed);
+  double r2 = sqrt(seed);
+  double t1 = 2.0 * M_PI * (rand()/(float)RAND_MAX);
+  double t2 = 2.0 * M_PI * (rand()/(float)RAND_MAX);
+  return Quaternion(sin(t1)*r1, cos(t1)*r1, sin(t2)*r2, cos(t2)*r2);
+}
diff --git a/source/blender/freestyle/intern/app_blender/quaternion.h b/source/blender/freestyle/intern/app_blender/quaternion.h
new file mode 100644
index 00000000000..e3bc876aa4c
--- /dev/null
+++ b/source/blender/freestyle/intern/app_blender/quaternion.h
@@ -0,0 +1,304 @@
+/****************************************************************************
+
+ Copyright (C) 2002-2007 Gilles Debunne (Gilles.Debunne@imag.fr)
+
+ This file is part of the QGLViewer library.
+ Version 2.2.6-3, released on August 28, 2007.
+
+ http://artis.imag.fr/Members/Gilles.Debunne/QGLViewer
+
+ libQGLViewer 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.
+
+ libQGLViewer 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 libQGLViewer; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*****************************************************************************/
+
+#ifndef QGLVIEWER_QUATERNION_H
+#define QGLVIEWER_QUATERNION_H
+
+#include "config.h"
+#include "vec.h"
+
+  /*! \brief The Quaternion class represents 3D rotations and orientations.
+  \class Quaternion quaternion.h QGLViewer/quaternion.h
+
+  The Quaternion is an appropriate (although not very intuitive) representation for 3D rotations and
+  orientations. Many tools are provided to ease the definition of a Quaternion: see constructors,
+  setAxisAngle(), setFromRotationMatrix(), setFromRotatedBasis().
+
+  You can apply the rotation represented by the Quaternion to 3D points using rotate() and
+  inverseRotate(). See also the Frame class that represents a coordinate system and provides other
+  conversion functions like Frame::coordinatesOf() and Frame::transformOf().
+
+  You can apply the Quaternion \c q rotation to the OpenGL matrices using:
+  \code
+  glMultMatrixd(q.matrix());
+  // equvalent to glRotate(q.angle()*180.0/M_PI, q.axis().x, q.axis().y, q.axis().z);
+  \endcode
+
+  Quaternion is part of the \c qglviewer namespace, specify \c qglviewer::Quaternion or use the qglviewer
+  namespace: \code using namespace qglviewer; \endcode
+
+  <h3>Internal representation</h3>
+
+  The internal representation of a Quaternion corresponding to a rotation around axis \c axis, with an angle
+  \c alpha is made of four doubles q[i]:
+  \code
+  {q[0],q[1],q[2]} = sin(alpha/2) * {axis[0],axis[1],axis[2]}
+  q[3] = cos(alpha/2)
+  \endcode
+
+  Note that certain implementations place the cosine term in first position (instead of last here).
+
+  The Quaternion is always normalized, so that its inverse() is actually its conjugate.
+
+  See also the Vec and Frame classes' documentations.
+  \nosubgrouping */
+class Quaternion
+{
+public:
+  /*! @name Defining a Quaternion */
+  //@{
+  /*! Default constructor, builds an identity rotation. */
+  Quaternion()
+  { q[0]=q[1]=q[2]=0.0;  q[3]=1.0; }
+
+  /*! Constructor from rotation axis (non null) and angle (in radians). See also setAxisAngle(). */
+  Quaternion(const Vec& axis, double angle)
+  {
+    setAxisAngle(axis, angle);
+  }
+
+  Quaternion(const Vec& from, const Vec& to);
+
+  /*! Constructor from the four values of a Quaternion. First three values are axis*sin(angle/2) and
+    last one is cos(angle/2).
+
+  \attention The identity Quaternion is Quaternion(0,0,0,1) and \e not Quaternion(0,0,0,0) (which is
+  not unitary). The default Quaternion() creates such identity Quaternion. */
+  Quaternion(double q0, double q1, double q2, double q3)
+  { q[0]=q0;    q[1]=q1;    q[2]=q2;    q[3]=q3; }
+
+  /*! Copy constructor. */
+  Quaternion(const Quaternion& Q)
+  { for (int i=0; i<4; ++i) q[i] = Q.q[i]; }
+
+  /*! Equal operator. */
+  Quaternion& operator=(const Quaternion& Q)
+  {
+    for (int i=0; i<4; ++i)
+      q[i] = Q.q[i];
+    return (*this);
+  }
+
+  /*! Sets the Quaternion as a rotation of axis \p axis and angle \p angle (in radians).
+
+  \p axis does not need to be normalized. A null \p axis will result in an identity Quaternion. */
+  void setAxisAngle(const Vec& axis, double angle)
+  {
+    const double norm = axis.norm();
+    if (norm < 1E-8)
+      {
+	// Null rotation
+	q[0] = 0.0;      q[1] = 0.0;      q[2] = 0.0;      q[3] = 1.0;
+      }
+    else
+      {
+	const double sin_half_angle = sin(angle / 2.0);
+	q[0] = sin_half_angle*axis[0]/norm;
+	q[1] = sin_half_angle*axis[1]/norm;
+	q[2] = sin_half_angle*axis[2]/norm;
+	q[3] = cos(angle / 2.0);
+      }
+  }
+
+  /*! Sets the Quaternion value. See the Quaternion(double, double, double, double) constructor documentation. */
+  void setValue(double q0, double q1, double q2, double q3)
+  { q[0]=q0;    q[1]=q1;    q[2]=q2;    q[3]=q3; }
+
+#ifndef DOXYGEN
+  void setFromRotationMatrix(const float m[3][3]);
+  void setFromRotatedBase(const Vec& X, const Vec& Y, const Vec& Z);
+#endif
+  void setFromRotationMatrix(const double m[3][3]);
+  void setFromRotatedBasis(const Vec& X, const Vec& Y, const Vec& Z);
+  //@}
+
+
+  /*! @name Accessing values */
+  //@{
+  Vec axis() const;
+  float angle() const;
+  void getAxisAngle(Vec& axis, float& angle) const;
+
+  /*! Bracket operator, with a constant return value. \p i must range in [0..3]. See the Quaternion(double, double, double, double) documentation. */
+  double operator[](int i) const { return q[i]; }
+
+  /*! Bracket operator returning an l-value. \p i must range in [0..3]. See the Quaternion(double, double, double, double) documentation. */
+  double& operator[](int i) { return q[i]; }
+  //@}
+
+
+  /*! @name Rotation computations */
+  //@{
+  /*! Returns the composition of the \p a and \p b rotations.
+
+  The order is important. When applied to a Vec \c v (see operator*(const Quaternion&, const Vec&)
+  and rotate()) the resulting Quaternion acts as if \p b was applied first and then \p a was
+  applied. This is obvious since the image \c v' of \p v by the composited rotation satisfies: \code
+  v'= (a*b) * v = a * (b*v) \endcode
+
+  Note that a*b usually differs from b*a.
+
+  \attention For efficiency reasons, the resulting Quaternion is not normalized. Use normalize() in
+  case of numerical drift with small rotation composition. */
+  friend Quaternion operator*(const Quaternion& a, const Quaternion& b)
+  {
+    return Quaternion(a.q[3]*b.q[0] + b.q[3]*a.q[0] + a.q[1]*b.q[2] - a.q[2]*b.q[1],
+		      a.q[3]*b.q[1] + b.q[3]*a.q[1] + a.q[2]*b.q[0] - a.q[0]*b.q[2],
+		      a.q[3]*b.q[2] + b.q[3]*a.q[2] + a.q[0]*b.q[1] - a.q[1]*b.q[0],
+		      a.q[3]*b.q[3] - b.q[0]*a.q[0] - a.q[1]*b.q[1] - a.q[2]*b.q[2]);
+  }
+
+  /*! Quaternion rotation is composed with \p q.
+
+  See operator*(), since this is equivalent to \c this = \c this * \p q.
+
+  \note For efficiency reasons, the resulting Quaternion is not normalized.
+  You may normalize() it after each application in case of numerical drift. */
+  Quaternion& operator*=(const Quaternion &q)
+  {
+    *this = (*this)*q;
+    return *this;
+  }
+
+  /*! Returns the image of \p v by the rotation \p q.
+
+  Same as q.rotate(v). See rotate() and inverseRotate(). */
+  friend Vec operator*(const Quaternion& q, const Vec& v)
+  {
+    return q.rotate(v);
+  }
+
+  Vec rotate(const Vec& v) const;
+  Vec inverseRotate(const Vec& v) const;
+  //@}
+
+
+  /*! @name Inversion */
+  //@{
+  /*! Returns the inverse Quaternion (inverse rotation).
+
+  Result has a negated axis() direction and the same angle(). A composition (see operator*()) of a
+  Quaternion and its inverse() results in an identity function.
+
+  Use invert() to actually modify the Quaternion. */
+  Quaternion inverse() const { return Quaternion(-q[0], -q[1], -q[2], q[3]); }
+
+  /*! Inverses the Quaternion (same rotation angle(), but negated axis()).
+
+  See also inverse(). */
+  void invert() { q[0] = -q[0]; q[1] = -q[1]; q[2] = -q[2]; }
+
+  /*! Negates all the coefficients of the Quaternion.
+
+  This results in an other representation of the \e same rotation (opposite rotation angle, but with
+  a negated axis direction: the two cancel out). However, note that the results of axis() and
+  angle() are unchanged after a call to this method since angle() always returns a value in [0,pi].
+
+  This method is mainly useful for Quaternion interpolation, so that the spherical
+  interpolation takes the shortest path on the unit sphere. See slerp() for details. */
+  void negate() { invert(); q[3] = -q[3]; }
+
+  /*! Normalizes the Quaternion coefficients.
+
+  This method should not need to be called since we only deal with unit Quaternions. This is however
+  useful to prevent numerical drifts, especially with small rotational increments. See also
+  normalized(). */
+  double normalize()
+  {
+    const double norm = sqrt(q[0]*q[0] + q[1]*q[1] + q[2]*q[2] + q[3]*q[3]);
+    for (int i=0; i<4; ++i)
+      q[i] /= norm;
+    return norm;
+  }
+
+  /*! Returns a normalized version of the Quaternion.
+
+  See also normalize(). */
+  Quaternion normalized() const
+  {
+    double Q[4];
+    const double norm = sqrt(q[0]*q[0] + q[1]*q[1] + q[2]*q[2] + q[3]*q[3]);
+    for (int i=0; i<4; ++i)
+      Q[i] = q[i] / norm;
+    return Quaternion(Q[0], Q[1], Q[2], Q[3]);
+  }
+//@}
+
+
+  /*! @name Associated matrix */
+  //@{
+  const GLdouble* matrix() const;
+  void getMatrix(GLdouble m[4][4]) const;
+  void getMatrix(GLdouble m[16]) const;
+
+  void getRotationMatrix(float m[3][3]) const;
+
+  const GLdouble* inverseMatrix() const;
+  void getInverseMatrix(GLdouble m[4][4]) const;
+  void getInverseMatrix(GLdouble m[16]) const;
+
+  void getInverseRotationMatrix(float m[3][3]) const;
+  //@}
+
+
+  /*! @name Slerp interpolation */
+  //@{
+  static Quaternion slerp(const Quaternion& a, const Quaternion& b, float t, bool allowFlip=true);
+  static Quaternion squad(const Quaternion& a, const Quaternion& tgA, const Quaternion& tgB, const Quaternion& b, float t);
+  /*! Returns the "dot" product of \p a and \p b: a[0]*b[0] + a[1]*b[1] + a[2]*b[2] + a[3]*b[3]. */
+  static double dot(const Quaternion& a, const Quaternion& b) { return a[0]*b[0] + a[1]*b[1] + a[2]*b[2] + a[3]*b[3]; }
+
+  Quaternion log();
+  Quaternion exp();
+  static Quaternion lnDif(const Quaternion& a, const Quaternion& b);
+  static Quaternion squadTangent(const Quaternion& before, const Quaternion& center, const Quaternion& after);
+  //@}
+
+  /*! @name Random Quaternion */
+  //@{
+  static Quaternion randomQuaternion();
+  //@}
+
+#ifdef DOXYGEN
+  /*! @name Output stream */
+  //@{
+  /*! Output stream operator. Enables debugging code like:
+  \code
+  Quaternion rot(...);
+  cout << "Rotation=" << rot << endl;
+  \endcode */
+  std::ostream& operator<<(std::ostream& o, const Vec&);
+  //@}
+#endif
+
+private:
+  /*! The internal data representation is private, use operator[] to access values. */
+  double q[4];
+};
+
+
+std::ostream& operator<<(std::ostream& o, const Quaternion&);
+
+#endif // QGLVIEWER_QUATERNION_H
diff --git a/source/blender/freestyle/intern/app_blender/vec.cpp b/source/blender/freestyle/intern/app_blender/vec.cpp
new file mode 100644
index 00000000000..a44dd1ed6ed
--- /dev/null
+++ b/source/blender/freestyle/intern/app_blender/vec.cpp
@@ -0,0 +1,75 @@
+/****************************************************************************
+
+ Copyright (C) 2002-2007 Gilles Debunne (Gilles.Debunne@imag.fr)
+
+ This file is part of the QGLViewer library.
+ Version 2.2.6-3, released on August 28, 2007.
+
+ http://artis.imag.fr/Members/Gilles.Debunne/QGLViewer
+
+ libQGLViewer 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.
+
+ libQGLViewer 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 libQGLViewer; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*****************************************************************************/
+
+#include "vec.h"
+
+// Most of the methods are declared inline in vec.h
+using namespace std;
+
+/*! Projects the Vec on the axis of direction \p direction that passes through the origin.
+
+\p direction does not need to be normalized (but must be non null). */
+void Vec::projectOnAxis(const Vec& direction)
+{
+#ifndef QT_NO_DEBUG
+  if (direction.squaredNorm() < 1.0E-10)
+    cout << "Vec::projectOnAxis: axis direction is not normalized (norm=" << direction.norm() << ")." << endl;
+#endif
+
+  *this = (((*this)*direction) / direction.squaredNorm()) * direction;
+}
+
+/*! Projects the Vec on the plane whose normal is \p normal that passes through the origin.
+
+\p normal does not need to be normalized (but must be non null). */
+void Vec::projectOnPlane(const Vec& normal)
+{
+#ifndef QT_NO_DEBUG
+  if (normal.squaredNorm() < 1.0E-10)
+    cout << "Vec::projectOnPlane: plane normal is not normalized (norm=" << normal.norm() << ")." << endl;
+#endif
+
+  *this -= (((*this)*normal) / normal.squaredNorm()) * normal;
+}
+
+/*! Returns a Vec orthogonal to the Vec. Its norm() depends on the Vec, but is zero only for a
+ null Vec. Note that the function that associates an orthogonalVec() to a Vec is not continous. */
+Vec Vec::orthogonalVec() const
+{
+  // Find smallest component. Keep equal case for null values.
+  if ((fabs(y) >= 0.9*fabs(x)) && (fabs(z) >= 0.9*fabs(x)))
+    return Vec(0.0, -z, y);
+  else
+    if ((fabs(x) >= 0.9*fabs(y)) && (fabs(z) >= 0.9*fabs(y)))
+      return Vec(-z, 0.0, x);
+    else
+      return Vec(-y, x, 0.0);
+}
+
+ostream& operator<<(ostream& o, const Vec& v)
+{
+  return o << v.x << '\t' << v.y << '\t' << v.z;
+}
+
diff --git a/source/blender/freestyle/intern/app_blender/vec.h b/source/blender/freestyle/intern/app_blender/vec.h
new file mode 100644
index 00000000000..ff17917fac8
--- /dev/null
+++ b/source/blender/freestyle/intern/app_blender/vec.h
@@ -0,0 +1,366 @@
+/****************************************************************************
+
+ Copyright (C) 2002-2007 Gilles Debunne (Gilles.Debunne@imag.fr)
+
+ This file is part of the QGLViewer library.
+ Version 2.2.6-3, released on August 28, 2007.
+
+ http://artis.imag.fr/Members/Gilles.Debunne/QGLViewer
+
+ libQGLViewer 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.
+
+ libQGLViewer 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 libQGLViewer; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*****************************************************************************/
+
+#ifndef QGLVIEWER_VEC_H
+#define QGLVIEWER_VEC_H
+
+#include "config.h"
+
+// #include <qapplication.h>
+
+// Included by all files as vec.h is at the end of the include hierarchy
+//soc #include "config.h" // Specific configuration options.
+
+/*! \brief The Vec class represents 3D positions and 3D vectors.
+  \class Vec vec.h QGLViewer/vec.h
+
+  Vec is used as a parameter and return type by many methods of the library. It provides classical
+  algebraic computational methods and is compatible with OpenGL:
+
+  \code
+  // Draws a point located at 3.0 OpenGL units in front of the camera
+  Vec pos = camera()->position() + 3.0 * camera()->viewDirection();
+  glBegin(GL_POINTS);
+  glVertex3fv(pos);
+  glEnd();
+  \endcode
+
+  This makes of Vec a good candidate for representing positions and vectors in your programs. Since
+  it is part of the \c qglviewer namespace, specify \c qglviewer::Vec or use the qglviewer
+  namespace:
+  \code
+  using namespace qglviewer;
+  \endcode
+
+  <h3>Interface with other vector classes</h3>
+
+  Vec implements a universal explicit converter, based on the \c [] \c operator.
+  Everywhere a \c const \c Vec& argument is expected, you can use your own vector type
+  instead, as long as it implements this operator (see the Vec(const C& c) documentation).
+
+  See also the Quaternion and the Frame documentations.
+  \nosubgrouping */
+class Vec
+{
+
+  // If your compiler complains the "The class "qglviewer::Vec" has no member "x"."
+  // Add your architecture Q_OS_XXXX flag (see qglobal.h) in this list.
+#if defined (Q_OS_IRIX) || defined (Q_OS_AIX) || defined (Q_OS_HPUX)
+# define QGLVIEWER_UNION_NOT_SUPPORTED
+#endif
+
+public:
+  /*! The internal data representation is public. One can use v.x, v.y, v.z. See also operator[](). */
+#if defined (DOXYGEN) || defined (QGLVIEWER_UNION_NOT_SUPPORTED)
+  float x, y, z;
+#else
+  union
+  {
+    struct { float x, y, z; };
+    float v_[3];
+  };
+#endif
+
+  /*! @name Setting the value */
+  //@{
+  /*! Default constructor. Value is set to (0,0,0). */
+  Vec() : x(0.0), y(0.0), z(0.0) {}
+
+  /*! Standard constructor with the x, y and z values. */
+  Vec(float X, float Y, float Z) : x(X), y(Y), z(Z) {}
+
+  /*! Universal explicit converter from any class to Vec. You can use your own vector class everywhere
+  a \c const \c Vec& parameter is required, as long as it implements the \c operator[ ]:
+
+  \code
+  class MyVec
+  {
+    // ...
+    float operator[](int i) const { returns x, y or z when i=0, 1 or 2; }
+  }
+
+  MyVec v(...);
+  camera()->setPosition(v);
+  \endcode
+
+  Note that standard vector types (stl, \c float[3], ...) implement this operator and can hence
+  be used in place of Vec. See also operator const float*() .*/
+  template <class C>
+  explicit Vec(const C& c) : x(c[0]), y(c[1]), z(c[2]) {}
+  // Should NOT be explicit to prevent conflicts with operator<<.
+
+  // ! Copy constructor
+  // Vec(const Vec& v) : x(v.x), y(v.y), z(v.z) {}
+
+  /*! Equal operator. */
+  Vec& operator=(const Vec& v)
+  {
+    x = v.x;   y = v.y;   z = v.z;
+    return *this;
+  }
+
+  /*! Set the current value. Maybe faster than using operator=() with a temporary Vec(x,y,z). */
+  void setValue(float X, float Y, float Z)
+  { x=X; y=Y; z=Z; }
+
+  // Universal equal operator which allows the use of any type in place of Vec,
+  // as long as the [] operator is implemented (v[0]=v.x, v[1]=v.y, v[2]=v.z).
+  // template <class C>
+  // Vec& operator=(const C& c)
+  // {
+  // x=c[0]; y=c[1]; z=c[2];
+  // return *this;
+  // }
+  //@}
+
+  /*! @name Accessing the value */
+  //@{
+  /*! Bracket operator, with a constant return value. \p i must range in [0..2]. */
+  float operator[](int i) const {
+#ifdef QGLVIEWER_UNION_NOT_SUPPORTED
+    return (&x)[i];
+#else
+    return v_[i];
+#endif
+  }
+
+  /*! Bracket operator returning an l-value. \p i must range in [0..2]. */
+  float& operator[](int i) {
+#ifdef QGLVIEWER_UNION_NOT_SUPPORTED
+    return (&x)[i];
+#else
+    return v_[i];
+#endif
+  }
+
+#ifndef DOXYGEN
+  /*! This method is deprecated since version 2.0. Use operator const float* instead. */
+  const float* address() const { cout << "Vec::address() is deprecated, use operator const float* instead." << endl; return operator const float*(); };
+#endif
+
+  /*! Conversion operator returning the memory address of the vector.
+
+  Very convenient to pass a Vec pointer as a parameter to OpenGL functions:
+  \code
+  Vec pos, normal;
+  glNormal3fv(normal);
+  glVertex3fv(pos);
+  \endcode */
+  operator const float*() const {
+#ifdef QGLVIEWER_UNION_NOT_SUPPORTED
+    return &x;
+#else
+    return v_;
+#endif
+  }
+
+  /*! Non const conversion operator returning the memory address of the vector.
+
+  Useful to pass a Vec to a method that requires and fills a \c float*, as provided by certain libraries. */
+  operator float*() {
+#ifdef QGLVIEWER_UNION_NOT_SUPPORTED
+    return &x;
+#else
+    return v_;
+#endif
+  }
+  //@}
+
+  /*! @name Algebraic computations */
+  //@{
+  /*! Returns the sum of the two vectors. */
+  friend Vec operator+(const Vec &a, const Vec &b)
+  {
+    return Vec(a.x+b.x, a.y+b.y, a.z+b.z);
+  }
+
+  /*! Returns the difference of the two vectors. */
+  friend Vec operator-(const Vec &a, const Vec &b)
+  {
+    return Vec(a.x-b.x, a.y-b.y, a.z-b.z);
+  }
+
+  /*! Unary minus operator. */
+  friend Vec operator-(const Vec &a)
+  {
+    return Vec(-a.x, -a.y, -a.z);
+  }
+
+  /*! Returns the product of the vector with a scalar. */
+  friend Vec operator*(const Vec &a, float k)
+  {
+    return Vec(a.x*k, a.y*k, a.z*k);
+  }
+
+  /*! Returns the product of the vector with a scalar. */
+  friend Vec operator*(float k, const Vec &a)
+  {
+    return a*k;
+  }
+
+  /*! Returns the division of the vector with a scalar.
+
+  Too small \p k values are \e not tested (unless the library was compiled with the "debug" Qt \c
+  CONFIG flag) and may result in \c NaN values. */
+  friend Vec operator/(const Vec &a, float k)
+  {
+#ifndef QT_NO_DEBUG
+    if (fabs(k) < 1.0E-10)
+		cout << "Vec::operator / : dividing by a null value" << endl;
+#endif
+    return Vec(a.x/k, a.y/k, a.z/k);
+  }
+
+  /*! Returns \c true only when the two vector are not equal (see operator==()). */
+  friend bool operator!=(const Vec &a, const Vec &b)
+  {
+    return !(a==b);
+  }
+
+  /*! Returns \c true when the squaredNorm() of the difference vector is lower than 1E-10. */
+  friend bool operator==(const Vec &a, const Vec &b)
+  {
+    const float epsilon = 1.0E-10f;
+    return (a-b).squaredNorm() < epsilon;
+  }
+
+  /*! Adds \p a to the vector. */
+  Vec& operator+=(const Vec &a)
+  {
+    x += a.x; y += a.y; z += a.z;
+    return *this;
+  }
+
+  /*! Subtracts \p a to the vector. */
+  Vec& operator-=(const Vec &a)
+  {
+    x -= a.x; y -= a.y; z -= a.z;
+    return *this;
+  }
+
+  /*! Multiply the vector by a scalar \p k. */
+  Vec& operator*=(float k)
+  {
+    x *= k; y *= k; z *= k;
+    return *this;
+  }
+
+  /*! Divides the vector by a scalar \p k.
+
+  An absolute \p k value lower than 1E-10 will print a warning if the library was compiled with the
+  "debug" Qt \c CONFIG flag. Otherwise, no test is performed for efficiency reasons. */
+  Vec& operator/=(float k)
+  {
+#ifndef QT_NO_DEBUG
+    if (fabs(k)<1.0E-10)
+		cout << "Vec::operator /= : dividing by a null value" << endl;
+#endif
+    x /= k; y /= k; z /= k;
+    return *this;
+  }
+
+  /*! Dot product of the two Vec. */
+  friend float operator*(const Vec &a, const Vec &b)
+  {
+    return a.x*b.x + a.y*b.y + a.z*b.z;
+  }
+
+  /*! Cross product of the two vectors. Same as cross(). */
+  friend Vec operator^(const Vec &a, const Vec &b)
+  {
+    return cross(a,b);
+  }
+
+  /*! Cross product of the two Vec. Mind the order ! */
+  friend Vec cross(const Vec &a, const Vec &b)
+  {
+    return Vec(a.y*b.z - a.z*b.y,
+	       a.z*b.x - a.x*b.z,
+	       a.x*b.y - a.y*b.x);
+  }
+
+  Vec orthogonalVec() const;
+  //@}
+
+  /*! @name Norm of the vector */
+  //@{
+#ifndef DOXYGEN
+  /*! This method is deprecated since version 2.0. Use squaredNorm() instead. */
+  float sqNorm() const { return x*x + y*y + z*z; }
+#endif
+
+  /*! Returns the \e squared norm of the Vec. */
+  float squaredNorm() const { return x*x + y*y + z*z; }
+
+  /*! Returns the norm of the vector. */
+  float norm() const { return sqrt(x*x + y*y + z*z); }
+
+  /*! Normalizes the Vec and returns its original norm.
+
+  Normalizing a null vector will result in \c NaN values. */
+  float normalize()
+  {
+    const float n = norm();
+#ifndef QT_NO_DEBUG
+    if (n < 1.0E-10)
+		cout << "Vec::normalize: normalizing a null vector" << endl;
+#endif
+    *this /= n;
+    return n;
+  }
+
+  /*! Returns a unitary (normalized) \e representation of the vector. The original Vec is not modified. */
+  Vec unit() const
+  {
+    Vec v = *this;
+    v.normalize();
+    return v;
+  }
+  //@}
+
+  /*! @name Projection */
+  //@{
+  void projectOnAxis(const Vec& direction);
+  void projectOnPlane(const Vec& normal);
+  //@}
+
+
+#ifdef DOXYGEN
+  /*! @name Output stream */
+  //@{
+  /*! Output stream operator. Enables debugging code like:
+  \code
+  Vec pos(...);
+  cout << "Position=" << pos << endl;
+  \endcode */
+  std::ostream& operator<<(std::ostream& o, const qglviewer::Vec&);
+  //@}
+#endif
+};
+
+
+std::ostream& operator<<(std::ostream& o, const Vec&);
+
+#endif // QGLVIEWER_VEC_H
diff --git a/source/blender/freestyle/intern/rendering/GLStrokeRenderer.cpp b/source/blender/freestyle/intern/rendering/GLStrokeRenderer.cpp
index 8177f3b02db..50055e10f3d 100755
--- a/source/blender/freestyle/intern/rendering/GLStrokeRenderer.cpp
+++ b/source/blender/freestyle/intern/rendering/GLStrokeRenderer.cpp
@@ -26,9 +26,13 @@
 // #include <qfileinfo.h>
 // #include <qgl.h>
 // #include <qfile.h>
+
+extern "C" {
 #include "BLI_blenlib.h"
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
+}
+
 #include "../system/StringUtils.h"
 
 #ifdef WIN32
diff --git a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp
index 40a0bbbc738..0022a36aee2 100755
--- a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp
+++ b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp
@@ -34,8 +34,10 @@
 
 //soc #include <qimage.h>
 //soc #include <QString>
+extern "C" {
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
+}
 
 // Internal function
 
diff --git a/source/blender/freestyle/intern/stroke/Canvas.cpp b/source/blender/freestyle/intern/stroke/Canvas.cpp
index 7e63d964cb5..b185bba92a0 100755
--- a/source/blender/freestyle/intern/stroke/Canvas.cpp
+++ b/source/blender/freestyle/intern/stroke/Canvas.cpp
@@ -34,9 +34,12 @@
 //soc #include <qimage.h>
 //soc #include <QString>
 #include <sstream>	
+
+extern "C" {
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 #include "intern/IMB_bmp.h"
+}
 
 using namespace std;
 
diff --git a/source/blender/freestyle/intern/system/StringUtils.h b/source/blender/freestyle/intern/system/StringUtils.h
index efc16953e48..b30eaae2247 100755
--- a/source/blender/freestyle/intern/system/StringUtils.h
+++ b/source/blender/freestyle/intern/system/StringUtils.h
@@ -34,8 +34,10 @@
 # include "FreestyleConfig.h"
 
 //soc
+extern "C" {
 #include "BKE_utildefines.h"
 #include "BLI_blenlib.h"
+}
 
 using namespace std;
 
diff --git a/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp b/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
index d7f2e5683c5..13c6bd65312 100755
--- a/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
+++ b/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
@@ -29,9 +29,12 @@ using namespace Geometry;
 //soc #include <qstring.h>
 //soc #include <qimage.h>
 #include <sstream>
+
+extern "C" {
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 #include "intern/IMB_png.h"
+}
 
 SteerableViewMap::SteerableViewMap(unsigned int nbOrientations){
   _nbOrientations = nbOrientations;
diff --git a/source/blender/freestyle/python/Freestyle.py b/source/blender/freestyle/python/Freestyle.py
new file mode 100755
index 00000000000..5eb9119cb80
--- /dev/null
+++ b/source/blender/freestyle/python/Freestyle.py
@@ -0,0 +1,4961 @@
+# This file was automatically generated by SWIG (http://www.swig.org).
+# Version 1.3.33
+#
+# Don't modify this file, modify the SWIG interface instead.
+# This file is compatible with both classic and new-style classes.
+
+import _Freestyle
+import new
+new_instancemethod = new.instancemethod
+try:
+    _swig_property = property
+except NameError:
+    pass # Python < 2.2 doesn't have 'property'.
+def _swig_setattr_nondynamic(self,class_type,name,value,static=1):
+    if (name == "thisown"): return self.this.own(value)
+    if (name == "this"):
+        if type(value).__name__ == 'PySwigObject':
+            self.__dict__[name] = value
+            return
+    method = class_type.__swig_setmethods__.get(name,None)
+    if method: return method(self,value)
+    if (not static) or hasattr(self,name):
+        self.__dict__[name] = value
+    else:
+        raise AttributeError("You cannot add attributes to %s" % self)
+
+def _swig_setattr(self,class_type,name,value):
+    return _swig_setattr_nondynamic(self,class_type,name,value,0)
+
+def _swig_getattr(self,class_type,name):
+    if (name == "thisown"): return self.this.own()
+    method = class_type.__swig_getmethods__.get(name,None)
+    if method: return method(self)
+    raise AttributeError,name
+
+def _swig_repr(self):
+    try: strthis = "proxy of " + self.this.__repr__()
+    except: strthis = ""
+    return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
+
+import types
+try:
+    _object = types.ObjectType
+    _newclass = 1
+except AttributeError:
+    class _object : pass
+    _newclass = 0
+del types
+
+
+try:
+    import weakref
+    weakref_proxy = weakref.proxy
+except:
+    weakref_proxy = lambda x: x
+
+
+class PySwigIterator(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, PySwigIterator, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, PySwigIterator, name)
+    def __init__(self): raise AttributeError, "No constructor defined"
+    __repr__ = _swig_repr
+    __swig_destroy__ = _Freestyle.delete_PySwigIterator
+    __del__ = lambda self : None;
+    def value(*args): return _Freestyle.PySwigIterator_value(*args)
+    def incr(*args): return _Freestyle.PySwigIterator_incr(*args)
+    def decr(*args): return _Freestyle.PySwigIterator_decr(*args)
+    def distance(*args): return _Freestyle.PySwigIterator_distance(*args)
+    def equal(*args): return _Freestyle.PySwigIterator_equal(*args)
+    def copy(*args): return _Freestyle.PySwigIterator_copy(*args)
+    def next(*args): return _Freestyle.PySwigIterator_next(*args)
+    def previous(*args): return _Freestyle.PySwigIterator_previous(*args)
+    def advance(*args): return _Freestyle.PySwigIterator_advance(*args)
+    def __eq__(*args): return _Freestyle.PySwigIterator___eq__(*args)
+    def __ne__(*args): return _Freestyle.PySwigIterator___ne__(*args)
+    def __iadd__(*args): return _Freestyle.PySwigIterator___iadd__(*args)
+    def __isub__(*args): return _Freestyle.PySwigIterator___isub__(*args)
+    def __add__(*args): return _Freestyle.PySwigIterator___add__(*args)
+    def __sub__(*args): return _Freestyle.PySwigIterator___sub__(*args)
+    def __iter__(self): return self
+PySwigIterator_swigregister = _Freestyle.PySwigIterator_swigregister
+PySwigIterator_swigregister(PySwigIterator)
+
+class vectorInt(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, vectorInt, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, vectorInt, name)
+    __repr__ = _swig_repr
+    def iterator(*args): return _Freestyle.vectorInt_iterator(*args)
+    def __iter__(self): return self.iterator()
+    def __nonzero__(*args): return _Freestyle.vectorInt___nonzero__(*args)
+    def __len__(*args): return _Freestyle.vectorInt___len__(*args)
+    def pop(*args): return _Freestyle.vectorInt_pop(*args)
+    def __getslice__(*args): return _Freestyle.vectorInt___getslice__(*args)
+    def __setslice__(*args): return _Freestyle.vectorInt___setslice__(*args)
+    def __delslice__(*args): return _Freestyle.vectorInt___delslice__(*args)
+    def __delitem__(*args): return _Freestyle.vectorInt___delitem__(*args)
+    def __getitem__(*args): return _Freestyle.vectorInt___getitem__(*args)
+    def __setitem__(*args): return _Freestyle.vectorInt___setitem__(*args)
+    def append(*args): return _Freestyle.vectorInt_append(*args)
+    def empty(*args): return _Freestyle.vectorInt_empty(*args)
+    def size(*args): return _Freestyle.vectorInt_size(*args)
+    def clear(*args): return _Freestyle.vectorInt_clear(*args)
+    def swap(*args): return _Freestyle.vectorInt_swap(*args)
+    def get_allocator(*args): return _Freestyle.vectorInt_get_allocator(*args)
+    def begin(*args): return _Freestyle.vectorInt_begin(*args)
+    def end(*args): return _Freestyle.vectorInt_end(*args)
+    def rbegin(*args): return _Freestyle.vectorInt_rbegin(*args)
+    def rend(*args): return _Freestyle.vectorInt_rend(*args)
+    def pop_back(*args): return _Freestyle.vectorInt_pop_back(*args)
+    def erase(*args): return _Freestyle.vectorInt_erase(*args)
+    def __init__(self, *args): 
+        this = _Freestyle.new_vectorInt(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def push_back(*args): return _Freestyle.vectorInt_push_back(*args)
+    def front(*args): return _Freestyle.vectorInt_front(*args)
+    def back(*args): return _Freestyle.vectorInt_back(*args)
+    def assign(*args): return _Freestyle.vectorInt_assign(*args)
+    def resize(*args): return _Freestyle.vectorInt_resize(*args)
+    def insert(*args): return _Freestyle.vectorInt_insert(*args)
+    def reserve(*args): return _Freestyle.vectorInt_reserve(*args)
+    def capacity(*args): return _Freestyle.vectorInt_capacity(*args)
+    __swig_destroy__ = _Freestyle.delete_vectorInt
+    __del__ = lambda self : None;
+vectorInt_swigregister = _Freestyle.vectorInt_swigregister
+vectorInt_swigregister(vectorInt)
+
+class Id(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, Id, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, Id, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_Id(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def getFirst(*args): return _Freestyle.Id_getFirst(*args)
+    def getSecond(*args): return _Freestyle.Id_getSecond(*args)
+    def setFirst(*args): return _Freestyle.Id_setFirst(*args)
+    def setSecond(*args): return _Freestyle.Id_setSecond(*args)
+    def __eq__(*args): return _Freestyle.Id___eq__(*args)
+    def __ne__(*args): return _Freestyle.Id___ne__(*args)
+    def __lt__(*args): return _Freestyle.Id___lt__(*args)
+    __swig_destroy__ = _Freestyle.delete_Id
+    __del__ = lambda self : None;
+Id_swigregister = _Freestyle.Id_swigregister
+Id_swigregister(Id)
+
+class Vec_2u(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, Vec_2u, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, Vec_2u, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_Vec_2u(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_Vec_2u
+    __del__ = lambda self : None;
+    __swig_getmethods__["dim"] = lambda x: _Freestyle.Vec_2u_dim
+    if _newclass:dim = staticmethod(_Freestyle.Vec_2u_dim)
+    def norm(*args): return _Freestyle.Vec_2u_norm(*args)
+    def squareNorm(*args): return _Freestyle.Vec_2u_squareNorm(*args)
+    def normalize(*args): return _Freestyle.Vec_2u_normalize(*args)
+    def normalizeSafe(*args): return _Freestyle.Vec_2u_normalizeSafe(*args)
+    def __add__(*args): return _Freestyle.Vec_2u___add__(*args)
+    def __sub__(*args): return _Freestyle.Vec_2u___sub__(*args)
+    def __div__(*args): return _Freestyle.Vec_2u___div__(*args)
+    def __mul__(*args): return _Freestyle.Vec_2u___mul__(*args)
+    def __eq__(*args): return _Freestyle.Vec_2u___eq__(*args)
+    def __ne__(*args): return _Freestyle.Vec_2u___ne__(*args)
+    def __lt__(*args): return _Freestyle.Vec_2u___lt__(*args)
+    def __gt__(*args): return _Freestyle.Vec_2u___gt__(*args)
+Vec_2u_swigregister = _Freestyle.Vec_2u_swigregister
+Vec_2u_swigregister(Vec_2u)
+Vec_2u_dim = _Freestyle.Vec_2u_dim
+
+class Vec_2i(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, Vec_2i, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, Vec_2i, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_Vec_2i(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_Vec_2i
+    __del__ = lambda self : None;
+    __swig_getmethods__["dim"] = lambda x: _Freestyle.Vec_2i_dim
+    if _newclass:dim = staticmethod(_Freestyle.Vec_2i_dim)
+    def norm(*args): return _Freestyle.Vec_2i_norm(*args)
+    def squareNorm(*args): return _Freestyle.Vec_2i_squareNorm(*args)
+    def normalize(*args): return _Freestyle.Vec_2i_normalize(*args)
+    def normalizeSafe(*args): return _Freestyle.Vec_2i_normalizeSafe(*args)
+    def __add__(*args): return _Freestyle.Vec_2i___add__(*args)
+    def __sub__(*args): return _Freestyle.Vec_2i___sub__(*args)
+    def __div__(*args): return _Freestyle.Vec_2i___div__(*args)
+    def __mul__(*args): return _Freestyle.Vec_2i___mul__(*args)
+    def __eq__(*args): return _Freestyle.Vec_2i___eq__(*args)
+    def __ne__(*args): return _Freestyle.Vec_2i___ne__(*args)
+    def __lt__(*args): return _Freestyle.Vec_2i___lt__(*args)
+    def __gt__(*args): return _Freestyle.Vec_2i___gt__(*args)
+Vec_2i_swigregister = _Freestyle.Vec_2i_swigregister
+Vec_2i_swigregister(Vec_2i)
+Vec_2i_dim = _Freestyle.Vec_2i_dim
+
+class Vec_2d(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, Vec_2d, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, Vec_2d, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_Vec_2d(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_Vec_2d
+    __del__ = lambda self : None;
+    __swig_getmethods__["dim"] = lambda x: _Freestyle.Vec_2d_dim
+    if _newclass:dim = staticmethod(_Freestyle.Vec_2d_dim)
+    def norm(*args): return _Freestyle.Vec_2d_norm(*args)
+    def squareNorm(*args): return _Freestyle.Vec_2d_squareNorm(*args)
+    def normalize(*args): return _Freestyle.Vec_2d_normalize(*args)
+    def normalizeSafe(*args): return _Freestyle.Vec_2d_normalizeSafe(*args)
+    def __add__(*args): return _Freestyle.Vec_2d___add__(*args)
+    def __sub__(*args): return _Freestyle.Vec_2d___sub__(*args)
+    def __div__(*args): return _Freestyle.Vec_2d___div__(*args)
+    def __mul__(*args): return _Freestyle.Vec_2d___mul__(*args)
+    def __eq__(*args): return _Freestyle.Vec_2d___eq__(*args)
+    def __ne__(*args): return _Freestyle.Vec_2d___ne__(*args)
+    def __lt__(*args): return _Freestyle.Vec_2d___lt__(*args)
+    def __gt__(*args): return _Freestyle.Vec_2d___gt__(*args)
+Vec_2d_swigregister = _Freestyle.Vec_2d_swigregister
+Vec_2d_swigregister(Vec_2d)
+Vec_2d_dim = _Freestyle.Vec_2d_dim
+
+class Vec_2f(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, Vec_2f, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, Vec_2f, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_Vec_2f(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_Vec_2f
+    __del__ = lambda self : None;
+    __swig_getmethods__["dim"] = lambda x: _Freestyle.Vec_2f_dim
+    if _newclass:dim = staticmethod(_Freestyle.Vec_2f_dim)
+    def norm(*args): return _Freestyle.Vec_2f_norm(*args)
+    def squareNorm(*args): return _Freestyle.Vec_2f_squareNorm(*args)
+    def normalize(*args): return _Freestyle.Vec_2f_normalize(*args)
+    def normalizeSafe(*args): return _Freestyle.Vec_2f_normalizeSafe(*args)
+    def __add__(*args): return _Freestyle.Vec_2f___add__(*args)
+    def __sub__(*args): return _Freestyle.Vec_2f___sub__(*args)
+    def __div__(*args): return _Freestyle.Vec_2f___div__(*args)
+    def __mul__(*args): return _Freestyle.Vec_2f___mul__(*args)
+    def __eq__(*args): return _Freestyle.Vec_2f___eq__(*args)
+    def __ne__(*args): return _Freestyle.Vec_2f___ne__(*args)
+    def __lt__(*args): return _Freestyle.Vec_2f___lt__(*args)
+    def __gt__(*args): return _Freestyle.Vec_2f___gt__(*args)
+Vec_2f_swigregister = _Freestyle.Vec_2f_swigregister
+Vec_2f_swigregister(Vec_2f)
+Vec_2f_dim = _Freestyle.Vec_2f_dim
+
+class Vec2u(Vec_2u):
+    __swig_setmethods__ = {}
+    for _s in [Vec_2u]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, Vec2u, name, value)
+    __swig_getmethods__ = {}
+    for _s in [Vec_2u]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, Vec2u, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_Vec2u(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def x(*args): return _Freestyle.Vec2u_x(*args)
+    def y(*args): return _Freestyle.Vec2u_y(*args)
+    def setX(*args): return _Freestyle.Vec2u_setX(*args)
+    def setY(*args): return _Freestyle.Vec2u_setY(*args)
+    def __add__(*args): return _Freestyle.Vec2u___add__(*args)
+    def __sub__(*args): return _Freestyle.Vec2u___sub__(*args)
+    def __div__(*args): return _Freestyle.Vec2u___div__(*args)
+    def __mul__(*args): return _Freestyle.Vec2u___mul__(*args)
+    __swig_destroy__ = _Freestyle.delete_Vec2u
+    __del__ = lambda self : None;
+Vec2u_swigregister = _Freestyle.Vec2u_swigregister
+Vec2u_swigregister(Vec2u)
+
+class Vec2i(Vec_2i):
+    __swig_setmethods__ = {}
+    for _s in [Vec_2i]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, Vec2i, name, value)
+    __swig_getmethods__ = {}
+    for _s in [Vec_2i]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, Vec2i, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_Vec2i(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def x(*args): return _Freestyle.Vec2i_x(*args)
+    def y(*args): return _Freestyle.Vec2i_y(*args)
+    def setX(*args): return _Freestyle.Vec2i_setX(*args)
+    def setY(*args): return _Freestyle.Vec2i_setY(*args)
+    def __add__(*args): return _Freestyle.Vec2i___add__(*args)
+    def __sub__(*args): return _Freestyle.Vec2i___sub__(*args)
+    def __div__(*args): return _Freestyle.Vec2i___div__(*args)
+    def __mul__(*args): return _Freestyle.Vec2i___mul__(*args)
+    __swig_destroy__ = _Freestyle.delete_Vec2i
+    __del__ = lambda self : None;
+Vec2i_swigregister = _Freestyle.Vec2i_swigregister
+Vec2i_swigregister(Vec2i)
+
+class Vec2f(Vec_2f):
+    __swig_setmethods__ = {}
+    for _s in [Vec_2f]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, Vec2f, name, value)
+    __swig_getmethods__ = {}
+    for _s in [Vec_2f]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, Vec2f, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_Vec2f(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def x(*args): return _Freestyle.Vec2f_x(*args)
+    def y(*args): return _Freestyle.Vec2f_y(*args)
+    def setX(*args): return _Freestyle.Vec2f_setX(*args)
+    def setY(*args): return _Freestyle.Vec2f_setY(*args)
+    def __add__(*args): return _Freestyle.Vec2f___add__(*args)
+    def __sub__(*args): return _Freestyle.Vec2f___sub__(*args)
+    def __div__(*args): return _Freestyle.Vec2f___div__(*args)
+    def __mul__(*args): return _Freestyle.Vec2f___mul__(*args)
+    __swig_destroy__ = _Freestyle.delete_Vec2f
+    __del__ = lambda self : None;
+Vec2f_swigregister = _Freestyle.Vec2f_swigregister
+Vec2f_swigregister(Vec2f)
+
+class Vec2d(Vec_2d):
+    __swig_setmethods__ = {}
+    for _s in [Vec_2d]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, Vec2d, name, value)
+    __swig_getmethods__ = {}
+    for _s in [Vec_2d]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, Vec2d, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_Vec2d(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def x(*args): return _Freestyle.Vec2d_x(*args)
+    def y(*args): return _Freestyle.Vec2d_y(*args)
+    def setX(*args): return _Freestyle.Vec2d_setX(*args)
+    def setY(*args): return _Freestyle.Vec2d_setY(*args)
+    def __add__(*args): return _Freestyle.Vec2d___add__(*args)
+    def __sub__(*args): return _Freestyle.Vec2d___sub__(*args)
+    def __div__(*args): return _Freestyle.Vec2d___div__(*args)
+    def __mul__(*args): return _Freestyle.Vec2d___mul__(*args)
+    __swig_destroy__ = _Freestyle.delete_Vec2d
+    __del__ = lambda self : None;
+Vec2d_swigregister = _Freestyle.Vec2d_swigregister
+Vec2d_swigregister(Vec2d)
+
+class Vec_3u(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, Vec_3u, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, Vec_3u, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_Vec_3u(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_Vec_3u
+    __del__ = lambda self : None;
+    __swig_getmethods__["dim"] = lambda x: _Freestyle.Vec_3u_dim
+    if _newclass:dim = staticmethod(_Freestyle.Vec_3u_dim)
+    def norm(*args): return _Freestyle.Vec_3u_norm(*args)
+    def squareNorm(*args): return _Freestyle.Vec_3u_squareNorm(*args)
+    def normalize(*args): return _Freestyle.Vec_3u_normalize(*args)
+    def normalizeSafe(*args): return _Freestyle.Vec_3u_normalizeSafe(*args)
+    def __add__(*args): return _Freestyle.Vec_3u___add__(*args)
+    def __sub__(*args): return _Freestyle.Vec_3u___sub__(*args)
+    def __div__(*args): return _Freestyle.Vec_3u___div__(*args)
+    def __mul__(*args): return _Freestyle.Vec_3u___mul__(*args)
+    def __eq__(*args): return _Freestyle.Vec_3u___eq__(*args)
+    def __ne__(*args): return _Freestyle.Vec_3u___ne__(*args)
+    def __lt__(*args): return _Freestyle.Vec_3u___lt__(*args)
+    def __gt__(*args): return _Freestyle.Vec_3u___gt__(*args)
+Vec_3u_swigregister = _Freestyle.Vec_3u_swigregister
+Vec_3u_swigregister(Vec_3u)
+Vec_3u_dim = _Freestyle.Vec_3u_dim
+
+class Vec_3i(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, Vec_3i, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, Vec_3i, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_Vec_3i(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_Vec_3i
+    __del__ = lambda self : None;
+    __swig_getmethods__["dim"] = lambda x: _Freestyle.Vec_3i_dim
+    if _newclass:dim = staticmethod(_Freestyle.Vec_3i_dim)
+    def norm(*args): return _Freestyle.Vec_3i_norm(*args)
+    def squareNorm(*args): return _Freestyle.Vec_3i_squareNorm(*args)
+    def normalize(*args): return _Freestyle.Vec_3i_normalize(*args)
+    def normalizeSafe(*args): return _Freestyle.Vec_3i_normalizeSafe(*args)
+    def __add__(*args): return _Freestyle.Vec_3i___add__(*args)
+    def __sub__(*args): return _Freestyle.Vec_3i___sub__(*args)
+    def __div__(*args): return _Freestyle.Vec_3i___div__(*args)
+    def __mul__(*args): return _Freestyle.Vec_3i___mul__(*args)
+    def __eq__(*args): return _Freestyle.Vec_3i___eq__(*args)
+    def __ne__(*args): return _Freestyle.Vec_3i___ne__(*args)
+    def __lt__(*args): return _Freestyle.Vec_3i___lt__(*args)
+    def __gt__(*args): return _Freestyle.Vec_3i___gt__(*args)
+Vec_3i_swigregister = _Freestyle.Vec_3i_swigregister
+Vec_3i_swigregister(Vec_3i)
+Vec_3i_dim = _Freestyle.Vec_3i_dim
+
+class Vec_3d(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, Vec_3d, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, Vec_3d, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_Vec_3d(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_Vec_3d
+    __del__ = lambda self : None;
+    __swig_getmethods__["dim"] = lambda x: _Freestyle.Vec_3d_dim
+    if _newclass:dim = staticmethod(_Freestyle.Vec_3d_dim)
+    def norm(*args): return _Freestyle.Vec_3d_norm(*args)
+    def squareNorm(*args): return _Freestyle.Vec_3d_squareNorm(*args)
+    def normalize(*args): return _Freestyle.Vec_3d_normalize(*args)
+    def normalizeSafe(*args): return _Freestyle.Vec_3d_normalizeSafe(*args)
+    def __add__(*args): return _Freestyle.Vec_3d___add__(*args)
+    def __sub__(*args): return _Freestyle.Vec_3d___sub__(*args)
+    def __div__(*args): return _Freestyle.Vec_3d___div__(*args)
+    def __mul__(*args): return _Freestyle.Vec_3d___mul__(*args)
+    def __eq__(*args): return _Freestyle.Vec_3d___eq__(*args)
+    def __ne__(*args): return _Freestyle.Vec_3d___ne__(*args)
+    def __lt__(*args): return _Freestyle.Vec_3d___lt__(*args)
+    def __gt__(*args): return _Freestyle.Vec_3d___gt__(*args)
+Vec_3d_swigregister = _Freestyle.Vec_3d_swigregister
+Vec_3d_swigregister(Vec_3d)
+Vec_3d_dim = _Freestyle.Vec_3d_dim
+
+class Vec_3f(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, Vec_3f, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, Vec_3f, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_Vec_3f(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_Vec_3f
+    __del__ = lambda self : None;
+    __swig_getmethods__["dim"] = lambda x: _Freestyle.Vec_3f_dim
+    if _newclass:dim = staticmethod(_Freestyle.Vec_3f_dim)
+    def norm(*args): return _Freestyle.Vec_3f_norm(*args)
+    def squareNorm(*args): return _Freestyle.Vec_3f_squareNorm(*args)
+    def normalize(*args): return _Freestyle.Vec_3f_normalize(*args)
+    def normalizeSafe(*args): return _Freestyle.Vec_3f_normalizeSafe(*args)
+    def __add__(*args): return _Freestyle.Vec_3f___add__(*args)
+    def __sub__(*args): return _Freestyle.Vec_3f___sub__(*args)
+    def __div__(*args): return _Freestyle.Vec_3f___div__(*args)
+    def __mul__(*args): return _Freestyle.Vec_3f___mul__(*args)
+    def __eq__(*args): return _Freestyle.Vec_3f___eq__(*args)
+    def __ne__(*args): return _Freestyle.Vec_3f___ne__(*args)
+    def __lt__(*args): return _Freestyle.Vec_3f___lt__(*args)
+    def __gt__(*args): return _Freestyle.Vec_3f___gt__(*args)
+Vec_3f_swigregister = _Freestyle.Vec_3f_swigregister
+Vec_3f_swigregister(Vec_3f)
+Vec_3f_dim = _Freestyle.Vec_3f_dim
+
+class Vec3u(Vec_3u):
+    __swig_setmethods__ = {}
+    for _s in [Vec_3u]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, Vec3u, name, value)
+    __swig_getmethods__ = {}
+    for _s in [Vec_3u]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, Vec3u, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_Vec3u(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def x(*args): return _Freestyle.Vec3u_x(*args)
+    def y(*args): return _Freestyle.Vec3u_y(*args)
+    def z(*args): return _Freestyle.Vec3u_z(*args)
+    def setX(*args): return _Freestyle.Vec3u_setX(*args)
+    def setY(*args): return _Freestyle.Vec3u_setY(*args)
+    def setZ(*args): return _Freestyle.Vec3u_setZ(*args)
+    def __add__(*args): return _Freestyle.Vec3u___add__(*args)
+    def __sub__(*args): return _Freestyle.Vec3u___sub__(*args)
+    def __div__(*args): return _Freestyle.Vec3u___div__(*args)
+    def __mul__(*args): return _Freestyle.Vec3u___mul__(*args)
+    def __xor__(*args): return _Freestyle.Vec3u___xor__(*args)
+    __swig_destroy__ = _Freestyle.delete_Vec3u
+    __del__ = lambda self : None;
+Vec3u_swigregister = _Freestyle.Vec3u_swigregister
+Vec3u_swigregister(Vec3u)
+
+class Vec3i(Vec_3i):
+    __swig_setmethods__ = {}
+    for _s in [Vec_3i]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, Vec3i, name, value)
+    __swig_getmethods__ = {}
+    for _s in [Vec_3i]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, Vec3i, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_Vec3i(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def x(*args): return _Freestyle.Vec3i_x(*args)
+    def y(*args): return _Freestyle.Vec3i_y(*args)
+    def z(*args): return _Freestyle.Vec3i_z(*args)
+    def setX(*args): return _Freestyle.Vec3i_setX(*args)
+    def setY(*args): return _Freestyle.Vec3i_setY(*args)
+    def setZ(*args): return _Freestyle.Vec3i_setZ(*args)
+    def __add__(*args): return _Freestyle.Vec3i___add__(*args)
+    def __sub__(*args): return _Freestyle.Vec3i___sub__(*args)
+    def __div__(*args): return _Freestyle.Vec3i___div__(*args)
+    def __mul__(*args): return _Freestyle.Vec3i___mul__(*args)
+    def __xor__(*args): return _Freestyle.Vec3i___xor__(*args)
+    __swig_destroy__ = _Freestyle.delete_Vec3i
+    __del__ = lambda self : None;
+Vec3i_swigregister = _Freestyle.Vec3i_swigregister
+Vec3i_swigregister(Vec3i)
+
+class Vec3f(Vec_3f):
+    __swig_setmethods__ = {}
+    for _s in [Vec_3f]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, Vec3f, name, value)
+    __swig_getmethods__ = {}
+    for _s in [Vec_3f]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, Vec3f, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_Vec3f(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def x(*args): return _Freestyle.Vec3f_x(*args)
+    def y(*args): return _Freestyle.Vec3f_y(*args)
+    def z(*args): return _Freestyle.Vec3f_z(*args)
+    def setX(*args): return _Freestyle.Vec3f_setX(*args)
+    def setY(*args): return _Freestyle.Vec3f_setY(*args)
+    def setZ(*args): return _Freestyle.Vec3f_setZ(*args)
+    def __add__(*args): return _Freestyle.Vec3f___add__(*args)
+    def __sub__(*args): return _Freestyle.Vec3f___sub__(*args)
+    def __div__(*args): return _Freestyle.Vec3f___div__(*args)
+    def __mul__(*args): return _Freestyle.Vec3f___mul__(*args)
+    def __xor__(*args): return _Freestyle.Vec3f___xor__(*args)
+    __swig_destroy__ = _Freestyle.delete_Vec3f
+    __del__ = lambda self : None;
+Vec3f_swigregister = _Freestyle.Vec3f_swigregister
+Vec3f_swigregister(Vec3f)
+
+class Vec3d(Vec_3d):
+    __swig_setmethods__ = {}
+    for _s in [Vec_3d]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, Vec3d, name, value)
+    __swig_getmethods__ = {}
+    for _s in [Vec_3d]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, Vec3d, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_Vec3d(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def x(*args): return _Freestyle.Vec3d_x(*args)
+    def y(*args): return _Freestyle.Vec3d_y(*args)
+    def z(*args): return _Freestyle.Vec3d_z(*args)
+    def setX(*args): return _Freestyle.Vec3d_setX(*args)
+    def setY(*args): return _Freestyle.Vec3d_setY(*args)
+    def setZ(*args): return _Freestyle.Vec3d_setZ(*args)
+    def __add__(*args): return _Freestyle.Vec3d___add__(*args)
+    def __sub__(*args): return _Freestyle.Vec3d___sub__(*args)
+    def __div__(*args): return _Freestyle.Vec3d___div__(*args)
+    def __mul__(*args): return _Freestyle.Vec3d___mul__(*args)
+    def __xor__(*args): return _Freestyle.Vec3d___xor__(*args)
+    __swig_destroy__ = _Freestyle.delete_Vec3d
+    __del__ = lambda self : None;
+Vec3d_swigregister = _Freestyle.Vec3d_swigregister
+Vec3d_swigregister(Vec3d)
+
+_Noise_B_ = _Freestyle._Noise_B_
+class Noise(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, Noise, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, Noise, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_Noise(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_Noise
+    __del__ = lambda self : None;
+    def turbulence1(*args): return _Freestyle.Noise_turbulence1(*args)
+    def turbulence2(*args): return _Freestyle.Noise_turbulence2(*args)
+    def turbulence3(*args): return _Freestyle.Noise_turbulence3(*args)
+    def smoothNoise1(*args): return _Freestyle.Noise_smoothNoise1(*args)
+    def smoothNoise2(*args): return _Freestyle.Noise_smoothNoise2(*args)
+    def smoothNoise3(*args): return _Freestyle.Noise_smoothNoise3(*args)
+Noise_swigregister = _Freestyle.Noise_swigregister
+Noise_swigregister(Noise)
+
+class Material(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, Material, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, Material, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_Material(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_Material
+    __del__ = lambda self : None;
+    def diffuse(*args): return _Freestyle.Material_diffuse(*args)
+    def diffuseR(*args): return _Freestyle.Material_diffuseR(*args)
+    def diffuseG(*args): return _Freestyle.Material_diffuseG(*args)
+    def diffuseB(*args): return _Freestyle.Material_diffuseB(*args)
+    def diffuseA(*args): return _Freestyle.Material_diffuseA(*args)
+    def specular(*args): return _Freestyle.Material_specular(*args)
+    def specularR(*args): return _Freestyle.Material_specularR(*args)
+    def specularG(*args): return _Freestyle.Material_specularG(*args)
+    def specularB(*args): return _Freestyle.Material_specularB(*args)
+    def specularA(*args): return _Freestyle.Material_specularA(*args)
+    def ambient(*args): return _Freestyle.Material_ambient(*args)
+    def ambientR(*args): return _Freestyle.Material_ambientR(*args)
+    def ambientG(*args): return _Freestyle.Material_ambientG(*args)
+    def ambientB(*args): return _Freestyle.Material_ambientB(*args)
+    def ambientA(*args): return _Freestyle.Material_ambientA(*args)
+    def emission(*args): return _Freestyle.Material_emission(*args)
+    def emissionR(*args): return _Freestyle.Material_emissionR(*args)
+    def emissionG(*args): return _Freestyle.Material_emissionG(*args)
+    def emissionB(*args): return _Freestyle.Material_emissionB(*args)
+    def emissionA(*args): return _Freestyle.Material_emissionA(*args)
+    def shininess(*args): return _Freestyle.Material_shininess(*args)
+    def SetDiffuse(*args): return _Freestyle.Material_SetDiffuse(*args)
+    def SetSpecular(*args): return _Freestyle.Material_SetSpecular(*args)
+    def SetAmbient(*args): return _Freestyle.Material_SetAmbient(*args)
+    def SetEmission(*args): return _Freestyle.Material_SetEmission(*args)
+    def SetShininess(*args): return _Freestyle.Material_SetShininess(*args)
+    def __ne__(*args): return _Freestyle.Material___ne__(*args)
+    def __eq__(*args): return _Freestyle.Material___eq__(*args)
+Material_swigregister = _Freestyle.Material_swigregister
+Material_swigregister(Material)
+
+class Interface0D(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, Interface0D, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, Interface0D, name)
+    __repr__ = _swig_repr
+    def getExactTypeName(*args): return _Freestyle.Interface0D_getExactTypeName(*args)
+    def getX(*args): return _Freestyle.Interface0D_getX(*args)
+    def getY(*args): return _Freestyle.Interface0D_getY(*args)
+    def getZ(*args): return _Freestyle.Interface0D_getZ(*args)
+    def getPoint3D(*args): return _Freestyle.Interface0D_getPoint3D(*args)
+    def getProjectedX(*args): return _Freestyle.Interface0D_getProjectedX(*args)
+    def getProjectedY(*args): return _Freestyle.Interface0D_getProjectedY(*args)
+    def getProjectedZ(*args): return _Freestyle.Interface0D_getProjectedZ(*args)
+    def getPoint2D(*args): return _Freestyle.Interface0D_getPoint2D(*args)
+    def getFEdge(*args): return _Freestyle.Interface0D_getFEdge(*args)
+    def getId(*args): return _Freestyle.Interface0D_getId(*args)
+    def getNature(*args): return _Freestyle.Interface0D_getNature(*args)
+    def castToSVertex(*args): return _Freestyle.Interface0D_castToSVertex(*args)
+    def castToViewVertex(*args): return _Freestyle.Interface0D_castToViewVertex(*args)
+    def castToNonTVertex(*args): return _Freestyle.Interface0D_castToNonTVertex(*args)
+    def castToTVertex(*args): return _Freestyle.Interface0D_castToTVertex(*args)
+    def __init__(self, *args): 
+        this = _Freestyle.new_Interface0D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_Interface0D
+    __del__ = lambda self : None;
+Interface0D_swigregister = _Freestyle.Interface0D_swigregister
+Interface0D_swigregister(Interface0D)
+cvar = _Freestyle.cvar
+POINT = cvar.POINT
+S_VERTEX = cvar.S_VERTEX
+VIEW_VERTEX = cvar.VIEW_VERTEX
+NON_T_VERTEX = cvar.NON_T_VERTEX
+T_VERTEX = cvar.T_VERTEX
+CUSP = cvar.CUSP
+NO_FEATURE = cvar.NO_FEATURE
+SILHOUETTE = cvar.SILHOUETTE
+BORDER = cvar.BORDER
+CREASE = cvar.CREASE
+RIDGE = cvar.RIDGE
+VALLEY = cvar.VALLEY
+SUGGESTIVE_CONTOUR = cvar.SUGGESTIVE_CONTOUR
+
+class Interface0DIteratorNested(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, Interface0DIteratorNested, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, Interface0DIteratorNested, name)
+    def __init__(self): raise AttributeError, "No constructor defined"
+    __repr__ = _swig_repr
+    __swig_destroy__ = _Freestyle.delete_Interface0DIteratorNested
+    __del__ = lambda self : None;
+    def getExactTypeName(*args): return _Freestyle.Interface0DIteratorNested_getExactTypeName(*args)
+    def getObject(*args): return _Freestyle.Interface0DIteratorNested_getObject(*args)
+    def __deref__(*args): return _Freestyle.Interface0DIteratorNested___deref__(*args)
+    def increment(*args): return _Freestyle.Interface0DIteratorNested_increment(*args)
+    def decrement(*args): return _Freestyle.Interface0DIteratorNested_decrement(*args)
+    def isBegin(*args): return _Freestyle.Interface0DIteratorNested_isBegin(*args)
+    def isEnd(*args): return _Freestyle.Interface0DIteratorNested_isEnd(*args)
+    def __eq__(*args): return _Freestyle.Interface0DIteratorNested___eq__(*args)
+    def __ne__(*args): return _Freestyle.Interface0DIteratorNested___ne__(*args)
+    def t(*args): return _Freestyle.Interface0DIteratorNested_t(*args)
+    def u(*args): return _Freestyle.Interface0DIteratorNested_u(*args)
+    def copy(*args): return _Freestyle.Interface0DIteratorNested_copy(*args)
+    def getX(*args): return _Freestyle.Interface0DIteratorNested_getX(*args)
+    def getY(*args): return _Freestyle.Interface0DIteratorNested_getY(*args)
+    def getZ(*args): return _Freestyle.Interface0DIteratorNested_getZ(*args)
+    def getPoint3D(*args): return _Freestyle.Interface0DIteratorNested_getPoint3D(*args)
+    def getProjectedX(*args): return _Freestyle.Interface0DIteratorNested_getProjectedX(*args)
+    def getProjectedY(*args): return _Freestyle.Interface0DIteratorNested_getProjectedY(*args)
+    def getProjectedZ(*args): return _Freestyle.Interface0DIteratorNested_getProjectedZ(*args)
+    def getPoint2D(*args): return _Freestyle.Interface0DIteratorNested_getPoint2D(*args)
+    def getFEdge(*args): return _Freestyle.Interface0DIteratorNested_getFEdge(*args)
+    def getId(*args): return _Freestyle.Interface0DIteratorNested_getId(*args)
+    def getNature(*args): return _Freestyle.Interface0DIteratorNested_getNature(*args)
+    def castToSVertex(*args): return _Freestyle.Interface0DIteratorNested_castToSVertex(*args)
+    def castToViewVertex(*args): return _Freestyle.Interface0DIteratorNested_castToViewVertex(*args)
+    def castToNonTVertex(*args): return _Freestyle.Interface0DIteratorNested_castToNonTVertex(*args)
+    def castToTVertex(*args): return _Freestyle.Interface0DIteratorNested_castToTVertex(*args)
+Interface0DIteratorNested_swigregister = _Freestyle.Interface0DIteratorNested_swigregister
+Interface0DIteratorNested_swigregister(Interface0DIteratorNested)
+
+class Interface0DIterator(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, Interface0DIterator, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, Interface0DIterator, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_Interface0DIterator(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_Interface0DIterator
+    __del__ = lambda self : None;
+    def getExactTypeName(*args): return _Freestyle.Interface0DIterator_getExactTypeName(*args)
+    def getObject(*args): return _Freestyle.Interface0DIterator_getObject(*args)
+    def __deref__(*args): return _Freestyle.Interface0DIterator___deref__(*args)
+    def increment(*args): return _Freestyle.Interface0DIterator_increment(*args)
+    def decrement(*args): return _Freestyle.Interface0DIterator_decrement(*args)
+    def isBegin(*args): return _Freestyle.Interface0DIterator_isBegin(*args)
+    def isEnd(*args): return _Freestyle.Interface0DIterator_isEnd(*args)
+    def __eq__(*args): return _Freestyle.Interface0DIterator___eq__(*args)
+    def __ne__(*args): return _Freestyle.Interface0DIterator___ne__(*args)
+    def t(*args): return _Freestyle.Interface0DIterator_t(*args)
+    def u(*args): return _Freestyle.Interface0DIterator_u(*args)
+    def getX(*args): return _Freestyle.Interface0DIterator_getX(*args)
+    def getY(*args): return _Freestyle.Interface0DIterator_getY(*args)
+    def getZ(*args): return _Freestyle.Interface0DIterator_getZ(*args)
+    def getPoint3D(*args): return _Freestyle.Interface0DIterator_getPoint3D(*args)
+    def getProjectedX(*args): return _Freestyle.Interface0DIterator_getProjectedX(*args)
+    def getProjectedY(*args): return _Freestyle.Interface0DIterator_getProjectedY(*args)
+    def getProjectedZ(*args): return _Freestyle.Interface0DIterator_getProjectedZ(*args)
+    def getPoint2D(*args): return _Freestyle.Interface0DIterator_getPoint2D(*args)
+    def getFEdge(*args): return _Freestyle.Interface0DIterator_getFEdge(*args)
+    def getId(*args): return _Freestyle.Interface0DIterator_getId(*args)
+    def getNature(*args): return _Freestyle.Interface0DIterator_getNature(*args)
+    def castToSVertex(*args): return _Freestyle.Interface0DIterator_castToSVertex(*args)
+    def castToViewVertex(*args): return _Freestyle.Interface0DIterator_castToViewVertex(*args)
+    def castToNonTVertex(*args): return _Freestyle.Interface0DIterator_castToNonTVertex(*args)
+    def castToTVertex(*args): return _Freestyle.Interface0DIterator_castToTVertex(*args)
+Interface0DIterator_swigregister = _Freestyle.Interface0DIterator_swigregister
+Interface0DIterator_swigregister(Interface0DIterator)
+
+MEAN = _Freestyle.MEAN
+MIN = _Freestyle.MIN
+MAX = _Freestyle.MAX
+FIRST = _Freestyle.FIRST
+LAST = _Freestyle.LAST
+class Interface1D(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, Interface1D, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, Interface1D, name)
+    def __init__(self): raise AttributeError, "No constructor defined"
+    __repr__ = _swig_repr
+    def getExactTypeName(*args): return _Freestyle.Interface1D_getExactTypeName(*args)
+    def verticesBegin(*args): return _Freestyle.Interface1D_verticesBegin(*args)
+    def verticesEnd(*args): return _Freestyle.Interface1D_verticesEnd(*args)
+    def pointsBegin(*args): return _Freestyle.Interface1D_pointsBegin(*args)
+    def pointsEnd(*args): return _Freestyle.Interface1D_pointsEnd(*args)
+    def getLength2D(*args): return _Freestyle.Interface1D_getLength2D(*args)
+    def getId(*args): return _Freestyle.Interface1D_getId(*args)
+    def getNature(*args): return _Freestyle.Interface1D_getNature(*args)
+    def getTimeStamp(*args): return _Freestyle.Interface1D_getTimeStamp(*args)
+    def setTimeStamp(*args): return _Freestyle.Interface1D_setTimeStamp(*args)
+    __swig_destroy__ = _Freestyle.delete_Interface1D
+    __del__ = lambda self : None;
+Interface1D_swigregister = _Freestyle.Interface1D_swigregister
+Interface1D_swigregister(Interface1D)
+
+class SVertex(Interface0D):
+    __swig_setmethods__ = {}
+    for _s in [Interface0D]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, SVertex, name, value)
+    __swig_getmethods__ = {}
+    for _s in [Interface0D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, SVertex, name)
+    __repr__ = _swig_repr
+    def getExactTypeName(*args): return _Freestyle.SVertex_getExactTypeName(*args)
+    def getX(*args): return _Freestyle.SVertex_getX(*args)
+    def getY(*args): return _Freestyle.SVertex_getY(*args)
+    def getZ(*args): return _Freestyle.SVertex_getZ(*args)
+    def getPoint3D(*args): return _Freestyle.SVertex_getPoint3D(*args)
+    def getProjectedX(*args): return _Freestyle.SVertex_getProjectedX(*args)
+    def getProjectedY(*args): return _Freestyle.SVertex_getProjectedY(*args)
+    def getProjectedZ(*args): return _Freestyle.SVertex_getProjectedZ(*args)
+    def getPoint2D(*args): return _Freestyle.SVertex_getPoint2D(*args)
+    def getFEdge(*args): return _Freestyle.SVertex_getFEdge(*args)
+    def getId(*args): return _Freestyle.SVertex_getId(*args)
+    def getNature(*args): return _Freestyle.SVertex_getNature(*args)
+    def castToSVertex(*args): return _Freestyle.SVertex_castToSVertex(*args)
+    def castToViewVertex(*args): return _Freestyle.SVertex_castToViewVertex(*args)
+    def castToNonTVertex(*args): return _Freestyle.SVertex_castToNonTVertex(*args)
+    def castToTVertex(*args): return _Freestyle.SVertex_castToTVertex(*args)
+    __swig_setmethods__["userdata"] = _Freestyle.SVertex_userdata_set
+    __swig_getmethods__["userdata"] = _Freestyle.SVertex_userdata_get
+    if _newclass:userdata = _swig_property(_Freestyle.SVertex_userdata_get, _Freestyle.SVertex_userdata_set)
+    def __init__(self, *args): 
+        this = _Freestyle.new_SVertex(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_SVertex
+    __del__ = lambda self : None;
+    def dupplicate(*args): return _Freestyle.SVertex_dupplicate(*args)
+    def __eq__(*args): return _Freestyle.SVertex___eq__(*args)
+    def point3D(*args): return _Freestyle.SVertex_point3D(*args)
+    def point2D(*args): return _Freestyle.SVertex_point2D(*args)
+    def normals(*args): return _Freestyle.SVertex_normals(*args)
+    def normalsSize(*args): return _Freestyle.SVertex_normalsSize(*args)
+    def fedges(*args): return _Freestyle.SVertex_fedges(*args)
+    def fedges_begin(*args): return _Freestyle.SVertex_fedges_begin(*args)
+    def fedges_end(*args): return _Freestyle.SVertex_fedges_end(*args)
+    def z(*args): return _Freestyle.SVertex_z(*args)
+    def viewvertex(*args): return _Freestyle.SVertex_viewvertex(*args)
+    def SetPoint3D(*args): return _Freestyle.SVertex_SetPoint3D(*args)
+    def SetPoint2D(*args): return _Freestyle.SVertex_SetPoint2D(*args)
+    def AddNormal(*args): return _Freestyle.SVertex_AddNormal(*args)
+    def setCurvatureInfo(*args): return _Freestyle.SVertex_setCurvatureInfo(*args)
+    def getCurvatureInfo(*args): return _Freestyle.SVertex_getCurvatureInfo(*args)
+    def setCurvatureFredo(*args): return _Freestyle.SVertex_setCurvatureFredo(*args)
+    def setDirectionFredo(*args): return _Freestyle.SVertex_setDirectionFredo(*args)
+    def curvatureFredo(*args): return _Freestyle.SVertex_curvatureFredo(*args)
+    def directionFredo(*args): return _Freestyle.SVertex_directionFredo(*args)
+    def SetId(*args): return _Freestyle.SVertex_SetId(*args)
+    def SetFEdges(*args): return _Freestyle.SVertex_SetFEdges(*args)
+    def SetShape(*args): return _Freestyle.SVertex_SetShape(*args)
+    def SetViewVertex(*args): return _Freestyle.SVertex_SetViewVertex(*args)
+    def AddFEdge(*args): return _Freestyle.SVertex_AddFEdge(*args)
+    def Replace(*args): return _Freestyle.SVertex_Replace(*args)
+    def fedge(*args): return _Freestyle.SVertex_fedge(*args)
+    def point2d(*args): return _Freestyle.SVertex_point2d(*args)
+    def point3d(*args): return _Freestyle.SVertex_point3d(*args)
+    def normal(*args): return _Freestyle.SVertex_normal(*args)
+    def shape_id(*args): return _Freestyle.SVertex_shape_id(*args)
+    def shape(*args): return _Freestyle.SVertex_shape(*args)
+    def shape_importance(*args): return _Freestyle.SVertex_shape_importance(*args)
+    def qi(*args): return _Freestyle.SVertex_qi(*args)
+    def occluders_begin(*args): return _Freestyle.SVertex_occluders_begin(*args)
+    def occluders_end(*args): return _Freestyle.SVertex_occluders_end(*args)
+    def occluders_empty(*args): return _Freestyle.SVertex_occluders_empty(*args)
+    def occluders_size(*args): return _Freestyle.SVertex_occluders_size(*args)
+    def occludee(*args): return _Freestyle.SVertex_occludee(*args)
+    def occluded_shape(*args): return _Freestyle.SVertex_occluded_shape(*args)
+    def occludee_empty(*args): return _Freestyle.SVertex_occludee_empty(*args)
+    def z_discontinuity(*args): return _Freestyle.SVertex_z_discontinuity(*args)
+SVertex_swigregister = _Freestyle.SVertex_swigregister
+SVertex_swigregister(SVertex)
+integrateUnsigned = _Freestyle.integrateUnsigned
+integrateFloat = _Freestyle.integrateFloat
+integrateDouble = _Freestyle.integrateDouble
+
+class FEdge(Interface1D):
+    __swig_setmethods__ = {}
+    for _s in [Interface1D]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, FEdge, name, value)
+    __swig_getmethods__ = {}
+    for _s in [Interface1D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, FEdge, name)
+    __repr__ = _swig_repr
+    def getExactTypeName(*args): return _Freestyle.FEdge_getExactTypeName(*args)
+    def getLength2D(*args): return _Freestyle.FEdge_getLength2D(*args)
+    def getId(*args): return _Freestyle.FEdge_getId(*args)
+    __swig_setmethods__["userdata"] = _Freestyle.FEdge_userdata_set
+    __swig_getmethods__["userdata"] = _Freestyle.FEdge_userdata_get
+    if _newclass:userdata = _swig_property(_Freestyle.FEdge_userdata_get, _Freestyle.FEdge_userdata_set)
+    def __init__(self, *args): 
+        this = _Freestyle.new_FEdge(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_FEdge
+    __del__ = lambda self : None;
+    def dupplicate(*args): return _Freestyle.FEdge_dupplicate(*args)
+    def vertexA(*args): return _Freestyle.FEdge_vertexA(*args)
+    def vertexB(*args): return _Freestyle.FEdge_vertexB(*args)
+    def getNature(*args): return _Freestyle.FEdge_getNature(*args)
+    def nextEdge(*args): return _Freestyle.FEdge_nextEdge(*args)
+    def previousEdge(*args): return _Freestyle.FEdge_previousEdge(*args)
+    def invisibility(*args): return _Freestyle.FEdge_invisibility(*args)
+    def viewedge(*args): return _Freestyle.FEdge_viewedge(*args)
+    def center3d(*args): return _Freestyle.FEdge_center3d(*args)
+    def center2d(*args): return _Freestyle.FEdge_center2d(*args)
+    def aFace(*args): return _Freestyle.FEdge_aFace(*args)
+    def getOccludeeIntersection(*args): return _Freestyle.FEdge_getOccludeeIntersection(*args)
+    def getOccludeeEmpty(*args): return _Freestyle.FEdge_getOccludeeEmpty(*args)
+    def isSmooth(*args): return _Freestyle.FEdge_isSmooth(*args)
+    def SetVertexA(*args): return _Freestyle.FEdge_SetVertexA(*args)
+    def SetVertexB(*args): return _Freestyle.FEdge_SetVertexB(*args)
+    def SetId(*args): return _Freestyle.FEdge_SetId(*args)
+    def SetNextEdge(*args): return _Freestyle.FEdge_SetNextEdge(*args)
+    def SetPreviousEdge(*args): return _Freestyle.FEdge_SetPreviousEdge(*args)
+    def SetNature(*args): return _Freestyle.FEdge_SetNature(*args)
+    def SetViewEdge(*args): return _Freestyle.FEdge_SetViewEdge(*args)
+    def SetaFace(*args): return _Freestyle.FEdge_SetaFace(*args)
+    def SetOccludeeIntersection(*args): return _Freestyle.FEdge_SetOccludeeIntersection(*args)
+    def SetOccludeeEmpty(*args): return _Freestyle.FEdge_SetOccludeeEmpty(*args)
+    def SetSmooth(*args): return _Freestyle.FEdge_SetSmooth(*args)
+    __swig_getmethods__["CommonVertex"] = lambda x: _Freestyle.FEdge_CommonVertex
+    if _newclass:CommonVertex = staticmethod(_Freestyle.FEdge_CommonVertex)
+    def min2d(*args): return _Freestyle.FEdge_min2d(*args)
+    def max2d(*args): return _Freestyle.FEdge_max2d(*args)
+    def shape_id(*args): return _Freestyle.FEdge_shape_id(*args)
+    def shape(*args): return _Freestyle.FEdge_shape(*args)
+    def shape_importance(*args): return _Freestyle.FEdge_shape_importance(*args)
+    def qi(*args): return _Freestyle.FEdge_qi(*args)
+    def occluders_begin(*args): return _Freestyle.FEdge_occluders_begin(*args)
+    def occluders_end(*args): return _Freestyle.FEdge_occluders_end(*args)
+    def occluders_empty(*args): return _Freestyle.FEdge_occluders_empty(*args)
+    def occluders_size(*args): return _Freestyle.FEdge_occluders_size(*args)
+    def occludee(*args): return _Freestyle.FEdge_occludee(*args)
+    def occluded_shape(*args): return _Freestyle.FEdge_occluded_shape(*args)
+    def occludee_empty(*args): return _Freestyle.FEdge_occludee_empty(*args)
+    def z_discontinuity(*args): return _Freestyle.FEdge_z_discontinuity(*args)
+    def viewedge_nature(*args): return _Freestyle.FEdge_viewedge_nature(*args)
+    def orientation2d(*args): return _Freestyle.FEdge_orientation2d(*args)
+    def orientation3d(*args): return _Freestyle.FEdge_orientation3d(*args)
+    def verticesBegin(*args): return _Freestyle.FEdge_verticesBegin(*args)
+    def verticesEnd(*args): return _Freestyle.FEdge_verticesEnd(*args)
+    def pointsBegin(*args): return _Freestyle.FEdge_pointsBegin(*args)
+    def pointsEnd(*args): return _Freestyle.FEdge_pointsEnd(*args)
+FEdge_swigregister = _Freestyle.FEdge_swigregister
+FEdge_swigregister(FEdge)
+FEdge_CommonVertex = _Freestyle.FEdge_CommonVertex
+
+class FEdgeSVertexIterator(Interface0DIteratorNested):
+    __swig_setmethods__ = {}
+    for _s in [Interface0DIteratorNested]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, FEdgeSVertexIterator, name, value)
+    __swig_getmethods__ = {}
+    for _s in [Interface0DIteratorNested]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, FEdgeSVertexIterator, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_FEdgeSVertexIterator(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def getExactTypeName(*args): return _Freestyle.FEdgeSVertexIterator_getExactTypeName(*args)
+    def getObject(*args): return _Freestyle.FEdgeSVertexIterator_getObject(*args)
+    def __deref__(*args): return _Freestyle.FEdgeSVertexIterator___deref__(*args)
+    def increment(*args): return _Freestyle.FEdgeSVertexIterator_increment(*args)
+    def decrement(*args): return _Freestyle.FEdgeSVertexIterator_decrement(*args)
+    def isBegin(*args): return _Freestyle.FEdgeSVertexIterator_isBegin(*args)
+    def isEnd(*args): return _Freestyle.FEdgeSVertexIterator_isEnd(*args)
+    def __eq__(*args): return _Freestyle.FEdgeSVertexIterator___eq__(*args)
+    def t(*args): return _Freestyle.FEdgeSVertexIterator_t(*args)
+    def u(*args): return _Freestyle.FEdgeSVertexIterator_u(*args)
+    def copy(*args): return _Freestyle.FEdgeSVertexIterator_copy(*args)
+    __swig_destroy__ = _Freestyle.delete_FEdgeSVertexIterator
+    __del__ = lambda self : None;
+    def getX(*args): return _Freestyle.FEdgeSVertexIterator_getX(*args)
+    def getY(*args): return _Freestyle.FEdgeSVertexIterator_getY(*args)
+    def getZ(*args): return _Freestyle.FEdgeSVertexIterator_getZ(*args)
+    def getPoint3D(*args): return _Freestyle.FEdgeSVertexIterator_getPoint3D(*args)
+    def getProjectedX(*args): return _Freestyle.FEdgeSVertexIterator_getProjectedX(*args)
+    def getProjectedY(*args): return _Freestyle.FEdgeSVertexIterator_getProjectedY(*args)
+    def getProjectedZ(*args): return _Freestyle.FEdgeSVertexIterator_getProjectedZ(*args)
+    def getPoint2D(*args): return _Freestyle.FEdgeSVertexIterator_getPoint2D(*args)
+    def getFEdge(*args): return _Freestyle.FEdgeSVertexIterator_getFEdge(*args)
+    def getId(*args): return _Freestyle.FEdgeSVertexIterator_getId(*args)
+    def getNature(*args): return _Freestyle.FEdgeSVertexIterator_getNature(*args)
+    def castToSVertex(*args): return _Freestyle.FEdgeSVertexIterator_castToSVertex(*args)
+    def castToViewVertex(*args): return _Freestyle.FEdgeSVertexIterator_castToViewVertex(*args)
+    def castToNonTVertex(*args): return _Freestyle.FEdgeSVertexIterator_castToNonTVertex(*args)
+    def castToTVertex(*args): return _Freestyle.FEdgeSVertexIterator_castToTVertex(*args)
+    __swig_setmethods__["userdata"] = _Freestyle.FEdgeSVertexIterator_userdata_set
+    __swig_getmethods__["userdata"] = _Freestyle.FEdgeSVertexIterator_userdata_get
+    if _newclass:userdata = _swig_property(_Freestyle.FEdgeSVertexIterator_userdata_get, _Freestyle.FEdgeSVertexIterator_userdata_set)
+    def dupplicate(*args): return _Freestyle.FEdgeSVertexIterator_dupplicate(*args)
+    def point3D(*args): return _Freestyle.FEdgeSVertexIterator_point3D(*args)
+    def point2D(*args): return _Freestyle.FEdgeSVertexIterator_point2D(*args)
+    def normals(*args): return _Freestyle.FEdgeSVertexIterator_normals(*args)
+    def normalsSize(*args): return _Freestyle.FEdgeSVertexIterator_normalsSize(*args)
+    def fedges(*args): return _Freestyle.FEdgeSVertexIterator_fedges(*args)
+    def fedges_begin(*args): return _Freestyle.FEdgeSVertexIterator_fedges_begin(*args)
+    def fedges_end(*args): return _Freestyle.FEdgeSVertexIterator_fedges_end(*args)
+    def shape(*args): return _Freestyle.FEdgeSVertexIterator_shape(*args)
+    def z(*args): return _Freestyle.FEdgeSVertexIterator_z(*args)
+    def viewvertex(*args): return _Freestyle.FEdgeSVertexIterator_viewvertex(*args)
+    def SetPoint3D(*args): return _Freestyle.FEdgeSVertexIterator_SetPoint3D(*args)
+    def SetPoint2D(*args): return _Freestyle.FEdgeSVertexIterator_SetPoint2D(*args)
+    def AddNormal(*args): return _Freestyle.FEdgeSVertexIterator_AddNormal(*args)
+    def setCurvatureInfo(*args): return _Freestyle.FEdgeSVertexIterator_setCurvatureInfo(*args)
+    def getCurvatureInfo(*args): return _Freestyle.FEdgeSVertexIterator_getCurvatureInfo(*args)
+    def setCurvatureFredo(*args): return _Freestyle.FEdgeSVertexIterator_setCurvatureFredo(*args)
+    def setDirectionFredo(*args): return _Freestyle.FEdgeSVertexIterator_setDirectionFredo(*args)
+    def curvatureFredo(*args): return _Freestyle.FEdgeSVertexIterator_curvatureFredo(*args)
+    def directionFredo(*args): return _Freestyle.FEdgeSVertexIterator_directionFredo(*args)
+    def SetId(*args): return _Freestyle.FEdgeSVertexIterator_SetId(*args)
+    def SetFEdges(*args): return _Freestyle.FEdgeSVertexIterator_SetFEdges(*args)
+    def SetShape(*args): return _Freestyle.FEdgeSVertexIterator_SetShape(*args)
+    def SetViewVertex(*args): return _Freestyle.FEdgeSVertexIterator_SetViewVertex(*args)
+    def AddFEdge(*args): return _Freestyle.FEdgeSVertexIterator_AddFEdge(*args)
+    def Replace(*args): return _Freestyle.FEdgeSVertexIterator_Replace(*args)
+    def fedge(*args): return _Freestyle.FEdgeSVertexIterator_fedge(*args)
+    def point2d(*args): return _Freestyle.FEdgeSVertexIterator_point2d(*args)
+    def point3d(*args): return _Freestyle.FEdgeSVertexIterator_point3d(*args)
+    def normal(*args): return _Freestyle.FEdgeSVertexIterator_normal(*args)
+    def shape_id(*args): return _Freestyle.FEdgeSVertexIterator_shape_id(*args)
+    def shape_importance(*args): return _Freestyle.FEdgeSVertexIterator_shape_importance(*args)
+    def qi(*args): return _Freestyle.FEdgeSVertexIterator_qi(*args)
+    def occluders_begin(*args): return _Freestyle.FEdgeSVertexIterator_occluders_begin(*args)
+    def occluders_end(*args): return _Freestyle.FEdgeSVertexIterator_occluders_end(*args)
+    def occluders_empty(*args): return _Freestyle.FEdgeSVertexIterator_occluders_empty(*args)
+    def occluders_size(*args): return _Freestyle.FEdgeSVertexIterator_occluders_size(*args)
+    def occludee(*args): return _Freestyle.FEdgeSVertexIterator_occludee(*args)
+    def occluded_shape(*args): return _Freestyle.FEdgeSVertexIterator_occluded_shape(*args)
+    def occludee_empty(*args): return _Freestyle.FEdgeSVertexIterator_occludee_empty(*args)
+    def z_discontinuity(*args): return _Freestyle.FEdgeSVertexIterator_z_discontinuity(*args)
+FEdgeSVertexIterator_swigregister = _Freestyle.FEdgeSVertexIterator_swigregister
+FEdgeSVertexIterator_swigregister(FEdgeSVertexIterator)
+
+class FEdgeSharp(FEdge):
+    __swig_setmethods__ = {}
+    for _s in [FEdge]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, FEdgeSharp, name, value)
+    __swig_getmethods__ = {}
+    for _s in [FEdge]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, FEdgeSharp, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_FEdgeSharp(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_FEdgeSharp
+    __del__ = lambda self : None;
+    def dupplicate(*args): return _Freestyle.FEdgeSharp_dupplicate(*args)
+    def normalA(*args): return _Freestyle.FEdgeSharp_normalA(*args)
+    def normalB(*args): return _Freestyle.FEdgeSharp_normalB(*args)
+    def aMaterialIndex(*args): return _Freestyle.FEdgeSharp_aMaterialIndex(*args)
+    def aMaterial(*args): return _Freestyle.FEdgeSharp_aMaterial(*args)
+    def bMaterialIndex(*args): return _Freestyle.FEdgeSharp_bMaterialIndex(*args)
+    def bMaterial(*args): return _Freestyle.FEdgeSharp_bMaterial(*args)
+    def SetNormalA(*args): return _Freestyle.FEdgeSharp_SetNormalA(*args)
+    def SetNormalB(*args): return _Freestyle.FEdgeSharp_SetNormalB(*args)
+    def SetaMaterialIndex(*args): return _Freestyle.FEdgeSharp_SetaMaterialIndex(*args)
+    def SetbMaterialIndex(*args): return _Freestyle.FEdgeSharp_SetbMaterialIndex(*args)
+FEdgeSharp_swigregister = _Freestyle.FEdgeSharp_swigregister
+FEdgeSharp_swigregister(FEdgeSharp)
+
+class FEdgeSmooth(FEdge):
+    __swig_setmethods__ = {}
+    for _s in [FEdge]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, FEdgeSmooth, name, value)
+    __swig_getmethods__ = {}
+    for _s in [FEdge]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, FEdgeSmooth, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_FEdgeSmooth(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_FEdgeSmooth
+    __del__ = lambda self : None;
+    def dupplicate(*args): return _Freestyle.FEdgeSmooth_dupplicate(*args)
+    def face(*args): return _Freestyle.FEdgeSmooth_face(*args)
+    def normal(*args): return _Freestyle.FEdgeSmooth_normal(*args)
+    def materialIndex(*args): return _Freestyle.FEdgeSmooth_materialIndex(*args)
+    def material(*args): return _Freestyle.FEdgeSmooth_material(*args)
+    def SetFace(*args): return _Freestyle.FEdgeSmooth_SetFace(*args)
+    def SetNormal(*args): return _Freestyle.FEdgeSmooth_SetNormal(*args)
+    def SetMaterialIndex(*args): return _Freestyle.FEdgeSmooth_SetMaterialIndex(*args)
+FEdgeSmooth_swigregister = _Freestyle.FEdgeSmooth_swigregister
+FEdgeSmooth_swigregister(FEdgeSmooth)
+
+class SShape(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, SShape, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, SShape, name)
+    __repr__ = _swig_repr
+    __swig_setmethods__["userdata"] = _Freestyle.SShape_userdata_set
+    __swig_getmethods__["userdata"] = _Freestyle.SShape_userdata_get
+    if _newclass:userdata = _swig_property(_Freestyle.SShape_userdata_get, _Freestyle.SShape_userdata_set)
+    def __init__(self, *args): 
+        this = _Freestyle.new_SShape(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def dupplicate(*args): return _Freestyle.SShape_dupplicate(*args)
+    __swig_destroy__ = _Freestyle.delete_SShape
+    __del__ = lambda self : None;
+    def AddEdge(*args): return _Freestyle.SShape_AddEdge(*args)
+    def AddNewVertex(*args): return _Freestyle.SShape_AddNewVertex(*args)
+    def AddChain(*args): return _Freestyle.SShape_AddChain(*args)
+    def CreateSVertex(*args): return _Freestyle.SShape_CreateSVertex(*args)
+    def SplitEdge(*args): return _Freestyle.SShape_SplitEdge(*args)
+    def SplitEdgeIn2(*args): return _Freestyle.SShape_SplitEdgeIn2(*args)
+    def SetBBox(*args): return _Freestyle.SShape_SetBBox(*args)
+    def ComputeBBox(*args): return _Freestyle.SShape_ComputeBBox(*args)
+    def RemoveEdgeFromChain(*args): return _Freestyle.SShape_RemoveEdgeFromChain(*args)
+    def RemoveEdge(*args): return _Freestyle.SShape_RemoveEdge(*args)
+    def GetVertexList(*args): return _Freestyle.SShape_GetVertexList(*args)
+    def GetEdgeList(*args): return _Freestyle.SShape_GetEdgeList(*args)
+    def GetChains(*args): return _Freestyle.SShape_GetChains(*args)
+    def bbox(*args): return _Freestyle.SShape_bbox(*args)
+    def material(*args): return _Freestyle.SShape_material(*args)
+    def materials(*args): return _Freestyle.SShape_materials(*args)
+    def viewShape(*args): return _Freestyle.SShape_viewShape(*args)
+    def importance(*args): return _Freestyle.SShape_importance(*args)
+    def getId(*args): return _Freestyle.SShape_getId(*args)
+    def SetId(*args): return _Freestyle.SShape_SetId(*args)
+    def SetMaterials(*args): return _Freestyle.SShape_SetMaterials(*args)
+    def SetViewShape(*args): return _Freestyle.SShape_SetViewShape(*args)
+    def SetImportance(*args): return _Freestyle.SShape_SetImportance(*args)
+SShape_swigregister = _Freestyle.SShape_swigregister
+SShape_swigregister(SShape)
+
+class ViewShapesContainer(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, ViewShapesContainer, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, ViewShapesContainer, name)
+    __repr__ = _swig_repr
+    def iterator(*args): return _Freestyle.ViewShapesContainer_iterator(*args)
+    def __iter__(self): return self.iterator()
+    def __nonzero__(*args): return _Freestyle.ViewShapesContainer___nonzero__(*args)
+    def __len__(*args): return _Freestyle.ViewShapesContainer___len__(*args)
+    def pop(*args): return _Freestyle.ViewShapesContainer_pop(*args)
+    def __getslice__(*args): return _Freestyle.ViewShapesContainer___getslice__(*args)
+    def __setslice__(*args): return _Freestyle.ViewShapesContainer___setslice__(*args)
+    def __delslice__(*args): return _Freestyle.ViewShapesContainer___delslice__(*args)
+    def __delitem__(*args): return _Freestyle.ViewShapesContainer___delitem__(*args)
+    def __getitem__(*args): return _Freestyle.ViewShapesContainer___getitem__(*args)
+    def __setitem__(*args): return _Freestyle.ViewShapesContainer___setitem__(*args)
+    def append(*args): return _Freestyle.ViewShapesContainer_append(*args)
+    def empty(*args): return _Freestyle.ViewShapesContainer_empty(*args)
+    def size(*args): return _Freestyle.ViewShapesContainer_size(*args)
+    def clear(*args): return _Freestyle.ViewShapesContainer_clear(*args)
+    def swap(*args): return _Freestyle.ViewShapesContainer_swap(*args)
+    def get_allocator(*args): return _Freestyle.ViewShapesContainer_get_allocator(*args)
+    def begin(*args): return _Freestyle.ViewShapesContainer_begin(*args)
+    def end(*args): return _Freestyle.ViewShapesContainer_end(*args)
+    def rbegin(*args): return _Freestyle.ViewShapesContainer_rbegin(*args)
+    def rend(*args): return _Freestyle.ViewShapesContainer_rend(*args)
+    def pop_back(*args): return _Freestyle.ViewShapesContainer_pop_back(*args)
+    def erase(*args): return _Freestyle.ViewShapesContainer_erase(*args)
+    def __init__(self, *args): 
+        this = _Freestyle.new_ViewShapesContainer(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def push_back(*args): return _Freestyle.ViewShapesContainer_push_back(*args)
+    def front(*args): return _Freestyle.ViewShapesContainer_front(*args)
+    def back(*args): return _Freestyle.ViewShapesContainer_back(*args)
+    def assign(*args): return _Freestyle.ViewShapesContainer_assign(*args)
+    def resize(*args): return _Freestyle.ViewShapesContainer_resize(*args)
+    def insert(*args): return _Freestyle.ViewShapesContainer_insert(*args)
+    def reserve(*args): return _Freestyle.ViewShapesContainer_reserve(*args)
+    def capacity(*args): return _Freestyle.ViewShapesContainer_capacity(*args)
+    __swig_destroy__ = _Freestyle.delete_ViewShapesContainer
+    __del__ = lambda self : None;
+ViewShapesContainer_swigregister = _Freestyle.ViewShapesContainer_swigregister
+ViewShapesContainer_swigregister(ViewShapesContainer)
+
+class ViewEdgesContainer(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, ViewEdgesContainer, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, ViewEdgesContainer, name)
+    __repr__ = _swig_repr
+    def iterator(*args): return _Freestyle.ViewEdgesContainer_iterator(*args)
+    def __iter__(self): return self.iterator()
+    def __nonzero__(*args): return _Freestyle.ViewEdgesContainer___nonzero__(*args)
+    def __len__(*args): return _Freestyle.ViewEdgesContainer___len__(*args)
+    def pop(*args): return _Freestyle.ViewEdgesContainer_pop(*args)
+    def __getslice__(*args): return _Freestyle.ViewEdgesContainer___getslice__(*args)
+    def __setslice__(*args): return _Freestyle.ViewEdgesContainer___setslice__(*args)
+    def __delslice__(*args): return _Freestyle.ViewEdgesContainer___delslice__(*args)
+    def __delitem__(*args): return _Freestyle.ViewEdgesContainer___delitem__(*args)
+    def __getitem__(*args): return _Freestyle.ViewEdgesContainer___getitem__(*args)
+    def __setitem__(*args): return _Freestyle.ViewEdgesContainer___setitem__(*args)
+    def append(*args): return _Freestyle.ViewEdgesContainer_append(*args)
+    def empty(*args): return _Freestyle.ViewEdgesContainer_empty(*args)
+    def size(*args): return _Freestyle.ViewEdgesContainer_size(*args)
+    def clear(*args): return _Freestyle.ViewEdgesContainer_clear(*args)
+    def swap(*args): return _Freestyle.ViewEdgesContainer_swap(*args)
+    def get_allocator(*args): return _Freestyle.ViewEdgesContainer_get_allocator(*args)
+    def begin(*args): return _Freestyle.ViewEdgesContainer_begin(*args)
+    def end(*args): return _Freestyle.ViewEdgesContainer_end(*args)
+    def rbegin(*args): return _Freestyle.ViewEdgesContainer_rbegin(*args)
+    def rend(*args): return _Freestyle.ViewEdgesContainer_rend(*args)
+    def pop_back(*args): return _Freestyle.ViewEdgesContainer_pop_back(*args)
+    def erase(*args): return _Freestyle.ViewEdgesContainer_erase(*args)
+    def __init__(self, *args): 
+        this = _Freestyle.new_ViewEdgesContainer(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def push_back(*args): return _Freestyle.ViewEdgesContainer_push_back(*args)
+    def front(*args): return _Freestyle.ViewEdgesContainer_front(*args)
+    def back(*args): return _Freestyle.ViewEdgesContainer_back(*args)
+    def assign(*args): return _Freestyle.ViewEdgesContainer_assign(*args)
+    def resize(*args): return _Freestyle.ViewEdgesContainer_resize(*args)
+    def insert(*args): return _Freestyle.ViewEdgesContainer_insert(*args)
+    def reserve(*args): return _Freestyle.ViewEdgesContainer_reserve(*args)
+    def capacity(*args): return _Freestyle.ViewEdgesContainer_capacity(*args)
+    __swig_destroy__ = _Freestyle.delete_ViewEdgesContainer
+    __del__ = lambda self : None;
+ViewEdgesContainer_swigregister = _Freestyle.ViewEdgesContainer_swigregister
+ViewEdgesContainer_swigregister(ViewEdgesContainer)
+
+class FEdgesContainer(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, FEdgesContainer, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, FEdgesContainer, name)
+    __repr__ = _swig_repr
+    def iterator(*args): return _Freestyle.FEdgesContainer_iterator(*args)
+    def __iter__(self): return self.iterator()
+    def __nonzero__(*args): return _Freestyle.FEdgesContainer___nonzero__(*args)
+    def __len__(*args): return _Freestyle.FEdgesContainer___len__(*args)
+    def pop(*args): return _Freestyle.FEdgesContainer_pop(*args)
+    def __getslice__(*args): return _Freestyle.FEdgesContainer___getslice__(*args)
+    def __setslice__(*args): return _Freestyle.FEdgesContainer___setslice__(*args)
+    def __delslice__(*args): return _Freestyle.FEdgesContainer___delslice__(*args)
+    def __delitem__(*args): return _Freestyle.FEdgesContainer___delitem__(*args)
+    def __getitem__(*args): return _Freestyle.FEdgesContainer___getitem__(*args)
+    def __setitem__(*args): return _Freestyle.FEdgesContainer___setitem__(*args)
+    def append(*args): return _Freestyle.FEdgesContainer_append(*args)
+    def empty(*args): return _Freestyle.FEdgesContainer_empty(*args)
+    def size(*args): return _Freestyle.FEdgesContainer_size(*args)
+    def clear(*args): return _Freestyle.FEdgesContainer_clear(*args)
+    def swap(*args): return _Freestyle.FEdgesContainer_swap(*args)
+    def get_allocator(*args): return _Freestyle.FEdgesContainer_get_allocator(*args)
+    def begin(*args): return _Freestyle.FEdgesContainer_begin(*args)
+    def end(*args): return _Freestyle.FEdgesContainer_end(*args)
+    def rbegin(*args): return _Freestyle.FEdgesContainer_rbegin(*args)
+    def rend(*args): return _Freestyle.FEdgesContainer_rend(*args)
+    def pop_back(*args): return _Freestyle.FEdgesContainer_pop_back(*args)
+    def erase(*args): return _Freestyle.FEdgesContainer_erase(*args)
+    def __init__(self, *args): 
+        this = _Freestyle.new_FEdgesContainer(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def push_back(*args): return _Freestyle.FEdgesContainer_push_back(*args)
+    def front(*args): return _Freestyle.FEdgesContainer_front(*args)
+    def back(*args): return _Freestyle.FEdgesContainer_back(*args)
+    def assign(*args): return _Freestyle.FEdgesContainer_assign(*args)
+    def resize(*args): return _Freestyle.FEdgesContainer_resize(*args)
+    def insert(*args): return _Freestyle.FEdgesContainer_insert(*args)
+    def reserve(*args): return _Freestyle.FEdgesContainer_reserve(*args)
+    def capacity(*args): return _Freestyle.FEdgesContainer_capacity(*args)
+    __swig_destroy__ = _Freestyle.delete_FEdgesContainer
+    __del__ = lambda self : None;
+FEdgesContainer_swigregister = _Freestyle.FEdgesContainer_swigregister
+FEdgesContainer_swigregister(FEdgesContainer)
+
+class ViewVerticesContainer(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, ViewVerticesContainer, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, ViewVerticesContainer, name)
+    __repr__ = _swig_repr
+    def iterator(*args): return _Freestyle.ViewVerticesContainer_iterator(*args)
+    def __iter__(self): return self.iterator()
+    def __nonzero__(*args): return _Freestyle.ViewVerticesContainer___nonzero__(*args)
+    def __len__(*args): return _Freestyle.ViewVerticesContainer___len__(*args)
+    def pop(*args): return _Freestyle.ViewVerticesContainer_pop(*args)
+    def __getslice__(*args): return _Freestyle.ViewVerticesContainer___getslice__(*args)
+    def __setslice__(*args): return _Freestyle.ViewVerticesContainer___setslice__(*args)
+    def __delslice__(*args): return _Freestyle.ViewVerticesContainer___delslice__(*args)
+    def __delitem__(*args): return _Freestyle.ViewVerticesContainer___delitem__(*args)
+    def __getitem__(*args): return _Freestyle.ViewVerticesContainer___getitem__(*args)
+    def __setitem__(*args): return _Freestyle.ViewVerticesContainer___setitem__(*args)
+    def append(*args): return _Freestyle.ViewVerticesContainer_append(*args)
+    def empty(*args): return _Freestyle.ViewVerticesContainer_empty(*args)
+    def size(*args): return _Freestyle.ViewVerticesContainer_size(*args)
+    def clear(*args): return _Freestyle.ViewVerticesContainer_clear(*args)
+    def swap(*args): return _Freestyle.ViewVerticesContainer_swap(*args)
+    def get_allocator(*args): return _Freestyle.ViewVerticesContainer_get_allocator(*args)
+    def begin(*args): return _Freestyle.ViewVerticesContainer_begin(*args)
+    def end(*args): return _Freestyle.ViewVerticesContainer_end(*args)
+    def rbegin(*args): return _Freestyle.ViewVerticesContainer_rbegin(*args)
+    def rend(*args): return _Freestyle.ViewVerticesContainer_rend(*args)
+    def pop_back(*args): return _Freestyle.ViewVerticesContainer_pop_back(*args)
+    def erase(*args): return _Freestyle.ViewVerticesContainer_erase(*args)
+    def __init__(self, *args): 
+        this = _Freestyle.new_ViewVerticesContainer(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def push_back(*args): return _Freestyle.ViewVerticesContainer_push_back(*args)
+    def front(*args): return _Freestyle.ViewVerticesContainer_front(*args)
+    def back(*args): return _Freestyle.ViewVerticesContainer_back(*args)
+    def assign(*args): return _Freestyle.ViewVerticesContainer_assign(*args)
+    def resize(*args): return _Freestyle.ViewVerticesContainer_resize(*args)
+    def insert(*args): return _Freestyle.ViewVerticesContainer_insert(*args)
+    def reserve(*args): return _Freestyle.ViewVerticesContainer_reserve(*args)
+    def capacity(*args): return _Freestyle.ViewVerticesContainer_capacity(*args)
+    __swig_destroy__ = _Freestyle.delete_ViewVerticesContainer
+    __del__ = lambda self : None;
+ViewVerticesContainer_swigregister = _Freestyle.ViewVerticesContainer_swigregister
+ViewVerticesContainer_swigregister(ViewVerticesContainer)
+
+class SVerticesContainer(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, SVerticesContainer, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, SVerticesContainer, name)
+    __repr__ = _swig_repr
+    def iterator(*args): return _Freestyle.SVerticesContainer_iterator(*args)
+    def __iter__(self): return self.iterator()
+    def __nonzero__(*args): return _Freestyle.SVerticesContainer___nonzero__(*args)
+    def __len__(*args): return _Freestyle.SVerticesContainer___len__(*args)
+    def pop(*args): return _Freestyle.SVerticesContainer_pop(*args)
+    def __getslice__(*args): return _Freestyle.SVerticesContainer___getslice__(*args)
+    def __setslice__(*args): return _Freestyle.SVerticesContainer___setslice__(*args)
+    def __delslice__(*args): return _Freestyle.SVerticesContainer___delslice__(*args)
+    def __delitem__(*args): return _Freestyle.SVerticesContainer___delitem__(*args)
+    def __getitem__(*args): return _Freestyle.SVerticesContainer___getitem__(*args)
+    def __setitem__(*args): return _Freestyle.SVerticesContainer___setitem__(*args)
+    def append(*args): return _Freestyle.SVerticesContainer_append(*args)
+    def empty(*args): return _Freestyle.SVerticesContainer_empty(*args)
+    def size(*args): return _Freestyle.SVerticesContainer_size(*args)
+    def clear(*args): return _Freestyle.SVerticesContainer_clear(*args)
+    def swap(*args): return _Freestyle.SVerticesContainer_swap(*args)
+    def get_allocator(*args): return _Freestyle.SVerticesContainer_get_allocator(*args)
+    def begin(*args): return _Freestyle.SVerticesContainer_begin(*args)
+    def end(*args): return _Freestyle.SVerticesContainer_end(*args)
+    def rbegin(*args): return _Freestyle.SVerticesContainer_rbegin(*args)
+    def rend(*args): return _Freestyle.SVerticesContainer_rend(*args)
+    def pop_back(*args): return _Freestyle.SVerticesContainer_pop_back(*args)
+    def erase(*args): return _Freestyle.SVerticesContainer_erase(*args)
+    def __init__(self, *args): 
+        this = _Freestyle.new_SVerticesContainer(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def push_back(*args): return _Freestyle.SVerticesContainer_push_back(*args)
+    def front(*args): return _Freestyle.SVerticesContainer_front(*args)
+    def back(*args): return _Freestyle.SVerticesContainer_back(*args)
+    def assign(*args): return _Freestyle.SVerticesContainer_assign(*args)
+    def resize(*args): return _Freestyle.SVerticesContainer_resize(*args)
+    def insert(*args): return _Freestyle.SVerticesContainer_insert(*args)
+    def reserve(*args): return _Freestyle.SVerticesContainer_reserve(*args)
+    def capacity(*args): return _Freestyle.SVerticesContainer_capacity(*args)
+    __swig_destroy__ = _Freestyle.delete_SVerticesContainer
+    __del__ = lambda self : None;
+SVerticesContainer_swigregister = _Freestyle.SVerticesContainer_swigregister
+SVerticesContainer_swigregister(SVerticesContainer)
+
+class ViewMap(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, ViewMap, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, ViewMap, name)
+    __repr__ = _swig_repr
+    __swig_setmethods__["userdata"] = _Freestyle.ViewMap_userdata_set
+    __swig_getmethods__["userdata"] = _Freestyle.ViewMap_userdata_get
+    if _newclass:userdata = _swig_property(_Freestyle.ViewMap_userdata_get, _Freestyle.ViewMap_userdata_set)
+    def __init__(self, *args): 
+        this = _Freestyle.new_ViewMap(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_ViewMap
+    __del__ = lambda self : None;
+    def GetClosestViewEdge(*args): return _Freestyle.ViewMap_GetClosestViewEdge(*args)
+    def GetClosestFEdge(*args): return _Freestyle.ViewMap_GetClosestFEdge(*args)
+    __swig_getmethods__["getInstance"] = lambda x: _Freestyle.ViewMap_getInstance
+    if _newclass:getInstance = staticmethod(_Freestyle.ViewMap_getInstance)
+    def ViewShapes(*args): return _Freestyle.ViewMap_ViewShapes(*args)
+    def ViewEdges(*args): return _Freestyle.ViewMap_ViewEdges(*args)
+    def ViewVertices(*args): return _Freestyle.ViewMap_ViewVertices(*args)
+    def FEdges(*args): return _Freestyle.ViewMap_FEdges(*args)
+    def SVertices(*args): return _Freestyle.ViewMap_SVertices(*args)
+    def viewedges_begin(*args): return _Freestyle.ViewMap_viewedges_begin(*args)
+    def viewedges_end(*args): return _Freestyle.ViewMap_viewedges_end(*args)
+    def viewedges_size(*args): return _Freestyle.ViewMap_viewedges_size(*args)
+    def viewShape(*args): return _Freestyle.ViewMap_viewShape(*args)
+    def shapeIdToIndexMap(*args): return _Freestyle.ViewMap_shapeIdToIndexMap(*args)
+    def getScene3dBBox(*args): return _Freestyle.ViewMap_getScene3dBBox(*args)
+    def AddViewShape(*args): return _Freestyle.ViewMap_AddViewShape(*args)
+    def AddViewEdge(*args): return _Freestyle.ViewMap_AddViewEdge(*args)
+    def AddViewVertex(*args): return _Freestyle.ViewMap_AddViewVertex(*args)
+    def AddFEdge(*args): return _Freestyle.ViewMap_AddFEdge(*args)
+    def AddSVertex(*args): return _Freestyle.ViewMap_AddSVertex(*args)
+    def setScene3dBBox(*args): return _Freestyle.ViewMap_setScene3dBBox(*args)
+    def CreateTVertex(*args): return _Freestyle.ViewMap_CreateTVertex(*args)
+    def InsertViewVertex(*args): return _Freestyle.ViewMap_InsertViewVertex(*args)
+ViewMap_swigregister = _Freestyle.ViewMap_swigregister
+ViewMap_swigregister(ViewMap)
+ViewMap_getInstance = _Freestyle.ViewMap_getInstance
+
+class ViewVertex(Interface0D):
+    __swig_setmethods__ = {}
+    for _s in [Interface0D]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, ViewVertex, name, value)
+    __swig_getmethods__ = {}
+    for _s in [Interface0D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, ViewVertex, name)
+    def __init__(self): raise AttributeError, "No constructor defined"
+    __repr__ = _swig_repr
+    def getExactTypeName(*args): return _Freestyle.ViewVertex_getExactTypeName(*args)
+    __swig_setmethods__["userdata"] = _Freestyle.ViewVertex_userdata_set
+    __swig_getmethods__["userdata"] = _Freestyle.ViewVertex_userdata_get
+    if _newclass:userdata = _swig_property(_Freestyle.ViewVertex_userdata_get, _Freestyle.ViewVertex_userdata_set)
+    __swig_destroy__ = _Freestyle.delete_ViewVertex
+    __del__ = lambda self : None;
+    def getNature(*args): return _Freestyle.ViewVertex_getNature(*args)
+    def setNature(*args): return _Freestyle.ViewVertex_setNature(*args)
+    def Replace(*args): return _Freestyle.ViewVertex_Replace(*args)
+    def edges_begin(*args): return _Freestyle.ViewVertex_edges_begin(*args)
+    def edges_end(*args): return _Freestyle.ViewVertex_edges_end(*args)
+    def edges_iterator(*args): return _Freestyle.ViewVertex_edges_iterator(*args)
+    def edgesBegin(*args): return _Freestyle.ViewVertex_edgesBegin(*args)
+    def edgesEnd(*args): return _Freestyle.ViewVertex_edgesEnd(*args)
+    def edgesIterator(*args): return _Freestyle.ViewVertex_edgesIterator(*args)
+ViewVertex_swigregister = _Freestyle.ViewVertex_swigregister
+ViewVertex_swigregister(ViewVertex)
+
+class TVertex(ViewVertex):
+    __swig_setmethods__ = {}
+    for _s in [ViewVertex]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, TVertex, name, value)
+    __swig_getmethods__ = {}
+    for _s in [ViewVertex]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, TVertex, name)
+    __repr__ = _swig_repr
+    def getExactTypeName(*args): return _Freestyle.TVertex_getExactTypeName(*args)
+    def getX(*args): return _Freestyle.TVertex_getX(*args)
+    def getY(*args): return _Freestyle.TVertex_getY(*args)
+    def getZ(*args): return _Freestyle.TVertex_getZ(*args)
+    def getPoint3D(*args): return _Freestyle.TVertex_getPoint3D(*args)
+    def getProjectedX(*args): return _Freestyle.TVertex_getProjectedX(*args)
+    def getProjectedY(*args): return _Freestyle.TVertex_getProjectedY(*args)
+    def getProjectedZ(*args): return _Freestyle.TVertex_getProjectedZ(*args)
+    def getPoint2D(*args): return _Freestyle.TVertex_getPoint2D(*args)
+    def getId(*args): return _Freestyle.TVertex_getId(*args)
+    def castToViewVertex(*args): return _Freestyle.TVertex_castToViewVertex(*args)
+    def castToTVertex(*args): return _Freestyle.TVertex_castToTVertex(*args)
+    def __init__(self, *args): 
+        this = _Freestyle.new_TVertex(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def frontSVertex(*args): return _Freestyle.TVertex_frontSVertex(*args)
+    def backSVertex(*args): return _Freestyle.TVertex_backSVertex(*args)
+    def frontEdgeA(*args): return _Freestyle.TVertex_frontEdgeA(*args)
+    def frontEdgeB(*args): return _Freestyle.TVertex_frontEdgeB(*args)
+    def backEdgeA(*args): return _Freestyle.TVertex_backEdgeA(*args)
+    def backEdgeB(*args): return _Freestyle.TVertex_backEdgeB(*args)
+    def SetFrontVertex(*args): return _Freestyle.TVertex_SetFrontVertex(*args)
+    def SetBackSVertex(*args): return _Freestyle.TVertex_SetBackSVertex(*args)
+    def SetFrontEdgeA(*args): return _Freestyle.TVertex_SetFrontEdgeA(*args)
+    def SetFrontEdgeB(*args): return _Freestyle.TVertex_SetFrontEdgeB(*args)
+    def SetBackEdgeA(*args): return _Freestyle.TVertex_SetBackEdgeA(*args)
+    def SetBackEdgeB(*args): return _Freestyle.TVertex_SetBackEdgeB(*args)
+    def SetId(*args): return _Freestyle.TVertex_SetId(*args)
+    def GetSVertex(*args): return _Freestyle.TVertex_GetSVertex(*args)
+    def Replace(*args): return _Freestyle.TVertex_Replace(*args)
+    def mate(*args): return _Freestyle.TVertex_mate(*args)
+    def edges_end(*args): return _Freestyle.TVertex_edges_end(*args)
+    def edgesBegin(*args): return _Freestyle.TVertex_edgesBegin(*args)
+    def edgesEnd(*args): return _Freestyle.TVertex_edgesEnd(*args)
+    def edgesIterator(*args): return _Freestyle.TVertex_edgesIterator(*args)
+    __swig_destroy__ = _Freestyle.delete_TVertex
+    __del__ = lambda self : None;
+TVertex_swigregister = _Freestyle.TVertex_swigregister
+TVertex_swigregister(TVertex)
+
+class NonTVertex(ViewVertex):
+    __swig_setmethods__ = {}
+    for _s in [ViewVertex]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, NonTVertex, name, value)
+    __swig_getmethods__ = {}
+    for _s in [ViewVertex]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, NonTVertex, name)
+    __repr__ = _swig_repr
+    def getExactTypeName(*args): return _Freestyle.NonTVertex_getExactTypeName(*args)
+    def getX(*args): return _Freestyle.NonTVertex_getX(*args)
+    def getY(*args): return _Freestyle.NonTVertex_getY(*args)
+    def getZ(*args): return _Freestyle.NonTVertex_getZ(*args)
+    def getPoint3D(*args): return _Freestyle.NonTVertex_getPoint3D(*args)
+    def getProjectedX(*args): return _Freestyle.NonTVertex_getProjectedX(*args)
+    def getProjectedY(*args): return _Freestyle.NonTVertex_getProjectedY(*args)
+    def getProjectedZ(*args): return _Freestyle.NonTVertex_getProjectedZ(*args)
+    def getPoint2D(*args): return _Freestyle.NonTVertex_getPoint2D(*args)
+    def getId(*args): return _Freestyle.NonTVertex_getId(*args)
+    def castToSVertex(*args): return _Freestyle.NonTVertex_castToSVertex(*args)
+    def castToViewVertex(*args): return _Freestyle.NonTVertex_castToViewVertex(*args)
+    def castToNonTVertex(*args): return _Freestyle.NonTVertex_castToNonTVertex(*args)
+    def __init__(self, *args): 
+        this = _Freestyle.new_NonTVertex(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_NonTVertex
+    __del__ = lambda self : None;
+    def svertex(*args): return _Freestyle.NonTVertex_svertex(*args)
+    def viewedges(*args): return _Freestyle.NonTVertex_viewedges(*args)
+    def SetSVertex(*args): return _Freestyle.NonTVertex_SetSVertex(*args)
+    def SetViewEdges(*args): return _Freestyle.NonTVertex_SetViewEdges(*args)
+    def AddIncomingViewEdge(*args): return _Freestyle.NonTVertex_AddIncomingViewEdge(*args)
+    def AddOutgoingViewEdge(*args): return _Freestyle.NonTVertex_AddOutgoingViewEdge(*args)
+    def AddViewEdge(*args): return _Freestyle.NonTVertex_AddViewEdge(*args)
+    def Replace(*args): return _Freestyle.NonTVertex_Replace(*args)
+    def edges_end(*args): return _Freestyle.NonTVertex_edges_end(*args)
+    def edgesBegin(*args): return _Freestyle.NonTVertex_edgesBegin(*args)
+    def edgesEnd(*args): return _Freestyle.NonTVertex_edgesEnd(*args)
+    def edgesIterator(*args): return _Freestyle.NonTVertex_edgesIterator(*args)
+NonTVertex_swigregister = _Freestyle.NonTVertex_swigregister
+NonTVertex_swigregister(NonTVertex)
+
+class ViewEdge(Interface1D):
+    __swig_setmethods__ = {}
+    for _s in [Interface1D]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, ViewEdge, name, value)
+    __swig_getmethods__ = {}
+    for _s in [Interface1D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, ViewEdge, name)
+    __repr__ = _swig_repr
+    def getExactTypeName(*args): return _Freestyle.ViewEdge_getExactTypeName(*args)
+    def getId(*args): return _Freestyle.ViewEdge_getId(*args)
+    def getNature(*args): return _Freestyle.ViewEdge_getNature(*args)
+    __swig_setmethods__["userdata"] = _Freestyle.ViewEdge_userdata_set
+    __swig_getmethods__["userdata"] = _Freestyle.ViewEdge_userdata_get
+    if _newclass:userdata = _swig_property(_Freestyle.ViewEdge_userdata_get, _Freestyle.ViewEdge_userdata_set)
+    def __init__(self, *args): 
+        this = _Freestyle.new_ViewEdge(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_ViewEdge
+    __del__ = lambda self : None;
+    def A(*args): return _Freestyle.ViewEdge_A(*args)
+    def B(*args): return _Freestyle.ViewEdge_B(*args)
+    def fedgeA(*args): return _Freestyle.ViewEdge_fedgeA(*args)
+    def fedgeB(*args): return _Freestyle.ViewEdge_fedgeB(*args)
+    def viewShape(*args): return _Freestyle.ViewEdge_viewShape(*args)
+    def isClosed(*args): return _Freestyle.ViewEdge_isClosed(*args)
+    def getChainingTimeStamp(*args): return _Freestyle.ViewEdge_getChainingTimeStamp(*args)
+    def aShape(*args): return _Freestyle.ViewEdge_aShape(*args)
+    def bShape(*args): return _Freestyle.ViewEdge_bShape(*args)
+    def occluders(*args): return _Freestyle.ViewEdge_occluders(*args)
+    def splittingId(*args): return _Freestyle.ViewEdge_splittingId(*args)
+    def SetA(*args): return _Freestyle.ViewEdge_SetA(*args)
+    def SetB(*args): return _Freestyle.ViewEdge_SetB(*args)
+    def SetNature(*args): return _Freestyle.ViewEdge_SetNature(*args)
+    def SetFEdgeA(*args): return _Freestyle.ViewEdge_SetFEdgeA(*args)
+    def SetFEdgeB(*args): return _Freestyle.ViewEdge_SetFEdgeB(*args)
+    def SetShape(*args): return _Freestyle.ViewEdge_SetShape(*args)
+    def SetId(*args): return _Freestyle.ViewEdge_SetId(*args)
+    def UpdateFEdges(*args): return _Freestyle.ViewEdge_UpdateFEdges(*args)
+    def SetaShape(*args): return _Freestyle.ViewEdge_SetaShape(*args)
+    def SetQI(*args): return _Freestyle.ViewEdge_SetQI(*args)
+    def setChainingTimeStamp(*args): return _Freestyle.ViewEdge_setChainingTimeStamp(*args)
+    def AddOccluder(*args): return _Freestyle.ViewEdge_AddOccluder(*args)
+    def setSplittingId(*args): return _Freestyle.ViewEdge_setSplittingId(*args)
+    def intersect_2d_area(*args): return _Freestyle.ViewEdge_intersect_2d_area(*args)
+    def include_in_2d_area(*args): return _Freestyle.ViewEdge_include_in_2d_area(*args)
+    def getLength2D(*args): return _Freestyle.ViewEdge_getLength2D(*args)
+    def qi(*args): return _Freestyle.ViewEdge_qi(*args)
+    def occluders_begin(*args): return _Freestyle.ViewEdge_occluders_begin(*args)
+    def occluders_end(*args): return _Freestyle.ViewEdge_occluders_end(*args)
+    def occluders_size(*args): return _Freestyle.ViewEdge_occluders_size(*args)
+    def occluders_empty(*args): return _Freestyle.ViewEdge_occluders_empty(*args)
+    def occludee(*args): return _Freestyle.ViewEdge_occludee(*args)
+    def occluded_shape(*args): return _Freestyle.ViewEdge_occluded_shape(*args)
+    def occludee_empty(*args): return _Freestyle.ViewEdge_occludee_empty(*args)
+    def shape_id(*args): return _Freestyle.ViewEdge_shape_id(*args)
+    def shape(*args): return _Freestyle.ViewEdge_shape(*args)
+    def shape_importance(*args): return _Freestyle.ViewEdge_shape_importance(*args)
+    def verticesBegin(*args): return _Freestyle.ViewEdge_verticesBegin(*args)
+    def verticesEnd(*args): return _Freestyle.ViewEdge_verticesEnd(*args)
+    def pointsBegin(*args): return _Freestyle.ViewEdge_pointsBegin(*args)
+    def pointsEnd(*args): return _Freestyle.ViewEdge_pointsEnd(*args)
+ViewEdge_swigregister = _Freestyle.ViewEdge_swigregister
+ViewEdge_swigregister(ViewEdge)
+
+class ViewShape(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, ViewShape, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, ViewShape, name)
+    __repr__ = _swig_repr
+    __swig_setmethods__["userdata"] = _Freestyle.ViewShape_userdata_set
+    __swig_getmethods__["userdata"] = _Freestyle.ViewShape_userdata_get
+    if _newclass:userdata = _swig_property(_Freestyle.ViewShape_userdata_get, _Freestyle.ViewShape_userdata_set)
+    def __init__(self, *args): 
+        this = _Freestyle.new_ViewShape(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def dupplicate(*args): return _Freestyle.ViewShape_dupplicate(*args)
+    __swig_destroy__ = _Freestyle.delete_ViewShape
+    __del__ = lambda self : None;
+    def SplitEdge(*args): return _Freestyle.ViewShape_SplitEdge(*args)
+    def sshape(*args): return _Freestyle.ViewShape_sshape(*args)
+    def vertices(*args): return _Freestyle.ViewShape_vertices(*args)
+    def edges(*args): return _Freestyle.ViewShape_edges(*args)
+    def getId(*args): return _Freestyle.ViewShape_getId(*args)
+    def SetSShape(*args): return _Freestyle.ViewShape_SetSShape(*args)
+    def SetVertices(*args): return _Freestyle.ViewShape_SetVertices(*args)
+    def SetEdges(*args): return _Freestyle.ViewShape_SetEdges(*args)
+    def AddVertex(*args): return _Freestyle.ViewShape_AddVertex(*args)
+    def AddEdge(*args): return _Freestyle.ViewShape_AddEdge(*args)
+    def RemoveEdge(*args): return _Freestyle.ViewShape_RemoveEdge(*args)
+    def RemoveVertex(*args): return _Freestyle.ViewShape_RemoveVertex(*args)
+ViewShape_swigregister = _Freestyle.ViewShape_swigregister
+ViewShape_swigregister(ViewShape)
+
+class ViewVertexOrientedViewEdgeIterator(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, ViewVertexOrientedViewEdgeIterator, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, ViewVertexOrientedViewEdgeIterator, name)
+    __repr__ = _swig_repr
+    __swig_destroy__ = _Freestyle.delete_ViewVertexOrientedViewEdgeIterator
+    __del__ = lambda self : None;
+    def __init__(self, *args): 
+        this = _Freestyle.new_ViewVertexOrientedViewEdgeIterator(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def isBegin(*args): return _Freestyle.ViewVertexOrientedViewEdgeIterator_isBegin(*args)
+    def isEnd(*args): return _Freestyle.ViewVertexOrientedViewEdgeIterator_isEnd(*args)
+    def __ne__(*args): return _Freestyle.ViewVertexOrientedViewEdgeIterator___ne__(*args)
+    def __eq__(*args): return _Freestyle.ViewVertexOrientedViewEdgeIterator___eq__(*args)
+    def getObject(*args): return _Freestyle.ViewVertexOrientedViewEdgeIterator_getObject(*args)
+    def __deref__(*args): return _Freestyle.ViewVertexOrientedViewEdgeIterator___deref__(*args)
+    def increment(*args): return _Freestyle.ViewVertexOrientedViewEdgeIterator_increment(*args)
+ViewVertexOrientedViewEdgeIterator_swigregister = _Freestyle.ViewVertexOrientedViewEdgeIterator_swigregister
+ViewVertexOrientedViewEdgeIterator_swigregister(ViewVertexOrientedViewEdgeIterator)
+
+class ViewEdgeSVertexIterator(Interface0DIteratorNested):
+    __swig_setmethods__ = {}
+    for _s in [Interface0DIteratorNested]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, ViewEdgeSVertexIterator, name, value)
+    __swig_getmethods__ = {}
+    for _s in [Interface0DIteratorNested]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, ViewEdgeSVertexIterator, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_ViewEdgeSVertexIterator(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_ViewEdgeSVertexIterator
+    __del__ = lambda self : None;
+    def getExactTypeName(*args): return _Freestyle.ViewEdgeSVertexIterator_getExactTypeName(*args)
+    def getObject(*args): return _Freestyle.ViewEdgeSVertexIterator_getObject(*args)
+    def __deref__(*args): return _Freestyle.ViewEdgeSVertexIterator___deref__(*args)
+    def increment(*args): return _Freestyle.ViewEdgeSVertexIterator_increment(*args)
+    def decrement(*args): return _Freestyle.ViewEdgeSVertexIterator_decrement(*args)
+    def isBegin(*args): return _Freestyle.ViewEdgeSVertexIterator_isBegin(*args)
+    def isEnd(*args): return _Freestyle.ViewEdgeSVertexIterator_isEnd(*args)
+    def t(*args): return _Freestyle.ViewEdgeSVertexIterator_t(*args)
+    def u(*args): return _Freestyle.ViewEdgeSVertexIterator_u(*args)
+    def __eq__(*args): return _Freestyle.ViewEdgeSVertexIterator___eq__(*args)
+    def copy(*args): return _Freestyle.ViewEdgeSVertexIterator_copy(*args)
+    def getX(*args): return _Freestyle.ViewEdgeSVertexIterator_getX(*args)
+    def getY(*args): return _Freestyle.ViewEdgeSVertexIterator_getY(*args)
+    def getZ(*args): return _Freestyle.ViewEdgeSVertexIterator_getZ(*args)
+    def getPoint3D(*args): return _Freestyle.ViewEdgeSVertexIterator_getPoint3D(*args)
+    def getProjectedX(*args): return _Freestyle.ViewEdgeSVertexIterator_getProjectedX(*args)
+    def getProjectedY(*args): return _Freestyle.ViewEdgeSVertexIterator_getProjectedY(*args)
+    def getProjectedZ(*args): return _Freestyle.ViewEdgeSVertexIterator_getProjectedZ(*args)
+    def getPoint2D(*args): return _Freestyle.ViewEdgeSVertexIterator_getPoint2D(*args)
+    def getFEdge(*args): return _Freestyle.ViewEdgeSVertexIterator_getFEdge(*args)
+    def getId(*args): return _Freestyle.ViewEdgeSVertexIterator_getId(*args)
+    def getNature(*args): return _Freestyle.ViewEdgeSVertexIterator_getNature(*args)
+    def castToSVertex(*args): return _Freestyle.ViewEdgeSVertexIterator_castToSVertex(*args)
+    def castToViewVertex(*args): return _Freestyle.ViewEdgeSVertexIterator_castToViewVertex(*args)
+    def castToNonTVertex(*args): return _Freestyle.ViewEdgeSVertexIterator_castToNonTVertex(*args)
+    def castToTVertex(*args): return _Freestyle.ViewEdgeSVertexIterator_castToTVertex(*args)
+    __swig_setmethods__["userdata"] = _Freestyle.ViewEdgeSVertexIterator_userdata_set
+    __swig_getmethods__["userdata"] = _Freestyle.ViewEdgeSVertexIterator_userdata_get
+    if _newclass:userdata = _swig_property(_Freestyle.ViewEdgeSVertexIterator_userdata_get, _Freestyle.ViewEdgeSVertexIterator_userdata_set)
+    def dupplicate(*args): return _Freestyle.ViewEdgeSVertexIterator_dupplicate(*args)
+    def point3D(*args): return _Freestyle.ViewEdgeSVertexIterator_point3D(*args)
+    def point2D(*args): return _Freestyle.ViewEdgeSVertexIterator_point2D(*args)
+    def normals(*args): return _Freestyle.ViewEdgeSVertexIterator_normals(*args)
+    def normalsSize(*args): return _Freestyle.ViewEdgeSVertexIterator_normalsSize(*args)
+    def fedges(*args): return _Freestyle.ViewEdgeSVertexIterator_fedges(*args)
+    def fedges_begin(*args): return _Freestyle.ViewEdgeSVertexIterator_fedges_begin(*args)
+    def fedges_end(*args): return _Freestyle.ViewEdgeSVertexIterator_fedges_end(*args)
+    def shape(*args): return _Freestyle.ViewEdgeSVertexIterator_shape(*args)
+    def z(*args): return _Freestyle.ViewEdgeSVertexIterator_z(*args)
+    def viewvertex(*args): return _Freestyle.ViewEdgeSVertexIterator_viewvertex(*args)
+    def SetPoint3D(*args): return _Freestyle.ViewEdgeSVertexIterator_SetPoint3D(*args)
+    def SetPoint2D(*args): return _Freestyle.ViewEdgeSVertexIterator_SetPoint2D(*args)
+    def AddNormal(*args): return _Freestyle.ViewEdgeSVertexIterator_AddNormal(*args)
+    def setCurvatureInfo(*args): return _Freestyle.ViewEdgeSVertexIterator_setCurvatureInfo(*args)
+    def getCurvatureInfo(*args): return _Freestyle.ViewEdgeSVertexIterator_getCurvatureInfo(*args)
+    def setCurvatureFredo(*args): return _Freestyle.ViewEdgeSVertexIterator_setCurvatureFredo(*args)
+    def setDirectionFredo(*args): return _Freestyle.ViewEdgeSVertexIterator_setDirectionFredo(*args)
+    def curvatureFredo(*args): return _Freestyle.ViewEdgeSVertexIterator_curvatureFredo(*args)
+    def directionFredo(*args): return _Freestyle.ViewEdgeSVertexIterator_directionFredo(*args)
+    def SetId(*args): return _Freestyle.ViewEdgeSVertexIterator_SetId(*args)
+    def SetFEdges(*args): return _Freestyle.ViewEdgeSVertexIterator_SetFEdges(*args)
+    def SetShape(*args): return _Freestyle.ViewEdgeSVertexIterator_SetShape(*args)
+    def SetViewVertex(*args): return _Freestyle.ViewEdgeSVertexIterator_SetViewVertex(*args)
+    def AddFEdge(*args): return _Freestyle.ViewEdgeSVertexIterator_AddFEdge(*args)
+    def Replace(*args): return _Freestyle.ViewEdgeSVertexIterator_Replace(*args)
+    def fedge(*args): return _Freestyle.ViewEdgeSVertexIterator_fedge(*args)
+    def point2d(*args): return _Freestyle.ViewEdgeSVertexIterator_point2d(*args)
+    def point3d(*args): return _Freestyle.ViewEdgeSVertexIterator_point3d(*args)
+    def normal(*args): return _Freestyle.ViewEdgeSVertexIterator_normal(*args)
+    def shape_id(*args): return _Freestyle.ViewEdgeSVertexIterator_shape_id(*args)
+    def shape_importance(*args): return _Freestyle.ViewEdgeSVertexIterator_shape_importance(*args)
+    def qi(*args): return _Freestyle.ViewEdgeSVertexIterator_qi(*args)
+    def occluders_begin(*args): return _Freestyle.ViewEdgeSVertexIterator_occluders_begin(*args)
+    def occluders_end(*args): return _Freestyle.ViewEdgeSVertexIterator_occluders_end(*args)
+    def occluders_empty(*args): return _Freestyle.ViewEdgeSVertexIterator_occluders_empty(*args)
+    def occluders_size(*args): return _Freestyle.ViewEdgeSVertexIterator_occluders_size(*args)
+    def occludee(*args): return _Freestyle.ViewEdgeSVertexIterator_occludee(*args)
+    def occluded_shape(*args): return _Freestyle.ViewEdgeSVertexIterator_occluded_shape(*args)
+    def occludee_empty(*args): return _Freestyle.ViewEdgeSVertexIterator_occludee_empty(*args)
+    def z_discontinuity(*args): return _Freestyle.ViewEdgeSVertexIterator_z_discontinuity(*args)
+ViewEdgeSVertexIterator_swigregister = _Freestyle.ViewEdgeSVertexIterator_swigregister
+ViewEdgeSVertexIterator_swigregister(ViewEdgeSVertexIterator)
+
+class ViewEdgeViewEdgeIterator(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, ViewEdgeViewEdgeIterator, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, ViewEdgeViewEdgeIterator, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        if self.__class__ == ViewEdgeViewEdgeIterator:
+            args = (None,) + args
+        else:
+            args = (self,) + args
+        this = _Freestyle.new_ViewEdgeViewEdgeIterator(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_ViewEdgeViewEdgeIterator
+    __del__ = lambda self : None;
+    def getExactTypeName(*args): return _Freestyle.ViewEdgeViewEdgeIterator_getExactTypeName(*args)
+    def getCurrentEdge(*args): return _Freestyle.ViewEdgeViewEdgeIterator_getCurrentEdge(*args)
+    def setCurrentEdge(*args): return _Freestyle.ViewEdgeViewEdgeIterator_setCurrentEdge(*args)
+    def getBegin(*args): return _Freestyle.ViewEdgeViewEdgeIterator_getBegin(*args)
+    def setBegin(*args): return _Freestyle.ViewEdgeViewEdgeIterator_setBegin(*args)
+    def getOrientation(*args): return _Freestyle.ViewEdgeViewEdgeIterator_getOrientation(*args)
+    def setOrientation(*args): return _Freestyle.ViewEdgeViewEdgeIterator_setOrientation(*args)
+    def changeOrientation(*args): return _Freestyle.ViewEdgeViewEdgeIterator_changeOrientation(*args)
+    def getObject(*args): return _Freestyle.ViewEdgeViewEdgeIterator_getObject(*args)
+    def __deref__(*args): return _Freestyle.ViewEdgeViewEdgeIterator___deref__(*args)
+    def increment(*args): return _Freestyle.ViewEdgeViewEdgeIterator_increment(*args)
+    def decrement(*args): return _Freestyle.ViewEdgeViewEdgeIterator_decrement(*args)
+    def isBegin(*args): return _Freestyle.ViewEdgeViewEdgeIterator_isBegin(*args)
+    def isEnd(*args): return _Freestyle.ViewEdgeViewEdgeIterator_isEnd(*args)
+    def __eq__(*args): return _Freestyle.ViewEdgeViewEdgeIterator___eq__(*args)
+    def __ne__(*args): return _Freestyle.ViewEdgeViewEdgeIterator___ne__(*args)
+    def getId(*args): return _Freestyle.ViewEdgeViewEdgeIterator_getId(*args)
+    def getNature(*args): return _Freestyle.ViewEdgeViewEdgeIterator_getNature(*args)
+    __swig_setmethods__["userdata"] = _Freestyle.ViewEdgeViewEdgeIterator_userdata_set
+    __swig_getmethods__["userdata"] = _Freestyle.ViewEdgeViewEdgeIterator_userdata_get
+    if _newclass:userdata = _swig_property(_Freestyle.ViewEdgeViewEdgeIterator_userdata_get, _Freestyle.ViewEdgeViewEdgeIterator_userdata_set)
+    def A(*args): return _Freestyle.ViewEdgeViewEdgeIterator_A(*args)
+    def B(*args): return _Freestyle.ViewEdgeViewEdgeIterator_B(*args)
+    def fedgeA(*args): return _Freestyle.ViewEdgeViewEdgeIterator_fedgeA(*args)
+    def fedgeB(*args): return _Freestyle.ViewEdgeViewEdgeIterator_fedgeB(*args)
+    def viewShape(*args): return _Freestyle.ViewEdgeViewEdgeIterator_viewShape(*args)
+    def aShape(*args): return _Freestyle.ViewEdgeViewEdgeIterator_aShape(*args)
+    def isClosed(*args): return _Freestyle.ViewEdgeViewEdgeIterator_isClosed(*args)
+    def getChainingTimeStamp(*args): return _Freestyle.ViewEdgeViewEdgeIterator_getChainingTimeStamp(*args)
+    def bShape(*args): return _Freestyle.ViewEdgeViewEdgeIterator_bShape(*args)
+    def occluders(*args): return _Freestyle.ViewEdgeViewEdgeIterator_occluders(*args)
+    def splittingId(*args): return _Freestyle.ViewEdgeViewEdgeIterator_splittingId(*args)
+    def SetA(*args): return _Freestyle.ViewEdgeViewEdgeIterator_SetA(*args)
+    def SetB(*args): return _Freestyle.ViewEdgeViewEdgeIterator_SetB(*args)
+    def SetNature(*args): return _Freestyle.ViewEdgeViewEdgeIterator_SetNature(*args)
+    def SetFEdgeA(*args): return _Freestyle.ViewEdgeViewEdgeIterator_SetFEdgeA(*args)
+    def SetFEdgeB(*args): return _Freestyle.ViewEdgeViewEdgeIterator_SetFEdgeB(*args)
+    def SetShape(*args): return _Freestyle.ViewEdgeViewEdgeIterator_SetShape(*args)
+    def SetId(*args): return _Freestyle.ViewEdgeViewEdgeIterator_SetId(*args)
+    def UpdateFEdges(*args): return _Freestyle.ViewEdgeViewEdgeIterator_UpdateFEdges(*args)
+    def SetaShape(*args): return _Freestyle.ViewEdgeViewEdgeIterator_SetaShape(*args)
+    def SetQI(*args): return _Freestyle.ViewEdgeViewEdgeIterator_SetQI(*args)
+    def setChainingTimeStamp(*args): return _Freestyle.ViewEdgeViewEdgeIterator_setChainingTimeStamp(*args)
+    def AddOccluder(*args): return _Freestyle.ViewEdgeViewEdgeIterator_AddOccluder(*args)
+    def setSplittingId(*args): return _Freestyle.ViewEdgeViewEdgeIterator_setSplittingId(*args)
+    def intersect_2d_area(*args): return _Freestyle.ViewEdgeViewEdgeIterator_intersect_2d_area(*args)
+    def include_in_2d_area(*args): return _Freestyle.ViewEdgeViewEdgeIterator_include_in_2d_area(*args)
+    def getLength2D(*args): return _Freestyle.ViewEdgeViewEdgeIterator_getLength2D(*args)
+    def qi(*args): return _Freestyle.ViewEdgeViewEdgeIterator_qi(*args)
+    def occluders_begin(*args): return _Freestyle.ViewEdgeViewEdgeIterator_occluders_begin(*args)
+    def occluders_end(*args): return _Freestyle.ViewEdgeViewEdgeIterator_occluders_end(*args)
+    def occluders_size(*args): return _Freestyle.ViewEdgeViewEdgeIterator_occluders_size(*args)
+    def occluders_empty(*args): return _Freestyle.ViewEdgeViewEdgeIterator_occluders_empty(*args)
+    def occludee(*args): return _Freestyle.ViewEdgeViewEdgeIterator_occludee(*args)
+    def occluded_shape(*args): return _Freestyle.ViewEdgeViewEdgeIterator_occluded_shape(*args)
+    def occludee_empty(*args): return _Freestyle.ViewEdgeViewEdgeIterator_occludee_empty(*args)
+    def shape_id(*args): return _Freestyle.ViewEdgeViewEdgeIterator_shape_id(*args)
+    def shape(*args): return _Freestyle.ViewEdgeViewEdgeIterator_shape(*args)
+    def shape_importance(*args): return _Freestyle.ViewEdgeViewEdgeIterator_shape_importance(*args)
+    def verticesBegin(*args): return _Freestyle.ViewEdgeViewEdgeIterator_verticesBegin(*args)
+    def verticesEnd(*args): return _Freestyle.ViewEdgeViewEdgeIterator_verticesEnd(*args)
+    def pointsBegin(*args): return _Freestyle.ViewEdgeViewEdgeIterator_pointsBegin(*args)
+    def pointsEnd(*args): return _Freestyle.ViewEdgeViewEdgeIterator_pointsEnd(*args)
+    def getTimeStamp(*args): return _Freestyle.ViewEdgeViewEdgeIterator_getTimeStamp(*args)
+    def setTimeStamp(*args): return _Freestyle.ViewEdgeViewEdgeIterator_setTimeStamp(*args)
+    def __disown__(self):
+        self.this.disown()
+        _Freestyle.disown_ViewEdgeViewEdgeIterator(self)
+        return weakref_proxy(self)
+ViewEdgeViewEdgeIterator_swigregister = _Freestyle.ViewEdgeViewEdgeIterator_swigregister
+ViewEdgeViewEdgeIterator_swigregister(ViewEdgeViewEdgeIterator)
+
+class UnaryFunction0DVoid(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, UnaryFunction0DVoid, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, UnaryFunction0DVoid, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        if self.__class__ == UnaryFunction0DVoid:
+            args = (None,) + args
+        else:
+            args = (self,) + args
+        this = _Freestyle.new_UnaryFunction0DVoid(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_UnaryFunction0DVoid
+    __del__ = lambda self : None;
+    def getName(*args): return _Freestyle.UnaryFunction0DVoid_getName(*args)
+    def __call__(*args): return _Freestyle.UnaryFunction0DVoid___call__(*args)
+    def __disown__(self):
+        self.this.disown()
+        _Freestyle.disown_UnaryFunction0DVoid(self)
+        return weakref_proxy(self)
+UnaryFunction0DVoid_swigregister = _Freestyle.UnaryFunction0DVoid_swigregister
+UnaryFunction0DVoid_swigregister(UnaryFunction0DVoid)
+
+class UnaryFunction0DUnsigned(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, UnaryFunction0DUnsigned, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, UnaryFunction0DUnsigned, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        if self.__class__ == UnaryFunction0DUnsigned:
+            args = (None,) + args
+        else:
+            args = (self,) + args
+        this = _Freestyle.new_UnaryFunction0DUnsigned(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_UnaryFunction0DUnsigned
+    __del__ = lambda self : None;
+    def getName(*args): return _Freestyle.UnaryFunction0DUnsigned_getName(*args)
+    def __call__(*args): return _Freestyle.UnaryFunction0DUnsigned___call__(*args)
+    def __disown__(self):
+        self.this.disown()
+        _Freestyle.disown_UnaryFunction0DUnsigned(self)
+        return weakref_proxy(self)
+UnaryFunction0DUnsigned_swigregister = _Freestyle.UnaryFunction0DUnsigned_swigregister
+UnaryFunction0DUnsigned_swigregister(UnaryFunction0DUnsigned)
+
+class UnaryFunction0DFloat(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, UnaryFunction0DFloat, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, UnaryFunction0DFloat, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        if self.__class__ == UnaryFunction0DFloat:
+            args = (None,) + args
+        else:
+            args = (self,) + args
+        this = _Freestyle.new_UnaryFunction0DFloat(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_UnaryFunction0DFloat
+    __del__ = lambda self : None;
+    def getName(*args): return _Freestyle.UnaryFunction0DFloat_getName(*args)
+    def __call__(*args): return _Freestyle.UnaryFunction0DFloat___call__(*args)
+    def __disown__(self):
+        self.this.disown()
+        _Freestyle.disown_UnaryFunction0DFloat(self)
+        return weakref_proxy(self)
+UnaryFunction0DFloat_swigregister = _Freestyle.UnaryFunction0DFloat_swigregister
+UnaryFunction0DFloat_swigregister(UnaryFunction0DFloat)
+
+class UnaryFunction0DDouble(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, UnaryFunction0DDouble, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, UnaryFunction0DDouble, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        if self.__class__ == UnaryFunction0DDouble:
+            args = (None,) + args
+        else:
+            args = (self,) + args
+        this = _Freestyle.new_UnaryFunction0DDouble(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_UnaryFunction0DDouble
+    __del__ = lambda self : None;
+    def getName(*args): return _Freestyle.UnaryFunction0DDouble_getName(*args)
+    def __call__(*args): return _Freestyle.UnaryFunction0DDouble___call__(*args)
+    def __disown__(self):
+        self.this.disown()
+        _Freestyle.disown_UnaryFunction0DDouble(self)
+        return weakref_proxy(self)
+UnaryFunction0DDouble_swigregister = _Freestyle.UnaryFunction0DDouble_swigregister
+UnaryFunction0DDouble_swigregister(UnaryFunction0DDouble)
+
+class UnaryFunction0DVec2f(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, UnaryFunction0DVec2f, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, UnaryFunction0DVec2f, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        if self.__class__ == UnaryFunction0DVec2f:
+            args = (None,) + args
+        else:
+            args = (self,) + args
+        this = _Freestyle.new_UnaryFunction0DVec2f(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_UnaryFunction0DVec2f
+    __del__ = lambda self : None;
+    def getName(*args): return _Freestyle.UnaryFunction0DVec2f_getName(*args)
+    def __call__(*args): return _Freestyle.UnaryFunction0DVec2f___call__(*args)
+    def __disown__(self):
+        self.this.disown()
+        _Freestyle.disown_UnaryFunction0DVec2f(self)
+        return weakref_proxy(self)
+UnaryFunction0DVec2f_swigregister = _Freestyle.UnaryFunction0DVec2f_swigregister
+UnaryFunction0DVec2f_swigregister(UnaryFunction0DVec2f)
+
+class UnaryFunction0DVec3f(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, UnaryFunction0DVec3f, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, UnaryFunction0DVec3f, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        if self.__class__ == UnaryFunction0DVec3f:
+            args = (None,) + args
+        else:
+            args = (self,) + args
+        this = _Freestyle.new_UnaryFunction0DVec3f(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_UnaryFunction0DVec3f
+    __del__ = lambda self : None;
+    def getName(*args): return _Freestyle.UnaryFunction0DVec3f_getName(*args)
+    def __call__(*args): return _Freestyle.UnaryFunction0DVec3f___call__(*args)
+    def __disown__(self):
+        self.this.disown()
+        _Freestyle.disown_UnaryFunction0DVec3f(self)
+        return weakref_proxy(self)
+UnaryFunction0DVec3f_swigregister = _Freestyle.UnaryFunction0DVec3f_swigregister
+UnaryFunction0DVec3f_swigregister(UnaryFunction0DVec3f)
+
+class UnaryFunction0DId(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, UnaryFunction0DId, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, UnaryFunction0DId, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        if self.__class__ == UnaryFunction0DId:
+            args = (None,) + args
+        else:
+            args = (self,) + args
+        this = _Freestyle.new_UnaryFunction0DId(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_UnaryFunction0DId
+    __del__ = lambda self : None;
+    def getName(*args): return _Freestyle.UnaryFunction0DId_getName(*args)
+    def __call__(*args): return _Freestyle.UnaryFunction0DId___call__(*args)
+    def __disown__(self):
+        self.this.disown()
+        _Freestyle.disown_UnaryFunction0DId(self)
+        return weakref_proxy(self)
+UnaryFunction0DId_swigregister = _Freestyle.UnaryFunction0DId_swigregister
+UnaryFunction0DId_swigregister(UnaryFunction0DId)
+
+class UnaryFunction0DViewShape(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, UnaryFunction0DViewShape, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, UnaryFunction0DViewShape, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_UnaryFunction0DViewShape(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_UnaryFunction0DViewShape
+    __del__ = lambda self : None;
+    def getName(*args): return _Freestyle.UnaryFunction0DViewShape_getName(*args)
+    def __call__(*args): return _Freestyle.UnaryFunction0DViewShape___call__(*args)
+UnaryFunction0DViewShape_swigregister = _Freestyle.UnaryFunction0DViewShape_swigregister
+UnaryFunction0DViewShape_swigregister(UnaryFunction0DViewShape)
+
+class UnaryFunction0DVectorViewShape(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, UnaryFunction0DVectorViewShape, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, UnaryFunction0DVectorViewShape, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_UnaryFunction0DVectorViewShape(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_UnaryFunction0DVectorViewShape
+    __del__ = lambda self : None;
+    def getName(*args): return _Freestyle.UnaryFunction0DVectorViewShape_getName(*args)
+    def __call__(*args): return _Freestyle.UnaryFunction0DVectorViewShape___call__(*args)
+UnaryFunction0DVectorViewShape_swigregister = _Freestyle.UnaryFunction0DVectorViewShape_swigregister
+UnaryFunction0DVectorViewShape_swigregister(UnaryFunction0DVectorViewShape)
+
+class GetXF0D(UnaryFunction0DDouble):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction0DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, GetXF0D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction0DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, GetXF0D, name)
+    __repr__ = _swig_repr
+    def getName(*args): return _Freestyle.GetXF0D_getName(*args)
+    def __call__(*args): return _Freestyle.GetXF0D___call__(*args)
+    def __init__(self, *args): 
+        this = _Freestyle.new_GetXF0D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_GetXF0D
+    __del__ = lambda self : None;
+GetXF0D_swigregister = _Freestyle.GetXF0D_swigregister
+GetXF0D_swigregister(GetXF0D)
+
+class GetYF0D(UnaryFunction0DDouble):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction0DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, GetYF0D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction0DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, GetYF0D, name)
+    __repr__ = _swig_repr
+    def getName(*args): return _Freestyle.GetYF0D_getName(*args)
+    def __call__(*args): return _Freestyle.GetYF0D___call__(*args)
+    def __init__(self, *args): 
+        this = _Freestyle.new_GetYF0D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_GetYF0D
+    __del__ = lambda self : None;
+GetYF0D_swigregister = _Freestyle.GetYF0D_swigregister
+GetYF0D_swigregister(GetYF0D)
+
+class GetZF0D(UnaryFunction0DDouble):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction0DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, GetZF0D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction0DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, GetZF0D, name)
+    __repr__ = _swig_repr
+    def getName(*args): return _Freestyle.GetZF0D_getName(*args)
+    def __call__(*args): return _Freestyle.GetZF0D___call__(*args)
+    def __init__(self, *args): 
+        this = _Freestyle.new_GetZF0D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_GetZF0D
+    __del__ = lambda self : None;
+GetZF0D_swigregister = _Freestyle.GetZF0D_swigregister
+GetZF0D_swigregister(GetZF0D)
+
+class GetProjectedXF0D(UnaryFunction0DDouble):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction0DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, GetProjectedXF0D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction0DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, GetProjectedXF0D, name)
+    __repr__ = _swig_repr
+    def getName(*args): return _Freestyle.GetProjectedXF0D_getName(*args)
+    def __call__(*args): return _Freestyle.GetProjectedXF0D___call__(*args)
+    def __init__(self, *args): 
+        this = _Freestyle.new_GetProjectedXF0D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_GetProjectedXF0D
+    __del__ = lambda self : None;
+GetProjectedXF0D_swigregister = _Freestyle.GetProjectedXF0D_swigregister
+GetProjectedXF0D_swigregister(GetProjectedXF0D)
+
+class GetProjectedYF0D(UnaryFunction0DDouble):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction0DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, GetProjectedYF0D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction0DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, GetProjectedYF0D, name)
+    __repr__ = _swig_repr
+    def getName(*args): return _Freestyle.GetProjectedYF0D_getName(*args)
+    def __call__(*args): return _Freestyle.GetProjectedYF0D___call__(*args)
+    def __init__(self, *args): 
+        this = _Freestyle.new_GetProjectedYF0D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_GetProjectedYF0D
+    __del__ = lambda self : None;
+GetProjectedYF0D_swigregister = _Freestyle.GetProjectedYF0D_swigregister
+GetProjectedYF0D_swigregister(GetProjectedYF0D)
+
+class GetProjectedZF0D(UnaryFunction0DDouble):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction0DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, GetProjectedZF0D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction0DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, GetProjectedZF0D, name)
+    __repr__ = _swig_repr
+    def getName(*args): return _Freestyle.GetProjectedZF0D_getName(*args)
+    def __call__(*args): return _Freestyle.GetProjectedZF0D___call__(*args)
+    def __init__(self, *args): 
+        this = _Freestyle.new_GetProjectedZF0D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_GetProjectedZF0D
+    __del__ = lambda self : None;
+GetProjectedZF0D_swigregister = _Freestyle.GetProjectedZF0D_swigregister
+GetProjectedZF0D_swigregister(GetProjectedZF0D)
+
+class GetCurvilinearAbscissaF0D(UnaryFunction0DFloat):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction0DFloat]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, GetCurvilinearAbscissaF0D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction0DFloat]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, GetCurvilinearAbscissaF0D, name)
+    __repr__ = _swig_repr
+    def getName(*args): return _Freestyle.GetCurvilinearAbscissaF0D_getName(*args)
+    def __call__(*args): return _Freestyle.GetCurvilinearAbscissaF0D___call__(*args)
+    def __init__(self, *args): 
+        this = _Freestyle.new_GetCurvilinearAbscissaF0D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_GetCurvilinearAbscissaF0D
+    __del__ = lambda self : None;
+GetCurvilinearAbscissaF0D_swigregister = _Freestyle.GetCurvilinearAbscissaF0D_swigregister
+GetCurvilinearAbscissaF0D_swigregister(GetCurvilinearAbscissaF0D)
+
+class GetParameterF0D(UnaryFunction0DFloat):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction0DFloat]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, GetParameterF0D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction0DFloat]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, GetParameterF0D, name)
+    __repr__ = _swig_repr
+    def getName(*args): return _Freestyle.GetParameterF0D_getName(*args)
+    def __call__(*args): return _Freestyle.GetParameterF0D___call__(*args)
+    def __init__(self, *args): 
+        this = _Freestyle.new_GetParameterF0D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_GetParameterF0D
+    __del__ = lambda self : None;
+GetParameterF0D_swigregister = _Freestyle.GetParameterF0D_swigregister
+GetParameterF0D_swigregister(GetParameterF0D)
+
+class VertexOrientation2DF0D(UnaryFunction0DVec2f):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction0DVec2f]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, VertexOrientation2DF0D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction0DVec2f]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, VertexOrientation2DF0D, name)
+    __repr__ = _swig_repr
+    def getName(*args): return _Freestyle.VertexOrientation2DF0D_getName(*args)
+    def __call__(*args): return _Freestyle.VertexOrientation2DF0D___call__(*args)
+    def __init__(self, *args): 
+        this = _Freestyle.new_VertexOrientation2DF0D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_VertexOrientation2DF0D
+    __del__ = lambda self : None;
+VertexOrientation2DF0D_swigregister = _Freestyle.VertexOrientation2DF0D_swigregister
+VertexOrientation2DF0D_swigregister(VertexOrientation2DF0D)
+
+class VertexOrientation3DF0D(UnaryFunction0DVec3f):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction0DVec3f]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, VertexOrientation3DF0D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction0DVec3f]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, VertexOrientation3DF0D, name)
+    __repr__ = _swig_repr
+    def getName(*args): return _Freestyle.VertexOrientation3DF0D_getName(*args)
+    def __call__(*args): return _Freestyle.VertexOrientation3DF0D___call__(*args)
+    def __init__(self, *args): 
+        this = _Freestyle.new_VertexOrientation3DF0D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_VertexOrientation3DF0D
+    __del__ = lambda self : None;
+VertexOrientation3DF0D_swigregister = _Freestyle.VertexOrientation3DF0D_swigregister
+VertexOrientation3DF0D_swigregister(VertexOrientation3DF0D)
+
+class Curvature2DAngleF0D(UnaryFunction0DDouble):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction0DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, Curvature2DAngleF0D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction0DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, Curvature2DAngleF0D, name)
+    __repr__ = _swig_repr
+    def getName(*args): return _Freestyle.Curvature2DAngleF0D_getName(*args)
+    def __call__(*args): return _Freestyle.Curvature2DAngleF0D___call__(*args)
+    def __init__(self, *args): 
+        this = _Freestyle.new_Curvature2DAngleF0D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_Curvature2DAngleF0D
+    __del__ = lambda self : None;
+Curvature2DAngleF0D_swigregister = _Freestyle.Curvature2DAngleF0D_swigregister
+Curvature2DAngleF0D_swigregister(Curvature2DAngleF0D)
+
+class ZDiscontinuityF0D(UnaryFunction0DDouble):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction0DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, ZDiscontinuityF0D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction0DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, ZDiscontinuityF0D, name)
+    __repr__ = _swig_repr
+    def getName(*args): return _Freestyle.ZDiscontinuityF0D_getName(*args)
+    def __call__(*args): return _Freestyle.ZDiscontinuityF0D___call__(*args)
+    def __init__(self, *args): 
+        this = _Freestyle.new_ZDiscontinuityF0D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_ZDiscontinuityF0D
+    __del__ = lambda self : None;
+ZDiscontinuityF0D_swigregister = _Freestyle.ZDiscontinuityF0D_swigregister
+ZDiscontinuityF0D_swigregister(ZDiscontinuityF0D)
+
+class Normal2DF0D(UnaryFunction0DVec2f):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction0DVec2f]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, Normal2DF0D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction0DVec2f]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, Normal2DF0D, name)
+    __repr__ = _swig_repr
+    def getName(*args): return _Freestyle.Normal2DF0D_getName(*args)
+    def __call__(*args): return _Freestyle.Normal2DF0D___call__(*args)
+    def __init__(self, *args): 
+        this = _Freestyle.new_Normal2DF0D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_Normal2DF0D
+    __del__ = lambda self : None;
+Normal2DF0D_swigregister = _Freestyle.Normal2DF0D_swigregister
+Normal2DF0D_swigregister(Normal2DF0D)
+
+class MaterialF0D(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, MaterialF0D, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, MaterialF0D, name)
+    __repr__ = _swig_repr
+    def getName(*args): return _Freestyle.MaterialF0D_getName(*args)
+    def __call__(*args): return _Freestyle.MaterialF0D___call__(*args)
+    def __init__(self, *args): 
+        this = _Freestyle.new_MaterialF0D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_MaterialF0D
+    __del__ = lambda self : None;
+MaterialF0D_swigregister = _Freestyle.MaterialF0D_swigregister
+MaterialF0D_swigregister(MaterialF0D)
+
+class ShapeIdF0D(UnaryFunction0DId):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction0DId]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, ShapeIdF0D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction0DId]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, ShapeIdF0D, name)
+    __repr__ = _swig_repr
+    def getName(*args): return _Freestyle.ShapeIdF0D_getName(*args)
+    def __call__(*args): return _Freestyle.ShapeIdF0D___call__(*args)
+    def __init__(self, *args): 
+        this = _Freestyle.new_ShapeIdF0D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_ShapeIdF0D
+    __del__ = lambda self : None;
+ShapeIdF0D_swigregister = _Freestyle.ShapeIdF0D_swigregister
+ShapeIdF0D_swigregister(ShapeIdF0D)
+
+class QuantitativeInvisibilityF0D(UnaryFunction0DUnsigned):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction0DUnsigned]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, QuantitativeInvisibilityF0D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction0DUnsigned]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, QuantitativeInvisibilityF0D, name)
+    __repr__ = _swig_repr
+    def getName(*args): return _Freestyle.QuantitativeInvisibilityF0D_getName(*args)
+    def __call__(*args): return _Freestyle.QuantitativeInvisibilityF0D___call__(*args)
+    def __init__(self, *args): 
+        this = _Freestyle.new_QuantitativeInvisibilityF0D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_QuantitativeInvisibilityF0D
+    __del__ = lambda self : None;
+QuantitativeInvisibilityF0D_swigregister = _Freestyle.QuantitativeInvisibilityF0D_swigregister
+QuantitativeInvisibilityF0D_swigregister(QuantitativeInvisibilityF0D)
+
+class CurveNatureF0D(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, CurveNatureF0D, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, CurveNatureF0D, name)
+    __repr__ = _swig_repr
+    def getName(*args): return _Freestyle.CurveNatureF0D_getName(*args)
+    def __call__(*args): return _Freestyle.CurveNatureF0D___call__(*args)
+    def __init__(self, *args): 
+        this = _Freestyle.new_CurveNatureF0D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_CurveNatureF0D
+    __del__ = lambda self : None;
+CurveNatureF0D_swigregister = _Freestyle.CurveNatureF0D_swigregister
+CurveNatureF0D_swigregister(CurveNatureF0D)
+
+class GetShapeF0D(UnaryFunction0DViewShape):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction0DViewShape]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, GetShapeF0D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction0DViewShape]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, GetShapeF0D, name)
+    __repr__ = _swig_repr
+    def getName(*args): return _Freestyle.GetShapeF0D_getName(*args)
+    def __call__(*args): return _Freestyle.GetShapeF0D___call__(*args)
+    def __init__(self, *args): 
+        this = _Freestyle.new_GetShapeF0D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_GetShapeF0D
+    __del__ = lambda self : None;
+GetShapeF0D_swigregister = _Freestyle.GetShapeF0D_swigregister
+GetShapeF0D_swigregister(GetShapeF0D)
+
+class GetOccludersF0D(UnaryFunction0DVectorViewShape):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction0DVectorViewShape]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, GetOccludersF0D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction0DVectorViewShape]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, GetOccludersF0D, name)
+    __repr__ = _swig_repr
+    def getName(*args): return _Freestyle.GetOccludersF0D_getName(*args)
+    def __call__(*args): return _Freestyle.GetOccludersF0D___call__(*args)
+    def __init__(self, *args): 
+        this = _Freestyle.new_GetOccludersF0D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_GetOccludersF0D
+    __del__ = lambda self : None;
+GetOccludersF0D_swigregister = _Freestyle.GetOccludersF0D_swigregister
+GetOccludersF0D_swigregister(GetOccludersF0D)
+
+class GetOccludeeF0D(UnaryFunction0DViewShape):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction0DViewShape]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, GetOccludeeF0D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction0DViewShape]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, GetOccludeeF0D, name)
+    __repr__ = _swig_repr
+    def getName(*args): return _Freestyle.GetOccludeeF0D_getName(*args)
+    def __call__(*args): return _Freestyle.GetOccludeeF0D___call__(*args)
+    def __init__(self, *args): 
+        this = _Freestyle.new_GetOccludeeF0D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_GetOccludeeF0D
+    __del__ = lambda self : None;
+GetOccludeeF0D_swigregister = _Freestyle.GetOccludeeF0D_swigregister
+GetOccludeeF0D_swigregister(GetOccludeeF0D)
+
+getFEdge = _Freestyle.getFEdge
+class UnaryFunction1DVoid(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, UnaryFunction1DVoid, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, UnaryFunction1DVoid, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        if self.__class__ == UnaryFunction1DVoid:
+            args = (None,) + args
+        else:
+            args = (self,) + args
+        this = _Freestyle.new_UnaryFunction1DVoid(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_UnaryFunction1DVoid
+    __del__ = lambda self : None;
+    def getName(*args): return _Freestyle.UnaryFunction1DVoid_getName(*args)
+    def __call__(*args): return _Freestyle.UnaryFunction1DVoid___call__(*args)
+    def setIntegrationType(*args): return _Freestyle.UnaryFunction1DVoid_setIntegrationType(*args)
+    def getIntegrationType(*args): return _Freestyle.UnaryFunction1DVoid_getIntegrationType(*args)
+    def __disown__(self):
+        self.this.disown()
+        _Freestyle.disown_UnaryFunction1DVoid(self)
+        return weakref_proxy(self)
+UnaryFunction1DVoid_swigregister = _Freestyle.UnaryFunction1DVoid_swigregister
+UnaryFunction1DVoid_swigregister(UnaryFunction1DVoid)
+
+class UnaryFunction1DUnsigned(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, UnaryFunction1DUnsigned, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, UnaryFunction1DUnsigned, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        if self.__class__ == UnaryFunction1DUnsigned:
+            args = (None,) + args
+        else:
+            args = (self,) + args
+        this = _Freestyle.new_UnaryFunction1DUnsigned(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_UnaryFunction1DUnsigned
+    __del__ = lambda self : None;
+    def getName(*args): return _Freestyle.UnaryFunction1DUnsigned_getName(*args)
+    def __call__(*args): return _Freestyle.UnaryFunction1DUnsigned___call__(*args)
+    def setIntegrationType(*args): return _Freestyle.UnaryFunction1DUnsigned_setIntegrationType(*args)
+    def getIntegrationType(*args): return _Freestyle.UnaryFunction1DUnsigned_getIntegrationType(*args)
+    def __disown__(self):
+        self.this.disown()
+        _Freestyle.disown_UnaryFunction1DUnsigned(self)
+        return weakref_proxy(self)
+UnaryFunction1DUnsigned_swigregister = _Freestyle.UnaryFunction1DUnsigned_swigregister
+UnaryFunction1DUnsigned_swigregister(UnaryFunction1DUnsigned)
+
+class UnaryFunction1DFloat(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, UnaryFunction1DFloat, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, UnaryFunction1DFloat, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        if self.__class__ == UnaryFunction1DFloat:
+            args = (None,) + args
+        else:
+            args = (self,) + args
+        this = _Freestyle.new_UnaryFunction1DFloat(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_UnaryFunction1DFloat
+    __del__ = lambda self : None;
+    def getName(*args): return _Freestyle.UnaryFunction1DFloat_getName(*args)
+    def __call__(*args): return _Freestyle.UnaryFunction1DFloat___call__(*args)
+    def setIntegrationType(*args): return _Freestyle.UnaryFunction1DFloat_setIntegrationType(*args)
+    def getIntegrationType(*args): return _Freestyle.UnaryFunction1DFloat_getIntegrationType(*args)
+    def __disown__(self):
+        self.this.disown()
+        _Freestyle.disown_UnaryFunction1DFloat(self)
+        return weakref_proxy(self)
+UnaryFunction1DFloat_swigregister = _Freestyle.UnaryFunction1DFloat_swigregister
+UnaryFunction1DFloat_swigregister(UnaryFunction1DFloat)
+
+class UnaryFunction1DDouble(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, UnaryFunction1DDouble, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, UnaryFunction1DDouble, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        if self.__class__ == UnaryFunction1DDouble:
+            args = (None,) + args
+        else:
+            args = (self,) + args
+        this = _Freestyle.new_UnaryFunction1DDouble(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_UnaryFunction1DDouble
+    __del__ = lambda self : None;
+    def getName(*args): return _Freestyle.UnaryFunction1DDouble_getName(*args)
+    def __call__(*args): return _Freestyle.UnaryFunction1DDouble___call__(*args)
+    def setIntegrationType(*args): return _Freestyle.UnaryFunction1DDouble_setIntegrationType(*args)
+    def getIntegrationType(*args): return _Freestyle.UnaryFunction1DDouble_getIntegrationType(*args)
+    def __disown__(self):
+        self.this.disown()
+        _Freestyle.disown_UnaryFunction1DDouble(self)
+        return weakref_proxy(self)
+UnaryFunction1DDouble_swigregister = _Freestyle.UnaryFunction1DDouble_swigregister
+UnaryFunction1DDouble_swigregister(UnaryFunction1DDouble)
+
+class UnaryFunction1DVec2f(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, UnaryFunction1DVec2f, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, UnaryFunction1DVec2f, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        if self.__class__ == UnaryFunction1DVec2f:
+            args = (None,) + args
+        else:
+            args = (self,) + args
+        this = _Freestyle.new_UnaryFunction1DVec2f(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_UnaryFunction1DVec2f
+    __del__ = lambda self : None;
+    def getName(*args): return _Freestyle.UnaryFunction1DVec2f_getName(*args)
+    def __call__(*args): return _Freestyle.UnaryFunction1DVec2f___call__(*args)
+    def setIntegrationType(*args): return _Freestyle.UnaryFunction1DVec2f_setIntegrationType(*args)
+    def getIntegrationType(*args): return _Freestyle.UnaryFunction1DVec2f_getIntegrationType(*args)
+    def __disown__(self):
+        self.this.disown()
+        _Freestyle.disown_UnaryFunction1DVec2f(self)
+        return weakref_proxy(self)
+UnaryFunction1DVec2f_swigregister = _Freestyle.UnaryFunction1DVec2f_swigregister
+UnaryFunction1DVec2f_swigregister(UnaryFunction1DVec2f)
+
+class UnaryFunction1DVec3f(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, UnaryFunction1DVec3f, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, UnaryFunction1DVec3f, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        if self.__class__ == UnaryFunction1DVec3f:
+            args = (None,) + args
+        else:
+            args = (self,) + args
+        this = _Freestyle.new_UnaryFunction1DVec3f(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_UnaryFunction1DVec3f
+    __del__ = lambda self : None;
+    def getName(*args): return _Freestyle.UnaryFunction1DVec3f_getName(*args)
+    def __call__(*args): return _Freestyle.UnaryFunction1DVec3f___call__(*args)
+    def setIntegrationType(*args): return _Freestyle.UnaryFunction1DVec3f_setIntegrationType(*args)
+    def getIntegrationType(*args): return _Freestyle.UnaryFunction1DVec3f_getIntegrationType(*args)
+    def __disown__(self):
+        self.this.disown()
+        _Freestyle.disown_UnaryFunction1DVec3f(self)
+        return weakref_proxy(self)
+UnaryFunction1DVec3f_swigregister = _Freestyle.UnaryFunction1DVec3f_swigregister
+UnaryFunction1DVec3f_swigregister(UnaryFunction1DVec3f)
+
+class UnaryFunction1DVectorViewShape(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, UnaryFunction1DVectorViewShape, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, UnaryFunction1DVectorViewShape, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_UnaryFunction1DVectorViewShape(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_UnaryFunction1DVectorViewShape
+    __del__ = lambda self : None;
+    def getName(*args): return _Freestyle.UnaryFunction1DVectorViewShape_getName(*args)
+    def __call__(*args): return _Freestyle.UnaryFunction1DVectorViewShape___call__(*args)
+    def setIntegrationType(*args): return _Freestyle.UnaryFunction1DVectorViewShape_setIntegrationType(*args)
+    def getIntegrationType(*args): return _Freestyle.UnaryFunction1DVectorViewShape_getIntegrationType(*args)
+UnaryFunction1DVectorViewShape_swigregister = _Freestyle.UnaryFunction1DVectorViewShape_swigregister
+UnaryFunction1DVectorViewShape_swigregister(UnaryFunction1DVectorViewShape)
+
+class GetXF1D(UnaryFunction1DDouble):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction1DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, GetXF1D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction1DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, GetXF1D, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_GetXF1D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def getName(*args): return _Freestyle.GetXF1D_getName(*args)
+    def __call__(*args): return _Freestyle.GetXF1D___call__(*args)
+    __swig_destroy__ = _Freestyle.delete_GetXF1D
+    __del__ = lambda self : None;
+GetXF1D_swigregister = _Freestyle.GetXF1D_swigregister
+GetXF1D_swigregister(GetXF1D)
+
+class GetYF1D(UnaryFunction1DDouble):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction1DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, GetYF1D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction1DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, GetYF1D, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_GetYF1D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def getName(*args): return _Freestyle.GetYF1D_getName(*args)
+    def __call__(*args): return _Freestyle.GetYF1D___call__(*args)
+    __swig_destroy__ = _Freestyle.delete_GetYF1D
+    __del__ = lambda self : None;
+GetYF1D_swigregister = _Freestyle.GetYF1D_swigregister
+GetYF1D_swigregister(GetYF1D)
+
+class GetZF1D(UnaryFunction1DDouble):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction1DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, GetZF1D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction1DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, GetZF1D, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_GetZF1D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def getName(*args): return _Freestyle.GetZF1D_getName(*args)
+    def __call__(*args): return _Freestyle.GetZF1D___call__(*args)
+    __swig_destroy__ = _Freestyle.delete_GetZF1D
+    __del__ = lambda self : None;
+GetZF1D_swigregister = _Freestyle.GetZF1D_swigregister
+GetZF1D_swigregister(GetZF1D)
+
+class GetProjectedXF1D(UnaryFunction1DDouble):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction1DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, GetProjectedXF1D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction1DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, GetProjectedXF1D, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_GetProjectedXF1D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def getName(*args): return _Freestyle.GetProjectedXF1D_getName(*args)
+    def __call__(*args): return _Freestyle.GetProjectedXF1D___call__(*args)
+    __swig_destroy__ = _Freestyle.delete_GetProjectedXF1D
+    __del__ = lambda self : None;
+GetProjectedXF1D_swigregister = _Freestyle.GetProjectedXF1D_swigregister
+GetProjectedXF1D_swigregister(GetProjectedXF1D)
+
+class GetProjectedYF1D(UnaryFunction1DDouble):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction1DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, GetProjectedYF1D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction1DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, GetProjectedYF1D, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_GetProjectedYF1D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def getName(*args): return _Freestyle.GetProjectedYF1D_getName(*args)
+    def __call__(*args): return _Freestyle.GetProjectedYF1D___call__(*args)
+    __swig_destroy__ = _Freestyle.delete_GetProjectedYF1D
+    __del__ = lambda self : None;
+GetProjectedYF1D_swigregister = _Freestyle.GetProjectedYF1D_swigregister
+GetProjectedYF1D_swigregister(GetProjectedYF1D)
+
+class GetProjectedZF1D(UnaryFunction1DDouble):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction1DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, GetProjectedZF1D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction1DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, GetProjectedZF1D, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_GetProjectedZF1D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def getName(*args): return _Freestyle.GetProjectedZF1D_getName(*args)
+    def __call__(*args): return _Freestyle.GetProjectedZF1D___call__(*args)
+    __swig_destroy__ = _Freestyle.delete_GetProjectedZF1D
+    __del__ = lambda self : None;
+GetProjectedZF1D_swigregister = _Freestyle.GetProjectedZF1D_swigregister
+GetProjectedZF1D_swigregister(GetProjectedZF1D)
+
+class Orientation2DF1D(UnaryFunction1DVec2f):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction1DVec2f]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, Orientation2DF1D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction1DVec2f]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, Orientation2DF1D, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_Orientation2DF1D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def getName(*args): return _Freestyle.Orientation2DF1D_getName(*args)
+    def __call__(*args): return _Freestyle.Orientation2DF1D___call__(*args)
+    __swig_destroy__ = _Freestyle.delete_Orientation2DF1D
+    __del__ = lambda self : None;
+Orientation2DF1D_swigregister = _Freestyle.Orientation2DF1D_swigregister
+Orientation2DF1D_swigregister(Orientation2DF1D)
+
+class Orientation3DF1D(UnaryFunction1DVec3f):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction1DVec3f]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, Orientation3DF1D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction1DVec3f]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, Orientation3DF1D, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_Orientation3DF1D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def getName(*args): return _Freestyle.Orientation3DF1D_getName(*args)
+    def __call__(*args): return _Freestyle.Orientation3DF1D___call__(*args)
+    __swig_destroy__ = _Freestyle.delete_Orientation3DF1D
+    __del__ = lambda self : None;
+Orientation3DF1D_swigregister = _Freestyle.Orientation3DF1D_swigregister
+Orientation3DF1D_swigregister(Orientation3DF1D)
+
+class ZDiscontinuityF1D(UnaryFunction1DDouble):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction1DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, ZDiscontinuityF1D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction1DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, ZDiscontinuityF1D, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_ZDiscontinuityF1D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def getName(*args): return _Freestyle.ZDiscontinuityF1D_getName(*args)
+    def __call__(*args): return _Freestyle.ZDiscontinuityF1D___call__(*args)
+    __swig_destroy__ = _Freestyle.delete_ZDiscontinuityF1D
+    __del__ = lambda self : None;
+ZDiscontinuityF1D_swigregister = _Freestyle.ZDiscontinuityF1D_swigregister
+ZDiscontinuityF1D_swigregister(ZDiscontinuityF1D)
+
+class QuantitativeInvisibilityF1D(UnaryFunction1DUnsigned):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction1DUnsigned]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, QuantitativeInvisibilityF1D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction1DUnsigned]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, QuantitativeInvisibilityF1D, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_QuantitativeInvisibilityF1D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def getName(*args): return _Freestyle.QuantitativeInvisibilityF1D_getName(*args)
+    def __call__(*args): return _Freestyle.QuantitativeInvisibilityF1D___call__(*args)
+    __swig_destroy__ = _Freestyle.delete_QuantitativeInvisibilityF1D
+    __del__ = lambda self : None;
+QuantitativeInvisibilityF1D_swigregister = _Freestyle.QuantitativeInvisibilityF1D_swigregister
+QuantitativeInvisibilityF1D_swigregister(QuantitativeInvisibilityF1D)
+
+class CurveNatureF1D(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, CurveNatureF1D, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, CurveNatureF1D, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_CurveNatureF1D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def getName(*args): return _Freestyle.CurveNatureF1D_getName(*args)
+    def __call__(*args): return _Freestyle.CurveNatureF1D___call__(*args)
+    __swig_destroy__ = _Freestyle.delete_CurveNatureF1D
+    __del__ = lambda self : None;
+CurveNatureF1D_swigregister = _Freestyle.CurveNatureF1D_swigregister
+CurveNatureF1D_swigregister(CurveNatureF1D)
+
+class TimeStampF1D(UnaryFunction1DVoid):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction1DVoid]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, TimeStampF1D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction1DVoid]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, TimeStampF1D, name)
+    __repr__ = _swig_repr
+    def getName(*args): return _Freestyle.TimeStampF1D_getName(*args)
+    def __call__(*args): return _Freestyle.TimeStampF1D___call__(*args)
+    def __init__(self, *args): 
+        this = _Freestyle.new_TimeStampF1D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_TimeStampF1D
+    __del__ = lambda self : None;
+TimeStampF1D_swigregister = _Freestyle.TimeStampF1D_swigregister
+TimeStampF1D_swigregister(TimeStampF1D)
+
+class IncrementChainingTimeStampF1D(UnaryFunction1DVoid):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction1DVoid]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, IncrementChainingTimeStampF1D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction1DVoid]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, IncrementChainingTimeStampF1D, name)
+    __repr__ = _swig_repr
+    def getName(*args): return _Freestyle.IncrementChainingTimeStampF1D_getName(*args)
+    def __call__(*args): return _Freestyle.IncrementChainingTimeStampF1D___call__(*args)
+    def __init__(self, *args): 
+        this = _Freestyle.new_IncrementChainingTimeStampF1D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_IncrementChainingTimeStampF1D
+    __del__ = lambda self : None;
+IncrementChainingTimeStampF1D_swigregister = _Freestyle.IncrementChainingTimeStampF1D_swigregister
+IncrementChainingTimeStampF1D_swigregister(IncrementChainingTimeStampF1D)
+
+class ChainingTimeStampF1D(UnaryFunction1DVoid):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction1DVoid]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, ChainingTimeStampF1D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction1DVoid]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, ChainingTimeStampF1D, name)
+    __repr__ = _swig_repr
+    def getName(*args): return _Freestyle.ChainingTimeStampF1D_getName(*args)
+    def __call__(*args): return _Freestyle.ChainingTimeStampF1D___call__(*args)
+    def __init__(self, *args): 
+        this = _Freestyle.new_ChainingTimeStampF1D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_ChainingTimeStampF1D
+    __del__ = lambda self : None;
+ChainingTimeStampF1D_swigregister = _Freestyle.ChainingTimeStampF1D_swigregister
+ChainingTimeStampF1D_swigregister(ChainingTimeStampF1D)
+
+class Curvature2DAngleF1D(UnaryFunction1DDouble):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction1DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, Curvature2DAngleF1D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction1DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, Curvature2DAngleF1D, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_Curvature2DAngleF1D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def getName(*args): return _Freestyle.Curvature2DAngleF1D_getName(*args)
+    def __call__(*args): return _Freestyle.Curvature2DAngleF1D___call__(*args)
+    __swig_destroy__ = _Freestyle.delete_Curvature2DAngleF1D
+    __del__ = lambda self : None;
+Curvature2DAngleF1D_swigregister = _Freestyle.Curvature2DAngleF1D_swigregister
+Curvature2DAngleF1D_swigregister(Curvature2DAngleF1D)
+
+class Normal2DF1D(UnaryFunction1DVec2f):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction1DVec2f]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, Normal2DF1D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction1DVec2f]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, Normal2DF1D, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_Normal2DF1D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def getName(*args): return _Freestyle.Normal2DF1D_getName(*args)
+    def __call__(*args): return _Freestyle.Normal2DF1D___call__(*args)
+    __swig_destroy__ = _Freestyle.delete_Normal2DF1D
+    __del__ = lambda self : None;
+Normal2DF1D_swigregister = _Freestyle.Normal2DF1D_swigregister
+Normal2DF1D_swigregister(Normal2DF1D)
+
+class GetShapeF1D(UnaryFunction1DVectorViewShape):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction1DVectorViewShape]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, GetShapeF1D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction1DVectorViewShape]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, GetShapeF1D, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_GetShapeF1D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def getName(*args): return _Freestyle.GetShapeF1D_getName(*args)
+    def __call__(*args): return _Freestyle.GetShapeF1D___call__(*args)
+    __swig_destroy__ = _Freestyle.delete_GetShapeF1D
+    __del__ = lambda self : None;
+GetShapeF1D_swigregister = _Freestyle.GetShapeF1D_swigregister
+GetShapeF1D_swigregister(GetShapeF1D)
+
+class GetOccludersF1D(UnaryFunction1DVectorViewShape):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction1DVectorViewShape]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, GetOccludersF1D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction1DVectorViewShape]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, GetOccludersF1D, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_GetOccludersF1D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def getName(*args): return _Freestyle.GetOccludersF1D_getName(*args)
+    def __call__(*args): return _Freestyle.GetOccludersF1D___call__(*args)
+    __swig_destroy__ = _Freestyle.delete_GetOccludersF1D
+    __del__ = lambda self : None;
+GetOccludersF1D_swigregister = _Freestyle.GetOccludersF1D_swigregister
+GetOccludersF1D_swigregister(GetOccludersF1D)
+
+class GetOccludeeF1D(UnaryFunction1DVectorViewShape):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction1DVectorViewShape]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, GetOccludeeF1D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction1DVectorViewShape]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, GetOccludeeF1D, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_GetOccludeeF1D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def getName(*args): return _Freestyle.GetOccludeeF1D_getName(*args)
+    def __call__(*args): return _Freestyle.GetOccludeeF1D___call__(*args)
+    __swig_destroy__ = _Freestyle.delete_GetOccludeeF1D
+    __del__ = lambda self : None;
+GetOccludeeF1D_swigregister = _Freestyle.GetOccludeeF1D_swigregister
+GetOccludeeF1D_swigregister(GetOccludeeF1D)
+
+class Module(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, Module, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, Module, name)
+    __repr__ = _swig_repr
+    __swig_getmethods__["setAlwaysRefresh"] = lambda x: _Freestyle.Module_setAlwaysRefresh
+    if _newclass:setAlwaysRefresh = staticmethod(_Freestyle.Module_setAlwaysRefresh)
+    __swig_getmethods__["setCausal"] = lambda x: _Freestyle.Module_setCausal
+    if _newclass:setCausal = staticmethod(_Freestyle.Module_setCausal)
+    __swig_getmethods__["setDrawable"] = lambda x: _Freestyle.Module_setDrawable
+    if _newclass:setDrawable = staticmethod(_Freestyle.Module_setDrawable)
+    __swig_getmethods__["getAlwaysRefresh"] = lambda x: _Freestyle.Module_getAlwaysRefresh
+    if _newclass:getAlwaysRefresh = staticmethod(_Freestyle.Module_getAlwaysRefresh)
+    __swig_getmethods__["getCausal"] = lambda x: _Freestyle.Module_getCausal
+    if _newclass:getCausal = staticmethod(_Freestyle.Module_getCausal)
+    __swig_getmethods__["getDrawable"] = lambda x: _Freestyle.Module_getDrawable
+    if _newclass:getDrawable = staticmethod(_Freestyle.Module_getDrawable)
+    def __init__(self, *args): 
+        this = _Freestyle.new_Module(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_Module
+    __del__ = lambda self : None;
+Module_swigregister = _Freestyle.Module_swigregister
+Module_swigregister(Module)
+Module_setAlwaysRefresh = _Freestyle.Module_setAlwaysRefresh
+Module_setCausal = _Freestyle.Module_setCausal
+Module_setDrawable = _Freestyle.Module_setDrawable
+Module_getAlwaysRefresh = _Freestyle.Module_getAlwaysRefresh
+Module_getCausal = _Freestyle.Module_getCausal
+Module_getDrawable = _Freestyle.Module_getDrawable
+
+class DensityF0D(UnaryFunction0DDouble):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction0DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, DensityF0D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction0DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, DensityF0D, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_DensityF0D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def getName(*args): return _Freestyle.DensityF0D_getName(*args)
+    def __call__(*args): return _Freestyle.DensityF0D___call__(*args)
+    __swig_destroy__ = _Freestyle.delete_DensityF0D
+    __del__ = lambda self : None;
+DensityF0D_swigregister = _Freestyle.DensityF0D_swigregister
+DensityF0D_swigregister(DensityF0D)
+
+class LocalAverageDepthF0D(UnaryFunction0DDouble):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction0DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, LocalAverageDepthF0D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction0DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, LocalAverageDepthF0D, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_LocalAverageDepthF0D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def getName(*args): return _Freestyle.LocalAverageDepthF0D_getName(*args)
+    def __call__(*args): return _Freestyle.LocalAverageDepthF0D___call__(*args)
+    __swig_destroy__ = _Freestyle.delete_LocalAverageDepthF0D
+    __del__ = lambda self : None;
+LocalAverageDepthF0D_swigregister = _Freestyle.LocalAverageDepthF0D_swigregister
+LocalAverageDepthF0D_swigregister(LocalAverageDepthF0D)
+
+class ReadMapPixelF0D(UnaryFunction0DFloat):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction0DFloat]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, ReadMapPixelF0D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction0DFloat]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, ReadMapPixelF0D, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_ReadMapPixelF0D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def getName(*args): return _Freestyle.ReadMapPixelF0D_getName(*args)
+    def __call__(*args): return _Freestyle.ReadMapPixelF0D___call__(*args)
+    __swig_destroy__ = _Freestyle.delete_ReadMapPixelF0D
+    __del__ = lambda self : None;
+ReadMapPixelF0D_swigregister = _Freestyle.ReadMapPixelF0D_swigregister
+ReadMapPixelF0D_swigregister(ReadMapPixelF0D)
+
+class ReadSteerableViewMapPixelF0D(UnaryFunction0DFloat):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction0DFloat]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, ReadSteerableViewMapPixelF0D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction0DFloat]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, ReadSteerableViewMapPixelF0D, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_ReadSteerableViewMapPixelF0D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def getName(*args): return _Freestyle.ReadSteerableViewMapPixelF0D_getName(*args)
+    def __call__(*args): return _Freestyle.ReadSteerableViewMapPixelF0D___call__(*args)
+    __swig_destroy__ = _Freestyle.delete_ReadSteerableViewMapPixelF0D
+    __del__ = lambda self : None;
+ReadSteerableViewMapPixelF0D_swigregister = _Freestyle.ReadSteerableViewMapPixelF0D_swigregister
+ReadSteerableViewMapPixelF0D_swigregister(ReadSteerableViewMapPixelF0D)
+
+class ReadCompleteViewMapPixelF0D(UnaryFunction0DFloat):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction0DFloat]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, ReadCompleteViewMapPixelF0D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction0DFloat]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, ReadCompleteViewMapPixelF0D, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_ReadCompleteViewMapPixelF0D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def getName(*args): return _Freestyle.ReadCompleteViewMapPixelF0D_getName(*args)
+    def __call__(*args): return _Freestyle.ReadCompleteViewMapPixelF0D___call__(*args)
+    __swig_destroy__ = _Freestyle.delete_ReadCompleteViewMapPixelF0D
+    __del__ = lambda self : None;
+ReadCompleteViewMapPixelF0D_swigregister = _Freestyle.ReadCompleteViewMapPixelF0D_swigregister
+ReadCompleteViewMapPixelF0D_swigregister(ReadCompleteViewMapPixelF0D)
+
+class GetViewMapGradientNormF0D(UnaryFunction0DFloat):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction0DFloat]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, GetViewMapGradientNormF0D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction0DFloat]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, GetViewMapGradientNormF0D, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_GetViewMapGradientNormF0D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def getName(*args): return _Freestyle.GetViewMapGradientNormF0D_getName(*args)
+    def __call__(*args): return _Freestyle.GetViewMapGradientNormF0D___call__(*args)
+    __swig_destroy__ = _Freestyle.delete_GetViewMapGradientNormF0D
+    __del__ = lambda self : None;
+GetViewMapGradientNormF0D_swigregister = _Freestyle.GetViewMapGradientNormF0D_swigregister
+GetViewMapGradientNormF0D_swigregister(GetViewMapGradientNormF0D)
+
+class DensityF1D(UnaryFunction1DDouble):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction1DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, DensityF1D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction1DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, DensityF1D, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_DensityF1D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_DensityF1D
+    __del__ = lambda self : None;
+    def getName(*args): return _Freestyle.DensityF1D_getName(*args)
+    def __call__(*args): return _Freestyle.DensityF1D___call__(*args)
+DensityF1D_swigregister = _Freestyle.DensityF1D_swigregister
+DensityF1D_swigregister(DensityF1D)
+
+class LocalAverageDepthF1D(UnaryFunction1DDouble):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction1DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, LocalAverageDepthF1D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction1DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, LocalAverageDepthF1D, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_LocalAverageDepthF1D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def getName(*args): return _Freestyle.LocalAverageDepthF1D_getName(*args)
+    def __call__(*args): return _Freestyle.LocalAverageDepthF1D___call__(*args)
+    __swig_destroy__ = _Freestyle.delete_LocalAverageDepthF1D
+    __del__ = lambda self : None;
+LocalAverageDepthF1D_swigregister = _Freestyle.LocalAverageDepthF1D_swigregister
+LocalAverageDepthF1D_swigregister(LocalAverageDepthF1D)
+
+class GetCompleteViewMapDensityF1D(UnaryFunction1DDouble):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction1DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, GetCompleteViewMapDensityF1D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction1DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, GetCompleteViewMapDensityF1D, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_GetCompleteViewMapDensityF1D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def getName(*args): return _Freestyle.GetCompleteViewMapDensityF1D_getName(*args)
+    def __call__(*args): return _Freestyle.GetCompleteViewMapDensityF1D___call__(*args)
+    __swig_destroy__ = _Freestyle.delete_GetCompleteViewMapDensityF1D
+    __del__ = lambda self : None;
+GetCompleteViewMapDensityF1D_swigregister = _Freestyle.GetCompleteViewMapDensityF1D_swigregister
+GetCompleteViewMapDensityF1D_swigregister(GetCompleteViewMapDensityF1D)
+
+class GetDirectionalViewMapDensityF1D(UnaryFunction1DDouble):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction1DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, GetDirectionalViewMapDensityF1D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction1DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, GetDirectionalViewMapDensityF1D, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_GetDirectionalViewMapDensityF1D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def getName(*args): return _Freestyle.GetDirectionalViewMapDensityF1D_getName(*args)
+    def __call__(*args): return _Freestyle.GetDirectionalViewMapDensityF1D___call__(*args)
+    __swig_destroy__ = _Freestyle.delete_GetDirectionalViewMapDensityF1D
+    __del__ = lambda self : None;
+GetDirectionalViewMapDensityF1D_swigregister = _Freestyle.GetDirectionalViewMapDensityF1D_swigregister
+GetDirectionalViewMapDensityF1D_swigregister(GetDirectionalViewMapDensityF1D)
+
+class GetSteerableViewMapDensityF1D(UnaryFunction1DDouble):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction1DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, GetSteerableViewMapDensityF1D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction1DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, GetSteerableViewMapDensityF1D, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_GetSteerableViewMapDensityF1D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_GetSteerableViewMapDensityF1D
+    __del__ = lambda self : None;
+    def getName(*args): return _Freestyle.GetSteerableViewMapDensityF1D_getName(*args)
+    def __call__(*args): return _Freestyle.GetSteerableViewMapDensityF1D___call__(*args)
+GetSteerableViewMapDensityF1D_swigregister = _Freestyle.GetSteerableViewMapDensityF1D_swigregister
+GetSteerableViewMapDensityF1D_swigregister(GetSteerableViewMapDensityF1D)
+
+class GetViewMapGradientNormF1D(UnaryFunction1DDouble):
+    __swig_setmethods__ = {}
+    for _s in [UnaryFunction1DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, GetViewMapGradientNormF1D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryFunction1DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, GetViewMapGradientNormF1D, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_GetViewMapGradientNormF1D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def getName(*args): return _Freestyle.GetViewMapGradientNormF1D_getName(*args)
+    def __call__(*args): return _Freestyle.GetViewMapGradientNormF1D___call__(*args)
+    __swig_destroy__ = _Freestyle.delete_GetViewMapGradientNormF1D
+    __del__ = lambda self : None;
+GetViewMapGradientNormF1D_swigregister = _Freestyle.GetViewMapGradientNormF1D_swigregister
+GetViewMapGradientNormF1D_swigregister(GetViewMapGradientNormF1D)
+
+GetTimeStampCF = _Freestyle.GetTimeStampCF
+GetCanvasWidthCF = _Freestyle.GetCanvasWidthCF
+GetCanvasHeightCF = _Freestyle.GetCanvasHeightCF
+ReadMapPixelCF = _Freestyle.ReadMapPixelCF
+ReadCompleteViewMapPixelCF = _Freestyle.ReadCompleteViewMapPixelCF
+ReadDirectionalViewMapPixelCF = _Freestyle.ReadDirectionalViewMapPixelCF
+GetSelectedFEdgeCF = _Freestyle.GetSelectedFEdgeCF
+class AdjacencyIterator(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, AdjacencyIterator, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, AdjacencyIterator, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_AdjacencyIterator(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_AdjacencyIterator
+    __del__ = lambda self : None;
+    def isEnd(*args): return _Freestyle.AdjacencyIterator_isEnd(*args)
+    def isBegin(*args): return _Freestyle.AdjacencyIterator_isBegin(*args)
+    def isIncoming(*args): return _Freestyle.AdjacencyIterator_isIncoming(*args)
+    def getObject(*args): return _Freestyle.AdjacencyIterator_getObject(*args)
+    def __deref__(*args): return _Freestyle.AdjacencyIterator___deref__(*args)
+    def increment(*args): return _Freestyle.AdjacencyIterator_increment(*args)
+    def getExactTypeName(*args): return _Freestyle.AdjacencyIterator_getExactTypeName(*args)
+    def getId(*args): return _Freestyle.AdjacencyIterator_getId(*args)
+    def getNature(*args): return _Freestyle.AdjacencyIterator_getNature(*args)
+    __swig_setmethods__["userdata"] = _Freestyle.AdjacencyIterator_userdata_set
+    __swig_getmethods__["userdata"] = _Freestyle.AdjacencyIterator_userdata_get
+    if _newclass:userdata = _swig_property(_Freestyle.AdjacencyIterator_userdata_get, _Freestyle.AdjacencyIterator_userdata_set)
+    def A(*args): return _Freestyle.AdjacencyIterator_A(*args)
+    def B(*args): return _Freestyle.AdjacencyIterator_B(*args)
+    def fedgeA(*args): return _Freestyle.AdjacencyIterator_fedgeA(*args)
+    def fedgeB(*args): return _Freestyle.AdjacencyIterator_fedgeB(*args)
+    def viewShape(*args): return _Freestyle.AdjacencyIterator_viewShape(*args)
+    def aShape(*args): return _Freestyle.AdjacencyIterator_aShape(*args)
+    def isClosed(*args): return _Freestyle.AdjacencyIterator_isClosed(*args)
+    def getChainingTimeStamp(*args): return _Freestyle.AdjacencyIterator_getChainingTimeStamp(*args)
+    def bShape(*args): return _Freestyle.AdjacencyIterator_bShape(*args)
+    def occluders(*args): return _Freestyle.AdjacencyIterator_occluders(*args)
+    def splittingId(*args): return _Freestyle.AdjacencyIterator_splittingId(*args)
+    def SetA(*args): return _Freestyle.AdjacencyIterator_SetA(*args)
+    def SetB(*args): return _Freestyle.AdjacencyIterator_SetB(*args)
+    def SetNature(*args): return _Freestyle.AdjacencyIterator_SetNature(*args)
+    def SetFEdgeA(*args): return _Freestyle.AdjacencyIterator_SetFEdgeA(*args)
+    def SetFEdgeB(*args): return _Freestyle.AdjacencyIterator_SetFEdgeB(*args)
+    def SetShape(*args): return _Freestyle.AdjacencyIterator_SetShape(*args)
+    def SetId(*args): return _Freestyle.AdjacencyIterator_SetId(*args)
+    def UpdateFEdges(*args): return _Freestyle.AdjacencyIterator_UpdateFEdges(*args)
+    def SetaShape(*args): return _Freestyle.AdjacencyIterator_SetaShape(*args)
+    def SetQI(*args): return _Freestyle.AdjacencyIterator_SetQI(*args)
+    def setChainingTimeStamp(*args): return _Freestyle.AdjacencyIterator_setChainingTimeStamp(*args)
+    def AddOccluder(*args): return _Freestyle.AdjacencyIterator_AddOccluder(*args)
+    def setSplittingId(*args): return _Freestyle.AdjacencyIterator_setSplittingId(*args)
+    def intersect_2d_area(*args): return _Freestyle.AdjacencyIterator_intersect_2d_area(*args)
+    def include_in_2d_area(*args): return _Freestyle.AdjacencyIterator_include_in_2d_area(*args)
+    def getLength2D(*args): return _Freestyle.AdjacencyIterator_getLength2D(*args)
+    def qi(*args): return _Freestyle.AdjacencyIterator_qi(*args)
+    def occluders_begin(*args): return _Freestyle.AdjacencyIterator_occluders_begin(*args)
+    def occluders_end(*args): return _Freestyle.AdjacencyIterator_occluders_end(*args)
+    def occluders_size(*args): return _Freestyle.AdjacencyIterator_occluders_size(*args)
+    def occluders_empty(*args): return _Freestyle.AdjacencyIterator_occluders_empty(*args)
+    def occludee(*args): return _Freestyle.AdjacencyIterator_occludee(*args)
+    def occluded_shape(*args): return _Freestyle.AdjacencyIterator_occluded_shape(*args)
+    def occludee_empty(*args): return _Freestyle.AdjacencyIterator_occludee_empty(*args)
+    def shape_id(*args): return _Freestyle.AdjacencyIterator_shape_id(*args)
+    def shape(*args): return _Freestyle.AdjacencyIterator_shape(*args)
+    def shape_importance(*args): return _Freestyle.AdjacencyIterator_shape_importance(*args)
+    def verticesBegin(*args): return _Freestyle.AdjacencyIterator_verticesBegin(*args)
+    def verticesEnd(*args): return _Freestyle.AdjacencyIterator_verticesEnd(*args)
+    def pointsBegin(*args): return _Freestyle.AdjacencyIterator_pointsBegin(*args)
+    def pointsEnd(*args): return _Freestyle.AdjacencyIterator_pointsEnd(*args)
+    def getTimeStamp(*args): return _Freestyle.AdjacencyIterator_getTimeStamp(*args)
+    def setTimeStamp(*args): return _Freestyle.AdjacencyIterator_setTimeStamp(*args)
+AdjacencyIterator_swigregister = _Freestyle.AdjacencyIterator_swigregister
+AdjacencyIterator_swigregister(AdjacencyIterator)
+LoadMapCF = _Freestyle.LoadMapCF
+
+class ChainingIterator(ViewEdgeViewEdgeIterator):
+    __swig_setmethods__ = {}
+    for _s in [ViewEdgeViewEdgeIterator]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, ChainingIterator, name, value)
+    __swig_getmethods__ = {}
+    for _s in [ViewEdgeViewEdgeIterator]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, ChainingIterator, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        if self.__class__ == ChainingIterator:
+            args = (None,) + args
+        else:
+            args = (self,) + args
+        this = _Freestyle.new_ChainingIterator(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def getExactTypeName(*args): return _Freestyle.ChainingIterator_getExactTypeName(*args)
+    def init(*args): return _Freestyle.ChainingIterator_init(*args)
+    def traverse(*args): return _Freestyle.ChainingIterator_traverse(*args)
+    def getVertex(*args): return _Freestyle.ChainingIterator_getVertex(*args)
+    def isIncrementing(*args): return _Freestyle.ChainingIterator_isIncrementing(*args)
+    def increment(*args): return _Freestyle.ChainingIterator_increment(*args)
+    def decrement(*args): return _Freestyle.ChainingIterator_decrement(*args)
+    __swig_destroy__ = _Freestyle.delete_ChainingIterator
+    __del__ = lambda self : None;
+    def __disown__(self):
+        self.this.disown()
+        _Freestyle.disown_ChainingIterator(self)
+        return weakref_proxy(self)
+ChainingIterator_swigregister = _Freestyle.ChainingIterator_swigregister
+ChainingIterator_swigregister(ChainingIterator)
+
+class ChainSilhouetteIterator(ChainingIterator):
+    __swig_setmethods__ = {}
+    for _s in [ChainingIterator]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, ChainSilhouetteIterator, name, value)
+    __swig_getmethods__ = {}
+    for _s in [ChainingIterator]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, ChainSilhouetteIterator, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        if self.__class__ == ChainSilhouetteIterator:
+            args = (None,) + args
+        else:
+            args = (self,) + args
+        this = _Freestyle.new_ChainSilhouetteIterator(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def getExactTypeName(*args): return _Freestyle.ChainSilhouetteIterator_getExactTypeName(*args)
+    def traverse(*args): return _Freestyle.ChainSilhouetteIterator_traverse(*args)
+    __swig_destroy__ = _Freestyle.delete_ChainSilhouetteIterator
+    __del__ = lambda self : None;
+    def __disown__(self):
+        self.this.disown()
+        _Freestyle.disown_ChainSilhouetteIterator(self)
+        return weakref_proxy(self)
+ChainSilhouetteIterator_swigregister = _Freestyle.ChainSilhouetteIterator_swigregister
+ChainSilhouetteIterator_swigregister(ChainSilhouetteIterator)
+
+class ChainPredicateIterator(ChainingIterator):
+    __swig_setmethods__ = {}
+    for _s in [ChainingIterator]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, ChainPredicateIterator, name, value)
+    __swig_getmethods__ = {}
+    for _s in [ChainingIterator]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, ChainPredicateIterator, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        if self.__class__ == ChainPredicateIterator:
+            args = (None,) + args
+        else:
+            args = (self,) + args
+        this = _Freestyle.new_ChainPredicateIterator(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_ChainPredicateIterator
+    __del__ = lambda self : None;
+    def getExactTypeName(*args): return _Freestyle.ChainPredicateIterator_getExactTypeName(*args)
+    def traverse(*args): return _Freestyle.ChainPredicateIterator_traverse(*args)
+    def __disown__(self):
+        self.this.disown()
+        _Freestyle.disown_ChainPredicateIterator(self)
+        return weakref_proxy(self)
+ChainPredicateIterator_swigregister = _Freestyle.ChainPredicateIterator_swigregister
+ChainPredicateIterator_swigregister(ChainPredicateIterator)
+
+class UnaryPredicate0D(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, UnaryPredicate0D, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, UnaryPredicate0D, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        if self.__class__ == UnaryPredicate0D:
+            args = (None,) + args
+        else:
+            args = (self,) + args
+        this = _Freestyle.new_UnaryPredicate0D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_UnaryPredicate0D
+    __del__ = lambda self : None;
+    def getName(*args): return _Freestyle.UnaryPredicate0D_getName(*args)
+    def __call__(*args): return _Freestyle.UnaryPredicate0D___call__(*args)
+    def __disown__(self):
+        self.this.disown()
+        _Freestyle.disown_UnaryPredicate0D(self)
+        return weakref_proxy(self)
+UnaryPredicate0D_swigregister = _Freestyle.UnaryPredicate0D_swigregister
+UnaryPredicate0D_swigregister(UnaryPredicate0D)
+
+class BinaryPredicate0D(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, BinaryPredicate0D, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, BinaryPredicate0D, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_BinaryPredicate0D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_BinaryPredicate0D
+    __del__ = lambda self : None;
+    def getName(*args): return _Freestyle.BinaryPredicate0D_getName(*args)
+    def __call__(*args): return _Freestyle.BinaryPredicate0D___call__(*args)
+BinaryPredicate0D_swigregister = _Freestyle.BinaryPredicate0D_swigregister
+BinaryPredicate0D_swigregister(BinaryPredicate0D)
+
+class TrueUP0D(UnaryPredicate0D):
+    __swig_setmethods__ = {}
+    for _s in [UnaryPredicate0D]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, TrueUP0D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryPredicate0D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, TrueUP0D, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_TrueUP0D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def getName(*args): return _Freestyle.TrueUP0D_getName(*args)
+    def __call__(*args): return _Freestyle.TrueUP0D___call__(*args)
+    __swig_destroy__ = _Freestyle.delete_TrueUP0D
+    __del__ = lambda self : None;
+TrueUP0D_swigregister = _Freestyle.TrueUP0D_swigregister
+TrueUP0D_swigregister(TrueUP0D)
+
+class FalseUP0D(UnaryPredicate0D):
+    __swig_setmethods__ = {}
+    for _s in [UnaryPredicate0D]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, FalseUP0D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryPredicate0D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, FalseUP0D, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_FalseUP0D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def getName(*args): return _Freestyle.FalseUP0D_getName(*args)
+    def __call__(*args): return _Freestyle.FalseUP0D___call__(*args)
+    __swig_destroy__ = _Freestyle.delete_FalseUP0D
+    __del__ = lambda self : None;
+FalseUP0D_swigregister = _Freestyle.FalseUP0D_swigregister
+FalseUP0D_swigregister(FalseUP0D)
+
+class UnaryPredicate1D(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, UnaryPredicate1D, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, UnaryPredicate1D, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        if self.__class__ == UnaryPredicate1D:
+            args = (None,) + args
+        else:
+            args = (self,) + args
+        this = _Freestyle.new_UnaryPredicate1D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_UnaryPredicate1D
+    __del__ = lambda self : None;
+    def getName(*args): return _Freestyle.UnaryPredicate1D_getName(*args)
+    def __call__(*args): return _Freestyle.UnaryPredicate1D___call__(*args)
+    def __disown__(self):
+        self.this.disown()
+        _Freestyle.disown_UnaryPredicate1D(self)
+        return weakref_proxy(self)
+UnaryPredicate1D_swigregister = _Freestyle.UnaryPredicate1D_swigregister
+UnaryPredicate1D_swigregister(UnaryPredicate1D)
+
+class BinaryPredicate1D(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, BinaryPredicate1D, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, BinaryPredicate1D, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        if self.__class__ == BinaryPredicate1D:
+            args = (None,) + args
+        else:
+            args = (self,) + args
+        this = _Freestyle.new_BinaryPredicate1D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_BinaryPredicate1D
+    __del__ = lambda self : None;
+    def getName(*args): return _Freestyle.BinaryPredicate1D_getName(*args)
+    def __call__(*args): return _Freestyle.BinaryPredicate1D___call__(*args)
+    def __disown__(self):
+        self.this.disown()
+        _Freestyle.disown_BinaryPredicate1D(self)
+        return weakref_proxy(self)
+BinaryPredicate1D_swigregister = _Freestyle.BinaryPredicate1D_swigregister
+BinaryPredicate1D_swigregister(BinaryPredicate1D)
+
+class TrueUP1D(UnaryPredicate1D):
+    __swig_setmethods__ = {}
+    for _s in [UnaryPredicate1D]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, TrueUP1D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryPredicate1D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, TrueUP1D, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_TrueUP1D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def getName(*args): return _Freestyle.TrueUP1D_getName(*args)
+    def __call__(*args): return _Freestyle.TrueUP1D___call__(*args)
+    __swig_destroy__ = _Freestyle.delete_TrueUP1D
+    __del__ = lambda self : None;
+TrueUP1D_swigregister = _Freestyle.TrueUP1D_swigregister
+TrueUP1D_swigregister(TrueUP1D)
+
+class FalseUP1D(UnaryPredicate1D):
+    __swig_setmethods__ = {}
+    for _s in [UnaryPredicate1D]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, FalseUP1D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryPredicate1D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, FalseUP1D, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_FalseUP1D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def getName(*args): return _Freestyle.FalseUP1D_getName(*args)
+    def __call__(*args): return _Freestyle.FalseUP1D___call__(*args)
+    __swig_destroy__ = _Freestyle.delete_FalseUP1D
+    __del__ = lambda self : None;
+FalseUP1D_swigregister = _Freestyle.FalseUP1D_swigregister
+FalseUP1D_swigregister(FalseUP1D)
+
+class QuantitativeInvisibilityUP1D(UnaryPredicate1D):
+    __swig_setmethods__ = {}
+    for _s in [UnaryPredicate1D]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, QuantitativeInvisibilityUP1D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryPredicate1D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, QuantitativeInvisibilityUP1D, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_QuantitativeInvisibilityUP1D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def getName(*args): return _Freestyle.QuantitativeInvisibilityUP1D_getName(*args)
+    def __call__(*args): return _Freestyle.QuantitativeInvisibilityUP1D___call__(*args)
+    __swig_destroy__ = _Freestyle.delete_QuantitativeInvisibilityUP1D
+    __del__ = lambda self : None;
+QuantitativeInvisibilityUP1D_swigregister = _Freestyle.QuantitativeInvisibilityUP1D_swigregister
+QuantitativeInvisibilityUP1D_swigregister(QuantitativeInvisibilityUP1D)
+
+class ContourUP1D(UnaryPredicate1D):
+    __swig_setmethods__ = {}
+    for _s in [UnaryPredicate1D]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, ContourUP1D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryPredicate1D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, ContourUP1D, name)
+    __repr__ = _swig_repr
+    def getName(*args): return _Freestyle.ContourUP1D_getName(*args)
+    def __call__(*args): return _Freestyle.ContourUP1D___call__(*args)
+    def __init__(self, *args): 
+        this = _Freestyle.new_ContourUP1D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_ContourUP1D
+    __del__ = lambda self : None;
+ContourUP1D_swigregister = _Freestyle.ContourUP1D_swigregister
+ContourUP1D_swigregister(ContourUP1D)
+
+class ExternalContourUP1D(UnaryPredicate1D):
+    __swig_setmethods__ = {}
+    for _s in [UnaryPredicate1D]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, ExternalContourUP1D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryPredicate1D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, ExternalContourUP1D, name)
+    __repr__ = _swig_repr
+    def getName(*args): return _Freestyle.ExternalContourUP1D_getName(*args)
+    def __call__(*args): return _Freestyle.ExternalContourUP1D___call__(*args)
+    def __init__(self, *args): 
+        this = _Freestyle.new_ExternalContourUP1D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_ExternalContourUP1D
+    __del__ = lambda self : None;
+ExternalContourUP1D_swigregister = _Freestyle.ExternalContourUP1D_swigregister
+ExternalContourUP1D_swigregister(ExternalContourUP1D)
+
+class EqualToTimeStampUP1D(UnaryPredicate1D):
+    __swig_setmethods__ = {}
+    for _s in [UnaryPredicate1D]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, EqualToTimeStampUP1D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryPredicate1D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, EqualToTimeStampUP1D, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_EqualToTimeStampUP1D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def getName(*args): return _Freestyle.EqualToTimeStampUP1D_getName(*args)
+    def __call__(*args): return _Freestyle.EqualToTimeStampUP1D___call__(*args)
+    __swig_destroy__ = _Freestyle.delete_EqualToTimeStampUP1D
+    __del__ = lambda self : None;
+EqualToTimeStampUP1D_swigregister = _Freestyle.EqualToTimeStampUP1D_swigregister
+EqualToTimeStampUP1D_swigregister(EqualToTimeStampUP1D)
+
+class EqualToChainingTimeStampUP1D(UnaryPredicate1D):
+    __swig_setmethods__ = {}
+    for _s in [UnaryPredicate1D]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, EqualToChainingTimeStampUP1D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryPredicate1D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, EqualToChainingTimeStampUP1D, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_EqualToChainingTimeStampUP1D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def getName(*args): return _Freestyle.EqualToChainingTimeStampUP1D_getName(*args)
+    def __call__(*args): return _Freestyle.EqualToChainingTimeStampUP1D___call__(*args)
+    __swig_destroy__ = _Freestyle.delete_EqualToChainingTimeStampUP1D
+    __del__ = lambda self : None;
+EqualToChainingTimeStampUP1D_swigregister = _Freestyle.EqualToChainingTimeStampUP1D_swigregister
+EqualToChainingTimeStampUP1D_swigregister(EqualToChainingTimeStampUP1D)
+
+class ShapeUP1D(UnaryPredicate1D):
+    __swig_setmethods__ = {}
+    for _s in [UnaryPredicate1D]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, ShapeUP1D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryPredicate1D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, ShapeUP1D, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_ShapeUP1D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def getName(*args): return _Freestyle.ShapeUP1D_getName(*args)
+    def __call__(*args): return _Freestyle.ShapeUP1D___call__(*args)
+    __swig_destroy__ = _Freestyle.delete_ShapeUP1D
+    __del__ = lambda self : None;
+ShapeUP1D_swigregister = _Freestyle.ShapeUP1D_swigregister
+ShapeUP1D_swigregister(ShapeUP1D)
+
+class TrueBP1D(BinaryPredicate1D):
+    __swig_setmethods__ = {}
+    for _s in [BinaryPredicate1D]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, TrueBP1D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [BinaryPredicate1D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, TrueBP1D, name)
+    __repr__ = _swig_repr
+    def getName(*args): return _Freestyle.TrueBP1D_getName(*args)
+    def __call__(*args): return _Freestyle.TrueBP1D___call__(*args)
+    def __init__(self, *args): 
+        this = _Freestyle.new_TrueBP1D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_TrueBP1D
+    __del__ = lambda self : None;
+TrueBP1D_swigregister = _Freestyle.TrueBP1D_swigregister
+TrueBP1D_swigregister(TrueBP1D)
+
+class FalseBP1D(BinaryPredicate1D):
+    __swig_setmethods__ = {}
+    for _s in [BinaryPredicate1D]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, FalseBP1D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [BinaryPredicate1D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, FalseBP1D, name)
+    __repr__ = _swig_repr
+    def getName(*args): return _Freestyle.FalseBP1D_getName(*args)
+    def __call__(*args): return _Freestyle.FalseBP1D___call__(*args)
+    def __init__(self, *args): 
+        this = _Freestyle.new_FalseBP1D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_FalseBP1D
+    __del__ = lambda self : None;
+FalseBP1D_swigregister = _Freestyle.FalseBP1D_swigregister
+FalseBP1D_swigregister(FalseBP1D)
+
+class Length2DBP1D(BinaryPredicate1D):
+    __swig_setmethods__ = {}
+    for _s in [BinaryPredicate1D]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, Length2DBP1D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [BinaryPredicate1D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, Length2DBP1D, name)
+    __repr__ = _swig_repr
+    def getName(*args): return _Freestyle.Length2DBP1D_getName(*args)
+    def __call__(*args): return _Freestyle.Length2DBP1D___call__(*args)
+    def __init__(self, *args): 
+        this = _Freestyle.new_Length2DBP1D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_Length2DBP1D
+    __del__ = lambda self : None;
+Length2DBP1D_swigregister = _Freestyle.Length2DBP1D_swigregister
+Length2DBP1D_swigregister(Length2DBP1D)
+
+class SameShapeIdBP1D(BinaryPredicate1D):
+    __swig_setmethods__ = {}
+    for _s in [BinaryPredicate1D]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, SameShapeIdBP1D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [BinaryPredicate1D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, SameShapeIdBP1D, name)
+    __repr__ = _swig_repr
+    def getName(*args): return _Freestyle.SameShapeIdBP1D_getName(*args)
+    def __call__(*args): return _Freestyle.SameShapeIdBP1D___call__(*args)
+    def __init__(self, *args): 
+        this = _Freestyle.new_SameShapeIdBP1D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_SameShapeIdBP1D
+    __del__ = lambda self : None;
+SameShapeIdBP1D_swigregister = _Freestyle.SameShapeIdBP1D_swigregister
+SameShapeIdBP1D_swigregister(SameShapeIdBP1D)
+
+class ViewMapGradientNormBP1D(BinaryPredicate1D):
+    __swig_setmethods__ = {}
+    for _s in [BinaryPredicate1D]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, ViewMapGradientNormBP1D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [BinaryPredicate1D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, ViewMapGradientNormBP1D, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_ViewMapGradientNormBP1D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def getName(*args): return _Freestyle.ViewMapGradientNormBP1D_getName(*args)
+    def __call__(*args): return _Freestyle.ViewMapGradientNormBP1D___call__(*args)
+    __swig_destroy__ = _Freestyle.delete_ViewMapGradientNormBP1D
+    __del__ = lambda self : None;
+ViewMapGradientNormBP1D_swigregister = _Freestyle.ViewMapGradientNormBP1D_swigregister
+ViewMapGradientNormBP1D_swigregister(ViewMapGradientNormBP1D)
+
+class DensityLowerThanUP1D(UnaryPredicate1D):
+    __swig_setmethods__ = {}
+    for _s in [UnaryPredicate1D]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, DensityLowerThanUP1D, name, value)
+    __swig_getmethods__ = {}
+    for _s in [UnaryPredicate1D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, DensityLowerThanUP1D, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_DensityLowerThanUP1D(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def getName(*args): return _Freestyle.DensityLowerThanUP1D_getName(*args)
+    def __call__(*args): return _Freestyle.DensityLowerThanUP1D___call__(*args)
+    __swig_destroy__ = _Freestyle.delete_DensityLowerThanUP1D
+    __del__ = lambda self : None;
+DensityLowerThanUP1D_swigregister = _Freestyle.DensityLowerThanUP1D_swigregister
+DensityLowerThanUP1D_swigregister(DensityLowerThanUP1D)
+
+class CurvePointIterator(Interface0DIteratorNested):
+    __swig_setmethods__ = {}
+    for _s in [Interface0DIteratorNested]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, CurvePointIterator, name, value)
+    __swig_getmethods__ = {}
+    for _s in [Interface0DIteratorNested]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, CurvePointIterator, name)
+    __repr__ = _swig_repr
+    __swig_setmethods__["_CurvilinearLength"] = _Freestyle.CurvePointIterator__CurvilinearLength_set
+    __swig_getmethods__["_CurvilinearLength"] = _Freestyle.CurvePointIterator__CurvilinearLength_get
+    if _newclass:_CurvilinearLength = _swig_property(_Freestyle.CurvePointIterator__CurvilinearLength_get, _Freestyle.CurvePointIterator__CurvilinearLength_set)
+    __swig_setmethods__["_step"] = _Freestyle.CurvePointIterator__step_set
+    __swig_getmethods__["_step"] = _Freestyle.CurvePointIterator__step_get
+    if _newclass:_step = _swig_property(_Freestyle.CurvePointIterator__step_get, _Freestyle.CurvePointIterator__step_set)
+    __swig_setmethods__["__A"] = _Freestyle.CurvePointIterator___A_set
+    __swig_getmethods__["__A"] = _Freestyle.CurvePointIterator___A_get
+    if _newclass:__A = _swig_property(_Freestyle.CurvePointIterator___A_get, _Freestyle.CurvePointIterator___A_set)
+    __swig_setmethods__["__B"] = _Freestyle.CurvePointIterator___B_set
+    __swig_getmethods__["__B"] = _Freestyle.CurvePointIterator___B_get
+    if _newclass:__B = _swig_property(_Freestyle.CurvePointIterator___B_get, _Freestyle.CurvePointIterator___B_set)
+    __swig_setmethods__["_begin"] = _Freestyle.CurvePointIterator__begin_set
+    __swig_getmethods__["_begin"] = _Freestyle.CurvePointIterator__begin_get
+    if _newclass:_begin = _swig_property(_Freestyle.CurvePointIterator__begin_get, _Freestyle.CurvePointIterator__begin_set)
+    __swig_setmethods__["_end"] = _Freestyle.CurvePointIterator__end_set
+    __swig_getmethods__["_end"] = _Freestyle.CurvePointIterator__end_get
+    if _newclass:_end = _swig_property(_Freestyle.CurvePointIterator__end_get, _Freestyle.CurvePointIterator__end_set)
+    __swig_setmethods__["_n"] = _Freestyle.CurvePointIterator__n_set
+    __swig_getmethods__["_n"] = _Freestyle.CurvePointIterator__n_get
+    if _newclass:_n = _swig_property(_Freestyle.CurvePointIterator__n_get, _Freestyle.CurvePointIterator__n_set)
+    __swig_setmethods__["_currentn"] = _Freestyle.CurvePointIterator__currentn_set
+    __swig_getmethods__["_currentn"] = _Freestyle.CurvePointIterator__currentn_get
+    if _newclass:_currentn = _swig_property(_Freestyle.CurvePointIterator__currentn_get, _Freestyle.CurvePointIterator__currentn_set)
+    __swig_setmethods__["_t"] = _Freestyle.CurvePointIterator__t_set
+    __swig_getmethods__["_t"] = _Freestyle.CurvePointIterator__t_get
+    if _newclass:_t = _swig_property(_Freestyle.CurvePointIterator__t_get, _Freestyle.CurvePointIterator__t_set)
+    __swig_setmethods__["_Point"] = _Freestyle.CurvePointIterator__Point_set
+    __swig_getmethods__["_Point"] = _Freestyle.CurvePointIterator__Point_get
+    if _newclass:_Point = _swig_property(_Freestyle.CurvePointIterator__Point_get, _Freestyle.CurvePointIterator__Point_set)
+    __swig_setmethods__["_CurveLength"] = _Freestyle.CurvePointIterator__CurveLength_set
+    __swig_getmethods__["_CurveLength"] = _Freestyle.CurvePointIterator__CurveLength_get
+    if _newclass:_CurveLength = _swig_property(_Freestyle.CurvePointIterator__CurveLength_get, _Freestyle.CurvePointIterator__CurveLength_set)
+    def __init__(self, *args): 
+        this = _Freestyle.new_CurvePointIterator(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_CurvePointIterator
+    __del__ = lambda self : None;
+    def copy(*args): return _Freestyle.CurvePointIterator_copy(*args)
+    def CastToInterface0DIterator(*args): return _Freestyle.CurvePointIterator_CastToInterface0DIterator(*args)
+    def getExactTypeName(*args): return _Freestyle.CurvePointIterator_getExactTypeName(*args)
+    def __eq__(*args): return _Freestyle.CurvePointIterator___eq__(*args)
+    def getObject(*args): return _Freestyle.CurvePointIterator_getObject(*args)
+    def __deref__(*args): return _Freestyle.CurvePointIterator___deref__(*args)
+    def isBegin(*args): return _Freestyle.CurvePointIterator_isBegin(*args)
+    def isEnd(*args): return _Freestyle.CurvePointIterator_isEnd(*args)
+    def getX(*args): return _Freestyle.CurvePointIterator_getX(*args)
+    def getY(*args): return _Freestyle.CurvePointIterator_getY(*args)
+    def getZ(*args): return _Freestyle.CurvePointIterator_getZ(*args)
+    def getPoint3D(*args): return _Freestyle.CurvePointIterator_getPoint3D(*args)
+    def getProjectedX(*args): return _Freestyle.CurvePointIterator_getProjectedX(*args)
+    def getProjectedY(*args): return _Freestyle.CurvePointIterator_getProjectedY(*args)
+    def getProjectedZ(*args): return _Freestyle.CurvePointIterator_getProjectedZ(*args)
+    def getPoint2D(*args): return _Freestyle.CurvePointIterator_getPoint2D(*args)
+    def getFEdge(*args): return _Freestyle.CurvePointIterator_getFEdge(*args)
+    def getId(*args): return _Freestyle.CurvePointIterator_getId(*args)
+    def getNature(*args): return _Freestyle.CurvePointIterator_getNature(*args)
+    def castToSVertex(*args): return _Freestyle.CurvePointIterator_castToSVertex(*args)
+    def castToViewVertex(*args): return _Freestyle.CurvePointIterator_castToViewVertex(*args)
+    def castToNonTVertex(*args): return _Freestyle.CurvePointIterator_castToNonTVertex(*args)
+    def castToTVertex(*args): return _Freestyle.CurvePointIterator_castToTVertex(*args)
+    def A(*args): return _Freestyle.CurvePointIterator_A(*args)
+    def B(*args): return _Freestyle.CurvePointIterator_B(*args)
+    def t2d(*args): return _Freestyle.CurvePointIterator_t2d(*args)
+    def SetA(*args): return _Freestyle.CurvePointIterator_SetA(*args)
+    def SetB(*args): return _Freestyle.CurvePointIterator_SetB(*args)
+    def SetT2d(*args): return _Freestyle.CurvePointIterator_SetT2d(*args)
+    def fedge(*args): return _Freestyle.CurvePointIterator_fedge(*args)
+    def point2d(*args): return _Freestyle.CurvePointIterator_point2d(*args)
+    def point3d(*args): return _Freestyle.CurvePointIterator_point3d(*args)
+    def normal(*args): return _Freestyle.CurvePointIterator_normal(*args)
+    def shape(*args): return _Freestyle.CurvePointIterator_shape(*args)
+    def occluders_begin(*args): return _Freestyle.CurvePointIterator_occluders_begin(*args)
+    def occluders_end(*args): return _Freestyle.CurvePointIterator_occluders_end(*args)
+    def occluders_empty(*args): return _Freestyle.CurvePointIterator_occluders_empty(*args)
+    def occluders_size(*args): return _Freestyle.CurvePointIterator_occluders_size(*args)
+    def occludee(*args): return _Freestyle.CurvePointIterator_occludee(*args)
+    def occluded_shape(*args): return _Freestyle.CurvePointIterator_occluded_shape(*args)
+    def occludee_empty(*args): return _Freestyle.CurvePointIterator_occludee_empty(*args)
+    def z_discontinuity(*args): return _Freestyle.CurvePointIterator_z_discontinuity(*args)
+    def curvatureFredo(*args): return _Freestyle.CurvePointIterator_curvatureFredo(*args)
+    def directionFredo(*args): return _Freestyle.CurvePointIterator_directionFredo(*args)
+CurvePointIterator_swigregister = _Freestyle.CurvePointIterator_swigregister
+CurvePointIterator_swigregister(CurvePointIterator)
+
+class CurvePoint(Interface0D):
+    __swig_setmethods__ = {}
+    for _s in [Interface0D]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, CurvePoint, name, value)
+    __swig_getmethods__ = {}
+    for _s in [Interface0D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, CurvePoint, name)
+    __repr__ = _swig_repr
+    def getExactTypeName(*args): return _Freestyle.CurvePoint_getExactTypeName(*args)
+    def getX(*args): return _Freestyle.CurvePoint_getX(*args)
+    def getY(*args): return _Freestyle.CurvePoint_getY(*args)
+    def getZ(*args): return _Freestyle.CurvePoint_getZ(*args)
+    def getPoint3D(*args): return _Freestyle.CurvePoint_getPoint3D(*args)
+    def getProjectedX(*args): return _Freestyle.CurvePoint_getProjectedX(*args)
+    def getProjectedY(*args): return _Freestyle.CurvePoint_getProjectedY(*args)
+    def getProjectedZ(*args): return _Freestyle.CurvePoint_getProjectedZ(*args)
+    def getPoint2D(*args): return _Freestyle.CurvePoint_getPoint2D(*args)
+    def getFEdge(*args): return _Freestyle.CurvePoint_getFEdge(*args)
+    def getId(*args): return _Freestyle.CurvePoint_getId(*args)
+    def getNature(*args): return _Freestyle.CurvePoint_getNature(*args)
+    def castToSVertex(*args): return _Freestyle.CurvePoint_castToSVertex(*args)
+    def castToViewVertex(*args): return _Freestyle.CurvePoint_castToViewVertex(*args)
+    def castToNonTVertex(*args): return _Freestyle.CurvePoint_castToNonTVertex(*args)
+    def castToTVertex(*args): return _Freestyle.CurvePoint_castToTVertex(*args)
+    def __init__(self, *args): 
+        this = _Freestyle.new_CurvePoint(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_CurvePoint
+    __del__ = lambda self : None;
+    def __eq__(*args): return _Freestyle.CurvePoint___eq__(*args)
+    def A(*args): return _Freestyle.CurvePoint_A(*args)
+    def B(*args): return _Freestyle.CurvePoint_B(*args)
+    def t2d(*args): return _Freestyle.CurvePoint_t2d(*args)
+    def SetA(*args): return _Freestyle.CurvePoint_SetA(*args)
+    def SetB(*args): return _Freestyle.CurvePoint_SetB(*args)
+    def SetT2d(*args): return _Freestyle.CurvePoint_SetT2d(*args)
+    def fedge(*args): return _Freestyle.CurvePoint_fedge(*args)
+    def point2d(*args): return _Freestyle.CurvePoint_point2d(*args)
+    def point3d(*args): return _Freestyle.CurvePoint_point3d(*args)
+    def normal(*args): return _Freestyle.CurvePoint_normal(*args)
+    def shape(*args): return _Freestyle.CurvePoint_shape(*args)
+    def occluders_begin(*args): return _Freestyle.CurvePoint_occluders_begin(*args)
+    def occluders_end(*args): return _Freestyle.CurvePoint_occluders_end(*args)
+    def occluders_empty(*args): return _Freestyle.CurvePoint_occluders_empty(*args)
+    def occluders_size(*args): return _Freestyle.CurvePoint_occluders_size(*args)
+    def occludee(*args): return _Freestyle.CurvePoint_occludee(*args)
+    def occluded_shape(*args): return _Freestyle.CurvePoint_occluded_shape(*args)
+    def occludee_empty(*args): return _Freestyle.CurvePoint_occludee_empty(*args)
+    def z_discontinuity(*args): return _Freestyle.CurvePoint_z_discontinuity(*args)
+    def curvatureFredo(*args): return _Freestyle.CurvePoint_curvatureFredo(*args)
+    def directionFredo(*args): return _Freestyle.CurvePoint_directionFredo(*args)
+CurvePoint_swigregister = _Freestyle.CurvePoint_swigregister
+CurvePoint_swigregister(CurvePoint)
+
+class Curve(Interface1D):
+    __swig_setmethods__ = {}
+    for _s in [Interface1D]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, Curve, name, value)
+    __swig_getmethods__ = {}
+    for _s in [Interface1D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, Curve, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_Curve(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_Curve
+    __del__ = lambda self : None;
+    def computeCurvatureAndOrientation(*args): return _Freestyle.Curve_computeCurvatureAndOrientation(*args)
+    def push_vertex_back(*args): return _Freestyle.Curve_push_vertex_back(*args)
+    def push_vertex_front(*args): return _Freestyle.Curve_push_vertex_front(*args)
+    def empty(*args): return _Freestyle.Curve_empty(*args)
+    def getLength2D(*args): return _Freestyle.Curve_getLength2D(*args)
+    def getId(*args): return _Freestyle.Curve_getId(*args)
+    def nSegments(*args): return _Freestyle.Curve_nSegments(*args)
+    def setId(*args): return _Freestyle.Curve_setId(*args)
+    def curvePointsBegin(*args): return _Freestyle.Curve_curvePointsBegin(*args)
+    def curvePointsEnd(*args): return _Freestyle.Curve_curvePointsEnd(*args)
+    def curveVerticesBegin(*args): return _Freestyle.Curve_curveVerticesBegin(*args)
+    def curveVerticesEnd(*args): return _Freestyle.Curve_curveVerticesEnd(*args)
+    def verticesBegin(*args): return _Freestyle.Curve_verticesBegin(*args)
+    def verticesEnd(*args): return _Freestyle.Curve_verticesEnd(*args)
+    def pointsBegin(*args): return _Freestyle.Curve_pointsBegin(*args)
+    def pointsEnd(*args): return _Freestyle.Curve_pointsEnd(*args)
+Curve_swigregister = _Freestyle.Curve_swigregister
+Curve_swigregister(Curve)
+
+class StrokeVertexIterator(Interface0DIteratorNested):
+    __swig_setmethods__ = {}
+    for _s in [Interface0DIteratorNested]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, StrokeVertexIterator, name, value)
+    __swig_getmethods__ = {}
+    for _s in [Interface0DIteratorNested]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, StrokeVertexIterator, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_StrokeVertexIterator(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_StrokeVertexIterator
+    __del__ = lambda self : None;
+    def castToInterface0DIterator(*args): return _Freestyle.StrokeVertexIterator_castToInterface0DIterator(*args)
+    def getExactTypeName(*args): return _Freestyle.StrokeVertexIterator_getExactTypeName(*args)
+    def getObject(*args): return _Freestyle.StrokeVertexIterator_getObject(*args)
+    def __deref__(*args): return _Freestyle.StrokeVertexIterator___deref__(*args)
+    def increment(*args): return _Freestyle.StrokeVertexIterator_increment(*args)
+    def decrement(*args): return _Freestyle.StrokeVertexIterator_decrement(*args)
+    def isBegin(*args): return _Freestyle.StrokeVertexIterator_isBegin(*args)
+    def isEnd(*args): return _Freestyle.StrokeVertexIterator_isEnd(*args)
+    def __eq__(*args): return _Freestyle.StrokeVertexIterator___eq__(*args)
+    def t(*args): return _Freestyle.StrokeVertexIterator_t(*args)
+    def u(*args): return _Freestyle.StrokeVertexIterator_u(*args)
+    def copy(*args): return _Freestyle.StrokeVertexIterator_copy(*args)
+    def getIt(*args): return _Freestyle.StrokeVertexIterator_getIt(*args)
+    def x(*args): return _Freestyle.StrokeVertexIterator_x(*args)
+    def y(*args): return _Freestyle.StrokeVertexIterator_y(*args)
+    def getPoint(*args): return _Freestyle.StrokeVertexIterator_getPoint(*args)
+    def attribute(*args): return _Freestyle.StrokeVertexIterator_attribute(*args)
+    def curvilinearAbscissa(*args): return _Freestyle.StrokeVertexIterator_curvilinearAbscissa(*args)
+    def strokeLength(*args): return _Freestyle.StrokeVertexIterator_strokeLength(*args)
+    def SetX(*args): return _Freestyle.StrokeVertexIterator_SetX(*args)
+    def SetY(*args): return _Freestyle.StrokeVertexIterator_SetY(*args)
+    def SetPoint(*args): return _Freestyle.StrokeVertexIterator_SetPoint(*args)
+    def SetAttribute(*args): return _Freestyle.StrokeVertexIterator_SetAttribute(*args)
+    def SetCurvilinearAbscissa(*args): return _Freestyle.StrokeVertexIterator_SetCurvilinearAbscissa(*args)
+    def SetStrokeLength(*args): return _Freestyle.StrokeVertexIterator_SetStrokeLength(*args)
+    def getX(*args): return _Freestyle.StrokeVertexIterator_getX(*args)
+    def getY(*args): return _Freestyle.StrokeVertexIterator_getY(*args)
+    def getZ(*args): return _Freestyle.StrokeVertexIterator_getZ(*args)
+    def getPoint3D(*args): return _Freestyle.StrokeVertexIterator_getPoint3D(*args)
+    def getProjectedX(*args): return _Freestyle.StrokeVertexIterator_getProjectedX(*args)
+    def getProjectedY(*args): return _Freestyle.StrokeVertexIterator_getProjectedY(*args)
+    def getProjectedZ(*args): return _Freestyle.StrokeVertexIterator_getProjectedZ(*args)
+    def getPoint2D(*args): return _Freestyle.StrokeVertexIterator_getPoint2D(*args)
+    def getFEdge(*args): return _Freestyle.StrokeVertexIterator_getFEdge(*args)
+    def getId(*args): return _Freestyle.StrokeVertexIterator_getId(*args)
+    def getNature(*args): return _Freestyle.StrokeVertexIterator_getNature(*args)
+    def castToSVertex(*args): return _Freestyle.StrokeVertexIterator_castToSVertex(*args)
+    def castToViewVertex(*args): return _Freestyle.StrokeVertexIterator_castToViewVertex(*args)
+    def castToNonTVertex(*args): return _Freestyle.StrokeVertexIterator_castToNonTVertex(*args)
+    def castToTVertex(*args): return _Freestyle.StrokeVertexIterator_castToTVertex(*args)
+    def A(*args): return _Freestyle.StrokeVertexIterator_A(*args)
+    def B(*args): return _Freestyle.StrokeVertexIterator_B(*args)
+    def t2d(*args): return _Freestyle.StrokeVertexIterator_t2d(*args)
+    def SetA(*args): return _Freestyle.StrokeVertexIterator_SetA(*args)
+    def SetB(*args): return _Freestyle.StrokeVertexIterator_SetB(*args)
+    def SetT2d(*args): return _Freestyle.StrokeVertexIterator_SetT2d(*args)
+    def fedge(*args): return _Freestyle.StrokeVertexIterator_fedge(*args)
+    def point2d(*args): return _Freestyle.StrokeVertexIterator_point2d(*args)
+    def point3d(*args): return _Freestyle.StrokeVertexIterator_point3d(*args)
+    def normal(*args): return _Freestyle.StrokeVertexIterator_normal(*args)
+    def shape(*args): return _Freestyle.StrokeVertexIterator_shape(*args)
+    def occluders_begin(*args): return _Freestyle.StrokeVertexIterator_occluders_begin(*args)
+    def occluders_end(*args): return _Freestyle.StrokeVertexIterator_occluders_end(*args)
+    def occluders_empty(*args): return _Freestyle.StrokeVertexIterator_occluders_empty(*args)
+    def occluders_size(*args): return _Freestyle.StrokeVertexIterator_occluders_size(*args)
+    def occludee(*args): return _Freestyle.StrokeVertexIterator_occludee(*args)
+    def occluded_shape(*args): return _Freestyle.StrokeVertexIterator_occluded_shape(*args)
+    def occludee_empty(*args): return _Freestyle.StrokeVertexIterator_occludee_empty(*args)
+    def z_discontinuity(*args): return _Freestyle.StrokeVertexIterator_z_discontinuity(*args)
+    def curvatureFredo(*args): return _Freestyle.StrokeVertexIterator_curvatureFredo(*args)
+    def directionFredo(*args): return _Freestyle.StrokeVertexIterator_directionFredo(*args)
+StrokeVertexIterator_swigregister = _Freestyle.StrokeVertexIterator_swigregister
+StrokeVertexIterator_swigregister(StrokeVertexIterator)
+
+class StrokeAttribute(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, StrokeAttribute, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, StrokeAttribute, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_StrokeAttribute(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_StrokeAttribute
+    __del__ = lambda self : None;
+    def getColor(*args): return _Freestyle.StrokeAttribute_getColor(*args)
+    def getColorR(*args): return _Freestyle.StrokeAttribute_getColorR(*args)
+    def getColorG(*args): return _Freestyle.StrokeAttribute_getColorG(*args)
+    def getColorB(*args): return _Freestyle.StrokeAttribute_getColorB(*args)
+    def getColorRGB(*args): return _Freestyle.StrokeAttribute_getColorRGB(*args)
+    def getAlpha(*args): return _Freestyle.StrokeAttribute_getAlpha(*args)
+    def getThickness(*args): return _Freestyle.StrokeAttribute_getThickness(*args)
+    def getThicknessR(*args): return _Freestyle.StrokeAttribute_getThicknessR(*args)
+    def getThicknessL(*args): return _Freestyle.StrokeAttribute_getThicknessL(*args)
+    def getThicknessRL(*args): return _Freestyle.StrokeAttribute_getThicknessRL(*args)
+    def isVisible(*args): return _Freestyle.StrokeAttribute_isVisible(*args)
+    def getAttributeReal(*args): return _Freestyle.StrokeAttribute_getAttributeReal(*args)
+    def getAttributeVec2f(*args): return _Freestyle.StrokeAttribute_getAttributeVec2f(*args)
+    def getAttributeVec3f(*args): return _Freestyle.StrokeAttribute_getAttributeVec3f(*args)
+    def isAttributeAvailableReal(*args): return _Freestyle.StrokeAttribute_isAttributeAvailableReal(*args)
+    def isAttributeAvailableVec2f(*args): return _Freestyle.StrokeAttribute_isAttributeAvailableVec2f(*args)
+    def isAttributeAvailableVec3f(*args): return _Freestyle.StrokeAttribute_isAttributeAvailableVec3f(*args)
+    def setColor(*args): return _Freestyle.StrokeAttribute_setColor(*args)
+    def setAlpha(*args): return _Freestyle.StrokeAttribute_setAlpha(*args)
+    def setThickness(*args): return _Freestyle.StrokeAttribute_setThickness(*args)
+    def SetVisible(*args): return _Freestyle.StrokeAttribute_SetVisible(*args)
+    def setAttributeReal(*args): return _Freestyle.StrokeAttribute_setAttributeReal(*args)
+    def setAttributeVec2f(*args): return _Freestyle.StrokeAttribute_setAttributeVec2f(*args)
+    def setAttributeVec3f(*args): return _Freestyle.StrokeAttribute_setAttributeVec3f(*args)
+StrokeAttribute_swigregister = _Freestyle.StrokeAttribute_swigregister
+StrokeAttribute_swigregister(StrokeAttribute)
+
+class StrokeVertex(CurvePoint):
+    __swig_setmethods__ = {}
+    for _s in [CurvePoint]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, StrokeVertex, name, value)
+    __swig_getmethods__ = {}
+    for _s in [CurvePoint]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, StrokeVertex, name)
+    __repr__ = _swig_repr
+    def getExactTypeName(*args): return _Freestyle.StrokeVertex_getExactTypeName(*args)
+    def __init__(self, *args): 
+        this = _Freestyle.new_StrokeVertex(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_StrokeVertex
+    __del__ = lambda self : None;
+    def x(*args): return _Freestyle.StrokeVertex_x(*args)
+    def y(*args): return _Freestyle.StrokeVertex_y(*args)
+    def getPoint(*args): return _Freestyle.StrokeVertex_getPoint(*args)
+    def attribute(*args): return _Freestyle.StrokeVertex_attribute(*args)
+    def curvilinearAbscissa(*args): return _Freestyle.StrokeVertex_curvilinearAbscissa(*args)
+    def strokeLength(*args): return _Freestyle.StrokeVertex_strokeLength(*args)
+    def u(*args): return _Freestyle.StrokeVertex_u(*args)
+    def SetX(*args): return _Freestyle.StrokeVertex_SetX(*args)
+    def SetY(*args): return _Freestyle.StrokeVertex_SetY(*args)
+    def SetPoint(*args): return _Freestyle.StrokeVertex_SetPoint(*args)
+    def SetAttribute(*args): return _Freestyle.StrokeVertex_SetAttribute(*args)
+    def SetCurvilinearAbscissa(*args): return _Freestyle.StrokeVertex_SetCurvilinearAbscissa(*args)
+    def SetStrokeLength(*args): return _Freestyle.StrokeVertex_SetStrokeLength(*args)
+StrokeVertex_swigregister = _Freestyle.StrokeVertex_swigregister
+StrokeVertex_swigregister(StrokeVertex)
+
+class Stroke(Interface1D):
+    __swig_setmethods__ = {}
+    for _s in [Interface1D]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, Stroke, name, value)
+    __swig_getmethods__ = {}
+    for _s in [Interface1D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, Stroke, name)
+    __repr__ = _swig_repr
+    def getExactTypeName(*args): return _Freestyle.Stroke_getExactTypeName(*args)
+    def getId(*args): return _Freestyle.Stroke_getId(*args)
+    DRY_MEDIUM = _Freestyle.Stroke_DRY_MEDIUM
+    HUMID_MEDIUM = _Freestyle.Stroke_HUMID_MEDIUM
+    OPAQUE_MEDIUM = _Freestyle.Stroke_OPAQUE_MEDIUM
+    def __init__(self, *args): 
+        this = _Freestyle.new_Stroke(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_Stroke
+    __del__ = lambda self : None;
+    def ComputeSampling(*args): return _Freestyle.Stroke_ComputeSampling(*args)
+    def Resample(*args): return _Freestyle.Stroke_Resample(*args)
+    def RemoveVertex(*args): return _Freestyle.Stroke_RemoveVertex(*args)
+    def InsertVertex(*args): return _Freestyle.Stroke_InsertVertex(*args)
+    def Render(*args): return _Freestyle.Stroke_Render(*args)
+    def RenderBasic(*args): return _Freestyle.Stroke_RenderBasic(*args)
+    def getLength2D(*args): return _Freestyle.Stroke_getLength2D(*args)
+    def getMediumType(*args): return _Freestyle.Stroke_getMediumType(*args)
+    def getTextureId(*args): return _Freestyle.Stroke_getTextureId(*args)
+    def hasTips(*args): return _Freestyle.Stroke_hasTips(*args)
+    def vertices_size(*args): return _Freestyle.Stroke_vertices_size(*args)
+    def viewedges_begin(*args): return _Freestyle.Stroke_viewedges_begin(*args)
+    def viewedges_end(*args): return _Freestyle.Stroke_viewedges_end(*args)
+    def viewedges_size(*args): return _Freestyle.Stroke_viewedges_size(*args)
+    def getBeginningOrientation(*args): return _Freestyle.Stroke_getBeginningOrientation(*args)
+    def getBeginningOrientationX(*args): return _Freestyle.Stroke_getBeginningOrientationX(*args)
+    def getBeginningOrientationY(*args): return _Freestyle.Stroke_getBeginningOrientationY(*args)
+    def getEndingOrientation(*args): return _Freestyle.Stroke_getEndingOrientation(*args)
+    def getEndingOrientationX(*args): return _Freestyle.Stroke_getEndingOrientationX(*args)
+    def getEndingOrientationY(*args): return _Freestyle.Stroke_getEndingOrientationY(*args)
+    def SetId(*args): return _Freestyle.Stroke_SetId(*args)
+    def SetLength(*args): return _Freestyle.Stroke_SetLength(*args)
+    def SetMediumType(*args): return _Freestyle.Stroke_SetMediumType(*args)
+    def SetTextureId(*args): return _Freestyle.Stroke_SetTextureId(*args)
+    def SetTips(*args): return _Freestyle.Stroke_SetTips(*args)
+    def push_back(*args): return _Freestyle.Stroke_push_back(*args)
+    def push_front(*args): return _Freestyle.Stroke_push_front(*args)
+    def AddViewEdge(*args): return _Freestyle.Stroke_AddViewEdge(*args)
+    def SetBeginningOrientation(*args): return _Freestyle.Stroke_SetBeginningOrientation(*args)
+    def SetEndingOrientation(*args): return _Freestyle.Stroke_SetEndingOrientation(*args)
+    def strokeVerticesBegin(*args): return _Freestyle.Stroke_strokeVerticesBegin(*args)
+    def strokeVerticesEnd(*args): return _Freestyle.Stroke_strokeVerticesEnd(*args)
+    def strokeVerticesSize(*args): return _Freestyle.Stroke_strokeVerticesSize(*args)
+    def verticesBegin(*args): return _Freestyle.Stroke_verticesBegin(*args)
+    def verticesEnd(*args): return _Freestyle.Stroke_verticesEnd(*args)
+    def pointsBegin(*args): return _Freestyle.Stroke_pointsBegin(*args)
+    def pointsEnd(*args): return _Freestyle.Stroke_pointsEnd(*args)
+Stroke_swigregister = _Freestyle.Stroke_swigregister
+Stroke_swigregister(Stroke)
+
+class ShadersContainer(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, ShadersContainer, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, ShadersContainer, name)
+    __repr__ = _swig_repr
+    def iterator(*args): return _Freestyle.ShadersContainer_iterator(*args)
+    def __iter__(self): return self.iterator()
+    def __nonzero__(*args): return _Freestyle.ShadersContainer___nonzero__(*args)
+    def __len__(*args): return _Freestyle.ShadersContainer___len__(*args)
+    def pop(*args): return _Freestyle.ShadersContainer_pop(*args)
+    def __getslice__(*args): return _Freestyle.ShadersContainer___getslice__(*args)
+    def __setslice__(*args): return _Freestyle.ShadersContainer___setslice__(*args)
+    def __delslice__(*args): return _Freestyle.ShadersContainer___delslice__(*args)
+    def __delitem__(*args): return _Freestyle.ShadersContainer___delitem__(*args)
+    def __getitem__(*args): return _Freestyle.ShadersContainer___getitem__(*args)
+    def __setitem__(*args): return _Freestyle.ShadersContainer___setitem__(*args)
+    def append(*args): return _Freestyle.ShadersContainer_append(*args)
+    def empty(*args): return _Freestyle.ShadersContainer_empty(*args)
+    def size(*args): return _Freestyle.ShadersContainer_size(*args)
+    def clear(*args): return _Freestyle.ShadersContainer_clear(*args)
+    def swap(*args): return _Freestyle.ShadersContainer_swap(*args)
+    def get_allocator(*args): return _Freestyle.ShadersContainer_get_allocator(*args)
+    def begin(*args): return _Freestyle.ShadersContainer_begin(*args)
+    def end(*args): return _Freestyle.ShadersContainer_end(*args)
+    def rbegin(*args): return _Freestyle.ShadersContainer_rbegin(*args)
+    def rend(*args): return _Freestyle.ShadersContainer_rend(*args)
+    def pop_back(*args): return _Freestyle.ShadersContainer_pop_back(*args)
+    def erase(*args): return _Freestyle.ShadersContainer_erase(*args)
+    def __init__(self, *args): 
+        this = _Freestyle.new_ShadersContainer(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def push_back(*args): return _Freestyle.ShadersContainer_push_back(*args)
+    def front(*args): return _Freestyle.ShadersContainer_front(*args)
+    def back(*args): return _Freestyle.ShadersContainer_back(*args)
+    def assign(*args): return _Freestyle.ShadersContainer_assign(*args)
+    def resize(*args): return _Freestyle.ShadersContainer_resize(*args)
+    def insert(*args): return _Freestyle.ShadersContainer_insert(*args)
+    def reserve(*args): return _Freestyle.ShadersContainer_reserve(*args)
+    def capacity(*args): return _Freestyle.ShadersContainer_capacity(*args)
+    __swig_destroy__ = _Freestyle.delete_ShadersContainer
+    __del__ = lambda self : None;
+ShadersContainer_swigregister = _Freestyle.ShadersContainer_swigregister
+ShadersContainer_swigregister(ShadersContainer)
+
+class StrokeShader(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, StrokeShader, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, StrokeShader, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        if self.__class__ == StrokeShader:
+            args = (None,) + args
+        else:
+            args = (self,) + args
+        this = _Freestyle.new_StrokeShader(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_StrokeShader
+    __del__ = lambda self : None;
+    def getName(*args): return _Freestyle.StrokeShader_getName(*args)
+    def shade(*args): return _Freestyle.StrokeShader_shade(*args)
+    def __disown__(self):
+        self.this.disown()
+        _Freestyle.disown_StrokeShader(self)
+        return weakref_proxy(self)
+StrokeShader_swigregister = _Freestyle.StrokeShader_swigregister
+StrokeShader_swigregister(StrokeShader)
+
+class ConstantThicknessShader(StrokeShader):
+    __swig_setmethods__ = {}
+    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, ConstantThicknessShader, name, value)
+    __swig_getmethods__ = {}
+    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, ConstantThicknessShader, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_ConstantThicknessShader(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_ConstantThicknessShader
+    __del__ = lambda self : None;
+    def getName(*args): return _Freestyle.ConstantThicknessShader_getName(*args)
+    def shade(*args): return _Freestyle.ConstantThicknessShader_shade(*args)
+ConstantThicknessShader_swigregister = _Freestyle.ConstantThicknessShader_swigregister
+ConstantThicknessShader_swigregister(ConstantThicknessShader)
+
+class ConstantExternThicknessShader(StrokeShader):
+    __swig_setmethods__ = {}
+    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, ConstantExternThicknessShader, name, value)
+    __swig_getmethods__ = {}
+    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, ConstantExternThicknessShader, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_ConstantExternThicknessShader(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_ConstantExternThicknessShader
+    __del__ = lambda self : None;
+    def getName(*args): return _Freestyle.ConstantExternThicknessShader_getName(*args)
+    def shade(*args): return _Freestyle.ConstantExternThicknessShader_shade(*args)
+ConstantExternThicknessShader_swigregister = _Freestyle.ConstantExternThicknessShader_swigregister
+ConstantExternThicknessShader_swigregister(ConstantExternThicknessShader)
+
+class IncreasingThicknessShader(StrokeShader):
+    __swig_setmethods__ = {}
+    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, IncreasingThicknessShader, name, value)
+    __swig_getmethods__ = {}
+    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, IncreasingThicknessShader, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_IncreasingThicknessShader(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_IncreasingThicknessShader
+    __del__ = lambda self : None;
+    def shade(*args): return _Freestyle.IncreasingThicknessShader_shade(*args)
+IncreasingThicknessShader_swigregister = _Freestyle.IncreasingThicknessShader_swigregister
+IncreasingThicknessShader_swigregister(IncreasingThicknessShader)
+
+class ConstrainedIncreasingThicknessShader(StrokeShader):
+    __swig_setmethods__ = {}
+    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, ConstrainedIncreasingThicknessShader, name, value)
+    __swig_getmethods__ = {}
+    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, ConstrainedIncreasingThicknessShader, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_ConstrainedIncreasingThicknessShader(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_ConstrainedIncreasingThicknessShader
+    __del__ = lambda self : None;
+    def shade(*args): return _Freestyle.ConstrainedIncreasingThicknessShader_shade(*args)
+ConstrainedIncreasingThicknessShader_swigregister = _Freestyle.ConstrainedIncreasingThicknessShader_swigregister
+ConstrainedIncreasingThicknessShader_swigregister(ConstrainedIncreasingThicknessShader)
+
+class LengthDependingThicknessShader(StrokeShader):
+    __swig_setmethods__ = {}
+    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, LengthDependingThicknessShader, name, value)
+    __swig_getmethods__ = {}
+    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, LengthDependingThicknessShader, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_LengthDependingThicknessShader(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_LengthDependingThicknessShader
+    __del__ = lambda self : None;
+    def shade(*args): return _Freestyle.LengthDependingThicknessShader_shade(*args)
+LengthDependingThicknessShader_swigregister = _Freestyle.LengthDependingThicknessShader_swigregister
+LengthDependingThicknessShader_swigregister(LengthDependingThicknessShader)
+
+class ThicknessVariationPatternShader(StrokeShader):
+    __swig_setmethods__ = {}
+    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, ThicknessVariationPatternShader, name, value)
+    __swig_getmethods__ = {}
+    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, ThicknessVariationPatternShader, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_ThicknessVariationPatternShader(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_ThicknessVariationPatternShader
+    __del__ = lambda self : None;
+    def shade(*args): return _Freestyle.ThicknessVariationPatternShader_shade(*args)
+ThicknessVariationPatternShader_swigregister = _Freestyle.ThicknessVariationPatternShader_swigregister
+ThicknessVariationPatternShader_swigregister(ThicknessVariationPatternShader)
+
+class ThicknessNoiseShader(StrokeShader):
+    __swig_setmethods__ = {}
+    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, ThicknessNoiseShader, name, value)
+    __swig_getmethods__ = {}
+    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, ThicknessNoiseShader, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_ThicknessNoiseShader(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def shade(*args): return _Freestyle.ThicknessNoiseShader_shade(*args)
+    __swig_destroy__ = _Freestyle.delete_ThicknessNoiseShader
+    __del__ = lambda self : None;
+ThicknessNoiseShader_swigregister = _Freestyle.ThicknessNoiseShader_swigregister
+ThicknessNoiseShader_swigregister(ThicknessNoiseShader)
+
+class ConstantColorShader(StrokeShader):
+    __swig_setmethods__ = {}
+    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, ConstantColorShader, name, value)
+    __swig_getmethods__ = {}
+    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, ConstantColorShader, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_ConstantColorShader(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def getName(*args): return _Freestyle.ConstantColorShader_getName(*args)
+    def shade(*args): return _Freestyle.ConstantColorShader_shade(*args)
+    __swig_destroy__ = _Freestyle.delete_ConstantColorShader
+    __del__ = lambda self : None;
+ConstantColorShader_swigregister = _Freestyle.ConstantColorShader_swigregister
+ConstantColorShader_swigregister(ConstantColorShader)
+
+class IncreasingColorShader(StrokeShader):
+    __swig_setmethods__ = {}
+    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, IncreasingColorShader, name, value)
+    __swig_getmethods__ = {}
+    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, IncreasingColorShader, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_IncreasingColorShader(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def shade(*args): return _Freestyle.IncreasingColorShader_shade(*args)
+    __swig_destroy__ = _Freestyle.delete_IncreasingColorShader
+    __del__ = lambda self : None;
+IncreasingColorShader_swigregister = _Freestyle.IncreasingColorShader_swigregister
+IncreasingColorShader_swigregister(IncreasingColorShader)
+
+class ColorVariationPatternShader(StrokeShader):
+    __swig_setmethods__ = {}
+    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, ColorVariationPatternShader, name, value)
+    __swig_getmethods__ = {}
+    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, ColorVariationPatternShader, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_ColorVariationPatternShader(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_ColorVariationPatternShader
+    __del__ = lambda self : None;
+    def shade(*args): return _Freestyle.ColorVariationPatternShader_shade(*args)
+ColorVariationPatternShader_swigregister = _Freestyle.ColorVariationPatternShader_swigregister
+ColorVariationPatternShader_swigregister(ColorVariationPatternShader)
+
+class MaterialColorShader(StrokeShader):
+    __swig_setmethods__ = {}
+    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, MaterialColorShader, name, value)
+    __swig_getmethods__ = {}
+    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, MaterialColorShader, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_MaterialColorShader(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def shade(*args): return _Freestyle.MaterialColorShader_shade(*args)
+    __swig_destroy__ = _Freestyle.delete_MaterialColorShader
+    __del__ = lambda self : None;
+MaterialColorShader_swigregister = _Freestyle.MaterialColorShader_swigregister
+MaterialColorShader_swigregister(MaterialColorShader)
+
+class CalligraphicColorShader(StrokeShader):
+    __swig_setmethods__ = {}
+    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, CalligraphicColorShader, name, value)
+    __swig_getmethods__ = {}
+    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, CalligraphicColorShader, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_CalligraphicColorShader(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def shade(*args): return _Freestyle.CalligraphicColorShader_shade(*args)
+    __swig_destroy__ = _Freestyle.delete_CalligraphicColorShader
+    __del__ = lambda self : None;
+CalligraphicColorShader_swigregister = _Freestyle.CalligraphicColorShader_swigregister
+CalligraphicColorShader_swigregister(CalligraphicColorShader)
+
+class ColorNoiseShader(StrokeShader):
+    __swig_setmethods__ = {}
+    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, ColorNoiseShader, name, value)
+    __swig_getmethods__ = {}
+    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, ColorNoiseShader, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_ColorNoiseShader(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def shade(*args): return _Freestyle.ColorNoiseShader_shade(*args)
+    __swig_destroy__ = _Freestyle.delete_ColorNoiseShader
+    __del__ = lambda self : None;
+ColorNoiseShader_swigregister = _Freestyle.ColorNoiseShader_swigregister
+ColorNoiseShader_swigregister(ColorNoiseShader)
+
+class TextureAssignerShader(StrokeShader):
+    __swig_setmethods__ = {}
+    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, TextureAssignerShader, name, value)
+    __swig_getmethods__ = {}
+    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, TextureAssignerShader, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_TextureAssignerShader(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def shade(*args): return _Freestyle.TextureAssignerShader_shade(*args)
+    __swig_destroy__ = _Freestyle.delete_TextureAssignerShader
+    __del__ = lambda self : None;
+TextureAssignerShader_swigregister = _Freestyle.TextureAssignerShader_swigregister
+TextureAssignerShader_swigregister(TextureAssignerShader)
+
+class StrokeTextureShader(StrokeShader):
+    __swig_setmethods__ = {}
+    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, StrokeTextureShader, name, value)
+    __swig_getmethods__ = {}
+    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, StrokeTextureShader, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_StrokeTextureShader(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def shade(*args): return _Freestyle.StrokeTextureShader_shade(*args)
+    __swig_destroy__ = _Freestyle.delete_StrokeTextureShader
+    __del__ = lambda self : None;
+StrokeTextureShader_swigregister = _Freestyle.StrokeTextureShader_swigregister
+StrokeTextureShader_swigregister(StrokeTextureShader)
+
+class BackboneStretcherShader(StrokeShader):
+    __swig_setmethods__ = {}
+    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, BackboneStretcherShader, name, value)
+    __swig_getmethods__ = {}
+    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, BackboneStretcherShader, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_BackboneStretcherShader(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def shade(*args): return _Freestyle.BackboneStretcherShader_shade(*args)
+    __swig_destroy__ = _Freestyle.delete_BackboneStretcherShader
+    __del__ = lambda self : None;
+BackboneStretcherShader_swigregister = _Freestyle.BackboneStretcherShader_swigregister
+BackboneStretcherShader_swigregister(BackboneStretcherShader)
+
+class SamplingShader(StrokeShader):
+    __swig_setmethods__ = {}
+    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, SamplingShader, name, value)
+    __swig_getmethods__ = {}
+    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, SamplingShader, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_SamplingShader(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def shade(*args): return _Freestyle.SamplingShader_shade(*args)
+    __swig_destroy__ = _Freestyle.delete_SamplingShader
+    __del__ = lambda self : None;
+SamplingShader_swigregister = _Freestyle.SamplingShader_swigregister
+SamplingShader_swigregister(SamplingShader)
+
+class ExternalContourStretcherShader(StrokeShader):
+    __swig_setmethods__ = {}
+    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, ExternalContourStretcherShader, name, value)
+    __swig_getmethods__ = {}
+    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, ExternalContourStretcherShader, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_ExternalContourStretcherShader(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def shade(*args): return _Freestyle.ExternalContourStretcherShader_shade(*args)
+    __swig_destroy__ = _Freestyle.delete_ExternalContourStretcherShader
+    __del__ = lambda self : None;
+ExternalContourStretcherShader_swigregister = _Freestyle.ExternalContourStretcherShader_swigregister
+ExternalContourStretcherShader_swigregister(ExternalContourStretcherShader)
+
+class BSplineShader(StrokeShader):
+    __swig_setmethods__ = {}
+    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, BSplineShader, name, value)
+    __swig_getmethods__ = {}
+    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, BSplineShader, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_BSplineShader(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def shade(*args): return _Freestyle.BSplineShader_shade(*args)
+    __swig_destroy__ = _Freestyle.delete_BSplineShader
+    __del__ = lambda self : None;
+BSplineShader_swigregister = _Freestyle.BSplineShader_swigregister
+BSplineShader_swigregister(BSplineShader)
+
+class BezierCurveShader(StrokeShader):
+    __swig_setmethods__ = {}
+    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, BezierCurveShader, name, value)
+    __swig_getmethods__ = {}
+    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, BezierCurveShader, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_BezierCurveShader(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def shade(*args): return _Freestyle.BezierCurveShader_shade(*args)
+    __swig_destroy__ = _Freestyle.delete_BezierCurveShader
+    __del__ = lambda self : None;
+BezierCurveShader_swigregister = _Freestyle.BezierCurveShader_swigregister
+BezierCurveShader_swigregister(BezierCurveShader)
+
+class InflateShader(StrokeShader):
+    __swig_setmethods__ = {}
+    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, InflateShader, name, value)
+    __swig_getmethods__ = {}
+    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, InflateShader, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_InflateShader(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def shade(*args): return _Freestyle.InflateShader_shade(*args)
+    __swig_destroy__ = _Freestyle.delete_InflateShader
+    __del__ = lambda self : None;
+InflateShader_swigregister = _Freestyle.InflateShader_swigregister
+InflateShader_swigregister(InflateShader)
+
+class PolygonalizationShader(StrokeShader):
+    __swig_setmethods__ = {}
+    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, PolygonalizationShader, name, value)
+    __swig_getmethods__ = {}
+    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, PolygonalizationShader, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_PolygonalizationShader(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def shade(*args): return _Freestyle.PolygonalizationShader_shade(*args)
+    __swig_destroy__ = _Freestyle.delete_PolygonalizationShader
+    __del__ = lambda self : None;
+PolygonalizationShader_swigregister = _Freestyle.PolygonalizationShader_swigregister
+PolygonalizationShader_swigregister(PolygonalizationShader)
+
+class GuidingLinesShader(StrokeShader):
+    __swig_setmethods__ = {}
+    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, GuidingLinesShader, name, value)
+    __swig_getmethods__ = {}
+    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, GuidingLinesShader, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_GuidingLinesShader(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    def shade(*args): return _Freestyle.GuidingLinesShader_shade(*args)
+    __swig_destroy__ = _Freestyle.delete_GuidingLinesShader
+    __del__ = lambda self : None;
+GuidingLinesShader_swigregister = _Freestyle.GuidingLinesShader_swigregister
+GuidingLinesShader_swigregister(GuidingLinesShader)
+
+class TipRemoverShader(StrokeShader):
+    __swig_setmethods__ = {}
+    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, TipRemoverShader, name, value)
+    __swig_getmethods__ = {}
+    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, TipRemoverShader, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_TipRemoverShader(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_TipRemoverShader
+    __del__ = lambda self : None;
+    def shade(*args): return _Freestyle.TipRemoverShader_shade(*args)
+TipRemoverShader_swigregister = _Freestyle.TipRemoverShader_swigregister
+TipRemoverShader_swigregister(TipRemoverShader)
+
+class streamShader(StrokeShader):
+    __swig_setmethods__ = {}
+    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, streamShader, name, value)
+    __swig_getmethods__ = {}
+    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, streamShader, name)
+    __repr__ = _swig_repr
+    __swig_destroy__ = _Freestyle.delete_streamShader
+    __del__ = lambda self : None;
+    def getName(*args): return _Freestyle.streamShader_getName(*args)
+    def shade(*args): return _Freestyle.streamShader_shade(*args)
+    def __init__(self, *args): 
+        this = _Freestyle.new_streamShader(*args)
+        try: self.this.append(this)
+        except: self.this = this
+streamShader_swigregister = _Freestyle.streamShader_swigregister
+streamShader_swigregister(streamShader)
+
+class fstreamShader(StrokeShader):
+    __swig_setmethods__ = {}
+    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, fstreamShader, name, value)
+    __swig_getmethods__ = {}
+    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, fstreamShader, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_fstreamShader(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_fstreamShader
+    __del__ = lambda self : None;
+    def getName(*args): return _Freestyle.fstreamShader_getName(*args)
+    def shade(*args): return _Freestyle.fstreamShader_shade(*args)
+fstreamShader_swigregister = _Freestyle.fstreamShader_swigregister
+fstreamShader_swigregister(fstreamShader)
+
+class CalligraphicShader(StrokeShader):
+    __swig_setmethods__ = {}
+    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, CalligraphicShader, name, value)
+    __swig_getmethods__ = {}
+    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, CalligraphicShader, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_CalligraphicShader(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_CalligraphicShader
+    __del__ = lambda self : None;
+    def shade(*args): return _Freestyle.CalligraphicShader_shade(*args)
+CalligraphicShader_swigregister = _Freestyle.CalligraphicShader_swigregister
+CalligraphicShader_swigregister(CalligraphicShader)
+
+class SpatialNoiseShader(StrokeShader):
+    __swig_setmethods__ = {}
+    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, SpatialNoiseShader, name, value)
+    __swig_getmethods__ = {}
+    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, SpatialNoiseShader, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_SpatialNoiseShader(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_SpatialNoiseShader
+    __del__ = lambda self : None;
+    def shade(*args): return _Freestyle.SpatialNoiseShader_shade(*args)
+SpatialNoiseShader_swigregister = _Freestyle.SpatialNoiseShader_swigregister
+SpatialNoiseShader_swigregister(SpatialNoiseShader)
+
+class SmoothingShader(StrokeShader):
+    __swig_setmethods__ = {}
+    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, SmoothingShader, name, value)
+    __swig_getmethods__ = {}
+    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, SmoothingShader, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_SmoothingShader(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_SmoothingShader
+    __del__ = lambda self : None;
+    def shade(*args): return _Freestyle.SmoothingShader_shade(*args)
+SmoothingShader_swigregister = _Freestyle.SmoothingShader_swigregister
+SmoothingShader_swigregister(SmoothingShader)
+
+class Smoother(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, Smoother, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, Smoother, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_Smoother(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_Smoother
+    __del__ = lambda self : None;
+    def smooth(*args): return _Freestyle.Smoother_smooth(*args)
+    def computeCurvature(*args): return _Freestyle.Smoother_computeCurvature(*args)
+Smoother_swigregister = _Freestyle.Smoother_swigregister
+Smoother_swigregister(Smoother)
+
+class Omitter(Smoother):
+    __swig_setmethods__ = {}
+    for _s in [Smoother]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, Omitter, name, value)
+    __swig_getmethods__ = {}
+    for _s in [Smoother]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, Omitter, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_Omitter(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_Omitter
+    __del__ = lambda self : None;
+    def omit(*args): return _Freestyle.Omitter_omit(*args)
+Omitter_swigregister = _Freestyle.Omitter_swigregister
+Omitter_swigregister(Omitter)
+
+class OmissionShader(StrokeShader):
+    __swig_setmethods__ = {}
+    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
+    __setattr__ = lambda self, name, value: _swig_setattr(self, OmissionShader, name, value)
+    __swig_getmethods__ = {}
+    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
+    __getattr__ = lambda self, name: _swig_getattr(self, OmissionShader, name)
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_OmissionShader(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_OmissionShader
+    __del__ = lambda self : None;
+    def shade(*args): return _Freestyle.OmissionShader_shade(*args)
+OmissionShader_swigregister = _Freestyle.OmissionShader_swigregister
+OmissionShader_swigregister(OmissionShader)
+
+class Operators(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, Operators, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, Operators, name)
+    def __init__(self): raise AttributeError, "No constructor defined"
+    __repr__ = _swig_repr
+    __swig_getmethods__["select"] = lambda x: _Freestyle.Operators_select
+    if _newclass:select = staticmethod(_Freestyle.Operators_select)
+    __swig_getmethods__["chain"] = lambda x: _Freestyle.Operators_chain
+    if _newclass:chain = staticmethod(_Freestyle.Operators_chain)
+    __swig_getmethods__["bidirectionalChain"] = lambda x: _Freestyle.Operators_bidirectionalChain
+    if _newclass:bidirectionalChain = staticmethod(_Freestyle.Operators_bidirectionalChain)
+    __swig_getmethods__["sequentialSplit"] = lambda x: _Freestyle.Operators_sequentialSplit
+    if _newclass:sequentialSplit = staticmethod(_Freestyle.Operators_sequentialSplit)
+    __swig_getmethods__["recursiveSplit"] = lambda x: _Freestyle.Operators_recursiveSplit
+    if _newclass:recursiveSplit = staticmethod(_Freestyle.Operators_recursiveSplit)
+    __swig_getmethods__["sort"] = lambda x: _Freestyle.Operators_sort
+    if _newclass:sort = staticmethod(_Freestyle.Operators_sort)
+    __swig_getmethods__["create"] = lambda x: _Freestyle.Operators_create
+    if _newclass:create = staticmethod(_Freestyle.Operators_create)
+    __swig_getmethods__["getViewEdgeFromIndex"] = lambda x: _Freestyle.Operators_getViewEdgeFromIndex
+    if _newclass:getViewEdgeFromIndex = staticmethod(_Freestyle.Operators_getViewEdgeFromIndex)
+    __swig_getmethods__["getChainFromIndex"] = lambda x: _Freestyle.Operators_getChainFromIndex
+    if _newclass:getChainFromIndex = staticmethod(_Freestyle.Operators_getChainFromIndex)
+    __swig_getmethods__["getStrokeFromIndex"] = lambda x: _Freestyle.Operators_getStrokeFromIndex
+    if _newclass:getStrokeFromIndex = staticmethod(_Freestyle.Operators_getStrokeFromIndex)
+    __swig_getmethods__["getViewEdgesSize"] = lambda x: _Freestyle.Operators_getViewEdgesSize
+    if _newclass:getViewEdgesSize = staticmethod(_Freestyle.Operators_getViewEdgesSize)
+    __swig_getmethods__["getChainsSize"] = lambda x: _Freestyle.Operators_getChainsSize
+    if _newclass:getChainsSize = staticmethod(_Freestyle.Operators_getChainsSize)
+    __swig_getmethods__["getStrokesSize"] = lambda x: _Freestyle.Operators_getStrokesSize
+    if _newclass:getStrokesSize = staticmethod(_Freestyle.Operators_getStrokesSize)
+    __swig_destroy__ = _Freestyle.delete_Operators
+    __del__ = lambda self : None;
+Operators_swigregister = _Freestyle.Operators_swigregister
+Operators_swigregister(Operators)
+Operators_select = _Freestyle.Operators_select
+Operators_chain = _Freestyle.Operators_chain
+Operators_bidirectionalChain = _Freestyle.Operators_bidirectionalChain
+Operators_sequentialSplit = _Freestyle.Operators_sequentialSplit
+Operators_recursiveSplit = _Freestyle.Operators_recursiveSplit
+Operators_sort = _Freestyle.Operators_sort
+Operators_create = _Freestyle.Operators_create
+Operators_getViewEdgeFromIndex = _Freestyle.Operators_getViewEdgeFromIndex
+Operators_getChainFromIndex = _Freestyle.Operators_getChainFromIndex
+Operators_getStrokeFromIndex = _Freestyle.Operators_getStrokeFromIndex
+Operators_getViewEdgesSize = _Freestyle.Operators_getViewEdgesSize
+Operators_getChainsSize = _Freestyle.Operators_getChainsSize
+Operators_getStrokesSize = _Freestyle.Operators_getStrokesSize
+
+class ltstr(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, ltstr, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, ltstr, name)
+    __repr__ = _swig_repr
+    def __call__(*args): return _Freestyle.ltstr___call__(*args)
+    def __init__(self, *args): 
+        this = _Freestyle.new_ltstr(*args)
+        try: self.this.append(this)
+        except: self.this = this
+    __swig_destroy__ = _Freestyle.delete_ltstr
+    __del__ = lambda self : None;
+ltstr_swigregister = _Freestyle.ltstr_swigregister
+ltstr_swigregister(ltstr)
+
+class Canvas(_object):
+    __swig_setmethods__ = {}
+    __setattr__ = lambda self, name, value: _swig_setattr(self, Canvas, name, value)
+    __swig_getmethods__ = {}
+    __getattr__ = lambda self, name: _swig_getattr(self, Canvas, name)
+    def __init__(self): raise AttributeError, "No constructor defined"
+    __repr__ = _swig_repr
+    __swig_getmethods__["getInstance"] = lambda x: _Freestyle.Canvas_getInstance
+    if _newclass:getInstance = staticmethod(_Freestyle.Canvas_getInstance)
+    NB_STEERABLE_VIEWMAP = _Freestyle.Canvas_NB_STEERABLE_VIEWMAP
+    __swig_destroy__ = _Freestyle.delete_Canvas
+    __del__ = lambda self : None;
+    def preDraw(*args): return _Freestyle.Canvas_preDraw(*args)
+    def Draw(*args): return _Freestyle.Canvas_Draw(*args)
+    def postDraw(*args): return _Freestyle.Canvas_postDraw(*args)
+    def Render(*args): return _Freestyle.Canvas_Render(*args)
+    def RenderBasic(*args): return _Freestyle.Canvas_RenderBasic(*args)
+    def RenderStroke(*args): return _Freestyle.Canvas_RenderStroke(*args)
+    def init(*args): return _Freestyle.Canvas_init(*args)
+    def Clear(*args): return _Freestyle.Canvas_Clear(*args)
+    def Erase(*args): return _Freestyle.Canvas_Erase(*args)
+    def readColorPixels(*args): return _Freestyle.Canvas_readColorPixels(*args)
+    def readDepthPixels(*args): return _Freestyle.Canvas_readDepthPixels(*args)
+    def update(*args): return _Freestyle.Canvas_update(*args)
+    def isEmpty(*args): return _Freestyle.Canvas_isEmpty(*args)
+    def loadMap(*args): return _Freestyle.Canvas_loadMap(*args)
+    def readMapPixel(*args): return _Freestyle.Canvas_readMapPixel(*args)
+    def loadSteerableViewMap(*args): return _Freestyle.Canvas_loadSteerableViewMap(*args)
+    def getSteerableViewMap(*args): return _Freestyle.Canvas_getSteerableViewMap(*args)
+    def selectedFEdge(*args): return _Freestyle.Canvas_selectedFEdge(*args)
+    def width(*args): return _Freestyle.Canvas_width(*args)
+    def height(*args): return _Freestyle.Canvas_height(*args)
+    def currentPaperTextureIndex(*args): return _Freestyle.Canvas_currentPaperTextureIndex(*args)
+    def scene3DBBox(*args): return _Freestyle.Canvas_scene3DBBox(*args)
+    def renderer(*args): return _Freestyle.Canvas_renderer(*args)
+    def getCurrentStyleModule(*args): return _Freestyle.Canvas_getCurrentStyleModule(*args)
+    def getRecordFlag(*args): return _Freestyle.Canvas_getRecordFlag(*args)
+    def SetSelectedFEdge(*args): return _Freestyle.Canvas_SetSelectedFEdge(*args)
+    def InsertStyleModule(*args): return _Freestyle.Canvas_InsertStyleModule(*args)
+    def RemoveStyleModule(*args): return _Freestyle.Canvas_RemoveStyleModule(*args)
+    def SwapStyleModules(*args): return _Freestyle.Canvas_SwapStyleModules(*args)
+    def ReplaceStyleModule(*args): return _Freestyle.Canvas_ReplaceStyleModule(*args)
+    def SetVisible(*args): return _Freestyle.Canvas_SetVisible(*args)
+    def AddLayer(*args): return _Freestyle.Canvas_AddLayer(*args)
+    def SetCurrentPaperTextureIndex(*args): return _Freestyle.Canvas_SetCurrentPaperTextureIndex(*args)
+    def changePaperTexture(*args): return _Freestyle.Canvas_changePaperTexture(*args)
+    def togglePaperTexture(*args): return _Freestyle.Canvas_togglePaperTexture(*args)
+    def resetModified(*args): return _Freestyle.Canvas_resetModified(*args)
+    def causalStyleModules(*args): return _Freestyle.Canvas_causalStyleModules(*args)
+    def setModified(*args): return _Freestyle.Canvas_setModified(*args)
+Canvas_swigregister = _Freestyle.Canvas_swigregister
+Canvas_swigregister(Canvas)
+Canvas_getInstance = _Freestyle.Canvas_getInstance
+
+castToSVertex = _Freestyle.castToSVertex
+castToViewVertex = _Freestyle.castToViewVertex
+castToTVertex = _Freestyle.castToTVertex
+castToCurvePoint = _Freestyle.castToCurvePoint
+castToStrokeVertex = _Freestyle.castToStrokeVertex
+castToNonTVertex = _Freestyle.castToNonTVertex
+castToFEdge = _Freestyle.castToFEdge
+castToViewEdge = _Freestyle.castToViewEdge
+castToStroke = _Freestyle.castToStroke
+castToChain = _Freestyle.castToChain
+
+

From ea760cade7e1c8a3ba747c52f359bd2e692510ec Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Sun, 25 May 2008 19:24:46 +0000
Subject: [PATCH 015/252] creating gsoc branch for Ian Thompson


From fc8cd192a3a22322f6127345dc14f8463b35ee1f Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Mon, 26 May 2008 16:19:30 +0000
Subject: [PATCH 016/252] soc-2008-mxcurioni: Freestyle compiles but crashes at
 runtime because of the Python environment.

I analyzed the crash with gdb and PyImport_AddModule ("__main__") in Python/import.c:320 seems responsible for the crash: apparently, "__main__" is not found and causes the error "No such file or directory".

I have to figure out what's wrong with the current configuration, especially whether Freestyle's PythonInterpreter can be used as is. I am going to see whether it's just quicker to use Blender's functions.
---
 .../intern/app_blender/AppConfig.cpp          |   5 +-
 .../intern/app_blender/AppGLWidget.h          |   6 +-
 .../{camera.cpp => AppGLWidget_camera.cpp}    |   2 +-
 .../{camera.h => AppGLWidget_camera.h}        |   2 +-
 .../{config.h => AppGLWidget_config.h}        |   2 +-
 ...{constraint.h => AppGLWidget_constraint.h} |   4 +-
 .../{frame.cpp => AppGLWidget_frame.cpp}      |   4 +-
 .../{frame.h => AppGLWidget_frame.h}          |   2 +-
 ...=> AppGLWidget_manipulatedCameraFrame.cpp} |   4 +-
 ...h => AppGLWidget_manipulatedCameraFrame.h} |   2 +-
 ...e.cpp => AppGLWidget_manipulatedFrame.cpp} |   4 +-
 ...Frame.h => AppGLWidget_manipulatedFrame.h} |   2 +-
 .../{point.h => AppGLWidget_point.h}          |   0
 ...ternion.cpp => AppGLWidget_quaternion.cpp} |   2 +-
 ...{quaternion.h => AppGLWidget_quaternion.h} |   4 +-
 .../{vec.cpp => AppGLWidget_vec.cpp}          |   2 +-
 .../app_blender/{vec.h => AppGLWidget_vec.h}  |   2 +-
 .../intern/app_blender/Controller.cpp         |  65 ++
 .../freestyle/intern/app_blender/Controller.h |   3 +
 .../freestyle/intern/app_blender/api.cpp      |   7 +-
 .../app_blender/old_camera_vec_quaternion.txt | 593 ------------------
 .../intern/app_blender/test_config.h          |   6 +
 .../intern/system/PythonInterpreter.h         |  32 +-
 23 files changed, 122 insertions(+), 633 deletions(-)
 rename source/blender/freestyle/intern/app_blender/{camera.cpp => AppGLWidget_camera.cpp} (99%)
 rename source/blender/freestyle/intern/app_blender/{camera.h => AppGLWidget_camera.h} (99%)
 rename source/blender/freestyle/intern/app_blender/{config.h => AppGLWidget_config.h} (97%)
 rename source/blender/freestyle/intern/app_blender/{constraint.h => AppGLWidget_constraint.h} (99%)
 rename source/blender/freestyle/intern/app_blender/{frame.cpp => AppGLWidget_frame.cpp} (99%)
 rename source/blender/freestyle/intern/app_blender/{frame.h => AppGLWidget_frame.h} (99%)
 rename source/blender/freestyle/intern/app_blender/{manipulatedCameraFrame.cpp => AppGLWidget_manipulatedCameraFrame.cpp} (97%)
 rename source/blender/freestyle/intern/app_blender/{manipulatedCameraFrame.h => AppGLWidget_manipulatedCameraFrame.h} (99%)
 rename source/blender/freestyle/intern/app_blender/{manipulatedFrame.cpp => AppGLWidget_manipulatedFrame.cpp} (98%)
 rename source/blender/freestyle/intern/app_blender/{manipulatedFrame.h => AppGLWidget_manipulatedFrame.h} (99%)
 rename source/blender/freestyle/intern/app_blender/{point.h => AppGLWidget_point.h} (100%)
 rename source/blender/freestyle/intern/app_blender/{quaternion.cpp => AppGLWidget_quaternion.cpp} (99%)
 rename source/blender/freestyle/intern/app_blender/{quaternion.h => AppGLWidget_quaternion.h} (99%)
 rename source/blender/freestyle/intern/app_blender/{vec.cpp => AppGLWidget_vec.cpp} (98%)
 rename source/blender/freestyle/intern/app_blender/{vec.h => AppGLWidget_vec.h} (99%)
 delete mode 100644 source/blender/freestyle/intern/app_blender/old_camera_vec_quaternion.txt
 create mode 100644 source/blender/freestyle/intern/app_blender/test_config.h

diff --git a/source/blender/freestyle/intern/app_blender/AppConfig.cpp b/source/blender/freestyle/intern/app_blender/AppConfig.cpp
index de4b71c5241..a2fa8787fa9 100755
--- a/source/blender/freestyle/intern/app_blender/AppConfig.cpp
+++ b/source/blender/freestyle/intern/app_blender/AppConfig.cpp
@@ -18,6 +18,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
+#include "test_config.h"
+
 #include "AppConfig.h"
 #include <iostream>
 
@@ -33,8 +35,7 @@ namespace Config{
     // get the root directory
 	//soc
 	//setRootDir(getEnvVar("FREESTYLE_BLENDER_DIR"));
-	setRootDir("/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/soc-2008-mxcurioni/source/blender/freestyle");
-	cout << _PythonPath << endl;
+	setRootDir( TEST_ROOT_DIR );
 
 //setRootDir(QString("."));
     _pInstance = this;
diff --git a/source/blender/freestyle/intern/app_blender/AppGLWidget.h b/source/blender/freestyle/intern/app_blender/AppGLWidget.h
index 492fafc883a..3cf7844876d 100755
--- a/source/blender/freestyle/intern/app_blender/AppGLWidget.h
+++ b/source/blender/freestyle/intern/app_blender/AppGLWidget.h
@@ -48,9 +48,9 @@ using namespace std;
 //# include <QGLViewer/qglviewer.h>
 
 //soc
-#include "camera.h"
-#include "vec.h"
-#include "quaternion.h"
+#include "AppGLWidget_camera.h"
+#include "AppGLWidget_vec.h"
+#include "AppGLWidget_quaternion.h"
 
 using namespace Geometry;
 
diff --git a/source/blender/freestyle/intern/app_blender/camera.cpp b/source/blender/freestyle/intern/app_blender/AppGLWidget_camera.cpp
similarity index 99%
rename from source/blender/freestyle/intern/app_blender/camera.cpp
rename to source/blender/freestyle/intern/app_blender/AppGLWidget_camera.cpp
index 25af0550e6c..23c3b2f09a4 100644
--- a/source/blender/freestyle/intern/app_blender/camera.cpp
+++ b/source/blender/freestyle/intern/app_blender/AppGLWidget_camera.cpp
@@ -23,7 +23,7 @@
 
 *****************************************************************************/
 
-#include "camera.h"
+#include "AppGLWidget_camera.h"
 //#include "qglviewer.h"
 
 using namespace std;
diff --git a/source/blender/freestyle/intern/app_blender/camera.h b/source/blender/freestyle/intern/app_blender/AppGLWidget_camera.h
similarity index 99%
rename from source/blender/freestyle/intern/app_blender/camera.h
rename to source/blender/freestyle/intern/app_blender/AppGLWidget_camera.h
index d6dad1dd895..cd349803712 100644
--- a/source/blender/freestyle/intern/app_blender/camera.h
+++ b/source/blender/freestyle/intern/app_blender/AppGLWidget_camera.h
@@ -26,7 +26,7 @@
 #ifndef QGLVIEWER_CAMERA_H
 #define QGLVIEWER_CAMERA_H
 
-#include "manipulatedCameraFrame.h"
+#include "AppGLWidget_manipulatedCameraFrame.h"
 
   /*! \brief A perspective or orthographic camera.
   \class Camera camera.h QGLViewer/camera.h
diff --git a/source/blender/freestyle/intern/app_blender/config.h b/source/blender/freestyle/intern/app_blender/AppGLWidget_config.h
similarity index 97%
rename from source/blender/freestyle/intern/app_blender/config.h
rename to source/blender/freestyle/intern/app_blender/AppGLWidget_config.h
index c1b65aad560..c2fc1b092e1 100644
--- a/source/blender/freestyle/intern/app_blender/config.h
+++ b/source/blender/freestyle/intern/app_blender/AppGLWidget_config.h
@@ -18,7 +18,7 @@
 
 using namespace std;
 
-#include "point.h"
+#include "AppGLWidget_point.h"
 
 # ifdef WIN32
 #  include <windows.h>
diff --git a/source/blender/freestyle/intern/app_blender/constraint.h b/source/blender/freestyle/intern/app_blender/AppGLWidget_constraint.h
similarity index 99%
rename from source/blender/freestyle/intern/app_blender/constraint.h
rename to source/blender/freestyle/intern/app_blender/AppGLWidget_constraint.h
index 871cb2be098..64e8d333d74 100644
--- a/source/blender/freestyle/intern/app_blender/constraint.h
+++ b/source/blender/freestyle/intern/app_blender/AppGLWidget_constraint.h
@@ -26,8 +26,8 @@
 #ifndef QGLVIEWER_CONSTRAINT_H
 #define QGLVIEWER_CONSTRAINT_H
 
-#include "vec.h"
-#include "quaternion.h"
+#include "AppGLWidget_vec.h"
+#include "AppGLWidget_quaternion.h"
 
 //namespace qglviewer {
   class Frame;
diff --git a/source/blender/freestyle/intern/app_blender/frame.cpp b/source/blender/freestyle/intern/app_blender/AppGLWidget_frame.cpp
similarity index 99%
rename from source/blender/freestyle/intern/app_blender/frame.cpp
rename to source/blender/freestyle/intern/app_blender/AppGLWidget_frame.cpp
index 26c2ee5d2b4..8fb17a7c1c6 100644
--- a/source/blender/freestyle/intern/app_blender/frame.cpp
+++ b/source/blender/freestyle/intern/app_blender/AppGLWidget_frame.cpp
@@ -23,7 +23,7 @@
 
 *****************************************************************************/
 
-#include "frame.h"
+#include "AppGLWidget_frame.h"
 #include <math.h>
 
 //using namespace qglviewer;
@@ -653,7 +653,7 @@ void Frame::setReferenceFrame(const Frame* const refFrame)
     cout << "Frame::setReferenceFrame would create a loop in Frame hierarchy" << endl;
   else
     {
-      bool identical = (referenceFrame_ == refFrame);
+      //bool identical = (referenceFrame_ == refFrame);
       referenceFrame_ = refFrame;
     }
 }
diff --git a/source/blender/freestyle/intern/app_blender/frame.h b/source/blender/freestyle/intern/app_blender/AppGLWidget_frame.h
similarity index 99%
rename from source/blender/freestyle/intern/app_blender/frame.h
rename to source/blender/freestyle/intern/app_blender/AppGLWidget_frame.h
index 1ff3d91f75c..30297499285 100644
--- a/source/blender/freestyle/intern/app_blender/frame.h
+++ b/source/blender/freestyle/intern/app_blender/AppGLWidget_frame.h
@@ -26,7 +26,7 @@
 #ifndef QGLVIEWER_FRAME_H
 #define QGLVIEWER_FRAME_H
 
-#include "constraint.h"
+#include "AppGLWidget_constraint.h"
 // #include "GL/gl.h" is now included in config.h for ease of configuration
 
 //namespace qglviewer {
diff --git a/source/blender/freestyle/intern/app_blender/manipulatedCameraFrame.cpp b/source/blender/freestyle/intern/app_blender/AppGLWidget_manipulatedCameraFrame.cpp
similarity index 97%
rename from source/blender/freestyle/intern/app_blender/manipulatedCameraFrame.cpp
rename to source/blender/freestyle/intern/app_blender/AppGLWidget_manipulatedCameraFrame.cpp
index c4e2e67b26a..7b52b90eedc 100644
--- a/source/blender/freestyle/intern/app_blender/manipulatedCameraFrame.cpp
+++ b/source/blender/freestyle/intern/app_blender/AppGLWidget_manipulatedCameraFrame.cpp
@@ -23,8 +23,8 @@
 
 *****************************************************************************/
 
-#include "manipulatedCameraFrame.h"
-#include "camera.h"
+#include "AppGLWidget_manipulatedCameraFrame.h"
+#include "AppGLWidget_camera.h"
 //#include "qglviewer.h"
 
 // #if QT_VERSION >= 0x040000
diff --git a/source/blender/freestyle/intern/app_blender/manipulatedCameraFrame.h b/source/blender/freestyle/intern/app_blender/AppGLWidget_manipulatedCameraFrame.h
similarity index 99%
rename from source/blender/freestyle/intern/app_blender/manipulatedCameraFrame.h
rename to source/blender/freestyle/intern/app_blender/AppGLWidget_manipulatedCameraFrame.h
index 3c28edab622..df9d8f8e7e3 100644
--- a/source/blender/freestyle/intern/app_blender/manipulatedCameraFrame.h
+++ b/source/blender/freestyle/intern/app_blender/AppGLWidget_manipulatedCameraFrame.h
@@ -26,7 +26,7 @@
 #ifndef QGLVIEWER_MANIPULATED_CAMERA_FRAME_H
 #define QGLVIEWER_MANIPULATED_CAMERA_FRAME_H
 
-#include "manipulatedFrame.h"
+#include "AppGLWidget_manipulatedFrame.h"
 
 //namespace qglviewer {
   /*! \brief The ManipulatedCameraFrame class represents a ManipulatedFrame with Camera specific mouse bindings.
diff --git a/source/blender/freestyle/intern/app_blender/manipulatedFrame.cpp b/source/blender/freestyle/intern/app_blender/AppGLWidget_manipulatedFrame.cpp
similarity index 98%
rename from source/blender/freestyle/intern/app_blender/manipulatedFrame.cpp
rename to source/blender/freestyle/intern/app_blender/AppGLWidget_manipulatedFrame.cpp
index 6721204383d..31243308472 100644
--- a/source/blender/freestyle/intern/app_blender/manipulatedFrame.cpp
+++ b/source/blender/freestyle/intern/app_blender/AppGLWidget_manipulatedFrame.cpp
@@ -23,9 +23,9 @@
 
 *****************************************************************************/
 
-#include "manipulatedFrame.h"
+#include "AppGLWidget_manipulatedFrame.h"
 //#include "qglviewer.h"
-#include "camera.h"
+#include "AppGLWidget_camera.h"
 
 //using namespace qglviewer;
 using namespace std;
diff --git a/source/blender/freestyle/intern/app_blender/manipulatedFrame.h b/source/blender/freestyle/intern/app_blender/AppGLWidget_manipulatedFrame.h
similarity index 99%
rename from source/blender/freestyle/intern/app_blender/manipulatedFrame.h
rename to source/blender/freestyle/intern/app_blender/AppGLWidget_manipulatedFrame.h
index 8ad815f0a63..4dfc82c672a 100644
--- a/source/blender/freestyle/intern/app_blender/manipulatedFrame.h
+++ b/source/blender/freestyle/intern/app_blender/AppGLWidget_manipulatedFrame.h
@@ -26,7 +26,7 @@
 #ifndef QGLVIEWER_MANIPULATED_FRAME_H
 #define QGLVIEWER_MANIPULATED_FRAME_H
 
-#include "frame.h"
+#include "AppGLWidget_frame.h"
 
 //namespace qglviewer {
   /*! \brief A ManipulatedFrame is a Frame that can be rotated and translated using the mouse.
diff --git a/source/blender/freestyle/intern/app_blender/point.h b/source/blender/freestyle/intern/app_blender/AppGLWidget_point.h
similarity index 100%
rename from source/blender/freestyle/intern/app_blender/point.h
rename to source/blender/freestyle/intern/app_blender/AppGLWidget_point.h
diff --git a/source/blender/freestyle/intern/app_blender/quaternion.cpp b/source/blender/freestyle/intern/app_blender/AppGLWidget_quaternion.cpp
similarity index 99%
rename from source/blender/freestyle/intern/app_blender/quaternion.cpp
rename to source/blender/freestyle/intern/app_blender/AppGLWidget_quaternion.cpp
index 3dd42ed6ed3..77219cdce1a 100644
--- a/source/blender/freestyle/intern/app_blender/quaternion.cpp
+++ b/source/blender/freestyle/intern/app_blender/AppGLWidget_quaternion.cpp
@@ -23,7 +23,7 @@
 
 *****************************************************************************/
 
-#include "quaternion.h"
+#include "AppGLWidget_quaternion.h"
 #include <stdlib.h> // RAND_MAX
 
 // All the methods are declared inline in Quaternion.h
diff --git a/source/blender/freestyle/intern/app_blender/quaternion.h b/source/blender/freestyle/intern/app_blender/AppGLWidget_quaternion.h
similarity index 99%
rename from source/blender/freestyle/intern/app_blender/quaternion.h
rename to source/blender/freestyle/intern/app_blender/AppGLWidget_quaternion.h
index e3bc876aa4c..e6242e908b1 100644
--- a/source/blender/freestyle/intern/app_blender/quaternion.h
+++ b/source/blender/freestyle/intern/app_blender/AppGLWidget_quaternion.h
@@ -26,8 +26,8 @@
 #ifndef QGLVIEWER_QUATERNION_H
 #define QGLVIEWER_QUATERNION_H
 
-#include "config.h"
-#include "vec.h"
+#include "AppGLWidget_config.h"
+#include "AppGLWidget_vec.h"
 
   /*! \brief The Quaternion class represents 3D rotations and orientations.
   \class Quaternion quaternion.h QGLViewer/quaternion.h
diff --git a/source/blender/freestyle/intern/app_blender/vec.cpp b/source/blender/freestyle/intern/app_blender/AppGLWidget_vec.cpp
similarity index 98%
rename from source/blender/freestyle/intern/app_blender/vec.cpp
rename to source/blender/freestyle/intern/app_blender/AppGLWidget_vec.cpp
index a44dd1ed6ed..2fad849238d 100644
--- a/source/blender/freestyle/intern/app_blender/vec.cpp
+++ b/source/blender/freestyle/intern/app_blender/AppGLWidget_vec.cpp
@@ -23,7 +23,7 @@
 
 *****************************************************************************/
 
-#include "vec.h"
+#include "AppGLWidget_vec.h"
 
 // Most of the methods are declared inline in vec.h
 using namespace std;
diff --git a/source/blender/freestyle/intern/app_blender/vec.h b/source/blender/freestyle/intern/app_blender/AppGLWidget_vec.h
similarity index 99%
rename from source/blender/freestyle/intern/app_blender/vec.h
rename to source/blender/freestyle/intern/app_blender/AppGLWidget_vec.h
index ff17917fac8..47643a19e8e 100644
--- a/source/blender/freestyle/intern/app_blender/vec.h
+++ b/source/blender/freestyle/intern/app_blender/AppGLWidget_vec.h
@@ -26,7 +26,7 @@
 #ifndef QGLVIEWER_VEC_H
 #define QGLVIEWER_VEC_H
 
-#include "config.h"
+#include "AppGLWidget_config.h"
 
 // #include <qapplication.h>
 
diff --git a/source/blender/freestyle/intern/app_blender/Controller.cpp b/source/blender/freestyle/intern/app_blender/Controller.cpp
index 9401f1ae281..25d9653b8f4 100755
--- a/source/blender/freestyle/intern/app_blender/Controller.cpp
+++ b/source/blender/freestyle/intern/app_blender/Controller.cpp
@@ -108,6 +108,8 @@ Controller::Controller()
   _ComputeSteerableViewMap = false;
   _ComputeSuggestive = true;
   _sphereRadius = 1.0;
+
+	init_options();
 }
 
 Controller::~Controller()
@@ -1053,3 +1055,66 @@ void Controller::displayDensityCurves(int x, int y){
   //     _pDensityCurvesWindow->SetLevelCurve(i, Vec2d(0,0), Vec2d(nbCurves, 1), curvesDirection[i], "orientation", "density");
   //   _pDensityCurvesWindow->show();
 }
+
+void Controller::init_options(){
+// 	//from AppOptionsWindow.cpp
+// 	
+// 	// Directories
+//   ViewMapIO::Options::setModelsPath((const char*)modelsPathLineEdit->text().toAscii().data());
+//   PythonInterpreter::Options::setPythonPath((const char*)pythonPathLineEdit->text().toAscii().data());
+//   TextureManager::Options::setPatternsPath((const char*)patternsPathLineEdit->text().toAscii().data());
+//   TextureManager::Options::setBrushesPath((const char*)brushesPathLineEdit->text().toAscii().data());
+//   //g_pController->setBrowserCmd(browserCmdLineEdit->text());
+//   //g_pController->setHelpIndex(helpIndexPathLineEdit->text());
+// 
+//   // ViewMap Format
+//   if (asFloatCheckBox->isChecked())
+//     ViewMapIO::Options::addFlags(ViewMapIO::Options::FLOAT_VECTORS);
+//   else
+//     ViewMapIO::Options::rmFlags(ViewMapIO::Options::FLOAT_VECTORS);
+//   if (noOccluderListCheckBox->isChecked())
+//     ViewMapIO::Options::addFlags(ViewMapIO::Options::NO_OCCLUDERS);
+//   else
+//     ViewMapIO::Options::rmFlags(ViewMapIO::Options::NO_OCCLUDERS);
+//   g_pController->setComputeSteerableViewMapFlag(steerableViewMapCheckBox->isChecked());
+// 
+//   // Visibility
+//   if (qiCheckBox->isChecked())
+//     g_pController->setQuantitativeInvisibility(true);
+//   else
+//     g_pController->setQuantitativeInvisibility(false);
+// 
+//   // Papers Textures
+//   vector<string> sl;
+//   for (unsigned i = 0; i < paperTexturesList->count(); i++) {
+//     sl.push_back(paperTexturesList->item(i)->text().toAscii().constData());
+//   }
+//   TextureManager::Options::setPaperTextures(sl);
+// 
+//    // Drawing Buffers
+//   if (frontBufferCheckBox->isChecked())
+//     g_pController->setFrontBufferFlag(true);
+//   else
+//     g_pController->setFrontBufferFlag(false);
+//   if (backBufferCheckBox->isChecked())
+//     g_pController->setBackBufferFlag(true);
+//   else
+//     g_pController->setBackBufferFlag(false);
+// 
+//   // Ridges and Valleys
+//   g_pController->setComputeRidgesAndValleysFlag(ridgeValleyCheckBox->isChecked());
+//   // Suggestive Contours
+//   g_pController->setComputeSuggestiveContoursFlag(suggestiveContoursCheckBox->isChecked());
+//   bool ok;
+//   real r = sphereRadiusLineEdit->text().toFloat(&ok);
+//   if(ok)
+//     g_pController->setSphereRadius(r);
+//   else
+//     sphereRadiusLineEdit->setText(QString(QString::number(g_pController->getSphereRadius())));
+//   r = krEpsilonLineEdit->text().toFloat(&ok);
+//   if(ok)
+//     g_pController->setSuggestiveContourKrDerivativeEpsilon(r);
+//   else
+//     krEpsilonLineEdit->setText(QString(QString::number(g_pController->getSuggestiveContourKrDerivativeEpsilon())));
+// }
+}
diff --git a/source/blender/freestyle/intern/app_blender/Controller.h b/source/blender/freestyle/intern/app_blender/Controller.h
index 5727db5705a..77f28071791 100755
--- a/source/blender/freestyle/intern/app_blender/Controller.h
+++ b/source/blender/freestyle/intern/app_blender/Controller.h
@@ -59,6 +59,9 @@ public:
   
   void SetView(AppGLWidget *iView);
 
+  //soc
+	void init_options();
+
   int  Load3DSFile(const char *iFileName);
   void CloseFile();
   void LoadViewMapFile(const char *iFileName, bool only_camera = false);
diff --git a/source/blender/freestyle/intern/app_blender/api.cpp b/source/blender/freestyle/intern/app_blender/api.cpp
index 0601ce191f9..5f3d8224ec5 100644
--- a/source/blender/freestyle/intern/app_blender/api.cpp
+++ b/source/blender/freestyle/intern/app_blender/api.cpp
@@ -2,6 +2,7 @@
 #include "AppGLWidget.h"
 #include "Controller.h"
 #include "AppConfig.h"
+#include "test_config.h"
 
 #include <iostream>
 
@@ -20,13 +21,13 @@ extern "C" {
 		
 		c->SetView(view);
 	
-		c->Load3DSFile( "/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/soc-2008-mxcurioni/source/blender/freestyle/data/models/teapot.3DS" );
+		c->Load3DSFile( TEST_3DS_FILE );
 		
-		c->InsertStyleModule( 0,  "/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules/contour.py" );
+		c->InsertStyleModule( 0, TEST_STYLE_MODULE_FILE );
 		c->toggleLayer(0, true);
 		c->ComputeViewMap();
 		 
-		//c->DrawStrokes();
+		c->DrawStrokes();
 		
 		cout << "Freestyle end" << endl;
 
diff --git a/source/blender/freestyle/intern/app_blender/old_camera_vec_quaternion.txt b/source/blender/freestyle/intern/app_blender/old_camera_vec_quaternion.txt
deleted file mode 100644
index 0d10049ee15..00000000000
--- a/source/blender/freestyle/intern/app_blender/old_camera_vec_quaternion.txt
+++ /dev/null
@@ -1,593 +0,0 @@
-//
-//  Filename         : AppConfig.h
-//  Author           : Stephane Grabli
-//  Purpose          : Configuration file
-//  Date of creation : 26/02/2003
-//
-///////////////////////////////////////////////////////////////////////////////
-
-//
-//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
-//   with this source distribution. 
-//
-//  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.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef  ARTGLWIDGET_H
-# define ARTGLWIDGET_H
-
-# ifndef WIN32
-#  include <algorithm>
-using namespace std;
-#  define __min(x,y) (min(x,y))
-#  define __max(x,y) (max(x,y))
-# endif // WIN32
-
-
-//# include <qstringlist.h>
-# include "../geometry/Geom.h"
-# include "../geometry/BBox.h"
-# include "../scene_graph/NodeDrawingStyle.h"
-# include "../system/TimeUtils.h"
-# include "../system/Precision.h"
-# include "AppConfig.h"
-# include "../rendering/GLDebugRenderer.h"
-//# include <QGLViewer/qglviewer.h>
-
-using namespace Geometry;
-
-typedef enum {SURFACIC, LINE, DEPTHBUFFER} RenderStyle;
-
-class FEdge;
-class QMainWindow;
-class GLRenderer;
-class GLSelectRenderer;
-class GLBBoxRenderer;
-class GLMonoColorRenderer;
-class GLDebugRenderer;
-
-class Vec{
-public:
-	Vec() {};
-	Vec(float _x, float _y, float _z): x(_x), y(_y), z(_z) {};
-	~Vec() {}
-	
-	float operator[] (unsigned i) {
-		switch(i){
-		case 0: return x; break;
-		case 1: return y; break;
-		case 2: return z; break;
-		}
-		return 0.0;
-	}
-		
-	
-	float x,y,z;
-};
-
-class Quaternion{
-public:
-	Quaternion( float _x, float _y, float _z, float _s): x(_x), y(_y), z(_z), s(_s){};
-	~Quaternion() {}
-	
-	float operator[] (unsigned i) {
-		switch(i){
-		case 0: return x; break;
-		case 1: return y; break;
-		case 2: return z; break;
-		case 3: return s; break;
-		}
-		return 0.0;
-	}
-	
-	float x,y,z,s;
-};
-
-class Camera {
-	private:
-		float _position[3];
-		float _orientation[3];
-		
-	public:
-		Camera(){};
-	  	~Camera() {};
-		
-		void setZNearCoefficient(float f) {}
-		void playPath(int i) {}
-
-		void loadProjectionMatrix() {}
-		void loadModelViewMatrix() {}
-		real distanceToSceneCenter() { return 0;}
-		void showEntireScene() {} 
-		real zFar() {return 0;}
-		real zNear() {return 0;}
-		void setPosition(Vec v) {}
-		void setOrientation(Quaternion q) {}
-		float* position() { return _position; }
-		float* orientation()  { return _orientation; }
-		void getWorldCoordinatesOf(float *src, float *vp_tmp) {}
-
-};
-
-
-//class AppGLWidget : public QGLViewer
-class AppGLWidget
-{
-  //Q_OBJECT
-
-    
-public:
-
-  AppGLWidget(const char *iName = 0);
-  virtual ~AppGLWidget();
-  
-public:
-
-	inline void swapBuffers() {}
-  inline void updateGL() {}
-  inline void makeCurrent() {}
-  inline void setSceneBoundingBox(Vec &min_, Vec &max_) {}
-	inline void saveSnapshot(bool b) {}
-	inline real width() { return _width; }
-	inline real height() { return _height; }
-	 void setStateFileName(const string& name) { stateFileName_ = name; };
-	
-	
-Camera * _camera;
-
-  // captures a frame animation that was previously registered
-  void captureMovie();
-
-  /*! Sets the rendering style.
-        iStyle
-          The style used to render. Can be:
-          SURFACIC    : usual rendering
-          LINES       : line rendering
-          DEPTHBUFFER : grey-levels rendering of the depth buffer
-          */
-  inline void SetRenderStyle(RenderStyle iStyle)
-  {
-    _RenderStyle = iStyle;
-  }
-
-  /*! Sets the model to draw in the viewer 
-   *  iModel
-   *    The Root Node of the model 
-   */
-  inline void SetModel(NodeGroup *iModel)
-  {
-    if(0 != _ModelRootNode->numberOfChildren())
-    {
-      _ModelRootNode->DetachChildren();
-      _ModelRootNode->clearBBox();
-    }
-      
-    AddModel(iModel);
-  }
-
-  /*! Adds a model for displaying in the viewer */
-  inline void AddModel(NodeGroup *iModel) 
-  {
-    _ModelRootNode->AddChild(iModel);
-    
-    _ModelRootNode->UpdateBBox();
-
-    _minBBox = __min(__min(_ModelRootNode->bbox().getMin()[0], 
-                            _ModelRootNode->bbox().getMin()[1]),
-                      _ModelRootNode->bbox().getMin()[2]);
-    _maxBBox = __max(__max(_ModelRootNode->bbox().getMax()[0], 
-                            _ModelRootNode->bbox().getMax()[1]),
-                      _ModelRootNode->bbox().getMax()[2]);
-    
-     _maxAbs = __max(rabs(_minBBox), rabs(_maxBBox));
-
-     _minAbs = __min(rabs(_minBBox), rabs(_maxBBox));
-
-     // DEBUG:
-    ReInitRenderers();
- 
-  }
-
-  inline void AddSilhouette(NodeGroup* iSilhouette)
-  {
-    _SilhouetteRootNode->AddChild(iSilhouette);
-    //ToggleSilhouette(true);
-    updateGL();
-  }
-
-  inline void Add2DSilhouette(NodeGroup *iSilhouette)
-  {
-    //_pFENode->AddChild(iSilhouette);
-    //ToggleSilhouette(true);
-    updateGL();
-  }
-
-  inline void Add2DVisibleSilhouette(NodeGroup *iVSilhouette)
-  {
-    //_pVisibleSilhouetteNode->AddChild(iVSilhouette);
-    updateGL();
-  }
-
-  inline void SetDebug(NodeGroup* iDebug)
-  {
-    if(0 != _DebugRootNode->numberOfChildren())
-    {
-      _DebugRootNode->DetachChildren();
-      _DebugRootNode->clearBBox();
-    }
-      
-    AddDebug(iDebug);
-  }
-
-  inline void AddDebug(NodeGroup* iDebug)
-  {
-    _DebugRootNode->AddChild(iDebug);
-    updateGL();
-  }
-
-  inline void DetachModel(Node *iModel)
-  {
-    _ModelRootNode->DetachChild(iModel);
-    _ModelRootNode->UpdateBBox();
-    
-    _minBBox = __min(__min(_ModelRootNode->bbox().getMin()[0], 
-                            _ModelRootNode->bbox().getMin()[1]),
-                      _ModelRootNode->bbox().getMin()[2]);
-    _maxBBox = __max(__max(_ModelRootNode->bbox().getMax()[0], 
-                            _ModelRootNode->bbox().getMax()[1]),
-                      _ModelRootNode->bbox().getMax()[2]);
-    
-     _maxAbs = __max(rabs(_minBBox), rabs(_maxBBox));
-     _minAbs = __min(rabs(_minBBox), rabs(_maxBBox));
-  } 
-
-  inline void DetachModel() 
-  {
-    _ModelRootNode->DetachChildren();
-    _ModelRootNode->clearBBox();
-    
-    // 2D Scene
-    //_p2DNode.DetachChildren();
-    //_pFENode->DetachChildren();
-    //_pVisibleSilhouetteNode->DetachChildren();
-    updateGL();
-  }
-
-  inline void DetachSilhouette()
-  {
-    _SilhouetteRootNode->DetachChildren();
-    //_pFENode->DetachChildren();
-    //_pVisibleSilhouetteNode->DetachChildren();
-    _p2DSelectionNode->destroy();
-    //updateGL(); //FIXME
-  }
-
-  inline void DetachVisibleSilhouette()
-  {
-    //_pVisibleSilhouetteNode->DetachChildren();
-    _p2DSelectionNode->destroy();
-    updateGL();
-  }
-
-  inline void DetachDebug()
-  {
-    _DebugRootNode->DetachChildren();
-    updateGL();
-  }
-
-  void SetMainWindow(QMainWindow *iMainWindow) ;
-
-  inline void Set3DContext()
-  {
-    // GL_PROJECTION matrix
-    _camera->loadProjectionMatrix();
-    // GL_MODELVIEW matrix
-    _camera->loadModelViewMatrix();
-  }
-  
-  inline void RetriveModelViewMatrix(float *p)
-  {
-    makeCurrent();
-    glGetFloatv(GL_MODELVIEW_MATRIX, p);
-  }
-  inline void RetriveModelViewMatrix(real *p)
-  {
-    makeCurrent();
-    glGetDoublev(GL_MODELVIEW_MATRIX, p);
-  }
-
-  inline void RetrieveProjectionMatrix(float *p)
-  {
-    makeCurrent();
-    glGetFloatv(GL_PROJECTION_MATRIX, p);
-
-  }
-  inline void RetrieveProjectionMatrix(real *p)
-  {
-    makeCurrent();
-    glGetDoublev(GL_PROJECTION_MATRIX, p);
-
-  }
-
-  inline void RetrieveViewport(int *p)
-  {
-    makeCurrent();
-    glGetIntegerv(GL_VIEWPORT,(GLint *)p);
-  }
-  
-  inline real GetFocalLength() const
-  {
-    real Near =  __max(0.1,(real)(-2.f*_maxAbs+_camera->distanceToSceneCenter()));
-    return Near;
-  }
-
-  inline real GetAspect() const
-  {
-    return ((real) _width/(real) _height);
-  }
-
-  inline real GetFovyRadian() const
-  {
-    return _Fovy/180.0 * M_PI;
-  }
-
-  inline real GetFovyDegrees() const
-  {
-    return _Fovy;
-  }
-
-  inline void FitBBox()
-  {
-	Vec min_(_ModelRootNode->bbox().getMin()[0],
-    			_ModelRootNode->bbox().getMin()[1],
-    			_ModelRootNode->bbox().getMin()[2]);
-	Vec max_(_ModelRootNode->bbox().getMax()[0],
-    			_ModelRootNode->bbox().getMax()[1],
-    			_ModelRootNode->bbox().getMax()[2]);
-    setSceneBoundingBox(min_, max_);
-    _camera->showEntireScene();
-  }
-  
-  inline void ToggleSilhouette(bool enabled) 
-  {
-    _fedges = enabled;
-    updateGL();
-  }
-  
-  // Reinit the renderers which need to be informed
-  // when a model is added to the scene.
-  void ReInitRenderers();
-
-  inline void SetSelectedFEdge(FEdge* iFEdge) { _pDebugRenderer->SetSelectedFEdge(iFEdge); }
-
-  inline GLDebugRenderer* debugRenderer() { return _pDebugRenderer; }
-  inline void toggle3D() { _Draw3DScene == true ? _Draw3DScene = false : _Draw3DScene = true; updateGL();}
-
-  /*! glReadPixels */
-  typedef enum{
-    RGB,
-    DEPTH
-  } PixelFormat;
-  void readPixels(int x,
-                  int y,
-                  int width,
-                  int height,
-                  PixelFormat format,
-                  float *pixels) 
-  {
-    makeCurrent();
-    //glReadBuffer(GL_FRONT); //in reality: glReadBuffer and glDrawBuffer are both set to GL_BACK
-    glReadBuffer(GL_BACK);
-    GLenum glformat;
-    switch(format)
-    {
-    case RGB:
-      glformat = GL_RGB;
-      break;
-    case DEPTH:
-      glformat = GL_DEPTH_COMPONENT;
-      break;
-    default:
-      break;
-    }
-    glReadPixels(x,y,width, height, glformat, GL_FLOAT, (GLfloat*)pixels);
-  }
-
-  void clear() { makeCurrent(); glClear(GL_COLOR_BUFFER_BIT ); }
-
-  void prepareCanvas();
-  void releaseCanvas();
-
-  typedef enum {
-    FRONT,
-    BACK
-  } GLBuffer;
-
-  void setReadPixelsBuffer(int iBuffer) 
-  {
-    makeCurrent();
-    switch(iBuffer)
-    {
-    case FRONT:
-      glReadBuffer(GL_FRONT);
-      break;
-    case BACK:
-      glReadBuffer(GL_BACK);
-      break;
-    default:
-      break;
-    }
-  }
-
-  BBox<Vec3r> scene3DBBox() const { return _ModelRootNode->bbox(); }
-
-  inline real znear() const {
-    return _camera->zNear();
-  }
-  
-  inline real zfar() const {
-    return _camera->zFar();
-  }
-
-  inline bool draw3DsceneEnabled() const { return _Draw3DScene; }
-
-  inline bool getRecordFlag() const {return _record;}
-
-  void setCameraState(const float* position, const float* orientation) {
-    _camera->setPosition(Vec(position[0], position[1], position[2]));
-    _camera->setOrientation(Quaternion(orientation[0], orientation[1], orientation[2], orientation[3]));
-  }
-
-  void getCameraState(float* position, float* orientation) const {
-    float* pos = _camera->position();
-    float* orient = _camera->orientation();
-    int i;
-    for(i=0;i<3;++i){
-      position[i] = pos[i];
-    }
-    for(i=0;i<4;++i){
-      orientation[i] = orient[i];
-    }
-  }
-
-  void saveCameraState() {
-    getCameraState(_cameraPosition, _cameraOrientation);
-    _cameraStateSaved = true;
-  }
-
-  void setUpdateMode(bool b) {
-    _enableUpdateSilhouettes = b;
-  }
-
-  bool getUpdateMode() const {
-    return _enableUpdateSilhouettes;
-  }
-  static void setFrontBufferFlag(bool iBool);
-  static bool getFrontBufferFlag();
-  static void setBackBufferFlag(bool iBool);
-  static bool getBackBufferFlag();
-
-protected:
-  virtual void	  init();
-  virtual void    draw();
-
-  /*! Loads an envmap */
-  void LoadEnvMap(const char *filename);
-
-public:
-  /*! Core scene drawing */
-  void            DrawScene(SceneVisitor *iRenderer);
-
-  /*! 2D Scene Drawing */
-  void            Draw2DScene(SceneVisitor *iRenderer);
-
-  /*! Draws scene silhouettes in real time */
-  void            DrawSilhouette();
-  
-  /*! Draws the Scene in lines style */
-  //  void            DrawLines();
-  //  /*! Draws the scene in surfacic style */
-  //  void            DrawSurfacic();
-  //  /*! Draws the scene as a depth buffer image */
-  //  void            DrawDepthBuffer();
-
-  GLRenderer* glRenderer() {return _pGLRenderer;}
-
-protected:
-
-
-  //QString shortcutBindingsString() const;
-
-  /*! fabs or abs */
-  inline int rabs(int x) {return abs(x);}
-  inline real rabs(real x) {return fabs(x);}
-
-  
-protected:
-  float _Fovy;
-  //float _SceneDepth;
-  //BBox<Vec3f> _BBox;
-  
-  RenderStyle _RenderStyle;
-
-  //The root node container
-  NodeGroup        _RootNode;
-  NodeDrawingStyle *_ModelRootNode;
-  NodeDrawingStyle *_SilhouetteRootNode;
-  NodeDrawingStyle *_DebugRootNode;
-  
-  bool _silhouette;
-  bool _fedges;
-  bool _debug;
-  bool _selection_mode;
-
-  //a Universal light:
-  NodeGroup _Light;
-
-  real _minBBox;
-  real _maxBBox;
-  real _maxAbs;
-
-  real _minAbs;
-  bool _drawBBox;
-
-  // OpenGL Renderer
-  GLRenderer *_pGLRenderer;
-  GLSelectRenderer *_pSelectRenderer;
-  GLBBoxRenderer *_pBBoxRenderer;
-  GLMonoColorRenderer *_pMonoColorRenderer;
-  GLDebugRenderer *_pDebugRenderer;
-  
-  QMainWindow *_pMainWindow;
-
-  Chronometer _Chrono;
-
-  // 2D Scene
-  bool _Draw2DScene;
-  bool _Draw3DScene;  NodeGroup _p2DNode;
-  //NodeDrawingStyle *_pFENode; // Feature edges node
-  //NodeDrawingStyle *_pVisibleSilhouetteNode;
-  NodeDrawingStyle *_p2DSelectionNode;
-
-  // EnvMap
-  bool _drawEnvMap;
-  int _currentEnvMap;
-  int _maxId;
-  int _blendFunc;
-
-  // Each time we compute the view map, the camera state is 
-  // saved in order to be able to restore it later
-  bool  _cameraStateSaved;
-  float _cameraPosition[3];
-  float _cameraOrientation[4];
-
-  // interactive silhouette update
-  bool _enableUpdateSilhouettes;
-  //capture movie
-  bool _captureMovie;
-  // 2D drawing buffers
-  static bool _frontBufferFlag;
-  static bool _backBufferFlag;
-
-  bool _record;
-
-
-real _width, _height;
-Vec _min,_max;
-string stateFileName_;
-};
-
-#endif // ARTGLWIDGET_H
diff --git a/source/blender/freestyle/intern/app_blender/test_config.h b/source/blender/freestyle/intern/app_blender/test_config.h
new file mode 100644
index 00000000000..773ca2f75f5
--- /dev/null
+++ b/source/blender/freestyle/intern/app_blender/test_config.h
@@ -0,0 +1,6 @@
+
+#define TEST_3DS_FILE "/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/soc-2008-mxcurioni/source/blender/freestyle/data/models/teapot.3DS"
+
+#define TEST_STYLE_MODULE_FILE "/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules/contour.py"
+
+#define TEST_ROOT_DIR "/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/soc-2008-mxcurioni/source/blender/freestyle"
\ No newline at end of file
diff --git a/source/blender/freestyle/intern/system/PythonInterpreter.h b/source/blender/freestyle/intern/system/PythonInterpreter.h
index f9a573ffb86..b8eaa4a8a3c 100755
--- a/source/blender/freestyle/intern/system/PythonInterpreter.h
+++ b/source/blender/freestyle/intern/system/PythonInterpreter.h
@@ -41,11 +41,17 @@ class LIB_SYSTEM_EXPORT PythonInterpreter : public Interpreter
 
   PythonInterpreter() {
     _language = "Python";
-    Py_Initialize();
+    //Py_Initialize();
+
+	cout << "Freestyle Python Init: " << endl;
+	cout << "- is init   : " << Py_IsInitialized() << endl;
+	cout << "- prog path : " << Py_GetProgramFullPath() << endl;
+	cout << "- mod path  : " << Py_GetPath() << endl;
+	cout << "- version   : " << Py_GetVersion() << endl;
   }
 
   virtual ~PythonInterpreter() {
-    Py_Finalize();
+    //Py_Finalize();
   }
 
   int interpretCmd(const string& cmd) {
@@ -88,19 +94,19 @@ private:
     if (_initialized)
       return;
     PyRun_SimpleString("import sys");
-    vector<string> pathnames;
-    StringUtils::getPathName(_path, "", pathnames);
-    string cmd;
-    char* c_cmd;
-    for (vector<string>::const_iterator it = pathnames.begin();
+	     vector<string> pathnames;
+	     StringUtils::getPathName(_path, "", pathnames);
+	     string cmd;
+	     char* c_cmd;
+	     for (vector<string>::const_iterator it = pathnames.begin();
 	 it != pathnames.end();
 	 ++it) {
-      cmd = "sys.path.append(\"" + *it + "\")";
-      c_cmd = strdup(cmd.c_str());
-      PyRun_SimpleString(c_cmd);
-      free(c_cmd);
-    }
-    //    PyRun_SimpleString("from Freestyle import *");
+	       cmd = "sys.path.append(\"" + *it + "\")";
+	       c_cmd = strdup(cmd.c_str());
+	       PyRun_SimpleString(c_cmd);
+	       free(c_cmd);
+	     }
+       PyRun_SimpleString("from Freestyle import *");
     _initialized = true;
   }
 

From 373d42dbeaef014ce6d8c9d337242966d7ca8e5f Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Mon, 26 May 2008 19:52:55 +0000
Subject: [PATCH 017/252] soc-2008-mxcurioni: PythonInterpreter works, using
 Blender's Python functions. The drawing still does not produce anything
 because the SWIG module wrapper is missing

---
 source/blender/freestyle/SConscript           |   2 +-
 .../intern/app_blender/Controller.cpp         | 110 ++++++++----------
 .../intern/app_blender/test_config.h          |   5 +-
 .../intern/system/PythonInterpreter.h         |  63 +++++-----
 .../freestyle/intern/system/StringUtils.cpp   |  38 +++---
 .../freestyle/intern/system/StringUtils.h     |   1 +
 6 files changed, 113 insertions(+), 106 deletions(-)

diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript
index 97b7d4cf9f2..623bf0308dd 100644
--- a/source/blender/freestyle/SConscript
+++ b/source/blender/freestyle/SConscript
@@ -6,7 +6,7 @@ sources = []
 defs = []
 incs = ''
 
-incs += '../blenkernel ../blenlib ../imbuf ../makesdna'
+incs += '../blenkernel ../blenlib ../imbuf ../makesdna ../python'
 incs += ' #/extern/freestyle/lib3ds' 
 incs += ' ' + env['BF_PYTHON_INC']
 incs += ' ' + env['BF_LIB3DS_INC']
diff --git a/source/blender/freestyle/intern/app_blender/Controller.cpp b/source/blender/freestyle/intern/app_blender/Controller.cpp
index 25d9653b8f4..38f0ff0b7f0 100755
--- a/source/blender/freestyle/intern/app_blender/Controller.cpp
+++ b/source/blender/freestyle/intern/app_blender/Controller.cpp
@@ -64,6 +64,7 @@
 
 #include "../system/StringUtils.h"
 
+#include "test_config.h"
 
 Controller::Controller()
 {
@@ -1057,64 +1058,53 @@ void Controller::displayDensityCurves(int x, int y){
 }
 
 void Controller::init_options(){
-// 	//from AppOptionsWindow.cpp
-// 	
-// 	// Directories
-//   ViewMapIO::Options::setModelsPath((const char*)modelsPathLineEdit->text().toAscii().data());
-//   PythonInterpreter::Options::setPythonPath((const char*)pythonPathLineEdit->text().toAscii().data());
-//   TextureManager::Options::setPatternsPath((const char*)patternsPathLineEdit->text().toAscii().data());
-//   TextureManager::Options::setBrushesPath((const char*)brushesPathLineEdit->text().toAscii().data());
-//   //g_pController->setBrowserCmd(browserCmdLineEdit->text());
-//   //g_pController->setHelpIndex(helpIndexPathLineEdit->text());
-// 
-//   // ViewMap Format
-//   if (asFloatCheckBox->isChecked())
-//     ViewMapIO::Options::addFlags(ViewMapIO::Options::FLOAT_VECTORS);
-//   else
-//     ViewMapIO::Options::rmFlags(ViewMapIO::Options::FLOAT_VECTORS);
-//   if (noOccluderListCheckBox->isChecked())
-//     ViewMapIO::Options::addFlags(ViewMapIO::Options::NO_OCCLUDERS);
-//   else
-//     ViewMapIO::Options::rmFlags(ViewMapIO::Options::NO_OCCLUDERS);
-//   g_pController->setComputeSteerableViewMapFlag(steerableViewMapCheckBox->isChecked());
-// 
-//   // Visibility
-//   if (qiCheckBox->isChecked())
-//     g_pController->setQuantitativeInvisibility(true);
-//   else
-//     g_pController->setQuantitativeInvisibility(false);
-// 
-//   // Papers Textures
-//   vector<string> sl;
-//   for (unsigned i = 0; i < paperTexturesList->count(); i++) {
-//     sl.push_back(paperTexturesList->item(i)->text().toAscii().constData());
-//   }
-//   TextureManager::Options::setPaperTextures(sl);
-// 
-//    // Drawing Buffers
-//   if (frontBufferCheckBox->isChecked())
-//     g_pController->setFrontBufferFlag(true);
-//   else
-//     g_pController->setFrontBufferFlag(false);
-//   if (backBufferCheckBox->isChecked())
-//     g_pController->setBackBufferFlag(true);
-//   else
-//     g_pController->setBackBufferFlag(false);
-// 
-//   // Ridges and Valleys
-//   g_pController->setComputeRidgesAndValleysFlag(ridgeValleyCheckBox->isChecked());
-//   // Suggestive Contours
-//   g_pController->setComputeSuggestiveContoursFlag(suggestiveContoursCheckBox->isChecked());
-//   bool ok;
-//   real r = sphereRadiusLineEdit->text().toFloat(&ok);
-//   if(ok)
-//     g_pController->setSphereRadius(r);
-//   else
-//     sphereRadiusLineEdit->setText(QString(QString::number(g_pController->getSphereRadius())));
-//   r = krEpsilonLineEdit->text().toFloat(&ok);
-//   if(ok)
-//     g_pController->setSuggestiveContourKrDerivativeEpsilon(r);
-//   else
-//     krEpsilonLineEdit->setText(QString(QString::number(g_pController->getSuggestiveContourKrDerivativeEpsilon())));
-// }
+// 	from AppOptionsWindow.cpp
+// 	Default init options
+
+	Config::Path * cpath = Config::Path::getInstance();
+
+    // const string& getProjectDir() const {return _ProjectDir;}
+    // const string& getModelsPath() const {return _ModelsPath;}
+    // const string& getPatternsPath() const {return _PatternsPath;}
+    // const string& getBrushesPath() const {return _BrushesPath;}
+    // const string& getPythonPath() const {return _PythonPath;}
+    // const string& getBrowserCmd() const {return _BrowserCmd;}
+    // const string& getHelpIndexpath() const {return _HelpIndexPath;}
+    // const string& getPapersDir() const {return _PapersDir;}
+    // const string& getEnvMapDir() const {return _EnvMapDir;}
+    // const string& getMapsDir() const {return _MapsDir;}
+    // const string& getHomeDir() const {return _HomeDir;}
+
+	// Directories
+	ViewMapIO::Options::setModelsPath( StringUtils::toAscii( cpath->getModelsPath() ) ); 
+	PythonInterpreter::Options::setPythonPath( StringUtils::toAscii( cpath->getPythonPath() ) );
+	TextureManager::Options::setPatternsPath( StringUtils::toAscii( cpath->getPatternsPath() ) );
+	TextureManager::Options::setBrushesPath( StringUtils::toAscii( cpath->getModelsPath() ) );
+
+	// ViewMap Format
+	ViewMapIO::Options::rmFlags(ViewMapIO::Options::FLOAT_VECTORS);
+	ViewMapIO::Options::rmFlags(ViewMapIO::Options::NO_OCCLUDERS);
+	setComputeSteerableViewMapFlag( false );
+
+	// Visibility
+	setQuantitativeInvisibility(true);
+
+	 // Papers Textures
+	vector<string> sl;
+	sl.push_back( StringUtils::toAscii( TEST_TEXTURE_FILE ) );
+	TextureManager::Options::setPaperTextures(sl);
+
+	// Drawing Buffers
+	setFrontBufferFlag(false);
+	setBackBufferFlag(true);
+
+
+	// Ridges and Valleys
+	setComputeRidgesAndValleysFlag( false );
+	
+	// Suggestive Contours
+	setComputeSuggestiveContoursFlag( false );
+	setSphereRadius(1);
+	setSuggestiveContourKrDerivativeEpsilon(0);
+
 }
diff --git a/source/blender/freestyle/intern/app_blender/test_config.h b/source/blender/freestyle/intern/app_blender/test_config.h
index 773ca2f75f5..98239f279f3 100644
--- a/source/blender/freestyle/intern/app_blender/test_config.h
+++ b/source/blender/freestyle/intern/app_blender/test_config.h
@@ -3,4 +3,7 @@
 
 #define TEST_STYLE_MODULE_FILE "/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules/contour.py"
 
-#define TEST_ROOT_DIR "/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/soc-2008-mxcurioni/source/blender/freestyle"
\ No newline at end of file
+#define TEST_ROOT_DIR "/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/soc-2008-mxcurioni/source/blender/freestyle"
+
+
+#define TEST_TEXTURE_FILE "/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/soc-2008-mxcurioni/source/blender/freestyle/data/textures/papers/whitepaper.jpg"
\ No newline at end of file
diff --git a/source/blender/freestyle/intern/system/PythonInterpreter.h b/source/blender/freestyle/intern/system/PythonInterpreter.h
index b8eaa4a8a3c..d9b563fabaa 100755
--- a/source/blender/freestyle/intern/system/PythonInterpreter.h
+++ b/source/blender/freestyle/intern/system/PythonInterpreter.h
@@ -35,6 +35,12 @@
 # include "StringUtils.h"
 # include "Interpreter.h"
 
+//soc
+extern "C" {
+#include "BKE_text.h"
+#include "BPY_extern.h"
+}
+
 class LIB_SYSTEM_EXPORT PythonInterpreter : public Interpreter
 {
  public:
@@ -42,12 +48,6 @@ class LIB_SYSTEM_EXPORT PythonInterpreter : public Interpreter
   PythonInterpreter() {
     _language = "Python";
     //Py_Initialize();
-
-	cout << "Freestyle Python Init: " << endl;
-	cout << "- is init   : " << Py_IsInitialized() << endl;
-	cout << "- prog path : " << Py_GetProgramFullPath() << endl;
-	cout << "- mod path  : " << Py_GetPath() << endl;
-	cout << "- version   : " << Py_GetVersion() << endl;
   }
 
   virtual ~PythonInterpreter() {
@@ -64,11 +64,22 @@ class LIB_SYSTEM_EXPORT PythonInterpreter : public Interpreter
 
   int interpretFile(const string& filename) {
     initPath();
-    string cmd("execfile(\"" + filename + "\")");
-    char* c_cmd = strdup(cmd.c_str());
-    int err = PyRun_SimpleString(c_cmd);
-    free(c_cmd);
-    return err;
+
+	char *fn = const_cast<char*>(filename.c_str());
+	struct Text *text = add_text( fn );
+	
+	if (text == NULL) {
+		cout << "\nError in PythonInterpreter::interpretFile:" << endl;
+		cout << "couldn't create Blender text from" << fn << endl;
+	}
+
+	if (BPY_txt_do_python_Text(text) != 1) {
+		cout << "\nError executing Python script from PythonInterpreter::interpretFile:" << endl;
+		cout << fn << " (at line " <<  BPY_Err_getLinenumber() << ")" << endl;
+		return BPY_Err_getLinenumber();
+	}
+
+	return 0;
   }
 
   struct Options
@@ -91,22 +102,20 @@ class LIB_SYSTEM_EXPORT PythonInterpreter : public Interpreter
 private:
 
   static void initPath() {
-    if (_initialized)
-      return;
-    PyRun_SimpleString("import sys");
-	     vector<string> pathnames;
-	     StringUtils::getPathName(_path, "", pathnames);
-	     string cmd;
-	     char* c_cmd;
-	     for (vector<string>::const_iterator it = pathnames.begin();
-	 it != pathnames.end();
-	 ++it) {
-	       cmd = "sys.path.append(\"" + *it + "\")";
-	       c_cmd = strdup(cmd.c_str());
-	       PyRun_SimpleString(c_cmd);
-	       free(c_cmd);
-	     }
-       PyRun_SimpleString("from Freestyle import *");
+	if (_initialized)
+		return;
+
+	// vector<string> pathnames;
+	// StringUtils::getPathName(_path, "", pathnames);
+	// 
+	// for (vector<string>::const_iterator it = pathnames.begin(); it != pathnames.end();++it) {
+	// 	if ( !it->empty() ) {
+	// 		cout << "Adding Python path: " << *it << endl;
+	// 		syspath_append( const_cast<char*>(it->c_str()) );
+	// 	}
+	// }
+	
+	//PyRun_SimpleString("from Freestyle import *");
     _initialized = true;
   }
 
diff --git a/source/blender/freestyle/intern/system/StringUtils.cpp b/source/blender/freestyle/intern/system/StringUtils.cpp
index bbdbef10a10..58798daf42a 100755
--- a/source/blender/freestyle/intern/system/StringUtils.cpp
+++ b/source/blender/freestyle/intern/system/StringUtils.cpp
@@ -27,25 +27,29 @@ namespace StringUtils {
 
   void getPathName(const string& path, const string& base, vector<string>& pathnames) {
     string dir;
-    unsigned size = path.size();
-    pathnames.push_back(base);
-    for (unsigned pos = 0, sep = path.find(Config::PATH_SEP, pos);
-	 pos < size;
-	 pos = sep + 1, sep = path.find(Config::PATH_SEP, pos)) {
-      if (sep == (unsigned)string::npos)
-		sep = size;
-      dir = path.substr(pos, sep - pos);
-
-//soc      QFileInfo fi(dir.c_str());
-//soc      string res = (const char*)fi.absoluteFilePath().toAscii();
+	string res;
 	char cleaned[FILE_MAX];
-	BLI_strncpy(cleaned, dir.c_str(), FILE_MAX);
-	BLI_cleanup_file(NULL, cleaned);
-	string res = toAscii( string(cleaned) );
+    unsigned size = path.size();
+
+    pathnames.push_back(base);
+
+    for (	unsigned pos = 0, sep = path.find(Config::PATH_SEP, pos);
+			pos < size;
+	 		pos = sep + 1, sep = path.find(Config::PATH_SEP, pos)) {
+
+		if (sep == (unsigned)string::npos)
+			sep = size;
+		
+		dir = path.substr(pos, sep - pos);
+
+		BLI_strncpy(cleaned, dir.c_str(), FILE_MAX);
+		BLI_cleanup_file(NULL, cleaned);
+		res = toAscii( string(cleaned) );
 	
-      if (!base.empty())
-		res += Config::DIR_SEP + base;
-      pathnames.push_back(res);
+		if (!base.empty())
+			res += Config::DIR_SEP + base;
+		
+		pathnames.push_back(res);
     }
   }
 
diff --git a/source/blender/freestyle/intern/system/StringUtils.h b/source/blender/freestyle/intern/system/StringUtils.h
index b30eaae2247..7b43886fa27 100755
--- a/source/blender/freestyle/intern/system/StringUtils.h
+++ b/source/blender/freestyle/intern/system/StringUtils.h
@@ -31,6 +31,7 @@
 # include <vector>
 # include <string>
 # include <sstream>
+# include <iostream>
 # include "FreestyleConfig.h"
 
 //soc

From 4245f8160555f12139a44d4bb8c3eac7bfc5970b Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Tue, 27 May 2008 03:29:43 +0000
Subject: [PATCH 018/252] soc-2008-mxcurioni: PythonInterpreter now properly
 handles its initialization (in accordance with original Freestyle code). This
 is achieved by creating a temporary Text structure, adding the required
 import and appending the necessary Python path. The text is executed using
 the BPY_txt_do_python_Text command.

When Freestyle is run within Blender, it should not crash; the Python interpreter should report an ImportError on _Freestyle (the SWIG wrapper).
---
 source/blender/freestyle/SConscript           |  2 +-
 .../intern/system/PythonInterpreter.h         | 25 ++++++++++++-------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript
index 623bf0308dd..4f096d35c23 100644
--- a/source/blender/freestyle/SConscript
+++ b/source/blender/freestyle/SConscript
@@ -92,4 +92,4 @@ env.BlenderLib (libname="bf_freestyle",
 
 # g++ -w  -I../geometry -I../image -I../scene_graph -I../stroke -I../system -I../view_map -I../winged_edge -I/usr/include/python2.5 -I../../../blenlib -I../../../blenkernel -I../../../imbuf -I../../../makesdna -c ModuleWrapper.cpp -o ModuleWrapper.o
 # 
-# g++ -bundle -flat_namespace -undefined suppress  -w  -L/usr/lib/python2.5/config -lpython2.5 -o ../../python/_Freestyle.so ModuleWrapper.o
\ No newline at end of file
+# g++ -bundle -flat_namespace -undefined suppress  -w  -L/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/build/darwin/lib -L/usr/lib/python2.5/config -lbf_freestyle -lbf_blenlib -lbf_blenkernel -lbf_guardedalloc -lbf_imbuf -lpython2.5 -o ../../python/_Freestyle.so ModuleWrapper.o
diff --git a/source/blender/freestyle/intern/system/PythonInterpreter.h b/source/blender/freestyle/intern/system/PythonInterpreter.h
index d9b563fabaa..540d0b3ddec 100755
--- a/source/blender/freestyle/intern/system/PythonInterpreter.h
+++ b/source/blender/freestyle/intern/system/PythonInterpreter.h
@@ -105,15 +105,22 @@ private:
 	if (_initialized)
 		return;
 
-	// vector<string> pathnames;
-	// StringUtils::getPathName(_path, "", pathnames);
-	// 
-	// for (vector<string>::const_iterator it = pathnames.begin(); it != pathnames.end();++it) {
-	// 	if ( !it->empty() ) {
-	// 		cout << "Adding Python path: " << *it << endl;
-	// 		syspath_append( const_cast<char*>(it->c_str()) );
-	// 	}
-	// }
+	vector<string> pathnames;
+	StringUtils::getPathName(_path, "", pathnames);
+	
+	struct Text *text = add_empty_text("initpath_test.txt");
+	string cmd = "import sys\n";
+	txt_insert_buf(text, const_cast<char*>(cmd.c_str()));
+	
+	for (vector<string>::const_iterator it = pathnames.begin(); it != pathnames.end();++it) {
+		if ( !it->empty() ) {
+			cout << "Adding Python path: " << *it << endl;
+			cmd = "sys.path.append(\"" + *it + "\")\n";
+			txt_insert_buf(text, const_cast<char*>(cmd.c_str()));
+		}
+	}
+	
+	BPY_txt_do_python_Text(text);
 	
 	//PyRun_SimpleString("from Freestyle import *");
     _initialized = true;

From 8676e9f44e8f5e1904bbeb12efec51a2061e656d Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Tue, 27 May 2008 12:38:07 +0000
Subject: [PATCH 019/252] rebranching for skeleton generation phase 2


From e70573badd22fc08b72c7c56f39293bc70d52c71 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Tue, 27 May 2008 13:22:17 +0000
Subject: [PATCH 020/252] gHash iterator initializer

To be able to have iterators on the stack/reuse iterators
---
 source/blender/blenlib/BLI_ghash.h        | 16 +++++++++++++++-
 source/blender/blenlib/intern/BLI_ghash.c | 17 +++++++++++------
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/source/blender/blenlib/BLI_ghash.h b/source/blender/blenlib/BLI_ghash.h
index aec77f5f385..c77e82f0a2b 100644
--- a/source/blender/blenlib/BLI_ghash.h
+++ b/source/blender/blenlib/BLI_ghash.h
@@ -34,7 +34,12 @@
 
 struct GHash;
 typedef struct GHash GHash;
-typedef struct GHashIterator GHashIterator;
+
+typedef struct GHashIterator {
+	GHash *gh;
+	int curBucket;
+	struct Entry *curEntry;
+} GHashIterator;
 
 typedef unsigned int	(*GHashHashFP)		(void *key);
 typedef int				(*GHashCmpFP)		(void *a, void *b);
@@ -62,6 +67,15 @@ int		BLI_ghash_size		(GHash *gh);
 	 * @return Pointer to a new DynStr.
 	 */
 GHashIterator*	BLI_ghashIterator_new		(GHash *gh);
+	/**
+	 * Init an already allocated GHashIterator. The hash table must not
+	 * be mutated while the iterator is in use, and the iterator will
+	 * step exactly BLI_ghash_size(gh) times before becoming done.
+	 * 
+	 * @param ghi The GHashIterator to initialize.
+	 * @param gh The GHash to iterate over.
+	 */
+void BLI_ghashIterator_init(GHashIterator *ghi, GHash *gh);
 	/**
 	 * Free a GHashIterator.
 	 *
diff --git a/source/blender/blenlib/intern/BLI_ghash.c b/source/blender/blenlib/intern/BLI_ghash.c
index 227cb8f5e9a..bae6ad428ea 100644
--- a/source/blender/blenlib/intern/BLI_ghash.c
+++ b/source/blender/blenlib/intern/BLI_ghash.c
@@ -198,12 +198,6 @@ void BLI_ghash_free(GHash *gh, GHashKeyFreeFP keyfreefp, GHashValFreeFP valfreef
 
 /***/
 
-struct GHashIterator {
-	GHash *gh;
-	int curBucket;
-	Entry *curEntry;
-};
-
 GHashIterator *BLI_ghashIterator_new(GHash *gh) {
 	GHashIterator *ghi= malloc(sizeof(*ghi));
 	ghi->gh= gh;
@@ -217,6 +211,17 @@ GHashIterator *BLI_ghashIterator_new(GHash *gh) {
 	}
 	return ghi;
 }
+void BLI_ghashIterator_init(GHashIterator *ghi, GHash *gh) {
+	ghi->gh= gh;
+	ghi->curEntry= NULL;
+	ghi->curBucket= -1;
+	while (!ghi->curEntry) {
+		ghi->curBucket++;
+		if (ghi->curBucket==ghi->gh->nbuckets)
+			break;
+		ghi->curEntry= ghi->gh->buckets[ghi->curBucket];
+	}
+}
 void BLI_ghashIterator_free(GHashIterator *ghi) {
 	free(ghi);
 }

From 1345417f27c684b23e442c5ee54982a079654724 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Tue, 27 May 2008 13:24:38 +0000
Subject: [PATCH 021/252] Reeb Graph importer (for debuging purpose only)

---
 release/scripts/reeb.py | 96 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 96 insertions(+)
 create mode 100644 release/scripts/reeb.py

diff --git a/release/scripts/reeb.py b/release/scripts/reeb.py
new file mode 100644
index 00000000000..4c4176739e1
--- /dev/null
+++ b/release/scripts/reeb.py
@@ -0,0 +1,96 @@
+#!BPY
+ 
+"""
+Name: 'Reeb graph import'
+Blender: 245
+Group: 'Import'
+Tooltip: 'Imports a reeb graph saved after skeleton generation'
+"""
+import Blender
+
+def name(count):
+	if count == -1:
+		return ""
+	else:
+		return "%05" % count
+
+def importGraph(count):
+	me = Blender.Mesh.New("graph%s" % name(count))
+	scn = Blender.Scene.GetCurrent()
+	
+	f = open("test%s.txt" % name(count), "r")
+	
+	verts = []
+	edges = []
+	faces = []
+	
+	i = 0
+	first = False
+	
+	SIZE = 0.3
+	WITH_NODE = True
+	
+	def addNode(v, s, verts, faces):
+		if WITH_NODE:
+			v1 = [v[0], v[1], v[2] + s]
+			i1 = len(verts)
+			verts.append(v1)
+			v2 = [v[0], v[1] + 0.959 * s, v[2] - 0.283 * s]
+			i2 = len(verts)
+			verts.append(v2)
+			v3 = [v[0] - 0.830 * s, v[1] - 0.479 * s, v[2] - 0.283 * s]
+			i3 = len(verts)
+			verts.append(v3)
+			v4 = [v[0] + 0.830 * s, v[1] - 0.479 * s, v[2] - 0.283 * s]
+			i4 = len(verts)
+			verts.append(v4)
+			
+			faces.append([i1,i2,i3])
+			faces.append([i1,i3,i4])
+			faces.append([i2,i3,i4])
+			faces.append([i1,i2,i4])
+			
+			return 4
+		else:
+			return 0
+		
+	for line in f:
+		data = line.strip().split(" ")
+		if data[0] == "v1":
+			v = [float(x) for x in data[-3:]]
+			i += addNode(v, SIZE, verts, faces)
+			verts.append(v)
+			i += 1
+		elif data[0] == "v2":
+			pass
+			v = [float(x) for x in data[-3:]]
+			verts.append(v)
+			edges.append((i-1, i))
+			i += 1
+			i += addNode(v, SIZE, verts, faces)
+		elif data[0] == "b":
+			verts.append([float(x) for x in data[-3:]])
+			edges.append((i-1, i))
+			i += 1
+#		elif data[0] == "angle":
+#			obj = scn.objects.new('Empty')
+#			obj.loc = (float(data[1]), float(data[2]), float(data[3]))
+#			obj.properties["angle"] = data[4]
+#			del obj
+                        
+                        
+	me.verts.extend(verts)
+	me.edges.extend(edges)
+	me.faces.extend(faces)
+	
+	
+	ob = scn.objects.new(me, "graph%s" % name(count))
+	del ob
+	del scn
+	
+
+#for i in range(16):
+#	importGraph(i)
+
+if __name__=='__main__':
+	importGraph(-1)

From db44a4a1a79286ed77dd34d0aaf1259a1f85d3be Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Tue, 27 May 2008 13:33:24 +0000
Subject: [PATCH 022/252] Skeleton retargetting - Preliminary commit. Results
 are encouraging but nothing *that* useful yet

Smarter heuristic noise arc filtering for Reeb graph
---
 source/blender/include/BIF_editarmature.h |    5 +
 source/blender/include/butspace.h         |    3 +-
 source/blender/include/reeb.h             |   56 +-
 source/blender/makesdna/DNA_scene_types.h |    3 +
 source/blender/src/autoarmature.c         | 1690 +++++++++++++++++++++
 source/blender/src/buttons_editing.c      |   43 +-
 source/blender/src/editarmature.c         |  637 +-------
 source/blender/src/reeb.c                 | 1217 ++++++++++++++-
 8 files changed, 2990 insertions(+), 664 deletions(-)
 create mode 100644 source/blender/src/autoarmature.c

diff --git a/source/blender/include/BIF_editarmature.h b/source/blender/include/BIF_editarmature.h
index 0e1557ac378..5ed02471978 100644
--- a/source/blender/include/BIF_editarmature.h
+++ b/source/blender/include/BIF_editarmature.h
@@ -68,6 +68,8 @@ typedef struct EditBone
 
 } EditBone;
 
+void	make_boneList(struct ListBase *list, struct ListBase *bones, EditBone *parent);
+void	editbones_to_armature (struct ListBase *list, struct Object *ob);
 
 void	adduplicate_armature(void);
 void	addvert_armature(void);
@@ -142,6 +144,9 @@ void	show_all_armature_bones(void);
 
 #define BONESEL_NOSEL	0x80000000	/* Indicates a negative number */
 
+/* from autoarmature */
+void BIF_retargetArmature();
+
 #endif
 
 
diff --git a/source/blender/include/butspace.h b/source/blender/include/butspace.h
index 7571d64be91..bd1cc46c211 100644
--- a/source/blender/include/butspace.h
+++ b/source/blender/include/butspace.h
@@ -444,7 +444,8 @@ void curvemap_buttons(struct uiBlock *block, struct CurveMapping *cumap, char la
 #define B_SETMCOL_RND		2083
 #define B_DRAWBWEIGHTS		2084
 
-#define B_GEN_SKELETON		2090
+#define B_GEN_SKELETON		2085
+#define B_RETARGET_SKELETON	2086
 
 /* *********************** */
 #define B_VGROUPBUTS		2100
diff --git a/source/blender/include/reeb.h b/source/blender/include/reeb.h
index c8352aedec5..e26b4080249 100644
--- a/source/blender/include/reeb.h
+++ b/source/blender/include/reeb.h
@@ -30,6 +30,7 @@
 
 #include "DNA_listBase.h"
 
+struct GHash;
 struct EdgeHash;
 struct ReebArc;
 struct ReebEdge;
@@ -55,7 +56,11 @@ typedef struct ReebNode {
 	int degree;
 	float weight;
 	float p[3];
-	int flags;
+	int flag;
+
+	int symmetry_level;
+	int symmetry_flag;
+	float symmetry_axis[3];
 } ReebNode;
 
 typedef struct ReebEdge {
@@ -63,6 +68,7 @@ typedef struct ReebEdge {
 	struct ReebArc  *arc;
 	struct ReebNode *v1, *v2;
 	struct ReebEdge *nextEdge;
+	int flag;
 } ReebEdge;
 
 typedef struct ReebArc {
@@ -71,7 +77,13 @@ typedef struct ReebArc {
 	struct ReebNode *v1, *v2;
 	struct EmbedBucket *buckets;
 	int	bcount;
-	int flags;
+	int flag;
+
+	int symmetry_level;
+	int symmetry_flag;
+
+	struct GHash *faces;	
+	float angle;
 } ReebArc;
 
 typedef struct ReebArcIterator {
@@ -87,21 +99,28 @@ struct EditMesh;
 int weightToHarmonic(struct EditMesh *em);
 int weightFromDistance(struct EditMesh *em);
 int weightFromLoc(struct EditMesh *me, int axis);
-void weightToVCol(struct EditMesh *em);
+void weightToVCol(struct EditMesh *em, int index);
+void arcToVCol(struct ReebGraph *rg, struct EditMesh *em, int index);
+void angleToVCol(EditMesh *em, int index);
 void renormalizeWeight(struct EditMesh *em, float newmax);
 
 ReebGraph * generateReebGraph(struct EditMesh *me, int subdivisions);
-void freeGraph(ReebGraph *rg);
-void exportGraph(ReebGraph *rg, int count);
+ReebGraph * newReebGraph();
 
 #define OTHER_NODE(arc, node) ((arc->v1 == node) ? arc->v2 : arc->v1)
 
 void initArcIterator(struct ReebArcIterator *iter, struct ReebArc *arc, struct ReebNode *head);
 void initArcIterator2(struct ReebArcIterator *iter, struct ReebArc *arc, int start, int end);
+void initArcIteratorStart(struct ReebArcIterator *iter, struct ReebArc *arc, struct ReebNode *head, int start);
 struct EmbedBucket * nextBucket(struct ReebArcIterator *iter);
+struct EmbedBucket * nextNBucket(ReebArcIterator *iter, int n);
+struct EmbedBucket * currentBucket(struct ReebArcIterator *iter);
+struct EmbedBucket * previousBucket(struct ReebArcIterator *iter);
+int iteratorStopped(struct ReebArcIterator *iter);
 
 /* Filtering */
 void filterNullReebGraph(ReebGraph *rg);
+int filterSmartReebGraph(ReebGraph *rg, float threshold);
 int filterExternalReebGraph(ReebGraph *rg, float threshold);
 int filterInternalReebGraph(ReebGraph *rg, float threshold);
 
@@ -121,7 +140,32 @@ int countConnectedArcs(ReebGraph *rg, ReebNode *node);
 int hasAdjacencyList(ReebGraph *rg); 
 int	isGraphCyclic(ReebGraph *rg);
 
-/* Sanity check */
+/*------------ Symmetry handling ------------*/
+void markdownSymmetry(ReebGraph *rg);
+
+/* ReebNode symmetry flags */
+#define SYM_TOPOLOGICAL	1
+#define SYM_PHYSICAL	2
+
+/* the following two are exclusive */
+#define SYM_AXIAL		4
+#define SYM_RADIAL		8
+
+/* ReebArc symmetry flags
+ * 
+ * axial symetry sides */
+#define SYM_SIDE_POSITIVE		1
+#define SYM_SIDE_NEGATIVE		2
+
+
+
+/*------------ Sanity check ------------*/
 void verifyBuckets(ReebGraph *rg);
+void verifyFaces(ReebGraph *rg);
+
+/*********************** PUBLIC *********************************/
+ReebGraph *BIF_ReebGraphFromEditMesh(void);
+void REEB_freeGraph(ReebGraph *rg);
+void REEB_exportGraph(ReebGraph *rg, int count);
 
 #endif /*REEB_H_*/
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 7b1b979b777..1ddebf5d6e4 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -433,6 +433,8 @@ typedef struct ToolSettings {
 	float skgen_angle_limit;
 	float skgen_correlation_limit;
 	float skgen_symmetry_limit;
+	float skgen_retarget_angle_weight;
+	float skgen_retarget_length_weight;
 	short skgen_options;
 	char  skgen_postpro;
 	char  skgen_postpro_passes;
@@ -831,6 +833,7 @@ typedef struct Scene {
 #define	SKGEN_CUT_LENGTH		8
 #define	SKGEN_CUT_ANGLE			16
 #define	SKGEN_CUT_CORRELATION	32
+#define	SKGEN_HARMONIC			64
 
 #define	SKGEN_SUB_LENGTH		0
 #define	SKGEN_SUB_ANGLE			1
diff --git a/source/blender/src/autoarmature.c b/source/blender/src/autoarmature.c
new file mode 100644
index 00000000000..d3cea1be786
--- /dev/null
+++ b/source/blender/src/autoarmature.c
@@ -0,0 +1,1690 @@
+/**
+ * $Id: editarmature.c 14848 2008-05-15 08:05:56Z 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): Martin Poirier
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ * autoarmature.c: Interface for automagically manipulating armature (retarget, created, ...)
+ */
+
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h> 
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "MEM_guardedalloc.h"
+
+#include "DNA_ID.h"
+#include "DNA_armature_types.h"
+#include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
+#include "DNA_object_types.h"
+#include "DNA_scene_types.h"
+#include "DNA_view3d_types.h"
+
+#include "BLI_blenlib.h"
+#include "BLI_arithb.h"
+#include "BLI_editVert.h"
+#include "BLI_ghash.h"
+
+#include "BDR_editobject.h"
+
+#include "BKE_global.h"
+#include "BKE_utildefines.h"
+
+#include "BIF_editarmature.h"
+#include "BIF_space.h"
+
+#include "PIL_time.h"
+
+#include "mydevice.h"
+#include "reeb.h" // FIX ME
+#include "blendef.h"
+
+/************ RIG RETARGET DATA STRUCTURES ***************/
+
+struct RigJoint;
+struct RigGraph;
+struct RigNode;
+struct RigArc;
+struct RigEdge;
+
+typedef struct RigGraph {
+	ListBase arcs;
+	ListBase nodes;
+	struct RigNode *head;
+	
+	ReebGraph *link;
+} RigGraph;
+
+typedef struct RigNode {
+	struct RigNode *next, *prev;
+	float p[3];
+	int degree;
+	struct RigArc **arcs;
+	int flag;
+	
+	int symmetry_level;
+	int symmetry_flag;
+	float symmetry_axis[3];
+
+	ReebNode *link;
+} RigNode;
+
+typedef struct RigArc {
+	struct RigArc *next, *prev;
+	RigNode *head, *tail;
+	ListBase edges;
+	float length;
+	int flag;
+
+	int symmetry_level;
+	int symmetry_flag;
+	
+	int count;
+	ReebArc *link;
+} RigArc;
+
+typedef struct RigEdge {
+	struct RigEdge *next, *prev;
+	float head[3], tail[3];
+	float length;
+	float angle;
+	EditBone *bone;
+} RigEdge;
+
+/*******************************************************************************************************/
+
+static void RIG_calculateEdgeAngle(RigEdge *edge_first, RigEdge *edge_second);
+void RIG_markdownSymmetry(RigGraph *rg);
+void RIG_markdownSymmetryArc(RigArc *arc, RigNode *node, int level);
+void RIG_markdownSecondarySymmetry(RigNode *node, int depth, int level);
+
+
+/*******************************************************************************************************/
+static RigNode *RIG_otherNode(RigArc *arc, RigNode *node)
+{
+	if (arc->head == node)
+		return arc->tail;
+	else
+		return arc->head;
+}
+
+static void RIG_flagNodes(RigGraph *rg, int flag)
+{
+	RigNode *node;
+	
+	for(node = rg->nodes.first; node; node = node->next)
+	{
+		node->flag = flag;
+	}
+}
+
+static void RIG_flagArcs(RigGraph *rg, int flag)
+{
+	RigArc *arc;
+	
+	for(arc = rg->arcs.first; arc; arc = arc->next)
+	{
+		arc->flag = flag;
+	}
+}
+
+static void RIG_addArcToNodeAdjacencyList(RigNode *node, RigArc *arc)
+{
+	node->arcs[node->degree] = arc;
+	node->degree++;
+}
+/*********************************** EDITBONE UTILS ****************************************************/
+
+int countEditBoneChildren(ListBase *list, EditBone *parent)
+{
+	EditBone *ebone;
+	int count = 0;
+	
+	for (ebone = list->first; ebone; ebone = ebone->next)
+	{
+		if (ebone->parent == parent)
+		{
+			count++;
+		}
+	}
+	
+	return count;
+}
+
+EditBone* nextEditBoneChild(ListBase *list, EditBone *parent, int n)
+{
+	EditBone *ebone;
+	
+	for (ebone = list->first; ebone; ebone = ebone->next)
+	{
+		if (ebone->parent == parent)
+		{
+			if (n == 0)
+			{
+				return ebone;
+			}
+			n--;
+		}
+	}
+	
+	return NULL;
+}
+
+/************************************* ALLOCATORS ******************************************************/
+
+static RigGraph *newRigGraph()
+{
+	RigGraph *rg;
+	rg = MEM_callocN(sizeof(RigGraph), "rig graph");
+	
+	rg->head = NULL;
+	
+	return rg;
+}
+
+static RigArc *newRigArc(RigGraph *rg)
+{
+	RigArc *arc;
+	
+	arc = MEM_callocN(sizeof(RigArc), "rig arc");
+	arc->length = 0;
+	arc->count = 0;
+	
+	BLI_addtail(&rg->arcs, arc);
+	
+	return arc;
+}
+
+static RigNode *newRigNodeHead(RigGraph *rg, RigArc *arc, float p[3])
+{
+	RigNode *node;
+	node = MEM_callocN(sizeof(RigNode), "rig node");
+	BLI_addtail(&rg->nodes, node);
+
+	VECCOPY(node->p, p);
+	node->degree = 1;
+	node->arcs = NULL;
+	
+	arc->head = node;
+	
+	return node;
+}
+
+static void addRigNodeHead(RigGraph *rg, RigArc *arc, RigNode *node)
+{
+	node->degree++;
+
+	arc->head = node;
+}
+
+static RigNode *newRigNodeTail(RigGraph *rg, RigArc *arc, float p[3])
+{
+	RigNode *node;
+	node = MEM_callocN(sizeof(RigNode), "rig node");
+	BLI_addtail(&rg->nodes, node);
+
+	VECCOPY(node->p, p);
+	node->degree = 1;
+	node->arcs = NULL;
+	
+	arc->tail = node;
+
+	return node;
+}
+
+static void RIG_addEdgeToArc(RigArc *arc, float tail[3], EditBone *bone)
+{
+	RigEdge *edge;
+
+	edge = MEM_callocN(sizeof(RigEdge), "rig edge");
+	BLI_addtail(&arc->edges, edge);
+
+
+	VECCOPY(edge->tail, tail);
+	edge->bone = bone;
+	
+	if (edge->prev == NULL)
+	{
+		VECCOPY(edge->head, arc->head->p);
+	}
+	else
+	{
+		RigEdge *last_edge = edge->prev;
+		VECCOPY(edge->head, last_edge->tail);
+		RIG_calculateEdgeAngle(last_edge, edge);
+	}
+	
+	edge->length = VecLenf(edge->head, edge->tail);
+	
+	arc->length += edge->length;
+	arc->count += 1;
+}
+
+/************************************ DESTRUCTORS ******************************************************/
+
+static void RIG_freeRigNode(RigNode *node)
+{
+	if (node->arcs)
+	{
+		MEM_freeN(node->arcs);
+	}
+}
+
+static void RIG_freeRigArc(RigArc *arc)
+{
+	BLI_freelistN(&arc->edges);
+}
+
+static void RIG_freeRigGraph(RigGraph *rg)
+{
+	RigNode *node;
+	RigArc *arc;
+	
+	for (arc = rg->arcs.first; arc; arc = arc->next)
+	{
+		RIG_freeRigArc(arc);
+	}
+	BLI_freelistN(&rg->arcs);
+	
+	for (node = rg->nodes.first; node; node = node->next)
+	{
+		RIG_freeRigNode(node);
+	}
+	BLI_freelistN(&rg->nodes);
+	
+	MEM_freeN(rg);
+}
+
+/*******************************************************************************************************/
+
+static void RIG_buildAdjacencyList(RigGraph *rg)
+{
+	RigNode *node;
+	RigArc *arc;
+
+	for(node = rg->nodes.first; node; node = node->next)
+	{
+		if (node->arcs != NULL)
+		{
+			MEM_freeN(node->arcs);
+		}
+		
+		node->arcs = MEM_callocN((node->degree + 1) * sizeof(RigArc*), "adjacency list");
+		
+		/* temporary use to indicate the first index available in the lists */
+		node->degree = 0;
+	}
+
+	for(arc = rg->arcs.first; arc; arc= arc->next)
+	{
+		RIG_addArcToNodeAdjacencyList(arc->head, arc);
+		RIG_addArcToNodeAdjacencyList(arc->tail, arc);
+	}
+}
+
+static void RIG_replaceNode(RigGraph *rg, RigNode *node_src, RigNode *node_replaced)
+{
+	RigArc *arc, *next_arc;
+	
+	for (arc = rg->arcs.first; arc; arc = next_arc)
+	{
+		next_arc = arc->next;
+		
+		if (arc->head == node_replaced)
+		{
+			arc->head = node_src;
+			node_src->degree++;
+		}
+
+		if (arc->tail == node_replaced)
+		{
+			arc->tail = node_src;
+			node_src->degree++;
+		}
+		
+		if (arc->head == arc->tail)
+		{
+			node_src->degree -= 2;
+			
+			RIG_freeRigArc(arc);
+			BLI_freelinkN(&rg->arcs, arc);
+		}
+	}
+}
+
+static void RIG_removeDoubleNodes(RigGraph *rg, float limit)
+{
+	RigNode *node_src, *node_replaced;
+	
+	for(node_src = rg->nodes.first; node_src; node_src = node_src->next)
+	{
+		for(node_replaced = rg->nodes.first; node_replaced; node_replaced = node_replaced->next)
+		{
+			if (node_replaced != node_src && VecLenf(node_replaced->p, node_src->p) <= limit)
+			{
+				RIG_replaceNode(rg, node_src, node_replaced);
+			}
+		}
+	}
+	
+}
+
+static void RIG_calculateEdgeAngle(RigEdge *edge_first, RigEdge *edge_second)
+{
+	float vec_first[3], vec_second[3];
+	
+	VecSubf(vec_first, edge_first->tail, edge_first->head); 
+	VecSubf(vec_second, edge_second->tail, edge_second->head);
+
+	Normalize(vec_first);
+	Normalize(vec_second);
+	
+	edge_first->angle = saacos(Inpf(vec_first, vec_second));
+}
+
+/*********************************** GRAPH AS TREE FUNCTIONS *******************************************/
+
+int RIG_subtreeDepth(RigNode *node, RigArc *rootArc)
+{
+	int depth = 0;
+	
+	/* Base case, no arcs leading away */
+	if (node->arcs == NULL || *(node->arcs) == NULL)
+	{
+		return 0;
+	}
+	else
+	{
+		RigArc ** pArc;
+
+		for(pArc = node->arcs; *pArc; pArc++)
+		{
+			RigArc *arc = *pArc;
+			
+			/* only arcs that go down the tree */
+			if (arc != rootArc)
+			{
+				RigNode *newNode = RIG_otherNode(arc, node);
+				depth = MAX2(depth, RIG_subtreeDepth(newNode, arc));
+			}
+		}
+	}
+	
+	return depth + BLI_countlist(&rootArc->edges);
+}
+
+int RIG_countConnectedArcs(RigGraph *rg, RigNode *node)
+{
+	int count = 0;
+	
+	/* use adjacency list if present */
+	if (node->arcs)
+	{
+		RigArc **arcs;
+	
+		for(arcs = node->arcs; *arcs; arcs++)
+		{
+			count++;
+		}
+	}
+	else
+	{
+		RigArc *arc;
+		for(arc = rg->arcs.first; arc; arc = arc->next)
+		{
+			if (arc->head == node || arc->tail == node)
+			{
+				count++;
+			}
+		}
+	}
+	
+	return count;
+}
+
+/********************************* SYMMETRY DETECTION **************************************************/
+
+static void mirrorAlongAxis(float v[3], float center[3], float axis[3])
+{
+	float dv[3], pv[3];
+	
+	VecSubf(dv, v, center);
+	Projf(pv, dv, axis);
+	VecMulf(pv, -2);
+	VecAddf(v, v, pv);
+}
+
+/* Helper structure for radial symmetry */
+typedef struct RadialArc
+{
+	RigArc *arc; 
+	float n[3]; /* normalized vector joining the nodes of the arc */
+} RadialArc;
+
+void RIG_markRadialSymmetry(RigNode *node, int depth, float axis[3])
+{
+	RadialArc *ring = NULL;
+	RadialArc *unit;
+	float limit = G.scene->toolsettings->skgen_symmetry_limit;
+	int symmetric = 1;
+	int count = 0;
+	int i;
+
+	/* mark topological symmetry */
+	node->symmetry_flag |= SYM_TOPOLOGICAL;
+
+	/* count the number of arcs in the symmetry ring */
+	for (i = 0; node->arcs[i] != NULL; i++)
+	{
+		RigArc *connectedArc = node->arcs[i];
+		
+		/* depth is store as a negative in flag. symmetry level is positive */
+		if (connectedArc->symmetry_level == -depth)
+		{
+			count++;
+		}
+	}
+
+	ring = MEM_callocN(sizeof(RadialArc) * count, "radial symmetry ring");
+	unit = ring;
+
+	/* fill in the ring */
+	for (unit = ring, i = 0; node->arcs[i] != NULL; i++)
+	{
+		RigArc *connectedArc = node->arcs[i];
+		
+		/* depth is store as a negative in flag. symmetry level is positive */
+		if (connectedArc->symmetry_level == -depth)
+		{
+			RigNode *otherNode = RIG_otherNode(connectedArc, node);
+			float vec[3];
+
+			unit->arc = connectedArc;
+
+			/* project the node to node vector on the symmetry plane */
+			VecSubf(unit->n, otherNode->p, node->p);
+			Projf(vec, unit->n, axis);
+			VecSubf(unit->n, unit->n, vec);
+
+			Normalize(unit->n);
+
+			unit++;
+		}
+	}
+
+	/* sort ring */
+	for (i = 0; i < count - 1; i++)
+	{
+		float minAngle = 3; /* arbitrary high value, higher than 2, at least */
+		int minIndex = -1;
+		int j;
+
+		for (j = i + 1; j < count; j++)
+		{
+			float angle = Inpf(ring[i].n, ring[j].n);
+
+			/* map negative values to 1..2 */
+			if (angle < 0)
+			{
+				angle = 1 - angle;
+			}
+
+			if (angle < minAngle)
+			{
+				minIndex = j;
+				minAngle = angle;
+			}
+		}
+
+		/* swap if needed */
+		if (minIndex != i + 1)
+		{
+			RadialArc tmp;
+			tmp = ring[i + 1];
+			ring[i + 1] = ring[minIndex];
+			ring[minIndex] = tmp;
+		}
+	}
+
+	for (i = 0; i < count && symmetric; i++)
+	{
+		RigNode *node1, *node2;
+		float tangent[3];
+		float normal[3];
+		float p[3];
+		int j = (i + 1) % count; /* next arc in the circular list */
+
+		VecAddf(tangent, ring[i].n, ring[j].n);
+		Crossf(normal, tangent, axis);
+		
+		node1 = RIG_otherNode(ring[i].arc, node);
+		node2 = RIG_otherNode(ring[j].arc, node);
+
+		VECCOPY(p, node2->p);
+		mirrorAlongAxis(p, node->p, normal);
+		
+		/* check if it's within limit before continuing */
+		if (VecLenf(node1->p, p) > limit)
+		{
+			symmetric = 0;
+		}
+
+	}
+
+	if (symmetric)
+	{
+		/* mark node as symmetric physically */
+		VECCOPY(node->symmetry_axis, axis);
+		node->symmetry_flag |= SYM_PHYSICAL;
+		node->symmetry_flag |= SYM_RADIAL;
+	}
+
+	MEM_freeN(ring);
+}
+
+static void setSideAxialSymmetry(RigNode *root_node, RigNode *end_node, RigArc *arc)
+{
+	float vec[3];
+	
+	VecSubf(vec, end_node->p, root_node->p);
+	
+	if (Inpf(vec, root_node->symmetry_axis) < 0)
+	{
+		arc->symmetry_flag |= SYM_SIDE_NEGATIVE;
+	}
+	else
+	{
+		arc->symmetry_flag |= SYM_SIDE_POSITIVE;
+	}
+}
+
+void RIG_markAxialSymmetry(RigNode *node, int depth, float axis[3])
+{
+	RigArc *arc1 = NULL;
+	RigArc *arc2 = NULL;
+	RigNode *node1 = NULL, *node2 = NULL;
+	float limit = G.scene->toolsettings->skgen_symmetry_limit;
+	float nor[3], vec[3], p[3];
+	int i;
+	
+	/* mark topological symmetry */
+	node->symmetry_flag |= SYM_TOPOLOGICAL;
+
+	for (i = 0; node->arcs[i] != NULL; i++)
+	{
+		RigArc *connectedArc = node->arcs[i];
+		
+		/* depth is store as a negative in flag. symmetry level is positive */
+		if (connectedArc->symmetry_level == -depth)
+		{
+			if (arc1 == NULL)
+			{
+				arc1 = connectedArc;
+				node1 = RIG_otherNode(arc1, node);
+			}
+			else
+			{
+				arc2 = connectedArc;
+				node2 = RIG_otherNode(arc2, node);
+				break; /* Can stop now, the two arcs have been found */
+			}
+		}
+	}
+	
+	/* shouldn't happen, but just to be sure */
+	if (node1 == NULL || node2 == NULL)
+	{
+		return;
+	}
+	
+	VecSubf(vec, node1->p, node->p);
+	Normalize(vec);
+	VecSubf(p, node->p, node2->p);
+	Normalize(p);
+	VecAddf(p, p, vec);
+
+	Crossf(vec, p, axis);
+	Crossf(nor, vec, axis);
+	
+	/* mirror node2 along axis */
+	VECCOPY(p, node2->p);
+	mirrorAlongAxis(p, node->p, nor);
+	
+	/* check if it's within limit before continuing */
+	if (VecLenf(node1->p, p) <= limit)
+	{
+		/* mark node as symmetric physically */
+		VECCOPY(node->symmetry_axis, nor);
+		node->symmetry_flag |= SYM_PHYSICAL;
+		node->symmetry_flag |= SYM_AXIAL;
+
+		/* set side on arcs */
+		setSideAxialSymmetry(node, node1, arc1);
+		setSideAxialSymmetry(node, node2, arc2);
+		printf("flag: %i <-> %i\n", arc1->symmetry_flag, arc2->symmetry_flag);
+	}
+	else
+	{
+		printf("NOT SYMMETRIC!\n");
+		printf("%f <= %f\n", VecLenf(node1->p, p), limit);
+		printvecf("axis", nor);
+	}
+}
+
+void RIG_markdownSecondarySymmetry(RigNode *node, int depth, int level)
+{
+	float axis[3] = {0, 0, 0};
+	int count = 0;
+	int i;
+
+	/* count the number of branches in this symmetry group
+	 * and determinte the axis of symmetry
+	 *  */	
+	for (i = 0; node->arcs[i] != NULL; i++)
+	{
+		RigArc *connectedArc = node->arcs[i];
+		
+		/* depth is store as a negative in flag. symmetry level is positive */
+		if (connectedArc->symmetry_level == -depth)
+		{
+			count++;
+		}
+		/* If arc is on the axis */
+		else if (connectedArc->symmetry_level == level)
+		{
+			VecAddf(axis, axis, connectedArc->head->p);
+			VecSubf(axis, axis, connectedArc->tail->p);
+		}
+	}
+
+	Normalize(axis);
+
+	/* Split between axial and radial symmetry */
+	if (count == 2)
+	{
+		RIG_markAxialSymmetry(node, depth, axis);
+	}
+	else
+	{
+		RIG_markRadialSymmetry(node, depth, axis);
+	}
+	
+	/* markdown secondary symetries */	
+	for (i = 0; node->arcs[i] != NULL; i++)
+	{
+		RigArc *connectedArc = node->arcs[i];
+		
+		if (connectedArc->symmetry_level == -depth)
+		{
+			/* markdown symmetry for branches corresponding to the depth */
+			RIG_markdownSymmetryArc(connectedArc, node, level + 1);
+		}
+	}
+}
+
+void RIG_markdownSymmetryArc(RigArc *arc, RigNode *node, int level)
+{
+	int i;
+	arc->symmetry_level = level;
+	
+	node = RIG_otherNode(arc, node);
+	
+	for (i = 0; node->arcs[i] != NULL; i++)
+	{
+		RigArc *connectedArc = node->arcs[i];
+		
+		if (connectedArc != arc)
+		{
+			RigNode *connectedNode = RIG_otherNode(connectedArc, node);
+			
+			/* symmetry level is positive value, negative values is subtree depth */
+			connectedArc->symmetry_level = -RIG_subtreeDepth(connectedNode, connectedArc);
+		}
+	}
+
+	arc = NULL;
+
+	for (i = 0; node->arcs[i] != NULL; i++)
+	{
+		int issymmetryAxis = 0;
+		RigArc *connectedArc = node->arcs[i];
+		
+		/* only arcs not already marked as symetric */
+		if (connectedArc->symmetry_level < 0)
+		{
+			int j;
+			
+			/* true by default */
+			issymmetryAxis = 1;
+			
+			for (j = 0; node->arcs[j] != NULL && issymmetryAxis == 1; j++)
+			{
+				RigArc *otherArc = node->arcs[j];
+				
+				/* different arc, same depth */
+				if (otherArc != connectedArc && otherArc->symmetry_level == connectedArc->symmetry_level)
+				{
+					/* not on the symmetry axis */
+					issymmetryAxis = 0;
+				} 
+			}
+		}
+		
+		/* arc could be on the symmetry axis */
+		if (issymmetryAxis == 1)
+		{
+			/* no arc as been marked previously, keep this one */
+			if (arc == NULL)
+			{
+				arc = connectedArc;
+			}
+			else
+			{
+				/* there can't be more than one symmetry arc */
+				arc = NULL;
+				break;
+			}
+		}
+	}
+	
+	/* go down the arc continuing the symmetry axis */
+	if (arc)
+	{
+		RIG_markdownSymmetryArc(arc, node, level);
+	}
+
+	
+	/* secondary symmetry */
+	for (i = 0; node->arcs[i] != NULL; i++)
+	{
+		RigArc *connectedArc = node->arcs[i];
+		
+		/* only arcs not already marked as symetric and is not the next arc on the symmetry axis */
+		if (connectedArc->symmetry_level < 0)
+		{
+			/* subtree depth is store as a negative value in the symmetry */
+			RIG_markdownSecondarySymmetry(node, -connectedArc->symmetry_level, level);
+		}
+	}
+}
+
+void RIG_markdownSymmetry(RigGraph *rg)
+{
+	RigNode *node;
+	RigArc *arc;
+	
+	/* mark down all arcs as non-symetric */
+	RIG_flagArcs(rg, 0);
+	
+	/* mark down all nodes as not on the symmetry axis */
+	RIG_flagNodes(rg, 0);
+
+	if (rg->head)
+	{
+		node = rg->head;
+	}
+	else
+	{
+		/* !TODO! DO SOMETHING SMART HERE */
+		return;
+	}
+	
+	/* only work on acyclic graphs and if only one arc is incident on the first node */
+	if (RIG_countConnectedArcs(rg, node) == 1)
+	{
+		arc = node->arcs[0];
+		
+		RIG_markdownSymmetryArc(arc, node, 1);
+
+		/* mark down non-symetric arcs */
+		for (arc = rg->arcs.first; arc; arc = arc->next)
+		{
+			if (arc->symmetry_level < 0)
+			{
+				arc->symmetry_level = 0;
+			}
+			else
+			{
+				/* mark down nodes with the lowest level symmetry axis */
+				if (arc->head->symmetry_level == 0 || arc->head->symmetry_level > arc->symmetry_level)
+				{
+					arc->head->symmetry_level = arc->symmetry_level;
+				}
+				if (arc->tail->symmetry_level == 0 || arc->tail->symmetry_level > arc->symmetry_level)
+				{
+					arc->tail->symmetry_level = arc->symmetry_level;
+				}
+			}
+		}
+	}
+}
+
+/*******************************************************************************************************/
+
+static void RIG_arcFromBoneChain(RigGraph *rg, ListBase *list, EditBone *root_bone, RigNode *starting_node)
+{
+	EditBone *bone, *last_bone = NULL;
+	RigArc *arc;
+	int contain_head = 0;
+	
+	arc = newRigArc(rg);
+	
+	if (starting_node == NULL)
+	{
+		starting_node = newRigNodeHead(rg, arc, root_bone->head);
+	}
+	else
+	{
+		addRigNodeHead(rg, arc, starting_node);
+	}
+	
+	for(bone = root_bone; bone; bone = nextEditBoneChild(list, bone, 0))
+	{
+		int nb_children;
+		
+		if (bone->parent && (bone->flag & BONE_CONNECTED) == 0)
+		{
+			RIG_addEdgeToArc(arc, bone->head, NULL);
+		}
+		
+		RIG_addEdgeToArc(arc, bone->tail, bone);
+		
+		if (strcmp(bone->name, "head") == 0)
+		{
+			contain_head = 1;
+		}
+		
+		nb_children = countEditBoneChildren(list, bone);
+		if (nb_children > 1)
+		{
+			RigNode *end_node = newRigNodeTail(rg, arc, bone->tail);
+			int i;
+			
+			for (i = 0; i < nb_children; i++)
+			{
+				root_bone = nextEditBoneChild(list, bone, i);
+				RIG_arcFromBoneChain(rg, list, root_bone, end_node);
+			}
+			
+			/* arc ends here, break */
+			break;
+		}
+		last_bone = bone;
+	}
+	
+	/* If the loop exited without forking */
+	if (bone == NULL)
+	{
+		newRigNodeTail(rg, arc, last_bone->tail);
+	}
+
+	if (contain_head)
+	{
+		rg->head = arc->tail;
+	}
+}
+
+/*******************************************************************************************************/
+static void RIG_findHead(RigGraph *rg)
+{
+	if (rg->head == NULL)
+	{
+		if (BLI_countlist(&rg->arcs) == 1)
+		{
+			RigArc *arc = rg->arcs.first;
+			
+			rg->head = arc->head;
+		}
+	}
+}
+
+/*******************************************************************************************************/
+
+static void RIG_printNode(RigNode *node, char name[])
+{
+	printf("%s %p %i <%0.3f, %0.3f, %0.3f>\n", name, node, node->degree, node->p[0], node->p[1], node->p[2]);
+	
+	if (node->symmetry_flag & SYM_TOPOLOGICAL)
+	{
+		if (node->symmetry_flag & SYM_AXIAL)
+			printf("Symmetry AXIAL\n");
+		else if (node->symmetry_flag & SYM_RADIAL)
+			printf("Symmetry RADIAL\n");
+			
+		printvecf("symmetry axis", node->symmetry_axis);
+	}
+}
+
+static void RIG_printArcBones(RigArc *arc)
+{
+	RigEdge *edge;
+
+	for (edge = arc->edges.first; edge; edge = edge->next)
+	{
+		if (edge->bone)
+			printf("%s ", edge->bone->name);
+		else
+			printf("---- ");
+	}
+	printf("\n");
+}
+
+static void RIG_printArc(RigArc *arc)
+{
+	RigEdge *edge;
+
+	printf("\n");
+
+	RIG_printNode(arc->head, "head");
+
+	for (edge = arc->edges.first; edge; edge = edge->next)
+	{
+		printf("\tinner joints %0.3f %0.3f %0.3f\n", edge->tail[0], edge->tail[1], edge->tail[2]);
+		printf("\t\tlength %f\n", edge->length);
+		printf("\t\tangle %f\n", edge->angle * 180 / M_PI);
+		if (edge->bone)
+			printf("\t\t%s\n", edge->bone->name);
+	}	
+	printf("symmetry level: %i\n", arc->symmetry_level);
+
+	RIG_printNode(arc->tail, "tail");
+}
+
+void RIG_printGraph(RigGraph *rg)
+{
+	RigArc *arc;
+
+	for (arc = rg->arcs.first; arc; arc = arc->next)
+	{
+		RIG_printArc(arc);	
+	}
+	
+	if (rg->head)
+	{
+		RIG_printNode(rg->head, "HEAD NODE:");
+	}
+	else
+	{
+		printf("HEAD NODE: NONE\n");
+	}	
+}
+
+/*******************************************************************************************************/
+
+static RigGraph *armatureToGraph(ListBase *list)
+{
+	EditBone *ebone;
+	RigGraph *rg;
+ 	
+	rg = newRigGraph();
+
+	/* Do the rotations */
+	for (ebone = list->first; ebone; ebone=ebone->next){
+		if (ebone->parent == NULL)
+		{
+			RIG_arcFromBoneChain(rg, list, ebone, NULL);
+		}
+	}
+	
+	RIG_removeDoubleNodes(rg, 0);
+	
+	RIG_buildAdjacencyList(rg);
+	
+	RIG_findHead(rg);
+	
+	return rg;
+}
+
+/************************************ RETARGETTING *****************************************************/
+
+typedef enum 
+{
+	RETARGET_LENGTH,
+	RETARGET_AGGRESSIVE
+} RetargetMode; 
+
+static RetargetMode detectArcRetargetMode(RigArc *arc);
+static void retargetArctoArcLength(RigArc *iarc);
+
+
+static RetargetMode detectArcRetargetMode(RigArc *iarc)
+{
+	RetargetMode mode = RETARGET_AGGRESSIVE;
+	ReebArc *earc = iarc->link;
+	RigEdge *edge;
+	int large_angle = 0;
+	float avg_angle = 0;
+	float avg_length = 0;
+	int nb_edges = 0;
+	
+	
+	for (edge = iarc->edges.first; edge; edge = edge->next)
+	{
+		avg_angle += edge->angle;
+		nb_edges++;
+	}
+	
+	avg_angle /= nb_edges - 1; /* -1 because last edge doesn't have an angle */
+
+	avg_length = iarc->length / nb_edges;
+	
+	
+	if (nb_edges > 2)
+	{
+		for (edge = iarc->edges.first; edge; edge = edge->next)
+		{
+			if (fabs(edge->angle - avg_angle) > M_PI / 6)
+			{
+				large_angle = 1;
+			}
+		}
+	}
+	else if (nb_edges == 2 && avg_angle > 0)
+	{
+		large_angle = 1;
+	}
+		
+	
+	if (large_angle == 0)
+	{
+		mode = RETARGET_LENGTH;
+	}
+	
+	if (earc->bcount <= (iarc->count - 1))
+	{
+		mode = RETARGET_LENGTH;
+	}
+	
+	return mode;
+}
+
+static void printPositions(int *positions, int nb_positions)
+{
+	int i;
+	
+	for (i = 0; i < nb_positions; i++)
+	{
+		printf("%i ", positions[i]);
+	}
+	printf("\n");
+}
+
+static void retargetArctoArcAggresive(RigArc *iarc)
+{
+	ReebArcIterator iter;
+	RigEdge *edge;
+	EmbedBucket *bucket = NULL;
+	ReebNode *node_start, *node_end;
+	ReebArc *earc = iarc->link;
+	float min_cost = FLT_MAX;
+	float *vec0, *vec1, *vec2;
+	float **vec_cache;
+	float *cost_cache;
+	int *best_positions;
+	int *positions;
+	int nb_edges = BLI_countlist(&iarc->edges);
+	int nb_joints = nb_edges - 1;
+	int symmetry_axis = 0;
+	int last_index = 0;
+	int first_pass = 1;
+	int must_move = nb_joints - 1;
+	int i;
+
+	positions = MEM_callocN(sizeof(int) * nb_joints, "Aggresive positions");
+	best_positions = MEM_callocN(sizeof(int) * nb_joints, "Best Aggresive positions");
+	cost_cache = MEM_callocN(sizeof(float) * nb_edges, "Cost cache");
+	vec_cache = MEM_callocN(sizeof(float*) * (nb_edges + 1), "Vec cache");
+	
+	/* symmetry axis */
+	if (earc->symmetry_level == 1 && iarc->symmetry_level == 1)
+	{
+		symmetry_axis = 1;
+		node_start = earc->v2;
+		node_end = earc->v1;
+	}
+	else
+	{
+		node_start = earc->v1;
+		node_end = earc->v2;
+	}
+	
+	/* init with first values */
+	for (i = 0; i < nb_joints; i++)
+	{
+		positions[i] = i + 1;
+	}
+	
+	/* init cost cache */
+	for (i = 0; i < nb_edges; i++)
+	{
+		cost_cache[i] = 0;
+	}
+	
+	vec_cache[0] = node_start->p;
+	vec_cache[nb_edges] = node_end->p;
+
+	while(1)
+	{
+		float cost = 0;
+		int need_calc = 0;
+		
+		/* increment to next possible solution */
+		
+		i = nb_joints - 1;
+
+		/* increment positions, starting from the last one
+		 * until a valid increment is found
+		 * */
+		for (i = must_move; i >= 0; i--)
+		{
+			int remaining_joints = nb_joints - (i + 1); 
+			
+			positions[i] += 1;
+			need_calc = i;
+			if (positions[i] + remaining_joints < earc->bcount)
+			{
+				break;
+			}
+		}
+		
+		if (first_pass)
+		{
+			need_calc = 0;
+			first_pass = 0;
+		}
+
+		if (i == -1)
+		{
+			break;
+		}
+		
+		/* reset joints following the last increment*/
+		for (i = i + 1; i < nb_joints; i++)
+		{
+			positions[i] = positions[i - 1] + 1;
+		}
+	
+		/* calculating cost */
+		initArcIterator(&iter, earc, node_start);
+		
+		vec0 = NULL;
+		vec1 = node_start->p;
+		vec2 = NULL;
+		
+		for (edge = iarc->edges.first, i = 0, last_index = 0;
+			 edge;
+			 edge = edge->next, i += 1)
+		{
+
+			if (i >= need_calc)
+			{ 
+				float vec_first[3], vec_second[3];
+				float length1, length2;
+				float new_cost = 0;
+				
+				if (i < nb_joints)
+				{
+					bucket = nextNBucket(&iter, positions[i] - last_index);
+					vec2 = bucket->p;
+					vec_cache[i + 1] = vec2; /* update cache for updated position */
+				}
+				else
+				{
+					vec2 = node_end->p;
+				}
+				
+				vec1 = vec_cache[i];
+				
+
+				VecSubf(vec_second, vec2, vec1);
+				length2 = Normalize(vec_second);
+	
+				/* check angle */
+				if (i != 0)
+				{
+					RigEdge *previous = edge->prev;
+					float angle = previous->angle;
+					float test_angle = previous->angle;
+					
+					vec0 = vec_cache[i - 1];
+					VecSubf(vec_first, vec1, vec0); 
+					length1 = Normalize(vec_first);
+					
+					if (length1 > 0 && length2 > 0)
+					{
+						test_angle = saacos(Inpf(vec_first, vec_second));
+						/* ANGLE COST HERE */
+						new_cost += G.scene->toolsettings->skgen_retarget_angle_weight * fabs((test_angle - angle) / test_angle);
+					}
+					else
+					{
+						new_cost += M_PI;
+					}
+				}
+	
+				/* LENGTH COST HERE */
+				new_cost += G.scene->toolsettings->skgen_retarget_length_weight * fabs((length2 - edge->length) / edge->length);
+				cost_cache[i] = new_cost;
+				
+				last_index =  positions[i];
+			}
+			
+			cost += cost_cache[i];
+			
+			if (cost > min_cost)
+			{
+				must_move = i;
+				break;
+			}
+		}
+		
+		if (must_move != i || must_move > nb_joints - 1)
+		{
+			must_move = nb_joints - 1;
+		}
+
+		/* cost optimizing */
+		if (cost < min_cost)
+		{
+			min_cost = cost;
+			memcpy(best_positions, positions, sizeof(int) * nb_joints);
+		}
+	}
+
+	vec0 = node_start->p;
+	initArcIterator(&iter, earc, node_start);
+	
+	printPositions(best_positions, nb_joints);
+	printf("buckets: %i\n", earc->bcount);
+
+	/* set joints to best position */
+	for (edge = iarc->edges.first, i = 0, last_index = 0;
+		 edge;
+		 edge = edge->next, i++)
+	{
+		EditBone *bone = edge->bone;
+		
+		if (i < nb_joints)
+		{
+			bucket = nextNBucket(&iter, best_positions[i] - last_index);
+			vec1 = bucket->p;
+		}
+		else
+		{
+			vec1 = node_end->p;
+		}
+		
+		if (bone)
+		{
+			VECCOPY(bone->head, vec0);
+			VECCOPY(bone->tail, vec1);
+			printf("===\n");
+			printvecf("vec0", vec0);
+			printvecf("vec1", vec1);
+			printf("position: %i\n", best_positions[i]);
+			printf("last_index: %i\n", last_index);
+		}
+		
+		vec0 = vec1;
+		last_index =  best_positions[i];
+	}
+	
+	MEM_freeN(positions);
+	MEM_freeN(best_positions);
+	MEM_freeN(cost_cache);
+	MEM_freeN(vec_cache);
+}
+
+static void retargetArctoArcLength(RigArc *iarc)
+{
+	ReebArcIterator iter;
+	ReebArc *earc = iarc->link;
+	ReebNode *node_start, *node_end;
+	RigEdge *edge;
+	EmbedBucket *bucket = NULL;
+	float embedding_length = 0;
+	float *vec0 = NULL;
+	float *vec1 = NULL;
+	float *previous_vec = NULL;
+	int symmetry_axis = 0;
+
+	
+	/* symmetry axis */
+	if (earc->symmetry_level == 1 && iarc->symmetry_level == 1)
+	{
+		symmetry_axis = 1;
+		node_start = earc->v2;
+		node_end = earc->v1;
+	}
+	else
+	{
+		node_start = earc->v1;
+		node_end = earc->v2;
+	}
+	
+	initArcIterator(&iter, earc, node_start);
+
+	bucket = nextBucket(&iter);
+	
+	vec0 = node_start->p;
+	
+	while (bucket != NULL)
+	{
+		vec1 = bucket->p;
+		
+		embedding_length += VecLenf(vec0, vec1);
+		
+		vec0 = vec1;
+		bucket = nextBucket(&iter);
+	}
+	
+	embedding_length += VecLenf(node_end->p, vec1);
+	
+	/* fit bones */
+	initArcIterator(&iter, earc, node_start);
+
+	bucket = nextBucket(&iter);
+
+	vec0 = node_start->p;
+	previous_vec = vec0;
+	vec1 = bucket->p;
+	
+	printf("arc: %f embedding %f\n",  iarc->length, embedding_length);
+	
+	for (edge = iarc->edges.first; edge; edge = edge->next)
+	{
+		EditBone *bone = edge->bone;
+		float new_bone_length = edge->length / iarc->length * embedding_length;
+
+#if 0		
+		while (bucket && new_bone_length > VecLenf(vec0, vec1))
+		{
+			bucket = nextBucket(&iter);
+			previous_vec = vec1;
+			vec1 = bucket->p;
+		}
+		
+		if (bucket == NULL)
+		{
+			vec1 = node_end->p;
+		}
+		
+		if (embedding_length < VecLenf(vec0, vec1))
+		{
+			float dv[3], off[3];
+			float a, b, c, f;
+			
+			/* Solve quadratic distance equation */
+			VecSubf(dv, vec1, previous_vec);
+			a = Inpf(dv, dv);
+			
+			VecSubf(off, previous_vec, vec0);
+			b = 2 * Inpf(dv, off);
+			
+			c = Inpf(off, off) - (new_bone_length * new_bone_length);
+			
+			f = (-b + (float)sqrt(b * b - 4 * a * c)) / (2 * a);
+			
+			if (isnan(f) == 0 && f < 1.0f)
+			{
+				VECCOPY(vec1, dv);
+				VecMulf(vec1, f);
+				VecAddf(vec1,vec1, vec0);
+			}
+		}
+#else
+		float length = 0;
+
+		while (bucket && new_bone_length > length)
+		{
+			length += VecLenf(previous_vec, vec1);
+			bucket = nextBucket(&iter);
+			previous_vec = vec1;
+			vec1 = bucket->p;
+		}
+		
+		if (bucket == NULL)
+		{
+			vec1 = node_end->p;
+		}
+#endif
+
+		/* no need to move virtual edges (space between unconnected bones) */		
+		if (bone)
+		{
+			printf("BONE: %s\n", bone->name);
+			VECCOPY(bone->head, vec0);
+			VECCOPY(bone->tail, vec1);
+		}
+		printvecf("vec0", vec0);
+		printvecf("vec1", vec1);
+		printf("old: %f target: %f new: %f\n", edge->length, new_bone_length, VecLenf(vec0, vec1));
+		
+		vec0 = vec1;
+		previous_vec = vec1;
+	}
+}
+
+static void retargetArctoArc(RigArc *iarc)
+{
+	ReebArc *earc = iarc->link;
+	
+	if (BLI_countlist(&iarc->edges) == 1)
+	{
+		RigEdge *edge = iarc->edges.first;
+		EditBone *bone = edge->bone;
+		
+		/* symmetry axis */
+		if (earc->symmetry_level == 1 && iarc->symmetry_level == 1)
+		{
+			VECCOPY(bone->head, earc->v2->p);
+			VECCOPY(bone->tail, earc->v1->p);
+		}
+		/* or not */
+		else
+		{
+			VECCOPY(bone->head, earc->v1->p);
+			VECCOPY(bone->tail, earc->v2->p);
+		}
+	}
+	else
+	{
+		RetargetMode mode = detectArcRetargetMode(iarc);
+		
+		if (mode == RETARGET_AGGRESSIVE)
+		{
+			printf("aggresive\n");
+			retargetArctoArcAggresive(iarc);
+		}
+		else
+		{		
+			retargetArctoArcLength(iarc);
+		}
+	}
+}
+
+static void findCorrespondingArc(RigArc *start_arc, RigNode *start_node, RigArc *next_iarc)
+{
+	ReebNode *enode = start_node->link;
+	ReebArc *next_earc;
+	int symmetry_level = next_iarc->symmetry_level;
+	int symmetry_flag = next_iarc->symmetry_flag;
+	int i;
+	
+	next_iarc->link = NULL;
+		
+	for(i = 0, next_earc = enode->arcs[i]; next_earc; i++, next_earc = enode->arcs[i])
+	{
+		if (next_earc->flag == 0 && /* not already taken */
+			next_earc->symmetry_flag == symmetry_flag &&
+			next_earc->symmetry_level == symmetry_level)
+		{
+			printf("-----------------------\n");
+			printf("CORRESPONDING ARC FOUND\n");
+			RIG_printArcBones(next_iarc);
+
+			next_earc->flag = 1; // mark as taken
+			next_iarc->link = next_earc;
+			break;
+		}
+	}
+	
+	if (next_iarc->link == NULL)
+	{
+		printf("--------------------------\n");
+		printf("NO CORRESPONDING ARC FOUND\n");
+		RIG_printArcBones(next_iarc);
+		
+		printf("LOOKING FOR\n");
+		printf("flag %i -- symmetry level %i -- symmetry flag %i\n", 0, symmetry_level, symmetry_flag);
+		
+		printf("CANDIDATES\n");
+		for(i = 0, next_earc = enode->arcs[i]; next_earc; i++, next_earc = enode->arcs[i])
+		{
+			printf("flag %i -- symmetry level %i -- symmetry flag %i\n", next_earc->flag, next_earc->symmetry_level, next_earc->symmetry_flag);
+		}
+	}
+}
+
+static void retargetSubgraph(RigGraph *rigg, RigArc *start_arc, RigNode *start_node)
+{
+	RigArc *iarc = start_arc;
+	ReebArc *earc = start_arc->link;
+	RigNode *inode = start_node;
+	ReebNode *enode = start_node->link;
+	RigArc *next_iarc;
+	int i;
+		
+	retargetArctoArc(iarc);
+	
+	enode = OTHER_NODE(earc, enode);
+	inode = RIG_otherNode(iarc, inode);
+	
+	inode->link = enode;
+	
+	for(i = 0, next_iarc = inode->arcs[i]; next_iarc; i++, next_iarc = inode->arcs[i])
+	{
+		/* no back tracking */
+		if (next_iarc != iarc)
+		{
+			findCorrespondingArc(iarc, inode, next_iarc);
+			if (next_iarc->link)
+			{
+				retargetSubgraph(rigg, next_iarc, inode);
+			}
+		}
+	}
+}
+
+static void retargetGraphs(RigGraph *rigg)
+{
+	ReebGraph *reebg = rigg->link;
+	ReebArc *earc;
+	RigArc *iarc;
+	ReebNode *enode;
+	RigNode *inode;
+	
+	/* flag all ReebArcs as not taken */
+	for (earc = reebg->arcs.first; earc; earc = earc->next)
+	{
+		earc->flag = 0;
+	}
+	
+	earc = reebg->arcs.first;
+	iarc = rigg->head->arcs[0];
+	
+	iarc->link = earc;
+	earc->flag = 1;
+	
+	enode = earc->v1;
+	inode = iarc->tail;
+
+	inode->link = enode;
+
+	retargetSubgraph(rigg, iarc, inode);
+}
+
+void BIF_retargetArmature()
+{
+	Object *ob;
+	Base *base;
+	ReebGraph *reebg;
+	
+	reebg = BIF_ReebGraphFromEditMesh();
+	
+	markdownSymmetry(reebg);
+	
+	printf("Reeb Graph created\n");
+
+	base= FIRSTBASE;
+	for (base = FIRSTBASE; base; base = base->next)
+	{
+		if TESTBASELIB(base) {
+			ob = base->object;
+
+			if (ob->type==OB_ARMATURE)
+			{
+				RigGraph *rigg;
+				ListBase  list;
+				bArmature *arm;
+			 	
+				arm = ob->data;
+			
+				/* Put the armature into editmode */
+				list.first= list.last = NULL;
+				make_boneList(&list, &arm->bonebase, NULL);
+			
+				rigg = armatureToGraph(&list);
+				
+				printf("Armature graph created\n");
+		
+				RIG_markdownSymmetry(rigg);
+				
+				RIG_printGraph(rigg);
+				
+				rigg->link = reebg;
+				
+				printf("retargetting %s\n", ob->id.name);
+				
+				retargetGraphs(rigg);
+				
+				/* Turn the list into an armature */
+				editbones_to_armature(&list, ob);
+				
+				BLI_freelistN(&list);
+
+				RIG_freeRigGraph(rigg);
+			}
+		}
+	}
+
+	REEB_freeGraph(reebg);
+	
+	BIF_undo_push("Retarget Skeleton");
+	
+	exit_editmode(EM_FREEDATA|EM_FREEUNDO|EM_WAITCURSOR); // freedata, and undo
+
+	allqueue(REDRAWVIEW3D, 0);
+}
diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c
index 1365baf075a..2b55fec084a 100644
--- a/source/blender/src/buttons_editing.c
+++ b/source/blender/src/buttons_editing.c
@@ -4891,6 +4891,9 @@ void do_meshbuts(unsigned short event)
 	case B_GEN_SKELETON:
 		generateSkeleton();
 		break;
+	case B_RETARGET_SKELETON:
+		BIF_retargetArmature();
+		break;
 	}
 
 	/* WATCH IT: previous events only in editmode! */
@@ -4989,6 +4992,38 @@ static void skgen_reorder(void *option, void *arg2)
 	}
 }
 
+static void editing_panel_mesh_skgen_retarget(Object *ob, Mesh *me)
+{
+	uiBlock *block;
+
+	block= uiNewBlock(&curarea->uiblocks, "editing_panel_mesh_skgen_retarget", UI_EMBOSS, UI_HELV, curarea->win);
+	uiNewPanelTabbed("Mesh Tools More", "Editing");
+	if(uiNewPanel(curarea, block, "Skeleton Retargetting", "Editing", 960, 0, 318, 204)==0) return;
+	
+	uiDefBut(block, BUT, B_RETARGET_SKELETON, "Retarget Skeleton",			1025,170,250,19, 0, 0, 0, 0, 0, "Retarget Selected Armature to this Mesh");
+
+	uiBlockBeginAlign(block);
+	uiDefButS(block, NUM, B_DIFF, "Resolution:",							1025,150,225,19, &G.scene->toolsettings->skgen_resolution,10.0,1000.0, 0, 0,		"Specifies the resolution of the graph's embedding");
+	uiDefButBitS(block, TOG, SKGEN_HARMONIC, B_DIFF, 		"H",			1250,150, 25,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Apply harmonic smoothing to the weighting");
+	uiDefButBitS(block, TOG, SKGEN_FILTER_INTERNAL, B_DIFF, "Filter In",	1025,130, 83,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Filter internal small arcs from graph");
+	uiDefButF(block, NUM, B_DIFF, 							"T:",			1111,130,164,19, &G.scene->toolsettings->skgen_threshold_internal,0.0, 1.0, 10, 0,	"Specify the threshold ratio for filtering internal arcs");
+	uiDefButBitS(block, TOG, SKGEN_FILTER_EXTERNAL, B_DIFF, "Filter Ex",	1025,110, 83,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Filter external small arcs from graph");
+	uiDefButF(block, NUM, B_DIFF, 							"T:",			1111,110,164,19, &G.scene->toolsettings->skgen_threshold_external,0.0, 1.0, 10, 0,	"Specify the threshold ratio for filtering external arcs");
+	uiBlockEndAlign(block);
+
+	uiDefButF(block, NUM, B_DIFF, 							"Angle:",			1025, 60, 125,19, &G.scene->toolsettings->skgen_retarget_angle_weight, 0, 10, 1, 0,		"Angle Weight");
+	uiDefButF(block, NUM, B_DIFF, 							"Length:",			1150, 60, 125,19, &G.scene->toolsettings->skgen_retarget_length_weight, 0, 10, 1, 0,		"Length Weight");
+
+	uiBlockBeginAlign(block);
+	uiDefButBitS(block, TOG, SKGEN_SYMMETRY, B_DIFF, 		"Symmetry",		1025, 30,125,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Restore symmetries based on topology");
+	uiDefButF(block, NUM, B_DIFF, 							"T:",			1150, 30,125,19, &G.scene->toolsettings->skgen_symmetry_limit,0.0, 1.0, 10, 0,	"Specify the threshold distance for considering potential symmetric arcs");
+	uiDefButC(block, NUM, B_DIFF, 							"P:",			1025, 10, 62,19, &G.scene->toolsettings->skgen_postpro_passes, 0, 10, 10, 0,		"Specify the number of processing passes on the embeddings");
+	uiDefButC(block, ROW, B_DIFF,							"Smooth",		1087, 10, 63,19, &G.scene->toolsettings->skgen_postpro, 5.0, (float)SKGEN_SMOOTH, 0, 0, "Smooth embeddings");
+	uiDefButC(block, ROW, B_DIFF,							"Average",		1150, 10, 62,19, &G.scene->toolsettings->skgen_postpro, 5.0, (float)SKGEN_AVERAGE, 0, 0, "Average embeddings");
+	uiDefButC(block, ROW, B_DIFF,							"Sharpen",		1212, 10, 63,19, &G.scene->toolsettings->skgen_postpro, 5.0, (float)SKGEN_SHARPEN, 0, 0, "Sharpen embeddings");
+	uiBlockEndAlign(block);
+}
+
 static void editing_panel_mesh_skgen(Object *ob, Mesh *me)
 {
 	uiBlock *block;
@@ -4996,12 +5031,14 @@ static void editing_panel_mesh_skgen(Object *ob, Mesh *me)
 	int i;
 
 	block= uiNewBlock(&curarea->uiblocks, "editing_panel_mesh_skgen", UI_EMBOSS, UI_HELV, curarea->win);
+	uiNewPanelTabbed("Mesh Tools More", "Editing");
 	if(uiNewPanel(curarea, block, "Skeleton Generator", "Editing", 960, 0, 318, 204)==0) return;
 	
 	uiDefBut(block, BUT, B_GEN_SKELETON, "Generate Skeleton",			1025,170,250,19, 0, 0, 0, 0, 0, "Generate Skeleton from Mesh");
 
 	uiBlockBeginAlign(block);
-	uiDefButS(block, NUM, B_DIFF, "Resolution:",							1025,150,250,19, &G.scene->toolsettings->skgen_resolution,10.0,1000.0, 0, 0,		"Specifies the resolution of the graph's embedding");
+	uiDefButS(block, NUM, B_DIFF, "Resolution:",							1025,150,225,19, &G.scene->toolsettings->skgen_resolution,10.0,1000.0, 0, 0,		"Specifies the resolution of the graph's embedding");
+	uiDefButBitS(block, TOG, SKGEN_HARMONIC, B_DIFF, 		"H",			1250,150, 25,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Apply harmonic smoothing to the weighting");
 	uiDefButBitS(block, TOG, SKGEN_FILTER_INTERNAL, B_DIFF, "Filter In",	1025,130, 83,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Filter internal small arcs from graph");
 	uiDefButF(block, NUM, B_DIFF, 							"T:",			1111,130,164,19, &G.scene->toolsettings->skgen_threshold_internal,0.0, 1.0, 10, 0,	"Specify the threshold ratio for filtering internal arcs");
 	uiDefButBitS(block, TOG, SKGEN_FILTER_EXTERNAL, B_DIFF, "Filter Ex",	1025,110, 83,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Filter external small arcs from graph");
@@ -6511,8 +6548,8 @@ void editing_panels()
 			editing_panel_mesh_tools1(ob, ob->data);
 			uiNewPanelTabbed("Mesh Tools 1", "Editing");
 			
-			if (G.rt == 42) /* hidden for now, no time for docs */
-				editing_panel_mesh_skgen(ob, ob->data);
+			editing_panel_mesh_skgen(ob, ob->data);
+			editing_panel_mesh_skgen_retarget(ob, ob->data);
 			
 			editing_panel_mesh_uvautocalculation();
 			if (EM_texFaceCheck())
diff --git a/source/blender/src/editarmature.c b/source/blender/src/editarmature.c
index c166a9df762..37e6510786d 100644
--- a/source/blender/src/editarmature.c
+++ b/source/blender/src/editarmature.c
@@ -4142,542 +4142,7 @@ void transform_armature_mirror_update(void)
 /*************************************** SKELETON GENERATOR ******************************************/
 /*****************************************************************************************************/
 
-/**************************************** SYMMETRY HANDLING ******************************************/
 
-void markdownSymmetryArc(ReebArc *arc, ReebNode *node, int level);
-
-void mirrorAlongAxis(float v[3], float center[3], float axis[3])
-{
-	float dv[3], pv[3];
-	
-	VecSubf(dv, v, center);
-	Projf(pv, dv, axis);
-	VecMulf(pv, -2);
-	VecAddf(v, v, pv);
-}
-
-/* Helper structure for radial symmetry */
-typedef struct RadialArc
-{
-	ReebArc *arc; 
-	float n[3]; /* normalized vector joining the nodes of the arc */
-} RadialArc;
-
-void reestablishRadialSymmetry(ReebNode *node, int depth, float axis[3])
-{
-	RadialArc *ring = NULL;
-	RadialArc *unit;
-	float limit = G.scene->toolsettings->skgen_symmetry_limit;
-	int symmetric = 1;
-	int count = 0;
-	int i;
-
-	/* count the number of arcs in the symmetry ring */
-	for (i = 0; node->arcs[i] != NULL; i++)
-	{
-		ReebArc *connectedArc = node->arcs[i];
-		
-		/* depth is store as a negative in flag. symmetry level is positive */
-		if (connectedArc->flags == -depth)
-		{
-			count++;
-		}
-	}
-
-	ring = MEM_callocN(sizeof(RadialArc) * count, "radial symmetry ring");
-	unit = ring;
-
-	/* fill in the ring */
-	for (unit = ring, i = 0; node->arcs[i] != NULL; i++)
-	{
-		ReebArc *connectedArc = node->arcs[i];
-		
-		/* depth is store as a negative in flag. symmetry level is positive */
-		if (connectedArc->flags == -depth)
-		{
-			ReebNode *otherNode = OTHER_NODE(connectedArc, node);
-			float vec[3];
-
-			unit->arc = connectedArc;
-
-			/* project the node to node vector on the symmetry plane */
-			VecSubf(unit->n, otherNode->p, node->p);
-			Projf(vec, unit->n, axis);
-			VecSubf(unit->n, unit->n, vec);
-
-			Normalize(unit->n);
-
-			unit++;
-		}
-	}
-
-	/* sort ring */
-	for (i = 0; i < count - 1; i++)
-	{
-		float minAngle = 3; /* arbitrary high value, higher than 2, at least */
-		int minIndex = -1;
-		int j;
-
-		for (j = i + 1; j < count; j++)
-		{
-			float angle = Inpf(ring[i].n, ring[j].n);
-
-			/* map negative values to 1..2 */
-			if (angle < 0)
-			{
-				angle = 1 - angle;
-			}
-
-			if (angle < minAngle)
-			{
-				minIndex = j;
-				minAngle = angle;
-			}
-		}
-
-		/* swap if needed */
-		if (minIndex != i + 1)
-		{
-			RadialArc tmp;
-			tmp = ring[i + 1];
-			ring[i + 1] = ring[minIndex];
-			ring[minIndex] = tmp;
-		}
-	}
-
-	for (i = 0; i < count && symmetric; i++)
-	{
-		ReebNode *node1, *node2;
-		float tangent[3];
-		float normal[3];
-		float p[3];
-		int j = (i + 1) % count; /* next arc in the circular list */
-
-		VecAddf(tangent, ring[i].n, ring[j].n);
-		Crossf(normal, tangent, axis);
-		
-		node1 = OTHER_NODE(ring[i].arc, node);
-		node2 = OTHER_NODE(ring[j].arc, node);
-
-		VECCOPY(p, node2->p);
-		mirrorAlongAxis(p, node->p, normal);
-		
-		/* check if it's within limit before continuing */
-		if (VecLenf(node1->p, p) > limit)
-		{
-			symmetric = 0;
-		}
-
-	}
-
-	if (symmetric)
-	{
-		/* first pass, merge incrementally */
-		for (i = 0; i < count - 1; i++)
-		{
-			ReebNode *node1, *node2;
-			float tangent[3];
-			float normal[3];
-			int j = i + 1;
-	
-			VecAddf(tangent, ring[i].n, ring[j].n);
-			Crossf(normal, tangent, axis);
-			
-			node1 = OTHER_NODE(ring[i].arc, node);
-			node2 = OTHER_NODE(ring[j].arc, node);
-	
-			/* mirror first node and mix with the second */
-			mirrorAlongAxis(node1->p, node->p, normal);
-			VecLerpf(node2->p, node2->p, node1->p, 1.0f / (j + 1));
-			
-			/* Merge buckets
-			 * there shouldn't be any null arcs here, but just to be safe 
-			 * */
-			if (ring[i].arc->bcount > 0 && ring[j].arc->bcount > 0)
-			{
-				ReebArcIterator iter1, iter2;
-				EmbedBucket *bucket1 = NULL, *bucket2 = NULL;
-				
-				initArcIterator(&iter1, ring[i].arc, node);
-				initArcIterator(&iter2, ring[j].arc, node);
-				
-				bucket1 = nextBucket(&iter1);
-				bucket2 = nextBucket(&iter2);
-			
-				/* Make sure they both start at the same value */	
-				while(bucket1 && bucket1->val < bucket2->val)
-				{
-					bucket1 = nextBucket(&iter1);
-				}
-				
-				while(bucket2 && bucket2->val < bucket1->val)
-				{
-					bucket2 = nextBucket(&iter2);
-				}
-		
-		
-				for ( ;bucket1 && bucket2; bucket1 = nextBucket(&iter1), bucket2 = nextBucket(&iter2))
-				{
-					bucket2->nv += bucket1->nv; /* add counts */
-					
-					/* mirror on axis */
-					mirrorAlongAxis(bucket1->p, node->p, normal);
-					/* add bucket2 in bucket1 */
-					VecLerpf(bucket2->p, bucket2->p, bucket1->p, (float)bucket1->nv / (float)(bucket2->nv));
-				}
-			}
-		}
-		
-		/* second pass, mirror back on previous arcs */
-		for (i = count - 1; i > 0; i--)
-		{
-			ReebNode *node1, *node2;
-			float tangent[3];
-			float normal[3];
-			int j = i - 1;
-	
-			VecAddf(tangent, ring[i].n, ring[j].n);
-			Crossf(normal, tangent, axis);
-			
-			node1 = OTHER_NODE(ring[i].arc, node);
-			node2 = OTHER_NODE(ring[j].arc, node);
-	
-			/* copy first node than mirror */
-			VECCOPY(node2->p, node1->p);
-			mirrorAlongAxis(node2->p, node->p, normal);
-			
-			/* Copy buckets
-			 * there shouldn't be any null arcs here, but just to be safe 
-			 * */
-			if (ring[i].arc->bcount > 0 && ring[j].arc->bcount > 0)
-			{
-				ReebArcIterator iter1, iter2;
-				EmbedBucket *bucket1 = NULL, *bucket2 = NULL;
-				
-				initArcIterator(&iter1, ring[i].arc, node);
-				initArcIterator(&iter2, ring[j].arc, node);
-				
-				bucket1 = nextBucket(&iter1);
-				bucket2 = nextBucket(&iter2);
-			
-				/* Make sure they both start at the same value */	
-				while(bucket1 && bucket1->val < bucket2->val)
-				{
-					bucket1 = nextBucket(&iter1);
-				}
-				
-				while(bucket2 && bucket2->val < bucket1->val)
-				{
-					bucket2 = nextBucket(&iter2);
-				}
-		
-		
-				for ( ;bucket1 && bucket2; bucket1 = nextBucket(&iter1), bucket2 = nextBucket(&iter2))
-				{
-					/* copy and mirror back to bucket2 */			
-					bucket2->nv = bucket1->nv;
-					VECCOPY(bucket2->p, bucket1->p);
-					mirrorAlongAxis(bucket2->p, node->p, normal);
-				}
-			}
-		}
-	}
-
-	MEM_freeN(ring);
-}
-
-void reestablishAxialSymmetry(ReebNode *node, int depth, float axis[3])
-{
-	ReebArc *arc1 = NULL;
-	ReebArc *arc2 = NULL;
-	ReebNode *node1 = NULL, *node2 = NULL;
-	float limit = G.scene->toolsettings->skgen_symmetry_limit;
-	float nor[3], vec[3], p[3];
-	int i;
-	
-	for (i = 0; node->arcs[i] != NULL; i++)
-	{
-		ReebArc *connectedArc = node->arcs[i];
-		
-		/* depth is store as a negative in flag. symmetry level is positive */
-		if (connectedArc->flags == -depth)
-		{
-			if (arc1 == NULL)
-			{
-				arc1 = connectedArc;
-				node1 = OTHER_NODE(arc1, node);
-			}
-			else
-			{
-				arc2 = connectedArc;
-				node2 = OTHER_NODE(arc2, node);
-				break; /* Can stop now, the two arcs have been found */
-			}
-		}
-	}
-	
-	/* shouldn't happen, but just to be sure */
-	if (node1 == NULL || node2 == NULL)
-	{
-		return;
-	}
-	
-	VecSubf(p, node1->p, node->p);
-	Crossf(vec, p, axis);
-	Crossf(nor, vec, axis);
-	
-	/* mirror node2 along axis */
-	VECCOPY(p, node2->p);
-	mirrorAlongAxis(p, node->p, nor);
-	
-	/* check if it's within limit before continuing */
-	if (VecLenf(node1->p, p) <= limit)
-	{
-	
-		/* average with node1 */
-		VecAddf(node1->p, node1->p, p);
-		VecMulf(node1->p, 0.5f);
-		
-		/* mirror back on node2 */
-		VECCOPY(node2->p, node1->p);
-		mirrorAlongAxis(node2->p, node->p, nor);
-		
-		/* Merge buckets
-		 * there shouldn't be any null arcs here, but just to be safe 
-		 * */
-		if (arc1->bcount > 0 && arc2->bcount > 0)
-		{
-			ReebArcIterator iter1, iter2;
-			EmbedBucket *bucket1 = NULL, *bucket2 = NULL;
-			
-			initArcIterator(&iter1, arc1, node);
-			initArcIterator(&iter2, arc2, node);
-			
-			bucket1 = nextBucket(&iter1);
-			bucket2 = nextBucket(&iter2);
-		
-			/* Make sure they both start at the same value */	
-			while(bucket1 && bucket1->val < bucket2->val)
-			{
-				bucket1 = nextBucket(&iter1);
-			}
-			
-			while(bucket2 && bucket2->val < bucket1->val)
-			{
-				bucket2 = nextBucket(&iter2);
-			}
-	
-	
-			for ( ;bucket1 && bucket2; bucket1 = nextBucket(&iter1), bucket2 = nextBucket(&iter2))
-			{
-				bucket1->nv += bucket2->nv; /* add counts */
-				
-				/* mirror on axis */
-				mirrorAlongAxis(bucket2->p, node->p, nor);
-				/* add bucket2 in bucket1 */
-				VecLerpf(bucket1->p, bucket1->p, bucket2->p, (float)bucket2->nv / (float)(bucket1->nv));
-	
-				/* copy and mirror back to bucket2 */			
-				bucket2->nv = bucket1->nv;
-				VECCOPY(bucket2->p, bucket1->p);
-				mirrorAlongAxis(bucket2->p, node->p, nor);
-			}
-		}
-	}
-}
-
-void markdownSecondarySymmetry(ReebNode *node, int depth, int level)
-{
-	float axis[3] = {0, 0, 0};
-	int count = 0;
-	int i;
-
-	/* Only reestablish spatial symmetry if needed */
-	if (G.scene->toolsettings->skgen_options & SKGEN_SYMMETRY)
-	{
-		/* count the number of branches in this symmetry group
-		 * and determinte the axis of symmetry
-		 *  */	
-		for (i = 0; node->arcs[i] != NULL; i++)
-		{
-			ReebArc *connectedArc = node->arcs[i];
-			
-			/* depth is store as a negative in flag. symmetry level is positive */
-			if (connectedArc->flags == -depth)
-			{
-				count++;
-			}
-			/* If arc is on the axis */
-			else if (connectedArc->flags == level)
-			{
-				VecAddf(axis, axis, connectedArc->v1->p);
-				VecSubf(axis, axis, connectedArc->v2->p);
-			}
-		}
-	
-		Normalize(axis);
-	
-		/* Split between axial and radial symmetry */
-		if (count == 2)
-		{
-			reestablishAxialSymmetry(node, depth, axis);
-		}
-		else
-		{
-			reestablishRadialSymmetry(node, depth, axis);
-		}
-	}
-
-	/* markdown secondary symetries */	
-	for (i = 0; node->arcs[i] != NULL; i++)
-	{
-		ReebArc *connectedArc = node->arcs[i];
-		
-		if (connectedArc->flags == -depth)
-		{
-			/* markdown symmetry for branches corresponding to the depth */
-			markdownSymmetryArc(connectedArc, node, level + 1);
-		}
-	}
-}
-
-void markdownSymmetryArc(ReebArc *arc, ReebNode *node, int level)
-{
-	int i;
-	arc->flags = level;
-	
-	node = OTHER_NODE(arc, node);
-	
-	for (i = 0; node->arcs[i] != NULL; i++)
-	{
-		ReebArc *connectedArc = node->arcs[i];
-		
-		if (connectedArc != arc)
-		{
-			ReebNode *connectedNode = OTHER_NODE(connectedArc, node);
-			
-			/* symmetry level is positive value, negative values is subtree depth */
-			connectedArc->flags = -subtreeDepth(connectedNode, connectedArc);
-		}
-	}
-
-	arc = NULL;
-
-	for (i = 0; node->arcs[i] != NULL; i++)
-	{
-		int issymmetryAxis = 0;
-		ReebArc *connectedArc = node->arcs[i];
-		
-		/* only arcs not already marked as symetric */
-		if (connectedArc->flags < 0)
-		{
-			int j;
-			
-			/* true by default */
-			issymmetryAxis = 1;
-			
-			for (j = 0; node->arcs[j] != NULL && issymmetryAxis == 1; j++)
-			{
-				ReebArc *otherArc = node->arcs[j];
-				
-				/* different arc, same depth */
-				if (otherArc != connectedArc && otherArc->flags == connectedArc->flags)
-				{
-					/* not on the symmetry axis */
-					issymmetryAxis = 0;
-				} 
-			}
-		}
-		
-		/* arc could be on the symmetry axis */
-		if (issymmetryAxis == 1)
-		{
-			/* no arc as been marked previously, keep this one */
-			if (arc == NULL)
-			{
-				arc = connectedArc;
-			}
-			else
-			{
-				/* there can't be more than one symmetry arc */
-				arc = NULL;
-				break;
-			}
-		}
-	}
-	
-	/* go down the arc continuing the symmetry axis */
-	if (arc)
-	{
-		markdownSymmetryArc(arc, node, level);
-	}
-
-	
-	/* secondary symmetry */
-	for (i = 0; node->arcs[i] != NULL; i++)
-	{
-		ReebArc *connectedArc = node->arcs[i];
-		
-		/* only arcs not already marked as symetric and is not the next arc on the symmetry axis */
-		if (connectedArc->flags < 0)
-		{
-			/* subtree depth is store as a negative value in the flag */
-			markdownSecondarySymmetry(node, -connectedArc->flags, level);
-		}
-	}
-}
-
-void markdownSymmetry(ReebGraph *rg)
-{
-	ReebNode *node;
-	ReebArc *arc;
-	/* only for Acyclic graphs */
-	int cyclic = isGraphCyclic(rg);
-	
-	/* mark down all arcs as non-symetric */
-	for (arc = rg->arcs.first; arc; arc = arc->next)
-	{
-		arc->flags = 0;
-	}
-	
-	/* mark down all nodes as not on the symmetry axis */
-	for (node = rg->nodes.first; node; node = node->next)
-	{
-		node->flags = 0;
-	}
-
-	/* node list is sorted, so lowest node is always the head (by design) */
-	node = rg->nodes.first;
-	
-	/* only work on acyclic graphs and if only one arc is incident on the first node */
-	if (cyclic == 0 && countConnectedArcs(rg, node) == 1)
-	{
-		arc = node->arcs[0];
-		
-		markdownSymmetryArc(arc, node, 1);
-
-		/* mark down non-symetric arcs */
-		for (arc = rg->arcs.first; arc; arc = arc->next)
-		{
-			if (arc->flags < 0)
-			{
-				arc->flags = 0;
-			}
-			else
-			{
-				/* mark down nodes with the lowest level symmetry axis */
-				if (arc->v1->flags == 0 || arc->v1->flags > arc->flags)
-				{
-					arc->v1->flags = arc->flags;
-				}
-				if (arc->v2->flags == 0 || arc->v2->flags > arc->flags)
-				{
-					arc->v2->flags = arc->flags;
-				}
-			}
-		}
-	}
-}
 
 /**************************************** SUBDIVISION ALGOS ******************************************/
 
@@ -5002,8 +4467,6 @@ void generateSkeletonFromReebGraph(ReebGraph *rg)
 	{
 		exit_editmode(EM_FREEDATA|EM_FREEUNDO|EM_WAITCURSOR); // freedata, and undo
 	}
-
-	setcursor_space(SPACE_VIEW3D, CURSOR_WAIT);
 	
 	dst = add_object(OB_ARMATURE);
 	base_init_from_view3d(BASACT, G.vd);
@@ -5030,35 +4493,35 @@ void generateSkeletonFromReebGraph(ReebGraph *rg)
 
 		/* Find out the direction of the arc through simple heuristics (in order of priority) :
 		 * 
-		 * 1- Arcs on primary symmetry axis (flags == 1) point up (head: high weight -> tail: low weight)
+		 * 1- Arcs on primary symmetry axis (symmetry == 1) point up (head: high weight -> tail: low weight)
 		 * 2- Arcs starting on a primary axis point away from it (head: node on primary axis)
 		 * 3- Arcs point down (head: low weight -> tail: high weight)
 		 *
-		 * Finally, the arc direction is stored in its flags: 1 (low -> high), -1 (high -> low)
+		 * Finally, the arc direction is stored in its flag: 1 (low -> high), -1 (high -> low)
 		 */
 
 		/* if arc is a symmetry axis, internal bones go up the tree */		
-		if (arc->flags == 1 && arc->v2->degree != 1)
+		if (arc->symmetry_level == 1 && arc->v2->degree != 1)
 		{
 			head = arc->v2;
 			tail = arc->v1;
 			
-			arc->flags = -1; /* mark arc direction */
+			arc->flag = -1; /* mark arc direction */
 		}
 		/* Bones point AWAY from the symmetry axis */
-		else if (arc->v1->flags == 1)
+		else if (arc->v1->symmetry_level == 1)
 		{
 			head = arc->v1;
 			tail = arc->v2;
 			
-			arc->flags = 1; /* mark arc direction */
+			arc->flag = 1; /* mark arc direction */
 		}
-		else if (arc->v2->flags == 1)
+		else if (arc->v2->symmetry_level == 1)
 		{
 			head = arc->v2;
 			tail = arc->v1;
 			
-			arc->flags = -1; /* mark arc direction */
+			arc->flag = -1; /* mark arc direction */
 		}
 		/* otherwise, always go from low weight to high weight */
 		else
@@ -5066,7 +4529,7 @@ void generateSkeletonFromReebGraph(ReebGraph *rg)
 			head = arc->v1;
 			tail = arc->v2;
 			
-			arc->flags = 1; /* mark arc direction */
+			arc->flag = 1; /* mark arc direction */
 		}
 		
 		/* Loop over subdivision methods */	
@@ -5113,7 +4576,7 @@ void generateSkeletonFromReebGraph(ReebGraph *rg)
 			arc = node->arcs[i];
 
 			/* if arc is incoming into the node */
-			if ((arc->v1 == node && arc->flags == -1) || (arc->v2 == node && arc->flags == 1))
+			if ((arc->v1 == node && arc->flag == -1) || (arc->v2 == node && arc->flag == 1))
 			{
 				if (incomingArc == NULL)
 				{
@@ -5139,7 +4602,7 @@ void generateSkeletonFromReebGraph(ReebGraph *rg)
 				arc = node->arcs[i];
 
 				/* if arc is outgoing from the node */
-				if ((arc->v1 == node && arc->flags == 1) || (arc->v2 == node && arc->flags == -1))
+				if ((arc->v1 == node && arc->flag == 1) || (arc->v2 == node && arc->flag == -1))
 				{
 					EditBone *childBone = BLI_ghash_lookup(arcBoneMap, arc);
 
@@ -5157,89 +4620,21 @@ void generateSkeletonFromReebGraph(ReebGraph *rg)
 	}
 	
 	BLI_ghash_free(arcBoneMap, NULL, NULL);
-
-	setcursor_space(SPACE_VIEW3D, CURSOR_EDIT);
 	
 	BIF_undo_push("Generate Skeleton");
 }
 
 void generateSkeleton(void)
 {
-	EditMesh *em = G.editMesh;
-	ReebGraph *rg = NULL;
-	int i;
+	ReebGraph *reebg;
 	
-	if (em == NULL)
-		return;
-
 	setcursor_space(SPACE_VIEW3D, CURSOR_WAIT);
-
-	if (weightFromDistance(em) == 0)
-	{
-		error("No selected vertex\n");
-		return;
-	}
-		
-	renormalizeWeight(em, 1.0f);
 	
-	weightToHarmonic(em);
-	
-#ifdef DEBUG_REEB
-	weightToVCol(em);
-#endif
-	
-	rg = generateReebGraph(em, G.scene->toolsettings->skgen_resolution);
+	reebg = BIF_ReebGraphFromEditMesh();
 
-	verifyBuckets(rg);
-	
-	/* Remove arcs without embedding */
-	filterNullReebGraph(rg);
+	generateSkeletonFromReebGraph(reebg);
 
-	verifyBuckets(rg);
+	REEB_freeGraph(reebg);
 
-
-	i = 1;
-	/* filter until there's nothing more to do */
-	while (i == 1)
-	{
-		i = 0; /* no work done yet */
-		
-		if (G.scene->toolsettings->skgen_options & SKGEN_FILTER_EXTERNAL)
-		{
-			i |= filterExternalReebGraph(rg, G.scene->toolsettings->skgen_threshold_external * G.scene->toolsettings->skgen_resolution);
-		}
-	
-		verifyBuckets(rg);
-	
-		if (G.scene->toolsettings->skgen_options & SKGEN_FILTER_INTERNAL)
-		{
-			i |= filterInternalReebGraph(rg, G.scene->toolsettings->skgen_threshold_internal * G.scene->toolsettings->skgen_resolution);
-		}
-	}
-
-	verifyBuckets(rg);
-
-	repositionNodes(rg);
-	
-	verifyBuckets(rg);
-
-	/* Filtering might have created degree 2 nodes, so remove them */
-	removeNormalNodes(rg);
-	
-	verifyBuckets(rg);
-
-	for(i = 0; i <  G.scene->toolsettings->skgen_postpro_passes; i++)
-	{
-		postprocessGraph(rg, G.scene->toolsettings->skgen_postpro);
-	}
-
-	buildAdjacencyList(rg);
-	
-	sortNodes(rg);
-	
-	sortArcs(rg);
-	
-	generateSkeletonFromReebGraph(rg);
-
-	freeGraph(rg);
+	setcursor_space(SPACE_VIEW3D, CURSOR_EDIT);
 }
diff --git a/source/blender/src/reeb.c b/source/blender/src/reeb.c
index 85fb5815c3e..34230e6dfc2 100644
--- a/source/blender/src/reeb.c
+++ b/source/blender/src/reeb.c
@@ -34,6 +34,7 @@
 #include "DNA_scene_types.h"
 #include "DNA_space_types.h"
 #include "DNA_meshdata_types.h"
+#include "DNA_armature_types.h"
 
 #include "MEM_guardedalloc.h"
 
@@ -41,6 +42,7 @@
 #include "BLI_arithb.h"
 #include "BLI_editVert.h"
 #include "BLI_edgehash.h"
+#include "BLI_ghash.h"
 
 #include "BDR_editobject.h"
 
@@ -60,6 +62,9 @@
 
 #include "reeb.h"
 
+/* REPLACE WITH NEW ONE IN UTILDEFINES ONCE PATCH IS APPLIED */
+#define FTOCHAR(val) (val<=0.0f)? 0 : ((val>(1.0f-0.5f/255.0f))? 255 : (char)((255.0f*val)+0.5f))
+
 /*
  * Skeleton generation algorithm based on: 
  * "Harmonic Skeleton for Realistic Character Animation"
@@ -72,10 +77,20 @@
  * SIGGRAPH 2007
  * 
  * */
+ 
+#define DEBUG_REEB
+
+typedef enum {
+	MERGE_LOWER,
+	MERGE_HIGHER,
+	MERGE_APPEND
+} MergeDirection;
 
 int mergeArcs(ReebGraph *rg, ReebArc *a0, ReebArc *a1);
 int mergeConnectedArcs(ReebGraph *rg, ReebArc *a0, ReebArc *a1);
 EditEdge * NextEdgeForVert(EditMesh *em, EditVert *v);
+void mergeArcFaces(ReebGraph *rg, ReebArc *aDst, ReebArc *aSrc);
+void addFacetoArc(ReebArc *arc, EditFace *efa);
 
 /***************************************** BUCKET UTILS **********************************************/
 
@@ -227,11 +242,14 @@ void freeArc(ReebArc *arc)
 	
 	if (arc->buckets)
 		MEM_freeN(arc->buckets);
+		
+	if (arc->faces)
+		BLI_ghash_free(arc->faces, NULL, NULL);
 	
 	MEM_freeN(arc);
 }
 
-void freeGraph(ReebGraph *rg)
+void REEB_freeGraph(ReebGraph *rg)
 {
 	ReebArc *arc;
 	ReebNode *node;
@@ -292,6 +310,7 @@ void repositionNodes(ReebGraph *rg)
 
 void verifyNodeDegree(ReebGraph *rg)
 {
+#ifdef DEBUG_REEB
 	ReebNode *node = NULL;
 	ReebArc *arc = NULL;
 
@@ -310,6 +329,7 @@ void verifyNodeDegree(ReebGraph *rg)
 			printf("degree error in node %i: expected %i got %i\n", node->index, count, node->degree);
 		}
 	}
+#endif
 }
 
 void verifyBuckets(ReebGraph *rg)
@@ -345,9 +365,617 @@ void verifyBuckets(ReebGraph *rg)
 #endif
 }
 
+void verifyFaces(ReebGraph *rg)
+{
+#ifdef DEBUG_REEB
+	int total = 0;
+	ReebArc *arc = NULL;
+	for(arc = rg->arcs.first; arc; arc = arc->next)
+	{
+		total += BLI_ghash_size(arc->faces);
+	}
+	
+#endif
+}
+
+/**************************************** SYMMETRY HANDLING ******************************************/
+
+void markdownSymmetryArc(ReebArc *arc, ReebNode *node, int level);
+
+static void mirrorAlongAxis(float v[3], float center[3], float axis[3])
+{
+	float dv[3], pv[3];
+	
+	VecSubf(dv, v, center);
+	Projf(pv, dv, axis);
+	VecMulf(pv, -2);
+	VecAddf(v, v, pv);
+}
+
+/* Helper structure for radial symmetry */
+typedef struct RadialArc
+{
+	ReebArc *arc; 
+	float n[3]; /* normalized vector joining the nodes of the arc */
+} RadialArc;
+
+void reestablishRadialSymmetry(ReebNode *node, int depth, float axis[3], int reestablish)
+{
+	RadialArc *ring = NULL;
+	RadialArc *unit;
+	float limit = G.scene->toolsettings->skgen_symmetry_limit;
+	int symmetric = 1;
+	int count = 0;
+	int i;
+
+	/* mark topological symmetry */
+	node->symmetry_flag |= SYM_TOPOLOGICAL;
+
+	/* count the number of arcs in the symmetry ring */
+	for (i = 0; node->arcs[i] != NULL; i++)
+	{
+		ReebArc *connectedArc = node->arcs[i];
+		
+		/* depth is store as a negative in flag. symmetry level is positive */
+		if (connectedArc->symmetry_level == -depth)
+		{
+			count++;
+		}
+	}
+
+	ring = MEM_callocN(sizeof(RadialArc) * count, "radial symmetry ring");
+	unit = ring;
+
+	/* fill in the ring */
+	for (unit = ring, i = 0; node->arcs[i] != NULL; i++)
+	{
+		ReebArc *connectedArc = node->arcs[i];
+		
+		/* depth is store as a negative in flag. symmetry level is positive */
+		if (connectedArc->symmetry_level == -depth)
+		{
+			ReebNode *otherNode = OTHER_NODE(connectedArc, node);
+			float vec[3];
+
+			unit->arc = connectedArc;
+
+			/* project the node to node vector on the symmetry plane */
+			VecSubf(unit->n, otherNode->p, node->p);
+			Projf(vec, unit->n, axis);
+			VecSubf(unit->n, unit->n, vec);
+
+			Normalize(unit->n);
+
+			unit++;
+		}
+	}
+
+	/* sort ring */
+	for (i = 0; i < count - 1; i++)
+	{
+		float minAngle = 3; /* arbitrary high value, higher than 2, at least */
+		int minIndex = -1;
+		int j;
+
+		for (j = i + 1; j < count; j++)
+		{
+			float angle = Inpf(ring[i].n, ring[j].n);
+
+			/* map negative values to 1..2 */
+			if (angle < 0)
+			{
+				angle = 1 - angle;
+			}
+
+			if (angle < minAngle)
+			{
+				minIndex = j;
+				minAngle = angle;
+			}
+		}
+
+		/* swap if needed */
+		if (minIndex != i + 1)
+		{
+			RadialArc tmp;
+			tmp = ring[i + 1];
+			ring[i + 1] = ring[minIndex];
+			ring[minIndex] = tmp;
+		}
+	}
+
+	for (i = 0; i < count && symmetric; i++)
+	{
+		ReebNode *node1, *node2;
+		float tangent[3];
+		float normal[3];
+		float p[3];
+		int j = (i + 1) % count; /* next arc in the circular list */
+
+		VecAddf(tangent, ring[i].n, ring[j].n);
+		Crossf(normal, tangent, axis);
+		
+		node1 = OTHER_NODE(ring[i].arc, node);
+		node2 = OTHER_NODE(ring[j].arc, node);
+
+		VECCOPY(p, node2->p);
+		mirrorAlongAxis(p, node->p, normal);
+		
+		/* check if it's within limit before continuing */
+		if (VecLenf(node1->p, p) > limit)
+		{
+			symmetric = 0;
+		}
+
+	}
+
+	if (symmetric)
+	{
+		/* mark node as symmetric physically */
+		VECCOPY(node->symmetry_axis, axis);
+		node->symmetry_flag |= SYM_PHYSICAL;
+		node->symmetry_flag |= SYM_RADIAL;
+		
+		/* reestablish symmetry only if wanted */
+		if (reestablish)
+		{
+			/* first pass, merge incrementally */
+			for (i = 0; i < count - 1; i++)
+			{
+				ReebNode *node1, *node2;
+				float tangent[3];
+				float normal[3];
+				int j = i + 1;
+		
+				VecAddf(tangent, ring[i].n, ring[j].n);
+				Crossf(normal, tangent, axis);
+				
+				node1 = OTHER_NODE(ring[i].arc, node);
+				node2 = OTHER_NODE(ring[j].arc, node);
+		
+				/* mirror first node and mix with the second */
+				mirrorAlongAxis(node1->p, node->p, normal);
+				VecLerpf(node2->p, node2->p, node1->p, 1.0f / (j + 1));
+				
+				/* Merge buckets
+				 * there shouldn't be any null arcs here, but just to be safe 
+				 * */
+				if (ring[i].arc->bcount > 0 && ring[j].arc->bcount > 0)
+				{
+					ReebArcIterator iter1, iter2;
+					EmbedBucket *bucket1 = NULL, *bucket2 = NULL;
+					
+					initArcIterator(&iter1, ring[i].arc, node);
+					initArcIterator(&iter2, ring[j].arc, node);
+					
+					bucket1 = nextBucket(&iter1);
+					bucket2 = nextBucket(&iter2);
+				
+					/* Make sure they both start at the same value */	
+					while(bucket1 && bucket1->val < bucket2->val)
+					{
+						bucket1 = nextBucket(&iter1);
+					}
+					
+					while(bucket2 && bucket2->val < bucket1->val)
+					{
+						bucket2 = nextBucket(&iter2);
+					}
+			
+			
+					for ( ;bucket1 && bucket2; bucket1 = nextBucket(&iter1), bucket2 = nextBucket(&iter2))
+					{
+						bucket2->nv += bucket1->nv; /* add counts */
+						
+						/* mirror on axis */
+						mirrorAlongAxis(bucket1->p, node->p, normal);
+						/* add bucket2 in bucket1 */
+						VecLerpf(bucket2->p, bucket2->p, bucket1->p, (float)bucket1->nv / (float)(bucket2->nv));
+					}
+				}
+			}
+			
+			/* second pass, mirror back on previous arcs */
+			for (i = count - 1; i > 0; i--)
+			{
+				ReebNode *node1, *node2;
+				float tangent[3];
+				float normal[3];
+				int j = i - 1;
+		
+				VecAddf(tangent, ring[i].n, ring[j].n);
+				Crossf(normal, tangent, axis);
+				
+				node1 = OTHER_NODE(ring[i].arc, node);
+				node2 = OTHER_NODE(ring[j].arc, node);
+		
+				/* copy first node than mirror */
+				VECCOPY(node2->p, node1->p);
+				mirrorAlongAxis(node2->p, node->p, normal);
+				
+				/* Copy buckets
+				 * there shouldn't be any null arcs here, but just to be safe 
+				 * */
+				if (ring[i].arc->bcount > 0 && ring[j].arc->bcount > 0)
+				{
+					ReebArcIterator iter1, iter2;
+					EmbedBucket *bucket1 = NULL, *bucket2 = NULL;
+					
+					initArcIterator(&iter1, ring[i].arc, node);
+					initArcIterator(&iter2, ring[j].arc, node);
+					
+					bucket1 = nextBucket(&iter1);
+					bucket2 = nextBucket(&iter2);
+				
+					/* Make sure they both start at the same value */	
+					while(bucket1 && bucket1->val < bucket2->val)
+					{
+						bucket1 = nextBucket(&iter1);
+					}
+					
+					while(bucket2 && bucket2->val < bucket1->val)
+					{
+						bucket2 = nextBucket(&iter2);
+					}
+			
+			
+					for ( ;bucket1 && bucket2; bucket1 = nextBucket(&iter1), bucket2 = nextBucket(&iter2))
+					{
+						/* copy and mirror back to bucket2 */			
+						bucket2->nv = bucket1->nv;
+						VECCOPY(bucket2->p, bucket1->p);
+						mirrorAlongAxis(bucket2->p, node->p, normal);
+					}
+				}
+			}
+		}
+	}
+
+	MEM_freeN(ring);
+}
+
+static void setSideAxialSymmetry(ReebNode *root_node, ReebNode *end_node, ReebArc *arc)
+{
+	float vec[3];
+	
+	VecSubf(vec, end_node->p, root_node->p);
+	
+	if (Inpf(vec, root_node->symmetry_axis) < 0)
+	{
+		arc->symmetry_flag |= SYM_SIDE_NEGATIVE;
+	}
+	else
+	{
+		arc->symmetry_flag |= SYM_SIDE_POSITIVE;
+	}
+}
+
+void reestablishAxialSymmetry(ReebNode *node, int depth, float axis[3], int reestablish)
+{
+	ReebArc *arc1 = NULL;
+	ReebArc *arc2 = NULL;
+	ReebNode *node1 = NULL, *node2 = NULL;
+	float limit = G.scene->toolsettings->skgen_symmetry_limit;
+	float nor[3], vec[3], p[3];
+	int i;
+	
+	/* mark topological symmetry */
+	node->symmetry_flag |= SYM_TOPOLOGICAL;
+
+	for (i = 0; node->arcs[i] != NULL; i++)
+	{
+		ReebArc *connectedArc = node->arcs[i];
+		
+		/* depth is store as a negative in flag. symmetry level is positive */
+		if (connectedArc->symmetry_level == -depth)
+		{
+			if (arc1 == NULL)
+			{
+				arc1 = connectedArc;
+				node1 = OTHER_NODE(arc1, node);
+			}
+			else
+			{
+				arc2 = connectedArc;
+				node2 = OTHER_NODE(arc2, node);
+				break; /* Can stop now, the two arcs have been found */
+			}
+		}
+	}
+	
+	/* shouldn't happen, but just to be sure */
+	if (node1 == NULL || node2 == NULL)
+	{
+		return;
+	}
+	
+	VecSubf(vec, node1->p, node->p);
+	Normalize(vec);
+	VecSubf(p, node->p, node2->p);
+	Normalize(p);
+	VecAddf(p, p, vec);
+	
+	
+	Crossf(vec, p, axis);
+	Crossf(nor, vec, axis);
+
+	printvecf("p", p);
+	printvecf("axis", axis);
+	printvecf("vec", vec);
+	printvecf("nor", nor);
+	
+	/* mirror node2 along axis */
+	VECCOPY(p, node2->p);
+	mirrorAlongAxis(p, node->p, nor);
+	
+	/* check if it's within limit before continuing */
+	if (VecLenf(node1->p, p) <= limit)
+	{
+		/* mark node as symmetric physically */
+		VECCOPY(node->symmetry_axis, nor);
+		node->symmetry_flag |= SYM_PHYSICAL;
+		node->symmetry_flag |= SYM_AXIAL;
+		
+		/* set side on arcs */
+		setSideAxialSymmetry(node, node1, arc1);
+		setSideAxialSymmetry(node, node2, arc2);
+		
+		/* reestablish symmetry only if wanted */
+		if (reestablish)
+		{
+			/* average with node1 */
+			VecAddf(node1->p, node1->p, p);
+			VecMulf(node1->p, 0.5f);
+			
+			/* mirror back on node2 */
+			VECCOPY(node2->p, node1->p);
+			mirrorAlongAxis(node2->p, node->p, nor);
+			
+			/* Merge buckets
+			 * there shouldn't be any null arcs here, but just to be safe 
+			 * */
+			if (arc1->bcount > 0 && arc2->bcount > 0)
+			{
+				ReebArcIterator iter1, iter2;
+				EmbedBucket *bucket1 = NULL, *bucket2 = NULL;
+				
+				initArcIterator(&iter1, arc1, node);
+				initArcIterator(&iter2, arc2, node);
+				
+				bucket1 = nextBucket(&iter1);
+				bucket2 = nextBucket(&iter2);
+			
+				/* Make sure they both start at the same value */	
+				while(bucket1 && bucket1->val < bucket2->val)
+				{
+					bucket1 = nextBucket(&iter1);
+				}
+				
+				while(bucket2 && bucket2->val < bucket1->val)
+				{
+					bucket2 = nextBucket(&iter2);
+				}
+		
+		
+				for ( ;bucket1 && bucket2; bucket1 = nextBucket(&iter1), bucket2 = nextBucket(&iter2))
+				{
+					bucket1->nv += bucket2->nv; /* add counts */
+					
+					/* mirror on axis */
+					mirrorAlongAxis(bucket2->p, node->p, nor);
+					/* add bucket2 in bucket1 */
+					VecLerpf(bucket1->p, bucket1->p, bucket2->p, (float)bucket2->nv / (float)(bucket1->nv));
+		
+					/* copy and mirror back to bucket2 */			
+					bucket2->nv = bucket1->nv;
+					VECCOPY(bucket2->p, bucket1->p);
+					mirrorAlongAxis(bucket2->p, node->p, nor);
+				}
+			}
+		}
+	}
+	else
+	{
+		printf("NOT SYMMETRIC!\n");
+		printf("%f <= %f\n", VecLenf(node1->p, p), limit);
+		printvecf("axis", nor);
+	}
+}
+
+void markdownSecondarySymmetry(ReebNode *node, int depth, int level)
+{
+	float axis[3] = {0, 0, 0};
+	int count = 0;
+	int i;
+	/* Only reestablish spatial symmetry if needed */
+	int reestablish = G.scene->toolsettings->skgen_options & SKGEN_SYMMETRY;
+
+	/* count the number of branches in this symmetry group
+	 * and determinte the axis of symmetry
+	 *  */	
+	for (i = 0; node->arcs[i] != NULL; i++)
+	{
+		ReebArc *connectedArc = node->arcs[i];
+		
+		/* depth is store as a negative in flag. symmetry level is positive */
+		if (connectedArc->symmetry_level == -depth)
+		{
+			count++;
+		}
+		/* If arc is on the axis */
+		else if (connectedArc->symmetry_level == level)
+		{
+			VecAddf(axis, axis, connectedArc->v1->p);
+			VecSubf(axis, axis, connectedArc->v2->p);
+		}
+	}
+
+	Normalize(axis);
+
+	/* Split between axial and radial symmetry */
+	if (count == 2)
+	{
+		reestablishAxialSymmetry(node, depth, axis, reestablish);
+	}
+	else
+	{
+		reestablishRadialSymmetry(node, depth, axis, reestablish);
+	}
+
+	/* markdown secondary symetries */	
+	for (i = 0; node->arcs[i] != NULL; i++)
+	{
+		ReebArc *connectedArc = node->arcs[i];
+		
+		if (connectedArc->symmetry_level == -depth)
+		{
+			/* markdown symmetry for branches corresponding to the depth */
+			markdownSymmetryArc(connectedArc, node, level + 1);
+		}
+	}
+}
+
+void markdownSymmetryArc(ReebArc *arc, ReebNode *node, int level)
+{
+	int i;
+	arc->symmetry_level = level;
+	
+	node = OTHER_NODE(arc, node);
+	
+	for (i = 0; node->arcs[i] != NULL; i++)
+	{
+		ReebArc *connectedArc = node->arcs[i];
+		
+		if (connectedArc != arc)
+		{
+			ReebNode *connectedNode = OTHER_NODE(connectedArc, node);
+			
+			/* symmetry level is positive value, negative values is subtree depth */
+			connectedArc->symmetry_level = -subtreeDepth(connectedNode, connectedArc);
+		}
+	}
+
+	arc = NULL;
+
+	for (i = 0; node->arcs[i] != NULL; i++)
+	{
+		int issymmetryAxis = 0;
+		ReebArc *connectedArc = node->arcs[i];
+		
+		/* only arcs not already marked as symetric */
+		if (connectedArc->symmetry_level < 0)
+		{
+			int j;
+			
+			/* true by default */
+			issymmetryAxis = 1;
+			
+			for (j = 0; node->arcs[j] != NULL && issymmetryAxis == 1; j++)
+			{
+				ReebArc *otherArc = node->arcs[j];
+				
+				/* different arc, same depth */
+				if (otherArc != connectedArc && otherArc->symmetry_level == connectedArc->symmetry_level)
+				{
+					/* not on the symmetry axis */
+					issymmetryAxis = 0;
+				} 
+			}
+		}
+		
+		/* arc could be on the symmetry axis */
+		if (issymmetryAxis == 1)
+		{
+			/* no arc as been marked previously, keep this one */
+			if (arc == NULL)
+			{
+				arc = connectedArc;
+			}
+			else
+			{
+				/* there can't be more than one symmetry arc */
+				arc = NULL;
+				break;
+			}
+		}
+	}
+	
+	/* go down the arc continuing the symmetry axis */
+	if (arc)
+	{
+		markdownSymmetryArc(arc, node, level);
+	}
+
+	
+	/* secondary symmetry */
+	for (i = 0; node->arcs[i] != NULL; i++)
+	{
+		ReebArc *connectedArc = node->arcs[i];
+		
+		/* only arcs not already marked as symetric and is not the next arc on the symmetry axis */
+		if (connectedArc->symmetry_level < 0)
+		{
+			/* subtree depth is store as a negative value in the flag */
+			markdownSecondarySymmetry(node, -connectedArc->symmetry_level, level);
+		}
+	}
+}
+
+void markdownSymmetry(ReebGraph *rg)
+{
+	ReebNode *node;
+	ReebArc *arc;
+	/* only for Acyclic graphs */
+	int cyclic = isGraphCyclic(rg);
+	
+	/* mark down all arcs as non-symetric */
+	for (arc = rg->arcs.first; arc; arc = arc->next)
+	{
+		arc->symmetry_level = 0;
+	}
+	
+	/* mark down all nodes as not on the symmetry axis */
+	for (node = rg->nodes.first; node; node = node->next)
+	{
+		node->symmetry_level = 0;
+	}
+
+	/* node list is sorted, so lowest node is always the head (by design) */
+	node = rg->nodes.first;
+	
+	/* only work on acyclic graphs and if only one arc is incident on the first node */
+	if (cyclic == 0 && countConnectedArcs(rg, node) == 1)
+	{
+		arc = node->arcs[0];
+		
+		markdownSymmetryArc(arc, node, 1);
+
+		/* mark down non-symetric arcs */
+		for (arc = rg->arcs.first; arc; arc = arc->next)
+		{
+			if (arc->symmetry_level < 0)
+			{
+				arc->symmetry_level = 0;
+			}
+			else
+			{
+				/* mark down nodes with the lowest level symmetry axis */
+				if (arc->v1->symmetry_level == 0 || arc->v1->symmetry_level > arc->symmetry_level)
+				{
+					arc->v1->symmetry_level = arc->symmetry_level;
+				}
+				if (arc->v2->symmetry_level == 0 || arc->v2->symmetry_level > arc->symmetry_level)
+				{
+					arc->v2->symmetry_level = arc->symmetry_level;
+				}
+			}
+		}
+	}
+}
+
 /************************************** ADJACENCY LIST *************************************************/
 
-void addArcToNodeAdjacencyList(ReebNode *node, ReebArc *arc)
+static void addArcToNodeAdjacencyList(ReebNode *node, ReebArc *arc)
 {
 	ReebArc **arclist;
 
@@ -590,6 +1218,7 @@ void filterArc(ReebGraph *rg, ReebNode *newNode, ReebNode *removedNode, ReebArc
 			else
 			{
 				newNode->degree++; // incrementing degree since we're adding an arc
+				mergeArcFaces(rg, arc, srcArc);
 
 				if (merging)
 				{
@@ -762,6 +1391,181 @@ int filterExternalReebGraph(ReebGraph *rg, float threshold)
 	return value;
 }
 
+int filterSmartReebGraph(ReebGraph *rg, float threshold)
+{
+	ReebArc *arc = NULL, *nextArc = NULL;
+	int value = 0;
+	
+	BLI_sortlist(&rg->arcs, compareArcs);
+
+#ifdef DEBUG_REEB
+	{	
+		EditFace *efa;
+		for(efa=G.editMesh->faces.first; efa; efa=efa->next) {
+			efa->tmp.fp = -1;
+		}
+	}
+#endif
+
+	arc = rg->arcs.first;
+	while(arc)
+	{
+		nextArc = arc->next;
+		
+		/* need correct normals and center */
+		recalc_editnormals();
+
+		// Only test terminal arcs
+		if (arc->v1->degree == 1 || arc->v2->degree == 1)
+		{
+			GHashIterator ghi;
+			int merging = 0;
+			int total = BLI_ghash_size(arc->faces);
+			float avg_angle = 0;
+			float avg_vec[3] = {0,0,0};
+			
+			for(BLI_ghashIterator_init(&ghi, arc->faces);
+				!BLI_ghashIterator_isDone(&ghi);
+				BLI_ghashIterator_step(&ghi))
+			{
+				EditFace *efa = BLI_ghashIterator_getValue(&ghi);
+
+#if 0
+				ReebArcIterator iter;
+				EmbedBucket *bucket = NULL;
+				EmbedBucket *previous = NULL;
+				float min_distance = -1;
+				float angle = 0;
+		
+				initArcIterator(&iter, arc, arc->v1);
+		
+				bucket = nextBucket(&iter);
+				
+				while (bucket != NULL)
+				{
+					float *vec0 = NULL;
+					float *vec1 = bucket->p;
+					float midpoint[3], tangent[3];
+					float distance;
+		
+					/* first bucket. Previous is head */
+					if (previous == NULL)
+					{
+						vec0 = arc->v1->p;
+					}
+					/* Previous is a valid bucket */
+					else
+					{
+						vec0 = previous->p;
+					}
+					
+					VECCOPY(midpoint, vec1);
+					
+					distance = VecLenf(midpoint, efa->cent);
+					
+					if (min_distance == -1 || distance < min_distance)
+					{
+						min_distance = distance;
+					
+						VecSubf(tangent, vec1, vec0);
+						Normalize(tangent);
+						
+						angle = Inpf(tangent, efa->n);
+					}
+					
+					previous = bucket;
+					bucket = nextBucket(&iter);
+				}
+				
+				avg_angle += saacos(fabs(angle));
+#ifdef DEBUG_REEB
+				efa->tmp.fp = saacos(fabs(angle));
+#endif
+#else
+				VecAddf(avg_vec, avg_vec, efa->n);		
+#endif
+			}
+
+
+#if 0			
+			avg_angle /= total;
+#else
+			VecMulf(avg_vec, 1.0 / total);
+			avg_angle = Inpf(avg_vec, avg_vec);
+#endif
+			
+			arc->angle = avg_angle;
+			
+#ifdef DEBUG_REEB
+			printf("angle %f total %i\n", avg_angle, total);
+#endif
+			
+			if (avg_angle > threshold)
+				merging = 1;
+			
+			if (merging)
+			{
+				ReebNode *terminalNode = NULL;
+				ReebNode *middleNode = NULL;
+				ReebNode *newNode = NULL;
+				ReebNode *removedNode = NULL;
+				int merging = 0;
+				
+				// Assign terminal and middle nodes
+				if (arc->v1->degree == 1)
+				{
+					terminalNode = arc->v1;
+					middleNode = arc->v2;
+				}
+				else
+				{
+					terminalNode = arc->v2;
+					middleNode = arc->v1;
+				}
+				
+				// If middle node is a normal node, merge to terminal node
+				if (middleNode->degree == 2)
+				{
+					merging = 1;
+					newNode = terminalNode;
+					removedNode = middleNode;
+				}
+				// Otherwise, just plain remove of the arc
+				else
+				{
+					merging = 0;
+					newNode = middleNode;
+					removedNode = terminalNode;
+				}
+				
+				// Merging arc
+				if (merging)
+				{
+					filterArc(rg, newNode, removedNode, arc, 1);
+				}
+				else
+				{
+					// removing arc, so we need to decrease the degree of the remaining node
+					newNode->degree--;
+				}
+	
+				// Reset nextArc, it might have changed
+				nextArc = arc->next;
+				
+				BLI_remlink(&rg->arcs, arc);
+				freeArc(arc);
+				
+				BLI_freelinkN(&rg->nodes, removedNode);
+				value = 1;
+			}
+		}
+		
+		arc = nextArc;
+	}
+	
+	return value;
+}
+
 /************************************** WEIGHT SPREADING ***********************************************/
 
 int compareVerts( const void* a, const void* b )
@@ -858,12 +1662,12 @@ int detectCycle(ReebNode *node, ReebArc *srcArc)
 {
 	int value = 0;
 	
-	if (node->flags == 0)
+	if (node->flag == 0)
 	{
 		ReebArc ** pArc;
 
 		/* mark node as visited */
-		node->flags = 1;
+		node->flag = 1;
 
 		for(pArc = node->arcs; *pArc && value == 0; pArc++)
 		{
@@ -894,14 +1698,14 @@ int	isGraphCyclic(ReebGraph *rg)
 	/* Mark all nodes as not visited */
 	for(node = rg->nodes.first; node; node = node->next)
 	{
-		node->flags = 0;
+		node->flag = 0;
 	}
 
 	/* detectCycles in subgraphs */	
 	for(node = rg->nodes.first; node && value == 0; node = node->next)
 	{
 		/* only for nodes in subgraphs that haven't been visited yet */
-		if (node->flags == 0)
+		if (node->flag == 0)
 		{
 			value = value || detectCycle(node, NULL);
 		}		
@@ -917,9 +1721,8 @@ void exportNode(FILE *f, char *text, ReebNode *node)
 	fprintf(f, "%s i:%i w:%f d:%i %f %f %f\n", text, node->index, node->weight, node->degree, node->p[0], node->p[1], node->p[2]);
 }
 
-void exportGraph(ReebGraph *rg, int count)
+void REEB_exportGraph(ReebGraph *rg, int count)
 {
-#ifdef DEBUG_REEB
 	ReebArc *arc;
 	char filename[128];
 	FILE *f;
@@ -937,6 +1740,7 @@ void exportGraph(ReebGraph *rg, int count)
 	for(arc = rg->arcs.first; arc; arc = arc->next)
 	{
 		int i;
+		float p[3];
 		
 		exportNode(f, "v1", arc->v1);
 		
@@ -945,11 +1749,14 @@ void exportGraph(ReebGraph *rg, int count)
 			fprintf(f, "b nv:%i %f %f %f\n", arc->buckets[i].nv, arc->buckets[i].p[0], arc->buckets[i].p[1], arc->buckets[i].p[2]);
 		}
 		
+		VecAddf(p, arc->v2->p, arc->v1->p);
+		VecMulf(p, 0.5f);
+		
+		fprintf(f, "angle %0.3f %0.3f %0.3f %0.3f %i\n", p[0], p[1], p[2], arc->angle, BLI_ghash_size(arc->faces));
 		exportNode(f, "v2", arc->v2);
 	}	
 	
 	fclose(f);
-#endif
 }
 
 /***************************************** MAIN ALGORITHM **********************************************/
@@ -969,6 +1776,7 @@ ReebArc * findConnectedArc(ReebGraph *rg, ReebArc *arc, ReebNode *v)
 	return nextArc;
 }
 
+
 void removeNormalNodes(ReebGraph *rg)
 {
 	ReebArc *arc;
@@ -1041,11 +1849,23 @@ ReebArc *nextArcMappedToEdge(ReebArc *arc, ReebEdge *e)
 	return result;
 }
 
-typedef enum {
-	MERGE_LOWER,
-	MERGE_HIGHER,
-	MERGE_APPEND
-} MergeDirection;
+void addFacetoArc(ReebArc *arc, EditFace *efa)
+{
+	BLI_ghash_insert(arc->faces, efa, efa);
+}
+
+void mergeArcFaces(ReebGraph *rg, ReebArc *aDst, ReebArc *aSrc)
+{
+	GHashIterator ghi;
+	
+	for(BLI_ghashIterator_init(&ghi, aSrc->faces);
+		!BLI_ghashIterator_isDone(&ghi);
+		BLI_ghashIterator_step(&ghi))
+	{
+		EditFace *efa = BLI_ghashIterator_getValue(&ghi);
+		BLI_ghash_insert(aDst->faces, efa, efa);
+	}
+} 
 
 void mergeArcEdges(ReebGraph *rg, ReebArc *aDst, ReebArc *aSrc, MergeDirection direction)
 {
@@ -1110,6 +1930,7 @@ int mergeConnectedArcs(ReebGraph *rg, ReebArc *a0, ReebArc *a1)
 	ReebNode *removedNode = NULL;
 	
 	mergeArcEdges(rg, a0, a1, MERGE_APPEND);
+	mergeArcFaces(rg, a0, a1);
 	
 	// Bring a0 to the combine length of both arcs
 	if (a0->v2 == a1->v1)
@@ -1146,6 +1967,7 @@ int mergeArcs(ReebGraph *rg, ReebArc *a0, ReebArc *a1)
 		if (a0->v2->weight == a1->v2->weight) // tails also the same, arcs can be totally merge together
 		{
 			mergeArcEdges(rg, a0, a1, MERGE_APPEND);
+			mergeArcFaces(rg, a0, a1);
 			
 			mergeArcBuckets(a0, a1, a0->v1->weight, a0->v2->weight);
 			
@@ -1162,6 +1984,7 @@ int mergeArcs(ReebGraph *rg, ReebArc *a0, ReebArc *a1)
 		else if (a0->v2->weight > a1->v2->weight) // a1->v2->weight is in the middle
 		{
 			mergeArcEdges(rg, a1, a0, MERGE_LOWER);
+			mergeArcFaces(rg, a1, a0);
 
 			// Adjust node degree
 			a0->v1->degree--;
@@ -1174,6 +1997,7 @@ int mergeArcs(ReebGraph *rg, ReebArc *a0, ReebArc *a1)
 		else // a0>n2 is in the middle
 		{
 			mergeArcEdges(rg, a0, a1, MERGE_LOWER);
+			mergeArcFaces(rg, a0, a1);
 			
 			// Adjust node degree
 			a1->v1->degree--;
@@ -1190,6 +2014,7 @@ int mergeArcs(ReebGraph *rg, ReebArc *a0, ReebArc *a1)
 		if (a0->v1->weight > a1->v1->weight) // a0->v1->weight is in the middle
 		{
 			mergeArcEdges(rg, a0, a1, MERGE_HIGHER);
+			mergeArcFaces(rg, a0, a1);
 			
 			// Adjust node degree
 			a1->v2->degree--;
@@ -1202,6 +2027,7 @@ int mergeArcs(ReebGraph *rg, ReebArc *a0, ReebArc *a1)
 		else // a1->v1->weight is in the middle
 		{
 			mergeArcEdges(rg, a1, a0, MERGE_HIGHER);
+			mergeArcFaces(rg, a1, a0);
 
 			// Adjust node degree
 			a0->v2->degree--;
@@ -1258,7 +2084,8 @@ ReebNode * addNode(ReebGraph *rg, EditVert *eve, float weight)
 	
 	node = MEM_callocN(sizeof(ReebNode), "reeb node");
 	
-	node->flags = 0; // clear flags on init
+	node->flag = 0; // clear flag on init
+	node->symmetry_level = 0;
 	node->arcs = NULL;
 	node->degree = 0;
 	node->weight = weight;
@@ -1288,7 +2115,9 @@ ReebEdge * createArc(ReebGraph *rg, ReebNode *node1, ReebNode *node2)
 		arc = MEM_callocN(sizeof(ReebArc), "reeb arc");
 		edge = MEM_callocN(sizeof(ReebEdge), "reeb edge");
 		
-		arc->flags = 0; // clear flags on init
+		arc->flag = 0; // clear flag on init
+		arc->symmetry_level = 0;
+		arc->faces = BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp);
 		
 		if (node1->weight <= node2->weight)
 		{
@@ -1349,7 +2178,7 @@ ReebEdge * createArc(ReebGraph *rg, ReebNode *node1, ReebNode *node2)
 	return edge;
 }
 
-void addTriangleToGraph(ReebGraph *rg, ReebNode * n1, ReebNode * n2, ReebNode * n3)
+void addTriangleToGraph(ReebGraph *rg, ReebNode * n1, ReebNode * n2, ReebNode * n3, EditFace *efa)
 {
 	ReebEdge *re1, *re2, *re3;
 	ReebEdge *e1, *e2, *e3;
@@ -1359,6 +2188,10 @@ void addTriangleToGraph(ReebGraph *rg, ReebNode * n1, ReebNode * n2, ReebNode *
 	re2 = createArc(rg, n2, n3);
 	re3 = createArc(rg, n3, n1);
 	
+	addFacetoArc(re1->arc, efa);
+	addFacetoArc(re2->arc, efa);
+	addFacetoArc(re3->arc, efa);
+	
 	len1 = (float)fabs(n1->weight - n2->weight);
 	len2 = (float)fabs(n2->weight - n3->weight);
 	len3 = (float)fabs(n3->weight - n1->weight);
@@ -1398,6 +2231,17 @@ void addTriangleToGraph(ReebGraph *rg, ReebNode * n1, ReebNode * n2, ReebNode *
 	mergePaths(rg, e1, e2, e3);
 }
 
+ReebGraph * newReebGraph()
+{
+	ReebGraph *rg;
+	rg = MEM_callocN(sizeof(ReebGraph), "reeb graph");
+	
+	rg->totnodes = 0;
+	rg->emap = BLI_edgehash_new();
+	
+	return rg;
+}
+
 ReebGraph * generateReebGraph(EditMesh *em, int subdivisions)
 {
 	ReebGraph *rg;
@@ -1412,10 +2256,7 @@ ReebGraph * generateReebGraph(EditMesh *em, int subdivisions)
 	int countfaces = 0;
 #endif
  	
-	rg = MEM_callocN(sizeof(ReebGraph), "reeb graph");
-	
-	rg->totnodes = 0;
-	rg->emap = BLI_edgehash_new();
+	rg = newReebGraph();
 	
 	totvert = BLI_countlist(&em->verts);
 	totfaces = BLI_countlist(&em->faces);
@@ -1447,12 +2288,12 @@ ReebGraph * generateReebGraph(EditMesh *em, int subdivisions)
 		n2 = (ReebNode*)BLI_dlist_find_link(dlist, efa->v2->hash);
 		n3 = (ReebNode*)BLI_dlist_find_link(dlist, efa->v3->hash);
 		
-		addTriangleToGraph(rg, n1, n2, n3);
+		addTriangleToGraph(rg, n1, n2, n3, efa);
 		
 		if (efa->v4)
 		{
 			ReebNode *n4 = (ReebNode*)efa->v4->tmp.p;
-			addTriangleToGraph(rg, n1, n3, n4);
+			addTriangleToGraph(rg, n1, n3, n4, efa);
 		}
 
 #ifdef DEBUG_REEB
@@ -1460,6 +2301,7 @@ ReebGraph * generateReebGraph(EditMesh *em, int subdivisions)
 		if (countfaces % 100 == 0)
 		{
 			printf("face %i of %i\n", countfaces, totfaces);
+			verifyFaces(rg);
 		}
 #endif
 		
@@ -1728,7 +2570,7 @@ int weightFromDistance(EditMesh *em)
 		return 0;
 	}
 
-	/* Initialize vertice flags and find at least one selected vertex */
+	/* Initialize vertice flag and find at least one selected vertex */
 	for(eve = em->verts.first; eve && vCount == 0; eve = eve->next)
 	{
 		eve->f1 = 0;
@@ -1762,7 +2604,7 @@ int weightFromDistance(EditMesh *em)
 					
 					edges = MEM_callocN(totedge * sizeof(EditEdge*), "Edges");
 					
-					/* Calculate edge weight and initialize edge flags */
+					/* Calculate edge weight and initialize edge flag */
 					for(eed= em->edges.first; eed; eed= eed->next)
 					{
 						eed->tmp.fp = VecLenf(eed->v1->co, eed->v2->co);
@@ -1837,17 +2679,17 @@ int weightFromDistance(EditMesh *em)
 	return 1;
 }
 
-MCol MColFromWeight(EditVert *eve)
+MCol MColFromVal(float val)
 {
 	MCol col;
 	col.a = 255;
-	col.b = (char)(eve->tmp.fp * 255);
+	col.b = (char)(val * 255);
 	col.g = 0;
-	col.r = (char)((1.0f - eve->tmp.fp) * 255);
+	col.r = (char)((1.0f - val) * 255);
 	return col;
 }
 
-void weightToVCol(EditMesh *em)
+void weightToVCol(EditMesh *em, int index)
 {
 	EditFace *efa;
 	MCol *mcol;
@@ -1855,15 +2697,149 @@ void weightToVCol(EditMesh *em)
 		return;
 	}
 	
+	for(efa=em->faces.first; efa; efa=efa->next) {
+		mcol = CustomData_em_get_n(&em->fdata, efa->data, CD_MCOL, index);
+
+		if (mcol)
+		{				
+			mcol[0] = MColFromVal(efa->v1->tmp.fp);
+			mcol[1] = MColFromVal(efa->v2->tmp.fp);
+			mcol[2] = MColFromVal(efa->v3->tmp.fp);
+	
+			if(efa->v4) {
+				mcol[3] = MColFromVal(efa->v4->tmp.fp);
+			}
+		}
+	}
+}
+
+void angleToVCol(EditMesh *em, int index)
+{
+	EditFace *efa;
+	MCol *mcol;
+
+	if (!EM_vertColorCheck()) {
+		return;
+	}
+	
+	for(efa=em->faces.first; efa; efa=efa->next) {
+		MCol col;
+		if (efa->tmp.fp > 0)
+		{
+			col = MColFromVal(efa->tmp.fp / (M_PI / 2 + 0.1));
+		}
+		else
+		{
+			col.a = 255;
+			col.r = 0;
+			col.g = 255;
+			col.b = 0;
+		}
+
+		mcol = CustomData_em_get_n(&em->fdata, efa->data, CD_MCOL, index);
+				
+		if (mcol)
+		{
+			mcol[0] = col;
+			mcol[1] = col;
+			mcol[2] = col;
+	
+			if(efa->v4) {
+				mcol[3] = col;
+			}
+		}
+	}
+}
+
+void blendColor(MCol *dst, MCol *src)
+{
+#if 1
+	float blend_src = (float)src->a / (float)(src->a + dst->a);
+	float blend_dst = (float)dst->a / (float)(src->a + dst->a);
+	dst->a += src->a;
+	dst->r = (char)(dst->r * blend_dst + src->r * blend_src);
+	dst->g = (char)(dst->g * blend_dst + src->g * blend_src);
+	dst->b = (char)(dst->b * blend_dst + src->b * blend_src);
+#else
+	dst->r = src->r;
+	dst->g = src->g;
+	dst->b = src->b;
+#endif
+}
+
+void arcToVCol(ReebGraph *rg, EditMesh *em, int index)
+{
+	GHashIterator ghi;
+	EditFace *efa;
+	ReebArc *arc;
+	MCol *mcol;
+	MCol col;
+	int total = BLI_countlist(&rg->arcs);
+	int i = 0;
+
+	if (!EM_vertColorCheck()) {
+		return;
+	}
+	
+	col.a = 0;
+	
+	col.r = 0;
+	col.g = 0;
+	col.b = 0;
+
+	for(efa=em->faces.first; efa; efa=efa->next) {
+		mcol = CustomData_em_get_n(&em->fdata, efa->data, CD_MCOL, index);
+		
+		if (mcol)
+		{
+			mcol[0] = col;
+			mcol[1] = col;
+			mcol[2] = col;
+	
+			if(efa->v4) {
+				mcol[3] = col;
+			}
+		}
+	}
+
+	for (arc = rg->arcs.first; arc; arc = arc->next, i++)
+	{
+		float r,g,b;
+		col.a = 1;
+		
+		hsv_to_rgb((float)i / (float)total, 1, 1, &r, &g, &b);
+		
+		col.r = FTOCHAR(r);
+		col.g = FTOCHAR(g);
+		col.b = FTOCHAR(b);
+		
+		for(BLI_ghashIterator_init(&ghi, arc->faces);
+			!BLI_ghashIterator_isDone(&ghi);
+			BLI_ghashIterator_step(&ghi))
+		{
+			efa = BLI_ghashIterator_getValue(&ghi);
+
+			mcol = CustomData_em_get(&em->fdata, efa->data, CD_MCOL);
+					
+			blendColor(&mcol[0], &col);
+			blendColor(&mcol[1], &col);
+			blendColor(&mcol[2], &col);
+	
+			if(efa->v4) {
+				blendColor(&mcol[3], &col);
+			}
+		}
+	}
+
 	for(efa=em->faces.first; efa; efa=efa->next) {
 		mcol = CustomData_em_get(&em->fdata, efa->data, CD_MCOL);
 				
-		mcol[0] = MColFromWeight(efa->v1);
-		mcol[1] = MColFromWeight(efa->v2);
-		mcol[2] = MColFromWeight(efa->v3);
+		mcol[0].a = 255;
+		mcol[1].a = 255;
+		mcol[2].a = 255;
 
 		if(efa->v4) {
-			mcol[3] = MColFromWeight(efa->v4);
+			mcol[3].a = 255;
 		}
 	}
 }
@@ -1890,6 +2866,31 @@ void initArcIterator(ReebArcIterator *iter, ReebArc *arc, ReebNode *head)
 	iter->index = iter->start - iter->stride;
 }
 
+void initArcIteratorStart(struct ReebArcIterator *iter, struct ReebArc *arc, struct ReebNode *head, int start)
+{
+	iter->arc = arc;
+	
+	if (head == arc->v1)
+	{
+		iter->start = start;
+		iter->end = arc->bcount - 1;
+		iter->stride = 1;
+	}
+	else
+	{
+		iter->start = arc->bcount - 1 - start;
+		iter->end = 0;
+		iter->stride = -1;
+	}
+	
+	iter->index = iter->start - iter->stride;
+	
+	if (start >= arc->bcount)
+	{
+		iter->start = iter->end; /* stop iterator since it's past its end */
+	}
+}
+
 void initArcIterator2(ReebArcIterator *iter, ReebArc *arc, int start, int end)
 {
 	iter->arc = arc;
@@ -1921,3 +2922,153 @@ EmbedBucket * nextBucket(ReebArcIterator *iter)
 	
 	return result;
 }
+
+EmbedBucket * nextNBucket(ReebArcIterator *iter, int n)
+{
+	EmbedBucket *result = NULL;
+	
+	iter->index += n * iter->stride;
+
+	/* check if passed end */
+	if ((iter->stride == 1 && iter->index < iter->end) ||
+		(iter->stride == -1 && iter->index > iter->end))
+	{
+		result = &(iter->arc->buckets[iter->index]);
+	}
+	else
+	{
+		/* stop iterator if passed end */
+		iter->index = iter->end; 
+	}
+	
+	return result;
+}
+
+EmbedBucket * previousBucket(struct ReebArcIterator *iter)
+{
+	EmbedBucket *result = NULL;
+	
+	if (iter->index != iter->start)
+	{
+		iter->index -= iter->stride;
+		result = &(iter->arc->buckets[iter->index]);
+	}
+	
+	return result;
+}
+
+int iteratorStopped(struct ReebArcIterator *iter)
+{
+	if (iter->index == iter->end)
+	{
+		return 1;
+	}
+	else
+	{
+		return 0;
+	}
+}
+
+struct EmbedBucket * currentBucket(struct ReebArcIterator *iter)
+{
+	EmbedBucket *result = NULL;
+	
+	if (iter->index != iter->end)
+	{
+		result = &(iter->arc->buckets[iter->index]);
+	}
+	
+	return result;
+}
+
+/************************ PUBLIC FUNCTIONS *********************************************/
+
+ReebGraph *BIF_ReebGraphFromEditMesh(void)
+{
+	EditMesh *em = G.editMesh;
+	ReebGraph *rg = NULL;
+	int i;
+	
+	if (em == NULL)
+		return NULL;
+
+	if (weightFromDistance(em) == 0)
+	{
+		error("No selected vertex\n");
+		return NULL;
+	}
+	
+	renormalizeWeight(em, 1.0f);
+
+	if (G.scene->toolsettings->skgen_options & SKGEN_HARMONIC)
+	{
+		weightToHarmonic(em);
+	}
+	
+#ifdef DEBUG_REEB
+	weightToVCol(em, 1);
+#endif
+	
+	rg = generateReebGraph(em, G.scene->toolsettings->skgen_resolution);
+
+	verifyBuckets(rg);
+	
+	verifyFaces(rg);
+
+	/* Remove arcs without embedding */
+	filterNullReebGraph(rg);
+
+	verifyBuckets(rg);
+
+	i = 1;
+	/* filter until there's nothing more to do */
+	while (i == 1)
+	{
+		i = 0; /* no work done yet */
+		
+		if (G.scene->toolsettings->skgen_options & SKGEN_FILTER_EXTERNAL)
+		{
+			i |= filterExternalReebGraph(rg, G.scene->toolsettings->skgen_threshold_external * G.scene->toolsettings->skgen_resolution);
+		}
+	
+		verifyBuckets(rg);
+	
+		if (G.scene->toolsettings->skgen_options & SKGEN_FILTER_INTERNAL)
+		{
+			i |= filterInternalReebGraph(rg, G.scene->toolsettings->skgen_threshold_internal * G.scene->toolsettings->skgen_resolution);
+		}
+	}
+
+	filterSmartReebGraph(rg, 0.5);
+
+#ifdef DEBUG_REEB
+	arcToVCol(rg, em, 0);
+	//angleToVCol(em, 1);
+#endif
+
+	verifyBuckets(rg);
+
+	repositionNodes(rg);
+	
+	verifyBuckets(rg);
+
+	/* Filtering might have created degree 2 nodes, so remove them */
+	removeNormalNodes(rg);
+	
+	verifyBuckets(rg);
+
+	for(i = 0; i <  G.scene->toolsettings->skgen_postpro_passes; i++)
+	{
+		postprocessGraph(rg, G.scene->toolsettings->skgen_postpro);
+	}
+
+	buildAdjacencyList(rg);
+	
+	sortNodes(rg);
+	
+	sortArcs(rg);
+	
+	REEB_exportGraph(rg, -1);
+	
+	return rg;
+}

From 21c479789619767e9c1edb5e8dc4e301d900f179 Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Tue, 27 May 2008 14:13:16 +0000
Subject: [PATCH 023/252] soc-2008-mxcurioni: Freestyle execution now works
 flawlessly (Python runtime loads appropriate modules, using SWIG wrapper),
 but does not render anything yet (render window OpenGL context not used yet).
 Currently, the SWIG wrapper library needs to be manually compiled (see SWIG
 section in  source/blender/freestyle/SConscript for details). I am missing
 some knowledge on scons to create it automatically from the SConscript. Once
 I find that information, I'll make it automatic and for different platforms.

I also corrected a simple GLStrokeRenderer bug for texture loading (not in original Freestyle code). Apparently, IMB_loadiffname doesn't recognize the paper's texture depth so a work-around will have to be found.
---
 source/blender/freestyle/SConscript           | 17 ++---------
 .../intern/app_blender/Controller.cpp         |  3 +-
 .../intern/rendering/GLStrokeRenderer.cpp     | 29 ++++++++++---------
 .../intern/system/PythonInterpreter.h         |  2 +-
 4 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript
index 4f096d35c23..7fae14cd457 100644
--- a/source/blender/freestyle/SConscript
+++ b/source/blender/freestyle/SConscript
@@ -77,19 +77,6 @@ env.BlenderLib (libname="bf_freestyle",
 ########################################################
 #	swig
 
-# swig -c++ -python -o ModuleWrapper.cpp Freestyle.i
-#
-# g++   -w  -I../geometry -I../image -I../scene_graph -I../stroke -I../system -I../view_map -I../winged_edge -I/usr/include/python2.5 -c ModuleWrapper.cpp -o ModuleWrapper.o
-#
-# install -d ../../build/macosx/release/lib/python
-#
-# g++ -bundle -flat_namespace -undefined suppress  -w  -L/usr/lib/python2.5/config -lpython2.5 -o ../../build/macosx/release/lib/python/_Freestyle.so ModuleWrapper.o
-# 
-# install Freestyle.py ../../build/macosx/release/lib/python
-
-
-#================ MINE
-
 # g++ -w  -I../geometry -I../image -I../scene_graph -I../stroke -I../system -I../view_map -I../winged_edge -I/usr/include/python2.5 -I../../../blenlib -I../../../blenkernel -I../../../imbuf -I../../../makesdna -c ModuleWrapper.cpp -o ModuleWrapper.o
-# 
-# g++ -bundle -flat_namespace -undefined suppress  -w  -L/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/build/darwin/lib -L/usr/lib/python2.5/config -lbf_freestyle -lbf_blenlib -lbf_blenkernel -lbf_guardedalloc -lbf_imbuf -lpython2.5 -o ../../python/_Freestyle.so ModuleWrapper.o
+
+# g++ -bundle -flat_namespace -undefined suppress  -w  -L/usr/lib/python2.5/config -L/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/build/darwin/lib -lpython2.5 -lbf_freestyle -o ../../python/_Freestyle.so ModuleWrapper.o
\ No newline at end of file
diff --git a/source/blender/freestyle/intern/app_blender/Controller.cpp b/source/blender/freestyle/intern/app_blender/Controller.cpp
index 38f0ff0b7f0..bd234746e2b 100755
--- a/source/blender/freestyle/intern/app_blender/Controller.cpp
+++ b/source/blender/freestyle/intern/app_blender/Controller.cpp
@@ -1098,7 +1098,6 @@ void Controller::init_options(){
 	setFrontBufferFlag(false);
 	setBackBufferFlag(true);
 
-
 	// Ridges and Valleys
 	setComputeRidgesAndValleysFlag( false );
 	
@@ -1107,4 +1106,6 @@ void Controller::init_options(){
 	setSphereRadius(1);
 	setSuggestiveContourKrDerivativeEpsilon(0);
 
+	// soc: initialize canvas
+	_Canvas->init();
 }
diff --git a/source/blender/freestyle/intern/rendering/GLStrokeRenderer.cpp b/source/blender/freestyle/intern/rendering/GLStrokeRenderer.cpp
index 50055e10f3d..c29ba759139 100755
--- a/source/blender/freestyle/intern/rendering/GLStrokeRenderer.cpp
+++ b/source/blender/freestyle/intern/rendering/GLStrokeRenderer.cpp
@@ -291,8 +291,10 @@ GLTextureManager::loadPapers ()
   // Papers textures
   cout << "Loading papers textures..." << endl;
 
-  for (unsigned i = 0; i < size; i++)
-    preparePaper(_papertextures[i].c_str(), _papertexname[i]);
+  for (unsigned i = 0; i < size; i++){
+	cout << i << ": " << _papertextures[i] << endl;
+	preparePaper(_papertextures[i].c_str(), _papertexname[i]);
+  }
 
   cout << "Done." << endl << endl;
 }
@@ -368,12 +370,12 @@ GLTextureManager::prepareTextureAlpha (string sname, GLuint itexname)
 //soc  if (qim.isNull()) 
 	if( qim )
     {
-      cerr << "  Error: unable to read \"" << name << "\"" << endl;
+      cerr << "  Error: unable to read \"" << filename << "\"" << endl;
       return false;
     }
   if( qim->depth > 8) //soc
     {
-      cerr<<"  Error: \""<< name <<"\" has "<< qim->depth <<" bits/pixel"<<endl; //soc
+      cerr<<"  Error: \""<< filename <<"\" has "<< qim->depth <<" bits/pixel"<<endl; //soc
       return false;
     }
   //		qim=QGLWidget::convertToGLFormat( qimOri );
@@ -414,14 +416,14 @@ GLTextureManager::prepareTextureLuminance (string sname, GLuint itexname)
 	char filename[FILE_MAXFILE];
 	BLI_splitdirstring(name, filename);
 	
-  if (qim) //soc
+  if (!qim) //soc
     {
-      cerr << "  Error: unable to read \"" << name << "\"" << endl;
+      cerr << "  Error: unable to read \"" << filename << "\"" << endl;
       return false;
     }
   if (qim->depth > 8) //soc
     {
-      cerr<<"  Error: \""<<name<<"\" has "<<qim->depth <<" bits/pixel"<<endl;//soc
+      cerr<<"  Error: \""<<filename<<"\" has "<<qim->depth <<" bits/pixel"<<endl;//soc
       return false;
     }
 
@@ -461,14 +463,14 @@ GLTextureManager::prepareTextureLuminanceAndAlpha (string sname, GLuint itexname
 	char filename[FILE_MAXFILE];
 	BLI_splitdirstring(name, filename);
 
-  if (qim) //soc
+  if (!qim) //soc
     {
-      cerr << "  Error: unable to read \"" << name << "\"" << endl;
+      cerr << "  Error: unable to read \"" << filename << "\"" << endl;
       return false;
     }
   if (qim->depth > 8) //soc
     {
-      cerr<<"  Error: \""<<name<<"\" has "<<qim->depth<<" bits/pixel"<<endl; //soc
+      cerr<<"  Error: \""<<filename<<"\" has "<< qim->depth <<" bits/pixel"<<endl; //soc
       return false;
     }
 					   
@@ -507,14 +509,15 @@ GLTextureManager::preparePaper (const char *name, GLuint itexname)
 	char filename[FILE_MAXFILE];
 	BLI_splitdirstring((char *)name, filename);
 
-  if (qim) //soc 
+  if (!qim) //soc 
     {
-      cerr << "  Error: unable to read \"" << name << "\"" << endl;
+      cerr << "  Error: unable to read \"" << filename << "\"" << endl;
       return false;
     }
+
   if (qim->depth !=32) //soc
     {
-      cerr<<"  Error: \""<<name<<"\" has "<<qim->depth<<" bits/pixel"<<endl; //soc
+      cerr<<"  Error: \""<<filename<<"\" has "<<qim->depth<<" bits/pixel"<<endl; //soc
       return false;
     }
   //soc QImage qim2=QGLWidget::convertToGLFormat( qim );
diff --git a/source/blender/freestyle/intern/system/PythonInterpreter.h b/source/blender/freestyle/intern/system/PythonInterpreter.h
index 540d0b3ddec..719b777f38d 100755
--- a/source/blender/freestyle/intern/system/PythonInterpreter.h
+++ b/source/blender/freestyle/intern/system/PythonInterpreter.h
@@ -108,7 +108,7 @@ private:
 	vector<string> pathnames;
 	StringUtils::getPathName(_path, "", pathnames);
 	
-	struct Text *text = add_empty_text("initpath_test.txt");
+	struct Text *text = add_empty_text("tmp_initpath.txt");
 	string cmd = "import sys\n";
 	txt_insert_buf(text, const_cast<char*>(cmd.c_str()));
 	

From 58066fd0af30388a6bf29fa897fb0300b37c5c7b Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Tue, 27 May 2008 14:49:28 +0000
Subject: [PATCH 024/252] soc-2008-mxcurioni: updated SWIG module linking
 instruction

---
 source/blender/freestyle/SConscript | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript
index 7fae14cd457..198eb2ed422 100644
--- a/source/blender/freestyle/SConscript
+++ b/source/blender/freestyle/SConscript
@@ -76,6 +76,11 @@ env.BlenderLib (libname="bf_freestyle",
 # SWIG
 ########################################################
 #	swig
+#
+# 	Run the following two commands in the source/blender/freestyle/intern/swig directory.
+#
+#	Replace /Users/mx/Documents/work/GSoC_2008/bf-blender/branches/build/darwin/lib to the path
+#	of your library directory (used to locate libbf_freestyle.a)
 
 # g++ -w  -I../geometry -I../image -I../scene_graph -I../stroke -I../system -I../view_map -I../winged_edge -I/usr/include/python2.5 -I../../../blenlib -I../../../blenkernel -I../../../imbuf -I../../../makesdna -c ModuleWrapper.cpp -o ModuleWrapper.o
 

From ab787c976567f46c7fcb5fd18806903a270350b9 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Wed, 28 May 2008 16:39:05 +0000
Subject: [PATCH 025/252] Generalizing the graph code used for Reeb graphs and
 Rig (Armature) graphs

Removing a lot of duplicated code
---
 source/blender/blenlib/BLI_graph.h    |  102 +++
 source/blender/blenlib/intern/graph.c |  678 ++++++++++++++
 source/blender/include/reeb.h         |   69 +-
 source/blender/src/autoarmature.c     |  750 ++--------------
 source/blender/src/editarmature.c     |   40 +-
 source/blender/src/reeb.c             | 1169 +++++++------------------
 6 files changed, 1235 insertions(+), 1573 deletions(-)
 create mode 100644 source/blender/blenlib/BLI_graph.h
 create mode 100644 source/blender/blenlib/intern/graph.c

diff --git a/source/blender/blenlib/BLI_graph.h b/source/blender/blenlib/BLI_graph.h
new file mode 100644
index 00000000000..1d29cc88651
--- /dev/null
+++ b/source/blender/blenlib/BLI_graph.h
@@ -0,0 +1,102 @@
+#ifndef BLI_GRAPH_H_
+#define BLI_GRAPH_H_
+
+#include "DNA_listBase.h"
+
+struct BGraph;
+struct BNode;
+struct BArc;
+
+struct RadialArc;
+
+typedef void (*FreeArc)(struct BArc*);
+typedef void (*FreeNode)(struct BNode*);
+typedef void (*RadialSymmetry)(struct BNode* root_node, struct RadialArc* ring, int total);
+typedef void (*AxialSymmetry)(struct BNode* root_node, struct BNode* node1, struct BNode* node2, struct BArc* arc1, struct BArc* arc2);
+
+/* IF YOU MODIFY THOSE TYPES, YOU NEED TO UPDATE ALL THOSE THAT "INHERIT" FROM THEM
+ * 
+ * RigGraph, ReebGraph
+ * 
+ * */
+
+typedef struct BGraph {
+	ListBase	arcs;
+	ListBase	nodes;
+	
+	/* function pointer to deal with custom fonctionnality */
+	FreeArc			free_arc;
+	FreeNode		free_node;
+	RadialSymmetry	radial_symmetry;
+	AxialSymmetry	axial_symmetry;
+} BGraph;
+
+typedef struct BNode {
+	void *next, *prev;
+	float p[3];
+	int flag;
+
+	int degree;
+	struct BArc **arcs;
+
+	int symmetry_level;
+	int symmetry_flag;
+	float symmetry_axis[3];
+} BNode;
+
+typedef struct BArc {
+	void *next, *prev;
+	struct BNode *head, *tail;
+	int flag;
+
+	float length;
+
+	int symmetry_level;
+	int symmetry_flag;
+} BArc;
+
+/* Helper structure for radial symmetry */
+typedef struct RadialArc
+{
+	struct BArc *arc; 
+	float n[3]; /* normalized vector joining the nodes of the arc */
+} RadialArc;
+
+BNode *BLI_otherNode(BArc *arc, BNode *node);
+
+void BLI_freeNode(BGraph *graph, BNode *node);
+
+void BLI_flagNodes(BGraph *graph, int flag);
+void BLI_flagArcs(BGraph *graph, int flag);
+
+int BLI_hasAdjacencyList(BGraph *rg);
+void BLI_buildAdjacencyList(BGraph *rg);
+
+void BLI_replaceNode(BGraph *graph, BNode *node_src, BNode *node_replaced);
+void BLI_removeDoubleNodes(BGraph *graph, float limit);
+
+BArc * BLI_findConnectedArc(BGraph *graph, BArc *arc, BNode *v);
+
+int	BLI_isGraphCyclic(BGraph *graph);
+
+/*------------ Symmetry handling ------------*/
+//	float limit = G.scene->toolsettings->skgen_symmetry_limit;
+void BLI_markdownSymmetry(BGraph *graph, BNode *root_node, float limit);
+
+void BLI_mirrorAlongAxis(float v[3], float center[3], float axis[3]);
+
+/* BNode symmetry flags */
+#define SYM_TOPOLOGICAL	1
+#define SYM_PHYSICAL	2
+
+/* the following two are exclusive */
+#define SYM_AXIAL		4
+#define SYM_RADIAL		8
+
+/* BArc symmetry flags
+ * 
+ * axial symetry sides */
+#define SYM_SIDE_POSITIVE		1
+#define SYM_SIDE_NEGATIVE		2
+
+#endif /*BLI_GRAPH_H_*/
diff --git a/source/blender/blenlib/intern/graph.c b/source/blender/blenlib/intern/graph.c
new file mode 100644
index 00000000000..3a484e15642
--- /dev/null
+++ b/source/blender/blenlib/intern/graph.c
@@ -0,0 +1,678 @@
+/**
+ * $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): Martin Poirier
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ * graph.c: Common graph interface and methods
+ */
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_graph.h"
+#include "BLI_blenlib.h"
+#include "BLI_arithb.h"
+
+#include "BKE_utildefines.h"
+
+void BLI_freeNode(BGraph *graph, BNode *node)
+{
+	if (node->arcs)
+	{
+		MEM_freeN(node->arcs);
+	}
+	
+	if (graph->free_node)
+	{
+		graph->free_node(node);
+	}
+}
+
+BNode *BLI_otherNode(BArc *arc, BNode *node)
+{
+	return (arc->head == node) ? arc->tail : arc->head;
+}
+
+void BLI_flagNodes(BGraph *graph, int flag)
+{
+	BNode *node;
+	
+	for(node = graph->nodes.first; node; node = node->next)
+	{
+		node->flag = flag;
+	}
+}
+
+void BLI_flagArcs(BGraph *graph, int flag)
+{
+	BArc *arc;
+	
+	for(arc = graph->arcs.first; arc; arc = arc->next)
+	{
+		arc->flag = flag;
+	}
+}
+
+static void addArcToNodeAdjacencyList(BNode *node, BArc *arc)
+{
+	node->arcs[node->degree] = arc;
+	node->degree++;
+}
+
+void BLI_buildAdjacencyList(BGraph *rg)
+{
+	BNode *node;
+	BArc *arc;
+
+	for(node = rg->nodes.first; node; node = node->next)
+	{
+		if (node->arcs != NULL)
+		{
+			MEM_freeN(node->arcs);
+		}
+		
+		node->arcs = MEM_callocN((node->degree) * sizeof(BArc*), "adjacency list");
+		
+		/* temporary use to indicate the first index available in the lists */
+		node->degree = 0;
+	}
+
+	for(arc = rg->arcs.first; arc; arc= arc->next)
+	{
+		addArcToNodeAdjacencyList(arc->head, arc);
+		addArcToNodeAdjacencyList(arc->tail, arc);
+	}
+}
+
+int BLI_hasAdjacencyList(BGraph *rg)
+{
+	BNode *node;
+	
+	for(node = rg->nodes.first; node; node = node->next)
+	{
+		if (node->arcs == NULL)
+		{
+			return 0;
+		}
+	}
+	
+	return 1;
+}
+
+void BLI_replaceNode(BGraph *graph, BNode *node_src, BNode *node_replaced)
+{
+	BArc *arc, *next_arc;
+	
+	for (arc = graph->arcs.first; arc; arc = next_arc)
+	{
+		next_arc = arc->next;
+		
+		if (arc->head == node_replaced)
+		{
+			arc->head = node_src;
+			node_src->degree++;
+		}
+
+		if (arc->tail == node_replaced)
+		{
+			arc->tail = node_src;
+			node_src->degree++;
+		}
+		
+		if (arc->head == arc->tail)
+		{
+			node_src->degree -= 2;
+			
+			graph->free_arc(arc);
+			BLI_freelinkN(&graph->arcs, arc);
+		}
+	}
+}
+
+void BLI_removeDoubleNodes(BGraph *graph, float limit)
+{
+	BNode *node_src, *node_replaced;
+	
+	for(node_src = graph->nodes.first; node_src; node_src = node_src->next)
+	{
+		for(node_replaced = graph->nodes.first; node_replaced; node_replaced = node_replaced->next)
+		{
+			if (node_replaced != node_src && VecLenf(node_replaced->p, node_src->p) <= limit)
+			{
+				BLI_replaceNode(graph, node_src, node_replaced);
+				
+				BLI_freeNode(graph, node_replaced);
+				BLI_remlink(&graph->nodes, node_replaced);
+			}
+		}
+	}
+	
+}
+
+/*************************************** CYCLE DETECTION ***********************************************/
+
+int detectCycle(BNode *node, BArc *src_arc)
+{
+	int value = 0;
+	
+	if (node->flag == 0)
+	{
+		int i;
+
+		/* mark node as visited */
+		node->flag = 1;
+
+		for(i = 0; i < node->degree && value == 0; i++)
+		{
+			BArc *arc = node->arcs[i];
+			
+			/* don't go back on the source arc */
+			if (arc != src_arc)
+			{
+				value = detectCycle(BLI_otherNode(arc, node), arc);
+			}
+		}
+	}
+	else
+	{
+		value = 1;
+	}
+	
+	return value;
+}
+
+int	BLI_isGraphCyclic(BGraph *graph)
+{
+	BNode *node;
+	int value = 0;
+	
+	/* NEED TO CHECK IF ADJACENCY LIST EXIST */
+	
+	/* Mark all nodes as not visited */
+	BLI_flagNodes(graph, 0);
+
+	/* detectCycles in subgraphs */	
+	for(node = graph->nodes.first; node && value == 0; node = node->next)
+	{
+		/* only for nodes in subgraphs that haven't been visited yet */
+		if (node->flag == 0)
+		{
+			value = value || detectCycle(node, NULL);
+		}		
+	}
+	
+	return value;
+}
+
+BArc * BLI_findConnectedArc(BGraph *graph, BArc *arc, BNode *v)
+{
+	BArc *nextArc = arc->next;
+	
+	for(nextArc = graph->arcs.first; nextArc; nextArc = nextArc->next)
+	{
+		if (arc != nextArc && (nextArc->head == v || nextArc->tail == v))
+		{
+			break;
+		}
+	}
+	
+	return nextArc;
+}
+
+/*********************************** GRAPH AS TREE FUNCTIONS *******************************************/
+
+int BLI_subtreeDepth(BNode *node, BArc *rootArc)
+{
+	int depth = 0;
+	
+	/* Base case, no arcs leading away */
+	if (node->arcs == NULL || *(node->arcs) == NULL)
+	{
+		return 0;
+	}
+	else
+	{
+		int i;
+
+		for(i = 0; i < node->degree; i++)
+		{
+			BArc *arc = node->arcs[i];
+			
+			/* only arcs that go down the tree */
+			if (arc != rootArc)
+			{
+				BNode *newNode = BLI_otherNode(arc, node);
+				depth = MAX2(depth, BLI_subtreeDepth(newNode, arc));
+			}
+		}
+	}
+	
+	return depth + 1; //BLI_countlist(&rootArc->edges);
+}
+
+/********************************* SYMMETRY DETECTION **************************************************/
+
+void markdownSymmetryArc(BGraph *graph, BArc *arc, BNode *node, int level, float limit);
+
+void BLI_mirrorAlongAxis(float v[3], float center[3], float axis[3])
+{
+	float dv[3], pv[3];
+	
+	VecSubf(dv, v, center);
+	Projf(pv, dv, axis);
+	VecMulf(pv, -2);
+	VecAddf(v, v, pv);
+}
+
+static void markRadialSymmetry(BGraph *graph, BNode *node, int depth, float axis[3], float limit)
+{
+	RadialArc *ring = NULL;
+	RadialArc *unit;
+	int symmetric = 1;
+	int count = 0;
+	int i;
+
+	/* mark topological symmetry */
+	node->symmetry_flag |= SYM_TOPOLOGICAL;
+
+	/* count the number of arcs in the symmetry ring */
+	for (i = 0; i < node->degree; i++)
+	{
+		BArc *connectedArc = node->arcs[i];
+		
+		/* depth is store as a negative in flag. symmetry level is positive */
+		if (connectedArc->symmetry_level == -depth)
+		{
+			count++;
+		}
+	}
+
+	ring = MEM_callocN(sizeof(RadialArc) * count, "radial symmetry ring");
+	unit = ring;
+
+	/* fill in the ring */
+	for (unit = ring, i = 0; i < node->degree; i++)
+	{
+		BArc *connectedArc = node->arcs[i];
+		
+		/* depth is store as a negative in flag. symmetry level is positive */
+		if (connectedArc->symmetry_level == -depth)
+		{
+			BNode *otherNode = BLI_otherNode(connectedArc, node);
+			float vec[3];
+
+			unit->arc = connectedArc;
+
+			/* project the node to node vector on the symmetry plane */
+			VecSubf(unit->n, otherNode->p, node->p);
+			Projf(vec, unit->n, axis);
+			VecSubf(unit->n, unit->n, vec);
+
+			Normalize(unit->n);
+
+			unit++;
+		}
+	}
+
+	/* sort ring */
+	for (i = 0; i < count - 1; i++)
+	{
+		float minAngle = 3; /* arbitrary high value, higher than 2, at least */
+		int minIndex = -1;
+		int j;
+
+		for (j = i + 1; j < count; j++)
+		{
+			float angle = Inpf(ring[i].n, ring[j].n);
+
+			/* map negative values to 1..2 */
+			if (angle < 0)
+			{
+				angle = 1 - angle;
+			}
+
+			if (angle < minAngle)
+			{
+				minIndex = j;
+				minAngle = angle;
+			}
+		}
+
+		/* swap if needed */
+		if (minIndex != i + 1)
+		{
+			RadialArc tmp;
+			tmp = ring[i + 1];
+			ring[i + 1] = ring[minIndex];
+			ring[minIndex] = tmp;
+		}
+	}
+
+	for (i = 0; i < count && symmetric; i++)
+	{
+		BNode *node1, *node2;
+		float tangent[3];
+		float normal[3];
+		float p[3];
+		int j = (i + 1) % count; /* next arc in the circular list */
+
+		VecAddf(tangent, ring[i].n, ring[j].n);
+		Crossf(normal, tangent, axis);
+		
+		node1 = BLI_otherNode(ring[i].arc, node);
+		node2 = BLI_otherNode(ring[j].arc, node);
+
+		VECCOPY(p, node2->p);
+		BLI_mirrorAlongAxis(p, node->p, normal);
+		
+		/* check if it's within limit before continuing */
+		if (VecLenf(node1->p, p) > limit)
+		{
+			symmetric = 0;
+		}
+
+	}
+
+	if (symmetric)
+	{
+		/* mark node as symmetric physically */
+		VECCOPY(node->symmetry_axis, axis);
+		node->symmetry_flag |= SYM_PHYSICAL;
+		node->symmetry_flag |= SYM_RADIAL;
+		
+		if (graph->radial_symmetry)
+		{
+			graph->radial_symmetry(node, ring, count);
+		}
+	}
+
+	MEM_freeN(ring);
+}
+
+static void setSideAxialSymmetry(BNode *root_node, BNode *end_node, BArc *arc)
+{
+	float vec[3];
+	
+	VecSubf(vec, end_node->p, root_node->p);
+	
+	if (Inpf(vec, root_node->symmetry_axis) < 0)
+	{
+		arc->symmetry_flag |= SYM_SIDE_NEGATIVE;
+	}
+	else
+	{
+		arc->symmetry_flag |= SYM_SIDE_POSITIVE;
+	}
+}
+
+static void markAxialSymmetry(BGraph *graph, BNode *node, int depth, float axis[3], float limit)
+{
+	BArc *arc1 = NULL;
+	BArc *arc2 = NULL;
+	BNode *node1 = NULL, *node2 = NULL;
+	float nor[3], vec[3], p[3];
+	int i;
+	
+	/* mark topological symmetry */
+	node->symmetry_flag |= SYM_TOPOLOGICAL;
+
+	for (i = 0; i < node->degree; i++)
+	{
+		BArc *connectedArc = node->arcs[i];
+		
+		/* depth is store as a negative in flag. symmetry level is positive */
+		if (connectedArc->symmetry_level == -depth)
+		{
+			if (arc1 == NULL)
+			{
+				arc1 = connectedArc;
+				node1 = BLI_otherNode(arc1, node);
+			}
+			else
+			{
+				arc2 = connectedArc;
+				node2 = BLI_otherNode(arc2, node);
+				break; /* Can stop now, the two arcs have been found */
+			}
+		}
+	}
+	
+	/* shouldn't happen, but just to be sure */
+	if (node1 == NULL || node2 == NULL)
+	{
+		return;
+	}
+	
+	VecSubf(vec, node1->p, node->p);
+	Normalize(vec);
+	VecSubf(p, node->p, node2->p);
+	Normalize(p);
+	VecAddf(p, p, vec);
+
+	Crossf(vec, p, axis);
+	Crossf(nor, vec, axis);
+	
+	/* mirror node2 along axis */
+	VECCOPY(p, node2->p);
+	BLI_mirrorAlongAxis(p, node->p, nor);
+	
+	/* check if it's within limit before continuing */
+	if (VecLenf(node1->p, p) <= limit)
+	{
+		/* mark node as symmetric physically */
+		VECCOPY(node->symmetry_axis, nor);
+		node->symmetry_flag |= SYM_PHYSICAL;
+		node->symmetry_flag |= SYM_AXIAL;
+
+		/* set side on arcs */
+		setSideAxialSymmetry(node, node1, arc1);
+		setSideAxialSymmetry(node, node2, arc2);
+		
+		if (graph->axial_symmetry)
+		{
+			graph->axial_symmetry(node, node1, node2, arc1, arc2);
+		}
+	}
+}
+
+static void markdownSecondarySymmetry(BGraph *graph, BNode *node, int depth, int level, float limit)
+{
+	float axis[3] = {0, 0, 0};
+	int count = 0;
+	int i;
+
+	/* count the number of branches in this symmetry group
+	 * and determinte the axis of symmetry
+	 *  */	
+	for (i = 0; i < node->degree; i++)
+	{
+		BArc *connectedArc = node->arcs[i];
+		
+		/* depth is store as a negative in flag. symmetry level is positive */
+		if (connectedArc->symmetry_level == -depth)
+		{
+			count++;
+		}
+		/* If arc is on the axis */
+		else if (connectedArc->symmetry_level == level)
+		{
+			VecAddf(axis, axis, connectedArc->head->p);
+			VecSubf(axis, axis, connectedArc->tail->p);
+		}
+	}
+
+	Normalize(axis);
+
+	/* Split between axial and radial symmetry */
+	if (count == 2)
+	{
+		markAxialSymmetry(graph, node, depth, axis, limit);
+	}
+	else
+	{
+		markRadialSymmetry(graph, node, depth, axis, limit);
+	}
+	
+	/* markdown secondary symetries */	
+	for (i = 0; i < node->degree; i++)
+	{
+		BArc *connectedArc = node->arcs[i];
+		
+		if (connectedArc->symmetry_level == -depth)
+		{
+			/* markdown symmetry for branches corresponding to the depth */
+			markdownSymmetryArc(graph, connectedArc, node, level + 1, limit);
+		}
+	}
+}
+
+void markdownSymmetryArc(BGraph *graph, BArc *arc, BNode *node, int level, float limit)
+{
+	int i;
+	arc->symmetry_level = level;
+	
+	node = BLI_otherNode(arc, node);
+	
+	for (i = 0; i < node->degree; i++)
+	{
+		BArc *connectedArc = node->arcs[i];
+		
+		if (connectedArc != arc)
+		{
+			BNode *connectedNode = BLI_otherNode(connectedArc, node);
+			
+			/* symmetry level is positive value, negative values is subtree depth */
+			connectedArc->symmetry_level = -BLI_subtreeDepth(connectedNode, connectedArc);
+		}
+	}
+
+	arc = NULL;
+
+	for (i = 0; i < node->degree; i++)
+	{
+		int issymmetryAxis = 0;
+		BArc *connectedArc = node->arcs[i];
+		
+		/* only arcs not already marked as symetric */
+		if (connectedArc->symmetry_level < 0)
+		{
+			int j;
+			
+			/* true by default */
+			issymmetryAxis = 1;
+			
+			for (j = 0; j < node->degree && issymmetryAxis == 1; j++)
+			{
+				BArc *otherArc = node->arcs[j];
+				
+				/* different arc, same depth */
+				if (otherArc != connectedArc && otherArc->symmetry_level == connectedArc->symmetry_level)
+				{
+					/* not on the symmetry axis */
+					issymmetryAxis = 0;
+				} 
+			}
+		}
+		
+		/* arc could be on the symmetry axis */
+		if (issymmetryAxis == 1)
+		{
+			/* no arc as been marked previously, keep this one */
+			if (arc == NULL)
+			{
+				arc = connectedArc;
+			}
+			else
+			{
+				/* there can't be more than one symmetry arc */
+				arc = NULL;
+				break;
+			}
+		}
+	}
+	
+	/* go down the arc continuing the symmetry axis */
+	if (arc)
+	{
+		markdownSymmetryArc(graph, arc, node, level, limit);
+	}
+
+	
+	/* secondary symmetry */
+	for (i = 0; i < node->degree; i++)
+	{
+		BArc *connectedArc = node->arcs[i];
+		
+		/* only arcs not already marked as symetric and is not the next arc on the symmetry axis */
+		if (connectedArc->symmetry_level < 0)
+		{
+			/* subtree depth is store as a negative value in the symmetry */
+			markdownSecondarySymmetry(graph, node, -connectedArc->symmetry_level, level, limit);
+		}
+	}
+}
+
+void BLI_markdownSymmetry(BGraph *graph, BNode *root_node, float limit)
+{
+	BNode *node;
+	BArc *arc;
+	
+	if (BLI_isGraphCyclic(graph))
+	{
+		return;
+	}
+	
+	/* mark down all arcs as non-symetric */
+	BLI_flagArcs(graph, 0);
+	
+	/* mark down all nodes as not on the symmetry axis */
+	BLI_flagNodes(graph, 0);
+
+	node = root_node;
+	
+	/* only work on acyclic graphs and if only one arc is incident on the first node */
+	if (node->degree == 1)
+	{
+		arc = node->arcs[0];
+		
+		markdownSymmetryArc(graph, arc, node, 1, limit);
+
+		/* mark down non-symetric arcs */
+		for (arc = graph->arcs.first; arc; arc = arc->next)
+		{
+			if (arc->symmetry_level < 0)
+			{
+				arc->symmetry_level = 0;
+			}
+			else
+			{
+				/* mark down nodes with the lowest level symmetry axis */
+				if (arc->head->symmetry_level == 0 || arc->head->symmetry_level > arc->symmetry_level)
+				{
+					arc->head->symmetry_level = arc->symmetry_level;
+				}
+				if (arc->tail->symmetry_level == 0 || arc->tail->symmetry_level > arc->symmetry_level)
+				{
+					arc->tail->symmetry_level = arc->symmetry_level;
+				}
+			}
+		}
+	}
+}
+
diff --git a/source/blender/include/reeb.h b/source/blender/include/reeb.h
index e26b4080249..b24ba25aa5d 100644
--- a/source/blender/include/reeb.h
+++ b/source/blender/include/reeb.h
@@ -30,6 +30,8 @@
 
 #include "DNA_listBase.h"
 
+#include "BLI_graph.h"
+
 struct GHash;
 struct EdgeHash;
 struct ReebArc;
@@ -37,8 +39,15 @@ struct ReebEdge;
 struct ReebNode;
 
 typedef struct ReebGraph {
-	ListBase arcs;
-	ListBase nodes;
+	ListBase	arcs;
+	ListBase	nodes;
+	
+	FreeArc			free_arc;
+	FreeNode		free_node;
+	RadialSymmetry	radial_symmetry;
+	AxialSymmetry	axial_symmetry;
+	/*********************************/
+	
 	int totnodes;
 	struct EdgeHash *emap;
 } ReebGraph;
@@ -50,17 +59,20 @@ typedef struct EmbedBucket {
 } EmbedBucket;
 
 typedef struct ReebNode {
-	struct ReebNode *next, *prev;
-	struct ReebArc **arcs;
-	int index;
-	int degree;
-	float weight;
+	void *next, *prev;
 	float p[3];
 	int flag;
 
+	int degree;
+	struct ReebArc **arcs;
+
 	int symmetry_level;
 	int symmetry_flag;
 	float symmetry_axis[3];
+	/*********************************/
+
+	int index;
+	float weight;
 } ReebNode;
 
 typedef struct ReebEdge {
@@ -72,15 +84,19 @@ typedef struct ReebEdge {
 } ReebEdge;
 
 typedef struct ReebArc {
-	struct ReebArc *next, *prev;
-	ListBase edges;
-	struct ReebNode *v1, *v2;
-	struct EmbedBucket *buckets;
-	int	bcount;
+	void *next, *prev;
+	struct ReebNode *head, *tail;
 	int flag;
 
+	float length;
+
 	int symmetry_level;
 	int symmetry_flag;
+	/*********************************/
+
+	ListBase edges;
+	int bcount;
+	struct EmbedBucket *buckets;
 
 	struct GHash *faces;	
 	float angle;
@@ -107,8 +123,6 @@ void renormalizeWeight(struct EditMesh *em, float newmax);
 ReebGraph * generateReebGraph(struct EditMesh *me, int subdivisions);
 ReebGraph * newReebGraph();
 
-#define OTHER_NODE(arc, node) ((arc->v1 == node) ? arc->v2 : arc->v1)
-
 void initArcIterator(struct ReebArcIterator *iter, struct ReebArc *arc, struct ReebNode *head);
 void initArcIterator2(struct ReebArcIterator *iter, struct ReebArc *arc, int start, int end);
 void initArcIteratorStart(struct ReebArcIterator *iter, struct ReebArc *arc, struct ReebNode *head, int start);
@@ -129,36 +143,9 @@ void repositionNodes(ReebGraph *rg);
 void postprocessGraph(ReebGraph *rg, char mode);
 void removeNormalNodes(ReebGraph *rg);
 
-/* Graph processing */
-void buildAdjacencyList(ReebGraph *rg);
-
 void sortNodes(ReebGraph *rg);
 void sortArcs(ReebGraph *rg);
 
-int subtreeDepth(ReebNode *node, ReebArc *rootArc);
-int countConnectedArcs(ReebGraph *rg, ReebNode *node);
-int hasAdjacencyList(ReebGraph *rg); 
-int	isGraphCyclic(ReebGraph *rg);
-
-/*------------ Symmetry handling ------------*/
-void markdownSymmetry(ReebGraph *rg);
-
-/* ReebNode symmetry flags */
-#define SYM_TOPOLOGICAL	1
-#define SYM_PHYSICAL	2
-
-/* the following two are exclusive */
-#define SYM_AXIAL		4
-#define SYM_RADIAL		8
-
-/* ReebArc symmetry flags
- * 
- * axial symetry sides */
-#define SYM_SIDE_POSITIVE		1
-#define SYM_SIDE_NEGATIVE		2
-
-
-
 /*------------ Sanity check ------------*/
 void verifyBuckets(ReebGraph *rg);
 void verifyFaces(ReebGraph *rg);
diff --git a/source/blender/src/autoarmature.c b/source/blender/src/autoarmature.c
index d3cea1be786..741398951bf 100644
--- a/source/blender/src/autoarmature.c
+++ b/source/blender/src/autoarmature.c
@@ -1,5 +1,5 @@
 /**
- * $Id: editarmature.c 14848 2008-05-15 08:05:56Z aligorith $
+ * $Id:
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
@@ -46,6 +46,7 @@
 #include "BLI_arithb.h"
 #include "BLI_editVert.h"
 #include "BLI_ghash.h"
+#include "BLI_graph.h"
 
 #include "BDR_editobject.h"
 
@@ -70,37 +71,47 @@ struct RigArc;
 struct RigEdge;
 
 typedef struct RigGraph {
-	ListBase arcs;
-	ListBase nodes;
-	struct RigNode *head;
+	ListBase	arcs;
+	ListBase	nodes;
 	
+	FreeArc			free_arc;
+	FreeNode		free_node;
+	RadialSymmetry	radial_symmetry;
+	AxialSymmetry	axial_symmetry;
+	/*********************************/
+
+	struct RigNode *head;
 	ReebGraph *link;
 } RigGraph;
 
 typedef struct RigNode {
-	struct RigNode *next, *prev;
+	void *next, *prev;
 	float p[3];
-	int degree;
-	struct RigArc **arcs;
 	int flag;
-	
+
+	int degree;
+	struct BArc **arcs;
+
 	int symmetry_level;
 	int symmetry_flag;
 	float symmetry_axis[3];
+	/*********************************/
 
 	ReebNode *link;
 } RigNode;
 
 typedef struct RigArc {
-	struct RigArc *next, *prev;
+	void *next, *prev;
 	RigNode *head, *tail;
-	ListBase edges;
-	float length;
 	int flag;
 
+	float length;
+
 	int symmetry_level;
 	int symmetry_flag;
+	/*********************************/
 	
+	ListBase edges;
 	int count;
 	ReebArc *link;
 } RigArc;
@@ -116,45 +127,7 @@ typedef struct RigEdge {
 /*******************************************************************************************************/
 
 static void RIG_calculateEdgeAngle(RigEdge *edge_first, RigEdge *edge_second);
-void RIG_markdownSymmetry(RigGraph *rg);
-void RIG_markdownSymmetryArc(RigArc *arc, RigNode *node, int level);
-void RIG_markdownSecondarySymmetry(RigNode *node, int depth, int level);
 
-
-/*******************************************************************************************************/
-static RigNode *RIG_otherNode(RigArc *arc, RigNode *node)
-{
-	if (arc->head == node)
-		return arc->tail;
-	else
-		return arc->head;
-}
-
-static void RIG_flagNodes(RigGraph *rg, int flag)
-{
-	RigNode *node;
-	
-	for(node = rg->nodes.first; node; node = node->next)
-	{
-		node->flag = flag;
-	}
-}
-
-static void RIG_flagArcs(RigGraph *rg, int flag)
-{
-	RigArc *arc;
-	
-	for(arc = rg->arcs.first; arc; arc = arc->next)
-	{
-		arc->flag = flag;
-	}
-}
-
-static void RIG_addArcToNodeAdjacencyList(RigNode *node, RigArc *arc)
-{
-	node->arcs[node->degree] = arc;
-	node->degree++;
-}
 /*********************************** EDITBONE UTILS ****************************************************/
 
 int countEditBoneChildren(ListBase *list, EditBone *parent)
@@ -192,6 +165,34 @@ EditBone* nextEditBoneChild(ListBase *list, EditBone *parent, int n)
 	return NULL;
 }
 
+
+/************************************ DESTRUCTORS ******************************************************/
+
+void RIG_freeRigArc(BArc *arc)
+{
+	BLI_freelistN(&((RigArc*)arc)->edges);
+}
+
+void RIG_freeRigGraph(BGraph *rg)
+{
+	BNode *node;
+	BArc *arc;
+	
+	for (arc = rg->arcs.first; arc; arc = arc->next)
+	{
+		RIG_freeRigArc(arc);
+	}
+	BLI_freelistN(&rg->arcs);
+	
+	for (node = rg->nodes.first; node; node = node->next)
+	{
+		BLI_freeNode((BGraph*)rg, (BNode*)node);
+	}
+	BLI_freelistN(&rg->nodes);
+	
+	MEM_freeN(rg);
+}
+
 /************************************* ALLOCATORS ******************************************************/
 
 static RigGraph *newRigGraph()
@@ -201,6 +202,9 @@ static RigGraph *newRigGraph()
 	
 	rg->head = NULL;
 	
+	rg->free_arc = RIG_freeRigArc;
+	rg->free_node = NULL;
+	
 	return rg;
 }
 
@@ -209,7 +213,6 @@ static RigArc *newRigArc(RigGraph *rg)
 	RigArc *arc;
 	
 	arc = MEM_callocN(sizeof(RigArc), "rig arc");
-	arc->length = 0;
 	arc->count = 0;
 	
 	BLI_addtail(&rg->arcs, arc);
@@ -279,118 +282,13 @@ static void RIG_addEdgeToArc(RigArc *arc, float tail[3], EditBone *bone)
 	edge->length = VecLenf(edge->head, edge->tail);
 	
 	arc->length += edge->length;
+	
 	arc->count += 1;
 }
 
-/************************************ DESTRUCTORS ******************************************************/
-
-static void RIG_freeRigNode(RigNode *node)
-{
-	if (node->arcs)
-	{
-		MEM_freeN(node->arcs);
-	}
-}
-
-static void RIG_freeRigArc(RigArc *arc)
-{
-	BLI_freelistN(&arc->edges);
-}
-
-static void RIG_freeRigGraph(RigGraph *rg)
-{
-	RigNode *node;
-	RigArc *arc;
-	
-	for (arc = rg->arcs.first; arc; arc = arc->next)
-	{
-		RIG_freeRigArc(arc);
-	}
-	BLI_freelistN(&rg->arcs);
-	
-	for (node = rg->nodes.first; node; node = node->next)
-	{
-		RIG_freeRigNode(node);
-	}
-	BLI_freelistN(&rg->nodes);
-	
-	MEM_freeN(rg);
-}
 
 /*******************************************************************************************************/
 
-static void RIG_buildAdjacencyList(RigGraph *rg)
-{
-	RigNode *node;
-	RigArc *arc;
-
-	for(node = rg->nodes.first; node; node = node->next)
-	{
-		if (node->arcs != NULL)
-		{
-			MEM_freeN(node->arcs);
-		}
-		
-		node->arcs = MEM_callocN((node->degree + 1) * sizeof(RigArc*), "adjacency list");
-		
-		/* temporary use to indicate the first index available in the lists */
-		node->degree = 0;
-	}
-
-	for(arc = rg->arcs.first; arc; arc= arc->next)
-	{
-		RIG_addArcToNodeAdjacencyList(arc->head, arc);
-		RIG_addArcToNodeAdjacencyList(arc->tail, arc);
-	}
-}
-
-static void RIG_replaceNode(RigGraph *rg, RigNode *node_src, RigNode *node_replaced)
-{
-	RigArc *arc, *next_arc;
-	
-	for (arc = rg->arcs.first; arc; arc = next_arc)
-	{
-		next_arc = arc->next;
-		
-		if (arc->head == node_replaced)
-		{
-			arc->head = node_src;
-			node_src->degree++;
-		}
-
-		if (arc->tail == node_replaced)
-		{
-			arc->tail = node_src;
-			node_src->degree++;
-		}
-		
-		if (arc->head == arc->tail)
-		{
-			node_src->degree -= 2;
-			
-			RIG_freeRigArc(arc);
-			BLI_freelinkN(&rg->arcs, arc);
-		}
-	}
-}
-
-static void RIG_removeDoubleNodes(RigGraph *rg, float limit)
-{
-	RigNode *node_src, *node_replaced;
-	
-	for(node_src = rg->nodes.first; node_src; node_src = node_src->next)
-	{
-		for(node_replaced = rg->nodes.first; node_replaced; node_replaced = node_replaced->next)
-		{
-			if (node_replaced != node_src && VecLenf(node_replaced->p, node_src->p) <= limit)
-			{
-				RIG_replaceNode(rg, node_src, node_replaced);
-			}
-		}
-	}
-	
-}
-
 static void RIG_calculateEdgeAngle(RigEdge *edge_first, RigEdge *edge_second)
 {
 	float vec_first[3], vec_second[3];
@@ -404,483 +302,6 @@ static void RIG_calculateEdgeAngle(RigEdge *edge_first, RigEdge *edge_second)
 	edge_first->angle = saacos(Inpf(vec_first, vec_second));
 }
 
-/*********************************** GRAPH AS TREE FUNCTIONS *******************************************/
-
-int RIG_subtreeDepth(RigNode *node, RigArc *rootArc)
-{
-	int depth = 0;
-	
-	/* Base case, no arcs leading away */
-	if (node->arcs == NULL || *(node->arcs) == NULL)
-	{
-		return 0;
-	}
-	else
-	{
-		RigArc ** pArc;
-
-		for(pArc = node->arcs; *pArc; pArc++)
-		{
-			RigArc *arc = *pArc;
-			
-			/* only arcs that go down the tree */
-			if (arc != rootArc)
-			{
-				RigNode *newNode = RIG_otherNode(arc, node);
-				depth = MAX2(depth, RIG_subtreeDepth(newNode, arc));
-			}
-		}
-	}
-	
-	return depth + BLI_countlist(&rootArc->edges);
-}
-
-int RIG_countConnectedArcs(RigGraph *rg, RigNode *node)
-{
-	int count = 0;
-	
-	/* use adjacency list if present */
-	if (node->arcs)
-	{
-		RigArc **arcs;
-	
-		for(arcs = node->arcs; *arcs; arcs++)
-		{
-			count++;
-		}
-	}
-	else
-	{
-		RigArc *arc;
-		for(arc = rg->arcs.first; arc; arc = arc->next)
-		{
-			if (arc->head == node || arc->tail == node)
-			{
-				count++;
-			}
-		}
-	}
-	
-	return count;
-}
-
-/********************************* SYMMETRY DETECTION **************************************************/
-
-static void mirrorAlongAxis(float v[3], float center[3], float axis[3])
-{
-	float dv[3], pv[3];
-	
-	VecSubf(dv, v, center);
-	Projf(pv, dv, axis);
-	VecMulf(pv, -2);
-	VecAddf(v, v, pv);
-}
-
-/* Helper structure for radial symmetry */
-typedef struct RadialArc
-{
-	RigArc *arc; 
-	float n[3]; /* normalized vector joining the nodes of the arc */
-} RadialArc;
-
-void RIG_markRadialSymmetry(RigNode *node, int depth, float axis[3])
-{
-	RadialArc *ring = NULL;
-	RadialArc *unit;
-	float limit = G.scene->toolsettings->skgen_symmetry_limit;
-	int symmetric = 1;
-	int count = 0;
-	int i;
-
-	/* mark topological symmetry */
-	node->symmetry_flag |= SYM_TOPOLOGICAL;
-
-	/* count the number of arcs in the symmetry ring */
-	for (i = 0; node->arcs[i] != NULL; i++)
-	{
-		RigArc *connectedArc = node->arcs[i];
-		
-		/* depth is store as a negative in flag. symmetry level is positive */
-		if (connectedArc->symmetry_level == -depth)
-		{
-			count++;
-		}
-	}
-
-	ring = MEM_callocN(sizeof(RadialArc) * count, "radial symmetry ring");
-	unit = ring;
-
-	/* fill in the ring */
-	for (unit = ring, i = 0; node->arcs[i] != NULL; i++)
-	{
-		RigArc *connectedArc = node->arcs[i];
-		
-		/* depth is store as a negative in flag. symmetry level is positive */
-		if (connectedArc->symmetry_level == -depth)
-		{
-			RigNode *otherNode = RIG_otherNode(connectedArc, node);
-			float vec[3];
-
-			unit->arc = connectedArc;
-
-			/* project the node to node vector on the symmetry plane */
-			VecSubf(unit->n, otherNode->p, node->p);
-			Projf(vec, unit->n, axis);
-			VecSubf(unit->n, unit->n, vec);
-
-			Normalize(unit->n);
-
-			unit++;
-		}
-	}
-
-	/* sort ring */
-	for (i = 0; i < count - 1; i++)
-	{
-		float minAngle = 3; /* arbitrary high value, higher than 2, at least */
-		int minIndex = -1;
-		int j;
-
-		for (j = i + 1; j < count; j++)
-		{
-			float angle = Inpf(ring[i].n, ring[j].n);
-
-			/* map negative values to 1..2 */
-			if (angle < 0)
-			{
-				angle = 1 - angle;
-			}
-
-			if (angle < minAngle)
-			{
-				minIndex = j;
-				minAngle = angle;
-			}
-		}
-
-		/* swap if needed */
-		if (minIndex != i + 1)
-		{
-			RadialArc tmp;
-			tmp = ring[i + 1];
-			ring[i + 1] = ring[minIndex];
-			ring[minIndex] = tmp;
-		}
-	}
-
-	for (i = 0; i < count && symmetric; i++)
-	{
-		RigNode *node1, *node2;
-		float tangent[3];
-		float normal[3];
-		float p[3];
-		int j = (i + 1) % count; /* next arc in the circular list */
-
-		VecAddf(tangent, ring[i].n, ring[j].n);
-		Crossf(normal, tangent, axis);
-		
-		node1 = RIG_otherNode(ring[i].arc, node);
-		node2 = RIG_otherNode(ring[j].arc, node);
-
-		VECCOPY(p, node2->p);
-		mirrorAlongAxis(p, node->p, normal);
-		
-		/* check if it's within limit before continuing */
-		if (VecLenf(node1->p, p) > limit)
-		{
-			symmetric = 0;
-		}
-
-	}
-
-	if (symmetric)
-	{
-		/* mark node as symmetric physically */
-		VECCOPY(node->symmetry_axis, axis);
-		node->symmetry_flag |= SYM_PHYSICAL;
-		node->symmetry_flag |= SYM_RADIAL;
-	}
-
-	MEM_freeN(ring);
-}
-
-static void setSideAxialSymmetry(RigNode *root_node, RigNode *end_node, RigArc *arc)
-{
-	float vec[3];
-	
-	VecSubf(vec, end_node->p, root_node->p);
-	
-	if (Inpf(vec, root_node->symmetry_axis) < 0)
-	{
-		arc->symmetry_flag |= SYM_SIDE_NEGATIVE;
-	}
-	else
-	{
-		arc->symmetry_flag |= SYM_SIDE_POSITIVE;
-	}
-}
-
-void RIG_markAxialSymmetry(RigNode *node, int depth, float axis[3])
-{
-	RigArc *arc1 = NULL;
-	RigArc *arc2 = NULL;
-	RigNode *node1 = NULL, *node2 = NULL;
-	float limit = G.scene->toolsettings->skgen_symmetry_limit;
-	float nor[3], vec[3], p[3];
-	int i;
-	
-	/* mark topological symmetry */
-	node->symmetry_flag |= SYM_TOPOLOGICAL;
-
-	for (i = 0; node->arcs[i] != NULL; i++)
-	{
-		RigArc *connectedArc = node->arcs[i];
-		
-		/* depth is store as a negative in flag. symmetry level is positive */
-		if (connectedArc->symmetry_level == -depth)
-		{
-			if (arc1 == NULL)
-			{
-				arc1 = connectedArc;
-				node1 = RIG_otherNode(arc1, node);
-			}
-			else
-			{
-				arc2 = connectedArc;
-				node2 = RIG_otherNode(arc2, node);
-				break; /* Can stop now, the two arcs have been found */
-			}
-		}
-	}
-	
-	/* shouldn't happen, but just to be sure */
-	if (node1 == NULL || node2 == NULL)
-	{
-		return;
-	}
-	
-	VecSubf(vec, node1->p, node->p);
-	Normalize(vec);
-	VecSubf(p, node->p, node2->p);
-	Normalize(p);
-	VecAddf(p, p, vec);
-
-	Crossf(vec, p, axis);
-	Crossf(nor, vec, axis);
-	
-	/* mirror node2 along axis */
-	VECCOPY(p, node2->p);
-	mirrorAlongAxis(p, node->p, nor);
-	
-	/* check if it's within limit before continuing */
-	if (VecLenf(node1->p, p) <= limit)
-	{
-		/* mark node as symmetric physically */
-		VECCOPY(node->symmetry_axis, nor);
-		node->symmetry_flag |= SYM_PHYSICAL;
-		node->symmetry_flag |= SYM_AXIAL;
-
-		/* set side on arcs */
-		setSideAxialSymmetry(node, node1, arc1);
-		setSideAxialSymmetry(node, node2, arc2);
-		printf("flag: %i <-> %i\n", arc1->symmetry_flag, arc2->symmetry_flag);
-	}
-	else
-	{
-		printf("NOT SYMMETRIC!\n");
-		printf("%f <= %f\n", VecLenf(node1->p, p), limit);
-		printvecf("axis", nor);
-	}
-}
-
-void RIG_markdownSecondarySymmetry(RigNode *node, int depth, int level)
-{
-	float axis[3] = {0, 0, 0};
-	int count = 0;
-	int i;
-
-	/* count the number of branches in this symmetry group
-	 * and determinte the axis of symmetry
-	 *  */	
-	for (i = 0; node->arcs[i] != NULL; i++)
-	{
-		RigArc *connectedArc = node->arcs[i];
-		
-		/* depth is store as a negative in flag. symmetry level is positive */
-		if (connectedArc->symmetry_level == -depth)
-		{
-			count++;
-		}
-		/* If arc is on the axis */
-		else if (connectedArc->symmetry_level == level)
-		{
-			VecAddf(axis, axis, connectedArc->head->p);
-			VecSubf(axis, axis, connectedArc->tail->p);
-		}
-	}
-
-	Normalize(axis);
-
-	/* Split between axial and radial symmetry */
-	if (count == 2)
-	{
-		RIG_markAxialSymmetry(node, depth, axis);
-	}
-	else
-	{
-		RIG_markRadialSymmetry(node, depth, axis);
-	}
-	
-	/* markdown secondary symetries */	
-	for (i = 0; node->arcs[i] != NULL; i++)
-	{
-		RigArc *connectedArc = node->arcs[i];
-		
-		if (connectedArc->symmetry_level == -depth)
-		{
-			/* markdown symmetry for branches corresponding to the depth */
-			RIG_markdownSymmetryArc(connectedArc, node, level + 1);
-		}
-	}
-}
-
-void RIG_markdownSymmetryArc(RigArc *arc, RigNode *node, int level)
-{
-	int i;
-	arc->symmetry_level = level;
-	
-	node = RIG_otherNode(arc, node);
-	
-	for (i = 0; node->arcs[i] != NULL; i++)
-	{
-		RigArc *connectedArc = node->arcs[i];
-		
-		if (connectedArc != arc)
-		{
-			RigNode *connectedNode = RIG_otherNode(connectedArc, node);
-			
-			/* symmetry level is positive value, negative values is subtree depth */
-			connectedArc->symmetry_level = -RIG_subtreeDepth(connectedNode, connectedArc);
-		}
-	}
-
-	arc = NULL;
-
-	for (i = 0; node->arcs[i] != NULL; i++)
-	{
-		int issymmetryAxis = 0;
-		RigArc *connectedArc = node->arcs[i];
-		
-		/* only arcs not already marked as symetric */
-		if (connectedArc->symmetry_level < 0)
-		{
-			int j;
-			
-			/* true by default */
-			issymmetryAxis = 1;
-			
-			for (j = 0; node->arcs[j] != NULL && issymmetryAxis == 1; j++)
-			{
-				RigArc *otherArc = node->arcs[j];
-				
-				/* different arc, same depth */
-				if (otherArc != connectedArc && otherArc->symmetry_level == connectedArc->symmetry_level)
-				{
-					/* not on the symmetry axis */
-					issymmetryAxis = 0;
-				} 
-			}
-		}
-		
-		/* arc could be on the symmetry axis */
-		if (issymmetryAxis == 1)
-		{
-			/* no arc as been marked previously, keep this one */
-			if (arc == NULL)
-			{
-				arc = connectedArc;
-			}
-			else
-			{
-				/* there can't be more than one symmetry arc */
-				arc = NULL;
-				break;
-			}
-		}
-	}
-	
-	/* go down the arc continuing the symmetry axis */
-	if (arc)
-	{
-		RIG_markdownSymmetryArc(arc, node, level);
-	}
-
-	
-	/* secondary symmetry */
-	for (i = 0; node->arcs[i] != NULL; i++)
-	{
-		RigArc *connectedArc = node->arcs[i];
-		
-		/* only arcs not already marked as symetric and is not the next arc on the symmetry axis */
-		if (connectedArc->symmetry_level < 0)
-		{
-			/* subtree depth is store as a negative value in the symmetry */
-			RIG_markdownSecondarySymmetry(node, -connectedArc->symmetry_level, level);
-		}
-	}
-}
-
-void RIG_markdownSymmetry(RigGraph *rg)
-{
-	RigNode *node;
-	RigArc *arc;
-	
-	/* mark down all arcs as non-symetric */
-	RIG_flagArcs(rg, 0);
-	
-	/* mark down all nodes as not on the symmetry axis */
-	RIG_flagNodes(rg, 0);
-
-	if (rg->head)
-	{
-		node = rg->head;
-	}
-	else
-	{
-		/* !TODO! DO SOMETHING SMART HERE */
-		return;
-	}
-	
-	/* only work on acyclic graphs and if only one arc is incident on the first node */
-	if (RIG_countConnectedArcs(rg, node) == 1)
-	{
-		arc = node->arcs[0];
-		
-		RIG_markdownSymmetryArc(arc, node, 1);
-
-		/* mark down non-symetric arcs */
-		for (arc = rg->arcs.first; arc; arc = arc->next)
-		{
-			if (arc->symmetry_level < 0)
-			{
-				arc->symmetry_level = 0;
-			}
-			else
-			{
-				/* mark down nodes with the lowest level symmetry axis */
-				if (arc->head->symmetry_level == 0 || arc->head->symmetry_level > arc->symmetry_level)
-				{
-					arc->head->symmetry_level = arc->symmetry_level;
-				}
-				if (arc->tail->symmetry_level == 0 || arc->tail->symmetry_level > arc->symmetry_level)
-				{
-					arc->tail->symmetry_level = arc->symmetry_level;
-				}
-			}
-		}
-	}
-}
-
 /*******************************************************************************************************/
 
 static void RIG_arcFromBoneChain(RigGraph *rg, ListBase *list, EditBone *root_bone, RigNode *starting_node)
@@ -942,7 +363,7 @@ static void RIG_arcFromBoneChain(RigGraph *rg, ListBase *list, EditBone *root_bo
 
 	if (contain_head)
 	{
-		rg->head = arc->tail;
+		rg->head = (RigNode*)arc->tail;
 	}
 }
 
@@ -955,7 +376,7 @@ static void RIG_findHead(RigGraph *rg)
 		{
 			RigArc *arc = rg->arcs.first;
 			
-			rg->head = arc->head;
+			rg->head = (RigNode*)arc->head;
 		}
 	}
 }
@@ -997,7 +418,7 @@ static void RIG_printArc(RigArc *arc)
 
 	printf("\n");
 
-	RIG_printNode(arc->head, "head");
+	RIG_printNode((RigNode*)arc->head, "head");
 
 	for (edge = arc->edges.first; edge; edge = edge->next)
 	{
@@ -1009,7 +430,7 @@ static void RIG_printArc(RigArc *arc)
 	}	
 	printf("symmetry level: %i\n", arc->symmetry_level);
 
-	RIG_printNode(arc->tail, "tail");
+	RIG_printNode((RigNode*)arc->tail, "tail");
 }
 
 void RIG_printGraph(RigGraph *rg)
@@ -1048,9 +469,9 @@ static RigGraph *armatureToGraph(ListBase *list)
 		}
 	}
 	
-	RIG_removeDoubleNodes(rg, 0);
+	BLI_removeDoubleNodes((BGraph*)rg, 0);
 	
-	RIG_buildAdjacencyList(rg);
+	BLI_buildAdjacencyList((BGraph*)rg);
 	
 	RIG_findHead(rg);
 	
@@ -1151,6 +572,8 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 	int first_pass = 1;
 	int must_move = nb_joints - 1;
 	int i;
+	
+	printf("aggressive\n");
 
 	positions = MEM_callocN(sizeof(int) * nb_joints, "Aggresive positions");
 	best_positions = MEM_callocN(sizeof(int) * nb_joints, "Best Aggresive positions");
@@ -1161,13 +584,13 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 	if (earc->symmetry_level == 1 && iarc->symmetry_level == 1)
 	{
 		symmetry_axis = 1;
-		node_start = earc->v2;
-		node_end = earc->v1;
+		node_start = earc->tail;
+		node_end = earc->head;
 	}
 	else
 	{
-		node_start = earc->v1;
-		node_end = earc->v2;
+		node_start = earc->head;
+		node_end = earc->tail;
 	}
 	
 	/* init with first values */
@@ -1375,13 +798,13 @@ static void retargetArctoArcLength(RigArc *iarc)
 	if (earc->symmetry_level == 1 && iarc->symmetry_level == 1)
 	{
 		symmetry_axis = 1;
-		node_start = earc->v2;
-		node_end = earc->v1;
+		node_start = (ReebNode*)earc->tail;
+		node_end = (ReebNode*)earc->head;
 	}
 	else
 	{
-		node_start = earc->v1;
-		node_end = earc->v2;
+		node_start = (ReebNode*)earc->head;
+		node_end = (ReebNode*)earc->tail;
 	}
 	
 	initArcIterator(&iter, earc, node_start);
@@ -1499,14 +922,14 @@ static void retargetArctoArc(RigArc *iarc)
 		/* symmetry axis */
 		if (earc->symmetry_level == 1 && iarc->symmetry_level == 1)
 		{
-			VECCOPY(bone->head, earc->v2->p);
-			VECCOPY(bone->tail, earc->v1->p);
+			VECCOPY(bone->head, earc->tail->p);
+			VECCOPY(bone->tail, earc->head->p);
 		}
 		/* or not */
 		else
 		{
-			VECCOPY(bone->head, earc->v1->p);
-			VECCOPY(bone->tail, earc->v2->p);
+			VECCOPY(bone->head, earc->head->p);
+			VECCOPY(bone->tail, earc->tail->p);
 		}
 	}
 	else
@@ -1535,8 +958,9 @@ static void findCorrespondingArc(RigArc *start_arc, RigNode *start_node, RigArc
 	
 	next_iarc->link = NULL;
 		
-	for(i = 0, next_earc = enode->arcs[i]; next_earc; i++, next_earc = enode->arcs[i])
+	for(i = 0; i < enode->degree; i++)
 	{
+		next_earc = (ReebArc*)enode->arcs[i];
 		if (next_earc->flag == 0 && /* not already taken */
 			next_earc->symmetry_flag == symmetry_flag &&
 			next_earc->symmetry_level == symmetry_level)
@@ -1561,8 +985,9 @@ static void findCorrespondingArc(RigArc *start_arc, RigNode *start_node, RigArc
 		printf("flag %i -- symmetry level %i -- symmetry flag %i\n", 0, symmetry_level, symmetry_flag);
 		
 		printf("CANDIDATES\n");
-		for(i = 0, next_earc = enode->arcs[i]; next_earc; i++, next_earc = enode->arcs[i])
+		for(i = 0; i < enode->degree; i++)
 		{
+			next_earc = (ReebArc*)enode->arcs[i];
 			printf("flag %i -- symmetry level %i -- symmetry flag %i\n", next_earc->flag, next_earc->symmetry_level, next_earc->symmetry_flag);
 		}
 	}
@@ -1574,18 +999,19 @@ static void retargetSubgraph(RigGraph *rigg, RigArc *start_arc, RigNode *start_n
 	ReebArc *earc = start_arc->link;
 	RigNode *inode = start_node;
 	ReebNode *enode = start_node->link;
-	RigArc *next_iarc;
 	int i;
 		
 	retargetArctoArc(iarc);
 	
-	enode = OTHER_NODE(earc, enode);
-	inode = RIG_otherNode(iarc, inode);
+	enode = (ReebNode*)BLI_otherNode((BArc*)earc, (BNode*)enode);
+	inode = (RigNode*)BLI_otherNode((BArc*)iarc, (BNode*)inode);
 	
 	inode->link = enode;
 	
-	for(i = 0, next_iarc = inode->arcs[i]; next_iarc; i++, next_iarc = inode->arcs[i])
+	for(i = 0; i < inode->degree; i++)
 	{
+		RigArc *next_iarc = (RigArc*)inode->arcs[i];
+		
 		/* no back tracking */
 		if (next_iarc != iarc)
 		{
@@ -1613,12 +1039,12 @@ static void retargetGraphs(RigGraph *rigg)
 	}
 	
 	earc = reebg->arcs.first;
-	iarc = rigg->head->arcs[0];
+	iarc = (RigArc*)rigg->head->arcs[0];
 	
 	iarc->link = earc;
 	earc->flag = 1;
 	
-	enode = earc->v1;
+	enode = earc->head;
 	inode = iarc->tail;
 
 	inode->link = enode;
@@ -1634,7 +1060,7 @@ void BIF_retargetArmature()
 	
 	reebg = BIF_ReebGraphFromEditMesh();
 	
-	markdownSymmetry(reebg);
+	BLI_markdownSymmetry((BGraph*)reebg, reebg->nodes.first, G.scene->toolsettings->skgen_symmetry_limit);
 	
 	printf("Reeb Graph created\n");
 
@@ -1660,7 +1086,7 @@ void BIF_retargetArmature()
 				
 				printf("Armature graph created\n");
 		
-				RIG_markdownSymmetry(rigg);
+				BLI_markdownSymmetry((BGraph*)rigg, (BNode*)rigg->head, G.scene->toolsettings->skgen_symmetry_limit);
 				
 				RIG_printGraph(rigg);
 				
@@ -1675,7 +1101,7 @@ void BIF_retargetArmature()
 				
 				BLI_freelistN(&list);
 
-				RIG_freeRigGraph(rigg);
+				RIG_freeRigGraph((BGraph*)rigg);
 			}
 		}
 	}
diff --git a/source/blender/src/editarmature.c b/source/blender/src/editarmature.c
index 37e6510786d..b1185a24d9f 100644
--- a/source/blender/src/editarmature.c
+++ b/source/blender/src/editarmature.c
@@ -4324,7 +4324,7 @@ float arcLengthRatio(ReebArc *arc)
 	float embedLength = 0.0f;
 	int i;
 	
-	arcLength = VecLenf(arc->v1->p, arc->v2->p);
+	arcLength = VecLenf(arc->head->p, arc->tail->p);
 	
 	if (arc->bcount > 0)
 	{
@@ -4334,8 +4334,8 @@ float arcLengthRatio(ReebArc *arc)
 			embedLength += VecLenf(arc->buckets[i - 1].p, arc->buckets[i].p);
 		}
 		/* Add head and tail -> embedding vectors */
-		embedLength += VecLenf(arc->v1->p, arc->buckets[0].p);
-		embedLength += VecLenf(arc->v2->p, arc->buckets[arc->bcount - 1].p);
+		embedLength += VecLenf(arc->head->p, arc->buckets[0].p);
+		embedLength += VecLenf(arc->tail->p, arc->buckets[arc->bcount - 1].p);
 	}
 	else
 	{
@@ -4483,7 +4483,7 @@ void generateSkeletonFromReebGraph(ReebGraph *rg)
 
 	arcBoneMap = BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp);
 	
-	markdownSymmetry(rg);
+	BLI_markdownSymmetry((BGraph*)rg, rg->nodes.first, G.scene->toolsettings->skgen_symmetry_limit);
 	
 	for (arc = rg->arcs.first; arc; arc = arc->next) 
 	{
@@ -4501,33 +4501,33 @@ void generateSkeletonFromReebGraph(ReebGraph *rg)
 		 */
 
 		/* if arc is a symmetry axis, internal bones go up the tree */		
-		if (arc->symmetry_level == 1 && arc->v2->degree != 1)
+		if (arc->symmetry_level == 1 && arc->tail->degree != 1)
 		{
-			head = arc->v2;
-			tail = arc->v1;
+			head = arc->tail;
+			tail = arc->head;
 			
 			arc->flag = -1; /* mark arc direction */
 		}
 		/* Bones point AWAY from the symmetry axis */
-		else if (arc->v1->symmetry_level == 1)
+		else if (arc->head->symmetry_level == 1)
 		{
-			head = arc->v1;
-			tail = arc->v2;
+			head = arc->head;
+			tail = arc->tail;
 			
 			arc->flag = 1; /* mark arc direction */
 		}
-		else if (arc->v2->symmetry_level == 1)
+		else if (arc->tail->symmetry_level == 1)
 		{
-			head = arc->v2;
-			tail = arc->v1;
+			head = arc->tail;
+			tail = arc->head;
 			
 			arc->flag = -1; /* mark arc direction */
 		}
 		/* otherwise, always go from low weight to high weight */
 		else
 		{
-			head = arc->v1;
-			tail = arc->v2;
+			head = arc->head;
+			tail = arc->tail;
 			
 			arc->flag = 1; /* mark arc direction */
 		}
@@ -4571,12 +4571,12 @@ void generateSkeletonFromReebGraph(ReebGraph *rg)
 		ReebArc *incomingArc = NULL;
 		int i;
 
-		for (i = 0; node->arcs[i] != NULL; i++)
+		for (i = 0; i < node->degree; i++)
 		{
-			arc = node->arcs[i];
+			arc = (ReebArc*)node->arcs[i];
 
 			/* if arc is incoming into the node */
-			if ((arc->v1 == node && arc->flag == -1) || (arc->v2 == node && arc->flag == 1))
+			if ((arc->head == node && arc->flag == -1) || (arc->tail == node && arc->flag == 1))
 			{
 				if (incomingArc == NULL)
 				{
@@ -4597,12 +4597,12 @@ void generateSkeletonFromReebGraph(ReebGraph *rg)
 			EditBone *parentBone = BLI_ghash_lookup(arcBoneMap, incomingArc);
 
 			/* Look for outgoing arcs and parent their bones */
-			for (i = 0; node->arcs[i] != NULL; i++)
+			for (i = 0; i < node->degree; i++)
 			{
 				arc = node->arcs[i];
 
 				/* if arc is outgoing from the node */
-				if ((arc->v1 == node && arc->flag == 1) || (arc->v2 == node && arc->flag == -1))
+				if ((arc->head == node && arc->flag == 1) || (arc->tail == node && arc->flag == -1))
 				{
 					EditBone *childBone = BLI_ghash_lookup(arcBoneMap, arc);
 
diff --git a/source/blender/src/reeb.c b/source/blender/src/reeb.c
index 34230e6dfc2..c437379dbdb 100644
--- a/source/blender/src/reeb.c
+++ b/source/blender/src/reeb.c
@@ -92,6 +92,10 @@ EditEdge * NextEdgeForVert(EditMesh *em, EditVert *v);
 void mergeArcFaces(ReebGraph *rg, ReebArc *aDst, ReebArc *aSrc);
 void addFacetoArc(ReebArc *arc, EditFace *efa);
 
+void REEB_RadialSymmetry(BNode* root_node, RadialArc* ring, int count);
+void REEB_AxialSymmetry(BNode* root_node, BNode* node1, BNode* node2, struct BArc* barc1, BArc* barc2);
+
+
 /***************************************** BUCKET UTILS **********************************************/
 
 void addVertToBucket(EmbedBucket *b, float co[3])
@@ -155,8 +159,8 @@ void mergeArcBuckets(ReebArc *aDst, ReebArc *aSrc, float start, float end)
 void allocArcBuckets(ReebArc *arc)
 {
 	int i;
-	float start = ceil(arc->v1->weight);
-	arc->bcount = (int)(floor(arc->v2->weight) - start) + 1;
+	float start = ceil(((ReebNode*)arc->head)->weight);
+	arc->bcount = (int)(floor(((ReebNode*)arc->tail)->weight) - start) + 1;
 	
 	if (arc->bcount > 0)
 	{
@@ -228,7 +232,8 @@ ReebEdge * copyEdge(ReebEdge *edge)
 void printArc(ReebArc *arc)
 {
 	ReebEdge *edge;
-	printf("arc: (%i)%f -> (%i)%f\n", arc->v1->index, arc->v1->weight, arc->v2->index, arc->v2->weight);
+	ReebNode *head = (ReebNode*)arc->head;
+	printf("arc: (%i)%f -> (%i)%f\n", head->index, head->weight, head->index, head->weight);
 	
 	for(edge = arc->edges.first; edge ; edge = edge->next)
 	{
@@ -236,8 +241,9 @@ void printArc(ReebArc *arc)
 	}
 }
 
-void freeArc(ReebArc *arc)
+void REEB_freeArc(BArc *barc)
 {
+	ReebArc *arc = (ReebArc*)barc;
 	BLI_freelistN(&arc->edges);
 	
 	if (arc->buckets)
@@ -270,7 +276,7 @@ void REEB_freeGraph(ReebGraph *rg)
 	while( arc )
 	{
 		ReebArc *next = arc->next;
-		freeArc(arc);
+		REEB_freeArc((BArc*)arc);
 		arc = next;
 	}
 	
@@ -282,8 +288,8 @@ void REEB_freeGraph(ReebGraph *rg)
 
 void repositionNodes(ReebGraph *rg)
 {
-	ReebArc *arc = NULL;
-	ReebNode *node = NULL;
+	BArc *arc = NULL;
+	BNode *node = NULL;
 	
 	// Reset node positions
 	for(node = rg->nodes.first; node; node = node->next)
@@ -293,17 +299,17 @@ void repositionNodes(ReebGraph *rg)
 	
 	for(arc = rg->arcs.first; arc; arc = arc->next)
 	{
-		if (arc->bcount > 0)
+		if (((ReebArc*)arc)->bcount > 0)
 		{
 			float p[3];
 			
-			VECCOPY(p, arc->buckets[0].p);
-			VecMulf(p, 1.0f / arc->v1->degree);
-			VecAddf(arc->v1->p, arc->v1->p, p);
+			VECCOPY(p, ((ReebArc*)arc)->buckets[0].p);
+			VecMulf(p, 1.0f / arc->head->degree);
+			VecAddf(arc->head->p, arc->head->p, p);
 			
-			VECCOPY(p, arc->buckets[arc->bcount - 1].p);
-			VecMulf(p, 1.0f / arc->v2->degree);
-			VecAddf(arc->v2->p, arc->v2->p, p);
+			VECCOPY(p, ((ReebArc*)arc)->buckets[((ReebArc*)arc)->bcount - 1].p);
+			VecMulf(p, 1.0f / arc->tail->degree);
+			VecAddf(arc->tail->p, arc->tail->p, p);
 		}
 	}
 }
@@ -319,7 +325,7 @@ void verifyNodeDegree(ReebGraph *rg)
 		int count = 0;
 		for(arc = rg->arcs.first; arc; arc = arc->next)
 		{
-			if (arc->v1 == node || arc->v2 == node)
+			if (arc->head == node || arc->tail == node)
 			{
 				count++;
 			}
@@ -338,6 +344,9 @@ void verifyBuckets(ReebGraph *rg)
 	ReebArc *arc = NULL;
 	for(arc = rg->arcs.first; arc; arc = arc->next)
 	{
+		ReebNode *head = (ReebNode*)arc->head;
+		ReebNode *tail = (ReebNode*)arc->tail;
+
 		if (arc->bcount > 0)
 		{
 			int i;
@@ -350,15 +359,15 @@ void verifyBuckets(ReebGraph *rg)
 				}
 			}
 			
-			if (ceil(arc->v1->weight) < arc->buckets[0].val)
+			if (ceil(head->weight) < arc->buckets[0].val)
 			{
 				printArc(arc);
-				printf("alloc error in first bucket: %f should be %f \n", arc->buckets[0].val, ceil(arc->v1->weight));
+				printf("alloc error in first bucket: %f should be %f \n", arc->buckets[0].val, ceil(head->weight));
 			}
-			if (floor(arc->v2->weight) < arc->buckets[arc->bcount - 1].val)
+			if (floor(tail->weight) < arc->buckets[arc->bcount - 1].val)
 			{
 				printArc(arc);
-				printf("alloc error in last bucket: %f should be %f \n", arc->buckets[arc->bcount - 1].val, floor(arc->v2->weight));
+				printf("alloc error in last bucket: %f should be %f \n", arc->buckets[arc->bcount - 1].val, floor(tail->weight));
 			}
 		}
 	}
@@ -380,676 +389,200 @@ void verifyFaces(ReebGraph *rg)
 
 /**************************************** SYMMETRY HANDLING ******************************************/
 
-void markdownSymmetryArc(ReebArc *arc, ReebNode *node, int level);
-
-static void mirrorAlongAxis(float v[3], float center[3], float axis[3])
+void REEB_RadialSymmetry(BNode* root_node, RadialArc* ring, int count)
 {
-	float dv[3], pv[3];
-	
-	VecSubf(dv, v, center);
-	Projf(pv, dv, axis);
-	VecMulf(pv, -2);
-	VecAddf(v, v, pv);
-}
-
-/* Helper structure for radial symmetry */
-typedef struct RadialArc
-{
-	ReebArc *arc; 
-	float n[3]; /* normalized vector joining the nodes of the arc */
-} RadialArc;
-
-void reestablishRadialSymmetry(ReebNode *node, int depth, float axis[3], int reestablish)
-{
-	RadialArc *ring = NULL;
-	RadialArc *unit;
-	float limit = G.scene->toolsettings->skgen_symmetry_limit;
-	int symmetric = 1;
-	int count = 0;
+	ReebNode *node = (ReebNode*)root_node;
+	float axis[3];
 	int i;
-
-	/* mark topological symmetry */
-	node->symmetry_flag |= SYM_TOPOLOGICAL;
-
-	/* count the number of arcs in the symmetry ring */
-	for (i = 0; node->arcs[i] != NULL; i++)
-	{
-		ReebArc *connectedArc = node->arcs[i];
-		
-		/* depth is store as a negative in flag. symmetry level is positive */
-		if (connectedArc->symmetry_level == -depth)
-		{
-			count++;
-		}
-	}
-
-	ring = MEM_callocN(sizeof(RadialArc) * count, "radial symmetry ring");
-	unit = ring;
-
-	/* fill in the ring */
-	for (unit = ring, i = 0; node->arcs[i] != NULL; i++)
-	{
-		ReebArc *connectedArc = node->arcs[i];
-		
-		/* depth is store as a negative in flag. symmetry level is positive */
-		if (connectedArc->symmetry_level == -depth)
-		{
-			ReebNode *otherNode = OTHER_NODE(connectedArc, node);
-			float vec[3];
-
-			unit->arc = connectedArc;
-
-			/* project the node to node vector on the symmetry plane */
-			VecSubf(unit->n, otherNode->p, node->p);
-			Projf(vec, unit->n, axis);
-			VecSubf(unit->n, unit->n, vec);
-
-			Normalize(unit->n);
-
-			unit++;
-		}
-	}
-
-	/* sort ring */
+	
+	VECCOPY(axis, root_node->symmetry_axis);
+	
+	/* first pass, merge incrementally */
 	for (i = 0; i < count - 1; i++)
-	{
-		float minAngle = 3; /* arbitrary high value, higher than 2, at least */
-		int minIndex = -1;
-		int j;
-
-		for (j = i + 1; j < count; j++)
-		{
-			float angle = Inpf(ring[i].n, ring[j].n);
-
-			/* map negative values to 1..2 */
-			if (angle < 0)
-			{
-				angle = 1 - angle;
-			}
-
-			if (angle < minAngle)
-			{
-				minIndex = j;
-				minAngle = angle;
-			}
-		}
-
-		/* swap if needed */
-		if (minIndex != i + 1)
-		{
-			RadialArc tmp;
-			tmp = ring[i + 1];
-			ring[i + 1] = ring[minIndex];
-			ring[minIndex] = tmp;
-		}
-	}
-
-	for (i = 0; i < count && symmetric; i++)
 	{
 		ReebNode *node1, *node2;
+		ReebArc *arc1, *arc2;
 		float tangent[3];
 		float normal[3];
-		float p[3];
-		int j = (i + 1) % count; /* next arc in the circular list */
+		int j = i + 1;
 
 		VecAddf(tangent, ring[i].n, ring[j].n);
 		Crossf(normal, tangent, axis);
 		
-		node1 = OTHER_NODE(ring[i].arc, node);
-		node2 = OTHER_NODE(ring[j].arc, node);
-
-		VECCOPY(p, node2->p);
-		mirrorAlongAxis(p, node->p, normal);
+		node1 = (ReebNode*)BLI_otherNode(ring[i].arc, root_node);
+		node2 = (ReebNode*)BLI_otherNode(ring[j].arc, root_node);
 		
-		/* check if it's within limit before continuing */
-		if (VecLenf(node1->p, p) > limit)
-		{
-			symmetric = 0;
-		}
+		arc1 = (ReebArc*)ring[i].arc;
+		arc2 = (ReebArc*)ring[j].arc;
 
-	}
-
-	if (symmetric)
-	{
-		/* mark node as symmetric physically */
-		VECCOPY(node->symmetry_axis, axis);
-		node->symmetry_flag |= SYM_PHYSICAL;
-		node->symmetry_flag |= SYM_RADIAL;
+		/* mirror first node and mix with the second */
+		BLI_mirrorAlongAxis(node1->p, root_node->p, normal);
+		VecLerpf(node2->p, node2->p, node1->p, 1.0f / (j + 1));
 		
-		/* reestablish symmetry only if wanted */
-		if (reestablish)
+		/* Merge buckets
+		 * there shouldn't be any null arcs here, but just to be safe 
+		 * */
+		if (arc1->bcount > 0 && arc2->bcount > 0)
 		{
-			/* first pass, merge incrementally */
-			for (i = 0; i < count - 1; i++)
+			ReebArcIterator iter1, iter2;
+			EmbedBucket *bucket1 = NULL, *bucket2 = NULL;
+			
+			initArcIterator(&iter1, arc1, (ReebNode*)root_node);
+			initArcIterator(&iter2, arc2, (ReebNode*)root_node);
+			
+			bucket1 = nextBucket(&iter1);
+			bucket2 = nextBucket(&iter2);
+		
+			/* Make sure they both start at the same value */	
+			while(bucket1 && bucket1->val < bucket2->val)
 			{
-				ReebNode *node1, *node2;
-				float tangent[3];
-				float normal[3];
-				int j = i + 1;
-		
-				VecAddf(tangent, ring[i].n, ring[j].n);
-				Crossf(normal, tangent, axis);
-				
-				node1 = OTHER_NODE(ring[i].arc, node);
-				node2 = OTHER_NODE(ring[j].arc, node);
-		
-				/* mirror first node and mix with the second */
-				mirrorAlongAxis(node1->p, node->p, normal);
-				VecLerpf(node2->p, node2->p, node1->p, 1.0f / (j + 1));
-				
-				/* Merge buckets
-				 * there shouldn't be any null arcs here, but just to be safe 
-				 * */
-				if (ring[i].arc->bcount > 0 && ring[j].arc->bcount > 0)
-				{
-					ReebArcIterator iter1, iter2;
-					EmbedBucket *bucket1 = NULL, *bucket2 = NULL;
-					
-					initArcIterator(&iter1, ring[i].arc, node);
-					initArcIterator(&iter2, ring[j].arc, node);
-					
-					bucket1 = nextBucket(&iter1);
-					bucket2 = nextBucket(&iter2);
-				
-					/* Make sure they both start at the same value */	
-					while(bucket1 && bucket1->val < bucket2->val)
-					{
-						bucket1 = nextBucket(&iter1);
-					}
-					
-					while(bucket2 && bucket2->val < bucket1->val)
-					{
-						bucket2 = nextBucket(&iter2);
-					}
-			
-			
-					for ( ;bucket1 && bucket2; bucket1 = nextBucket(&iter1), bucket2 = nextBucket(&iter2))
-					{
-						bucket2->nv += bucket1->nv; /* add counts */
-						
-						/* mirror on axis */
-						mirrorAlongAxis(bucket1->p, node->p, normal);
-						/* add bucket2 in bucket1 */
-						VecLerpf(bucket2->p, bucket2->p, bucket1->p, (float)bucket1->nv / (float)(bucket2->nv));
-					}
-				}
+				bucket1 = nextBucket(&iter1);
 			}
 			
-			/* second pass, mirror back on previous arcs */
-			for (i = count - 1; i > 0; i--)
+			while(bucket2 && bucket2->val < bucket1->val)
 			{
-				ReebNode *node1, *node2;
-				float tangent[3];
-				float normal[3];
-				int j = i - 1;
-		
-				VecAddf(tangent, ring[i].n, ring[j].n);
-				Crossf(normal, tangent, axis);
+				bucket2 = nextBucket(&iter2);
+			}
+	
+	
+			for ( ;bucket1 && bucket2; bucket1 = nextBucket(&iter1), bucket2 = nextBucket(&iter2))
+			{
+				bucket2->nv += bucket1->nv; /* add counts */
 				
-				node1 = OTHER_NODE(ring[i].arc, node);
-				node2 = OTHER_NODE(ring[j].arc, node);
-		
-				/* copy first node than mirror */
-				VECCOPY(node2->p, node1->p);
-				mirrorAlongAxis(node2->p, node->p, normal);
-				
-				/* Copy buckets
-				 * there shouldn't be any null arcs here, but just to be safe 
-				 * */
-				if (ring[i].arc->bcount > 0 && ring[j].arc->bcount > 0)
-				{
-					ReebArcIterator iter1, iter2;
-					EmbedBucket *bucket1 = NULL, *bucket2 = NULL;
-					
-					initArcIterator(&iter1, ring[i].arc, node);
-					initArcIterator(&iter2, ring[j].arc, node);
-					
-					bucket1 = nextBucket(&iter1);
-					bucket2 = nextBucket(&iter2);
-				
-					/* Make sure they both start at the same value */	
-					while(bucket1 && bucket1->val < bucket2->val)
-					{
-						bucket1 = nextBucket(&iter1);
-					}
-					
-					while(bucket2 && bucket2->val < bucket1->val)
-					{
-						bucket2 = nextBucket(&iter2);
-					}
-			
-			
-					for ( ;bucket1 && bucket2; bucket1 = nextBucket(&iter1), bucket2 = nextBucket(&iter2))
-					{
-						/* copy and mirror back to bucket2 */			
-						bucket2->nv = bucket1->nv;
-						VECCOPY(bucket2->p, bucket1->p);
-						mirrorAlongAxis(bucket2->p, node->p, normal);
-					}
-				}
+				/* mirror on axis */
+				BLI_mirrorAlongAxis(bucket1->p, root_node->p, normal);
+				/* add bucket2 in bucket1 */
+				VecLerpf(bucket2->p, bucket2->p, bucket1->p, (float)bucket1->nv / (float)(bucket2->nv));
 			}
 		}
 	}
-
-	MEM_freeN(ring);
-}
-
-static void setSideAxialSymmetry(ReebNode *root_node, ReebNode *end_node, ReebArc *arc)
-{
-	float vec[3];
 	
-	VecSubf(vec, end_node->p, root_node->p);
+	/* second pass, mirror back on previous arcs */
+	for (i = count - 1; i > 0; i--)
+	{
+		ReebNode *node1, *node2;
+		ReebArc *arc1, *arc2;
+		float tangent[3];
+		float normal[3];
+		int j = i - 1;
+
+		VecAddf(tangent, ring[i].n, ring[j].n);
+		Crossf(normal, tangent, axis);
+		
+		node1 = (ReebNode*)BLI_otherNode(ring[i].arc, root_node);
+		node2 = (ReebNode*)BLI_otherNode(ring[j].arc, root_node);
+		
+		arc1 = (ReebArc*)ring[i].arc;
+		arc2 = (ReebArc*)ring[j].arc;
+
+		/* copy first node than mirror */
+		VECCOPY(node2->p, node1->p);
+		BLI_mirrorAlongAxis(node2->p, root_node->p, normal);
+		
+		/* Copy buckets
+		 * there shouldn't be any null arcs here, but just to be safe 
+		 * */
+		if (arc1->bcount > 0 && arc2->bcount > 0)
+		{
+			ReebArcIterator iter1, iter2;
+			EmbedBucket *bucket1 = NULL, *bucket2 = NULL;
+			
+			initArcIterator(&iter1, arc1, node);
+			initArcIterator(&iter2, arc2, node);
+			
+			bucket1 = nextBucket(&iter1);
+			bucket2 = nextBucket(&iter2);
+		
+			/* Make sure they both start at the same value */	
+			while(bucket1 && bucket1->val < bucket2->val)
+			{
+				bucket1 = nextBucket(&iter1);
+			}
+			
+			while(bucket2 && bucket2->val < bucket1->val)
+			{
+				bucket2 = nextBucket(&iter2);
+			}
 	
-	if (Inpf(vec, root_node->symmetry_axis) < 0)
-	{
-		arc->symmetry_flag |= SYM_SIDE_NEGATIVE;
-	}
-	else
-	{
-		arc->symmetry_flag |= SYM_SIDE_POSITIVE;
+	
+			for ( ;bucket1 && bucket2; bucket1 = nextBucket(&iter1), bucket2 = nextBucket(&iter2))
+			{
+				/* copy and mirror back to bucket2 */			
+				bucket2->nv = bucket1->nv;
+				VECCOPY(bucket2->p, bucket1->p);
+				BLI_mirrorAlongAxis(bucket2->p, node->p, normal);
+			}
+		}
 	}
 }
 
-void reestablishAxialSymmetry(ReebNode *node, int depth, float axis[3], int reestablish)
+void REEB_AxialSymmetry(BNode* root_node, BNode* node1, BNode* node2, struct BArc* barc1, BArc* barc2)
 {
-	ReebArc *arc1 = NULL;
-	ReebArc *arc2 = NULL;
-	ReebNode *node1 = NULL, *node2 = NULL;
-	float limit = G.scene->toolsettings->skgen_symmetry_limit;
-	float nor[3], vec[3], p[3];
-	int i;
-	
-	/* mark topological symmetry */
-	node->symmetry_flag |= SYM_TOPOLOGICAL;
+	ReebArc *arc1, *arc2;
+	float nor[3], p[3];
 
-	for (i = 0; node->arcs[i] != NULL; i++)
-	{
-		ReebArc *connectedArc = node->arcs[i];
-		
-		/* depth is store as a negative in flag. symmetry level is positive */
-		if (connectedArc->symmetry_level == -depth)
-		{
-			if (arc1 == NULL)
-			{
-				arc1 = connectedArc;
-				node1 = OTHER_NODE(arc1, node);
-			}
-			else
-			{
-				arc2 = connectedArc;
-				node2 = OTHER_NODE(arc2, node);
-				break; /* Can stop now, the two arcs have been found */
-			}
-		}
-	}
-	
-	/* shouldn't happen, but just to be sure */
-	if (node1 == NULL || node2 == NULL)
-	{
-		return;
-	}
-	
-	VecSubf(vec, node1->p, node->p);
-	Normalize(vec);
-	VecSubf(p, node->p, node2->p);
-	Normalize(p);
-	VecAddf(p, p, vec);
-	
-	
-	Crossf(vec, p, axis);
-	Crossf(nor, vec, axis);
+	arc1 = (ReebArc*)barc1;
+	arc2 = (ReebArc*)barc2;
 
-	printvecf("p", p);
-	printvecf("axis", axis);
-	printvecf("vec", vec);
-	printvecf("nor", nor);
+	VECCOPY(nor, root_node->symmetry_axis);
 	
 	/* mirror node2 along axis */
 	VECCOPY(p, node2->p);
-	mirrorAlongAxis(p, node->p, nor);
+	BLI_mirrorAlongAxis(p, root_node->p, nor);
+
+	/* average with node1 */
+	VecAddf(node1->p, node1->p, p);
+	VecMulf(node1->p, 0.5f);
 	
-	/* check if it's within limit before continuing */
-	if (VecLenf(node1->p, p) <= limit)
+	/* mirror back on node2 */
+	VECCOPY(node2->p, node1->p);
+	BLI_mirrorAlongAxis(node2->p, root_node->p, nor);
+	
+	/* Merge buckets
+	 * there shouldn't be any null arcs here, but just to be safe 
+	 * */
+	if (arc1->bcount > 0 && arc2->bcount > 0)
 	{
-		/* mark node as symmetric physically */
-		VECCOPY(node->symmetry_axis, nor);
-		node->symmetry_flag |= SYM_PHYSICAL;
-		node->symmetry_flag |= SYM_AXIAL;
+		ReebArcIterator iter1, iter2;
+		EmbedBucket *bucket1 = NULL, *bucket2 = NULL;
 		
-		/* set side on arcs */
-		setSideAxialSymmetry(node, node1, arc1);
-		setSideAxialSymmetry(node, node2, arc2);
+		initArcIterator(&iter1, arc1, (ReebNode*)root_node);
+		initArcIterator(&iter2, arc2, (ReebNode*)root_node);
 		
-		/* reestablish symmetry only if wanted */
-		if (reestablish)
+		bucket1 = nextBucket(&iter1);
+		bucket2 = nextBucket(&iter2);
+	
+		/* Make sure they both start at the same value */	
+		while(bucket1 && bucket1->val < bucket2->val)
 		{
-			/* average with node1 */
-			VecAddf(node1->p, node1->p, p);
-			VecMulf(node1->p, 0.5f);
+			bucket1 = nextBucket(&iter1);
+		}
+		
+		while(bucket2 && bucket2->val < bucket1->val)
+		{
+			bucket2 = nextBucket(&iter2);
+		}
+
+
+		for ( ;bucket1 && bucket2; bucket1 = nextBucket(&iter1), bucket2 = nextBucket(&iter2))
+		{
+			bucket1->nv += bucket2->nv; /* add counts */
 			
-			/* mirror back on node2 */
-			VECCOPY(node2->p, node1->p);
-			mirrorAlongAxis(node2->p, node->p, nor);
-			
-			/* Merge buckets
-			 * there shouldn't be any null arcs here, but just to be safe 
-			 * */
-			if (arc1->bcount > 0 && arc2->bcount > 0)
-			{
-				ReebArcIterator iter1, iter2;
-				EmbedBucket *bucket1 = NULL, *bucket2 = NULL;
-				
-				initArcIterator(&iter1, arc1, node);
-				initArcIterator(&iter2, arc2, node);
-				
-				bucket1 = nextBucket(&iter1);
-				bucket2 = nextBucket(&iter2);
-			
-				/* Make sure they both start at the same value */	
-				while(bucket1 && bucket1->val < bucket2->val)
-				{
-					bucket1 = nextBucket(&iter1);
-				}
-				
-				while(bucket2 && bucket2->val < bucket1->val)
-				{
-					bucket2 = nextBucket(&iter2);
-				}
-		
-		
-				for ( ;bucket1 && bucket2; bucket1 = nextBucket(&iter1), bucket2 = nextBucket(&iter2))
-				{
-					bucket1->nv += bucket2->nv; /* add counts */
-					
-					/* mirror on axis */
-					mirrorAlongAxis(bucket2->p, node->p, nor);
-					/* add bucket2 in bucket1 */
-					VecLerpf(bucket1->p, bucket1->p, bucket2->p, (float)bucket2->nv / (float)(bucket1->nv));
-		
-					/* copy and mirror back to bucket2 */			
-					bucket2->nv = bucket1->nv;
-					VECCOPY(bucket2->p, bucket1->p);
-					mirrorAlongAxis(bucket2->p, node->p, nor);
-				}
-			}
-		}
-	}
-	else
-	{
-		printf("NOT SYMMETRIC!\n");
-		printf("%f <= %f\n", VecLenf(node1->p, p), limit);
-		printvecf("axis", nor);
-	}
-}
+			/* mirror on axis */
+			BLI_mirrorAlongAxis(bucket2->p, root_node->p, nor);
+			/* add bucket2 in bucket1 */
+			VecLerpf(bucket1->p, bucket1->p, bucket2->p, (float)bucket2->nv / (float)(bucket1->nv));
 
-void markdownSecondarySymmetry(ReebNode *node, int depth, int level)
-{
-	float axis[3] = {0, 0, 0};
-	int count = 0;
-	int i;
-	/* Only reestablish spatial symmetry if needed */
-	int reestablish = G.scene->toolsettings->skgen_options & SKGEN_SYMMETRY;
-
-	/* count the number of branches in this symmetry group
-	 * and determinte the axis of symmetry
-	 *  */	
-	for (i = 0; node->arcs[i] != NULL; i++)
-	{
-		ReebArc *connectedArc = node->arcs[i];
-		
-		/* depth is store as a negative in flag. symmetry level is positive */
-		if (connectedArc->symmetry_level == -depth)
-		{
-			count++;
-		}
-		/* If arc is on the axis */
-		else if (connectedArc->symmetry_level == level)
-		{
-			VecAddf(axis, axis, connectedArc->v1->p);
-			VecSubf(axis, axis, connectedArc->v2->p);
-		}
-	}
-
-	Normalize(axis);
-
-	/* Split between axial and radial symmetry */
-	if (count == 2)
-	{
-		reestablishAxialSymmetry(node, depth, axis, reestablish);
-	}
-	else
-	{
-		reestablishRadialSymmetry(node, depth, axis, reestablish);
-	}
-
-	/* markdown secondary symetries */	
-	for (i = 0; node->arcs[i] != NULL; i++)
-	{
-		ReebArc *connectedArc = node->arcs[i];
-		
-		if (connectedArc->symmetry_level == -depth)
-		{
-			/* markdown symmetry for branches corresponding to the depth */
-			markdownSymmetryArc(connectedArc, node, level + 1);
-		}
-	}
-}
-
-void markdownSymmetryArc(ReebArc *arc, ReebNode *node, int level)
-{
-	int i;
-	arc->symmetry_level = level;
-	
-	node = OTHER_NODE(arc, node);
-	
-	for (i = 0; node->arcs[i] != NULL; i++)
-	{
-		ReebArc *connectedArc = node->arcs[i];
-		
-		if (connectedArc != arc)
-		{
-			ReebNode *connectedNode = OTHER_NODE(connectedArc, node);
-			
-			/* symmetry level is positive value, negative values is subtree depth */
-			connectedArc->symmetry_level = -subtreeDepth(connectedNode, connectedArc);
-		}
-	}
-
-	arc = NULL;
-
-	for (i = 0; node->arcs[i] != NULL; i++)
-	{
-		int issymmetryAxis = 0;
-		ReebArc *connectedArc = node->arcs[i];
-		
-		/* only arcs not already marked as symetric */
-		if (connectedArc->symmetry_level < 0)
-		{
-			int j;
-			
-			/* true by default */
-			issymmetryAxis = 1;
-			
-			for (j = 0; node->arcs[j] != NULL && issymmetryAxis == 1; j++)
-			{
-				ReebArc *otherArc = node->arcs[j];
-				
-				/* different arc, same depth */
-				if (otherArc != connectedArc && otherArc->symmetry_level == connectedArc->symmetry_level)
-				{
-					/* not on the symmetry axis */
-					issymmetryAxis = 0;
-				} 
-			}
-		}
-		
-		/* arc could be on the symmetry axis */
-		if (issymmetryAxis == 1)
-		{
-			/* no arc as been marked previously, keep this one */
-			if (arc == NULL)
-			{
-				arc = connectedArc;
-			}
-			else
-			{
-				/* there can't be more than one symmetry arc */
-				arc = NULL;
-				break;
-			}
-		}
-	}
-	
-	/* go down the arc continuing the symmetry axis */
-	if (arc)
-	{
-		markdownSymmetryArc(arc, node, level);
-	}
-
-	
-	/* secondary symmetry */
-	for (i = 0; node->arcs[i] != NULL; i++)
-	{
-		ReebArc *connectedArc = node->arcs[i];
-		
-		/* only arcs not already marked as symetric and is not the next arc on the symmetry axis */
-		if (connectedArc->symmetry_level < 0)
-		{
-			/* subtree depth is store as a negative value in the flag */
-			markdownSecondarySymmetry(node, -connectedArc->symmetry_level, level);
-		}
-	}
-}
-
-void markdownSymmetry(ReebGraph *rg)
-{
-	ReebNode *node;
-	ReebArc *arc;
-	/* only for Acyclic graphs */
-	int cyclic = isGraphCyclic(rg);
-	
-	/* mark down all arcs as non-symetric */
-	for (arc = rg->arcs.first; arc; arc = arc->next)
-	{
-		arc->symmetry_level = 0;
-	}
-	
-	/* mark down all nodes as not on the symmetry axis */
-	for (node = rg->nodes.first; node; node = node->next)
-	{
-		node->symmetry_level = 0;
-	}
-
-	/* node list is sorted, so lowest node is always the head (by design) */
-	node = rg->nodes.first;
-	
-	/* only work on acyclic graphs and if only one arc is incident on the first node */
-	if (cyclic == 0 && countConnectedArcs(rg, node) == 1)
-	{
-		arc = node->arcs[0];
-		
-		markdownSymmetryArc(arc, node, 1);
-
-		/* mark down non-symetric arcs */
-		for (arc = rg->arcs.first; arc; arc = arc->next)
-		{
-			if (arc->symmetry_level < 0)
-			{
-				arc->symmetry_level = 0;
-			}
-			else
-			{
-				/* mark down nodes with the lowest level symmetry axis */
-				if (arc->v1->symmetry_level == 0 || arc->v1->symmetry_level > arc->symmetry_level)
-				{
-					arc->v1->symmetry_level = arc->symmetry_level;
-				}
-				if (arc->v2->symmetry_level == 0 || arc->v2->symmetry_level > arc->symmetry_level)
-				{
-					arc->v2->symmetry_level = arc->symmetry_level;
-				}
-			}
+			/* copy and mirror back to bucket2 */			
+			bucket2->nv = bucket1->nv;
+			VECCOPY(bucket2->p, bucket1->p);
+			BLI_mirrorAlongAxis(bucket2->p, root_node->p, nor);
 		}
 	}
 }
 
 /************************************** ADJACENCY LIST *************************************************/
 
-static void addArcToNodeAdjacencyList(ReebNode *node, ReebArc *arc)
-{
-	ReebArc **arclist;
-
-	for(arclist = node->arcs; *arclist; arclist++)
-	{	}
-	
-	*arclist = arc;
-}
-
-void buildAdjacencyList(ReebGraph *rg)
-{
-	ReebNode *node = NULL;
-	ReebArc *arc = NULL;
-
-	for(node = rg->nodes.first; node; node = node->next)
-	{
-		if (node->arcs != NULL)
-		{
-			MEM_freeN(node->arcs);
-		}
-		
-		node->arcs = MEM_callocN((node->degree + 1) * sizeof(ReebArc*), "adjacency list");
-	}
-
-	for(arc = rg->arcs.first; arc; arc= arc->next)
-	{
-		addArcToNodeAdjacencyList(arc->v1, arc);
-		addArcToNodeAdjacencyList(arc->v2, arc);
-	}
-}
-
-int hasAdjacencyList(ReebGraph *rg)
-{
-	ReebNode *node;
-	
-	for(node = rg->nodes.first; node; node = node->next)
-	{
-		if (node->arcs == NULL)
-		{
-			return 0;
-		}
-	}
-	
-	return 1;
-}
-
-int countConnectedArcs(ReebGraph *rg, ReebNode *node)
-{
-	int count = 0;
-	
-	/* use adjacency list if present */
-	if (node->arcs)
-	{
-		ReebArc **arcs;
-	
-		for(arcs = node->arcs; *arcs; arcs++)
-		{
-			count++;
-		}
-	}
-	else
-	{
-		ReebArc *arc;
-		for(arc = rg->arcs.first; arc; arc = arc->next)
-		{
-			if (arc->v1 == node || arc->v2 == node)
-			{
-				count++;
-			}
-		}
-	}
-	
-	return count;
-}
 
 /****************************************** SMOOTHING **************************************************/
 
@@ -1120,12 +653,14 @@ int compareArcsWeight(void *varc1, void *varc2)
 {
 	ReebArc *arc1 = (ReebArc*)varc1;
 	ReebArc *arc2 = (ReebArc*)varc2;
+	ReebNode *node1 = (ReebNode*)arc1->head; 
+	ReebNode *node2 = (ReebNode*)arc2->head; 
 	
-	if (arc1->v1->weight < arc2->v1->weight)
+	if (node1->weight < node2->weight)
 	{
 		return -1;
 	}
-	if (arc1->v1->weight > arc2->v1->weight)
+	if (node1->weight > node2->weight)
 	{
 		return 1;
 	}
@@ -1142,12 +677,20 @@ void sortArcs(ReebGraph *rg)
 
 /****************************************** FILTERING **************************************************/
 
+float lengthArc(ReebArc *arc)
+{
+	ReebNode *head = (ReebNode*)arc->head;
+	ReebNode *tail = (ReebNode*)arc->tail;
+	
+	return tail->weight - head->weight;
+}
+
 int compareArcs(void *varc1, void *varc2)
 {
 	ReebArc *arc1 = (ReebArc*)varc1;
 	ReebArc *arc2 = (ReebArc*)varc2;
-	float len1 = arc1->v2->weight - arc1->v1->weight;
-	float len2 = arc2->v2->weight - arc2->v1->weight;
+	float len1 = lengthArc(arc1);
+	float len2 = lengthArc(arc2);
 	
 	if (len1 < len2)
 	{
@@ -1170,9 +713,11 @@ void filterArc(ReebGraph *rg, ReebNode *newNode, ReebNode *removedNode, ReebArc
 	/* first pass, merge buckets for arcs that spawned the two nodes into the source arc*/
 	for(arc = rg->arcs.first; arc; arc = arc->next)
 	{
-		if (arc->v1 == srcArc->v1 && arc->v2 == srcArc->v2 && arc != srcArc)
+		if (arc->head == srcArc->head && arc->tail == srcArc->tail && arc != srcArc)
 		{
-			mergeArcBuckets(srcArc, arc, srcArc->v1->weight, srcArc->v2->weight);
+			ReebNode *head = (ReebNode*)srcArc->head;
+			ReebNode *tail = (ReebNode*)srcArc->tail;
+			mergeArcBuckets(srcArc, arc, head->weight, tail->weight);
 		}
 	}
 
@@ -1182,19 +727,19 @@ void filterArc(ReebGraph *rg, ReebNode *newNode, ReebNode *removedNode, ReebArc
 	{
 		nextArc = arc->next;
 		
-		if (arc->v1 == removedNode || arc->v2 == removedNode)
+		if (arc->head == removedNode || arc->tail == removedNode)
 		{
-			if (arc->v1 == removedNode)
+			if (arc->head == removedNode)
 			{
-				arc->v1 = newNode;
+				arc->head = newNode;
 			}
 			else
 			{
-				arc->v2 = newNode;
+				arc->tail = newNode;
 			}
 
 			// Remove looped arcs			
-			if (arc->v1 == arc->v2)
+			if (arc->head == arc->tail)
 			{
 				// v1 or v2 was already newNode, since we're removing an arc, decrement degree
 				newNode->degree--;
@@ -1203,17 +748,17 @@ void filterArc(ReebGraph *rg, ReebNode *newNode, ReebNode *removedNode, ReebArc
 				if (arc != srcArc)
 				{
 					BLI_remlink(&rg->arcs, arc);
-					freeArc(arc);
+					REEB_freeArc((BArc*)arc);
 				}
 			}
 			// Remove flipped arcs
-			else if (arc->v1->weight > arc->v2->weight)
+			else if (((ReebNode*)arc->head)->weight > ((ReebNode*)arc->tail)->weight)
 			{
 				// Decrement degree from the other node
-				OTHER_NODE(arc, newNode)->degree--;
+				BLI_otherNode((BArc*)arc, (BNode*)newNode)->degree--;
 				
 				BLI_remlink(&rg->arcs, arc);
-				freeArc(arc);
+				REEB_freeArc((BArc*)arc);
 			}
 			else
 			{
@@ -1222,9 +767,12 @@ void filterArc(ReebGraph *rg, ReebNode *newNode, ReebNode *removedNode, ReebArc
 
 				if (merging)
 				{
+					ReebNode *head = (ReebNode*)arc->head;
+					ReebNode *tail = (ReebNode*)arc->tail;
+
 					// resize bucket list
 					resizeArcBuckets(arc);
-					mergeArcBuckets(arc, srcArc, arc->v1->weight, arc->v2->weight);
+					mergeArcBuckets(arc, srcArc, head->weight, tail->weight);
 				}
 			}
 		}
@@ -1244,8 +792,8 @@ void filterNullReebGraph(ReebGraph *rg)
 		// Only collapse arcs too short to have any embed bucket
 		if (arc->bcount == 0)
 		{
-			ReebNode *newNode = arc->v1;
-			ReebNode *removedNode = arc->v2;
+			ReebNode *newNode = (ReebNode*)arc->head;
+			ReebNode *removedNode = (ReebNode*)arc->tail;
 			float blend;
 			
 			blend = (float)newNode->degree / (float)(newNode->degree + removedNode->degree); // blending factors
@@ -1259,7 +807,7 @@ void filterNullReebGraph(ReebGraph *rg)
 			nextArc = arc->next;
 			
 			BLI_remlink(&rg->arcs, arc);
-			freeArc(arc);
+			REEB_freeArc((BArc*)arc);
 			
 			BLI_freelinkN(&rg->nodes, removedNode);
 		}
@@ -1281,21 +829,21 @@ int filterInternalReebGraph(ReebGraph *rg, float threshold)
 		nextArc = arc->next;
 
 		// Only collapse non-terminal arcs that are shorter than threshold
-		if ((arc->v1->degree > 1 && arc->v2->degree > 1 && arc->v2->weight - arc->v1->weight < threshold))
+		if ((arc->head->degree > 1 && arc->tail->degree > 1 && ((ReebNode*)arc->tail)->weight - ((ReebNode*)arc->head)->weight < threshold))
 		{
 			ReebNode *newNode = NULL;
 			ReebNode *removedNode = NULL;
 			
 			/* Keep the node with the highestn number of connected arcs */
-			if (arc->v1->degree >= arc->v2->degree)
+			if (arc->head->degree >= arc->tail->degree)
 			{
-				newNode = arc->v1;
-				removedNode = arc->v2;
+				newNode = arc->head;
+				removedNode = arc->tail;
 			}
 			else
 			{
-				newNode = arc->v2;
-				removedNode = arc->v1;
+				newNode = arc->tail;
+				removedNode = arc->head;
 			}
 			
 			filterArc(rg, newNode, removedNode, arc, 1);
@@ -1304,7 +852,7 @@ int filterInternalReebGraph(ReebGraph *rg, float threshold)
 			nextArc = arc->next;
 			
 			BLI_remlink(&rg->arcs, arc);
-			freeArc(arc);
+			REEB_freeArc((BArc*)arc);
 			
 			BLI_freelinkN(&rg->nodes, removedNode);
 			value = 1;
@@ -1329,7 +877,7 @@ int filterExternalReebGraph(ReebGraph *rg, float threshold)
 		nextArc = arc->next;
 
 		// Only collapse terminal arcs that are shorter than threshold
-		if ((arc->v1->degree == 1 || arc->v2->degree == 1) && arc->v2->weight - arc->v1->weight < threshold)
+		if ((arc->head->degree == 1 || arc->tail->degree == 1) && ((ReebNode*)arc->tail)->weight - ((ReebNode*)arc->head)->weight < threshold)
 		{
 			ReebNode *terminalNode = NULL;
 			ReebNode *middleNode = NULL;
@@ -1338,15 +886,15 @@ int filterExternalReebGraph(ReebGraph *rg, float threshold)
 			int merging = 0;
 			
 			// Assign terminal and middle nodes
-			if (arc->v1->degree == 1)
+			if (arc->head->degree == 1)
 			{
-				terminalNode = arc->v1;
-				middleNode = arc->v2;
+				terminalNode = arc->head;
+				middleNode = arc->tail;
 			}
 			else
 			{
-				terminalNode = arc->v2;
-				middleNode = arc->v1;
+				terminalNode = arc->tail;
+				middleNode = arc->head;
 			}
 			
 			// If middle node is a normal node, merge to terminal node
@@ -1379,7 +927,7 @@ int filterExternalReebGraph(ReebGraph *rg, float threshold)
 			nextArc = arc->next;
 			
 			BLI_remlink(&rg->arcs, arc);
-			freeArc(arc);
+			REEB_freeArc((BArc*)arc);
 			
 			BLI_freelinkN(&rg->nodes, removedNode);
 			value = 1;
@@ -1416,7 +964,7 @@ int filterSmartReebGraph(ReebGraph *rg, float threshold)
 		recalc_editnormals();
 
 		// Only test terminal arcs
-		if (arc->v1->degree == 1 || arc->v2->degree == 1)
+		if (arc->head->degree == 1 || arc->tail->degree == 1)
 		{
 			GHashIterator ghi;
 			int merging = 0;
@@ -1437,7 +985,7 @@ int filterSmartReebGraph(ReebGraph *rg, float threshold)
 				float min_distance = -1;
 				float angle = 0;
 		
-				initArcIterator(&iter, arc, arc->v1);
+				initArcIterator(&iter, arc, arc->head);
 		
 				bucket = nextBucket(&iter);
 				
@@ -1451,7 +999,7 @@ int filterSmartReebGraph(ReebGraph *rg, float threshold)
 					/* first bucket. Previous is head */
 					if (previous == NULL)
 					{
-						vec0 = arc->v1->p;
+						vec0 = arc->head->p;
 					}
 					/* Previous is a valid bucket */
 					else
@@ -1512,15 +1060,15 @@ int filterSmartReebGraph(ReebGraph *rg, float threshold)
 				int merging = 0;
 				
 				// Assign terminal and middle nodes
-				if (arc->v1->degree == 1)
+				if (arc->head->degree == 1)
 				{
-					terminalNode = arc->v1;
-					middleNode = arc->v2;
+					terminalNode = arc->head;
+					middleNode = arc->tail;
 				}
 				else
 				{
-					terminalNode = arc->v2;
-					middleNode = arc->v1;
+					terminalNode = arc->tail;
+					middleNode = arc->head;
 				}
 				
 				// If middle node is a normal node, merge to terminal node
@@ -1553,7 +1101,7 @@ int filterSmartReebGraph(ReebGraph *rg, float threshold)
 				nextArc = arc->next;
 				
 				BLI_remlink(&rg->arcs, arc);
-				freeArc(arc);
+				REEB_freeArc((BArc*)arc);
 				
 				BLI_freelinkN(&rg->nodes, removedNode);
 				value = 1;
@@ -1625,94 +1173,6 @@ void spreadWeight(EditMesh *em)
 	
 	MEM_freeN(verts);
 }
-/*********************************** GRAPH AS TREE FUNCTIONS *******************************************/
-
-int subtreeDepth(ReebNode *node, ReebArc *rootArc)
-{
-	int depth = 0;
-	
-	/* Base case, no arcs leading away */
-	if (node->arcs == NULL || *(node->arcs) == NULL)
-	{
-		return 0;
-	}
-	else
-	{
-		ReebArc ** pArc;
-
-		for(pArc = node->arcs; *pArc; pArc++)
-		{
-			ReebArc *arc = *pArc;
-			
-			/* only arcs that go down the tree */
-			if (arc != rootArc)
-			{
-				ReebNode *newNode = OTHER_NODE(arc, node);
-				depth = MAX2(depth, subtreeDepth(newNode, arc));
-			}
-		}
-	}
-	
-	return depth + 1;
-}
-
-/*************************************** CYCLE DETECTION ***********************************************/
-
-int detectCycle(ReebNode *node, ReebArc *srcArc)
-{
-	int value = 0;
-	
-	if (node->flag == 0)
-	{
-		ReebArc ** pArc;
-
-		/* mark node as visited */
-		node->flag = 1;
-
-		for(pArc = node->arcs; *pArc && value == 0; pArc++)
-		{
-			ReebArc *arc = *pArc;
-			
-			/* don't go back on the source arc */
-			if (arc != srcArc)
-			{
-				value = detectCycle(OTHER_NODE(arc, node), arc);
-			}
-		}
-	}
-	else
-	{
-		value = 1;
-	}
-	
-	return value;
-}
-
-int	isGraphCyclic(ReebGraph *rg)
-{
-	ReebNode *node;
-	int value = 0;
-	
-	/* NEED TO CHECK IF ADJACENCY LIST EXIST */
-	
-	/* Mark all nodes as not visited */
-	for(node = rg->nodes.first; node; node = node->next)
-	{
-		node->flag = 0;
-	}
-
-	/* detectCycles in subgraphs */	
-	for(node = rg->nodes.first; node && value == 0; node = node->next)
-	{
-		/* only for nodes in subgraphs that haven't been visited yet */
-		if (node->flag == 0)
-		{
-			value = value || detectCycle(node, NULL);
-		}		
-	}
-	
-	return value;
-}
 
 /******************************************** EXPORT ***************************************************/
 
@@ -1742,18 +1202,18 @@ void REEB_exportGraph(ReebGraph *rg, int count)
 		int i;
 		float p[3];
 		
-		exportNode(f, "v1", arc->v1);
+		exportNode(f, "v1", arc->head);
 		
 		for(i = 0; i < arc->bcount; i++)
 		{
 			fprintf(f, "b nv:%i %f %f %f\n", arc->buckets[i].nv, arc->buckets[i].p[0], arc->buckets[i].p[1], arc->buckets[i].p[2]);
 		}
 		
-		VecAddf(p, arc->v2->p, arc->v1->p);
+		VecAddf(p, arc->tail->p, arc->head->p);
 		VecMulf(p, 0.5f);
 		
 		fprintf(f, "angle %0.3f %0.3f %0.3f %0.3f %i\n", p[0], p[1], p[2], arc->angle, BLI_ghash_size(arc->faces));
-		exportNode(f, "v2", arc->v2);
+		exportNode(f, "v2", arc->tail);
 	}	
 	
 	fclose(f);
@@ -1767,7 +1227,7 @@ ReebArc * findConnectedArc(ReebGraph *rg, ReebArc *arc, ReebNode *v)
 	
 	for(nextArc = rg->arcs.first; nextArc; nextArc = nextArc->next)
 	{
-		if (arc != nextArc && (nextArc->v1 == v || nextArc->v2 == v))
+		if (arc != nextArc && (nextArc->head == v || nextArc->tail == v))
 		{
 			break;
 		}
@@ -1784,39 +1244,39 @@ void removeNormalNodes(ReebGraph *rg)
 	// Merge degree 2 nodes
 	for(arc = rg->arcs.first; arc; arc = arc->next)
 	{
-		while (arc->v1->degree == 2 || arc->v2->degree == 2)
+		while (arc->head->degree == 2 || arc->tail->degree == 2)
 		{
 			// merge at v1
-			if (arc->v1->degree == 2)
+			if (arc->head->degree == 2)
 			{
-				ReebArc *nextArc = findConnectedArc(rg, arc, arc->v1);
+				ReebArc *nextArc = (ReebArc*)BLI_findConnectedArc((BGraph*)rg, (BArc*)arc, (BNode*)arc->head);
 
 				// Merge arc only if needed
-				if (arc->v1 == nextArc->v2)
+				if (arc->head == nextArc->tail)
 				{				
 					mergeConnectedArcs(rg, arc, nextArc);
 				}
 				// Otherwise, mark down vert
 				else
 				{
-					arc->v1->degree = 3;
+					arc->head->degree = 3;
 				}
 			}
 			
 			// merge at v2
-			if (arc->v2->degree == 2)
+			if (arc->tail->degree == 2)
 			{
-				ReebArc *nextArc = findConnectedArc(rg, arc, arc->v2);
+				ReebArc *nextArc = (ReebArc*)BLI_findConnectedArc((BGraph*)rg, (BArc*)arc, (BNode*)arc->tail);
 				
 				// Merge arc only if needed
-				if (arc->v2 == nextArc->v1)
+				if (arc->tail == nextArc->head)
 				{				
 					mergeConnectedArcs(rg, arc, nextArc);
 				}
 				// Otherwise, mark down vert
 				else
 				{
-					arc->v2->degree = 3;
+					arc->tail->degree = 3;
 				}
 			}
 		}
@@ -1933,24 +1393,24 @@ int mergeConnectedArcs(ReebGraph *rg, ReebArc *a0, ReebArc *a1)
 	mergeArcFaces(rg, a0, a1);
 	
 	// Bring a0 to the combine length of both arcs
-	if (a0->v2 == a1->v1)
+	if (a0->tail == a1->head)
 	{
-		removedNode = a0->v2;
-		a0->v2 = a1->v2;
+		removedNode = a0->tail;
+		a0->tail = a1->tail;
 	}
-	else if (a0->v1 == a1->v2)
+	else if (a0->head == a1->tail)
 	{
-		removedNode = a0->v1;
-		a0->v1 = a1->v1;
+		removedNode = a0->head;
+		a0->head = a1->head;
 	}
 	
 	resizeArcBuckets(a0);
 	// Merge a1 in a0
-	mergeArcBuckets(a0, a1, a0->v1->weight, a0->v2->weight);
+	mergeArcBuckets(a0, a1, a0->head->weight, a0->tail->weight);
 	
 	// remove a1 from graph
 	BLI_remlink(&rg->arcs, a1);
-	freeArc(a1);
+	REEB_freeArc((BArc*)a1);
 	
 	BLI_freelinkN(&rg->nodes, removedNode);
 	result = 1;
@@ -1962,36 +1422,36 @@ int mergeArcs(ReebGraph *rg, ReebArc *a0, ReebArc *a1)
 {
 	int result = 0;
 	// TRIANGLE POINTS DOWN
-	if (a0->v1->weight == a1->v1->weight) // heads are the same
+	if (a0->head->weight == a1->head->weight) // heads are the same
 	{
-		if (a0->v2->weight == a1->v2->weight) // tails also the same, arcs can be totally merge together
+		if (a0->tail->weight == a1->tail->weight) // tails also the same, arcs can be totally merge together
 		{
 			mergeArcEdges(rg, a0, a1, MERGE_APPEND);
 			mergeArcFaces(rg, a0, a1);
 			
-			mergeArcBuckets(a0, a1, a0->v1->weight, a0->v2->weight);
+			mergeArcBuckets(a0, a1, a0->head->weight, a0->tail->weight);
 			
 			// Adjust node degree
-			a1->v1->degree--;
-			a1->v2->degree--;
+			a1->head->degree--;
+			a1->tail->degree--;
 			
 			// remove a1 from graph
 			BLI_remlink(&rg->arcs, a1);
 			
-			freeArc(a1);
+			REEB_freeArc((BArc*)a1);
 			result = 1;
 		}
-		else if (a0->v2->weight > a1->v2->weight) // a1->v2->weight is in the middle
+		else if (a0->tail->weight > a1->tail->weight) // a1->tail->weight is in the middle
 		{
 			mergeArcEdges(rg, a1, a0, MERGE_LOWER);
 			mergeArcFaces(rg, a1, a0);
 
 			// Adjust node degree
-			a0->v1->degree--;
-			a1->v2->degree++;
+			a0->head->degree--;
+			a1->tail->degree++;
 			
-			mergeArcBuckets(a1, a0, a1->v1->weight, a1->v2->weight);
-			a0->v1 = a1->v2;
+			mergeArcBuckets(a1, a0, a1->head->weight, a1->tail->weight);
+			a0->head = a1->tail;
 			resizeArcBuckets(a0);
 		}
 		else // a0>n2 is in the middle
@@ -2000,41 +1460,41 @@ int mergeArcs(ReebGraph *rg, ReebArc *a0, ReebArc *a1)
 			mergeArcFaces(rg, a0, a1);
 			
 			// Adjust node degree
-			a1->v1->degree--;
-			a0->v2->degree++;
+			a1->head->degree--;
+			a0->tail->degree++;
 			
-			mergeArcBuckets(a0, a1, a0->v1->weight, a0->v2->weight);
-			a1->v1 = a0->v2;
+			mergeArcBuckets(a0, a1, a0->head->weight, a0->tail->weight);
+			a1->head = a0->tail;
 			resizeArcBuckets(a1);
 		}
 	}
 	// TRIANGLE POINTS UP
-	else if (a0->v2->weight == a1->v2->weight) // tails are the same
+	else if (a0->tail->weight == a1->tail->weight) // tails are the same
 	{
-		if (a0->v1->weight > a1->v1->weight) // a0->v1->weight is in the middle
+		if (a0->head->weight > a1->head->weight) // a0->head->weight is in the middle
 		{
 			mergeArcEdges(rg, a0, a1, MERGE_HIGHER);
 			mergeArcFaces(rg, a0, a1);
 			
 			// Adjust node degree
-			a1->v2->degree--;
-			a0->v1->degree++;
+			a1->tail->degree--;
+			a0->head->degree++;
 			
-			mergeArcBuckets(a0, a1, a0->v1->weight, a0->v2->weight);
-			a1->v2 = a0->v1;
+			mergeArcBuckets(a0, a1, a0->head->weight, a0->tail->weight);
+			a1->tail = a0->head;
 			resizeArcBuckets(a1);
 		}
-		else // a1->v1->weight is in the middle
+		else // a1->head->weight is in the middle
 		{
 			mergeArcEdges(rg, a1, a0, MERGE_HIGHER);
 			mergeArcFaces(rg, a1, a0);
 
 			// Adjust node degree
-			a0->v2->degree--;
-			a1->v1->degree++;
+			a0->tail->degree--;
+			a1->head->degree++;
 
-			mergeArcBuckets(a1, a0, a1->v1->weight, a1->v2->weight);
-			a0->v2 = a1->v1;
+			mergeArcBuckets(a1, a0, a1->head->weight, a1->tail->weight);
+			a0->tail = a1->head;
 			resizeArcBuckets(a0);
 		}
 	}
@@ -2055,7 +1515,7 @@ void glueByMergeSort(ReebGraph *rg, ReebArc *a0, ReebArc *a1, ReebEdge *e0, Reeb
 		
 		if (total == 0) // if it wasn't a total merge, go forward
 		{
-			if (a0->v2->weight < a1->v2->weight)
+			if (a0->tail->weight < a1->tail->weight)
 			{
 				a0 = nextArcMappedToEdge(a0, e0);
 			}
@@ -2130,8 +1590,8 @@ ReebEdge * createArc(ReebGraph *rg, ReebNode *node1, ReebNode *node2)
 			v2 = node1;	
 		}
 		
-		arc->v1 = v1;
-		arc->v2 = v2;
+		arc->head = v1;
+		arc->tail = v2;
 		
 		// increase node degree
 		v1->degree++;
@@ -2150,8 +1610,8 @@ ReebEdge * createArc(ReebGraph *rg, ReebNode *node1, ReebNode *node2)
 		/* adding buckets for embedding */
 		allocArcBuckets(arc);
 		
-		offset = arc->v1->weight;
-		len = arc->v2->weight - arc->v1->weight;
+		offset = arc->head->weight;
+		len = arc->tail->weight - arc->head->weight;
 
 #if 0
 		/* This is the actual embedding filling described in the paper
@@ -2159,8 +1619,8 @@ ReebEdge * createArc(ReebGraph *rg, ReebNode *node1, ReebNode *node2)
 		 */
 		if (arc->bcount > 0)
 		{
-			addVertToBucket(&(arc->buckets[0]), arc->v1->co);
-			addVertToBucket(&(arc->buckets[arc->bcount - 1]), arc->v2->co);
+			addVertToBucket(&(arc->buckets[0]), arc->head->co);
+			addVertToBucket(&(arc->buckets[arc->bcount - 1]), arc->tail->co);
 		}
 #else
 		for(i = 0; i < arc->bcount; i++)
@@ -2239,6 +1699,12 @@ ReebGraph * newReebGraph()
 	rg->totnodes = 0;
 	rg->emap = BLI_edgehash_new();
 	
+	
+	rg->free_arc = REEB_freeArc;
+	rg->free_node = NULL;
+	rg->radial_symmetry = REEB_RadialSymmetry;
+	rg->axial_symmetry = REEB_AxialSymmetry;
+	
 	return rg;
 }
 
@@ -2282,29 +1748,30 @@ ReebGraph * generateReebGraph(EditMesh *em, int subdivisions)
 	/* Adding face, edge per edge */
 	for(efa = em->faces.first; efa; efa = efa->next)
 	{
-		ReebNode *n1, *n2, *n3;
-		
-		n1 = (ReebNode*)BLI_dlist_find_link(dlist, efa->v1->hash);
-		n2 = (ReebNode*)BLI_dlist_find_link(dlist, efa->v2->hash);
-		n3 = (ReebNode*)BLI_dlist_find_link(dlist, efa->v3->hash);
-		
-		addTriangleToGraph(rg, n1, n2, n3, efa);
-		
-		if (efa->v4)
+		if (efa->h == 0)
 		{
-			ReebNode *n4 = (ReebNode*)efa->v4->tmp.p;
-			addTriangleToGraph(rg, n1, n3, n4, efa);
-		}
-
+			ReebNode *n1, *n2, *n3;
+			
+			n1 = (ReebNode*)BLI_dlist_find_link(dlist, efa->v1->hash);
+			n2 = (ReebNode*)BLI_dlist_find_link(dlist, efa->v2->hash);
+			n3 = (ReebNode*)BLI_dlist_find_link(dlist, efa->v3->hash);
+			
+			addTriangleToGraph(rg, n1, n2, n3, efa);
+			
+			if (efa->v4)
+			{
+				ReebNode *n4 = (ReebNode*)efa->v4->tmp.p;
+				addTriangleToGraph(rg, n1, n3, n4, efa);
+			}
 #ifdef DEBUG_REEB
-		countfaces++;
-		if (countfaces % 100 == 0)
-		{
-			printf("face %i of %i\n", countfaces, totfaces);
-			verifyFaces(rg);
-		}
+			countfaces++;
+			if (countfaces % 100 == 0)
+			{
+				printf("face %i of %i\n", countfaces, totfaces);
+				verifyFaces(rg);
+			}
 #endif
-		
+		}
 		
 	}
 	BLI_listbase_from_dlist(dlist, &rg->nodes);
@@ -2543,7 +2010,7 @@ EditEdge * NextEdgeForVert(EditMesh *em, EditVert *v)
 
 	for( ; e ; e = e->next)
 	{
-		if (e->v1 == v || e->v2 == v)
+		if ((e->v1 == v || e->v2 == v) && (e->h == 0))
 		{
 			break;
 		}
@@ -2850,7 +2317,7 @@ void initArcIterator(ReebArcIterator *iter, ReebArc *arc, ReebNode *head)
 {
 	iter->arc = arc;
 	
-	if (head == arc->v1)
+	if (head == arc->head)
 	{
 		iter->start = 0;
 		iter->end = arc->bcount - 1;
@@ -2870,7 +2337,7 @@ void initArcIteratorStart(struct ReebArcIterator *iter, struct ReebArc *arc, str
 {
 	iter->arc = arc;
 	
-	if (head == arc->v1)
+	if (head == arc->head)
 	{
 		iter->start = start;
 		iter->end = arc->bcount - 1;
@@ -3011,6 +2478,8 @@ ReebGraph *BIF_ReebGraphFromEditMesh(void)
 	
 	rg = generateReebGraph(em, G.scene->toolsettings->skgen_resolution);
 
+	REEB_exportGraph(rg, -1);
+
 	verifyBuckets(rg);
 	
 	verifyFaces(rg);
@@ -3062,7 +2531,7 @@ ReebGraph *BIF_ReebGraphFromEditMesh(void)
 		postprocessGraph(rg, G.scene->toolsettings->skgen_postpro);
 	}
 
-	buildAdjacencyList(rg);
+	BLI_buildAdjacencyList((BGraph*)rg);
 	
 	sortNodes(rg);
 	

From 9986b5cd736a493026c9580a49bbf030cd1fa4be Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Wed, 28 May 2008 21:19:56 +0000
Subject: [PATCH 026/252] soc-2008-mxcurioni: corrected
 GLStrokeRender::preparePaper function for paper texture loading. The canvas
 view now has its frame properly initialized to fixed dimensions. When the
 Freestyle render is executed, the render is displayed for a fraction of a
 second and is then erased by a standard gray background. I have to analyze
 what command I need to call to keep the result on display.

---
 source/blender/freestyle/SConscript           |  6 +---
 .../intern/app_blender/AppCanvas.cpp          |  2 +-
 .../intern/app_blender/AppGLWidget.cpp        | 15 ++-------
 .../intern/app_blender/AppGLWidget.h          | 14 ++++----
 .../freestyle/intern/app_blender/api.cpp      |  4 ++-
 .../intern/rendering/GLStrokeRenderer.cpp     | 32 ++++++++++++-------
 6 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript
index 198eb2ed422..58d4e980e8b 100644
--- a/source/blender/freestyle/SConscript
+++ b/source/blender/freestyle/SConscript
@@ -55,14 +55,10 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'):
 prefix = 'intern/app_blender'
 app_sources = env.Glob(prefix + '/*.cpp')
 
-# 	swig wrapper
-#prefix = 'intern/swig'
-#swig_sources = env.Glob(prefix + '/*.cpp')
-swig_sources = []
 
 sources = 	system_sources + image_sources + geometry_sources + scene_graph_sources \
 		  +	winged_edge_sources + view_map_sources + stroke_sources + rendering_sources \
-		  + app_sources + swig_sources
+		  + app_sources
 
 env.BlenderLib (libname="bf_freestyle",
 				sources=sources,
diff --git a/source/blender/freestyle/intern/app_blender/AppCanvas.cpp b/source/blender/freestyle/intern/app_blender/AppCanvas.cpp
index 5125bf5f70b..98013cf18d4 100755
--- a/source/blender/freestyle/intern/app_blender/AppCanvas.cpp
+++ b/source/blender/freestyle/intern/app_blender/AppCanvas.cpp
@@ -214,7 +214,7 @@ void AppCanvas::update()
 //  char number[10];
 //
   _pViewer->updateGL();
-  _pViewer->swapBuffers();
+  //_pViewer->swapBuffers();
   //QImage fb = _pViewer->grabFrameBuffer();
   //  sprintf(number, "%3d", counter);
   //  strcat(fileName, number);
diff --git a/source/blender/freestyle/intern/app_blender/AppGLWidget.cpp b/source/blender/freestyle/intern/app_blender/AppGLWidget.cpp
index 18e9639342d..a06e25d72be 100755
--- a/source/blender/freestyle/intern/app_blender/AppGLWidget.cpp
+++ b/source/blender/freestyle/intern/app_blender/AppGLWidget.cpp
@@ -618,22 +618,13 @@ bool AppGLWidget::getBackBufferFlag() {
 // COPIED FROM LIBQGLVIEWER
 //*******************************
 
-	// inherited 
-	void AppGLWidget::swapBuffers() {}
-	
+	// inherited 	
 	//Updates the display. Do not call draw() directly, use this method instead. 
 	void AppGLWidget::updateGL() {}
 
 	//Makes this widget's rendering context the current OpenGL rendering context. Useful with several viewers
-	void AppGLWidget::makeCurrent() {}
-
+	void AppGLWidget::makeCurrent() { }
 
 	// not-inherited
-
-	//	Convenient way to call setSceneCenter() and setSceneRadius() from a (world axis aligned) bounding box of the scene.
-	void AppGLWidget::setSceneBoundingBox(const Vec& min, const Vec& max) { _camera->setSceneBoundingBox(min,max); }
-		
-	void AppGLWidget::saveSnapshot(bool b) {}
-
 	 void AppGLWidget::setStateFileName(const string& name) { stateFileName_ = name; };
-
+	void AppGLWidget::saveSnapshot(bool b) {}
diff --git a/source/blender/freestyle/intern/app_blender/AppGLWidget.h b/source/blender/freestyle/intern/app_blender/AppGLWidget.h
index 3cf7844876d..15238ba6269 100755
--- a/source/blender/freestyle/intern/app_blender/AppGLWidget.h
+++ b/source/blender/freestyle/intern/app_blender/AppGLWidget.h
@@ -47,6 +47,7 @@ using namespace std;
 # include "../rendering/GLDebugRenderer.h"
 //# include <QGLViewer/qglviewer.h>
 
+
 //soc
 #include "AppGLWidget_camera.h"
 #include "AppGLWidget_vec.h"
@@ -76,14 +77,15 @@ public:
 public:
 
 	//inherited
-		inline real width() { return _width; }
-		inline real height() { return _height; }
-		void swapBuffers();
+		inline unsigned int width() { return _width; }
+		inline unsigned int height() { return _height; }
+		inline void setWidth( unsigned int width ) { _width = width; }
+		inline void setHeight( unsigned int height ) { _height = height; }
+		
 		void updateGL();
 		void makeCurrent();
 	
 	// not-inherited
-		void setSceneBoundingBox(const Vec& min, const Vec& max);
 		void saveSnapshot(bool b);
 		void setStateFileName(const string& name);
 	
@@ -91,7 +93,7 @@ public:
 		Camera * _camera;
 
 protected:
-	real _width, _height;
+	unsigned int _width, _height;
 	Vec _min,_max;
 	string stateFileName_;
 
@@ -306,7 +308,7 @@ public:
 	Vec max_(_ModelRootNode->bbox().getMax()[0],
     			_ModelRootNode->bbox().getMax()[1],
     			_ModelRootNode->bbox().getMax()[2]);
-    setSceneBoundingBox(min_, max_);
+    _camera->setSceneBoundingBox(min_, max_);
     _camera->showEntireScene();
   }
   
diff --git a/source/blender/freestyle/intern/app_blender/api.cpp b/source/blender/freestyle/intern/app_blender/api.cpp
index 5f3d8224ec5..eb29580f891 100644
--- a/source/blender/freestyle/intern/app_blender/api.cpp
+++ b/source/blender/freestyle/intern/app_blender/api.cpp
@@ -20,7 +20,9 @@ extern "C" {
 		AppGLWidget *view = new AppGLWidget;
 		
 		c->SetView(view);
-	
+		view->setWidth(640);
+		view->setHeight(640);
+		
 		c->Load3DSFile( TEST_3DS_FILE );
 		
 		c->InsertStyleModule( 0, TEST_STYLE_MODULE_FILE );
diff --git a/source/blender/freestyle/intern/rendering/GLStrokeRenderer.cpp b/source/blender/freestyle/intern/rendering/GLStrokeRenderer.cpp
index c29ba759139..94518cee58f 100755
--- a/source/blender/freestyle/intern/rendering/GLStrokeRenderer.cpp
+++ b/source/blender/freestyle/intern/rendering/GLStrokeRenderer.cpp
@@ -368,11 +368,13 @@ GLTextureManager::prepareTextureAlpha (string sname, GLuint itexname)
 	BLI_splitdirstring(name, filename);
 
 //soc  if (qim.isNull()) 
-	if( qim )
+  if (!qim) //soc 
     {
       cerr << "  Error: unable to read \"" << filename << "\"" << endl;
+	IMB_freeImBuf(qim);
       return false;
     }
+
   if( qim->depth > 8) //soc
     {
       cerr<<"  Error: \""<< filename <<"\" has "<< qim->depth <<" bits/pixel"<<endl; //soc
@@ -416,9 +418,10 @@ GLTextureManager::prepareTextureLuminance (string sname, GLuint itexname)
 	char filename[FILE_MAXFILE];
 	BLI_splitdirstring(name, filename);
 	
-  if (!qim) //soc
+  if (!qim) //soc 
     {
       cerr << "  Error: unable to read \"" << filename << "\"" << endl;
+	IMB_freeImBuf(qim);
       return false;
     }
   if (qim->depth > 8) //soc
@@ -463,11 +466,13 @@ GLTextureManager::prepareTextureLuminanceAndAlpha (string sname, GLuint itexname
 	char filename[FILE_MAXFILE];
 	BLI_splitdirstring(name, filename);
 
-  if (!qim) //soc
+  if (!qim) //soc 
     {
       cerr << "  Error: unable to read \"" << filename << "\"" << endl;
+	IMB_freeImBuf(qim);
       return false;
     }
+
   if (qim->depth > 8) //soc
     {
       cerr<<"  Error: \""<<filename<<"\" has "<< qim->depth <<" bits/pixel"<<endl; //soc
@@ -508,19 +513,24 @@ GLTextureManager::preparePaper (const char *name, GLuint itexname)
 	ImBuf *qim = IMB_loadiffname(name, 0);
 	char filename[FILE_MAXFILE];
 	BLI_splitdirstring((char *)name, filename);
+	qim->depth = 32;
 
   if (!qim) //soc 
     {
       cerr << "  Error: unable to read \"" << filename << "\"" << endl;
+	IMB_freeImBuf(qim);
       return false;
     }
 
-  if (qim->depth !=32) //soc
-    {
-      cerr<<"  Error: \""<<filename<<"\" has "<<qim->depth<<" bits/pixel"<<endl; //soc
-      return false;
-    }
-  //soc QImage qim2=QGLWidget::convertToGLFormat( qim );
+	//soc: no test because IMB_loadiffname creates 32 bit image directly
+	//
+	//   if (qim->depth != 32) 
+	//     {
+	//       cerr<<"  Error: \""<<filename<<"\" has "<< qim->depth <<" bits/pixel"<<endl; //soc
+	// IMB_freeImBuf(qim);
+	//       return false;
+	//     }
+	// QImage qim2=QGLWidget::convertToGLFormat( qim );
 
   glBindTexture(GL_TEXTURE_2D, itexname);
 	
@@ -532,10 +542,10 @@ GLTextureManager::preparePaper (const char *name, GLuint itexname)
 		  GL_LINEAR);     
 
   glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, qim->x, qim->y, 0, 
-	       GL_RGBA, GL_UNSIGNED_BYTE, qim->rect);	//soc: here qim->rect, not qim2->rect, used
+	       GL_RGBA, GL_UNSIGNED_BYTE, qim->rect); // soc: was qim2
 
   //cout << "  \"" << filename.toAscii().data() << "\" loaded with "<< qim.depth() << " bits per pixel" << endl;
-	cout << "  \"" << StringUtils::toAscii(filename) << "\" loaded with "<< qim->depth << " bits per pixel" << endl;
+	cout << "  \"" << StringUtils::toAscii(filename) << "\" loaded with 32 bits per pixel" << endl;
   return true;
 }
 

From 9a6302e10994e45a2ec8a419bda5e1735c8e0799 Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Thu, 29 May 2008 00:27:09 +0000
Subject: [PATCH 027/252] soc-2008-mxcurioni: First render ! It should render
 the teapot upside down on a black background. The correction was made by
 following Yafray's rendering and display implementation, which is very clear.

---
 source/blender/freestyle/FST_freestyle.h      |  2 +-
 source/blender/freestyle/SConscript           |  3 +-
 .../freestyle/intern/app_blender/api.cpp      | 44 +++++++++++++++++--
 .../intern/rendering/GLStrokeRenderer.cpp     |  1 -
 .../blender/render/intern/source/pipeline.c   | 10 ++++-
 5 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/source/blender/freestyle/FST_freestyle.h b/source/blender/freestyle/FST_freestyle.h
index 52940815fe4..1f516078258 100644
--- a/source/blender/freestyle/FST_freestyle.h
+++ b/source/blender/freestyle/FST_freestyle.h
@@ -5,7 +5,7 @@
 extern "C" {
 #endif	
 	
-	void FRS_execute();
+	void FRS_execute(Render* re);
 
 #ifdef __cplusplus
 }
diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript
index 58d4e980e8b..33bc9682bbe 100644
--- a/source/blender/freestyle/SConscript
+++ b/source/blender/freestyle/SConscript
@@ -6,7 +6,8 @@ sources = []
 defs = []
 incs = ''
 
-incs += '../blenkernel ../blenlib ../imbuf ../makesdna ../python'
+incs += '../blenkernel ../blenlib ../imbuf ../makesdna ../python '
+incs += '../render/extern/include ../render/intern/include'
 incs += ' #/extern/freestyle/lib3ds' 
 incs += ' ' + env['BF_PYTHON_INC']
 incs += ' ' + env['BF_LIB3DS_INC']
diff --git a/source/blender/freestyle/intern/app_blender/api.cpp b/source/blender/freestyle/intern/app_blender/api.cpp
index eb29580f891..d842e59d31b 100644
--- a/source/blender/freestyle/intern/app_blender/api.cpp
+++ b/source/blender/freestyle/intern/app_blender/api.cpp
@@ -6,13 +6,26 @@
 
 #include <iostream>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "render_types.h"
+//#include "renderdatabase.h"
+/* display_draw() needs render layer info */
+#include "renderpipeline.h"
+
+#ifdef __cplusplus
+}
+#endif
+
 using namespace std;
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-	void FRS_execute() {
+	void FRS_execute(Render* re) {
 		cout << "Freestyle start" << endl;
 	
 		Config::Path pathconfig;
@@ -20,16 +33,39 @@ extern "C" {
 		AppGLWidget *view = new AppGLWidget;
 		
 		c->SetView(view);
-		view->setWidth(640);
-		view->setHeight(640);
+		unsigned int width = re->winx;
+		unsigned int height = re->winy;
+		view->setWidth(width);
+		view->setHeight(height);
 		
 		c->Load3DSFile( TEST_3DS_FILE );
 		
 		c->InsertStyleModule( 0, TEST_STYLE_MODULE_FILE );
 		c->toggleLayer(0, true);
 		c->ComputeViewMap();
-		 
+		
 		c->DrawStrokes();
+
+		RenderResult rres;
+		RE_GetResultImage(re, &rres);
+		float *rgb = new float[3*width*height];
+		view->readPixels(0,0,width,height,AppGLWidget::RGB, rgb);
+		
+		for (unsigned short y=0; y<height; y++) {
+			float* bpt = (float*)rres.rectf + ((y*width) << 2);			
+			for (unsigned short x=0; x<width; x++) {
+				float *pos = rgb + 3 * ( y*width + x );
+				
+				bpt[0] = pos[0]; // r
+				bpt[1] = pos[1]; // g
+				bpt[2] = pos[2]; // b
+				bpt[3] = 1.0; // a
+				bpt += 4;
+			}
+		}
+		
+		re->result->renlay = render_get_active_layer(re, re->result);
+		re->display_draw(re->result, NULL);
 		
 		cout << "Freestyle end" << endl;
 
diff --git a/source/blender/freestyle/intern/rendering/GLStrokeRenderer.cpp b/source/blender/freestyle/intern/rendering/GLStrokeRenderer.cpp
index 94518cee58f..5033cc5d895 100755
--- a/source/blender/freestyle/intern/rendering/GLStrokeRenderer.cpp
+++ b/source/blender/freestyle/intern/rendering/GLStrokeRenderer.cpp
@@ -513,7 +513,6 @@ GLTextureManager::preparePaper (const char *name, GLuint itexname)
 	ImBuf *qim = IMB_loadiffname(name, 0);
 	char filename[FILE_MAXFILE];
 	BLI_splitdirstring((char *)name, filename);
-	qim->depth = 32;
 
   if (!qim) //soc 
     {
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 27abbf96122..d45dd77fe1e 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -2193,7 +2193,15 @@ static void do_render_composite_fields_blur_3d(Render *re)
 
 static void freestyleRender(Render *re)
 {
-	FRS_execute();
+	RE_FreeRenderResult(re->result);
+	re->result= new_render_result(re, &re->disprect, 0, RR_USEMEM);
+	
+	RE_SetCamera(re, re->scene->camera);
+	
+	FRS_execute(re);
+	
+	re->stats_draw(&re->i);
+	RE_Database_Free(re);
 }
 
 #ifndef DISABLE_YAFRAY

From 4b7174a6dd18d83b4d359f3e86df8a6f7a6edd7a Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Thu, 29 May 2008 02:31:36 +0000
Subject: [PATCH 028/252] soc-2008-mxcurioni: updated SConscript file for SWIG
 module compilation and linking under Linux

---
 source/blender/freestyle/SConscript                 | 13 ++++++++++---
 .../intern/app_blender/AppGLWidget_point.h          |  2 +-
 .../freestyle/intern/app_blender/test_config.h      |  3 +--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript
index 33bc9682bbe..c9a77919f4f 100644
--- a/source/blender/freestyle/SConscript
+++ b/source/blender/freestyle/SConscript
@@ -74,11 +74,18 @@ env.BlenderLib (libname="bf_freestyle",
 ########################################################
 #	swig
 #
-# 	Run the following two commands in the source/blender/freestyle/intern/swig directory.
+# 	1] Run the following two commands in the source/blender/freestyle/intern/swig directory.
 #
-#	Replace /Users/mx/Documents/work/GSoC_2008/bf-blender/branches/build/darwin/lib to the path
+#	2] Replace /Users/mx/Documents/work/GSoC_2008/bf-blender/branches/build/darwin/lib to the path
 #	of your library directory (used to locate libbf_freestyle.a)
+#
+#   3] Replace the python directories to suit your config
 
 # g++ -w  -I../geometry -I../image -I../scene_graph -I../stroke -I../system -I../view_map -I../winged_edge -I/usr/include/python2.5 -I../../../blenlib -I../../../blenkernel -I../../../imbuf -I../../../makesdna -c ModuleWrapper.cpp -o ModuleWrapper.o
 
-# g++ -bundle -flat_namespace -undefined suppress  -w  -L/usr/lib/python2.5/config -L/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/build/darwin/lib -lpython2.5 -lbf_freestyle -o ../../python/_Freestyle.so ModuleWrapper.o
\ No newline at end of file
+###########  Mac OS X ###########
+# g++ -bundle -flat_namespace -undefined suppress  -w  -L/usr/lib/python2.5/config -L/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/build/darwin/lib -lpython2.5 -lbf_freestyle -o ../../python/_Freestyle.so ModuleWrapper.o
+
+###########  Linux  ###########
+# g++ -shared -w  -L/usr/lib/python2.5/config -L/home/joe/bf_blender_freestyle/build/linux2/lib  -lpython2.5 -lbf_freestyle -o ../../python/_Freestyle.so ModuleWrapper.o
+
diff --git a/source/blender/freestyle/intern/app_blender/AppGLWidget_point.h b/source/blender/freestyle/intern/app_blender/AppGLWidget_point.h
index 81903f174a8..4250922239d 100644
--- a/source/blender/freestyle/intern/app_blender/AppGLWidget_point.h
+++ b/source/blender/freestyle/intern/app_blender/AppGLWidget_point.h
@@ -156,4 +156,4 @@ inline const Point operator/( const Point &p, double c )
     return Point((QCOORD)(p.xp/c), (QCOORD)(p.yp/c));
 }
 
-#endif // POINT_H
\ No newline at end of file
+#endif // POINT_H
diff --git a/source/blender/freestyle/intern/app_blender/test_config.h b/source/blender/freestyle/intern/app_blender/test_config.h
index 98239f279f3..6507050a4e4 100644
--- a/source/blender/freestyle/intern/app_blender/test_config.h
+++ b/source/blender/freestyle/intern/app_blender/test_config.h
@@ -5,5 +5,4 @@
 
 #define TEST_ROOT_DIR "/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/soc-2008-mxcurioni/source/blender/freestyle"
 
-
-#define TEST_TEXTURE_FILE "/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/soc-2008-mxcurioni/source/blender/freestyle/data/textures/papers/whitepaper.jpg"
\ No newline at end of file
+#define TEST_TEXTURE_FILE "/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/soc-2008-mxcurioni/source/blender/freestyle/data/textures/papers/whitepaper.jpg"

From f3966dda4e0a03c16206cfbf176f222e13a784c1 Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Thu, 29 May 2008 09:00:49 +0000
Subject: [PATCH 029/252] soc-2008-mxcurioni: made the image rendering faster
 by reading the frame buffer directly into the RenderResult's ImBuf structure,
 removing the need to copy it manually

---
 .../intern/app_blender/AppGLWidget.h          |  4 +++
 .../freestyle/intern/app_blender/api.cpp      | 32 +++++++++++--------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/source/blender/freestyle/intern/app_blender/AppGLWidget.h b/source/blender/freestyle/intern/app_blender/AppGLWidget.h
index 15238ba6269..eb233bfcb7d 100755
--- a/source/blender/freestyle/intern/app_blender/AppGLWidget.h
+++ b/source/blender/freestyle/intern/app_blender/AppGLWidget.h
@@ -329,6 +329,7 @@ public:
 
   /*! glReadPixels */
   typedef enum{
+	RGBA,
     RGB,
     DEPTH
   } PixelFormat;
@@ -345,6 +346,9 @@ public:
     GLenum glformat;
     switch(format)
     {
+	    case RGBA:
+	      glformat = GL_RGBA;
+	      break;
     case RGB:
       glformat = GL_RGB;
       break;
diff --git a/source/blender/freestyle/intern/app_blender/api.cpp b/source/blender/freestyle/intern/app_blender/api.cpp
index d842e59d31b..906522b059e 100644
--- a/source/blender/freestyle/intern/app_blender/api.cpp
+++ b/source/blender/freestyle/intern/app_blender/api.cpp
@@ -48,21 +48,25 @@ extern "C" {
 
 		RenderResult rres;
 		RE_GetResultImage(re, &rres);
-		float *rgb = new float[3*width*height];
-		view->readPixels(0,0,width,height,AppGLWidget::RGB, rgb);
+		view->readPixels(0,0,width,height,AppGLWidget::RGBA, rres.rectf );
+		
+		// float *rgb = new float[3*width*height];
+		// view->readPixels(0,0,width,height,AppGLWidget::RGB, rgb);
+		// 
+		// for (unsigned short y=0; y<height; y++) {
+		// 	float* bpt = (float*)rres.rectf + ((y*width) << 2);			
+		// 	for (unsigned short x=0; x<width; x++) {
+		// 		float *pos = rgb + 3 * ( y*width + x );
+		// 		
+		// 		bpt[0] = pos[0]; // r
+		// 		bpt[1] = pos[1]; // g
+		// 		bpt[2] = pos[2]; // b
+		// 		bpt[3] = 1.0; // a
+		// 		bpt += 4;
+		// 	}
+		// }
+		// 
 		
-		for (unsigned short y=0; y<height; y++) {
-			float* bpt = (float*)rres.rectf + ((y*width) << 2);			
-			for (unsigned short x=0; x<width; x++) {
-				float *pos = rgb + 3 * ( y*width + x );
-				
-				bpt[0] = pos[0]; // r
-				bpt[1] = pos[1]; // g
-				bpt[2] = pos[2]; // b
-				bpt[3] = 1.0; // a
-				bpt += 4;
-			}
-		}
 		
 		re->result->renlay = render_get_active_layer(re, re->result);
 		re->display_draw(re->result, NULL);

From be2b832db7652afe9a6ce9a05da7420d12ac8916 Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Thu, 29 May 2008 11:41:06 +0000
Subject: [PATCH 030/252] soc-mx-curioni: resolved the rendering issue. In the
 previous steps, I was only rendering the strokes, not the toatl scene
 (explaining why the render color was being inverted). i added a call to the
 view's draw() method. Now, the rendering steps are complete and display both
 the object and the silhouette.

---
 .../intern/app_blender/AppCanvas.cpp          |  1 +
 .../intern/app_blender/AppGLWidget.h          |  4 ++-
 .../intern/app_blender/Controller.cpp         | 12 ---------
 .../freestyle/intern/app_blender/api.cpp      | 26 +++----------------
 .../blender/render/intern/source/pipeline.c   |  2 +-
 5 files changed, 9 insertions(+), 36 deletions(-)

diff --git a/source/blender/freestyle/intern/app_blender/AppCanvas.cpp b/source/blender/freestyle/intern/app_blender/AppCanvas.cpp
index 98013cf18d4..f82d136b525 100755
--- a/source/blender/freestyle/intern/app_blender/AppCanvas.cpp
+++ b/source/blender/freestyle/intern/app_blender/AppCanvas.cpp
@@ -306,6 +306,7 @@ void AppCanvas::Render(const StrokeRenderer *iRenderer)
   glBlendFunc(GL_SRC_ALPHA, GL_ONE);
   
   glEnable(GL_TEXTURE_2D);
+
   Canvas::Render(iRenderer);
   //  
   glPushAttrib(GL_COLOR_BUFFER_BIT);
diff --git a/source/blender/freestyle/intern/app_blender/AppGLWidget.h b/source/blender/freestyle/intern/app_blender/AppGLWidget.h
index eb233bfcb7d..319fc248494 100755
--- a/source/blender/freestyle/intern/app_blender/AppGLWidget.h
+++ b/source/blender/freestyle/intern/app_blender/AppGLWidget.h
@@ -435,9 +435,11 @@ public:
   static void setBackBufferFlag(bool iBool);
   static bool getBackBufferFlag();
 
+public:
+  virtual void    draw();
+
 protected:
   virtual void	  init();
-  virtual void    draw();
 
   /*! Loads an envmap */
   void LoadEnvMap(const char *filename);
diff --git a/source/blender/freestyle/intern/app_blender/Controller.cpp b/source/blender/freestyle/intern/app_blender/Controller.cpp
index bd234746e2b..8b494ff5108 100755
--- a/source/blender/freestyle/intern/app_blender/Controller.cpp
+++ b/source/blender/freestyle/intern/app_blender/Controller.cpp
@@ -1063,18 +1063,6 @@ void Controller::init_options(){
 
 	Config::Path * cpath = Config::Path::getInstance();
 
-    // const string& getProjectDir() const {return _ProjectDir;}
-    // const string& getModelsPath() const {return _ModelsPath;}
-    // const string& getPatternsPath() const {return _PatternsPath;}
-    // const string& getBrushesPath() const {return _BrushesPath;}
-    // const string& getPythonPath() const {return _PythonPath;}
-    // const string& getBrowserCmd() const {return _BrowserCmd;}
-    // const string& getHelpIndexpath() const {return _HelpIndexPath;}
-    // const string& getPapersDir() const {return _PapersDir;}
-    // const string& getEnvMapDir() const {return _EnvMapDir;}
-    // const string& getMapsDir() const {return _MapsDir;}
-    // const string& getHomeDir() const {return _HomeDir;}
-
 	// Directories
 	ViewMapIO::Options::setModelsPath( StringUtils::toAscii( cpath->getModelsPath() ) ); 
 	PythonInterpreter::Options::setPythonPath( StringUtils::toAscii( cpath->getPythonPath() ) );
diff --git a/source/blender/freestyle/intern/app_blender/api.cpp b/source/blender/freestyle/intern/app_blender/api.cpp
index 906522b059e..a021e30a6e5 100644
--- a/source/blender/freestyle/intern/app_blender/api.cpp
+++ b/source/blender/freestyle/intern/app_blender/api.cpp
@@ -44,30 +44,12 @@ extern "C" {
 		c->toggleLayer(0, true);
 		c->ComputeViewMap();
 		
-		c->DrawStrokes();
-
+		c->DrawStrokes(); // build strokes
+		view->draw(); // render final result
+		
 		RenderResult rres;
 		RE_GetResultImage(re, &rres);
-		view->readPixels(0,0,width,height,AppGLWidget::RGBA, rres.rectf );
-		
-		// float *rgb = new float[3*width*height];
-		// view->readPixels(0,0,width,height,AppGLWidget::RGB, rgb);
-		// 
-		// for (unsigned short y=0; y<height; y++) {
-		// 	float* bpt = (float*)rres.rectf + ((y*width) << 2);			
-		// 	for (unsigned short x=0; x<width; x++) {
-		// 		float *pos = rgb + 3 * ( y*width + x );
-		// 		
-		// 		bpt[0] = pos[0]; // r
-		// 		bpt[1] = pos[1]; // g
-		// 		bpt[2] = pos[2]; // b
-		// 		bpt[3] = 1.0; // a
-		// 		bpt += 4;
-		// 	}
-		// }
-		// 
-		
-		
+		view->readPixels(0,0,width,height,AppGLWidget::RGBA, rres.rectf );		
 		re->result->renlay = render_get_active_layer(re, re->result);
 		re->display_draw(re->result, NULL);
 		
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index d45dd77fe1e..88998199452 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -2194,7 +2194,7 @@ static void do_render_composite_fields_blur_3d(Render *re)
 static void freestyleRender(Render *re)
 {
 	RE_FreeRenderResult(re->result);
-	re->result= new_render_result(re, &re->disprect, 0, RR_USEMEM);
+	re->result = new_render_result(re, &re->disprect, 0, RR_USEMEM);
 	
 	RE_SetCamera(re, re->scene->camera);
 	

From 08750f66a46979cf6f5830068fba69f61e31fe2d Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Fri, 30 May 2008 17:42:02 +0000
Subject: [PATCH 031/252] Retargetting

More refined symmetry grouping (can take care of tails properly) and better matching between symmetry groups (based on relative length of arcs)
---
 source/blender/blenlib/BLI_graph.h    |   2 +
 source/blender/blenlib/intern/graph.c | 342 ++++++++++++++++++--------
 source/blender/include/reeb.h         |   1 +
 source/blender/src/autoarmature.c     |  16 +-
 source/blender/src/reeb.c             |  40 +++
 5 files changed, 295 insertions(+), 106 deletions(-)

diff --git a/source/blender/blenlib/BLI_graph.h b/source/blender/blenlib/BLI_graph.h
index 1d29cc88651..0763c7edff0 100644
--- a/source/blender/blenlib/BLI_graph.h
+++ b/source/blender/blenlib/BLI_graph.h
@@ -52,6 +52,7 @@ typedef struct BArc {
 	float length;
 
 	int symmetry_level;
+	int symmetry_group;
 	int symmetry_flag;
 } BArc;
 
@@ -98,5 +99,6 @@ void BLI_mirrorAlongAxis(float v[3], float center[3], float axis[3]);
  * axial symetry sides */
 #define SYM_SIDE_POSITIVE		1
 #define SYM_SIDE_NEGATIVE		2
+/* Anything higher is the order in radial symmetry */
 
 #endif /*BLI_GRAPH_H_*/
diff --git a/source/blender/blenlib/intern/graph.c b/source/blender/blenlib/intern/graph.c
index 3a484e15642..6e9dcc66ffc 100644
--- a/source/blender/blenlib/intern/graph.c
+++ b/source/blender/blenlib/intern/graph.c
@@ -23,6 +23,9 @@
  * graph.c: Common graph interface and methods
  */
 
+#include <float.h> 
+#include <math.h>
+
 #include "MEM_guardedalloc.h"
 
 #include "BLI_graph.h"
@@ -31,6 +34,12 @@
 
 #include "BKE_utildefines.h"
 
+static void testRadialSymmetry(BGraph *graph, BNode* root_node, RadialArc* ring, int total, float axis[3], float limit, int group);
+
+static void handleAxialSymmetry(BGraph *graph, BNode *root_node, int depth, float axis[3], float limit);
+static void testAxialSymmetry(BGraph *graph, BNode* root_node, BNode* node1, BNode* node2, BArc* arc1, BArc* arc2, float axis[3], float limit, int group);
+static void flagAxialSymmetry(BNode *root_node, BNode *end_node, BArc *arc, int group);
+
 void BLI_freeNode(BGraph *graph, BNode *node)
 {
 	if (node->arcs)
@@ -280,64 +289,19 @@ void BLI_mirrorAlongAxis(float v[3], float center[3], float axis[3])
 	VecAddf(v, v, pv);
 }
 
-static void markRadialSymmetry(BGraph *graph, BNode *node, int depth, float axis[3], float limit)
+static void testRadialSymmetry(BGraph *graph, BNode* root_node, RadialArc* ring, int total, float axis[3], float limit, int group)
 {
-	RadialArc *ring = NULL;
-	RadialArc *unit;
 	int symmetric = 1;
-	int count = 0;
 	int i;
-
-	/* mark topological symmetry */
-	node->symmetry_flag |= SYM_TOPOLOGICAL;
-
-	/* count the number of arcs in the symmetry ring */
-	for (i = 0; i < node->degree; i++)
+	
+	/* sort ring by angle */
+	for (i = 0; i < total - 1; i++)
 	{
-		BArc *connectedArc = node->arcs[i];
-		
-		/* depth is store as a negative in flag. symmetry level is positive */
-		if (connectedArc->symmetry_level == -depth)
-		{
-			count++;
-		}
-	}
-
-	ring = MEM_callocN(sizeof(RadialArc) * count, "radial symmetry ring");
-	unit = ring;
-
-	/* fill in the ring */
-	for (unit = ring, i = 0; i < node->degree; i++)
-	{
-		BArc *connectedArc = node->arcs[i];
-		
-		/* depth is store as a negative in flag. symmetry level is positive */
-		if (connectedArc->symmetry_level == -depth)
-		{
-			BNode *otherNode = BLI_otherNode(connectedArc, node);
-			float vec[3];
-
-			unit->arc = connectedArc;
-
-			/* project the node to node vector on the symmetry plane */
-			VecSubf(unit->n, otherNode->p, node->p);
-			Projf(vec, unit->n, axis);
-			VecSubf(unit->n, unit->n, vec);
-
-			Normalize(unit->n);
-
-			unit++;
-		}
-	}
-
-	/* sort ring */
-	for (i = 0; i < count - 1; i++)
-	{
-		float minAngle = 3; /* arbitrary high value, higher than 2, at least */
+		float minAngle = FLT_MAX;
 		int minIndex = -1;
 		int j;
 
-		for (j = i + 1; j < count; j++)
+		for (j = i + 1; j < total; j++)
 		{
 			float angle = Inpf(ring[i].n, ring[j].n);
 
@@ -364,22 +328,22 @@ static void markRadialSymmetry(BGraph *graph, BNode *node, int depth, float axis
 		}
 	}
 
-	for (i = 0; i < count && symmetric; i++)
+	for (i = 0; i < total && symmetric; i++)
 	{
 		BNode *node1, *node2;
 		float tangent[3];
 		float normal[3];
 		float p[3];
-		int j = (i + 1) % count; /* next arc in the circular list */
+		int j = (i + 1) % total; /* next arc in the circular list */
 
 		VecAddf(tangent, ring[i].n, ring[j].n);
 		Crossf(normal, tangent, axis);
 		
-		node1 = BLI_otherNode(ring[i].arc, node);
-		node2 = BLI_otherNode(ring[j].arc, node);
+		node1 = BLI_otherNode(ring[i].arc, root_node);
+		node2 = BLI_otherNode(ring[j].arc, root_node);
 
 		VECCOPY(p, node2->p);
-		BLI_mirrorAlongAxis(p, node->p, normal);
+		BLI_mirrorAlongAxis(p, root_node->p, normal);
 		
 		/* check if it's within limit before continuing */
 		if (VecLenf(node1->p, p) > limit)
@@ -392,23 +356,192 @@ static void markRadialSymmetry(BGraph *graph, BNode *node, int depth, float axis
 	if (symmetric)
 	{
 		/* mark node as symmetric physically */
-		VECCOPY(node->symmetry_axis, axis);
-		node->symmetry_flag |= SYM_PHYSICAL;
-		node->symmetry_flag |= SYM_RADIAL;
+		VECCOPY(root_node->symmetry_axis, axis);
+		root_node->symmetry_flag |= SYM_PHYSICAL;
+		root_node->symmetry_flag |= SYM_RADIAL;
 		
+		/* FLAG SYMMETRY GROUP */
+		for (i = 0; i < total; i++)
+		{
+			ring[i].arc->symmetry_group = group;
+			ring[i].arc->symmetry_flag = i;
+		}
+
 		if (graph->radial_symmetry)
 		{
-			graph->radial_symmetry(node, ring, count);
+			graph->radial_symmetry(root_node, ring, total);
 		}
 	}
+}
+
+static void handleRadialSymmetry(BGraph *graph, BNode *root_node, int depth, float axis[3], float limit)
+{
+	RadialArc *ring = NULL;
+	RadialArc *unit;
+	int total = 0;
+	int group;
+	int first;
+	int i;
+
+	/* mark topological symmetry */
+	root_node->symmetry_flag |= SYM_TOPOLOGICAL;
+
+	/* total the number of arcs in the symmetry ring */
+	for (i = 0; i < root_node->degree; i++)
+	{
+		BArc *connectedArc = root_node->arcs[i];
+		
+		/* depth is store as a negative in flag. symmetry level is positive */
+		if (connectedArc->symmetry_level == -depth)
+		{
+			total++;
+		}
+	}
+
+	ring = MEM_callocN(sizeof(RadialArc) * total, "radial symmetry ring");
+	unit = ring;
+
+	/* fill in the ring */
+	for (unit = ring, i = 0; i < root_node->degree; i++)
+	{
+		BArc *connectedArc = root_node->arcs[i];
+		
+		/* depth is store as a negative in flag. symmetry level is positive */
+		if (connectedArc->symmetry_level == -depth)
+		{
+			BNode *otherNode = BLI_otherNode(connectedArc, root_node);
+			float vec[3];
+
+			unit->arc = connectedArc;
+
+			/* project the node to node vector on the symmetry plane */
+			VecSubf(unit->n, otherNode->p, root_node->p);
+			Projf(vec, unit->n, axis);
+			VecSubf(unit->n, unit->n, vec);
+
+			Normalize(unit->n);
+
+			unit++;
+		}
+	}
+
+	/* sort ring by arc length
+	 * using a rather bogus insertion sort
+	 * butrings will never get too big to matter
+	 * */
+	for (i = 0; i < total; i++)
+	{
+		int j;
+
+		for (j = i - 1; j >= 0; j--)
+		{
+			BArc *arc1, *arc2;
+			
+			arc1 = ring[j].arc;
+			arc2 = ring[j + 1].arc;
+			
+			if (arc1->length > arc2->length)
+			{
+				/* swap with smaller */
+				RadialArc tmp;
+				tmp = ring[j + 1];
+				ring[j + 1] = ring[j];
+				ring[j] = tmp;
+			}
+			else
+			{
+				break;
+			}
+		}
+	}
+
+	/* Dispatch to specific symmetry tests */
+	first = 0;
+	group = 0;
+	
+	for (i = 1; i < total; i++)
+	{
+		int dispatch = 0;
+		int last = i - 1;
+		
+		if (fabs(ring[first].arc->length - ring[i].arc->length) > limit)
+		{
+			dispatch = 1;
+		}
+
+		/* if not dispatching already and on last arc
+		 * Dispatch using current arc as last
+		 * */		
+		if (dispatch == 0 && i == total - 1)
+		{
+			last = i;
+			dispatch = 1;
+		} 
+		
+		if (dispatch)
+		{
+			int sub_total = last - first + 1; 
+
+			group += 1;
+
+			if (sub_total == 1)
+			{
+				printf("no dispatch\n");
+				/* NOTHING TO DO */
+			}
+			else if (sub_total == 2)
+			{
+				BArc *arc1, *arc2;
+				BNode *node1, *node2;
+				
+				printf("dispatch axial\n");
+
+				arc1 = ring[first].arc;
+				arc2 = ring[last].arc;
+				
+				node1 = BLI_otherNode(arc1, root_node);
+				node2 = BLI_otherNode(arc2, root_node);
+				
+				testAxialSymmetry(graph, root_node, node1, node2, arc1, arc2, axis, limit, group);
+			}
+			else if (sub_total != total) /* allocate a new sub ring if needed */
+			{
+				RadialArc *sub_ring = MEM_callocN(sizeof(RadialArc) * sub_total, "radial symmetry ring");
+				int sub_i;
+				
+				printf("dispatch radial sub ring\n");
+
+				/* fill in the sub ring */
+				for (sub_i = 0; sub_i < sub_total; sub_i++)
+				{
+					sub_ring[sub_i] = ring[first + sub_i];
+				}
+				
+				testRadialSymmetry(graph, root_node, sub_ring, sub_total, axis, limit, group);
+			
+				MEM_freeN(sub_ring);
+			}
+			else if (sub_total == total)
+			{
+				printf("dispatch radial full ring\n");
+
+				testRadialSymmetry(graph, root_node, ring, total, axis, limit, group);
+			}
+			
+			first = i;
+		}
+	}
+
 
 	MEM_freeN(ring);
 }
 
-static void setSideAxialSymmetry(BNode *root_node, BNode *end_node, BArc *arc)
+static void flagAxialSymmetry(BNode *root_node, BNode *end_node, BArc *arc, int group)
 {
 	float vec[3];
 	
+	arc->symmetry_group = group;
+	
 	VecSubf(vec, end_node->p, root_node->p);
 	
 	if (Inpf(vec, root_node->symmetry_axis) < 0)
@@ -421,20 +554,54 @@ static void setSideAxialSymmetry(BNode *root_node, BNode *end_node, BArc *arc)
 	}
 }
 
-static void markAxialSymmetry(BGraph *graph, BNode *node, int depth, float axis[3], float limit)
+static void testAxialSymmetry(BGraph *graph, BNode* root_node, BNode* node1, BNode* node2, BArc* arc1, BArc* arc2, float axis[3], float limit, int group)
 {
-	BArc *arc1 = NULL;
-	BArc *arc2 = NULL;
-	BNode *node1 = NULL, *node2 = NULL;
 	float nor[3], vec[3], p[3];
+
+	VecSubf(vec, node1->p, root_node->p);
+	Normalize(vec);
+	VecSubf(p, root_node->p, node2->p);
+	Normalize(p);
+	VecAddf(p, p, vec);
+
+	Crossf(vec, p, axis);
+	Crossf(nor, vec, axis);
+	
+	/* mirror node2 along axis */
+	VECCOPY(p, node2->p);
+	BLI_mirrorAlongAxis(p, root_node->p, nor);
+	
+	/* check if it's within limit before continuing */
+	if (VecLenf(node1->p, p) <= limit)
+	{
+		/* mark node as symmetric physically */
+		VECCOPY(root_node->symmetry_axis, nor);
+		root_node->symmetry_flag |= SYM_PHYSICAL;
+		root_node->symmetry_flag |= SYM_AXIAL;
+
+		/* flag side on arcs */
+		flagAxialSymmetry(root_node, node1, arc1, group);
+		flagAxialSymmetry(root_node, node2, arc2, group);
+		
+		if (graph->axial_symmetry)
+		{
+			graph->axial_symmetry(root_node, node1, node2, arc1, arc2);
+		}
+	}
+}
+
+static void handleAxialSymmetry(BGraph *graph, BNode *root_node, int depth, float axis[3], float limit)
+{
+	BArc *arc1 = NULL, *arc2 = NULL;
+	BNode *node1 = NULL, *node2 = NULL;
 	int i;
 	
 	/* mark topological symmetry */
-	node->symmetry_flag |= SYM_TOPOLOGICAL;
+	root_node->symmetry_flag |= SYM_TOPOLOGICAL;
 
-	for (i = 0; i < node->degree; i++)
+	for (i = 0; i < root_node->degree; i++)
 	{
-		BArc *connectedArc = node->arcs[i];
+		BArc *connectedArc = root_node->arcs[i];
 		
 		/* depth is store as a negative in flag. symmetry level is positive */
 		if (connectedArc->symmetry_level == -depth)
@@ -442,12 +609,12 @@ static void markAxialSymmetry(BGraph *graph, BNode *node, int depth, float axis[
 			if (arc1 == NULL)
 			{
 				arc1 = connectedArc;
-				node1 = BLI_otherNode(arc1, node);
+				node1 = BLI_otherNode(arc1, root_node);
 			}
 			else
 			{
 				arc2 = connectedArc;
-				node2 = BLI_otherNode(arc2, node);
+				node2 = BLI_otherNode(arc2, root_node);
 				break; /* Can stop now, the two arcs have been found */
 			}
 		}
@@ -459,36 +626,9 @@ static void markAxialSymmetry(BGraph *graph, BNode *node, int depth, float axis[
 		return;
 	}
 	
-	VecSubf(vec, node1->p, node->p);
-	Normalize(vec);
-	VecSubf(p, node->p, node2->p);
-	Normalize(p);
-	VecAddf(p, p, vec);
-
-	Crossf(vec, p, axis);
-	Crossf(nor, vec, axis);
+	printf("symmetry length %f <> %f\n", arc1->length, arc2->length);
 	
-	/* mirror node2 along axis */
-	VECCOPY(p, node2->p);
-	BLI_mirrorAlongAxis(p, node->p, nor);
-	
-	/* check if it's within limit before continuing */
-	if (VecLenf(node1->p, p) <= limit)
-	{
-		/* mark node as symmetric physically */
-		VECCOPY(node->symmetry_axis, nor);
-		node->symmetry_flag |= SYM_PHYSICAL;
-		node->symmetry_flag |= SYM_AXIAL;
-
-		/* set side on arcs */
-		setSideAxialSymmetry(node, node1, arc1);
-		setSideAxialSymmetry(node, node2, arc2);
-		
-		if (graph->axial_symmetry)
-		{
-			graph->axial_symmetry(node, node1, node2, arc1, arc2);
-		}
-	}
+	testAxialSymmetry(graph, root_node, node1, node2, arc1, arc2, axis, limit, 1);
 }
 
 static void markdownSecondarySymmetry(BGraph *graph, BNode *node, int depth, int level, float limit)
@@ -522,11 +662,11 @@ static void markdownSecondarySymmetry(BGraph *graph, BNode *node, int depth, int
 	/* Split between axial and radial symmetry */
 	if (count == 2)
 	{
-		markAxialSymmetry(graph, node, depth, axis, limit);
+		handleAxialSymmetry(graph, node, depth, axis, limit);
 	}
 	else
 	{
-		markRadialSymmetry(graph, node, depth, axis, limit);
+		handleRadialSymmetry(graph, node, depth, axis, limit);
 	}
 	
 	/* markdown secondary symetries */	
diff --git a/source/blender/include/reeb.h b/source/blender/include/reeb.h
index b24ba25aa5d..2395e294b85 100644
--- a/source/blender/include/reeb.h
+++ b/source/blender/include/reeb.h
@@ -91,6 +91,7 @@ typedef struct ReebArc {
 	float length;
 
 	int symmetry_level;
+	int symmetry_group;
 	int symmetry_flag;
 	/*********************************/
 
diff --git a/source/blender/src/autoarmature.c b/source/blender/src/autoarmature.c
index 741398951bf..a852a3fb82d 100644
--- a/source/blender/src/autoarmature.c
+++ b/source/blender/src/autoarmature.c
@@ -108,6 +108,7 @@ typedef struct RigArc {
 	float length;
 
 	int symmetry_level;
+	int symmetry_group;
 	int symmetry_flag;
 	/*********************************/
 	
@@ -383,7 +384,7 @@ static void RIG_findHead(RigGraph *rg)
 
 /*******************************************************************************************************/
 
-static void RIG_printNode(RigNode *node, char name[])
+void RIG_printNode(RigNode *node, char name[])
 {
 	printf("%s %p %i <%0.3f, %0.3f, %0.3f>\n", name, node, node->degree, node->p[0], node->p[1], node->p[2]);
 	
@@ -398,7 +399,7 @@ static void RIG_printNode(RigNode *node, char name[])
 	}
 }
 
-static void RIG_printArcBones(RigArc *arc)
+void RIG_printArcBones(RigArc *arc)
 {
 	RigEdge *edge;
 
@@ -412,7 +413,7 @@ static void RIG_printArcBones(RigArc *arc)
 	printf("\n");
 }
 
-static void RIG_printArc(RigArc *arc)
+void RIG_printArc(RigArc *arc)
 {
 	RigEdge *edge;
 
@@ -938,7 +939,6 @@ static void retargetArctoArc(RigArc *iarc)
 		
 		if (mode == RETARGET_AGGRESSIVE)
 		{
-			printf("aggresive\n");
 			retargetArctoArcAggresive(iarc);
 		}
 		else
@@ -953,6 +953,7 @@ static void findCorrespondingArc(RigArc *start_arc, RigNode *start_node, RigArc
 	ReebNode *enode = start_node->link;
 	ReebArc *next_earc;
 	int symmetry_level = next_iarc->symmetry_level;
+	int symmetry_group = next_iarc->symmetry_group;
 	int symmetry_flag = next_iarc->symmetry_flag;
 	int i;
 	
@@ -963,18 +964,22 @@ static void findCorrespondingArc(RigArc *start_arc, RigNode *start_node, RigArc
 		next_earc = (ReebArc*)enode->arcs[i];
 		if (next_earc->flag == 0 && /* not already taken */
 			next_earc->symmetry_flag == symmetry_flag &&
+			next_earc->symmetry_group == symmetry_group &&
 			next_earc->symmetry_level == symmetry_level)
 		{
+/*
 			printf("-----------------------\n");
 			printf("CORRESPONDING ARC FOUND\n");
 			RIG_printArcBones(next_iarc);
-
+			printf("flag %i -- symmetry level %i -- symmetry flag %i\n", next_earc->flag, next_earc->symmetry_level, next_earc->symmetry_flag);
+*/
 			next_earc->flag = 1; // mark as taken
 			next_iarc->link = next_earc;
 			break;
 		}
 	}
 	
+/*
 	if (next_iarc->link == NULL)
 	{
 		printf("--------------------------\n");
@@ -991,6 +996,7 @@ static void findCorrespondingArc(RigArc *start_arc, RigNode *start_node, RigArc
 			printf("flag %i -- symmetry level %i -- symmetry flag %i\n", next_earc->flag, next_earc->symmetry_level, next_earc->symmetry_flag);
 		}
 	}
+*/
 }
 
 static void retargetSubgraph(RigGraph *rigg, RigArc *start_arc, RigNode *start_node)
diff --git a/source/blender/src/reeb.c b/source/blender/src/reeb.c
index c437379dbdb..bd105e114ef 100644
--- a/source/blender/src/reeb.c
+++ b/source/blender/src/reeb.c
@@ -214,6 +214,44 @@ void resizeArcBuckets(ReebArc *arc)
 		MEM_freeN(oldBuckets);
 	}
 }
+
+void calculateArcLength(ReebArc *arc)
+{
+	ReebArcIterator iter;
+	EmbedBucket *bucket = NULL;
+	float *vec0, *vec1;
+
+	arc->length = 0;
+	
+	initArcIterator(&iter, arc, arc->head);
+
+	bucket = nextBucket(&iter);
+	
+	vec0 = arc->head->p;
+	
+	while (bucket != NULL)
+	{
+		vec1 = bucket->p;
+		
+		arc->length += VecLenf(vec0, vec1);
+		
+		vec0 = vec1;
+		bucket = nextBucket(&iter);
+	}
+	
+	arc->length += VecLenf(arc->tail->p, vec1);	
+}
+
+void calculateGraphLength(ReebGraph *rg)
+{
+	ReebArc *arc;
+	
+	for (arc = rg->arcs.first; arc; arc = arc->next)
+	{
+		calculateArcLength(arc);
+	}
+}
+
 /***************************************** UTILS **********************************************/
 
 ReebEdge * copyEdge(ReebEdge *edge)
@@ -2539,5 +2577,7 @@ ReebGraph *BIF_ReebGraphFromEditMesh(void)
 	
 	REEB_exportGraph(rg, -1);
 	
+	calculateGraphLength(rg);
+	
 	return rg;
 }

From 42740a14423e71c13e50ffe407dac34786bea10e Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Fri, 30 May 2008 18:13:43 +0000
Subject: [PATCH 032/252] More and less debug prints

Also, setting the merge limit to be non-zero for armature graphs (since very small yet non-zero differences would prevent merges and correct graph creation)
---
 source/blender/blenlib/intern/graph.c | 10 ++++++++++
 source/blender/src/autoarmature.c     | 14 +++++++-------
 source/blender/src/reeb.c             |  4 ----
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/source/blender/blenlib/intern/graph.c b/source/blender/blenlib/intern/graph.c
index 6e9dcc66ffc..93093e4b279 100644
--- a/source/blender/blenlib/intern/graph.c
+++ b/source/blender/blenlib/intern/graph.c
@@ -444,6 +444,7 @@ static void handleRadialSymmetry(BGraph *graph, BNode *root_node, int depth, flo
 			{
 				/* swap with smaller */
 				RadialArc tmp;
+				
 				tmp = ring[j + 1];
 				ring[j + 1] = ring[j];
 				ring[j] = tmp;
@@ -454,6 +455,11 @@ static void handleRadialSymmetry(BGraph *graph, BNode *root_node, int depth, flo
 			}
 		}
 	}
+	
+	for (i = 0; i < total; i++)
+	{
+		printf("length %f\n", ring[i].arc->length);
+	}
 
 	/* Dispatch to specific symmetry tests */
 	first = 0;
@@ -588,6 +594,10 @@ static void testAxialSymmetry(BGraph *graph, BNode* root_node, BNode* node1, BNo
 			graph->axial_symmetry(root_node, node1, node2, arc1, arc2);
 		}
 	}
+	else
+	{
+		printf("not symmetric\n");
+	}
 }
 
 static void handleAxialSymmetry(BGraph *graph, BNode *root_node, int depth, float axis[3], float limit)
diff --git a/source/blender/src/autoarmature.c b/source/blender/src/autoarmature.c
index a852a3fb82d..e9b3dad852f 100644
--- a/source/blender/src/autoarmature.c
+++ b/source/blender/src/autoarmature.c
@@ -470,7 +470,7 @@ static RigGraph *armatureToGraph(ListBase *list)
 		}
 	}
 	
-	BLI_removeDoubleNodes((BGraph*)rg, 0);
+	BLI_removeDoubleNodes((BGraph*)rg, 0.001);
 	
 	BLI_buildAdjacencyList((BGraph*)rg);
 	
@@ -967,19 +967,19 @@ static void findCorrespondingArc(RigArc *start_arc, RigNode *start_node, RigArc
 			next_earc->symmetry_group == symmetry_group &&
 			next_earc->symmetry_level == symmetry_level)
 		{
-/*
+
 			printf("-----------------------\n");
 			printf("CORRESPONDING ARC FOUND\n");
 			RIG_printArcBones(next_iarc);
 			printf("flag %i -- symmetry level %i -- symmetry flag %i\n", next_earc->flag, next_earc->symmetry_level, next_earc->symmetry_flag);
-*/
+
 			next_earc->flag = 1; // mark as taken
 			next_iarc->link = next_earc;
 			break;
 		}
 	}
 	
-/*
+
 	if (next_iarc->link == NULL)
 	{
 		printf("--------------------------\n");
@@ -996,7 +996,7 @@ static void findCorrespondingArc(RigArc *start_arc, RigNode *start_node, RigArc
 			printf("flag %i -- symmetry level %i -- symmetry flag %i\n", next_earc->flag, next_earc->symmetry_level, next_earc->symmetry_flag);
 		}
 	}
-*/
+
 }
 
 static void retargetSubgraph(RigGraph *rigg, RigArc *start_arc, RigNode *start_node)
@@ -1090,10 +1090,10 @@ void BIF_retargetArmature()
 			
 				rigg = armatureToGraph(&list);
 				
-				printf("Armature graph created\n");
-		
 				BLI_markdownSymmetry((BGraph*)rigg, (BNode*)rigg->head, G.scene->toolsettings->skgen_symmetry_limit);
 				
+				printf("Armature graph created\n");
+		
 				RIG_printGraph(rigg);
 				
 				rigg->link = reebg;
diff --git a/source/blender/src/reeb.c b/source/blender/src/reeb.c
index bd105e114ef..003cb707d1e 100644
--- a/source/blender/src/reeb.c
+++ b/source/blender/src/reeb.c
@@ -1082,10 +1082,6 @@ int filterSmartReebGraph(ReebGraph *rg, float threshold)
 			
 			arc->angle = avg_angle;
 			
-#ifdef DEBUG_REEB
-			printf("angle %f total %i\n", avg_angle, total);
-#endif
-			
 			if (avg_angle > threshold)
 				merging = 1;
 			

From 6d0ac5095fb984d389938f309ec76b72674067d8 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Sat, 31 May 2008 18:52:23 +0000
Subject: [PATCH 033/252] Alternative method for correletation based skeleton
 subdivision (where bone end points can deviate from embedding).

Disabled because too unstable
---
 source/blender/src/editarmature.c | 133 ++++++++++++++++++++++++++++++
 1 file changed, 133 insertions(+)

diff --git a/source/blender/src/editarmature.c b/source/blender/src/editarmature.c
index b1185a24d9f..ace3536a835 100644
--- a/source/blender/src/editarmature.c
+++ b/source/blender/src/editarmature.c
@@ -4207,6 +4207,8 @@ EditBone * subdivideByAngle(ReebArc *arc, ReebNode *head, ReebNode *tail)
 	return lastBone;
 }
 
+#if 1
+
 float calcCorrelation(ReebArc *arc, int start, int end, float v0[3], float n[3])
 {
 	int len = 2 + abs(end - start);
@@ -4318,6 +4320,137 @@ EditBone * subdivideByCorrelation(ReebArc *arc, ReebNode *head, ReebNode *tail)
 	return lastBone;
 }
 
+#else
+
+float calcCorrelation(ReebArc *arc, int start, int end, float v0[3], float n[3])
+{
+	int len = 2 + abs(end - start);
+	
+	if (len > 2)
+	{
+		ReebArcIterator iter;
+		EmbedBucket *bucket = NULL;
+		float avg_t = 0.0f;
+		float s_t = 0.0f;
+		float s_xyz = 0.0f;
+		
+		/* First pass, calculate average */
+		for (initArcIterator2(&iter, arc, start, end), bucket = nextBucket(&iter);
+			bucket;
+			bucket = nextBucket(&iter))
+		{
+			float v[3];
+			
+			VecSubf(v, bucket->p, v0);
+			Normalize(v);
+			avg_t += Inpf(v, n);
+		}
+		
+		avg_t /= Inpf(n, n);
+		avg_t += 1.0f; /* adding start (0) and end (1) values */
+		avg_t /= len;
+		
+		/* Second pass, calculate s_xyz and s_t */
+		for (initArcIterator2(&iter, arc, start, end), bucket = nextBucket(&iter);
+			bucket;
+			bucket = nextBucket(&iter))
+		{
+			float v[3], d[3];
+			float dt;
+			
+			VecSubf(v, bucket->p, v0);
+			Normalize(v);
+			Projf(d, v, n);
+			VecSubf(v, v, d);
+			
+			dt = VecLength(d) - avg_t;
+			
+			s_t += dt * dt;
+			s_xyz += Inpf(v, v);
+		}
+		
+		/* adding start(0) and end(1) values to s_t */
+		s_t += (avg_t * avg_t) + (1 - avg_t) * (1 - avg_t);
+		
+		return 1.0f - s_xyz / s_t; 
+	}
+	else
+	{
+		return 1.0f;
+	}
+}
+
+EditBone * subdivideByCorrelation(ReebArc *arc, ReebNode *head, ReebNode *tail)
+{
+	ReebArcIterator iter;
+	float n[3];
+	float CORRELATION_THRESHOLD = G.scene->toolsettings->skgen_correlation_limit;
+	EditBone *lastBone = NULL;
+	
+	/* init iterator to get start and end from head */
+	initArcIterator(&iter, arc, head);
+	
+	/* Calculate overall */
+	VecSubf(n, arc->buckets[iter.end].p, head->p);
+	
+	if (G.scene->toolsettings->skgen_options & SKGEN_CUT_CORRELATION)
+	{
+		EmbedBucket *bucket = NULL;
+		EmbedBucket *previous = NULL;
+		EditBone *child = NULL;
+		EditBone *parent = NULL;
+		float normal[3] = {0, 0, 0};
+		float avg_normal[3];
+		int total = 0;
+		int boneStart = iter.start;
+		
+		parent = add_editbone("Bone");
+		parent->flag = BONE_SELECTED|BONE_TIPSEL|BONE_ROOTSEL;
+		VECCOPY(parent->head, head->p);
+		
+		for (previous = nextBucket(&iter), bucket = nextBucket(&iter);
+			bucket;
+			previous = bucket, bucket = nextBucket(&iter))
+		{
+			float length;
+			
+			/* Calculate normal */
+			VecSubf(n, bucket->p, parent->head);
+			length = Normalize(n);
+			
+			total += 1;
+			VecAddf(normal, normal, n);
+			VECCOPY(avg_normal, normal);
+			VecMulf(avg_normal, 1.0f / total); 
+
+			if (calcCorrelation(arc, boneStart, iter.index, parent->head, avg_normal) < CORRELATION_THRESHOLD)
+			{
+				VECCOPY(parent->tail, avg_normal);
+				VecMulf(parent->tail, length);
+				VecAddf(parent->tail, parent->tail, parent->head);
+
+				child = add_editbone("Bone");
+				VECCOPY(child->head, parent->tail);
+				child->parent = parent;
+				child->flag |= BONE_CONNECTED|BONE_SELECTED|BONE_TIPSEL|BONE_ROOTSEL;
+				
+				parent = child; // new child is next parent
+				boneStart = iter.index; // start from end
+				
+				normal[0] = normal[1] = normal[2] = 0;
+				total = 0;
+			}
+		}
+
+		VECCOPY(parent->tail, tail->p);
+		
+		lastBone = parent; /* set last bone in the chain */
+	}
+	
+	return lastBone;
+}
+#endif
+
 float arcLengthRatio(ReebArc *arc)
 {
 	float arcLength = 0.0f;

From d6d43823962d91f2d77470f2be3d1f5e50aee3c6 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Tue, 3 Jun 2008 16:43:07 +0000
Subject: [PATCH 034/252] Fix mem leak in graph rem doubles

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

diff --git a/source/blender/blenlib/intern/graph.c b/source/blender/blenlib/intern/graph.c
index 93093e4b279..2c577983112 100644
--- a/source/blender/blenlib/intern/graph.c
+++ b/source/blender/blenlib/intern/graph.c
@@ -167,7 +167,7 @@ void BLI_removeDoubleNodes(BGraph *graph, float limit)
 				BLI_replaceNode(graph, node_src, node_replaced);
 				
 				BLI_freeNode(graph, node_replaced);
-				BLI_remlink(&graph->nodes, node_replaced);
+				BLI_freelinkN(&graph->nodes, node_replaced);
 			}
 		}
 	}

From 2dcab87383843bc02f0ad12fa7ed1bebf2c86f58 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Wed, 4 Jun 2008 12:32:06 +0000
Subject: [PATCH 035/252] Overwrite mode added, toggled with INSERTKEY

---
 source/blender/blenkernel/BKE_text.h      |  1 +
 source/blender/blenkernel/intern/text.c   | 28 +++++++++++++++++++++++
 source/blender/makesdna/DNA_space_types.h |  2 +-
 source/blender/src/drawtext.c             | 25 ++++++++++++++++----
 source/blender/src/space.c                |  2 ++
 5 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/source/blender/blenkernel/BKE_text.h b/source/blender/blenkernel/BKE_text.h
index 6f891ab4887..ea1afc3754a 100644
--- a/source/blender/blenkernel/BKE_text.h
+++ b/source/blender/blenkernel/BKE_text.h
@@ -81,6 +81,7 @@ void	txt_do_redo			(struct Text *text);
 void	txt_split_curline	(struct Text *text);
 void	txt_backspace_char	(struct Text *text);
 int		txt_add_char		(struct Text *text, char add);
+int		txt_replace_char	(struct Text *text, char add);
 void	txt_find_panel		(struct SpaceText *st, int again);
 void	run_python_script	(struct SpaceText *st);
 int	jumptoline_interactive	(struct SpaceText *st);
diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c
index 872f81ead63..af37f513ff6 100644
--- a/source/blender/blenkernel/intern/text.c
+++ b/source/blender/blenkernel/intern/text.c
@@ -2140,6 +2140,34 @@ int txt_add_char (Text *text, char add)
 	return 1;
 }
 
+int txt_replace_char (Text *text, char add)
+{
+	char del;
+	
+	if (!text) return 0;
+	if (!text->curl) return 0;
+
+	/* If text is selected or we're at the end of the line just use txt_add_char */
+	if (text->curc==text->curl->len || text->sell!=text->curl || text->selc!=text->curc || add=='\n') {
+		return txt_add_char(text, add);
+	}
+	
+	del= text->curl->line[text->curc];
+	text->curl->line[text->curc]= (unsigned char) add;
+	text->curc++;
+	txt_pop_sel(text);
+	
+	txt_make_dirty(text);
+	txt_clean_text(text);
+
+	/* Should probably create a new op for this */
+	if(!undoing) {
+		txt_undo_add_charop(text, UNDO_DEL, del);
+		txt_undo_add_charop(text, UNDO_INSERT, add);
+	}
+	return 1;
+}
+
 void indent(Text *text)
 {
 	int len, num;
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index 619dfbb43a0..e4544d77634 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -281,7 +281,7 @@ typedef struct SpaceText {
 	int tabnumber;
 	int currtab_set; 
 	int showsyntax;
-	int unused_padd;
+	int overwrite;
 	
 	float pix_per_line;
 
diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index 71f0bbef7ca..31bdea0e07e 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -634,10 +634,11 @@ static void set_cursor_to_pos (SpaceText *st, int x, int y, int sel)
 }
 
 static void draw_cursor(SpaceText *st) {
-	int h, x, i;
+	int h, x, i, w;
 	Text *text= st->text;
 	TextLine *linef, *linel;
 	int charf, charl;
+	char ch[2];
 	
 	if (text->curl==text->sell && text->curc==text->selc) {
 		x= text_draw(st, text->curl->line, st->left, text->curc, 0, 0, 0, NULL);
@@ -645,9 +646,19 @@ static void draw_cursor(SpaceText *st) {
 		if (x) {
 			h= txt_get_span(text->lines.first, text->curl) - st->top;
 
-			BIF_ThemeColor(TH_HILITE);
-			
-			glRecti(x-1, curarea->winy-st->lheight*(h)-2, x+1, curarea->winy-st->lheight*(h+1)-2);
+			if (st->overwrite) {
+				ch[0]= (unsigned char) text->curl->line[text->curc];
+				if (ch[0]=='\0') ch[0]=' ';
+				ch[1]= '\0';
+				w= BMF_GetStringWidth(spacetext_get_font(st), ch);
+				BIF_ThemeColor(TH_SHADE2);
+				glRecti(x, curarea->winy-st->lheight*(h)-2, x+w, curarea->winy-st->lheight*(h+1)-2);
+				BIF_ThemeColor(TH_HILITE);
+				glRecti(x, curarea->winy-st->lheight*(h+1)-3, x+w, curarea->winy-st->lheight*(h+1)-1);
+			} else {
+				BIF_ThemeColor(TH_HILITE);
+				glRecti(x-1, curarea->winy-st->lheight*(h)-2, x+1, curarea->winy-st->lheight*(h+1)-2);
+			}
 		}
 	} else {
 		int span= txt_get_span(text->curl, text->sell);
@@ -1594,7 +1605,7 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			}
 		}
 	} else if (ascii) {
-		if (txt_add_char(text, ascii)) {
+		if ((st->overwrite && txt_replace_char(text, ascii)) || txt_add_char(text, ascii)) {
 			if (st->showsyntax) get_format_string(st);
 			pop_space_text(st);
 			do_draw= 1;
@@ -1894,6 +1905,10 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			pop_space_text(st);
 			st->currtab_set = setcurr_tab(text);
 			break;
+		case INSERTKEY:
+			st->overwrite= !st->overwrite;
+			do_draw= 1;
+			break;
 		case DOWNARROWKEY:
 			txt_move_down(text, G.qual & LR_SHIFTKEY);
 			set_tabs(text);
diff --git a/source/blender/src/space.c b/source/blender/src/space.c
index 47e3387755b..1a32bd35eca 100644
--- a/source/blender/src/space.c
+++ b/source/blender/src/space.c
@@ -6011,6 +6011,8 @@ static void init_textspace(ScrArea *sa)
 	st->lheight= 12;
 	st->showlinenrs= 0;
 	st->tabnumber = 4;
+	st->showsyntax= 0;
+	st->overwrite= 0;
 	st->currtab_set = 0;
 	
 	st->top= 0;

From ec4b6ba3f3d80113e422aef721389aac74bc66c5 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Wed, 4 Jun 2008 16:03:19 +0000
Subject: [PATCH 036/252] Fixed unreported bug: Backspace at top of text pushed
 newline onto undo stack

---
 source/blender/blenkernel/intern/text.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c
index af37f513ff6..337dba11d59 100644
--- a/source/blender/blenkernel/intern/text.c
+++ b/source/blender/blenkernel/intern/text.c
@@ -2075,13 +2075,13 @@ void txt_backspace_char (Text *text)
 	  return;
 	}
 	else if (text->curc==0) { /* Appending two lines */
-	    if (text->curl->prev) {
-	      text->curl= text->curl->prev;
-	      text->curc= text->curl->len;
-			
-	      txt_combine_lines(text, text->curl, text->curl->next);
-	      txt_pop_sel(text);
-	    }
+		if (!text->curl->prev) return;
+		
+		text->curl= text->curl->prev;
+		text->curc= text->curl->len;
+		
+		txt_combine_lines(text, text->curl, text->curl->next);
+		txt_pop_sel(text);
 	} 
 	else { /* Just backspacing a char */
 	  int i= text->curc-1;

From a68975f4e14687207529fa7dcc6a397abe5680ac Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Wed, 4 Jun 2008 23:20:54 +0000
Subject: [PATCH 037/252] Whole word operations added:  * Alt-Left/Right: moves
 cursor/selection a word to the left/right  * Alt-/Ctrl-Delete/Backspace
 deletes whole words at a time

---
 source/blender/blenkernel/BKE_text.h    |  4 ++
 source/blender/blenkernel/intern/text.c | 64 +++++++++++++++++++++++++
 source/blender/src/drawtext.c           | 16 ++++++-
 3 files changed, 82 insertions(+), 2 deletions(-)

diff --git a/source/blender/blenkernel/BKE_text.h b/source/blender/blenkernel/BKE_text.h
index ea1afc3754a..45b4034549f 100644
--- a/source/blender/blenkernel/BKE_text.h
+++ b/source/blender/blenkernel/BKE_text.h
@@ -59,6 +59,8 @@ void	txt_move_up			(struct Text *text, short sel);
 void	txt_move_down		(struct Text *text, short sel);
 void	txt_move_left		(struct Text *text, short sel);
 void	txt_move_right		(struct Text *text, short sel);
+void	txt_jump_left		(struct Text *text, short sel);
+void	txt_jump_right		(struct Text *text, short sel);
 void	txt_move_bof		(struct Text *text, short sel);
 void	txt_move_eof		(struct Text *text, short sel);
 void	txt_move_bol		(struct Text *text, short sel);
@@ -66,6 +68,7 @@ void	txt_move_eol		(struct Text *text, short sel);
 void	txt_move_toline		(struct Text *text, unsigned int line, short sel);
 void	txt_pop_sel			(struct Text *text);
 void	txt_delete_char		(struct Text *text);
+void	txt_delete_word		(struct Text *text);
 void	txt_copy_sel		(struct Text *text);
 void	txt_sel_all			(struct Text *text);
 void	txt_sel_line		(struct Text *text);
@@ -80,6 +83,7 @@ void	txt_do_undo			(struct Text *text);
 void	txt_do_redo			(struct Text *text);
 void	txt_split_curline	(struct Text *text);
 void	txt_backspace_char	(struct Text *text);
+void	txt_backspace_word	(struct Text *text);
 int		txt_add_char		(struct Text *text, char add);
 int		txt_replace_char	(struct Text *text, char add);
 void	txt_find_panel		(struct SpaceText *st, int again);
diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c
index 337dba11d59..0556472993f 100644
--- a/source/blender/blenkernel/intern/text.c
+++ b/source/blender/blenkernel/intern/text.c
@@ -117,6 +117,7 @@ static void txt_pop_last(Text *text);
 static void txt_undo_add_op(Text *text, int op);
 static void txt_undo_add_block(Text *text, int op, char *buf);
 static void txt_delete_line(Text *text, TextLine *line);
+static int txt_word_boundary(char ch);
 
 /***/
 
@@ -553,6 +554,17 @@ static void txt_make_dirty (Text *text)
 	if (text->compiled) BPY_free_compiled_text(text);
 }
 
+static int txt_word_boundary (char ch)
+{
+	if (ch < '0') return TRUE;
+	if (ch <= '9') return FALSE;
+	if (ch < 'A') return TRUE;
+	if (ch <= 'Z') return FALSE;
+	if (ch < 'a') return TRUE;
+	if (ch <= 'z') return FALSE;
+	return TRUE;
+}
+
 /****************************/
 /* Cursor utility functions */
 /****************************/
@@ -689,6 +701,32 @@ void txt_move_right(Text *text, short sel)
 	if(!sel) txt_pop_sel(text);
 }
 
+void txt_jump_left(Text *text, short sel)
+{
+	TextLine *l;
+	int c;
+	if (!text) return;
+	if (!text->curl) return;
+	do {
+		txt_move_left(text, sel);
+		l= sel ? text->sell : text->curl;
+		c= sel ? text->selc : text->curc;
+	} while (c>0 && c<l->len && !txt_word_boundary(l->line[c-1]));
+}
+
+void txt_jump_right(Text *text, short sel)
+{
+	TextLine *l;
+	int c;
+	if (!text) return;
+	if (!text->curl) return;
+	do {
+		txt_move_right(text, sel);
+		l= sel ? text->sell : text->curl;
+		c= sel ? text->selc : text->curc;
+	} while (c>0 && c<l->len && !txt_word_boundary(l->line[c-1]));
+}
+
 void txt_move_bol (Text *text, short sel) 
 {
 	TextLine **linep;
@@ -2063,6 +2101,20 @@ void txt_delete_char (Text *text)
 	if(!undoing) txt_undo_add_charop(text, UNDO_DEL, c);
 }
 
+void txt_delete_word (Text *text) 
+{
+	int i;
+	char ch;
+	if (!text) return;
+	if (!text->curl) return;
+	i= text->curc;
+	do {
+		ch= text->curl->line[i];
+		txt_delete_char(text);
+		i= text->curc;
+	} while (i<text->curl->len && !txt_word_boundary(ch));
+}
+
 void txt_backspace_char (Text *text) 
 {
 	char c='\n';
@@ -2103,6 +2155,18 @@ void txt_backspace_char (Text *text)
 	if(!undoing) txt_undo_add_charop(text, UNDO_BS, c);
 }
 
+void txt_backspace_word (Text *text) 
+{
+	int i;
+	if (!text) return;
+	if (!text->curl) return;
+	i= text->curc;
+	do {
+		txt_backspace_char(text);
+		i= text->curc;
+	} while (i>0 && !txt_word_boundary(text->curl->line[i-1]));
+}
+
 int txt_add_char (Text *text, char add) 
 {
 	int len;
diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index 31bdea0e07e..cdb6e90a3ed 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -1892,14 +1892,22 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			pop_space_text(st);
 			break;
 		case BACKSPACEKEY:
-			txt_backspace_char(text);
+			if (G.qual & (LR_ALTKEY | LR_CTRLKEY)) {
+				txt_backspace_word(text);
+			} else {
+				txt_backspace_char(text);
+			}
 			set_tabs(text);
 			if (st->showsyntax) get_format_string(st);
 			do_draw= 1;
 			pop_space_text(st);
 			break;
 		case DELKEY:
-			txt_delete_char(text);
+			if (G.qual & (LR_ALTKEY | LR_CTRLKEY)) {
+				txt_delete_word(text);
+			} else {
+				txt_delete_char(text);
+			}
 			if (st->showsyntax) get_format_string(st);
 			do_draw= 1;
 			pop_space_text(st);
@@ -1918,6 +1926,8 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 		case LEFTARROWKEY:
 			if (G.qual & LR_COMMANDKEY)
 				txt_move_bol(text, G.qual & LR_SHIFTKEY);
+			else if (G.qual & LR_ALTKEY)
+				txt_jump_left(text, G.qual & LR_SHIFTKEY);
 			else
 				txt_move_left(text, G.qual & LR_SHIFTKEY);
 			set_tabs(text);
@@ -1927,6 +1937,8 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 		case RIGHTARROWKEY:
 			if (G.qual & LR_COMMANDKEY)
 				txt_move_eol(text, G.qual & LR_SHIFTKEY);
+			else if (G.qual & LR_ALTKEY)
+				txt_jump_right(text, G.qual & LR_SHIFTKEY);
 			else
 				txt_move_right(text, G.qual & LR_SHIFTKEY);
 			set_tabs(text);

From 12f5a0a228b60833cb48ad93b28e6c39d22a496e Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Fri, 6 Jun 2008 11:32:45 +0000
Subject: [PATCH 038/252] Added file info to header. Also reopen was marking
 text dirty (different from disk) which it isn't.

---
 source/blender/blenkernel/intern/text.c |  2 +-
 source/blender/src/header_text.c        | 30 ++++++++++++++++++++++---
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c
index 0556472993f..6031c2a8acc 100644
--- a/source/blender/blenkernel/intern/text.c
+++ b/source/blender/blenkernel/intern/text.c
@@ -243,7 +243,7 @@ int reopen_text(Text *text)
 	text->undo_len= TXT_INIT_UNDO;
 	text->undo_buf= MEM_mallocN(text->undo_len, "undo buf");
 	
-	text->flags= TXT_ISDIRTY | TXT_ISTMP; 
+	text->flags= TXT_ISTMP; 
 	
 	fseek(fp, 0L, SEEK_END);
 	len= ftell(fp);
diff --git a/source/blender/src/header_text.c b/source/blender/src/header_text.c
index cf6d21ff264..5ee3ea395b0 100644
--- a/source/blender/src/header_text.c
+++ b/source/blender/src/header_text.c
@@ -52,6 +52,7 @@
 #include "DNA_constraint_types.h"
 #include "DNA_action_types.h"
 
+#include "BIF_gl.h" /* for glRasterPos2i */
 #include "BIF_drawtext.h"
 #include "BIF_interface.h"
 #include "BIF_resources.h"
@@ -715,13 +716,15 @@ static uiBlock *text_filemenu(void *arg_unused)
 }
 
 /* header */
+#define PATH_MAX	260
 void text_buttons(void)
 {
 	uiBlock *block;
 	SpaceText *st= curarea->spacedata.first;
 	Text *text;
 	short xco, xmax;
-	char naam[256];
+	char naam[256], fname[PATH_MAX], headtxt[PATH_MAX+17];
+	int len;
 	
 	if (st==NULL || st->spacetype != SPACE_TEXT) return;
 	
@@ -804,9 +807,30 @@ void text_buttons(void)
 	uiDefButI(block, MENU, B_TEXTFONT, "Screen 12 %x0|Screen 15%x1", xco,0,100,YIC, &st->font_id, 0, 0, 0, 0, "Displays available fonts");
 	xco+=110;
 	
-	uiDefButI(block, NUM, B_TAB_NUMBERS, "Tab:",		xco, 0, XIC+50, YIC, &st->tabnumber, 2, 8, 0, 0, "Set spacing of Tab");
+	uiDefButI(block, NUM, B_TAB_NUMBERS, "Tab:", xco, 0, XIC+50, YIC, &st->tabnumber, 2, 8, 0, 0, "Set spacing of Tab");
 	xco+= XIC+50;
-	
+
+	/* File info */
+	if (text) {
+		if (text->name) {
+			len = strlen(text->name);
+			if (len > PATH_MAX-1)
+				len = PATH_MAX-1;
+			strncpy(fname, text->name, len);
+			fname[len]='\0';
+		} else {
+			strcpy(fname, "Internal");
+		}
+		BIF_ThemeColor(TH_MENU_TEXT);
+		if (text->flags & TXT_ISDIRTY)
+			sprintf(headtxt, "File: *%s (unsaved)", fname);
+		else
+			sprintf(headtxt, "File: %s", fname);
+		glRasterPos2i(xco+=XIC, 5);
+		BMF_DrawString(G.font, headtxt);
+		xco += BMF_GetStringWidth(G.font, headtxt);
+	}
+
 	/* always as last  */
 	curarea->headbutlen= xco+2*XIC;
 

From 39a680734816a2fd8b1f9e0aebfa9d5d8d5e2b39 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Sun, 8 Jun 2008 19:29:19 +0000
Subject: [PATCH 039/252] Prevent editing of linked library Texts

---
 source/blender/src/drawtext.c    | 41 +++++++++++++++++++++++++++++++-
 source/blender/src/header_text.c | 34 ++++++++++++++++++++++----
 2 files changed, 69 insertions(+), 6 deletions(-)

diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index cdb6e90a3ed..3d8759ef3a6 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -1605,7 +1605,10 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			}
 		}
 	} else if (ascii) {
-		if ((st->overwrite && txt_replace_char(text, ascii)) || txt_add_char(text, ascii)) {
+		if (text && text->id.lib) {
+			error_libdata();
+
+		} else if ((st->overwrite && txt_replace_char(text, ascii)) || txt_add_char(text, ascii)) {
 			if (st->showsyntax) get_format_string(st);
 			pop_space_text(st);
 			do_draw= 1;
@@ -1633,6 +1636,10 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			}
 			break; /* BREAK C */
 		case DKEY:
+			if (text && text->id.lib) {
+				error_libdata();
+				break;
+			}
 			if (G.qual == (LR_CTRLKEY|LR_SHIFTKEY)) {
 				//uncommenting
 				txt_order_cursors(text);
@@ -1651,6 +1658,10 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			if (G.qual == (LR_ALTKEY|LR_SHIFTKEY)) {
 				switch(pupmenu("Edit %t|Cut %x0|Copy %x1|Paste %x2|Print Cut Buffer %x3")) {
 				case 0:
+					if (text && text->id.lib) {
+						error_libdata();
+						break;
+					}
 					txt_copy_clipboard(text); //First copy to clipboard
 					txt_cut_sel(text);
 					do_draw= 1;
@@ -1661,6 +1672,10 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 					do_draw= 1;
 					break;
 				case 2:
+					if (text && text->id.lib) {
+						error_libdata();
+						break;
+					}
 					//txt_paste(text);
 					txt_paste_clipboard(text);
 					if (st->showsyntax) get_format_string(st);
@@ -1824,6 +1839,10 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			}
 			/* Support for both Alt-V and Ctrl-V for Paste, for backward compatibility reasons */
 			else if (G.qual & LR_ALTKEY || G.qual & LR_CTRLKEY) {
+				if (text && text->id.lib) {
+					error_libdata();
+					break;
+				}
 				/* Throwing in the Shift modifier Paste from the OS clipboard */
 				if (G.qual & LR_SHIFTKEY)
 					txt_paste_clipboard(text);
@@ -1836,6 +1855,10 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			break; /* BREAK V */
 		case XKEY:
 			if (G.qual == LR_ALTKEY || G.qual == LR_CTRLKEY) {
+				if (text && text->id.lib) {
+					error_libdata();
+					break;
+				}
 				txt_cut_sel(text);
 				if (st->showsyntax) get_format_string(st);
 				do_draw= 1;	
@@ -1854,6 +1877,10 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			}
 			break;
 		case TABKEY:
+			if (text && text->id.lib) {
+				error_libdata();
+				break;
+			}
 			if (G.qual & LR_SHIFTKEY) {
 				if (txt_has_sel(text)) {
 					txt_order_cursors(text);
@@ -1874,6 +1901,10 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			st->currtab_set = setcurr_tab(text);
 			break;
 		case RETKEY:
+			if (text && text->id.lib) {
+				error_libdata();
+				break;
+			}
 			//double check tabs before splitting the line
 			st->currtab_set = setcurr_tab(text);
 			txt_split_curline(text);
@@ -1892,6 +1923,10 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			pop_space_text(st);
 			break;
 		case BACKSPACEKEY:
+			if (text && text->id.lib) {
+				error_libdata();
+				break;
+			}
 			if (G.qual & (LR_ALTKEY | LR_CTRLKEY)) {
 				txt_backspace_word(text);
 			} else {
@@ -1903,6 +1938,10 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			pop_space_text(st);
 			break;
 		case DELKEY:
+			if (text && text->id.lib) {
+				error_libdata();
+				break;
+			}
 			if (G.qual & (LR_ALTKEY | LR_CTRLKEY)) {
 				txt_delete_word(text);
 			} else {
diff --git a/source/blender/src/header_text.c b/source/blender/src/header_text.c
index 5ee3ea395b0..7f281096479 100644
--- a/source/blender/src/header_text.c
+++ b/source/blender/src/header_text.c
@@ -346,6 +346,10 @@ static void do_text_editmenu(void *arg, int event)
 		txt_do_redo(text);
 		break;
 	case 3:
+		if (text && text->id.lib) {
+			error_libdata();
+			break;
+		}
 		txt_copy_clipboard(text);
 		txt_cut_sel(text);
 		pop_space_text(st);
@@ -355,6 +359,10 @@ static void do_text_editmenu(void *arg, int event)
 		txt_copy_clipboard(text);
 		break;
 	case 5:
+		if (text && text->id.lib) {
+			error_libdata();
+			break;
+		}
 		txt_paste_clipboard(text);
 		if (st->showsyntax) get_format_string(st);
 		break;
@@ -457,6 +465,10 @@ static void do_text_formatmenu(void *arg, int event)
 	
 	switch(event) {
 	case 3:
+		if (text && text->id.lib) {
+			error_libdata();
+			break;
+		}
 		if (txt_has_sel(text)) {
 			txt_order_cursors(text);
 			indent(text);
@@ -467,6 +479,10 @@ static void do_text_formatmenu(void *arg, int event)
 			break;
 		}
 	case 4:
+		if (text && text->id.lib) {
+			error_libdata();
+			break;
+		}
 		if ( txt_has_sel(text)) {
 			txt_order_cursors(text);
 			unindent(text);
@@ -474,6 +490,10 @@ static void do_text_formatmenu(void *arg, int event)
 		}
 		break;
 	case 5:
+		if (text && text->id.lib) {
+			error_libdata();
+			break;
+		}
 		if ( txt_has_sel(text)) {
 			txt_order_cursors(text);
 			comment(text);
@@ -482,6 +502,10 @@ static void do_text_formatmenu(void *arg, int event)
 		}
 		break;
 	case 6:
+		if (text && text->id.lib) {
+			error_libdata();
+			break;
+		}
 		if ( txt_has_sel(text)) {
 			txt_order_cursors(text);
 			uncomment(text);
@@ -818,14 +842,14 @@ void text_buttons(void)
 				len = PATH_MAX-1;
 			strncpy(fname, text->name, len);
 			fname[len]='\0';
+			if (text->flags & TXT_ISDIRTY)
+				sprintf(headtxt, "File: *%s (unsaved)", fname);
+			else
+				sprintf(headtxt, "File: %s", fname);
 		} else {
-			strcpy(fname, "Internal");
+			sprintf(headtxt, text->id.lib?"Text: External":"Text: Internal");
 		}
 		BIF_ThemeColor(TH_MENU_TEXT);
-		if (text->flags & TXT_ISDIRTY)
-			sprintf(headtxt, "File: *%s (unsaved)", fname);
-		else
-			sprintf(headtxt, "File: %s", fname);
 		glRasterPos2i(xco+=XIC, 5);
 		BMF_DrawString(G.font, headtxt);
 		xco += BMF_GetStringWidth(G.font, headtxt);

From 062fb01614be23623fc9ebedc1ca1307ceb9a1bf Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Sun, 8 Jun 2008 19:35:20 +0000
Subject: [PATCH 040/252] soc-2008-mxcurioni: now supports current scene
 drawing (instead of fixed scene object), still with fixed style and fixed
 camera. Initialization is properly handled, which limits memory problems and
 speed-ups subsequent rendering. The viewing ratio should be correct now too.
 I also removed linking references to former lib3ds library path (caused some
 linking problems).

---
 config/darwin-config.py                       |     1 -
 config/linux2-config.py                       |     1 -
 config/linuxcross-config.py                   |     1 -
 config/openbsd3-config.py                     |     1 -
 config/sunos5-config.py                       |     1 -
 config/win32-mingw-config.py                  |     1 -
 config/win32-vc-config.py                     |     1 -
 source/blender/freestyle/SConscript           |    10 +-
 .../freestyle/intern/app_blender/api.cpp      |    53 +-
 .../intern/app_blender/test_config.h          |     8 +-
 .../freestyle/intern/swig/ModuleWrapper.cpp   | 16629 ++++++++--------
 .../freestyle/intern/swig/ModuleWrapper.h     |    36 +-
 source/blender/freestyle/python/3ds_export.py |  1010 +
 source/blender/freestyle/python/Freestyle.py  |    22 +-
 tools/Blender.py                              |     3 -
 tools/btools.py                               |     5 +-
 16 files changed, 8874 insertions(+), 8909 deletions(-)
 create mode 100644 source/blender/freestyle/python/3ds_export.py

diff --git a/config/darwin-config.py b/config/darwin-config.py
index 115123f9984..4c3b5d19e36 100644
--- a/config/darwin-config.py
+++ b/config/darwin-config.py
@@ -167,7 +167,6 @@ BF_SWIG = '${BF_FREESTYLE}/swig'
 BF_SWIG_LIB = 'extern_swig'
 BF_LIB3DS = '${BF_FREESTYLE}/lib3ds'
 BF_LIB3DS_LIB = 'extern_lib3ds'
-BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs'
 BF_LIB3DS_INC = '${BF_LIB3DS}'
 
 # WITH_BF_OPENEXR = 'true'
diff --git a/config/linux2-config.py b/config/linux2-config.py
index f59dcf266ee..965b5935886 100644
--- a/config/linux2-config.py
+++ b/config/linux2-config.py
@@ -93,7 +93,6 @@ BF_SWIG = '${BF_FREESTYLE}/swig'
 BF_SWIG_LIB = 'extern_swig'
 BF_LIB3DS = '${BF_FREESTYLE}/lib3ds'
 BF_LIB3DS_LIB = 'extern_lib3ds'
-BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs'
 BF_LIB3DS_INC = '${BF_LIB3DS}'
 
 #WITH_BF_NSPR = 'true'
diff --git a/config/linuxcross-config.py b/config/linuxcross-config.py
index 603f6a1a880..c695e0e04e3 100644
--- a/config/linuxcross-config.py
+++ b/config/linuxcross-config.py
@@ -13,7 +13,6 @@ BF_SWIG = '${BF_FREESTYLE}/swig'
 BF_SWIG_LIB = 'extern_swig'
 BF_LIB3DS = '${BF_FREESTYLE}/lib3ds'
 BF_LIB3DS_LIB = 'extern_lib3ds'
-BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs'
 BF_LIB3DS_INC = '${BF_LIB3DS}'
 
 ###########################
diff --git a/config/openbsd3-config.py b/config/openbsd3-config.py
index 9a4c0d6f34e..6b8d30f8bca 100644
--- a/config/openbsd3-config.py
+++ b/config/openbsd3-config.py
@@ -87,7 +87,6 @@ BF_SWIG = '${BF_FREESTYLE}/swig'
 BF_SWIG_LIB = 'extern_swig'
 BF_LIB3DS = '${BF_FREESTYLE}/lib3ds'
 BF_LIB3DS_LIB = 'extern_lib3ds'
-BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs'
 BF_LIB3DS_INC = '${BF_LIB3DS}'
 
 #WITH_BF_NSPR = 'true'
diff --git a/config/sunos5-config.py b/config/sunos5-config.py
index cccc380f60c..36ed610da3f 100644
--- a/config/sunos5-config.py
+++ b/config/sunos5-config.py
@@ -89,7 +89,6 @@ BF_SWIG = '${BF_FREESTYLE}/swig'
 BF_SWIG_LIB = 'extern_swig'
 BF_LIB3DS = '${BF_FREESTYLE}/lib3ds'
 BF_LIB3DS_LIB = 'extern_lib3ds'
-BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs'
 BF_LIB3DS_INC = '${BF_LIB3DS}'
 
 #WITH_BF_NSPR = 'true'
diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py
index 9757c0264b5..a0e85a07548 100644
--- a/config/win32-mingw-config.py
+++ b/config/win32-mingw-config.py
@@ -104,7 +104,6 @@ BF_SWIG = '${BF_FREESTYLE}/swig'
 BF_SWIG_LIB = 'extern_swig'
 BF_LIB3DS = '${BF_FREESTYLE}/lib3ds'
 BF_LIB3DS_LIB = 'extern_lib3ds'
-BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs'
 BF_LIB3DS_INC = '${BF_LIB3DS}'
 
 #WITH_BF_NSPR = 'true'
diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py
index 8e7d6c56c13..8eace13c807 100644
--- a/config/win32-vc-config.py
+++ b/config/win32-vc-config.py
@@ -115,7 +115,6 @@ BF_SWIG = '${BF_FREESTYLE}/swig'
 BF_SWIG_LIB = 'extern_swig'
 BF_LIB3DS = '${BF_FREESTYLE}/lib3ds'
 BF_LIB3DS_LIB = 'extern_lib3ds'
-BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs'
 BF_LIB3DS_INC = '${BF_LIB3DS}'
 
 #WITH_BF_NSPR = 'true'
diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript
index c9a77919f4f..656cecb4e75 100644
--- a/source/blender/freestyle/SConscript
+++ b/source/blender/freestyle/SConscript
@@ -74,13 +74,21 @@ env.BlenderLib (libname="bf_freestyle",
 ########################################################
 #	swig
 #
-# 	1] Run the following two commands in the source/blender/freestyle/intern/swig directory.
+# 	1] Run the following three commands in the source/blender/freestyle/intern/swig directory.
 #
 #	2] Replace /Users/mx/Documents/work/GSoC_2008/bf-blender/branches/build/darwin/lib to the path
 #	of your library directory (used to locate libbf_freestyle.a)
 #
 #   3] Replace the python directories to suit your config
 
+# export SWIG_LIB=/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/soc-2008-mxcurioni/extern/freestyle/swig/Lib
+
+# cd /Users/mx/Documents/work/GSoC_2008/bf-blender/branches/soc-2008-mxcurioni/source/blender/freestyle/intern/swig
+
+# /Users/mx/Documents/work/GSoC_2008/bf-blender/branches/build/darwin/bin/swig -c++ -python -o ModuleWrapper.cpp Freestyle.i
+
+# mv ./Freestyle.py ../../python/
+
 # g++ -w  -I../geometry -I../image -I../scene_graph -I../stroke -I../system -I../view_map -I../winged_edge -I/usr/include/python2.5 -I../../../blenlib -I../../../blenkernel -I../../../imbuf -I../../../makesdna -c ModuleWrapper.cpp -o ModuleWrapper.o
 
 ###########  Mac OS X ###########
diff --git a/source/blender/freestyle/intern/app_blender/api.cpp b/source/blender/freestyle/intern/app_blender/api.cpp
index a021e30a6e5..c097b64ef53 100644
--- a/source/blender/freestyle/intern/app_blender/api.cpp
+++ b/source/blender/freestyle/intern/app_blender/api.cpp
@@ -11,10 +11,11 @@ extern "C" {
 #endif
 
 #include "render_types.h"
-//#include "renderdatabase.h"
-/* display_draw() needs render layer info */
 #include "renderpipeline.h"
 
+#include "BLI_blenlib.h"
+#include "BPY_extern.h"
+
 #ifdef __cplusplus
 }
 #endif
@@ -25,26 +26,50 @@ using namespace std;
 extern "C" {
 #endif
 
-	void FRS_execute(Render* re) {
-		cout << "Freestyle start" << endl;
-	
+	static Controller *controller = NULL;
+	static AppGLWidget *view = NULL;
+
+	void FRS_initialize(){
 		Config::Path pathconfig;
-		Controller *c = new Controller;
-		AppGLWidget *view = new AppGLWidget;
 		
-		c->SetView(view);
+		if( controller == NULL )
+			controller = new Controller;
+		
+		if( view == NULL )
+			view = new AppGLWidget;
+	}
+
+	void FRS_execute(Render* re) {
+			
+		FRS_initialize();
+		
+		controller->SetView(view);
 		unsigned int width = re->winx;
 		unsigned int height = re->winy;
 		view->setWidth(width);
 		view->setHeight(height);
+		view->_camera->setScreenWidthAndHeight(width, height);
+		//view->setCameraState(const float* position, const float* orientation) 
 		
-		c->Load3DSFile( TEST_3DS_FILE );
+		BPY_run_python_script( TEST_3DS_EXPORT );
 		
-		c->InsertStyleModule( 0, TEST_STYLE_MODULE_FILE );
-		c->toggleLayer(0, true);
-		c->ComputeViewMap();
+		char btempdir[255];
+		BLI_where_is_temp(btempdir,1);
+		string exported_3ds_file =  btempdir;
+		exported_3ds_file += "/tmp_scene_freestyle.3ds";
+		if( BLI_exists( const_cast<char *>(exported_3ds_file.c_str()) ) ) {
+			controller->Load3DSFile( exported_3ds_file.c_str() );
+		}
+		else {
+			cout << "Cannot find" << exported_3ds_file << endl;
+			return;
+		}
 		
-		c->DrawStrokes(); // build strokes
+		controller->InsertStyleModule( 0, TEST_STYLE_MODULE_FILE );
+		controller->toggleLayer(0, true);
+		controller->ComputeViewMap();
+		
+		controller->DrawStrokes(); // build strokes
 		view->draw(); // render final result
 		
 		RenderResult rres;
@@ -52,8 +77,6 @@ extern "C" {
 		view->readPixels(0,0,width,height,AppGLWidget::RGBA, rres.rectf );		
 		re->result->renlay = render_get_active_layer(re, re->result);
 		re->display_draw(re->result, NULL);
-		
-		cout << "Freestyle end" << endl;
 
 	}
 	
diff --git a/source/blender/freestyle/intern/app_blender/test_config.h b/source/blender/freestyle/intern/app_blender/test_config.h
index 6507050a4e4..c2337c0ba4c 100644
--- a/source/blender/freestyle/intern/app_blender/test_config.h
+++ b/source/blender/freestyle/intern/app_blender/test_config.h
@@ -1,8 +1,10 @@
-
-#define TEST_3DS_FILE "/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/soc-2008-mxcurioni/source/blender/freestyle/data/models/teapot.3DS"
-
 #define TEST_STYLE_MODULE_FILE "/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules/contour.py"
 
 #define TEST_ROOT_DIR "/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/soc-2008-mxcurioni/source/blender/freestyle"
 
 #define TEST_TEXTURE_FILE "/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/soc-2008-mxcurioni/source/blender/freestyle/data/textures/papers/whitepaper.jpg"
+
+
+
+
+#define TEST_3DS_EXPORT "/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/soc-2008-mxcurioni/source/blender/freestyle/python/3ds_export.py"
diff --git a/source/blender/freestyle/intern/swig/ModuleWrapper.cpp b/source/blender/freestyle/intern/swig/ModuleWrapper.cpp
index 36bd39b2b15..94662595bd9 100755
--- a/source/blender/freestyle/intern/swig/ModuleWrapper.cpp
+++ b/source/blender/freestyle/intern/swig/ModuleWrapper.cpp
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.31
+ * Version 1.3.35
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -13,7 +13,7 @@
 #define SWIG_PYTHON_DIRECTOR_NO_VTABLE
 
 #ifdef __cplusplus
-template<class T> class SwigValueWrapper {
+template<typename T> class SwigValueWrapper {
     T *tt;
 public:
     SwigValueWrapper() : tt(0) { }
@@ -26,6 +26,10 @@ public:
 private:
     SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs);
 };
+
+template <typename T> T SwigValueInit() {
+  return T();
+}
 #endif
 
 /* -----------------------------------------------------------------------------
@@ -35,14 +39,14 @@ private:
 
 /* template workaround for compilers that cannot correctly implement the C++ standard */
 #ifndef SWIGTEMPLATEDISAMBIGUATOR
-# if defined(__SUNPRO_CC)
-#   if (__SUNPRO_CC <= 0x560)
-#     define SWIGTEMPLATEDISAMBIGUATOR template
-#   else
-#     define SWIGTEMPLATEDISAMBIGUATOR 
-#   endif
+# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560)
+#  define SWIGTEMPLATEDISAMBIGUATOR template
+# elif defined(__HP_aCC)
+/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */
+/* If we find a maximum version that requires this, the test would be __HP_aCC <= 35500 for A.03.55 */
+#  define SWIGTEMPLATEDISAMBIGUATOR template
 # else
-#   define SWIGTEMPLATEDISAMBIGUATOR 
+#  define SWIGTEMPLATEDISAMBIGUATOR
 # endif
 #endif
 
@@ -125,6 +129,12 @@ private:
 # define _CRT_SECURE_NO_DEPRECATE
 #endif
 
+/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */
+#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE)
+# define _SCL_SECURE_NO_DEPRECATE
+#endif
+
+
 
 /* Python.h has to appear first */
 #include <Python.h>
@@ -138,7 +148,7 @@ private:
 
 /* This should only be incremented when either the layout of swig_type_info changes,
    or for whatever reason, the runtime changes incompatibly */
-#define SWIG_RUNTIME_VERSION "3"
+#define SWIG_RUNTIME_VERSION "4"
 
 /* define SWIG_TYPE_TABLE_NAME as "SWIG_TYPE_TABLE" */
 #ifdef SWIG_TYPE_TABLE
@@ -173,6 +183,7 @@ private:
 
 /* Flags for pointer conversions */
 #define SWIG_POINTER_DISOWN        0x1
+#define SWIG_CAST_NEW_MEMORY       0x2
 
 /* Flags for new pointer objects */
 #define SWIG_POINTER_OWN           0x1
@@ -313,10 +324,10 @@ SWIGINTERNINLINE int SWIG_CheckState(int r) {
 extern "C" {
 #endif
 
-typedef void *(*swig_converter_func)(void *);
+typedef void *(*swig_converter_func)(void *, int *);
 typedef struct swig_type_info *(*swig_dycast_func)(void **);
 
-/* Structure to store inforomation on one type */
+/* Structure to store information on one type */
 typedef struct swig_type_info {
   const char             *name;			/* mangled name of this type */
   const char             *str;			/* human readable name of this type */
@@ -361,7 +372,7 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
     while ((*f2 == ' ') && (f2 != l2)) ++f2;
     if (*f1 != *f2) return (*f1 > *f2) ? 1 : -1;
   }
-  return (l1 - f1) - (l2 - f2);
+  return (int)((l1 - f1) - (l2 - f2));
 }
 
 /*
@@ -443,8 +454,8 @@ SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *into) {
   Cast a pointer up an inheritance hierarchy
 */
 SWIGRUNTIMEINLINE void *
-SWIG_TypeCast(swig_cast_info *ty, void *ptr) {
-  return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr);
+SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
+  return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
 }
 
 /* 
@@ -868,7 +879,7 @@ SWIG_Python_AddErrorMsg(const char* mesg)
     Py_DECREF(old_str);
     Py_DECREF(value);
   } else {
-    PyErr_Format(PyExc_RuntimeError, mesg);
+    PyErr_SetString(PyExc_RuntimeError, mesg);
   }
 }
 
@@ -1108,14 +1119,14 @@ SWIG_Python_AppendOutput(PyObject* result, PyObject* obj) {
 /* Unpack the argument tuple */
 
 SWIGINTERN int
-SWIG_Python_UnpackTuple(PyObject *args, const char *name, int min, int max, PyObject **objs)
+SWIG_Python_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssize_t max, PyObject **objs)
 {
   if (!args) {
     if (!min && !max) {
       return 1;
     } else {
       PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got none", 
-		   name, (min == max ? "" : "at least "), min);
+		   name, (min == max ? "" : "at least "), (int)min);
       return 0;
     }
   }  
@@ -1123,14 +1134,14 @@ SWIG_Python_UnpackTuple(PyObject *args, const char *name, int min, int max, PyOb
     PyErr_SetString(PyExc_SystemError, "UnpackTuple() argument list is not a tuple");
     return 0;
   } else {
-    register int l = PyTuple_GET_SIZE(args);
+    register Py_ssize_t l = PyTuple_GET_SIZE(args);
     if (l < min) {
       PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got %d", 
-		   name, (min == max ? "" : "at least "), min, l);
+		   name, (min == max ? "" : "at least "), (int)min, (int)l);
       return 0;
     } else if (l > max) {
       PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got %d", 
-		   name, (min == max ? "" : "at most "), max, l);
+		   name, (min == max ? "" : "at most "), (int)max, (int)l);
       return 0;
     } else {
       register int i;
@@ -1428,7 +1439,7 @@ PySwigObject_dealloc(PyObject *v)
 {
   PySwigObject *sobj = (PySwigObject *) v;
   PyObject *next = sobj->next;
-  if (sobj->own) {
+  if (sobj->own == SWIG_POINTER_OWN) {
     swig_type_info *ty = sobj->ty;
     PySwigClientData *data = ty ? (PySwigClientData *) ty->clientdata : 0;
     PyObject *destroy = data ? data->destroy : 0;
@@ -1446,12 +1457,13 @@ PySwigObject_dealloc(PyObject *v)
 	res = ((*meth)(mself, v));
       }
       Py_XDECREF(res);
-    } else {
-      const char *name = SWIG_TypePrettyName(ty);
+    } 
 #if !defined(SWIG_PYTHON_SILENT_MEMLEAK)
-      printf("swig/python detected a memory leak of type '%s', no destructor found.\n", name);
-#endif
+    else {
+      const char *name = SWIG_TypePrettyName(ty);
+      printf("swig/python detected a memory leak of type '%s', no destructor found.\n", (name ? name : "unknown"));
     }
+#endif
   } 
   Py_XDECREF(next);
   PyObject_DEL(v);
@@ -1609,9 +1621,11 @@ _PySwigObject_type(void) {
     (unaryfunc)0,                 /*nb_float*/
     (unaryfunc)PySwigObject_oct,  /*nb_oct*/
     (unaryfunc)PySwigObject_hex,  /*nb_hex*/
-#if PY_VERSION_HEX >= 0x02020000
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_true_divide */ 
-#elif PY_VERSION_HEX >= 0x02000000
+#if PY_VERSION_HEX >= 0x02050000 /* 2.5.0 */
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_index */
+#elif PY_VERSION_HEX >= 0x02020000 /* 2.2.0 */
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_true_divide */
+#elif PY_VERSION_HEX >= 0x02000000 /* 2.0.0 */
     0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_or */
 #endif
   };
@@ -1954,7 +1968,7 @@ SWIG_Python_GetSwigThis(PyObject *pyobj)
 
 SWIGRUNTIME int
 SWIG_Python_AcquirePtr(PyObject *obj, int own) {
-  if (own) {
+  if (own == SWIG_POINTER_OWN) {
     PySwigObject *sobj = SWIG_Python_GetSwigThis(obj);
     if (sobj) {
       int oldown = sobj->own;
@@ -1975,6 +1989,8 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
     return SWIG_OK;
   } else {
     PySwigObject *sobj = SWIG_Python_GetSwigThis(obj);
+    if (own)
+      *own = 0;
     while (sobj) {
       void *vptr = sobj->ptr;
       if (ty) {
@@ -1988,7 +2004,15 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
 	  if (!tc) {
 	    sobj = (PySwigObject *)sobj->next;
 	  } else {
-	    if (ptr) *ptr = SWIG_TypeCast(tc,vptr);
+	    if (ptr) {
+              int newmemory = 0;
+              *ptr = SWIG_TypeCast(tc,vptr,&newmemory);
+              if (newmemory == SWIG_CAST_NEW_MEMORY) {
+                assert(own);
+                if (own)
+                  *own = *own | SWIG_CAST_NEW_MEMORY;
+              }
+            }
 	    break;
 	  }
 	}
@@ -1998,7 +2022,8 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
       }
     }
     if (sobj) {
-      if (own) *own = sobj->own;
+      if (own)
+        *own = *own | sobj->own;
       if (flags & SWIG_POINTER_DISOWN) {
 	sobj->own = 0;
       }
@@ -2063,8 +2088,13 @@ SWIG_Python_ConvertFunctionPtr(PyObject *obj, void **ptr, swig_type_info *ty) {
     }
     if (ty) {
       swig_cast_info *tc = SWIG_TypeCheck(desc,ty);
-      if (!tc) return SWIG_ERROR;
-      *ptr = SWIG_TypeCast(tc,vptr);
+      if (tc) {
+        int newmemory = 0;
+        *ptr = SWIG_TypeCast(tc,vptr,&newmemory);
+        assert(!newmemory); /* newmemory handling not yet implemented */
+      } else {
+        return SWIG_ERROR;
+      }
     } else {
       *ptr = vptr;
     }
@@ -2680,6 +2710,7 @@ namespace Swig {
         swig_msg += msg;
       }
       if (!PyErr_Occurred()) {
+        swig_msg.insert(0, ": ");
         PyErr_SetString(error, getMessage());
       } else {
         SWIG_Python_AddErrorMsg(getMessage());
@@ -2774,7 +2805,7 @@ namespace Swig {
   class DirectorMethodException : public Swig::DirectorException {
   public:
     DirectorMethodException(const char* msg = "") 
-      : DirectorException(PyExc_RuntimeError, "Swig director method error", msg)
+      : DirectorException(PyExc_RuntimeError, "Swig director method error.", msg)
     {
     }    
 
@@ -2807,33 +2838,21 @@ namespace Swig {
 # endif
 #endif
 
-/* simple thread abstraction for pthreads on win32 */
 #ifdef __THREAD__
-# define __PTHREAD__
-# if defined(_WIN32) || defined(__WIN32__)
-#  define pthread_mutex_lock EnterCriticalSection
-#  define pthread_mutex_unlock LeaveCriticalSection
-#  define pthread_mutex_t CRITICAL_SECTION
-#  define SWIG_MUTEX_INIT(var) var
-# else
-#  include <pthread.h>
-#  define SWIG_MUTEX_INIT(var) var = PTHREAD_MUTEX_INITIALIZER 
-# endif
-#endif
-
-#ifdef  __PTHREAD__
-  struct Guard
+# include "pythread.h"
+  class Guard
   {
-    pthread_mutex_t *_mutex;
+    PyThread_type_lock & mutex_;
     
-    Guard(pthread_mutex_t &mutex) : _mutex(&mutex)
+  public:
+    Guard(PyThread_type_lock & mutex) : mutex_(mutex)
     {
-      pthread_mutex_lock(_mutex);
+      PyThread_acquire_lock(mutex_, WAIT_LOCK);
     }
     
     ~Guard()
     {
-      pthread_mutex_unlock(_mutex);
+      PyThread_release_lock(mutex_);
     }
   };
 # define SWIG_GUARD(mutex) Guard _guard(mutex)
@@ -2904,8 +2923,8 @@ namespace Swig {
   private:
     typedef std::map<void*, GCItem_var> ownership_map;
     mutable ownership_map owner;
-#ifdef __PTHREAD__
-    static pthread_mutex_t swig_mutex_own;
+#ifdef __THREAD__
+    static PyThread_type_lock swig_mutex_own;
 #endif
 
   public:
@@ -2950,8 +2969,8 @@ namespace Swig {
     }
   };
 
-#ifdef __PTHREAD__
-  pthread_mutex_t SWIG_MUTEX_INIT(Director::swig_mutex_own);
+#ifdef __THREAD__
+  PyThread_type_lock Director::swig_mutex_own = PyThread_allocate_lock();
 #endif
 }
 
@@ -2963,7 +2982,7 @@ namespace Swig {
 /* -------- TYPES TABLE (BEGIN) -------- */
 
 #define SWIGTYPE_p_AdjacencyIterator swig_types[0]
-#define SWIGTYPE_p_BBoxTVecMat__Vec3Tdouble_t_t swig_types[1]
+#define SWIGTYPE_p_BBoxT_VecMat__Vec3T_double_t_t swig_types[1]
 #define SWIGTYPE_p_BinaryPredicate0D swig_types[2]
 #define SWIGTYPE_p_BinaryPredicate1D swig_types[3]
 #define SWIGTYPE_p_CalligraphicShader swig_types[4]
@@ -3114,56 +3133,56 @@ namespace Swig {
 #define SWIGTYPE_p_StrokesContainer swig_types[149]
 #define SWIGTYPE_p_StyleModule swig_types[150]
 #define SWIGTYPE_p_TVertex swig_types[151]
-#define SWIGTYPE_p_UnaryFunction0DTId_t swig_types[152]
-#define SWIGTYPE_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t swig_types[153]
-#define SWIGTYPE_p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t swig_types[154]
-#define SWIGTYPE_p_UnaryFunction0DTViewShape_p_t swig_types[155]
-#define SWIGTYPE_p_UnaryFunction0DTdouble_t swig_types[156]
-#define SWIGTYPE_p_UnaryFunction0DTfloat_t swig_types[157]
-#define SWIGTYPE_p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t swig_types[158]
-#define SWIGTYPE_p_UnaryFunction0DTunsigned_int_t swig_types[159]
-#define SWIGTYPE_p_UnaryFunction0DTvoid_t swig_types[160]
-#define SWIGTYPE_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t swig_types[161]
-#define SWIGTYPE_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t swig_types[162]
-#define SWIGTYPE_p_UnaryFunction1DTdouble_t swig_types[163]
-#define SWIGTYPE_p_UnaryFunction1DTfloat_t swig_types[164]
-#define SWIGTYPE_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t swig_types[165]
-#define SWIGTYPE_p_UnaryFunction1DTunsigned_int_t swig_types[166]
-#define SWIGTYPE_p_UnaryFunction1DTvoid_t swig_types[167]
+#define SWIGTYPE_p_UnaryFunction0DT_Id_t swig_types[152]
+#define SWIGTYPE_p_UnaryFunction0DT_VecMat__Vec2T_float_t_t swig_types[153]
+#define SWIGTYPE_p_UnaryFunction0DT_VecMat__Vec3T_float_t_t swig_types[154]
+#define SWIGTYPE_p_UnaryFunction0DT_ViewShape_p_t swig_types[155]
+#define SWIGTYPE_p_UnaryFunction0DT_double_t swig_types[156]
+#define SWIGTYPE_p_UnaryFunction0DT_float_t swig_types[157]
+#define SWIGTYPE_p_UnaryFunction0DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t swig_types[158]
+#define SWIGTYPE_p_UnaryFunction0DT_unsigned_int_t swig_types[159]
+#define SWIGTYPE_p_UnaryFunction0DT_void_t swig_types[160]
+#define SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec2T_float_t_t swig_types[161]
+#define SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec3T_float_t_t swig_types[162]
+#define SWIGTYPE_p_UnaryFunction1DT_double_t swig_types[163]
+#define SWIGTYPE_p_UnaryFunction1DT_float_t swig_types[164]
+#define SWIGTYPE_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t swig_types[165]
+#define SWIGTYPE_p_UnaryFunction1DT_unsigned_int_t swig_types[166]
+#define SWIGTYPE_p_UnaryFunction1DT_void_t swig_types[167]
 #define SWIGTYPE_p_UnaryPredicate0D swig_types[168]
 #define SWIGTYPE_p_UnaryPredicate1D swig_types[169]
-#define SWIGTYPE_p_VecMat__HVec3Tdouble_t swig_types[170]
-#define SWIGTYPE_p_VecMat__HVec3Tfloat_t swig_types[171]
-#define SWIGTYPE_p_VecMat__HVec3Tint_t swig_types[172]
-#define SWIGTYPE_p_VecMat__HVec3Tunsigned_int_t swig_types[173]
-#define SWIGTYPE_p_VecMat__SquareMatrixTdouble_2_t swig_types[174]
-#define SWIGTYPE_p_VecMat__SquareMatrixTdouble_3_t swig_types[175]
-#define SWIGTYPE_p_VecMat__SquareMatrixTdouble_4_t swig_types[176]
-#define SWIGTYPE_p_VecMat__SquareMatrixTfloat_2_t swig_types[177]
-#define SWIGTYPE_p_VecMat__SquareMatrixTfloat_3_t swig_types[178]
-#define SWIGTYPE_p_VecMat__SquareMatrixTfloat_4_t swig_types[179]
-#define SWIGTYPE_p_VecMat__SquareMatrixTint_2_t swig_types[180]
-#define SWIGTYPE_p_VecMat__SquareMatrixTint_3_t swig_types[181]
-#define SWIGTYPE_p_VecMat__SquareMatrixTint_4_t swig_types[182]
-#define SWIGTYPE_p_VecMat__SquareMatrixTunsigned_int_2_t swig_types[183]
-#define SWIGTYPE_p_VecMat__SquareMatrixTunsigned_int_3_t swig_types[184]
-#define SWIGTYPE_p_VecMat__SquareMatrixTunsigned_int_4_t swig_types[185]
-#define SWIGTYPE_p_VecMat__Vec2Tdouble_t swig_types[186]
-#define SWIGTYPE_p_VecMat__Vec2Tfloat_t swig_types[187]
-#define SWIGTYPE_p_VecMat__Vec2Tint_t swig_types[188]
-#define SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t swig_types[189]
-#define SWIGTYPE_p_VecMat__Vec3Tdouble_t swig_types[190]
-#define SWIGTYPE_p_VecMat__Vec3Tfloat_t swig_types[191]
-#define SWIGTYPE_p_VecMat__Vec3Tint_t swig_types[192]
-#define SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t swig_types[193]
-#define SWIGTYPE_p_VecMat__VecTdouble_2_t swig_types[194]
-#define SWIGTYPE_p_VecMat__VecTdouble_3_t swig_types[195]
-#define SWIGTYPE_p_VecMat__VecTfloat_2_t swig_types[196]
-#define SWIGTYPE_p_VecMat__VecTfloat_3_t swig_types[197]
-#define SWIGTYPE_p_VecMat__VecTint_2_t swig_types[198]
-#define SWIGTYPE_p_VecMat__VecTint_3_t swig_types[199]
-#define SWIGTYPE_p_VecMat__VecTunsigned_int_2_t swig_types[200]
-#define SWIGTYPE_p_VecMat__VecTunsigned_int_3_t swig_types[201]
+#define SWIGTYPE_p_VecMat__HVec3T_double_t swig_types[170]
+#define SWIGTYPE_p_VecMat__HVec3T_float_t swig_types[171]
+#define SWIGTYPE_p_VecMat__HVec3T_int_t swig_types[172]
+#define SWIGTYPE_p_VecMat__HVec3T_unsigned_int_t swig_types[173]
+#define SWIGTYPE_p_VecMat__SquareMatrixT_double_2_t swig_types[174]
+#define SWIGTYPE_p_VecMat__SquareMatrixT_double_3_t swig_types[175]
+#define SWIGTYPE_p_VecMat__SquareMatrixT_double_4_t swig_types[176]
+#define SWIGTYPE_p_VecMat__SquareMatrixT_float_2_t swig_types[177]
+#define SWIGTYPE_p_VecMat__SquareMatrixT_float_3_t swig_types[178]
+#define SWIGTYPE_p_VecMat__SquareMatrixT_float_4_t swig_types[179]
+#define SWIGTYPE_p_VecMat__SquareMatrixT_int_2_t swig_types[180]
+#define SWIGTYPE_p_VecMat__SquareMatrixT_int_3_t swig_types[181]
+#define SWIGTYPE_p_VecMat__SquareMatrixT_int_4_t swig_types[182]
+#define SWIGTYPE_p_VecMat__SquareMatrixT_unsigned_int_2_t swig_types[183]
+#define SWIGTYPE_p_VecMat__SquareMatrixT_unsigned_int_3_t swig_types[184]
+#define SWIGTYPE_p_VecMat__SquareMatrixT_unsigned_int_4_t swig_types[185]
+#define SWIGTYPE_p_VecMat__Vec2T_double_t swig_types[186]
+#define SWIGTYPE_p_VecMat__Vec2T_float_t swig_types[187]
+#define SWIGTYPE_p_VecMat__Vec2T_int_t swig_types[188]
+#define SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t swig_types[189]
+#define SWIGTYPE_p_VecMat__Vec3T_double_t swig_types[190]
+#define SWIGTYPE_p_VecMat__Vec3T_float_t swig_types[191]
+#define SWIGTYPE_p_VecMat__Vec3T_int_t swig_types[192]
+#define SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t swig_types[193]
+#define SWIGTYPE_p_VecMat__VecT_double_2_t swig_types[194]
+#define SWIGTYPE_p_VecMat__VecT_double_3_t swig_types[195]
+#define SWIGTYPE_p_VecMat__VecT_float_2_t swig_types[196]
+#define SWIGTYPE_p_VecMat__VecT_float_3_t swig_types[197]
+#define SWIGTYPE_p_VecMat__VecT_int_2_t swig_types[198]
+#define SWIGTYPE_p_VecMat__VecT_int_3_t swig_types[199]
+#define SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t swig_types[200]
+#define SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t swig_types[201]
 #define SWIGTYPE_p_Vertex swig_types[202]
 #define SWIGTYPE_p_ViewEdge swig_types[203]
 #define SWIGTYPE_p_ViewEdgeInternal__SVertexIterator swig_types[204]
@@ -3171,8 +3190,8 @@ namespace Swig {
 #define SWIGTYPE_p_ViewMap swig_types[206]
 #define SWIGTYPE_p_ViewShape swig_types[207]
 #define SWIGTYPE_p_ViewVertex swig_types[208]
-#define SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t swig_types[209]
-#define SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t swig_types[210]
+#define SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_const_traits_t swig_types[209]
+#define SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_nonconst_traits_t swig_types[210]
 #define SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator swig_types[211]
 #define SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator__edge_pointers_container__iterator swig_types[212]
 #define SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator__edges_container__iterator swig_types[213]
@@ -3192,59 +3211,61 @@ namespace Swig {
 #define SWIGTYPE_p_fedge_iterator swig_types[227]
 #define SWIGTYPE_p_fedges_container swig_types[228]
 #define SWIGTYPE_p_float swig_types[229]
-#define SWIGTYPE_p_id_type swig_types[230]
-#define SWIGTYPE_p_int swig_types[231]
-#define SWIGTYPE_p_ltstr swig_types[232]
-#define SWIGTYPE_p_mapsMap swig_types[233]
-#define SWIGTYPE_p_occluder_container__const_iterator swig_types[234]
-#define SWIGTYPE_p_p_PyObject swig_types[235]
-#define SWIGTYPE_p_point_iterator swig_types[236]
-#define SWIGTYPE_p_point_type swig_types[237]
-#define SWIGTYPE_p_reference swig_types[238]
-#define SWIGTYPE_p_setTVecMat__Vec3Tdouble_t_t swig_types[239]
-#define SWIGTYPE_p_size_type swig_types[240]
-#define SWIGTYPE_p_std__invalid_argument swig_types[241]
-#define SWIGTYPE_p_std__pairTViewEdge_p_bool_t swig_types[242]
-#define SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t swig_types[243]
-#define SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__allocator_type swig_types[244]
-#define SWIGTYPE_p_std__vectorTMaterial_std__allocatorTMaterial_t_t swig_types[245]
-#define SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t swig_types[246]
-#define SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__allocator_type swig_types[247]
-#define SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t swig_types[248]
-#define SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__allocator_type swig_types[249]
-#define SWIGTYPE_p_std__vectorTTVertex_p_std__allocatorTTVertex_p_t_t swig_types[250]
-#define SWIGTYPE_p_std__vectorTVecMat__Vec2Tdouble_t_std__allocatorTVecMat__Vec2Tdouble_t_t_t swig_types[251]
-#define SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t swig_types[252]
-#define SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__allocator_type swig_types[253]
-#define SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t swig_types[254]
-#define SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__allocator_type swig_types[255]
-#define SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t swig_types[256]
-#define SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__allocator_type swig_types[257]
-#define SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t swig_types[258]
-#define SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t__allocator_type swig_types[259]
-#define SWIGTYPE_p_std__vectorTstd__pairTViewEdge_p_bool_t_std__allocatorTstd__pairTViewEdge_p_bool_t_t_t swig_types[260]
-#define SWIGTYPE_p_std__vectorTunsigned_int_std__allocatorTunsigned_int_t_t swig_types[261]
-#define SWIGTYPE_p_svertices_container swig_types[262]
-#define SWIGTYPE_p_swig__PySwigIterator swig_types[263]
-#define SWIGTYPE_p_unsigned_int swig_types[264]
-#define SWIGTYPE_p_unsigned_short swig_types[265]
-#define SWIGTYPE_p_value_type swig_types[266]
-#define SWIGTYPE_p_vertex_container swig_types[267]
-#define SWIGTYPE_p_vertex_iterator swig_types[268]
-#define SWIGTYPE_p_vertex_type swig_types[269]
-#define SWIGTYPE_p_viewedge_container swig_types[270]
-#define SWIGTYPE_p_viewedges_container swig_types[271]
-#define SWIGTYPE_p_viewshapes_container swig_types[272]
-#define SWIGTYPE_p_viewvertices_container swig_types[273]
-#define SWIGTYPE_p_void swig_types[274]
-#define SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type swig_types[275]
-#define SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type swig_types[276]
-#define SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type swig_types[277]
-#define SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type swig_types[278]
-#define SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type swig_types[279]
-#define SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type swig_types[280]
-static swig_type_info *swig_types[282];
-static swig_module_info swig_module = {swig_types, 281, 0, 0, 0, 0};
+#define SWIGTYPE_p_id_to_index_map swig_types[230]
+#define SWIGTYPE_p_id_type swig_types[231]
+#define SWIGTYPE_p_int swig_types[232]
+#define SWIGTYPE_p_ltstr swig_types[233]
+#define SWIGTYPE_p_mapsMap swig_types[234]
+#define SWIGTYPE_p_occluder_container__const_iterator swig_types[235]
+#define SWIGTYPE_p_p_PyObject swig_types[236]
+#define SWIGTYPE_p_point_iterator swig_types[237]
+#define SWIGTYPE_p_point_type swig_types[238]
+#define SWIGTYPE_p_reference swig_types[239]
+#define SWIGTYPE_p_setT_VecMat__Vec3T_double_t_t swig_types[240]
+#define SWIGTYPE_p_size_type swig_types[241]
+#define SWIGTYPE_p_std__invalid_argument swig_types[242]
+#define SWIGTYPE_p_std__mapT_int_int_std__lessT_int_t_std__allocatorT_std__pairT_int_const_int_t_t_t swig_types[243]
+#define SWIGTYPE_p_std__pairT_ViewEdge_p_bool_t swig_types[244]
+#define SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t swig_types[245]
+#define SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__allocator_type swig_types[246]
+#define SWIGTYPE_p_std__vectorT_Material_std__allocatorT_Material_t_t swig_types[247]
+#define SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t swig_types[248]
+#define SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__allocator_type swig_types[249]
+#define SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t swig_types[250]
+#define SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__allocator_type swig_types[251]
+#define SWIGTYPE_p_std__vectorT_TVertex_p_std__allocatorT_TVertex_p_t_t swig_types[252]
+#define SWIGTYPE_p_std__vectorT_VecMat__Vec2T_double_t_std__allocatorT_VecMat__Vec2T_double_t_t_t swig_types[253]
+#define SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t swig_types[254]
+#define SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__allocator_type swig_types[255]
+#define SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t swig_types[256]
+#define SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__allocator_type swig_types[257]
+#define SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t swig_types[258]
+#define SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__allocator_type swig_types[259]
+#define SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t swig_types[260]
+#define SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t__allocator_type swig_types[261]
+#define SWIGTYPE_p_std__vectorT_std__pairT_ViewEdge_p_bool_t_std__allocatorT_std__pairT_ViewEdge_p_bool_t_t_t swig_types[262]
+#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t swig_types[263]
+#define SWIGTYPE_p_svertices_container swig_types[264]
+#define SWIGTYPE_p_swig__PySwigIterator swig_types[265]
+#define SWIGTYPE_p_unsigned_int swig_types[266]
+#define SWIGTYPE_p_unsigned_short swig_types[267]
+#define SWIGTYPE_p_value_type swig_types[268]
+#define SWIGTYPE_p_vertex_container swig_types[269]
+#define SWIGTYPE_p_vertex_iterator swig_types[270]
+#define SWIGTYPE_p_vertex_type swig_types[271]
+#define SWIGTYPE_p_viewedge_container swig_types[272]
+#define SWIGTYPE_p_viewedges_container swig_types[273]
+#define SWIGTYPE_p_viewshapes_container swig_types[274]
+#define SWIGTYPE_p_viewvertices_container swig_types[275]
+#define SWIGTYPE_p_void swig_types[276]
+#define SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type swig_types[277]
+#define SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type swig_types[278]
+#define SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type swig_types[279]
+#define SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type swig_types[280]
+#define SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type swig_types[281]
+#define SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type swig_types[282]
+static swig_type_info *swig_types[284];
+static swig_module_info swig_module = {swig_types, 283, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -3263,7 +3284,7 @@ static swig_module_info swig_module = {swig_types, 281, 0, 0, 0, 0};
 
 #define SWIG_name    "_Freestyle"
 
-#define SWIGVERSION 0x010331 
+#define SWIGVERSION 0x010335 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -3291,7 +3312,9 @@ namespace swig {
     
     PyObject_ptr(PyObject *obj, bool initial_ref = true) :_obj(obj)
     {
-      if (initial_ref) Py_XINCREF(_obj);
+      if (initial_ref) {
+        Py_XINCREF(_obj);
+      }
     }
     
     PyObject_ptr & operator=(const PyObject_ptr& item) 
@@ -3439,17 +3462,22 @@ namespace swig {
     // C++ common/needed methods
     virtual PySwigIterator *copy() const = 0;
 
-    PyObject *next()
+    PyObject *next()     
     {
+      SWIG_PYTHON_THREAD_BEGIN_BLOCK; // disable threads       
       PyObject *obj = value();
-      incr();
-      return obj;
+      incr();       
+      SWIG_PYTHON_THREAD_END_BLOCK; // re-enable threads
+      return obj;     
     }
 
     PyObject *previous()
     {
+      SWIG_PYTHON_THREAD_BEGIN_BLOCK; // disable threads       
       decr();
-      return value();
+      PyObject *obj = value();
+      SWIG_PYTHON_THREAD_END_BLOCK; // re-enable threads       
+      return obj;
     }
 
     PySwigIterator *advance(ptrdiff_t n)
@@ -4532,12 +4560,12 @@ namespace swig
 
     ~PySequence_Cont()
     {
-      if (_seq) Py_DECREF(_seq);
+      Py_XDECREF(_seq);
     }
 
     size_type size() const
     {
-      return PySequence_Size(_seq);
+      return static_cast<size_type>(PySequence_Size(_seq));
     }
 
     bool empty() const
@@ -4600,14 +4628,12 @@ namespace swig
 
 
 #include <limits.h>
-#ifndef LLONG_MIN
-# define LLONG_MIN	LONG_LONG_MIN
-#endif
-#ifndef LLONG_MAX
-# define LLONG_MAX	LONG_LONG_MAX
-#endif
-#ifndef ULLONG_MAX
-# define ULLONG_MAX	ULONG_LONG_MAX
+#if !defined(SWIG_NO_LLONG_MAX)
+# if !defined(LLONG_MAX) && defined(__GNUC__) && defined (__LONG_LONG_MAX__)
+#   define LLONG_MAX __LONG_LONG_MAX__
+#   define LLONG_MIN (-LLONG_MAX - 1LL)
+#   define ULLONG_MAX (LLONG_MAX * 2ULL + 1ULL)
+# endif
 #endif
 
 
@@ -4675,7 +4701,14 @@ namespace swig {
     typedef T value_type;
 
     static int asptr(PyObject *obj, sequence **seq) {
-      if (PySequence_Check(obj)) {
+      if (obj == Py_None || SWIG_Python_GetSwigThis(obj)) {
+	sequence *p;
+	if (SWIG_ConvertPtr(obj,(void**)&p,
+			    swig::type_info<sequence>(),0) == SWIG_OK) {
+	  if (seq) *seq = p;
+	  return SWIG_OLDOBJ;
+	}
+      } else if (PySequence_Check(obj)) {
 	try {
 	  PySequence_Cont<value_type> pyseq(obj);
 	  if (seq) {
@@ -4694,13 +4727,6 @@ namespace swig {
 	  }
 	  return SWIG_ERROR;
 	}
-      } else {
-	sequence *p;
-	if (SWIG_ConvertPtr(obj,(void**)&p,
-			    swig::type_info<sequence>(),0) == SWIG_OK) {
-	  if (seq) *seq = p;
-	  return SWIG_OLDOBJ;
-	}
       }
       return SWIG_ERROR;
     }
@@ -4756,21 +4782,21 @@ namespace swig {
 
 
       namespace swig {
-	template <>  struct traits<std::vector<int, std::allocator<int > > > {
+	template <>  struct traits<std::vector<int, std::allocator< int > > > {
 	  typedef pointer_category category;
 	  static const char* type_name() {
-	    return "std::vector<" "int" "," "std::allocator<int >" " >";
+	    return "std::vector<" "int" "," "std::allocator< int >" " >";
 	  }
 	};
       }
     
-SWIGINTERN swig::PySwigIterator *std_vector_Sl_int_Sg__iterator(std::vector<int > *self,PyObject **PYTHON_SELF){
+SWIGINTERN swig::PySwigIterator *std_vector_Sl_int_Sg__iterator(std::vector< int > *self,PyObject **PYTHON_SELF){
       return swig::make_output_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
     }
-SWIGINTERN bool std_vector_Sl_int_Sg____nonzero__(std::vector<int > const *self){
+SWIGINTERN bool std_vector_Sl_int_Sg____nonzero__(std::vector< int > const *self){
       return !(self->empty());
     }
-SWIGINTERN std::vector<int >::size_type std_vector_Sl_int_Sg____len__(std::vector<int > const *self){
+SWIGINTERN std::vector< int >::size_type std_vector_Sl_int_Sg____len__(std::vector< int > const *self){
       return self->size();
     }
 
@@ -4788,32 +4814,32 @@ SWIG_From_size_t  (size_t value)
   return SWIG_From_unsigned_SS_long  (static_cast< unsigned long >(value));
 }
 
-SWIGINTERN std::vector<int >::value_type std_vector_Sl_int_Sg__pop(std::vector<int > *self){
+SWIGINTERN std::vector< int >::value_type std_vector_Sl_int_Sg__pop(std::vector< int > *self){
       if (self->size() == 0)
 	throw std::out_of_range("pop from empty container");
-      std::vector<int,std::allocator<int > >::value_type x = self->back();
+      std::vector<int,std::allocator< int > >::value_type x = self->back();
       self->pop_back();
       return x;
     }
-SWIGINTERN std::vector<int,std::allocator<int > > *std_vector_Sl_int_Sg____getslice__(std::vector<int > *self,std::vector<int >::difference_type i,std::vector<int >::difference_type j){
+SWIGINTERN std::vector< int,std::allocator< int > > *std_vector_Sl_int_Sg____getslice__(std::vector< int > *self,std::vector< int >::difference_type i,std::vector< int >::difference_type j){
       return swig::getslice(self, i, j);
     }
-SWIGINTERN void std_vector_Sl_int_Sg____setslice__(std::vector<int > *self,std::vector<int >::difference_type i,std::vector<int >::difference_type j,std::vector<int,std::allocator<int > > const &v){
+SWIGINTERN void std_vector_Sl_int_Sg____setslice__(std::vector< int > *self,std::vector< int >::difference_type i,std::vector< int >::difference_type j,std::vector< int,std::allocator< int > > const &v){
       swig::setslice(self, i, j, v);
     }
-SWIGINTERN void std_vector_Sl_int_Sg____delslice__(std::vector<int > *self,std::vector<int >::difference_type i,std::vector<int >::difference_type j){
+SWIGINTERN void std_vector_Sl_int_Sg____delslice__(std::vector< int > *self,std::vector< int >::difference_type i,std::vector< int >::difference_type j){
       swig::delslice(self, i, j);
     }
-SWIGINTERN void std_vector_Sl_int_Sg____delitem__(std::vector<int > *self,std::vector<int >::difference_type i){
+SWIGINTERN void std_vector_Sl_int_Sg____delitem__(std::vector< int > *self,std::vector< int >::difference_type i){
       self->erase(swig::getpos(self,i));
     }
-SWIGINTERN std::vector<int >::value_type const &std_vector_Sl_int_Sg____getitem__(std::vector<int > const *self,std::vector<int >::difference_type i){
+SWIGINTERN std::vector< int >::value_type const &std_vector_Sl_int_Sg____getitem__(std::vector< int > const *self,std::vector< int >::difference_type i){
       return *(swig::cgetpos(self, i));
     }
-SWIGINTERN void std_vector_Sl_int_Sg____setitem__(std::vector<int > *self,std::vector<int >::difference_type i,std::vector<int >::value_type const &x){
+SWIGINTERN void std_vector_Sl_int_Sg____setitem__(std::vector< int > *self,std::vector< int >::difference_type i,std::vector< int >::value_type const &x){
       *(swig::getpos(self,i)) = x;
     }
-SWIGINTERN void std_vector_Sl_int_Sg__append(std::vector<int > *self,std::vector<int >::value_type const &x){
+SWIGINTERN void std_vector_Sl_int_Sg__append(std::vector< int > *self,std::vector< int >::value_type const &x){
       self->push_back(x);
     }
 
@@ -4933,18 +4959,11 @@ SWIG_AsVal_unsigned_SS_short (PyObject * obj, unsigned short *val)
 SWIGINTERN int
 SWIG_AsVal_bool (PyObject *obj, bool *val)
 {
-  if (obj == Py_True) {
-    if (val) *val = true;
-    return SWIG_OK;
-  } else if (obj == Py_False) {
-    if (val) *val = false;
-    return SWIG_OK;
-  } else {
-    long v = 0;
-    int res = SWIG_AddCast(SWIG_AsVal_long (obj, val ? &v : 0));
-    if (SWIG_IsOK(res) && val) *val = v ? true : false;
-    return res;
-  }
+  int r = PyObject_IsTrue(obj);
+  if (r == -1)
+    return SWIG_ERROR;
+  if (val) *val = r ? true : false;
+  return SWIG_OK;
 }
 
 
@@ -4957,49 +4976,49 @@ SWIG_AsVal_bool (PyObject *obj, bool *val)
 
 
       namespace swig {
-	template <>  struct traits<std::vector<ViewShape*, std::allocator<ViewShape * > > > {
+	template <>  struct traits<std::vector<ViewShape*, std::allocator< ViewShape * > > > {
 	  typedef value_category category;
 	  static const char* type_name() {
-	    return "std::vector<" "ViewShape" " *," "std::allocator<ViewShape * >" " >";
+	    return "std::vector<" "ViewShape" " *," "std::allocator< ViewShape * >" " >";
 	  }
 	};
       }
     
-SWIGINTERN swig::PySwigIterator *std_vector_Sl_ViewShape_Sm__Sg__iterator(std::vector<ViewShape * > *self,PyObject **PYTHON_SELF){
+SWIGINTERN swig::PySwigIterator *std_vector_Sl_ViewShape_Sm__Sg__iterator(std::vector< ViewShape * > *self,PyObject **PYTHON_SELF){
       return swig::make_output_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
     }
-SWIGINTERN bool std_vector_Sl_ViewShape_Sm__Sg____nonzero__(std::vector<ViewShape * > const *self){
+SWIGINTERN bool std_vector_Sl_ViewShape_Sm__Sg____nonzero__(std::vector< ViewShape * > const *self){
       return !(self->empty());
     }
-SWIGINTERN std::vector<ViewShape * >::size_type std_vector_Sl_ViewShape_Sm__Sg____len__(std::vector<ViewShape * > const *self){
+SWIGINTERN std::vector< ViewShape * >::size_type std_vector_Sl_ViewShape_Sm__Sg____len__(std::vector< ViewShape * > const *self){
       return self->size();
     }
-SWIGINTERN std::vector<ViewShape * >::value_type std_vector_Sl_ViewShape_Sm__Sg__pop(std::vector<ViewShape * > *self){
+SWIGINTERN std::vector< ViewShape * >::value_type std_vector_Sl_ViewShape_Sm__Sg__pop(std::vector< ViewShape * > *self){
       if (self->size() == 0)
 	throw std::out_of_range("pop from empty container");
-      std::vector<ViewShape*,std::allocator<ViewShape * > >::value_type x = self->back();
+      std::vector<ViewShape*,std::allocator< ViewShape * > >::value_type x = self->back();
       self->pop_back();
       return x;
     }
-SWIGINTERN std::vector<ViewShape *,std::allocator<ViewShape * > > *std_vector_Sl_ViewShape_Sm__Sg____getslice__(std::vector<ViewShape * > *self,std::vector<ViewShape * >::difference_type i,std::vector<ViewShape * >::difference_type j){
+SWIGINTERN std::vector< ViewShape *,std::allocator< ViewShape * > > *std_vector_Sl_ViewShape_Sm__Sg____getslice__(std::vector< ViewShape * > *self,std::vector< ViewShape * >::difference_type i,std::vector< ViewShape * >::difference_type j){
       return swig::getslice(self, i, j);
     }
-SWIGINTERN void std_vector_Sl_ViewShape_Sm__Sg____setslice__(std::vector<ViewShape * > *self,std::vector<ViewShape * >::difference_type i,std::vector<ViewShape * >::difference_type j,std::vector<ViewShape *,std::allocator<ViewShape * > > const &v){
+SWIGINTERN void std_vector_Sl_ViewShape_Sm__Sg____setslice__(std::vector< ViewShape * > *self,std::vector< ViewShape * >::difference_type i,std::vector< ViewShape * >::difference_type j,std::vector< ViewShape *,std::allocator< ViewShape * > > const &v){
       swig::setslice(self, i, j, v);
     }
-SWIGINTERN void std_vector_Sl_ViewShape_Sm__Sg____delslice__(std::vector<ViewShape * > *self,std::vector<ViewShape * >::difference_type i,std::vector<ViewShape * >::difference_type j){
+SWIGINTERN void std_vector_Sl_ViewShape_Sm__Sg____delslice__(std::vector< ViewShape * > *self,std::vector< ViewShape * >::difference_type i,std::vector< ViewShape * >::difference_type j){
       swig::delslice(self, i, j);
     }
-SWIGINTERN void std_vector_Sl_ViewShape_Sm__Sg____delitem__(std::vector<ViewShape * > *self,std::vector<ViewShape * >::difference_type i){
+SWIGINTERN void std_vector_Sl_ViewShape_Sm__Sg____delitem__(std::vector< ViewShape * > *self,std::vector< ViewShape * >::difference_type i){
       self->erase(swig::getpos(self,i));
     }
-SWIGINTERN std::vector<ViewShape * >::value_type std_vector_Sl_ViewShape_Sm__Sg____getitem__(std::vector<ViewShape * > *self,std::vector<ViewShape * >::difference_type i){
+SWIGINTERN std::vector< ViewShape * >::value_type std_vector_Sl_ViewShape_Sm__Sg____getitem__(std::vector< ViewShape * > *self,std::vector< ViewShape * >::difference_type i){
       return *(swig::cgetpos(self, i));
     }
-SWIGINTERN void std_vector_Sl_ViewShape_Sm__Sg____setitem__(std::vector<ViewShape * > *self,std::vector<ViewShape * >::difference_type i,std::vector<ViewShape * >::value_type x){
+SWIGINTERN void std_vector_Sl_ViewShape_Sm__Sg____setitem__(std::vector< ViewShape * > *self,std::vector< ViewShape * >::difference_type i,std::vector< ViewShape * >::value_type x){
       *(swig::getpos(self,i)) = x;
     }
-SWIGINTERN void std_vector_Sl_ViewShape_Sm__Sg__append(std::vector<ViewShape * > *self,std::vector<ViewShape * >::value_type x){
+SWIGINTERN void std_vector_Sl_ViewShape_Sm__Sg__append(std::vector< ViewShape * > *self,std::vector< ViewShape * >::value_type x){
       self->push_back(x);
     }
 
@@ -5012,49 +5031,49 @@ SWIGINTERN void std_vector_Sl_ViewShape_Sm__Sg__append(std::vector<ViewShape * >
 
 
       namespace swig {
-	template <>  struct traits<std::vector<ViewEdge*, std::allocator<ViewEdge * > > > {
+	template <>  struct traits<std::vector<ViewEdge*, std::allocator< ViewEdge * > > > {
 	  typedef value_category category;
 	  static const char* type_name() {
-	    return "std::vector<" "ViewEdge" " *," "std::allocator<ViewEdge * >" " >";
+	    return "std::vector<" "ViewEdge" " *," "std::allocator< ViewEdge * >" " >";
 	  }
 	};
       }
     
-SWIGINTERN swig::PySwigIterator *std_vector_Sl_ViewEdge_Sm__Sg__iterator(std::vector<ViewEdge * > *self,PyObject **PYTHON_SELF){
+SWIGINTERN swig::PySwigIterator *std_vector_Sl_ViewEdge_Sm__Sg__iterator(std::vector< ViewEdge * > *self,PyObject **PYTHON_SELF){
       return swig::make_output_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
     }
-SWIGINTERN bool std_vector_Sl_ViewEdge_Sm__Sg____nonzero__(std::vector<ViewEdge * > const *self){
+SWIGINTERN bool std_vector_Sl_ViewEdge_Sm__Sg____nonzero__(std::vector< ViewEdge * > const *self){
       return !(self->empty());
     }
-SWIGINTERN std::vector<ViewEdge * >::size_type std_vector_Sl_ViewEdge_Sm__Sg____len__(std::vector<ViewEdge * > const *self){
+SWIGINTERN std::vector< ViewEdge * >::size_type std_vector_Sl_ViewEdge_Sm__Sg____len__(std::vector< ViewEdge * > const *self){
       return self->size();
     }
-SWIGINTERN std::vector<ViewEdge * >::value_type std_vector_Sl_ViewEdge_Sm__Sg__pop(std::vector<ViewEdge * > *self){
+SWIGINTERN std::vector< ViewEdge * >::value_type std_vector_Sl_ViewEdge_Sm__Sg__pop(std::vector< ViewEdge * > *self){
       if (self->size() == 0)
 	throw std::out_of_range("pop from empty container");
-      std::vector<ViewEdge*,std::allocator<ViewEdge * > >::value_type x = self->back();
+      std::vector<ViewEdge*,std::allocator< ViewEdge * > >::value_type x = self->back();
       self->pop_back();
       return x;
     }
-SWIGINTERN std::vector<ViewEdge *,std::allocator<ViewEdge * > > *std_vector_Sl_ViewEdge_Sm__Sg____getslice__(std::vector<ViewEdge * > *self,std::vector<ViewEdge * >::difference_type i,std::vector<ViewEdge * >::difference_type j){
+SWIGINTERN std::vector< ViewEdge *,std::allocator< ViewEdge * > > *std_vector_Sl_ViewEdge_Sm__Sg____getslice__(std::vector< ViewEdge * > *self,std::vector< ViewEdge * >::difference_type i,std::vector< ViewEdge * >::difference_type j){
       return swig::getslice(self, i, j);
     }
-SWIGINTERN void std_vector_Sl_ViewEdge_Sm__Sg____setslice__(std::vector<ViewEdge * > *self,std::vector<ViewEdge * >::difference_type i,std::vector<ViewEdge * >::difference_type j,std::vector<ViewEdge *,std::allocator<ViewEdge * > > const &v){
+SWIGINTERN void std_vector_Sl_ViewEdge_Sm__Sg____setslice__(std::vector< ViewEdge * > *self,std::vector< ViewEdge * >::difference_type i,std::vector< ViewEdge * >::difference_type j,std::vector< ViewEdge *,std::allocator< ViewEdge * > > const &v){
       swig::setslice(self, i, j, v);
     }
-SWIGINTERN void std_vector_Sl_ViewEdge_Sm__Sg____delslice__(std::vector<ViewEdge * > *self,std::vector<ViewEdge * >::difference_type i,std::vector<ViewEdge * >::difference_type j){
+SWIGINTERN void std_vector_Sl_ViewEdge_Sm__Sg____delslice__(std::vector< ViewEdge * > *self,std::vector< ViewEdge * >::difference_type i,std::vector< ViewEdge * >::difference_type j){
       swig::delslice(self, i, j);
     }
-SWIGINTERN void std_vector_Sl_ViewEdge_Sm__Sg____delitem__(std::vector<ViewEdge * > *self,std::vector<ViewEdge * >::difference_type i){
+SWIGINTERN void std_vector_Sl_ViewEdge_Sm__Sg____delitem__(std::vector< ViewEdge * > *self,std::vector< ViewEdge * >::difference_type i){
       self->erase(swig::getpos(self,i));
     }
-SWIGINTERN std::vector<ViewEdge * >::value_type std_vector_Sl_ViewEdge_Sm__Sg____getitem__(std::vector<ViewEdge * > *self,std::vector<ViewEdge * >::difference_type i){
+SWIGINTERN std::vector< ViewEdge * >::value_type std_vector_Sl_ViewEdge_Sm__Sg____getitem__(std::vector< ViewEdge * > *self,std::vector< ViewEdge * >::difference_type i){
       return *(swig::cgetpos(self, i));
     }
-SWIGINTERN void std_vector_Sl_ViewEdge_Sm__Sg____setitem__(std::vector<ViewEdge * > *self,std::vector<ViewEdge * >::difference_type i,std::vector<ViewEdge * >::value_type x){
+SWIGINTERN void std_vector_Sl_ViewEdge_Sm__Sg____setitem__(std::vector< ViewEdge * > *self,std::vector< ViewEdge * >::difference_type i,std::vector< ViewEdge * >::value_type x){
       *(swig::getpos(self,i)) = x;
     }
-SWIGINTERN void std_vector_Sl_ViewEdge_Sm__Sg__append(std::vector<ViewEdge * > *self,std::vector<ViewEdge * >::value_type x){
+SWIGINTERN void std_vector_Sl_ViewEdge_Sm__Sg__append(std::vector< ViewEdge * > *self,std::vector< ViewEdge * >::value_type x){
       self->push_back(x);
     }
 
@@ -5067,49 +5086,49 @@ SWIGINTERN void std_vector_Sl_ViewEdge_Sm__Sg__append(std::vector<ViewEdge * > *
 
 
       namespace swig {
-	template <>  struct traits<std::vector<FEdge*, std::allocator<FEdge * > > > {
+	template <>  struct traits<std::vector<FEdge*, std::allocator< FEdge * > > > {
 	  typedef value_category category;
 	  static const char* type_name() {
-	    return "std::vector<" "FEdge" " *," "std::allocator<FEdge * >" " >";
+	    return "std::vector<" "FEdge" " *," "std::allocator< FEdge * >" " >";
 	  }
 	};
       }
     
-SWIGINTERN swig::PySwigIterator *std_vector_Sl_FEdge_Sm__Sg__iterator(std::vector<FEdge * > *self,PyObject **PYTHON_SELF){
+SWIGINTERN swig::PySwigIterator *std_vector_Sl_FEdge_Sm__Sg__iterator(std::vector< FEdge * > *self,PyObject **PYTHON_SELF){
       return swig::make_output_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
     }
-SWIGINTERN bool std_vector_Sl_FEdge_Sm__Sg____nonzero__(std::vector<FEdge * > const *self){
+SWIGINTERN bool std_vector_Sl_FEdge_Sm__Sg____nonzero__(std::vector< FEdge * > const *self){
       return !(self->empty());
     }
-SWIGINTERN std::vector<FEdge * >::size_type std_vector_Sl_FEdge_Sm__Sg____len__(std::vector<FEdge * > const *self){
+SWIGINTERN std::vector< FEdge * >::size_type std_vector_Sl_FEdge_Sm__Sg____len__(std::vector< FEdge * > const *self){
       return self->size();
     }
-SWIGINTERN std::vector<FEdge * >::value_type std_vector_Sl_FEdge_Sm__Sg__pop(std::vector<FEdge * > *self){
+SWIGINTERN std::vector< FEdge * >::value_type std_vector_Sl_FEdge_Sm__Sg__pop(std::vector< FEdge * > *self){
       if (self->size() == 0)
 	throw std::out_of_range("pop from empty container");
-      std::vector<FEdge*,std::allocator<FEdge * > >::value_type x = self->back();
+      std::vector<FEdge*,std::allocator< FEdge * > >::value_type x = self->back();
       self->pop_back();
       return x;
     }
-SWIGINTERN std::vector<FEdge *,std::allocator<FEdge * > > *std_vector_Sl_FEdge_Sm__Sg____getslice__(std::vector<FEdge * > *self,std::vector<FEdge * >::difference_type i,std::vector<FEdge * >::difference_type j){
+SWIGINTERN std::vector< FEdge *,std::allocator< FEdge * > > *std_vector_Sl_FEdge_Sm__Sg____getslice__(std::vector< FEdge * > *self,std::vector< FEdge * >::difference_type i,std::vector< FEdge * >::difference_type j){
       return swig::getslice(self, i, j);
     }
-SWIGINTERN void std_vector_Sl_FEdge_Sm__Sg____setslice__(std::vector<FEdge * > *self,std::vector<FEdge * >::difference_type i,std::vector<FEdge * >::difference_type j,std::vector<FEdge *,std::allocator<FEdge * > > const &v){
+SWIGINTERN void std_vector_Sl_FEdge_Sm__Sg____setslice__(std::vector< FEdge * > *self,std::vector< FEdge * >::difference_type i,std::vector< FEdge * >::difference_type j,std::vector< FEdge *,std::allocator< FEdge * > > const &v){
       swig::setslice(self, i, j, v);
     }
-SWIGINTERN void std_vector_Sl_FEdge_Sm__Sg____delslice__(std::vector<FEdge * > *self,std::vector<FEdge * >::difference_type i,std::vector<FEdge * >::difference_type j){
+SWIGINTERN void std_vector_Sl_FEdge_Sm__Sg____delslice__(std::vector< FEdge * > *self,std::vector< FEdge * >::difference_type i,std::vector< FEdge * >::difference_type j){
       swig::delslice(self, i, j);
     }
-SWIGINTERN void std_vector_Sl_FEdge_Sm__Sg____delitem__(std::vector<FEdge * > *self,std::vector<FEdge * >::difference_type i){
+SWIGINTERN void std_vector_Sl_FEdge_Sm__Sg____delitem__(std::vector< FEdge * > *self,std::vector< FEdge * >::difference_type i){
       self->erase(swig::getpos(self,i));
     }
-SWIGINTERN std::vector<FEdge * >::value_type std_vector_Sl_FEdge_Sm__Sg____getitem__(std::vector<FEdge * > *self,std::vector<FEdge * >::difference_type i){
+SWIGINTERN std::vector< FEdge * >::value_type std_vector_Sl_FEdge_Sm__Sg____getitem__(std::vector< FEdge * > *self,std::vector< FEdge * >::difference_type i){
       return *(swig::cgetpos(self, i));
     }
-SWIGINTERN void std_vector_Sl_FEdge_Sm__Sg____setitem__(std::vector<FEdge * > *self,std::vector<FEdge * >::difference_type i,std::vector<FEdge * >::value_type x){
+SWIGINTERN void std_vector_Sl_FEdge_Sm__Sg____setitem__(std::vector< FEdge * > *self,std::vector< FEdge * >::difference_type i,std::vector< FEdge * >::value_type x){
       *(swig::getpos(self,i)) = x;
     }
-SWIGINTERN void std_vector_Sl_FEdge_Sm__Sg__append(std::vector<FEdge * > *self,std::vector<FEdge * >::value_type x){
+SWIGINTERN void std_vector_Sl_FEdge_Sm__Sg__append(std::vector< FEdge * > *self,std::vector< FEdge * >::value_type x){
       self->push_back(x);
     }
 
@@ -5122,49 +5141,49 @@ SWIGINTERN void std_vector_Sl_FEdge_Sm__Sg__append(std::vector<FEdge * > *self,s
 
 
       namespace swig {
-	template <>  struct traits<std::vector<ViewVertex*, std::allocator<ViewVertex * > > > {
+	template <>  struct traits<std::vector<ViewVertex*, std::allocator< ViewVertex * > > > {
 	  typedef value_category category;
 	  static const char* type_name() {
-	    return "std::vector<" "ViewVertex" " *," "std::allocator<ViewVertex * >" " >";
+	    return "std::vector<" "ViewVertex" " *," "std::allocator< ViewVertex * >" " >";
 	  }
 	};
       }
     
-SWIGINTERN swig::PySwigIterator *std_vector_Sl_ViewVertex_Sm__Sg__iterator(std::vector<ViewVertex * > *self,PyObject **PYTHON_SELF){
+SWIGINTERN swig::PySwigIterator *std_vector_Sl_ViewVertex_Sm__Sg__iterator(std::vector< ViewVertex * > *self,PyObject **PYTHON_SELF){
       return swig::make_output_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
     }
-SWIGINTERN bool std_vector_Sl_ViewVertex_Sm__Sg____nonzero__(std::vector<ViewVertex * > const *self){
+SWIGINTERN bool std_vector_Sl_ViewVertex_Sm__Sg____nonzero__(std::vector< ViewVertex * > const *self){
       return !(self->empty());
     }
-SWIGINTERN std::vector<ViewVertex * >::size_type std_vector_Sl_ViewVertex_Sm__Sg____len__(std::vector<ViewVertex * > const *self){
+SWIGINTERN std::vector< ViewVertex * >::size_type std_vector_Sl_ViewVertex_Sm__Sg____len__(std::vector< ViewVertex * > const *self){
       return self->size();
     }
-SWIGINTERN std::vector<ViewVertex * >::value_type std_vector_Sl_ViewVertex_Sm__Sg__pop(std::vector<ViewVertex * > *self){
+SWIGINTERN std::vector< ViewVertex * >::value_type std_vector_Sl_ViewVertex_Sm__Sg__pop(std::vector< ViewVertex * > *self){
       if (self->size() == 0)
 	throw std::out_of_range("pop from empty container");
-      std::vector<ViewVertex*,std::allocator<ViewVertex * > >::value_type x = self->back();
+      std::vector<ViewVertex*,std::allocator< ViewVertex * > >::value_type x = self->back();
       self->pop_back();
       return x;
     }
-SWIGINTERN std::vector<ViewVertex *,std::allocator<ViewVertex * > > *std_vector_Sl_ViewVertex_Sm__Sg____getslice__(std::vector<ViewVertex * > *self,std::vector<ViewVertex * >::difference_type i,std::vector<ViewVertex * >::difference_type j){
+SWIGINTERN std::vector< ViewVertex *,std::allocator< ViewVertex * > > *std_vector_Sl_ViewVertex_Sm__Sg____getslice__(std::vector< ViewVertex * > *self,std::vector< ViewVertex * >::difference_type i,std::vector< ViewVertex * >::difference_type j){
       return swig::getslice(self, i, j);
     }
-SWIGINTERN void std_vector_Sl_ViewVertex_Sm__Sg____setslice__(std::vector<ViewVertex * > *self,std::vector<ViewVertex * >::difference_type i,std::vector<ViewVertex * >::difference_type j,std::vector<ViewVertex *,std::allocator<ViewVertex * > > const &v){
+SWIGINTERN void std_vector_Sl_ViewVertex_Sm__Sg____setslice__(std::vector< ViewVertex * > *self,std::vector< ViewVertex * >::difference_type i,std::vector< ViewVertex * >::difference_type j,std::vector< ViewVertex *,std::allocator< ViewVertex * > > const &v){
       swig::setslice(self, i, j, v);
     }
-SWIGINTERN void std_vector_Sl_ViewVertex_Sm__Sg____delslice__(std::vector<ViewVertex * > *self,std::vector<ViewVertex * >::difference_type i,std::vector<ViewVertex * >::difference_type j){
+SWIGINTERN void std_vector_Sl_ViewVertex_Sm__Sg____delslice__(std::vector< ViewVertex * > *self,std::vector< ViewVertex * >::difference_type i,std::vector< ViewVertex * >::difference_type j){
       swig::delslice(self, i, j);
     }
-SWIGINTERN void std_vector_Sl_ViewVertex_Sm__Sg____delitem__(std::vector<ViewVertex * > *self,std::vector<ViewVertex * >::difference_type i){
+SWIGINTERN void std_vector_Sl_ViewVertex_Sm__Sg____delitem__(std::vector< ViewVertex * > *self,std::vector< ViewVertex * >::difference_type i){
       self->erase(swig::getpos(self,i));
     }
-SWIGINTERN std::vector<ViewVertex * >::value_type std_vector_Sl_ViewVertex_Sm__Sg____getitem__(std::vector<ViewVertex * > *self,std::vector<ViewVertex * >::difference_type i){
+SWIGINTERN std::vector< ViewVertex * >::value_type std_vector_Sl_ViewVertex_Sm__Sg____getitem__(std::vector< ViewVertex * > *self,std::vector< ViewVertex * >::difference_type i){
       return *(swig::cgetpos(self, i));
     }
-SWIGINTERN void std_vector_Sl_ViewVertex_Sm__Sg____setitem__(std::vector<ViewVertex * > *self,std::vector<ViewVertex * >::difference_type i,std::vector<ViewVertex * >::value_type x){
+SWIGINTERN void std_vector_Sl_ViewVertex_Sm__Sg____setitem__(std::vector< ViewVertex * > *self,std::vector< ViewVertex * >::difference_type i,std::vector< ViewVertex * >::value_type x){
       *(swig::getpos(self,i)) = x;
     }
-SWIGINTERN void std_vector_Sl_ViewVertex_Sm__Sg__append(std::vector<ViewVertex * > *self,std::vector<ViewVertex * >::value_type x){
+SWIGINTERN void std_vector_Sl_ViewVertex_Sm__Sg__append(std::vector< ViewVertex * > *self,std::vector< ViewVertex * >::value_type x){
       self->push_back(x);
     }
 
@@ -5177,49 +5196,49 @@ SWIGINTERN void std_vector_Sl_ViewVertex_Sm__Sg__append(std::vector<ViewVertex *
 
 
       namespace swig {
-	template <>  struct traits<std::vector<SVertex*, std::allocator<SVertex * > > > {
+	template <>  struct traits<std::vector<SVertex*, std::allocator< SVertex * > > > {
 	  typedef value_category category;
 	  static const char* type_name() {
-	    return "std::vector<" "SVertex" " *," "std::allocator<SVertex * >" " >";
+	    return "std::vector<" "SVertex" " *," "std::allocator< SVertex * >" " >";
 	  }
 	};
       }
     
-SWIGINTERN swig::PySwigIterator *std_vector_Sl_SVertex_Sm__Sg__iterator(std::vector<SVertex * > *self,PyObject **PYTHON_SELF){
+SWIGINTERN swig::PySwigIterator *std_vector_Sl_SVertex_Sm__Sg__iterator(std::vector< SVertex * > *self,PyObject **PYTHON_SELF){
       return swig::make_output_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
     }
-SWIGINTERN bool std_vector_Sl_SVertex_Sm__Sg____nonzero__(std::vector<SVertex * > const *self){
+SWIGINTERN bool std_vector_Sl_SVertex_Sm__Sg____nonzero__(std::vector< SVertex * > const *self){
       return !(self->empty());
     }
-SWIGINTERN std::vector<SVertex * >::size_type std_vector_Sl_SVertex_Sm__Sg____len__(std::vector<SVertex * > const *self){
+SWIGINTERN std::vector< SVertex * >::size_type std_vector_Sl_SVertex_Sm__Sg____len__(std::vector< SVertex * > const *self){
       return self->size();
     }
-SWIGINTERN std::vector<SVertex * >::value_type std_vector_Sl_SVertex_Sm__Sg__pop(std::vector<SVertex * > *self){
+SWIGINTERN std::vector< SVertex * >::value_type std_vector_Sl_SVertex_Sm__Sg__pop(std::vector< SVertex * > *self){
       if (self->size() == 0)
 	throw std::out_of_range("pop from empty container");
-      std::vector<SVertex*,std::allocator<SVertex * > >::value_type x = self->back();
+      std::vector<SVertex*,std::allocator< SVertex * > >::value_type x = self->back();
       self->pop_back();
       return x;
     }
-SWIGINTERN std::vector<SVertex *,std::allocator<SVertex * > > *std_vector_Sl_SVertex_Sm__Sg____getslice__(std::vector<SVertex * > *self,std::vector<SVertex * >::difference_type i,std::vector<SVertex * >::difference_type j){
+SWIGINTERN std::vector< SVertex *,std::allocator< SVertex * > > *std_vector_Sl_SVertex_Sm__Sg____getslice__(std::vector< SVertex * > *self,std::vector< SVertex * >::difference_type i,std::vector< SVertex * >::difference_type j){
       return swig::getslice(self, i, j);
     }
-SWIGINTERN void std_vector_Sl_SVertex_Sm__Sg____setslice__(std::vector<SVertex * > *self,std::vector<SVertex * >::difference_type i,std::vector<SVertex * >::difference_type j,std::vector<SVertex *,std::allocator<SVertex * > > const &v){
+SWIGINTERN void std_vector_Sl_SVertex_Sm__Sg____setslice__(std::vector< SVertex * > *self,std::vector< SVertex * >::difference_type i,std::vector< SVertex * >::difference_type j,std::vector< SVertex *,std::allocator< SVertex * > > const &v){
       swig::setslice(self, i, j, v);
     }
-SWIGINTERN void std_vector_Sl_SVertex_Sm__Sg____delslice__(std::vector<SVertex * > *self,std::vector<SVertex * >::difference_type i,std::vector<SVertex * >::difference_type j){
+SWIGINTERN void std_vector_Sl_SVertex_Sm__Sg____delslice__(std::vector< SVertex * > *self,std::vector< SVertex * >::difference_type i,std::vector< SVertex * >::difference_type j){
       swig::delslice(self, i, j);
     }
-SWIGINTERN void std_vector_Sl_SVertex_Sm__Sg____delitem__(std::vector<SVertex * > *self,std::vector<SVertex * >::difference_type i){
+SWIGINTERN void std_vector_Sl_SVertex_Sm__Sg____delitem__(std::vector< SVertex * > *self,std::vector< SVertex * >::difference_type i){
       self->erase(swig::getpos(self,i));
     }
-SWIGINTERN std::vector<SVertex * >::value_type std_vector_Sl_SVertex_Sm__Sg____getitem__(std::vector<SVertex * > *self,std::vector<SVertex * >::difference_type i){
+SWIGINTERN std::vector< SVertex * >::value_type std_vector_Sl_SVertex_Sm__Sg____getitem__(std::vector< SVertex * > *self,std::vector< SVertex * >::difference_type i){
       return *(swig::cgetpos(self, i));
     }
-SWIGINTERN void std_vector_Sl_SVertex_Sm__Sg____setitem__(std::vector<SVertex * > *self,std::vector<SVertex * >::difference_type i,std::vector<SVertex * >::value_type x){
+SWIGINTERN void std_vector_Sl_SVertex_Sm__Sg____setitem__(std::vector< SVertex * > *self,std::vector< SVertex * >::difference_type i,std::vector< SVertex * >::value_type x){
       *(swig::getpos(self,i)) = x;
     }
-SWIGINTERN void std_vector_Sl_SVertex_Sm__Sg__append(std::vector<SVertex * > *self,std::vector<SVertex * >::value_type x){
+SWIGINTERN void std_vector_Sl_SVertex_Sm__Sg__append(std::vector< SVertex * > *self,std::vector< SVertex * >::value_type x){
       self->push_back(x);
     }
 
@@ -5318,49 +5337,49 @@ SWIG_AsPtr_std_string (PyObject * obj, std::string **val)
 
 
       namespace swig {
-	template <>  struct traits<std::vector<StrokeShader*, std::allocator<StrokeShader * > > > {
+	template <>  struct traits<std::vector<StrokeShader*, std::allocator< StrokeShader * > > > {
 	  typedef value_category category;
 	  static const char* type_name() {
-	    return "std::vector<" "StrokeShader" " *," "std::allocator<StrokeShader * >" " >";
+	    return "std::vector<" "StrokeShader" " *," "std::allocator< StrokeShader * >" " >";
 	  }
 	};
       }
     
-SWIGINTERN swig::PySwigIterator *std_vector_Sl_StrokeShader_Sm__Sg__iterator(std::vector<StrokeShader * > *self,PyObject **PYTHON_SELF){
+SWIGINTERN swig::PySwigIterator *std_vector_Sl_StrokeShader_Sm__Sg__iterator(std::vector< StrokeShader * > *self,PyObject **PYTHON_SELF){
       return swig::make_output_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
     }
-SWIGINTERN bool std_vector_Sl_StrokeShader_Sm__Sg____nonzero__(std::vector<StrokeShader * > const *self){
+SWIGINTERN bool std_vector_Sl_StrokeShader_Sm__Sg____nonzero__(std::vector< StrokeShader * > const *self){
       return !(self->empty());
     }
-SWIGINTERN std::vector<StrokeShader * >::size_type std_vector_Sl_StrokeShader_Sm__Sg____len__(std::vector<StrokeShader * > const *self){
+SWIGINTERN std::vector< StrokeShader * >::size_type std_vector_Sl_StrokeShader_Sm__Sg____len__(std::vector< StrokeShader * > const *self){
       return self->size();
     }
-SWIGINTERN std::vector<StrokeShader * >::value_type std_vector_Sl_StrokeShader_Sm__Sg__pop(std::vector<StrokeShader * > *self){
+SWIGINTERN std::vector< StrokeShader * >::value_type std_vector_Sl_StrokeShader_Sm__Sg__pop(std::vector< StrokeShader * > *self){
       if (self->size() == 0)
 	throw std::out_of_range("pop from empty container");
-      std::vector<StrokeShader*,std::allocator<StrokeShader * > >::value_type x = self->back();
+      std::vector<StrokeShader*,std::allocator< StrokeShader * > >::value_type x = self->back();
       self->pop_back();
       return x;
     }
-SWIGINTERN std::vector<StrokeShader *,std::allocator<StrokeShader * > > *std_vector_Sl_StrokeShader_Sm__Sg____getslice__(std::vector<StrokeShader * > *self,std::vector<StrokeShader * >::difference_type i,std::vector<StrokeShader * >::difference_type j){
+SWIGINTERN std::vector< StrokeShader *,std::allocator< StrokeShader * > > *std_vector_Sl_StrokeShader_Sm__Sg____getslice__(std::vector< StrokeShader * > *self,std::vector< StrokeShader * >::difference_type i,std::vector< StrokeShader * >::difference_type j){
       return swig::getslice(self, i, j);
     }
-SWIGINTERN void std_vector_Sl_StrokeShader_Sm__Sg____setslice__(std::vector<StrokeShader * > *self,std::vector<StrokeShader * >::difference_type i,std::vector<StrokeShader * >::difference_type j,std::vector<StrokeShader *,std::allocator<StrokeShader * > > const &v){
+SWIGINTERN void std_vector_Sl_StrokeShader_Sm__Sg____setslice__(std::vector< StrokeShader * > *self,std::vector< StrokeShader * >::difference_type i,std::vector< StrokeShader * >::difference_type j,std::vector< StrokeShader *,std::allocator< StrokeShader * > > const &v){
       swig::setslice(self, i, j, v);
     }
-SWIGINTERN void std_vector_Sl_StrokeShader_Sm__Sg____delslice__(std::vector<StrokeShader * > *self,std::vector<StrokeShader * >::difference_type i,std::vector<StrokeShader * >::difference_type j){
+SWIGINTERN void std_vector_Sl_StrokeShader_Sm__Sg____delslice__(std::vector< StrokeShader * > *self,std::vector< StrokeShader * >::difference_type i,std::vector< StrokeShader * >::difference_type j){
       swig::delslice(self, i, j);
     }
-SWIGINTERN void std_vector_Sl_StrokeShader_Sm__Sg____delitem__(std::vector<StrokeShader * > *self,std::vector<StrokeShader * >::difference_type i){
+SWIGINTERN void std_vector_Sl_StrokeShader_Sm__Sg____delitem__(std::vector< StrokeShader * > *self,std::vector< StrokeShader * >::difference_type i){
       self->erase(swig::getpos(self,i));
     }
-SWIGINTERN std::vector<StrokeShader * >::value_type std_vector_Sl_StrokeShader_Sm__Sg____getitem__(std::vector<StrokeShader * > *self,std::vector<StrokeShader * >::difference_type i){
+SWIGINTERN std::vector< StrokeShader * >::value_type std_vector_Sl_StrokeShader_Sm__Sg____getitem__(std::vector< StrokeShader * > *self,std::vector< StrokeShader * >::difference_type i){
       return *(swig::cgetpos(self, i));
     }
-SWIGINTERN void std_vector_Sl_StrokeShader_Sm__Sg____setitem__(std::vector<StrokeShader * > *self,std::vector<StrokeShader * >::difference_type i,std::vector<StrokeShader * >::value_type x){
+SWIGINTERN void std_vector_Sl_StrokeShader_Sm__Sg____setitem__(std::vector< StrokeShader * > *self,std::vector< StrokeShader * >::difference_type i,std::vector< StrokeShader * >::value_type x){
       *(swig::getpos(self,i)) = x;
     }
-SWIGINTERN void std_vector_Sl_StrokeShader_Sm__Sg__append(std::vector<StrokeShader * > *self,std::vector<StrokeShader * >::value_type x){
+SWIGINTERN void std_vector_Sl_StrokeShader_Sm__Sg__append(std::vector< StrokeShader * > *self,std::vector< StrokeShader * >::value_type x){
       self->push_back(x);
     }
 
@@ -5446,7 +5465,7 @@ ViewEdge *SwigDirector_ViewEdgeViewEdgeIterator::operator *() {
     Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""ViewEdge *""'");
   }
   c_result = reinterpret_cast< ViewEdge * >(swig_argp);
-  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own);
+  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own /* & TODO: SWIG_POINTER_OWN */);
   return (ViewEdge *) c_result;
 }
 
@@ -5479,7 +5498,7 @@ ViewEdge *SwigDirector_ViewEdgeViewEdgeIterator::operator ->() {
     Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""ViewEdge *""'");
   }
   c_result = reinterpret_cast< ViewEdge * >(swig_argp);
-  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own);
+  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own /* & TODO: SWIG_POINTER_OWN */);
   return (ViewEdge *) c_result;
 }
 
@@ -5666,8 +5685,8 @@ bool SwigDirector_ViewEdgeViewEdgeIterator::operator !=(ViewEdgeInternal::ViewEd
 }
 
 
-SwigDirector_UnaryFunction0DVoid::SwigDirector_UnaryFunction0DVoid(PyObject *self): UnaryFunction0D<void >(), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction0D<void > *)this, this); 
+SwigDirector_UnaryFunction0DVoid::SwigDirector_UnaryFunction0DVoid(PyObject *self): UnaryFunction0D< void >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction0D< void > *)this, this); 
 }
 
 
@@ -5729,8 +5748,8 @@ void SwigDirector_UnaryFunction0DVoid::operator ()(Interface0DIterator &iter) {
 }
 
 
-SwigDirector_UnaryFunction0DUnsigned::SwigDirector_UnaryFunction0DUnsigned(PyObject *self): UnaryFunction0D<unsigned int >(), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction0D<unsigned int > *)this, this); 
+SwigDirector_UnaryFunction0DUnsigned::SwigDirector_UnaryFunction0DUnsigned(PyObject *self): UnaryFunction0D< unsigned int >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction0D< unsigned int > *)this, this); 
 }
 
 
@@ -5800,8 +5819,8 @@ unsigned int SwigDirector_UnaryFunction0DUnsigned::operator ()(Interface0DIterat
 }
 
 
-SwigDirector_UnaryFunction0DFloat::SwigDirector_UnaryFunction0DFloat(PyObject *self): UnaryFunction0D<float >(), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction0D<float > *)this, this); 
+SwigDirector_UnaryFunction0DFloat::SwigDirector_UnaryFunction0DFloat(PyObject *self): UnaryFunction0D< float >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction0D< float > *)this, this); 
 }
 
 
@@ -5871,8 +5890,8 @@ float SwigDirector_UnaryFunction0DFloat::operator ()(Interface0DIterator &iter)
 }
 
 
-SwigDirector_UnaryFunction0DDouble::SwigDirector_UnaryFunction0DDouble(PyObject *self): UnaryFunction0D<double >(), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction0D<double > *)this, this); 
+SwigDirector_UnaryFunction0DDouble::SwigDirector_UnaryFunction0DDouble(PyObject *self): UnaryFunction0D< double >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction0D< double > *)this, this); 
 }
 
 
@@ -5942,8 +5961,8 @@ double SwigDirector_UnaryFunction0DDouble::operator ()(Interface0DIterator &iter
 }
 
 
-SwigDirector_UnaryFunction0DVec2f::SwigDirector_UnaryFunction0DVec2f(PyObject *self): UnaryFunction0D<Geometry::Vec2f >(), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction0D<Geometry::Vec2f > *)this, this); 
+SwigDirector_UnaryFunction0DVec2f::SwigDirector_UnaryFunction0DVec2f(PyObject *self): UnaryFunction0D< Geometry::Vec2f >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction0D< Geometry::Vec2f > *)this, this); 
 }
 
 
@@ -5982,11 +6001,11 @@ std::string SwigDirector_UnaryFunction0DVec2f::getName() const {
 }
 
 
-VecMat::Vec2<float > SwigDirector_UnaryFunction0DVec2f::operator ()(Interface0DIterator &iter) {
+VecMat::Vec2< float > SwigDirector_UnaryFunction0DVec2f::operator ()(Interface0DIterator &iter) {
   void *swig_argp ;
   int swig_res = 0 ;
   
-  VecMat::Vec2<float > c_result;
+  VecMat::Vec2< float > c_result;
   swig::PyObject_var obj0;
   obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&iter), SWIGTYPE_p_Interface0DIterator,  0 );
   if (!swig_get_self()) {
@@ -6006,18 +6025,18 @@ VecMat::Vec2<float > SwigDirector_UnaryFunction0DVec2f::operator ()(Interface0DI
       Swig::DirectorMethodException::raise("Error detected when calling 'UnaryFunction0DVec2f.__call__'");
     }
   }
-  swig_res = SWIG_ConvertPtr(result,&swig_argp,SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0  | 0);
+  swig_res = SWIG_ConvertPtr(result,&swig_argp,SWIGTYPE_p_VecMat__Vec2T_float_t,  0  | 0);
   if (!SWIG_IsOK(swig_res)) {
-    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""VecMat::Vec2<float >""'");
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""VecMat::Vec2< float >""'");
   }
-  c_result = *(reinterpret_cast< VecMat::Vec2<float > * >(swig_argp));
-  if (SWIG_IsNewObj(swig_res)) delete reinterpret_cast< VecMat::Vec2<float > * >(swig_argp);
-  return (VecMat::Vec2<float >) c_result;
+  c_result = *(reinterpret_cast< VecMat::Vec2< float > * >(swig_argp));
+  if (SWIG_IsNewObj(swig_res)) delete reinterpret_cast< VecMat::Vec2< float > * >(swig_argp);
+  return (VecMat::Vec2< float >) c_result;
 }
 
 
-SwigDirector_UnaryFunction0DVec3f::SwigDirector_UnaryFunction0DVec3f(PyObject *self): UnaryFunction0D<Geometry::Vec3f >(), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction0D<Geometry::Vec3f > *)this, this); 
+SwigDirector_UnaryFunction0DVec3f::SwigDirector_UnaryFunction0DVec3f(PyObject *self): UnaryFunction0D< Geometry::Vec3f >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction0D< Geometry::Vec3f > *)this, this); 
 }
 
 
@@ -6056,11 +6075,11 @@ std::string SwigDirector_UnaryFunction0DVec3f::getName() const {
 }
 
 
-VecMat::Vec3<float > SwigDirector_UnaryFunction0DVec3f::operator ()(Interface0DIterator &iter) {
+VecMat::Vec3< float > SwigDirector_UnaryFunction0DVec3f::operator ()(Interface0DIterator &iter) {
   void *swig_argp ;
   int swig_res = 0 ;
   
-  VecMat::Vec3<float > c_result;
+  VecMat::Vec3< float > c_result;
   swig::PyObject_var obj0;
   obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&iter), SWIGTYPE_p_Interface0DIterator,  0 );
   if (!swig_get_self()) {
@@ -6080,18 +6099,18 @@ VecMat::Vec3<float > SwigDirector_UnaryFunction0DVec3f::operator ()(Interface0DI
       Swig::DirectorMethodException::raise("Error detected when calling 'UnaryFunction0DVec3f.__call__'");
     }
   }
-  swig_res = SWIG_ConvertPtr(result,&swig_argp,SWIGTYPE_p_VecMat__Vec3Tfloat_t,  0  | 0);
+  swig_res = SWIG_ConvertPtr(result,&swig_argp,SWIGTYPE_p_VecMat__Vec3T_float_t,  0  | 0);
   if (!SWIG_IsOK(swig_res)) {
-    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""VecMat::Vec3<float >""'");
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""VecMat::Vec3< float >""'");
   }
-  c_result = *(reinterpret_cast< VecMat::Vec3<float > * >(swig_argp));
-  if (SWIG_IsNewObj(swig_res)) delete reinterpret_cast< VecMat::Vec3<float > * >(swig_argp);
-  return (VecMat::Vec3<float >) c_result;
+  c_result = *(reinterpret_cast< VecMat::Vec3< float > * >(swig_argp));
+  if (SWIG_IsNewObj(swig_res)) delete reinterpret_cast< VecMat::Vec3< float > * >(swig_argp);
+  return (VecMat::Vec3< float >) c_result;
 }
 
 
-SwigDirector_UnaryFunction0DId::SwigDirector_UnaryFunction0DId(PyObject *self): UnaryFunction0D<Id >(), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction0D<Id > *)this, this); 
+SwigDirector_UnaryFunction0DId::SwigDirector_UnaryFunction0DId(PyObject *self): UnaryFunction0D< Id >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction0D< Id > *)this, this); 
 }
 
 
@@ -6164,15 +6183,15 @@ Id SwigDirector_UnaryFunction0DId::operator ()(Interface0DIterator &iter) {
 }
 
 
-SwigDirector_UnaryFunction1DVoid::SwigDirector_UnaryFunction1DVoid(PyObject *self): UnaryFunction1D<void >(), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction1D<void > *)this, this); 
+SwigDirector_UnaryFunction1DVoid::SwigDirector_UnaryFunction1DVoid(PyObject *self): UnaryFunction1D< void >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D< void > *)this, this); 
 }
 
 
 
 
-SwigDirector_UnaryFunction1DVoid::SwigDirector_UnaryFunction1DVoid(PyObject *self, IntegrationType iType): UnaryFunction1D<void >(iType), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction1D<void > *)this, this); 
+SwigDirector_UnaryFunction1DVoid::SwigDirector_UnaryFunction1DVoid(PyObject *self, IntegrationType iType): UnaryFunction1D< void >(iType), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D< void > *)this, this); 
 }
 
 
@@ -6234,15 +6253,15 @@ void SwigDirector_UnaryFunction1DVoid::operator ()(Interface1D &inter) {
 }
 
 
-SwigDirector_UnaryFunction1DUnsigned::SwigDirector_UnaryFunction1DUnsigned(PyObject *self): UnaryFunction1D<unsigned int >(), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction1D<unsigned int > *)this, this); 
+SwigDirector_UnaryFunction1DUnsigned::SwigDirector_UnaryFunction1DUnsigned(PyObject *self): UnaryFunction1D< unsigned int >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D< unsigned int > *)this, this); 
 }
 
 
 
 
-SwigDirector_UnaryFunction1DUnsigned::SwigDirector_UnaryFunction1DUnsigned(PyObject *self, IntegrationType iType): UnaryFunction1D<unsigned int >(iType), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction1D<unsigned int > *)this, this); 
+SwigDirector_UnaryFunction1DUnsigned::SwigDirector_UnaryFunction1DUnsigned(PyObject *self, IntegrationType iType): UnaryFunction1D< unsigned int >(iType), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D< unsigned int > *)this, this); 
 }
 
 
@@ -6312,15 +6331,15 @@ unsigned int SwigDirector_UnaryFunction1DUnsigned::operator ()(Interface1D &inte
 }
 
 
-SwigDirector_UnaryFunction1DFloat::SwigDirector_UnaryFunction1DFloat(PyObject *self): UnaryFunction1D<float >(), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction1D<float > *)this, this); 
+SwigDirector_UnaryFunction1DFloat::SwigDirector_UnaryFunction1DFloat(PyObject *self): UnaryFunction1D< float >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D< float > *)this, this); 
 }
 
 
 
 
-SwigDirector_UnaryFunction1DFloat::SwigDirector_UnaryFunction1DFloat(PyObject *self, IntegrationType iType): UnaryFunction1D<float >(iType), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction1D<float > *)this, this); 
+SwigDirector_UnaryFunction1DFloat::SwigDirector_UnaryFunction1DFloat(PyObject *self, IntegrationType iType): UnaryFunction1D< float >(iType), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D< float > *)this, this); 
 }
 
 
@@ -6390,15 +6409,15 @@ float SwigDirector_UnaryFunction1DFloat::operator ()(Interface1D &inter) {
 }
 
 
-SwigDirector_UnaryFunction1DDouble::SwigDirector_UnaryFunction1DDouble(PyObject *self): UnaryFunction1D<double >(), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction1D<double > *)this, this); 
+SwigDirector_UnaryFunction1DDouble::SwigDirector_UnaryFunction1DDouble(PyObject *self): UnaryFunction1D< double >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D< double > *)this, this); 
 }
 
 
 
 
-SwigDirector_UnaryFunction1DDouble::SwigDirector_UnaryFunction1DDouble(PyObject *self, IntegrationType iType): UnaryFunction1D<double >(iType), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction1D<double > *)this, this); 
+SwigDirector_UnaryFunction1DDouble::SwigDirector_UnaryFunction1DDouble(PyObject *self, IntegrationType iType): UnaryFunction1D< double >(iType), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D< double > *)this, this); 
 }
 
 
@@ -6468,15 +6487,15 @@ double SwigDirector_UnaryFunction1DDouble::operator ()(Interface1D &inter) {
 }
 
 
-SwigDirector_UnaryFunction1DVec2f::SwigDirector_UnaryFunction1DVec2f(PyObject *self): UnaryFunction1D<Geometry::Vec2f >(), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction1D<Geometry::Vec2f > *)this, this); 
+SwigDirector_UnaryFunction1DVec2f::SwigDirector_UnaryFunction1DVec2f(PyObject *self): UnaryFunction1D< Geometry::Vec2f >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D< Geometry::Vec2f > *)this, this); 
 }
 
 
 
 
-SwigDirector_UnaryFunction1DVec2f::SwigDirector_UnaryFunction1DVec2f(PyObject *self, IntegrationType iType): UnaryFunction1D<Geometry::Vec2f >(iType), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction1D<Geometry::Vec2f > *)this, this); 
+SwigDirector_UnaryFunction1DVec2f::SwigDirector_UnaryFunction1DVec2f(PyObject *self, IntegrationType iType): UnaryFunction1D< Geometry::Vec2f >(iType), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D< Geometry::Vec2f > *)this, this); 
 }
 
 
@@ -6515,11 +6534,11 @@ std::string SwigDirector_UnaryFunction1DVec2f::getName() const {
 }
 
 
-VecMat::Vec2<float > SwigDirector_UnaryFunction1DVec2f::operator ()(Interface1D &inter) {
+VecMat::Vec2< float > SwigDirector_UnaryFunction1DVec2f::operator ()(Interface1D &inter) {
   void *swig_argp ;
   int swig_res = 0 ;
   
-  VecMat::Vec2<float > c_result;
+  VecMat::Vec2< float > c_result;
   swig::PyObject_var obj0;
   obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&inter), SWIGTYPE_p_Interface1D,  0 );
   if (!swig_get_self()) {
@@ -6539,25 +6558,25 @@ VecMat::Vec2<float > SwigDirector_UnaryFunction1DVec2f::operator ()(Interface1D
       Swig::DirectorMethodException::raise("Error detected when calling 'UnaryFunction1DVec2f.__call__'");
     }
   }
-  swig_res = SWIG_ConvertPtr(result,&swig_argp,SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0  | 0);
+  swig_res = SWIG_ConvertPtr(result,&swig_argp,SWIGTYPE_p_VecMat__Vec2T_float_t,  0  | 0);
   if (!SWIG_IsOK(swig_res)) {
-    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""VecMat::Vec2<float >""'");
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""VecMat::Vec2< float >""'");
   }
-  c_result = *(reinterpret_cast< VecMat::Vec2<float > * >(swig_argp));
-  if (SWIG_IsNewObj(swig_res)) delete reinterpret_cast< VecMat::Vec2<float > * >(swig_argp);
-  return (VecMat::Vec2<float >) c_result;
+  c_result = *(reinterpret_cast< VecMat::Vec2< float > * >(swig_argp));
+  if (SWIG_IsNewObj(swig_res)) delete reinterpret_cast< VecMat::Vec2< float > * >(swig_argp);
+  return (VecMat::Vec2< float >) c_result;
 }
 
 
-SwigDirector_UnaryFunction1DVec3f::SwigDirector_UnaryFunction1DVec3f(PyObject *self): UnaryFunction1D<Geometry::Vec3f >(), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction1D<Geometry::Vec3f > *)this, this); 
+SwigDirector_UnaryFunction1DVec3f::SwigDirector_UnaryFunction1DVec3f(PyObject *self): UnaryFunction1D< Geometry::Vec3f >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D< Geometry::Vec3f > *)this, this); 
 }
 
 
 
 
-SwigDirector_UnaryFunction1DVec3f::SwigDirector_UnaryFunction1DVec3f(PyObject *self, IntegrationType iType): UnaryFunction1D<Geometry::Vec3f >(iType), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction1D<Geometry::Vec3f > *)this, this); 
+SwigDirector_UnaryFunction1DVec3f::SwigDirector_UnaryFunction1DVec3f(PyObject *self, IntegrationType iType): UnaryFunction1D< Geometry::Vec3f >(iType), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D< Geometry::Vec3f > *)this, this); 
 }
 
 
@@ -6596,11 +6615,11 @@ std::string SwigDirector_UnaryFunction1DVec3f::getName() const {
 }
 
 
-VecMat::Vec3<float > SwigDirector_UnaryFunction1DVec3f::operator ()(Interface1D &inter) {
+VecMat::Vec3< float > SwigDirector_UnaryFunction1DVec3f::operator ()(Interface1D &inter) {
   void *swig_argp ;
   int swig_res = 0 ;
   
-  VecMat::Vec3<float > c_result;
+  VecMat::Vec3< float > c_result;
   swig::PyObject_var obj0;
   obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&inter), SWIGTYPE_p_Interface1D,  0 );
   if (!swig_get_self()) {
@@ -6620,13 +6639,13 @@ VecMat::Vec3<float > SwigDirector_UnaryFunction1DVec3f::operator ()(Interface1D
       Swig::DirectorMethodException::raise("Error detected when calling 'UnaryFunction1DVec3f.__call__'");
     }
   }
-  swig_res = SWIG_ConvertPtr(result,&swig_argp,SWIGTYPE_p_VecMat__Vec3Tfloat_t,  0  | 0);
+  swig_res = SWIG_ConvertPtr(result,&swig_argp,SWIGTYPE_p_VecMat__Vec3T_float_t,  0  | 0);
   if (!SWIG_IsOK(swig_res)) {
-    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""VecMat::Vec3<float >""'");
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""VecMat::Vec3< float >""'");
   }
-  c_result = *(reinterpret_cast< VecMat::Vec3<float > * >(swig_argp));
-  if (SWIG_IsNewObj(swig_res)) delete reinterpret_cast< VecMat::Vec3<float > * >(swig_argp);
-  return (VecMat::Vec3<float >) c_result;
+  c_result = *(reinterpret_cast< VecMat::Vec3< float > * >(swig_argp));
+  if (SWIG_IsNewObj(swig_res)) delete reinterpret_cast< VecMat::Vec3< float > * >(swig_argp);
+  return (VecMat::Vec3< float >) c_result;
 }
 
 
@@ -6705,7 +6724,7 @@ ViewEdge *SwigDirector_ChainingIterator::operator *() {
     Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""ViewEdge *""'");
   }
   c_result = reinterpret_cast< ViewEdge * >(swig_argp);
-  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own);
+  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own /* & TODO: SWIG_POINTER_OWN */);
   return (ViewEdge *) c_result;
 }
 
@@ -6738,7 +6757,7 @@ ViewEdge *SwigDirector_ChainingIterator::operator ->() {
     Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""ViewEdge *""'");
   }
   c_result = reinterpret_cast< ViewEdge * >(swig_argp);
-  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own);
+  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own /* & TODO: SWIG_POINTER_OWN */);
   return (ViewEdge *) c_result;
 }
 
@@ -6976,7 +6995,7 @@ ViewEdge *SwigDirector_ChainingIterator::traverse(AdjacencyIterator const &it) {
     Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""ViewEdge *""'");
   }
   c_result = reinterpret_cast< ViewEdge * >(swig_argp);
-  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own);
+  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own /* & TODO: SWIG_POINTER_OWN */);
   return (ViewEdge *) c_result;
 }
 
@@ -7056,7 +7075,7 @@ ViewEdge *SwigDirector_ChainSilhouetteIterator::operator *() {
     Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""ViewEdge *""'");
   }
   c_result = reinterpret_cast< ViewEdge * >(swig_argp);
-  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own);
+  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own /* & TODO: SWIG_POINTER_OWN */);
   return (ViewEdge *) c_result;
 }
 
@@ -7089,7 +7108,7 @@ ViewEdge *SwigDirector_ChainSilhouetteIterator::operator ->() {
     Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""ViewEdge *""'");
   }
   c_result = reinterpret_cast< ViewEdge * >(swig_argp);
-  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own);
+  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own /* & TODO: SWIG_POINTER_OWN */);
   return (ViewEdge *) c_result;
 }
 
@@ -7327,7 +7346,7 @@ ViewEdge *SwigDirector_ChainSilhouetteIterator::traverse(AdjacencyIterator const
     Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""ViewEdge *""'");
   }
   c_result = reinterpret_cast< ViewEdge * >(swig_argp);
-  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own);
+  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own /* & TODO: SWIG_POINTER_OWN */);
   return (ViewEdge *) c_result;
 }
 
@@ -7414,7 +7433,7 @@ ViewEdge *SwigDirector_ChainPredicateIterator::operator *() {
     Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""ViewEdge *""'");
   }
   c_result = reinterpret_cast< ViewEdge * >(swig_argp);
-  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own);
+  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own /* & TODO: SWIG_POINTER_OWN */);
   return (ViewEdge *) c_result;
 }
 
@@ -7447,7 +7466,7 @@ ViewEdge *SwigDirector_ChainPredicateIterator::operator ->() {
     Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""ViewEdge *""'");
   }
   c_result = reinterpret_cast< ViewEdge * >(swig_argp);
-  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own);
+  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own /* & TODO: SWIG_POINTER_OWN */);
   return (ViewEdge *) c_result;
 }
 
@@ -7685,7 +7704,7 @@ ViewEdge *SwigDirector_ChainPredicateIterator::traverse(AdjacencyIterator const
     Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""ViewEdge *""'");
   }
   c_result = reinterpret_cast< ViewEdge * >(swig_argp);
-  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own);
+  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own /* & TODO: SWIG_POINTER_OWN */);
   return (ViewEdge *) c_result;
 }
 
@@ -8104,7 +8123,7 @@ SWIGINTERN PyObject *_wrap_PySwigIterator_incr(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -8134,7 +8153,10 @@ SWIGINTERN PyObject *_wrap_PySwigIterator_incr(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'PySwigIterator_incr'.\n  Possible C/C++ prototypes are:\n    incr(size_t)\n    incr()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'PySwigIterator_incr'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    incr(swig::PySwigIterator *,size_t)\n"
+    "    incr(swig::PySwigIterator *)\n");
   return NULL;
 }
 
@@ -8218,7 +8240,7 @@ SWIGINTERN PyObject *_wrap_PySwigIterator_decr(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -8248,7 +8270,10 @@ SWIGINTERN PyObject *_wrap_PySwigIterator_decr(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'PySwigIterator_decr'.\n  Possible C/C++ prototypes are:\n    decr(size_t)\n    decr()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'PySwigIterator_decr'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    decr(swig::PySwigIterator *,size_t)\n"
+    "    decr(swig::PySwigIterator *)\n");
   return NULL;
 }
 
@@ -8738,7 +8763,7 @@ SWIGINTERN PyObject *_wrap_PySwigIterator___sub__(PyObject *self, PyObject *args
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -8779,14 +8804,14 @@ fail:
 
 SWIGINTERN PyObject *PySwigIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_swig__PySwigIterator, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_vectorInt_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   PyObject **arg2 = (PyObject **) 0 ;
   swig::PySwigIterator *result = 0 ;
   void *argp1 = 0 ;
@@ -8795,11 +8820,11 @@ SWIGINTERN PyObject *_wrap_vectorInt_iterator(PyObject *SWIGUNUSEDPARM(self), Py
   
   arg2 = &obj0;
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_iterator" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_iterator" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   result = (swig::PySwigIterator *)std_vector_Sl_int_Sg__iterator(arg1,arg2);
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__PySwigIterator, SWIG_POINTER_OWN |  0 );
   return resultobj;
@@ -8810,19 +8835,19 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt___nonzero__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt___nonzero__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___nonzero__" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___nonzero__" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
-  result = (bool)std_vector_Sl_int_Sg____nonzero__((std::vector<int > const *)arg1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
+  result = (bool)std_vector_Sl_int_Sg____nonzero__((std::vector< int > const *)arg1);
   resultobj = SWIG_From_bool(static_cast< bool >(result));
   return resultobj;
 fail:
@@ -8832,19 +8857,19 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt___len__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::size_type result;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt___len__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___len__" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___len__" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
-  result = std_vector_Sl_int_Sg____len__((std::vector<int > const *)arg1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
+  result = std_vector_Sl_int_Sg____len__((std::vector< int > const *)arg1);
   resultobj = SWIG_From_size_t(static_cast< size_t >(result));
   return resultobj;
 fail:
@@ -8854,20 +8879,20 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::value_type result;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_pop" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_pop" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   try {
-    result = (std::vector<int >::value_type)std_vector_Sl_int_Sg__pop(arg1);
+    result = (std::vector< int >::value_type)std_vector_Sl_int_Sg__pop(arg1);
   }
   catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -8882,10 +8907,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::difference_type arg2 ;
-  std::vector<int >::difference_type arg3 ;
-  std::vector<int,std::allocator<int > > *result = 0 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::difference_type arg2 ;
+  std::vector< int >::difference_type arg3 ;
+  std::vector< int,std::allocator< int > > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -8897,29 +8922,29 @@ SWIGINTERN PyObject *_wrap_vectorInt___getslice__(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:vectorInt___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___getslice__" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___getslice__" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt___getslice__" "', argument " "2"" of type '" "std::vector<int >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt___getslice__" "', argument " "2"" of type '" "std::vector< int >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<int >::difference_type >(val2);
+  arg2 = static_cast< std::vector< int >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt___getslice__" "', argument " "3"" of type '" "std::vector<int >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt___getslice__" "', argument " "3"" of type '" "std::vector< int >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<int >::difference_type >(val3);
+  arg3 = static_cast< std::vector< int >::difference_type >(val3);
   try {
-    result = (std::vector<int,std::allocator<int > > *)std_vector_Sl_int_Sg____getslice__(arg1,arg2,arg3);
+    result = (std::vector< int,std::allocator< int > > *)std_vector_Sl_int_Sg____getslice__(arg1,arg2,arg3);
   }
   catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
   
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -8928,10 +8953,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt___setslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::difference_type arg2 ;
-  std::vector<int >::difference_type arg3 ;
-  std::vector<int,std::allocator<int > > *arg4 = 0 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::difference_type arg2 ;
+  std::vector< int >::difference_type arg3 ;
+  std::vector< int,std::allocator< int > > *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -8945,34 +8970,34 @@ SWIGINTERN PyObject *_wrap_vectorInt___setslice__(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:vectorInt___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___setslice__" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___setslice__" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt___setslice__" "', argument " "2"" of type '" "std::vector<int >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt___setslice__" "', argument " "2"" of type '" "std::vector< int >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<int >::difference_type >(val2);
+  arg2 = static_cast< std::vector< int >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt___setslice__" "', argument " "3"" of type '" "std::vector<int >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt___setslice__" "', argument " "3"" of type '" "std::vector< int >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<int >::difference_type >(val3);
+  arg3 = static_cast< std::vector< int >::difference_type >(val3);
   {
-    std::vector<int,std::allocator<int > > *ptr = (std::vector<int,std::allocator<int > > *)0;
+    std::vector<int,std::allocator< int > > *ptr = (std::vector<int,std::allocator< int > > *)0;
     res4 = swig::asptr(obj3, &ptr);
     if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vectorInt___setslice__" "', argument " "4"" of type '" "std::vector<int,std::allocator<int > > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vectorInt___setslice__" "', argument " "4"" of type '" "std::vector< int,std::allocator< int > > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vectorInt___setslice__" "', argument " "4"" of type '" "std::vector<int,std::allocator<int > > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vectorInt___setslice__" "', argument " "4"" of type '" "std::vector< int,std::allocator< int > > const &""'"); 
     }
     arg4 = ptr;
   }
   try {
-    std_vector_Sl_int_Sg____setslice__(arg1,arg2,arg3,(std::vector<int,std::allocator<int > > const &)*arg4);
+    std_vector_Sl_int_Sg____setslice__(arg1,arg2,arg3,(std::vector< int,std::allocator< int > > const &)*arg4);
   }
   catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -8992,9 +9017,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt___delslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::difference_type arg2 ;
-  std::vector<int >::difference_type arg3 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::difference_type arg2 ;
+  std::vector< int >::difference_type arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -9006,21 +9031,21 @@ SWIGINTERN PyObject *_wrap_vectorInt___delslice__(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:vectorInt___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___delslice__" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___delslice__" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt___delslice__" "', argument " "2"" of type '" "std::vector<int >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt___delslice__" "', argument " "2"" of type '" "std::vector< int >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<int >::difference_type >(val2);
+  arg2 = static_cast< std::vector< int >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt___delslice__" "', argument " "3"" of type '" "std::vector<int >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt___delslice__" "', argument " "3"" of type '" "std::vector< int >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<int >::difference_type >(val3);
+  arg3 = static_cast< std::vector< int >::difference_type >(val3);
   try {
     std_vector_Sl_int_Sg____delslice__(arg1,arg2,arg3);
   }
@@ -9037,8 +9062,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt___delitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::difference_type arg2 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::difference_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -9047,16 +9072,16 @@ SWIGINTERN PyObject *_wrap_vectorInt___delitem__(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:vectorInt___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___delitem__" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___delitem__" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt___delitem__" "', argument " "2"" of type '" "std::vector<int >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt___delitem__" "', argument " "2"" of type '" "std::vector< int >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<int >::difference_type >(val2);
+  arg2 = static_cast< std::vector< int >::difference_type >(val2);
   try {
     std_vector_Sl_int_Sg____delitem__(arg1,arg2);
   }
@@ -9073,9 +9098,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt___getitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::difference_type arg2 ;
-  std::vector<int >::value_type *result = 0 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::difference_type arg2 ;
+  std::vector< int >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -9084,20 +9109,20 @@ SWIGINTERN PyObject *_wrap_vectorInt___getitem__(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:vectorInt___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___getitem__" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___getitem__" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt___getitem__" "', argument " "2"" of type '" "std::vector<int >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt___getitem__" "', argument " "2"" of type '" "std::vector< int >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<int >::difference_type >(val2);
+  arg2 = static_cast< std::vector< int >::difference_type >(val2);
   try {
     {
-      std::vector<int >::value_type const &_result_ref = std_vector_Sl_int_Sg____getitem__((std::vector<int > const *)arg1,arg2);
-      result = (std::vector<int >::value_type *) &_result_ref;
+      std::vector< int >::value_type const &_result_ref = std_vector_Sl_int_Sg____getitem__((std::vector< int > const *)arg1,arg2);
+      result = (std::vector< int >::value_type *) &_result_ref;
     }
   }
   catch(std::out_of_range &_e) {
@@ -9113,14 +9138,14 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt___setitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::difference_type arg2 ;
-  std::vector<int >::value_type *arg3 = 0 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::difference_type arg2 ;
+  std::vector< int >::value_type *arg3 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  std::vector<int >::value_type temp3 ;
+  std::vector< int >::value_type temp3 ;
   int val3 ;
   int ecode3 = 0 ;
   PyObject * obj0 = 0 ;
@@ -9128,21 +9153,21 @@ SWIGINTERN PyObject *_wrap_vectorInt___setitem__(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:vectorInt___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___setitem__" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___setitem__" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt___setitem__" "', argument " "2"" of type '" "std::vector<int >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt___setitem__" "', argument " "2"" of type '" "std::vector< int >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<int >::difference_type >(val2);
+  arg2 = static_cast< std::vector< int >::difference_type >(val2);
   ecode3 = SWIG_AsVal_int(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt___setitem__" "', argument " "3"" of type '" "std::vector<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt___setitem__" "', argument " "3"" of type '" "std::vector< int >::value_type""'");
   } 
-  temp3 = static_cast< std::vector<int >::value_type >(val3);
+  temp3 = static_cast< std::vector< int >::value_type >(val3);
   arg3 = &temp3;
   try {
     std_vector_Sl_int_Sg____setitem__(arg1,arg2,(int const &)*arg3);
@@ -9160,27 +9185,27 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::value_type *arg2 = 0 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::value_type *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  std::vector<int >::value_type temp2 ;
+  std::vector< int >::value_type temp2 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:vectorInt_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_append" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_append" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt_append" "', argument " "2"" of type '" "std::vector<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt_append" "', argument " "2"" of type '" "std::vector< int >::value_type""'");
   } 
-  temp2 = static_cast< std::vector<int >::value_type >(val2);
+  temp2 = static_cast< std::vector< int >::value_type >(val2);
   arg2 = &temp2;
   std_vector_Sl_int_Sg__append(arg1,(int const &)*arg2);
   resultobj = SWIG_Py_Void();
@@ -9192,11 +9217,11 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_vectorInt__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *result = 0 ;
+  std::vector< int > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_vectorInt")) SWIG_fail;
-  result = (std::vector<int > *)new std::vector<int >();
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, SWIG_POINTER_NEW |  0 );
+  result = (std::vector< int > *)new std::vector< int >();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -9205,25 +9230,25 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_vectorInt__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = 0 ;
-  std::vector<int > *result = 0 ;
+  std::vector< int > *arg1 = 0 ;
+  std::vector< int > *result = 0 ;
   int res1 = SWIG_OLDOBJ ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_vectorInt",&obj0)) SWIG_fail;
   {
-    std::vector<int,std::allocator<int > > *ptr = (std::vector<int,std::allocator<int > > *)0;
+    std::vector<int,std::allocator< int > > *ptr = (std::vector<int,std::allocator< int > > *)0;
     res1 = swig::asptr(obj0, &ptr);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_vectorInt" "', argument " "1"" of type '" "std::vector<int > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_vectorInt" "', argument " "1"" of type '" "std::vector< int > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_vectorInt" "', argument " "1"" of type '" "std::vector<int > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_vectorInt" "', argument " "1"" of type '" "std::vector< int > const &""'"); 
     }
     arg1 = ptr;
   }
-  result = (std::vector<int > *)new std::vector<int >((std::vector<int > const &)*arg1);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, SWIG_POINTER_NEW |  0 );
+  result = (std::vector< int > *)new std::vector< int >((std::vector< int > const &)*arg1);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, SWIG_POINTER_NEW |  0 );
   if (SWIG_IsNewObj(res1)) delete arg1;
   return resultobj;
 fail:
@@ -9234,19 +9259,19 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_empty",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_empty" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_empty" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
-  result = (bool)((std::vector<int > const *)arg1)->empty();
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
+  result = (bool)((std::vector< int > const *)arg1)->empty();
   resultobj = SWIG_From_bool(static_cast< bool >(result));
   return resultobj;
 fail:
@@ -9256,19 +9281,19 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::size_type result;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_size" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_size" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
-  result = ((std::vector<int > const *)arg1)->size();
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
+  result = ((std::vector< int > const *)arg1)->size();
   resultobj = SWIG_From_size_t(static_cast< size_t >(result));
   return resultobj;
 fail:
@@ -9278,17 +9303,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_clear" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_clear" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   (arg1)->clear();
   resultobj = SWIG_Py_Void();
   return resultobj;
@@ -9299,8 +9324,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int > *arg2 = 0 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -9309,19 +9334,19 @@ SWIGINTERN PyObject *_wrap_vectorInt_swap(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:vectorInt_swap",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_swap" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_swap" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t,  0 );
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vectorInt_swap" "', argument " "2"" of type '" "std::vector<int > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vectorInt_swap" "', argument " "2"" of type '" "std::vector< int > &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vectorInt_swap" "', argument " "2"" of type '" "std::vector<int > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vectorInt_swap" "', argument " "2"" of type '" "std::vector< int > &""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<int > * >(argp2);
+  arg2 = reinterpret_cast< std::vector< int > * >(argp2);
   (arg1)->swap(*arg2);
   resultobj = SWIG_Py_Void();
   return resultobj;
@@ -9332,42 +9357,42 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  SwigValueWrapper<std::allocator<int > > result;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  SwigValueWrapper< std::allocator< int > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_get_allocator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_get_allocator" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_get_allocator" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
-  result = ((std::vector<int > const *)arg1)->get_allocator();
-  resultobj = SWIG_NewPointerObj((new std::vector<int >::allocator_type(static_cast< const std::vector<int >::allocator_type& >(result))), SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
+  result = ((std::vector< int > const *)arg1)->get_allocator();
+  resultobj = SWIG_NewPointerObj((new std::vector< int >::allocator_type(static_cast< const std::vector< int >::allocator_type& >(result))), SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorInt_begin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vectorInt_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::iterator result;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::const_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_begin" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_begin" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
-  result = (arg1)->begin();
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<int >::iterator & >(result)),
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
+  result = ((std::vector< int > const *)arg1)->begin();
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< int >::const_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -9375,78 +9400,22 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorInt_begin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vectorInt_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::const_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_begin" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
-  result = ((std::vector<int > const *)arg1)->begin();
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<int >::const_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_vectorInt_begin(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_vectorInt_begin__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_vectorInt_begin__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'vectorInt_begin'.\n  Possible C/C++ prototypes are:\n    begin()\n    begin()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_vectorInt_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::iterator result;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::const_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_end" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_end" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
-  result = (arg1)->end();
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<int >::iterator & >(result)),
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
+  result = ((std::vector< int > const *)arg1)->end();
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< int >::const_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -9454,78 +9423,22 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorInt_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vectorInt_rbegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::const_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_end" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
-  result = ((std::vector<int > const *)arg1)->end();
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<int >::const_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_vectorInt_end(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_vectorInt_end__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_vectorInt_end__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'vectorInt_end'.\n  Possible C/C++ prototypes are:\n    end()\n    end()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_vectorInt_rbegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::reverse_iterator result;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::const_reverse_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_rbegin" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_rbegin" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
-  result = (arg1)->rbegin();
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<int >::reverse_iterator & >(result)),
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
+  result = ((std::vector< int > const *)arg1)->rbegin();
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< int >::const_reverse_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -9533,78 +9446,22 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorInt_rbegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vectorInt_rend(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::const_reverse_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_rbegin" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
-  result = ((std::vector<int > const *)arg1)->rbegin();
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<int >::const_reverse_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_vectorInt_rbegin(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_vectorInt_rbegin__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_vectorInt_rbegin__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'vectorInt_rbegin'.\n  Possible C/C++ prototypes are:\n    rbegin()\n    rbegin()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_vectorInt_rend__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::reverse_iterator result;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::const_reverse_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_rend" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_rend" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
-  result = (arg1)->rend();
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<int >::reverse_iterator & >(result)),
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
+  result = ((std::vector< int > const *)arg1)->rend();
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< int >::const_reverse_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -9612,66 +9469,10 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorInt_rend__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::const_reverse_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_rend" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
-  result = ((std::vector<int > const *)arg1)->rend();
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<int >::const_reverse_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_vectorInt_rend(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_vectorInt_rend__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_vectorInt_rend__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'vectorInt_rend'.\n  Possible C/C++ prototypes are:\n    rend()\n    rend()\n");
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_new_vectorInt__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int >::size_type arg1 ;
-  std::vector<int > *result = 0 ;
+  std::vector< int >::size_type arg1 ;
+  std::vector< int > *result = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -9679,11 +9480,11 @@ SWIGINTERN PyObject *_wrap_new_vectorInt__SWIG_2(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"O:new_vectorInt",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vectorInt" "', argument " "1"" of type '" "std::vector<int >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vectorInt" "', argument " "1"" of type '" "std::vector< int >::size_type""'");
   } 
-  arg1 = static_cast< std::vector<int >::size_type >(val1);
-  result = (std::vector<int > *)new std::vector<int >(arg1);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, SWIG_POINTER_NEW |  0 );
+  arg1 = static_cast< std::vector< int >::size_type >(val1);
+  result = (std::vector< int > *)new std::vector< int >(arg1);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -9692,17 +9493,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_pop_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_pop_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_pop_back" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_pop_back" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   (arg1)->pop_back();
   resultobj = SWIG_Py_Void();
   return resultobj;
@@ -9713,8 +9514,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::size_type arg2 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::size_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -9723,16 +9524,16 @@ SWIGINTERN PyObject *_wrap_vectorInt_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:vectorInt_resize",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_resize" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_resize" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt_resize" "', argument " "2"" of type '" "std::vector<int >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt_resize" "', argument " "2"" of type '" "std::vector< int >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<int >::size_type >(val2);
+  arg2 = static_cast< std::vector< int >::size_type >(val2);
   (arg1)->resize(arg2);
   resultobj = SWIG_Py_Void();
   return resultobj;
@@ -9743,9 +9544,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::iterator arg2 ;
-  std::vector<int >::iterator result;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::iterator arg2 ;
+  std::vector< int >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -9754,24 +9555,24 @@ SWIGINTERN PyObject *_wrap_vectorInt_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:vectorInt_erase",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_erase" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_erase" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_erase" "', argument " "2"" of type '" "std::vector<int >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_erase" "', argument " "2"" of type '" "std::vector< int >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<int >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<int >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< int >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< int >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_erase" "', argument " "2"" of type '" "std::vector<int >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_erase" "', argument " "2"" of type '" "std::vector< int >::iterator""'");
     }
   }
   result = (arg1)->erase(arg2);
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<int >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< int >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -9781,10 +9582,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::iterator arg2 ;
-  std::vector<int >::iterator arg3 ;
-  std::vector<int >::iterator result;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::iterator arg2 ;
+  std::vector< int >::iterator arg3 ;
+  std::vector< int >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -9796,35 +9597,35 @@ SWIGINTERN PyObject *_wrap_vectorInt_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:vectorInt_erase",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_erase" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_erase" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_erase" "', argument " "2"" of type '" "std::vector<int >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_erase" "', argument " "2"" of type '" "std::vector< int >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<int >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<int >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< int >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< int >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_erase" "', argument " "2"" of type '" "std::vector<int >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_erase" "', argument " "2"" of type '" "std::vector< int >::iterator""'");
     }
   }
   res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res3) || !iter3) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_erase" "', argument " "3"" of type '" "std::vector<int >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_erase" "', argument " "3"" of type '" "std::vector< int >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<int >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<int >::iterator > *>(iter3);
+    swig::PySwigIterator_T<std::vector< int >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< int >::iterator > *>(iter3);
     if (iter_t) {
       arg3 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_erase" "', argument " "3"" of type '" "std::vector<int >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_erase" "', argument " "3"" of type '" "std::vector< int >::iterator""'");
     }
   }
   result = (arg1)->erase(arg2,arg3);
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<int >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< int >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -9838,18 +9639,18 @@ SWIGINTERN PyObject *_wrap_vectorInt_erase(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<int >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< int >::iterator > *>(iter) != 0));
       if (_v) {
         return _wrap_vectorInt_erase__SWIG_0(self, args);
       }
@@ -9857,16 +9658,16 @@ SWIGINTERN PyObject *_wrap_vectorInt_erase(PyObject *self, PyObject *args) {
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<int >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< int >::iterator > *>(iter) != 0));
       if (_v) {
         swig::PySwigIterator *iter = 0;
         int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<int >::iterator > *>(iter) != 0));
+        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< int >::iterator > *>(iter) != 0));
         if (_v) {
           return _wrap_vectorInt_erase__SWIG_1(self, args);
         }
@@ -9875,19 +9676,22 @@ SWIGINTERN PyObject *_wrap_vectorInt_erase(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'vectorInt_erase'.\n  Possible C/C++ prototypes are:\n    erase(std::vector<int >::iterator)\n    erase(std::vector<int >::iterator,std::vector<int >::iterator)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'vectorInt_erase'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    erase(std::vector< int > *,std::vector< int >::iterator)\n"
+    "    erase(std::vector< int > *,std::vector< int >::iterator,std::vector< int >::iterator)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_new_vectorInt__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int >::size_type arg1 ;
-  std::vector<int >::value_type *arg2 = 0 ;
-  std::vector<int > *result = 0 ;
+  std::vector< int >::size_type arg1 ;
+  std::vector< int >::value_type *arg2 = 0 ;
+  std::vector< int > *result = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
-  std::vector<int >::value_type temp2 ;
+  std::vector< int >::value_type temp2 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
@@ -9896,17 +9700,17 @@ SWIGINTERN PyObject *_wrap_new_vectorInt__SWIG_3(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"OO:new_vectorInt",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vectorInt" "', argument " "1"" of type '" "std::vector<int >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vectorInt" "', argument " "1"" of type '" "std::vector< int >::size_type""'");
   } 
-  arg1 = static_cast< std::vector<int >::size_type >(val1);
+  arg1 = static_cast< std::vector< int >::size_type >(val1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_vectorInt" "', argument " "2"" of type '" "std::vector<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_vectorInt" "', argument " "2"" of type '" "std::vector< int >::value_type""'");
   } 
-  temp2 = static_cast< std::vector<int >::value_type >(val2);
+  temp2 = static_cast< std::vector< int >::value_type >(val2);
   arg2 = &temp2;
-  result = (std::vector<int > *)new std::vector<int >(arg1,(std::vector<int >::value_type const &)*arg2);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, SWIG_POINTER_NEW |  0 );
+  result = (std::vector< int > *)new std::vector< int >(arg1,(std::vector< int >::value_type const &)*arg2);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -9919,7 +9723,7 @@ SWIGINTERN PyObject *_wrap_new_vectorInt(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -9938,7 +9742,7 @@ SWIGINTERN PyObject *_wrap_new_vectorInt(PyObject *self, PyObject *args) {
   }
   if (argc == 1) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_new_vectorInt__SWIG_1(self, args);
@@ -9962,36 +9766,41 @@ SWIGINTERN PyObject *_wrap_new_vectorInt(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_vectorInt'.\n  Possible C/C++ prototypes are:\n    std::vector<(int)>()\n    std::vector<(int)>(std::vector<int > const &)\n    std::vector<(int)>(std::vector<int >::size_type)\n    std::vector<(int)>(std::vector<int >::size_type,std::vector<int >::value_type const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_vectorInt'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    std::vector< int >()\n"
+    "    std::vector< int >(std::vector< int > const &)\n"
+    "    std::vector< int >(std::vector< int >::size_type)\n"
+    "    std::vector< int >(std::vector< int >::size_type,std::vector< int >::value_type const &)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_vectorInt_push_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::value_type *arg2 = 0 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::value_type *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  std::vector<int >::value_type temp2 ;
+  std::vector< int >::value_type temp2 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:vectorInt_push_back",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_push_back" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_push_back" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt_push_back" "', argument " "2"" of type '" "std::vector<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt_push_back" "', argument " "2"" of type '" "std::vector< int >::value_type""'");
   } 
-  temp2 = static_cast< std::vector<int >::value_type >(val2);
+  temp2 = static_cast< std::vector< int >::value_type >(val2);
   arg2 = &temp2;
-  (arg1)->push_back((std::vector<int >::value_type const &)*arg2);
+  (arg1)->push_back((std::vector< int >::value_type const &)*arg2);
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -10001,21 +9810,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_front(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::value_type *result = 0 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_front",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_front" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_front" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   {
-    std::vector<int >::value_type const &_result_ref = ((std::vector<int > const *)arg1)->front();
-    result = (std::vector<int >::value_type *) &_result_ref;
+    std::vector< int >::value_type const &_result_ref = ((std::vector< int > const *)arg1)->front();
+    result = (std::vector< int >::value_type *) &_result_ref;
   }
   resultobj = SWIG_From_int(static_cast< int >(*result));
   return resultobj;
@@ -10026,21 +9835,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::value_type *result = 0 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_back" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_back" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   {
-    std::vector<int >::value_type const &_result_ref = ((std::vector<int > const *)arg1)->back();
-    result = (std::vector<int >::value_type *) &_result_ref;
+    std::vector< int >::value_type const &_result_ref = ((std::vector< int > const *)arg1)->back();
+    result = (std::vector< int >::value_type *) &_result_ref;
   }
   resultobj = SWIG_From_int(static_cast< int >(*result));
   return resultobj;
@@ -10051,14 +9860,14 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_assign(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::size_type arg2 ;
-  std::vector<int >::value_type *arg3 = 0 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::size_type arg2 ;
+  std::vector< int >::value_type *arg3 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  std::vector<int >::value_type temp3 ;
+  std::vector< int >::value_type temp3 ;
   int val3 ;
   int ecode3 = 0 ;
   PyObject * obj0 = 0 ;
@@ -10066,23 +9875,23 @@ SWIGINTERN PyObject *_wrap_vectorInt_assign(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:vectorInt_assign",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_assign" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_assign" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt_assign" "', argument " "2"" of type '" "std::vector<int >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt_assign" "', argument " "2"" of type '" "std::vector< int >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<int >::size_type >(val2);
+  arg2 = static_cast< std::vector< int >::size_type >(val2);
   ecode3 = SWIG_AsVal_int(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt_assign" "', argument " "3"" of type '" "std::vector<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt_assign" "', argument " "3"" of type '" "std::vector< int >::value_type""'");
   } 
-  temp3 = static_cast< std::vector<int >::value_type >(val3);
+  temp3 = static_cast< std::vector< int >::value_type >(val3);
   arg3 = &temp3;
-  (arg1)->assign(arg2,(std::vector<int >::value_type const &)*arg3);
+  (arg1)->assign(arg2,(std::vector< int >::value_type const &)*arg3);
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -10092,14 +9901,14 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::size_type arg2 ;
-  std::vector<int >::value_type *arg3 = 0 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::size_type arg2 ;
+  std::vector< int >::value_type *arg3 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  std::vector<int >::value_type temp3 ;
+  std::vector< int >::value_type temp3 ;
   int val3 ;
   int ecode3 = 0 ;
   PyObject * obj0 = 0 ;
@@ -10107,23 +9916,23 @@ SWIGINTERN PyObject *_wrap_vectorInt_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:vectorInt_resize",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_resize" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_resize" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt_resize" "', argument " "2"" of type '" "std::vector<int >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt_resize" "', argument " "2"" of type '" "std::vector< int >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<int >::size_type >(val2);
+  arg2 = static_cast< std::vector< int >::size_type >(val2);
   ecode3 = SWIG_AsVal_int(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt_resize" "', argument " "3"" of type '" "std::vector<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt_resize" "', argument " "3"" of type '" "std::vector< int >::value_type""'");
   } 
-  temp3 = static_cast< std::vector<int >::value_type >(val3);
+  temp3 = static_cast< std::vector< int >::value_type >(val3);
   arg3 = &temp3;
-  (arg1)->resize(arg2,(std::vector<int >::value_type const &)*arg3);
+  (arg1)->resize(arg2,(std::vector< int >::value_type const &)*arg3);
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -10137,13 +9946,13 @@ SWIGINTERN PyObject *_wrap_vectorInt_resize(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -10157,7 +9966,7 @@ SWIGINTERN PyObject *_wrap_vectorInt_resize(PyObject *self, PyObject *args) {
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -10177,22 +9986,25 @@ SWIGINTERN PyObject *_wrap_vectorInt_resize(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'vectorInt_resize'.\n  Possible C/C++ prototypes are:\n    resize(std::vector<int >::size_type)\n    resize(std::vector<int >::size_type,std::vector<int >::value_type const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'vectorInt_resize'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    resize(std::vector< int > *,std::vector< int >::size_type)\n"
+    "    resize(std::vector< int > *,std::vector< int >::size_type,std::vector< int >::value_type const &)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_vectorInt_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::iterator arg2 ;
-  std::vector<int >::value_type *arg3 = 0 ;
-  std::vector<int >::iterator result;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::iterator arg2 ;
+  std::vector< int >::value_type *arg3 = 0 ;
+  std::vector< int >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
   int res2 ;
-  std::vector<int >::value_type temp3 ;
+  std::vector< int >::value_type temp3 ;
   int val3 ;
   int ecode3 = 0 ;
   PyObject * obj0 = 0 ;
@@ -10200,30 +10012,30 @@ SWIGINTERN PyObject *_wrap_vectorInt_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:vectorInt_insert",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_insert" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_insert" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_insert" "', argument " "2"" of type '" "std::vector<int >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_insert" "', argument " "2"" of type '" "std::vector< int >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<int >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<int >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< int >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< int >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_insert" "', argument " "2"" of type '" "std::vector<int >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_insert" "', argument " "2"" of type '" "std::vector< int >::iterator""'");
     }
   }
   ecode3 = SWIG_AsVal_int(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt_insert" "', argument " "3"" of type '" "std::vector<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt_insert" "', argument " "3"" of type '" "std::vector< int >::value_type""'");
   } 
-  temp3 = static_cast< std::vector<int >::value_type >(val3);
+  temp3 = static_cast< std::vector< int >::value_type >(val3);
   arg3 = &temp3;
-  result = (arg1)->insert(arg2,(std::vector<int >::value_type const &)*arg3);
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<int >::iterator & >(result)),
+  result = (arg1)->insert(arg2,(std::vector< int >::value_type const &)*arg3);
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< int >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -10233,17 +10045,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::iterator arg2 ;
-  std::vector<int >::size_type arg3 ;
-  std::vector<int >::value_type *arg4 = 0 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::iterator arg2 ;
+  std::vector< int >::size_type arg3 ;
+  std::vector< int >::value_type *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
   int res2 ;
   size_t val3 ;
   int ecode3 = 0 ;
-  std::vector<int >::value_type temp4 ;
+  std::vector< int >::value_type temp4 ;
   int val4 ;
   int ecode4 = 0 ;
   PyObject * obj0 = 0 ;
@@ -10252,34 +10064,34 @@ SWIGINTERN PyObject *_wrap_vectorInt_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:vectorInt_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_insert" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_insert" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_insert" "', argument " "2"" of type '" "std::vector<int >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_insert" "', argument " "2"" of type '" "std::vector< int >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<int >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<int >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< int >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< int >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_insert" "', argument " "2"" of type '" "std::vector<int >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_insert" "', argument " "2"" of type '" "std::vector< int >::iterator""'");
     }
   }
   ecode3 = SWIG_AsVal_size_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt_insert" "', argument " "3"" of type '" "std::vector<int >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt_insert" "', argument " "3"" of type '" "std::vector< int >::size_type""'");
   } 
-  arg3 = static_cast< std::vector<int >::size_type >(val3);
+  arg3 = static_cast< std::vector< int >::size_type >(val3);
   ecode4 = SWIG_AsVal_int(obj3, &val4);
   if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "vectorInt_insert" "', argument " "4"" of type '" "std::vector<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "vectorInt_insert" "', argument " "4"" of type '" "std::vector< int >::value_type""'");
   } 
-  temp4 = static_cast< std::vector<int >::value_type >(val4);
+  temp4 = static_cast< std::vector< int >::value_type >(val4);
   arg4 = &temp4;
-  (arg1)->insert(arg2,arg3,(std::vector<int >::value_type const &)*arg4);
+  (arg1)->insert(arg2,arg3,(std::vector< int >::value_type const &)*arg4);
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -10293,18 +10105,18 @@ SWIGINTERN PyObject *_wrap_vectorInt_insert(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<int >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< int >::iterator > *>(iter) != 0));
       if (_v) {
         {
           int res = SWIG_AsVal_int(argv[2], NULL);
@@ -10318,12 +10130,12 @@ SWIGINTERN PyObject *_wrap_vectorInt_insert(PyObject *self, PyObject *args) {
   }
   if (argc == 4) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<int >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< int >::iterator > *>(iter) != 0));
       if (_v) {
         {
           int res = SWIG_AsVal_size_t(argv[2], NULL);
@@ -10343,15 +10155,18 @@ SWIGINTERN PyObject *_wrap_vectorInt_insert(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'vectorInt_insert'.\n  Possible C/C++ prototypes are:\n    insert(std::vector<int >::iterator,std::vector<int >::value_type const &)\n    insert(std::vector<int >::iterator,std::vector<int >::size_type,std::vector<int >::value_type const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'vectorInt_insert'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    insert(std::vector< int > *,std::vector< int >::iterator,std::vector< int >::value_type const &)\n"
+    "    insert(std::vector< int > *,std::vector< int >::iterator,std::vector< int >::size_type,std::vector< int >::value_type const &)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_vectorInt_reserve(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::size_type arg2 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::size_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -10360,16 +10175,16 @@ SWIGINTERN PyObject *_wrap_vectorInt_reserve(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:vectorInt_reserve",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_reserve" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_reserve" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt_reserve" "', argument " "2"" of type '" "std::vector<int >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt_reserve" "', argument " "2"" of type '" "std::vector< int >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<int >::size_type >(val2);
+  arg2 = static_cast< std::vector< int >::size_type >(val2);
   (arg1)->reserve(arg2);
   resultobj = SWIG_Py_Void();
   return resultobj;
@@ -10380,19 +10195,19 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_capacity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::size_type result;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_capacity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_capacity" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_capacity" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
-  result = ((std::vector<int > const *)arg1)->capacity();
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
+  result = ((std::vector< int > const *)arg1)->capacity();
   resultobj = SWIG_From_size_t(static_cast< size_t >(result));
   return resultobj;
 fail:
@@ -10402,17 +10217,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_vectorInt(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_vectorInt",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_vectorInt" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_vectorInt" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   {
     try {
       delete arg1;
@@ -10434,8 +10249,8 @@ fail:
 
 SWIGINTERN PyObject *vectorInt_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
@@ -10576,7 +10391,7 @@ SWIGINTERN PyObject *_wrap_new_Id(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -10619,7 +10434,12 @@ SWIGINTERN PyObject *_wrap_new_Id(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Id'.\n  Possible C/C++ prototypes are:\n    Id()\n    Id(Id::id_type)\n    Id(Id::id_type,Id::id_type)\n    Id(Id const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Id'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Id()\n"
+    "    Id(Id::id_type)\n"
+    "    Id(Id::id_type,Id::id_type)\n"
+    "    Id(Id const &)\n");
   return NULL;
 }
 
@@ -10934,19 +10754,19 @@ fail:
 
 SWIGINTERN PyObject *Id_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Id, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec_2u(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,2 > *result = 0 ;
+  VecMat::Vec< unsigned int,2 > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec_2u")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec<unsigned int,2 > *)new VecMat::Vec<unsigned int,2 >();
+      result = (VecMat::Vec< unsigned int,2 > *)new VecMat::Vec< unsigned int,2 >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -10955,7 +10775,7 @@ SWIGINTERN PyObject *_wrap_new_Vec_2u(PyObject *SWIGUNUSEDPARM(self), PyObject *
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -10964,17 +10784,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec_2u(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
+  VecMat::Vec< unsigned int,2 > *arg1 = (VecMat::Vec< unsigned int,2 > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec_2u",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_2u" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_2u" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,2 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp1);
   {
     try {
       delete arg1;
@@ -11001,7 +10821,7 @@ SWIGINTERN PyObject *_wrap_Vec_2u_dim(PyObject *SWIGUNUSEDPARM(self), PyObject *
   if (!PyArg_ParseTuple(args,(char *)":Vec_2u_dim")) SWIG_fail;
   {
     try {
-      result = (unsigned int)VecMat::Vec<unsigned int,2 >::SWIGTEMPLATEDISAMBIGUATOR dim();
+      result = (unsigned int)VecMat::Vec< unsigned int,2 >::SWIGTEMPLATEDISAMBIGUATOR dim();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11019,21 +10839,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2u_norm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
-  VecMat::Vec<unsigned int,2 >::value_type result;
+  VecMat::Vec< unsigned int,2 > *arg1 = (VecMat::Vec< unsigned int,2 > *) 0 ;
+  VecMat::Vec< unsigned int,2 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2u_norm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u_norm" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u_norm" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec<unsigned int,2 >::value_type)((VecMat::Vec<unsigned int,2 > const *)arg1)->norm();
+      result = (VecMat::Vec< unsigned int,2 >::value_type)((VecMat::Vec< unsigned int,2 > const *)arg1)->norm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11051,21 +10871,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2u_squareNorm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
-  VecMat::Vec<unsigned int,2 >::value_type result;
+  VecMat::Vec< unsigned int,2 > *arg1 = (VecMat::Vec< unsigned int,2 > *) 0 ;
+  VecMat::Vec< unsigned int,2 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2u_squareNorm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u_squareNorm" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u_squareNorm" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec<unsigned int,2 >::value_type)((VecMat::Vec<unsigned int,2 > const *)arg1)->squareNorm();
+      result = (VecMat::Vec< unsigned int,2 >::value_type)((VecMat::Vec< unsigned int,2 > const *)arg1)->squareNorm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11083,23 +10903,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2u_normalize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
-  VecMat::Vec<unsigned int,2 > *result = 0 ;
+  VecMat::Vec< unsigned int,2 > *arg1 = (VecMat::Vec< unsigned int,2 > *) 0 ;
+  VecMat::Vec< unsigned int,2 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2u_normalize",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u_normalize" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u_normalize" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,2 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec<unsigned int,2 > &_result_ref = (arg1)->normalize();
-        result = (VecMat::Vec<unsigned int,2 > *) &_result_ref;
+        VecMat::Vec< unsigned int,2 > &_result_ref = (arg1)->normalize();
+        result = (VecMat::Vec< unsigned int,2 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -11109,7 +10929,7 @@ SWIGINTERN PyObject *_wrap_Vec_2u_normalize(PyObject *SWIGUNUSEDPARM(self), PyOb
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -11118,23 +10938,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2u_normalizeSafe(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
-  VecMat::Vec<unsigned int,2 > *result = 0 ;
+  VecMat::Vec< unsigned int,2 > *arg1 = (VecMat::Vec< unsigned int,2 > *) 0 ;
+  VecMat::Vec< unsigned int,2 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2u_normalizeSafe",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,2 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec<unsigned int,2 > &_result_ref = (arg1)->normalizeSafe();
-        result = (VecMat::Vec<unsigned int,2 > *) &_result_ref;
+        VecMat::Vec< unsigned int,2 > &_result_ref = (arg1)->normalizeSafe();
+        result = (VecMat::Vec< unsigned int,2 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -11144,7 +10964,7 @@ SWIGINTERN PyObject *_wrap_Vec_2u_normalizeSafe(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -11153,9 +10973,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2u___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
-  VecMat::Vec<unsigned int,2 > *arg2 = 0 ;
-  VecMat::Vec<unsigned int,2 > result;
+  VecMat::Vec< unsigned int,2 > *arg1 = (VecMat::Vec< unsigned int,2 > *) 0 ;
+  VecMat::Vec< unsigned int,2 > *arg2 = 0 ;
+  VecMat::Vec< unsigned int,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -11164,22 +10984,22 @@ SWIGINTERN PyObject *_wrap_Vec_2u___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2u___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___add__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___add__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___add__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___add__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___add__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___add__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec<unsigned int,2 > const *)arg1)->operator +((VecMat::Vec<unsigned int,2 > const &)*arg2);
+      result = ((VecMat::Vec< unsigned int,2 > const *)arg1)->operator +((VecMat::Vec< unsigned int,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11188,7 +11008,7 @@ SWIGINTERN PyObject *_wrap_Vec_2u___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<unsigned int,2 >(static_cast< const VecMat::Vec<unsigned int,2 >& >(result))), SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< unsigned int,2 >(static_cast< const VecMat::Vec< unsigned int,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -11197,9 +11017,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2u___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
-  VecMat::Vec<unsigned int,2 > *arg2 = 0 ;
-  VecMat::Vec<unsigned int,2 > result;
+  VecMat::Vec< unsigned int,2 > *arg1 = (VecMat::Vec< unsigned int,2 > *) 0 ;
+  VecMat::Vec< unsigned int,2 > *arg2 = 0 ;
+  VecMat::Vec< unsigned int,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -11208,22 +11028,22 @@ SWIGINTERN PyObject *_wrap_Vec_2u___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2u___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___sub__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___sub__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___sub__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___sub__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___sub__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___sub__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec<unsigned int,2 > const *)arg1)->operator -((VecMat::Vec<unsigned int,2 > const &)*arg2);
+      result = ((VecMat::Vec< unsigned int,2 > const *)arg1)->operator -((VecMat::Vec< unsigned int,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11232,7 +11052,7 @@ SWIGINTERN PyObject *_wrap_Vec_2u___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<unsigned int,2 >(static_cast< const VecMat::Vec<unsigned int,2 >& >(result))), SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< unsigned int,2 >(static_cast< const VecMat::Vec< unsigned int,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -11241,9 +11061,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2u___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
-  VecMat::Vec<unsigned int,2 >::value_type arg2 ;
-  VecMat::Vec<unsigned int,2 > result;
+  VecMat::Vec< unsigned int,2 > *arg1 = (VecMat::Vec< unsigned int,2 > *) 0 ;
+  VecMat::Vec< unsigned int,2 >::value_type arg2 ;
+  VecMat::Vec< unsigned int,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned int val2 ;
@@ -11252,19 +11072,19 @@ SWIGINTERN PyObject *_wrap_Vec_2u___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2u___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___mul__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___mul__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2u___mul__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2u___mul__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec<unsigned int,2 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec< unsigned int,2 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec<unsigned int,2 > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec< unsigned int,2 > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11273,7 +11093,7 @@ SWIGINTERN PyObject *_wrap_Vec_2u___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<unsigned int,2 >(static_cast< const VecMat::Vec<unsigned int,2 >& >(result))), SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< unsigned int,2 >(static_cast< const VecMat::Vec< unsigned int,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -11282,9 +11102,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2u___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
-  VecMat::Vec<unsigned int,2 >::value_type arg2 ;
-  VecMat::Vec<unsigned int,2 > result;
+  VecMat::Vec< unsigned int,2 > *arg1 = (VecMat::Vec< unsigned int,2 > *) 0 ;
+  VecMat::Vec< unsigned int,2 >::value_type arg2 ;
+  VecMat::Vec< unsigned int,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned int val2 ;
@@ -11293,19 +11113,19 @@ SWIGINTERN PyObject *_wrap_Vec_2u___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2u___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___div__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___div__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2u___div__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2u___div__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec<unsigned int,2 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec< unsigned int,2 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec<unsigned int,2 > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec< unsigned int,2 > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11314,7 +11134,7 @@ SWIGINTERN PyObject *_wrap_Vec_2u___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<unsigned int,2 >(static_cast< const VecMat::Vec<unsigned int,2 >& >(result))), SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< unsigned int,2 >(static_cast< const VecMat::Vec< unsigned int,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -11323,9 +11143,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2u___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
-  VecMat::Vec<unsigned int,2 > *arg2 = 0 ;
-  VecMat::Vec<unsigned int,2 >::value_type result;
+  VecMat::Vec< unsigned int,2 > *arg1 = (VecMat::Vec< unsigned int,2 > *) 0 ;
+  VecMat::Vec< unsigned int,2 > *arg2 = 0 ;
+  VecMat::Vec< unsigned int,2 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -11334,22 +11154,22 @@ SWIGINTERN PyObject *_wrap_Vec_2u___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2u___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___mul__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___mul__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___mul__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___mul__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___mul__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___mul__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp2);
   {
     try {
-      result = (VecMat::Vec<unsigned int,2 >::value_type)((VecMat::Vec<unsigned int,2 > const *)arg1)->operator *((VecMat::Vec<unsigned int,2 > const &)*arg2);
+      result = (VecMat::Vec< unsigned int,2 >::value_type)((VecMat::Vec< unsigned int,2 > const *)arg1)->operator *((VecMat::Vec< unsigned int,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11371,17 +11191,17 @@ SWIGINTERN PyObject *_wrap_Vec_2u___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec_2u___mul____SWIG_1(self, args);
@@ -11391,7 +11211,7 @@ SWIGINTERN PyObject *_wrap_Vec_2u___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -11412,8 +11232,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2u___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
-  VecMat::Vec<unsigned int,2 > *arg2 = 0 ;
+  VecMat::Vec< unsigned int,2 > *arg1 = (VecMat::Vec< unsigned int,2 > *) 0 ;
+  VecMat::Vec< unsigned int,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -11423,22 +11243,22 @@ SWIGINTERN PyObject *_wrap_Vec_2u___eq__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2u___eq__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___eq__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___eq__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___eq__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___eq__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___eq__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___eq__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<unsigned int,2 > const *)arg1)->operator ==((VecMat::Vec<unsigned int,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec< unsigned int,2 > const *)arg1)->operator ==((VecMat::Vec< unsigned int,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11456,8 +11276,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2u___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
-  VecMat::Vec<unsigned int,2 > *arg2 = 0 ;
+  VecMat::Vec< unsigned int,2 > *arg1 = (VecMat::Vec< unsigned int,2 > *) 0 ;
+  VecMat::Vec< unsigned int,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -11467,22 +11287,22 @@ SWIGINTERN PyObject *_wrap_Vec_2u___ne__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2u___ne__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___ne__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___ne__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___ne__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___ne__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___ne__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___ne__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<unsigned int,2 > const *)arg1)->operator !=((VecMat::Vec<unsigned int,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec< unsigned int,2 > const *)arg1)->operator !=((VecMat::Vec< unsigned int,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11500,8 +11320,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2u___lt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
-  VecMat::Vec<unsigned int,2 > *arg2 = 0 ;
+  VecMat::Vec< unsigned int,2 > *arg1 = (VecMat::Vec< unsigned int,2 > *) 0 ;
+  VecMat::Vec< unsigned int,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -11511,22 +11331,22 @@ SWIGINTERN PyObject *_wrap_Vec_2u___lt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2u___lt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___lt__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___lt__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___lt__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___lt__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___lt__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___lt__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<unsigned int,2 > const *)arg1)->operator <((VecMat::Vec<unsigned int,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec< unsigned int,2 > const *)arg1)->operator <((VecMat::Vec< unsigned int,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11544,8 +11364,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2u___gt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
-  VecMat::Vec<unsigned int,2 > *arg2 = 0 ;
+  VecMat::Vec< unsigned int,2 > *arg1 = (VecMat::Vec< unsigned int,2 > *) 0 ;
+  VecMat::Vec< unsigned int,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -11555,22 +11375,22 @@ SWIGINTERN PyObject *_wrap_Vec_2u___gt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2u___gt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___gt__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___gt__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___gt__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___gt__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___gt__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___gt__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<unsigned int,2 > const *)arg1)->operator >((VecMat::Vec<unsigned int,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec< unsigned int,2 > const *)arg1)->operator >((VecMat::Vec< unsigned int,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11588,19 +11408,19 @@ fail:
 
 SWIGINTERN PyObject *Vec_2u_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec_2i(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,2 > *result = 0 ;
+  VecMat::Vec< int,2 > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec_2i")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec<int,2 > *)new VecMat::Vec<int,2 >();
+      result = (VecMat::Vec< int,2 > *)new VecMat::Vec< int,2 >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11609,7 +11429,7 @@ SWIGINTERN PyObject *_wrap_new_Vec_2i(PyObject *SWIGUNUSEDPARM(self), PyObject *
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTint_2_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_int_2_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -11618,17 +11438,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec_2i(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
+  VecMat::Vec< int,2 > *arg1 = (VecMat::Vec< int,2 > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec_2i",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_2_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_2i" "', argument " "1"" of type '" "VecMat::Vec<int,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_2i" "', argument " "1"" of type '" "VecMat::Vec< int,2 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp1);
   {
     try {
       delete arg1;
@@ -11655,7 +11475,7 @@ SWIGINTERN PyObject *_wrap_Vec_2i_dim(PyObject *SWIGUNUSEDPARM(self), PyObject *
   if (!PyArg_ParseTuple(args,(char *)":Vec_2i_dim")) SWIG_fail;
   {
     try {
-      result = (unsigned int)VecMat::Vec<int,2 >::SWIGTEMPLATEDISAMBIGUATOR dim();
+      result = (unsigned int)VecMat::Vec< int,2 >::SWIGTEMPLATEDISAMBIGUATOR dim();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11673,21 +11493,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2i_norm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
-  VecMat::Vec<int,2 >::value_type result;
+  VecMat::Vec< int,2 > *arg1 = (VecMat::Vec< int,2 > *) 0 ;
+  VecMat::Vec< int,2 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2i_norm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i_norm" "', argument " "1"" of type '" "VecMat::Vec<int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i_norm" "', argument " "1"" of type '" "VecMat::Vec< int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec<int,2 >::value_type)((VecMat::Vec<int,2 > const *)arg1)->norm();
+      result = (VecMat::Vec< int,2 >::value_type)((VecMat::Vec< int,2 > const *)arg1)->norm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11705,21 +11525,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2i_squareNorm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
-  VecMat::Vec<int,2 >::value_type result;
+  VecMat::Vec< int,2 > *arg1 = (VecMat::Vec< int,2 > *) 0 ;
+  VecMat::Vec< int,2 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2i_squareNorm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i_squareNorm" "', argument " "1"" of type '" "VecMat::Vec<int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i_squareNorm" "', argument " "1"" of type '" "VecMat::Vec< int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec<int,2 >::value_type)((VecMat::Vec<int,2 > const *)arg1)->squareNorm();
+      result = (VecMat::Vec< int,2 >::value_type)((VecMat::Vec< int,2 > const *)arg1)->squareNorm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11737,23 +11557,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2i_normalize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
-  VecMat::Vec<int,2 > *result = 0 ;
+  VecMat::Vec< int,2 > *arg1 = (VecMat::Vec< int,2 > *) 0 ;
+  VecMat::Vec< int,2 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2i_normalize",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i_normalize" "', argument " "1"" of type '" "VecMat::Vec<int,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i_normalize" "', argument " "1"" of type '" "VecMat::Vec< int,2 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec<int,2 > &_result_ref = (arg1)->normalize();
-        result = (VecMat::Vec<int,2 > *) &_result_ref;
+        VecMat::Vec< int,2 > &_result_ref = (arg1)->normalize();
+        result = (VecMat::Vec< int,2 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -11763,7 +11583,7 @@ SWIGINTERN PyObject *_wrap_Vec_2i_normalize(PyObject *SWIGUNUSEDPARM(self), PyOb
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_int_2_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -11772,23 +11592,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2i_normalizeSafe(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
-  VecMat::Vec<int,2 > *result = 0 ;
+  VecMat::Vec< int,2 > *arg1 = (VecMat::Vec< int,2 > *) 0 ;
+  VecMat::Vec< int,2 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2i_normalizeSafe",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec<int,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec< int,2 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec<int,2 > &_result_ref = (arg1)->normalizeSafe();
-        result = (VecMat::Vec<int,2 > *) &_result_ref;
+        VecMat::Vec< int,2 > &_result_ref = (arg1)->normalizeSafe();
+        result = (VecMat::Vec< int,2 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -11798,7 +11618,7 @@ SWIGINTERN PyObject *_wrap_Vec_2i_normalizeSafe(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_int_2_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -11807,9 +11627,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2i___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
-  VecMat::Vec<int,2 > *arg2 = 0 ;
-  VecMat::Vec<int,2 > result;
+  VecMat::Vec< int,2 > *arg1 = (VecMat::Vec< int,2 > *) 0 ;
+  VecMat::Vec< int,2 > *arg2 = 0 ;
+  VecMat::Vec< int,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -11818,22 +11638,22 @@ SWIGINTERN PyObject *_wrap_Vec_2i___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2i___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___add__" "', argument " "1"" of type '" "VecMat::Vec<int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___add__" "', argument " "1"" of type '" "VecMat::Vec< int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_int_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___add__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___add__" "', argument " "2"" of type '" "VecMat::Vec< int,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___add__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___add__" "', argument " "2"" of type '" "VecMat::Vec< int,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec<int,2 > const *)arg1)->operator +((VecMat::Vec<int,2 > const &)*arg2);
+      result = ((VecMat::Vec< int,2 > const *)arg1)->operator +((VecMat::Vec< int,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11842,7 +11662,7 @@ SWIGINTERN PyObject *_wrap_Vec_2i___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<int,2 >(static_cast< const VecMat::Vec<int,2 >& >(result))), SWIGTYPE_p_VecMat__VecTint_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< int,2 >(static_cast< const VecMat::Vec< int,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_int_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -11851,9 +11671,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2i___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
-  VecMat::Vec<int,2 > *arg2 = 0 ;
-  VecMat::Vec<int,2 > result;
+  VecMat::Vec< int,2 > *arg1 = (VecMat::Vec< int,2 > *) 0 ;
+  VecMat::Vec< int,2 > *arg2 = 0 ;
+  VecMat::Vec< int,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -11862,22 +11682,22 @@ SWIGINTERN PyObject *_wrap_Vec_2i___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2i___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___sub__" "', argument " "1"" of type '" "VecMat::Vec<int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___sub__" "', argument " "1"" of type '" "VecMat::Vec< int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_int_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___sub__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___sub__" "', argument " "2"" of type '" "VecMat::Vec< int,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___sub__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___sub__" "', argument " "2"" of type '" "VecMat::Vec< int,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec<int,2 > const *)arg1)->operator -((VecMat::Vec<int,2 > const &)*arg2);
+      result = ((VecMat::Vec< int,2 > const *)arg1)->operator -((VecMat::Vec< int,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11886,7 +11706,7 @@ SWIGINTERN PyObject *_wrap_Vec_2i___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<int,2 >(static_cast< const VecMat::Vec<int,2 >& >(result))), SWIGTYPE_p_VecMat__VecTint_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< int,2 >(static_cast< const VecMat::Vec< int,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_int_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -11895,9 +11715,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2i___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
-  VecMat::Vec<int,2 >::value_type arg2 ;
-  VecMat::Vec<int,2 > result;
+  VecMat::Vec< int,2 > *arg1 = (VecMat::Vec< int,2 > *) 0 ;
+  VecMat::Vec< int,2 >::value_type arg2 ;
+  VecMat::Vec< int,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -11906,19 +11726,19 @@ SWIGINTERN PyObject *_wrap_Vec_2i___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2i___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___mul__" "', argument " "1"" of type '" "VecMat::Vec<int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___mul__" "', argument " "1"" of type '" "VecMat::Vec< int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2i___mul__" "', argument " "2"" of type '" "VecMat::Vec<int,2 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2i___mul__" "', argument " "2"" of type '" "VecMat::Vec< int,2 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec<int,2 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec< int,2 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec<int,2 > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec< int,2 > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11927,7 +11747,7 @@ SWIGINTERN PyObject *_wrap_Vec_2i___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<int,2 >(static_cast< const VecMat::Vec<int,2 >& >(result))), SWIGTYPE_p_VecMat__VecTint_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< int,2 >(static_cast< const VecMat::Vec< int,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_int_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -11936,9 +11756,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2i___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
-  VecMat::Vec<int,2 >::value_type arg2 ;
-  VecMat::Vec<int,2 > result;
+  VecMat::Vec< int,2 > *arg1 = (VecMat::Vec< int,2 > *) 0 ;
+  VecMat::Vec< int,2 >::value_type arg2 ;
+  VecMat::Vec< int,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -11947,19 +11767,19 @@ SWIGINTERN PyObject *_wrap_Vec_2i___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2i___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___div__" "', argument " "1"" of type '" "VecMat::Vec<int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___div__" "', argument " "1"" of type '" "VecMat::Vec< int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2i___div__" "', argument " "2"" of type '" "VecMat::Vec<int,2 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2i___div__" "', argument " "2"" of type '" "VecMat::Vec< int,2 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec<int,2 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec< int,2 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec<int,2 > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec< int,2 > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11968,7 +11788,7 @@ SWIGINTERN PyObject *_wrap_Vec_2i___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<int,2 >(static_cast< const VecMat::Vec<int,2 >& >(result))), SWIGTYPE_p_VecMat__VecTint_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< int,2 >(static_cast< const VecMat::Vec< int,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_int_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -11977,9 +11797,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2i___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
-  VecMat::Vec<int,2 > *arg2 = 0 ;
-  VecMat::Vec<int,2 >::value_type result;
+  VecMat::Vec< int,2 > *arg1 = (VecMat::Vec< int,2 > *) 0 ;
+  VecMat::Vec< int,2 > *arg2 = 0 ;
+  VecMat::Vec< int,2 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -11988,22 +11808,22 @@ SWIGINTERN PyObject *_wrap_Vec_2i___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2i___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___mul__" "', argument " "1"" of type '" "VecMat::Vec<int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___mul__" "', argument " "1"" of type '" "VecMat::Vec< int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_int_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___mul__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___mul__" "', argument " "2"" of type '" "VecMat::Vec< int,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___mul__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___mul__" "', argument " "2"" of type '" "VecMat::Vec< int,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp2);
   {
     try {
-      result = (VecMat::Vec<int,2 >::value_type)((VecMat::Vec<int,2 > const *)arg1)->operator *((VecMat::Vec<int,2 > const &)*arg2);
+      result = (VecMat::Vec< int,2 >::value_type)((VecMat::Vec< int,2 > const *)arg1)->operator *((VecMat::Vec< int,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12025,17 +11845,17 @@ SWIGINTERN PyObject *_wrap_Vec_2i___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTint_2_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_int_2_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecTint_2_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecT_int_2_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec_2i___mul____SWIG_1(self, args);
@@ -12045,7 +11865,7 @@ SWIGINTERN PyObject *_wrap_Vec_2i___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTint_2_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_int_2_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -12066,8 +11886,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2i___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
-  VecMat::Vec<int,2 > *arg2 = 0 ;
+  VecMat::Vec< int,2 > *arg1 = (VecMat::Vec< int,2 > *) 0 ;
+  VecMat::Vec< int,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -12077,22 +11897,22 @@ SWIGINTERN PyObject *_wrap_Vec_2i___eq__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2i___eq__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___eq__" "', argument " "1"" of type '" "VecMat::Vec<int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___eq__" "', argument " "1"" of type '" "VecMat::Vec< int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_int_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___eq__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___eq__" "', argument " "2"" of type '" "VecMat::Vec< int,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___eq__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___eq__" "', argument " "2"" of type '" "VecMat::Vec< int,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<int,2 > const *)arg1)->operator ==((VecMat::Vec<int,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec< int,2 > const *)arg1)->operator ==((VecMat::Vec< int,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12110,8 +11930,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2i___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
-  VecMat::Vec<int,2 > *arg2 = 0 ;
+  VecMat::Vec< int,2 > *arg1 = (VecMat::Vec< int,2 > *) 0 ;
+  VecMat::Vec< int,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -12121,22 +11941,22 @@ SWIGINTERN PyObject *_wrap_Vec_2i___ne__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2i___ne__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___ne__" "', argument " "1"" of type '" "VecMat::Vec<int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___ne__" "', argument " "1"" of type '" "VecMat::Vec< int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_int_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___ne__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___ne__" "', argument " "2"" of type '" "VecMat::Vec< int,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___ne__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___ne__" "', argument " "2"" of type '" "VecMat::Vec< int,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<int,2 > const *)arg1)->operator !=((VecMat::Vec<int,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec< int,2 > const *)arg1)->operator !=((VecMat::Vec< int,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12154,8 +11974,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2i___lt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
-  VecMat::Vec<int,2 > *arg2 = 0 ;
+  VecMat::Vec< int,2 > *arg1 = (VecMat::Vec< int,2 > *) 0 ;
+  VecMat::Vec< int,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -12165,22 +11985,22 @@ SWIGINTERN PyObject *_wrap_Vec_2i___lt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2i___lt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___lt__" "', argument " "1"" of type '" "VecMat::Vec<int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___lt__" "', argument " "1"" of type '" "VecMat::Vec< int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_int_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___lt__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___lt__" "', argument " "2"" of type '" "VecMat::Vec< int,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___lt__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___lt__" "', argument " "2"" of type '" "VecMat::Vec< int,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<int,2 > const *)arg1)->operator <((VecMat::Vec<int,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec< int,2 > const *)arg1)->operator <((VecMat::Vec< int,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12198,8 +12018,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2i___gt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
-  VecMat::Vec<int,2 > *arg2 = 0 ;
+  VecMat::Vec< int,2 > *arg1 = (VecMat::Vec< int,2 > *) 0 ;
+  VecMat::Vec< int,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -12209,22 +12029,22 @@ SWIGINTERN PyObject *_wrap_Vec_2i___gt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2i___gt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___gt__" "', argument " "1"" of type '" "VecMat::Vec<int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___gt__" "', argument " "1"" of type '" "VecMat::Vec< int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_int_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___gt__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___gt__" "', argument " "2"" of type '" "VecMat::Vec< int,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___gt__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___gt__" "', argument " "2"" of type '" "VecMat::Vec< int,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<int,2 > const *)arg1)->operator >((VecMat::Vec<int,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec< int,2 > const *)arg1)->operator >((VecMat::Vec< int,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12242,19 +12062,19 @@ fail:
 
 SWIGINTERN PyObject *Vec_2i_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecTint_2_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecT_int_2_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec_2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,2 > *result = 0 ;
+  VecMat::Vec< double,2 > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec_2d")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec<double,2 > *)new VecMat::Vec<double,2 >();
+      result = (VecMat::Vec< double,2 > *)new VecMat::Vec< double,2 >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12263,7 +12083,7 @@ SWIGINTERN PyObject *_wrap_new_Vec_2d(PyObject *SWIGUNUSEDPARM(self), PyObject *
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTdouble_2_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_double_2_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -12272,17 +12092,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec_2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
+  VecMat::Vec< double,2 > *arg1 = (VecMat::Vec< double,2 > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec_2d",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_2_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_2d" "', argument " "1"" of type '" "VecMat::Vec<double,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_2d" "', argument " "1"" of type '" "VecMat::Vec< double,2 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp1);
   {
     try {
       delete arg1;
@@ -12309,7 +12129,7 @@ SWIGINTERN PyObject *_wrap_Vec_2d_dim(PyObject *SWIGUNUSEDPARM(self), PyObject *
   if (!PyArg_ParseTuple(args,(char *)":Vec_2d_dim")) SWIG_fail;
   {
     try {
-      result = (unsigned int)VecMat::Vec<double,2 >::SWIGTEMPLATEDISAMBIGUATOR dim();
+      result = (unsigned int)VecMat::Vec< double,2 >::SWIGTEMPLATEDISAMBIGUATOR dim();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12327,21 +12147,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2d_norm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
-  VecMat::Vec<double,2 >::value_type result;
+  VecMat::Vec< double,2 > *arg1 = (VecMat::Vec< double,2 > *) 0 ;
+  VecMat::Vec< double,2 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2d_norm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d_norm" "', argument " "1"" of type '" "VecMat::Vec<double,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d_norm" "', argument " "1"" of type '" "VecMat::Vec< double,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec<double,2 >::value_type)((VecMat::Vec<double,2 > const *)arg1)->norm();
+      result = (VecMat::Vec< double,2 >::value_type)((VecMat::Vec< double,2 > const *)arg1)->norm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12359,21 +12179,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2d_squareNorm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
-  VecMat::Vec<double,2 >::value_type result;
+  VecMat::Vec< double,2 > *arg1 = (VecMat::Vec< double,2 > *) 0 ;
+  VecMat::Vec< double,2 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2d_squareNorm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d_squareNorm" "', argument " "1"" of type '" "VecMat::Vec<double,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d_squareNorm" "', argument " "1"" of type '" "VecMat::Vec< double,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec<double,2 >::value_type)((VecMat::Vec<double,2 > const *)arg1)->squareNorm();
+      result = (VecMat::Vec< double,2 >::value_type)((VecMat::Vec< double,2 > const *)arg1)->squareNorm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12391,23 +12211,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2d_normalize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
-  VecMat::Vec<double,2 > *result = 0 ;
+  VecMat::Vec< double,2 > *arg1 = (VecMat::Vec< double,2 > *) 0 ;
+  VecMat::Vec< double,2 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2d_normalize",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d_normalize" "', argument " "1"" of type '" "VecMat::Vec<double,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d_normalize" "', argument " "1"" of type '" "VecMat::Vec< double,2 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec<double,2 > &_result_ref = (arg1)->normalize();
-        result = (VecMat::Vec<double,2 > *) &_result_ref;
+        VecMat::Vec< double,2 > &_result_ref = (arg1)->normalize();
+        result = (VecMat::Vec< double,2 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -12417,7 +12237,7 @@ SWIGINTERN PyObject *_wrap_Vec_2d_normalize(PyObject *SWIGUNUSEDPARM(self), PyOb
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_double_2_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -12426,23 +12246,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2d_normalizeSafe(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
-  VecMat::Vec<double,2 > *result = 0 ;
+  VecMat::Vec< double,2 > *arg1 = (VecMat::Vec< double,2 > *) 0 ;
+  VecMat::Vec< double,2 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2d_normalizeSafe",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec<double,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec< double,2 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec<double,2 > &_result_ref = (arg1)->normalizeSafe();
-        result = (VecMat::Vec<double,2 > *) &_result_ref;
+        VecMat::Vec< double,2 > &_result_ref = (arg1)->normalizeSafe();
+        result = (VecMat::Vec< double,2 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -12452,7 +12272,7 @@ SWIGINTERN PyObject *_wrap_Vec_2d_normalizeSafe(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_double_2_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -12461,9 +12281,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2d___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
-  VecMat::Vec<double,2 > *arg2 = 0 ;
-  VecMat::Vec<double,2 > result;
+  VecMat::Vec< double,2 > *arg1 = (VecMat::Vec< double,2 > *) 0 ;
+  VecMat::Vec< double,2 > *arg2 = 0 ;
+  VecMat::Vec< double,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -12472,22 +12292,22 @@ SWIGINTERN PyObject *_wrap_Vec_2d___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2d___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___add__" "', argument " "1"" of type '" "VecMat::Vec<double,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___add__" "', argument " "1"" of type '" "VecMat::Vec< double,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_double_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___add__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___add__" "', argument " "2"" of type '" "VecMat::Vec< double,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___add__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___add__" "', argument " "2"" of type '" "VecMat::Vec< double,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec<double,2 > const *)arg1)->operator +((VecMat::Vec<double,2 > const &)*arg2);
+      result = ((VecMat::Vec< double,2 > const *)arg1)->operator +((VecMat::Vec< double,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12496,7 +12316,7 @@ SWIGINTERN PyObject *_wrap_Vec_2d___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<double,2 >(static_cast< const VecMat::Vec<double,2 >& >(result))), SWIGTYPE_p_VecMat__VecTdouble_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< double,2 >(static_cast< const VecMat::Vec< double,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_double_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -12505,9 +12325,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2d___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
-  VecMat::Vec<double,2 > *arg2 = 0 ;
-  VecMat::Vec<double,2 > result;
+  VecMat::Vec< double,2 > *arg1 = (VecMat::Vec< double,2 > *) 0 ;
+  VecMat::Vec< double,2 > *arg2 = 0 ;
+  VecMat::Vec< double,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -12516,22 +12336,22 @@ SWIGINTERN PyObject *_wrap_Vec_2d___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2d___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___sub__" "', argument " "1"" of type '" "VecMat::Vec<double,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___sub__" "', argument " "1"" of type '" "VecMat::Vec< double,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_double_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___sub__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___sub__" "', argument " "2"" of type '" "VecMat::Vec< double,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___sub__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___sub__" "', argument " "2"" of type '" "VecMat::Vec< double,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec<double,2 > const *)arg1)->operator -((VecMat::Vec<double,2 > const &)*arg2);
+      result = ((VecMat::Vec< double,2 > const *)arg1)->operator -((VecMat::Vec< double,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12540,7 +12360,7 @@ SWIGINTERN PyObject *_wrap_Vec_2d___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<double,2 >(static_cast< const VecMat::Vec<double,2 >& >(result))), SWIGTYPE_p_VecMat__VecTdouble_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< double,2 >(static_cast< const VecMat::Vec< double,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_double_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -12549,9 +12369,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2d___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
-  VecMat::Vec<double,2 >::value_type arg2 ;
-  VecMat::Vec<double,2 > result;
+  VecMat::Vec< double,2 > *arg1 = (VecMat::Vec< double,2 > *) 0 ;
+  VecMat::Vec< double,2 >::value_type arg2 ;
+  VecMat::Vec< double,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
@@ -12560,19 +12380,19 @@ SWIGINTERN PyObject *_wrap_Vec_2d___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2d___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___mul__" "', argument " "1"" of type '" "VecMat::Vec<double,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___mul__" "', argument " "1"" of type '" "VecMat::Vec< double,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2d___mul__" "', argument " "2"" of type '" "VecMat::Vec<double,2 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2d___mul__" "', argument " "2"" of type '" "VecMat::Vec< double,2 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec<double,2 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec< double,2 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec<double,2 > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec< double,2 > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12581,7 +12401,7 @@ SWIGINTERN PyObject *_wrap_Vec_2d___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<double,2 >(static_cast< const VecMat::Vec<double,2 >& >(result))), SWIGTYPE_p_VecMat__VecTdouble_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< double,2 >(static_cast< const VecMat::Vec< double,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_double_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -12590,9 +12410,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2d___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
-  VecMat::Vec<double,2 >::value_type arg2 ;
-  VecMat::Vec<double,2 > result;
+  VecMat::Vec< double,2 > *arg1 = (VecMat::Vec< double,2 > *) 0 ;
+  VecMat::Vec< double,2 >::value_type arg2 ;
+  VecMat::Vec< double,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
@@ -12601,19 +12421,19 @@ SWIGINTERN PyObject *_wrap_Vec_2d___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2d___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___div__" "', argument " "1"" of type '" "VecMat::Vec<double,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___div__" "', argument " "1"" of type '" "VecMat::Vec< double,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2d___div__" "', argument " "2"" of type '" "VecMat::Vec<double,2 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2d___div__" "', argument " "2"" of type '" "VecMat::Vec< double,2 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec<double,2 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec< double,2 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec<double,2 > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec< double,2 > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12622,7 +12442,7 @@ SWIGINTERN PyObject *_wrap_Vec_2d___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<double,2 >(static_cast< const VecMat::Vec<double,2 >& >(result))), SWIGTYPE_p_VecMat__VecTdouble_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< double,2 >(static_cast< const VecMat::Vec< double,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_double_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -12631,9 +12451,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2d___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
-  VecMat::Vec<double,2 > *arg2 = 0 ;
-  VecMat::Vec<double,2 >::value_type result;
+  VecMat::Vec< double,2 > *arg1 = (VecMat::Vec< double,2 > *) 0 ;
+  VecMat::Vec< double,2 > *arg2 = 0 ;
+  VecMat::Vec< double,2 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -12642,22 +12462,22 @@ SWIGINTERN PyObject *_wrap_Vec_2d___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2d___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___mul__" "', argument " "1"" of type '" "VecMat::Vec<double,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___mul__" "', argument " "1"" of type '" "VecMat::Vec< double,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_double_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___mul__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___mul__" "', argument " "2"" of type '" "VecMat::Vec< double,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___mul__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___mul__" "', argument " "2"" of type '" "VecMat::Vec< double,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp2);
   {
     try {
-      result = (VecMat::Vec<double,2 >::value_type)((VecMat::Vec<double,2 > const *)arg1)->operator *((VecMat::Vec<double,2 > const &)*arg2);
+      result = (VecMat::Vec< double,2 >::value_type)((VecMat::Vec< double,2 > const *)arg1)->operator *((VecMat::Vec< double,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12679,17 +12499,17 @@ SWIGINTERN PyObject *_wrap_Vec_2d___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTdouble_2_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_double_2_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecTdouble_2_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecT_double_2_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec_2d___mul____SWIG_1(self, args);
@@ -12699,7 +12519,7 @@ SWIGINTERN PyObject *_wrap_Vec_2d___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTdouble_2_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_double_2_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -12720,8 +12540,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2d___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
-  VecMat::Vec<double,2 > *arg2 = 0 ;
+  VecMat::Vec< double,2 > *arg1 = (VecMat::Vec< double,2 > *) 0 ;
+  VecMat::Vec< double,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -12731,22 +12551,22 @@ SWIGINTERN PyObject *_wrap_Vec_2d___eq__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2d___eq__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___eq__" "', argument " "1"" of type '" "VecMat::Vec<double,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___eq__" "', argument " "1"" of type '" "VecMat::Vec< double,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_double_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___eq__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___eq__" "', argument " "2"" of type '" "VecMat::Vec< double,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___eq__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___eq__" "', argument " "2"" of type '" "VecMat::Vec< double,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<double,2 > const *)arg1)->operator ==((VecMat::Vec<double,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec< double,2 > const *)arg1)->operator ==((VecMat::Vec< double,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12764,8 +12584,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2d___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
-  VecMat::Vec<double,2 > *arg2 = 0 ;
+  VecMat::Vec< double,2 > *arg1 = (VecMat::Vec< double,2 > *) 0 ;
+  VecMat::Vec< double,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -12775,22 +12595,22 @@ SWIGINTERN PyObject *_wrap_Vec_2d___ne__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2d___ne__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___ne__" "', argument " "1"" of type '" "VecMat::Vec<double,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___ne__" "', argument " "1"" of type '" "VecMat::Vec< double,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_double_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___ne__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___ne__" "', argument " "2"" of type '" "VecMat::Vec< double,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___ne__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___ne__" "', argument " "2"" of type '" "VecMat::Vec< double,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<double,2 > const *)arg1)->operator !=((VecMat::Vec<double,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec< double,2 > const *)arg1)->operator !=((VecMat::Vec< double,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12808,8 +12628,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2d___lt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
-  VecMat::Vec<double,2 > *arg2 = 0 ;
+  VecMat::Vec< double,2 > *arg1 = (VecMat::Vec< double,2 > *) 0 ;
+  VecMat::Vec< double,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -12819,22 +12639,22 @@ SWIGINTERN PyObject *_wrap_Vec_2d___lt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2d___lt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___lt__" "', argument " "1"" of type '" "VecMat::Vec<double,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___lt__" "', argument " "1"" of type '" "VecMat::Vec< double,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_double_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___lt__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___lt__" "', argument " "2"" of type '" "VecMat::Vec< double,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___lt__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___lt__" "', argument " "2"" of type '" "VecMat::Vec< double,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<double,2 > const *)arg1)->operator <((VecMat::Vec<double,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec< double,2 > const *)arg1)->operator <((VecMat::Vec< double,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12852,8 +12672,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2d___gt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
-  VecMat::Vec<double,2 > *arg2 = 0 ;
+  VecMat::Vec< double,2 > *arg1 = (VecMat::Vec< double,2 > *) 0 ;
+  VecMat::Vec< double,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -12863,22 +12683,22 @@ SWIGINTERN PyObject *_wrap_Vec_2d___gt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2d___gt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___gt__" "', argument " "1"" of type '" "VecMat::Vec<double,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___gt__" "', argument " "1"" of type '" "VecMat::Vec< double,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_double_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___gt__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___gt__" "', argument " "2"" of type '" "VecMat::Vec< double,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___gt__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___gt__" "', argument " "2"" of type '" "VecMat::Vec< double,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<double,2 > const *)arg1)->operator >((VecMat::Vec<double,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec< double,2 > const *)arg1)->operator >((VecMat::Vec< double,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12896,19 +12716,19 @@ fail:
 
 SWIGINTERN PyObject *Vec_2d_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecTdouble_2_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecT_double_2_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec_2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,2 > *result = 0 ;
+  VecMat::Vec< float,2 > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec_2f")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec<float,2 > *)new VecMat::Vec<float,2 >();
+      result = (VecMat::Vec< float,2 > *)new VecMat::Vec< float,2 >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12917,7 +12737,7 @@ SWIGINTERN PyObject *_wrap_new_Vec_2f(PyObject *SWIGUNUSEDPARM(self), PyObject *
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTfloat_2_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_float_2_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -12926,17 +12746,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec_2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
+  VecMat::Vec< float,2 > *arg1 = (VecMat::Vec< float,2 > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec_2f",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_2_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_2f" "', argument " "1"" of type '" "VecMat::Vec<float,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_2f" "', argument " "1"" of type '" "VecMat::Vec< float,2 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp1);
   {
     try {
       delete arg1;
@@ -12963,7 +12783,7 @@ SWIGINTERN PyObject *_wrap_Vec_2f_dim(PyObject *SWIGUNUSEDPARM(self), PyObject *
   if (!PyArg_ParseTuple(args,(char *)":Vec_2f_dim")) SWIG_fail;
   {
     try {
-      result = (unsigned int)VecMat::Vec<float,2 >::SWIGTEMPLATEDISAMBIGUATOR dim();
+      result = (unsigned int)VecMat::Vec< float,2 >::SWIGTEMPLATEDISAMBIGUATOR dim();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12981,21 +12801,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2f_norm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
-  VecMat::Vec<float,2 >::value_type result;
+  VecMat::Vec< float,2 > *arg1 = (VecMat::Vec< float,2 > *) 0 ;
+  VecMat::Vec< float,2 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2f_norm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f_norm" "', argument " "1"" of type '" "VecMat::Vec<float,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f_norm" "', argument " "1"" of type '" "VecMat::Vec< float,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec<float,2 >::value_type)((VecMat::Vec<float,2 > const *)arg1)->norm();
+      result = (VecMat::Vec< float,2 >::value_type)((VecMat::Vec< float,2 > const *)arg1)->norm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13013,21 +12833,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2f_squareNorm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
-  VecMat::Vec<float,2 >::value_type result;
+  VecMat::Vec< float,2 > *arg1 = (VecMat::Vec< float,2 > *) 0 ;
+  VecMat::Vec< float,2 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2f_squareNorm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f_squareNorm" "', argument " "1"" of type '" "VecMat::Vec<float,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f_squareNorm" "', argument " "1"" of type '" "VecMat::Vec< float,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec<float,2 >::value_type)((VecMat::Vec<float,2 > const *)arg1)->squareNorm();
+      result = (VecMat::Vec< float,2 >::value_type)((VecMat::Vec< float,2 > const *)arg1)->squareNorm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13045,23 +12865,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2f_normalize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
-  VecMat::Vec<float,2 > *result = 0 ;
+  VecMat::Vec< float,2 > *arg1 = (VecMat::Vec< float,2 > *) 0 ;
+  VecMat::Vec< float,2 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2f_normalize",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f_normalize" "', argument " "1"" of type '" "VecMat::Vec<float,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f_normalize" "', argument " "1"" of type '" "VecMat::Vec< float,2 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec<float,2 > &_result_ref = (arg1)->normalize();
-        result = (VecMat::Vec<float,2 > *) &_result_ref;
+        VecMat::Vec< float,2 > &_result_ref = (arg1)->normalize();
+        result = (VecMat::Vec< float,2 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -13071,7 +12891,7 @@ SWIGINTERN PyObject *_wrap_Vec_2f_normalize(PyObject *SWIGUNUSEDPARM(self), PyOb
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_float_2_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -13080,23 +12900,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2f_normalizeSafe(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
-  VecMat::Vec<float,2 > *result = 0 ;
+  VecMat::Vec< float,2 > *arg1 = (VecMat::Vec< float,2 > *) 0 ;
+  VecMat::Vec< float,2 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2f_normalizeSafe",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec<float,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec< float,2 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec<float,2 > &_result_ref = (arg1)->normalizeSafe();
-        result = (VecMat::Vec<float,2 > *) &_result_ref;
+        VecMat::Vec< float,2 > &_result_ref = (arg1)->normalizeSafe();
+        result = (VecMat::Vec< float,2 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -13106,7 +12926,7 @@ SWIGINTERN PyObject *_wrap_Vec_2f_normalizeSafe(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_float_2_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -13115,9 +12935,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2f___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
-  VecMat::Vec<float,2 > *arg2 = 0 ;
-  VecMat::Vec<float,2 > result;
+  VecMat::Vec< float,2 > *arg1 = (VecMat::Vec< float,2 > *) 0 ;
+  VecMat::Vec< float,2 > *arg2 = 0 ;
+  VecMat::Vec< float,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -13126,22 +12946,22 @@ SWIGINTERN PyObject *_wrap_Vec_2f___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2f___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___add__" "', argument " "1"" of type '" "VecMat::Vec<float,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___add__" "', argument " "1"" of type '" "VecMat::Vec< float,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_float_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___add__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___add__" "', argument " "2"" of type '" "VecMat::Vec< float,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___add__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___add__" "', argument " "2"" of type '" "VecMat::Vec< float,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec<float,2 > const *)arg1)->operator +((VecMat::Vec<float,2 > const &)*arg2);
+      result = ((VecMat::Vec< float,2 > const *)arg1)->operator +((VecMat::Vec< float,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13150,7 +12970,7 @@ SWIGINTERN PyObject *_wrap_Vec_2f___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<float,2 >(static_cast< const VecMat::Vec<float,2 >& >(result))), SWIGTYPE_p_VecMat__VecTfloat_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< float,2 >(static_cast< const VecMat::Vec< float,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_float_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -13159,9 +12979,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2f___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
-  VecMat::Vec<float,2 > *arg2 = 0 ;
-  VecMat::Vec<float,2 > result;
+  VecMat::Vec< float,2 > *arg1 = (VecMat::Vec< float,2 > *) 0 ;
+  VecMat::Vec< float,2 > *arg2 = 0 ;
+  VecMat::Vec< float,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -13170,22 +12990,22 @@ SWIGINTERN PyObject *_wrap_Vec_2f___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2f___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___sub__" "', argument " "1"" of type '" "VecMat::Vec<float,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___sub__" "', argument " "1"" of type '" "VecMat::Vec< float,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_float_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___sub__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___sub__" "', argument " "2"" of type '" "VecMat::Vec< float,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___sub__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___sub__" "', argument " "2"" of type '" "VecMat::Vec< float,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec<float,2 > const *)arg1)->operator -((VecMat::Vec<float,2 > const &)*arg2);
+      result = ((VecMat::Vec< float,2 > const *)arg1)->operator -((VecMat::Vec< float,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13194,7 +13014,7 @@ SWIGINTERN PyObject *_wrap_Vec_2f___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<float,2 >(static_cast< const VecMat::Vec<float,2 >& >(result))), SWIGTYPE_p_VecMat__VecTfloat_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< float,2 >(static_cast< const VecMat::Vec< float,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_float_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -13203,9 +13023,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2f___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
-  VecMat::Vec<float,2 >::value_type arg2 ;
-  VecMat::Vec<float,2 > result;
+  VecMat::Vec< float,2 > *arg1 = (VecMat::Vec< float,2 > *) 0 ;
+  VecMat::Vec< float,2 >::value_type arg2 ;
+  VecMat::Vec< float,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   float val2 ;
@@ -13214,19 +13034,19 @@ SWIGINTERN PyObject *_wrap_Vec_2f___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2f___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___mul__" "', argument " "1"" of type '" "VecMat::Vec<float,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___mul__" "', argument " "1"" of type '" "VecMat::Vec< float,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2f___mul__" "', argument " "2"" of type '" "VecMat::Vec<float,2 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2f___mul__" "', argument " "2"" of type '" "VecMat::Vec< float,2 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec<float,2 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec< float,2 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec<float,2 > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec< float,2 > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13235,7 +13055,7 @@ SWIGINTERN PyObject *_wrap_Vec_2f___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<float,2 >(static_cast< const VecMat::Vec<float,2 >& >(result))), SWIGTYPE_p_VecMat__VecTfloat_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< float,2 >(static_cast< const VecMat::Vec< float,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_float_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -13244,9 +13064,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2f___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
-  VecMat::Vec<float,2 >::value_type arg2 ;
-  VecMat::Vec<float,2 > result;
+  VecMat::Vec< float,2 > *arg1 = (VecMat::Vec< float,2 > *) 0 ;
+  VecMat::Vec< float,2 >::value_type arg2 ;
+  VecMat::Vec< float,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   float val2 ;
@@ -13255,19 +13075,19 @@ SWIGINTERN PyObject *_wrap_Vec_2f___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2f___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___div__" "', argument " "1"" of type '" "VecMat::Vec<float,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___div__" "', argument " "1"" of type '" "VecMat::Vec< float,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2f___div__" "', argument " "2"" of type '" "VecMat::Vec<float,2 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2f___div__" "', argument " "2"" of type '" "VecMat::Vec< float,2 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec<float,2 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec< float,2 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec<float,2 > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec< float,2 > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13276,7 +13096,7 @@ SWIGINTERN PyObject *_wrap_Vec_2f___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<float,2 >(static_cast< const VecMat::Vec<float,2 >& >(result))), SWIGTYPE_p_VecMat__VecTfloat_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< float,2 >(static_cast< const VecMat::Vec< float,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_float_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -13285,9 +13105,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2f___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
-  VecMat::Vec<float,2 > *arg2 = 0 ;
-  VecMat::Vec<float,2 >::value_type result;
+  VecMat::Vec< float,2 > *arg1 = (VecMat::Vec< float,2 > *) 0 ;
+  VecMat::Vec< float,2 > *arg2 = 0 ;
+  VecMat::Vec< float,2 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -13296,22 +13116,22 @@ SWIGINTERN PyObject *_wrap_Vec_2f___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2f___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___mul__" "', argument " "1"" of type '" "VecMat::Vec<float,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___mul__" "', argument " "1"" of type '" "VecMat::Vec< float,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_float_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___mul__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___mul__" "', argument " "2"" of type '" "VecMat::Vec< float,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___mul__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___mul__" "', argument " "2"" of type '" "VecMat::Vec< float,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp2);
   {
     try {
-      result = (VecMat::Vec<float,2 >::value_type)((VecMat::Vec<float,2 > const *)arg1)->operator *((VecMat::Vec<float,2 > const &)*arg2);
+      result = (VecMat::Vec< float,2 >::value_type)((VecMat::Vec< float,2 > const *)arg1)->operator *((VecMat::Vec< float,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13333,17 +13153,17 @@ SWIGINTERN PyObject *_wrap_Vec_2f___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTfloat_2_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_float_2_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecTfloat_2_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecT_float_2_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec_2f___mul____SWIG_1(self, args);
@@ -13353,7 +13173,7 @@ SWIGINTERN PyObject *_wrap_Vec_2f___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTfloat_2_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_float_2_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -13374,8 +13194,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2f___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
-  VecMat::Vec<float,2 > *arg2 = 0 ;
+  VecMat::Vec< float,2 > *arg1 = (VecMat::Vec< float,2 > *) 0 ;
+  VecMat::Vec< float,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -13385,22 +13205,22 @@ SWIGINTERN PyObject *_wrap_Vec_2f___eq__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2f___eq__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___eq__" "', argument " "1"" of type '" "VecMat::Vec<float,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___eq__" "', argument " "1"" of type '" "VecMat::Vec< float,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_float_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___eq__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___eq__" "', argument " "2"" of type '" "VecMat::Vec< float,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___eq__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___eq__" "', argument " "2"" of type '" "VecMat::Vec< float,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<float,2 > const *)arg1)->operator ==((VecMat::Vec<float,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec< float,2 > const *)arg1)->operator ==((VecMat::Vec< float,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13418,8 +13238,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2f___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
-  VecMat::Vec<float,2 > *arg2 = 0 ;
+  VecMat::Vec< float,2 > *arg1 = (VecMat::Vec< float,2 > *) 0 ;
+  VecMat::Vec< float,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -13429,22 +13249,22 @@ SWIGINTERN PyObject *_wrap_Vec_2f___ne__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2f___ne__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___ne__" "', argument " "1"" of type '" "VecMat::Vec<float,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___ne__" "', argument " "1"" of type '" "VecMat::Vec< float,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_float_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___ne__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___ne__" "', argument " "2"" of type '" "VecMat::Vec< float,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___ne__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___ne__" "', argument " "2"" of type '" "VecMat::Vec< float,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<float,2 > const *)arg1)->operator !=((VecMat::Vec<float,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec< float,2 > const *)arg1)->operator !=((VecMat::Vec< float,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13462,8 +13282,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2f___lt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
-  VecMat::Vec<float,2 > *arg2 = 0 ;
+  VecMat::Vec< float,2 > *arg1 = (VecMat::Vec< float,2 > *) 0 ;
+  VecMat::Vec< float,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -13473,22 +13293,22 @@ SWIGINTERN PyObject *_wrap_Vec_2f___lt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2f___lt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___lt__" "', argument " "1"" of type '" "VecMat::Vec<float,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___lt__" "', argument " "1"" of type '" "VecMat::Vec< float,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_float_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___lt__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___lt__" "', argument " "2"" of type '" "VecMat::Vec< float,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___lt__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___lt__" "', argument " "2"" of type '" "VecMat::Vec< float,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<float,2 > const *)arg1)->operator <((VecMat::Vec<float,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec< float,2 > const *)arg1)->operator <((VecMat::Vec< float,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13506,8 +13326,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2f___gt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
-  VecMat::Vec<float,2 > *arg2 = 0 ;
+  VecMat::Vec< float,2 > *arg1 = (VecMat::Vec< float,2 > *) 0 ;
+  VecMat::Vec< float,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -13517,22 +13337,22 @@ SWIGINTERN PyObject *_wrap_Vec_2f___gt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2f___gt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___gt__" "', argument " "1"" of type '" "VecMat::Vec<float,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___gt__" "', argument " "1"" of type '" "VecMat::Vec< float,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_float_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___gt__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___gt__" "', argument " "2"" of type '" "VecMat::Vec< float,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___gt__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___gt__" "', argument " "2"" of type '" "VecMat::Vec< float,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<float,2 > const *)arg1)->operator >((VecMat::Vec<float,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec< float,2 > const *)arg1)->operator >((VecMat::Vec< float,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13550,19 +13370,19 @@ fail:
 
 SWIGINTERN PyObject *Vec_2f_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecTfloat_2_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecT_float_2_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec2u__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<unsigned int > *result = 0 ;
+  VecMat::Vec2< unsigned int > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec2u")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec2<unsigned int > *)new VecMat::Vec2<unsigned int >();
+      result = (VecMat::Vec2< unsigned int > *)new VecMat::Vec2< unsigned int >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13571,7 +13391,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2u__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -13580,9 +13400,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec2u__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<unsigned int >::value_type arg1 ;
-  VecMat::Vec2<unsigned int >::value_type arg2 ;
-  VecMat::Vec2<unsigned int > *result = 0 ;
+  VecMat::Vec2< unsigned int >::value_type arg1 ;
+  VecMat::Vec2< unsigned int >::value_type arg2 ;
+  VecMat::Vec2< unsigned int > *result = 0 ;
   unsigned int val1 ;
   int ecode1 = 0 ;
   unsigned int val2 ;
@@ -13593,17 +13413,17 @@ SWIGINTERN PyObject *_wrap_new_Vec2u__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OO:new_Vec2u",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_unsigned_SS_int(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2u" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2u" "', argument " "1"" of type '" "VecMat::Vec2< unsigned int >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec2<unsigned int >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec2< unsigned int >::value_type >(val1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec2u" "', argument " "2"" of type '" "VecMat::Vec2<unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec2u" "', argument " "2"" of type '" "VecMat::Vec2< unsigned int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2<unsigned int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2< unsigned int >::value_type >(val2);
   {
     try {
-      result = (VecMat::Vec2<unsigned int > *)new VecMat::Vec2<unsigned int >(arg1,arg2);
+      result = (VecMat::Vec2< unsigned int > *)new VecMat::Vec2< unsigned int >(arg1,arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13612,7 +13432,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2u__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -13621,8 +13441,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec2u__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<unsigned int >::value_type arg1 ;
-  VecMat::Vec2<unsigned int > *result = 0 ;
+  VecMat::Vec2< unsigned int >::value_type arg1 ;
+  VecMat::Vec2< unsigned int > *result = 0 ;
   unsigned int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -13630,12 +13450,12 @@ SWIGINTERN PyObject *_wrap_new_Vec2u__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"O:new_Vec2u",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_unsigned_SS_int(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2u" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2u" "', argument " "1"" of type '" "VecMat::Vec2< unsigned int >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec2<unsigned int >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec2< unsigned int >::value_type >(val1);
   {
     try {
-      result = (VecMat::Vec2<unsigned int > *)new VecMat::Vec2<unsigned int >(arg1);
+      result = (VecMat::Vec2< unsigned int > *)new VecMat::Vec2< unsigned int >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13644,7 +13464,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2u__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -13657,7 +13477,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2u(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -13692,28 +13512,32 @@ SWIGINTERN PyObject *_wrap_new_Vec2u(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec2u'.\n  Possible C/C++ prototypes are:\n    VecMat::Vec2<(unsigned int)>()\n    VecMat::Vec2<(unsigned int)>(VecMat::Vec2<unsigned int >::value_type const,VecMat::Vec2<unsigned int >::value_type const)\n    VecMat::Vec2<(unsigned int)>(VecMat::Vec2<unsigned int >::value_type const)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec2u'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    VecMat::Vec2< unsigned int >()\n"
+    "    VecMat::Vec2< unsigned int >(VecMat::Vec2< unsigned int >::value_type const,VecMat::Vec2< unsigned int >::value_type const)\n"
+    "    VecMat::Vec2< unsigned int >(VecMat::Vec2< unsigned int >::value_type const)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec2u_x__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
-  VecMat::Vec2<unsigned int >::value_type result;
+  VecMat::Vec2< unsigned int > *arg1 = (VecMat::Vec2< unsigned int > *) 0 ;
+  VecMat::Vec2< unsigned int >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2u_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u_x" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u_x" "', argument " "1"" of type '" "VecMat::Vec2< unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< unsigned int > * >(argp1);
   {
     try {
-      result = (VecMat::Vec2<unsigned int >::value_type)((VecMat::Vec2<unsigned int > const *)arg1)->x();
+      result = (VecMat::Vec2< unsigned int >::value_type)((VecMat::Vec2< unsigned int > const *)arg1)->x();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13731,23 +13555,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2u_x__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
-  VecMat::Vec2<unsigned int >::value_type *result = 0 ;
+  VecMat::Vec2< unsigned int > *arg1 = (VecMat::Vec2< unsigned int > *) 0 ;
+  VecMat::Vec2< unsigned int >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2u_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u_x" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u_x" "', argument " "1"" of type '" "VecMat::Vec2< unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< unsigned int > * >(argp1);
   {
     try {
       {
-        VecMat::Vec2<unsigned int >::value_type &_result_ref = (arg1)->x();
-        result = (VecMat::Vec2<unsigned int >::value_type *) &_result_ref;
+        VecMat::Vec2< unsigned int >::value_type &_result_ref = (arg1)->x();
+        result = (VecMat::Vec2< unsigned int >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -13770,14 +13594,14 @@ SWIGINTERN PyObject *_wrap_Vec2u_x(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2u_x__SWIG_0(self, args);
@@ -13786,7 +13610,7 @@ SWIGINTERN PyObject *_wrap_Vec2u_x(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2u_x__SWIG_1(self, args);
@@ -13794,28 +13618,31 @@ SWIGINTERN PyObject *_wrap_Vec2u_x(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2u_x'.\n  Possible C/C++ prototypes are:\n    x()\n    x()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2u_x'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    x(VecMat::Vec2< unsigned int > const *)\n"
+    "    x(VecMat::Vec2< unsigned int > *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec2u_y__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
-  VecMat::Vec2<unsigned int >::value_type result;
+  VecMat::Vec2< unsigned int > *arg1 = (VecMat::Vec2< unsigned int > *) 0 ;
+  VecMat::Vec2< unsigned int >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2u_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u_y" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u_y" "', argument " "1"" of type '" "VecMat::Vec2< unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< unsigned int > * >(argp1);
   {
     try {
-      result = (VecMat::Vec2<unsigned int >::value_type)((VecMat::Vec2<unsigned int > const *)arg1)->y();
+      result = (VecMat::Vec2< unsigned int >::value_type)((VecMat::Vec2< unsigned int > const *)arg1)->y();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13833,23 +13660,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2u_y__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
-  VecMat::Vec2<unsigned int >::value_type *result = 0 ;
+  VecMat::Vec2< unsigned int > *arg1 = (VecMat::Vec2< unsigned int > *) 0 ;
+  VecMat::Vec2< unsigned int >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2u_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u_y" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u_y" "', argument " "1"" of type '" "VecMat::Vec2< unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< unsigned int > * >(argp1);
   {
     try {
       {
-        VecMat::Vec2<unsigned int >::value_type &_result_ref = (arg1)->y();
-        result = (VecMat::Vec2<unsigned int >::value_type *) &_result_ref;
+        VecMat::Vec2< unsigned int >::value_type &_result_ref = (arg1)->y();
+        result = (VecMat::Vec2< unsigned int >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -13872,14 +13699,14 @@ SWIGINTERN PyObject *_wrap_Vec2u_y(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2u_y__SWIG_0(self, args);
@@ -13888,7 +13715,7 @@ SWIGINTERN PyObject *_wrap_Vec2u_y(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2u_y__SWIG_1(self, args);
@@ -13896,15 +13723,18 @@ SWIGINTERN PyObject *_wrap_Vec2u_y(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2u_y'.\n  Possible C/C++ prototypes are:\n    y()\n    y()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2u_y'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    y(VecMat::Vec2< unsigned int > const *)\n"
+    "    y(VecMat::Vec2< unsigned int > *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec2u_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
-  VecMat::Vec2<unsigned int >::value_type arg2 ;
+  VecMat::Vec2< unsigned int > *arg1 = (VecMat::Vec2< unsigned int > *) 0 ;
+  VecMat::Vec2< unsigned int >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned int val2 ;
@@ -13913,16 +13743,16 @@ SWIGINTERN PyObject *_wrap_Vec2u_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2u_setX",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u_setX" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u_setX" "', argument " "1"" of type '" "VecMat::Vec2< unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< unsigned int > * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2u_setX" "', argument " "2"" of type '" "VecMat::Vec2<unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2u_setX" "', argument " "2"" of type '" "VecMat::Vec2< unsigned int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2<unsigned int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2< unsigned int >::value_type >(val2);
   {
     try {
       (arg1)->setX(arg2);
@@ -13943,8 +13773,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2u_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
-  VecMat::Vec2<unsigned int >::value_type arg2 ;
+  VecMat::Vec2< unsigned int > *arg1 = (VecMat::Vec2< unsigned int > *) 0 ;
+  VecMat::Vec2< unsigned int >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned int val2 ;
@@ -13953,16 +13783,16 @@ SWIGINTERN PyObject *_wrap_Vec2u_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2u_setY",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u_setY" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u_setY" "', argument " "1"" of type '" "VecMat::Vec2< unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< unsigned int > * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2u_setY" "', argument " "2"" of type '" "VecMat::Vec2<unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2u_setY" "', argument " "2"" of type '" "VecMat::Vec2< unsigned int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2<unsigned int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2< unsigned int >::value_type >(val2);
   {
     try {
       (arg1)->setY(arg2);
@@ -13983,9 +13813,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2u___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
-  VecMat::Vec2<unsigned int > *arg2 = 0 ;
-  VecMat::Vec2<unsigned int > result;
+  VecMat::Vec2< unsigned int > *arg1 = (VecMat::Vec2< unsigned int > *) 0 ;
+  VecMat::Vec2< unsigned int > *arg2 = 0 ;
+  VecMat::Vec2< unsigned int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -13994,22 +13824,22 @@ SWIGINTERN PyObject *_wrap_Vec2u___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2u___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u___add__" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u___add__" "', argument " "1"" of type '" "VecMat::Vec2< unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec2< unsigned int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2u___add__" "', argument " "2"" of type '" "VecMat::Vec2<unsigned int > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2u___add__" "', argument " "2"" of type '" "VecMat::Vec2< unsigned int > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2u___add__" "', argument " "2"" of type '" "VecMat::Vec2<unsigned int > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2u___add__" "', argument " "2"" of type '" "VecMat::Vec2< unsigned int > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec2< unsigned int > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec2<unsigned int > const *)arg1)->operator +((VecMat::Vec2<unsigned int > const &)*arg2);
+      result = ((VecMat::Vec2< unsigned int > const *)arg1)->operator +((VecMat::Vec2< unsigned int > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -14018,7 +13848,7 @@ SWIGINTERN PyObject *_wrap_Vec2u___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<unsigned int >(static_cast< const VecMat::Vec2<unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< unsigned int >(static_cast< const VecMat::Vec2< unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -14027,9 +13857,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2u___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
-  VecMat::Vec2<unsigned int > *arg2 = 0 ;
-  VecMat::Vec2<unsigned int > result;
+  VecMat::Vec2< unsigned int > *arg1 = (VecMat::Vec2< unsigned int > *) 0 ;
+  VecMat::Vec2< unsigned int > *arg2 = 0 ;
+  VecMat::Vec2< unsigned int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -14038,22 +13868,22 @@ SWIGINTERN PyObject *_wrap_Vec2u___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2u___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u___sub__" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u___sub__" "', argument " "1"" of type '" "VecMat::Vec2< unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec2< unsigned int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2u___sub__" "', argument " "2"" of type '" "VecMat::Vec2<unsigned int > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2u___sub__" "', argument " "2"" of type '" "VecMat::Vec2< unsigned int > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2u___sub__" "', argument " "2"" of type '" "VecMat::Vec2<unsigned int > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2u___sub__" "', argument " "2"" of type '" "VecMat::Vec2< unsigned int > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec2< unsigned int > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec2<unsigned int > const *)arg1)->operator -((VecMat::Vec2<unsigned int > const &)*arg2);
+      result = ((VecMat::Vec2< unsigned int > const *)arg1)->operator -((VecMat::Vec2< unsigned int > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -14062,7 +13892,7 @@ SWIGINTERN PyObject *_wrap_Vec2u___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<unsigned int >(static_cast< const VecMat::Vec2<unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< unsigned int >(static_cast< const VecMat::Vec2< unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -14071,9 +13901,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2u___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
-  VecMat::Vec2<unsigned int >::value_type arg2 ;
-  VecMat::Vec2<unsigned int > result;
+  VecMat::Vec2< unsigned int > *arg1 = (VecMat::Vec2< unsigned int > *) 0 ;
+  VecMat::Vec2< unsigned int >::value_type arg2 ;
+  VecMat::Vec2< unsigned int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned int val2 ;
@@ -14082,19 +13912,19 @@ SWIGINTERN PyObject *_wrap_Vec2u___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2u___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u___mul__" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u___mul__" "', argument " "1"" of type '" "VecMat::Vec2< unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< unsigned int > * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2u___mul__" "', argument " "2"" of type '" "VecMat::Vec2<unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2u___mul__" "', argument " "2"" of type '" "VecMat::Vec2< unsigned int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2<unsigned int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2< unsigned int >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec2<unsigned int > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec2< unsigned int > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -14103,7 +13933,7 @@ SWIGINTERN PyObject *_wrap_Vec2u___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<unsigned int >(static_cast< const VecMat::Vec2<unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< unsigned int >(static_cast< const VecMat::Vec2< unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -14112,9 +13942,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2u___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
-  VecMat::Vec2<unsigned int >::value_type arg2 ;
-  VecMat::Vec2<unsigned int > result;
+  VecMat::Vec2< unsigned int > *arg1 = (VecMat::Vec2< unsigned int > *) 0 ;
+  VecMat::Vec2< unsigned int >::value_type arg2 ;
+  VecMat::Vec2< unsigned int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned int val2 ;
@@ -14123,19 +13953,19 @@ SWIGINTERN PyObject *_wrap_Vec2u___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2u___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u___div__" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u___div__" "', argument " "1"" of type '" "VecMat::Vec2< unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< unsigned int > * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2u___div__" "', argument " "2"" of type '" "VecMat::Vec2<unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2u___div__" "', argument " "2"" of type '" "VecMat::Vec2< unsigned int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2<unsigned int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2< unsigned int >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec2<unsigned int > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec2< unsigned int > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -14144,7 +13974,7 @@ SWIGINTERN PyObject *_wrap_Vec2u___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<unsigned int >(static_cast< const VecMat::Vec2<unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< unsigned int >(static_cast< const VecMat::Vec2< unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -14153,9 +13983,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2u___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
-  VecMat::Vec2<unsigned int > *arg2 = 0 ;
-  VecMat::Vec2<unsigned int >::value_type result;
+  VecMat::Vec2< unsigned int > *arg1 = (VecMat::Vec2< unsigned int > *) 0 ;
+  VecMat::Vec2< unsigned int > *arg2 = 0 ;
+  VecMat::Vec2< unsigned int >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -14164,22 +13994,22 @@ SWIGINTERN PyObject *_wrap_Vec2u___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2u___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u___mul__" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u___mul__" "', argument " "1"" of type '" "VecMat::Vec2< unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec2< unsigned int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2u___mul__" "', argument " "2"" of type '" "VecMat::Vec2<unsigned int > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2u___mul__" "', argument " "2"" of type '" "VecMat::Vec2< unsigned int > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2u___mul__" "', argument " "2"" of type '" "VecMat::Vec2<unsigned int > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2u___mul__" "', argument " "2"" of type '" "VecMat::Vec2< unsigned int > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec2< unsigned int > * >(argp2);
   {
     try {
-      result = (VecMat::Vec2<unsigned int >::value_type)((VecMat::Vec2<unsigned int > const *)arg1)->operator *((VecMat::Vec2<unsigned int > const &)*arg2);
+      result = (VecMat::Vec2< unsigned int >::value_type)((VecMat::Vec2< unsigned int > const *)arg1)->operator *((VecMat::Vec2< unsigned int > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -14201,17 +14031,17 @@ SWIGINTERN PyObject *_wrap_Vec2u___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec2u___mul____SWIG_1(self, args);
@@ -14221,7 +14051,7 @@ SWIGINTERN PyObject *_wrap_Vec2u___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -14242,17 +14072,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec2u(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
+  VecMat::Vec2< unsigned int > *arg1 = (VecMat::Vec2< unsigned int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec2u",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec2u" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec2u" "', argument " "1"" of type '" "VecMat::Vec2< unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< unsigned int > * >(argp1);
   {
     try {
       delete arg1;
@@ -14274,19 +14104,19 @@ fail:
 
 SWIGINTERN PyObject *Vec2u_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec2i__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<int > *result = 0 ;
+  VecMat::Vec2< int > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec2i")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec2<int > *)new VecMat::Vec2<int >();
+      result = (VecMat::Vec2< int > *)new VecMat::Vec2< int >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -14295,7 +14125,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2i__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tint_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2T_int_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -14304,9 +14134,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec2i__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<int >::value_type arg1 ;
-  VecMat::Vec2<int >::value_type arg2 ;
-  VecMat::Vec2<int > *result = 0 ;
+  VecMat::Vec2< int >::value_type arg1 ;
+  VecMat::Vec2< int >::value_type arg2 ;
+  VecMat::Vec2< int > *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -14317,17 +14147,17 @@ SWIGINTERN PyObject *_wrap_new_Vec2i__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OO:new_Vec2i",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2i" "', argument " "1"" of type '" "VecMat::Vec2<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2i" "', argument " "1"" of type '" "VecMat::Vec2< int >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec2<int >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec2< int >::value_type >(val1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec2i" "', argument " "2"" of type '" "VecMat::Vec2<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec2i" "', argument " "2"" of type '" "VecMat::Vec2< int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2<int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2< int >::value_type >(val2);
   {
     try {
-      result = (VecMat::Vec2<int > *)new VecMat::Vec2<int >(arg1,arg2);
+      result = (VecMat::Vec2< int > *)new VecMat::Vec2< int >(arg1,arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -14336,7 +14166,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2i__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tint_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2T_int_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -14345,8 +14175,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec2i__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<int >::value_type arg1 ;
-  VecMat::Vec2<int > *result = 0 ;
+  VecMat::Vec2< int >::value_type arg1 ;
+  VecMat::Vec2< int > *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -14354,12 +14184,12 @@ SWIGINTERN PyObject *_wrap_new_Vec2i__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"O:new_Vec2i",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2i" "', argument " "1"" of type '" "VecMat::Vec2<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2i" "', argument " "1"" of type '" "VecMat::Vec2< int >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec2<int >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec2< int >::value_type >(val1);
   {
     try {
-      result = (VecMat::Vec2<int > *)new VecMat::Vec2<int >(arg1);
+      result = (VecMat::Vec2< int > *)new VecMat::Vec2< int >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -14368,7 +14198,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2i__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tint_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2T_int_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -14381,7 +14211,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2i(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -14416,28 +14246,32 @@ SWIGINTERN PyObject *_wrap_new_Vec2i(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec2i'.\n  Possible C/C++ prototypes are:\n    VecMat::Vec2<(int)>()\n    VecMat::Vec2<(int)>(VecMat::Vec2<int >::value_type const,VecMat::Vec2<int >::value_type const)\n    VecMat::Vec2<(int)>(VecMat::Vec2<int >::value_type const)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec2i'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    VecMat::Vec2< int >()\n"
+    "    VecMat::Vec2< int >(VecMat::Vec2< int >::value_type const,VecMat::Vec2< int >::value_type const)\n"
+    "    VecMat::Vec2< int >(VecMat::Vec2< int >::value_type const)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec2i_x__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
-  VecMat::Vec2<int >::value_type result;
+  VecMat::Vec2< int > *arg1 = (VecMat::Vec2< int > *) 0 ;
+  VecMat::Vec2< int >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2i_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i_x" "', argument " "1"" of type '" "VecMat::Vec2<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i_x" "', argument " "1"" of type '" "VecMat::Vec2< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< int > * >(argp1);
   {
     try {
-      result = (VecMat::Vec2<int >::value_type)((VecMat::Vec2<int > const *)arg1)->x();
+      result = (VecMat::Vec2< int >::value_type)((VecMat::Vec2< int > const *)arg1)->x();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -14455,23 +14289,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2i_x__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
-  VecMat::Vec2<int >::value_type *result = 0 ;
+  VecMat::Vec2< int > *arg1 = (VecMat::Vec2< int > *) 0 ;
+  VecMat::Vec2< int >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2i_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i_x" "', argument " "1"" of type '" "VecMat::Vec2<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i_x" "', argument " "1"" of type '" "VecMat::Vec2< int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< int > * >(argp1);
   {
     try {
       {
-        VecMat::Vec2<int >::value_type &_result_ref = (arg1)->x();
-        result = (VecMat::Vec2<int >::value_type *) &_result_ref;
+        VecMat::Vec2< int >::value_type &_result_ref = (arg1)->x();
+        result = (VecMat::Vec2< int >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -14494,14 +14328,14 @@ SWIGINTERN PyObject *_wrap_Vec2i_x(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tint_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2i_x__SWIG_0(self, args);
@@ -14510,7 +14344,7 @@ SWIGINTERN PyObject *_wrap_Vec2i_x(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tint_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2i_x__SWIG_1(self, args);
@@ -14518,28 +14352,31 @@ SWIGINTERN PyObject *_wrap_Vec2i_x(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2i_x'.\n  Possible C/C++ prototypes are:\n    x()\n    x()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2i_x'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    x(VecMat::Vec2< int > const *)\n"
+    "    x(VecMat::Vec2< int > *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec2i_y__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
-  VecMat::Vec2<int >::value_type result;
+  VecMat::Vec2< int > *arg1 = (VecMat::Vec2< int > *) 0 ;
+  VecMat::Vec2< int >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2i_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i_y" "', argument " "1"" of type '" "VecMat::Vec2<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i_y" "', argument " "1"" of type '" "VecMat::Vec2< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< int > * >(argp1);
   {
     try {
-      result = (VecMat::Vec2<int >::value_type)((VecMat::Vec2<int > const *)arg1)->y();
+      result = (VecMat::Vec2< int >::value_type)((VecMat::Vec2< int > const *)arg1)->y();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -14557,23 +14394,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2i_y__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
-  VecMat::Vec2<int >::value_type *result = 0 ;
+  VecMat::Vec2< int > *arg1 = (VecMat::Vec2< int > *) 0 ;
+  VecMat::Vec2< int >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2i_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i_y" "', argument " "1"" of type '" "VecMat::Vec2<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i_y" "', argument " "1"" of type '" "VecMat::Vec2< int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< int > * >(argp1);
   {
     try {
       {
-        VecMat::Vec2<int >::value_type &_result_ref = (arg1)->y();
-        result = (VecMat::Vec2<int >::value_type *) &_result_ref;
+        VecMat::Vec2< int >::value_type &_result_ref = (arg1)->y();
+        result = (VecMat::Vec2< int >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -14596,14 +14433,14 @@ SWIGINTERN PyObject *_wrap_Vec2i_y(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tint_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2i_y__SWIG_0(self, args);
@@ -14612,7 +14449,7 @@ SWIGINTERN PyObject *_wrap_Vec2i_y(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tint_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2i_y__SWIG_1(self, args);
@@ -14620,15 +14457,18 @@ SWIGINTERN PyObject *_wrap_Vec2i_y(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2i_y'.\n  Possible C/C++ prototypes are:\n    y()\n    y()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2i_y'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    y(VecMat::Vec2< int > const *)\n"
+    "    y(VecMat::Vec2< int > *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec2i_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
-  VecMat::Vec2<int >::value_type arg2 ;
+  VecMat::Vec2< int > *arg1 = (VecMat::Vec2< int > *) 0 ;
+  VecMat::Vec2< int >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -14637,16 +14477,16 @@ SWIGINTERN PyObject *_wrap_Vec2i_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2i_setX",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i_setX" "', argument " "1"" of type '" "VecMat::Vec2<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i_setX" "', argument " "1"" of type '" "VecMat::Vec2< int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< int > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2i_setX" "', argument " "2"" of type '" "VecMat::Vec2<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2i_setX" "', argument " "2"" of type '" "VecMat::Vec2< int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2<int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2< int >::value_type >(val2);
   {
     try {
       (arg1)->setX(arg2);
@@ -14667,8 +14507,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2i_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
-  VecMat::Vec2<int >::value_type arg2 ;
+  VecMat::Vec2< int > *arg1 = (VecMat::Vec2< int > *) 0 ;
+  VecMat::Vec2< int >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -14677,16 +14517,16 @@ SWIGINTERN PyObject *_wrap_Vec2i_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2i_setY",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i_setY" "', argument " "1"" of type '" "VecMat::Vec2<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i_setY" "', argument " "1"" of type '" "VecMat::Vec2< int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< int > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2i_setY" "', argument " "2"" of type '" "VecMat::Vec2<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2i_setY" "', argument " "2"" of type '" "VecMat::Vec2< int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2<int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2< int >::value_type >(val2);
   {
     try {
       (arg1)->setY(arg2);
@@ -14707,9 +14547,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2i___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
-  VecMat::Vec2<int > *arg2 = 0 ;
-  VecMat::Vec2<int > result;
+  VecMat::Vec2< int > *arg1 = (VecMat::Vec2< int > *) 0 ;
+  VecMat::Vec2< int > *arg2 = 0 ;
+  VecMat::Vec2< int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -14718,22 +14558,22 @@ SWIGINTERN PyObject *_wrap_Vec2i___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2i___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i___add__" "', argument " "1"" of type '" "VecMat::Vec2<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i___add__" "', argument " "1"" of type '" "VecMat::Vec2< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tint_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec2< int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_int_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2i___add__" "', argument " "2"" of type '" "VecMat::Vec2<int > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2i___add__" "', argument " "2"" of type '" "VecMat::Vec2< int > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2i___add__" "', argument " "2"" of type '" "VecMat::Vec2<int > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2i___add__" "', argument " "2"" of type '" "VecMat::Vec2< int > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec2<int > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec2< int > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec2<int > const *)arg1)->operator +((VecMat::Vec2<int > const &)*arg2);
+      result = ((VecMat::Vec2< int > const *)arg1)->operator +((VecMat::Vec2< int > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -14742,7 +14582,7 @@ SWIGINTERN PyObject *_wrap_Vec2i___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<int >(static_cast< const VecMat::Vec2<int >& >(result))), SWIGTYPE_p_VecMat__Vec2Tint_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< int >(static_cast< const VecMat::Vec2< int >& >(result))), SWIGTYPE_p_VecMat__Vec2T_int_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -14751,9 +14591,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2i___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
-  VecMat::Vec2<int > *arg2 = 0 ;
-  VecMat::Vec2<int > result;
+  VecMat::Vec2< int > *arg1 = (VecMat::Vec2< int > *) 0 ;
+  VecMat::Vec2< int > *arg2 = 0 ;
+  VecMat::Vec2< int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -14762,22 +14602,22 @@ SWIGINTERN PyObject *_wrap_Vec2i___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2i___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i___sub__" "', argument " "1"" of type '" "VecMat::Vec2<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i___sub__" "', argument " "1"" of type '" "VecMat::Vec2< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tint_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec2< int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_int_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2i___sub__" "', argument " "2"" of type '" "VecMat::Vec2<int > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2i___sub__" "', argument " "2"" of type '" "VecMat::Vec2< int > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2i___sub__" "', argument " "2"" of type '" "VecMat::Vec2<int > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2i___sub__" "', argument " "2"" of type '" "VecMat::Vec2< int > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec2<int > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec2< int > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec2<int > const *)arg1)->operator -((VecMat::Vec2<int > const &)*arg2);
+      result = ((VecMat::Vec2< int > const *)arg1)->operator -((VecMat::Vec2< int > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -14786,7 +14626,7 @@ SWIGINTERN PyObject *_wrap_Vec2i___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<int >(static_cast< const VecMat::Vec2<int >& >(result))), SWIGTYPE_p_VecMat__Vec2Tint_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< int >(static_cast< const VecMat::Vec2< int >& >(result))), SWIGTYPE_p_VecMat__Vec2T_int_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -14795,9 +14635,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2i___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
-  VecMat::Vec2<int >::value_type arg2 ;
-  VecMat::Vec2<int > result;
+  VecMat::Vec2< int > *arg1 = (VecMat::Vec2< int > *) 0 ;
+  VecMat::Vec2< int >::value_type arg2 ;
+  VecMat::Vec2< int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -14806,19 +14646,19 @@ SWIGINTERN PyObject *_wrap_Vec2i___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2i___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i___mul__" "', argument " "1"" of type '" "VecMat::Vec2<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i___mul__" "', argument " "1"" of type '" "VecMat::Vec2< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< int > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2i___mul__" "', argument " "2"" of type '" "VecMat::Vec2<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2i___mul__" "', argument " "2"" of type '" "VecMat::Vec2< int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2<int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2< int >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec2<int > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec2< int > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -14827,7 +14667,7 @@ SWIGINTERN PyObject *_wrap_Vec2i___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<int >(static_cast< const VecMat::Vec2<int >& >(result))), SWIGTYPE_p_VecMat__Vec2Tint_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< int >(static_cast< const VecMat::Vec2< int >& >(result))), SWIGTYPE_p_VecMat__Vec2T_int_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -14836,9 +14676,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2i___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
-  VecMat::Vec2<int >::value_type arg2 ;
-  VecMat::Vec2<int > result;
+  VecMat::Vec2< int > *arg1 = (VecMat::Vec2< int > *) 0 ;
+  VecMat::Vec2< int >::value_type arg2 ;
+  VecMat::Vec2< int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -14847,19 +14687,19 @@ SWIGINTERN PyObject *_wrap_Vec2i___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2i___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i___div__" "', argument " "1"" of type '" "VecMat::Vec2<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i___div__" "', argument " "1"" of type '" "VecMat::Vec2< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< int > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2i___div__" "', argument " "2"" of type '" "VecMat::Vec2<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2i___div__" "', argument " "2"" of type '" "VecMat::Vec2< int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2<int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2< int >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec2<int > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec2< int > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -14868,7 +14708,7 @@ SWIGINTERN PyObject *_wrap_Vec2i___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<int >(static_cast< const VecMat::Vec2<int >& >(result))), SWIGTYPE_p_VecMat__Vec2Tint_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< int >(static_cast< const VecMat::Vec2< int >& >(result))), SWIGTYPE_p_VecMat__Vec2T_int_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -14877,9 +14717,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2i___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
-  VecMat::Vec2<int > *arg2 = 0 ;
-  VecMat::Vec2<int >::value_type result;
+  VecMat::Vec2< int > *arg1 = (VecMat::Vec2< int > *) 0 ;
+  VecMat::Vec2< int > *arg2 = 0 ;
+  VecMat::Vec2< int >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -14888,22 +14728,22 @@ SWIGINTERN PyObject *_wrap_Vec2i___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2i___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i___mul__" "', argument " "1"" of type '" "VecMat::Vec2<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i___mul__" "', argument " "1"" of type '" "VecMat::Vec2< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tint_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec2< int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_int_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2i___mul__" "', argument " "2"" of type '" "VecMat::Vec2<int > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2i___mul__" "', argument " "2"" of type '" "VecMat::Vec2< int > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2i___mul__" "', argument " "2"" of type '" "VecMat::Vec2<int > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2i___mul__" "', argument " "2"" of type '" "VecMat::Vec2< int > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec2<int > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec2< int > * >(argp2);
   {
     try {
-      result = (VecMat::Vec2<int >::value_type)((VecMat::Vec2<int > const *)arg1)->operator *((VecMat::Vec2<int > const &)*arg2);
+      result = (VecMat::Vec2< int >::value_type)((VecMat::Vec2< int > const *)arg1)->operator *((VecMat::Vec2< int > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -14925,17 +14765,17 @@ SWIGINTERN PyObject *_wrap_Vec2i___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tint_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2Tint_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2T_int_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec2i___mul____SWIG_1(self, args);
@@ -14945,7 +14785,7 @@ SWIGINTERN PyObject *_wrap_Vec2i___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tint_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -14966,17 +14806,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec2i(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
+  VecMat::Vec2< int > *arg1 = (VecMat::Vec2< int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec2i",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_int_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec2i" "', argument " "1"" of type '" "VecMat::Vec2<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec2i" "', argument " "1"" of type '" "VecMat::Vec2< int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< int > * >(argp1);
   {
     try {
       delete arg1;
@@ -14998,19 +14838,19 @@ fail:
 
 SWIGINTERN PyObject *Vec2i_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec2Tint_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec2T_int_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec2f__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<float > *result = 0 ;
+  VecMat::Vec2< float > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec2f")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec2<float > *)new VecMat::Vec2<float >();
+      result = (VecMat::Vec2< float > *)new VecMat::Vec2< float >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -15019,7 +14859,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2f__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -15028,9 +14868,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec2f__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<float >::value_type arg1 ;
-  VecMat::Vec2<float >::value_type arg2 ;
-  VecMat::Vec2<float > *result = 0 ;
+  VecMat::Vec2< float >::value_type arg1 ;
+  VecMat::Vec2< float >::value_type arg2 ;
+  VecMat::Vec2< float > *result = 0 ;
   float val1 ;
   int ecode1 = 0 ;
   float val2 ;
@@ -15041,17 +14881,17 @@ SWIGINTERN PyObject *_wrap_new_Vec2f__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OO:new_Vec2f",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_float(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2f" "', argument " "1"" of type '" "VecMat::Vec2<float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2f" "', argument " "1"" of type '" "VecMat::Vec2< float >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec2<float >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec2< float >::value_type >(val1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec2f" "', argument " "2"" of type '" "VecMat::Vec2<float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec2f" "', argument " "2"" of type '" "VecMat::Vec2< float >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2<float >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2< float >::value_type >(val2);
   {
     try {
-      result = (VecMat::Vec2<float > *)new VecMat::Vec2<float >(arg1,arg2);
+      result = (VecMat::Vec2< float > *)new VecMat::Vec2< float >(arg1,arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -15060,7 +14900,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2f__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -15069,8 +14909,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec2f__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<float >::value_type arg1 ;
-  VecMat::Vec2<float > *result = 0 ;
+  VecMat::Vec2< float >::value_type arg1 ;
+  VecMat::Vec2< float > *result = 0 ;
   float val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -15078,12 +14918,12 @@ SWIGINTERN PyObject *_wrap_new_Vec2f__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"O:new_Vec2f",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_float(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2f" "', argument " "1"" of type '" "VecMat::Vec2<float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2f" "', argument " "1"" of type '" "VecMat::Vec2< float >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec2<float >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec2< float >::value_type >(val1);
   {
     try {
-      result = (VecMat::Vec2<float > *)new VecMat::Vec2<float >(arg1);
+      result = (VecMat::Vec2< float > *)new VecMat::Vec2< float >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -15092,7 +14932,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2f__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -15105,7 +14945,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2f(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -15140,28 +14980,32 @@ SWIGINTERN PyObject *_wrap_new_Vec2f(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec2f'.\n  Possible C/C++ prototypes are:\n    VecMat::Vec2<(float)>()\n    VecMat::Vec2<(float)>(VecMat::Vec2<float >::value_type const,VecMat::Vec2<float >::value_type const)\n    VecMat::Vec2<(float)>(VecMat::Vec2<float >::value_type const)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec2f'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    VecMat::Vec2< float >()\n"
+    "    VecMat::Vec2< float >(VecMat::Vec2< float >::value_type const,VecMat::Vec2< float >::value_type const)\n"
+    "    VecMat::Vec2< float >(VecMat::Vec2< float >::value_type const)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec2f_x__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
-  VecMat::Vec2<float >::value_type result;
+  VecMat::Vec2< float > *arg1 = (VecMat::Vec2< float > *) 0 ;
+  VecMat::Vec2< float >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2f_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f_x" "', argument " "1"" of type '" "VecMat::Vec2<float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f_x" "', argument " "1"" of type '" "VecMat::Vec2< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< float > * >(argp1);
   {
     try {
-      result = (VecMat::Vec2<float >::value_type)((VecMat::Vec2<float > const *)arg1)->x();
+      result = (VecMat::Vec2< float >::value_type)((VecMat::Vec2< float > const *)arg1)->x();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -15179,23 +15023,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2f_x__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
-  VecMat::Vec2<float >::value_type *result = 0 ;
+  VecMat::Vec2< float > *arg1 = (VecMat::Vec2< float > *) 0 ;
+  VecMat::Vec2< float >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2f_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f_x" "', argument " "1"" of type '" "VecMat::Vec2<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f_x" "', argument " "1"" of type '" "VecMat::Vec2< float > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< float > * >(argp1);
   {
     try {
       {
-        VecMat::Vec2<float >::value_type &_result_ref = (arg1)->x();
-        result = (VecMat::Vec2<float >::value_type *) &_result_ref;
+        VecMat::Vec2< float >::value_type &_result_ref = (arg1)->x();
+        result = (VecMat::Vec2< float >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -15218,14 +15062,14 @@ SWIGINTERN PyObject *_wrap_Vec2f_x(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_float_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2f_x__SWIG_0(self, args);
@@ -15234,7 +15078,7 @@ SWIGINTERN PyObject *_wrap_Vec2f_x(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_float_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2f_x__SWIG_1(self, args);
@@ -15242,28 +15086,31 @@ SWIGINTERN PyObject *_wrap_Vec2f_x(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2f_x'.\n  Possible C/C++ prototypes are:\n    x()\n    x()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2f_x'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    x(VecMat::Vec2< float > const *)\n"
+    "    x(VecMat::Vec2< float > *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec2f_y__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
-  VecMat::Vec2<float >::value_type result;
+  VecMat::Vec2< float > *arg1 = (VecMat::Vec2< float > *) 0 ;
+  VecMat::Vec2< float >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2f_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f_y" "', argument " "1"" of type '" "VecMat::Vec2<float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f_y" "', argument " "1"" of type '" "VecMat::Vec2< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< float > * >(argp1);
   {
     try {
-      result = (VecMat::Vec2<float >::value_type)((VecMat::Vec2<float > const *)arg1)->y();
+      result = (VecMat::Vec2< float >::value_type)((VecMat::Vec2< float > const *)arg1)->y();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -15281,23 +15128,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2f_y__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
-  VecMat::Vec2<float >::value_type *result = 0 ;
+  VecMat::Vec2< float > *arg1 = (VecMat::Vec2< float > *) 0 ;
+  VecMat::Vec2< float >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2f_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f_y" "', argument " "1"" of type '" "VecMat::Vec2<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f_y" "', argument " "1"" of type '" "VecMat::Vec2< float > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< float > * >(argp1);
   {
     try {
       {
-        VecMat::Vec2<float >::value_type &_result_ref = (arg1)->y();
-        result = (VecMat::Vec2<float >::value_type *) &_result_ref;
+        VecMat::Vec2< float >::value_type &_result_ref = (arg1)->y();
+        result = (VecMat::Vec2< float >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -15320,14 +15167,14 @@ SWIGINTERN PyObject *_wrap_Vec2f_y(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_float_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2f_y__SWIG_0(self, args);
@@ -15336,7 +15183,7 @@ SWIGINTERN PyObject *_wrap_Vec2f_y(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_float_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2f_y__SWIG_1(self, args);
@@ -15344,15 +15191,18 @@ SWIGINTERN PyObject *_wrap_Vec2f_y(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2f_y'.\n  Possible C/C++ prototypes are:\n    y()\n    y()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2f_y'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    y(VecMat::Vec2< float > const *)\n"
+    "    y(VecMat::Vec2< float > *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec2f_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
-  VecMat::Vec2<float >::value_type arg2 ;
+  VecMat::Vec2< float > *arg1 = (VecMat::Vec2< float > *) 0 ;
+  VecMat::Vec2< float >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   float val2 ;
@@ -15361,16 +15211,16 @@ SWIGINTERN PyObject *_wrap_Vec2f_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2f_setX",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f_setX" "', argument " "1"" of type '" "VecMat::Vec2<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f_setX" "', argument " "1"" of type '" "VecMat::Vec2< float > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< float > * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2f_setX" "', argument " "2"" of type '" "VecMat::Vec2<float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2f_setX" "', argument " "2"" of type '" "VecMat::Vec2< float >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2<float >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2< float >::value_type >(val2);
   {
     try {
       (arg1)->setX(arg2);
@@ -15391,8 +15241,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2f_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
-  VecMat::Vec2<float >::value_type arg2 ;
+  VecMat::Vec2< float > *arg1 = (VecMat::Vec2< float > *) 0 ;
+  VecMat::Vec2< float >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   float val2 ;
@@ -15401,16 +15251,16 @@ SWIGINTERN PyObject *_wrap_Vec2f_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2f_setY",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f_setY" "', argument " "1"" of type '" "VecMat::Vec2<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f_setY" "', argument " "1"" of type '" "VecMat::Vec2< float > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< float > * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2f_setY" "', argument " "2"" of type '" "VecMat::Vec2<float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2f_setY" "', argument " "2"" of type '" "VecMat::Vec2< float >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2<float >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2< float >::value_type >(val2);
   {
     try {
       (arg1)->setY(arg2);
@@ -15431,9 +15281,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2f___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
-  VecMat::Vec2<float > *arg2 = 0 ;
-  VecMat::Vec2<float > result;
+  VecMat::Vec2< float > *arg1 = (VecMat::Vec2< float > *) 0 ;
+  VecMat::Vec2< float > *arg2 = 0 ;
+  VecMat::Vec2< float > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -15442,22 +15292,22 @@ SWIGINTERN PyObject *_wrap_Vec2f___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2f___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f___add__" "', argument " "1"" of type '" "VecMat::Vec2<float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f___add__" "', argument " "1"" of type '" "VecMat::Vec2< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec2< float > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_float_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2f___add__" "', argument " "2"" of type '" "VecMat::Vec2<float > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2f___add__" "', argument " "2"" of type '" "VecMat::Vec2< float > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2f___add__" "', argument " "2"" of type '" "VecMat::Vec2<float > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2f___add__" "', argument " "2"" of type '" "VecMat::Vec2< float > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec2<float > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec2< float > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec2<float > const *)arg1)->operator +((VecMat::Vec2<float > const &)*arg2);
+      result = ((VecMat::Vec2< float > const *)arg1)->operator +((VecMat::Vec2< float > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -15466,7 +15316,7 @@ SWIGINTERN PyObject *_wrap_Vec2f___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<float >(static_cast< const VecMat::Vec2<float >& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< float >(static_cast< const VecMat::Vec2< float >& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -15475,9 +15325,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2f___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
-  VecMat::Vec2<float > *arg2 = 0 ;
-  VecMat::Vec2<float > result;
+  VecMat::Vec2< float > *arg1 = (VecMat::Vec2< float > *) 0 ;
+  VecMat::Vec2< float > *arg2 = 0 ;
+  VecMat::Vec2< float > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -15486,22 +15336,22 @@ SWIGINTERN PyObject *_wrap_Vec2f___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2f___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f___sub__" "', argument " "1"" of type '" "VecMat::Vec2<float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f___sub__" "', argument " "1"" of type '" "VecMat::Vec2< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec2< float > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_float_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2f___sub__" "', argument " "2"" of type '" "VecMat::Vec2<float > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2f___sub__" "', argument " "2"" of type '" "VecMat::Vec2< float > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2f___sub__" "', argument " "2"" of type '" "VecMat::Vec2<float > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2f___sub__" "', argument " "2"" of type '" "VecMat::Vec2< float > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec2<float > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec2< float > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec2<float > const *)arg1)->operator -((VecMat::Vec2<float > const &)*arg2);
+      result = ((VecMat::Vec2< float > const *)arg1)->operator -((VecMat::Vec2< float > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -15510,7 +15360,7 @@ SWIGINTERN PyObject *_wrap_Vec2f___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<float >(static_cast< const VecMat::Vec2<float >& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< float >(static_cast< const VecMat::Vec2< float >& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -15519,9 +15369,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2f___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
-  VecMat::Vec2<float >::value_type arg2 ;
-  VecMat::Vec2<float > result;
+  VecMat::Vec2< float > *arg1 = (VecMat::Vec2< float > *) 0 ;
+  VecMat::Vec2< float >::value_type arg2 ;
+  VecMat::Vec2< float > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   float val2 ;
@@ -15530,19 +15380,19 @@ SWIGINTERN PyObject *_wrap_Vec2f___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2f___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f___mul__" "', argument " "1"" of type '" "VecMat::Vec2<float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f___mul__" "', argument " "1"" of type '" "VecMat::Vec2< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< float > * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2f___mul__" "', argument " "2"" of type '" "VecMat::Vec2<float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2f___mul__" "', argument " "2"" of type '" "VecMat::Vec2< float >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2<float >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2< float >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec2<float > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec2< float > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -15551,7 +15401,7 @@ SWIGINTERN PyObject *_wrap_Vec2f___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<float >(static_cast< const VecMat::Vec2<float >& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< float >(static_cast< const VecMat::Vec2< float >& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -15560,9 +15410,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2f___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
-  VecMat::Vec2<float >::value_type arg2 ;
-  VecMat::Vec2<float > result;
+  VecMat::Vec2< float > *arg1 = (VecMat::Vec2< float > *) 0 ;
+  VecMat::Vec2< float >::value_type arg2 ;
+  VecMat::Vec2< float > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   float val2 ;
@@ -15571,19 +15421,19 @@ SWIGINTERN PyObject *_wrap_Vec2f___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2f___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f___div__" "', argument " "1"" of type '" "VecMat::Vec2<float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f___div__" "', argument " "1"" of type '" "VecMat::Vec2< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< float > * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2f___div__" "', argument " "2"" of type '" "VecMat::Vec2<float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2f___div__" "', argument " "2"" of type '" "VecMat::Vec2< float >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2<float >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2< float >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec2<float > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec2< float > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -15592,7 +15442,7 @@ SWIGINTERN PyObject *_wrap_Vec2f___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<float >(static_cast< const VecMat::Vec2<float >& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< float >(static_cast< const VecMat::Vec2< float >& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -15601,9 +15451,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2f___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
-  VecMat::Vec2<float > *arg2 = 0 ;
-  VecMat::Vec2<float >::value_type result;
+  VecMat::Vec2< float > *arg1 = (VecMat::Vec2< float > *) 0 ;
+  VecMat::Vec2< float > *arg2 = 0 ;
+  VecMat::Vec2< float >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -15612,22 +15462,22 @@ SWIGINTERN PyObject *_wrap_Vec2f___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2f___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f___mul__" "', argument " "1"" of type '" "VecMat::Vec2<float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f___mul__" "', argument " "1"" of type '" "VecMat::Vec2< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec2< float > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_float_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2f___mul__" "', argument " "2"" of type '" "VecMat::Vec2<float > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2f___mul__" "', argument " "2"" of type '" "VecMat::Vec2< float > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2f___mul__" "', argument " "2"" of type '" "VecMat::Vec2<float > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2f___mul__" "', argument " "2"" of type '" "VecMat::Vec2< float > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec2<float > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec2< float > * >(argp2);
   {
     try {
-      result = (VecMat::Vec2<float >::value_type)((VecMat::Vec2<float > const *)arg1)->operator *((VecMat::Vec2<float > const &)*arg2);
+      result = (VecMat::Vec2< float >::value_type)((VecMat::Vec2< float > const *)arg1)->operator *((VecMat::Vec2< float > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -15649,17 +15499,17 @@ SWIGINTERN PyObject *_wrap_Vec2f___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_float_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2T_float_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec2f___mul____SWIG_1(self, args);
@@ -15669,7 +15519,7 @@ SWIGINTERN PyObject *_wrap_Vec2f___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_float_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -15690,17 +15540,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
+  VecMat::Vec2< float > *arg1 = (VecMat::Vec2< float > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec2f",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec2f" "', argument " "1"" of type '" "VecMat::Vec2<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec2f" "', argument " "1"" of type '" "VecMat::Vec2< float > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< float > * >(argp1);
   {
     try {
       delete arg1;
@@ -15722,19 +15572,19 @@ fail:
 
 SWIGINTERN PyObject *Vec2f_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec2d__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<double > *result = 0 ;
+  VecMat::Vec2< double > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec2d")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec2<double > *)new VecMat::Vec2<double >();
+      result = (VecMat::Vec2< double > *)new VecMat::Vec2< double >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -15743,7 +15593,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2d__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -15752,9 +15602,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec2d__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<double >::value_type arg1 ;
-  VecMat::Vec2<double >::value_type arg2 ;
-  VecMat::Vec2<double > *result = 0 ;
+  VecMat::Vec2< double >::value_type arg1 ;
+  VecMat::Vec2< double >::value_type arg2 ;
+  VecMat::Vec2< double > *result = 0 ;
   double val1 ;
   int ecode1 = 0 ;
   double val2 ;
@@ -15765,17 +15615,17 @@ SWIGINTERN PyObject *_wrap_new_Vec2d__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OO:new_Vec2d",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_double(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2d" "', argument " "1"" of type '" "VecMat::Vec2<double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2d" "', argument " "1"" of type '" "VecMat::Vec2< double >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec2<double >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec2< double >::value_type >(val1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec2d" "', argument " "2"" of type '" "VecMat::Vec2<double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec2d" "', argument " "2"" of type '" "VecMat::Vec2< double >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2<double >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2< double >::value_type >(val2);
   {
     try {
-      result = (VecMat::Vec2<double > *)new VecMat::Vec2<double >(arg1,arg2);
+      result = (VecMat::Vec2< double > *)new VecMat::Vec2< double >(arg1,arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -15784,7 +15634,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2d__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -15793,8 +15643,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec2d__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<double >::value_type arg1 ;
-  VecMat::Vec2<double > *result = 0 ;
+  VecMat::Vec2< double >::value_type arg1 ;
+  VecMat::Vec2< double > *result = 0 ;
   double val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -15802,12 +15652,12 @@ SWIGINTERN PyObject *_wrap_new_Vec2d__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"O:new_Vec2d",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_double(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2d" "', argument " "1"" of type '" "VecMat::Vec2<double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2d" "', argument " "1"" of type '" "VecMat::Vec2< double >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec2<double >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec2< double >::value_type >(val1);
   {
     try {
-      result = (VecMat::Vec2<double > *)new VecMat::Vec2<double >(arg1);
+      result = (VecMat::Vec2< double > *)new VecMat::Vec2< double >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -15816,7 +15666,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2d__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -15829,7 +15679,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2d(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -15864,28 +15714,32 @@ SWIGINTERN PyObject *_wrap_new_Vec2d(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec2d'.\n  Possible C/C++ prototypes are:\n    VecMat::Vec2<(double)>()\n    VecMat::Vec2<(double)>(VecMat::Vec2<double >::value_type const,VecMat::Vec2<double >::value_type const)\n    VecMat::Vec2<(double)>(VecMat::Vec2<double >::value_type const)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec2d'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    VecMat::Vec2< double >()\n"
+    "    VecMat::Vec2< double >(VecMat::Vec2< double >::value_type const,VecMat::Vec2< double >::value_type const)\n"
+    "    VecMat::Vec2< double >(VecMat::Vec2< double >::value_type const)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec2d_x__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
-  VecMat::Vec2<double >::value_type result;
+  VecMat::Vec2< double > *arg1 = (VecMat::Vec2< double > *) 0 ;
+  VecMat::Vec2< double >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2d_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d_x" "', argument " "1"" of type '" "VecMat::Vec2<double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d_x" "', argument " "1"" of type '" "VecMat::Vec2< double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< double > * >(argp1);
   {
     try {
-      result = (VecMat::Vec2<double >::value_type)((VecMat::Vec2<double > const *)arg1)->x();
+      result = (VecMat::Vec2< double >::value_type)((VecMat::Vec2< double > const *)arg1)->x();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -15903,23 +15757,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2d_x__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
-  VecMat::Vec2<double >::value_type *result = 0 ;
+  VecMat::Vec2< double > *arg1 = (VecMat::Vec2< double > *) 0 ;
+  VecMat::Vec2< double >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2d_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d_x" "', argument " "1"" of type '" "VecMat::Vec2<double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d_x" "', argument " "1"" of type '" "VecMat::Vec2< double > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< double > * >(argp1);
   {
     try {
       {
-        VecMat::Vec2<double >::value_type &_result_ref = (arg1)->x();
-        result = (VecMat::Vec2<double >::value_type *) &_result_ref;
+        VecMat::Vec2< double >::value_type &_result_ref = (arg1)->x();
+        result = (VecMat::Vec2< double >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -15942,14 +15796,14 @@ SWIGINTERN PyObject *_wrap_Vec2d_x(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2d_x__SWIG_0(self, args);
@@ -15958,7 +15812,7 @@ SWIGINTERN PyObject *_wrap_Vec2d_x(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2d_x__SWIG_1(self, args);
@@ -15966,28 +15820,31 @@ SWIGINTERN PyObject *_wrap_Vec2d_x(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2d_x'.\n  Possible C/C++ prototypes are:\n    x()\n    x()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2d_x'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    x(VecMat::Vec2< double > const *)\n"
+    "    x(VecMat::Vec2< double > *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec2d_y__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
-  VecMat::Vec2<double >::value_type result;
+  VecMat::Vec2< double > *arg1 = (VecMat::Vec2< double > *) 0 ;
+  VecMat::Vec2< double >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2d_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d_y" "', argument " "1"" of type '" "VecMat::Vec2<double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d_y" "', argument " "1"" of type '" "VecMat::Vec2< double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< double > * >(argp1);
   {
     try {
-      result = (VecMat::Vec2<double >::value_type)((VecMat::Vec2<double > const *)arg1)->y();
+      result = (VecMat::Vec2< double >::value_type)((VecMat::Vec2< double > const *)arg1)->y();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16005,23 +15862,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2d_y__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
-  VecMat::Vec2<double >::value_type *result = 0 ;
+  VecMat::Vec2< double > *arg1 = (VecMat::Vec2< double > *) 0 ;
+  VecMat::Vec2< double >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2d_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d_y" "', argument " "1"" of type '" "VecMat::Vec2<double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d_y" "', argument " "1"" of type '" "VecMat::Vec2< double > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< double > * >(argp1);
   {
     try {
       {
-        VecMat::Vec2<double >::value_type &_result_ref = (arg1)->y();
-        result = (VecMat::Vec2<double >::value_type *) &_result_ref;
+        VecMat::Vec2< double >::value_type &_result_ref = (arg1)->y();
+        result = (VecMat::Vec2< double >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -16044,14 +15901,14 @@ SWIGINTERN PyObject *_wrap_Vec2d_y(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2d_y__SWIG_0(self, args);
@@ -16060,7 +15917,7 @@ SWIGINTERN PyObject *_wrap_Vec2d_y(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2d_y__SWIG_1(self, args);
@@ -16068,15 +15925,18 @@ SWIGINTERN PyObject *_wrap_Vec2d_y(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2d_y'.\n  Possible C/C++ prototypes are:\n    y()\n    y()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2d_y'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    y(VecMat::Vec2< double > const *)\n"
+    "    y(VecMat::Vec2< double > *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec2d_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
-  VecMat::Vec2<double >::value_type arg2 ;
+  VecMat::Vec2< double > *arg1 = (VecMat::Vec2< double > *) 0 ;
+  VecMat::Vec2< double >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
@@ -16085,16 +15945,16 @@ SWIGINTERN PyObject *_wrap_Vec2d_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2d_setX",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d_setX" "', argument " "1"" of type '" "VecMat::Vec2<double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d_setX" "', argument " "1"" of type '" "VecMat::Vec2< double > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< double > * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2d_setX" "', argument " "2"" of type '" "VecMat::Vec2<double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2d_setX" "', argument " "2"" of type '" "VecMat::Vec2< double >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2<double >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2< double >::value_type >(val2);
   {
     try {
       (arg1)->setX(arg2);
@@ -16115,8 +15975,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2d_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
-  VecMat::Vec2<double >::value_type arg2 ;
+  VecMat::Vec2< double > *arg1 = (VecMat::Vec2< double > *) 0 ;
+  VecMat::Vec2< double >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
@@ -16125,16 +15985,16 @@ SWIGINTERN PyObject *_wrap_Vec2d_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2d_setY",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d_setY" "', argument " "1"" of type '" "VecMat::Vec2<double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d_setY" "', argument " "1"" of type '" "VecMat::Vec2< double > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< double > * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2d_setY" "', argument " "2"" of type '" "VecMat::Vec2<double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2d_setY" "', argument " "2"" of type '" "VecMat::Vec2< double >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2<double >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2< double >::value_type >(val2);
   {
     try {
       (arg1)->setY(arg2);
@@ -16155,9 +16015,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2d___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
-  VecMat::Vec2<double > *arg2 = 0 ;
-  VecMat::Vec2<double > result;
+  VecMat::Vec2< double > *arg1 = (VecMat::Vec2< double > *) 0 ;
+  VecMat::Vec2< double > *arg2 = 0 ;
+  VecMat::Vec2< double > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -16166,22 +16026,22 @@ SWIGINTERN PyObject *_wrap_Vec2d___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2d___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d___add__" "', argument " "1"" of type '" "VecMat::Vec2<double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d___add__" "', argument " "1"" of type '" "VecMat::Vec2< double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec2< double > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2d___add__" "', argument " "2"" of type '" "VecMat::Vec2<double > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2d___add__" "', argument " "2"" of type '" "VecMat::Vec2< double > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2d___add__" "', argument " "2"" of type '" "VecMat::Vec2<double > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2d___add__" "', argument " "2"" of type '" "VecMat::Vec2< double > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec2<double > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec2< double > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec2<double > const *)arg1)->operator +((VecMat::Vec2<double > const &)*arg2);
+      result = ((VecMat::Vec2< double > const *)arg1)->operator +((VecMat::Vec2< double > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16190,7 +16050,7 @@ SWIGINTERN PyObject *_wrap_Vec2d___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<double >(static_cast< const VecMat::Vec2<double >& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< double >(static_cast< const VecMat::Vec2< double >& >(result))), SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -16199,9 +16059,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2d___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
-  VecMat::Vec2<double > *arg2 = 0 ;
-  VecMat::Vec2<double > result;
+  VecMat::Vec2< double > *arg1 = (VecMat::Vec2< double > *) 0 ;
+  VecMat::Vec2< double > *arg2 = 0 ;
+  VecMat::Vec2< double > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -16210,22 +16070,22 @@ SWIGINTERN PyObject *_wrap_Vec2d___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2d___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d___sub__" "', argument " "1"" of type '" "VecMat::Vec2<double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d___sub__" "', argument " "1"" of type '" "VecMat::Vec2< double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec2< double > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2d___sub__" "', argument " "2"" of type '" "VecMat::Vec2<double > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2d___sub__" "', argument " "2"" of type '" "VecMat::Vec2< double > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2d___sub__" "', argument " "2"" of type '" "VecMat::Vec2<double > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2d___sub__" "', argument " "2"" of type '" "VecMat::Vec2< double > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec2<double > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec2< double > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec2<double > const *)arg1)->operator -((VecMat::Vec2<double > const &)*arg2);
+      result = ((VecMat::Vec2< double > const *)arg1)->operator -((VecMat::Vec2< double > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16234,7 +16094,7 @@ SWIGINTERN PyObject *_wrap_Vec2d___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<double >(static_cast< const VecMat::Vec2<double >& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< double >(static_cast< const VecMat::Vec2< double >& >(result))), SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -16243,9 +16103,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2d___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
-  VecMat::Vec2<double >::value_type arg2 ;
-  VecMat::Vec2<double > result;
+  VecMat::Vec2< double > *arg1 = (VecMat::Vec2< double > *) 0 ;
+  VecMat::Vec2< double >::value_type arg2 ;
+  VecMat::Vec2< double > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
@@ -16254,19 +16114,19 @@ SWIGINTERN PyObject *_wrap_Vec2d___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2d___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d___mul__" "', argument " "1"" of type '" "VecMat::Vec2<double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d___mul__" "', argument " "1"" of type '" "VecMat::Vec2< double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< double > * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2d___mul__" "', argument " "2"" of type '" "VecMat::Vec2<double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2d___mul__" "', argument " "2"" of type '" "VecMat::Vec2< double >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2<double >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2< double >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec2<double > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec2< double > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16275,7 +16135,7 @@ SWIGINTERN PyObject *_wrap_Vec2d___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<double >(static_cast< const VecMat::Vec2<double >& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< double >(static_cast< const VecMat::Vec2< double >& >(result))), SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -16284,9 +16144,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2d___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
-  VecMat::Vec2<double >::value_type arg2 ;
-  VecMat::Vec2<double > result;
+  VecMat::Vec2< double > *arg1 = (VecMat::Vec2< double > *) 0 ;
+  VecMat::Vec2< double >::value_type arg2 ;
+  VecMat::Vec2< double > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
@@ -16295,19 +16155,19 @@ SWIGINTERN PyObject *_wrap_Vec2d___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2d___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d___div__" "', argument " "1"" of type '" "VecMat::Vec2<double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d___div__" "', argument " "1"" of type '" "VecMat::Vec2< double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< double > * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2d___div__" "', argument " "2"" of type '" "VecMat::Vec2<double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2d___div__" "', argument " "2"" of type '" "VecMat::Vec2< double >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2<double >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2< double >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec2<double > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec2< double > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16316,7 +16176,7 @@ SWIGINTERN PyObject *_wrap_Vec2d___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<double >(static_cast< const VecMat::Vec2<double >& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< double >(static_cast< const VecMat::Vec2< double >& >(result))), SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -16325,9 +16185,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2d___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
-  VecMat::Vec2<double > *arg2 = 0 ;
-  VecMat::Vec2<double >::value_type result;
+  VecMat::Vec2< double > *arg1 = (VecMat::Vec2< double > *) 0 ;
+  VecMat::Vec2< double > *arg2 = 0 ;
+  VecMat::Vec2< double >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -16336,22 +16196,22 @@ SWIGINTERN PyObject *_wrap_Vec2d___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2d___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d___mul__" "', argument " "1"" of type '" "VecMat::Vec2<double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d___mul__" "', argument " "1"" of type '" "VecMat::Vec2< double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec2< double > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2d___mul__" "', argument " "2"" of type '" "VecMat::Vec2<double > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2d___mul__" "', argument " "2"" of type '" "VecMat::Vec2< double > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2d___mul__" "', argument " "2"" of type '" "VecMat::Vec2<double > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2d___mul__" "', argument " "2"" of type '" "VecMat::Vec2< double > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec2<double > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec2< double > * >(argp2);
   {
     try {
-      result = (VecMat::Vec2<double >::value_type)((VecMat::Vec2<double > const *)arg1)->operator *((VecMat::Vec2<double > const &)*arg2);
+      result = (VecMat::Vec2< double >::value_type)((VecMat::Vec2< double > const *)arg1)->operator *((VecMat::Vec2< double > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16373,17 +16233,17 @@ SWIGINTERN PyObject *_wrap_Vec2d___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2T_double_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec2d___mul____SWIG_1(self, args);
@@ -16393,7 +16253,7 @@ SWIGINTERN PyObject *_wrap_Vec2d___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -16414,17 +16274,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
+  VecMat::Vec2< double > *arg1 = (VecMat::Vec2< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec2d",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec2d" "', argument " "1"" of type '" "VecMat::Vec2<double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec2d" "', argument " "1"" of type '" "VecMat::Vec2< double > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< double > * >(argp1);
   {
     try {
       delete arg1;
@@ -16446,19 +16306,19 @@ fail:
 
 SWIGINTERN PyObject *Vec2d_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec_3u(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,3 > *result = 0 ;
+  VecMat::Vec< unsigned int,3 > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec_3u")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec<unsigned int,3 > *)new VecMat::Vec<unsigned int,3 >();
+      result = (VecMat::Vec< unsigned int,3 > *)new VecMat::Vec< unsigned int,3 >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16467,7 +16327,7 @@ SWIGINTERN PyObject *_wrap_new_Vec_3u(PyObject *SWIGUNUSEDPARM(self), PyObject *
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -16476,17 +16336,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec_3u(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
+  VecMat::Vec< unsigned int,3 > *arg1 = (VecMat::Vec< unsigned int,3 > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec_3u",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_3u" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_3u" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,3 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp1);
   {
     try {
       delete arg1;
@@ -16513,7 +16373,7 @@ SWIGINTERN PyObject *_wrap_Vec_3u_dim(PyObject *SWIGUNUSEDPARM(self), PyObject *
   if (!PyArg_ParseTuple(args,(char *)":Vec_3u_dim")) SWIG_fail;
   {
     try {
-      result = (unsigned int)VecMat::Vec<unsigned int,3 >::SWIGTEMPLATEDISAMBIGUATOR dim();
+      result = (unsigned int)VecMat::Vec< unsigned int,3 >::SWIGTEMPLATEDISAMBIGUATOR dim();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16531,21 +16391,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3u_norm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
-  VecMat::Vec<unsigned int,3 >::value_type result;
+  VecMat::Vec< unsigned int,3 > *arg1 = (VecMat::Vec< unsigned int,3 > *) 0 ;
+  VecMat::Vec< unsigned int,3 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3u_norm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u_norm" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u_norm" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec<unsigned int,3 >::value_type)((VecMat::Vec<unsigned int,3 > const *)arg1)->norm();
+      result = (VecMat::Vec< unsigned int,3 >::value_type)((VecMat::Vec< unsigned int,3 > const *)arg1)->norm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16563,21 +16423,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3u_squareNorm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
-  VecMat::Vec<unsigned int,3 >::value_type result;
+  VecMat::Vec< unsigned int,3 > *arg1 = (VecMat::Vec< unsigned int,3 > *) 0 ;
+  VecMat::Vec< unsigned int,3 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3u_squareNorm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u_squareNorm" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u_squareNorm" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec<unsigned int,3 >::value_type)((VecMat::Vec<unsigned int,3 > const *)arg1)->squareNorm();
+      result = (VecMat::Vec< unsigned int,3 >::value_type)((VecMat::Vec< unsigned int,3 > const *)arg1)->squareNorm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16595,23 +16455,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3u_normalize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
-  VecMat::Vec<unsigned int,3 > *result = 0 ;
+  VecMat::Vec< unsigned int,3 > *arg1 = (VecMat::Vec< unsigned int,3 > *) 0 ;
+  VecMat::Vec< unsigned int,3 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3u_normalize",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u_normalize" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u_normalize" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,3 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec<unsigned int,3 > &_result_ref = (arg1)->normalize();
-        result = (VecMat::Vec<unsigned int,3 > *) &_result_ref;
+        VecMat::Vec< unsigned int,3 > &_result_ref = (arg1)->normalize();
+        result = (VecMat::Vec< unsigned int,3 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -16621,7 +16481,7 @@ SWIGINTERN PyObject *_wrap_Vec_3u_normalize(PyObject *SWIGUNUSEDPARM(self), PyOb
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -16630,23 +16490,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3u_normalizeSafe(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
-  VecMat::Vec<unsigned int,3 > *result = 0 ;
+  VecMat::Vec< unsigned int,3 > *arg1 = (VecMat::Vec< unsigned int,3 > *) 0 ;
+  VecMat::Vec< unsigned int,3 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3u_normalizeSafe",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,3 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec<unsigned int,3 > &_result_ref = (arg1)->normalizeSafe();
-        result = (VecMat::Vec<unsigned int,3 > *) &_result_ref;
+        VecMat::Vec< unsigned int,3 > &_result_ref = (arg1)->normalizeSafe();
+        result = (VecMat::Vec< unsigned int,3 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -16656,7 +16516,7 @@ SWIGINTERN PyObject *_wrap_Vec_3u_normalizeSafe(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -16665,9 +16525,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3u___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
-  VecMat::Vec<unsigned int,3 > *arg2 = 0 ;
-  VecMat::Vec<unsigned int,3 > result;
+  VecMat::Vec< unsigned int,3 > *arg1 = (VecMat::Vec< unsigned int,3 > *) 0 ;
+  VecMat::Vec< unsigned int,3 > *arg2 = 0 ;
+  VecMat::Vec< unsigned int,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -16676,22 +16536,22 @@ SWIGINTERN PyObject *_wrap_Vec_3u___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3u___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___add__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___add__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___add__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___add__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___add__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___add__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec<unsigned int,3 > const *)arg1)->operator +((VecMat::Vec<unsigned int,3 > const &)*arg2);
+      result = ((VecMat::Vec< unsigned int,3 > const *)arg1)->operator +((VecMat::Vec< unsigned int,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16700,7 +16560,7 @@ SWIGINTERN PyObject *_wrap_Vec_3u___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<unsigned int,3 >(static_cast< const VecMat::Vec<unsigned int,3 >& >(result))), SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< unsigned int,3 >(static_cast< const VecMat::Vec< unsigned int,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -16709,9 +16569,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3u___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
-  VecMat::Vec<unsigned int,3 > *arg2 = 0 ;
-  VecMat::Vec<unsigned int,3 > result;
+  VecMat::Vec< unsigned int,3 > *arg1 = (VecMat::Vec< unsigned int,3 > *) 0 ;
+  VecMat::Vec< unsigned int,3 > *arg2 = 0 ;
+  VecMat::Vec< unsigned int,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -16720,22 +16580,22 @@ SWIGINTERN PyObject *_wrap_Vec_3u___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3u___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___sub__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___sub__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___sub__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___sub__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___sub__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___sub__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec<unsigned int,3 > const *)arg1)->operator -((VecMat::Vec<unsigned int,3 > const &)*arg2);
+      result = ((VecMat::Vec< unsigned int,3 > const *)arg1)->operator -((VecMat::Vec< unsigned int,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16744,7 +16604,7 @@ SWIGINTERN PyObject *_wrap_Vec_3u___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<unsigned int,3 >(static_cast< const VecMat::Vec<unsigned int,3 >& >(result))), SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< unsigned int,3 >(static_cast< const VecMat::Vec< unsigned int,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -16753,9 +16613,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3u___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
-  VecMat::Vec<unsigned int,3 >::value_type arg2 ;
-  VecMat::Vec<unsigned int,3 > result;
+  VecMat::Vec< unsigned int,3 > *arg1 = (VecMat::Vec< unsigned int,3 > *) 0 ;
+  VecMat::Vec< unsigned int,3 >::value_type arg2 ;
+  VecMat::Vec< unsigned int,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned int val2 ;
@@ -16764,19 +16624,19 @@ SWIGINTERN PyObject *_wrap_Vec_3u___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3u___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___mul__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___mul__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3u___mul__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3u___mul__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec<unsigned int,3 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec< unsigned int,3 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec<unsigned int,3 > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec< unsigned int,3 > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16785,7 +16645,7 @@ SWIGINTERN PyObject *_wrap_Vec_3u___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<unsigned int,3 >(static_cast< const VecMat::Vec<unsigned int,3 >& >(result))), SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< unsigned int,3 >(static_cast< const VecMat::Vec< unsigned int,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -16794,9 +16654,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3u___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
-  VecMat::Vec<unsigned int,3 >::value_type arg2 ;
-  VecMat::Vec<unsigned int,3 > result;
+  VecMat::Vec< unsigned int,3 > *arg1 = (VecMat::Vec< unsigned int,3 > *) 0 ;
+  VecMat::Vec< unsigned int,3 >::value_type arg2 ;
+  VecMat::Vec< unsigned int,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned int val2 ;
@@ -16805,19 +16665,19 @@ SWIGINTERN PyObject *_wrap_Vec_3u___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3u___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___div__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___div__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3u___div__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3u___div__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec<unsigned int,3 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec< unsigned int,3 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec<unsigned int,3 > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec< unsigned int,3 > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16826,7 +16686,7 @@ SWIGINTERN PyObject *_wrap_Vec_3u___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<unsigned int,3 >(static_cast< const VecMat::Vec<unsigned int,3 >& >(result))), SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< unsigned int,3 >(static_cast< const VecMat::Vec< unsigned int,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -16835,9 +16695,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3u___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
-  VecMat::Vec<unsigned int,3 > *arg2 = 0 ;
-  VecMat::Vec<unsigned int,3 >::value_type result;
+  VecMat::Vec< unsigned int,3 > *arg1 = (VecMat::Vec< unsigned int,3 > *) 0 ;
+  VecMat::Vec< unsigned int,3 > *arg2 = 0 ;
+  VecMat::Vec< unsigned int,3 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -16846,22 +16706,22 @@ SWIGINTERN PyObject *_wrap_Vec_3u___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3u___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___mul__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___mul__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___mul__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___mul__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___mul__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___mul__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp2);
   {
     try {
-      result = (VecMat::Vec<unsigned int,3 >::value_type)((VecMat::Vec<unsigned int,3 > const *)arg1)->operator *((VecMat::Vec<unsigned int,3 > const &)*arg2);
+      result = (VecMat::Vec< unsigned int,3 >::value_type)((VecMat::Vec< unsigned int,3 > const *)arg1)->operator *((VecMat::Vec< unsigned int,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16883,17 +16743,17 @@ SWIGINTERN PyObject *_wrap_Vec_3u___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec_3u___mul____SWIG_1(self, args);
@@ -16903,7 +16763,7 @@ SWIGINTERN PyObject *_wrap_Vec_3u___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -16924,8 +16784,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3u___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
-  VecMat::Vec<unsigned int,3 > *arg2 = 0 ;
+  VecMat::Vec< unsigned int,3 > *arg1 = (VecMat::Vec< unsigned int,3 > *) 0 ;
+  VecMat::Vec< unsigned int,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -16935,22 +16795,22 @@ SWIGINTERN PyObject *_wrap_Vec_3u___eq__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3u___eq__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___eq__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___eq__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___eq__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___eq__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___eq__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___eq__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<unsigned int,3 > const *)arg1)->operator ==((VecMat::Vec<unsigned int,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec< unsigned int,3 > const *)arg1)->operator ==((VecMat::Vec< unsigned int,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16968,8 +16828,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3u___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
-  VecMat::Vec<unsigned int,3 > *arg2 = 0 ;
+  VecMat::Vec< unsigned int,3 > *arg1 = (VecMat::Vec< unsigned int,3 > *) 0 ;
+  VecMat::Vec< unsigned int,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -16979,22 +16839,22 @@ SWIGINTERN PyObject *_wrap_Vec_3u___ne__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3u___ne__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___ne__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___ne__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___ne__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___ne__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___ne__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___ne__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<unsigned int,3 > const *)arg1)->operator !=((VecMat::Vec<unsigned int,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec< unsigned int,3 > const *)arg1)->operator !=((VecMat::Vec< unsigned int,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17012,8 +16872,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3u___lt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
-  VecMat::Vec<unsigned int,3 > *arg2 = 0 ;
+  VecMat::Vec< unsigned int,3 > *arg1 = (VecMat::Vec< unsigned int,3 > *) 0 ;
+  VecMat::Vec< unsigned int,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -17023,22 +16883,22 @@ SWIGINTERN PyObject *_wrap_Vec_3u___lt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3u___lt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___lt__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___lt__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___lt__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___lt__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___lt__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___lt__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<unsigned int,3 > const *)arg1)->operator <((VecMat::Vec<unsigned int,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec< unsigned int,3 > const *)arg1)->operator <((VecMat::Vec< unsigned int,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17056,8 +16916,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3u___gt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
-  VecMat::Vec<unsigned int,3 > *arg2 = 0 ;
+  VecMat::Vec< unsigned int,3 > *arg1 = (VecMat::Vec< unsigned int,3 > *) 0 ;
+  VecMat::Vec< unsigned int,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -17067,22 +16927,22 @@ SWIGINTERN PyObject *_wrap_Vec_3u___gt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3u___gt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___gt__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___gt__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___gt__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___gt__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___gt__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___gt__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<unsigned int,3 > const *)arg1)->operator >((VecMat::Vec<unsigned int,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec< unsigned int,3 > const *)arg1)->operator >((VecMat::Vec< unsigned int,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17100,19 +16960,19 @@ fail:
 
 SWIGINTERN PyObject *Vec_3u_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec_3i(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,3 > *result = 0 ;
+  VecMat::Vec< int,3 > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec_3i")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec<int,3 > *)new VecMat::Vec<int,3 >();
+      result = (VecMat::Vec< int,3 > *)new VecMat::Vec< int,3 >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17121,7 +16981,7 @@ SWIGINTERN PyObject *_wrap_new_Vec_3i(PyObject *SWIGUNUSEDPARM(self), PyObject *
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTint_3_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_int_3_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -17130,17 +16990,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec_3i(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
+  VecMat::Vec< int,3 > *arg1 = (VecMat::Vec< int,3 > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec_3i",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_3_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_3i" "', argument " "1"" of type '" "VecMat::Vec<int,3 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_3i" "', argument " "1"" of type '" "VecMat::Vec< int,3 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp1);
   {
     try {
       delete arg1;
@@ -17167,7 +17027,7 @@ SWIGINTERN PyObject *_wrap_Vec_3i_dim(PyObject *SWIGUNUSEDPARM(self), PyObject *
   if (!PyArg_ParseTuple(args,(char *)":Vec_3i_dim")) SWIG_fail;
   {
     try {
-      result = (unsigned int)VecMat::Vec<int,3 >::SWIGTEMPLATEDISAMBIGUATOR dim();
+      result = (unsigned int)VecMat::Vec< int,3 >::SWIGTEMPLATEDISAMBIGUATOR dim();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17185,21 +17045,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3i_norm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
-  VecMat::Vec<int,3 >::value_type result;
+  VecMat::Vec< int,3 > *arg1 = (VecMat::Vec< int,3 > *) 0 ;
+  VecMat::Vec< int,3 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3i_norm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i_norm" "', argument " "1"" of type '" "VecMat::Vec<int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i_norm" "', argument " "1"" of type '" "VecMat::Vec< int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec<int,3 >::value_type)((VecMat::Vec<int,3 > const *)arg1)->norm();
+      result = (VecMat::Vec< int,3 >::value_type)((VecMat::Vec< int,3 > const *)arg1)->norm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17217,21 +17077,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3i_squareNorm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
-  VecMat::Vec<int,3 >::value_type result;
+  VecMat::Vec< int,3 > *arg1 = (VecMat::Vec< int,3 > *) 0 ;
+  VecMat::Vec< int,3 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3i_squareNorm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i_squareNorm" "', argument " "1"" of type '" "VecMat::Vec<int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i_squareNorm" "', argument " "1"" of type '" "VecMat::Vec< int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec<int,3 >::value_type)((VecMat::Vec<int,3 > const *)arg1)->squareNorm();
+      result = (VecMat::Vec< int,3 >::value_type)((VecMat::Vec< int,3 > const *)arg1)->squareNorm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17249,23 +17109,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3i_normalize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
-  VecMat::Vec<int,3 > *result = 0 ;
+  VecMat::Vec< int,3 > *arg1 = (VecMat::Vec< int,3 > *) 0 ;
+  VecMat::Vec< int,3 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3i_normalize",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i_normalize" "', argument " "1"" of type '" "VecMat::Vec<int,3 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i_normalize" "', argument " "1"" of type '" "VecMat::Vec< int,3 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec<int,3 > &_result_ref = (arg1)->normalize();
-        result = (VecMat::Vec<int,3 > *) &_result_ref;
+        VecMat::Vec< int,3 > &_result_ref = (arg1)->normalize();
+        result = (VecMat::Vec< int,3 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -17275,7 +17135,7 @@ SWIGINTERN PyObject *_wrap_Vec_3i_normalize(PyObject *SWIGUNUSEDPARM(self), PyOb
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_int_3_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -17284,23 +17144,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3i_normalizeSafe(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
-  VecMat::Vec<int,3 > *result = 0 ;
+  VecMat::Vec< int,3 > *arg1 = (VecMat::Vec< int,3 > *) 0 ;
+  VecMat::Vec< int,3 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3i_normalizeSafe",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec<int,3 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec< int,3 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec<int,3 > &_result_ref = (arg1)->normalizeSafe();
-        result = (VecMat::Vec<int,3 > *) &_result_ref;
+        VecMat::Vec< int,3 > &_result_ref = (arg1)->normalizeSafe();
+        result = (VecMat::Vec< int,3 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -17310,7 +17170,7 @@ SWIGINTERN PyObject *_wrap_Vec_3i_normalizeSafe(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_int_3_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -17319,9 +17179,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3i___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
-  VecMat::Vec<int,3 > *arg2 = 0 ;
-  VecMat::Vec<int,3 > result;
+  VecMat::Vec< int,3 > *arg1 = (VecMat::Vec< int,3 > *) 0 ;
+  VecMat::Vec< int,3 > *arg2 = 0 ;
+  VecMat::Vec< int,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -17330,22 +17190,22 @@ SWIGINTERN PyObject *_wrap_Vec_3i___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3i___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___add__" "', argument " "1"" of type '" "VecMat::Vec<int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___add__" "', argument " "1"" of type '" "VecMat::Vec< int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_int_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___add__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___add__" "', argument " "2"" of type '" "VecMat::Vec< int,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___add__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___add__" "', argument " "2"" of type '" "VecMat::Vec< int,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec<int,3 > const *)arg1)->operator +((VecMat::Vec<int,3 > const &)*arg2);
+      result = ((VecMat::Vec< int,3 > const *)arg1)->operator +((VecMat::Vec< int,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17354,7 +17214,7 @@ SWIGINTERN PyObject *_wrap_Vec_3i___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<int,3 >(static_cast< const VecMat::Vec<int,3 >& >(result))), SWIGTYPE_p_VecMat__VecTint_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< int,3 >(static_cast< const VecMat::Vec< int,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_int_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -17363,9 +17223,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3i___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
-  VecMat::Vec<int,3 > *arg2 = 0 ;
-  VecMat::Vec<int,3 > result;
+  VecMat::Vec< int,3 > *arg1 = (VecMat::Vec< int,3 > *) 0 ;
+  VecMat::Vec< int,3 > *arg2 = 0 ;
+  VecMat::Vec< int,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -17374,22 +17234,22 @@ SWIGINTERN PyObject *_wrap_Vec_3i___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3i___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___sub__" "', argument " "1"" of type '" "VecMat::Vec<int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___sub__" "', argument " "1"" of type '" "VecMat::Vec< int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_int_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___sub__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___sub__" "', argument " "2"" of type '" "VecMat::Vec< int,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___sub__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___sub__" "', argument " "2"" of type '" "VecMat::Vec< int,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec<int,3 > const *)arg1)->operator -((VecMat::Vec<int,3 > const &)*arg2);
+      result = ((VecMat::Vec< int,3 > const *)arg1)->operator -((VecMat::Vec< int,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17398,7 +17258,7 @@ SWIGINTERN PyObject *_wrap_Vec_3i___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<int,3 >(static_cast< const VecMat::Vec<int,3 >& >(result))), SWIGTYPE_p_VecMat__VecTint_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< int,3 >(static_cast< const VecMat::Vec< int,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_int_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -17407,9 +17267,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3i___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
-  VecMat::Vec<int,3 >::value_type arg2 ;
-  VecMat::Vec<int,3 > result;
+  VecMat::Vec< int,3 > *arg1 = (VecMat::Vec< int,3 > *) 0 ;
+  VecMat::Vec< int,3 >::value_type arg2 ;
+  VecMat::Vec< int,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -17418,19 +17278,19 @@ SWIGINTERN PyObject *_wrap_Vec_3i___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3i___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___mul__" "', argument " "1"" of type '" "VecMat::Vec<int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___mul__" "', argument " "1"" of type '" "VecMat::Vec< int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3i___mul__" "', argument " "2"" of type '" "VecMat::Vec<int,3 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3i___mul__" "', argument " "2"" of type '" "VecMat::Vec< int,3 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec<int,3 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec< int,3 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec<int,3 > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec< int,3 > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17439,7 +17299,7 @@ SWIGINTERN PyObject *_wrap_Vec_3i___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<int,3 >(static_cast< const VecMat::Vec<int,3 >& >(result))), SWIGTYPE_p_VecMat__VecTint_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< int,3 >(static_cast< const VecMat::Vec< int,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_int_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -17448,9 +17308,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3i___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
-  VecMat::Vec<int,3 >::value_type arg2 ;
-  VecMat::Vec<int,3 > result;
+  VecMat::Vec< int,3 > *arg1 = (VecMat::Vec< int,3 > *) 0 ;
+  VecMat::Vec< int,3 >::value_type arg2 ;
+  VecMat::Vec< int,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -17459,19 +17319,19 @@ SWIGINTERN PyObject *_wrap_Vec_3i___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3i___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___div__" "', argument " "1"" of type '" "VecMat::Vec<int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___div__" "', argument " "1"" of type '" "VecMat::Vec< int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3i___div__" "', argument " "2"" of type '" "VecMat::Vec<int,3 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3i___div__" "', argument " "2"" of type '" "VecMat::Vec< int,3 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec<int,3 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec< int,3 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec<int,3 > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec< int,3 > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17480,7 +17340,7 @@ SWIGINTERN PyObject *_wrap_Vec_3i___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<int,3 >(static_cast< const VecMat::Vec<int,3 >& >(result))), SWIGTYPE_p_VecMat__VecTint_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< int,3 >(static_cast< const VecMat::Vec< int,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_int_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -17489,9 +17349,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3i___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
-  VecMat::Vec<int,3 > *arg2 = 0 ;
-  VecMat::Vec<int,3 >::value_type result;
+  VecMat::Vec< int,3 > *arg1 = (VecMat::Vec< int,3 > *) 0 ;
+  VecMat::Vec< int,3 > *arg2 = 0 ;
+  VecMat::Vec< int,3 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -17500,22 +17360,22 @@ SWIGINTERN PyObject *_wrap_Vec_3i___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3i___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___mul__" "', argument " "1"" of type '" "VecMat::Vec<int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___mul__" "', argument " "1"" of type '" "VecMat::Vec< int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_int_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___mul__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___mul__" "', argument " "2"" of type '" "VecMat::Vec< int,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___mul__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___mul__" "', argument " "2"" of type '" "VecMat::Vec< int,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp2);
   {
     try {
-      result = (VecMat::Vec<int,3 >::value_type)((VecMat::Vec<int,3 > const *)arg1)->operator *((VecMat::Vec<int,3 > const &)*arg2);
+      result = (VecMat::Vec< int,3 >::value_type)((VecMat::Vec< int,3 > const *)arg1)->operator *((VecMat::Vec< int,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17537,17 +17397,17 @@ SWIGINTERN PyObject *_wrap_Vec_3i___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTint_3_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_int_3_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecTint_3_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecT_int_3_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec_3i___mul____SWIG_1(self, args);
@@ -17557,7 +17417,7 @@ SWIGINTERN PyObject *_wrap_Vec_3i___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTint_3_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_int_3_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -17578,8 +17438,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3i___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
-  VecMat::Vec<int,3 > *arg2 = 0 ;
+  VecMat::Vec< int,3 > *arg1 = (VecMat::Vec< int,3 > *) 0 ;
+  VecMat::Vec< int,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -17589,22 +17449,22 @@ SWIGINTERN PyObject *_wrap_Vec_3i___eq__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3i___eq__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___eq__" "', argument " "1"" of type '" "VecMat::Vec<int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___eq__" "', argument " "1"" of type '" "VecMat::Vec< int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_int_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___eq__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___eq__" "', argument " "2"" of type '" "VecMat::Vec< int,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___eq__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___eq__" "', argument " "2"" of type '" "VecMat::Vec< int,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<int,3 > const *)arg1)->operator ==((VecMat::Vec<int,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec< int,3 > const *)arg1)->operator ==((VecMat::Vec< int,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17622,8 +17482,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3i___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
-  VecMat::Vec<int,3 > *arg2 = 0 ;
+  VecMat::Vec< int,3 > *arg1 = (VecMat::Vec< int,3 > *) 0 ;
+  VecMat::Vec< int,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -17633,22 +17493,22 @@ SWIGINTERN PyObject *_wrap_Vec_3i___ne__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3i___ne__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___ne__" "', argument " "1"" of type '" "VecMat::Vec<int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___ne__" "', argument " "1"" of type '" "VecMat::Vec< int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_int_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___ne__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___ne__" "', argument " "2"" of type '" "VecMat::Vec< int,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___ne__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___ne__" "', argument " "2"" of type '" "VecMat::Vec< int,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<int,3 > const *)arg1)->operator !=((VecMat::Vec<int,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec< int,3 > const *)arg1)->operator !=((VecMat::Vec< int,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17666,8 +17526,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3i___lt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
-  VecMat::Vec<int,3 > *arg2 = 0 ;
+  VecMat::Vec< int,3 > *arg1 = (VecMat::Vec< int,3 > *) 0 ;
+  VecMat::Vec< int,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -17677,22 +17537,22 @@ SWIGINTERN PyObject *_wrap_Vec_3i___lt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3i___lt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___lt__" "', argument " "1"" of type '" "VecMat::Vec<int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___lt__" "', argument " "1"" of type '" "VecMat::Vec< int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_int_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___lt__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___lt__" "', argument " "2"" of type '" "VecMat::Vec< int,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___lt__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___lt__" "', argument " "2"" of type '" "VecMat::Vec< int,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<int,3 > const *)arg1)->operator <((VecMat::Vec<int,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec< int,3 > const *)arg1)->operator <((VecMat::Vec< int,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17710,8 +17570,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3i___gt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
-  VecMat::Vec<int,3 > *arg2 = 0 ;
+  VecMat::Vec< int,3 > *arg1 = (VecMat::Vec< int,3 > *) 0 ;
+  VecMat::Vec< int,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -17721,22 +17581,22 @@ SWIGINTERN PyObject *_wrap_Vec_3i___gt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3i___gt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___gt__" "', argument " "1"" of type '" "VecMat::Vec<int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___gt__" "', argument " "1"" of type '" "VecMat::Vec< int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_int_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___gt__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___gt__" "', argument " "2"" of type '" "VecMat::Vec< int,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___gt__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___gt__" "', argument " "2"" of type '" "VecMat::Vec< int,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<int,3 > const *)arg1)->operator >((VecMat::Vec<int,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec< int,3 > const *)arg1)->operator >((VecMat::Vec< int,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17754,19 +17614,19 @@ fail:
 
 SWIGINTERN PyObject *Vec_3i_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecTint_3_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecT_int_3_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec_3d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,3 > *result = 0 ;
+  VecMat::Vec< double,3 > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec_3d")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec<double,3 > *)new VecMat::Vec<double,3 >();
+      result = (VecMat::Vec< double,3 > *)new VecMat::Vec< double,3 >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17775,7 +17635,7 @@ SWIGINTERN PyObject *_wrap_new_Vec_3d(PyObject *SWIGUNUSEDPARM(self), PyObject *
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTdouble_3_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_double_3_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -17784,17 +17644,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec_3d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
+  VecMat::Vec< double,3 > *arg1 = (VecMat::Vec< double,3 > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec_3d",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_3_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_3d" "', argument " "1"" of type '" "VecMat::Vec<double,3 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_3d" "', argument " "1"" of type '" "VecMat::Vec< double,3 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp1);
   {
     try {
       delete arg1;
@@ -17821,7 +17681,7 @@ SWIGINTERN PyObject *_wrap_Vec_3d_dim(PyObject *SWIGUNUSEDPARM(self), PyObject *
   if (!PyArg_ParseTuple(args,(char *)":Vec_3d_dim")) SWIG_fail;
   {
     try {
-      result = (unsigned int)VecMat::Vec<double,3 >::SWIGTEMPLATEDISAMBIGUATOR dim();
+      result = (unsigned int)VecMat::Vec< double,3 >::SWIGTEMPLATEDISAMBIGUATOR dim();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17839,21 +17699,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3d_norm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
-  VecMat::Vec<double,3 >::value_type result;
+  VecMat::Vec< double,3 > *arg1 = (VecMat::Vec< double,3 > *) 0 ;
+  VecMat::Vec< double,3 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3d_norm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d_norm" "', argument " "1"" of type '" "VecMat::Vec<double,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d_norm" "', argument " "1"" of type '" "VecMat::Vec< double,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec<double,3 >::value_type)((VecMat::Vec<double,3 > const *)arg1)->norm();
+      result = (VecMat::Vec< double,3 >::value_type)((VecMat::Vec< double,3 > const *)arg1)->norm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17871,21 +17731,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3d_squareNorm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
-  VecMat::Vec<double,3 >::value_type result;
+  VecMat::Vec< double,3 > *arg1 = (VecMat::Vec< double,3 > *) 0 ;
+  VecMat::Vec< double,3 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3d_squareNorm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d_squareNorm" "', argument " "1"" of type '" "VecMat::Vec<double,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d_squareNorm" "', argument " "1"" of type '" "VecMat::Vec< double,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec<double,3 >::value_type)((VecMat::Vec<double,3 > const *)arg1)->squareNorm();
+      result = (VecMat::Vec< double,3 >::value_type)((VecMat::Vec< double,3 > const *)arg1)->squareNorm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17903,23 +17763,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3d_normalize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
-  VecMat::Vec<double,3 > *result = 0 ;
+  VecMat::Vec< double,3 > *arg1 = (VecMat::Vec< double,3 > *) 0 ;
+  VecMat::Vec< double,3 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3d_normalize",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d_normalize" "', argument " "1"" of type '" "VecMat::Vec<double,3 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d_normalize" "', argument " "1"" of type '" "VecMat::Vec< double,3 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec<double,3 > &_result_ref = (arg1)->normalize();
-        result = (VecMat::Vec<double,3 > *) &_result_ref;
+        VecMat::Vec< double,3 > &_result_ref = (arg1)->normalize();
+        result = (VecMat::Vec< double,3 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -17929,7 +17789,7 @@ SWIGINTERN PyObject *_wrap_Vec_3d_normalize(PyObject *SWIGUNUSEDPARM(self), PyOb
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_double_3_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -17938,23 +17798,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3d_normalizeSafe(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
-  VecMat::Vec<double,3 > *result = 0 ;
+  VecMat::Vec< double,3 > *arg1 = (VecMat::Vec< double,3 > *) 0 ;
+  VecMat::Vec< double,3 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3d_normalizeSafe",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec<double,3 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec< double,3 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec<double,3 > &_result_ref = (arg1)->normalizeSafe();
-        result = (VecMat::Vec<double,3 > *) &_result_ref;
+        VecMat::Vec< double,3 > &_result_ref = (arg1)->normalizeSafe();
+        result = (VecMat::Vec< double,3 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -17964,7 +17824,7 @@ SWIGINTERN PyObject *_wrap_Vec_3d_normalizeSafe(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_double_3_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -17973,9 +17833,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3d___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
-  VecMat::Vec<double,3 > *arg2 = 0 ;
-  VecMat::Vec<double,3 > result;
+  VecMat::Vec< double,3 > *arg1 = (VecMat::Vec< double,3 > *) 0 ;
+  VecMat::Vec< double,3 > *arg2 = 0 ;
+  VecMat::Vec< double,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -17984,22 +17844,22 @@ SWIGINTERN PyObject *_wrap_Vec_3d___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3d___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___add__" "', argument " "1"" of type '" "VecMat::Vec<double,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___add__" "', argument " "1"" of type '" "VecMat::Vec< double,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_double_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___add__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___add__" "', argument " "2"" of type '" "VecMat::Vec< double,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___add__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___add__" "', argument " "2"" of type '" "VecMat::Vec< double,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec<double,3 > const *)arg1)->operator +((VecMat::Vec<double,3 > const &)*arg2);
+      result = ((VecMat::Vec< double,3 > const *)arg1)->operator +((VecMat::Vec< double,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18008,7 +17868,7 @@ SWIGINTERN PyObject *_wrap_Vec_3d___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<double,3 >(static_cast< const VecMat::Vec<double,3 >& >(result))), SWIGTYPE_p_VecMat__VecTdouble_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< double,3 >(static_cast< const VecMat::Vec< double,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_double_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -18017,9 +17877,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3d___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
-  VecMat::Vec<double,3 > *arg2 = 0 ;
-  VecMat::Vec<double,3 > result;
+  VecMat::Vec< double,3 > *arg1 = (VecMat::Vec< double,3 > *) 0 ;
+  VecMat::Vec< double,3 > *arg2 = 0 ;
+  VecMat::Vec< double,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -18028,22 +17888,22 @@ SWIGINTERN PyObject *_wrap_Vec_3d___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3d___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___sub__" "', argument " "1"" of type '" "VecMat::Vec<double,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___sub__" "', argument " "1"" of type '" "VecMat::Vec< double,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_double_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___sub__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___sub__" "', argument " "2"" of type '" "VecMat::Vec< double,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___sub__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___sub__" "', argument " "2"" of type '" "VecMat::Vec< double,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec<double,3 > const *)arg1)->operator -((VecMat::Vec<double,3 > const &)*arg2);
+      result = ((VecMat::Vec< double,3 > const *)arg1)->operator -((VecMat::Vec< double,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18052,7 +17912,7 @@ SWIGINTERN PyObject *_wrap_Vec_3d___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<double,3 >(static_cast< const VecMat::Vec<double,3 >& >(result))), SWIGTYPE_p_VecMat__VecTdouble_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< double,3 >(static_cast< const VecMat::Vec< double,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_double_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -18061,9 +17921,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3d___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
-  VecMat::Vec<double,3 >::value_type arg2 ;
-  VecMat::Vec<double,3 > result;
+  VecMat::Vec< double,3 > *arg1 = (VecMat::Vec< double,3 > *) 0 ;
+  VecMat::Vec< double,3 >::value_type arg2 ;
+  VecMat::Vec< double,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
@@ -18072,19 +17932,19 @@ SWIGINTERN PyObject *_wrap_Vec_3d___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3d___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___mul__" "', argument " "1"" of type '" "VecMat::Vec<double,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___mul__" "', argument " "1"" of type '" "VecMat::Vec< double,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3d___mul__" "', argument " "2"" of type '" "VecMat::Vec<double,3 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3d___mul__" "', argument " "2"" of type '" "VecMat::Vec< double,3 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec<double,3 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec< double,3 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec<double,3 > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec< double,3 > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18093,7 +17953,7 @@ SWIGINTERN PyObject *_wrap_Vec_3d___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<double,3 >(static_cast< const VecMat::Vec<double,3 >& >(result))), SWIGTYPE_p_VecMat__VecTdouble_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< double,3 >(static_cast< const VecMat::Vec< double,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_double_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -18102,9 +17962,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3d___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
-  VecMat::Vec<double,3 >::value_type arg2 ;
-  VecMat::Vec<double,3 > result;
+  VecMat::Vec< double,3 > *arg1 = (VecMat::Vec< double,3 > *) 0 ;
+  VecMat::Vec< double,3 >::value_type arg2 ;
+  VecMat::Vec< double,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
@@ -18113,19 +17973,19 @@ SWIGINTERN PyObject *_wrap_Vec_3d___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3d___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___div__" "', argument " "1"" of type '" "VecMat::Vec<double,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___div__" "', argument " "1"" of type '" "VecMat::Vec< double,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3d___div__" "', argument " "2"" of type '" "VecMat::Vec<double,3 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3d___div__" "', argument " "2"" of type '" "VecMat::Vec< double,3 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec<double,3 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec< double,3 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec<double,3 > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec< double,3 > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18134,7 +17994,7 @@ SWIGINTERN PyObject *_wrap_Vec_3d___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<double,3 >(static_cast< const VecMat::Vec<double,3 >& >(result))), SWIGTYPE_p_VecMat__VecTdouble_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< double,3 >(static_cast< const VecMat::Vec< double,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_double_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -18143,9 +18003,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3d___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
-  VecMat::Vec<double,3 > *arg2 = 0 ;
-  VecMat::Vec<double,3 >::value_type result;
+  VecMat::Vec< double,3 > *arg1 = (VecMat::Vec< double,3 > *) 0 ;
+  VecMat::Vec< double,3 > *arg2 = 0 ;
+  VecMat::Vec< double,3 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -18154,22 +18014,22 @@ SWIGINTERN PyObject *_wrap_Vec_3d___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3d___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___mul__" "', argument " "1"" of type '" "VecMat::Vec<double,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___mul__" "', argument " "1"" of type '" "VecMat::Vec< double,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_double_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___mul__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___mul__" "', argument " "2"" of type '" "VecMat::Vec< double,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___mul__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___mul__" "', argument " "2"" of type '" "VecMat::Vec< double,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp2);
   {
     try {
-      result = (VecMat::Vec<double,3 >::value_type)((VecMat::Vec<double,3 > const *)arg1)->operator *((VecMat::Vec<double,3 > const &)*arg2);
+      result = (VecMat::Vec< double,3 >::value_type)((VecMat::Vec< double,3 > const *)arg1)->operator *((VecMat::Vec< double,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18191,17 +18051,17 @@ SWIGINTERN PyObject *_wrap_Vec_3d___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTdouble_3_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_double_3_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecTdouble_3_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecT_double_3_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec_3d___mul____SWIG_1(self, args);
@@ -18211,7 +18071,7 @@ SWIGINTERN PyObject *_wrap_Vec_3d___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTdouble_3_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_double_3_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -18232,8 +18092,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3d___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
-  VecMat::Vec<double,3 > *arg2 = 0 ;
+  VecMat::Vec< double,3 > *arg1 = (VecMat::Vec< double,3 > *) 0 ;
+  VecMat::Vec< double,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -18243,22 +18103,22 @@ SWIGINTERN PyObject *_wrap_Vec_3d___eq__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3d___eq__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___eq__" "', argument " "1"" of type '" "VecMat::Vec<double,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___eq__" "', argument " "1"" of type '" "VecMat::Vec< double,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_double_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___eq__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___eq__" "', argument " "2"" of type '" "VecMat::Vec< double,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___eq__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___eq__" "', argument " "2"" of type '" "VecMat::Vec< double,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<double,3 > const *)arg1)->operator ==((VecMat::Vec<double,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec< double,3 > const *)arg1)->operator ==((VecMat::Vec< double,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18276,8 +18136,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3d___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
-  VecMat::Vec<double,3 > *arg2 = 0 ;
+  VecMat::Vec< double,3 > *arg1 = (VecMat::Vec< double,3 > *) 0 ;
+  VecMat::Vec< double,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -18287,22 +18147,22 @@ SWIGINTERN PyObject *_wrap_Vec_3d___ne__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3d___ne__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___ne__" "', argument " "1"" of type '" "VecMat::Vec<double,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___ne__" "', argument " "1"" of type '" "VecMat::Vec< double,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_double_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___ne__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___ne__" "', argument " "2"" of type '" "VecMat::Vec< double,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___ne__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___ne__" "', argument " "2"" of type '" "VecMat::Vec< double,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<double,3 > const *)arg1)->operator !=((VecMat::Vec<double,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec< double,3 > const *)arg1)->operator !=((VecMat::Vec< double,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18320,8 +18180,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3d___lt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
-  VecMat::Vec<double,3 > *arg2 = 0 ;
+  VecMat::Vec< double,3 > *arg1 = (VecMat::Vec< double,3 > *) 0 ;
+  VecMat::Vec< double,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -18331,22 +18191,22 @@ SWIGINTERN PyObject *_wrap_Vec_3d___lt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3d___lt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___lt__" "', argument " "1"" of type '" "VecMat::Vec<double,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___lt__" "', argument " "1"" of type '" "VecMat::Vec< double,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_double_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___lt__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___lt__" "', argument " "2"" of type '" "VecMat::Vec< double,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___lt__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___lt__" "', argument " "2"" of type '" "VecMat::Vec< double,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<double,3 > const *)arg1)->operator <((VecMat::Vec<double,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec< double,3 > const *)arg1)->operator <((VecMat::Vec< double,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18364,8 +18224,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3d___gt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
-  VecMat::Vec<double,3 > *arg2 = 0 ;
+  VecMat::Vec< double,3 > *arg1 = (VecMat::Vec< double,3 > *) 0 ;
+  VecMat::Vec< double,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -18375,22 +18235,22 @@ SWIGINTERN PyObject *_wrap_Vec_3d___gt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3d___gt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___gt__" "', argument " "1"" of type '" "VecMat::Vec<double,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___gt__" "', argument " "1"" of type '" "VecMat::Vec< double,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_double_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___gt__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___gt__" "', argument " "2"" of type '" "VecMat::Vec< double,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___gt__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___gt__" "', argument " "2"" of type '" "VecMat::Vec< double,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<double,3 > const *)arg1)->operator >((VecMat::Vec<double,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec< double,3 > const *)arg1)->operator >((VecMat::Vec< double,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18408,19 +18268,19 @@ fail:
 
 SWIGINTERN PyObject *Vec_3d_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecTdouble_3_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecT_double_3_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec_3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,3 > *result = 0 ;
+  VecMat::Vec< float,3 > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec_3f")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec<float,3 > *)new VecMat::Vec<float,3 >();
+      result = (VecMat::Vec< float,3 > *)new VecMat::Vec< float,3 >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18429,7 +18289,7 @@ SWIGINTERN PyObject *_wrap_new_Vec_3f(PyObject *SWIGUNUSEDPARM(self), PyObject *
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTfloat_3_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_float_3_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -18438,17 +18298,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec_3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
+  VecMat::Vec< float,3 > *arg1 = (VecMat::Vec< float,3 > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec_3f",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_3_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_3f" "', argument " "1"" of type '" "VecMat::Vec<float,3 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_3f" "', argument " "1"" of type '" "VecMat::Vec< float,3 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp1);
   {
     try {
       delete arg1;
@@ -18475,7 +18335,7 @@ SWIGINTERN PyObject *_wrap_Vec_3f_dim(PyObject *SWIGUNUSEDPARM(self), PyObject *
   if (!PyArg_ParseTuple(args,(char *)":Vec_3f_dim")) SWIG_fail;
   {
     try {
-      result = (unsigned int)VecMat::Vec<float,3 >::SWIGTEMPLATEDISAMBIGUATOR dim();
+      result = (unsigned int)VecMat::Vec< float,3 >::SWIGTEMPLATEDISAMBIGUATOR dim();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18493,21 +18353,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3f_norm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
-  VecMat::Vec<float,3 >::value_type result;
+  VecMat::Vec< float,3 > *arg1 = (VecMat::Vec< float,3 > *) 0 ;
+  VecMat::Vec< float,3 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3f_norm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f_norm" "', argument " "1"" of type '" "VecMat::Vec<float,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f_norm" "', argument " "1"" of type '" "VecMat::Vec< float,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec<float,3 >::value_type)((VecMat::Vec<float,3 > const *)arg1)->norm();
+      result = (VecMat::Vec< float,3 >::value_type)((VecMat::Vec< float,3 > const *)arg1)->norm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18525,21 +18385,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3f_squareNorm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
-  VecMat::Vec<float,3 >::value_type result;
+  VecMat::Vec< float,3 > *arg1 = (VecMat::Vec< float,3 > *) 0 ;
+  VecMat::Vec< float,3 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3f_squareNorm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f_squareNorm" "', argument " "1"" of type '" "VecMat::Vec<float,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f_squareNorm" "', argument " "1"" of type '" "VecMat::Vec< float,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec<float,3 >::value_type)((VecMat::Vec<float,3 > const *)arg1)->squareNorm();
+      result = (VecMat::Vec< float,3 >::value_type)((VecMat::Vec< float,3 > const *)arg1)->squareNorm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18557,23 +18417,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3f_normalize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
-  VecMat::Vec<float,3 > *result = 0 ;
+  VecMat::Vec< float,3 > *arg1 = (VecMat::Vec< float,3 > *) 0 ;
+  VecMat::Vec< float,3 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3f_normalize",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f_normalize" "', argument " "1"" of type '" "VecMat::Vec<float,3 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f_normalize" "', argument " "1"" of type '" "VecMat::Vec< float,3 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec<float,3 > &_result_ref = (arg1)->normalize();
-        result = (VecMat::Vec<float,3 > *) &_result_ref;
+        VecMat::Vec< float,3 > &_result_ref = (arg1)->normalize();
+        result = (VecMat::Vec< float,3 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -18583,7 +18443,7 @@ SWIGINTERN PyObject *_wrap_Vec_3f_normalize(PyObject *SWIGUNUSEDPARM(self), PyOb
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_float_3_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -18592,23 +18452,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3f_normalizeSafe(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
-  VecMat::Vec<float,3 > *result = 0 ;
+  VecMat::Vec< float,3 > *arg1 = (VecMat::Vec< float,3 > *) 0 ;
+  VecMat::Vec< float,3 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3f_normalizeSafe",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec<float,3 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec< float,3 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec<float,3 > &_result_ref = (arg1)->normalizeSafe();
-        result = (VecMat::Vec<float,3 > *) &_result_ref;
+        VecMat::Vec< float,3 > &_result_ref = (arg1)->normalizeSafe();
+        result = (VecMat::Vec< float,3 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -18618,7 +18478,7 @@ SWIGINTERN PyObject *_wrap_Vec_3f_normalizeSafe(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_float_3_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -18627,9 +18487,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3f___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
-  VecMat::Vec<float,3 > *arg2 = 0 ;
-  VecMat::Vec<float,3 > result;
+  VecMat::Vec< float,3 > *arg1 = (VecMat::Vec< float,3 > *) 0 ;
+  VecMat::Vec< float,3 > *arg2 = 0 ;
+  VecMat::Vec< float,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -18638,22 +18498,22 @@ SWIGINTERN PyObject *_wrap_Vec_3f___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3f___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___add__" "', argument " "1"" of type '" "VecMat::Vec<float,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___add__" "', argument " "1"" of type '" "VecMat::Vec< float,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_float_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___add__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___add__" "', argument " "2"" of type '" "VecMat::Vec< float,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___add__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___add__" "', argument " "2"" of type '" "VecMat::Vec< float,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec<float,3 > const *)arg1)->operator +((VecMat::Vec<float,3 > const &)*arg2);
+      result = ((VecMat::Vec< float,3 > const *)arg1)->operator +((VecMat::Vec< float,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18662,7 +18522,7 @@ SWIGINTERN PyObject *_wrap_Vec_3f___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<float,3 >(static_cast< const VecMat::Vec<float,3 >& >(result))), SWIGTYPE_p_VecMat__VecTfloat_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< float,3 >(static_cast< const VecMat::Vec< float,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_float_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -18671,9 +18531,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3f___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
-  VecMat::Vec<float,3 > *arg2 = 0 ;
-  VecMat::Vec<float,3 > result;
+  VecMat::Vec< float,3 > *arg1 = (VecMat::Vec< float,3 > *) 0 ;
+  VecMat::Vec< float,3 > *arg2 = 0 ;
+  VecMat::Vec< float,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -18682,22 +18542,22 @@ SWIGINTERN PyObject *_wrap_Vec_3f___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3f___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___sub__" "', argument " "1"" of type '" "VecMat::Vec<float,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___sub__" "', argument " "1"" of type '" "VecMat::Vec< float,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_float_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___sub__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___sub__" "', argument " "2"" of type '" "VecMat::Vec< float,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___sub__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___sub__" "', argument " "2"" of type '" "VecMat::Vec< float,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec<float,3 > const *)arg1)->operator -((VecMat::Vec<float,3 > const &)*arg2);
+      result = ((VecMat::Vec< float,3 > const *)arg1)->operator -((VecMat::Vec< float,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18706,7 +18566,7 @@ SWIGINTERN PyObject *_wrap_Vec_3f___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<float,3 >(static_cast< const VecMat::Vec<float,3 >& >(result))), SWIGTYPE_p_VecMat__VecTfloat_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< float,3 >(static_cast< const VecMat::Vec< float,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_float_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -18715,9 +18575,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3f___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
-  VecMat::Vec<float,3 >::value_type arg2 ;
-  VecMat::Vec<float,3 > result;
+  VecMat::Vec< float,3 > *arg1 = (VecMat::Vec< float,3 > *) 0 ;
+  VecMat::Vec< float,3 >::value_type arg2 ;
+  VecMat::Vec< float,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   float val2 ;
@@ -18726,19 +18586,19 @@ SWIGINTERN PyObject *_wrap_Vec_3f___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3f___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___mul__" "', argument " "1"" of type '" "VecMat::Vec<float,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___mul__" "', argument " "1"" of type '" "VecMat::Vec< float,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3f___mul__" "', argument " "2"" of type '" "VecMat::Vec<float,3 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3f___mul__" "', argument " "2"" of type '" "VecMat::Vec< float,3 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec<float,3 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec< float,3 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec<float,3 > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec< float,3 > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18747,7 +18607,7 @@ SWIGINTERN PyObject *_wrap_Vec_3f___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<float,3 >(static_cast< const VecMat::Vec<float,3 >& >(result))), SWIGTYPE_p_VecMat__VecTfloat_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< float,3 >(static_cast< const VecMat::Vec< float,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_float_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -18756,9 +18616,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3f___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
-  VecMat::Vec<float,3 >::value_type arg2 ;
-  VecMat::Vec<float,3 > result;
+  VecMat::Vec< float,3 > *arg1 = (VecMat::Vec< float,3 > *) 0 ;
+  VecMat::Vec< float,3 >::value_type arg2 ;
+  VecMat::Vec< float,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   float val2 ;
@@ -18767,19 +18627,19 @@ SWIGINTERN PyObject *_wrap_Vec_3f___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3f___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___div__" "', argument " "1"" of type '" "VecMat::Vec<float,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___div__" "', argument " "1"" of type '" "VecMat::Vec< float,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3f___div__" "', argument " "2"" of type '" "VecMat::Vec<float,3 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3f___div__" "', argument " "2"" of type '" "VecMat::Vec< float,3 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec<float,3 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec< float,3 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec<float,3 > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec< float,3 > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18788,7 +18648,7 @@ SWIGINTERN PyObject *_wrap_Vec_3f___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<float,3 >(static_cast< const VecMat::Vec<float,3 >& >(result))), SWIGTYPE_p_VecMat__VecTfloat_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< float,3 >(static_cast< const VecMat::Vec< float,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_float_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -18797,9 +18657,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3f___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
-  VecMat::Vec<float,3 > *arg2 = 0 ;
-  VecMat::Vec<float,3 >::value_type result;
+  VecMat::Vec< float,3 > *arg1 = (VecMat::Vec< float,3 > *) 0 ;
+  VecMat::Vec< float,3 > *arg2 = 0 ;
+  VecMat::Vec< float,3 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -18808,22 +18668,22 @@ SWIGINTERN PyObject *_wrap_Vec_3f___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3f___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___mul__" "', argument " "1"" of type '" "VecMat::Vec<float,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___mul__" "', argument " "1"" of type '" "VecMat::Vec< float,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_float_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___mul__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___mul__" "', argument " "2"" of type '" "VecMat::Vec< float,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___mul__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___mul__" "', argument " "2"" of type '" "VecMat::Vec< float,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp2);
   {
     try {
-      result = (VecMat::Vec<float,3 >::value_type)((VecMat::Vec<float,3 > const *)arg1)->operator *((VecMat::Vec<float,3 > const &)*arg2);
+      result = (VecMat::Vec< float,3 >::value_type)((VecMat::Vec< float,3 > const *)arg1)->operator *((VecMat::Vec< float,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18845,17 +18705,17 @@ SWIGINTERN PyObject *_wrap_Vec_3f___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTfloat_3_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_float_3_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecTfloat_3_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecT_float_3_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec_3f___mul____SWIG_1(self, args);
@@ -18865,7 +18725,7 @@ SWIGINTERN PyObject *_wrap_Vec_3f___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTfloat_3_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_float_3_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -18886,8 +18746,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3f___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
-  VecMat::Vec<float,3 > *arg2 = 0 ;
+  VecMat::Vec< float,3 > *arg1 = (VecMat::Vec< float,3 > *) 0 ;
+  VecMat::Vec< float,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -18897,22 +18757,22 @@ SWIGINTERN PyObject *_wrap_Vec_3f___eq__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3f___eq__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___eq__" "', argument " "1"" of type '" "VecMat::Vec<float,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___eq__" "', argument " "1"" of type '" "VecMat::Vec< float,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_float_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___eq__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___eq__" "', argument " "2"" of type '" "VecMat::Vec< float,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___eq__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___eq__" "', argument " "2"" of type '" "VecMat::Vec< float,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<float,3 > const *)arg1)->operator ==((VecMat::Vec<float,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec< float,3 > const *)arg1)->operator ==((VecMat::Vec< float,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18930,8 +18790,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3f___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
-  VecMat::Vec<float,3 > *arg2 = 0 ;
+  VecMat::Vec< float,3 > *arg1 = (VecMat::Vec< float,3 > *) 0 ;
+  VecMat::Vec< float,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -18941,22 +18801,22 @@ SWIGINTERN PyObject *_wrap_Vec_3f___ne__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3f___ne__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___ne__" "', argument " "1"" of type '" "VecMat::Vec<float,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___ne__" "', argument " "1"" of type '" "VecMat::Vec< float,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_float_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___ne__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___ne__" "', argument " "2"" of type '" "VecMat::Vec< float,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___ne__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___ne__" "', argument " "2"" of type '" "VecMat::Vec< float,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<float,3 > const *)arg1)->operator !=((VecMat::Vec<float,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec< float,3 > const *)arg1)->operator !=((VecMat::Vec< float,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18974,8 +18834,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3f___lt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
-  VecMat::Vec<float,3 > *arg2 = 0 ;
+  VecMat::Vec< float,3 > *arg1 = (VecMat::Vec< float,3 > *) 0 ;
+  VecMat::Vec< float,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -18985,22 +18845,22 @@ SWIGINTERN PyObject *_wrap_Vec_3f___lt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3f___lt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___lt__" "', argument " "1"" of type '" "VecMat::Vec<float,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___lt__" "', argument " "1"" of type '" "VecMat::Vec< float,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_float_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___lt__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___lt__" "', argument " "2"" of type '" "VecMat::Vec< float,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___lt__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___lt__" "', argument " "2"" of type '" "VecMat::Vec< float,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<float,3 > const *)arg1)->operator <((VecMat::Vec<float,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec< float,3 > const *)arg1)->operator <((VecMat::Vec< float,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -19018,8 +18878,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3f___gt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
-  VecMat::Vec<float,3 > *arg2 = 0 ;
+  VecMat::Vec< float,3 > *arg1 = (VecMat::Vec< float,3 > *) 0 ;
+  VecMat::Vec< float,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -19029,22 +18889,22 @@ SWIGINTERN PyObject *_wrap_Vec_3f___gt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3f___gt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___gt__" "', argument " "1"" of type '" "VecMat::Vec<float,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___gt__" "', argument " "1"" of type '" "VecMat::Vec< float,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_float_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___gt__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___gt__" "', argument " "2"" of type '" "VecMat::Vec< float,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___gt__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___gt__" "', argument " "2"" of type '" "VecMat::Vec< float,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<float,3 > const *)arg1)->operator >((VecMat::Vec<float,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec< float,3 > const *)arg1)->operator >((VecMat::Vec< float,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -19062,19 +18922,19 @@ fail:
 
 SWIGINTERN PyObject *Vec_3f_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecTfloat_3_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecT_float_3_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec3u__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<unsigned int > *result = 0 ;
+  VecMat::Vec3< unsigned int > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec3u")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec3<unsigned int > *)new VecMat::Vec3<unsigned int >();
+      result = (VecMat::Vec3< unsigned int > *)new VecMat::Vec3< unsigned int >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -19083,7 +18943,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3u__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -19092,10 +18952,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec3u__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<unsigned int >::value_type arg1 ;
-  VecMat::Vec3<unsigned int >::value_type arg2 ;
-  VecMat::Vec3<unsigned int >::value_type arg3 ;
-  VecMat::Vec3<unsigned int > *result = 0 ;
+  VecMat::Vec3< unsigned int >::value_type arg1 ;
+  VecMat::Vec3< unsigned int >::value_type arg2 ;
+  VecMat::Vec3< unsigned int >::value_type arg3 ;
+  VecMat::Vec3< unsigned int > *result = 0 ;
   unsigned int val1 ;
   int ecode1 = 0 ;
   unsigned int val2 ;
@@ -19109,22 +18969,22 @@ SWIGINTERN PyObject *_wrap_new_Vec3u__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OOO:new_Vec3u",&obj0,&obj1,&obj2)) SWIG_fail;
   ecode1 = SWIG_AsVal_unsigned_SS_int(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3u" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3u" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec3<unsigned int >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec3< unsigned int >::value_type >(val1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3u" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3u" "', argument " "2"" of type '" "VecMat::Vec3< unsigned int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<unsigned int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< unsigned int >::value_type >(val2);
   ecode3 = SWIG_AsVal_unsigned_SS_int(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_Vec3u" "', argument " "3"" of type '" "VecMat::Vec3<unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_Vec3u" "', argument " "3"" of type '" "VecMat::Vec3< unsigned int >::value_type""'");
   } 
-  arg3 = static_cast< VecMat::Vec3<unsigned int >::value_type >(val3);
+  arg3 = static_cast< VecMat::Vec3< unsigned int >::value_type >(val3);
   {
     try {
-      result = (VecMat::Vec3<unsigned int > *)new VecMat::Vec3<unsigned int >(arg1,arg2,arg3);
+      result = (VecMat::Vec3< unsigned int > *)new VecMat::Vec3< unsigned int >(arg1,arg2,arg3);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -19133,7 +18993,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3u__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -19142,9 +19002,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec3u__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<unsigned int >::value_type arg1 ;
-  VecMat::Vec3<unsigned int >::value_type arg2 ;
-  VecMat::Vec3<unsigned int > *result = 0 ;
+  VecMat::Vec3< unsigned int >::value_type arg1 ;
+  VecMat::Vec3< unsigned int >::value_type arg2 ;
+  VecMat::Vec3< unsigned int > *result = 0 ;
   unsigned int val1 ;
   int ecode1 = 0 ;
   unsigned int val2 ;
@@ -19155,17 +19015,17 @@ SWIGINTERN PyObject *_wrap_new_Vec3u__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OO:new_Vec3u",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_unsigned_SS_int(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3u" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3u" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec3<unsigned int >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec3< unsigned int >::value_type >(val1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3u" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3u" "', argument " "2"" of type '" "VecMat::Vec3< unsigned int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<unsigned int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< unsigned int >::value_type >(val2);
   {
     try {
-      result = (VecMat::Vec3<unsigned int > *)new VecMat::Vec3<unsigned int >(arg1,arg2);
+      result = (VecMat::Vec3< unsigned int > *)new VecMat::Vec3< unsigned int >(arg1,arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -19174,7 +19034,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3u__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -19183,8 +19043,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec3u__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<unsigned int >::value_type arg1 ;
-  VecMat::Vec3<unsigned int > *result = 0 ;
+  VecMat::Vec3< unsigned int >::value_type arg1 ;
+  VecMat::Vec3< unsigned int > *result = 0 ;
   unsigned int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -19192,12 +19052,12 @@ SWIGINTERN PyObject *_wrap_new_Vec3u__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"O:new_Vec3u",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_unsigned_SS_int(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3u" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3u" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec3<unsigned int >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec3< unsigned int >::value_type >(val1);
   {
     try {
-      result = (VecMat::Vec3<unsigned int > *)new VecMat::Vec3<unsigned int >(arg1);
+      result = (VecMat::Vec3< unsigned int > *)new VecMat::Vec3< unsigned int >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -19206,7 +19066,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3u__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -19219,7 +19079,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3u(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -19276,28 +19136,33 @@ SWIGINTERN PyObject *_wrap_new_Vec3u(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec3u'.\n  Possible C/C++ prototypes are:\n    VecMat::Vec3<(unsigned int)>()\n    VecMat::Vec3<(unsigned int)>(VecMat::Vec3<unsigned int >::value_type const,VecMat::Vec3<unsigned int >::value_type const,VecMat::Vec3<unsigned int >::value_type const)\n    VecMat::Vec3<(unsigned int)>(VecMat::Vec3<unsigned int >::value_type const,VecMat::Vec3<unsigned int >::value_type const)\n    VecMat::Vec3<(unsigned int)>(VecMat::Vec3<unsigned int >::value_type const)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec3u'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    VecMat::Vec3< unsigned int >()\n"
+    "    VecMat::Vec3< unsigned int >(VecMat::Vec3< unsigned int >::value_type const,VecMat::Vec3< unsigned int >::value_type const,VecMat::Vec3< unsigned int >::value_type const)\n"
+    "    VecMat::Vec3< unsigned int >(VecMat::Vec3< unsigned int >::value_type const,VecMat::Vec3< unsigned int >::value_type const)\n"
+    "    VecMat::Vec3< unsigned int >(VecMat::Vec3< unsigned int >::value_type const)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3u_x__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
-  VecMat::Vec3<unsigned int >::value_type result;
+  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
+  VecMat::Vec3< unsigned int >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3u_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_x" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_x" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
   {
     try {
-      result = (VecMat::Vec3<unsigned int >::value_type)((VecMat::Vec3<unsigned int > const *)arg1)->x();
+      result = (VecMat::Vec3< unsigned int >::value_type)((VecMat::Vec3< unsigned int > const *)arg1)->x();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -19315,23 +19180,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3u_x__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
-  VecMat::Vec3<unsigned int >::value_type *result = 0 ;
+  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
+  VecMat::Vec3< unsigned int >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3u_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_x" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_x" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
   {
     try {
       {
-        VecMat::Vec3<unsigned int >::value_type &_result_ref = (arg1)->x();
-        result = (VecMat::Vec3<unsigned int >::value_type *) &_result_ref;
+        VecMat::Vec3< unsigned int >::value_type &_result_ref = (arg1)->x();
+        result = (VecMat::Vec3< unsigned int >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -19354,14 +19219,14 @@ SWIGINTERN PyObject *_wrap_Vec3u_x(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3u_x__SWIG_0(self, args);
@@ -19370,7 +19235,7 @@ SWIGINTERN PyObject *_wrap_Vec3u_x(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3u_x__SWIG_1(self, args);
@@ -19378,28 +19243,31 @@ SWIGINTERN PyObject *_wrap_Vec3u_x(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3u_x'.\n  Possible C/C++ prototypes are:\n    x()\n    x()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3u_x'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    x(VecMat::Vec3< unsigned int > const *)\n"
+    "    x(VecMat::Vec3< unsigned int > *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3u_y__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
-  VecMat::Vec3<unsigned int >::value_type result;
+  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
+  VecMat::Vec3< unsigned int >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3u_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_y" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_y" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
   {
     try {
-      result = (VecMat::Vec3<unsigned int >::value_type)((VecMat::Vec3<unsigned int > const *)arg1)->y();
+      result = (VecMat::Vec3< unsigned int >::value_type)((VecMat::Vec3< unsigned int > const *)arg1)->y();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -19417,23 +19285,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3u_y__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
-  VecMat::Vec3<unsigned int >::value_type *result = 0 ;
+  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
+  VecMat::Vec3< unsigned int >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3u_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_y" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_y" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
   {
     try {
       {
-        VecMat::Vec3<unsigned int >::value_type &_result_ref = (arg1)->y();
-        result = (VecMat::Vec3<unsigned int >::value_type *) &_result_ref;
+        VecMat::Vec3< unsigned int >::value_type &_result_ref = (arg1)->y();
+        result = (VecMat::Vec3< unsigned int >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -19456,14 +19324,14 @@ SWIGINTERN PyObject *_wrap_Vec3u_y(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3u_y__SWIG_0(self, args);
@@ -19472,7 +19340,7 @@ SWIGINTERN PyObject *_wrap_Vec3u_y(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3u_y__SWIG_1(self, args);
@@ -19480,28 +19348,31 @@ SWIGINTERN PyObject *_wrap_Vec3u_y(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3u_y'.\n  Possible C/C++ prototypes are:\n    y()\n    y()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3u_y'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    y(VecMat::Vec3< unsigned int > const *)\n"
+    "    y(VecMat::Vec3< unsigned int > *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3u_z__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
-  VecMat::Vec3<unsigned int >::value_type result;
+  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
+  VecMat::Vec3< unsigned int >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3u_z",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_z" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_z" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
   {
     try {
-      result = (VecMat::Vec3<unsigned int >::value_type)((VecMat::Vec3<unsigned int > const *)arg1)->z();
+      result = (VecMat::Vec3< unsigned int >::value_type)((VecMat::Vec3< unsigned int > const *)arg1)->z();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -19519,23 +19390,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3u_z__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
-  VecMat::Vec3<unsigned int >::value_type *result = 0 ;
+  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
+  VecMat::Vec3< unsigned int >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3u_z",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_z" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_z" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
   {
     try {
       {
-        VecMat::Vec3<unsigned int >::value_type &_result_ref = (arg1)->z();
-        result = (VecMat::Vec3<unsigned int >::value_type *) &_result_ref;
+        VecMat::Vec3< unsigned int >::value_type &_result_ref = (arg1)->z();
+        result = (VecMat::Vec3< unsigned int >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -19558,14 +19429,14 @@ SWIGINTERN PyObject *_wrap_Vec3u_z(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3u_z__SWIG_0(self, args);
@@ -19574,7 +19445,7 @@ SWIGINTERN PyObject *_wrap_Vec3u_z(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3u_z__SWIG_1(self, args);
@@ -19582,15 +19453,18 @@ SWIGINTERN PyObject *_wrap_Vec3u_z(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3u_z'.\n  Possible C/C++ prototypes are:\n    z()\n    z()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3u_z'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    z(VecMat::Vec3< unsigned int > const *)\n"
+    "    z(VecMat::Vec3< unsigned int > *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3u_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
-  VecMat::Vec3<unsigned int >::value_type arg2 ;
+  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
+  VecMat::Vec3< unsigned int >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned int val2 ;
@@ -19599,16 +19473,16 @@ SWIGINTERN PyObject *_wrap_Vec3u_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3u_setX",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_setX" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_setX" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3u_setX" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3u_setX" "', argument " "2"" of type '" "VecMat::Vec3< unsigned int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<unsigned int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< unsigned int >::value_type >(val2);
   {
     try {
       (arg1)->setX(arg2);
@@ -19629,8 +19503,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3u_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
-  VecMat::Vec3<unsigned int >::value_type arg2 ;
+  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
+  VecMat::Vec3< unsigned int >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned int val2 ;
@@ -19639,16 +19513,16 @@ SWIGINTERN PyObject *_wrap_Vec3u_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3u_setY",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_setY" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_setY" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3u_setY" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3u_setY" "', argument " "2"" of type '" "VecMat::Vec3< unsigned int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<unsigned int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< unsigned int >::value_type >(val2);
   {
     try {
       (arg1)->setY(arg2);
@@ -19669,8 +19543,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3u_setZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
-  VecMat::Vec3<unsigned int >::value_type arg2 ;
+  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
+  VecMat::Vec3< unsigned int >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned int val2 ;
@@ -19679,16 +19553,16 @@ SWIGINTERN PyObject *_wrap_Vec3u_setZ(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3u_setZ",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_setZ" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_setZ" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3u_setZ" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3u_setZ" "', argument " "2"" of type '" "VecMat::Vec3< unsigned int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<unsigned int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< unsigned int >::value_type >(val2);
   {
     try {
       (arg1)->setZ(arg2);
@@ -19709,9 +19583,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3u___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
-  VecMat::Vec3<unsigned int > *arg2 = 0 ;
-  VecMat::Vec3<unsigned int > result;
+  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
+  VecMat::Vec3< unsigned int > *arg2 = 0 ;
+  VecMat::Vec3< unsigned int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -19720,22 +19594,22 @@ SWIGINTERN PyObject *_wrap_Vec3u___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3u___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u___add__" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u___add__" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3u___add__" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3u___add__" "', argument " "2"" of type '" "VecMat::Vec3< unsigned int > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3u___add__" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3u___add__" "', argument " "2"" of type '" "VecMat::Vec3< unsigned int > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec3<unsigned int > const *)arg1)->operator +((VecMat::Vec3<unsigned int > const &)*arg2);
+      result = ((VecMat::Vec3< unsigned int > const *)arg1)->operator +((VecMat::Vec3< unsigned int > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -19744,7 +19618,7 @@ SWIGINTERN PyObject *_wrap_Vec3u___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<unsigned int >(static_cast< const VecMat::Vec3<unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< unsigned int >(static_cast< const VecMat::Vec3< unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -19753,9 +19627,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3u___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
-  VecMat::Vec3<unsigned int > *arg2 = 0 ;
-  VecMat::Vec3<unsigned int > result;
+  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
+  VecMat::Vec3< unsigned int > *arg2 = 0 ;
+  VecMat::Vec3< unsigned int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -19764,22 +19638,22 @@ SWIGINTERN PyObject *_wrap_Vec3u___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3u___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u___sub__" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u___sub__" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3u___sub__" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3u___sub__" "', argument " "2"" of type '" "VecMat::Vec3< unsigned int > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3u___sub__" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3u___sub__" "', argument " "2"" of type '" "VecMat::Vec3< unsigned int > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec3<unsigned int > const *)arg1)->operator -((VecMat::Vec3<unsigned int > const &)*arg2);
+      result = ((VecMat::Vec3< unsigned int > const *)arg1)->operator -((VecMat::Vec3< unsigned int > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -19788,7 +19662,7 @@ SWIGINTERN PyObject *_wrap_Vec3u___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<unsigned int >(static_cast< const VecMat::Vec3<unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< unsigned int >(static_cast< const VecMat::Vec3< unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -19797,9 +19671,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3u___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
-  VecMat::Vec3<unsigned int >::value_type arg2 ;
-  VecMat::Vec3<unsigned int > result;
+  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
+  VecMat::Vec3< unsigned int >::value_type arg2 ;
+  VecMat::Vec3< unsigned int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned int val2 ;
@@ -19808,19 +19682,19 @@ SWIGINTERN PyObject *_wrap_Vec3u___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3u___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u___mul__" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u___mul__" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3u___mul__" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3u___mul__" "', argument " "2"" of type '" "VecMat::Vec3< unsigned int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<unsigned int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< unsigned int >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec3<unsigned int > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec3< unsigned int > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -19829,7 +19703,7 @@ SWIGINTERN PyObject *_wrap_Vec3u___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<unsigned int >(static_cast< const VecMat::Vec3<unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< unsigned int >(static_cast< const VecMat::Vec3< unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -19838,9 +19712,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3u___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
-  VecMat::Vec3<unsigned int >::value_type arg2 ;
-  VecMat::Vec3<unsigned int > result;
+  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
+  VecMat::Vec3< unsigned int >::value_type arg2 ;
+  VecMat::Vec3< unsigned int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned int val2 ;
@@ -19849,19 +19723,19 @@ SWIGINTERN PyObject *_wrap_Vec3u___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3u___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u___div__" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u___div__" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3u___div__" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3u___div__" "', argument " "2"" of type '" "VecMat::Vec3< unsigned int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<unsigned int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< unsigned int >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec3<unsigned int > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec3< unsigned int > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -19870,7 +19744,7 @@ SWIGINTERN PyObject *_wrap_Vec3u___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<unsigned int >(static_cast< const VecMat::Vec3<unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< unsigned int >(static_cast< const VecMat::Vec3< unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -19879,9 +19753,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3u___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
-  VecMat::Vec3<unsigned int > *arg2 = 0 ;
-  VecMat::Vec3<unsigned int >::value_type result;
+  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
+  VecMat::Vec3< unsigned int > *arg2 = 0 ;
+  VecMat::Vec3< unsigned int >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -19890,22 +19764,22 @@ SWIGINTERN PyObject *_wrap_Vec3u___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3u___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u___mul__" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u___mul__" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3u___mul__" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3u___mul__" "', argument " "2"" of type '" "VecMat::Vec3< unsigned int > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3u___mul__" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3u___mul__" "', argument " "2"" of type '" "VecMat::Vec3< unsigned int > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp2);
   {
     try {
-      result = (VecMat::Vec3<unsigned int >::value_type)((VecMat::Vec3<unsigned int > const *)arg1)->operator *((VecMat::Vec3<unsigned int > const &)*arg2);
+      result = (VecMat::Vec3< unsigned int >::value_type)((VecMat::Vec3< unsigned int > const *)arg1)->operator *((VecMat::Vec3< unsigned int > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -19927,17 +19801,17 @@ SWIGINTERN PyObject *_wrap_Vec3u___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec3u___mul____SWIG_1(self, args);
@@ -19947,7 +19821,7 @@ SWIGINTERN PyObject *_wrap_Vec3u___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -19968,9 +19842,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3u___xor__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
-  VecMat::Vec3<unsigned int > *arg2 = 0 ;
-  VecMat::Vec3<unsigned int > result;
+  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
+  VecMat::Vec3< unsigned int > *arg2 = 0 ;
+  VecMat::Vec3< unsigned int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -19979,22 +19853,22 @@ SWIGINTERN PyObject *_wrap_Vec3u___xor__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3u___xor__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u___xor__" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u___xor__" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3u___xor__" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3u___xor__" "', argument " "2"" of type '" "VecMat::Vec3< unsigned int > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3u___xor__" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3u___xor__" "', argument " "2"" of type '" "VecMat::Vec3< unsigned int > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec3<unsigned int > const *)arg1)->operator ^((VecMat::Vec3<unsigned int > const &)*arg2);
+      result = ((VecMat::Vec3< unsigned int > const *)arg1)->operator ^((VecMat::Vec3< unsigned int > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -20003,7 +19877,7 @@ SWIGINTERN PyObject *_wrap_Vec3u___xor__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<unsigned int >(static_cast< const VecMat::Vec3<unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< unsigned int >(static_cast< const VecMat::Vec3< unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -20012,17 +19886,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec3u(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
+  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec3u",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec3u" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec3u" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
   {
     try {
       delete arg1;
@@ -20044,19 +19918,19 @@ fail:
 
 SWIGINTERN PyObject *Vec3u_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec3i__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<int > *result = 0 ;
+  VecMat::Vec3< int > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec3i")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec3<int > *)new VecMat::Vec3<int >();
+      result = (VecMat::Vec3< int > *)new VecMat::Vec3< int >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -20065,7 +19939,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3i__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tint_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_int_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -20074,10 +19948,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec3i__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<int >::value_type arg1 ;
-  VecMat::Vec3<int >::value_type arg2 ;
-  VecMat::Vec3<int >::value_type arg3 ;
-  VecMat::Vec3<int > *result = 0 ;
+  VecMat::Vec3< int >::value_type arg1 ;
+  VecMat::Vec3< int >::value_type arg2 ;
+  VecMat::Vec3< int >::value_type arg3 ;
+  VecMat::Vec3< int > *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -20091,22 +19965,22 @@ SWIGINTERN PyObject *_wrap_new_Vec3i__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OOO:new_Vec3i",&obj0,&obj1,&obj2)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3i" "', argument " "1"" of type '" "VecMat::Vec3<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3i" "', argument " "1"" of type '" "VecMat::Vec3< int >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec3<int >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec3< int >::value_type >(val1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3i" "', argument " "2"" of type '" "VecMat::Vec3<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3i" "', argument " "2"" of type '" "VecMat::Vec3< int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< int >::value_type >(val2);
   ecode3 = SWIG_AsVal_int(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_Vec3i" "', argument " "3"" of type '" "VecMat::Vec3<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_Vec3i" "', argument " "3"" of type '" "VecMat::Vec3< int >::value_type""'");
   } 
-  arg3 = static_cast< VecMat::Vec3<int >::value_type >(val3);
+  arg3 = static_cast< VecMat::Vec3< int >::value_type >(val3);
   {
     try {
-      result = (VecMat::Vec3<int > *)new VecMat::Vec3<int >(arg1,arg2,arg3);
+      result = (VecMat::Vec3< int > *)new VecMat::Vec3< int >(arg1,arg2,arg3);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -20115,7 +19989,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3i__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tint_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_int_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -20124,9 +19998,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec3i__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<int >::value_type arg1 ;
-  VecMat::Vec3<int >::value_type arg2 ;
-  VecMat::Vec3<int > *result = 0 ;
+  VecMat::Vec3< int >::value_type arg1 ;
+  VecMat::Vec3< int >::value_type arg2 ;
+  VecMat::Vec3< int > *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -20137,17 +20011,17 @@ SWIGINTERN PyObject *_wrap_new_Vec3i__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OO:new_Vec3i",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3i" "', argument " "1"" of type '" "VecMat::Vec3<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3i" "', argument " "1"" of type '" "VecMat::Vec3< int >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec3<int >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec3< int >::value_type >(val1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3i" "', argument " "2"" of type '" "VecMat::Vec3<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3i" "', argument " "2"" of type '" "VecMat::Vec3< int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< int >::value_type >(val2);
   {
     try {
-      result = (VecMat::Vec3<int > *)new VecMat::Vec3<int >(arg1,arg2);
+      result = (VecMat::Vec3< int > *)new VecMat::Vec3< int >(arg1,arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -20156,7 +20030,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3i__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tint_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_int_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -20165,8 +20039,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec3i__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<int >::value_type arg1 ;
-  VecMat::Vec3<int > *result = 0 ;
+  VecMat::Vec3< int >::value_type arg1 ;
+  VecMat::Vec3< int > *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -20174,12 +20048,12 @@ SWIGINTERN PyObject *_wrap_new_Vec3i__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"O:new_Vec3i",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3i" "', argument " "1"" of type '" "VecMat::Vec3<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3i" "', argument " "1"" of type '" "VecMat::Vec3< int >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec3<int >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec3< int >::value_type >(val1);
   {
     try {
-      result = (VecMat::Vec3<int > *)new VecMat::Vec3<int >(arg1);
+      result = (VecMat::Vec3< int > *)new VecMat::Vec3< int >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -20188,7 +20062,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3i__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tint_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_int_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -20201,7 +20075,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3i(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -20258,28 +20132,33 @@ SWIGINTERN PyObject *_wrap_new_Vec3i(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec3i'.\n  Possible C/C++ prototypes are:\n    VecMat::Vec3<(int)>()\n    VecMat::Vec3<(int)>(VecMat::Vec3<int >::value_type const,VecMat::Vec3<int >::value_type const,VecMat::Vec3<int >::value_type const)\n    VecMat::Vec3<(int)>(VecMat::Vec3<int >::value_type const,VecMat::Vec3<int >::value_type const)\n    VecMat::Vec3<(int)>(VecMat::Vec3<int >::value_type const)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec3i'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    VecMat::Vec3< int >()\n"
+    "    VecMat::Vec3< int >(VecMat::Vec3< int >::value_type const,VecMat::Vec3< int >::value_type const,VecMat::Vec3< int >::value_type const)\n"
+    "    VecMat::Vec3< int >(VecMat::Vec3< int >::value_type const,VecMat::Vec3< int >::value_type const)\n"
+    "    VecMat::Vec3< int >(VecMat::Vec3< int >::value_type const)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3i_x__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
-  VecMat::Vec3<int >::value_type result;
+  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
+  VecMat::Vec3< int >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3i_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_x" "', argument " "1"" of type '" "VecMat::Vec3<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_x" "', argument " "1"" of type '" "VecMat::Vec3< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
   {
     try {
-      result = (VecMat::Vec3<int >::value_type)((VecMat::Vec3<int > const *)arg1)->x();
+      result = (VecMat::Vec3< int >::value_type)((VecMat::Vec3< int > const *)arg1)->x();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -20297,23 +20176,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3i_x__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
-  VecMat::Vec3<int >::value_type *result = 0 ;
+  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
+  VecMat::Vec3< int >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3i_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_x" "', argument " "1"" of type '" "VecMat::Vec3<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_x" "', argument " "1"" of type '" "VecMat::Vec3< int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
   {
     try {
       {
-        VecMat::Vec3<int >::value_type &_result_ref = (arg1)->x();
-        result = (VecMat::Vec3<int >::value_type *) &_result_ref;
+        VecMat::Vec3< int >::value_type &_result_ref = (arg1)->x();
+        result = (VecMat::Vec3< int >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -20336,14 +20215,14 @@ SWIGINTERN PyObject *_wrap_Vec3i_x(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tint_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3i_x__SWIG_0(self, args);
@@ -20352,7 +20231,7 @@ SWIGINTERN PyObject *_wrap_Vec3i_x(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tint_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3i_x__SWIG_1(self, args);
@@ -20360,28 +20239,31 @@ SWIGINTERN PyObject *_wrap_Vec3i_x(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3i_x'.\n  Possible C/C++ prototypes are:\n    x()\n    x()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3i_x'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    x(VecMat::Vec3< int > const *)\n"
+    "    x(VecMat::Vec3< int > *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3i_y__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
-  VecMat::Vec3<int >::value_type result;
+  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
+  VecMat::Vec3< int >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3i_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_y" "', argument " "1"" of type '" "VecMat::Vec3<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_y" "', argument " "1"" of type '" "VecMat::Vec3< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
   {
     try {
-      result = (VecMat::Vec3<int >::value_type)((VecMat::Vec3<int > const *)arg1)->y();
+      result = (VecMat::Vec3< int >::value_type)((VecMat::Vec3< int > const *)arg1)->y();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -20399,23 +20281,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3i_y__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
-  VecMat::Vec3<int >::value_type *result = 0 ;
+  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
+  VecMat::Vec3< int >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3i_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_y" "', argument " "1"" of type '" "VecMat::Vec3<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_y" "', argument " "1"" of type '" "VecMat::Vec3< int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
   {
     try {
       {
-        VecMat::Vec3<int >::value_type &_result_ref = (arg1)->y();
-        result = (VecMat::Vec3<int >::value_type *) &_result_ref;
+        VecMat::Vec3< int >::value_type &_result_ref = (arg1)->y();
+        result = (VecMat::Vec3< int >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -20438,14 +20320,14 @@ SWIGINTERN PyObject *_wrap_Vec3i_y(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tint_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3i_y__SWIG_0(self, args);
@@ -20454,7 +20336,7 @@ SWIGINTERN PyObject *_wrap_Vec3i_y(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tint_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3i_y__SWIG_1(self, args);
@@ -20462,28 +20344,31 @@ SWIGINTERN PyObject *_wrap_Vec3i_y(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3i_y'.\n  Possible C/C++ prototypes are:\n    y()\n    y()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3i_y'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    y(VecMat::Vec3< int > const *)\n"
+    "    y(VecMat::Vec3< int > *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3i_z__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
-  VecMat::Vec3<int >::value_type result;
+  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
+  VecMat::Vec3< int >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3i_z",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_z" "', argument " "1"" of type '" "VecMat::Vec3<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_z" "', argument " "1"" of type '" "VecMat::Vec3< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
   {
     try {
-      result = (VecMat::Vec3<int >::value_type)((VecMat::Vec3<int > const *)arg1)->z();
+      result = (VecMat::Vec3< int >::value_type)((VecMat::Vec3< int > const *)arg1)->z();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -20501,23 +20386,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3i_z__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
-  VecMat::Vec3<int >::value_type *result = 0 ;
+  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
+  VecMat::Vec3< int >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3i_z",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_z" "', argument " "1"" of type '" "VecMat::Vec3<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_z" "', argument " "1"" of type '" "VecMat::Vec3< int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
   {
     try {
       {
-        VecMat::Vec3<int >::value_type &_result_ref = (arg1)->z();
-        result = (VecMat::Vec3<int >::value_type *) &_result_ref;
+        VecMat::Vec3< int >::value_type &_result_ref = (arg1)->z();
+        result = (VecMat::Vec3< int >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -20540,14 +20425,14 @@ SWIGINTERN PyObject *_wrap_Vec3i_z(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tint_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3i_z__SWIG_0(self, args);
@@ -20556,7 +20441,7 @@ SWIGINTERN PyObject *_wrap_Vec3i_z(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tint_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3i_z__SWIG_1(self, args);
@@ -20564,15 +20449,18 @@ SWIGINTERN PyObject *_wrap_Vec3i_z(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3i_z'.\n  Possible C/C++ prototypes are:\n    z()\n    z()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3i_z'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    z(VecMat::Vec3< int > const *)\n"
+    "    z(VecMat::Vec3< int > *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3i_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
-  VecMat::Vec3<int >::value_type arg2 ;
+  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
+  VecMat::Vec3< int >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -20581,16 +20469,16 @@ SWIGINTERN PyObject *_wrap_Vec3i_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3i_setX",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_setX" "', argument " "1"" of type '" "VecMat::Vec3<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_setX" "', argument " "1"" of type '" "VecMat::Vec3< int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3i_setX" "', argument " "2"" of type '" "VecMat::Vec3<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3i_setX" "', argument " "2"" of type '" "VecMat::Vec3< int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< int >::value_type >(val2);
   {
     try {
       (arg1)->setX(arg2);
@@ -20611,8 +20499,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3i_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
-  VecMat::Vec3<int >::value_type arg2 ;
+  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
+  VecMat::Vec3< int >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -20621,16 +20509,16 @@ SWIGINTERN PyObject *_wrap_Vec3i_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3i_setY",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_setY" "', argument " "1"" of type '" "VecMat::Vec3<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_setY" "', argument " "1"" of type '" "VecMat::Vec3< int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3i_setY" "', argument " "2"" of type '" "VecMat::Vec3<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3i_setY" "', argument " "2"" of type '" "VecMat::Vec3< int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< int >::value_type >(val2);
   {
     try {
       (arg1)->setY(arg2);
@@ -20651,8 +20539,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3i_setZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
-  VecMat::Vec3<int >::value_type arg2 ;
+  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
+  VecMat::Vec3< int >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -20661,16 +20549,16 @@ SWIGINTERN PyObject *_wrap_Vec3i_setZ(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3i_setZ",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_setZ" "', argument " "1"" of type '" "VecMat::Vec3<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_setZ" "', argument " "1"" of type '" "VecMat::Vec3< int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3i_setZ" "', argument " "2"" of type '" "VecMat::Vec3<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3i_setZ" "', argument " "2"" of type '" "VecMat::Vec3< int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< int >::value_type >(val2);
   {
     try {
       (arg1)->setZ(arg2);
@@ -20691,9 +20579,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3i___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
-  VecMat::Vec3<int > *arg2 = 0 ;
-  VecMat::Vec3<int > result;
+  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
+  VecMat::Vec3< int > *arg2 = 0 ;
+  VecMat::Vec3< int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -20702,22 +20590,22 @@ SWIGINTERN PyObject *_wrap_Vec3i___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3i___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i___add__" "', argument " "1"" of type '" "VecMat::Vec3<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i___add__" "', argument " "1"" of type '" "VecMat::Vec3< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tint_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_int_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3i___add__" "', argument " "2"" of type '" "VecMat::Vec3<int > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3i___add__" "', argument " "2"" of type '" "VecMat::Vec3< int > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3i___add__" "', argument " "2"" of type '" "VecMat::Vec3<int > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3i___add__" "', argument " "2"" of type '" "VecMat::Vec3< int > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3<int > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3< int > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec3<int > const *)arg1)->operator +((VecMat::Vec3<int > const &)*arg2);
+      result = ((VecMat::Vec3< int > const *)arg1)->operator +((VecMat::Vec3< int > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -20726,7 +20614,7 @@ SWIGINTERN PyObject *_wrap_Vec3i___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<int >(static_cast< const VecMat::Vec3<int >& >(result))), SWIGTYPE_p_VecMat__Vec3Tint_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< int >(static_cast< const VecMat::Vec3< int >& >(result))), SWIGTYPE_p_VecMat__Vec3T_int_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -20735,9 +20623,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3i___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
-  VecMat::Vec3<int > *arg2 = 0 ;
-  VecMat::Vec3<int > result;
+  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
+  VecMat::Vec3< int > *arg2 = 0 ;
+  VecMat::Vec3< int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -20746,22 +20634,22 @@ SWIGINTERN PyObject *_wrap_Vec3i___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3i___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i___sub__" "', argument " "1"" of type '" "VecMat::Vec3<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i___sub__" "', argument " "1"" of type '" "VecMat::Vec3< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tint_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_int_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3i___sub__" "', argument " "2"" of type '" "VecMat::Vec3<int > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3i___sub__" "', argument " "2"" of type '" "VecMat::Vec3< int > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3i___sub__" "', argument " "2"" of type '" "VecMat::Vec3<int > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3i___sub__" "', argument " "2"" of type '" "VecMat::Vec3< int > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3<int > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3< int > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec3<int > const *)arg1)->operator -((VecMat::Vec3<int > const &)*arg2);
+      result = ((VecMat::Vec3< int > const *)arg1)->operator -((VecMat::Vec3< int > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -20770,7 +20658,7 @@ SWIGINTERN PyObject *_wrap_Vec3i___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<int >(static_cast< const VecMat::Vec3<int >& >(result))), SWIGTYPE_p_VecMat__Vec3Tint_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< int >(static_cast< const VecMat::Vec3< int >& >(result))), SWIGTYPE_p_VecMat__Vec3T_int_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -20779,9 +20667,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3i___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
-  VecMat::Vec3<int >::value_type arg2 ;
-  VecMat::Vec3<int > result;
+  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
+  VecMat::Vec3< int >::value_type arg2 ;
+  VecMat::Vec3< int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -20790,19 +20678,19 @@ SWIGINTERN PyObject *_wrap_Vec3i___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3i___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i___mul__" "', argument " "1"" of type '" "VecMat::Vec3<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i___mul__" "', argument " "1"" of type '" "VecMat::Vec3< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3i___mul__" "', argument " "2"" of type '" "VecMat::Vec3<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3i___mul__" "', argument " "2"" of type '" "VecMat::Vec3< int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< int >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec3<int > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec3< int > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -20811,7 +20699,7 @@ SWIGINTERN PyObject *_wrap_Vec3i___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<int >(static_cast< const VecMat::Vec3<int >& >(result))), SWIGTYPE_p_VecMat__Vec3Tint_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< int >(static_cast< const VecMat::Vec3< int >& >(result))), SWIGTYPE_p_VecMat__Vec3T_int_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -20820,9 +20708,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3i___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
-  VecMat::Vec3<int >::value_type arg2 ;
-  VecMat::Vec3<int > result;
+  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
+  VecMat::Vec3< int >::value_type arg2 ;
+  VecMat::Vec3< int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -20831,19 +20719,19 @@ SWIGINTERN PyObject *_wrap_Vec3i___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3i___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i___div__" "', argument " "1"" of type '" "VecMat::Vec3<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i___div__" "', argument " "1"" of type '" "VecMat::Vec3< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3i___div__" "', argument " "2"" of type '" "VecMat::Vec3<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3i___div__" "', argument " "2"" of type '" "VecMat::Vec3< int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< int >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec3<int > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec3< int > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -20852,7 +20740,7 @@ SWIGINTERN PyObject *_wrap_Vec3i___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<int >(static_cast< const VecMat::Vec3<int >& >(result))), SWIGTYPE_p_VecMat__Vec3Tint_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< int >(static_cast< const VecMat::Vec3< int >& >(result))), SWIGTYPE_p_VecMat__Vec3T_int_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -20861,9 +20749,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3i___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
-  VecMat::Vec3<int > *arg2 = 0 ;
-  VecMat::Vec3<int >::value_type result;
+  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
+  VecMat::Vec3< int > *arg2 = 0 ;
+  VecMat::Vec3< int >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -20872,22 +20760,22 @@ SWIGINTERN PyObject *_wrap_Vec3i___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3i___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i___mul__" "', argument " "1"" of type '" "VecMat::Vec3<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i___mul__" "', argument " "1"" of type '" "VecMat::Vec3< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tint_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_int_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3i___mul__" "', argument " "2"" of type '" "VecMat::Vec3<int > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3i___mul__" "', argument " "2"" of type '" "VecMat::Vec3< int > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3i___mul__" "', argument " "2"" of type '" "VecMat::Vec3<int > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3i___mul__" "', argument " "2"" of type '" "VecMat::Vec3< int > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3<int > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3< int > * >(argp2);
   {
     try {
-      result = (VecMat::Vec3<int >::value_type)((VecMat::Vec3<int > const *)arg1)->operator *((VecMat::Vec3<int > const &)*arg2);
+      result = (VecMat::Vec3< int >::value_type)((VecMat::Vec3< int > const *)arg1)->operator *((VecMat::Vec3< int > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -20909,17 +20797,17 @@ SWIGINTERN PyObject *_wrap_Vec3i___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tint_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec3Tint_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec3T_int_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec3i___mul____SWIG_1(self, args);
@@ -20929,7 +20817,7 @@ SWIGINTERN PyObject *_wrap_Vec3i___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tint_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -20950,9 +20838,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3i___xor__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
-  VecMat::Vec3<int > *arg2 = 0 ;
-  VecMat::Vec3<int > result;
+  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
+  VecMat::Vec3< int > *arg2 = 0 ;
+  VecMat::Vec3< int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -20961,22 +20849,22 @@ SWIGINTERN PyObject *_wrap_Vec3i___xor__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3i___xor__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i___xor__" "', argument " "1"" of type '" "VecMat::Vec3<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i___xor__" "', argument " "1"" of type '" "VecMat::Vec3< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tint_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_int_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3i___xor__" "', argument " "2"" of type '" "VecMat::Vec3<int > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3i___xor__" "', argument " "2"" of type '" "VecMat::Vec3< int > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3i___xor__" "', argument " "2"" of type '" "VecMat::Vec3<int > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3i___xor__" "', argument " "2"" of type '" "VecMat::Vec3< int > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3<int > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3< int > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec3<int > const *)arg1)->operator ^((VecMat::Vec3<int > const &)*arg2);
+      result = ((VecMat::Vec3< int > const *)arg1)->operator ^((VecMat::Vec3< int > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -20985,7 +20873,7 @@ SWIGINTERN PyObject *_wrap_Vec3i___xor__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<int >(static_cast< const VecMat::Vec3<int >& >(result))), SWIGTYPE_p_VecMat__Vec3Tint_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< int >(static_cast< const VecMat::Vec3< int >& >(result))), SWIGTYPE_p_VecMat__Vec3T_int_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -20994,17 +20882,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec3i(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
+  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec3i",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec3i" "', argument " "1"" of type '" "VecMat::Vec3<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec3i" "', argument " "1"" of type '" "VecMat::Vec3< int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
   {
     try {
       delete arg1;
@@ -21026,19 +20914,19 @@ fail:
 
 SWIGINTERN PyObject *Vec3i_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec3Tint_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec3T_int_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec3f__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<float > *result = 0 ;
+  VecMat::Vec3< float > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec3f")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec3<float > *)new VecMat::Vec3<float >();
+      result = (VecMat::Vec3< float > *)new VecMat::Vec3< float >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -21047,7 +20935,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3f__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -21056,10 +20944,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec3f__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<float >::value_type arg1 ;
-  VecMat::Vec3<float >::value_type arg2 ;
-  VecMat::Vec3<float >::value_type arg3 ;
-  VecMat::Vec3<float > *result = 0 ;
+  VecMat::Vec3< float >::value_type arg1 ;
+  VecMat::Vec3< float >::value_type arg2 ;
+  VecMat::Vec3< float >::value_type arg3 ;
+  VecMat::Vec3< float > *result = 0 ;
   float val1 ;
   int ecode1 = 0 ;
   float val2 ;
@@ -21073,22 +20961,22 @@ SWIGINTERN PyObject *_wrap_new_Vec3f__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OOO:new_Vec3f",&obj0,&obj1,&obj2)) SWIG_fail;
   ecode1 = SWIG_AsVal_float(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3f" "', argument " "1"" of type '" "VecMat::Vec3<float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3f" "', argument " "1"" of type '" "VecMat::Vec3< float >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec3<float >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec3< float >::value_type >(val1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3f" "', argument " "2"" of type '" "VecMat::Vec3<float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3f" "', argument " "2"" of type '" "VecMat::Vec3< float >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<float >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< float >::value_type >(val2);
   ecode3 = SWIG_AsVal_float(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_Vec3f" "', argument " "3"" of type '" "VecMat::Vec3<float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_Vec3f" "', argument " "3"" of type '" "VecMat::Vec3< float >::value_type""'");
   } 
-  arg3 = static_cast< VecMat::Vec3<float >::value_type >(val3);
+  arg3 = static_cast< VecMat::Vec3< float >::value_type >(val3);
   {
     try {
-      result = (VecMat::Vec3<float > *)new VecMat::Vec3<float >(arg1,arg2,arg3);
+      result = (VecMat::Vec3< float > *)new VecMat::Vec3< float >(arg1,arg2,arg3);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -21097,7 +20985,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3f__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -21106,9 +20994,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec3f__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<float >::value_type arg1 ;
-  VecMat::Vec3<float >::value_type arg2 ;
-  VecMat::Vec3<float > *result = 0 ;
+  VecMat::Vec3< float >::value_type arg1 ;
+  VecMat::Vec3< float >::value_type arg2 ;
+  VecMat::Vec3< float > *result = 0 ;
   float val1 ;
   int ecode1 = 0 ;
   float val2 ;
@@ -21119,17 +21007,17 @@ SWIGINTERN PyObject *_wrap_new_Vec3f__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OO:new_Vec3f",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_float(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3f" "', argument " "1"" of type '" "VecMat::Vec3<float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3f" "', argument " "1"" of type '" "VecMat::Vec3< float >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec3<float >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec3< float >::value_type >(val1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3f" "', argument " "2"" of type '" "VecMat::Vec3<float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3f" "', argument " "2"" of type '" "VecMat::Vec3< float >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<float >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< float >::value_type >(val2);
   {
     try {
-      result = (VecMat::Vec3<float > *)new VecMat::Vec3<float >(arg1,arg2);
+      result = (VecMat::Vec3< float > *)new VecMat::Vec3< float >(arg1,arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -21138,7 +21026,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3f__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -21147,8 +21035,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec3f__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<float >::value_type arg1 ;
-  VecMat::Vec3<float > *result = 0 ;
+  VecMat::Vec3< float >::value_type arg1 ;
+  VecMat::Vec3< float > *result = 0 ;
   float val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -21156,12 +21044,12 @@ SWIGINTERN PyObject *_wrap_new_Vec3f__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"O:new_Vec3f",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_float(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3f" "', argument " "1"" of type '" "VecMat::Vec3<float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3f" "', argument " "1"" of type '" "VecMat::Vec3< float >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec3<float >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec3< float >::value_type >(val1);
   {
     try {
-      result = (VecMat::Vec3<float > *)new VecMat::Vec3<float >(arg1);
+      result = (VecMat::Vec3< float > *)new VecMat::Vec3< float >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -21170,7 +21058,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3f__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -21183,7 +21071,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3f(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -21240,28 +21128,33 @@ SWIGINTERN PyObject *_wrap_new_Vec3f(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec3f'.\n  Possible C/C++ prototypes are:\n    VecMat::Vec3<(float)>()\n    VecMat::Vec3<(float)>(VecMat::Vec3<float >::value_type const,VecMat::Vec3<float >::value_type const,VecMat::Vec3<float >::value_type const)\n    VecMat::Vec3<(float)>(VecMat::Vec3<float >::value_type const,VecMat::Vec3<float >::value_type const)\n    VecMat::Vec3<(float)>(VecMat::Vec3<float >::value_type const)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec3f'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    VecMat::Vec3< float >()\n"
+    "    VecMat::Vec3< float >(VecMat::Vec3< float >::value_type const,VecMat::Vec3< float >::value_type const,VecMat::Vec3< float >::value_type const)\n"
+    "    VecMat::Vec3< float >(VecMat::Vec3< float >::value_type const,VecMat::Vec3< float >::value_type const)\n"
+    "    VecMat::Vec3< float >(VecMat::Vec3< float >::value_type const)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3f_x__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
-  VecMat::Vec3<float >::value_type result;
+  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
+  VecMat::Vec3< float >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3f_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_x" "', argument " "1"" of type '" "VecMat::Vec3<float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_x" "', argument " "1"" of type '" "VecMat::Vec3< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
   {
     try {
-      result = (VecMat::Vec3<float >::value_type)((VecMat::Vec3<float > const *)arg1)->x();
+      result = (VecMat::Vec3< float >::value_type)((VecMat::Vec3< float > const *)arg1)->x();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -21279,23 +21172,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3f_x__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
-  VecMat::Vec3<float >::value_type *result = 0 ;
+  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
+  VecMat::Vec3< float >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3f_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_x" "', argument " "1"" of type '" "VecMat::Vec3<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_x" "', argument " "1"" of type '" "VecMat::Vec3< float > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
   {
     try {
       {
-        VecMat::Vec3<float >::value_type &_result_ref = (arg1)->x();
-        result = (VecMat::Vec3<float >::value_type *) &_result_ref;
+        VecMat::Vec3< float >::value_type &_result_ref = (arg1)->x();
+        result = (VecMat::Vec3< float >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -21318,14 +21211,14 @@ SWIGINTERN PyObject *_wrap_Vec3f_x(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_float_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3f_x__SWIG_0(self, args);
@@ -21334,7 +21227,7 @@ SWIGINTERN PyObject *_wrap_Vec3f_x(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_float_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3f_x__SWIG_1(self, args);
@@ -21342,28 +21235,31 @@ SWIGINTERN PyObject *_wrap_Vec3f_x(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3f_x'.\n  Possible C/C++ prototypes are:\n    x()\n    x()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3f_x'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    x(VecMat::Vec3< float > const *)\n"
+    "    x(VecMat::Vec3< float > *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3f_y__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
-  VecMat::Vec3<float >::value_type result;
+  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
+  VecMat::Vec3< float >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3f_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_y" "', argument " "1"" of type '" "VecMat::Vec3<float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_y" "', argument " "1"" of type '" "VecMat::Vec3< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
   {
     try {
-      result = (VecMat::Vec3<float >::value_type)((VecMat::Vec3<float > const *)arg1)->y();
+      result = (VecMat::Vec3< float >::value_type)((VecMat::Vec3< float > const *)arg1)->y();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -21381,23 +21277,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3f_y__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
-  VecMat::Vec3<float >::value_type *result = 0 ;
+  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
+  VecMat::Vec3< float >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3f_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_y" "', argument " "1"" of type '" "VecMat::Vec3<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_y" "', argument " "1"" of type '" "VecMat::Vec3< float > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
   {
     try {
       {
-        VecMat::Vec3<float >::value_type &_result_ref = (arg1)->y();
-        result = (VecMat::Vec3<float >::value_type *) &_result_ref;
+        VecMat::Vec3< float >::value_type &_result_ref = (arg1)->y();
+        result = (VecMat::Vec3< float >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -21420,14 +21316,14 @@ SWIGINTERN PyObject *_wrap_Vec3f_y(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_float_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3f_y__SWIG_0(self, args);
@@ -21436,7 +21332,7 @@ SWIGINTERN PyObject *_wrap_Vec3f_y(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_float_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3f_y__SWIG_1(self, args);
@@ -21444,28 +21340,31 @@ SWIGINTERN PyObject *_wrap_Vec3f_y(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3f_y'.\n  Possible C/C++ prototypes are:\n    y()\n    y()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3f_y'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    y(VecMat::Vec3< float > const *)\n"
+    "    y(VecMat::Vec3< float > *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3f_z__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
-  VecMat::Vec3<float >::value_type result;
+  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
+  VecMat::Vec3< float >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3f_z",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_z" "', argument " "1"" of type '" "VecMat::Vec3<float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_z" "', argument " "1"" of type '" "VecMat::Vec3< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
   {
     try {
-      result = (VecMat::Vec3<float >::value_type)((VecMat::Vec3<float > const *)arg1)->z();
+      result = (VecMat::Vec3< float >::value_type)((VecMat::Vec3< float > const *)arg1)->z();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -21483,23 +21382,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3f_z__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
-  VecMat::Vec3<float >::value_type *result = 0 ;
+  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
+  VecMat::Vec3< float >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3f_z",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_z" "', argument " "1"" of type '" "VecMat::Vec3<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_z" "', argument " "1"" of type '" "VecMat::Vec3< float > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
   {
     try {
       {
-        VecMat::Vec3<float >::value_type &_result_ref = (arg1)->z();
-        result = (VecMat::Vec3<float >::value_type *) &_result_ref;
+        VecMat::Vec3< float >::value_type &_result_ref = (arg1)->z();
+        result = (VecMat::Vec3< float >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -21522,14 +21421,14 @@ SWIGINTERN PyObject *_wrap_Vec3f_z(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_float_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3f_z__SWIG_0(self, args);
@@ -21538,7 +21437,7 @@ SWIGINTERN PyObject *_wrap_Vec3f_z(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_float_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3f_z__SWIG_1(self, args);
@@ -21546,15 +21445,18 @@ SWIGINTERN PyObject *_wrap_Vec3f_z(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3f_z'.\n  Possible C/C++ prototypes are:\n    z()\n    z()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3f_z'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    z(VecMat::Vec3< float > const *)\n"
+    "    z(VecMat::Vec3< float > *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3f_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
-  VecMat::Vec3<float >::value_type arg2 ;
+  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
+  VecMat::Vec3< float >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   float val2 ;
@@ -21563,16 +21465,16 @@ SWIGINTERN PyObject *_wrap_Vec3f_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3f_setX",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_setX" "', argument " "1"" of type '" "VecMat::Vec3<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_setX" "', argument " "1"" of type '" "VecMat::Vec3< float > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3f_setX" "', argument " "2"" of type '" "VecMat::Vec3<float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3f_setX" "', argument " "2"" of type '" "VecMat::Vec3< float >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<float >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< float >::value_type >(val2);
   {
     try {
       (arg1)->setX(arg2);
@@ -21593,8 +21495,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3f_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
-  VecMat::Vec3<float >::value_type arg2 ;
+  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
+  VecMat::Vec3< float >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   float val2 ;
@@ -21603,16 +21505,16 @@ SWIGINTERN PyObject *_wrap_Vec3f_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3f_setY",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_setY" "', argument " "1"" of type '" "VecMat::Vec3<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_setY" "', argument " "1"" of type '" "VecMat::Vec3< float > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3f_setY" "', argument " "2"" of type '" "VecMat::Vec3<float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3f_setY" "', argument " "2"" of type '" "VecMat::Vec3< float >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<float >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< float >::value_type >(val2);
   {
     try {
       (arg1)->setY(arg2);
@@ -21633,8 +21535,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3f_setZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
-  VecMat::Vec3<float >::value_type arg2 ;
+  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
+  VecMat::Vec3< float >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   float val2 ;
@@ -21643,16 +21545,16 @@ SWIGINTERN PyObject *_wrap_Vec3f_setZ(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3f_setZ",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_setZ" "', argument " "1"" of type '" "VecMat::Vec3<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_setZ" "', argument " "1"" of type '" "VecMat::Vec3< float > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3f_setZ" "', argument " "2"" of type '" "VecMat::Vec3<float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3f_setZ" "', argument " "2"" of type '" "VecMat::Vec3< float >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<float >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< float >::value_type >(val2);
   {
     try {
       (arg1)->setZ(arg2);
@@ -21673,9 +21575,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3f___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
-  VecMat::Vec3<float > *arg2 = 0 ;
-  VecMat::Vec3<float > result;
+  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
+  VecMat::Vec3< float > *arg2 = 0 ;
+  VecMat::Vec3< float > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -21684,22 +21586,22 @@ SWIGINTERN PyObject *_wrap_Vec3f___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3f___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f___add__" "', argument " "1"" of type '" "VecMat::Vec3<float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f___add__" "', argument " "1"" of type '" "VecMat::Vec3< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tfloat_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_float_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3f___add__" "', argument " "2"" of type '" "VecMat::Vec3<float > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3f___add__" "', argument " "2"" of type '" "VecMat::Vec3< float > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3f___add__" "', argument " "2"" of type '" "VecMat::Vec3<float > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3f___add__" "', argument " "2"" of type '" "VecMat::Vec3< float > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3<float > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3< float > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec3<float > const *)arg1)->operator +((VecMat::Vec3<float > const &)*arg2);
+      result = ((VecMat::Vec3< float > const *)arg1)->operator +((VecMat::Vec3< float > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -21708,7 +21610,7 @@ SWIGINTERN PyObject *_wrap_Vec3f___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<float >(static_cast< const VecMat::Vec3<float >& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< float >(static_cast< const VecMat::Vec3< float >& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -21717,9 +21619,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3f___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
-  VecMat::Vec3<float > *arg2 = 0 ;
-  VecMat::Vec3<float > result;
+  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
+  VecMat::Vec3< float > *arg2 = 0 ;
+  VecMat::Vec3< float > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -21728,22 +21630,22 @@ SWIGINTERN PyObject *_wrap_Vec3f___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3f___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f___sub__" "', argument " "1"" of type '" "VecMat::Vec3<float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f___sub__" "', argument " "1"" of type '" "VecMat::Vec3< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tfloat_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_float_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3f___sub__" "', argument " "2"" of type '" "VecMat::Vec3<float > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3f___sub__" "', argument " "2"" of type '" "VecMat::Vec3< float > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3f___sub__" "', argument " "2"" of type '" "VecMat::Vec3<float > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3f___sub__" "', argument " "2"" of type '" "VecMat::Vec3< float > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3<float > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3< float > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec3<float > const *)arg1)->operator -((VecMat::Vec3<float > const &)*arg2);
+      result = ((VecMat::Vec3< float > const *)arg1)->operator -((VecMat::Vec3< float > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -21752,7 +21654,7 @@ SWIGINTERN PyObject *_wrap_Vec3f___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<float >(static_cast< const VecMat::Vec3<float >& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< float >(static_cast< const VecMat::Vec3< float >& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -21761,9 +21663,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3f___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
-  VecMat::Vec3<float >::value_type arg2 ;
-  VecMat::Vec3<float > result;
+  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
+  VecMat::Vec3< float >::value_type arg2 ;
+  VecMat::Vec3< float > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   float val2 ;
@@ -21772,19 +21674,19 @@ SWIGINTERN PyObject *_wrap_Vec3f___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3f___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f___mul__" "', argument " "1"" of type '" "VecMat::Vec3<float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f___mul__" "', argument " "1"" of type '" "VecMat::Vec3< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3f___mul__" "', argument " "2"" of type '" "VecMat::Vec3<float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3f___mul__" "', argument " "2"" of type '" "VecMat::Vec3< float >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<float >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< float >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec3<float > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec3< float > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -21793,7 +21695,7 @@ SWIGINTERN PyObject *_wrap_Vec3f___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<float >(static_cast< const VecMat::Vec3<float >& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< float >(static_cast< const VecMat::Vec3< float >& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -21802,9 +21704,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3f___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
-  VecMat::Vec3<float >::value_type arg2 ;
-  VecMat::Vec3<float > result;
+  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
+  VecMat::Vec3< float >::value_type arg2 ;
+  VecMat::Vec3< float > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   float val2 ;
@@ -21813,19 +21715,19 @@ SWIGINTERN PyObject *_wrap_Vec3f___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3f___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f___div__" "', argument " "1"" of type '" "VecMat::Vec3<float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f___div__" "', argument " "1"" of type '" "VecMat::Vec3< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3f___div__" "', argument " "2"" of type '" "VecMat::Vec3<float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3f___div__" "', argument " "2"" of type '" "VecMat::Vec3< float >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<float >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< float >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec3<float > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec3< float > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -21834,7 +21736,7 @@ SWIGINTERN PyObject *_wrap_Vec3f___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<float >(static_cast< const VecMat::Vec3<float >& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< float >(static_cast< const VecMat::Vec3< float >& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -21843,9 +21745,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3f___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
-  VecMat::Vec3<float > *arg2 = 0 ;
-  VecMat::Vec3<float >::value_type result;
+  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
+  VecMat::Vec3< float > *arg2 = 0 ;
+  VecMat::Vec3< float >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -21854,22 +21756,22 @@ SWIGINTERN PyObject *_wrap_Vec3f___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3f___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f___mul__" "', argument " "1"" of type '" "VecMat::Vec3<float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f___mul__" "', argument " "1"" of type '" "VecMat::Vec3< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tfloat_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_float_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3f___mul__" "', argument " "2"" of type '" "VecMat::Vec3<float > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3f___mul__" "', argument " "2"" of type '" "VecMat::Vec3< float > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3f___mul__" "', argument " "2"" of type '" "VecMat::Vec3<float > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3f___mul__" "', argument " "2"" of type '" "VecMat::Vec3< float > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3<float > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3< float > * >(argp2);
   {
     try {
-      result = (VecMat::Vec3<float >::value_type)((VecMat::Vec3<float > const *)arg1)->operator *((VecMat::Vec3<float > const &)*arg2);
+      result = (VecMat::Vec3< float >::value_type)((VecMat::Vec3< float > const *)arg1)->operator *((VecMat::Vec3< float > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -21891,17 +21793,17 @@ SWIGINTERN PyObject *_wrap_Vec3f___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_float_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec3T_float_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec3f___mul____SWIG_1(self, args);
@@ -21911,7 +21813,7 @@ SWIGINTERN PyObject *_wrap_Vec3f___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_float_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -21932,9 +21834,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3f___xor__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
-  VecMat::Vec3<float > *arg2 = 0 ;
-  VecMat::Vec3<float > result;
+  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
+  VecMat::Vec3< float > *arg2 = 0 ;
+  VecMat::Vec3< float > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -21943,22 +21845,22 @@ SWIGINTERN PyObject *_wrap_Vec3f___xor__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3f___xor__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f___xor__" "', argument " "1"" of type '" "VecMat::Vec3<float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f___xor__" "', argument " "1"" of type '" "VecMat::Vec3< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tfloat_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_float_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3f___xor__" "', argument " "2"" of type '" "VecMat::Vec3<float > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3f___xor__" "', argument " "2"" of type '" "VecMat::Vec3< float > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3f___xor__" "', argument " "2"" of type '" "VecMat::Vec3<float > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3f___xor__" "', argument " "2"" of type '" "VecMat::Vec3< float > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3<float > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3< float > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec3<float > const *)arg1)->operator ^((VecMat::Vec3<float > const &)*arg2);
+      result = ((VecMat::Vec3< float > const *)arg1)->operator ^((VecMat::Vec3< float > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -21967,7 +21869,7 @@ SWIGINTERN PyObject *_wrap_Vec3f___xor__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<float >(static_cast< const VecMat::Vec3<float >& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< float >(static_cast< const VecMat::Vec3< float >& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -21976,17 +21878,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
+  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec3f",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec3f" "', argument " "1"" of type '" "VecMat::Vec3<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec3f" "', argument " "1"" of type '" "VecMat::Vec3< float > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
   {
     try {
       delete arg1;
@@ -22008,19 +21910,19 @@ fail:
 
 SWIGINTERN PyObject *Vec3f_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec3d__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<double > *result = 0 ;
+  VecMat::Vec3< double > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec3d")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec3<double > *)new VecMat::Vec3<double >();
+      result = (VecMat::Vec3< double > *)new VecMat::Vec3< double >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -22029,7 +21931,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3d__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -22038,10 +21940,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec3d__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<double >::value_type arg1 ;
-  VecMat::Vec3<double >::value_type arg2 ;
-  VecMat::Vec3<double >::value_type arg3 ;
-  VecMat::Vec3<double > *result = 0 ;
+  VecMat::Vec3< double >::value_type arg1 ;
+  VecMat::Vec3< double >::value_type arg2 ;
+  VecMat::Vec3< double >::value_type arg3 ;
+  VecMat::Vec3< double > *result = 0 ;
   double val1 ;
   int ecode1 = 0 ;
   double val2 ;
@@ -22055,22 +21957,22 @@ SWIGINTERN PyObject *_wrap_new_Vec3d__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OOO:new_Vec3d",&obj0,&obj1,&obj2)) SWIG_fail;
   ecode1 = SWIG_AsVal_double(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3d" "', argument " "1"" of type '" "VecMat::Vec3<double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3d" "', argument " "1"" of type '" "VecMat::Vec3< double >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec3<double >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec3< double >::value_type >(val1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3d" "', argument " "2"" of type '" "VecMat::Vec3<double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3d" "', argument " "2"" of type '" "VecMat::Vec3< double >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<double >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< double >::value_type >(val2);
   ecode3 = SWIG_AsVal_double(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_Vec3d" "', argument " "3"" of type '" "VecMat::Vec3<double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_Vec3d" "', argument " "3"" of type '" "VecMat::Vec3< double >::value_type""'");
   } 
-  arg3 = static_cast< VecMat::Vec3<double >::value_type >(val3);
+  arg3 = static_cast< VecMat::Vec3< double >::value_type >(val3);
   {
     try {
-      result = (VecMat::Vec3<double > *)new VecMat::Vec3<double >(arg1,arg2,arg3);
+      result = (VecMat::Vec3< double > *)new VecMat::Vec3< double >(arg1,arg2,arg3);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -22079,7 +21981,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3d__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -22088,9 +21990,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec3d__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<double >::value_type arg1 ;
-  VecMat::Vec3<double >::value_type arg2 ;
-  VecMat::Vec3<double > *result = 0 ;
+  VecMat::Vec3< double >::value_type arg1 ;
+  VecMat::Vec3< double >::value_type arg2 ;
+  VecMat::Vec3< double > *result = 0 ;
   double val1 ;
   int ecode1 = 0 ;
   double val2 ;
@@ -22101,17 +22003,17 @@ SWIGINTERN PyObject *_wrap_new_Vec3d__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OO:new_Vec3d",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_double(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3d" "', argument " "1"" of type '" "VecMat::Vec3<double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3d" "', argument " "1"" of type '" "VecMat::Vec3< double >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec3<double >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec3< double >::value_type >(val1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3d" "', argument " "2"" of type '" "VecMat::Vec3<double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3d" "', argument " "2"" of type '" "VecMat::Vec3< double >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<double >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< double >::value_type >(val2);
   {
     try {
-      result = (VecMat::Vec3<double > *)new VecMat::Vec3<double >(arg1,arg2);
+      result = (VecMat::Vec3< double > *)new VecMat::Vec3< double >(arg1,arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -22120,7 +22022,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3d__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -22129,8 +22031,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec3d__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<double >::value_type arg1 ;
-  VecMat::Vec3<double > *result = 0 ;
+  VecMat::Vec3< double >::value_type arg1 ;
+  VecMat::Vec3< double > *result = 0 ;
   double val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -22138,12 +22040,12 @@ SWIGINTERN PyObject *_wrap_new_Vec3d__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"O:new_Vec3d",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_double(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3d" "', argument " "1"" of type '" "VecMat::Vec3<double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3d" "', argument " "1"" of type '" "VecMat::Vec3< double >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec3<double >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec3< double >::value_type >(val1);
   {
     try {
-      result = (VecMat::Vec3<double > *)new VecMat::Vec3<double >(arg1);
+      result = (VecMat::Vec3< double > *)new VecMat::Vec3< double >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -22152,7 +22054,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3d__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -22165,7 +22067,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3d(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -22222,28 +22124,33 @@ SWIGINTERN PyObject *_wrap_new_Vec3d(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec3d'.\n  Possible C/C++ prototypes are:\n    VecMat::Vec3<(double)>()\n    VecMat::Vec3<(double)>(VecMat::Vec3<double >::value_type const,VecMat::Vec3<double >::value_type const,VecMat::Vec3<double >::value_type const)\n    VecMat::Vec3<(double)>(VecMat::Vec3<double >::value_type const,VecMat::Vec3<double >::value_type const)\n    VecMat::Vec3<(double)>(VecMat::Vec3<double >::value_type const)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec3d'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    VecMat::Vec3< double >()\n"
+    "    VecMat::Vec3< double >(VecMat::Vec3< double >::value_type const,VecMat::Vec3< double >::value_type const,VecMat::Vec3< double >::value_type const)\n"
+    "    VecMat::Vec3< double >(VecMat::Vec3< double >::value_type const,VecMat::Vec3< double >::value_type const)\n"
+    "    VecMat::Vec3< double >(VecMat::Vec3< double >::value_type const)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3d_x__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
-  VecMat::Vec3<double >::value_type result;
+  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
+  VecMat::Vec3< double >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3d_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_x" "', argument " "1"" of type '" "VecMat::Vec3<double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_x" "', argument " "1"" of type '" "VecMat::Vec3< double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
   {
     try {
-      result = (VecMat::Vec3<double >::value_type)((VecMat::Vec3<double > const *)arg1)->x();
+      result = (VecMat::Vec3< double >::value_type)((VecMat::Vec3< double > const *)arg1)->x();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -22261,23 +22168,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3d_x__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
-  VecMat::Vec3<double >::value_type *result = 0 ;
+  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
+  VecMat::Vec3< double >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3d_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_x" "', argument " "1"" of type '" "VecMat::Vec3<double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_x" "', argument " "1"" of type '" "VecMat::Vec3< double > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
   {
     try {
       {
-        VecMat::Vec3<double >::value_type &_result_ref = (arg1)->x();
-        result = (VecMat::Vec3<double >::value_type *) &_result_ref;
+        VecMat::Vec3< double >::value_type &_result_ref = (arg1)->x();
+        result = (VecMat::Vec3< double >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -22300,14 +22207,14 @@ SWIGINTERN PyObject *_wrap_Vec3d_x(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3d_x__SWIG_0(self, args);
@@ -22316,7 +22223,7 @@ SWIGINTERN PyObject *_wrap_Vec3d_x(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3d_x__SWIG_1(self, args);
@@ -22324,28 +22231,31 @@ SWIGINTERN PyObject *_wrap_Vec3d_x(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3d_x'.\n  Possible C/C++ prototypes are:\n    x()\n    x()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3d_x'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    x(VecMat::Vec3< double > const *)\n"
+    "    x(VecMat::Vec3< double > *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3d_y__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
-  VecMat::Vec3<double >::value_type result;
+  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
+  VecMat::Vec3< double >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3d_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_y" "', argument " "1"" of type '" "VecMat::Vec3<double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_y" "', argument " "1"" of type '" "VecMat::Vec3< double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
   {
     try {
-      result = (VecMat::Vec3<double >::value_type)((VecMat::Vec3<double > const *)arg1)->y();
+      result = (VecMat::Vec3< double >::value_type)((VecMat::Vec3< double > const *)arg1)->y();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -22363,23 +22273,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3d_y__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
-  VecMat::Vec3<double >::value_type *result = 0 ;
+  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
+  VecMat::Vec3< double >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3d_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_y" "', argument " "1"" of type '" "VecMat::Vec3<double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_y" "', argument " "1"" of type '" "VecMat::Vec3< double > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
   {
     try {
       {
-        VecMat::Vec3<double >::value_type &_result_ref = (arg1)->y();
-        result = (VecMat::Vec3<double >::value_type *) &_result_ref;
+        VecMat::Vec3< double >::value_type &_result_ref = (arg1)->y();
+        result = (VecMat::Vec3< double >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -22402,14 +22312,14 @@ SWIGINTERN PyObject *_wrap_Vec3d_y(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3d_y__SWIG_0(self, args);
@@ -22418,7 +22328,7 @@ SWIGINTERN PyObject *_wrap_Vec3d_y(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3d_y__SWIG_1(self, args);
@@ -22426,28 +22336,31 @@ SWIGINTERN PyObject *_wrap_Vec3d_y(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3d_y'.\n  Possible C/C++ prototypes are:\n    y()\n    y()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3d_y'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    y(VecMat::Vec3< double > const *)\n"
+    "    y(VecMat::Vec3< double > *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3d_z__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
-  VecMat::Vec3<double >::value_type result;
+  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
+  VecMat::Vec3< double >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3d_z",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_z" "', argument " "1"" of type '" "VecMat::Vec3<double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_z" "', argument " "1"" of type '" "VecMat::Vec3< double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
   {
     try {
-      result = (VecMat::Vec3<double >::value_type)((VecMat::Vec3<double > const *)arg1)->z();
+      result = (VecMat::Vec3< double >::value_type)((VecMat::Vec3< double > const *)arg1)->z();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -22465,23 +22378,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3d_z__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
-  VecMat::Vec3<double >::value_type *result = 0 ;
+  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
+  VecMat::Vec3< double >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3d_z",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_z" "', argument " "1"" of type '" "VecMat::Vec3<double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_z" "', argument " "1"" of type '" "VecMat::Vec3< double > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
   {
     try {
       {
-        VecMat::Vec3<double >::value_type &_result_ref = (arg1)->z();
-        result = (VecMat::Vec3<double >::value_type *) &_result_ref;
+        VecMat::Vec3< double >::value_type &_result_ref = (arg1)->z();
+        result = (VecMat::Vec3< double >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -22504,14 +22417,14 @@ SWIGINTERN PyObject *_wrap_Vec3d_z(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3d_z__SWIG_0(self, args);
@@ -22520,7 +22433,7 @@ SWIGINTERN PyObject *_wrap_Vec3d_z(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3d_z__SWIG_1(self, args);
@@ -22528,15 +22441,18 @@ SWIGINTERN PyObject *_wrap_Vec3d_z(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3d_z'.\n  Possible C/C++ prototypes are:\n    z()\n    z()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3d_z'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    z(VecMat::Vec3< double > const *)\n"
+    "    z(VecMat::Vec3< double > *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3d_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
-  VecMat::Vec3<double >::value_type arg2 ;
+  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
+  VecMat::Vec3< double >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
@@ -22545,16 +22461,16 @@ SWIGINTERN PyObject *_wrap_Vec3d_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3d_setX",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_setX" "', argument " "1"" of type '" "VecMat::Vec3<double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_setX" "', argument " "1"" of type '" "VecMat::Vec3< double > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3d_setX" "', argument " "2"" of type '" "VecMat::Vec3<double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3d_setX" "', argument " "2"" of type '" "VecMat::Vec3< double >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<double >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< double >::value_type >(val2);
   {
     try {
       (arg1)->setX(arg2);
@@ -22575,8 +22491,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3d_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
-  VecMat::Vec3<double >::value_type arg2 ;
+  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
+  VecMat::Vec3< double >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
@@ -22585,16 +22501,16 @@ SWIGINTERN PyObject *_wrap_Vec3d_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3d_setY",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_setY" "', argument " "1"" of type '" "VecMat::Vec3<double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_setY" "', argument " "1"" of type '" "VecMat::Vec3< double > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3d_setY" "', argument " "2"" of type '" "VecMat::Vec3<double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3d_setY" "', argument " "2"" of type '" "VecMat::Vec3< double >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<double >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< double >::value_type >(val2);
   {
     try {
       (arg1)->setY(arg2);
@@ -22615,8 +22531,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3d_setZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
-  VecMat::Vec3<double >::value_type arg2 ;
+  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
+  VecMat::Vec3< double >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
@@ -22625,16 +22541,16 @@ SWIGINTERN PyObject *_wrap_Vec3d_setZ(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3d_setZ",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_setZ" "', argument " "1"" of type '" "VecMat::Vec3<double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_setZ" "', argument " "1"" of type '" "VecMat::Vec3< double > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3d_setZ" "', argument " "2"" of type '" "VecMat::Vec3<double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3d_setZ" "', argument " "2"" of type '" "VecMat::Vec3< double >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<double >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< double >::value_type >(val2);
   {
     try {
       (arg1)->setZ(arg2);
@@ -22655,9 +22571,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3d___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
-  VecMat::Vec3<double > *arg2 = 0 ;
-  VecMat::Vec3<double > result;
+  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
+  VecMat::Vec3< double > *arg2 = 0 ;
+  VecMat::Vec3< double > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -22666,22 +22582,22 @@ SWIGINTERN PyObject *_wrap_Vec3d___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3d___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d___add__" "', argument " "1"" of type '" "VecMat::Vec3<double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d___add__" "', argument " "1"" of type '" "VecMat::Vec3< double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3d___add__" "', argument " "2"" of type '" "VecMat::Vec3<double > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3d___add__" "', argument " "2"" of type '" "VecMat::Vec3< double > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3d___add__" "', argument " "2"" of type '" "VecMat::Vec3<double > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3d___add__" "', argument " "2"" of type '" "VecMat::Vec3< double > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3<double > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3< double > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec3<double > const *)arg1)->operator +((VecMat::Vec3<double > const &)*arg2);
+      result = ((VecMat::Vec3< double > const *)arg1)->operator +((VecMat::Vec3< double > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -22690,7 +22606,7 @@ SWIGINTERN PyObject *_wrap_Vec3d___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<double >(static_cast< const VecMat::Vec3<double >& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< double >(static_cast< const VecMat::Vec3< double >& >(result))), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -22699,9 +22615,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3d___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
-  VecMat::Vec3<double > *arg2 = 0 ;
-  VecMat::Vec3<double > result;
+  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
+  VecMat::Vec3< double > *arg2 = 0 ;
+  VecMat::Vec3< double > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -22710,22 +22626,22 @@ SWIGINTERN PyObject *_wrap_Vec3d___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3d___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d___sub__" "', argument " "1"" of type '" "VecMat::Vec3<double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d___sub__" "', argument " "1"" of type '" "VecMat::Vec3< double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3d___sub__" "', argument " "2"" of type '" "VecMat::Vec3<double > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3d___sub__" "', argument " "2"" of type '" "VecMat::Vec3< double > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3d___sub__" "', argument " "2"" of type '" "VecMat::Vec3<double > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3d___sub__" "', argument " "2"" of type '" "VecMat::Vec3< double > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3<double > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3< double > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec3<double > const *)arg1)->operator -((VecMat::Vec3<double > const &)*arg2);
+      result = ((VecMat::Vec3< double > const *)arg1)->operator -((VecMat::Vec3< double > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -22734,7 +22650,7 @@ SWIGINTERN PyObject *_wrap_Vec3d___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<double >(static_cast< const VecMat::Vec3<double >& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< double >(static_cast< const VecMat::Vec3< double >& >(result))), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -22743,9 +22659,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3d___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
-  VecMat::Vec3<double >::value_type arg2 ;
-  VecMat::Vec3<double > result;
+  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
+  VecMat::Vec3< double >::value_type arg2 ;
+  VecMat::Vec3< double > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
@@ -22754,19 +22670,19 @@ SWIGINTERN PyObject *_wrap_Vec3d___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3d___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d___mul__" "', argument " "1"" of type '" "VecMat::Vec3<double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d___mul__" "', argument " "1"" of type '" "VecMat::Vec3< double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3d___mul__" "', argument " "2"" of type '" "VecMat::Vec3<double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3d___mul__" "', argument " "2"" of type '" "VecMat::Vec3< double >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<double >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< double >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec3<double > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec3< double > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -22775,7 +22691,7 @@ SWIGINTERN PyObject *_wrap_Vec3d___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<double >(static_cast< const VecMat::Vec3<double >& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< double >(static_cast< const VecMat::Vec3< double >& >(result))), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -22784,9 +22700,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3d___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
-  VecMat::Vec3<double >::value_type arg2 ;
-  VecMat::Vec3<double > result;
+  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
+  VecMat::Vec3< double >::value_type arg2 ;
+  VecMat::Vec3< double > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
@@ -22795,19 +22711,19 @@ SWIGINTERN PyObject *_wrap_Vec3d___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3d___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d___div__" "', argument " "1"" of type '" "VecMat::Vec3<double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d___div__" "', argument " "1"" of type '" "VecMat::Vec3< double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3d___div__" "', argument " "2"" of type '" "VecMat::Vec3<double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3d___div__" "', argument " "2"" of type '" "VecMat::Vec3< double >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<double >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< double >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec3<double > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec3< double > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -22816,7 +22732,7 @@ SWIGINTERN PyObject *_wrap_Vec3d___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<double >(static_cast< const VecMat::Vec3<double >& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< double >(static_cast< const VecMat::Vec3< double >& >(result))), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -22825,9 +22741,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3d___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
-  VecMat::Vec3<double > *arg2 = 0 ;
-  VecMat::Vec3<double >::value_type result;
+  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
+  VecMat::Vec3< double > *arg2 = 0 ;
+  VecMat::Vec3< double >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -22836,22 +22752,22 @@ SWIGINTERN PyObject *_wrap_Vec3d___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3d___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d___mul__" "', argument " "1"" of type '" "VecMat::Vec3<double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d___mul__" "', argument " "1"" of type '" "VecMat::Vec3< double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3d___mul__" "', argument " "2"" of type '" "VecMat::Vec3<double > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3d___mul__" "', argument " "2"" of type '" "VecMat::Vec3< double > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3d___mul__" "', argument " "2"" of type '" "VecMat::Vec3<double > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3d___mul__" "', argument " "2"" of type '" "VecMat::Vec3< double > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3<double > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3< double > * >(argp2);
   {
     try {
-      result = (VecMat::Vec3<double >::value_type)((VecMat::Vec3<double > const *)arg1)->operator *((VecMat::Vec3<double > const &)*arg2);
+      result = (VecMat::Vec3< double >::value_type)((VecMat::Vec3< double > const *)arg1)->operator *((VecMat::Vec3< double > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -22873,17 +22789,17 @@ SWIGINTERN PyObject *_wrap_Vec3d___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec3T_double_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec3d___mul____SWIG_1(self, args);
@@ -22893,7 +22809,7 @@ SWIGINTERN PyObject *_wrap_Vec3d___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -22914,9 +22830,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3d___xor__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
-  VecMat::Vec3<double > *arg2 = 0 ;
-  VecMat::Vec3<double > result;
+  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
+  VecMat::Vec3< double > *arg2 = 0 ;
+  VecMat::Vec3< double > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -22925,22 +22841,22 @@ SWIGINTERN PyObject *_wrap_Vec3d___xor__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3d___xor__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d___xor__" "', argument " "1"" of type '" "VecMat::Vec3<double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d___xor__" "', argument " "1"" of type '" "VecMat::Vec3< double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3d___xor__" "', argument " "2"" of type '" "VecMat::Vec3<double > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3d___xor__" "', argument " "2"" of type '" "VecMat::Vec3< double > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3d___xor__" "', argument " "2"" of type '" "VecMat::Vec3<double > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3d___xor__" "', argument " "2"" of type '" "VecMat::Vec3< double > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3<double > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3< double > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec3<double > const *)arg1)->operator ^((VecMat::Vec3<double > const &)*arg2);
+      result = ((VecMat::Vec3< double > const *)arg1)->operator ^((VecMat::Vec3< double > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -22949,7 +22865,7 @@ SWIGINTERN PyObject *_wrap_Vec3d___xor__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<double >(static_cast< const VecMat::Vec3<double >& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< double >(static_cast< const VecMat::Vec3< double >& >(result))), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -22958,17 +22874,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec3d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
+  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec3d",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec3d" "', argument " "1"" of type '" "VecMat::Vec3<double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec3d" "', argument " "1"" of type '" "VecMat::Vec3< double > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
   {
     try {
       delete arg1;
@@ -22990,8 +22906,8 @@ fail:
 
 SWIGINTERN PyObject *Vec3d_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
@@ -23183,7 +23099,7 @@ SWIGINTERN PyObject *_wrap_Noise_turbulence1(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 5); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -23249,7 +23165,10 @@ SWIGINTERN PyObject *_wrap_Noise_turbulence1(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Noise_turbulence1'.\n  Possible C/C++ prototypes are:\n    turbulence1(float,float,float,unsigned int)\n    turbulence1(float,float,float)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Noise_turbulence1'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    turbulence1(Noise *,float,float,float,unsigned int)\n"
+    "    turbulence1(Noise *,float,float,float)\n");
   return NULL;
 }
 
@@ -23284,7 +23203,7 @@ SWIGINTERN PyObject *_wrap_Noise_turbulence2__SWIG_0(PyObject *SWIGUNUSEDPARM(se
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Noise_turbulence2" "', argument " "1"" of type '" "Noise *""'"); 
   }
   arg1 = reinterpret_cast< Noise * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0 );
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_float_t,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Noise_turbulence2" "', argument " "2"" of type '" "Geometry::Vec2f &""'"); 
   }
@@ -23351,7 +23270,7 @@ SWIGINTERN PyObject *_wrap_Noise_turbulence2__SWIG_1(PyObject *SWIGUNUSEDPARM(se
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Noise_turbulence2" "', argument " "1"" of type '" "Noise *""'"); 
   }
   arg1 = reinterpret_cast< Noise * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0 );
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_float_t,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Noise_turbulence2" "', argument " "2"" of type '" "Geometry::Vec2f &""'"); 
   }
@@ -23393,7 +23312,7 @@ SWIGINTERN PyObject *_wrap_Noise_turbulence2(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 5); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -23404,7 +23323,7 @@ SWIGINTERN PyObject *_wrap_Noise_turbulence2(PyObject *self, PyObject *args) {
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_VecMat__Vec2T_float_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         {
@@ -23430,7 +23349,7 @@ SWIGINTERN PyObject *_wrap_Noise_turbulence2(PyObject *self, PyObject *args) {
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_VecMat__Vec2T_float_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         {
@@ -23457,7 +23376,10 @@ SWIGINTERN PyObject *_wrap_Noise_turbulence2(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Noise_turbulence2'.\n  Possible C/C++ prototypes are:\n    turbulence2(Geometry::Vec2f &,float,float,unsigned int)\n    turbulence2(Geometry::Vec2f &,float,float)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Noise_turbulence2'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    turbulence2(Noise *,Geometry::Vec2f &,float,float,unsigned int)\n"
+    "    turbulence2(Noise *,Geometry::Vec2f &,float,float)\n");
   return NULL;
 }
 
@@ -23492,7 +23414,7 @@ SWIGINTERN PyObject *_wrap_Noise_turbulence3__SWIG_0(PyObject *SWIGUNUSEDPARM(se
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Noise_turbulence3" "', argument " "1"" of type '" "Noise *""'"); 
   }
   arg1 = reinterpret_cast< Noise * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tfloat_t,  0 );
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_float_t,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Noise_turbulence3" "', argument " "2"" of type '" "Geometry::Vec3f &""'"); 
   }
@@ -23559,7 +23481,7 @@ SWIGINTERN PyObject *_wrap_Noise_turbulence3__SWIG_1(PyObject *SWIGUNUSEDPARM(se
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Noise_turbulence3" "', argument " "1"" of type '" "Noise *""'"); 
   }
   arg1 = reinterpret_cast< Noise * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tfloat_t,  0 );
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_float_t,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Noise_turbulence3" "', argument " "2"" of type '" "Geometry::Vec3f &""'"); 
   }
@@ -23601,7 +23523,7 @@ SWIGINTERN PyObject *_wrap_Noise_turbulence3(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 5); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -23612,7 +23534,7 @@ SWIGINTERN PyObject *_wrap_Noise_turbulence3(PyObject *self, PyObject *args) {
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_VecMat__Vec3T_float_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         {
@@ -23638,7 +23560,7 @@ SWIGINTERN PyObject *_wrap_Noise_turbulence3(PyObject *self, PyObject *args) {
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_VecMat__Vec3T_float_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         {
@@ -23665,7 +23587,10 @@ SWIGINTERN PyObject *_wrap_Noise_turbulence3(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Noise_turbulence3'.\n  Possible C/C++ prototypes are:\n    turbulence3(Geometry::Vec3f &,float,float,unsigned int)\n    turbulence3(Geometry::Vec3f &,float,float)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Noise_turbulence3'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    turbulence3(Noise *,Geometry::Vec3f &,float,float,unsigned int)\n"
+    "    turbulence3(Noise *,Geometry::Vec3f &,float,float)\n");
   return NULL;
 }
 
@@ -23729,7 +23654,7 @@ SWIGINTERN PyObject *_wrap_Noise_smoothNoise2(PyObject *SWIGUNUSEDPARM(self), Py
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Noise_smoothNoise2" "', argument " "1"" of type '" "Noise *""'"); 
   }
   arg1 = reinterpret_cast< Noise * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0 );
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_float_t,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Noise_smoothNoise2" "', argument " "2"" of type '" "Geometry::Vec2f &""'"); 
   }
@@ -23773,7 +23698,7 @@ SWIGINTERN PyObject *_wrap_Noise_smoothNoise3(PyObject *SWIGUNUSEDPARM(self), Py
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Noise_smoothNoise3" "', argument " "1"" of type '" "Noise *""'"); 
   }
   arg1 = reinterpret_cast< Noise * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tfloat_t,  0 );
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_float_t,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Noise_smoothNoise3" "', argument " "2"" of type '" "Geometry::Vec3f &""'"); 
   }
@@ -23801,7 +23726,7 @@ fail:
 
 SWIGINTERN PyObject *Noise_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Noise, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -23938,7 +23863,7 @@ SWIGINTERN PyObject *_wrap_new_Material(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 5); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -23985,7 +23910,11 @@ SWIGINTERN PyObject *_wrap_new_Material(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Material'.\n  Possible C/C++ prototypes are:\n    Material()\n    Material(float const *,float const *,float const *,float const *,float const)\n    Material(Material const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Material'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Material()\n"
+    "    Material(float const *,float const *,float const *,float const *,float const)\n"
+    "    Material(Material const &)\n");
   return NULL;
 }
 
@@ -25092,18 +25021,18 @@ fail:
 
 SWIGINTERN PyObject *Material_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Material, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN int POINT_set(PyObject *) {
+SWIGINTERN int Swig_var_POINT_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable POINT is read-only.");
   return 1;
 }
 
 
-SWIGINTERN PyObject *POINT_get(void) {
+SWIGINTERN PyObject *Swig_var_POINT_get(void) {
   PyObject *pyobj = 0;
   
   pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::POINT));
@@ -25111,13 +25040,13 @@ SWIGINTERN PyObject *POINT_get(void) {
 }
 
 
-SWIGINTERN int S_VERTEX_set(PyObject *) {
+SWIGINTERN int Swig_var_S_VERTEX_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable S_VERTEX is read-only.");
   return 1;
 }
 
 
-SWIGINTERN PyObject *S_VERTEX_get(void) {
+SWIGINTERN PyObject *Swig_var_S_VERTEX_get(void) {
   PyObject *pyobj = 0;
   
   pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::S_VERTEX));
@@ -25125,13 +25054,13 @@ SWIGINTERN PyObject *S_VERTEX_get(void) {
 }
 
 
-SWIGINTERN int VIEW_VERTEX_set(PyObject *) {
+SWIGINTERN int Swig_var_VIEW_VERTEX_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable VIEW_VERTEX is read-only.");
   return 1;
 }
 
 
-SWIGINTERN PyObject *VIEW_VERTEX_get(void) {
+SWIGINTERN PyObject *Swig_var_VIEW_VERTEX_get(void) {
   PyObject *pyobj = 0;
   
   pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::VIEW_VERTEX));
@@ -25139,13 +25068,13 @@ SWIGINTERN PyObject *VIEW_VERTEX_get(void) {
 }
 
 
-SWIGINTERN int NON_T_VERTEX_set(PyObject *) {
+SWIGINTERN int Swig_var_NON_T_VERTEX_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable NON_T_VERTEX is read-only.");
   return 1;
 }
 
 
-SWIGINTERN PyObject *NON_T_VERTEX_get(void) {
+SWIGINTERN PyObject *Swig_var_NON_T_VERTEX_get(void) {
   PyObject *pyobj = 0;
   
   pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::NON_T_VERTEX));
@@ -25153,13 +25082,13 @@ SWIGINTERN PyObject *NON_T_VERTEX_get(void) {
 }
 
 
-SWIGINTERN int T_VERTEX_set(PyObject *) {
+SWIGINTERN int Swig_var_T_VERTEX_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable T_VERTEX is read-only.");
   return 1;
 }
 
 
-SWIGINTERN PyObject *T_VERTEX_get(void) {
+SWIGINTERN PyObject *Swig_var_T_VERTEX_get(void) {
   PyObject *pyobj = 0;
   
   pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::T_VERTEX));
@@ -25167,13 +25096,13 @@ SWIGINTERN PyObject *T_VERTEX_get(void) {
 }
 
 
-SWIGINTERN int CUSP_set(PyObject *) {
+SWIGINTERN int Swig_var_CUSP_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable CUSP is read-only.");
   return 1;
 }
 
 
-SWIGINTERN PyObject *CUSP_get(void) {
+SWIGINTERN PyObject *Swig_var_CUSP_get(void) {
   PyObject *pyobj = 0;
   
   pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::CUSP));
@@ -25181,13 +25110,13 @@ SWIGINTERN PyObject *CUSP_get(void) {
 }
 
 
-SWIGINTERN int NO_FEATURE_set(PyObject *) {
+SWIGINTERN int Swig_var_NO_FEATURE_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable NO_FEATURE is read-only.");
   return 1;
 }
 
 
-SWIGINTERN PyObject *NO_FEATURE_get(void) {
+SWIGINTERN PyObject *Swig_var_NO_FEATURE_get(void) {
   PyObject *pyobj = 0;
   
   pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::NO_FEATURE));
@@ -25195,13 +25124,13 @@ SWIGINTERN PyObject *NO_FEATURE_get(void) {
 }
 
 
-SWIGINTERN int SILHOUETTE_set(PyObject *) {
+SWIGINTERN int Swig_var_SILHOUETTE_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable SILHOUETTE is read-only.");
   return 1;
 }
 
 
-SWIGINTERN PyObject *SILHOUETTE_get(void) {
+SWIGINTERN PyObject *Swig_var_SILHOUETTE_get(void) {
   PyObject *pyobj = 0;
   
   pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::SILHOUETTE));
@@ -25209,13 +25138,13 @@ SWIGINTERN PyObject *SILHOUETTE_get(void) {
 }
 
 
-SWIGINTERN int BORDER_set(PyObject *) {
+SWIGINTERN int Swig_var_BORDER_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable BORDER is read-only.");
   return 1;
 }
 
 
-SWIGINTERN PyObject *BORDER_get(void) {
+SWIGINTERN PyObject *Swig_var_BORDER_get(void) {
   PyObject *pyobj = 0;
   
   pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::BORDER));
@@ -25223,13 +25152,13 @@ SWIGINTERN PyObject *BORDER_get(void) {
 }
 
 
-SWIGINTERN int CREASE_set(PyObject *) {
+SWIGINTERN int Swig_var_CREASE_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable CREASE is read-only.");
   return 1;
 }
 
 
-SWIGINTERN PyObject *CREASE_get(void) {
+SWIGINTERN PyObject *Swig_var_CREASE_get(void) {
   PyObject *pyobj = 0;
   
   pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::CREASE));
@@ -25237,13 +25166,13 @@ SWIGINTERN PyObject *CREASE_get(void) {
 }
 
 
-SWIGINTERN int RIDGE_set(PyObject *) {
+SWIGINTERN int Swig_var_RIDGE_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable RIDGE is read-only.");
   return 1;
 }
 
 
-SWIGINTERN PyObject *RIDGE_get(void) {
+SWIGINTERN PyObject *Swig_var_RIDGE_get(void) {
   PyObject *pyobj = 0;
   
   pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::RIDGE));
@@ -25251,13 +25180,13 @@ SWIGINTERN PyObject *RIDGE_get(void) {
 }
 
 
-SWIGINTERN int VALLEY_set(PyObject *) {
+SWIGINTERN int Swig_var_VALLEY_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable VALLEY is read-only.");
   return 1;
 }
 
 
-SWIGINTERN PyObject *VALLEY_get(void) {
+SWIGINTERN PyObject *Swig_var_VALLEY_get(void) {
   PyObject *pyobj = 0;
   
   pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::VALLEY));
@@ -25265,13 +25194,13 @@ SWIGINTERN PyObject *VALLEY_get(void) {
 }
 
 
-SWIGINTERN int SUGGESTIVE_CONTOUR_set(PyObject *) {
+SWIGINTERN int Swig_var_SUGGESTIVE_CONTOUR_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable SUGGESTIVE_CONTOUR is read-only.");
   return 1;
 }
 
 
-SWIGINTERN PyObject *SUGGESTIVE_CONTOUR_get(void) {
+SWIGINTERN PyObject *Swig_var_SUGGESTIVE_CONTOUR_get(void) {
   PyObject *pyobj = 0;
   
   pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::SUGGESTIVE_CONTOUR));
@@ -25279,6 +25208,38 @@ SWIGINTERN PyObject *SUGGESTIVE_CONTOUR_get(void) {
 }
 
 
+SWIGINTERN PyObject *_wrap_delete_Interface0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface0D *arg1 = (Interface0D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_Interface0D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Interface0D" "', argument " "1"" of type '" "Interface0D *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface0D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_Interface0D_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   Interface0D *arg1 = (Interface0D *) 0 ;
@@ -25432,7 +25393,7 @@ SWIGINTERN PyObject *_wrap_Interface0D_getPoint3D(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -25560,7 +25521,7 @@ SWIGINTERN PyObject *_wrap_Interface0D_getPoint2D(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -25826,41 +25787,9 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_Interface0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  Interface0D *arg1 = (Interface0D *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_Interface0D",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface0D, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Interface0D" "', argument " "1"" of type '" "Interface0D *""'"); 
-  }
-  arg1 = reinterpret_cast< Interface0D * >(argp1);
-  {
-    try {
-      delete arg1;
-      
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *Interface0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Interface0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -26427,7 +26356,7 @@ SWIGINTERN PyObject *_wrap_Interface0DIteratorNested_getPoint3D(PyObject *SWIGUN
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -26555,7 +26484,7 @@ SWIGINTERN PyObject *_wrap_Interface0DIteratorNested_getPoint2D(PyObject *SWIGUN
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -26800,7 +26729,7 @@ fail:
 
 SWIGINTERN PyObject *Interface0DIteratorNested_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Interface0DIteratorNested, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -26901,7 +26830,7 @@ SWIGINTERN PyObject *_wrap_new_Interface0DIterator(PyObject *self, PyObject *arg
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -26927,7 +26856,11 @@ SWIGINTERN PyObject *_wrap_new_Interface0DIterator(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Interface0DIterator'.\n  Possible C/C++ prototypes are:\n    Interface0DIterator(Interface0DIteratorNested *)\n    Interface0DIterator()\n    Interface0DIterator(Interface0DIterator const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Interface0DIterator'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Interface0DIterator(Interface0DIteratorNested *)\n"
+    "    Interface0DIterator()\n"
+    "    Interface0DIterator(Interface0DIterator const &)\n");
   return NULL;
 }
 
@@ -27462,7 +27395,7 @@ SWIGINTERN PyObject *_wrap_Interface0DIterator_getPoint3D(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -27590,7 +27523,7 @@ SWIGINTERN PyObject *_wrap_Interface0DIterator_getPoint2D(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -27835,11 +27768,43 @@ fail:
 
 SWIGINTERN PyObject *Interface0DIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Interface0DIterator, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *_wrap_delete_Interface1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface1D *arg1 = (Interface1D *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:delete_Interface1D",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface1D, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Interface1D" "', argument " "1"" of type '" "Interface1D *""'"); 
+  }
+  arg1 = reinterpret_cast< Interface1D * >(argp1);
+  {
+    try {
+      delete arg1;
+      
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_Interface1D_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   Interface1D *arg1 = (Interface1D *) 0 ;
@@ -28015,7 +27980,7 @@ SWIGINTERN PyObject *_wrap_Interface1D_pointsBegin(PyObject *self, PyObject *arg
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -28045,7 +28010,10 @@ SWIGINTERN PyObject *_wrap_Interface1D_pointsBegin(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Interface1D_pointsBegin'.\n  Possible C/C++ prototypes are:\n    pointsBegin(float)\n    pointsBegin()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Interface1D_pointsBegin'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    pointsBegin(Interface1D *,float)\n"
+    "    pointsBegin(Interface1D *)\n");
   return NULL;
 }
 
@@ -28129,7 +28097,7 @@ SWIGINTERN PyObject *_wrap_Interface1D_pointsEnd(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -28159,7 +28127,10 @@ SWIGINTERN PyObject *_wrap_Interface1D_pointsEnd(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Interface1D_pointsEnd'.\n  Possible C/C++ prototypes are:\n    pointsEnd(float)\n    pointsEnd()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Interface1D_pointsEnd'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    pointsEnd(Interface1D *,float)\n"
+    "    pointsEnd(Interface1D *)\n");
   return NULL;
 }
 
@@ -28332,48 +28303,16 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_Interface1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  Interface1D *arg1 = (Interface1D *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_Interface1D",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Interface1D, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Interface1D" "', argument " "1"" of type '" "Interface1D *""'"); 
-  }
-  arg1 = reinterpret_cast< Interface1D * >(argp1);
-  {
-    try {
-      delete arg1;
-      
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *Interface1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Interface1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_integrateUnsigned__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<unsigned int > *arg1 = 0 ;
+  UnaryFunction0D< unsigned int > *arg1 = 0 ;
   Interface0DIterator arg2 ;
   Interface0DIterator arg3 ;
   IntegrationType arg4 ;
@@ -28392,14 +28331,14 @@ SWIGINTERN PyObject *_wrap_integrateUnsigned__SWIG_0(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:integrateUnsigned",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DTunsigned_int_t,  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DT_unsigned_int_t,  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "integrateUnsigned" "', argument " "1"" of type '" "UnaryFunction0D<unsigned int > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "integrateUnsigned" "', argument " "1"" of type '" "UnaryFunction0D< unsigned int > &""'"); 
   }
   if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateUnsigned" "', argument " "1"" of type '" "UnaryFunction0D<unsigned int > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateUnsigned" "', argument " "1"" of type '" "UnaryFunction0D< unsigned int > &""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< unsigned int > * >(argp1);
   {
     res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0  | 0);
     if (!SWIG_IsOK(res2)) {
@@ -28433,7 +28372,7 @@ SWIGINTERN PyObject *_wrap_integrateUnsigned__SWIG_0(PyObject *SWIGUNUSEDPARM(se
   arg4 = static_cast< IntegrationType >(val4);
   {
     try {
-      result = (unsigned int)integrate<unsigned int >(*arg1,arg2,arg3,arg4);
+      result = (unsigned int)integrate< unsigned int >(*arg1,arg2,arg3,arg4);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -28451,7 +28390,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_integrateUnsigned__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<unsigned int > *arg1 = 0 ;
+  UnaryFunction0D< unsigned int > *arg1 = 0 ;
   Interface0DIterator arg2 ;
   Interface0DIterator arg3 ;
   unsigned int result;
@@ -28466,14 +28405,14 @@ SWIGINTERN PyObject *_wrap_integrateUnsigned__SWIG_1(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:integrateUnsigned",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DTunsigned_int_t,  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DT_unsigned_int_t,  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "integrateUnsigned" "', argument " "1"" of type '" "UnaryFunction0D<unsigned int > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "integrateUnsigned" "', argument " "1"" of type '" "UnaryFunction0D< unsigned int > &""'"); 
   }
   if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateUnsigned" "', argument " "1"" of type '" "UnaryFunction0D<unsigned int > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateUnsigned" "', argument " "1"" of type '" "UnaryFunction0D< unsigned int > &""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< unsigned int > * >(argp1);
   {
     res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0  | 0);
     if (!SWIG_IsOK(res2)) {
@@ -28502,7 +28441,7 @@ SWIGINTERN PyObject *_wrap_integrateUnsigned__SWIG_1(PyObject *SWIGUNUSEDPARM(se
   }
   {
     try {
-      result = (unsigned int)integrate<unsigned int >(*arg1,arg2,arg3);
+      result = (unsigned int)integrate< unsigned int >(*arg1,arg2,arg3);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -28524,14 +28463,14 @@ SWIGINTERN PyObject *_wrap_integrateUnsigned(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 3) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DTunsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DT_unsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Interface0DIterator, 0);
@@ -28548,7 +28487,7 @@ SWIGINTERN PyObject *_wrap_integrateUnsigned(PyObject *self, PyObject *args) {
   if (argc == 4) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DTunsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DT_unsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Interface0DIterator, 0);
@@ -28570,14 +28509,17 @@ SWIGINTERN PyObject *_wrap_integrateUnsigned(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'integrateUnsigned'.\n  Possible C/C++ prototypes are:\n    integrate<(unsigned int)>(UnaryFunction0D<unsigned int > &,Interface0DIterator,Interface0DIterator,IntegrationType)\n    integrate<(unsigned int)>(UnaryFunction0D<unsigned int > &,Interface0DIterator,Interface0DIterator)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'integrateUnsigned'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    integrate< unsigned int >(UnaryFunction0D< unsigned int > &,Interface0DIterator,Interface0DIterator,IntegrationType)\n"
+    "    integrate< unsigned int >(UnaryFunction0D< unsigned int > &,Interface0DIterator,Interface0DIterator)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_integrateFloat__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<float > *arg1 = 0 ;
+  UnaryFunction0D< float > *arg1 = 0 ;
   Interface0DIterator arg2 ;
   Interface0DIterator arg3 ;
   IntegrationType arg4 ;
@@ -28596,14 +28538,14 @@ SWIGINTERN PyObject *_wrap_integrateFloat__SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:integrateFloat",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DTfloat_t,  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DT_float_t,  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "integrateFloat" "', argument " "1"" of type '" "UnaryFunction0D<float > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "integrateFloat" "', argument " "1"" of type '" "UnaryFunction0D< float > &""'"); 
   }
   if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateFloat" "', argument " "1"" of type '" "UnaryFunction0D<float > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateFloat" "', argument " "1"" of type '" "UnaryFunction0D< float > &""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<float > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< float > * >(argp1);
   {
     res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0  | 0);
     if (!SWIG_IsOK(res2)) {
@@ -28637,7 +28579,7 @@ SWIGINTERN PyObject *_wrap_integrateFloat__SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   arg4 = static_cast< IntegrationType >(val4);
   {
     try {
-      result = (float)integrate<float >(*arg1,arg2,arg3,arg4);
+      result = (float)integrate< float >(*arg1,arg2,arg3,arg4);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -28655,7 +28597,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_integrateFloat__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<float > *arg1 = 0 ;
+  UnaryFunction0D< float > *arg1 = 0 ;
   Interface0DIterator arg2 ;
   Interface0DIterator arg3 ;
   float result;
@@ -28670,14 +28612,14 @@ SWIGINTERN PyObject *_wrap_integrateFloat__SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:integrateFloat",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DTfloat_t,  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DT_float_t,  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "integrateFloat" "', argument " "1"" of type '" "UnaryFunction0D<float > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "integrateFloat" "', argument " "1"" of type '" "UnaryFunction0D< float > &""'"); 
   }
   if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateFloat" "', argument " "1"" of type '" "UnaryFunction0D<float > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateFloat" "', argument " "1"" of type '" "UnaryFunction0D< float > &""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<float > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< float > * >(argp1);
   {
     res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0  | 0);
     if (!SWIG_IsOK(res2)) {
@@ -28706,7 +28648,7 @@ SWIGINTERN PyObject *_wrap_integrateFloat__SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   }
   {
     try {
-      result = (float)integrate<float >(*arg1,arg2,arg3);
+      result = (float)integrate< float >(*arg1,arg2,arg3);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -28728,14 +28670,14 @@ SWIGINTERN PyObject *_wrap_integrateFloat(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 3) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DTfloat_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DT_float_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Interface0DIterator, 0);
@@ -28752,7 +28694,7 @@ SWIGINTERN PyObject *_wrap_integrateFloat(PyObject *self, PyObject *args) {
   if (argc == 4) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DTfloat_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DT_float_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Interface0DIterator, 0);
@@ -28774,14 +28716,17 @@ SWIGINTERN PyObject *_wrap_integrateFloat(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'integrateFloat'.\n  Possible C/C++ prototypes are:\n    integrate<(float)>(UnaryFunction0D<float > &,Interface0DIterator,Interface0DIterator,IntegrationType)\n    integrate<(float)>(UnaryFunction0D<float > &,Interface0DIterator,Interface0DIterator)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'integrateFloat'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    integrate< float >(UnaryFunction0D< float > &,Interface0DIterator,Interface0DIterator,IntegrationType)\n"
+    "    integrate< float >(UnaryFunction0D< float > &,Interface0DIterator,Interface0DIterator)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_integrateDouble__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<double > *arg1 = 0 ;
+  UnaryFunction0D< double > *arg1 = 0 ;
   Interface0DIterator arg2 ;
   Interface0DIterator arg3 ;
   IntegrationType arg4 ;
@@ -28800,14 +28745,14 @@ SWIGINTERN PyObject *_wrap_integrateDouble__SWIG_0(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:integrateDouble",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DTdouble_t,  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DT_double_t,  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "integrateDouble" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "integrateDouble" "', argument " "1"" of type '" "UnaryFunction0D< double > &""'"); 
   }
   if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateDouble" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateDouble" "', argument " "1"" of type '" "UnaryFunction0D< double > &""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< double > * >(argp1);
   {
     res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0  | 0);
     if (!SWIG_IsOK(res2)) {
@@ -28841,7 +28786,7 @@ SWIGINTERN PyObject *_wrap_integrateDouble__SWIG_0(PyObject *SWIGUNUSEDPARM(self
   arg4 = static_cast< IntegrationType >(val4);
   {
     try {
-      result = (double)integrate<double >(*arg1,arg2,arg3,arg4);
+      result = (double)integrate< double >(*arg1,arg2,arg3,arg4);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -28859,7 +28804,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_integrateDouble__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<double > *arg1 = 0 ;
+  UnaryFunction0D< double > *arg1 = 0 ;
   Interface0DIterator arg2 ;
   Interface0DIterator arg3 ;
   double result;
@@ -28874,14 +28819,14 @@ SWIGINTERN PyObject *_wrap_integrateDouble__SWIG_1(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:integrateDouble",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DTdouble_t,  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DT_double_t,  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "integrateDouble" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "integrateDouble" "', argument " "1"" of type '" "UnaryFunction0D< double > &""'"); 
   }
   if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateDouble" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateDouble" "', argument " "1"" of type '" "UnaryFunction0D< double > &""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< double > * >(argp1);
   {
     res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0  | 0);
     if (!SWIG_IsOK(res2)) {
@@ -28910,7 +28855,7 @@ SWIGINTERN PyObject *_wrap_integrateDouble__SWIG_1(PyObject *SWIGUNUSEDPARM(self
   }
   {
     try {
-      result = (double)integrate<double >(*arg1,arg2,arg3);
+      result = (double)integrate< double >(*arg1,arg2,arg3);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -28932,14 +28877,14 @@ SWIGINTERN PyObject *_wrap_integrateDouble(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 3) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DTdouble_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DT_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Interface0DIterator, 0);
@@ -28956,7 +28901,7 @@ SWIGINTERN PyObject *_wrap_integrateDouble(PyObject *self, PyObject *args) {
   if (argc == 4) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DTdouble_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DT_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Interface0DIterator, 0);
@@ -28978,7 +28923,10 @@ SWIGINTERN PyObject *_wrap_integrateDouble(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'integrateDouble'.\n  Possible C/C++ prototypes are:\n    integrate<(double)>(UnaryFunction0D<double > &,Interface0DIterator,Interface0DIterator,IntegrationType)\n    integrate<(double)>(UnaryFunction0D<double > &,Interface0DIterator,Interface0DIterator)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'integrateDouble'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    integrate< double >(UnaryFunction0D< double > &,Interface0DIterator,Interface0DIterator,IntegrationType)\n"
+    "    integrate< double >(UnaryFunction0D< double > &,Interface0DIterator,Interface0DIterator)\n");
   return NULL;
 }
 
@@ -29136,7 +29084,7 @@ SWIGINTERN PyObject *_wrap_SVertex_getPoint3D(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -29264,7 +29212,7 @@ SWIGINTERN PyObject *_wrap_SVertex_getPoint2D(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -29594,7 +29542,7 @@ SWIGINTERN PyObject *_wrap_new_SVertex__SWIG_1(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:new_SVertex",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_SVertex" "', argument " "1"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -29669,7 +29617,7 @@ SWIGINTERN PyObject *_wrap_new_SVertex(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -29687,7 +29635,7 @@ SWIGINTERN PyObject *_wrap_new_SVertex(PyObject *self, PyObject *args) {
   }
   if (argc == 2) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_VecMat__Vec3T_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Id, 0);
@@ -29699,7 +29647,11 @@ SWIGINTERN PyObject *_wrap_new_SVertex(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_SVertex'.\n  Possible C/C++ prototypes are:\n    SVertex()\n    SVertex(Geometry::Vec3r const &,Id const &)\n    SVertex(SVertex &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_SVertex'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    SVertex()\n"
+    "    SVertex(Geometry::Vec3r const &,Id const &)\n"
+    "    SVertex(SVertex &)\n");
   return NULL;
 }
 
@@ -29840,7 +29792,7 @@ SWIGINTERN PyObject *_wrap_SVertex_point3D(PyObject *SWIGUNUSEDPARM(self), PyObj
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -29875,7 +29827,7 @@ SWIGINTERN PyObject *_wrap_SVertex_point2D(PyObject *SWIGUNUSEDPARM(self), PyObj
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -29885,7 +29837,7 @@ fail:
 SWIGINTERN PyObject *_wrap_SVertex_normals(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SVertex *arg1 = (SVertex *) 0 ;
-  SwigValueWrapper<set<VecMat::Vec3<double > > > result;
+  SwigValueWrapper< set< VecMat::Vec3< double > > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -29907,7 +29859,7 @@ SWIGINTERN PyObject *_wrap_SVertex_normals(PyObject *SWIGUNUSEDPARM(self), PyObj
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new set<Geometry::Vec3r >(static_cast< const set<Geometry::Vec3r >& >(result))), SWIGTYPE_p_setTVecMat__Vec3Tdouble_t_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new set< Geometry::Vec3r >(static_cast< const set< Geometry::Vec3r >& >(result))), SWIGTYPE_p_setT_VecMat__Vec3T_double_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -29949,7 +29901,7 @@ fail:
 SWIGINTERN PyObject *_wrap_SVertex_fedges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SVertex *arg1 = (SVertex *) 0 ;
-  std::vector<FEdge * > *result = 0 ;
+  std::vector< FEdge * > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -29963,8 +29915,8 @@ SWIGINTERN PyObject *_wrap_SVertex_fedges(PyObject *SWIGUNUSEDPARM(self), PyObje
   {
     try {
       {
-        std::vector<FEdge * > const &_result_ref = (arg1)->fedges();
-        result = (std::vector<FEdge * > *) &_result_ref;
+        std::vector< FEdge * > const &_result_ref = (arg1)->fedges();
+        result = (std::vector< FEdge * > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -29974,7 +29926,7 @@ SWIGINTERN PyObject *_wrap_SVertex_fedges(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -30158,7 +30110,7 @@ SWIGINTERN PyObject *_wrap_SVertex_SetPoint3D(PyObject *SWIGUNUSEDPARM(self), Py
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_SetPoint3D" "', argument " "1"" of type '" "SVertex *""'"); 
   }
   arg1 = reinterpret_cast< SVertex * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVertex_SetPoint3D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -30201,7 +30153,7 @@ SWIGINTERN PyObject *_wrap_SVertex_SetPoint2D(PyObject *SWIGUNUSEDPARM(self), Py
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_SetPoint2D" "', argument " "1"" of type '" "SVertex *""'"); 
   }
   arg1 = reinterpret_cast< SVertex * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVertex_SetPoint2D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -30244,7 +30196,7 @@ SWIGINTERN PyObject *_wrap_SVertex_AddNormal(PyObject *SWIGUNUSEDPARM(self), PyO
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_AddNormal" "', argument " "1"" of type '" "SVertex *""'"); 
   }
   arg1 = reinterpret_cast< SVertex * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVertex_AddNormal" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -30400,7 +30352,7 @@ SWIGINTERN PyObject *_wrap_SVertex_setDirectionFredo(PyObject *SWIGUNUSEDPARM(se
   }
   arg1 = reinterpret_cast< SVertex * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVertex_setDirectionFredo" "', argument " "2"" of type '" "Geometry::Vec2r""'"); 
     }  
@@ -30487,7 +30439,7 @@ SWIGINTERN PyObject *_wrap_SVertex_directionFredo(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2r(static_cast< const Geometry::Vec2r& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2r(static_cast< const Geometry::Vec2r& >(result))), SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -30540,7 +30492,7 @@ fail:
 SWIGINTERN PyObject *_wrap_SVertex_SetFEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SVertex *arg1 = (SVertex *) 0 ;
-  std::vector<FEdge * > *arg2 = 0 ;
+  std::vector< FEdge * > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -30554,17 +30506,17 @@ SWIGINTERN PyObject *_wrap_SVertex_SetFEdges(PyObject *SWIGUNUSEDPARM(self), PyO
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_SetFEdges" "', argument " "1"" of type '" "SVertex *""'"); 
   }
   arg1 = reinterpret_cast< SVertex * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVertex_SetFEdges" "', argument " "2"" of type '" "std::vector<FEdge * > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVertex_SetFEdges" "', argument " "2"" of type '" "std::vector< FEdge * > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SVertex_SetFEdges" "', argument " "2"" of type '" "std::vector<FEdge * > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SVertex_SetFEdges" "', argument " "2"" of type '" "std::vector< FEdge * > const &""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<FEdge * > * >(argp2);
+  arg2 = reinterpret_cast< std::vector< FEdge * > * >(argp2);
   {
     try {
-      (arg1)->SetFEdges((std::vector<FEdge * > const &)*arg2);
+      (arg1)->SetFEdges((std::vector< FEdge * > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -30809,7 +30761,7 @@ SWIGINTERN PyObject *_wrap_SVertex_point2d(PyObject *SWIGUNUSEDPARM(self), PyObj
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -30844,7 +30796,7 @@ SWIGINTERN PyObject *_wrap_SVertex_point3d(PyObject *SWIGUNUSEDPARM(self), PyObj
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -30876,7 +30828,7 @@ SWIGINTERN PyObject *_wrap_SVertex_normal(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -30953,7 +30905,7 @@ SWIGINTERN PyObject *_wrap_SVertex_shape(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -30977,7 +30929,10 @@ SWIGINTERN PyObject *_wrap_SVertex_shape(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SVertex_shape'.\n  Possible C/C++ prototypes are:\n    shape()\n    shape()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SVertex_shape'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    shape(SVertex *)\n"
+    "    shape(SVertex const *)\n");
   return NULL;
 }
 
@@ -31307,7 +31262,7 @@ fail:
 
 SWIGINTERN PyObject *SVertex_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_SVertex, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -31564,7 +31519,7 @@ SWIGINTERN PyObject *_wrap_new_FEdge(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -31596,7 +31551,11 @@ SWIGINTERN PyObject *_wrap_new_FEdge(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_FEdge'.\n  Possible C/C++ prototypes are:\n    FEdge()\n    FEdge(SVertex *,SVertex *)\n    FEdge(FEdge &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_FEdge'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    FEdge()\n"
+    "    FEdge(SVertex *,SVertex *)\n"
+    "    FEdge(FEdge &)\n");
   return NULL;
 }
 
@@ -31946,7 +31905,7 @@ SWIGINTERN PyObject *_wrap_FEdge_center3d(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -31978,7 +31937,7 @@ SWIGINTERN PyObject *_wrap_FEdge_center2d(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -32048,7 +32007,7 @@ SWIGINTERN PyObject *_wrap_FEdge_getOccludeeIntersection(PyObject *SWIGUNUSEDPAR
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -32462,7 +32421,7 @@ SWIGINTERN PyObject *_wrap_FEdge_SetOccludeeIntersection(PyObject *SWIGUNUSEDPAR
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_SetOccludeeIntersection" "', argument " "1"" of type '" "FEdge *""'"); 
   }
   arg1 = reinterpret_cast< FEdge * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdge_SetOccludeeIntersection" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -32743,7 +32702,7 @@ SWIGINTERN PyObject *_wrap_FEdge_shape(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -32767,7 +32726,10 @@ SWIGINTERN PyObject *_wrap_FEdge_shape(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdge_shape'.\n  Possible C/C++ prototypes are:\n    shape()\n    shape()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdge_shape'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    shape(FEdge *)\n"
+    "    shape(FEdge const *)\n");
   return NULL;
 }
 
@@ -33152,7 +33114,7 @@ SWIGINTERN PyObject *_wrap_FEdge_orientation2d(PyObject *SWIGUNUSEDPARM(self), P
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -33184,7 +33146,7 @@ SWIGINTERN PyObject *_wrap_FEdge_orientation3d(PyObject *SWIGUNUSEDPARM(self), P
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -33334,7 +33296,7 @@ SWIGINTERN PyObject *_wrap_FEdge_pointsBegin(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -33364,7 +33326,10 @@ SWIGINTERN PyObject *_wrap_FEdge_pointsBegin(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdge_pointsBegin'.\n  Possible C/C++ prototypes are:\n    pointsBegin(float)\n    pointsBegin()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdge_pointsBegin'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    pointsBegin(FEdge *,float)\n"
+    "    pointsBegin(FEdge *)\n");
   return NULL;
 }
 
@@ -33448,7 +33413,7 @@ SWIGINTERN PyObject *_wrap_FEdge_pointsEnd(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -33478,14 +33443,17 @@ SWIGINTERN PyObject *_wrap_FEdge_pointsEnd(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdge_pointsEnd'.\n  Possible C/C++ prototypes are:\n    pointsEnd(float)\n    pointsEnd()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdge_pointsEnd'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    pointsEnd(FEdge *,float)\n"
+    "    pointsEnd(FEdge *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *FEdge_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FEdge, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -33595,7 +33563,7 @@ SWIGINTERN PyObject *_wrap_new_FEdgeSVertexIterator(PyObject *self, PyObject *ar
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -33626,7 +33594,11 @@ SWIGINTERN PyObject *_wrap_new_FEdgeSVertexIterator(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_FEdgeSVertexIterator'.\n  Possible C/C++ prototypes are:\n    FEdgeInternal::SVertexIterator()\n    FEdgeInternal::SVertexIterator(FEdgeInternal::SVertexIterator const &)\n    FEdgeInternal::SVertexIterator(SVertex *,FEdge *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_FEdgeSVertexIterator'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    FEdgeInternal::SVertexIterator()\n"
+    "    FEdgeInternal::SVertexIterator(FEdgeInternal::SVertexIterator const &)\n"
+    "    FEdgeInternal::SVertexIterator(SVertex *,FEdge *)\n");
   return NULL;
 }
 
@@ -34149,7 +34121,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_getPoint3D(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -34277,7 +34249,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_getPoint2D(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -34631,7 +34603,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_point3D(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -34666,7 +34638,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_point2D(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -34676,7 +34648,7 @@ fail:
 SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_normals(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
-  SwigValueWrapper<set<VecMat::Vec3<double > > > result;
+  SwigValueWrapper< set< VecMat::Vec3< double > > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -34698,7 +34670,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_normals(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new set<Geometry::Vec3r >(static_cast< const set<Geometry::Vec3r >& >(result))), SWIGTYPE_p_setTVecMat__Vec3Tdouble_t_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new set< Geometry::Vec3r >(static_cast< const set< Geometry::Vec3r >& >(result))), SWIGTYPE_p_setT_VecMat__Vec3T_double_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -34740,7 +34712,7 @@ fail:
 SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_fedges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
-  std::vector<FEdge * > *result = 0 ;
+  std::vector< FEdge * > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -34754,8 +34726,8 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_fedges(PyObject *SWIGUNUSEDPARM(
   {
     try {
       {
-        std::vector<FEdge * > const &_result_ref = (*arg1)->fedges();
-        result = (std::vector<FEdge * > *) &_result_ref;
+        std::vector< FEdge * > const &_result_ref = (*arg1)->fedges();
+        result = (std::vector< FEdge * > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -34765,7 +34737,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_fedges(PyObject *SWIGUNUSEDPARM(
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -34906,7 +34878,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_shape(PyObject *self, PyObject *
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -34930,7 +34902,10 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_shape(PyObject *self, PyObject *
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdgeSVertexIterator_shape'.\n  Possible C/C++ prototypes are:\n    shape()\n    shape()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdgeSVertexIterator_shape'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    shape(FEdgeInternal::SVertexIterator *)\n"
+    "    shape(FEdgeInternal::SVertexIterator const *)\n");
   return NULL;
 }
 
@@ -35016,7 +34991,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_SetPoint3D(PyObject *SWIGUNUSEDP
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_SetPoint3D" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
   }
   arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSVertexIterator_SetPoint3D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -35059,7 +35034,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_SetPoint2D(PyObject *SWIGUNUSEDP
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_SetPoint2D" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
   }
   arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSVertexIterator_SetPoint2D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -35102,7 +35077,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_AddNormal(PyObject *SWIGUNUSEDPA
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_AddNormal" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
   }
   arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSVertexIterator_AddNormal" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -35258,7 +35233,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_setDirectionFredo(PyObject *SWIG
   }
   arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSVertexIterator_setDirectionFredo" "', argument " "2"" of type '" "Geometry::Vec2r""'"); 
     }  
@@ -35345,7 +35320,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_directionFredo(PyObject *SWIGUNU
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2r(static_cast< const Geometry::Vec2r& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2r(static_cast< const Geometry::Vec2r& >(result))), SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -35398,7 +35373,7 @@ fail:
 SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_SetFEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
-  std::vector<FEdge * > *arg2 = 0 ;
+  std::vector< FEdge * > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -35412,17 +35387,17 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_SetFEdges(PyObject *SWIGUNUSEDPA
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_SetFEdges" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
   }
   arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSVertexIterator_SetFEdges" "', argument " "2"" of type '" "std::vector<FEdge * > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSVertexIterator_SetFEdges" "', argument " "2"" of type '" "std::vector< FEdge * > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdgeSVertexIterator_SetFEdges" "', argument " "2"" of type '" "std::vector<FEdge * > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdgeSVertexIterator_SetFEdges" "', argument " "2"" of type '" "std::vector< FEdge * > const &""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<FEdge * > * >(argp2);
+  arg2 = reinterpret_cast< std::vector< FEdge * > * >(argp2);
   {
     try {
-      (*arg1)->SetFEdges((std::vector<FEdge * > const &)*arg2);
+      (*arg1)->SetFEdges((std::vector< FEdge * > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -35667,7 +35642,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_point2d(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -35702,7 +35677,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_point3d(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -35734,7 +35709,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_normal(PyObject *SWIGUNUSEDPARM(
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -36098,7 +36073,7 @@ fail:
 
 SWIGINTERN PyObject *FEdgeSVertexIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FEdgeInternal__SVertexIterator, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -36208,7 +36183,7 @@ SWIGINTERN PyObject *_wrap_new_FEdgeSharp(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -36240,7 +36215,11 @@ SWIGINTERN PyObject *_wrap_new_FEdgeSharp(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_FEdgeSharp'.\n  Possible C/C++ prototypes are:\n    FEdgeSharp()\n    FEdgeSharp(SVertex *,SVertex *)\n    FEdgeSharp(FEdgeSharp &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_FEdgeSharp'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    FEdgeSharp()\n"
+    "    FEdgeSharp(SVertex *,SVertex *)\n"
+    "    FEdgeSharp(FEdgeSharp &)\n");
   return NULL;
 }
 
@@ -36337,7 +36316,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSharp_normalA(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -36372,7 +36351,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSharp_normalB(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -36530,7 +36509,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSharp_SetNormalA(PyObject *SWIGUNUSEDPARM(self),
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSharp_SetNormalA" "', argument " "1"" of type '" "FEdgeSharp *""'"); 
   }
   arg1 = reinterpret_cast< FEdgeSharp * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSharp_SetNormalA" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -36573,7 +36552,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSharp_SetNormalB(PyObject *SWIGUNUSEDPARM(self),
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSharp_SetNormalB" "', argument " "1"" of type '" "FEdgeSharp *""'"); 
   }
   arg1 = reinterpret_cast< FEdgeSharp * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSharp_SetNormalB" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -36681,7 +36660,7 @@ fail:
 
 SWIGINTERN PyObject *FEdgeSharp_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FEdgeSharp, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -36791,7 +36770,7 @@ SWIGINTERN PyObject *_wrap_new_FEdgeSmooth(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -36823,7 +36802,11 @@ SWIGINTERN PyObject *_wrap_new_FEdgeSmooth(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_FEdgeSmooth'.\n  Possible C/C++ prototypes are:\n    FEdgeSmooth()\n    FEdgeSmooth(SVertex *,SVertex *)\n    FEdgeSmooth(FEdgeSmooth &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_FEdgeSmooth'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    FEdgeSmooth()\n"
+    "    FEdgeSmooth(SVertex *,SVertex *)\n"
+    "    FEdgeSmooth(FEdgeSmooth &)\n");
   return NULL;
 }
 
@@ -36952,7 +36935,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSmooth_normal(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -37081,7 +37064,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSmooth_SetNormal(PyObject *SWIGUNUSEDPARM(self),
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSmooth_SetNormal" "', argument " "1"" of type '" "FEdgeSmooth *""'"); 
   }
   arg1 = reinterpret_cast< FEdgeSmooth * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSmooth_SetNormal" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -37149,7 +37132,7 @@ fail:
 
 SWIGINTERN PyObject *FEdgeSmooth_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FEdgeSmooth, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -37269,7 +37252,7 @@ SWIGINTERN PyObject *_wrap_new_SShape(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -37287,7 +37270,10 @@ SWIGINTERN PyObject *_wrap_new_SShape(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_SShape'.\n  Possible C/C++ prototypes are:\n    SShape()\n    SShape(SShape &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_SShape'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    SShape()\n"
+    "    SShape(SShape &)\n");
   return NULL;
 }
 
@@ -37502,7 +37488,7 @@ SWIGINTERN PyObject *_wrap_SShape_CreateSVertex(PyObject *SWIGUNUSEDPARM(self),
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_CreateSVertex" "', argument " "1"" of type '" "SShape *""'"); 
   }
   arg1 = reinterpret_cast< SShape * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SShape_CreateSVertex" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -37510,7 +37496,7 @@ SWIGINTERN PyObject *_wrap_SShape_CreateSVertex(PyObject *SWIGUNUSEDPARM(self),
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SShape_CreateSVertex" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
   arg2 = reinterpret_cast< Geometry::Vec3r * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SShape_CreateSVertex" "', argument " "3"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -37548,8 +37534,8 @@ SWIGINTERN PyObject *_wrap_SShape_SplitEdge(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject *resultobj = 0;
   SShape *arg1 = (SShape *) 0 ;
   FEdge *arg2 = (FEdge *) 0 ;
-  std::vector<Geometry::Vec2r > *arg3 = 0 ;
-  std::vector<FEdge * > *arg4 = 0 ;
+  std::vector< Geometry::Vec2r > *arg3 = 0 ;
+  std::vector< FEdge * > *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -37574,25 +37560,25 @@ SWIGINTERN PyObject *_wrap_SShape_SplitEdge(PyObject *SWIGUNUSEDPARM(self), PyOb
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SShape_SplitEdge" "', argument " "2"" of type '" "FEdge *""'"); 
   }
   arg2 = reinterpret_cast< FEdge * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_std__vectorTVecMat__Vec2Tdouble_t_std__allocatorTVecMat__Vec2Tdouble_t_t_t,  0  | 0);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_std__vectorT_VecMat__Vec2T_double_t_std__allocatorT_VecMat__Vec2T_double_t_t_t,  0  | 0);
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SShape_SplitEdge" "', argument " "3"" of type '" "std::vector<Geometry::Vec2r > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SShape_SplitEdge" "', argument " "3"" of type '" "std::vector< Geometry::Vec2r > const &""'"); 
   }
   if (!argp3) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SShape_SplitEdge" "', argument " "3"" of type '" "std::vector<Geometry::Vec2r > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SShape_SplitEdge" "', argument " "3"" of type '" "std::vector< Geometry::Vec2r > const &""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<Geometry::Vec2r > * >(argp3);
-  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t,  0 );
+  arg3 = reinterpret_cast< std::vector< Geometry::Vec2r > * >(argp3);
+  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t,  0 );
   if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "SShape_SplitEdge" "', argument " "4"" of type '" "std::vector<FEdge * > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "SShape_SplitEdge" "', argument " "4"" of type '" "std::vector< FEdge * > &""'"); 
   }
   if (!argp4) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SShape_SplitEdge" "', argument " "4"" of type '" "std::vector<FEdge * > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SShape_SplitEdge" "', argument " "4"" of type '" "std::vector< FEdge * > &""'"); 
   }
-  arg4 = reinterpret_cast< std::vector<FEdge * > * >(argp4);
+  arg4 = reinterpret_cast< std::vector< FEdge * > * >(argp4);
   {
     try {
-      (arg1)->SplitEdge(arg2,(std::vector<Geometry::Vec2r > const &)*arg3,*arg4);
+      (arg1)->SplitEdge(arg2,(std::vector< Geometry::Vec2r > const &)*arg3,*arg4);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -37661,7 +37647,7 @@ fail:
 SWIGINTERN PyObject *_wrap_SShape_SetBBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SShape *arg1 = (SShape *) 0 ;
-  BBox<Geometry::Vec3r > *arg2 = 0 ;
+  BBox< Geometry::Vec3r > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -37675,17 +37661,17 @@ SWIGINTERN PyObject *_wrap_SShape_SetBBox(PyObject *SWIGUNUSEDPARM(self), PyObje
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_SetBBox" "', argument " "1"" of type '" "SShape *""'"); 
   }
   arg1 = reinterpret_cast< SShape * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BBoxTVecMat__Vec3Tdouble_t_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BBoxT_VecMat__Vec3T_double_t_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SShape_SetBBox" "', argument " "2"" of type '" "BBox<Geometry::Vec3r > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SShape_SetBBox" "', argument " "2"" of type '" "BBox< Geometry::Vec3r > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SShape_SetBBox" "', argument " "2"" of type '" "BBox<Geometry::Vec3r > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SShape_SetBBox" "', argument " "2"" of type '" "BBox< Geometry::Vec3r > const &""'"); 
   }
-  arg2 = reinterpret_cast< BBox<Geometry::Vec3r > * >(argp2);
+  arg2 = reinterpret_cast< BBox< Geometry::Vec3r > * >(argp2);
   {
     try {
-      (arg1)->SetBBox((BBox<Geometry::Vec3r > const &)*arg2);
+      (arg1)->SetBBox((BBox< Geometry::Vec3r > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -37815,7 +37801,7 @@ fail:
 SWIGINTERN PyObject *_wrap_SShape_GetVertexList(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SShape *arg1 = (SShape *) 0 ;
-  std::vector<SVertex * > *result = 0 ;
+  std::vector< SVertex * > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -37829,8 +37815,8 @@ SWIGINTERN PyObject *_wrap_SShape_GetVertexList(PyObject *SWIGUNUSEDPARM(self),
   {
     try {
       {
-        std::vector<SVertex * > &_result_ref = (arg1)->GetVertexList();
-        result = (std::vector<SVertex * > *) &_result_ref;
+        std::vector< SVertex * > &_result_ref = (arg1)->GetVertexList();
+        result = (std::vector< SVertex * > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -37840,7 +37826,7 @@ SWIGINTERN PyObject *_wrap_SShape_GetVertexList(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -37850,7 +37836,7 @@ fail:
 SWIGINTERN PyObject *_wrap_SShape_GetEdgeList(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SShape *arg1 = (SShape *) 0 ;
-  std::vector<FEdge * > *result = 0 ;
+  std::vector< FEdge * > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -37864,8 +37850,8 @@ SWIGINTERN PyObject *_wrap_SShape_GetEdgeList(PyObject *SWIGUNUSEDPARM(self), Py
   {
     try {
       {
-        std::vector<FEdge * > &_result_ref = (arg1)->GetEdgeList();
-        result = (std::vector<FEdge * > *) &_result_ref;
+        std::vector< FEdge * > &_result_ref = (arg1)->GetEdgeList();
+        result = (std::vector< FEdge * > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -37875,7 +37861,7 @@ SWIGINTERN PyObject *_wrap_SShape_GetEdgeList(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -37885,7 +37871,7 @@ fail:
 SWIGINTERN PyObject *_wrap_SShape_GetChains(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SShape *arg1 = (SShape *) 0 ;
-  std::vector<FEdge * > *result = 0 ;
+  std::vector< FEdge * > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -37899,8 +37885,8 @@ SWIGINTERN PyObject *_wrap_SShape_GetChains(PyObject *SWIGUNUSEDPARM(self), PyOb
   {
     try {
       {
-        std::vector<FEdge * > &_result_ref = (arg1)->GetChains();
-        result = (std::vector<FEdge * > *) &_result_ref;
+        std::vector< FEdge * > &_result_ref = (arg1)->GetChains();
+        result = (std::vector< FEdge * > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -37910,7 +37896,7 @@ SWIGINTERN PyObject *_wrap_SShape_GetChains(PyObject *SWIGUNUSEDPARM(self), PyOb
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -37920,7 +37906,7 @@ fail:
 SWIGINTERN PyObject *_wrap_SShape_bbox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SShape *arg1 = (SShape *) 0 ;
-  BBox<Geometry::Vec3r > *result = 0 ;
+  BBox< Geometry::Vec3r > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -37934,8 +37920,8 @@ SWIGINTERN PyObject *_wrap_SShape_bbox(PyObject *SWIGUNUSEDPARM(self), PyObject
   {
     try {
       {
-        BBox<Geometry::Vec3r > const &_result_ref = (arg1)->bbox();
-        result = (BBox<Geometry::Vec3r > *) &_result_ref;
+        BBox< Geometry::Vec3r > const &_result_ref = (arg1)->bbox();
+        result = (BBox< Geometry::Vec3r > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -37945,7 +37931,7 @@ SWIGINTERN PyObject *_wrap_SShape_bbox(PyObject *SWIGUNUSEDPARM(self), PyObject
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_BBoxTVecMat__Vec3Tdouble_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_BBoxT_VecMat__Vec3T_double_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -37999,7 +37985,7 @@ fail:
 SWIGINTERN PyObject *_wrap_SShape_materials(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SShape *arg1 = (SShape *) 0 ;
-  std::vector<Material > *result = 0 ;
+  std::vector< Material > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -38013,8 +37999,8 @@ SWIGINTERN PyObject *_wrap_SShape_materials(PyObject *SWIGUNUSEDPARM(self), PyOb
   {
     try {
       {
-        std::vector<Material > const &_result_ref = ((SShape const *)arg1)->materials();
-        result = (std::vector<Material > *) &_result_ref;
+        std::vector< Material > const &_result_ref = ((SShape const *)arg1)->materials();
+        result = (std::vector< Material > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -38024,7 +38010,7 @@ SWIGINTERN PyObject *_wrap_SShape_materials(PyObject *SWIGUNUSEDPARM(self), PyOb
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTMaterial_std__allocatorTMaterial_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_Material_std__allocatorT_Material_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -38178,7 +38164,7 @@ fail:
 SWIGINTERN PyObject *_wrap_SShape_SetMaterials(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SShape *arg1 = (SShape *) 0 ;
-  std::vector<Material > *arg2 = 0 ;
+  std::vector< Material > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -38192,17 +38178,17 @@ SWIGINTERN PyObject *_wrap_SShape_SetMaterials(PyObject *SWIGUNUSEDPARM(self), P
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_SetMaterials" "', argument " "1"" of type '" "SShape *""'"); 
   }
   arg1 = reinterpret_cast< SShape * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTMaterial_std__allocatorTMaterial_t_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_Material_std__allocatorT_Material_t_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SShape_SetMaterials" "', argument " "2"" of type '" "std::vector<Material > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SShape_SetMaterials" "', argument " "2"" of type '" "std::vector< Material > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SShape_SetMaterials" "', argument " "2"" of type '" "std::vector<Material > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SShape_SetMaterials" "', argument " "2"" of type '" "std::vector< Material > const &""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<Material > * >(argp2);
+  arg2 = reinterpret_cast< std::vector< Material > * >(argp2);
   {
     try {
-      (arg1)->SetMaterials((std::vector<Material > const &)*arg2);
+      (arg1)->SetMaterials((std::vector< Material > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -38300,14 +38286,14 @@ fail:
 
 SWIGINTERN PyObject *SShape_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_SShape, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
   PyObject **arg2 = (PyObject **) 0 ;
   swig::PySwigIterator *result = 0 ;
   void *argp1 = 0 ;
@@ -38316,11 +38302,11 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_iterator(PyObject *SWIGUNUSEDPARM
   
   arg2 = &obj0;
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_iterator" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_iterator" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   {
     try {
       result = (swig::PySwigIterator *)std_vector_Sl_ViewShape_Sm__Sg__iterator(arg1,arg2);
@@ -38341,21 +38327,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer___nonzero__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer___nonzero__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___nonzero__" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___nonzero__" "', argument " "1"" of type '" "std::vector< ViewShape * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   {
     try {
-      result = (bool)std_vector_Sl_ViewShape_Sm__Sg____nonzero__((std::vector<ViewShape * > const *)arg1);
+      result = (bool)std_vector_Sl_ViewShape_Sm__Sg____nonzero__((std::vector< ViewShape * > const *)arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -38373,21 +38359,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer___len__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::size_type result;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer___len__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___len__" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___len__" "', argument " "1"" of type '" "std::vector< ViewShape * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   {
     try {
-      result = std_vector_Sl_ViewShape_Sm__Sg____len__((std::vector<ViewShape * > const *)arg1);
+      result = std_vector_Sl_ViewShape_Sm__Sg____len__((std::vector< ViewShape * > const *)arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -38405,22 +38391,22 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::value_type result;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_pop" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_pop" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   {
     try {
       try {
-        result = (std::vector<ViewShape * >::value_type)std_vector_Sl_ViewShape_Sm__Sg__pop(arg1);
+        result = (std::vector< ViewShape * >::value_type)std_vector_Sl_ViewShape_Sm__Sg__pop(arg1);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -38434,7 +38420,7 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_pop(PyObject *SWIGUNUSEDPARM(self
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -38443,10 +38429,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::difference_type arg2 ;
-  std::vector<ViewShape * >::difference_type arg3 ;
-  std::vector<ViewShape *,std::allocator<ViewShape * > > *result = 0 ;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::difference_type arg2 ;
+  std::vector< ViewShape * >::difference_type arg3 ;
+  std::vector< ViewShape *,std::allocator< ViewShape * > > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -38458,25 +38444,25 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer___getslice__(PyObject *SWIGUNUSED
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewShapesContainer___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___getslice__" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___getslice__" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer___getslice__" "', argument " "2"" of type '" "std::vector<ViewShape * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer___getslice__" "', argument " "2"" of type '" "std::vector< ViewShape * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewShape * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< ViewShape * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewShapesContainer___getslice__" "', argument " "3"" of type '" "std::vector<ViewShape * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewShapesContainer___getslice__" "', argument " "3"" of type '" "std::vector< ViewShape * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<ViewShape * >::difference_type >(val3);
+  arg3 = static_cast< std::vector< ViewShape * >::difference_type >(val3);
   {
     try {
       try {
-        result = (std::vector<ViewShape *,std::allocator<ViewShape * > > *)std_vector_Sl_ViewShape_Sm__Sg____getslice__(arg1,arg2,arg3);
+        result = (std::vector< ViewShape *,std::allocator< ViewShape * > > *)std_vector_Sl_ViewShape_Sm__Sg____getslice__(arg1,arg2,arg3);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -38490,7 +38476,7 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer___getslice__(PyObject *SWIGUNUSED
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -38499,10 +38485,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer___setslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::difference_type arg2 ;
-  std::vector<ViewShape * >::difference_type arg3 ;
-  std::vector<ViewShape *,std::allocator<ViewShape * > > *arg4 = 0 ;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::difference_type arg2 ;
+  std::vector< ViewShape * >::difference_type arg3 ;
+  std::vector< ViewShape *,std::allocator< ViewShape * > > *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -38516,36 +38502,36 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer___setslice__(PyObject *SWIGUNUSED
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:ViewShapesContainer___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___setslice__" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___setslice__" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer___setslice__" "', argument " "2"" of type '" "std::vector<ViewShape * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer___setslice__" "', argument " "2"" of type '" "std::vector< ViewShape * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewShape * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< ViewShape * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewShapesContainer___setslice__" "', argument " "3"" of type '" "std::vector<ViewShape * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewShapesContainer___setslice__" "', argument " "3"" of type '" "std::vector< ViewShape * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<ViewShape * >::difference_type >(val3);
+  arg3 = static_cast< std::vector< ViewShape * >::difference_type >(val3);
   {
-    std::vector<ViewShape*,std::allocator<ViewShape * > > *ptr = (std::vector<ViewShape*,std::allocator<ViewShape * > > *)0;
+    std::vector<ViewShape*,std::allocator< ViewShape * > > *ptr = (std::vector<ViewShape*,std::allocator< ViewShape * > > *)0;
     res4 = swig::asptr(obj3, &ptr);
     if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewShapesContainer___setslice__" "', argument " "4"" of type '" "std::vector<ViewShape *,std::allocator<ViewShape * > > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewShapesContainer___setslice__" "', argument " "4"" of type '" "std::vector< ViewShape *,std::allocator< ViewShape * > > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShapesContainer___setslice__" "', argument " "4"" of type '" "std::vector<ViewShape *,std::allocator<ViewShape * > > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShapesContainer___setslice__" "', argument " "4"" of type '" "std::vector< ViewShape *,std::allocator< ViewShape * > > const &""'"); 
     }
     arg4 = ptr;
   }
   {
     try {
       try {
-        std_vector_Sl_ViewShape_Sm__Sg____setslice__(arg1,arg2,arg3,(std::vector<ViewShape *,std::allocator<ViewShape * > > const &)*arg4);
+        std_vector_Sl_ViewShape_Sm__Sg____setslice__(arg1,arg2,arg3,(std::vector< ViewShape *,std::allocator< ViewShape * > > const &)*arg4);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -38573,9 +38559,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer___delslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::difference_type arg2 ;
-  std::vector<ViewShape * >::difference_type arg3 ;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::difference_type arg2 ;
+  std::vector< ViewShape * >::difference_type arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -38587,21 +38573,21 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer___delslice__(PyObject *SWIGUNUSED
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewShapesContainer___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___delslice__" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___delslice__" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer___delslice__" "', argument " "2"" of type '" "std::vector<ViewShape * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer___delslice__" "', argument " "2"" of type '" "std::vector< ViewShape * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewShape * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< ViewShape * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewShapesContainer___delslice__" "', argument " "3"" of type '" "std::vector<ViewShape * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewShapesContainer___delslice__" "', argument " "3"" of type '" "std::vector< ViewShape * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<ViewShape * >::difference_type >(val3);
+  arg3 = static_cast< std::vector< ViewShape * >::difference_type >(val3);
   {
     try {
       try {
@@ -38628,8 +38614,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer___delitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::difference_type arg2 ;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::difference_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -38638,16 +38624,16 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer___delitem__(PyObject *SWIGUNUSEDP
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewShapesContainer___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___delitem__" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___delitem__" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer___delitem__" "', argument " "2"" of type '" "std::vector<ViewShape * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer___delitem__" "', argument " "2"" of type '" "std::vector< ViewShape * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewShape * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< ViewShape * >::difference_type >(val2);
   {
     try {
       try {
@@ -38674,9 +38660,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer___getitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::difference_type arg2 ;
-  std::vector<ViewShape * >::value_type result;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::difference_type arg2 ;
+  std::vector< ViewShape * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -38685,20 +38671,20 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer___getitem__(PyObject *SWIGUNUSEDP
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewShapesContainer___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___getitem__" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___getitem__" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer___getitem__" "', argument " "2"" of type '" "std::vector<ViewShape * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer___getitem__" "', argument " "2"" of type '" "std::vector< ViewShape * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewShape * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< ViewShape * >::difference_type >(val2);
   {
     try {
       try {
-        result = (std::vector<ViewShape * >::value_type)std_vector_Sl_ViewShape_Sm__Sg____getitem__(arg1,arg2);
+        result = (std::vector< ViewShape * >::value_type)std_vector_Sl_ViewShape_Sm__Sg____getitem__(arg1,arg2);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -38712,7 +38698,7 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer___getitem__(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -38721,9 +38707,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer___setitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::difference_type arg2 ;
-  std::vector<ViewShape * >::value_type arg3 = (std::vector<ViewShape * >::value_type) 0 ;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::difference_type arg2 ;
+  std::vector< ViewShape * >::value_type arg3 = (std::vector< ViewShape * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -38735,21 +38721,21 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer___setitem__(PyObject *SWIGUNUSEDP
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewShapesContainer___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___setitem__" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___setitem__" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer___setitem__" "', argument " "2"" of type '" "std::vector<ViewShape * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer___setitem__" "', argument " "2"" of type '" "std::vector< ViewShape * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewShape * >::difference_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector< ViewShape * >::difference_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewShapesContainer___setitem__" "', argument " "3"" of type '" "std::vector<ViewShape * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewShapesContainer___setitem__" "', argument " "3"" of type '" "std::vector< ViewShape * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<ViewShape * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< ViewShape * >::value_type >(argp3);
   {
     try {
       try {
@@ -38776,8 +38762,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::value_type arg2 = (std::vector<ViewShape * >::value_type) 0 ;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::value_type arg2 = (std::vector< ViewShape * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -38786,16 +38772,16 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_append(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewShapesContainer_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_append" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_append" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShapesContainer_append" "', argument " "2"" of type '" "std::vector<ViewShape * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShapesContainer_append" "', argument " "2"" of type '" "std::vector< ViewShape * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<ViewShape * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector< ViewShape * >::value_type >(argp2);
   {
     try {
       std_vector_Sl_ViewShape_Sm__Sg__append(arg1,arg2);
@@ -38816,12 +38802,12 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_ViewShapesContainer__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *result = 0 ;
+  std::vector< ViewShape * > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_ViewShapesContainer")) SWIG_fail;
   {
     try {
-      result = (std::vector<ViewShape * > *)new std::vector<ViewShape * >();
+      result = (std::vector< ViewShape * > *)new std::vector< ViewShape * >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -38830,7 +38816,7 @@ SWIGINTERN PyObject *_wrap_new_ViewShapesContainer__SWIG_0(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -38839,26 +38825,26 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_ViewShapesContainer__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = 0 ;
-  std::vector<ViewShape * > *result = 0 ;
+  std::vector< ViewShape * > *arg1 = 0 ;
+  std::vector< ViewShape * > *result = 0 ;
   int res1 = SWIG_OLDOBJ ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_ViewShapesContainer",&obj0)) SWIG_fail;
   {
-    std::vector<ViewShape*,std::allocator<ViewShape * > > *ptr = (std::vector<ViewShape*,std::allocator<ViewShape * > > *)0;
+    std::vector<ViewShape*,std::allocator< ViewShape * > > *ptr = (std::vector<ViewShape*,std::allocator< ViewShape * > > *)0;
     res1 = swig::asptr(obj0, &ptr);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ViewShapesContainer" "', argument " "1"" of type '" "std::vector<ViewShape * > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ViewShapesContainer" "', argument " "1"" of type '" "std::vector< ViewShape * > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ViewShapesContainer" "', argument " "1"" of type '" "std::vector<ViewShape * > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ViewShapesContainer" "', argument " "1"" of type '" "std::vector< ViewShape * > const &""'"); 
     }
     arg1 = ptr;
   }
   {
     try {
-      result = (std::vector<ViewShape * > *)new std::vector<ViewShape * >((std::vector<ViewShape * > const &)*arg1);
+      result = (std::vector< ViewShape * > *)new std::vector< ViewShape * >((std::vector< ViewShape * > const &)*arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -38867,7 +38853,7 @@ SWIGINTERN PyObject *_wrap_new_ViewShapesContainer__SWIG_1(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, SWIG_POINTER_NEW |  0 );
   if (SWIG_IsNewObj(res1)) delete arg1;
   return resultobj;
 fail:
@@ -38878,21 +38864,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_empty",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_empty" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_empty" "', argument " "1"" of type '" "std::vector< ViewShape * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   {
     try {
-      result = (bool)((std::vector<ViewShape * > const *)arg1)->empty();
+      result = (bool)((std::vector< ViewShape * > const *)arg1)->empty();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -38910,21 +38896,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::size_type result;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_size" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_size" "', argument " "1"" of type '" "std::vector< ViewShape * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   {
     try {
-      result = ((std::vector<ViewShape * > const *)arg1)->size();
+      result = ((std::vector< ViewShape * > const *)arg1)->size();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -38942,17 +38928,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_clear" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_clear" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   {
     try {
       (arg1)->clear();
@@ -38973,8 +38959,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * > *arg2 = 0 ;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -38983,19 +38969,19 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_swap(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewShapesContainer_swap",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_swap" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_swap" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t,  0 );
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShapesContainer_swap" "', argument " "2"" of type '" "std::vector<ViewShape * > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShapesContainer_swap" "', argument " "2"" of type '" "std::vector< ViewShape * > &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShapesContainer_swap" "', argument " "2"" of type '" "std::vector<ViewShape * > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShapesContainer_swap" "', argument " "2"" of type '" "std::vector< ViewShape * > &""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<ViewShape * > * >(argp2);
+  arg2 = reinterpret_cast< std::vector< ViewShape * > * >(argp2);
   {
     try {
       (arg1)->swap(*arg2);
@@ -39016,21 +39002,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  SwigValueWrapper<std::allocator<ViewShape * > > result;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  SwigValueWrapper< std::allocator< ViewShape * > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_get_allocator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_get_allocator" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_get_allocator" "', argument " "1"" of type '" "std::vector< ViewShape * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   {
     try {
-      result = ((std::vector<ViewShape * > const *)arg1)->get_allocator();
+      result = ((std::vector< ViewShape * > const *)arg1)->get_allocator();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -39039,30 +39025,30 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_get_allocator(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new std::vector<ViewShape * >::allocator_type(static_cast< const std::vector<ViewShape * >::allocator_type& >(result))), SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new std::vector< ViewShape * >::allocator_type(static_cast< const std::vector< ViewShape * >::allocator_type& >(result))), SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShapesContainer_begin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::iterator result;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::const_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_begin" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_begin" "', argument " "1"" of type '" "std::vector< ViewShape * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   {
     try {
-      result = (arg1)->begin();
+      result = ((std::vector< ViewShape * > const *)arg1)->begin();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -39071,7 +39057,7 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_begin__SWIG_0(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewShape * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewShape * >::const_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -39079,89 +39065,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShapesContainer_begin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::const_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_begin" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<ViewShape * > const *)arg1)->begin();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewShape * >::const_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ViewShapesContainer_begin(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewShapesContainer_begin__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewShapesContainer_begin__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewShapesContainer_begin'.\n  Possible C/C++ prototypes are:\n    begin()\n    begin()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ViewShapesContainer_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::iterator result;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::const_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_end" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_end" "', argument " "1"" of type '" "std::vector< ViewShape * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   {
     try {
-      result = (arg1)->end();
+      result = ((std::vector< ViewShape * > const *)arg1)->end();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -39170,7 +39090,7 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_end__SWIG_0(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewShape * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewShape * >::const_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -39178,89 +39098,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShapesContainer_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_rbegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::const_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_end" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<ViewShape * > const *)arg1)->end();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewShape * >::const_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ViewShapesContainer_end(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewShapesContainer_end__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewShapesContainer_end__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewShapesContainer_end'.\n  Possible C/C++ prototypes are:\n    end()\n    end()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ViewShapesContainer_rbegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::reverse_iterator result;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::const_reverse_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_rbegin" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_rbegin" "', argument " "1"" of type '" "std::vector< ViewShape * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   {
     try {
-      result = (arg1)->rbegin();
+      result = ((std::vector< ViewShape * > const *)arg1)->rbegin();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -39269,7 +39123,7 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_rbegin__SWIG_0(PyObject *SWIGUNUS
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewShape * >::reverse_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewShape * >::const_reverse_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -39277,89 +39131,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShapesContainer_rbegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_rend(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::const_reverse_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_rbegin" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<ViewShape * > const *)arg1)->rbegin();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewShape * >::const_reverse_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ViewShapesContainer_rbegin(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewShapesContainer_rbegin__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewShapesContainer_rbegin__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewShapesContainer_rbegin'.\n  Possible C/C++ prototypes are:\n    rbegin()\n    rbegin()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ViewShapesContainer_rend__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::reverse_iterator result;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::const_reverse_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_rend" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_rend" "', argument " "1"" of type '" "std::vector< ViewShape * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   {
     try {
-      result = (arg1)->rend();
+      result = ((std::vector< ViewShape * > const *)arg1)->rend();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -39368,7 +39156,7 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_rend__SWIG_0(PyObject *SWIGUNUSED
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewShape * >::reverse_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewShape * >::const_reverse_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -39376,76 +39164,10 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShapesContainer_rend__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::const_reverse_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_rend" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<ViewShape * > const *)arg1)->rend();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewShape * >::const_reverse_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ViewShapesContainer_rend(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewShapesContainer_rend__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewShapesContainer_rend__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewShapesContainer_rend'.\n  Possible C/C++ prototypes are:\n    rend()\n    rend()\n");
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_new_ViewShapesContainer__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * >::size_type arg1 ;
-  std::vector<ViewShape * > *result = 0 ;
+  std::vector< ViewShape * >::size_type arg1 ;
+  std::vector< ViewShape * > *result = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -39453,12 +39175,12 @@ SWIGINTERN PyObject *_wrap_new_ViewShapesContainer__SWIG_2(PyObject *SWIGUNUSEDP
   if (!PyArg_ParseTuple(args,(char *)"O:new_ViewShapesContainer",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ViewShapesContainer" "', argument " "1"" of type '" "std::vector<ViewShape * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ViewShapesContainer" "', argument " "1"" of type '" "std::vector< ViewShape * >::size_type""'");
   } 
-  arg1 = static_cast< std::vector<ViewShape * >::size_type >(val1);
+  arg1 = static_cast< std::vector< ViewShape * >::size_type >(val1);
   {
     try {
-      result = (std::vector<ViewShape * > *)new std::vector<ViewShape * >(arg1);
+      result = (std::vector< ViewShape * > *)new std::vector< ViewShape * >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -39467,7 +39189,7 @@ SWIGINTERN PyObject *_wrap_new_ViewShapesContainer__SWIG_2(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -39476,17 +39198,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_pop_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_pop_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_pop_back" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_pop_back" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   {
     try {
       (arg1)->pop_back();
@@ -39507,8 +39229,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::size_type arg2 ;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::size_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -39517,16 +39239,16 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_resize__SWIG_0(PyObject *SWIGUNUS
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewShapesContainer_resize",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_resize" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_resize" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer_resize" "', argument " "2"" of type '" "std::vector<ViewShape * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer_resize" "', argument " "2"" of type '" "std::vector< ViewShape * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewShape * >::size_type >(val2);
+  arg2 = static_cast< std::vector< ViewShape * >::size_type >(val2);
   {
     try {
       (arg1)->resize(arg2);
@@ -39547,9 +39269,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::iterator arg2 ;
-  std::vector<ViewShape * >::iterator result;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::iterator arg2 ;
+  std::vector< ViewShape * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -39558,20 +39280,20 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_erase__SWIG_0(PyObject *SWIGUNUSE
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewShapesContainer_erase",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_erase" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_erase" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewShape * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_erase" "', argument " "2"" of type '" "std::vector< ViewShape * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< ViewShape * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< ViewShape * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewShape * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_erase" "', argument " "2"" of type '" "std::vector< ViewShape * >::iterator""'");
     }
   }
   {
@@ -39585,7 +39307,7 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_erase__SWIG_0(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewShape * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewShape * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -39595,10 +39317,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::iterator arg2 ;
-  std::vector<ViewShape * >::iterator arg3 ;
-  std::vector<ViewShape * >::iterator result;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::iterator arg2 ;
+  std::vector< ViewShape * >::iterator arg3 ;
+  std::vector< ViewShape * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -39610,31 +39332,31 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_erase__SWIG_1(PyObject *SWIGUNUSE
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewShapesContainer_erase",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_erase" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_erase" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewShape * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_erase" "', argument " "2"" of type '" "std::vector< ViewShape * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< ViewShape * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< ViewShape * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewShape * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_erase" "', argument " "2"" of type '" "std::vector< ViewShape * >::iterator""'");
     }
   }
   res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res3) || !iter3) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_erase" "', argument " "3"" of type '" "std::vector<ViewShape * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_erase" "', argument " "3"" of type '" "std::vector< ViewShape * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *>(iter3);
+    swig::PySwigIterator_T<std::vector< ViewShape * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< ViewShape * >::iterator > *>(iter3);
     if (iter_t) {
       arg3 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_erase" "', argument " "3"" of type '" "std::vector<ViewShape * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_erase" "', argument " "3"" of type '" "std::vector< ViewShape * >::iterator""'");
     }
   }
   {
@@ -39648,7 +39370,7 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_erase__SWIG_1(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewShape * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewShape * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -39662,18 +39384,18 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_erase(PyObject *self, PyObject *a
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator< ViewShape * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< ViewShape * >::iterator > *>(iter) != 0));
       if (_v) {
         return _wrap_ViewShapesContainer_erase__SWIG_0(self, args);
       }
@@ -39681,16 +39403,16 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_erase(PyObject *self, PyObject *a
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator< ViewShape * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< ViewShape * >::iterator > *>(iter) != 0));
       if (_v) {
         swig::PySwigIterator *iter = 0;
         int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *>(iter) != 0));
+        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< ViewShape * >::iterator > *>(iter) != 0));
         if (_v) {
           return _wrap_ViewShapesContainer_erase__SWIG_1(self, args);
         }
@@ -39699,16 +39421,19 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_erase(PyObject *self, PyObject *a
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewShapesContainer_erase'.\n  Possible C/C++ prototypes are:\n    erase(std::vector<ViewShape * >::iterator)\n    erase(std::vector<ViewShape * >::iterator,std::vector<ViewShape * >::iterator)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewShapesContainer_erase'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    erase(std::vector< ViewShape * > *,std::vector< ViewShape * >::iterator)\n"
+    "    erase(std::vector< ViewShape * > *,std::vector< ViewShape * >::iterator,std::vector< ViewShape * >::iterator)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_new_ViewShapesContainer__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * >::size_type arg1 ;
-  std::vector<ViewShape * >::value_type arg2 = (std::vector<ViewShape * >::value_type) 0 ;
-  std::vector<ViewShape * > *result = 0 ;
+  std::vector< ViewShape * >::size_type arg1 ;
+  std::vector< ViewShape * >::value_type arg2 = (std::vector< ViewShape * >::value_type) 0 ;
+  std::vector< ViewShape * > *result = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   void *argp2 = 0 ;
@@ -39719,17 +39444,17 @@ SWIGINTERN PyObject *_wrap_new_ViewShapesContainer__SWIG_3(PyObject *SWIGUNUSEDP
   if (!PyArg_ParseTuple(args,(char *)"OO:new_ViewShapesContainer",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ViewShapesContainer" "', argument " "1"" of type '" "std::vector<ViewShape * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ViewShapesContainer" "', argument " "1"" of type '" "std::vector< ViewShape * >::size_type""'");
   } 
-  arg1 = static_cast< std::vector<ViewShape * >::size_type >(val1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
+  arg1 = static_cast< std::vector< ViewShape * >::size_type >(val1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ViewShapesContainer" "', argument " "2"" of type '" "std::vector<ViewShape * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ViewShapesContainer" "', argument " "2"" of type '" "std::vector< ViewShape * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<ViewShape * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector< ViewShape * >::value_type >(argp2);
   {
     try {
-      result = (std::vector<ViewShape * > *)new std::vector<ViewShape * >(arg1,arg2);
+      result = (std::vector< ViewShape * > *)new std::vector< ViewShape * >(arg1,arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -39738,7 +39463,7 @@ SWIGINTERN PyObject *_wrap_new_ViewShapesContainer__SWIG_3(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -39751,7 +39476,7 @@ SWIGINTERN PyObject *_wrap_new_ViewShapesContainer(PyObject *self, PyObject *arg
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -39770,7 +39495,7 @@ SWIGINTERN PyObject *_wrap_new_ViewShapesContainer(PyObject *self, PyObject *arg
   }
   if (argc == 1) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator< ViewShape * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_new_ViewShapesContainer__SWIG_1(self, args);
@@ -39784,7 +39509,7 @@ SWIGINTERN PyObject *_wrap_new_ViewShapesContainer(PyObject *self, PyObject *arg
     }
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_new_ViewShapesContainer__SWIG_3(self, args);
@@ -39793,15 +39518,20 @@ SWIGINTERN PyObject *_wrap_new_ViewShapesContainer(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewShapesContainer'.\n  Possible C/C++ prototypes are:\n    std::vector<(p.ViewShape)>()\n    std::vector<(p.ViewShape)>(std::vector<ViewShape * > const &)\n    std::vector<(p.ViewShape)>(std::vector<ViewShape * >::size_type)\n    std::vector<(p.ViewShape)>(std::vector<ViewShape * >::size_type,std::vector<ViewShape * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewShapesContainer'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    std::vector< ViewShape * >()\n"
+    "    std::vector< ViewShape * >(std::vector< ViewShape * > const &)\n"
+    "    std::vector< ViewShape * >(std::vector< ViewShape * >::size_type)\n"
+    "    std::vector< ViewShape * >(std::vector< ViewShape * >::size_type,std::vector< ViewShape * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_push_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::value_type arg2 = (std::vector<ViewShape * >::value_type) 0 ;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::value_type arg2 = (std::vector< ViewShape * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -39810,16 +39540,16 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_push_back(PyObject *SWIGUNUSEDPAR
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewShapesContainer_push_back",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_push_back" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_push_back" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShapesContainer_push_back" "', argument " "2"" of type '" "std::vector<ViewShape * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShapesContainer_push_back" "', argument " "2"" of type '" "std::vector< ViewShape * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<ViewShape * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector< ViewShape * >::value_type >(argp2);
   {
     try {
       (arg1)->push_back(arg2);
@@ -39840,21 +39570,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_front(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::value_type result;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_front",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_front" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_front" "', argument " "1"" of type '" "std::vector< ViewShape * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   {
     try {
-      result = (std::vector<ViewShape * >::value_type)((std::vector<ViewShape * > const *)arg1)->front();
+      result = (std::vector< ViewShape * >::value_type)((std::vector< ViewShape * > const *)arg1)->front();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -39863,7 +39593,7 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_front(PyObject *SWIGUNUSEDPARM(se
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -39872,21 +39602,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::value_type result;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_back" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_back" "', argument " "1"" of type '" "std::vector< ViewShape * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   {
     try {
-      result = (std::vector<ViewShape * >::value_type)((std::vector<ViewShape * > const *)arg1)->back();
+      result = (std::vector< ViewShape * >::value_type)((std::vector< ViewShape * > const *)arg1)->back();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -39895,7 +39625,7 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_back(PyObject *SWIGUNUSEDPARM(sel
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -39904,9 +39634,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_assign(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::size_type arg2 ;
-  std::vector<ViewShape * >::value_type arg3 = (std::vector<ViewShape * >::value_type) 0 ;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::size_type arg2 ;
+  std::vector< ViewShape * >::value_type arg3 = (std::vector< ViewShape * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -39918,21 +39648,21 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_assign(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewShapesContainer_assign",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_assign" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_assign" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer_assign" "', argument " "2"" of type '" "std::vector<ViewShape * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer_assign" "', argument " "2"" of type '" "std::vector< ViewShape * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewShape * >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector< ViewShape * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewShapesContainer_assign" "', argument " "3"" of type '" "std::vector<ViewShape * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewShapesContainer_assign" "', argument " "3"" of type '" "std::vector< ViewShape * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<ViewShape * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< ViewShape * >::value_type >(argp3);
   {
     try {
       (arg1)->assign(arg2,arg3);
@@ -39953,9 +39683,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::size_type arg2 ;
-  std::vector<ViewShape * >::value_type arg3 = (std::vector<ViewShape * >::value_type) 0 ;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::size_type arg2 ;
+  std::vector< ViewShape * >::value_type arg3 = (std::vector< ViewShape * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -39967,21 +39697,21 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_resize__SWIG_1(PyObject *SWIGUNUS
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewShapesContainer_resize",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_resize" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_resize" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer_resize" "', argument " "2"" of type '" "std::vector<ViewShape * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer_resize" "', argument " "2"" of type '" "std::vector< ViewShape * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewShape * >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector< ViewShape * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewShapesContainer_resize" "', argument " "3"" of type '" "std::vector<ViewShape * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewShapesContainer_resize" "', argument " "3"" of type '" "std::vector< ViewShape * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<ViewShape * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< ViewShape * >::value_type >(argp3);
   {
     try {
       (arg1)->resize(arg2,arg3);
@@ -40006,13 +39736,13 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_resize(PyObject *self, PyObject *
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator< ViewShape * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -40026,7 +39756,7 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_resize(PyObject *self, PyObject *
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator< ViewShape * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -40035,7 +39765,7 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_resize(PyObject *self, PyObject *
       }
       if (_v) {
         void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0);
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           return _wrap_ViewShapesContainer_resize__SWIG_1(self, args);
@@ -40045,17 +39775,20 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_resize(PyObject *self, PyObject *
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewShapesContainer_resize'.\n  Possible C/C++ prototypes are:\n    resize(std::vector<ViewShape * >::size_type)\n    resize(std::vector<ViewShape * >::size_type,std::vector<ViewShape * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewShapesContainer_resize'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    resize(std::vector< ViewShape * > *,std::vector< ViewShape * >::size_type)\n"
+    "    resize(std::vector< ViewShape * > *,std::vector< ViewShape * >::size_type,std::vector< ViewShape * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::iterator arg2 ;
-  std::vector<ViewShape * >::value_type arg3 = (std::vector<ViewShape * >::value_type) 0 ;
-  std::vector<ViewShape * >::iterator result;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::iterator arg2 ;
+  std::vector< ViewShape * >::value_type arg3 = (std::vector< ViewShape * >::value_type) 0 ;
+  std::vector< ViewShape * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -40067,27 +39800,27 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_insert__SWIG_0(PyObject *SWIGUNUS
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewShapesContainer_insert",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_insert" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_insert" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewShape * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_insert" "', argument " "2"" of type '" "std::vector< ViewShape * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< ViewShape * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< ViewShape * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewShape * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_insert" "', argument " "2"" of type '" "std::vector< ViewShape * >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewShapesContainer_insert" "', argument " "3"" of type '" "std::vector<ViewShape * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewShapesContainer_insert" "', argument " "3"" of type '" "std::vector< ViewShape * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<ViewShape * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< ViewShape * >::value_type >(argp3);
   {
     try {
       result = (arg1)->insert(arg2,arg3);
@@ -40099,7 +39832,7 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_insert__SWIG_0(PyObject *SWIGUNUS
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewShape * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewShape * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -40109,10 +39842,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::iterator arg2 ;
-  std::vector<ViewShape * >::size_type arg3 ;
-  std::vector<ViewShape * >::value_type arg4 = (std::vector<ViewShape * >::value_type) 0 ;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::iterator arg2 ;
+  std::vector< ViewShape * >::size_type arg3 ;
+  std::vector< ViewShape * >::value_type arg4 = (std::vector< ViewShape * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -40127,32 +39860,32 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_insert__SWIG_1(PyObject *SWIGUNUS
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:ViewShapesContainer_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_insert" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_insert" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewShape * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_insert" "', argument " "2"" of type '" "std::vector< ViewShape * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< ViewShape * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< ViewShape * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewShape * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_insert" "', argument " "2"" of type '" "std::vector< ViewShape * >::iterator""'");
     }
   }
   ecode3 = SWIG_AsVal_size_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewShapesContainer_insert" "', argument " "3"" of type '" "std::vector<ViewShape * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewShapesContainer_insert" "', argument " "3"" of type '" "std::vector< ViewShape * >::size_type""'");
   } 
-  arg3 = static_cast< std::vector<ViewShape * >::size_type >(val3);
-  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
+  arg3 = static_cast< std::vector< ViewShape * >::size_type >(val3);
+  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewShapesContainer_insert" "', argument " "4"" of type '" "std::vector<ViewShape * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewShapesContainer_insert" "', argument " "4"" of type '" "std::vector< ViewShape * >::value_type""'"); 
   }
-  arg4 = reinterpret_cast< std::vector<ViewShape * >::value_type >(argp4);
+  arg4 = reinterpret_cast< std::vector< ViewShape * >::value_type >(argp4);
   {
     try {
       (arg1)->insert(arg2,arg3,arg4);
@@ -40177,21 +39910,21 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_insert(PyObject *self, PyObject *
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator< ViewShape * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< ViewShape * >::iterator > *>(iter) != 0));
       if (_v) {
         void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0);
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           return _wrap_ViewShapesContainer_insert__SWIG_0(self, args);
@@ -40201,12 +39934,12 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_insert(PyObject *self, PyObject *
   }
   if (argc == 4) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator< ViewShape * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< ViewShape * >::iterator > *>(iter) != 0));
       if (_v) {
         {
           int res = SWIG_AsVal_size_t(argv[2], NULL);
@@ -40214,7 +39947,7 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_insert(PyObject *self, PyObject *
         }
         if (_v) {
           void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0);
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0);
           _v = SWIG_CheckState(res);
           if (_v) {
             return _wrap_ViewShapesContainer_insert__SWIG_1(self, args);
@@ -40225,15 +39958,18 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_insert(PyObject *self, PyObject *
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewShapesContainer_insert'.\n  Possible C/C++ prototypes are:\n    insert(std::vector<ViewShape * >::iterator,std::vector<ViewShape * >::value_type)\n    insert(std::vector<ViewShape * >::iterator,std::vector<ViewShape * >::size_type,std::vector<ViewShape * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewShapesContainer_insert'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    insert(std::vector< ViewShape * > *,std::vector< ViewShape * >::iterator,std::vector< ViewShape * >::value_type)\n"
+    "    insert(std::vector< ViewShape * > *,std::vector< ViewShape * >::iterator,std::vector< ViewShape * >::size_type,std::vector< ViewShape * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_reserve(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::size_type arg2 ;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::size_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -40242,16 +39978,16 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_reserve(PyObject *SWIGUNUSEDPARM(
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewShapesContainer_reserve",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_reserve" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_reserve" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer_reserve" "', argument " "2"" of type '" "std::vector<ViewShape * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer_reserve" "', argument " "2"" of type '" "std::vector< ViewShape * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewShape * >::size_type >(val2);
+  arg2 = static_cast< std::vector< ViewShape * >::size_type >(val2);
   {
     try {
       (arg1)->reserve(arg2);
@@ -40272,21 +40008,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_capacity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::size_type result;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_capacity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_capacity" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_capacity" "', argument " "1"" of type '" "std::vector< ViewShape * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   {
     try {
-      result = ((std::vector<ViewShape * > const *)arg1)->capacity();
+      result = ((std::vector< ViewShape * > const *)arg1)->capacity();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -40304,17 +40040,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_ViewShapesContainer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_ViewShapesContainer",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ViewShapesContainer" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ViewShapesContainer" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   {
     try {
       delete arg1;
@@ -40336,14 +40072,14 @@ fail:
 
 SWIGINTERN PyObject *ViewShapesContainer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
   PyObject **arg2 = (PyObject **) 0 ;
   swig::PySwigIterator *result = 0 ;
   void *argp1 = 0 ;
@@ -40352,11 +40088,11 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_iterator(PyObject *SWIGUNUSEDPARM(
   
   arg2 = &obj0;
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_iterator" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_iterator" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   {
     try {
       result = (swig::PySwigIterator *)std_vector_Sl_ViewEdge_Sm__Sg__iterator(arg1,arg2);
@@ -40377,21 +40113,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer___nonzero__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer___nonzero__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___nonzero__" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___nonzero__" "', argument " "1"" of type '" "std::vector< ViewEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   {
     try {
-      result = (bool)std_vector_Sl_ViewEdge_Sm__Sg____nonzero__((std::vector<ViewEdge * > const *)arg1);
+      result = (bool)std_vector_Sl_ViewEdge_Sm__Sg____nonzero__((std::vector< ViewEdge * > const *)arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -40409,21 +40145,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer___len__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::size_type result;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer___len__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___len__" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___len__" "', argument " "1"" of type '" "std::vector< ViewEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   {
     try {
-      result = std_vector_Sl_ViewEdge_Sm__Sg____len__((std::vector<ViewEdge * > const *)arg1);
+      result = std_vector_Sl_ViewEdge_Sm__Sg____len__((std::vector< ViewEdge * > const *)arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -40441,22 +40177,22 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::value_type result;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_pop" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_pop" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   {
     try {
       try {
-        result = (std::vector<ViewEdge * >::value_type)std_vector_Sl_ViewEdge_Sm__Sg__pop(arg1);
+        result = (std::vector< ViewEdge * >::value_type)std_vector_Sl_ViewEdge_Sm__Sg__pop(arg1);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -40470,7 +40206,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_pop(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -40479,10 +40215,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::difference_type arg2 ;
-  std::vector<ViewEdge * >::difference_type arg3 ;
-  std::vector<ViewEdge *,std::allocator<ViewEdge * > > *result = 0 ;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::difference_type arg2 ;
+  std::vector< ViewEdge * >::difference_type arg3 ;
+  std::vector< ViewEdge *,std::allocator< ViewEdge * > > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -40494,25 +40230,25 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer___getslice__(PyObject *SWIGUNUSEDP
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewEdgesContainer___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___getslice__" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___getslice__" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer___getslice__" "', argument " "2"" of type '" "std::vector<ViewEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer___getslice__" "', argument " "2"" of type '" "std::vector< ViewEdge * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewEdge * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< ViewEdge * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewEdgesContainer___getslice__" "', argument " "3"" of type '" "std::vector<ViewEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewEdgesContainer___getslice__" "', argument " "3"" of type '" "std::vector< ViewEdge * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<ViewEdge * >::difference_type >(val3);
+  arg3 = static_cast< std::vector< ViewEdge * >::difference_type >(val3);
   {
     try {
       try {
-        result = (std::vector<ViewEdge *,std::allocator<ViewEdge * > > *)std_vector_Sl_ViewEdge_Sm__Sg____getslice__(arg1,arg2,arg3);
+        result = (std::vector< ViewEdge *,std::allocator< ViewEdge * > > *)std_vector_Sl_ViewEdge_Sm__Sg____getslice__(arg1,arg2,arg3);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -40526,7 +40262,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer___getslice__(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -40535,10 +40271,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer___setslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::difference_type arg2 ;
-  std::vector<ViewEdge * >::difference_type arg3 ;
-  std::vector<ViewEdge *,std::allocator<ViewEdge * > > *arg4 = 0 ;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::difference_type arg2 ;
+  std::vector< ViewEdge * >::difference_type arg3 ;
+  std::vector< ViewEdge *,std::allocator< ViewEdge * > > *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -40552,36 +40288,36 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer___setslice__(PyObject *SWIGUNUSEDP
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:ViewEdgesContainer___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___setslice__" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___setslice__" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer___setslice__" "', argument " "2"" of type '" "std::vector<ViewEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer___setslice__" "', argument " "2"" of type '" "std::vector< ViewEdge * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewEdge * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< ViewEdge * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewEdgesContainer___setslice__" "', argument " "3"" of type '" "std::vector<ViewEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewEdgesContainer___setslice__" "', argument " "3"" of type '" "std::vector< ViewEdge * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<ViewEdge * >::difference_type >(val3);
+  arg3 = static_cast< std::vector< ViewEdge * >::difference_type >(val3);
   {
-    std::vector<ViewEdge*,std::allocator<ViewEdge * > > *ptr = (std::vector<ViewEdge*,std::allocator<ViewEdge * > > *)0;
+    std::vector<ViewEdge*,std::allocator< ViewEdge * > > *ptr = (std::vector<ViewEdge*,std::allocator< ViewEdge * > > *)0;
     res4 = swig::asptr(obj3, &ptr);
     if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewEdgesContainer___setslice__" "', argument " "4"" of type '" "std::vector<ViewEdge *,std::allocator<ViewEdge * > > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewEdgesContainer___setslice__" "', argument " "4"" of type '" "std::vector< ViewEdge *,std::allocator< ViewEdge * > > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgesContainer___setslice__" "', argument " "4"" of type '" "std::vector<ViewEdge *,std::allocator<ViewEdge * > > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgesContainer___setslice__" "', argument " "4"" of type '" "std::vector< ViewEdge *,std::allocator< ViewEdge * > > const &""'"); 
     }
     arg4 = ptr;
   }
   {
     try {
       try {
-        std_vector_Sl_ViewEdge_Sm__Sg____setslice__(arg1,arg2,arg3,(std::vector<ViewEdge *,std::allocator<ViewEdge * > > const &)*arg4);
+        std_vector_Sl_ViewEdge_Sm__Sg____setslice__(arg1,arg2,arg3,(std::vector< ViewEdge *,std::allocator< ViewEdge * > > const &)*arg4);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -40609,9 +40345,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer___delslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::difference_type arg2 ;
-  std::vector<ViewEdge * >::difference_type arg3 ;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::difference_type arg2 ;
+  std::vector< ViewEdge * >::difference_type arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -40623,21 +40359,21 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer___delslice__(PyObject *SWIGUNUSEDP
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewEdgesContainer___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___delslice__" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___delslice__" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer___delslice__" "', argument " "2"" of type '" "std::vector<ViewEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer___delslice__" "', argument " "2"" of type '" "std::vector< ViewEdge * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewEdge * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< ViewEdge * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewEdgesContainer___delslice__" "', argument " "3"" of type '" "std::vector<ViewEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewEdgesContainer___delslice__" "', argument " "3"" of type '" "std::vector< ViewEdge * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<ViewEdge * >::difference_type >(val3);
+  arg3 = static_cast< std::vector< ViewEdge * >::difference_type >(val3);
   {
     try {
       try {
@@ -40664,8 +40400,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer___delitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::difference_type arg2 ;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::difference_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -40674,16 +40410,16 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer___delitem__(PyObject *SWIGUNUSEDPA
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgesContainer___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___delitem__" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___delitem__" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer___delitem__" "', argument " "2"" of type '" "std::vector<ViewEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer___delitem__" "', argument " "2"" of type '" "std::vector< ViewEdge * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewEdge * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< ViewEdge * >::difference_type >(val2);
   {
     try {
       try {
@@ -40710,9 +40446,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer___getitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::difference_type arg2 ;
-  std::vector<ViewEdge * >::value_type result;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::difference_type arg2 ;
+  std::vector< ViewEdge * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -40721,20 +40457,20 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer___getitem__(PyObject *SWIGUNUSEDPA
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgesContainer___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___getitem__" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___getitem__" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer___getitem__" "', argument " "2"" of type '" "std::vector<ViewEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer___getitem__" "', argument " "2"" of type '" "std::vector< ViewEdge * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewEdge * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< ViewEdge * >::difference_type >(val2);
   {
     try {
       try {
-        result = (std::vector<ViewEdge * >::value_type)std_vector_Sl_ViewEdge_Sm__Sg____getitem__(arg1,arg2);
+        result = (std::vector< ViewEdge * >::value_type)std_vector_Sl_ViewEdge_Sm__Sg____getitem__(arg1,arg2);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -40748,7 +40484,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer___getitem__(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -40757,9 +40493,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer___setitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::difference_type arg2 ;
-  std::vector<ViewEdge * >::value_type arg3 = (std::vector<ViewEdge * >::value_type) 0 ;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::difference_type arg2 ;
+  std::vector< ViewEdge * >::value_type arg3 = (std::vector< ViewEdge * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -40771,21 +40507,21 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer___setitem__(PyObject *SWIGUNUSEDPA
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewEdgesContainer___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___setitem__" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___setitem__" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer___setitem__" "', argument " "2"" of type '" "std::vector<ViewEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer___setitem__" "', argument " "2"" of type '" "std::vector< ViewEdge * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewEdge * >::difference_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector< ViewEdge * >::difference_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewEdgesContainer___setitem__" "', argument " "3"" of type '" "std::vector<ViewEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewEdgesContainer___setitem__" "', argument " "3"" of type '" "std::vector< ViewEdge * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<ViewEdge * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< ViewEdge * >::value_type >(argp3);
   {
     try {
       try {
@@ -40812,8 +40548,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::value_type arg2 = (std::vector<ViewEdge * >::value_type) 0 ;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::value_type arg2 = (std::vector< ViewEdge * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -40822,16 +40558,16 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_append(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgesContainer_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_append" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_append" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgesContainer_append" "', argument " "2"" of type '" "std::vector<ViewEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgesContainer_append" "', argument " "2"" of type '" "std::vector< ViewEdge * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<ViewEdge * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector< ViewEdge * >::value_type >(argp2);
   {
     try {
       std_vector_Sl_ViewEdge_Sm__Sg__append(arg1,arg2);
@@ -40852,12 +40588,12 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *result = 0 ;
+  std::vector< ViewEdge * > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_ViewEdgesContainer")) SWIG_fail;
   {
     try {
-      result = (std::vector<ViewEdge * > *)new std::vector<ViewEdge * >();
+      result = (std::vector< ViewEdge * > *)new std::vector< ViewEdge * >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -40866,7 +40602,7 @@ SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer__SWIG_0(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -40875,26 +40611,26 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = 0 ;
-  std::vector<ViewEdge * > *result = 0 ;
+  std::vector< ViewEdge * > *arg1 = 0 ;
+  std::vector< ViewEdge * > *result = 0 ;
   int res1 = SWIG_OLDOBJ ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_ViewEdgesContainer",&obj0)) SWIG_fail;
   {
-    std::vector<ViewEdge*,std::allocator<ViewEdge * > > *ptr = (std::vector<ViewEdge*,std::allocator<ViewEdge * > > *)0;
+    std::vector<ViewEdge*,std::allocator< ViewEdge * > > *ptr = (std::vector<ViewEdge*,std::allocator< ViewEdge * > > *)0;
     res1 = swig::asptr(obj0, &ptr);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ViewEdgesContainer" "', argument " "1"" of type '" "std::vector<ViewEdge * > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ViewEdgesContainer" "', argument " "1"" of type '" "std::vector< ViewEdge * > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ViewEdgesContainer" "', argument " "1"" of type '" "std::vector<ViewEdge * > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ViewEdgesContainer" "', argument " "1"" of type '" "std::vector< ViewEdge * > const &""'"); 
     }
     arg1 = ptr;
   }
   {
     try {
-      result = (std::vector<ViewEdge * > *)new std::vector<ViewEdge * >((std::vector<ViewEdge * > const &)*arg1);
+      result = (std::vector< ViewEdge * > *)new std::vector< ViewEdge * >((std::vector< ViewEdge * > const &)*arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -40903,7 +40639,7 @@ SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer__SWIG_1(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, SWIG_POINTER_NEW |  0 );
   if (SWIG_IsNewObj(res1)) delete arg1;
   return resultobj;
 fail:
@@ -40914,21 +40650,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_empty",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_empty" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_empty" "', argument " "1"" of type '" "std::vector< ViewEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   {
     try {
-      result = (bool)((std::vector<ViewEdge * > const *)arg1)->empty();
+      result = (bool)((std::vector< ViewEdge * > const *)arg1)->empty();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -40946,21 +40682,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::size_type result;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_size" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_size" "', argument " "1"" of type '" "std::vector< ViewEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   {
     try {
-      result = ((std::vector<ViewEdge * > const *)arg1)->size();
+      result = ((std::vector< ViewEdge * > const *)arg1)->size();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -40978,17 +40714,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_clear" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_clear" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   {
     try {
       (arg1)->clear();
@@ -41009,8 +40745,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * > *arg2 = 0 ;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -41019,19 +40755,19 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_swap(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgesContainer_swap",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_swap" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_swap" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t,  0 );
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgesContainer_swap" "', argument " "2"" of type '" "std::vector<ViewEdge * > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgesContainer_swap" "', argument " "2"" of type '" "std::vector< ViewEdge * > &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgesContainer_swap" "', argument " "2"" of type '" "std::vector<ViewEdge * > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgesContainer_swap" "', argument " "2"" of type '" "std::vector< ViewEdge * > &""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<ViewEdge * > * >(argp2);
+  arg2 = reinterpret_cast< std::vector< ViewEdge * > * >(argp2);
   {
     try {
       (arg1)->swap(*arg2);
@@ -41052,21 +40788,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  SwigValueWrapper<std::allocator<ViewEdge * > > result;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  SwigValueWrapper< std::allocator< ViewEdge * > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_get_allocator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_get_allocator" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_get_allocator" "', argument " "1"" of type '" "std::vector< ViewEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   {
     try {
-      result = ((std::vector<ViewEdge * > const *)arg1)->get_allocator();
+      result = ((std::vector< ViewEdge * > const *)arg1)->get_allocator();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -41075,30 +40811,30 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_get_allocator(PyObject *SWIGUNUSED
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new std::vector<ViewEdge * >::allocator_type(static_cast< const std::vector<ViewEdge * >::allocator_type& >(result))), SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new std::vector< ViewEdge * >::allocator_type(static_cast< const std::vector< ViewEdge * >::allocator_type& >(result))), SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdgesContainer_begin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::iterator result;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::const_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_begin" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_begin" "', argument " "1"" of type '" "std::vector< ViewEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   {
     try {
-      result = (arg1)->begin();
+      result = ((std::vector< ViewEdge * > const *)arg1)->begin();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -41107,7 +40843,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_begin__SWIG_0(PyObject *SWIGUNUSED
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewEdge * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewEdge * >::const_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -41115,89 +40851,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdgesContainer_begin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::const_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_begin" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<ViewEdge * > const *)arg1)->begin();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewEdge * >::const_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ViewEdgesContainer_begin(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewEdgesContainer_begin__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewEdgesContainer_begin__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgesContainer_begin'.\n  Possible C/C++ prototypes are:\n    begin()\n    begin()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ViewEdgesContainer_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::iterator result;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::const_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_end" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_end" "', argument " "1"" of type '" "std::vector< ViewEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   {
     try {
-      result = (arg1)->end();
+      result = ((std::vector< ViewEdge * > const *)arg1)->end();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -41206,7 +40876,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_end__SWIG_0(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewEdge * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewEdge * >::const_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -41214,89 +40884,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdgesContainer_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_rbegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::const_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_end" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<ViewEdge * > const *)arg1)->end();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewEdge * >::const_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ViewEdgesContainer_end(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewEdgesContainer_end__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewEdgesContainer_end__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgesContainer_end'.\n  Possible C/C++ prototypes are:\n    end()\n    end()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ViewEdgesContainer_rbegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::reverse_iterator result;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::const_reverse_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_rbegin" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_rbegin" "', argument " "1"" of type '" "std::vector< ViewEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   {
     try {
-      result = (arg1)->rbegin();
+      result = ((std::vector< ViewEdge * > const *)arg1)->rbegin();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -41305,7 +40909,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_rbegin__SWIG_0(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewEdge * >::reverse_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewEdge * >::const_reverse_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -41313,89 +40917,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdgesContainer_rbegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_rend(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::const_reverse_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_rbegin" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<ViewEdge * > const *)arg1)->rbegin();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewEdge * >::const_reverse_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ViewEdgesContainer_rbegin(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewEdgesContainer_rbegin__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewEdgesContainer_rbegin__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgesContainer_rbegin'.\n  Possible C/C++ prototypes are:\n    rbegin()\n    rbegin()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ViewEdgesContainer_rend__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::reverse_iterator result;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::const_reverse_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_rend" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_rend" "', argument " "1"" of type '" "std::vector< ViewEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   {
     try {
-      result = (arg1)->rend();
+      result = ((std::vector< ViewEdge * > const *)arg1)->rend();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -41404,7 +40942,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_rend__SWIG_0(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewEdge * >::reverse_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewEdge * >::const_reverse_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -41412,76 +40950,10 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdgesContainer_rend__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::const_reverse_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_rend" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<ViewEdge * > const *)arg1)->rend();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewEdge * >::const_reverse_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ViewEdgesContainer_rend(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewEdgesContainer_rend__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewEdgesContainer_rend__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgesContainer_rend'.\n  Possible C/C++ prototypes are:\n    rend()\n    rend()\n");
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * >::size_type arg1 ;
-  std::vector<ViewEdge * > *result = 0 ;
+  std::vector< ViewEdge * >::size_type arg1 ;
+  std::vector< ViewEdge * > *result = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -41489,12 +40961,12 @@ SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer__SWIG_2(PyObject *SWIGUNUSEDPA
   if (!PyArg_ParseTuple(args,(char *)"O:new_ViewEdgesContainer",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ViewEdgesContainer" "', argument " "1"" of type '" "std::vector<ViewEdge * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ViewEdgesContainer" "', argument " "1"" of type '" "std::vector< ViewEdge * >::size_type""'");
   } 
-  arg1 = static_cast< std::vector<ViewEdge * >::size_type >(val1);
+  arg1 = static_cast< std::vector< ViewEdge * >::size_type >(val1);
   {
     try {
-      result = (std::vector<ViewEdge * > *)new std::vector<ViewEdge * >(arg1);
+      result = (std::vector< ViewEdge * > *)new std::vector< ViewEdge * >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -41503,7 +40975,7 @@ SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer__SWIG_2(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -41512,17 +40984,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_pop_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_pop_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_pop_back" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_pop_back" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   {
     try {
       (arg1)->pop_back();
@@ -41543,8 +41015,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::size_type arg2 ;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::size_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -41553,16 +41025,16 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_resize__SWIG_0(PyObject *SWIGUNUSE
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgesContainer_resize",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_resize" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_resize" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer_resize" "', argument " "2"" of type '" "std::vector<ViewEdge * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer_resize" "', argument " "2"" of type '" "std::vector< ViewEdge * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewEdge * >::size_type >(val2);
+  arg2 = static_cast< std::vector< ViewEdge * >::size_type >(val2);
   {
     try {
       (arg1)->resize(arg2);
@@ -41583,9 +41055,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::iterator arg2 ;
-  std::vector<ViewEdge * >::iterator result;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::iterator arg2 ;
+  std::vector< ViewEdge * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -41594,20 +41066,20 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_erase__SWIG_0(PyObject *SWIGUNUSED
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgesContainer_erase",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_erase" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_erase" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewEdge * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_erase" "', argument " "2"" of type '" "std::vector< ViewEdge * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< ViewEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< ViewEdge * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewEdge * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_erase" "', argument " "2"" of type '" "std::vector< ViewEdge * >::iterator""'");
     }
   }
   {
@@ -41621,7 +41093,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_erase__SWIG_0(PyObject *SWIGUNUSED
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewEdge * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewEdge * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -41631,10 +41103,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::iterator arg2 ;
-  std::vector<ViewEdge * >::iterator arg3 ;
-  std::vector<ViewEdge * >::iterator result;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::iterator arg2 ;
+  std::vector< ViewEdge * >::iterator arg3 ;
+  std::vector< ViewEdge * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -41646,31 +41118,31 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_erase__SWIG_1(PyObject *SWIGUNUSED
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewEdgesContainer_erase",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_erase" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_erase" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewEdge * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_erase" "', argument " "2"" of type '" "std::vector< ViewEdge * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< ViewEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< ViewEdge * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewEdge * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_erase" "', argument " "2"" of type '" "std::vector< ViewEdge * >::iterator""'");
     }
   }
   res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res3) || !iter3) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_erase" "', argument " "3"" of type '" "std::vector<ViewEdge * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_erase" "', argument " "3"" of type '" "std::vector< ViewEdge * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *>(iter3);
+    swig::PySwigIterator_T<std::vector< ViewEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< ViewEdge * >::iterator > *>(iter3);
     if (iter_t) {
       arg3 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_erase" "', argument " "3"" of type '" "std::vector<ViewEdge * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_erase" "', argument " "3"" of type '" "std::vector< ViewEdge * >::iterator""'");
     }
   }
   {
@@ -41684,7 +41156,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_erase__SWIG_1(PyObject *SWIGUNUSED
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewEdge * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewEdge * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -41698,18 +41170,18 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_erase(PyObject *self, PyObject *ar
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator< ViewEdge * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< ViewEdge * >::iterator > *>(iter) != 0));
       if (_v) {
         return _wrap_ViewEdgesContainer_erase__SWIG_0(self, args);
       }
@@ -41717,16 +41189,16 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_erase(PyObject *self, PyObject *ar
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator< ViewEdge * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< ViewEdge * >::iterator > *>(iter) != 0));
       if (_v) {
         swig::PySwigIterator *iter = 0;
         int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *>(iter) != 0));
+        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< ViewEdge * >::iterator > *>(iter) != 0));
         if (_v) {
           return _wrap_ViewEdgesContainer_erase__SWIG_1(self, args);
         }
@@ -41735,16 +41207,19 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_erase(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgesContainer_erase'.\n  Possible C/C++ prototypes are:\n    erase(std::vector<ViewEdge * >::iterator)\n    erase(std::vector<ViewEdge * >::iterator,std::vector<ViewEdge * >::iterator)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgesContainer_erase'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    erase(std::vector< ViewEdge * > *,std::vector< ViewEdge * >::iterator)\n"
+    "    erase(std::vector< ViewEdge * > *,std::vector< ViewEdge * >::iterator,std::vector< ViewEdge * >::iterator)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * >::size_type arg1 ;
-  std::vector<ViewEdge * >::value_type arg2 = (std::vector<ViewEdge * >::value_type) 0 ;
-  std::vector<ViewEdge * > *result = 0 ;
+  std::vector< ViewEdge * >::size_type arg1 ;
+  std::vector< ViewEdge * >::value_type arg2 = (std::vector< ViewEdge * >::value_type) 0 ;
+  std::vector< ViewEdge * > *result = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   void *argp2 = 0 ;
@@ -41755,17 +41230,17 @@ SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer__SWIG_3(PyObject *SWIGUNUSEDPA
   if (!PyArg_ParseTuple(args,(char *)"OO:new_ViewEdgesContainer",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ViewEdgesContainer" "', argument " "1"" of type '" "std::vector<ViewEdge * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ViewEdgesContainer" "', argument " "1"" of type '" "std::vector< ViewEdge * >::size_type""'");
   } 
-  arg1 = static_cast< std::vector<ViewEdge * >::size_type >(val1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
+  arg1 = static_cast< std::vector< ViewEdge * >::size_type >(val1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ViewEdgesContainer" "', argument " "2"" of type '" "std::vector<ViewEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ViewEdgesContainer" "', argument " "2"" of type '" "std::vector< ViewEdge * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<ViewEdge * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector< ViewEdge * >::value_type >(argp2);
   {
     try {
-      result = (std::vector<ViewEdge * > *)new std::vector<ViewEdge * >(arg1,arg2);
+      result = (std::vector< ViewEdge * > *)new std::vector< ViewEdge * >(arg1,arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -41774,7 +41249,7 @@ SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer__SWIG_3(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -41787,7 +41262,7 @@ SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer(PyObject *self, PyObject *args
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -41806,7 +41281,7 @@ SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer(PyObject *self, PyObject *args
   }
   if (argc == 1) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator< ViewEdge * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_new_ViewEdgesContainer__SWIG_1(self, args);
@@ -41820,7 +41295,7 @@ SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer(PyObject *self, PyObject *args
     }
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_new_ViewEdgesContainer__SWIG_3(self, args);
@@ -41829,15 +41304,20 @@ SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer(PyObject *self, PyObject *args
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewEdgesContainer'.\n  Possible C/C++ prototypes are:\n    std::vector<(p.ViewEdge)>()\n    std::vector<(p.ViewEdge)>(std::vector<ViewEdge * > const &)\n    std::vector<(p.ViewEdge)>(std::vector<ViewEdge * >::size_type)\n    std::vector<(p.ViewEdge)>(std::vector<ViewEdge * >::size_type,std::vector<ViewEdge * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewEdgesContainer'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    std::vector< ViewEdge * >()\n"
+    "    std::vector< ViewEdge * >(std::vector< ViewEdge * > const &)\n"
+    "    std::vector< ViewEdge * >(std::vector< ViewEdge * >::size_type)\n"
+    "    std::vector< ViewEdge * >(std::vector< ViewEdge * >::size_type,std::vector< ViewEdge * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_push_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::value_type arg2 = (std::vector<ViewEdge * >::value_type) 0 ;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::value_type arg2 = (std::vector< ViewEdge * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -41846,16 +41326,16 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_push_back(PyObject *SWIGUNUSEDPARM
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgesContainer_push_back",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_push_back" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_push_back" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgesContainer_push_back" "', argument " "2"" of type '" "std::vector<ViewEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgesContainer_push_back" "', argument " "2"" of type '" "std::vector< ViewEdge * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<ViewEdge * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector< ViewEdge * >::value_type >(argp2);
   {
     try {
       (arg1)->push_back(arg2);
@@ -41876,21 +41356,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_front(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::value_type result;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_front",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_front" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_front" "', argument " "1"" of type '" "std::vector< ViewEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   {
     try {
-      result = (std::vector<ViewEdge * >::value_type)((std::vector<ViewEdge * > const *)arg1)->front();
+      result = (std::vector< ViewEdge * >::value_type)((std::vector< ViewEdge * > const *)arg1)->front();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -41899,7 +41379,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_front(PyObject *SWIGUNUSEDPARM(sel
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -41908,21 +41388,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::value_type result;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_back" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_back" "', argument " "1"" of type '" "std::vector< ViewEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   {
     try {
-      result = (std::vector<ViewEdge * >::value_type)((std::vector<ViewEdge * > const *)arg1)->back();
+      result = (std::vector< ViewEdge * >::value_type)((std::vector< ViewEdge * > const *)arg1)->back();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -41931,7 +41411,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_back(PyObject *SWIGUNUSEDPARM(self
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -41940,9 +41420,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_assign(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::size_type arg2 ;
-  std::vector<ViewEdge * >::value_type arg3 = (std::vector<ViewEdge * >::value_type) 0 ;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::size_type arg2 ;
+  std::vector< ViewEdge * >::value_type arg3 = (std::vector< ViewEdge * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -41954,21 +41434,21 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_assign(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewEdgesContainer_assign",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_assign" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_assign" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer_assign" "', argument " "2"" of type '" "std::vector<ViewEdge * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer_assign" "', argument " "2"" of type '" "std::vector< ViewEdge * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewEdge * >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector< ViewEdge * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewEdgesContainer_assign" "', argument " "3"" of type '" "std::vector<ViewEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewEdgesContainer_assign" "', argument " "3"" of type '" "std::vector< ViewEdge * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<ViewEdge * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< ViewEdge * >::value_type >(argp3);
   {
     try {
       (arg1)->assign(arg2,arg3);
@@ -41989,9 +41469,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::size_type arg2 ;
-  std::vector<ViewEdge * >::value_type arg3 = (std::vector<ViewEdge * >::value_type) 0 ;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::size_type arg2 ;
+  std::vector< ViewEdge * >::value_type arg3 = (std::vector< ViewEdge * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -42003,21 +41483,21 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_resize__SWIG_1(PyObject *SWIGUNUSE
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewEdgesContainer_resize",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_resize" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_resize" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer_resize" "', argument " "2"" of type '" "std::vector<ViewEdge * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer_resize" "', argument " "2"" of type '" "std::vector< ViewEdge * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewEdge * >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector< ViewEdge * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewEdgesContainer_resize" "', argument " "3"" of type '" "std::vector<ViewEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewEdgesContainer_resize" "', argument " "3"" of type '" "std::vector< ViewEdge * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<ViewEdge * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< ViewEdge * >::value_type >(argp3);
   {
     try {
       (arg1)->resize(arg2,arg3);
@@ -42042,13 +41522,13 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_resize(PyObject *self, PyObject *a
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator< ViewEdge * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -42062,7 +41542,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_resize(PyObject *self, PyObject *a
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator< ViewEdge * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -42071,7 +41551,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_resize(PyObject *self, PyObject *a
       }
       if (_v) {
         void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0);
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           return _wrap_ViewEdgesContainer_resize__SWIG_1(self, args);
@@ -42081,17 +41561,20 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_resize(PyObject *self, PyObject *a
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgesContainer_resize'.\n  Possible C/C++ prototypes are:\n    resize(std::vector<ViewEdge * >::size_type)\n    resize(std::vector<ViewEdge * >::size_type,std::vector<ViewEdge * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgesContainer_resize'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    resize(std::vector< ViewEdge * > *,std::vector< ViewEdge * >::size_type)\n"
+    "    resize(std::vector< ViewEdge * > *,std::vector< ViewEdge * >::size_type,std::vector< ViewEdge * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::iterator arg2 ;
-  std::vector<ViewEdge * >::value_type arg3 = (std::vector<ViewEdge * >::value_type) 0 ;
-  std::vector<ViewEdge * >::iterator result;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::iterator arg2 ;
+  std::vector< ViewEdge * >::value_type arg3 = (std::vector< ViewEdge * >::value_type) 0 ;
+  std::vector< ViewEdge * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -42103,27 +41586,27 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_insert__SWIG_0(PyObject *SWIGUNUSE
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewEdgesContainer_insert",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_insert" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_insert" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewEdge * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_insert" "', argument " "2"" of type '" "std::vector< ViewEdge * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< ViewEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< ViewEdge * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewEdge * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_insert" "', argument " "2"" of type '" "std::vector< ViewEdge * >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewEdgesContainer_insert" "', argument " "3"" of type '" "std::vector<ViewEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewEdgesContainer_insert" "', argument " "3"" of type '" "std::vector< ViewEdge * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<ViewEdge * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< ViewEdge * >::value_type >(argp3);
   {
     try {
       result = (arg1)->insert(arg2,arg3);
@@ -42135,7 +41618,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_insert__SWIG_0(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewEdge * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewEdge * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -42145,10 +41628,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::iterator arg2 ;
-  std::vector<ViewEdge * >::size_type arg3 ;
-  std::vector<ViewEdge * >::value_type arg4 = (std::vector<ViewEdge * >::value_type) 0 ;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::iterator arg2 ;
+  std::vector< ViewEdge * >::size_type arg3 ;
+  std::vector< ViewEdge * >::value_type arg4 = (std::vector< ViewEdge * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -42163,32 +41646,32 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_insert__SWIG_1(PyObject *SWIGUNUSE
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:ViewEdgesContainer_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_insert" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_insert" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewEdge * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_insert" "', argument " "2"" of type '" "std::vector< ViewEdge * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< ViewEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< ViewEdge * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewEdge * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_insert" "', argument " "2"" of type '" "std::vector< ViewEdge * >::iterator""'");
     }
   }
   ecode3 = SWIG_AsVal_size_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewEdgesContainer_insert" "', argument " "3"" of type '" "std::vector<ViewEdge * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewEdgesContainer_insert" "', argument " "3"" of type '" "std::vector< ViewEdge * >::size_type""'");
   } 
-  arg3 = static_cast< std::vector<ViewEdge * >::size_type >(val3);
-  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
+  arg3 = static_cast< std::vector< ViewEdge * >::size_type >(val3);
+  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewEdgesContainer_insert" "', argument " "4"" of type '" "std::vector<ViewEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewEdgesContainer_insert" "', argument " "4"" of type '" "std::vector< ViewEdge * >::value_type""'"); 
   }
-  arg4 = reinterpret_cast< std::vector<ViewEdge * >::value_type >(argp4);
+  arg4 = reinterpret_cast< std::vector< ViewEdge * >::value_type >(argp4);
   {
     try {
       (arg1)->insert(arg2,arg3,arg4);
@@ -42213,21 +41696,21 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_insert(PyObject *self, PyObject *a
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator< ViewEdge * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< ViewEdge * >::iterator > *>(iter) != 0));
       if (_v) {
         void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0);
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           return _wrap_ViewEdgesContainer_insert__SWIG_0(self, args);
@@ -42237,12 +41720,12 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_insert(PyObject *self, PyObject *a
   }
   if (argc == 4) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator< ViewEdge * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< ViewEdge * >::iterator > *>(iter) != 0));
       if (_v) {
         {
           int res = SWIG_AsVal_size_t(argv[2], NULL);
@@ -42250,7 +41733,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_insert(PyObject *self, PyObject *a
         }
         if (_v) {
           void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0);
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0);
           _v = SWIG_CheckState(res);
           if (_v) {
             return _wrap_ViewEdgesContainer_insert__SWIG_1(self, args);
@@ -42261,15 +41744,18 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_insert(PyObject *self, PyObject *a
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgesContainer_insert'.\n  Possible C/C++ prototypes are:\n    insert(std::vector<ViewEdge * >::iterator,std::vector<ViewEdge * >::value_type)\n    insert(std::vector<ViewEdge * >::iterator,std::vector<ViewEdge * >::size_type,std::vector<ViewEdge * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgesContainer_insert'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    insert(std::vector< ViewEdge * > *,std::vector< ViewEdge * >::iterator,std::vector< ViewEdge * >::value_type)\n"
+    "    insert(std::vector< ViewEdge * > *,std::vector< ViewEdge * >::iterator,std::vector< ViewEdge * >::size_type,std::vector< ViewEdge * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_reserve(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::size_type arg2 ;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::size_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -42278,16 +41764,16 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_reserve(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgesContainer_reserve",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_reserve" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_reserve" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer_reserve" "', argument " "2"" of type '" "std::vector<ViewEdge * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer_reserve" "', argument " "2"" of type '" "std::vector< ViewEdge * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewEdge * >::size_type >(val2);
+  arg2 = static_cast< std::vector< ViewEdge * >::size_type >(val2);
   {
     try {
       (arg1)->reserve(arg2);
@@ -42308,21 +41794,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_capacity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::size_type result;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_capacity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_capacity" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_capacity" "', argument " "1"" of type '" "std::vector< ViewEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   {
     try {
-      result = ((std::vector<ViewEdge * > const *)arg1)->capacity();
+      result = ((std::vector< ViewEdge * > const *)arg1)->capacity();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -42340,17 +41826,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_ViewEdgesContainer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_ViewEdgesContainer",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ViewEdgesContainer" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ViewEdgesContainer" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   {
     try {
       delete arg1;
@@ -42372,14 +41858,14 @@ fail:
 
 SWIGINTERN PyObject *ViewEdgesContainer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
   PyObject **arg2 = (PyObject **) 0 ;
   swig::PySwigIterator *result = 0 ;
   void *argp1 = 0 ;
@@ -42388,11 +41874,11 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_iterator(PyObject *SWIGUNUSEDPARM(sel
   
   arg2 = &obj0;
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_iterator" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_iterator" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   {
     try {
       result = (swig::PySwigIterator *)std_vector_Sl_FEdge_Sm__Sg__iterator(arg1,arg2);
@@ -42413,21 +41899,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer___nonzero__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer___nonzero__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___nonzero__" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___nonzero__" "', argument " "1"" of type '" "std::vector< FEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   {
     try {
-      result = (bool)std_vector_Sl_FEdge_Sm__Sg____nonzero__((std::vector<FEdge * > const *)arg1);
+      result = (bool)std_vector_Sl_FEdge_Sm__Sg____nonzero__((std::vector< FEdge * > const *)arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -42445,21 +41931,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer___len__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::size_type result;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer___len__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___len__" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___len__" "', argument " "1"" of type '" "std::vector< FEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   {
     try {
-      result = std_vector_Sl_FEdge_Sm__Sg____len__((std::vector<FEdge * > const *)arg1);
+      result = std_vector_Sl_FEdge_Sm__Sg____len__((std::vector< FEdge * > const *)arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -42477,22 +41963,22 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::value_type result;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_pop" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_pop" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   {
     try {
       try {
-        result = (std::vector<FEdge * >::value_type)std_vector_Sl_FEdge_Sm__Sg__pop(arg1);
+        result = (std::vector< FEdge * >::value_type)std_vector_Sl_FEdge_Sm__Sg__pop(arg1);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -42506,7 +41992,7 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_pop(PyObject *SWIGUNUSEDPARM(self), P
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -42515,10 +42001,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::difference_type arg2 ;
-  std::vector<FEdge * >::difference_type arg3 ;
-  std::vector<FEdge *,std::allocator<FEdge * > > *result = 0 ;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::difference_type arg2 ;
+  std::vector< FEdge * >::difference_type arg3 ;
+  std::vector< FEdge *,std::allocator< FEdge * > > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -42530,25 +42016,25 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer___getslice__(PyObject *SWIGUNUSEDPARM
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:FEdgesContainer___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___getslice__" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___getslice__" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer___getslice__" "', argument " "2"" of type '" "std::vector<FEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer___getslice__" "', argument " "2"" of type '" "std::vector< FEdge * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<FEdge * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< FEdge * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FEdgesContainer___getslice__" "', argument " "3"" of type '" "std::vector<FEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FEdgesContainer___getslice__" "', argument " "3"" of type '" "std::vector< FEdge * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<FEdge * >::difference_type >(val3);
+  arg3 = static_cast< std::vector< FEdge * >::difference_type >(val3);
   {
     try {
       try {
-        result = (std::vector<FEdge *,std::allocator<FEdge * > > *)std_vector_Sl_FEdge_Sm__Sg____getslice__(arg1,arg2,arg3);
+        result = (std::vector< FEdge *,std::allocator< FEdge * > > *)std_vector_Sl_FEdge_Sm__Sg____getslice__(arg1,arg2,arg3);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -42562,7 +42048,7 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer___getslice__(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -42571,10 +42057,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer___setslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::difference_type arg2 ;
-  std::vector<FEdge * >::difference_type arg3 ;
-  std::vector<FEdge *,std::allocator<FEdge * > > *arg4 = 0 ;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::difference_type arg2 ;
+  std::vector< FEdge * >::difference_type arg3 ;
+  std::vector< FEdge *,std::allocator< FEdge * > > *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -42588,36 +42074,36 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer___setslice__(PyObject *SWIGUNUSEDPARM
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:FEdgesContainer___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___setslice__" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___setslice__" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer___setslice__" "', argument " "2"" of type '" "std::vector<FEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer___setslice__" "', argument " "2"" of type '" "std::vector< FEdge * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<FEdge * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< FEdge * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FEdgesContainer___setslice__" "', argument " "3"" of type '" "std::vector<FEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FEdgesContainer___setslice__" "', argument " "3"" of type '" "std::vector< FEdge * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<FEdge * >::difference_type >(val3);
+  arg3 = static_cast< std::vector< FEdge * >::difference_type >(val3);
   {
-    std::vector<FEdge*,std::allocator<FEdge * > > *ptr = (std::vector<FEdge*,std::allocator<FEdge * > > *)0;
+    std::vector<FEdge*,std::allocator< FEdge * > > *ptr = (std::vector<FEdge*,std::allocator< FEdge * > > *)0;
     res4 = swig::asptr(obj3, &ptr);
     if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "FEdgesContainer___setslice__" "', argument " "4"" of type '" "std::vector<FEdge *,std::allocator<FEdge * > > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "FEdgesContainer___setslice__" "', argument " "4"" of type '" "std::vector< FEdge *,std::allocator< FEdge * > > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdgesContainer___setslice__" "', argument " "4"" of type '" "std::vector<FEdge *,std::allocator<FEdge * > > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdgesContainer___setslice__" "', argument " "4"" of type '" "std::vector< FEdge *,std::allocator< FEdge * > > const &""'"); 
     }
     arg4 = ptr;
   }
   {
     try {
       try {
-        std_vector_Sl_FEdge_Sm__Sg____setslice__(arg1,arg2,arg3,(std::vector<FEdge *,std::allocator<FEdge * > > const &)*arg4);
+        std_vector_Sl_FEdge_Sm__Sg____setslice__(arg1,arg2,arg3,(std::vector< FEdge *,std::allocator< FEdge * > > const &)*arg4);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -42645,9 +42131,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer___delslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::difference_type arg2 ;
-  std::vector<FEdge * >::difference_type arg3 ;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::difference_type arg2 ;
+  std::vector< FEdge * >::difference_type arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -42659,21 +42145,21 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer___delslice__(PyObject *SWIGUNUSEDPARM
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:FEdgesContainer___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___delslice__" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___delslice__" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer___delslice__" "', argument " "2"" of type '" "std::vector<FEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer___delslice__" "', argument " "2"" of type '" "std::vector< FEdge * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<FEdge * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< FEdge * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FEdgesContainer___delslice__" "', argument " "3"" of type '" "std::vector<FEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FEdgesContainer___delslice__" "', argument " "3"" of type '" "std::vector< FEdge * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<FEdge * >::difference_type >(val3);
+  arg3 = static_cast< std::vector< FEdge * >::difference_type >(val3);
   {
     try {
       try {
@@ -42700,8 +42186,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer___delitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::difference_type arg2 ;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::difference_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -42710,16 +42196,16 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer___delitem__(PyObject *SWIGUNUSEDPARM(
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:FEdgesContainer___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___delitem__" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___delitem__" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer___delitem__" "', argument " "2"" of type '" "std::vector<FEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer___delitem__" "', argument " "2"" of type '" "std::vector< FEdge * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<FEdge * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< FEdge * >::difference_type >(val2);
   {
     try {
       try {
@@ -42746,9 +42232,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer___getitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::difference_type arg2 ;
-  std::vector<FEdge * >::value_type result;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::difference_type arg2 ;
+  std::vector< FEdge * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -42757,20 +42243,20 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer___getitem__(PyObject *SWIGUNUSEDPARM(
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:FEdgesContainer___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___getitem__" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___getitem__" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer___getitem__" "', argument " "2"" of type '" "std::vector<FEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer___getitem__" "', argument " "2"" of type '" "std::vector< FEdge * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<FEdge * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< FEdge * >::difference_type >(val2);
   {
     try {
       try {
-        result = (std::vector<FEdge * >::value_type)std_vector_Sl_FEdge_Sm__Sg____getitem__(arg1,arg2);
+        result = (std::vector< FEdge * >::value_type)std_vector_Sl_FEdge_Sm__Sg____getitem__(arg1,arg2);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -42784,7 +42270,7 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer___getitem__(PyObject *SWIGUNUSEDPARM(
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -42793,9 +42279,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer___setitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::difference_type arg2 ;
-  std::vector<FEdge * >::value_type arg3 = (std::vector<FEdge * >::value_type) 0 ;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::difference_type arg2 ;
+  std::vector< FEdge * >::value_type arg3 = (std::vector< FEdge * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -42807,21 +42293,21 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer___setitem__(PyObject *SWIGUNUSEDPARM(
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:FEdgesContainer___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___setitem__" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___setitem__" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer___setitem__" "', argument " "2"" of type '" "std::vector<FEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer___setitem__" "', argument " "2"" of type '" "std::vector< FEdge * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<FEdge * >::difference_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector< FEdge * >::difference_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FEdgesContainer___setitem__" "', argument " "3"" of type '" "std::vector<FEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FEdgesContainer___setitem__" "', argument " "3"" of type '" "std::vector< FEdge * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<FEdge * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< FEdge * >::value_type >(argp3);
   {
     try {
       try {
@@ -42848,8 +42334,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::value_type arg2 = (std::vector<FEdge * >::value_type) 0 ;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::value_type arg2 = (std::vector< FEdge * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -42858,16 +42344,16 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_append(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:FEdgesContainer_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_append" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_append" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgesContainer_append" "', argument " "2"" of type '" "std::vector<FEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgesContainer_append" "', argument " "2"" of type '" "std::vector< FEdge * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<FEdge * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector< FEdge * >::value_type >(argp2);
   {
     try {
       std_vector_Sl_FEdge_Sm__Sg__append(arg1,arg2);
@@ -42888,12 +42374,12 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_FEdgesContainer__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *result = 0 ;
+  std::vector< FEdge * > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_FEdgesContainer")) SWIG_fail;
   {
     try {
-      result = (std::vector<FEdge * > *)new std::vector<FEdge * >();
+      result = (std::vector< FEdge * > *)new std::vector< FEdge * >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -42902,7 +42388,7 @@ SWIGINTERN PyObject *_wrap_new_FEdgesContainer__SWIG_0(PyObject *SWIGUNUSEDPARM(
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -42911,26 +42397,26 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_FEdgesContainer__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = 0 ;
-  std::vector<FEdge * > *result = 0 ;
+  std::vector< FEdge * > *arg1 = 0 ;
+  std::vector< FEdge * > *result = 0 ;
   int res1 = SWIG_OLDOBJ ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_FEdgesContainer",&obj0)) SWIG_fail;
   {
-    std::vector<FEdge*,std::allocator<FEdge * > > *ptr = (std::vector<FEdge*,std::allocator<FEdge * > > *)0;
+    std::vector<FEdge*,std::allocator< FEdge * > > *ptr = (std::vector<FEdge*,std::allocator< FEdge * > > *)0;
     res1 = swig::asptr(obj0, &ptr);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_FEdgesContainer" "', argument " "1"" of type '" "std::vector<FEdge * > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_FEdgesContainer" "', argument " "1"" of type '" "std::vector< FEdge * > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_FEdgesContainer" "', argument " "1"" of type '" "std::vector<FEdge * > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_FEdgesContainer" "', argument " "1"" of type '" "std::vector< FEdge * > const &""'"); 
     }
     arg1 = ptr;
   }
   {
     try {
-      result = (std::vector<FEdge * > *)new std::vector<FEdge * >((std::vector<FEdge * > const &)*arg1);
+      result = (std::vector< FEdge * > *)new std::vector< FEdge * >((std::vector< FEdge * > const &)*arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -42939,7 +42425,7 @@ SWIGINTERN PyObject *_wrap_new_FEdgesContainer__SWIG_1(PyObject *SWIGUNUSEDPARM(
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, SWIG_POINTER_NEW |  0 );
   if (SWIG_IsNewObj(res1)) delete arg1;
   return resultobj;
 fail:
@@ -42950,21 +42436,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_empty",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_empty" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_empty" "', argument " "1"" of type '" "std::vector< FEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   {
     try {
-      result = (bool)((std::vector<FEdge * > const *)arg1)->empty();
+      result = (bool)((std::vector< FEdge * > const *)arg1)->empty();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -42982,21 +42468,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::size_type result;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_size" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_size" "', argument " "1"" of type '" "std::vector< FEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   {
     try {
-      result = ((std::vector<FEdge * > const *)arg1)->size();
+      result = ((std::vector< FEdge * > const *)arg1)->size();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -43014,17 +42500,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_clear" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_clear" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   {
     try {
       (arg1)->clear();
@@ -43045,8 +42531,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * > *arg2 = 0 ;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -43055,19 +42541,19 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_swap(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:FEdgesContainer_swap",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_swap" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_swap" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t,  0 );
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgesContainer_swap" "', argument " "2"" of type '" "std::vector<FEdge * > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgesContainer_swap" "', argument " "2"" of type '" "std::vector< FEdge * > &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdgesContainer_swap" "', argument " "2"" of type '" "std::vector<FEdge * > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdgesContainer_swap" "', argument " "2"" of type '" "std::vector< FEdge * > &""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<FEdge * > * >(argp2);
+  arg2 = reinterpret_cast< std::vector< FEdge * > * >(argp2);
   {
     try {
       (arg1)->swap(*arg2);
@@ -43088,21 +42574,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  SwigValueWrapper<std::allocator<FEdge * > > result;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  SwigValueWrapper< std::allocator< FEdge * > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_get_allocator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_get_allocator" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_get_allocator" "', argument " "1"" of type '" "std::vector< FEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   {
     try {
-      result = ((std::vector<FEdge * > const *)arg1)->get_allocator();
+      result = ((std::vector< FEdge * > const *)arg1)->get_allocator();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -43111,30 +42597,30 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_get_allocator(PyObject *SWIGUNUSEDPAR
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new std::vector<FEdge * >::allocator_type(static_cast< const std::vector<FEdge * >::allocator_type& >(result))), SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new std::vector< FEdge * >::allocator_type(static_cast< const std::vector< FEdge * >::allocator_type& >(result))), SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgesContainer_begin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FEdgesContainer_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::iterator result;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::const_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_begin" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_begin" "', argument " "1"" of type '" "std::vector< FEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   {
     try {
-      result = (arg1)->begin();
+      result = ((std::vector< FEdge * > const *)arg1)->begin();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -43143,7 +42629,7 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_begin__SWIG_0(PyObject *SWIGUNUSEDPAR
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<FEdge * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< FEdge * >::const_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -43151,89 +42637,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgesContainer_begin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FEdgesContainer_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::const_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_begin" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<FEdge * > const *)arg1)->begin();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<FEdge * >::const_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_FEdgesContainer_begin(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_FEdgesContainer_begin__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_FEdgesContainer_begin__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdgesContainer_begin'.\n  Possible C/C++ prototypes are:\n    begin()\n    begin()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_FEdgesContainer_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::iterator result;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::const_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_end" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_end" "', argument " "1"" of type '" "std::vector< FEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   {
     try {
-      result = (arg1)->end();
+      result = ((std::vector< FEdge * > const *)arg1)->end();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -43242,7 +42662,7 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_end__SWIG_0(PyObject *SWIGUNUSEDPARM(
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<FEdge * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< FEdge * >::const_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -43250,89 +42670,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgesContainer_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FEdgesContainer_rbegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::const_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_end" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<FEdge * > const *)arg1)->end();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<FEdge * >::const_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_FEdgesContainer_end(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_FEdgesContainer_end__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_FEdgesContainer_end__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdgesContainer_end'.\n  Possible C/C++ prototypes are:\n    end()\n    end()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_FEdgesContainer_rbegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::reverse_iterator result;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::const_reverse_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_rbegin" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_rbegin" "', argument " "1"" of type '" "std::vector< FEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   {
     try {
-      result = (arg1)->rbegin();
+      result = ((std::vector< FEdge * > const *)arg1)->rbegin();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -43341,7 +42695,7 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_rbegin__SWIG_0(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<FEdge * >::reverse_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< FEdge * >::const_reverse_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -43349,89 +42703,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgesContainer_rbegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FEdgesContainer_rend(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::const_reverse_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_rbegin" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<FEdge * > const *)arg1)->rbegin();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<FEdge * >::const_reverse_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_FEdgesContainer_rbegin(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_FEdgesContainer_rbegin__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_FEdgesContainer_rbegin__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdgesContainer_rbegin'.\n  Possible C/C++ prototypes are:\n    rbegin()\n    rbegin()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_FEdgesContainer_rend__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::reverse_iterator result;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::const_reverse_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_rend" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_rend" "', argument " "1"" of type '" "std::vector< FEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   {
     try {
-      result = (arg1)->rend();
+      result = ((std::vector< FEdge * > const *)arg1)->rend();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -43440,7 +42728,7 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_rend__SWIG_0(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<FEdge * >::reverse_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< FEdge * >::const_reverse_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -43448,76 +42736,10 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgesContainer_rend__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::const_reverse_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_rend" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<FEdge * > const *)arg1)->rend();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<FEdge * >::const_reverse_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_FEdgesContainer_rend(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_FEdgesContainer_rend__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_FEdgesContainer_rend__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdgesContainer_rend'.\n  Possible C/C++ prototypes are:\n    rend()\n    rend()\n");
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_new_FEdgesContainer__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * >::size_type arg1 ;
-  std::vector<FEdge * > *result = 0 ;
+  std::vector< FEdge * >::size_type arg1 ;
+  std::vector< FEdge * > *result = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -43525,12 +42747,12 @@ SWIGINTERN PyObject *_wrap_new_FEdgesContainer__SWIG_2(PyObject *SWIGUNUSEDPARM(
   if (!PyArg_ParseTuple(args,(char *)"O:new_FEdgesContainer",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FEdgesContainer" "', argument " "1"" of type '" "std::vector<FEdge * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FEdgesContainer" "', argument " "1"" of type '" "std::vector< FEdge * >::size_type""'");
   } 
-  arg1 = static_cast< std::vector<FEdge * >::size_type >(val1);
+  arg1 = static_cast< std::vector< FEdge * >::size_type >(val1);
   {
     try {
-      result = (std::vector<FEdge * > *)new std::vector<FEdge * >(arg1);
+      result = (std::vector< FEdge * > *)new std::vector< FEdge * >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -43539,7 +42761,7 @@ SWIGINTERN PyObject *_wrap_new_FEdgesContainer__SWIG_2(PyObject *SWIGUNUSEDPARM(
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -43548,17 +42770,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_pop_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_pop_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_pop_back" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_pop_back" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   {
     try {
       (arg1)->pop_back();
@@ -43579,8 +42801,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::size_type arg2 ;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::size_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -43589,16 +42811,16 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_resize__SWIG_0(PyObject *SWIGUNUSEDPA
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:FEdgesContainer_resize",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_resize" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_resize" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer_resize" "', argument " "2"" of type '" "std::vector<FEdge * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer_resize" "', argument " "2"" of type '" "std::vector< FEdge * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<FEdge * >::size_type >(val2);
+  arg2 = static_cast< std::vector< FEdge * >::size_type >(val2);
   {
     try {
       (arg1)->resize(arg2);
@@ -43619,9 +42841,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::iterator arg2 ;
-  std::vector<FEdge * >::iterator result;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::iterator arg2 ;
+  std::vector< FEdge * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -43630,20 +42852,20 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_erase__SWIG_0(PyObject *SWIGUNUSEDPAR
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:FEdgesContainer_erase",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_erase" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_erase" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_erase" "', argument " "2"" of type '" "std::vector<FEdge * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_erase" "', argument " "2"" of type '" "std::vector< FEdge * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< FEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< FEdge * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_erase" "', argument " "2"" of type '" "std::vector<FEdge * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_erase" "', argument " "2"" of type '" "std::vector< FEdge * >::iterator""'");
     }
   }
   {
@@ -43657,7 +42879,7 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_erase__SWIG_0(PyObject *SWIGUNUSEDPAR
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<FEdge * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< FEdge * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -43667,10 +42889,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::iterator arg2 ;
-  std::vector<FEdge * >::iterator arg3 ;
-  std::vector<FEdge * >::iterator result;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::iterator arg2 ;
+  std::vector< FEdge * >::iterator arg3 ;
+  std::vector< FEdge * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -43682,31 +42904,31 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_erase__SWIG_1(PyObject *SWIGUNUSEDPAR
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:FEdgesContainer_erase",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_erase" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_erase" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_erase" "', argument " "2"" of type '" "std::vector<FEdge * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_erase" "', argument " "2"" of type '" "std::vector< FEdge * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< FEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< FEdge * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_erase" "', argument " "2"" of type '" "std::vector<FEdge * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_erase" "', argument " "2"" of type '" "std::vector< FEdge * >::iterator""'");
     }
   }
   res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res3) || !iter3) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_erase" "', argument " "3"" of type '" "std::vector<FEdge * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_erase" "', argument " "3"" of type '" "std::vector< FEdge * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *>(iter3);
+    swig::PySwigIterator_T<std::vector< FEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< FEdge * >::iterator > *>(iter3);
     if (iter_t) {
       arg3 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_erase" "', argument " "3"" of type '" "std::vector<FEdge * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_erase" "', argument " "3"" of type '" "std::vector< FEdge * >::iterator""'");
     }
   }
   {
@@ -43720,7 +42942,7 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_erase__SWIG_1(PyObject *SWIGUNUSEDPAR
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<FEdge * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< FEdge * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -43734,18 +42956,18 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_erase(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator< FEdge * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< FEdge * >::iterator > *>(iter) != 0));
       if (_v) {
         return _wrap_FEdgesContainer_erase__SWIG_0(self, args);
       }
@@ -43753,16 +42975,16 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_erase(PyObject *self, PyObject *args)
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator< FEdge * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< FEdge * >::iterator > *>(iter) != 0));
       if (_v) {
         swig::PySwigIterator *iter = 0;
         int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *>(iter) != 0));
+        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< FEdge * >::iterator > *>(iter) != 0));
         if (_v) {
           return _wrap_FEdgesContainer_erase__SWIG_1(self, args);
         }
@@ -43771,16 +42993,19 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_erase(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdgesContainer_erase'.\n  Possible C/C++ prototypes are:\n    erase(std::vector<FEdge * >::iterator)\n    erase(std::vector<FEdge * >::iterator,std::vector<FEdge * >::iterator)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdgesContainer_erase'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    erase(std::vector< FEdge * > *,std::vector< FEdge * >::iterator)\n"
+    "    erase(std::vector< FEdge * > *,std::vector< FEdge * >::iterator,std::vector< FEdge * >::iterator)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_new_FEdgesContainer__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * >::size_type arg1 ;
-  std::vector<FEdge * >::value_type arg2 = (std::vector<FEdge * >::value_type) 0 ;
-  std::vector<FEdge * > *result = 0 ;
+  std::vector< FEdge * >::size_type arg1 ;
+  std::vector< FEdge * >::value_type arg2 = (std::vector< FEdge * >::value_type) 0 ;
+  std::vector< FEdge * > *result = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   void *argp2 = 0 ;
@@ -43791,17 +43016,17 @@ SWIGINTERN PyObject *_wrap_new_FEdgesContainer__SWIG_3(PyObject *SWIGUNUSEDPARM(
   if (!PyArg_ParseTuple(args,(char *)"OO:new_FEdgesContainer",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FEdgesContainer" "', argument " "1"" of type '" "std::vector<FEdge * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FEdgesContainer" "', argument " "1"" of type '" "std::vector< FEdge * >::size_type""'");
   } 
-  arg1 = static_cast< std::vector<FEdge * >::size_type >(val1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
+  arg1 = static_cast< std::vector< FEdge * >::size_type >(val1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_FEdgesContainer" "', argument " "2"" of type '" "std::vector<FEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_FEdgesContainer" "', argument " "2"" of type '" "std::vector< FEdge * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<FEdge * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector< FEdge * >::value_type >(argp2);
   {
     try {
-      result = (std::vector<FEdge * > *)new std::vector<FEdge * >(arg1,arg2);
+      result = (std::vector< FEdge * > *)new std::vector< FEdge * >(arg1,arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -43810,7 +43035,7 @@ SWIGINTERN PyObject *_wrap_new_FEdgesContainer__SWIG_3(PyObject *SWIGUNUSEDPARM(
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -43823,7 +43048,7 @@ SWIGINTERN PyObject *_wrap_new_FEdgesContainer(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -43842,7 +43067,7 @@ SWIGINTERN PyObject *_wrap_new_FEdgesContainer(PyObject *self, PyObject *args) {
   }
   if (argc == 1) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator< FEdge * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_new_FEdgesContainer__SWIG_1(self, args);
@@ -43856,7 +43081,7 @@ SWIGINTERN PyObject *_wrap_new_FEdgesContainer(PyObject *self, PyObject *args) {
     }
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_new_FEdgesContainer__SWIG_3(self, args);
@@ -43865,15 +43090,20 @@ SWIGINTERN PyObject *_wrap_new_FEdgesContainer(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_FEdgesContainer'.\n  Possible C/C++ prototypes are:\n    std::vector<(p.FEdge)>()\n    std::vector<(p.FEdge)>(std::vector<FEdge * > const &)\n    std::vector<(p.FEdge)>(std::vector<FEdge * >::size_type)\n    std::vector<(p.FEdge)>(std::vector<FEdge * >::size_type,std::vector<FEdge * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_FEdgesContainer'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    std::vector< FEdge * >()\n"
+    "    std::vector< FEdge * >(std::vector< FEdge * > const &)\n"
+    "    std::vector< FEdge * >(std::vector< FEdge * >::size_type)\n"
+    "    std::vector< FEdge * >(std::vector< FEdge * >::size_type,std::vector< FEdge * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_push_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::value_type arg2 = (std::vector<FEdge * >::value_type) 0 ;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::value_type arg2 = (std::vector< FEdge * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -43882,16 +43112,16 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_push_back(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:FEdgesContainer_push_back",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_push_back" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_push_back" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgesContainer_push_back" "', argument " "2"" of type '" "std::vector<FEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgesContainer_push_back" "', argument " "2"" of type '" "std::vector< FEdge * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<FEdge * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector< FEdge * >::value_type >(argp2);
   {
     try {
       (arg1)->push_back(arg2);
@@ -43912,21 +43142,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_front(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::value_type result;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_front",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_front" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_front" "', argument " "1"" of type '" "std::vector< FEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   {
     try {
-      result = (std::vector<FEdge * >::value_type)((std::vector<FEdge * > const *)arg1)->front();
+      result = (std::vector< FEdge * >::value_type)((std::vector< FEdge * > const *)arg1)->front();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -43935,7 +43165,7 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_front(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -43944,21 +43174,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::value_type result;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_back" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_back" "', argument " "1"" of type '" "std::vector< FEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   {
     try {
-      result = (std::vector<FEdge * >::value_type)((std::vector<FEdge * > const *)arg1)->back();
+      result = (std::vector< FEdge * >::value_type)((std::vector< FEdge * > const *)arg1)->back();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -43967,7 +43197,7 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_back(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -43976,9 +43206,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_assign(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::size_type arg2 ;
-  std::vector<FEdge * >::value_type arg3 = (std::vector<FEdge * >::value_type) 0 ;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::size_type arg2 ;
+  std::vector< FEdge * >::value_type arg3 = (std::vector< FEdge * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -43990,21 +43220,21 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_assign(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:FEdgesContainer_assign",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_assign" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_assign" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer_assign" "', argument " "2"" of type '" "std::vector<FEdge * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer_assign" "', argument " "2"" of type '" "std::vector< FEdge * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<FEdge * >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector< FEdge * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FEdgesContainer_assign" "', argument " "3"" of type '" "std::vector<FEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FEdgesContainer_assign" "', argument " "3"" of type '" "std::vector< FEdge * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<FEdge * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< FEdge * >::value_type >(argp3);
   {
     try {
       (arg1)->assign(arg2,arg3);
@@ -44025,9 +43255,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::size_type arg2 ;
-  std::vector<FEdge * >::value_type arg3 = (std::vector<FEdge * >::value_type) 0 ;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::size_type arg2 ;
+  std::vector< FEdge * >::value_type arg3 = (std::vector< FEdge * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -44039,21 +43269,21 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_resize__SWIG_1(PyObject *SWIGUNUSEDPA
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:FEdgesContainer_resize",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_resize" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_resize" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer_resize" "', argument " "2"" of type '" "std::vector<FEdge * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer_resize" "', argument " "2"" of type '" "std::vector< FEdge * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<FEdge * >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector< FEdge * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FEdgesContainer_resize" "', argument " "3"" of type '" "std::vector<FEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FEdgesContainer_resize" "', argument " "3"" of type '" "std::vector< FEdge * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<FEdge * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< FEdge * >::value_type >(argp3);
   {
     try {
       (arg1)->resize(arg2,arg3);
@@ -44078,13 +43308,13 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_resize(PyObject *self, PyObject *args
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator< FEdge * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -44098,7 +43328,7 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_resize(PyObject *self, PyObject *args
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator< FEdge * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -44107,7 +43337,7 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_resize(PyObject *self, PyObject *args
       }
       if (_v) {
         void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0);
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           return _wrap_FEdgesContainer_resize__SWIG_1(self, args);
@@ -44117,17 +43347,20 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_resize(PyObject *self, PyObject *args
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdgesContainer_resize'.\n  Possible C/C++ prototypes are:\n    resize(std::vector<FEdge * >::size_type)\n    resize(std::vector<FEdge * >::size_type,std::vector<FEdge * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdgesContainer_resize'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    resize(std::vector< FEdge * > *,std::vector< FEdge * >::size_type)\n"
+    "    resize(std::vector< FEdge * > *,std::vector< FEdge * >::size_type,std::vector< FEdge * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::iterator arg2 ;
-  std::vector<FEdge * >::value_type arg3 = (std::vector<FEdge * >::value_type) 0 ;
-  std::vector<FEdge * >::iterator result;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::iterator arg2 ;
+  std::vector< FEdge * >::value_type arg3 = (std::vector< FEdge * >::value_type) 0 ;
+  std::vector< FEdge * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -44139,27 +43372,27 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_insert__SWIG_0(PyObject *SWIGUNUSEDPA
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:FEdgesContainer_insert",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_insert" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_insert" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_insert" "', argument " "2"" of type '" "std::vector<FEdge * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_insert" "', argument " "2"" of type '" "std::vector< FEdge * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< FEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< FEdge * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_insert" "', argument " "2"" of type '" "std::vector<FEdge * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_insert" "', argument " "2"" of type '" "std::vector< FEdge * >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FEdgesContainer_insert" "', argument " "3"" of type '" "std::vector<FEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FEdgesContainer_insert" "', argument " "3"" of type '" "std::vector< FEdge * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<FEdge * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< FEdge * >::value_type >(argp3);
   {
     try {
       result = (arg1)->insert(arg2,arg3);
@@ -44171,7 +43404,7 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_insert__SWIG_0(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<FEdge * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< FEdge * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -44181,10 +43414,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::iterator arg2 ;
-  std::vector<FEdge * >::size_type arg3 ;
-  std::vector<FEdge * >::value_type arg4 = (std::vector<FEdge * >::value_type) 0 ;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::iterator arg2 ;
+  std::vector< FEdge * >::size_type arg3 ;
+  std::vector< FEdge * >::value_type arg4 = (std::vector< FEdge * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -44199,32 +43432,32 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_insert__SWIG_1(PyObject *SWIGUNUSEDPA
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:FEdgesContainer_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_insert" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_insert" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_insert" "', argument " "2"" of type '" "std::vector<FEdge * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_insert" "', argument " "2"" of type '" "std::vector< FEdge * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< FEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< FEdge * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_insert" "', argument " "2"" of type '" "std::vector<FEdge * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_insert" "', argument " "2"" of type '" "std::vector< FEdge * >::iterator""'");
     }
   }
   ecode3 = SWIG_AsVal_size_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FEdgesContainer_insert" "', argument " "3"" of type '" "std::vector<FEdge * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FEdgesContainer_insert" "', argument " "3"" of type '" "std::vector< FEdge * >::size_type""'");
   } 
-  arg3 = static_cast< std::vector<FEdge * >::size_type >(val3);
-  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
+  arg3 = static_cast< std::vector< FEdge * >::size_type >(val3);
+  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "FEdgesContainer_insert" "', argument " "4"" of type '" "std::vector<FEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "FEdgesContainer_insert" "', argument " "4"" of type '" "std::vector< FEdge * >::value_type""'"); 
   }
-  arg4 = reinterpret_cast< std::vector<FEdge * >::value_type >(argp4);
+  arg4 = reinterpret_cast< std::vector< FEdge * >::value_type >(argp4);
   {
     try {
       (arg1)->insert(arg2,arg3,arg4);
@@ -44249,21 +43482,21 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_insert(PyObject *self, PyObject *args
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator< FEdge * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< FEdge * >::iterator > *>(iter) != 0));
       if (_v) {
         void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0);
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           return _wrap_FEdgesContainer_insert__SWIG_0(self, args);
@@ -44273,12 +43506,12 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_insert(PyObject *self, PyObject *args
   }
   if (argc == 4) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator< FEdge * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< FEdge * >::iterator > *>(iter) != 0));
       if (_v) {
         {
           int res = SWIG_AsVal_size_t(argv[2], NULL);
@@ -44286,7 +43519,7 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_insert(PyObject *self, PyObject *args
         }
         if (_v) {
           void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0);
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0);
           _v = SWIG_CheckState(res);
           if (_v) {
             return _wrap_FEdgesContainer_insert__SWIG_1(self, args);
@@ -44297,15 +43530,18 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_insert(PyObject *self, PyObject *args
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdgesContainer_insert'.\n  Possible C/C++ prototypes are:\n    insert(std::vector<FEdge * >::iterator,std::vector<FEdge * >::value_type)\n    insert(std::vector<FEdge * >::iterator,std::vector<FEdge * >::size_type,std::vector<FEdge * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdgesContainer_insert'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    insert(std::vector< FEdge * > *,std::vector< FEdge * >::iterator,std::vector< FEdge * >::value_type)\n"
+    "    insert(std::vector< FEdge * > *,std::vector< FEdge * >::iterator,std::vector< FEdge * >::size_type,std::vector< FEdge * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_reserve(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::size_type arg2 ;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::size_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -44314,16 +43550,16 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_reserve(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:FEdgesContainer_reserve",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_reserve" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_reserve" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer_reserve" "', argument " "2"" of type '" "std::vector<FEdge * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer_reserve" "', argument " "2"" of type '" "std::vector< FEdge * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<FEdge * >::size_type >(val2);
+  arg2 = static_cast< std::vector< FEdge * >::size_type >(val2);
   {
     try {
       (arg1)->reserve(arg2);
@@ -44344,21 +43580,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_capacity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::size_type result;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_capacity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_capacity" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_capacity" "', argument " "1"" of type '" "std::vector< FEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   {
     try {
-      result = ((std::vector<FEdge * > const *)arg1)->capacity();
+      result = ((std::vector< FEdge * > const *)arg1)->capacity();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -44376,17 +43612,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_FEdgesContainer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_FEdgesContainer",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FEdgesContainer" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FEdgesContainer" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   {
     try {
       delete arg1;
@@ -44408,14 +43644,14 @@ fail:
 
 SWIGINTERN PyObject *FEdgesContainer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
   PyObject **arg2 = (PyObject **) 0 ;
   swig::PySwigIterator *result = 0 ;
   void *argp1 = 0 ;
@@ -44424,11 +43660,11 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_iterator(PyObject *SWIGUNUSEDPA
   
   arg2 = &obj0;
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_iterator" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_iterator" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   {
     try {
       result = (swig::PySwigIterator *)std_vector_Sl_ViewVertex_Sm__Sg__iterator(arg1,arg2);
@@ -44449,21 +43685,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer___nonzero__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer___nonzero__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___nonzero__" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___nonzero__" "', argument " "1"" of type '" "std::vector< ViewVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   {
     try {
-      result = (bool)std_vector_Sl_ViewVertex_Sm__Sg____nonzero__((std::vector<ViewVertex * > const *)arg1);
+      result = (bool)std_vector_Sl_ViewVertex_Sm__Sg____nonzero__((std::vector< ViewVertex * > const *)arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -44481,21 +43717,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer___len__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::size_type result;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer___len__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___len__" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___len__" "', argument " "1"" of type '" "std::vector< ViewVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   {
     try {
-      result = std_vector_Sl_ViewVertex_Sm__Sg____len__((std::vector<ViewVertex * > const *)arg1);
+      result = std_vector_Sl_ViewVertex_Sm__Sg____len__((std::vector< ViewVertex * > const *)arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -44513,22 +43749,22 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::value_type result;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_pop" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_pop" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   {
     try {
       try {
-        result = (std::vector<ViewVertex * >::value_type)std_vector_Sl_ViewVertex_Sm__Sg__pop(arg1);
+        result = (std::vector< ViewVertex * >::value_type)std_vector_Sl_ViewVertex_Sm__Sg__pop(arg1);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -44542,7 +43778,7 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_pop(PyObject *SWIGUNUSEDPARM(se
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -44551,10 +43787,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::difference_type arg2 ;
-  std::vector<ViewVertex * >::difference_type arg3 ;
-  std::vector<ViewVertex *,std::allocator<ViewVertex * > > *result = 0 ;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::difference_type arg2 ;
+  std::vector< ViewVertex * >::difference_type arg3 ;
+  std::vector< ViewVertex *,std::allocator< ViewVertex * > > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -44566,25 +43802,25 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer___getslice__(PyObject *SWIGUNUS
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewVerticesContainer___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___getslice__" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___getslice__" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer___getslice__" "', argument " "2"" of type '" "std::vector<ViewVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer___getslice__" "', argument " "2"" of type '" "std::vector< ViewVertex * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewVertex * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< ViewVertex * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewVerticesContainer___getslice__" "', argument " "3"" of type '" "std::vector<ViewVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewVerticesContainer___getslice__" "', argument " "3"" of type '" "std::vector< ViewVertex * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<ViewVertex * >::difference_type >(val3);
+  arg3 = static_cast< std::vector< ViewVertex * >::difference_type >(val3);
   {
     try {
       try {
-        result = (std::vector<ViewVertex *,std::allocator<ViewVertex * > > *)std_vector_Sl_ViewVertex_Sm__Sg____getslice__(arg1,arg2,arg3);
+        result = (std::vector< ViewVertex *,std::allocator< ViewVertex * > > *)std_vector_Sl_ViewVertex_Sm__Sg____getslice__(arg1,arg2,arg3);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -44598,7 +43834,7 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer___getslice__(PyObject *SWIGUNUS
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -44607,10 +43843,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer___setslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::difference_type arg2 ;
-  std::vector<ViewVertex * >::difference_type arg3 ;
-  std::vector<ViewVertex *,std::allocator<ViewVertex * > > *arg4 = 0 ;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::difference_type arg2 ;
+  std::vector< ViewVertex * >::difference_type arg3 ;
+  std::vector< ViewVertex *,std::allocator< ViewVertex * > > *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -44624,36 +43860,36 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer___setslice__(PyObject *SWIGUNUS
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:ViewVerticesContainer___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___setslice__" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___setslice__" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer___setslice__" "', argument " "2"" of type '" "std::vector<ViewVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer___setslice__" "', argument " "2"" of type '" "std::vector< ViewVertex * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewVertex * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< ViewVertex * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewVerticesContainer___setslice__" "', argument " "3"" of type '" "std::vector<ViewVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewVerticesContainer___setslice__" "', argument " "3"" of type '" "std::vector< ViewVertex * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<ViewVertex * >::difference_type >(val3);
+  arg3 = static_cast< std::vector< ViewVertex * >::difference_type >(val3);
   {
-    std::vector<ViewVertex*,std::allocator<ViewVertex * > > *ptr = (std::vector<ViewVertex*,std::allocator<ViewVertex * > > *)0;
+    std::vector<ViewVertex*,std::allocator< ViewVertex * > > *ptr = (std::vector<ViewVertex*,std::allocator< ViewVertex * > > *)0;
     res4 = swig::asptr(obj3, &ptr);
     if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewVerticesContainer___setslice__" "', argument " "4"" of type '" "std::vector<ViewVertex *,std::allocator<ViewVertex * > > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewVerticesContainer___setslice__" "', argument " "4"" of type '" "std::vector< ViewVertex *,std::allocator< ViewVertex * > > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewVerticesContainer___setslice__" "', argument " "4"" of type '" "std::vector<ViewVertex *,std::allocator<ViewVertex * > > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewVerticesContainer___setslice__" "', argument " "4"" of type '" "std::vector< ViewVertex *,std::allocator< ViewVertex * > > const &""'"); 
     }
     arg4 = ptr;
   }
   {
     try {
       try {
-        std_vector_Sl_ViewVertex_Sm__Sg____setslice__(arg1,arg2,arg3,(std::vector<ViewVertex *,std::allocator<ViewVertex * > > const &)*arg4);
+        std_vector_Sl_ViewVertex_Sm__Sg____setslice__(arg1,arg2,arg3,(std::vector< ViewVertex *,std::allocator< ViewVertex * > > const &)*arg4);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -44681,9 +43917,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer___delslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::difference_type arg2 ;
-  std::vector<ViewVertex * >::difference_type arg3 ;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::difference_type arg2 ;
+  std::vector< ViewVertex * >::difference_type arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -44695,21 +43931,21 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer___delslice__(PyObject *SWIGUNUS
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewVerticesContainer___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___delslice__" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___delslice__" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer___delslice__" "', argument " "2"" of type '" "std::vector<ViewVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer___delslice__" "', argument " "2"" of type '" "std::vector< ViewVertex * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewVertex * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< ViewVertex * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewVerticesContainer___delslice__" "', argument " "3"" of type '" "std::vector<ViewVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewVerticesContainer___delslice__" "', argument " "3"" of type '" "std::vector< ViewVertex * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<ViewVertex * >::difference_type >(val3);
+  arg3 = static_cast< std::vector< ViewVertex * >::difference_type >(val3);
   {
     try {
       try {
@@ -44736,8 +43972,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer___delitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::difference_type arg2 ;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::difference_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -44746,16 +43982,16 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer___delitem__(PyObject *SWIGUNUSE
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewVerticesContainer___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___delitem__" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___delitem__" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer___delitem__" "', argument " "2"" of type '" "std::vector<ViewVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer___delitem__" "', argument " "2"" of type '" "std::vector< ViewVertex * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewVertex * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< ViewVertex * >::difference_type >(val2);
   {
     try {
       try {
@@ -44782,9 +44018,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer___getitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::difference_type arg2 ;
-  std::vector<ViewVertex * >::value_type result;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::difference_type arg2 ;
+  std::vector< ViewVertex * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -44793,20 +44029,20 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer___getitem__(PyObject *SWIGUNUSE
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewVerticesContainer___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___getitem__" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___getitem__" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer___getitem__" "', argument " "2"" of type '" "std::vector<ViewVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer___getitem__" "', argument " "2"" of type '" "std::vector< ViewVertex * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewVertex * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< ViewVertex * >::difference_type >(val2);
   {
     try {
       try {
-        result = (std::vector<ViewVertex * >::value_type)std_vector_Sl_ViewVertex_Sm__Sg____getitem__(arg1,arg2);
+        result = (std::vector< ViewVertex * >::value_type)std_vector_Sl_ViewVertex_Sm__Sg____getitem__(arg1,arg2);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -44820,7 +44056,7 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer___getitem__(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -44829,9 +44065,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer___setitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::difference_type arg2 ;
-  std::vector<ViewVertex * >::value_type arg3 = (std::vector<ViewVertex * >::value_type) 0 ;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::difference_type arg2 ;
+  std::vector< ViewVertex * >::value_type arg3 = (std::vector< ViewVertex * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -44843,21 +44079,21 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer___setitem__(PyObject *SWIGUNUSE
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewVerticesContainer___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___setitem__" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___setitem__" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer___setitem__" "', argument " "2"" of type '" "std::vector<ViewVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer___setitem__" "', argument " "2"" of type '" "std::vector< ViewVertex * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewVertex * >::difference_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector< ViewVertex * >::difference_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewVerticesContainer___setitem__" "', argument " "3"" of type '" "std::vector<ViewVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewVerticesContainer___setitem__" "', argument " "3"" of type '" "std::vector< ViewVertex * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<ViewVertex * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< ViewVertex * >::value_type >(argp3);
   {
     try {
       try {
@@ -44884,8 +44120,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::value_type arg2 = (std::vector<ViewVertex * >::value_type) 0 ;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::value_type arg2 = (std::vector< ViewVertex * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -44894,16 +44130,16 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_append(PyObject *SWIGUNUSEDPARM
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewVerticesContainer_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_append" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_append" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewVerticesContainer_append" "', argument " "2"" of type '" "std::vector<ViewVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewVerticesContainer_append" "', argument " "2"" of type '" "std::vector< ViewVertex * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<ViewVertex * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector< ViewVertex * >::value_type >(argp2);
   {
     try {
       std_vector_Sl_ViewVertex_Sm__Sg__append(arg1,arg2);
@@ -44924,12 +44160,12 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *result = 0 ;
+  std::vector< ViewVertex * > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_ViewVerticesContainer")) SWIG_fail;
   {
     try {
-      result = (std::vector<ViewVertex * > *)new std::vector<ViewVertex * >();
+      result = (std::vector< ViewVertex * > *)new std::vector< ViewVertex * >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -44938,7 +44174,7 @@ SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer__SWIG_0(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -44947,26 +44183,26 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = 0 ;
-  std::vector<ViewVertex * > *result = 0 ;
+  std::vector< ViewVertex * > *arg1 = 0 ;
+  std::vector< ViewVertex * > *result = 0 ;
   int res1 = SWIG_OLDOBJ ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_ViewVerticesContainer",&obj0)) SWIG_fail;
   {
-    std::vector<ViewVertex*,std::allocator<ViewVertex * > > *ptr = (std::vector<ViewVertex*,std::allocator<ViewVertex * > > *)0;
+    std::vector<ViewVertex*,std::allocator< ViewVertex * > > *ptr = (std::vector<ViewVertex*,std::allocator< ViewVertex * > > *)0;
     res1 = swig::asptr(obj0, &ptr);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ViewVerticesContainer" "', argument " "1"" of type '" "std::vector<ViewVertex * > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ViewVerticesContainer" "', argument " "1"" of type '" "std::vector< ViewVertex * > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ViewVerticesContainer" "', argument " "1"" of type '" "std::vector<ViewVertex * > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ViewVerticesContainer" "', argument " "1"" of type '" "std::vector< ViewVertex * > const &""'"); 
     }
     arg1 = ptr;
   }
   {
     try {
-      result = (std::vector<ViewVertex * > *)new std::vector<ViewVertex * >((std::vector<ViewVertex * > const &)*arg1);
+      result = (std::vector< ViewVertex * > *)new std::vector< ViewVertex * >((std::vector< ViewVertex * > const &)*arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -44975,7 +44211,7 @@ SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer__SWIG_1(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, SWIG_POINTER_NEW |  0 );
   if (SWIG_IsNewObj(res1)) delete arg1;
   return resultobj;
 fail:
@@ -44986,21 +44222,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_empty",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_empty" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_empty" "', argument " "1"" of type '" "std::vector< ViewVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   {
     try {
-      result = (bool)((std::vector<ViewVertex * > const *)arg1)->empty();
+      result = (bool)((std::vector< ViewVertex * > const *)arg1)->empty();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -45018,21 +44254,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::size_type result;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_size" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_size" "', argument " "1"" of type '" "std::vector< ViewVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   {
     try {
-      result = ((std::vector<ViewVertex * > const *)arg1)->size();
+      result = ((std::vector< ViewVertex * > const *)arg1)->size();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -45050,17 +44286,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_clear" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_clear" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   {
     try {
       (arg1)->clear();
@@ -45081,8 +44317,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * > *arg2 = 0 ;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -45091,19 +44327,19 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_swap(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewVerticesContainer_swap",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_swap" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_swap" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t,  0 );
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewVerticesContainer_swap" "', argument " "2"" of type '" "std::vector<ViewVertex * > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewVerticesContainer_swap" "', argument " "2"" of type '" "std::vector< ViewVertex * > &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewVerticesContainer_swap" "', argument " "2"" of type '" "std::vector<ViewVertex * > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewVerticesContainer_swap" "', argument " "2"" of type '" "std::vector< ViewVertex * > &""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<ViewVertex * > * >(argp2);
+  arg2 = reinterpret_cast< std::vector< ViewVertex * > * >(argp2);
   {
     try {
       (arg1)->swap(*arg2);
@@ -45124,21 +44360,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  SwigValueWrapper<std::allocator<ViewVertex * > > result;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  SwigValueWrapper< std::allocator< ViewVertex * > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_get_allocator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_get_allocator" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_get_allocator" "', argument " "1"" of type '" "std::vector< ViewVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   {
     try {
-      result = ((std::vector<ViewVertex * > const *)arg1)->get_allocator();
+      result = ((std::vector< ViewVertex * > const *)arg1)->get_allocator();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -45147,30 +44383,30 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_get_allocator(PyObject *SWIGUNU
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new std::vector<ViewVertex * >::allocator_type(static_cast< const std::vector<ViewVertex * >::allocator_type& >(result))), SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new std::vector< ViewVertex * >::allocator_type(static_cast< const std::vector< ViewVertex * >::allocator_type& >(result))), SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVerticesContainer_begin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::iterator result;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::const_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_begin" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_begin" "', argument " "1"" of type '" "std::vector< ViewVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   {
     try {
-      result = (arg1)->begin();
+      result = ((std::vector< ViewVertex * > const *)arg1)->begin();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -45179,7 +44415,7 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_begin__SWIG_0(PyObject *SWIGUNU
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewVertex * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewVertex * >::const_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -45187,89 +44423,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVerticesContainer_begin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::const_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_begin" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<ViewVertex * > const *)arg1)->begin();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewVertex * >::const_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ViewVerticesContainer_begin(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewVerticesContainer_begin__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewVerticesContainer_begin__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVerticesContainer_begin'.\n  Possible C/C++ prototypes are:\n    begin()\n    begin()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ViewVerticesContainer_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::iterator result;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::const_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_end" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_end" "', argument " "1"" of type '" "std::vector< ViewVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   {
     try {
-      result = (arg1)->end();
+      result = ((std::vector< ViewVertex * > const *)arg1)->end();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -45278,7 +44448,7 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_end__SWIG_0(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewVertex * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewVertex * >::const_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -45286,89 +44456,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVerticesContainer_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_rbegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::const_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_end" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<ViewVertex * > const *)arg1)->end();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewVertex * >::const_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ViewVerticesContainer_end(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewVerticesContainer_end__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewVerticesContainer_end__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVerticesContainer_end'.\n  Possible C/C++ prototypes are:\n    end()\n    end()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ViewVerticesContainer_rbegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::reverse_iterator result;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::const_reverse_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_rbegin" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_rbegin" "', argument " "1"" of type '" "std::vector< ViewVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   {
     try {
-      result = (arg1)->rbegin();
+      result = ((std::vector< ViewVertex * > const *)arg1)->rbegin();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -45377,7 +44481,7 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_rbegin__SWIG_0(PyObject *SWIGUN
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewVertex * >::reverse_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewVertex * >::const_reverse_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -45385,89 +44489,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVerticesContainer_rbegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_rend(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::const_reverse_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_rbegin" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<ViewVertex * > const *)arg1)->rbegin();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewVertex * >::const_reverse_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ViewVerticesContainer_rbegin(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewVerticesContainer_rbegin__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewVerticesContainer_rbegin__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVerticesContainer_rbegin'.\n  Possible C/C++ prototypes are:\n    rbegin()\n    rbegin()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ViewVerticesContainer_rend__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::reverse_iterator result;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::const_reverse_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_rend" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_rend" "', argument " "1"" of type '" "std::vector< ViewVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   {
     try {
-      result = (arg1)->rend();
+      result = ((std::vector< ViewVertex * > const *)arg1)->rend();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -45476,7 +44514,7 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_rend__SWIG_0(PyObject *SWIGUNUS
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewVertex * >::reverse_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewVertex * >::const_reverse_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -45484,76 +44522,10 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVerticesContainer_rend__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::const_reverse_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_rend" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<ViewVertex * > const *)arg1)->rend();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewVertex * >::const_reverse_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ViewVerticesContainer_rend(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewVerticesContainer_rend__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewVerticesContainer_rend__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVerticesContainer_rend'.\n  Possible C/C++ prototypes are:\n    rend()\n    rend()\n");
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * >::size_type arg1 ;
-  std::vector<ViewVertex * > *result = 0 ;
+  std::vector< ViewVertex * >::size_type arg1 ;
+  std::vector< ViewVertex * > *result = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -45561,12 +44533,12 @@ SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer__SWIG_2(PyObject *SWIGUNUSE
   if (!PyArg_ParseTuple(args,(char *)"O:new_ViewVerticesContainer",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ViewVerticesContainer" "', argument " "1"" of type '" "std::vector<ViewVertex * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ViewVerticesContainer" "', argument " "1"" of type '" "std::vector< ViewVertex * >::size_type""'");
   } 
-  arg1 = static_cast< std::vector<ViewVertex * >::size_type >(val1);
+  arg1 = static_cast< std::vector< ViewVertex * >::size_type >(val1);
   {
     try {
-      result = (std::vector<ViewVertex * > *)new std::vector<ViewVertex * >(arg1);
+      result = (std::vector< ViewVertex * > *)new std::vector< ViewVertex * >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -45575,7 +44547,7 @@ SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer__SWIG_2(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -45584,17 +44556,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_pop_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_pop_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_pop_back" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_pop_back" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   {
     try {
       (arg1)->pop_back();
@@ -45615,8 +44587,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::size_type arg2 ;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::size_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -45625,16 +44597,16 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_resize__SWIG_0(PyObject *SWIGUN
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewVerticesContainer_resize",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_resize" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_resize" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer_resize" "', argument " "2"" of type '" "std::vector<ViewVertex * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer_resize" "', argument " "2"" of type '" "std::vector< ViewVertex * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewVertex * >::size_type >(val2);
+  arg2 = static_cast< std::vector< ViewVertex * >::size_type >(val2);
   {
     try {
       (arg1)->resize(arg2);
@@ -45655,9 +44627,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::iterator arg2 ;
-  std::vector<ViewVertex * >::iterator result;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::iterator arg2 ;
+  std::vector< ViewVertex * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -45666,20 +44638,20 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_erase__SWIG_0(PyObject *SWIGUNU
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewVerticesContainer_erase",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_erase" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_erase" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewVertex * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_erase" "', argument " "2"" of type '" "std::vector< ViewVertex * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< ViewVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< ViewVertex * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewVertex * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_erase" "', argument " "2"" of type '" "std::vector< ViewVertex * >::iterator""'");
     }
   }
   {
@@ -45693,7 +44665,7 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_erase__SWIG_0(PyObject *SWIGUNU
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewVertex * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewVertex * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -45703,10 +44675,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::iterator arg2 ;
-  std::vector<ViewVertex * >::iterator arg3 ;
-  std::vector<ViewVertex * >::iterator result;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::iterator arg2 ;
+  std::vector< ViewVertex * >::iterator arg3 ;
+  std::vector< ViewVertex * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -45718,31 +44690,31 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_erase__SWIG_1(PyObject *SWIGUNU
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewVerticesContainer_erase",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_erase" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_erase" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewVertex * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_erase" "', argument " "2"" of type '" "std::vector< ViewVertex * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< ViewVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< ViewVertex * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewVertex * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_erase" "', argument " "2"" of type '" "std::vector< ViewVertex * >::iterator""'");
     }
   }
   res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res3) || !iter3) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_erase" "', argument " "3"" of type '" "std::vector<ViewVertex * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_erase" "', argument " "3"" of type '" "std::vector< ViewVertex * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *>(iter3);
+    swig::PySwigIterator_T<std::vector< ViewVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< ViewVertex * >::iterator > *>(iter3);
     if (iter_t) {
       arg3 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_erase" "', argument " "3"" of type '" "std::vector<ViewVertex * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_erase" "', argument " "3"" of type '" "std::vector< ViewVertex * >::iterator""'");
     }
   }
   {
@@ -45756,7 +44728,7 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_erase__SWIG_1(PyObject *SWIGUNU
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewVertex * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewVertex * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -45770,18 +44742,18 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_erase(PyObject *self, PyObject
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator< ViewVertex * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< ViewVertex * >::iterator > *>(iter) != 0));
       if (_v) {
         return _wrap_ViewVerticesContainer_erase__SWIG_0(self, args);
       }
@@ -45789,16 +44761,16 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_erase(PyObject *self, PyObject
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator< ViewVertex * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< ViewVertex * >::iterator > *>(iter) != 0));
       if (_v) {
         swig::PySwigIterator *iter = 0;
         int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *>(iter) != 0));
+        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< ViewVertex * >::iterator > *>(iter) != 0));
         if (_v) {
           return _wrap_ViewVerticesContainer_erase__SWIG_1(self, args);
         }
@@ -45807,16 +44779,19 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_erase(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVerticesContainer_erase'.\n  Possible C/C++ prototypes are:\n    erase(std::vector<ViewVertex * >::iterator)\n    erase(std::vector<ViewVertex * >::iterator,std::vector<ViewVertex * >::iterator)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVerticesContainer_erase'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    erase(std::vector< ViewVertex * > *,std::vector< ViewVertex * >::iterator)\n"
+    "    erase(std::vector< ViewVertex * > *,std::vector< ViewVertex * >::iterator,std::vector< ViewVertex * >::iterator)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * >::size_type arg1 ;
-  std::vector<ViewVertex * >::value_type arg2 = (std::vector<ViewVertex * >::value_type) 0 ;
-  std::vector<ViewVertex * > *result = 0 ;
+  std::vector< ViewVertex * >::size_type arg1 ;
+  std::vector< ViewVertex * >::value_type arg2 = (std::vector< ViewVertex * >::value_type) 0 ;
+  std::vector< ViewVertex * > *result = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   void *argp2 = 0 ;
@@ -45827,17 +44802,17 @@ SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer__SWIG_3(PyObject *SWIGUNUSE
   if (!PyArg_ParseTuple(args,(char *)"OO:new_ViewVerticesContainer",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ViewVerticesContainer" "', argument " "1"" of type '" "std::vector<ViewVertex * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ViewVerticesContainer" "', argument " "1"" of type '" "std::vector< ViewVertex * >::size_type""'");
   } 
-  arg1 = static_cast< std::vector<ViewVertex * >::size_type >(val1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
+  arg1 = static_cast< std::vector< ViewVertex * >::size_type >(val1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ViewVerticesContainer" "', argument " "2"" of type '" "std::vector<ViewVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ViewVerticesContainer" "', argument " "2"" of type '" "std::vector< ViewVertex * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<ViewVertex * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector< ViewVertex * >::value_type >(argp2);
   {
     try {
-      result = (std::vector<ViewVertex * > *)new std::vector<ViewVertex * >(arg1,arg2);
+      result = (std::vector< ViewVertex * > *)new std::vector< ViewVertex * >(arg1,arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -45846,7 +44821,7 @@ SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer__SWIG_3(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -45859,7 +44834,7 @@ SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer(PyObject *self, PyObject *a
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -45878,7 +44853,7 @@ SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer(PyObject *self, PyObject *a
   }
   if (argc == 1) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator< ViewVertex * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_new_ViewVerticesContainer__SWIG_1(self, args);
@@ -45892,7 +44867,7 @@ SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer(PyObject *self, PyObject *a
     }
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_new_ViewVerticesContainer__SWIG_3(self, args);
@@ -45901,15 +44876,20 @@ SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer(PyObject *self, PyObject *a
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewVerticesContainer'.\n  Possible C/C++ prototypes are:\n    std::vector<(p.ViewVertex)>()\n    std::vector<(p.ViewVertex)>(std::vector<ViewVertex * > const &)\n    std::vector<(p.ViewVertex)>(std::vector<ViewVertex * >::size_type)\n    std::vector<(p.ViewVertex)>(std::vector<ViewVertex * >::size_type,std::vector<ViewVertex * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewVerticesContainer'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    std::vector< ViewVertex * >()\n"
+    "    std::vector< ViewVertex * >(std::vector< ViewVertex * > const &)\n"
+    "    std::vector< ViewVertex * >(std::vector< ViewVertex * >::size_type)\n"
+    "    std::vector< ViewVertex * >(std::vector< ViewVertex * >::size_type,std::vector< ViewVertex * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_push_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::value_type arg2 = (std::vector<ViewVertex * >::value_type) 0 ;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::value_type arg2 = (std::vector< ViewVertex * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -45918,16 +44898,16 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_push_back(PyObject *SWIGUNUSEDP
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewVerticesContainer_push_back",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_push_back" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_push_back" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewVerticesContainer_push_back" "', argument " "2"" of type '" "std::vector<ViewVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewVerticesContainer_push_back" "', argument " "2"" of type '" "std::vector< ViewVertex * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<ViewVertex * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector< ViewVertex * >::value_type >(argp2);
   {
     try {
       (arg1)->push_back(arg2);
@@ -45948,21 +44928,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_front(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::value_type result;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_front",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_front" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_front" "', argument " "1"" of type '" "std::vector< ViewVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   {
     try {
-      result = (std::vector<ViewVertex * >::value_type)((std::vector<ViewVertex * > const *)arg1)->front();
+      result = (std::vector< ViewVertex * >::value_type)((std::vector< ViewVertex * > const *)arg1)->front();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -45971,7 +44951,7 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_front(PyObject *SWIGUNUSEDPARM(
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -45980,21 +44960,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::value_type result;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_back" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_back" "', argument " "1"" of type '" "std::vector< ViewVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   {
     try {
-      result = (std::vector<ViewVertex * >::value_type)((std::vector<ViewVertex * > const *)arg1)->back();
+      result = (std::vector< ViewVertex * >::value_type)((std::vector< ViewVertex * > const *)arg1)->back();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -46003,7 +44983,7 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_back(PyObject *SWIGUNUSEDPARM(s
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -46012,9 +44992,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_assign(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::size_type arg2 ;
-  std::vector<ViewVertex * >::value_type arg3 = (std::vector<ViewVertex * >::value_type) 0 ;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::size_type arg2 ;
+  std::vector< ViewVertex * >::value_type arg3 = (std::vector< ViewVertex * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -46026,21 +45006,21 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_assign(PyObject *SWIGUNUSEDPARM
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewVerticesContainer_assign",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_assign" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_assign" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer_assign" "', argument " "2"" of type '" "std::vector<ViewVertex * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer_assign" "', argument " "2"" of type '" "std::vector< ViewVertex * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewVertex * >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector< ViewVertex * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewVerticesContainer_assign" "', argument " "3"" of type '" "std::vector<ViewVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewVerticesContainer_assign" "', argument " "3"" of type '" "std::vector< ViewVertex * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<ViewVertex * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< ViewVertex * >::value_type >(argp3);
   {
     try {
       (arg1)->assign(arg2,arg3);
@@ -46061,9 +45041,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::size_type arg2 ;
-  std::vector<ViewVertex * >::value_type arg3 = (std::vector<ViewVertex * >::value_type) 0 ;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::size_type arg2 ;
+  std::vector< ViewVertex * >::value_type arg3 = (std::vector< ViewVertex * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -46075,21 +45055,21 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_resize__SWIG_1(PyObject *SWIGUN
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewVerticesContainer_resize",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_resize" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_resize" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer_resize" "', argument " "2"" of type '" "std::vector<ViewVertex * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer_resize" "', argument " "2"" of type '" "std::vector< ViewVertex * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewVertex * >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector< ViewVertex * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewVerticesContainer_resize" "', argument " "3"" of type '" "std::vector<ViewVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewVerticesContainer_resize" "', argument " "3"" of type '" "std::vector< ViewVertex * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<ViewVertex * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< ViewVertex * >::value_type >(argp3);
   {
     try {
       (arg1)->resize(arg2,arg3);
@@ -46114,13 +45094,13 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_resize(PyObject *self, PyObject
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator< ViewVertex * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -46134,7 +45114,7 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_resize(PyObject *self, PyObject
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator< ViewVertex * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -46143,7 +45123,7 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_resize(PyObject *self, PyObject
       }
       if (_v) {
         void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0);
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           return _wrap_ViewVerticesContainer_resize__SWIG_1(self, args);
@@ -46153,17 +45133,20 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_resize(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVerticesContainer_resize'.\n  Possible C/C++ prototypes are:\n    resize(std::vector<ViewVertex * >::size_type)\n    resize(std::vector<ViewVertex * >::size_type,std::vector<ViewVertex * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVerticesContainer_resize'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    resize(std::vector< ViewVertex * > *,std::vector< ViewVertex * >::size_type)\n"
+    "    resize(std::vector< ViewVertex * > *,std::vector< ViewVertex * >::size_type,std::vector< ViewVertex * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::iterator arg2 ;
-  std::vector<ViewVertex * >::value_type arg3 = (std::vector<ViewVertex * >::value_type) 0 ;
-  std::vector<ViewVertex * >::iterator result;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::iterator arg2 ;
+  std::vector< ViewVertex * >::value_type arg3 = (std::vector< ViewVertex * >::value_type) 0 ;
+  std::vector< ViewVertex * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -46175,27 +45158,27 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_insert__SWIG_0(PyObject *SWIGUN
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewVerticesContainer_insert",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_insert" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_insert" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewVertex * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_insert" "', argument " "2"" of type '" "std::vector< ViewVertex * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< ViewVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< ViewVertex * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewVertex * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_insert" "', argument " "2"" of type '" "std::vector< ViewVertex * >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewVerticesContainer_insert" "', argument " "3"" of type '" "std::vector<ViewVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewVerticesContainer_insert" "', argument " "3"" of type '" "std::vector< ViewVertex * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<ViewVertex * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< ViewVertex * >::value_type >(argp3);
   {
     try {
       result = (arg1)->insert(arg2,arg3);
@@ -46207,7 +45190,7 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_insert__SWIG_0(PyObject *SWIGUN
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewVertex * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewVertex * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -46217,10 +45200,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::iterator arg2 ;
-  std::vector<ViewVertex * >::size_type arg3 ;
-  std::vector<ViewVertex * >::value_type arg4 = (std::vector<ViewVertex * >::value_type) 0 ;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::iterator arg2 ;
+  std::vector< ViewVertex * >::size_type arg3 ;
+  std::vector< ViewVertex * >::value_type arg4 = (std::vector< ViewVertex * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -46235,32 +45218,32 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_insert__SWIG_1(PyObject *SWIGUN
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:ViewVerticesContainer_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_insert" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_insert" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewVertex * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_insert" "', argument " "2"" of type '" "std::vector< ViewVertex * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< ViewVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< ViewVertex * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewVertex * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_insert" "', argument " "2"" of type '" "std::vector< ViewVertex * >::iterator""'");
     }
   }
   ecode3 = SWIG_AsVal_size_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewVerticesContainer_insert" "', argument " "3"" of type '" "std::vector<ViewVertex * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewVerticesContainer_insert" "', argument " "3"" of type '" "std::vector< ViewVertex * >::size_type""'");
   } 
-  arg3 = static_cast< std::vector<ViewVertex * >::size_type >(val3);
-  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
+  arg3 = static_cast< std::vector< ViewVertex * >::size_type >(val3);
+  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewVerticesContainer_insert" "', argument " "4"" of type '" "std::vector<ViewVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewVerticesContainer_insert" "', argument " "4"" of type '" "std::vector< ViewVertex * >::value_type""'"); 
   }
-  arg4 = reinterpret_cast< std::vector<ViewVertex * >::value_type >(argp4);
+  arg4 = reinterpret_cast< std::vector< ViewVertex * >::value_type >(argp4);
   {
     try {
       (arg1)->insert(arg2,arg3,arg4);
@@ -46285,21 +45268,21 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_insert(PyObject *self, PyObject
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator< ViewVertex * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< ViewVertex * >::iterator > *>(iter) != 0));
       if (_v) {
         void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0);
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           return _wrap_ViewVerticesContainer_insert__SWIG_0(self, args);
@@ -46309,12 +45292,12 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_insert(PyObject *self, PyObject
   }
   if (argc == 4) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator< ViewVertex * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< ViewVertex * >::iterator > *>(iter) != 0));
       if (_v) {
         {
           int res = SWIG_AsVal_size_t(argv[2], NULL);
@@ -46322,7 +45305,7 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_insert(PyObject *self, PyObject
         }
         if (_v) {
           void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0);
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0);
           _v = SWIG_CheckState(res);
           if (_v) {
             return _wrap_ViewVerticesContainer_insert__SWIG_1(self, args);
@@ -46333,15 +45316,18 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_insert(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVerticesContainer_insert'.\n  Possible C/C++ prototypes are:\n    insert(std::vector<ViewVertex * >::iterator,std::vector<ViewVertex * >::value_type)\n    insert(std::vector<ViewVertex * >::iterator,std::vector<ViewVertex * >::size_type,std::vector<ViewVertex * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVerticesContainer_insert'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    insert(std::vector< ViewVertex * > *,std::vector< ViewVertex * >::iterator,std::vector< ViewVertex * >::value_type)\n"
+    "    insert(std::vector< ViewVertex * > *,std::vector< ViewVertex * >::iterator,std::vector< ViewVertex * >::size_type,std::vector< ViewVertex * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_reserve(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::size_type arg2 ;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::size_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -46350,16 +45336,16 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_reserve(PyObject *SWIGUNUSEDPAR
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewVerticesContainer_reserve",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_reserve" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_reserve" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer_reserve" "', argument " "2"" of type '" "std::vector<ViewVertex * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer_reserve" "', argument " "2"" of type '" "std::vector< ViewVertex * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewVertex * >::size_type >(val2);
+  arg2 = static_cast< std::vector< ViewVertex * >::size_type >(val2);
   {
     try {
       (arg1)->reserve(arg2);
@@ -46380,21 +45366,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_capacity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::size_type result;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_capacity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_capacity" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_capacity" "', argument " "1"" of type '" "std::vector< ViewVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   {
     try {
-      result = ((std::vector<ViewVertex * > const *)arg1)->capacity();
+      result = ((std::vector< ViewVertex * > const *)arg1)->capacity();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -46412,17 +45398,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_ViewVerticesContainer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_ViewVerticesContainer",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ViewVerticesContainer" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ViewVerticesContainer" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   {
     try {
       delete arg1;
@@ -46444,14 +45430,14 @@ fail:
 
 SWIGINTERN PyObject *ViewVerticesContainer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
   PyObject **arg2 = (PyObject **) 0 ;
   swig::PySwigIterator *result = 0 ;
   void *argp1 = 0 ;
@@ -46460,11 +45446,11 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_iterator(PyObject *SWIGUNUSEDPARM(
   
   arg2 = &obj0;
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_iterator" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_iterator" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   {
     try {
       result = (swig::PySwigIterator *)std_vector_Sl_SVertex_Sm__Sg__iterator(arg1,arg2);
@@ -46485,21 +45471,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer___nonzero__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer___nonzero__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___nonzero__" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___nonzero__" "', argument " "1"" of type '" "std::vector< SVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   {
     try {
-      result = (bool)std_vector_Sl_SVertex_Sm__Sg____nonzero__((std::vector<SVertex * > const *)arg1);
+      result = (bool)std_vector_Sl_SVertex_Sm__Sg____nonzero__((std::vector< SVertex * > const *)arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -46517,21 +45503,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer___len__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::size_type result;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer___len__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___len__" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___len__" "', argument " "1"" of type '" "std::vector< SVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   {
     try {
-      result = std_vector_Sl_SVertex_Sm__Sg____len__((std::vector<SVertex * > const *)arg1);
+      result = std_vector_Sl_SVertex_Sm__Sg____len__((std::vector< SVertex * > const *)arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -46549,22 +45535,22 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::value_type result;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_pop" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_pop" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   {
     try {
       try {
-        result = (std::vector<SVertex * >::value_type)std_vector_Sl_SVertex_Sm__Sg__pop(arg1);
+        result = (std::vector< SVertex * >::value_type)std_vector_Sl_SVertex_Sm__Sg__pop(arg1);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -46578,7 +45564,7 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_pop(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -46587,10 +45573,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::difference_type arg2 ;
-  std::vector<SVertex * >::difference_type arg3 ;
-  std::vector<SVertex *,std::allocator<SVertex * > > *result = 0 ;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::difference_type arg2 ;
+  std::vector< SVertex * >::difference_type arg3 ;
+  std::vector< SVertex *,std::allocator< SVertex * > > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -46602,25 +45588,25 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer___getslice__(PyObject *SWIGUNUSEDP
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:SVerticesContainer___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___getslice__" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___getslice__" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer___getslice__" "', argument " "2"" of type '" "std::vector<SVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer___getslice__" "', argument " "2"" of type '" "std::vector< SVertex * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<SVertex * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< SVertex * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SVerticesContainer___getslice__" "', argument " "3"" of type '" "std::vector<SVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SVerticesContainer___getslice__" "', argument " "3"" of type '" "std::vector< SVertex * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<SVertex * >::difference_type >(val3);
+  arg3 = static_cast< std::vector< SVertex * >::difference_type >(val3);
   {
     try {
       try {
-        result = (std::vector<SVertex *,std::allocator<SVertex * > > *)std_vector_Sl_SVertex_Sm__Sg____getslice__(arg1,arg2,arg3);
+        result = (std::vector< SVertex *,std::allocator< SVertex * > > *)std_vector_Sl_SVertex_Sm__Sg____getslice__(arg1,arg2,arg3);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -46634,7 +45620,7 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer___getslice__(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -46643,10 +45629,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer___setslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::difference_type arg2 ;
-  std::vector<SVertex * >::difference_type arg3 ;
-  std::vector<SVertex *,std::allocator<SVertex * > > *arg4 = 0 ;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::difference_type arg2 ;
+  std::vector< SVertex * >::difference_type arg3 ;
+  std::vector< SVertex *,std::allocator< SVertex * > > *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -46660,36 +45646,36 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer___setslice__(PyObject *SWIGUNUSEDP
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:SVerticesContainer___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___setslice__" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___setslice__" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer___setslice__" "', argument " "2"" of type '" "std::vector<SVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer___setslice__" "', argument " "2"" of type '" "std::vector< SVertex * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<SVertex * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< SVertex * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SVerticesContainer___setslice__" "', argument " "3"" of type '" "std::vector<SVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SVerticesContainer___setslice__" "', argument " "3"" of type '" "std::vector< SVertex * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<SVertex * >::difference_type >(val3);
+  arg3 = static_cast< std::vector< SVertex * >::difference_type >(val3);
   {
-    std::vector<SVertex*,std::allocator<SVertex * > > *ptr = (std::vector<SVertex*,std::allocator<SVertex * > > *)0;
+    std::vector<SVertex*,std::allocator< SVertex * > > *ptr = (std::vector<SVertex*,std::allocator< SVertex * > > *)0;
     res4 = swig::asptr(obj3, &ptr);
     if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "SVerticesContainer___setslice__" "', argument " "4"" of type '" "std::vector<SVertex *,std::allocator<SVertex * > > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "SVerticesContainer___setslice__" "', argument " "4"" of type '" "std::vector< SVertex *,std::allocator< SVertex * > > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SVerticesContainer___setslice__" "', argument " "4"" of type '" "std::vector<SVertex *,std::allocator<SVertex * > > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SVerticesContainer___setslice__" "', argument " "4"" of type '" "std::vector< SVertex *,std::allocator< SVertex * > > const &""'"); 
     }
     arg4 = ptr;
   }
   {
     try {
       try {
-        std_vector_Sl_SVertex_Sm__Sg____setslice__(arg1,arg2,arg3,(std::vector<SVertex *,std::allocator<SVertex * > > const &)*arg4);
+        std_vector_Sl_SVertex_Sm__Sg____setslice__(arg1,arg2,arg3,(std::vector< SVertex *,std::allocator< SVertex * > > const &)*arg4);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -46717,9 +45703,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer___delslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::difference_type arg2 ;
-  std::vector<SVertex * >::difference_type arg3 ;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::difference_type arg2 ;
+  std::vector< SVertex * >::difference_type arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -46731,21 +45717,21 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer___delslice__(PyObject *SWIGUNUSEDP
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:SVerticesContainer___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___delslice__" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___delslice__" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer___delslice__" "', argument " "2"" of type '" "std::vector<SVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer___delslice__" "', argument " "2"" of type '" "std::vector< SVertex * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<SVertex * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< SVertex * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SVerticesContainer___delslice__" "', argument " "3"" of type '" "std::vector<SVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SVerticesContainer___delslice__" "', argument " "3"" of type '" "std::vector< SVertex * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<SVertex * >::difference_type >(val3);
+  arg3 = static_cast< std::vector< SVertex * >::difference_type >(val3);
   {
     try {
       try {
@@ -46772,8 +45758,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer___delitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::difference_type arg2 ;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::difference_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -46782,16 +45768,16 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer___delitem__(PyObject *SWIGUNUSEDPA
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:SVerticesContainer___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___delitem__" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___delitem__" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer___delitem__" "', argument " "2"" of type '" "std::vector<SVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer___delitem__" "', argument " "2"" of type '" "std::vector< SVertex * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<SVertex * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< SVertex * >::difference_type >(val2);
   {
     try {
       try {
@@ -46818,9 +45804,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer___getitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::difference_type arg2 ;
-  std::vector<SVertex * >::value_type result;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::difference_type arg2 ;
+  std::vector< SVertex * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -46829,20 +45815,20 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer___getitem__(PyObject *SWIGUNUSEDPA
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:SVerticesContainer___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___getitem__" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___getitem__" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer___getitem__" "', argument " "2"" of type '" "std::vector<SVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer___getitem__" "', argument " "2"" of type '" "std::vector< SVertex * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<SVertex * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< SVertex * >::difference_type >(val2);
   {
     try {
       try {
-        result = (std::vector<SVertex * >::value_type)std_vector_Sl_SVertex_Sm__Sg____getitem__(arg1,arg2);
+        result = (std::vector< SVertex * >::value_type)std_vector_Sl_SVertex_Sm__Sg____getitem__(arg1,arg2);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -46856,7 +45842,7 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer___getitem__(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -46865,9 +45851,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer___setitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::difference_type arg2 ;
-  std::vector<SVertex * >::value_type arg3 = (std::vector<SVertex * >::value_type) 0 ;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::difference_type arg2 ;
+  std::vector< SVertex * >::value_type arg3 = (std::vector< SVertex * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -46879,21 +45865,21 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer___setitem__(PyObject *SWIGUNUSEDPA
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:SVerticesContainer___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___setitem__" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___setitem__" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer___setitem__" "', argument " "2"" of type '" "std::vector<SVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer___setitem__" "', argument " "2"" of type '" "std::vector< SVertex * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<SVertex * >::difference_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector< SVertex * >::difference_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SVerticesContainer___setitem__" "', argument " "3"" of type '" "std::vector<SVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SVerticesContainer___setitem__" "', argument " "3"" of type '" "std::vector< SVertex * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<SVertex * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< SVertex * >::value_type >(argp3);
   {
     try {
       try {
@@ -46920,8 +45906,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::value_type arg2 = (std::vector<SVertex * >::value_type) 0 ;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::value_type arg2 = (std::vector< SVertex * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -46930,16 +45916,16 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_append(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:SVerticesContainer_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_append" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_append" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVerticesContainer_append" "', argument " "2"" of type '" "std::vector<SVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVerticesContainer_append" "', argument " "2"" of type '" "std::vector< SVertex * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<SVertex * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector< SVertex * >::value_type >(argp2);
   {
     try {
       std_vector_Sl_SVertex_Sm__Sg__append(arg1,arg2);
@@ -46960,12 +45946,12 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_SVerticesContainer__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *result = 0 ;
+  std::vector< SVertex * > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_SVerticesContainer")) SWIG_fail;
   {
     try {
-      result = (std::vector<SVertex * > *)new std::vector<SVertex * >();
+      result = (std::vector< SVertex * > *)new std::vector< SVertex * >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -46974,7 +45960,7 @@ SWIGINTERN PyObject *_wrap_new_SVerticesContainer__SWIG_0(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -46983,26 +45969,26 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_SVerticesContainer__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = 0 ;
-  std::vector<SVertex * > *result = 0 ;
+  std::vector< SVertex * > *arg1 = 0 ;
+  std::vector< SVertex * > *result = 0 ;
   int res1 = SWIG_OLDOBJ ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_SVerticesContainer",&obj0)) SWIG_fail;
   {
-    std::vector<SVertex*,std::allocator<SVertex * > > *ptr = (std::vector<SVertex*,std::allocator<SVertex * > > *)0;
+    std::vector<SVertex*,std::allocator< SVertex * > > *ptr = (std::vector<SVertex*,std::allocator< SVertex * > > *)0;
     res1 = swig::asptr(obj0, &ptr);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_SVerticesContainer" "', argument " "1"" of type '" "std::vector<SVertex * > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_SVerticesContainer" "', argument " "1"" of type '" "std::vector< SVertex * > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_SVerticesContainer" "', argument " "1"" of type '" "std::vector<SVertex * > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_SVerticesContainer" "', argument " "1"" of type '" "std::vector< SVertex * > const &""'"); 
     }
     arg1 = ptr;
   }
   {
     try {
-      result = (std::vector<SVertex * > *)new std::vector<SVertex * >((std::vector<SVertex * > const &)*arg1);
+      result = (std::vector< SVertex * > *)new std::vector< SVertex * >((std::vector< SVertex * > const &)*arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -47011,7 +45997,7 @@ SWIGINTERN PyObject *_wrap_new_SVerticesContainer__SWIG_1(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, SWIG_POINTER_NEW |  0 );
   if (SWIG_IsNewObj(res1)) delete arg1;
   return resultobj;
 fail:
@@ -47022,21 +46008,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_empty",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_empty" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_empty" "', argument " "1"" of type '" "std::vector< SVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   {
     try {
-      result = (bool)((std::vector<SVertex * > const *)arg1)->empty();
+      result = (bool)((std::vector< SVertex * > const *)arg1)->empty();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -47054,21 +46040,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::size_type result;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_size" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_size" "', argument " "1"" of type '" "std::vector< SVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   {
     try {
-      result = ((std::vector<SVertex * > const *)arg1)->size();
+      result = ((std::vector< SVertex * > const *)arg1)->size();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -47086,17 +46072,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_clear" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_clear" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   {
     try {
       (arg1)->clear();
@@ -47117,8 +46103,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * > *arg2 = 0 ;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -47127,19 +46113,19 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_swap(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:SVerticesContainer_swap",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_swap" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_swap" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t,  0 );
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVerticesContainer_swap" "', argument " "2"" of type '" "std::vector<SVertex * > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVerticesContainer_swap" "', argument " "2"" of type '" "std::vector< SVertex * > &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SVerticesContainer_swap" "', argument " "2"" of type '" "std::vector<SVertex * > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SVerticesContainer_swap" "', argument " "2"" of type '" "std::vector< SVertex * > &""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<SVertex * > * >(argp2);
+  arg2 = reinterpret_cast< std::vector< SVertex * > * >(argp2);
   {
     try {
       (arg1)->swap(*arg2);
@@ -47160,21 +46146,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  SwigValueWrapper<std::allocator<SVertex * > > result;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  SwigValueWrapper< std::allocator< SVertex * > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_get_allocator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_get_allocator" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_get_allocator" "', argument " "1"" of type '" "std::vector< SVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   {
     try {
-      result = ((std::vector<SVertex * > const *)arg1)->get_allocator();
+      result = ((std::vector< SVertex * > const *)arg1)->get_allocator();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -47183,30 +46169,30 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_get_allocator(PyObject *SWIGUNUSED
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new std::vector<SVertex * >::allocator_type(static_cast< const std::vector<SVertex * >::allocator_type& >(result))), SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new std::vector< SVertex * >::allocator_type(static_cast< const std::vector< SVertex * >::allocator_type& >(result))), SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_SVerticesContainer_begin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SVerticesContainer_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::iterator result;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::const_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_begin" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_begin" "', argument " "1"" of type '" "std::vector< SVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   {
     try {
-      result = (arg1)->begin();
+      result = ((std::vector< SVertex * > const *)arg1)->begin();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -47215,7 +46201,7 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_begin__SWIG_0(PyObject *SWIGUNUSED
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<SVertex * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< SVertex * >::const_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -47223,89 +46209,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SVerticesContainer_begin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SVerticesContainer_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::const_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_begin" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<SVertex * > const *)arg1)->begin();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<SVertex * >::const_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SVerticesContainer_begin(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_SVerticesContainer_begin__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_SVerticesContainer_begin__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SVerticesContainer_begin'.\n  Possible C/C++ prototypes are:\n    begin()\n    begin()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SVerticesContainer_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::iterator result;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::const_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_end" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_end" "', argument " "1"" of type '" "std::vector< SVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   {
     try {
-      result = (arg1)->end();
+      result = ((std::vector< SVertex * > const *)arg1)->end();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -47314,7 +46234,7 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_end__SWIG_0(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<SVertex * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< SVertex * >::const_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -47322,89 +46242,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SVerticesContainer_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SVerticesContainer_rbegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::const_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_end" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<SVertex * > const *)arg1)->end();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<SVertex * >::const_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SVerticesContainer_end(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_SVerticesContainer_end__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_SVerticesContainer_end__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SVerticesContainer_end'.\n  Possible C/C++ prototypes are:\n    end()\n    end()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SVerticesContainer_rbegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::reverse_iterator result;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::const_reverse_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_rbegin" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_rbegin" "', argument " "1"" of type '" "std::vector< SVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   {
     try {
-      result = (arg1)->rbegin();
+      result = ((std::vector< SVertex * > const *)arg1)->rbegin();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -47413,7 +46267,7 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_rbegin__SWIG_0(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<SVertex * >::reverse_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< SVertex * >::const_reverse_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -47421,89 +46275,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SVerticesContainer_rbegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SVerticesContainer_rend(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::const_reverse_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_rbegin" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<SVertex * > const *)arg1)->rbegin();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<SVertex * >::const_reverse_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SVerticesContainer_rbegin(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_SVerticesContainer_rbegin__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_SVerticesContainer_rbegin__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SVerticesContainer_rbegin'.\n  Possible C/C++ prototypes are:\n    rbegin()\n    rbegin()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SVerticesContainer_rend__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::reverse_iterator result;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::const_reverse_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_rend" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_rend" "', argument " "1"" of type '" "std::vector< SVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   {
     try {
-      result = (arg1)->rend();
+      result = ((std::vector< SVertex * > const *)arg1)->rend();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -47512,7 +46300,7 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_rend__SWIG_0(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<SVertex * >::reverse_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< SVertex * >::const_reverse_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -47520,76 +46308,10 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SVerticesContainer_rend__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::const_reverse_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_rend" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<SVertex * > const *)arg1)->rend();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<SVertex * >::const_reverse_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SVerticesContainer_rend(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_SVerticesContainer_rend__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_SVerticesContainer_rend__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SVerticesContainer_rend'.\n  Possible C/C++ prototypes are:\n    rend()\n    rend()\n");
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_new_SVerticesContainer__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * >::size_type arg1 ;
-  std::vector<SVertex * > *result = 0 ;
+  std::vector< SVertex * >::size_type arg1 ;
+  std::vector< SVertex * > *result = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -47597,12 +46319,12 @@ SWIGINTERN PyObject *_wrap_new_SVerticesContainer__SWIG_2(PyObject *SWIGUNUSEDPA
   if (!PyArg_ParseTuple(args,(char *)"O:new_SVerticesContainer",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_SVerticesContainer" "', argument " "1"" of type '" "std::vector<SVertex * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_SVerticesContainer" "', argument " "1"" of type '" "std::vector< SVertex * >::size_type""'");
   } 
-  arg1 = static_cast< std::vector<SVertex * >::size_type >(val1);
+  arg1 = static_cast< std::vector< SVertex * >::size_type >(val1);
   {
     try {
-      result = (std::vector<SVertex * > *)new std::vector<SVertex * >(arg1);
+      result = (std::vector< SVertex * > *)new std::vector< SVertex * >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -47611,7 +46333,7 @@ SWIGINTERN PyObject *_wrap_new_SVerticesContainer__SWIG_2(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -47620,17 +46342,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_pop_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_pop_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_pop_back" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_pop_back" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   {
     try {
       (arg1)->pop_back();
@@ -47651,8 +46373,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::size_type arg2 ;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::size_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -47661,16 +46383,16 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_resize__SWIG_0(PyObject *SWIGUNUSE
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:SVerticesContainer_resize",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_resize" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_resize" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer_resize" "', argument " "2"" of type '" "std::vector<SVertex * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer_resize" "', argument " "2"" of type '" "std::vector< SVertex * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<SVertex * >::size_type >(val2);
+  arg2 = static_cast< std::vector< SVertex * >::size_type >(val2);
   {
     try {
       (arg1)->resize(arg2);
@@ -47691,9 +46413,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::iterator arg2 ;
-  std::vector<SVertex * >::iterator result;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::iterator arg2 ;
+  std::vector< SVertex * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -47702,20 +46424,20 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_erase__SWIG_0(PyObject *SWIGUNUSED
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:SVerticesContainer_erase",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_erase" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_erase" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_erase" "', argument " "2"" of type '" "std::vector<SVertex * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_erase" "', argument " "2"" of type '" "std::vector< SVertex * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< SVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< SVertex * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_erase" "', argument " "2"" of type '" "std::vector<SVertex * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_erase" "', argument " "2"" of type '" "std::vector< SVertex * >::iterator""'");
     }
   }
   {
@@ -47729,7 +46451,7 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_erase__SWIG_0(PyObject *SWIGUNUSED
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<SVertex * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< SVertex * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -47739,10 +46461,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::iterator arg2 ;
-  std::vector<SVertex * >::iterator arg3 ;
-  std::vector<SVertex * >::iterator result;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::iterator arg2 ;
+  std::vector< SVertex * >::iterator arg3 ;
+  std::vector< SVertex * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -47754,31 +46476,31 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_erase__SWIG_1(PyObject *SWIGUNUSED
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:SVerticesContainer_erase",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_erase" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_erase" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_erase" "', argument " "2"" of type '" "std::vector<SVertex * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_erase" "', argument " "2"" of type '" "std::vector< SVertex * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< SVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< SVertex * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_erase" "', argument " "2"" of type '" "std::vector<SVertex * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_erase" "', argument " "2"" of type '" "std::vector< SVertex * >::iterator""'");
     }
   }
   res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res3) || !iter3) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_erase" "', argument " "3"" of type '" "std::vector<SVertex * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_erase" "', argument " "3"" of type '" "std::vector< SVertex * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *>(iter3);
+    swig::PySwigIterator_T<std::vector< SVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< SVertex * >::iterator > *>(iter3);
     if (iter_t) {
       arg3 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_erase" "', argument " "3"" of type '" "std::vector<SVertex * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_erase" "', argument " "3"" of type '" "std::vector< SVertex * >::iterator""'");
     }
   }
   {
@@ -47792,7 +46514,7 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_erase__SWIG_1(PyObject *SWIGUNUSED
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<SVertex * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< SVertex * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -47806,18 +46528,18 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_erase(PyObject *self, PyObject *ar
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator< SVertex * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< SVertex * >::iterator > *>(iter) != 0));
       if (_v) {
         return _wrap_SVerticesContainer_erase__SWIG_0(self, args);
       }
@@ -47825,16 +46547,16 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_erase(PyObject *self, PyObject *ar
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator< SVertex * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< SVertex * >::iterator > *>(iter) != 0));
       if (_v) {
         swig::PySwigIterator *iter = 0;
         int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *>(iter) != 0));
+        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< SVertex * >::iterator > *>(iter) != 0));
         if (_v) {
           return _wrap_SVerticesContainer_erase__SWIG_1(self, args);
         }
@@ -47843,16 +46565,19 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_erase(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SVerticesContainer_erase'.\n  Possible C/C++ prototypes are:\n    erase(std::vector<SVertex * >::iterator)\n    erase(std::vector<SVertex * >::iterator,std::vector<SVertex * >::iterator)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SVerticesContainer_erase'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    erase(std::vector< SVertex * > *,std::vector< SVertex * >::iterator)\n"
+    "    erase(std::vector< SVertex * > *,std::vector< SVertex * >::iterator,std::vector< SVertex * >::iterator)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_new_SVerticesContainer__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * >::size_type arg1 ;
-  std::vector<SVertex * >::value_type arg2 = (std::vector<SVertex * >::value_type) 0 ;
-  std::vector<SVertex * > *result = 0 ;
+  std::vector< SVertex * >::size_type arg1 ;
+  std::vector< SVertex * >::value_type arg2 = (std::vector< SVertex * >::value_type) 0 ;
+  std::vector< SVertex * > *result = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   void *argp2 = 0 ;
@@ -47863,17 +46588,17 @@ SWIGINTERN PyObject *_wrap_new_SVerticesContainer__SWIG_3(PyObject *SWIGUNUSEDPA
   if (!PyArg_ParseTuple(args,(char *)"OO:new_SVerticesContainer",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_SVerticesContainer" "', argument " "1"" of type '" "std::vector<SVertex * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_SVerticesContainer" "', argument " "1"" of type '" "std::vector< SVertex * >::size_type""'");
   } 
-  arg1 = static_cast< std::vector<SVertex * >::size_type >(val1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
+  arg1 = static_cast< std::vector< SVertex * >::size_type >(val1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_SVerticesContainer" "', argument " "2"" of type '" "std::vector<SVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_SVerticesContainer" "', argument " "2"" of type '" "std::vector< SVertex * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<SVertex * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector< SVertex * >::value_type >(argp2);
   {
     try {
-      result = (std::vector<SVertex * > *)new std::vector<SVertex * >(arg1,arg2);
+      result = (std::vector< SVertex * > *)new std::vector< SVertex * >(arg1,arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -47882,7 +46607,7 @@ SWIGINTERN PyObject *_wrap_new_SVerticesContainer__SWIG_3(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -47895,7 +46620,7 @@ SWIGINTERN PyObject *_wrap_new_SVerticesContainer(PyObject *self, PyObject *args
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -47914,7 +46639,7 @@ SWIGINTERN PyObject *_wrap_new_SVerticesContainer(PyObject *self, PyObject *args
   }
   if (argc == 1) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator< SVertex * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_new_SVerticesContainer__SWIG_1(self, args);
@@ -47928,7 +46653,7 @@ SWIGINTERN PyObject *_wrap_new_SVerticesContainer(PyObject *self, PyObject *args
     }
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_new_SVerticesContainer__SWIG_3(self, args);
@@ -47937,15 +46662,20 @@ SWIGINTERN PyObject *_wrap_new_SVerticesContainer(PyObject *self, PyObject *args
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_SVerticesContainer'.\n  Possible C/C++ prototypes are:\n    std::vector<(p.SVertex)>()\n    std::vector<(p.SVertex)>(std::vector<SVertex * > const &)\n    std::vector<(p.SVertex)>(std::vector<SVertex * >::size_type)\n    std::vector<(p.SVertex)>(std::vector<SVertex * >::size_type,std::vector<SVertex * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_SVerticesContainer'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    std::vector< SVertex * >()\n"
+    "    std::vector< SVertex * >(std::vector< SVertex * > const &)\n"
+    "    std::vector< SVertex * >(std::vector< SVertex * >::size_type)\n"
+    "    std::vector< SVertex * >(std::vector< SVertex * >::size_type,std::vector< SVertex * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_push_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::value_type arg2 = (std::vector<SVertex * >::value_type) 0 ;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::value_type arg2 = (std::vector< SVertex * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -47954,16 +46684,16 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_push_back(PyObject *SWIGUNUSEDPARM
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:SVerticesContainer_push_back",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_push_back" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_push_back" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVerticesContainer_push_back" "', argument " "2"" of type '" "std::vector<SVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVerticesContainer_push_back" "', argument " "2"" of type '" "std::vector< SVertex * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<SVertex * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector< SVertex * >::value_type >(argp2);
   {
     try {
       (arg1)->push_back(arg2);
@@ -47984,21 +46714,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_front(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::value_type result;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_front",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_front" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_front" "', argument " "1"" of type '" "std::vector< SVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   {
     try {
-      result = (std::vector<SVertex * >::value_type)((std::vector<SVertex * > const *)arg1)->front();
+      result = (std::vector< SVertex * >::value_type)((std::vector< SVertex * > const *)arg1)->front();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -48007,7 +46737,7 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_front(PyObject *SWIGUNUSEDPARM(sel
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -48016,21 +46746,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::value_type result;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_back" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_back" "', argument " "1"" of type '" "std::vector< SVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   {
     try {
-      result = (std::vector<SVertex * >::value_type)((std::vector<SVertex * > const *)arg1)->back();
+      result = (std::vector< SVertex * >::value_type)((std::vector< SVertex * > const *)arg1)->back();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -48039,7 +46769,7 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_back(PyObject *SWIGUNUSEDPARM(self
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -48048,9 +46778,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_assign(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::size_type arg2 ;
-  std::vector<SVertex * >::value_type arg3 = (std::vector<SVertex * >::value_type) 0 ;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::size_type arg2 ;
+  std::vector< SVertex * >::value_type arg3 = (std::vector< SVertex * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -48062,21 +46792,21 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_assign(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:SVerticesContainer_assign",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_assign" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_assign" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer_assign" "', argument " "2"" of type '" "std::vector<SVertex * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer_assign" "', argument " "2"" of type '" "std::vector< SVertex * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<SVertex * >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector< SVertex * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SVerticesContainer_assign" "', argument " "3"" of type '" "std::vector<SVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SVerticesContainer_assign" "', argument " "3"" of type '" "std::vector< SVertex * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<SVertex * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< SVertex * >::value_type >(argp3);
   {
     try {
       (arg1)->assign(arg2,arg3);
@@ -48097,9 +46827,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::size_type arg2 ;
-  std::vector<SVertex * >::value_type arg3 = (std::vector<SVertex * >::value_type) 0 ;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::size_type arg2 ;
+  std::vector< SVertex * >::value_type arg3 = (std::vector< SVertex * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -48111,21 +46841,21 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_resize__SWIG_1(PyObject *SWIGUNUSE
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:SVerticesContainer_resize",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_resize" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_resize" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer_resize" "', argument " "2"" of type '" "std::vector<SVertex * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer_resize" "', argument " "2"" of type '" "std::vector< SVertex * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<SVertex * >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector< SVertex * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SVerticesContainer_resize" "', argument " "3"" of type '" "std::vector<SVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SVerticesContainer_resize" "', argument " "3"" of type '" "std::vector< SVertex * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<SVertex * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< SVertex * >::value_type >(argp3);
   {
     try {
       (arg1)->resize(arg2,arg3);
@@ -48150,13 +46880,13 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_resize(PyObject *self, PyObject *a
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator< SVertex * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -48170,7 +46900,7 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_resize(PyObject *self, PyObject *a
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator< SVertex * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -48179,7 +46909,7 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_resize(PyObject *self, PyObject *a
       }
       if (_v) {
         void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0);
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           return _wrap_SVerticesContainer_resize__SWIG_1(self, args);
@@ -48189,17 +46919,20 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_resize(PyObject *self, PyObject *a
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SVerticesContainer_resize'.\n  Possible C/C++ prototypes are:\n    resize(std::vector<SVertex * >::size_type)\n    resize(std::vector<SVertex * >::size_type,std::vector<SVertex * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SVerticesContainer_resize'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    resize(std::vector< SVertex * > *,std::vector< SVertex * >::size_type)\n"
+    "    resize(std::vector< SVertex * > *,std::vector< SVertex * >::size_type,std::vector< SVertex * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::iterator arg2 ;
-  std::vector<SVertex * >::value_type arg3 = (std::vector<SVertex * >::value_type) 0 ;
-  std::vector<SVertex * >::iterator result;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::iterator arg2 ;
+  std::vector< SVertex * >::value_type arg3 = (std::vector< SVertex * >::value_type) 0 ;
+  std::vector< SVertex * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -48211,27 +46944,27 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_insert__SWIG_0(PyObject *SWIGUNUSE
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:SVerticesContainer_insert",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_insert" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_insert" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_insert" "', argument " "2"" of type '" "std::vector<SVertex * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_insert" "', argument " "2"" of type '" "std::vector< SVertex * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< SVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< SVertex * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_insert" "', argument " "2"" of type '" "std::vector<SVertex * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_insert" "', argument " "2"" of type '" "std::vector< SVertex * >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SVerticesContainer_insert" "', argument " "3"" of type '" "std::vector<SVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SVerticesContainer_insert" "', argument " "3"" of type '" "std::vector< SVertex * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<SVertex * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< SVertex * >::value_type >(argp3);
   {
     try {
       result = (arg1)->insert(arg2,arg3);
@@ -48243,7 +46976,7 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_insert__SWIG_0(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<SVertex * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< SVertex * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -48253,10 +46986,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::iterator arg2 ;
-  std::vector<SVertex * >::size_type arg3 ;
-  std::vector<SVertex * >::value_type arg4 = (std::vector<SVertex * >::value_type) 0 ;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::iterator arg2 ;
+  std::vector< SVertex * >::size_type arg3 ;
+  std::vector< SVertex * >::value_type arg4 = (std::vector< SVertex * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -48271,32 +47004,32 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_insert__SWIG_1(PyObject *SWIGUNUSE
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:SVerticesContainer_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_insert" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_insert" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_insert" "', argument " "2"" of type '" "std::vector<SVertex * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_insert" "', argument " "2"" of type '" "std::vector< SVertex * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< SVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< SVertex * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_insert" "', argument " "2"" of type '" "std::vector<SVertex * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_insert" "', argument " "2"" of type '" "std::vector< SVertex * >::iterator""'");
     }
   }
   ecode3 = SWIG_AsVal_size_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SVerticesContainer_insert" "', argument " "3"" of type '" "std::vector<SVertex * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SVerticesContainer_insert" "', argument " "3"" of type '" "std::vector< SVertex * >::size_type""'");
   } 
-  arg3 = static_cast< std::vector<SVertex * >::size_type >(val3);
-  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
+  arg3 = static_cast< std::vector< SVertex * >::size_type >(val3);
+  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "SVerticesContainer_insert" "', argument " "4"" of type '" "std::vector<SVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "SVerticesContainer_insert" "', argument " "4"" of type '" "std::vector< SVertex * >::value_type""'"); 
   }
-  arg4 = reinterpret_cast< std::vector<SVertex * >::value_type >(argp4);
+  arg4 = reinterpret_cast< std::vector< SVertex * >::value_type >(argp4);
   {
     try {
       (arg1)->insert(arg2,arg3,arg4);
@@ -48321,21 +47054,21 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_insert(PyObject *self, PyObject *a
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator< SVertex * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< SVertex * >::iterator > *>(iter) != 0));
       if (_v) {
         void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0);
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           return _wrap_SVerticesContainer_insert__SWIG_0(self, args);
@@ -48345,12 +47078,12 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_insert(PyObject *self, PyObject *a
   }
   if (argc == 4) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator< SVertex * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< SVertex * >::iterator > *>(iter) != 0));
       if (_v) {
         {
           int res = SWIG_AsVal_size_t(argv[2], NULL);
@@ -48358,7 +47091,7 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_insert(PyObject *self, PyObject *a
         }
         if (_v) {
           void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0);
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0);
           _v = SWIG_CheckState(res);
           if (_v) {
             return _wrap_SVerticesContainer_insert__SWIG_1(self, args);
@@ -48369,15 +47102,18 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_insert(PyObject *self, PyObject *a
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SVerticesContainer_insert'.\n  Possible C/C++ prototypes are:\n    insert(std::vector<SVertex * >::iterator,std::vector<SVertex * >::value_type)\n    insert(std::vector<SVertex * >::iterator,std::vector<SVertex * >::size_type,std::vector<SVertex * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SVerticesContainer_insert'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    insert(std::vector< SVertex * > *,std::vector< SVertex * >::iterator,std::vector< SVertex * >::value_type)\n"
+    "    insert(std::vector< SVertex * > *,std::vector< SVertex * >::iterator,std::vector< SVertex * >::size_type,std::vector< SVertex * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_reserve(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::size_type arg2 ;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::size_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -48386,16 +47122,16 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_reserve(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:SVerticesContainer_reserve",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_reserve" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_reserve" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer_reserve" "', argument " "2"" of type '" "std::vector<SVertex * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer_reserve" "', argument " "2"" of type '" "std::vector< SVertex * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<SVertex * >::size_type >(val2);
+  arg2 = static_cast< std::vector< SVertex * >::size_type >(val2);
   {
     try {
       (arg1)->reserve(arg2);
@@ -48416,21 +47152,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_capacity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::size_type result;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_capacity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_capacity" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_capacity" "', argument " "1"" of type '" "std::vector< SVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   {
     try {
-      result = ((std::vector<SVertex * > const *)arg1)->capacity();
+      result = ((std::vector< SVertex * > const *)arg1)->capacity();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -48448,17 +47184,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_SVerticesContainer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_SVerticesContainer",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_SVerticesContainer" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_SVerticesContainer" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   {
     try {
       delete arg1;
@@ -48480,8 +47216,8 @@ fail:
 
 SWIGINTERN PyObject *SVerticesContainer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
@@ -48742,7 +47478,7 @@ SWIGINTERN PyObject *_wrap_ViewMap_ViewShapes(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -48777,7 +47513,7 @@ SWIGINTERN PyObject *_wrap_ViewMap_ViewEdges(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -48812,7 +47548,7 @@ SWIGINTERN PyObject *_wrap_ViewMap_ViewVertices(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -48847,7 +47583,7 @@ SWIGINTERN PyObject *_wrap_ViewMap_FEdges(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -48882,7 +47618,7 @@ SWIGINTERN PyObject *_wrap_ViewMap_SVertices(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -49028,10 +47764,45 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_ViewMap_shapeIdToIndexMap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewMap *arg1 = (ViewMap *) 0 ;
+  ViewMap::id_to_index_map *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewMap_shapeIdToIndexMap",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewMap, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewMap_shapeIdToIndexMap" "', argument " "1"" of type '" "ViewMap *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewMap * >(argp1);
+  {
+    try {
+      {
+        ViewMap::id_to_index_map &_result_ref = (arg1)->shapeIdToIndexMap();
+        result = (ViewMap::id_to_index_map *) &_result_ref;
+      }
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__mapT_int_int_std__lessT_int_t_std__allocatorT_std__pairT_int_const_int_t_t_t, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_ViewMap_getScene3dBBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewMap *arg1 = (ViewMap *) 0 ;
-  SwigValueWrapper<BBox<VecMat::Vec3<double > > > result;
+  SwigValueWrapper< BBox< VecMat::Vec3< double > > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -49053,7 +47824,7 @@ SWIGINTERN PyObject *_wrap_ViewMap_getScene3dBBox(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new BBox<Geometry::Vec3r >(static_cast< const BBox<Geometry::Vec3r >& >(result))), SWIGTYPE_p_BBoxTVecMat__Vec3Tdouble_t_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new BBox< Geometry::Vec3r >(static_cast< const BBox< Geometry::Vec3r >& >(result))), SWIGTYPE_p_BBoxT_VecMat__Vec3T_double_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -49263,7 +48034,7 @@ fail:
 SWIGINTERN PyObject *_wrap_ViewMap_setScene3dBBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewMap *arg1 = (ViewMap *) 0 ;
-  BBox<Geometry::Vec3r > *arg2 = 0 ;
+  BBox< Geometry::Vec3r > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -49277,17 +48048,17 @@ SWIGINTERN PyObject *_wrap_ViewMap_setScene3dBBox(PyObject *SWIGUNUSEDPARM(self)
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewMap_setScene3dBBox" "', argument " "1"" of type '" "ViewMap *""'"); 
   }
   arg1 = reinterpret_cast< ViewMap * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BBoxTVecMat__Vec3Tdouble_t_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BBoxT_VecMat__Vec3T_double_t_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewMap_setScene3dBBox" "', argument " "2"" of type '" "BBox<Geometry::Vec3r > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewMap_setScene3dBBox" "', argument " "2"" of type '" "BBox< Geometry::Vec3r > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewMap_setScene3dBBox" "', argument " "2"" of type '" "BBox<Geometry::Vec3r > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewMap_setScene3dBBox" "', argument " "2"" of type '" "BBox< Geometry::Vec3r > const &""'"); 
   }
-  arg2 = reinterpret_cast< BBox<Geometry::Vec3r > * >(argp2);
+  arg2 = reinterpret_cast< BBox< Geometry::Vec3r > * >(argp2);
   {
     try {
-      (arg1)->setScene3dBBox((BBox<Geometry::Vec3r > const &)*arg2);
+      (arg1)->setScene3dBBox((BBox< Geometry::Vec3r > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -49345,7 +48116,7 @@ SWIGINTERN PyObject *_wrap_ViewMap_CreateTVertex(PyObject *SWIGUNUSEDPARM(self),
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewMap_CreateTVertex" "', argument " "1"" of type '" "ViewMap *""'"); 
   }
   arg1 = reinterpret_cast< ViewMap * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewMap_CreateTVertex" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -49353,7 +48124,7 @@ SWIGINTERN PyObject *_wrap_ViewMap_CreateTVertex(PyObject *SWIGUNUSEDPARM(self),
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewMap_CreateTVertex" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
   arg2 = reinterpret_cast< Geometry::Vec3r * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewMap_CreateTVertex" "', argument " "3"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -49366,7 +48137,7 @@ SWIGINTERN PyObject *_wrap_ViewMap_CreateTVertex(PyObject *SWIGUNUSEDPARM(self),
     SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewMap_CreateTVertex" "', argument " "4"" of type '" "FEdge *""'"); 
   }
   arg4 = reinterpret_cast< FEdge * >(argp4);
-  res5 = SWIG_ConvertPtr(obj4, &argp5, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  res5 = SWIG_ConvertPtr(obj4, &argp5, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res5)) {
     SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "ViewMap_CreateTVertex" "', argument " "5"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -49374,7 +48145,7 @@ SWIGINTERN PyObject *_wrap_ViewMap_CreateTVertex(PyObject *SWIGUNUSEDPARM(self),
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewMap_CreateTVertex" "', argument " "5"" of type '" "Geometry::Vec3r const &""'"); 
   }
   arg5 = reinterpret_cast< Geometry::Vec3r * >(argp5);
-  res6 = SWIG_ConvertPtr(obj5, &argp6, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  res6 = SWIG_ConvertPtr(obj5, &argp6, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res6)) {
     SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "ViewMap_CreateTVertex" "', argument " "6"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -49417,7 +48188,7 @@ SWIGINTERN PyObject *_wrap_ViewMap_InsertViewVertex(PyObject *SWIGUNUSEDPARM(sel
   PyObject *resultobj = 0;
   ViewMap *arg1 = (ViewMap *) 0 ;
   SVertex *arg2 = (SVertex *) 0 ;
-  std::vector<ViewEdge * > *arg3 = 0 ;
+  std::vector< ViewEdge * > *arg3 = 0 ;
   ViewVertex *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -49440,14 +48211,14 @@ SWIGINTERN PyObject *_wrap_ViewMap_InsertViewVertex(PyObject *SWIGUNUSEDPARM(sel
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewMap_InsertViewVertex" "', argument " "2"" of type '" "SVertex *""'"); 
   }
   arg2 = reinterpret_cast< SVertex * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t,  0 );
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t,  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewMap_InsertViewVertex" "', argument " "3"" of type '" "std::vector<ViewEdge * > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewMap_InsertViewVertex" "', argument " "3"" of type '" "std::vector< ViewEdge * > &""'"); 
   }
   if (!argp3) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewMap_InsertViewVertex" "', argument " "3"" of type '" "std::vector<ViewEdge * > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewMap_InsertViewVertex" "', argument " "3"" of type '" "std::vector< ViewEdge * > &""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<ViewEdge * > * >(argp3);
+  arg3 = reinterpret_cast< std::vector< ViewEdge * > * >(argp3);
   {
     try {
       result = (ViewVertex *)(arg1)->InsertViewVertex(arg2,*arg3);
@@ -49468,7 +48239,7 @@ fail:
 
 SWIGINTERN PyObject *ViewMap_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ViewMap, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -49712,7 +48483,7 @@ fail:
 SWIGINTERN PyObject *_wrap_ViewVertex_edges_begin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewVertex *arg1 = (ViewVertex *) 0 ;
-  SwigValueWrapper<ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_nonconst_traits > > result;
+  SwigValueWrapper< ViewVertexInternal::edge_iterator_base< ViewVertexInternal::edge_nonconst_traits > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -49734,7 +48505,7 @@ SWIGINTERN PyObject *_wrap_ViewVertex_edges_begin__SWIG_0(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new ViewVertex::edge_iterator(static_cast< const ViewVertex::edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new ViewVertex::edge_iterator(static_cast< const ViewVertex::edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_nonconst_traits_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -49744,7 +48515,7 @@ fail:
 SWIGINTERN PyObject *_wrap_ViewVertex_edges_begin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewVertex *arg1 = (ViewVertex *) 0 ;
-  SwigValueWrapper<ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_const_traits > > result;
+  SwigValueWrapper< ViewVertexInternal::edge_iterator_base< ViewVertexInternal::edge_const_traits > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -49766,7 +48537,7 @@ SWIGINTERN PyObject *_wrap_ViewVertex_edges_begin__SWIG_1(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new ViewVertex::const_edge_iterator(static_cast< const ViewVertex::const_edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new ViewVertex::const_edge_iterator(static_cast< const ViewVertex::const_edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_const_traits_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -49779,7 +48550,7 @@ SWIGINTERN PyObject *_wrap_ViewVertex_edges_begin(PyObject *self, PyObject *args
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -49803,7 +48574,10 @@ SWIGINTERN PyObject *_wrap_ViewVertex_edges_begin(PyObject *self, PyObject *args
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVertex_edges_begin'.\n  Possible C/C++ prototypes are:\n    edges_begin()\n    edges_begin()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVertex_edges_begin'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    edges_begin(ViewVertex *)\n"
+    "    edges_begin(ViewVertex const *)\n");
   return NULL;
 }
 
@@ -49811,7 +48585,7 @@ fail:
 SWIGINTERN PyObject *_wrap_ViewVertex_edges_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewVertex *arg1 = (ViewVertex *) 0 ;
-  SwigValueWrapper<ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_nonconst_traits > > result;
+  SwigValueWrapper< ViewVertexInternal::edge_iterator_base< ViewVertexInternal::edge_nonconst_traits > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -49833,7 +48607,7 @@ SWIGINTERN PyObject *_wrap_ViewVertex_edges_end__SWIG_0(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new ViewVertex::edge_iterator(static_cast< const ViewVertex::edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new ViewVertex::edge_iterator(static_cast< const ViewVertex::edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_nonconst_traits_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -49843,7 +48617,7 @@ fail:
 SWIGINTERN PyObject *_wrap_ViewVertex_edges_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewVertex *arg1 = (ViewVertex *) 0 ;
-  SwigValueWrapper<ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_const_traits > > result;
+  SwigValueWrapper< ViewVertexInternal::edge_iterator_base< ViewVertexInternal::edge_const_traits > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -49865,7 +48639,7 @@ SWIGINTERN PyObject *_wrap_ViewVertex_edges_end__SWIG_1(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new ViewVertex::const_edge_iterator(static_cast< const ViewVertex::const_edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new ViewVertex::const_edge_iterator(static_cast< const ViewVertex::const_edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_const_traits_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -49878,7 +48652,7 @@ SWIGINTERN PyObject *_wrap_ViewVertex_edges_end(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -49902,7 +48676,10 @@ SWIGINTERN PyObject *_wrap_ViewVertex_edges_end(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVertex_edges_end'.\n  Possible C/C++ prototypes are:\n    edges_end()\n    edges_end()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVertex_edges_end'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    edges_end(ViewVertex *)\n"
+    "    edges_end(ViewVertex const *)\n");
   return NULL;
 }
 
@@ -49911,7 +48688,7 @@ SWIGINTERN PyObject *_wrap_ViewVertex_edges_iterator__SWIG_0(PyObject *SWIGUNUSE
   PyObject *resultobj = 0;
   ViewVertex *arg1 = (ViewVertex *) 0 ;
   ViewEdge *arg2 = (ViewEdge *) 0 ;
-  SwigValueWrapper<ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_nonconst_traits > > result;
+  SwigValueWrapper< ViewVertexInternal::edge_iterator_base< ViewVertexInternal::edge_nonconst_traits > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -49941,7 +48718,7 @@ SWIGINTERN PyObject *_wrap_ViewVertex_edges_iterator__SWIG_0(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new ViewVertex::edge_iterator(static_cast< const ViewVertex::edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new ViewVertex::edge_iterator(static_cast< const ViewVertex::edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_nonconst_traits_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -49952,7 +48729,7 @@ SWIGINTERN PyObject *_wrap_ViewVertex_edges_iterator__SWIG_1(PyObject *SWIGUNUSE
   PyObject *resultobj = 0;
   ViewVertex *arg1 = (ViewVertex *) 0 ;
   ViewEdge *arg2 = (ViewEdge *) 0 ;
-  SwigValueWrapper<ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_const_traits > > result;
+  SwigValueWrapper< ViewVertexInternal::edge_iterator_base< ViewVertexInternal::edge_const_traits > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -49982,7 +48759,7 @@ SWIGINTERN PyObject *_wrap_ViewVertex_edges_iterator__SWIG_1(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new ViewVertex::const_edge_iterator(static_cast< const ViewVertex::const_edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new ViewVertex::const_edge_iterator(static_cast< const ViewVertex::const_edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_const_traits_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -49995,7 +48772,7 @@ SWIGINTERN PyObject *_wrap_ViewVertex_edges_iterator(PyObject *self, PyObject *a
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -50029,7 +48806,10 @@ SWIGINTERN PyObject *_wrap_ViewVertex_edges_iterator(PyObject *self, PyObject *a
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVertex_edges_iterator'.\n  Possible C/C++ prototypes are:\n    edges_iterator(ViewEdge *)\n    edges_iterator(ViewEdge *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVertex_edges_iterator'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    edges_iterator(ViewVertex *,ViewEdge *)\n"
+    "    edges_iterator(ViewVertex const *,ViewEdge *)\n");
   return NULL;
 }
 
@@ -50141,7 +48921,7 @@ fail:
 
 SWIGINTERN PyObject *ViewVertex_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ViewVertex, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -50299,7 +49079,7 @@ SWIGINTERN PyObject *_wrap_TVertex_getPoint3D(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -50427,7 +49207,7 @@ SWIGINTERN PyObject *_wrap_TVertex_getPoint2D(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -50600,7 +49380,7 @@ SWIGINTERN PyObject *_wrap_new_TVertex(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -50623,7 +49403,10 @@ SWIGINTERN PyObject *_wrap_new_TVertex(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_TVertex'.\n  Possible C/C++ prototypes are:\n    TVertex()\n    TVertex(SVertex *,SVertex *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_TVertex'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    TVertex()\n"
+    "    TVertex(SVertex *,SVertex *)\n");
   return NULL;
 }
 
@@ -50720,7 +49503,7 @@ SWIGINTERN PyObject *_wrap_TVertex_frontEdgeA(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairTViewEdge_p_bool_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairT_ViewEdge_p_bool_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -50755,7 +49538,7 @@ SWIGINTERN PyObject *_wrap_TVertex_frontEdgeB(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairTViewEdge_p_bool_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairT_ViewEdge_p_bool_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -50790,7 +49573,7 @@ SWIGINTERN PyObject *_wrap_TVertex_backEdgeA(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairTViewEdge_p_bool_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairT_ViewEdge_p_bool_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -50825,7 +49608,7 @@ SWIGINTERN PyObject *_wrap_TVertex_backEdgeB(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairTViewEdge_p_bool_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairT_ViewEdge_p_bool_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -51007,7 +49790,7 @@ SWIGINTERN PyObject *_wrap_TVertex_SetFrontEdgeA(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -51047,7 +49830,10 @@ SWIGINTERN PyObject *_wrap_TVertex_SetFrontEdgeA(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'TVertex_SetFrontEdgeA'.\n  Possible C/C++ prototypes are:\n    SetFrontEdgeA(ViewEdge *,bool)\n    SetFrontEdgeA(ViewEdge *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'TVertex_SetFrontEdgeA'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    SetFrontEdgeA(TVertex *,ViewEdge *,bool)\n"
+    "    SetFrontEdgeA(TVertex *,ViewEdge *)\n");
   return NULL;
 }
 
@@ -51147,7 +49933,7 @@ SWIGINTERN PyObject *_wrap_TVertex_SetFrontEdgeB(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -51187,7 +49973,10 @@ SWIGINTERN PyObject *_wrap_TVertex_SetFrontEdgeB(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'TVertex_SetFrontEdgeB'.\n  Possible C/C++ prototypes are:\n    SetFrontEdgeB(ViewEdge *,bool)\n    SetFrontEdgeB(ViewEdge *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'TVertex_SetFrontEdgeB'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    SetFrontEdgeB(TVertex *,ViewEdge *,bool)\n"
+    "    SetFrontEdgeB(TVertex *,ViewEdge *)\n");
   return NULL;
 }
 
@@ -51287,7 +50076,7 @@ SWIGINTERN PyObject *_wrap_TVertex_SetBackEdgeA(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -51327,7 +50116,10 @@ SWIGINTERN PyObject *_wrap_TVertex_SetBackEdgeA(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'TVertex_SetBackEdgeA'.\n  Possible C/C++ prototypes are:\n    SetBackEdgeA(ViewEdge *,bool)\n    SetBackEdgeA(ViewEdge *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'TVertex_SetBackEdgeA'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    SetBackEdgeA(TVertex *,ViewEdge *,bool)\n"
+    "    SetBackEdgeA(TVertex *,ViewEdge *)\n");
   return NULL;
 }
 
@@ -51427,7 +50219,7 @@ SWIGINTERN PyObject *_wrap_TVertex_SetBackEdgeB(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -51467,7 +50259,10 @@ SWIGINTERN PyObject *_wrap_TVertex_SetBackEdgeB(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'TVertex_SetBackEdgeB'.\n  Possible C/C++ prototypes are:\n    SetBackEdgeB(ViewEdge *,bool)\n    SetBackEdgeB(ViewEdge *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'TVertex_SetBackEdgeB'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    SetBackEdgeB(TVertex *,ViewEdge *,bool)\n"
+    "    SetBackEdgeB(TVertex *,ViewEdge *)\n");
   return NULL;
 }
 
@@ -51649,7 +50444,7 @@ fail:
 SWIGINTERN PyObject *_wrap_TVertex_edges_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   TVertex *arg1 = (TVertex *) 0 ;
-  SwigValueWrapper<ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_nonconst_traits > > result;
+  SwigValueWrapper< ViewVertexInternal::edge_iterator_base< ViewVertexInternal::edge_nonconst_traits > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -51671,7 +50466,7 @@ SWIGINTERN PyObject *_wrap_TVertex_edges_end__SWIG_0(PyObject *SWIGUNUSEDPARM(se
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new ViewVertex::edge_iterator(static_cast< const ViewVertex::edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new ViewVertex::edge_iterator(static_cast< const ViewVertex::edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_nonconst_traits_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -51681,7 +50476,7 @@ fail:
 SWIGINTERN PyObject *_wrap_TVertex_edges_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   TVertex *arg1 = (TVertex *) 0 ;
-  SwigValueWrapper<ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_const_traits > > result;
+  SwigValueWrapper< ViewVertexInternal::edge_iterator_base< ViewVertexInternal::edge_const_traits > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -51703,7 +50498,7 @@ SWIGINTERN PyObject *_wrap_TVertex_edges_end__SWIG_1(PyObject *SWIGUNUSEDPARM(se
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new ViewVertex::const_edge_iterator(static_cast< const ViewVertex::const_edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new ViewVertex::const_edge_iterator(static_cast< const ViewVertex::const_edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_const_traits_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -51716,7 +50511,7 @@ SWIGINTERN PyObject *_wrap_TVertex_edges_end(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -51740,7 +50535,10 @@ SWIGINTERN PyObject *_wrap_TVertex_edges_end(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'TVertex_edges_end'.\n  Possible C/C++ prototypes are:\n    edges_end()\n    edges_end()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'TVertex_edges_end'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    edges_end(TVertex *)\n"
+    "    edges_end(TVertex const *)\n");
   return NULL;
 }
 
@@ -51884,7 +50682,7 @@ fail:
 
 SWIGINTERN PyObject *TVertex_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_TVertex, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -52042,7 +50840,7 @@ SWIGINTERN PyObject *_wrap_NonTVertex_getPoint3D(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -52170,7 +50968,7 @@ SWIGINTERN PyObject *_wrap_NonTVertex_getPoint2D(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -52366,7 +51164,7 @@ SWIGINTERN PyObject *_wrap_new_NonTVertex(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -52384,7 +51182,10 @@ SWIGINTERN PyObject *_wrap_new_NonTVertex(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_NonTVertex'.\n  Possible C/C++ prototypes are:\n    NonTVertex()\n    NonTVertex(SVertex *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_NonTVertex'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    NonTVertex()\n"
+    "    NonTVertex(SVertex *)\n");
   return NULL;
 }
 
@@ -52481,7 +51282,7 @@ SWIGINTERN PyObject *_wrap_NonTVertex_viewedges(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTstd__pairTViewEdge_p_bool_t_std__allocatorTstd__pairTViewEdge_p_bool_t_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_std__pairT_ViewEdge_p_bool_t_std__allocatorT_std__pairT_ViewEdge_p_bool_t_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -52531,7 +51332,7 @@ fail:
 SWIGINTERN PyObject *_wrap_NonTVertex_SetViewEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   NonTVertex *arg1 = (NonTVertex *) 0 ;
-  std::vector<ViewVertex::directedViewEdge > *arg2 = 0 ;
+  std::vector< ViewVertex::directedViewEdge > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -52545,17 +51346,17 @@ SWIGINTERN PyObject *_wrap_NonTVertex_SetViewEdges(PyObject *SWIGUNUSEDPARM(self
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NonTVertex_SetViewEdges" "', argument " "1"" of type '" "NonTVertex *""'"); 
   }
   arg1 = reinterpret_cast< NonTVertex * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTstd__pairTViewEdge_p_bool_t_std__allocatorTstd__pairTViewEdge_p_bool_t_t_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_std__pairT_ViewEdge_p_bool_t_std__allocatorT_std__pairT_ViewEdge_p_bool_t_t_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "NonTVertex_SetViewEdges" "', argument " "2"" of type '" "std::vector<ViewVertex::directedViewEdge > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "NonTVertex_SetViewEdges" "', argument " "2"" of type '" "std::vector< ViewVertex::directedViewEdge > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "NonTVertex_SetViewEdges" "', argument " "2"" of type '" "std::vector<ViewVertex::directedViewEdge > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "NonTVertex_SetViewEdges" "', argument " "2"" of type '" "std::vector< ViewVertex::directedViewEdge > const &""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<ViewVertex::directedViewEdge > * >(argp2);
+  arg2 = reinterpret_cast< std::vector< ViewVertex::directedViewEdge > * >(argp2);
   {
     try {
-      (arg1)->SetViewEdges((std::vector<ViewVertex::directedViewEdge > const &)*arg2);
+      (arg1)->SetViewEdges((std::vector< ViewVertex::directedViewEdge > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -52746,7 +51547,7 @@ SWIGINTERN PyObject *_wrap_NonTVertex_AddViewEdge(PyObject *self, PyObject *args
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -52786,7 +51587,10 @@ SWIGINTERN PyObject *_wrap_NonTVertex_AddViewEdge(PyObject *self, PyObject *args
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'NonTVertex_AddViewEdge'.\n  Possible C/C++ prototypes are:\n    AddViewEdge(ViewEdge *,bool)\n    AddViewEdge(ViewEdge *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'NonTVertex_AddViewEdge'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    AddViewEdge(NonTVertex *,ViewEdge *,bool)\n"
+    "    AddViewEdge(NonTVertex *,ViewEdge *)\n");
   return NULL;
 }
 
@@ -52843,7 +51647,7 @@ fail:
 SWIGINTERN PyObject *_wrap_NonTVertex_edges_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   NonTVertex *arg1 = (NonTVertex *) 0 ;
-  SwigValueWrapper<ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_nonconst_traits > > result;
+  SwigValueWrapper< ViewVertexInternal::edge_iterator_base< ViewVertexInternal::edge_nonconst_traits > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -52865,7 +51669,7 @@ SWIGINTERN PyObject *_wrap_NonTVertex_edges_end__SWIG_0(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new ViewVertex::edge_iterator(static_cast< const ViewVertex::edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new ViewVertex::edge_iterator(static_cast< const ViewVertex::edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_nonconst_traits_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -52875,7 +51679,7 @@ fail:
 SWIGINTERN PyObject *_wrap_NonTVertex_edges_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   NonTVertex *arg1 = (NonTVertex *) 0 ;
-  SwigValueWrapper<ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_const_traits > > result;
+  SwigValueWrapper< ViewVertexInternal::edge_iterator_base< ViewVertexInternal::edge_const_traits > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -52897,7 +51701,7 @@ SWIGINTERN PyObject *_wrap_NonTVertex_edges_end__SWIG_1(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new ViewVertex::const_edge_iterator(static_cast< const ViewVertex::const_edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new ViewVertex::const_edge_iterator(static_cast< const ViewVertex::const_edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_const_traits_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -52910,7 +51714,7 @@ SWIGINTERN PyObject *_wrap_NonTVertex_edges_end(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -52934,7 +51738,10 @@ SWIGINTERN PyObject *_wrap_NonTVertex_edges_end(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'NonTVertex_edges_end'.\n  Possible C/C++ prototypes are:\n    edges_end()\n    edges_end()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'NonTVertex_edges_end'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    edges_end(NonTVertex *)\n"
+    "    edges_end(NonTVertex const *)\n");
   return NULL;
 }
 
@@ -53046,7 +51853,7 @@ fail:
 
 SWIGINTERN PyObject *NonTVertex_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_NonTVertex, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -53386,7 +52193,7 @@ SWIGINTERN PyObject *_wrap_new_ViewEdge(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 5); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -53457,7 +52264,12 @@ SWIGINTERN PyObject *_wrap_new_ViewEdge(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewEdge'.\n  Possible C/C++ prototypes are:\n    ViewEdge()\n    ViewEdge(ViewVertex *,ViewVertex *)\n    ViewEdge(ViewVertex *,ViewVertex *,FEdge *)\n    ViewEdge(ViewVertex *,ViewVertex *,FEdge *,FEdge *,ViewShape *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewEdge'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    ViewEdge()\n"
+    "    ViewEdge(ViewVertex *,ViewVertex *)\n"
+    "    ViewEdge(ViewVertex *,ViewVertex *,FEdge *)\n"
+    "    ViewEdge(ViewVertex *,ViewVertex *,FEdge *,FEdge *,ViewShape *)\n");
   return NULL;
 }
 
@@ -53788,7 +52600,7 @@ SWIGINTERN PyObject *_wrap_ViewEdge_aShape(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -53812,7 +52624,10 @@ SWIGINTERN PyObject *_wrap_ViewEdge_aShape(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdge_aShape'.\n  Possible C/C++ prototypes are:\n    aShape()\n    aShape()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdge_aShape'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    aShape(ViewEdge *)\n"
+    "    aShape(ViewEdge const *)\n");
   return NULL;
 }
 
@@ -53852,7 +52667,7 @@ fail:
 SWIGINTERN PyObject *_wrap_ViewEdge_occluders(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewEdge *arg1 = (ViewEdge *) 0 ;
-  std::vector<ViewShape * > *result = 0 ;
+  std::vector< ViewShape * > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -53866,8 +52681,8 @@ SWIGINTERN PyObject *_wrap_ViewEdge_occluders(PyObject *SWIGUNUSEDPARM(self), Py
   {
     try {
       {
-        std::vector<ViewShape * > &_result_ref = (arg1)->occluders();
-        result = (std::vector<ViewShape * > *) &_result_ref;
+        std::vector< ViewShape * > &_result_ref = (arg1)->occluders();
+        result = (std::vector< ViewShape * > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -53877,7 +52692,7 @@ SWIGINTERN PyObject *_wrap_ViewEdge_occluders(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -54452,7 +53267,7 @@ SWIGINTERN PyObject *_wrap_ViewEdge_intersect_2d_area(PyObject *SWIGUNUSEDPARM(s
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_intersect_2d_area" "', argument " "1"" of type '" "ViewEdge const *""'"); 
   }
   arg1 = reinterpret_cast< ViewEdge * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdge_intersect_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
   }
@@ -54460,7 +53275,7 @@ SWIGINTERN PyObject *_wrap_ViewEdge_intersect_2d_area(PyObject *SWIGUNUSEDPARM(s
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdge_intersect_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
   }
   arg2 = reinterpret_cast< Geometry::Vec2r * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewEdge_intersect_2d_area" "', argument " "3"" of type '" "Geometry::Vec2r const &""'"); 
   }
@@ -54508,7 +53323,7 @@ SWIGINTERN PyObject *_wrap_ViewEdge_include_in_2d_area(PyObject *SWIGUNUSEDPARM(
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_include_in_2d_area" "', argument " "1"" of type '" "ViewEdge const *""'"); 
   }
   arg1 = reinterpret_cast< ViewEdge * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdge_include_in_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
   }
@@ -54516,7 +53331,7 @@ SWIGINTERN PyObject *_wrap_ViewEdge_include_in_2d_area(PyObject *SWIGUNUSEDPARM(
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdge_include_in_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
   }
   arg2 = reinterpret_cast< Geometry::Vec2r * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewEdge_include_in_2d_area" "', argument " "3"" of type '" "Geometry::Vec2r const &""'"); 
   }
@@ -55072,7 +53887,7 @@ SWIGINTERN PyObject *_wrap_ViewEdge_pointsBegin(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -55102,7 +53917,10 @@ SWIGINTERN PyObject *_wrap_ViewEdge_pointsBegin(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdge_pointsBegin'.\n  Possible C/C++ prototypes are:\n    pointsBegin(float)\n    pointsBegin()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdge_pointsBegin'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    pointsBegin(ViewEdge *,float)\n"
+    "    pointsBegin(ViewEdge *)\n");
   return NULL;
 }
 
@@ -55186,7 +54004,7 @@ SWIGINTERN PyObject *_wrap_ViewEdge_pointsEnd(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -55216,14 +54034,17 @@ SWIGINTERN PyObject *_wrap_ViewEdge_pointsEnd(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdge_pointsEnd'.\n  Possible C/C++ prototypes are:\n    pointsEnd(float)\n    pointsEnd()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdge_pointsEnd'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    pointsEnd(ViewEdge *,float)\n"
+    "    pointsEnd(ViewEdge *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *ViewEdge_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ViewEdge, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -55375,7 +54196,7 @@ SWIGINTERN PyObject *_wrap_new_ViewShape(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -55402,7 +54223,11 @@ SWIGINTERN PyObject *_wrap_new_ViewShape(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewShape'.\n  Possible C/C++ prototypes are:\n    ViewShape()\n    ViewShape(SShape *)\n    ViewShape(ViewShape &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewShape'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    ViewShape()\n"
+    "    ViewShape(SShape *)\n"
+    "    ViewShape(ViewShape &)\n");
   return NULL;
 }
 
@@ -55475,9 +54300,9 @@ SWIGINTERN PyObject *_wrap_ViewShape_SplitEdge(PyObject *SWIGUNUSEDPARM(self), P
   PyObject *resultobj = 0;
   ViewShape *arg1 = (ViewShape *) 0 ;
   FEdge *arg2 = (FEdge *) 0 ;
-  std::vector<TVertex * > *arg3 = 0 ;
-  std::vector<FEdge * > *arg4 = 0 ;
-  std::vector<ViewEdge * > *arg5 = 0 ;
+  std::vector< TVertex * > *arg3 = 0 ;
+  std::vector< FEdge * > *arg4 = 0 ;
+  std::vector< ViewEdge * > *arg5 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -55505,33 +54330,33 @@ SWIGINTERN PyObject *_wrap_ViewShape_SplitEdge(PyObject *SWIGUNUSEDPARM(self), P
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShape_SplitEdge" "', argument " "2"" of type '" "FEdge *""'"); 
   }
   arg2 = reinterpret_cast< FEdge * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_std__vectorTTVertex_p_std__allocatorTTVertex_p_t_t,  0  | 0);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_std__vectorT_TVertex_p_std__allocatorT_TVertex_p_t_t,  0  | 0);
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewShape_SplitEdge" "', argument " "3"" of type '" "std::vector<TVertex * > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewShape_SplitEdge" "', argument " "3"" of type '" "std::vector< TVertex * > const &""'"); 
   }
   if (!argp3) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShape_SplitEdge" "', argument " "3"" of type '" "std::vector<TVertex * > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShape_SplitEdge" "', argument " "3"" of type '" "std::vector< TVertex * > const &""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<TVertex * > * >(argp3);
-  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t,  0 );
+  arg3 = reinterpret_cast< std::vector< TVertex * > * >(argp3);
+  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t,  0 );
   if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewShape_SplitEdge" "', argument " "4"" of type '" "std::vector<FEdge * > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewShape_SplitEdge" "', argument " "4"" of type '" "std::vector< FEdge * > &""'"); 
   }
   if (!argp4) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShape_SplitEdge" "', argument " "4"" of type '" "std::vector<FEdge * > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShape_SplitEdge" "', argument " "4"" of type '" "std::vector< FEdge * > &""'"); 
   }
-  arg4 = reinterpret_cast< std::vector<FEdge * > * >(argp4);
-  res5 = SWIG_ConvertPtr(obj4, &argp5, SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t,  0 );
+  arg4 = reinterpret_cast< std::vector< FEdge * > * >(argp4);
+  res5 = SWIG_ConvertPtr(obj4, &argp5, SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t,  0 );
   if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "ViewShape_SplitEdge" "', argument " "5"" of type '" "std::vector<ViewEdge * > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "ViewShape_SplitEdge" "', argument " "5"" of type '" "std::vector< ViewEdge * > &""'"); 
   }
   if (!argp5) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShape_SplitEdge" "', argument " "5"" of type '" "std::vector<ViewEdge * > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShape_SplitEdge" "', argument " "5"" of type '" "std::vector< ViewEdge * > &""'"); 
   }
-  arg5 = reinterpret_cast< std::vector<ViewEdge * > * >(argp5);
+  arg5 = reinterpret_cast< std::vector< ViewEdge * > * >(argp5);
   {
     try {
-      (arg1)->SplitEdge(arg2,(std::vector<TVertex * > const &)*arg3,*arg4,*arg5);
+      (arg1)->SplitEdge(arg2,(std::vector< TVertex * > const &)*arg3,*arg4,*arg5);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -55617,7 +54442,7 @@ SWIGINTERN PyObject *_wrap_ViewShape_sshape(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -55641,7 +54466,10 @@ SWIGINTERN PyObject *_wrap_ViewShape_sshape(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewShape_sshape'.\n  Possible C/C++ prototypes are:\n    sshape()\n    sshape()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewShape_sshape'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    sshape(ViewShape *)\n"
+    "    sshape(ViewShape const *)\n");
   return NULL;
 }
 
@@ -55649,7 +54477,7 @@ fail:
 SWIGINTERN PyObject *_wrap_ViewShape_vertices(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewShape *arg1 = (ViewShape *) 0 ;
-  std::vector<ViewVertex * > *result = 0 ;
+  std::vector< ViewVertex * > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -55663,8 +54491,8 @@ SWIGINTERN PyObject *_wrap_ViewShape_vertices(PyObject *SWIGUNUSEDPARM(self), Py
   {
     try {
       {
-        std::vector<ViewVertex * > &_result_ref = (arg1)->vertices();
-        result = (std::vector<ViewVertex * > *) &_result_ref;
+        std::vector< ViewVertex * > &_result_ref = (arg1)->vertices();
+        result = (std::vector< ViewVertex * > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -55674,7 +54502,7 @@ SWIGINTERN PyObject *_wrap_ViewShape_vertices(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -55684,7 +54512,7 @@ fail:
 SWIGINTERN PyObject *_wrap_ViewShape_edges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewShape *arg1 = (ViewShape *) 0 ;
-  std::vector<ViewEdge * > *result = 0 ;
+  std::vector< ViewEdge * > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -55698,8 +54526,8 @@ SWIGINTERN PyObject *_wrap_ViewShape_edges(PyObject *SWIGUNUSEDPARM(self), PyObj
   {
     try {
       {
-        std::vector<ViewEdge * > &_result_ref = (arg1)->edges();
-        result = (std::vector<ViewEdge * > *) &_result_ref;
+        std::vector< ViewEdge * > &_result_ref = (arg1)->edges();
+        result = (std::vector< ViewEdge * > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -55709,7 +54537,7 @@ SWIGINTERN PyObject *_wrap_ViewShape_edges(PyObject *SWIGUNUSEDPARM(self), PyObj
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -55791,7 +54619,7 @@ fail:
 SWIGINTERN PyObject *_wrap_ViewShape_SetVertices(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewShape *arg1 = (ViewShape *) 0 ;
-  std::vector<ViewVertex * > *arg2 = 0 ;
+  std::vector< ViewVertex * > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
@@ -55805,19 +54633,19 @@ SWIGINTERN PyObject *_wrap_ViewShape_SetVertices(PyObject *SWIGUNUSEDPARM(self),
   }
   arg1 = reinterpret_cast< ViewShape * >(argp1);
   {
-    std::vector<ViewVertex*,std::allocator<ViewVertex * > > *ptr = (std::vector<ViewVertex*,std::allocator<ViewVertex * > > *)0;
+    std::vector<ViewVertex*,std::allocator< ViewVertex * > > *ptr = (std::vector<ViewVertex*,std::allocator< ViewVertex * > > *)0;
     res2 = swig::asptr(obj1, &ptr);
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShape_SetVertices" "', argument " "2"" of type '" "std::vector<ViewVertex * > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShape_SetVertices" "', argument " "2"" of type '" "std::vector< ViewVertex * > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShape_SetVertices" "', argument " "2"" of type '" "std::vector<ViewVertex * > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShape_SetVertices" "', argument " "2"" of type '" "std::vector< ViewVertex * > const &""'"); 
     }
     arg2 = ptr;
   }
   {
     try {
-      (arg1)->SetVertices((std::vector<ViewVertex * > const &)*arg2);
+      (arg1)->SetVertices((std::vector< ViewVertex * > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -55838,7 +54666,7 @@ fail:
 SWIGINTERN PyObject *_wrap_ViewShape_SetEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewShape *arg1 = (ViewShape *) 0 ;
-  std::vector<ViewEdge * > *arg2 = 0 ;
+  std::vector< ViewEdge * > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
@@ -55852,19 +54680,19 @@ SWIGINTERN PyObject *_wrap_ViewShape_SetEdges(PyObject *SWIGUNUSEDPARM(self), Py
   }
   arg1 = reinterpret_cast< ViewShape * >(argp1);
   {
-    std::vector<ViewEdge*,std::allocator<ViewEdge * > > *ptr = (std::vector<ViewEdge*,std::allocator<ViewEdge * > > *)0;
+    std::vector<ViewEdge*,std::allocator< ViewEdge * > > *ptr = (std::vector<ViewEdge*,std::allocator< ViewEdge * > > *)0;
     res2 = swig::asptr(obj1, &ptr);
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShape_SetEdges" "', argument " "2"" of type '" "std::vector<ViewEdge * > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShape_SetEdges" "', argument " "2"" of type '" "std::vector< ViewEdge * > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShape_SetEdges" "', argument " "2"" of type '" "std::vector<ViewEdge * > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShape_SetEdges" "', argument " "2"" of type '" "std::vector< ViewEdge * > const &""'"); 
     }
     arg2 = ptr;
   }
   {
     try {
-      (arg1)->SetEdges((std::vector<ViewEdge * > const &)*arg2);
+      (arg1)->SetEdges((std::vector< ViewEdge * > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -56044,7 +54872,7 @@ fail:
 
 SWIGINTERN PyObject *ViewShape_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ViewShape, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -56325,7 +55153,7 @@ SWIGINTERN PyObject *_wrap_new_ViewVertexOrientedViewEdgeIterator(PyObject *self
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -56384,7 +55212,13 @@ SWIGINTERN PyObject *_wrap_new_ViewVertexOrientedViewEdgeIterator(PyObject *self
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewVertexOrientedViewEdgeIterator'.\n  Possible C/C++ prototypes are:\n    ViewVertexInternal::orientedViewEdgeIterator()\n    ViewVertexInternal::orientedViewEdgeIterator(Nature::VertexNature)\n    ViewVertexInternal::orientedViewEdgeIterator(ViewVertexInternal::orientedViewEdgeIterator const &)\n    ViewVertexInternal::orientedViewEdgeIterator(ViewVertexInternal::orientedViewEdgeIterator::edge_pointers_container::iterator,ViewVertexInternal::orientedViewEdgeIterator::edge_pointers_container::iterator,ViewVertexInternal::orientedViewEdgeIterator::edge_pointers_container::iterator)\n    ViewVertexInternal::orientedViewEdgeIterator(ViewVertexInternal::orientedViewEdgeIterator::edges_container::iterator,ViewVertexInternal::orientedViewEdgeIterator::edges_container::iterator,ViewVertexInternal::orientedViewEdgeIterator::edges_container::iterator)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewVertexOrientedViewEdgeIterator'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    ViewVertexInternal::orientedViewEdgeIterator()\n"
+    "    ViewVertexInternal::orientedViewEdgeIterator(Nature::VertexNature)\n"
+    "    ViewVertexInternal::orientedViewEdgeIterator(ViewVertexInternal::orientedViewEdgeIterator const &)\n"
+    "    ViewVertexInternal::orientedViewEdgeIterator(ViewVertexInternal::orientedViewEdgeIterator::edge_pointers_container::iterator,ViewVertexInternal::orientedViewEdgeIterator::edge_pointers_container::iterator,ViewVertexInternal::orientedViewEdgeIterator::edge_pointers_container::iterator)\n"
+    "    ViewVertexInternal::orientedViewEdgeIterator(ViewVertexInternal::orientedViewEdgeIterator::edges_container::iterator,ViewVertexInternal::orientedViewEdgeIterator::edges_container::iterator,ViewVertexInternal::orientedViewEdgeIterator::edges_container::iterator)\n");
   return NULL;
 }
 
@@ -56544,7 +55378,7 @@ fail:
 SWIGINTERN PyObject *_wrap_ViewVertexOrientedViewEdgeIterator_getObject(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewVertexInternal::orientedViewEdgeIterator *arg1 = (ViewVertexInternal::orientedViewEdgeIterator *) 0 ;
-  ViewVertex::directedViewEdge *result = 0 ;
+  ::ViewVertex::directedViewEdge *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -56558,8 +55392,8 @@ SWIGINTERN PyObject *_wrap_ViewVertexOrientedViewEdgeIterator_getObject(PyObject
   {
     try {
       {
-        ViewVertex::directedViewEdge &_result_ref = ((ViewVertexInternal::orientedViewEdgeIterator const *)arg1)->operator *();
-        result = (ViewVertex::directedViewEdge *) &_result_ref;
+        ::ViewVertex::directedViewEdge &_result_ref = ((ViewVertexInternal::orientedViewEdgeIterator const *)arg1)->operator *();
+        result = (::ViewVertex::directedViewEdge *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -56569,7 +55403,7 @@ SWIGINTERN PyObject *_wrap_ViewVertexOrientedViewEdgeIterator_getObject(PyObject
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairTViewEdge_p_bool_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairT_ViewEdge_p_bool_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -56579,7 +55413,7 @@ fail:
 SWIGINTERN PyObject *_wrap_ViewVertexOrientedViewEdgeIterator___deref__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewVertexInternal::orientedViewEdgeIterator *arg1 = (ViewVertexInternal::orientedViewEdgeIterator *) 0 ;
-  ViewVertex::directedViewEdge *result = 0 ;
+  ::ViewVertex::directedViewEdge *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -56592,7 +55426,7 @@ SWIGINTERN PyObject *_wrap_ViewVertexOrientedViewEdgeIterator___deref__(PyObject
   arg1 = reinterpret_cast< ViewVertexInternal::orientedViewEdgeIterator * >(argp1);
   {
     try {
-      result = (ViewVertex::directedViewEdge *)((ViewVertexInternal::orientedViewEdgeIterator const *)arg1)->operator ->();
+      result = (::ViewVertex::directedViewEdge *)((ViewVertexInternal::orientedViewEdgeIterator const *)arg1)->operator ->();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -56601,7 +55435,7 @@ SWIGINTERN PyObject *_wrap_ViewVertexOrientedViewEdgeIterator___deref__(PyObject
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairTViewEdge_p_bool_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairT_ViewEdge_p_bool_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -56641,7 +55475,7 @@ fail:
 
 SWIGINTERN PyObject *ViewVertexOrientedViewEdgeIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -56778,7 +55612,7 @@ SWIGINTERN PyObject *_wrap_new_ViewEdgeSVertexIterator(PyObject *self, PyObject
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 5); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -56825,7 +55659,11 @@ SWIGINTERN PyObject *_wrap_new_ViewEdgeSVertexIterator(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewEdgeSVertexIterator'.\n  Possible C/C++ prototypes are:\n    ViewEdgeInternal::SVertexIterator()\n    ViewEdgeInternal::SVertexIterator(ViewEdgeInternal::SVertexIterator const &)\n    ViewEdgeInternal::SVertexIterator(SVertex *,SVertex *,FEdge *,FEdge *,float)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewEdgeSVertexIterator'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    ViewEdgeInternal::SVertexIterator()\n"
+    "    ViewEdgeInternal::SVertexIterator(ViewEdgeInternal::SVertexIterator const &)\n"
+    "    ViewEdgeInternal::SVertexIterator(SVertex *,SVertex *,FEdge *,FEdge *,float)\n");
   return NULL;
 }
 
@@ -57348,7 +56186,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_getPoint3D(PyObject *SWIGUNUS
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -57476,7 +56314,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_getPoint2D(PyObject *SWIGUNUS
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -57830,7 +56668,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_point3D(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -57865,7 +56703,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_point2D(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -57875,7 +56713,7 @@ fail:
 SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_normals(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
-  SwigValueWrapper<set<VecMat::Vec3<double > > > result;
+  SwigValueWrapper< set< VecMat::Vec3< double > > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -57897,7 +56735,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_normals(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new set<Geometry::Vec3r >(static_cast< const set<Geometry::Vec3r >& >(result))), SWIGTYPE_p_setTVecMat__Vec3Tdouble_t_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new set< Geometry::Vec3r >(static_cast< const set< Geometry::Vec3r >& >(result))), SWIGTYPE_p_setT_VecMat__Vec3T_double_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -57939,7 +56777,7 @@ fail:
 SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_fedges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
-  std::vector<FEdge * > *result = 0 ;
+  std::vector< FEdge * > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -57953,8 +56791,8 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_fedges(PyObject *SWIGUNUSEDPA
   {
     try {
       {
-        std::vector<FEdge * > const &_result_ref = (*arg1)->fedges();
-        result = (std::vector<FEdge * > *) &_result_ref;
+        std::vector< FEdge * > const &_result_ref = (*arg1)->fedges();
+        result = (std::vector< FEdge * > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -57964,7 +56802,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_fedges(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = swig::from(static_cast< std::vector<FEdge*,std::allocator<FEdge * > > >(*result));
+  resultobj = swig::from(static_cast< std::vector<FEdge*,std::allocator< FEdge * > > >(*result));
   return resultobj;
 fail:
   return NULL;
@@ -58105,7 +56943,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_shape(PyObject *self, PyObjec
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -58129,7 +56967,10 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_shape(PyObject *self, PyObjec
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgeSVertexIterator_shape'.\n  Possible C/C++ prototypes are:\n    shape()\n    shape()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgeSVertexIterator_shape'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    shape(ViewEdgeInternal::SVertexIterator *)\n"
+    "    shape(ViewEdgeInternal::SVertexIterator const *)\n");
   return NULL;
 }
 
@@ -58215,7 +57056,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_SetPoint3D(PyObject *SWIGUNUS
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_SetPoint3D" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
   }
   arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeSVertexIterator_SetPoint3D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -58258,7 +57099,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_SetPoint2D(PyObject *SWIGUNUS
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_SetPoint2D" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
   }
   arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeSVertexIterator_SetPoint2D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -58301,7 +57142,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_AddNormal(PyObject *SWIGUNUSE
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_AddNormal" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
   }
   arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeSVertexIterator_AddNormal" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -58457,7 +57298,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_setDirectionFredo(PyObject *S
   }
   arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeSVertexIterator_setDirectionFredo" "', argument " "2"" of type '" "Geometry::Vec2r""'"); 
     }  
@@ -58544,7 +57385,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_directionFredo(PyObject *SWIG
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2r(static_cast< const Geometry::Vec2r& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2r(static_cast< const Geometry::Vec2r& >(result))), SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -58597,7 +57438,7 @@ fail:
 SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_SetFEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
-  std::vector<FEdge * > *arg2 = 0 ;
+  std::vector< FEdge * > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
@@ -58611,19 +57452,19 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_SetFEdges(PyObject *SWIGUNUSE
   }
   arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
   {
-    std::vector<FEdge*,std::allocator<FEdge * > > *ptr = (std::vector<FEdge*,std::allocator<FEdge * > > *)0;
+    std::vector<FEdge*,std::allocator< FEdge * > > *ptr = (std::vector<FEdge*,std::allocator< FEdge * > > *)0;
     res2 = swig::asptr(obj1, &ptr);
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeSVertexIterator_SetFEdges" "', argument " "2"" of type '" "std::vector<FEdge * > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeSVertexIterator_SetFEdges" "', argument " "2"" of type '" "std::vector< FEdge * > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgeSVertexIterator_SetFEdges" "', argument " "2"" of type '" "std::vector<FEdge * > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgeSVertexIterator_SetFEdges" "', argument " "2"" of type '" "std::vector< FEdge * > const &""'"); 
     }
     arg2 = ptr;
   }
   {
     try {
-      (*arg1)->SetFEdges((std::vector<FEdge * > const &)*arg2);
+      (*arg1)->SetFEdges((std::vector< FEdge * > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -58870,7 +57711,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_point2d(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -58905,7 +57746,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_point3d(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -58937,7 +57778,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_normal(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -59301,7 +58142,7 @@ fail:
 
 SWIGINTERN PyObject *ViewEdgeSVertexIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -59479,7 +58320,7 @@ SWIGINTERN PyObject *_wrap_new_ViewEdgeViewEdgeIterator(PyObject *self, PyObject
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -59533,7 +58374,12 @@ SWIGINTERN PyObject *_wrap_new_ViewEdgeViewEdgeIterator(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewEdgeViewEdgeIterator'.\n  Possible C/C++ prototypes are:\n    ViewEdgeInternal::ViewEdgeIterator(PyObject *,ViewEdge *,bool)\n    ViewEdgeInternal::ViewEdgeIterator(PyObject *,ViewEdge *)\n    ViewEdgeInternal::ViewEdgeIterator(PyObject *)\n    ViewEdgeInternal::ViewEdgeIterator(PyObject *,ViewEdgeInternal::ViewEdgeIterator const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewEdgeViewEdgeIterator'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    ViewEdgeInternal::ViewEdgeIterator(PyObject *,ViewEdge *,bool)\n"
+    "    ViewEdgeInternal::ViewEdgeIterator(PyObject *,ViewEdge *)\n"
+    "    ViewEdgeInternal::ViewEdgeIterator(PyObject *)\n"
+    "    ViewEdgeInternal::ViewEdgeIterator(PyObject *,ViewEdgeInternal::ViewEdgeIterator const &)\n");
   return NULL;
 }
 
@@ -60586,7 +59432,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_aShape(PyObject *self, PyObj
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -60610,7 +59456,10 @@ SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_aShape(PyObject *self, PyObj
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgeViewEdgeIterator_aShape'.\n  Possible C/C++ prototypes are:\n    aShape()\n    aShape()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgeViewEdgeIterator_aShape'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    aShape(ViewEdgeInternal::ViewEdgeIterator *)\n"
+    "    aShape(ViewEdgeInternal::ViewEdgeIterator const *)\n");
   return NULL;
 }
 
@@ -60714,7 +59563,7 @@ fail:
 SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_occluders(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
-  std::vector<ViewShape * > *result = 0 ;
+  std::vector< ViewShape * > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -60728,8 +59577,8 @@ SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_occluders(PyObject *SWIGUNUS
   {
     try {
       {
-        std::vector<ViewShape * > &_result_ref = (*arg1)->occluders();
-        result = (std::vector<ViewShape * > *) &_result_ref;
+        std::vector< ViewShape * > &_result_ref = (*arg1)->occluders();
+        result = (std::vector< ViewShape * > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -60739,7 +59588,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_occluders(PyObject *SWIGUNUS
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -61314,7 +60163,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_intersect_2d_area(PyObject *
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_intersect_2d_area" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator const *""'"); 
   }
   arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeViewEdgeIterator_intersect_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
   }
@@ -61322,7 +60171,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_intersect_2d_area(PyObject *
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgeViewEdgeIterator_intersect_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
   }
   arg2 = reinterpret_cast< Geometry::Vec2r * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewEdgeViewEdgeIterator_intersect_2d_area" "', argument " "3"" of type '" "Geometry::Vec2r const &""'"); 
   }
@@ -61370,7 +60219,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_include_in_2d_area(PyObject
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_include_in_2d_area" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator const *""'"); 
   }
   arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeViewEdgeIterator_include_in_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
   }
@@ -61378,7 +60227,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_include_in_2d_area(PyObject
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgeViewEdgeIterator_include_in_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
   }
   arg2 = reinterpret_cast< Geometry::Vec2r * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewEdgeViewEdgeIterator_include_in_2d_area" "', argument " "3"" of type '" "Geometry::Vec2r const &""'"); 
   }
@@ -61934,7 +60783,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_pointsBegin(PyObject *self,
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -61964,7 +60813,10 @@ SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_pointsBegin(PyObject *self,
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgeViewEdgeIterator_pointsBegin'.\n  Possible C/C++ prototypes are:\n    pointsBegin(float)\n    pointsBegin()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgeViewEdgeIterator_pointsBegin'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    pointsBegin(ViewEdgeInternal::ViewEdgeIterator *,float)\n"
+    "    pointsBegin(ViewEdgeInternal::ViewEdgeIterator *)\n");
   return NULL;
 }
 
@@ -62048,7 +60900,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_pointsEnd(PyObject *self, Py
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -62078,7 +60930,10 @@ SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_pointsEnd(PyObject *self, Py
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgeViewEdgeIterator_pointsEnd'.\n  Possible C/C++ prototypes are:\n    pointsEnd(float)\n    pointsEnd()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgeViewEdgeIterator_pointsEnd'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    pointsEnd(ViewEdgeInternal::ViewEdgeIterator *,float)\n"
+    "    pointsEnd(ViewEdgeInternal::ViewEdgeIterator *)\n");
   return NULL;
 }
 
@@ -62182,7 +61037,7 @@ fail:
 
 SWIGINTERN PyObject *ViewEdgeViewEdgeIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -62190,7 +61045,7 @@ SWIGINTERN PyObject *ViewEdgeViewEdgeIterator_swigregister(PyObject *SWIGUNUSEDP
 SWIGINTERN PyObject *_wrap_new_UnaryFunction0DVoid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  UnaryFunction0D<void > *result = 0 ;
+  UnaryFunction0D< void > *result = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction0DVoid",&obj0)) SWIG_fail;
@@ -62199,9 +61054,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DVoid(PyObject *SWIGUNUSEDPARM(self
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction0D<void > *)new SwigDirector_UnaryFunction0DVoid(arg1); 
+        result = (UnaryFunction0D< void > *)new SwigDirector_UnaryFunction0DVoid(arg1); 
       } else {
-        result = (UnaryFunction0D<void > *)new UnaryFunction0D<void >(); 
+        result = (UnaryFunction0D< void > *)new UnaryFunction0D< void >(); 
       }
       
     }
@@ -62212,7 +61067,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DVoid(PyObject *SWIGUNUSEDPARM(self
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DTvoid_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DT_void_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -62221,17 +61076,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction0DVoid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<void > *arg1 = (UnaryFunction0D<void > *) 0 ;
+  UnaryFunction0D< void > *arg1 = (UnaryFunction0D< void > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction0DVoid",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTvoid_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_void_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DVoid" "', argument " "1"" of type '" "UnaryFunction0D<void > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DVoid" "', argument " "1"" of type '" "UnaryFunction0D< void > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<void > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< void > * >(argp1);
   {
     try {
       delete arg1;
@@ -62253,7 +61108,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DVoid_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<void > *arg1 = (UnaryFunction0D<void > *) 0 ;
+  UnaryFunction0D< void > *arg1 = (UnaryFunction0D< void > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -62262,20 +61117,20 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DVoid_getName(PyObject *SWIGUNUSEDPARM(
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction0DVoid_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTvoid_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_void_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVoid_getName" "', argument " "1"" of type '" "UnaryFunction0D<void > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVoid_getName" "', argument " "1"" of type '" "UnaryFunction0D< void > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<void > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< void > * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
   upcall = (director && (director->swig_get_self()==obj0));
   try {
     {
       try {
         if (upcall) {
-          result = ((UnaryFunction0D<void > const *)arg1)->UnaryFunction0D<void >::getName();
+          result = ((UnaryFunction0D< void > const *)arg1)->UnaryFunction0D< void >::getName();
         } else {
-          result = ((UnaryFunction0D<void > const *)arg1)->getName();
+          result = ((UnaryFunction0D< void > const *)arg1)->getName();
         }
       }
       //    catch (Swig::DirectorTypeMismatch&) {
@@ -62297,7 +61152,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DVoid___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<void > *arg1 = (UnaryFunction0D<void > *) 0 ;
+  UnaryFunction0D< void > *arg1 = (UnaryFunction0D< void > *) 0 ;
   Interface0DIterator *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -62309,11 +61164,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DVoid___call__(PyObject *SWIGUNUSEDPARM
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction0DVoid___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTvoid_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_void_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVoid___call__" "', argument " "1"" of type '" "UnaryFunction0D<void > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVoid___call__" "', argument " "1"" of type '" "UnaryFunction0D< void > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<void > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< void > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction0DVoid___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
@@ -62328,7 +61183,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DVoid___call__(PyObject *SWIGUNUSEDPARM
     {
       try {
         if (upcall) {
-          (arg1)->UnaryFunction0D<void >::operator ()(*arg2);
+          (arg1)->UnaryFunction0D< void >::operator ()(*arg2);
         } else {
           (arg1)->operator ()(*arg2);
         }
@@ -62352,17 +61207,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DVoid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<void > *arg1 = (UnaryFunction0D<void > *) 0 ;
+  UnaryFunction0D< void > *arg1 = (UnaryFunction0D< void > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction0DVoid",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTvoid_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_void_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DVoid" "', argument " "1"" of type '" "UnaryFunction0D<void > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DVoid" "', argument " "1"" of type '" "UnaryFunction0D< void > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<void > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< void > * >(argp1);
   {
     Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
@@ -62377,15 +61232,15 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction0DVoid_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DTvoid_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DT_void_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_UnaryFunction0DUnsigned(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  UnaryFunction0D<unsigned int > *result = 0 ;
+  UnaryFunction0D< unsigned int > *result = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction0DUnsigned",&obj0)) SWIG_fail;
@@ -62394,9 +61249,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DUnsigned(PyObject *SWIGUNUSEDPARM(
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction0D<unsigned int > *)new SwigDirector_UnaryFunction0DUnsigned(arg1); 
+        result = (UnaryFunction0D< unsigned int > *)new SwigDirector_UnaryFunction0DUnsigned(arg1); 
       } else {
-        result = (UnaryFunction0D<unsigned int > *)new UnaryFunction0D<unsigned int >(); 
+        result = (UnaryFunction0D< unsigned int > *)new UnaryFunction0D< unsigned int >(); 
       }
       
     }
@@ -62407,7 +61262,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DUnsigned(PyObject *SWIGUNUSEDPARM(
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DTunsigned_int_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DT_unsigned_int_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -62416,17 +61271,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction0DUnsigned(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<unsigned int > *arg1 = (UnaryFunction0D<unsigned int > *) 0 ;
+  UnaryFunction0D< unsigned int > *arg1 = (UnaryFunction0D< unsigned int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction0DUnsigned",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTunsigned_int_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_unsigned_int_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DUnsigned" "', argument " "1"" of type '" "UnaryFunction0D<unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DUnsigned" "', argument " "1"" of type '" "UnaryFunction0D< unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< unsigned int > * >(argp1);
   {
     try {
       delete arg1;
@@ -62448,7 +61303,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DUnsigned_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<unsigned int > *arg1 = (UnaryFunction0D<unsigned int > *) 0 ;
+  UnaryFunction0D< unsigned int > *arg1 = (UnaryFunction0D< unsigned int > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -62457,20 +61312,20 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DUnsigned_getName(PyObject *SWIGUNUSEDP
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction0DUnsigned_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DUnsigned_getName" "', argument " "1"" of type '" "UnaryFunction0D<unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DUnsigned_getName" "', argument " "1"" of type '" "UnaryFunction0D< unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< unsigned int > * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
   upcall = (director && (director->swig_get_self()==obj0));
   try {
     {
       try {
         if (upcall) {
-          result = ((UnaryFunction0D<unsigned int > const *)arg1)->UnaryFunction0D<unsigned int >::getName();
+          result = ((UnaryFunction0D< unsigned int > const *)arg1)->UnaryFunction0D< unsigned int >::getName();
         } else {
-          result = ((UnaryFunction0D<unsigned int > const *)arg1)->getName();
+          result = ((UnaryFunction0D< unsigned int > const *)arg1)->getName();
         }
       }
       //    catch (Swig::DirectorTypeMismatch&) {
@@ -62492,7 +61347,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DUnsigned___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<unsigned int > *arg1 = (UnaryFunction0D<unsigned int > *) 0 ;
+  UnaryFunction0D< unsigned int > *arg1 = (UnaryFunction0D< unsigned int > *) 0 ;
   Interface0DIterator *arg2 = 0 ;
   unsigned int result;
   void *argp1 = 0 ;
@@ -62505,11 +61360,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DUnsigned___call__(PyObject *SWIGUNUSED
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction0DUnsigned___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DUnsigned___call__" "', argument " "1"" of type '" "UnaryFunction0D<unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DUnsigned___call__" "', argument " "1"" of type '" "UnaryFunction0D< unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< unsigned int > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction0DUnsigned___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
@@ -62524,7 +61379,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DUnsigned___call__(PyObject *SWIGUNUSED
     {
       try {
         if (upcall) {
-          result = (unsigned int)(arg1)->UnaryFunction0D<unsigned int >::operator ()(*arg2);
+          result = (unsigned int)(arg1)->UnaryFunction0D< unsigned int >::operator ()(*arg2);
         } else {
           result = (unsigned int)(arg1)->operator ()(*arg2);
         }
@@ -62548,17 +61403,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DUnsigned(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<unsigned int > *arg1 = (UnaryFunction0D<unsigned int > *) 0 ;
+  UnaryFunction0D< unsigned int > *arg1 = (UnaryFunction0D< unsigned int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction0DUnsigned",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DUnsigned" "', argument " "1"" of type '" "UnaryFunction0D<unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DUnsigned" "', argument " "1"" of type '" "UnaryFunction0D< unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< unsigned int > * >(argp1);
   {
     Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
@@ -62573,15 +61428,15 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction0DUnsigned_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DTunsigned_int_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DT_unsigned_int_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_UnaryFunction0DFloat(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  UnaryFunction0D<float > *result = 0 ;
+  UnaryFunction0D< float > *result = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction0DFloat",&obj0)) SWIG_fail;
@@ -62590,9 +61445,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DFloat(PyObject *SWIGUNUSEDPARM(sel
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction0D<float > *)new SwigDirector_UnaryFunction0DFloat(arg1); 
+        result = (UnaryFunction0D< float > *)new SwigDirector_UnaryFunction0DFloat(arg1); 
       } else {
-        result = (UnaryFunction0D<float > *)new UnaryFunction0D<float >(); 
+        result = (UnaryFunction0D< float > *)new UnaryFunction0D< float >(); 
       }
       
     }
@@ -62603,7 +61458,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DFloat(PyObject *SWIGUNUSEDPARM(sel
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DTfloat_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DT_float_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -62612,17 +61467,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction0DFloat(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<float > *arg1 = (UnaryFunction0D<float > *) 0 ;
+  UnaryFunction0D< float > *arg1 = (UnaryFunction0D< float > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction0DFloat",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTfloat_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_float_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DFloat" "', argument " "1"" of type '" "UnaryFunction0D<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DFloat" "', argument " "1"" of type '" "UnaryFunction0D< float > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<float > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< float > * >(argp1);
   {
     try {
       delete arg1;
@@ -62644,7 +61499,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DFloat_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<float > *arg1 = (UnaryFunction0D<float > *) 0 ;
+  UnaryFunction0D< float > *arg1 = (UnaryFunction0D< float > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -62653,20 +61508,20 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DFloat_getName(PyObject *SWIGUNUSEDPARM
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction0DFloat_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DFloat_getName" "', argument " "1"" of type '" "UnaryFunction0D<float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DFloat_getName" "', argument " "1"" of type '" "UnaryFunction0D< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<float > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< float > * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
   upcall = (director && (director->swig_get_self()==obj0));
   try {
     {
       try {
         if (upcall) {
-          result = ((UnaryFunction0D<float > const *)arg1)->UnaryFunction0D<float >::getName();
+          result = ((UnaryFunction0D< float > const *)arg1)->UnaryFunction0D< float >::getName();
         } else {
-          result = ((UnaryFunction0D<float > const *)arg1)->getName();
+          result = ((UnaryFunction0D< float > const *)arg1)->getName();
         }
       }
       //    catch (Swig::DirectorTypeMismatch&) {
@@ -62688,7 +61543,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DFloat___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<float > *arg1 = (UnaryFunction0D<float > *) 0 ;
+  UnaryFunction0D< float > *arg1 = (UnaryFunction0D< float > *) 0 ;
   Interface0DIterator *arg2 = 0 ;
   float result;
   void *argp1 = 0 ;
@@ -62701,11 +61556,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DFloat___call__(PyObject *SWIGUNUSEDPAR
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction0DFloat___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DFloat___call__" "', argument " "1"" of type '" "UnaryFunction0D<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DFloat___call__" "', argument " "1"" of type '" "UnaryFunction0D< float > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<float > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< float > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction0DFloat___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
@@ -62720,7 +61575,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DFloat___call__(PyObject *SWIGUNUSEDPAR
     {
       try {
         if (upcall) {
-          result = (float)(arg1)->UnaryFunction0D<float >::operator ()(*arg2);
+          result = (float)(arg1)->UnaryFunction0D< float >::operator ()(*arg2);
         } else {
           result = (float)(arg1)->operator ()(*arg2);
         }
@@ -62744,17 +61599,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DFloat(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<float > *arg1 = (UnaryFunction0D<float > *) 0 ;
+  UnaryFunction0D< float > *arg1 = (UnaryFunction0D< float > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction0DFloat",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DFloat" "', argument " "1"" of type '" "UnaryFunction0D<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DFloat" "', argument " "1"" of type '" "UnaryFunction0D< float > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<float > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< float > * >(argp1);
   {
     Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
@@ -62769,15 +61624,15 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction0DFloat_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DTfloat_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DT_float_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_UnaryFunction0DDouble(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  UnaryFunction0D<double > *result = 0 ;
+  UnaryFunction0D< double > *result = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction0DDouble",&obj0)) SWIG_fail;
@@ -62786,9 +61641,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DDouble(PyObject *SWIGUNUSEDPARM(se
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction0D<double > *)new SwigDirector_UnaryFunction0DDouble(arg1); 
+        result = (UnaryFunction0D< double > *)new SwigDirector_UnaryFunction0DDouble(arg1); 
       } else {
-        result = (UnaryFunction0D<double > *)new UnaryFunction0D<double >(); 
+        result = (UnaryFunction0D< double > *)new UnaryFunction0D< double >(); 
       }
       
     }
@@ -62799,7 +61654,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DDouble(PyObject *SWIGUNUSEDPARM(se
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DTdouble_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DT_double_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -62808,17 +61663,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction0DDouble(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<double > *arg1 = (UnaryFunction0D<double > *) 0 ;
+  UnaryFunction0D< double > *arg1 = (UnaryFunction0D< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction0DDouble",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTdouble_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_double_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DDouble" "', argument " "1"" of type '" "UnaryFunction0D<double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DDouble" "', argument " "1"" of type '" "UnaryFunction0D< double > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< double > * >(argp1);
   {
     try {
       delete arg1;
@@ -62840,7 +61695,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DDouble_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<double > *arg1 = (UnaryFunction0D<double > *) 0 ;
+  UnaryFunction0D< double > *arg1 = (UnaryFunction0D< double > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -62849,20 +61704,20 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DDouble_getName(PyObject *SWIGUNUSEDPAR
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction0DDouble_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DDouble_getName" "', argument " "1"" of type '" "UnaryFunction0D<double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DDouble_getName" "', argument " "1"" of type '" "UnaryFunction0D< double > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< double > * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
   upcall = (director && (director->swig_get_self()==obj0));
   try {
     {
       try {
         if (upcall) {
-          result = ((UnaryFunction0D<double > const *)arg1)->UnaryFunction0D<double >::getName();
+          result = ((UnaryFunction0D< double > const *)arg1)->UnaryFunction0D< double >::getName();
         } else {
-          result = ((UnaryFunction0D<double > const *)arg1)->getName();
+          result = ((UnaryFunction0D< double > const *)arg1)->getName();
         }
       }
       //    catch (Swig::DirectorTypeMismatch&) {
@@ -62884,7 +61739,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DDouble___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<double > *arg1 = (UnaryFunction0D<double > *) 0 ;
+  UnaryFunction0D< double > *arg1 = (UnaryFunction0D< double > *) 0 ;
   Interface0DIterator *arg2 = 0 ;
   double result;
   void *argp1 = 0 ;
@@ -62897,11 +61752,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DDouble___call__(PyObject *SWIGUNUSEDPA
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction0DDouble___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DDouble___call__" "', argument " "1"" of type '" "UnaryFunction0D<double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DDouble___call__" "', argument " "1"" of type '" "UnaryFunction0D< double > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< double > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction0DDouble___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
@@ -62916,7 +61771,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DDouble___call__(PyObject *SWIGUNUSEDPA
     {
       try {
         if (upcall) {
-          result = (double)(arg1)->UnaryFunction0D<double >::operator ()(*arg2);
+          result = (double)(arg1)->UnaryFunction0D< double >::operator ()(*arg2);
         } else {
           result = (double)(arg1)->operator ()(*arg2);
         }
@@ -62940,17 +61795,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DDouble(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<double > *arg1 = (UnaryFunction0D<double > *) 0 ;
+  UnaryFunction0D< double > *arg1 = (UnaryFunction0D< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction0DDouble",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DDouble" "', argument " "1"" of type '" "UnaryFunction0D<double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DDouble" "', argument " "1"" of type '" "UnaryFunction0D< double > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< double > * >(argp1);
   {
     Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
@@ -62965,15 +61820,15 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction0DDouble_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DTdouble_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DT_double_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_UnaryFunction0DVec2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  UnaryFunction0D<Geometry::Vec2f > *result = 0 ;
+  UnaryFunction0D< Geometry::Vec2f > *result = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction0DVec2f",&obj0)) SWIG_fail;
@@ -62982,9 +61837,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DVec2f(PyObject *SWIGUNUSEDPARM(sel
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction0D<Geometry::Vec2f > *)new SwigDirector_UnaryFunction0DVec2f(arg1); 
+        result = (UnaryFunction0D< Geometry::Vec2f > *)new SwigDirector_UnaryFunction0DVec2f(arg1); 
       } else {
-        result = (UnaryFunction0D<Geometry::Vec2f > *)new UnaryFunction0D<Geometry::Vec2f >(); 
+        result = (UnaryFunction0D< Geometry::Vec2f > *)new UnaryFunction0D< Geometry::Vec2f >(); 
       }
       
     }
@@ -62995,7 +61850,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DVec2f(PyObject *SWIGUNUSEDPARM(sel
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DT_VecMat__Vec2T_float_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -63004,17 +61859,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction0DVec2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<Geometry::Vec2f > *arg1 = (UnaryFunction0D<Geometry::Vec2f > *) 0 ;
+  UnaryFunction0D< Geometry::Vec2f > *arg1 = (UnaryFunction0D< Geometry::Vec2f > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction0DVec2f",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_VecMat__Vec2T_float_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DVec2f" "', argument " "1"" of type '" "UnaryFunction0D<Geometry::Vec2f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DVec2f" "', argument " "1"" of type '" "UnaryFunction0D< Geometry::Vec2f > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<Geometry::Vec2f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< Geometry::Vec2f > * >(argp1);
   {
     try {
       delete arg1;
@@ -63036,7 +61891,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DVec2f_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<Geometry::Vec2f > *arg1 = (UnaryFunction0D<Geometry::Vec2f > *) 0 ;
+  UnaryFunction0D< Geometry::Vec2f > *arg1 = (UnaryFunction0D< Geometry::Vec2f > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -63045,20 +61900,20 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DVec2f_getName(PyObject *SWIGUNUSEDPARM
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction0DVec2f_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_VecMat__Vec2T_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVec2f_getName" "', argument " "1"" of type '" "UnaryFunction0D<Geometry::Vec2f > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVec2f_getName" "', argument " "1"" of type '" "UnaryFunction0D< Geometry::Vec2f > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<Geometry::Vec2f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< Geometry::Vec2f > * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
   upcall = (director && (director->swig_get_self()==obj0));
   try {
     {
       try {
         if (upcall) {
-          result = ((UnaryFunction0D<Geometry::Vec2f > const *)arg1)->UnaryFunction0D<VecMat::Vec2<float > >::getName();
+          result = ((UnaryFunction0D< Geometry::Vec2f > const *)arg1)->UnaryFunction0D< VecMat::Vec2< float > >::getName();
         } else {
-          result = ((UnaryFunction0D<Geometry::Vec2f > const *)arg1)->getName();
+          result = ((UnaryFunction0D< Geometry::Vec2f > const *)arg1)->getName();
         }
       }
       //    catch (Swig::DirectorTypeMismatch&) {
@@ -63080,9 +61935,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DVec2f___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<Geometry::Vec2f > *arg1 = (UnaryFunction0D<Geometry::Vec2f > *) 0 ;
+  UnaryFunction0D< Geometry::Vec2f > *arg1 = (UnaryFunction0D< Geometry::Vec2f > *) 0 ;
   Interface0DIterator *arg2 = 0 ;
-  VecMat::Vec2<float > result;
+  VecMat::Vec2< float > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -63093,11 +61948,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DVec2f___call__(PyObject *SWIGUNUSEDPAR
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction0DVec2f___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_VecMat__Vec2T_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVec2f___call__" "', argument " "1"" of type '" "UnaryFunction0D<Geometry::Vec2f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVec2f___call__" "', argument " "1"" of type '" "UnaryFunction0D< Geometry::Vec2f > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<Geometry::Vec2f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< Geometry::Vec2f > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction0DVec2f___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
@@ -63112,7 +61967,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DVec2f___call__(PyObject *SWIGUNUSEDPAR
     {
       try {
         if (upcall) {
-          result = (arg1)->UnaryFunction0D<VecMat::Vec2<float > >::operator ()(*arg2);
+          result = (arg1)->UnaryFunction0D< VecMat::Vec2< float > >::operator ()(*arg2);
         } else {
           result = (arg1)->operator ()(*arg2);
         }
@@ -63127,7 +61982,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DVec2f___call__(PyObject *SWIGUNUSEDPAR
   } catch (Swig::DirectorException&) {
     SWIG_fail;
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<float >(static_cast< const VecMat::Vec2<float >& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< float >(static_cast< const VecMat::Vec2< float >& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -63136,17 +61991,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DVec2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<Geometry::Vec2f > *arg1 = (UnaryFunction0D<Geometry::Vec2f > *) 0 ;
+  UnaryFunction0D< Geometry::Vec2f > *arg1 = (UnaryFunction0D< Geometry::Vec2f > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction0DVec2f",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_VecMat__Vec2T_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DVec2f" "', argument " "1"" of type '" "UnaryFunction0D<Geometry::Vec2f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DVec2f" "', argument " "1"" of type '" "UnaryFunction0D< Geometry::Vec2f > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<Geometry::Vec2f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< Geometry::Vec2f > * >(argp1);
   {
     Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
@@ -63161,15 +62016,15 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction0DVec2f_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DT_VecMat__Vec2T_float_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_UnaryFunction0DVec3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  UnaryFunction0D<Geometry::Vec3f > *result = 0 ;
+  UnaryFunction0D< Geometry::Vec3f > *result = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction0DVec3f",&obj0)) SWIG_fail;
@@ -63178,9 +62033,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DVec3f(PyObject *SWIGUNUSEDPARM(sel
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction0D<Geometry::Vec3f > *)new SwigDirector_UnaryFunction0DVec3f(arg1); 
+        result = (UnaryFunction0D< Geometry::Vec3f > *)new SwigDirector_UnaryFunction0DVec3f(arg1); 
       } else {
-        result = (UnaryFunction0D<Geometry::Vec3f > *)new UnaryFunction0D<Geometry::Vec3f >(); 
+        result = (UnaryFunction0D< Geometry::Vec3f > *)new UnaryFunction0D< Geometry::Vec3f >(); 
       }
       
     }
@@ -63191,7 +62046,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DVec3f(PyObject *SWIGUNUSEDPARM(sel
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DT_VecMat__Vec3T_float_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -63200,17 +62055,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction0DVec3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<Geometry::Vec3f > *arg1 = (UnaryFunction0D<Geometry::Vec3f > *) 0 ;
+  UnaryFunction0D< Geometry::Vec3f > *arg1 = (UnaryFunction0D< Geometry::Vec3f > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction0DVec3f",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_VecMat__Vec3T_float_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DVec3f" "', argument " "1"" of type '" "UnaryFunction0D<Geometry::Vec3f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DVec3f" "', argument " "1"" of type '" "UnaryFunction0D< Geometry::Vec3f > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<Geometry::Vec3f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< Geometry::Vec3f > * >(argp1);
   {
     try {
       delete arg1;
@@ -63232,7 +62087,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DVec3f_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<Geometry::Vec3f > *arg1 = (UnaryFunction0D<Geometry::Vec3f > *) 0 ;
+  UnaryFunction0D< Geometry::Vec3f > *arg1 = (UnaryFunction0D< Geometry::Vec3f > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -63241,20 +62096,20 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DVec3f_getName(PyObject *SWIGUNUSEDPARM
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction0DVec3f_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_VecMat__Vec3T_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVec3f_getName" "', argument " "1"" of type '" "UnaryFunction0D<Geometry::Vec3f > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVec3f_getName" "', argument " "1"" of type '" "UnaryFunction0D< Geometry::Vec3f > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<Geometry::Vec3f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< Geometry::Vec3f > * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
   upcall = (director && (director->swig_get_self()==obj0));
   try {
     {
       try {
         if (upcall) {
-          result = ((UnaryFunction0D<Geometry::Vec3f > const *)arg1)->UnaryFunction0D<VecMat::Vec3<float > >::getName();
+          result = ((UnaryFunction0D< Geometry::Vec3f > const *)arg1)->UnaryFunction0D< VecMat::Vec3< float > >::getName();
         } else {
-          result = ((UnaryFunction0D<Geometry::Vec3f > const *)arg1)->getName();
+          result = ((UnaryFunction0D< Geometry::Vec3f > const *)arg1)->getName();
         }
       }
       //    catch (Swig::DirectorTypeMismatch&) {
@@ -63276,9 +62131,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DVec3f___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<Geometry::Vec3f > *arg1 = (UnaryFunction0D<Geometry::Vec3f > *) 0 ;
+  UnaryFunction0D< Geometry::Vec3f > *arg1 = (UnaryFunction0D< Geometry::Vec3f > *) 0 ;
   Interface0DIterator *arg2 = 0 ;
-  VecMat::Vec3<float > result;
+  VecMat::Vec3< float > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -63289,11 +62144,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DVec3f___call__(PyObject *SWIGUNUSEDPAR
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction0DVec3f___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_VecMat__Vec3T_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVec3f___call__" "', argument " "1"" of type '" "UnaryFunction0D<Geometry::Vec3f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVec3f___call__" "', argument " "1"" of type '" "UnaryFunction0D< Geometry::Vec3f > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<Geometry::Vec3f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< Geometry::Vec3f > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction0DVec3f___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
@@ -63308,7 +62163,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DVec3f___call__(PyObject *SWIGUNUSEDPAR
     {
       try {
         if (upcall) {
-          result = (arg1)->UnaryFunction0D<VecMat::Vec3<float > >::operator ()(*arg2);
+          result = (arg1)->UnaryFunction0D< VecMat::Vec3< float > >::operator ()(*arg2);
         } else {
           result = (arg1)->operator ()(*arg2);
         }
@@ -63323,7 +62178,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DVec3f___call__(PyObject *SWIGUNUSEDPAR
   } catch (Swig::DirectorException&) {
     SWIG_fail;
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<float >(static_cast< const VecMat::Vec3<float >& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< float >(static_cast< const VecMat::Vec3< float >& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -63332,17 +62187,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DVec3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<Geometry::Vec3f > *arg1 = (UnaryFunction0D<Geometry::Vec3f > *) 0 ;
+  UnaryFunction0D< Geometry::Vec3f > *arg1 = (UnaryFunction0D< Geometry::Vec3f > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction0DVec3f",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_VecMat__Vec3T_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DVec3f" "', argument " "1"" of type '" "UnaryFunction0D<Geometry::Vec3f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DVec3f" "', argument " "1"" of type '" "UnaryFunction0D< Geometry::Vec3f > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<Geometry::Vec3f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< Geometry::Vec3f > * >(argp1);
   {
     Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
@@ -63357,15 +62212,15 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction0DVec3f_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DT_VecMat__Vec3T_float_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_UnaryFunction0DId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  UnaryFunction0D<Id > *result = 0 ;
+  UnaryFunction0D< Id > *result = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction0DId",&obj0)) SWIG_fail;
@@ -63374,9 +62229,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DId(PyObject *SWIGUNUSEDPARM(self),
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction0D<Id > *)new SwigDirector_UnaryFunction0DId(arg1); 
+        result = (UnaryFunction0D< Id > *)new SwigDirector_UnaryFunction0DId(arg1); 
       } else {
-        result = (UnaryFunction0D<Id > *)new UnaryFunction0D<Id >(); 
+        result = (UnaryFunction0D< Id > *)new UnaryFunction0D< Id >(); 
       }
       
     }
@@ -63387,7 +62242,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DId(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DTId_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DT_Id_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -63396,17 +62251,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction0DId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<Id > *arg1 = (UnaryFunction0D<Id > *) 0 ;
+  UnaryFunction0D< Id > *arg1 = (UnaryFunction0D< Id > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction0DId",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTId_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_Id_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DId" "', argument " "1"" of type '" "UnaryFunction0D<Id > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DId" "', argument " "1"" of type '" "UnaryFunction0D< Id > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<Id > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< Id > * >(argp1);
   {
     try {
       delete arg1;
@@ -63428,7 +62283,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DId_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<Id > *arg1 = (UnaryFunction0D<Id > *) 0 ;
+  UnaryFunction0D< Id > *arg1 = (UnaryFunction0D< Id > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -63437,20 +62292,20 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DId_getName(PyObject *SWIGUNUSEDPARM(se
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction0DId_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTId_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_Id_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DId_getName" "', argument " "1"" of type '" "UnaryFunction0D<Id > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DId_getName" "', argument " "1"" of type '" "UnaryFunction0D< Id > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<Id > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< Id > * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
   upcall = (director && (director->swig_get_self()==obj0));
   try {
     {
       try {
         if (upcall) {
-          result = ((UnaryFunction0D<Id > const *)arg1)->UnaryFunction0D<Id >::getName();
+          result = ((UnaryFunction0D< Id > const *)arg1)->UnaryFunction0D< Id >::getName();
         } else {
-          result = ((UnaryFunction0D<Id > const *)arg1)->getName();
+          result = ((UnaryFunction0D< Id > const *)arg1)->getName();
         }
       }
       //    catch (Swig::DirectorTypeMismatch&) {
@@ -63472,7 +62327,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DId___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<Id > *arg1 = (UnaryFunction0D<Id > *) 0 ;
+  UnaryFunction0D< Id > *arg1 = (UnaryFunction0D< Id > *) 0 ;
   Interface0DIterator *arg2 = 0 ;
   Id result;
   void *argp1 = 0 ;
@@ -63485,11 +62340,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DId___call__(PyObject *SWIGUNUSEDPARM(s
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction0DId___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTId_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_Id_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DId___call__" "', argument " "1"" of type '" "UnaryFunction0D<Id > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DId___call__" "', argument " "1"" of type '" "UnaryFunction0D< Id > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<Id > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< Id > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction0DId___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
@@ -63504,7 +62359,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DId___call__(PyObject *SWIGUNUSEDPARM(s
     {
       try {
         if (upcall) {
-          result = (arg1)->UnaryFunction0D<Id >::operator ()(*arg2);
+          result = (arg1)->UnaryFunction0D< Id >::operator ()(*arg2);
         } else {
           result = (arg1)->operator ()(*arg2);
         }
@@ -63528,17 +62383,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<Id > *arg1 = (UnaryFunction0D<Id > *) 0 ;
+  UnaryFunction0D< Id > *arg1 = (UnaryFunction0D< Id > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction0DId",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTId_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_Id_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DId" "', argument " "1"" of type '" "UnaryFunction0D<Id > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DId" "', argument " "1"" of type '" "UnaryFunction0D< Id > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<Id > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< Id > * >(argp1);
   {
     Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
@@ -63553,19 +62408,19 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction0DId_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DTId_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DT_Id_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_UnaryFunction0DViewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<ViewShape * > *result = 0 ;
+  UnaryFunction0D< ViewShape * > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_UnaryFunction0DViewShape")) SWIG_fail;
   {
     try {
-      result = (UnaryFunction0D<ViewShape * > *)new UnaryFunction0D<ViewShape * >();
+      result = (UnaryFunction0D< ViewShape * > *)new UnaryFunction0D< ViewShape * >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -63574,7 +62429,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DViewShape(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DTViewShape_p_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DT_ViewShape_p_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -63583,17 +62438,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction0DViewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<ViewShape * > *arg1 = (UnaryFunction0D<ViewShape * > *) 0 ;
+  UnaryFunction0D< ViewShape * > *arg1 = (UnaryFunction0D< ViewShape * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction0DViewShape",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTViewShape_p_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_ViewShape_p_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DViewShape" "', argument " "1"" of type '" "UnaryFunction0D<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DViewShape" "', argument " "1"" of type '" "UnaryFunction0D< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< ViewShape * > * >(argp1);
   {
     try {
       delete arg1;
@@ -63615,21 +62470,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DViewShape_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<ViewShape * > *arg1 = (UnaryFunction0D<ViewShape * > *) 0 ;
+  UnaryFunction0D< ViewShape * > *arg1 = (UnaryFunction0D< ViewShape * > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction0DViewShape_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTViewShape_p_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_ViewShape_p_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DViewShape_getName" "', argument " "1"" of type '" "UnaryFunction0D<ViewShape * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DViewShape_getName" "', argument " "1"" of type '" "UnaryFunction0D< ViewShape * > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< ViewShape * > * >(argp1);
   {
     try {
-      result = ((UnaryFunction0D<ViewShape * > const *)arg1)->getName();
+      result = ((UnaryFunction0D< ViewShape * > const *)arg1)->getName();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -63647,7 +62502,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DViewShape___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<ViewShape * > *arg1 = (UnaryFunction0D<ViewShape * > *) 0 ;
+  UnaryFunction0D< ViewShape * > *arg1 = (UnaryFunction0D< ViewShape * > *) 0 ;
   Interface0DIterator *arg2 = 0 ;
   ViewShape *result = 0 ;
   void *argp1 = 0 ;
@@ -63658,11 +62513,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DViewShape___call__(PyObject *SWIGUNUSE
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction0DViewShape___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTViewShape_p_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_ViewShape_p_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DViewShape___call__" "', argument " "1"" of type '" "UnaryFunction0D<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DViewShape___call__" "', argument " "1"" of type '" "UnaryFunction0D< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< ViewShape * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction0DViewShape___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
@@ -63691,19 +62546,19 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction0DViewShape_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DTViewShape_p_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DT_ViewShape_p_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_UnaryFunction0DVectorViewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<std::vector<ViewShape * > > *result = 0 ;
+  UnaryFunction0D< std::vector< ViewShape * > > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_UnaryFunction0DVectorViewShape")) SWIG_fail;
   {
     try {
-      result = (UnaryFunction0D<std::vector<ViewShape * > > *)new UnaryFunction0D<std::vector<ViewShape * > >();
+      result = (UnaryFunction0D< std::vector< ViewShape * > > *)new UnaryFunction0D< std::vector< ViewShape * > >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -63712,7 +62567,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DVectorViewShape(PyObject *SWIGUNUS
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -63721,17 +62576,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction0DVectorViewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<std::vector<ViewShape * > > *arg1 = (UnaryFunction0D<std::vector<ViewShape * > > *) 0 ;
+  UnaryFunction0D< std::vector< ViewShape * > > *arg1 = (UnaryFunction0D< std::vector< ViewShape * > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction0DVectorViewShape",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DVectorViewShape" "', argument " "1"" of type '" "UnaryFunction0D<std::vector<ViewShape * > > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DVectorViewShape" "', argument " "1"" of type '" "UnaryFunction0D< std::vector< ViewShape * > > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<std::vector<ViewShape * > > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< std::vector< ViewShape * > > * >(argp1);
   {
     try {
       delete arg1;
@@ -63753,21 +62608,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DVectorViewShape_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<std::vector<ViewShape * > > *arg1 = (UnaryFunction0D<std::vector<ViewShape * > > *) 0 ;
+  UnaryFunction0D< std::vector< ViewShape * > > *arg1 = (UnaryFunction0D< std::vector< ViewShape * > > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction0DVectorViewShape_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVectorViewShape_getName" "', argument " "1"" of type '" "UnaryFunction0D<std::vector<ViewShape * > > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVectorViewShape_getName" "', argument " "1"" of type '" "UnaryFunction0D< std::vector< ViewShape * > > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<std::vector<ViewShape * > > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< std::vector< ViewShape * > > * >(argp1);
   {
     try {
-      result = ((UnaryFunction0D<std::vector<ViewShape * > > const *)arg1)->getName();
+      result = ((UnaryFunction0D< std::vector< ViewShape * > > const *)arg1)->getName();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -63785,9 +62640,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DVectorViewShape___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<std::vector<ViewShape * > > *arg1 = (UnaryFunction0D<std::vector<ViewShape * > > *) 0 ;
+  UnaryFunction0D< std::vector< ViewShape * > > *arg1 = (UnaryFunction0D< std::vector< ViewShape * > > *) 0 ;
   Interface0DIterator *arg2 = 0 ;
-  std::vector<ViewShape *,std::allocator<ViewShape * > > result;
+  std::vector< ViewShape *,std::allocator< ViewShape * > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -63796,11 +62651,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DVectorViewShape___call__(PyObject *SWI
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction0DVectorViewShape___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVectorViewShape___call__" "', argument " "1"" of type '" "UnaryFunction0D<std::vector<ViewShape * > > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVectorViewShape___call__" "', argument " "1"" of type '" "UnaryFunction0D< std::vector< ViewShape * > > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<std::vector<ViewShape * > > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< std::vector< ViewShape * > > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction0DVectorViewShape___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
@@ -63820,7 +62675,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DVectorViewShape___call__(PyObject *SWI
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = swig::from(static_cast< std::vector<ViewShape*,std::allocator<ViewShape * > > >(result));
+  resultobj = swig::from(static_cast< std::vector<ViewShape*,std::allocator< ViewShape * > > >(result));
   return resultobj;
 fail:
   return NULL;
@@ -63829,8 +62684,8 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction0DVectorViewShape_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
@@ -63967,7 +62822,7 @@ fail:
 
 SWIGINTERN PyObject *GetXF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetXF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -64105,7 +62960,7 @@ fail:
 
 SWIGINTERN PyObject *GetYF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetYF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -64243,7 +63098,7 @@ fail:
 
 SWIGINTERN PyObject *GetZF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetZF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -64381,7 +63236,7 @@ fail:
 
 SWIGINTERN PyObject *GetProjectedXF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetProjectedXF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -64519,7 +63374,7 @@ fail:
 
 SWIGINTERN PyObject *GetProjectedYF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetProjectedYF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -64657,7 +63512,7 @@ fail:
 
 SWIGINTERN PyObject *GetProjectedZF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetProjectedZF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -64795,7 +63650,7 @@ fail:
 
 SWIGINTERN PyObject *GetCurvilinearAbscissaF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetCurvilinearAbscissaF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -64933,7 +63788,7 @@ fail:
 
 SWIGINTERN PyObject *GetParameterF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetParameterF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -65007,7 +63862,7 @@ SWIGINTERN PyObject *_wrap_VertexOrientation2DF0D___call__(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -65071,7 +63926,7 @@ fail:
 
 SWIGINTERN PyObject *VertexOrientation2DF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__VertexOrientation2DF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -65145,7 +64000,7 @@ SWIGINTERN PyObject *_wrap_VertexOrientation3DF0D___call__(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -65209,7 +64064,7 @@ fail:
 
 SWIGINTERN PyObject *VertexOrientation3DF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__VertexOrientation3DF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -65347,7 +64202,7 @@ fail:
 
 SWIGINTERN PyObject *Curvature2DAngleF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__Curvature2DAngleF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -65485,7 +64340,7 @@ fail:
 
 SWIGINTERN PyObject *ZDiscontinuityF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__ZDiscontinuityF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -65559,7 +64414,7 @@ SWIGINTERN PyObject *_wrap_Normal2DF0D___call__(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -65623,7 +64478,7 @@ fail:
 
 SWIGINTERN PyObject *Normal2DF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__Normal2DF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -65761,7 +64616,7 @@ fail:
 
 SWIGINTERN PyObject *MaterialF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__MaterialF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -65899,7 +64754,7 @@ fail:
 
 SWIGINTERN PyObject *ShapeIdF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__ShapeIdF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -66037,7 +64892,7 @@ fail:
 
 SWIGINTERN PyObject *QuantitativeInvisibilityF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__QuantitativeInvisibilityF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -66175,7 +65030,7 @@ fail:
 
 SWIGINTERN PyObject *CurveNatureF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__CurveNatureF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -66313,7 +65168,7 @@ fail:
 
 SWIGINTERN PyObject *GetShapeF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetShapeF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -66354,7 +65209,7 @@ SWIGINTERN PyObject *_wrap_GetOccludersF0D___call__(PyObject *SWIGUNUSEDPARM(sel
   PyObject *resultobj = 0;
   Functions0D::GetOccludersF0D *arg1 = (Functions0D::GetOccludersF0D *) 0 ;
   Interface0DIterator *arg2 = 0 ;
-  std::vector<ViewShape *,std::allocator<ViewShape * > > result;
+  std::vector< ViewShape *,std::allocator< ViewShape * > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -66387,7 +65242,7 @@ SWIGINTERN PyObject *_wrap_GetOccludersF0D___call__(PyObject *SWIGUNUSEDPARM(sel
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = swig::from(static_cast< std::vector<ViewShape*,std::allocator<ViewShape * > > >(result));
+  resultobj = swig::from(static_cast< std::vector<ViewShape*,std::allocator< ViewShape * > > >(result));
   return resultobj;
 fail:
   return NULL;
@@ -66451,7 +65306,7 @@ fail:
 
 SWIGINTERN PyObject *GetOccludersF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetOccludersF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -66589,7 +65444,7 @@ fail:
 
 SWIGINTERN PyObject *GetOccludeeF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetOccludeeF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -66644,7 +65499,7 @@ fail:
 SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVoid__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  UnaryFunction1D<void > *result = 0 ;
+  UnaryFunction1D< void > *result = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction1DVoid",&obj0)) SWIG_fail;
@@ -66653,9 +65508,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVoid__SWIG_0(PyObject *SWIGUNUSEDP
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction1D<void > *)new SwigDirector_UnaryFunction1DVoid(arg1); 
+        result = (UnaryFunction1D< void > *)new SwigDirector_UnaryFunction1DVoid(arg1); 
       } else {
-        result = (UnaryFunction1D<void > *)new UnaryFunction1D<void >(); 
+        result = (UnaryFunction1D< void > *)new UnaryFunction1D< void >(); 
       }
       
     }
@@ -66666,7 +65521,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVoid__SWIG_0(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTvoid_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DT_void_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -66677,7 +65532,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVoid__SWIG_1(PyObject *SWIGUNUSEDP
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
   IntegrationType arg2 ;
-  UnaryFunction1D<void > *result = 0 ;
+  UnaryFunction1D< void > *result = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
@@ -66694,9 +65549,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVoid__SWIG_1(PyObject *SWIGUNUSEDP
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction1D<void > *)new SwigDirector_UnaryFunction1DVoid(arg1,arg2); 
+        result = (UnaryFunction1D< void > *)new SwigDirector_UnaryFunction1DVoid(arg1,arg2); 
       } else {
-        result = (UnaryFunction1D<void > *)new UnaryFunction1D<void >(arg2); 
+        result = (UnaryFunction1D< void > *)new UnaryFunction1D< void >(arg2); 
       }
       
     }
@@ -66707,7 +65562,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVoid__SWIG_1(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTvoid_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DT_void_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -66720,7 +65575,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVoid(PyObject *self, PyObject *arg
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -66746,24 +65601,27 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVoid(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DVoid'.\n  Possible C/C++ prototypes are:\n    UnaryFunction1D<(void)>(PyObject *)\n    UnaryFunction1D<(void)>(PyObject *,IntegrationType)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DVoid'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    UnaryFunction1D< void >(PyObject *)\n"
+    "    UnaryFunction1D< void >(PyObject *,IntegrationType)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction1DVoid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<void > *arg1 = (UnaryFunction1D<void > *) 0 ;
+  UnaryFunction1D< void > *arg1 = (UnaryFunction1D< void > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction1DVoid",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTvoid_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_void_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DVoid" "', argument " "1"" of type '" "UnaryFunction1D<void > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DVoid" "', argument " "1"" of type '" "UnaryFunction1D< void > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<void > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< void > * >(argp1);
   {
     try {
       delete arg1;
@@ -66785,7 +65643,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVoid_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<void > *arg1 = (UnaryFunction1D<void > *) 0 ;
+  UnaryFunction1D< void > *arg1 = (UnaryFunction1D< void > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -66794,20 +65652,20 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVoid_getName(PyObject *SWIGUNUSEDPARM(
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DVoid_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTvoid_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_void_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVoid_getName" "', argument " "1"" of type '" "UnaryFunction1D<void > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVoid_getName" "', argument " "1"" of type '" "UnaryFunction1D< void > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<void > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< void > * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
   upcall = (director && (director->swig_get_self()==obj0));
   try {
     {
       try {
         if (upcall) {
-          result = ((UnaryFunction1D<void > const *)arg1)->UnaryFunction1D<void >::getName();
+          result = ((UnaryFunction1D< void > const *)arg1)->UnaryFunction1D< void >::getName();
         } else {
-          result = ((UnaryFunction1D<void > const *)arg1)->getName();
+          result = ((UnaryFunction1D< void > const *)arg1)->getName();
         }
       }
       //    catch (Swig::DirectorTypeMismatch&) {
@@ -66829,7 +65687,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVoid___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<void > *arg1 = (UnaryFunction1D<void > *) 0 ;
+  UnaryFunction1D< void > *arg1 = (UnaryFunction1D< void > *) 0 ;
   Interface1D *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -66841,11 +65699,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVoid___call__(PyObject *SWIGUNUSEDPARM
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DVoid___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTvoid_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_void_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVoid___call__" "', argument " "1"" of type '" "UnaryFunction1D<void > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVoid___call__" "', argument " "1"" of type '" "UnaryFunction1D< void > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<void > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< void > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction1DVoid___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
@@ -66860,7 +65718,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVoid___call__(PyObject *SWIGUNUSEDPARM
     {
       try {
         if (upcall) {
-          (arg1)->UnaryFunction1D<void >::operator ()(*arg2);
+          (arg1)->UnaryFunction1D< void >::operator ()(*arg2);
         } else {
           (arg1)->operator ()(*arg2);
         }
@@ -66884,7 +65742,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVoid_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<void > *arg1 = (UnaryFunction1D<void > *) 0 ;
+  UnaryFunction1D< void > *arg1 = (UnaryFunction1D< void > *) 0 ;
   IntegrationType arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -66894,11 +65752,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVoid_setIntegrationType(PyObject *SWIG
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DVoid_setIntegrationType",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTvoid_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_void_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVoid_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<void > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVoid_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D< void > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<void > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< void > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "UnaryFunction1DVoid_setIntegrationType" "', argument " "2"" of type '" "IntegrationType""'");
@@ -66924,21 +65782,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVoid_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<void > *arg1 = (UnaryFunction1D<void > *) 0 ;
+  UnaryFunction1D< void > *arg1 = (UnaryFunction1D< void > *) 0 ;
   IntegrationType result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DVoid_getIntegrationType",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTvoid_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_void_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVoid_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<void > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVoid_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D< void > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<void > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< void > * >(argp1);
   {
     try {
-      result = (IntegrationType)((UnaryFunction1D<void > const *)arg1)->getIntegrationType();
+      result = (IntegrationType)((UnaryFunction1D< void > const *)arg1)->getIntegrationType();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -66956,17 +65814,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_disown_UnaryFunction1DVoid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<void > *arg1 = (UnaryFunction1D<void > *) 0 ;
+  UnaryFunction1D< void > *arg1 = (UnaryFunction1D< void > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction1DVoid",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTvoid_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_void_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction1DVoid" "', argument " "1"" of type '" "UnaryFunction1D<void > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction1DVoid" "', argument " "1"" of type '" "UnaryFunction1D< void > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<void > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< void > * >(argp1);
   {
     Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
@@ -66981,15 +65839,15 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction1DVoid_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DTvoid_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DT_void_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_UnaryFunction1DUnsigned__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  UnaryFunction1D<unsigned int > *result = 0 ;
+  UnaryFunction1D< unsigned int > *result = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction1DUnsigned",&obj0)) SWIG_fail;
@@ -66998,9 +65856,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DUnsigned__SWIG_0(PyObject *SWIGUNU
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction1D<unsigned int > *)new SwigDirector_UnaryFunction1DUnsigned(arg1); 
+        result = (UnaryFunction1D< unsigned int > *)new SwigDirector_UnaryFunction1DUnsigned(arg1); 
       } else {
-        result = (UnaryFunction1D<unsigned int > *)new UnaryFunction1D<unsigned int >(); 
+        result = (UnaryFunction1D< unsigned int > *)new UnaryFunction1D< unsigned int >(); 
       }
       
     }
@@ -67011,7 +65869,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DUnsigned__SWIG_0(PyObject *SWIGUNU
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTunsigned_int_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DT_unsigned_int_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -67022,7 +65880,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DUnsigned__SWIG_1(PyObject *SWIGUNU
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
   IntegrationType arg2 ;
-  UnaryFunction1D<unsigned int > *result = 0 ;
+  UnaryFunction1D< unsigned int > *result = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
@@ -67039,9 +65897,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DUnsigned__SWIG_1(PyObject *SWIGUNU
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction1D<unsigned int > *)new SwigDirector_UnaryFunction1DUnsigned(arg1,arg2); 
+        result = (UnaryFunction1D< unsigned int > *)new SwigDirector_UnaryFunction1DUnsigned(arg1,arg2); 
       } else {
-        result = (UnaryFunction1D<unsigned int > *)new UnaryFunction1D<unsigned int >(arg2); 
+        result = (UnaryFunction1D< unsigned int > *)new UnaryFunction1D< unsigned int >(arg2); 
       }
       
     }
@@ -67052,7 +65910,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DUnsigned__SWIG_1(PyObject *SWIGUNU
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTunsigned_int_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DT_unsigned_int_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -67065,7 +65923,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DUnsigned(PyObject *self, PyObject
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -67091,24 +65949,27 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DUnsigned(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DUnsigned'.\n  Possible C/C++ prototypes are:\n    UnaryFunction1D<(unsigned int)>(PyObject *)\n    UnaryFunction1D<(unsigned int)>(PyObject *,IntegrationType)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DUnsigned'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    UnaryFunction1D< unsigned int >(PyObject *)\n"
+    "    UnaryFunction1D< unsigned int >(PyObject *,IntegrationType)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction1DUnsigned(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<unsigned int > *arg1 = (UnaryFunction1D<unsigned int > *) 0 ;
+  UnaryFunction1D< unsigned int > *arg1 = (UnaryFunction1D< unsigned int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction1DUnsigned",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTunsigned_int_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_unsigned_int_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DUnsigned" "', argument " "1"" of type '" "UnaryFunction1D<unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DUnsigned" "', argument " "1"" of type '" "UnaryFunction1D< unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< unsigned int > * >(argp1);
   {
     try {
       delete arg1;
@@ -67130,7 +65991,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DUnsigned_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<unsigned int > *arg1 = (UnaryFunction1D<unsigned int > *) 0 ;
+  UnaryFunction1D< unsigned int > *arg1 = (UnaryFunction1D< unsigned int > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -67139,20 +66000,20 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DUnsigned_getName(PyObject *SWIGUNUSEDP
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DUnsigned_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DUnsigned_getName" "', argument " "1"" of type '" "UnaryFunction1D<unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DUnsigned_getName" "', argument " "1"" of type '" "UnaryFunction1D< unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< unsigned int > * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
   upcall = (director && (director->swig_get_self()==obj0));
   try {
     {
       try {
         if (upcall) {
-          result = ((UnaryFunction1D<unsigned int > const *)arg1)->UnaryFunction1D<unsigned int >::getName();
+          result = ((UnaryFunction1D< unsigned int > const *)arg1)->UnaryFunction1D< unsigned int >::getName();
         } else {
-          result = ((UnaryFunction1D<unsigned int > const *)arg1)->getName();
+          result = ((UnaryFunction1D< unsigned int > const *)arg1)->getName();
         }
       }
       //    catch (Swig::DirectorTypeMismatch&) {
@@ -67174,7 +66035,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DUnsigned___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<unsigned int > *arg1 = (UnaryFunction1D<unsigned int > *) 0 ;
+  UnaryFunction1D< unsigned int > *arg1 = (UnaryFunction1D< unsigned int > *) 0 ;
   Interface1D *arg2 = 0 ;
   unsigned int result;
   void *argp1 = 0 ;
@@ -67187,11 +66048,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DUnsigned___call__(PyObject *SWIGUNUSED
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DUnsigned___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DUnsigned___call__" "', argument " "1"" of type '" "UnaryFunction1D<unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DUnsigned___call__" "', argument " "1"" of type '" "UnaryFunction1D< unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< unsigned int > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction1DUnsigned___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
@@ -67206,7 +66067,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DUnsigned___call__(PyObject *SWIGUNUSED
     {
       try {
         if (upcall) {
-          result = (unsigned int)(arg1)->UnaryFunction1D<unsigned int >::operator ()(*arg2);
+          result = (unsigned int)(arg1)->UnaryFunction1D< unsigned int >::operator ()(*arg2);
         } else {
           result = (unsigned int)(arg1)->operator ()(*arg2);
         }
@@ -67230,7 +66091,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DUnsigned_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<unsigned int > *arg1 = (UnaryFunction1D<unsigned int > *) 0 ;
+  UnaryFunction1D< unsigned int > *arg1 = (UnaryFunction1D< unsigned int > *) 0 ;
   IntegrationType arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -67240,11 +66101,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DUnsigned_setIntegrationType(PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DUnsigned_setIntegrationType",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DUnsigned_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DUnsigned_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D< unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< unsigned int > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "UnaryFunction1DUnsigned_setIntegrationType" "', argument " "2"" of type '" "IntegrationType""'");
@@ -67270,21 +66131,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DUnsigned_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<unsigned int > *arg1 = (UnaryFunction1D<unsigned int > *) 0 ;
+  UnaryFunction1D< unsigned int > *arg1 = (UnaryFunction1D< unsigned int > *) 0 ;
   IntegrationType result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DUnsigned_getIntegrationType",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DUnsigned_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DUnsigned_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D< unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< unsigned int > * >(argp1);
   {
     try {
-      result = (IntegrationType)((UnaryFunction1D<unsigned int > const *)arg1)->getIntegrationType();
+      result = (IntegrationType)((UnaryFunction1D< unsigned int > const *)arg1)->getIntegrationType();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -67302,17 +66163,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_disown_UnaryFunction1DUnsigned(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<unsigned int > *arg1 = (UnaryFunction1D<unsigned int > *) 0 ;
+  UnaryFunction1D< unsigned int > *arg1 = (UnaryFunction1D< unsigned int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction1DUnsigned",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction1DUnsigned" "', argument " "1"" of type '" "UnaryFunction1D<unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction1DUnsigned" "', argument " "1"" of type '" "UnaryFunction1D< unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< unsigned int > * >(argp1);
   {
     Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
@@ -67327,15 +66188,15 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction1DUnsigned_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DTunsigned_int_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DT_unsigned_int_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_UnaryFunction1DFloat__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  UnaryFunction1D<float > *result = 0 ;
+  UnaryFunction1D< float > *result = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction1DFloat",&obj0)) SWIG_fail;
@@ -67344,9 +66205,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DFloat__SWIG_0(PyObject *SWIGUNUSED
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction1D<float > *)new SwigDirector_UnaryFunction1DFloat(arg1); 
+        result = (UnaryFunction1D< float > *)new SwigDirector_UnaryFunction1DFloat(arg1); 
       } else {
-        result = (UnaryFunction1D<float > *)new UnaryFunction1D<float >(); 
+        result = (UnaryFunction1D< float > *)new UnaryFunction1D< float >(); 
       }
       
     }
@@ -67357,7 +66218,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DFloat__SWIG_0(PyObject *SWIGUNUSED
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTfloat_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DT_float_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -67368,7 +66229,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DFloat__SWIG_1(PyObject *SWIGUNUSED
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
   IntegrationType arg2 ;
-  UnaryFunction1D<float > *result = 0 ;
+  UnaryFunction1D< float > *result = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
@@ -67385,9 +66246,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DFloat__SWIG_1(PyObject *SWIGUNUSED
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction1D<float > *)new SwigDirector_UnaryFunction1DFloat(arg1,arg2); 
+        result = (UnaryFunction1D< float > *)new SwigDirector_UnaryFunction1DFloat(arg1,arg2); 
       } else {
-        result = (UnaryFunction1D<float > *)new UnaryFunction1D<float >(arg2); 
+        result = (UnaryFunction1D< float > *)new UnaryFunction1D< float >(arg2); 
       }
       
     }
@@ -67398,7 +66259,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DFloat__SWIG_1(PyObject *SWIGUNUSED
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTfloat_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DT_float_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -67411,7 +66272,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DFloat(PyObject *self, PyObject *ar
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -67437,24 +66298,27 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DFloat(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DFloat'.\n  Possible C/C++ prototypes are:\n    UnaryFunction1D<(float)>(PyObject *)\n    UnaryFunction1D<(float)>(PyObject *,IntegrationType)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DFloat'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    UnaryFunction1D< float >(PyObject *)\n"
+    "    UnaryFunction1D< float >(PyObject *,IntegrationType)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction1DFloat(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<float > *arg1 = (UnaryFunction1D<float > *) 0 ;
+  UnaryFunction1D< float > *arg1 = (UnaryFunction1D< float > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction1DFloat",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTfloat_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_float_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DFloat" "', argument " "1"" of type '" "UnaryFunction1D<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DFloat" "', argument " "1"" of type '" "UnaryFunction1D< float > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<float > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< float > * >(argp1);
   {
     try {
       delete arg1;
@@ -67476,7 +66340,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DFloat_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<float > *arg1 = (UnaryFunction1D<float > *) 0 ;
+  UnaryFunction1D< float > *arg1 = (UnaryFunction1D< float > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -67485,20 +66349,20 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DFloat_getName(PyObject *SWIGUNUSEDPARM
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DFloat_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DFloat_getName" "', argument " "1"" of type '" "UnaryFunction1D<float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DFloat_getName" "', argument " "1"" of type '" "UnaryFunction1D< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<float > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< float > * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
   upcall = (director && (director->swig_get_self()==obj0));
   try {
     {
       try {
         if (upcall) {
-          result = ((UnaryFunction1D<float > const *)arg1)->UnaryFunction1D<float >::getName();
+          result = ((UnaryFunction1D< float > const *)arg1)->UnaryFunction1D< float >::getName();
         } else {
-          result = ((UnaryFunction1D<float > const *)arg1)->getName();
+          result = ((UnaryFunction1D< float > const *)arg1)->getName();
         }
       }
       //    catch (Swig::DirectorTypeMismatch&) {
@@ -67520,7 +66384,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DFloat___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<float > *arg1 = (UnaryFunction1D<float > *) 0 ;
+  UnaryFunction1D< float > *arg1 = (UnaryFunction1D< float > *) 0 ;
   Interface1D *arg2 = 0 ;
   float result;
   void *argp1 = 0 ;
@@ -67533,11 +66397,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DFloat___call__(PyObject *SWIGUNUSEDPAR
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DFloat___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DFloat___call__" "', argument " "1"" of type '" "UnaryFunction1D<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DFloat___call__" "', argument " "1"" of type '" "UnaryFunction1D< float > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<float > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< float > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction1DFloat___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
@@ -67552,7 +66416,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DFloat___call__(PyObject *SWIGUNUSEDPAR
     {
       try {
         if (upcall) {
-          result = (float)(arg1)->UnaryFunction1D<float >::operator ()(*arg2);
+          result = (float)(arg1)->UnaryFunction1D< float >::operator ()(*arg2);
         } else {
           result = (float)(arg1)->operator ()(*arg2);
         }
@@ -67576,7 +66440,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DFloat_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<float > *arg1 = (UnaryFunction1D<float > *) 0 ;
+  UnaryFunction1D< float > *arg1 = (UnaryFunction1D< float > *) 0 ;
   IntegrationType arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -67586,11 +66450,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DFloat_setIntegrationType(PyObject *SWI
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DFloat_setIntegrationType",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DFloat_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DFloat_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D< float > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<float > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< float > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "UnaryFunction1DFloat_setIntegrationType" "', argument " "2"" of type '" "IntegrationType""'");
@@ -67616,21 +66480,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DFloat_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<float > *arg1 = (UnaryFunction1D<float > *) 0 ;
+  UnaryFunction1D< float > *arg1 = (UnaryFunction1D< float > *) 0 ;
   IntegrationType result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DFloat_getIntegrationType",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DFloat_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DFloat_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<float > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< float > * >(argp1);
   {
     try {
-      result = (IntegrationType)((UnaryFunction1D<float > const *)arg1)->getIntegrationType();
+      result = (IntegrationType)((UnaryFunction1D< float > const *)arg1)->getIntegrationType();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -67648,17 +66512,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_disown_UnaryFunction1DFloat(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<float > *arg1 = (UnaryFunction1D<float > *) 0 ;
+  UnaryFunction1D< float > *arg1 = (UnaryFunction1D< float > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction1DFloat",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction1DFloat" "', argument " "1"" of type '" "UnaryFunction1D<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction1DFloat" "', argument " "1"" of type '" "UnaryFunction1D< float > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<float > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< float > * >(argp1);
   {
     Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
@@ -67673,15 +66537,15 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction1DFloat_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DTfloat_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DT_float_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_UnaryFunction1DDouble__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  UnaryFunction1D<double > *result = 0 ;
+  UnaryFunction1D< double > *result = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction1DDouble",&obj0)) SWIG_fail;
@@ -67690,9 +66554,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DDouble__SWIG_0(PyObject *SWIGUNUSE
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction1D<double > *)new SwigDirector_UnaryFunction1DDouble(arg1); 
+        result = (UnaryFunction1D< double > *)new SwigDirector_UnaryFunction1DDouble(arg1); 
       } else {
-        result = (UnaryFunction1D<double > *)new UnaryFunction1D<double >(); 
+        result = (UnaryFunction1D< double > *)new UnaryFunction1D< double >(); 
       }
       
     }
@@ -67703,7 +66567,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DDouble__SWIG_0(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTdouble_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DT_double_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -67714,7 +66578,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DDouble__SWIG_1(PyObject *SWIGUNUSE
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
   IntegrationType arg2 ;
-  UnaryFunction1D<double > *result = 0 ;
+  UnaryFunction1D< double > *result = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
@@ -67731,9 +66595,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DDouble__SWIG_1(PyObject *SWIGUNUSE
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction1D<double > *)new SwigDirector_UnaryFunction1DDouble(arg1,arg2); 
+        result = (UnaryFunction1D< double > *)new SwigDirector_UnaryFunction1DDouble(arg1,arg2); 
       } else {
-        result = (UnaryFunction1D<double > *)new UnaryFunction1D<double >(arg2); 
+        result = (UnaryFunction1D< double > *)new UnaryFunction1D< double >(arg2); 
       }
       
     }
@@ -67744,7 +66608,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DDouble__SWIG_1(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTdouble_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DT_double_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -67757,7 +66621,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DDouble(PyObject *self, PyObject *a
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -67783,24 +66647,27 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DDouble(PyObject *self, PyObject *a
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DDouble'.\n  Possible C/C++ prototypes are:\n    UnaryFunction1D<(double)>(PyObject *)\n    UnaryFunction1D<(double)>(PyObject *,IntegrationType)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DDouble'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    UnaryFunction1D< double >(PyObject *)\n"
+    "    UnaryFunction1D< double >(PyObject *,IntegrationType)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction1DDouble(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<double > *arg1 = (UnaryFunction1D<double > *) 0 ;
+  UnaryFunction1D< double > *arg1 = (UnaryFunction1D< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction1DDouble",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTdouble_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_double_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DDouble" "', argument " "1"" of type '" "UnaryFunction1D<double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DDouble" "', argument " "1"" of type '" "UnaryFunction1D< double > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< double > * >(argp1);
   {
     try {
       delete arg1;
@@ -67822,7 +66689,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DDouble_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<double > *arg1 = (UnaryFunction1D<double > *) 0 ;
+  UnaryFunction1D< double > *arg1 = (UnaryFunction1D< double > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -67831,20 +66698,20 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DDouble_getName(PyObject *SWIGUNUSEDPAR
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DDouble_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DDouble_getName" "', argument " "1"" of type '" "UnaryFunction1D<double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DDouble_getName" "', argument " "1"" of type '" "UnaryFunction1D< double > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< double > * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
   upcall = (director && (director->swig_get_self()==obj0));
   try {
     {
       try {
         if (upcall) {
-          result = ((UnaryFunction1D<double > const *)arg1)->UnaryFunction1D<double >::getName();
+          result = ((UnaryFunction1D< double > const *)arg1)->UnaryFunction1D< double >::getName();
         } else {
-          result = ((UnaryFunction1D<double > const *)arg1)->getName();
+          result = ((UnaryFunction1D< double > const *)arg1)->getName();
         }
       }
       //    catch (Swig::DirectorTypeMismatch&) {
@@ -67866,7 +66733,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DDouble___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<double > *arg1 = (UnaryFunction1D<double > *) 0 ;
+  UnaryFunction1D< double > *arg1 = (UnaryFunction1D< double > *) 0 ;
   Interface1D *arg2 = 0 ;
   double result;
   void *argp1 = 0 ;
@@ -67879,11 +66746,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DDouble___call__(PyObject *SWIGUNUSEDPA
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DDouble___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DDouble___call__" "', argument " "1"" of type '" "UnaryFunction1D<double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DDouble___call__" "', argument " "1"" of type '" "UnaryFunction1D< double > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< double > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction1DDouble___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
@@ -67898,7 +66765,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DDouble___call__(PyObject *SWIGUNUSEDPA
     {
       try {
         if (upcall) {
-          result = (double)(arg1)->UnaryFunction1D<double >::operator ()(*arg2);
+          result = (double)(arg1)->UnaryFunction1D< double >::operator ()(*arg2);
         } else {
           result = (double)(arg1)->operator ()(*arg2);
         }
@@ -67922,7 +66789,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DDouble_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<double > *arg1 = (UnaryFunction1D<double > *) 0 ;
+  UnaryFunction1D< double > *arg1 = (UnaryFunction1D< double > *) 0 ;
   IntegrationType arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -67932,11 +66799,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DDouble_setIntegrationType(PyObject *SW
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DDouble_setIntegrationType",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DDouble_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DDouble_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D< double > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< double > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "UnaryFunction1DDouble_setIntegrationType" "', argument " "2"" of type '" "IntegrationType""'");
@@ -67962,21 +66829,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DDouble_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<double > *arg1 = (UnaryFunction1D<double > *) 0 ;
+  UnaryFunction1D< double > *arg1 = (UnaryFunction1D< double > *) 0 ;
   IntegrationType result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DDouble_getIntegrationType",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DDouble_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DDouble_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D< double > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< double > * >(argp1);
   {
     try {
-      result = (IntegrationType)((UnaryFunction1D<double > const *)arg1)->getIntegrationType();
+      result = (IntegrationType)((UnaryFunction1D< double > const *)arg1)->getIntegrationType();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -67994,17 +66861,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_disown_UnaryFunction1DDouble(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<double > *arg1 = (UnaryFunction1D<double > *) 0 ;
+  UnaryFunction1D< double > *arg1 = (UnaryFunction1D< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction1DDouble",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction1DDouble" "', argument " "1"" of type '" "UnaryFunction1D<double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction1DDouble" "', argument " "1"" of type '" "UnaryFunction1D< double > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< double > * >(argp1);
   {
     Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
@@ -68019,15 +66886,15 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction1DDouble_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DTdouble_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DT_double_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec2f__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  UnaryFunction1D<Geometry::Vec2f > *result = 0 ;
+  UnaryFunction1D< Geometry::Vec2f > *result = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction1DVec2f",&obj0)) SWIG_fail;
@@ -68036,9 +66903,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec2f__SWIG_0(PyObject *SWIGUNUSED
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction1D<Geometry::Vec2f > *)new SwigDirector_UnaryFunction1DVec2f(arg1); 
+        result = (UnaryFunction1D< Geometry::Vec2f > *)new SwigDirector_UnaryFunction1DVec2f(arg1); 
       } else {
-        result = (UnaryFunction1D<Geometry::Vec2f > *)new UnaryFunction1D<Geometry::Vec2f >(); 
+        result = (UnaryFunction1D< Geometry::Vec2f > *)new UnaryFunction1D< Geometry::Vec2f >(); 
       }
       
     }
@@ -68049,7 +66916,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec2f__SWIG_0(PyObject *SWIGUNUSED
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec2T_float_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -68060,7 +66927,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec2f__SWIG_1(PyObject *SWIGUNUSED
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
   IntegrationType arg2 ;
-  UnaryFunction1D<Geometry::Vec2f > *result = 0 ;
+  UnaryFunction1D< Geometry::Vec2f > *result = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
@@ -68077,9 +66944,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec2f__SWIG_1(PyObject *SWIGUNUSED
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction1D<Geometry::Vec2f > *)new SwigDirector_UnaryFunction1DVec2f(arg1,arg2); 
+        result = (UnaryFunction1D< Geometry::Vec2f > *)new SwigDirector_UnaryFunction1DVec2f(arg1,arg2); 
       } else {
-        result = (UnaryFunction1D<Geometry::Vec2f > *)new UnaryFunction1D<Geometry::Vec2f >(arg2); 
+        result = (UnaryFunction1D< Geometry::Vec2f > *)new UnaryFunction1D< Geometry::Vec2f >(arg2); 
       }
       
     }
@@ -68090,7 +66957,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec2f__SWIG_1(PyObject *SWIGUNUSED
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec2T_float_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -68103,7 +66970,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec2f(PyObject *self, PyObject *ar
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -68129,24 +66996,27 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec2f(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DVec2f'.\n  Possible C/C++ prototypes are:\n    UnaryFunction1D<(Geometry::Vec2f)>(PyObject *)\n    UnaryFunction1D<(Geometry::Vec2f)>(PyObject *,IntegrationType)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DVec2f'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    UnaryFunction1D< Geometry::Vec2f >(PyObject *)\n"
+    "    UnaryFunction1D< Geometry::Vec2f >(PyObject *,IntegrationType)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction1DVec2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<Geometry::Vec2f > *arg1 = (UnaryFunction1D<Geometry::Vec2f > *) 0 ;
+  UnaryFunction1D< Geometry::Vec2f > *arg1 = (UnaryFunction1D< Geometry::Vec2f > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction1DVec2f",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec2T_float_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DVec2f" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec2f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DVec2f" "', argument " "1"" of type '" "UnaryFunction1D< Geometry::Vec2f > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec2f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< Geometry::Vec2f > * >(argp1);
   {
     try {
       delete arg1;
@@ -68168,7 +67038,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVec2f_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<Geometry::Vec2f > *arg1 = (UnaryFunction1D<Geometry::Vec2f > *) 0 ;
+  UnaryFunction1D< Geometry::Vec2f > *arg1 = (UnaryFunction1D< Geometry::Vec2f > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -68177,20 +67047,20 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVec2f_getName(PyObject *SWIGUNUSEDPARM
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DVec2f_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec2T_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec2f_getName" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec2f > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec2f_getName" "', argument " "1"" of type '" "UnaryFunction1D< Geometry::Vec2f > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec2f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< Geometry::Vec2f > * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
   upcall = (director && (director->swig_get_self()==obj0));
   try {
     {
       try {
         if (upcall) {
-          result = ((UnaryFunction1D<Geometry::Vec2f > const *)arg1)->UnaryFunction1D<VecMat::Vec2<float > >::getName();
+          result = ((UnaryFunction1D< Geometry::Vec2f > const *)arg1)->UnaryFunction1D< VecMat::Vec2< float > >::getName();
         } else {
-          result = ((UnaryFunction1D<Geometry::Vec2f > const *)arg1)->getName();
+          result = ((UnaryFunction1D< Geometry::Vec2f > const *)arg1)->getName();
         }
       }
       //    catch (Swig::DirectorTypeMismatch&) {
@@ -68212,9 +67082,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVec2f___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<Geometry::Vec2f > *arg1 = (UnaryFunction1D<Geometry::Vec2f > *) 0 ;
+  UnaryFunction1D< Geometry::Vec2f > *arg1 = (UnaryFunction1D< Geometry::Vec2f > *) 0 ;
   Interface1D *arg2 = 0 ;
-  VecMat::Vec2<float > result;
+  VecMat::Vec2< float > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -68225,11 +67095,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVec2f___call__(PyObject *SWIGUNUSEDPAR
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DVec2f___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec2T_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec2f___call__" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec2f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec2f___call__" "', argument " "1"" of type '" "UnaryFunction1D< Geometry::Vec2f > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec2f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< Geometry::Vec2f > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction1DVec2f___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
@@ -68244,7 +67114,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVec2f___call__(PyObject *SWIGUNUSEDPAR
     {
       try {
         if (upcall) {
-          result = (arg1)->UnaryFunction1D<VecMat::Vec2<float > >::operator ()(*arg2);
+          result = (arg1)->UnaryFunction1D< VecMat::Vec2< float > >::operator ()(*arg2);
         } else {
           result = (arg1)->operator ()(*arg2);
         }
@@ -68259,7 +67129,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVec2f___call__(PyObject *SWIGUNUSEDPAR
   } catch (Swig::DirectorException&) {
     SWIG_fail;
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<float >(static_cast< const VecMat::Vec2<float >& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< float >(static_cast< const VecMat::Vec2< float >& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -68268,7 +67138,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVec2f_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<Geometry::Vec2f > *arg1 = (UnaryFunction1D<Geometry::Vec2f > *) 0 ;
+  UnaryFunction1D< Geometry::Vec2f > *arg1 = (UnaryFunction1D< Geometry::Vec2f > *) 0 ;
   IntegrationType arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -68278,11 +67148,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVec2f_setIntegrationType(PyObject *SWI
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DVec2f_setIntegrationType",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec2T_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec2f_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec2f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec2f_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D< Geometry::Vec2f > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec2f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< Geometry::Vec2f > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "UnaryFunction1DVec2f_setIntegrationType" "', argument " "2"" of type '" "IntegrationType""'");
@@ -68308,21 +67178,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVec2f_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<Geometry::Vec2f > *arg1 = (UnaryFunction1D<Geometry::Vec2f > *) 0 ;
+  UnaryFunction1D< Geometry::Vec2f > *arg1 = (UnaryFunction1D< Geometry::Vec2f > *) 0 ;
   IntegrationType result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DVec2f_getIntegrationType",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec2T_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec2f_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec2f > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec2f_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D< Geometry::Vec2f > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec2f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< Geometry::Vec2f > * >(argp1);
   {
     try {
-      result = (IntegrationType)((UnaryFunction1D<Geometry::Vec2f > const *)arg1)->getIntegrationType();
+      result = (IntegrationType)((UnaryFunction1D< Geometry::Vec2f > const *)arg1)->getIntegrationType();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -68340,17 +67210,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_disown_UnaryFunction1DVec2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<Geometry::Vec2f > *arg1 = (UnaryFunction1D<Geometry::Vec2f > *) 0 ;
+  UnaryFunction1D< Geometry::Vec2f > *arg1 = (UnaryFunction1D< Geometry::Vec2f > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction1DVec2f",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec2T_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction1DVec2f" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec2f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction1DVec2f" "', argument " "1"" of type '" "UnaryFunction1D< Geometry::Vec2f > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec2f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< Geometry::Vec2f > * >(argp1);
   {
     Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
@@ -68365,15 +67235,15 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction1DVec2f_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec2T_float_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec3f__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  UnaryFunction1D<Geometry::Vec3f > *result = 0 ;
+  UnaryFunction1D< Geometry::Vec3f > *result = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction1DVec3f",&obj0)) SWIG_fail;
@@ -68382,9 +67252,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec3f__SWIG_0(PyObject *SWIGUNUSED
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction1D<Geometry::Vec3f > *)new SwigDirector_UnaryFunction1DVec3f(arg1); 
+        result = (UnaryFunction1D< Geometry::Vec3f > *)new SwigDirector_UnaryFunction1DVec3f(arg1); 
       } else {
-        result = (UnaryFunction1D<Geometry::Vec3f > *)new UnaryFunction1D<Geometry::Vec3f >(); 
+        result = (UnaryFunction1D< Geometry::Vec3f > *)new UnaryFunction1D< Geometry::Vec3f >(); 
       }
       
     }
@@ -68395,7 +67265,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec3f__SWIG_0(PyObject *SWIGUNUSED
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec3T_float_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -68406,7 +67276,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec3f__SWIG_1(PyObject *SWIGUNUSED
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
   IntegrationType arg2 ;
-  UnaryFunction1D<Geometry::Vec3f > *result = 0 ;
+  UnaryFunction1D< Geometry::Vec3f > *result = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
@@ -68423,9 +67293,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec3f__SWIG_1(PyObject *SWIGUNUSED
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction1D<Geometry::Vec3f > *)new SwigDirector_UnaryFunction1DVec3f(arg1,arg2); 
+        result = (UnaryFunction1D< Geometry::Vec3f > *)new SwigDirector_UnaryFunction1DVec3f(arg1,arg2); 
       } else {
-        result = (UnaryFunction1D<Geometry::Vec3f > *)new UnaryFunction1D<Geometry::Vec3f >(arg2); 
+        result = (UnaryFunction1D< Geometry::Vec3f > *)new UnaryFunction1D< Geometry::Vec3f >(arg2); 
       }
       
     }
@@ -68436,7 +67306,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec3f__SWIG_1(PyObject *SWIGUNUSED
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec3T_float_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -68449,7 +67319,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec3f(PyObject *self, PyObject *ar
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -68475,24 +67345,27 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec3f(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DVec3f'.\n  Possible C/C++ prototypes are:\n    UnaryFunction1D<(Geometry::Vec3f)>(PyObject *)\n    UnaryFunction1D<(Geometry::Vec3f)>(PyObject *,IntegrationType)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DVec3f'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    UnaryFunction1D< Geometry::Vec3f >(PyObject *)\n"
+    "    UnaryFunction1D< Geometry::Vec3f >(PyObject *,IntegrationType)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction1DVec3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<Geometry::Vec3f > *arg1 = (UnaryFunction1D<Geometry::Vec3f > *) 0 ;
+  UnaryFunction1D< Geometry::Vec3f > *arg1 = (UnaryFunction1D< Geometry::Vec3f > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction1DVec3f",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec3T_float_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DVec3f" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec3f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DVec3f" "', argument " "1"" of type '" "UnaryFunction1D< Geometry::Vec3f > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec3f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< Geometry::Vec3f > * >(argp1);
   {
     try {
       delete arg1;
@@ -68514,7 +67387,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVec3f_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<Geometry::Vec3f > *arg1 = (UnaryFunction1D<Geometry::Vec3f > *) 0 ;
+  UnaryFunction1D< Geometry::Vec3f > *arg1 = (UnaryFunction1D< Geometry::Vec3f > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -68523,20 +67396,20 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVec3f_getName(PyObject *SWIGUNUSEDPARM
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DVec3f_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec3T_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec3f_getName" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec3f > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec3f_getName" "', argument " "1"" of type '" "UnaryFunction1D< Geometry::Vec3f > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec3f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< Geometry::Vec3f > * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
   upcall = (director && (director->swig_get_self()==obj0));
   try {
     {
       try {
         if (upcall) {
-          result = ((UnaryFunction1D<Geometry::Vec3f > const *)arg1)->UnaryFunction1D<VecMat::Vec3<float > >::getName();
+          result = ((UnaryFunction1D< Geometry::Vec3f > const *)arg1)->UnaryFunction1D< VecMat::Vec3< float > >::getName();
         } else {
-          result = ((UnaryFunction1D<Geometry::Vec3f > const *)arg1)->getName();
+          result = ((UnaryFunction1D< Geometry::Vec3f > const *)arg1)->getName();
         }
       }
       //    catch (Swig::DirectorTypeMismatch&) {
@@ -68558,9 +67431,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVec3f___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<Geometry::Vec3f > *arg1 = (UnaryFunction1D<Geometry::Vec3f > *) 0 ;
+  UnaryFunction1D< Geometry::Vec3f > *arg1 = (UnaryFunction1D< Geometry::Vec3f > *) 0 ;
   Interface1D *arg2 = 0 ;
-  VecMat::Vec3<float > result;
+  VecMat::Vec3< float > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -68571,11 +67444,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVec3f___call__(PyObject *SWIGUNUSEDPAR
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DVec3f___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec3T_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec3f___call__" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec3f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec3f___call__" "', argument " "1"" of type '" "UnaryFunction1D< Geometry::Vec3f > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec3f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< Geometry::Vec3f > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction1DVec3f___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
@@ -68590,7 +67463,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVec3f___call__(PyObject *SWIGUNUSEDPAR
     {
       try {
         if (upcall) {
-          result = (arg1)->UnaryFunction1D<VecMat::Vec3<float > >::operator ()(*arg2);
+          result = (arg1)->UnaryFunction1D< VecMat::Vec3< float > >::operator ()(*arg2);
         } else {
           result = (arg1)->operator ()(*arg2);
         }
@@ -68605,7 +67478,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVec3f___call__(PyObject *SWIGUNUSEDPAR
   } catch (Swig::DirectorException&) {
     SWIG_fail;
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<float >(static_cast< const VecMat::Vec3<float >& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< float >(static_cast< const VecMat::Vec3< float >& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -68614,7 +67487,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVec3f_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<Geometry::Vec3f > *arg1 = (UnaryFunction1D<Geometry::Vec3f > *) 0 ;
+  UnaryFunction1D< Geometry::Vec3f > *arg1 = (UnaryFunction1D< Geometry::Vec3f > *) 0 ;
   IntegrationType arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -68624,11 +67497,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVec3f_setIntegrationType(PyObject *SWI
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DVec3f_setIntegrationType",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec3T_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec3f_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec3f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec3f_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D< Geometry::Vec3f > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec3f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< Geometry::Vec3f > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "UnaryFunction1DVec3f_setIntegrationType" "', argument " "2"" of type '" "IntegrationType""'");
@@ -68654,21 +67527,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVec3f_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<Geometry::Vec3f > *arg1 = (UnaryFunction1D<Geometry::Vec3f > *) 0 ;
+  UnaryFunction1D< Geometry::Vec3f > *arg1 = (UnaryFunction1D< Geometry::Vec3f > *) 0 ;
   IntegrationType result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DVec3f_getIntegrationType",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec3T_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec3f_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec3f > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec3f_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D< Geometry::Vec3f > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec3f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< Geometry::Vec3f > * >(argp1);
   {
     try {
-      result = (IntegrationType)((UnaryFunction1D<Geometry::Vec3f > const *)arg1)->getIntegrationType();
+      result = (IntegrationType)((UnaryFunction1D< Geometry::Vec3f > const *)arg1)->getIntegrationType();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -68686,17 +67559,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_disown_UnaryFunction1DVec3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<Geometry::Vec3f > *arg1 = (UnaryFunction1D<Geometry::Vec3f > *) 0 ;
+  UnaryFunction1D< Geometry::Vec3f > *arg1 = (UnaryFunction1D< Geometry::Vec3f > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction1DVec3f",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec3T_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction1DVec3f" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec3f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction1DVec3f" "', argument " "1"" of type '" "UnaryFunction1D< Geometry::Vec3f > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec3f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< Geometry::Vec3f > * >(argp1);
   {
     Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
@@ -68711,19 +67584,19 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction1DVec3f_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec3T_float_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVectorViewShape__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<std::vector<ViewShape * > > *result = 0 ;
+  UnaryFunction1D< std::vector< ViewShape * > > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_UnaryFunction1DVectorViewShape")) SWIG_fail;
   {
     try {
-      result = (UnaryFunction1D<std::vector<ViewShape * > > *)new UnaryFunction1D<std::vector<ViewShape * > >();
+      result = (UnaryFunction1D< std::vector< ViewShape * > > *)new UnaryFunction1D< std::vector< ViewShape * > >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -68732,7 +67605,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVectorViewShape__SWIG_0(PyObject *
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -68742,7 +67615,7 @@ fail:
 SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVectorViewShape__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IntegrationType arg1 ;
-  UnaryFunction1D<std::vector<ViewShape * > > *result = 0 ;
+  UnaryFunction1D< std::vector< ViewShape * > > *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -68755,7 +67628,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVectorViewShape__SWIG_1(PyObject *
   arg1 = static_cast< IntegrationType >(val1);
   {
     try {
-      result = (UnaryFunction1D<std::vector<ViewShape * > > *)new UnaryFunction1D<std::vector<ViewShape * > >(arg1);
+      result = (UnaryFunction1D< std::vector< ViewShape * > > *)new UnaryFunction1D< std::vector< ViewShape * > >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -68764,7 +67637,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVectorViewShape__SWIG_1(PyObject *
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -68777,7 +67650,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVectorViewShape(PyObject *self, Py
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -68796,24 +67669,27 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVectorViewShape(PyObject *self, Py
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DVectorViewShape'.\n  Possible C/C++ prototypes are:\n    UnaryFunction1D<(std::vector<(p.ViewShape)>)>()\n    UnaryFunction1D<(std::vector<(p.ViewShape)>)>(IntegrationType)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DVectorViewShape'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    UnaryFunction1D< std::vector< ViewShape * > >()\n"
+    "    UnaryFunction1D< std::vector< ViewShape * > >(IntegrationType)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction1DVectorViewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<std::vector<ViewShape * > > *arg1 = (UnaryFunction1D<std::vector<ViewShape * > > *) 0 ;
+  UnaryFunction1D< std::vector< ViewShape * > > *arg1 = (UnaryFunction1D< std::vector< ViewShape * > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction1DVectorViewShape",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DVectorViewShape" "', argument " "1"" of type '" "UnaryFunction1D<std::vector<ViewShape * > > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DVectorViewShape" "', argument " "1"" of type '" "UnaryFunction1D< std::vector< ViewShape * > > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<std::vector<ViewShape * > > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< std::vector< ViewShape * > > * >(argp1);
   {
     try {
       delete arg1;
@@ -68835,21 +67711,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVectorViewShape_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<std::vector<ViewShape * > > *arg1 = (UnaryFunction1D<std::vector<ViewShape * > > *) 0 ;
+  UnaryFunction1D< std::vector< ViewShape * > > *arg1 = (UnaryFunction1D< std::vector< ViewShape * > > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DVectorViewShape_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVectorViewShape_getName" "', argument " "1"" of type '" "UnaryFunction1D<std::vector<ViewShape * > > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVectorViewShape_getName" "', argument " "1"" of type '" "UnaryFunction1D< std::vector< ViewShape * > > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<std::vector<ViewShape * > > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< std::vector< ViewShape * > > * >(argp1);
   {
     try {
-      result = ((UnaryFunction1D<std::vector<ViewShape * > > const *)arg1)->getName();
+      result = ((UnaryFunction1D< std::vector< ViewShape * > > const *)arg1)->getName();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -68867,9 +67743,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVectorViewShape___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<std::vector<ViewShape * > > *arg1 = (UnaryFunction1D<std::vector<ViewShape * > > *) 0 ;
+  UnaryFunction1D< std::vector< ViewShape * > > *arg1 = (UnaryFunction1D< std::vector< ViewShape * > > *) 0 ;
   Interface1D *arg2 = 0 ;
-  std::vector<ViewShape *,std::allocator<ViewShape * > > result;
+  std::vector< ViewShape *,std::allocator< ViewShape * > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -68878,11 +67754,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVectorViewShape___call__(PyObject *SWI
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DVectorViewShape___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVectorViewShape___call__" "', argument " "1"" of type '" "UnaryFunction1D<std::vector<ViewShape * > > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVectorViewShape___call__" "', argument " "1"" of type '" "UnaryFunction1D< std::vector< ViewShape * > > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<std::vector<ViewShape * > > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< std::vector< ViewShape * > > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction1DVectorViewShape___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
@@ -68902,7 +67778,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVectorViewShape___call__(PyObject *SWI
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = swig::from(static_cast< std::vector<ViewShape*,std::allocator<ViewShape * > > >(result));
+  resultobj = swig::from(static_cast< std::vector<ViewShape*,std::allocator< ViewShape * > > >(result));
   return resultobj;
 fail:
   return NULL;
@@ -68911,7 +67787,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVectorViewShape_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<std::vector<ViewShape * > > *arg1 = (UnaryFunction1D<std::vector<ViewShape * > > *) 0 ;
+  UnaryFunction1D< std::vector< ViewShape * > > *arg1 = (UnaryFunction1D< std::vector< ViewShape * > > *) 0 ;
   IntegrationType arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -68921,11 +67797,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVectorViewShape_setIntegrationType(PyO
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DVectorViewShape_setIntegrationType",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVectorViewShape_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<std::vector<ViewShape * > > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVectorViewShape_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D< std::vector< ViewShape * > > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<std::vector<ViewShape * > > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< std::vector< ViewShape * > > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "UnaryFunction1DVectorViewShape_setIntegrationType" "', argument " "2"" of type '" "IntegrationType""'");
@@ -68951,21 +67827,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVectorViewShape_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<std::vector<ViewShape * > > *arg1 = (UnaryFunction1D<std::vector<ViewShape * > > *) 0 ;
+  UnaryFunction1D< std::vector< ViewShape * > > *arg1 = (UnaryFunction1D< std::vector< ViewShape * > > *) 0 ;
   IntegrationType result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DVectorViewShape_getIntegrationType",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVectorViewShape_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<std::vector<ViewShape * > > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVectorViewShape_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D< std::vector< ViewShape * > > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<std::vector<ViewShape * > > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< std::vector< ViewShape * > > * >(argp1);
   {
     try {
-      result = (IntegrationType)((UnaryFunction1D<std::vector<ViewShape * > > const *)arg1)->getIntegrationType();
+      result = (IntegrationType)((UnaryFunction1D< std::vector< ViewShape * > > const *)arg1)->getIntegrationType();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -68983,8 +67859,8 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction1DVectorViewShape_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
@@ -69130,7 +68006,7 @@ fail:
 
 SWIGINTERN PyObject *GetXF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetXF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -69196,7 +68072,7 @@ SWIGINTERN PyObject *_wrap_new_GetYF1D(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -69215,7 +68091,10 @@ SWIGINTERN PyObject *_wrap_new_GetYF1D(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetYF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::GetYF1D(IntegrationType)\n    Functions1D::GetYF1D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetYF1D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Functions1D::GetYF1D(IntegrationType)\n"
+    "    Functions1D::GetYF1D()\n");
   return NULL;
 }
 
@@ -69330,7 +68209,7 @@ fail:
 
 SWIGINTERN PyObject *GetYF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetYF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -69396,7 +68275,7 @@ SWIGINTERN PyObject *_wrap_new_GetZF1D(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -69415,7 +68294,10 @@ SWIGINTERN PyObject *_wrap_new_GetZF1D(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetZF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::GetZF1D(IntegrationType)\n    Functions1D::GetZF1D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetZF1D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Functions1D::GetZF1D(IntegrationType)\n"
+    "    Functions1D::GetZF1D()\n");
   return NULL;
 }
 
@@ -69530,7 +68412,7 @@ fail:
 
 SWIGINTERN PyObject *GetZF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetZF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -69596,7 +68478,7 @@ SWIGINTERN PyObject *_wrap_new_GetProjectedXF1D(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -69615,7 +68497,10 @@ SWIGINTERN PyObject *_wrap_new_GetProjectedXF1D(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetProjectedXF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::GetProjectedXF1D(IntegrationType)\n    Functions1D::GetProjectedXF1D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetProjectedXF1D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Functions1D::GetProjectedXF1D(IntegrationType)\n"
+    "    Functions1D::GetProjectedXF1D()\n");
   return NULL;
 }
 
@@ -69730,7 +68615,7 @@ fail:
 
 SWIGINTERN PyObject *GetProjectedXF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetProjectedXF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -69796,7 +68681,7 @@ SWIGINTERN PyObject *_wrap_new_GetProjectedYF1D(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -69815,7 +68700,10 @@ SWIGINTERN PyObject *_wrap_new_GetProjectedYF1D(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetProjectedYF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::GetProjectedYF1D(IntegrationType)\n    Functions1D::GetProjectedYF1D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetProjectedYF1D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Functions1D::GetProjectedYF1D(IntegrationType)\n"
+    "    Functions1D::GetProjectedYF1D()\n");
   return NULL;
 }
 
@@ -69930,7 +68818,7 @@ fail:
 
 SWIGINTERN PyObject *GetProjectedYF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetProjectedYF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -69996,7 +68884,7 @@ SWIGINTERN PyObject *_wrap_new_GetProjectedZF1D(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -70015,7 +68903,10 @@ SWIGINTERN PyObject *_wrap_new_GetProjectedZF1D(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetProjectedZF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::GetProjectedZF1D(IntegrationType)\n    Functions1D::GetProjectedZF1D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetProjectedZF1D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Functions1D::GetProjectedZF1D(IntegrationType)\n"
+    "    Functions1D::GetProjectedZF1D()\n");
   return NULL;
 }
 
@@ -70130,7 +69021,7 @@ fail:
 
 SWIGINTERN PyObject *GetProjectedZF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetProjectedZF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -70196,7 +69087,7 @@ SWIGINTERN PyObject *_wrap_new_Orientation2DF1D(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -70215,7 +69106,10 @@ SWIGINTERN PyObject *_wrap_new_Orientation2DF1D(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Orientation2DF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::Orientation2DF1D(IntegrationType)\n    Functions1D::Orientation2DF1D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Orientation2DF1D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Functions1D::Orientation2DF1D(IntegrationType)\n"
+    "    Functions1D::Orientation2DF1D()\n");
   return NULL;
 }
 
@@ -70289,7 +69183,7 @@ SWIGINTERN PyObject *_wrap_Orientation2DF1D___call__(PyObject *SWIGUNUSEDPARM(se
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -70330,7 +69224,7 @@ fail:
 
 SWIGINTERN PyObject *Orientation2DF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__Orientation2DF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -70396,7 +69290,7 @@ SWIGINTERN PyObject *_wrap_new_Orientation3DF1D(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -70415,7 +69309,10 @@ SWIGINTERN PyObject *_wrap_new_Orientation3DF1D(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Orientation3DF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::Orientation3DF1D(IntegrationType)\n    Functions1D::Orientation3DF1D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Orientation3DF1D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Functions1D::Orientation3DF1D(IntegrationType)\n"
+    "    Functions1D::Orientation3DF1D()\n");
   return NULL;
 }
 
@@ -70489,7 +69386,7 @@ SWIGINTERN PyObject *_wrap_Orientation3DF1D___call__(PyObject *SWIGUNUSEDPARM(se
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -70530,7 +69427,7 @@ fail:
 
 SWIGINTERN PyObject *Orientation3DF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__Orientation3DF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -70596,7 +69493,7 @@ SWIGINTERN PyObject *_wrap_new_ZDiscontinuityF1D(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -70615,7 +69512,10 @@ SWIGINTERN PyObject *_wrap_new_ZDiscontinuityF1D(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ZDiscontinuityF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::ZDiscontinuityF1D(IntegrationType)\n    Functions1D::ZDiscontinuityF1D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ZDiscontinuityF1D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Functions1D::ZDiscontinuityF1D(IntegrationType)\n"
+    "    Functions1D::ZDiscontinuityF1D()\n");
   return NULL;
 }
 
@@ -70730,7 +69630,7 @@ fail:
 
 SWIGINTERN PyObject *ZDiscontinuityF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__ZDiscontinuityF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -70796,7 +69696,7 @@ SWIGINTERN PyObject *_wrap_new_QuantitativeInvisibilityF1D(PyObject *self, PyObj
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -70815,7 +69715,10 @@ SWIGINTERN PyObject *_wrap_new_QuantitativeInvisibilityF1D(PyObject *self, PyObj
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_QuantitativeInvisibilityF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::QuantitativeInvisibilityF1D(IntegrationType)\n    Functions1D::QuantitativeInvisibilityF1D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_QuantitativeInvisibilityF1D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Functions1D::QuantitativeInvisibilityF1D(IntegrationType)\n"
+    "    Functions1D::QuantitativeInvisibilityF1D()\n");
   return NULL;
 }
 
@@ -70930,7 +69833,7 @@ fail:
 
 SWIGINTERN PyObject *QuantitativeInvisibilityF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__QuantitativeInvisibilityF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -70996,7 +69899,7 @@ SWIGINTERN PyObject *_wrap_new_CurveNatureF1D(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -71015,7 +69918,10 @@ SWIGINTERN PyObject *_wrap_new_CurveNatureF1D(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CurveNatureF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::CurveNatureF1D(IntegrationType)\n    Functions1D::CurveNatureF1D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CurveNatureF1D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Functions1D::CurveNatureF1D(IntegrationType)\n"
+    "    Functions1D::CurveNatureF1D()\n");
   return NULL;
 }
 
@@ -71130,7 +70036,7 @@ fail:
 
 SWIGINTERN PyObject *CurveNatureF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__CurveNatureF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -71267,7 +70173,7 @@ fail:
 
 SWIGINTERN PyObject *TimeStampF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__TimeStampF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -71404,7 +70310,7 @@ fail:
 
 SWIGINTERN PyObject *IncrementChainingTimeStampF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__IncrementChainingTimeStampF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -71541,7 +70447,7 @@ fail:
 
 SWIGINTERN PyObject *ChainingTimeStampF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__ChainingTimeStampF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -71607,7 +70513,7 @@ SWIGINTERN PyObject *_wrap_new_Curvature2DAngleF1D(PyObject *self, PyObject *arg
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -71626,7 +70532,10 @@ SWIGINTERN PyObject *_wrap_new_Curvature2DAngleF1D(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Curvature2DAngleF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::Curvature2DAngleF1D(IntegrationType)\n    Functions1D::Curvature2DAngleF1D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Curvature2DAngleF1D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Functions1D::Curvature2DAngleF1D(IntegrationType)\n"
+    "    Functions1D::Curvature2DAngleF1D()\n");
   return NULL;
 }
 
@@ -71741,7 +70650,7 @@ fail:
 
 SWIGINTERN PyObject *Curvature2DAngleF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__Curvature2DAngleF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -71807,7 +70716,7 @@ SWIGINTERN PyObject *_wrap_new_Normal2DF1D(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -71826,7 +70735,10 @@ SWIGINTERN PyObject *_wrap_new_Normal2DF1D(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Normal2DF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::Normal2DF1D(IntegrationType)\n    Functions1D::Normal2DF1D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Normal2DF1D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Functions1D::Normal2DF1D(IntegrationType)\n"
+    "    Functions1D::Normal2DF1D()\n");
   return NULL;
 }
 
@@ -71900,7 +70812,7 @@ SWIGINTERN PyObject *_wrap_Normal2DF1D___call__(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -71941,7 +70853,7 @@ fail:
 
 SWIGINTERN PyObject *Normal2DF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__Normal2DF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -72005,7 +70917,7 @@ SWIGINTERN PyObject *_wrap_GetShapeF1D___call__(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   Functions1D::GetShapeF1D *arg1 = (Functions1D::GetShapeF1D *) 0 ;
   Interface1D *arg2 = 0 ;
-  std::vector<ViewShape *,std::allocator<ViewShape * > > result;
+  std::vector< ViewShape *,std::allocator< ViewShape * > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -72038,7 +70950,7 @@ SWIGINTERN PyObject *_wrap_GetShapeF1D___call__(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = swig::from(static_cast< std::vector<ViewShape*,std::allocator<ViewShape * > > >(result));
+  resultobj = swig::from(static_cast< std::vector<ViewShape*,std::allocator< ViewShape * > > >(result));
   return resultobj;
 fail:
   return NULL;
@@ -72079,7 +70991,7 @@ fail:
 
 SWIGINTERN PyObject *GetShapeF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetShapeF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -72143,7 +71055,7 @@ SWIGINTERN PyObject *_wrap_GetOccludersF1D___call__(PyObject *SWIGUNUSEDPARM(sel
   PyObject *resultobj = 0;
   Functions1D::GetOccludersF1D *arg1 = (Functions1D::GetOccludersF1D *) 0 ;
   Interface1D *arg2 = 0 ;
-  std::vector<ViewShape *,std::allocator<ViewShape * > > result;
+  std::vector< ViewShape *,std::allocator< ViewShape * > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -72176,7 +71088,7 @@ SWIGINTERN PyObject *_wrap_GetOccludersF1D___call__(PyObject *SWIGUNUSEDPARM(sel
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = swig::from(static_cast< std::vector<ViewShape*,std::allocator<ViewShape * > > >(result));
+  resultobj = swig::from(static_cast< std::vector<ViewShape*,std::allocator< ViewShape * > > >(result));
   return resultobj;
 fail:
   return NULL;
@@ -72217,7 +71129,7 @@ fail:
 
 SWIGINTERN PyObject *GetOccludersF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetOccludersF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -72281,7 +71193,7 @@ SWIGINTERN PyObject *_wrap_GetOccludeeF1D___call__(PyObject *SWIGUNUSEDPARM(self
   PyObject *resultobj = 0;
   Functions1D::GetOccludeeF1D *arg1 = (Functions1D::GetOccludeeF1D *) 0 ;
   Interface1D *arg2 = 0 ;
-  std::vector<ViewShape *,std::allocator<ViewShape * > > result;
+  std::vector< ViewShape *,std::allocator< ViewShape * > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -72314,7 +71226,7 @@ SWIGINTERN PyObject *_wrap_GetOccludeeF1D___call__(PyObject *SWIGUNUSEDPARM(self
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = swig::from(static_cast< std::vector<ViewShape*,std::allocator<ViewShape * > > >(result));
+  resultobj = swig::from(static_cast< std::vector<ViewShape*,std::allocator< ViewShape * > > >(result));
   return resultobj;
 fail:
   return NULL;
@@ -72355,7 +71267,7 @@ fail:
 
 SWIGINTERN PyObject *GetOccludeeF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetOccludeeF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -72419,7 +71331,7 @@ SWIGINTERN PyObject *_wrap_Module_setAlwaysRefresh(PyObject *self, PyObject *arg
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -72438,7 +71350,10 @@ SWIGINTERN PyObject *_wrap_Module_setAlwaysRefresh(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Module_setAlwaysRefresh'.\n  Possible C/C++ prototypes are:\n    setAlwaysRefresh(bool)\n    Module::setAlwaysRefresh()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Module_setAlwaysRefresh'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    setAlwaysRefresh(bool)\n"
+    "    Module::setAlwaysRefresh()\n");
   return NULL;
 }
 
@@ -72502,7 +71417,7 @@ SWIGINTERN PyObject *_wrap_Module_setCausal(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -72521,7 +71436,10 @@ SWIGINTERN PyObject *_wrap_Module_setCausal(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Module_setCausal'.\n  Possible C/C++ prototypes are:\n    setCausal(bool)\n    Module::setCausal()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Module_setCausal'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    setCausal(bool)\n"
+    "    Module::setCausal()\n");
   return NULL;
 }
 
@@ -72585,7 +71503,7 @@ SWIGINTERN PyObject *_wrap_Module_setDrawable(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -72604,7 +71522,10 @@ SWIGINTERN PyObject *_wrap_Module_setDrawable(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Module_setDrawable'.\n  Possible C/C++ prototypes are:\n    setDrawable(bool)\n    Module::setDrawable()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Module_setDrawable'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    setDrawable(bool)\n"
+    "    Module::setDrawable()\n");
   return NULL;
 }
 
@@ -72735,7 +71656,7 @@ fail:
 
 SWIGINTERN PyObject *Module_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Module, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -72801,7 +71722,7 @@ SWIGINTERN PyObject *_wrap_new_DensityF0D(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -72820,7 +71741,10 @@ SWIGINTERN PyObject *_wrap_new_DensityF0D(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_DensityF0D'.\n  Possible C/C++ prototypes are:\n    Functions0D::DensityF0D(double)\n    Functions0D::DensityF0D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_DensityF0D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Functions0D::DensityF0D(double)\n"
+    "    Functions0D::DensityF0D()\n");
   return NULL;
 }
 
@@ -72935,7 +71859,7 @@ fail:
 
 SWIGINTERN PyObject *DensityF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__DensityF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -73001,7 +71925,7 @@ SWIGINTERN PyObject *_wrap_new_LocalAverageDepthF0D(PyObject *self, PyObject *ar
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -73020,7 +71944,10 @@ SWIGINTERN PyObject *_wrap_new_LocalAverageDepthF0D(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_LocalAverageDepthF0D'.\n  Possible C/C++ prototypes are:\n    Functions0D::LocalAverageDepthF0D(real)\n    Functions0D::LocalAverageDepthF0D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_LocalAverageDepthF0D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Functions0D::LocalAverageDepthF0D(real)\n"
+    "    Functions0D::LocalAverageDepthF0D()\n");
   return NULL;
 }
 
@@ -73135,7 +72062,7 @@ fail:
 
 SWIGINTERN PyObject *LocalAverageDepthF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__LocalAverageDepthF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -73294,7 +72221,7 @@ fail:
 
 SWIGINTERN PyObject *ReadMapPixelF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__ReadMapPixelF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -73450,7 +72377,7 @@ fail:
 
 SWIGINTERN PyObject *ReadSteerableViewMapPixelF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__ReadSteerableViewMapPixelF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -73597,7 +72524,7 @@ fail:
 
 SWIGINTERN PyObject *ReadCompleteViewMapPixelF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__ReadCompleteViewMapPixelF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -73744,7 +72671,7 @@ fail:
 
 SWIGINTERN PyObject *GetViewMapGradientNormF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetViewMapGradientNormF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -73901,7 +72828,7 @@ SWIGINTERN PyObject *_wrap_new_DensityF1D(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -73958,7 +72885,12 @@ SWIGINTERN PyObject *_wrap_new_DensityF1D(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_DensityF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::DensityF1D(double,IntegrationType,float)\n    Functions1D::DensityF1D(double,IntegrationType)\n    Functions1D::DensityF1D(double)\n    Functions1D::DensityF1D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_DensityF1D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Functions1D::DensityF1D(double,IntegrationType,float)\n"
+    "    Functions1D::DensityF1D(double,IntegrationType)\n"
+    "    Functions1D::DensityF1D(double)\n"
+    "    Functions1D::DensityF1D()\n");
   return NULL;
 }
 
@@ -74073,7 +73005,7 @@ fail:
 
 SWIGINTERN PyObject *DensityF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__DensityF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -74157,7 +73089,7 @@ SWIGINTERN PyObject *_wrap_new_LocalAverageDepthF1D(PyObject *self, PyObject *ar
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -74189,7 +73121,10 @@ SWIGINTERN PyObject *_wrap_new_LocalAverageDepthF1D(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_LocalAverageDepthF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::LocalAverageDepthF1D(real,IntegrationType)\n    Functions1D::LocalAverageDepthF1D(real)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_LocalAverageDepthF1D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Functions1D::LocalAverageDepthF1D(real,IntegrationType)\n"
+    "    Functions1D::LocalAverageDepthF1D(real)\n");
   return NULL;
 }
 
@@ -74304,7 +73239,7 @@ fail:
 
 SWIGINTERN PyObject *LocalAverageDepthF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__LocalAverageDepthF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -74438,7 +73373,7 @@ SWIGINTERN PyObject *_wrap_new_GetCompleteViewMapDensityF1D(PyObject *self, PyOb
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -74492,7 +73427,11 @@ SWIGINTERN PyObject *_wrap_new_GetCompleteViewMapDensityF1D(PyObject *self, PyOb
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetCompleteViewMapDensityF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::GetCompleteViewMapDensityF1D(unsigned int,IntegrationType,float)\n    Functions1D::GetCompleteViewMapDensityF1D(unsigned int,IntegrationType)\n    Functions1D::GetCompleteViewMapDensityF1D(unsigned int)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetCompleteViewMapDensityF1D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Functions1D::GetCompleteViewMapDensityF1D(unsigned int,IntegrationType,float)\n"
+    "    Functions1D::GetCompleteViewMapDensityF1D(unsigned int,IntegrationType)\n"
+    "    Functions1D::GetCompleteViewMapDensityF1D(unsigned int)\n");
   return NULL;
 }
 
@@ -74607,7 +73546,7 @@ fail:
 
 SWIGINTERN PyObject *GetCompleteViewMapDensityF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetCompleteViewMapDensityF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -74768,7 +73707,7 @@ SWIGINTERN PyObject *_wrap_new_GetDirectionalViewMapDensityF1D(PyObject *self, P
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -74840,7 +73779,11 @@ SWIGINTERN PyObject *_wrap_new_GetDirectionalViewMapDensityF1D(PyObject *self, P
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetDirectionalViewMapDensityF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::GetDirectionalViewMapDensityF1D(unsigned int,unsigned int,IntegrationType,float)\n    Functions1D::GetDirectionalViewMapDensityF1D(unsigned int,unsigned int,IntegrationType)\n    Functions1D::GetDirectionalViewMapDensityF1D(unsigned int,unsigned int)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetDirectionalViewMapDensityF1D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Functions1D::GetDirectionalViewMapDensityF1D(unsigned int,unsigned int,IntegrationType,float)\n"
+    "    Functions1D::GetDirectionalViewMapDensityF1D(unsigned int,unsigned int,IntegrationType)\n"
+    "    Functions1D::GetDirectionalViewMapDensityF1D(unsigned int,unsigned int)\n");
   return NULL;
 }
 
@@ -74955,7 +73898,7 @@ fail:
 
 SWIGINTERN PyObject *GetDirectionalViewMapDensityF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetDirectionalViewMapDensityF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -75089,7 +74032,7 @@ SWIGINTERN PyObject *_wrap_new_GetSteerableViewMapDensityF1D(PyObject *self, PyO
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -75143,7 +74086,11 @@ SWIGINTERN PyObject *_wrap_new_GetSteerableViewMapDensityF1D(PyObject *self, PyO
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetSteerableViewMapDensityF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::GetSteerableViewMapDensityF1D(int,IntegrationType,float)\n    Functions1D::GetSteerableViewMapDensityF1D(int,IntegrationType)\n    Functions1D::GetSteerableViewMapDensityF1D(int)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetSteerableViewMapDensityF1D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Functions1D::GetSteerableViewMapDensityF1D(int,IntegrationType,float)\n"
+    "    Functions1D::GetSteerableViewMapDensityF1D(int,IntegrationType)\n"
+    "    Functions1D::GetSteerableViewMapDensityF1D(int)\n");
   return NULL;
 }
 
@@ -75258,7 +74205,7 @@ fail:
 
 SWIGINTERN PyObject *GetSteerableViewMapDensityF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetSteerableViewMapDensityF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -75392,7 +74339,7 @@ SWIGINTERN PyObject *_wrap_new_GetViewMapGradientNormF1D(PyObject *self, PyObjec
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -75446,7 +74393,11 @@ SWIGINTERN PyObject *_wrap_new_GetViewMapGradientNormF1D(PyObject *self, PyObjec
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetViewMapGradientNormF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::GetViewMapGradientNormF1D(int,IntegrationType,float)\n    Functions1D::GetViewMapGradientNormF1D(int,IntegrationType)\n    Functions1D::GetViewMapGradientNormF1D(int)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetViewMapGradientNormF1D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Functions1D::GetViewMapGradientNormF1D(int,IntegrationType,float)\n"
+    "    Functions1D::GetViewMapGradientNormF1D(int,IntegrationType)\n"
+    "    Functions1D::GetViewMapGradientNormF1D(int)\n");
   return NULL;
 }
 
@@ -75561,7 +74512,7 @@ fail:
 
 SWIGINTERN PyObject *GetViewMapGradientNormF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetViewMapGradientNormF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -75806,7 +74757,7 @@ SWIGINTERN PyObject *_wrap_LoadMapCF(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -75866,7 +74817,11 @@ SWIGINTERN PyObject *_wrap_LoadMapCF(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'LoadMapCF'.\n  Possible C/C++ prototypes are:\n    ContextFunctions::LoadMapCF(char const *,char const *,unsigned int,float)\n    ContextFunctions::LoadMapCF(char const *,char const *,unsigned int)\n    ContextFunctions::LoadMapCF(char const *,char const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'LoadMapCF'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    ContextFunctions::LoadMapCF(char const *,char const *,unsigned int,float)\n"
+    "    ContextFunctions::LoadMapCF(char const *,char const *,unsigned int)\n"
+    "    ContextFunctions::LoadMapCF(char const *,char const *)\n");
   return NULL;
 }
 
@@ -76252,7 +75207,7 @@ SWIGINTERN PyObject *_wrap_new_AdjacencyIterator(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -76314,7 +75269,13 @@ SWIGINTERN PyObject *_wrap_new_AdjacencyIterator(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_AdjacencyIterator'.\n  Possible C/C++ prototypes are:\n    AdjacencyIterator()\n    AdjacencyIterator(ViewVertex *,bool,bool)\n    AdjacencyIterator(ViewVertex *,bool)\n    AdjacencyIterator(ViewVertex *)\n    AdjacencyIterator(AdjacencyIterator const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_AdjacencyIterator'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    AdjacencyIterator()\n"
+    "    AdjacencyIterator(ViewVertex *,bool,bool)\n"
+    "    AdjacencyIterator(ViewVertex *,bool)\n"
+    "    AdjacencyIterator(ViewVertex *)\n"
+    "    AdjacencyIterator(AdjacencyIterator const &)\n");
   return NULL;
 }
 
@@ -76919,7 +75880,7 @@ SWIGINTERN PyObject *_wrap_AdjacencyIterator_aShape(PyObject *self, PyObject *ar
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -76943,7 +75904,10 @@ SWIGINTERN PyObject *_wrap_AdjacencyIterator_aShape(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'AdjacencyIterator_aShape'.\n  Possible C/C++ prototypes are:\n    aShape()\n    aShape()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'AdjacencyIterator_aShape'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    aShape(AdjacencyIterator *)\n"
+    "    aShape(AdjacencyIterator const *)\n");
   return NULL;
 }
 
@@ -77047,7 +76011,7 @@ fail:
 SWIGINTERN PyObject *_wrap_AdjacencyIterator_occluders(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
-  std::vector<ViewShape * > *result = 0 ;
+  std::vector< ViewShape * > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -77061,8 +76025,8 @@ SWIGINTERN PyObject *_wrap_AdjacencyIterator_occluders(PyObject *SWIGUNUSEDPARM(
   {
     try {
       {
-        std::vector<ViewShape * > &_result_ref = (*arg1)->occluders();
-        result = (std::vector<ViewShape * > *) &_result_ref;
+        std::vector< ViewShape * > &_result_ref = (*arg1)->occluders();
+        result = (std::vector< ViewShape * > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -77072,7 +76036,7 @@ SWIGINTERN PyObject *_wrap_AdjacencyIterator_occluders(PyObject *SWIGUNUSEDPARM(
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -77647,7 +76611,7 @@ SWIGINTERN PyObject *_wrap_AdjacencyIterator_intersect_2d_area(PyObject *SWIGUNU
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_intersect_2d_area" "', argument " "1"" of type '" "AdjacencyIterator const *""'"); 
   }
   arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AdjacencyIterator_intersect_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
   }
@@ -77655,7 +76619,7 @@ SWIGINTERN PyObject *_wrap_AdjacencyIterator_intersect_2d_area(PyObject *SWIGUNU
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AdjacencyIterator_intersect_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
   }
   arg2 = reinterpret_cast< Geometry::Vec2r * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "AdjacencyIterator_intersect_2d_area" "', argument " "3"" of type '" "Geometry::Vec2r const &""'"); 
   }
@@ -77703,7 +76667,7 @@ SWIGINTERN PyObject *_wrap_AdjacencyIterator_include_in_2d_area(PyObject *SWIGUN
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_include_in_2d_area" "', argument " "1"" of type '" "AdjacencyIterator const *""'"); 
   }
   arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AdjacencyIterator_include_in_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
   }
@@ -77711,7 +76675,7 @@ SWIGINTERN PyObject *_wrap_AdjacencyIterator_include_in_2d_area(PyObject *SWIGUN
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AdjacencyIterator_include_in_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
   }
   arg2 = reinterpret_cast< Geometry::Vec2r * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "AdjacencyIterator_include_in_2d_area" "', argument " "3"" of type '" "Geometry::Vec2r const &""'"); 
   }
@@ -78267,7 +77231,7 @@ SWIGINTERN PyObject *_wrap_AdjacencyIterator_pointsBegin(PyObject *self, PyObjec
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -78297,7 +77261,10 @@ SWIGINTERN PyObject *_wrap_AdjacencyIterator_pointsBegin(PyObject *self, PyObjec
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'AdjacencyIterator_pointsBegin'.\n  Possible C/C++ prototypes are:\n    pointsBegin(float)\n    pointsBegin()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'AdjacencyIterator_pointsBegin'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    pointsBegin(AdjacencyIterator *,float)\n"
+    "    pointsBegin(AdjacencyIterator *)\n");
   return NULL;
 }
 
@@ -78381,7 +77348,7 @@ SWIGINTERN PyObject *_wrap_AdjacencyIterator_pointsEnd(PyObject *self, PyObject
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -78411,7 +77378,10 @@ SWIGINTERN PyObject *_wrap_AdjacencyIterator_pointsEnd(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'AdjacencyIterator_pointsEnd'.\n  Possible C/C++ prototypes are:\n    pointsEnd(float)\n    pointsEnd()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'AdjacencyIterator_pointsEnd'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    pointsEnd(AdjacencyIterator *,float)\n"
+    "    pointsEnd(AdjacencyIterator *)\n");
   return NULL;
 }
 
@@ -78490,7 +77460,7 @@ fail:
 
 SWIGINTERN PyObject *AdjacencyIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_AdjacencyIterator, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -78795,7 +77765,7 @@ SWIGINTERN PyObject *_wrap_new_ChainingIterator(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 5); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -78905,7 +77875,14 @@ SWIGINTERN PyObject *_wrap_new_ChainingIterator(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ChainingIterator'.\n  Possible C/C++ prototypes are:\n    ChainingIterator(PyObject *,bool,bool,ViewEdge *,bool)\n    ChainingIterator(PyObject *,bool,bool,ViewEdge *)\n    ChainingIterator(PyObject *,bool,bool)\n    ChainingIterator(PyObject *,bool)\n    ChainingIterator(PyObject *)\n    ChainingIterator(PyObject *,ChainingIterator const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ChainingIterator'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    ChainingIterator(PyObject *,bool,bool,ViewEdge *,bool)\n"
+    "    ChainingIterator(PyObject *,bool,bool,ViewEdge *)\n"
+    "    ChainingIterator(PyObject *,bool,bool)\n"
+    "    ChainingIterator(PyObject *,bool)\n"
+    "    ChainingIterator(PyObject *)\n"
+    "    ChainingIterator(PyObject *,ChainingIterator const &)\n");
   return NULL;
 }
 
@@ -79265,7 +78242,7 @@ fail:
 
 SWIGINTERN PyObject *ChainingIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ChainingIterator, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -79502,7 +78479,7 @@ SWIGINTERN PyObject *_wrap_new_ChainSilhouetteIterator(PyObject *self, PyObject
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -79581,7 +78558,13 @@ SWIGINTERN PyObject *_wrap_new_ChainSilhouetteIterator(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ChainSilhouetteIterator'.\n  Possible C/C++ prototypes are:\n    ChainSilhouetteIterator(PyObject *,bool,ViewEdge *,bool)\n    ChainSilhouetteIterator(PyObject *,bool,ViewEdge *)\n    ChainSilhouetteIterator(PyObject *,bool)\n    ChainSilhouetteIterator(PyObject *)\n    ChainSilhouetteIterator(PyObject *,ChainSilhouetteIterator const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ChainSilhouetteIterator'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    ChainSilhouetteIterator(PyObject *,bool,ViewEdge *,bool)\n"
+    "    ChainSilhouetteIterator(PyObject *,bool,ViewEdge *)\n"
+    "    ChainSilhouetteIterator(PyObject *,bool)\n"
+    "    ChainSilhouetteIterator(PyObject *)\n"
+    "    ChainSilhouetteIterator(PyObject *,ChainSilhouetteIterator const &)\n");
   return NULL;
 }
 
@@ -79748,7 +78731,7 @@ fail:
 
 SWIGINTERN PyObject *ChainSilhouetteIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ChainSilhouetteIterator, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -80423,7 +79406,7 @@ SWIGINTERN PyObject *_wrap_new_ChainPredicateIterator(PyObject *self, PyObject *
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 7); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -80676,7 +79659,19 @@ SWIGINTERN PyObject *_wrap_new_ChainPredicateIterator(PyObject *self, PyObject *
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ChainPredicateIterator'.\n  Possible C/C++ prototypes are:\n    ChainPredicateIterator(PyObject *,bool,bool,ViewEdge *,bool)\n    ChainPredicateIterator(PyObject *,bool,bool,ViewEdge *)\n    ChainPredicateIterator(PyObject *,bool,bool)\n    ChainPredicateIterator(PyObject *,bool)\n    ChainPredicateIterator(PyObject *)\n    ChainPredicateIterator(PyObject *,UnaryPredicate1D &,BinaryPredicate1D &,bool,bool,ViewEdge *,bool)\n    ChainPredicateIterator(PyObject *,UnaryPredicate1D &,BinaryPredicate1D &,bool,bool,ViewEdge *)\n    ChainPredicateIterator(PyObject *,UnaryPredicate1D &,BinaryPredicate1D &,bool,bool)\n    ChainPredicateIterator(PyObject *,UnaryPredicate1D &,BinaryPredicate1D &,bool)\n    ChainPredicateIterator(PyObject *,UnaryPredicate1D &,BinaryPredicate1D &)\n    ChainPredicateIterator(PyObject *,ChainPredicateIterator const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ChainPredicateIterator'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    ChainPredicateIterator(PyObject *,bool,bool,ViewEdge *,bool)\n"
+    "    ChainPredicateIterator(PyObject *,bool,bool,ViewEdge *)\n"
+    "    ChainPredicateIterator(PyObject *,bool,bool)\n"
+    "    ChainPredicateIterator(PyObject *,bool)\n"
+    "    ChainPredicateIterator(PyObject *)\n"
+    "    ChainPredicateIterator(PyObject *,UnaryPredicate1D &,BinaryPredicate1D &,bool,bool,ViewEdge *,bool)\n"
+    "    ChainPredicateIterator(PyObject *,UnaryPredicate1D &,BinaryPredicate1D &,bool,bool,ViewEdge *)\n"
+    "    ChainPredicateIterator(PyObject *,UnaryPredicate1D &,BinaryPredicate1D &,bool,bool)\n"
+    "    ChainPredicateIterator(PyObject *,UnaryPredicate1D &,BinaryPredicate1D &,bool)\n"
+    "    ChainPredicateIterator(PyObject *,UnaryPredicate1D &,BinaryPredicate1D &)\n"
+    "    ChainPredicateIterator(PyObject *,ChainPredicateIterator const &)\n");
   return NULL;
 }
 
@@ -80843,7 +79838,7 @@ fail:
 
 SWIGINTERN PyObject *ChainPredicateIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ChainPredicateIterator, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -81039,7 +80034,7 @@ fail:
 
 SWIGINTERN PyObject *UnaryPredicate0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_UnaryPredicate0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -81189,7 +80184,7 @@ fail:
 
 SWIGINTERN PyObject *BinaryPredicate0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_BinaryPredicate0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -81327,7 +80322,7 @@ fail:
 
 SWIGINTERN PyObject *TrueUP0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates0D__TrueUP0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -81465,7 +80460,7 @@ fail:
 
 SWIGINTERN PyObject *FalseUP0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates0D__FalseUP0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -81661,7 +80656,7 @@ fail:
 
 SWIGINTERN PyObject *UnaryPredicate1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_UnaryPredicate1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -81869,7 +80864,7 @@ fail:
 
 SWIGINTERN PyObject *BinaryPredicate1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_BinaryPredicate1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -82007,7 +81002,7 @@ fail:
 
 SWIGINTERN PyObject *TrueUP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__TrueUP1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -82145,7 +81140,7 @@ fail:
 
 SWIGINTERN PyObject *FalseUP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__FalseUP1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -82211,7 +81206,7 @@ SWIGINTERN PyObject *_wrap_new_QuantitativeInvisibilityUP1D(PyObject *self, PyOb
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -82230,7 +81225,10 @@ SWIGINTERN PyObject *_wrap_new_QuantitativeInvisibilityUP1D(PyObject *self, PyOb
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_QuantitativeInvisibilityUP1D'.\n  Possible C/C++ prototypes are:\n    Predicates1D::QuantitativeInvisibilityUP1D(unsigned int)\n    Predicates1D::QuantitativeInvisibilityUP1D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_QuantitativeInvisibilityUP1D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Predicates1D::QuantitativeInvisibilityUP1D(unsigned int)\n"
+    "    Predicates1D::QuantitativeInvisibilityUP1D()\n");
   return NULL;
 }
 
@@ -82345,7 +81343,7 @@ fail:
 
 SWIGINTERN PyObject *QuantitativeInvisibilityUP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__QuantitativeInvisibilityUP1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -82483,7 +81481,7 @@ fail:
 
 SWIGINTERN PyObject *ContourUP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__ContourUP1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -82621,7 +81619,7 @@ fail:
 
 SWIGINTERN PyObject *ExternalContourUP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__ExternalContourUP1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -82768,7 +81766,7 @@ fail:
 
 SWIGINTERN PyObject *EqualToTimeStampUP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__EqualToTimeStampUP1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -82915,7 +81913,7 @@ fail:
 
 SWIGINTERN PyObject *EqualToChainingTimeStampUP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__EqualToChainingTimeStampUP1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -82999,7 +81997,7 @@ SWIGINTERN PyObject *_wrap_new_ShapeUP1D(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -83031,7 +82029,10 @@ SWIGINTERN PyObject *_wrap_new_ShapeUP1D(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ShapeUP1D'.\n  Possible C/C++ prototypes are:\n    Predicates1D::ShapeUP1D(unsigned int,unsigned int)\n    Predicates1D::ShapeUP1D(unsigned int)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ShapeUP1D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Predicates1D::ShapeUP1D(unsigned int,unsigned int)\n"
+    "    Predicates1D::ShapeUP1D(unsigned int)\n");
   return NULL;
 }
 
@@ -83146,7 +82147,7 @@ fail:
 
 SWIGINTERN PyObject *ShapeUP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__ShapeUP1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -83296,7 +82297,7 @@ fail:
 
 SWIGINTERN PyObject *TrueBP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__TrueBP1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -83446,7 +82447,7 @@ fail:
 
 SWIGINTERN PyObject *FalseBP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__FalseBP1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -83596,7 +82597,7 @@ fail:
 
 SWIGINTERN PyObject *Length2DBP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__Length2DBP1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -83746,7 +82747,7 @@ fail:
 
 SWIGINTERN PyObject *SameShapeIdBP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__SameShapeIdBP1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -83880,7 +82881,7 @@ SWIGINTERN PyObject *_wrap_new_ViewMapGradientNormBP1D(PyObject *self, PyObject
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -83934,7 +82935,11 @@ SWIGINTERN PyObject *_wrap_new_ViewMapGradientNormBP1D(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewMapGradientNormBP1D'.\n  Possible C/C++ prototypes are:\n    Predicates1D::ViewMapGradientNormBP1D(int,IntegrationType,float)\n    Predicates1D::ViewMapGradientNormBP1D(int,IntegrationType)\n    Predicates1D::ViewMapGradientNormBP1D(int)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewMapGradientNormBP1D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Predicates1D::ViewMapGradientNormBP1D(int,IntegrationType,float)\n"
+    "    Predicates1D::ViewMapGradientNormBP1D(int,IntegrationType)\n"
+    "    Predicates1D::ViewMapGradientNormBP1D(int)\n");
   return NULL;
 }
 
@@ -84061,7 +83066,7 @@ fail:
 
 SWIGINTERN PyObject *ViewMapGradientNormBP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__ViewMapGradientNormBP1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -84145,7 +83150,7 @@ SWIGINTERN PyObject *_wrap_new_DensityLowerThanUP1D(PyObject *self, PyObject *ar
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -84177,7 +83182,10 @@ SWIGINTERN PyObject *_wrap_new_DensityLowerThanUP1D(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_DensityLowerThanUP1D'.\n  Possible C/C++ prototypes are:\n    Predicates1D::DensityLowerThanUP1D(double,double)\n    Predicates1D::DensityLowerThanUP1D(double)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_DensityLowerThanUP1D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Predicates1D::DensityLowerThanUP1D(double,double)\n"
+    "    Predicates1D::DensityLowerThanUP1D(double)\n");
   return NULL;
 }
 
@@ -84292,7 +83300,7 @@ fail:
 
 SWIGINTERN PyObject *DensityLowerThanUP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__DensityLowerThanUP1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -84406,7 +83414,7 @@ fail:
 SWIGINTERN PyObject *_wrap_CurvePointIterator___A_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
-  Curve::vertex_container::iterator arg2 ;
+  ::Curve::vertex_container::iterator arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 ;
@@ -84423,12 +83431,12 @@ SWIGINTERN PyObject *_wrap_CurvePointIterator___A_set(PyObject *SWIGUNUSEDPARM(s
   {
     res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Curve__vertex_container__iterator,  0  | 0);
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CurvePointIterator___A_set" "', argument " "2"" of type '" "Curve::vertex_container::iterator""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CurvePointIterator___A_set" "', argument " "2"" of type '" "::Curve::vertex_container::iterator""'"); 
     }  
     if (!argp2) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CurvePointIterator___A_set" "', argument " "2"" of type '" "Curve::vertex_container::iterator""'");
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CurvePointIterator___A_set" "', argument " "2"" of type '" "::Curve::vertex_container::iterator""'");
     } else {
-      Curve::vertex_container::iterator * temp = reinterpret_cast< Curve::vertex_container::iterator * >(argp2);
+      ::Curve::vertex_container::iterator * temp = reinterpret_cast< ::Curve::vertex_container::iterator * >(argp2);
       arg2 = *temp;
       if (SWIG_IsNewObj(res2)) delete temp;
     }
@@ -84445,7 +83453,7 @@ fail:
 SWIGINTERN PyObject *_wrap_CurvePointIterator___A_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
-  Curve::vertex_container::iterator result;
+  ::Curve::vertex_container::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -84457,7 +83465,7 @@ SWIGINTERN PyObject *_wrap_CurvePointIterator___A_get(PyObject *SWIGUNUSEDPARM(s
   }
   arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
   result =  ((arg1)->__A);
-  resultobj = SWIG_NewPointerObj((new Curve::vertex_container::iterator(static_cast< const Curve::vertex_container::iterator& >(result))), SWIGTYPE_p_Curve__vertex_container__iterator, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new ::Curve::vertex_container::iterator(static_cast< const ::Curve::vertex_container::iterator& >(result))), SWIGTYPE_p_Curve__vertex_container__iterator, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -84467,7 +83475,7 @@ fail:
 SWIGINTERN PyObject *_wrap_CurvePointIterator___B_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
-  Curve::vertex_container::iterator arg2 ;
+  ::Curve::vertex_container::iterator arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 ;
@@ -84484,12 +83492,12 @@ SWIGINTERN PyObject *_wrap_CurvePointIterator___B_set(PyObject *SWIGUNUSEDPARM(s
   {
     res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Curve__vertex_container__iterator,  0  | 0);
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CurvePointIterator___B_set" "', argument " "2"" of type '" "Curve::vertex_container::iterator""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CurvePointIterator___B_set" "', argument " "2"" of type '" "::Curve::vertex_container::iterator""'"); 
     }  
     if (!argp2) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CurvePointIterator___B_set" "', argument " "2"" of type '" "Curve::vertex_container::iterator""'");
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CurvePointIterator___B_set" "', argument " "2"" of type '" "::Curve::vertex_container::iterator""'");
     } else {
-      Curve::vertex_container::iterator * temp = reinterpret_cast< Curve::vertex_container::iterator * >(argp2);
+      ::Curve::vertex_container::iterator * temp = reinterpret_cast< ::Curve::vertex_container::iterator * >(argp2);
       arg2 = *temp;
       if (SWIG_IsNewObj(res2)) delete temp;
     }
@@ -84506,7 +83514,7 @@ fail:
 SWIGINTERN PyObject *_wrap_CurvePointIterator___B_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
-  Curve::vertex_container::iterator result;
+  ::Curve::vertex_container::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -84518,7 +83526,7 @@ SWIGINTERN PyObject *_wrap_CurvePointIterator___B_get(PyObject *SWIGUNUSEDPARM(s
   }
   arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
   result =  ((arg1)->__B);
-  resultobj = SWIG_NewPointerObj((new Curve::vertex_container::iterator(static_cast< const Curve::vertex_container::iterator& >(result))), SWIGTYPE_p_Curve__vertex_container__iterator, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new ::Curve::vertex_container::iterator(static_cast< const ::Curve::vertex_container::iterator& >(result))), SWIGTYPE_p_Curve__vertex_container__iterator, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -84528,7 +83536,7 @@ fail:
 SWIGINTERN PyObject *_wrap_CurvePointIterator__begin_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
-  Curve::vertex_container::iterator arg2 ;
+  ::Curve::vertex_container::iterator arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 ;
@@ -84545,12 +83553,12 @@ SWIGINTERN PyObject *_wrap_CurvePointIterator__begin_set(PyObject *SWIGUNUSEDPAR
   {
     res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Curve__vertex_container__iterator,  0  | 0);
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CurvePointIterator__begin_set" "', argument " "2"" of type '" "Curve::vertex_container::iterator""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CurvePointIterator__begin_set" "', argument " "2"" of type '" "::Curve::vertex_container::iterator""'"); 
     }  
     if (!argp2) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CurvePointIterator__begin_set" "', argument " "2"" of type '" "Curve::vertex_container::iterator""'");
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CurvePointIterator__begin_set" "', argument " "2"" of type '" "::Curve::vertex_container::iterator""'");
     } else {
-      Curve::vertex_container::iterator * temp = reinterpret_cast< Curve::vertex_container::iterator * >(argp2);
+      ::Curve::vertex_container::iterator * temp = reinterpret_cast< ::Curve::vertex_container::iterator * >(argp2);
       arg2 = *temp;
       if (SWIG_IsNewObj(res2)) delete temp;
     }
@@ -84567,7 +83575,7 @@ fail:
 SWIGINTERN PyObject *_wrap_CurvePointIterator__begin_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
-  Curve::vertex_container::iterator result;
+  ::Curve::vertex_container::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -84579,7 +83587,7 @@ SWIGINTERN PyObject *_wrap_CurvePointIterator__begin_get(PyObject *SWIGUNUSEDPAR
   }
   arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
   result =  ((arg1)->_begin);
-  resultobj = SWIG_NewPointerObj((new Curve::vertex_container::iterator(static_cast< const Curve::vertex_container::iterator& >(result))), SWIGTYPE_p_Curve__vertex_container__iterator, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new ::Curve::vertex_container::iterator(static_cast< const ::Curve::vertex_container::iterator& >(result))), SWIGTYPE_p_Curve__vertex_container__iterator, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -84589,7 +83597,7 @@ fail:
 SWIGINTERN PyObject *_wrap_CurvePointIterator__end_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
-  Curve::vertex_container::iterator arg2 ;
+  ::Curve::vertex_container::iterator arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 ;
@@ -84606,12 +83614,12 @@ SWIGINTERN PyObject *_wrap_CurvePointIterator__end_set(PyObject *SWIGUNUSEDPARM(
   {
     res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Curve__vertex_container__iterator,  0  | 0);
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CurvePointIterator__end_set" "', argument " "2"" of type '" "Curve::vertex_container::iterator""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CurvePointIterator__end_set" "', argument " "2"" of type '" "::Curve::vertex_container::iterator""'"); 
     }  
     if (!argp2) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CurvePointIterator__end_set" "', argument " "2"" of type '" "Curve::vertex_container::iterator""'");
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "CurvePointIterator__end_set" "', argument " "2"" of type '" "::Curve::vertex_container::iterator""'");
     } else {
-      Curve::vertex_container::iterator * temp = reinterpret_cast< Curve::vertex_container::iterator * >(argp2);
+      ::Curve::vertex_container::iterator * temp = reinterpret_cast< ::Curve::vertex_container::iterator * >(argp2);
       arg2 = *temp;
       if (SWIG_IsNewObj(res2)) delete temp;
     }
@@ -84628,7 +83636,7 @@ fail:
 SWIGINTERN PyObject *_wrap_CurvePointIterator__end_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
-  Curve::vertex_container::iterator result;
+  ::Curve::vertex_container::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -84640,7 +83648,7 @@ SWIGINTERN PyObject *_wrap_CurvePointIterator__end_get(PyObject *SWIGUNUSEDPARM(
   }
   arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
   result =  ((arg1)->_end);
-  resultobj = SWIG_NewPointerObj((new Curve::vertex_container::iterator(static_cast< const Curve::vertex_container::iterator& >(result))), SWIGTYPE_p_Curve__vertex_container__iterator, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new ::Curve::vertex_container::iterator(static_cast< const ::Curve::vertex_container::iterator& >(result))), SWIGTYPE_p_Curve__vertex_container__iterator, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -85008,7 +84016,7 @@ SWIGINTERN PyObject *_wrap_new_CurvePointIterator(PyObject *self, PyObject *args
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -85035,7 +84043,11 @@ SWIGINTERN PyObject *_wrap_new_CurvePointIterator(PyObject *self, PyObject *args
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CurvePointIterator'.\n  Possible C/C++ prototypes are:\n    CurveInternal::CurvePointIterator(float)\n    CurveInternal::CurvePointIterator()\n    CurveInternal::CurvePointIterator(CurveInternal::CurvePointIterator const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CurvePointIterator'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    CurveInternal::CurvePointIterator(float)\n"
+    "    CurveInternal::CurvePointIterator()\n"
+    "    CurveInternal::CurvePointIterator(CurveInternal::CurvePointIterator const &)\n");
   return NULL;
 }
 
@@ -85464,7 +84476,7 @@ SWIGINTERN PyObject *_wrap_CurvePointIterator_getPoint3D(PyObject *SWIGUNUSEDPAR
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -85592,7 +84604,7 @@ SWIGINTERN PyObject *_wrap_CurvePointIterator_getPoint2D(PyObject *SWIGUNUSEDPAR
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -86111,7 +85123,7 @@ SWIGINTERN PyObject *_wrap_CurvePointIterator_point2d(PyObject *SWIGUNUSEDPARM(s
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -86146,7 +85158,7 @@ SWIGINTERN PyObject *_wrap_CurvePointIterator_point3d(PyObject *SWIGUNUSEDPARM(s
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -86178,7 +85190,7 @@ SWIGINTERN PyObject *_wrap_CurvePointIterator_normal(PyObject *SWIGUNUSEDPARM(se
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -86533,7 +85545,7 @@ SWIGINTERN PyObject *_wrap_CurvePointIterator_directionFredo(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2d(static_cast< const Geometry::Vec2d& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2d(static_cast< const Geometry::Vec2d& >(result))), SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -86542,7 +85554,7 @@ fail:
 
 SWIGINTERN PyObject *CurvePointIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CurveInternal__CurvePointIterator, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -86700,7 +85712,7 @@ SWIGINTERN PyObject *_wrap_CurvePoint_getPoint3D(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -86828,7 +85840,7 @@ SWIGINTERN PyObject *_wrap_CurvePoint_getPoint2D(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -87235,7 +86247,7 @@ SWIGINTERN PyObject *_wrap_new_CurvePoint(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -87292,7 +86304,12 @@ SWIGINTERN PyObject *_wrap_new_CurvePoint(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CurvePoint'.\n  Possible C/C++ prototypes are:\n    CurvePoint()\n    CurvePoint(SVertex *,SVertex *,float)\n    CurvePoint(CurvePoint *,CurvePoint *,float)\n    CurvePoint(CurvePoint const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CurvePoint'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    CurvePoint()\n"
+    "    CurvePoint(SVertex *,SVertex *,float)\n"
+    "    CurvePoint(CurvePoint *,CurvePoint *,float)\n"
+    "    CurvePoint(CurvePoint const &)\n");
   return NULL;
 }
 
@@ -87649,7 +86666,7 @@ SWIGINTERN PyObject *_wrap_CurvePoint_point2d(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -87684,7 +86701,7 @@ SWIGINTERN PyObject *_wrap_CurvePoint_point3d(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -87716,7 +86733,7 @@ SWIGINTERN PyObject *_wrap_CurvePoint_normal(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -88071,7 +87088,7 @@ SWIGINTERN PyObject *_wrap_CurvePoint_directionFredo(PyObject *SWIGUNUSEDPARM(se
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2d(static_cast< const Geometry::Vec2d& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2d(static_cast< const Geometry::Vec2d& >(result))), SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -88080,7 +87097,7 @@ fail:
 
 SWIGINTERN PyObject *CurvePoint_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CurvePoint, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -88184,7 +87201,7 @@ SWIGINTERN PyObject *_wrap_new_Curve(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -88209,7 +87226,11 @@ SWIGINTERN PyObject *_wrap_new_Curve(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Curve'.\n  Possible C/C++ prototypes are:\n    Curve()\n    Curve(Id const &)\n    Curve(Curve const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Curve'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Curve()\n"
+    "    Curve(Id const &)\n"
+    "    Curve(Curve const &)\n");
   return NULL;
 }
 
@@ -88363,7 +87384,7 @@ SWIGINTERN PyObject *_wrap_Curve_push_vertex_back(PyObject *self, PyObject *args
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -88397,7 +87418,10 @@ SWIGINTERN PyObject *_wrap_Curve_push_vertex_back(PyObject *self, PyObject *args
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Curve_push_vertex_back'.\n  Possible C/C++ prototypes are:\n    push_vertex_back(Curve::Vertex *)\n    push_vertex_back(SVertex *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Curve_push_vertex_back'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    push_vertex_back(Curve *,Curve::Vertex *)\n"
+    "    push_vertex_back(Curve *,SVertex *)\n");
   return NULL;
 }
 
@@ -88488,7 +87512,7 @@ SWIGINTERN PyObject *_wrap_Curve_push_vertex_front(PyObject *self, PyObject *arg
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -88522,7 +87546,10 @@ SWIGINTERN PyObject *_wrap_Curve_push_vertex_front(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Curve_push_vertex_front'.\n  Possible C/C++ prototypes are:\n    push_vertex_front(Curve::Vertex *)\n    push_vertex_front(SVertex *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Curve_push_vertex_front'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    push_vertex_front(Curve *,Curve::Vertex *)\n"
+    "    push_vertex_front(Curve *,SVertex *)\n");
   return NULL;
 }
 
@@ -88777,7 +87804,7 @@ SWIGINTERN PyObject *_wrap_Curve_curvePointsBegin(PyObject *self, PyObject *args
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -88807,7 +87834,10 @@ SWIGINTERN PyObject *_wrap_Curve_curvePointsBegin(PyObject *self, PyObject *args
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Curve_curvePointsBegin'.\n  Possible C/C++ prototypes are:\n    curvePointsBegin(float)\n    curvePointsBegin()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Curve_curvePointsBegin'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    curvePointsBegin(Curve *,float)\n"
+    "    curvePointsBegin(Curve *)\n");
   return NULL;
 }
 
@@ -88891,7 +87921,7 @@ SWIGINTERN PyObject *_wrap_Curve_curvePointsEnd(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -88921,7 +87951,10 @@ SWIGINTERN PyObject *_wrap_Curve_curvePointsEnd(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Curve_curvePointsEnd'.\n  Possible C/C++ prototypes are:\n    curvePointsEnd(float)\n    curvePointsEnd()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Curve_curvePointsEnd'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    curvePointsEnd(Curve *,float)\n"
+    "    curvePointsEnd(Curve *)\n");
   return NULL;
 }
 
@@ -89133,7 +88166,7 @@ SWIGINTERN PyObject *_wrap_Curve_pointsBegin(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -89163,7 +88196,10 @@ SWIGINTERN PyObject *_wrap_Curve_pointsBegin(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Curve_pointsBegin'.\n  Possible C/C++ prototypes are:\n    pointsBegin(float)\n    pointsBegin()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Curve_pointsBegin'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    pointsBegin(Curve *,float)\n"
+    "    pointsBegin(Curve *)\n");
   return NULL;
 }
 
@@ -89247,7 +88283,7 @@ SWIGINTERN PyObject *_wrap_Curve_pointsEnd(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -89277,14 +88313,17 @@ SWIGINTERN PyObject *_wrap_Curve_pointsEnd(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Curve_pointsEnd'.\n  Possible C/C++ prototypes are:\n    pointsEnd(float)\n    pointsEnd()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Curve_pointsEnd'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    pointsEnd(Curve *,float)\n"
+    "    pointsEnd(Curve *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *Curve_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Curve, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -89412,7 +88451,7 @@ SWIGINTERN PyObject *_wrap_new_StrokeVertexIterator(PyObject *self, PyObject *ar
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -89445,7 +88484,11 @@ SWIGINTERN PyObject *_wrap_new_StrokeVertexIterator(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_StrokeVertexIterator'.\n  Possible C/C++ prototypes are:\n    StrokeInternal::StrokeVertexIterator()\n    StrokeInternal::StrokeVertexIterator(StrokeInternal::StrokeVertexIterator const &)\n    StrokeInternal::StrokeVertexIterator(Stroke::vertex_container::iterator const &,Stroke::vertex_container::iterator const &,Stroke::vertex_container::iterator const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_StrokeVertexIterator'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    StrokeInternal::StrokeVertexIterator()\n"
+    "    StrokeInternal::StrokeVertexIterator(StrokeInternal::StrokeVertexIterator const &)\n"
+    "    StrokeInternal::StrokeVertexIterator(Stroke::vertex_container::iterator const &,Stroke::vertex_container::iterator const &,Stroke::vertex_container::iterator const &)\n");
   return NULL;
 }
 
@@ -90003,7 +89046,7 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getPoint(PyObject *SWIGUNUSEDPAR
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -90086,7 +89129,7 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_attribute(PyObject *self, PyObje
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -90110,7 +89153,10 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_attribute(PyObject *self, PyObje
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'StrokeVertexIterator_attribute'.\n  Possible C/C++ prototypes are:\n    attribute()\n    attribute()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'StrokeVertexIterator_attribute'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    attribute(StrokeInternal::StrokeVertexIterator const *)\n"
+    "    attribute(StrokeInternal::StrokeVertexIterator *)\n");
   return NULL;
 }
 
@@ -90325,7 +89371,7 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetPoint__SWIG_1(PyObject *SWIGU
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_SetPoint" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
   }
   arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_float_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeVertexIterator_SetPoint" "', argument " "2"" of type '" "Geometry::Vec2f const &""'"); 
   }
@@ -90357,7 +89403,7 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetPoint(PyObject *self, PyObjec
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -90367,7 +89413,7 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetPoint(PyObject *self, PyObjec
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2T_float_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_StrokeVertexIterator_SetPoint__SWIG_1(self, args);
@@ -90397,7 +89443,10 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetPoint(PyObject *self, PyObjec
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'StrokeVertexIterator_SetPoint'.\n  Possible C/C++ prototypes are:\n    SetPoint(real,real)\n    SetPoint(Geometry::Vec2f const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'StrokeVertexIterator_SetPoint'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    SetPoint(StrokeInternal::StrokeVertexIterator *,real,real)\n"
+    "    SetPoint(StrokeInternal::StrokeVertexIterator *,Geometry::Vec2f const &)\n");
   return NULL;
 }
 
@@ -90646,7 +89695,7 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getPoint3D(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -90774,7 +89823,7 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getPoint2D(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -91293,7 +90342,7 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_point2d(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -91328,7 +90377,7 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_point3d(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -91360,7 +90409,7 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_normal(PyObject *SWIGUNUSEDPARM(
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -91715,7 +90764,7 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_directionFredo(PyObject *SWIGUNU
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2d(static_cast< const Geometry::Vec2d& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2d(static_cast< const Geometry::Vec2d& >(result))), SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -91724,7 +90773,7 @@ fail:
 
 SWIGINTERN PyObject *StrokeVertexIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -91926,7 +90975,7 @@ SWIGINTERN PyObject *_wrap_new_StrokeAttribute(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 6); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -92001,7 +91050,12 @@ SWIGINTERN PyObject *_wrap_new_StrokeAttribute(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_StrokeAttribute'.\n  Possible C/C++ prototypes are:\n    StrokeAttribute()\n    StrokeAttribute(StrokeAttribute const &)\n    StrokeAttribute(float,float,float,float,float,float)\n    StrokeAttribute(StrokeAttribute const &,StrokeAttribute const &,float)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_StrokeAttribute'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    StrokeAttribute()\n"
+    "    StrokeAttribute(StrokeAttribute const &)\n"
+    "    StrokeAttribute(float,float,float,float,float,float)\n"
+    "    StrokeAttribute(StrokeAttribute const &,StrokeAttribute const &,float)\n");
   return NULL;
 }
 
@@ -92191,7 +91245,7 @@ SWIGINTERN PyObject *_wrap_StrokeAttribute_getColorRGB(PyObject *SWIGUNUSEDPARM(
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -92351,7 +91405,7 @@ SWIGINTERN PyObject *_wrap_StrokeAttribute_getThicknessRL(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -92469,7 +91523,7 @@ SWIGINTERN PyObject *_wrap_StrokeAttribute_getAttributeVec2f(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
   return resultobj;
 fail:
@@ -92513,7 +91567,7 @@ SWIGINTERN PyObject *_wrap_StrokeAttribute_getAttributeVec3f(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
   if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
   return resultobj;
 fail:
@@ -92729,7 +91783,7 @@ SWIGINTERN PyObject *_wrap_StrokeAttribute_setColor__SWIG_1(PyObject *SWIGUNUSED
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeAttribute_setColor" "', argument " "1"" of type '" "StrokeAttribute *""'"); 
   }
   arg1 = reinterpret_cast< StrokeAttribute * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tfloat_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_float_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeAttribute_setColor" "', argument " "2"" of type '" "Geometry::Vec3f const &""'"); 
   }
@@ -92761,7 +91815,7 @@ SWIGINTERN PyObject *_wrap_StrokeAttribute_setColor(PyObject *self, PyObject *ar
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -92771,7 +91825,7 @@ SWIGINTERN PyObject *_wrap_StrokeAttribute_setColor(PyObject *self, PyObject *ar
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_StrokeAttribute, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec3T_float_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_StrokeAttribute_setColor__SWIG_1(self, args);
@@ -92807,7 +91861,10 @@ SWIGINTERN PyObject *_wrap_StrokeAttribute_setColor(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'StrokeAttribute_setColor'.\n  Possible C/C++ prototypes are:\n    setColor(float,float,float)\n    setColor(Geometry::Vec3f const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'StrokeAttribute_setColor'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    setColor(StrokeAttribute *,float,float,float)\n"
+    "    setColor(StrokeAttribute *,Geometry::Vec3f const &)\n");
   return NULL;
 }
 
@@ -92918,7 +91975,7 @@ SWIGINTERN PyObject *_wrap_StrokeAttribute_setThickness__SWIG_1(PyObject *SWIGUN
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeAttribute_setThickness" "', argument " "1"" of type '" "StrokeAttribute *""'"); 
   }
   arg1 = reinterpret_cast< StrokeAttribute * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_float_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeAttribute_setThickness" "', argument " "2"" of type '" "Geometry::Vec2f const &""'"); 
   }
@@ -92950,7 +92007,7 @@ SWIGINTERN PyObject *_wrap_StrokeAttribute_setThickness(PyObject *self, PyObject
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -92960,7 +92017,7 @@ SWIGINTERN PyObject *_wrap_StrokeAttribute_setThickness(PyObject *self, PyObject
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_StrokeAttribute, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2T_float_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_StrokeAttribute_setThickness__SWIG_1(self, args);
@@ -92990,7 +92047,10 @@ SWIGINTERN PyObject *_wrap_StrokeAttribute_setThickness(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'StrokeAttribute_setThickness'.\n  Possible C/C++ prototypes are:\n    setThickness(float,float)\n    setThickness(Geometry::Vec2f const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'StrokeAttribute_setThickness'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    setThickness(StrokeAttribute *,float,float)\n"
+    "    setThickness(StrokeAttribute *,Geometry::Vec2f const &)\n");
   return NULL;
 }
 
@@ -93114,7 +92174,7 @@ SWIGINTERN PyObject *_wrap_StrokeAttribute_setAttributeVec2f(PyObject *SWIGUNUSE
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeAttribute_setAttributeVec2f" "', argument " "2"" of type '" "char const *""'");
   }
   arg2 = reinterpret_cast< char * >(buf2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0  | 0);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2T_float_t,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "StrokeAttribute_setAttributeVec2f" "', argument " "3"" of type '" "Geometry::Vec2f const &""'"); 
   }
@@ -93169,7 +92229,7 @@ SWIGINTERN PyObject *_wrap_StrokeAttribute_setAttributeVec3f(PyObject *SWIGUNUSE
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeAttribute_setAttributeVec3f" "', argument " "2"" of type '" "char const *""'");
   }
   arg2 = reinterpret_cast< char * >(buf2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec3Tfloat_t,  0  | 0);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec3T_float_t,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "StrokeAttribute_setAttributeVec3f" "', argument " "3"" of type '" "Geometry::Vec3f const &""'"); 
   }
@@ -93199,7 +92259,7 @@ fail:
 
 SWIGINTERN PyObject *StrokeAttribute_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeAttribute, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -93458,7 +92518,7 @@ SWIGINTERN PyObject *_wrap_new_StrokeVertex(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -93526,7 +92586,14 @@ SWIGINTERN PyObject *_wrap_new_StrokeVertex(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_StrokeVertex'.\n  Possible C/C++ prototypes are:\n    StrokeVertex()\n    StrokeVertex(StrokeVertex const &)\n    StrokeVertex(SVertex *)\n    StrokeVertex(CurvePoint *)\n    StrokeVertex(StrokeVertex *,StrokeVertex *,float)\n    StrokeVertex(SVertex *,StrokeAttribute const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_StrokeVertex'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    StrokeVertex()\n"
+    "    StrokeVertex(StrokeVertex const &)\n"
+    "    StrokeVertex(SVertex *)\n"
+    "    StrokeVertex(CurvePoint *)\n"
+    "    StrokeVertex(StrokeVertex *,StrokeVertex *,float)\n"
+    "    StrokeVertex(SVertex *,StrokeAttribute const &)\n");
   return NULL;
 }
 
@@ -93652,7 +92719,7 @@ SWIGINTERN PyObject *_wrap_StrokeVertex_getPoint(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -93735,7 +92802,7 @@ SWIGINTERN PyObject *_wrap_StrokeVertex_attribute(PyObject *self, PyObject *args
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -93759,7 +92826,10 @@ SWIGINTERN PyObject *_wrap_StrokeVertex_attribute(PyObject *self, PyObject *args
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'StrokeVertex_attribute'.\n  Possible C/C++ prototypes are:\n    attribute()\n    attribute()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'StrokeVertex_attribute'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    attribute(StrokeVertex const *)\n"
+    "    attribute(StrokeVertex *)\n");
   return NULL;
 }
 
@@ -94006,7 +93076,7 @@ SWIGINTERN PyObject *_wrap_StrokeVertex_SetPoint__SWIG_1(PyObject *SWIGUNUSEDPAR
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertex_SetPoint" "', argument " "1"" of type '" "StrokeVertex *""'"); 
   }
   arg1 = reinterpret_cast< StrokeVertex * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_float_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeVertex_SetPoint" "', argument " "2"" of type '" "Geometry::Vec2f const &""'"); 
   }
@@ -94038,7 +93108,7 @@ SWIGINTERN PyObject *_wrap_StrokeVertex_SetPoint(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -94048,7 +93118,7 @@ SWIGINTERN PyObject *_wrap_StrokeVertex_SetPoint(PyObject *self, PyObject *args)
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_StrokeVertex, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2T_float_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_StrokeVertex_SetPoint__SWIG_1(self, args);
@@ -94078,7 +93148,10 @@ SWIGINTERN PyObject *_wrap_StrokeVertex_SetPoint(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'StrokeVertex_SetPoint'.\n  Possible C/C++ prototypes are:\n    SetPoint(real,real)\n    SetPoint(Geometry::Vec2f const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'StrokeVertex_SetPoint'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    SetPoint(StrokeVertex *,real,real)\n"
+    "    SetPoint(StrokeVertex *,Geometry::Vec2f const &)\n");
   return NULL;
 }
 
@@ -94208,7 +93281,7 @@ fail:
 
 SWIGINTERN PyObject *StrokeVertex_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeVertex, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -94341,7 +93414,7 @@ SWIGINTERN PyObject *_wrap_new_Stroke(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -94358,7 +93431,10 @@ SWIGINTERN PyObject *_wrap_new_Stroke(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Stroke'.\n  Possible C/C++ prototypes are:\n    Stroke()\n    Stroke(Stroke const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Stroke'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Stroke()\n"
+    "    Stroke(Stroke const &)\n");
   return NULL;
 }
 
@@ -94522,7 +93598,7 @@ SWIGINTERN PyObject *_wrap_Stroke_Resample(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -94558,7 +93634,10 @@ SWIGINTERN PyObject *_wrap_Stroke_Resample(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_Resample'.\n  Possible C/C++ prototypes are:\n    Resample(int)\n    Resample(float)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_Resample'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Resample(Stroke *,int)\n"
+    "    Resample(Stroke *,float)\n");
   return NULL;
 }
 
@@ -94970,7 +94049,7 @@ SWIGINTERN PyObject *_wrap_Stroke_viewedges_begin(PyObject *self, PyObject *args
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -94994,7 +94073,10 @@ SWIGINTERN PyObject *_wrap_Stroke_viewedges_begin(PyObject *self, PyObject *args
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_viewedges_begin'.\n  Possible C/C++ prototypes are:\n    viewedges_begin()\n    viewedges_begin()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_viewedges_begin'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    viewedges_begin(Stroke const *)\n"
+    "    viewedges_begin(Stroke *)\n");
   return NULL;
 }
 
@@ -95069,7 +94151,7 @@ SWIGINTERN PyObject *_wrap_Stroke_viewedges_end(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -95093,7 +94175,10 @@ SWIGINTERN PyObject *_wrap_Stroke_viewedges_end(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_viewedges_end'.\n  Possible C/C++ prototypes are:\n    viewedges_end()\n    viewedges_end()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_viewedges_end'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    viewedges_end(Stroke const *)\n"
+    "    viewedges_end(Stroke *)\n");
   return NULL;
 }
 
@@ -95155,7 +94240,7 @@ SWIGINTERN PyObject *_wrap_Stroke_getBeginningOrientation(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2r(static_cast< const Geometry::Vec2r& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2r(static_cast< const Geometry::Vec2r& >(result))), SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -95251,7 +94336,7 @@ SWIGINTERN PyObject *_wrap_Stroke_getEndingOrientation(PyObject *SWIGUNUSEDPARM(
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2r(static_cast< const Geometry::Vec2r& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2r(static_cast< const Geometry::Vec2r& >(result))), SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -95662,7 +94747,7 @@ SWIGINTERN PyObject *_wrap_Stroke_SetBeginningOrientation__SWIG_0(PyObject *SWIG
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_SetBeginningOrientation" "', argument " "1"" of type '" "Stroke *""'"); 
   }
   arg1 = reinterpret_cast< Stroke * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Stroke_SetBeginningOrientation" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
   }
@@ -95743,7 +94828,7 @@ SWIGINTERN PyObject *_wrap_Stroke_SetBeginningOrientation(PyObject *self, PyObje
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -95753,7 +94838,7 @@ SWIGINTERN PyObject *_wrap_Stroke_SetBeginningOrientation(PyObject *self, PyObje
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Stroke, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2T_double_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Stroke_SetBeginningOrientation__SWIG_0(self, args);
@@ -95783,7 +94868,10 @@ SWIGINTERN PyObject *_wrap_Stroke_SetBeginningOrientation(PyObject *self, PyObje
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_SetBeginningOrientation'.\n  Possible C/C++ prototypes are:\n    SetBeginningOrientation(Geometry::Vec2r const &)\n    SetBeginningOrientation(real,real)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_SetBeginningOrientation'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    SetBeginningOrientation(Stroke *,Geometry::Vec2r const &)\n"
+    "    SetBeginningOrientation(Stroke *,real,real)\n");
   return NULL;
 }
 
@@ -95805,7 +94893,7 @@ SWIGINTERN PyObject *_wrap_Stroke_SetEndingOrientation__SWIG_0(PyObject *SWIGUNU
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_SetEndingOrientation" "', argument " "1"" of type '" "Stroke *""'"); 
   }
   arg1 = reinterpret_cast< Stroke * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Stroke_SetEndingOrientation" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
   }
@@ -95886,7 +94974,7 @@ SWIGINTERN PyObject *_wrap_Stroke_SetEndingOrientation(PyObject *self, PyObject
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -95896,7 +94984,7 @@ SWIGINTERN PyObject *_wrap_Stroke_SetEndingOrientation(PyObject *self, PyObject
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Stroke, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2T_double_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Stroke_SetEndingOrientation__SWIG_0(self, args);
@@ -95926,7 +95014,10 @@ SWIGINTERN PyObject *_wrap_Stroke_SetEndingOrientation(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_SetEndingOrientation'.\n  Possible C/C++ prototypes are:\n    SetEndingOrientation(Geometry::Vec2r const &)\n    SetEndingOrientation(real,real)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_SetEndingOrientation'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    SetEndingOrientation(Stroke *,Geometry::Vec2r const &)\n"
+    "    SetEndingOrientation(Stroke *,real,real)\n");
   return NULL;
 }
 
@@ -96010,7 +95101,7 @@ SWIGINTERN PyObject *_wrap_Stroke_strokeVerticesBegin(PyObject *self, PyObject *
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -96040,7 +95131,10 @@ SWIGINTERN PyObject *_wrap_Stroke_strokeVerticesBegin(PyObject *self, PyObject *
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_strokeVerticesBegin'.\n  Possible C/C++ prototypes are:\n    strokeVerticesBegin(float)\n    strokeVerticesBegin()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_strokeVerticesBegin'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    strokeVerticesBegin(Stroke *,float)\n"
+    "    strokeVerticesBegin(Stroke *)\n");
   return NULL;
 }
 
@@ -96252,7 +95346,7 @@ SWIGINTERN PyObject *_wrap_Stroke_pointsBegin(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -96282,7 +95376,10 @@ SWIGINTERN PyObject *_wrap_Stroke_pointsBegin(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_pointsBegin'.\n  Possible C/C++ prototypes are:\n    pointsBegin(float)\n    pointsBegin()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_pointsBegin'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    pointsBegin(Stroke *,float)\n"
+    "    pointsBegin(Stroke *)\n");
   return NULL;
 }
 
@@ -96366,7 +95463,7 @@ SWIGINTERN PyObject *_wrap_Stroke_pointsEnd(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -96396,21 +95493,24 @@ SWIGINTERN PyObject *_wrap_Stroke_pointsEnd(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_pointsEnd'.\n  Possible C/C++ prototypes are:\n    pointsEnd(float)\n    pointsEnd()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_pointsEnd'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    pointsEnd(Stroke *,float)\n"
+    "    pointsEnd(Stroke *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *Stroke_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Stroke, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
   PyObject **arg2 = (PyObject **) 0 ;
   swig::PySwigIterator *result = 0 ;
   void *argp1 = 0 ;
@@ -96419,11 +95519,11 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_iterator(PyObject *SWIGUNUSEDPARM(se
   
   arg2 = &obj0;
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_iterator" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_iterator" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   {
     try {
       result = (swig::PySwigIterator *)std_vector_Sl_StrokeShader_Sm__Sg__iterator(arg1,arg2);
@@ -96444,21 +95544,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer___nonzero__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer___nonzero__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___nonzero__" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___nonzero__" "', argument " "1"" of type '" "std::vector< StrokeShader * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   {
     try {
-      result = (bool)std_vector_Sl_StrokeShader_Sm__Sg____nonzero__((std::vector<StrokeShader * > const *)arg1);
+      result = (bool)std_vector_Sl_StrokeShader_Sm__Sg____nonzero__((std::vector< StrokeShader * > const *)arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -96476,21 +95576,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer___len__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::size_type result;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer___len__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___len__" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___len__" "', argument " "1"" of type '" "std::vector< StrokeShader * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   {
     try {
-      result = std_vector_Sl_StrokeShader_Sm__Sg____len__((std::vector<StrokeShader * > const *)arg1);
+      result = std_vector_Sl_StrokeShader_Sm__Sg____len__((std::vector< StrokeShader * > const *)arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -96508,22 +95608,22 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::value_type result;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_pop" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_pop" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   {
     try {
       try {
-        result = (std::vector<StrokeShader * >::value_type)std_vector_Sl_StrokeShader_Sm__Sg__pop(arg1);
+        result = (std::vector< StrokeShader * >::value_type)std_vector_Sl_StrokeShader_Sm__Sg__pop(arg1);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -96537,7 +95637,7 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_pop(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -96546,10 +95646,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::difference_type arg2 ;
-  std::vector<StrokeShader * >::difference_type arg3 ;
-  std::vector<StrokeShader *,std::allocator<StrokeShader * > > *result = 0 ;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::difference_type arg2 ;
+  std::vector< StrokeShader * >::difference_type arg3 ;
+  std::vector< StrokeShader *,std::allocator< StrokeShader * > > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -96561,25 +95661,25 @@ SWIGINTERN PyObject *_wrap_ShadersContainer___getslice__(PyObject *SWIGUNUSEDPAR
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ShadersContainer___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___getslice__" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___getslice__" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer___getslice__" "', argument " "2"" of type '" "std::vector<StrokeShader * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer___getslice__" "', argument " "2"" of type '" "std::vector< StrokeShader * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<StrokeShader * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< StrokeShader * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ShadersContainer___getslice__" "', argument " "3"" of type '" "std::vector<StrokeShader * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ShadersContainer___getslice__" "', argument " "3"" of type '" "std::vector< StrokeShader * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<StrokeShader * >::difference_type >(val3);
+  arg3 = static_cast< std::vector< StrokeShader * >::difference_type >(val3);
   {
     try {
       try {
-        result = (std::vector<StrokeShader *,std::allocator<StrokeShader * > > *)std_vector_Sl_StrokeShader_Sm__Sg____getslice__(arg1,arg2,arg3);
+        result = (std::vector< StrokeShader *,std::allocator< StrokeShader * > > *)std_vector_Sl_StrokeShader_Sm__Sg____getslice__(arg1,arg2,arg3);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -96593,7 +95693,7 @@ SWIGINTERN PyObject *_wrap_ShadersContainer___getslice__(PyObject *SWIGUNUSEDPAR
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -96602,10 +95702,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer___setslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::difference_type arg2 ;
-  std::vector<StrokeShader * >::difference_type arg3 ;
-  std::vector<StrokeShader *,std::allocator<StrokeShader * > > *arg4 = 0 ;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::difference_type arg2 ;
+  std::vector< StrokeShader * >::difference_type arg3 ;
+  std::vector< StrokeShader *,std::allocator< StrokeShader * > > *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -96619,36 +95719,36 @@ SWIGINTERN PyObject *_wrap_ShadersContainer___setslice__(PyObject *SWIGUNUSEDPAR
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:ShadersContainer___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___setslice__" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___setslice__" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer___setslice__" "', argument " "2"" of type '" "std::vector<StrokeShader * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer___setslice__" "', argument " "2"" of type '" "std::vector< StrokeShader * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<StrokeShader * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< StrokeShader * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ShadersContainer___setslice__" "', argument " "3"" of type '" "std::vector<StrokeShader * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ShadersContainer___setslice__" "', argument " "3"" of type '" "std::vector< StrokeShader * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<StrokeShader * >::difference_type >(val3);
+  arg3 = static_cast< std::vector< StrokeShader * >::difference_type >(val3);
   {
-    std::vector<StrokeShader*,std::allocator<StrokeShader * > > *ptr = (std::vector<StrokeShader*,std::allocator<StrokeShader * > > *)0;
+    std::vector<StrokeShader*,std::allocator< StrokeShader * > > *ptr = (std::vector<StrokeShader*,std::allocator< StrokeShader * > > *)0;
     res4 = swig::asptr(obj3, &ptr);
     if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ShadersContainer___setslice__" "', argument " "4"" of type '" "std::vector<StrokeShader *,std::allocator<StrokeShader * > > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ShadersContainer___setslice__" "', argument " "4"" of type '" "std::vector< StrokeShader *,std::allocator< StrokeShader * > > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ShadersContainer___setslice__" "', argument " "4"" of type '" "std::vector<StrokeShader *,std::allocator<StrokeShader * > > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ShadersContainer___setslice__" "', argument " "4"" of type '" "std::vector< StrokeShader *,std::allocator< StrokeShader * > > const &""'"); 
     }
     arg4 = ptr;
   }
   {
     try {
       try {
-        std_vector_Sl_StrokeShader_Sm__Sg____setslice__(arg1,arg2,arg3,(std::vector<StrokeShader *,std::allocator<StrokeShader * > > const &)*arg4);
+        std_vector_Sl_StrokeShader_Sm__Sg____setslice__(arg1,arg2,arg3,(std::vector< StrokeShader *,std::allocator< StrokeShader * > > const &)*arg4);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -96676,9 +95776,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer___delslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::difference_type arg2 ;
-  std::vector<StrokeShader * >::difference_type arg3 ;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::difference_type arg2 ;
+  std::vector< StrokeShader * >::difference_type arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -96690,21 +95790,21 @@ SWIGINTERN PyObject *_wrap_ShadersContainer___delslice__(PyObject *SWIGUNUSEDPAR
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ShadersContainer___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___delslice__" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___delslice__" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer___delslice__" "', argument " "2"" of type '" "std::vector<StrokeShader * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer___delslice__" "', argument " "2"" of type '" "std::vector< StrokeShader * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<StrokeShader * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< StrokeShader * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ShadersContainer___delslice__" "', argument " "3"" of type '" "std::vector<StrokeShader * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ShadersContainer___delslice__" "', argument " "3"" of type '" "std::vector< StrokeShader * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<StrokeShader * >::difference_type >(val3);
+  arg3 = static_cast< std::vector< StrokeShader * >::difference_type >(val3);
   {
     try {
       try {
@@ -96731,8 +95831,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer___delitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::difference_type arg2 ;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::difference_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -96741,16 +95841,16 @@ SWIGINTERN PyObject *_wrap_ShadersContainer___delitem__(PyObject *SWIGUNUSEDPARM
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ShadersContainer___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___delitem__" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___delitem__" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer___delitem__" "', argument " "2"" of type '" "std::vector<StrokeShader * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer___delitem__" "', argument " "2"" of type '" "std::vector< StrokeShader * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<StrokeShader * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< StrokeShader * >::difference_type >(val2);
   {
     try {
       try {
@@ -96777,9 +95877,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer___getitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::difference_type arg2 ;
-  std::vector<StrokeShader * >::value_type result;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::difference_type arg2 ;
+  std::vector< StrokeShader * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -96788,20 +95888,20 @@ SWIGINTERN PyObject *_wrap_ShadersContainer___getitem__(PyObject *SWIGUNUSEDPARM
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ShadersContainer___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___getitem__" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___getitem__" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer___getitem__" "', argument " "2"" of type '" "std::vector<StrokeShader * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer___getitem__" "', argument " "2"" of type '" "std::vector< StrokeShader * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<StrokeShader * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< StrokeShader * >::difference_type >(val2);
   {
     try {
       try {
-        result = (std::vector<StrokeShader * >::value_type)std_vector_Sl_StrokeShader_Sm__Sg____getitem__(arg1,arg2);
+        result = (std::vector< StrokeShader * >::value_type)std_vector_Sl_StrokeShader_Sm__Sg____getitem__(arg1,arg2);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -96815,7 +95915,7 @@ SWIGINTERN PyObject *_wrap_ShadersContainer___getitem__(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -96824,9 +95924,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer___setitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::difference_type arg2 ;
-  std::vector<StrokeShader * >::value_type arg3 = (std::vector<StrokeShader * >::value_type) 0 ;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::difference_type arg2 ;
+  std::vector< StrokeShader * >::value_type arg3 = (std::vector< StrokeShader * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -96838,21 +95938,21 @@ SWIGINTERN PyObject *_wrap_ShadersContainer___setitem__(PyObject *SWIGUNUSEDPARM
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ShadersContainer___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___setitem__" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___setitem__" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer___setitem__" "', argument " "2"" of type '" "std::vector<StrokeShader * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer___setitem__" "', argument " "2"" of type '" "std::vector< StrokeShader * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<StrokeShader * >::difference_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector< StrokeShader * >::difference_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ShadersContainer___setitem__" "', argument " "3"" of type '" "std::vector<StrokeShader * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ShadersContainer___setitem__" "', argument " "3"" of type '" "std::vector< StrokeShader * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<StrokeShader * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< StrokeShader * >::value_type >(argp3);
   {
     try {
       try {
@@ -96879,8 +95979,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::value_type arg2 = (std::vector<StrokeShader * >::value_type) 0 ;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::value_type arg2 = (std::vector< StrokeShader * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -96889,16 +95989,16 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_append(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ShadersContainer_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_append" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_append" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ShadersContainer_append" "', argument " "2"" of type '" "std::vector<StrokeShader * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ShadersContainer_append" "', argument " "2"" of type '" "std::vector< StrokeShader * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<StrokeShader * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector< StrokeShader * >::value_type >(argp2);
   {
     try {
       std_vector_Sl_StrokeShader_Sm__Sg__append(arg1,arg2);
@@ -96919,12 +96019,12 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_ShadersContainer__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *result = 0 ;
+  std::vector< StrokeShader * > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_ShadersContainer")) SWIG_fail;
   {
     try {
-      result = (std::vector<StrokeShader * > *)new std::vector<StrokeShader * >();
+      result = (std::vector< StrokeShader * > *)new std::vector< StrokeShader * >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -96933,7 +96033,7 @@ SWIGINTERN PyObject *_wrap_new_ShadersContainer__SWIG_0(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -96942,26 +96042,26 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_ShadersContainer__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = 0 ;
-  std::vector<StrokeShader * > *result = 0 ;
+  std::vector< StrokeShader * > *arg1 = 0 ;
+  std::vector< StrokeShader * > *result = 0 ;
   int res1 = SWIG_OLDOBJ ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_ShadersContainer",&obj0)) SWIG_fail;
   {
-    std::vector<StrokeShader*,std::allocator<StrokeShader * > > *ptr = (std::vector<StrokeShader*,std::allocator<StrokeShader * > > *)0;
+    std::vector<StrokeShader*,std::allocator< StrokeShader * > > *ptr = (std::vector<StrokeShader*,std::allocator< StrokeShader * > > *)0;
     res1 = swig::asptr(obj0, &ptr);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ShadersContainer" "', argument " "1"" of type '" "std::vector<StrokeShader * > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ShadersContainer" "', argument " "1"" of type '" "std::vector< StrokeShader * > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ShadersContainer" "', argument " "1"" of type '" "std::vector<StrokeShader * > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ShadersContainer" "', argument " "1"" of type '" "std::vector< StrokeShader * > const &""'"); 
     }
     arg1 = ptr;
   }
   {
     try {
-      result = (std::vector<StrokeShader * > *)new std::vector<StrokeShader * >((std::vector<StrokeShader * > const &)*arg1);
+      result = (std::vector< StrokeShader * > *)new std::vector< StrokeShader * >((std::vector< StrokeShader * > const &)*arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -96970,7 +96070,7 @@ SWIGINTERN PyObject *_wrap_new_ShadersContainer__SWIG_1(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, SWIG_POINTER_NEW |  0 );
   if (SWIG_IsNewObj(res1)) delete arg1;
   return resultobj;
 fail:
@@ -96981,21 +96081,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_empty",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_empty" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_empty" "', argument " "1"" of type '" "std::vector< StrokeShader * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   {
     try {
-      result = (bool)((std::vector<StrokeShader * > const *)arg1)->empty();
+      result = (bool)((std::vector< StrokeShader * > const *)arg1)->empty();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -97013,21 +96113,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::size_type result;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_size" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_size" "', argument " "1"" of type '" "std::vector< StrokeShader * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   {
     try {
-      result = ((std::vector<StrokeShader * > const *)arg1)->size();
+      result = ((std::vector< StrokeShader * > const *)arg1)->size();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -97045,17 +96145,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_clear" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_clear" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   {
     try {
       (arg1)->clear();
@@ -97076,8 +96176,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * > *arg2 = 0 ;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -97086,19 +96186,19 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_swap(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ShadersContainer_swap",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_swap" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_swap" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t,  0 );
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ShadersContainer_swap" "', argument " "2"" of type '" "std::vector<StrokeShader * > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ShadersContainer_swap" "', argument " "2"" of type '" "std::vector< StrokeShader * > &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ShadersContainer_swap" "', argument " "2"" of type '" "std::vector<StrokeShader * > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ShadersContainer_swap" "', argument " "2"" of type '" "std::vector< StrokeShader * > &""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<StrokeShader * > * >(argp2);
+  arg2 = reinterpret_cast< std::vector< StrokeShader * > * >(argp2);
   {
     try {
       (arg1)->swap(*arg2);
@@ -97119,21 +96219,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  SwigValueWrapper<std::allocator<StrokeShader * > > result;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  SwigValueWrapper< std::allocator< StrokeShader * > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_get_allocator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_get_allocator" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_get_allocator" "', argument " "1"" of type '" "std::vector< StrokeShader * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   {
     try {
-      result = ((std::vector<StrokeShader * > const *)arg1)->get_allocator();
+      result = ((std::vector< StrokeShader * > const *)arg1)->get_allocator();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -97142,30 +96242,30 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_get_allocator(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new std::vector<StrokeShader * >::allocator_type(static_cast< const std::vector<StrokeShader * >::allocator_type& >(result))), SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new std::vector< StrokeShader * >::allocator_type(static_cast< const std::vector< StrokeShader * >::allocator_type& >(result))), SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_ShadersContainer_begin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ShadersContainer_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::iterator result;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::const_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_begin" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_begin" "', argument " "1"" of type '" "std::vector< StrokeShader * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   {
     try {
-      result = (arg1)->begin();
+      result = ((std::vector< StrokeShader * > const *)arg1)->begin();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -97174,7 +96274,7 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_begin__SWIG_0(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<StrokeShader * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< StrokeShader * >::const_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -97182,89 +96282,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ShadersContainer_begin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ShadersContainer_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::const_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_begin" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<StrokeShader * > const *)arg1)->begin();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<StrokeShader * >::const_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ShadersContainer_begin(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ShadersContainer_begin__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ShadersContainer_begin__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ShadersContainer_begin'.\n  Possible C/C++ prototypes are:\n    begin()\n    begin()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ShadersContainer_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::iterator result;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::const_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_end" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_end" "', argument " "1"" of type '" "std::vector< StrokeShader * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   {
     try {
-      result = (arg1)->end();
+      result = ((std::vector< StrokeShader * > const *)arg1)->end();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -97273,7 +96307,7 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_end__SWIG_0(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<StrokeShader * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< StrokeShader * >::const_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -97281,89 +96315,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ShadersContainer_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ShadersContainer_rbegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::const_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_end" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<StrokeShader * > const *)arg1)->end();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<StrokeShader * >::const_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ShadersContainer_end(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ShadersContainer_end__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ShadersContainer_end__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ShadersContainer_end'.\n  Possible C/C++ prototypes are:\n    end()\n    end()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ShadersContainer_rbegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::reverse_iterator result;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::const_reverse_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_rbegin" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_rbegin" "', argument " "1"" of type '" "std::vector< StrokeShader * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   {
     try {
-      result = (arg1)->rbegin();
+      result = ((std::vector< StrokeShader * > const *)arg1)->rbegin();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -97372,7 +96340,7 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_rbegin__SWIG_0(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<StrokeShader * >::reverse_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< StrokeShader * >::const_reverse_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -97380,89 +96348,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ShadersContainer_rbegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ShadersContainer_rend(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::const_reverse_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_rbegin" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<StrokeShader * > const *)arg1)->rbegin();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<StrokeShader * >::const_reverse_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ShadersContainer_rbegin(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ShadersContainer_rbegin__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ShadersContainer_rbegin__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ShadersContainer_rbegin'.\n  Possible C/C++ prototypes are:\n    rbegin()\n    rbegin()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ShadersContainer_rend__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::reverse_iterator result;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::const_reverse_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_rend" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_rend" "', argument " "1"" of type '" "std::vector< StrokeShader * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   {
     try {
-      result = (arg1)->rend();
+      result = ((std::vector< StrokeShader * > const *)arg1)->rend();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -97471,7 +96373,7 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_rend__SWIG_0(PyObject *SWIGUNUSEDPAR
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<StrokeShader * >::reverse_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< StrokeShader * >::const_reverse_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -97479,76 +96381,10 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ShadersContainer_rend__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::const_reverse_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_rend" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<StrokeShader * > const *)arg1)->rend();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<StrokeShader * >::const_reverse_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ShadersContainer_rend(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ShadersContainer_rend__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ShadersContainer_rend__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ShadersContainer_rend'.\n  Possible C/C++ prototypes are:\n    rend()\n    rend()\n");
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_new_ShadersContainer__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * >::size_type arg1 ;
-  std::vector<StrokeShader * > *result = 0 ;
+  std::vector< StrokeShader * >::size_type arg1 ;
+  std::vector< StrokeShader * > *result = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -97556,12 +96392,12 @@ SWIGINTERN PyObject *_wrap_new_ShadersContainer__SWIG_2(PyObject *SWIGUNUSEDPARM
   if (!PyArg_ParseTuple(args,(char *)"O:new_ShadersContainer",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ShadersContainer" "', argument " "1"" of type '" "std::vector<StrokeShader * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ShadersContainer" "', argument " "1"" of type '" "std::vector< StrokeShader * >::size_type""'");
   } 
-  arg1 = static_cast< std::vector<StrokeShader * >::size_type >(val1);
+  arg1 = static_cast< std::vector< StrokeShader * >::size_type >(val1);
   {
     try {
-      result = (std::vector<StrokeShader * > *)new std::vector<StrokeShader * >(arg1);
+      result = (std::vector< StrokeShader * > *)new std::vector< StrokeShader * >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -97570,7 +96406,7 @@ SWIGINTERN PyObject *_wrap_new_ShadersContainer__SWIG_2(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -97579,17 +96415,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_pop_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_pop_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_pop_back" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_pop_back" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   {
     try {
       (arg1)->pop_back();
@@ -97610,8 +96446,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::size_type arg2 ;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::size_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -97620,16 +96456,16 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_resize__SWIG_0(PyObject *SWIGUNUSEDP
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ShadersContainer_resize",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_resize" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_resize" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer_resize" "', argument " "2"" of type '" "std::vector<StrokeShader * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer_resize" "', argument " "2"" of type '" "std::vector< StrokeShader * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<StrokeShader * >::size_type >(val2);
+  arg2 = static_cast< std::vector< StrokeShader * >::size_type >(val2);
   {
     try {
       (arg1)->resize(arg2);
@@ -97650,9 +96486,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::iterator arg2 ;
-  std::vector<StrokeShader * >::iterator result;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::iterator arg2 ;
+  std::vector< StrokeShader * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -97661,20 +96497,20 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_erase__SWIG_0(PyObject *SWIGUNUSEDPA
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ShadersContainer_erase",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_erase" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_erase" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_erase" "', argument " "2"" of type '" "std::vector<StrokeShader * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_erase" "', argument " "2"" of type '" "std::vector< StrokeShader * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< StrokeShader * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< StrokeShader * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_erase" "', argument " "2"" of type '" "std::vector<StrokeShader * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_erase" "', argument " "2"" of type '" "std::vector< StrokeShader * >::iterator""'");
     }
   }
   {
@@ -97688,7 +96524,7 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_erase__SWIG_0(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<StrokeShader * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< StrokeShader * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -97698,10 +96534,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::iterator arg2 ;
-  std::vector<StrokeShader * >::iterator arg3 ;
-  std::vector<StrokeShader * >::iterator result;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::iterator arg2 ;
+  std::vector< StrokeShader * >::iterator arg3 ;
+  std::vector< StrokeShader * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -97713,31 +96549,31 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_erase__SWIG_1(PyObject *SWIGUNUSEDPA
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ShadersContainer_erase",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_erase" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_erase" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_erase" "', argument " "2"" of type '" "std::vector<StrokeShader * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_erase" "', argument " "2"" of type '" "std::vector< StrokeShader * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< StrokeShader * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< StrokeShader * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_erase" "', argument " "2"" of type '" "std::vector<StrokeShader * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_erase" "', argument " "2"" of type '" "std::vector< StrokeShader * >::iterator""'");
     }
   }
   res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res3) || !iter3) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_erase" "', argument " "3"" of type '" "std::vector<StrokeShader * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_erase" "', argument " "3"" of type '" "std::vector< StrokeShader * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *>(iter3);
+    swig::PySwigIterator_T<std::vector< StrokeShader * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< StrokeShader * >::iterator > *>(iter3);
     if (iter_t) {
       arg3 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_erase" "', argument " "3"" of type '" "std::vector<StrokeShader * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_erase" "', argument " "3"" of type '" "std::vector< StrokeShader * >::iterator""'");
     }
   }
   {
@@ -97751,7 +96587,7 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_erase__SWIG_1(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<StrokeShader * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< StrokeShader * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -97765,18 +96601,18 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_erase(PyObject *self, PyObject *args
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator< StrokeShader * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< StrokeShader * >::iterator > *>(iter) != 0));
       if (_v) {
         return _wrap_ShadersContainer_erase__SWIG_0(self, args);
       }
@@ -97784,16 +96620,16 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_erase(PyObject *self, PyObject *args
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator< StrokeShader * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< StrokeShader * >::iterator > *>(iter) != 0));
       if (_v) {
         swig::PySwigIterator *iter = 0;
         int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *>(iter) != 0));
+        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< StrokeShader * >::iterator > *>(iter) != 0));
         if (_v) {
           return _wrap_ShadersContainer_erase__SWIG_1(self, args);
         }
@@ -97802,16 +96638,19 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_erase(PyObject *self, PyObject *args
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ShadersContainer_erase'.\n  Possible C/C++ prototypes are:\n    erase(std::vector<StrokeShader * >::iterator)\n    erase(std::vector<StrokeShader * >::iterator,std::vector<StrokeShader * >::iterator)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ShadersContainer_erase'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    erase(std::vector< StrokeShader * > *,std::vector< StrokeShader * >::iterator)\n"
+    "    erase(std::vector< StrokeShader * > *,std::vector< StrokeShader * >::iterator,std::vector< StrokeShader * >::iterator)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_new_ShadersContainer__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * >::size_type arg1 ;
-  std::vector<StrokeShader * >::value_type arg2 = (std::vector<StrokeShader * >::value_type) 0 ;
-  std::vector<StrokeShader * > *result = 0 ;
+  std::vector< StrokeShader * >::size_type arg1 ;
+  std::vector< StrokeShader * >::value_type arg2 = (std::vector< StrokeShader * >::value_type) 0 ;
+  std::vector< StrokeShader * > *result = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   void *argp2 = 0 ;
@@ -97822,17 +96661,17 @@ SWIGINTERN PyObject *_wrap_new_ShadersContainer__SWIG_3(PyObject *SWIGUNUSEDPARM
   if (!PyArg_ParseTuple(args,(char *)"OO:new_ShadersContainer",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ShadersContainer" "', argument " "1"" of type '" "std::vector<StrokeShader * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ShadersContainer" "', argument " "1"" of type '" "std::vector< StrokeShader * >::size_type""'");
   } 
-  arg1 = static_cast< std::vector<StrokeShader * >::size_type >(val1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
+  arg1 = static_cast< std::vector< StrokeShader * >::size_type >(val1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ShadersContainer" "', argument " "2"" of type '" "std::vector<StrokeShader * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ShadersContainer" "', argument " "2"" of type '" "std::vector< StrokeShader * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<StrokeShader * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector< StrokeShader * >::value_type >(argp2);
   {
     try {
-      result = (std::vector<StrokeShader * > *)new std::vector<StrokeShader * >(arg1,arg2);
+      result = (std::vector< StrokeShader * > *)new std::vector< StrokeShader * >(arg1,arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -97841,7 +96680,7 @@ SWIGINTERN PyObject *_wrap_new_ShadersContainer__SWIG_3(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -97854,7 +96693,7 @@ SWIGINTERN PyObject *_wrap_new_ShadersContainer(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -97873,7 +96712,7 @@ SWIGINTERN PyObject *_wrap_new_ShadersContainer(PyObject *self, PyObject *args)
   }
   if (argc == 1) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator< StrokeShader * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_new_ShadersContainer__SWIG_1(self, args);
@@ -97887,7 +96726,7 @@ SWIGINTERN PyObject *_wrap_new_ShadersContainer(PyObject *self, PyObject *args)
     }
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_new_ShadersContainer__SWIG_3(self, args);
@@ -97896,15 +96735,20 @@ SWIGINTERN PyObject *_wrap_new_ShadersContainer(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ShadersContainer'.\n  Possible C/C++ prototypes are:\n    std::vector<(p.StrokeShader)>()\n    std::vector<(p.StrokeShader)>(std::vector<StrokeShader * > const &)\n    std::vector<(p.StrokeShader)>(std::vector<StrokeShader * >::size_type)\n    std::vector<(p.StrokeShader)>(std::vector<StrokeShader * >::size_type,std::vector<StrokeShader * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ShadersContainer'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    std::vector< StrokeShader * >()\n"
+    "    std::vector< StrokeShader * >(std::vector< StrokeShader * > const &)\n"
+    "    std::vector< StrokeShader * >(std::vector< StrokeShader * >::size_type)\n"
+    "    std::vector< StrokeShader * >(std::vector< StrokeShader * >::size_type,std::vector< StrokeShader * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_push_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::value_type arg2 = (std::vector<StrokeShader * >::value_type) 0 ;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::value_type arg2 = (std::vector< StrokeShader * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -97913,16 +96757,16 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_push_back(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ShadersContainer_push_back",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_push_back" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_push_back" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ShadersContainer_push_back" "', argument " "2"" of type '" "std::vector<StrokeShader * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ShadersContainer_push_back" "', argument " "2"" of type '" "std::vector< StrokeShader * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<StrokeShader * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector< StrokeShader * >::value_type >(argp2);
   {
     try {
       (arg1)->push_back(arg2);
@@ -97943,21 +96787,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_front(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::value_type result;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_front",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_front" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_front" "', argument " "1"" of type '" "std::vector< StrokeShader * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   {
     try {
-      result = (std::vector<StrokeShader * >::value_type)((std::vector<StrokeShader * > const *)arg1)->front();
+      result = (std::vector< StrokeShader * >::value_type)((std::vector< StrokeShader * > const *)arg1)->front();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -97966,7 +96810,7 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_front(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -97975,21 +96819,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::value_type result;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_back" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_back" "', argument " "1"" of type '" "std::vector< StrokeShader * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   {
     try {
-      result = (std::vector<StrokeShader * >::value_type)((std::vector<StrokeShader * > const *)arg1)->back();
+      result = (std::vector< StrokeShader * >::value_type)((std::vector< StrokeShader * > const *)arg1)->back();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -97998,7 +96842,7 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_back(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -98007,9 +96851,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_assign(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::size_type arg2 ;
-  std::vector<StrokeShader * >::value_type arg3 = (std::vector<StrokeShader * >::value_type) 0 ;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::size_type arg2 ;
+  std::vector< StrokeShader * >::value_type arg3 = (std::vector< StrokeShader * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -98021,21 +96865,21 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_assign(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ShadersContainer_assign",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_assign" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_assign" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer_assign" "', argument " "2"" of type '" "std::vector<StrokeShader * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer_assign" "', argument " "2"" of type '" "std::vector< StrokeShader * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<StrokeShader * >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector< StrokeShader * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ShadersContainer_assign" "', argument " "3"" of type '" "std::vector<StrokeShader * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ShadersContainer_assign" "', argument " "3"" of type '" "std::vector< StrokeShader * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<StrokeShader * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< StrokeShader * >::value_type >(argp3);
   {
     try {
       (arg1)->assign(arg2,arg3);
@@ -98056,9 +96900,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::size_type arg2 ;
-  std::vector<StrokeShader * >::value_type arg3 = (std::vector<StrokeShader * >::value_type) 0 ;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::size_type arg2 ;
+  std::vector< StrokeShader * >::value_type arg3 = (std::vector< StrokeShader * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -98070,21 +96914,21 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_resize__SWIG_1(PyObject *SWIGUNUSEDP
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ShadersContainer_resize",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_resize" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_resize" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer_resize" "', argument " "2"" of type '" "std::vector<StrokeShader * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer_resize" "', argument " "2"" of type '" "std::vector< StrokeShader * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<StrokeShader * >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector< StrokeShader * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ShadersContainer_resize" "', argument " "3"" of type '" "std::vector<StrokeShader * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ShadersContainer_resize" "', argument " "3"" of type '" "std::vector< StrokeShader * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<StrokeShader * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< StrokeShader * >::value_type >(argp3);
   {
     try {
       (arg1)->resize(arg2,arg3);
@@ -98109,13 +96953,13 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_resize(PyObject *self, PyObject *arg
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator< StrokeShader * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -98129,7 +96973,7 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_resize(PyObject *self, PyObject *arg
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator< StrokeShader * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -98138,7 +96982,7 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_resize(PyObject *self, PyObject *arg
       }
       if (_v) {
         void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0);
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           return _wrap_ShadersContainer_resize__SWIG_1(self, args);
@@ -98148,17 +96992,20 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_resize(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ShadersContainer_resize'.\n  Possible C/C++ prototypes are:\n    resize(std::vector<StrokeShader * >::size_type)\n    resize(std::vector<StrokeShader * >::size_type,std::vector<StrokeShader * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ShadersContainer_resize'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    resize(std::vector< StrokeShader * > *,std::vector< StrokeShader * >::size_type)\n"
+    "    resize(std::vector< StrokeShader * > *,std::vector< StrokeShader * >::size_type,std::vector< StrokeShader * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::iterator arg2 ;
-  std::vector<StrokeShader * >::value_type arg3 = (std::vector<StrokeShader * >::value_type) 0 ;
-  std::vector<StrokeShader * >::iterator result;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::iterator arg2 ;
+  std::vector< StrokeShader * >::value_type arg3 = (std::vector< StrokeShader * >::value_type) 0 ;
+  std::vector< StrokeShader * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -98170,27 +97017,27 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_insert__SWIG_0(PyObject *SWIGUNUSEDP
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ShadersContainer_insert",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_insert" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_insert" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_insert" "', argument " "2"" of type '" "std::vector<StrokeShader * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_insert" "', argument " "2"" of type '" "std::vector< StrokeShader * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< StrokeShader * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< StrokeShader * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_insert" "', argument " "2"" of type '" "std::vector<StrokeShader * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_insert" "', argument " "2"" of type '" "std::vector< StrokeShader * >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ShadersContainer_insert" "', argument " "3"" of type '" "std::vector<StrokeShader * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ShadersContainer_insert" "', argument " "3"" of type '" "std::vector< StrokeShader * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<StrokeShader * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< StrokeShader * >::value_type >(argp3);
   {
     try {
       result = (arg1)->insert(arg2,arg3);
@@ -98202,7 +97049,7 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_insert__SWIG_0(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<StrokeShader * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< StrokeShader * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -98212,10 +97059,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::iterator arg2 ;
-  std::vector<StrokeShader * >::size_type arg3 ;
-  std::vector<StrokeShader * >::value_type arg4 = (std::vector<StrokeShader * >::value_type) 0 ;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::iterator arg2 ;
+  std::vector< StrokeShader * >::size_type arg3 ;
+  std::vector< StrokeShader * >::value_type arg4 = (std::vector< StrokeShader * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -98230,32 +97077,32 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_insert__SWIG_1(PyObject *SWIGUNUSEDP
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:ShadersContainer_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_insert" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_insert" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_insert" "', argument " "2"" of type '" "std::vector<StrokeShader * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_insert" "', argument " "2"" of type '" "std::vector< StrokeShader * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< StrokeShader * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< StrokeShader * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_insert" "', argument " "2"" of type '" "std::vector<StrokeShader * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_insert" "', argument " "2"" of type '" "std::vector< StrokeShader * >::iterator""'");
     }
   }
   ecode3 = SWIG_AsVal_size_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ShadersContainer_insert" "', argument " "3"" of type '" "std::vector<StrokeShader * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ShadersContainer_insert" "', argument " "3"" of type '" "std::vector< StrokeShader * >::size_type""'");
   } 
-  arg3 = static_cast< std::vector<StrokeShader * >::size_type >(val3);
-  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
+  arg3 = static_cast< std::vector< StrokeShader * >::size_type >(val3);
+  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ShadersContainer_insert" "', argument " "4"" of type '" "std::vector<StrokeShader * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ShadersContainer_insert" "', argument " "4"" of type '" "std::vector< StrokeShader * >::value_type""'"); 
   }
-  arg4 = reinterpret_cast< std::vector<StrokeShader * >::value_type >(argp4);
+  arg4 = reinterpret_cast< std::vector< StrokeShader * >::value_type >(argp4);
   {
     try {
       (arg1)->insert(arg2,arg3,arg4);
@@ -98280,21 +97127,21 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_insert(PyObject *self, PyObject *arg
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator< StrokeShader * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< StrokeShader * >::iterator > *>(iter) != 0));
       if (_v) {
         void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0);
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           return _wrap_ShadersContainer_insert__SWIG_0(self, args);
@@ -98304,12 +97151,12 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_insert(PyObject *self, PyObject *arg
   }
   if (argc == 4) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator< StrokeShader * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< StrokeShader * >::iterator > *>(iter) != 0));
       if (_v) {
         {
           int res = SWIG_AsVal_size_t(argv[2], NULL);
@@ -98317,7 +97164,7 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_insert(PyObject *self, PyObject *arg
         }
         if (_v) {
           void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0);
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0);
           _v = SWIG_CheckState(res);
           if (_v) {
             return _wrap_ShadersContainer_insert__SWIG_1(self, args);
@@ -98328,15 +97175,18 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_insert(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ShadersContainer_insert'.\n  Possible C/C++ prototypes are:\n    insert(std::vector<StrokeShader * >::iterator,std::vector<StrokeShader * >::value_type)\n    insert(std::vector<StrokeShader * >::iterator,std::vector<StrokeShader * >::size_type,std::vector<StrokeShader * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ShadersContainer_insert'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    insert(std::vector< StrokeShader * > *,std::vector< StrokeShader * >::iterator,std::vector< StrokeShader * >::value_type)\n"
+    "    insert(std::vector< StrokeShader * > *,std::vector< StrokeShader * >::iterator,std::vector< StrokeShader * >::size_type,std::vector< StrokeShader * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_reserve(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::size_type arg2 ;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::size_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -98345,16 +97195,16 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_reserve(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ShadersContainer_reserve",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_reserve" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_reserve" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer_reserve" "', argument " "2"" of type '" "std::vector<StrokeShader * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer_reserve" "', argument " "2"" of type '" "std::vector< StrokeShader * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<StrokeShader * >::size_type >(val2);
+  arg2 = static_cast< std::vector< StrokeShader * >::size_type >(val2);
   {
     try {
       (arg1)->reserve(arg2);
@@ -98375,21 +97225,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_capacity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::size_type result;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_capacity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_capacity" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_capacity" "', argument " "1"" of type '" "std::vector< StrokeShader * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   {
     try {
-      result = ((std::vector<StrokeShader * > const *)arg1)->capacity();
+      result = ((std::vector< StrokeShader * > const *)arg1)->capacity();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -98407,17 +97257,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_ShadersContainer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_ShadersContainer",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ShadersContainer" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ShadersContainer" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   {
     try {
       delete arg1;
@@ -98439,8 +97289,8 @@ fail:
 
 SWIGINTERN PyObject *ShadersContainer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
@@ -98634,7 +97484,7 @@ fail:
 
 SWIGINTERN PyObject *StrokeShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -98780,7 +97630,7 @@ fail:
 
 SWIGINTERN PyObject *ConstantThicknessShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__ConstantThicknessShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -98926,7 +97776,7 @@ fail:
 
 SWIGINTERN PyObject *ConstantExternThicknessShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__ConstantExternThicknessShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -99049,7 +97899,7 @@ fail:
 
 SWIGINTERN PyObject *IncreasingThicknessShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__IncreasingThicknessShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -99181,7 +98031,7 @@ fail:
 
 SWIGINTERN PyObject *ConstrainedIncreasingThicknessShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__ConstrainedIncreasingThicknessShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -99304,7 +98154,7 @@ fail:
 
 SWIGINTERN PyObject *LengthDependingThicknessShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__LengthDependingThicknessShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -99505,7 +98355,7 @@ SWIGINTERN PyObject *_wrap_new_ThicknessVariationPatternShader(PyObject *self, P
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -99579,7 +98429,12 @@ SWIGINTERN PyObject *_wrap_new_ThicknessVariationPatternShader(PyObject *self, P
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ThicknessVariationPatternShader'.\n  Possible C/C++ prototypes are:\n    StrokeShaders::ThicknessVariationPatternShader(std::string const,float,float,bool)\n    StrokeShaders::ThicknessVariationPatternShader(std::string const,float,float)\n    StrokeShaders::ThicknessVariationPatternShader(std::string const,float)\n    StrokeShaders::ThicknessVariationPatternShader(std::string const)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ThicknessVariationPatternShader'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    StrokeShaders::ThicknessVariationPatternShader(std::string const,float,float,bool)\n"
+    "    StrokeShaders::ThicknessVariationPatternShader(std::string const,float,float)\n"
+    "    StrokeShaders::ThicknessVariationPatternShader(std::string const,float)\n"
+    "    StrokeShaders::ThicknessVariationPatternShader(std::string const)\n");
   return NULL;
 }
 
@@ -99661,7 +98516,7 @@ fail:
 
 SWIGINTERN PyObject *ThicknessVariationPatternShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__ThicknessVariationPatternShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -99736,7 +98591,7 @@ SWIGINTERN PyObject *_wrap_new_ThicknessNoiseShader(PyObject *self, PyObject *ar
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -99761,7 +98616,10 @@ SWIGINTERN PyObject *_wrap_new_ThicknessNoiseShader(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ThicknessNoiseShader'.\n  Possible C/C++ prototypes are:\n    StrokeShaders::ThicknessNoiseShader()\n    StrokeShaders::ThicknessNoiseShader(float,float)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ThicknessNoiseShader'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    StrokeShaders::ThicknessNoiseShader()\n"
+    "    StrokeShaders::ThicknessNoiseShader(float,float)\n");
   return NULL;
 }
 
@@ -99843,7 +98701,7 @@ fail:
 
 SWIGINTERN PyObject *ThicknessNoiseShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__ThicknessNoiseShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -99963,7 +98821,7 @@ SWIGINTERN PyObject *_wrap_new_ConstantColorShader(PyObject *self, PyObject *arg
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -100019,7 +98877,10 @@ SWIGINTERN PyObject *_wrap_new_ConstantColorShader(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ConstantColorShader'.\n  Possible C/C++ prototypes are:\n    StrokeShaders::ConstantColorShader(float,float,float,float)\n    StrokeShaders::ConstantColorShader(float,float,float)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ConstantColorShader'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    StrokeShaders::ConstantColorShader(float,float,float,float)\n"
+    "    StrokeShaders::ConstantColorShader(float,float,float)\n");
   return NULL;
 }
 
@@ -100133,7 +98994,7 @@ fail:
 
 SWIGINTERN PyObject *ConstantColorShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__ConstantColorShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -100310,7 +99171,7 @@ fail:
 
 SWIGINTERN PyObject *IncreasingColorShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__IncreasingColorShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -100398,7 +99259,7 @@ SWIGINTERN PyObject *_wrap_new_ColorVariationPatternShader(PyObject *self, PyObj
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -100426,7 +99287,10 @@ SWIGINTERN PyObject *_wrap_new_ColorVariationPatternShader(PyObject *self, PyObj
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ColorVariationPatternShader'.\n  Possible C/C++ prototypes are:\n    StrokeShaders::ColorVariationPatternShader(std::string const,bool)\n    StrokeShaders::ColorVariationPatternShader(std::string const)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ColorVariationPatternShader'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    StrokeShaders::ColorVariationPatternShader(std::string const,bool)\n"
+    "    StrokeShaders::ColorVariationPatternShader(std::string const)\n");
   return NULL;
 }
 
@@ -100508,7 +99372,7 @@ fail:
 
 SWIGINTERN PyObject *ColorVariationPatternShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__ColorVariationPatternShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -100574,7 +99438,7 @@ SWIGINTERN PyObject *_wrap_new_MaterialColorShader(PyObject *self, PyObject *arg
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -100593,7 +99457,10 @@ SWIGINTERN PyObject *_wrap_new_MaterialColorShader(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_MaterialColorShader'.\n  Possible C/C++ prototypes are:\n    StrokeShaders::MaterialColorShader(float)\n    StrokeShaders::MaterialColorShader()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_MaterialColorShader'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    StrokeShaders::MaterialColorShader(float)\n"
+    "    StrokeShaders::MaterialColorShader()\n");
   return NULL;
 }
 
@@ -100675,7 +99542,7 @@ fail:
 
 SWIGINTERN PyObject *MaterialColorShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__MaterialColorShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -100689,7 +99556,7 @@ SWIGINTERN PyObject *_wrap_new_CalligraphicColorShader(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_CalligraphicColorShader",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CalligraphicColorShader" "', argument " "1"" of type '" "Geometry::Vec2d const &""'"); 
   }
@@ -100792,7 +99659,7 @@ fail:
 
 SWIGINTERN PyObject *CalligraphicColorShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__CalligraphicColorShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -100867,7 +99734,7 @@ SWIGINTERN PyObject *_wrap_new_ColorNoiseShader(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -100892,7 +99759,10 @@ SWIGINTERN PyObject *_wrap_new_ColorNoiseShader(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ColorNoiseShader'.\n  Possible C/C++ prototypes are:\n    StrokeShaders::ColorNoiseShader()\n    StrokeShaders::ColorNoiseShader(float,float)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ColorNoiseShader'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    StrokeShaders::ColorNoiseShader()\n"
+    "    StrokeShaders::ColorNoiseShader(float,float)\n");
   return NULL;
 }
 
@@ -100974,7 +99844,7 @@ fail:
 
 SWIGINTERN PyObject *ColorNoiseShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__ColorNoiseShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -101088,7 +99958,7 @@ fail:
 
 SWIGINTERN PyObject *TextureAssignerShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__TextureAssignerShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -101228,7 +100098,7 @@ SWIGINTERN PyObject *_wrap_new_StrokeTextureShader(PyObject *self, PyObject *arg
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -101276,7 +100146,11 @@ SWIGINTERN PyObject *_wrap_new_StrokeTextureShader(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_StrokeTextureShader'.\n  Possible C/C++ prototypes are:\n    StrokeShaders::StrokeTextureShader(std::string const,Stroke::MediumType,bool)\n    StrokeShaders::StrokeTextureShader(std::string const,Stroke::MediumType)\n    StrokeShaders::StrokeTextureShader(std::string const)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_StrokeTextureShader'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    StrokeShaders::StrokeTextureShader(std::string const,Stroke::MediumType,bool)\n"
+    "    StrokeShaders::StrokeTextureShader(std::string const,Stroke::MediumType)\n"
+    "    StrokeShaders::StrokeTextureShader(std::string const)\n");
   return NULL;
 }
 
@@ -101358,7 +100232,7 @@ fail:
 
 SWIGINTERN PyObject *StrokeTextureShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__StrokeTextureShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -101424,7 +100298,7 @@ SWIGINTERN PyObject *_wrap_new_BackboneStretcherShader(PyObject *self, PyObject
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -101443,7 +100317,10 @@ SWIGINTERN PyObject *_wrap_new_BackboneStretcherShader(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_BackboneStretcherShader'.\n  Possible C/C++ prototypes are:\n    StrokeShaders::BackboneStretcherShader(float)\n    StrokeShaders::BackboneStretcherShader()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_BackboneStretcherShader'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    StrokeShaders::BackboneStretcherShader(float)\n"
+    "    StrokeShaders::BackboneStretcherShader()\n");
   return NULL;
 }
 
@@ -101525,7 +100402,7 @@ fail:
 
 SWIGINTERN PyObject *BackboneStretcherShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__BackboneStretcherShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -101639,7 +100516,7 @@ fail:
 
 SWIGINTERN PyObject *SamplingShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__SamplingShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -101705,7 +100582,7 @@ SWIGINTERN PyObject *_wrap_new_ExternalContourStretcherShader(PyObject *self, Py
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -101724,7 +100601,10 @@ SWIGINTERN PyObject *_wrap_new_ExternalContourStretcherShader(PyObject *self, Py
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ExternalContourStretcherShader'.\n  Possible C/C++ prototypes are:\n    StrokeShaders::ExternalContourStretcherShader(float)\n    StrokeShaders::ExternalContourStretcherShader()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ExternalContourStretcherShader'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    StrokeShaders::ExternalContourStretcherShader(float)\n"
+    "    StrokeShaders::ExternalContourStretcherShader()\n");
   return NULL;
 }
 
@@ -101806,7 +100686,7 @@ fail:
 
 SWIGINTERN PyObject *ExternalContourStretcherShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__ExternalContourStretcherShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -101911,7 +100791,7 @@ fail:
 
 SWIGINTERN PyObject *BSplineShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__BSplineShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -101977,7 +100857,7 @@ SWIGINTERN PyObject *_wrap_new_BezierCurveShader(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -101996,7 +100876,10 @@ SWIGINTERN PyObject *_wrap_new_BezierCurveShader(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_BezierCurveShader'.\n  Possible C/C++ prototypes are:\n    StrokeShaders::BezierCurveShader(float)\n    StrokeShaders::BezierCurveShader()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_BezierCurveShader'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    StrokeShaders::BezierCurveShader(float)\n"
+    "    StrokeShaders::BezierCurveShader()\n");
   return NULL;
 }
 
@@ -102078,7 +100961,7 @@ fail:
 
 SWIGINTERN PyObject *BezierCurveShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__BezierCurveShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -102201,7 +101084,7 @@ fail:
 
 SWIGINTERN PyObject *InflateShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__InflateShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -102315,7 +101198,7 @@ fail:
 
 SWIGINTERN PyObject *PolygonalizationShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__PolygonalizationShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -102429,7 +101312,7 @@ fail:
 
 SWIGINTERN PyObject *GuidingLinesShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__GuidingLinesShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -102543,7 +101426,7 @@ fail:
 
 SWIGINTERN PyObject *TipRemoverShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__TipRemoverShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -102680,7 +101563,7 @@ fail:
 
 SWIGINTERN PyObject *streamShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__streamShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -102829,7 +101712,7 @@ fail:
 
 SWIGINTERN PyObject *fstreamShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__fstreamShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -102865,7 +101748,7 @@ SWIGINTERN PyObject *_wrap_new_CalligraphicShader(PyObject *SWIGUNUSEDPARM(self)
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CalligraphicShader" "', argument " "2"" of type '" "real""'");
   } 
   arg2 = static_cast< real >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0  | 0);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2T_float_t,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_CalligraphicShader" "', argument " "3"" of type '" "Geometry::Vec2f const &""'"); 
   }
@@ -102973,7 +101856,7 @@ fail:
 
 SWIGINTERN PyObject *CalligraphicShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CalligraphicShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -103123,7 +102006,7 @@ fail:
 
 SWIGINTERN PyObject *SpatialNoiseShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_SpatialNoiseShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -103300,7 +102183,7 @@ fail:
 
 SWIGINTERN PyObject *SmoothingShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_SmoothingShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -103508,7 +102391,7 @@ fail:
 
 SWIGINTERN PyObject *Smoother_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Smoother, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -103649,7 +102532,7 @@ fail:
 
 SWIGINTERN PyObject *Omitter_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Omitter, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -103790,7 +102673,7 @@ fail:
 
 SWIGINTERN PyObject *OmissionShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_OmissionShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -103833,7 +102716,7 @@ SWIGINTERN PyObject *_wrap_Operators_chain__SWIG_0(PyObject *SWIGUNUSEDPARM(self
   PyObject *resultobj = 0;
   ViewEdgeInternal::ViewEdgeIterator *arg1 = 0 ;
   UnaryPredicate1D *arg2 = 0 ;
-  UnaryFunction1D<void > *arg3 = 0 ;
+  UnaryFunction1D< void > *arg3 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -103861,14 +102744,14 @@ SWIGINTERN PyObject *_wrap_Operators_chain__SWIG_0(PyObject *SWIGUNUSEDPARM(self
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_chain" "', argument " "2"" of type '" "UnaryPredicate1D &""'"); 
   }
   arg2 = reinterpret_cast< UnaryPredicate1D * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_UnaryFunction1DTvoid_t,  0 );
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_UnaryFunction1DT_void_t,  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Operators_chain" "', argument " "3"" of type '" "UnaryFunction1D<void > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Operators_chain" "', argument " "3"" of type '" "UnaryFunction1D< void > &""'"); 
   }
   if (!argp3) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_chain" "', argument " "3"" of type '" "UnaryFunction1D<void > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_chain" "', argument " "3"" of type '" "UnaryFunction1D< void > &""'"); 
   }
-  arg3 = reinterpret_cast< UnaryFunction1D<void > * >(argp3);
+  arg3 = reinterpret_cast< UnaryFunction1D< void > * >(argp3);
   {
     try {
       Operators::chain(*arg1,*arg2,*arg3);
@@ -103939,7 +102822,7 @@ SWIGINTERN PyObject *_wrap_Operators_chain(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -103968,7 +102851,7 @@ SWIGINTERN PyObject *_wrap_Operators_chain(PyObject *self, PyObject *args) {
       _v = SWIG_CheckState(res);
       if (_v) {
         void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_UnaryFunction1DTvoid_t, 0);
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_UnaryFunction1DT_void_t, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           return _wrap_Operators_chain__SWIG_0(self, args);
@@ -103978,7 +102861,10 @@ SWIGINTERN PyObject *_wrap_Operators_chain(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Operators_chain'.\n  Possible C/C++ prototypes are:\n    chain(ViewEdgeInternal::ViewEdgeIterator &,UnaryPredicate1D &,UnaryFunction1D<void > &)\n    Operators::chain(ViewEdgeInternal::ViewEdgeIterator &,UnaryPredicate1D &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Operators_chain'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    chain(ViewEdgeInternal::ViewEdgeIterator &,UnaryPredicate1D &,UnaryFunction1D< void > &)\n"
+    "    Operators::chain(ViewEdgeInternal::ViewEdgeIterator &,UnaryPredicate1D &)\n");
   return NULL;
 }
 
@@ -104069,7 +102955,7 @@ SWIGINTERN PyObject *_wrap_Operators_bidirectionalChain(PyObject *self, PyObject
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -104098,7 +102984,10 @@ SWIGINTERN PyObject *_wrap_Operators_bidirectionalChain(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Operators_bidirectionalChain'.\n  Possible C/C++ prototypes are:\n    bidirectionalChain(ChainingIterator &,UnaryPredicate1D &)\n    Operators::bidirectionalChain(ChainingIterator &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Operators_bidirectionalChain'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    bidirectionalChain(ChainingIterator &,UnaryPredicate1D &)\n"
+    "    Operators::bidirectionalChain(ChainingIterator &)\n");
   return NULL;
 }
 
@@ -104287,7 +103176,7 @@ SWIGINTERN PyObject *_wrap_Operators_sequentialSplit(PyObject *self, PyObject *a
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -104351,14 +103240,19 @@ SWIGINTERN PyObject *_wrap_Operators_sequentialSplit(PyObject *self, PyObject *a
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Operators_sequentialSplit'.\n  Possible C/C++ prototypes are:\n    sequentialSplit(UnaryPredicate0D &,UnaryPredicate0D &,float)\n    sequentialSplit(UnaryPredicate0D &,UnaryPredicate0D &)\n    sequentialSplit(UnaryPredicate0D &,float)\n    Operators::sequentialSplit(UnaryPredicate0D &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Operators_sequentialSplit'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    sequentialSplit(UnaryPredicate0D &,UnaryPredicate0D &,float)\n"
+    "    sequentialSplit(UnaryPredicate0D &,UnaryPredicate0D &)\n"
+    "    sequentialSplit(UnaryPredicate0D &,float)\n"
+    "    Operators::sequentialSplit(UnaryPredicate0D &)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Operators_recursiveSplit__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<double > *arg1 = 0 ;
+  UnaryFunction0D< double > *arg1 = 0 ;
   UnaryPredicate1D *arg2 = 0 ;
   float arg3 ;
   void *argp1 = 0 ;
@@ -104372,14 +103266,14 @@ SWIGINTERN PyObject *_wrap_Operators_recursiveSplit__SWIG_0(PyObject *SWIGUNUSED
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:Operators_recursiveSplit",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DTdouble_t,  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DT_double_t,  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D< double > &""'"); 
   }
   if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D< double > &""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< double > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_UnaryPredicate1D,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Operators_recursiveSplit" "', argument " "2"" of type '" "UnaryPredicate1D &""'"); 
@@ -104413,7 +103307,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Operators_recursiveSplit__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<double > *arg1 = 0 ;
+  UnaryFunction0D< double > *arg1 = 0 ;
   UnaryPredicate1D *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -104423,14 +103317,14 @@ SWIGINTERN PyObject *_wrap_Operators_recursiveSplit__SWIG_1(PyObject *SWIGUNUSED
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Operators_recursiveSplit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DTdouble_t,  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DT_double_t,  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D< double > &""'"); 
   }
   if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D< double > &""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< double > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_UnaryPredicate1D,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Operators_recursiveSplit" "', argument " "2"" of type '" "UnaryPredicate1D &""'"); 
@@ -104459,7 +103353,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Operators_recursiveSplit__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<double > *arg1 = 0 ;
+  UnaryFunction0D< double > *arg1 = 0 ;
   UnaryPredicate0D *arg2 = 0 ;
   UnaryPredicate1D *arg3 = 0 ;
   float arg4 ;
@@ -104477,14 +103371,14 @@ SWIGINTERN PyObject *_wrap_Operators_recursiveSplit__SWIG_2(PyObject *SWIGUNUSED
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:Operators_recursiveSplit",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DTdouble_t,  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DT_double_t,  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D< double > &""'"); 
   }
   if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D< double > &""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< double > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_UnaryPredicate0D,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Operators_recursiveSplit" "', argument " "2"" of type '" "UnaryPredicate0D &""'"); 
@@ -104526,7 +103420,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Operators_recursiveSplit__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<double > *arg1 = 0 ;
+  UnaryFunction0D< double > *arg1 = 0 ;
   UnaryPredicate0D *arg2 = 0 ;
   UnaryPredicate1D *arg3 = 0 ;
   void *argp1 = 0 ;
@@ -104540,14 +103434,14 @@ SWIGINTERN PyObject *_wrap_Operators_recursiveSplit__SWIG_3(PyObject *SWIGUNUSED
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:Operators_recursiveSplit",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DTdouble_t,  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DT_double_t,  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D< double > &""'"); 
   }
   if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D< double > &""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< double > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_UnaryPredicate0D,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Operators_recursiveSplit" "', argument " "2"" of type '" "UnaryPredicate0D &""'"); 
@@ -104588,14 +103482,14 @@ SWIGINTERN PyObject *_wrap_Operators_recursiveSplit(PyObject *self, PyObject *ar
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DTdouble_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DT_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
@@ -104609,7 +103503,7 @@ SWIGINTERN PyObject *_wrap_Operators_recursiveSplit(PyObject *self, PyObject *ar
   if (argc == 3) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DTdouble_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DT_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
@@ -104629,7 +103523,7 @@ SWIGINTERN PyObject *_wrap_Operators_recursiveSplit(PyObject *self, PyObject *ar
   if (argc == 3) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DTdouble_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DT_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
@@ -104648,7 +103542,7 @@ SWIGINTERN PyObject *_wrap_Operators_recursiveSplit(PyObject *self, PyObject *ar
   if (argc == 4) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DTdouble_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DT_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
@@ -104672,7 +103566,12 @@ SWIGINTERN PyObject *_wrap_Operators_recursiveSplit(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Operators_recursiveSplit'.\n  Possible C/C++ prototypes are:\n    recursiveSplit(UnaryFunction0D<double > &,UnaryPredicate1D &,float)\n    recursiveSplit(UnaryFunction0D<double > &,UnaryPredicate1D &)\n    recursiveSplit(UnaryFunction0D<double > &,UnaryPredicate0D &,UnaryPredicate1D &,float)\n    Operators::recursiveSplit(UnaryFunction0D<double > &,UnaryPredicate0D &,UnaryPredicate1D &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Operators_recursiveSplit'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    recursiveSplit(UnaryFunction0D< double > &,UnaryPredicate1D &,float)\n"
+    "    recursiveSplit(UnaryFunction0D< double > &,UnaryPredicate1D &)\n"
+    "    recursiveSplit(UnaryFunction0D< double > &,UnaryPredicate0D &,UnaryPredicate1D &,float)\n"
+    "    Operators::recursiveSplit(UnaryFunction0D< double > &,UnaryPredicate0D &,UnaryPredicate1D &)\n");
   return NULL;
 }
 
@@ -104714,7 +103613,7 @@ fail:
 SWIGINTERN PyObject *_wrap_Operators_create(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   UnaryPredicate1D *arg1 = 0 ;
-  std::vector<StrokeShader * > arg2 ;
+  std::vector< StrokeShader * > arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -104730,10 +103629,10 @@ SWIGINTERN PyObject *_wrap_Operators_create(PyObject *SWIGUNUSEDPARM(self), PyOb
   }
   arg1 = reinterpret_cast< UnaryPredicate1D * >(argp1);
   {
-    std::vector<StrokeShader*,std::allocator<StrokeShader * > > *ptr = (std::vector<StrokeShader*,std::allocator<StrokeShader * > > *)0;
+    std::vector<StrokeShader*,std::allocator< StrokeShader * > > *ptr = (std::vector<StrokeShader*,std::allocator< StrokeShader * > > *)0;
     int res = swig::asptr(obj1, &ptr);
     if (!SWIG_IsOK(res) || !ptr) {
-      SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "Operators_create" "', argument " "2"" of type '" "std::vector<StrokeShader * >""'"); 
+      SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "Operators_create" "', argument " "2"" of type '" "std::vector< StrokeShader * >""'"); 
     }
     arg2 = *ptr;
     if (SWIG_IsNewObj(res)) delete ptr;
@@ -104955,7 +103854,7 @@ fail:
 
 SWIGINTERN PyObject *Operators_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Operators, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -105073,7 +103972,7 @@ fail:
 
 SWIGINTERN PyObject *ltstr_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ltstr, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -105858,7 +104757,7 @@ SWIGINTERN PyObject *_wrap_Canvas_loadMap(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 5); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -105933,7 +104832,11 @@ SWIGINTERN PyObject *_wrap_Canvas_loadMap(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Canvas_loadMap'.\n  Possible C/C++ prototypes are:\n    loadMap(char const *,char const *,unsigned int,float)\n    loadMap(char const *,char const *,unsigned int)\n    loadMap(char const *,char const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Canvas_loadMap'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    loadMap(Canvas *,char const *,char const *,unsigned int,float)\n"
+    "    loadMap(Canvas *,char const *,char const *,unsigned int)\n"
+    "    loadMap(Canvas *,char const *,char const *)\n");
   return NULL;
 }
 
@@ -106151,7 +105054,7 @@ SWIGINTERN PyObject *_wrap_Canvas_selectedFEdge(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -106175,7 +105078,10 @@ SWIGINTERN PyObject *_wrap_Canvas_selectedFEdge(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Canvas_selectedFEdge'.\n  Possible C/C++ prototypes are:\n    selectedFEdge()\n    selectedFEdge()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Canvas_selectedFEdge'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    selectedFEdge(Canvas const *)\n"
+    "    selectedFEdge(Canvas *)\n");
   return NULL;
 }
 
@@ -106279,7 +105185,7 @@ fail:
 SWIGINTERN PyObject *_wrap_Canvas_scene3DBBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   Canvas *arg1 = (Canvas *) 0 ;
-  SwigValueWrapper<BBox<VecMat::Vec3<double > > > result;
+  SwigValueWrapper< BBox< VecMat::Vec3< double > > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -106301,7 +105207,7 @@ SWIGINTERN PyObject *_wrap_Canvas_scene3DBBox(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new BBox<Geometry::Vec3r >(static_cast< const BBox<Geometry::Vec3r >& >(result))), SWIGTYPE_p_BBoxTVecMat__Vec3Tdouble_t_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new BBox< Geometry::Vec3r >(static_cast< const BBox< Geometry::Vec3r >& >(result))), SWIGTYPE_p_BBoxT_VecMat__Vec3T_double_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -106837,7 +105743,7 @@ SWIGINTERN PyObject *_wrap_Canvas_changePaperTexture(PyObject *self, PyObject *a
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -106867,7 +105773,10 @@ SWIGINTERN PyObject *_wrap_Canvas_changePaperTexture(PyObject *self, PyObject *a
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Canvas_changePaperTexture'.\n  Possible C/C++ prototypes are:\n    changePaperTexture(bool)\n    changePaperTexture()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Canvas_changePaperTexture'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    changePaperTexture(Canvas *,bool)\n"
+    "    changePaperTexture(Canvas *)\n");
   return NULL;
 }
 
@@ -106980,7 +105889,7 @@ SWIGINTERN PyObject *_wrap_Canvas_resetModified(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -107010,7 +105919,10 @@ SWIGINTERN PyObject *_wrap_Canvas_resetModified(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Canvas_resetModified'.\n  Possible C/C++ prototypes are:\n    resetModified(bool)\n    resetModified()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Canvas_resetModified'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    resetModified(Canvas *,bool)\n"
+    "    resetModified(Canvas *)\n");
   return NULL;
 }
 
@@ -107018,7 +105930,7 @@ fail:
 SWIGINTERN PyObject *_wrap_Canvas_causalStyleModules__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   Canvas *arg1 = (Canvas *) 0 ;
-  std::vector<unsigned int,std::allocator<unsigned int > > *arg2 = 0 ;
+  std::vector< unsigned int,std::allocator< unsigned int > > *arg2 = 0 ;
   unsigned int arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -107036,14 +105948,14 @@ SWIGINTERN PyObject *_wrap_Canvas_causalStyleModules__SWIG_0(PyObject *SWIGUNUSE
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_causalStyleModules" "', argument " "1"" of type '" "Canvas *""'"); 
   }
   arg1 = reinterpret_cast< Canvas * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTunsigned_int_std__allocatorTunsigned_int_t_t,  0 );
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Canvas_causalStyleModules" "', argument " "2"" of type '" "std::vector<unsigned int,std::allocator<unsigned int > > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Canvas_causalStyleModules" "', argument " "2"" of type '" "std::vector< unsigned int,std::allocator< unsigned int > > &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Canvas_causalStyleModules" "', argument " "2"" of type '" "std::vector<unsigned int,std::allocator<unsigned int > > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Canvas_causalStyleModules" "', argument " "2"" of type '" "std::vector< unsigned int,std::allocator< unsigned int > > &""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<unsigned int,std::allocator<unsigned int > > * >(argp2);
+  arg2 = reinterpret_cast< std::vector< unsigned int,std::allocator< unsigned int > > * >(argp2);
   ecode3 = SWIG_AsVal_unsigned_SS_int(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Canvas_causalStyleModules" "', argument " "3"" of type '" "unsigned int""'");
@@ -107070,7 +105982,7 @@ fail:
 SWIGINTERN PyObject *_wrap_Canvas_causalStyleModules__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   Canvas *arg1 = (Canvas *) 0 ;
-  std::vector<unsigned int,std::allocator<unsigned int > > *arg2 = 0 ;
+  std::vector< unsigned int,std::allocator< unsigned int > > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -107084,14 +105996,14 @@ SWIGINTERN PyObject *_wrap_Canvas_causalStyleModules__SWIG_1(PyObject *SWIGUNUSE
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_causalStyleModules" "', argument " "1"" of type '" "Canvas *""'"); 
   }
   arg1 = reinterpret_cast< Canvas * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTunsigned_int_std__allocatorTunsigned_int_t_t,  0 );
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Canvas_causalStyleModules" "', argument " "2"" of type '" "std::vector<unsigned int,std::allocator<unsigned int > > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Canvas_causalStyleModules" "', argument " "2"" of type '" "std::vector< unsigned int,std::allocator< unsigned int > > &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Canvas_causalStyleModules" "', argument " "2"" of type '" "std::vector<unsigned int,std::allocator<unsigned int > > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Canvas_causalStyleModules" "', argument " "2"" of type '" "std::vector< unsigned int,std::allocator< unsigned int > > &""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<unsigned int,std::allocator<unsigned int > > * >(argp2);
+  arg2 = reinterpret_cast< std::vector< unsigned int,std::allocator< unsigned int > > * >(argp2);
   {
     try {
       (arg1)->causalStyleModules(*arg2);
@@ -107116,7 +106028,7 @@ SWIGINTERN PyObject *_wrap_Canvas_causalStyleModules(PyObject *self, PyObject *a
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -107127,7 +106039,7 @@ SWIGINTERN PyObject *_wrap_Canvas_causalStyleModules(PyObject *self, PyObject *a
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_std__vectorTunsigned_int_std__allocatorTunsigned_int_t_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Canvas_causalStyleModules__SWIG_1(self, args);
@@ -107141,7 +106053,7 @@ SWIGINTERN PyObject *_wrap_Canvas_causalStyleModules(PyObject *self, PyObject *a
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_std__vectorTunsigned_int_std__allocatorTunsigned_int_t_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         {
@@ -107156,7 +106068,10 @@ SWIGINTERN PyObject *_wrap_Canvas_causalStyleModules(PyObject *self, PyObject *a
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Canvas_causalStyleModules'.\n  Possible C/C++ prototypes are:\n    causalStyleModules(std::vector<unsigned int,std::allocator<unsigned int > > &,unsigned int)\n    causalStyleModules(std::vector<unsigned int,std::allocator<unsigned int > > &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Canvas_causalStyleModules'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    causalStyleModules(Canvas *,std::vector< unsigned int,std::allocator< unsigned int > > &,unsigned int)\n"
+    "    causalStyleModules(Canvas *,std::vector< unsigned int,std::allocator< unsigned int > > &)\n");
   return NULL;
 }
 
@@ -107212,7 +106127,7 @@ fail:
 
 SWIGINTERN PyObject *Canvas_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Canvas, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -107233,7 +106148,7 @@ SWIGINTERN PyObject *_wrap_castToSVertex(PyObject *SWIGUNUSEDPARM(self), PyObjec
   arg1 = reinterpret_cast< Interface0D * >(argp1);
   {
     try {
-      result = (SVertex *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast<Interface0D,SVertex >(arg1);
+      result = (SVertex *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast< Interface0D,SVertex >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -107265,7 +106180,7 @@ SWIGINTERN PyObject *_wrap_castToViewVertex(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg1 = reinterpret_cast< Interface0D * >(argp1);
   {
     try {
-      result = (ViewVertex *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast<Interface0D,ViewVertex >(arg1);
+      result = (ViewVertex *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast< Interface0D,ViewVertex >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -107297,7 +106212,7 @@ SWIGINTERN PyObject *_wrap_castToTVertex(PyObject *SWIGUNUSEDPARM(self), PyObjec
   arg1 = reinterpret_cast< Interface0D * >(argp1);
   {
     try {
-      result = (TVertex *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast<Interface0D,TVertex >(arg1);
+      result = (TVertex *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast< Interface0D,TVertex >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -107329,7 +106244,7 @@ SWIGINTERN PyObject *_wrap_castToCurvePoint(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg1 = reinterpret_cast< Interface0D * >(argp1);
   {
     try {
-      result = (CurvePoint *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast<Interface0D,CurvePoint >(arg1);
+      result = (CurvePoint *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast< Interface0D,CurvePoint >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -107361,7 +106276,7 @@ SWIGINTERN PyObject *_wrap_castToStrokeVertex(PyObject *SWIGUNUSEDPARM(self), Py
   arg1 = reinterpret_cast< Interface0D * >(argp1);
   {
     try {
-      result = (StrokeVertex *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast<Interface0D,StrokeVertex >(arg1);
+      result = (StrokeVertex *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast< Interface0D,StrokeVertex >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -107393,7 +106308,7 @@ SWIGINTERN PyObject *_wrap_castToNonTVertex(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg1 = reinterpret_cast< Interface0D * >(argp1);
   {
     try {
-      result = (NonTVertex *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast<Interface0D,NonTVertex >(arg1);
+      result = (NonTVertex *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast< Interface0D,NonTVertex >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -107425,7 +106340,7 @@ SWIGINTERN PyObject *_wrap_castToFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject
   arg1 = reinterpret_cast< Interface1D * >(argp1);
   {
     try {
-      result = (FEdge *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast<Interface1D,FEdge >(arg1);
+      result = (FEdge *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast< Interface1D,FEdge >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -107457,7 +106372,7 @@ SWIGINTERN PyObject *_wrap_castToViewEdge(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg1 = reinterpret_cast< Interface1D * >(argp1);
   {
     try {
-      result = (ViewEdge *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast<Interface1D,ViewEdge >(arg1);
+      result = (ViewEdge *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast< Interface1D,ViewEdge >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -107489,7 +106404,7 @@ SWIGINTERN PyObject *_wrap_castToStroke(PyObject *SWIGUNUSEDPARM(self), PyObject
   arg1 = reinterpret_cast< Interface1D * >(argp1);
   {
     try {
-      result = (Stroke *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast<Interface1D,Stroke >(arg1);
+      result = (Stroke *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast< Interface1D,Stroke >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -107521,7 +106436,7 @@ SWIGINTERN PyObject *_wrap_castToChain(PyObject *SWIGUNUSEDPARM(self), PyObject
   arg1 = reinterpret_cast< Interface1D * >(argp1);
   {
     try {
-      result = (Chain *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast<Interface1D,Chain >(arg1);
+      result = (Chain *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast< Interface1D,Chain >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -107866,6 +106781,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"Material___ne__", _wrap_Material___ne__, METH_VARARGS, NULL},
 	 { (char *)"Material___eq__", _wrap_Material___eq__, METH_VARARGS, NULL},
 	 { (char *)"Material_swigregister", Material_swigregister, METH_VARARGS, NULL},
+	 { (char *)"delete_Interface0D", _wrap_delete_Interface0D, METH_VARARGS, NULL},
 	 { (char *)"Interface0D_getExactTypeName", _wrap_Interface0D_getExactTypeName, METH_VARARGS, NULL},
 	 { (char *)"Interface0D_getX", _wrap_Interface0D_getX, METH_VARARGS, NULL},
 	 { (char *)"Interface0D_getY", _wrap_Interface0D_getY, METH_VARARGS, NULL},
@@ -107883,7 +106799,6 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"Interface0D_castToNonTVertex", _wrap_Interface0D_castToNonTVertex, METH_VARARGS, NULL},
 	 { (char *)"Interface0D_castToTVertex", _wrap_Interface0D_castToTVertex, METH_VARARGS, NULL},
 	 { (char *)"new_Interface0D", _wrap_new_Interface0D, METH_VARARGS, NULL},
-	 { (char *)"delete_Interface0D", _wrap_delete_Interface0D, METH_VARARGS, NULL},
 	 { (char *)"Interface0D_swigregister", Interface0D_swigregister, METH_VARARGS, NULL},
 	 { (char *)"delete_Interface0DIteratorNested", _wrap_delete_Interface0DIteratorNested, METH_VARARGS, NULL},
 	 { (char *)"Interface0DIteratorNested_getExactTypeName", _wrap_Interface0DIteratorNested_getExactTypeName, METH_VARARGS, NULL},
@@ -107943,6 +106858,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"Interface0DIterator_castToNonTVertex", _wrap_Interface0DIterator_castToNonTVertex, METH_VARARGS, NULL},
 	 { (char *)"Interface0DIterator_castToTVertex", _wrap_Interface0DIterator_castToTVertex, METH_VARARGS, NULL},
 	 { (char *)"Interface0DIterator_swigregister", Interface0DIterator_swigregister, METH_VARARGS, NULL},
+	 { (char *)"delete_Interface1D", _wrap_delete_Interface1D, METH_VARARGS, NULL},
 	 { (char *)"Interface1D_getExactTypeName", _wrap_Interface1D_getExactTypeName, METH_VARARGS, NULL},
 	 { (char *)"Interface1D_verticesBegin", _wrap_Interface1D_verticesBegin, METH_VARARGS, NULL},
 	 { (char *)"Interface1D_verticesEnd", _wrap_Interface1D_verticesEnd, METH_VARARGS, NULL},
@@ -107953,7 +106869,6 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"Interface1D_getNature", _wrap_Interface1D_getNature, METH_VARARGS, NULL},
 	 { (char *)"Interface1D_getTimeStamp", _wrap_Interface1D_getTimeStamp, METH_VARARGS, NULL},
 	 { (char *)"Interface1D_setTimeStamp", _wrap_Interface1D_setTimeStamp, METH_VARARGS, NULL},
-	 { (char *)"delete_Interface1D", _wrap_delete_Interface1D, METH_VARARGS, NULL},
 	 { (char *)"Interface1D_swigregister", Interface1D_swigregister, METH_VARARGS, NULL},
 	 { (char *)"integrateUnsigned", _wrap_integrateUnsigned, METH_VARARGS, NULL},
 	 { (char *)"integrateFloat", _wrap_integrateFloat, METH_VARARGS, NULL},
@@ -108383,6 +107298,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"ViewMap_viewedges_end", _wrap_ViewMap_viewedges_end, METH_VARARGS, NULL},
 	 { (char *)"ViewMap_viewedges_size", _wrap_ViewMap_viewedges_size, METH_VARARGS, NULL},
 	 { (char *)"ViewMap_viewShape", _wrap_ViewMap_viewShape, METH_VARARGS, NULL},
+	 { (char *)"ViewMap_shapeIdToIndexMap", _wrap_ViewMap_shapeIdToIndexMap, METH_VARARGS, NULL},
 	 { (char *)"ViewMap_getScene3dBBox", _wrap_ViewMap_getScene3dBBox, METH_VARARGS, NULL},
 	 { (char *)"ViewMap_AddViewShape", _wrap_ViewMap_AddViewShape, METH_VARARGS, NULL},
 	 { (char *)"ViewMap_AddViewEdge", _wrap_ViewMap_AddViewEdge, METH_VARARGS, NULL},
@@ -109780,395 +108696,395 @@ static PyMethodDef SwigMethods[] = {
 
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
 
-static void *_p_Functions0D__GetOccludersF0DTo_p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t(void *x) {
-    return (void *)((UnaryFunction0D<std::vector<ViewShape *,std::allocator<ViewShape * > > > *)  ((Functions0D::GetOccludersF0D *) x));
+static void *_p_Functions0D__GetOccludersF0DTo_p_UnaryFunction0DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< std::vector< ViewShape *,std::allocator< ViewShape * > > > *)  ((Functions0D::GetOccludersF0D *) x));
 }
-static void *_p_Functions1D__GetOccludeeF1DTo_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t(void *x) {
-    return (void *)((UnaryFunction1D<std::vector<ViewShape *,std::allocator<ViewShape * > > > *)  ((Functions1D::GetOccludeeF1D *) x));
+static void *_p_Functions1D__GetOccludeeF1DTo_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< std::vector< ViewShape *,std::allocator< ViewShape * > > > *)  ((Functions1D::GetOccludeeF1D *) x));
 }
-static void *_p_Functions1D__GetShapeF1DTo_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t(void *x) {
-    return (void *)((UnaryFunction1D<std::vector<ViewShape *,std::allocator<ViewShape * > > > *)  ((Functions1D::GetShapeF1D *) x));
+static void *_p_Functions1D__GetShapeF1DTo_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< std::vector< ViewShape *,std::allocator< ViewShape * > > > *)  ((Functions1D::GetShapeF1D *) x));
 }
-static void *_p_Functions1D__GetOccludersF1DTo_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t(void *x) {
-    return (void *)((UnaryFunction1D<std::vector<ViewShape *,std::allocator<ViewShape * > > > *)  ((Functions1D::GetOccludersF1D *) x));
+static void *_p_Functions1D__GetOccludersF1DTo_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< std::vector< ViewShape *,std::allocator< ViewShape * > > > *)  ((Functions1D::GetOccludersF1D *) x));
 }
-static void *_p_TVertexTo_p_Interface0D(void *x) {
+static void *_p_TVertexTo_p_Interface0D(void *x, int *newmemory) {
     return (void *)((Interface0D *) (ViewVertex *) ((TVertex *) x));
 }
-static void *_p_NonTVertexTo_p_Interface0D(void *x) {
+static void *_p_NonTVertexTo_p_Interface0D(void *x, int *newmemory) {
     return (void *)((Interface0D *) (ViewVertex *) ((NonTVertex *) x));
 }
-static void *_p_SVertexTo_p_Interface0D(void *x) {
+static void *_p_SVertexTo_p_Interface0D(void *x, int *newmemory) {
     return (void *)((Interface0D *)  ((SVertex *) x));
 }
-static void *_p_ViewVertexTo_p_Interface0D(void *x) {
+static void *_p_ViewVertexTo_p_Interface0D(void *x, int *newmemory) {
     return (void *)((Interface0D *)  ((ViewVertex *) x));
 }
-static void *_p_StrokeVertexTo_p_Interface0D(void *x) {
+static void *_p_StrokeVertexTo_p_Interface0D(void *x, int *newmemory) {
     return (void *)((Interface0D *) (CurvePoint *) ((StrokeVertex *) x));
 }
-static void *_p_CurvePointTo_p_Interface0D(void *x) {
+static void *_p_CurvePointTo_p_Interface0D(void *x, int *newmemory) {
     return (void *)((Interface0D *)  ((CurvePoint *) x));
 }
-static void *_p_Functions0D__GetShapeF0DTo_p_UnaryFunction0DTViewShape_p_t(void *x) {
-    return (void *)((UnaryFunction0D<ViewShape * > *)  ((Functions0D::GetShapeF0D *) x));
+static void *_p_Functions0D__GetShapeF0DTo_p_UnaryFunction0DT_ViewShape_p_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< ViewShape * > *)  ((Functions0D::GetShapeF0D *) x));
 }
-static void *_p_Functions0D__GetOccludeeF0DTo_p_UnaryFunction0DTViewShape_p_t(void *x) {
-    return (void *)((UnaryFunction0D<ViewShape * > *)  ((Functions0D::GetOccludeeF0D *) x));
+static void *_p_Functions0D__GetOccludeeF0DTo_p_UnaryFunction0DT_ViewShape_p_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< ViewShape * > *)  ((Functions0D::GetOccludeeF0D *) x));
 }
-static void *_p_ChainSilhouetteIteratorTo_p_ChainingIterator(void *x) {
+static void *_p_ChainSilhouetteIteratorTo_p_ChainingIterator(void *x, int *newmemory) {
     return (void *)((ChainingIterator *)  ((ChainSilhouetteIterator *) x));
 }
-static void *_p_ChainPredicateIteratorTo_p_ChainingIterator(void *x) {
+static void *_p_ChainPredicateIteratorTo_p_ChainingIterator(void *x, int *newmemory) {
     return (void *)((ChainingIterator *)  ((ChainPredicateIterator *) x));
 }
-static void *_p_ChainingIteratorTo_p_ViewEdgeInternal__ViewEdgeIterator(void *x) {
+static void *_p_ChainingIteratorTo_p_ViewEdgeInternal__ViewEdgeIterator(void *x, int *newmemory) {
     return (void *)((ViewEdgeInternal::ViewEdgeIterator *)  ((ChainingIterator *) x));
 }
-static void *_p_ChainSilhouetteIteratorTo_p_ViewEdgeInternal__ViewEdgeIterator(void *x) {
+static void *_p_ChainSilhouetteIteratorTo_p_ViewEdgeInternal__ViewEdgeIterator(void *x, int *newmemory) {
     return (void *)((ViewEdgeInternal::ViewEdgeIterator *) (ChainingIterator *) ((ChainSilhouetteIterator *) x));
 }
-static void *_p_ChainPredicateIteratorTo_p_ViewEdgeInternal__ViewEdgeIterator(void *x) {
+static void *_p_ChainPredicateIteratorTo_p_ViewEdgeInternal__ViewEdgeIterator(void *x, int *newmemory) {
     return (void *)((ViewEdgeInternal::ViewEdgeIterator *) (ChainingIterator *) ((ChainPredicateIterator *) x));
 }
-static void *_p_ViewEdgeTo_p_Interface1D(void *x) {
+static void *_p_ViewEdgeTo_p_Interface1D(void *x, int *newmemory) {
     return (void *)((Interface1D *)  ((ViewEdge *) x));
 }
-static void *_p_StrokeTo_p_Interface1D(void *x) {
+static void *_p_StrokeTo_p_Interface1D(void *x, int *newmemory) {
     return (void *)((Interface1D *)  ((Stroke *) x));
 }
-static void *_p_CurveTo_p_Interface1D(void *x) {
+static void *_p_CurveTo_p_Interface1D(void *x, int *newmemory) {
     return (void *)((Interface1D *)  ((Curve *) x));
 }
-static void *_p_FEdgeSharpTo_p_Interface1D(void *x) {
+static void *_p_FEdgeSharpTo_p_Interface1D(void *x, int *newmemory) {
     return (void *)((Interface1D *) (FEdge *) ((FEdgeSharp *) x));
 }
-static void *_p_FEdgeSmoothTo_p_Interface1D(void *x) {
+static void *_p_FEdgeSmoothTo_p_Interface1D(void *x, int *newmemory) {
     return (void *)((Interface1D *) (FEdge *) ((FEdgeSmooth *) x));
 }
-static void *_p_FEdgeTo_p_Interface1D(void *x) {
+static void *_p_FEdgeTo_p_Interface1D(void *x, int *newmemory) {
     return (void *)((Interface1D *)  ((FEdge *) x));
 }
-static void *_p_VecMat__Vec2Tint_tTo_p_VecMat__VecTint_2_t(void *x) {
-    return (void *)((VecMat::Vec<int,2 > *)  ((VecMat::Vec2<int > *) x));
+static void *_p_VecMat__Vec2T_int_tTo_p_VecMat__VecT_int_2_t(void *x, int *newmemory) {
+    return (void *)((VecMat::Vec< int,2 > *)  ((VecMat::Vec2< int > *) x));
 }
-static void *_p_VecMat__Vec2Tunsigned_int_tTo_p_VecMat__VecTunsigned_int_2_t(void *x) {
-    return (void *)((VecMat::Vec<unsigned int,2 > *)  ((VecMat::Vec2<unsigned int > *) x));
+static void *_p_VecMat__Vec2T_unsigned_int_tTo_p_VecMat__VecT_unsigned_int_2_t(void *x, int *newmemory) {
+    return (void *)((VecMat::Vec< unsigned int,2 > *)  ((VecMat::Vec2< unsigned int > *) x));
 }
-static void *_p_VecMat__Vec3Tint_tTo_p_VecMat__VecTint_3_t(void *x) {
-    return (void *)((VecMat::Vec<int,3 > *)  ((VecMat::Vec3<int > *) x));
+static void *_p_VecMat__Vec3T_int_tTo_p_VecMat__VecT_int_3_t(void *x, int *newmemory) {
+    return (void *)((VecMat::Vec< int,3 > *)  ((VecMat::Vec3< int > *) x));
 }
-static void *_p_VecMat__Vec3Tunsigned_int_tTo_p_VecMat__VecTunsigned_int_3_t(void *x) {
-    return (void *)((VecMat::Vec<unsigned int,3 > *)  ((VecMat::Vec3<unsigned int > *) x));
+static void *_p_VecMat__Vec3T_unsigned_int_tTo_p_VecMat__VecT_unsigned_int_3_t(void *x, int *newmemory) {
+    return (void *)((VecMat::Vec< unsigned int,3 > *)  ((VecMat::Vec3< unsigned int > *) x));
 }
-static void *_p_StrokeVertexTo_p_CurvePoint(void *x) {
+static void *_p_StrokeVertexTo_p_CurvePoint(void *x, int *newmemory) {
     return (void *)((CurvePoint *)  ((StrokeVertex *) x));
 }
-static void *_p_Predicates0D__TrueUP0DTo_p_UnaryPredicate0D(void *x) {
+static void *_p_Predicates0D__TrueUP0DTo_p_UnaryPredicate0D(void *x, int *newmemory) {
     return (void *)((UnaryPredicate0D *)  ((Predicates0D::TrueUP0D *) x));
 }
-static void *_p_Predicates0D__FalseUP0DTo_p_UnaryPredicate0D(void *x) {
+static void *_p_Predicates0D__FalseUP0DTo_p_UnaryPredicate0D(void *x, int *newmemory) {
     return (void *)((UnaryPredicate0D *)  ((Predicates0D::FalseUP0D *) x));
 }
-static void *_p_FEdgeSharpTo_p_FEdge(void *x) {
+static void *_p_FEdgeSharpTo_p_FEdge(void *x, int *newmemory) {
     return (void *)((FEdge *)  ((FEdgeSharp *) x));
 }
-static void *_p_FEdgeSmoothTo_p_FEdge(void *x) {
+static void *_p_FEdgeSmoothTo_p_FEdge(void *x, int *newmemory) {
     return (void *)((FEdge *)  ((FEdgeSmooth *) x));
 }
-static void *_p_StrokeShaders__ConstrainedIncreasingThicknessShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__ConstrainedIncreasingThicknessShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::ConstrainedIncreasingThicknessShader *) x));
 }
-static void *_p_StrokeShaders__ColorNoiseShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__ColorNoiseShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::ColorNoiseShader *) x));
 }
-static void *_p_StrokeShaders__ThicknessNoiseShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__ThicknessNoiseShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::ThicknessNoiseShader *) x));
 }
-static void *_p_StrokeShaders__LengthDependingThicknessShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__LengthDependingThicknessShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::LengthDependingThicknessShader *) x));
 }
-static void *_p_StrokeShaders__IncreasingThicknessShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__IncreasingThicknessShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::IncreasingThicknessShader *) x));
 }
-static void *_p_StrokeShaders__ConstantExternThicknessShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__ConstantExternThicknessShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::ConstantExternThicknessShader *) x));
 }
-static void *_p_StrokeShaders__ConstantThicknessShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__ConstantThicknessShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::ConstantThicknessShader *) x));
 }
-static void *_p_StrokeShaders__StrokeTextureShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__StrokeTextureShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::StrokeTextureShader *) x));
 }
-static void *_p_StrokeShaders__SamplingShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__SamplingShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::SamplingShader *) x));
 }
-static void *_p_StrokeShaders__BSplineShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__BSplineShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::BSplineShader *) x));
 }
-static void *_p_StrokeShaders__BezierCurveShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__BezierCurveShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::BezierCurveShader *) x));
 }
-static void *_p_StrokeShaders__InflateShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__InflateShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::InflateShader *) x));
 }
-static void *_p_StrokeShaders__GuidingLinesShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__GuidingLinesShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::GuidingLinesShader *) x));
 }
-static void *_p_StrokeShaders__streamShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__streamShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::streamShader *) x));
 }
-static void *_p_StrokeShaders__fstreamShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__fstreamShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::fstreamShader *) x));
 }
-static void *_p_CalligraphicShaderTo_p_StrokeShader(void *x) {
+static void *_p_CalligraphicShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((CalligraphicShader *) x));
 }
-static void *_p_SpatialNoiseShaderTo_p_StrokeShader(void *x) {
+static void *_p_SpatialNoiseShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((SpatialNoiseShader *) x));
 }
-static void *_p_SmoothingShaderTo_p_StrokeShader(void *x) {
+static void *_p_SmoothingShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((SmoothingShader *) x));
 }
-static void *_p_StrokeShaders__TextureAssignerShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__TextureAssignerShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::TextureAssignerShader *) x));
 }
-static void *_p_StrokeShaders__CalligraphicColorShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__CalligraphicColorShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::CalligraphicColorShader *) x));
 }
-static void *_p_StrokeShaders__MaterialColorShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__MaterialColorShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::MaterialColorShader *) x));
 }
-static void *_p_StrokeShaders__ColorVariationPatternShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__ColorVariationPatternShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::ColorVariationPatternShader *) x));
 }
-static void *_p_StrokeShaders__IncreasingColorShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__IncreasingColorShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::IncreasingColorShader *) x));
 }
-static void *_p_StrokeShaders__ConstantColorShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__ConstantColorShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::ConstantColorShader *) x));
 }
-static void *_p_StrokeShaders__ThicknessVariationPatternShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__ThicknessVariationPatternShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::ThicknessVariationPatternShader *) x));
 }
-static void *_p_StrokeShaders__BackboneStretcherShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__BackboneStretcherShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::BackboneStretcherShader *) x));
 }
-static void *_p_StrokeShaders__ExternalContourStretcherShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__ExternalContourStretcherShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::ExternalContourStretcherShader *) x));
 }
-static void *_p_StrokeShaders__PolygonalizationShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__PolygonalizationShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::PolygonalizationShader *) x));
 }
-static void *_p_StrokeShaders__TipRemoverShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__TipRemoverShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::TipRemoverShader *) x));
 }
-static void *_p_OmissionShaderTo_p_StrokeShader(void *x) {
+static void *_p_OmissionShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((OmissionShader *) x));
 }
-static void *_p_OmitterTo_p_Smoother(void *x) {
+static void *_p_OmitterTo_p_Smoother(void *x, int *newmemory) {
     return (void *)((Smoother *)  ((Omitter *) x));
 }
-static void *_p_Predicates1D__Length2DBP1DTo_p_BinaryPredicate1D(void *x) {
+static void *_p_Predicates1D__Length2DBP1DTo_p_BinaryPredicate1D(void *x, int *newmemory) {
     return (void *)((BinaryPredicate1D *)  ((Predicates1D::Length2DBP1D *) x));
 }
-static void *_p_Predicates1D__FalseBP1DTo_p_BinaryPredicate1D(void *x) {
+static void *_p_Predicates1D__FalseBP1DTo_p_BinaryPredicate1D(void *x, int *newmemory) {
     return (void *)((BinaryPredicate1D *)  ((Predicates1D::FalseBP1D *) x));
 }
-static void *_p_Predicates1D__ViewMapGradientNormBP1DTo_p_BinaryPredicate1D(void *x) {
+static void *_p_Predicates1D__ViewMapGradientNormBP1DTo_p_BinaryPredicate1D(void *x, int *newmemory) {
     return (void *)((BinaryPredicate1D *)  ((Predicates1D::ViewMapGradientNormBP1D *) x));
 }
-static void *_p_Predicates1D__TrueBP1DTo_p_BinaryPredicate1D(void *x) {
+static void *_p_Predicates1D__TrueBP1DTo_p_BinaryPredicate1D(void *x, int *newmemory) {
     return (void *)((BinaryPredicate1D *)  ((Predicates1D::TrueBP1D *) x));
 }
-static void *_p_Predicates1D__SameShapeIdBP1DTo_p_BinaryPredicate1D(void *x) {
+static void *_p_Predicates1D__SameShapeIdBP1DTo_p_BinaryPredicate1D(void *x, int *newmemory) {
     return (void *)((BinaryPredicate1D *)  ((Predicates1D::SameShapeIdBP1D *) x));
 }
-static void *_p_Predicates1D__FalseUP1DTo_p_UnaryPredicate1D(void *x) {
+static void *_p_Predicates1D__FalseUP1DTo_p_UnaryPredicate1D(void *x, int *newmemory) {
     return (void *)((UnaryPredicate1D *)  ((Predicates1D::FalseUP1D *) x));
 }
-static void *_p_Predicates1D__ShapeUP1DTo_p_UnaryPredicate1D(void *x) {
+static void *_p_Predicates1D__ShapeUP1DTo_p_UnaryPredicate1D(void *x, int *newmemory) {
     return (void *)((UnaryPredicate1D *)  ((Predicates1D::ShapeUP1D *) x));
 }
-static void *_p_Predicates1D__DensityLowerThanUP1DTo_p_UnaryPredicate1D(void *x) {
+static void *_p_Predicates1D__DensityLowerThanUP1DTo_p_UnaryPredicate1D(void *x, int *newmemory) {
     return (void *)((UnaryPredicate1D *)  ((Predicates1D::DensityLowerThanUP1D *) x));
 }
-static void *_p_Predicates1D__EqualToTimeStampUP1DTo_p_UnaryPredicate1D(void *x) {
+static void *_p_Predicates1D__EqualToTimeStampUP1DTo_p_UnaryPredicate1D(void *x, int *newmemory) {
     return (void *)((UnaryPredicate1D *)  ((Predicates1D::EqualToTimeStampUP1D *) x));
 }
-static void *_p_Predicates1D__EqualToChainingTimeStampUP1DTo_p_UnaryPredicate1D(void *x) {
+static void *_p_Predicates1D__EqualToChainingTimeStampUP1DTo_p_UnaryPredicate1D(void *x, int *newmemory) {
     return (void *)((UnaryPredicate1D *)  ((Predicates1D::EqualToChainingTimeStampUP1D *) x));
 }
-static void *_p_Predicates1D__TrueUP1DTo_p_UnaryPredicate1D(void *x) {
+static void *_p_Predicates1D__TrueUP1DTo_p_UnaryPredicate1D(void *x, int *newmemory) {
     return (void *)((UnaryPredicate1D *)  ((Predicates1D::TrueUP1D *) x));
 }
-static void *_p_Predicates1D__QuantitativeInvisibilityUP1DTo_p_UnaryPredicate1D(void *x) {
+static void *_p_Predicates1D__QuantitativeInvisibilityUP1DTo_p_UnaryPredicate1D(void *x, int *newmemory) {
     return (void *)((UnaryPredicate1D *)  ((Predicates1D::QuantitativeInvisibilityUP1D *) x));
 }
-static void *_p_Predicates1D__ContourUP1DTo_p_UnaryPredicate1D(void *x) {
+static void *_p_Predicates1D__ContourUP1DTo_p_UnaryPredicate1D(void *x, int *newmemory) {
     return (void *)((UnaryPredicate1D *)  ((Predicates1D::ContourUP1D *) x));
 }
-static void *_p_Predicates1D__ExternalContourUP1DTo_p_UnaryPredicate1D(void *x) {
+static void *_p_Predicates1D__ExternalContourUP1DTo_p_UnaryPredicate1D(void *x, int *newmemory) {
     return (void *)((UnaryPredicate1D *)  ((Predicates1D::ExternalContourUP1D *) x));
 }
-static void *_p_VecMat__Vec2Tfloat_tTo_p_VecMat__VecTfloat_2_t(void *x) {
-    return (void *)((VecMat::Vec<float,2 > *)  ((VecMat::Vec2<float > *) x));
+static void *_p_VecMat__Vec2T_float_tTo_p_VecMat__VecT_float_2_t(void *x, int *newmemory) {
+    return (void *)((VecMat::Vec< float,2 > *)  ((VecMat::Vec2< float > *) x));
 }
-static void *_p_Functions1D__TimeStampF1DTo_p_UnaryFunction1DTvoid_t(void *x) {
-    return (void *)((UnaryFunction1D<void > *)  ((Functions1D::TimeStampF1D *) x));
+static void *_p_Functions1D__TimeStampF1DTo_p_UnaryFunction1DT_void_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< void > *)  ((Functions1D::TimeStampF1D *) x));
 }
-static void *_p_Functions1D__IncrementChainingTimeStampF1DTo_p_UnaryFunction1DTvoid_t(void *x) {
-    return (void *)((UnaryFunction1D<void > *)  ((Functions1D::IncrementChainingTimeStampF1D *) x));
+static void *_p_Functions1D__IncrementChainingTimeStampF1DTo_p_UnaryFunction1DT_void_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< void > *)  ((Functions1D::IncrementChainingTimeStampF1D *) x));
 }
-static void *_p_Functions1D__ChainingTimeStampF1DTo_p_UnaryFunction1DTvoid_t(void *x) {
-    return (void *)((UnaryFunction1D<void > *)  ((Functions1D::ChainingTimeStampF1D *) x));
+static void *_p_Functions1D__ChainingTimeStampF1DTo_p_UnaryFunction1DT_void_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< void > *)  ((Functions1D::ChainingTimeStampF1D *) x));
 }
-static void *_p_VecMat__Vec3Tfloat_tTo_p_VecMat__VecTfloat_3_t(void *x) {
-    return (void *)((VecMat::Vec<float,3 > *)  ((VecMat::Vec3<float > *) x));
+static void *_p_VecMat__Vec3T_float_tTo_p_VecMat__VecT_float_3_t(void *x, int *newmemory) {
+    return (void *)((VecMat::Vec< float,3 > *)  ((VecMat::Vec3< float > *) x));
 }
-static void *_p_FEdgeInternal__SVertexIteratorTo_p_Interface0DIteratorNested(void *x) {
+static void *_p_FEdgeInternal__SVertexIteratorTo_p_Interface0DIteratorNested(void *x, int *newmemory) {
     return (void *)((Interface0DIteratorNested *)  ((FEdgeInternal::SVertexIterator *) x));
 }
-static void *_p_ViewEdgeInternal__SVertexIteratorTo_p_Interface0DIteratorNested(void *x) {
+static void *_p_ViewEdgeInternal__SVertexIteratorTo_p_Interface0DIteratorNested(void *x, int *newmemory) {
     return (void *)((Interface0DIteratorNested *)  ((ViewEdgeInternal::SVertexIterator *) x));
 }
-static void *_p_CurveInternal__CurvePointIteratorTo_p_Interface0DIteratorNested(void *x) {
+static void *_p_CurveInternal__CurvePointIteratorTo_p_Interface0DIteratorNested(void *x, int *newmemory) {
     return (void *)((Interface0DIteratorNested *)  ((CurveInternal::CurvePointIterator *) x));
 }
-static void *_p_StrokeInternal__StrokeVertexIteratorTo_p_Interface0DIteratorNested(void *x) {
+static void *_p_StrokeInternal__StrokeVertexIteratorTo_p_Interface0DIteratorNested(void *x, int *newmemory) {
     return (void *)((Interface0DIteratorNested *)  ((StrokeInternal::StrokeVertexIterator *) x));
 }
-static void *_p_Functions0D__VertexOrientation2DF0DTo_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t(void *x) {
-    return (void *)((UnaryFunction0D<VecMat::Vec2<float > > *)  ((Functions0D::VertexOrientation2DF0D *) x));
+static void *_p_Functions0D__VertexOrientation2DF0DTo_p_UnaryFunction0DT_VecMat__Vec2T_float_t_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< VecMat::Vec2< float > > *)  ((Functions0D::VertexOrientation2DF0D *) x));
 }
-static void *_p_Functions0D__Normal2DF0DTo_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t(void *x) {
-    return (void *)((UnaryFunction0D<VecMat::Vec2<float > > *)  ((Functions0D::Normal2DF0D *) x));
+static void *_p_Functions0D__Normal2DF0DTo_p_UnaryFunction0DT_VecMat__Vec2T_float_t_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< VecMat::Vec2< float > > *)  ((Functions0D::Normal2DF0D *) x));
 }
-static void *_p_Functions0D__VertexOrientation3DF0DTo_p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t(void *x) {
-    return (void *)((UnaryFunction0D<VecMat::Vec3<float > > *)  ((Functions0D::VertexOrientation3DF0D *) x));
+static void *_p_Functions0D__VertexOrientation3DF0DTo_p_UnaryFunction0DT_VecMat__Vec3T_float_t_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< VecMat::Vec3< float > > *)  ((Functions0D::VertexOrientation3DF0D *) x));
 }
-static void *_p_Functions1D__Orientation2DF1DTo_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t(void *x) {
-    return (void *)((UnaryFunction1D<VecMat::Vec2<float > > *)  ((Functions1D::Orientation2DF1D *) x));
+static void *_p_Functions1D__Orientation2DF1DTo_p_UnaryFunction1DT_VecMat__Vec2T_float_t_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< VecMat::Vec2< float > > *)  ((Functions1D::Orientation2DF1D *) x));
 }
-static void *_p_Functions1D__Normal2DF1DTo_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t(void *x) {
-    return (void *)((UnaryFunction1D<VecMat::Vec2<float > > *)  ((Functions1D::Normal2DF1D *) x));
+static void *_p_Functions1D__Normal2DF1DTo_p_UnaryFunction1DT_VecMat__Vec2T_float_t_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< VecMat::Vec2< float > > *)  ((Functions1D::Normal2DF1D *) x));
 }
-static void *_p_Functions1D__Orientation3DF1DTo_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t(void *x) {
-    return (void *)((UnaryFunction1D<VecMat::Vec3<float > > *)  ((Functions1D::Orientation3DF1D *) x));
+static void *_p_Functions1D__Orientation3DF1DTo_p_UnaryFunction1DT_VecMat__Vec3T_float_t_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< VecMat::Vec3< float > > *)  ((Functions1D::Orientation3DF1D *) x));
 }
-static void *_p_Functions0D__QuantitativeInvisibilityF0DTo_p_UnaryFunction0DTunsigned_int_t(void *x) {
-    return (void *)((UnaryFunction0D<unsigned int > *)  ((Functions0D::QuantitativeInvisibilityF0D *) x));
+static void *_p_Functions0D__QuantitativeInvisibilityF0DTo_p_UnaryFunction0DT_unsigned_int_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< unsigned int > *)  ((Functions0D::QuantitativeInvisibilityF0D *) x));
 }
-static void *_p_Functions1D__QuantitativeInvisibilityF1DTo_p_UnaryFunction1DTunsigned_int_t(void *x) {
-    return (void *)((UnaryFunction1D<unsigned int > *)  ((Functions1D::QuantitativeInvisibilityF1D *) x));
+static void *_p_Functions1D__QuantitativeInvisibilityF1DTo_p_UnaryFunction1DT_unsigned_int_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< unsigned int > *)  ((Functions1D::QuantitativeInvisibilityF1D *) x));
 }
-static void *_p_Functions0D__ShapeIdF0DTo_p_UnaryFunction0DTId_t(void *x) {
-    return (void *)((UnaryFunction0D<Id > *)  ((Functions0D::ShapeIdF0D *) x));
+static void *_p_Functions0D__ShapeIdF0DTo_p_UnaryFunction0DT_Id_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< Id > *)  ((Functions0D::ShapeIdF0D *) x));
 }
-static void *_p_VecMat__Vec2Tdouble_tTo_p_VecMat__VecTdouble_2_t(void *x) {
-    return (void *)((VecMat::Vec<double,2 > *)  ((VecMat::Vec2<double > *) x));
+static void *_p_VecMat__Vec2T_double_tTo_p_VecMat__VecT_double_2_t(void *x, int *newmemory) {
+    return (void *)((VecMat::Vec< double,2 > *)  ((VecMat::Vec2< double > *) x));
 }
-static void *_p_TVertexTo_p_ViewVertex(void *x) {
+static void *_p_TVertexTo_p_ViewVertex(void *x, int *newmemory) {
     return (void *)((ViewVertex *)  ((TVertex *) x));
 }
-static void *_p_NonTVertexTo_p_ViewVertex(void *x) {
+static void *_p_NonTVertexTo_p_ViewVertex(void *x, int *newmemory) {
     return (void *)((ViewVertex *)  ((NonTVertex *) x));
 }
-static void *_p_Functions0D__ZDiscontinuityF0DTo_p_UnaryFunction0DTdouble_t(void *x) {
-    return (void *)((UnaryFunction0D<double > *)  ((Functions0D::ZDiscontinuityF0D *) x));
+static void *_p_Functions0D__ZDiscontinuityF0DTo_p_UnaryFunction0DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< double > *)  ((Functions0D::ZDiscontinuityF0D *) x));
 }
-static void *_p_Functions0D__DensityF0DTo_p_UnaryFunction0DTdouble_t(void *x) {
-    return (void *)((UnaryFunction0D<double > *)  ((Functions0D::DensityF0D *) x));
+static void *_p_Functions0D__DensityF0DTo_p_UnaryFunction0DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< double > *)  ((Functions0D::DensityF0D *) x));
 }
-static void *_p_Functions0D__GetXF0DTo_p_UnaryFunction0DTdouble_t(void *x) {
-    return (void *)((UnaryFunction0D<double > *)  ((Functions0D::GetXF0D *) x));
+static void *_p_Functions0D__GetXF0DTo_p_UnaryFunction0DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< double > *)  ((Functions0D::GetXF0D *) x));
 }
-static void *_p_Functions0D__GetProjectedXF0DTo_p_UnaryFunction0DTdouble_t(void *x) {
-    return (void *)((UnaryFunction0D<double > *)  ((Functions0D::GetProjectedXF0D *) x));
+static void *_p_Functions0D__GetProjectedXF0DTo_p_UnaryFunction0DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< double > *)  ((Functions0D::GetProjectedXF0D *) x));
 }
-static void *_p_Functions0D__Curvature2DAngleF0DTo_p_UnaryFunction0DTdouble_t(void *x) {
-    return (void *)((UnaryFunction0D<double > *)  ((Functions0D::Curvature2DAngleF0D *) x));
+static void *_p_Functions0D__Curvature2DAngleF0DTo_p_UnaryFunction0DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< double > *)  ((Functions0D::Curvature2DAngleF0D *) x));
 }
-static void *_p_Functions0D__GetYF0DTo_p_UnaryFunction0DTdouble_t(void *x) {
-    return (void *)((UnaryFunction0D<double > *)  ((Functions0D::GetYF0D *) x));
+static void *_p_Functions0D__GetYF0DTo_p_UnaryFunction0DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< double > *)  ((Functions0D::GetYF0D *) x));
 }
-static void *_p_Functions0D__GetProjectedYF0DTo_p_UnaryFunction0DTdouble_t(void *x) {
-    return (void *)((UnaryFunction0D<double > *)  ((Functions0D::GetProjectedYF0D *) x));
+static void *_p_Functions0D__GetProjectedYF0DTo_p_UnaryFunction0DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< double > *)  ((Functions0D::GetProjectedYF0D *) x));
 }
-static void *_p_Functions0D__GetZF0DTo_p_UnaryFunction0DTdouble_t(void *x) {
-    return (void *)((UnaryFunction0D<double > *)  ((Functions0D::GetZF0D *) x));
+static void *_p_Functions0D__GetZF0DTo_p_UnaryFunction0DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< double > *)  ((Functions0D::GetZF0D *) x));
 }
-static void *_p_Functions0D__GetProjectedZF0DTo_p_UnaryFunction0DTdouble_t(void *x) {
-    return (void *)((UnaryFunction0D<double > *)  ((Functions0D::GetProjectedZF0D *) x));
+static void *_p_Functions0D__GetProjectedZF0DTo_p_UnaryFunction0DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< double > *)  ((Functions0D::GetProjectedZF0D *) x));
 }
-static void *_p_Functions0D__LocalAverageDepthF0DTo_p_UnaryFunction0DTdouble_t(void *x) {
-    return (void *)((UnaryFunction0D<double > *)  ((Functions0D::LocalAverageDepthF0D *) x));
+static void *_p_Functions0D__LocalAverageDepthF0DTo_p_UnaryFunction0DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< double > *)  ((Functions0D::LocalAverageDepthF0D *) x));
 }
-static void *_p_Functions1D__GetSteerableViewMapDensityF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
-    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::GetSteerableViewMapDensityF1D *) x));
+static void *_p_Functions1D__GetSteerableViewMapDensityF1DTo_p_UnaryFunction1DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< double > *)  ((Functions1D::GetSteerableViewMapDensityF1D *) x));
 }
-static void *_p_Functions1D__GetDirectionalViewMapDensityF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
-    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::GetDirectionalViewMapDensityF1D *) x));
+static void *_p_Functions1D__GetDirectionalViewMapDensityF1DTo_p_UnaryFunction1DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< double > *)  ((Functions1D::GetDirectionalViewMapDensityF1D *) x));
 }
-static void *_p_Functions1D__GetCompleteViewMapDensityF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
-    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::GetCompleteViewMapDensityF1D *) x));
+static void *_p_Functions1D__GetCompleteViewMapDensityF1DTo_p_UnaryFunction1DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< double > *)  ((Functions1D::GetCompleteViewMapDensityF1D *) x));
 }
-static void *_p_Functions1D__DensityF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
-    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::DensityF1D *) x));
+static void *_p_Functions1D__DensityF1DTo_p_UnaryFunction1DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< double > *)  ((Functions1D::DensityF1D *) x));
 }
-static void *_p_Functions1D__ZDiscontinuityF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
-    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::ZDiscontinuityF1D *) x));
+static void *_p_Functions1D__ZDiscontinuityF1DTo_p_UnaryFunction1DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< double > *)  ((Functions1D::ZDiscontinuityF1D *) x));
 }
-static void *_p_Functions1D__GetXF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
-    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::GetXF1D *) x));
+static void *_p_Functions1D__GetXF1DTo_p_UnaryFunction1DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< double > *)  ((Functions1D::GetXF1D *) x));
 }
-static void *_p_Functions1D__GetZF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
-    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::GetZF1D *) x));
+static void *_p_Functions1D__GetZF1DTo_p_UnaryFunction1DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< double > *)  ((Functions1D::GetZF1D *) x));
 }
-static void *_p_Functions1D__GetViewMapGradientNormF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
-    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::GetViewMapGradientNormF1D *) x));
+static void *_p_Functions1D__GetViewMapGradientNormF1DTo_p_UnaryFunction1DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< double > *)  ((Functions1D::GetViewMapGradientNormF1D *) x));
 }
-static void *_p_Functions1D__GetProjectedYF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
-    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::GetProjectedYF1D *) x));
+static void *_p_Functions1D__GetProjectedYF1DTo_p_UnaryFunction1DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< double > *)  ((Functions1D::GetProjectedYF1D *) x));
 }
-static void *_p_Functions1D__Curvature2DAngleF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
-    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::Curvature2DAngleF1D *) x));
+static void *_p_Functions1D__Curvature2DAngleF1DTo_p_UnaryFunction1DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< double > *)  ((Functions1D::Curvature2DAngleF1D *) x));
 }
-static void *_p_Functions1D__GetYF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
-    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::GetYF1D *) x));
+static void *_p_Functions1D__GetYF1DTo_p_UnaryFunction1DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< double > *)  ((Functions1D::GetYF1D *) x));
 }
-static void *_p_Functions1D__GetProjectedXF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
-    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::GetProjectedXF1D *) x));
+static void *_p_Functions1D__GetProjectedXF1DTo_p_UnaryFunction1DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< double > *)  ((Functions1D::GetProjectedXF1D *) x));
 }
-static void *_p_Functions1D__LocalAverageDepthF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
-    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::LocalAverageDepthF1D *) x));
+static void *_p_Functions1D__LocalAverageDepthF1DTo_p_UnaryFunction1DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< double > *)  ((Functions1D::LocalAverageDepthF1D *) x));
 }
-static void *_p_Functions1D__GetProjectedZF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
-    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::GetProjectedZF1D *) x));
+static void *_p_Functions1D__GetProjectedZF1DTo_p_UnaryFunction1DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< double > *)  ((Functions1D::GetProjectedZF1D *) x));
 }
-static void *_p_Functions0D__GetCurvilinearAbscissaF0DTo_p_UnaryFunction0DTfloat_t(void *x) {
-    return (void *)((UnaryFunction0D<float > *)  ((Functions0D::GetCurvilinearAbscissaF0D *) x));
+static void *_p_Functions0D__GetCurvilinearAbscissaF0DTo_p_UnaryFunction0DT_float_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< float > *)  ((Functions0D::GetCurvilinearAbscissaF0D *) x));
 }
-static void *_p_Functions0D__ReadMapPixelF0DTo_p_UnaryFunction0DTfloat_t(void *x) {
-    return (void *)((UnaryFunction0D<float > *)  ((Functions0D::ReadMapPixelF0D *) x));
+static void *_p_Functions0D__ReadMapPixelF0DTo_p_UnaryFunction0DT_float_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< float > *)  ((Functions0D::ReadMapPixelF0D *) x));
 }
-static void *_p_Functions0D__ReadSteerableViewMapPixelF0DTo_p_UnaryFunction0DTfloat_t(void *x) {
-    return (void *)((UnaryFunction0D<float > *)  ((Functions0D::ReadSteerableViewMapPixelF0D *) x));
+static void *_p_Functions0D__ReadSteerableViewMapPixelF0DTo_p_UnaryFunction0DT_float_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< float > *)  ((Functions0D::ReadSteerableViewMapPixelF0D *) x));
 }
-static void *_p_Functions0D__ReadCompleteViewMapPixelF0DTo_p_UnaryFunction0DTfloat_t(void *x) {
-    return (void *)((UnaryFunction0D<float > *)  ((Functions0D::ReadCompleteViewMapPixelF0D *) x));
+static void *_p_Functions0D__ReadCompleteViewMapPixelF0DTo_p_UnaryFunction0DT_float_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< float > *)  ((Functions0D::ReadCompleteViewMapPixelF0D *) x));
 }
-static void *_p_Functions0D__GetViewMapGradientNormF0DTo_p_UnaryFunction0DTfloat_t(void *x) {
-    return (void *)((UnaryFunction0D<float > *)  ((Functions0D::GetViewMapGradientNormF0D *) x));
+static void *_p_Functions0D__GetViewMapGradientNormF0DTo_p_UnaryFunction0DT_float_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< float > *)  ((Functions0D::GetViewMapGradientNormF0D *) x));
 }
-static void *_p_Functions0D__GetParameterF0DTo_p_UnaryFunction0DTfloat_t(void *x) {
-    return (void *)((UnaryFunction0D<float > *)  ((Functions0D::GetParameterF0D *) x));
+static void *_p_Functions0D__GetParameterF0DTo_p_UnaryFunction0DT_float_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< float > *)  ((Functions0D::GetParameterF0D *) x));
 }
-static void *_p_VecMat__Vec3Tdouble_tTo_p_VecMat__VecTdouble_3_t(void *x) {
-    return (void *)((VecMat::Vec<double,3 > *)  ((VecMat::Vec3<double > *) x));
+static void *_p_VecMat__Vec3T_double_tTo_p_VecMat__VecT_double_3_t(void *x, int *newmemory) {
+    return (void *)((VecMat::Vec< double,3 > *)  ((VecMat::Vec3< double > *) x));
 }
 static swig_type_info _swigt__p_AdjacencyIterator = {"_p_AdjacencyIterator", "AdjacencyIterator *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_BBoxTVecMat__Vec3Tdouble_t_t = {"_p_BBoxTVecMat__Vec3Tdouble_t_t", "BBox<VecMat::Vec3<double > > *|BBox<Geometry::Vec3r > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_BBoxT_VecMat__Vec3T_double_t_t = {"_p_BBoxT_VecMat__Vec3T_double_t_t", "BBox< VecMat::Vec3< double > > *|BBox< Geometry::Vec3r > *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_BinaryPredicate0D = {"_p_BinaryPredicate0D", "BinaryPredicate0D *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_BinaryPredicate1D = {"_p_BinaryPredicate1D", "BinaryPredicate1D *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CalligraphicShader = {"_p_CalligraphicShader", "CalligraphicShader *", 0, 0, (void*)0, 0};
@@ -110180,8 +109096,8 @@ static swig_type_info _swigt__p_ChainingIterator = {"_p_ChainingIterator", "Chai
 static swig_type_info _swigt__p_CurvatureInfo = {"_p_CurvatureInfo", "CurvatureInfo *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_Curve = {"_p_Curve", "Curve *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CurveInternal__CurvePointIterator = {"_p_CurveInternal__CurvePointIterator", "CurveInternal::CurvePointIterator *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_CurvePoint = {"_p_CurvePoint", "CurvePoint *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_Curve__vertex_container__iterator = {"_p_Curve__vertex_container__iterator", "Curve::vertex_container::iterator *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_CurvePoint = {"_p_CurvePoint", "Curve::Vertex *|CurvePoint *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_Curve__vertex_container__iterator = {"_p_Curve__vertex_container__iterator", "::Curve::vertex_container::iterator *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_FEdge = {"_p_FEdge", "FEdge *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_FEdgeInternal__SVertexIterator = {"_p_FEdgeInternal__SVertexIterator", "FEdgeInternal::SVertexIterator *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_FEdgeSharp = {"_p_FEdgeSharp", "FEdgeSharp *", 0, 0, (void*)0, 0};
@@ -110319,56 +109235,56 @@ static swig_type_info _swigt__p_Stroke__viewedge_container__iterator = {"_p_Stro
 static swig_type_info _swigt__p_StrokesContainer = {"_p_StrokesContainer", "StrokesContainer *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_StyleModule = {"_p_StyleModule", "StyleModule *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_TVertex = {"_p_TVertex", "TVertex *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction0DTId_t = {"_p_UnaryFunction0DTId_t", "UnaryFunction0D<Id > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t = {"_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t", "UnaryFunction0D<VecMat::Vec2<float > > *|UnaryFunction0D<Geometry::Vec2f > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t = {"_p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t", "UnaryFunction0D<VecMat::Vec3<float > > *|UnaryFunction0D<Geometry::Vec3f > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction0DTViewShape_p_t = {"_p_UnaryFunction0DTViewShape_p_t", "UnaryFunction0D<ViewShape * > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction0DTdouble_t = {"_p_UnaryFunction0DTdouble_t", "UnaryFunction0D<double > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction0DTfloat_t = {"_p_UnaryFunction0DTfloat_t", "UnaryFunction0D<float > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t = {"_p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t", "UnaryFunction0D<std::vector<ViewShape * > > *|UnaryFunction0D<std::vector<ViewShape *,std::allocator<ViewShape * > > > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction0DTunsigned_int_t = {"_p_UnaryFunction0DTunsigned_int_t", "UnaryFunction0D<unsigned int > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction0DTvoid_t = {"_p_UnaryFunction0DTvoid_t", "UnaryFunction0D<void > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t = {"_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t", "UnaryFunction1D<VecMat::Vec2<float > > *|UnaryFunction1D<Geometry::Vec2f > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t = {"_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t", "UnaryFunction1D<VecMat::Vec3<float > > *|UnaryFunction1D<Geometry::Vec3f > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction1DTdouble_t = {"_p_UnaryFunction1DTdouble_t", "UnaryFunction1D<double > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction1DTfloat_t = {"_p_UnaryFunction1DTfloat_t", "UnaryFunction1D<float > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t = {"_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t", "UnaryFunction1D<std::vector<ViewShape * > > *|UnaryFunction1D<std::vector<ViewShape *,std::allocator<ViewShape * > > > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction1DTunsigned_int_t = {"_p_UnaryFunction1DTunsigned_int_t", "UnaryFunction1D<unsigned int > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction1DTvoid_t = {"_p_UnaryFunction1DTvoid_t", "UnaryFunction1D<void > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction0DT_Id_t = {"_p_UnaryFunction0DT_Id_t", "UnaryFunction0D< Id > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction0DT_VecMat__Vec2T_float_t_t = {"_p_UnaryFunction0DT_VecMat__Vec2T_float_t_t", "UnaryFunction0D< Geometry::Vec2f > *|UnaryFunction0D< VecMat::Vec2< float > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction0DT_VecMat__Vec3T_float_t_t = {"_p_UnaryFunction0DT_VecMat__Vec3T_float_t_t", "UnaryFunction0D< VecMat::Vec3< float > > *|UnaryFunction0D< Geometry::Vec3f > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction0DT_ViewShape_p_t = {"_p_UnaryFunction0DT_ViewShape_p_t", "UnaryFunction0D< ViewShape * > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction0DT_double_t = {"_p_UnaryFunction0DT_double_t", "UnaryFunction0D< double > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction0DT_float_t = {"_p_UnaryFunction0DT_float_t", "UnaryFunction0D< float > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction0DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t = {"_p_UnaryFunction0DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t", "UnaryFunction0D< std::vector< ViewShape * > > *|UnaryFunction0D< std::vector< ViewShape *,std::allocator< ViewShape * > > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction0DT_unsigned_int_t = {"_p_UnaryFunction0DT_unsigned_int_t", "UnaryFunction0D< unsigned int > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction0DT_void_t = {"_p_UnaryFunction0DT_void_t", "UnaryFunction0D< void > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction1DT_VecMat__Vec2T_float_t_t = {"_p_UnaryFunction1DT_VecMat__Vec2T_float_t_t", "UnaryFunction1D< Geometry::Vec2f > *|UnaryFunction1D< VecMat::Vec2< float > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction1DT_VecMat__Vec3T_float_t_t = {"_p_UnaryFunction1DT_VecMat__Vec3T_float_t_t", "UnaryFunction1D< VecMat::Vec3< float > > *|UnaryFunction1D< Geometry::Vec3f > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction1DT_double_t = {"_p_UnaryFunction1DT_double_t", "UnaryFunction1D< double > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction1DT_float_t = {"_p_UnaryFunction1DT_float_t", "UnaryFunction1D< float > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t = {"_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t", "UnaryFunction1D< std::vector< ViewShape * > > *|UnaryFunction1D< std::vector< ViewShape *,std::allocator< ViewShape * > > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction1DT_unsigned_int_t = {"_p_UnaryFunction1DT_unsigned_int_t", "UnaryFunction1D< unsigned int > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction1DT_void_t = {"_p_UnaryFunction1DT_void_t", "UnaryFunction1D< void > *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_UnaryPredicate0D = {"_p_UnaryPredicate0D", "UnaryPredicate0D *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_UnaryPredicate1D = {"_p_UnaryPredicate1D", "UnaryPredicate1D *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__HVec3Tdouble_t = {"_p_VecMat__HVec3Tdouble_t", "VecMat::HVec3<double > *|Geometry::HVec3r *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__HVec3Tfloat_t = {"_p_VecMat__HVec3Tfloat_t", "VecMat::HVec3<float > *|Geometry::HVec3f *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__HVec3Tint_t = {"_p_VecMat__HVec3Tint_t", "VecMat::HVec3<int > *|Geometry::HVec3i *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__HVec3Tunsigned_int_t = {"_p_VecMat__HVec3Tunsigned_int_t", "VecMat::HVec3<unsigned int > *|Geometry::HVec3u *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__SquareMatrixTdouble_2_t = {"_p_VecMat__SquareMatrixTdouble_2_t", "VecMat::SquareMatrix<double,2 > *|Geometry::Matrix22r *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__SquareMatrixTdouble_3_t = {"_p_VecMat__SquareMatrixTdouble_3_t", "VecMat::SquareMatrix<double,3 > *|Geometry::Matrix33r *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__SquareMatrixTdouble_4_t = {"_p_VecMat__SquareMatrixTdouble_4_t", "VecMat::SquareMatrix<double,4 > *|Geometry::Matrix44r *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__SquareMatrixTfloat_2_t = {"_p_VecMat__SquareMatrixTfloat_2_t", "VecMat::SquareMatrix<float,2 > *|Geometry::Matrix22f *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__SquareMatrixTfloat_3_t = {"_p_VecMat__SquareMatrixTfloat_3_t", "VecMat::SquareMatrix<float,3 > *|Geometry::Matrix33f *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__SquareMatrixTfloat_4_t = {"_p_VecMat__SquareMatrixTfloat_4_t", "VecMat::SquareMatrix<float,4 > *|Geometry::Matrix44f *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__SquareMatrixTint_2_t = {"_p_VecMat__SquareMatrixTint_2_t", "VecMat::SquareMatrix<int,2 > *|Geometry::Matrix22i *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__SquareMatrixTint_3_t = {"_p_VecMat__SquareMatrixTint_3_t", "VecMat::SquareMatrix<int,3 > *|Geometry::Matrix33i *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__SquareMatrixTint_4_t = {"_p_VecMat__SquareMatrixTint_4_t", "VecMat::SquareMatrix<int,4 > *|Geometry::Matrix44i *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__SquareMatrixTunsigned_int_2_t = {"_p_VecMat__SquareMatrixTunsigned_int_2_t", "VecMat::SquareMatrix<unsigned int,2 > *|Geometry::Matrix22u *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__SquareMatrixTunsigned_int_3_t = {"_p_VecMat__SquareMatrixTunsigned_int_3_t", "VecMat::SquareMatrix<unsigned int,3 > *|Geometry::Matrix33u *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__SquareMatrixTunsigned_int_4_t = {"_p_VecMat__SquareMatrixTunsigned_int_4_t", "VecMat::SquareMatrix<unsigned int,4 > *|Geometry::Matrix44u *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__Vec2Tdouble_t = {"_p_VecMat__Vec2Tdouble_t", "VecMat::Vec2<double > *|Geometry::Vec2d *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__Vec2Tfloat_t = {"_p_VecMat__Vec2Tfloat_t", "VecMat::Vec2<float > *|Geometry::Vec2f *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__Vec2Tint_t = {"_p_VecMat__Vec2Tint_t", "VecMat::Vec2<int > *|Geometry::Vec2i *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__Vec2Tunsigned_int_t = {"_p_VecMat__Vec2Tunsigned_int_t", "VecMat::Vec2<unsigned int > *|Geometry::Vec2u *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__Vec3Tdouble_t = {"_p_VecMat__Vec3Tdouble_t", "VecMat::Vec3<double > *|Geometry::Vec3r *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__Vec3Tfloat_t = {"_p_VecMat__Vec3Tfloat_t", "VecMat::Vec3<float > *|Geometry::Vec3f *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__Vec3Tint_t = {"_p_VecMat__Vec3Tint_t", "VecMat::Vec3<int > *|Geometry::Vec3i *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__Vec3Tunsigned_int_t = {"_p_VecMat__Vec3Tunsigned_int_t", "VecMat::Vec3<unsigned int > *|Geometry::Vec3u *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__VecTdouble_2_t = {"_p_VecMat__VecTdouble_2_t", "VecMat::Vec<double,2 > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__VecTdouble_3_t = {"_p_VecMat__VecTdouble_3_t", "VecMat::Vec<double,3 > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__VecTfloat_2_t = {"_p_VecMat__VecTfloat_2_t", "VecMat::Vec<float,2 > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__VecTfloat_3_t = {"_p_VecMat__VecTfloat_3_t", "VecMat::Vec<float,3 > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__VecTint_2_t = {"_p_VecMat__VecTint_2_t", "VecMat::Vec<int,2 > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__VecTint_3_t = {"_p_VecMat__VecTint_3_t", "VecMat::Vec<int,3 > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__VecTunsigned_int_2_t = {"_p_VecMat__VecTunsigned_int_2_t", "VecMat::Vec<unsigned int,2 > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__VecTunsigned_int_3_t = {"_p_VecMat__VecTunsigned_int_3_t", "VecMat::Vec<unsigned int,3 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__HVec3T_double_t = {"_p_VecMat__HVec3T_double_t", "Geometry::HVec3d *|Geometry::HVec3r *|VecMat::HVec3< double > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__HVec3T_float_t = {"_p_VecMat__HVec3T_float_t", "VecMat::HVec3< float > *|Geometry::HVec3f *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__HVec3T_int_t = {"_p_VecMat__HVec3T_int_t", "Geometry::HVec3i *|VecMat::HVec3< int > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__HVec3T_unsigned_int_t = {"_p_VecMat__HVec3T_unsigned_int_t", "Geometry::HVec3u *|VecMat::HVec3< unsigned int > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixT_double_2_t = {"_p_VecMat__SquareMatrixT_double_2_t", "Geometry::Matrix22d *|Geometry::Matrix22r *|VecMat::SquareMatrix< double,2 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixT_double_3_t = {"_p_VecMat__SquareMatrixT_double_3_t", "VecMat::SquareMatrix< double,3 > *|Geometry::Matrix33d *|Geometry::Matrix33r *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixT_double_4_t = {"_p_VecMat__SquareMatrixT_double_4_t", "VecMat::SquareMatrix< double,4 > *|Geometry::Matrix44d *|Geometry::Matrix44r *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixT_float_2_t = {"_p_VecMat__SquareMatrixT_float_2_t", "Geometry::Matrix22f *|VecMat::SquareMatrix< float,2 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixT_float_3_t = {"_p_VecMat__SquareMatrixT_float_3_t", "VecMat::SquareMatrix< float,3 > *|Geometry::Matrix33f *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixT_float_4_t = {"_p_VecMat__SquareMatrixT_float_4_t", "Geometry::Matrix44f *|VecMat::SquareMatrix< float,4 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixT_int_2_t = {"_p_VecMat__SquareMatrixT_int_2_t", "VecMat::SquareMatrix< int,2 > *|Geometry::Matrix22i *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixT_int_3_t = {"_p_VecMat__SquareMatrixT_int_3_t", "VecMat::SquareMatrix< int,3 > *|Geometry::Matrix33i *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixT_int_4_t = {"_p_VecMat__SquareMatrixT_int_4_t", "Geometry::Matrix44i *|VecMat::SquareMatrix< int,4 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixT_unsigned_int_2_t = {"_p_VecMat__SquareMatrixT_unsigned_int_2_t", "Geometry::Matrix22u *|VecMat::SquareMatrix< unsigned int,2 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixT_unsigned_int_3_t = {"_p_VecMat__SquareMatrixT_unsigned_int_3_t", "Geometry::Matrix33u *|VecMat::SquareMatrix< unsigned int,3 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixT_unsigned_int_4_t = {"_p_VecMat__SquareMatrixT_unsigned_int_4_t", "Geometry::Matrix44u *|VecMat::SquareMatrix< unsigned int,4 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__Vec2T_double_t = {"_p_VecMat__Vec2T_double_t", "Geometry::Vec2d *|Geometry::Vec2r *|VecMat::Vec2< double > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__Vec2T_float_t = {"_p_VecMat__Vec2T_float_t", "VecMat::Vec2< float > *|Geometry::Vec2f *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__Vec2T_int_t = {"_p_VecMat__Vec2T_int_t", "Geometry::Vec2i *|VecMat::Vec2< int > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__Vec2T_unsigned_int_t = {"_p_VecMat__Vec2T_unsigned_int_t", "Geometry::Vec2u *|VecMat::Vec2< unsigned int > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__Vec3T_double_t = {"_p_VecMat__Vec3T_double_t", "Geometry::Vec3d *|Geometry::Vec3r *|VecMat::Vec3< double > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__Vec3T_float_t = {"_p_VecMat__Vec3T_float_t", "VecMat::Vec3< float > *|Geometry::Vec3f *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__Vec3T_int_t = {"_p_VecMat__Vec3T_int_t", "Geometry::Vec3i *|VecMat::Vec3< int > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__Vec3T_unsigned_int_t = {"_p_VecMat__Vec3T_unsigned_int_t", "Geometry::Vec3u *|VecMat::Vec3< unsigned int > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__VecT_double_2_t = {"_p_VecMat__VecT_double_2_t", "VecMat::Vec< double,2 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__VecT_double_3_t = {"_p_VecMat__VecT_double_3_t", "VecMat::Vec< double,3 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__VecT_float_2_t = {"_p_VecMat__VecT_float_2_t", "VecMat::Vec< float,2 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__VecT_float_3_t = {"_p_VecMat__VecT_float_3_t", "VecMat::Vec< float,3 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__VecT_int_2_t = {"_p_VecMat__VecT_int_2_t", "VecMat::Vec< int,2 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__VecT_int_3_t = {"_p_VecMat__VecT_int_3_t", "VecMat::Vec< int,3 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__VecT_unsigned_int_2_t = {"_p_VecMat__VecT_unsigned_int_2_t", "VecMat::Vec< unsigned int,2 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__VecT_unsigned_int_3_t = {"_p_VecMat__VecT_unsigned_int_3_t", "VecMat::Vec< unsigned int,3 > *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_Vertex = {"_p_Vertex", "Vertex *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_ViewEdge = {"_p_ViewEdge", "ViewEdge *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_ViewEdgeInternal__SVertexIterator = {"_p_ViewEdgeInternal__SVertexIterator", "ViewEdgeInternal::SVertexIterator *", 0, 0, (void*)0, 0};
@@ -110376,8 +109292,8 @@ static swig_type_info _swigt__p_ViewEdgeInternal__ViewEdgeIterator = {"_p_ViewEd
 static swig_type_info _swigt__p_ViewMap = {"_p_ViewMap", "ViewMap *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_ViewShape = {"_p_ViewShape", "ViewShape *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_ViewVertex = {"_p_ViewVertex", "ViewVertex *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t = {"_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t", "ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_const_traits > *|ViewVertex::const_edge_iterator *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t = {"_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t", "ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_nonconst_traits > *|ViewVertex::edge_iterator *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_const_traits_t = {"_p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_const_traits_t", "ViewVertexInternal::edge_iterator_base< ViewVertexInternal::edge_const_traits > *|ViewVertex::const_edge_iterator *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_nonconst_traits_t = {"_p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_nonconst_traits_t", "ViewVertexInternal::edge_iterator_base< ViewVertexInternal::edge_nonconst_traits > *|ViewVertex::edge_iterator *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_ViewVertexInternal__orientedViewEdgeIterator = {"_p_ViewVertexInternal__orientedViewEdgeIterator", "ViewVertexInternal::orientedViewEdgeIterator *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_ViewVertexInternal__orientedViewEdgeIterator__edge_pointers_container__iterator = {"_p_ViewVertexInternal__orientedViewEdgeIterator__edge_pointers_container__iterator", "ViewVertexInternal::orientedViewEdgeIterator::edge_pointers_container::iterator *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_ViewVertexInternal__orientedViewEdgeIterator__edges_container__iterator = {"_p_ViewVertexInternal__orientedViewEdgeIterator__edges_container__iterator", "ViewVertexInternal::orientedViewEdgeIterator::edges_container::iterator *", 0, 0, (void*)0, 0};
@@ -110390,15 +109306,16 @@ static swig_type_info _swigt__p_const_reference = {"_p_const_reference", "const_
 static swig_type_info _swigt__p_const_vertex_iterator = {"_p_const_vertex_iterator", "const_vertex_iterator *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_difference_type = {"_p_difference_type", "difference_type *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_directedViewEdge = {"_p_directedViewEdge", "directedViewEdge *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_double = {"_p_double", "double *|VecMat::Vec3<double >::value_type *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_double = {"_p_double", "real *|VecMat::Vec2< double >::value_type *|VecMat::Vec3< double >::value_type *|double *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_edge_iterator = {"_p_edge_iterator", "edge_iterator *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_edge_pointers_container = {"_p_edge_pointers_container", "edge_pointers_container *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_edges_container = {"_p_edges_container", "edges_container *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_fedge_iterator = {"_p_fedge_iterator", "fedge_iterator *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_fedges_container = {"_p_fedges_container", "fedges_container *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_float = {"_p_float", "float *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_float = {"_p_float", "VecMat::Vec2< float >::value_type *|VecMat::Vec3< float >::value_type *|float *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_id_to_index_map = {"_p_id_to_index_map", "id_to_index_map *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_id_type = {"_p_id_type", "id_type *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_int = {"_p_int", "int *|VecMat::Vec3<int >::value_type *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_int = {"_p_int", "VecMat::Vec2< int >::value_type *|VecMat::Vec3< int >::value_type *|int *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_ltstr = {"_p_ltstr", "ltstr *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_mapsMap = {"_p_mapsMap", "mapsMap *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_occluder_container__const_iterator = {"_p_occluder_container__const_iterator", "occluder_container::const_iterator *", 0, 0, (void*)0, 0};
@@ -110406,33 +109323,34 @@ static swig_type_info _swigt__p_p_PyObject = {"_p_p_PyObject", "PyObject **", 0,
 static swig_type_info _swigt__p_point_iterator = {"_p_point_iterator", "point_iterator *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_point_type = {"_p_point_type", "point_type *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_reference = {"_p_reference", "reference *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_setTVecMat__Vec3Tdouble_t_t = {"_p_setTVecMat__Vec3Tdouble_t_t", "set<VecMat::Vec3<double > > *|set<Geometry::Vec3r > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_setT_VecMat__Vec3T_double_t_t = {"_p_setT_VecMat__Vec3T_double_t_t", "set< VecMat::Vec3< double > > *|set< Geometry::Vec3r > *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_size_type = {"_p_size_type", "size_type *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_std__invalid_argument = {"_p_std__invalid_argument", "std::invalid_argument *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__pairTViewEdge_p_bool_t = {"_p_std__pairTViewEdge_p_bool_t", "std::pair<ViewEdge *,bool > *|ViewVertex::directedViewEdge *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t = {"_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t", "std::vector<FEdge * > *|std::vector<FEdge *,std::allocator<FEdge * > > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__allocator_type = {"_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__allocator_type", "std::allocator<FEdge * > *|std::vector<FEdge * >::allocator_type *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorTMaterial_std__allocatorTMaterial_t_t = {"_p_std__vectorTMaterial_std__allocatorTMaterial_t_t", "std::vector<Material > *|std::vector<Material,std::allocator<Material > > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t = {"_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t", "std::vector<SVertex * > *|ViewMap::svertices_container *|std::vector<SVertex *,std::allocator<SVertex * > > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__allocator_type = {"_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__allocator_type", "std::allocator<SVertex * > *|std::vector<SVertex * >::allocator_type *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t = {"_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t", "std::vector<StrokeShader * > *|std::vector<StrokeShader *,std::allocator<StrokeShader * > > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__allocator_type = {"_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__allocator_type", "std::allocator<StrokeShader * > *|std::vector<StrokeShader * >::allocator_type *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorTTVertex_p_std__allocatorTTVertex_p_t_t = {"_p_std__vectorTTVertex_p_std__allocatorTTVertex_p_t_t", "std::vector<TVertex * > *|std::vector<TVertex *,std::allocator<TVertex * > > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorTVecMat__Vec2Tdouble_t_std__allocatorTVecMat__Vec2Tdouble_t_t_t = {"_p_std__vectorTVecMat__Vec2Tdouble_t_std__allocatorTVecMat__Vec2Tdouble_t_t_t", "std::vector<VecMat::Vec2<double > > *|std::vector<Geometry::Vec2r > *|std::vector<VecMat::Vec2<double >,std::allocator<VecMat::Vec2<double > > > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t = {"_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t", "std::vector<ViewEdge * > *|std::vector<ViewEdge *,std::allocator<ViewEdge * > > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__allocator_type = {"_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__allocator_type", "std::allocator<ViewEdge * > *|std::vector<ViewEdge * >::allocator_type *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t = {"_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t", "std::vector<ViewShape * > *|std::vector<ViewShape *,std::allocator<ViewShape * > > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__allocator_type = {"_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__allocator_type", "std::allocator<ViewShape * > *|std::vector<ViewShape * >::allocator_type *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t = {"_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t", "std::vector<ViewVertex * > *|std::vector<ViewVertex *,std::allocator<ViewVertex * > > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__allocator_type = {"_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__allocator_type", "std::allocator<ViewVertex * > *|std::vector<ViewVertex * >::allocator_type *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorTint_std__allocatorTint_t_t = {"_p_std__vectorTint_std__allocatorTint_t_t", "std::vector<int > *|std::vector<int,std::allocator<int > > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorTint_std__allocatorTint_t_t__allocator_type = {"_p_std__vectorTint_std__allocatorTint_t_t__allocator_type", "std::allocator<int > *|std::vector<int >::allocator_type *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorTstd__pairTViewEdge_p_bool_t_std__allocatorTstd__pairTViewEdge_p_bool_t_t_t = {"_p_std__vectorTstd__pairTViewEdge_p_bool_t_std__allocatorTstd__pairTViewEdge_p_bool_t_t_t", "std::vector<std::pair<ViewEdge *,bool > > *|std::vector<ViewVertex::directedViewEdge > *|std::vector<std::pair<ViewEdge *,bool >,std::allocator<std::pair<ViewEdge *,bool > > > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorTunsigned_int_std__allocatorTunsigned_int_t_t = {"_p_std__vectorTunsigned_int_std__allocatorTunsigned_int_t_t", "std::vector<unsigned int,std::allocator<unsigned int > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__mapT_int_int_std__lessT_int_t_std__allocatorT_std__pairT_int_const_int_t_t_t = {"_p_std__mapT_int_int_std__lessT_int_t_std__allocatorT_std__pairT_int_const_int_t_t_t", "ViewMap::id_to_index_map *|std::map< int,int,std::less< int >,std::allocator< std::pair< int const,int > > > *|std::map< int,int > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__pairT_ViewEdge_p_bool_t = {"_p_std__pairT_ViewEdge_p_bool_t", "std::pair< ViewEdge *,bool > *|ViewVertex::directedViewEdge *|::ViewVertex::directedViewEdge *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t = {"_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t", "std::vector< FEdge *,std::allocator< FEdge * > > *|std::vector< FEdge * > *|ViewMap::fedges_container *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__allocator_type = {"_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__allocator_type", "std::vector< FEdge * >::allocator_type *|std::allocator< FEdge * > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorT_Material_std__allocatorT_Material_t_t = {"_p_std__vectorT_Material_std__allocatorT_Material_t_t", "std::vector< Material,std::allocator< Material > > *|std::vector< Material > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t = {"_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t", "std::vector< SVertex * > *|ViewMap::svertices_container *|std::vector< SVertex *,std::allocator< SVertex * > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__allocator_type = {"_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__allocator_type", "std::vector< SVertex * >::allocator_type *|std::allocator< SVertex * > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t = {"_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t", "std::vector< StrokeShader *,std::allocator< StrokeShader * > > *|std::vector< StrokeShader * > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__allocator_type = {"_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__allocator_type", "std::vector< StrokeShader * >::allocator_type *|std::allocator< StrokeShader * > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorT_TVertex_p_std__allocatorT_TVertex_p_t_t = {"_p_std__vectorT_TVertex_p_std__allocatorT_TVertex_p_t_t", "std::vector< TVertex * > *|std::vector< TVertex *,std::allocator< TVertex * > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorT_VecMat__Vec2T_double_t_std__allocatorT_VecMat__Vec2T_double_t_t_t = {"_p_std__vectorT_VecMat__Vec2T_double_t_std__allocatorT_VecMat__Vec2T_double_t_t_t", "std::vector< VecMat::Vec2< double > > *|std::vector< VecMat::Vec2< double >,std::allocator< VecMat::Vec2< double > > > *|std::vector< Geometry::Vec2r > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t = {"_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t", "std::vector< ViewEdge *,std::allocator< ViewEdge * > > *|std::vector< ViewEdge * > *|ViewMap::viewedges_container *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__allocator_type = {"_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__allocator_type", "std::vector< ViewEdge * >::allocator_type *|std::allocator< ViewEdge * > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t = {"_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t", "std::vector< ViewShape *,std::allocator< ViewShape * > > *|std::vector< ViewShape * > *|occluder_container *|ViewMap::viewshapes_container *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__allocator_type = {"_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__allocator_type", "std::vector< ViewShape * >::allocator_type *|std::allocator< ViewShape * > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t = {"_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t", "std::vector< ViewVertex *,std::allocator< ViewVertex * > > *|std::vector< ViewVertex * > *|ViewMap::viewvertices_container *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__allocator_type = {"_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__allocator_type", "std::vector< ViewVertex * >::allocator_type *|std::allocator< ViewVertex * > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorT_int_std__allocatorT_int_t_t = {"_p_std__vectorT_int_std__allocatorT_int_t_t", "std::vector< int,std::allocator< int > > *|std::vector< int > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorT_int_std__allocatorT_int_t_t__allocator_type = {"_p_std__vectorT_int_std__allocatorT_int_t_t__allocator_type", "std::vector< int >::allocator_type *|std::allocator< int > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorT_std__pairT_ViewEdge_p_bool_t_std__allocatorT_std__pairT_ViewEdge_p_bool_t_t_t = {"_p_std__vectorT_std__pairT_ViewEdge_p_bool_t_std__allocatorT_std__pairT_ViewEdge_p_bool_t_t_t", "std::vector< std::pair< ViewEdge *,bool > > *|std::vector< ViewVertex::directedViewEdge > *|std::vector< std::pair< ViewEdge *,bool >,std::allocator< std::pair< ViewEdge *,bool > > > *|NonTVertex::edges_container *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t = {"_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t", "std::vector< unsigned int,std::allocator< unsigned int > > *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svertices_container = {"_p_svertices_container", "svertices_container *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_swig__PySwigIterator = {"_p_swig__PySwigIterator", "swig::PySwigIterator *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_unsigned_int = {"_p_unsigned_int", "unsigned int *|VecMat::Vec3<unsigned int >::value_type *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_unsigned_short = {"_p_unsigned_short", "unsigned short *|Nature::EdgeNature *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_unsigned_int = {"_p_unsigned_int", "VecMat::Vec2< unsigned int >::value_type *|VecMat::Vec3< unsigned int >::value_type *|unsigned int *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_unsigned_short = {"_p_unsigned_short", "Nature::VertexNature *|Nature::EdgeNature *|unsigned short *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_value_type = {"_p_value_type", "value_type *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_vertex_container = {"_p_vertex_container", "vertex_container *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_vertex_iterator = {"_p_vertex_iterator", "vertex_iterator *", 0, 0, (void*)0, 0};
@@ -110442,16 +109360,16 @@ static swig_type_info _swigt__p_viewedges_container = {"_p_viewedges_container",
 static swig_type_info _swigt__p_viewshapes_container = {"_p_viewshapes_container", "viewshapes_container *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_viewvertices_container = {"_p_viewvertices_container", "viewvertices_container *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_void = {"_p_void", "void *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type = {"_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type", "FEdge *|std::vector<FEdge * >::value_type", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type = {"_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type", "SVertex *|std::vector<SVertex * >::value_type", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type = {"_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type", "StrokeShader *|std::vector<StrokeShader * >::value_type", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type = {"_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type", "ViewEdge *|std::vector<ViewEdge * >::value_type", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type = {"_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type", "ViewShape *|std::vector<ViewShape * >::value_type", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type = {"_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type", "ViewVertex *|std::vector<ViewVertex * >::value_type", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type = {"_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type", "std::vector< FEdge * >::value_type|FEdge *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type = {"_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type", "std::vector< SVertex * >::value_type|SVertex *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type = {"_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type", "std::vector< StrokeShader * >::value_type|StrokeShader *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type = {"_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type", "std::vector< ViewEdge * >::value_type|ViewEdge *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type = {"_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type", "std::vector< ViewShape * >::value_type|ViewShape *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type = {"_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type", "std::vector< ViewVertex * >::value_type|ViewVertex *", 0, 0, (void*)0, 0};
 
 static swig_type_info *swig_type_initial[] = {
   &_swigt__p_AdjacencyIterator,
-  &_swigt__p_BBoxTVecMat__Vec3Tdouble_t_t,
+  &_swigt__p_BBoxT_VecMat__Vec3T_double_t_t,
   &_swigt__p_BinaryPredicate0D,
   &_swigt__p_BinaryPredicate1D,
   &_swigt__p_CalligraphicShader,
@@ -110602,56 +109520,56 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_StrokesContainer,
   &_swigt__p_StyleModule,
   &_swigt__p_TVertex,
-  &_swigt__p_UnaryFunction0DTId_t,
-  &_swigt__p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t,
-  &_swigt__p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t,
-  &_swigt__p_UnaryFunction0DTViewShape_p_t,
-  &_swigt__p_UnaryFunction0DTdouble_t,
-  &_swigt__p_UnaryFunction0DTfloat_t,
-  &_swigt__p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t,
-  &_swigt__p_UnaryFunction0DTunsigned_int_t,
-  &_swigt__p_UnaryFunction0DTvoid_t,
-  &_swigt__p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t,
-  &_swigt__p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t,
-  &_swigt__p_UnaryFunction1DTdouble_t,
-  &_swigt__p_UnaryFunction1DTfloat_t,
-  &_swigt__p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t,
-  &_swigt__p_UnaryFunction1DTunsigned_int_t,
-  &_swigt__p_UnaryFunction1DTvoid_t,
+  &_swigt__p_UnaryFunction0DT_Id_t,
+  &_swigt__p_UnaryFunction0DT_VecMat__Vec2T_float_t_t,
+  &_swigt__p_UnaryFunction0DT_VecMat__Vec3T_float_t_t,
+  &_swigt__p_UnaryFunction0DT_ViewShape_p_t,
+  &_swigt__p_UnaryFunction0DT_double_t,
+  &_swigt__p_UnaryFunction0DT_float_t,
+  &_swigt__p_UnaryFunction0DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t,
+  &_swigt__p_UnaryFunction0DT_unsigned_int_t,
+  &_swigt__p_UnaryFunction0DT_void_t,
+  &_swigt__p_UnaryFunction1DT_VecMat__Vec2T_float_t_t,
+  &_swigt__p_UnaryFunction1DT_VecMat__Vec3T_float_t_t,
+  &_swigt__p_UnaryFunction1DT_double_t,
+  &_swigt__p_UnaryFunction1DT_float_t,
+  &_swigt__p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t,
+  &_swigt__p_UnaryFunction1DT_unsigned_int_t,
+  &_swigt__p_UnaryFunction1DT_void_t,
   &_swigt__p_UnaryPredicate0D,
   &_swigt__p_UnaryPredicate1D,
-  &_swigt__p_VecMat__HVec3Tdouble_t,
-  &_swigt__p_VecMat__HVec3Tfloat_t,
-  &_swigt__p_VecMat__HVec3Tint_t,
-  &_swigt__p_VecMat__HVec3Tunsigned_int_t,
-  &_swigt__p_VecMat__SquareMatrixTdouble_2_t,
-  &_swigt__p_VecMat__SquareMatrixTdouble_3_t,
-  &_swigt__p_VecMat__SquareMatrixTdouble_4_t,
-  &_swigt__p_VecMat__SquareMatrixTfloat_2_t,
-  &_swigt__p_VecMat__SquareMatrixTfloat_3_t,
-  &_swigt__p_VecMat__SquareMatrixTfloat_4_t,
-  &_swigt__p_VecMat__SquareMatrixTint_2_t,
-  &_swigt__p_VecMat__SquareMatrixTint_3_t,
-  &_swigt__p_VecMat__SquareMatrixTint_4_t,
-  &_swigt__p_VecMat__SquareMatrixTunsigned_int_2_t,
-  &_swigt__p_VecMat__SquareMatrixTunsigned_int_3_t,
-  &_swigt__p_VecMat__SquareMatrixTunsigned_int_4_t,
-  &_swigt__p_VecMat__Vec2Tdouble_t,
-  &_swigt__p_VecMat__Vec2Tfloat_t,
-  &_swigt__p_VecMat__Vec2Tint_t,
-  &_swigt__p_VecMat__Vec2Tunsigned_int_t,
-  &_swigt__p_VecMat__Vec3Tdouble_t,
-  &_swigt__p_VecMat__Vec3Tfloat_t,
-  &_swigt__p_VecMat__Vec3Tint_t,
-  &_swigt__p_VecMat__Vec3Tunsigned_int_t,
-  &_swigt__p_VecMat__VecTdouble_2_t,
-  &_swigt__p_VecMat__VecTdouble_3_t,
-  &_swigt__p_VecMat__VecTfloat_2_t,
-  &_swigt__p_VecMat__VecTfloat_3_t,
-  &_swigt__p_VecMat__VecTint_2_t,
-  &_swigt__p_VecMat__VecTint_3_t,
-  &_swigt__p_VecMat__VecTunsigned_int_2_t,
-  &_swigt__p_VecMat__VecTunsigned_int_3_t,
+  &_swigt__p_VecMat__HVec3T_double_t,
+  &_swigt__p_VecMat__HVec3T_float_t,
+  &_swigt__p_VecMat__HVec3T_int_t,
+  &_swigt__p_VecMat__HVec3T_unsigned_int_t,
+  &_swigt__p_VecMat__SquareMatrixT_double_2_t,
+  &_swigt__p_VecMat__SquareMatrixT_double_3_t,
+  &_swigt__p_VecMat__SquareMatrixT_double_4_t,
+  &_swigt__p_VecMat__SquareMatrixT_float_2_t,
+  &_swigt__p_VecMat__SquareMatrixT_float_3_t,
+  &_swigt__p_VecMat__SquareMatrixT_float_4_t,
+  &_swigt__p_VecMat__SquareMatrixT_int_2_t,
+  &_swigt__p_VecMat__SquareMatrixT_int_3_t,
+  &_swigt__p_VecMat__SquareMatrixT_int_4_t,
+  &_swigt__p_VecMat__SquareMatrixT_unsigned_int_2_t,
+  &_swigt__p_VecMat__SquareMatrixT_unsigned_int_3_t,
+  &_swigt__p_VecMat__SquareMatrixT_unsigned_int_4_t,
+  &_swigt__p_VecMat__Vec2T_double_t,
+  &_swigt__p_VecMat__Vec2T_float_t,
+  &_swigt__p_VecMat__Vec2T_int_t,
+  &_swigt__p_VecMat__Vec2T_unsigned_int_t,
+  &_swigt__p_VecMat__Vec3T_double_t,
+  &_swigt__p_VecMat__Vec3T_float_t,
+  &_swigt__p_VecMat__Vec3T_int_t,
+  &_swigt__p_VecMat__Vec3T_unsigned_int_t,
+  &_swigt__p_VecMat__VecT_double_2_t,
+  &_swigt__p_VecMat__VecT_double_3_t,
+  &_swigt__p_VecMat__VecT_float_2_t,
+  &_swigt__p_VecMat__VecT_float_3_t,
+  &_swigt__p_VecMat__VecT_int_2_t,
+  &_swigt__p_VecMat__VecT_int_3_t,
+  &_swigt__p_VecMat__VecT_unsigned_int_2_t,
+  &_swigt__p_VecMat__VecT_unsigned_int_3_t,
   &_swigt__p_Vertex,
   &_swigt__p_ViewEdge,
   &_swigt__p_ViewEdgeInternal__SVertexIterator,
@@ -110659,8 +109577,8 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_ViewMap,
   &_swigt__p_ViewShape,
   &_swigt__p_ViewVertex,
-  &_swigt__p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t,
-  &_swigt__p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t,
+  &_swigt__p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_const_traits_t,
+  &_swigt__p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_nonconst_traits_t,
   &_swigt__p_ViewVertexInternal__orientedViewEdgeIterator,
   &_swigt__p_ViewVertexInternal__orientedViewEdgeIterator__edge_pointers_container__iterator,
   &_swigt__p_ViewVertexInternal__orientedViewEdgeIterator__edges_container__iterator,
@@ -110680,6 +109598,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_fedge_iterator,
   &_swigt__p_fedges_container,
   &_swigt__p_float,
+  &_swigt__p_id_to_index_map,
   &_swigt__p_id_type,
   &_swigt__p_int,
   &_swigt__p_ltstr,
@@ -110689,29 +109608,30 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_point_iterator,
   &_swigt__p_point_type,
   &_swigt__p_reference,
-  &_swigt__p_setTVecMat__Vec3Tdouble_t_t,
+  &_swigt__p_setT_VecMat__Vec3T_double_t_t,
   &_swigt__p_size_type,
   &_swigt__p_std__invalid_argument,
-  &_swigt__p_std__pairTViewEdge_p_bool_t,
-  &_swigt__p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t,
-  &_swigt__p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__allocator_type,
-  &_swigt__p_std__vectorTMaterial_std__allocatorTMaterial_t_t,
-  &_swigt__p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t,
-  &_swigt__p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__allocator_type,
-  &_swigt__p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t,
-  &_swigt__p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__allocator_type,
-  &_swigt__p_std__vectorTTVertex_p_std__allocatorTTVertex_p_t_t,
-  &_swigt__p_std__vectorTVecMat__Vec2Tdouble_t_std__allocatorTVecMat__Vec2Tdouble_t_t_t,
-  &_swigt__p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t,
-  &_swigt__p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__allocator_type,
-  &_swigt__p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t,
-  &_swigt__p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__allocator_type,
-  &_swigt__p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t,
-  &_swigt__p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__allocator_type,
-  &_swigt__p_std__vectorTint_std__allocatorTint_t_t,
-  &_swigt__p_std__vectorTint_std__allocatorTint_t_t__allocator_type,
-  &_swigt__p_std__vectorTstd__pairTViewEdge_p_bool_t_std__allocatorTstd__pairTViewEdge_p_bool_t_t_t,
-  &_swigt__p_std__vectorTunsigned_int_std__allocatorTunsigned_int_t_t,
+  &_swigt__p_std__mapT_int_int_std__lessT_int_t_std__allocatorT_std__pairT_int_const_int_t_t_t,
+  &_swigt__p_std__pairT_ViewEdge_p_bool_t,
+  &_swigt__p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t,
+  &_swigt__p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__allocator_type,
+  &_swigt__p_std__vectorT_Material_std__allocatorT_Material_t_t,
+  &_swigt__p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t,
+  &_swigt__p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__allocator_type,
+  &_swigt__p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t,
+  &_swigt__p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__allocator_type,
+  &_swigt__p_std__vectorT_TVertex_p_std__allocatorT_TVertex_p_t_t,
+  &_swigt__p_std__vectorT_VecMat__Vec2T_double_t_std__allocatorT_VecMat__Vec2T_double_t_t_t,
+  &_swigt__p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t,
+  &_swigt__p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__allocator_type,
+  &_swigt__p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t,
+  &_swigt__p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__allocator_type,
+  &_swigt__p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t,
+  &_swigt__p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__allocator_type,
+  &_swigt__p_std__vectorT_int_std__allocatorT_int_t_t,
+  &_swigt__p_std__vectorT_int_std__allocatorT_int_t_t__allocator_type,
+  &_swigt__p_std__vectorT_std__pairT_ViewEdge_p_bool_t_std__allocatorT_std__pairT_ViewEdge_p_bool_t_t_t,
+  &_swigt__p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t,
   &_swigt__p_svertices_container,
   &_swigt__p_swig__PySwigIterator,
   &_swigt__p_unsigned_int,
@@ -110725,16 +109645,16 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_viewshapes_container,
   &_swigt__p_viewvertices_container,
   &_swigt__p_void,
-  &_swigt__std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type,
-  &_swigt__std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type,
-  &_swigt__std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type,
-  &_swigt__std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type,
-  &_swigt__std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type,
-  &_swigt__std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type,
+  &_swigt__std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type,
+  &_swigt__std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type,
+  &_swigt__std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type,
+  &_swigt__std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type,
+  &_swigt__std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type,
+  &_swigt__std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type,
 };
 
 static swig_cast_info _swigc__p_AdjacencyIterator[] = {  {&_swigt__p_AdjacencyIterator, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_BBoxTVecMat__Vec3Tdouble_t_t[] = {  {&_swigt__p_BBoxTVecMat__Vec3Tdouble_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_BBoxT_VecMat__Vec3T_double_t_t[] = {  {&_swigt__p_BBoxT_VecMat__Vec3T_double_t_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_BinaryPredicate0D[] = {  {&_swigt__p_BinaryPredicate0D, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_BinaryPredicate1D[] = {  {&_swigt__p_Predicates1D__Length2DBP1D, _p_Predicates1D__Length2DBP1DTo_p_BinaryPredicate1D, 0, 0},  {&_swigt__p_Predicates1D__FalseBP1D, _p_Predicates1D__FalseBP1DTo_p_BinaryPredicate1D, 0, 0},  {&_swigt__p_BinaryPredicate1D, 0, 0, 0},  {&_swigt__p_Predicates1D__ViewMapGradientNormBP1D, _p_Predicates1D__ViewMapGradientNormBP1DTo_p_BinaryPredicate1D, 0, 0},  {&_swigt__p_Predicates1D__TrueBP1D, _p_Predicates1D__TrueBP1DTo_p_BinaryPredicate1D, 0, 0},  {&_swigt__p_Predicates1D__SameShapeIdBP1D, _p_Predicates1D__SameShapeIdBP1DTo_p_BinaryPredicate1D, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CalligraphicShader[] = {  {&_swigt__p_CalligraphicShader, 0, 0, 0},{0, 0, 0, 0}};
@@ -110748,7 +109668,7 @@ static swig_cast_info _swigc__p_Curve[] = {  {&_swigt__p_Curve, 0, 0, 0},{0, 0,
 static swig_cast_info _swigc__p_CurveInternal__CurvePointIterator[] = {  {&_swigt__p_CurveInternal__CurvePointIterator, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CurvePoint[] = {  {&_swigt__p_StrokeVertex, _p_StrokeVertexTo_p_CurvePoint, 0, 0},  {&_swigt__p_CurvePoint, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_Curve__vertex_container__iterator[] = {  {&_swigt__p_Curve__vertex_container__iterator, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_FEdge[] = {  {&_swigt__p_FEdge, 0, 0, 0},  {&_swigt__p_FEdgeSharp, _p_FEdgeSharpTo_p_FEdge, 0, 0},  {&_swigt__p_FEdgeSmooth, _p_FEdgeSmoothTo_p_FEdge, 0, 0},  {&_swigt__std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_FEdge[] = {  {&_swigt__std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_FEdge, 0, 0, 0},  {&_swigt__p_FEdgeSharp, _p_FEdgeSharpTo_p_FEdge, 0, 0},  {&_swigt__p_FEdgeSmooth, _p_FEdgeSmoothTo_p_FEdge, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_FEdgeInternal__SVertexIterator[] = {  {&_swigt__p_FEdgeInternal__SVertexIterator, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_FEdgeSharp[] = {  {&_swigt__p_FEdgeSharp, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_FEdgeSmooth[] = {  {&_swigt__p_FEdgeSmooth, 0, 0, 0},{0, 0, 0, 0}};
@@ -110807,10 +109727,10 @@ static swig_cast_info _swigc__p_GrayImage[] = {  {&_swigt__p_GrayImage, 0, 0, 0}
 static swig_cast_info _swigc__p_I1DContainer[] = {  {&_swigt__p_I1DContainer, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_Id[] = {  {&_swigt__p_Id, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_IntegrationType[] = {  {&_swigt__p_IntegrationType, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_Interface0D[] = {  {&_swigt__std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, _p_SVertexTo_p_Interface0D, 0, 0},  {&_swigt__p_TVertex, _p_TVertexTo_p_Interface0D, 0, 0},  {&_swigt__p_NonTVertex, _p_NonTVertexTo_p_Interface0D, 0, 0},  {&_swigt__p_Interface0D, 0, 0, 0},  {&_swigt__p_SVertex, _p_SVertexTo_p_Interface0D, 0, 0},  {&_swigt__p_ViewVertex, _p_ViewVertexTo_p_Interface0D, 0, 0},  {&_swigt__std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, _p_ViewVertexTo_p_Interface0D, 0, 0},  {&_swigt__p_StrokeVertex, _p_StrokeVertexTo_p_Interface0D, 0, 0},  {&_swigt__p_CurvePoint, _p_CurvePointTo_p_Interface0D, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Interface0D[] = {  {&_swigt__std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, _p_ViewVertexTo_p_Interface0D, 0, 0},  {&_swigt__p_TVertex, _p_TVertexTo_p_Interface0D, 0, 0},  {&_swigt__p_NonTVertex, _p_NonTVertexTo_p_Interface0D, 0, 0},  {&_swigt__p_Interface0D, 0, 0, 0},  {&_swigt__p_ViewVertex, _p_ViewVertexTo_p_Interface0D, 0, 0},  {&_swigt__p_SVertex, _p_SVertexTo_p_Interface0D, 0, 0},  {&_swigt__std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, _p_SVertexTo_p_Interface0D, 0, 0},  {&_swigt__p_StrokeVertex, _p_StrokeVertexTo_p_Interface0D, 0, 0},  {&_swigt__p_CurvePoint, _p_CurvePointTo_p_Interface0D, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_Interface0DIterator[] = {  {&_swigt__p_Interface0DIterator, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_Interface0DIteratorNested[] = {  {&_swigt__p_Interface0DIteratorNested, 0, 0, 0},  {&_swigt__p_FEdgeInternal__SVertexIterator, _p_FEdgeInternal__SVertexIteratorTo_p_Interface0DIteratorNested, 0, 0},  {&_swigt__p_ViewEdgeInternal__SVertexIterator, _p_ViewEdgeInternal__SVertexIteratorTo_p_Interface0DIteratorNested, 0, 0},  {&_swigt__p_CurveInternal__CurvePointIterator, _p_CurveInternal__CurvePointIteratorTo_p_Interface0DIteratorNested, 0, 0},  {&_swigt__p_StrokeInternal__StrokeVertexIterator, _p_StrokeInternal__StrokeVertexIteratorTo_p_Interface0DIteratorNested, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_Interface1D[] = {  {&_swigt__p_Interface1D, 0, 0, 0},  {&_swigt__p_ViewEdge, _p_ViewEdgeTo_p_Interface1D, 0, 0},  {&_swigt__std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_Curve, _p_CurveTo_p_Interface1D, 0, 0},  {&_swigt__p_Stroke, _p_StrokeTo_p_Interface1D, 0, 0},  {&_swigt__p_FEdgeSharp, _p_FEdgeSharpTo_p_Interface1D, 0, 0},  {&_swigt__p_FEdgeSmooth, _p_FEdgeSmoothTo_p_Interface1D, 0, 0},  {&_swigt__p_FEdge, _p_FEdgeTo_p_Interface1D, 0, 0},  {&_swigt__std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Interface1D[] = {  {&_swigt__p_Interface1D, 0, 0, 0},  {&_swigt__std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_ViewEdge, _p_ViewEdgeTo_p_Interface1D, 0, 0},  {&_swigt__p_Curve, _p_CurveTo_p_Interface1D, 0, 0},  {&_swigt__p_Stroke, _p_StrokeTo_p_Interface1D, 0, 0},  {&_swigt__std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_FEdgeSharp, _p_FEdgeSharpTo_p_Interface1D, 0, 0},  {&_swigt__p_FEdgeSmooth, _p_FEdgeSmoothTo_p_Interface1D, 0, 0},  {&_swigt__p_FEdge, _p_FEdgeTo_p_Interface1D, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_Material[] = {  {&_swigt__p_Material, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_MediumType[] = {  {&_swigt__p_MediumType, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_Module[] = {  {&_swigt__p_Module, 0, 0, 0},{0, 0, 0, 0}};
@@ -110840,7 +109760,7 @@ static swig_cast_info _swigc__p_Predicates1D__ViewMapGradientNormBP1D[] = {  {&_
 static swig_cast_info _swigc__p_RGBImage[] = {  {&_swigt__p_RGBImage, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_ReturnedValueType[] = {  {&_swigt__p_ReturnedValueType, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_SShape[] = {  {&_swigt__p_SShape, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_SVertex[] = {  {&_swigt__std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_SVertex, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_SVertex[] = {  {&_swigt__p_SVertex, 0, 0, 0},  {&_swigt__std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_SVertex__fedges_container__iterator[] = {  {&_swigt__p_SVertex__fedges_container__iterator, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_Smoother[] = {  {&_swigt__p_Smoother, 0, 0, 0},  {&_swigt__p_Omitter, _p_OmitterTo_p_Smoother, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_SmoothingShader[] = {  {&_swigt__p_SmoothingShader, 0, 0, 0},{0, 0, 0, 0}};
@@ -110851,7 +109771,7 @@ static swig_cast_info _swigc__p_StrokeAttribute[] = {  {&_swigt__p_StrokeAttribu
 static swig_cast_info _swigc__p_StrokeInternal__StrokeVertexIterator[] = {  {&_swigt__p_StrokeInternal__StrokeVertexIterator, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_StrokeLayer[] = {  {&_swigt__p_StrokeLayer, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_StrokeRenderer[] = {  {&_swigt__p_StrokeRenderer, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_StrokeShader[] = {  {&_swigt__p_StrokeShaders__ConstrainedIncreasingThicknessShader, _p_StrokeShaders__ConstrainedIncreasingThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_StrokeShaders__ColorNoiseShader, _p_StrokeShaders__ColorNoiseShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ThicknessNoiseShader, _p_StrokeShaders__ThicknessNoiseShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__LengthDependingThicknessShader, _p_StrokeShaders__LengthDependingThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__IncreasingThicknessShader, _p_StrokeShaders__IncreasingThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ConstantExternThicknessShader, _p_StrokeShaders__ConstantExternThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ConstantThicknessShader, _p_StrokeShaders__ConstantThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__StrokeTextureShader, _p_StrokeShaders__StrokeTextureShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__SamplingShader, _p_StrokeShaders__SamplingShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__BSplineShader, _p_StrokeShaders__BSplineShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__BezierCurveShader, _p_StrokeShaders__BezierCurveShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__InflateShader, _p_StrokeShaders__InflateShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShader, 0, 0, 0},  {&_swigt__p_StrokeShaders__GuidingLinesShader, _p_StrokeShaders__GuidingLinesShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__streamShader, _p_StrokeShaders__streamShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__fstreamShader, _p_StrokeShaders__fstreamShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_CalligraphicShader, _p_CalligraphicShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_SpatialNoiseShader, _p_SpatialNoiseShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_SmoothingShader, _p_SmoothingShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__TextureAssignerShader, _p_StrokeShaders__TextureAssignerShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__CalligraphicColorShader, _p_StrokeShaders__CalligraphicColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__MaterialColorShader, _p_StrokeShaders__MaterialColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ColorVariationPatternShader, _p_StrokeShaders__ColorVariationPatternShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__IncreasingColorShader, _p_StrokeShaders__IncreasingColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ConstantColorShader, _p_StrokeShaders__ConstantColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ThicknessVariationPatternShader, _p_StrokeShaders__ThicknessVariationPatternShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__BackboneStretcherShader, _p_StrokeShaders__BackboneStretcherShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ExternalContourStretcherShader, _p_StrokeShaders__ExternalContourStretcherShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__PolygonalizationShader, _p_StrokeShaders__PolygonalizationShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__TipRemoverShader, _p_StrokeShaders__TipRemoverShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_OmissionShader, _p_OmissionShaderTo_p_StrokeShader, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_StrokeShader[] = {  {&_swigt__p_StrokeShaders__ConstrainedIncreasingThicknessShader, _p_StrokeShaders__ConstrainedIncreasingThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_StrokeShaders__ColorNoiseShader, _p_StrokeShaders__ColorNoiseShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ThicknessNoiseShader, _p_StrokeShaders__ThicknessNoiseShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__LengthDependingThicknessShader, _p_StrokeShaders__LengthDependingThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__IncreasingThicknessShader, _p_StrokeShaders__IncreasingThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ConstantExternThicknessShader, _p_StrokeShaders__ConstantExternThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ConstantThicknessShader, _p_StrokeShaders__ConstantThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__StrokeTextureShader, _p_StrokeShaders__StrokeTextureShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__SamplingShader, _p_StrokeShaders__SamplingShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__BSplineShader, _p_StrokeShaders__BSplineShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__BezierCurveShader, _p_StrokeShaders__BezierCurveShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__InflateShader, _p_StrokeShaders__InflateShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShader, 0, 0, 0},  {&_swigt__p_StrokeShaders__GuidingLinesShader, _p_StrokeShaders__GuidingLinesShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__streamShader, _p_StrokeShaders__streamShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__fstreamShader, _p_StrokeShaders__fstreamShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_CalligraphicShader, _p_CalligraphicShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_SpatialNoiseShader, _p_SpatialNoiseShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_SmoothingShader, _p_SmoothingShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__TextureAssignerShader, _p_StrokeShaders__TextureAssignerShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__CalligraphicColorShader, _p_StrokeShaders__CalligraphicColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__MaterialColorShader, _p_StrokeShaders__MaterialColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ColorVariationPatternShader, _p_StrokeShaders__ColorVariationPatternShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__IncreasingColorShader, _p_StrokeShaders__IncreasingColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ConstantColorShader, _p_StrokeShaders__ConstantColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ThicknessVariationPatternShader, _p_StrokeShaders__ThicknessVariationPatternShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__BackboneStretcherShader, _p_StrokeShaders__BackboneStretcherShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ExternalContourStretcherShader, _p_StrokeShaders__ExternalContourStretcherShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__PolygonalizationShader, _p_StrokeShaders__PolygonalizationShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__TipRemoverShader, _p_StrokeShaders__TipRemoverShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_OmissionShader, _p_OmissionShaderTo_p_StrokeShader, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_StrokeShaders__BSplineShader[] = {  {&_swigt__p_StrokeShaders__BSplineShader, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_StrokeShaders__BackboneStretcherShader[] = {  {&_swigt__p_StrokeShaders__BackboneStretcherShader, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_StrokeShaders__BezierCurveShader[] = {  {&_swigt__p_StrokeShaders__BezierCurveShader, 0, 0, 0},{0, 0, 0, 0}};
@@ -110885,65 +109805,65 @@ static swig_cast_info _swigc__p_Stroke__viewedge_container__iterator[] = {  {&_s
 static swig_cast_info _swigc__p_StrokesContainer[] = {  {&_swigt__p_StrokesContainer, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_StyleModule[] = {  {&_swigt__p_StyleModule, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_TVertex[] = {  {&_swigt__p_TVertex, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction0DTId_t[] = {  {&_swigt__p_UnaryFunction0DTId_t, 0, 0, 0},  {&_swigt__p_Functions0D__ShapeIdF0D, _p_Functions0D__ShapeIdF0DTo_p_UnaryFunction0DTId_t, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t[] = {  {&_swigt__p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t, 0, 0, 0},  {&_swigt__p_Functions0D__VertexOrientation2DF0D, _p_Functions0D__VertexOrientation2DF0DTo_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t, 0, 0},  {&_swigt__p_Functions0D__Normal2DF0D, _p_Functions0D__Normal2DF0DTo_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t[] = {  {&_swigt__p_Functions0D__VertexOrientation3DF0D, _p_Functions0D__VertexOrientation3DF0DTo_p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t, 0, 0},  {&_swigt__p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction0DTViewShape_p_t[] = {  {&_swigt__p_Functions0D__GetShapeF0D, _p_Functions0D__GetShapeF0DTo_p_UnaryFunction0DTViewShape_p_t, 0, 0},  {&_swigt__p_Functions0D__GetOccludeeF0D, _p_Functions0D__GetOccludeeF0DTo_p_UnaryFunction0DTViewShape_p_t, 0, 0},  {&_swigt__p_UnaryFunction0DTViewShape_p_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction0DTdouble_t[] = {  {&_swigt__p_UnaryFunction0DTdouble_t, 0, 0, 0},  {&_swigt__p_Functions0D__ZDiscontinuityF0D, _p_Functions0D__ZDiscontinuityF0DTo_p_UnaryFunction0DTdouble_t, 0, 0},  {&_swigt__p_Functions0D__DensityF0D, _p_Functions0D__DensityF0DTo_p_UnaryFunction0DTdouble_t, 0, 0},  {&_swigt__p_Functions0D__GetXF0D, _p_Functions0D__GetXF0DTo_p_UnaryFunction0DTdouble_t, 0, 0},  {&_swigt__p_Functions0D__GetProjectedXF0D, _p_Functions0D__GetProjectedXF0DTo_p_UnaryFunction0DTdouble_t, 0, 0},  {&_swigt__p_Functions0D__Curvature2DAngleF0D, _p_Functions0D__Curvature2DAngleF0DTo_p_UnaryFunction0DTdouble_t, 0, 0},  {&_swigt__p_Functions0D__GetYF0D, _p_Functions0D__GetYF0DTo_p_UnaryFunction0DTdouble_t, 0, 0},  {&_swigt__p_Functions0D__GetProjectedYF0D, _p_Functions0D__GetProjectedYF0DTo_p_UnaryFunction0DTdouble_t, 0, 0},  {&_swigt__p_Functions0D__GetZF0D, _p_Functions0D__GetZF0DTo_p_UnaryFunction0DTdouble_t, 0, 0},  {&_swigt__p_Functions0D__GetProjectedZF0D, _p_Functions0D__GetProjectedZF0DTo_p_UnaryFunction0DTdouble_t, 0, 0},  {&_swigt__p_Functions0D__LocalAverageDepthF0D, _p_Functions0D__LocalAverageDepthF0DTo_p_UnaryFunction0DTdouble_t, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction0DTfloat_t[] = {  {&_swigt__p_Functions0D__GetCurvilinearAbscissaF0D, _p_Functions0D__GetCurvilinearAbscissaF0DTo_p_UnaryFunction0DTfloat_t, 0, 0},  {&_swigt__p_Functions0D__ReadMapPixelF0D, _p_Functions0D__ReadMapPixelF0DTo_p_UnaryFunction0DTfloat_t, 0, 0},  {&_swigt__p_Functions0D__ReadSteerableViewMapPixelF0D, _p_Functions0D__ReadSteerableViewMapPixelF0DTo_p_UnaryFunction0DTfloat_t, 0, 0},  {&_swigt__p_Functions0D__ReadCompleteViewMapPixelF0D, _p_Functions0D__ReadCompleteViewMapPixelF0DTo_p_UnaryFunction0DTfloat_t, 0, 0},  {&_swigt__p_Functions0D__GetViewMapGradientNormF0D, _p_Functions0D__GetViewMapGradientNormF0DTo_p_UnaryFunction0DTfloat_t, 0, 0},  {&_swigt__p_UnaryFunction0DTfloat_t, 0, 0, 0},  {&_swigt__p_Functions0D__GetParameterF0D, _p_Functions0D__GetParameterF0DTo_p_UnaryFunction0DTfloat_t, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t[] = {  {&_swigt__p_Functions0D__GetOccludersF0D, _p_Functions0D__GetOccludersF0DTo_p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0, 0},  {&_swigt__p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction0DTunsigned_int_t[] = {  {&_swigt__p_Functions0D__QuantitativeInvisibilityF0D, _p_Functions0D__QuantitativeInvisibilityF0DTo_p_UnaryFunction0DTunsigned_int_t, 0, 0},  {&_swigt__p_UnaryFunction0DTunsigned_int_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction0DTvoid_t[] = {  {&_swigt__p_UnaryFunction0DTvoid_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t[] = {  {&_swigt__p_Functions1D__Orientation2DF1D, _p_Functions1D__Orientation2DF1DTo_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, 0, 0},  {&_swigt__p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, 0, 0, 0},  {&_swigt__p_Functions1D__Normal2DF1D, _p_Functions1D__Normal2DF1DTo_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t[] = {  {&_swigt__p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t, 0, 0, 0},  {&_swigt__p_Functions1D__Orientation3DF1D, _p_Functions1D__Orientation3DF1DTo_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction1DTdouble_t[] = {  {&_swigt__p_Functions1D__GetSteerableViewMapDensityF1D, _p_Functions1D__GetSteerableViewMapDensityF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__GetDirectionalViewMapDensityF1D, _p_Functions1D__GetDirectionalViewMapDensityF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__GetCompleteViewMapDensityF1D, _p_Functions1D__GetCompleteViewMapDensityF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__DensityF1D, _p_Functions1D__DensityF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__ZDiscontinuityF1D, _p_Functions1D__ZDiscontinuityF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__GetXF1D, _p_Functions1D__GetXF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__GetZF1D, _p_Functions1D__GetZF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__GetViewMapGradientNormF1D, _p_Functions1D__GetViewMapGradientNormF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__GetProjectedYF1D, _p_Functions1D__GetProjectedYF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_UnaryFunction1DTdouble_t, 0, 0, 0},  {&_swigt__p_Functions1D__Curvature2DAngleF1D, _p_Functions1D__Curvature2DAngleF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__GetYF1D, _p_Functions1D__GetYF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__GetProjectedXF1D, _p_Functions1D__GetProjectedXF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__LocalAverageDepthF1D, _p_Functions1D__LocalAverageDepthF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__GetProjectedZF1D, _p_Functions1D__GetProjectedZF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction1DTfloat_t[] = {  {&_swigt__p_UnaryFunction1DTfloat_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t[] = {  {&_swigt__p_Functions1D__GetOccludeeF1D, _p_Functions1D__GetOccludeeF1DTo_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0, 0},  {&_swigt__p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0, 0, 0},  {&_swigt__p_Functions1D__GetShapeF1D, _p_Functions1D__GetShapeF1DTo_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0, 0},  {&_swigt__p_Functions1D__GetOccludersF1D, _p_Functions1D__GetOccludersF1DTo_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction1DTunsigned_int_t[] = {  {&_swigt__p_Functions1D__QuantitativeInvisibilityF1D, _p_Functions1D__QuantitativeInvisibilityF1DTo_p_UnaryFunction1DTunsigned_int_t, 0, 0},  {&_swigt__p_UnaryFunction1DTunsigned_int_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction1DTvoid_t[] = {  {&_swigt__p_UnaryFunction1DTvoid_t, 0, 0, 0},  {&_swigt__p_Functions1D__TimeStampF1D, _p_Functions1D__TimeStampF1DTo_p_UnaryFunction1DTvoid_t, 0, 0},  {&_swigt__p_Functions1D__IncrementChainingTimeStampF1D, _p_Functions1D__IncrementChainingTimeStampF1DTo_p_UnaryFunction1DTvoid_t, 0, 0},  {&_swigt__p_Functions1D__ChainingTimeStampF1D, _p_Functions1D__ChainingTimeStampF1DTo_p_UnaryFunction1DTvoid_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction0DT_Id_t[] = {  {&_swigt__p_Functions0D__ShapeIdF0D, _p_Functions0D__ShapeIdF0DTo_p_UnaryFunction0DT_Id_t, 0, 0},  {&_swigt__p_UnaryFunction0DT_Id_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction0DT_VecMat__Vec2T_float_t_t[] = {  {&_swigt__p_UnaryFunction0DT_VecMat__Vec2T_float_t_t, 0, 0, 0},  {&_swigt__p_Functions0D__VertexOrientation2DF0D, _p_Functions0D__VertexOrientation2DF0DTo_p_UnaryFunction0DT_VecMat__Vec2T_float_t_t, 0, 0},  {&_swigt__p_Functions0D__Normal2DF0D, _p_Functions0D__Normal2DF0DTo_p_UnaryFunction0DT_VecMat__Vec2T_float_t_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction0DT_VecMat__Vec3T_float_t_t[] = {  {&_swigt__p_Functions0D__VertexOrientation3DF0D, _p_Functions0D__VertexOrientation3DF0DTo_p_UnaryFunction0DT_VecMat__Vec3T_float_t_t, 0, 0},  {&_swigt__p_UnaryFunction0DT_VecMat__Vec3T_float_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction0DT_ViewShape_p_t[] = {  {&_swigt__p_Functions0D__GetShapeF0D, _p_Functions0D__GetShapeF0DTo_p_UnaryFunction0DT_ViewShape_p_t, 0, 0},  {&_swigt__p_Functions0D__GetOccludeeF0D, _p_Functions0D__GetOccludeeF0DTo_p_UnaryFunction0DT_ViewShape_p_t, 0, 0},  {&_swigt__p_UnaryFunction0DT_ViewShape_p_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction0DT_double_t[] = {  {&_swigt__p_UnaryFunction0DT_double_t, 0, 0, 0},  {&_swigt__p_Functions0D__ZDiscontinuityF0D, _p_Functions0D__ZDiscontinuityF0DTo_p_UnaryFunction0DT_double_t, 0, 0},  {&_swigt__p_Functions0D__DensityF0D, _p_Functions0D__DensityF0DTo_p_UnaryFunction0DT_double_t, 0, 0},  {&_swigt__p_Functions0D__GetXF0D, _p_Functions0D__GetXF0DTo_p_UnaryFunction0DT_double_t, 0, 0},  {&_swigt__p_Functions0D__GetProjectedXF0D, _p_Functions0D__GetProjectedXF0DTo_p_UnaryFunction0DT_double_t, 0, 0},  {&_swigt__p_Functions0D__Curvature2DAngleF0D, _p_Functions0D__Curvature2DAngleF0DTo_p_UnaryFunction0DT_double_t, 0, 0},  {&_swigt__p_Functions0D__GetYF0D, _p_Functions0D__GetYF0DTo_p_UnaryFunction0DT_double_t, 0, 0},  {&_swigt__p_Functions0D__GetProjectedYF0D, _p_Functions0D__GetProjectedYF0DTo_p_UnaryFunction0DT_double_t, 0, 0},  {&_swigt__p_Functions0D__GetZF0D, _p_Functions0D__GetZF0DTo_p_UnaryFunction0DT_double_t, 0, 0},  {&_swigt__p_Functions0D__GetProjectedZF0D, _p_Functions0D__GetProjectedZF0DTo_p_UnaryFunction0DT_double_t, 0, 0},  {&_swigt__p_Functions0D__LocalAverageDepthF0D, _p_Functions0D__LocalAverageDepthF0DTo_p_UnaryFunction0DT_double_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction0DT_float_t[] = {  {&_swigt__p_Functions0D__GetCurvilinearAbscissaF0D, _p_Functions0D__GetCurvilinearAbscissaF0DTo_p_UnaryFunction0DT_float_t, 0, 0},  {&_swigt__p_Functions0D__ReadMapPixelF0D, _p_Functions0D__ReadMapPixelF0DTo_p_UnaryFunction0DT_float_t, 0, 0},  {&_swigt__p_Functions0D__ReadSteerableViewMapPixelF0D, _p_Functions0D__ReadSteerableViewMapPixelF0DTo_p_UnaryFunction0DT_float_t, 0, 0},  {&_swigt__p_Functions0D__ReadCompleteViewMapPixelF0D, _p_Functions0D__ReadCompleteViewMapPixelF0DTo_p_UnaryFunction0DT_float_t, 0, 0},  {&_swigt__p_Functions0D__GetViewMapGradientNormF0D, _p_Functions0D__GetViewMapGradientNormF0DTo_p_UnaryFunction0DT_float_t, 0, 0},  {&_swigt__p_UnaryFunction0DT_float_t, 0, 0, 0},  {&_swigt__p_Functions0D__GetParameterF0D, _p_Functions0D__GetParameterF0DTo_p_UnaryFunction0DT_float_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction0DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t[] = {  {&_swigt__p_Functions0D__GetOccludersF0D, _p_Functions0D__GetOccludersF0DTo_p_UnaryFunction0DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, 0, 0},  {&_swigt__p_UnaryFunction0DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction0DT_unsigned_int_t[] = {  {&_swigt__p_Functions0D__QuantitativeInvisibilityF0D, _p_Functions0D__QuantitativeInvisibilityF0DTo_p_UnaryFunction0DT_unsigned_int_t, 0, 0},  {&_swigt__p_UnaryFunction0DT_unsigned_int_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction0DT_void_t[] = {  {&_swigt__p_UnaryFunction0DT_void_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction1DT_VecMat__Vec2T_float_t_t[] = {  {&_swigt__p_Functions1D__Orientation2DF1D, _p_Functions1D__Orientation2DF1DTo_p_UnaryFunction1DT_VecMat__Vec2T_float_t_t, 0, 0},  {&_swigt__p_UnaryFunction1DT_VecMat__Vec2T_float_t_t, 0, 0, 0},  {&_swigt__p_Functions1D__Normal2DF1D, _p_Functions1D__Normal2DF1DTo_p_UnaryFunction1DT_VecMat__Vec2T_float_t_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction1DT_VecMat__Vec3T_float_t_t[] = {  {&_swigt__p_UnaryFunction1DT_VecMat__Vec3T_float_t_t, 0, 0, 0},  {&_swigt__p_Functions1D__Orientation3DF1D, _p_Functions1D__Orientation3DF1DTo_p_UnaryFunction1DT_VecMat__Vec3T_float_t_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction1DT_double_t[] = {  {&_swigt__p_Functions1D__GetSteerableViewMapDensityF1D, _p_Functions1D__GetSteerableViewMapDensityF1DTo_p_UnaryFunction1DT_double_t, 0, 0},  {&_swigt__p_Functions1D__GetDirectionalViewMapDensityF1D, _p_Functions1D__GetDirectionalViewMapDensityF1DTo_p_UnaryFunction1DT_double_t, 0, 0},  {&_swigt__p_Functions1D__GetCompleteViewMapDensityF1D, _p_Functions1D__GetCompleteViewMapDensityF1DTo_p_UnaryFunction1DT_double_t, 0, 0},  {&_swigt__p_Functions1D__DensityF1D, _p_Functions1D__DensityF1DTo_p_UnaryFunction1DT_double_t, 0, 0},  {&_swigt__p_Functions1D__ZDiscontinuityF1D, _p_Functions1D__ZDiscontinuityF1DTo_p_UnaryFunction1DT_double_t, 0, 0},  {&_swigt__p_Functions1D__GetXF1D, _p_Functions1D__GetXF1DTo_p_UnaryFunction1DT_double_t, 0, 0},  {&_swigt__p_Functions1D__GetZF1D, _p_Functions1D__GetZF1DTo_p_UnaryFunction1DT_double_t, 0, 0},  {&_swigt__p_Functions1D__GetViewMapGradientNormF1D, _p_Functions1D__GetViewMapGradientNormF1DTo_p_UnaryFunction1DT_double_t, 0, 0},  {&_swigt__p_Functions1D__GetProjectedYF1D, _p_Functions1D__GetProjectedYF1DTo_p_UnaryFunction1DT_double_t, 0, 0},  {&_swigt__p_UnaryFunction1DT_double_t, 0, 0, 0},  {&_swigt__p_Functions1D__Curvature2DAngleF1D, _p_Functions1D__Curvature2DAngleF1DTo_p_UnaryFunction1DT_double_t, 0, 0},  {&_swigt__p_Functions1D__GetYF1D, _p_Functions1D__GetYF1DTo_p_UnaryFunction1DT_double_t, 0, 0},  {&_swigt__p_Functions1D__GetProjectedXF1D, _p_Functions1D__GetProjectedXF1DTo_p_UnaryFunction1DT_double_t, 0, 0},  {&_swigt__p_Functions1D__LocalAverageDepthF1D, _p_Functions1D__LocalAverageDepthF1DTo_p_UnaryFunction1DT_double_t, 0, 0},  {&_swigt__p_Functions1D__GetProjectedZF1D, _p_Functions1D__GetProjectedZF1DTo_p_UnaryFunction1DT_double_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction1DT_float_t[] = {  {&_swigt__p_UnaryFunction1DT_float_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t[] = {  {&_swigt__p_Functions1D__GetOccludeeF1D, _p_Functions1D__GetOccludeeF1DTo_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, 0, 0},  {&_swigt__p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, 0, 0, 0},  {&_swigt__p_Functions1D__GetShapeF1D, _p_Functions1D__GetShapeF1DTo_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, 0, 0},  {&_swigt__p_Functions1D__GetOccludersF1D, _p_Functions1D__GetOccludersF1DTo_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction1DT_unsigned_int_t[] = {  {&_swigt__p_Functions1D__QuantitativeInvisibilityF1D, _p_Functions1D__QuantitativeInvisibilityF1DTo_p_UnaryFunction1DT_unsigned_int_t, 0, 0},  {&_swigt__p_UnaryFunction1DT_unsigned_int_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction1DT_void_t[] = {  {&_swigt__p_UnaryFunction1DT_void_t, 0, 0, 0},  {&_swigt__p_Functions1D__TimeStampF1D, _p_Functions1D__TimeStampF1DTo_p_UnaryFunction1DT_void_t, 0, 0},  {&_swigt__p_Functions1D__IncrementChainingTimeStampF1D, _p_Functions1D__IncrementChainingTimeStampF1DTo_p_UnaryFunction1DT_void_t, 0, 0},  {&_swigt__p_Functions1D__ChainingTimeStampF1D, _p_Functions1D__ChainingTimeStampF1DTo_p_UnaryFunction1DT_void_t, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_UnaryPredicate0D[] = {  {&_swigt__p_Predicates0D__TrueUP0D, _p_Predicates0D__TrueUP0DTo_p_UnaryPredicate0D, 0, 0},  {&_swigt__p_Predicates0D__FalseUP0D, _p_Predicates0D__FalseUP0DTo_p_UnaryPredicate0D, 0, 0},  {&_swigt__p_UnaryPredicate0D, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_UnaryPredicate1D[] = {  {&_swigt__p_Predicates1D__FalseUP1D, _p_Predicates1D__FalseUP1DTo_p_UnaryPredicate1D, 0, 0},  {&_swigt__p_Predicates1D__ShapeUP1D, _p_Predicates1D__ShapeUP1DTo_p_UnaryPredicate1D, 0, 0},  {&_swigt__p_Predicates1D__DensityLowerThanUP1D, _p_Predicates1D__DensityLowerThanUP1DTo_p_UnaryPredicate1D, 0, 0},  {&_swigt__p_UnaryPredicate1D, 0, 0, 0},  {&_swigt__p_Predicates1D__EqualToTimeStampUP1D, _p_Predicates1D__EqualToTimeStampUP1DTo_p_UnaryPredicate1D, 0, 0},  {&_swigt__p_Predicates1D__EqualToChainingTimeStampUP1D, _p_Predicates1D__EqualToChainingTimeStampUP1DTo_p_UnaryPredicate1D, 0, 0},  {&_swigt__p_Predicates1D__TrueUP1D, _p_Predicates1D__TrueUP1DTo_p_UnaryPredicate1D, 0, 0},  {&_swigt__p_Predicates1D__QuantitativeInvisibilityUP1D, _p_Predicates1D__QuantitativeInvisibilityUP1DTo_p_UnaryPredicate1D, 0, 0},  {&_swigt__p_Predicates1D__ContourUP1D, _p_Predicates1D__ContourUP1DTo_p_UnaryPredicate1D, 0, 0},  {&_swigt__p_Predicates1D__ExternalContourUP1D, _p_Predicates1D__ExternalContourUP1DTo_p_UnaryPredicate1D, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__HVec3Tdouble_t[] = {  {&_swigt__p_VecMat__HVec3Tdouble_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__HVec3Tfloat_t[] = {  {&_swigt__p_VecMat__HVec3Tfloat_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__HVec3Tint_t[] = {  {&_swigt__p_VecMat__HVec3Tint_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__HVec3Tunsigned_int_t[] = {  {&_swigt__p_VecMat__HVec3Tunsigned_int_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__SquareMatrixTdouble_2_t[] = {  {&_swigt__p_VecMat__SquareMatrixTdouble_2_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__SquareMatrixTdouble_3_t[] = {  {&_swigt__p_VecMat__SquareMatrixTdouble_3_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__SquareMatrixTdouble_4_t[] = {  {&_swigt__p_VecMat__SquareMatrixTdouble_4_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__SquareMatrixTfloat_2_t[] = {  {&_swigt__p_VecMat__SquareMatrixTfloat_2_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__SquareMatrixTfloat_3_t[] = {  {&_swigt__p_VecMat__SquareMatrixTfloat_3_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__SquareMatrixTfloat_4_t[] = {  {&_swigt__p_VecMat__SquareMatrixTfloat_4_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__SquareMatrixTint_2_t[] = {  {&_swigt__p_VecMat__SquareMatrixTint_2_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__SquareMatrixTint_3_t[] = {  {&_swigt__p_VecMat__SquareMatrixTint_3_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__SquareMatrixTint_4_t[] = {  {&_swigt__p_VecMat__SquareMatrixTint_4_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__SquareMatrixTunsigned_int_2_t[] = {  {&_swigt__p_VecMat__SquareMatrixTunsigned_int_2_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__SquareMatrixTunsigned_int_3_t[] = {  {&_swigt__p_VecMat__SquareMatrixTunsigned_int_3_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__SquareMatrixTunsigned_int_4_t[] = {  {&_swigt__p_VecMat__SquareMatrixTunsigned_int_4_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__Vec2Tdouble_t[] = {  {&_swigt__p_VecMat__Vec2Tdouble_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__Vec2Tfloat_t[] = {  {&_swigt__p_VecMat__Vec2Tfloat_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__Vec2Tint_t[] = {  {&_swigt__p_VecMat__Vec2Tint_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__Vec2Tunsigned_int_t[] = {  {&_swigt__p_VecMat__Vec2Tunsigned_int_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__Vec3Tdouble_t[] = {  {&_swigt__p_VecMat__Vec3Tdouble_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__Vec3Tfloat_t[] = {  {&_swigt__p_VecMat__Vec3Tfloat_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__Vec3Tint_t[] = {  {&_swigt__p_VecMat__Vec3Tint_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__Vec3Tunsigned_int_t[] = {  {&_swigt__p_VecMat__Vec3Tunsigned_int_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__VecTdouble_2_t[] = {  {&_swigt__p_VecMat__VecTdouble_2_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec2Tdouble_t, _p_VecMat__Vec2Tdouble_tTo_p_VecMat__VecTdouble_2_t, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__VecTdouble_3_t[] = {  {&_swigt__p_VecMat__Vec3Tdouble_t, _p_VecMat__Vec3Tdouble_tTo_p_VecMat__VecTdouble_3_t, 0, 0},  {&_swigt__p_VecMat__VecTdouble_3_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__VecTfloat_2_t[] = {  {&_swigt__p_VecMat__VecTfloat_2_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec2Tfloat_t, _p_VecMat__Vec2Tfloat_tTo_p_VecMat__VecTfloat_2_t, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__VecTfloat_3_t[] = {  {&_swigt__p_VecMat__VecTfloat_3_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec3Tfloat_t, _p_VecMat__Vec3Tfloat_tTo_p_VecMat__VecTfloat_3_t, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__VecTint_2_t[] = {  {&_swigt__p_VecMat__VecTint_2_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec2Tint_t, _p_VecMat__Vec2Tint_tTo_p_VecMat__VecTint_2_t, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__VecTint_3_t[] = {  {&_swigt__p_VecMat__VecTint_3_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec3Tint_t, _p_VecMat__Vec3Tint_tTo_p_VecMat__VecTint_3_t, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__VecTunsigned_int_2_t[] = {  {&_swigt__p_VecMat__VecTunsigned_int_2_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec2Tunsigned_int_t, _p_VecMat__Vec2Tunsigned_int_tTo_p_VecMat__VecTunsigned_int_2_t, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__VecTunsigned_int_3_t[] = {  {&_swigt__p_VecMat__VecTunsigned_int_3_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec3Tunsigned_int_t, _p_VecMat__Vec3Tunsigned_int_tTo_p_VecMat__VecTunsigned_int_3_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__HVec3T_double_t[] = {  {&_swigt__p_VecMat__HVec3T_double_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__HVec3T_float_t[] = {  {&_swigt__p_VecMat__HVec3T_float_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__HVec3T_int_t[] = {  {&_swigt__p_VecMat__HVec3T_int_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__HVec3T_unsigned_int_t[] = {  {&_swigt__p_VecMat__HVec3T_unsigned_int_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixT_double_2_t[] = {  {&_swigt__p_VecMat__SquareMatrixT_double_2_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixT_double_3_t[] = {  {&_swigt__p_VecMat__SquareMatrixT_double_3_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixT_double_4_t[] = {  {&_swigt__p_VecMat__SquareMatrixT_double_4_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixT_float_2_t[] = {  {&_swigt__p_VecMat__SquareMatrixT_float_2_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixT_float_3_t[] = {  {&_swigt__p_VecMat__SquareMatrixT_float_3_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixT_float_4_t[] = {  {&_swigt__p_VecMat__SquareMatrixT_float_4_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixT_int_2_t[] = {  {&_swigt__p_VecMat__SquareMatrixT_int_2_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixT_int_3_t[] = {  {&_swigt__p_VecMat__SquareMatrixT_int_3_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixT_int_4_t[] = {  {&_swigt__p_VecMat__SquareMatrixT_int_4_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixT_unsigned_int_2_t[] = {  {&_swigt__p_VecMat__SquareMatrixT_unsigned_int_2_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixT_unsigned_int_3_t[] = {  {&_swigt__p_VecMat__SquareMatrixT_unsigned_int_3_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixT_unsigned_int_4_t[] = {  {&_swigt__p_VecMat__SquareMatrixT_unsigned_int_4_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__Vec2T_double_t[] = {  {&_swigt__p_VecMat__Vec2T_double_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__Vec2T_float_t[] = {  {&_swigt__p_VecMat__Vec2T_float_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__Vec2T_int_t[] = {  {&_swigt__p_VecMat__Vec2T_int_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__Vec2T_unsigned_int_t[] = {  {&_swigt__p_VecMat__Vec2T_unsigned_int_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__Vec3T_double_t[] = {  {&_swigt__p_VecMat__Vec3T_double_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__Vec3T_float_t[] = {  {&_swigt__p_VecMat__Vec3T_float_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__Vec3T_int_t[] = {  {&_swigt__p_VecMat__Vec3T_int_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__Vec3T_unsigned_int_t[] = {  {&_swigt__p_VecMat__Vec3T_unsigned_int_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__VecT_double_2_t[] = {  {&_swigt__p_VecMat__VecT_double_2_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec2T_double_t, _p_VecMat__Vec2T_double_tTo_p_VecMat__VecT_double_2_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__VecT_double_3_t[] = {  {&_swigt__p_VecMat__Vec3T_double_t, _p_VecMat__Vec3T_double_tTo_p_VecMat__VecT_double_3_t, 0, 0},  {&_swigt__p_VecMat__VecT_double_3_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__VecT_float_2_t[] = {  {&_swigt__p_VecMat__VecT_float_2_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec2T_float_t, _p_VecMat__Vec2T_float_tTo_p_VecMat__VecT_float_2_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__VecT_float_3_t[] = {  {&_swigt__p_VecMat__VecT_float_3_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec3T_float_t, _p_VecMat__Vec3T_float_tTo_p_VecMat__VecT_float_3_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__VecT_int_2_t[] = {  {&_swigt__p_VecMat__VecT_int_2_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec2T_int_t, _p_VecMat__Vec2T_int_tTo_p_VecMat__VecT_int_2_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__VecT_int_3_t[] = {  {&_swigt__p_VecMat__VecT_int_3_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec3T_int_t, _p_VecMat__Vec3T_int_tTo_p_VecMat__VecT_int_3_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__VecT_unsigned_int_2_t[] = {  {&_swigt__p_VecMat__VecT_unsigned_int_2_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec2T_unsigned_int_t, _p_VecMat__Vec2T_unsigned_int_tTo_p_VecMat__VecT_unsigned_int_2_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__VecT_unsigned_int_3_t[] = {  {&_swigt__p_VecMat__VecT_unsigned_int_3_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec3T_unsigned_int_t, _p_VecMat__Vec3T_unsigned_int_tTo_p_VecMat__VecT_unsigned_int_3_t, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_Vertex[] = {  {&_swigt__p_Vertex, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_ViewEdge[] = {  {&_swigt__p_ViewEdge, 0, 0, 0},  {&_swigt__std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_ViewEdge[] = {  {&_swigt__std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_ViewEdge, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_ViewEdgeInternal__SVertexIterator[] = {  {&_swigt__p_ViewEdgeInternal__SVertexIterator, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_ViewEdgeInternal__ViewEdgeIterator[] = {  {&_swigt__p_ViewEdgeInternal__ViewEdgeIterator, 0, 0, 0},  {&_swigt__p_ChainingIterator, _p_ChainingIteratorTo_p_ViewEdgeInternal__ViewEdgeIterator, 0, 0},  {&_swigt__p_ChainSilhouetteIterator, _p_ChainSilhouetteIteratorTo_p_ViewEdgeInternal__ViewEdgeIterator, 0, 0},  {&_swigt__p_ChainPredicateIterator, _p_ChainPredicateIteratorTo_p_ViewEdgeInternal__ViewEdgeIterator, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_ViewMap[] = {  {&_swigt__p_ViewMap, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_ViewShape[] = {  {&_swigt__p_ViewShape, 0, 0, 0},  {&_swigt__std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_ViewVertex[] = {  {&_swigt__p_TVertex, _p_TVertexTo_p_ViewVertex, 0, 0},  {&_swigt__p_NonTVertex, _p_NonTVertexTo_p_ViewVertex, 0, 0},  {&_swigt__p_ViewVertex, 0, 0, 0},  {&_swigt__std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t[] = {  {&_swigt__p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t[] = {  {&_swigt__p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_ViewShape[] = {  {&_swigt__p_ViewShape, 0, 0, 0},  {&_swigt__std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_ViewVertex[] = {  {&_swigt__std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_TVertex, _p_TVertexTo_p_ViewVertex, 0, 0},  {&_swigt__p_NonTVertex, _p_NonTVertexTo_p_ViewVertex, 0, 0},  {&_swigt__p_ViewVertex, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_const_traits_t[] = {  {&_swigt__p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_const_traits_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_nonconst_traits_t[] = {  {&_swigt__p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_nonconst_traits_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_ViewVertexInternal__orientedViewEdgeIterator[] = {  {&_swigt__p_ViewVertexInternal__orientedViewEdgeIterator, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_ViewVertexInternal__orientedViewEdgeIterator__edge_pointers_container__iterator[] = {  {&_swigt__p_ViewVertexInternal__orientedViewEdgeIterator__edge_pointers_container__iterator, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_ViewVertexInternal__orientedViewEdgeIterator__edges_container__iterator[] = {  {&_swigt__p_ViewVertexInternal__orientedViewEdgeIterator__edges_container__iterator, 0, 0, 0},{0, 0, 0, 0}};
@@ -110963,6 +109883,7 @@ static swig_cast_info _swigc__p_edges_container[] = {  {&_swigt__p_edges_contain
 static swig_cast_info _swigc__p_fedge_iterator[] = {  {&_swigt__p_fedge_iterator, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_fedges_container[] = {  {&_swigt__p_fedges_container, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_float[] = {  {&_swigt__p_float, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_id_to_index_map[] = {  {&_swigt__p_id_to_index_map, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_id_type[] = {  {&_swigt__p_id_type, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_int[] = {  {&_swigt__p_int, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_ltstr[] = {  {&_swigt__p_ltstr, 0, 0, 0},{0, 0, 0, 0}};
@@ -110972,29 +109893,30 @@ static swig_cast_info _swigc__p_p_PyObject[] = {  {&_swigt__p_p_PyObject, 0, 0,
 static swig_cast_info _swigc__p_point_iterator[] = {  {&_swigt__p_point_iterator, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_point_type[] = {  {&_swigt__p_point_type, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_reference[] = {  {&_swigt__p_reference, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_setTVecMat__Vec3Tdouble_t_t[] = {  {&_swigt__p_setTVecMat__Vec3Tdouble_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_setT_VecMat__Vec3T_double_t_t[] = {  {&_swigt__p_setT_VecMat__Vec3T_double_t_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_size_type[] = {  {&_swigt__p_size_type, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_std__invalid_argument[] = {  {&_swigt__p_std__invalid_argument, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__pairTViewEdge_p_bool_t[] = {  {&_swigt__p_std__pairTViewEdge_p_bool_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t[] = {  {&_swigt__p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__allocator_type[] = {  {&_swigt__p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorTMaterial_std__allocatorTMaterial_t_t[] = {  {&_swigt__p_std__vectorTMaterial_std__allocatorTMaterial_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t[] = {  {&_swigt__p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__allocator_type[] = {  {&_swigt__p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t[] = {  {&_swigt__p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__allocator_type[] = {  {&_swigt__p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorTTVertex_p_std__allocatorTTVertex_p_t_t[] = {  {&_swigt__p_std__vectorTTVertex_p_std__allocatorTTVertex_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorTVecMat__Vec2Tdouble_t_std__allocatorTVecMat__Vec2Tdouble_t_t_t[] = {  {&_swigt__p_std__vectorTVecMat__Vec2Tdouble_t_std__allocatorTVecMat__Vec2Tdouble_t_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t[] = {  {&_swigt__p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__allocator_type[] = {  {&_swigt__p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t[] = {  {&_swigt__p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__allocator_type[] = {  {&_swigt__p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t[] = {  {&_swigt__p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__allocator_type[] = {  {&_swigt__p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorTint_std__allocatorTint_t_t[] = {  {&_swigt__p_std__vectorTint_std__allocatorTint_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorTint_std__allocatorTint_t_t__allocator_type[] = {  {&_swigt__p_std__vectorTint_std__allocatorTint_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorTstd__pairTViewEdge_p_bool_t_std__allocatorTstd__pairTViewEdge_p_bool_t_t_t[] = {  {&_swigt__p_std__vectorTstd__pairTViewEdge_p_bool_t_std__allocatorTstd__pairTViewEdge_p_bool_t_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorTunsigned_int_std__allocatorTunsigned_int_t_t[] = {  {&_swigt__p_std__vectorTunsigned_int_std__allocatorTunsigned_int_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__mapT_int_int_std__lessT_int_t_std__allocatorT_std__pairT_int_const_int_t_t_t[] = {  {&_swigt__p_std__mapT_int_int_std__lessT_int_t_std__allocatorT_std__pairT_int_const_int_t_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__pairT_ViewEdge_p_bool_t[] = {  {&_swigt__p_std__pairT_ViewEdge_p_bool_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t[] = {  {&_swigt__p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__allocator_type[] = {  {&_swigt__p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorT_Material_std__allocatorT_Material_t_t[] = {  {&_swigt__p_std__vectorT_Material_std__allocatorT_Material_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t[] = {  {&_swigt__p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__allocator_type[] = {  {&_swigt__p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t[] = {  {&_swigt__p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__allocator_type[] = {  {&_swigt__p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorT_TVertex_p_std__allocatorT_TVertex_p_t_t[] = {  {&_swigt__p_std__vectorT_TVertex_p_std__allocatorT_TVertex_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorT_VecMat__Vec2T_double_t_std__allocatorT_VecMat__Vec2T_double_t_t_t[] = {  {&_swigt__p_std__vectorT_VecMat__Vec2T_double_t_std__allocatorT_VecMat__Vec2T_double_t_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t[] = {  {&_swigt__p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__allocator_type[] = {  {&_swigt__p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t[] = {  {&_swigt__p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__allocator_type[] = {  {&_swigt__p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t[] = {  {&_swigt__p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__allocator_type[] = {  {&_swigt__p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorT_int_std__allocatorT_int_t_t[] = {  {&_swigt__p_std__vectorT_int_std__allocatorT_int_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorT_int_std__allocatorT_int_t_t__allocator_type[] = {  {&_swigt__p_std__vectorT_int_std__allocatorT_int_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorT_std__pairT_ViewEdge_p_bool_t_std__allocatorT_std__pairT_ViewEdge_p_bool_t_t_t[] = {  {&_swigt__p_std__vectorT_std__pairT_ViewEdge_p_bool_t_std__allocatorT_std__pairT_ViewEdge_p_bool_t_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t[] = {  {&_swigt__p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svertices_container[] = {  {&_swigt__p_svertices_container, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_swig__PySwigIterator[] = {  {&_swigt__p_swig__PySwigIterator, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_unsigned_int[] = {  {&_swigt__p_unsigned_int, 0, 0, 0},{0, 0, 0, 0}};
@@ -111008,16 +109930,16 @@ static swig_cast_info _swigc__p_viewedges_container[] = {  {&_swigt__p_viewedges
 static swig_cast_info _swigc__p_viewshapes_container[] = {  {&_swigt__p_viewshapes_container, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_viewvertices_container[] = {  {&_swigt__p_viewvertices_container, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_void[] = {  {&_swigt__p_void, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type[] = {  {&_swigt__p_FEdge, 0, 0, 0},  {&_swigt__p_FEdgeSharp, _p_FEdgeSharpTo_p_FEdge, 0, 0},  {&_swigt__p_FEdgeSmooth, _p_FEdgeSmoothTo_p_FEdge, 0, 0},  {&_swigt__std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type[] = {  {&_swigt__std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_SVertex, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type[] = {  {&_swigt__p_StrokeShaders__ConstrainedIncreasingThicknessShader, _p_StrokeShaders__ConstrainedIncreasingThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_StrokeShader, 0, 0, 0},  {&_swigt__p_StrokeShaders__ColorNoiseShader, _p_StrokeShaders__ColorNoiseShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ThicknessNoiseShader, _p_StrokeShaders__ThicknessNoiseShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__LengthDependingThicknessShader, _p_StrokeShaders__LengthDependingThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__IncreasingThicknessShader, _p_StrokeShaders__IncreasingThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ConstantExternThicknessShader, _p_StrokeShaders__ConstantExternThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ConstantThicknessShader, _p_StrokeShaders__ConstantThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__StrokeTextureShader, _p_StrokeShaders__StrokeTextureShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__SamplingShader, _p_StrokeShaders__SamplingShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__BSplineShader, _p_StrokeShaders__BSplineShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__BezierCurveShader, _p_StrokeShaders__BezierCurveShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__InflateShader, _p_StrokeShaders__InflateShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__GuidingLinesShader, _p_StrokeShaders__GuidingLinesShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__streamShader, _p_StrokeShaders__streamShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__fstreamShader, _p_StrokeShaders__fstreamShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_CalligraphicShader, _p_CalligraphicShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_SpatialNoiseShader, _p_SpatialNoiseShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_SmoothingShader, _p_SmoothingShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__TextureAssignerShader, _p_StrokeShaders__TextureAssignerShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__CalligraphicColorShader, _p_StrokeShaders__CalligraphicColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__MaterialColorShader, _p_StrokeShaders__MaterialColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ColorVariationPatternShader, _p_StrokeShaders__ColorVariationPatternShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__IncreasingColorShader, _p_StrokeShaders__IncreasingColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ConstantColorShader, _p_StrokeShaders__ConstantColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ThicknessVariationPatternShader, _p_StrokeShaders__ThicknessVariationPatternShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__BackboneStretcherShader, _p_StrokeShaders__BackboneStretcherShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ExternalContourStretcherShader, _p_StrokeShaders__ExternalContourStretcherShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__PolygonalizationShader, _p_StrokeShaders__PolygonalizationShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__TipRemoverShader, _p_StrokeShaders__TipRemoverShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_OmissionShader, _p_OmissionShaderTo_p_StrokeShader, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type[] = {  {&_swigt__std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_ViewEdge, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type[] = {  {&_swigt__p_ViewShape, 0, 0, 0},  {&_swigt__std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type[] = {  {&_swigt__p_TVertex, _p_TVertexTo_p_ViewVertex, 0, 0},  {&_swigt__p_NonTVertex, _p_NonTVertexTo_p_ViewVertex, 0, 0},  {&_swigt__std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_ViewVertex, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type[] = {  {&_swigt__std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_FEdge, 0, 0, 0},  {&_swigt__p_FEdgeSharp, _p_FEdgeSharpTo_p_FEdge, 0, 0},  {&_swigt__p_FEdgeSmooth, _p_FEdgeSmoothTo_p_FEdge, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type[] = {  {&_swigt__std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_SVertex, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type[] = {  {&_swigt__p_StrokeShaders__ConstrainedIncreasingThicknessShader, _p_StrokeShaders__ConstrainedIncreasingThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_StrokeShader, 0, 0, 0},  {&_swigt__p_StrokeShaders__ColorNoiseShader, _p_StrokeShaders__ColorNoiseShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ThicknessNoiseShader, _p_StrokeShaders__ThicknessNoiseShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__LengthDependingThicknessShader, _p_StrokeShaders__LengthDependingThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__IncreasingThicknessShader, _p_StrokeShaders__IncreasingThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ConstantExternThicknessShader, _p_StrokeShaders__ConstantExternThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ConstantThicknessShader, _p_StrokeShaders__ConstantThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__StrokeTextureShader, _p_StrokeShaders__StrokeTextureShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__SamplingShader, _p_StrokeShaders__SamplingShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__BSplineShader, _p_StrokeShaders__BSplineShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__BezierCurveShader, _p_StrokeShaders__BezierCurveShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__InflateShader, _p_StrokeShaders__InflateShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__GuidingLinesShader, _p_StrokeShaders__GuidingLinesShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__streamShader, _p_StrokeShaders__streamShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__fstreamShader, _p_StrokeShaders__fstreamShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_CalligraphicShader, _p_CalligraphicShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_SpatialNoiseShader, _p_SpatialNoiseShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_SmoothingShader, _p_SmoothingShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__TextureAssignerShader, _p_StrokeShaders__TextureAssignerShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__CalligraphicColorShader, _p_StrokeShaders__CalligraphicColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__MaterialColorShader, _p_StrokeShaders__MaterialColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ColorVariationPatternShader, _p_StrokeShaders__ColorVariationPatternShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__IncreasingColorShader, _p_StrokeShaders__IncreasingColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ConstantColorShader, _p_StrokeShaders__ConstantColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ThicknessVariationPatternShader, _p_StrokeShaders__ThicknessVariationPatternShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__BackboneStretcherShader, _p_StrokeShaders__BackboneStretcherShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ExternalContourStretcherShader, _p_StrokeShaders__ExternalContourStretcherShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__PolygonalizationShader, _p_StrokeShaders__PolygonalizationShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__TipRemoverShader, _p_StrokeShaders__TipRemoverShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_OmissionShader, _p_OmissionShaderTo_p_StrokeShader, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type[] = {  {&_swigt__std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_ViewEdge, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type[] = {  {&_swigt__p_ViewShape, 0, 0, 0},  {&_swigt__std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type[] = {  {&_swigt__std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_TVertex, _p_TVertexTo_p_ViewVertex, 0, 0},  {&_swigt__p_NonTVertex, _p_NonTVertexTo_p_ViewVertex, 0, 0},  {&_swigt__p_ViewVertex, 0, 0, 0},{0, 0, 0, 0}};
 
 static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_AdjacencyIterator,
-  _swigc__p_BBoxTVecMat__Vec3Tdouble_t_t,
+  _swigc__p_BBoxT_VecMat__Vec3T_double_t_t,
   _swigc__p_BinaryPredicate0D,
   _swigc__p_BinaryPredicate1D,
   _swigc__p_CalligraphicShader,
@@ -111168,56 +110090,56 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_StrokesContainer,
   _swigc__p_StyleModule,
   _swigc__p_TVertex,
-  _swigc__p_UnaryFunction0DTId_t,
-  _swigc__p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t,
-  _swigc__p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t,
-  _swigc__p_UnaryFunction0DTViewShape_p_t,
-  _swigc__p_UnaryFunction0DTdouble_t,
-  _swigc__p_UnaryFunction0DTfloat_t,
-  _swigc__p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t,
-  _swigc__p_UnaryFunction0DTunsigned_int_t,
-  _swigc__p_UnaryFunction0DTvoid_t,
-  _swigc__p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t,
-  _swigc__p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t,
-  _swigc__p_UnaryFunction1DTdouble_t,
-  _swigc__p_UnaryFunction1DTfloat_t,
-  _swigc__p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t,
-  _swigc__p_UnaryFunction1DTunsigned_int_t,
-  _swigc__p_UnaryFunction1DTvoid_t,
+  _swigc__p_UnaryFunction0DT_Id_t,
+  _swigc__p_UnaryFunction0DT_VecMat__Vec2T_float_t_t,
+  _swigc__p_UnaryFunction0DT_VecMat__Vec3T_float_t_t,
+  _swigc__p_UnaryFunction0DT_ViewShape_p_t,
+  _swigc__p_UnaryFunction0DT_double_t,
+  _swigc__p_UnaryFunction0DT_float_t,
+  _swigc__p_UnaryFunction0DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t,
+  _swigc__p_UnaryFunction0DT_unsigned_int_t,
+  _swigc__p_UnaryFunction0DT_void_t,
+  _swigc__p_UnaryFunction1DT_VecMat__Vec2T_float_t_t,
+  _swigc__p_UnaryFunction1DT_VecMat__Vec3T_float_t_t,
+  _swigc__p_UnaryFunction1DT_double_t,
+  _swigc__p_UnaryFunction1DT_float_t,
+  _swigc__p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t,
+  _swigc__p_UnaryFunction1DT_unsigned_int_t,
+  _swigc__p_UnaryFunction1DT_void_t,
   _swigc__p_UnaryPredicate0D,
   _swigc__p_UnaryPredicate1D,
-  _swigc__p_VecMat__HVec3Tdouble_t,
-  _swigc__p_VecMat__HVec3Tfloat_t,
-  _swigc__p_VecMat__HVec3Tint_t,
-  _swigc__p_VecMat__HVec3Tunsigned_int_t,
-  _swigc__p_VecMat__SquareMatrixTdouble_2_t,
-  _swigc__p_VecMat__SquareMatrixTdouble_3_t,
-  _swigc__p_VecMat__SquareMatrixTdouble_4_t,
-  _swigc__p_VecMat__SquareMatrixTfloat_2_t,
-  _swigc__p_VecMat__SquareMatrixTfloat_3_t,
-  _swigc__p_VecMat__SquareMatrixTfloat_4_t,
-  _swigc__p_VecMat__SquareMatrixTint_2_t,
-  _swigc__p_VecMat__SquareMatrixTint_3_t,
-  _swigc__p_VecMat__SquareMatrixTint_4_t,
-  _swigc__p_VecMat__SquareMatrixTunsigned_int_2_t,
-  _swigc__p_VecMat__SquareMatrixTunsigned_int_3_t,
-  _swigc__p_VecMat__SquareMatrixTunsigned_int_4_t,
-  _swigc__p_VecMat__Vec2Tdouble_t,
-  _swigc__p_VecMat__Vec2Tfloat_t,
-  _swigc__p_VecMat__Vec2Tint_t,
-  _swigc__p_VecMat__Vec2Tunsigned_int_t,
-  _swigc__p_VecMat__Vec3Tdouble_t,
-  _swigc__p_VecMat__Vec3Tfloat_t,
-  _swigc__p_VecMat__Vec3Tint_t,
-  _swigc__p_VecMat__Vec3Tunsigned_int_t,
-  _swigc__p_VecMat__VecTdouble_2_t,
-  _swigc__p_VecMat__VecTdouble_3_t,
-  _swigc__p_VecMat__VecTfloat_2_t,
-  _swigc__p_VecMat__VecTfloat_3_t,
-  _swigc__p_VecMat__VecTint_2_t,
-  _swigc__p_VecMat__VecTint_3_t,
-  _swigc__p_VecMat__VecTunsigned_int_2_t,
-  _swigc__p_VecMat__VecTunsigned_int_3_t,
+  _swigc__p_VecMat__HVec3T_double_t,
+  _swigc__p_VecMat__HVec3T_float_t,
+  _swigc__p_VecMat__HVec3T_int_t,
+  _swigc__p_VecMat__HVec3T_unsigned_int_t,
+  _swigc__p_VecMat__SquareMatrixT_double_2_t,
+  _swigc__p_VecMat__SquareMatrixT_double_3_t,
+  _swigc__p_VecMat__SquareMatrixT_double_4_t,
+  _swigc__p_VecMat__SquareMatrixT_float_2_t,
+  _swigc__p_VecMat__SquareMatrixT_float_3_t,
+  _swigc__p_VecMat__SquareMatrixT_float_4_t,
+  _swigc__p_VecMat__SquareMatrixT_int_2_t,
+  _swigc__p_VecMat__SquareMatrixT_int_3_t,
+  _swigc__p_VecMat__SquareMatrixT_int_4_t,
+  _swigc__p_VecMat__SquareMatrixT_unsigned_int_2_t,
+  _swigc__p_VecMat__SquareMatrixT_unsigned_int_3_t,
+  _swigc__p_VecMat__SquareMatrixT_unsigned_int_4_t,
+  _swigc__p_VecMat__Vec2T_double_t,
+  _swigc__p_VecMat__Vec2T_float_t,
+  _swigc__p_VecMat__Vec2T_int_t,
+  _swigc__p_VecMat__Vec2T_unsigned_int_t,
+  _swigc__p_VecMat__Vec3T_double_t,
+  _swigc__p_VecMat__Vec3T_float_t,
+  _swigc__p_VecMat__Vec3T_int_t,
+  _swigc__p_VecMat__Vec3T_unsigned_int_t,
+  _swigc__p_VecMat__VecT_double_2_t,
+  _swigc__p_VecMat__VecT_double_3_t,
+  _swigc__p_VecMat__VecT_float_2_t,
+  _swigc__p_VecMat__VecT_float_3_t,
+  _swigc__p_VecMat__VecT_int_2_t,
+  _swigc__p_VecMat__VecT_int_3_t,
+  _swigc__p_VecMat__VecT_unsigned_int_2_t,
+  _swigc__p_VecMat__VecT_unsigned_int_3_t,
   _swigc__p_Vertex,
   _swigc__p_ViewEdge,
   _swigc__p_ViewEdgeInternal__SVertexIterator,
@@ -111225,8 +110147,8 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_ViewMap,
   _swigc__p_ViewShape,
   _swigc__p_ViewVertex,
-  _swigc__p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t,
-  _swigc__p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t,
+  _swigc__p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_const_traits_t,
+  _swigc__p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_nonconst_traits_t,
   _swigc__p_ViewVertexInternal__orientedViewEdgeIterator,
   _swigc__p_ViewVertexInternal__orientedViewEdgeIterator__edge_pointers_container__iterator,
   _swigc__p_ViewVertexInternal__orientedViewEdgeIterator__edges_container__iterator,
@@ -111246,6 +110168,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_fedge_iterator,
   _swigc__p_fedges_container,
   _swigc__p_float,
+  _swigc__p_id_to_index_map,
   _swigc__p_id_type,
   _swigc__p_int,
   _swigc__p_ltstr,
@@ -111255,29 +110178,30 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_point_iterator,
   _swigc__p_point_type,
   _swigc__p_reference,
-  _swigc__p_setTVecMat__Vec3Tdouble_t_t,
+  _swigc__p_setT_VecMat__Vec3T_double_t_t,
   _swigc__p_size_type,
   _swigc__p_std__invalid_argument,
-  _swigc__p_std__pairTViewEdge_p_bool_t,
-  _swigc__p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t,
-  _swigc__p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__allocator_type,
-  _swigc__p_std__vectorTMaterial_std__allocatorTMaterial_t_t,
-  _swigc__p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t,
-  _swigc__p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__allocator_type,
-  _swigc__p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t,
-  _swigc__p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__allocator_type,
-  _swigc__p_std__vectorTTVertex_p_std__allocatorTTVertex_p_t_t,
-  _swigc__p_std__vectorTVecMat__Vec2Tdouble_t_std__allocatorTVecMat__Vec2Tdouble_t_t_t,
-  _swigc__p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t,
-  _swigc__p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__allocator_type,
-  _swigc__p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t,
-  _swigc__p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__allocator_type,
-  _swigc__p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t,
-  _swigc__p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__allocator_type,
-  _swigc__p_std__vectorTint_std__allocatorTint_t_t,
-  _swigc__p_std__vectorTint_std__allocatorTint_t_t__allocator_type,
-  _swigc__p_std__vectorTstd__pairTViewEdge_p_bool_t_std__allocatorTstd__pairTViewEdge_p_bool_t_t_t,
-  _swigc__p_std__vectorTunsigned_int_std__allocatorTunsigned_int_t_t,
+  _swigc__p_std__mapT_int_int_std__lessT_int_t_std__allocatorT_std__pairT_int_const_int_t_t_t,
+  _swigc__p_std__pairT_ViewEdge_p_bool_t,
+  _swigc__p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t,
+  _swigc__p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__allocator_type,
+  _swigc__p_std__vectorT_Material_std__allocatorT_Material_t_t,
+  _swigc__p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t,
+  _swigc__p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__allocator_type,
+  _swigc__p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t,
+  _swigc__p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__allocator_type,
+  _swigc__p_std__vectorT_TVertex_p_std__allocatorT_TVertex_p_t_t,
+  _swigc__p_std__vectorT_VecMat__Vec2T_double_t_std__allocatorT_VecMat__Vec2T_double_t_t_t,
+  _swigc__p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t,
+  _swigc__p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__allocator_type,
+  _swigc__p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t,
+  _swigc__p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__allocator_type,
+  _swigc__p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t,
+  _swigc__p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__allocator_type,
+  _swigc__p_std__vectorT_int_std__allocatorT_int_t_t,
+  _swigc__p_std__vectorT_int_std__allocatorT_int_t_t__allocator_type,
+  _swigc__p_std__vectorT_std__pairT_ViewEdge_p_bool_t_std__allocatorT_std__pairT_ViewEdge_p_bool_t_t_t,
+  _swigc__p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t,
   _swigc__p_svertices_container,
   _swigc__p_swig__PySwigIterator,
   _swigc__p_unsigned_int,
@@ -111291,12 +110215,12 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_viewshapes_container,
   _swigc__p_viewvertices_container,
   _swigc__p_void,
-  _swigc__std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type,
-  _swigc__std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type,
-  _swigc__std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type,
-  _swigc__std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type,
-  _swigc__std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type,
-  _swigc__std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type,
+  _swigc__std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type,
+  _swigc__std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type,
+  _swigc__std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type,
+  _swigc__std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type,
+  _swigc__std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type,
+  _swigc__std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type,
 };
 
 
@@ -111365,7 +110289,7 @@ SWIGRUNTIME void
 SWIG_InitializeModule(void *clientdata) {
   size_t i;
   swig_module_info *module_head, *iter;
-  int found;
+  int found, init;
   
   clientdata = clientdata;
   
@@ -111375,6 +110299,9 @@ SWIG_InitializeModule(void *clientdata) {
     swig_module.type_initial = swig_type_initial;
     swig_module.cast_initial = swig_cast_initial;
     swig_module.next = &swig_module;
+    init = 1;
+  } else {
+    init = 0;
   }
   
   /* Try and load any already created modules */
@@ -111403,6 +110330,12 @@ SWIG_InitializeModule(void *clientdata) {
     module_head->next = &swig_module;
   }
   
+  /* When multiple interpeters are used, a module could have already been initialized in
+       a different interpreter, but not yet have a pointer in this interpreter.
+       In this case, we do not want to continue adding types... everything should be
+       set up already */
+  if (init == 0) return;
+  
   /* Now work on filling in swig_module.types */
 #ifdef SWIGRUNTIME_DEBUG
   printf("SWIG_InitializeModule: size %d\n", swig_module.size);
@@ -111819,19 +110752,19 @@ SWIGEXPORT void SWIG_init(void) {
   
   SWIG_Python_SetConstant(d, "_Noise_B_",SWIG_From_int(static_cast< int >(0x100)));
   PyDict_SetItemString(d,(char*)"cvar", SWIG_globals());
-  SWIG_addvarlink(SWIG_globals(),(char*)"POINT",POINT_get, POINT_set);
-  SWIG_addvarlink(SWIG_globals(),(char*)"S_VERTEX",S_VERTEX_get, S_VERTEX_set);
-  SWIG_addvarlink(SWIG_globals(),(char*)"VIEW_VERTEX",VIEW_VERTEX_get, VIEW_VERTEX_set);
-  SWIG_addvarlink(SWIG_globals(),(char*)"NON_T_VERTEX",NON_T_VERTEX_get, NON_T_VERTEX_set);
-  SWIG_addvarlink(SWIG_globals(),(char*)"T_VERTEX",T_VERTEX_get, T_VERTEX_set);
-  SWIG_addvarlink(SWIG_globals(),(char*)"CUSP",CUSP_get, CUSP_set);
-  SWIG_addvarlink(SWIG_globals(),(char*)"NO_FEATURE",NO_FEATURE_get, NO_FEATURE_set);
-  SWIG_addvarlink(SWIG_globals(),(char*)"SILHOUETTE",SILHOUETTE_get, SILHOUETTE_set);
-  SWIG_addvarlink(SWIG_globals(),(char*)"BORDER",BORDER_get, BORDER_set);
-  SWIG_addvarlink(SWIG_globals(),(char*)"CREASE",CREASE_get, CREASE_set);
-  SWIG_addvarlink(SWIG_globals(),(char*)"RIDGE",RIDGE_get, RIDGE_set);
-  SWIG_addvarlink(SWIG_globals(),(char*)"VALLEY",VALLEY_get, VALLEY_set);
-  SWIG_addvarlink(SWIG_globals(),(char*)"SUGGESTIVE_CONTOUR",SUGGESTIVE_CONTOUR_get, SUGGESTIVE_CONTOUR_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"POINT",Swig_var_POINT_get, Swig_var_POINT_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"S_VERTEX",Swig_var_S_VERTEX_get, Swig_var_S_VERTEX_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"VIEW_VERTEX",Swig_var_VIEW_VERTEX_get, Swig_var_VIEW_VERTEX_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"NON_T_VERTEX",Swig_var_NON_T_VERTEX_get, Swig_var_NON_T_VERTEX_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"T_VERTEX",Swig_var_T_VERTEX_get, Swig_var_T_VERTEX_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"CUSP",Swig_var_CUSP_get, Swig_var_CUSP_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"NO_FEATURE",Swig_var_NO_FEATURE_get, Swig_var_NO_FEATURE_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"SILHOUETTE",Swig_var_SILHOUETTE_get, Swig_var_SILHOUETTE_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"BORDER",Swig_var_BORDER_get, Swig_var_BORDER_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"CREASE",Swig_var_CREASE_get, Swig_var_CREASE_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"RIDGE",Swig_var_RIDGE_get, Swig_var_RIDGE_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"VALLEY",Swig_var_VALLEY_get, Swig_var_VALLEY_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"SUGGESTIVE_CONTOUR",Swig_var_SUGGESTIVE_CONTOUR_get, Swig_var_SUGGESTIVE_CONTOUR_set);
   SWIG_Python_SetConstant(d, "MEAN",SWIG_From_int(static_cast< int >(MEAN)));
   SWIG_Python_SetConstant(d, "MIN",SWIG_From_int(static_cast< int >(MIN)));
   SWIG_Python_SetConstant(d, "MAX",SWIG_From_int(static_cast< int >(MAX)));
diff --git a/source/blender/freestyle/intern/swig/ModuleWrapper.h b/source/blender/freestyle/intern/swig/ModuleWrapper.h
index 06ca8c90f37..f24a77d53b2 100755
--- a/source/blender/freestyle/intern/swig/ModuleWrapper.h
+++ b/source/blender/freestyle/intern/swig/ModuleWrapper.h
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.31
+ * Version 1.3.35
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -73,7 +73,7 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction0DVoid : public UnaryFunction0D<void >, public Swig::Director {
+class SwigDirector_UnaryFunction0DVoid : public UnaryFunction0D< void >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction0DVoid(PyObject *self);
@@ -119,7 +119,7 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction0DUnsigned : public UnaryFunction0D<unsigned int >, public Swig::Director {
+class SwigDirector_UnaryFunction0DUnsigned : public UnaryFunction0D< unsigned int >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction0DUnsigned(PyObject *self);
@@ -165,7 +165,7 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction0DFloat : public UnaryFunction0D<float >, public Swig::Director {
+class SwigDirector_UnaryFunction0DFloat : public UnaryFunction0D< float >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction0DFloat(PyObject *self);
@@ -211,7 +211,7 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction0DDouble : public UnaryFunction0D<double >, public Swig::Director {
+class SwigDirector_UnaryFunction0DDouble : public UnaryFunction0D< double >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction0DDouble(PyObject *self);
@@ -257,13 +257,13 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction0DVec2f : public UnaryFunction0D<Geometry::Vec2f >, public Swig::Director {
+class SwigDirector_UnaryFunction0DVec2f : public UnaryFunction0D< Geometry::Vec2f >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction0DVec2f(PyObject *self);
     virtual ~SwigDirector_UnaryFunction0DVec2f();
     virtual std::string getName() const;
-    virtual VecMat::Vec2<float > operator ()(Interface0DIterator &iter);
+    virtual VecMat::Vec2< float > operator ()(Interface0DIterator &iter);
 
 
 /* Internal Director utilities */
@@ -303,13 +303,13 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction0DVec3f : public UnaryFunction0D<Geometry::Vec3f >, public Swig::Director {
+class SwigDirector_UnaryFunction0DVec3f : public UnaryFunction0D< Geometry::Vec3f >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction0DVec3f(PyObject *self);
     virtual ~SwigDirector_UnaryFunction0DVec3f();
     virtual std::string getName() const;
-    virtual VecMat::Vec3<float > operator ()(Interface0DIterator &iter);
+    virtual VecMat::Vec3< float > operator ()(Interface0DIterator &iter);
 
 
 /* Internal Director utilities */
@@ -349,7 +349,7 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction0DId : public UnaryFunction0D<Id >, public Swig::Director {
+class SwigDirector_UnaryFunction0DId : public UnaryFunction0D< Id >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction0DId(PyObject *self);
@@ -395,7 +395,7 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction1DVoid : public UnaryFunction1D<void >, public Swig::Director {
+class SwigDirector_UnaryFunction1DVoid : public UnaryFunction1D< void >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction1DVoid(PyObject *self);
@@ -442,7 +442,7 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction1DUnsigned : public UnaryFunction1D<unsigned int >, public Swig::Director {
+class SwigDirector_UnaryFunction1DUnsigned : public UnaryFunction1D< unsigned int >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction1DUnsigned(PyObject *self);
@@ -489,7 +489,7 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction1DFloat : public UnaryFunction1D<float >, public Swig::Director {
+class SwigDirector_UnaryFunction1DFloat : public UnaryFunction1D< float >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction1DFloat(PyObject *self);
@@ -536,7 +536,7 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction1DDouble : public UnaryFunction1D<double >, public Swig::Director {
+class SwigDirector_UnaryFunction1DDouble : public UnaryFunction1D< double >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction1DDouble(PyObject *self);
@@ -583,14 +583,14 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction1DVec2f : public UnaryFunction1D<Geometry::Vec2f >, public Swig::Director {
+class SwigDirector_UnaryFunction1DVec2f : public UnaryFunction1D< Geometry::Vec2f >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction1DVec2f(PyObject *self);
     SwigDirector_UnaryFunction1DVec2f(PyObject *self, IntegrationType iType);
     virtual ~SwigDirector_UnaryFunction1DVec2f();
     virtual std::string getName() const;
-    virtual VecMat::Vec2<float > operator ()(Interface1D &inter);
+    virtual VecMat::Vec2< float > operator ()(Interface1D &inter);
 
 
 /* Internal Director utilities */
@@ -630,14 +630,14 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction1DVec3f : public UnaryFunction1D<Geometry::Vec3f >, public Swig::Director {
+class SwigDirector_UnaryFunction1DVec3f : public UnaryFunction1D< Geometry::Vec3f >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction1DVec3f(PyObject *self);
     SwigDirector_UnaryFunction1DVec3f(PyObject *self, IntegrationType iType);
     virtual ~SwigDirector_UnaryFunction1DVec3f();
     virtual std::string getName() const;
-    virtual VecMat::Vec3<float > operator ()(Interface1D &inter);
+    virtual VecMat::Vec3< float > operator ()(Interface1D &inter);
 
 
 /* Internal Director utilities */
diff --git a/source/blender/freestyle/python/3ds_export.py b/source/blender/freestyle/python/3ds_export.py
new file mode 100644
index 00000000000..eb7fd079cfd
--- /dev/null
+++ b/source/blender/freestyle/python/3ds_export.py
@@ -0,0 +1,1010 @@
+#!BPY
+# coding: utf-8
+""" 
+Name: '3D Studio (.3ds)...'
+Blender: 243
+Group: 'Export'
+Tooltip: 'Export to 3DS file format (.3ds).'
+"""
+
+__author__ = ["Campbell Barton", "Bob Holcomb", "Richard Lärkäng", "Damien McGinnes", "Mark Stijnman"]
+__url__ = ("blenderartists.org", "www.blender.org", "www.gametutorials.com", "lib3ds.sourceforge.net/")
+__version__ = "0.90a"
+__bpydoc__ = """\
+
+3ds Exporter
+
+This script Exports a 3ds file.
+
+Exporting is based on 3ds loader from www.gametutorials.com(Thanks DigiBen) and using information
+from the lib3ds project (http://lib3ds.sourceforge.net/) sourcecode.
+"""
+
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# Script copyright (C) Bob Holcomb 
+#
+# 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 *****
+# --------------------------------------------------------------------------
+
+
+######################################################
+# Importing modules
+######################################################
+
+import Blender
+import bpy
+from BPyMesh import getMeshFromObject
+from BPyObject import getDerivedObjects
+import struct
+
+# So 3ds max can open files, limit names to 12 in length
+# this is verry annoying for filenames!
+name_unique = []
+name_mapping = {}
+def sane_name(name):
+	name_fixed = name_mapping.get(name)
+	if name_fixed != None:
+		return name_fixed
+	
+	if len(name) > 12:
+		new_name = name[:12]
+	else:
+		new_name = name
+	
+	i = 0
+	
+	while new_name in name_unique:
+		new_name = new_name[:-4] + '.%.3d' % i
+		i+=1
+	
+	name_unique.append(new_name)
+	name_mapping[name] = new_name
+	return new_name
+
+######################################################
+# Data Structures
+######################################################
+
+#Some of the chunks that we will export
+#----- Primary Chunk, at the beginning of each file
+PRIMARY= long("0x4D4D",16)
+
+#------ Main Chunks
+OBJECTINFO   =      long("0x3D3D",16);      #This gives the version of the mesh and is found right before the material and object information
+VERSION      =      long("0x0002",16);      #This gives the version of the .3ds file
+KFDATA       =      long("0xB000",16);      #This is the header for all of the key frame info
+
+#------ sub defines of OBJECTINFO
+MATERIAL=45055		#0xAFFF				// This stored the texture info
+OBJECT=16384		#0x4000				// This stores the faces, vertices, etc...
+
+#>------ sub defines of MATERIAL
+MATNAME    =      long("0xA000",16);      # This holds the material name
+MATAMBIENT   =      long("0xA010",16);      # Ambient color of the object/material
+MATDIFFUSE   =      long("0xA020",16);      # This holds the color of the object/material
+MATSPECULAR   =      long("0xA030",16);      # SPecular color of the object/material
+MATSHINESS   =      long("0xA040",16);      # ??
+MATMAP       =      long("0xA200",16);      # This is a header for a new material
+MATMAPFILE    =      long("0xA300",16);      # This holds the file name of the texture
+
+RGB1=	long("0x0011",16)
+RGB2=	long("0x0012",16)
+
+#>------ sub defines of OBJECT
+OBJECT_MESH  =      long("0x4100",16);      # This lets us know that we are reading a new object
+OBJECT_LIGHT =      long("0x4600",16);      # This lets un know we are reading a light object
+OBJECT_CAMERA=      long("0x4700",16);      # This lets un know we are reading a camera object
+
+#>------ sub defines of CAMERA
+OBJECT_CAM_RANGES=   long("0x4720",16);      # The camera range values
+
+#>------ sub defines of OBJECT_MESH
+OBJECT_VERTICES =   long("0x4110",16);      # The objects vertices
+OBJECT_FACES    =   long("0x4120",16);      # The objects faces
+OBJECT_MATERIAL =   long("0x4130",16);      # This is found if the object has a material, either texture map or color
+OBJECT_UV       =   long("0x4140",16);      # The UV texture coordinates
+OBJECT_TRANS_MATRIX  =   long("0x4160",16); # The Object Matrix
+
+#>------ sub defines of KFDATA
+KFDATA_KFHDR            = long("0xB00A",16);
+KFDATA_KFSEG            = long("0xB008",16);
+KFDATA_KFCURTIME        = long("0xB009",16);
+KFDATA_OBJECT_NODE_TAG  = long("0xB002",16);
+
+#>------ sub defines of OBJECT_NODE_TAG
+OBJECT_NODE_ID          = long("0xB030",16);
+OBJECT_NODE_HDR         = long("0xB010",16);
+OBJECT_PIVOT            = long("0xB013",16);
+OBJECT_INSTANCE_NAME    = long("0xB011",16);
+POS_TRACK_TAG			= long("0xB020",16);
+ROT_TRACK_TAG			= long("0xB021",16);
+SCL_TRACK_TAG			= long("0xB022",16);
+
+def uv_key(uv):
+	return round(uv.x, 6), round(uv.y, 6)
+
+# size defines:	
+SZ_SHORT = 2
+SZ_INT   = 4
+SZ_FLOAT = 4
+
+class _3ds_short(object):
+	'''Class representing a short (2-byte integer) for a 3ds file.
+	*** This looks like an unsigned short H is unsigned from the struct docs - Cam***'''
+	__slots__ = 'value'
+	def __init__(self, val=0):
+		self.value=val
+	
+	def get_size(self):
+		return SZ_SHORT
+
+	def write(self,file):
+		file.write(struct.pack("<H", self.value))
+		
+	def __str__(self):
+		return str(self.value)
+
+class _3ds_int(object):
+	'''Class representing an int (4-byte integer) for a 3ds file.'''
+	__slots__ = 'value'
+	def __init__(self, val=0):
+		self.value=val
+	
+	def get_size(self):
+		return SZ_INT
+
+	def write(self,file):
+		file.write(struct.pack("<I", self.value))
+	
+	def __str__(self):
+		return str(self.value)
+
+class _3ds_float(object):
+	'''Class representing a 4-byte IEEE floating point number for a 3ds file.'''
+	__slots__ = 'value'
+	def __init__(self, val=0.0):
+		self.value=val
+	
+	def get_size(self):
+		return SZ_FLOAT
+
+	def write(self,file):
+		file.write(struct.pack("<f", self.value))
+	
+	def __str__(self):
+		return str(self.value)
+
+
+class _3ds_string(object):
+	'''Class representing a zero-terminated string for a 3ds file.'''
+	__slots__ = 'value'
+	def __init__(self, val=""):
+		self.value=val
+	
+	def get_size(self):
+		return (len(self.value)+1)
+
+	def write(self,file):
+		binary_format = "<%ds" % (len(self.value)+1)
+		file.write(struct.pack(binary_format, self.value))
+	
+	def __str__(self):
+		return self.value
+
+class _3ds_point_3d(object):
+	'''Class representing a three-dimensional point for a 3ds file.'''
+	__slots__ = 'x','y','z'
+	def __init__(self, point=(0.0,0.0,0.0)):
+		self.x, self.y, self.z = point
+		
+	def get_size(self):
+		return 3*SZ_FLOAT
+
+	def write(self,file):
+		file.write(struct.pack('<3f', self.x, self.y, self.z))
+	
+	def __str__(self):
+		return '(%f, %f, %f)' % (self.x, self.y, self.z)
+		
+# Used for writing a track
+"""
+class _3ds_point_4d(object):
+	'''Class representing a four-dimensional point for a 3ds file, for instance a quaternion.'''
+	__slots__ = 'x','y','z','w'
+	def __init__(self, point=(0.0,0.0,0.0,0.0)):
+		self.x, self.y, self.z, self.w = point	
+	
+	def get_size(self):
+		return 4*SZ_FLOAT
+
+	def write(self,file):
+		data=struct.pack('<4f', self.x, self.y, self.z, self.w)
+		file.write(data)
+
+	def __str__(self):
+		return '(%f, %f, %f, %f)' % (self.x, self.y, self.z, self.w)
+"""
+
+class _3ds_point_uv(object):
+	'''Class representing a UV-coordinate for a 3ds file.'''
+	__slots__ = 'uv'
+	def __init__(self, point=(0.0,0.0)):
+		self.uv = point
+	
+	def __cmp__(self, other):
+		return cmp(self.uv,other.uv)	
+	
+	def get_size(self):
+		return 2*SZ_FLOAT
+	
+	def write(self,file):
+		data=struct.pack('<2f', self.uv[0], self.uv[1])
+		file.write(data)
+	
+	def __str__(self):
+		return '(%g, %g)' % self.uv
+
+class _3ds_rgb_color(object):
+	'''Class representing a (24-bit) rgb color for a 3ds file.'''
+	__slots__ = 'r','g','b'
+	def __init__(self, col=(0,0,0)):
+		self.r, self.g, self.b = col
+	
+	def get_size(self):
+		return 3
+	
+	def write(self,file):
+		file.write( struct.pack('<3c', chr(int(255*self.r)), chr(int(255*self.g)), chr(int(255*self.b)) ) )
+	
+	def __str__(self):
+		return '{%f, %f, %f}' % (self.r, self.g, self.b)
+
+class _3ds_face(object):
+	'''Class representing a face for a 3ds file.'''
+	__slots__ = 'vindex'
+	def __init__(self, vindex):
+		self.vindex = vindex
+	
+	def get_size(self):
+		return 4*SZ_SHORT
+	
+	def write(self,file):
+		# The last zero is only used by 3d studio
+		file.write(struct.pack("<4H", self.vindex[0],self.vindex[1], self.vindex[2], 0))
+	
+	def __str__(self):
+		return '[%d %d %d]' % (self.vindex[0],self.vindex[1], self.vindex[2])
+
+class _3ds_array(object):
+	'''Class representing an array of variables for a 3ds file.
+
+	Consists of a _3ds_short to indicate the number of items, followed by the items themselves.
+	'''
+	__slots__ = 'values', 'size'
+	def __init__(self):
+		self.values=[]
+		self.size=SZ_SHORT
+	
+	# add an item:
+	def add(self,item):
+		self.values.append(item)
+		self.size+=item.get_size()
+	
+	def get_size(self):
+		return self.size
+	
+	def write(self,file):
+		_3ds_short(len(self.values)).write(file)
+		#_3ds_int(len(self.values)).write(file)
+		for value in self.values:
+			value.write(file)
+	
+	# To not overwhelm the output in a dump, a _3ds_array only
+	# outputs the number of items, not all of the actual items. 
+	def __str__(self):
+		return '(%d items)' % len(self.values)
+
+class _3ds_named_variable(object):
+	'''Convenience class for named variables.'''
+	
+	__slots__ = 'value', 'name'
+	def __init__(self, name, val=None):
+		self.name=name
+		self.value=val
+	
+	def get_size(self):
+		if (self.value==None): 
+			return 0
+		else:
+			return self.value.get_size()
+	
+	def write(self, file):
+		if (self.value!=None): 
+			self.value.write(file)
+	
+	def dump(self,indent):
+		if (self.value!=None):
+			spaces=""
+			for i in xrange(indent):
+				spaces+="  ";
+			if (self.name!=""):
+				print spaces, self.name, " = ", self.value
+			else:
+				print spaces, "[unnamed]", " = ", self.value
+
+
+#the chunk class
+class _3ds_chunk(object):
+	'''Class representing a chunk in a 3ds file.
+
+	Chunks contain zero or more variables, followed by zero or more subchunks.
+	'''
+	__slots__ = 'ID', 'size', 'variables', 'subchunks'
+	def __init__(self, id=0):
+		self.ID=_3ds_short(id)
+		self.size=_3ds_int(0)
+		self.variables=[]
+		self.subchunks=[]
+	
+	def set_ID(id):
+		self.ID=_3ds_short(id)
+	
+	def add_variable(self, name, var):
+		'''Add a named variable. 
+		
+		The name is mostly for debugging purposes.'''
+		self.variables.append(_3ds_named_variable(name,var))
+	
+	def add_subchunk(self, chunk):
+		'''Add a subchunk.'''
+		self.subchunks.append(chunk)
+
+	def get_size(self):
+		'''Calculate the size of the chunk and return it.
+		
+		The sizes of the variables and subchunks are used to determine this chunk\'s size.'''
+		tmpsize=self.ID.get_size()+self.size.get_size()
+		for variable in self.variables:
+			tmpsize+=variable.get_size()
+		for subchunk in self.subchunks:
+			tmpsize+=subchunk.get_size()
+		self.size.value=tmpsize
+		return self.size.value
+
+	def write(self, file):
+		'''Write the chunk to a file.
+		
+		Uses the write function of the variables and the subchunks to do the actual work.'''
+		#write header
+		self.ID.write(file)
+		self.size.write(file)
+		for variable in self.variables:
+			variable.write(file)
+		for subchunk in self.subchunks:
+			subchunk.write(file)
+		
+		
+	def dump(self, indent=0):
+		'''Write the chunk to a file.
+		
+		Dump is used for debugging purposes, to dump the contents of a chunk to the standard output. 
+		Uses the dump function of the named variables and the subchunks to do the actual work.'''
+		spaces=""
+		for i in xrange(indent):
+			spaces+="  ";
+		print spaces, "ID=", hex(self.ID.value), "size=", self.get_size()
+		for variable in self.variables:
+			variable.dump(indent+1)
+		for subchunk in self.subchunks:
+			subchunk.dump(indent+1)
+
+
+
+######################################################
+# EXPORT
+######################################################
+
+def get_material_images(material):
+	# blender utility func.
+	images = []
+	if material:
+		for mtex in material.getTextures():
+			if mtex and mtex.tex.type == Blender.Texture.Types.IMAGE:
+				image = mtex.tex.image
+				if image:
+					images.append(image) # maye want to include info like diffuse, spec here.
+	return images
+
+def make_material_subchunk(id, color):
+	'''Make a material subchunk.
+	
+	Used for color subchunks, such as diffuse color or ambient color subchunks.'''
+	mat_sub = _3ds_chunk(id)
+	col1 = _3ds_chunk(RGB1)
+	col1.add_variable("color1", _3ds_rgb_color(color));
+	mat_sub.add_subchunk(col1)
+# optional:
+#	col2 = _3ds_chunk(RGB1)
+#	col2.add_variable("color2", _3ds_rgb_color(color));
+#	mat_sub.add_subchunk(col2)
+	return mat_sub
+
+
+def make_material_texture_chunk(id, images):
+	"""Make Material Map texture chunk
+	"""
+	mat_sub = _3ds_chunk(id)
+	
+	def add_image(img):
+		filename = image.filename.split('\\')[-1].split('/')[-1]
+		mat_sub_file = _3ds_chunk(MATMAPFILE)
+		mat_sub_file.add_variable("mapfile", _3ds_string(sane_name(filename)))
+		mat_sub.add_subchunk(mat_sub_file)
+	
+	for image in images:
+		add_image(image)
+	
+	return mat_sub
+
+def make_material_chunk(material, image):
+	'''Make a material chunk out of a blender material.'''
+	material_chunk = _3ds_chunk(MATERIAL)
+	name = _3ds_chunk(MATNAME)
+	
+	if material:	name_str = material.name
+	else:			name_str = 'None'
+	if image:	name_str += image.name
+		
+	name.add_variable("name", _3ds_string(sane_name(name_str)))
+	material_chunk.add_subchunk(name)
+	
+	if not material:
+		material_chunk.add_subchunk(make_material_subchunk(MATAMBIENT, (0,0,0) ))
+		material_chunk.add_subchunk(make_material_subchunk(MATDIFFUSE, (.8, .8, .8) ))
+		material_chunk.add_subchunk(make_material_subchunk(MATSPECULAR, (1,1,1) ))
+	
+	else:
+		material_chunk.add_subchunk(make_material_subchunk(MATAMBIENT, [a*material.amb for a in material.rgbCol] ))
+		material_chunk.add_subchunk(make_material_subchunk(MATDIFFUSE, material.rgbCol))
+		material_chunk.add_subchunk(make_material_subchunk(MATSPECULAR, material.specCol))
+		
+		images = get_material_images(material) # can be None
+		if image: images.append(image)
+		
+		if images:
+			material_chunk.add_subchunk(make_material_texture_chunk(MATMAP, images))
+	
+	return material_chunk
+
+class tri_wrapper(object):
+	'''Class representing a triangle.
+	
+	Used when converting faces to triangles'''
+	
+	__slots__ = 'vertex_index', 'mat', 'image', 'faceuvs', 'offset'
+	def __init__(self, vindex=(0,0,0), mat=None, image=None, faceuvs=None):
+		self.vertex_index= vindex
+		self.mat= mat
+		self.image= image
+		self.faceuvs= faceuvs
+		self.offset= [0, 0, 0] # offset indicies
+
+
+def extract_triangles(mesh):
+	'''Extract triangles from a mesh.
+	
+	If the mesh contains quads, they will be split into triangles.'''
+	tri_list = []
+	do_uv = mesh.faceUV
+	
+	if not do_uv:
+		face_uv = None
+	
+	img = None
+	for face in mesh.faces:
+		f_v = face.v
+		
+		if do_uv:
+			f_uv = face.uv
+			img = face.image
+			if img: img = img.name
+		
+		if len(f_v)==3:
+			new_tri = tri_wrapper((f_v[0].index, f_v[1].index, f_v[2].index), face.mat, img)
+			if (do_uv): new_tri.faceuvs= uv_key(f_uv[0]), uv_key(f_uv[1]), uv_key(f_uv[2])
+			tri_list.append(new_tri)
+		
+		else: #it's a quad
+			new_tri = tri_wrapper((f_v[0].index, f_v[1].index, f_v[2].index), face.mat, img)
+			new_tri_2 = tri_wrapper((f_v[0].index, f_v[2].index, f_v[3].index), face.mat, img)
+			
+			if (do_uv):
+				new_tri.faceuvs= uv_key(f_uv[0]), uv_key(f_uv[1]), uv_key(f_uv[2])
+				new_tri_2.faceuvs= uv_key(f_uv[0]), uv_key(f_uv[2]), uv_key(f_uv[3])
+			
+			tri_list.append( new_tri )
+			tri_list.append( new_tri_2 )
+		
+	return tri_list
+	
+	
+def remove_face_uv(verts, tri_list):
+	'''Remove face UV coordinates from a list of triangles.
+		
+	Since 3ds files only support one pair of uv coordinates for each vertex, face uv coordinates
+	need to be converted to vertex uv coordinates. That means that vertices need to be duplicated when
+	there are multiple uv coordinates per vertex.'''
+	
+	# initialize a list of UniqueLists, one per vertex:
+	#uv_list = [UniqueList() for i in xrange(len(verts))]
+	unique_uvs= [{} for i in xrange(len(verts))]
+	
+	# for each face uv coordinate, add it to the UniqueList of the vertex
+	for tri in tri_list:
+		for i in xrange(3):
+			# store the index into the UniqueList for future reference:
+			# offset.append(uv_list[tri.vertex_index[i]].add(_3ds_point_uv(tri.faceuvs[i])))
+			
+			context_uv_vert= unique_uvs[tri.vertex_index[i]]
+			uvkey= tri.faceuvs[i]
+			
+			offset_index__uv_3ds = context_uv_vert.get(uvkey)
+			
+			if not offset_index__uv_3ds:				
+				offset_index__uv_3ds = context_uv_vert[uvkey] = len(context_uv_vert), _3ds_point_uv(uvkey)
+			
+			tri.offset[i] = offset_index__uv_3ds[0]
+			
+			
+		
+	# At this point, each vertex has a UniqueList containing every uv coordinate that is associated with it
+	# only once.
+	
+	# Now we need to duplicate every vertex as many times as it has uv coordinates and make sure the
+	# faces refer to the new face indices:
+	vert_index = 0
+	vert_array = _3ds_array()
+	uv_array = _3ds_array()
+	index_list = []
+	for i,vert in enumerate(verts):
+		index_list.append(vert_index)
+		
+		pt = _3ds_point_3d(vert.co) # reuse, should be ok
+		uvmap = [None] * len(unique_uvs[i])
+		for ii, uv_3ds in unique_uvs[i].itervalues():
+			# add a vertex duplicate to the vertex_array for every uv associated with this vertex:
+			vert_array.add(pt)
+			# add the uv coordinate to the uv array:
+			# This for loop does not give uv's ordered by ii, so we create a new map
+			# and add the uv's later
+			# uv_array.add(uv_3ds)
+			uvmap[ii] = uv_3ds
+		
+		# Add the uv's in the correct order
+		for uv_3ds in uvmap:
+			# add the uv coordinate to the uv array:
+			uv_array.add(uv_3ds)
+		
+		vert_index += len(unique_uvs[i])
+	
+	# Make sure the triangle vertex indices now refer to the new vertex list:
+	for tri in tri_list:
+		for i in xrange(3):
+			tri.offset[i]+=index_list[tri.vertex_index[i]]
+		tri.vertex_index= tri.offset
+	
+	return vert_array, uv_array, tri_list
+
+def make_faces_chunk(tri_list, mesh, materialDict):
+	'''Make a chunk for the faces.
+	
+	Also adds subchunks assigning materials to all faces.'''
+	
+	materials = mesh.materials
+	if not materials:
+		mat = None
+	
+	face_chunk = _3ds_chunk(OBJECT_FACES)
+	face_list = _3ds_array()
+	
+	
+	if mesh.faceUV:
+		# Gather materials used in this mesh - mat/image pairs
+		unique_mats = {}
+		for i,tri in enumerate(tri_list):
+			
+			face_list.add(_3ds_face(tri.vertex_index))
+			
+			if materials:
+				mat = materials[tri.mat]
+				if mat: mat = mat.name
+			
+			img = tri.image
+			
+			try:
+				context_mat_face_array = unique_mats[mat, img][1]
+			except:
+				
+				if mat:	name_str = mat
+				else:	name_str = 'None'
+				if img: name_str += img
+				
+				context_mat_face_array = _3ds_array()
+				unique_mats[mat, img] = _3ds_string(sane_name(name_str)), context_mat_face_array
+				
+			
+			context_mat_face_array.add(_3ds_short(i))
+			# obj_material_faces[tri.mat].add(_3ds_short(i))
+		
+		face_chunk.add_variable("faces", face_list)
+		for mat_name, mat_faces in unique_mats.itervalues():
+			obj_material_chunk=_3ds_chunk(OBJECT_MATERIAL)
+			obj_material_chunk.add_variable("name", mat_name)
+			obj_material_chunk.add_variable("face_list", mat_faces)
+			face_chunk.add_subchunk(obj_material_chunk)
+			
+	else:
+		
+		obj_material_faces=[]
+		obj_material_names=[]
+		for m in materials:
+			if m:
+				obj_material_names.append(_3ds_string(sane_name(m.name)))
+				obj_material_faces.append(_3ds_array())
+		n_materials = len(obj_material_names)
+		
+		for i,tri in enumerate(tri_list):
+			face_list.add(_3ds_face(tri.vertex_index))
+			if (tri.mat < n_materials):
+				obj_material_faces[tri.mat].add(_3ds_short(i))
+		
+		face_chunk.add_variable("faces", face_list)
+		for i in xrange(n_materials):
+			obj_material_chunk=_3ds_chunk(OBJECT_MATERIAL)
+			obj_material_chunk.add_variable("name", obj_material_names[i])
+			obj_material_chunk.add_variable("face_list", obj_material_faces[i])
+			face_chunk.add_subchunk(obj_material_chunk)
+	
+	return face_chunk
+
+def make_vert_chunk(vert_array):
+	'''Make a vertex chunk out of an array of vertices.'''
+	vert_chunk = _3ds_chunk(OBJECT_VERTICES)
+	vert_chunk.add_variable("vertices",vert_array)
+	return vert_chunk
+
+def make_uv_chunk(uv_array):
+	'''Make a UV chunk out of an array of UVs.'''
+	uv_chunk = _3ds_chunk(OBJECT_UV)
+	uv_chunk.add_variable("uv coords", uv_array)
+	return uv_chunk
+
+def make_mesh_chunk(mesh, materialDict):
+	'''Make a chunk out of a Blender mesh.'''
+	
+	# Extract the triangles from the mesh:
+	tri_list = extract_triangles(mesh)
+	
+	if mesh.faceUV:
+		# Remove the face UVs and convert it to vertex UV:
+		vert_array, uv_array, tri_list = remove_face_uv(mesh.verts, tri_list)
+	else:
+		# Add the vertices to the vertex array:
+		vert_array = _3ds_array()
+		for vert in mesh.verts:
+			vert_array.add(_3ds_point_3d(vert.co))
+		# If the mesh has vertex UVs, create an array of UVs:
+		if mesh.vertexUV:
+			uv_array = _3ds_array()
+			for vert in mesh.verts:
+				uv_array.add(_3ds_point_uv(vert.uvco))
+		else:
+			# no UV at all:
+			uv_array = None
+
+	# create the chunk:
+	mesh_chunk = _3ds_chunk(OBJECT_MESH)
+	
+	# add vertex chunk:
+	mesh_chunk.add_subchunk(make_vert_chunk(vert_array))
+	# add faces chunk:
+	
+	mesh_chunk.add_subchunk(make_faces_chunk(tri_list, mesh, materialDict))
+	
+	# if available, add uv chunk:
+	if uv_array:
+		mesh_chunk.add_subchunk(make_uv_chunk(uv_array))
+	
+	return mesh_chunk
+
+""" # COMMENTED OUT FOR 2.42 RELEASE!! CRASHES 3DS MAX
+def make_kfdata(start=0, stop=0, curtime=0):
+	'''Make the basic keyframe data chunk'''
+	kfdata = _3ds_chunk(KFDATA)
+	
+	kfhdr = _3ds_chunk(KFDATA_KFHDR)
+	kfhdr.add_variable("revision", _3ds_short(0))
+	# Not really sure what filename is used for, but it seems it is usually used
+	# to identify the program that generated the .3ds:
+	kfhdr.add_variable("filename", _3ds_string("Blender"))
+	kfhdr.add_variable("animlen", _3ds_int(stop-start))
+	
+	kfseg = _3ds_chunk(KFDATA_KFSEG)
+	kfseg.add_variable("start", _3ds_int(start))
+	kfseg.add_variable("stop", _3ds_int(stop))
+	
+	kfcurtime = _3ds_chunk(KFDATA_KFCURTIME)
+	kfcurtime.add_variable("curtime", _3ds_int(curtime))
+	
+	kfdata.add_subchunk(kfhdr)
+	kfdata.add_subchunk(kfseg)
+	kfdata.add_subchunk(kfcurtime)
+	return kfdata
+"""
+
+"""
+def make_track_chunk(ID, obj):
+	'''Make a chunk for track data.
+	
+	Depending on the ID, this will construct a position, rotation or scale track.'''
+	track_chunk = _3ds_chunk(ID)
+	track_chunk.add_variable("track_flags", _3ds_short())
+	track_chunk.add_variable("unknown", _3ds_int())
+	track_chunk.add_variable("unknown", _3ds_int())
+	track_chunk.add_variable("nkeys", _3ds_int(1))
+	# Next section should be repeated for every keyframe, but for now, animation is not actually supported.
+	track_chunk.add_variable("tcb_frame", _3ds_int(0))
+	track_chunk.add_variable("tcb_flags", _3ds_short())
+	if obj.type=='Empty':
+		if ID==POS_TRACK_TAG:
+			# position vector:
+			track_chunk.add_variable("position", _3ds_point_3d(obj.getLocation()))
+		elif ID==ROT_TRACK_TAG:
+			# rotation (quaternion, angle first, followed by axis):
+			q = obj.getEuler().toQuat()
+			track_chunk.add_variable("rotation", _3ds_point_4d((q.angle, q.axis[0], q.axis[1], q.axis[2])))
+		elif ID==SCL_TRACK_TAG:
+			# scale vector:
+			track_chunk.add_variable("scale", _3ds_point_3d(obj.getSize()))
+	else:
+		# meshes have their transformations applied before 
+		# exporting, so write identity transforms here:
+		if ID==POS_TRACK_TAG:
+			# position vector:
+			track_chunk.add_variable("position", _3ds_point_3d((0.0,0.0,0.0)))
+		elif ID==ROT_TRACK_TAG:
+			# rotation (quaternion, angle first, followed by axis):
+			track_chunk.add_variable("rotation", _3ds_point_4d((0.0, 1.0, 0.0, 0.0)))
+		elif ID==SCL_TRACK_TAG:
+			# scale vector:
+			track_chunk.add_variable("scale", _3ds_point_3d((1.0, 1.0, 1.0)))
+	
+	return track_chunk
+"""
+
+"""
+def make_kf_obj_node(obj, name_to_id):
+	'''Make a node chunk for a Blender object.
+	
+	Takes the Blender object as a parameter. Object id's are taken from the dictionary name_to_id.
+	Blender Empty objects are converted to dummy nodes.'''
+	
+	name = obj.name
+	# main object node chunk:
+	kf_obj_node = _3ds_chunk(KFDATA_OBJECT_NODE_TAG)
+	# chunk for the object id: 
+	obj_id_chunk = _3ds_chunk(OBJECT_NODE_ID)
+	# object id is from the name_to_id dictionary:
+	obj_id_chunk.add_variable("node_id", _3ds_short(name_to_id[name]))
+	
+	# object node header:
+	obj_node_header_chunk = _3ds_chunk(OBJECT_NODE_HDR)
+	# object name:
+	if obj.type == 'Empty':
+		# Empties are called "$$$DUMMY" and use the OBJECT_INSTANCE_NAME chunk 
+		# for their name (see below):
+		obj_node_header_chunk.add_variable("name", _3ds_string("$$$DUMMY"))
+	else:
+		# Add the name:
+		obj_node_header_chunk.add_variable("name", _3ds_string(sane_name(name)))
+	# Add Flag variables (not sure what they do):
+	obj_node_header_chunk.add_variable("flags1", _3ds_short(0))
+	obj_node_header_chunk.add_variable("flags2", _3ds_short(0))
+	
+	# Check parent-child relationships:
+	parent = obj.parent
+	if (parent == None) or (parent.name not in name_to_id):
+		# If no parent, or the parents name is not in the name_to_id dictionary,
+		# parent id becomes -1:
+		obj_node_header_chunk.add_variable("parent", _3ds_short(-1))
+	else:
+		# Get the parent's id from the name_to_id dictionary:
+		obj_node_header_chunk.add_variable("parent", _3ds_short(name_to_id[parent.name]))
+	
+	# Add pivot chunk:
+	obj_pivot_chunk = _3ds_chunk(OBJECT_PIVOT)
+	obj_pivot_chunk.add_variable("pivot", _3ds_point_3d(obj.getLocation()))
+	kf_obj_node.add_subchunk(obj_pivot_chunk)
+	
+	# add subchunks for object id and node header:
+	kf_obj_node.add_subchunk(obj_id_chunk)
+	kf_obj_node.add_subchunk(obj_node_header_chunk)
+
+	# Empty objects need to have an extra chunk for the instance name:
+	if obj.type == 'Empty':
+		obj_instance_name_chunk = _3ds_chunk(OBJECT_INSTANCE_NAME)
+		obj_instance_name_chunk.add_variable("name", _3ds_string(sane_name(name)))
+		kf_obj_node.add_subchunk(obj_instance_name_chunk)
+	
+	# Add track chunks for position, rotation and scale:
+	kf_obj_node.add_subchunk(make_track_chunk(POS_TRACK_TAG, obj))
+	kf_obj_node.add_subchunk(make_track_chunk(ROT_TRACK_TAG, obj))
+	kf_obj_node.add_subchunk(make_track_chunk(SCL_TRACK_TAG, obj))
+
+	return kf_obj_node
+"""
+
+import BPyMessages
+def save_3ds(filename):
+	'''Save the Blender scene to a 3ds file.'''
+	# Time the export
+	
+	if not filename.lower().endswith('.3ds'):
+		filename += '.3ds'
+	
+	# if not BPyMessages.Warning_SaveOver(filename):
+	# 	return
+	
+	time1= Blender.sys.time()
+	Blender.Window.WaitCursor(1)
+	sce= bpy.data.scenes.active
+	
+	# Initialize the main chunk (primary):
+	primary = _3ds_chunk(PRIMARY)
+	# Add version chunk:
+	version_chunk = _3ds_chunk(VERSION)
+	version_chunk.add_variable("version", _3ds_int(3))
+	primary.add_subchunk(version_chunk)
+	
+	# init main object info chunk:
+	object_info = _3ds_chunk(OBJECTINFO)
+	
+	''' # COMMENTED OUT FOR 2.42 RELEASE!! CRASHES 3DS MAX
+	# init main key frame data chunk:
+	kfdata = make_kfdata()
+	'''
+	
+	# Get all the supported objects selected in this scene:
+	# ob_sel= list(sce.objects.context)
+	# mesh_objects = [ (ob, me) for ob in ob_sel   for me in (BPyMesh.getMeshFromObject(ob, None, True, False, sce),) if me ]
+	# empty_objects = [ ob for ob in ob_sel if ob.type == 'Empty' ]
+	
+	# Make a list of all materials used in the selected meshes (use a dictionary,
+	# each material is added once):
+	materialDict = {}
+	mesh_objects = []
+	for ob in sce.objects.context:
+		for ob_derived, mat in getDerivedObjects(ob, False):
+			data = getMeshFromObject(ob_derived, None, True, False, sce)
+			if data:
+				data.transform(mat, recalc_normals=False)
+				mesh_objects.append((ob_derived, data))
+				mat_ls = data.materials
+				mat_ls_len = len(mat_ls)
+				# get material/image tuples.
+				if data.faceUV:
+					if not mat_ls:
+						mat = mat_name = None
+					
+					for f in data.faces:
+						if mat_ls:
+							mat_index = f.mat
+							if mat_index >= mat_ls_len:
+								mat_index = f.mat = 0
+							mat = mat_ls[mat_index]
+							if mat:	mat_name = mat.name
+							else:	mat_name = None
+						# else there alredy set to none
+							
+						img = f.image
+						if img:	img_name = img.name
+						else:	img_name = None
+						
+						materialDict.setdefault((mat_name, img_name), (mat, img) )
+						
+					
+				else:
+					for mat in mat_ls:
+						if mat: # material may be None so check its not.
+							materialDict.setdefault((mat.name, None), (mat, None) )
+					
+					# Why 0 Why!
+					for f in data.faces:
+						if f.mat >= mat_ls_len:
+							f.mat = 0 
+	
+	# Make material chunks for all materials used in the meshes:
+	for mat_and_image in materialDict.itervalues():
+		object_info.add_subchunk(make_material_chunk(mat_and_image[0], mat_and_image[1]))
+	
+	# Give all objects a unique ID and build a dictionary from object name to object id:
+	"""
+	name_to_id = {}
+	for ob, data in mesh_objects:
+		name_to_id[ob.name]= len(name_to_id)
+	#for ob in empty_objects:
+	#	name_to_id[ob.name]= len(name_to_id)
+	"""
+	
+	# Create object chunks for all meshes:
+	i = 0
+	for ob, blender_mesh in mesh_objects:
+		# create a new object chunk
+		object_chunk = _3ds_chunk(OBJECT)
+		
+		# set the object name
+		object_chunk.add_variable("name", _3ds_string(sane_name(ob.name)))
+		
+		# make a mesh chunk out of the mesh:
+		object_chunk.add_subchunk(make_mesh_chunk(blender_mesh, materialDict))
+		object_info.add_subchunk(object_chunk)
+		
+		''' # COMMENTED OUT FOR 2.42 RELEASE!! CRASHES 3DS MAX
+		# make a kf object node for the object:
+		kfdata.add_subchunk(make_kf_obj_node(ob, name_to_id))
+		'''
+		blender_mesh.verts = None
+		i+=i
+
+	# Create chunks for all empties:
+	''' # COMMENTED OUT FOR 2.42 RELEASE!! CRASHES 3DS MAX
+	for ob in empty_objects:
+		# Empties only require a kf object node:
+		kfdata.add_subchunk(make_kf_obj_node(ob, name_to_id))
+		pass
+	'''
+	
+	# Add main object info chunk to primary chunk:
+	primary.add_subchunk(object_info)
+	
+	''' # COMMENTED OUT FOR 2.42 RELEASE!! CRASHES 3DS MAX
+	# Add main keyframe data chunk to primary chunk:
+	primary.add_subchunk(kfdata)
+	'''
+	
+	# At this point, the chunk hierarchy is completely built.
+	
+	# Check the size:
+	primary.get_size()
+	# Open the file for writing:
+	file = open( filename, 'wb' )
+	
+	# Recursively write the chunks to file:
+	primary.write(file)
+	
+	# Close the file:
+	file.close()
+	
+	# Debugging only: report the exporting time:
+	Blender.Window.WaitCursor(0)
+	print "3ds export time: %.2f" % (Blender.sys.time() - time1)
+	
+	# Debugging only: dump the chunk hierarchy:
+	#primary.dump()
+
+save_3ds( Blender.Get('tempdir') + '/tmp_scene_freestyle.3ds' )
diff --git a/source/blender/freestyle/python/Freestyle.py b/source/blender/freestyle/python/Freestyle.py
index 5eb9119cb80..43ae6772f35 100755
--- a/source/blender/freestyle/python/Freestyle.py
+++ b/source/blender/freestyle/python/Freestyle.py
@@ -1,5 +1,5 @@
 # This file was automatically generated by SWIG (http://www.swig.org).
-# Version 1.3.33
+# Version 1.3.35
 #
 # Don't modify this file, modify the SWIG interface instead.
 # This file is compatible with both classic and new-style classes.
@@ -60,7 +60,7 @@ class PySwigIterator(_object):
     __setattr__ = lambda self, name, value: _swig_setattr(self, PySwigIterator, name, value)
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, PySwigIterator, name)
-    def __init__(self): raise AttributeError, "No constructor defined"
+    def __init__(self, *args, **kwargs): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
     __swig_destroy__ = _Freestyle.delete_PySwigIterator
     __del__ = lambda self : None;
@@ -674,6 +674,8 @@ class Interface0D(_object):
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, Interface0D, name)
     __repr__ = _swig_repr
+    __swig_destroy__ = _Freestyle.delete_Interface0D
+    __del__ = lambda self : None;
     def getExactTypeName(*args): return _Freestyle.Interface0D_getExactTypeName(*args)
     def getX(*args): return _Freestyle.Interface0D_getX(*args)
     def getY(*args): return _Freestyle.Interface0D_getY(*args)
@@ -694,8 +696,6 @@ class Interface0D(_object):
         this = _Freestyle.new_Interface0D(*args)
         try: self.this.append(this)
         except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_Interface0D
-    __del__ = lambda self : None;
 Interface0D_swigregister = _Freestyle.Interface0D_swigregister
 Interface0D_swigregister(Interface0D)
 cvar = _Freestyle.cvar
@@ -718,7 +718,7 @@ class Interface0DIteratorNested(_object):
     __setattr__ = lambda self, name, value: _swig_setattr(self, Interface0DIteratorNested, name, value)
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, Interface0DIteratorNested, name)
-    def __init__(self): raise AttributeError, "No constructor defined"
+    def __init__(self, *args, **kwargs): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
     __swig_destroy__ = _Freestyle.delete_Interface0DIteratorNested
     __del__ = lambda self : None;
@@ -803,8 +803,10 @@ class Interface1D(_object):
     __setattr__ = lambda self, name, value: _swig_setattr(self, Interface1D, name, value)
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, Interface1D, name)
-    def __init__(self): raise AttributeError, "No constructor defined"
+    def __init__(self, *args, **kwargs): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
+    __swig_destroy__ = _Freestyle.delete_Interface1D
+    __del__ = lambda self : None;
     def getExactTypeName(*args): return _Freestyle.Interface1D_getExactTypeName(*args)
     def verticesBegin(*args): return _Freestyle.Interface1D_verticesBegin(*args)
     def verticesEnd(*args): return _Freestyle.Interface1D_verticesEnd(*args)
@@ -815,8 +817,6 @@ class Interface1D(_object):
     def getNature(*args): return _Freestyle.Interface1D_getNature(*args)
     def getTimeStamp(*args): return _Freestyle.Interface1D_getTimeStamp(*args)
     def setTimeStamp(*args): return _Freestyle.Interface1D_setTimeStamp(*args)
-    __swig_destroy__ = _Freestyle.delete_Interface1D
-    __del__ = lambda self : None;
 Interface1D_swigregister = _Freestyle.Interface1D_swigregister
 Interface1D_swigregister(Interface1D)
 
@@ -1434,7 +1434,7 @@ class ViewVertex(Interface0D):
     __swig_getmethods__ = {}
     for _s in [Interface0D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
     __getattr__ = lambda self, name: _swig_getattr(self, ViewVertex, name)
-    def __init__(self): raise AttributeError, "No constructor defined"
+    def __init__(self, *args, **kwargs): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
     def getExactTypeName(*args): return _Freestyle.ViewVertex_getExactTypeName(*args)
     __swig_setmethods__["userdata"] = _Freestyle.ViewVertex_userdata_set
@@ -4831,7 +4831,7 @@ class Operators(_object):
     __setattr__ = lambda self, name, value: _swig_setattr(self, Operators, name, value)
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, Operators, name)
-    def __init__(self): raise AttributeError, "No constructor defined"
+    def __init__(self, *args, **kwargs): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
     __swig_getmethods__["select"] = lambda x: _Freestyle.Operators_select
     if _newclass:select = staticmethod(_Freestyle.Operators_select)
@@ -4898,7 +4898,7 @@ class Canvas(_object):
     __setattr__ = lambda self, name, value: _swig_setattr(self, Canvas, name, value)
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, Canvas, name)
-    def __init__(self): raise AttributeError, "No constructor defined"
+    def __init__(self, *args, **kwargs): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
     __swig_getmethods__["getInstance"] = lambda x: _Freestyle.Canvas_getInstance
     if _newclass:getInstance = staticmethod(_Freestyle.Canvas_getInstance)
diff --git a/tools/Blender.py b/tools/Blender.py
index 92ee1e3e6ec..633a576efee 100644
--- a/tools/Blender.py
+++ b/tools/Blender.py
@@ -121,9 +121,6 @@ def setup_staticlibs(lenv):
         ]
     libincs += Split(lenv['BF_OPENEXR_LIBPATH'])
     libincs += Split(lenv['BF_FFMPEG_LIBPATH'])
-	
-    if lenv['WITH_BF_FREESTYLE']:
-        libincs += Split(lenv['BF_LIB3DS_LIBPATH'])	
 
     if lenv['WITH_BF_INTERNATIONAL']:
         libincs += Split(lenv['BF_GETTEXT_LIBPATH'])
diff --git a/tools/btools.py b/tools/btools.py
index deab2e687b6..5bce1c15daa 100755
--- a/tools/btools.py
+++ b/tools/btools.py
@@ -66,7 +66,7 @@ def validate_arguments(args, bc):
             'BF_FANCY', 'BF_QUIET',
             'BF_X264_CONFIG',
             'BF_XVIDCORE_CONFIG',
-			'BF_WITH_BF_FREESTYLE', 'BF_FREESTYLE', 'BF_FREESTYLE_SRC', 'BF_SWIG', 'BF_SWIG_LIB', 'BF_LIB3DS', 'BF_LIB3DS_LIB', 'BF_LIB3DS_LIBPATH', 'BF_LIB3DS_INC'
+			'BF_WITH_BF_FREESTYLE', 'BF_FREESTYLE', 'BF_FREESTYLE_SRC', 'BF_SWIG', 'BF_SWIG_LIB', 'BF_LIB3DS', 'BF_LIB3DS_LIB', 'BF_LIB3DS_INC'
             ]
 
     arg_list = ['BF_DEBUG', 'BF_QUIET', 'BF_CROSS', 'BF_UPDATE',
@@ -245,8 +245,7 @@ def read_opts(cfg, args):
         ('BF_SWIG_LIB', 'SWIG library', ''),
         ('BF_LIB3DS', 'lib3ds base path', ''),
         ('BF_LIB3DS_LIB', 'lib3ds library', ''),
-        ('BF_LIB3DS_LIBPATH', 'lib3ds library path', ''),
-		('BF_LIB3DS_INC', 'lib3ds include path', ''),
+        ('BF_LIB3DS_INC', 'lib3ds include path', ''),
 
 ##
 ##WITH_BF_NSPR = 'true'

From 7fd8c2424f339dfad88745e7d39b3ddcb8b484fc Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Mon, 9 Jun 2008 12:45:49 +0000
Subject: [PATCH 041/252] Fix: Convert to spaces/tabs corrupted syntax

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

diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index 3d8759ef3a6..882baa90c65 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -2312,4 +2312,7 @@ void convert_tabs (struct SpaceText *st, int tab)
 			tmp = tmp->next;
 		}
 	}
+
+	if (st->showsyntax)
+		get_format_string(st);
 }

From 10d59e720827660ab73801165c3c0925a27c5101 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Mon, 9 Jun 2008 14:04:19 +0000
Subject: [PATCH 042/252] Merged from trunk svn merge -r14988:15170
 https://svn.blender.org/svnroot/bf-blender/trunk/blender

---
 config/linux2-config.py                       |   18 +
 config/win32-vc-config.py                     |    2 +-
 extern/SConscript                             |    6 +
 extern/bFTGL/SConscript                       |    2 +-
 extern/libopenjpeg/SConscript                 |   20 +
 extern/libopenjpeg/bio.c                      |  187 ++
 extern/libopenjpeg/bio.h                      |  125 +
 extern/libopenjpeg/cio.c                      |  191 ++
 extern/libopenjpeg/cio.h                      |   86 +
 extern/libopenjpeg/dwt.c                      |  825 ++++++
 extern/libopenjpeg/dwt.h                      |  113 +
 extern/libopenjpeg/event.c                    |  121 +
 extern/libopenjpeg/event.h                    |   58 +
 extern/libopenjpeg/fix.h                      |   64 +
 extern/libopenjpeg/image.c                    |   89 +
 extern/libopenjpeg/image.h                    |   48 +
 extern/libopenjpeg/int.h                      |  119 +
 extern/libopenjpeg/j2k.c                      | 2498 +++++++++++++++++
 extern/libopenjpeg/j2k.h                      |  446 +++
 extern/libopenjpeg/j2k_lib.c                  |   59 +
 extern/libopenjpeg/j2k_lib.h                  |   54 +
 extern/libopenjpeg/jp2.c                      |  710 +++++
 extern/libopenjpeg/jp2.h                      |  177 ++
 extern/libopenjpeg/jpt.c                      |  155 +
 extern/libopenjpeg/jpt.h                      |   75 +
 extern/libopenjpeg/license.txt                |   30 +
 extern/libopenjpeg/mct.c                      |  148 +
 extern/libopenjpeg/mct.h                      |   98 +
 extern/libopenjpeg/mqc.c                      |  538 ++++
 extern/libopenjpeg/mqc.h                      |  197 ++
 extern/libopenjpeg/openjpeg.c                 |  329 +++
 extern/libopenjpeg/openjpeg.h                 |  911 ++++++
 extern/libopenjpeg/opj_includes.h             |  132 +
 extern/libopenjpeg/opj_malloc.h               |  145 +
 extern/libopenjpeg/pi.c                       |  963 +++++++
 extern/libopenjpeg/pi.h                       |  154 +
 extern/libopenjpeg/raw.c                      |   87 +
 extern/libopenjpeg/raw.h                      |  100 +
 extern/libopenjpeg/t1.c                       | 1208 ++++++++
 extern/libopenjpeg/t1.h                       |  147 +
 extern/libopenjpeg/t1_generate_luts.c         |  275 ++
 extern/libopenjpeg/t1_luts.h                  |  143 +
 extern/libopenjpeg/t2.c                       |  787 ++++++
 extern/libopenjpeg/t2.h                       |  103 +
 extern/libopenjpeg/tcd.c                      | 1506 ++++++++++
 extern/libopenjpeg/tcd.h                      |  285 ++
 extern/libopenjpeg/tgt.c                      |  213 ++
 extern/libopenjpeg/tgt.h                      |  114 +
 extern/libredcode/AUTHOR                      |    1 +
 extern/libredcode/LICENSE                     |  340 +++
 extern/libredcode/NOTES                       |   23 +
 extern/libredcode/SConscript                  |   28 +
 extern/libredcode/codec.c                     |  141 +
 extern/libredcode/codec.h                     |   34 +
 extern/libredcode/debayer.c                   |  129 +
 extern/libredcode/debayer.h                   |   11 +
 extern/libredcode/format.c                    |  213 ++
 extern/libredcode/format.h                    |   24 +
 intern/bsp/SConscript                         |    2 +-
 intern/guardedalloc/intern/mmap_win.c         |    1 -
 release/scripts/import_dxf.py                 | 1031 ++++---
 release/scripts/uv_from_adjacent.py           |  129 -
 release/scripts/uv_seams_from_islands.py      |   30 +-
 release/scripts/uvcalc_lightmap.py            |   34 +-
 release/windows/installer/00.sconsblender.nsi |    6 +-
 source/blender/blenkernel/BKE_bmesh.h         |   43 +-
 .../blender/blenkernel/BKE_bmeshCustomData.h  |  108 +
 source/blender/blenkernel/BKE_cloth.h         |   32 +-
 source/blender/blenkernel/BKE_collision.h     |   97 +-
 .../blenkernel/intern/BME_Customdata.c        |  198 ++
 .../blenkernel/intern/BME_conversions.c       |   22 +-
 source/blender/blenkernel/intern/BME_mesh.c   |  119 +-
 .../blender/blenkernel/intern/BME_structure.c |  200 +-
 source/blender/blenkernel/intern/BME_tools.c  |   30 +-
 .../blender/blenkernel/intern/bmesh_private.h |    7 +-
 source/blender/blenkernel/intern/cloth.c      |  224 +-
 source/blender/blenkernel/intern/collision.c  | 1551 ++++++----
 source/blender/blenkernel/intern/constraint.c |    4 +-
 source/blender/blenkernel/intern/customdata.c |    2 +-
 source/blender/blenkernel/intern/kdop.c       |  860 ------
 source/blender/blenkernel/intern/modifier.c   |  149 +-
 source/blender/blenkernel/intern/object.c     |    9 +-
 source/blender/blenkernel/intern/pointcache.c |    2 +-
 .../blender/blenkernel/intern/writeffmpeg.c   |    2 +-
 source/blender/blenlib/BLI_kdopbvh.h          |   60 +
 source/blender/blenlib/intern/BLI_kdopbvh.c   |  810 ++++++
 source/blender/blenlib/intern/bpath.c         |    3 -
 source/blender/blenlib/intern/util.c          |   39 +-
 source/blender/blenloader/intern/readfile.c   |    2 +-
 source/blender/imbuf/SConscript               |    8 +
 source/blender/imbuf/intern/IMB_anim.h        |    8 +
 source/blender/imbuf/intern/anim.c            |   80 +-
 source/blender/imbuf/intern/util.c            |   18 +
 source/blender/include/BIF_editseq.h          |    4 +-
 source/blender/include/BSE_view.h             |    2 +
 source/blender/include/transform.h            |    1 +
 source/blender/makesdna/DNA_modifier_types.h  |    2 +-
 source/blender/makesdna/DNA_scene_types.h     |    2 +-
 source/blender/makesdna/intern/makesdna.c     |   10 +-
 source/blender/python/BPY_interface.c         |   21 +-
 source/blender/python/api2_2x/Blender.c       |    8 +-
 source/blender/python/api2_2x/Draw.c          |    2 +
 source/blender/python/api2_2x/Material.c      |    4 +-
 source/blender/python/api2_2x/Node.c          |    2 +-
 source/blender/python/api2_2x/Object.c        |  133 +
 source/blender/python/api2_2x/Particle.c      |   14 +-
 source/blender/python/api2_2x/Scene.c         |   27 +-
 source/blender/python/api2_2x/Sys.c           |    5 +-
 source/blender/python/api2_2x/doc/Object.py   |    9 +
 source/blender/python/api2_2x/sceneRender.c   |   13 +-
 .../render/extern/include/RE_pipeline.h       |    2 +
 .../render/extern/include/RE_raytrace.h       |    2 +-
 .../render/intern/include/render_types.h      |    1 +
 .../render/intern/source/convertblender.c     |   74 +-
 source/blender/render/intern/source/envmap.c  |    2 +-
 .../blender/render/intern/source/pipeline.c   |    1 +
 .../blender/render/intern/source/rayshade.c   |   22 +-
 .../blender/render/intern/source/rendercore.c |   16 +-
 source/blender/src/buttons_editing.c          |    2 +-
 source/blender/src/buttons_object.c           |    2 +-
 source/blender/src/buttons_scene.c            |   15 +-
 source/blender/src/drawipo.c                  |    8 +-
 source/blender/src/drawobject.c               |  207 +-
 source/blender/src/drawseq.c                  |    2 +-
 source/blender/src/drawview.c                 |   23 +-
 source/blender/src/editaction.c               |   13 +-
 source/blender/src/editarmature.c             |   46 +-
 source/blender/src/editmesh_tools.c           |    3 +-
 source/blender/src/editnode.c                 |   19 +-
 source/blender/src/editseq.c                  |   93 +-
 source/blender/src/filesel.c                  |    2 +-
 source/blender/src/fluidsim.c                 |   33 +-
 source/blender/src/interface.c                |    1 +
 source/blender/src/meshtools.c                |   11 +-
 source/blender/src/space.c                    |    7 +-
 source/blender/src/toets.c                    |    4 +-
 source/blender/src/transform.c                |   45 +-
 source/blender/src/transform_conversions.c    |    2 +-
 source/blender/src/transform_manipulator.c    |   49 +-
 source/blender/src/transform_orientations.c   |  105 +-
 source/blender/src/view.c                     |   49 +-
 source/creator/creator.c                      |    2 +-
 .../Converter/BL_ArmatureObject.cpp           |   13 +-
 source/gameengine/Ketsji/KX_GameObject.cpp    |   81 +-
 source/gameengine/Ketsji/KX_GameObject.h      |   10 +
 source/gameengine/Ketsji/KX_RayCast.cpp       |    1 +
 source/gameengine/PyDoc/KX_GameObject.py      |   15 +-
 .../Rasterizer/RAS_2DFilterManager.cpp        |    4 +
 .../RAS_GLExtensionManager.h                  |    4 +-
 tools/btools.py                               |   12 +
 150 files changed, 20321 insertions(+), 2666 deletions(-)
 create mode 100644 extern/libopenjpeg/SConscript
 create mode 100644 extern/libopenjpeg/bio.c
 create mode 100644 extern/libopenjpeg/bio.h
 create mode 100644 extern/libopenjpeg/cio.c
 create mode 100644 extern/libopenjpeg/cio.h
 create mode 100644 extern/libopenjpeg/dwt.c
 create mode 100644 extern/libopenjpeg/dwt.h
 create mode 100644 extern/libopenjpeg/event.c
 create mode 100644 extern/libopenjpeg/event.h
 create mode 100644 extern/libopenjpeg/fix.h
 create mode 100644 extern/libopenjpeg/image.c
 create mode 100644 extern/libopenjpeg/image.h
 create mode 100644 extern/libopenjpeg/int.h
 create mode 100644 extern/libopenjpeg/j2k.c
 create mode 100644 extern/libopenjpeg/j2k.h
 create mode 100644 extern/libopenjpeg/j2k_lib.c
 create mode 100644 extern/libopenjpeg/j2k_lib.h
 create mode 100644 extern/libopenjpeg/jp2.c
 create mode 100644 extern/libopenjpeg/jp2.h
 create mode 100644 extern/libopenjpeg/jpt.c
 create mode 100644 extern/libopenjpeg/jpt.h
 create mode 100644 extern/libopenjpeg/license.txt
 create mode 100644 extern/libopenjpeg/mct.c
 create mode 100644 extern/libopenjpeg/mct.h
 create mode 100644 extern/libopenjpeg/mqc.c
 create mode 100644 extern/libopenjpeg/mqc.h
 create mode 100644 extern/libopenjpeg/openjpeg.c
 create mode 100644 extern/libopenjpeg/openjpeg.h
 create mode 100644 extern/libopenjpeg/opj_includes.h
 create mode 100644 extern/libopenjpeg/opj_malloc.h
 create mode 100644 extern/libopenjpeg/pi.c
 create mode 100644 extern/libopenjpeg/pi.h
 create mode 100644 extern/libopenjpeg/raw.c
 create mode 100644 extern/libopenjpeg/raw.h
 create mode 100644 extern/libopenjpeg/t1.c
 create mode 100644 extern/libopenjpeg/t1.h
 create mode 100644 extern/libopenjpeg/t1_generate_luts.c
 create mode 100644 extern/libopenjpeg/t1_luts.h
 create mode 100644 extern/libopenjpeg/t2.c
 create mode 100644 extern/libopenjpeg/t2.h
 create mode 100644 extern/libopenjpeg/tcd.c
 create mode 100644 extern/libopenjpeg/tcd.h
 create mode 100644 extern/libopenjpeg/tgt.c
 create mode 100644 extern/libopenjpeg/tgt.h
 create mode 100644 extern/libredcode/AUTHOR
 create mode 100644 extern/libredcode/LICENSE
 create mode 100644 extern/libredcode/NOTES
 create mode 100644 extern/libredcode/SConscript
 create mode 100644 extern/libredcode/codec.c
 create mode 100644 extern/libredcode/codec.h
 create mode 100644 extern/libredcode/debayer.c
 create mode 100644 extern/libredcode/debayer.h
 create mode 100644 extern/libredcode/format.c
 create mode 100644 extern/libredcode/format.h
 delete mode 100644 release/scripts/uv_from_adjacent.py
 create mode 100644 source/blender/blenkernel/BKE_bmeshCustomData.h
 create mode 100644 source/blender/blenkernel/intern/BME_Customdata.c
 delete mode 100644 source/blender/blenkernel/intern/kdop.c
 create mode 100644 source/blender/blenlib/BLI_kdopbvh.h
 create mode 100644 source/blender/blenlib/intern/BLI_kdopbvh.c

diff --git a/config/linux2-config.py b/config/linux2-config.py
index 4d8b5c97512..6bde0664fe5 100644
--- a/config/linux2-config.py
+++ b/config/linux2-config.py
@@ -130,6 +130,24 @@ BF_FFMPEG_LIB = ''
 BF_FFMPEG_INC = '${BF_FFMPEG}/include'
 BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
 
+WITH_BF_OPENJPEG = 'true' 
+BF_OPENJPEG = '#extern/libopenjpeg'
+BF_OPENJPEG_LIB = ''
+# Uncomment the following two lines to use system's ffmpeg
+# BF_FFMPEG = '/usr'
+# BF_FFMPEG_LIB = 'avformat avcodec swscale avutil'
+BF_OPENJPEG_INC = '${BF_OPENJPEG}/include'
+BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
+
+WITH_BF_REDCODE = 'true'  
+BF_REDCODE = '#extern/libredcode'
+BF_REDCODE_LIB = ''
+# Uncomment the following two lines to use system's ffmpeg
+# BF_FFMPEG = '/usr'
+# BF_FFMPEG_LIB = 'avformat avcodec swscale avutil'
+BF_REDCODE_INC = '${BF_REDCODE}/include'
+BF_REDCODE_LIBPATH='${BF_REDCODE}/lib'
+
 # Mesa Libs should go here if your using them as well....
 WITH_BF_STATICOPENGL = 'false'
 BF_OPENGL = '/usr'
diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py
index 32b6597b5d5..02e5dbb7f8f 100644
--- a/config/win32-vc-config.py
+++ b/config/win32-vc-config.py
@@ -157,7 +157,7 @@ REL_CCFLAGS = ['-O2', '-DNDEBUG']
 C_WARN = []
 CC_WARN = []
 
-LLIBS = 'ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid'
+LLIBS = 'ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid'
 
 PLATFORM_LINKFLAGS = '''
                         /SUBSYSTEM:CONSOLE 
diff --git a/extern/SConscript b/extern/SConscript
index 09eaf080c28..c94b6573eb9 100644
--- a/extern/SConscript
+++ b/extern/SConscript
@@ -21,5 +21,11 @@ if env['WITH_BF_FFMPEG'] and env['BF_FFMPEG_LIB'] == '':
     SConscript(['xvidcore/SConscript'])
     SConscript(['ffmpeg/SConscript'])
 
+if env['WITH_BF_OPENJPEG'] and env['BF_OPENJPEG_LIB'] == '':
+    SConscript(['libopenjpeg/SConscript'])
+
+if env['WITH_BF_REDCODE'] and env['BF_REDCODE_LIB'] == '':
+    SConscript(['libredcode/SConscript'])
+
 if env['OURPLATFORM'] == 'linux2':
     SConscript(['binreloc/SConscript']);
diff --git a/extern/bFTGL/SConscript b/extern/bFTGL/SConscript
index bd20db5a459..c03992631e6 100644
--- a/extern/bFTGL/SConscript
+++ b/extern/bFTGL/SConscript
@@ -22,7 +22,7 @@ Import('env')
 
 #ftgl_env.Append (CPPDEFINES = defines)
 
-incs = 'include src ' + env['BF_FREETYPE_INC']
+incs = 'include src ' + env['BF_FREETYPE_INC'] + ' ' + env['BF_OPENGL_INC']
 defs = ''
 
 sources = env.Glob('src/*.cpp')
diff --git a/extern/libopenjpeg/SConscript b/extern/libopenjpeg/SConscript
new file mode 100644
index 00000000000..f0a93f6e2d9
--- /dev/null
+++ b/extern/libopenjpeg/SConscript
@@ -0,0 +1,20 @@
+#!/usr/bin/python
+
+import sys
+
+Import('env')
+
+sources = env.Glob('*.c')
+incs = '.'
+
+flags = "-Wall -O3 -ffast-math -std=c99"
+
+oj_env = env.Copy();
+oj_env.Replace(CCFLAGS = '')
+oj_env.Replace(BF_DEBUG_FLAGS = '')
+
+oj_env.BlenderLib ( libname='extern_openjpeg', 
+                    sources=sources, includes=Split(incs),
+                    defines=[],
+                    libtype=['core','intern','player'],
+                    priority=[10, 10, 300], compileflags = Split(flags))
diff --git a/extern/libopenjpeg/bio.c b/extern/libopenjpeg/bio.c
new file mode 100644
index 00000000000..4c02f464d8d
--- /dev/null
+++ b/extern/libopenjpeg/bio.c
@@ -0,0 +1,187 @@
+/*
+ * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2007, Professor Benoit Macq
+ * Copyright (c) 2001-2003, David Janssens
+ * Copyright (c) 2002-2003, Yannick Verschueren
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "opj_includes.h"
+
+/** @defgroup BIO BIO - Individual bit input-output stream */
+/*@{*/
+
+/** @name Local static functions */
+/*@{*/
+
+/**
+Write a bit
+@param bio BIO handle
+@param b Bit to write (0 or 1)
+*/
+static void bio_putbit(opj_bio_t *bio, int b);
+/**
+Read a bit
+@param bio BIO handle
+@return Returns the read bit
+*/
+static int bio_getbit(opj_bio_t *bio);
+/**
+Write a byte
+@param bio BIO handle
+@return Returns 0 if successful, returns 1 otherwise
+*/
+static int bio_byteout(opj_bio_t *bio);
+/**
+Read a byte
+@param bio BIO handle
+@return Returns 0 if successful, returns 1 otherwise
+*/
+static int bio_bytein(opj_bio_t *bio);
+
+/*@}*/
+
+/*@}*/
+
+/* 
+==========================================================
+   local functions
+==========================================================
+*/
+
+static int bio_byteout(opj_bio_t *bio) {
+	bio->buf = (bio->buf << 8) & 0xffff;
+	bio->ct = bio->buf == 0xff00 ? 7 : 8;
+	if (bio->bp >= bio->end) {
+		return 1;
+	}
+	*bio->bp++ = bio->buf >> 8;
+	return 0;
+}
+
+static int bio_bytein(opj_bio_t *bio) {
+	bio->buf = (bio->buf << 8) & 0xffff;
+	bio->ct = bio->buf == 0xff00 ? 7 : 8;
+	if (bio->bp >= bio->end) {
+		return 1;
+	}
+	bio->buf |= *bio->bp++;
+	return 0;
+}
+
+static void bio_putbit(opj_bio_t *bio, int b) {
+	if (bio->ct == 0) {
+		bio_byteout(bio);
+	}
+	bio->ct--;
+	bio->buf |= b << bio->ct;
+}
+
+static int bio_getbit(opj_bio_t *bio) {
+	if (bio->ct == 0) {
+		bio_bytein(bio);
+	}
+	bio->ct--;
+	return (bio->buf >> bio->ct) & 1;
+}
+
+/* 
+==========================================================
+   Bit Input/Output interface
+==========================================================
+*/
+
+opj_bio_t* bio_create(void) {
+	opj_bio_t *bio = (opj_bio_t*)opj_malloc(sizeof(opj_bio_t));
+	return bio;
+}
+
+void bio_destroy(opj_bio_t *bio) {
+	if(bio) {
+		opj_free(bio);
+	}
+}
+
+int bio_numbytes(opj_bio_t *bio) {
+	return (bio->bp - bio->start);
+}
+
+void bio_init_enc(opj_bio_t *bio, unsigned char *bp, int len) {
+	bio->start = bp;
+	bio->end = bp + len;
+	bio->bp = bp;
+	bio->buf = 0;
+	bio->ct = 8;
+}
+
+void bio_init_dec(opj_bio_t *bio, unsigned char *bp, int len) {
+	bio->start = bp;
+	bio->end = bp + len;
+	bio->bp = bp;
+	bio->buf = 0;
+	bio->ct = 0;
+}
+
+void bio_write(opj_bio_t *bio, int v, int n) {
+	int i;
+	for (i = n - 1; i >= 0; i--) {
+		bio_putbit(bio, (v >> i) & 1);
+	}
+}
+
+int bio_read(opj_bio_t *bio, int n) {
+	int i, v;
+	v = 0;
+	for (i = n - 1; i >= 0; i--) {
+		v += bio_getbit(bio) << i;
+	}
+	return v;
+}
+
+int bio_flush(opj_bio_t *bio) {
+	bio->ct = 0;
+	if (bio_byteout(bio)) {
+		return 1;
+	}
+	if (bio->ct == 7) {
+		bio->ct = 0;
+		if (bio_byteout(bio)) {
+			return 1;
+		}
+	}
+	return 0;
+}
+
+int bio_inalign(opj_bio_t *bio) {
+	bio->ct = 0;
+	if ((bio->buf & 0xff) == 0xff) {
+		if (bio_bytein(bio)) {
+			return 1;
+		}
+		bio->ct = 0;
+	}
+	return 0;
+}
diff --git a/extern/libopenjpeg/bio.h b/extern/libopenjpeg/bio.h
new file mode 100644
index 00000000000..764d7cb2e92
--- /dev/null
+++ b/extern/libopenjpeg/bio.h
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2007, Professor Benoit Macq
+ * Copyright (c) 2001-2003, David Janssens
+ * Copyright (c) 2002-2003, Yannick Verschueren
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __BIO_H
+#define __BIO_H
+/** 
+@file bio.h
+@brief Implementation of an individual bit input-output (BIO)
+
+The functions in BIO.C have for goal to realize an individual bit input - output.
+*/
+
+/** @defgroup BIO BIO - Individual bit input-output stream */
+/*@{*/
+
+/**
+Individual bit input-output stream (BIO)
+*/
+typedef struct opj_bio {
+	/** pointer to the start of the buffer */
+	unsigned char *start;
+	/** pointer to the end of the buffer */
+	unsigned char *end;
+	/** pointer to the present position in the buffer */
+	unsigned char *bp;
+	/** temporary place where each byte is read or written */
+	unsigned int buf;
+	/** coder : number of bits free to write. decoder : number of bits read */
+	int ct;
+} opj_bio_t;
+
+/** @name Exported functions */
+/*@{*/
+/* ----------------------------------------------------------------------- */
+/**
+Create a new BIO handle 
+@return Returns a new BIO handle if successful, returns NULL otherwise
+*/
+opj_bio_t* bio_create(void);
+/**
+Destroy a previously created BIO handle
+@param bio BIO handle to destroy
+*/
+void bio_destroy(opj_bio_t *bio);
+/**
+Number of bytes written.
+@param bio BIO handle
+@return Returns the number of bytes written
+*/
+int bio_numbytes(opj_bio_t *bio);
+/**
+Init encoder
+@param bio BIO handle
+@param bp Output buffer
+@param len Output buffer length 
+*/
+void bio_init_enc(opj_bio_t *bio, unsigned char *bp, int len);
+/**
+Init decoder
+@param bio BIO handle
+@param bp Input buffer
+@param len Input buffer length 
+*/
+void bio_init_dec(opj_bio_t *bio, unsigned char *bp, int len);
+/**
+Write bits
+@param bio BIO handle
+@param v Value of bits
+@param n Number of bits to write
+*/
+void bio_write(opj_bio_t *bio, int v, int n);
+/**
+Read bits
+@param bio BIO handle
+@param n Number of bits to read 
+@return Returns the corresponding read number
+*/
+int bio_read(opj_bio_t *bio, int n);
+/**
+Flush bits
+@param bio BIO handle
+@return Returns 1 if successful, returns 0 otherwise
+*/
+int bio_flush(opj_bio_t *bio);
+/**
+Passes the ending bits (coming from flushing)
+@param bio BIO handle
+@return Returns 1 if successful, returns 0 otherwise
+*/
+int bio_inalign(opj_bio_t *bio);
+/* ----------------------------------------------------------------------- */
+/*@}*/
+
+/*@}*/
+
+#endif /* __BIO_H */
+
diff --git a/extern/libopenjpeg/cio.c b/extern/libopenjpeg/cio.c
new file mode 100644
index 00000000000..2ac262a1f6b
--- /dev/null
+++ b/extern/libopenjpeg/cio.c
@@ -0,0 +1,191 @@
+/*
+ * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2007, Professor Benoit Macq
+ * Copyright (c) 2001-2003, David Janssens
+ * Copyright (c) 2002-2003, Yannick Verschueren
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "opj_includes.h"
+
+/* ----------------------------------------------------------------------- */
+
+opj_cio_t* OPJ_CALLCONV opj_cio_open(opj_common_ptr cinfo, unsigned char *buffer, int length) {
+	opj_cp_t *cp = NULL;
+	opj_cio_t *cio = (opj_cio_t*)opj_malloc(sizeof(opj_cio_t));
+	if(!cio) return NULL;
+	cio->cinfo = cinfo;
+	if(buffer && length) {
+		/* wrap a user buffer containing the encoded image */
+		cio->openmode = OPJ_STREAM_READ;
+		cio->buffer = buffer;
+		cio->length = length;
+	}
+	else if(!buffer && !length && cinfo) {
+		/* allocate a buffer for the encoded image */
+		cio->openmode = OPJ_STREAM_WRITE;
+		switch(cinfo->codec_format) {
+			case CODEC_J2K:
+				cp = ((opj_j2k_t*)cinfo->j2k_handle)->cp;
+				break;
+			case CODEC_JP2:
+				cp = ((opj_jp2_t*)cinfo->jp2_handle)->j2k->cp;
+				break;
+			default:
+				opj_free(cio);
+				return NULL;
+		}
+		cio->length = (unsigned int) (0.1625 * cp->img_size + 2000); /* 0.1625 = 1.3/8 and 2000 bytes as a minimum for headers */
+		cio->buffer = (unsigned char *)opj_malloc(cio->length);
+		if(!cio->buffer) {
+			opj_event_msg(cio->cinfo, EVT_ERROR, "Error allocating memory for compressed bitstream\n");
+			opj_free(cio);
+			return NULL;
+		}
+	}
+	else {
+		opj_free(cio);
+		return NULL;
+	}
+
+	/* Initialize byte IO */
+	cio->start = cio->buffer;
+	cio->end = cio->buffer + cio->length;
+	cio->bp = cio->buffer;
+
+	return cio;
+}
+
+void OPJ_CALLCONV opj_cio_close(opj_cio_t *cio) {
+	if(cio) {
+		if(cio->openmode == OPJ_STREAM_WRITE) {
+			/* destroy the allocated buffer */
+			opj_free(cio->buffer);
+		}
+		/* destroy the cio */
+		opj_free(cio);
+	}
+}
+
+
+/* ----------------------------------------------------------------------- */
+
+/*
+ * Get position in byte stream.
+ */
+int OPJ_CALLCONV cio_tell(opj_cio_t *cio) {
+	return cio->bp - cio->start;
+}
+
+/*
+ * Set position in byte stream.
+ *
+ * pos : position, in number of bytes, from the beginning of the stream
+ */
+void OPJ_CALLCONV cio_seek(opj_cio_t *cio, int pos) {
+	cio->bp = cio->start + pos;
+}
+
+/*
+ * Number of bytes left before the end of the stream.
+ */
+int cio_numbytesleft(opj_cio_t *cio) {
+	return cio->end - cio->bp;
+}
+
+/*
+ * Get pointer to the current position in the stream.
+ */
+unsigned char *cio_getbp(opj_cio_t *cio) {
+	return cio->bp;
+}
+
+/*
+ * Write a byte.
+ */
+bool cio_byteout(opj_cio_t *cio, unsigned char v) {
+	if (cio->bp >= cio->end) {
+		opj_event_msg(cio->cinfo, EVT_ERROR, "write error\n");
+		return false;
+	}
+	*cio->bp++ = v;
+	return true;
+}
+
+/*
+ * Read a byte.
+ */
+unsigned char cio_bytein(opj_cio_t *cio) {
+	if (cio->bp >= cio->end) {
+		opj_event_msg(cio->cinfo, EVT_ERROR, "read error: passed the end of the codestream (start = %d, current = %d, end = %d\n", cio->start, cio->bp, cio->end);
+		return 0;
+	}
+	return *cio->bp++;
+}
+
+/*
+ * Write some bytes.
+ *
+ * v : value to write
+ * n : number of bytes to write
+ */
+unsigned int cio_write(opj_cio_t *cio, unsigned int v, int n) {
+	int i;
+	for (i = n - 1; i >= 0; i--) {
+		if( !cio_byteout(cio, (unsigned char) ((v >> (i << 3)) & 0xff)) )
+			return 0;
+	}
+	return n;
+}
+
+/*
+ * Read some bytes.
+ *
+ * n : number of bytes to read
+ *
+ * return : value of the n bytes read
+ */
+unsigned int cio_read(opj_cio_t *cio, int n) {
+	int i;
+	unsigned int v;
+	v = 0;
+	for (i = n - 1; i >= 0; i--) {
+		v += cio_bytein(cio) << (i << 3);
+	}
+	return v;
+}
+
+/* 
+ * Skip some bytes.
+ *
+ * n : number of bytes to skip
+ */
+void cio_skip(opj_cio_t *cio, int n) {
+	cio->bp += n;
+}
+
+
+
diff --git a/extern/libopenjpeg/cio.h b/extern/libopenjpeg/cio.h
new file mode 100644
index 00000000000..580bf9c0d12
--- /dev/null
+++ b/extern/libopenjpeg/cio.h
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2007, Professor Benoit Macq
+ * Copyright (c) 2001-2003, David Janssens
+ * Copyright (c) 2002-2003, Yannick Verschueren
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __CIO_H
+#define __CIO_H
+/**
+@file cio.h
+@brief Implementation of a byte input-output process (CIO)
+
+The functions in CIO.C have for goal to realize a byte input / output process.
+*/
+
+/** @defgroup CIO CIO - byte input-output stream */
+/*@{*/
+
+/** @name Exported functions (see also openjpeg.h) */
+/*@{*/
+/* ----------------------------------------------------------------------- */
+/**
+Number of bytes left before the end of the stream
+@param cio CIO handle
+@return Returns the number of bytes before the end of the stream
+*/
+int cio_numbytesleft(opj_cio_t *cio);
+/**
+Get pointer to the current position in the stream
+@param cio CIO handle
+@return Returns a pointer to the current position
+*/
+unsigned char *cio_getbp(opj_cio_t *cio);
+/**
+Write some bytes
+@param cio CIO handle
+@param v Value to write
+@param n Number of bytes to write
+@return Returns the number of bytes written or 0 if an error occured
+*/
+unsigned int cio_write(opj_cio_t *cio, unsigned int v, int n);
+/**
+Read some bytes
+@param cio CIO handle
+@param n Number of bytes to read
+@return Returns the value of the n bytes read
+*/
+unsigned int cio_read(opj_cio_t *cio, int n);
+/**
+Skip some bytes
+@param cio CIO handle
+@param n Number of bytes to skip
+*/
+void cio_skip(opj_cio_t *cio, int n);
+/* ----------------------------------------------------------------------- */
+/*@}*/
+
+/*@}*/
+
+#endif /* __CIO_H */
+
diff --git a/extern/libopenjpeg/dwt.c b/extern/libopenjpeg/dwt.c
new file mode 100644
index 00000000000..78d18d175f4
--- /dev/null
+++ b/extern/libopenjpeg/dwt.c
@@ -0,0 +1,825 @@
+/*
+ * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2007, Professor Benoit Macq
+ * Copyright (c) 2001-2003, David Janssens
+ * Copyright (c) 2002-2003, Yannick Verschueren
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * Copyright (c) 2007, Jonathan Ballard <dzonatas@dzonux.net>
+ * Copyright (c) 2007, Callum Lerwick <seg@haxxed.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifdef __SSE__
+#include <xmmintrin.h>
+#endif
+
+#include "opj_includes.h"
+
+/** @defgroup DWT DWT - Implementation of a discrete wavelet transform */
+/*@{*/
+
+#define WS(i) v->mem[(i)*2]
+#define WD(i) v->mem[(1+(i)*2)]
+
+/** @name Local data structures */
+/*@{*/
+
+typedef struct dwt_local {
+	int* mem;
+	int dn;
+	int sn;
+	int cas;
+} dwt_t;
+
+typedef union {
+	float	f[4];
+} v4;
+
+typedef struct v4dwt_local {
+	v4*	wavelet ;
+	int		dn ;
+	int		sn ;
+	int		cas ;
+} v4dwt_t ;
+
+static const float dwt_alpha =  1.586134342f; //  12994
+static const float dwt_beta  =  0.052980118f; //    434
+static const float dwt_gamma = -0.882911075f; //  -7233
+static const float dwt_delta = -0.443506852f; //  -3633
+
+static const float K      = 1.230174105f; //  10078
+/* FIXME: What is this constant? */
+static const float c13318 = 1.625732422f;
+
+/*@}*/
+
+/**
+Virtual function type for wavelet transform in 1-D 
+*/
+typedef void (*DWT1DFN)(dwt_t* v);
+
+/** @name Local static functions */
+/*@{*/
+
+/**
+Forward lazy transform (horizontal)
+*/
+static void dwt_deinterleave_h(int *a, int *b, int dn, int sn, int cas);
+/**
+Forward lazy transform (vertical)
+*/
+static void dwt_deinterleave_v(int *a, int *b, int dn, int sn, int x, int cas);
+/**
+Inverse lazy transform (horizontal)
+*/
+static void dwt_interleave_h(dwt_t* h, int *a);
+/**
+Inverse lazy transform (vertical)
+*/
+static void dwt_interleave_v(dwt_t* v, int *a, int x);
+/**
+Forward 5-3 wavelet transform in 1-D
+*/
+static void dwt_encode_1(int *a, int dn, int sn, int cas);
+/**
+Inverse 5-3 wavelet transform in 1-D
+*/
+static void dwt_decode_1(dwt_t *v);
+/**
+Forward 9-7 wavelet transform in 1-D
+*/
+static void dwt_encode_1_real(int *a, int dn, int sn, int cas);
+/**
+Explicit calculation of the Quantization Stepsizes 
+*/
+static void dwt_encode_stepsize(int stepsize, int numbps, opj_stepsize_t *bandno_stepsize);
+/**
+Inverse wavelet transform in 2-D.
+*/
+static void dwt_decode_tile(opj_tcd_tilecomp_t* tilec, int i, DWT1DFN fn);
+
+/*@}*/
+
+/*@}*/
+
+#define S(i) a[(i)*2]
+#define D(i) a[(1+(i)*2)]
+#define S_(i) ((i)<0?S(0):((i)>=sn?S(sn-1):S(i)))
+#define D_(i) ((i)<0?D(0):((i)>=dn?D(dn-1):D(i)))
+/* new */
+#define SS_(i) ((i)<0?S(0):((i)>=dn?S(dn-1):S(i)))
+#define DD_(i) ((i)<0?D(0):((i)>=sn?D(sn-1):D(i)))
+
+/* <summary>                                                              */
+/* This table contains the norms of the 5-3 wavelets for different bands. */
+/* </summary>                                                             */
+static const double dwt_norms[4][10] = {
+	{1.000, 1.500, 2.750, 5.375, 10.68, 21.34, 42.67, 85.33, 170.7, 341.3},
+	{1.038, 1.592, 2.919, 5.703, 11.33, 22.64, 45.25, 90.48, 180.9},
+	{1.038, 1.592, 2.919, 5.703, 11.33, 22.64, 45.25, 90.48, 180.9},
+	{.7186, .9218, 1.586, 3.043, 6.019, 12.01, 24.00, 47.97, 95.93}
+};
+
+/* <summary>                                                              */
+/* This table contains the norms of the 9-7 wavelets for different bands. */
+/* </summary>                                                             */
+static const double dwt_norms_real[4][10] = {
+	{1.000, 1.965, 4.177, 8.403, 16.90, 33.84, 67.69, 135.3, 270.6, 540.9},
+	{2.022, 3.989, 8.355, 17.04, 34.27, 68.63, 137.3, 274.6, 549.0},
+	{2.022, 3.989, 8.355, 17.04, 34.27, 68.63, 137.3, 274.6, 549.0},
+	{2.080, 3.865, 8.307, 17.18, 34.71, 69.59, 139.3, 278.6, 557.2}
+};
+
+/* 
+==========================================================
+   local functions
+==========================================================
+*/
+
+/* <summary>			                 */
+/* Forward lazy transform (horizontal).  */
+/* </summary>                            */ 
+static void dwt_deinterleave_h(int *a, int *b, int dn, int sn, int cas) {
+	int i;
+    for (i=0; i<sn; i++) b[i]=a[2*i+cas];
+    for (i=0; i<dn; i++) b[sn+i]=a[(2*i+1-cas)];
+}
+
+/* <summary>                             */  
+/* Forward lazy transform (vertical).    */
+/* </summary>                            */ 
+static void dwt_deinterleave_v(int *a, int *b, int dn, int sn, int x, int cas) {
+    int i;
+    for (i=0; i<sn; i++) b[i*x]=a[2*i+cas];
+    for (i=0; i<dn; i++) b[(sn+i)*x]=a[(2*i+1-cas)];
+}
+
+/* <summary>                             */
+/* Inverse lazy transform (horizontal).  */
+/* </summary>                            */
+static void dwt_interleave_h(dwt_t* h, int *a) {
+    int *ai = a;
+    int *bi = h->mem + h->cas;
+    int  i	= h->sn;
+    while( i-- ) {
+      *bi = *(ai++);
+	  bi += 2;
+    }
+    ai	= a + h->sn;
+    bi	= h->mem + 1 - h->cas;
+    i	= h->dn ;
+    while( i-- ) {
+      *bi = *(ai++);
+	  bi += 2;
+    }
+}
+
+/* <summary>                             */  
+/* Inverse lazy transform (vertical).    */
+/* </summary>                            */ 
+static void dwt_interleave_v(dwt_t* v, int *a, int x) {
+    int *ai = a;
+    int *bi = v->mem + v->cas;
+    int  i = v->sn;
+    while( i-- ) {
+      *bi = *ai;
+	  bi += 2;
+	  ai += x;
+    }
+    ai = a + (v->sn * x);
+    bi = v->mem + 1 - v->cas;
+    i = v->dn ;
+    while( i-- ) {
+      *bi = *ai;
+	  bi += 2;  
+	  ai += x;
+    }
+}
+
+
+/* <summary>                            */
+/* Forward 5-3 wavelet transform in 1-D. */
+/* </summary>                           */
+static void dwt_encode_1(int *a, int dn, int sn, int cas) {
+	int i;
+	
+	if (!cas) {
+		if ((dn > 0) || (sn > 1)) {	/* NEW :  CASE ONE ELEMENT */
+			for (i = 0; i < dn; i++) D(i) -= (S_(i) + S_(i + 1)) >> 1;
+			for (i = 0; i < sn; i++) S(i) += (D_(i - 1) + D_(i) + 2) >> 2;
+		}
+	} else {
+		if (!sn && dn == 1)		    /* NEW :  CASE ONE ELEMENT */
+			S(0) *= 2;
+		else {
+			for (i = 0; i < dn; i++) S(i) -= (DD_(i) + DD_(i - 1)) >> 1;
+			for (i = 0; i < sn; i++) D(i) += (SS_(i) + SS_(i + 1) + 2) >> 2;
+		}
+	}
+}
+
+/* <summary>                            */
+/* Inverse 5-3 wavelet transform in 1-D. */
+/* </summary>                           */ 
+static void dwt_decode_1_(int *a, int dn, int sn, int cas) {
+	int i;
+	
+	if (!cas) {
+		if ((dn > 0) || (sn > 1)) { /* NEW :  CASE ONE ELEMENT */
+			for (i = 0; i < sn; i++) S(i) -= (D_(i - 1) + D_(i) + 2) >> 2;
+			for (i = 0; i < dn; i++) D(i) += (S_(i) + S_(i + 1)) >> 1;
+		}
+	} else {
+		if (!sn  && dn == 1)          /* NEW :  CASE ONE ELEMENT */
+			S(0) /= 2;
+		else {
+			for (i = 0; i < sn; i++) D(i) -= (SS_(i) + SS_(i + 1) + 2) >> 2;
+			for (i = 0; i < dn; i++) S(i) += (DD_(i) + DD_(i - 1)) >> 1;
+		}
+	}
+}
+
+/* <summary>                            */
+/* Inverse 5-3 wavelet transform in 1-D. */
+/* </summary>                           */ 
+static void dwt_decode_1(dwt_t *v) {
+	dwt_decode_1_(v->mem, v->dn, v->sn, v->cas);
+}
+
+/* <summary>                             */
+/* Forward 9-7 wavelet transform in 1-D. */
+/* </summary>                            */
+static void dwt_encode_1_real(int *a, int dn, int sn, int cas) {
+	int i;
+	if (!cas) {
+		if ((dn > 0) || (sn > 1)) {	/* NEW :  CASE ONE ELEMENT */
+			for (i = 0; i < dn; i++)
+				D(i) -= fix_mul(S_(i) + S_(i + 1), 12993);
+			for (i = 0; i < sn; i++)
+				S(i) -= fix_mul(D_(i - 1) + D_(i), 434);
+			for (i = 0; i < dn; i++)
+				D(i) += fix_mul(S_(i) + S_(i + 1), 7233);
+			for (i = 0; i < sn; i++)
+				S(i) += fix_mul(D_(i - 1) + D_(i), 3633);
+			for (i = 0; i < dn; i++)
+				D(i) = fix_mul(D(i), 5038);	/*5038 */
+			for (i = 0; i < sn; i++)
+				S(i) = fix_mul(S(i), 6659);	/*6660 */
+		}
+	} else {
+		if ((sn > 0) || (dn > 1)) {	/* NEW :  CASE ONE ELEMENT */
+			for (i = 0; i < dn; i++)
+				S(i) -= fix_mul(DD_(i) + DD_(i - 1), 12993);
+			for (i = 0; i < sn; i++)
+				D(i) -= fix_mul(SS_(i) + SS_(i + 1), 434);
+			for (i = 0; i < dn; i++)
+				S(i) += fix_mul(DD_(i) + DD_(i - 1), 7233);
+			for (i = 0; i < sn; i++)
+				D(i) += fix_mul(SS_(i) + SS_(i + 1), 3633);
+			for (i = 0; i < dn; i++)
+				S(i) = fix_mul(S(i), 5038);	/*5038 */
+			for (i = 0; i < sn; i++)
+				D(i) = fix_mul(D(i), 6659);	/*6660 */
+		}
+	}
+}
+
+static void dwt_encode_stepsize(int stepsize, int numbps, opj_stepsize_t *bandno_stepsize) {
+	int p, n;
+	p = int_floorlog2(stepsize) - 13;
+	n = 11 - int_floorlog2(stepsize);
+	bandno_stepsize->mant = (n < 0 ? stepsize >> -n : stepsize << n) & 0x7ff;
+	bandno_stepsize->expn = numbps - p;
+}
+
+/* 
+==========================================================
+   DWT interface
+==========================================================
+*/
+
+/* <summary>                            */
+/* Forward 5-3 wavelet transform in 2-D. */
+/* </summary>                           */
+void dwt_encode(opj_tcd_tilecomp_t * tilec) {
+	int i, j, k;
+	int *a = NULL;
+	int *aj = NULL;
+	int *bj = NULL;
+	int w, l;
+	
+	w = tilec->x1-tilec->x0;
+	l = tilec->numresolutions-1;
+	a = tilec->data;
+	
+	for (i = 0; i < l; i++) {
+		int rw;			/* width of the resolution level computed                                                           */
+		int rh;			/* height of the resolution level computed                                                          */
+		int rw1;		/* width of the resolution level once lower than computed one                                       */
+		int rh1;		/* height of the resolution level once lower than computed one                                      */
+		int cas_col;	/* 0 = non inversion on horizontal filtering 1 = inversion between low-pass and high-pass filtering */
+		int cas_row;	/* 0 = non inversion on vertical filtering 1 = inversion between low-pass and high-pass filtering   */
+		int dn, sn;
+		
+		rw = tilec->resolutions[l - i].x1 - tilec->resolutions[l - i].x0;
+		rh = tilec->resolutions[l - i].y1 - tilec->resolutions[l - i].y0;
+		rw1= tilec->resolutions[l - i - 1].x1 - tilec->resolutions[l - i - 1].x0;
+		rh1= tilec->resolutions[l - i - 1].y1 - tilec->resolutions[l - i - 1].y0;
+		
+		cas_row = tilec->resolutions[l - i].x0 % 2;
+		cas_col = tilec->resolutions[l - i].y0 % 2;
+        
+		sn = rh1;
+		dn = rh - rh1;
+		bj = (int*)opj_malloc(rh * sizeof(int));
+		for (j = 0; j < rw; j++) {
+			aj = a + j;
+			for (k = 0; k < rh; k++)  bj[k] = aj[k*w];
+			dwt_encode_1(bj, dn, sn, cas_col);
+			dwt_deinterleave_v(bj, aj, dn, sn, w, cas_col);
+		}
+		opj_free(bj);
+		
+		sn = rw1;
+		dn = rw - rw1;
+		bj = (int*)opj_malloc(rw * sizeof(int));
+		for (j = 0; j < rh; j++) {
+			aj = a + j * w;
+			for (k = 0; k < rw; k++)  bj[k] = aj[k];
+			dwt_encode_1(bj, dn, sn, cas_row);
+			dwt_deinterleave_h(bj, aj, dn, sn, cas_row);
+		}
+		opj_free(bj);
+	}
+}
+
+
+/* <summary>                            */
+/* Inverse 5-3 wavelet transform in 2-D. */
+/* </summary>                           */
+void dwt_decode(opj_tcd_tilecomp_t* tilec, int numres) {
+	dwt_decode_tile(tilec, numres, &dwt_decode_1);
+}
+
+
+/* <summary>                          */
+/* Get gain of 5-3 wavelet transform. */
+/* </summary>                         */
+int dwt_getgain(int orient) {
+	if (orient == 0)
+		return 0;
+	if (orient == 1 || orient == 2)
+		return 1;
+	return 2;
+}
+
+/* <summary>                */
+/* Get norm of 5-3 wavelet. */
+/* </summary>               */
+double dwt_getnorm(int level, int orient) {
+	return dwt_norms[orient][level];
+}
+
+/* <summary>                             */
+/* Forward 9-7 wavelet transform in 2-D. */
+/* </summary>                            */
+
+void dwt_encode_real(opj_tcd_tilecomp_t * tilec) {
+	int i, j, k;
+	int *a = NULL;
+	int *aj = NULL;
+	int *bj = NULL;
+	int w, l;
+	
+	w = tilec->x1-tilec->x0;
+	l = tilec->numresolutions-1;
+	a = tilec->data;
+	
+	for (i = 0; i < l; i++) {
+		int rw;			/* width of the resolution level computed                                                     */
+		int rh;			/* height of the resolution level computed                                                    */
+		int rw1;		/* width of the resolution level once lower than computed one                                 */
+		int rh1;		/* height of the resolution level once lower than computed one                                */
+		int cas_col;	/* 0 = non inversion on horizontal filtering 1 = inversion between low-pass and high-pass filtering */
+		int cas_row;	/* 0 = non inversion on vertical filtering 1 = inversion between low-pass and high-pass filtering   */
+		int dn, sn;
+		
+		rw = tilec->resolutions[l - i].x1 - tilec->resolutions[l - i].x0;
+		rh = tilec->resolutions[l - i].y1 - tilec->resolutions[l - i].y0;
+		rw1= tilec->resolutions[l - i - 1].x1 - tilec->resolutions[l - i - 1].x0;
+		rh1= tilec->resolutions[l - i - 1].y1 - tilec->resolutions[l - i - 1].y0;
+		
+		cas_row = tilec->resolutions[l - i].x0 % 2;
+		cas_col = tilec->resolutions[l - i].y0 % 2;
+		
+		sn = rh1;
+		dn = rh - rh1;
+		bj = (int*)opj_malloc(rh * sizeof(int));
+		for (j = 0; j < rw; j++) {
+			aj = a + j;
+			for (k = 0; k < rh; k++)  bj[k] = aj[k*w];
+			dwt_encode_1_real(bj, dn, sn, cas_col);
+			dwt_deinterleave_v(bj, aj, dn, sn, w, cas_col);
+		}
+		opj_free(bj);
+		
+		sn = rw1;
+		dn = rw - rw1;
+		bj = (int*)opj_malloc(rw * sizeof(int));
+		for (j = 0; j < rh; j++) {
+			aj = a + j * w;
+			for (k = 0; k < rw; k++)  bj[k] = aj[k];
+			dwt_encode_1_real(bj, dn, sn, cas_row);
+			dwt_deinterleave_h(bj, aj, dn, sn, cas_row);
+		}
+		opj_free(bj);
+	}
+}
+
+
+/* <summary>                          */
+/* Get gain of 9-7 wavelet transform. */
+/* </summary>                         */
+int dwt_getgain_real(int orient) {
+	(void)orient;
+	return 0;
+}
+
+/* <summary>                */
+/* Get norm of 9-7 wavelet. */
+/* </summary>               */
+double dwt_getnorm_real(int level, int orient) {
+	return dwt_norms_real[orient][level];
+}
+
+void dwt_calc_explicit_stepsizes(opj_tccp_t * tccp, int prec) {
+	int numbands, bandno;
+	numbands = 3 * tccp->numresolutions - 2;
+	for (bandno = 0; bandno < numbands; bandno++) {
+		double stepsize;
+		int resno, level, orient, gain;
+
+		resno = (bandno == 0) ? 0 : ((bandno - 1) / 3 + 1);
+		orient = (bandno == 0) ? 0 : ((bandno - 1) % 3 + 1);
+		level = tccp->numresolutions - 1 - resno;
+		gain = (tccp->qmfbid == 0) ? 0 : ((orient == 0) ? 0 : (((orient == 1) || (orient == 2)) ? 1 : 2));
+		if (tccp->qntsty == J2K_CCP_QNTSTY_NOQNT) {
+			stepsize = 1.0;
+		} else {
+			double norm = dwt_norms_real[orient][level];
+			stepsize = (1 << (gain)) / norm;
+		}
+		dwt_encode_stepsize((int) floor(stepsize * 8192.0), prec + gain, &tccp->stepsizes[bandno]);
+	}
+}
+
+
+/* <summary>                             */
+/* Determine maximum computed resolution level for inverse wavelet transform */
+/* </summary>                            */
+static int dwt_decode_max_resolution(opj_tcd_resolution_t* restrict r, int i) {
+	int mr	= 1;
+	int w;
+	while( --i ) {
+		r++;
+		if( mr < ( w = r->x1 - r->x0 ) )
+			mr = w ;
+		if( mr < ( w = r->y1 - r->y0 ) )
+			mr = w ;
+	}
+	return mr ;
+}
+
+
+/* <summary>                            */
+/* Inverse wavelet transform in 2-D.     */
+/* </summary>                           */
+static void dwt_decode_tile(opj_tcd_tilecomp_t* tilec, int numres, DWT1DFN dwt_1D) {
+	dwt_t h;
+	dwt_t v;
+
+	opj_tcd_resolution_t* tr = tilec->resolutions;
+
+	int rw = tr->x1 - tr->x0;	/* width of the resolution level computed */
+	int rh = tr->y1 - tr->y0;	/* height of the resolution level computed */
+
+	int w = tilec->x1 - tilec->x0;
+
+	h.mem = opj_aligned_malloc(dwt_decode_max_resolution(tr, numres) * sizeof(int));
+	v.mem = h.mem;
+
+	while( --numres) {
+		int * restrict tiledp = tilec->data;
+		int j;
+
+		++tr;
+		h.sn = rw;
+		v.sn = rh;
+
+		rw = tr->x1 - tr->x0;
+		rh = tr->y1 - tr->y0;
+
+		h.dn = rw - h.sn;
+		h.cas = tr->x0 % 2;
+
+		for(j = 0; j < rh; ++j) {
+			dwt_interleave_h(&h, &tiledp[j*w]);
+			(dwt_1D)(&h);
+			memcpy(&tiledp[j*w], h.mem, rw * sizeof(int));
+		}
+
+		v.dn = rh - v.sn;
+		v.cas = tr->y0 % 2;
+
+		for(j = 0; j < rw; ++j){
+			int k;
+			dwt_interleave_v(&v, &tiledp[j], w);
+			(dwt_1D)(&v);
+			for(k = 0; k < rh; ++k) {
+				tiledp[k * w + j] = v.mem[k];
+			}
+		}
+	}
+	opj_aligned_free(h.mem);
+}
+
+static void v4dwt_interleave_h(v4dwt_t* restrict w, float* restrict a, int x, int size){
+	float* restrict bi = (float*) (w->wavelet + w->cas);
+	int count = w->sn;
+	int i, k;
+	for(k = 0; k < 2; ++k){
+		for(i = 0; i < count; ++i){
+			int j = i;
+			bi[i*8    ] = a[j];
+			j += x;
+			if(j > size) continue;
+			bi[i*8 + 1] = a[j];
+			j += x;
+			if(j > size) continue;
+			bi[i*8 + 2] = a[j];
+			j += x;
+			if(j > size) continue;
+			bi[i*8 + 3] = a[j];
+		}
+		bi = (float*) (w->wavelet + 1 - w->cas);
+		a += w->sn;
+		size -= w->sn;
+		count = w->dn;
+	}
+}
+
+static void v4dwt_interleave_v(v4dwt_t* restrict v , float* restrict a , int x){
+	v4* restrict bi = v->wavelet + v->cas;
+	int i;
+	for(i = 0; i < v->sn; ++i){
+		memcpy(&bi[i*2], &a[i*x], 4 * sizeof(float));
+	}
+	a += v->sn * x;
+	bi = v->wavelet + 1 - v->cas;
+	for(i = 0; i < v->dn; ++i){
+		memcpy(&bi[i*2], &a[i*x], 4 * sizeof(float));
+	}
+}
+
+#ifdef __SSE__
+
+static void v4dwt_decode_step1_sse(v4* w, int count, const __m128 c){
+	__m128* restrict vw = (__m128*) w;
+	int i;
+	for(i = 0; i < count; ++i){
+		__m128 tmp = vw[i*2];
+		vw[i*2] = tmp * c;
+	}
+}
+
+static void v4dwt_decode_step2_sse(v4* l, v4* w, int k, int m, __m128 c){
+	__m128* restrict vl = (__m128*) l;
+	__m128* restrict vw = (__m128*) w;
+	int i;
+	for(i = 0; i < m; ++i){
+		__m128 tmp1 = vl[ 0];
+		__m128 tmp2 = vw[-1];
+		__m128 tmp3 = vw[ 0];
+		vw[-1] = tmp2 + ((tmp1 + tmp3) * c);
+		vl = vw;
+		vw += 2;
+	}
+	if(m >= k){
+		return;
+	}
+	c += c;
+	c *= vl[0];
+	for(; m < k; ++m){
+		__m128 tmp = vw[-1];
+		vw[-1] = tmp + c;
+		vw += 2;
+	}
+}
+
+#else
+
+static void v4dwt_decode_step1(v4* w, int count, const float c){
+	float* restrict fw = (float*) w;
+	int i;
+	for(i = 0; i < count; ++i){
+		float tmp1 = fw[i*8    ];
+		float tmp2 = fw[i*8 + 1];
+		float tmp3 = fw[i*8 + 2];
+		float tmp4 = fw[i*8 + 3];
+		fw[i*8    ] = tmp1 * c;
+		fw[i*8 + 1] = tmp2 * c;
+		fw[i*8 + 2] = tmp3 * c;
+		fw[i*8 + 3] = tmp4 * c;
+	}
+}
+
+static void v4dwt_decode_step2(v4* l, v4* w, int k, int m, float c){
+	float* restrict fl = (float*) l;
+	float* restrict fw = (float*) w;
+	int i;
+	for(i = 0; i < m; ++i){
+		float tmp1_1 = fl[0];
+		float tmp1_2 = fl[1];
+		float tmp1_3 = fl[2];
+		float tmp1_4 = fl[3];
+		float tmp2_1 = fw[-4];
+		float tmp2_2 = fw[-3];
+		float tmp2_3 = fw[-2];
+		float tmp2_4 = fw[-1];
+		float tmp3_1 = fw[0];
+		float tmp3_2 = fw[1];
+		float tmp3_3 = fw[2];
+		float tmp3_4 = fw[3];
+		fw[-4] = tmp2_1 + ((tmp1_1 + tmp3_1) * c);
+		fw[-3] = tmp2_2 + ((tmp1_2 + tmp3_2) * c);
+		fw[-2] = tmp2_3 + ((tmp1_3 + tmp3_3) * c);
+		fw[-1] = tmp2_4 + ((tmp1_4 + tmp3_4) * c);
+		fl = fw;
+		fw += 8;
+	}
+	if(m < k){
+		float c1;
+		float c2;
+		float c3;
+		float c4;
+		c += c;
+		c1 = fl[0] * c;
+		c2 = fl[1] * c;
+		c3 = fl[2] * c;
+		c4 = fl[3] * c;
+		for(; m < k; ++m){
+			float tmp1 = fw[-4];
+			float tmp2 = fw[-3];
+			float tmp3 = fw[-2];
+			float tmp4 = fw[-1];
+			fw[-4] = tmp1 + c1;
+			fw[-3] = tmp2 + c2;
+			fw[-2] = tmp3 + c3;
+			fw[-1] = tmp4 + c4;
+			fw += 8;
+		}
+	}
+}
+
+#endif
+
+/* <summary>                             */
+/* Inverse 9-7 wavelet transform in 1-D. */
+/* </summary>                            */
+static void v4dwt_decode(v4dwt_t* restrict dwt){
+	int a, b;
+	if(dwt->cas == 0) {
+		if(!((dwt->dn > 0) || (dwt->sn > 1))){
+			return;
+		}
+		a = 0;
+		b = 1;
+	}else{
+		if(!((dwt->sn > 0) || (dwt->dn > 1))) {
+			return;
+		}
+		a = 1;
+		b = 0;
+	}
+#ifdef __SSE__
+	v4dwt_decode_step1_sse(dwt->wavelet+a, dwt->sn, _mm_set1_ps(K));
+	v4dwt_decode_step1_sse(dwt->wavelet+b, dwt->dn, _mm_set1_ps(c13318));
+	v4dwt_decode_step2_sse(dwt->wavelet+b, dwt->wavelet+a+1, dwt->sn, int_min(dwt->sn, dwt->dn-a), _mm_set1_ps(dwt_delta));
+	v4dwt_decode_step2_sse(dwt->wavelet+a, dwt->wavelet+b+1, dwt->dn, int_min(dwt->dn, dwt->sn-b), _mm_set1_ps(dwt_gamma));
+	v4dwt_decode_step2_sse(dwt->wavelet+b, dwt->wavelet+a+1, dwt->sn, int_min(dwt->sn, dwt->dn-a), _mm_set1_ps(dwt_beta));
+	v4dwt_decode_step2_sse(dwt->wavelet+a, dwt->wavelet+b+1, dwt->dn, int_min(dwt->dn, dwt->sn-b), _mm_set1_ps(dwt_alpha));
+#else
+	v4dwt_decode_step1(dwt->wavelet+a, dwt->sn, K);
+	v4dwt_decode_step1(dwt->wavelet+b, dwt->dn, c13318);
+	v4dwt_decode_step2(dwt->wavelet+b, dwt->wavelet+a+1, dwt->sn, int_min(dwt->sn, dwt->dn-a), dwt_delta);
+	v4dwt_decode_step2(dwt->wavelet+a, dwt->wavelet+b+1, dwt->dn, int_min(dwt->dn, dwt->sn-b), dwt_gamma);
+	v4dwt_decode_step2(dwt->wavelet+b, dwt->wavelet+a+1, dwt->sn, int_min(dwt->sn, dwt->dn-a), dwt_beta);
+	v4dwt_decode_step2(dwt->wavelet+a, dwt->wavelet+b+1, dwt->dn, int_min(dwt->dn, dwt->sn-b), dwt_alpha);
+#endif
+}
+
+/* <summary>                             */
+/* Inverse 9-7 wavelet transform in 2-D. */
+/* </summary>                            */
+void dwt_decode_real(opj_tcd_tilecomp_t* restrict tilec, int numres){
+	v4dwt_t h;
+	v4dwt_t v;
+
+	opj_tcd_resolution_t* res = tilec->resolutions;
+
+	int rw = res->x1 - res->x0;	/* width of the resolution level computed */
+	int rh = res->y1 - res->y0;	/* height of the resolution level computed */
+
+	int w = tilec->x1 - tilec->x0;
+
+	h.wavelet = (v4*) opj_aligned_malloc((dwt_decode_max_resolution(res, numres)+5) * sizeof(v4));
+	v.wavelet = h.wavelet;
+
+	while( --numres) {
+		float * restrict aj = (float*) tilec->data;
+		int bufsize = (tilec->x1 - tilec->x0) * (tilec->y1 - tilec->y0);
+		int j;
+
+		h.sn = rw;
+		v.sn = rh;
+
+		++res;
+
+		rw = res->x1 - res->x0;	/* width of the resolution level computed */
+		rh = res->y1 - res->y0;	/* height of the resolution level computed */
+
+		h.dn = rw - h.sn;
+		h.cas = res->x0 % 2;
+
+		for(j = rh; j > 0; j -= 4){
+			v4dwt_interleave_h(&h, aj, w, bufsize);
+			v4dwt_decode(&h);
+			if(j >= 4){
+				int k;
+				for(k = rw; --k >= 0;){
+					aj[k    ] = h.wavelet[k].f[0];
+					aj[k+w  ] = h.wavelet[k].f[1];
+					aj[k+w*2] = h.wavelet[k].f[2];
+					aj[k+w*3] = h.wavelet[k].f[3];
+				}
+			}else{
+				int k;
+				for(k = rw; --k >= 0;){
+					switch(j) {
+						case 3: aj[k+w*2] = h.wavelet[k].f[2];
+						case 2: aj[k+w  ] = h.wavelet[k].f[1];
+						case 1: aj[k    ] = h.wavelet[k].f[0];
+					}
+				}
+			}
+			aj += w*4;
+			bufsize -= w*4;
+		}
+
+		v.dn = rh - v.sn;
+		v.cas = res->y0 % 2;
+
+		aj = (float*) tilec->data;
+		for(j = rw; j > 0; j -= 4){
+			v4dwt_interleave_v(&v, aj, w);
+			v4dwt_decode(&v);
+			if(j >= 4){
+				int k;
+				for(k = 0; k < rh; ++k){
+					memcpy(&aj[k*w], &v.wavelet[k], 4 * sizeof(float));
+				}
+			}else{
+				int k;
+				for(k = 0; k < rh; ++k){
+					memcpy(&aj[k*w], &v.wavelet[k], j * sizeof(float));
+				}
+			}
+			aj += 4;
+		}
+	}
+
+	opj_aligned_free(h.wavelet);
+}
+
diff --git a/extern/libopenjpeg/dwt.h b/extern/libopenjpeg/dwt.h
new file mode 100644
index 00000000000..adf73e54400
--- /dev/null
+++ b/extern/libopenjpeg/dwt.h
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2007, Professor Benoit Macq
+ * Copyright (c) 2001-2003, David Janssens
+ * Copyright (c) 2002-2003, Yannick Verschueren
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __DWT_H
+#define __DWT_H
+/**
+@file dwt.h
+@brief Implementation of a discrete wavelet transform (DWT)
+
+The functions in DWT.C have for goal to realize forward and inverse discret wavelet
+transform with filter 5-3 (reversible) and filter 9-7 (irreversible). The functions in
+DWT.C are used by some function in TCD.C.
+*/
+
+/** @defgroup DWT DWT - Implementation of a discrete wavelet transform */
+/*@{*/
+
+
+/** @name Exported functions */
+/*@{*/
+/* ----------------------------------------------------------------------- */
+/**
+Forward 5-3 wavelet tranform in 2-D. 
+Apply a reversible DWT transform to a component of an image.
+@param tilec Tile component information (current tile)
+*/
+void dwt_encode(opj_tcd_tilecomp_t * tilec);
+/**
+Inverse 5-3 wavelet tranform in 2-D.
+Apply a reversible inverse DWT transform to a component of an image.
+@param tilec Tile component information (current tile)
+@param numres Number of resolution levels to decode
+*/
+void dwt_decode(opj_tcd_tilecomp_t* tilec, int numres);
+/**
+Get the gain of a subband for the reversible 5-3 DWT.
+@param orient Number that identifies the subband (0->LL, 1->HL, 2->LH, 3->HH)
+@return Returns 0 if orient = 0, returns 1 if orient = 1 or 2, returns 2 otherwise
+*/
+int dwt_getgain(int orient);
+/**
+Get the norm of a wavelet function of a subband at a specified level for the reversible 5-3 DWT.
+@param level Level of the wavelet function
+@param orient Band of the wavelet function
+@return Returns the norm of the wavelet function
+*/
+double dwt_getnorm(int level, int orient);
+/**
+Forward 9-7 wavelet transform in 2-D. 
+Apply an irreversible DWT transform to a component of an image.
+@param tilec Tile component information (current tile)
+*/
+void dwt_encode_real(opj_tcd_tilecomp_t * tilec);
+/**
+Inverse 9-7 wavelet transform in 2-D. 
+Apply an irreversible inverse DWT transform to a component of an image.
+@param tilec Tile component information (current tile)
+@param numres Number of resolution levels to decode
+*/
+void dwt_decode_real(opj_tcd_tilecomp_t* tilec, int numres);
+/**
+Get the gain of a subband for the irreversible 9-7 DWT.
+@param orient Number that identifies the subband (0->LL, 1->HL, 2->LH, 3->HH)
+@return Returns the gain of the 9-7 wavelet transform
+*/
+int dwt_getgain_real(int orient);
+/**
+Get the norm of a wavelet function of a subband at a specified level for the irreversible 9-7 DWT
+@param level Level of the wavelet function
+@param orient Band of the wavelet function
+@return Returns the norm of the 9-7 wavelet
+*/
+double dwt_getnorm_real(int level, int orient);
+/**
+Explicit calculation of the Quantization Stepsizes 
+@param tccp Tile-component coding parameters
+@param prec Precint analyzed
+*/
+void dwt_calc_explicit_stepsizes(opj_tccp_t * tccp, int prec);
+/* ----------------------------------------------------------------------- */
+/*@}*/
+
+/*@}*/
+
+#endif /* __DWT_H */
diff --git a/extern/libopenjpeg/event.c b/extern/libopenjpeg/event.c
new file mode 100644
index 00000000000..291ff585811
--- /dev/null
+++ b/extern/libopenjpeg/event.c
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "opj_includes.h"
+
+/* ==========================================================
+     Utility functions
+   ==========================================================*/
+
+#if !defined(_MSC_VER) && !defined(__MINGW32__)
+static char*
+i2a(unsigned i, char *a, unsigned r) {
+	if (i/r > 0) a = i2a(i/r,a,r);
+	*a = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"[i%r];
+	return a+1;
+}
+
+/** 
+ Transforms integer i into an ascii string and stores the result in a; 
+ string is encoded in the base indicated by r.
+ @param i Number to be converted
+ @param a String result
+ @param r Base of value; must be in the range 2 - 36
+ @return Returns a
+*/
+static char *
+_itoa(int i, char *a, int r) {
+	r = ((r < 2) || (r > 36)) ? 10 : r;
+	if(i < 0) {
+		*a = '-';
+		*i2a(-i, a+1, r) = 0;
+	}
+	else *i2a(i, a, r) = 0;
+	return a;
+}
+
+#endif /* !WIN32 */
+
+/* ----------------------------------------------------------------------- */
+
+opj_event_mgr_t* OPJ_CALLCONV opj_set_event_mgr(opj_common_ptr cinfo, opj_event_mgr_t *event_mgr, void *context) {
+	if(cinfo) {
+		opj_event_mgr_t *previous = cinfo->event_mgr;
+		cinfo->event_mgr = event_mgr;
+		cinfo->client_data = context;
+		return previous;
+	}
+
+	return NULL;
+}
+
+bool opj_event_msg(opj_common_ptr cinfo, int event_type, const char *fmt, ...) {
+#define MSG_SIZE 512 /* 512 bytes should be more than enough for a short message */
+	opj_msg_callback msg_handler = NULL;
+
+	opj_event_mgr_t *event_mgr = cinfo->event_mgr;
+	if(event_mgr != NULL) {
+		switch(event_type) {
+			case EVT_ERROR:
+				msg_handler = event_mgr->error_handler;
+				break;
+			case EVT_WARNING:
+				msg_handler = event_mgr->warning_handler;
+				break;
+			case EVT_INFO:
+				msg_handler = event_mgr->info_handler;
+				break;
+			default:
+				break;
+		}
+		if(msg_handler == NULL) {
+			return false;
+		}
+	} else {
+		return false;
+	}
+
+	if ((fmt != NULL) && (event_mgr != NULL)) {
+		va_list arg;
+		int str_length/*, i, j*/; /* UniPG */
+		char message[MSG_SIZE];
+		memset(message, 0, MSG_SIZE);
+		/* initialize the optional parameter list */
+		va_start(arg, fmt);
+		/* check the length of the format string */
+		str_length = (strlen(fmt) > MSG_SIZE) ? MSG_SIZE : strlen(fmt);
+		/* parse the format string and put the result in 'message' */
+		vsprintf(message, fmt, arg); /* UniPG */
+		/* deinitialize the optional parameter list */
+		va_end(arg);
+
+		/* output the message to the user program */
+		msg_handler(message, cinfo->client_data);
+	}
+
+	return true;
+}
+
diff --git a/extern/libopenjpeg/event.h b/extern/libopenjpeg/event.h
new file mode 100644
index 00000000000..11910b0e4bc
--- /dev/null
+++ b/extern/libopenjpeg/event.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef __EVENT_H
+#define __EVENT_H
+/**
+@file event.h
+@brief Implementation of a event callback system
+
+The functions in EVENT.C have for goal to send output messages (errors, warnings, debug) to the user.
+*/
+
+#define EVT_ERROR	1	/**< Error event type */
+#define EVT_WARNING	2	/**< Warning event type */
+#define EVT_INFO	4	/**< Debug event type */
+
+/** @defgroup EVENT EVENT - Implementation of a event callback system */
+/*@{*/
+
+/** @name Exported functions (see also openjpeg.h) */
+/*@{*/
+/* ----------------------------------------------------------------------- */
+/**
+Write formatted data to a string and send the string to a user callback. 
+@param cinfo Codec context info
+@param event_type Event type or callback to use to send the message
+@param fmt Format-control string (plus optionnal arguments)
+@return Returns true if successful, returns false otherwise
+*/
+bool opj_event_msg(opj_common_ptr cinfo, int event_type, const char *fmt, ...);
+/* ----------------------------------------------------------------------- */
+/*@}*/
+
+/*@}*/
+
+#endif /* __EVENT_H */
diff --git a/extern/libopenjpeg/fix.h b/extern/libopenjpeg/fix.h
new file mode 100644
index 00000000000..bcb2acb54c8
--- /dev/null
+++ b/extern/libopenjpeg/fix.h
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2007, Professor Benoit Macq
+ * Copyright (c) 2001-2003, David Janssens
+ * Copyright (c) 2002-2003, Yannick Verschueren
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef __FIX_H
+#define __FIX_H
+
+#if defined(_MSC_VER) || defined(__BORLANDC__)
+#define int64 __int64
+#else
+#define int64 long long
+#endif
+
+/**
+@file fix.h
+@brief Implementation of operations of specific multiplication (FIX)
+
+The functions in FIX.H have for goal to realize specific multiplication.
+*/
+
+/** @defgroup FIX FIX - Implementation of operations of specific multiplication */
+/*@{*/
+
+/**
+Multiply two fixed-precision rational numbers.
+@param a
+@param b
+@return Returns a * b
+*/
+static INLINE int fix_mul(int a, int b) {
+    int64 temp = (int64) a * (int64) b ;
+    temp += temp & 4096;
+    return (int) (temp >> 13) ;
+}
+
+/*@}*/
+
+#endif /* __FIX_H */
diff --git a/extern/libopenjpeg/image.c b/extern/libopenjpeg/image.c
new file mode 100644
index 00000000000..ea8e59ea547
--- /dev/null
+++ b/extern/libopenjpeg/image.c
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "opj_includes.h"
+
+opj_image_t* opj_image_create0(void) {
+	opj_image_t *image = (opj_image_t*)opj_malloc(sizeof(opj_image_t));
+	return image;
+}
+
+opj_image_t* OPJ_CALLCONV opj_image_create(int numcmpts, opj_image_cmptparm_t *cmptparms, OPJ_COLOR_SPACE clrspc) {
+	int compno;
+	opj_image_t *image = NULL;
+
+	image = (opj_image_t*) opj_calloc(1, sizeof(opj_image_t));
+	if(image) {
+		image->color_space = clrspc;
+		image->numcomps = numcmpts;
+		/* allocate memory for the per-component information */
+		image->comps = (opj_image_comp_t*)opj_malloc(image->numcomps * sizeof(opj_image_comp_t));
+		if(!image->comps) {
+			fprintf(stderr,"Unable to allocate memory for image.\n");
+			opj_image_destroy(image);
+			return NULL;
+		}
+		/* create the individual image components */
+		for(compno = 0; compno < numcmpts; compno++) {
+			opj_image_comp_t *comp = &image->comps[compno];
+			comp->dx = cmptparms[compno].dx;
+			comp->dy = cmptparms[compno].dy;
+			comp->w = cmptparms[compno].w;
+			comp->h = cmptparms[compno].h;
+			comp->x0 = cmptparms[compno].x0;
+			comp->y0 = cmptparms[compno].y0;
+			comp->prec = cmptparms[compno].prec;
+			comp->bpp = cmptparms[compno].bpp;
+			comp->sgnd = cmptparms[compno].sgnd;
+			comp->data = (int*) opj_calloc(comp->w * comp->h, sizeof(int));
+			if(!comp->data) {
+				fprintf(stderr,"Unable to allocate memory for image.\n");
+				opj_image_destroy(image);
+				return NULL;
+			}
+		}
+	}
+
+	return image;
+}
+
+void OPJ_CALLCONV opj_image_destroy(opj_image_t *image) {
+	int i;
+	if(image) {
+		if(image->comps) {
+			/* image components */
+			for(i = 0; i < image->numcomps; i++) {
+				opj_image_comp_t *image_comp = &image->comps[i];
+				if(image_comp->data) {
+					opj_free(image_comp->data);
+				}
+			}
+			opj_free(image->comps);
+		}
+		opj_free(image);
+	}
+}
+
diff --git a/extern/libopenjpeg/image.h b/extern/libopenjpeg/image.h
new file mode 100644
index 00000000000..04c362eb834
--- /dev/null
+++ b/extern/libopenjpeg/image.h
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef __IMAGE_H
+#define __IMAGE_H
+/**
+@file image.h
+@brief Implementation of operations on images (IMAGE)
+
+The functions in IMAGE.C have for goal to realize operations on images.
+*/
+
+/** @defgroup IMAGE IMAGE - Implementation of operations on images */
+/*@{*/
+
+/**
+Create an empty image
+@todo this function should be removed
+@return returns an empty image if successful, returns NULL otherwise
+*/
+opj_image_t* opj_image_create0(void);
+
+/*@}*/
+
+#endif /* __IMAGE_H */
+
diff --git a/extern/libopenjpeg/int.h b/extern/libopenjpeg/int.h
new file mode 100644
index 00000000000..4e5fe08eb76
--- /dev/null
+++ b/extern/libopenjpeg/int.h
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2007, Professor Benoit Macq
+ * Copyright (c) 2001-2003, David Janssens
+ * Copyright (c) 2002-2003, Yannick Verschueren
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef __INT_H
+#define __INT_H
+/**
+@file int.h
+@brief Implementation of operations on integers (INT)
+
+The functions in INT.H have for goal to realize operations on integers.
+*/
+
+/** @defgroup INT INT - Implementation of operations on integers */
+/*@{*/
+
+/** @name Exported functions (see also openjpeg.h) */
+/*@{*/
+/* ----------------------------------------------------------------------- */
+/**
+Get the minimum of two integers
+@return Returns a if a < b else b
+*/
+static INLINE int int_min(int a, int b) {
+	return a < b ? a : b;
+}
+/**
+Get the maximum of two integers
+@return Returns a if a > b else b
+*/
+static INLINE int int_max(int a, int b) {
+	return (a > b) ? a : b;
+}
+/**
+Clamp an integer inside an interval
+@return
+<ul>
+<li>Returns a if (min < a < max)
+<li>Returns max if (a > max)
+<li>Returns min if (a < min) 
+</ul>
+*/
+static INLINE int int_clamp(int a, int min, int max) {
+	if (a < min)
+		return min;
+	if (a > max)
+		return max;
+	return a;
+}
+/**
+@return Get absolute value of integer
+*/
+static INLINE int int_abs(int a) {
+	return a < 0 ? -a : a;
+}
+/**
+Divide an integer and round upwards
+@return Returns a divided by b
+*/
+static INLINE int int_ceildiv(int a, int b) {
+	return (a + b - 1) / b;
+}
+/**
+Divide an integer by a power of 2 and round upwards
+@return Returns a divided by 2^b
+*/
+static INLINE int int_ceildivpow2(int a, int b) {
+	return (a + (1 << b) - 1) >> b;
+}
+/**
+Divide an integer by a power of 2 and round downwards
+@return Returns a divided by 2^b
+*/
+static INLINE int int_floordivpow2(int a, int b) {
+	return a >> b;
+}
+/**
+Get logarithm of an integer and round downwards
+@return Returns log2(a)
+*/
+static INLINE int int_floorlog2(int a) {
+	int l;
+	for (l = 0; a > 1; l++) {
+		a >>= 1;
+	}
+	return l;
+}
+/* ----------------------------------------------------------------------- */
+/*@}*/
+
+/*@}*/
+
+#endif
diff --git a/extern/libopenjpeg/j2k.c b/extern/libopenjpeg/j2k.c
new file mode 100644
index 00000000000..8e7b1ce081f
--- /dev/null
+++ b/extern/libopenjpeg/j2k.c
@@ -0,0 +1,2498 @@
+/*
+ * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2007, Professor Benoit Macq
+ * Copyright (c) 2001-2003, David Janssens
+ * Copyright (c) 2002-2003, Yannick Verschueren
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * Copyright (c) 2006-2007, Parvatha Elangovan
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "opj_includes.h"
+
+/** @defgroup J2K J2K - JPEG-2000 codestream reader/writer */
+/*@{*/
+
+/** @name Local static functions */
+/*@{*/
+
+/**
+Write the SOC marker (Start Of Codestream)
+@param j2k J2K handle
+*/
+static void j2k_write_soc(opj_j2k_t *j2k);
+/**
+Read the SOC marker (Start of Codestream)
+@param j2k J2K handle
+*/
+static void j2k_read_soc(opj_j2k_t *j2k);
+/**
+Write the SIZ marker (image and tile size)
+@param j2k J2K handle
+*/
+static void j2k_write_siz(opj_j2k_t *j2k);
+/**
+Read the SIZ marker (image and tile size)
+@param j2k J2K handle
+*/
+static void j2k_read_siz(opj_j2k_t *j2k);
+/**
+Write the COM marker (comment)
+@param j2k J2K handle
+*/
+static void j2k_write_com(opj_j2k_t *j2k);
+/**
+Read the COM marker (comment)
+@param j2k J2K handle
+*/
+static void j2k_read_com(opj_j2k_t *j2k);
+/**
+Write the value concerning the specified component in the marker COD and COC
+@param j2k J2K handle
+@param compno Number of the component concerned by the information written
+*/
+static void j2k_write_cox(opj_j2k_t *j2k, int compno);
+/**
+Read the value concerning the specified component in the marker COD and COC
+@param j2k J2K handle
+@param compno Number of the component concerned by the information read
+*/
+static void j2k_read_cox(opj_j2k_t *j2k, int compno);
+/**
+Write the COD marker (coding style default)
+@param j2k J2K handle
+*/
+static void j2k_write_cod(opj_j2k_t *j2k);
+/**
+Read the COD marker (coding style default)
+@param j2k J2K handle
+*/
+static void j2k_read_cod(opj_j2k_t *j2k);
+/**
+Write the COC marker (coding style component)
+@param j2k J2K handle
+@param compno Number of the component concerned by the information written
+*/
+static void j2k_write_coc(opj_j2k_t *j2k, int compno);
+/**
+Read the COC marker (coding style component)
+@param j2k J2K handle
+*/
+static void j2k_read_coc(opj_j2k_t *j2k);
+/**
+Write the value concerning the specified component in the marker QCD and QCC
+@param j2k J2K handle
+@param compno Number of the component concerned by the information written
+*/
+static void j2k_write_qcx(opj_j2k_t *j2k, int compno);
+/**
+Read the value concerning the specified component in the marker QCD and QCC
+@param j2k J2K handle
+@param compno Number of the component concern by the information read
+@param len Length of the information in the QCX part of the marker QCD/QCC
+*/
+static void j2k_read_qcx(opj_j2k_t *j2k, int compno, int len);
+/**
+Write the QCD marker (quantization default)
+@param j2k J2K handle
+*/
+static void j2k_write_qcd(opj_j2k_t *j2k);
+/**
+Read the QCD marker (quantization default)
+@param j2k J2K handle
+*/
+static void j2k_read_qcd(opj_j2k_t *j2k);
+/**
+Write the QCC marker (quantization component)
+@param j2k J2K handle
+@param compno Number of the component concerned by the information written
+*/
+static void j2k_write_qcc(opj_j2k_t *j2k, int compno);
+/**
+Read the QCC marker (quantization component)
+@param j2k J2K handle
+*/
+static void j2k_read_qcc(opj_j2k_t *j2k);
+/**
+Write the POC marker (progression order change)
+@param j2k J2K handle
+*/
+static void j2k_write_poc(opj_j2k_t *j2k);
+/**
+Read the POC marker (progression order change)
+@param j2k J2K handle
+*/
+static void j2k_read_poc(opj_j2k_t *j2k);
+/**
+Read the CRG marker (component registration)
+@param j2k J2K handle
+*/
+static void j2k_read_crg(opj_j2k_t *j2k);
+/**
+Read the TLM marker (tile-part lengths)
+@param j2k J2K handle
+*/
+static void j2k_read_tlm(opj_j2k_t *j2k);
+/**
+Read the PLM marker (packet length, main header)
+@param j2k J2K handle
+*/
+static void j2k_read_plm(opj_j2k_t *j2k);
+/**
+Read the PLT marker (packet length, tile-part header)
+@param j2k J2K handle
+*/
+static void j2k_read_plt(opj_j2k_t *j2k);
+/**
+Read the PPM marker (packet packet headers, main header)
+@param j2k J2K handle
+*/
+static void j2k_read_ppm(opj_j2k_t *j2k);
+/**
+Read the PPT marker (packet packet headers, tile-part header)
+@param j2k J2K handle
+*/
+static void j2k_read_ppt(opj_j2k_t *j2k);
+/**
+Write the TLM marker (Mainheader)
+@param j2k J2K handle
+*/
+static void j2k_write_tlm(opj_j2k_t *j2k);
+/**
+Write the SOT marker (start of tile-part)
+@param j2k J2K handle
+*/
+static void j2k_write_sot(opj_j2k_t *j2k);
+/**
+Read the SOT marker (start of tile-part)
+@param j2k J2K handle
+*/
+static void j2k_read_sot(opj_j2k_t *j2k);
+/**
+Write the SOD marker (start of data)
+@param j2k J2K handle
+@param tile_coder Pointer to a TCD handle
+*/
+static void j2k_write_sod(opj_j2k_t *j2k, void *tile_coder);
+/**
+Read the SOD marker (start of data)
+@param j2k J2K handle
+*/
+static void j2k_read_sod(opj_j2k_t *j2k);
+/**
+Write the RGN marker (region-of-interest)
+@param j2k J2K handle
+@param compno Number of the component concerned by the information written
+@param tileno Number of the tile concerned by the information written
+*/
+static void j2k_write_rgn(opj_j2k_t *j2k, int compno, int tileno);
+/**
+Read the RGN marker (region-of-interest)
+@param j2k J2K handle
+*/
+static void j2k_read_rgn(opj_j2k_t *j2k);
+/**
+Write the EOC marker (end of codestream)
+@param j2k J2K handle
+*/
+static void j2k_write_eoc(opj_j2k_t *j2k);
+/**
+Read the EOC marker (end of codestream)
+@param j2k J2K handle
+*/
+static void j2k_read_eoc(opj_j2k_t *j2k);
+/**
+Read an unknown marker
+@param j2k J2K handle
+*/
+static void j2k_read_unk(opj_j2k_t *j2k);
+
+/*@}*/
+
+/*@}*/
+
+/* ----------------------------------------------------------------------- */
+typedef struct j2k_prog_order{
+	OPJ_PROG_ORDER enum_prog;
+	char str_prog[4];
+}j2k_prog_order_t;
+
+j2k_prog_order_t j2k_prog_order_list[] = {
+	{CPRL, "CPRL"},
+	{LRCP, "LRCP"},
+	{PCRL, "PCRL"},
+	{RLCP, "RLCP"},
+	{RPCL, "RPCL"},
+	{-1, ""}
+};
+
+char *j2k_convert_progression_order(OPJ_PROG_ORDER prg_order){
+	j2k_prog_order_t *po;
+	for(po = j2k_prog_order_list; po->enum_prog != -1; po++ ){
+		if(po->enum_prog == prg_order){
+			break;
+		}
+	}
+	return po->str_prog;
+}
+
+void j2k_dump_image(FILE *fd, opj_image_t * img) {
+	int compno;
+	fprintf(fd, "image {\n");
+	fprintf(fd, "  x0=%d, y0=%d, x1=%d, y1=%d\n", img->x0, img->y0, img->x1, img->y1);
+	fprintf(fd, "  numcomps=%d\n", img->numcomps);
+	for (compno = 0; compno < img->numcomps; compno++) {
+		opj_image_comp_t *comp = &img->comps[compno];
+		fprintf(fd, "  comp %d {\n", compno);
+		fprintf(fd, "    dx=%d, dy=%d\n", comp->dx, comp->dy);
+		fprintf(fd, "    prec=%d\n", comp->prec);
+		fprintf(fd, "    sgnd=%d\n", comp->sgnd);
+		fprintf(fd, "  }\n");
+	}
+	fprintf(fd, "}\n");
+}
+
+void j2k_dump_cp(FILE *fd, opj_image_t * img, opj_cp_t * cp) {
+	int tileno, compno, layno, bandno, resno, numbands;
+	fprintf(fd, "coding parameters {\n");
+	fprintf(fd, "  tx0=%d, ty0=%d\n", cp->tx0, cp->ty0);
+	fprintf(fd, "  tdx=%d, tdy=%d\n", cp->tdx, cp->tdy);
+	fprintf(fd, "  tw=%d, th=%d\n", cp->tw, cp->th);
+	for (tileno = 0; tileno < cp->tw * cp->th; tileno++) {
+		opj_tcp_t *tcp = &cp->tcps[tileno];
+		fprintf(fd, "  tile %d {\n", tileno);
+		fprintf(fd, "    csty=%x\n", tcp->csty);
+		fprintf(fd, "    prg=%d\n", tcp->prg);
+		fprintf(fd, "    numlayers=%d\n", tcp->numlayers);
+		fprintf(fd, "    mct=%d\n", tcp->mct);
+		fprintf(fd, "    rates=");
+		for (layno = 0; layno < tcp->numlayers; layno++) {
+			fprintf(fd, "%.1f ", tcp->rates[layno]);
+		}
+		fprintf(fd, "\n");
+		for (compno = 0; compno < img->numcomps; compno++) {
+			opj_tccp_t *tccp = &tcp->tccps[compno];
+			fprintf(fd, "    comp %d {\n", compno);
+			fprintf(fd, "      csty=%x\n", tccp->csty);
+			fprintf(fd, "      numresolutions=%d\n", tccp->numresolutions);
+			fprintf(fd, "      cblkw=%d\n", tccp->cblkw);
+			fprintf(fd, "      cblkh=%d\n", tccp->cblkh);
+			fprintf(fd, "      cblksty=%x\n", tccp->cblksty);
+			fprintf(fd, "      qmfbid=%d\n", tccp->qmfbid);
+			fprintf(fd, "      qntsty=%d\n", tccp->qntsty);
+			fprintf(fd, "      numgbits=%d\n", tccp->numgbits);
+			fprintf(fd, "      roishift=%d\n", tccp->roishift);
+			fprintf(fd, "      stepsizes=");
+			numbands = tccp->qntsty == J2K_CCP_QNTSTY_SIQNT ? 1 : tccp->numresolutions * 3 - 2;
+			for (bandno = 0; bandno < numbands; bandno++) {
+				fprintf(fd, "(%d,%d) ", tccp->stepsizes[bandno].mant,
+					tccp->stepsizes[bandno].expn);
+			}
+			fprintf(fd, "\n");
+			
+			if (tccp->csty & J2K_CCP_CSTY_PRT) {
+				fprintf(fd, "      prcw=");
+				for (resno = 0; resno < tccp->numresolutions; resno++) {
+					fprintf(fd, "%d ", tccp->prcw[resno]);
+				}
+				fprintf(fd, "\n");
+				fprintf(fd, "      prch=");
+				for (resno = 0; resno < tccp->numresolutions; resno++) {
+					fprintf(fd, "%d ", tccp->prch[resno]);
+				}
+				fprintf(fd, "\n");
+			}
+			fprintf(fd, "    }\n");
+		}
+		fprintf(fd, "  }\n");
+	}
+	fprintf(fd, "}\n");
+}
+
+/* ----------------------------------------------------------------------- */
+static int j2k_get_num_tp(opj_cp_t *cp,int pino,int tileno){
+	char *prog;
+	int i;
+	int tpnum=1,tpend=0;
+	opj_tcp_t *tcp = &cp->tcps[tileno];
+	prog = j2k_convert_progression_order(tcp->prg);
+	
+	if(cp->tp_on == 1){
+		for(i=0;i<4;i++){
+			if(tpend!=1){
+				if( cp->tp_flag == prog[i] ){
+					tpend=1;cp->tp_pos=i;
+				}
+				switch(prog[i]){
+				case 'C':
+					tpnum= tpnum * tcp->pocs[pino].compE;
+					break;
+				case 'R':
+					tpnum= tpnum * tcp->pocs[pino].resE;
+					break;
+				case 'P':
+					tpnum= tpnum * tcp->pocs[pino].prcE;
+					break;
+				case 'L':
+					tpnum= tpnum * tcp->pocs[pino].layE;
+					break;
+				}
+			}
+		}
+	}else{
+		tpnum=1;
+	}
+	return tpnum;
+}
+
+/**	mem allocation for TLM marker*/
+int j2k_calculate_tp(opj_cp_t *cp,int img_numcomp,opj_image_t *image,opj_j2k_t *j2k ){
+	int pino,tileno,totnum_tp=0;
+	j2k->cur_totnum_tp = (int *) opj_malloc(cp->tw * cp->th * sizeof(int));
+	for (tileno = 0; tileno < cp->tw * cp->th; tileno++) {
+		int cur_totnum_tp = 0;
+		opj_tcp_t *tcp = &cp->tcps[tileno];
+		for(pino = 0; pino <= tcp->numpocs; pino++) {
+			int tp_num=0;
+			opj_pi_iterator_t *pi = pi_initialise_encode(image, cp, tileno,FINAL_PASS);
+			if(!pi) { return -1;}
+			tp_num = j2k_get_num_tp(cp,pino,tileno);
+			totnum_tp = totnum_tp + tp_num;
+			cur_totnum_tp = cur_totnum_tp + tp_num;
+			pi_destroy(pi, cp, tileno);
+		}
+		j2k->cur_totnum_tp[tileno] = cur_totnum_tp;
+		/* INDEX >> */
+		if (j2k->cstr_info) {
+			j2k->cstr_info->tile[tileno].num_tps = cur_totnum_tp;
+			j2k->cstr_info->tile[tileno].tp = (opj_tp_info_t *) opj_malloc(cur_totnum_tp * sizeof(opj_tp_info_t));
+		}
+		/* << INDEX */
+	}
+	return totnum_tp;
+}
+
+static void j2k_write_soc(opj_j2k_t *j2k) {
+	opj_cio_t *cio = j2k->cio;
+	cio_write(cio, J2K_MS_SOC, 2);
+
+/* UniPG>> */
+#ifdef USE_JPWL
+
+	/* update markers struct */
+	j2k_add_marker(j2k->cstr_info, J2K_MS_SOC, cio_tell(cio) - 2, 2);
+
+#endif /* USE_JPWL */
+/* <<UniPG */
+}
+
+static void j2k_read_soc(opj_j2k_t *j2k) {	
+	j2k->state = J2K_STATE_MHSIZ;
+	/* Index */
+	if (j2k->cstr_info) {
+		j2k->cstr_info->main_head_start = cio_tell(j2k->cio) - 2;
+		j2k->cstr_info->codestream_size = cio_numbytesleft(j2k->cio) + 2 - j2k->cstr_info->main_head_start;
+	}
+}
+
+static void j2k_write_siz(opj_j2k_t *j2k) {
+	int i;
+	int lenp, len;
+
+	opj_cio_t *cio = j2k->cio;
+	opj_image_t *image = j2k->image;
+	opj_cp_t *cp = j2k->cp;
+	
+	cio_write(cio, J2K_MS_SIZ, 2);	/* SIZ */
+	lenp = cio_tell(cio);
+	cio_skip(cio, 2);
+	cio_write(cio, cp->rsiz, 2);			/* Rsiz (capabilities) */
+	cio_write(cio, image->x1, 4);	/* Xsiz */
+	cio_write(cio, image->y1, 4);	/* Ysiz */
+	cio_write(cio, image->x0, 4);	/* X0siz */
+	cio_write(cio, image->y0, 4);	/* Y0siz */
+	cio_write(cio, cp->tdx, 4);		/* XTsiz */
+	cio_write(cio, cp->tdy, 4);		/* YTsiz */
+	cio_write(cio, cp->tx0, 4);		/* XT0siz */
+	cio_write(cio, cp->ty0, 4);		/* YT0siz */
+	cio_write(cio, image->numcomps, 2);	/* Csiz */
+	for (i = 0; i < image->numcomps; i++) {
+		cio_write(cio, image->comps[i].prec - 1 + (image->comps[i].sgnd << 7), 1);	/* Ssiz_i */
+		cio_write(cio, image->comps[i].dx, 1);	/* XRsiz_i */
+		cio_write(cio, image->comps[i].dy, 1);	/* YRsiz_i */
+	}
+	len = cio_tell(cio) - lenp;
+	cio_seek(cio, lenp);
+	cio_write(cio, len, 2);		/* Lsiz */
+	cio_seek(cio, lenp + len);
+}
+
+static void j2k_read_siz(opj_j2k_t *j2k) {
+	int len, i;
+	
+	opj_cio_t *cio = j2k->cio;
+	opj_image_t *image = j2k->image;
+	opj_cp_t *cp = j2k->cp;
+	
+	len = cio_read(cio, 2);			/* Lsiz */
+	cio_read(cio, 2);				/* Rsiz (capabilities) */
+	image->x1 = cio_read(cio, 4);	/* Xsiz */
+	image->y1 = cio_read(cio, 4);	/* Ysiz */
+	image->x0 = cio_read(cio, 4);	/* X0siz */
+	image->y0 = cio_read(cio, 4);	/* Y0siz */
+	cp->tdx = cio_read(cio, 4);		/* XTsiz */
+	cp->tdy = cio_read(cio, 4);		/* YTsiz */
+	cp->tx0 = cio_read(cio, 4);		/* XT0siz */
+	cp->ty0 = cio_read(cio, 4);		/* YT0siz */
+	
+	image->numcomps = cio_read(cio, 2);	/* Csiz */
+
+#ifdef USE_JPWL
+	if (j2k->cp->correct) {
+		/* if JPWL is on, we check whether TX errors have damaged
+		  too much the SIZ parameters */
+		if (!(image->x1 * image->y1)) {
+			opj_event_msg(j2k->cinfo, EVT_ERROR,
+				"JPWL: bad image size (%d x %d)\n",
+				image->x1, image->y1);
+			if (!JPWL_ASSUME || JPWL_ASSUME) {
+				opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
+				return;
+			}
+		}
+		if (image->numcomps != ((len - 38) / 3)) {
+			opj_event_msg(j2k->cinfo, JPWL_ASSUME ? EVT_WARNING : EVT_ERROR,
+				"JPWL: Csiz is %d => space in SIZ only for %d comps.!!!\n",
+				image->numcomps, ((len - 38) / 3));
+			if (!JPWL_ASSUME) {
+				opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
+				return;
+			}
+			/* we try to correct */
+			opj_event_msg(j2k->cinfo, EVT_WARNING, "- trying to adjust this\n");
+			if (image->numcomps < ((len - 38) / 3)) {
+				len = 38 + 3 * image->numcomps;
+				opj_event_msg(j2k->cinfo, EVT_WARNING, "- setting Lsiz to %d => HYPOTHESIS!!!\n",
+					len);				
+			} else {
+				image->numcomps = ((len - 38) / 3);
+				opj_event_msg(j2k->cinfo, EVT_WARNING, "- setting Csiz to %d => HYPOTHESIS!!!\n",
+					image->numcomps);				
+			}
+		}
+
+		/* update components number in the jpwl_exp_comps filed */
+		cp->exp_comps = image->numcomps;
+	}
+#endif /* USE_JPWL */
+
+	image->comps = (opj_image_comp_t*) opj_calloc(image->numcomps, sizeof(opj_image_comp_t));
+	for (i = 0; i < image->numcomps; i++) {
+		int tmp, w, h;
+		tmp = cio_read(cio, 1);		/* Ssiz_i */
+		image->comps[i].prec = (tmp & 0x7f) + 1;
+		image->comps[i].sgnd = tmp >> 7;
+		image->comps[i].dx = cio_read(cio, 1);	/* XRsiz_i */
+		image->comps[i].dy = cio_read(cio, 1);	/* YRsiz_i */
+		
+#ifdef USE_JPWL
+		if (j2k->cp->correct) {
+		/* if JPWL is on, we check whether TX errors have damaged
+			too much the SIZ parameters, again */
+			if (!(image->comps[i].dx * image->comps[i].dy)) {
+				opj_event_msg(j2k->cinfo, JPWL_ASSUME ? EVT_WARNING : EVT_ERROR,
+					"JPWL: bad XRsiz_%d/YRsiz_%d (%d x %d)\n",
+					i, i, image->comps[i].dx, image->comps[i].dy);
+				if (!JPWL_ASSUME) {
+					opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
+					return;
+				}
+				/* we try to correct */
+				opj_event_msg(j2k->cinfo, EVT_WARNING, "- trying to adjust them\n");
+				if (!image->comps[i].dx) {
+					image->comps[i].dx = 1;
+					opj_event_msg(j2k->cinfo, EVT_WARNING, "- setting XRsiz_%d to %d => HYPOTHESIS!!!\n",
+						i, image->comps[i].dx);
+				}
+				if (!image->comps[i].dy) {
+					image->comps[i].dy = 1;
+					opj_event_msg(j2k->cinfo, EVT_WARNING, "- setting YRsiz_%d to %d => HYPOTHESIS!!!\n",
+						i, image->comps[i].dy);
+				}
+			}
+			
+		}
+#endif /* USE_JPWL */
+
+		/* TODO: unused ? */
+		w = int_ceildiv(image->x1 - image->x0, image->comps[i].dx);
+		h = int_ceildiv(image->y1 - image->y0, image->comps[i].dy);
+
+		image->comps[i].resno_decoded = 0;	/* number of resolution decoded */
+		image->comps[i].factor = cp->reduce; /* reducing factor per component */
+	}
+	
+	cp->tw = int_ceildiv(image->x1 - cp->tx0, cp->tdx);
+	cp->th = int_ceildiv(image->y1 - cp->ty0, cp->tdy);
+
+#ifdef USE_JPWL
+	if (j2k->cp->correct) {
+		/* if JPWL is on, we check whether TX errors have damaged
+		  too much the SIZ parameters */
+		if ((cp->tw < 1) || (cp->th < 1) || (cp->tw > cp->max_tiles) || (cp->th > cp->max_tiles)) {
+			opj_event_msg(j2k->cinfo, JPWL_ASSUME ? EVT_WARNING : EVT_ERROR,
+				"JPWL: bad number of tiles (%d x %d)\n",
+				cp->tw, cp->th);
+			if (!JPWL_ASSUME) {
+				opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
+				return;
+			}
+			/* we try to correct */
+			opj_event_msg(j2k->cinfo, EVT_WARNING, "- trying to adjust them\n");
+			if (cp->tw < 1) {
+				cp->tw= 1;
+				opj_event_msg(j2k->cinfo, EVT_WARNING, "- setting %d tiles in x => HYPOTHESIS!!!\n",
+					cp->tw);
+			}
+			if (cp->tw > cp->max_tiles) {
+				cp->tw= 1;
+				opj_event_msg(j2k->cinfo, EVT_WARNING, "- too large x, increase expectance of %d\n"
+					"- setting %d tiles in x => HYPOTHESIS!!!\n",
+					cp->max_tiles, cp->tw);
+			}
+			if (cp->th < 1) {
+				cp->th= 1;
+				opj_event_msg(j2k->cinfo, EVT_WARNING, "- setting %d tiles in y => HYPOTHESIS!!!\n",
+					cp->th);
+			}
+			if (cp->th > cp->max_tiles) {
+				cp->th= 1;
+				opj_event_msg(j2k->cinfo, EVT_WARNING, "- too large y, increase expectance of %d to continue\n",
+					"- setting %d tiles in y => HYPOTHESIS!!!\n",
+					cp->max_tiles, cp->th);
+			}
+		}
+	}
+#endif /* USE_JPWL */
+
+	cp->tcps = (opj_tcp_t*) opj_calloc(cp->tw * cp->th, sizeof(opj_tcp_t));
+	cp->tileno = (int*) opj_malloc(cp->tw * cp->th * sizeof(int));
+	cp->tileno_size = 0;
+	
+#ifdef USE_JPWL
+	if (j2k->cp->correct) {
+		if (!cp->tcps) {
+			opj_event_msg(j2k->cinfo, JPWL_ASSUME ? EVT_WARNING : EVT_ERROR,
+				"JPWL: could not alloc tcps field of cp\n");
+			if (!JPWL_ASSUME || JPWL_ASSUME) {
+				opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
+				return;
+			}
+		}
+	}
+#endif /* USE_JPWL */
+
+	for (i = 0; i < cp->tw * cp->th; i++) {
+		cp->tcps[i].POC = 0;
+		cp->tcps[i].numpocs = 0;
+		cp->tcps[i].first = 1;
+	}
+	
+	/* Initialization for PPM marker */
+	cp->ppm = 0;
+	cp->ppm_data = NULL;
+	cp->ppm_data_first = NULL;
+	cp->ppm_previous = 0;
+	cp->ppm_store = 0;
+
+	j2k->default_tcp->tccps = (opj_tccp_t*) opj_calloc(image->numcomps, sizeof(opj_tccp_t));
+	for (i = 0; i < cp->tw * cp->th; i++) {
+		cp->tcps[i].tccps = (opj_tccp_t*) opj_malloc(image->numcomps * sizeof(opj_tccp_t));
+	}	
+	j2k->tile_data = (unsigned char**) opj_calloc(cp->tw * cp->th, sizeof(unsigned char*));
+	j2k->tile_len = (int*) opj_calloc(cp->tw * cp->th, sizeof(int));
+	j2k->state = J2K_STATE_MH;
+
+	/* Index */
+	if (j2k->cstr_info) {
+		opj_codestream_info_t *cstr_info = j2k->cstr_info;
+		cstr_info->image_w = image->x1 - image->x0;
+		cstr_info->image_h = image->y1 - image->y0;
+		cstr_info->numcomps = image->numcomps;
+		cstr_info->tw = cp->tw;
+		cstr_info->th = cp->th;
+		cstr_info->tile_x = cp->tdx;	
+		cstr_info->tile_y = cp->tdy;	
+		cstr_info->tile_Ox = cp->tx0;	
+		cstr_info->tile_Oy = cp->ty0;			
+		cstr_info->tile = (opj_tile_info_t*) opj_calloc(cp->tw * cp->th, sizeof(opj_tile_info_t));		
+	}
+}
+
+static void j2k_write_com(opj_j2k_t *j2k) {
+	unsigned int i;
+	int lenp, len;
+
+	if(j2k->cp->comment) {
+		opj_cio_t *cio = j2k->cio;
+		char *comment = j2k->cp->comment;
+
+		cio_write(cio, J2K_MS_COM, 2);
+		lenp = cio_tell(cio);
+		cio_skip(cio, 2);
+		cio_write(cio, 1, 2);		/* General use (IS 8859-15:1999 (Latin) values) */
+		for (i = 0; i < strlen(comment); i++) {
+			cio_write(cio, comment[i], 1);
+		}
+		len = cio_tell(cio) - lenp;
+		cio_seek(cio, lenp);
+		cio_write(cio, len, 2);
+		cio_seek(cio, lenp + len);
+	}
+}
+
+static void j2k_read_com(opj_j2k_t *j2k) {
+	int len;
+	
+	opj_cio_t *cio = j2k->cio;
+
+	len = cio_read(cio, 2);
+	cio_skip(cio, len - 2);  
+}
+
+static void j2k_write_cox(opj_j2k_t *j2k, int compno) {
+	int i;
+
+	opj_cp_t *cp = j2k->cp;
+	opj_tcp_t *tcp = &cp->tcps[j2k->curtileno];
+	opj_tccp_t *tccp = &tcp->tccps[compno];
+	opj_cio_t *cio = j2k->cio;
+	
+	cio_write(cio, tccp->numresolutions - 1, 1);	/* SPcox (D) */
+	cio_write(cio, tccp->cblkw - 2, 1);				/* SPcox (E) */
+	cio_write(cio, tccp->cblkh - 2, 1);				/* SPcox (F) */
+	cio_write(cio, tccp->cblksty, 1);				/* SPcox (G) */
+	cio_write(cio, tccp->qmfbid, 1);				/* SPcox (H) */
+	
+	if (tccp->csty & J2K_CCP_CSTY_PRT) {
+		for (i = 0; i < tccp->numresolutions; i++) {
+			cio_write(cio, tccp->prcw[i] + (tccp->prch[i] << 4), 1);	/* SPcox (I_i) */
+		}
+	}
+}
+
+static void j2k_read_cox(opj_j2k_t *j2k, int compno) {
+	int i;
+
+	opj_cp_t *cp = j2k->cp;
+	opj_tcp_t *tcp = j2k->state == J2K_STATE_TPH ? &cp->tcps[j2k->curtileno] : j2k->default_tcp;
+	opj_tccp_t *tccp = &tcp->tccps[compno];
+	opj_cio_t *cio = j2k->cio;
+
+	tccp->numresolutions = cio_read(cio, 1) + 1;	/* SPcox (D) */
+
+	// If user wants to remove more resolutions than the codestream contains, return error
+	if (cp->reduce >= tccp->numresolutions) {
+		opj_event_msg(j2k->cinfo, EVT_ERROR, "Error decoding component %d.\nThe number of resolutions to remove is higher than the number "
+					"of resolutions of this component\nModify the cp_reduce parameter.\n\n", compno);
+		j2k->state |= J2K_STATE_ERR;
+	}
+
+	tccp->cblkw = cio_read(cio, 1) + 2;	/* SPcox (E) */
+	tccp->cblkh = cio_read(cio, 1) + 2;	/* SPcox (F) */
+	tccp->cblksty = cio_read(cio, 1);	/* SPcox (G) */
+	tccp->qmfbid = cio_read(cio, 1);	/* SPcox (H) */
+	if (tccp->csty & J2K_CP_CSTY_PRT) {
+		for (i = 0; i < tccp->numresolutions; i++) {
+			int tmp = cio_read(cio, 1);	/* SPcox (I_i) */
+			tccp->prcw[i] = tmp & 0xf;
+			tccp->prch[i] = tmp >> 4;
+		}
+	}
+
+	/* INDEX >> */
+	if(j2k->cstr_info && compno == 0) {
+		for (i = 0; i < tccp->numresolutions; i++) {
+			if (tccp->csty & J2K_CP_CSTY_PRT) {
+				j2k->cstr_info->tile[j2k->curtileno].pdx[i] = tccp->prcw[i];
+				j2k->cstr_info->tile[j2k->curtileno].pdy[i] = tccp->prch[i];
+			}
+			else {
+				j2k->cstr_info->tile[j2k->curtileno].pdx[i] = 15;
+				j2k->cstr_info->tile[j2k->curtileno].pdx[i] = 15;
+			}
+		}
+	}
+	/* << INDEX */
+}
+
+static void j2k_write_cod(opj_j2k_t *j2k) {
+	opj_cp_t *cp = NULL;
+	opj_tcp_t *tcp = NULL;
+	int lenp, len;
+
+	opj_cio_t *cio = j2k->cio;
+	
+	cio_write(cio, J2K_MS_COD, 2);	/* COD */
+	
+	lenp = cio_tell(cio);
+	cio_skip(cio, 2);
+	
+	cp = j2k->cp;
+	tcp = &cp->tcps[j2k->curtileno];
+
+	cio_write(cio, tcp->csty, 1);		/* Scod */
+	cio_write(cio, tcp->prg, 1);		/* SGcod (A) */
+	cio_write(cio, tcp->numlayers, 2);	/* SGcod (B) */
+	cio_write(cio, tcp->mct, 1);		/* SGcod (C) */
+	
+	j2k_write_cox(j2k, 0);
+	len = cio_tell(cio) - lenp;
+	cio_seek(cio, lenp);
+	cio_write(cio, len, 2);		/* Lcod */
+	cio_seek(cio, lenp + len);
+}
+
+static void j2k_read_cod(opj_j2k_t *j2k) {
+	int len, i, pos;
+	
+	opj_cio_t *cio = j2k->cio;
+	opj_cp_t *cp = j2k->cp;
+	opj_tcp_t *tcp = j2k->state == J2K_STATE_TPH ? &cp->tcps[j2k->curtileno] : j2k->default_tcp;
+	opj_image_t *image = j2k->image;
+	
+	len = cio_read(cio, 2);				/* Lcod */
+	tcp->csty = cio_read(cio, 1);		/* Scod */
+	tcp->prg = (OPJ_PROG_ORDER)cio_read(cio, 1);		/* SGcod (A) */
+	tcp->numlayers = cio_read(cio, 2);	/* SGcod (B) */
+	tcp->mct = cio_read(cio, 1);		/* SGcod (C) */
+	
+	pos = cio_tell(cio);
+	for (i = 0; i < image->numcomps; i++) {
+		tcp->tccps[i].csty = tcp->csty & J2K_CP_CSTY_PRT;
+		cio_seek(cio, pos);
+		j2k_read_cox(j2k, i);
+	}
+
+	/* Index */
+	if (j2k->cstr_info) {
+		opj_codestream_info_t *cstr_info = j2k->cstr_info;
+		cstr_info->prog = tcp->prg;
+		cstr_info->numlayers = tcp->numlayers;
+		cstr_info->numdecompos = (int*) opj_malloc(image->numcomps * sizeof(int));
+		for (i = 0; i < image->numcomps; i++) {
+			cstr_info->numdecompos[i] = tcp->tccps[i].numresolutions - 1;
+		}
+	}
+}
+
+static void j2k_write_coc(opj_j2k_t *j2k, int compno) {
+	int lenp, len;
+
+	opj_cp_t *cp = j2k->cp;
+	opj_tcp_t *tcp = &cp->tcps[j2k->curtileno];
+	opj_image_t *image = j2k->image;
+	opj_cio_t *cio = j2k->cio;
+	
+	cio_write(cio, J2K_MS_COC, 2);	/* COC */
+	lenp = cio_tell(cio);
+	cio_skip(cio, 2);
+	cio_write(cio, compno, image->numcomps <= 256 ? 1 : 2);	/* Ccoc */
+	cio_write(cio, tcp->tccps[compno].csty, 1);	/* Scoc */
+	j2k_write_cox(j2k, compno);
+	len = cio_tell(cio) - lenp;
+	cio_seek(cio, lenp);
+	cio_write(cio, len, 2);			/* Lcoc */
+	cio_seek(cio, lenp + len);
+}
+
+static void j2k_read_coc(opj_j2k_t *j2k) {
+	int len, compno;
+
+	opj_cp_t *cp = j2k->cp;
+	opj_tcp_t *tcp = j2k->state == J2K_STATE_TPH ? &cp->tcps[j2k->curtileno] : j2k->default_tcp;
+	opj_image_t *image = j2k->image;
+	opj_cio_t *cio = j2k->cio;
+	
+	len = cio_read(cio, 2);		/* Lcoc */
+	compno = cio_read(cio, image->numcomps <= 256 ? 1 : 2);	/* Ccoc */
+	tcp->tccps[compno].csty = cio_read(cio, 1);	/* Scoc */
+	j2k_read_cox(j2k, compno);
+}
+
+static void j2k_write_qcx(opj_j2k_t *j2k, int compno) {
+	int bandno, numbands;
+	int expn, mant;
+	
+	opj_cp_t *cp = j2k->cp;
+	opj_tcp_t *tcp = &cp->tcps[j2k->curtileno];
+	opj_tccp_t *tccp = &tcp->tccps[compno];
+	opj_cio_t *cio = j2k->cio;
+	
+	cio_write(cio, tccp->qntsty + (tccp->numgbits << 5), 1);	/* Sqcx */
+	numbands = tccp->qntsty == J2K_CCP_QNTSTY_SIQNT ? 1 : tccp->numresolutions * 3 - 2;
+	
+	for (bandno = 0; bandno < numbands; bandno++) {
+		expn = tccp->stepsizes[bandno].expn;
+		mant = tccp->stepsizes[bandno].mant;
+		
+		if (tccp->qntsty == J2K_CCP_QNTSTY_NOQNT) {
+			cio_write(cio, expn << 3, 1);	/* SPqcx_i */
+		} else {
+			cio_write(cio, (expn << 11) + mant, 2);	/* SPqcx_i */
+		}
+	}
+}
+
+static void j2k_read_qcx(opj_j2k_t *j2k, int compno, int len) {
+	int tmp;
+	int bandno, numbands;
+
+	opj_cp_t *cp = j2k->cp;
+	opj_tcp_t *tcp = j2k->state == J2K_STATE_TPH ? &cp->tcps[j2k->curtileno] : j2k->default_tcp;
+	opj_tccp_t *tccp = &tcp->tccps[compno];
+	opj_cio_t *cio = j2k->cio;
+
+	tmp = cio_read(cio, 1);		/* Sqcx */
+	tccp->qntsty = tmp & 0x1f;
+	tccp->numgbits = tmp >> 5;
+	numbands = (tccp->qntsty == J2K_CCP_QNTSTY_SIQNT) ? 
+		1 : ((tccp->qntsty == J2K_CCP_QNTSTY_NOQNT) ? len - 1 : (len - 1) / 2);
+
+#ifdef USE_JPWL
+	if (j2k->cp->correct) {
+
+		/* if JPWL is on, we check whether there are too many subbands */
+		if ((numbands < 0) || (numbands >= J2K_MAXBANDS)) {
+			opj_event_msg(j2k->cinfo, JPWL_ASSUME ? EVT_WARNING : EVT_ERROR,
+				"JPWL: bad number of subbands in Sqcx (%d)\n",
+				numbands);
+			if (!JPWL_ASSUME) {
+				opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
+				return;
+			}
+			/* we try to correct */
+			numbands = 1;
+			opj_event_msg(j2k->cinfo, EVT_WARNING, "- trying to adjust them\n"
+				"- setting number of bands to %d => HYPOTHESIS!!!\n",
+				numbands);
+		};
+
+	};
+#endif /* USE_JPWL */
+
+	for (bandno = 0; bandno < numbands; bandno++) {
+		int expn, mant;
+		if (tccp->qntsty == J2K_CCP_QNTSTY_NOQNT) {
+			expn = cio_read(cio, 1) >> 3;	/* SPqcx_i */
+			mant = 0;
+		} else {
+			tmp = cio_read(cio, 2);	/* SPqcx_i */
+			expn = tmp >> 11;
+			mant = tmp & 0x7ff;
+		}
+		tccp->stepsizes[bandno].expn = expn;
+		tccp->stepsizes[bandno].mant = mant;
+	}
+	
+	/* Add Antonin : if scalar_derived -> compute other stepsizes */
+	if (tccp->qntsty == J2K_CCP_QNTSTY_SIQNT) {
+		for (bandno = 1; bandno < J2K_MAXBANDS; bandno++) {
+			tccp->stepsizes[bandno].expn = 
+				((tccp->stepsizes[0].expn) - ((bandno - 1) / 3) > 0) ? 
+					(tccp->stepsizes[0].expn) - ((bandno - 1) / 3) : 0;
+			tccp->stepsizes[bandno].mant = tccp->stepsizes[0].mant;
+		}
+	}
+	/* ddA */
+}
+
+static void j2k_write_qcd(opj_j2k_t *j2k) {
+	int lenp, len;
+
+	opj_cio_t *cio = j2k->cio;
+	
+	cio_write(cio, J2K_MS_QCD, 2);	/* QCD */
+	lenp = cio_tell(cio);
+	cio_skip(cio, 2);
+	j2k_write_qcx(j2k, 0);
+	len = cio_tell(cio) - lenp;
+	cio_seek(cio, lenp);
+	cio_write(cio, len, 2);			/* Lqcd */
+	cio_seek(cio, lenp + len);
+}
+
+static void j2k_read_qcd(opj_j2k_t *j2k) {
+	int len, i, pos;
+
+	opj_cio_t *cio = j2k->cio;
+	opj_image_t *image = j2k->image;
+	
+	len = cio_read(cio, 2);		/* Lqcd */
+	pos = cio_tell(cio);
+	for (i = 0; i < image->numcomps; i++) {
+		cio_seek(cio, pos);
+		j2k_read_qcx(j2k, i, len - 2);
+	}
+}
+
+static void j2k_write_qcc(opj_j2k_t *j2k, int compno) {
+	int lenp, len;
+
+	opj_cio_t *cio = j2k->cio;
+	
+	cio_write(cio, J2K_MS_QCC, 2);	/* QCC */
+	lenp = cio_tell(cio);
+	cio_skip(cio, 2);
+	cio_write(cio, compno, j2k->image->numcomps <= 256 ? 1 : 2);	/* Cqcc */
+	j2k_write_qcx(j2k, compno);
+	len = cio_tell(cio) - lenp;
+	cio_seek(cio, lenp);
+	cio_write(cio, len, 2);			/* Lqcc */
+	cio_seek(cio, lenp + len);
+}
+
+static void j2k_read_qcc(opj_j2k_t *j2k) {
+	int len, compno;
+	int numcomp = j2k->image->numcomps;
+	opj_cio_t *cio = j2k->cio;
+	
+	len = cio_read(cio, 2);	/* Lqcc */
+	compno = cio_read(cio, numcomp <= 256 ? 1 : 2);	/* Cqcc */
+
+#ifdef USE_JPWL
+	if (j2k->cp->correct) {
+
+		static int backup_compno = 0;
+
+		/* compno is negative or larger than the number of components!!! */
+		if ((compno < 0) || (compno >= numcomp)) {
+			opj_event_msg(j2k->cinfo, EVT_ERROR,
+				"JPWL: bad component number in QCC (%d out of a maximum of %d)\n",
+				compno, numcomp);
+			if (!JPWL_ASSUME) {
+				opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
+				return;
+			}
+			/* we try to correct */
+			compno = backup_compno % numcomp;
+			opj_event_msg(j2k->cinfo, EVT_WARNING, "- trying to adjust this\n"
+				"- setting component number to %d\n",
+				compno);
+		}
+
+		/* keep your private count of tiles */
+		backup_compno++;
+	};
+#endif /* USE_JPWL */
+
+	j2k_read_qcx(j2k, compno, len - 2 - (numcomp <= 256 ? 1 : 2));
+}
+
+static void j2k_write_poc(opj_j2k_t *j2k) {
+	int len, numpchgs, i;
+
+	int numcomps = j2k->image->numcomps;
+	
+	opj_cp_t *cp = j2k->cp;
+	opj_tcp_t *tcp = &cp->tcps[j2k->curtileno];
+	opj_tccp_t *tccp = &tcp->tccps[0];
+	opj_cio_t *cio = j2k->cio;
+
+	numpchgs = 1 + tcp->numpocs;
+	cio_write(cio, J2K_MS_POC, 2);	/* POC  */
+	len = 2 + (5 + 2 * (numcomps <= 256 ? 1 : 2)) * numpchgs;
+	cio_write(cio, len, 2);		/* Lpoc */
+	for (i = 0; i < numpchgs; i++) {
+		opj_poc_t *poc = &tcp->pocs[i];
+		cio_write(cio, poc->resno0, 1);	/* RSpoc_i */
+		cio_write(cio, poc->compno0, (numcomps <= 256 ? 1 : 2));	/* CSpoc_i */
+		cio_write(cio, poc->layno1, 2);	/* LYEpoc_i */
+		poc->layno1 = int_min(poc->layno1, tcp->numlayers);
+		cio_write(cio, poc->resno1, 1);	/* REpoc_i */
+		poc->resno1 = int_min(poc->resno1, tccp->numresolutions);
+		cio_write(cio, poc->compno1, (numcomps <= 256 ? 1 : 2));	/* CEpoc_i */
+		poc->compno1 = int_min(poc->compno1, numcomps);
+		cio_write(cio, poc->prg, 1);	/* Ppoc_i */
+	}
+}
+
+static void j2k_read_poc(opj_j2k_t *j2k) {
+	int len, numpchgs, i, old_poc;
+
+	int numcomps = j2k->image->numcomps;
+	
+	opj_cp_t *cp = j2k->cp;
+	opj_tcp_t *tcp = j2k->state == J2K_STATE_TPH ? &cp->tcps[j2k->curtileno] : j2k->default_tcp;
+	opj_cio_t *cio = j2k->cio;
+	
+	old_poc = tcp->POC ? tcp->numpocs + 1 : 0;
+	tcp->POC = 1;
+	len = cio_read(cio, 2);		/* Lpoc */
+	numpchgs = (len - 2) / (5 + 2 * (numcomps <= 256 ? 1 : 2));
+	
+	for (i = old_poc; i < numpchgs + old_poc; i++) {
+		opj_poc_t *poc;
+		poc = &tcp->pocs[i];
+		poc->resno0 = cio_read(cio, 1);	/* RSpoc_i */
+		poc->compno0 = cio_read(cio, numcomps <= 256 ? 1 : 2);	/* CSpoc_i */
+		poc->layno1 = cio_read(cio, 2);    /* LYEpoc_i */
+		poc->resno1 = cio_read(cio, 1);    /* REpoc_i */
+		poc->compno1 = int_min(
+			cio_read(cio, numcomps <= 256 ? 1 : 2), (unsigned int) numcomps);	/* CEpoc_i */
+		poc->prg = (OPJ_PROG_ORDER)cio_read(cio, 1);	/* Ppoc_i */
+	}
+	
+	tcp->numpocs = numpchgs + old_poc - 1;
+}
+
+static void j2k_read_crg(opj_j2k_t *j2k) {
+	int len, i, Xcrg_i, Ycrg_i;
+	
+	opj_cio_t *cio = j2k->cio;
+	int numcomps = j2k->image->numcomps;
+	
+	len = cio_read(cio, 2);			/* Lcrg */
+	for (i = 0; i < numcomps; i++) {
+		Xcrg_i = cio_read(cio, 2);	/* Xcrg_i */
+		Ycrg_i = cio_read(cio, 2);	/* Ycrg_i */
+	}
+}
+
+static void j2k_read_tlm(opj_j2k_t *j2k) {
+	int len, Ztlm, Stlm, ST, SP, tile_tlm, i;
+	long int Ttlm_i, Ptlm_i;
+
+	opj_cio_t *cio = j2k->cio;
+	
+	len = cio_read(cio, 2);		/* Ltlm */
+	Ztlm = cio_read(cio, 1);	/* Ztlm */
+	Stlm = cio_read(cio, 1);	/* Stlm */
+	ST = ((Stlm >> 4) & 0x01) + ((Stlm >> 4) & 0x02);
+	SP = (Stlm >> 6) & 0x01;
+	tile_tlm = (len - 4) / ((SP + 1) * 2 + ST);
+	for (i = 0; i < tile_tlm; i++) {
+		Ttlm_i = cio_read(cio, ST);	/* Ttlm_i */
+		Ptlm_i = cio_read(cio, SP ? 4 : 2);	/* Ptlm_i */
+	}
+}
+
+static void j2k_read_plm(opj_j2k_t *j2k) {
+	int len, i, Zplm, Nplm, add, packet_len = 0;
+	
+	opj_cio_t *cio = j2k->cio;
+
+	len = cio_read(cio, 2);		/* Lplm */
+	Zplm = cio_read(cio, 1);	/* Zplm */
+	len -= 3;
+	while (len > 0) {
+		Nplm = cio_read(cio, 4);		/* Nplm */
+		len -= 4;
+		for (i = Nplm; i > 0; i--) {
+			add = cio_read(cio, 1);
+			len--;
+			packet_len = (packet_len << 7) + add;	/* Iplm_ij */
+			if ((add & 0x80) == 0) {
+				/* New packet */
+				packet_len = 0;
+			}
+			if (len <= 0)
+				break;
+		}
+	}
+}
+
+static void j2k_read_plt(opj_j2k_t *j2k) {
+	int len, i, Zplt, packet_len = 0, add;
+	
+	opj_cio_t *cio = j2k->cio;
+	
+	len = cio_read(cio, 2);		/* Lplt */
+	Zplt = cio_read(cio, 1);	/* Zplt */
+	for (i = len - 3; i > 0; i--) {
+		add = cio_read(cio, 1);
+		packet_len = (packet_len << 7) + add;	/* Iplt_i */
+		if ((add & 0x80) == 0) {
+			/* New packet */
+			packet_len = 0;
+		}
+	}
+}
+
+static void j2k_read_ppm(opj_j2k_t *j2k) {
+	int len, Z_ppm, i, j;
+	int N_ppm;
+
+	opj_cp_t *cp = j2k->cp;
+	opj_cio_t *cio = j2k->cio;
+	
+	len = cio_read(cio, 2);
+	cp->ppm = 1;
+	
+	Z_ppm = cio_read(cio, 1);	/* Z_ppm */
+	len -= 3;
+	while (len > 0) {
+		if (cp->ppm_previous == 0) {
+			N_ppm = cio_read(cio, 4);	/* N_ppm */
+			len -= 4;
+		} else {
+			N_ppm = cp->ppm_previous;
+		}
+		j = cp->ppm_store;
+		if (Z_ppm == 0) {	/* First PPM marker */
+			cp->ppm_data = (unsigned char *) opj_malloc(N_ppm * sizeof(unsigned char));
+			cp->ppm_data_first = cp->ppm_data;
+			cp->ppm_len = N_ppm;
+		} else {			/* NON-first PPM marker */
+			cp->ppm_data = (unsigned char *) opj_realloc(cp->ppm_data, (N_ppm +	cp->ppm_store) * sizeof(unsigned char));
+
+#ifdef USE_JPWL
+			/* this memory allocation check could be done even in non-JPWL cases */
+			if (cp->correct) {
+				if (!cp->ppm_data) {
+					opj_event_msg(j2k->cinfo, EVT_ERROR,
+						"JPWL: failed memory allocation during PPM marker parsing (pos. %x)\n",
+						cio_tell(cio));
+					if (!JPWL_ASSUME || JPWL_ASSUME) {
+						opj_free(cp->ppm_data);
+						opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
+						return;
+					}
+				}
+			}
+#endif
+
+			cp->ppm_data_first = cp->ppm_data;
+			cp->ppm_len = N_ppm + cp->ppm_store;
+		}
+		for (i = N_ppm; i > 0; i--) {	/* Read packet header */
+			cp->ppm_data[j] = cio_read(cio, 1);
+			j++;
+			len--;
+			if (len == 0)
+				break;			/* Case of non-finished packet header in present marker but finished in next one */
+		}
+		cp->ppm_previous = i - 1;
+		cp->ppm_store = j;
+	}
+}
+
+static void j2k_read_ppt(opj_j2k_t *j2k) {
+	int len, Z_ppt, i, j = 0;
+
+	opj_cp_t *cp = j2k->cp;
+	opj_tcp_t *tcp = cp->tcps + j2k->curtileno;
+	opj_cio_t *cio = j2k->cio;
+
+	len = cio_read(cio, 2);
+	Z_ppt = cio_read(cio, 1);
+	tcp->ppt = 1;
+	if (Z_ppt == 0) {		/* First PPT marker */
+		tcp->ppt_data = (unsigned char *) opj_malloc((len - 3) * sizeof(unsigned char));
+		tcp->ppt_data_first = tcp->ppt_data;
+		tcp->ppt_store = 0;
+		tcp->ppt_len = len - 3;
+	} else {			/* NON-first PPT marker */
+		tcp->ppt_data =	(unsigned char *) opj_realloc(tcp->ppt_data, (len - 3 + tcp->ppt_store) * sizeof(unsigned char));
+		tcp->ppt_data_first = tcp->ppt_data;
+		tcp->ppt_len = len - 3 + tcp->ppt_store;
+	}
+	j = tcp->ppt_store;
+	for (i = len - 3; i > 0; i--) {
+		tcp->ppt_data[j] = cio_read(cio, 1);
+		j++;
+	}
+	tcp->ppt_store = j;
+}
+
+static void j2k_write_tlm(opj_j2k_t *j2k){
+	int lenp;
+	opj_cio_t *cio = j2k->cio;
+	j2k->tlm_start = cio_tell(cio);
+	cio_write(cio, J2K_MS_TLM, 2);/* TLM */
+	lenp = 4 + (5*j2k->totnum_tp);
+	cio_write(cio,lenp,2);				/* Ltlm */
+	cio_write(cio, 0,1);					/* Ztlm=0*/
+	cio_write(cio,80,1);					/* Stlm ST=1(8bits-255 tiles max),SP=1(Ptlm=32bits) */
+	cio_skip(cio,5*j2k->totnum_tp);
+}
+
+static void j2k_write_sot(opj_j2k_t *j2k) {
+	int lenp, len;
+
+	opj_cio_t *cio = j2k->cio;
+
+	j2k->sot_start = cio_tell(cio);
+	cio_write(cio, J2K_MS_SOT, 2);		/* SOT */
+	lenp = cio_tell(cio);
+	cio_skip(cio, 2);					/* Lsot (further) */
+	cio_write(cio, j2k->curtileno, 2);	/* Isot */
+	cio_skip(cio, 4);					/* Psot (further in j2k_write_sod) */
+	cio_write(cio, j2k->cur_tp_num , 1);	/* TPsot */
+	cio_write(cio, j2k->cur_totnum_tp[j2k->curtileno], 1);		/* TNsot */
+	len = cio_tell(cio) - lenp;
+	cio_seek(cio, lenp);
+	cio_write(cio, len, 2);				/* Lsot */
+	cio_seek(cio, lenp + len);
+
+	/* UniPG>> */
+#ifdef USE_JPWL
+	/* update markers struct */
+	j2k_add_marker(j2k->cstr_info, J2K_MS_SOT, j2k->sot_start, len + 2);
+#endif /* USE_JPWL */
+	/* <<UniPG */
+}
+
+static void j2k_read_sot(opj_j2k_t *j2k) {
+	int len, tileno, totlen, partno, numparts, i;
+	opj_tcp_t *tcp = NULL;
+	char status = 0;
+
+	opj_cp_t *cp = j2k->cp;
+	opj_cio_t *cio = j2k->cio;
+
+	len = cio_read(cio, 2);
+	tileno = cio_read(cio, 2);
+
+#ifdef USE_JPWL
+	if (j2k->cp->correct) {
+
+		static int backup_tileno = 0;
+
+		/* tileno is negative or larger than the number of tiles!!! */
+		if ((tileno < 0) || (tileno > (cp->tw * cp->th))) {
+			opj_event_msg(j2k->cinfo, EVT_ERROR,
+				"JPWL: bad tile number (%d out of a maximum of %d)\n",
+				tileno, (cp->tw * cp->th));
+			if (!JPWL_ASSUME) {
+				opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
+				return;
+			}
+			/* we try to correct */
+			tileno = backup_tileno;
+			opj_event_msg(j2k->cinfo, EVT_WARNING, "- trying to adjust this\n"
+				"- setting tile number to %d\n",
+				tileno);
+		}
+
+		/* keep your private count of tiles */
+		backup_tileno++;
+	};
+#endif /* USE_JPWL */
+	
+	if (cp->tileno_size == 0) {
+		cp->tileno[cp->tileno_size] = tileno;
+		cp->tileno_size++;
+	} else {
+		i = 0;
+		while (i < cp->tileno_size && status == 0) {
+			status = cp->tileno[i] == tileno ? 1 : 0;
+			i++;
+		}
+		if (status == 0) {
+			cp->tileno[cp->tileno_size] = tileno;
+			cp->tileno_size++;
+		}
+	}
+	
+	totlen = cio_read(cio, 4);
+
+#ifdef USE_JPWL
+	if (j2k->cp->correct) {
+
+		/* totlen is negative or larger than the bytes left!!! */
+		if ((totlen < 0) || (totlen > (cio_numbytesleft(cio) + 8))) {
+			opj_event_msg(j2k->cinfo, EVT_ERROR,
+				"JPWL: bad tile byte size (%d bytes against %d bytes left)\n",
+				totlen, cio_numbytesleft(cio) + 8);
+			if (!JPWL_ASSUME) {
+				opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
+				return;
+			}
+			/* we try to correct */
+			totlen = 0;
+			opj_event_msg(j2k->cinfo, EVT_WARNING, "- trying to adjust this\n"
+				"- setting Psot to %d => assuming it is the last tile\n",
+				totlen);
+		}
+
+	};
+#endif /* USE_JPWL */
+
+	if (!totlen)
+		totlen = cio_numbytesleft(cio) + 8;
+	
+	partno = cio_read(cio, 1);
+	numparts = cio_read(cio, 1);
+	
+	j2k->curtileno = tileno;
+	j2k->cur_tp_num = partno;
+	j2k->eot = cio_getbp(cio) - 12 + totlen;
+	j2k->state = J2K_STATE_TPH;
+	tcp = &cp->tcps[j2k->curtileno];
+
+	/* Index */
+	if (j2k->cstr_info) {
+		if (tcp->first) {
+			if (tileno == 0) 
+				j2k->cstr_info->main_head_end = cio_tell(cio) - 13;
+			j2k->cstr_info->tile[tileno].tileno = tileno;
+			j2k->cstr_info->tile[tileno].start_pos = cio_tell(cio) - 12;
+			j2k->cstr_info->tile[tileno].end_pos = j2k->cstr_info->tile[tileno].start_pos + totlen - 1;				
+			j2k->cstr_info->tile[tileno].num_tps = numparts;
+			if (numparts)
+				j2k->cstr_info->tile[tileno].tp = (opj_tp_info_t *) opj_malloc(numparts * sizeof(opj_tp_info_t));
+			else
+				j2k->cstr_info->tile[tileno].tp = (opj_tp_info_t *) opj_malloc(10 * sizeof(opj_tp_info_t)); // Fixme (10)
+		}
+		else {
+			j2k->cstr_info->tile[tileno].end_pos += totlen;
+		}		
+		j2k->cstr_info->tile[tileno].tp[partno].tp_start_pos = cio_tell(cio) - 12;
+		j2k->cstr_info->tile[tileno].tp[partno].tp_end_pos = 
+			j2k->cstr_info->tile[tileno].tp[partno].tp_start_pos + totlen - 1;
+	}
+	
+	if (tcp->first == 1) {		
+		/* Initialization PPT */
+		opj_tccp_t *tmp = tcp->tccps;
+		memcpy(tcp, j2k->default_tcp, sizeof(opj_tcp_t));
+		tcp->ppt = 0;
+		tcp->ppt_data = NULL;
+		tcp->ppt_data_first = NULL;
+		tcp->tccps = tmp;
+
+		for (i = 0; i < j2k->image->numcomps; i++) {
+			tcp->tccps[i] = j2k->default_tcp->tccps[i];
+		}
+		cp->tcps[j2k->curtileno].first = 0;
+	}
+}
+
+static void j2k_write_sod(opj_j2k_t *j2k, void *tile_coder) {
+	int l, layno;
+	int totlen;
+	opj_tcp_t *tcp = NULL;
+	opj_codestream_info_t *cstr_info = NULL;
+	
+	opj_tcd_t *tcd = (opj_tcd_t*)tile_coder;	/* cast is needed because of conflicts in header inclusions */
+	opj_cp_t *cp = j2k->cp;
+	opj_cio_t *cio = j2k->cio;
+
+	tcd->tp_num = j2k->tp_num ;
+	tcd->cur_tp_num = j2k->cur_tp_num;
+	
+	cio_write(cio, J2K_MS_SOD, 2);
+	if (j2k->curtileno == 0) {
+		j2k->sod_start = cio_tell(cio) + j2k->pos_correction;
+	}
+
+	/* INDEX >> */
+	cstr_info = j2k->cstr_info;
+	if (cstr_info) {
+		if (!j2k->cur_tp_num ) {
+			cstr_info->tile[j2k->curtileno].end_header = cio_tell(cio) + j2k->pos_correction - 1;
+			j2k->cstr_info->tile[j2k->curtileno].tileno = j2k->curtileno;
+		}
+		else{
+			if(cstr_info->tile[j2k->curtileno].packet[cstr_info->packno - 1].end_pos < cio_tell(cio))
+				cstr_info->tile[j2k->curtileno].packet[cstr_info->packno].start_pos = cio_tell(cio);
+		}
+		/* UniPG>> */
+#ifdef USE_JPWL
+		/* update markers struct */
+		j2k_add_marker(j2k->cstr_info, J2K_MS_SOD, j2k->sod_start, 2);
+#endif /* USE_JPWL */
+		/* <<UniPG */
+	}
+	/* << INDEX */
+	
+	tcp = &cp->tcps[j2k->curtileno];
+	for (layno = 0; layno < tcp->numlayers; layno++) {
+		tcp->rates[layno] -= tcp->rates[layno] ? (j2k->sod_start / (cp->th * cp->tw)) : 0;
+	}
+	if(j2k->cur_tp_num == 0){
+		tcd->tcd_image->tiles->packno = 0;
+		if(cstr_info)
+			cstr_info->packno = 0;
+	}
+	
+	l = tcd_encode_tile(tcd, j2k->curtileno, cio_getbp(cio), cio_numbytesleft(cio) - 2, cstr_info);
+	
+	/* Writing Psot in SOT marker */
+	totlen = cio_tell(cio) + l - j2k->sot_start;
+	cio_seek(cio, j2k->sot_start + 6);
+	cio_write(cio, totlen, 4);
+	cio_seek(cio, j2k->sot_start + totlen);
+	/* Writing Ttlm and Ptlm in TLM marker */
+	if(cp->cinema){
+		cio_seek(cio, j2k->tlm_start + 6 + (5*j2k->cur_tp_num));
+		cio_write(cio, j2k->curtileno, 1);
+		cio_write(cio, totlen, 4);
+	}
+	cio_seek(cio, j2k->sot_start + totlen);
+}
+
+static void j2k_read_sod(opj_j2k_t *j2k) {
+	int len, truncate = 0, i;
+	unsigned char *data = NULL, *data_ptr = NULL;
+
+	opj_cio_t *cio = j2k->cio;
+	int curtileno = j2k->curtileno;
+
+	/* Index */
+	if (j2k->cstr_info) {
+		j2k->cstr_info->tile[j2k->curtileno].tp[j2k->cur_tp_num].tp_end_header =
+			cio_tell(cio) + j2k->pos_correction - 1;
+		if (j2k->cur_tp_num == 0)
+			j2k->cstr_info->tile[j2k->curtileno].end_header = cio_tell(cio) + j2k->pos_correction - 1;
+		j2k->cstr_info->packno = 0;
+	}
+	
+	len = int_min(j2k->eot - cio_getbp(cio), cio_numbytesleft(cio) + 1);
+
+	if (len == cio_numbytesleft(cio) + 1) {
+		truncate = 1;		/* Case of a truncate codestream */
+	}	
+
+	data = j2k->tile_data[curtileno];
+	data = (unsigned char*) opj_realloc(data, (j2k->tile_len[curtileno] + len) * sizeof(unsigned char));
+
+	data_ptr = data + j2k->tile_len[curtileno];
+	for (i = 0; i < len; i++) {
+		data_ptr[i] = cio_read(cio, 1);
+	}
+
+	j2k->tile_len[curtileno] += len;
+	j2k->tile_data[curtileno] = data;
+	
+	if (!truncate) {
+		j2k->state = J2K_STATE_TPHSOT;
+	} else {
+		j2k->state = J2K_STATE_NEOC;	/* RAJOUTE !! */
+	}
+	j2k->cur_tp_num++;
+}
+
+static void j2k_write_rgn(opj_j2k_t *j2k, int compno, int tileno) {
+	opj_cp_t *cp = j2k->cp;
+	opj_tcp_t *tcp = &cp->tcps[tileno];
+	opj_cio_t *cio = j2k->cio;
+	int numcomps = j2k->image->numcomps;
+	
+	cio_write(cio, J2K_MS_RGN, 2);						/* RGN  */
+	cio_write(cio, numcomps <= 256 ? 5 : 6, 2);			/* Lrgn */
+	cio_write(cio, compno, numcomps <= 256 ? 1 : 2);	/* Crgn */
+	cio_write(cio, 0, 1);								/* Srgn */
+	cio_write(cio, tcp->tccps[compno].roishift, 1);		/* SPrgn */
+}
+
+static void j2k_read_rgn(opj_j2k_t *j2k) {
+	int len, compno, roisty;
+
+	opj_cp_t *cp = j2k->cp;
+	opj_tcp_t *tcp = j2k->state == J2K_STATE_TPH ? &cp->tcps[j2k->curtileno] : j2k->default_tcp;
+	opj_cio_t *cio = j2k->cio;
+	int numcomps = j2k->image->numcomps;
+
+	len = cio_read(cio, 2);										/* Lrgn */
+	compno = cio_read(cio, numcomps <= 256 ? 1 : 2);			/* Crgn */
+	roisty = cio_read(cio, 1);									/* Srgn */
+
+#ifdef USE_JPWL
+	if (j2k->cp->correct) {
+		/* totlen is negative or larger than the bytes left!!! */
+		if (compno >= numcomps) {
+			opj_event_msg(j2k->cinfo, EVT_ERROR,
+				"JPWL: bad component number in RGN (%d when there are only %d)\n",
+				compno, numcomps);
+			if (!JPWL_ASSUME || JPWL_ASSUME) {
+				opj_event_msg(j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
+				return;
+			}
+		}
+	};
+#endif /* USE_JPWL */
+
+	tcp->tccps[compno].roishift = cio_read(cio, 1);				/* SPrgn */
+}
+
+static void j2k_write_eoc(opj_j2k_t *j2k) {
+	opj_cio_t *cio = j2k->cio;
+	/* opj_event_msg(j2k->cinfo, "%.8x: EOC\n", cio_tell(cio) + j2k->pos_correction); */
+	cio_write(cio, J2K_MS_EOC, 2);
+
+/* UniPG>> */
+#ifdef USE_JPWL
+	/* update markers struct */
+	j2k_add_marker(j2k->cstr_info, J2K_MS_EOC, cio_tell(cio) - 2, 2);
+#endif /* USE_JPWL */
+/* <<UniPG */
+}
+
+static void j2k_read_eoc(opj_j2k_t *j2k) {
+	int i, tileno;
+	bool success;
+
+	/* if packets should be decoded */
+	if (j2k->cp->limit_decoding != DECODE_ALL_BUT_PACKETS) {
+		opj_tcd_t *tcd = tcd_create(j2k->cinfo);
+		tcd_malloc_decode(tcd, j2k->image, j2k->cp);
+		for (i = 0; i < j2k->cp->tileno_size; i++) {
+			tcd_malloc_decode_tile(tcd, j2k->image, j2k->cp, i, j2k->cstr_info);
+			tileno = j2k->cp->tileno[i];
+			success = tcd_decode_tile(tcd, j2k->tile_data[tileno], j2k->tile_len[tileno], tileno, j2k->cstr_info);
+			opj_free(j2k->tile_data[tileno]);
+			j2k->tile_data[tileno] = NULL;
+			tcd_free_decode_tile(tcd, i);
+			if (success == false) {
+				j2k->state |= J2K_STATE_ERR;
+				break;
+			}
+		}
+		tcd_free_decode(tcd);
+		tcd_destroy(tcd);
+	}
+	/* if packets should not be decoded  */
+	else {
+		for (i = 0; i < j2k->cp->tileno_size; i++) {
+			tileno = j2k->cp->tileno[i];
+			opj_free(j2k->tile_data[tileno]);
+			j2k->tile_data[tileno] = NULL;
+		}
+	}	
+	if (j2k->state & J2K_STATE_ERR)
+		j2k->state = J2K_STATE_MT + J2K_STATE_ERR;
+	else
+		j2k->state = J2K_STATE_MT; 
+}
+
+typedef struct opj_dec_mstabent {
+	/** marker value */
+	int id;
+	/** value of the state when the marker can appear */
+	int states;
+	/** action linked to the marker */
+	void (*handler) (opj_j2k_t *j2k);
+} opj_dec_mstabent_t;
+
+opj_dec_mstabent_t j2k_dec_mstab[] = {
+  {J2K_MS_SOC, J2K_STATE_MHSOC, j2k_read_soc},
+  {J2K_MS_SOT, J2K_STATE_MH | J2K_STATE_TPHSOT, j2k_read_sot},
+  {J2K_MS_SOD, J2K_STATE_TPH, j2k_read_sod},
+  {J2K_MS_EOC, J2K_STATE_TPHSOT, j2k_read_eoc},
+  {J2K_MS_SIZ, J2K_STATE_MHSIZ, j2k_read_siz},
+  {J2K_MS_COD, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_cod},
+  {J2K_MS_COC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_coc},
+  {J2K_MS_RGN, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_rgn},
+  {J2K_MS_QCD, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_qcd},
+  {J2K_MS_QCC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_qcc},
+  {J2K_MS_POC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_poc},
+  {J2K_MS_TLM, J2K_STATE_MH, j2k_read_tlm},
+  {J2K_MS_PLM, J2K_STATE_MH, j2k_read_plm},
+  {J2K_MS_PLT, J2K_STATE_TPH, j2k_read_plt},
+  {J2K_MS_PPM, J2K_STATE_MH, j2k_read_ppm},
+  {J2K_MS_PPT, J2K_STATE_TPH, j2k_read_ppt},
+  {J2K_MS_SOP, 0, 0},
+  {J2K_MS_CRG, J2K_STATE_MH, j2k_read_crg},
+  {J2K_MS_COM, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_com},
+
+#ifdef USE_JPWL
+  {J2K_MS_EPC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_epc},
+  {J2K_MS_EPB, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_epb},
+  {J2K_MS_ESD, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_esd},
+  {J2K_MS_RED, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_red},
+#endif /* USE_JPWL */
+#ifdef USE_JPSEC
+  {J2K_MS_SEC, J2K_STATE_MH, j2k_read_sec},
+  {J2K_MS_INSEC, 0, j2k_read_insec},
+#endif /* USE_JPSEC */
+
+  {0, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_unk}
+};
+
+static void j2k_read_unk(opj_j2k_t *j2k) {
+	opj_event_msg(j2k->cinfo, EVT_WARNING, "Unknown marker\n");
+
+#ifdef USE_JPWL
+	if (j2k->cp->correct) {
+		int m = 0, id, i;
+		int min_id = 0, min_dist = 17, cur_dist = 0, tmp_id;
+		cio_seek(j2k->cio, cio_tell(j2k->cio) - 2);
+		id = cio_read(j2k->cio, 2);
+		opj_event_msg(j2k->cinfo, EVT_ERROR,
+			"JPWL: really don't know this marker %x\n",
+			id);
+		if (!JPWL_ASSUME) {
+			opj_event_msg(j2k->cinfo, EVT_ERROR,
+				"- possible synch loss due to uncorrectable codestream errors => giving up\n");
+			return;
+		}
+		/* OK, activate this at your own risk!!! */
+		/* we look for the marker at the minimum hamming distance from this */
+		while (j2k_dec_mstab[m].id) {
+			
+			/* 1's where they differ */
+			tmp_id = j2k_dec_mstab[m].id ^ id;
+
+			/* compute the hamming distance between our id and the current */
+			cur_dist = 0;
+			for (i = 0; i < 16; i++) {
+				if ((tmp_id >> i) & 0x0001) {
+					cur_dist++;
+				}
+			}
+
+			/* if current distance is smaller, set the minimum */
+			if (cur_dist < min_dist) {
+				min_dist = cur_dist;
+				min_id = j2k_dec_mstab[m].id;
+			}
+			
+			/* jump to the next marker */
+			m++;
+		}
+
+		/* do we substitute the marker? */
+		if (min_dist < JPWL_MAXIMUM_HAMMING) {
+			opj_event_msg(j2k->cinfo, EVT_ERROR,
+				"- marker %x is at distance %d from the read %x\n",
+				min_id, min_dist, id);
+			opj_event_msg(j2k->cinfo, EVT_ERROR,
+				"- trying to substitute in place and crossing fingers!\n");
+			cio_seek(j2k->cio, cio_tell(j2k->cio) - 2);
+			cio_write(j2k->cio, min_id, 2);
+
+			/* rewind */
+			cio_seek(j2k->cio, cio_tell(j2k->cio) - 2);
+
+		}
+
+	};
+#endif /* USE_JPWL */
+
+}
+
+/**
+Read the lookup table containing all the marker, status and action
+@param id Marker value
+*/
+static opj_dec_mstabent_t *j2k_dec_mstab_lookup(int id) {
+	opj_dec_mstabent_t *e;
+	for (e = j2k_dec_mstab; e->id != 0; e++) {
+		if (e->id == id) {
+			break;
+		}
+	}
+	return e;
+}
+
+/* ----------------------------------------------------------------------- */
+/* J2K / JPT decoder interface                                             */
+/* ----------------------------------------------------------------------- */
+
+opj_j2k_t* j2k_create_decompress(opj_common_ptr cinfo) {
+	opj_j2k_t *j2k = (opj_j2k_t*) opj_calloc(1, sizeof(opj_j2k_t));
+	if(!j2k)
+		return NULL;
+
+	j2k->default_tcp = (opj_tcp_t*) opj_calloc(1, sizeof(opj_tcp_t));
+	if(!j2k->default_tcp) {
+		opj_free(j2k);
+		return NULL;
+	}
+
+	j2k->cinfo = cinfo;
+	j2k->tile_data = NULL;
+
+	return j2k;
+}
+
+void j2k_destroy_decompress(opj_j2k_t *j2k) {
+	int i = 0;
+
+	if(j2k->tile_len != NULL) {
+		opj_free(j2k->tile_len);
+	}
+	if(j2k->tile_data != NULL) {
+		opj_free(j2k->tile_data);
+	}
+	if(j2k->default_tcp != NULL) {
+		opj_tcp_t *default_tcp = j2k->default_tcp;
+		if(default_tcp->ppt_data_first != NULL) {
+			opj_free(default_tcp->ppt_data_first);
+		}
+		if(j2k->default_tcp->tccps != NULL) {
+			opj_free(j2k->default_tcp->tccps);
+		}
+		opj_free(j2k->default_tcp);
+	}
+	if(j2k->cp != NULL) {
+		opj_cp_t *cp = j2k->cp;
+		if(cp->tcps != NULL) {
+			for(i = 0; i < cp->tw * cp->th; i++) {
+				if(cp->tcps[i].ppt_data_first != NULL) {
+					opj_free(cp->tcps[i].ppt_data_first);
+				}
+				if(cp->tcps[i].tccps != NULL) {
+					opj_free(cp->tcps[i].tccps);
+				}
+			}
+			opj_free(cp->tcps);
+		}
+		if(cp->ppm_data_first != NULL) {
+			opj_free(cp->ppm_data_first);
+		}
+		if(cp->tileno != NULL) {
+			opj_free(cp->tileno);  
+		}
+		if(cp->comment != NULL) {
+			opj_free(cp->comment);
+		}
+
+		opj_free(cp);
+	}
+	opj_free(j2k);
+}
+
+void j2k_setup_decoder(opj_j2k_t *j2k, opj_dparameters_t *parameters) {
+	if(j2k && parameters) {
+		/* create and initialize the coding parameters structure */
+		opj_cp_t *cp = (opj_cp_t*) opj_calloc(1, sizeof(opj_cp_t));
+		cp->reduce = parameters->cp_reduce;	
+		cp->layer = parameters->cp_layer;
+		cp->limit_decoding = parameters->cp_limit_decoding;
+
+#ifdef USE_JPWL
+		cp->correct = parameters->jpwl_correct;
+		cp->exp_comps = parameters->jpwl_exp_comps;
+		cp->max_tiles = parameters->jpwl_max_tiles;
+#endif /* USE_JPWL */
+
+
+		/* keep a link to cp so that we can destroy it later in j2k_destroy_decompress */
+		j2k->cp = cp;
+	}
+}
+
+opj_image_t* j2k_decode(opj_j2k_t *j2k, opj_cio_t *cio, opj_codestream_info_t *cstr_info) {
+	opj_image_t *image = NULL;
+
+	opj_common_ptr cinfo = j2k->cinfo;	
+
+	j2k->cio = cio;
+	j2k->cstr_info = cstr_info;
+	if (cstr_info)
+		memset(cstr_info, 0, sizeof(opj_codestream_info_t));
+
+	/* create an empty image */
+	image = opj_image_create0();
+	j2k->image = image;
+
+	j2k->state = J2K_STATE_MHSOC;
+
+	for (;;) {
+		opj_dec_mstabent_t *e;
+		int id = cio_read(cio, 2);
+
+#ifdef USE_JPWL
+		/* we try to honor JPWL correction power */
+		if (j2k->cp->correct) {
+
+			int orig_pos = cio_tell(cio);
+			bool status;
+
+			/* call the corrector */
+			status = jpwl_correct(j2k);
+
+			/* go back to where you were */
+			cio_seek(cio, orig_pos - 2);
+
+			/* re-read the marker */
+			id = cio_read(cio, 2);
+
+			/* check whether it begins with ff */
+			if (id >> 8 != 0xff) {
+				opj_event_msg(cinfo, EVT_ERROR,
+					"JPWL: possible bad marker %x at %d\n",
+					id, cio_tell(cio) - 2);
+				if (!JPWL_ASSUME) {
+					opj_image_destroy(image);
+					opj_event_msg(cinfo, EVT_ERROR, "JPWL: giving up\n");
+					return 0;
+				}
+				/* we try to correct */
+				id = id | 0xff00;
+				cio_seek(cio, cio_tell(cio) - 2);
+				cio_write(cio, id, 2);
+				opj_event_msg(cinfo, EVT_WARNING, "- trying to adjust this\n"
+					"- setting marker to %x\n",
+					id);
+			}
+
+		}
+#endif /* USE_JPWL */
+
+		if (id >> 8 != 0xff) {
+			opj_image_destroy(image);
+			opj_event_msg(cinfo, EVT_ERROR, "%.8x: expected a marker instead of %x\n", cio_tell(cio) - 2, id);
+			return 0;
+		}
+		e = j2k_dec_mstab_lookup(id);
+		// Check if the marker is known
+		if (!(j2k->state & e->states)) {
+			opj_image_destroy(image);
+			opj_event_msg(cinfo, EVT_ERROR, "%.8x: unexpected marker %x\n", cio_tell(cio) - 2, id);
+			return 0;
+		}
+		// Check if the decoding is limited to the main header
+		if (e->id == J2K_MS_SOT && j2k->cp->limit_decoding == LIMIT_TO_MAIN_HEADER) {
+			opj_event_msg(cinfo, EVT_INFO, "Main Header decoded.\n");
+			return image;
+		}		
+
+		if (e->handler) {
+			(*e->handler)(j2k);
+		}
+		if (j2k->state & J2K_STATE_ERR) 
+			return NULL;	
+
+		if (j2k->state == J2K_STATE_MT) {
+			break;
+		}
+		if (j2k->state == J2K_STATE_NEOC) {
+			break;
+		}
+	}
+	if (j2k->state == J2K_STATE_NEOC) {
+		j2k_read_eoc(j2k);
+	}
+
+	if (j2k->state != J2K_STATE_MT) {
+		opj_event_msg(cinfo, EVT_WARNING, "Incomplete bitstream\n");
+	}
+
+	return image;
+}
+
+/*
+* Read a JPT-stream and decode file
+*
+*/
+opj_image_t* j2k_decode_jpt_stream(opj_j2k_t *j2k, opj_cio_t *cio,  opj_codestream_info_t *cstr_info) {
+	opj_image_t *image = NULL;
+	opj_jpt_msg_header_t header;
+	int position;
+
+	opj_common_ptr cinfo = j2k->cinfo;
+	
+	j2k->cio = cio;
+
+	/* create an empty image */
+	image = opj_image_create0();
+	j2k->image = image;
+
+	j2k->state = J2K_STATE_MHSOC;
+	
+	/* Initialize the header */
+	jpt_init_msg_header(&header);
+	/* Read the first header of the message */
+	jpt_read_msg_header(cinfo, cio, &header);
+	
+	position = cio_tell(cio);
+	if (header.Class_Id != 6) {	/* 6 : Main header data-bin message */
+		opj_image_destroy(image);
+		opj_event_msg(cinfo, EVT_ERROR, "[JPT-stream] : Expecting Main header first [class_Id %d] !\n", header.Class_Id);
+		return 0;
+	}
+	
+	for (;;) {
+		opj_dec_mstabent_t *e = NULL;
+		int id;
+		
+		if (!cio_numbytesleft(cio)) {
+			j2k_read_eoc(j2k);
+			return image;
+		}
+		/* data-bin read -> need to read a new header */
+		if ((unsigned int) (cio_tell(cio) - position) == header.Msg_length) {
+			jpt_read_msg_header(cinfo, cio, &header);
+			position = cio_tell(cio);
+			if (header.Class_Id != 4) {	/* 4 : Tile data-bin message */
+				opj_image_destroy(image);
+				opj_event_msg(cinfo, EVT_ERROR, "[JPT-stream] : Expecting Tile info !\n");
+				return 0;
+			}
+		}
+		
+		id = cio_read(cio, 2);
+		if (id >> 8 != 0xff) {
+			opj_image_destroy(image);
+			opj_event_msg(cinfo, EVT_ERROR, "%.8x: expected a marker instead of %x\n", cio_tell(cio) - 2, id);
+			return 0;
+		}
+		e = j2k_dec_mstab_lookup(id);
+		if (!(j2k->state & e->states)) {
+			opj_image_destroy(image);
+			opj_event_msg(cinfo, EVT_ERROR, "%.8x: unexpected marker %x\n", cio_tell(cio) - 2, id);
+			return 0;
+		}
+		if (e->handler) {
+			(*e->handler)(j2k);
+		}
+		if (j2k->state == J2K_STATE_MT) {
+			break;
+		}
+		if (j2k->state == J2K_STATE_NEOC) {
+			break;
+		}
+	}
+	if (j2k->state == J2K_STATE_NEOC) {
+		j2k_read_eoc(j2k);
+	}
+	
+	if (j2k->state != J2K_STATE_MT) {
+		opj_event_msg(cinfo, EVT_WARNING, "Incomplete bitstream\n");
+	}
+
+	return image;
+}
+
+/* ----------------------------------------------------------------------- */
+/* J2K encoder interface                                                       */
+/* ----------------------------------------------------------------------- */
+
+opj_j2k_t* j2k_create_compress(opj_common_ptr cinfo) {
+	opj_j2k_t *j2k = (opj_j2k_t*) opj_calloc(1, sizeof(opj_j2k_t));
+	if(j2k) {
+		j2k->cinfo = cinfo;
+	}
+	return j2k;
+}
+
+void j2k_destroy_compress(opj_j2k_t *j2k) {
+	int tileno;
+
+	if(!j2k) return;
+	if(j2k->cp != NULL) {
+		opj_cp_t *cp = j2k->cp;
+
+		if(cp->comment) {
+			opj_free(cp->comment);
+		}
+		if(cp->matrice) {
+			opj_free(cp->matrice);
+		}
+		for (tileno = 0; tileno < cp->tw * cp->th; tileno++) {
+			opj_free(cp->tcps[tileno].tccps);
+		}
+		opj_free(cp->tcps);
+		opj_free(cp);
+	}
+
+	opj_free(j2k);
+}
+
+void j2k_setup_encoder(opj_j2k_t *j2k, opj_cparameters_t *parameters, opj_image_t *image) {
+	int i, j, tileno, numpocs_tile;
+	opj_cp_t *cp = NULL;
+
+	if(!j2k || !parameters || ! image) {
+		return;
+	}
+
+	/* create and initialize the coding parameters structure */
+	cp = (opj_cp_t*) opj_calloc(1, sizeof(opj_cp_t));
+
+	/* keep a link to cp so that we can destroy it later in j2k_destroy_compress */
+	j2k->cp = cp;
+
+	/* set default values for cp */
+	cp->tw = 1;
+	cp->th = 1;
+
+	/* 
+	copy user encoding parameters 
+	*/
+	cp->cinema = parameters->cp_cinema;
+	cp->max_comp_size =	parameters->max_comp_size;
+	cp->rsiz   = parameters->cp_rsiz;
+	cp->disto_alloc = parameters->cp_disto_alloc;
+	cp->fixed_alloc = parameters->cp_fixed_alloc;
+	cp->fixed_quality = parameters->cp_fixed_quality;
+
+	/* mod fixed_quality */
+	if(parameters->cp_matrice) {
+		size_t array_size = parameters->tcp_numlayers * parameters->numresolution * 3 * sizeof(int);
+		cp->matrice = (int *) opj_malloc(array_size);
+		memcpy(cp->matrice, parameters->cp_matrice, array_size);
+	}
+
+	/* tiles */
+	cp->tdx = parameters->cp_tdx;
+	cp->tdy = parameters->cp_tdy;
+
+	/* tile offset */
+	cp->tx0 = parameters->cp_tx0;
+	cp->ty0 = parameters->cp_ty0;
+
+	/* comment string */
+	if(parameters->cp_comment) {
+		cp->comment = (char*)opj_malloc(strlen(parameters->cp_comment) + 1);
+		if(cp->comment) {
+			strcpy(cp->comment, parameters->cp_comment);
+		}
+	}
+
+	/*
+	calculate other encoding parameters
+	*/
+
+	if (parameters->tile_size_on) {
+		cp->tw = int_ceildiv(image->x1 - cp->tx0, cp->tdx);
+		cp->th = int_ceildiv(image->y1 - cp->ty0, cp->tdy);
+	} else {
+		cp->tdx = image->x1 - cp->tx0;
+		cp->tdy = image->y1 - cp->ty0;
+	}
+
+	if(parameters->tp_on){
+		cp->tp_flag = parameters->tp_flag;
+		cp->tp_on = 1;
+	}
+	
+	cp->img_size = 0;
+	for(i=0;i<image->numcomps ;i++){
+	cp->img_size += (image->comps[i].w *image->comps[i].h * image->comps[i].prec);
+	}
+
+
+#ifdef USE_JPWL
+	/*
+	calculate JPWL encoding parameters
+	*/
+
+	if (parameters->jpwl_epc_on) {
+		int i;
+
+		/* set JPWL on */
+		cp->epc_on = true;
+		cp->info_on = false; /* no informative technique */
+
+		/* set EPB on */
+		if ((parameters->jpwl_hprot_MH > 0) || (parameters->jpwl_hprot_TPH[0] > 0)) {
+			cp->epb_on = true;
+			
+			cp->hprot_MH = parameters->jpwl_hprot_MH;
+			for (i = 0; i < JPWL_MAX_NO_TILESPECS; i++) {
+				cp->hprot_TPH_tileno[i] = parameters->jpwl_hprot_TPH_tileno[i];
+				cp->hprot_TPH[i] = parameters->jpwl_hprot_TPH[i];
+			}
+			/* if tile specs are not specified, copy MH specs */
+			if (cp->hprot_TPH[0] == -1) {
+				cp->hprot_TPH_tileno[0] = 0;
+				cp->hprot_TPH[0] = parameters->jpwl_hprot_MH;
+			}
+			for (i = 0; i < JPWL_MAX_NO_PACKSPECS; i++) {
+				cp->pprot_tileno[i] = parameters->jpwl_pprot_tileno[i];
+				cp->pprot_packno[i] = parameters->jpwl_pprot_packno[i];
+				cp->pprot[i] = parameters->jpwl_pprot[i];
+			}
+		}
+
+		/* set ESD writing */
+		if ((parameters->jpwl_sens_size == 1) || (parameters->jpwl_sens_size == 2)) {
+			cp->esd_on = true;
+
+			cp->sens_size = parameters->jpwl_sens_size;
+			cp->sens_addr = parameters->jpwl_sens_addr;
+			cp->sens_range = parameters->jpwl_sens_range;
+
+			cp->sens_MH = parameters->jpwl_sens_MH;
+			for (i = 0; i < JPWL_MAX_NO_TILESPECS; i++) {
+				cp->sens_TPH_tileno[i] = parameters->jpwl_sens_TPH_tileno[i];
+				cp->sens_TPH[i] = parameters->jpwl_sens_TPH[i];
+			}
+		}
+
+		/* always set RED writing to false: we are at the encoder */
+		cp->red_on = false;
+
+	} else {
+		cp->epc_on = false;
+	}
+#endif /* USE_JPWL */
+
+
+	/* initialize the mutiple tiles */
+	/* ---------------------------- */
+	cp->tcps = (opj_tcp_t*) opj_calloc(cp->tw * cp->th, sizeof(opj_tcp_t));
+
+	for (tileno = 0; tileno < cp->tw * cp->th; tileno++) {
+		opj_tcp_t *tcp = &cp->tcps[tileno];
+		tcp->numlayers = parameters->tcp_numlayers;
+		for (j = 0; j < tcp->numlayers; j++) {
+			if(cp->cinema){
+				if (cp->fixed_quality) {
+					tcp->distoratio[j] = parameters->tcp_distoratio[j];
+				}
+				tcp->rates[j] = parameters->tcp_rates[j];
+			}else{
+				if (cp->fixed_quality) {	/* add fixed_quality */
+					tcp->distoratio[j] = parameters->tcp_distoratio[j];
+				} else {
+					tcp->rates[j] = parameters->tcp_rates[j];
+				}
+			}
+		}
+		tcp->csty = parameters->csty;
+		tcp->prg = parameters->prog_order;
+		tcp->mct = parameters->tcp_mct; 
+
+		numpocs_tile = 0;
+		tcp->POC = 0;
+		if (parameters->numpocs) {
+			/* initialisation of POC */
+			tcp->POC = 1;
+			for (i = 0; i < parameters->numpocs; i++) {
+				if((tileno == parameters->POC[i].tile - 1) || (parameters->POC[i].tile == -1)) {
+					opj_poc_t *tcp_poc = &tcp->pocs[numpocs_tile];
+					tcp_poc->resno0		= parameters->POC[numpocs_tile].resno0;
+					tcp_poc->compno0	= parameters->POC[numpocs_tile].compno0;
+					tcp_poc->layno1		= parameters->POC[numpocs_tile].layno1;
+					tcp_poc->resno1		= parameters->POC[numpocs_tile].resno1;
+					tcp_poc->compno1	= parameters->POC[numpocs_tile].compno1;
+					tcp_poc->prg1		= parameters->POC[numpocs_tile].prg1;
+					tcp_poc->tile		= parameters->POC[numpocs_tile].tile;
+					numpocs_tile++;
+				}
+			}
+			tcp->numpocs = numpocs_tile -1 ;
+		}else{ 
+			tcp->numpocs = 0;
+		}
+
+		tcp->tccps = (opj_tccp_t*) opj_calloc(image->numcomps, sizeof(opj_tccp_t));
+
+		for (i = 0; i < image->numcomps; i++) {
+			opj_tccp_t *tccp = &tcp->tccps[i];
+			tccp->csty = parameters->csty & 0x01;	/* 0 => one precinct || 1 => custom precinct  */
+			tccp->numresolutions = parameters->numresolution;
+			tccp->cblkw = int_floorlog2(parameters->cblockw_init);
+			tccp->cblkh = int_floorlog2(parameters->cblockh_init);
+			tccp->cblksty = parameters->mode;
+			tccp->qmfbid = parameters->irreversible ? 0 : 1;
+			tccp->qntsty = parameters->irreversible ? J2K_CCP_QNTSTY_SEQNT : J2K_CCP_QNTSTY_NOQNT;
+			tccp->numgbits = 2;
+			if (i == parameters->roi_compno) {
+				tccp->roishift = parameters->roi_shift;
+			} else {
+				tccp->roishift = 0;
+			}
+
+			if(parameters->cp_cinema)
+			{
+				//Precinct size for lowest frequency subband=128
+				tccp->prcw[0] = 7;
+				tccp->prch[0] = 7;
+				//Precinct size at all other resolutions = 256
+				for (j = 1; j < tccp->numresolutions; j++) {
+					tccp->prcw[j] = 8;
+					tccp->prch[j] = 8;
+				}
+			}else{
+				if (parameters->csty & J2K_CCP_CSTY_PRT) {
+					int p = 0;
+					for (j = tccp->numresolutions - 1; j >= 0; j--) {
+						if (p < parameters->res_spec) {
+							
+							if (parameters->prcw_init[p] < 1) {
+								tccp->prcw[j] = 1;
+							} else {
+								tccp->prcw[j] = int_floorlog2(parameters->prcw_init[p]);
+							}
+							
+							if (parameters->prch_init[p] < 1) {
+								tccp->prch[j] = 1;
+							}else {
+								tccp->prch[j] = int_floorlog2(parameters->prch_init[p]);
+							}
+
+						} else {
+							int res_spec = parameters->res_spec;
+							int size_prcw = parameters->prcw_init[res_spec - 1] >> (p - (res_spec - 1));
+							int size_prch = parameters->prch_init[res_spec - 1] >> (p - (res_spec - 1));
+							
+							if (size_prcw < 1) {
+								tccp->prcw[j] = 1;
+							} else {
+								tccp->prcw[j] = int_floorlog2(size_prcw);
+							}
+							
+							if (size_prch < 1) {
+								tccp->prch[j] = 1;
+							} else {
+								tccp->prch[j] = int_floorlog2(size_prch);
+							}
+						}
+						p++;
+						/*printf("\nsize precinct for level %d : %d,%d\n", j,tccp->prcw[j], tccp->prch[j]); */
+					}	//end for
+				} else {
+					for (j = 0; j < tccp->numresolutions; j++) {
+						tccp->prcw[j] = 15;
+						tccp->prch[j] = 15;
+					}
+				}
+			}
+
+			dwt_calc_explicit_stepsizes(tccp, image->comps[i].prec);
+		}
+	}
+}
+
+bool j2k_encode(opj_j2k_t *j2k, opj_cio_t *cio, opj_image_t *image, opj_codestream_info_t *cstr_info) {
+	int tileno, compno;
+	opj_cp_t *cp = NULL;
+
+	opj_tcd_t *tcd = NULL;	/* TCD component */
+
+	j2k->cio = cio;	
+	j2k->image = image;
+
+	cp = j2k->cp;
+
+	/* j2k_dump_cp(stdout, image, cp); */
+
+	/* INDEX >> */
+	j2k->cstr_info = cstr_info;
+	if (cstr_info) {
+		int compno;
+		cstr_info->tile = (opj_tile_info_t *) opj_malloc(cp->tw * cp->th * sizeof(opj_tile_info_t));
+		cstr_info->image_w = image->x1 - image->x0;
+		cstr_info->image_h = image->y1 - image->y0;
+		cstr_info->prog = (&cp->tcps[0])->prg;
+		cstr_info->tw = cp->tw;
+		cstr_info->th = cp->th;
+		cstr_info->tile_x = cp->tdx;	/* new version parser */
+		cstr_info->tile_y = cp->tdy;	/* new version parser */
+		cstr_info->tile_Ox = cp->tx0;	/* new version parser */
+		cstr_info->tile_Oy = cp->ty0;	/* new version parser */
+		cstr_info->numcomps = image->numcomps;
+		cstr_info->numlayers = (&cp->tcps[0])->numlayers;
+		cstr_info->numdecompos = (int*) opj_malloc(image->numcomps * sizeof(int));
+		for (compno=0; compno < image->numcomps; compno++) {
+			cstr_info->numdecompos[compno] = (&cp->tcps[0])->tccps->numresolutions - 1;
+		}
+		cstr_info->D_max = 0.0;		/* ADD Marcela */
+		cstr_info->main_head_start = cio_tell(cio); /* position of SOC */
+		cstr_info->maxmarknum = 100;
+		cstr_info->marker = (opj_marker_info_t *) opj_malloc(cstr_info->maxmarknum * sizeof(opj_marker_info_t));
+		cstr_info->marknum = 0;
+	}
+	/* << INDEX */
+
+	j2k_write_soc(j2k);
+	j2k_write_siz(j2k);
+	j2k_write_cod(j2k);
+	j2k_write_qcd(j2k);
+
+	if(cp->cinema){
+		for (compno = 1; compno < image->numcomps; compno++) {
+			j2k_write_coc(j2k, compno);
+			j2k_write_qcc(j2k, compno);
+		}
+	}
+
+	for (compno = 0; compno < image->numcomps; compno++) {
+		opj_tcp_t *tcp = &cp->tcps[0];
+		if (tcp->tccps[compno].roishift)
+			j2k_write_rgn(j2k, compno, 0);
+	}
+	if (cp->comment != NULL) {
+		j2k_write_com(j2k);
+	}
+
+	j2k->totnum_tp = j2k_calculate_tp(cp,image->numcomps,image,j2k);
+	/* TLM Marker*/
+	if(cp->cinema){
+		j2k_write_tlm(j2k);
+		if (cp->cinema == CINEMA4K_24) {
+			j2k_write_poc(j2k);
+		}
+	}
+
+	/* uncomment only for testing JPSEC marker writing */
+	/* j2k_write_sec(j2k); */
+
+	/* INDEX >> */
+	if(cstr_info) {
+		cstr_info->main_head_end = cio_tell(cio) - 1;
+	}
+	/* << INDEX */
+	/**** Main Header ENDS here ***/
+
+	/* create the tile encoder */
+	tcd = tcd_create(j2k->cinfo);
+
+	/* encode each tile */
+	for (tileno = 0; tileno < cp->tw * cp->th; tileno++) {
+		int pino;
+		int tilepartno=0;
+		/* UniPG>> */
+		int acc_pack_num = 0;
+		/* <<UniPG */
+
+
+		opj_tcp_t *tcp = &cp->tcps[tileno];
+		opj_event_msg(j2k->cinfo, EVT_INFO, "tile number %d / %d\n", tileno + 1, cp->tw * cp->th);
+
+		j2k->curtileno = tileno;
+		j2k->cur_tp_num = 0;
+		tcd->cur_totnum_tp = j2k->cur_totnum_tp[j2k->curtileno];
+		/* initialisation before tile encoding  */
+		if (tileno == 0) {
+			tcd_malloc_encode(tcd, image, cp, j2k->curtileno);
+		} else {
+			tcd_init_encode(tcd, image, cp, j2k->curtileno);
+		}
+
+		/* INDEX >> */
+		if(cstr_info) {
+			cstr_info->tile[j2k->curtileno].start_pos = cio_tell(cio) + j2k->pos_correction;
+		}
+		/* << INDEX */
+
+		for(pino = 0; pino <= tcp->numpocs; pino++) {
+			int tot_num_tp;
+			tcd->cur_pino=pino;
+
+			/*Get number of tile parts*/
+			tot_num_tp = j2k_get_num_tp(cp,pino,tileno);
+			tcd->tp_pos = cp->tp_pos;
+
+			for(tilepartno = 0; tilepartno < tot_num_tp ; tilepartno++){
+				j2k->tp_num = tilepartno;
+				/* INDEX >> */
+				if(cstr_info)
+					cstr_info->tile[j2k->curtileno].tp[j2k->cur_tp_num].tp_start_pos =
+					cio_tell(cio) + j2k->pos_correction;
+				/* << INDEX */
+				j2k_write_sot(j2k);
+
+				if(j2k->cur_tp_num == 0 && cp->cinema == 0){
+					for (compno = 1; compno < image->numcomps; compno++) {
+						j2k_write_coc(j2k, compno);
+						j2k_write_qcc(j2k, compno);
+					}
+					if (cp->tcps[tileno].numpocs) {
+						j2k_write_poc(j2k);
+					}
+				}
+
+				/* INDEX >> */
+				if(cstr_info)
+					cstr_info->tile[j2k->curtileno].tp[j2k->cur_tp_num].tp_end_header =
+					cio_tell(cio) + j2k->pos_correction + 1;
+				/* << INDEX */
+
+				j2k_write_sod(j2k, tcd);
+
+				/* INDEX >> */
+				if(cstr_info) {
+					cstr_info->tile[j2k->curtileno].tp[j2k->cur_tp_num].tp_end_pos =
+						cio_tell(cio) + j2k->pos_correction - 1;
+					cstr_info->tile[j2k->curtileno].tp[j2k->cur_tp_num].tp_start_pack =
+						acc_pack_num;
+					cstr_info->tile[j2k->curtileno].tp[j2k->cur_tp_num].tp_numpacks =
+						cstr_info->packno - acc_pack_num;
+					acc_pack_num = cstr_info->packno;
+				}
+				/* << INDEX */
+
+				j2k->cur_tp_num++;
+			}			
+		}
+		if(cstr_info) {
+			cstr_info->tile[j2k->curtileno].end_pos = cio_tell(cio) + j2k->pos_correction - 1;
+		}
+
+
+		/*
+		if (tile->PPT) { // BAD PPT !!! 
+		FILE *PPT_file;
+		int i;
+		PPT_file=fopen("PPT","rb");
+		fprintf(stderr,"%c%c%c%c",255,97,tile->len_ppt/256,tile->len_ppt%256);
+		for (i=0;i<tile->len_ppt;i++) {
+		unsigned char elmt;
+		fread(&elmt, 1, 1, PPT_file);
+		fwrite(&elmt,1,1,f);
+		}
+		fclose(PPT_file);
+		unlink("PPT");
+		}
+		*/
+
+	}
+
+	/* destroy the tile encoder */
+	tcd_free_encode(tcd);
+	tcd_destroy(tcd);
+
+	opj_free(j2k->cur_totnum_tp);
+
+	j2k_write_eoc(j2k);
+
+	if(cstr_info) {
+		cstr_info->codestream_size = cio_tell(cio) + j2k->pos_correction;
+		/* UniPG>> */
+		/* The following adjustment is done to adjust the codestream size */
+		/* if SOD is not at 0 in the buffer. Useful in case of JP2, where */
+		/* the first bunch of bytes is not in the codestream              */
+		cstr_info->codestream_size -= cstr_info->main_head_start;
+		/* <<UniPG */
+	}
+
+#ifdef USE_JPWL
+	/*
+	preparation of JPWL marker segments
+	*/
+	if(cp->epc_on) {
+
+		/* encode according to JPWL */
+		jpwl_encode(j2k, cio, image);
+
+	}
+#endif /* USE_JPWL */
+
+	return true;
+}
+
+
+
+
+
+
diff --git a/extern/libopenjpeg/j2k.h b/extern/libopenjpeg/j2k.h
new file mode 100644
index 00000000000..5599be47a8d
--- /dev/null
+++ b/extern/libopenjpeg/j2k.h
@@ -0,0 +1,446 @@
+/*
+ * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2007, Professor Benoit Macq
+ * Copyright (c) 2001-2003, David Janssens
+ * Copyright (c) 2002-2003, Yannick Verschueren
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * Copyright (c) 2006-2007, Parvatha Elangovan
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef __J2K_H
+#define __J2K_H
+/**
+@file j2k.h
+@brief The JPEG-2000 Codestream Reader/Writer (J2K)
+
+The functions in J2K.C have for goal to read/write the several parts of the codestream: markers and data.
+*/
+
+/** @defgroup J2K J2K - JPEG-2000 codestream reader/writer */
+/*@{*/
+
+#define J2K_CP_CSTY_PRT 0x01
+#define J2K_CP_CSTY_SOP 0x02
+#define J2K_CP_CSTY_EPH 0x04
+#define J2K_CCP_CSTY_PRT 0x01
+#define J2K_CCP_CBLKSTY_LAZY 0x01
+#define J2K_CCP_CBLKSTY_RESET 0x02
+#define J2K_CCP_CBLKSTY_TERMALL 0x04
+#define J2K_CCP_CBLKSTY_VSC 0x08
+#define J2K_CCP_CBLKSTY_PTERM 0x10
+#define J2K_CCP_CBLKSTY_SEGSYM 0x20
+#define J2K_CCP_QNTSTY_NOQNT 0
+#define J2K_CCP_QNTSTY_SIQNT 1
+#define J2K_CCP_QNTSTY_SEQNT 2
+
+/* ----------------------------------------------------------------------- */
+
+#define J2K_MS_SOC 0xff4f	/**< SOC marker value */
+#define J2K_MS_SOT 0xff90	/**< SOT marker value */
+#define J2K_MS_SOD 0xff93	/**< SOD marker value */
+#define J2K_MS_EOC 0xffd9	/**< EOC marker value */
+#define J2K_MS_SIZ 0xff51	/**< SIZ marker value */
+#define J2K_MS_COD 0xff52	/**< COD marker value */
+#define J2K_MS_COC 0xff53	/**< COC marker value */
+#define J2K_MS_RGN 0xff5e	/**< RGN marker value */
+#define J2K_MS_QCD 0xff5c	/**< QCD marker value */
+#define J2K_MS_QCC 0xff5d	/**< QCC marker value */
+#define J2K_MS_POC 0xff5f	/**< POC marker value */
+#define J2K_MS_TLM 0xff55	/**< TLM marker value */
+#define J2K_MS_PLM 0xff57	/**< PLM marker value */
+#define J2K_MS_PLT 0xff58	/**< PLT marker value */
+#define J2K_MS_PPM 0xff60	/**< PPM marker value */
+#define J2K_MS_PPT 0xff61	/**< PPT marker value */
+#define J2K_MS_SOP 0xff91	/**< SOP marker value */
+#define J2K_MS_EPH 0xff92	/**< EPH marker value */
+#define J2K_MS_CRG 0xff63	/**< CRG marker value */
+#define J2K_MS_COM 0xff64	/**< COM marker value */
+/* UniPG>> */
+#ifdef USE_JPWL
+#define J2K_MS_EPC 0xff68	/**< EPC marker value (Part 11: JPEG 2000 for Wireless) */
+#define J2K_MS_EPB 0xff66	/**< EPB marker value (Part 11: JPEG 2000 for Wireless) */ 
+#define J2K_MS_ESD 0xff67	/**< ESD marker value (Part 11: JPEG 2000 for Wireless) */ 
+#define J2K_MS_RED 0xff69	/**< RED marker value (Part 11: JPEG 2000 for Wireless) */
+#endif /* USE_JPWL */
+#ifdef USE_JPSEC
+#define J2K_MS_SEC 0xff65    /**< SEC marker value (Part 8: Secure JPEG 2000) */
+#define J2K_MS_INSEC 0xff94  /**< INSEC marker value (Part 8: Secure JPEG 2000) */
+#endif /* USE_JPSEC */
+/* <<UniPG */
+
+
+/* ----------------------------------------------------------------------- */
+
+/**
+Values that specify the status of the decoding process when decoding the main header. 
+These values may be combined with a | operator. 
+*/
+typedef enum J2K_STATUS {
+	J2K_STATE_MHSOC  = 0x0001, /**< a SOC marker is expected */
+	J2K_STATE_MHSIZ  = 0x0002, /**< a SIZ marker is expected */
+	J2K_STATE_MH     = 0x0004, /**< the decoding process is in the main header */
+	J2K_STATE_TPHSOT = 0x0008, /**< the decoding process is in a tile part header and expects a SOT marker */
+	J2K_STATE_TPH    = 0x0010, /**< the decoding process is in a tile part header */
+	J2K_STATE_MT     = 0x0020, /**< the EOC marker has just been read */
+	J2K_STATE_NEOC   = 0x0040, /**< the decoding process must not expect a EOC marker because the codestream is truncated */
+	J2K_STATE_ERR    = 0x0080  /**< the decoding process has encountered an error */
+} J2K_STATUS;
+
+/* ----------------------------------------------------------------------- */
+
+/** 
+T2 encoding mode 
+*/
+typedef enum T2_MODE {
+	THRESH_CALC = 0,	/** Function called in Rate allocation process*/
+	FINAL_PASS = 1		/** Function called in Tier 2 process*/
+}J2K_T2_MODE;
+
+/**
+Quantization stepsize
+*/
+typedef struct opj_stepsize {
+	/** exponent */
+	int expn;
+	/** mantissa */
+	int mant;
+} opj_stepsize_t;
+
+/**
+Tile-component coding parameters
+*/
+typedef struct opj_tccp {
+	/** coding style */
+	int csty;
+	/** number of resolutions */
+	int numresolutions;
+	/** code-blocks width */
+	int cblkw;
+	/** code-blocks height */
+	int cblkh;
+	/** code-block coding style */
+	int cblksty;
+	/** discrete wavelet transform identifier */
+	int qmfbid;
+	/** quantisation style */
+	int qntsty;
+	/** stepsizes used for quantization */
+	opj_stepsize_t stepsizes[J2K_MAXBANDS];
+	/** number of guard bits */
+	int numgbits;
+	/** Region Of Interest shift */
+	int roishift;
+	/** precinct width */
+	int prcw[J2K_MAXRLVLS];
+	/** precinct height */
+	int prch[J2K_MAXRLVLS];	
+} opj_tccp_t;
+
+/**
+Tile coding parameters : 
+this structure is used to store coding/decoding parameters common to all
+tiles (information like COD, COC in main header)
+*/
+typedef struct opj_tcp {
+	/** 1 : first part-tile of a tile */
+	int first;
+	/** coding style */
+	int csty;
+	/** progression order */
+	OPJ_PROG_ORDER prg;
+	/** number of layers */
+	int numlayers;
+	/** multi-component transform identifier */
+	int mct;
+	/** rates of layers */
+	float rates[100];
+	/** number of progression order changes */
+	int numpocs;
+	/** indicates if a POC marker has been used O:NO, 1:YES */
+	int POC;
+	/** progression order changes */
+	opj_poc_t pocs[32];
+	/** packet header store there for futur use in t2_decode_packet */
+	unsigned char *ppt_data;
+	/** pointer remaining on the first byte of the first header if ppt is used */
+	unsigned char *ppt_data_first;
+	/** If ppt == 1 --> there was a PPT marker for the present tile */
+	int ppt;
+	/** used in case of multiple marker PPT (number of info already stored) */
+	int ppt_store;
+	/** ppmbug1 */
+	int ppt_len;
+	/** add fixed_quality */
+	float distoratio[100];
+	/** tile-component coding parameters */
+	opj_tccp_t *tccps;
+} opj_tcp_t;
+
+/**
+Coding parameters
+*/
+typedef struct opj_cp {
+	/** Digital cinema profile*/
+	OPJ_CINEMA_MODE cinema;
+	/** Maximum rate for each component. If == 0, component size limitation is not considered */
+	int max_comp_size;
+	/** Size of the image in bits*/
+	int img_size;
+	/** Rsiz*/
+	OPJ_RSIZ_CAPABILITIES rsiz;
+	/** Enabling Tile part generation*/
+	char tp_on;
+	/** Flag determining tile part generation*/
+	char tp_flag;
+	/** Position of tile part flag in progression order*/
+	int tp_pos;
+	/** allocation by rate/distortion */
+	int disto_alloc;
+	/** allocation by fixed layer */
+	int fixed_alloc;
+	/** add fixed_quality */
+	int fixed_quality;
+	/** if != 0, then original dimension divided by 2^(reduce); if == 0 or not used, image is decoded to the full resolution */
+	int reduce;
+	/** if != 0, then only the first "layer" layers are decoded; if == 0 or not used, all the quality layers are decoded */
+	int layer;
+	/** if == NO_LIMITATION, decode entire codestream; if == LIMIT_TO_MAIN_HEADER then only decode the main header */
+	OPJ_LIMIT_DECODING limit_decoding;
+	/** XTOsiz */
+	int tx0;
+	/** YTOsiz */
+	int ty0;
+	/** XTsiz */
+	int tdx;
+	/** YTsiz */
+	int tdy;
+	/** comment for coding */
+	char *comment;
+	/** number of tiles in width */
+	int tw;
+	/** number of tiles in heigth */
+	int th;
+	/** ID number of the tiles present in the codestream */
+	int *tileno;
+	/** size of the vector tileno */
+	int tileno_size;
+	/** packet header store there for futur use in t2_decode_packet */
+	unsigned char *ppm_data;
+	/** pointer remaining on the first byte of the first header if ppm is used */
+	unsigned char *ppm_data_first;
+	/** if ppm == 1 --> there was a PPM marker for the present tile */
+	int ppm;
+	/** use in case of multiple marker PPM (number of info already store) */
+	int ppm_store;
+	/** use in case of multiple marker PPM (case on non-finished previous info) */
+	int ppm_previous;
+	/** ppmbug1 */
+	int ppm_len;
+	/** tile coding parameters */
+	opj_tcp_t *tcps;
+	/** fixed layer */
+	int *matrice;
+/* UniPG>> */
+#ifdef USE_JPWL
+	/** enables writing of EPC in MH, thus activating JPWL */
+	bool epc_on;
+	/** enables writing of EPB, in case of activated JPWL */
+	bool epb_on;
+	/** enables writing of ESD, in case of activated JPWL */
+	bool esd_on;
+	/** enables writing of informative techniques of ESD, in case of activated JPWL */
+	bool info_on;
+	/** enables writing of RED, in case of activated JPWL */
+	bool red_on;
+	/** error protection method for MH (0,1,16,32,37-128) */
+	int hprot_MH;
+	/** tile number of header protection specification (>=0) */
+	int hprot_TPH_tileno[JPWL_MAX_NO_TILESPECS];
+	/** error protection methods for TPHs (0,1,16,32,37-128) */
+	int hprot_TPH[JPWL_MAX_NO_TILESPECS];
+	/** tile number of packet protection specification (>=0) */
+	int pprot_tileno[JPWL_MAX_NO_PACKSPECS];
+	/** packet number of packet protection specification (>=0) */
+	int pprot_packno[JPWL_MAX_NO_PACKSPECS];
+	/** error protection methods for packets (0,1,16,32,37-128) */
+	int pprot[JPWL_MAX_NO_PACKSPECS];
+	/** enables writing of ESD, (0/2/4 bytes) */
+	int sens_size;
+	/** sensitivity addressing size (0=auto/2/4 bytes) */
+	int sens_addr;
+	/** sensitivity range (0-3) */
+	int sens_range;
+	/** sensitivity method for MH (-1,0-7) */
+	int sens_MH;
+	/** tile number of sensitivity specification (>=0) */
+	int sens_TPH_tileno[JPWL_MAX_NO_TILESPECS];
+	/** sensitivity methods for TPHs (-1,0-7) */
+	int sens_TPH[JPWL_MAX_NO_TILESPECS];
+	/** enables JPWL correction at the decoder */
+	bool correct;
+	/** expected number of components at the decoder */
+	int exp_comps;
+	/** maximum number of tiles at the decoder */
+	int max_tiles;
+#endif /* USE_JPWL */
+/* <<UniPG */
+} opj_cp_t;
+
+/**
+JPEG-2000 codestream reader/writer
+*/
+typedef struct opj_j2k {
+	/** codec context */
+	opj_common_ptr cinfo;
+
+	/** locate in which part of the codestream the decoder is (main header, tile header, end) */
+	int state;
+	/** number of the tile curently concern by coding/decoding */
+	int curtileno;
+	/** Tile part number*/
+	int tp_num;
+	/** Tilepart number currently coding*/
+	int cur_tp_num;
+	/** Total number of tileparts of the current tile*/
+	int *cur_totnum_tp;
+	/**
+	locate the start position of the TLM marker  
+	after encoding the tilepart, a jump (in j2k_write_sod) is done to the TLM marker to store the value of its length. 
+	*/
+	int tlm_start;
+	/** Total num of tile parts in whole image = num tiles* num tileparts in each tile*/
+	/** used in TLMmarker*/
+	int totnum_tp;	
+	/** 
+	locate the position of the end of the tile in the codestream, 
+	used to detect a truncated codestream (in j2k_read_sod)
+	*/
+	unsigned char *eot;
+	/**
+	locate the start position of the SOT marker of the current coded tile:  
+	after encoding the tile, a jump (in j2k_write_sod) is done to the SOT marker to store the value of its length. 
+	*/
+	int sot_start;
+	int sod_start;
+	/**
+	as the J2K-file is written in several parts during encoding, 
+	it enables to make the right correction in position return by cio_tell
+	*/
+	int pos_correction;
+	/** array used to store the data of each tile */
+	unsigned char **tile_data;
+	/** array used to store the length of each tile */
+	int *tile_len;
+	/** 
+	decompression only : 
+	store decoding parameters common to all tiles (information like COD, COC in main header)
+	*/
+	opj_tcp_t *default_tcp;
+	/** pointer to the encoded / decoded image */
+	opj_image_t *image;
+	/** pointer to the coding parameters */
+	opj_cp_t *cp;
+	/** helper used to write the index file */
+	opj_codestream_info_t *cstr_info;
+	/** pointer to the byte i/o stream */
+	opj_cio_t *cio;
+} opj_j2k_t;
+
+/** @name Exported functions */
+/*@{*/
+/* ----------------------------------------------------------------------- */
+/**
+Creates a J2K decompression structure
+@param cinfo Codec context info
+@return Returns a handle to a J2K decompressor if successful, returns NULL otherwise
+*/
+opj_j2k_t* j2k_create_decompress(opj_common_ptr cinfo);
+/**
+Destroy a J2K decompressor handle
+@param j2k J2K decompressor handle to destroy
+*/
+void j2k_destroy_decompress(opj_j2k_t *j2k);
+/**
+Setup the decoder decoding parameters using user parameters.
+Decoding parameters are returned in j2k->cp. 
+@param j2k J2K decompressor handle
+@param parameters decompression parameters
+*/
+void j2k_setup_decoder(opj_j2k_t *j2k, opj_dparameters_t *parameters);
+/**
+Decode an image from a JPEG-2000 codestream
+@param j2k J2K decompressor handle
+@param cio Input buffer stream
+@param cstr_info Codestream information structure if required, NULL otherwise
+@return Returns a decoded image if successful, returns NULL otherwise
+*/
+opj_image_t* j2k_decode(opj_j2k_t *j2k, opj_cio_t *cio, opj_codestream_info_t *cstr_info);
+/**
+Decode an image form a JPT-stream (JPEG 2000, JPIP)
+@param j2k J2K decompressor handle
+@param cio Input buffer stream
+@param cstr_info Codestream information structure if required, NULL otherwise
+@return Returns a decoded image if successful, returns NULL otherwise
+*/
+opj_image_t* j2k_decode_jpt_stream(opj_j2k_t *j2k, opj_cio_t *cio, opj_codestream_info_t *cstr_info);
+/**
+Creates a J2K compression structure
+@param cinfo Codec context info
+@return Returns a handle to a J2K compressor if successful, returns NULL otherwise
+*/
+opj_j2k_t* j2k_create_compress(opj_common_ptr cinfo);
+/**
+Destroy a J2K compressor handle
+@param j2k J2K compressor handle to destroy
+*/
+void j2k_destroy_compress(opj_j2k_t *j2k);
+/**
+Setup the encoder parameters using the current image and using user parameters. 
+Coding parameters are returned in j2k->cp. 
+@param j2k J2K compressor handle
+@param parameters compression parameters
+@param image input filled image
+*/
+void j2k_setup_encoder(opj_j2k_t *j2k, opj_cparameters_t *parameters, opj_image_t *image);
+/**
+Converts an enum type progression order to string type
+*/
+char *j2k_convert_progression_order(OPJ_PROG_ORDER prg_order);
+/**
+Encode an image into a JPEG-2000 codestream
+@param j2k J2K compressor handle
+@param cio Output buffer stream
+@param image Image to encode
+@param cstr_info Codestream information structure if required, NULL otherwise
+@return Returns true if successful, returns false otherwise
+*/
+bool j2k_encode(opj_j2k_t *j2k, opj_cio_t *cio, opj_image_t *image, opj_codestream_info_t *cstr_info);
+
+/* ----------------------------------------------------------------------- */
+/*@}*/
+
+/*@}*/
+
+#endif /* __J2K_H */
diff --git a/extern/libopenjpeg/j2k_lib.c b/extern/libopenjpeg/j2k_lib.c
new file mode 100644
index 00000000000..91aee007152
--- /dev/null
+++ b/extern/libopenjpeg/j2k_lib.c
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifdef WIN32
+#include <windows.h>
+#else
+#include <sys/time.h>
+#include <sys/resource.h>
+#include <sys/times.h>
+#endif /* WIN32 */
+#include "opj_includes.h"
+
+double opj_clock(void) {
+#ifdef WIN32
+	/* WIN32: use QueryPerformance (very accurate) */
+    LARGE_INTEGER freq , t ;
+    /* freq is the clock speed of the CPU */
+    QueryPerformanceFrequency(&freq) ;
+	/* cout << "freq = " << ((double) freq.QuadPart) << endl; */
+    /* t is the high resolution performance counter (see MSDN) */
+    QueryPerformanceCounter ( & t ) ;
+    return ( t.QuadPart /(double) freq.QuadPart ) ;
+#else
+	/* Unix or Linux: use resource usage */
+    struct rusage t;
+    double procTime;
+    /* (1) Get the rusage data structure at this moment (man getrusage) */
+    getrusage(0,&t);
+    /* (2) What is the elapsed time ? - CPU time = User time + System time */
+	/* (2a) Get the seconds */
+    procTime = t.ru_utime.tv_sec + t.ru_stime.tv_sec;
+    /* (2b) More precisely! Get the microseconds part ! */
+    return ( procTime + (t.ru_utime.tv_usec + t.ru_stime.tv_usec) * 1e-6 ) ;
+#endif
+}
+
diff --git a/extern/libopenjpeg/j2k_lib.h b/extern/libopenjpeg/j2k_lib.h
new file mode 100644
index 00000000000..7df4d367757
--- /dev/null
+++ b/extern/libopenjpeg/j2k_lib.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef __J2K_LIB_H
+#define __J2K_LIB_H
+/**
+@file j2k_lib.h
+@brief Internal functions
+
+The functions in J2K_LIB.C are internal utilities mainly used for timing.
+*/
+
+/** @defgroup MISC MISC - Miscellaneous internal functions */
+/*@{*/
+
+/** @name Exported functions */
+/*@{*/
+/* ----------------------------------------------------------------------- */
+
+/**
+Difference in successive opj_clock() calls tells you the elapsed time
+@return Returns time in seconds
+*/
+double opj_clock(void);
+
+/* ----------------------------------------------------------------------- */
+/*@}*/
+
+/*@}*/
+
+#endif /* __J2K_LIB_H */
+
diff --git a/extern/libopenjpeg/jp2.c b/extern/libopenjpeg/jp2.c
new file mode 100644
index 00000000000..14f9493c401
--- /dev/null
+++ b/extern/libopenjpeg/jp2.c
@@ -0,0 +1,710 @@
+/*
+ * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2007, Professor Benoit Macq
+ * Copyright (c) 2001-2003, David Janssens
+ * Copyright (c) 2002-2003, Yannick Verschueren
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "opj_includes.h"
+
+/** @defgroup JP2 JP2 - JPEG-2000 file format reader/writer */
+/*@{*/
+
+/** @name Local static functions */
+/*@{*/
+
+/**
+Read box headers
+@param cinfo Codec context info
+@param cio Input stream
+@param box
+@return Returns true if successful, returns false otherwise
+*/
+static bool jp2_read_boxhdr(opj_common_ptr cinfo, opj_cio_t *cio, opj_jp2_box_t *box);
+/*static void jp2_write_url(opj_cio_t *cio, char *Idx_file);*/
+/**
+Read the IHDR box - Image Header box
+@param jp2 JP2 handle
+@param cio Input buffer stream
+@return Returns true if successful, returns false otherwise
+*/
+static bool jp2_read_ihdr(opj_jp2_t *jp2, opj_cio_t *cio);
+static void jp2_write_ihdr(opj_jp2_t *jp2, opj_cio_t *cio);
+static void jp2_write_bpcc(opj_jp2_t *jp2, opj_cio_t *cio);
+static bool jp2_read_bpcc(opj_jp2_t *jp2, opj_cio_t *cio);
+static void jp2_write_colr(opj_jp2_t *jp2, opj_cio_t *cio);
+static bool jp2_read_colr(opj_jp2_t *jp2, opj_cio_t *cio);
+/**
+Write the FTYP box - File type box
+@param jp2 JP2 handle
+@param cio Output buffer stream
+*/
+static void jp2_write_ftyp(opj_jp2_t *jp2, opj_cio_t *cio);
+/**
+Read the FTYP box - File type box
+@param jp2 JP2 handle
+@param cio Input buffer stream
+@return Returns true if successful, returns false otherwise
+*/
+static bool jp2_read_ftyp(opj_jp2_t *jp2, opj_cio_t *cio);
+static int jp2_write_jp2c(opj_jp2_t *jp2, opj_cio_t *cio, opj_image_t *image, opj_codestream_info_t *cstr_info);
+static bool jp2_read_jp2c(opj_jp2_t *jp2, opj_cio_t *cio, unsigned int *j2k_codestream_length, unsigned int *j2k_codestream_offset);
+static void jp2_write_jp(opj_cio_t *cio);
+/**
+Read the JP box - JPEG 2000 signature
+@param jp2 JP2 handle
+@param cio Input buffer stream
+@return Returns true if successful, returns false otherwise
+*/
+static bool jp2_read_jp(opj_jp2_t *jp2, opj_cio_t *cio);
+/**
+Decode the structure of a JP2 file
+@param jp2 JP2 handle
+@param cio Input buffer stream
+@return Returns true if successful, returns false otherwise
+*/
+static bool jp2_read_struct(opj_jp2_t *jp2, opj_cio_t *cio);
+
+/*@}*/
+
+/*@}*/
+
+/* ----------------------------------------------------------------------- */
+
+static bool jp2_read_boxhdr(opj_common_ptr cinfo, opj_cio_t *cio, opj_jp2_box_t *box) {
+	box->init_pos = cio_tell(cio);
+	box->length = cio_read(cio, 4);
+	box->type = cio_read(cio, 4);
+	if (box->length == 1) {
+		if (cio_read(cio, 4) != 0) {
+			opj_event_msg(cinfo, EVT_ERROR, "Cannot handle box sizes higher than 2^32\n");
+			return false;
+		}
+		box->length = cio_read(cio, 4);
+		if (box->length == 0) 
+			box->length = cio_numbytesleft(cio) + 12;
+	}
+	else if (box->length == 0) {
+		box->length = cio_numbytesleft(cio) + 8;
+	}
+	
+	return true;
+}
+
+#if 0
+static void jp2_write_url(opj_cio_t *cio, char *Idx_file) {
+	unsigned int i;
+	opj_jp2_box_t box;
+
+	box.init_pos = cio_tell(cio);
+	cio_skip(cio, 4);
+	cio_write(cio, JP2_URL, 4);	/* DBTL */
+	cio_write(cio, 0, 1);		/* VERS */
+	cio_write(cio, 0, 3);		/* FLAG */
+
+	if(Idx_file) {
+		for (i = 0; i < strlen(Idx_file); i++) {
+			cio_write(cio, Idx_file[i], 1);
+		}
+	}
+
+	box.length = cio_tell(cio) - box.init_pos;
+	cio_seek(cio, box.init_pos);
+	cio_write(cio, box.length, 4);	/* L */
+	cio_seek(cio, box.init_pos + box.length);
+}
+#endif
+
+static bool jp2_read_ihdr(opj_jp2_t *jp2, opj_cio_t *cio) {
+	opj_jp2_box_t box;
+
+	opj_common_ptr cinfo = jp2->cinfo;
+
+	jp2_read_boxhdr(cinfo, cio, &box);
+	if (JP2_IHDR != box.type) {
+		opj_event_msg(cinfo, EVT_ERROR, "Expected IHDR Marker\n");
+		return false;
+	}
+
+	jp2->h = cio_read(cio, 4);			/* HEIGHT */
+	jp2->w = cio_read(cio, 4);			/* WIDTH */
+	jp2->numcomps = cio_read(cio, 2);	/* NC */
+	jp2->comps = (opj_jp2_comps_t*) opj_malloc(jp2->numcomps * sizeof(opj_jp2_comps_t));
+
+	jp2->bpc = cio_read(cio, 1);		/* BPC */
+
+	jp2->C = cio_read(cio, 1);			/* C */
+	jp2->UnkC = cio_read(cio, 1);		/* UnkC */
+	jp2->IPR = cio_read(cio, 1);		/* IPR */
+
+	if (cio_tell(cio) - box.init_pos != box.length) {
+		opj_event_msg(cinfo, EVT_ERROR, "Error with IHDR Box\n");
+		return false;
+	}
+
+	return true;
+}
+
+static void jp2_write_ihdr(opj_jp2_t *jp2, opj_cio_t *cio) {
+	opj_jp2_box_t box;
+
+	box.init_pos = cio_tell(cio);
+	cio_skip(cio, 4);
+	cio_write(cio, JP2_IHDR, 4);		/* IHDR */
+
+	cio_write(cio, jp2->h, 4);			/* HEIGHT */
+	cio_write(cio, jp2->w, 4);			/* WIDTH */
+	cio_write(cio, jp2->numcomps, 2);	/* NC */
+
+	cio_write(cio, jp2->bpc, 1);		/* BPC */
+
+	cio_write(cio, jp2->C, 1);			/* C : Always 7 */
+	cio_write(cio, jp2->UnkC, 1);		/* UnkC, colorspace unknown */
+	cio_write(cio, jp2->IPR, 1);		/* IPR, no intellectual property */
+
+	box.length = cio_tell(cio) - box.init_pos;
+	cio_seek(cio, box.init_pos);
+	cio_write(cio, box.length, 4);	/* L */
+	cio_seek(cio, box.init_pos + box.length);
+}
+
+static void jp2_write_bpcc(opj_jp2_t *jp2, opj_cio_t *cio) {
+	unsigned int i;
+	opj_jp2_box_t box;
+
+	box.init_pos = cio_tell(cio);
+	cio_skip(cio, 4);
+	cio_write(cio, JP2_BPCC, 4);	/* BPCC */
+
+	for (i = 0; i < jp2->numcomps; i++) {
+		cio_write(cio, jp2->comps[i].bpcc, 1);
+	}
+
+	box.length = cio_tell(cio) - box.init_pos;
+	cio_seek(cio, box.init_pos);
+	cio_write(cio, box.length, 4);	/* L */
+	cio_seek(cio, box.init_pos + box.length);
+}
+
+
+static bool jp2_read_bpcc(opj_jp2_t *jp2, opj_cio_t *cio) {
+	unsigned int i;
+	opj_jp2_box_t box;
+
+	opj_common_ptr cinfo = jp2->cinfo;
+
+	jp2_read_boxhdr(cinfo, cio, &box);
+	if (JP2_BPCC != box.type) {
+		opj_event_msg(cinfo, EVT_ERROR, "Expected BPCC Marker\n");
+		return false;
+	}
+
+	for (i = 0; i < jp2->numcomps; i++) {
+		jp2->comps[i].bpcc = cio_read(cio, 1);
+	}
+
+	if (cio_tell(cio) - box.init_pos != box.length) {
+		opj_event_msg(cinfo, EVT_ERROR, "Error with BPCC Box\n");
+		return false;
+	}
+
+	return true;
+}
+
+static void jp2_write_colr(opj_jp2_t *jp2, opj_cio_t *cio) {
+	opj_jp2_box_t box;
+
+	box.init_pos = cio_tell(cio);
+	cio_skip(cio, 4);
+	cio_write(cio, JP2_COLR, 4);		/* COLR */
+
+	cio_write(cio, jp2->meth, 1);		/* METH */
+	cio_write(cio, jp2->precedence, 1);	/* PRECEDENCE */
+	cio_write(cio, jp2->approx, 1);		/* APPROX */
+
+	if (jp2->meth == 1) {
+		cio_write(cio, jp2->enumcs, 4);	/* EnumCS */
+	} else {
+		cio_write(cio, 0, 1);			/* PROFILE (??) */
+	}
+
+	box.length = cio_tell(cio) - box.init_pos;
+	cio_seek(cio, box.init_pos);
+	cio_write(cio, box.length, 4);	/* L */
+	cio_seek(cio, box.init_pos + box.length);
+}
+
+static bool jp2_read_colr(opj_jp2_t *jp2, opj_cio_t *cio) {
+	opj_jp2_box_t box;
+	int skip_len;
+
+	opj_common_ptr cinfo = jp2->cinfo;
+
+	jp2_read_boxhdr(cinfo, cio, &box);
+	do {
+		if (JP2_COLR != box.type) {
+			cio_skip(cio, box.length - 8);
+			jp2_read_boxhdr(cinfo, cio, &box);
+		}
+	} while(JP2_COLR != box.type);
+
+	jp2->meth = cio_read(cio, 1);		/* METH */
+	jp2->precedence = cio_read(cio, 1);	/* PRECEDENCE */
+	jp2->approx = cio_read(cio, 1);		/* APPROX */
+
+	if (jp2->meth == 1) {
+		jp2->enumcs = cio_read(cio, 4);	/* EnumCS */
+	} else {
+		/* skip PROFILE */
+		skip_len = box.init_pos + box.length - cio_tell(cio);
+		if (skip_len < 0) {
+			opj_event_msg(cinfo, EVT_ERROR, "Error with JP2H box size\n");
+			return false;
+		}
+		cio_skip(cio, box.init_pos + box.length - cio_tell(cio));
+	}
+
+	if (cio_tell(cio) - box.init_pos != box.length) {
+		opj_event_msg(cinfo, EVT_ERROR, "Error with BPCC Box\n");
+		return false;
+	}
+	return true;
+}
+
+void jp2_write_jp2h(opj_jp2_t *jp2, opj_cio_t *cio) {
+	opj_jp2_box_t box;
+
+	box.init_pos = cio_tell(cio);
+	cio_skip(cio, 4);
+	cio_write(cio, JP2_JP2H, 4);	/* JP2H */
+
+	jp2_write_ihdr(jp2, cio);
+
+	if (jp2->bpc == 255) {
+		jp2_write_bpcc(jp2, cio);
+	}
+	jp2_write_colr(jp2, cio);
+
+	box.length = cio_tell(cio) - box.init_pos;
+	cio_seek(cio, box.init_pos);
+	cio_write(cio, box.length, 4);	/* L */
+	cio_seek(cio, box.init_pos + box.length);
+}
+
+bool jp2_read_jp2h(opj_jp2_t *jp2, opj_cio_t *cio) {
+	opj_jp2_box_t box;
+	int skip_len;
+
+	opj_common_ptr cinfo = jp2->cinfo;
+
+	jp2_read_boxhdr(cinfo, cio, &box);
+	do {
+		if (JP2_JP2H != box.type) {
+			if (box.type == JP2_JP2C) {
+				opj_event_msg(cinfo, EVT_ERROR, "Expected JP2H Marker\n");
+				return false;
+			}
+			cio_skip(cio, box.length - 8);
+			jp2_read_boxhdr(cinfo, cio, &box);
+		}
+	} while(JP2_JP2H != box.type);
+
+	if (!jp2_read_ihdr(jp2, cio))
+		return false;
+
+	if (jp2->bpc == 255) {
+		if (!jp2_read_bpcc(jp2, cio))
+			return false;
+	}
+	if (!jp2_read_colr(jp2, cio))
+		return false;
+
+	skip_len = box.init_pos + box.length - cio_tell(cio);
+	if (skip_len < 0) {
+		opj_event_msg(cinfo, EVT_ERROR, "Error with JP2H Box\n");
+		return false;
+	}
+	cio_skip(cio, box.init_pos + box.length - cio_tell(cio));
+
+	return true;
+}
+
+static void jp2_write_ftyp(opj_jp2_t *jp2, opj_cio_t *cio) {
+	unsigned int i;
+	opj_jp2_box_t box;
+
+	box.init_pos = cio_tell(cio);
+	cio_skip(cio, 4);
+	cio_write(cio, JP2_FTYP, 4);		/* FTYP */
+
+	cio_write(cio, jp2->brand, 4);		/* BR */
+	cio_write(cio, jp2->minversion, 4);	/* MinV */
+
+	for (i = 0; i < jp2->numcl; i++) {
+		cio_write(cio, jp2->cl[i], 4);	/* CL */
+	}
+
+	box.length = cio_tell(cio) - box.init_pos;
+	cio_seek(cio, box.init_pos);
+	cio_write(cio, box.length, 4);	/* L */
+	cio_seek(cio, box.init_pos + box.length);
+}
+
+static bool jp2_read_ftyp(opj_jp2_t *jp2, opj_cio_t *cio) {
+	int i;
+	opj_jp2_box_t box;
+
+	opj_common_ptr cinfo = jp2->cinfo;
+
+	jp2_read_boxhdr(cinfo, cio, &box);
+
+	if (JP2_FTYP != box.type) {
+		opj_event_msg(cinfo, EVT_ERROR, "Expected FTYP Marker\n");
+		return false;
+	}
+
+	jp2->brand = cio_read(cio, 4);		/* BR */
+	jp2->minversion = cio_read(cio, 4);	/* MinV */
+	jp2->numcl = (box.length - 16) / 4;
+	jp2->cl = (unsigned int *) opj_malloc(jp2->numcl * sizeof(unsigned int));
+
+	for (i = 0; i < (int)jp2->numcl; i++) {
+		jp2->cl[i] = cio_read(cio, 4);	/* CLi */
+	}
+
+	if (cio_tell(cio) - box.init_pos != box.length) {
+		opj_event_msg(cinfo, EVT_ERROR, "Error with FTYP Box\n");
+		return false;
+	}
+
+	return true;
+}
+
+static int jp2_write_jp2c(opj_jp2_t *jp2, opj_cio_t *cio, opj_image_t *image, opj_codestream_info_t *cstr_info) {
+	unsigned int j2k_codestream_offset, j2k_codestream_length;
+	opj_jp2_box_t box;
+
+	opj_j2k_t *j2k = jp2->j2k;
+
+	box.init_pos = cio_tell(cio);
+	cio_skip(cio, 4);
+	cio_write(cio, JP2_JP2C, 4);	/* JP2C */
+
+	/* J2K encoding */
+	j2k_codestream_offset = cio_tell(cio);
+	if(!j2k_encode(j2k, cio, image, cstr_info)) {
+		opj_event_msg(j2k->cinfo, EVT_ERROR, "Failed to encode image\n");
+		return 0;
+	}
+	j2k_codestream_length = cio_tell(cio) - j2k_codestream_offset;
+
+	jp2->j2k_codestream_offset = j2k_codestream_offset;
+	jp2->j2k_codestream_length = j2k_codestream_length;
+
+	box.length = 8 + jp2->j2k_codestream_length;
+	cio_seek(cio, box.init_pos);
+	cio_write(cio, box.length, 4);	/* L */
+	cio_seek(cio, box.init_pos + box.length);
+
+	return box.length;
+}
+
+static bool jp2_read_jp2c(opj_jp2_t *jp2, opj_cio_t *cio, unsigned int *j2k_codestream_length, unsigned int *j2k_codestream_offset) {
+	opj_jp2_box_t box;
+
+	opj_common_ptr cinfo = jp2->cinfo;
+
+	jp2_read_boxhdr(cinfo, cio, &box);
+	do {
+		if(JP2_JP2C != box.type) {
+			cio_skip(cio, box.length - 8);
+			jp2_read_boxhdr(cinfo, cio, &box);
+		}
+	} while(JP2_JP2C != box.type);
+
+	*j2k_codestream_offset = cio_tell(cio);
+	*j2k_codestream_length = box.length - 8;
+
+	return true;
+}
+
+static void jp2_write_jp(opj_cio_t *cio) {
+	opj_jp2_box_t box;
+
+	box.init_pos = cio_tell(cio);
+	cio_skip(cio, 4);
+	cio_write(cio, JP2_JP, 4);		/* JP2 signature */
+	cio_write(cio, 0x0d0a870a, 4);
+
+	box.length = cio_tell(cio) - box.init_pos;
+	cio_seek(cio, box.init_pos);
+	cio_write(cio, box.length, 4);	/* L */
+	cio_seek(cio, box.init_pos + box.length);
+}
+
+static bool jp2_read_jp(opj_jp2_t *jp2, opj_cio_t *cio) {
+	opj_jp2_box_t box;
+
+	opj_common_ptr cinfo = jp2->cinfo;
+
+	jp2_read_boxhdr(cinfo, cio, &box);
+	if (JP2_JP != box.type) {
+		opj_event_msg(cinfo, EVT_ERROR, "Expected JP Marker\n");
+		return false;
+	}
+	if (0x0d0a870a != cio_read(cio, 4)) {
+		opj_event_msg(cinfo, EVT_ERROR, "Error with JP Marker\n");
+		return false;
+	}
+	if (cio_tell(cio) - box.init_pos != box.length) {
+		opj_event_msg(cinfo, EVT_ERROR, "Error with JP Box size\n");
+		return false;
+	}
+
+	return true;
+}
+
+
+static bool jp2_read_struct(opj_jp2_t *jp2, opj_cio_t *cio) {
+	if (!jp2_read_jp(jp2, cio))
+		return false;
+	if (!jp2_read_ftyp(jp2, cio))
+		return false;
+	if (!jp2_read_jp2h(jp2, cio))
+		return false;
+	if (!jp2_read_jp2c(jp2, cio, &jp2->j2k_codestream_length, &jp2->j2k_codestream_offset))
+		return false;
+	
+	return true;
+}
+
+/* ----------------------------------------------------------------------- */
+/* JP2 decoder interface                                             */
+/* ----------------------------------------------------------------------- */
+
+opj_jp2_t* jp2_create_decompress(opj_common_ptr cinfo) {
+	opj_jp2_t *jp2 = (opj_jp2_t*) opj_calloc(1, sizeof(opj_jp2_t));
+	if(jp2) {
+		jp2->cinfo = cinfo;
+		/* create the J2K codec */
+		jp2->j2k = j2k_create_decompress(cinfo);
+		if(jp2->j2k == NULL) {
+			jp2_destroy_decompress(jp2);
+			return NULL;
+		}
+	}
+	return jp2;
+}
+
+void jp2_destroy_decompress(opj_jp2_t *jp2) {
+	if(jp2) {
+		/* destroy the J2K codec */
+		j2k_destroy_decompress(jp2->j2k);
+
+		if(jp2->comps) {
+			opj_free(jp2->comps);
+		}
+		if(jp2->cl) {
+			opj_free(jp2->cl);
+		}
+		opj_free(jp2);
+	}
+}
+
+void jp2_setup_decoder(opj_jp2_t *jp2, opj_dparameters_t *parameters) {
+	/* setup the J2K codec */
+	j2k_setup_decoder(jp2->j2k, parameters);
+	/* further JP2 initializations go here */
+}
+
+opj_image_t* jp2_decode(opj_jp2_t *jp2, opj_cio_t *cio, opj_codestream_info_t *cstr_info) {
+	opj_common_ptr cinfo;
+	opj_image_t *image = NULL;
+
+	if(!jp2 || !cio) {
+		return NULL;
+	}
+
+	cinfo = jp2->cinfo;
+
+	/* JP2 decoding */
+	if(!jp2_read_struct(jp2, cio)) {
+		opj_event_msg(cinfo, EVT_ERROR, "Failed to decode jp2 structure\n");
+		return NULL;
+	}
+
+	/* J2K decoding */
+	image = j2k_decode(jp2->j2k, cio, cstr_info);
+	if(!image) {
+		opj_event_msg(cinfo, EVT_ERROR, "Failed to decode J2K image\n");
+	}
+
+	/* Set Image Color Space */
+	if (jp2->enumcs == 16)
+		image->color_space = CLRSPC_SRGB;
+	else if (jp2->enumcs == 17)
+		image->color_space = CLRSPC_GRAY;
+	else if (jp2->enumcs == 18)
+		image->color_space = CLRSPC_SYCC;
+	else
+		image->color_space = CLRSPC_UNKNOWN;
+
+	return image;
+}
+
+/* ----------------------------------------------------------------------- */
+/* JP2 encoder interface                                             */
+/* ----------------------------------------------------------------------- */
+
+opj_jp2_t* jp2_create_compress(opj_common_ptr cinfo) {
+	opj_jp2_t *jp2 = (opj_jp2_t*)opj_malloc(sizeof(opj_jp2_t));
+	if(jp2) {
+		jp2->cinfo = cinfo;
+		/* create the J2K codec */
+		jp2->j2k = j2k_create_compress(cinfo);
+		if(jp2->j2k == NULL) {
+			jp2_destroy_compress(jp2);
+			return NULL;
+		}
+	}
+	return jp2;
+}
+
+void jp2_destroy_compress(opj_jp2_t *jp2) {
+	if(jp2) {
+		/* destroy the J2K codec */
+		j2k_destroy_compress(jp2->j2k);
+
+		if(jp2->comps) {
+			opj_free(jp2->comps);
+		}
+		if(jp2->cl) {
+			opj_free(jp2->cl);
+		}
+		opj_free(jp2);
+	}
+}
+
+void jp2_setup_encoder(opj_jp2_t *jp2, opj_cparameters_t *parameters, opj_image_t *image) {
+	int i;
+	int depth_0, sign;
+
+	if(!jp2 || !parameters || !image)
+		return;
+
+	/* setup the J2K codec */
+	/* ------------------- */
+
+	/* Check if number of components respects standard */
+	if (image->numcomps < 1 || image->numcomps > 16384) {
+		opj_event_msg(jp2->cinfo, EVT_ERROR, "Invalid number of components specified while setting up JP2 encoder\n");
+		return;
+	}
+
+	j2k_setup_encoder(jp2->j2k, parameters, image);
+
+	/* setup the JP2 codec */
+	/* ------------------- */
+	
+	/* Profile box */
+
+	jp2->brand = JP2_JP2;	/* BR */
+	jp2->minversion = 0;	/* MinV */
+	jp2->numcl = 1;
+	jp2->cl = (unsigned int*) opj_malloc(jp2->numcl * sizeof(unsigned int));
+	jp2->cl[0] = JP2_JP2;	/* CL0 : JP2 */
+
+	/* Image Header box */
+
+	jp2->numcomps = image->numcomps;	/* NC */
+	jp2->comps = (opj_jp2_comps_t*) opj_malloc(jp2->numcomps * sizeof(opj_jp2_comps_t));
+	jp2->h = image->y1 - image->y0;		/* HEIGHT */
+	jp2->w = image->x1 - image->x0;		/* WIDTH */
+	/* BPC */
+	depth_0 = image->comps[0].prec - 1;
+	sign = image->comps[0].sgnd;
+	jp2->bpc = depth_0 + (sign << 7);
+	for (i = 1; i < image->numcomps; i++) {
+		int depth = image->comps[i].prec - 1;
+		sign = image->comps[i].sgnd;
+		if (depth_0 != depth)
+			jp2->bpc = 255;
+	}
+	jp2->C = 7;			/* C : Always 7 */
+	jp2->UnkC = 0;		/* UnkC, colorspace specified in colr box */
+	jp2->IPR = 0;		/* IPR, no intellectual property */
+	
+	/* BitsPerComponent box */
+
+	for (i = 0; i < image->numcomps; i++) {
+		jp2->comps[i].bpcc = image->comps[i].prec - 1 + (image->comps[i].sgnd << 7);
+	}
+
+	/* Colour Specification box */
+
+	if ((image->numcomps == 1 || image->numcomps == 3) && (jp2->bpc != 255)) {
+		jp2->meth = 1;	/* METH: Enumerated colourspace */
+	} else {
+		jp2->meth = 2;	/* METH: Restricted ICC profile */
+	}
+	if (jp2->meth == 1) {
+		if (image->color_space == 1)
+			jp2->enumcs = 16;	/* sRGB as defined by IEC 61966–2–1 */
+		else if (image->color_space == 2)
+			jp2->enumcs = 17;	/* greyscale */
+		else if (image->color_space == 3)
+			jp2->enumcs = 18;	/* YUV */
+	} else {
+		jp2->enumcs = 0;		/* PROFILE (??) */
+	}
+	jp2->precedence = 0;	/* PRECEDENCE */
+	jp2->approx = 0;		/* APPROX */
+
+}
+
+bool jp2_encode(opj_jp2_t *jp2, opj_cio_t *cio, opj_image_t *image, opj_codestream_info_t *cstr_info) {
+
+	/* JP2 encoding */
+
+	/* JPEG 2000 Signature box */
+	jp2_write_jp(cio);
+	/* File Type box */
+	jp2_write_ftyp(jp2, cio);
+	/* JP2 Header box */
+	jp2_write_jp2h(jp2, cio);
+
+	/* J2K encoding */
+
+	if(!jp2_write_jp2c(jp2, cio, image, cstr_info)) {
+		opj_event_msg(jp2->cinfo, EVT_ERROR, "Failed to encode image\n");
+		return false;
+	}
+
+	return true;
+}
+
+
diff --git a/extern/libopenjpeg/jp2.h b/extern/libopenjpeg/jp2.h
new file mode 100644
index 00000000000..7e363be2eee
--- /dev/null
+++ b/extern/libopenjpeg/jp2.h
@@ -0,0 +1,177 @@
+/*
+ * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2007, Professor Benoit Macq
+ * Copyright (c) 2002-2003, Yannick Verschueren
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef __JP2_H
+#define __JP2_H
+/**
+@file jp2.h
+@brief The JPEG-2000 file format Reader/Writer (JP2)
+
+*/
+
+/** @defgroup JP2 JP2 - JPEG-2000 file format reader/writer */
+/*@{*/
+
+#define JPIP_JPIP 0x6a706970
+
+#define JP2_JP   0x6a502020		/**< JPEG 2000 signature box */
+#define JP2_FTYP 0x66747970		/**< File type box */
+#define JP2_JP2H 0x6a703268		/**< JP2 header box */
+#define JP2_IHDR 0x69686472		/**< Image header box */
+#define JP2_COLR 0x636f6c72		/**< Colour specification box */
+#define JP2_JP2C 0x6a703263		/**< Contiguous codestream box */
+#define JP2_URL  0x75726c20		/**< URL box */
+#define JP2_DBTL 0x6474626c		/**< ??? */
+#define JP2_BPCC 0x62706363		/**< Bits per component box */
+#define JP2_JP2  0x6a703220		/**< File type fields */
+
+/* ----------------------------------------------------------------------- */
+
+/** 
+JP2 component
+*/
+typedef struct opj_jp2_comps {
+  int depth;		  
+  int sgnd;		   
+  int bpcc;
+} opj_jp2_comps_t;
+
+/**
+JPEG-2000 file format reader/writer
+*/
+typedef struct opj_jp2 {
+	/** codec context */
+	opj_common_ptr cinfo;
+	/** handle to the J2K codec  */
+	opj_j2k_t *j2k;
+	unsigned int w;
+	unsigned int h;
+	unsigned int numcomps;
+	unsigned int bpc;
+	unsigned int C;
+	unsigned int UnkC;
+	unsigned int IPR;
+	unsigned int meth;
+	unsigned int approx;
+	unsigned int enumcs;
+	unsigned int precedence;
+	unsigned int brand;
+	unsigned int minversion;
+	unsigned int numcl;
+	unsigned int *cl;
+	opj_jp2_comps_t *comps;
+	unsigned int j2k_codestream_offset;
+	unsigned int j2k_codestream_length;
+} opj_jp2_t;
+
+/**
+JP2 Box
+*/
+typedef struct opj_jp2_box {
+  int length;
+  int type;
+  int init_pos;
+} opj_jp2_box_t;
+
+/** @name Exported functions */
+/*@{*/
+/* ----------------------------------------------------------------------- */
+/**
+Write the JP2H box - JP2 Header box (used in MJ2)
+@param jp2 JP2 handle
+@param cio Output buffer stream
+*/
+void jp2_write_jp2h(opj_jp2_t *jp2, opj_cio_t *cio);
+/**
+Read the JP2H box - JP2 Header box (used in MJ2)
+@param jp2 JP2 handle
+@param cio Input buffer stream
+@return Returns true if successful, returns false otherwise
+*/
+bool jp2_read_jp2h(opj_jp2_t *jp2, opj_cio_t *cio);
+/**
+Creates a JP2 decompression structure
+@param cinfo Codec context info
+@return Returns a handle to a JP2 decompressor if successful, returns NULL otherwise
+*/
+opj_jp2_t* jp2_create_decompress(opj_common_ptr cinfo);
+/**
+Destroy a JP2 decompressor handle
+@param jp2 JP2 decompressor handle to destroy
+*/
+void jp2_destroy_decompress(opj_jp2_t *jp2);
+/**
+Setup the decoder decoding parameters using user parameters.
+Decoding parameters are returned in jp2->j2k->cp. 
+@param jp2 JP2 decompressor handle
+@param parameters decompression parameters
+*/
+void jp2_setup_decoder(opj_jp2_t *jp2, opj_dparameters_t *parameters);
+/**
+Decode an image from a JPEG-2000 file stream
+@param jp2 JP2 decompressor handle
+@param cio Input buffer stream
+@param cstr_info Codestream information structure if required, NULL otherwise
+@return Returns a decoded image if successful, returns NULL otherwise
+*/
+opj_image_t* jp2_decode(opj_jp2_t *jp2, opj_cio_t *cio, opj_codestream_info_t *cstr_info);
+/**
+Creates a JP2 compression structure
+@param cinfo Codec context info
+@return Returns a handle to a JP2 compressor if successful, returns NULL otherwise
+*/
+opj_jp2_t* jp2_create_compress(opj_common_ptr cinfo);
+/**
+Destroy a JP2 compressor handle
+@param jp2 JP2 compressor handle to destroy
+*/
+void jp2_destroy_compress(opj_jp2_t *jp2);
+/**
+Setup the encoder parameters using the current image and using user parameters. 
+Coding parameters are returned in jp2->j2k->cp. 
+@param jp2 JP2 compressor handle
+@param parameters compression parameters
+@param image input filled image
+*/
+void jp2_setup_encoder(opj_jp2_t *jp2, opj_cparameters_t *parameters, opj_image_t *image);
+/**
+Encode an image into a JPEG-2000 file stream
+@param jp2 JP2 compressor handle
+@param cio Output buffer stream
+@param image Image to encode
+@param cstr_info Codestream information structure if required, NULL otherwise
+@return Returns true if successful, returns false otherwise
+*/
+bool jp2_encode(opj_jp2_t *jp2, opj_cio_t *cio, opj_image_t *image, opj_codestream_info_t *cstr_info);
+/* ----------------------------------------------------------------------- */
+/*@}*/
+
+/*@}*/
+
+#endif /* __JP2_H */
+
diff --git a/extern/libopenjpeg/jpt.c b/extern/libopenjpeg/jpt.c
new file mode 100644
index 00000000000..a2566ea8872
--- /dev/null
+++ b/extern/libopenjpeg/jpt.c
@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2007, Professor Benoit Macq
+ * Copyright (c) 2002-2003, Yannick Verschueren
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "opj_includes.h"
+
+/*
+ * Read the information contains in VBAS [JPP/JPT stream message header]
+ * Store information (7 bits) in value
+ *
+ */
+unsigned int jpt_read_VBAS_info(opj_cio_t *cio, unsigned int value) {
+	unsigned char elmt;
+
+	elmt = cio_read(cio, 1);
+	while ((elmt >> 7) == 1) {
+		value = (value << 7);
+		value |= (elmt & 0x7f);
+		elmt = cio_read(cio, 1);
+	}
+	value = (value << 7);
+	value |= (elmt & 0x7f);
+
+	return value;
+}
+
+/*
+ * Initialize the value of the message header structure 
+ *
+ */
+void jpt_init_msg_header(opj_jpt_msg_header_t * header) {
+	header->Id = 0;		/* In-class Identifier    */
+	header->last_byte = 0;	/* Last byte information  */
+	header->Class_Id = 0;		/* Class Identifier       */
+	header->CSn_Id = 0;		/* CSn : index identifier */
+	header->Msg_offset = 0;	/* Message offset         */
+	header->Msg_length = 0;	/* Message length         */
+	header->Layer_nb = 0;		/* Auxiliary for JPP case */
+}
+
+/*
+ * Re-initialize the value of the message header structure
+ *
+ * Only parameters always present in message header
+ *
+ */
+void jpt_reinit_msg_header(opj_jpt_msg_header_t * header) {
+	header->Id = 0;		/* In-class Identifier    */
+	header->last_byte = 0;	/* Last byte information  */
+	header->Msg_offset = 0;	/* Message offset         */
+	header->Msg_length = 0;	/* Message length         */
+}
+
+/*
+ * Read the message header for a JPP/JPT - stream
+ *
+ */
+void jpt_read_msg_header(opj_common_ptr cinfo, opj_cio_t *cio, opj_jpt_msg_header_t *header) {
+	unsigned char elmt, Class = 0, CSn = 0;
+	jpt_reinit_msg_header(header);
+
+	/* ------------- */
+	/* VBAS : Bin-ID */
+	/* ------------- */
+	elmt = cio_read(cio, 1);
+
+	/* See for Class and CSn */
+	switch ((elmt >> 5) & 0x03) {
+		case 0:
+			opj_event_msg(cinfo, EVT_ERROR, "Forbidden value encounter in message header !!\n");
+			break;
+		case 1:
+			Class = 0;
+			CSn = 0;
+			break;
+		case 2:
+			Class = 1;
+			CSn = 0;
+			break;
+		case 3:
+			Class = 1;
+			CSn = 1;
+			break;
+		default:
+			break;
+	}
+
+	/* see information on bits 'c' [p 10 : A.2.1 general, ISO/IEC FCD 15444-9] */
+	if (((elmt >> 4) & 0x01) == 1)
+		header->last_byte = 1;
+
+	/* In-class identifier */
+	header->Id |= (elmt & 0x0f);
+	if ((elmt >> 7) == 1)
+		header->Id = jpt_read_VBAS_info(cio, header->Id);
+
+	/* ------------ */
+	/* VBAS : Class */
+	/* ------------ */
+	if (Class == 1) {
+		header->Class_Id = 0;
+		header->Class_Id = jpt_read_VBAS_info(cio, header->Class_Id);
+	}
+
+	/* ---------- */
+	/* VBAS : CSn */
+	/* ---------- */
+	if (CSn == 1) {
+		header->CSn_Id = 0;
+		header->CSn_Id = jpt_read_VBAS_info(cio, header->CSn_Id);
+	}
+
+	/* ----------------- */
+	/* VBAS : Msg_offset */
+	/* ----------------- */
+	header->Msg_offset = jpt_read_VBAS_info(cio, header->Msg_offset);
+
+	/* ----------------- */
+	/* VBAS : Msg_length */
+	/* ----------------- */
+	header->Msg_length = jpt_read_VBAS_info(cio, header->Msg_length);
+
+	/* ---------- */
+	/* VBAS : Aux */
+	/* ---------- */
+	if ((header->Class_Id & 0x01) == 1) {
+		header->Layer_nb = 0;
+		header->Layer_nb = jpt_read_VBAS_info(cio, header->Layer_nb);
+	}
+}
diff --git a/extern/libopenjpeg/jpt.h b/extern/libopenjpeg/jpt.h
new file mode 100644
index 00000000000..eb01f98eb85
--- /dev/null
+++ b/extern/libopenjpeg/jpt.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2007, Professor Benoit Macq
+ * Copyright (c) 2002-2003, Yannick Verschueren
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __JPT_H
+#define __JPT_H
+/**
+@file jpt.h
+@brief JPT-stream reader (JPEG 2000, JPIP)
+
+JPT-stream functions are implemented in J2K.C. 
+*/
+
+/**
+Message Header JPT stream structure
+*/
+typedef struct opj_jpt_msg_header {
+	/** In-class Identifier */
+	unsigned int Id;
+	/** Last byte information */
+	unsigned int last_byte;	
+	/** Class Identifier */
+	unsigned int Class_Id;	
+	/** CSn : index identifier */
+	unsigned int CSn_Id;
+	/** Message offset */
+	unsigned int Msg_offset;
+	/** Message length */
+	unsigned int Msg_length;
+	/** Auxiliary for JPP case */
+	unsigned int Layer_nb;
+} opj_jpt_msg_header_t;
+
+/* ----------------------------------------------------------------------- */
+
+/**
+Initialize the value of the message header structure 
+@param header Message header structure
+*/
+void jpt_init_msg_header(opj_jpt_msg_header_t * header);
+
+/**
+Read the message header for a JPP/JPT - stream
+@param cinfo Codec context info
+@param cio CIO handle
+@param header Message header structure
+*/
+void jpt_read_msg_header(opj_common_ptr cinfo, opj_cio_t *cio, opj_jpt_msg_header_t *header);
+
+#endif
diff --git a/extern/libopenjpeg/license.txt b/extern/libopenjpeg/license.txt
new file mode 100644
index 00000000000..d1e5b6a5333
--- /dev/null
+++ b/extern/libopenjpeg/license.txt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2007, Professor Benoit Macq
+ * Copyright (c) 2001-2003, David Janssens
+ * Copyright (c) 2002-2003, Yannick Verschueren
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
\ No newline at end of file
diff --git a/extern/libopenjpeg/mct.c b/extern/libopenjpeg/mct.c
new file mode 100644
index 00000000000..ca21744f3e4
--- /dev/null
+++ b/extern/libopenjpeg/mct.c
@@ -0,0 +1,148 @@
+/*
+ * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2007, Professor Benoit Macq
+ * Copyright (c) 2001-2003, David Janssens
+ * Copyright (c) 2002-2003, Yannick Verschueren
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "opj_includes.h"
+
+/* <summary> */
+/* This table contains the norms of the basis function of the reversible MCT. */
+/* </summary> */
+static const double mct_norms[3] = { 1.732, .8292, .8292 };
+
+/* <summary> */
+/* This table contains the norms of the basis function of the irreversible MCT. */
+/* </summary> */
+static const double mct_norms_real[3] = { 1.732, 1.805, 1.573 };
+
+/* <summary> */
+/* Foward reversible MCT. */
+/* </summary> */
+void mct_encode(
+		int* restrict c0,
+		int* restrict c1,
+		int* restrict c2,
+		int n)
+{
+	int i;
+	for(i = 0; i < n; ++i) {
+		int r = c0[i];
+		int g = c1[i];
+		int b = c2[i];
+		int y = (r + (g * 2) + b) >> 2;
+		int u = b - g;
+		int v = r - g;
+		c0[i] = y;
+		c1[i] = u;
+		c2[i] = v;
+	}
+}
+
+/* <summary> */
+/* Inverse reversible MCT. */
+/* </summary> */
+void mct_decode(
+		int* restrict c0,
+		int* restrict c1, 
+		int* restrict c2, 
+		int n)
+{
+	int i;
+	for (i = 0; i < n; ++i) {
+		int y = c0[i];
+		int u = c1[i];
+		int v = c2[i];
+		int g = y - ((u + v) >> 2);
+		int r = v + g;
+		int b = u + g;
+		c0[i] = r;
+		c1[i] = g;
+		c2[i] = b;
+	}
+}
+
+/* <summary> */
+/* Get norm of basis function of reversible MCT. */
+/* </summary> */
+double mct_getnorm(int compno) {
+	return mct_norms[compno];
+}
+
+/* <summary> */
+/* Foward irreversible MCT. */
+/* </summary> */
+void mct_encode_real(
+		int* restrict c0,
+		int* restrict c1,
+		int* restrict c2,
+		int n)
+{
+	int i;
+	for(i = 0; i < n; ++i) {
+		int r = c0[i];
+		int g = c1[i];
+		int b = c2[i];
+		int y =  fix_mul(r, 2449) + fix_mul(g, 4809) + fix_mul(b, 934);
+		int u = -fix_mul(r, 1382) - fix_mul(g, 2714) + fix_mul(b, 4096);
+		int v =  fix_mul(r, 4096) - fix_mul(g, 3430) - fix_mul(b, 666);
+		c0[i] = y;
+		c1[i] = u;
+		c2[i] = v;
+	}
+}
+
+/* <summary> */
+/* Inverse irreversible MCT. */
+/* </summary> */
+void mct_decode_real(
+		float* restrict c0,
+		float* restrict c1,
+		float* restrict c2,
+		int n)
+{
+	int i;
+	for(i = 0; i < n; ++i) {
+		float y = c0[i];
+		float u = c1[i];
+		float v = c2[i];
+		float r = y + (v * 1.402f);
+		float g = y - (u * 0.34413f) - (v * (0.71414f));
+		float b = y + (u * 1.772f);
+		c0[i] = r;
+		c1[i] = g;
+		c2[i] = b;
+	}
+}
+
+/* <summary> */
+/* Get norm of basis function of irreversible MCT. */
+/* </summary> */
+double mct_getnorm_real(int compno) {
+	return mct_norms_real[compno];
+}
diff --git a/extern/libopenjpeg/mct.h b/extern/libopenjpeg/mct.h
new file mode 100644
index 00000000000..84e3f8add19
--- /dev/null
+++ b/extern/libopenjpeg/mct.h
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2007, Professor Benoit Macq
+ * Copyright (c) 2001-2003, David Janssens
+ * Copyright (c) 2002-2003, Yannick Verschueren
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __MCT_H
+#define __MCT_H
+/**
+@file mct.h
+@brief Implementation of a multi-component transforms (MCT)
+
+The functions in MCT.C have for goal to realize reversible and irreversible multicomponent
+transform. The functions in MCT.C are used by some function in TCD.C.
+*/
+
+/** @defgroup MCT MCT - Implementation of a multi-component transform */
+/*@{*/
+
+/** @name Exported functions */
+/*@{*/
+/* ----------------------------------------------------------------------- */
+/**
+Apply a reversible multi-component transform to an image
+@param c0 Samples for red component
+@param c1 Samples for green component
+@param c2 Samples blue component
+@param n Number of samples for each component
+*/
+void mct_encode(int *c0, int *c1, int *c2, int n);
+/**
+Apply a reversible multi-component inverse transform to an image
+@param c0 Samples for luminance component
+@param c1 Samples for red chrominance component
+@param c2 Samples for blue chrominance component
+@param n Number of samples for each component
+*/
+void mct_decode(int *c0, int *c1, int *c2, int n);
+/**
+Get norm of the basis function used for the reversible multi-component transform
+@param compno Number of the component (0->Y, 1->U, 2->V)
+@return 
+*/
+double mct_getnorm(int compno);
+
+/**
+Apply an irreversible multi-component transform to an image
+@param c0 Samples for red component
+@param c1 Samples for green component
+@param c2 Samples blue component
+@param n Number of samples for each component
+*/
+void mct_encode_real(int *c0, int *c1, int *c2, int n);
+/**
+Apply an irreversible multi-component inverse transform to an image
+@param c0 Samples for luminance component
+@param c1 Samples for red chrominance component
+@param c2 Samples for blue chrominance component
+@param n Number of samples for each component
+*/
+void mct_decode_real(float* c0, float* c1, float* c2, int n);
+/**
+Get norm of the basis function used for the irreversible multi-component transform
+@param compno Number of the component (0->Y, 1->U, 2->V)
+@return 
+*/
+double mct_getnorm_real(int compno);
+/* ----------------------------------------------------------------------- */
+/*@}*/
+
+/*@}*/
+
+#endif /* __MCT_H */
diff --git a/extern/libopenjpeg/mqc.c b/extern/libopenjpeg/mqc.c
new file mode 100644
index 00000000000..9aa9d2c2e5b
--- /dev/null
+++ b/extern/libopenjpeg/mqc.c
@@ -0,0 +1,538 @@
+/*
+ * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2007, Professor Benoit Macq
+ * Copyright (c) 2001-2003, David Janssens
+ * Copyright (c) 2002-2003, Yannick Verschueren
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "opj_includes.h"
+
+/** @defgroup MQC MQC - Implementation of an MQ-Coder */
+/*@{*/
+
+/** @name Local static functions */
+/*@{*/
+
+/**
+Output a byte, doing bit-stuffing if necessary.
+After a 0xff byte, the next byte must be smaller than 0x90.
+@param mqc MQC handle
+*/
+static void mqc_byteout(opj_mqc_t *mqc);
+/**
+Renormalize mqc->a and mqc->c while encoding, so that mqc->a stays between 0x8000 and 0x10000
+@param mqc MQC handle
+*/
+static void mqc_renorme(opj_mqc_t *mqc);
+/**
+Encode the most probable symbol
+@param mqc MQC handle
+*/
+static void mqc_codemps(opj_mqc_t *mqc);
+/**
+Encode the most least symbol
+@param mqc MQC handle
+*/
+static void mqc_codelps(opj_mqc_t *mqc);
+/**
+Fill mqc->c with 1's for flushing
+@param mqc MQC handle
+*/
+static void mqc_setbits(opj_mqc_t *mqc);
+/**
+FIXME: documentation ???
+@param mqc MQC handle
+@return 
+*/
+static int mqc_mpsexchange(opj_mqc_t *mqc);
+/**
+FIXME: documentation ???
+@param mqc MQC handle
+@return 
+*/
+static int mqc_lpsexchange(opj_mqc_t *mqc);
+/**
+Input a byte
+@param mqc MQC handle
+*/
+static void mqc_bytein(opj_mqc_t *mqc);
+/**
+Renormalize mqc->a and mqc->c while decoding
+@param mqc MQC handle
+*/
+static void mqc_renormd(opj_mqc_t *mqc);
+
+/*@}*/
+
+/*@}*/
+
+/* <summary> */
+/* This array defines all the possible states for a context. */
+/* </summary> */
+static opj_mqc_state_t mqc_states[47 * 2] = {
+	{0x5601, 0, &mqc_states[2], &mqc_states[3]},
+	{0x5601, 1, &mqc_states[3], &mqc_states[2]},
+	{0x3401, 0, &mqc_states[4], &mqc_states[12]},
+	{0x3401, 1, &mqc_states[5], &mqc_states[13]},
+	{0x1801, 0, &mqc_states[6], &mqc_states[18]},
+	{0x1801, 1, &mqc_states[7], &mqc_states[19]},
+	{0x0ac1, 0, &mqc_states[8], &mqc_states[24]},
+	{0x0ac1, 1, &mqc_states[9], &mqc_states[25]},
+	{0x0521, 0, &mqc_states[10], &mqc_states[58]},
+	{0x0521, 1, &mqc_states[11], &mqc_states[59]},
+	{0x0221, 0, &mqc_states[76], &mqc_states[66]},
+	{0x0221, 1, &mqc_states[77], &mqc_states[67]},
+	{0x5601, 0, &mqc_states[14], &mqc_states[13]},
+	{0x5601, 1, &mqc_states[15], &mqc_states[12]},
+	{0x5401, 0, &mqc_states[16], &mqc_states[28]},
+	{0x5401, 1, &mqc_states[17], &mqc_states[29]},
+	{0x4801, 0, &mqc_states[18], &mqc_states[28]},
+	{0x4801, 1, &mqc_states[19], &mqc_states[29]},
+	{0x3801, 0, &mqc_states[20], &mqc_states[28]},
+	{0x3801, 1, &mqc_states[21], &mqc_states[29]},
+	{0x3001, 0, &mqc_states[22], &mqc_states[34]},
+	{0x3001, 1, &mqc_states[23], &mqc_states[35]},
+	{0x2401, 0, &mqc_states[24], &mqc_states[36]},
+	{0x2401, 1, &mqc_states[25], &mqc_states[37]},
+	{0x1c01, 0, &mqc_states[26], &mqc_states[40]},
+	{0x1c01, 1, &mqc_states[27], &mqc_states[41]},
+	{0x1601, 0, &mqc_states[58], &mqc_states[42]},
+	{0x1601, 1, &mqc_states[59], &mqc_states[43]},
+	{0x5601, 0, &mqc_states[30], &mqc_states[29]},
+	{0x5601, 1, &mqc_states[31], &mqc_states[28]},
+	{0x5401, 0, &mqc_states[32], &mqc_states[28]},
+	{0x5401, 1, &mqc_states[33], &mqc_states[29]},
+	{0x5101, 0, &mqc_states[34], &mqc_states[30]},
+	{0x5101, 1, &mqc_states[35], &mqc_states[31]},
+	{0x4801, 0, &mqc_states[36], &mqc_states[32]},
+	{0x4801, 1, &mqc_states[37], &mqc_states[33]},
+	{0x3801, 0, &mqc_states[38], &mqc_states[34]},
+	{0x3801, 1, &mqc_states[39], &mqc_states[35]},
+	{0x3401, 0, &mqc_states[40], &mqc_states[36]},
+	{0x3401, 1, &mqc_states[41], &mqc_states[37]},
+	{0x3001, 0, &mqc_states[42], &mqc_states[38]},
+	{0x3001, 1, &mqc_states[43], &mqc_states[39]},
+	{0x2801, 0, &mqc_states[44], &mqc_states[38]},
+	{0x2801, 1, &mqc_states[45], &mqc_states[39]},
+	{0x2401, 0, &mqc_states[46], &mqc_states[40]},
+	{0x2401, 1, &mqc_states[47], &mqc_states[41]},
+	{0x2201, 0, &mqc_states[48], &mqc_states[42]},
+	{0x2201, 1, &mqc_states[49], &mqc_states[43]},
+	{0x1c01, 0, &mqc_states[50], &mqc_states[44]},
+	{0x1c01, 1, &mqc_states[51], &mqc_states[45]},
+	{0x1801, 0, &mqc_states[52], &mqc_states[46]},
+	{0x1801, 1, &mqc_states[53], &mqc_states[47]},
+	{0x1601, 0, &mqc_states[54], &mqc_states[48]},
+	{0x1601, 1, &mqc_states[55], &mqc_states[49]},
+	{0x1401, 0, &mqc_states[56], &mqc_states[50]},
+	{0x1401, 1, &mqc_states[57], &mqc_states[51]},
+	{0x1201, 0, &mqc_states[58], &mqc_states[52]},
+	{0x1201, 1, &mqc_states[59], &mqc_states[53]},
+	{0x1101, 0, &mqc_states[60], &mqc_states[54]},
+	{0x1101, 1, &mqc_states[61], &mqc_states[55]},
+	{0x0ac1, 0, &mqc_states[62], &mqc_states[56]},
+	{0x0ac1, 1, &mqc_states[63], &mqc_states[57]},
+	{0x09c1, 0, &mqc_states[64], &mqc_states[58]},
+	{0x09c1, 1, &mqc_states[65], &mqc_states[59]},
+	{0x08a1, 0, &mqc_states[66], &mqc_states[60]},
+	{0x08a1, 1, &mqc_states[67], &mqc_states[61]},
+	{0x0521, 0, &mqc_states[68], &mqc_states[62]},
+	{0x0521, 1, &mqc_states[69], &mqc_states[63]},
+	{0x0441, 0, &mqc_states[70], &mqc_states[64]},
+	{0x0441, 1, &mqc_states[71], &mqc_states[65]},
+	{0x02a1, 0, &mqc_states[72], &mqc_states[66]},
+	{0x02a1, 1, &mqc_states[73], &mqc_states[67]},
+	{0x0221, 0, &mqc_states[74], &mqc_states[68]},
+	{0x0221, 1, &mqc_states[75], &mqc_states[69]},
+	{0x0141, 0, &mqc_states[76], &mqc_states[70]},
+	{0x0141, 1, &mqc_states[77], &mqc_states[71]},
+	{0x0111, 0, &mqc_states[78], &mqc_states[72]},
+	{0x0111, 1, &mqc_states[79], &mqc_states[73]},
+	{0x0085, 0, &mqc_states[80], &mqc_states[74]},
+	{0x0085, 1, &mqc_states[81], &mqc_states[75]},
+	{0x0049, 0, &mqc_states[82], &mqc_states[76]},
+	{0x0049, 1, &mqc_states[83], &mqc_states[77]},
+	{0x0025, 0, &mqc_states[84], &mqc_states[78]},
+	{0x0025, 1, &mqc_states[85], &mqc_states[79]},
+	{0x0015, 0, &mqc_states[86], &mqc_states[80]},
+	{0x0015, 1, &mqc_states[87], &mqc_states[81]},
+	{0x0009, 0, &mqc_states[88], &mqc_states[82]},
+	{0x0009, 1, &mqc_states[89], &mqc_states[83]},
+	{0x0005, 0, &mqc_states[90], &mqc_states[84]},
+	{0x0005, 1, &mqc_states[91], &mqc_states[85]},
+	{0x0001, 0, &mqc_states[90], &mqc_states[86]},
+	{0x0001, 1, &mqc_states[91], &mqc_states[87]},
+	{0x5601, 0, &mqc_states[92], &mqc_states[92]},
+	{0x5601, 1, &mqc_states[93], &mqc_states[93]},
+};
+
+/* 
+==========================================================
+   local functions
+==========================================================
+*/
+
+static void mqc_byteout(opj_mqc_t *mqc) {
+	if (*mqc->bp == 0xff) {
+		mqc->bp++;
+		*mqc->bp = mqc->c >> 20;
+		mqc->c &= 0xfffff;
+		mqc->ct = 7;
+	} else {
+		if ((mqc->c & 0x8000000) == 0) {	/* ((mqc->c&0x8000000)==0) CHANGE */
+			mqc->bp++;
+			*mqc->bp = mqc->c >> 19;
+			mqc->c &= 0x7ffff;
+			mqc->ct = 8;
+		} else {
+			(*mqc->bp)++;
+			if (*mqc->bp == 0xff) {
+				mqc->c &= 0x7ffffff;
+				mqc->bp++;
+				*mqc->bp = mqc->c >> 20;
+				mqc->c &= 0xfffff;
+				mqc->ct = 7;
+			} else {
+				mqc->bp++;
+				*mqc->bp = mqc->c >> 19;
+				mqc->c &= 0x7ffff;
+				mqc->ct = 8;
+			}
+		}
+	}
+}
+
+static void mqc_renorme(opj_mqc_t *mqc) {
+	do {
+		mqc->a <<= 1;
+		mqc->c <<= 1;
+		mqc->ct--;
+		if (mqc->ct == 0) {
+			mqc_byteout(mqc);
+		}
+	} while ((mqc->a & 0x8000) == 0);
+}
+
+static void mqc_codemps(opj_mqc_t *mqc) {
+	mqc->a -= (*mqc->curctx)->qeval;
+	if ((mqc->a & 0x8000) == 0) {
+		if (mqc->a < (*mqc->curctx)->qeval) {
+			mqc->a = (*mqc->curctx)->qeval;
+		} else {
+			mqc->c += (*mqc->curctx)->qeval;
+		}
+		*mqc->curctx = (*mqc->curctx)->nmps;
+		mqc_renorme(mqc);
+	} else {
+		mqc->c += (*mqc->curctx)->qeval;
+	}
+}
+
+static void mqc_codelps(opj_mqc_t *mqc) {
+	mqc->a -= (*mqc->curctx)->qeval;
+	if (mqc->a < (*mqc->curctx)->qeval) {
+		mqc->c += (*mqc->curctx)->qeval;
+	} else {
+		mqc->a = (*mqc->curctx)->qeval;
+	}
+	*mqc->curctx = (*mqc->curctx)->nlps;
+	mqc_renorme(mqc);
+}
+
+static void mqc_setbits(opj_mqc_t *mqc) {
+	unsigned int tempc = mqc->c + mqc->a;
+	mqc->c |= 0xffff;
+	if (mqc->c >= tempc) {
+		mqc->c -= 0x8000;
+	}
+}
+
+static int mqc_mpsexchange(opj_mqc_t *mqc) {
+	int d;
+	if (mqc->a < (*mqc->curctx)->qeval) {
+		d = 1 - (*mqc->curctx)->mps;
+		*mqc->curctx = (*mqc->curctx)->nlps;
+	} else {
+		d = (*mqc->curctx)->mps;
+		*mqc->curctx = (*mqc->curctx)->nmps;
+	}
+	
+	return d;
+}
+
+static int mqc_lpsexchange(opj_mqc_t *mqc) {
+	int d;
+	if (mqc->a < (*mqc->curctx)->qeval) {
+		mqc->a = (*mqc->curctx)->qeval;
+		d = (*mqc->curctx)->mps;
+		*mqc->curctx = (*mqc->curctx)->nmps;
+	} else {
+		mqc->a = (*mqc->curctx)->qeval;
+		d = 1 - (*mqc->curctx)->mps;
+		*mqc->curctx = (*mqc->curctx)->nlps;
+	}
+	
+	return d;
+}
+
+static void mqc_bytein(opj_mqc_t *mqc) {
+	if (mqc->bp != mqc->end) {
+		unsigned int c;
+		if (mqc->bp + 1 != mqc->end) {
+			c = *(mqc->bp + 1);
+		} else {
+			c = 0xff;
+		}
+		if (*mqc->bp == 0xff) {
+			if (c > 0x8f) {
+				mqc->c += 0xff00;
+				mqc->ct = 8;
+			} else {
+				mqc->bp++;
+				mqc->c += c << 9;
+				mqc->ct = 7;
+			}
+		} else {
+			mqc->bp++;
+			mqc->c += c << 8;
+			mqc->ct = 8;
+		}
+	} else {
+		mqc->c += 0xff00;
+		mqc->ct = 8;
+	}
+}
+
+static void mqc_renormd(opj_mqc_t *mqc) {
+	do {
+		if (mqc->ct == 0) {
+			mqc_bytein(mqc);
+		}
+		mqc->a <<= 1;
+		mqc->c <<= 1;
+		mqc->ct--;
+	} while (mqc->a < 0x8000);
+}
+
+/* 
+==========================================================
+   MQ-Coder interface
+==========================================================
+*/
+
+opj_mqc_t* mqc_create(void) {
+	opj_mqc_t *mqc = (opj_mqc_t*)opj_malloc(sizeof(opj_mqc_t));
+	return mqc;
+}
+
+void mqc_destroy(opj_mqc_t *mqc) {
+	if(mqc) {
+		opj_free(mqc);
+	}
+}
+
+int mqc_numbytes(opj_mqc_t *mqc) {
+	return mqc->bp - mqc->start;
+}
+
+void mqc_init_enc(opj_mqc_t *mqc, unsigned char *bp) {
+	mqc_setcurctx(mqc, 0);
+	mqc->a = 0x8000;
+	mqc->c = 0;
+	mqc->bp = bp - 1;
+	mqc->ct = 12;
+	if (*mqc->bp == 0xff) {
+		mqc->ct = 13;
+	}
+	mqc->start = bp;
+}
+
+void mqc_encode(opj_mqc_t *mqc, int d) {
+	if ((*mqc->curctx)->mps == d) {
+		mqc_codemps(mqc);
+	} else {
+		mqc_codelps(mqc);
+	}
+}
+
+void mqc_flush(opj_mqc_t *mqc) {
+	mqc_setbits(mqc);
+	mqc->c <<= mqc->ct;
+	mqc_byteout(mqc);
+	mqc->c <<= mqc->ct;
+	mqc_byteout(mqc);
+	
+	if (*mqc->bp != 0xff) {
+		mqc->bp++;
+	}
+}
+
+void mqc_bypass_init_enc(opj_mqc_t *mqc) {
+	mqc->c = 0;
+	mqc->ct = 8;
+	/*if (*mqc->bp == 0xff) {
+	mqc->ct = 7;
+     } */
+}
+
+void mqc_bypass_enc(opj_mqc_t *mqc, int d) {
+	mqc->ct--;
+	mqc->c = mqc->c + (d << mqc->ct);
+	if (mqc->ct == 0) {
+		mqc->bp++;
+		*mqc->bp = mqc->c;
+		mqc->ct = 8;
+		if (*mqc->bp == 0xff) {
+			mqc->ct = 7;
+		}
+		mqc->c = 0;
+	}
+}
+
+int mqc_bypass_flush_enc(opj_mqc_t *mqc) {
+	unsigned char bit_padding;
+	
+	bit_padding = 0;
+	
+	if (mqc->ct != 0) {
+		while (mqc->ct > 0) {
+			mqc->ct--;
+			mqc->c += bit_padding << mqc->ct;
+			bit_padding = (bit_padding + 1) & 0x01;
+		}
+		mqc->bp++;
+		*mqc->bp = mqc->c;
+		mqc->ct = 8;
+		mqc->c = 0;
+	}
+	
+	return 1;
+}
+
+void mqc_reset_enc(opj_mqc_t *mqc) {
+	mqc_resetstates(mqc);
+	mqc_setstate(mqc, T1_CTXNO_UNI, 0, 46);
+	mqc_setstate(mqc, T1_CTXNO_AGG, 0, 3);
+	mqc_setstate(mqc, T1_CTXNO_ZC, 0, 4);
+}
+
+int mqc_restart_enc(opj_mqc_t *mqc) {
+	int correction = 1;
+	
+	/* <flush part> */
+	int n = 27 - 15 - mqc->ct;
+	mqc->c <<= mqc->ct;
+	while (n > 0) {
+		mqc_byteout(mqc);
+		n -= mqc->ct;
+		mqc->c <<= mqc->ct;
+	}
+	mqc_byteout(mqc);
+	
+	return correction;
+}
+
+void mqc_restart_init_enc(opj_mqc_t *mqc) {
+	/* <Re-init part> */
+	mqc_setcurctx(mqc, 0);
+	mqc->a = 0x8000;
+	mqc->c = 0;
+	mqc->ct = 12;
+	mqc->bp--;
+	if (*mqc->bp == 0xff) {
+		mqc->ct = 13;
+	}
+}
+
+void mqc_erterm_enc(opj_mqc_t *mqc) {
+	int k = 11 - mqc->ct + 1;
+	
+	while (k > 0) {
+		mqc->c <<= mqc->ct;
+		mqc->ct = 0;
+		mqc_byteout(mqc);
+		k -= mqc->ct;
+	}
+	
+	if (*mqc->bp != 0xff) {
+		mqc_byteout(mqc);
+	}
+}
+
+void mqc_segmark_enc(opj_mqc_t *mqc) {
+	int i;
+	mqc_setcurctx(mqc, 18);
+	
+	for (i = 1; i < 5; i++) {
+		mqc_encode(mqc, i % 2);
+	}
+}
+
+void mqc_init_dec(opj_mqc_t *mqc, unsigned char *bp, int len) {
+	mqc_setcurctx(mqc, 0);
+	mqc->start = bp;
+	mqc->end = bp + len;
+	mqc->bp = bp;
+	if (len==0) mqc->c = 0xff << 16;
+	else mqc->c = *mqc->bp << 16;
+	mqc_bytein(mqc);
+	mqc->c <<= 7;
+	mqc->ct -= 7;
+	mqc->a = 0x8000;
+}
+
+int mqc_decode(opj_mqc_t *mqc) {
+	int d;
+	mqc->a -= (*mqc->curctx)->qeval;
+	if ((mqc->c >> 16) < (*mqc->curctx)->qeval) {
+		d = mqc_lpsexchange(mqc);
+		mqc_renormd(mqc);
+	} else {
+		mqc->c -= (*mqc->curctx)->qeval << 16;
+		if ((mqc->a & 0x8000) == 0) {
+			d = mqc_mpsexchange(mqc);
+			mqc_renormd(mqc);
+		} else {
+			d = (*mqc->curctx)->mps;
+		}
+	}
+
+	return d;
+}
+
+void mqc_resetstates(opj_mqc_t *mqc) {
+	int i;
+	for (i = 0; i < MQC_NUMCTXS; i++) {
+		mqc->ctxs[i] = mqc_states;
+	}
+}
+
+void mqc_setstate(opj_mqc_t *mqc, int ctxno, int msb, int prob) {
+	mqc->ctxs[ctxno] = &mqc_states[msb + (prob << 1)];
+}
+
+
diff --git a/extern/libopenjpeg/mqc.h b/extern/libopenjpeg/mqc.h
new file mode 100644
index 00000000000..8cc8c934598
--- /dev/null
+++ b/extern/libopenjpeg/mqc.h
@@ -0,0 +1,197 @@
+/*
+ * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2007, Professor Benoit Macq
+ * Copyright (c) 2001-2003, David Janssens
+ * Copyright (c) 2002-2003, Yannick Verschueren
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __MQC_H
+#define __MQC_H
+/**
+@file mqc.h
+@brief Implementation of an MQ-Coder (MQC)
+
+The functions in MQC.C have for goal to realize the MQ-coder operations. The functions
+in MQC.C are used by some function in T1.C.
+*/
+
+/** @defgroup MQC MQC - Implementation of an MQ-Coder */
+/*@{*/
+
+/**
+This struct defines the state of a context.
+*/
+typedef struct opj_mqc_state {
+	/** the probability of the Least Probable Symbol (0.75->0x8000, 1.5->0xffff) */
+	unsigned int qeval;
+	/** the Most Probable Symbol (0 or 1) */
+	int mps;
+	/** next state if the next encoded symbol is the MPS */
+	struct opj_mqc_state *nmps;
+	/** next state if the next encoded symbol is the LPS */
+	struct opj_mqc_state *nlps;
+} opj_mqc_state_t;
+
+#define MQC_NUMCTXS 19
+
+/**
+MQ coder
+*/
+typedef struct opj_mqc {
+	unsigned int c;
+	unsigned int a;
+	unsigned int ct;
+	unsigned char *bp;
+	unsigned char *start;
+	unsigned char *end;
+	opj_mqc_state_t *ctxs[MQC_NUMCTXS];
+	opj_mqc_state_t **curctx;
+} opj_mqc_t;
+
+/** @name Exported functions */
+/*@{*/
+/* ----------------------------------------------------------------------- */
+/**
+Create a new MQC handle 
+@return Returns a new MQC handle if successful, returns NULL otherwise
+*/
+opj_mqc_t* mqc_create(void);
+/**
+Destroy a previously created MQC handle
+@param mqc MQC handle to destroy
+*/
+void mqc_destroy(opj_mqc_t *mqc);
+/**
+Return the number of bytes written/read since initialisation
+@param mqc MQC handle
+@return Returns the number of bytes already encoded
+*/
+int mqc_numbytes(opj_mqc_t *mqc);
+/**
+Reset the states of all the context of the coder/decoder 
+(each context is set to a state where 0 and 1 are more or less equiprobable)
+@param mqc MQC handle
+*/
+void mqc_resetstates(opj_mqc_t *mqc);
+/**
+Set the state of a particular context
+@param mqc MQC handle
+@param ctxno Number that identifies the context
+@param msb The MSB of the new state of the context
+@param prob Number that identifies the probability of the symbols for the new state of the context
+*/
+void mqc_setstate(opj_mqc_t *mqc, int ctxno, int msb, int prob);
+/**
+Initialize the encoder
+@param mqc MQC handle
+@param bp Pointer to the start of the buffer where the bytes will be written
+*/
+void mqc_init_enc(opj_mqc_t *mqc, unsigned char *bp);
+/**
+Set the current context used for coding/decoding
+@param mqc MQC handle
+@param ctxno Number that identifies the context
+*/
+#define mqc_setcurctx(mqc, ctxno)	(mqc)->curctx = &(mqc)->ctxs[(int)(ctxno)]
+/**
+Encode a symbol using the MQ-coder
+@param mqc MQC handle
+@param d The symbol to be encoded (0 or 1)
+*/
+void mqc_encode(opj_mqc_t *mqc, int d);
+/**
+Flush the encoder, so that all remaining data is written
+@param mqc MQC handle
+*/
+void mqc_flush(opj_mqc_t *mqc);
+/**
+BYPASS mode switch, initialization operation. 
+JPEG 2000 p 505. 
+<h2>Not fully implemented and tested !!</h2>
+@param mqc MQC handle
+*/
+void mqc_bypass_init_enc(opj_mqc_t *mqc);
+/**
+BYPASS mode switch, coding operation. 
+JPEG 2000 p 505. 
+<h2>Not fully implemented and tested !!</h2>
+@param mqc MQC handle
+@param d The symbol to be encoded (0 or 1)
+*/
+void mqc_bypass_enc(opj_mqc_t *mqc, int d);
+/**
+BYPASS mode switch, flush operation
+<h2>Not fully implemented and tested !!</h2>
+@param mqc MQC handle
+@return Returns 1 (always)
+*/
+int mqc_bypass_flush_enc(opj_mqc_t *mqc);
+/**
+RESET mode switch
+@param mqc MQC handle
+*/
+void mqc_reset_enc(opj_mqc_t *mqc);
+/**
+RESTART mode switch (TERMALL)
+@param mqc MQC handle
+@return Returns 1 (always)
+*/
+int mqc_restart_enc(opj_mqc_t *mqc);
+/**
+RESTART mode switch (TERMALL) reinitialisation
+@param mqc MQC handle
+*/
+void mqc_restart_init_enc(opj_mqc_t *mqc);
+/**
+ERTERM mode switch (PTERM)
+@param mqc MQC handle
+*/
+void mqc_erterm_enc(opj_mqc_t *mqc);
+/**
+SEGMARK mode switch (SEGSYM)
+@param mqc MQC handle
+*/
+void mqc_segmark_enc(opj_mqc_t *mqc);
+/**
+Initialize the decoder
+@param mqc MQC handle
+@param bp Pointer to the start of the buffer from which the bytes will be read
+@param len Length of the input buffer
+*/
+void mqc_init_dec(opj_mqc_t *mqc, unsigned char *bp, int len);
+/**
+Decode a symbol
+@param mqc MQC handle
+@return Returns the decoded symbol (0 or 1)
+*/
+int mqc_decode(opj_mqc_t *mqc);
+/* ----------------------------------------------------------------------- */
+/*@}*/
+
+/*@}*/
+
+#endif /* __MQC_H */
diff --git a/extern/libopenjpeg/openjpeg.c b/extern/libopenjpeg/openjpeg.c
new file mode 100644
index 00000000000..96fa0ad57e5
--- /dev/null
+++ b/extern/libopenjpeg/openjpeg.c
@@ -0,0 +1,329 @@
+/*
+ * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifdef WIN32
+#include <windows.h>
+#endif /* WIN32 */
+
+#include "opj_includes.h"
+
+/* ---------------------------------------------------------------------- */
+#ifdef WIN32
+#ifndef OPJ_STATIC
+BOOL APIENTRY
+DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) {
+	switch (ul_reason_for_call) {
+		case DLL_PROCESS_ATTACH :
+			break;
+		case DLL_PROCESS_DETACH :
+			break;
+		case DLL_THREAD_ATTACH :
+		case DLL_THREAD_DETACH :
+			break;
+    }
+
+    return TRUE;
+}
+#endif /* OPJ_STATIC */
+#endif /* WIN32 */
+
+/* ---------------------------------------------------------------------- */
+
+
+const char* OPJ_CALLCONV opj_version(void) {
+    return OPENJPEG_VERSION;
+}
+
+opj_dinfo_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FORMAT format) {
+	opj_dinfo_t *dinfo = (opj_dinfo_t*)opj_malloc(sizeof(opj_dinfo_t));
+	if(!dinfo) return NULL;
+	dinfo->is_decompressor = true;
+	switch(format) {
+		case CODEC_J2K:
+		case CODEC_JPT:
+			/* get a J2K decoder handle */
+			dinfo->j2k_handle = (void*)j2k_create_decompress((opj_common_ptr)dinfo);
+			if(!dinfo->j2k_handle) {
+				opj_free(dinfo);
+				return NULL;
+			}
+			break;
+		case CODEC_JP2:
+			/* get a JP2 decoder handle */
+			dinfo->jp2_handle = (void*)jp2_create_decompress((opj_common_ptr)dinfo);
+			if(!dinfo->jp2_handle) {
+				opj_free(dinfo);
+				return NULL;
+			}
+			break;
+		case CODEC_UNKNOWN:
+		default:
+			opj_free(dinfo);
+			return NULL;
+	}
+
+	dinfo->codec_format = format;
+
+	return dinfo;
+}
+
+void OPJ_CALLCONV opj_destroy_decompress(opj_dinfo_t *dinfo) {
+	if(dinfo) {
+		/* destroy the codec */
+		switch(dinfo->codec_format) {
+			case CODEC_J2K:
+			case CODEC_JPT:
+				j2k_destroy_decompress((opj_j2k_t*)dinfo->j2k_handle);
+				break;
+			case CODEC_JP2:
+				jp2_destroy_decompress((opj_jp2_t*)dinfo->jp2_handle);
+				break;
+			case CODEC_UNKNOWN:
+			default:
+				break;
+		}
+		/* destroy the decompressor */
+		opj_free(dinfo);
+	}
+}
+
+void OPJ_CALLCONV opj_set_default_decoder_parameters(opj_dparameters_t *parameters) {
+	if(parameters) {
+		memset(parameters, 0, sizeof(opj_dparameters_t));
+		/* default decoding parameters */
+		parameters->cp_layer = 0;
+		parameters->cp_reduce = 0;
+		parameters->cp_limit_decoding = NO_LIMITATION;
+
+		parameters->decod_format = -1;
+		parameters->cod_format = -1;
+/* UniPG>> */
+#ifdef USE_JPWL
+		parameters->jpwl_correct = false;
+		parameters->jpwl_exp_comps = JPWL_EXPECTED_COMPONENTS;
+		parameters->jpwl_max_tiles = JPWL_MAXIMUM_TILES;
+#endif /* USE_JPWL */
+/* <<UniPG */
+	}
+}
+
+void OPJ_CALLCONV opj_setup_decoder(opj_dinfo_t *dinfo, opj_dparameters_t *parameters) {
+	if(dinfo && parameters) {
+		switch(dinfo->codec_format) {
+			case CODEC_J2K:
+			case CODEC_JPT:
+				j2k_setup_decoder((opj_j2k_t*)dinfo->j2k_handle, parameters);
+				break;
+			case CODEC_JP2:
+				jp2_setup_decoder((opj_jp2_t*)dinfo->jp2_handle, parameters);
+				break;
+			case CODEC_UNKNOWN:
+			default:
+				break;
+		}
+	}
+}
+
+opj_image_t* OPJ_CALLCONV opj_decode(opj_dinfo_t *dinfo, opj_cio_t *cio) {
+	return opj_decode_with_info(dinfo, cio, NULL);
+}
+
+opj_image_t* OPJ_CALLCONV opj_decode_with_info(opj_dinfo_t *dinfo, opj_cio_t *cio, opj_codestream_info_t *cstr_info) {
+	if(dinfo && cio) {
+		switch(dinfo->codec_format) {
+			case CODEC_J2K:
+				return j2k_decode((opj_j2k_t*)dinfo->j2k_handle, cio, cstr_info);
+			case CODEC_JPT:
+				return j2k_decode_jpt_stream((opj_j2k_t*)dinfo->j2k_handle, cio, cstr_info);
+			case CODEC_JP2:
+				return jp2_decode((opj_jp2_t*)dinfo->jp2_handle, cio, cstr_info);
+			case CODEC_UNKNOWN:
+			default:
+				break;
+		}
+	}
+	return NULL;
+}
+
+opj_cinfo_t* OPJ_CALLCONV opj_create_compress(OPJ_CODEC_FORMAT format) {
+	opj_cinfo_t *cinfo = (opj_cinfo_t*)opj_malloc(sizeof(opj_cinfo_t));
+	if(!cinfo) return NULL;
+	cinfo->is_decompressor = false;
+	switch(format) {
+		case CODEC_J2K:
+			/* get a J2K coder handle */
+			cinfo->j2k_handle = (void*)j2k_create_compress((opj_common_ptr)cinfo);
+			if(!cinfo->j2k_handle) {
+				opj_free(cinfo);
+				return NULL;
+			}
+			break;
+		case CODEC_JP2:
+			/* get a JP2 coder handle */
+			cinfo->jp2_handle = (void*)jp2_create_compress((opj_common_ptr)cinfo);
+			if(!cinfo->jp2_handle) {
+				opj_free(cinfo);
+				return NULL;
+			}
+			break;
+		case CODEC_JPT:
+		case CODEC_UNKNOWN:
+		default:
+			opj_free(cinfo);
+			return NULL;
+	}
+
+	cinfo->codec_format = format;
+
+	return cinfo;
+}
+
+void OPJ_CALLCONV opj_destroy_compress(opj_cinfo_t *cinfo) {
+	if(cinfo) {
+		/* destroy the codec */
+		switch(cinfo->codec_format) {
+			case CODEC_J2K:
+				j2k_destroy_compress((opj_j2k_t*)cinfo->j2k_handle);
+				break;
+			case CODEC_JP2:
+				jp2_destroy_compress((opj_jp2_t*)cinfo->jp2_handle);
+				break;
+			case CODEC_JPT:
+			case CODEC_UNKNOWN:
+			default:
+				break;
+		}
+		/* destroy the decompressor */
+		opj_free(cinfo);
+	}
+}
+
+void OPJ_CALLCONV opj_set_default_encoder_parameters(opj_cparameters_t *parameters) {
+	if(parameters) {
+		memset(parameters, 0, sizeof(opj_cparameters_t));
+		/* default coding parameters */
+		parameters->cp_cinema = OFF; 
+		parameters->max_comp_size = 0;
+		parameters->numresolution = 6;
+		parameters->cp_rsiz = STD_RSIZ;
+		parameters->cblockw_init = 64;
+		parameters->cblockh_init = 64;
+		parameters->prog_order = LRCP;
+		parameters->roi_compno = -1;		/* no ROI */
+		parameters->subsampling_dx = 1;
+		parameters->subsampling_dy = 1;
+		parameters->tp_on = 0;
+		parameters->decod_format = -1;
+		parameters->cod_format = -1;
+/* UniPG>> */
+#ifdef USE_JPWL
+		parameters->jpwl_epc_on = false;
+		parameters->jpwl_hprot_MH = -1; /* -1 means unassigned */
+		{
+			int i;
+			for (i = 0; i < JPWL_MAX_NO_TILESPECS; i++) {
+				parameters->jpwl_hprot_TPH_tileno[i] = -1; /* unassigned */
+				parameters->jpwl_hprot_TPH[i] = 0; /* absent */
+			}
+		};
+		{
+			int i;
+			for (i = 0; i < JPWL_MAX_NO_PACKSPECS; i++) {
+				parameters->jpwl_pprot_tileno[i] = -1; /* unassigned */
+				parameters->jpwl_pprot_packno[i] = -1; /* unassigned */
+				parameters->jpwl_pprot[i] = 0; /* absent */
+			}
+		};
+		parameters->jpwl_sens_size = 0; /* 0 means no ESD */
+		parameters->jpwl_sens_addr = 0; /* 0 means auto */
+		parameters->jpwl_sens_range = 0; /* 0 means packet */
+		parameters->jpwl_sens_MH = -1; /* -1 means unassigned */
+		{
+			int i;
+			for (i = 0; i < JPWL_MAX_NO_TILESPECS; i++) {
+				parameters->jpwl_sens_TPH_tileno[i] = -1; /* unassigned */
+				parameters->jpwl_sens_TPH[i] = -1; /* absent */
+			}
+		};
+#endif /* USE_JPWL */
+/* <<UniPG */
+	}
+}
+
+void OPJ_CALLCONV opj_setup_encoder(opj_cinfo_t *cinfo, opj_cparameters_t *parameters, opj_image_t *image) {
+	if(cinfo && parameters && image) {
+		switch(cinfo->codec_format) {
+			case CODEC_J2K:
+				j2k_setup_encoder((opj_j2k_t*)cinfo->j2k_handle, parameters, image);
+				break;
+			case CODEC_JP2:
+				jp2_setup_encoder((opj_jp2_t*)cinfo->jp2_handle, parameters, image);
+				break;
+			case CODEC_JPT:
+			case CODEC_UNKNOWN:
+			default:
+				break;
+		}
+	}
+}
+
+bool OPJ_CALLCONV opj_encode(opj_cinfo_t *cinfo, opj_cio_t *cio, opj_image_t *image, char *index) {
+	if (index != NULL)
+		opj_event_msg((opj_common_ptr)cinfo, EVT_WARNING, "Set index to NULL when calling the opj_encode function.\n"
+		"To extract the index, use the opj_encode_with_info() function.\n"
+		"No index will be generated during this encoding\n");
+	return opj_encode_with_info(cinfo, cio, image, NULL);
+}
+
+bool OPJ_CALLCONV opj_encode_with_info(opj_cinfo_t *cinfo, opj_cio_t *cio, opj_image_t *image, opj_codestream_info_t *cstr_info) {
+	if(cinfo && cio && image) {
+		switch(cinfo->codec_format) {
+			case CODEC_J2K:
+				return j2k_encode((opj_j2k_t*)cinfo->j2k_handle, cio, image, cstr_info);
+			case CODEC_JP2:
+				return jp2_encode((opj_jp2_t*)cinfo->jp2_handle, cio, image, cstr_info);
+			case CODEC_JPT:
+			case CODEC_UNKNOWN:
+			default:
+				break;
+		}
+	}
+	return false;
+}
+
+void OPJ_CALLCONV opj_destroy_cstr_info(opj_codestream_info_t *cstr_info) {
+	if (cstr_info) {
+		int tileno;
+		for (tileno = 0; tileno < cstr_info->tw * cstr_info->th; tileno++) {
+			opj_tile_info_t *tile_info = &cstr_info->tile[tileno];
+			opj_free(tile_info->thresh);
+			opj_free(tile_info->packet);
+			opj_free(tile_info->tp);
+		}
+		opj_free(cstr_info->tile);
+		opj_free(cstr_info->marker);
+	}
+}
diff --git a/extern/libopenjpeg/openjpeg.h b/extern/libopenjpeg/openjpeg.h
new file mode 100644
index 00000000000..ffcaacaf6e5
--- /dev/null
+++ b/extern/libopenjpeg/openjpeg.h
@@ -0,0 +1,911 @@
+ /*
+ * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2007, Professor Benoit Macq
+ * Copyright (c) 2001-2003, David Janssens
+ * Copyright (c) 2002-2003, Yannick Verschueren
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * Copyright (c) 2006-2007, Parvatha Elangovan
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef OPENJPEG_H
+#define OPENJPEG_H
+
+#define OPENJPEG_VERSION "1.3.0"
+
+/* 
+==========================================================
+   Compiler directives
+==========================================================
+*/
+
+#if defined(OPJ_STATIC) || !(defined(WIN32) || defined(__WIN32__))
+#define OPJ_API
+#define OPJ_CALLCONV
+#else
+#define OPJ_CALLCONV __stdcall
+/*
+The following ifdef block is the standard way of creating macros which make exporting 
+from a DLL simpler. All files within this DLL are compiled with the OPJ_EXPORTS
+symbol defined on the command line. this symbol should not be defined on any project
+that uses this DLL. This way any other project whose source files include this file see 
+OPJ_API functions as being imported from a DLL, wheras this DLL sees symbols
+defined with this macro as being exported.
+*/
+#ifdef OPJ_EXPORTS
+#define OPJ_API __declspec(dllexport)
+#else
+#define OPJ_API __declspec(dllimport)
+#endif /* OPJ_EXPORTS */
+#endif /* !OPJ_STATIC || !WIN32 */
+
+#ifndef __cplusplus
+#if defined(HAVE_STDBOOL_H)
+/*
+The C language implementation does correctly provide the standard header
+file "stdbool.h".
+ */
+#include <stdbool.h>
+#else
+/*
+The C language implementation does not provide the standard header file
+"stdbool.h" as required by ISO/IEC 9899:1999.  Try to compensate for this
+braindamage below.
+*/
+#if !defined(bool)
+#define	bool	int
+#endif
+#if !defined(true)
+#define true	1
+#endif
+#if !defined(false)
+#define	false	0
+#endif
+#endif
+#endif /* __cplusplus */
+
+/* 
+==========================================================
+   Useful constant definitions
+==========================================================
+*/
+
+#define OPJ_PATH_LEN 4096 /**< Maximum allowed size for filenames */
+
+#define J2K_MAXRLVLS 33					/**< Number of maximum resolution level authorized */
+#define J2K_MAXBANDS (3*J2K_MAXRLVLS-2)	/**< Number of maximum sub-band linked to number of resolution level */
+
+/* UniPG>> */
+#define JPWL_MAX_NO_TILESPECS	16 /**< Maximum number of tile parts expected by JPWL: increase at your will */
+#define JPWL_MAX_NO_PACKSPECS	16 /**< Maximum number of packet parts expected by JPWL: increase at your will */
+#define JPWL_MAX_NO_MARKERS	512 /**< Maximum number of JPWL markers: increase at your will */
+#define JPWL_PRIVATEINDEX_NAME "jpwl_index_privatefilename" /**< index file name used when JPWL is on */
+#define JPWL_EXPECTED_COMPONENTS 3 /**< Expect this number of components, so you'll find better the first EPB */
+#define JPWL_MAXIMUM_TILES 8192 /**< Expect this maximum number of tiles, to avoid some crashes */
+#define JPWL_MAXIMUM_HAMMING 2 /**< Expect this maximum number of bit errors in marker id's */
+#define JPWL_MAXIMUM_EPB_ROOM 65450 /**< Expect this maximum number of bytes for composition of EPBs */
+/* <<UniPG */
+
+/* 
+==========================================================
+   enum definitions
+==========================================================
+*/
+/** 
+Rsiz Capabilities
+*/
+typedef enum RSIZ_CAPABILITIES {
+	STD_RSIZ = 0,		/** Standard JPEG2000 profile*/
+	CINEMA2K = 3,		/** Profile name for a 2K image*/
+	CINEMA4K = 4		/** Profile name for a 4K image*/
+} OPJ_RSIZ_CAPABILITIES;
+
+/** 
+Digital cinema operation mode 
+*/
+typedef enum CINEMA_MODE {
+	OFF = 0,					/** Not Digital Cinema*/
+	CINEMA2K_24 = 1,	/** 2K Digital Cinema at 24 fps*/
+	CINEMA2K_48 = 2,	/** 2K Digital Cinema at 48 fps*/
+	CINEMA4K_24 = 3		/** 4K Digital Cinema at 24 fps*/
+}OPJ_CINEMA_MODE;
+
+/** 
+Progression order 
+*/
+typedef enum PROG_ORDER {
+	PROG_UNKNOWN = -1,	/**< place-holder */
+	LRCP = 0,		/**< layer-resolution-component-precinct order */
+	RLCP = 1,		/**< resolution-layer-component-precinct order */
+	RPCL = 2,		/**< resolution-precinct-component-layer order */
+	PCRL = 3,		/**< precinct-component-resolution-layer order */
+	CPRL = 4		/**< component-precinct-resolution-layer order */
+} OPJ_PROG_ORDER;
+
+/**
+Supported image color spaces
+*/
+typedef enum COLOR_SPACE {
+	CLRSPC_UNKNOWN = -1,	/**< place-holder */
+	CLRSPC_SRGB = 1,		/**< sRGB */
+	CLRSPC_GRAY = 2,		/**< grayscale */
+	CLRSPC_SYCC = 3			/**< YUV */
+} OPJ_COLOR_SPACE;
+
+/**
+Supported codec
+*/
+typedef enum CODEC_FORMAT {
+	CODEC_UNKNOWN = -1,	/**< place-holder */
+	CODEC_J2K = 0,		/**< JPEG-2000 codestream : read/write */
+	CODEC_JPT = 1,		/**< JPT-stream (JPEG 2000, JPIP) : read only */
+	CODEC_JP2 = 2		/**< JPEG-2000 file format : read/write */
+} OPJ_CODEC_FORMAT;
+
+/** 
+Limit decoding to certain portions of the codestream. 
+*/
+typedef enum LIMIT_DECODING {
+	NO_LIMITATION = 0,				  /**< No limitation for the decoding. The entire codestream will de decoded */
+	LIMIT_TO_MAIN_HEADER = 1,		/**< The decoding is limited to the Main Header */
+	DECODE_ALL_BUT_PACKETS = 2	/**< Decode everything except the JPEG 2000 packets */
+} OPJ_LIMIT_DECODING;
+
+/* 
+==========================================================
+   event manager typedef definitions
+==========================================================
+*/
+
+/**
+Callback function prototype for events
+@param msg Event message
+@param client_data 
+*/
+typedef void (*opj_msg_callback) (const char *msg, void *client_data);
+
+/**
+Message handler object
+used for 
+<ul>
+<li>Error messages
+<li>Warning messages
+<li>Debugging messages
+</ul>
+*/
+typedef struct opj_event_mgr {
+	/** Error message callback if available, NULL otherwise */
+	opj_msg_callback error_handler;
+	/** Warning message callback if available, NULL otherwise */
+	opj_msg_callback warning_handler;
+	/** Debug message callback if available, NULL otherwise */
+	opj_msg_callback info_handler;
+} opj_event_mgr_t;
+
+
+/* 
+==========================================================
+   codec typedef definitions
+==========================================================
+*/
+
+/**
+Progression order changes
+*/
+typedef struct opj_poc {
+	/** Resolution num start, Component num start, given by POC */
+	int resno0, compno0;
+	/** Layer num end,Resolution num end, Component num end, given by POC */
+	int layno1, resno1, compno1;
+	/** Layer num start,Precinct num start, Precinct num end */
+	int layno0, precno0, precno1;
+	/** Progression order enum*/
+	OPJ_PROG_ORDER prg1,prg;
+	/** Progression order string*/
+	char progorder[5];
+	/** Tile number */
+	int tile;
+	/** Start and end values for Tile width and height*/
+	int tx0,tx1,ty0,ty1;
+	/** Start value, initialised in pi_initialise_encode*/
+	int layS, resS, compS, prcS;
+	/** End value, initialised in pi_initialise_encode */
+	int layE, resE, compE, prcE;
+	/** Start and end values of Tile width and height, initialised in pi_initialise_encode*/
+	int txS,txE,tyS,tyE,dx,dy;
+	/** Temporary values for Tile parts, initialised in pi_create_encode */
+	int lay_t, res_t, comp_t, prc_t,tx0_t,ty0_t;
+} opj_poc_t;
+
+/**
+Compression parameters
+*/
+typedef struct opj_cparameters {
+	/** size of tile: tile_size_on = false (not in argument) or = true (in argument) */
+	bool tile_size_on;
+	/** XTOsiz */
+	int cp_tx0;
+	/** YTOsiz */
+	int cp_ty0;
+	/** XTsiz */
+	int cp_tdx;
+	/** YTsiz */
+	int cp_tdy;
+	/** allocation by rate/distortion */
+	int cp_disto_alloc;
+	/** allocation by fixed layer */
+	int cp_fixed_alloc;
+	/** add fixed_quality */
+	int cp_fixed_quality;
+	/** fixed layer */
+	int *cp_matrice;
+	/** comment for coding */
+	char *cp_comment;
+	/** csty : coding style */
+	int csty;
+	/** progression order (default LRCP) */
+	OPJ_PROG_ORDER prog_order;
+	/** progression order changes */
+	opj_poc_t POC[32];
+	/** number of progression order changes (POC), default to 0 */
+	int numpocs;
+	/** number of layers */
+	int tcp_numlayers;
+	/** rates of layers */
+	float tcp_rates[100];
+	/** different psnr for successive layers */
+	float tcp_distoratio[100];
+	/** number of resolutions */
+	int numresolution;
+	/** initial code block width, default to 64 */
+ 	int cblockw_init;
+	/** initial code block height, default to 64 */
+	int cblockh_init;
+	/** mode switch (cblk_style) */
+	int mode;
+	/** 1 : use the irreversible DWT 9-7, 0 : use lossless compression (default) */
+	int irreversible;
+	/** region of interest: affected component in [0..3], -1 means no ROI */
+	int roi_compno;
+	/** region of interest: upshift value */
+	int roi_shift;
+	/* number of precinct size specifications */
+	int res_spec;
+	/** initial precinct width */
+	int prcw_init[J2K_MAXRLVLS];
+	/** initial precinct height */
+	int prch_init[J2K_MAXRLVLS];
+
+	/**@name command line encoder parameters (not used inside the library) */
+	/*@{*/
+	/** input file name */
+	char infile[OPJ_PATH_LEN];
+	/** output file name */
+	char outfile[OPJ_PATH_LEN];
+	/** DEPRECATED. Index generation is now handeld with the opj_encode_with_info() function. Set to NULL */
+	int index_on;
+	/** DEPRECATED. Index generation is now handeld with the opj_encode_with_info() function. Set to NULL */
+	char index[OPJ_PATH_LEN];
+	/** subimage encoding: origin image offset in x direction */
+	int image_offset_x0;
+	/** subimage encoding: origin image offset in y direction */
+	int image_offset_y0;
+	/** subsampling value for dx */
+	int subsampling_dx;
+	/** subsampling value for dy */
+	int subsampling_dy;
+	/** input file format 0: PGX, 1: PxM, 2: BMP 3:TIF*/
+	int decod_format;
+	/** output file format 0: J2K, 1: JP2, 2: JPT */
+	int cod_format;
+	/*@}*/
+
+/* UniPG>> */
+	/**@name JPWL encoding parameters */
+	/*@{*/
+	/** enables writing of EPC in MH, thus activating JPWL */
+	bool jpwl_epc_on;
+	/** error protection method for MH (0,1,16,32,37-128) */
+	int jpwl_hprot_MH;
+	/** tile number of header protection specification (>=0) */
+	int jpwl_hprot_TPH_tileno[JPWL_MAX_NO_TILESPECS];
+	/** error protection methods for TPHs (0,1,16,32,37-128) */
+	int jpwl_hprot_TPH[JPWL_MAX_NO_TILESPECS];
+	/** tile number of packet protection specification (>=0) */
+	int jpwl_pprot_tileno[JPWL_MAX_NO_PACKSPECS];
+	/** packet number of packet protection specification (>=0) */
+	int jpwl_pprot_packno[JPWL_MAX_NO_PACKSPECS];
+	/** error protection methods for packets (0,1,16,32,37-128) */
+	int jpwl_pprot[JPWL_MAX_NO_PACKSPECS];
+	/** enables writing of ESD, (0=no/1/2 bytes) */
+	int jpwl_sens_size;
+	/** sensitivity addressing size (0=auto/2/4 bytes) */
+	int jpwl_sens_addr;
+	/** sensitivity range (0-3) */
+	int jpwl_sens_range;
+	/** sensitivity method for MH (-1=no,0-7) */
+	int jpwl_sens_MH;
+	/** tile number of sensitivity specification (>=0) */
+	int jpwl_sens_TPH_tileno[JPWL_MAX_NO_TILESPECS];
+	/** sensitivity methods for TPHs (-1=no,0-7) */
+	int jpwl_sens_TPH[JPWL_MAX_NO_TILESPECS];
+	/*@}*/
+/* <<UniPG */
+
+	/** Digital Cinema compliance 0-not compliant, 1-compliant*/
+	OPJ_CINEMA_MODE cp_cinema;
+	/** Maximum rate for each component. If == 0, component size limitation is not considered */
+	int max_comp_size;
+	/** Profile name*/
+	OPJ_RSIZ_CAPABILITIES cp_rsiz;
+	/** Tile part generation*/
+	char tp_on;
+	/** Flag for Tile part generation*/
+	char tp_flag;
+	/** MCT (multiple component transform) */
+	char tcp_mct;
+} opj_cparameters_t;
+
+/**
+Decompression parameters
+*/
+typedef struct opj_dparameters {
+	/** 
+	Set the number of highest resolution levels to be discarded. 
+	The image resolution is effectively divided by 2 to the power of the number of discarded levels. 
+	The reduce factor is limited by the smallest total number of decomposition levels among tiles.
+	if != 0, then original dimension divided by 2^(reduce); 
+	if == 0 or not used, image is decoded to the full resolution 
+	*/
+	int cp_reduce;
+	/** 
+	Set the maximum number of quality layers to decode. 
+	If there are less quality layers than the specified number, all the quality layers are decoded.
+	if != 0, then only the first "layer" layers are decoded; 
+	if == 0 or not used, all the quality layers are decoded 
+	*/
+	int cp_layer;
+
+	/**@name command line encoder parameters (not used inside the library) */
+	/*@{*/
+	/** input file name */
+	char infile[OPJ_PATH_LEN];
+	/** output file name */
+	char outfile[OPJ_PATH_LEN];
+	/** input file format 0: J2K, 1: JP2, 2: JPT */
+	int decod_format;
+	/** output file format 0: PGX, 1: PxM, 2: BMP */
+	int cod_format;
+	/*@}*/
+
+/* UniPG>> */
+	/**@name JPWL decoding parameters */
+	/*@{*/
+	/** activates the JPWL correction capabilities */
+	bool jpwl_correct;
+	/** expected number of components */
+	int jpwl_exp_comps;
+	/** maximum number of tiles */
+	int jpwl_max_tiles;
+	/*@}*/
+/* <<UniPG */
+
+	/** 
+	Specify whether the decoding should be done on the entire codestream, or be limited to the main header
+	Limiting the decoding to the main header makes it possible to extract the characteristics of the codestream
+	if == NO_LIMITATION, the entire codestream is decoded; 
+	if == LIMIT_TO_MAIN_HEADER, only the main header is decoded; 
+	*/
+	OPJ_LIMIT_DECODING cp_limit_decoding;
+
+} opj_dparameters_t;
+
+/** Common fields between JPEG-2000 compression and decompression master structs. */
+
+#define opj_common_fields \
+	opj_event_mgr_t *event_mgr;	/**< pointer to the event manager */\
+	void * client_data;			/**< Available for use by application */\
+	bool is_decompressor;		/**< So common code can tell which is which */\
+	OPJ_CODEC_FORMAT codec_format;	/**< selected codec */\
+	void *j2k_handle;			/**< pointer to the J2K codec */\
+	void *jp2_handle;			/**< pointer to the JP2 codec */\
+	void *mj2_handle			/**< pointer to the MJ2 codec */
+	
+/* Routines that are to be used by both halves of the library are declared
+ * to receive a pointer to this structure.  There are no actual instances of
+ * opj_common_struct_t, only of opj_cinfo_t and opj_dinfo_t.
+ */
+typedef struct opj_common_struct {
+  opj_common_fields;		/* Fields common to both master struct types */
+  /* Additional fields follow in an actual opj_cinfo_t or
+   * opj_dinfo_t.  All three structs must agree on these
+   * initial fields!  (This would be a lot cleaner in C++.)
+   */
+} opj_common_struct_t;
+
+typedef opj_common_struct_t * opj_common_ptr;
+
+/**
+Compression context info
+*/
+typedef struct opj_cinfo {
+	/** Fields shared with opj_dinfo_t */
+	opj_common_fields;	
+	/* other specific fields go here */
+} opj_cinfo_t;
+
+/**
+Decompression context info
+*/
+typedef struct opj_dinfo {
+	/** Fields shared with opj_cinfo_t */
+	opj_common_fields;	
+	/* other specific fields go here */
+} opj_dinfo_t;
+
+/* 
+==========================================================
+   I/O stream typedef definitions
+==========================================================
+*/
+
+/*
+ * Stream open flags.
+ */
+/** The stream was opened for reading. */
+#define OPJ_STREAM_READ	0x0001
+/** The stream was opened for writing. */
+#define OPJ_STREAM_WRITE 0x0002
+
+/**
+Byte input-output stream (CIO)
+*/
+typedef struct opj_cio {
+	/** codec context */
+	opj_common_ptr cinfo;
+
+	/** open mode (read/write) either OPJ_STREAM_READ or OPJ_STREAM_WRITE */
+	int openmode;
+	/** pointer to the start of the buffer */
+	unsigned char *buffer;
+	/** buffer size in bytes */
+	int length;
+
+	/** pointer to the start of the stream */
+	unsigned char *start;
+	/** pointer to the end of the stream */
+	unsigned char *end;
+	/** pointer to the current position */
+	unsigned char *bp;
+} opj_cio_t;
+
+/* 
+==========================================================
+   image typedef definitions
+==========================================================
+*/
+
+/**
+Defines a single image component
+*/
+typedef struct opj_image_comp {
+	/** XRsiz: horizontal separation of a sample of ith component with respect to the reference grid */
+	int dx;
+	/** YRsiz: vertical separation of a sample of ith component with respect to the reference grid */
+	int dy;
+	/** data width */
+	int w;
+	/** data height */
+	int h;
+	/** x component offset compared to the whole image */
+	int x0;
+	/** y component offset compared to the whole image */
+	int y0;
+	/** precision */
+	int prec;
+	/** image depth in bits */
+	int bpp;
+	/** signed (1) / unsigned (0) */
+	int sgnd;
+	/** number of decoded resolution */
+	int resno_decoded;
+	/** number of division by 2 of the out image compared to the original size of image */
+	int factor;
+	/** image component data */
+	int *data;
+} opj_image_comp_t;
+
+/** 
+Defines image data and characteristics
+*/
+typedef struct opj_image {
+	/** XOsiz: horizontal offset from the origin of the reference grid to the left side of the image area */
+	int x0;
+	/** YOsiz: vertical offset from the origin of the reference grid to the top side of the image area */
+	int y0;
+	/** Xsiz: width of the reference grid */
+	int x1;
+	/** Ysiz: height of the reference grid */
+	int y1;
+	/** number of components in the image */
+	int numcomps;
+	/** color space: sRGB, Greyscale or YUV */
+	OPJ_COLOR_SPACE color_space;
+	/** image components */
+	opj_image_comp_t *comps;
+} opj_image_t;
+
+/**
+Component parameters structure used by the opj_image_create function
+*/
+typedef struct opj_image_comptparm {
+	/** XRsiz: horizontal separation of a sample of ith component with respect to the reference grid */
+	int dx;
+	/** YRsiz: vertical separation of a sample of ith component with respect to the reference grid */
+	int dy;
+	/** data width */
+	int w;
+	/** data height */
+	int h;
+	/** x component offset compared to the whole image */
+	int x0;
+	/** y component offset compared to the whole image */
+	int y0;
+	/** precision */
+	int prec;
+	/** image depth in bits */
+	int bpp;
+	/** signed (1) / unsigned (0) */
+	int sgnd;
+} opj_image_cmptparm_t;
+
+/* 
+==========================================================
+   Information on the JPEG 2000 codestream
+==========================================================
+*/
+
+/**
+Index structure : Information concerning a packet inside tile
+*/
+typedef struct opj_packet_info {
+	/** packet start position (including SOP marker if it exists) */
+	int start_pos;
+	/** end of packet header position (including EPH marker if it exists)*/
+	int end_ph_pos;
+	/** packet end position */
+	int end_pos;
+	/** packet distorsion */
+	double disto;
+} opj_packet_info_t;
+
+/**
+Index structure : Information concerning tile-parts
+*/
+typedef struct opj_tp_info {
+	/** start position of tile part */
+	int tp_start_pos;
+	/** end position of tile part header */
+	int tp_end_header;
+	/** end position of tile part */
+	int tp_end_pos;
+	/** start packet of tile part */
+	int tp_start_pack;
+	/** number of packets of tile part */
+	int tp_numpacks;
+} opj_tp_info_t;
+
+/**
+Index structure : information regarding tiles 
+*/
+typedef struct opj_tile_info {
+	/** value of thresh for each layer by tile cfr. Marcela   */
+	double *thresh;
+	/** number of tile */
+	int tileno;
+	/** start position */
+	int start_pos;
+	/** end position of the header */
+	int end_header;
+	/** end position */
+	int end_pos;
+	/** precinct number for each resolution level (width) */
+	int pw[33];
+	/** precinct number for each resolution level (height) */
+	int ph[33];
+	/** precinct size (in power of 2), in X for each resolution level */
+	int pdx[33];
+	/** precinct size (in power of 2), in Y for each resolution level */
+	int pdy[33];
+	/** information concerning packets inside tile */
+	opj_packet_info_t *packet;
+	/** add fixed_quality */
+	int numpix;
+	/** add fixed_quality */
+	double distotile;
+	/** number of tile parts */
+	int num_tps;
+	/** information concerning tile parts */
+	opj_tp_info_t *tp;
+} opj_tile_info_t;
+
+/* UniPG>> */
+/**
+Marker structure
+*/
+typedef struct opj_marker_info_t {
+	/** marker type */
+	unsigned short int type;
+	/** position in codestream */
+	int pos;
+	/** length, marker val included */
+	int len;
+} opj_marker_info_t;
+/* <<UniPG */
+
+/**
+Index structure of the codestream
+*/
+typedef struct opj_codestream_info {
+	/** maximum distortion reduction on the whole image (add for Marcela) */
+	double D_max;
+	/** packet number */
+	int packno;
+	/** writing the packet in the index with t2_encode_packets */
+	int index_write;
+	/** image width */
+	int image_w;
+	/** image height */
+	int image_h;
+	/** progression order */
+	OPJ_PROG_ORDER prog;
+	/** tile size in x */
+	int tile_x;
+	/** tile size in y */
+	int tile_y;
+	/** */
+	int tile_Ox;
+	/** */
+	int tile_Oy;
+	/** number of tiles in X */
+	int tw;
+	/** number of tiles in Y */
+	int th;
+	/** component numbers */
+	int numcomps;
+	/** number of layer */
+	int numlayers;
+	/** number of decomposition for each component */
+	int *numdecompos;
+/* UniPG>> */
+	/** number of markers */
+	int marknum;
+	/** list of markers */
+	opj_marker_info_t *marker;
+	/** actual size of markers array */
+	int maxmarknum;
+/* <<UniPG */
+	/** main header position */
+	int main_head_start;
+	/** main header position */
+	int main_head_end;
+	/** codestream's size */
+	int codestream_size;
+	/** information regarding tiles inside image */
+	opj_tile_info_t *tile;
+} opj_codestream_info_t;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* 
+==========================================================
+   openjpeg version
+==========================================================
+*/
+
+OPJ_API const char * OPJ_CALLCONV opj_version(void);
+
+/* 
+==========================================================
+   image functions definitions
+==========================================================
+*/
+
+/**
+Create an image
+@param numcmpts number of components
+@param cmptparms components parameters
+@param clrspc image color space
+@return returns a new image structure if successful, returns NULL otherwise
+*/
+OPJ_API opj_image_t* OPJ_CALLCONV opj_image_create(int numcmpts, opj_image_cmptparm_t *cmptparms, OPJ_COLOR_SPACE clrspc);
+
+/**
+Deallocate any resources associated with an image
+@param image image to be destroyed
+*/
+OPJ_API void OPJ_CALLCONV opj_image_destroy(opj_image_t *image);
+
+/* 
+==========================================================
+   stream functions definitions
+==========================================================
+*/
+
+/**
+Open and allocate a memory stream for read / write. 
+On reading, the user must provide a buffer containing encoded data. The buffer will be 
+wrapped by the returned CIO handle. 
+On writing, buffer parameters must be set to 0: a buffer will be allocated by the library 
+to contain encoded data. 
+@param cinfo Codec context info
+@param buffer Reading: buffer address. Writing: NULL
+@param length Reading: buffer length. Writing: 0
+@return Returns a CIO handle if successful, returns NULL otherwise
+*/
+OPJ_API opj_cio_t* OPJ_CALLCONV opj_cio_open(opj_common_ptr cinfo, unsigned char *buffer, int length);
+
+/**
+Close and free a CIO handle
+@param cio CIO handle to free
+*/
+OPJ_API void OPJ_CALLCONV opj_cio_close(opj_cio_t *cio);
+
+/**
+Get position in byte stream
+@param cio CIO handle
+@return Returns the position in bytes
+*/
+OPJ_API int OPJ_CALLCONV cio_tell(opj_cio_t *cio);
+/**
+Set position in byte stream
+@param cio CIO handle
+@param pos Position, in number of bytes, from the beginning of the stream
+*/
+OPJ_API void OPJ_CALLCONV cio_seek(opj_cio_t *cio, int pos);
+
+/* 
+==========================================================
+   event manager functions definitions
+==========================================================
+*/
+
+OPJ_API opj_event_mgr_t* OPJ_CALLCONV opj_set_event_mgr(opj_common_ptr cinfo, opj_event_mgr_t *event_mgr, void *context);
+
+/* 
+==========================================================
+   codec functions definitions
+==========================================================
+*/
+/**
+Creates a J2K/JPT/JP2 decompression structure
+@param format Decoder to select
+@return Returns a handle to a decompressor if successful, returns NULL otherwise
+*/
+OPJ_API opj_dinfo_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FORMAT format);
+/**
+Destroy a decompressor handle
+@param dinfo decompressor handle to destroy
+*/
+OPJ_API void OPJ_CALLCONV opj_destroy_decompress(opj_dinfo_t *dinfo);
+/**
+Set decoding parameters to default values
+@param parameters Decompression parameters
+*/
+OPJ_API void OPJ_CALLCONV opj_set_default_decoder_parameters(opj_dparameters_t *parameters);
+/**
+Setup the decoder decoding parameters using user parameters.
+Decoding parameters are returned in j2k->cp. 
+@param dinfo decompressor handle
+@param parameters decompression parameters
+*/
+OPJ_API void OPJ_CALLCONV opj_setup_decoder(opj_dinfo_t *dinfo, opj_dparameters_t *parameters);
+/**
+Decode an image from a JPEG-2000 codestream 
+@param dinfo decompressor handle
+@param cio Input buffer stream
+@return Returns a decoded image if successful, returns NULL otherwise
+*/
+OPJ_API opj_image_t* OPJ_CALLCONV opj_decode(opj_dinfo_t *dinfo, opj_cio_t *cio);
+
+/**
+Decode an image from a JPEG-2000 codestream and extract the codestream information
+@param dinfo decompressor handle
+@param cio Input buffer stream
+@param cstr_info Codestream information structure if needed afterwards, NULL otherwise
+@return Returns a decoded image if successful, returns NULL otherwise
+*/
+OPJ_API opj_image_t* OPJ_CALLCONV opj_decode_with_info(opj_dinfo_t *dinfo, opj_cio_t *cio, opj_codestream_info_t *cstr_info);
+/**
+Creates a J2K/JP2 compression structure
+@param format Coder to select
+@return Returns a handle to a compressor if successful, returns NULL otherwise
+*/
+OPJ_API opj_cinfo_t* OPJ_CALLCONV opj_create_compress(OPJ_CODEC_FORMAT format);
+/**
+Destroy a compressor handle
+@param cinfo compressor handle to destroy
+*/
+OPJ_API void OPJ_CALLCONV opj_destroy_compress(opj_cinfo_t *cinfo);
+/**
+Set encoding parameters to default values, that means : 
+<ul>
+<li>Lossless
+<li>1 tile
+<li>Size of precinct : 2^15 x 2^15 (means 1 precinct)
+<li>Size of code-block : 64 x 64
+<li>Number of resolutions: 6
+<li>No SOP marker in the codestream
+<li>No EPH marker in the codestream
+<li>No sub-sampling in x or y direction
+<li>No mode switch activated
+<li>Progression order: LRCP
+<li>No index file
+<li>No ROI upshifted
+<li>No offset of the origin of the image
+<li>No offset of the origin of the tiles
+<li>Reversible DWT 5-3
+</ul>
+@param parameters Compression parameters
+*/
+OPJ_API void OPJ_CALLCONV opj_set_default_encoder_parameters(opj_cparameters_t *parameters);
+/**
+Setup the encoder parameters using the current image and using user parameters. 
+@param cinfo Compressor handle
+@param parameters Compression parameters
+@param image Input filled image
+*/
+OPJ_API void OPJ_CALLCONV opj_setup_encoder(opj_cinfo_t *cinfo, opj_cparameters_t *parameters, opj_image_t *image);
+/**
+Encode an image into a JPEG-2000 codestream
+@param cinfo compressor handle
+@param cio Output buffer stream
+@param image Image to encode
+@param index Depreacted -> Set to NULL. To extract index, used opj_encode_wci()
+@return Returns true if successful, returns false otherwise
+*/
+OPJ_API bool OPJ_CALLCONV opj_encode(opj_cinfo_t *cinfo, opj_cio_t *cio, opj_image_t *image, char *index);
+/**
+Encode an image into a JPEG-2000 codestream and extract the codestream information
+@param cinfo compressor handle
+@param cio Output buffer stream
+@param image Image to encode
+@param cstr_info Codestream information structure if needed afterwards, NULL otherwise
+@return Returns true if successful, returns false otherwise
+*/
+OPJ_API bool OPJ_CALLCONV opj_encode_with_info(opj_cinfo_t *cinfo, opj_cio_t *cio, opj_image_t *image, opj_codestream_info_t *cstr_info);
+/**
+Destroy Codestream information after compression or decompression
+@param cstr_info Codestream information structure
+*/
+OPJ_API void OPJ_CALLCONV opj_destroy_cstr_info(opj_codestream_info_t *cstr_info);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* OPENJPEG_H */
diff --git a/extern/libopenjpeg/opj_includes.h b/extern/libopenjpeg/opj_includes.h
new file mode 100644
index 00000000000..80d43df990f
--- /dev/null
+++ b/extern/libopenjpeg/opj_includes.h
@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef OPJ_INCLUDES_H
+#define OPJ_INCLUDES_H
+
+/*
+ ==========================================================
+   Standard includes used by the library
+ ==========================================================
+*/
+#include <memory.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include <float.h>
+#include <time.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <ctype.h>
+
+/*
+ ==========================================================
+   OpenJPEG interface
+ ==========================================================
+ */
+#include "openjpeg.h"
+
+/*
+ ==========================================================
+   OpenJPEG modules
+ ==========================================================
+*/
+
+/* Ignore GCC attributes if this is not GCC */
+#ifndef __GNUC__
+	#define __attribute__(x) /* __attribute__(x) */
+#endif
+
+/*
+The inline keyword is supported by C99 but not by C90. 
+Most compilers implement their own version of this keyword ... 
+*/
+#ifndef INLINE
+	#if defined(_MSC_VER)
+		#define INLINE __inline
+	#elif defined(__GNUC__)
+		#define INLINE __inline__
+	#elif defined(__MWERKS__)
+		#define INLINE inline
+	#else 
+		/* add other compilers here ... */
+		#define INLINE 
+	#endif /* defined(<Compiler>) */
+#endif /* INLINE */
+
+/* Are restricted pointers available? (C99) */
+#if (__STDC_VERSION__ != 199901L)
+	/* Not a C99 compiler */
+	#ifdef __GNUC__
+		#define restrict __restrict__
+	#else
+		#define restrict /* restrict */
+	#endif
+#endif
+
+/* MSVC does not have lrintf */
+#ifdef _MSC_VER
+static INLINE long lrintf(float f){
+	int i;
+
+	_asm{
+		fld f
+		fistp i
+	};
+
+	return i;
+}
+#endif
+
+#include "j2k_lib.h"
+#include "opj_malloc.h"
+#include "event.h"
+#include "cio.h"
+
+#include "image.h"
+#include "j2k.h"
+#include "jp2.h"
+#include "jpt.h"
+
+#include "mqc.h"
+#include "raw.h"
+#include "bio.h"
+#include "tgt.h"
+#include "pi.h"
+#include "tcd.h"
+#include "t1.h"
+#include "dwt.h"
+#include "t2.h"
+#include "mct.h"
+#include "int.h"
+#include "fix.h"
+
+/* JPWL>> */
+#ifdef USE_JPWL
+#include "../jpwl/jpwl.h"
+#endif /* USE_JPWL */
+/* <<JPWL */
+
+#endif /* OPJ_INCLUDES_H */
diff --git a/extern/libopenjpeg/opj_malloc.h b/extern/libopenjpeg/opj_malloc.h
new file mode 100644
index 00000000000..79698f8ff1b
--- /dev/null
+++ b/extern/libopenjpeg/opj_malloc.h
@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 2005, Hervé Drolon, FreeImage Team
+ * Copyright (c) 2007, Callum Lerwick <seg@haxxed.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef __OPJ_MALLOC_H
+#define __OPJ_MALLOC_H
+/**
+@file opj_malloc.h
+@brief Internal functions
+
+The functions in opj_malloc.h are internal utilities used for memory management.
+*/
+
+/** @defgroup MISC MISC - Miscellaneous internal functions */
+/*@{*/
+
+/** @name Exported functions */
+/*@{*/
+/* ----------------------------------------------------------------------- */
+
+/**
+Allocate an uninitialized memory block
+@param size Bytes to allocate
+@return Returns a void pointer to the allocated space, or NULL if there is insufficient memory available
+*/
+#define opj_malloc(size) malloc(size)
+
+/**
+Allocate a memory block with elements initialized to 0
+@param num Blocks to allocate
+@param size Bytes per block to allocate
+@return Returns a void pointer to the allocated space, or NULL if there is insufficient memory available
+*/
+#define opj_calloc(num, size) calloc(num, size)
+
+/**
+Allocate memory aligned to a 16 byte boundry
+@param size Bytes to allocate
+@return Returns a void pointer to the allocated space, or NULL if there is insufficient memory available
+*/
+/* FIXME: These should be set with cmake tests, but we're currently not requiring use of cmake */
+#ifdef WIN32
+	/* Someone should tell the mingw people that their malloc.h ought to provide _mm_malloc() */
+	#ifdef __GNUC__
+		#include <mm_malloc.h>
+		#define HAVE_MM_MALLOC
+	#else /* MSVC, Intel C++ */
+		#include <malloc.h>
+		#ifdef _mm_malloc
+			#define HAVE_MM_MALLOC
+		#endif
+	#endif
+#else /* Not WIN32 */
+	#if defined(__sun)
+			#define HAVE_MEMALIGN
+		#elif defined(__GNUC__)
+			#define HAVE_MEMALIGN
+			#include <malloc.h>		
+		/* Linux x86_64 and OSX always align allocations to 16 bytes */
+		#elif !defined(__amd64__) && !defined(__APPLE__)	
+			/* FIXME: Yes, this is a big assumption */
+			#define HAVE_POSIX_MEMALIGN
+	#endif
+#endif
+
+
+
+#define opj_aligned_malloc(size) malloc(size)
+#define opj_aligned_free(m) free(m)
+
+#ifdef HAVE_MM_MALLOC
+	#undef opj_aligned_malloc
+	#define opj_aligned_malloc(size) _mm_malloc(size, 16)
+	#undef opj_aligned_free
+	#define opj_aligned_free(m) _mm_free(m)
+#endif
+
+#ifdef HAVE_MEMALIGN
+	extern void* memalign(size_t, size_t);
+	#undef opj_aligned_malloc
+	#define opj_aligned_malloc(size) memalign(16, (size))
+	#undef opj_aligned_free
+	#define opj_aligned_free(m) free(m)
+#endif
+
+#ifdef HAVE_POSIX_MEMALIGN
+	#undef opj_aligned_malloc
+	extern int posix_memalign(void**, size_t, size_t);
+
+	static INLINE void* __attribute__ ((malloc)) opj_aligned_malloc(size_t size){
+		void* mem = NULL;
+		posix_memalign(&mem, 16, size);
+		return mem;
+	}
+	#undef opj_aligned_free
+	#define opj_aligned_free(m) free(m)
+#endif
+
+/**
+Reallocate memory blocks.
+@param memblock Pointer to previously allocated memory block
+@param size New size in bytes
+@return Returns a void pointer to the reallocated (and possibly moved) memory block
+*/
+#define opj_realloc(m, s) realloc(m, s)
+
+/**
+Deallocates or frees a memory block.
+@param memblock Previously allocated memory block to be freed
+*/
+#define opj_free(m) free(m)
+
+#ifdef __GNUC__
+#pragma GCC poison malloc calloc realloc free
+#endif
+
+/* ----------------------------------------------------------------------- */
+/*@}*/
+
+/*@}*/
+
+#endif /* __OPJ_MALLOC_H */
+
diff --git a/extern/libopenjpeg/pi.c b/extern/libopenjpeg/pi.c
new file mode 100644
index 00000000000..ac7654c5f14
--- /dev/null
+++ b/extern/libopenjpeg/pi.c
@@ -0,0 +1,963 @@
+/*
+ * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2007, Professor Benoit Macq
+ * Copyright (c) 2001-2003, David Janssens
+ * Copyright (c) 2002-2003, Yannick Verschueren
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * Copyright (c) 2006-2007, Parvatha Elangovan
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "opj_includes.h"
+
+/** @defgroup PI PI - Implementation of a packet iterator */
+/*@{*/
+
+/** @name Local static functions */
+/*@{*/
+
+/**
+Get next packet in layer-resolution-component-precinct order.
+@param pi packet iterator to modify
+@return returns false if pi pointed to the last packet or else returns true 
+*/
+static bool pi_next_lrcp(opj_pi_iterator_t * pi);
+/**
+Get next packet in resolution-layer-component-precinct order.
+@param pi packet iterator to modify
+@return returns false if pi pointed to the last packet or else returns true 
+*/
+static bool pi_next_rlcp(opj_pi_iterator_t * pi);
+/**
+Get next packet in resolution-precinct-component-layer order.
+@param pi packet iterator to modify
+@return returns false if pi pointed to the last packet or else returns true 
+*/
+static bool pi_next_rpcl(opj_pi_iterator_t * pi);
+/**
+Get next packet in precinct-component-resolution-layer order.
+@param pi packet iterator to modify
+@return returns false if pi pointed to the last packet or else returns true 
+*/
+static bool pi_next_pcrl(opj_pi_iterator_t * pi);
+/**
+Get next packet in component-precinct-resolution-layer order.
+@param pi packet iterator to modify
+@return returns false if pi pointed to the last packet or else returns true 
+*/
+static bool pi_next_cprl(opj_pi_iterator_t * pi);
+
+/*@}*/
+
+/*@}*/
+
+/* 
+==========================================================
+   local functions
+==========================================================
+*/
+
+static bool pi_next_lrcp(opj_pi_iterator_t * pi) {
+	opj_pi_comp_t *comp = NULL;
+	opj_pi_resolution_t *res = NULL;
+	long index = 0;
+	
+	if (!pi->first) {
+		comp = &pi->comps[pi->compno];
+		res = &comp->resolutions[pi->resno];
+		goto LABEL_SKIP;
+	} else {
+		pi->first = 0;
+	}
+
+	for (pi->layno = pi->poc.layno0; pi->layno < pi->poc.layno1; pi->layno++) {
+		for (pi->resno = pi->poc.resno0; pi->resno < pi->poc.resno1;
+		pi->resno++) {
+			for (pi->compno = pi->poc.compno0; pi->compno < pi->poc.compno1; pi->compno++) {
+				comp = &pi->comps[pi->compno];
+				if (pi->resno >= comp->numresolutions) {
+					continue;
+				}
+				res = &comp->resolutions[pi->resno];
+				if (!pi->tp_on){
+					pi->poc.precno1 = res->pw * res->ph;
+				}
+				for (pi->precno = pi->poc.precno0; pi->precno < pi->poc.precno1; pi->precno++) {
+					index = pi->layno * pi->step_l + pi->resno * pi->step_r + pi->compno * pi->step_c + pi->precno * pi->step_p;
+					if (!pi->include[index]) {
+						pi->include[index] = 1;
+						return true;
+					}
+LABEL_SKIP:;
+				}
+			}
+		}
+	}
+	
+	return false;
+}
+
+static bool pi_next_rlcp(opj_pi_iterator_t * pi) {
+	opj_pi_comp_t *comp = NULL;
+	opj_pi_resolution_t *res = NULL;
+	long index = 0;
+
+	if (!pi->first) {
+		comp = &pi->comps[pi->compno];
+		res = &comp->resolutions[pi->resno];
+		goto LABEL_SKIP;
+	} else {
+		pi->first = 0;
+	}
+
+	for (pi->resno = pi->poc.resno0; pi->resno < pi->poc.resno1; pi->resno++) {
+		for (pi->layno = pi->poc.layno0; pi->layno < pi->poc.layno1; pi->layno++) {
+			for (pi->compno = pi->poc.compno0; pi->compno < pi->poc.compno1; pi->compno++) {
+				comp = &pi->comps[pi->compno];
+				if (pi->resno >= comp->numresolutions) {
+					continue;
+				}
+				res = &comp->resolutions[pi->resno];
+				if(!pi->tp_on){
+					pi->poc.precno1 = res->pw * res->ph;
+				}
+				for (pi->precno = pi->poc.precno0; pi->precno < pi->poc.precno1; pi->precno++) {
+					index = pi->layno * pi->step_l + pi->resno * pi->step_r + pi->compno * pi->step_c + pi->precno * pi->step_p;
+					if (!pi->include[index]) {
+						pi->include[index] = 1;
+						return true;
+					}
+LABEL_SKIP:;
+				}
+			}
+		}
+	}
+	
+	return false;
+}
+
+static bool pi_next_rpcl(opj_pi_iterator_t * pi) {
+	opj_pi_comp_t *comp = NULL;
+	opj_pi_resolution_t *res = NULL;
+	long index = 0;
+
+	if (!pi->first) {
+		goto LABEL_SKIP;
+	} else {
+		int compno, resno;
+		pi->first = 0;
+		pi->dx = 0;
+		pi->dy = 0;
+		for (compno = 0; compno < pi->numcomps; compno++) {
+			comp = &pi->comps[compno];
+			for (resno = 0; resno < comp->numresolutions; resno++) {
+				int dx, dy;
+				res = &comp->resolutions[resno];
+				dx = comp->dx * (1 << (res->pdx + comp->numresolutions - 1 - resno));
+				dy = comp->dy * (1 << (res->pdy + comp->numresolutions - 1 - resno));
+				pi->dx = !pi->dx ? dx : int_min(pi->dx, dx);
+				pi->dy = !pi->dy ? dy : int_min(pi->dy, dy);
+			}
+		}
+	}
+if (!pi->tp_on){
+			pi->poc.ty0 = pi->ty0;
+			pi->poc.tx0 = pi->tx0;
+			pi->poc.ty1 = pi->ty1;
+			pi->poc.tx1 = pi->tx1;
+		}
+	for (pi->resno = pi->poc.resno0; pi->resno < pi->poc.resno1; pi->resno++) {
+		for (pi->y = pi->poc.ty0; pi->y < pi->poc.ty1; pi->y += pi->dy - (pi->y % pi->dy)) {
+			for (pi->x = pi->poc.tx0; pi->x < pi->poc.tx1; pi->x += pi->dx - (pi->x % pi->dx)) {
+				for (pi->compno = pi->poc.compno0; pi->compno < pi->poc.compno1; pi->compno++) {
+					int levelno;
+					int trx0, try0;
+					int trx1, try1;
+					int rpx, rpy;
+					int prci, prcj;
+					comp = &pi->comps[pi->compno];
+					if (pi->resno >= comp->numresolutions) {
+						continue;
+					}
+					res = &comp->resolutions[pi->resno];
+					levelno = comp->numresolutions - 1 - pi->resno;
+					trx0 = int_ceildiv(pi->tx0, comp->dx << levelno);
+					try0 = int_ceildiv(pi->ty0, comp->dy << levelno);
+					trx1 = int_ceildiv(pi->tx1, comp->dx << levelno);
+					try1 = int_ceildiv(pi->ty1, comp->dy << levelno);
+					rpx = res->pdx + levelno;
+					rpy = res->pdy + levelno;
+					if (!((pi->y % (comp->dy << rpy) == 0) || ((pi->y == pi->ty0) && ((try0 << levelno) % (1 << rpx))))){
+						continue;	
+					}
+					if (!((pi->x % (comp->dx << rpx) == 0) || ((pi->x == pi->tx0) && ((trx0 << levelno) % (1 << rpx))))){
+						continue; 
+					}
+					
+					if ((res->pw==0)||(res->pw==0)) continue;
+					
+					if ((trx0==trx1)||(try0==try1)) continue;
+					
+					prci = int_floordivpow2(int_ceildiv(pi->x, comp->dx << levelno), res->pdx) 
+						 - int_floordivpow2(trx0, res->pdx);
+					prcj = int_floordivpow2(int_ceildiv(pi->y, comp->dy << levelno), res->pdy) 
+						 - int_floordivpow2(try0, res->pdy);
+					pi->precno = prci + prcj * res->pw;
+					for (pi->layno = pi->poc.layno0; pi->layno < pi->poc.layno1; pi->layno++) {
+						index = pi->layno * pi->step_l + pi->resno * pi->step_r + pi->compno * pi->step_c + pi->precno * pi->step_p;
+						if (!pi->include[index]) {
+							pi->include[index] = 1;
+							return true;
+						}
+LABEL_SKIP:;
+					}
+				}
+			}
+		}
+	}
+	
+	return false;
+}
+
+static bool pi_next_pcrl(opj_pi_iterator_t * pi) {
+	opj_pi_comp_t *comp = NULL;
+	opj_pi_resolution_t *res = NULL;
+	long index = 0;
+
+	if (!pi->first) {
+		comp = &pi->comps[pi->compno];
+		goto LABEL_SKIP;
+	} else {
+		int compno, resno;
+		pi->first = 0;
+		pi->dx = 0;
+		pi->dy = 0;
+		for (compno = 0; compno < pi->numcomps; compno++) {
+			comp = &pi->comps[compno];
+			for (resno = 0; resno < comp->numresolutions; resno++) {
+				int dx, dy;
+				res = &comp->resolutions[resno];
+				dx = comp->dx * (1 << (res->pdx + comp->numresolutions - 1 - resno));
+				dy = comp->dy * (1 << (res->pdy + comp->numresolutions - 1 - resno));
+				pi->dx = !pi->dx ? dx : int_min(pi->dx, dx);
+				pi->dy = !pi->dy ? dy : int_min(pi->dy, dy);
+			}
+		}
+	}
+	if (!pi->tp_on){
+			pi->poc.ty0 = pi->ty0;
+			pi->poc.tx0 = pi->tx0;
+			pi->poc.ty1 = pi->ty1;
+			pi->poc.tx1 = pi->tx1;
+		}
+	for (pi->y = pi->poc.ty0; pi->y < pi->poc.ty1; pi->y += pi->dy - (pi->y % pi->dy)) {
+		for (pi->x = pi->poc.tx0; pi->x < pi->poc.tx1; pi->x += pi->dx - (pi->x % pi->dx)) {
+			for (pi->compno = pi->poc.compno0; pi->compno < pi->poc.compno1; pi->compno++) {
+				comp = &pi->comps[pi->compno];
+				for (pi->resno = pi->poc.resno0; pi->resno < int_min(pi->poc.resno1, comp->numresolutions); pi->resno++) {
+					int levelno;
+					int trx0, try0;
+					int trx1, try1;
+					int rpx, rpy;
+					int prci, prcj;
+					res = &comp->resolutions[pi->resno];
+					levelno = comp->numresolutions - 1 - pi->resno;
+					trx0 = int_ceildiv(pi->tx0, comp->dx << levelno);
+					try0 = int_ceildiv(pi->ty0, comp->dy << levelno);
+					trx1 = int_ceildiv(pi->tx1, comp->dx << levelno);
+					try1 = int_ceildiv(pi->ty1, comp->dy << levelno);
+					rpx = res->pdx + levelno;
+					rpy = res->pdy + levelno;
+					if (!((pi->y % (comp->dy << rpy) == 0) || ((pi->y == pi->ty0) && ((try0 << levelno) % (1 << rpx))))){
+						continue;	
+					}
+					if (!((pi->x % (comp->dx << rpx) == 0) || ((pi->x == pi->tx0) && ((trx0 << levelno) % (1 << rpx))))){
+						continue; 
+					}
+					
+					if ((res->pw==0)||(res->pw==0)) continue;
+					
+					if ((trx0==trx1)||(try0==try1)) continue;
+					
+					prci = int_floordivpow2(int_ceildiv(pi->x, comp->dx << levelno), res->pdx) 
+						 - int_floordivpow2(trx0, res->pdx);
+					prcj = int_floordivpow2(int_ceildiv(pi->y, comp->dy << levelno), res->pdy) 
+						 - int_floordivpow2(try0, res->pdy);
+					pi->precno = prci + prcj * res->pw;
+					for (pi->layno = pi->poc.layno0; pi->layno < pi->poc.layno1; pi->layno++) {
+						index = pi->layno * pi->step_l + pi->resno * pi->step_r + pi->compno * pi->step_c + pi->precno * pi->step_p;
+						if (!pi->include[index]) {
+							pi->include[index] = 1;
+							return true;
+						}	
+LABEL_SKIP:;
+					}
+				}
+			}
+		}
+	}
+	
+	return false;
+}
+
+static bool pi_next_cprl(opj_pi_iterator_t * pi) {
+	opj_pi_comp_t *comp = NULL;
+	opj_pi_resolution_t *res = NULL;
+	long index = 0;
+
+	if (!pi->first) {
+		comp = &pi->comps[pi->compno];
+		goto LABEL_SKIP;
+	} else {
+		pi->first = 0;
+	}
+
+	for (pi->compno = pi->poc.compno0; pi->compno < pi->poc.compno1; pi->compno++) {
+		int resno;
+		comp = &pi->comps[pi->compno];
+		pi->dx = 0;
+		pi->dy = 0;
+		for (resno = 0; resno < comp->numresolutions; resno++) {
+			int dx, dy;
+			res = &comp->resolutions[resno];
+			dx = comp->dx * (1 << (res->pdx + comp->numresolutions - 1 - resno));
+			dy = comp->dy * (1 << (res->pdy + comp->numresolutions - 1 - resno));
+			pi->dx = !pi->dx ? dx : int_min(pi->dx, dx);
+			pi->dy = !pi->dy ? dy : int_min(pi->dy, dy);
+		}
+		if (!pi->tp_on){
+			pi->poc.ty0 = pi->ty0;
+			pi->poc.tx0 = pi->tx0;
+			pi->poc.ty1 = pi->ty1;
+			pi->poc.tx1 = pi->tx1;
+		}
+		for (pi->y = pi->poc.ty0; pi->y < pi->poc.ty1; pi->y += pi->dy - (pi->y % pi->dy)) {
+			for (pi->x = pi->poc.tx0; pi->x < pi->poc.tx1; pi->x += pi->dx - (pi->x % pi->dx)) {
+				for (pi->resno = pi->poc.resno0; pi->resno < int_min(pi->poc.resno1, comp->numresolutions); pi->resno++) {
+					int levelno;
+					int trx0, try0;
+					int trx1, try1;
+					int rpx, rpy;
+					int prci, prcj;
+					res = &comp->resolutions[pi->resno];
+					levelno = comp->numresolutions - 1 - pi->resno;
+					trx0 = int_ceildiv(pi->tx0, comp->dx << levelno);
+					try0 = int_ceildiv(pi->ty0, comp->dy << levelno);
+					trx1 = int_ceildiv(pi->tx1, comp->dx << levelno);
+					try1 = int_ceildiv(pi->ty1, comp->dy << levelno);
+					rpx = res->pdx + levelno;
+					rpy = res->pdy + levelno;
+					if (!((pi->y % (comp->dy << rpy) == 0) || ((pi->y == pi->ty0) && ((try0 << levelno) % (1 << rpx))))){
+						continue;	
+					}
+					if (!((pi->x % (comp->dx << rpx) == 0) || ((pi->x == pi->tx0) && ((trx0 << levelno) % (1 << rpx))))){
+						continue; 
+					}
+					
+					if ((res->pw==0)||(res->pw==0)) continue;
+					
+					if ((trx0==trx1)||(try0==try1)) continue;
+					
+					prci = int_floordivpow2(int_ceildiv(pi->x, comp->dx << levelno), res->pdx) 
+						 - int_floordivpow2(trx0, res->pdx);
+					prcj = int_floordivpow2(int_ceildiv(pi->y, comp->dy << levelno), res->pdy) 
+						 - int_floordivpow2(try0, res->pdy);
+					pi->precno = prci + prcj * res->pw;
+					for (pi->layno = pi->poc.layno0; pi->layno < pi->poc.layno1; pi->layno++) {
+						index = pi->layno * pi->step_l + pi->resno * pi->step_r + pi->compno * pi->step_c + pi->precno * pi->step_p;
+						if (!pi->include[index]) {
+							pi->include[index] = 1;
+							return true;
+						}
+LABEL_SKIP:;
+					}
+				}
+			}
+		}
+	}
+	
+	return false;
+}
+
+/* 
+==========================================================
+   Packet iterator interface
+==========================================================
+*/
+
+opj_pi_iterator_t *pi_create_decode(opj_image_t *image, opj_cp_t *cp, int tileno) {
+	int p, q;
+	int compno, resno, pino;
+	opj_pi_iterator_t *pi = NULL;
+	opj_tcp_t *tcp = NULL;
+	opj_tccp_t *tccp = NULL;
+
+	tcp = &cp->tcps[tileno];
+
+	pi = (opj_pi_iterator_t*) opj_calloc((tcp->numpocs + 1), sizeof(opj_pi_iterator_t));
+	if(!pi) {
+		/* TODO: throw an error */
+		return NULL;
+	}
+
+	for (pino = 0; pino < tcp->numpocs + 1; pino++) {	/* change */
+		int maxres = 0;
+		int maxprec = 0;
+		p = tileno % cp->tw;
+		q = tileno / cp->tw;
+
+		pi[pino].tx0 = int_max(cp->tx0 + p * cp->tdx, image->x0);
+		pi[pino].ty0 = int_max(cp->ty0 + q * cp->tdy, image->y0);
+		pi[pino].tx1 = int_min(cp->tx0 + (p + 1) * cp->tdx, image->x1);
+		pi[pino].ty1 = int_min(cp->ty0 + (q + 1) * cp->tdy, image->y1);
+		pi[pino].numcomps = image->numcomps;
+
+		pi[pino].comps = (opj_pi_comp_t*) opj_calloc(image->numcomps, sizeof(opj_pi_comp_t));
+		if(!pi[pino].comps) {
+			/* TODO: throw an error */
+			pi_destroy(pi, cp, tileno);
+			return NULL;
+		}
+		
+		for (compno = 0; compno < pi->numcomps; compno++) {
+			int tcx0, tcy0, tcx1, tcy1;
+			opj_pi_comp_t *comp = &pi[pino].comps[compno];
+			tccp = &tcp->tccps[compno];
+			comp->dx = image->comps[compno].dx;
+			comp->dy = image->comps[compno].dy;
+			comp->numresolutions = tccp->numresolutions;
+
+			comp->resolutions = (opj_pi_resolution_t*) opj_calloc(comp->numresolutions, sizeof(opj_pi_resolution_t));
+			if(!comp->resolutions) {
+				/* TODO: throw an error */
+				pi_destroy(pi, cp, tileno);
+				return NULL;
+			}
+
+			tcx0 = int_ceildiv(pi->tx0, comp->dx);
+			tcy0 = int_ceildiv(pi->ty0, comp->dy);
+			tcx1 = int_ceildiv(pi->tx1, comp->dx);
+			tcy1 = int_ceildiv(pi->ty1, comp->dy);
+			if (comp->numresolutions > maxres) {
+				maxres = comp->numresolutions;
+			}
+
+			for (resno = 0; resno < comp->numresolutions; resno++) {
+				int levelno;
+				int rx0, ry0, rx1, ry1;
+				int px0, py0, px1, py1;
+				opj_pi_resolution_t *res = &comp->resolutions[resno];
+				if (tccp->csty & J2K_CCP_CSTY_PRT) {
+					res->pdx = tccp->prcw[resno];
+					res->pdy = tccp->prch[resno];
+				} else {
+					res->pdx = 15;
+					res->pdy = 15;
+				}
+				levelno = comp->numresolutions - 1 - resno;
+				rx0 = int_ceildivpow2(tcx0, levelno);
+				ry0 = int_ceildivpow2(tcy0, levelno);
+				rx1 = int_ceildivpow2(tcx1, levelno);
+				ry1 = int_ceildivpow2(tcy1, levelno);
+				px0 = int_floordivpow2(rx0, res->pdx) << res->pdx;
+				py0 = int_floordivpow2(ry0, res->pdy) << res->pdy;
+				px1 = int_ceildivpow2(rx1, res->pdx) << res->pdx;
+				py1 = int_ceildivpow2(ry1, res->pdy) << res->pdy;
+				res->pw = (rx0==rx1)?0:((px1 - px0) >> res->pdx);
+				res->ph = (ry0==ry1)?0:((py1 - py0) >> res->pdy);
+				
+				if (res->pw*res->ph > maxprec) {
+					maxprec = res->pw*res->ph;
+				}
+				
+			}
+		}
+		
+		tccp = &tcp->tccps[0];
+		pi[pino].step_p = 1;
+		pi[pino].step_c = maxprec * pi[pino].step_p;
+		pi[pino].step_r = image->numcomps * pi[pino].step_c;
+		pi[pino].step_l = maxres * pi[pino].step_r;
+		
+		if (pino == 0) {
+			pi[pino].include = (short int*) opj_calloc(image->numcomps * maxres * tcp->numlayers * maxprec, sizeof(short int));
+			if(!pi[pino].include) {
+				/* TODO: throw an error */
+				pi_destroy(pi, cp, tileno);
+				return NULL;
+			}
+		}
+		else {
+			pi[pino].include = pi[pino - 1].include;
+		}
+		
+		if (tcp->POC == 0) {
+			pi[pino].first = 1;
+			pi[pino].poc.resno0 = 0;
+			pi[pino].poc.compno0 = 0;
+			pi[pino].poc.layno1 = tcp->numlayers;
+			pi[pino].poc.resno1 = maxres;
+			pi[pino].poc.compno1 = image->numcomps;
+			pi[pino].poc.prg = tcp->prg;
+		} else {
+			pi[pino].first = 1;
+			pi[pino].poc.resno0 = tcp->pocs[pino].resno0;
+			pi[pino].poc.compno0 = tcp->pocs[pino].compno0;
+			pi[pino].poc.layno1 = tcp->pocs[pino].layno1;
+			pi[pino].poc.resno1 = tcp->pocs[pino].resno1;
+			pi[pino].poc.compno1 = tcp->pocs[pino].compno1;
+			pi[pino].poc.prg = tcp->pocs[pino].prg;
+		}
+		pi[pino].poc.layno0  = 0;
+		pi[pino].poc.precno0 = 0; 
+		pi[pino].poc.precno1 = maxprec;
+			
+	}
+	
+	return pi;
+}
+
+
+opj_pi_iterator_t *pi_initialise_encode(opj_image_t *image, opj_cp_t *cp, int tileno, J2K_T2_MODE t2_mode){ 
+	int p, q, pino;
+	int compno, resno;
+	int maxres = 0;
+	int maxprec = 0;
+	opj_pi_iterator_t *pi = NULL;
+	opj_tcp_t *tcp = NULL;
+	opj_tccp_t *tccp = NULL;
+	
+	tcp = &cp->tcps[tileno];
+
+	pi = (opj_pi_iterator_t*) opj_calloc((tcp->numpocs + 1), sizeof(opj_pi_iterator_t));
+	if(!pi) {	return NULL;}
+	pi->tp_on = cp->tp_on;
+
+	for(pino = 0;pino < tcp->numpocs+1 ; pino ++){
+		p = tileno % cp->tw;
+		q = tileno / cp->tw;
+
+		pi[pino].tx0 = int_max(cp->tx0 + p * cp->tdx, image->x0);
+		pi[pino].ty0 = int_max(cp->ty0 + q * cp->tdy, image->y0);
+		pi[pino].tx1 = int_min(cp->tx0 + (p + 1) * cp->tdx, image->x1);
+		pi[pino].ty1 = int_min(cp->ty0 + (q + 1) * cp->tdy, image->y1);
+		pi[pino].numcomps = image->numcomps;
+		
+		pi[pino].comps = (opj_pi_comp_t*) opj_calloc(image->numcomps, sizeof(opj_pi_comp_t));
+		if(!pi[pino].comps) {
+			pi_destroy(pi, cp, tileno);
+			return NULL;
+		}
+		
+		for (compno = 0; compno < pi[pino].numcomps; compno++) {
+			int tcx0, tcy0, tcx1, tcy1;
+			opj_pi_comp_t *comp = &pi[pino].comps[compno];
+			tccp = &tcp->tccps[compno];
+			comp->dx = image->comps[compno].dx;
+			comp->dy = image->comps[compno].dy;
+			comp->numresolutions = tccp->numresolutions;
+
+			comp->resolutions = (opj_pi_resolution_t*) opj_malloc(comp->numresolutions * sizeof(opj_pi_resolution_t));
+			if(!comp->resolutions) {
+				pi_destroy(pi, cp, tileno);
+				return NULL;
+			}
+
+			tcx0 = int_ceildiv(pi[pino].tx0, comp->dx);
+			tcy0 = int_ceildiv(pi[pino].ty0, comp->dy);
+			tcx1 = int_ceildiv(pi[pino].tx1, comp->dx);
+			tcy1 = int_ceildiv(pi[pino].ty1, comp->dy);
+			if (comp->numresolutions > maxres) {
+				maxres = comp->numresolutions;
+			}
+
+			for (resno = 0; resno < comp->numresolutions; resno++) {
+				int levelno;
+				int rx0, ry0, rx1, ry1;
+				int px0, py0, px1, py1;
+				opj_pi_resolution_t *res = &comp->resolutions[resno];
+				if (tccp->csty & J2K_CCP_CSTY_PRT) {
+					res->pdx = tccp->prcw[resno];
+					res->pdy = tccp->prch[resno];
+				} else {
+					res->pdx = 15;
+					res->pdy = 15;
+				}
+				levelno = comp->numresolutions - 1 - resno;
+				rx0 = int_ceildivpow2(tcx0, levelno);
+				ry0 = int_ceildivpow2(tcy0, levelno);
+				rx1 = int_ceildivpow2(tcx1, levelno);
+				ry1 = int_ceildivpow2(tcy1, levelno);
+				px0 = int_floordivpow2(rx0, res->pdx) << res->pdx;
+				py0 = int_floordivpow2(ry0, res->pdy) << res->pdy;
+				px1 = int_ceildivpow2(rx1, res->pdx) << res->pdx;
+				py1 = int_ceildivpow2(ry1, res->pdy) << res->pdy;
+				res->pw = (rx0==rx1)?0:((px1 - px0) >> res->pdx);
+				res->ph = (ry0==ry1)?0:((py1 - py0) >> res->pdy);
+
+				if (res->pw*res->ph > maxprec) {
+					maxprec = res->pw * res->ph;
+				}
+			}
+		}
+		
+		tccp = &tcp->tccps[0];
+		pi[pino].step_p = 1;
+		pi[pino].step_c = maxprec * pi[pino].step_p;
+		pi[pino].step_r = image->numcomps * pi[pino].step_c;
+		pi[pino].step_l = maxres * pi[pino].step_r;
+		
+		for (compno = 0; compno < pi->numcomps; compno++) {
+			opj_pi_comp_t *comp = &pi->comps[compno];
+			for (resno = 0; resno < comp->numresolutions; resno++) {
+				int dx, dy;
+				opj_pi_resolution_t *res = &comp->resolutions[resno];
+				dx = comp->dx * (1 << (res->pdx + comp->numresolutions - 1 - resno));
+				dy = comp->dy * (1 << (res->pdy + comp->numresolutions - 1 - resno));
+				pi[pino].dx = !pi->dx ? dx : int_min(pi->dx, dx);
+				pi[pino].dy = !pi->dy ? dy : int_min(pi->dy, dy);
+			}
+		}
+
+		if (pino == 0) {
+			pi[pino].include = (short int*) opj_calloc(tcp->numlayers * pi[pino].step_l, sizeof(short int));
+			if(!pi[pino].include) {
+				pi_destroy(pi, cp, tileno);
+				return NULL;
+			}
+		}
+		else {
+			pi[pino].include = pi[pino - 1].include;
+		}
+		
+		/* Generation of boundaries for each prog flag*/
+			if(tcp->POC && ( cp->cinema || ((!cp->cinema) && (t2_mode == FINAL_PASS)))){
+				tcp->pocs[pino].compS= tcp->pocs[pino].compno0;
+				tcp->pocs[pino].compE= tcp->pocs[pino].compno1;
+				tcp->pocs[pino].resS = tcp->pocs[pino].resno0;
+				tcp->pocs[pino].resE = tcp->pocs[pino].resno1;
+				tcp->pocs[pino].layE = tcp->pocs[pino].layno1;
+				tcp->pocs[pino].prg  = tcp->pocs[pino].prg1;
+				if (pino > 0)
+					tcp->pocs[pino].layS = (tcp->pocs[pino].layE > tcp->pocs[pino - 1].layE) ? tcp->pocs[pino - 1].layE : 0;
+			}else {
+				tcp->pocs[pino].compS= 0;
+				tcp->pocs[pino].compE= image->numcomps;
+				tcp->pocs[pino].resS = 0;
+				tcp->pocs[pino].resE = maxres;
+				tcp->pocs[pino].layS = 0;
+				tcp->pocs[pino].layE = tcp->numlayers;
+				tcp->pocs[pino].prg  = tcp->prg;
+			}
+			tcp->pocs[pino].prcS = 0;
+			tcp->pocs[pino].prcE = maxprec;;
+			tcp->pocs[pino].txS = pi[pino].tx0;
+			tcp->pocs[pino].txE = pi[pino].tx1;
+			tcp->pocs[pino].tyS = pi[pino].ty0;
+			tcp->pocs[pino].tyE = pi[pino].ty1;
+			tcp->pocs[pino].dx = pi[pino].dx;
+			tcp->pocs[pino].dy = pi[pino].dy;
+		}
+			return pi;
+	}
+
+
+
+void pi_destroy(opj_pi_iterator_t *pi, opj_cp_t *cp, int tileno) {
+	int compno, pino;
+	opj_tcp_t *tcp = &cp->tcps[tileno];
+	if(pi) {
+		for (pino = 0; pino < tcp->numpocs + 1; pino++) {	
+			if(pi[pino].comps) {
+				for (compno = 0; compno < pi->numcomps; compno++) {
+					opj_pi_comp_t *comp = &pi[pino].comps[compno];
+					if(comp->resolutions) {
+						opj_free(comp->resolutions);
+					}
+				}
+				opj_free(pi[pino].comps);
+			}
+		}
+		if(pi->include) {
+			opj_free(pi->include);
+		}
+		opj_free(pi);
+	}
+}
+
+bool pi_next(opj_pi_iterator_t * pi) {
+	switch (pi->poc.prg) {
+		case LRCP:
+			return pi_next_lrcp(pi);
+		case RLCP:
+			return pi_next_rlcp(pi);
+		case RPCL:
+			return pi_next_rpcl(pi);
+		case PCRL:
+			return pi_next_pcrl(pi);
+		case CPRL:
+			return pi_next_cprl(pi);
+		case PROG_UNKNOWN:
+			return false;
+	}
+	
+	return false;
+}
+
+bool pi_create_encode( opj_pi_iterator_t *pi, opj_cp_t *cp,int tileno, int pino,int tpnum, int tppos, J2K_T2_MODE t2_mode,int cur_totnum_tp){
+	char prog[4];
+	int i;
+	int incr_top=1,resetX=0;
+	opj_tcp_t *tcps =&cp->tcps[tileno];
+	opj_poc_t *tcp= &tcps->pocs[pino];
+
+	pi[pino].first = 1;
+	pi[pino].poc.prg = tcp->prg;
+
+	switch(tcp->prg){
+		case CPRL: strncpy(prog, "CPRL",4);
+			break;
+		case LRCP: strncpy(prog, "LRCP",4);
+			break;
+		case PCRL: strncpy(prog, "PCRL",4);
+			break;
+		case RLCP: strncpy(prog, "RLCP",4);
+			break;
+		case RPCL: strncpy(prog, "RPCL",4);
+			break;
+		case PROG_UNKNOWN: 
+			return true;
+	}
+
+	if(!(cp->tp_on && ((!cp->cinema && (t2_mode == FINAL_PASS)) || cp->cinema))){
+		pi[pino].poc.resno0 = tcp->resS;
+		pi[pino].poc.resno1 = tcp->resE;
+		pi[pino].poc.compno0 = tcp->compS;
+		pi[pino].poc.compno1 = tcp->compE;
+		pi[pino].poc.layno0 = tcp->layS;
+		pi[pino].poc.layno1 = tcp->layE;
+		pi[pino].poc.precno0 = tcp->prcS;
+		pi[pino].poc.precno1 = tcp->prcE;
+		pi[pino].poc.tx0 = tcp->txS;
+		pi[pino].poc.ty0 = tcp->tyS;
+		pi[pino].poc.tx1 = tcp->txE;
+		pi[pino].poc.ty1 = tcp->tyE;
+	}else {
+		if( tpnum < cur_totnum_tp){
+			for(i=3;i>=0;i--){
+				switch(prog[i]){
+				case 'C':
+					if (i > tppos){
+						pi[pino].poc.compno0 = tcp->compS;
+						pi[pino].poc.compno1 = tcp->compE;
+					}else{
+						if (tpnum == 0){
+							tcp->comp_t = tcp->compS;
+							pi[pino].poc.compno0 = tcp->comp_t;
+							pi[pino].poc.compno1 = tcp->comp_t+1;
+							tcp->comp_t+=1;
+						}else{
+							if (incr_top == 1){
+								if(tcp->comp_t ==tcp->compE){
+									tcp->comp_t = tcp->compS;
+									pi[pino].poc.compno0 = tcp->comp_t;
+									pi[pino].poc.compno1 = tcp->comp_t+1;
+									tcp->comp_t+=1;
+									incr_top=1;
+								}else{
+									pi[pino].poc.compno0 = tcp->comp_t;
+									pi[pino].poc.compno1 = tcp->comp_t+1;
+									tcp->comp_t+=1;
+									incr_top=0;
+								}
+							}else{
+								pi[pino].poc.compno0 = tcp->comp_t-1;
+								pi[pino].poc.compno1 = tcp->comp_t;
+							}
+						}
+					}
+					break;
+
+				case 'R':
+					if (i > tppos){
+						pi[pino].poc.resno0 = tcp->resS;
+						pi[pino].poc.resno1 = tcp->resE;
+					}else{
+						if (tpnum == 0){
+							tcp->res_t = tcp->resS;
+							pi[pino].poc.resno0 = tcp->res_t;
+							pi[pino].poc.resno1 = tcp->res_t+1;
+							tcp->res_t+=1;
+						}else{
+							if (incr_top == 1){
+								if(tcp->res_t==tcp->resE){
+									tcp->res_t = tcp->resS;
+									pi[pino].poc.resno0 = tcp->res_t;
+									pi[pino].poc.resno1 = tcp->res_t+1;
+									tcp->res_t+=1;
+									incr_top=1;
+								}else{
+									pi[pino].poc.resno0 = tcp->res_t;
+									pi[pino].poc.resno1 = tcp->res_t+1;
+									tcp->res_t+=1;
+									incr_top=0;
+								}
+							}else{
+								pi[pino].poc.resno0 = tcp->res_t - 1;
+								pi[pino].poc.resno1 = tcp->res_t;
+							}
+						}
+					}
+					break;
+
+				case 'L':
+					if (i > tppos){
+						pi[pino].poc.layno0 = tcp->layS;
+						pi[pino].poc.layno1 = tcp->layE;
+					}else{
+						if (tpnum == 0){
+							tcp->lay_t = tcp->layS;
+							pi[pino].poc.layno0 = tcp->lay_t;
+							pi[pino].poc.layno1 = tcp->lay_t+1;
+							tcp->lay_t+=1;
+						}else{
+							if (incr_top == 1){
+								if(tcp->lay_t == tcp->layE){
+									tcp->lay_t = tcp->layS;
+									pi[pino].poc.layno0 = tcp->lay_t;
+									pi[pino].poc.layno1 = tcp->lay_t+1;
+									tcp->lay_t+=1;
+									incr_top=1;
+								}else{
+									pi[pino].poc.layno0 = tcp->lay_t;
+									pi[pino].poc.layno1 = tcp->lay_t+1;
+									tcp->lay_t+=1;
+									incr_top=0;
+								}
+							}else{
+								pi[pino].poc.layno0 = tcp->lay_t - 1;
+								pi[pino].poc.layno1 = tcp->lay_t;
+							}
+						}
+					}
+					break;
+
+				case 'P':
+					switch(tcp->prg){
+						case LRCP:
+						case RLCP:
+							if (i > tppos){
+								pi[pino].poc.precno0 = tcp->prcS;
+								pi[pino].poc.precno1 = tcp->prcE;
+							}else{
+								if (tpnum == 0){
+									tcp->prc_t = tcp->prcS;
+									pi[pino].poc.precno0 = tcp->prc_t;
+									pi[pino].poc.precno1 = tcp->prc_t+1;
+									tcp->prc_t+=1; 
+								}else{
+									if (incr_top == 1){
+										if(tcp->prc_t == tcp->prcE){
+											tcp->prc_t = tcp->prcS;
+											pi[pino].poc.precno0 = tcp->prc_t;
+											pi[pino].poc.precno1 = tcp->prc_t+1;
+											tcp->prc_t+=1;
+											incr_top=1;
+										}else{
+											pi[pino].poc.precno0 = tcp->prc_t;
+											pi[pino].poc.precno1 = tcp->prc_t+1;
+											tcp->prc_t+=1;
+											incr_top=0;
+										}
+									}else{
+										pi[pino].poc.precno0 = tcp->prc_t - 1;
+										pi[pino].poc.precno1 = tcp->prc_t;
+									}
+								}
+							}
+						break;
+						default:
+							if (i > tppos){
+								pi[pino].poc.tx0 = tcp->txS;
+								pi[pino].poc.ty0 = tcp->tyS;
+								pi[pino].poc.tx1 = tcp->txE;
+								pi[pino].poc.ty1 = tcp->tyE;
+							}else{
+								if (tpnum == 0){
+									tcp->tx0_t = tcp->txS;
+									tcp->ty0_t = tcp->tyS;
+									pi[pino].poc.tx0 = tcp->tx0_t;
+									pi[pino].poc.tx1 = tcp->tx0_t + tcp->dx - (tcp->tx0_t % tcp->dx);
+									pi[pino].poc.ty0 = tcp->ty0_t;
+									pi[pino].poc.ty1 = tcp->ty0_t + tcp->dy - (tcp->ty0_t % tcp->dy);
+									tcp->tx0_t = pi[pino].poc.tx1;
+									tcp->ty0_t = pi[pino].poc.ty1;
+								}else{
+									if (incr_top == 1){
+										if(tcp->tx0_t >= tcp->txE){
+											if(tcp->ty0_t >= tcp->tyE){
+												tcp->ty0_t = tcp->tyS;
+												pi[pino].poc.ty0 = tcp->ty0_t;
+												pi[pino].poc.ty1 = tcp->ty0_t + tcp->dy - (tcp->ty0_t % tcp->dy);
+												tcp->ty0_t = pi[pino].poc.ty1;
+												incr_top=1;resetX=1;
+											}else{
+												pi[pino].poc.ty0 = tcp->ty0_t;
+												pi[pino].poc.ty1 = tcp->ty0_t + tcp->dy - (tcp->ty0_t % tcp->dy);
+												tcp->ty0_t = pi[pino].poc.ty1;
+												incr_top=0;resetX=1;
+											}
+											if(resetX==1){
+												tcp->tx0_t = tcp->txS;
+												pi[pino].poc.tx0 = tcp->tx0_t;
+												pi[pino].poc.tx1 = tcp->tx0_t + tcp->dx- (tcp->tx0_t % tcp->dx);
+												tcp->tx0_t = pi[pino].poc.tx1;
+											}
+										}else{
+											pi[pino].poc.tx0 = tcp->tx0_t;
+											pi[pino].poc.tx1 = tcp->tx0_t + tcp->dx- (tcp->tx0_t % tcp->dx);
+											tcp->tx0_t = pi[pino].poc.tx1;
+											pi[pino].poc.ty0 = tcp->ty0_t - tcp->dy - (tcp->ty0_t % tcp->dy);
+											pi[pino].poc.ty1 = tcp->ty0_t ;
+											incr_top=0;
+										}
+									}else{
+										pi[pino].poc.tx0 = tcp->tx0_t - tcp->dx - (tcp->tx0_t % tcp->dx);
+										pi[pino].poc.tx1 = tcp->tx0_t ;
+										pi[pino].poc.ty0 = tcp->ty0_t - tcp->dy - (tcp->ty0_t % tcp->dy);
+										pi[pino].poc.ty1 = tcp->ty0_t ;
+									}
+								}
+							}
+						break;
+						}
+						break;
+				}		
+			} 
+		}
+	}	
+	return false;
+}
+
diff --git a/extern/libopenjpeg/pi.h b/extern/libopenjpeg/pi.h
new file mode 100644
index 00000000000..b5e0f6a4df8
--- /dev/null
+++ b/extern/libopenjpeg/pi.h
@@ -0,0 +1,154 @@
+/*
+ * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2007, Professor Benoit Macq
+ * Copyright (c) 2001-2003, David Janssens
+ * Copyright (c) 2002-2003, Yannick Verschueren
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __PI_H
+#define __PI_H
+/**
+@file pi.h
+@brief Implementation of a packet iterator (PI)
+
+The functions in PI.C have for goal to realize a packet iterator that permits to get the next
+packet following the progression order and change of it. The functions in PI.C are used
+by some function in T2.C.
+*/
+
+/** @defgroup PI PI - Implementation of a packet iterator */
+/*@{*/
+
+/**
+FIXME: documentation
+*/
+typedef struct opj_pi_resolution {
+  int pdx, pdy;
+  int pw, ph;
+} opj_pi_resolution_t;
+
+/**
+FIXME: documentation
+*/
+typedef struct opj_pi_comp {
+  int dx, dy;
+  /** number of resolution levels */
+  int numresolutions;
+  opj_pi_resolution_t *resolutions;
+} opj_pi_comp_t;
+
+/** 
+Packet iterator 
+*/
+typedef struct opj_pi_iterator {
+	/** Enabling Tile part generation*/
+	char tp_on;
+	/** precise if the packet has been already used (usefull for progression order change) */
+	short int *include;
+	/** layer step used to localize the packet in the include vector */
+	int step_l;
+	/** resolution step used to localize the packet in the include vector */
+	int step_r;	
+	/** component step used to localize the packet in the include vector */
+	int step_c;	
+	/** precinct step used to localize the packet in the include vector */
+	int step_p;	
+	/** component that identify the packet */
+	int compno;
+	/** resolution that identify the packet */
+	int resno;
+	/** precinct that identify the packet */
+	int precno;
+	/** layer that identify the packet */
+	int layno;   
+	/** 0 if the first packet */
+	int first;
+	/** progression order change information */
+	opj_poc_t poc;
+	/** number of components in the image */
+	int numcomps;
+	/** Components*/
+	opj_pi_comp_t *comps;
+	int tx0, ty0, tx1, ty1;
+	int x, y, dx, dy;
+} opj_pi_iterator_t;
+
+/** @name Exported functions */
+/*@{*/
+/* ----------------------------------------------------------------------- */
+/**
+Create a packet iterator for Encoder
+@param image Raw image for which the packets will be listed
+@param cp Coding parameters
+@param tileno Number that identifies the tile for which to list the packets
+@param t2_mode If == 0 In Threshold calculation ,If == 1 Final pass
+@return Returns a packet iterator that points to the first packet of the tile
+@see pi_destroy
+*/
+opj_pi_iterator_t *pi_initialise_encode(opj_image_t *image, opj_cp_t *cp, int tileno,J2K_T2_MODE t2_mode);
+/**
+Modify the packet iterator for enabling tile part generation
+@param pi Handle to the packet iterator generated in pi_initialise_encode  
+@param cp Coding parameters
+@param tileno Number that identifies the tile for which to list the packets
+@param tpnum Tile part number of the current tile
+@param tppos The position of the tile part flag in the progression order
+@param cur_totnum_tp The total number of tile parts in the current tile
+@return Returns true if an error is detected 
+*/
+bool pi_create_encode(opj_pi_iterator_t *pi, opj_cp_t *cp,int tileno, int pino,int tpnum, int tppos, J2K_T2_MODE t2_mode,int cur_totnum_tp);
+/**
+Create a packet iterator for Decoder
+@param image Raw image for which the packets will be listed
+@param cp Coding parameters
+@param tileno Number that identifies the tile for which to list the packets
+@return Returns a packet iterator that points to the first packet of the tile
+@see pi_destroy
+*/
+opj_pi_iterator_t *pi_create_decode(opj_image_t * image, opj_cp_t * cp, int tileno);
+
+/**
+Destroy a packet iterator
+@param pi Previously created packet iterator
+@param cp Coding parameters
+@param tileno Number that identifies the tile for which the packets were listed
+@see pi_create
+*/
+void pi_destroy(opj_pi_iterator_t *pi, opj_cp_t *cp, int tileno);
+
+/**
+Modify the packet iterator to point to the next packet
+@param pi Packet iterator to modify
+@return Returns false if pi pointed to the last packet or else returns true 
+*/
+bool pi_next(opj_pi_iterator_t * pi);
+/* ----------------------------------------------------------------------- */
+/*@}*/
+
+/*@}*/
+
+#endif /* __PI_H */
diff --git a/extern/libopenjpeg/raw.c b/extern/libopenjpeg/raw.c
new file mode 100644
index 00000000000..3d231bfdc6b
--- /dev/null
+++ b/extern/libopenjpeg/raw.c
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2007, Professor Benoit Macq
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "opj_includes.h"
+
+/* 
+==========================================================
+   local functions
+==========================================================
+*/
+
+
+/* 
+==========================================================
+   RAW encoding interface
+==========================================================
+*/
+
+opj_raw_t* raw_create(void) {
+	opj_raw_t *raw = (opj_raw_t*)opj_malloc(sizeof(opj_raw_t));
+	return raw;
+}
+
+void raw_destroy(opj_raw_t *raw) {
+	if(raw) {
+		opj_free(raw);
+	}
+}
+
+int raw_numbytes(opj_raw_t *raw) {
+	return raw->bp - raw->start;
+}
+
+void raw_init_dec(opj_raw_t *raw, unsigned char *bp, int len) {
+	raw->start = bp;
+	raw->lenmax = len;
+	raw->len = 0;
+	raw->c = 0;
+	raw->ct = 0;
+}
+
+int raw_decode(opj_raw_t *raw) {
+	int d;
+	if (raw->ct == 0) {
+		raw->ct = 8;
+		if (raw->len == raw->lenmax) {
+			raw->c = 0xff;
+		} else {
+			if (raw->c == 0xff) {
+				raw->ct = 7;
+			}
+			raw->c = *(raw->start + raw->len);
+			raw->len++;
+		}
+	}
+	raw->ct--;
+	d = (raw->c >> raw->ct) & 0x01;
+	
+	return d;
+}
+
diff --git a/extern/libopenjpeg/raw.h b/extern/libopenjpeg/raw.h
new file mode 100644
index 00000000000..3c4b372f3f6
--- /dev/null
+++ b/extern/libopenjpeg/raw.h
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2007, Professor Benoit Macq
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __RAW_H
+#define __RAW_H
+/**
+@file raw.h
+@brief Implementation of operations for raw encoding (RAW)
+
+The functions in RAW.C have for goal to realize the operation of raw encoding linked
+with the corresponding mode switch.
+*/
+
+/** @defgroup RAW RAW - Implementation of operations for raw encoding */
+/*@{*/
+
+/**
+RAW encoding operations
+*/
+typedef struct opj_raw {
+	/** temporary buffer where bits are coded or decoded */
+	unsigned char c;
+	/** number of bits already read or free to write */
+	unsigned int ct;
+	/** maximum length to decode */
+	unsigned int lenmax;
+	/** length decoded */
+	unsigned int len;
+	/** pointer to the current position in the buffer */
+	unsigned char *bp;
+	/** pointer to the start of the buffer */
+	unsigned char *start;
+	/** pointer to the end of the buffer */
+	unsigned char *end;
+} opj_raw_t;
+
+/** @name Exported functions */
+/*@{*/
+/* ----------------------------------------------------------------------- */
+/**
+Create a new RAW handle 
+@return Returns a new RAW handle if successful, returns NULL otherwise
+*/
+opj_raw_t* raw_create(void);
+/**
+Destroy a previously created RAW handle
+@param raw RAW handle to destroy
+*/
+void raw_destroy(opj_raw_t *raw);
+/**
+Return the number of bytes written/read since initialisation
+@param raw RAW handle to destroy
+@return Returns the number of bytes already encoded
+*/
+int raw_numbytes(opj_raw_t *raw);
+/**
+Initialize the decoder
+@param raw RAW handle
+@param bp Pointer to the start of the buffer from which the bytes will be read
+@param len Length of the input buffer
+*/
+void raw_init_dec(opj_raw_t *raw, unsigned char *bp, int len);
+/**
+Decode a symbol using raw-decoder. Cfr p.506 TAUBMAN
+@param raw RAW handle
+@return Returns the decoded symbol (0 or 1)
+*/
+int raw_decode(opj_raw_t *raw);
+/* ----------------------------------------------------------------------- */
+/*@}*/
+
+/*@}*/
+
+#endif /* __RAW_H */
diff --git a/extern/libopenjpeg/t1.c b/extern/libopenjpeg/t1.c
new file mode 100644
index 00000000000..ad1c6a83ab6
--- /dev/null
+++ b/extern/libopenjpeg/t1.c
@@ -0,0 +1,1208 @@
+/*
+ * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2007, Professor Benoit Macq
+ * Copyright (c) 2001-2003, David Janssens
+ * Copyright (c) 2002-2003, Yannick Verschueren
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * Copyright (c) 2007, Callum Lerwick <seg@haxxed.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "opj_includes.h"
+#include "t1_luts.h"
+
+/** @defgroup T1 T1 - Implementation of the tier-1 coding */
+/*@{*/
+
+/** @name Local static functions */
+/*@{*/
+
+static INLINE char t1_getctxno_zc(int f, int orient);
+static char t1_getctxno_sc(int f);
+static INLINE int t1_getctxno_mag(int f);
+static char t1_getspb(int f);
+static short t1_getnmsedec_sig(int x, int bitpos);
+static short t1_getnmsedec_ref(int x, int bitpos);
+static void t1_updateflags(flag_t *flagsp, int s, int stride);
+/**
+Encode significant pass
+*/
+static void t1_enc_sigpass_step(
+		opj_t1_t *t1,
+		flag_t *flagsp,
+		int *datap,
+		int orient,
+		int bpno,
+		int one,
+		int *nmsedec,
+		char type,
+		int vsc);
+/**
+Decode significant pass
+*/
+static void t1_dec_sigpass_step(
+		opj_t1_t *t1,
+		flag_t *flagsp,
+		int *datap,
+		int orient,
+		int oneplushalf,
+		char type,
+		int vsc);
+/**
+Encode significant pass
+*/
+static void t1_enc_sigpass(
+		opj_t1_t *t1,
+		int bpno,
+		int orient,
+		int *nmsedec,
+		char type,
+		int cblksty);
+/**
+Decode significant pass
+*/
+static void t1_dec_sigpass(
+		opj_t1_t *t1,
+		int bpno,
+		int orient,
+		char type,
+		int cblksty);
+/**
+Encode refinement pass
+*/
+static void t1_enc_refpass_step(
+		opj_t1_t *t1,
+		flag_t *flagsp,
+		int *datap,
+		int bpno,
+		int one,
+		int *nmsedec,
+		char type,
+		int vsc);
+/**
+Decode refinement pass
+*/
+static void t1_dec_refpass_step(
+		opj_t1_t *t1,
+		flag_t *flagsp,
+		int *datap,
+		int poshalf,
+		int neghalf,
+		char type,
+		int vsc);
+/**
+Encode refinement pass
+*/
+static void t1_enc_refpass(
+		opj_t1_t *t1,
+		int bpno,
+		int *nmsedec,
+		char type,
+		int cblksty);
+/**
+Decode refinement pass
+*/
+static void t1_dec_refpass(
+		opj_t1_t *t1,
+		int bpno,
+		char type,
+		int cblksty);
+/**
+Encode clean-up pass
+*/
+static void t1_enc_clnpass_step(
+		opj_t1_t *t1,
+		flag_t *flagsp,
+		int *datap,
+		int orient,
+		int bpno,
+		int one,
+		int *nmsedec,
+		int partial,
+		int vsc);
+/**
+Decode clean-up pass
+*/
+static void t1_dec_clnpass_step(
+		opj_t1_t *t1,
+		flag_t *flagsp,
+		int *datap,
+		int orient,
+		int oneplushalf,
+		int partial,
+		int vsc);
+/**
+Encode clean-up pass
+*/
+static void t1_enc_clnpass(
+		opj_t1_t *t1,
+		int bpno,
+		int orient,
+		int *nmsedec,
+		int cblksty);
+/**
+Decode clean-up pass
+*/
+static void t1_dec_clnpass(
+		opj_t1_t *t1,
+		int bpno,
+		int orient,
+		int cblksty);
+static double t1_getwmsedec(
+		int nmsedec,
+		int compno,
+		int level,
+		int orient,
+		int bpno,
+		int qmfbid,
+		double stepsize,
+		int numcomps);
+/**
+Encode 1 code-block
+@param t1 T1 handle
+@param cblk Code-block coding parameters
+@param orient
+@param compno Component number
+@param level
+@param qmfbid
+@param stepsize
+@param cblksty Code-block style
+@param numcomps
+@param tile
+*/
+static void t1_encode_cblk(
+		opj_t1_t *t1,
+		opj_tcd_cblk_enc_t* cblk,
+		int orient,
+		int compno,
+		int level,
+		int qmfbid,
+		double stepsize,
+		int cblksty,
+		int numcomps,
+		opj_tcd_tile_t * tile);
+/**
+Decode 1 code-block
+@param t1 T1 handle
+@param cblk Code-block coding parameters
+@param orient
+@param roishift Region of interest shifting value
+@param cblksty Code-block style
+*/
+static void t1_decode_cblk(
+		opj_t1_t *t1,
+		opj_tcd_cblk_dec_t* cblk,
+		int orient,
+		int roishift,
+		int cblksty);
+
+/*@}*/
+
+/*@}*/
+
+/* ----------------------------------------------------------------------- */
+
+static char t1_getctxno_zc(int f, int orient) {
+	return lut_ctxno_zc[(orient << 8) | (f & T1_SIG_OTH)];
+}
+
+static char t1_getctxno_sc(int f) {
+	return lut_ctxno_sc[(f & (T1_SIG_PRIM | T1_SGN)) >> 4];
+}
+
+static int t1_getctxno_mag(int f) {
+	int tmp1 = (f & T1_SIG_OTH) ? T1_CTXNO_MAG + 1 : T1_CTXNO_MAG;
+	int tmp2 = (f & T1_REFINE) ? T1_CTXNO_MAG + 2 : tmp1;
+	return (tmp2);
+}
+
+static char t1_getspb(int f) {
+	return lut_spb[(f & (T1_SIG_PRIM | T1_SGN)) >> 4];
+}
+
+static short t1_getnmsedec_sig(int x, int bitpos) {
+	if (bitpos > T1_NMSEDEC_FRACBITS) {
+		return lut_nmsedec_sig[(x >> (bitpos - T1_NMSEDEC_FRACBITS)) & ((1 << T1_NMSEDEC_BITS) - 1)];
+	}
+	
+	return lut_nmsedec_sig0[x & ((1 << T1_NMSEDEC_BITS) - 1)];
+}
+
+static short t1_getnmsedec_ref(int x, int bitpos) {
+	if (bitpos > T1_NMSEDEC_FRACBITS) {
+		return lut_nmsedec_ref[(x >> (bitpos - T1_NMSEDEC_FRACBITS)) & ((1 << T1_NMSEDEC_BITS) - 1)];
+	}
+
+    return lut_nmsedec_ref0[x & ((1 << T1_NMSEDEC_BITS) - 1)];
+}
+
+static void t1_updateflags(flag_t *flagsp, int s, int stride) {
+	flag_t *np = flagsp - stride;
+	flag_t *sp = flagsp + stride;
+
+	static const flag_t mod[] = {
+		T1_SIG_S, T1_SIG_S|T1_SGN_S,
+		T1_SIG_E, T1_SIG_E|T1_SGN_E,
+		T1_SIG_W, T1_SIG_W|T1_SGN_W,
+		T1_SIG_N, T1_SIG_N|T1_SGN_N
+	};
+
+	np[-1] |= T1_SIG_SE;
+	np[0]  |= mod[s];
+	np[1]  |= T1_SIG_SW;
+
+	flagsp[-1] |= mod[s+2];
+	flagsp[0]  |= T1_SIG;
+	flagsp[1]  |= mod[s+4];
+
+	sp[-1] |= T1_SIG_NE;
+	sp[0]  |= mod[s+6];
+	sp[1]  |= T1_SIG_NW;
+}
+
+static void t1_enc_sigpass_step(
+		opj_t1_t *t1,
+		flag_t *flagsp,
+		int *datap,
+		int orient,
+		int bpno,
+		int one,
+		int *nmsedec,
+		char type,
+		int vsc)
+{
+	int v, flag;
+	
+	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
+	
+	flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp);
+	if ((flag & T1_SIG_OTH) && !(flag & (T1_SIG | T1_VISIT))) {
+		v = int_abs(*datap) & one ? 1 : 0;
+		mqc_setcurctx(mqc, t1_getctxno_zc(flag, orient));	/* ESSAI */
+		if (type == T1_TYPE_RAW) {	/* BYPASS/LAZY MODE */
+			mqc_bypass_enc(mqc, v);
+		} else {
+			mqc_encode(mqc, v);
+		}
+		if (v) {
+			v = *datap < 0 ? 1 : 0;
+			*nmsedec +=	t1_getnmsedec_sig(int_abs(*datap), bpno + T1_NMSEDEC_FRACBITS);
+			mqc_setcurctx(mqc, t1_getctxno_sc(flag));	/* ESSAI */
+			if (type == T1_TYPE_RAW) {	/* BYPASS/LAZY MODE */
+				mqc_bypass_enc(mqc, v);
+			} else {
+				mqc_encode(mqc, v ^ t1_getspb(flag));
+			}
+			t1_updateflags(flagsp, v, t1->flags_stride);
+		}
+		*flagsp |= T1_VISIT;
+	}
+}
+
+static void t1_dec_sigpass_step(
+		opj_t1_t *t1,
+		flag_t *flagsp,
+		int *datap,
+		int orient,
+		int oneplushalf,
+		char type,
+		int vsc)
+{
+	int v, flag;
+	
+	opj_raw_t *raw = t1->raw;	/* RAW component */
+	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
+	
+	flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp);
+	if ((flag & T1_SIG_OTH) && !(flag & (T1_SIG | T1_VISIT))) {
+		if (type == T1_TYPE_RAW) {
+			if (raw_decode(raw)) {
+				v = raw_decode(raw);	/* ESSAI */
+				*datap = v ? -oneplushalf : oneplushalf;
+				t1_updateflags(flagsp, v, t1->flags_stride);
+			}
+		} else {
+			mqc_setcurctx(mqc, t1_getctxno_zc(flag, orient));
+			if (mqc_decode(mqc)) {
+				mqc_setcurctx(mqc, t1_getctxno_sc(flag));
+				v = mqc_decode(mqc) ^ t1_getspb(flag);
+				*datap = v ? -oneplushalf : oneplushalf;
+				t1_updateflags(flagsp, v, t1->flags_stride);
+			}
+		}
+		*flagsp |= T1_VISIT;
+	}
+}				/* VSC and  BYPASS by Antonin */
+
+static void t1_enc_sigpass(
+		opj_t1_t *t1,
+		int bpno,
+		int orient,
+		int *nmsedec,
+		char type,
+		int cblksty)
+{
+	int i, j, k, one, vsc;
+	*nmsedec = 0;
+	one = 1 << (bpno + T1_NMSEDEC_FRACBITS);
+	for (k = 0; k < t1->h; k += 4) {
+		for (i = 0; i < t1->w; ++i) {
+			for (j = k; j < k + 4 && j < t1->h; ++j) {
+				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
+				t1_enc_sigpass_step(
+						t1,
+						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
+						&t1->data[(j * t1->w) + i],
+						orient,
+						bpno,
+						one,
+						nmsedec,
+						type,
+						vsc);
+			}
+		}
+	}
+}
+
+static void t1_dec_sigpass(
+		opj_t1_t *t1,
+		int bpno,
+		int orient,
+		char type,
+		int cblksty)
+{
+	int i, j, k, one, half, oneplushalf, vsc;
+	one = 1 << bpno;
+	half = one >> 1;
+	oneplushalf = one | half;
+	for (k = 0; k < t1->h; k += 4) {
+		for (i = 0; i < t1->w; ++i) {
+			for (j = k; j < k + 4 && j < t1->h; ++j) {
+				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
+				t1_dec_sigpass_step(
+						t1,
+						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
+						&t1->data[(j * t1->w) + i],
+						orient,
+						oneplushalf,
+						type,
+						vsc);
+			}
+		}
+	}
+}				/* VSC and  BYPASS by Antonin */
+
+static void t1_enc_refpass_step(
+		opj_t1_t *t1,
+		flag_t *flagsp,
+		int *datap,
+		int bpno,
+		int one,
+		int *nmsedec,
+		char type,
+		int vsc)
+{
+	int v, flag;
+	
+	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
+	
+	flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp);
+	if ((flag & (T1_SIG | T1_VISIT)) == T1_SIG) {
+		*nmsedec += t1_getnmsedec_ref(int_abs(*datap), bpno + T1_NMSEDEC_FRACBITS);
+		v = int_abs(*datap) & one ? 1 : 0;
+		mqc_setcurctx(mqc, t1_getctxno_mag(flag));	/* ESSAI */
+		if (type == T1_TYPE_RAW) {	/* BYPASS/LAZY MODE */
+			mqc_bypass_enc(mqc, v);
+		} else {
+			mqc_encode(mqc, v);
+		}
+		*flagsp |= T1_REFINE;
+	}
+}
+
+static void t1_dec_refpass_step(
+		opj_t1_t *t1,
+		flag_t *flagsp,
+		int *datap,
+		int poshalf,
+		int neghalf,
+		char type,
+		int vsc)
+{
+	int v, t, flag;
+	
+	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
+	opj_raw_t *raw = t1->raw;	/* RAW component */
+	
+	flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp);
+	if ((flag & (T1_SIG | T1_VISIT)) == T1_SIG) {
+		mqc_setcurctx(mqc, t1_getctxno_mag(flag));	/* ESSAI */
+		if (type == T1_TYPE_RAW) {
+			v = raw_decode(raw);
+		} else {
+			v = mqc_decode(mqc);
+		}
+		t = v ? poshalf : neghalf;
+		*datap += *datap < 0 ? -t : t;
+		*flagsp |= T1_REFINE;
+	}
+}				/* VSC and  BYPASS by Antonin  */
+
+static void t1_enc_refpass(
+		opj_t1_t *t1,
+		int bpno,
+		int *nmsedec,
+		char type,
+		int cblksty)
+{
+	int i, j, k, one, vsc;
+	*nmsedec = 0;
+	one = 1 << (bpno + T1_NMSEDEC_FRACBITS);
+	for (k = 0; k < t1->h; k += 4) {
+		for (i = 0; i < t1->w; ++i) {
+			for (j = k; j < k + 4 && j < t1->h; ++j) {
+				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
+				t1_enc_refpass_step(
+						t1,
+						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
+						&t1->data[(j * t1->w) + i],
+						bpno,
+						one,
+						nmsedec,
+						type,
+						vsc);
+			}
+		}
+	}
+}
+
+static void t1_dec_refpass(
+		opj_t1_t *t1,
+		int bpno,
+		char type,
+		int cblksty)
+{
+	int i, j, k, one, poshalf, neghalf;
+	int vsc;
+	one = 1 << bpno;
+	poshalf = one >> 1;
+	neghalf = bpno > 0 ? -poshalf : -1;
+	for (k = 0; k < t1->h; k += 4) {
+		for (i = 0; i < t1->w; ++i) {
+			for (j = k; j < k + 4 && j < t1->h; ++j) {
+				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
+				t1_dec_refpass_step(
+						t1,
+						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
+						&t1->data[(j * t1->w) + i],
+						poshalf,
+						neghalf,
+						type,
+						vsc);
+			}
+		}
+	}
+}				/* VSC and  BYPASS by Antonin */
+
+static void t1_enc_clnpass_step(
+		opj_t1_t *t1,
+		flag_t *flagsp,
+		int *datap,
+		int orient,
+		int bpno,
+		int one,
+		int *nmsedec,
+		int partial,
+		int vsc)
+{
+	int v, flag;
+	
+	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
+	
+	flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp);
+	if (partial) {
+		goto LABEL_PARTIAL;
+	}
+	if (!(*flagsp & (T1_SIG | T1_VISIT))) {
+		mqc_setcurctx(mqc, t1_getctxno_zc(flag, orient));
+		v = int_abs(*datap) & one ? 1 : 0;
+		mqc_encode(mqc, v);
+		if (v) {
+LABEL_PARTIAL:
+			*nmsedec += t1_getnmsedec_sig(int_abs(*datap), bpno + T1_NMSEDEC_FRACBITS);
+			mqc_setcurctx(mqc, t1_getctxno_sc(flag));
+			v = *datap < 0 ? 1 : 0;
+			mqc_encode(mqc, v ^ t1_getspb(flag));
+			t1_updateflags(flagsp, v, t1->flags_stride);
+		}
+	}
+	*flagsp &= ~T1_VISIT;
+}
+
+static void t1_dec_clnpass_step(
+		opj_t1_t *t1,
+		flag_t *flagsp,
+		int *datap,
+		int orient,
+		int oneplushalf,
+		int partial,
+		int vsc)
+{
+	int v, flag;
+	
+	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
+	
+	flag = vsc ? ((*flagsp) & (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW | T1_SGN_S))) : (*flagsp);
+	if (partial) {
+		goto LABEL_PARTIAL;
+	}
+	if (!(flag & (T1_SIG | T1_VISIT))) {
+		mqc_setcurctx(mqc, t1_getctxno_zc(flag, orient));
+		if (mqc_decode(mqc)) {
+LABEL_PARTIAL:
+			mqc_setcurctx(mqc, t1_getctxno_sc(flag));
+			v = mqc_decode(mqc) ^ t1_getspb(flag);
+			*datap = v ? -oneplushalf : oneplushalf;
+			t1_updateflags(flagsp, v, t1->flags_stride);
+		}
+	}
+	*flagsp &= ~T1_VISIT;
+}				/* VSC and  BYPASS by Antonin */
+
+static void t1_enc_clnpass(
+		opj_t1_t *t1,
+		int bpno,
+		int orient,
+		int *nmsedec,
+		int cblksty)
+{
+	int i, j, k, one, agg, runlen, vsc;
+	
+	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
+	
+	*nmsedec = 0;
+	one = 1 << (bpno + T1_NMSEDEC_FRACBITS);
+	for (k = 0; k < t1->h; k += 4) {
+		for (i = 0; i < t1->w; ++i) {
+			if (k + 3 < t1->h) {
+				if (cblksty & J2K_CCP_CBLKSTY_VSC) {
+					agg = !(MACRO_t1_flags(1 + k,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+						|| MACRO_t1_flags(1 + k + 1,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+						|| MACRO_t1_flags(1 + k + 2,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+						|| (MACRO_t1_flags(1 + k + 3,1 + i) 
+						& (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW |	T1_SGN_S))) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
+				} else {
+					agg = !(MACRO_t1_flags(1 + k,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+						|| MACRO_t1_flags(1 + k + 1,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+						|| MACRO_t1_flags(1 + k + 2,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+						|| MACRO_t1_flags(1 + k + 3,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
+				}
+			} else {
+				agg = 0;
+			}
+			if (agg) {
+				for (runlen = 0; runlen < 4; ++runlen) {
+					if (int_abs(t1->data[((k + runlen)*t1->w) + i]) & one)
+						break;
+				}
+				mqc_setcurctx(mqc, T1_CTXNO_AGG);
+				mqc_encode(mqc, runlen != 4);
+				if (runlen == 4) {
+					continue;
+				}
+				mqc_setcurctx(mqc, T1_CTXNO_UNI);
+				mqc_encode(mqc, runlen >> 1);
+				mqc_encode(mqc, runlen & 1);
+			} else {
+				runlen = 0;
+			}
+			for (j = k + runlen; j < k + 4 && j < t1->h; ++j) {
+				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
+				t1_enc_clnpass_step(
+						t1,
+						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
+						&t1->data[(j * t1->w) + i],
+						orient,
+						bpno,
+						one,
+						nmsedec,
+						agg && (j == k + runlen),
+						vsc);
+			}
+		}
+	}
+}
+
+static void t1_dec_clnpass(
+		opj_t1_t *t1,
+		int bpno,
+		int orient,
+		int cblksty)
+{
+	int i, j, k, one, half, oneplushalf, agg, runlen, vsc;
+	int segsym = cblksty & J2K_CCP_CBLKSTY_SEGSYM;
+	
+	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
+	
+	one = 1 << bpno;
+	half = one >> 1;
+	oneplushalf = one | half;
+	for (k = 0; k < t1->h; k += 4) {
+		for (i = 0; i < t1->w; ++i) {
+			if (k + 3 < t1->h) {
+				if (cblksty & J2K_CCP_CBLKSTY_VSC) {
+					agg = !(MACRO_t1_flags(1 + k,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+						|| MACRO_t1_flags(1 + k + 1,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+						|| MACRO_t1_flags(1 + k + 2,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+						|| (MACRO_t1_flags(1 + k + 3,1 + i) 
+						& (~(T1_SIG_S | T1_SIG_SE | T1_SIG_SW |	T1_SGN_S))) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
+				} else {
+					agg = !(MACRO_t1_flags(1 + k,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+						|| MACRO_t1_flags(1 + k + 1,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+						|| MACRO_t1_flags(1 + k + 2,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH)
+						|| MACRO_t1_flags(1 + k + 3,1 + i) & (T1_SIG | T1_VISIT | T1_SIG_OTH));
+				}
+			} else {
+				agg = 0;
+			}
+			if (agg) {
+				mqc_setcurctx(mqc, T1_CTXNO_AGG);
+				if (!mqc_decode(mqc)) {
+					continue;
+				}
+				mqc_setcurctx(mqc, T1_CTXNO_UNI);
+				runlen = mqc_decode(mqc);
+				runlen = (runlen << 1) | mqc_decode(mqc);
+			} else {
+				runlen = 0;
+			}
+			for (j = k + runlen; j < k + 4 && j < t1->h; ++j) {
+				vsc = ((cblksty & J2K_CCP_CBLKSTY_VSC) && (j == k + 3 || j == t1->h - 1)) ? 1 : 0;
+				t1_dec_clnpass_step(
+						t1,
+						&t1->flags[((j+1) * t1->flags_stride) + i + 1],
+						&t1->data[(j * t1->w) + i],
+						orient,
+						oneplushalf,
+						agg && (j == k + runlen),
+						vsc);
+			}
+		}
+	}
+	if (segsym) {
+		int v = 0;
+		mqc_setcurctx(mqc, T1_CTXNO_UNI);
+		v = mqc_decode(mqc);
+		v = (v << 1) | mqc_decode(mqc);
+		v = (v << 1) | mqc_decode(mqc);
+		v = (v << 1) | mqc_decode(mqc);
+		/*
+		if (v!=0xa) {
+			opj_event_msg(t1->cinfo, EVT_WARNING, "Bad segmentation symbol %x\n", v);
+		} 
+		*/
+	}
+}				/* VSC and  BYPASS by Antonin */
+
+
+/** mod fixed_quality */
+static double t1_getwmsedec(
+		int nmsedec,
+		int compno,
+		int level,
+		int orient,
+		int bpno,
+		int qmfbid,
+		double stepsize,
+		int numcomps)
+{
+	double w1, w2, wmsedec;
+	if (qmfbid == 1) {
+		w1 = (numcomps > 1) ? mct_getnorm(compno) : 1.0;
+		w2 = dwt_getnorm(level, orient);
+	} else {			/* if (qmfbid == 0) */
+		w1 = (numcomps > 1) ? mct_getnorm_real(compno) : 1.0;
+		w2 = dwt_getnorm_real(level, orient);
+	}
+	wmsedec = w1 * w2 * stepsize * (1 << bpno);
+	wmsedec *= wmsedec * nmsedec / 8192.0;
+	
+	return wmsedec;
+}
+
+static bool allocate_buffers(
+		opj_t1_t *t1,
+		int w,
+		int h)
+{
+	int datasize=w * h;
+	int flagssize;
+
+	if(datasize > t1->datasize){
+		opj_aligned_free(t1->data);
+		t1->data = (int*) opj_aligned_malloc(datasize * sizeof(int));
+		if(!t1->data){
+			return false;
+		}
+		t1->datasize=datasize;
+	}
+	memset(t1->data,0,datasize * sizeof(int));
+
+	t1->flags_stride=w+2;
+	flagssize=t1->flags_stride * (h+2);
+
+	if(flagssize > t1->flagssize){
+		opj_aligned_free(t1->flags);
+		t1->flags = (flag_t*) opj_aligned_malloc(flagssize * sizeof(flag_t));
+		if(!t1->flags){
+			return false;
+		}
+		t1->flagssize=flagssize;
+	}
+	memset(t1->flags,0,flagssize * sizeof(flag_t));
+
+	t1->w=w;
+	t1->h=h;
+
+	return true;
+}
+
+/** mod fixed_quality */
+static void t1_encode_cblk(
+		opj_t1_t *t1,
+		opj_tcd_cblk_enc_t* cblk,
+		int orient,
+		int compno,
+		int level,
+		int qmfbid,
+		double stepsize,
+		int cblksty,
+		int numcomps,
+		opj_tcd_tile_t * tile)
+{
+	double cumwmsedec = 0.0;
+
+	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
+
+	int passno, bpno, passtype;
+	int nmsedec = 0;
+	int i, max;
+	char type = T1_TYPE_MQ;
+	double tempwmsedec;
+
+	max = 0;
+	for (i = 0; i < t1->w * t1->h; ++i) {
+		int tmp = abs(t1->data[i]);
+		max = int_max(max, tmp);
+	}
+
+	cblk->numbps = max ? (int_floorlog2(max) + 1) - T1_NMSEDEC_FRACBITS : 0;
+	
+	bpno = cblk->numbps - 1;
+	passtype = 2;
+	
+	mqc_resetstates(mqc);
+	mqc_setstate(mqc, T1_CTXNO_UNI, 0, 46);
+	mqc_setstate(mqc, T1_CTXNO_AGG, 0, 3);
+	mqc_setstate(mqc, T1_CTXNO_ZC, 0, 4);
+	mqc_init_enc(mqc, cblk->data);
+	
+	for (passno = 0; bpno >= 0; ++passno) {
+		opj_tcd_pass_t *pass = &cblk->passes[passno];
+		int correction = 3;
+		type = ((bpno < (cblk->numbps - 4)) && (passtype < 2) && (cblksty & J2K_CCP_CBLKSTY_LAZY)) ? T1_TYPE_RAW : T1_TYPE_MQ;
+		
+		switch (passtype) {
+			case 0:
+				t1_enc_sigpass(t1, bpno, orient, &nmsedec, type, cblksty);
+				break;
+			case 1:
+				t1_enc_refpass(t1, bpno, &nmsedec, type, cblksty);
+				break;
+			case 2:
+				t1_enc_clnpass(t1, bpno, orient, &nmsedec, cblksty);
+				/* code switch SEGMARK (i.e. SEGSYM) */
+				if (cblksty & J2K_CCP_CBLKSTY_SEGSYM)
+					mqc_segmark_enc(mqc);
+				break;
+		}
+		
+		/* fixed_quality */
+		tempwmsedec = t1_getwmsedec(nmsedec, compno, level, orient, bpno, qmfbid, stepsize, numcomps);
+		cumwmsedec += tempwmsedec;
+		tile->distotile += tempwmsedec;
+		
+		/* Code switch "RESTART" (i.e. TERMALL) */
+		if ((cblksty & J2K_CCP_CBLKSTY_TERMALL)	&& !((passtype == 2) && (bpno - 1 < 0))) {
+			if (type == T1_TYPE_RAW) {
+				mqc_flush(mqc);
+				correction = 1;
+				/* correction = mqc_bypass_flush_enc(); */
+			} else {			/* correction = mqc_restart_enc(); */
+				mqc_flush(mqc);
+				correction = 1;
+			}
+			pass->term = 1;
+		} else {
+			if (((bpno < (cblk->numbps - 4) && (passtype > 0)) 
+				|| ((bpno == (cblk->numbps - 4)) && (passtype == 2))) && (cblksty & J2K_CCP_CBLKSTY_LAZY)) {
+				if (type == T1_TYPE_RAW) {
+					mqc_flush(mqc);
+					correction = 1;
+					/* correction = mqc_bypass_flush_enc(); */
+				} else {		/* correction = mqc_restart_enc(); */
+					mqc_flush(mqc);
+					correction = 1;
+				}
+				pass->term = 1;
+			} else {
+				pass->term = 0;
+			}
+		}
+		
+		if (++passtype == 3) {
+			passtype = 0;
+			bpno--;
+		}
+		
+		if (pass->term && bpno > 0) {
+			type = ((bpno < (cblk->numbps - 4)) && (passtype < 2) && (cblksty & J2K_CCP_CBLKSTY_LAZY)) ? T1_TYPE_RAW : T1_TYPE_MQ;
+			if (type == T1_TYPE_RAW)
+				mqc_bypass_init_enc(mqc);
+			else
+				mqc_restart_init_enc(mqc);
+		}
+		
+		pass->distortiondec = cumwmsedec;
+		pass->rate = mqc_numbytes(mqc) + correction;	/* FIXME */
+		
+		/* Code-switch "RESET" */
+		if (cblksty & J2K_CCP_CBLKSTY_RESET)
+			mqc_reset_enc(mqc);
+	}
+	
+	/* Code switch "ERTERM" (i.e. PTERM) */
+	if (cblksty & J2K_CCP_CBLKSTY_PTERM)
+		mqc_erterm_enc(mqc);
+	else /* Default coding */ if (!(cblksty & J2K_CCP_CBLKSTY_LAZY))
+		mqc_flush(mqc);
+	
+	cblk->totalpasses = passno;
+
+	for (passno = 0; passno<cblk->totalpasses; passno++) {
+		opj_tcd_pass_t *pass = &cblk->passes[passno];
+		if (pass->rate > mqc_numbytes(mqc))
+			pass->rate = mqc_numbytes(mqc);
+		/*Preventing generation of FF as last data byte of a pass*/
+		if((pass->rate>1) && (cblk->data[pass->rate - 1] == 0xFF)){
+			pass->rate--;
+		}
+		pass->len = pass->rate - (passno == 0 ? 0 : cblk->passes[passno - 1].rate);		
+	}
+}
+
+static void t1_decode_cblk(
+		opj_t1_t *t1,
+		opj_tcd_cblk_dec_t* cblk,
+		int orient,
+		int roishift,
+		int cblksty)
+{
+	opj_raw_t *raw = t1->raw;	/* RAW component */
+	opj_mqc_t *mqc = t1->mqc;	/* MQC component */
+
+	int bpno, passtype;
+	int segno, passno;
+	char type = T1_TYPE_MQ; /* BYPASS mode */
+
+	if(!allocate_buffers(
+				t1,
+				cblk->x1 - cblk->x0,
+				cblk->y1 - cblk->y0))
+	{
+		return;
+	}
+
+	bpno = roishift + cblk->numbps - 1;
+	passtype = 2;
+	
+	mqc_resetstates(mqc);
+	mqc_setstate(mqc, T1_CTXNO_UNI, 0, 46);
+	mqc_setstate(mqc, T1_CTXNO_AGG, 0, 3);
+	mqc_setstate(mqc, T1_CTXNO_ZC, 0, 4);
+	
+	for (segno = 0; segno < cblk->numsegs; ++segno) {
+		opj_tcd_seg_t *seg = &cblk->segs[segno];
+		
+		/* BYPASS mode */
+		type = ((bpno <= (cblk->numbps - 1) - 4) && (passtype < 2) && (cblksty & J2K_CCP_CBLKSTY_LAZY)) ? T1_TYPE_RAW : T1_TYPE_MQ;
+		/* FIXME: slviewer gets here with a null pointer. Why? Partially downloaded and/or corrupt textures? */
+		if(seg->data == NULL){
+			continue;
+		}
+		if (type == T1_TYPE_RAW) {
+			raw_init_dec(raw, (*seg->data) + seg->dataindex, seg->len);
+		} else {
+			mqc_init_dec(mqc, (*seg->data) + seg->dataindex, seg->len);
+		}
+		
+		for (passno = 0; passno < seg->numpasses; ++passno) {
+			switch (passtype) {
+				case 0:
+					t1_dec_sigpass(t1, bpno+1, orient, type, cblksty);
+					break;
+				case 1:
+					t1_dec_refpass(t1, bpno+1, type, cblksty);
+					break;
+				case 2:
+					t1_dec_clnpass(t1, bpno+1, orient, cblksty);
+					break;
+			}
+			
+			if ((cblksty & J2K_CCP_CBLKSTY_RESET) && type == T1_TYPE_MQ) {
+				mqc_resetstates(mqc);
+				mqc_setstate(mqc, T1_CTXNO_UNI, 0, 46);				
+				mqc_setstate(mqc, T1_CTXNO_AGG, 0, 3);
+				mqc_setstate(mqc, T1_CTXNO_ZC, 0, 4);
+			}
+			if (++passtype == 3) {
+				passtype = 0;
+				bpno--;
+			}
+		}
+	}
+}
+
+/* ----------------------------------------------------------------------- */
+
+opj_t1_t* t1_create(opj_common_ptr cinfo) {
+	opj_t1_t *t1 = (opj_t1_t*) opj_malloc(sizeof(opj_t1_t));
+	if(!t1)
+		return NULL;
+
+	t1->cinfo = cinfo;
+	/* create MQC and RAW handles */
+	t1->mqc = mqc_create();
+	t1->raw = raw_create();
+
+	t1->data=NULL;
+	t1->flags=NULL;
+	t1->datasize=0;
+	t1->flagssize=0;
+
+	return t1;
+}
+
+void t1_destroy(opj_t1_t *t1) {
+	if(t1) {
+		/* destroy MQC and RAW handles */
+		mqc_destroy(t1->mqc);
+		raw_destroy(t1->raw);
+		opj_aligned_free(t1->data);
+		opj_aligned_free(t1->flags);
+		opj_free(t1);
+	}
+}
+
+void t1_encode_cblks(
+		opj_t1_t *t1,
+		opj_tcd_tile_t *tile,
+		opj_tcp_t *tcp)
+{
+	int compno, resno, bandno, precno, cblkno;
+
+	tile->distotile = 0;		/* fixed_quality */
+
+	for (compno = 0; compno < tile->numcomps; ++compno) {
+		opj_tcd_tilecomp_t* tilec = &tile->comps[compno];
+		opj_tccp_t* tccp = &tcp->tccps[compno];
+		int tile_w = tilec->x1 - tilec->x0;
+
+		for (resno = 0; resno < tilec->numresolutions; ++resno) {
+			opj_tcd_resolution_t *res = &tilec->resolutions[resno];
+
+			for (bandno = 0; bandno < res->numbands; ++bandno) {
+				opj_tcd_band_t* restrict band = &res->bands[bandno];
+
+				for (precno = 0; precno < res->pw * res->ph; ++precno) {
+					opj_tcd_precinct_t *prc = &band->precincts[precno];
+
+					for (cblkno = 0; cblkno < prc->cw * prc->ch; ++cblkno) {
+						opj_tcd_cblk_enc_t* cblk = &prc->cblks.enc[cblkno];
+						int* restrict datap;
+						int* restrict tiledp;
+						int cblk_w;
+						int cblk_h;
+						int i, j;
+
+						int x = cblk->x0 - band->x0;
+						int y = cblk->y0 - band->y0;
+						if (band->bandno & 1) {
+							opj_tcd_resolution_t *pres = &tilec->resolutions[resno - 1];
+							x += pres->x1 - pres->x0;
+						}
+						if (band->bandno & 2) {
+							opj_tcd_resolution_t *pres = &tilec->resolutions[resno - 1];
+							y += pres->y1 - pres->y0;
+						}
+
+						if(!allocate_buffers(
+									t1,
+									cblk->x1 - cblk->x0,
+									cblk->y1 - cblk->y0))
+						{
+							return;
+						}
+
+						datap=t1->data;
+						cblk_w = t1->w;
+						cblk_h = t1->h;
+
+						tiledp=&tilec->data[(y * tile_w) + x];
+						if (tccp->qmfbid == 1) {
+							for (j = 0; j < cblk_h; ++j) {
+								for (i = 0; i < cblk_w; ++i) {
+									int tmp = tiledp[(j * tile_w) + i];
+									datap[(j * cblk_w) + i] = tmp << T1_NMSEDEC_FRACBITS;
+								}
+							}
+						} else {		/* if (tccp->qmfbid == 0) */
+							for (j = 0; j < cblk_h; ++j) {
+								for (i = 0; i < cblk_w; ++i) {
+									int tmp = tiledp[(j * tile_w) + i];
+									datap[(j * cblk_w) + i] =
+										fix_mul(
+										tmp,
+										8192 * 8192 / ((int) floor(band->stepsize * 8192))) >> (11 - T1_NMSEDEC_FRACBITS);
+								}
+							}
+						}
+
+						t1_encode_cblk(
+								t1,
+								cblk,
+								band->bandno,
+								compno,
+								tilec->numresolutions - 1 - resno,
+								tccp->qmfbid,
+								band->stepsize,
+								tccp->cblksty,
+								tile->numcomps,
+								tile);
+
+					} /* cblkno */
+				} /* precno */
+			} /* bandno */
+		} /* resno  */
+	} /* compno  */
+}
+
+void t1_decode_cblks(
+		opj_t1_t* t1,
+		opj_tcd_tilecomp_t* tilec,
+		opj_tccp_t* tccp)
+{
+	int resno, bandno, precno, cblkno;
+
+	int tile_w = tilec->x1 - tilec->x0;
+
+	for (resno = 0; resno < tilec->numresolutions; ++resno) {
+		opj_tcd_resolution_t* res = &tilec->resolutions[resno];
+
+		for (bandno = 0; bandno < res->numbands; ++bandno) {
+			opj_tcd_band_t* restrict band = &res->bands[bandno];
+
+			for (precno = 0; precno < res->pw * res->ph; ++precno) {
+				opj_tcd_precinct_t* precinct = &band->precincts[precno];
+
+				for (cblkno = 0; cblkno < precinct->cw * precinct->ch; ++cblkno) {
+					opj_tcd_cblk_dec_t* cblk = &precinct->cblks.dec[cblkno];
+					int* restrict datap;
+					void* restrict tiledp;
+					int cblk_w, cblk_h;
+					int x, y;
+					int i, j;
+
+					t1_decode_cblk(
+							t1,
+							cblk,
+							band->bandno,
+							tccp->roishift,
+							tccp->cblksty);
+
+					x = cblk->x0 - band->x0;
+					y = cblk->y0 - band->y0;
+					if (band->bandno & 1) {
+						opj_tcd_resolution_t* pres = &tilec->resolutions[resno - 1];
+						x += pres->x1 - pres->x0;
+					}
+					if (band->bandno & 2) {
+						opj_tcd_resolution_t* pres = &tilec->resolutions[resno - 1];
+						y += pres->y1 - pres->y0;
+					}
+
+					datap=t1->data;
+					cblk_w = t1->w;
+					cblk_h = t1->h;
+
+					if (tccp->roishift) {
+						int thresh = 1 << tccp->roishift;
+						for (j = 0; j < cblk_h; ++j) {
+							for (i = 0; i < cblk_w; ++i) {
+								int val = datap[(j * cblk_w) + i];
+								int mag = abs(val);
+								if (mag >= thresh) {
+									mag >>= tccp->roishift;
+									datap[(j * cblk_w) + i] = val < 0 ? -mag : mag;
+								}
+							}
+						}
+					}
+
+					tiledp=(void*)&tilec->data[(y * tile_w) + x];
+					if (tccp->qmfbid == 1) {
+						for (j = 0; j < cblk_h; ++j) {
+							for (i = 0; i < cblk_w; ++i) {
+								int tmp = datap[(j * cblk_w) + i];
+								((int*)tiledp)[(j * tile_w) + i] = tmp / 2;
+							}
+						}
+					} else {		/* if (tccp->qmfbid == 0) */
+						for (j = 0; j < cblk_h; ++j) {
+							for (i = 0; i < cblk_w; ++i) {
+								float tmp = datap[(j * cblk_w) + i] * band->stepsize;
+								((float*)tiledp)[(j * tile_w) + i] = tmp;
+							}
+						}
+					}
+					opj_free(cblk->data);
+					opj_free(cblk->segs);
+				} /* cblkno */
+				opj_free(precinct->cblks.dec);
+			} /* precno */
+		} /* bandno */
+	} /* resno */
+}
+
diff --git a/extern/libopenjpeg/t1.h b/extern/libopenjpeg/t1.h
new file mode 100644
index 00000000000..0b4294e1d6b
--- /dev/null
+++ b/extern/libopenjpeg/t1.h
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2007, Professor Benoit Macq
+ * Copyright (c) 2001-2003, David Janssens
+ * Copyright (c) 2002-2003, Yannick Verschueren
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef __T1_H
+#define __T1_H
+/**
+@file t1.h
+@brief Implementation of the tier-1 coding (coding of code-block coefficients) (T1)
+
+The functions in T1.C have for goal to realize the tier-1 coding operation. The functions
+in T1.C are used by some function in TCD.C.
+*/
+
+/** @defgroup T1 T1 - Implementation of the tier-1 coding */
+/*@{*/
+
+/* ----------------------------------------------------------------------- */
+#define T1_NMSEDEC_BITS 7
+
+#define T1_SIG_NE 0x0001	/**< Context orientation : North-East direction */
+#define T1_SIG_SE 0x0002	/**< Context orientation : South-East direction */
+#define T1_SIG_SW 0x0004	/**< Context orientation : South-West direction */
+#define T1_SIG_NW 0x0008	/**< Context orientation : North-West direction */
+#define T1_SIG_N 0x0010		/**< Context orientation : North direction */
+#define T1_SIG_E 0x0020		/**< Context orientation : East direction */
+#define T1_SIG_S 0x0040		/**< Context orientation : South direction */
+#define T1_SIG_W 0x0080		/**< Context orientation : West direction */
+#define T1_SIG_OTH (T1_SIG_N|T1_SIG_NE|T1_SIG_E|T1_SIG_SE|T1_SIG_S|T1_SIG_SW|T1_SIG_W|T1_SIG_NW)
+#define T1_SIG_PRIM (T1_SIG_N|T1_SIG_E|T1_SIG_S|T1_SIG_W)
+
+#define T1_SGN_N 0x0100
+#define T1_SGN_E 0x0200
+#define T1_SGN_S 0x0400
+#define T1_SGN_W 0x0800
+#define T1_SGN (T1_SGN_N|T1_SGN_E|T1_SGN_S|T1_SGN_W)
+
+#define T1_SIG 0x1000
+#define T1_REFINE 0x2000
+#define T1_VISIT 0x4000
+
+#define T1_NUMCTXS_ZC 9
+#define T1_NUMCTXS_SC 5
+#define T1_NUMCTXS_MAG 3
+#define T1_NUMCTXS_AGG 1
+#define T1_NUMCTXS_UNI 1
+
+#define T1_CTXNO_ZC 0
+#define T1_CTXNO_SC (T1_CTXNO_ZC+T1_NUMCTXS_ZC)
+#define T1_CTXNO_MAG (T1_CTXNO_SC+T1_NUMCTXS_SC)
+#define T1_CTXNO_AGG (T1_CTXNO_MAG+T1_NUMCTXS_MAG)
+#define T1_CTXNO_UNI (T1_CTXNO_AGG+T1_NUMCTXS_AGG)
+#define T1_NUMCTXS (T1_CTXNO_UNI+T1_NUMCTXS_UNI)
+
+#define T1_NMSEDEC_FRACBITS (T1_NMSEDEC_BITS-1)
+
+#define T1_TYPE_MQ 0	/**< Normal coding using entropy coder */
+#define T1_TYPE_RAW 1	/**< No encoding the information is store under raw format in codestream (mode switch RAW)*/
+
+/* ----------------------------------------------------------------------- */
+
+typedef short flag_t;
+
+/**
+Tier-1 coding (coding of code-block coefficients)
+*/
+typedef struct opj_t1 {
+	/** codec context */
+	opj_common_ptr cinfo;
+
+	/** MQC component */
+	opj_mqc_t *mqc;
+	/** RAW component */
+	opj_raw_t *raw;
+
+	int *data;
+	flag_t *flags;
+	int w;
+	int h;
+	int datasize;
+	int flagssize;
+	int flags_stride;
+} opj_t1_t;
+
+#define MACRO_t1_flags(x,y) t1->flags[((x)*(t1->flags_stride))+(y)]
+
+/** @name Exported functions */
+/*@{*/
+/* ----------------------------------------------------------------------- */
+/**
+Create a new T1 handle 
+and initialize the look-up tables of the Tier-1 coder/decoder
+@return Returns a new T1 handle if successful, returns NULL otherwise
+@see t1_init_luts
+*/
+opj_t1_t* t1_create(opj_common_ptr cinfo);
+/**
+Destroy a previously created T1 handle
+@param t1 T1 handle to destroy
+*/
+void t1_destroy(opj_t1_t *t1);
+/**
+Encode the code-blocks of a tile
+@param t1 T1 handle
+@param tile The tile to encode
+@param tcp Tile coding parameters
+*/
+void t1_encode_cblks(opj_t1_t *t1, opj_tcd_tile_t *tile, opj_tcp_t *tcp);
+/**
+Decode the code-blocks of a tile
+@param t1 T1 handle
+@param tile The tile to decode
+@param tcp Tile coding parameters
+*/
+void t1_decode_cblks(opj_t1_t* t1, opj_tcd_tilecomp_t* tilec, opj_tccp_t* tccp);
+/* ----------------------------------------------------------------------- */
+/*@}*/
+
+/*@}*/
+
+#endif /* __T1_H */
diff --git a/extern/libopenjpeg/t1_generate_luts.c b/extern/libopenjpeg/t1_generate_luts.c
new file mode 100644
index 00000000000..1925b951f1b
--- /dev/null
+++ b/extern/libopenjpeg/t1_generate_luts.c
@@ -0,0 +1,275 @@
+/*
+ * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2007, Professor Benoit Macq
+ * Copyright (c) 2001-2003, David Janssens
+ * Copyright (c) 2002-2003, Yannick Verschueren
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * Copyright (c) 2007, Callum Lerwick <seg@haxxed.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "opj_includes.h"
+#include <math.h>
+
+static int t1_init_ctxno_zc(int f, int orient) {
+	int h, v, d, n, t, hv;
+	n = 0;
+	h = ((f & T1_SIG_W) != 0) + ((f & T1_SIG_E) != 0);
+	v = ((f & T1_SIG_N) != 0) + ((f & T1_SIG_S) != 0);
+	d = ((f & T1_SIG_NW) != 0) + ((f & T1_SIG_NE) != 0) + ((f & T1_SIG_SE) != 0) + ((f & T1_SIG_SW) != 0);
+
+	switch (orient) {
+		case 2:
+			t = h;
+			h = v;
+			v = t;
+		case 0:
+		case 1:
+			if (!h) {
+				if (!v) {
+					if (!d)
+						n = 0;
+					else if (d == 1)
+						n = 1;
+					else
+						n = 2;
+				} else if (v == 1) {
+					n = 3;
+				} else {
+					n = 4;
+				}
+			} else if (h == 1) {
+				if (!v) {
+					if (!d)
+						n = 5;
+					else
+						n = 6;
+				} else {
+					n = 7;
+				}
+			} else
+				n = 8;
+			break;
+		case 3:
+			hv = h + v;
+			if (!d) {
+				if (!hv) {
+					n = 0;
+				} else if (hv == 1) {
+					n = 1;
+				} else {
+					n = 2;
+				}
+			} else if (d == 1) {
+				if (!hv) {
+					n = 3;
+				} else if (hv == 1) {
+					n = 4;
+				} else {
+					n = 5;
+				}
+			} else if (d == 2) {
+				if (!hv) {
+					n = 6;
+				} else {
+					n = 7;
+				}
+			} else {
+				n = 8;
+			}
+			break;
+	}
+
+	return (T1_CTXNO_ZC + n);
+}
+
+static int t1_init_ctxno_sc(int f) {
+	int hc, vc, n;
+	n = 0;
+
+	hc = int_min(((f & (T1_SIG_E | T1_SGN_E)) ==
+				T1_SIG_E) + ((f & (T1_SIG_W | T1_SGN_W)) == T1_SIG_W),
+			1) - int_min(((f & (T1_SIG_E | T1_SGN_E)) ==
+					(T1_SIG_E | T1_SGN_E)) +
+				((f & (T1_SIG_W | T1_SGN_W)) ==
+				 (T1_SIG_W | T1_SGN_W)), 1);
+
+	vc = int_min(((f & (T1_SIG_N | T1_SGN_N)) ==
+				T1_SIG_N) + ((f & (T1_SIG_S | T1_SGN_S)) == T1_SIG_S),
+			1) - int_min(((f & (T1_SIG_N | T1_SGN_N)) ==
+					(T1_SIG_N | T1_SGN_N)) +
+				((f & (T1_SIG_S | T1_SGN_S)) ==
+				 (T1_SIG_S | T1_SGN_S)), 1);
+
+	if (hc < 0) {
+		hc = -hc;
+		vc = -vc;
+	}
+	if (!hc) {
+		if (vc == -1)
+			n = 1;
+		else if (!vc)
+			n = 0;
+		else
+			n = 1;
+	} else if (hc == 1) {
+		if (vc == -1)
+			n = 2;
+		else if (!vc)
+			n = 3;
+		else
+			n = 4;
+	}
+
+	return (T1_CTXNO_SC + n);
+}
+
+static int t1_init_spb(int f) {
+	int hc, vc, n;
+
+	hc = int_min(((f & (T1_SIG_E | T1_SGN_E)) ==
+				T1_SIG_E) + ((f & (T1_SIG_W | T1_SGN_W)) == T1_SIG_W),
+			1) - int_min(((f & (T1_SIG_E | T1_SGN_E)) ==
+					(T1_SIG_E | T1_SGN_E)) +
+				((f & (T1_SIG_W | T1_SGN_W)) ==
+				 (T1_SIG_W | T1_SGN_W)), 1);
+
+	vc = int_min(((f & (T1_SIG_N | T1_SGN_N)) ==
+				T1_SIG_N) + ((f & (T1_SIG_S | T1_SGN_S)) == T1_SIG_S),
+			1) - int_min(((f & (T1_SIG_N | T1_SGN_N)) ==
+					(T1_SIG_N | T1_SGN_N)) +
+				((f & (T1_SIG_S | T1_SGN_S)) ==
+				 (T1_SIG_S | T1_SGN_S)), 1);
+
+	if (!hc && !vc)
+		n = 0;
+	else
+		n = (!(hc > 0 || (!hc && vc > 0)));
+
+	return n;
+}
+
+void dump_array16(int array[],int size){
+	int i;
+	--size;
+	for (i = 0; i < size; ++i) {
+		printf("0x%04x, ", array[i]);
+		if(!((i+1)&0x7))
+			printf("\n  ");
+	}
+	printf("0x%04x\n};\n\n", array[size]);
+}
+
+int main(){
+	int i, j;
+	double u, v, t;
+
+	int lut_ctxno_zc[1024];
+	int lut_nmsedec_sig[1 << T1_NMSEDEC_BITS];
+	int lut_nmsedec_sig0[1 << T1_NMSEDEC_BITS];
+	int lut_nmsedec_ref[1 << T1_NMSEDEC_BITS];
+	int lut_nmsedec_ref0[1 << T1_NMSEDEC_BITS];
+
+	printf("/* This file was automatically generated by t1_generate_luts.c */\n\n");
+
+	// lut_ctxno_zc
+	for (j = 0; j < 4; ++j) {
+		for (i = 0; i < 256; ++i) {
+			int orient = j;
+			if (orient == 2) {
+				orient = 1;
+			} else if (orient == 1) {
+				orient = 2;
+			}
+			lut_ctxno_zc[(orient << 8) | i] = t1_init_ctxno_zc(i, j);
+		}
+	}
+
+	printf("static char lut_ctxno_zc[1024] = {\n  ");
+	for (i = 0; i < 1023; ++i) {
+		printf("%i, ", lut_ctxno_zc[i]);
+		if(!((i+1)&0x1f))
+			printf("\n  ");
+	}
+	printf("%i\n};\n\n", lut_ctxno_zc[1023]);
+
+	// lut_ctxno_sc
+	printf("static char lut_ctxno_sc[256] = {\n  ");
+	for (i = 0; i < 255; ++i) {
+		printf("0x%x, ", t1_init_ctxno_sc(i << 4));
+		if(!((i+1)&0xf))
+			printf("\n  ");
+	}
+	printf("0x%x\n};\n\n", t1_init_ctxno_sc(255 << 4));
+
+	// lut_spb
+	printf("static char lut_spb[256] = {\n  ");
+	for (i = 0; i < 255; ++i) {
+		printf("%i, ", t1_init_spb(i << 4));
+		if(!((i+1)&0x1f))
+			printf("\n  ");
+	}
+	printf("%i\n};\n\n", t1_init_spb(255 << 4));
+
+	/* FIXME FIXME FIXME */
+	/* fprintf(stdout,"nmsedec luts:\n"); */
+	for (i = 0; i < (1 << T1_NMSEDEC_BITS); ++i) {
+		t = i / pow(2, T1_NMSEDEC_FRACBITS);
+		u = t;
+		v = t - 1.5;
+		lut_nmsedec_sig[i] = 
+			int_max(0, 
+					(int) (floor((u * u - v * v) * pow(2, T1_NMSEDEC_FRACBITS) + 0.5) / pow(2, T1_NMSEDEC_FRACBITS) * 8192.0));
+		lut_nmsedec_sig0[i] =
+			int_max(0,
+					(int) (floor((u * u) * pow(2, T1_NMSEDEC_FRACBITS) + 0.5) / pow(2, T1_NMSEDEC_FRACBITS) * 8192.0));
+		u = t - 1.0;
+		if (i & (1 << (T1_NMSEDEC_BITS - 1))) {
+			v = t - 1.5;
+		} else {
+			v = t - 0.5;
+		}
+		lut_nmsedec_ref[i] =
+			int_max(0,
+					(int) (floor((u * u - v * v) * pow(2, T1_NMSEDEC_FRACBITS) + 0.5) / pow(2, T1_NMSEDEC_FRACBITS) * 8192.0));
+		lut_nmsedec_ref0[i] =
+			int_max(0,
+					(int) (floor((u * u) * pow(2, T1_NMSEDEC_FRACBITS) + 0.5) / pow(2, T1_NMSEDEC_FRACBITS) * 8192.0));
+	}
+
+	printf("static short lut_nmsedec_sig[1 << T1_NMSEDEC_BITS] = {\n  ");
+	dump_array16(&lut_nmsedec_sig, 1 << T1_NMSEDEC_BITS);
+
+	printf("static short lut_nmsedec_sig0[1 << T1_NMSEDEC_BITS] = {\n  ");
+	dump_array16(&lut_nmsedec_sig0, 1 << T1_NMSEDEC_BITS);
+
+	printf("static short lut_nmsedec_ref[1 << T1_NMSEDEC_BITS] = {\n  ");
+	dump_array16(&lut_nmsedec_ref, 1 << T1_NMSEDEC_BITS);
+
+	printf("static short lut_nmsedec_ref0[1 << T1_NMSEDEC_BITS] = {\n  ");
+	dump_array16(&lut_nmsedec_ref0, 1 << T1_NMSEDEC_BITS);
+
+	return 0;
+}
diff --git a/extern/libopenjpeg/t1_luts.h b/extern/libopenjpeg/t1_luts.h
new file mode 100644
index 00000000000..e5e33f6656a
--- /dev/null
+++ b/extern/libopenjpeg/t1_luts.h
@@ -0,0 +1,143 @@
+/* This file was automatically generated by t1_generate_luts.c */
+
+static char lut_ctxno_zc[1024] = {
+  0, 1, 1, 2, 1, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 
+  7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
+  5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
+  8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 
+  7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
+  8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 
+  0, 1, 1, 2, 1, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
+  5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 
+  7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
+  7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 
+  7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 
+  0, 1, 1, 2, 1, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
+  5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 
+  7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
+  5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
+  8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 
+  7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
+  8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 
+  0, 3, 3, 6, 3, 6, 6, 8, 3, 6, 6, 8, 6, 8, 8, 8, 1, 4, 4, 7, 4, 7, 7, 8, 4, 7, 7, 8, 7, 8, 8, 8, 
+  1, 4, 4, 7, 4, 7, 7, 8, 4, 7, 7, 8, 7, 8, 8, 8, 2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8, 
+  1, 4, 4, 7, 4, 7, 7, 8, 4, 7, 7, 8, 7, 8, 8, 8, 2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8, 
+  2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8, 2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8, 
+  1, 4, 4, 7, 4, 7, 7, 8, 4, 7, 7, 8, 7, 8, 8, 8, 2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8, 
+  2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8, 2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8, 
+  2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8, 2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8, 
+  2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8, 2, 5, 5, 7, 5, 7, 7, 8, 5, 7, 7, 8, 7, 8, 8, 8
+};
+
+static char lut_ctxno_sc[256] = {
+  0x9, 0xa, 0xc, 0xd, 0xa, 0xa, 0xd, 0xd, 0xc, 0xd, 0xc, 0xd, 0xd, 0xd, 0xd, 0xd, 
+  0x9, 0xa, 0xc, 0xb, 0xa, 0x9, 0xd, 0xc, 0xc, 0xb, 0xc, 0xb, 0xd, 0xc, 0xd, 0xc, 
+  0x9, 0xa, 0xc, 0xb, 0xa, 0xa, 0xb, 0xb, 0xc, 0xd, 0x9, 0xa, 0xd, 0xd, 0xa, 0xa, 
+  0x9, 0xa, 0xc, 0xd, 0xa, 0x9, 0xb, 0xc, 0xc, 0xb, 0x9, 0xa, 0xd, 0xc, 0xa, 0x9, 
+  0x9, 0xa, 0xc, 0xd, 0xa, 0x9, 0xb, 0xc, 0xc, 0xd, 0xc, 0xd, 0xb, 0xc, 0xb, 0xc, 
+  0x9, 0xa, 0xc, 0xb, 0xa, 0xa, 0xb, 0xb, 0xc, 0xb, 0xc, 0xb, 0xb, 0xb, 0xb, 0xb, 
+  0x9, 0xa, 0xc, 0xb, 0xa, 0x9, 0xd, 0xc, 0xc, 0xd, 0x9, 0xa, 0xb, 0xc, 0xa, 0x9, 
+  0x9, 0xa, 0xc, 0xd, 0xa, 0xa, 0xd, 0xd, 0xc, 0xb, 0x9, 0xa, 0xb, 0xb, 0xa, 0xa, 
+  0x9, 0xa, 0xc, 0xd, 0xa, 0xa, 0xd, 0xd, 0xc, 0xb, 0x9, 0xa, 0xb, 0xb, 0xa, 0xa, 
+  0x9, 0xa, 0xc, 0xb, 0xa, 0x9, 0xd, 0xc, 0xc, 0xd, 0x9, 0xa, 0xb, 0xc, 0xa, 0x9, 
+  0x9, 0xa, 0xc, 0xb, 0xa, 0xa, 0xb, 0xb, 0xc, 0xb, 0xc, 0xb, 0xb, 0xb, 0xb, 0xb, 
+  0x9, 0xa, 0xc, 0xd, 0xa, 0x9, 0xb, 0xc, 0xc, 0xd, 0xc, 0xd, 0xb, 0xc, 0xb, 0xc, 
+  0x9, 0xa, 0xc, 0xd, 0xa, 0x9, 0xb, 0xc, 0xc, 0xb, 0x9, 0xa, 0xd, 0xc, 0xa, 0x9, 
+  0x9, 0xa, 0xc, 0xb, 0xa, 0xa, 0xb, 0xb, 0xc, 0xd, 0x9, 0xa, 0xd, 0xd, 0xa, 0xa, 
+  0x9, 0xa, 0xc, 0xb, 0xa, 0x9, 0xd, 0xc, 0xc, 0xb, 0xc, 0xb, 0xd, 0xc, 0xd, 0xc, 
+  0x9, 0xa, 0xc, 0xd, 0xa, 0xa, 0xd, 0xd, 0xc, 0xd, 0xc, 0xd, 0xd, 0xd, 0xd, 0xd
+};
+
+static char lut_spb[256] = {
+  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, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 
+  0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1, 
+  0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 
+  0, 0, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
+  0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 
+  0, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+};
+
+static short lut_nmsedec_sig[1 << T1_NMSEDEC_BITS] = {
+  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+  0x0000, 0x0180, 0x0300, 0x0480, 0x0600, 0x0780, 0x0900, 0x0a80, 
+  0x0c00, 0x0d80, 0x0f00, 0x1080, 0x1200, 0x1380, 0x1500, 0x1680, 
+  0x1800, 0x1980, 0x1b00, 0x1c80, 0x1e00, 0x1f80, 0x2100, 0x2280, 
+  0x2400, 0x2580, 0x2700, 0x2880, 0x2a00, 0x2b80, 0x2d00, 0x2e80, 
+  0x3000, 0x3180, 0x3300, 0x3480, 0x3600, 0x3780, 0x3900, 0x3a80, 
+  0x3c00, 0x3d80, 0x3f00, 0x4080, 0x4200, 0x4380, 0x4500, 0x4680, 
+  0x4800, 0x4980, 0x4b00, 0x4c80, 0x4e00, 0x4f80, 0x5100, 0x5280, 
+  0x5400, 0x5580, 0x5700, 0x5880, 0x5a00, 0x5b80, 0x5d00, 0x5e80, 
+  0x6000, 0x6180, 0x6300, 0x6480, 0x6600, 0x6780, 0x6900, 0x6a80, 
+  0x6c00, 0x6d80, 0x6f00, 0x7080, 0x7200, 0x7380, 0x7500, 0x7680
+};
+
+static short lut_nmsedec_sig0[1 << T1_NMSEDEC_BITS] = {
+  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0080, 0x0080, 
+  0x0080, 0x0080, 0x0100, 0x0100, 0x0100, 0x0180, 0x0180, 0x0200, 
+  0x0200, 0x0280, 0x0280, 0x0300, 0x0300, 0x0380, 0x0400, 0x0400, 
+  0x0480, 0x0500, 0x0580, 0x0580, 0x0600, 0x0680, 0x0700, 0x0780, 
+  0x0800, 0x0880, 0x0900, 0x0980, 0x0a00, 0x0a80, 0x0b80, 0x0c00, 
+  0x0c80, 0x0d00, 0x0e00, 0x0e80, 0x0f00, 0x1000, 0x1080, 0x1180, 
+  0x1200, 0x1300, 0x1380, 0x1480, 0x1500, 0x1600, 0x1700, 0x1780, 
+  0x1880, 0x1980, 0x1a80, 0x1b00, 0x1c00, 0x1d00, 0x1e00, 0x1f00, 
+  0x2000, 0x2100, 0x2200, 0x2300, 0x2400, 0x2500, 0x2680, 0x2780, 
+  0x2880, 0x2980, 0x2b00, 0x2c00, 0x2d00, 0x2e80, 0x2f80, 0x3100, 
+  0x3200, 0x3380, 0x3480, 0x3600, 0x3700, 0x3880, 0x3a00, 0x3b00, 
+  0x3c80, 0x3e00, 0x3f80, 0x4080, 0x4200, 0x4380, 0x4500, 0x4680, 
+  0x4800, 0x4980, 0x4b00, 0x4c80, 0x4e00, 0x4f80, 0x5180, 0x5300, 
+  0x5480, 0x5600, 0x5800, 0x5980, 0x5b00, 0x5d00, 0x5e80, 0x6080, 
+  0x6200, 0x6400, 0x6580, 0x6780, 0x6900, 0x6b00, 0x6d00, 0x6e80, 
+  0x7080, 0x7280, 0x7480, 0x7600, 0x7800, 0x7a00, 0x7c00, 0x7e00
+};
+
+static short lut_nmsedec_ref[1 << T1_NMSEDEC_BITS] = {
+  0x1800, 0x1780, 0x1700, 0x1680, 0x1600, 0x1580, 0x1500, 0x1480, 
+  0x1400, 0x1380, 0x1300, 0x1280, 0x1200, 0x1180, 0x1100, 0x1080, 
+  0x1000, 0x0f80, 0x0f00, 0x0e80, 0x0e00, 0x0d80, 0x0d00, 0x0c80, 
+  0x0c00, 0x0b80, 0x0b00, 0x0a80, 0x0a00, 0x0980, 0x0900, 0x0880, 
+  0x0800, 0x0780, 0x0700, 0x0680, 0x0600, 0x0580, 0x0500, 0x0480, 
+  0x0400, 0x0380, 0x0300, 0x0280, 0x0200, 0x0180, 0x0100, 0x0080, 
+  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+  0x0000, 0x0080, 0x0100, 0x0180, 0x0200, 0x0280, 0x0300, 0x0380, 
+  0x0400, 0x0480, 0x0500, 0x0580, 0x0600, 0x0680, 0x0700, 0x0780, 
+  0x0800, 0x0880, 0x0900, 0x0980, 0x0a00, 0x0a80, 0x0b00, 0x0b80, 
+  0x0c00, 0x0c80, 0x0d00, 0x0d80, 0x0e00, 0x0e80, 0x0f00, 0x0f80, 
+  0x1000, 0x1080, 0x1100, 0x1180, 0x1200, 0x1280, 0x1300, 0x1380, 
+  0x1400, 0x1480, 0x1500, 0x1580, 0x1600, 0x1680, 0x1700, 0x1780
+};
+
+static short lut_nmsedec_ref0[1 << T1_NMSEDEC_BITS] = {
+  0x2000, 0x1f00, 0x1e00, 0x1d00, 0x1c00, 0x1b00, 0x1a80, 0x1980, 
+  0x1880, 0x1780, 0x1700, 0x1600, 0x1500, 0x1480, 0x1380, 0x1300, 
+  0x1200, 0x1180, 0x1080, 0x1000, 0x0f00, 0x0e80, 0x0e00, 0x0d00, 
+  0x0c80, 0x0c00, 0x0b80, 0x0a80, 0x0a00, 0x0980, 0x0900, 0x0880, 
+  0x0800, 0x0780, 0x0700, 0x0680, 0x0600, 0x0580, 0x0580, 0x0500, 
+  0x0480, 0x0400, 0x0400, 0x0380, 0x0300, 0x0300, 0x0280, 0x0280, 
+  0x0200, 0x0200, 0x0180, 0x0180, 0x0100, 0x0100, 0x0100, 0x0080, 
+  0x0080, 0x0080, 0x0080, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 
+  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0080, 0x0080, 
+  0x0080, 0x0080, 0x0100, 0x0100, 0x0100, 0x0180, 0x0180, 0x0200, 
+  0x0200, 0x0280, 0x0280, 0x0300, 0x0300, 0x0380, 0x0400, 0x0400, 
+  0x0480, 0x0500, 0x0580, 0x0580, 0x0600, 0x0680, 0x0700, 0x0780, 
+  0x0800, 0x0880, 0x0900, 0x0980, 0x0a00, 0x0a80, 0x0b80, 0x0c00, 
+  0x0c80, 0x0d00, 0x0e00, 0x0e80, 0x0f00, 0x1000, 0x1080, 0x1180, 
+  0x1200, 0x1300, 0x1380, 0x1480, 0x1500, 0x1600, 0x1700, 0x1780, 
+  0x1880, 0x1980, 0x1a80, 0x1b00, 0x1c00, 0x1d00, 0x1e00, 0x1f00
+};
+
diff --git a/extern/libopenjpeg/t2.c b/extern/libopenjpeg/t2.c
new file mode 100644
index 00000000000..be9b42a4132
--- /dev/null
+++ b/extern/libopenjpeg/t2.c
@@ -0,0 +1,787 @@
+/*
+ * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2007, Professor Benoit Macq
+ * Copyright (c) 2001-2003, David Janssens
+ * Copyright (c) 2002-2003, Yannick Verschueren
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "opj_includes.h"
+
+/** @defgroup T2 T2 - Implementation of a tier-2 coding */
+/*@{*/
+
+/** @name Local static functions */
+/*@{*/
+
+static void t2_putcommacode(opj_bio_t *bio, int n);
+static int t2_getcommacode(opj_bio_t *bio);
+/**
+Variable length code for signalling delta Zil (truncation point)
+@param bio Bit Input/Output component
+@param n delta Zil
+*/
+static void t2_putnumpasses(opj_bio_t *bio, int n);
+static int t2_getnumpasses(opj_bio_t *bio);
+/**
+Encode a packet of a tile to a destination buffer
+@param tile Tile for which to write the packets
+@param tcp Tile coding parameters
+@param pi Packet identity
+@param dest Destination buffer
+@param len Length of the destination buffer
+@param cstr_info Codestream information structure 
+@param tileno Number of the tile encoded
+@return 
+*/
+static int t2_encode_packet(opj_tcd_tile_t *tile, opj_tcp_t *tcp, opj_pi_iterator_t *pi, unsigned char *dest, int len, opj_codestream_info_t *cstr_info, int tileno);
+/**
+@param seg
+@param cblksty
+@param first
+*/
+static void t2_init_seg(opj_tcd_cblk_dec_t* cblk, int index, int cblksty, int first);
+/**
+Decode a packet of a tile from a source buffer
+@param t2 T2 handle
+@param src Source buffer
+@param len Length of the source buffer
+@param tile Tile for which to write the packets
+@param tcp Tile coding parameters
+@param pi Packet identity
+@return 
+*/
+static int t2_decode_packet(opj_t2_t* t2, unsigned char *src, int len, opj_tcd_tile_t *tile, 
+														opj_tcp_t *tcp, opj_pi_iterator_t *pi, opj_packet_info_t *pack_info);
+
+/*@}*/
+
+/*@}*/
+
+/* ----------------------------------------------------------------------- */
+
+/* #define RESTART 0x04 */
+
+static void t2_putcommacode(opj_bio_t *bio, int n) {
+	while (--n >= 0) {
+		bio_write(bio, 1, 1);
+	}
+	bio_write(bio, 0, 1);
+}
+
+static int t2_getcommacode(opj_bio_t *bio) {
+	int n;
+	for (n = 0; bio_read(bio, 1); n++) {
+		;
+	}
+	return n;
+}
+
+static void t2_putnumpasses(opj_bio_t *bio, int n) {
+	if (n == 1) {
+		bio_write(bio, 0, 1);
+	} else if (n == 2) {
+		bio_write(bio, 2, 2);
+	} else if (n <= 5) {
+		bio_write(bio, 0xc | (n - 3), 4);
+	} else if (n <= 36) {
+		bio_write(bio, 0x1e0 | (n - 6), 9);
+	} else if (n <= 164) {
+		bio_write(bio, 0xff80 | (n - 37), 16);
+	}
+}
+
+static int t2_getnumpasses(opj_bio_t *bio) {
+	int n;
+	if (!bio_read(bio, 1))
+		return 1;
+	if (!bio_read(bio, 1))
+		return 2;
+	if ((n = bio_read(bio, 2)) != 3)
+		return (3 + n);
+	if ((n = bio_read(bio, 5)) != 31)
+		return (6 + n);
+	return (37 + bio_read(bio, 7));
+}
+
+static int t2_encode_packet(opj_tcd_tile_t * tile, opj_tcp_t * tcp, opj_pi_iterator_t *pi, unsigned char *dest, int length, opj_codestream_info_t *cstr_info, int tileno) {
+	int bandno, cblkno;
+	unsigned char *c = dest;
+
+	int compno = pi->compno;	/* component value */
+	int resno  = pi->resno;		/* resolution level value */
+	int precno = pi->precno;	/* precinct value */
+	int layno  = pi->layno;		/* quality layer value */
+
+	opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
+	opj_tcd_resolution_t *res = &tilec->resolutions[resno];
+	
+	opj_bio_t *bio = NULL;	/* BIO component */
+	
+	/* <SOP 0xff91> */
+	if (tcp->csty & J2K_CP_CSTY_SOP) {
+		c[0] = 255;
+		c[1] = 145;
+		c[2] = 0;
+		c[3] = 4;
+		c[4] = (tile->packno % 65536) / 256;
+		c[5] = (tile->packno % 65536) % 256;
+		c += 6;
+	}
+	/* </SOP> */
+	
+	if (!layno) {
+		for (bandno = 0; bandno < res->numbands; bandno++) {
+			opj_tcd_band_t *band = &res->bands[bandno];
+			opj_tcd_precinct_t *prc = &band->precincts[precno];
+			tgt_reset(prc->incltree);
+			tgt_reset(prc->imsbtree);
+			for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
+				opj_tcd_cblk_enc_t* cblk = &prc->cblks.enc[cblkno];
+				cblk->numpasses = 0;
+				tgt_setvalue(prc->imsbtree, cblkno, band->numbps - cblk->numbps);
+			}
+		}
+	}
+	
+	bio = bio_create();
+	bio_init_enc(bio, c, length);
+	bio_write(bio, 1, 1);		/* Empty header bit */
+	
+	/* Writing Packet header */
+	for (bandno = 0; bandno < res->numbands; bandno++) {
+		opj_tcd_band_t *band = &res->bands[bandno];
+		opj_tcd_precinct_t *prc = &band->precincts[precno];
+		for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
+			opj_tcd_cblk_enc_t* cblk = &prc->cblks.enc[cblkno];
+			opj_tcd_layer_t *layer = &cblk->layers[layno];
+			if (!cblk->numpasses && layer->numpasses) {
+				tgt_setvalue(prc->incltree, cblkno, layno);
+			}
+		}
+		for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
+			opj_tcd_cblk_enc_t* cblk = &prc->cblks.enc[cblkno];
+			opj_tcd_layer_t *layer = &cblk->layers[layno];
+			int increment = 0;
+			int nump = 0;
+			int len = 0, passno;
+			/* cblk inclusion bits */
+			if (!cblk->numpasses) {
+				tgt_encode(bio, prc->incltree, cblkno, layno + 1);
+			} else {
+				bio_write(bio, layer->numpasses != 0, 1);
+			}
+			/* if cblk not included, go to the next cblk  */
+			if (!layer->numpasses) {
+				continue;
+			}
+			/* if first instance of cblk --> zero bit-planes information */
+			if (!cblk->numpasses) {
+				cblk->numlenbits = 3;
+				tgt_encode(bio, prc->imsbtree, cblkno, 999);
+			}
+			/* number of coding passes included */
+			t2_putnumpasses(bio, layer->numpasses);
+			
+			/* computation of the increase of the length indicator and insertion in the header     */
+			for (passno = cblk->numpasses; passno < cblk->numpasses + layer->numpasses; passno++) {
+				opj_tcd_pass_t *pass = &cblk->passes[passno];
+				nump++;
+				len += pass->len;
+				if (pass->term || passno == (cblk->numpasses + layer->numpasses) - 1) {
+					increment = int_max(increment, int_floorlog2(len) + 1 - (cblk->numlenbits + int_floorlog2(nump)));
+					len = 0;
+					nump = 0;
+				}
+			}
+			t2_putcommacode(bio, increment);
+
+			/* computation of the new Length indicator */
+			cblk->numlenbits += increment;
+
+			/* insertion of the codeword segment length */
+			for (passno = cblk->numpasses; passno < cblk->numpasses + layer->numpasses; passno++) {
+				opj_tcd_pass_t *pass = &cblk->passes[passno];
+				nump++;
+				len += pass->len;
+				if (pass->term || passno == (cblk->numpasses + layer->numpasses) - 1) {
+					bio_write(bio, len, cblk->numlenbits + int_floorlog2(nump));
+					len = 0;
+					nump = 0;
+				}
+			}
+		}
+	}
+
+	if (bio_flush(bio)) {
+		bio_destroy(bio);
+		return -999;		/* modified to eliminate longjmp !! */
+	}
+
+	c += bio_numbytes(bio);
+	bio_destroy(bio);
+	
+	/* <EPH 0xff92> */
+	if (tcp->csty & J2K_CP_CSTY_EPH) {
+		c[0] = 255;
+		c[1] = 146;
+		c += 2;
+	}
+	/* </EPH> */
+
+	/* << INDEX */
+	// End of packet header position. Currently only represents the distance to start of packet
+	// Will be updated later by incrementing with packet start value
+	if(cstr_info && cstr_info->index_write) {
+		opj_packet_info_t *info_PK = &cstr_info->tile[tileno].packet[cstr_info->packno];
+		info_PK->end_ph_pos = (int)(c - dest);
+	}
+	/* INDEX >> */
+	
+	/* Writing the packet body */
+	
+	for (bandno = 0; bandno < res->numbands; bandno++) {
+		opj_tcd_band_t *band = &res->bands[bandno];
+		opj_tcd_precinct_t *prc = &band->precincts[precno];
+		for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
+			opj_tcd_cblk_enc_t* cblk = &prc->cblks.enc[cblkno];
+			opj_tcd_layer_t *layer = &cblk->layers[layno];
+			if (!layer->numpasses) {
+				continue;
+			}
+			if (c + layer->len > dest + length) {
+				return -999;
+			}
+			
+			memcpy(c, layer->data, layer->len);
+			cblk->numpasses += layer->numpasses;
+			c += layer->len;
+			/* << INDEX */ 
+			if(cstr_info && cstr_info->index_write) {
+				opj_packet_info_t *info_PK = &cstr_info->tile[tileno].packet[cstr_info->packno];
+				info_PK->disto += layer->disto;
+				if (cstr_info->D_max < info_PK->disto) {
+					cstr_info->D_max = info_PK->disto;
+				}
+			}
+			/* INDEX >> */
+		}
+	}
+	
+	return (c - dest);
+}
+
+static void t2_init_seg(opj_tcd_cblk_dec_t* cblk, int index, int cblksty, int first) {
+	opj_tcd_seg_t* seg;
+	cblk->segs = (opj_tcd_seg_t*) opj_realloc(cblk->segs, (index + 1) * sizeof(opj_tcd_seg_t));
+	seg = &cblk->segs[index];
+	seg->data = NULL;
+	seg->dataindex = 0;
+	seg->numpasses = 0;
+	seg->len = 0;
+	if (cblksty & J2K_CCP_CBLKSTY_TERMALL) {
+		seg->maxpasses = 1;
+	}
+	else if (cblksty & J2K_CCP_CBLKSTY_LAZY) {
+		if (first) {
+			seg->maxpasses = 10;
+		} else {
+			seg->maxpasses = (((seg - 1)->maxpasses == 1) || ((seg - 1)->maxpasses == 10)) ? 2 : 1;
+		}
+	} else {
+		seg->maxpasses = 109;
+	}
+}
+
+static int t2_decode_packet(opj_t2_t* t2, unsigned char *src, int len, opj_tcd_tile_t *tile, 
+														opj_tcp_t *tcp, opj_pi_iterator_t *pi, opj_packet_info_t *pack_info) {
+	int bandno, cblkno;
+	unsigned char *c = src;
+
+	opj_cp_t *cp = t2->cp;
+
+	int compno = pi->compno;	/* component value */
+	int resno  = pi->resno;		/* resolution level value */
+	int precno = pi->precno;	/* precinct value */
+	int layno  = pi->layno;		/* quality layer value */
+
+	opj_tcd_resolution_t* res = &tile->comps[compno].resolutions[resno];
+
+	unsigned char *hd = NULL;
+	int present;
+	
+	opj_bio_t *bio = NULL;	/* BIO component */
+	
+	if (layno == 0) {
+		for (bandno = 0; bandno < res->numbands; bandno++) {
+			opj_tcd_band_t *band = &res->bands[bandno];
+			opj_tcd_precinct_t *prc = &band->precincts[precno];
+			
+			if ((band->x1-band->x0 == 0)||(band->y1-band->y0 == 0)) continue;
+			
+			tgt_reset(prc->incltree);
+			tgt_reset(prc->imsbtree);
+			for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
+				opj_tcd_cblk_dec_t* cblk = &prc->cblks.dec[cblkno];
+				cblk->numsegs = 0;
+			}
+		}
+	}
+	
+	/* SOP markers */
+	
+	if (tcp->csty & J2K_CP_CSTY_SOP) {
+		if ((*c) != 0xff || (*(c + 1) != 0x91)) {
+			opj_event_msg(t2->cinfo, EVT_WARNING, "Expected SOP marker\n");
+		} else {
+			c += 6;
+		}
+		
+		/** TODO : check the Nsop value */
+	}
+	
+	/* 
+	When the marker PPT/PPM is used the packet header are store in PPT/PPM marker
+	This part deal with this caracteristic
+	step 1: Read packet header in the saved structure
+	step 2: Return to codestream for decoding 
+	*/
+
+	bio = bio_create();
+	
+	if (cp->ppm == 1) {		/* PPM */
+		hd = cp->ppm_data;
+		bio_init_dec(bio, hd, cp->ppm_len);
+	} else if (tcp->ppt == 1) {	/* PPT */
+		hd = tcp->ppt_data;
+		bio_init_dec(bio, hd, tcp->ppt_len);
+	} else {			/* Normal Case */
+		hd = c;
+		bio_init_dec(bio, hd, src+len-hd);
+	}
+	
+	present = bio_read(bio, 1);
+	
+	if (!present) {
+		bio_inalign(bio);
+		hd += bio_numbytes(bio);
+		bio_destroy(bio);
+		
+		/* EPH markers */
+		
+		if (tcp->csty & J2K_CP_CSTY_EPH) {
+			if ((*hd) != 0xff || (*(hd + 1) != 0x92)) {
+				printf("Error : expected EPH marker\n");
+			} else {
+				hd += 2;
+			}
+		}
+
+		/* << INDEX */
+		// End of packet header position. Currently only represents the distance to start of packet
+		// Will be updated later by incrementing with packet start value
+		if(pack_info) {
+			pack_info->end_ph_pos = (int)(c - src);
+		}
+		/* INDEX >> */
+		
+		if (cp->ppm == 1) {		/* PPM case */
+			cp->ppm_len += cp->ppm_data-hd;
+			cp->ppm_data = hd;
+			return (c - src);
+		}
+		if (tcp->ppt == 1) {	/* PPT case */
+			tcp->ppt_len+=tcp->ppt_data-hd;
+			tcp->ppt_data = hd;
+			return (c - src);
+		}
+		
+		return (hd - src);
+	}
+	
+	for (bandno = 0; bandno < res->numbands; bandno++) {
+		opj_tcd_band_t *band = &res->bands[bandno];
+		opj_tcd_precinct_t *prc = &band->precincts[precno];
+		
+		if ((band->x1-band->x0 == 0)||(band->y1-band->y0 == 0)) continue;
+		
+		for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
+			int included, increment, n, segno;
+			opj_tcd_cblk_dec_t* cblk = &prc->cblks.dec[cblkno];
+			/* if cblk not yet included before --> inclusion tagtree */
+			if (!cblk->numsegs) {
+				included = tgt_decode(bio, prc->incltree, cblkno, layno + 1);
+				/* else one bit */
+			} else {
+				included = bio_read(bio, 1);
+			}
+			/* if cblk not included */
+			if (!included) {
+				cblk->numnewpasses = 0;
+				continue;
+			}
+			/* if cblk not yet included --> zero-bitplane tagtree */
+			if (!cblk->numsegs) {
+				int i, numimsbs;
+				for (i = 0; !tgt_decode(bio, prc->imsbtree, cblkno, i); i++) {
+					;
+				}
+				numimsbs = i - 1;
+				cblk->numbps = band->numbps - numimsbs;
+				cblk->numlenbits = 3;
+			}
+			/* number of coding passes */
+			cblk->numnewpasses = t2_getnumpasses(bio);
+			increment = t2_getcommacode(bio);
+			/* length indicator increment */
+			cblk->numlenbits += increment;
+			segno = 0;
+			if (!cblk->numsegs) {
+				t2_init_seg(cblk, segno, tcp->tccps[compno].cblksty, 1);
+			} else {
+				segno = cblk->numsegs - 1;
+				if (cblk->segs[segno].numpasses == cblk->segs[segno].maxpasses) {
+					++segno;
+					t2_init_seg(cblk, segno, tcp->tccps[compno].cblksty, 0);
+				}
+			}
+			n = cblk->numnewpasses;
+			
+			do {
+				cblk->segs[segno].numnewpasses = int_min(cblk->segs[segno].maxpasses - cblk->segs[segno].numpasses, n);
+				cblk->segs[segno].newlen = bio_read(bio, cblk->numlenbits + int_floorlog2(cblk->segs[segno].numnewpasses));
+				n -= cblk->segs[segno].numnewpasses;
+				if (n > 0) {
+					++segno;
+					t2_init_seg(cblk, segno, tcp->tccps[compno].cblksty, 0);
+				}
+			} while (n > 0);
+		}
+	}
+	
+	if (bio_inalign(bio)) {
+		bio_destroy(bio);
+		return -999;
+	}
+	
+	hd += bio_numbytes(bio);
+	bio_destroy(bio);
+	
+	/* EPH markers */
+	if (tcp->csty & J2K_CP_CSTY_EPH) {
+		if ((*hd) != 0xff || (*(hd + 1) != 0x92)) {
+			opj_event_msg(t2->cinfo, EVT_ERROR, "Expected EPH marker\n");
+		} else {
+			hd += 2;
+		}
+	}
+
+	/* << INDEX */
+	// End of packet header position. Currently only represents the distance to start of packet
+	// Will be updated later by incrementing with packet start value
+	if(pack_info) {
+		pack_info->end_ph_pos = (int)(hd - src);
+	}
+	/* INDEX >> */
+	
+	if (cp->ppm==1) {
+		cp->ppm_len+=cp->ppm_data-hd;
+		cp->ppm_data = hd;
+	} else if (tcp->ppt == 1) {
+		tcp->ppt_len+=tcp->ppt_data-hd;
+		tcp->ppt_data = hd;
+	} else {
+		c=hd;
+	}
+	
+	for (bandno = 0; bandno < res->numbands; bandno++) {
+		opj_tcd_band_t *band = &res->bands[bandno];
+		opj_tcd_precinct_t *prc = &band->precincts[precno];
+		
+		if ((band->x1-band->x0 == 0)||(band->y1-band->y0 == 0)) continue;
+		
+		for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
+			opj_tcd_cblk_dec_t* cblk = &prc->cblks.dec[cblkno];
+			opj_tcd_seg_t *seg = NULL;
+			if (!cblk->numnewpasses)
+				continue;
+			if (!cblk->numsegs) {
+				seg = &cblk->segs[0];
+				cblk->numsegs++;
+				cblk->len = 0;
+			} else {
+				seg = &cblk->segs[cblk->numsegs - 1];
+				if (seg->numpasses == seg->maxpasses) {
+					seg++;
+					cblk->numsegs++;
+				}
+			}
+			
+			do {
+				if (c + seg->newlen > src + len) {
+					return -999;
+				}
+
+#ifdef USE_JPWL
+			/* we need here a j2k handle to verify if making a check to
+			the validity of cblocks parameters is selected from user (-W) */
+
+				/* let's check that we are not exceeding */
+				if ((cblk->len + seg->newlen) > 8192) {
+					opj_event_msg(t2->cinfo, EVT_WARNING,
+						"JPWL: segment too long (%d) for codeblock %d (p=%d, b=%d, r=%d, c=%d)\n",
+						seg->newlen, cblkno, precno, bandno, resno, compno);
+					if (!JPWL_ASSUME) {
+						opj_event_msg(t2->cinfo, EVT_ERROR, "JPWL: giving up\n");
+						return -999;
+					}
+					seg->newlen = 8192 - cblk->len;
+					opj_event_msg(t2->cinfo, EVT_WARNING, "      - truncating segment to %d\n", seg->newlen);
+					break;
+				};
+
+#endif /* USE_JPWL */
+				
+				cblk->data = (unsigned char*) opj_realloc(cblk->data, (cblk->len + seg->newlen) * sizeof(unsigned char*));
+				memcpy(cblk->data + cblk->len, c, seg->newlen);
+				if (seg->numpasses == 0) {
+					seg->data = &cblk->data;
+					seg->dataindex = cblk->len;
+				}
+				c += seg->newlen;
+				cblk->len += seg->newlen;
+				seg->len += seg->newlen;
+				seg->numpasses += seg->numnewpasses;
+				cblk->numnewpasses -= seg->numnewpasses;
+				if (cblk->numnewpasses > 0) {
+					seg++;
+					cblk->numsegs++;
+				}
+			} while (cblk->numnewpasses > 0);
+		}
+	}
+	
+	return (c - src);
+}
+
+/* ----------------------------------------------------------------------- */
+
+int t2_encode_packets(opj_t2_t* t2,int tileno, opj_tcd_tile_t *tile, int maxlayers, unsigned char *dest, int len, opj_codestream_info_t *cstr_info,int tpnum, int tppos,int pino, J2K_T2_MODE t2_mode, int cur_totnum_tp){
+	unsigned char *c = dest;
+	int e = 0;
+	int compno;
+	opj_pi_iterator_t *pi = NULL;
+	int poc;
+	opj_image_t *image = t2->image;
+	opj_cp_t *cp = t2->cp;
+	opj_tcp_t *tcp = &cp->tcps[tileno];
+	int pocno = cp->cinema == CINEMA4K_24? 2: 1;
+	int maxcomp = cp->max_comp_size > 0 ? image->numcomps : 1;
+	
+	pi = pi_initialise_encode(image, cp, tileno, t2_mode);
+	if(!pi) {
+		/* TODO: throw an error */
+		return -999;
+	}
+	
+	if(t2_mode == THRESH_CALC ){ /* Calculating threshold */
+		for(compno = 0; compno < maxcomp; compno++ ){
+			for(poc = 0; poc < pocno ; poc++){
+				int comp_len = 0;
+				int tpnum = compno;
+				if (pi_create_encode(pi, cp,tileno,poc,tpnum,tppos,t2_mode,cur_totnum_tp)) {
+					opj_event_msg(t2->cinfo, EVT_ERROR, "Error initializing Packet Iterator\n");
+					return -999;
+				}
+				while (pi_next(&pi[poc])) {
+					if (pi[poc].layno < maxlayers) {
+						e = t2_encode_packet(tile, &cp->tcps[tileno], &pi[poc], c, dest + len - c, cstr_info, tileno);
+						comp_len = comp_len + e;
+						if (e == -999) {
+							break;
+						} else {
+							c += e;
+						}
+					}
+				}
+				if (e == -999) break;
+				if (cp->max_comp_size){
+					if (comp_len > cp->max_comp_size){
+						e = -999;
+						break;
+					}
+				}
+			}
+			if (e == -999)  break;
+		}
+	}else{  /* t2_mode == FINAL_PASS  */
+		pi_create_encode(pi, cp,tileno,pino,tpnum,tppos,t2_mode,cur_totnum_tp);
+		while (pi_next(&pi[pino])) {
+			if (pi[pino].layno < maxlayers) {
+				e = t2_encode_packet(tile, &cp->tcps[tileno], &pi[pino], c, dest + len - c, cstr_info, tileno);
+				if (e == -999) {
+					break;
+				} else {
+					c += e;
+				}
+				/* INDEX >> */
+				if(cstr_info) {
+					if(cstr_info->index_write) {
+						opj_tile_info_t *info_TL = &cstr_info->tile[tileno];
+						opj_packet_info_t *info_PK = &info_TL->packet[cstr_info->packno];
+						if (!cstr_info->packno) {
+							info_PK->start_pos = info_TL->end_header + 1;
+						} else {
+							info_PK->start_pos = ((cp->tp_on | tcp->POC)&& info_PK->start_pos) ? info_PK->start_pos : info_TL->packet[cstr_info->packno - 1].end_pos + 1;
+						}
+						info_PK->end_pos = info_PK->start_pos + e - 1;
+						info_PK->end_ph_pos += info_PK->start_pos - 1;	// End of packet header which now only represents the distance 
+																														// to start of packet is incremented by value of start of packet
+					}
+					
+					cstr_info->packno++;
+				}
+				/* << INDEX */
+				tile->packno++;
+			}
+		}
+	}
+	
+	pi_destroy(pi, cp, tileno);
+	
+	if (e == -999) {
+		return e;
+	}
+	
+  return (c - dest);
+}
+
+int t2_decode_packets(opj_t2_t *t2, unsigned char *src, int len, int tileno, opj_tcd_tile_t *tile, opj_codestream_info_t *cstr_info) {
+	unsigned char *c = src;
+	opj_pi_iterator_t *pi;
+	int pino, e = 0;
+	int n = 0, curtp = 0;
+	int tp_start_packno;
+
+	opj_image_t *image = t2->image;
+	opj_cp_t *cp = t2->cp;
+	
+	/* create a packet iterator */
+	pi = pi_create_decode(image, cp, tileno);
+	if(!pi) {
+		/* TODO: throw an error */
+		return -999;
+	}
+
+	tp_start_packno = 0;
+	
+	for (pino = 0; pino <= cp->tcps[tileno].numpocs; pino++) {
+		while (pi_next(&pi[pino])) {
+			if ((cp->layer==0) || (cp->layer>=((pi[pino].layno)+1))) {
+				opj_packet_info_t *pack_info;
+				if (cstr_info)
+					pack_info = &cstr_info->tile[tileno].packet[cstr_info->packno];
+				else
+					pack_info = NULL;
+				e = t2_decode_packet(t2, c, src + len - c, tile, &cp->tcps[tileno], &pi[pino], pack_info);
+			} else {
+				e = 0;
+			}
+			
+			/* progression in resolution */
+			image->comps[pi[pino].compno].resno_decoded =	
+				(e > 0) ? 
+				int_max(pi[pino].resno, image->comps[pi[pino].compno].resno_decoded) 
+				: image->comps[pi[pino].compno].resno_decoded;
+			n++;
+
+			/* INDEX >> */
+			if(cstr_info) {
+				opj_tile_info_t *info_TL = &cstr_info->tile[tileno];
+				opj_packet_info_t *info_PK = &info_TL->packet[cstr_info->packno];
+				if (!cstr_info->packno) {
+					info_PK->start_pos = info_TL->end_header + 1;
+				} else if (info_TL->packet[cstr_info->packno-1].end_pos >= (int)cstr_info->tile[tileno].tp[curtp].tp_end_pos){ // New tile part
+					info_TL->tp[curtp].tp_numpacks = cstr_info->packno - tp_start_packno; // Number of packets in previous tile-part
+					tp_start_packno = cstr_info->packno;
+					curtp++;
+					info_PK->start_pos = cstr_info->tile[tileno].tp[curtp].tp_end_header+1;
+				} else {
+					info_PK->start_pos = (cp->tp_on && info_PK->start_pos) ? info_PK->start_pos : info_TL->packet[cstr_info->packno - 1].end_pos + 1;
+				}
+				info_PK->end_pos = info_PK->start_pos + e - 1;
+				info_PK->end_ph_pos += info_PK->start_pos - 1;	// End of packet header which now only represents the distance 
+																												// to start of packet is incremented by value of start of packet
+				cstr_info->packno++;
+			}
+			/* << INDEX */
+			
+			if (e == -999) {		/* ADD */
+				break;
+			} else {
+				c += e;
+			}			
+		}
+	}
+	/* INDEX >> */
+	if(cstr_info) {
+		cstr_info->tile[tileno].tp[curtp].tp_numpacks = cstr_info->packno - tp_start_packno; // Number of packets in last tile-part
+	}
+	/* << INDEX */
+
+	/* don't forget to release pi */
+	pi_destroy(pi, cp, tileno);
+	
+	if (e == -999) {
+		return e;
+	}
+	
+	return (c - src);
+}
+
+/* ----------------------------------------------------------------------- */
+
+opj_t2_t* t2_create(opj_common_ptr cinfo, opj_image_t *image, opj_cp_t *cp) {
+	/* create the tcd structure */
+	opj_t2_t *t2 = (opj_t2_t*)opj_malloc(sizeof(opj_t2_t));
+	if(!t2) return NULL;
+	t2->cinfo = cinfo;
+	t2->image = image;
+	t2->cp = cp;
+
+	return t2;
+}
+
+void t2_destroy(opj_t2_t *t2) {
+	if(t2) {
+		opj_free(t2);
+	}
+}
+
+
+
+
+
diff --git a/extern/libopenjpeg/t2.h b/extern/libopenjpeg/t2.h
new file mode 100644
index 00000000000..b15b7520019
--- /dev/null
+++ b/extern/libopenjpeg/t2.h
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2007, Professor Benoit Macq
+ * Copyright (c) 2001-2003, David Janssens
+ * Copyright (c) 2002-2003, Yannick Verschueren
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef __T2_H
+#define __T2_H
+/**
+@file t2.h
+@brief Implementation of a tier-2 coding (packetization of code-block data) (T2)
+
+*/
+
+/** @defgroup T2 T2 - Implementation of a tier-2 coding */
+/*@{*/
+
+/**
+Tier-2 coding
+*/
+typedef struct opj_t2 {
+	/** codec context */
+	opj_common_ptr cinfo;
+
+	/** Encoding: pointer to the src image. Decoding: pointer to the dst image. */
+	opj_image_t *image;
+	/** pointer to the image coding parameters */
+	opj_cp_t *cp;
+} opj_t2_t;
+
+/** @name Exported functions */
+/*@{*/
+/* ----------------------------------------------------------------------- */
+
+/**
+Encode the packets of a tile to a destination buffer
+@param t2 T2 handle
+@param tileno number of the tile encoded
+@param tile the tile for which to write the packets
+@param maxlayers maximum number of layers
+@param dest the destination buffer
+@param len the length of the destination buffer
+@param cstr_info Codestream information structure 
+@param tpnum Tile part number of the current tile
+@param tppos The position of the tile part flag in the progression order
+@param t2_mode If == 0 In Threshold calculation ,If == 1 Final pass
+@param cur_totnum_tp The total number of tile parts in the current tile
+*/
+int t2_encode_packets(opj_t2_t* t2,int tileno, opj_tcd_tile_t *tile, int maxlayers, unsigned char *dest, int len, opj_codestream_info_t *cstr_info,int tpnum, int tppos,int pino,J2K_T2_MODE t2_mode,int cur_totnum_tp);
+/**
+Decode the packets of a tile from a source buffer
+@param t2 T2 handle
+@param src the source buffer
+@param len length of the source buffer
+@param tileno number that identifies the tile for which to decode the packets
+@param tile tile for which to decode the packets
+ */
+int t2_decode_packets(opj_t2_t *t2, unsigned char *src, int len, int tileno, opj_tcd_tile_t *tile, opj_codestream_info_t *cstr_info);
+
+/**
+Create a T2 handle
+@param cinfo Codec context info
+@param image Source or destination image
+@param cp Image coding parameters
+@return Returns a new T2 handle if successful, returns NULL otherwise
+*/
+opj_t2_t* t2_create(opj_common_ptr cinfo, opj_image_t *image, opj_cp_t *cp);
+/**
+Destroy a T2 handle
+@param t2 T2 handle to destroy
+*/
+void t2_destroy(opj_t2_t *t2);
+
+/* ----------------------------------------------------------------------- */
+/*@}*/
+
+/*@}*/
+
+#endif /* __T2_H */
diff --git a/extern/libopenjpeg/tcd.c b/extern/libopenjpeg/tcd.c
new file mode 100644
index 00000000000..f4a54553e28
--- /dev/null
+++ b/extern/libopenjpeg/tcd.c
@@ -0,0 +1,1506 @@
+/*
+ * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2007, Professor Benoit Macq
+ * Copyright (c) 2001-2003, David Janssens
+ * Copyright (c) 2002-2003, Yannick Verschueren
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * Copyright (c) 2006-2007, Parvatha Elangovan
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "opj_includes.h"
+
+void tcd_dump(FILE *fd, opj_tcd_t *tcd, opj_tcd_image_t * img) {
+	int tileno, compno, resno, bandno, precno;//, cblkno;
+
+	fprintf(fd, "image {\n");
+	fprintf(fd, "  tw=%d, th=%d x0=%d x1=%d y0=%d y1=%d\n", 
+		img->tw, img->th, tcd->image->x0, tcd->image->x1, tcd->image->y0, tcd->image->y1);
+
+	for (tileno = 0; tileno < img->th * img->tw; tileno++) {
+		opj_tcd_tile_t *tile = &tcd->tcd_image->tiles[tileno];
+		fprintf(fd, "  tile {\n");
+		fprintf(fd, "    x0=%d, y0=%d, x1=%d, y1=%d, numcomps=%d\n",
+			tile->x0, tile->y0, tile->x1, tile->y1, tile->numcomps);
+		for (compno = 0; compno < tile->numcomps; compno++) {
+			opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
+			fprintf(fd, "    tilec {\n");
+			fprintf(fd,
+				"      x0=%d, y0=%d, x1=%d, y1=%d, numresolutions=%d\n",
+				tilec->x0, tilec->y0, tilec->x1, tilec->y1, tilec->numresolutions);
+			for (resno = 0; resno < tilec->numresolutions; resno++) {
+				opj_tcd_resolution_t *res = &tilec->resolutions[resno];
+				fprintf(fd, "\n   res {\n");
+				fprintf(fd,
+					"          x0=%d, y0=%d, x1=%d, y1=%d, pw=%d, ph=%d, numbands=%d\n",
+					res->x0, res->y0, res->x1, res->y1, res->pw, res->ph, res->numbands);
+				for (bandno = 0; bandno < res->numbands; bandno++) {
+					opj_tcd_band_t *band = &res->bands[bandno];
+					fprintf(fd, "        band {\n");
+					fprintf(fd,
+						"          x0=%d, y0=%d, x1=%d, y1=%d, stepsize=%f, numbps=%d\n",
+						band->x0, band->y0, band->x1, band->y1, band->stepsize, band->numbps);
+					for (precno = 0; precno < res->pw * res->ph; precno++) {
+						opj_tcd_precinct_t *prec = &band->precincts[precno];
+						fprintf(fd, "          prec {\n");
+						fprintf(fd,
+							"            x0=%d, y0=%d, x1=%d, y1=%d, cw=%d, ch=%d\n",
+							prec->x0, prec->y0, prec->x1, prec->y1, prec->cw, prec->ch);
+						/*
+						for (cblkno = 0; cblkno < prec->cw * prec->ch; cblkno++) {
+							opj_tcd_cblk_t *cblk = &prec->cblks[cblkno];
+							fprintf(fd, "            cblk {\n");
+							fprintf(fd,
+								"              x0=%d, y0=%d, x1=%d, y1=%d\n",
+								cblk->x0, cblk->y0, cblk->x1, cblk->y1);
+							fprintf(fd, "            }\n");
+						}
+						*/
+						fprintf(fd, "          }\n");
+					}
+					fprintf(fd, "        }\n");
+				}
+				fprintf(fd, "      }\n");
+			}
+			fprintf(fd, "    }\n");
+		}
+		fprintf(fd, "  }\n");
+	}
+	fprintf(fd, "}\n");
+}
+
+/* ----------------------------------------------------------------------- */
+
+/**
+Create a new TCD handle
+*/
+opj_tcd_t* tcd_create(opj_common_ptr cinfo) {
+	/* create the tcd structure */
+	opj_tcd_t *tcd = (opj_tcd_t*)opj_malloc(sizeof(opj_tcd_t));
+	if(!tcd) return NULL;
+	tcd->cinfo = cinfo;
+	tcd->tcd_image = (opj_tcd_image_t*)opj_malloc(sizeof(opj_tcd_image_t));
+	if(!tcd->tcd_image) {
+		opj_free(tcd);
+		return NULL;
+	}
+
+	return tcd;
+}
+
+/**
+Destroy a previously created TCD handle
+*/
+void tcd_destroy(opj_tcd_t *tcd) {
+	if(tcd) {
+		opj_free(tcd->tcd_image);
+		opj_free(tcd);
+	}
+}
+
+/* ----------------------------------------------------------------------- */
+
+void tcd_malloc_encode(opj_tcd_t *tcd, opj_image_t * image, opj_cp_t * cp, int curtileno) {
+	int tileno, compno, resno, bandno, precno, cblkno;
+
+	tcd->image = image;
+	tcd->cp = cp;
+	tcd->tcd_image->tw = cp->tw;
+	tcd->tcd_image->th = cp->th;
+	tcd->tcd_image->tiles = (opj_tcd_tile_t *) opj_malloc(sizeof(opj_tcd_tile_t));
+	
+	for (tileno = 0; tileno < 1; tileno++) {
+		opj_tcp_t *tcp = &cp->tcps[curtileno];
+		int j;
+
+		/* cfr p59 ISO/IEC FDIS15444-1 : 2000 (18 august 2000) */
+		int p = curtileno % cp->tw;	/* si numerotation matricielle .. */
+		int q = curtileno / cp->tw;	/* .. coordonnees de la tile (q,p) q pour ligne et p pour colonne */
+
+		/* opj_tcd_tile_t *tile=&tcd->tcd_image->tiles[tileno]; */
+		opj_tcd_tile_t *tile = tcd->tcd_image->tiles;
+
+		/* 4 borders of the tile rescale on the image if necessary */
+		tile->x0 = int_max(cp->tx0 + p * cp->tdx, image->x0);
+		tile->y0 = int_max(cp->ty0 + q * cp->tdy, image->y0);
+		tile->x1 = int_min(cp->tx0 + (p + 1) * cp->tdx, image->x1);
+		tile->y1 = int_min(cp->ty0 + (q + 1) * cp->tdy, image->y1);
+		tile->numcomps = image->numcomps;
+		/* tile->PPT=image->PPT;  */
+
+		/* Modification of the RATE >> */
+		for (j = 0; j < tcp->numlayers; j++) {
+			tcp->rates[j] = tcp->rates[j] ? 
+				cp->tp_on ? 
+					(((float) (tile->numcomps 
+					* (tile->x1 - tile->x0) 
+					* (tile->y1 - tile->y0)
+					* image->comps[0].prec))
+					/(tcp->rates[j] * 8 * image->comps[0].dx * image->comps[0].dy)) - (((tcd->cur_totnum_tp - 1) * 14 )/ tcp->numlayers)
+					:
+				((float) (tile->numcomps 
+					* (tile->x1 - tile->x0) 
+					* (tile->y1 - tile->y0) 
+					* image->comps[0].prec))/ 
+					(tcp->rates[j] * 8 * image->comps[0].dx * image->comps[0].dy)
+					: 0;
+
+			if (tcp->rates[j]) {
+				if (j && tcp->rates[j] < tcp->rates[j - 1] + 10) {
+					tcp->rates[j] = tcp->rates[j - 1] + 20;
+				} else {
+					if (!j && tcp->rates[j] < 30)
+						tcp->rates[j] = 30;
+				}
+				
+				if(j == (tcp->numlayers-1)){
+					tcp->rates[j] = tcp->rates[j]- 2;
+				}
+			}
+		}
+		/* << Modification of the RATE */
+		
+		tile->comps = (opj_tcd_tilecomp_t *) opj_malloc(image->numcomps * sizeof(opj_tcd_tilecomp_t));
+		for (compno = 0; compno < tile->numcomps; compno++) {
+			opj_tccp_t *tccp = &tcp->tccps[compno];
+
+			opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
+
+			/* border of each tile component (global) */
+			tilec->x0 = int_ceildiv(tile->x0, image->comps[compno].dx);
+			tilec->y0 = int_ceildiv(tile->y0, image->comps[compno].dy);
+			tilec->x1 = int_ceildiv(tile->x1, image->comps[compno].dx);
+			tilec->y1 = int_ceildiv(tile->y1, image->comps[compno].dy);
+			
+			tilec->data = (int *) opj_aligned_malloc((tilec->x1 - tilec->x0) * (tilec->y1 - tilec->y0) * sizeof(int));
+			tilec->numresolutions = tccp->numresolutions;
+
+			tilec->resolutions = (opj_tcd_resolution_t *) opj_malloc(tilec->numresolutions * sizeof(opj_tcd_resolution_t));
+			
+			for (resno = 0; resno < tilec->numresolutions; resno++) {
+				int pdx, pdy;
+				int levelno = tilec->numresolutions - 1 - resno;
+				int tlprcxstart, tlprcystart, brprcxend, brprcyend;
+				int tlcbgxstart, tlcbgystart, brcbgxend, brcbgyend;
+				int cbgwidthexpn, cbgheightexpn;
+				int cblkwidthexpn, cblkheightexpn;
+
+				opj_tcd_resolution_t *res = &tilec->resolutions[resno];
+				
+				/* border for each resolution level (global) */
+				res->x0 = int_ceildivpow2(tilec->x0, levelno);
+				res->y0 = int_ceildivpow2(tilec->y0, levelno);
+				res->x1 = int_ceildivpow2(tilec->x1, levelno);
+				res->y1 = int_ceildivpow2(tilec->y1, levelno);
+				
+				res->numbands = resno == 0 ? 1 : 3;
+				/* p. 35, table A-23, ISO/IEC FDIS154444-1 : 2000 (18 august 2000) */
+				if (tccp->csty & J2K_CCP_CSTY_PRT) {
+					pdx = tccp->prcw[resno];
+					pdy = tccp->prch[resno];
+				} else {
+					pdx = 15;
+					pdy = 15;
+				}
+				/* p. 64, B.6, ISO/IEC FDIS15444-1 : 2000 (18 august 2000)  */
+				tlprcxstart = int_floordivpow2(res->x0, pdx) << pdx;
+				tlprcystart = int_floordivpow2(res->y0, pdy) << pdy;
+				
+				brprcxend = int_ceildivpow2(res->x1, pdx) << pdx;
+				brprcyend = int_ceildivpow2(res->y1, pdy) << pdy;
+				
+				res->pw = (brprcxend - tlprcxstart) >> pdx;
+				res->ph = (brprcyend - tlprcystart) >> pdy;
+				
+				if (resno == 0) {
+					tlcbgxstart = tlprcxstart;
+					tlcbgystart = tlprcystart;
+					brcbgxend = brprcxend;
+					brcbgyend = brprcyend;
+					cbgwidthexpn = pdx;
+					cbgheightexpn = pdy;
+				} else {
+					tlcbgxstart = int_ceildivpow2(tlprcxstart, 1);
+					tlcbgystart = int_ceildivpow2(tlprcystart, 1);
+					brcbgxend = int_ceildivpow2(brprcxend, 1);
+					brcbgyend = int_ceildivpow2(brprcyend, 1);
+					cbgwidthexpn = pdx - 1;
+					cbgheightexpn = pdy - 1;
+				}
+				
+				cblkwidthexpn = int_min(tccp->cblkw, cbgwidthexpn);
+				cblkheightexpn = int_min(tccp->cblkh, cbgheightexpn);
+				
+				for (bandno = 0; bandno < res->numbands; bandno++) {
+					int x0b, y0b, i;
+					int gain, numbps;
+					opj_stepsize_t *ss = NULL;
+
+					opj_tcd_band_t *band = &res->bands[bandno];
+
+					band->bandno = resno == 0 ? 0 : bandno + 1;
+					x0b = (band->bandno == 1) || (band->bandno == 3) ? 1 : 0;
+					y0b = (band->bandno == 2) || (band->bandno == 3) ? 1 : 0;
+					
+					if (band->bandno == 0) {
+						/* band border (global) */
+						band->x0 = int_ceildivpow2(tilec->x0, levelno);
+						band->y0 = int_ceildivpow2(tilec->y0, levelno);
+						band->x1 = int_ceildivpow2(tilec->x1, levelno);
+						band->y1 = int_ceildivpow2(tilec->y1, levelno);
+					} else {
+						/* band border (global) */
+						band->x0 = int_ceildivpow2(tilec->x0 - (1 << levelno) * x0b, levelno + 1);
+						band->y0 = int_ceildivpow2(tilec->y0 - (1 << levelno) * y0b, levelno + 1);
+						band->x1 = int_ceildivpow2(tilec->x1 - (1 << levelno) * x0b, levelno + 1);
+						band->y1 = int_ceildivpow2(tilec->y1 - (1 << levelno) * y0b, levelno + 1);
+					}
+					
+					ss = &tccp->stepsizes[resno == 0 ? 0 : 3 * (resno - 1) + bandno + 1];
+					gain = tccp->qmfbid == 0 ? dwt_getgain_real(band->bandno) : dwt_getgain(band->bandno);					
+					numbps = image->comps[compno].prec + gain;
+					
+					band->stepsize = (float)((1.0 + ss->mant / 2048.0) * pow(2.0, numbps - ss->expn));
+					band->numbps = ss->expn + tccp->numgbits - 1;	/* WHY -1 ? */
+					
+					band->precincts = (opj_tcd_precinct_t *) opj_malloc(3 * res->pw * res->ph * sizeof(opj_tcd_precinct_t));
+					
+					for (i = 0; i < res->pw * res->ph * 3; i++) {
+						band->precincts[i].imsbtree = NULL;
+						band->precincts[i].incltree = NULL;
+					}
+					
+					for (precno = 0; precno < res->pw * res->ph; precno++) {
+						int tlcblkxstart, tlcblkystart, brcblkxend, brcblkyend;
+
+						int cbgxstart = tlcbgxstart + (precno % res->pw) * (1 << cbgwidthexpn);
+						int cbgystart = tlcbgystart + (precno / res->pw) * (1 << cbgheightexpn);
+						int cbgxend = cbgxstart + (1 << cbgwidthexpn);
+						int cbgyend = cbgystart + (1 << cbgheightexpn);
+
+						opj_tcd_precinct_t *prc = &band->precincts[precno];
+
+						/* precinct size (global) */
+						prc->x0 = int_max(cbgxstart, band->x0);
+						prc->y0 = int_max(cbgystart, band->y0);
+						prc->x1 = int_min(cbgxend, band->x1);
+						prc->y1 = int_min(cbgyend, band->y1);
+
+						tlcblkxstart = int_floordivpow2(prc->x0, cblkwidthexpn) << cblkwidthexpn;
+						tlcblkystart = int_floordivpow2(prc->y0, cblkheightexpn) << cblkheightexpn;
+						brcblkxend = int_ceildivpow2(prc->x1, cblkwidthexpn) << cblkwidthexpn;
+						brcblkyend = int_ceildivpow2(prc->y1, cblkheightexpn) << cblkheightexpn;
+						prc->cw = (brcblkxend - tlcblkxstart) >> cblkwidthexpn;
+						prc->ch = (brcblkyend - tlcblkystart) >> cblkheightexpn;
+
+						prc->cblks.enc = (opj_tcd_cblk_enc_t*) opj_calloc((prc->cw * prc->ch), sizeof(opj_tcd_cblk_enc_t));
+						prc->incltree = tgt_create(prc->cw, prc->ch);
+						prc->imsbtree = tgt_create(prc->cw, prc->ch);
+						
+						for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
+							int cblkxstart = tlcblkxstart + (cblkno % prc->cw) * (1 << cblkwidthexpn);
+							int cblkystart = tlcblkystart + (cblkno / prc->cw) * (1 << cblkheightexpn);
+							int cblkxend = cblkxstart + (1 << cblkwidthexpn);
+							int cblkyend = cblkystart + (1 << cblkheightexpn);
+							
+							opj_tcd_cblk_enc_t* cblk = &prc->cblks.enc[cblkno];
+
+							/* code-block size (global) */
+							cblk->x0 = int_max(cblkxstart, prc->x0);
+							cblk->y0 = int_max(cblkystart, prc->y0);
+							cblk->x1 = int_min(cblkxend, prc->x1);
+							cblk->y1 = int_min(cblkyend, prc->y1);
+							cblk->data = (unsigned char*) opj_calloc(8192+2, sizeof(unsigned char));
+							/* FIXME: mqc_init_enc and mqc_byteout underrun the buffer if we don't do this. Why? */
+							cblk->data += 2;
+							cblk->layers = (opj_tcd_layer_t*) opj_calloc(100, sizeof(opj_tcd_layer_t));
+							cblk->passes = (opj_tcd_pass_t*) opj_calloc(100, sizeof(opj_tcd_pass_t));
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	/* tcd_dump(stdout, tcd, &tcd->tcd_image); */
+}
+
+void tcd_free_encode(opj_tcd_t *tcd) {
+	int tileno, compno, resno, bandno, precno, cblkno;
+
+	for (tileno = 0; tileno < 1; tileno++) {
+		opj_tcd_tile_t *tile = tcd->tcd_image->tiles;
+
+		for (compno = 0; compno < tile->numcomps; compno++) {
+			opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
+
+			for (resno = 0; resno < tilec->numresolutions; resno++) {
+				opj_tcd_resolution_t *res = &tilec->resolutions[resno];
+
+				for (bandno = 0; bandno < res->numbands; bandno++) {
+					opj_tcd_band_t *band = &res->bands[bandno];
+
+					for (precno = 0; precno < res->pw * res->ph; precno++) {
+						opj_tcd_precinct_t *prc = &band->precincts[precno];
+
+						if (prc->incltree != NULL) {
+							tgt_destroy(prc->incltree);
+							prc->incltree = NULL;
+						}
+						if (prc->imsbtree != NULL) {
+							tgt_destroy(prc->imsbtree);	
+							prc->imsbtree = NULL;
+						}
+						for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
+							opj_free(prc->cblks.enc[cblkno].data - 2);
+							opj_free(prc->cblks.enc[cblkno].layers);
+							opj_free(prc->cblks.enc[cblkno].passes);
+						}
+						opj_free(prc->cblks.enc);
+					} /* for (precno */
+					opj_free(band->precincts);
+					band->precincts = NULL;
+				} /* for (bandno */
+			} /* for (resno */
+			opj_free(tilec->resolutions);
+			tilec->resolutions = NULL;
+		} /* for (compno */
+		opj_free(tile->comps);
+		tile->comps = NULL;
+	} /* for (tileno */
+	opj_free(tcd->tcd_image->tiles);
+	tcd->tcd_image->tiles = NULL;
+}
+
+void tcd_init_encode(opj_tcd_t *tcd, opj_image_t * image, opj_cp_t * cp, int curtileno) {
+	int tileno, compno, resno, bandno, precno, cblkno;
+
+	for (tileno = 0; tileno < 1; tileno++) {
+		opj_tcp_t *tcp = &cp->tcps[curtileno];
+		int j;
+		/* cfr p59 ISO/IEC FDIS15444-1 : 2000 (18 august 2000) */
+		int p = curtileno % cp->tw;
+		int q = curtileno / cp->tw;
+
+		opj_tcd_tile_t *tile = tcd->tcd_image->tiles;
+		
+		/* 4 borders of the tile rescale on the image if necessary */
+		tile->x0 = int_max(cp->tx0 + p * cp->tdx, image->x0);
+		tile->y0 = int_max(cp->ty0 + q * cp->tdy, image->y0);
+		tile->x1 = int_min(cp->tx0 + (p + 1) * cp->tdx, image->x1);
+		tile->y1 = int_min(cp->ty0 + (q + 1) * cp->tdy, image->y1);
+		
+		tile->numcomps = image->numcomps;
+		/* tile->PPT=image->PPT; */
+
+		/* Modification of the RATE >> */
+		for (j = 0; j < tcp->numlayers; j++) {
+			tcp->rates[j] = tcp->rates[j] ? 
+						((float) (tile->numcomps 
+								* (tile->x1 - tile->x0) 
+								* (tile->y1 - tile->y0) 
+								* image->comps[0].prec))/ 
+						(tcp->rates[j] * 8 * image->comps[0].dx * image->comps[0].dy) 
+						: 0;
+
+			if (tcp->rates[j]) {
+				if (j && tcp->rates[j] < tcp->rates[j - 1] + 10) {
+					tcp->rates[j] = tcp->rates[j - 1] + 20;
+				} else {
+					if (!j && tcp->rates[j] < 30)
+						tcp->rates[j] = 30;
+				}
+			}
+		}
+		/* << Modification of the RATE */
+
+		/* tile->comps=(opj_tcd_tilecomp_t*)opj_realloc(tile->comps,image->numcomps*sizeof(opj_tcd_tilecomp_t)); */
+		for (compno = 0; compno < tile->numcomps; compno++) {
+			opj_tccp_t *tccp = &tcp->tccps[compno];
+			
+			opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
+
+			/* border of each tile component (global) */
+			tilec->x0 = int_ceildiv(tile->x0, image->comps[compno].dx);
+			tilec->y0 = int_ceildiv(tile->y0, image->comps[compno].dy);
+			tilec->x1 = int_ceildiv(tile->x1, image->comps[compno].dx);
+			tilec->y1 = int_ceildiv(tile->y1, image->comps[compno].dy);
+			
+			tilec->data = (int *) opj_aligned_malloc((tilec->x1 - tilec->x0) * (tilec->y1 - tilec->y0) * sizeof(int));
+			tilec->numresolutions = tccp->numresolutions;
+			/* tilec->resolutions=(opj_tcd_resolution_t*)opj_realloc(tilec->resolutions,tilec->numresolutions*sizeof(opj_tcd_resolution_t)); */
+			for (resno = 0; resno < tilec->numresolutions; resno++) {
+				int pdx, pdy;
+
+				int levelno = tilec->numresolutions - 1 - resno;
+				int tlprcxstart, tlprcystart, brprcxend, brprcyend;
+				int tlcbgxstart, tlcbgystart, brcbgxend, brcbgyend;
+				int cbgwidthexpn, cbgheightexpn;
+				int cblkwidthexpn, cblkheightexpn;
+				
+				opj_tcd_resolution_t *res = &tilec->resolutions[resno];
+
+				/* border for each resolution level (global) */
+				res->x0 = int_ceildivpow2(tilec->x0, levelno);
+				res->y0 = int_ceildivpow2(tilec->y0, levelno);
+				res->x1 = int_ceildivpow2(tilec->x1, levelno);
+				res->y1 = int_ceildivpow2(tilec->y1, levelno);	
+				res->numbands = resno == 0 ? 1 : 3;
+
+				/* p. 35, table A-23, ISO/IEC FDIS154444-1 : 2000 (18 august 2000) */
+				if (tccp->csty & J2K_CCP_CSTY_PRT) {
+					pdx = tccp->prcw[resno];
+					pdy = tccp->prch[resno];
+				} else {
+					pdx = 15;
+					pdy = 15;
+				}
+				/* p. 64, B.6, ISO/IEC FDIS15444-1 : 2000 (18 august 2000)  */
+				tlprcxstart = int_floordivpow2(res->x0, pdx) << pdx;
+				tlprcystart = int_floordivpow2(res->y0, pdy) << pdy;
+				brprcxend = int_ceildivpow2(res->x1, pdx) << pdx;
+				brprcyend = int_ceildivpow2(res->y1, pdy) << pdy;
+				
+				res->pw = (brprcxend - tlprcxstart) >> pdx;
+				res->ph = (brprcyend - tlprcystart) >> pdy;
+				
+				if (resno == 0) {
+					tlcbgxstart = tlprcxstart;
+					tlcbgystart = tlprcystart;
+					brcbgxend = brprcxend;
+					brcbgyend = brprcyend;
+					cbgwidthexpn = pdx;
+					cbgheightexpn = pdy;
+				} else {
+					tlcbgxstart = int_ceildivpow2(tlprcxstart, 1);
+					tlcbgystart = int_ceildivpow2(tlprcystart, 1);
+					brcbgxend = int_ceildivpow2(brprcxend, 1);
+					brcbgyend = int_ceildivpow2(brprcyend, 1);
+					cbgwidthexpn = pdx - 1;
+					cbgheightexpn = pdy - 1;
+				}
+				
+				cblkwidthexpn = int_min(tccp->cblkw, cbgwidthexpn);
+				cblkheightexpn = int_min(tccp->cblkh, cbgheightexpn);
+				
+				for (bandno = 0; bandno < res->numbands; bandno++) {
+					int x0b, y0b;
+					int gain, numbps;
+					opj_stepsize_t *ss = NULL;
+
+					opj_tcd_band_t *band = &res->bands[bandno];
+
+					band->bandno = resno == 0 ? 0 : bandno + 1;
+					x0b = (band->bandno == 1) || (band->bandno == 3) ? 1 : 0;
+					y0b = (band->bandno == 2) || (band->bandno == 3) ? 1 : 0;
+					
+					if (band->bandno == 0) {
+						/* band border */
+						band->x0 = int_ceildivpow2(tilec->x0, levelno);
+						band->y0 = int_ceildivpow2(tilec->y0, levelno);
+						band->x1 = int_ceildivpow2(tilec->x1, levelno);
+						band->y1 = int_ceildivpow2(tilec->y1, levelno);
+					} else {
+						band->x0 = int_ceildivpow2(tilec->x0 - (1 << levelno) * x0b, levelno + 1);
+						band->y0 = int_ceildivpow2(tilec->y0 - (1 << levelno) * y0b, levelno + 1);
+						band->x1 = int_ceildivpow2(tilec->x1 - (1 << levelno) * x0b, levelno + 1);
+						band->y1 = int_ceildivpow2(tilec->y1 - (1 << levelno) * y0b, levelno + 1);
+					}
+					
+					ss = &tccp->stepsizes[resno == 0 ? 0 : 3 * (resno - 1) + bandno + 1];
+					gain = tccp->qmfbid == 0 ? dwt_getgain_real(band->bandno) : dwt_getgain(band->bandno);
+					numbps = image->comps[compno].prec + gain;
+					band->stepsize = (float)((1.0 + ss->mant / 2048.0) * pow(2.0, numbps - ss->expn));
+					band->numbps = ss->expn + tccp->numgbits - 1;	/* WHY -1 ? */
+					
+					for (precno = 0; precno < res->pw * res->ph; precno++) {
+						int tlcblkxstart, tlcblkystart, brcblkxend, brcblkyend;
+
+						int cbgxstart = tlcbgxstart + (precno % res->pw) * (1 << cbgwidthexpn);
+						int cbgystart = tlcbgystart + (precno / res->pw) * (1 << cbgheightexpn);
+						int cbgxend = cbgxstart + (1 << cbgwidthexpn);
+						int cbgyend = cbgystart + (1 << cbgheightexpn);
+						
+						opj_tcd_precinct_t *prc = &band->precincts[precno];
+
+						/* precinct size (global) */
+						prc->x0 = int_max(cbgxstart, band->x0);
+						prc->y0 = int_max(cbgystart, band->y0);
+						prc->x1 = int_min(cbgxend, band->x1);
+						prc->y1 = int_min(cbgyend, band->y1);
+
+						tlcblkxstart = int_floordivpow2(prc->x0, cblkwidthexpn) << cblkwidthexpn;
+						tlcblkystart = int_floordivpow2(prc->y0, cblkheightexpn) << cblkheightexpn;
+						brcblkxend = int_ceildivpow2(prc->x1, cblkwidthexpn) << cblkwidthexpn;
+						brcblkyend = int_ceildivpow2(prc->y1, cblkheightexpn) << cblkheightexpn;
+						prc->cw = (brcblkxend - tlcblkxstart) >> cblkwidthexpn;
+						prc->ch = (brcblkyend - tlcblkystart) >> cblkheightexpn;
+
+						opj_free(prc->cblks.enc);
+						prc->cblks.enc = (opj_tcd_cblk_enc_t*) opj_calloc(prc->cw * prc->ch, sizeof(opj_tcd_cblk_enc_t));
+
+						if (prc->incltree != NULL) {
+							tgt_destroy(prc->incltree);
+						}
+						if (prc->imsbtree != NULL) {
+							tgt_destroy(prc->imsbtree);
+						}
+						
+						prc->incltree = tgt_create(prc->cw, prc->ch);
+						prc->imsbtree = tgt_create(prc->cw, prc->ch);
+
+						for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
+							int cblkxstart = tlcblkxstart + (cblkno % prc->cw) * (1 << cblkwidthexpn);
+							int cblkystart = tlcblkystart + (cblkno / prc->cw) * (1 << cblkheightexpn);
+							int cblkxend = cblkxstart + (1 << cblkwidthexpn);
+							int cblkyend = cblkystart + (1 << cblkheightexpn);
+
+							opj_tcd_cblk_enc_t* cblk = &prc->cblks.enc[cblkno];
+
+							/* code-block size (global) */
+							cblk->x0 = int_max(cblkxstart, prc->x0);
+							cblk->y0 = int_max(cblkystart, prc->y0);
+							cblk->x1 = int_min(cblkxend, prc->x1);
+							cblk->y1 = int_min(cblkyend, prc->y1);
+							cblk->data = (unsigned char*) opj_calloc(8192, sizeof(unsigned char));
+							cblk->layers = (opj_tcd_layer_t*) opj_calloc(100, sizeof(opj_tcd_layer_t));
+							cblk->passes = (opj_tcd_pass_t*) opj_calloc(100, sizeof(opj_tcd_pass_t));
+						}
+					} /* precno */
+				} /* bandno */
+			} /* resno */
+		} /* compno */
+	} /* tileno */
+
+	/* tcd_dump(stdout, tcd, &tcd->tcd_image); */
+}
+
+void tcd_malloc_decode(opj_tcd_t *tcd, opj_image_t * image, opj_cp_t * cp) {
+	int i, j, tileno, p, q;
+	unsigned int x0 = 0, y0 = 0, x1 = 0, y1 = 0, w, h;
+
+	tcd->image = image;
+	tcd->tcd_image->tw = cp->tw;
+	tcd->tcd_image->th = cp->th;
+	tcd->tcd_image->tiles = (opj_tcd_tile_t *) opj_malloc(cp->tw * cp->th * sizeof(opj_tcd_tile_t));
+
+	/* 
+	Allocate place to store the decoded data = final image
+	Place limited by the tile really present in the codestream 
+	*/
+
+	for (j = 0; j < cp->tileno_size; j++) {
+		opj_tcd_tile_t *tile;
+		
+		tileno = cp->tileno[j];		
+		tile = &(tcd->tcd_image->tiles[cp->tileno[tileno]]);		
+		tile->numcomps = image->numcomps;
+		tile->comps = (opj_tcd_tilecomp_t*) opj_calloc(image->numcomps, sizeof(opj_tcd_tilecomp_t));
+	}
+
+	for (i = 0; i < image->numcomps; i++) {
+		for (j = 0; j < cp->tileno_size; j++) {
+			opj_tcd_tile_t *tile;
+			opj_tcd_tilecomp_t *tilec;
+			
+			/* cfr p59 ISO/IEC FDIS15444-1 : 2000 (18 august 2000) */
+			
+			tileno = cp->tileno[j];
+			
+			tile = &(tcd->tcd_image->tiles[cp->tileno[tileno]]);
+			tilec = &tile->comps[i];
+			
+			p = tileno % cp->tw;	/* si numerotation matricielle .. */
+			q = tileno / cp->tw;	/* .. coordonnees de la tile (q,p) q pour ligne et p pour colonne */
+			
+			/* 4 borders of the tile rescale on the image if necessary */
+			tile->x0 = int_max(cp->tx0 + p * cp->tdx, image->x0);
+			tile->y0 = int_max(cp->ty0 + q * cp->tdy, image->y0);
+			tile->x1 = int_min(cp->tx0 + (p + 1) * cp->tdx, image->x1);
+			tile->y1 = int_min(cp->ty0 + (q + 1) * cp->tdy, image->y1);
+
+			tilec->x0 = int_ceildiv(tile->x0, image->comps[i].dx);
+			tilec->y0 = int_ceildiv(tile->y0, image->comps[i].dy);
+			tilec->x1 = int_ceildiv(tile->x1, image->comps[i].dx);
+			tilec->y1 = int_ceildiv(tile->y1, image->comps[i].dy);
+
+			x0 = j == 0 ? tilec->x0 : int_min(x0, (unsigned int) tilec->x0);
+			y0 = j == 0 ? tilec->y0 : int_min(y0,	(unsigned int) tilec->x0);
+			x1 = j == 0 ? tilec->x1 : int_max(x1,	(unsigned int) tilec->x1);
+			y1 = j == 0 ? tilec->y1 : int_max(y1,	(unsigned int) tilec->y1);
+		}
+
+		w = int_ceildivpow2(x1 - x0, image->comps[i].factor);
+		h = int_ceildivpow2(y1 - y0, image->comps[i].factor);
+
+		image->comps[i].w = w;
+		image->comps[i].h = h;
+		image->comps[i].x0 = x0;
+		image->comps[i].y0 = y0;
+	}
+}
+
+void tcd_malloc_decode_tile(opj_tcd_t *tcd, opj_image_t * image, opj_cp_t * cp, int tileno, opj_codestream_info_t *cstr_info) {
+	int compno, resno, bandno, precno, cblkno;
+	opj_tcp_t *tcp;
+	opj_tcd_tile_t *tile;
+
+	tcd->cp = cp;
+	
+	tcp = &(cp->tcps[cp->tileno[tileno]]);
+	tile = &(tcd->tcd_image->tiles[cp->tileno[tileno]]);
+	
+	tileno = cp->tileno[tileno];
+	
+	for (compno = 0; compno < tile->numcomps; compno++) {
+		opj_tccp_t *tccp = &tcp->tccps[compno];
+		opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
+		
+		/* border of each tile component (global) */
+		tilec->x0 = int_ceildiv(tile->x0, image->comps[compno].dx);
+		tilec->y0 = int_ceildiv(tile->y0, image->comps[compno].dy);
+		tilec->x1 = int_ceildiv(tile->x1, image->comps[compno].dx);
+		tilec->y1 = int_ceildiv(tile->y1, image->comps[compno].dy);
+
+		tilec->numresolutions = tccp->numresolutions;
+		tilec->resolutions = (opj_tcd_resolution_t *) opj_malloc(tilec->numresolutions * sizeof(opj_tcd_resolution_t));
+		
+		for (resno = 0; resno < tilec->numresolutions; resno++) {
+			int pdx, pdy;
+			int levelno = tilec->numresolutions - 1 - resno;
+			int tlprcxstart, tlprcystart, brprcxend, brprcyend;
+			int tlcbgxstart, tlcbgystart, brcbgxend, brcbgyend;
+			int cbgwidthexpn, cbgheightexpn;
+			int cblkwidthexpn, cblkheightexpn;
+			
+			opj_tcd_resolution_t *res = &tilec->resolutions[resno];
+			
+			/* border for each resolution level (global) */
+			res->x0 = int_ceildivpow2(tilec->x0, levelno);
+			res->y0 = int_ceildivpow2(tilec->y0, levelno);
+			res->x1 = int_ceildivpow2(tilec->x1, levelno);
+			res->y1 = int_ceildivpow2(tilec->y1, levelno);
+			res->numbands = resno == 0 ? 1 : 3;
+			
+			/* p. 35, table A-23, ISO/IEC FDIS154444-1 : 2000 (18 august 2000) */
+			if (tccp->csty & J2K_CCP_CSTY_PRT) {
+				pdx = tccp->prcw[resno];
+				pdy = tccp->prch[resno];
+			} else {
+				pdx = 15;
+				pdy = 15;
+			}			
+			
+			/* p. 64, B.6, ISO/IEC FDIS15444-1 : 2000 (18 august 2000)  */
+			tlprcxstart = int_floordivpow2(res->x0, pdx) << pdx;
+			tlprcystart = int_floordivpow2(res->y0, pdy) << pdy;
+			brprcxend = int_ceildivpow2(res->x1, pdx) << pdx;
+			brprcyend = int_ceildivpow2(res->y1, pdy) << pdy;
+			
+			res->pw = (res->x0 == res->x1) ? 0 : ((brprcxend - tlprcxstart) >> pdx);
+			res->ph = (res->y0 == res->y1) ? 0 : ((brprcyend - tlprcystart) >> pdy);
+			
+			if (resno == 0) {
+				tlcbgxstart = tlprcxstart;
+				tlcbgystart = tlprcystart;
+				brcbgxend = brprcxend;
+				brcbgyend = brprcyend;
+				cbgwidthexpn = pdx;
+				cbgheightexpn = pdy;
+			} else {
+				tlcbgxstart = int_ceildivpow2(tlprcxstart, 1);
+				tlcbgystart = int_ceildivpow2(tlprcystart, 1);
+				brcbgxend = int_ceildivpow2(brprcxend, 1);
+				brcbgyend = int_ceildivpow2(brprcyend, 1);
+				cbgwidthexpn = pdx - 1;
+				cbgheightexpn = pdy - 1;
+			}
+			
+			cblkwidthexpn = int_min(tccp->cblkw, cbgwidthexpn);
+			cblkheightexpn = int_min(tccp->cblkh, cbgheightexpn);
+			
+			for (bandno = 0; bandno < res->numbands; bandno++) {
+				int x0b, y0b;
+				int gain, numbps;
+				opj_stepsize_t *ss = NULL;
+				
+				opj_tcd_band_t *band = &res->bands[bandno];
+				band->bandno = resno == 0 ? 0 : bandno + 1;
+				x0b = (band->bandno == 1) || (band->bandno == 3) ? 1 : 0;
+				y0b = (band->bandno == 2) || (band->bandno == 3) ? 1 : 0;
+				
+				if (band->bandno == 0) {
+					/* band border (global) */
+					band->x0 = int_ceildivpow2(tilec->x0, levelno);
+					band->y0 = int_ceildivpow2(tilec->y0, levelno);
+					band->x1 = int_ceildivpow2(tilec->x1, levelno);
+					band->y1 = int_ceildivpow2(tilec->y1, levelno);
+				} else {
+					/* band border (global) */
+					band->x0 = int_ceildivpow2(tilec->x0 - (1 << levelno) * x0b, levelno + 1);
+					band->y0 = int_ceildivpow2(tilec->y0 - (1 << levelno) * y0b, levelno + 1);
+					band->x1 = int_ceildivpow2(tilec->x1 - (1 << levelno) * x0b, levelno + 1);
+					band->y1 = int_ceildivpow2(tilec->y1 - (1 << levelno) * y0b, levelno + 1);
+				}
+				
+				ss = &tccp->stepsizes[resno == 0 ? 0 : 3 * (resno - 1) + bandno + 1];
+				gain = tccp->qmfbid == 0 ? dwt_getgain_real(band->bandno) : dwt_getgain(band->bandno);
+				numbps = image->comps[compno].prec + gain;
+				band->stepsize = (float)(((1.0 + ss->mant / 2048.0) * pow(2.0, numbps - ss->expn)) * 0.5);
+				band->numbps = ss->expn + tccp->numgbits - 1;	/* WHY -1 ? */
+				
+				band->precincts = (opj_tcd_precinct_t *) opj_malloc(res->pw * res->ph * sizeof(opj_tcd_precinct_t));
+				
+				for (precno = 0; precno < res->pw * res->ph; precno++) {
+					int tlcblkxstart, tlcblkystart, brcblkxend, brcblkyend;
+					int cbgxstart = tlcbgxstart + (precno % res->pw) * (1 << cbgwidthexpn);
+					int cbgystart = tlcbgystart + (precno / res->pw) * (1 << cbgheightexpn);
+					int cbgxend = cbgxstart + (1 << cbgwidthexpn);
+					int cbgyend = cbgystart + (1 << cbgheightexpn);
+					
+					opj_tcd_precinct_t *prc = &band->precincts[precno];
+					/* precinct size (global) */
+					prc->x0 = int_max(cbgxstart, band->x0);
+					prc->y0 = int_max(cbgystart, band->y0);
+					prc->x1 = int_min(cbgxend, band->x1);
+					prc->y1 = int_min(cbgyend, band->y1);
+					
+					tlcblkxstart = int_floordivpow2(prc->x0, cblkwidthexpn) << cblkwidthexpn;
+					tlcblkystart = int_floordivpow2(prc->y0, cblkheightexpn) << cblkheightexpn;
+					brcblkxend = int_ceildivpow2(prc->x1, cblkwidthexpn) << cblkwidthexpn;
+					brcblkyend = int_ceildivpow2(prc->y1, cblkheightexpn) << cblkheightexpn;
+					prc->cw = (brcblkxend - tlcblkxstart) >> cblkwidthexpn;
+					prc->ch = (brcblkyend - tlcblkystart) >> cblkheightexpn;
+
+					prc->cblks.dec = (opj_tcd_cblk_dec_t*) opj_malloc(prc->cw * prc->ch * sizeof(opj_tcd_cblk_dec_t));
+
+					prc->incltree = tgt_create(prc->cw, prc->ch);
+					prc->imsbtree = tgt_create(prc->cw, prc->ch);
+					
+					for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
+						int cblkxstart = tlcblkxstart + (cblkno % prc->cw) * (1 << cblkwidthexpn);
+						int cblkystart = tlcblkystart + (cblkno / prc->cw) * (1 << cblkheightexpn);
+						int cblkxend = cblkxstart + (1 << cblkwidthexpn);
+						int cblkyend = cblkystart + (1 << cblkheightexpn);					
+
+						opj_tcd_cblk_dec_t* cblk = &prc->cblks.dec[cblkno];
+						cblk->data = NULL;
+						cblk->segs = NULL;
+						/* code-block size (global) */
+						cblk->x0 = int_max(cblkxstart, prc->x0);
+						cblk->y0 = int_max(cblkystart, prc->y0);
+						cblk->x1 = int_min(cblkxend, prc->x1);
+						cblk->y1 = int_min(cblkyend, prc->y1);
+						cblk->numsegs = 0;
+					}
+				} /* precno */
+			} /* bandno */
+		} /* resno */
+	} /* compno */
+	/* tcd_dump(stdout, tcd, &tcd->tcd_image); */
+}
+
+void tcd_makelayer_fixed(opj_tcd_t *tcd, int layno, int final) {
+	int compno, resno, bandno, precno, cblkno;
+	int value;			/*, matrice[tcd_tcp->numlayers][tcd_tile->comps[0].numresolutions][3]; */
+	int matrice[10][10][3];
+	int i, j, k;
+
+	opj_cp_t *cp = tcd->cp;
+	opj_tcd_tile_t *tcd_tile = tcd->tcd_tile;
+	opj_tcp_t *tcd_tcp = tcd->tcp;
+
+	/*matrice=(int*)opj_malloc(tcd_tcp->numlayers*tcd_tile->comps[0].numresolutions*3*sizeof(int)); */
+	
+	for (compno = 0; compno < tcd_tile->numcomps; compno++) {
+		opj_tcd_tilecomp_t *tilec = &tcd_tile->comps[compno];
+		for (i = 0; i < tcd_tcp->numlayers; i++) {
+			for (j = 0; j < tilec->numresolutions; j++) {
+				for (k = 0; k < 3; k++) {
+					matrice[i][j][k] =
+						(int) (cp->matrice[i * tilec->numresolutions * 3 + j * 3 + k] 
+						* (float) (tcd->image->comps[compno].prec / 16.0));
+				}
+			}
+		}
+        
+		for (resno = 0; resno < tilec->numresolutions; resno++) {
+			opj_tcd_resolution_t *res = &tilec->resolutions[resno];
+			for (bandno = 0; bandno < res->numbands; bandno++) {
+				opj_tcd_band_t *band = &res->bands[bandno];
+				for (precno = 0; precno < res->pw * res->ph; precno++) {
+					opj_tcd_precinct_t *prc = &band->precincts[precno];
+					for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
+						opj_tcd_cblk_enc_t *cblk = &prc->cblks.enc[cblkno];
+						opj_tcd_layer_t *layer = &cblk->layers[layno];
+						int n;
+						int imsb = tcd->image->comps[compno].prec - cblk->numbps;	/* number of bit-plan equal to zero */
+						/* Correction of the matrix of coefficient to include the IMSB information */
+						if (layno == 0) {
+							value = matrice[layno][resno][bandno];
+							if (imsb >= value) {
+								value = 0;
+							} else {
+								value -= imsb;
+							}
+						} else {
+							value =	matrice[layno][resno][bandno] -	matrice[layno - 1][resno][bandno];
+							if (imsb >= matrice[layno - 1][resno][bandno]) {
+								value -= (imsb - matrice[layno - 1][resno][bandno]);
+								if (value < 0) {
+									value = 0;
+								}
+							}
+						}
+						
+						if (layno == 0) {
+							cblk->numpassesinlayers = 0;
+						}
+						
+						n = cblk->numpassesinlayers;
+						if (cblk->numpassesinlayers == 0) {
+							if (value != 0) {
+								n = 3 * value - 2 + cblk->numpassesinlayers;
+							} else {
+								n = cblk->numpassesinlayers;
+							}
+						} else {
+							n = 3 * value + cblk->numpassesinlayers;
+						}
+						
+						layer->numpasses = n - cblk->numpassesinlayers;
+						
+						if (!layer->numpasses)
+							continue;
+						
+						if (cblk->numpassesinlayers == 0) {
+							layer->len = cblk->passes[n - 1].rate;
+							layer->data = cblk->data;
+						} else {
+							layer->len = cblk->passes[n - 1].rate - cblk->passes[cblk->numpassesinlayers - 1].rate;
+							layer->data = cblk->data + cblk->passes[cblk->numpassesinlayers - 1].rate;
+						}
+						if (final)
+							cblk->numpassesinlayers = n;
+					}
+				}
+			}
+		}
+	}
+}
+
+void tcd_rateallocate_fixed(opj_tcd_t *tcd) {
+	int layno;
+	for (layno = 0; layno < tcd->tcp->numlayers; layno++) {
+		tcd_makelayer_fixed(tcd, layno, 1);
+	}
+}
+
+void tcd_makelayer(opj_tcd_t *tcd, int layno, double thresh, int final) {
+	int compno, resno, bandno, precno, cblkno, passno;
+	
+	opj_tcd_tile_t *tcd_tile = tcd->tcd_tile;
+
+	tcd_tile->distolayer[layno] = 0;	/* fixed_quality */
+	
+	for (compno = 0; compno < tcd_tile->numcomps; compno++) {
+		opj_tcd_tilecomp_t *tilec = &tcd_tile->comps[compno];
+		for (resno = 0; resno < tilec->numresolutions; resno++) {
+			opj_tcd_resolution_t *res = &tilec->resolutions[resno];
+			for (bandno = 0; bandno < res->numbands; bandno++) {
+				opj_tcd_band_t *band = &res->bands[bandno];
+				for (precno = 0; precno < res->pw * res->ph; precno++) {
+					opj_tcd_precinct_t *prc = &band->precincts[precno];
+					for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
+						opj_tcd_cblk_enc_t *cblk = &prc->cblks.enc[cblkno];
+						opj_tcd_layer_t *layer = &cblk->layers[layno];
+						
+						int n;
+						if (layno == 0) {
+							cblk->numpassesinlayers = 0;
+						}
+						n = cblk->numpassesinlayers;
+						for (passno = cblk->numpassesinlayers; passno < cblk->totalpasses; passno++) {
+							int dr;
+							double dd;
+							opj_tcd_pass_t *pass = &cblk->passes[passno];
+							if (n == 0) {
+								dr = pass->rate;
+								dd = pass->distortiondec;
+							} else {
+								dr = pass->rate - cblk->passes[n - 1].rate;
+								dd = pass->distortiondec - cblk->passes[n - 1].distortiondec;
+							}
+							if (!dr) {
+								if (dd != 0)
+									n = passno + 1;
+								continue;
+							}
+							if (dd / dr >= thresh)
+								n = passno + 1;
+						}
+						layer->numpasses = n - cblk->numpassesinlayers;
+						
+						if (!layer->numpasses) {
+							layer->disto = 0;
+							continue;
+						}
+						if (cblk->numpassesinlayers == 0) {
+							layer->len = cblk->passes[n - 1].rate;
+							layer->data = cblk->data;
+							layer->disto = cblk->passes[n - 1].distortiondec;
+						} else {
+							layer->len = cblk->passes[n - 1].rate -	cblk->passes[cblk->numpassesinlayers - 1].rate;
+							layer->data = cblk->data + cblk->passes[cblk->numpassesinlayers - 1].rate;
+							layer->disto = cblk->passes[n - 1].distortiondec - cblk->passes[cblk->numpassesinlayers - 1].distortiondec;
+						}
+						
+						tcd_tile->distolayer[layno] += layer->disto;	/* fixed_quality */
+						
+						if (final)
+							cblk->numpassesinlayers = n;
+					}
+				}
+			}
+		}
+	}
+}
+
+bool tcd_rateallocate(opj_tcd_t *tcd, unsigned char *dest, int len, opj_codestream_info_t *cstr_info) {
+	int compno, resno, bandno, precno, cblkno, passno, layno;
+	double min, max;
+	double cumdisto[100];	/* fixed_quality */
+	const double K = 1;		/* 1.1; fixed_quality */
+	double maxSE = 0;
+
+	opj_cp_t *cp = tcd->cp;
+	opj_tcd_tile_t *tcd_tile = tcd->tcd_tile;
+	opj_tcp_t *tcd_tcp = tcd->tcp;
+
+	min = DBL_MAX;
+	max = 0;
+	
+	tcd_tile->numpix = 0;		/* fixed_quality */
+	
+	for (compno = 0; compno < tcd_tile->numcomps; compno++) {
+		opj_tcd_tilecomp_t *tilec = &tcd_tile->comps[compno];
+		tilec->numpix = 0;
+
+		for (resno = 0; resno < tilec->numresolutions; resno++) {
+			opj_tcd_resolution_t *res = &tilec->resolutions[resno];
+
+			for (bandno = 0; bandno < res->numbands; bandno++) {
+				opj_tcd_band_t *band = &res->bands[bandno];
+
+				for (precno = 0; precno < res->pw * res->ph; precno++) {
+					opj_tcd_precinct_t *prc = &band->precincts[precno];
+
+					for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) {
+						opj_tcd_cblk_enc_t *cblk = &prc->cblks.enc[cblkno];
+
+						for (passno = 0; passno < cblk->totalpasses; passno++) {
+							opj_tcd_pass_t *pass = &cblk->passes[passno];
+							int dr;
+							double dd, rdslope;
+							if (passno == 0) {
+								dr = pass->rate;
+								dd = pass->distortiondec;
+							} else {
+								dr = pass->rate - cblk->passes[passno - 1].rate;
+								dd = pass->distortiondec - cblk->passes[passno - 1].distortiondec;
+							}
+							if (dr == 0) {
+								continue;
+							}
+							rdslope = dd / dr;
+							if (rdslope < min) {
+								min = rdslope;
+							}
+							if (rdslope > max) {
+								max = rdslope;
+							}
+						} /* passno */
+						
+						/* fixed_quality */
+						tcd_tile->numpix += ((cblk->x1 - cblk->x0) * (cblk->y1 - cblk->y0));
+						tilec->numpix += ((cblk->x1 - cblk->x0) * (cblk->y1 - cblk->y0));
+					} /* cbklno */
+				} /* precno */
+			} /* bandno */
+		} /* resno */
+		
+		maxSE += (((double)(1 << tcd->image->comps[compno].prec) - 1.0) 
+			* ((double)(1 << tcd->image->comps[compno].prec) -1.0)) 
+			* ((double)(tilec->numpix));
+	} /* compno */
+	
+	/* index file */
+	if(cstr_info) {
+		opj_tile_info_t *tile_info = &cstr_info->tile[tcd->tcd_tileno];
+		tile_info->numpix = tcd_tile->numpix;
+		tile_info->distotile = tcd_tile->distotile;
+		tile_info->thresh = (double *) opj_malloc(tcd_tcp->numlayers * sizeof(double));
+	}
+	
+	for (layno = 0; layno < tcd_tcp->numlayers; layno++) {
+		double lo = min;
+		double hi = max;
+		int success = 0;
+		int maxlen = tcd_tcp->rates[layno] ? int_min(((int) ceil(tcd_tcp->rates[layno])), len) : len;
+		double goodthresh = 0;
+		double stable_thresh = 0;
+		int i;
+		double distotarget;		/* fixed_quality */
+		
+		/* fixed_quality */
+		distotarget = tcd_tile->distotile - ((K * maxSE) / pow((float)10, tcd_tcp->distoratio[layno] / 10));
+        
+		/* Don't try to find an optimal threshold but rather take everything not included yet, if
+		  -r xx,yy,zz,0   (disto_alloc == 1 and rates == 0)
+		  -q xx,yy,zz,0	  (fixed_quality == 1 and distoratio == 0)
+		  ==> possible to have some lossy layers and the last layer for sure lossless */
+		if ( ((cp->disto_alloc==1) && (tcd_tcp->rates[layno]>0)) || ((cp->fixed_quality==1) && (tcd_tcp->distoratio[layno]>0))) {
+			opj_t2_t *t2 = t2_create(tcd->cinfo, tcd->image, cp);
+			double thresh = 0;
+
+			for (i = 0; i < 32; i++) {
+				int l = 0;
+				double distoachieved = 0;	/* fixed_quality */
+				thresh = (lo + hi) / 2;
+				
+				tcd_makelayer(tcd, layno, thresh, 0);
+				
+				if (cp->fixed_quality) {	/* fixed_quality */
+					if(cp->cinema){
+						l = t2_encode_packets(t2,tcd->tcd_tileno, tcd_tile, layno + 1, dest, maxlen, cstr_info,tcd->cur_tp_num,tcd->tp_pos,tcd->cur_pino,THRESH_CALC, tcd->cur_totnum_tp);
+						if (l == -999) {
+							lo = thresh;
+							continue;
+						}else{
+           		distoachieved =	layno == 0 ? 
+							tcd_tile->distolayer[0]	: cumdisto[layno - 1] + tcd_tile->distolayer[layno];
+							if (distoachieved < distotarget) {
+								hi=thresh; 
+								stable_thresh = thresh;
+								continue;
+							}else{
+								lo=thresh;
+							}
+						}
+					}else{
+						distoachieved =	(layno == 0) ? 
+							tcd_tile->distolayer[0]	: (cumdisto[layno - 1] + tcd_tile->distolayer[layno]);
+						if (distoachieved < distotarget) {
+							hi = thresh;
+							stable_thresh = thresh;
+							continue;
+						}
+						lo = thresh;
+					}
+				} else {
+					l = t2_encode_packets(t2, tcd->tcd_tileno, tcd_tile, layno + 1, dest, maxlen, cstr_info,tcd->cur_tp_num,tcd->tp_pos,tcd->cur_pino,THRESH_CALC, tcd->cur_totnum_tp);
+					/* TODO: what to do with l ??? seek / tell ??? */
+					/* opj_event_msg(tcd->cinfo, EVT_INFO, "rate alloc: len=%d, max=%d\n", l, maxlen); */
+					if (l == -999) {
+						lo = thresh;
+						continue;
+					}
+					hi = thresh;
+					stable_thresh = thresh;
+				}
+			}
+			success = 1;
+			goodthresh = stable_thresh == 0? thresh : stable_thresh;
+			t2_destroy(t2);
+		} else {
+			success = 1;
+			goodthresh = min;
+		}
+		
+		if (!success) {
+			return false;
+		}
+		
+		if(cstr_info) {	/* Threshold for Marcela Index */
+			cstr_info->tile[tcd->tcd_tileno].thresh[layno] = goodthresh;
+		}
+		tcd_makelayer(tcd, layno, goodthresh, 1);
+        
+		/* fixed_quality */
+		cumdisto[layno] = (layno == 0) ? tcd_tile->distolayer[0] : (cumdisto[layno - 1] + tcd_tile->distolayer[layno]);	
+	}
+
+	return true;
+}
+
+int tcd_encode_tile(opj_tcd_t *tcd, int tileno, unsigned char *dest, int len, opj_codestream_info_t *cstr_info) {
+	int compno;
+	int l, i, numpacks = 0;
+	opj_tcd_tile_t *tile = NULL;
+	opj_tcp_t *tcd_tcp = NULL;
+	opj_cp_t *cp = NULL;
+
+	opj_tcp_t *tcp = &tcd->cp->tcps[0];
+	opj_tccp_t *tccp = &tcp->tccps[0];
+	opj_image_t *image = tcd->image;
+	
+	opj_t1_t *t1 = NULL;		/* T1 component */
+	opj_t2_t *t2 = NULL;		/* T2 component */
+
+	tcd->tcd_tileno = tileno;
+	tcd->tcd_tile = tcd->tcd_image->tiles;
+	tcd->tcp = &tcd->cp->tcps[tileno];
+
+	tile = tcd->tcd_tile;
+	tcd_tcp = tcd->tcp;
+	cp = tcd->cp;
+
+	if(tcd->cur_tp_num == 0){
+		tcd->encoding_time = opj_clock();	/* time needed to encode a tile */
+		/* INDEX >> "Precinct_nb_X et Precinct_nb_Y" */
+		if(cstr_info) {
+			opj_tcd_tilecomp_t *tilec_idx = &tile->comps[0];	/* based on component 0 */
+			for (i = 0; i < tilec_idx->numresolutions; i++) {
+				opj_tcd_resolution_t *res_idx = &tilec_idx->resolutions[i];
+				
+				cstr_info->tile[tileno].pw[i] = res_idx->pw;
+				cstr_info->tile[tileno].ph[i] = res_idx->ph;
+				
+				numpacks += res_idx->pw * res_idx->ph;
+				
+				cstr_info->tile[tileno].pdx[i] = tccp->prcw[i];
+				cstr_info->tile[tileno].pdy[i] = tccp->prch[i];
+			}
+			cstr_info->tile[tileno].packet = (opj_packet_info_t*) opj_calloc(cstr_info->numcomps * cstr_info->numlayers * numpacks, sizeof(opj_packet_info_t));
+		}
+		/* << INDEX */
+		
+		/*---------------TILE-------------------*/
+		
+		for (compno = 0; compno < tile->numcomps; compno++) {
+			int x, y;
+			
+			int adjust = image->comps[compno].sgnd ? 0 : 1 << (image->comps[compno].prec - 1);
+			int offset_x = int_ceildiv(image->x0, image->comps[compno].dx);
+			int offset_y = int_ceildiv(image->y0, image->comps[compno].dy);
+			
+			opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
+			int tw = tilec->x1 - tilec->x0;
+			int w = int_ceildiv(image->x1 - image->x0, image->comps[compno].dx);
+			
+			/* extract tile data */
+			
+			if (tcd_tcp->tccps[compno].qmfbid == 1) {
+				for (y = tilec->y0; y < tilec->y1; y++) {
+					/* start of the src tile scanline */
+					int *data = &image->comps[compno].data[(tilec->x0 - offset_x) + (y - offset_y) * w];
+					/* start of the dst tile scanline */
+					int *tile_data = &tilec->data[(y - tilec->y0) * tw];
+					for (x = tilec->x0; x < tilec->x1; x++) {
+						*tile_data++ = *data++ - adjust;
+					}
+				}
+			} else if (tcd_tcp->tccps[compno].qmfbid == 0) {
+				for (y = tilec->y0; y < tilec->y1; y++) {
+					/* start of the src tile scanline */
+					int *data = &image->comps[compno].data[(tilec->x0 - offset_x) + (y - offset_y) * w];
+					/* start of the dst tile scanline */
+					int *tile_data = &tilec->data[(y - tilec->y0) * tw];
+					for (x = tilec->x0; x < tilec->x1; x++) {
+						*tile_data++ = (*data++ - adjust) << 11;
+					}
+					
+				}
+			}
+		}
+		
+		/*----------------MCT-------------------*/
+		if (tcd_tcp->mct) {
+			int samples = (tile->comps[0].x1 - tile->comps[0].x0) * (tile->comps[0].y1 - tile->comps[0].y0);
+			if (tcd_tcp->tccps[0].qmfbid == 0) {
+				mct_encode_real(tile->comps[0].data, tile->comps[1].data, tile->comps[2].data, samples);
+			} else {
+				mct_encode(tile->comps[0].data, tile->comps[1].data, tile->comps[2].data, samples);
+			}
+		}
+		
+		/*----------------DWT---------------------*/
+		
+		for (compno = 0; compno < tile->numcomps; compno++) {
+			opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
+			if (tcd_tcp->tccps[compno].qmfbid == 1) {
+				dwt_encode(tilec);
+			} else if (tcd_tcp->tccps[compno].qmfbid == 0) {
+				dwt_encode_real(tilec);
+			}
+		}
+		
+		/*------------------TIER1-----------------*/
+		t1 = t1_create(tcd->cinfo);
+		t1_encode_cblks(t1, tile, tcd_tcp);
+		t1_destroy(t1);
+		
+		/*-----------RATE-ALLOCATE------------------*/
+		
+		/* INDEX */
+		if(cstr_info) {
+			cstr_info->index_write = 0;
+		}
+		if (cp->disto_alloc || cp->fixed_quality) {	/* fixed_quality */
+			/* Normal Rate/distortion allocation */
+			tcd_rateallocate(tcd, dest, len, cstr_info);
+		} else {
+			/* Fixed layer allocation */
+			tcd_rateallocate_fixed(tcd);
+		}
+	}
+	/*--------------TIER2------------------*/
+
+	/* INDEX */
+	if(cstr_info) {
+		cstr_info->index_write = 1;
+	}
+
+	t2 = t2_create(tcd->cinfo, image, cp);
+	l = t2_encode_packets(t2,tileno, tile, tcd_tcp->numlayers, dest, len, cstr_info,tcd->tp_num,tcd->tp_pos,tcd->cur_pino,FINAL_PASS,tcd->cur_totnum_tp);
+	t2_destroy(t2);
+	
+	/*---------------CLEAN-------------------*/
+
+	
+	if(tcd->cur_tp_num == tcd->cur_totnum_tp - 1){
+		tcd->encoding_time = opj_clock() - tcd->encoding_time;
+		opj_event_msg(tcd->cinfo, EVT_INFO, "- tile encoded in %f s\n", tcd->encoding_time);
+
+		/* cleaning memory */
+		for (compno = 0; compno < tile->numcomps; compno++) {
+			opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
+			opj_aligned_free(tilec->data);
+		}
+	}
+
+	return l;
+}
+
+bool tcd_decode_tile(opj_tcd_t *tcd, unsigned char *src, int len, int tileno, opj_codestream_info_t *cstr_info) {
+	int l;
+	int compno;
+	int eof = 0;
+	double tile_time, t1_time, dwt_time;
+	opj_tcd_tile_t *tile = NULL;
+
+	opj_t1_t *t1 = NULL;		/* T1 component */
+	opj_t2_t *t2 = NULL;		/* T2 component */
+	
+	tcd->tcd_tileno = tileno;
+	tcd->tcd_tile = &(tcd->tcd_image->tiles[tileno]);
+	tcd->tcp = &(tcd->cp->tcps[tileno]);
+	tile = tcd->tcd_tile;
+	
+	tile_time = opj_clock();	/* time needed to decode a tile */
+	opj_event_msg(tcd->cinfo, EVT_INFO, "tile %d of %d\n", tileno + 1, tcd->cp->tw * tcd->cp->th);
+
+	/* INDEX >>  */
+	if(cstr_info) {
+		int resno, compno, numprec = 0;
+		for (compno = 0; compno < cstr_info->numcomps; compno++) {
+			opj_tcp_t *tcp = &tcd->cp->tcps[0];
+			opj_tccp_t *tccp = &tcp->tccps[compno];
+			opj_tcd_tilecomp_t *tilec_idx = &tile->comps[compno];	
+			for (resno = 0; resno < tilec_idx->numresolutions; resno++) {
+				opj_tcd_resolution_t *res_idx = &tilec_idx->resolutions[resno];
+				cstr_info->tile[tileno].pw[resno] = res_idx->pw;
+				cstr_info->tile[tileno].ph[resno] = res_idx->ph;
+				numprec += res_idx->pw * res_idx->ph;
+				if (tccp->csty & J2K_CP_CSTY_PRT) {
+					cstr_info->tile[tileno].pdx[resno] = tccp->prcw[resno];
+					cstr_info->tile[tileno].pdy[resno] = tccp->prch[resno];
+				}
+				else {
+					cstr_info->tile[tileno].pdx[resno] = 15;
+					cstr_info->tile[tileno].pdx[resno] = 15;
+				}
+			}
+		}
+		cstr_info->tile[tileno].packet = (opj_packet_info_t *) opj_malloc(cstr_info->numlayers * numprec * sizeof(opj_packet_info_t));
+		cstr_info->packno = 0;
+	}
+	/* << INDEX */
+	
+	/*--------------TIER2------------------*/
+	
+	t2 = t2_create(tcd->cinfo, tcd->image, tcd->cp);
+	l = t2_decode_packets(t2, src, len, tileno, tile, cstr_info);
+	t2_destroy(t2);
+
+	if (l == -999) {
+		eof = 1;
+		opj_event_msg(tcd->cinfo, EVT_ERROR, "tcd_decode: incomplete bistream\n");
+	}
+	
+	/*------------------TIER1-----------------*/
+	
+	t1_time = opj_clock();	/* time needed to decode a tile */
+	t1 = t1_create(tcd->cinfo);
+	for (compno = 0; compno < tile->numcomps; ++compno) {
+		opj_tcd_tilecomp_t* tilec = &tile->comps[compno];
+		/* The +3 is headroom required by the vectorized DWT */
+		tilec->data = (int*) opj_aligned_malloc((((tilec->x1 - tilec->x0) * (tilec->y1 - tilec->y0))+3) * sizeof(int));
+		t1_decode_cblks(t1, tilec, &tcd->tcp->tccps[compno]);
+	}
+	t1_destroy(t1);
+	t1_time = opj_clock() - t1_time;
+	opj_event_msg(tcd->cinfo, EVT_INFO, "- tiers-1 took %f s\n", t1_time);
+	
+	/*----------------DWT---------------------*/
+
+	dwt_time = opj_clock();	/* time needed to decode a tile */
+	for (compno = 0; compno < tile->numcomps; compno++) {
+		opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
+		int numres2decode;
+
+		if (tcd->cp->reduce != 0) {
+			tcd->image->comps[compno].resno_decoded =
+				tile->comps[compno].numresolutions - tcd->cp->reduce - 1;
+			if (tcd->image->comps[compno].resno_decoded < 0) {				
+				opj_event_msg(tcd->cinfo, EVT_ERROR, "Error decoding tile. The number of resolutions to remove [%d+1] is higher than the number "
+					" of resolutions in the original codestream [%d]\nModify the cp_reduce parameter.\n", tcd->cp->reduce, tile->comps[compno].numresolutions);
+				return false;
+			}
+		}
+
+		numres2decode = tcd->image->comps[compno].resno_decoded + 1;
+		if(numres2decode > 0){
+			if (tcd->tcp->tccps[compno].qmfbid == 1) {
+				dwt_decode(tilec, numres2decode);
+			} else {
+				dwt_decode_real(tilec, numres2decode);
+			}
+		}
+	}
+	dwt_time = opj_clock() - dwt_time;
+	opj_event_msg(tcd->cinfo, EVT_INFO, "- dwt took %f s\n", dwt_time);
+
+	/*----------------MCT-------------------*/
+
+	if (tcd->tcp->mct) {
+		int n = (tile->comps[0].x1 - tile->comps[0].x0) * (tile->comps[0].y1 - tile->comps[0].y0);
+		if (tcd->tcp->tccps[0].qmfbid == 1) {
+			mct_decode(
+					tile->comps[0].data,
+					tile->comps[1].data,
+					tile->comps[2].data, 
+					n);
+		} else {
+			mct_decode_real(
+					(float*)tile->comps[0].data,
+					(float*)tile->comps[1].data,
+					(float*)tile->comps[2].data, 
+					n);
+		}
+	}
+
+	/*---------------TILE-------------------*/
+
+	for (compno = 0; compno < tile->numcomps; ++compno) {
+		opj_tcd_tilecomp_t* tilec = &tile->comps[compno];
+		opj_image_comp_t* imagec = &tcd->image->comps[compno];
+		opj_tcd_resolution_t* res = &tilec->resolutions[imagec->resno_decoded];
+		int adjust = imagec->sgnd ? 0 : 1 << (imagec->prec - 1);
+		int min = imagec->sgnd ? -(1 << (imagec->prec - 1)) : 0;
+		int max = imagec->sgnd ?  (1 << (imagec->prec - 1)) - 1 : (1 << imagec->prec) - 1;
+
+		int tw = tilec->x1 - tilec->x0;
+		int w = imagec->w;
+
+		int offset_x = int_ceildivpow2(imagec->x0, imagec->factor);
+		int offset_y = int_ceildivpow2(imagec->y0, imagec->factor);
+
+		int i, j;
+		if(!imagec->data){
+			imagec->data = (int*) opj_malloc(imagec->w * imagec->h * sizeof(int));
+		}
+		if(tcd->tcp->tccps[compno].qmfbid == 1) {
+			for(j = res->y0; j < res->y1; ++j) {
+				for(i = res->x0; i < res->x1; ++i) {
+					int v = tilec->data[i - res->x0 + (j - res->y0) * tw];
+					v += adjust;
+					imagec->data[(i - offset_x) + (j - offset_y) * w] = int_clamp(v, min, max);
+				}
+			}
+		}else{
+			for(j = res->y0; j < res->y1; ++j) {
+				for(i = res->x0; i < res->x1; ++i) {
+					float tmp = ((float*)tilec->data)[i - res->x0 + (j - res->y0) * tw];
+					int v = lrintf(tmp);
+					v += adjust;
+					imagec->data[(i - offset_x) + (j - offset_y) * w] = int_clamp(v, min, max);
+				}
+			}
+		}
+		opj_aligned_free(tilec->data);
+	}
+
+	tile_time = opj_clock() - tile_time;	/* time needed to decode a tile */
+	opj_event_msg(tcd->cinfo, EVT_INFO, "- tile decoded in %f s\n", tile_time);
+
+	if (eof) {
+		return false;
+	}
+	
+	return true;
+}
+
+void tcd_free_decode(opj_tcd_t *tcd) {
+	opj_tcd_image_t *tcd_image = tcd->tcd_image;	
+	opj_free(tcd_image->tiles);
+}
+
+void tcd_free_decode_tile(opj_tcd_t *tcd, int tileno) {
+	int compno,resno,bandno,precno;
+
+	opj_tcd_image_t *tcd_image = tcd->tcd_image;
+
+	opj_tcd_tile_t *tile = &tcd_image->tiles[tileno];
+	for (compno = 0; compno < tile->numcomps; compno++) {
+		opj_tcd_tilecomp_t *tilec = &tile->comps[compno];
+		for (resno = 0; resno < tilec->numresolutions; resno++) {
+			opj_tcd_resolution_t *res = &tilec->resolutions[resno];
+			for (bandno = 0; bandno < res->numbands; bandno++) {
+				opj_tcd_band_t *band = &res->bands[bandno];
+				for (precno = 0; precno < res->ph * res->pw; precno++) {
+					opj_tcd_precinct_t *prec = &band->precincts[precno];
+					if (prec->imsbtree != NULL) tgt_destroy(prec->imsbtree);
+					if (prec->incltree != NULL) tgt_destroy(prec->incltree);
+				}
+				opj_free(band->precincts);
+			}
+		}
+		opj_free(tilec->resolutions);
+	}
+	opj_free(tile->comps);
+}
+
+
diff --git a/extern/libopenjpeg/tcd.h b/extern/libopenjpeg/tcd.h
new file mode 100644
index 00000000000..f0ac5619f1e
--- /dev/null
+++ b/extern/libopenjpeg/tcd.h
@@ -0,0 +1,285 @@
+/*
+ * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2007, Professor Benoit Macq
+ * Copyright (c) 2001-2003, David Janssens
+ * Copyright (c) 2002-2003, Yannick Verschueren
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef __TCD_H
+#define __TCD_H
+/**
+@file tcd.h
+@brief Implementation of a tile coder/decoder (TCD)
+
+The functions in TCD.C have for goal to encode or decode each tile independently from
+each other. The functions in TCD.C are used by some function in J2K.C.
+*/
+
+/** @defgroup TCD TCD - Implementation of a tile coder/decoder */
+/*@{*/
+
+/**
+FIXME: documentation
+*/
+typedef struct opj_tcd_seg {
+  unsigned char** data;
+  int dataindex;
+  int numpasses;
+  int len;
+  int maxpasses;
+  int numnewpasses;
+  int newlen;
+} opj_tcd_seg_t;
+
+/**
+FIXME: documentation
+*/
+typedef struct opj_tcd_pass {
+  int rate;
+  double distortiondec;
+  int term, len;
+} opj_tcd_pass_t;
+
+/**
+FIXME: documentation
+*/
+typedef struct opj_tcd_layer {
+  int numpasses;		/* Number of passes in the layer */
+  int len;			/* len of information */
+  double disto;			/* add for index (Cfr. Marcela) */
+  unsigned char *data;		/* data */
+} opj_tcd_layer_t;
+
+/**
+FIXME: documentation
+*/
+typedef struct opj_tcd_cblk_enc {
+  unsigned char* data;	/* Data */
+  opj_tcd_layer_t* layers;	/* layer information */
+  opj_tcd_pass_t* passes;	/* information about the passes */
+  int x0, y0, x1, y1;		/* dimension of the code-blocks : left upper corner (x0, y0) right low corner (x1,y1) */
+  int numbps;
+  int numlenbits;
+  int numpasses;		/* number of pass already done for the code-blocks */
+  int numpassesinlayers;	/* number of passes in the layer */
+  int totalpasses;		/* total number of passes */
+} opj_tcd_cblk_enc_t;
+
+typedef struct opj_tcd_cblk_dec {
+  unsigned char* data;	/* Data */
+  opj_tcd_seg_t* segs;		/* segments informations */
+	int x0, y0, x1, y1;		/* dimension of the code-blocks : left upper corner (x0, y0) right low corner (x1,y1) */
+  int numbps;
+  int numlenbits;
+  int len;			/* length */
+  int numnewpasses;		/* number of pass added to the code-blocks */
+  int numsegs;			/* number of segments */
+} opj_tcd_cblk_dec_t;
+
+/**
+FIXME: documentation
+*/
+typedef struct opj_tcd_precinct {
+  int x0, y0, x1, y1;		/* dimension of the precinct : left upper corner (x0, y0) right low corner (x1,y1) */
+  int cw, ch;			/* number of precinct in width and heigth */
+  union{		/* code-blocks informations */
+	  opj_tcd_cblk_enc_t* enc;
+	  opj_tcd_cblk_dec_t* dec;
+  } cblks;
+  opj_tgt_tree_t *incltree;		/* inclusion tree */
+  opj_tgt_tree_t *imsbtree;		/* IMSB tree */
+} opj_tcd_precinct_t;
+
+/**
+FIXME: documentation
+*/
+typedef struct opj_tcd_band {
+  int x0, y0, x1, y1;		/* dimension of the subband : left upper corner (x0, y0) right low corner (x1,y1) */
+  int bandno;
+  opj_tcd_precinct_t *precincts;	/* precinct information */
+  int numbps;
+  float stepsize;
+} opj_tcd_band_t;
+
+/**
+FIXME: documentation
+*/
+typedef struct opj_tcd_resolution {
+  int x0, y0, x1, y1;		/* dimension of the resolution level : left upper corner (x0, y0) right low corner (x1,y1) */
+  int pw, ph;
+  int numbands;			/* number sub-band for the resolution level */
+  opj_tcd_band_t bands[3];		/* subband information */
+} opj_tcd_resolution_t;
+
+/**
+FIXME: documentation
+*/
+typedef struct opj_tcd_tilecomp {
+  int x0, y0, x1, y1;		/* dimension of component : left upper corner (x0, y0) right low corner (x1,y1) */
+  int numresolutions;		/* number of resolutions level */
+  opj_tcd_resolution_t *resolutions;	/* resolutions information */
+  int *data;			/* data of the component */
+  int numpix;			/* add fixed_quality */
+} opj_tcd_tilecomp_t;
+
+/**
+FIXME: documentation
+*/
+typedef struct opj_tcd_tile {
+  int x0, y0, x1, y1;		/* dimension of the tile : left upper corner (x0, y0) right low corner (x1,y1) */
+  int numcomps;			/* number of components in tile */
+  opj_tcd_tilecomp_t *comps;	/* Components information */
+  int numpix;			/* add fixed_quality */
+  double distotile;		/* add fixed_quality */
+  double distolayer[100];	/* add fixed_quality */
+  /** packet number */
+  int packno;
+} opj_tcd_tile_t;
+
+/**
+FIXME: documentation
+*/
+typedef struct opj_tcd_image {
+  int tw, th;			/* number of tiles in width and heigth */
+  opj_tcd_tile_t *tiles;		/* Tiles information */
+} opj_tcd_image_t;
+
+/**
+Tile coder/decoder
+*/
+typedef struct opj_tcd {
+	/** Position of the tilepart flag in Progression order*/
+	int tp_pos;
+	/** Tile part number*/
+	int tp_num;
+	/** Current tile part number*/
+	int cur_tp_num;
+	/** Total number of tileparts of the current tile*/
+	int cur_totnum_tp;
+	/** Current Packet iterator number */
+	int cur_pino;
+	/** codec context */
+	opj_common_ptr cinfo;
+
+	/** info on each image tile */
+	opj_tcd_image_t *tcd_image;
+	/** image */
+	opj_image_t *image;
+	/** coding parameters */
+	opj_cp_t *cp;
+	/** pointer to the current encoded/decoded tile */
+	opj_tcd_tile_t *tcd_tile;
+	/** coding/decoding parameters common to all tiles */
+	opj_tcp_t *tcp;
+	/** current encoded/decoded tile */
+	int tcd_tileno;
+	/** Time taken to encode a tile*/
+	double encoding_time;
+} opj_tcd_t;
+
+/** @name Exported functions */
+/*@{*/
+/* ----------------------------------------------------------------------- */
+
+/**
+Dump the content of a tcd structure
+*/
+void tcd_dump(FILE *fd, opj_tcd_t *tcd, opj_tcd_image_t *img);
+/**
+Create a new TCD handle
+@param cinfo Codec context info
+@return Returns a new TCD handle if successful returns NULL otherwise
+*/
+opj_tcd_t* tcd_create(opj_common_ptr cinfo);
+/**
+Destroy a previously created TCD handle
+@param tcd TCD handle to destroy
+*/
+void tcd_destroy(opj_tcd_t *tcd);
+/**
+Initialize the tile coder (allocate the memory)
+@param tcd TCD handle
+@param image Raw image
+@param cp Coding parameters
+@param curtileno Number that identifies the tile that will be encoded
+*/
+void tcd_malloc_encode(opj_tcd_t *tcd, opj_image_t * image, opj_cp_t * cp, int curtileno);
+/**
+Free the memory allocated for encoding
+@param tcd TCD handle
+*/
+void tcd_free_encode(opj_tcd_t *tcd);
+/**
+Initialize the tile coder (reuses the memory allocated by tcd_malloc_encode)
+@param tcd TCD handle
+@param image Raw image
+@param cp Coding parameters
+@param curtileno Number that identifies the tile that will be encoded
+*/
+void tcd_init_encode(opj_tcd_t *tcd, opj_image_t * image, opj_cp_t * cp, int curtileno);
+/**
+Initialize the tile decoder
+@param tcd TCD handle
+@param image Raw image
+@param cp Coding parameters
+*/
+void tcd_malloc_decode(opj_tcd_t *tcd, opj_image_t * image, opj_cp_t * cp);
+void tcd_malloc_decode_tile(opj_tcd_t *tcd, opj_image_t * image, opj_cp_t * cp, int tileno, opj_codestream_info_t *cstr_info);
+void tcd_makelayer_fixed(opj_tcd_t *tcd, int layno, int final);
+void tcd_rateallocate_fixed(opj_tcd_t *tcd);
+void tcd_makelayer(opj_tcd_t *tcd, int layno, double thresh, int final);
+bool tcd_rateallocate(opj_tcd_t *tcd, unsigned char *dest, int len, opj_codestream_info_t *cstr_info);
+/**
+Encode a tile from the raw image into a buffer
+@param tcd TCD handle
+@param tileno Number that identifies one of the tiles to be encoded
+@param dest Destination buffer
+@param len Length of destination buffer
+@param cstr_info Codestream information structure 
+@return 
+*/
+int tcd_encode_tile(opj_tcd_t *tcd, int tileno, unsigned char *dest, int len, opj_codestream_info_t *cstr_info);
+/**
+Decode a tile from a buffer into a raw image
+@param tcd TCD handle
+@param src Source buffer
+@param len Length of source buffer
+@param tileno Number that identifies one of the tiles to be decoded
+*/
+bool tcd_decode_tile(opj_tcd_t *tcd, unsigned char *src, int len, int tileno, opj_codestream_info_t *cstr_info);
+/**
+Free the memory allocated for decoding
+@param tcd TCD handle
+*/
+void tcd_free_decode(opj_tcd_t *tcd);
+void tcd_free_decode_tile(opj_tcd_t *tcd, int tileno);
+
+/* ----------------------------------------------------------------------- */
+/*@}*/
+
+/*@}*/
+
+#endif /* __TCD_H */
diff --git a/extern/libopenjpeg/tgt.c b/extern/libopenjpeg/tgt.c
new file mode 100644
index 00000000000..a5dbcd3cef4
--- /dev/null
+++ b/extern/libopenjpeg/tgt.c
@@ -0,0 +1,213 @@
+/*
+ * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2007, Professor Benoit Macq
+ * Copyright (c) 2001-2003, David Janssens
+ * Copyright (c) 2002-2003, Yannick Verschueren
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "opj_includes.h"
+
+/* 
+==========================================================
+   Tag-tree coder interface
+==========================================================
+*/
+
+opj_tgt_tree_t *tgt_create(int numleafsh, int numleafsv) {
+	int nplh[32];
+	int nplv[32];
+	opj_tgt_node_t *node = NULL;
+	opj_tgt_node_t *parentnode = NULL;
+	opj_tgt_node_t *parentnode0 = NULL;
+	opj_tgt_tree_t *tree = NULL;
+	int i, j, k;
+	int numlvls;
+	int n;
+
+	tree = (opj_tgt_tree_t *) opj_malloc(sizeof(opj_tgt_tree_t));
+	if(!tree) return NULL;
+	tree->numleafsh = numleafsh;
+	tree->numleafsv = numleafsv;
+
+	numlvls = 0;
+	nplh[0] = numleafsh;
+	nplv[0] = numleafsv;
+	tree->numnodes = 0;
+	do {
+		n = nplh[numlvls] * nplv[numlvls];
+		nplh[numlvls + 1] = (nplh[numlvls] + 1) / 2;
+		nplv[numlvls + 1] = (nplv[numlvls] + 1) / 2;
+		tree->numnodes += n;
+		++numlvls;
+	} while (n > 1);
+	
+	/* ADD */
+	if (tree->numnodes == 0) {
+		opj_free(tree);
+		return NULL;
+	}
+
+	tree->nodes = (opj_tgt_node_t*) opj_calloc(tree->numnodes, sizeof(opj_tgt_node_t));
+	if(!tree->nodes) {
+		opj_free(tree);
+		return NULL;
+	}
+
+	node = tree->nodes;
+	parentnode = &tree->nodes[tree->numleafsh * tree->numleafsv];
+	parentnode0 = parentnode;
+	
+	for (i = 0; i < numlvls - 1; ++i) {
+		for (j = 0; j < nplv[i]; ++j) {
+			k = nplh[i];
+			while (--k >= 0) {
+				node->parent = parentnode;
+				++node;
+				if (--k >= 0) {
+					node->parent = parentnode;
+					++node;
+				}
+				++parentnode;
+			}
+			if ((j & 1) || j == nplv[i] - 1) {
+				parentnode0 = parentnode;
+			} else {
+				parentnode = parentnode0;
+				parentnode0 += nplh[i];
+			}
+		}
+	}
+	node->parent = 0;
+	
+	tgt_reset(tree);
+	
+	return tree;
+}
+
+void tgt_destroy(opj_tgt_tree_t *tree) {
+	opj_free(tree->nodes);
+	opj_free(tree);
+}
+
+void tgt_reset(opj_tgt_tree_t *tree) {
+	int i;
+
+	if (NULL == tree)
+		return;
+	
+	for (i = 0; i < tree->numnodes; i++) {
+		tree->nodes[i].value = 999;
+		tree->nodes[i].low = 0;
+		tree->nodes[i].known = 0;
+	}
+}
+
+void tgt_setvalue(opj_tgt_tree_t *tree, int leafno, int value) {
+	opj_tgt_node_t *node;
+	node = &tree->nodes[leafno];
+	while (node && node->value > value) {
+		node->value = value;
+		node = node->parent;
+	}
+}
+
+void tgt_encode(opj_bio_t *bio, opj_tgt_tree_t *tree, int leafno, int threshold) {
+	opj_tgt_node_t *stk[31];
+	opj_tgt_node_t **stkptr;
+	opj_tgt_node_t *node;
+	int low;
+
+	stkptr = stk;
+	node = &tree->nodes[leafno];
+	while (node->parent) {
+		*stkptr++ = node;
+		node = node->parent;
+	}
+	
+	low = 0;
+	for (;;) {
+		if (low > node->low) {
+			node->low = low;
+		} else {
+			low = node->low;
+		}
+		
+		while (low < threshold) {
+			if (low >= node->value) {
+				if (!node->known) {
+					bio_write(bio, 1, 1);
+					node->known = 1;
+				}
+				break;
+			}
+			bio_write(bio, 0, 1);
+			++low;
+		}
+		
+		node->low = low;
+		if (stkptr == stk)
+			break;
+		node = *--stkptr;
+	}
+}
+
+int tgt_decode(opj_bio_t *bio, opj_tgt_tree_t *tree, int leafno, int threshold) {
+	opj_tgt_node_t *stk[31];
+	opj_tgt_node_t **stkptr;
+	opj_tgt_node_t *node;
+	int low;
+
+	stkptr = stk;
+	node = &tree->nodes[leafno];
+	while (node->parent) {
+		*stkptr++ = node;
+		node = node->parent;
+	}
+	
+	low = 0;
+	for (;;) {
+		if (low > node->low) {
+			node->low = low;
+		} else {
+			low = node->low;
+		}
+		while (low < threshold && low < node->value) {
+			if (bio_read(bio, 1)) {
+				node->value = low;
+			} else {
+				++low;
+			}
+		}
+		node->low = low;
+		if (stkptr == stk) {
+			break;
+		}
+		node = *--stkptr;
+	}
+	
+	return (node->value < threshold) ? 1 : 0;
+}
diff --git a/extern/libopenjpeg/tgt.h b/extern/libopenjpeg/tgt.h
new file mode 100644
index 00000000000..c08c8da0af4
--- /dev/null
+++ b/extern/libopenjpeg/tgt.h
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2007, Professor Benoit Macq
+ * Copyright (c) 2001-2003, David Janssens
+ * Copyright (c) 2002-2003, Yannick Verschueren
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __TGT_H
+#define __TGT_H
+/**
+@file tgt.h
+@brief Implementation of a tag-tree coder (TGT)
+
+The functions in TGT.C have for goal to realize a tag-tree coder. The functions in TGT.C
+are used by some function in T2.C.
+*/
+
+/** @defgroup TGT TGT - Implementation of a tag-tree coder */
+/*@{*/
+
+/**
+Tag node
+*/
+typedef struct opj_tgt_node {
+  struct opj_tgt_node *parent;
+  int value;
+  int low;
+  int known;
+} opj_tgt_node_t;
+
+/**
+Tag tree
+*/
+typedef struct opj_tgt_tree {
+  int numleafsh;
+  int numleafsv;
+  int numnodes;
+  opj_tgt_node_t *nodes;
+} opj_tgt_tree_t;
+
+/** @name Exported functions */
+/*@{*/
+/* ----------------------------------------------------------------------- */
+/**
+Create a tag-tree
+@param numleafsh Width of the array of leafs of the tree
+@param numleafsv Height of the array of leafs of the tree
+@return Returns a new tag-tree if successful, returns NULL otherwise
+*/
+opj_tgt_tree_t *tgt_create(int numleafsh, int numleafsv);
+/**
+Destroy a tag-tree, liberating memory
+@param tree Tag-tree to destroy
+*/
+void tgt_destroy(opj_tgt_tree_t *tree);
+/**
+Reset a tag-tree (set all leaves to 0)
+@param tree Tag-tree to reset
+*/
+void tgt_reset(opj_tgt_tree_t *tree);
+/**
+Set the value of a leaf of a tag-tree
+@param tree Tag-tree to modify
+@param leafno Number that identifies the leaf to modify
+@param value New value of the leaf
+*/
+void tgt_setvalue(opj_tgt_tree_t *tree, int leafno, int value);
+/**
+Encode the value of a leaf of the tag-tree up to a given threshold
+@param bio Pointer to a BIO handle
+@param tree Tag-tree to modify
+@param leafno Number that identifies the leaf to encode
+@param threshold Threshold to use when encoding value of the leaf
+*/
+void tgt_encode(opj_bio_t *bio, opj_tgt_tree_t *tree, int leafno, int threshold);
+/**
+Decode the value of a leaf of the tag-tree up to a given threshold
+@param bio Pointer to a BIO handle
+@param tree Tag-tree to decode
+@param leafno Number that identifies the leaf to decode
+@param threshold Threshold to use when decoding value of the leaf
+@return Returns 1 if the node's value < threshold, returns 0 otherwise
+*/
+int tgt_decode(opj_bio_t *bio, opj_tgt_tree_t *tree, int leafno, int threshold);
+/* ----------------------------------------------------------------------- */
+/*@}*/
+
+/*@}*/
+
+#endif /* __TGT_H */
diff --git a/extern/libredcode/AUTHOR b/extern/libredcode/AUTHOR
new file mode 100644
index 00000000000..b3d20a4eb7a
--- /dev/null
+++ b/extern/libredcode/AUTHOR
@@ -0,0 +1 @@
+Peter Schlaile * peter at schlaile dot de
diff --git a/extern/libredcode/LICENSE b/extern/libredcode/LICENSE
new file mode 100644
index 00000000000..14db8fc79db
--- /dev/null
+++ b/extern/libredcode/LICENSE
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA  02111-1307  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) <year>  <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) year 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/libredcode/NOTES b/extern/libredcode/NOTES
new file mode 100644
index 00000000000..39101e0bd63
--- /dev/null
+++ b/extern/libredcode/NOTES
@@ -0,0 +1,23 @@
+This is a redcode decoder written solely by looking at some
+R3D files that are floating around on the web.
+
+This decoder works with the files I tested, but I don't give
+any guarantee (especially, if RED decides to change the
+file format).
+
+That said: I found it a really nice idea of them, to make
+such a clear and comprehensible file layout.
+
+Choosing JPEG2000 as an encoding format and the way, they
+did YCbCr encoding of the sensor data is simply brilliant.
+
+My approach of decoding the sensor data is probably not
+so brilliant, but seems to work rather nicely (and sharply!).
+
+If someone finds a better way and/or RED decides to release
+specification, just go ahead and feel free to change it!
+
+Until that happens: simply enjoy opening RED footage within Blender!
+
+-- Peter Schlaile, June 2008
+
diff --git a/extern/libredcode/SConscript b/extern/libredcode/SConscript
new file mode 100644
index 00000000000..4e83ba5cbb4
--- /dev/null
+++ b/extern/libredcode/SConscript
@@ -0,0 +1,28 @@
+#!/usr/bin/python
+
+import sys
+import os
+import shutil
+
+Import('env')
+
+sources = env.Glob('*.c')
+incs = '. ../libopenjpeg'
+
+root = "extern/libredcode"
+
+if not os.path.isdir(root + "/include"):
+    os.mkdir(root + "/include");
+if not os.path.isdir(root + "/include/redcode"):
+    os.mkdir(root + "/include/redcode");
+
+for h in env.Glob('*.h'):
+    shutil.copyfile(root + "/" + h,
+                    root + "/include/redcode/" + h)
+
+
+env.BlenderLib ( libname='extern_redcode', 
+                 sources=sources, includes=Split(incs),
+                 defines=[],
+                 libtype=['core','intern','player'],
+                 priority=[5, 5, 200], compileflags = [])
diff --git a/extern/libredcode/codec.c b/extern/libredcode/codec.c
new file mode 100644
index 00000000000..e0b79119e80
--- /dev/null
+++ b/extern/libredcode/codec.c
@@ -0,0 +1,141 @@
+#include "codec.h"
+#include "format.h"
+#include "debayer.h"
+
+#include <openjpeg.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+static void error_callback(const char *msg, void *client_data) {
+	FILE *stream = (FILE*)client_data;
+	fprintf(stream, "[R3D ERR] %s", msg);
+}
+
+static void warning_callback(const char *msg, void *client_data) {
+	FILE *stream = (FILE*)client_data;
+	fprintf(stream, "[R3D WARN] %s", msg);
+}
+
+static void info_callback(const char *msg, void *client_data) {
+	(void)client_data;
+	fprintf(stdout, "[R3D INFO] %s", msg);
+}
+
+#define J2K_CFMT 0
+#define JP2_CFMT 1
+#define JPT_CFMT 2
+
+struct redcode_frame_raw * redcode_decode_video_raw(
+	struct redcode_frame * frame, int scale)
+{
+	struct redcode_frame_raw * rv = NULL;
+	opj_dparameters_t parameters;	/* decompression parameters */
+	opj_event_mgr_t event_mgr;		/* event manager */
+	opj_image_t *image = NULL;
+	opj_dinfo_t* dinfo = NULL;	/* handle to a decompressor */
+	opj_cio_t *cio = NULL;
+
+	memset(&event_mgr, 0, sizeof(opj_event_mgr_t));
+	event_mgr.error_handler = error_callback;
+	event_mgr.warning_handler = warning_callback;
+	event_mgr.info_handler = info_callback;
+
+	opj_set_default_decoder_parameters(&parameters);
+
+	parameters.decod_format = JP2_CFMT;
+
+	if (scale == 2) {
+		parameters.cp_reduce = 1;
+	} else if (scale == 4) {
+		parameters.cp_reduce = 2;
+	} else if (scale == 8) {
+		parameters.cp_reduce = 3;
+	}
+
+	/* JPEG 2000 compressed image data */
+	
+	/* get a decoder handle */
+	dinfo = opj_create_decompress(CODEC_JP2);
+
+	/* catch events using our callbacks and give a local context */
+	opj_set_event_mgr((opj_common_ptr)dinfo, &event_mgr, stderr);
+	
+	/* setup the decoder decoding parameters using the current image 
+	   and user parameters */
+	opj_setup_decoder(dinfo, &parameters);
+			
+	/* open a byte stream */
+	cio = opj_cio_open((opj_common_ptr)dinfo, 
+			   frame->data + frame->offset, frame->length);
+
+	image = opj_decode(dinfo, cio);			
+
+	if(!image) {
+		fprintf(stderr, 
+			"ERROR -> j2k_to_image: failed to decode image!\n");
+		opj_destroy_decompress(dinfo);
+		opj_cio_close(cio);
+		return 0;
+	}
+
+	/* close the byte stream */
+	opj_cio_close(cio);
+
+	/* free remaining structures */
+	if(dinfo) {
+		opj_destroy_decompress(dinfo);
+	}
+
+	if((image->numcomps * image->x1 * image->y1) == 0) {
+		opj_image_destroy(image);
+		return 0;
+	}
+		
+	rv = (struct redcode_frame_raw *) calloc(
+		1, sizeof(struct redcode_frame_raw));
+
+	rv->data = image;
+	rv->width = image->comps[0].w;
+	rv->height = image->comps[0].h;
+
+	return rv;
+}
+
+int redcode_decode_video_float(struct redcode_frame_raw * frame, 
+			       float * out, int scale)
+{
+	int* planes[4];
+	int i;
+	opj_image_t *image = (opj_image_t*) frame->data;
+
+	if (image->numcomps != 4) {
+		fprintf(stderr, "R3D: need 4 planes, but got: %d\n",
+			image->numcomps);
+		return 0;
+	}
+
+	for (i = 0; i < 4; i++) {
+		planes[i] = image->comps[i].data;
+	}
+
+	if (scale == 1) {
+		redcode_ycbcr2rgb_fullscale(
+			planes, frame->width, frame->height, out);
+	} else if (scale == 2) {
+		redcode_ycbcr2rgb_halfscale(
+			planes, frame->width, frame->height, out);
+	} else if (scale == 4) {
+		redcode_ycbcr2rgb_quarterscale(
+			planes, frame->width, frame->height, out);
+	}
+
+	opj_image_destroy(image);
+
+	free(frame);
+
+	return 1;
+}
+
+
+
diff --git a/extern/libredcode/codec.h b/extern/libredcode/codec.h
new file mode 100644
index 00000000000..928cab589ed
--- /dev/null
+++ b/extern/libredcode/codec.h
@@ -0,0 +1,34 @@
+#ifndef __redcode_codec_h_included__
+#define __redcode_codec_h_included__
+
+struct redcode_frame;
+
+struct redcode_frame_raw {
+	void * data;
+	int width;
+	int height;
+};
+
+/* do the JPEG2000 decompression into YCbCrY planes */
+struct redcode_frame_raw * redcode_decode_video_raw(
+	struct redcode_frame * frame, int scale);
+
+/* finally decode RAW frame into out-buffer (which has to be allocated
+   in advance)
+
+   Keep in mind: frame_raw-width + height is half sized. 
+   (one pixel contains 2x2 bayer-sensor data)
+
+   output-buffer should have room for
+
+   scale = 1 : width * height * 4 * 4 * sizeof(float)
+   scale = 2 : width * height * 4 * sizeof(float)
+   scale = 4 : width * height * sizeof(float)
+
+*/
+
+int redcode_decode_video_float(struct redcode_frame_raw * frame, 
+			       float * out, int scale);
+
+
+#endif
diff --git a/extern/libredcode/debayer.c b/extern/libredcode/debayer.c
new file mode 100644
index 00000000000..f7f22e1cc54
--- /dev/null
+++ b/extern/libredcode/debayer.c
@@ -0,0 +1,129 @@
+#include "debayer.h"
+
+/* pretty simple but astonishingly very effective "debayer" function 
+ */
+
+void redcode_ycbcr2rgb_fullscale(
+	int ** planes, int width, int height, float * out)
+{
+	int x,y;
+	int pix_max = 4096;
+	int mask = pix_max - 1;
+	float Kb = 0.0722;
+	float Kr = 0.2126;
+	float *o;
+
+	for (y = 0; y < height; y++) {
+		for (x = 0; x < width; x++) {
+			int i = x + y*width;
+			int i_p = (y > 0) ? i-width : i;
+			int i_n = (y < (height-1)) ? i + width : i;
+			float y1n = planes[0][i_n] & mask;
+			float y1  = planes[0][i] & mask;
+			float cb  = (planes[1][i] & mask)   - pix_max/2;
+			float cr  = (planes[2][i] & mask)   - pix_max/2;
+			float y2  = (planes[3][i] & mask);
+			float y2p = (planes[3][i_p] & mask);
+
+			float b_ = cb * (1.0 - Kb)/(pix_max/2);
+			float r_ = cr * (1.0 - Kr)/(pix_max/2);
+			float g_ = (- Kr * r_ - Kb * b_)/(1.0 - Kr - Kb);
+		
+			float y_[4] = {y1 / pix_max, 
+				       (y2 + y2p)/2 / pix_max, 
+				       (y1 + y1n)/2 / pix_max, 
+				       y2 / pix_max};
+
+			int j;
+			int yc = 0;
+
+			o = out + (2*height-1-2*y)*2*4*width 
+				+ x*2*4;
+
+			for (j = 0; j < 8; j += 4) {
+				o[j+0] = r_ + y_[yc];
+				o[j+1] = g_ + y_[yc];
+				o[j+2] = b_ + y_[yc];
+				o[j+3] = 1.0;
+				yc++;
+			}
+			
+			o = out + (2*height-1-2*y)*2*4*width 
+				+ x*2*4 - 2*4*width;
+
+			for (j = 0; j < 8; j += 4) {
+				o[j+0] = r_ + y_[yc];
+				o[j+1] = g_ + y_[yc];
+				o[j+2] = b_ + y_[yc];
+				o[j+3] = 1.0;
+				yc++;
+			}
+		}
+	}
+}
+
+void redcode_ycbcr2rgb_halfscale(
+	int ** planes, int width, int height, float * out)
+{
+	int x,y;
+	int pix_max = 4096;
+	int mask = pix_max - 1;
+	float Kb = 0.0722;
+	float Kr = 0.2126;
+
+	for (y = 0; y < height; y++) {
+		float *o = out + width * (height - y - 1);
+		for (x = 0; x < width; x++) {
+			int i = y*height + x;
+			float y1  = (planes[0][i] & mask);
+			float cb  = (planes[1][i] & mask)  - pix_max/2;
+			float cr  = (planes[2][i] & mask)  - pix_max/2;
+			float y2  = (planes[3][i] & mask);
+
+			float b_ = cb * (1.0 - Kb)/(pix_max/2);
+			float r_ = cr * (1.0 - Kr)/(pix_max/2);
+			float g_ = (- Kr * r_ - Kb * b_)/(1.0 - Kr - Kb);
+			
+			float y = (y1 + y2)/2 / pix_max;
+
+			*o++ = r_ + y;
+			*o++ = g_ + y;
+			*o++ = b_ + y;
+			*o++ = 1.0;
+		}
+	}
+}
+
+
+void redcode_ycbcr2rgb_quarterscale(
+	int ** planes, int width, int height, float * out)
+{
+	int x,y;
+	int pix_max = 4096;
+	int mask = pix_max - 1;
+	float Kb = 0.0722;
+	float Kr = 0.2126;
+
+	for (y = 0; y < height; y += 2) {
+		float *o = out + (width/2) * (height/2 - y/2 - 1);
+		for (x = 0; x < width; x += 2) {
+			int i = y * width + x;
+			float y1  = planes[0][i] & mask;
+			float cb  = (planes[1][i] & mask)  - pix_max/2;
+			float cr  = (planes[2][i] & mask)  - pix_max/2;
+			float y2  = planes[3][i] & mask;
+
+			float b_ = cb * (1.0 - Kb)/(pix_max/2);
+			float r_ = cr * (1.0 - Kr)/(pix_max/2);
+			float g_ = (- Kr * r_ - Kb * b_)/(1.0 - Kr - Kb);
+			
+			float y = (y1 + y2)/2 / pix_max;
+			
+			*o++ = r_ + y;
+			*o++ = g_ + y;
+			*o++ = b_ + y;
+			*o++ = 1.0;
+		}
+	}
+}
+
diff --git a/extern/libredcode/debayer.h b/extern/libredcode/debayer.h
new file mode 100644
index 00000000000..b58c7678671
--- /dev/null
+++ b/extern/libredcode/debayer.h
@@ -0,0 +1,11 @@
+#ifndef __redcode_debayer_h_included__
+#define __redcode_debayer_h_included__ 1
+
+void redcode_ycbcr2rgb_fullscale(
+	int ** planes, int width, int height, float * out);
+void redcode_ycbcr2rgb_halfscale(
+	int ** planes, int width, int height, float * out);
+void redcode_ycbcr2rgb_quarterscale(
+	int ** planes, int width, int height, float * out);
+
+#endif
diff --git a/extern/libredcode/format.c b/extern/libredcode/format.c
new file mode 100644
index 00000000000..35410e9e269
--- /dev/null
+++ b/extern/libredcode/format.c
@@ -0,0 +1,213 @@
+#include <netinet/in.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "format.h"
+
+struct red_reob {
+	unsigned long len;
+	char head[4];
+
+	unsigned long rdvo;
+	unsigned long rdvs;
+	unsigned long rdao;
+	unsigned long rdas;
+
+	unsigned long unknown1;
+	unsigned long unknown2;
+	unsigned long totlen;
+	
+	unsigned long avgv;
+	unsigned long avgs;
+
+	unsigned long unknown3;
+	unsigned long unknown4;
+	unsigned long unknown5;
+};
+
+struct redcode_handle {
+	FILE * fp;
+	struct red_reob * reob;
+        unsigned long * rdvo;
+	unsigned long * rdvs;
+	unsigned long * rdao;
+	unsigned long * rdas;
+	long cfra;
+};
+
+
+static unsigned char* read_packet(FILE * fp, char * expect)
+{
+	unsigned long len;
+	char head[5];
+	unsigned char * rv;
+
+	fread(&len, 4, 1, fp);
+	fread(&head, 4, 1, fp);
+
+	head[4] = 0;
+
+	len = ntohl(len);
+
+	if (strcmp(expect, head) != 0) {
+		fprintf(stderr, "Read: %s, expect: %s\n", head, expect);
+		return NULL;
+	}
+
+	rv = (unsigned char*) malloc(len + 8);
+
+	memcpy(rv, &len, 4);
+	memcpy(rv + 4, &head, 4);
+	
+	fread(rv + 8, len, 1, fp);
+
+	return rv;
+}
+
+static unsigned long * read_index_packet(FILE * fp, char * expect)
+{
+	unsigned long * rv = (unsigned long*) read_packet(fp, expect);
+	int i;
+
+	if (!rv) {
+		return NULL;
+	}
+
+	for (i = 2; i < rv[0]/4; i++) {
+		rv[i] = ntohl(rv[i]);
+	}
+	return rv;
+}
+
+static struct red_reob * read_reob(FILE * fp)
+{
+	fseek(fp, -0x38, SEEK_END);
+
+	return (struct red_reob *) read_index_packet(fp, "REOB");
+}
+
+static unsigned long * read_index(FILE * fp, unsigned long i, char * expect)
+{
+	fseek(fp, i, SEEK_SET);
+	
+	return (unsigned long*) read_index_packet(fp, expect);
+}
+
+static unsigned char * read_data(FILE * fp, unsigned long i, char * expect)
+{
+	fseek(fp, i, SEEK_SET);
+	
+	return read_packet(fp, expect);
+}
+
+struct redcode_handle * redcode_open(const char * fname)
+{
+	struct redcode_handle * rv = NULL;
+	struct red_reob * reob = NULL;
+
+	FILE * fp = fopen(fname, "rb");
+
+	if (!fp) {
+		return NULL;
+	}
+
+	reob = read_reob(fp);
+	if (!reob) {
+		fclose(fp);
+		return NULL;
+	}
+
+	rv = (struct redcode_handle*) calloc(1, sizeof(struct redcode_handle));
+
+	rv->fp = fp;
+	rv->reob = reob;
+	rv->rdvo = read_index(fp, reob->rdvo, "RDVO");
+	rv->rdvs = read_index(fp, reob->rdvs, "RDVS");
+	rv->rdao = read_index(fp, reob->rdao, "RDAO");
+	rv->rdas = read_index(fp, reob->rdas, "RDAS");
+
+	if (!rv->rdvo || !rv->rdvs || !rv->rdao || !rv->rdas) {
+		redcode_close(rv);
+		return NULL;
+	}
+
+	return rv;
+}
+
+void redcode_close(struct redcode_handle * handle)
+{
+	if (handle->reob) {
+		free(handle->reob);
+	}
+	if (handle->rdvo) {
+		free(handle->rdvo);
+	}
+	if (handle->rdvs) {
+		free(handle->rdvs);
+	}
+	if (handle->rdao) {
+		free(handle->rdao);
+	}
+	if (handle->rdas) {
+		free(handle->rdas);
+	}
+	fclose(handle->fp);
+	free(handle);
+}
+
+long redcode_get_length(struct redcode_handle * handle)
+{
+	return handle->rdvo[0]/4;
+}
+
+struct redcode_frame * redcode_read_video_frame(
+	struct redcode_handle * handle, long frame)
+{
+	struct redcode_frame * rv;
+	unsigned char * data;
+
+	if (frame > handle->rdvo[0]/4 || handle->rdvo[frame + 2] == 0) {
+		return NULL;
+	}
+	data = read_data(handle->fp, handle->rdvo[frame + 2], "REDV");
+	if (!data) {
+		return NULL;
+	}
+
+	rv = (struct redcode_frame*) calloc(1, sizeof(struct redcode_frame));
+
+	rv->offset = 12+8;
+	rv->length = *(unsigned long*)data - rv->offset;
+	rv->data = data;
+
+	return rv;
+}
+
+struct redcode_frame * redcode_read_audio_frame(
+	struct redcode_handle * handle, long frame)
+{
+	struct redcode_frame * rv;
+	unsigned char * data;
+
+	if (frame > handle->rdao[0]/4 || handle->rdao[frame + 2] == 0) {
+		return NULL;
+	}
+	data = read_data(handle->fp, handle->rdao[frame+2], "REDA");
+	if (!data) {
+		return NULL;
+	}
+
+	rv = (struct redcode_frame*) calloc(1, sizeof(struct redcode_frame));
+
+	rv->offset = 24+8;
+	rv->length = *(unsigned long*)data - rv->offset;
+	rv->data = data;
+
+	return rv;
+}
+
+void redcode_free_frame(struct redcode_frame * frame)
+{
+	free(frame->data);
+	free(frame);
+}
diff --git a/extern/libredcode/format.h b/extern/libredcode/format.h
new file mode 100644
index 00000000000..e09ea8a3b64
--- /dev/null
+++ b/extern/libredcode/format.h
@@ -0,0 +1,24 @@
+#ifndef __redcode_format_h_included__
+#define __redcode_format_h_included__
+
+struct redcode_handle;
+struct redcode_frame {
+	unsigned long length;
+	unsigned long offset;
+	unsigned char * data;
+};
+
+struct redcode_handle * redcode_open(const char * fname);
+void redcode_close(struct redcode_handle * handle);
+
+long redcode_get_length(struct redcode_handle * handle);
+
+struct redcode_frame * redcode_read_video_frame(
+	struct redcode_handle * handle, long frame);
+struct redcode_frame * redcode_read_audio_frame(
+	struct redcode_handle * handle, long frame);
+
+void redcode_free_frame(struct redcode_frame * frame);
+
+
+#endif
diff --git a/intern/bsp/SConscript b/intern/bsp/SConscript
index e363fd1d4c3..88d2529ae59 100644
--- a/intern/bsp/SConscript
+++ b/intern/bsp/SConscript
@@ -8,5 +8,5 @@ incs = 'intern ../container ../moto/include ../memutil'
 if (env['OURPLATFORM'] == 'win32-mingw'):
     env.BlenderLib ('blender_BSP', sources, Split(incs), [], libtype=['common','intern'], priority=[26,26] )
 else:
-    env.BlenderLib ('blender_BSP', sources, Split(incs), [], libtype='core', priority=15 )
+    env.BlenderLib ('blender_BSP', sources, Split(incs), [], libtype='core', priority=26 )
 
diff --git a/intern/guardedalloc/intern/mmap_win.c b/intern/guardedalloc/intern/mmap_win.c
index cc31cf5174e..436c99344a7 100644
--- a/intern/guardedalloc/intern/mmap_win.c
+++ b/intern/guardedalloc/intern/mmap_win.c
@@ -200,7 +200,6 @@ static void mmap_remlink(volatile mmapListBase *listbase, void *vlink)
 
 static void *mmap_findlink(volatile mmapListBase *listbase, void *ptr)
 {
-	MemMap *mmap_ptr = (MemMap*)ptr;
 	MemMap *mm;
 
 	if (ptr == 0) return NULL;
diff --git a/release/scripts/import_dxf.py b/release/scripts/import_dxf.py
index 88b42e3e564..ce7df610d98 100644
--- a/release/scripts/import_dxf.py
+++ b/release/scripts/import_dxf.py
@@ -1,5 +1,5 @@
 #!BPY
-# coding: utf-8
+
 """
 Name: 'Autodesk DXF (.dxf)'
 Blender: 244
@@ -7,14 +7,15 @@ Group: 'Import'
 Tooltip: 'Import for DXF geometry data (Drawing eXchange Format).'
 """
 __author__ = 'Kitsu(Ed Blake) & migius(Remigiusz Fiedler)'
-__version__ = '1.0.12 - 2008.02.08 by migius'
+__version__ = '1.0.12 - 2008.06.05 by migius'
 __url__ = ["http://blenderartists.org/forum/showthread.php?t=84319",
 	 "http://wiki.blender.org/index.php/Scripts/Manual/Import/DXF-3D"]
 __email__ = ["Kitsune_e(at)yahoo.com", "migius(at)4d-vectors.de"]
 __bpydoc__ = """\
 This script imports objects from DXF (2d/3d) into Blender.
 
-This script imports 2d and 3d geometery from DXFr12 format files.
+This script imports 2d and 3d geometery from DXF files.
+Supported DXF format versions: from (r2.5) r12 up to 2008.
 Enhanced features are:
 - configurable object filtering and geometry manipulation,
 - configurable material pre-processing,
@@ -40,22 +41,23 @@ XREF (External Reference).
 
 Supported DXF>r12 objects:
 ELLIPSE,
-(wip v1.0.12 partly supported) LWPOLYLINE (LightWeight),
-(wip v1.0.12) MLINE,
-(wip v1.0.12) MTEXT
+LWPOLYLINE (LightWeight Polylines),
+(wip v1.0.12) SPLINE,
+(wip v1.0.13) MLINE,
+(wip v1.0.13) MTEXT
 
-Unsupported Objects:
+Unsupported objects:
 DXF r12: DIMENSION.
-DXF>r12: SPLINE, GROUP, RAY/XLINE, LEADER, 3DSOLID, BODY, REGION, dynamic BLOCK
+DXF>r12: GROUP, RAY/XLINE, LEADER, 3DSOLID, BODY, REGION, dynamic BLOCK
 
-Supported Geometry: 2d and 3d DXF-objects.
-Curves imported as curves or meshes optionally.
+Supported geometry: 2d and 3d DXF-objects.
+Curves imported as Blender curves or meshes optionally.
 
 Supported layout modes:
 "model space" is default,
 "paper space" as option (= "layout views")
 
-Scene definitions produced with AVE_RENDER:
+Supported scene definition objescts produced with AVE_RENDER:
 scene: selection of lights assigned to the camera,
 lights: DIRECT, OVERHEAD, SH_SPOT,
 (wip v1.0.13 import of AVE_RENDER material definitions)
@@ -77,14 +79,10 @@ It is recommended to use DXF-object properties for assign Blender materials.
 Notes:
 - Recommend that you run 'RemoveDoubles' on each imported mesh after using this script
 - Blocks are created on layer 19 then referenced at each insert point.
-- Big DXF-files (over 1500 objects) decrease import performance.
+- support for DXF-files up to 160MB on systems with 1GB RAM
+- DXF-files with over 1500 objects decrease import performance.
 The problem is not the inefficiency of python-scripting but Blenders performance
-in creating new objects in his database - probably a database management problem.
-	
-TODO:  
-- the new style object visibility
-- support for real 3d-solids (ACIS)
-- (to see more, search for "--todo--" in script code)
+in creating new objects in scene database - probably a database management problem.
 
 """
 
@@ -92,6 +90,7 @@ TODO:
 History:
  v1.0 - 2008.01. by migius
  planned tasks:
+ -- (to see more, search for "--todo--" in script code)
  -- command-line-mode/batch-mode
  -- in-place-editing for dupliGroups
  -- support for MLINE (is exported to r12 as BLOCK*Unnamed with LINEs)
@@ -102,17 +101,23 @@ History:
  -- added f_layerFilter
  -- to-check: obj/mat/group/_mapping-idea from ideasman42:
  -- curves: added "fill/non-fill" option for closed curves: CIRCLEs,ELLIPSEs,POLYLINEs
- -- bug:? object = Object.Get(obname) -> = SCENE.getChildren(obname)
  -- "normalize Z" option to correct non-planar figures
  -- LINEs need "width" in 3d-space incl vGroups
  -- support width_force for LINEs/ELLIPSEs = "solidify"
  -- add better support for color_index BYLAYER=256, BYBLOCK=0 
- -- bug: "oneMesh" produces sometimes errors
+ -- bug: "oneMesh" produces irregularly errors
  -- bug: Registry recall from hd_cache ?? only win32 bug??
-
- v1.0.12: 2008.02.08 by migius
  -- support DXF-definitions of scene, lights and cameras
  -- support ortho mode for VIEWs and VPORTs as cameras 
+ -- add support for SPLINEs
+
+ v1.0.12: 2008.06.05 by migius
+ b3 bugfix: ob.name conflict with existing meshes (different ob.name/mesh.name)
+ v1.0.12: 2008.05.24 by migius
+ b2 added support for LWPOLYLINEs
+ b2 added support for ProE in readerDXF.py
+ v1.0.12: 2008.02.08 by migius
+ b1 update: object = Object.Get(obname) -> f_getSceChild().getChildren()
  a9 bugfix by non-existing tables views, vports, layers (Kai reported)
  v1.0.12: 2008.01.17 by migius
  a8 lately used INI-dir/filename persistently stored in Registry
@@ -279,9 +284,9 @@ History:
 # --------------------------------------------------------------------------
 
 import Blender
-#import bpy
 from Blender import *
 #from Blender.Mathutils import Vector, Matrix
+import bpy
 #import BPyMessages
 
 from dxfReader import readDXF
@@ -313,6 +318,8 @@ WORLDX = Mathutils.Vector((1,0,0))
 WORLDY = Mathutils.Vector((1,1,0))
 WORLDZ = Mathutils.Vector((0,0,1))
 
+oblist = [] #to be sure, it is an empty list
+
 G_SCALE = 1.0	   #(0.0001-1000) global scaling factor for all dxf data
 G_ORIGIN_X = 0.0   #global translation-vector (x,y,z) in DXF units
 G_ORIGIN_Y = 0.0
@@ -330,6 +337,10 @@ ELEVATION = 0.0 #standard elevation = coordinate Z
 
 TARGET_LAYER = 3	#target blender_layer
 GROUP_BYLAYER = 0   #(0/1) all entities from same layer import into one blender-group
+cur_COUNTER = 0  #counter for progress_bar
+M_OBJ = False
+BYBLOCK = 0
+BYLAYER = 256
 
 FILENAME_MAX = 180	#max length of path+file_name string  (FILE_MAXDIR + FILE_MAXFILE)
 MAX_NAMELENGTH = 17   #max_effective_obnamelength in blender =21=17+(.001)
@@ -342,75 +353,6 @@ AUTO = BezTriple.HandleTypes.AUTO
 FREE = BezTriple.HandleTypes.FREE
 VECT = BezTriple.HandleTypes.VECT
 ALIGN = BezTriple.HandleTypes.ALIGN
-cur_COUNTER = 0  #counter for progress_bar
-
-
-"""This module provides wrapper objects for dxf entities.
-
-	The wrappers expect a "dxf object" as input.  The dxf object is
-	an object with a type and a data attribute.  Type is a lowercase
-	string matching the 0 code of a dxf entity.  Data is a list containing
-	dxf objects or lists of [code, data] pairs.
-
-	This module is not general, and is only for dxf import.
-"""
-
-# from Stani's dxf writer v1.1 (c)www.stani.be (GPL)
-#---color values
-BYBLOCK = 0
-BYLAYER = 256
-
-#---block-type flags (bit coded values, may be combined):
-ANONYMOUS		   =1  # This is an anonymous block generated by hatching, associative dimensioning, other internal operations, or an application
-NON_CONSTANT_ATTRIBUTES =2  # This block has non-constant attribute definitions (this bit is not set if the block has any attribute definitions that are constant, or has no attribute definitions at all)
-XREF					=4  # This block is an external reference (xref)
-XREF_OVERLAY			=8  # This block is an xref overlay
-EXTERNAL				=16 # This block is externally dependent
-RESOLVED				=32 # This is a resolved external reference, or dependent of an external reference (ignored on input)
-REFERENCED	  =64 # This definition is a referenced external reference (ignored on input)
-
-#---polyline flags
-CLOSED			  =1  # This is a closed polyline (or a polygon mesh closed in the M direction)
-CURVE_FIT			   =2  # Curve-fit vertices have been added
-SPLINE_FIT		  =4  # Spline-fit vertices have been added
-POLYLINE_3D	 =8   # This is a 3D polyline
-POLYGON_MESH				=16  # This is a 3D polygon mesh
-CLOSED_N					=32  # The polygon mesh is closed in the N direction
-POLYFACE_MESH		   =64   # The polyline is a polyface mesh
-CONTINOUS_LINETYPE_PATTERN  =128	# The linetype pattern is generated continuously around the vertices of this polyline
-
-#---text flags
-#horizontal
-LEFT		= 0
-CENTER  = 1
-RIGHT   = 2
-ALIGNED  = 3 #if vertical alignment = 0
-MIDDLE  = 4 #if vertical alignment = 0
-FIT   = 5 #if vertical alignment = 0
-#vertical
-BASELINE	= 0
-BOTTOM  = 1
-MIDDLE  = 2
-TOP   = 3
-
-#---mtext flags
-#attachment point
-TOP_LEFT		= 1
-TOP_CENTER  = 2
-TOP_RIGHT   = 3
-MIDDLE_LEFT  = 4
-MIDDLE_CENTER   = 5
-MIDDLE_RIGHT	= 6
-BOTTOM_LEFT  = 7
-BOTTOM_CENTER   = 8
-BOTTOM_RIGHT	= 9
-#drawing direction
-LEFT_RIGHT  = 1
-TOP_BOTTOM  = 3
-BY_STYLE		= 5 #the flow direction is inherited from the associated text style
-#line spacing style (optional):
-AT_LEAST		= 1 #taller characters will override
-EXACT	   = 2 #taller characters will not override
 
 
 class View:  #-----------------------------------------------------------------
@@ -652,6 +594,14 @@ def get_extrusion(data):	 #-------------------------------------------------
 	return vec
 
 
+#------------------------------------------
+def getSceneChild(name):
+	dudu = [i for i in SCENE.objects if i.name==name]
+#	dudu = [i for i in SCENE.getChildren() if i.name==name]
+	#print 'deb:getSceneChild %s -result: %s:' %(name,dudu) #-----------------
+	if dudu!=[]: return dudu[0]
+	return None
+
 
 class Solid:  #-----------------------------------------------------------------
 	"""Class for objects representing dxf SOLID or TRACE.
@@ -754,16 +704,16 @@ class Solid:  #-----------------------------------------------------------------
 			if   l == 4: faces = [[0,1,3,2]]
 			elif l == 3: faces = [[0,1,2]]
 			elif l == 2: edges = [[0,1]]
-
-
-
-		me = Mesh.New(obname)		  # create a new mesh
+		
+		if M_OBJ: obname, me, ob = makeNewObject()
+		else: 
+			me = Mesh.New(obname)		# create a new mesh
+			ob = SCENE.objects.new(me) # create a new mesh_object
 		me.verts.extend(points)		# add vertices to mesh
 		if faces: me.faces.extend(faces)		   # add faces to the mesh
 		if edges: me.edges.extend(edges)		   # add faces to the mesh
 
-		ob = SCENE.objects.new(me) # create a new mesh_object
-		if settings.var['vGroup_on']:
+		if settings.var['vGroup_on'] and not M_OBJ:
 			# each MeshSide becomes vertexGroup for easier material assignment ---------------------
 			replace = Blender.Mesh.AssignModes.ADD  #or .AssignModes.ADD/REPLACE
 			if vg_left: me.addVertGroup('side.left')  ; me.assignVertsToGroup('side.left',  vg_left, 1.0, replace)
@@ -777,9 +727,6 @@ class Solid:  #-----------------------------------------------------------------
 
 		return ob
 
-
-
-
 class Line:  #-----------------------------------------------------------------
 	"""Class for objects representing dxf LINEs.
 	"""
@@ -838,7 +785,7 @@ class Line:  #-----------------------------------------------------------------
 		elif settings.var['lines_as'] == 3: # as thin cylinder
 			cyl_rad = 0.5 * settings.var['width_min']
 
-		if settings.var['lines_as'] == 5: # LINE curve representation-------------------------
+		elif settings.var['lines_as'] == 5: # LINE curve representation-------------------------
 			obname = 'li_%s' %self.layer  # create object name from layer name
 			obname = obname[:MAX_NAMELENGTH]
 
@@ -872,20 +819,23 @@ class Line:  #-----------------------------------------------------------------
 			global activObjectName
 			#print 'deb:draw:line.ob IN activObjectName: ', activObjectName #---------------------
 	
-			if activObjectLayer == self.layer and settings.var['one_mesh_on']:
-				obname = activObjectName
-				#print 'deb:line.draw obname from activObjectName: ', obname #---------------------
-				ob = Object.Get(obname)  # open an existing mesh_object
-				#ob = SCENE.getChildren(obname)  # open an existing mesh_object
-				me = Mesh.Get(ob.name)   # open objects mesh data
-			else:
-				obname = 'li_%s' %self.layer  # create object name from layer name
-				obname = obname[:MAX_NAMELENGTH]
-				me = Mesh.New(obname)		  # create a new mesh
-				ob = SCENE.objects.new(me) # create a new mesh_object
-				activObjectName = ob.name
-				activObjectLayer = self.layer
-				#print ('deb:line.draw new line.ob+mesh:"%s" created!' %ob.name) #---------------------
+			if M_OBJ: obname, me, ob = makeNewObject()
+			else: 
+				if activObjectLayer == self.layer and settings.var['one_mesh_on']:
+					obname = activObjectName
+					#print 'deb:line.draw obname from activObjectName: ', obname #---------------------
+					ob = getSceneChild(obname)  # open an existing mesh_object
+					#ob = SCENE.getChildren(obname)  # open an existing mesh_object
+					#me = Mesh.Get(ob.name)   # open objects mesh data
+					me = ob.getData(name_only=False, mesh=True)
+				else:
+					obname = 'li_%s' %self.layer  # create object name from layer name
+					obname = obname[:MAX_NAMELENGTH]
+					me = Mesh.New(obname)		  # create a new mesh
+					ob = SCENE.objects.new(me) # create a new mesh_object
+					activObjectName = ob.name
+					activObjectLayer = self.layer
+					#print ('deb:line.draw new line.ob+mesh:"%s" created!' %ob.name) #---------------------
 	
 			faces, edges = [], []
 			n = len(me.verts)
@@ -904,7 +854,7 @@ class Line:  #-----------------------------------------------------------------
 			if faces: me.faces.extend(faces)	   # add faces to the mesh
 			if edges: me.edges.extend(edges)	   # add faces to the mesh
 	
-			if settings.var['vGroup_on']:
+			if settings.var['vGroup_on'] and not M_OBJ:
 				# entities with the same color build one vertexGroup for easier material assignment ----
 				ob.link(me) # link mesh to that object
 				vG_name = 'color_%s' %self.color_index
@@ -988,155 +938,23 @@ class Point:  #-----------------------------------------------------------------
 			global activObjectLayer
 			global activObjectName
 			#print 'deb:draw:point.ob IN activObjectName: ', activObjectName #---------------------
-			if activObjectLayer == self.layer and settings.var['one_mesh_on']:
-				obname = activObjectName
-				#print 'deb:draw:point.ob obname from activObjectName: ', obname #---------------------
-				ob = Object.Get(obname)  # open an existing mesh_object
-				#ob = SCENE.getChildren(obname)  # open an existing mesh_object
-				me = Mesh.Get(ob.name)   # open objects mesh data
-			else:
-				me = Mesh.New(obname)		  # create a new mesh
-				ob = SCENE.objects.new(me) # create a new mesh_object
-				activObjectName = ob.name
-				activObjectLayer = self.layer
-				#print ('deb:draw:point new point.ob+mesh:"%s" created!' %ob.name) #---------------------
-			me.verts.extend(points) # add vertices to mesh
-
-		return ob
-
-
-
-class LWpolyline:  #-----------------------------------------------------------------
-	"""Class for objects representing dxf LWPOLYLINEs.
-	"""
-	def __init__(self, obj):
-		"""Expects an entity object of type lwpolyline as input.
-		"""
-		#print 'deb:LWpolyline.START:----------------' #------------------------
-		if not obj.type == 'lwpolyline':
-			raise TypeError, "Wrong type %s for polyline object!" %obj.type
-		self.type = obj.type
-		self.data = obj.data[:]
-
-		# required data
-		self.num_points = obj.get_type(90)[0]
-
-		# optional data (with defaults)
-		self.space = getit(obj, 67, 0)
-
-		self.color_index = getit(obj, 62, BYLAYER)
-
-		self.elevation =  getit(obj, 30, 0)
-		self.thic =  getit(obj, 39, 0)
-		self.flags = getit(obj, 70, 0)
-
-		self.closed = self.flags&1 # byte coded, 1 = closed, 128 = plinegen
-
-		self.layer = getit(obj.data, 8, None)
-		self.points = self.get_points(obj.data)
-		self.extrusion = get_extrusion(obj.data)
-
-		#print 'deb:LWpolyline.obj.data:\n', obj.data #------------------------
-		#print 'deb:LWpolyline.ENDinit:----------------' #------------------------
-
-
-	def get_points(self, data):
-		"""Gets points for a polyline type object.
-
-		LW-Polylines have no fixed number of verts, and
-		each vert can have a number of properties.
-		Verts should be coded as
-		10:xvalue
-		20:yvalue
-		40:startwidth or 0
-		41:endwidth or 0
-		42:bulge or 0
-		for each vert
-		"""
-		num = self.num_points
-		point = None
-		points = []
-		for item in data:
-			if item[0] == 10:   # 10 = x
-				if point:
-					points.append(point)
-				point = Vertex()
-				point.x = item[1]
-			elif item[0] == 20: # 20 = y
-				point.y = item[1]
-			elif item[0] == 40: # 40 = start width
-				point.swidth = item[1]
-			elif item[0] == 41: # 41 = end width
-				point.ewidth = item[1]
-			elif item[0] == 42: # 42 = bulge
-				point.bulge = item[1]
-		points.append(point)
-		return points
-
-
-
-	def __repr__(self):
-		return "%s: layer - %s, points - %s" %(self.__class__.__name__, self.layer, self.points)
-
-
-	def draw(self, settings):
-		"""for LWPOLYLINE: generate Blender_geometry.
-		"""
-		#print 'deb:LWpolyline.draw.START:----------------' #------------------------
-		points = []
-		obname = 'lw_%s' %self.layer  # create object name from layer name
-		obname = obname[:MAX_NAMELENGTH]
-		#settings.var['curves_on'] == True
-		#print 'deb:index_len: ', len(self.points) #------------------
-		for i, point in enumerate(self.points):
-			#print 'deb:index: ', i #------------------
-			if not point.bulge:
-				points.append(point.loc)
-			elif point.bulge and not self.closed and i == len(self.points)-1:
-				points.append(point.loc)
-			elif point.bulge:	 #
-				if i == len(self.points)-1:
-					point2 = self.points[0]
+			if M_OBJ: obname, me, ob = makeNewObject()
+			else: 
+				if activObjectLayer == self.layer and settings.var['one_mesh_on']:
+					obname = activObjectName
+					#print 'deb:draw:point.ob obname from activObjectName: ', obname #---------------------
+					ob = getSceneChild(obname)  # open an existing mesh_object
+					#ob = SCENE.getChildren(obname)  # open an existing mesh_object
+					me = ob.getData(name_only=False, mesh=True)
+					#me = Mesh.Get(ob.name)   # open objects mesh data
 				else:
-					point2 = self.points[i+1]
-				arc_res = settings.var['arc_res']/sqrt(settings.var['arc_rad'])
-				verts, center = calcBulge(point, point2, arc_res)
-#			   if i == len(self.points)-1:
-#				   if self.closed:
-#					   verts.pop() #remove last(=first) vertex
-#			   else:
-#				   verts.pop() #remove last vertex, because this point will be writen as the next vertex
-				points.extend(verts)
-
-		thic = self.thic
-		if settings.var['thick_force'] and thic == 0: thic = settings.var['thick_min']
-		if settings.var['thick_on'] and thic != 0:
-			len1 = len(points)
-			points.extend([[point[0], point[1], point[2]+thic] for point in points])
-			faces = []
-			#print 'deb:len1:', len1  #-----------------------
-			faces = [[num, num+1, num+len1+1, num+len1] for num in xrange(len1 - 1)]
-			if self.closed:
-				faces.append([len1-1, 0, len1, 2*len1-1])
-			#print 'deb:faces_list:\n', faces  #-----------------------
-			me = Mesh.New(obname)		  # create a new mesh
-			ob = SCENE.objects.new(me) # create a new mesh_object
+					me = Mesh.New(obname)		  # create a new mesh
+					ob = SCENE.objects.new(me) # create a new mesh_object
+					activObjectName = ob.name
+					activObjectLayer = self.layer
+					#print ('deb:draw:point new point.ob+mesh:"%s" created!' %ob.name) #---------------------
 			me.verts.extend(points) # add vertices to mesh
-			me.faces.extend(faces)   # add faces to the mesh
-		else:
-			edges = [[num, num+1] for num in xrange(len(points)-1)]
-			if self.closed:
-				edges.append([len(points)-1, 0])
-			#print 'deb:edges_list:\n', edges  #-----------------------
-			me = Mesh.New(obname)		  # create a new mesh
-			ob = SCENE.objects.new(me) # create a new mesh_object
-			me.verts.extend(points) # add vertices to mesh
-			me.edges.extend(edges)   # add edges to the mesh
 
-		ob.LocZ = self.elevation
-		transform(self.extrusion, 0, ob)
-
-		#print 'deb:LWpolyline.draw.END:----------------' #------------------------
 		return ob
 
 
@@ -1172,10 +990,10 @@ class Polyline:  #--------------------------------------------------------------
 		self.plface = self.flags & 64  # 3D-polyface mesh
 		self.contin = self.flags & 128 # the linetype pattern is generated continuously
 
-		if self.poly3d or self.plface or self.plmesh:
-			self.poly2d = False  # its not a 2D-polyline
-		else:
-			self.poly2d = True   # it is a 2D-polyline
+		self.pltype='poly2d'   # default is a 2D-polyline
+		if self.poly3d: self.pltype='poly3d'
+		elif self.plface: self.pltype='plface'
+		elif self.plmesh: self.pltype='plmesh'
 
 		self.swidth =  getit(obj, 40, 0) # default start width
 		self.ewidth =  getit(obj, 41, 0) # default end width
@@ -1213,19 +1031,19 @@ class Polyline:  #--------------------------------------------------------------
 		"""
 		ob = []
 		#---- 3dPolyFace - mesh with free topology
-		if self.plface and settings.drawTypes['plmesh']:
+		if self.pltype=='plface' and settings.drawTypes['plmesh']:
 			ob = self.drawPlFace(settings)
 		#---- 3dPolyMesh - mesh with ortogonal topology
-		elif self.plmesh and settings.drawTypes['plmesh']:
+		elif self.pltype=='plmesh' and settings.drawTypes['plmesh']:
 			ob = self.drawPlMesh(settings)
 		#---- 2dPolyline - plane polyline with arc/wide/thic segments
-		elif (self.poly2d and settings.drawTypes['polyline']):
+		elif self.pltype=='poly2d' and settings.drawTypes['polyline']:
 			if settings.var['plines_as'] == 5: # and self.spline:
 				ob = self.drawPolyCurve(settings)
 			else:
 				ob = self.drawPoly2d(settings)
 		#---- 3dPolyline - non-plane polyline (thin segments = without arc/wide/thic)
-		elif (self.poly3d and settings.drawTypes['pline3']):
+		elif self.pltype=='poly3d' and settings.drawTypes['pline3']:
 			if settings.var['plines3_as'] == 5: # and self.spline:
 				ob = self.drawPolyCurve(settings)
 			else:
@@ -1355,21 +1173,7 @@ class Polyline:  #--------------------------------------------------------------
 		pline = Curve.New(obname)   # create new curve data
 		#pline.setResolu(24) #--todo-----						
 
-		if False: #self.spline:  # NURBSplines-----FAKE(with Bezier)-----
-			#print 'deb:polyline2dCurve.draw self.spline!' #---------------
-			curve = pline.appendNurb(BezTriple.New(d_points[0]))
-			for p in d_points[1:]:
-				curve.append(BezTriple.New(p))
-			for point in curve:
-				point.handleTypes = [AUTO, AUTO]
-			if self.closed:
-				curve.flagU = 1 # Set curve cyclic=close
-			else:
-				curve.flagU = 0 # Set curve not cyclic=open
-				curve[0].handleTypes = [FREE, ALIGN]   #remi--todo-----
-				curve[-1].handleTypes = [ALIGN, FREE]   #remi--todo-----
-
-		elif self.spline:  # NURBSplines-----OK-----
+		if self.spline:  # NURBSplines-----OK-----
 			#print 'deb:polyline2dCurve.draw self.spline!' #---------------
 			weight1 = 0.5
 			weight2 = 1.0
@@ -1562,6 +1366,7 @@ class Polyline:  #--------------------------------------------------------------
 		ewidths = []
 		swidth_default = self.swidth #default start width of POLYLINEs segments
 		ewidth_default = self.ewidth #default end width of POLYLINEs segments
+		#print 'deb:drawPoly2d self.swidth=', self.swidth #------------------------
 		thic = set_thick(self.thic, settings)
 		if self.spline: pline_typ = 'ps'
 		elif self.curved: pline_typ = 'pc'
@@ -1633,9 +1438,11 @@ class Polyline:  #--------------------------------------------------------------
 
 			swidth = point1.swidth
 			ewidth = point1.ewidth
+			#print 'deb:drawPoly2d point1.swidth=', swidth #------------------------
 			if swidth == None: swidth = swidth_default
 			if ewidth == None: ewidth = ewidth_default
 			if swidth != 0.0 or ewidth != 0.0: wide_segment_exist = True
+			#print 'deb:drawPoly2d vertex_swidth=', swidth #------------------------
 
 			if settings.var['width_force']:  # force minimal width for thin segments
 				width_min = settings.var['width_min']
@@ -1819,14 +1626,14 @@ class Polyline:  #--------------------------------------------------------------
 								left_angle = False
 							limit_dist = settings.var['dist_min']
 							if left_angle:  # if left turning angle
-								print 'deb:drawPoly2d it is left turning angle' #-------------
+								#print 'deb:drawPoly2d it is left turning angle' #-------------
 								# to avoid triangelface/doubleVertex
 								delta1 = (cornerpointL - vecL1).normalize() * limit_dist
 								delta4 = (cornerpointL - vecL4).normalize() * limit_dist
 								pointsLc.extend((cornerpointL - delta1, cornerpointL - delta4))
 								pointsRc.extend((pointsRe[i],pointsRs[i+1]))
 							else:  # if right turning angle
-								print 'deb:drawPoly2d right turning angle' #-------------
+								#print 'deb:drawPoly2d right turning angle' #-------------
 								delta1 = (cornerpointR - vecR1).normalize() * limit_dist
 								delta4 = (cornerpointR - vecR4).normalize() * limit_dist
 								pointsRc.extend((cornerpointR - delta1, cornerpointR - delta4))
@@ -1917,8 +1724,10 @@ class Polyline:  #--------------------------------------------------------------
 				#faces = f_bottom + f_top
 				#faces = f_left + f_right + f_start + f_end
 				#print 'deb:faces_list:\n', faces  #-----------------------
-				me = Mesh.New(obname)		  # create a new mesh
-				ob = SCENE.objects.new(me) # create a new mesh_object
+				if M_OBJ: obname, me, ob = makeNewObject()
+				else: 
+					me = Mesh.New(obname)		# create a new mesh
+					ob = SCENE.objects.new(me) # create a new mesh_object
 				me.verts.extend(pointsW)		# add vertices to mesh
 				me.faces.extend(faces)  # add faces to the mesh
 
@@ -1926,7 +1735,7 @@ class Polyline:  #--------------------------------------------------------------
 				# The mesh must first be linked to an object so the method knows which object to update.
 				# This is because vertex groups in Blender are stored in the object -- not in the mesh,
 				# which may be linked to more than one object.
-				if settings.var['vGroup_on']:
+				if settings.var['vGroup_on'] and not M_OBJ:
 					# each MeshSide becomes vertexGroup for easier material assignment ---------------------
 					replace = Blender.Mesh.AssignModes.REPLACE  #or .AssignModes.ADD
 					vg_left, vg_right, vg_top, vg_bottom = [], [], [], []
@@ -1956,8 +1765,10 @@ class Polyline:  #--------------------------------------------------------------
 				faces = [[num, len1+num, len1+num+1, num+1] for num in xrange(len1 - 1)]
 				if self.closed:
 					faces.append([len1, 0, len1-1, len1+len1-1])
-				me = Mesh.New(obname)		  # create a new mesh
-				ob = SCENE.objects.new(me) # create a new mesh_object
+				if M_OBJ: obname, me, ob = makeNewObject()
+				else: 
+					me = Mesh.New(obname)		# create a new mesh
+					ob = SCENE.objects.new(me) # create a new mesh_object
 				me.verts.extend(pointsW)		# add vertices to mesh
 				me.faces.extend(faces)  # add faces to the mesh
 
@@ -1976,8 +1787,10 @@ class Polyline:  #--------------------------------------------------------------
 			faces = [[num, num+1, num+len1+1, num+len1] for num in xrange(len1 - 1)]
 			if self.closed:
 				faces.append([len1-1, 0, len1, 2*len1-1])
-			me = Mesh.New(obname)		  # create a new mesh
-			ob = SCENE.objects.new(me) # create a new mesh_object
+			if M_OBJ: obname, me, ob = makeNewObject()
+			else: 
+				me = Mesh.New(obname)		# create a new mesh
+				ob = SCENE.objects.new(me) # create a new mesh_object
 			me.verts.extend(points)   # add vertices to mesh
 			me.faces.extend(faces)  # add faces to the mesh
 
@@ -1993,8 +1806,10 @@ class Polyline:  #--------------------------------------------------------------
 			edges = [[num, num+1] for num in xrange(len(points)-1)]
 			if self.closed:
 				edges.append([len(points)-1, 0])
-			me = Mesh.New(obname)		  # create a new mesh
-			ob = SCENE.objects.new(me) # create a new mesh_object
+			if M_OBJ: obname, me, ob = makeNewObject()
+			else: 
+				me = Mesh.New(obname)		# create a new mesh
+				ob = SCENE.objects.new(me) # create a new mesh_object
 			me.verts.extend(points)   # add vertices to mesh
 			me.edges.extend(edges)  # add edges to the mesh
 
@@ -2006,7 +1821,8 @@ class Polyline:  #--------------------------------------------------------------
 
 
 class Vertex(object):  #-----------------------------------------------------------------
-	"""Generic vertex object used by POLYLINEs (and maybe others).
+	"""Generic vertex object used by POLYLINEs, (and maybe others).
+	also used by class_LWPOLYLINEs but without obj-parameter
 	"""
 
 	def __init__(self, obj=None):
@@ -2017,8 +1833,8 @@ class Vertex(object):  #--------------------------------------------------------
 		#print 'deb:Vertex.init.START:----------------' #-----------------------
 		self.loc = [0,0,0]
 		self.face = []
-		self.swidth = 0
-		self.ewidth = 0
+		self.swidth = None #0
+		self.ewidth = None #0
 		self.bulge = 0
 		if obj is not None:
 			if not obj.type == 'vertex':
@@ -2058,14 +1874,14 @@ class Vertex(object):  #--------------------------------------------------------
 			self.curv_tangent =  getit(data, 50, None) # curve_tangent
 
 		if self.plface and not self.plmesh:
-				v1 = getit(data, 71, 0) # polyface:Face.vertex 1.
-				v2 = getit(data, 72, 0) # polyface:Face.vertex 2.
-				v3 = getit(data, 73, 0) # polyface:Face.vertex 3.
-				v4 = getit(data, 74, None) # polyface:Face.vertex 4.
-				self.face = [abs(v1)-1,abs(v2)-1,abs(v3)-1]
-				if v4 != None:
-					if abs(v4) != abs(v1):
-						self.face.append(abs(v4)-1)
+			v1 = getit(data, 71, 0) # polyface:Face.vertex 1.
+			v2 = getit(data, 72, 0) # polyface:Face.vertex 2.
+			v3 = getit(data, 73, 0) # polyface:Face.vertex 3.
+			v4 = getit(data, 74, None) # polyface:Face.vertex 4.
+			self.face = [abs(v1)-1,abs(v2)-1,abs(v3)-1]
+			if v4 != None:
+				if abs(v4) != abs(v1):
+					self.face.append(abs(v4)-1)
 		else:   #--parameter for polyline2d
 			self.swidth = getit(data, 40, None) # start width
 			self.ewidth = getit(data, 41, None) # end width
@@ -2119,6 +1935,304 @@ class Vertex(object):  #--------------------------------------------------------
 
 
 
+class Spline(Polyline):  #-----------------------------------------------------------------
+	"""Class for objects representing dxf SPLINEs.
+	"""
+	def __init__(self, obj):
+		"""Expects an entity object of type spline as input.
+100 - Subclass marker (AcDbSpline)
+210,220, 230  - Normal vector (omitted if the spline is nonplanar) X,Y,Z values of normal vector
+70 - Spline flag (bit coded):
+  1 = Closed spline
+  2 = Periodic spline
+  4 = Rational spline
+  8 = Planar
+ 16 = Linear (planar bit is also set)
+71 - Degree of the spline curve
+72 - Number of knots
+73 - Number of control points
+74 - Number of fit points (if any)
+42 - Knot tolerance (default = 0.0000001)
+43 - Control-point tolerance (default = 0.0000001)
+44 - Fit tolerance (default = 0.0000000001)
+12,22,32 - Start tangent--may be omitted (in WCS). X,Y,Z values of start tangent--may be omitted (in WCS).
+13,23, 33 - End tangent--may be omitted (in WCS). X,Y,Z values of end tangent--may be omitted (in WCS)
+40 - Knot value (one entry per knot)
+41 - Weight (if not 1); with multiple group pairs, are present if all are not 1
+10,20, 30  - Control points (in WCS) one entry per control point.
+DXF: X value; APP: 3D point, Y and Z values of control points (in WCS) (one entry per control point)
+11,21, 31 - Fit points (in WCS) one entry per fit point.
+ X,Y,Z values of fit points (in WCS) (one entry per fit point)
+		"""
+		#print 'deb:Spline.START:----------------' #------------------------
+		if not obj.type == 'spline':
+			raise TypeError, "Wrong type %s for spline object!" %obj.type
+		self.type = obj.type
+		self.data = obj.data[:]
+
+		# required data
+		self.num_points = obj.get_type(73)[0]
+
+		# optional data (with defaults)
+		self.space = getit(obj, 67, 0)
+
+		self.color_index = getit(obj, 62, BYLAYER)
+
+		#self.elevation =  getit(obj, 30, 0)
+		self.thic = 0 # getit(obj, 39, 0)
+
+		width = 0
+		self.swidth =  width # default start width
+		self.ewidth =  width # default end width
+
+		self.flags = getit(obj, 70, 0)
+		self.closed = self.flags & 1   # closed spline
+		self.period = self.flags & 2   # Periodic spline
+		self.ration = self.flags & 4   # Rational spline
+		self.planar = self.flags & 8   # Planar
+		self.linear = self.flags & 16  # Linear (and Planar)
+
+		self.degree = getit(obj, 71, 0) # Degree of the spline curve
+		self.curvNormal = False
+		self.curvQBspline = False
+		self.curvCBspline = False
+		self.curvBezier = False
+		if   self.degree == 0: self.curvNormal = True
+		elif self.degree == 1: self.curvQBspline = True
+		elif self.degree == 2: self.curvCBspline = True
+		#elif self.degree == 3: self.curvBezier = True
+		elif self.degree == 3: self.spline = True
+	
+		self.num_knots = getit(obj, 72, 0) # Number of knots
+		self.num_contr = getit(obj, 73, 0) # Number of control points
+		self.num_fitpk = getit(obj, 74, 0) # Number of fit points (if any)
+
+		self.layer = getit(obj.data, 8, None)
+		self.extrusion = get_extrusion(obj.data)
+
+		self.points = self.get_points(obj.data)
+
+		if self.planar: self.pltype = 'poly2d'
+		else: self.pltype = 'poly3d'
+		self.curved = False
+		#self.curved = False
+
+		#print 'deb:Spline obj.data:\n', obj.data #------------------------
+		#print 'deb:Spline self.points:\n', self.points #------------------------
+		#print 'deb:Spline.ENDinit:----------------' #------------------------
+
+
+	def get_points(self, data):
+		"""Gets points for a spline type object.
+
+		Splines have fixed number of verts, and
+		each vert can have a number of properties.
+		Verts should be coded as
+		10:xvalue
+		20:yvalue
+		for each vert
+		"""
+		num = self.num_contr
+		point = None
+		points = []
+		#point = Vertex()
+		for item in data:
+			#print 'deb:Spline item:', item #------------------------
+			if item[0] == 10:   # control point
+				if point: points.append(point)
+				point = Vertex()
+				point.curved = True
+				point.x = item[1]
+			elif item[0] == 20: # 20 = y
+				point.y = item[1]
+			elif item[0] == 30: # 30 = z
+				point.z = item[1]
+
+			elif item[0] == 11:   # fit point
+				if point: points.append(point)
+				point = Vertex()
+				point.curved = True
+				point.x = item[1]
+			elif item[0] == 21: # 20 = y
+				point.y = item[1]
+			elif item[0] == 31: # 30 = z
+				point.z = item[1]
+
+			elif item[0] == 12:   # start tangent
+				if point: points.append(point)
+				point = Vertex()
+				point.curved = True
+				point.x = item[1]
+			elif item[0] == 22: # = y
+				point.y = item[1]
+			elif item[0] == 32: # = z
+				point.z = item[1]
+
+			elif item[0] == 13:   # end tangent
+				if point: points.append(point)
+				point = Vertex()
+				point.curved = True
+				point.x = item[1]
+			elif item[0] == 23: # 20 = y
+				point.y = item[1]
+			elif item[0] == 33: # 30 = z
+				point.z = item[1]
+		points.append(point)
+		#print 'deb:Spline points:\n', points #------------------------
+		return points
+
+
+
+	def __repr__(self):
+		return "%s: layer - %s, points - %s" %(self.__class__.__name__, self.layer, self.points)
+
+
+	
+
+class LWpolyline(Polyline):  #-------------------------------------------------------------
+	"""Class for objects representing dxf LWPOLYLINEs.
+	"""
+	def __init__(self, obj):
+		"""Expects an entity object of type lwpolyline as input.
+		"""
+		#print 'deb:LWpolyline.START:----------------' #------------------------
+		if not obj.type == 'lwpolyline':
+			raise TypeError, "Wrong type %s for polyline object!" %obj.type
+		self.type = obj.type
+		self.data = obj.data[:]
+
+		# required data
+		self.num_points = obj.get_type(90)[0]
+
+		# optional data (with defaults)
+		self.space = getit(obj, 67, 0)
+		self.elevation =  getit(obj, 38, 0)
+		self.thic =  getit(obj, 39, 0)
+		self.color_index = getit(obj, 62, BYLAYER)
+		width =  getit(obj, 43, 0)
+		self.swidth =  width # default start width
+		self.ewidth =  width # default end width
+		#print 'deb:LWpolyline width=', width #------------------------
+		#print 'deb:LWpolyline elevation=', self.elevation #------------------------
+	
+		self.flags = getit(obj, 70, 0)
+		self.closed = self.flags&1 # byte coded, 1 = closed, 128 = plinegen
+
+		self.layer = getit(obj.data, 8, None)
+		self.extrusion = get_extrusion(obj.data)
+
+		self.points = self.get_points(obj.data)
+
+		self.pltype = 'poly2d'   # LW-polyline is a 2D-polyline
+		self.spline = False
+		self.curved = False
+
+
+		#print 'deb:LWpolyline.obj.data:\n', obj.data #------------------------
+		#print 'deb:LWpolyline.ENDinit:----------------' #------------------------
+
+
+	def get_points(self, data):
+		"""Gets points for a polyline type object.
+
+		LW-Polylines have no fixed number of verts, and
+		each vert can have a number of properties.
+		Verts should be coded as
+		10:xvalue
+		20:yvalue
+		40:startwidth or 0
+		41:endwidth or 0
+		42:bulge or 0
+		for each vert
+		"""
+		num = self.num_points
+		point = None
+		points = []
+		for item in data:
+			if item[0] == 10:   # 10 = x
+				if point:
+					points.append(point)
+				point = Vertex()
+				point.x = item[1]
+				point.z = self.elevation
+			elif item[0] == 20: # 20 = y
+				point.y = item[1]
+			elif item[0] == 40: # 40 = start width
+				point.swidth = item[1]
+			elif item[0] == 41: # 41 = end width
+				point.ewidth = item[1]
+			elif item[0] == 42: # 42 = bulge
+				point.bulge = item[1]
+		points.append(point)
+		return points
+
+
+
+	def __repr__(self):
+		return "%s: layer - %s, points - %s" %(self.__class__.__name__, self.layer, self.points)
+
+
+	def draw_old(self, settings):
+		"""for LWPOLYLINE: generate Blender_geometry.
+		"""
+		#print 'deb:LWpolyline.draw.START:----------------' #------------------------
+		points = []
+		obname = 'lw_%s' %self.layer  # create object name from layer name
+		obname = obname[:MAX_NAMELENGTH]
+		#settings.var['curves_on'] == True
+		#print 'deb:index_len: ', len(self.points) #------------------
+		for i, point in enumerate(self.points):
+			#print 'deb:index: ', i #------------------
+			if not point.bulge:
+				points.append(point.loc)
+			elif point.bulge and not self.closed and i == len(self.points)-1:
+				points.append(point.loc)
+			elif point.bulge:	 #
+				if i == len(self.points)-1:
+					point2 = self.points[0]
+				else:
+					point2 = self.points[i+1]
+				arc_res = settings.var['arc_res']/sqrt(settings.var['arc_rad'])
+				verts, center = calcBulge(point, point2, arc_res)
+#			   if i == len(self.points)-1:
+#				   if self.closed:
+#					   verts.pop() #remove last(=first) vertex
+#			   else:
+#				   verts.pop() #remove last vertex, because this point will be writen as the next vertex
+				points.extend(verts)
+
+		thic = self.thic
+		if settings.var['thick_force'] and thic == 0: thic = settings.var['thick_min']
+		if settings.var['thick_on'] and thic != 0:
+			len1 = len(points)
+			points.extend([[point[0], point[1], point[2]+thic] for point in points])
+			faces = []
+			#print 'deb:len1:', len1  #-----------------------
+			faces = [[num, num+1, num+len1+1, num+len1] for num in xrange(len1 - 1)]
+			if self.closed:
+				faces.append([len1-1, 0, len1, 2*len1-1])
+			#print 'deb:faces_list:\n', faces  #-----------------------
+			me = Mesh.New(obname)		  # create a new mesh
+			ob = SCENE.objects.new(me) # create a new mesh_object
+			me.verts.extend(points) # add vertices to mesh
+			me.faces.extend(faces)   # add faces to the mesh
+		else:
+			edges = [[num, num+1] for num in xrange(len(points)-1)]
+			if self.closed:
+				edges.append([len(points)-1, 0])
+			#print 'deb:edges_list:\n', edges  #-----------------------
+			me = Mesh.New(obname)		  # create a new mesh
+			ob = SCENE.objects.new(me) # create a new mesh_object
+			me.verts.extend(points) # add vertices to mesh
+			me.edges.extend(edges)   # add edges to the mesh
+
+		ob.LocZ = self.elevation
+		transform(self.extrusion, 0, ob)
+
+		#print 'deb:LWpolyline.draw.END:----------------' #------------------------
+		return ob
+
+
 class Text:  #-----------------------------------------------------------------
 	"""Class for objects representing dxf TEXT.
 	"""
@@ -2363,8 +2477,6 @@ class Mtext:  #-----------------------------------------------------------------
 		return ob
 
 
-
-
 class Circle:  #-----------------------------------------------------------------
 	"""Class for objects representing dxf CIRCLEs.
 	"""
@@ -2494,8 +2606,10 @@ class Circle:  #----------------------------------------------------------------
 			return ob
 
 		else:  # draw CIRCLE as mesh -----------------------------------------------
-			cir = Mesh.New(obname)		 # create a new mesh
-			ob = SCENE.objects.new(cir) # create a new circle_object
+			if M_OBJ: obname, me, ob = makeNewObject()
+			else: 
+				me = Mesh.New(obname)		# create a new mesh
+				ob = SCENE.objects.new(me) # create a new mesh_object
 			# set a number of segments in entire circle
 			arc_res = settings.var['arc_res'] * sqrt(radius) / sqrt(settings.var['arc_rad'])
 			start, end = 0.0 , 360.0
@@ -2534,24 +2648,24 @@ class Circle:  #----------------------------------------------------------------
 					#print 'deb:circleDraw:verts:', verts  #---------------
 					faces = f_band + f_bottom + f_top
 					#print 'deb:circleDraw:faces:', faces  #---------------
-				cir.verts.extend(verts) # add vertices to mesh
-				cir.faces.extend(faces)  # add faces to the mesh
+				me.verts.extend(verts) # add vertices to mesh
+				me.faces.extend(faces)  # add faces to the mesh
 
 				if settings.var['meshSmooth_on']:  # left and right side become smooth ----------------------
 					for i in xrange(smooth_len):
-						cir.faces[i].smooth = True
+						me.faces[i].smooth = True
 				# each MeshSide becomes vertexGroup for easier material assignment ---------------------
-				if settings.var['vGroup_on']:
+				if settings.var['vGroup_on'] and not M_OBJ:
 					# each MeshSide becomes vertexGroup for easier material assignment ---------------------
 					replace = Blender.Mesh.AssignModes.REPLACE  #or .AssignModes.ADD
 					vg_band, vg_top, vg_bottom = [], [], []
 					for v in f_band: vg_band.extend(v)
-					cir.addVertGroup('side.band')  ; cir.assignVertsToGroup('side.band',  list(set(vg_band)), 1.0, replace)
+					me.addVertGroup('side.band')  ; me.assignVertsToGroup('side.band',  list(set(vg_band)), 1.0, replace)
 					if settings.var['fill_on']:
 						for v in f_top: vg_top.extend(v)
 						for v in f_bottom: vg_bottom.extend(v)
-						cir.addVertGroup('side.top')   ; cir.assignVertsToGroup('side.top',   list(set(vg_top)), 1.0, replace)
-						cir.addVertGroup('side.bottom'); cir.assignVertsToGroup('side.bottom',list(set(vg_bottom)), 1.0, replace)
+						me.addVertGroup('side.top')   ; me.assignVertsToGroup('side.top',   list(set(vg_top)), 1.0, replace)
+						me.addVertGroup('side.bottom'); me.assignVertsToGroup('side.bottom',list(set(vg_bottom)), 1.0, replace)
 
 			else: # if thic == 0
 				if settings.var['fill_on']:
@@ -2563,20 +2677,18 @@ class Circle:  #----------------------------------------------------------------
 					faces.append([len1-1, 0, center1])
 					#print 'deb:circleDraw:verts:', verts  #---------------
 					#print 'deb:circleDraw:faces:', faces  #---------------
-					cir.verts.extend(verts) # add vertices to mesh
-					cir.faces.extend(faces)  # add faces to the mesh
+					me.verts.extend(verts) # add vertices to mesh
+					me.faces.extend(faces)  # add faces to the mesh
 				else:
-					cir.verts.extend(verts) # add vertices to mesh
+					me.verts.extend(verts) # add vertices to mesh
 					edges = [[num, num+1] for num in xrange(len(verts))]
 					edges[-1][1] = 0   # it points the "new" last edge to the first vertex
-					cir.edges.extend(edges)  # add edges to the mesh
+					me.edges.extend(edges)  # add edges to the mesh
 
 			ob.loc = tuple(self.loc)
 			transform(self.extrusion, 0, ob)
 			return ob
 			
-			
-
 
 class Arc:  #-----------------------------------------------------------------
 	"""Class for objects representing dxf ARCs.
@@ -2670,8 +2782,10 @@ class Arc:  #-----------------------------------------------------------------
 			return ob
 
 		else:  # draw ARC as mesh --------------------
-			me = Mesh.New(obname)  # create a new mesh
-			ob = SCENE.objects.new(me) # create a new mesh_object
+			if M_OBJ: obname, me, ob = makeNewObject()
+			else: 
+				me = Mesh.New(obname)		# create a new mesh
+				ob = SCENE.objects.new(me) # create a new mesh_object
 			# set a number of segments in entire circle
 			arc_res = settings.var['arc_res'] * sqrt(radius) / sqrt(settings.var['arc_rad'])
 
@@ -2719,7 +2833,7 @@ class Arc:  #-----------------------------------------------------------------
 						for i in xrange(smooth_len):
 							me.faces[i].smooth = True
 					# each MeshSide becomes vertexGroup for easier material assignment ---------------------
-					if settings.var['vGroup_on']:
+					if settings.var['vGroup_on'] and not M_OBJ:
 						# each MeshSide becomes vertexGroup for easier material assignment ---------------------
 						replace = Blender.Mesh.AssignModes.REPLACE  #or .AssignModes.ADD
 						vg_left, vg_right, vg_top, vg_bottom = [], [], [], []
@@ -2792,8 +2906,8 @@ class BlockRecord:  #-----------------------------------------------------------
 		# optional data (with defaults)
 		self.insertion_units =  getit(obj, 70, None)
 		self.insert_units = getit(obj, 1070, None)
-		"""code 1070 Einfügeeinheiten:
-		0 = Keine Einheiten; 1 = Zoll; 2 = Fuß; 3 = Meilen; 4 = Millimeter;
+		"""code 1070 Einfuegeeinheiten:
+		0 = Keine Einheiten; 1 = Zoll; 2 = Fuss; 3 = Meilen; 4 = Millimeter;
 		5 = Zentimeter; 6 = Meter; 7 = Kilometer; 8 = Mikrozoll;
 		9 = Mils; 10 = Yard; 11 = Angstrom; 12 = Nanometer;
 		13 = Mikrons; 14 = Dezimeter; 15 = Dekameter;
@@ -3048,7 +3162,7 @@ class Insert:  #----------------------------------------------------------------
 				return ob
 
 		elif settings.drawTypes['insert']:  #if insert_drawType activated
-			print 'deb:draw.  settings.blocknamesmap:', settings.blocknamesmap #--------------------
+			#print 'deb:draw.  settings.blocknamesmap:', settings.blocknamesmap #--------------------
 			obname = settings.blocknamesmap[self.name]
 			obname = 'in_%s' %obname  # create object name from block name
 			#obname = obname[:MAX_NAMELENGTH]
@@ -3193,10 +3307,10 @@ class Ellipse:  #---------------------------------------------------------------
 		if settings.var['lines_as'] == 4: # as thin_box
 			thic = settings.var['thick_min']
 			width = settings.var['width_min']
-		if settings.var['lines_as'] == 3: # as thin cylinder
+		elif settings.var['lines_as'] == 3: # as thin cylinder
 			cyl_rad = 0.5 * settings.var['width_min']
 
-		if settings.var['lines_as'] == 5:  # draw ELLIPSE as curve -------------
+		elif settings.var['lines_as'] == 5:  # draw ELLIPSE as curve -------------
 			arc_res = settings.var['curve_arc']
 			triples = True
 			VectorTriples = calcArc(None, radius, start, end, arc_res, triples)
@@ -3236,12 +3350,13 @@ class Ellipse:  #---------------------------------------------------------------
 
 
 		else: # draw ELLIPSE as mesh --------------------------------------
-			me = Mesh.New(obname)  # create a new mesh
-			ob = SCENE.objects.new(me) # create a new mesh_object
+			if M_OBJ: obname, me, ob = makeNewObject()
+			else: 
+				me = Mesh.New(obname)		# create a new mesh
+				ob = SCENE.objects.new(me) # create a new mesh_object
 			# set a number of segments in entire circle
 			arc_res = settings.var['arc_res'] * sqrt(radius) / sqrt(settings.var['arc_rad'])
 
-
 			verts = calcArc(None, radius, start, end, arc_res, False)
 			#verts = [list(point) for point in verts]
 			if False: #--todo--: if ellipse_closed:
@@ -3287,8 +3402,7 @@ class Ellipse:  #---------------------------------------------------------------
 						smooth_len = len(f_left) + len(f_right)
 						for i in xrange(smooth_len):
 							me.faces[i].smooth = True
-
-					if settings.var['vGroup_on']:
+					if settings.var['vGroup_on'] and not M_OBJ:
 						# each MeshSide becomes vertexGroup for easier material assignment ---------------------
 						replace = Blender.Mesh.AssignModes.REPLACE  #or .AssignModes.ADD
 						vg_left, vg_right, vg_top, vg_bottom = [], [], [], []
@@ -3408,21 +3522,24 @@ class Face:  #-----------------------------------------------------------------
 		global activObjectName
 		#print 'deb:draw:face.ob IN activObjectName: ', activObjectName #---------------------
 
-		if activObjectLayer == self.layer and settings.var['one_mesh_on']:
-			obname = activObjectName
-			#print 'deb:face.draw obname from activObjectName: ', obname #---------------------
-			ob = Object.Get(obname)  # open an existing mesh_object
-			#ob = SCENE.getChildren(obname)  # open an existing mesh_object
-		else:
-			obname = 'fa_%s' %self.layer  # create object name from layer name
-			obname = obname[:MAX_NAMELENGTH]
-			me = Mesh.New(obname)		  # create a new mesh
-			ob = SCENE.objects.new(me) # create a new mesh_object
-			activObjectName = ob.name
-			activObjectLayer = self.layer
-			#print ('deb:except. new face.ob+mesh:"%s" created!' %ob.name) #---------------------
-
-		me = Mesh.Get(ob.name)   # open objects mesh data
+		if M_OBJ: obname, me, ob = makeNewObject()
+		else: 
+			if activObjectLayer == self.layer and settings.var['one_mesh_on']:
+				obname = activObjectName
+				#print 'deb:face.draw obname from activObjectName: ', obname #---------------------
+				ob = getSceneChild(obname)  # open an existing mesh_object
+				#ob = SCENE.getChildren(obname)  # open an existing mesh_object
+				me = ob.getData(name_only=False, mesh=True)
+			else:
+				obname = 'fa_%s' %self.layer  # create object name from layer name
+				obname = obname[:MAX_NAMELENGTH]
+				me = Mesh.New(obname)		  # create a new mesh
+				ob = SCENE.objects.new(me) # create a new mesh_object
+				activObjectName = ob.name
+				activObjectLayer = self.layer
+				#print ('deb:except. new face.ob+mesh:"%s" created!' %ob.name) #---------------------
+	
+		#me = Mesh.Get(ob.name)   # open objects mesh data
 		faces, edges = [], []
 		n = len(me.verts)
 		if len(self.points) == 4:
@@ -3435,7 +3552,7 @@ class Face:  #-----------------------------------------------------------------
 		me.verts.extend(points) # add vertices to mesh
 		if faces: me.faces.extend(faces)	   # add faces to the mesh
 		if edges: me.edges.extend(edges)	   # add faces to the mesh
-		if settings.var['vGroup_on']:
+		if settings.var['vGroup_on'] and not M_OBJ:
 			# entities with the same color build one vertexGroup for easier material assignment ---------------------
 			ob.link(me) # link mesh to that object
 			vG_name = 'color_%s' %self.color_index
@@ -3468,6 +3585,7 @@ type_map = {
 #   'mline':MLine,
 	'polyline':Polyline,
 	'lwpolyline':LWpolyline,
+	'spline':Spline,
 #   'region':Region,
 	'trace':Solid,
 	'solid':Solid,
@@ -3738,7 +3856,11 @@ class Blocks:  #----------------------------------------------------------------
 			global oblist
 			oblist.append((ob, insertFlag, blockFlag))
 		else:		
+			if M_OBJ:
+				car_end()
+				car_start()
 			drawEntities(block.entities, self.settings, block_def)
+			if M_OBJ: car_end()
 		self.settings.write("Drawing block:\'%s\' done!" %name)
 		self.blocks[name] = blender_group
 
@@ -3809,7 +3931,8 @@ class Settings:  #--------------------------------------------------------------
 		"""Given the drawing, build dictionaries of Layers, Colors and Blocks.
 		"""
 
-		#de:	paßt die distance parameter an globalScale
+		global oblist
+		#adjust the distance parameter to globalScale
 		if self.var['g_scale'] != 1.0:
 			self.var['dist_min']  = self.var['dist_min'] / self.var['g_scale']
 			self.var['thick_min'] = self.var['thick_min'] / self.var['g_scale']
@@ -3859,7 +3982,6 @@ class Settings:  #--------------------------------------------------------------
 
 			if views: #----------------------------------
 				if self.var['views_on']:
-					global oblist
 					for item in views.data:
 						if type(item) != list and item.type == 'view':
 							#print 'deb:settings_valid views dir(item)=', dir(item) #-------------
@@ -3876,7 +3998,6 @@ class Settings:  #--------------------------------------------------------------
 
 			if vports: #----------------------------------
 				if self.var['views_on']:
-					global oblist
 					for item in vports.data:
 						if type(item) != list and item.type == 'vport':
 							#print 'deb:settings_valid views dir(item)=', dir(item) #-------------
@@ -3901,7 +4022,8 @@ class Settings:  #--------------------------------------------------------------
 			# Read the block definitions and build our block object
 			if self.drawTypes['insert']: #if support for entity type 'Insert' is activated
 				#Build a dictionary of blockname:block_data pairs
-				blocksmap, self.obj_number = getBlocksmap(drawing, layersmap, self.var['layFrozen_on'])
+				blocksmap, obj_number = getBlocksmap(drawing, layersmap, self.var['layFrozen_on'])
+				self.obj_number += obj_number
 				self.blocknamesmap = getBlocknamesmap(blocksmap)
 				self.blocks = Blocks(blocksmap, self) # initiates container for blocks_data
 				self.usedBlocks = blocksmap.keys()
@@ -3916,9 +4038,7 @@ class Settings:  #--------------------------------------------------------------
 		# The section:entities
 		if 'entities' in sections.keys():
 			self.write("found section:entities")
-
 			self.obj_number += len(drawing.entities.data)
-			#print 'deb:settings_valid self.obj_number', self.obj_number #----------
 			self.obj_number = 1.0 / self.obj_number
 
 
@@ -4152,6 +4272,7 @@ def	analyzeDXF(dxfFile): #---------------------------------------
 def main(dxfFile):  #---------------#############################-----------
 	#print 'deb:filename:', filename #--------------
 	global SCENE
+	global oblist
 	editmode = Window.EditMode()	# are we in edit mode?  If so ...
 	if editmode:
 		Window.EditMode(0) # leave edit mode before
@@ -4206,7 +4327,6 @@ def main(dxfFile):  #---------------#############################-----------
 			return None
 
 		# Draw all the know entity types in the current scene
-		global oblist
 		oblist = []  # a list of all created AND linked objects for final f_globalScale
 		time2 = Blender.sys.time()  #time marker2
 
@@ -4218,9 +4338,12 @@ def main(dxfFile):  #---------------#############################-----------
 		global activObjectLayer, activObjectName
 		activObjectLayer, activObjectName = None, None
 
+		if M_OBJ: car_init()
+
 		drawEntities(drawing.entities, settings)
 
 		#print 'deb:drawEntities after: oblist:', oblist #-----------------------
+		if M_OBJ: car_end()
 		if oblist: # and settings.var['g_scale'] != 1:
 			globalScale(oblist, settings.var['g_scale'])
 
@@ -4357,7 +4480,7 @@ def getBlocksmap(drawing, layersmap, layFrozen_on=False):  #--------------------
 			try: usedblocks[item.name] = [used, childList]
 			except KeyError: print 'Cannot map "%s" - "%s" as Block!' %(item.name, item)
 	#print 'deb:getBlocksmap: usedblocks=' , usedblocks #-------------
-	print 'deb:getBlocksmap:  layersmap=' , layersmap #-------------
+	#print 'deb:getBlocksmap:  layersmap=' , layersmap #-------------
 
 	for item in drawing.entities.data:
 		if type(item) != list and item.type == 'insert':
@@ -4527,19 +4650,27 @@ def drawer(_type, entities, settings, block_def):  #----------------------------
 				insertFlag = False
 				alt_obname = activObjectName
 				ob = entity.draw(settings)
-				if ob and ob.name != alt_obname:
-					if block_def:
-						blockFlag = True
-						bl_loc = block_def[1]
-						ob.loc = [ob.loc[0]-bl_loc[0],ob.loc[1]-bl_loc[1],ob.loc[2]-bl_loc[2]]
-					else: blockFlag = False
-					setObjectProperties(ob, group, entity, settings, block_def)
-					if settings.var['optimization'] <= settings.MIN:
-						#if settings.var['g_origin_on'] and not block_def: ob.loc = Mathutils.Vector(ob.loc) + settings.g_origin
-						if settings.var['g_scale_on']: globalScaleOne(ob, insertFlag, blockFlag, settings.var['g_scale'])
-						settings.redraw()
-					else: oblist.append((ob, insertFlag, blockFlag))
-
+				if ob:
+					if M_OBJ and ob.type=='Mesh': #'Curve', 'Text'
+						if block_def:
+							blockFlag = True
+							bl_loc = block_def[1]
+							ob.loc = [ob.loc[0]-bl_loc[0],ob.loc[1]-bl_loc[1],ob.loc[2]-bl_loc[2]]
+						car_nr()
+	
+					elif ob.name != alt_obname:
+						if block_def:
+							blockFlag = True
+							bl_loc = block_def[1]
+							ob.loc = [ob.loc[0]-bl_loc[0],ob.loc[1]-bl_loc[1],ob.loc[2]-bl_loc[2]]
+						else: blockFlag = False
+						setObjectProperties(ob, group, entity, settings, block_def)
+						if settings.var['optimization'] <= settings.MIN:
+							#if settings.var['g_origin_on'] and not block_def: ob.loc = Mathutils.Vector(ob.loc) + settings.g_origin
+							if settings.var['g_scale_on']: globalScaleOne(ob, insertFlag, blockFlag, settings.var['g_scale'])
+							settings.redraw()
+						else: oblist.append((ob, insertFlag, blockFlag))
+	
 		#print 'deb:Finished drawing:', entities[0].type   #------------------------
 		message = "\nDrawing dxf\'%ss\' done!" % _type
 		settings.write(message, True)
@@ -4569,7 +4700,8 @@ def globalScaleOne(ob, insertFlag, blockFlag, SCALE):  #------------------------
 		ob.loc = Mathutils.Vector(ob.loc) * SCALE_MAT
 	else:   # entire scaling for all other imported objects ------------
 		if ob.type == 'Mesh':		
-			me = Mesh.Get(ob.name)
+			me = ob.getData(name_only=False, mesh=True)
+			#me = Mesh.Get(ob.name)
 			# set centers of all objects in (0,0,0)
 			#me.transform(ob.matrixWorld*SCALE_MAT) 
 			#ob.loc = Mathutils.Vector([0,0,0])
@@ -4990,6 +5122,7 @@ points_as_menu  = "convert to: %t|empty %x1|mesh.vertex %x2|thin sphere %x3|thin
 lines_as_menu   = "convert to: %t|*edge %x1|mesh %x2|*thin cylinder %x3|thin box %x4|curve %x5"
 mlines_as_menu  = "convert to: %t|*edge %x1|*mesh %x2|*thin cylinder %x3|*thin box %x|*curve %x5"
 plines_as_menu  = "convert to: %t|*edge %x1|mesh %x2|*thin cylinder %x3|*thin box %x4|curve %x5"
+splines_as_menu  = "convert to: %t|*edge %x1|mesh %x2|*thin cylinder %x3|*thin box %x4|curve %x5"
 plines3_as_menu = "convert to: %t|*edge %x1|mesh %x2|*thin cylinder %x3|*thin box %x4|curve %x5"
 plmesh_as_menu  = "convert to: %t|*edge %x1|mesh %x2"
 solids_as_menu  = "convert to: %t|*edge %x1|mesh %x2"
@@ -5072,6 +5205,7 @@ keywords_org = {
 	'lines_as'  : 2,
 	'mlines_as' : 2,
 	'plines_as' : 2,
+	'splines_as' : 2,
 	'plines3_as': 2,
 	'plmesh_as' : 2,
 	'solids_as' : 2,
@@ -5087,6 +5221,7 @@ drawTypes_org = {
 	'ellipse': 1,
 	'mline' : 0,
 	'polyline': 1,
+	'spline': 0,
 	'plmesh': 1,
 	'pline3': 1,
 	'lwpolyline': 1,
@@ -5272,12 +5407,14 @@ def presetConfig_curv():  #-----------------------------------------------
 		GUI_A['lines_as'].val  = 5
 		GUI_A['mlines_as'].val = 5
 		GUI_A['plines_as'].val = 5
+		GUI_A['splines_as'].val = 5
 		GUI_A['plines3_as'].val = 5
 	else:
 		GUI_A['points_as'].val = 2
 		GUI_A['lines_as'].val  = 2
 		GUI_A['mlines_as'].val = 2
 		GUI_A['plines_as'].val = 2
+		GUI_A['splines_as'].val = 2
 		GUI_A['plines3_as'].val = 2
 
 	
@@ -5315,6 +5452,7 @@ def resetDefaultConfig_2D():  #-----------------------------------------------
 		'ellipse': 1,
 		'mline' : 0,
 		'polyline': 1,
+		'spline': 0,
 		'plmesh': 0,
 		'pline3': 0,
 		'lwpolyline': 1,
@@ -5361,6 +5499,7 @@ def resetDefaultConfig_3D():  #-----------------------------------------------
 		'ellipse': 1,
 		'mline' : 0,
 		'polyline': 1,
+		'spline': 0,
 		'plmesh': 1,
 		'pline3': 1,
 		'lwpolyline': 1,
@@ -5429,7 +5568,7 @@ def draw_UI():  #---------------------------------------------------------------
 	menu_w = (3 * butt_margin) + but_0c + but_1c + but_2c + but_3c  #menu width
 
 	simple_menu_h = 80
-	extend_menu_h = 350
+	extend_menu_h = 370
 	y = simple_menu_h		 # y is menu upper.y
 	if config_UI.val: y += extend_menu_h
 	x = 20 #menu left.x
@@ -5450,8 +5589,9 @@ def draw_UI():  #---------------------------------------------------------------
 	if config_UI.val:
 		b0, b0_ = but0c, but_0c + butt_margin
 		b1, b1_ = but1c, but_1c
-		y -= 10
+		y_top = y
 
+		y -= 10
 		y -= 20
 		Draw.BeginAlign()
 		GUI_B['point'] = Draw.Toggle('POINT', EVENT_REDRAW, b0, y, b0_, 20, GUI_B['point'].val, "support dxf-POINT on/off")
@@ -5476,7 +5616,14 @@ def draw_UI():  #---------------------------------------------------------------
 
 		y -= 20
 		Draw.BeginAlign()
-		GUI_B['polyline'] = Draw.Toggle('2D-PLINE', EVENT_REDRAW, b0, y, b0_, 20, GUI_B['polyline'].val, "support dxf-2D-POLYLINE on/off")
+		GUI_B['spline'] = Draw.Toggle('SPLINE', EVENT_REDRAW, b0, y, b0_, 20, GUI_B['spline'].val, "support dxf-SPLINE on/off")
+		if GUI_B['spline'].val:
+			GUI_A['splines_as'] = Draw.Menu(splines_as_menu, EVENT_NONE, but1c, y, but_1c, 20, GUI_A['splines_as'].val, "select target Blender-object")
+		Draw.EndAlign()
+
+		y -= 20
+		Draw.BeginAlign()
+		GUI_B['polyline'] = Draw.Toggle('2D/LWPLINE', EVENT_REDRAW, b0, y, b0_, 20, GUI_B['polyline'].val, "support dxf-2D-POLYLINE on/off")
 		if GUI_B['polyline'].val:
 			GUI_A['plines_as'] = Draw.Menu(plines_as_menu, EVENT_NONE, but1c, y, but_1c, 20, GUI_A['plines_as'].val, "select target Blender-object")
 		Draw.EndAlign()
@@ -5488,6 +5635,64 @@ def draw_UI():  #---------------------------------------------------------------
 			GUI_A['plines3_as'] = Draw.Menu(plines3_as_menu, EVENT_NONE, but1c, y, but_1c, 20, GUI_A['plines3_as'].val, "select target Blender-object")
 		Draw.EndAlign()
 
+		y_down = y
+		# -----------------------------------------------
+
+		y = y_top
+		b0, b0_ = but2c, but_2c + butt_margin
+		b1, b1_ = but3c, but_3c
+
+		y -= 10
+		y -= 20
+		Draw.BeginAlign()
+		GUI_B['plmesh'] = Draw.Toggle('POLY-MESH/FACE', EVENT_NONE, b0, y, b0_+b1_, 20, GUI_B['plmesh'].val, "support dxf-POLYMESH/POLYFACE on/off")
+#		GUI_A['plmesh_as'] = Draw.Menu(plmesh_as_menu, EVENT_NONE, but1c, y, but_1c, 20, GUI_A['plmesh_as'].val, "select target Blender-object")
+		Draw.EndAlign()
+
+		y -= 20
+		Draw.BeginAlign()
+		GUI_B['solid'] = Draw.Toggle('SOLID', EVENT_NONE, b0, y, b0_, 20, GUI_B['solid'].val, "support dxf-SOLID and TRACE on/off")
+		GUI_B['face'] = Draw.Toggle('3DFACE', EVENT_NONE, b1, y, b1_, 20, GUI_B['face'].val, "support dxf-3DFACE on/off")
+#		GUI_A['solids_as'] = Draw.Menu(solids_as_menu, EVENT_NONE, but3c, y, but_3c, 20, GUI_A['solids_as'].val, "select target Blender-object")
+		Draw.EndAlign()
+		#print 'deb:support solid, trace', GUI_B['trace'].val, GUI_B['solid'].val # ------------
+
+
+		y -= 20
+		Draw.BeginAlign()
+		GUI_B['text'] = Draw.Toggle('TEXT', EVENT_NONE, b0, y, b0_, 20, GUI_B['text'].val, "support dxf-TEXT on/off")
+		GUI_B['mtext'] = Draw.Toggle('*MTEXT', EVENT_NONE, b1, y, b1_, 20, GUI_B['mtext'].val, "(*wip)support dxf-MTEXT on/off")
+#		GUI_A['texts_as'] = Draw.Menu(texts_as_menu, EVENT_NONE, but3c, y, but_3c, 20, GUI_A['texts_as'].val, "select target Blender-object")
+		Draw.EndAlign()
+
+		y -= 20
+		Draw.BeginAlign()
+		GUI_B['block'] = Draw.Toggle('BLOCK', EVENT_REDRAW, b0, y, b0_-30, 20, GUI_B['block'].val, "support dxf-BLOCK and ARRAY on/off")
+		GUI_B['insert'].val = GUI_B['block'].val
+		if GUI_B['block'].val:
+			GUI_A['block_nn'] = Draw.Toggle('n', EVENT_NONE, b1-30, y, 15, 20, GUI_A['block_nn'].val, "support hatch/noname BLOCKs *X... on/off")
+			GUI_A['blockFilter_on'] = Draw.Toggle('F', EVENT_NONE, b1-15, y, 15, 20, GUI_A['blockFilter_on'].val, "(*wip) support name filtering of BLOCKs on/off")
+			GUI_A['xref_on'] = Draw.Toggle('Xref', EVENT_NONE, b1, y, 20, 20, GUI_A['xref_on'].val, "support place holder for XREF-BLOCKs on/off")
+			GUI_A['blocks_as'] = Draw.Menu(blocks_as_menu, EVENT_NONE, b1+20, y, b1_-20, 20, GUI_A['blocks_as'].val, "select target representation for imported BLOCKs")
+		Draw.EndAlign()
+
+
+		y -= 20
+		Draw.BeginAlign()
+		GUI_A['views_on'] = Draw.Toggle('views', EVENT_NONE, b0, y, b0_-25, 20, GUI_A['views_on'].val, "imports VIEWs and VIEWPORTs as cameras on/off")
+		GUI_A['cams_on'] = Draw.Toggle('*cams', EVENT_NONE, b1-25, y, b1_-25, 20, GUI_A['cams_on'].val, "(*wip) support ASHADE cameras on/off")
+		GUI_A['lights_on'] = Draw.Toggle('*lights', EVENT_NONE, b1+25, y, b1_-25, 20, GUI_A['lights_on'].val, "(*wip) support AVE_RENDER lights on/off")
+		Draw.EndAlign()
+
+
+		if y < y_down: y_down = y
+		# -----end supported objects--------------------------------------
+
+		b0, b0_ = but0c, but_0c + butt_margin
+		b1, b1_ = but1c, but_1c
+
+		y_top = y_down
+		y = y_top
 		y -= 10
 		y -= 20
 		Draw.BeginAlign()
@@ -5534,6 +5739,14 @@ def draw_UI():  #---------------------------------------------------------------
 			Draw.Label(scale_str, b1+45, y, 200, 20)
 		Draw.EndAlign()
 
+		y_down = y
+		# -----end material,translate,scale------------------------------------------
+
+		b0, b0_ = but0c, but_0c + butt_margin
+		b1, b1_ = but1c, but_1c
+
+		y_top = y_down
+		y = y_top
 		y -= 10
 		y -= 20
 		Draw.BeginAlign()
@@ -5571,56 +5784,11 @@ def draw_UI():  #---------------------------------------------------------------
 
 		y_down = y
 		# -----------------------------------------------
-		y = simple_menu_h + extend_menu_h +20
+
 		b0, b0_ = but2c, but_2c + butt_margin
 		b1, b1_ = but3c, but_3c
 
-		y -= 20
-		Draw.BeginAlign()
-		GUI_B['plmesh'] = Draw.Toggle('POLY-MESH/FACE', EVENT_NONE, b0, y, b0_+b1_, 20, GUI_B['plmesh'].val, "support dxf-POLYMESH/POLYFACE on/off")
-#		GUI_A['plmesh_as'] = Draw.Menu(plmesh_as_menu, EVENT_NONE, but1c, y, but_1c, 20, GUI_A['plmesh_as'].val, "select target Blender-object")
-		Draw.EndAlign()
-
-		y -= 20
-		Draw.BeginAlign()
-		GUI_B['solid'] = Draw.Toggle('SOLID', EVENT_NONE, b0, y, b0_, 20, GUI_B['solid'].val, "support dxf-SOLID and TRACE on/off")
-		GUI_B['face'] = Draw.Toggle('3DFACE', EVENT_NONE, b1, y, b1_, 20, GUI_B['face'].val, "support dxf-3DFACE on/off")
-#		GUI_A['solids_as'] = Draw.Menu(solids_as_menu, EVENT_NONE, but3c, y, but_3c, 20, GUI_A['solids_as'].val, "select target Blender-object")
-		Draw.EndAlign()
-		#print 'deb:support solid, trace', GUI_B['trace'].val, GUI_B['solid'].val # ------------
-
-
-		y -= 20
-		Draw.BeginAlign()
-		GUI_B['text'] = Draw.Toggle('TEXT', EVENT_NONE, b0, y, b0_, 20, GUI_B['text'].val, "support dxf-TEXT on/off")
-		GUI_B['mtext'] = Draw.Toggle('*MTEXT', EVENT_NONE, b1, y, b1_, 20, GUI_B['mtext'].val, "(*wip)support dxf-MTEXT on/off")
-#		GUI_A['texts_as'] = Draw.Menu(texts_as_menu, EVENT_NONE, but3c, y, but_3c, 20, GUI_A['texts_as'].val, "select target Blender-object")
-		Draw.EndAlign()
-
-		y -= 20
-		Draw.BeginAlign()
-		GUI_B['block'] = Draw.Toggle('BLOCK', EVENT_REDRAW, b0, y, b0_-30, 20, GUI_B['block'].val, "support dxf-BLOCK and ARRAY on/off")
-		GUI_B['insert'].val = GUI_B['block'].val
-		if GUI_B['block'].val:
-			GUI_A['block_nn'] = Draw.Toggle('n', EVENT_NONE, b1-30, y, 15, 20, GUI_A['block_nn'].val, "support hatch/noname BLOCKs *X... on/off")
-			GUI_A['blockFilter_on'] = Draw.Toggle('F', EVENT_NONE, b1-15, y, 15, 20, GUI_A['blockFilter_on'].val, "(*wip) support name filtering of BLOCKs on/off")
-			GUI_A['xref_on'] = Draw.Toggle('Xref', EVENT_NONE, b1, y, 20, 20, GUI_A['xref_on'].val, "support place holder for XREF-BLOCKs on/off")
-			GUI_A['blocks_as'] = Draw.Menu(blocks_as_menu, EVENT_NONE, b1+20, y, b1_-20, 20, GUI_A['blocks_as'].val, "select target representation for imported BLOCKs")
-		Draw.EndAlign()
-
-
-		y -= 20
-		Draw.BeginAlign()
-		GUI_A['views_on'] = Draw.Toggle('views', EVENT_NONE, b0, y, b0_-25, 20, GUI_A['views_on'].val, "imports VIEWs and VIEWPORTs as cameras on/off")
-		GUI_A['cams_on'] = Draw.Toggle('*cams', EVENT_NONE, b1-25, y, b1_-25, 20, GUI_A['cams_on'].val, "(*wip) support ASHADE cameras on/off")
-		GUI_A['lights_on'] = Draw.Toggle('*lights', EVENT_NONE, b1+25, y, b1_-25, 20, GUI_A['lights_on'].val, "(*wip) support AVE_RENDER lights on/off")
-		Draw.EndAlign()
-
-		y -= 10
-		y -= 20
-		y -= 20
-		y -= 20
-
+		y = y_top
 		y -= 10
 		y -= 20
 		Draw.BeginAlign()
@@ -5656,8 +5824,13 @@ def draw_UI():  #---------------------------------------------------------------
 		GUI_A['newScene_on'] = Draw.Toggle('newScene', EVENT_NONE, b0, y, b0_, 20, GUI_A['newScene_on'].val, "creates new Blender-Scene for each import on/off")
 		GUI_A['target_layer'] = Draw.Number('layer', EVENT_NONE, b1, y, b1_, 20, GUI_A['target_layer'].val, 1, 18, "imports into this Blender-layer (<19> reserved for block_definitions)")
 
+		if y < y_down: y_down = y
+		# -----end options --------------------------------------
+
+
 		#--------------------------------------
-		if y > y_down: y = y_down
+		y_top = y_down
+		y = y_top
 		#GUI_A['dummy_on'] = Draw.Toggle(' - ', EVENT_NONE, but0c, y, but_0c, 20, GUI_A['dummy_on'].val, "reserved")
 		y -= 30
 		Draw.BeginAlign()
@@ -5891,6 +6064,7 @@ def multi_import(DIR):
 
 
 
+UI_MODE = True
 
 if __name__ == "__main__":
 	UI_MODE = True
@@ -5942,5 +6116,4 @@ if 1:
 			main(_dxf)
 
 	print 'TOTAL TIME: %.6f' % (Blender.sys.time() - TIME)
-"""
-
+"""
\ No newline at end of file
diff --git a/release/scripts/uv_from_adjacent.py b/release/scripts/uv_from_adjacent.py
deleted file mode 100644
index 285cca97d8b..00000000000
--- a/release/scripts/uv_from_adjacent.py
+++ /dev/null
@@ -1,129 +0,0 @@
-#!BPY
-"""
-Name: 'UVs from unselected adjacent'
-Blender: 242
-Group: 'UVCalculation'
-Tooltip: 'Assign UVs to selected faces from surrounding unselected faces.'
-"""
-__author__ = "Campbell Barton"
-__url__ = ("blender", "blenderartists.org")
-__version__ = "1.0 2006/02/07"
-
-__bpydoc__ = """\
-This script sets the UV mapping and image of selected faces from adjacent unselected faces.
-
-Use this script in face select mode for texturing between textured faces.
-"""
-
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# Script copyright (C) Campbell J Barton
-#
-# 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 *****
-# --------------------------------------------------------------------------
-
-
-from Blender import *
-import bpy
-
-def mostUsedImage(imageList): # Returns the image most used in the list.
-	if not imageList:
-		return None
-	elif len(imageList) < 3:
-		return imageList[0]
-	
-	# 3+ Images, Get the most used image for surrounding faces.
-	imageCount = {}
-	for image in imageList:
-		if image:
-			image_key= image.name
-		else:
-			image_key = None
-		
-		try:
-			imageCount[image_key]['imageCount'] +=1 # an extra user of this image
-		except:
-			imageCount[image_key] = {'imageCount':1, 'blenderImage':image} # start with 1 user.
-	
-	# Now a list of tuples, (imageName, {imageCount, image})
-	imageCount = imageCount.items()
-	
-	try:	imageCount.sort(key=lambda a: a[1])
-	except:	imageCount.sort(lambda a,b: cmp(a[1], b[1]))
-	
-	
-	return imageCount[-1][1]['blenderImage']	
-
-
-def main():
-	sce = bpy.data.scenes.active
-	ob = sce.objects.active
-	
-	if ob == None or ob.type != 'Mesh':
-		Draw.PupMenu('ERROR: No mesh object in face select mode.')
-		return
-	me = ob.getData(mesh=1)
-	
-	if not me.faceUV:
-		Draw.PupMenu('ERROR: No mesh object in face select mode.')
-		return
-	
-	selfaces = [f for f in me.faces if f.sel]
-	unselfaces = [f for f in me.faces if not f.sel]
-	
-	
-	# Gather per Vert UV and Image, store in vertUvAverage
-	vertUvAverage = [[[],[]] for i in xrange(len(me.verts))]
-	
-	for f in unselfaces: # Unselected faces only.
-		fuv = f.uv
-		for i,v in enumerate(f):
-			vertUvAverage[v.index][0].append(fuv[i])
-			vertUvAverage[v.index][1].append(f.image)
-			
-	# Average per vectex UV coords
-	for vertUvData in vertUvAverage:
-		uvList = vertUvData[0]
-		if uvList:
-			# Convert from a list of vectors into 1 vector.
-			vertUvData[0] = reduce(lambda a,b: a+b, uvList, Mathutils.Vector(0,0)) * (1.0/len(uvList))
-		else:
-			vertUvData[0] = None
-	
-	# Assign to selected faces
-	TEX_FLAG = Mesh.FaceModes['TEX']
-	for f in selfaces:
-		uvlist = []
-		imageList = []
-		for i,v in enumerate(f):
-			uv, vImages = vertUvAverage[v.index]
-			uvlist.append( uv )
-			imageList.extend(vImages)
-		
-		if None not in uvlist:			
-			# all the faces images used by this faces vert. some faces will be added twice but thats ok.
-			# Get the most used image and assign to the face.
-			image = mostUsedImage(imageList) 
-			f.uv = uvlist
-			
-			if image:
-				f.image = image
-				f.mode |= TEX_FLAG
-	Window.RedrawAll()
-	
-if __name__ == '__main__':
-	main()
\ No newline at end of file
diff --git a/release/scripts/uv_seams_from_islands.py b/release/scripts/uv_seams_from_islands.py
index 241f38fc4aa..7f156efde7d 100644
--- a/release/scripts/uv_seams_from_islands.py
+++ b/release/scripts/uv_seams_from_islands.py
@@ -1,12 +1,31 @@
 #!BPY
 """
 Name: 'Seams from Islands'
-Blender: 243
+Blender: 246
 Group: 'UV'
 Tooltip: 'Add seams onto the mesh at the bounds of UV islands'
 """
 
-# Add a licence here if you wish to re-distribute, we recommend the GPL
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# Script copyright (C) Campbell Barton
+#
+# 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 *****
+# --------------------------------------------------------------------------
 
 from Blender import Scene, Mesh, Window, sys
 import BPyMessages
@@ -37,8 +56,11 @@ def seams_from_islands(me):
 	# add seams
 	SEAM = Mesh.EdgeFlags.SEAM
 	for ed in me.edges:
-		if len(set(edge_uvs[ed.key])) > 1:
-			ed.flag |= SEAM
+		try: # the edge might not be in a face
+			if len(set(edge_uvs[ed.key])) > 1:
+				ed.flag |= SEAM
+		except:
+			pass
 
 def main():
 	
diff --git a/release/scripts/uvcalc_lightmap.py b/release/scripts/uvcalc_lightmap.py
index 5f9f88a241d..37423b7197e 100644
--- a/release/scripts/uvcalc_lightmap.py
+++ b/release/scripts/uvcalc_lightmap.py
@@ -41,6 +41,12 @@ import BPyMesh
 
 from math import sqrt
 
+def AngleBetweenVecs(a1,a2):
+	try:
+		return Mathutils.AngleBetweenVecs(a1,a2)
+	except:
+		return 180.0
+
 class prettyface(object):
 	__slots__ = 'uv', 'width', 'height', 'children', 'xoff', 'yoff', 'has_parent', 'rot'
 	def __init__(self, data):
@@ -148,9 +154,9 @@ class prettyface(object):
 		if len(uv) == 2:
 			# match the order of angle sizes of the 3d verts with the UV angles and rotate.
 			def get_tri_angles(v1,v2,v3):
-				a1= Mathutils.AngleBetweenVecs(v2-v1,v3-v1)
-				a2= Mathutils.AngleBetweenVecs(v1-v2,v3-v2)
-				a3 = 180 - (a1+a2) #a3= Mathutils.AngleBetweenVecs(v2-v3,v1-v3)
+				a1= AngleBetweenVecs(v2-v1,v3-v1)
+				a2= AngleBetweenVecs(v1-v2,v3-v2)
+				a3 = 180 - (a1+a2) #a3= AngleBetweenVecs(v2-v3,v1-v3)
 				
 				
 				return [(a1,0),(a2,1),(a3,2)]
@@ -237,8 +243,17 @@ PREF_MARGIN_DIV=		512):
 			face_groups.append(faces)
 		
 		if PREF_NEW_UVLAYER:
-			me.addUVLayer('lightmap')
-			me.activeUVLayer = 'lightmap'
+			uvname_org = uvname = 'lightmap'
+			uvnames = me.getUVLayerNames()
+			i = 1
+			while uvname in uvnames:
+				uvname = '%s.%03d' % (uvname_org, i)
+				i+=1
+			
+			me.addUVLayer(uvname)
+			me.activeUVLayer = uvname
+			
+			del uvnames, uvname_org, uvname
 	
 	for face_sel in face_groups:
 		print "\nStarting unwrap"
@@ -402,11 +417,14 @@ PREF_MARGIN_DIV=		512):
 		# ...limiting this is needed or you end up with bug unused texture spaces
 		# ...however if its too high, boxpacking is way too slow for high poly meshes.
 		float_to_int_factor = lengths_to_ints[0][0]
-		max_int_dimension = int(((side_len / float_to_int_factor)) / PREF_BOX_DIV)
-		
+		if float_to_int_factor > 0:
+			max_int_dimension = int(((side_len / float_to_int_factor)) / PREF_BOX_DIV)
+			ok = True
+		else:
+			max_int_dimension = 0.0 # wont be used
+			ok = False
 		
 		# RECURSIVE prettyface grouping
-		ok = True
 		while ok:
 			ok = False
 			
diff --git a/release/windows/installer/00.sconsblender.nsi b/release/windows/installer/00.sconsblender.nsi
index c4e504a5bff..338075c1b18 100644
--- a/release/windows/installer/00.sconsblender.nsi
+++ b/release/windows/installer/00.sconsblender.nsi
@@ -32,7 +32,7 @@ Name "Blender VERSION"
     
 !insertmacro MUI_PAGE_DIRECTORY
 Page custom DataLocation DataLocationOnLeave
-Page custom AppDataChoice AppDataChoiceOnLeave
+;Page custom AppDataChoice AppDataChoiceOnLeave
 Page custom PreMigrateUserSettings MigrateUserSettings
 !insertmacro MUI_PAGE_INSTFILES
 !insertmacro MUI_PAGE_FINISH
@@ -271,7 +271,9 @@ Function DataLocationOnLeave
 	StrCpy $SETUSERCONTEXT "false"
 	${NSD_GetState} $HWND_APPDATA $R0
 	${If} $R0 == "1"
-	  StrCpy $SETUSERCONTEXT "true"
+	  ; FIXME: disabled 'all users' until fully multi-user compatible
+	  ;StrCpy $SETUSERCONTEXT "true"
+	  Call SetWinXPPathCurrentUser
 	${Else}
 	  ${NSD_GetState} $HWND_INSTDIR $R0
 	  ${If} $R0 == "1"
diff --git a/source/blender/blenkernel/BKE_bmesh.h b/source/blender/blenkernel/BKE_bmesh.h
index 08ad8192688..51a5d29dbb7 100644
--- a/source/blender/blenkernel/BKE_bmesh.h
+++ b/source/blender/blenkernel/BKE_bmesh.h
@@ -40,16 +40,35 @@
 #include "DNA_listBase.h"
 #include "BLI_ghash.h"
 #include "BLI_memarena.h"
-#include "DNA_customdata_types.h"
+#include "DNA_image_types.h"
 #include "BLI_editVert.h"
 #include "BKE_DerivedMesh.h"
 #include "transform.h"
+#include "BKE_bmeshCustomData.h"
 
+/*forward declerations*/
 struct BME_Vert;
 struct BME_Edge;
 struct BME_Poly;
 struct BME_Loop;
 
+
+/*structure for fast memory allocation/frees*/
+typedef struct BME_mempool{
+	struct ListBase chunks;
+	int esize, csize, pchunk;		/*size of elements and chunks in bytes and number of elements per chunk*/
+	struct BME_freenode	*free;		/*free element list. Interleaved into chunk datas.*/
+}BME_mempool;
+
+/*Notes on further structure Cleanup:
+	-Remove the tflags, they belong in custom data layers
+	-Remove the eflags completely, they are mostly not used
+	-Remove the selection/vis/bevel weight flag/values ect and move them to custom data
+	-Remove EID member and move to custom data
+	-Add a radial cycle length, disk cycle length and loop cycle lenght attributes to custom data and have eulers maintain/use them if present.
+	-Move data such as vertex coordinates/normals to custom data and leave pointers in structures to active layer data.
+	-Remove BME_CycleNode structure?
+*/
 typedef struct BME_CycleNode{
 	struct BME_CycleNode *next, *prev;
 	void *data;
@@ -57,16 +76,21 @@ typedef struct BME_CycleNode{
 
 typedef struct BME_Mesh
 {
-	ListBase verts, edges, polys, loops;
-	int totvert, totedge, totpoly, totloop;			/*record keeping*/
-	int nextv, nexte, nextp, nextl;					/*Next element ID for verts/edges/faces/loops. Never reused*/
-	struct CustomData vdata, edata, pdata, ldata;	/*Custom Data Layer information*/
+	ListBase verts, edges, polys;
+	/*memory pools used for storing mesh elements*/
+	struct BME_mempool *vpool;
+	struct BME_mempool *epool;
+	struct BME_mempool *ppool;
+	struct BME_mempool *lpool;
 	/*some scratch arrays used by eulers*/
 	struct BME_Vert **vtar;
 	struct BME_Edge **edar;
 	struct BME_Loop **lpar;
 	struct BME_Poly **plar;
 	int vtarlen, edarlen, lparlen, plarlen;
+	int totvert, totedge, totpoly, totloop;				/*record keeping*/
+	int nextv, nexte, nextp, nextl;						/*Next element ID for verts/edges/faces/loops. Never reused*/
+	struct BME_CustomData vdata, edata, pdata, ldata;	/*Custom Data Layer information*/
 } BME_Mesh;
 
 typedef struct BME_Vert
@@ -102,7 +126,6 @@ typedef struct BME_Loop
 	struct BME_Loop *next, *prev;					/*circularly linked list around face*/
 	int EID;
 	struct BME_CycleNode radial;					/*circularly linked list used to find faces around an edge*/
-	struct BME_CycleNode *gref;						/*pointer to loop ref. Nasty.*/
 	struct BME_Vert *v;								/*vertex that this loop starts at.*/
 	struct BME_Edge *e;								/*edge this loop belongs to*/
 	struct BME_Poly *f;								/*face this loop belongs to*/	
@@ -124,7 +147,7 @@ typedef struct BME_Poly
 	unsigned short flag, h, mat_nr;
 } BME_Poly;
 
-//*EDGE UTILITIES*/
+/*EDGE UTILITIES*/
 int BME_verts_in_edge(struct BME_Vert *v1, struct BME_Vert *v2, struct BME_Edge *e);
 int BME_vert_in_edge(struct BME_Edge *e, BME_Vert *v);
 struct BME_Vert *BME_edge_getothervert(struct BME_Edge *e, struct BME_Vert *v);
@@ -146,7 +169,7 @@ int BME_radial_find_face(struct BME_Edge *e,struct BME_Poly *f);
 struct BME_Loop *BME_loop_find_loop(struct BME_Poly *f, struct BME_Vert *v);
 
 /*MESH CREATION/DESTRUCTION*/
-struct BME_Mesh *BME_make_mesh(void);
+struct BME_Mesh *BME_make_mesh(int allocsize[4], struct BME_CustomDataInit init[4]);
 void BME_free_mesh(struct BME_Mesh *bm);
 /*FULL MESH VALIDATION*/
 int BME_validate_mesh(struct BME_Mesh *bm, int halt);
@@ -230,8 +253,8 @@ float *BME_bevel_calc_polynormal(struct BME_Poly *f, struct BME_TransData_Head *
 struct BME_Mesh *BME_bevel(struct BME_Mesh *bm, float value, int res, int options, int defgrp_index, float angle, BME_TransData_Head **rtd);
 
 /*CONVERSION FUNCTIONS*/
-struct BME_Mesh *BME_editmesh_to_bmesh(EditMesh *em, struct BME_Mesh *bm);
+struct BME_Mesh *BME_editmesh_to_bmesh(EditMesh *em);
 struct EditMesh *BME_bmesh_to_editmesh(struct BME_Mesh *bm, BME_TransData_Head *td);
-struct BME_Mesh *BME_derivedmesh_to_bmesh(struct DerivedMesh *dm, struct BME_Mesh *bm);
+struct BME_Mesh *BME_derivedmesh_to_bmesh(struct DerivedMesh *dm);
 struct DerivedMesh *BME_bmesh_to_derivedmesh(struct BME_Mesh *bm, struct DerivedMesh *dm);
 #endif
diff --git a/source/blender/blenkernel/BKE_bmeshCustomData.h b/source/blender/blenkernel/BKE_bmeshCustomData.h
new file mode 100644
index 00000000000..423f75e532d
--- /dev/null
+++ b/source/blender/blenkernel/BKE_bmeshCustomData.h
@@ -0,0 +1,108 @@
+/**
+ * BKE_bmesh.h    jan 2007
+ *
+ *	BMesh modeler structure and functions.
+ *
+ * $Id: BKE_bmesh.h,v 1.00 2007/01/17 17:42:01 Briggs Exp $
+ *
+ * ***** 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. 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) 2004 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): Geoffrey Bantle.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+
+#ifndef BKE_BMESHCUSTOMDATA_H
+#define BKE_BMESHCUSTOMDATA_H
+
+struct BME_mempool;
+
+/*Custom Data Types and defines
+	Eventual plan is to move almost everything to custom data and let caller
+	decide when making the mesh what layers they want to store in the mesh
+
+	This stuff should probably go in a seperate file....
+*/
+
+#define BME_CD_FACETEX		0		/*Image texture/texface*/
+#define BME_CD_LOOPTEX		1		/*UV coordinates*/
+#define BME_CD_LOOPCOL		2		/*Vcolors*/
+#define BME_CD_DEFORMVERT	3		/*Vertex Group/Weights*/
+#define BME_CD_NUMTYPES		4
+
+typedef struct BME_CustomDataLayer {
+	int type;       				/* type of data in layer */
+	int offset;     				/* offset of layer in block */
+	int active;     				/* offset of active layer*/
+	char name[32];  				/* layer name */
+} BME_CustomDataLayer;
+
+typedef struct BME_CustomData {
+	struct BME_CustomDataLayer *layers;	/*Custom Data Layers*/
+	struct BME_mempool *pool;				/*pool for alloc of blocks*/
+	int totlayer, totsize;         	/*total layers and total size in bytes of each block*/
+} BME_CustomData;
+
+typedef struct BME_CustomDataInit{
+	int layout[BME_CD_NUMTYPES];
+	int active[BME_CD_NUMTYPES];
+	int totlayers;
+	char *nametemplate;
+} BME_CustomDataInit;
+
+/*Custom data types*/
+typedef struct BME_DeformWeight {
+	int				def_nr;
+	float			weight;
+} BME_DeformWeight;
+
+typedef struct BME_DeformVert {
+	struct BME_DeformWeight *dw;
+	int totweight;
+} BME_DeformVert;
+
+typedef struct BME_facetex{
+	struct Image *tpage;
+	char flag, transp;
+	short mode, tile, unwrap;
+}BME_facetex;
+
+typedef struct BME_looptex{
+	float u, v;
+}BME_looptex;
+
+typedef struct BME_loopcol{
+	char r, g, b, a;
+}BME_loopcol;
+
+/*CUSTOM DATA API*/
+void BME_CD_Create(struct BME_CustomData *data, struct BME_CustomDataInit *init, int initalloc);
+void BME_CD_Free(struct BME_CustomData *data);
+void BME_CD_free_block(struct BME_CustomData *data, void **block);
+void BME_CD_copy_data(const struct BME_CustomData *source, struct BME_CustomData *dest, void *src_block, void **dest_block);
+void BME_CD_set_default(struct BME_CustomData *data, void **block);
+
+#endif
diff --git a/source/blender/blenkernel/BKE_cloth.h b/source/blender/blenkernel/BKE_cloth.h
index af920e9762d..2e5da236a89 100644
--- a/source/blender/blenkernel/BKE_cloth.h
+++ b/source/blender/blenkernel/BKE_cloth.h
@@ -24,14 +24,14 @@
  *
  * The Original Code is: all of this file.
  *
- * Contributor(s): none yet.
+ * Contributor(s): Daniel Genrich
  *
  * ***** END GPL LICENSE BLOCK *****
  */
 #ifndef BKE_CLOTH_H
 #define BKE_CLOTH_H
 
-#include "float.h"
+#include <float.h>
 
 #include "BLI_linklist.h"
 #include "BKE_customdata.h"
@@ -102,7 +102,8 @@ typedef struct Cloth
 	unsigned char 		old_solver_type;	/* unused, only 1 solver here */
 	unsigned char 		pad2;
 	short 			pad3;
-	struct BVH		*tree;			/* collision tree for this cloth object */
+	struct BVHTree		*bvhtree;			/* collision tree for this cloth object */
+	struct BVHTree 		*bvhselftree;			/* collision tree for this cloth object */
 	struct MFace 		*mfaces;
 	struct Implicit_Data	*implicit; 		/* our implicit solver connects to this pointer */
 	struct Implicit_Data	*implicitEM; 		/* our implicit solver connects to this pointer */
@@ -171,17 +172,10 @@ ClothSpring;
 /* These are the bits used in SimSettings.flags. */
 typedef enum
 {
-	//CLOTH_SIMSETTINGS_FLAG_RESET = ( 1 << 1 ),	// The CM object requires a reinitializaiton.
 	CLOTH_SIMSETTINGS_FLAG_COLLOBJ = ( 1 << 2 ),// object is only collision object, no cloth simulation is done
 	CLOTH_SIMSETTINGS_FLAG_GOAL = ( 1 << 3 ), 	// we have goals enabled
 	CLOTH_SIMSETTINGS_FLAG_TEARING = ( 1 << 4 ),// true if tearing is enabled
-	//CLOTH_SIMSETTINGS_FLAG_CCACHE_PROTECT = ( 1 << 5 ), // true if tearing is enabled
-	//CLOTH_SIMSETTINGS_FLAG_EDITMODE = ( 1 << 6 ), // are we in editmode? -several things disabled
-	//CLOTH_SIMSETTINGS_FLAG_CCACHE_FFREE = ( 1 << 7 ), /* force cache freeing */
 	CLOTH_SIMSETTINGS_FLAG_SCALING = ( 1 << 8 ), /* is advanced scaling active? */
-	//CLOTH_SIMSETTINGS_FLAG_LOADED = ( 1 << 9 ), /* did we just got load? */
-	//CLOTH_SIMSETTINGS_FLAG_AUTOPROTECT = ( 1 << 10 ), /* is autoprotect enabled? */
-	//CLOTH_SIMSETTINGS_FLAG_CCACHE_OUTDATED = (1 << 11),	/* while protected, did cache get outdated? */
 	CLOTH_SIMSETTINGS_FLAG_CCACHE_EDIT = (1 << 12)	/* edit cache in editmode */
 } CLOTH_SIMSETTINGS_FLAGS;
 
@@ -208,6 +202,7 @@ typedef enum
 	CLOTH_SPRING_FLAG_NEEDED = ( 1 << 2 ), // springs has values to be applied
 } CLOTH_SPRINGS_FLAGS;
 
+
 /////////////////////////////////////////////////
 // collision.c
 ////////////////////////////////////////////////
@@ -246,7 +241,8 @@ DerivedMesh *clothModifier_do ( ClothModifierData *clmd,Object *ob, DerivedMesh
 void cloth_update_normals ( ClothVertex *verts, int nVerts, MFace *face, int totface );
 
 // needed for collision.c
-void bvh_update_from_cloth ( ClothModifierData *clmd, int moving );
+void bvhtree_update_from_cloth ( ClothModifierData *clmd, int moving );
+void bvhselftree_update_from_cloth ( ClothModifierData *clmd, int moving );
 
 // needed for editmesh.c
 void cloth_write_cache ( Object *ob, ClothModifierData *clmd, float framenr );
@@ -261,11 +257,6 @@ int cloth_add_spring ( ClothModifierData *clmd, unsigned int indexA, unsigned in
 ////////////////////////////////////////////////
 
 
-/* Typedefs for function pointers we need for solvers and collision detection. */
-typedef void ( *CM_COLLISION_SELF ) ( ClothModifierData *clmd, int step );
-typedef void ( *CM_COLLISION_OBJ ) ( ClothModifierData *clmd, int step, CM_COLLISION_RESPONSE collision_response );
-
-
 /* This enum provides the IDs for our solvers. */
 // only one available in the moment
 typedef enum
@@ -286,15 +277,6 @@ typedef struct
 }
 CM_SOLVER_DEF;
 
-/* used for caching in implicit.c */
-typedef struct Frame
-{
-	ClothVertex *verts;
-	ClothSpring *springs;
-	unsigned int numverts, numsprings;
-	float time; /* we need float since we want to support sub-frames */
-}
-Frame;
 
 #endif
 
diff --git a/source/blender/blenkernel/BKE_collision.h b/source/blender/blenkernel/BKE_collision.h
index 7328f9108e3..2966d932a49 100644
--- a/source/blender/blenkernel/BKE_collision.h
+++ b/source/blender/blenkernel/BKE_collision.h
@@ -24,7 +24,7 @@
  *
  * The Original Code is: all of this file.
  *
- * Contributor(s): none yet.
+ * Contributor(s): Daniel Genrich
  *
  * ***** END GPL LICENSE BLOCK *****
  */
@@ -32,7 +32,7 @@
 #define BKE_COLLISIONS_H
 
 #include <math.h>
-#include "float.h"
+#include <float.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -47,68 +47,27 @@
 #include "DNA_modifier_types.h"
 #include "DNA_object_types.h"
 
+#include "BLI_kdopbvh.h"
+
 struct Object;
 struct Cloth;
 struct MFace;
 struct DerivedMesh;
 struct ClothModifierData;
-struct CollisionTree;
-
 
 ////////////////////////////////////////
-// used in kdop.c and collision.c
+// used for collisions in collision.c
 ////////////////////////////////////////
-typedef struct CollisionTree
+
+/* COLLISION FLAGS */
+typedef enum
 {
-	struct CollisionTree *nodes[4]; // 4 children --> quad-tree
-	struct CollisionTree *parent;
-	struct CollisionTree *nextLeaf;
-	struct CollisionTree *prevLeaf;
-	float	bv[26]; // Bounding volume of all nodes / we have 7 axes on a 14-DOP
-	unsigned int tri_index; // this saves the index of the face
-	// int point_index[4]; // supports up to 4 points in a leaf
-	int	count_nodes; // how many nodes are used
-	int	traversed;  // how many nodes already traversed until this level?
-	int	isleaf;
-	float alpha; /* for selfcollision */
-	float normal[3]; /* for selfcollision */
-}
-CollisionTree;
-
-typedef struct BVH
-{
-	unsigned int 	numfaces;
-	unsigned int 	numverts;
-	MVert 		*current_x; // e.g. txold in clothvertex
-	MVert 		*current_xold; // e.g. tx in clothvertex
-	MFace 		*mfaces; // just a pointer to the original datastructure
-	struct LinkNode *tree;
-	CollisionTree 	*root; // TODO: saving the root --> is this really needed? YES!
-	CollisionTree 	*leaf_tree; /* Tail of the leaf linked list.	*/
-	CollisionTree 	*leaf_root;	/* Head of the leaf linked list.	*/
-	float 		epsilon; /* epslion is used for inflation of the k-dop	   */
-	int 		flags; /* bvhFlags */
-}
-BVH;
-////////////////////////////////////////
-
-
-
-////////////////////////////////////////
-// kdop.c
-////////////////////////////////////////
-
-// needed for collision.c
-typedef void ( *CM_COLLISION_RESPONSE ) ( ModifierData *md1, ModifierData *md2, CollisionTree *tree1, CollisionTree *tree2 );
-
-// needed for collision.c
-int bvh_traverse ( ModifierData * md1, ModifierData * md2, CollisionTree * tree1, CollisionTree * tree2, float step, CM_COLLISION_RESPONSE collision_response, int selfcollision);
-
-////////////////////////////////////////
+	COLLISION_IN_FUTURE = ( 1 << 1 ),
+} COLLISION_FLAGS;
 
 
 ////////////////////////////////////////
-// used for collisions in kdop.c and also collision.c
+// used for collisions in collision.c
 ////////////////////////////////////////
 /* used for collisions in collision.c */
 typedef struct CollPair
@@ -119,10 +78,10 @@ typedef struct CollPair
 	float normal[3];
 	float vector[3]; // unnormalized collision vector: p2-p1
 	float pa[3], pb[3]; // collision point p1 on face1, p2 on face2
-	int lastsign; // indicates if the distance sign has changed, unused itm
+	int flag;
 	float time; // collision time, from 0 up to 1
-	unsigned int ap1, ap2, ap3, bp1, bp2, bp3;
-	unsigned int pointsb[4];
+	int ap1, ap2, ap3, bp1, bp2, bp3;
+	int pointsb[4];
 }
 CollPair;
 
@@ -157,32 +116,22 @@ FaceCollPair;
 // forward declarations
 /////////////////////////////////////////////////
 
-// NOTICE: mvert-routines for building + update the BVH are the most native ones
-
-// builds bounding volume hierarchy
-void bvh_build (BVH *bvh);
-BVH *bvh_build_from_mvert (MFace *mfaces, unsigned int numfaces, MVert *x, unsigned int numverts, float epsilon);
-
-// frees the same
-void bvh_free ( BVH * bvh );
-
-// checks two bounding volume hierarchies for potential collisions and returns some list with those
-
-
-// update bounding volumes, needs updated positions in  bvh->current_xold (static) 
-// and also bvh->current_x if moving==1
-void bvh_update_from_mvert(BVH * bvh, MVert *x, unsigned int numverts, MVert *xnew, int moving);
-void bvh_update(BVH * bvh, int moving);
+/////////////////////////////////////////////////
+// used in modifier.c from collision.c
+/////////////////////////////////////////////////
+BVHTree *bvhtree_build_from_mvert ( MFace *mfaces, unsigned int numfaces, MVert *x, unsigned int numverts, float epsilon );
+void bvhtree_update_from_mvert ( BVHTree * bvhtree, MFace *faces, int numfaces, MVert *x, MVert *xnew, int numverts, int moving );
+/////////////////////////////////////////////////
 
 LinkNode *BLI_linklist_append_fast ( LinkNode **listp, void *ptr );
 
 // move Collision modifier object inter-frame with step = [0,1]
 // defined in collisions.c
-void collision_move_object(CollisionModifierData *collmd, float step, float prevstep);
+void collision_move_object ( CollisionModifierData *collmd, float step, float prevstep );
 
 // interface for collision functions
-void collisions_compute_barycentric (float pv[3], float p1[3], float p2[3], float p3[3], float *w1, float *w2, float *w3);
-void interpolateOnTriangle(float to[3], float v1[3], float v2[3], float v3[3], double w1, double w2, double w3);
+void collisions_compute_barycentric ( float pv[3], float p1[3], float p2[3], float p3[3], float *w1, float *w2, float *w3 );
+void interpolateOnTriangle ( float to[3], float v1[3], float v2[3], float v3[3], double w1, double w2, double w3 );
 
 /////////////////////////////////////////////////
 
diff --git a/source/blender/blenkernel/intern/BME_Customdata.c b/source/blender/blenkernel/intern/BME_Customdata.c
new file mode 100644
index 00000000000..8b48efbdbd2
--- /dev/null
+++ b/source/blender/blenkernel/intern/BME_Customdata.c
@@ -0,0 +1,198 @@
+/**
+ * BME_customdata.c    jan 2007
+ *
+ *	Custom Data functions for Bmesh
+ *
+ * $Id: BKE_bmesh.h,v 1.00 2007/01/17 17:42:01 Briggs Exp $
+ *
+ * ***** 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. 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) 2004 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): Geoffrey Bantle, Brecht Van Lommel, Ben Batt
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+
+#include "BKE_bmesh.h"
+#include "BKE_bmeshCustomData.h"
+#include "bmesh_private.h"
+#include <string.h>
+#include "MEM_guardedalloc.h"
+
+/********************* Layer type information **********************/
+typedef struct BME_LayerTypeInfo {
+	int size;
+	char *defaultname;
+	void (*copy)(const void *source, void *dest, int count);
+	void (*free)(void *data, int count, int size);
+	void (*interp)(void **sources, float *weights, float *sub_weights, int count, void *dest);
+	void (*set_default)(void *data, int count);
+} BME_LayerTypeInfo;
+const BME_LayerTypeInfo BMELAYERTYPEINFO[BME_CD_NUMTYPES] = {
+	{sizeof(BME_facetex), "TexFace", NULL, NULL, NULL, NULL},
+	{sizeof(BME_looptex), "UV", NULL, NULL, NULL, NULL},
+	{sizeof(BME_loopcol), "VCol", NULL, NULL, NULL, NULL},
+	{sizeof(BME_DeformVert), "Group", NULL, NULL, NULL, NULL}
+};
+static const BME_LayerTypeInfo *BME_layerType_getInfo(int type)
+{
+	if(type < 0 || type >= CD_NUMTYPES) return NULL;
+
+	return &BMELAYERTYPEINFO[type];
+}
+void BME_CD_Create(BME_CustomData *data, BME_CustomDataInit *init, int initalloc)
+{
+	int i, j, offset=0;
+	const BME_LayerTypeInfo *info;
+	
+	/*initialize data members*/
+	data->layers = NULL;
+	data->pool = NULL;
+	data->totlayer = 0;
+	data->totsize = 0;
+
+	/*first count how many layers to alloc*/
+	for(i=0; i < BME_CD_NUMTYPES; i++){
+		info = BME_layerType_getInfo(i);
+		data->totlayer += init->layout[i];
+		data->totsize  += (init->layout[i] * info->size);
+	}
+	/*alloc our layers*/
+	if(data->totlayer){
+		/*alloc memory*/
+		data->layers = MEM_callocN(sizeof(BME_CustomDataLayer)*data->totlayer, "BMesh Custom Data Layers");
+		data->pool = BME_mempool_create(data->totsize, initalloc, initalloc);
+		/*initialize layer data*/
+		for(i=0; i < BME_CD_NUMTYPES; i++){
+			if(init->layout[i]){
+				info = BME_layerType_getInfo(i);
+				for(j=0; j < init->layout[i]; j++){
+					if(j==0) data->layers[j+i].active = init->active[i];
+					data->layers[j+i].type = i;
+					data->layers[j+i].offset = offset;	
+					strcpy(data->layers[j+i].name, &(init->nametemplate[j+i]));
+					offset += info->size;
+				}
+			}
+		}
+	}
+}
+
+void BME_CD_Free(BME_CustomData *data)
+{
+	if(data->pool) BME_mempool_destroy(data->pool);
+}
+
+/*Block level ops*/
+void BME_CD_free_block(BME_CustomData *data, void **block)
+{
+	const BME_LayerTypeInfo *typeInfo;
+	int i;
+
+	if(!*block) return;
+	for(i = 0; i < data->totlayer; ++i) {
+		typeInfo = BME_layerType_getInfo(data->layers[i].type);
+		if(typeInfo->free) {
+			int offset = data->layers[i].offset;
+			typeInfo->free((char*)*block + offset, 1, typeInfo->size);
+		}
+	}
+	BME_mempool_free(data->pool, *block);
+	*block = NULL;
+}
+
+
+static void BME_CD_alloc_block(BME_CustomData *data, void **block)
+{	
+	
+	if (*block) BME_CD_free_block(data, block); //if we copy layers that have their own free functions like deformverts
+	
+	if (data->totsize > 0)
+		*block = BME_mempool_alloc(data->pool);	
+	else
+		*block = NULL;
+}
+
+void BME_CD_copy_data(const BME_CustomData *source, BME_CustomData *dest,
+                            void *src_block, void **dest_block)
+{
+	const BME_LayerTypeInfo *typeInfo;
+	int dest_i, src_i;
+
+	if (!*dest_block) /*for addXXXlist functions!*/
+		BME_CD_alloc_block(dest, dest_block);
+	
+	/* copies a layer at a time */
+	dest_i = 0;
+	for(src_i = 0; src_i < source->totlayer; ++src_i) {
+
+		/* find the first dest layer with type >= the source type
+		 * (this should work because layers are ordered by type)
+		 */
+		while(dest_i < dest->totlayer
+		      && dest->layers[dest_i].type < source->layers[src_i].type)
+			++dest_i;
+
+		/* if there are no more dest layers, we're done */
+		if(dest_i >= dest->totlayer) return;
+
+		/* if we found a matching layer, copy the data */
+		if(dest->layers[dest_i].type == source->layers[src_i].type &&
+			strcmp(dest->layers[dest_i].name, source->layers[src_i].name) == 0) {
+			char *src_data = (char*)src_block + source->layers[src_i].offset;
+			char *dest_data = (char*)*dest_block + dest->layers[dest_i].offset;
+
+			typeInfo = BME_layerType_getInfo(source->layers[src_i].type);
+
+			if(typeInfo->copy)
+				typeInfo->copy(src_data, dest_data, 1);
+			else
+				memcpy(dest_data, src_data, typeInfo->size);
+
+			/* if there are multiple source & dest layers of the same type,
+			 * we don't want to copy all source layers to the same dest, so
+			 * increment dest_i
+			 */
+			++dest_i;
+		}
+	}
+}
+void BME_CD_set_default(BME_CustomData *data, void **block)
+{
+	const BME_LayerTypeInfo *typeInfo;
+	int i;
+
+	if (!*block)
+		BME_CD_alloc_block(data, block); //for addXXXlist functions...
+
+	for(i = 0; i < data->totlayer; ++i) {
+		int offset = data->layers[i].offset;
+
+		typeInfo = BME_layerType_getInfo(data->layers[i].type);
+
+		if(typeInfo->set_default)
+			typeInfo->set_default((char*)*block + offset, 1);
+	}
+}
diff --git a/source/blender/blenkernel/intern/BME_conversions.c b/source/blender/blenkernel/intern/BME_conversions.c
index 369c19b16c8..08483711c45 100644
--- a/source/blender/blenkernel/intern/BME_conversions.c
+++ b/source/blender/blenkernel/intern/BME_conversions.c
@@ -55,7 +55,10 @@
 
 #include "BSE_edit.h"
 
-BME_Mesh *BME_editmesh_to_bmesh(EditMesh *em, BME_Mesh *bm) {
+BME_Mesh *BME_editmesh_to_bmesh(EditMesh *em) {
+	BME_Mesh *bm;
+	int allocsize[4] = {512,512,2048,512};
+	BME_CustomDataInit *init = MEM_callocN(sizeof(BME_CustomDataInit) * 4, "Bmesh custom data init");
 	BME_Vert *v1, *v2;
 	BME_Edge *e, *edar[4];
 	BME_Poly *f;
@@ -65,7 +68,7 @@ BME_Mesh *BME_editmesh_to_bmesh(EditMesh *em, BME_Mesh *bm) {
 	EditFace *efa;
 
 	int len;
-
+	bm = BME_make_mesh(allocsize,init);
 	BME_model_begin(bm);
 	
 	/*add verts*/
@@ -134,6 +137,7 @@ BME_Mesh *BME_editmesh_to_bmesh(EditMesh *em, BME_Mesh *bm) {
 		efa = efa->next;
 	}
 	BME_model_end(bm);
+	MEM_freeN(init);
 	return bm;
 }
 
@@ -224,21 +228,24 @@ EditMesh *BME_bmesh_to_editmesh(BME_Mesh *bm, BME_TransData_Head *td) {
 }
 
 /* Adds the geometry found in dm to bm
- * NOTE: it does not allocate a new BME_Mesh!
- */
-BME_Mesh *BME_derivedmesh_to_bmesh(DerivedMesh *dm, BME_Mesh *bm)
+  */
+BME_Mesh *BME_derivedmesh_to_bmesh(DerivedMesh *dm)
 {
+	
+	BME_Mesh *bm;
+	int allocsize[4] = {512,512,2048,512};
+	BME_CustomDataInit *init = MEM_callocN(sizeof(BME_CustomDataInit) * 4, "Bmesh custom data init");
 	MVert *mvert, *mv;
 	MEdge *medge, *me;
 	MFace *mface, *mf;
 	int totface,totedge,totvert,i,len;
-
 	BME_Vert *v1=NULL,*v2=NULL, **vert_array;
 	BME_Edge *e=NULL;
 	BME_Poly *f=NULL;
 	
 	EdgeHash *edge_hash = BLI_edgehash_new();
-	
+
+	bm = BME_make_mesh(allocsize,init);
 	totvert = dm->getNumVerts(dm);
 	totedge = dm->getNumEdges(dm);
 	totface = dm->getNumFaces(dm);
@@ -293,6 +300,7 @@ BME_Mesh *BME_derivedmesh_to_bmesh(DerivedMesh *dm, BME_Mesh *bm)
 	BME_model_end(bm);
 	BLI_edgehash_free(edge_hash, NULL);
 	MEM_freeN(vert_array);
+	MEM_freeN(init);
 	return bm;
 }
 
diff --git a/source/blender/blenkernel/intern/BME_mesh.c b/source/blender/blenkernel/intern/BME_mesh.c
index d9d2354ef36..184ef2b8a0e 100644
--- a/source/blender/blenkernel/intern/BME_mesh.c
+++ b/source/blender/blenkernel/intern/BME_mesh.c
@@ -59,14 +59,39 @@
 /*	
  *	BME MAKE MESH
  *
- *  Allocates a new BME_Mesh structure
+ *  Allocates a new BME_Mesh structure.
+ *	The arguments are two arrays, one of type int
+ *  and another of type BME_CustomDataInit. The first array
+ *  contains the allocation size for each element pool in 
+ *  the mesh. For instance allocsize[0] contains the number
+ *  of vertices to allocate at a time for the vertex pool.
+ *
+ *  The second array contains structures describing the layout
+ *  of custom data for each element type in the mesh. So init[0]
+ *  contains the custom data layout information for vertices, init[1]
+ *  the layout information for edges and so on.
+ *
+ *  Returns -
+ *  Pointer to a Bmesh
+ *
 */
 
-BME_Mesh *BME_make_mesh(void){
+BME_Mesh *BME_make_mesh(int allocsize[4], BME_CustomDataInit init[4])
+{
+	/*allocate the structure*/
 	BME_Mesh *bm = MEM_callocN(sizeof(BME_Mesh),"BMesh");
+	/*allocate the memory pools for the mesh elements*/
+	bm->vpool = BME_mempool_create(sizeof(BME_Vert), allocsize[0], allocsize[0]);
+	bm->epool = BME_mempool_create(sizeof(BME_Edge), allocsize[1], allocsize[1]);
+	bm->lpool = BME_mempool_create(sizeof(BME_Loop), allocsize[2], allocsize[2]);
+	bm->ppool = BME_mempool_create(sizeof(BME_Poly), allocsize[3], allocsize[3]);
+	/*Setup custom data layers*/
+	BME_CD_Create(&bm->vdata, &init[0], allocsize[0]);
+	BME_CD_Create(&bm->edata, &init[1], allocsize[1]);
+	BME_CD_Create(&bm->ldata, &init[2], allocsize[2]);
+	BME_CD_Create(&bm->pdata, &init[3], allocsize[3]);
 	return bm;
 }
-
 /*	
  *	BME FREE MESH
  *
@@ -75,45 +100,31 @@ BME_Mesh *BME_make_mesh(void){
 
 void BME_free_mesh(BME_Mesh *bm)
 {
-	BME_Poly *bf, *nextf;
-	BME_Edge *be, *nexte;
-	BME_Vert *bv, *nextv;
-	BME_CycleNode *loopref;
-	
-	/*destroy polygon data*/
-	bf = bm->polys.first;
-	while(bf){
-		nextf = bf->next;
-		BLI_remlink(&(bm->polys), bf);
-		BME_free_poly(bm, bf);
-		
-		bf = nextf;
+	BME_Vert *v;
+	BME_Edge *e;
+	BME_Loop *l;
+	BME_Poly *f;
+
+	for(v=bm->verts.first; v; v=v->next) BME_CD_free_block(&bm->vdata, &v->data);
+	for(e=bm->edges.first; e; e=e->next) BME_CD_free_block(&bm->edata, &e->data);
+	for(f=bm->polys.first; f; f=f->next){
+		BME_CD_free_block(&bm->pdata, &f->data);
+		l = f->loopbase;
+		do{
+			BME_CD_free_block(&bm->ldata, &l->data);
+			l = l->next;
+		}while(l!=f->loopbase);
 	}
-	/*destroy edge data*/
-	be = bm->edges.first;
-	while(be){
-		nexte = be->next;
-		BLI_remlink(&(bm->edges), be);
-		BME_free_edge(bm, be);
-		be = nexte;
-	}
-	/*destroy vert data*/
-	bv = bm->verts.first;
-	while(bv){
-		nextv = bv->next;
-		BLI_remlink(&(bm->verts), bv);
-		BME_free_vert(bm, bv);
-		bv = nextv; 
-	}
-	
-	for(loopref=bm->loops.first;loopref;loopref=loopref->next) BME_delete_loop(bm,loopref->data);
-	BLI_freelistN(&(bm->loops));
-	
-	//CustomData_free(&bm->vdata, 0);
-	//CustomData_free(&bm->edata, 0);
-	//CustomData_free(&bm->ldata, 0);
-	//CustomData_free(&bm->pdata, 0);
-	
+	/*destroy element pools*/
+	BME_mempool_destroy(bm->vpool);
+	BME_mempool_destroy(bm->epool);
+	BME_mempool_destroy(bm->ppool);
+	BME_mempool_destroy(bm->lpool);
+	/*free custom data pools*/
+	BME_CD_Free(&bm->vdata);
+	BME_CD_Free(&bm->edata);
+	BME_CD_Free(&bm->ldata);
+	BME_CD_Free(&bm->pdata);
 	MEM_freeN(bm);	
 }
 
@@ -124,17 +135,12 @@ void BME_free_mesh(BME_Mesh *bm)
  *	must begin with a call to BME_model_end() and finish with a call to BME_model_end().
  *	No modification of mesh data is allowed except in between these two calls.
  *
- *	TODO 
- *		FOR BME_MODEL_BEGIN:
- *		-integrate euler undo system.
- *		-make full copy of structure to safely recover from errors.
- *		-accept a toolname string.
- *		-accept param to turn off full copy if just selection tool. (perhaps check for this in eulers...)
+ *  The purpose of these calls is allow for housekeeping tasks to be performed,
+ *  such as allocating/freeing scratch arrays or performing debug validation of 
+ *  the mesh structure.
  *
- *		BME_MODEL_END:
- *		-full mesh validation if debugging turned on
- *		-free structure copy or use it to restore.
- *		-do euler undo push.
+ *  Returns -
+ *  Nothing
  *
 */
 
@@ -151,13 +157,12 @@ int BME_model_begin(BME_Mesh *bm){
 }
 
 void BME_model_end(BME_Mesh *bm){
-	int meshok, totvert, totedge, totpoly, totloop;
+	int meshok, totvert, totedge, totpoly;
 
 	totvert = BLI_countlist(&(bm->verts));
 	totedge = BLI_countlist(&(bm->edges));
 	totpoly = BLI_countlist(&(bm->polys));
-	totloop = BLI_countlist(&(bm->loops));
-	
+
 	if(bm->vtar) MEM_freeN(bm->vtar);
 	if(bm->edar) MEM_freeN(bm->edar);
 	if(bm->lpar) MEM_freeN(bm->lpar);
@@ -167,10 +172,10 @@ void BME_model_end(BME_Mesh *bm){
 	bm->edar = NULL;
 	bm->lpar = NULL;
 	bm->plar = NULL;
-	bm->vtarlen = bm->edarlen = bm->lparlen = bm->plarlen = 1024;
+	bm->vtarlen = bm->edarlen = bm->lparlen = bm->plarlen = 0;
 	
 	
-	if(bm->totvert!=totvert || bm->totedge!=totedge || bm->totpoly!=totpoly || bm->totloop!=totloop)
+	if(bm->totvert!=totvert || bm->totedge!=totedge || bm->totpoly!=totpoly)
 		BME_error();
 	
 	meshok = BME_validate_mesh(bm, 1);
@@ -194,7 +199,7 @@ void BME_model_end(BME_Mesh *bm){
  *
  *	TODO 
  *	
- *	-Write a full mesh validation function for debugging purposes.
+ *	-Make this only part of debug builds
  */
 
 #define VHALT(halt) {BME_error(); if(halt) return 0;}
diff --git a/source/blender/blenkernel/intern/BME_structure.c b/source/blender/blenkernel/intern/BME_structure.c
index d283e1df5ca..cbf780c6467 100644
--- a/source/blender/blenkernel/intern/BME_structure.c
+++ b/source/blender/blenkernel/intern/BME_structure.c
@@ -43,6 +43,99 @@
 #include "BLI_ghash.h"
 
 #include "BKE_customdata.h"
+
+/*
+	Simple, fast memory allocator for allocating many elements of the same size.
+*/
+typedef struct BME_mempool_chunk{
+	struct BME_mempool_chunk *next, *prev;
+	void *data;
+}BME_mempool_chunk;
+
+/*this is just to make things prettier*/
+typedef struct BME_freenode{
+	struct BME_freenode *next;
+}BME_freenode;
+
+BME_mempool *BME_mempool_create(int esize, int tote, int pchunk)
+{	BME_mempool  *pool = NULL;
+	BME_freenode *lasttail = NULL, *curnode = NULL;
+	int i,j, maxchunks;
+	char *addr;
+
+	/*allocate the pool structure*/
+	pool = MEM_mallocN(sizeof(BME_mempool),"memory pool");
+	pool->esize = esize;
+	pool->pchunk = pchunk;	
+	pool->csize = esize * pchunk;
+	pool->chunks.first = pool->chunks.last = NULL;
+	
+	maxchunks = tote / pchunk;
+	
+	/*allocate the actual chunks*/
+	for(i=0; i < maxchunks; i++){
+		BME_mempool_chunk *mpchunk = MEM_mallocN(sizeof(BME_mempool_chunk), "BME_Mempool Chunk");
+		mpchunk->next = mpchunk->prev = NULL;
+		mpchunk->data = MEM_mallocN(pool->csize, "BME Mempool Chunk Data");
+		BLI_addtail(&(pool->chunks), mpchunk);
+		
+		if(i==0) pool->free = mpchunk->data; /*start of the list*/
+		/*loop through the allocated data, building the pointer structures*/
+		for(addr = mpchunk->data, j=0; j < pool->pchunk; j++){
+			curnode = ((BME_freenode*)addr);
+			addr += pool->esize;
+			curnode->next = (BME_freenode*)addr;
+		}
+		/*final pointer in the previously allocated chunk is wrong.*/
+		if(lasttail) lasttail->next = mpchunk->data;
+		/*set the end of this chunks memory to the new tail for next iteration*/
+		lasttail = curnode;
+	}
+	/*terminate the list*/
+	curnode->next = NULL;
+	return pool;
+}
+
+void *BME_mempool_alloc(BME_mempool *pool){
+	void *retval=NULL;
+	BME_freenode *curnode=NULL;
+	char *addr=NULL;
+	int j;
+
+	if(!(pool->free)){
+		/*need to allocate a new chunk*/
+		BME_mempool_chunk *mpchunk = MEM_mallocN(sizeof(BME_mempool_chunk), "BME_Mempool Chunk");
+		mpchunk->next = mpchunk->prev = NULL;
+		mpchunk->data = MEM_mallocN(pool->csize, "BME_Mempool Chunk Data");
+		BLI_addtail(&(pool->chunks), mpchunk);
+
+		pool->free = mpchunk->data; /*start of the list*/
+		for(addr = mpchunk->data, j=0; j < pool->pchunk; j++){
+			curnode = ((BME_freenode*)addr);
+			addr += pool->esize;
+			curnode->next = (BME_freenode*)addr;
+		}
+		curnode->next = NULL; /*terminate the list*/
+	}
+
+	retval = pool->free;
+	pool->free = pool->free->next;
+	//memset(retval, 0, pool->esize);
+	return retval;
+}
+
+void BME_mempool_free(BME_mempool *pool, void *addr){ //doesnt protect against double frees, dont be stupid!
+	BME_freenode *newhead = addr;
+	newhead->next = pool->free;
+	pool->free = newhead;
+}
+void BME_mempool_destroy(BME_mempool *pool)
+{
+	BME_mempool_chunk *mpchunk=NULL;
+	for(mpchunk = pool->chunks.first; mpchunk; mpchunk = mpchunk->next) MEM_freeN(mpchunk->data);
+	BLI_freelistN(&(pool->chunks));
+	MEM_freeN(pool);
+}
 /**
  *	MISC utility functions.
  *
@@ -86,78 +179,98 @@ int BME_edge_swapverts(BME_Edge *e, BME_Vert *orig, BME_Vert *new){
 
 BME_Vert *BME_addvertlist(BME_Mesh *bm, BME_Vert *example){
 	BME_Vert *v=NULL;
-	v = MEM_callocN(sizeof(BME_Vert), "BME Vertex");
-	BLI_addtail(&(bm->verts), v);
+	v = BME_mempool_alloc(bm->vpool);
+	v->next = v->prev = NULL;
 	v->EID = bm->nextv;
+	v->co[0] = v->co[1] = v->co[2] = 0.0f;
+	v->no[0] = v->no[1] = v->no[2] = 0.0f;
+	v->edge = NULL;
+	v->data = NULL;
+	v->eflag1 = v->eflag2 = v->tflag1 = v->tflag2 = 0;
+	v->flag = v->h = 0;
+	v->bweight = 0.0f;
+	BLI_addtail(&(bm->verts), v);
 	bm->nextv++;
 	bm->totvert++;
 
-	if(example)
+	if(example){
 		VECCOPY(v->co,example->co);
-	//if(example)
-	//	CustomData_em_copy_data(&bm->vdata, &bm->vdata, example->data, &v->data);
-	//else
-	//	CustomData_em_set_default(&bm->vdata, &v->data);
+		BME_CD_copy_data(&bm->vdata, &bm->vdata, example->data, &v->data);
+	}
+	else
+		BME_CD_set_default(&bm->vdata, &v->data);
 
 	return v;
 }
 BME_Edge *BME_addedgelist(BME_Mesh *bm, BME_Vert *v1, BME_Vert *v2, BME_Edge *example){
 	BME_Edge *e=NULL;
-	e = MEM_callocN(sizeof(BME_Edge), "BME_Edge");
+	e = BME_mempool_alloc(bm->epool);
+	e->next = e->prev = NULL;
+	e->EID = bm->nexte;
 	e->v1 = v1;
 	e->v2 = v2;
+	e->d1.next = e->d1.prev = e->d2.next = e->d2.prev = NULL;
 	e->d1.data = e;
 	e->d2.data = e;
-	e->EID = bm->nexte;
+	e->loop = NULL;
+	e->data = NULL;
+	e->eflag1 = e->eflag2 = e->tflag1 = e->tflag2 = 0;
+	e->flag = e->h = 0;
+	e->crease = e->bweight = 0.0f;
 	bm->nexte++;
 	bm->totedge++;
 	BLI_addtail(&(bm->edges), e);
 	
-	//if(example)
-	//	CustomData_em_copy_data(&bm->edata, &bm->edata, example->data, &e->data);
-	//else
-	//	CustomData_em_set_default(&bm->edata, &e->data);
+	if(example)
+		BME_CD_copy_data(&bm->edata, &bm->edata, example->data, &e->data);
+	else
+		BME_CD_set_default(&bm->edata, &e->data);
 
 
 	return e;
 }
 BME_Loop *BME_create_loop(BME_Mesh *bm, BME_Vert *v, BME_Edge *e, BME_Poly *f, BME_Loop *example){
-	/*allocate a BME_Loop and add it to the loophash*/
 	BME_Loop *l=NULL;
-	BME_CycleNode *loopnode = MEM_callocN(sizeof(BME_CycleNode),"BME Loop Reference");
-	l = MEM_callocN(sizeof(BME_Loop), "BME_Loop");
+	l = BME_mempool_alloc(bm->lpool);
+	l->next = l->prev = NULL;
+	l->EID = bm->nextl;
+	l->radial.next = l->radial.prev = NULL;
 	l->radial.data = l;
 	l->v = v;
 	l->e = e;
 	l->f = f;
-	l->EID = bm->nextl;
-	l->gref = loopnode;
-	loopnode->data = l;
-	BLI_addtail(&(bm->loops),loopnode);
+	l->data = NULL;
+	l->eflag1 = l->eflag2 = l->tflag1 = l->tflag2 = 0;
+	l->flag = l->h = 0; //stupid waste!
 	bm->nextl++;
 	bm->totloop++;
 	
-
-/*	if(example)
-		BME_CustomData_copy_data(&bm->ldata, &bm->ldata, example->data, &l->data);
+	if(example)
+		BME_CD_copy_data(&bm->ldata, &bm->ldata, example->data, &l->data);
 	else
-		BME_CustomData_set_default(&bm->ldata, &l->data);
-*/
+		BME_CD_set_default(&bm->ldata, &l->data);
+
 	return l;
 }
 
 BME_Poly *BME_addpolylist(BME_Mesh *bm, BME_Poly *example){
 	BME_Poly *f = NULL;
-	f= MEM_callocN(sizeof(BME_Poly),"BME_Poly");
-	BLI_addtail(&(bm->polys),f);
+	f = BME_mempool_alloc(bm->ppool);
+	f->next = f->prev = NULL;
 	f->EID = bm->nextp;
+	f->loopbase = NULL;
+	f->len = 0;
+	f->data = NULL;
+	f->eflag1 = f->eflag2 = f->tflag1 = f->tflag2 = 0;
+	f->flag = f->h = f->mat_nr;
+	BLI_addtail(&(bm->polys),f);
 	bm->nextp++;
 	bm->totpoly++;
 
-	//if(example)
-	//	CustomData_em_copy_data(&bm->pdata, &bm->pdata, example->data, &f->data);
-	//else
-	//	CustomData_em_set_default(&bm->pdata, &f->data);
+	if(example)
+		BME_CD_copy_data(&bm->pdata, &bm->pdata, example->data, &f->data);
+	else
+		BME_CD_set_default(&bm->pdata, &f->data);
 
 
 	return f;
@@ -168,31 +281,24 @@ BME_Poly *BME_addpolylist(BME_Mesh *bm, BME_Poly *example){
 */
 void BME_free_vert(BME_Mesh *bm, BME_Vert *v){
 	bm->totvert--;
-	//CustomData_em_free_block(&bm->vdata, &v->data);
-	MEM_freeN(v);
+	BME_CD_free_block(&bm->vdata, &v->data);
+	BME_mempool_free(bm->vpool, v);
 }
 void BME_free_edge(BME_Mesh *bm, BME_Edge *e){
 	bm->totedge--;
-	//CustomData_em_free_block(&bm->edata, &e->data);
-	MEM_freeN(e);
+	BME_CD_free_block(&bm->edata, &e->data);
+	BME_mempool_free(bm->epool, e);
 }
 void BME_free_poly(BME_Mesh *bm, BME_Poly *f){
 	bm->totpoly--;
-	//CustomData_em_free_block(&bm->pdata, &f->data);
-	MEM_freeN(f);
-}
-void BME_delete_loop(BME_Mesh *bm, BME_Loop *l){
-	bm->totloop--;
-	//CustomData_em_free_block(&bm->ldata, &l->data);
-	MEM_freeN(l);
+	BME_CD_free_block(&bm->pdata, &f->data);
+	BME_mempool_free(bm->ppool, f);
 }
 void BME_free_loop(BME_Mesh *bm, BME_Loop *l){
-	BME_CycleNode *loopref = l->gref;
-	BLI_freelinkN(&(bm->loops),loopref);
-	BME_delete_loop(bm,l);
+	bm->totloop--;
+	BME_CD_free_block(&bm->ldata, &l->data);
+	BME_mempool_free(bm->lpool, l);
 }
-
-
 /**
  *	BMESH CYCLES
  *
diff --git a/source/blender/blenkernel/intern/BME_tools.c b/source/blender/blenkernel/intern/BME_tools.c
index 90fa9793644..7ce967d1d22 100644
--- a/source/blender/blenkernel/intern/BME_tools.c
+++ b/source/blender/blenkernel/intern/BME_tools.c
@@ -811,7 +811,18 @@ static float BME_bevel_get_angle(BME_Mesh *bm, BME_Edge *e, BME_Vert *v) {
 
 	return Inpf(vec3,vec4);
 }
-
+static int BME_face_sharededges(BME_Poly *f1, BME_Poly *f2){
+	BME_Loop *l;
+	int count = 0;
+	
+	l = f1->loopbase;
+	do{
+		if(BME_radial_find_face(l->e,f2)) count++;
+		l = l->next;
+	}while(l != f1->loopbase);
+	
+	return count;
+}
 /**
  *			BME_bevel_initialize
  *
@@ -990,6 +1001,17 @@ static BME_Mesh *BME_bevel_initialize(BME_Mesh *bm, int options, int defgrp_inde
 	/* face pass */
 	for (f=bm->polys.first; f; f=f->next) f->tflag1 = BME_BEVEL_ORIG;
 
+	/*clean up edges with 2 faces that share more than one edge*/
+	for (e=bm->edges.first; e; e=e->next){
+		if(e->tflag1 & BME_BEVEL_BEVEL){
+			int count = 0;
+			count = BME_face_sharededges(e->loop->f, ((BME_Loop*)e->loop->radial.next->data)->f);
+			if(count > 1){
+				e->tflag1 &= ~BME_BEVEL_BEVEL;
+			}	
+		}
+	}
+
 	return bm;
 }
 
@@ -1075,7 +1097,7 @@ static BME_Mesh *BME_bevel_mesh(BME_Mesh *bm, float value, int res, int options,
 			v = BME_bevel_wire(bm, v, value, res, options, td);
 		}
 		else if (res && ((v->tflag1 & BME_BEVEL_BEVEL) && (v->tflag1 & BME_BEVEL_ORIG))) {
-			
+			int count = 0;
 			/* first, make sure we're not sitting on an edge to be removed */
 			oe = v->edge;
 			e = BME_disk_nextedge(oe,v);
@@ -1089,6 +1111,7 @@ static BME_Mesh *BME_bevel_mesh(BME_Mesh *bm, float value, int res, int options,
 			/* look for original edges, and remove them */
 			oe = e;
 			while ( (e = BME_disk_next_edgeflag(oe, v, 0, BME_BEVEL_ORIG | BME_BEVEL_BEVEL)) ) {
+				count++;
 				/* join the faces (we'll split them later) */
 				f = BME_JFKE_safe(bm,e->loop->f,((BME_Loop*)e->loop->radial.next->data)->f,e);
 				if (!f){
@@ -1096,6 +1119,9 @@ static BME_Mesh *BME_bevel_mesh(BME_Mesh *bm, float value, int res, int options,
 				}
 			}
 
+			/*need to do double check *before* you bevel to make sure that manifold edges are for two faces that share only *one* edge to make sure it doesnt hang here!*/
+
+
 			/* all original edges marked to be beveled have been removed;
 			 * now we need to link up the edges for this "corner" */
 			len = BME_cycle_length(BME_disk_getpointer(v->edge, v));
diff --git a/source/blender/blenkernel/intern/bmesh_private.h b/source/blender/blenkernel/intern/bmesh_private.h
index ad90398bf66..4aa2a85b8b1 100644
--- a/source/blender/blenkernel/intern/bmesh_private.h
+++ b/source/blender/blenkernel/intern/bmesh_private.h
@@ -39,6 +39,11 @@
 
 #include "BKE_bmesh.h"
 
+struct BME_mempool *BME_mempool_create(int esize, int tote, int pchunk);
+void BME_mempool_destroy(struct BME_mempool *pool);
+void *BME_mempool_alloc(struct BME_mempool *pool);
+void BME_mempool_free(struct BME_mempool *pool, void *address);
+
 /*ALLOCATION/DEALLOCATION*/
 struct BME_Vert *BME_addvertlist(struct BME_Mesh *bm, struct BME_Vert *example);
 struct BME_Edge *BME_addedgelist(struct BME_Mesh *bm, struct BME_Vert *v1, struct BME_Vert *v2, struct BME_Edge *example);
@@ -49,7 +54,7 @@ void BME_free_vert(struct BME_Mesh *bm, struct BME_Vert *v);
 void BME_free_edge(struct BME_Mesh *bm, struct BME_Edge *e);
 void BME_free_poly(struct BME_Mesh *bm, struct BME_Poly *f);
 void BME_free_loop(struct BME_Mesh *bm, struct BME_Loop *l);
-void BME_delete_loop(struct BME_Mesh *bm, struct BME_Loop *l);
+//void BME_delete_loop(struct BME_Mesh *bm, struct BME_Loop *l);
 
 /*DOUBLE CIRCULAR LINKED LIST FUNCTIONS*/
 void BME_cycle_append(void *h, void *nt);
diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c
index 09a51bb37a4..6034b85e20f 100644
--- a/source/blender/blenkernel/intern/cloth.c
+++ b/source/blender/blenkernel/intern/cloth.c
@@ -45,6 +45,8 @@
 
 #include "BKE_pointcache.h"
 
+#include "BLI_kdopbvh.h"
+
 #ifdef _WIN32
 void tstart ( void )
 {}
@@ -151,13 +153,14 @@ void cloth_init ( ClothModifierData *clmd )
 	clmd->sim_parms->goalfrict = 0.0f;
 }
 
-
-BVH *bvh_build_from_cloth (ClothModifierData *clmd, float epsilon)
+BVHTree *bvhselftree_build_from_cloth (ClothModifierData *clmd, float epsilon)
 {
-	unsigned int i = 0;
-	BVH	*bvh=NULL;
+	int i;
+	BVHTree *bvhtree;
 	Cloth *cloth = clmd->clothObject;
-	ClothVertex *verts = NULL;
+	ClothVertex *verts;
+	MFace *mfaces;
+	float co[12];
 
 	if(!clmd)
 		return NULL;
@@ -168,69 +171,171 @@ BVH *bvh_build_from_cloth (ClothModifierData *clmd, float epsilon)
 		return NULL;
 	
 	verts = cloth->verts;
+	mfaces = cloth->mfaces;
+	
+	// in the moment, return zero if no faces there
+	if(!cloth->numverts)
+		return NULL;
+	
+	// create quadtree with k=26
+	bvhtree = BLI_bvhtree_new(cloth->numverts, epsilon, 4, 6);
+	
+	// fill tree
+	for(i = 0; i < cloth->numverts; i++, verts++)
+	{
+		VECCOPY(&co[0*3], verts->xold);
+		
+		BLI_bvhtree_insert(bvhtree, i, co, 1);
+	}
+	
+	// balance tree
+	BLI_bvhtree_balance(bvhtree);
+	
+	return bvhtree;
+}
+
+BVHTree *bvhtree_build_from_cloth (ClothModifierData *clmd, float epsilon)
+{
+	int i;
+	BVHTree *bvhtree;
+	Cloth *cloth = clmd->clothObject;
+	ClothVertex *verts;
+	MFace *mfaces;
+	float co[12];
+
+	if(!clmd)
+		return NULL;
+
+	cloth = clmd->clothObject;
+
+	if(!cloth)
+		return NULL;
+	
+	verts = cloth->verts;
+	mfaces = cloth->mfaces;
 	
 	// in the moment, return zero if no faces there
 	if(!cloth->numfaces)
 		return NULL;
 	
-	bvh = MEM_callocN(sizeof(BVH), "BVH");
-	if (bvh == NULL) 
+	// create quadtree with k=26
+	bvhtree = BLI_bvhtree_new(cloth->numfaces, epsilon, 4, 26);
+	
+	// fill tree
+	for(i = 0; i < cloth->numfaces; i++, mfaces++)
 	{
-		printf("bvh: Out of memory.\n");
-		return NULL;
+		VECCOPY(&co[0*3], verts[mfaces->v1].xold);
+		VECCOPY(&co[1*3], verts[mfaces->v2].xold);
+		VECCOPY(&co[2*3], verts[mfaces->v3].xold);
+		
+		if(mfaces->v4)
+			VECCOPY(&co[3*3], verts[mfaces->v4].xold);
+		
+		BLI_bvhtree_insert(bvhtree, i, co, (mfaces->v4 ? 4 : 3));
 	}
 	
-	// springs = cloth->springs;
-	// numsprings = cloth->numsprings;
-
-	bvh->epsilon = epsilon;
-	bvh->numfaces = cloth->numfaces;
-	bvh->mfaces = cloth->mfaces;
-
-	bvh->numverts = cloth->numverts;
+	// balance tree
+	BLI_bvhtree_balance(bvhtree);
 	
-	bvh->current_x = MEM_callocN ( sizeof ( MVert ) * bvh->numverts, "bvh->current_x" );
-	
-	if (bvh->current_x == NULL) 
-	{
-		printf("bvh: Out of memory.\n");
-		MEM_freeN(bvh);
-		return NULL;
-	}
-	
-	for(i = 0; i < bvh->numverts; i++)
-	{
-		VECCOPY(bvh->current_x[i].co, verts[i].tx);
-	}
-	
-	bvh_build (bvh);
-	
-	return bvh;
+	return bvhtree;
 }
 
-void bvh_update_from_cloth(ClothModifierData *clmd, int moving)
-{
+void bvhtree_update_from_cloth(ClothModifierData *clmd, int moving)
+{	
 	unsigned int i = 0;
 	Cloth *cloth = clmd->clothObject;
-	BVH *bvh = cloth->tree;
+	BVHTree *bvhtree = cloth->bvhtree;
 	ClothVertex *verts = cloth->verts;
+	MFace *mfaces;
+	float co[12], co_moving[12];
+	int ret = 0;
 	
-	if(!bvh)
+	if(!bvhtree)
 		return;
 	
-	if(cloth->numverts!=bvh->numverts)
-		return;
+	mfaces = cloth->mfaces;
 	
-	if(cloth->verts)
+	// update vertex position in bvh tree
+	if(verts && mfaces)
 	{
-		for(i = 0; i < bvh->numverts; i++)
+		for(i = 0; i < cloth->numfaces; i++, mfaces++)
 		{
-			VECCOPY(bvh->current_x[i].co, verts[i].tx);
-			VECCOPY(bvh->current_xold[i].co, verts[i].txold);
+			VECCOPY(&co[0*3], verts[mfaces->v1].txold);
+			VECCOPY(&co[1*3], verts[mfaces->v2].txold);
+			VECCOPY(&co[2*3], verts[mfaces->v3].txold);
+			
+			if(mfaces->v4)
+				VECCOPY(&co[3*3], verts[mfaces->v4].txold);
+		
+			// copy new locations into array
+			if(moving)
+			{
+				// update moving positions
+				VECCOPY(&co_moving[0*3], verts[mfaces->v1].tx);
+				VECCOPY(&co_moving[1*3], verts[mfaces->v2].tx);
+				VECCOPY(&co_moving[2*3], verts[mfaces->v3].tx);
+				
+				if(mfaces->v4)
+					VECCOPY(&co_moving[3*3], verts[mfaces->v4].tx);
+				
+				ret = BLI_bvhtree_update_node(bvhtree, i, co, co_moving, (mfaces->v4 ? 4 : 3));
+			}
+			else
+			{
+				ret = BLI_bvhtree_update_node(bvhtree, i, co, NULL, (mfaces->v4 ? 4 : 3));
+			}
+			
+			// check if tree is already full
+			if(!ret)
+				break;
 		}
+		
+		BLI_bvhtree_update_tree(bvhtree);
 	}
+}
+
+void bvhselftree_update_from_cloth(ClothModifierData *clmd, int moving)
+{	
+	unsigned int i = 0;
+	Cloth *cloth = clmd->clothObject;
+	BVHTree *bvhtree = cloth->bvhselftree;
+	ClothVertex *verts = cloth->verts;
+	MFace *mfaces;
+	float co[12], co_moving[12];
+	int ret = 0;
 	
-	bvh_update(bvh, moving);
+	if(!bvhtree)
+		return;
+	
+	mfaces = cloth->mfaces;
+	
+	// update vertex position in bvh tree
+	if(verts && mfaces)
+	{
+		for(i = 0; i < cloth->numverts; i++, verts++)
+		{
+			VECCOPY(&co[0*3], verts->txold);
+			
+			// copy new locations into array
+			if(moving)
+			{
+				// update moving positions
+				VECCOPY(&co_moving[0*3], verts->tx);
+				
+				ret = BLI_bvhtree_update_node(bvhtree, i, co, co_moving, 1);
+			}
+			else
+			{
+				ret = BLI_bvhtree_update_node(bvhtree, i, co, NULL, 1);
+			}
+			
+			// check if tree is already full
+			if(!ret)
+				break;
+		}
+		
+		BLI_bvhtree_update_tree(bvhtree);
+	}
 }
 
 int modifiers_indexInObject(Object *ob, ModifierData *md_seek);
@@ -541,8 +646,11 @@ void cloth_free_modifier ( Object *ob, ClothModifierData *clmd )
 		cloth->numsprings = 0;
 
 		// free BVH collision tree
-		if ( cloth->tree )
-			bvh_free ( ( BVH * ) cloth->tree );
+		if ( cloth->bvhtree )
+			BLI_bvhtree_free ( cloth->bvhtree );
+		
+		if ( cloth->bvhselftree )
+			BLI_bvhtree_free ( cloth->bvhselftree );
 
 		// we save our faces for collision objects
 		if ( cloth->mfaces )
@@ -611,8 +719,11 @@ void cloth_free_modifier_extern ( ClothModifierData *clmd )
 		cloth->numsprings = 0;
 
 		// free BVH collision tree
-		if ( cloth->tree )
-			bvh_free ( ( BVH * ) cloth->tree );
+		if ( cloth->bvhtree )
+			BLI_bvhtree_free ( cloth->bvhtree );
+		
+		if ( cloth->bvhselftree )
+			BLI_bvhtree_free ( cloth->bvhselftree );
 
 		// we save our faces for collision objects
 		if ( cloth->mfaces )
@@ -751,6 +862,7 @@ static int cloth_from_object(Object *ob, ClothModifierData *clmd, DerivedMesh *d
 	ClothVertex *verts = NULL;
 	float tnull[3] = {0,0,0};
 	Cloth *cloth = NULL;
+	float maxdist = 0;
 
 	// If we have a clothObject, free it. 
 	if ( clmd->clothObject != NULL )
@@ -810,6 +922,7 @@ static int cloth_from_object(Object *ob, ClothModifierData *clmd, DerivedMesh *d
 		VECCOPY ( verts->xold, verts->x );
 		VECCOPY ( verts->xconst, verts->x );
 		VECCOPY ( verts->txold, verts->x );
+		VECCOPY ( verts->tx, verts->x );
 		VecMulf ( verts->v, 0.0f );
 
 		verts->impulse_count = 0;
@@ -819,8 +932,7 @@ static int cloth_from_object(Object *ob, ClothModifierData *clmd, DerivedMesh *d
 	// apply / set vertex groups
 	// has to be happen before springs are build!
 	cloth_apply_vgroup (clmd, dm);
-	
-	
+
 	if ( !cloth_build_springs ( clmd, dm ) )
 	{
 		cloth_free_modifier ( ob, clmd );
@@ -845,12 +957,18 @@ static int cloth_from_object(Object *ob, ClothModifierData *clmd, DerivedMesh *d
 	if(!first)
 		implicit_set_positions(clmd);
 
-	clmd->clothObject->tree = bvh_build_from_cloth ( clmd, clmd->coll_parms->epsilon );
+	clmd->clothObject->bvhtree = bvhtree_build_from_cloth ( clmd, clmd->coll_parms->epsilon );
+	
+	for(i = 0; i < dm->getNumVerts(dm); i++)
+	{
+		maxdist = MAX2(maxdist, clmd->coll_parms->selfepsilon* ( cloth->verts[i].avg_spring_len*2.0));
+	}
+	
+	clmd->clothObject->bvhselftree = bvhselftree_build_from_cloth ( clmd, maxdist );
 
 	return 1;
 }
 
-
 static void cloth_from_mesh ( Object *ob, ClothModifierData *clmd, DerivedMesh *dm )
 {
 	unsigned int numverts = dm->getNumVerts ( dm );
diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c
index e244ccca306..7f41ca033d3 100644
--- a/source/blender/blenkernel/intern/collision.c
+++ b/source/blender/blenkernel/intern/collision.c
@@ -41,7 +41,6 @@
 #include "BKE_global.h"
 #include "BKE_mesh.h"
 #include "BKE_object.h"
-#include "BKE_cloth.h"
 #include "BKE_modifier.h"
 #include "BKE_utildefines.h"
 #include "BKE_DerivedMesh.h"
@@ -49,6 +48,10 @@
 
 #include "Bullet-C-Api.h"
 
+#include "BLI_kdopbvh.h"
+#include "BKE_collision.h"
+
+
 /***********************************
 Collision modifier code start
 ***********************************/
@@ -66,58 +69,80 @@ void collision_move_object ( CollisionModifierData *collmd, float step, float pr
 		VECADDS ( collmd->current_xnew[i].co, collmd->x[i].co, tv, step );
 		VECSUB ( collmd->current_v[i].co, collmd->current_xnew[i].co, collmd->current_x[i].co );
 	}
-	bvh_update_from_mvert ( collmd->bvh, collmd->current_x, collmd->numverts, collmd->current_xnew, 1 );
+	bvhtree_update_from_mvert ( collmd->bvhtree, collmd->mfaces, collmd->numfaces, collmd->current_x, collmd->current_xnew, collmd->numverts, 1 );
 }
 
-/* build bounding volume hierarchy from mverts (see kdop.c for whole BVH code) */
-BVH *bvh_build_from_mvert ( MFace *mfaces, unsigned int numfaces, MVert *x, unsigned int numverts, float epsilon )
+BVHTree *bvhtree_build_from_mvert ( MFace *mfaces, unsigned int numfaces, MVert *x, unsigned int numverts, float epsilon )
 {
-	BVH *bvh=NULL;
+	BVHTree *tree;
+	float co[12];
+	int i;
+	MFace *tface = mfaces;
 
-	bvh = MEM_callocN ( sizeof ( BVH ), "BVH" );
-	if ( bvh == NULL )
+	tree = BLI_bvhtree_new ( numfaces*2, epsilon, 4, 26 );
+
+	// fill tree
+	for ( i = 0; i < numfaces; i++, tface++ )
 	{
-		printf ( "bvh: Out of memory.\n" );
-		return NULL;
+		VECCOPY ( &co[0*3], x[tface->v1].co );
+		VECCOPY ( &co[1*3], x[tface->v2].co );
+		VECCOPY ( &co[2*3], x[tface->v3].co );
+		if ( tface->v4 )
+			VECCOPY ( &co[3*3], x[tface->v4].co );
+
+		BLI_bvhtree_insert ( tree, i, co, ( mfaces->v4 ? 4 : 3 ) );
 	}
 
-	// in the moment, return zero if no faces there
-	if ( !numfaces )
-		return NULL;
+	// balance tree
+	BLI_bvhtree_balance ( tree );
 
-	bvh->epsilon = epsilon;
-	bvh->numfaces = numfaces;
-	bvh->mfaces = mfaces;
-
-	// we have no faces, we save seperate points
-	if ( !mfaces )
-	{
-		bvh->numfaces = numverts;
-	}
-
-	bvh->numverts = numverts;
-	bvh->current_x = MEM_dupallocN ( x );
-
-	bvh_build ( bvh );
-
-	return bvh;
+	return tree;
 }
 
-void bvh_update_from_mvert ( BVH * bvh, MVert *x, unsigned int numverts, MVert *xnew, int moving )
+void bvhtree_update_from_mvert ( BVHTree * bvhtree, MFace *faces, int numfaces, MVert *x, MVert *xnew, int numverts, int moving )
 {
-	if ( !bvh )
-		return;
+	int i;
+	MFace *mfaces = faces;
+	float co[12], co_moving[12];
+	int ret = 0;
 
-	if ( numverts!=bvh->numverts )
+	if ( !bvhtree )
 		return;
 
 	if ( x )
-		memcpy ( bvh->current_xold, x, sizeof ( MVert ) * numverts );
+	{
+		for ( i = 0; i < numfaces; i++, mfaces++ )
+		{
+			VECCOPY ( &co[0*3], x[mfaces->v1].co );
+			VECCOPY ( &co[1*3], x[mfaces->v2].co );
+			VECCOPY ( &co[2*3], x[mfaces->v3].co );
+			if ( mfaces->v4 )
+				VECCOPY ( &co[3*3], x[mfaces->v4].co );
 
-	if ( xnew )
-		memcpy ( bvh->current_x, xnew, sizeof ( MVert ) * numverts );
+			// copy new locations into array
+			if ( moving && xnew )
+			{
+				// update moving positions
+				VECCOPY ( &co_moving[0*3], xnew[mfaces->v1].co );
+				VECCOPY ( &co_moving[1*3], xnew[mfaces->v2].co );
+				VECCOPY ( &co_moving[2*3], xnew[mfaces->v3].co );
+				if ( mfaces->v4 )
+					VECCOPY ( &co_moving[3*3], xnew[mfaces->v4].co );
 
-	bvh_update ( bvh, moving );
+				ret = BLI_bvhtree_update_node ( bvhtree, i, co, co_moving, ( mfaces->v4 ? 4 : 3 ) );
+			}
+			else
+			{
+				ret = BLI_bvhtree_update_node ( bvhtree, i, co, NULL, ( mfaces->v4 ? 4 : 3 ) );
+			}
+
+			// check if tree is already full
+			if ( !ret )
+				break;
+		}
+
+		BLI_bvhtree_update_tree ( bvhtree );
+	}
 }
 
 /***********************************
@@ -125,47 +150,48 @@ Collision modifier code end
 ***********************************/
 
 /**
- * gsl_poly_solve_cubic -
- *
- * copied from SOLVE_CUBIC.C --> GSL
- */
+* gsl_poly_solve_cubic -
+*
+* copied from SOLVE_CUBIC.C --> GSL
+*/
 
-/* DG: debug hint! don't forget that all functions were "fabs", "sinf", etc before */
-#define mySWAP(a,b) { float tmp = b ; b = a ; a = tmp ; }
+#define mySWAP(a,b) do { double tmp = b ; b = a ; a = tmp ; } while(0)
 
-int gsl_poly_solve_cubic ( float a, float b, float c, float *x0, float *x1, float *x2 )
+int 
+gsl_poly_solve_cubic (double a, double b, double c, 
+					  double *x0, double *x1, double *x2)
 {
-	float q = ( a * a - 3 * b );
-	float r = ( 2 * a * a * a - 9 * a * b + 27 * c );
+	double q = (a * a - 3 * b);
+	double r = (2 * a * a * a - 9 * a * b + 27 * c);
 
-	float Q = q / 9;
-	float R = r / 54;
+	double Q = q / 9;
+	double R = r / 54;
 
-	float Q3 = Q * Q * Q;
-	float R2 = R * R;
+	double Q3 = Q * Q * Q;
+	double R2 = R * R;
 
-	float CR2 = 729 * r * r;
-	float CQ3 = 2916 * q * q * q;
+	double CR2 = 729 * r * r;
+	double CQ3 = 2916 * q * q * q;
 
-	if ( R == 0 && Q == 0 )
+	if (R == 0 && Q == 0)
 	{
 		*x0 = - a / 3 ;
 		*x1 = - a / 3 ;
 		*x2 = - a / 3 ;
 		return 3 ;
 	}
-	else if ( CR2 == CQ3 )
+	else if (CR2 == CQ3) 
 	{
 		/* this test is actually R2 == Q3, written in a form suitable
-		  for exact computation with integers */
+		for exact computation with integers */
 
-		/* Due to finite precision some float roots may be missed, and
-		  considered to be a pair of complex roots z = x +/- epsilon i
-		  close to the real axis. */
+		/* Due to finite precision some double roots may be missed, and
+		considered to be a pair of complex roots z = x +/- epsilon i
+		close to the real axis. */
 
-		float sqrtQ = sqrt ( Q );
+		double sqrtQ = sqrt (Q);
 
-		if ( R > 0 )
+		if (R > 0)
 		{
 			*x0 = -2 * sqrtQ  - a / 3;
 			*x1 = sqrtQ - a / 3;
@@ -179,72 +205,88 @@ int gsl_poly_solve_cubic ( float a, float b, float c, float *x0, float *x1, floa
 		}
 		return 3 ;
 	}
-	else if ( CR2 < CQ3 ) /* equivalent to R2 < Q3 */
+	else if (CR2 < CQ3) /* equivalent to R2 < Q3 */
 	{
-		float sqrtQ = sqrt ( Q );
-		float sqrtQ3 = sqrtQ * sqrtQ * sqrtQ;
-		float theta = acos ( R / sqrtQ3 );
-		float norm = -2 * sqrtQ;
-		*x0 = norm * cos ( theta / 3 ) - a / 3;
-		*x1 = norm * cos ( ( theta + 2.0 * M_PI ) / 3 ) - a / 3;
-		*x2 = norm * cos ( ( theta - 2.0 * M_PI ) / 3 ) - a / 3;
+		double sqrtQ = sqrt (Q);
+		double sqrtQ3 = sqrtQ * sqrtQ * sqrtQ;
+		double theta = acos (R / sqrtQ3);
+		double norm = -2 * sqrtQ;
+		*x0 = norm * cos (theta / 3) - a / 3;
+		*x1 = norm * cos ((theta + 2.0 * M_PI) / 3) - a / 3;
+		*x2 = norm * cos ((theta - 2.0 * M_PI) / 3) - a / 3;
 
 		/* Sort *x0, *x1, *x2 into increasing order */
 
-		if ( *x0 > *x1 )
-			mySWAP ( *x0, *x1 ) ;
+		if (*x0 > *x1)
+			mySWAP(*x0, *x1) ;
 
-		if ( *x1 > *x2 )
+		if (*x1 > *x2)
 		{
-			mySWAP ( *x1, *x2 ) ;
+			mySWAP(*x1, *x2) ;
 
-			if ( *x0 > *x1 )
-				mySWAP ( *x0, *x1 ) ;
+			if (*x0 > *x1)
+				mySWAP(*x0, *x1) ;
 		}
 
 		return 3;
 	}
 	else
 	{
-		float sgnR = ( R >= 0 ? 1 : -1 );
-		float A = -sgnR * pow ( ABS ( R ) + sqrt ( R2 - Q3 ), 1.0/3.0 );
-		float B = Q / A ;
+		double sgnR = (R >= 0 ? 1 : -1);
+		double A = -sgnR * pow (fabs (R) + sqrt (R2 - Q3), 1.0/3.0);
+		double B = Q / A ;
 		*x0 = A + B - a / 3;
 		return 1;
 	}
 }
 
 
-/**
- * gsl_poly_solve_quadratic
- *
- * copied from GSL
- */
-int gsl_poly_solve_quadratic ( float a, float b, float c,  float *x0, float *x1 )
-{
-	float disc = b * b - 4 * a * c;
 
-	if ( disc > 0 )
+/**
+* gsl_poly_solve_quadratic
+*
+* copied from GSL
+*/
+int 
+gsl_poly_solve_quadratic (double a, double b, double c, 
+						  double *x0, double *x1)
+{
+	double disc = b * b - 4 * a * c;
+
+	if (a == 0) /* Handle linear case */
 	{
-		if ( b == 0 )
+		if (b == 0)
 		{
-			float r = ABS ( 0.5 * sqrt ( disc ) / a );
+			return 0;
+		}
+		else
+		{
+			*x0 = -c / b;
+			return 1;
+		};
+	}
+
+	if (disc > 0)
+	{
+		if (b == 0)
+		{
+			double r = fabs (0.5 * sqrt (disc) / a);
 			*x0 = -r;
 			*x1 =  r;
 		}
 		else
 		{
-			float sgnb = ( b > 0 ? 1 : -1 );
-			float temp = -0.5 * ( b + sgnb * sqrt ( disc ) );
-			float r1 = temp / a ;
-			float r2 = c / temp ;
+			double sgnb = (b > 0 ? 1 : -1);
+			double temp = -0.5 * (b + sgnb * sqrt (disc));
+			double r1 = temp / a ;
+			double r2 = c / temp ;
 
-			if ( r1 < r2 )
+			if (r1 < r2) 
 			{
 				*x0 = r1 ;
 				*x1 = r2 ;
-			}
-			else
+			} 
+			else 
 			{
 				*x0 = r2 ;
 				*x1 = r1 ;
@@ -252,7 +294,7 @@ int gsl_poly_solve_quadratic ( float a, float b, float c,  float *x0, float *x1
 		}
 		return 2;
 	}
-	else if ( disc == 0 )
+	else if (disc == 0) 
 	{
 		*x0 = -0.5 * b / a ;
 		*x1 = -0.5 * b / a ;
@@ -266,79 +308,88 @@ int gsl_poly_solve_quadratic ( float a, float b, float c,  float *x0, float *x1
 
 
 
-/*
- * See Bridson et al. "Robust Treatment of Collision, Contact and Friction for Cloth Animation"
- *     page 4, left column
- */
 
-int cloth_get_collision_time ( float a[3], float b[3], float c[3], float d[3], float e[3], float f[3], float solution[3] )
+/*
+* See Bridson et al. "Robust Treatment of Collision, Contact and Friction for Cloth Animation"
+*     page 4, left column
+*/
+int cloth_get_collision_time ( double a[3], double b[3], double c[3], double d[3], double e[3], double f[3], double solution[3] )
 {
 	int num_sols = 0;
 
-	float g = -a[2] * c[1] * e[0] + a[1] * c[2] * e[0] +
-	          a[2] * c[0] * e[1] - a[0] * c[2] * e[1] -
-	          a[1] * c[0] * e[2] + a[0] * c[1] * e[2];
+	// x^0 - checked 
+	double g = 	a[0] * c[1] * e[2] - a[0] * c[2] * e[1] +
+		a[1] * c[2] * e[0] - a[1] * c[0] * e[2] + 
+		a[2] * c[0] * e[1] - a[2] * c[1] * e[0];
 
-	float h = -b[2] * c[1] * e[0] + b[1] * c[2] * e[0] - a[2] * d[1] * e[0] +
-	          a[1] * d[2] * e[0] + b[2] * c[0] * e[1] - b[0] * c[2] * e[1] +
-	          a[2] * d[0] * e[1] - a[0] * d[2] * e[1] - b[1] * c[0] * e[2] +
-	          b[0] * c[1] * e[2] - a[1] * d[0] * e[2] + a[0] * d[1] * e[2] -
-	          a[2] * c[1] * f[0] + a[1] * c[2] * f[0] + a[2] * c[0] * f[1] -
-	          a[0] * c[2] * f[1] - a[1] * c[0] * f[2] + a[0] * c[1] * f[2];
+	// x^1
+	double h = -b[2] * c[1] * e[0] + b[1] * c[2] * e[0] - a[2] * d[1] * e[0] +
+		a[1] * d[2] * e[0] + b[2] * c[0] * e[1] - b[0] * c[2] * e[1] +
+		a[2] * d[0] * e[1] - a[0] * d[2] * e[1] - b[1] * c[0] * e[2] +
+		b[0] * c[1] * e[2] - a[1] * d[0] * e[2] + a[0] * d[1] * e[2] -
+		a[2] * c[1] * f[0] + a[1] * c[2] * f[0] + a[2] * c[0] * f[1] -
+		a[0] * c[2] * f[1] - a[1] * c[0] * f[2] + a[0] * c[1] * f[2];
 
-	float i = -b[2] * d[1] * e[0] + b[1] * d[2] * e[0] +
-	          b[2] * d[0] * e[1] - b[0] * d[2] * e[1] -
-	          b[1] * d[0] * e[2] + b[0] * d[1] * e[2] -
-	          b[2] * c[1] * f[0] + b[1] * c[2] * f[0] -
-	          a[2] * d[1] * f[0] + a[1] * d[2] * f[0] +
-	          b[2] * c[0] * f[1] - b[0] * c[2] * f[1] +
-	          a[2] * d[0] * f[1] - a[0] * d[2] * f[1] -
-	          b[1] * c[0] * f[2] + b[0] * c[1] * f[2] -
-	          a[1] * d[0] * f[2] + a[0] * d[1] * f[2];
+	// x^2
+	double i = -b[2] * d[1] * e[0] + b[1] * d[2] * e[0] +
+		b[2] * d[0] * e[1] - b[0] * d[2] * e[1] -
+		b[1] * d[0] * e[2] + b[0] * d[1] * e[2] -
+		b[2] * c[1] * f[0] + b[1] * c[2] * f[0] -
+		a[2] * d[1] * f[0] + a[1] * d[2] * f[0] +
+		b[2] * c[0] * f[1] - b[0] * c[2] * f[1] + 
+		a[2] * d[0] * f[1] - a[0] * d[2] * f[1] -
+		b[1] * c[0] * f[2] + b[0] * c[1] * f[2] -
+		a[1] * d[0] * f[2] + a[0] * d[1] * f[2];
 
-	float j = -b[2] * d[1] * f[0] + b[1] * d[2] * f[0] +
-	          b[2] * d[0] * f[1] - b[0] * d[2] * f[1] -
-	          b[1] * d[0] * f[2] + b[0] * d[1] * f[2];
+	// x^3 - checked
+	double j = -b[2] * d[1] * f[0] + b[1] * d[2] * f[0] +
+		b[2] * d[0] * f[1] - b[0] * d[2] * f[1] -
+		b[1] * d[0] * f[2] + b[0] * d[1] * f[2];
 
+	/*
+	printf("r1: %lf\n", a[0] * c[1] * e[2] - a[0] * c[2] * e[1]);
+	printf("r2: %lf\n", a[1] * c[2] * e[0] - a[1] * c[0] * e[2]);
+	printf("r3: %lf\n", a[2] * c[0] * e[1] - a[2] * c[1] * e[0]);
+
+	printf("x1 x: %f, y: %f, z: %f\n", a[0], a[1], a[2]);
+	printf("x2 x: %f, y: %f, z: %f\n", c[0], c[1], c[2]);
+	printf("x3 x: %f, y: %f, z: %f\n", e[0], e[1], e[2]);
+
+	printf("v1 x: %f, y: %f, z: %f\n", b[0], b[1], b[2]);
+	printf("v2 x: %f, y: %f, z: %f\n", d[0], d[1], d[2]);
+	printf("v3 x: %f, y: %f, z: %f\n", f[0], f[1], f[2]);
+
+	printf("t^3: %lf, t^2: %lf, t^1: %lf, t^0: %lf\n", j, i, h, g);
+	
+*/
 	// Solve cubic equation to determine times t1, t2, t3, when the collision will occur.
-	if ( ABS ( j ) > ALMOST_ZERO )
+	if ( ABS ( j ) > DBL_EPSILON )
 	{
 		i /= j;
 		h /= j;
 		g /= j;
-
 		num_sols = gsl_poly_solve_cubic ( i, h, g, &solution[0], &solution[1], &solution[2] );
 	}
-	else if ( ABS ( i ) > ALMOST_ZERO )
+	else
 	{
 		num_sols = gsl_poly_solve_quadratic ( i, h, g, &solution[0], &solution[1] );
 		solution[2] = -1.0;
 	}
-	else if ( ABS ( h ) > ALMOST_ZERO )
-	{
-		solution[0] = -g / h;
-		solution[1] = solution[2] = -1.0;
-		num_sols = 1;
-	}
-	else if ( ABS ( g ) > ALMOST_ZERO )
-	{
-		solution[0] = 0;
-		solution[1] = solution[2] = -1.0;
-		num_sols = 1;
-	}
+
+	// printf("num_sols: %d, sol1: %lf, sol2: %lf, sol3: %lf\n", num_sols, solution[0],  solution[1],  solution[2]);
 
 	// Discard negative solutions
-	if ( ( num_sols >= 1 ) && ( solution[0] < 0 ) )
+	if ( ( num_sols >= 1 ) && ( solution[0] < DBL_EPSILON ) )
 	{
 		--num_sols;
 		solution[0] = solution[num_sols];
 	}
-	if ( ( num_sols >= 2 ) && ( solution[1] < 0 ) )
+	if ( ( num_sols >= 2 ) && ( solution[1] < DBL_EPSILON ) )
 	{
 		--num_sols;
 		solution[1] = solution[num_sols];
 	}
-	if ( ( num_sols == 3 ) && ( solution[2] < 0 ) )
+	if ( ( num_sols == 3 ) && ( solution[2] < DBL_EPSILON ) )
 	{
 		--num_sols;
 	}
@@ -374,6 +425,7 @@ int cloth_get_collision_time ( float a[3], float b[3], float c[3], float d[3], f
 	return num_sols;
 }
 
+
 // w3 is not perfect
 void collision_compute_barycentric ( float pv[3], float p1[3], float p2[3], float p3[3], float *w1, float *w2, float *w3 )
 {
@@ -419,38 +471,37 @@ DO_INLINE void collision_interpolateOnTriangle ( float to[3], float v1[3], float
 	VECADDMUL ( to, v3, w3 );
 }
 
-int cloth_collision_response_static ( ClothModifierData *clmd, CollisionModifierData *collmd )
+
+int cloth_collision_response_static ( ClothModifierData *clmd, CollisionModifierData *collmd, CollPair *collpair, CollPair *collision_end )
 {
 	int result = 0;
-	LinkNode *search = NULL;
-	CollPair *collpair = NULL;
 	Cloth *cloth1;
 	float w1, w2, w3, u1, u2, u3;
 	float v1[3], v2[3], relativeVelocity[3];
 	float magrelVel;
-	float epsilon2 = collmd->bvh->epsilon;
+	float epsilon2 = BLI_bvhtree_getepsilon ( collmd->bvhtree );
 
 	cloth1 = clmd->clothObject;
 
-	search = clmd->coll_parms->collision_list;
-
-	while ( search )
+	for ( ; collpair != collision_end; collpair++ )
 	{
-		collpair = search->link;
+		// only handle static collisions here
+		if ( collpair->flag & COLLISION_IN_FUTURE )
+			continue;
 
 		// compute barycentric coordinates for both collision points
 		collision_compute_barycentric ( collpair->pa,
-		                                cloth1->verts[collpair->ap1].txold,
-		                                cloth1->verts[collpair->ap2].txold,
-		                                cloth1->verts[collpair->ap3].txold,
-		                                &w1, &w2, &w3 );
+			cloth1->verts[collpair->ap1].txold,
+			cloth1->verts[collpair->ap2].txold,
+			cloth1->verts[collpair->ap3].txold,
+			&w1, &w2, &w3 );
 
 		// was: txold
 		collision_compute_barycentric ( collpair->pb,
-		                                collmd->current_x[collpair->bp1].co,
-		                                collmd->current_x[collpair->bp2].co,
-		                                collmd->current_x[collpair->bp3].co,
-		                                &u1, &u2, &u3 );
+			collmd->current_x[collpair->bp1].co,
+			collmd->current_x[collpair->bp2].co,
+			collmd->current_x[collpair->bp3].co,
+			&u1, &u2, &u3 );
 
 		// Calculate relative "velocity".
 		collision_interpolateOnTriangle ( v1, cloth1->verts[collpair->ap1].tv, cloth1->verts[collpair->ap2].tv, cloth1->verts[collpair->ap3].tv, w1, w2, w3 );
@@ -530,70 +581,50 @@ int cloth_collision_response_static ( ClothModifierData *clmd, CollisionModifier
 
 			result = 1;
 		}
-
-		search = search->next;
 	}
-
-
 	return result;
 }
 
-int cloth_collision_response_moving_tris ( ClothModifierData *clmd, ClothModifierData *coll_clmd )
-{
-	return 1;
-}
-
-
-int cloth_collision_response_moving_edges ( ClothModifierData *clmd, ClothModifierData *coll_clmd )
-{
-	return 1;
-}
-
-void cloth_collision_static ( ModifierData *md1, ModifierData *md2, CollisionTree *tree1, CollisionTree *tree2 )
+//Determines collisions on overlap, collisions are writen to collpair[i] and collision+number_collision_found is returned
+CollPair* cloth_collision ( ModifierData *md1, ModifierData *md2, BVHTreeOverlap *overlap, CollPair *collpair )
 {
 	ClothModifierData *clmd = ( ClothModifierData * ) md1;
 	CollisionModifierData *collmd = ( CollisionModifierData * ) md2;
-	CollPair *collpair = NULL;
-	Cloth *cloth1=NULL;
-	MFace *face1=NULL, *face2=NULL;
-	ClothVertex *verts1=NULL;
+	MFace *face1=NULL, *face2 = NULL;
+	ClothVertex *verts1 = clmd->clothObject->verts;
 	double distance = 0;
-	float epsilon = clmd->coll_parms->epsilon;
-	float epsilon2 = ( ( CollisionModifierData * ) md2 )->bvh->epsilon;
-	unsigned int i = 0;
+	float epsilon1 = clmd->coll_parms->epsilon;
+	float epsilon2 = BLI_bvhtree_getepsilon ( collmd->bvhtree );
+	int i;
 
+	face1 = & ( clmd->clothObject->mfaces[overlap->indexA] );
+	face2 = & ( collmd->mfaces[overlap->indexB] );
+
+	// check all 4 possible collisions
 	for ( i = 0; i < 4; i++ )
 	{
-		collpair = ( CollPair * ) MEM_callocN ( sizeof ( CollPair ), "cloth coll pair" );
-
-		cloth1 = clmd->clothObject;
-
-		verts1 = cloth1->verts;
-
-		face1 = & ( cloth1->mfaces[tree1->tri_index] );
-		face2 = & ( collmd->mfaces[tree2->tri_index] );
-
-		// check all possible pairs of triangles
 		if ( i == 0 )
 		{
+			// fill faceA
 			collpair->ap1 = face1->v1;
 			collpair->ap2 = face1->v2;
 			collpair->ap3 = face1->v3;
 
+			// fill faceB
 			collpair->bp1 = face2->v1;
 			collpair->bp2 = face2->v2;
 			collpair->bp3 = face2->v3;
-
 		}
-
-		if ( i == 1 )
+		else if ( i == 1 )
 		{
 			if ( face1->v4 )
 			{
-				collpair->ap1 = face1->v3;
+				// fill faceA
+				collpair->ap1 = face1->v1;
 				collpair->ap2 = face1->v4;
-				collpair->ap3 = face1->v1;
+				collpair->ap3 = face1->v3;
 
+				// fill faceB
 				collpair->bp1 = face2->v1;
 				collpair->bp2 = face2->v2;
 				collpair->bp3 = face2->v3;
@@ -601,386 +632,704 @@ void cloth_collision_static ( ModifierData *md1, ModifierData *md2, CollisionTre
 			else
 				i++;
 		}
-
 		if ( i == 2 )
 		{
 			if ( face2->v4 )
 			{
+				// fill faceA
 				collpair->ap1 = face1->v1;
 				collpair->ap2 = face1->v2;
 				collpair->ap3 = face1->v3;
 
-				collpair->bp1 = face2->v3;
+				// fill faceB
+				collpair->bp1 = face2->v1;
 				collpair->bp2 = face2->v4;
-				collpair->bp3 = face2->v1;
+				collpair->bp3 = face2->v3;
 			}
 			else
-				i+=2;
-		}
-
-		if ( i == 3 )
-		{
-			if ( ( face1->v4 ) && ( face2->v4 ) )
-			{
-				collpair->ap1 = face1->v3;
-				collpair->ap2 = face1->v4;
-				collpair->ap3 = face1->v1;
-
-				collpair->bp1 = face2->v3;
-				collpair->bp2 = face2->v4;
-				collpair->bp3 = face2->v1;
-			}
-			else
-				i++;
-		}
-
-		// calc SIPcode (?)
-
-		if ( i < 4 )
-		{
-			// calc distance + normal
-#ifdef WITH_BULLET
-			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 );
-#else
-			// just be sure that we don't add anything
-			distance = 2.0 * ( epsilon + epsilon2 + ALMOST_ZERO );
-#endif
-			if ( distance <= ( epsilon + epsilon2 + ALMOST_ZERO ) )
-			{
-				// printf("dist: %f\n", (float)distance);
-
-				// collpair->face1 = tree1->tri_index;
-				// collpair->face2 = tree2->tri_index;
-
-				VECCOPY ( collpair->normal, collpair->vector );
-				Normalize ( collpair->normal );
-
-				collpair->distance = distance;
-				BLI_linklist_prepend ( &clmd->coll_parms->collision_list, collpair );
-
-			}
-			else
-			{
-				MEM_freeN ( collpair );
-			}
-		}
-		else
-		{
-			MEM_freeN ( collpair );
-		}
-	}
-}
-
-int cloth_are_edges_adjacent ( ClothModifierData *clmd, ClothModifierData *coll_clmd, EdgeCollPair *edgecollpair )
-{
-	Cloth *cloth1 = NULL, *cloth2 = NULL;
-	ClothVertex *verts1 = NULL, *verts2 = NULL;
-	float temp[3];
-
-	cloth1 = clmd->clothObject;
-	cloth2 = coll_clmd->clothObject;
-
-	verts1 = cloth1->verts;
-	verts2 = cloth2->verts;
-
-	VECSUB ( temp, verts1[edgecollpair->p11].xold, verts2[edgecollpair->p21].xold );
-	if ( ABS ( INPR ( temp, temp ) ) < ALMOST_ZERO )
-		return 1;
-
-	VECSUB ( temp, verts1[edgecollpair->p11].xold, verts2[edgecollpair->p22].xold );
-	if ( ABS ( INPR ( temp, temp ) ) < ALMOST_ZERO )
-		return 1;
-
-	VECSUB ( temp, verts1[edgecollpair->p12].xold, verts2[edgecollpair->p21].xold );
-	if ( ABS ( INPR ( temp, temp ) ) < ALMOST_ZERO )
-		return 1;
-
-	VECSUB ( temp, verts1[edgecollpair->p12].xold, verts2[edgecollpair->p22].xold );
-	if ( ABS ( INPR ( temp, temp ) ) < ALMOST_ZERO )
-		return 1;
-
-	return 0;
-}
-
-void cloth_collision_moving_edges ( ClothModifierData *clmd, ClothModifierData *coll_clmd, CollisionTree *tree1, CollisionTree *tree2 )
-{
-	EdgeCollPair edgecollpair;
-	Cloth *cloth1=NULL, *cloth2=NULL;
-	MFace *face1=NULL, *face2=NULL;
-	ClothVertex *verts1=NULL, *verts2=NULL;
-	unsigned int i = 0, j = 0, k = 0;
-	int numsolutions = 0;
-	float a[3], b[3], c[3], d[3], e[3], f[3], solution[3];
-
-	cloth1 = clmd->clothObject;
-	cloth2 = coll_clmd->clothObject;
-
-	verts1 = cloth1->verts;
-	verts2 = cloth2->verts;
-
-	face1 = & ( cloth1->mfaces[tree1->tri_index] );
-	face2 = & ( cloth2->mfaces[tree2->tri_index] );
-
-	for ( i = 0; i < 5; i++ )
-	{
-		if ( i == 0 )
-		{
-			edgecollpair.p11 = face1->v1;
-			edgecollpair.p12 = face1->v2;
-		}
-		else if ( i == 1 )
-		{
-			edgecollpair.p11 = face1->v2;
-			edgecollpair.p12 = face1->v3;
-		}
-		else if ( i == 2 )
-		{
-			if ( face1->v4 )
-			{
-				edgecollpair.p11 = face1->v3;
-				edgecollpair.p12 = face1->v4;
-			}
-			else
-			{
-				edgecollpair.p11 = face1->v3;
-				edgecollpair.p12 = face1->v1;
-				i+=5; // get out of here after this edge pair is handled
-			}
+				break;
 		}
 		else if ( i == 3 )
 		{
-			if ( face1->v4 )
+			if ( face1->v4 && face2->v4 )
 			{
-				edgecollpair.p11 = face1->v4;
-				edgecollpair.p12 = face1->v1;
+				// fill faceA
+				collpair->ap1 = face1->v1;
+				collpair->ap2 = face1->v4;
+				collpair->ap3 = face1->v3;
+
+				// fill faceB
+				collpair->bp1 = face2->v1;
+				collpair->bp2 = face2->v4;
+				collpair->bp3 = face2->v3;
 			}
 			else
-				continue;
+				break;
+		}
+
+#ifdef WITH_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 );
+#else
+		// just be sure that we don't add anything
+		distance = 2.0 * ( epsilon1 + epsilon2 + ALMOST_ZERO );
+#endif
+
+		if ( distance <= ( epsilon1 + epsilon2 + ALMOST_ZERO ) )
+		{
+			VECCOPY ( collpair->normal, collpair->vector );
+			Normalize ( collpair->normal );
+
+			collpair->distance = distance;
+			collpair->flag = 0;
+			collpair++;
+		}/*
+		else
+		{
+			float w1, w2, w3, u1, u2, u3;
+			float v1[3], v2[3], relativeVelocity[3];
+
+			// calc relative velocity
+			
+			// compute barycentric coordinates for both collision points
+			collision_compute_barycentric ( collpair->pa,
+			verts1[collpair->ap1].txold,
+			verts1[collpair->ap2].txold,
+			verts1[collpair->ap3].txold,
+			&w1, &w2, &w3 );
+
+			// was: txold
+			collision_compute_barycentric ( collpair->pb,
+			collmd->current_x[collpair->bp1].co,
+			collmd->current_x[collpair->bp2].co,
+			collmd->current_x[collpair->bp3].co,
+			&u1, &u2, &u3 );
+
+			// Calculate relative "velocity".
+			collision_interpolateOnTriangle ( v1, verts1[collpair->ap1].tv, verts1[collpair->ap2].tv, verts1[collpair->ap3].tv, w1, w2, w3 );
+
+			collision_interpolateOnTriangle ( v2, collmd->current_v[collpair->bp1].co, collmd->current_v[collpair->bp2].co, collmd->current_v[collpair->bp3].co, u1, u2, u3 );
+
+			VECSUB ( relativeVelocity, v2, v1 );
+
+			if(sqrt(INPR(relativeVelocity, relativeVelocity)) >= distance)
+			{
+				// check for collision in the future
+				collpair->flag |= COLLISION_IN_FUTURE;
+				collpair++;
+			}
+		}*/
+	}
+	return collpair;
+}
+
+int cloth_collision_response_moving( ClothModifierData *clmd, CollisionModifierData *collmd, CollPair *collpair, CollPair *collision_end )
+{
+	int result = 0;
+	Cloth *cloth1;
+	float w1, w2, w3, u1, u2, u3;
+	float v1[3], v2[3], relativeVelocity[3];
+	float magrelVel;
+
+	cloth1 = clmd->clothObject;
+
+	for ( ; collpair != collision_end; collpair++ )
+	{
+		// compute barycentric coordinates for both collision points
+		collision_compute_barycentric ( collpair->pa,
+			cloth1->verts[collpair->ap1].txold,
+			cloth1->verts[collpair->ap2].txold,
+			cloth1->verts[collpair->ap3].txold,
+			&w1, &w2, &w3 );
+
+		// was: txold
+		collision_compute_barycentric ( collpair->pb,
+			collmd->current_x[collpair->bp1].co,
+			collmd->current_x[collpair->bp2].co,
+			collmd->current_x[collpair->bp3].co,
+			&u1, &u2, &u3 );
+
+		// Calculate relative "velocity".
+		collision_interpolateOnTriangle ( v1, cloth1->verts[collpair->ap1].tv, cloth1->verts[collpair->ap2].tv, cloth1->verts[collpair->ap3].tv, w1, w2, w3 );
+
+		collision_interpolateOnTriangle ( v2, collmd->current_v[collpair->bp1].co, collmd->current_v[collpair->bp2].co, collmd->current_v[collpair->bp3].co, u1, u2, u3 );
+
+		VECSUB ( relativeVelocity, v2, v1 );
+
+		// Calculate the normal component of the relative velocity (actually only the magnitude - the direction is stored in 'normal').
+		magrelVel = INPR ( relativeVelocity, collpair->normal );
+
+		// printf("magrelVel: %f\n", magrelVel);
+
+		// Calculate masses of points.
+		// TODO
+
+		// If v_n_mag < 0 the edges are approaching each other.
+		if ( magrelVel > ALMOST_ZERO )
+		{
+			// Calculate Impulse magnitude to stop all motion in normal direction.
+			float magtangent = 0;
+			double impulse = 0.0;
+			float vrel_t_pre[3];
+			float temp[3];
+
+			// calculate tangential velocity
+			VECCOPY ( temp, collpair->normal );
+			VecMulf ( temp, magrelVel );
+			VECSUB ( vrel_t_pre, relativeVelocity, temp );
+
+			// Decrease in magnitude of relative tangential velocity due to coulomb friction
+			// in original formula "magrelVel" should be the "change of relative velocity in normal direction"
+			magtangent = MIN2 ( clmd->coll_parms->friction * 0.01 * magrelVel,sqrt ( INPR ( vrel_t_pre,vrel_t_pre ) ) );
+
+			// Apply friction impulse.
+			if ( magtangent > ALMOST_ZERO )
+			{
+				Normalize ( vrel_t_pre );
+
+				impulse = 2.0 * magtangent / ( 1.0 + w1*w1 + w2*w2 + w3*w3 );
+				VECADDMUL ( cloth1->verts[collpair->ap1].impulse, vrel_t_pre, w1 * impulse );
+				VECADDMUL ( cloth1->verts[collpair->ap2].impulse, vrel_t_pre, w2 * impulse );
+				VECADDMUL ( cloth1->verts[collpair->ap3].impulse, vrel_t_pre, w3 * impulse );
+			}
+
+			// Apply velocity stopping impulse
+			// I_c = m * v_N / 2.0
+			// no 2.0 * magrelVel normally, but looks nicer DG
+			impulse =  magrelVel / ( 1.0 + w1*w1 + w2*w2 + w3*w3 );
+
+			VECADDMUL ( cloth1->verts[collpair->ap1].impulse, collpair->normal, w1 * impulse );
+			cloth1->verts[collpair->ap1].impulse_count++;
+
+			VECADDMUL ( cloth1->verts[collpair->ap2].impulse, collpair->normal, w2 * impulse );
+			cloth1->verts[collpair->ap2].impulse_count++;
+
+			VECADDMUL ( cloth1->verts[collpair->ap3].impulse, collpair->normal, w3 * impulse );
+			cloth1->verts[collpair->ap3].impulse_count++;
+
+			// Apply repulse impulse if distance too short
+			// I_r = -min(dt*kd, m(0,1d/dt - v_n))
+			/*
+			d = clmd->coll_parms->epsilon*8.0/9.0 + epsilon2*8.0/9.0 - collpair->distance;
+			if ( ( magrelVel < 0.1*d*clmd->sim_parms->stepsPerFrame ) && ( d > ALMOST_ZERO ) )
+			{
+			repulse = MIN2 ( d*1.0/clmd->sim_parms->stepsPerFrame, 0.1*d*clmd->sim_parms->stepsPerFrame - magrelVel );
+
+			// stay on the safe side and clamp repulse
+			if ( impulse > ALMOST_ZERO )
+			repulse = MIN2 ( repulse, 5.0*impulse );
+			repulse = MAX2 ( impulse, repulse );
+
+			impulse = repulse / ( 1.0 + w1*w1 + w2*w2 + w3*w3 ); // original 2.0 / 0.25
+			VECADDMUL ( cloth1->verts[collpair->ap1].impulse, collpair->normal,  impulse );
+			VECADDMUL ( cloth1->verts[collpair->ap2].impulse, collpair->normal,  impulse );
+			VECADDMUL ( cloth1->verts[collpair->ap3].impulse, collpair->normal,  impulse );
+			}
+			*/
+			result = 1;
+		}
+	}
+	return result;
+}
+
+static float projectPointOntoLine(float *p, float *a, float *b) 
+{
+   float ba[3], pa[3];
+   VECSUB(ba, b, a);
+   VECSUB(pa, p, a);
+   return INPR(pa, ba) / INPR(ba, ba);
+}
+
+static void calculateEENormal(float *np1, float *np2, float *np3, float *np4,float *out_normal) 
+{
+	float line1[3], line2[3];
+	float length;
+
+	VECSUB(line1, np2, np1);
+	VECSUB(line2, np3, np1);
+
+	// printf("l1: %f, l1: %f, l2: %f, l2: %f\n", line1[0], line1[1], line2[0], line2[1]);
+
+	Crossf(out_normal, line1, line2);
+
+	
+
+	length = Normalize(out_normal);
+	if (length <= FLT_EPSILON)
+	{ // lines are collinear
+		VECSUB(out_normal, np2, np1);
+		Normalize(out_normal);
+	}
+}
+
+static void findClosestPointsEE(float *x1, float *x2, float *x3, float *x4, float *w1, float *w2)
+{
+	float temp[3], temp2[3];
+	
+	double a, b, c, e, f; 
+
+	VECSUB(temp, x2, x1);
+	a = INPR(temp, temp);
+
+	VECSUB(temp2, x4, x3);
+	b = -INPR(temp, temp2);
+
+	c = INPR(temp2, temp2);
+
+	VECSUB(temp2, x3, x1);
+	e = INPR(temp, temp2);
+
+	VECSUB(temp, x4, x3);
+	f = -INPR(temp, temp2);
+
+	*w1 = (e * c - b * f) / (a * c - b * b);
+	*w2 = (f - b * *w1) / c;
+
+}
+
+// calculates the distance of 2 edges
+float edgedge_distance(float np11[3], float np12[3], float np21[3], float np22[3], float *out_a1, float *out_a2, float *out_normal)
+{
+	float line1[3], line2[3], cross[3];
+	float length;
+	float temp[3], temp2[3];
+	float dist_a1, dist_a2;
+	
+	VECSUB(line1, np12, np11);
+	VECSUB(line2, np22, np21);
+
+	Crossf(cross, line1, line2);
+	length = INPR(cross, cross);
+
+	if (length < FLT_EPSILON) 
+	{
+		*out_a2 = projectPointOntoLine(np11, np21, np22);
+		if ((*out_a2 >= -FLT_EPSILON) && (*out_a2 <= 1.0 + FLT_EPSILON)) 
+		{
+			*out_a1 = 0;
+			calculateEENormal(np11, np12, np21, np22, out_normal);
+			VECSUB(temp, np22, np21);
+			VecMulf(temp, *out_a2);
+			VECADD(temp2, temp, np21);
+			VECADD(temp2, temp2, np11);
+			return INPR(temp2, temp2);
+		}
+
+		CLAMP(*out_a2, 0.0, 1.0);
+		if (*out_a2 > .5) 
+		{ // == 1.0
+			*out_a1 = projectPointOntoLine(np22, np11, np12);
+			if ((*out_a1 >= -FLT_EPSILON) && (*out_a1 <= 1.0 + FLT_EPSILON)) 
+			{
+				calculateEENormal(np11, np12, np21, np22, out_normal);
+
+				// return (np22 - (np11 + (np12 - np11) * out_a1)).lengthSquared();
+				VECSUB(temp, np12, np11);
+				VecMulf(temp, *out_a1);
+				VECADD(temp2, temp, np11);
+				VECSUB(temp2, np22, temp2);
+				return INPR(temp2, temp2);
+			}
+		} 
+		else 
+		{ // == 0.0
+			*out_a1 = projectPointOntoLine(np21, np11, np12);
+			if ((*out_a1 >= -FLT_EPSILON) && (*out_a1 <= 1.0 + FLT_EPSILON)) 
+			{
+				calculateEENormal(np11, np11, np21, np22, out_normal);
+
+				// return (np21 - (np11 + (np12 - np11) * out_a1)).lengthSquared();
+				VECSUB(temp, np12, np11);
+				VecMulf(temp, *out_a1);
+				VECADD(temp2, temp, np11);
+				VECSUB(temp2, np21, temp2);
+				return INPR(temp2, temp2);
+			}
+		}
+
+		CLAMP(*out_a1, 0.0, 1.0);
+		calculateEENormal(np11, np12, np21, np22, out_normal);
+		if(*out_a1 > .5)
+		{
+			if(*out_a2 > .5)
+			{
+				VECSUB(temp, np12, np22);
+			}
+			else
+			{
+				VECSUB(temp, np12, np21);
+			}
 		}
 		else
 		{
-			edgecollpair.p11 = face1->v3;
-			edgecollpair.p12 = face1->v1;
-		}
-
-
-		for ( j = 0; j < 5; j++ )
-		{
-			if ( j == 0 )
+			if(*out_a2 > .5)
 			{
-				edgecollpair.p21 = face2->v1;
-				edgecollpair.p22 = face2->v2;
-			}
-			else if ( j == 1 )
-			{
-				edgecollpair.p21 = face2->v2;
-				edgecollpair.p22 = face2->v3;
-			}
-			else if ( j == 2 )
-			{
-				if ( face2->v4 )
-				{
-					edgecollpair.p21 = face2->v3;
-					edgecollpair.p22 = face2->v4;
-				}
-				else
-				{
-					edgecollpair.p21 = face2->v3;
-					edgecollpair.p22 = face2->v1;
-				}
-			}
-			else if ( j == 3 )
-			{
-				if ( face2->v4 )
-				{
-					edgecollpair.p21 = face2->v4;
-					edgecollpair.p22 = face2->v1;
-				}
-				else
-					continue;
+				VECSUB(temp, np11, np22);
 			}
 			else
 			{
-				edgecollpair.p21 = face2->v3;
-				edgecollpair.p22 = face2->v1;
-			}
-
-
-			if ( !cloth_are_edges_adjacent ( clmd, coll_clmd, &edgecollpair ) )
-			{
-				VECSUB ( a, verts1[edgecollpair.p12].xold, verts1[edgecollpair.p11].xold );
-				VECSUB ( b, verts1[edgecollpair.p12].v, verts1[edgecollpair.p11].v );
-				VECSUB ( c, verts1[edgecollpair.p21].xold, verts1[edgecollpair.p11].xold );
-				VECSUB ( d, verts1[edgecollpair.p21].v, verts1[edgecollpair.p11].v );
-				VECSUB ( e, verts2[edgecollpair.p22].xold, verts1[edgecollpair.p11].xold );
-				VECSUB ( f, verts2[edgecollpair.p22].v, verts1[edgecollpair.p11].v );
-
-				numsolutions = cloth_get_collision_time ( a, b, c, d, e, f, solution );
-
-				for ( k = 0; k < numsolutions; k++ )
-				{
-					if ( ( solution[k] >= 0.0 ) && ( solution[k] <= 1.0 ) )
-					{
-						//float out_collisionTime = solution[k];
-
-						// TODO: check for collisions
-
-						// TODO: put into (edge) collision list
-
-						// printf("Moving edge found!\n");
-					}
-				}
+				VECSUB(temp, np11, np21);
 			}
 		}
+
+		return INPR(temp, temp);
 	}
+	else
+	{
+		
+		// If the lines aren't parallel (but coplanar) they have to intersect
+
+		findClosestPointsEE(np11, np12, np21, np22, out_a1, out_a2);
+
+		// If both points are on the finite edges, we're done.
+		if (*out_a1 >= 0.0 && *out_a1 <= 1.0 && *out_a2 >= 0.0 && *out_a2 <= 1.0) 
+		{
+			float p1[3], p2[3];
+			
+			// p1= np11 + (np12 - np11) * out_a1;
+			VECSUB(temp, np12, np11);
+			VecMulf(temp, *out_a1);
+			VECADD(p1, np11, temp);
+			
+			// p2 = np21 + (np22 - np21) * out_a2;
+			VECSUB(temp, np22, np21);
+			VecMulf(temp, *out_a2);
+			VECADD(p2, np21, temp);
+
+			calculateEENormal(np11, np12, np21, np22, out_normal);
+			VECSUB(temp, p1, p2);
+			return INPR(temp, temp);
+		}
+
+		
+		/*
+		* Clamp both points to the finite edges.
+		* The one that moves most during clamping is one part of the solution.
+		*/
+		dist_a1 = *out_a1;
+		CLAMP(dist_a1, 0.0, 1.0);
+		dist_a2 = *out_a2;
+		CLAMP(dist_a2, 0.0, 1.0);
+
+		// Now project the "most clamped" point on the other line.
+		if (dist_a1 > dist_a2) 
+		{ 
+			/* keep out_a1 */
+			float p1[3];
+
+			// p1 = np11 + (np12 - np11) * out_a1;
+			VECSUB(temp, np12, np11);
+			VecMulf(temp, *out_a1);
+			VECADD(p1, np11, temp);
+
+			*out_a2 = projectPointOntoLine(p1, np21, np22);
+			CLAMP(*out_a2, 0.0, 1.0);
+
+			calculateEENormal(np11, np12, np21, np22, out_normal);
+
+			// return (p1 - (np21 + (np22 - np21) * out_a2)).lengthSquared();
+			VECSUB(temp, np22, np21);
+			VecMulf(temp, *out_a2);
+			VECADD(temp, temp, np21);
+			VECSUB(temp, p1, temp);
+			return INPR(temp, temp);
+		} 
+		else 
+		{	
+			/* keep out_a2 */
+			float p2[3];
+			
+			// p2 = np21 + (np22 - np21) * out_a2;
+			VECSUB(temp, np22, np21);
+			VecMulf(temp, *out_a2);
+			VECADD(p2, np21, temp);
+
+			*out_a1 = projectPointOntoLine(p2, np11, np12);
+			CLAMP(*out_a1, 0.0, 1.0);
+
+			calculateEENormal(np11, np12, np21, np22, out_normal);
+			
+			// return ((np11 + (np12 - np11) * out_a1) - p2).lengthSquared();
+			VECSUB(temp, np12, np11);
+			VecMulf(temp, *out_a1);
+			VECADD(temp, temp, np11);
+			VECSUB(temp, temp, p2);
+			return INPR(temp, temp);
+		}
+	}
+	
+	printf("Error in edgedge_distance: end of function\n");
+	return 0;
 }
 
-void cloth_collision_moving_tris ( ClothModifierData *clmd, ClothModifierData *coll_clmd, CollisionTree *tree1, CollisionTree *tree2 )
+int cloth_collision_moving_edges ( ClothModifierData *clmd, CollisionModifierData *collmd, CollPair *collpair )
 {
-	CollPair collpair;
-	Cloth *cloth1=NULL, *cloth2=NULL;
-	MFace *face1=NULL, *face2=NULL;
-	ClothVertex *verts1=NULL, *verts2=NULL;
-	unsigned int i = 0, j = 0, k = 0;
+	EdgeCollPair edgecollpair;
+	Cloth *cloth1=NULL;
+	ClothVertex *verts1=NULL;
+	unsigned int i = 0, k = 0;
 	int numsolutions = 0;
-	float a[3], b[3], c[3], d[3], e[3], f[3], solution[3];
+	double x1[3], v1[3], x2[3], v2[3], x3[3], v3[3];
+	double solution[3], solution2[3];
+	MVert *verts2 = collmd->current_x; // old x
+	MVert *velocity2 = collmd->current_v; // velocity
+	float distance = 0;
+	float triA[3][3], triB[3][3];
+	int result = 0;
 
-	for ( i = 0; i < 2; i++ )
+	cloth1 = clmd->clothObject;
+	verts1 = cloth1->verts;
+
+	for(i = 0; i < 9; i++)
 	{
-		cloth1 = clmd->clothObject;
-		cloth2 = coll_clmd->clothObject;
+		// 9 edge - edge possibilities
 
-		verts1 = cloth1->verts;
-		verts2 = cloth2->verts;
-
-		face1 = & ( cloth1->mfaces[tree1->tri_index] );
-		face2 = & ( cloth2->mfaces[tree2->tri_index] );
-
-		// check all possible pairs of triangles
-		if ( i == 0 )
+		if(i == 0) // cloth edge: 1-2; coll edge: 1-2
 		{
-			collpair.ap1 = face1->v1;
-			collpair.ap2 = face1->v2;
-			collpair.ap3 = face1->v3;
+			edgecollpair.p11 = collpair->ap1;
+			edgecollpair.p12 = collpair->ap2;
 
-			collpair.pointsb[0] = face2->v1;
-			collpair.pointsb[1] = face2->v2;
-			collpair.pointsb[2] = face2->v3;
-			collpair.pointsb[3] = face2->v4;
+			edgecollpair.p21 = collpair->bp1;
+			edgecollpair.p22 = collpair->bp2;
 		}
-
-		if ( i == 1 )
+		else if(i == 1) // cloth edge: 1-2; coll edge: 2-3
 		{
-			if ( face1->v4 )
-			{
-				collpair.ap1 = face1->v3;
-				collpair.ap2 = face1->v4;
-				collpair.ap3 = face1->v1;
+			edgecollpair.p11 = collpair->ap1;
+			edgecollpair.p12 = collpair->ap2;
 
-				collpair.pointsb[0] = face2->v1;
-				collpair.pointsb[1] = face2->v2;
-				collpair.pointsb[2] = face2->v3;
-				collpair.pointsb[3] = face2->v4;
-			}
-			else
-				i++;
+			edgecollpair.p21 = collpair->bp2;
+			edgecollpair.p22 = collpair->bp3;
 		}
-
-		// calc SIPcode (?)
-
-		if ( i < 2 )
+		else if(i == 2) // cloth edge: 1-2; coll edge: 1-3
 		{
-			VECSUB ( a, verts1[collpair.ap2].xold, verts1[collpair.ap1].xold );
-			VECSUB ( b, verts1[collpair.ap2].v, verts1[collpair.ap1].v );
-			VECSUB ( c, verts1[collpair.ap3].xold, verts1[collpair.ap1].xold );
-			VECSUB ( d, verts1[collpair.ap3].v, verts1[collpair.ap1].v );
+			edgecollpair.p11 = collpair->ap1;
+			edgecollpair.p12 = collpair->ap2;
 
-			for ( j = 0; j < 4; j++ )
+			edgecollpair.p21 = collpair->bp1;
+			edgecollpair.p22 = collpair->bp3;
+		}
+		else if(i == 3) // cloth edge: 2-3; coll edge: 1-2
+		{
+			edgecollpair.p11 = collpair->ap2;
+			edgecollpair.p12 = collpair->ap3;
+
+			edgecollpair.p21 = collpair->bp1;
+			edgecollpair.p22 = collpair->bp2;
+		}
+		else if(i == 4) // cloth edge: 2-3; coll edge: 2-3
+		{
+			edgecollpair.p11 = collpair->ap2;
+			edgecollpair.p12 = collpair->ap3;
+
+			edgecollpair.p21 = collpair->bp2;
+			edgecollpair.p22 = collpair->bp3;
+		}
+		else if(i == 5) // cloth edge: 2-3; coll edge: 1-3
+		{
+			edgecollpair.p11 = collpair->ap2;
+			edgecollpair.p12 = collpair->ap3;
+
+			edgecollpair.p21 = collpair->bp1;
+			edgecollpair.p22 = collpair->bp3;
+		}
+		else if(i ==6) // cloth edge: 1-3; coll edge: 1-2
+		{
+			edgecollpair.p11 = collpair->ap1;
+			edgecollpair.p12 = collpair->ap3;
+
+			edgecollpair.p21 = collpair->bp1;
+			edgecollpair.p22 = collpair->bp2;
+		}
+		else if(i ==7) // cloth edge: 1-3; coll edge: 2-3
+		{
+			edgecollpair.p11 = collpair->ap1;
+			edgecollpair.p12 = collpair->ap3;
+
+			edgecollpair.p21 = collpair->bp2;
+			edgecollpair.p22 = collpair->bp3;
+		}
+		else if(i == 8) // cloth edge: 1-3; coll edge: 1-3
+		{
+			edgecollpair.p11 = collpair->ap1;
+			edgecollpair.p12 = collpair->ap3;
+
+			edgecollpair.p21 = collpair->bp1;
+			edgecollpair.p22 = collpair->bp3;
+		}
+		/*
+		if((edgecollpair.p11 == 3) && (edgecollpair.p12 == 16))
+			printf("Ahier!\n");
+		if((edgecollpair.p11 == 16) && (edgecollpair.p12 == 3))
+			printf("Ahier!\n");
+		*/
+
+		// if ( !cloth_are_edges_adjacent ( clmd, collmd, &edgecollpair ) )
+		{
+			// always put coll points in p21/p22
+			VECSUB ( x1, verts1[edgecollpair.p12].txold, verts1[edgecollpair.p11].txold );
+			VECSUB ( v1, verts1[edgecollpair.p12].tv, verts1[edgecollpair.p11].tv );
+
+			VECSUB ( x2, verts2[edgecollpair.p21].co, verts1[edgecollpair.p11].txold );
+			VECSUB ( v2, velocity2[edgecollpair.p21].co, verts1[edgecollpair.p11].tv );
+
+			VECSUB ( x3, verts2[edgecollpair.p22].co, verts1[edgecollpair.p11].txold );
+			VECSUB ( v3, velocity2[edgecollpair.p22].co, verts1[edgecollpair.p11].tv );
+
+			numsolutions = cloth_get_collision_time ( x1, v1, x2, v2, x3, v3, solution );
+
+			if((edgecollpair.p11 == 3 && edgecollpair.p12==16)|| (edgecollpair.p11==16 && edgecollpair.p12==3))
 			{
-				if ( ( j==3 ) && ! ( face2->v4 ) )
-					break;
-
-				VECSUB ( e, verts2[collpair.pointsb[j]].xold, verts1[collpair.ap1].xold );
-				VECSUB ( f, verts2[collpair.pointsb[j]].v, verts1[collpair.ap1].v );
-
-				numsolutions = cloth_get_collision_time ( a, b, c, d, e, f, solution );
-
-				for ( k = 0; k < numsolutions; k++ )
+				if(edgecollpair.p21==6 || edgecollpair.p22 == 6)
 				{
-					if ( ( solution[k] >= 0.0 ) && ( solution[k] <= 1.0 ) )
-					{
-						//float out_collisionTime = solution[k];
-
-						// TODO: check for collisions
-
-						// TODO: put into (point-face) collision list
-
-						// printf("Moving found!\n");
-
-					}
+					printf("dist: %f, sol[k]: %lf, sol2[k]: %lf\n", distance, solution[k], solution2[k]);
+					printf("a1: %f, a2: %f, b1: %f, b2: %f\n", x1[0], x2[0], x3[0], v1[0]);
+					printf("b21: %d, b22: %d\n", edgecollpair.p21, edgecollpair.p22);
 				}
-
-				// TODO: check borders for collisions
 			}
 
+			for ( k = 0; k < numsolutions; k++ )
+			{
+				// printf("sol %d: %lf\n", k, solution[k]);
+				if ( ( solution[k] >= ALMOST_ZERO ) && ( solution[k] <= 1.0 ) && ( solution[k] >  ALMOST_ZERO))
+				{
+					float a,b;
+					float out_normal[3];
+					float distance;
+					float impulse = 0;
+					float I_mag;
+
+					// move verts
+					VECADDS(triA[0], verts1[edgecollpair.p11].txold, verts1[edgecollpair.p11].tv, solution[k]);
+					VECADDS(triA[1], verts1[edgecollpair.p12].txold, verts1[edgecollpair.p12].tv, solution[k]);
+
+					VECADDS(triB[0], collmd->current_x[edgecollpair.p21].co, collmd->current_v[edgecollpair.p21].co, solution[k]);
+					VECADDS(triB[1], collmd->current_x[edgecollpair.p22].co, collmd->current_v[edgecollpair.p22].co, solution[k]);
+
+					// TODO: check for collisions
+					distance = edgedge_distance(triA[0], triA[1], triB[0], triB[1], &a, &b, out_normal);
+					
+					if ((distance <= clmd->coll_parms->epsilon + BLI_bvhtree_getepsilon ( collmd->bvhtree ) + ALMOST_ZERO) && (INPR(out_normal, out_normal) > 0))
+					{
+						float vrel_1_to_2[3], temp[3], temp2[3], out_normalVelocity;
+						float desiredVn;
+
+						VECCOPY(vrel_1_to_2, verts1[edgecollpair.p11].tv);
+						VecMulf(vrel_1_to_2, 1.0 - a);
+						VECCOPY(temp, verts1[edgecollpair.p12].tv);
+						VecMulf(temp, a);
+
+						VECADD(vrel_1_to_2, vrel_1_to_2, temp);
+
+						VECCOPY(temp, verts1[edgecollpair.p21].tv);
+						VecMulf(temp, 1.0 - b);
+						VECCOPY(temp2, verts1[edgecollpair.p22].tv);
+						VecMulf(temp2, b);
+						VECADD(temp, temp, temp2);
+
+						VECSUB(vrel_1_to_2, vrel_1_to_2, temp);
+
+						out_normalVelocity = INPR(vrel_1_to_2, out_normal);
+/*
+						// this correction results in wrong normals sometimes?
+						if(out_normalVelocity < 0.0)
+						{
+							out_normalVelocity*= -1.0;
+							VecMulf(out_normal, -1.0);
+						}
+*/
+						/* Inelastic repulsion impulse. */
+
+						// Calculate which normal velocity we need. 
+						desiredVn = (out_normalVelocity * (float)solution[k] - (.1 * (clmd->coll_parms->epsilon + BLI_bvhtree_getepsilon ( collmd->bvhtree )) - sqrt(distance)) - ALMOST_ZERO);
+
+						// Now calculate what impulse we need to reach that velocity. 
+						I_mag = (out_normalVelocity - desiredVn) / 2.0; // / (1/m1 + 1/m2);
+
+						// Finally apply that impulse. 
+						impulse = (2.0 * -I_mag) / (a*a + (1.0-a)*(1.0-a) + b*b + (1.0-b)*(1.0-b));
+
+						VECADDMUL ( verts1[edgecollpair.p11].impulse, out_normal, (1.0-a) * impulse );
+						verts1[edgecollpair.p11].impulse_count++;
+
+						VECADDMUL ( verts1[edgecollpair.p12].impulse, out_normal, a * impulse );
+						verts1[edgecollpair.p12].impulse_count++;
+
+						// return true;
+						result = 1;
+						break;
+					}
+					else
+					{
+						// missing from collision.hpp
+					}
+					// mintime = MIN2(mintime, (float)solution[k]);
+
+					break;
+				}
+			}
 		}
 	}
+	return result;
 }
 
-void cloth_collision_moving ( ClothModifierData *clmd, ClothModifierData *coll_clmd, CollisionTree *tree1, CollisionTree *tree2 )
+int cloth_collision_moving ( ClothModifierData *clmd, CollisionModifierData *collmd, CollPair *collpair, CollPair *collision_end )
 {
-	// TODO: check for adjacent
-	cloth_collision_moving_edges ( clmd, coll_clmd, tree1, tree2 );
+	Cloth *cloth1;
+	cloth1 = clmd->clothObject;
 
-	cloth_collision_moving_tris ( clmd, coll_clmd, tree1, tree2 );
-	cloth_collision_moving_tris ( coll_clmd, clmd, tree2, tree1 );
-}
-
-void cloth_free_collision_list ( ClothModifierData *clmd )
-{
-	// free collision list
-	if ( clmd->coll_parms->collision_list )
+	for ( ; collpair != collision_end; collpair++ )
 	{
-		LinkNode *search = clmd->coll_parms->collision_list;
-		while ( search )
-		{
-			CollPair *coll_pair = search->link;
+		// only handle moving collisions here
+		if (!( collpair->flag & COLLISION_IN_FUTURE ))
+			continue;
 
-			MEM_freeN ( coll_pair );
-			search = search->next;
-		}
-		BLI_linklist_free ( clmd->coll_parms->collision_list,NULL );
-
-		clmd->coll_parms->collision_list = NULL;
+		cloth_collision_moving_edges ( clmd, collmd, collpair);
+		// cloth_collision_moving_tris ( clmd, collmd, collpair);
 	}
+
+	return 1;
 }
 
 int cloth_bvh_objcollisions_do ( ClothModifierData * clmd, CollisionModifierData *collmd, float step, float dt )
 {
 	Cloth *cloth = clmd->clothObject;
-	BVH *cloth_bvh= ( BVH * ) cloth->tree;
+	BVHTree *cloth_bvh= ( BVHTree * ) cloth->bvhtree;
 	long i=0, j = 0, numfaces = 0, numverts = 0;
 	ClothVertex *verts = NULL;
+	CollPair *collisions = NULL, *collisions_index = NULL;
 	int ret = 0;
-	unsigned int result = 0;
+	int result = 0;
 	float tnull[3] = {0,0,0};
+	BVHTreeOverlap *overlap = NULL;
+
 
 	numfaces = clmd->clothObject->numfaces;
 	numverts = clmd->clothObject->numverts;
 
 	verts = cloth->verts;
 
-	if ( collmd->bvh )
+	if ( collmd->bvhtree )
 	{
 		/* get pointer to bounding volume hierarchy */
-		BVH *coll_bvh = collmd->bvh;
+		BVHTree *coll_bvh = collmd->bvhtree;
 
 		/* move object to position (step) in time */
 		collision_move_object ( collmd, step + dt, step );
 
 		/* search for overlapping collision pairs */
-		bvh_traverse ( ( ModifierData * ) clmd, ( ModifierData * ) collmd, cloth_bvh->root, coll_bvh->root, step, cloth_collision_static, 0 );
+		overlap = BLI_bvhtree_overlap ( cloth_bvh, coll_bvh, &result );
+
+		collisions = ( CollPair* ) MEM_mallocN ( sizeof ( CollPair ) * result*4, "collision array" ); //*4 since cloth_collision_static can return more than 1 collision
+		collisions_index = collisions;
+
+		for ( i = 0; i < result; i++ )
+		{
+			collisions_index = cloth_collision ( ( ModifierData * ) clmd, ( ModifierData * ) collmd, overlap+i, collisions_index );
+		}
+
+		if ( overlap )
+			MEM_freeN ( overlap );
 	}
 	else
 	{
@@ -994,29 +1343,50 @@ int cloth_bvh_objcollisions_do ( ClothModifierData * clmd, CollisionModifierData
 	{
 		result = 0;
 
-		if ( collmd->bvh )
-			result += cloth_collision_response_static ( clmd, collmd );
+		if ( collmd->bvhtree )
+		{
+			result += cloth_collision_response_static ( clmd, collmd, collisions, collisions_index );
 
-		// apply impulses in parallel
-		if ( result )
-			for ( i = 0; i < numverts; i++ )
+			// apply impulses in parallel
+			if ( result )
 			{
-				// calculate "velocities" (just xnew = xold + v; no dt in v)
-				if ( verts[i].impulse_count )
+				for ( i = 0; i < numverts; i++ )
 				{
-					VECADDMUL ( verts[i].tv, verts[i].impulse, 1.0f / verts[i].impulse_count );
-					VECCOPY ( verts[i].impulse, tnull );
-					verts[i].impulse_count = 0;
+					// calculate "velocities" (just xnew = xold + v; no dt in v)
+					if ( verts[i].impulse_count )
+					{
+						VECADDMUL ( verts[i].tv, verts[i].impulse, 1.0f / verts[i].impulse_count );
+						VECCOPY ( verts[i].impulse, tnull );
+						verts[i].impulse_count = 0;
 
-					ret++;
+						ret++;
+					}
 				}
 			}
+/*
+			result += cloth_collision_moving ( clmd, collmd, collisions, collisions_index );
 
-		if ( !result )
-			break;
+			// apply impulses in parallel
+			if ( result )
+			{
+				for ( i = 0; i < numverts; i++ )
+				{
+					// calculate "velocities" (just xnew = xold + v; no dt in v)
+					if ( verts[i].impulse_count )
+					{
+						VECADDMUL ( verts[i].tv, verts[i].impulse, 1.0f / verts[i].impulse_count );
+						VECCOPY ( verts[i].impulse, tnull );
+						verts[i].impulse_count = 0;
+
+						ret++;
+					}
+				}
+			}
+*/
+		}
 	}
 
-	cloth_free_collision_list ( clmd );
+	if ( collisions ) MEM_freeN ( collisions );
 
 	return ret;
 }
@@ -1028,22 +1398,22 @@ int cloth_bvh_objcollision ( ClothModifierData * clmd, float step, float dt )
 	CollisionModifierData *collmd=NULL;
 	Cloth *cloth=NULL;
 	Object *coll_ob=NULL;
-	BVH *cloth_bvh=NULL;
-	long i=0, j = 0, numfaces = 0, numverts = 0;
-	unsigned int result = 0, rounds = 0; // result counts applied collisions; ic is for debug output;
+	BVHTree *cloth_bvh=NULL;
+	long i=0, j = 0, k = 0, l = 0, numfaces = 0, numverts = 0;
+	int result = 0, rounds = 0; // result counts applied collisions; ic is for debug output;
 	ClothVertex *verts = NULL;
-	int ret = 0;
+	int ret = 0, ret2 = 0;
 	ClothModifierData *tclmd;
-	int collisions = 0, count = 0;
+	int collisions = 0;
 
-	if ( ( clmd->sim_parms->flags & CLOTH_SIMSETTINGS_FLAG_COLLOBJ ) || ! ( ( ( Cloth * ) clmd->clothObject )->tree ) )
+	if ( ( clmd->sim_parms->flags & CLOTH_SIMSETTINGS_FLAG_COLLOBJ ) || ! ( ( ( Cloth * ) clmd->clothObject )->bvhtree ) )
 	{
 		return 0;
 	}
 
 	cloth = clmd->clothObject;
 	verts = cloth->verts;
-	cloth_bvh = ( BVH * ) cloth->tree;
+	cloth_bvh = ( BVHTree * ) cloth->bvhtree;
 	numfaces = clmd->clothObject->numfaces;
 	numverts = clmd->clothObject->numverts;
 
@@ -1052,12 +1422,13 @@ int cloth_bvh_objcollision ( ClothModifierData * clmd, float step, float dt )
 	////////////////////////////////////////////////////////////
 
 	// update cloth bvh
-	bvh_update_from_cloth ( clmd, 0 ); // 0 means STATIC, 1 means MOVING (see later in this function)
+	bvhtree_update_from_cloth ( clmd, 1 ); // 0 means STATIC, 1 means MOVING (see later in this function)
+	bvhselftree_update_from_cloth ( clmd, 0 ); // 0 means STATIC, 1 means MOVING (see later in this function)
 
 	do
 	{
 		result = 0;
-		clmd->coll_parms->collision_list = NULL;
+		ret2 = 0;
 
 		// check all collision objects
 		for ( base = G.scene->base.first; base; base = base->next )
@@ -1086,6 +1457,7 @@ int cloth_bvh_objcollision ( ClothModifierData * clmd, float step, float dt )
 							continue;
 
 						ret += cloth_bvh_objcollisions_do ( clmd, collmd, step, dt );
+						ret2 += ret;
 					}
 				}
 			}
@@ -1096,6 +1468,7 @@ int cloth_bvh_objcollision ( ClothModifierData * clmd, float step, float dt )
 					continue;
 
 				ret += cloth_bvh_objcollisions_do ( clmd, collmd, step, dt );
+				ret2 += ret;
 			}
 		}
 		rounds++;
@@ -1126,78 +1499,90 @@ int cloth_bvh_objcollision ( ClothModifierData * clmd, float step, float dt )
 		////////////////////////////////////////////////////////////
 		if ( clmd->coll_parms->flags & CLOTH_COLLSETTINGS_FLAG_SELF )
 		{
-			collisions = 1;
-			verts = cloth->verts; // needed for openMP
-
-			for ( count = 0; count < clmd->coll_parms->self_loop_count; count++ )
+			for(l = 0; l < clmd->coll_parms->self_loop_count; l++)
 			{
-				if ( collisions )
+				// TODO: add coll quality rounds again
+				BVHTreeOverlap *overlap = NULL;
+	
+				collisions = 1;
+				verts = cloth->verts; // needed for openMP
+	
+				numfaces = clmd->clothObject->numfaces;
+				numverts = clmd->clothObject->numverts;
+	
+				verts = cloth->verts;
+	
+				if ( cloth->bvhselftree )
 				{
-					collisions = 0;
-#pragma omp parallel for private(i,j, collisions) shared(verts, ret)
-					for ( i = 0; i < cloth->numverts; i++ )
+					// search for overlapping collision pairs 
+					overlap = BLI_bvhtree_overlap ( cloth->bvhselftree, cloth->bvhselftree, &result );
+	
+	// #pragma omp parallel for private(k, i, j) schedule(static)
+					for ( k = 0; k < result; k++ )
 					{
-						for ( j = i + 1; j < cloth->numverts; j++ )
+						float temp[3];
+						float length = 0;
+						float mindistance;
+	
+						i = overlap[k].indexA;
+						j = overlap[k].indexB;
+	
+						mindistance = clmd->coll_parms->selfepsilon* ( cloth->verts[i].avg_spring_len + cloth->verts[j].avg_spring_len );
+	
+						if ( clmd->sim_parms->flags & CLOTH_SIMSETTINGS_FLAG_GOAL )
 						{
-							float temp[3];
-							float length = 0;
-							float mindistance = clmd->coll_parms->selfepsilon* ( cloth->verts[i].avg_spring_len + cloth->verts[j].avg_spring_len );
-
-							if ( clmd->sim_parms->flags & CLOTH_SIMSETTINGS_FLAG_GOAL )
-							{
-								if ( ( cloth->verts [i].flags & CLOTH_VERT_FLAG_PINNED )
-								        && ( cloth->verts [j].flags & CLOTH_VERT_FLAG_PINNED ) )
-								{
-									continue;
-								}
-							}
-
-							VECSUB ( temp, verts[i].tx, verts[j].tx );
-
-							if ( ( ABS ( temp[0] ) > mindistance ) || ( ABS ( temp[1] ) > mindistance ) || ( ABS ( temp[2] ) > mindistance ) ) continue;
-
-							// check for adjacent points (i must be smaller j)
-							if ( BLI_edgehash_haskey ( cloth->edgehash, i, j ) )
+							if ( ( cloth->verts [i].flags & CLOTH_VERT_FLAG_PINNED )
+								&& ( cloth->verts [j].flags & CLOTH_VERT_FLAG_PINNED ) )
 							{
 								continue;
 							}
-
-							length = Normalize ( temp );
-
-							if ( length < mindistance )
+						}
+	
+						VECSUB ( temp, verts[i].tx, verts[j].tx );
+	
+						if ( ( ABS ( temp[0] ) > mindistance ) || ( ABS ( temp[1] ) > mindistance ) || ( ABS ( temp[2] ) > mindistance ) ) continue;
+	
+						// check for adjacent points (i must be smaller j)
+						if ( BLI_edgehash_haskey ( cloth->edgehash, MIN2(i, j), MAX2(i, j) ) )
+						{
+							continue;
+						}
+	
+						length = Normalize ( temp );
+	
+						if ( length < mindistance )
+						{
+							float correction = mindistance - length;
+	
+							if ( cloth->verts [i].flags & CLOTH_VERT_FLAG_PINNED )
 							{
-								float correction = mindistance - length;
-
-								if ( cloth->verts [i].flags & CLOTH_VERT_FLAG_PINNED )
-								{
-									VecMulf ( temp, -correction );
-									VECADD ( verts[j].tx, verts[j].tx, temp );
-								}
-								else if ( cloth->verts [j].flags & CLOTH_VERT_FLAG_PINNED )
-								{
-									VecMulf ( temp, correction );
-									VECADD ( verts[i].tx, verts[i].tx, temp );
-								}
-								else
-								{
-									VecMulf ( temp, -correction*0.5 );
-									VECADD ( verts[j].tx, verts[j].tx, temp );
-
-									VECSUB ( verts[i].tx, verts[i].tx, temp );
-								}
-
-								collisions = 1;
-
-								if ( !ret )
-								{
-#pragma omp critical
-									{
-										ret = 1;
-									}
-								}
+								VecMulf ( temp, -correction );
+								VECADD ( verts[j].tx, verts[j].tx, temp );
 							}
+							else if ( cloth->verts [j].flags & CLOTH_VERT_FLAG_PINNED )
+							{
+								VecMulf ( temp, correction );
+								VECADD ( verts[i].tx, verts[i].tx, temp );
+							}
+							else
+							{
+								VecMulf ( temp, -correction*0.5 );
+								VECADD ( verts[j].tx, verts[j].tx, temp );
+	
+								VECSUB ( verts[i].tx, verts[i].tx, temp );
+							}
+							ret = 1;
+							ret2 += ret;
+						}
+						else
+						{
+							// check for approximated time collisions
 						}
 					}
+	
+					if ( overlap )
+						MEM_freeN ( overlap );
+	
 				}
 			}
 			////////////////////////////////////////////////////////////
@@ -1205,18 +1590,20 @@ int cloth_bvh_objcollision ( ClothModifierData * clmd, float step, float dt )
 			////////////////////////////////////////////////////////////
 			// SELFCOLLISIONS: update velocities
 			////////////////////////////////////////////////////////////
-			if ( ret )
+			if ( ret2 )
 			{
 				for ( i = 0; i < cloth->numverts; i++ )
 				{
-					if ( ! ( cloth->verts [i].flags & CLOTH_VERT_FLAG_PINNED ) )
+					if ( ! ( verts [i].flags & CLOTH_VERT_FLAG_PINNED ) )
+					{
 						VECSUB ( verts[i].tv, verts[i].tx, verts[i].txold );
+					}
 				}
 			}
 			////////////////////////////////////////////////////////////
 		}
 	}
-	while ( result && ( clmd->coll_parms->loop_count>rounds ) );
+	while ( ret2 && ( clmd->coll_parms->loop_count>rounds ) );
 
 	return MIN2 ( ret, 1 );
 }
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index f60e39769a2..068501780bc 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -1882,7 +1882,7 @@ static void pycon_get_tarmat (bConstraint *con, bConstraintOb *cob, bConstraintT
 {
 	bPythonConstraint *data= con->data;
 	
-	if (VALID_CONS_TARGET(ct)) {
+	if ((G.f & G_DOSCRIPTLINKS) && VALID_CONS_TARGET(ct)) {
 		/* special exception for curves - depsgraph issues */
 		if (ct->tar->type == OB_CURVE) {
 			Curve *cu= ct->tar->data;
@@ -1906,6 +1906,8 @@ static void pycon_evaluate (bConstraint *con, bConstraintOb *cob, ListBase *targ
 {
 	bPythonConstraint *data= con->data;
 	
+	if ((G.f & G_DOSCRIPTLINKS)==0)  return;
+	
 /* currently removed, until I this can be re-implemented for multiple targets */
 #if 0
 	/* Firstly, run the 'driver' function which has direct access to the objects involved 
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index 3644a50b799..77068d8ed66 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -1278,7 +1278,7 @@ void *CustomData_em_get_n(const CustomData *data, void *block, int type, int n)
 	int layer_index;
 	
 	/* get the layer index of the first layer of type */
-	layer_index = CustomData_get_active_layer_index(data, type);
+	layer_index = CustomData_get_layer_index(data, type);
 	if(layer_index < 0) return NULL;
 
 	return (char *)block + data->layers[layer_index+n].offset;
diff --git a/source/blender/blenkernel/intern/kdop.c b/source/blender/blenkernel/intern/kdop.c
deleted file mode 100644
index 3189fe960ad..00000000000
--- a/source/blender/blenkernel/intern/kdop.c
+++ /dev/null
@@ -1,860 +0,0 @@
-/*  kdop.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.
-*
-* The Original Code is Copyright (C) Blender Foundation
-* All rights reserved.
-*
-* The Original Code is: all of this file.
-*
-* Contributor(s): none yet.
-*
-* ***** END GPL LICENSE BLOCK *****
-*/
-
-#include "MEM_guardedalloc.h"
-
-#include "BKE_cloth.h"
-
-#include "DNA_cloth_types.h"
-#include "DNA_mesh_types.h"
-#include "DNA_scene_types.h"
-
-#include "BKE_deform.h"
-#include "BKE_DerivedMesh.h"
-#include "BKE_cdderivedmesh.h"
-#include "BKE_effect.h"
-#include "BKE_global.h"
-#include "BKE_object.h"
-#include "BKE_modifier.h"
-#include "BKE_utildefines.h"
-
-#ifdef _OPENMP
-#include <omp.h>
-#endif
-
-
-////////////////////////////////////////////////////////////////////////
-// Additional fastened appending function
-// It uses the link to the last inserted node as start value 
-// for searching the end of the list
-// NEW: in compare to the original function, this one returns
-// the reference to the last inserted node 
-////////////////////////////////////////////////////////////////////////
-LinkNode *BLI_linklist_append_fast(LinkNode **listp, void *ptr) {
-	LinkNode *nlink= MEM_mallocN(sizeof(*nlink), "nlink");
-	LinkNode *node = *listp;
-
-	nlink->link = ptr;
-	nlink->next = NULL;
-
-	if(node == NULL){
-		*listp = nlink;
-	} else {
-		while(node->next != NULL){
-			node = node->next;   
-		}
-		node->next = nlink;
-	}
-	return nlink;
-}
-
-
-
-////////////////////////////////////////////////////////////////////////
-// 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
-////////////////////////////////////////////////////////////////////////
-
-static float KDOP_AXES[13][3] =
-{ {1.0, 0, 0}, {0, 1.0, 0}, {0, 0, 1.0}, {1.0, 1.0, 1.0}, {1.0, -1.0, 1.0}, {1.0, 1.0, -1.0},
-{1.0, -1.0, -1.0}, {1.0, 1.0, 0}, {1.0, 0, 1.0}, {0, 1.0, 1.0}, {1.0, -1.0, 0}, {1.0, 0, -1.0},
-{0, 1.0, -1.0}
-};
-
-///////////// choose bounding volume here! /////////////
-
-#define KDOP_26
-
-
-
-#ifdef KDOP_26
-#define KDOP_END 13
-#define KDOP_START 0
-#endif
-
-#ifdef KDOP_18
-#define KDOP_END 13
-#define KDOP_START 7
-#endif
-
-#ifdef KDOP_14
-#define KDOP_END 7
-#define KDOP_START 0
-#endif
-
-// this is basicly some AABB
-#ifdef KDOP_8
-#define KDOP_END 4
-#define KDOP_START 0
-#endif
-
-// this is basicly some OBB
-#ifdef KDOP_6
-#define KDOP_END 3
-#define KDOP_START 0
-#endif
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////
-// 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 
-//////////////////////////////////////////////////////////////////////////////////////////////////////
-static int size_threshold = 16;
-/*
-* Common methods for all algorithms
-*/
-DO_INLINE void bvh_exchange(CollisionTree **a, int i, int j)
-{
-	CollisionTree *t=a[i];
-	a[i]=a[j];
-	a[j]=t;
-}
-DO_INLINE int floor_lg(int a)
-{
-	return (int)(floor(log(a)/log(2)));
-}
-
-/*
-* Insertion sort algorithm
-*/
-void bvh_insertionsort(CollisionTree **a, int lo, int hi, int axis)
-{
-	int i,j;
-	CollisionTree *t;
-	for (i=lo; i < hi; i++)
-	{
-		j=i;
-		t = a[i];
-		while((j!=lo) && (t->bv[axis] < (a[j-1])->bv[axis]))
-		{
-			a[j] = a[j-1];
-			j--;
-		}				
-		a[j] = t;
-	}
-}
-
-static int bvh_partition(CollisionTree **a, int lo, int hi, CollisionTree * x, int axis)
-{
-	int i=lo, j=hi;
-	while (1)
-	{
-		while ((a[i])->bv[axis] < x->bv[axis]) i++;
-		j=j-1;
-		while (x->bv[axis] < (a[j])->bv[axis]) j=j-1;
-		if(!(i < j))
-			return i;
-		bvh_exchange(a, i,j);
-		i++;
-	}
-}
-
-/*
-* Heapsort algorithm
-*/
-static void bvh_downheap(CollisionTree **a, int i, int n, int lo, int axis)
-{
-	CollisionTree * d = a[lo+i-1];
-	int child;
-	while (i<=n/2)
-	{
-		child = 2*i;
-		if ((child < n) && ((a[lo+child-1])->bv[axis] < (a[lo+child])->bv[axis]))
-		{
-			child++;
-		}
-		if (!(d->bv[axis] < (a[lo+child-1])->bv[axis])) break;
-		a[lo+i-1] = a[lo+child-1];
-		i = child;
-	}
-	a[lo+i-1] = d;
-}
-
-static void bvh_heapsort(CollisionTree **a, int lo, int hi, int axis)
-{
-	int n = hi-lo, i;
-	for (i=n/2; i>=1; i=i-1)
-	{
-		bvh_downheap(a, i,n,lo, axis);
-	}
-	for (i=n; i>1; i=i-1)
-	{
-		bvh_exchange(a, lo,lo+i-1);
-		bvh_downheap(a, 1,i-1,lo, axis);
-	}
-}
-
-static CollisionTree *bvh_medianof3(CollisionTree **a, int lo, int mid, int hi, int axis) // returns Sortable
-{
-	if ((a[mid])->bv[axis] < (a[lo])->bv[axis])
-	{
-		if ((a[hi])->bv[axis] < (a[mid])->bv[axis])
-			return a[mid];
-		else
-		{
-			if ((a[hi])->bv[axis] < (a[lo])->bv[axis])
-				return a[hi];
-			else
-				return a[lo];
-		}
-	}
-	else
-	{
-		if ((a[hi])->bv[axis] < (a[mid])->bv[axis])
-		{
-			if ((a[hi])->bv[axis] < (a[lo])->bv[axis])
-				return a[lo];
-			else
-				return a[hi];
-		}
-		else
-			return a[mid];
-	}
-}
-/*
-* Quicksort algorithm modified for Introsort
-*/
-void bvh_introsort_loop (CollisionTree **a, int lo, int hi, int depth_limit, int axis)
-{
-	int p;
-
-	while (hi-lo > size_threshold)
-	{
-		if (depth_limit == 0)
-		{
-			bvh_heapsort(a, lo, hi, axis);
-			return;
-		}
-		depth_limit=depth_limit-1;
-		p=bvh_partition(a, lo, hi, bvh_medianof3(a, lo, lo+((hi-lo)/2)+1, hi-1, axis), axis);
-		bvh_introsort_loop(a, p, hi, depth_limit, axis);
-		hi=p;
-	}
-}
-
-DO_INLINE void bvh_sort(CollisionTree **a0, int begin, int end, int axis)
-{
-	if (begin < end)
-	{
-		CollisionTree **a=a0;
-		bvh_introsort_loop(a, begin, end, 2*floor_lg(end-begin), axis);
-		bvh_insertionsort(a, begin, end, axis);
-	}
-}
-DO_INLINE void bvh_sort_along_axis(CollisionTree **face_list, int start, int end, int axis)
-{
-	bvh_sort(face_list, start, end, axis);
-}
-////////////////////////////////////////////////////////////////////////////////////////////////
-void bvh_free(BVH * bvh)
-{
-	LinkNode *search = NULL;
-	CollisionTree *tree = NULL;
-
-	if (bvh) 
-	{
-
-		search = bvh->tree;
-
-		while(search)
-		{
-			LinkNode *next= search->next;
-			tree = search->link;
-
-			MEM_freeN(tree);
-
-			search = next;
-		}
-
-		BLI_linklist_free(bvh->tree,NULL); 
-		bvh->tree = NULL;
-		
-		if(bvh->current_x)
-			MEM_freeN(bvh->current_x);
-		if(bvh->current_xold)
-			MEM_freeN(bvh->current_xold);
-
-		MEM_freeN(bvh);
-		bvh = NULL;
-	}
-}
-
-// only supports x,y,z axis in the moment
-// but we should use a plain and simple function here for speed sake
-DO_INLINE int bvh_largest_axis(float *bv)
-{
-	float middle_point[3];
-
-	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[2])
-			return 1; // max x axis
-		else
-			return 5; // max z axis
-	}
-	else 
-	{
-		if (middle_point[1] > middle_point[2])
-			return 3; // max y axis
-		else
-			return 5; // max z axis
-	}
-}
-
-// depends on the fact that the BVH's for each face is already build
-DO_INLINE void bvh_calc_DOP_hull_from_faces(BVH * bvh, CollisionTree **tri, int numfaces, float *bv)
-{
-	float newmin,newmax;
-	int i, j;
-	
-	if(numfaces >0)
-	{
-		// for all Axes.
-		for (i = KDOP_START; i < KDOP_END; i++)
-		{
-			bv[(2 * i)] = (tri [0])->bv[(2 * i)];	
-			bv[(2 * i) + 1] = (tri [0])->bv[(2 * i) + 1];
-		}
-	}
-	
-	for (j = 0; j < numfaces; j++)
-	{
-		// for all Axes.
-		for (i = KDOP_START; i < KDOP_END; i++)
-		{
-			newmin = (tri [j])->bv[(2 * i)];	
-			if ((newmin < bv[(2 * i)]))
-			{
-				bv[(2 * i)] = newmin;
-			}
-
-			newmax = (tri [j])->bv[(2 * i) + 1];
-			if ((newmax > bv[(2 * i) + 1]))
-			{
-				bv[(2 * i) + 1] = newmax;
-			}
-		}
-	}
-}
-
-DO_INLINE void bvh_calc_DOP_hull_static(BVH * bvh, CollisionTree **tri, int numfaces, float *bv, CollisionTree *tree)
-{
-	MFace *tempMFace = bvh->mfaces;
-	float *tempBV = bv;
-	float newminmax;
-	int i, j, k;
-	
-	for (j = 0; j < numfaces; j++)
-	{
-		tempMFace = bvh->mfaces + (tri [j])->tri_index;
-		// 3 or 4 vertices per face.
-		for (k = 0; k < 4; k++)
-		{
-			int temp = 0;  
-			// If this is a triangle.
-			if (k == 3 && !tempMFace->v4)
-				continue;
-			// TODO: other name for "temp" this gets all vertices of a face
-			if (k == 0)
-				temp = tempMFace->v1;
-			else if (k == 1)
-				temp = tempMFace->v2;
-			else if (k == 2)
-				temp = tempMFace->v3;
-			else if (k == 3)
-				temp = tempMFace->v4;
-			// for all Axes.
-			for (i = KDOP_START; i < KDOP_END; i++)
-			{				
-				newminmax = INPR(bvh->current_xold[temp].co, KDOP_AXES[i]);
-				if ((newminmax < tempBV[(2 * i)]) || (k == 0 && j == 0))
-					tempBV[(2 * i)] = newminmax;
-				if ((newminmax > tempBV[(2 * i) + 1])|| (k == 0 && j == 0))
-					tempBV[(2 * i) + 1] = newminmax;
-			}
-		}
-		
-		/* calculate normal of this face */
-		/* (code copied from cdderivedmesh.c) */
-		/*
-		if(tempMFace->v4)
-			CalcNormFloat4(bvh->current_xold[tempMFace->v1].co, bvh->current_xold[tempMFace->v2].co,
-				       bvh->current_xold[tempMFace->v3].co, bvh->current_xold[tempMFace->v4].co, tree->normal);
-		else
-			CalcNormFloat(bvh->current_xold[tempMFace->v1].co, bvh->current_xold[tempMFace->v2].co,
-				      bvh->current_xold[tempMFace->v3].co, tree->normal);
-		
-		tree->alpha = 0;
-		*/
-	}
-}
-
-DO_INLINE void bvh_calc_DOP_hull_moving(BVH * bvh, CollisionTree **tri, int numfaces, float *bv, CollisionTree *tree)
-{
-	MFace *tempMFace = bvh->mfaces;
-	float *tempBV = bv;
-	float newminmax;
-	int i, j, k;
-	
-	/* TODO: calculate normals */
-	
-	for (j = 0; j < numfaces; j++)
-	{
-		tempMFace = bvh->mfaces + (tri [j])->tri_index;
-		// 3 or 4 vertices per face.
-		for (k = 0; k < 4; k++)
-		{
-			int temp = 0;  
-			// If this is a triangle.
-			if (k == 3 && !tempMFace->v4)
-				continue;
-			// TODO: other name for "temp" this gets all vertices of a face
-			if (k == 0)
-				temp = tempMFace->v1;
-			else if (k == 1)
-				temp = tempMFace->v2;
-			else if (k == 2)
-				temp = tempMFace->v3;
-			else if (k == 3)
-				temp = tempMFace->v4;
-			// for all Axes.
-			for (i = KDOP_START; i < KDOP_END; i++)
-			{				
-				newminmax = INPR(bvh->current_xold[temp].co, KDOP_AXES[i]);
-				if ((newminmax < tempBV[(2 * i)]) || (k == 0 && j == 0))
-					tempBV[(2 * i)] = newminmax;
-				if ((newminmax > tempBV[(2 * i) + 1])|| (k == 0 && j == 0))
-					tempBV[(2 * i) + 1] = newminmax;
-				
-				newminmax = INPR(bvh->current_x[temp].co, KDOP_AXES[i]);
-				if ((newminmax < tempBV[(2 * i)]) || (k == 0 && j == 0))
-					tempBV[(2 * i)] = newminmax;
-				if ((newminmax > tempBV[(2 * i) + 1])|| (k == 0 && j == 0))
-					tempBV[(2 * i) + 1] = newminmax;
-			}
-		}
-	}
-}
-
-static void bvh_div_env_node(BVH *bvh, CollisionTree *tree, CollisionTree **face_list, unsigned int start, unsigned int end, int lastaxis, LinkNode *nlink)
-{
-	int		i = 0;
-	CollisionTree *newtree = NULL;
-	int laxis = 0, max_nodes=4;
-	unsigned int tstart, tend;
-	LinkNode *nlink1 = nlink;
-	LinkNode *tnlink;
-	tree->traversed = 0;	
-	// Determine which axis to split along
-	laxis = bvh_largest_axis(tree->bv);
-
-	// Sort along longest axis
-	if(laxis!=lastaxis)
-		bvh_sort_along_axis(face_list, start, end, laxis);
-	
-	// maximum is 4 since we have a quad tree
-	max_nodes = MIN2((end-start + 1 ),4);
-
-	for (i = 0; i < max_nodes; i++)
-	{
-		tree->count_nodes++;
-
-		if(end-start+1 > 4)
-		{
-			int quarter = ((float)((float)(end - start + 1) / 4.0f));
-			tstart = start + i * quarter;
-			tend = tstart + quarter - 1;
-
-			// be sure that we get all faces
-			if(i==3)
-			{
-				tend = end;
-			}
-		}
-		else
-		{
-			tend = tstart = start + i;
-		}
-
-		// Build tree until 4 node left.
-		if ((tend-tstart + 1 ) > 1) 
-		{
-			newtree = (CollisionTree *)MEM_callocN(sizeof(CollisionTree), "CollisionTree");
-			tnlink = BLI_linklist_append_fast(&nlink1->next, newtree);
-
-			newtree->nodes[0] = newtree->nodes[1] = newtree->nodes[2] = newtree->nodes[3] = NULL;
-			newtree->count_nodes = 0;
-			newtree->parent = tree;
-			newtree->isleaf = 0;
-
-			tree->nodes[i] = newtree;
-
-			nlink1 = tnlink;
-
-			bvh_calc_DOP_hull_from_faces(bvh, &face_list[tstart], tend-tstart + 1, tree->nodes[i]->bv);
-
-			bvh_div_env_node(bvh, tree->nodes[i], face_list, tstart, tend, laxis, nlink1);
-		}
-		else // ok, we have 1 left for this node
-		{
-			CollisionTree *tnode = face_list[tstart];
-			tree->nodes[i] = tnode;
-			tree->nodes[i]->parent = tree;
-		}
-	}
-	return;
-}
-
-/* function cannot be directly called - needs alloced bvh */
-void bvh_build (BVH *bvh)
-{
-	unsigned int i = 0, j = 0, k = 0;
-	CollisionTree **face_list=NULL;
-	CollisionTree *tree=NULL;
-	LinkNode *nlink = NULL;
-	
-	bvh->flags = 0;
-	bvh->leaf_tree = NULL;
-	bvh->leaf_root = NULL;
-	bvh->tree = NULL;
-	
-	if(!bvh->current_x)
-	{
-		bvh_free(bvh);
-		return;
-	}
-	
-	bvh->current_xold = MEM_dupallocN(bvh->current_x);
-	
-	tree = (CollisionTree *)MEM_callocN(sizeof(CollisionTree), "CollisionTree");
-	
-	if (tree == NULL) 
-	{
-		printf("bvh_build: Out of memory for nodes.\n");
-		bvh_free(bvh);
-		return;
-	}
-	
-	BLI_linklist_append(&bvh->tree, tree);
-
-	nlink = bvh->tree;
-
-	bvh->root = bvh->tree->link;
-	bvh->root->isleaf = 0;
-	bvh->root->parent = NULL;
-	bvh->root->nodes[0] = bvh->root->nodes[1] = bvh->root->nodes[1] = bvh->root->nodes[3] = NULL;
-
-	if(bvh->numfaces<=1)
-	{
-		bvh->root->tri_index = 0;	// Why that? --> only one face there 
-		bvh->root->isleaf = 1;
-		bvh->root->traversed = 0;
-		bvh->root->count_nodes = 0;
-		bvh->leaf_root = bvh->root;
-		bvh->leaf_tree = bvh->root;
-		bvh->root->nextLeaf = NULL;
-		bvh->root->prevLeaf = NULL;
-	}
-	else
-	{
-		// create face boxes		
-		face_list = MEM_callocN (bvh->numfaces * sizeof (CollisionTree *), "CollisionTree");
-		if (face_list == NULL) 
-		{
-			printf("bvh_build: Out of memory for face_list.\n");
-			bvh_free(bvh);
-			return;
-		}
-
-		// create face boxes
-		for(i = 0, k = 0; i < bvh->numfaces; i++)
-		{
-			LinkNode *tnlink;
-
-			tree = (CollisionTree *)MEM_callocN(sizeof(CollisionTree), "CollisionTree");
-			// TODO: check succesfull alloc
-
-			tnlink = BLI_linklist_append_fast(&nlink->next, tree);
-
-			face_list[i] = tree;
-			tree->tri_index = i;
-			tree->isleaf = 1;
-			tree->nextLeaf = NULL;
-			tree->prevLeaf = bvh->leaf_tree;
-			tree->parent = NULL;
-			tree->count_nodes = 0;
-
-			if(i==0)
-			{
-				bvh->leaf_tree = bvh->leaf_root = tree;
-			}
-			else
-			{
-				bvh->leaf_tree->nextLeaf = tree;
-				bvh->leaf_tree = bvh->leaf_tree->nextLeaf;
-			}		
-
-			tree->nodes[0] = tree->nodes[1] = tree->nodes[2] = tree->nodes[3] = NULL;		
-
-			bvh_calc_DOP_hull_static(bvh, &face_list[i], 1, tree->bv, tree);
-
-			// inflate the bv with some epsilon
-			for (j = KDOP_START; j < KDOP_END; j++)
-			{
-				tree->bv[(2 * j)] -= bvh->epsilon; // minimum 
-				tree->bv[(2 * j) + 1] += bvh->epsilon;	// maximum 
-			}
-			
-			nlink = tnlink;
-		}
-		
-		// build root bvh
-		bvh_calc_DOP_hull_from_faces(bvh, face_list, bvh->numfaces, bvh->root->bv);
-
-		// This is the traversal function. 
-		bvh_div_env_node(bvh, bvh->root, face_list, 0, bvh->numfaces-1, 0, nlink);
-		if (face_list)
-			MEM_freeN(face_list);
-		
-	}
-	
-}
-
-// bvh_overlap - is it possbile for 2 bv's to collide ?
-DO_INLINE int bvh_overlap(float *bv1, float *bv2)
-{
-	int i = 0;
-	for (i = KDOP_START; i < KDOP_END; i++)
-	{
-		// Minimum test.
-		if (bv1[(2 * i)] > bv2[(2 * i) + 1]) 
-		{
-			return 0;
-		}
-		// Maxiumum test.
-		if (bv2[(2 * i)] > bv1[(2 * i) + 1]) 
-		{
-			return 0;
-		}
-	}
-	
-	return 1;
-}
-
-// bvh_overlap_self - is it possbile for 2 bv's to selfcollide ?
-DO_INLINE int bvh_overlap_self(CollisionTree * tree1, CollisionTree * tree2)
-{
-	// printf("overlap: %f, q: %f\n", (saacos(INPR(tree1->normal, tree2->normal)) / 2.0)+MAX2(tree1->alpha, tree2->alpha), saacos(INPR(tree1->normal, tree2->normal)));
-	
-	if((saacos(INPR(tree1->normal, tree2->normal)) / 2.0)+MAX2(tree1->alpha, tree2->alpha) > M_PI)
-	{
-		return 1;
-	}
-	else
-		return 0;
-}
-
-/**
- * bvh_traverse - traverse two bvh trees looking for potential collisions.
- *
- * max collisions are n*n collisions --> every triangle collide with
- * every other triangle that doesn't require any realloc, but uses
- * much memory
- */
-int bvh_traverse ( ModifierData * md1, ModifierData * md2, CollisionTree * tree1, CollisionTree * tree2, float step, CM_COLLISION_RESPONSE collision_response, int selfcollision)
-{
-	int i = 0, ret=0, overlap = 0;
-	
-	/*
-	// Shouldn't be possible
-	if(!tree1 || !tree2)
-	{
-	printf("Error: no tree there\n");
-	return 0;
-}
-	*/	
-	
-	if(selfcollision)
-		overlap = bvh_overlap_self(tree1, tree2);
-	else
-		overlap = bvh_overlap(tree1->bv, tree2->bv);
-	
-	if (overlap) 
-	{		
-		// Check if this node in the first tree is a leaf
-		if (tree1->isleaf) 
-		{
-			// Check if this node in the second tree a leaf
-			if (tree2->isleaf) 
-			{
-				// Provide the collision response.
-				
-				if(collision_response)
-					collision_response (md1, md2, tree1, tree2);
-				return 1;
-			}
-			else 
-			{
-				// Process the quad tree.
-				for (i = 0; i < 4; i++)
-				{
-					// Only traverse nodes that exist.
-					if (tree2->nodes[i] && bvh_traverse (md1, md2, tree1, tree2->nodes[i], step, collision_response, selfcollision))
-						ret = 1;
-				}
-			}
-		}
-		else 
-		{
-			// Process the quad tree.
-			for (i = 0; i < 4; i++)
-			{
-				// Only traverse nodes that exist.
-				if (tree1->nodes [i] && bvh_traverse (md1, md2, tree1->nodes[i], tree2, step, collision_response, selfcollision))
-					ret = 1;
-			}
-		}
-	}
-
-	return ret;
-}
-// bottom up update of bvh tree:
-// join the 4 children here
-void bvh_join(CollisionTree *tree)
-{
-	int	i = 0, j = 0;
-	float max = 0;
-	
-	if (!tree)
-		return;
-	
-	for (i = 0; i < 4; i++)
-	{
-		if (tree->nodes[i]) 
-		{
-			for (j = KDOP_START; j < KDOP_END; j++)
-			{
-				// update minimum 
-				if ((tree->nodes[i]->bv[(2 * j)] < tree->bv[(2 * j)]) || (i == 0)) 
-				{
-					tree->bv[(2 * j)] = tree->nodes[i]->bv[(2 * j)];
-				}
-				// update maximum 
-				if ((tree->nodes[i]->bv[(2 * j) + 1] > tree->bv[(2 * j) + 1])|| (i == 0))
-				{
-					tree->bv[(2 * j) + 1] = tree->nodes[i]->bv[(2 * j) + 1];
-				}
-			}
-			
-			/* for selfcollisions */
-			/*
-			if(!i)
-			{
-				tree->alpha = tree->nodes[i]->alpha;
-				VECCOPY(tree->normal, tree->nodes[i]->normal);
-			}
-			else
-			{
-				tree->alpha += saacos(INPR(tree->normal, tree->nodes[i]->normal)) / 2.0;
-				VECADD(tree->normal, tree->normal, tree->nodes[i]->normal);
-				VecMulf(tree->normal, 0.5);
-				max = MAX2(max, tree->nodes[i]->alpha);
-			}
-			*/
-			
-		}
-		else
-			break;
-	}
-	
-	tree->alpha += max;
-}
-
-// update static bvh
-/* you have to update the bvh position before calling this function */
-void bvh_update(BVH * bvh, int moving)
-{
-	CollisionTree *leaf, *parent;
-	int traversecheck = 1;	// if this is zero we don't go further 
-	unsigned int j = 0;
-	
-	for (leaf = bvh->leaf_root; leaf; leaf = leaf->nextLeaf)
-	{
-		traversecheck = 1;
-		if ((leaf->parent) && (leaf->parent->traversed == leaf->parent->count_nodes)) 
-		{			
-			leaf->parent->traversed = 0;
-		}
-		if(!moving)
-			bvh_calc_DOP_hull_static(bvh, &leaf, 1, leaf->bv, leaf);
-		else
-			bvh_calc_DOP_hull_moving(bvh, &leaf, 1, leaf->bv, leaf);
-
-		// inflate the bv with some epsilon
-		for (j = KDOP_START; j < KDOP_END; j++)
-		{			
-			leaf->bv[(2 * j)] -= bvh->epsilon; // minimum 
-			leaf->bv[(2 * j) + 1] += bvh->epsilon;	// maximum 
-		}
-
-		for (parent = leaf->parent; parent; parent = parent->parent)
-		{			
-			if (traversecheck) 
-			{
-				parent->traversed++;	// we tried to go up in hierarchy 
-				if (parent->traversed < parent->count_nodes) 
-				{
-					traversecheck = 0;
-
-					if (parent->parent) 
-					{
-						if (parent->parent->traversed == parent->parent->count_nodes) 
-						{
-							parent->parent->traversed = 0;
-						}
-					}
-					break;	// we do not need to check further 
-				}
-				else 
-				{
-					bvh_join(parent);
-				}
-			}
-
-		}
-	}	
-}
-
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index b867b8d22bb..bd8a2ea219a 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -43,6 +43,7 @@
 
 #include "BLI_arithb.h"
 #include "BLI_blenlib.h"
+#include "BLI_kdopbvh.h"
 #include "BLI_kdtree.h"
 #include "BLI_linklist.h"
 #include "BLI_rand.h"
@@ -76,6 +77,7 @@
 #include "BKE_anim.h"
 #include "BKE_bad_level_calls.h"
 #include "BKE_cloth.h"
+#include "BKE_collision.h"
 #include "BKE_curve.h"
 #include "BKE_customdata.h"
 #include "BKE_global.h"
@@ -2736,6 +2738,7 @@ static DerivedMesh *bevelModifier_applyModifier(
 {
 	DerivedMesh *result;
 	BME_Mesh *bm;
+
 	/*bDeformGroup *def;*/
 	int /*i,*/ options, defgrp_index = -1;
 	BevelModifierData *bmd = (BevelModifierData*) md;
@@ -2754,8 +2757,7 @@ static DerivedMesh *bevelModifier_applyModifier(
 		//~ }
 	//~ }
 
-	bm = BME_make_mesh();
-	bm = BME_derivedmesh_to_bmesh(derivedData, bm);
+	bm = BME_derivedmesh_to_bmesh(derivedData);
 	BME_bevel(bm,bmd->value,bmd->res,options,defgrp_index,bmd->bevel_angle,NULL);
 	result = BME_bmesh_to_derivedmesh(bm,derivedData);
 	BME_free_mesh(bm);
@@ -5193,7 +5195,7 @@ static void collisionModifier_initData(ModifierData *md)
 	collmd->current_v = NULL;
 	collmd->time = -1;
 	collmd->numverts = 0;
-	collmd->bvh = NULL;
+	collmd->bvhtree = NULL;
 }
 
 static void collisionModifier_freeData(ModifierData *md)
@@ -5202,8 +5204,8 @@ static void collisionModifier_freeData(ModifierData *md)
 	
 	if (collmd) 
 	{
-		if(collmd->bvh)
-			bvh_free(collmd->bvh);
+		if(collmd->bvhtree)
+			BLI_bvhtree_free(collmd->bvhtree);
 		if(collmd->x)
 			MEM_freeN(collmd->x);
 		if(collmd->xnew)
@@ -5214,7 +5216,6 @@ static void collisionModifier_freeData(ModifierData *md)
 			MEM_freeN(collmd->current_xnew);
 		if(collmd->current_v)
 			MEM_freeN(collmd->current_v);
-		
 		if(collmd->mfaces)
 			MEM_freeN(collmd->mfaces);
 		
@@ -5225,7 +5226,7 @@ static void collisionModifier_freeData(ModifierData *md)
 		collmd->current_v = NULL;
 		collmd->time = -1;
 		collmd->numverts = 0;
-		collmd->bvh = NULL;
+		collmd->bvhtree = NULL;
 		collmd->mfaces = NULL;
 	}
 }
@@ -5293,9 +5294,8 @@ static void collisionModifier_deformVerts(
 				collmd->mfaces = dm->dupFaceArray(dm);
 				collmd->numfaces = dm->getNumFaces(dm);
 				
-				// TODO: epsilon
 				// create bounding box hierarchy
-				collmd->bvh = bvh_build_from_mvert(collmd->mfaces, collmd->numfaces, collmd->x, numverts, ob->pd->pdef_sboft);
+				collmd->bvhtree = bvhtree_build_from_mvert(collmd->mfaces, collmd->numfaces, collmd->x, numverts, ob->pd->pdef_sboft);
 				
 				collmd->time = current_time;
 			}
@@ -5318,25 +5318,25 @@ static void collisionModifier_deformVerts(
 				memcpy(collmd->current_x, collmd->x, numverts*sizeof(MVert));
 				
 				/* check if GUI setting has changed for bvh */
-				if(collmd->bvh)
+				if(collmd->bvhtree) 
 				{
-					if(ob->pd->pdef_sboft != collmd->bvh->epsilon)
+					if(ob->pd->pdef_sboft != BLI_bvhtree_getepsilon(collmd->bvhtree))
 					{
-						bvh_free(collmd->bvh);
-						collmd->bvh = bvh_build_from_mvert(collmd->mfaces, collmd->numfaces, collmd->current_x, numverts, ob->pd->pdef_sboft);
+						BLI_bvhtree_free(collmd->bvhtree);
+						collmd->bvhtree = bvhtree_build_from_mvert(collmd->mfaces, collmd->numfaces, collmd->current_x, numverts, ob->pd->pdef_sboft);
 					}
 			
 				}
 				
-				/* happens on file load (ONLY when i decomment changes in readfile.c */
-				if(!collmd->bvh)
+				/* happens on file load (ONLY when i decomment changes in readfile.c) */
+				if(!collmd->bvhtree)
 				{
-					collmd->bvh = bvh_build_from_mvert(collmd->mfaces, collmd->numfaces, collmd->current_x, numverts, ob->pd->pdef_sboft);
+					collmd->bvhtree = bvhtree_build_from_mvert(collmd->mfaces, collmd->numfaces, collmd->current_x, numverts, ob->pd->pdef_sboft);
 				}
 				else
 				{
 					// recalc static bounding boxes
-					bvh_update_from_mvert(collmd->bvh, collmd->current_x, numverts, NULL, 0);
+					bvhtree_update_from_mvert ( collmd->bvhtree, collmd->mfaces, collmd->numfaces, collmd->current_x, collmd->current_xnew, collmd->numverts, 1 );
 				}
 				
 				collmd->time = current_time;
@@ -6485,12 +6485,14 @@ static DerivedMesh * explodeModifier_explodeMesh(ExplodeModifierData *emd,
 	MFace *mf=0;
 	MVert *dupvert=0;
 	ParticleSettings *part=psmd->psys->part;
-	ParticleData *pa, *pars=psmd->psys->particles;
+	ParticleData *pa=NULL, *pars=psmd->psys->particles;
 	ParticleKey state;
+	EdgeHash *vertpahash;
+	EdgeHashIterator *ehi;
 	float *vertco=0, imat[4][4];
 	float loc0[3], nor[3];
 	float timestep, cfra;
-	int *facepa=emd->facepa, *vertpa=0;
+	int *facepa=emd->facepa;
 	int totdup=0,totvert=0,totface=0,totpart=0;
 	int i, j, v, mindex=0;
 
@@ -6505,34 +6507,36 @@ static DerivedMesh * explodeModifier_explodeMesh(ExplodeModifierData *emd,
 	else
 		cfra=bsystem_time(ob,(float)G.scene->r.cfra,0.0);
 
-	/* table for vertice <-> particle relations (row totpart+1 is for yet unexploded verts) */
-	vertpa = MEM_callocN(sizeof(int)*(totpart+1)*totvert, "explode_vertpatab");
-	for(i=0; i<(totpart+1)*totvert; i++)
-		vertpa[i] = -1;
+	/* hash table for vertice <-> particle relations */
+	vertpahash= BLI_edgehash_new();
 
 	for (i=0; i<totface; i++) {
+		/* do mindex + totvert to ensure the vertex index to be the first
+		 * with BLI_edgehashIterator_getKey */
 		if(facepa[i]==totpart || cfra <= (pars+facepa[i])->time)
-			mindex = totpart*totvert;
+			mindex = totvert+totpart;
 		else 
-			mindex = facepa[i]*totvert;
+			mindex = totvert+facepa[i];
 
 		mf=CDDM_get_face(dm,i);
 
-		/*set face vertices to exist in particle group*/
-		vertpa[mindex+mf->v1] = 1;
-		vertpa[mindex+mf->v2] = 1;
-		vertpa[mindex+mf->v3] = 1;
+		/* set face vertices to exist in particle group */
+		BLI_edgehash_insert(vertpahash, mf->v1, mindex, NULL);
+		BLI_edgehash_insert(vertpahash, mf->v2, mindex, NULL);
+		BLI_edgehash_insert(vertpahash, mf->v3, mindex, NULL);
 		if(mf->v4)
-			vertpa[mindex+mf->v4] = 1;
+			BLI_edgehash_insert(vertpahash, mf->v4, mindex, NULL);
 	}
 
-	/*make new vertice indexes & count total vertices after duplication*/
-	for(i=0; i<(totpart+1)*totvert; i++){
-		if(vertpa[i] != -1)
-			vertpa[i] = totdup++;
+	/* make new vertice indexes & count total vertices after duplication */
+	ehi= BLI_edgehashIterator_new(vertpahash);
+	for(; !BLI_edgehashIterator_isDone(ehi); BLI_edgehashIterator_step(ehi)) {
+		BLI_edgehashIterator_setValue(ehi, SET_INT_IN_POINTER(totdup));
+		totdup++;
 	}
+	BLI_edgehashIterator_free(ehi);
 
-	/*the final duplicated vertices*/
+	/* the final duplicated vertices */
 	explode= CDDM_from_template(dm, totdup, 0,totface);
 	dupvert= CDDM_get_verts(explode);
 
@@ -6541,45 +6545,49 @@ static DerivedMesh * explodeModifier_explodeMesh(ExplodeModifierData *emd,
 
 	psmd->psys->lattice = psys_get_lattice(ob, psmd->psys);
 
-	/*duplicate & displace vertices*/
-	for(i=0, pa=pars; i<=totpart; i++, pa++){
-		if(i!=totpart){
+	/* duplicate & displace vertices */
+	ehi= BLI_edgehashIterator_new(vertpahash);
+	for(; !BLI_edgehashIterator_isDone(ehi); BLI_edgehashIterator_step(ehi)) {
+		MVert source;
+		MVert *dest;
+
+		/* get particle + vertex from hash */
+		BLI_edgehashIterator_getKey(ehi, &j, &i);
+		i -= totvert;
+		v= GET_INT_FROM_POINTER(BLI_edgehashIterator_getValue(ehi));
+
+		dm->getVert(dm, j, &source);
+		dest = CDDM_get_vert(explode,v);
+
+		DM_copy_vert_data(dm,explode,j,v,1);
+		*dest = source;
+
+		if(i!=totpart) {
+			/* get particle */
+			pa= pars+i;
+
+			/* get particle state */
 			psys_particle_on_emitter(ob, psmd,part->from,pa->num,-1,pa->fuv,pa->foffset,loc0,nor,0,0,0,0);
 			Mat4MulVecfl(ob->obmat,loc0);
 
 			state.time=cfra;
 			psys_get_particle_state(ob,psmd->psys,i,&state,1);
-		}
 
-		for(j=0; j<totvert; j++){
-			v=vertpa[i*totvert+j];
-			if(v != -1) {
-				MVert source;
-				MVert *dest;
+			vertco=CDDM_get_vert(explode,v)->co;
+			
+			Mat4MulVecfl(ob->obmat,vertco);
 
-				dm->getVert(dm, j, &source);
-				dest = CDDM_get_vert(explode,v);
+			VECSUB(vertco,vertco,loc0);
 
-				DM_copy_vert_data(dm,explode,j,v,1);
-				*dest = source;
+			/* apply rotation, size & location */
+			QuatMulVecf(state.rot,vertco);
+			VecMulf(vertco,pa->size);
+			VECADD(vertco,vertco,state.co);
 
-				if(i!=totpart){
-					vertco=CDDM_get_vert(explode,v)->co;
-					
-					Mat4MulVecfl(ob->obmat,vertco);
-
-					VECSUB(vertco,vertco,loc0);
-
-					/* apply rotation, size & location */
-					QuatMulVecf(state.rot,vertco);
-					VecMulf(vertco,pa->size);
-					VECADD(vertco,vertco,state.co);
-
-					Mat4MulVecfl(imat,vertco);
-				}
-			}
+			Mat4MulVecfl(imat,vertco);
 		}
 	}
+	BLI_edgehashIterator_free(ehi);
 
 	/*map new vertices to faces*/
 	for (i=0; i<totface; i++) {
@@ -6601,15 +6609,15 @@ static DerivedMesh * explodeModifier_explodeMesh(ExplodeModifierData *emd,
 		orig_v4 = source.v4;
 
 		if(facepa[i]!=totpart && cfra <= pa->time)
-			mindex = totpart*totvert;
+			mindex = totvert+totpart;
 		else 
-			mindex = facepa[i]*totvert;
+			mindex = totvert+facepa[i];
 
-		source.v1 = vertpa[mindex+source.v1];
-		source.v2 = vertpa[mindex+source.v2];
-		source.v3 = vertpa[mindex+source.v3];
+		source.v1 = edgesplit_get(vertpahash, source.v1, mindex);
+		source.v2 = edgesplit_get(vertpahash, source.v2, mindex);
+		source.v3 = edgesplit_get(vertpahash, source.v3, mindex);
 		if(source.v4)
-			source.v4 = vertpa[mindex+source.v4];
+			source.v4 = edgesplit_get(vertpahash, source.v4, mindex);
 
 		DM_copy_face_data(dm,explode,i,i,1);
 
@@ -6618,9 +6626,10 @@ static DerivedMesh * explodeModifier_explodeMesh(ExplodeModifierData *emd,
 		test_index_face(mf, &explode->faceData, i, (mf->v4 ? 4 : 3));
 	}
 
+	MEM_printmemlist_stats();
 
 	/* cleanup */
-	if(vertpa) MEM_freeN(vertpa);
+	BLI_edgehash_free(vertpahash, NULL);
 
 	/* finalization */
 	CDDM_calc_edges(explode);
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index ab1bc5a2265..4f901ba7216 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -1614,7 +1614,7 @@ static void give_parvert(Object *par, int nr, float *vec)
 			
 			for(eve= em->verts.first; eve; eve= eve->next) {
 				if(eve->keyindex==nr) {
-					memcpy(vec, eve->co, 12);
+					memcpy(vec, eve->co, sizeof(float)*3);
 					break;
 				}
 			}
@@ -1652,18 +1652,20 @@ static void give_parvert(Object *par, int nr, float *vec)
 		Curve *cu;
 		BPoint *bp;
 		BezTriple *bezt;
+		int found= 0;
 		
 		cu= par->data;
 		nu= cu->nurb.first;
 		if(par==G.obedit) nu= editNurb.first;
 		
 		count= 0;
-		while(nu) {
+		while(nu && !found) {
 			if((nu->type & 7)==CU_BEZIER) {
 				bezt= nu->bezt;
 				a= nu->pntsu;
 				while(a--) {
 					if(count==nr) {
+						found= 1;
 						VECCOPY(vec, bezt->vec[1]);
 						break;
 					}
@@ -1676,7 +1678,8 @@ static void give_parvert(Object *par, int nr, float *vec)
 				a= nu->pntsu*nu->pntsv;
 				while(a--) {
 					if(count==nr) {
-						memcpy(vec, bp->vec, 12);
+						found= 1;
+						memcpy(vec, bp->vec, sizeof(float)*3);
 						break;
 					}
 					count++;
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c
index 7b727528b3d..57ecffbb796 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -185,8 +185,8 @@ static int ptcache_path(PTCacheID *pid, char *filename)
 			file[i-6] = '\0';
 		
 		sprintf(filename, "//"PTCACHE_PATH"%s", file); /* add blend file name to pointcache dir */
-		BLI_add_slash(filename);
 		BLI_convertstringcode(filename, blendfilename);
+		BLI_add_slash(filename);
 		return strlen(filename);
 	}
 	
diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c
index c95e3d20442..64af8258f80 100644
--- a/source/blender/blenkernel/intern/writeffmpeg.c
+++ b/source/blender/blenkernel/intern/writeffmpeg.c
@@ -867,7 +867,7 @@ void end_ffmpeg(void)
 	
 	fprintf(stderr, "Closing ffmpeg...\n");
 
-	if (audio_stream) {
+	if (audio_stream && video_stream) {
 		write_audio_frames();
 	}
 	
diff --git a/source/blender/blenlib/BLI_kdopbvh.h b/source/blender/blenlib/BLI_kdopbvh.h
new file mode 100644
index 00000000000..b81ff0ee66f
--- /dev/null
+++ b/source/blender/blenlib/BLI_kdopbvh.h
@@ -0,0 +1,60 @@
+/**
+ *
+ * ***** 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 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): Daniel Genrich, Andre Pinto
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+
+#ifndef BLI_KDOPBVH_H
+#define BLI_KDOPBVH_H
+
+#include <float.h>
+
+struct BVHTree;
+typedef struct BVHTree BVHTree;
+
+typedef struct BVHTreeOverlap {
+	int indexA;
+	int indexB;
+} BVHTreeOverlap;
+
+BVHTree *BLI_bvhtree_new(int maxsize, float epsilon, char tree_type, char axis);
+void BLI_bvhtree_free(BVHTree *tree);
+
+/* construct: first insert points, then call balance */
+int BLI_bvhtree_insert(BVHTree *tree, int index, float *co, int numpoints);
+void BLI_bvhtree_balance(BVHTree *tree);
+
+/* update: first update points/nodes, then call update_tree to refit the bounding volumes */
+int BLI_bvhtree_update_node(BVHTree *tree, int index, float *co, float *co_moving, int numpoints);
+void BLI_bvhtree_update_tree(BVHTree *tree);
+
+/* collision/overlap: check two trees if they overlap, alloc's *overlap with length of the int return value */
+BVHTreeOverlap *BLI_bvhtree_overlap(BVHTree *tree1, BVHTree *tree2, int *result);
+
+float BLI_bvhtree_getepsilon(BVHTree *tree);
+
+#endif // BLI_KDOPBVH_H
+
diff --git a/source/blender/blenlib/intern/BLI_kdopbvh.c b/source/blender/blenlib/intern/BLI_kdopbvh.c
new file mode 100644
index 00000000000..a85883f6572
--- /dev/null
+++ b/source/blender/blenlib/intern/BLI_kdopbvh.c
@@ -0,0 +1,810 @@
+/**
+ *
+ * ***** 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 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): Daniel Genrich, Andre Pinto
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include "math.h"
+#include <stdio.h>
+#include <stdlib.h> 
+#include <string.h>
+
+#include "MEM_guardedalloc.h"
+
+#include "BKE_utildefines.h"
+
+#include "BLI_kdopbvh.h"
+#include "BLI_arithb.h"
+
+#ifdef _OPENMP
+#include <omp.h>
+#endif
+
+typedef struct BVHNode
+{
+	struct BVHNode **children; // max 8 children
+	struct BVHNode *parent; // needed for bottom - top update
+	float *bv; // Bounding volume of all nodes, max 13 axis
+	int index; /* face, edge, vertex index */
+	char totnode; // how many nodes are used, used for speedup
+	char traversed;  // how many nodes already traversed until this level?
+	char main_axis;
+} BVHNode;
+
+struct BVHTree
+{
+	BVHNode **nodes;
+	BVHNode *nodearray; /* pre-alloc branch nodes */
+	BVHNode **nodechild;	// pre-alloc childs for nodes
+	float	*nodebv;		// pre-alloc bounding-volumes for nodes
+	float 	epsilon; /* epslion is used for inflation of the k-dop	   */
+	int 	totleaf; // leafs
+	int 	totbranch;
+	char 	tree_type; // type of tree (4 => quadtree)
+	char 	axis; // kdop type (6 => OBB, 7 => AABB, ...)
+	char 	start_axis, stop_axis; // KDOP_AXES array indices according to axis
+};
+
+typedef struct BVHOverlapData 
+{  
+	BVHTree *tree1, *tree2; 
+	BVHTreeOverlap *overlap; 
+	int i, max_overlap; /* i is number of overlaps */
+} BVHOverlapData;
+////////////////////////////////////////
+
+
+////////////////////////////////////////////////////////////////////////
+// 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
+////////////////////////////////////////////////////////////////////////
+
+static float KDOP_AXES[13][3] =
+{ {1.0, 0, 0}, {0, 1.0, 0}, {0, 0, 1.0}, {1.0, 1.0, 1.0}, {1.0, -1.0, 1.0}, {1.0, 1.0, -1.0},
+{1.0, -1.0, -1.0}, {1.0, 1.0, 0}, {1.0, 0, 1.0}, {0, 1.0, 1.0}, {1.0, -1.0, 0}, {1.0, 0, -1.0},
+{0, 1.0, -1.0}
+};
+
+//////////////////////////////////////////////////////////////////////////////////////////////////////
+// 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 
+//////////////////////////////////////////////////////////////////////////////////////////////////////
+static int size_threshold = 16;
+/*
+* Common methods for all algorithms
+*/
+static int floor_lg(int a)
+{
+	return (int)(floor(log(a)/log(2)));
+}
+
+/*
+* Insertion sort algorithm
+*/
+static void bvh_insertionsort(BVHNode **a, int lo, int hi, int axis)
+{
+	int i,j;
+	BVHNode *t;
+	for (i=lo; i < hi; i++)
+	{
+		j=i;
+		t = a[i];
+		while((j!=lo) && (t->bv[axis] < (a[j-1])->bv[axis]))
+		{
+			a[j] = a[j-1];
+			j--;
+		}
+		a[j] = t;
+	}
+}
+
+static int bvh_partition(BVHNode **a, int lo, int hi, BVHNode * x, int axis)
+{
+	int i=lo, j=hi;
+	while (1)
+	{
+		while ((a[i])->bv[axis] < x->bv[axis]) i++;
+		j--;
+		while (x->bv[axis] < (a[j])->bv[axis]) j--;
+		if(!(i < j))
+			return i;
+		SWAP( BVHNode* , a[i], a[j]);
+		i++;
+	}
+}
+
+/*
+* Heapsort algorithm
+*/
+static void bvh_downheap(BVHNode **a, int i, int n, int lo, int axis)
+{
+	BVHNode * d = a[lo+i-1];
+	int child;
+	while (i<=n/2)
+	{
+		child = 2*i;
+		if ((child < n) && ((a[lo+child-1])->bv[axis] < (a[lo+child])->bv[axis]))
+		{
+			child++;
+		}
+		if (!(d->bv[axis] < (a[lo+child-1])->bv[axis])) break;
+		a[lo+i-1] = a[lo+child-1];
+		i = child;
+	}
+	a[lo+i-1] = d;
+}
+
+static void bvh_heapsort(BVHNode **a, int lo, int hi, int axis)
+{
+	int n = hi-lo, i;
+	for (i=n/2; i>=1; i=i-1)
+	{
+		bvh_downheap(a, i,n,lo, axis);
+	}
+	for (i=n; i>1; i=i-1)
+	{
+		SWAP(BVHNode*, a[lo],a[lo+i-1]);
+		bvh_downheap(a, 1,i-1,lo, axis);
+	}
+}
+
+static BVHNode *bvh_medianof3(BVHNode **a, int lo, int mid, int hi, int axis) // returns Sortable
+{
+	if ((a[mid])->bv[axis] < (a[lo])->bv[axis])
+	{
+		if ((a[hi])->bv[axis] < (a[mid])->bv[axis])
+			return a[mid];
+		else
+		{
+			if ((a[hi])->bv[axis] < (a[lo])->bv[axis])
+				return a[hi];
+			else
+				return a[lo];
+		}
+	}
+	else
+	{
+		if ((a[hi])->bv[axis] < (a[mid])->bv[axis])
+		{
+			if ((a[hi])->bv[axis] < (a[lo])->bv[axis])
+				return a[lo];
+			else
+				return a[hi];
+		}
+		else
+			return a[mid];
+	}
+}
+/*
+* Quicksort algorithm modified for Introsort
+*/
+static void bvh_introsort_loop (BVHNode **a, int lo, int hi, int depth_limit, int axis)
+{
+	int p;
+
+	while (hi-lo > size_threshold)
+	{
+		if (depth_limit == 0)
+		{
+			bvh_heapsort(a, lo, hi, axis);
+			return;
+		}
+		depth_limit=depth_limit-1;
+		p=bvh_partition(a, lo, hi, bvh_medianof3(a, lo, lo+((hi-lo)/2)+1, hi-1, axis), axis);
+		bvh_introsort_loop(a, p, hi, depth_limit, axis);
+		hi=p;
+	}
+}
+
+static void sort(BVHNode **a0, int begin, int end, int axis)
+{
+	if (begin < end)
+	{
+		BVHNode **a=a0;
+		bvh_introsort_loop(a, begin, end, 2*floor_lg(end-begin), axis);
+		bvh_insertionsort(a, begin, end, axis);
+	}
+}
+void sort_along_axis(BVHTree *tree, int start, int end, int axis)
+{
+	sort(tree->nodes, start, end, axis);
+}
+
+//after a call to this function you can expect one of:
+//      every node to left of a[n] are smaller or equal to it
+//      every node to the right of a[n] are greater or equal to it
+int partition_nth_element(BVHNode **a, int _begin, int _end, int n, int axis){
+	int begin = _begin, end = _end, cut;
+	while(end-begin > 3)
+	{
+		cut = bvh_partition(a, begin, end, bvh_medianof3(a, begin, (begin+end)/2, end-1, axis), axis ); 
+		if(cut <= n)
+			begin = cut;
+		else
+			end = cut;
+	}
+	bvh_insertionsort(a, begin, end, axis);
+
+	return n;
+}
+
+
+//////////////////////////////////////////////////////////////////////////////////////////////////////
+
+void BLI_bvhtree_free(BVHTree *tree)
+{	
+	if(tree)
+	{
+		MEM_freeN(tree->nodes);
+		MEM_freeN(tree->nodearray);
+		MEM_freeN(tree->nodebv);
+		MEM_freeN(tree->nodechild);
+		MEM_freeN(tree);
+	}
+}
+
+BVHTree *BLI_bvhtree_new(int maxsize, float epsilon, char tree_type, char axis)
+{
+	BVHTree *tree;
+	int numbranches=0, i;
+	
+	// only support up to octree
+	if(tree_type > 8)
+		return NULL;
+
+	tree = (BVHTree *)MEM_callocN(sizeof(BVHTree), "BVHTree");
+	
+	if(tree)
+	{
+		tree->epsilon = epsilon;
+		tree->tree_type = tree_type; 
+		tree->axis = axis;
+		
+		if(axis == 26)
+		{
+			tree->start_axis = 0;
+			tree->stop_axis = 13;
+		}
+		else if(axis == 18)
+		{
+			tree->start_axis = 7;
+			tree->stop_axis = 13;
+		}
+		else if(axis == 14)
+		{
+			tree->start_axis = 0;
+			tree->stop_axis = 7;
+		}
+		else if(axis == 8) // AABB
+		{
+			tree->start_axis = 0;
+			tree->stop_axis = 4;
+		}
+		else if(axis == 6) // OBB
+		{
+			tree->start_axis = 0;
+			tree->stop_axis = 3;
+		}
+		else
+		{
+			MEM_freeN(tree);
+			return NULL;
+		}
+
+
+		// calculate max number of branches, our bvh kdop is "almost perfect"
+		for(i = 1; i <= (int)ceil((float)((float)log(maxsize)/(float)log(tree_type))); i++)
+			numbranches += (pow(tree_type, i) / tree_type);
+		
+		tree->nodes = (BVHNode **)MEM_callocN(sizeof(BVHNode *)*(numbranches+maxsize + tree_type), "BVHNodes");
+		
+		if(!tree->nodes)
+		{
+			MEM_freeN(tree);
+			return NULL;
+		}
+		
+		tree->nodebv = (float*)MEM_callocN(sizeof(float)* axis * (numbranches+maxsize + tree_type), "BVHNodeBV");
+		if(!tree->nodebv)
+		{
+			MEM_freeN(tree->nodes);
+			MEM_freeN(tree);
+		}
+
+		tree->nodechild = (BVHNode**)MEM_callocN(sizeof(BVHNode*) * tree_type * (numbranches+maxsize + tree_type), "BVHNodeBV");
+		if(!tree->nodechild)
+		{
+			MEM_freeN(tree->nodebv);
+			MEM_freeN(tree->nodes);
+			MEM_freeN(tree);
+		}
+
+		tree->nodearray = (BVHNode *)MEM_callocN(sizeof(BVHNode)*(numbranches+maxsize + tree_type), "BVHNodeArray");
+		
+		if(!tree->nodearray)
+		{
+			MEM_freeN(tree->nodechild);
+			MEM_freeN(tree->nodebv);
+			MEM_freeN(tree->nodes);
+			MEM_freeN(tree);
+			return NULL;
+		}
+
+		//link the dynamic bv and child links
+		for(i=0; i< numbranches+maxsize + tree_type; i++)
+		{
+			tree->nodearray[i].bv = tree->nodebv + i * axis;
+			tree->nodearray[i].children = tree->nodechild + i * tree_type;
+		}
+		
+	}
+
+	return tree;
+}
+
+
+static void create_kdop_hull(BVHTree *tree, BVHNode *node, float *co, int numpoints, int moving)
+{
+	float newminmax;
+	int i, k;
+	
+	// don't init boudings for the moving case
+	if(!moving)
+	{
+		for (i = tree->start_axis; i < tree->stop_axis; i++)
+		{
+			node->bv[2*i] = FLT_MAX;
+			node->bv[2*i + 1] = -FLT_MAX;
+		}
+	}
+	
+	for(k = 0; k < numpoints; k++)
+	{
+		// for all Axes.
+		for (i = tree->start_axis; i < tree->stop_axis; i++)
+		{
+			newminmax = INPR(&co[k * 3], KDOP_AXES[i]);
+			if (newminmax < node->bv[2 * i])
+				node->bv[2 * i] = newminmax;
+			if (newminmax > node->bv[(2 * i) + 1])
+				node->bv[(2 * i) + 1] = newminmax;
+		}
+	}
+}
+
+// depends on the fact that the BVH's for each face is already build
+static void refit_kdop_hull(BVHTree *tree, BVHNode *node, int start, int end)
+{
+	float newmin,newmax;
+	int i, j;
+	float *bv = node->bv;
+	
+	for (i = tree->start_axis; i < tree->stop_axis; i++)
+	{
+		bv[2*i] = FLT_MAX;
+		bv[2*i + 1] = -FLT_MAX;
+	}
+
+	for (j = start; j < end; j++)
+	{
+// for all Axes.
+		for (i = tree->start_axis; i < tree->stop_axis; 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;
+		}
+	}
+}
+
+int BLI_bvhtree_insert(BVHTree *tree, int index, float *co, int numpoints)
+{
+	BVHNode *node= NULL;
+	int i;
+	
+	// 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))
+		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);
+	
+	// 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->index= index;
+	
+	return 1;
+}
+
+// only supports x,y,z axis in the moment
+// but we should use a plain and simple function here for speed sake
+static char get_largest_axis(float *bv)
+{
+	float middle_point[3];
+
+	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[2])
+			return 1; // max x axis
+		else
+			return 5; // max z axis
+	}
+	else 
+	{
+		if (middle_point[1] > middle_point[2])
+			return 3; // max y axis
+		else
+			return 5; // max z axis
+	}
+}
+
+static void bvh_div_nodes(BVHTree *tree, BVHNode *node, int start, int end, char lastaxis)
+{
+	char laxis;
+	int i, tend;
+	BVHNode *tnode;
+	int slice = (end-start+tree->tree_type-1)/tree->tree_type;	//division rounded up
+	
+	// Determine which axis to split along
+	laxis = get_largest_axis(node->bv);
+	
+	// split nodes along longest axis
+	for (i=0; start < end; start += slice, i++) //i counts the current child
+	{	
+		tend = start + slice;
+		
+		if(tend > end) tend = end;
+		
+		if(tend-start == 1)	// ok, we have 1 left for this node
+		{
+			node->children[i] = tree->nodes[start];
+			node->children[i]->parent = node;
+		}
+		else
+		{
+			tnode = node->children[i] = tree->nodes[tree->totleaf  + tree->totbranch] = &(tree->nodearray[tree->totbranch + tree->totleaf]);
+			tree->totbranch++;
+			tnode->parent = node;
+			
+			if(tend != end)
+				partition_nth_element(tree->nodes, start, end, tend, laxis);
+			refit_kdop_hull(tree, tnode, start, tend);
+			bvh_div_nodes(tree, tnode, start, tend, laxis);
+		}
+		node->totnode++;
+	}
+	
+	return;
+}
+
+static void verify_tree(BVHTree *tree)
+{
+	int i, j, check = 0;
+	
+	// check the pointer list
+	for(i = 0; i < tree->totleaf; i++)
+	{
+		if(tree->nodes[i]->parent == NULL)
+			printf("Leaf has no parent: %d\n", i);
+		else
+		{
+			for(j = 0; j < tree->tree_type; j++)
+			{
+				if(tree->nodes[i]->parent->children[j] == tree->nodes[i])
+					check = 1;
+			}
+			if(!check)
+			{
+				printf("Parent child relationship doesn't match: %d\n", i);
+			}
+			check = 0;
+		}
+	}
+	
+	// check the leaf list
+	for(i = 0; i < tree->totleaf; i++)
+	{
+		if(tree->nodearray[i].parent == NULL)
+			printf("Leaf has no parent: %d\n", i);
+		else
+		{
+			for(j = 0; j < tree->tree_type; j++)
+			{
+				if(tree->nodearray[i].parent->children[j] == &tree->nodearray[i])
+					check = 1;
+			}
+			if(!check)
+			{
+				printf("Parent child relationship doesn't match: %d\n", i);
+			}
+			check = 0;
+		}
+	}
+	
+	printf("branches: %d, leafs: %d, total: %d\n", tree->totbranch, tree->totleaf, tree->totbranch + tree->totleaf);
+}
+	
+void BLI_bvhtree_balance(BVHTree *tree)
+{
+	BVHNode *node;
+	
+	if(tree->totleaf == 0)
+		return;
+	
+	// create root node
+	node = tree->nodes[tree->totleaf] = &(tree->nodearray[tree->totleaf]);
+	tree->totbranch++;
+	
+	// refit root bvh node
+	refit_kdop_hull(tree, tree->nodes[tree->totleaf], 0, tree->totleaf);
+	// create + balance tree
+	bvh_div_nodes(tree, tree->nodes[tree->totleaf], 0, tree->totleaf, 0);
+	
+	// verify_tree(tree);
+}
+
+// overlap - is it possbile for 2 bv's to collide ?
+static int tree_overlap(float *bv1, float *bv2, int start_axis, int stop_axis)
+{
+	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))) 
+			return 0;
+	}
+	
+	return 1;
+}
+
+static void traverse(BVHOverlapData *data, BVHNode *node1, BVHNode *node2)
+{
+	int j;
+	
+	if(tree_overlap(node1->bv, node2->bv, MIN2(data->tree1->start_axis, data->tree2->start_axis), MIN2(data->tree1->stop_axis, data->tree2->stop_axis)))
+	{
+		// check if node1 is a leaf
+		if(!node1->totnode)
+		{
+			// 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");
+						return;
+					}
+					data->max_overlap *= 2;
+				}
+				
+				// both leafs, insert overlap!
+				data->overlap[data->i].indexA = node1->index;
+				data->overlap[data->i].indexB = node2->index;
+
+				data->i++;
+			}
+			else
+			{
+				for(j = 0; j < data->tree2->tree_type; j++)
+				{
+					if(node2->children[j])
+						traverse(data, node1, node2->children[j]);
+				}
+			}
+		}
+		else
+		{
+			
+			for(j = 0; j < data->tree2->tree_type; j++)
+			{
+				if(node1->children[j])
+					traverse(data, node1->children[j], node2);
+			}
+		}
+	}
+	return;
+}
+
+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))
+		return 0;
+	
+	// fast check root nodes for collision before doing big splitting + traversal
+	if(!tree_overlap(tree1->nodes[tree1->totleaf]->bv, tree2->nodes[tree2->totleaf]->bv, 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;
+		data[j]->tree2 = tree2;
+		data[j]->max_overlap = MAX2(tree1->totleaf, tree2->totleaf);
+		data[j]->i = 0;
+	}
+
+#pragma omp parallel for private(j) schedule(static)
+	for(j = 0; j < MIN2(tree1->tree_type, tree1->nodes[tree1->totleaf]->totnode); j++)
+	{
+		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;
+}
+
+
+// bottom up update of bvh tree:
+// join the 4 children here
+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]) 
+		{
+			for (j = tree->start_axis; j < tree->stop_axis; 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 
+				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];
+			}
+		}
+		else
+			break;
+	}
+}
+
+// call before BLI_bvhtree_update_tree()
+int BLI_bvhtree_update_node(BVHTree *tree, int index, float *co, float *co_moving, int numpoints)
+{
+	BVHNode *node= NULL;
+	int i = 0;
+	
+	// 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 
+	}
+	
+	return 1;
+}
+
+// call BLI_bvhtree_update_node() first for every node/point/triangle
+void BLI_bvhtree_update_tree(BVHTree *tree)
+{
+	BVHNode *leaf, *parent;
+	
+	// reset tree traversing flag
+	for (leaf = tree->nodearray + tree->totleaf; leaf != tree->nodearray + tree->totleaf + tree->totbranch; leaf++)
+		leaf->traversed = 0;
+	
+	for (leaf = tree->nodearray; leaf != tree->nodearray + tree->totleaf; leaf++)
+	{
+		for (parent = leaf->parent; parent; parent = parent->parent)
+		{
+			parent->traversed++;	// we tried to go up in hierarchy 
+			if (parent->traversed < parent->totnode) 
+				break;	// we do not need to check further 
+			else 
+				node_join(tree, parent);
+		}
+	}
+}
+
+float BLI_bvhtree_getepsilon(BVHTree *tree)
+{
+	return tree->epsilon;
+}
diff --git a/source/blender/blenlib/intern/bpath.c b/source/blender/blenlib/intern/bpath.c
index 79d3e487712..898ad6ddd67 100644
--- a/source/blender/blenlib/intern/bpath.c
+++ b/source/blender/blenlib/intern/bpath.c
@@ -456,13 +456,10 @@ void checkMissingFiles( char *txtname ) {
 	
 	/* be sure there is low chance of the path being too short */
 	char filepath_expanded[FILE_MAXDIR*2]; 
-	char *libpath;
 	int files_missing = 0;
 	
 	BLI_bpathIterator_init(&bpi);
 	while (!BLI_bpathIterator_isDone(&bpi)) {
-		libpath = BLI_bpathIterator_getLib(&bpi);
-		
 		BLI_bpathIterator_getPathExpanded( &bpi, filepath_expanded );
 		
 		if (!BLI_exists(filepath_expanded)) {
diff --git a/source/blender/blenlib/intern/util.c b/source/blender/blenlib/intern/util.c
index c85849b5ed4..848e45ccb1b 100644
--- a/source/blender/blenlib/intern/util.c
+++ b/source/blender/blenlib/intern/util.c
@@ -865,11 +865,8 @@ int BLI_strcaseeq(char *a, char *b) {
 void BLI_cleanup_dir(const char *relabase, char *dir)
 {
 	BLI_cleanup_file(relabase, dir);
-#ifdef WIN32
-	strcat(dir, "\\");
-#else
-	strcat(dir, "/");
-#endif
+	BLI_add_slash(dir);
+
 }
 
 void BLI_cleanup_file(const char *relabase, char *dir)
@@ -878,6 +875,13 @@ void BLI_cleanup_file(const char *relabase, char *dir)
 	char *start, *eind;
 	if (relabase) {
 		BLI_convertstringcode(dir, relabase);
+	} else {
+		if (dir[0]=='/' && dir[1]=='/') {
+			if (dir[2]== '\0') {
+				return; /* path is "//" - cant clean it */
+			}
+			dir = dir+2; /* skip the first // */
+		}
 	}
 #ifdef WIN32
 	if(dir[0]=='.') {	/* happens for example in FILE_MAIN */
@@ -1150,23 +1154,32 @@ int BLI_convertstringcode(char *path, const char *basepath)
 	BLI_char_switch(tmp, '\\', '/');
 	BLI_char_switch(base, '\\', '/');	
 
+	/* Paths starting with // will get the blend file as their base,
+	 * this isnt standard in any os but is uesed in blender all over the place */
 	if (tmp[0] == '/' && tmp[1] == '/') {
-		char *filepart= BLI_strdup(tmp+2); /* skip code */
 		char *lslash= BLI_last_slash(base);
-
 		if (lslash) {
 			int baselen= (int) (lslash-base) + 1;
-
+			/* use path for for temp storage here, we copy back over it right away */
+			BLI_strncpy(path, tmp+2, FILE_MAX);
+			
 			memcpy(tmp, base, baselen);
-			strcpy(tmp+baselen, filepart);
+			strcpy(tmp+baselen, path);
+			strcpy(path, tmp);
 		} else {
-			strcpy(tmp, filepart);
+			strcpy(path, tmp+2);
 		}
-		
-		MEM_freeN(filepart);
+	} else {
+		strcpy(path, tmp);
 	}
 	
-	strcpy(path, tmp);
+	if (path[0]!='\0') {
+		if ( path[strlen(path)-1]=='/') {
+			BLI_cleanup_dir(NULL, path);
+		} else {
+			BLI_cleanup_file(NULL, path);
+		}
+	}
 	
 #ifdef WIN32
 	/* skip first two chars, which in case of
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 1cb8b10b087..7d0dd9e41c1 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -3108,7 +3108,7 @@ static void direct_link_modifiers(FileData *fd, ListBase *lb)
 			collmd->current_v = NULL;
 			collmd->time = -1;
 			collmd->numverts = 0;
-			collmd->bvh = NULL;
+			collmd->bvhtree = NULL;
 			collmd->mfaces = NULL;
 			
 		}
diff --git a/source/blender/imbuf/SConscript b/source/blender/imbuf/SConscript
index f9e46b20d9a..7349f481731 100644
--- a/source/blender/imbuf/SConscript
+++ b/source/blender/imbuf/SConscript
@@ -27,6 +27,14 @@ if env['WITH_BF_FFMPEG'] == 1:
     defs.append('WITH_FFMPEG')
     incs += ' ' + env['BF_FFMPEG_INC']
 
+if env['WITH_BF_OPENJPEG'] == 1:
+    defs.append('WITH_OPENJPEG')
+    incs += ' ' + env['BF_OPENJPEG_INC']
+
+if env['WITH_BF_REDCODE'] == 1:
+    defs.append('WITH_REDCODE')
+    incs += ' ' + env['BF_REDCODE_INC']
+
 if env['WITH_BF_QUICKTIME']==1:
 	incs += ' ' + env['BF_QUICKTIME_INC']
 	defs.append('WITH_QUICKTIME')
diff --git a/source/blender/imbuf/intern/IMB_anim.h b/source/blender/imbuf/intern/IMB_anim.h
index 4948ff11b4a..71d35949833 100644
--- a/source/blender/imbuf/intern/IMB_anim.h
+++ b/source/blender/imbuf/intern/IMB_anim.h
@@ -81,6 +81,10 @@
 #include <ffmpeg/swscale.h>
 #endif
 
+#ifdef WITH_REDCODE
+#include <redcode/format.h>
+#endif
+
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
 
@@ -116,6 +120,7 @@
 #define ANIM_AVI		(1 << 6)
 #define ANIM_QTIME		(1 << 7)
 #define ANIM_FFMPEG             (1 << 8)
+#define ANIM_REDCODE            (1 << 9)
 
 #define ANIM5_MMAP		0
 #define ANIM5_MALLOC		1
@@ -184,6 +189,9 @@ struct anim {
 	int videoStream;
 #endif
 
+#ifdef WITH_REDCODE
+	struct redcode_handle * redcodeCtx;
+#endif
 };
 
 #endif
diff --git a/source/blender/imbuf/intern/anim.c b/source/blender/imbuf/intern/anim.c
index d2743b680d8..87d67f5263b 100644
--- a/source/blender/imbuf/intern/anim.c
+++ b/source/blender/imbuf/intern/anim.c
@@ -96,6 +96,11 @@
 
 #endif
 
+#ifdef WITH_REDCODE
+#include <redcode/format.h>
+#include <redcode/codec.h>
+#endif
+
 /****/
 
 #ifdef __sgi
@@ -307,6 +312,9 @@ void IMB_free_anim_ibuf(struct anim * anim) {
 #ifdef WITH_FFMPEG
 static void free_anim_ffmpeg(struct anim * anim);
 #endif
+#ifdef WITH_REDCODE
+static void free_anim_redcode(struct anim * anim);
+#endif
 
 void IMB_free_anim(struct anim * anim) {
 	if (anim == NULL) {
@@ -325,6 +333,9 @@ void IMB_free_anim(struct anim * anim) {
 #ifdef WITH_FFMPEG
 	free_anim_ffmpeg(anim);
 #endif
+#ifdef WITH_REDCODE
+	free_anim_redcode(anim);
+#endif
 
 	free(anim);
 }
@@ -830,6 +841,58 @@ static void free_anim_ffmpeg(struct anim * anim) {
 
 #endif
 
+#ifdef WITH_REDCODE
+
+static int startredcode(struct anim * anim) {
+	anim->redcodeCtx = redcode_open(anim->name);
+	if (!anim->redcodeCtx) {
+		return -1;
+	}
+	anim->duration = redcode_get_length(anim->redcodeCtx);
+	
+	return 0;
+}
+
+static ImBuf * redcode_fetchibuf(struct anim * anim, int position) {
+	struct ImBuf * ibuf;
+	struct redcode_frame * frame;
+	struct redcode_frame_raw * raw_frame;
+
+	if (!anim->redcodeCtx) {
+		return NULL;
+	}
+
+	frame = redcode_read_video_frame(anim->redcodeCtx, position);
+	
+	if (!frame) {
+		return NULL;
+	}
+
+	raw_frame = redcode_decode_video_raw(frame, 1);
+
+	redcode_free_frame(frame);
+
+	if (!raw_frame) {
+		return NULL;
+	}
+	
+        ibuf = IMB_allocImBuf(raw_frame->width * 2, 
+			      raw_frame->height * 2, 32, IB_rectfloat, 0);
+
+	redcode_decode_video_float(raw_frame, ibuf->rect_float, 1);
+
+	return ibuf;
+}
+
+static void free_anim_redcode(struct anim * anim) {
+	if (anim->redcodeCtx) {
+		redcode_close(anim->redcodeCtx);
+		anim->redcodeCtx = 0;
+	}
+	anim->duration = 0;
+}
+
+#endif
 
 /* probeer volgende plaatje te lezen */
 /* Geen plaatje, probeer dan volgende animatie te openen */
@@ -849,6 +912,10 @@ static struct ImBuf * anim_getnew(struct anim * anim) {
 #ifdef WITH_FFMPEG
 	free_anim_ffmpeg(anim);
 #endif
+#ifdef WITH_REDCODE
+	free_anim_redcode(anim);
+#endif
+
 
 	if (anim->curtype != 0) return (0);
 	anim->curtype = imb_get_anim_type(anim->name);	
@@ -887,9 +954,14 @@ static struct ImBuf * anim_getnew(struct anim * anim) {
 		if (startffmpeg(anim)) return (0);
 		ibuf = IMB_allocImBuf (anim->x, anim->y, 24, 0, 0);
 		break;
+#endif
+#ifdef WITH_REDCODE
+	case ANIM_REDCODE:
+		if (startredcode(anim)) return (0);
+		ibuf = IMB_allocImBuf (8, 8, 32, 0, 0);
+		break;
 #endif
 	}
-
 	return(ibuf);
 }
 
@@ -969,6 +1041,12 @@ struct ImBuf * IMB_anim_absolute(struct anim * anim, int position) {
 		ibuf = ffmpeg_fetchibuf(anim, position);
 		if (ibuf) anim->curposition = position;
 		break;
+#endif
+#ifdef WITH_REDCODE
+	case ANIM_REDCODE:
+		ibuf = redcode_fetchibuf(anim, position);
+		if (ibuf) anim->curposition = position;
+		break;
 #endif
 	}
 
diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c
index 632a471ecd0..4f6730db1f1 100644
--- a/source/blender/imbuf/intern/util.c
+++ b/source/blender/imbuf/intern/util.c
@@ -321,6 +321,19 @@ static int isffmpeg (char *filename) {
 }
 #endif
 
+#ifdef WITH_REDCODE
+static int isredcode(char * filename)
+{
+	struct redcode_handle * h = redcode_open(filename);
+	if (!h) {
+		return 0;
+	}
+	redcode_close(h);
+	return 1;
+}
+
+#endif
+
 int imb_get_anim_type(char * name) {
 	int type;
 	struct stat st;
@@ -354,6 +367,9 @@ int imb_get_anim_type(char * name) {
 #	ifdef WITH_FFMPEG
 	if (isffmpeg(name)) return (ANIM_FFMPEG);
 #	endif
+#endif
+#ifdef WITH_REDCODE
+	if (isredcode(name)) return (ANIM_REDCODE);
 #endif
 	type = IMB_ispic(name);
 	if (type == ANIM) return (ANIM_ANIM5);
@@ -369,6 +385,7 @@ int IMB_isanim(char *filename) {
 			if(		BLI_testextensie(filename, ".avi")
 				||	BLI_testextensie(filename, ".flc")
 				||	BLI_testextensie(filename, ".dv")
+				||	BLI_testextensie(filename, ".r3d")
 				||	BLI_testextensie(filename, ".mov")
 				||	BLI_testextensie(filename, ".movie")
 				||	BLI_testextensie(filename, ".mv")) {
@@ -379,6 +396,7 @@ int IMB_isanim(char *filename) {
 		} else { // no quicktime
 			if(		BLI_testextensie(filename, ".avi")
 				||	BLI_testextensie(filename, ".dv")
+				||	BLI_testextensie(filename, ".r3d")
 				||	BLI_testextensie(filename, ".mv")) {
 				type = imb_get_anim_type(filename);
 			}
diff --git a/source/blender/include/BIF_editseq.h b/source/blender/include/BIF_editseq.h
index 0d1e792eb1c..b353e7bb45c 100644
--- a/source/blender/include/BIF_editseq.h
+++ b/source/blender/include/BIF_editseq.h
@@ -92,8 +92,8 @@ start and end are from the start and fixed length of the sequence.
 int seq_tx_get_start(struct Sequence *seq);
 int seq_tx_get_end(struct Sequence *seq);
 
-int seq_tx_get_final_left(struct Sequence *seq);
-int seq_tx_get_final_right(struct Sequence *seq);
+int seq_tx_get_final_left(struct Sequence *seq, int metaclip);
+int seq_tx_get_final_right(struct Sequence *seq, int metaclip);
 
 void seq_tx_set_final_left(struct Sequence *seq, int i);
 void seq_tx_set_final_right(struct Sequence *seq, int i);
diff --git a/source/blender/include/BSE_view.h b/source/blender/include/BSE_view.h
index 236f35f17c6..4b334fdd959 100644
--- a/source/blender/include/BSE_view.h
+++ b/source/blender/include/BSE_view.h
@@ -63,7 +63,9 @@ void window_to_3d(float *vec, short mx, short my);
 void project_short(float *vec, short *adr);
 void project_short_noclip(float *vec, short *adr);
 void project_int(float *vec, int *adr);
+void project_int_noclip(float *vec, int *adr);
 void project_float(float *vec, float *adr);
+void project_float_noclip(float *vec, float *adr);
 
 int boundbox_clip(float obmat[][4], struct BoundBox *bb);
 void fdrawline(float x1, float y1, float x2, float y2);
diff --git a/source/blender/include/transform.h b/source/blender/include/transform.h
index 982a2f25df7..82adb1ac12a 100644
--- a/source/blender/include/transform.h
+++ b/source/blender/include/transform.h
@@ -515,6 +515,7 @@ int handleNDofInput(NDofInput *n, unsigned short event, short val);
 
 int manageObjectSpace(int confirm, int set);
 int manageMeshSpace(int confirm, int set);
+int manageBoneSpace(int confirm, int set);
 
 /* Those two fill in mat and return non-zero on success */
 int createSpaceNormal(float mat[3][3], float normal[3]);
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index b7b43817474..fc015775f49 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -390,7 +390,7 @@ typedef struct CollisionModifierData {
 	unsigned int numfaces;
 	int pad;
 	float time;		/* cfra time of modifier */
-	struct BVH *bvh;	/* bounding volume hierarchy for this cloth object */
+	struct BVHTree *bvhtree; /* bounding volume hierarchy for this cloth object */
 } CollisionModifierData;
 
 typedef enum {
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 7b1b979b777..aae8a697cbe 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -274,7 +274,7 @@ typedef struct RenderData {
 	
 	/* Bake Render options */
 	short bake_osa, bake_filter, bake_mode, bake_flag;
-	short bake_normal_space, bpad;
+	short bake_normal_space, bake_quad_split;
 	float bake_maxdist, bake_biasdist, bake_pad;
 	
 	/* yafray: global panel params. TODO: move elsewhere */
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c
index 9b837f9f988..83f4e633fa1 100644
--- a/source/blender/makesdna/intern/makesdna.c
+++ b/source/blender/makesdna/intern/makesdna.c
@@ -688,18 +688,18 @@ static int calculate_structlens(int firststruct)
 						/* 4-8 aligned/ */
 						if(sizeof(void *) == 4) {
 							if (len % 4) {
-								printf("Align pointer error in struct: %s %s\n", types[structtype], cp);
+								printf("Align pointer error in struct (len4): %s %s\n", types[structtype], cp);
 								dna_error = 1;
 							}
 						} else {
 							if (len % 8) {
-								printf("Align pointer error in struct: %s %s\n", types[structtype], cp);
+								printf("Align pointer error in struct (len8): %s %s\n", types[structtype], cp);
 								dna_error = 1;
 							}
 						}
 
 						if (alphalen % 8) {
-							printf("Align pointer error in struct: %s %s\n", types[structtype],cp);
+							printf("Align pointer error in struct (alphalen8): %s %s\n", types[structtype],cp);
 							dna_error = 1;
 						}
 
@@ -748,13 +748,13 @@ static int calculate_structlens(int firststruct)
 					// has_pointer is set or alphalen != len
 					if (has_pointer || alphalen != len) {
 						if (alphalen % 8) {
-							printf("Sizeerror in struct: %s (add %d bytes)\n", types[structtype], alphalen%8);
+							printf("Sizeerror 8 in struct: %s (add %d bytes)\n", types[structtype], alphalen%8);
 							dna_error = 1;
 						}
 					}
 					
 					if(len % 4) {
-						printf("Sizeerror in struct: %s (add %d bytes)\n", types[structtype], len%4);
+						printf("Sizeerror 4 in struct: %s (add %d bytes)\n", types[structtype], len%4);
 						dna_error = 1;
 					}
 					
diff --git a/source/blender/python/BPY_interface.c b/source/blender/python/BPY_interface.c
index 257203908b1..7c23c86d9ba 100644
--- a/source/blender/python/BPY_interface.c
+++ b/source/blender/python/BPY_interface.c
@@ -1259,15 +1259,16 @@ static int bpy_pydriver_create_dict(void)
 
 	/* If there's a Blender text called pydrivers.py, import it.
 	 * Users can add their own functions to this module. */
-	mod = importText("pydrivers"); /* can also use PyImport_Import() */
-	if (mod) {
-		PyDict_SetItemString(d, "pydrivers", mod);
-		PyDict_SetItemString(d, "p", mod);
-		Py_DECREF(mod);
+	if (G.f&G_DOSCRIPTLINKS) {
+		mod = importText("pydrivers"); /* can also use PyImport_Import() */
+		if (mod) {
+			PyDict_SetItemString(d, "pydrivers", mod);
+			PyDict_SetItemString(d, "p", mod);
+			Py_DECREF(mod);
+		} else {
+			PyErr_Clear();
+		}
 	}
-	else
-		PyErr_Clear();
-
 	/* short aliases for some Get() functions: */
 
 	/* ob(obname) == Blender.Object.Get(obname) */
@@ -1998,7 +1999,7 @@ float BPY_pydriver_eval(IpoDriver *driver)
 	int setitem_retval;
 	PyGILState_STATE gilstate;
 
-	if (!driver) return result;
+	if (!driver || 	(G.f&G_DOSCRIPTLINKS)==0) return result;
 
 	expr = driver->name; /* the py expression to be evaluated */
 	if (!expr || expr[0]=='\0') return result;
@@ -2103,7 +2104,7 @@ int BPY_button_eval(char *expr, double *value)
 	if (!bpy_pydriver_Dict) {
 		if (bpy_pydriver_create_dict() != 0) {
 			fprintf(stderr,
-				"Button Python Eval error: couldn't create Python dictionary");
+				"Button Python Eval error: couldn't create Python dictionary \n");
 			PyGILState_Release(gilstate);
 			return -1;
 		}
diff --git a/source/blender/python/api2_2x/Blender.c b/source/blender/python/api2_2x/Blender.c
index 6fce0864189..d8385c1d660 100644
--- a/source/blender/python/api2_2x/Blender.c
+++ b/source/blender/python/api2_2x/Blender.c
@@ -936,6 +936,7 @@ static PyObject *Blender_GetPaths( PyObject * self, PyObject *args, PyObject *ke
 	PyObject *list = PyList_New(0), *st; /* stupidly big string to be safe */
 	/* be sure there is low chance of the path being too short */
 	char filepath_expanded[FILE_MAXDIR*2]; 
+	char *lib;
 	
 	int absolute = 0;
 	static char *kwlist[] = {"absolute", NULL};
@@ -952,7 +953,12 @@ static PyObject *Blender_GetPaths( PyObject * self, PyObject *args, PyObject *ke
 		if (absolute) {
 			BLI_bpathIterator_getPathExpanded( &bpi, filepath_expanded );
 		} else {
-			BLI_bpathIterator_getPathExpanded( &bpi, filepath_expanded );
+			lib = BLI_bpathIterator_getLib( &bpi );
+			if ( lib && ( strcmp(lib, G.sce) ) ) { /* relative path to the library is NOT the same as our blendfile path, return an absolute path */
+				BLI_bpathIterator_getPathExpanded( &bpi, filepath_expanded );
+			} else {
+				BLI_bpathIterator_getPath( &bpi, filepath_expanded );
+			}
 		}
 		st = PyString_FromString(filepath_expanded);
 		
diff --git a/source/blender/python/api2_2x/Draw.c b/source/blender/python/api2_2x/Draw.c
index 3d4546613be..047a035fb8b 100644
--- a/source/blender/python/api2_2x/Draw.c
+++ b/source/blender/python/api2_2x/Draw.c
@@ -613,6 +613,8 @@ static void exit_pydraw( SpaceScript * sc, short err )
 		PyErr_Print(  );
 		script->flags = 0;	/* mark script struct for deletion */
 		SCRIPT_SET_NULL(script);
+		script->scriptname[0] = '\0';
+		script->scriptarg[0] = '\0';
 		error_pyscript();
 		scrarea_queue_redraw( sc->area );
 	}
diff --git a/source/blender/python/api2_2x/Material.c b/source/blender/python/api2_2x/Material.c
index 818c58109f3..c36213950b0 100644
--- a/source/blender/python/api2_2x/Material.c
+++ b/source/blender/python/api2_2x/Material.c
@@ -1179,7 +1179,7 @@ static PyGetSetDef BPy_Material_getseters[] = {
 	{"sssRadiusBlue",
 	 (getter)Material_getSssRadius, (setter)Material_setSssRadius,
 	 "Mean red scattering path length",
-	 (void *) 0},
+	 (void *) 2},
 	{"sssIOR",
 	 (getter)Material_getSssIOR, (setter)Material_setSssIOR,
 	 "index of refraction",
@@ -1196,7 +1196,7 @@ static PyGetSetDef BPy_Material_getseters[] = {
 	 (getter)Material_getSssTexScatter, (setter)Material_setSssTexScatter,
 	 "Texture scattering factor",
 	 NULL},
-	{"sssFont",
+	{"sssFront",
 	 (getter)Material_getSssFront, (setter)Material_setSssFront,
 	 "Front scattering weight",
 	 NULL},
diff --git a/source/blender/python/api2_2x/Node.c b/source/blender/python/api2_2x/Node.c
index 92529023b7e..792b2331508 100644
--- a/source/blender/python/api2_2x/Node.c
+++ b/source/blender/python/api2_2x/Node.c
@@ -848,7 +848,7 @@ static int Sockoutmap_assign_subscript(BPy_SockMap *self, PyObject *pyidx, PyObj
 
 	if (PyInt_Check(pyidx)) {
 		idx = (int)PyInt_AsLong(pyidx);
-		if (idx < 0 || idx >= Sockinmap_len(self))
+		if (idx < 0 || idx >= Sockoutmap_len(self))
 			return EXPP_ReturnIntError(PyExc_IndexError, "index out of range");
 	}
 	else if (PyString_Check(pyidx)) {
diff --git a/source/blender/python/api2_2x/Object.c b/source/blender/python/api2_2x/Object.c
index 82f99adcdb1..45cce46d389 100644
--- a/source/blender/python/api2_2x/Object.c
+++ b/source/blender/python/api2_2x/Object.c
@@ -341,6 +341,7 @@ static int setupPI(Object* ob);
 
 static PyObject *Object_getParticleSys( BPy_Object * self );
 /* fixme Object_newParticleSys( self, default-partsys-name ) */
+static PyObject *Object_addVertexGroupsFromArmature( BPy_Object * self, PyObject * args);
 static PyObject *Object_newParticleSys( BPy_Object * self );
 static PyObject *Object_buildParts( BPy_Object * self );
 static PyObject *Object_clearIpo( BPy_Object * self );
@@ -359,6 +360,8 @@ static PyObject *Object_getMatrix( BPy_Object * self, PyObject * args );
 static PyObject *Object_getParent( BPy_Object * self );
 static PyObject *Object_getParentBoneName( BPy_Object * self );
 static int Object_setParentBoneName( BPy_Object * self, PyObject * value );
+static PyObject *Object_getParentVertexIndex( BPy_Object * self );
+static int Object_setParentVertexIndex( BPy_Object * self, PyObject * value );
 static PyObject *Object_getSize( BPy_Object * self, PyObject * args );
 static PyObject *Object_getTimeOffset( BPy_Object * self );
 static PyObject *Object_getTracked( BPy_Object * self );
@@ -475,6 +478,8 @@ static PyMethodDef BPy_Object_methods[] = {
 	 "Return a list of particle systems"},
  	{"newParticleSystem", ( PyCFunction ) Object_newParticleSys, METH_NOARGS,
 	 "Create and link a new particle system"},
+	{"addVertexGroupsFromArmature" , ( PyCFunction ) Object_addVertexGroupsFromArmature, METH_VARARGS,
+	 "Add vertex groups from armature using the bone heat method"},
 	{"buildParts", ( PyCFunction ) Object_buildParts, METH_NOARGS,
 	 "Recalcs particle system (if any), (depricated, will always return an empty list in version 2.46)"},
 	{"getIpo", ( PyCFunction ) Object_getIpo, METH_NOARGS,
@@ -1051,10 +1056,12 @@ PyObject *Object_getParticleSys( BPy_Object * self ){
 /* fixme:  for(;;) */
 	current = ParticleSys_CreatePyObject( blparticlesys, ob );
 	PyList_Append(partsyslist,current);
+	Py_DECREF(current);
 
 	while((blparticlesys = blparticlesys->next)){
 		current = ParticleSys_CreatePyObject( blparticlesys, ob );
 		PyList_Append(partsyslist,current);
+		Py_DECREF(current);
 	}
 
 	return partsyslist;
@@ -1109,6 +1116,42 @@ PyObject *Object_newParticleSys( BPy_Object * self ){
 	return ParticleSys_CreatePyObject(rpsys,ob);
 }
 
+/*****************************************************************************/
+/* attribute:           addVertexGroupsFromArmature                          */
+/* Description:         evaluate and add vertex groups to the current object */
+/*                      for each bone of the selected armature               */   
+/* Data:                self Object, Bpy armature                            */
+/* Return:              nothing                                              */
+/*****************************************************************************/
+static PyObject *Object_addVertexGroupsFromArmature( BPy_Object * self, PyObject * args)
+{
+	
+	Object *ob = self->object;
+	BPy_Object *arm;
+
+	if( ob->type != OB_MESH )
+		return EXPP_ReturnPyObjError( PyExc_TypeError,
+				"Only useable on Mesh type Objects" );
+	
+	if( G.obedit != NULL)
+		return EXPP_ReturnPyObjError( PyExc_TypeError,
+				"Not useable when inside edit mode" );
+	
+	/* Check if the arguments passed to makeParent are valid. */
+	if( !PyArg_ParseTuple( args, "O!",&Object_Type, &arm ) )
+		return EXPP_ReturnPyObjError( PyExc_TypeError,
+				"An armature object is expected." );
+	
+	if( arm->object->type != OB_ARMATURE ) 
+		return EXPP_ReturnPyObjError( PyExc_TypeError,
+				"An armature object is expected." );
+			
+	add_verts_to_dgroups(ob, arm->object, 1, 0);
+	ob->recalc |= OB_RECALC_OB;  
+	
+	Py_RETURN_NONE;
+}
+
 static PyObject *Object_buildParts( BPy_Object * self )
 {
 	/* This is now handles by modifiers */
@@ -1452,6 +1495,92 @@ static int Object_setParentBoneName( BPy_Object * self, PyObject *value )
 	return 0;
 }
 
+static PyObject *Object_getParentVertexIndex( BPy_Object * self )
+{
+	PyObject *pyls = NULL;
+	
+	if( self->object->parent) {
+		if (self->object->partype==PARVERT1) {
+			pyls = PyList_New(1);
+			PyList_SET_ITEM( pyls, 0, PyInt_FromLong( self->object->par1 ));
+			return pyls;
+		} else if (self->object->partype==PARVERT3) {
+			pyls = PyList_New(3);
+			PyList_SET_ITEM( pyls, 0, PyInt_FromLong( self->object->par1 ));
+			PyList_SET_ITEM( pyls, 1, PyInt_FromLong( self->object->par2 ));
+			PyList_SET_ITEM( pyls, 2, PyInt_FromLong( self->object->par3 ));
+			return pyls;
+		}
+	}
+	return PyList_New(0);
+}
+
+static int Object_setParentVertexIndex( BPy_Object * self, PyObject *value )
+{
+	PyObject *item;
+	int val[3] = {0,0,0};
+	if( !self->object->parent) {
+		return EXPP_ReturnIntError( PyExc_RuntimeError,
+			"This object has no vertex parent, cant set the vertex parent indicies" );
+	}
+	if (self->object->partype==PARVERT1) {
+		if (PySequence_Length(value) != 1)
+			return EXPP_ReturnIntError( PyExc_RuntimeError,
+				"Vertex parented to 1 vertex, can only assign a sequence with 1 vertex parent index" );
+		item = PySequence_GetItem(value, 0);
+		if (item) {
+			val[0] = PyInt_AsLong(item);
+			Py_DECREF(item);
+		}
+	} else if (self->object->partype==PARVERT3) {
+		int i;
+		if (PySequence_Length(value) != 3)
+			return EXPP_ReturnIntError( PyExc_RuntimeError,
+				"Vertex parented to 3 verts, can only assign a sequence with 3 verts parent index" );
+		
+		for (i=0; i<3; i++) {
+			item = PySequence_GetItem(value, i);
+			if (item) {
+				val[i] = PyInt_AsLong(item);
+				Py_DECREF(item);
+			}
+		}
+	} else {
+		return EXPP_ReturnIntError( PyExc_RuntimeError,
+			"This object has no vertex parent, cant set the vertex parent indicies" );
+	}
+	
+	if (PyErr_Occurred()) {
+		return EXPP_ReturnIntError( PyExc_RuntimeError,
+			"This object has no vertex parent, cant set the vertex parent indicies" );
+	} else {
+		if (self->object->partype==PARVERT1) {
+			if (val[0] < 0) {
+				return EXPP_ReturnIntError( PyExc_RuntimeError,
+					"vertex index less then zero" );
+			}
+			
+			self->object->par1 = val[0];
+		} else if (self->object->partype==PARVERT3) {
+			if (val[0]==val[1] || val[0]==val[2] || val[1]==val[2]) {
+				return EXPP_ReturnIntError( PyExc_RuntimeError,
+					"duplicate indicies in vertex parent assignment" );
+			}
+			if (val[0] < 0 || val[1] < 0 || val[2] < 0) {
+				return EXPP_ReturnIntError( PyExc_RuntimeError,
+					"vertex index less then zero" );
+			}
+		
+			self->object->par1 = val[0];
+			self->object->par2 = val[1];
+			self->object->par3 = val[2];
+		}
+	}
+
+	return 0;
+}
+
+
 static PyObject *Object_getSize( BPy_Object * self, PyObject * args )
 {
 	char *space = "localspace";	/* default to local */
@@ -4877,6 +5006,10 @@ static PyGetSetDef BPy_Object_getseters[] = {
 	 (getter)Object_getParentBoneName, (setter)Object_setParentBoneName,
 	 "The object's parent object's sub name",
 	 NULL},
+	{"parentVertexIndex",
+	 (getter)Object_getParentVertexIndex, (setter)Object_setParentVertexIndex,
+	 "Indicies used for vertex parents",
+	 NULL},
 	{"track",
 	 (getter)Object_getTracked, (setter)Object_setTracked,
 	 "The object's tracked object",
diff --git a/source/blender/python/api2_2x/Particle.c b/source/blender/python/api2_2x/Particle.c
index f0a32db0623..95de9757b87 100644
--- a/source/blender/python/api2_2x/Particle.c
+++ b/source/blender/python/api2_2x/Particle.c
@@ -854,7 +854,7 @@ static PyObject *Part_GetLoc( BPy_PartSys * self, PyObject * args ){
 					return EXPP_ReturnPyObjError( PyExc_RuntimeError,
 							"Couldn't append item to PyList" );
 				}
-
+				Py_DECREF(loc); /* PyList_Append increfs */
 				path++;
 			}
 
@@ -864,6 +864,7 @@ static PyObject *Part_GetLoc( BPy_PartSys * self, PyObject * args ){
 				return EXPP_ReturnPyObjError( PyExc_RuntimeError,
 						"Couldn't append item to PyList" );		
 			}
+			Py_DECREF(seglist); /* PyList_Append increfs */
 		}
 
 		cache=psys->childcache;
@@ -885,7 +886,7 @@ static PyObject *Part_GetLoc( BPy_PartSys * self, PyObject * args ){
 					return EXPP_ReturnPyObjError( PyExc_RuntimeError,
 							"Couldn't append item to PyList" );
 				}
-
+				Py_DECREF(loc);/* PyList_Append increfs */
 				path++;
 			}
 
@@ -895,6 +896,7 @@ static PyObject *Part_GetLoc( BPy_PartSys * self, PyObject * args ){
 				return EXPP_ReturnPyObjError( PyExc_RuntimeError,
 						"Couldn't append item to PyList" );	
 			}
+			Py_DECREF(seglist); /* PyList_Append increfs */
 		}
 		
 	} else {
@@ -933,6 +935,7 @@ static PyObject *Part_GetLoc( BPy_PartSys * self, PyObject * args ){
 					return EXPP_ReturnPyObjError( PyExc_RuntimeError,
 								"Couldn't append item to PyList" );
 				}
+				Py_DECREF(loc);/* PyList_Append increfs */
 			}
 			else {
 				if ( all ){
@@ -941,6 +944,7 @@ static PyObject *Part_GetLoc( BPy_PartSys * self, PyObject * args ){
 						return EXPP_ReturnPyObjError( PyExc_RuntimeError,
 									"Couldn't append item to PyList" );
 					}
+					Py_DECREF(Py_None); /* PyList_Append increfs */
 				}
 			}
 		}
@@ -985,6 +989,7 @@ static PyObject *Part_GetRot( BPy_PartSys * self, PyObject * args ){
 			if(psys_get_particle_state(ob,psys,i,&state,0)==0){
 				if ( all ){
 					PyList_Append(partlist,Py_None);
+					Py_DECREF(Py_None); /* PyList_Append increfs */
 					continue;
 				} else {
 					continue;
@@ -1001,6 +1006,7 @@ static PyObject *Part_GetRot( BPy_PartSys * self, PyObject * args ){
 			if (id)
 				PyTuple_SetItem(loc,4,PyInt_FromLong(i));
 			PyList_Append(partlist,loc);
+			Py_DECREF(loc); /* PyList_Append increfs */
 		}
 	}
 	return partlist;
@@ -1060,9 +1066,11 @@ static PyObject *Part_GetSize( BPy_PartSys * self, PyObject * args ){
 				PyTuple_SetItem(tuple,0,PyFloat_FromDouble((double)size));
 				PyTuple_SetItem(tuple,1,PyInt_FromLong(i));
 				PyList_Append(partlist,tuple);
+				Py_DECREF(tuple);
 			} else {
 				siz = PyFloat_FromDouble((double)size);
 				PyList_Append(partlist,siz);
+				Py_DECREF(siz);
 			}
 		}
 	}
@@ -1125,9 +1133,11 @@ static PyObject *Part_GetAge( BPy_PartSys * self, PyObject * args ){
 				PyTuple_SetItem(tuple,0,PyFloat_FromDouble((double)life));
 				PyTuple_SetItem(tuple,1,PyInt_FromLong(i));
 				PyList_Append(partlist,tuple);
+				Py_DECREF(tuple);
 			} else {
 				lif = PyFloat_FromDouble((double)life);
 				PyList_Append(partlist,lif);
+				Py_DECREF(lif);
 			}
 		}
 	}
diff --git a/source/blender/python/api2_2x/Scene.c b/source/blender/python/api2_2x/Scene.c
index 7ef351b1127..eba951b8813 100644
--- a/source/blender/python/api2_2x/Scene.c
+++ b/source/blender/python/api2_2x/Scene.c
@@ -1355,16 +1355,29 @@ static PyObject *SceneObSeq_item( BPy_SceneObSeq * self, int i )
 		for (base= scene->base.first; base && i!=index; base= base->next, index++) {}
 	/* selected */
 	else if (self->mode==EXPP_OBSEQ_SELECTED) {
-		for (base= scene->base.first; base && i!=index; base= base->next)
-			if (base->flag & SELECT)
-				index++;
+		for (base= scene->base.first; base; base= base->next) {
+			if (base->flag & SELECT) {
+				if (i==index) {
+					break;
+				} else {
+					index++;
+				}
+			}
+		}
 	}
 	/* context */
 	else if (self->mode==EXPP_OBSEQ_CONTEXT) {
-		if (G.vd)
-			for (base= scene->base.first; base && i!=index; base= base->next)
-				if TESTBASE(base)
-					index++;
+		if (G.vd) {
+			for (base= scene->base.first; base; base= base->next) {
+				if (TESTBASE(base)) {
+					if (i==index) {
+						break;
+					} else {
+						index++;
+					}
+				}
+			}
+		}
 	}
 	
 	if (!(base))
diff --git a/source/blender/python/api2_2x/Sys.c b/source/blender/python/api2_2x/Sys.c
index 3863cc12227..baae2220143 100644
--- a/source/blender/python/api2_2x/Sys.c
+++ b/source/blender/python/api2_2x/Sys.c
@@ -406,11 +406,12 @@ static PyObject *M_sys_cleanpath( PyObject * self, PyObject * value )
 {
 	char *path = PyString_AsString(value);
 	char cleaned[FILE_MAXDIR + FILE_MAXFILE];
-	int trailing_slash = 0;
+	int trailing_slash = 0, last;
 	if (!path)
 		return EXPP_ReturnPyObjError( PyExc_TypeError,
 			"expected string argument" );
-	if (strstr(path, "/") || strstr(path, "\\")) {
+	last = strlen(path)-1;
+	if ((last >= 0) && ((path[last]=='/') || (path[last]=='\\'))) {
 		trailing_slash = 1;
 	}
 	BLI_strncpy(cleaned, path, FILE_MAXDIR + FILE_MAXFILE);
diff --git a/source/blender/python/api2_2x/doc/Object.py b/source/blender/python/api2_2x/doc/Object.py
index 521be3b0cea..2e4850aeb14 100644
--- a/source/blender/python/api2_2x/doc/Object.py
+++ b/source/blender/python/api2_2x/doc/Object.py
@@ -389,6 +389,8 @@ class Object:
 	@ivar parentbonename: The string name of the parent bone (if defined).
 		This can be set to another bone in the armature if the object already has a bone parent.
 	@type parentbonename: string or None
+	@ivar parentVertexIndex: A list of vertex parent indicies, with a length of 0, 1 or 3. When there are 1 or 3 vertex parents, the indicies can be assigned to a sequence of the same length.
+	@type parentVertexIndex: list
 	@ivar protectFlags: The "transform locking" bitfield flags for the object.  
 	See L{ProtectFlags} const dict for values.
 	@type protectFlags: int
@@ -651,6 +653,13 @@ class Object:
 		Link a new particle system (see Blender.Particle).
 		"""
 		
+	def addVertexGroupsFromArmature(object):
+		"""
+		Add vertex groups from armature using the bone heat method
+		This method can be only used with an Object of the type Mesh when NOT in edit mode.
+		@type object: a bpy armature
+		"""
+
 	def buildParts():
 		"""
 		Recomputes the particle system. This method only applies to an Object of
diff --git a/source/blender/python/api2_2x/sceneRender.c b/source/blender/python/api2_2x/sceneRender.c
index f54c2cd4e3b..b446af7efd4 100644
--- a/source/blender/python/api2_2x/sceneRender.c
+++ b/source/blender/python/api2_2x/sceneRender.c
@@ -478,9 +478,11 @@ PyObject *RenderData_Render( BPy_RenderData * self )
 	}
 
 	else { /* background mode (blender -b file.blend -P script) */
-		Render *re= RE_NewRender("Render");
+		Render *re= RE_NewRender(G.scene->id.name);
 
-		int end_frame = G.scene->r.efra; /* is of type short currently */
+
+
+		int end_frame = G.scene->r.efra;
 
 		if (G.scene != self->scene)
 			return EXPP_ReturnPyObjError (PyExc_RuntimeError,
@@ -490,7 +492,7 @@ PyObject *RenderData_Render( BPy_RenderData * self )
 
 		RE_BlenderAnim(re, G.scene, G.scene->r.sfra, G.scene->r.efra);
 
-		G.scene->r.efra = (short)end_frame;
+		G.scene->r.efra = end_frame;
 	}
 
 	Py_RETURN_NONE;
@@ -571,7 +573,7 @@ PyObject *RenderData_RenderAnim( BPy_RenderData * self )
 		set_scene( oldsce );
 	}
 	else { /* background mode (blender -b file.blend -P script) */
-		Render *re= RE_NewRender("Render");
+		Render *re= RE_NewRender(G.scene->id.name);
 		
 		if (G.scene != self->scene)
 			return EXPP_ReturnPyObjError (PyExc_RuntimeError,
@@ -2046,7 +2048,7 @@ static int RenderData_setIValueAttrClamp( BPy_RenderData *self, PyObject *value,
 		break;
 	case EXPP_RENDER_ATTR_BAKEMODE:
 		min = RE_BAKE_LIGHT;
-		max = RE_BAKE_DISPLACEMENT;
+		max = RE_BAKE_SHADOW;
 		size = 'h';
 		param = &self->renderContext->bake_mode;
 		break;
@@ -3779,6 +3781,7 @@ static PyObject *M_Render_BakeModesDict( void )
 		PyConstant_Insert( d, "NORMALS", PyInt_FromLong( RE_BAKE_NORMALS ) );
 		PyConstant_Insert( d, "TEXTURE", PyInt_FromLong( RE_BAKE_TEXTURE ) );
 		PyConstant_Insert( d, "DISPLACEMENT", PyInt_FromLong( RE_BAKE_DISPLACEMENT ) );
+		PyConstant_Insert( d, "SHADOW", PyInt_FromLong( RE_BAKE_SHADOW ) );
 	}
 	return M;
 }
diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h
index 66dc1dd5fef..64cf7fcb37b 100644
--- a/source/blender/render/extern/include/RE_pipeline.h
+++ b/source/blender/render/extern/include/RE_pipeline.h
@@ -220,6 +220,8 @@ void RE_zbuf_accumulate_vecblur(struct NodeBlurData *nbd, int xsize, int ysize,
 #define RE_BAKE_NORMALS			3
 #define RE_BAKE_TEXTURE			4
 #define RE_BAKE_DISPLACEMENT	5
+#define RE_BAKE_SHADOW			6
+
 void RE_Database_Baking(struct Render *re, struct Scene *scene, int type, struct Object *actob);
 
 void RE_DataBase_GetView(struct Render *re, float mat[][4]);
diff --git a/source/blender/render/extern/include/RE_raytrace.h b/source/blender/render/extern/include/RE_raytrace.h
index aec1c69b3dc..8f429f7dd90 100644
--- a/source/blender/render/extern/include/RE_raytrace.h
+++ b/source/blender/render/extern/include/RE_raytrace.h
@@ -70,7 +70,7 @@ typedef struct Isect {
 	int ob_last;
 
 	short isect;			/* which half of quad */
-	short mode;				/* RE_RAYSHADOW, RE_RAYMIRROR, RE_RAYSHADOW_TRA */
+	short mode;				/* RE_RAY_SHADOW, RE_RAY_MIRROR, RE_RAY_SHADOW_TRA */
 	int lay;				/* -1 default, set for layer lamps */
 
 	/* only used externally */
diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h
index d7e71b3e531..8414b6aefe3 100644
--- a/source/blender/render/intern/include/render_types.h
+++ b/source/blender/render/intern/include/render_types.h
@@ -499,6 +499,7 @@ typedef struct LampRen {
 #define R_NEED_TANGENT	32
 #define R_SKIP_MULTIRES	64
 #define R_BAKE_TRACE	128
+#define R_BAKING		256
 
 /* vlakren->flag (vlak = face in dutch) char!!! */
 #define R_SMOOTH		1
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index dbade68ba1d..89a0a5ba7cb 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -3935,6 +3935,57 @@ static void set_fullsample_flag(Render *re, ObjectRen *obr)
 	}
 }
 
+/* split quads for pradictable baking
+ * dir 1 == (0,1,2) (0,2,3),  2 == (1,3,0) (1,2,3) 
+ */
+static void split_quads(ObjectRen *obr, int dir) 
+{
+	VlakRen *vlr, *vlr1;
+	int a;
+
+	for(a=obr->totvlak-1; a>=0; a--) {
+		vlr= RE_findOrAddVlak(obr, a);
+		
+		/* test if rendering as a quad or triangle, skip wire */
+		if(vlr->v4 && (vlr->flag & R_STRAND)==0 && (vlr->mat->mode & MA_WIRE)==0) {
+			
+			if(vlr->v4) {
+
+				vlr1= RE_vlakren_copy(obr, vlr);
+				vlr1->flag |= R_FACE_SPLIT;
+				
+				if( dir==2 ) vlr->flag |= R_DIVIDE_24;
+				else vlr->flag &= ~R_DIVIDE_24;
+
+				/* new vertex pointers */
+				if (vlr->flag & R_DIVIDE_24) {
+					vlr1->v1= vlr->v2;
+					vlr1->v2= vlr->v3;
+					vlr1->v3= vlr->v4;
+
+					vlr->v3 = vlr->v4;
+					
+					vlr1->flag |= R_DIVIDE_24;
+				}
+				else {
+					vlr1->v1= vlr->v1;
+					vlr1->v2= vlr->v3;
+					vlr1->v3= vlr->v4;
+					
+					vlr1->flag &= ~R_DIVIDE_24;
+				}
+				vlr->v4 = vlr1->v4 = NULL;
+				
+				/* new normals */
+				CalcNormFloat(vlr->v3->co, vlr->v2->co, vlr->v1->co, vlr->n);
+				CalcNormFloat(vlr1->v3->co, vlr1->v2->co, vlr1->v1->co, vlr1->n);
+			}
+			/* clear the flag when not divided */
+			else vlr->flag &= ~R_DIVIDE_24;
+		}
+	}
+}
+
 static void check_non_flat_quads(ObjectRen *obr)
 {
 	VlakRen *vlr, *vlr1;
@@ -3997,6 +4048,7 @@ static void check_non_flat_quads(ObjectRen *obr)
 				xn= nor[0]*vlr->n[0] + nor[1]*vlr->n[1] + nor[2]*vlr->n[2];
 
 				if(ABS(xn) < 0.999995 ) {	// checked on noisy fractal grid
+					
 					float d1, d2;
 
 					vlr1= RE_vlakren_copy(obr, vlr);
@@ -4008,10 +4060,10 @@ static void check_non_flat_quads(ObjectRen *obr)
 
 					CalcNormFloat(vlr->v2->co, vlr->v3->co, vlr->v4->co, nor);
 					d2= nor[0]*vlr->v2->n[0] + nor[1]*vlr->v2->n[1] + nor[2]*vlr->v2->n[2];
-					
+				
 					if( fabs(d1) < fabs(d2) ) vlr->flag |= R_DIVIDE_24;
 					else vlr->flag &= ~R_DIVIDE_24;
-					
+
 					/* new vertex pointers */
 					if (vlr->flag & R_DIVIDE_24) {
 						vlr1->v1= vlr->v2;
@@ -4064,8 +4116,14 @@ static void finalize_render_object(Render *re, ObjectRen *obr, int timeoffset)
 			ob->smoothresh= 0.0;
 			if((re->r.mode & R_RAYTRACE) && (re->r.mode & R_SHADOW)) 
 				set_phong_threshold(obr);
-
-			check_non_flat_quads(obr);
+			
+			if (re->flag & R_BAKING && re->r.bake_quad_split != 0) {
+				/* Baking lets us define a quad split order */
+				split_quads(obr, re->r.bake_quad_split);
+			} else {
+				check_non_flat_quads(obr);
+			}
+			
 			set_fullsample_flag(re, obr);
 
 			/* compute bounding boxes for clipping */
@@ -5406,6 +5464,7 @@ void RE_Database_FromScene_Vectors(Render *re, Scene *sce)
    RE_BAKE_AO:     for baking, no lamps, but all objects
    RE_BAKE_TEXTURE:for baking, no lamps, only selected objects
    RE_BAKE_DISPLACEMENT:for baking, no lamps, only selected objects
+   RE_BAKE_SHADOW: for baking, only shadows, but all objects
 */
 void RE_Database_Baking(Render *re, Scene *scene, int type, Object *actob)
 {
@@ -5421,6 +5480,7 @@ void RE_Database_Baking(Render *re, Scene *scene, int type, Object *actob)
 	RE_init_threadcount(re);
 	
 	re->flag |= R_GLOB_NOPUNOFLIP;
+	re->flag |= R_BAKING;
 	re->excludeob= actob;
 	if(type == RE_BAKE_LIGHT)
 		re->flag |= R_SKIP_MULTIRES;
@@ -5435,6 +5495,10 @@ void RE_Database_Baking(Render *re, Scene *scene, int type, Object *actob)
 		re->r.mode &= ~R_RAYTRACE;
 	}
 	
+	if(!actob && (type==RE_BAKE_SHADOW)) {
+		re->r.mode |= R_SHADOW;
+	}
+	
 	/* setup render stuff */
 	re->memArena = BLI_memarena_new(BLI_MEMARENA_STD_BUFSIZE);
 	
@@ -5472,7 +5536,7 @@ void RE_Database_Baking(Render *re, Scene *scene, int type, Object *actob)
 	set_node_shader_lamp_loop(shade_material_loop);
 
 	/* MAKE RENDER DATA */
-	nolamps= !ELEM(type, RE_BAKE_LIGHT, RE_BAKE_ALL);
+	nolamps= !ELEM3(type, RE_BAKE_LIGHT, RE_BAKE_ALL, RE_BAKE_SHADOW);
 	onlyselected= ELEM3(type, RE_BAKE_NORMALS, RE_BAKE_TEXTURE, RE_BAKE_DISPLACEMENT);
 
 	database_init_objects(re, lay, nolamps, onlyselected, actob, 0);
diff --git a/source/blender/render/intern/source/envmap.c b/source/blender/render/intern/source/envmap.c
index 73db5c4b0be..aa4e40739da 100644
--- a/source/blender/render/intern/source/envmap.c
+++ b/source/blender/render/intern/source/envmap.c
@@ -241,7 +241,7 @@ static void env_rotate_scene(Render *re, float mat[][4], int mode)
 		/* append or set matrix depending on dupli */
 		if(obi->flag & R_DUPLI_TRANSFORMED) {
 			Mat4CpyMat4(tmpmat, obi->mat);
-			Mat4MulMat4(obi->mat, tmat, tmpmat);
+			Mat4MulMat4(obi->mat, tmpmat, tmat);
 		}
 		else if(mode==1)
 			Mat4CpyMat4(obi->mat, tmat);
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index fb699f5b382..ebb52c49132 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -993,6 +993,7 @@ RenderStats *RE_GetStats(Render *re)
 	return &re->i;
 }
 
+/* Note, when rendering from a scene, ALWAYS use G.scene->id.name, else compositing wont work */
 Render *RE_NewRender(const char *name)
 {
 	Render *re;
diff --git a/source/blender/render/intern/source/rayshade.c b/source/blender/render/intern/source/rayshade.c
index 8fd07001bd1..1155d2ea817 100644
--- a/source/blender/render/intern/source/rayshade.c
+++ b/source/blender/render/intern/source/rayshade.c
@@ -1473,14 +1473,15 @@ static float *sphere_sampler(int type, int resol, int thread, int xs, int ys)
 	int tot;
 	float *vec;
 	
-	if(resol>16) resol= 16;
-	
 	tot= 2*resol*resol;
 
 	if (type & WO_AORNDSMP) {
-		static float sphere[2*3*256];
+		float *sphere;
 		int a;
 		
+		// always returns table
+		sphere= threadsafe_table_sphere(0, thread, xs, ys, tot);
+
 		/* total random sampling. NOT THREADSAFE! (should be removed, is not useful) */
 		vec= sphere;
 		for (a=0; a<tot; a++, vec+=3) {
@@ -1495,7 +1496,8 @@ static float *sphere_sampler(int type, int resol, int thread, int xs, int ys)
 		float ang, *vec1;
 		int a;
 		
-		sphere= threadsafe_table_sphere(1, thread, xs, ys, tot);	// returns table if xs and ys were equal to last call
+		// returns table if xs and ys were equal to last call
+		sphere= threadsafe_table_sphere(1, thread, xs, ys, tot);
 		if(sphere==NULL) {
 			sphere= threadsafe_table_sphere(0, thread, xs, ys, tot);
 			
@@ -1663,7 +1665,7 @@ void ray_ao_spheresamp(ShadeInput *shi, float *shadfac)
 	float *vec, *nrm, div, bias, sh=0.0f;
 	float maxdist = R.wrld.aodist;
 	float dxyview[3];
-	int j= -1, tot, actual=0, skyadded=0, aocolor;
+	int j= -1, tot, actual=0, skyadded=0, aocolor, resol= R.wrld.aosamp;
 	
 	isec.faceorig= (RayFace*)shi->vlr;
 	isec.oborig= RAY_OBJECT_SET(&R, shi->obi);
@@ -1690,14 +1692,16 @@ void ray_ao_spheresamp(ShadeInput *shi, float *shadfac)
 	if(shi->mat->mode & MA_ONLYSHADOW)
 		aocolor= WO_AOPLAIN;
 	
-	vec= sphere_sampler(R.wrld.aomode, R.wrld.aosamp, shi->thread, shi->xs, shi->ys);
+	if(resol>32) resol= 32;
+	
+	vec= sphere_sampler(R.wrld.aomode, resol, shi->thread, shi->xs, shi->ys);
 	
 	// warning: since we use full sphere now, and dotproduct is below, we do twice as much
-	tot= 2*R.wrld.aosamp*R.wrld.aosamp;
+	tot= 2*resol*resol;
 
 	if(aocolor == WO_AOSKYTEX) {
-		dxyview[0]= 1.0f/(float)R.wrld.aosamp;
-		dxyview[1]= 1.0f/(float)R.wrld.aosamp;
+		dxyview[0]= 1.0f/(float)resol;
+		dxyview[1]= 1.0f/(float)resol;
 		dxyview[2]= 0.0f;
 	}
 	
diff --git a/source/blender/render/intern/source/rendercore.c b/source/blender/render/intern/source/rendercore.c
index ff31ba8a6ee..dae7b0dcd88 100644
--- a/source/blender/render/intern/source/rendercore.c
+++ b/source/blender/render/intern/source/rendercore.c
@@ -2017,9 +2017,12 @@ static void bake_shade(void *handle, Object *ob, ShadeInput *shi, int quad, int
 			ambient_occlusion_to_diffuse(shi, shr.combined);
 	}
 	else {
+		if (bs->type==RE_BAKE_SHADOW) /* Why do shadows set the color anyhow?, ignore material color for baking */
+			shi->r = shi->g = shi->b = 1.0f;
+	
 		shade_input_set_shade_texco(shi);
 		
-		if(!ELEM(bs->type, RE_BAKE_NORMALS, RE_BAKE_TEXTURE))
+		if(!ELEM3(bs->type, RE_BAKE_NORMALS, RE_BAKE_TEXTURE, RE_BAKE_SHADOW))
 			shade_samples_do_AO(ssamp);
 		
 		if(shi->mat->nodetree && shi->mat->use_nodes) {
@@ -2070,6 +2073,10 @@ static void bake_shade(void *handle, Object *ob, ShadeInput *shi, int quad, int
 			shr.combined[2]= shi->b;
 			shr.alpha = shi->alpha;
 		}
+		else if(bs->type==RE_BAKE_SHADOW) {
+			VECCOPY(shr.combined, shr.shad);
+			shr.alpha = shi->alpha;
+		}
 	}
 	
 	if(bs->rect_float) {
@@ -2505,7 +2512,12 @@ int RE_bake_shade_all_selected(Render *re, int type, Object *actob)
 		memset(&handles[a], 0, sizeof(BakeShade));
 		
 		handles[a].ssamp.shi[0].lay= re->scene->lay;
-		handles[a].ssamp.shi[0].passflag= SCE_PASS_COMBINED;
+		
+		if (type==RE_BAKE_SHADOW) {
+			handles[a].ssamp.shi[0].passflag= SCE_PASS_SHADOW;
+		} else {
+			handles[a].ssamp.shi[0].passflag= SCE_PASS_COMBINED;
+		}
 		handles[a].ssamp.shi[0].combinedflag= ~(SCE_PASS_SPEC);
 		handles[a].ssamp.shi[0].thread= a;
 		handles[a].ssamp.tot= 1;
diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c
index 1365baf075a..6250b69345b 100644
--- a/source/blender/src/buttons_editing.c
+++ b/source/blender/src/buttons_editing.c
@@ -4369,7 +4369,7 @@ static void editing_panel_armature_bones(Object *ob, bArmature *arm)
 			
 			/* bone types */
 			uiDefButBitI(block, TOG, BONE_HINGE, B_ARM_RECALCDATA, "Hinge",		-10,by-38,80,18, &curBone->flag, 1.0, 32.0, 0.0, 0.0, "Don't inherit rotation or scale from parent Bone");
-			uiDefButBitI(block, TOG, BONE_NO_SCALE, B_ARM_RECALCDATA, "S",		70,by-38,20,18, &curBone->flag, 1.0, 32.0, 0.0, 0.0, "Don't inherit rotation or scale from parent Bone");
+			uiDefButBitI(block, TOG, BONE_NO_SCALE, B_ARM_RECALCDATA, "S",		70,by-38,20,18, &curBone->flag, 1.0, 32.0, 0.0, 0.0, "Don't inherit scale from parent Bone");
 			uiDefButBitI(block, TOGN, BONE_NO_DEFORM, B_ARM_RECALCDATA, "Deform",	90, by-38, 80, 18, &curBone->flag, 0.0, 0.0, 0.0, 0.0, "Indicate if Bone deforms geometry");
 			uiDefButBitI(block, TOG, BONE_MULT_VG_ENV, B_ARM_RECALCDATA, "Mult", 170,by-38,80,18, &curBone->flag, 1.0, 32.0, 0.0, 0.0, "Multiply Bone Envelope with VertexGroup");
 			uiDefButBitI(block, TOG, BONE_HIDDEN_A, REDRAWVIEW3D, "Hide",	250,by-38,80,18, &curBone->flag, 0, 0, 0, 0, "Toggles display of this bone in Edit Mode");
diff --git a/source/blender/src/buttons_object.c b/source/blender/src/buttons_object.c
index fb36d103656..52261f7d3fb 100644
--- a/source/blender/src/buttons_object.c
+++ b/source/blender/src/buttons_object.c
@@ -4044,7 +4044,7 @@ static void object_softbodies(Object *ob)
 				uiDefButS(block, NUM, B_BAKE_CACHE_CHANGE, "Aero:",     30,10,60,20, &sb->aeroedge,  0.00,  30000.0, 10, 0, "Make edges 'sail'");
 			    uiDefButS(block, NUM, B_BAKE_CACHE_CHANGE, "Plas:", 90,10,60,20, &sb->plastic, 0.0,  100.0, 10, 0, "Permanent deform");
 				if(ob->type==OB_MESH) {
-					uiDefButF(block, NUM, B_BAKE_CACHE_CHANGE, "Be:", 150,10,80,20, &sb->secondspring, 0.0,  10.0, 10, 0, "Bendig Stiffness");
+					uiDefButF(block, NUM, B_BAKE_CACHE_CHANGE, "Be:", 150,10,80,20, &sb->secondspring, 0.0,  10.0, 10, 0, "Bending Stiffness");
 					if (*softflag & OB_SB_QUADS){ 
 					uiDefButF(block, NUM, B_BAKE_CACHE_CHANGE, "Sh:", 230,10,80,20, &sb->shearstiff, 0.0,  1.0, 10, 0, "Shear Stiffness");
 					}
diff --git a/source/blender/src/buttons_scene.c b/source/blender/src/buttons_scene.c
index b98a8c58102..3797a92f16f 100644
--- a/source/blender/src/buttons_scene.c
+++ b/source/blender/src/buttons_scene.c
@@ -2150,6 +2150,10 @@ static void render_panel_bake(void)
 				 "Normalized displacement value to fit the 'Dist' range"
 		);
 	}
+	
+	uiDefButS(block, MENU, B_NOP, "Quad Split Order%t|Quad Split Auto%x0|Quad Split A (0,1,2) (0,2,3)%x1|Quad Split B (1,2,3) (1,3,0)%x2", 
+		10,10,190,20, &G.scene->r.bake_quad_split, 0, 0, 0, 0, "Method to divide quads (use A or B for external applications that use a fixed order)");
+	
 #if 0	
 	uiBlockBeginAlign(block);
 	uiDefButBitS(block, TOG, R_BAKE_OSA, B_DIFF, "OSA",		10,120,190,20, &G.scene->r.bake_flag, 0, 0, 0, 0, "Enables Oversampling (Anti-aliasing)");
@@ -2161,14 +2165,15 @@ static void render_panel_bake(void)
 	uiBlockBeginAlign(block);
 	uiDefButS(block, ROW,B_REDR,"Full Render",		210,170,120,20,&G.scene->r.bake_mode, 1.0, RE_BAKE_ALL, 0, 0, "");
 	uiDefButS(block, ROW,B_REDR,"Ambient Occlusion",210,150,120,20,&G.scene->r.bake_mode, 1.0, RE_BAKE_AO, 0, 0, "");
-	uiDefButS(block, ROW,B_REDR,"Normals",		210,130,120,20,&G.scene->r.bake_mode, 1.0, RE_BAKE_NORMALS, 0, 0, "");
-	uiDefButS(block, ROW,B_REDR,"Textures",		210,110,120,20,&G.scene->r.bake_mode, 1.0, RE_BAKE_TEXTURE, 0, 0, "");
-	uiDefButS(block, ROW,B_REDR,"Displacement",		210,90,120,20,&G.scene->r.bake_mode, 1.0, RE_BAKE_DISPLACEMENT, 0, 0, "");
+	uiDefButS(block, ROW,B_REDR,"Shadow",			210,130,120,20,&G.scene->r.bake_mode, 1.0, RE_BAKE_SHADOW, 0, 0, "");
+	uiDefButS(block, ROW,B_REDR,"Normals",			210,110,120,20,&G.scene->r.bake_mode, 1.0, RE_BAKE_NORMALS, 0, 0, "");
+	uiDefButS(block, ROW,B_REDR,"Textures",			210,90,120,20,&G.scene->r.bake_mode, 1.0, RE_BAKE_TEXTURE, 0, 0, "");
+	uiDefButS(block, ROW,B_REDR,"Displacement",		210,70,120,20,&G.scene->r.bake_mode, 1.0, RE_BAKE_DISPLACEMENT, 0, 0, "");
 	uiBlockEndAlign(block);
 	
-	uiDefButBitS(block, TOG, R_BAKE_CLEAR, B_DIFF, "Clear",		210,60,120,20,&G.scene->r.bake_flag, 0.0, 0, 0, 0, "Clear Images before baking");
+	uiDefButBitS(block, TOG, R_BAKE_CLEAR, B_DIFF, "Clear",		210,40,120,20,&G.scene->r.bake_flag, 0.0, 0, 0, 0, "Clear Images before baking");
 	
-	uiDefButS(block, NUM, B_DIFF,"Margin:",				210,30,120,20,&G.scene->r.bake_filter, 0.0, 32.0, 0, 0, "Amount of pixels to extend the baked result with, as post process filter");
+	uiDefButS(block, NUM, B_DIFF,"Margin:",				210,10,120,20,&G.scene->r.bake_filter, 0.0, 32.0, 0, 0, "Amount of pixels to extend the baked result with, as post process filter");
 }
 
 static void render_panel_simplify(void)
diff --git a/source/blender/src/drawipo.c b/source/blender/src/drawipo.c
index 552e87a57d1..0e7476bbe82 100644
--- a/source/blender/src/drawipo.c
+++ b/source/blender/src/drawipo.c
@@ -1712,7 +1712,7 @@ static void boundbox_ipo_curves(SpaceIpo *si)
 /* is used for both read and write... */
 static void ipo_editvertex_buts(uiBlock *block, SpaceIpo *si, float min, float max)
 {
-	Object *ob= OBACT;
+	Object *ob;
 	EditIpo *ei;
 	BezTriple *bezt;
 	float median[3];
@@ -1721,6 +1721,12 @@ static void ipo_editvertex_buts(uiBlock *block, SpaceIpo *si, float min, float m
 	median[0]= median[1]= median[2]= 0.0;
 	tot= 0;
 	
+	/* use G.sipo->from (which should be an object) so that pinning ipo's will still work ok */
+	if((G.sipo->from) && (GS(G.sipo->from->name) == ID_OB))
+		ob= (Object *)(G.sipo->from);
+	else
+		ob= OBACT;
+	
 	ei= G.sipo->editipo;
 	for(a=0; a<G.sipo->totipo; a++, ei++) {
 		
diff --git a/source/blender/src/drawobject.c b/source/blender/src/drawobject.c
index 045b98bb784..96ba8c71755 100644
--- a/source/blender/src/drawobject.c
+++ b/source/blender/src/drawobject.c
@@ -2885,7 +2885,7 @@ static int drawDispList(Base *base, int dt)
 /* 5. start filling the arrays				*/
 /* 6. draw the arrays						*/
 /* 7. clean up								*/
-static void draw_new_particle_system(Base *base, ParticleSystem *psys)
+static void draw_new_particle_system(Base *base, ParticleSystem *psys, int dt)
 {
 	View3D *v3d= G.vd;
 	Object *ob=base->object;
@@ -2902,7 +2902,7 @@ static void draw_new_particle_system(Base *base, ParticleSystem *psys)
 	float *vdata=0, *vedata=0, *cdata=0, *ndata=0, *vd=0, *ved=0, *cd=0, *nd=0, xvec[3], yvec[3], zvec[3];
 	int a, k, k_max=0, totpart, totpoint=0, draw_as, path_nbr=0;
 	int path_possible=0, keys_possible=0, draw_keys=0, totchild=0;
-	int select=ob->flag&SELECT;
+	int select=ob->flag&SELECT, create_cdata=0;
 	GLint polygonmode[2];
 	char val[32];
 
@@ -2956,8 +2956,10 @@ static void draw_new_particle_system(Base *base, ParticleSystem *psys)
 
 	if(select)
 		cpack(0xFFFFFF);
-	else if((ma) && (part->draw&PART_DRAW_MAT_COL))
+	else if((ma) && (part->draw&PART_DRAW_MAT_COL)) {
 		glColor3f(ma->r,ma->g,ma->b);
+		create_cdata = 1;
+	}
 	else
 		cpack(0);
 
@@ -3065,19 +3067,25 @@ static void draw_new_particle_system(Base *base, ParticleSystem *psys)
 		if(draw_as!=PART_DRAW_CIRC){
 			switch(draw_as){
 				case PART_DRAW_AXIS:
-					cdata=MEM_callocN((totpart+totchild)*(path_nbr+1)*6*3*sizeof(float), "particle_cdata");
-					/* no break! */
 				case PART_DRAW_CROSS:
+					if(draw_as!=PART_DRAW_CROSS || create_cdata)
+						cdata=MEM_callocN((totpart+totchild)*(path_nbr+1)*6*3*sizeof(float), "particle_cdata");
 					vdata=MEM_callocN((totpart+totchild)*(path_nbr+1)*6*3*sizeof(float), "particle_vdata");
 					break;
 				case PART_DRAW_LINE:
+					if(create_cdata)
+						cdata=MEM_callocN((totpart+totchild)*(path_nbr+1)*2*3*sizeof(float), "particle_cdata");
 					vdata=MEM_callocN((totpart+totchild)*(path_nbr+1)*2*3*sizeof(float), "particle_vdata");
 					break;
 				case PART_DRAW_BB:
+					if(create_cdata)
+						cdata=MEM_callocN((totpart+totchild)*(path_nbr+1)*4*3*sizeof(float), "particle_cdata");
 					vdata=MEM_callocN((totpart+totchild)*(path_nbr+1)*4*3*sizeof(float), "particle_vdata");
 					ndata=MEM_callocN((totpart+totchild)*(path_nbr+1)*4*3*sizeof(float), "particle_vdata");
 					break;
 				default:
+					if(create_cdata)
+						cdata=MEM_callocN((totpart+totchild)*(path_nbr+1)*3*sizeof(float), "particle_cdata");
 					vdata=MEM_callocN((totpart+totchild)*(path_nbr+1)*3*sizeof(float), "particle_vdata");
 			}
 		}
@@ -3102,9 +3110,17 @@ static void draw_new_particle_system(Base *base, ParticleSystem *psys)
 
 				pa_time=(cfra-pa->time)/pa->lifetime;
 
-				if((part->flag&PART_ABS_TIME)==0 && part->ipo){
-					calc_ipo(part->ipo, 100*pa_time);
-					execute_ipo((ID *)part, part->ipo);
+				if((part->flag&PART_ABS_TIME)==0){				
+					if(ma && ma->ipo){
+						/* correction for lifetime */
+						calc_ipo(ma->ipo, 100.0f*pa_time);
+						execute_ipo((ID *)ma, ma->ipo);
+					}
+					if(part->ipo) {
+						/* correction for lifetime */
+						calc_ipo(part->ipo, 100*pa_time);
+						execute_ipo((ID *)part, part->ipo);
+					}
 				}
 
 				pa_size=pa->size;
@@ -3121,9 +3137,17 @@ static void draw_new_particle_system(Base *base, ParticleSystem *psys)
 
 				pa_time=psys_get_child_time(psys,cpa,cfra);
 
-				if((part->flag&PART_ABS_TIME)==0 && part->ipo){
-					calc_ipo(part->ipo, 100*pa_time);
-					execute_ipo((ID *)part, part->ipo);
+				if((part->flag&PART_ABS_TIME)==0) {
+					if(ma && ma->ipo){
+						/* correction for lifetime */
+						calc_ipo(ma->ipo, 100.0f*pa_time);
+						execute_ipo((ID *)ma, ma->ipo);
+					}
+					if(part->ipo) {
+						/* correction for lifetime */
+						calc_ipo(part->ipo, 100*pa_time);
+						execute_ipo((ID *)part, part->ipo);
+					}
 				}
 
 				pa_size=psys_get_child_size(psys,cpa,cfra,0);
@@ -3161,6 +3185,12 @@ static void draw_new_particle_system(Base *base, ParticleSystem *psys)
 
 					switch(draw_as){
 						case PART_DRAW_DOT:
+							if(cd) {
+								cd[0]=ma->r;
+								cd[1]=ma->g;
+								cd[2]=ma->b;
+								cd+=3;
+							}
 							if(vd){
 								VECCOPY(vd,state.co) vd+=3;
 							}
@@ -3181,7 +3211,15 @@ static void draw_new_particle_system(Base *base, ParticleSystem *psys)
 
 								VECCOPY(vec2,state.co);
 							}
-							else VECSUB(vec2,state.co,vec);
+							else {
+								if(cd) {
+									cd[0]=cd[3]=cd[6]=cd[9]=cd[12]=cd[15]=ma->r;
+									cd[1]=cd[4]=cd[7]=cd[10]=cd[13]=cd[16]=ma->g;
+									cd[2]=cd[5]=cd[8]=cd[11]=cd[14]=cd[17]=ma->b;
+									cd+=18;
+								}
+								VECSUB(vec2,state.co,vec);
+							}
 
 							VECADD(vec,state.co,vec);
 							VECCOPY(vd,vec); vd+=3;
@@ -3219,11 +3257,25 @@ static void draw_new_particle_system(Base *base, ParticleSystem *psys)
 								VecMulf(vec,VecLength(state.vel));
 							VECADDFAC(vd,state.co,vec,-part->draw_line[0]); vd+=3;
 							VECADDFAC(vd,state.co,vec,part->draw_line[1]); vd+=3;
+							if(cd) {
+								cd[0]=cd[3]=ma->r;
+								cd[1]=cd[4]=ma->g;
+								cd[2]=cd[5]=ma->b;
+								cd+=3;
+							}
 							break;
 						case PART_DRAW_CIRC:
+							if(create_cdata)
+								glColor3f(ma->r,ma->g,ma->b);
 							drawcircball(GL_LINE_LOOP, state.co, pixsize, imat);
 							break;
 						case PART_DRAW_BB:
+							if(cd) {
+								cd[0]=cd[3]=cd[6]=cd[9]=ma->r;
+								cd[1]=cd[4]=cd[7]=cd[10]=ma->g;
+								cd[2]=cd[5]=cd[8]=cd[11]=ma->b;
+								cd+=12;
+							}
 							if(part->draw&PART_DRAW_BB_LOCK && part->bb_align==PART_BB_VIEW){
 								VECCOPY(xvec,bb_ob->obmat[0]);
 								Normalize(xvec);
@@ -3334,14 +3386,24 @@ static void draw_new_particle_system(Base *base, ParticleSystem *psys)
 				float *cd2=0,*cdata2=0;
 
 				glEnableClientState(GL_VERTEX_ARRAY);
-				glEnableClientState(GL_NORMAL_ARRAY);
-				glEnable(GL_LIGHTING);
 
-				glColorMaterial(GL_FRONT_AND_BACK, GL_DIFFUSE);
-				glEnable(GL_COLOR_MATERIAL);
+				if(dt > OB_WIRE) {
+					glEnableClientState(GL_NORMAL_ARRAY);
 
-				if(part->draw&PART_DRAW_MAT_COL)
-					glEnableClientState(GL_COLOR_ARRAY);
+					if(part->draw&PART_DRAW_MAT_COL)
+						glEnableClientState(GL_COLOR_ARRAY);
+
+					glEnable(GL_LIGHTING);
+					glColorMaterial(GL_FRONT_AND_BACK, GL_DIFFUSE);
+					glEnable(GL_COLOR_MATERIAL);
+				}
+				else {
+					glDisableClientState(GL_NORMAL_ARRAY);
+
+					glDisable(GL_COLOR_MATERIAL);
+					glDisable(GL_LIGHTING);
+					BIF_ThemeColor(TH_WIRE);
+				}
 
 				if(totchild && (part->draw&PART_DRAW_PARENT)==0)
 					totpart=0;
@@ -3350,9 +3412,13 @@ static void draw_new_particle_system(Base *base, ParticleSystem *psys)
 				for(a=0, pa=psys->particles; a<totpart; a++, pa++){
 					path=cache[a];
 					glVertexPointer(3, GL_FLOAT, sizeof(ParticleCacheKey), path->co);
-					glNormalPointer(GL_FLOAT, sizeof(ParticleCacheKey), path->vel);
-					if(part->draw&PART_DRAW_MAT_COL)
-						glColorPointer(3, GL_FLOAT, sizeof(ParticleCacheKey), path->col);
+
+					if(dt > OB_WIRE) {
+						glNormalPointer(GL_FLOAT, sizeof(ParticleCacheKey), path->vel);
+						if(part->draw&PART_DRAW_MAT_COL)
+							glColorPointer(3, GL_FLOAT, sizeof(ParticleCacheKey), path->col);
+					}
+
 					glDrawArrays(GL_LINE_STRIP, 0, path->steps + 1);
 				}
 				
@@ -3360,15 +3426,21 @@ static void draw_new_particle_system(Base *base, ParticleSystem *psys)
 				for(a=0; a<totchild; a++){
 					path=cache[a];
 					glVertexPointer(3, GL_FLOAT, sizeof(ParticleCacheKey), path->co);
-					glNormalPointer(GL_FLOAT, sizeof(ParticleCacheKey), path->vel);
-					if(part->draw&PART_DRAW_MAT_COL)
-						glColorPointer(3, GL_FLOAT, sizeof(ParticleCacheKey), path->col);
+
+					if(dt > OB_WIRE) {
+						glNormalPointer(GL_FLOAT, sizeof(ParticleCacheKey), path->vel);
+						if(part->draw&PART_DRAW_MAT_COL)
+							glColorPointer(3, GL_FLOAT, sizeof(ParticleCacheKey), path->col);
+					}
+
 					glDrawArrays(GL_LINE_STRIP, 0, path->steps + 1);
 				}
 
-				if(part->draw&PART_DRAW_MAT_COL)
-					glDisable(GL_COLOR_ARRAY);
-				glDisable(GL_COLOR_MATERIAL);
+				if(dt > OB_WIRE) {
+					if(part->draw&PART_DRAW_MAT_COL)
+						glDisable(GL_COLOR_ARRAY);
+					glDisable(GL_COLOR_MATERIAL);
+				}
 
 				if(cdata2)
 					MEM_freeN(cdata2);
@@ -3389,7 +3461,7 @@ static void draw_new_particle_system(Base *base, ParticleSystem *psys)
 				else
 					glDisableClientState(GL_VERTEX_ARRAY);
 
-				if(ndata && MIN2(G.vd->drawtype, ob->dt)>OB_WIRE){
+				if(ndata && dt>OB_WIRE){
 					glEnableClientState(GL_NORMAL_ARRAY);
 					glNormalPointer(GL_FLOAT, 0, ndata);
 					glEnable(GL_LIGHTING);
@@ -3399,20 +3471,21 @@ static void draw_new_particle_system(Base *base, ParticleSystem *psys)
 					glDisable(GL_LIGHTING);
 				}
 
+				if(cdata){
+					glEnableClientState(GL_COLOR_ARRAY);
+					glColorPointer(3, GL_FLOAT, 0, cdata);
+				}
+
 				switch(draw_as){
 					case PART_DRAW_AXIS:
 					case PART_DRAW_CROSS:
-						if(cdata){
-							glEnableClientState(GL_COLOR_ARRAY);
-							glColorPointer(3, GL_FLOAT, 0, cdata);
-						}
 						glDrawArrays(GL_LINES, 0, 6*totpoint);
 						break;
 					case PART_DRAW_LINE:
 						glDrawArrays(GL_LINES, 0, 2*totpoint);
 						break;
 					case PART_DRAW_BB:
-						if(MIN2(G.vd->drawtype, ob->dt)<=OB_WIRE)
+						if(dt<=OB_WIRE)
 							glPolygonMode(GL_FRONT_AND_BACK,GL_LINE);
 
 						glDrawArrays(GL_QUADS, 0, 4*totpoint);
@@ -3466,7 +3539,7 @@ static void draw_new_particle_system(Base *base, ParticleSystem *psys)
 	mymultmatrix(ob->obmat);	// bring back local matrix for dtx
 }
 
-static void draw_particle_edit(Object *ob, ParticleSystem *psys)
+static void draw_particle_edit(Object *ob, ParticleSystem *psys, int dt)
 {
 	ParticleEdit *edit = psys->edit;
 	ParticleData *pa;
@@ -3479,6 +3552,7 @@ static void draw_particle_edit(Object *ob, ParticleSystem *psys)
 	float nosel_col[3];
 	char val[32];
 
+	/* create path and child path cache if it doesn't exist already */
 	if(psys->pathcache==0){
 		PE_hide_keys_time(psys,CFRA);
 		psys_cache_paths(ob,psys,CFRA,0);
@@ -3493,11 +3567,13 @@ static void draw_particle_edit(Object *ob, ParticleSystem *psys)
 	else if(!(pset->flag & PE_SHOW_CHILD) && psys->childcache)
 		free_child_path_cache(psys);
 
+	/* opengl setup */
 	if((G.vd->flag & V3D_ZBUF_SELECT)==0)
 		glDisable(GL_DEPTH_TEST);
 
 	myloadmatrix(G.vd->viewmat);
 
+	/* get selection theme colors */
 	BIF_GetThemeColor3ubv(TH_VERTEX_SELECT, sel);
 	BIF_GetThemeColor3ubv(TH_VERTEX, nosel);
 	sel_col[0]=(float)sel[0]/255.0f;
@@ -3511,41 +3587,61 @@ static void draw_particle_edit(Object *ob, ParticleSystem *psys)
 		totchild = psys->totchildcache;
 
 	/* draw paths */
-	glEnableClientState(GL_VERTEX_ARRAY);
-	glEnableClientState(GL_NORMAL_ARRAY);
-	glEnableClientState(GL_COLOR_ARRAY);
 	if(timed)
 		glEnable(GL_BLEND);
 
-	if(pset->brushtype == PE_BRUSH_WEIGHT){
-		glLineWidth(2.0f);
+	glEnableClientState(GL_VERTEX_ARRAY);
+
+	if(dt > OB_WIRE) {
+		/* 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);
+		BIF_ThemeColor(TH_WIRE);
 	}
 
-	glColorMaterial(GL_FRONT_AND_BACK, GL_DIFFUSE);
-	glEnable(GL_COLOR_MATERIAL);
+	/* only draw child paths with lighting */
+	if(dt > OB_WIRE)
+		glEnable(GL_LIGHTING);
 
-	for(i=0, pa=psys->particles, path = psys->pathcache; i<totpart; i++, pa++, path++){
-		glVertexPointer(3, GL_FLOAT, sizeof(ParticleCacheKey), (*path)->co);
-		glNormalPointer(GL_FLOAT, sizeof(ParticleCacheKey), (*path)->vel);
-		glColorPointer(3, GL_FLOAT, sizeof(ParticleCacheKey), (*path)->col);
-
-		glDrawArrays(GL_LINE_STRIP, 0, (int)(*path)->steps + 1);
-	}
-
-	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);
-			glNormalPointer(GL_FLOAT, sizeof(ParticleCacheKey), (*path)->vel);
-			glColorPointer(3, GL_FLOAT, sizeof(ParticleCacheKey), (*path)->col);
+			if(dt > OB_WIRE) {
+				glNormalPointer(GL_FLOAT, sizeof(ParticleCacheKey), (*path)->vel);
+				glColorPointer(3, GL_FLOAT, sizeof(ParticleCacheKey), (*path)->col);
+			}
 
 			glDrawArrays(GL_LINE_STRIP, 0, (int)(*path)->steps + 1);
 		}
 	}
 
-	glDisable(GL_COLOR_MATERIAL);
+	if(dt > OB_WIRE)
+		glDisable(GL_LIGHTING);
+
+	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(G.scene->selectmode!=SCE_SELECT_PATH){
@@ -3619,6 +3715,7 @@ static void draw_particle_edit(Object *ob, ParticleSystem *psys)
 
 	glDisable(GL_BLEND);
 	glDisable(GL_LIGHTING);
+	glDisable(GL_COLOR_MATERIAL);
 	glDisableClientState(GL_COLOR_ARRAY);
 	glEnableClientState(GL_NORMAL_ARRAY);
 	glEnable(GL_DEPTH_TEST);
@@ -5011,12 +5108,12 @@ void draw_object(Base *base, int flag)
 		glDepthMask(GL_FALSE);
 		
 		for(psys=ob->particlesystem.first; psys; psys=psys->next)
-			draw_new_particle_system(base, psys);
+			draw_new_particle_system(base, psys, dt);
 		
 		if(G.f & G_PARTICLEEDIT && ob==OBACT) {
 			psys= PE_get_current(ob);
 			if(psys && !G.obedit && psys_in_edit_mode(psys))
-				draw_particle_edit(ob, psys);
+				draw_particle_edit(ob, psys, dt);
 		}
 		glDepthMask(GL_TRUE); 
 		if(col) cpack(col);
diff --git a/source/blender/src/drawseq.c b/source/blender/src/drawseq.c
index e979f6e16fc..e554b91dd52 100644
--- a/source/blender/src/drawseq.c
+++ b/source/blender/src/drawseq.c
@@ -691,7 +691,7 @@ static void draw_seq_strip(Sequence *seq, ScrArea *sa, SpaceSeq *sseq, int outli
 	
 	/* draw the main strip body */
 	if (is_single_image) /* single image */
-		draw_shadedstrip(seq, col, seq_tx_get_final_left(seq), y1, seq_tx_get_final_right(seq), y2);
+		draw_shadedstrip(seq, col, seq_tx_get_final_left(seq, 0), y1, seq_tx_get_final_right(seq, 0), y2);
 	else /* normal operation */
 		draw_shadedstrip(seq, col, x1, y1, x2, y2);
 	
diff --git a/source/blender/src/drawview.c b/source/blender/src/drawview.c
index 52e0d3d6f05..deb7ddc068d 100644
--- a/source/blender/src/drawview.c
+++ b/source/blender/src/drawview.c
@@ -2154,6 +2154,7 @@ void do_viewbuts(unsigned short event)
 			}
 			allqueue(REDRAWVIEW3D, 1);
 			allqueue(REDRAWBUTSOBJECT, 0);
+			allqueue(REDRAWOOPS, 0);
 		}
 		break;
 		
@@ -3732,18 +3733,22 @@ int play_anim(int mode)
 					else viewmove(0);
 				}
 			} else if (event==WHEELDOWNMOUSE || (val && event==PADMINUS)) { /* copied from persptoetsen */
-				/* this min and max is also in viewmove() */
-				if(G.vd->persp==V3D_CAMOB) {
-					G.vd->camzoom-= 10;
-					if(G.vd->camzoom<-30) G.vd->camzoom= -30;
+				if (G.vd) { /* when using the sequencer this can be NULL */
+					/* this min and max is also in viewmove() */ 
+					if(G.vd->persp==V3D_CAMOB) {
+						G.vd->camzoom-= 10;
+						if(G.vd->camzoom<-30) G.vd->camzoom= -30;
+					}
+					else if(G.vd->dist<10.0*G.vd->far) G.vd->dist*=1.2f;
 				}
-				else if(G.vd->dist<10.0*G.vd->far) G.vd->dist*=1.2f;
 			} else if (event==WHEELUPMOUSE || (val && event==PADPLUSKEY)) { /* copied from persptoetsen */
-				if(G.vd->persp==V3D_CAMOB) {
-					G.vd->camzoom+= 10;
-					if(G.vd->camzoom>300) G.vd->camzoom= 300;
+				if (G.vd) {
+					if(G.vd->persp==V3D_CAMOB) {
+						G.vd->camzoom+= 10;
+						if(G.vd->camzoom>300) G.vd->camzoom= 300;
+					}
+					else if(G.vd->dist> 0.001*G.vd->grid) G.vd->dist*=.83333f;
 				}
-				else if(G.vd->dist> 0.001*G.vd->grid) G.vd->dist*=.83333f;
 			} else if(event==MKEY) {
 				if(val) add_marker(CFRA-1);
 			}
diff --git a/source/blender/src/editaction.c b/source/blender/src/editaction.c
index 12b9cb8919f..40b6b7ba6fe 100644
--- a/source/blender/src/editaction.c
+++ b/source/blender/src/editaction.c
@@ -1485,7 +1485,7 @@ void insertkey_action(void)
 	data= get_action_context(&datatype);
 	if (data == NULL) return;
 	cfra = frame_to_float(CFRA);
-		
+	
 	if (datatype == ACTCONT_ACTION) {
 		ListBase act_data = {NULL, NULL};
 		bActListElem *ale;
@@ -1941,6 +1941,7 @@ void paste_actdata ()
 	int filter;
 	void *data;
 	short datatype;
+	Object *ob= OBACT;
 	
 	short no_name= 0;
 	float offset = CFRA - actcopy_firstframe;
@@ -2017,7 +2018,7 @@ void paste_actdata ()
 		
 		/* loop over curves, pasting keyframes */
 		for (ico= ipo_src->curve.first; ico; ico= ico->next) {
-			icu= verify_ipocurve((ID*)OBACT, ico->blocktype, actname, conname, "", ico->adrcode);
+			icu= verify_ipocurve((ID*)ob, ico->blocktype, actname, conname, "", ico->adrcode);
 			
 			if (icu) {
 				/* just start pasting, with the the first keyframe on the current frame, and so on */
@@ -2045,6 +2046,14 @@ void paste_actdata ()
 	/* free temp memory */
 	BLI_freelistN(&act_data);
 	
+	/* do depsgraph updates (for 3d-view)? */
+	if ((ob) && (G.saction->pin==0)) {
+		if (ob->type == OB_ARMATURE)
+			DAG_object_flush_update(G.scene, ob, OB_RECALC_OB|OB_RECALC_DATA);
+		else
+			DAG_object_flush_update(G.scene, ob, OB_RECALC_OB);
+	}
+	
 	/* undo and redraw stuff */
 	allqueue(REDRAWVIEW3D, 0);
 	allspace(REMAKEIPO, 0);
diff --git a/source/blender/src/editarmature.c b/source/blender/src/editarmature.c
index c166a9df762..39f93510358 100644
--- a/source/blender/src/editarmature.c
+++ b/source/blender/src/editarmature.c
@@ -2396,6 +2396,7 @@ void fill_bones_armature(void)
 	else if (count == 2) {
 		EditBonePoint *ebp, *ebp2;
 		float head[3], tail[3];
+		short headtail = 0;
 		
 		/* check that the points don't belong to the same bone */
 		ebp= (EditBonePoint *)points.first;
@@ -2420,7 +2421,7 @@ void fill_bones_armature(void)
 			float distA, distB;
 			
 			/* get cursor location */
-			VECCOPY (curs, give_cursor());	
+			VECCOPY(curs, give_cursor());	
 			
 			Mat4Invert(G.obedit->imat, G.obedit->obmat);
 			Mat4MulVecfl(G.obedit->imat, curs);
@@ -2432,26 +2433,47 @@ void fill_bones_armature(void)
 			distB= VecLength(vecB);
 			
 			/* compare distances - closer one therefore acts as direction for bone to go */
-			if (distA < distB) {
-				VECCOPY(head, ebp2->vec);
-				VECCOPY(tail, ebp->vec);
-			}
-			else {
-				VECCOPY(head, ebp->vec);
-				VECCOPY(tail, ebp2->vec);
-			}
+			headtail= (distA < distB) ? 2 : 1;
 		}
 		else if (ebp->head_owner) {
+			headtail = 1;
+		}
+		else if (ebp2->head_owner) {
+			headtail = 2;
+		}
+		
+		/* assign head/tail combinations */
+		if (headtail == 2) {
 			VECCOPY(head, ebp->vec);
 			VECCOPY(tail, ebp2->vec);
 		}
-		else if (ebp2->head_owner) {
+		else if (headtail == 1) {
 			VECCOPY(head, ebp2->vec);
 			VECCOPY(tail, ebp->vec);
 		}
 		
-		/* add new bone */
-		newbone= add_points_bone(head, tail);
+		/* add new bone and parent it to the appropriate end */
+		if (headtail) {
+			newbone= add_points_bone(head, tail);
+			
+			/* do parenting (will need to set connected flag too) */
+			if (headtail == 2) {
+				/* ebp tail or head - tail gets priority */
+				if (ebp->tail_owner)
+					newbone->parent= ebp->tail_owner;
+				else
+					newbone->parent= ebp->head_owner;
+			}
+			else {
+				/* ebp2 tail or head - tail gets priority */
+				if (ebp2->tail_owner)
+					newbone->parent= ebp2->tail_owner;
+				else
+					newbone->parent= ebp2->head_owner;
+			}
+			
+			newbone->flag |= BONE_CONNECTED;
+		}
 	}
 	else {
 		// FIXME.. figure out a method for multiple bones
diff --git a/source/blender/src/editmesh_tools.c b/source/blender/src/editmesh_tools.c
index d4ebe181218..f9bb14a08c6 100644
--- a/source/blender/src/editmesh_tools.c
+++ b/source/blender/src/editmesh_tools.c
@@ -4497,8 +4497,7 @@ void bevel_menu() {
 	while(G.editBMesh->options & BME_BEVEL_RUNNING) {
 		options = G.editBMesh->options;
 		res = G.editBMesh->res;
-		bm = BME_make_mesh();
-		bm = BME_editmesh_to_bmesh(G.editMesh, bm);
+		bm = BME_editmesh_to_bmesh(G.editMesh);
 		BIF_undo_push("Pre-Bevel");
 		free_editMesh(G.editMesh);
 		BME_bevel(bm,0.1f,res,options,0,0,&td);
diff --git a/source/blender/src/editnode.c b/source/blender/src/editnode.c
index afafc4f2590..4c7334c55e0 100644
--- a/source/blender/src/editnode.c
+++ b/source/blender/src/editnode.c
@@ -166,13 +166,14 @@ static void snode_handle_recalc(SpaceNode *snode)
 			snode->nodetree->test_break= NULL;
 			waitcursor(0);
 			
-			allqueue(REDRAWNODE, 1);
 			allqueue(REDRAWIMAGE, 1);
 			if(G.scene->r.scemode & R_DOCOMP) {
 				BIF_redraw_render_rect();	/* seems to screwup display? */
 				mywinset(curarea->win);
 			}
 		}
+
+		allqueue(REDRAWNODE, 1);
 	}
 }
 
@@ -2381,14 +2382,14 @@ void winqreadnodespace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			}
 			else {
 				
-				if(G.qual &  LR_CTRLKEY) {
-					gesture();
-				} else {
-					if(node_add_link(snode)==0)
-						if(node_mouse_groupheader(snode)==0)
-							if(node_mouse_select(snode, event)==0)
-								node_border_link_delete(snode);
-				}
+				if(G.qual & LR_CTRLKEY)
+					if(gesture())
+						break;
+					
+				if(node_add_link(snode)==0)
+					if(node_mouse_groupheader(snode)==0)
+						if(node_mouse_select(snode, event)==0)
+							node_border_link_delete(snode);
 			}
 			break;
 			
diff --git a/source/blender/src/editseq.c b/source/blender/src/editseq.c
index bb706f1aa3f..fb0fac4489d 100644
--- a/source/blender/src/editseq.c
+++ b/source/blender/src/editseq.c
@@ -184,13 +184,24 @@ int seq_tx_get_end(Sequence *seq)
 	return seq->start+seq->len;
 }
 
-int seq_tx_get_final_left(Sequence *seq)
+int seq_tx_get_final_left(Sequence *seq, int metaclip)
 {
-	return (seq->start - seq->startstill) + seq->startofs;
+	if (metaclip && seq->tmp) {
+		/* return the range clipped by the parents range */
+		return MAX2( seq_tx_get_final_left(seq, 0), seq_tx_get_final_left((Sequence *)seq->tmp, 1) );
+	} else {
+		return (seq->start - seq->startstill) + seq->startofs;
+	}
+	
 }
-int  seq_tx_get_final_right(Sequence *seq)
+int seq_tx_get_final_right(Sequence *seq, int metaclip)
 {
-	return ((seq->start+seq->len) + seq->endstill) - seq->endofs;
+	if (metaclip && seq->tmp) {
+		/* return the range clipped by the parents range */
+		return MIN2( seq_tx_get_final_right(seq, 0), seq_tx_get_final_right((Sequence *)seq->tmp, 1) );
+	} else {
+		return ((seq->start+seq->len) + seq->endstill) - seq->endofs;	
+	}
 }
 
 void seq_tx_set_final_left(Sequence *seq, int val)
@@ -260,12 +271,12 @@ static void fix_single_image_seq(Sequence *seq)
 	
 	/* make sure the image is always at the start since there is only one,
 	   adjusting its start should be ok */
-	left = seq_tx_get_final_left(seq);
+	left = seq_tx_get_final_left(seq, 0);
 	start = seq->start;
 	if (start != left) {
 		offset = left - start;
-		seq_tx_set_final_left( seq, seq_tx_get_final_left(seq) - offset );
-		seq_tx_set_final_right( seq, seq_tx_get_final_right(seq) - offset );
+		seq_tx_set_final_left( seq, seq_tx_get_final_left(seq, 0) - offset );
+		seq_tx_set_final_right( seq, seq_tx_get_final_right(seq, 0) - offset );
 		seq->start += offset;
 	}
 }
@@ -2927,34 +2938,34 @@ static int seq_get_snaplimit(void)
 static void transform_grab_xlimits(Sequence *seq, int leftflag, int rightflag)
 {
 	if(leftflag) {
-		if (seq_tx_get_final_left(seq) >= seq_tx_get_final_right(seq)) {
-			seq_tx_set_final_left(seq, seq_tx_get_final_right(seq)-1);
+		if (seq_tx_get_final_left(seq, 0) >= seq_tx_get_final_right(seq, 0)) {
+			seq_tx_set_final_left(seq, seq_tx_get_final_right(seq, 0)-1);
 		}
 		
 		if (check_single_seq(seq)==0) {
-			if (seq_tx_get_final_left(seq) >= seq_tx_get_end(seq)) {
+			if (seq_tx_get_final_left(seq, 0) >= seq_tx_get_end(seq)) {
 				seq_tx_set_final_left(seq, seq_tx_get_end(seq)-1);
 			}
 			
 			/* dosnt work now - TODO */
 			/*
-			if (seq_tx_get_start(seq) >= seq_tx_get_final_right(seq)) {
+			if (seq_tx_get_start(seq) >= seq_tx_get_final_right(seq, 0)) {
 				int ofs;
-				ofs = seq_tx_get_start(seq) - seq_tx_get_final_right(seq);
+				ofs = seq_tx_get_start(seq) - seq_tx_get_final_right(seq, 0);
 				seq->start -= ofs;
-				seq_tx_set_final_left(seq, seq_tx_get_final_left(seq) + ofs );
+				seq_tx_set_final_left(seq, seq_tx_get_final_left(seq, 0) + ofs );
 			}*/
 			
 		}
 	}
 	
 	if(rightflag) {
-		if (seq_tx_get_final_right(seq) <=  seq_tx_get_final_left(seq)) {
-			seq_tx_set_final_right(seq, seq_tx_get_final_left(seq)+1);
+		if (seq_tx_get_final_right(seq, 0) <=  seq_tx_get_final_left(seq, 0)) {
+			seq_tx_set_final_right(seq, seq_tx_get_final_left(seq, 0)+1);
 		}
 									
 		if (check_single_seq(seq)==0) {
-			if (seq_tx_get_final_right(seq) <= seq_tx_get_start(seq)) {
+			if (seq_tx_get_final_right(seq, 0) <= seq_tx_get_start(seq)) {
 				seq_tx_set_final_right(seq, seq_tx_get_start(seq)+1);
 			}
 		}
@@ -3033,9 +3044,24 @@ void transform_seq(int mode, int context)
 		for(seq_index=0, seq=seqar[0]; seq_index < totseq_index; seq=seqar[++seq_index]) {
 			if((seq->flag & SELECT) && !(seq->depth==0 && seq->flag & SEQ_LOCK)) 
 				totstrip++;
+			/* only needed for extend but can set here anyway since were alredy looping */
+			seq->tmp= NULL;
 		}
 	}
 	
+	/* for extending we need the metastrip clipped left/right values, set the metastrips as parents in seq->tmp */
+	if (mode=='e') {
+		Sequence *meta_seq;
+		for(seq_index=0, seq=seqar[0]; seq_index < totseq_index; seq=seqar[++seq_index]) {
+			if (seq->type == SEQ_META) {
+				for (meta_seq = seq->seqbase.first; meta_seq; meta_seq= meta_seq->next){
+					meta_seq->tmp= (void *)seq;
+				}
+			}
+		}
+	}
+	
+	
 	if (sseq->flag & SEQ_MARKER_TRANS) {
 		for(marker= G.scene->markers.first; marker; marker= marker->next) {
 			if(marker->flag & SELECT) totmark++;
@@ -3064,8 +3090,8 @@ void transform_seq(int mode, int context)
 			
 			/* for extend only */
 			if (mode=='e') {
-				ts->final_left = seq_tx_get_final_left(seq);
-				ts->final_right = seq_tx_get_final_right(seq);
+				ts->final_left = seq_tx_get_final_left(seq, 1);
+				ts->final_right = seq_tx_get_final_right(seq, 1);
 			}
 			ts++;
 		}
@@ -3151,9 +3177,9 @@ void transform_seq(int mode, int context)
 				snap_point_num=0;
 				if (last_seq && (last_seq->flag & SELECT)) { /* active seq bounds */
 					if(seq_tx_check_left(last_seq))
-						snap_points[snap_point_num++] = seq_tx_get_final_left(last_seq);
+						snap_points[snap_point_num++] = seq_tx_get_final_left(last_seq, 0);
 					if(seq_tx_check_right(last_seq))
-						snap_points[snap_point_num++] = seq_tx_get_final_right(last_seq);
+						snap_points[snap_point_num++] = seq_tx_get_final_right(last_seq, 0);
 					
 				}
 				if (totstrip > 1) { /* selection bounds */
@@ -3163,9 +3189,9 @@ void transform_seq(int mode, int context)
 					for(seq_index=0, seq=seqar[0]; seq_index < totseq_index; seq=seqar[++seq_index]) {
 						if(seq->flag & SELECT) {
 							if(seq_tx_check_left(seq))
-								bounds_left		= MIN2(bounds_left,	seq_tx_get_final_left(seq));
+								bounds_left		= MIN2(bounds_left,	seq_tx_get_final_left(seq, 0));
 							if(seq_tx_check_right(seq))
-								bounds_right	= MAX2(bounds_right,seq_tx_get_final_right(seq));
+								bounds_right	= MAX2(bounds_right,seq_tx_get_final_right(seq, 0));
 						}
 					}
 					
@@ -3214,13 +3240,13 @@ void transform_seq(int mode, int context)
 				if (snap_dist && last_seq && seq_tx_check_left(last_seq)) {
 					seq = find_next_prev_sequence(last_seq, 1, 0); /* left */
 					if(seq && !seq_tx_check_right(seq))
-						TESTSNAP(seq_tx_get_final_right(seq));
+						TESTSNAP(seq_tx_get_final_right(seq, 0));
 				}
 				
 				if (snap_dist && last_seq && seq_tx_check_right(last_seq)) {
 					seq = find_next_prev_sequence(last_seq, 2, 0); /* right */
 					if(seq && !seq_tx_check_left(seq))
-						TESTSNAP(seq_tx_get_final_left(seq));
+						TESTSNAP(seq_tx_get_final_left(seq, 0));
 				}
 
 #undef TESTSNAP
@@ -3242,20 +3268,23 @@ void transform_seq(int mode, int context)
 				for(seq_index=0, seq=seqar[0]; seq_index < totseq_index; seq=seqar[++seq_index]) {
 					if(seq->flag & SELECT && !(seq->depth==0 && seq->flag & SEQ_LOCK)) {
 						int myofs;
+						/* flag, ignores lefsel/rightsel for nested strips */
+						int sel_flag = (seq->depth==0) ? seq->flag : seq->flag & ~(SEQ_LEFTSEL+SEQ_RIGHTSEL);
+						
 						// SEQ_DEBUG_INFO(seq);
 						
 						/* X Transformation */
-						if(seq->flag & SEQ_LEFTSEL) {
+						if((seq->depth==0) && (sel_flag & SEQ_LEFTSEL)) {
 							myofs = (ts->startofs - ts->startstill);
 							seq_tx_set_final_left(seq, ts->start + (myofs + ix));
 						}
-						if(seq->flag & SEQ_RIGHTSEL) {
+						if((seq->depth==0) && (sel_flag & SEQ_RIGHTSEL)) {
 							myofs = (ts->endstill - ts->endofs);
 							seq_tx_set_final_right(seq, ts->start + seq->len + (myofs + ix));
 						}
-						transform_grab_xlimits(seq, seq->flag & SEQ_LEFTSEL, seq->flag & SEQ_RIGHTSEL);
+						transform_grab_xlimits(seq, sel_flag & SEQ_LEFTSEL, sel_flag & SEQ_RIGHTSEL);
 						
-						if( (seq->flag & (SEQ_LEFTSEL+SEQ_RIGHTSEL))==0 ) {
+						if( (sel_flag & (SEQ_LEFTSEL+SEQ_RIGHTSEL))==0 ) {
 							if(sequence_is_free_transformable(seq)) seq->start= ts->start+ ix;
 
 							/* Y Transformation */
@@ -3300,8 +3329,8 @@ void transform_seq(int mode, int context)
 							
 							//SEQ_DEBUG_INFO(seq);
 							
-							final_left =	seq_tx_get_final_left(seq);
-							final_right =	seq_tx_get_final_right(seq);
+							final_left =	seq_tx_get_final_left(seq, 1);
+							final_right =	seq_tx_get_final_right(seq, 1);
 							
 							/* Only X Axis moving */
 							
@@ -3591,8 +3620,8 @@ void seq_separate_images(void)
 			BLI_remlink(ed->seqbasep, seq); 
 			if(seq->ipo) seq->ipo->id.us--;
 			
-			start_ofs = cfra = seq_tx_get_final_left(seq);
-			frame_end = seq_tx_get_final_right(seq);
+			start_ofs = cfra = seq_tx_get_final_left(seq, 0);
+			frame_end = seq_tx_get_final_right(seq, 0);
 			
 			while (cfra < frame_end) {
 				/* new seq */
diff --git a/source/blender/src/filesel.c b/source/blender/src/filesel.c
index 9689ffdafeb..2ba5745b19b 100644
--- a/source/blender/src/filesel.c
+++ b/source/blender/src/filesel.c
@@ -1591,7 +1591,7 @@ static void do_filesel_buttons(short event, SpaceFile *sfile)
 		BLI_del_slash(butname);
 		
 		if(sfile->type & FILE_UNIX) {
-			if (!BLI_exists(butname)) {
+			if (butname[0] != '\0' && !BLI_exists(butname)) {
 				if (okee("Makedir")) {
 					BLI_recurdir_fileops(butname);
 					if (!BLI_exists(butname)) parent(sfile);
diff --git a/source/blender/src/fluidsim.c b/source/blender/src/fluidsim.c
index a7361a9ffca..8b9c89656fb 100644
--- a/source/blender/src/fluidsim.c
+++ b/source/blender/src/fluidsim.c
@@ -481,6 +481,7 @@ void fluidsimBake(struct Object *ob)
 	struct Object *fsDomain = NULL;
 	FluidsimSettings *domainSettings;
 	struct Object *obit = NULL; /* object iterator */
+	Base *base;
 	int origFrame = G.scene->r.cfra;
 	char debugStrBuffer[256];
 	int dirExist = 0;
@@ -522,7 +523,7 @@ void fluidsimBake(struct Object *ob)
 	float *channelObjMove[256][3]; // object movments , 0=trans, 1=rot, 2=scale
 	float *channelObjInivel[256];    // initial velocities
 	float *channelObjActive[256];    // obj active channel
-
+	
 	if(getenv(strEnvName)) {
 		int dlevel = atoi(getenv(strEnvName));
 		elbeemSetDebugLevel(dlevel);
@@ -545,7 +546,6 @@ void fluidsimBake(struct Object *ob)
 
 	/* no object pointer, find in selected ones.. */
 	if(!ob) {
-		Base *base;
 		for(base=G.scene->base.first; base; base= base->next) {
 			if ( ((base)->flag & SELECT) 
 					// ignore layer setting for now? && ((base)->lay & G.vd->lay) 
@@ -561,8 +561,26 @@ void fluidsimBake(struct Object *ob)
 		if(!ob) return;
 	}
 
+	channelObjCount = 0;
+	for(base=G.scene->base.first; base; base= base->next) {
+		obit = base->object;
+		//{ snprintf(debugStrBuffer,256,"DEBUG object name=%s, type=%d ...\n", obit->id.name, obit->type); elbeemDebugOut(debugStrBuffer); } // DEBUG
+		if( (obit->fluidsimFlag & OB_FLUIDSIM_ENABLE) && 
+				(obit->type==OB_MESH) &&
+				(obit->fluidsimSettings->type != OB_FLUIDSIM_DOMAIN) &&  // if has to match 3 places! // CHECKMATCH
+				(obit->fluidsimSettings->type != OB_FLUIDSIM_PARTICLE) ) {
+			channelObjCount++;
+		}
+	}
+	
+	if (channelObjCount>=255) {
+		pupmenu("Fluidsim Bake Error%t|Cannot bake with more then 256 objects");
+		return;
+	}
+
 	/* check if there's another domain... */
-	for(obit= G.main->object.first; obit; obit= obit->id.next) {
+	for(base=G.scene->base.first; base; base= base->next) {
+		obit = base->object;
 		if((obit->fluidsimFlag & OB_FLUIDSIM_ENABLE)&&(obit->type==OB_MESH)) {
 			if(obit->fluidsimSettings->type == OB_FLUIDSIM_DOMAIN) {
 				if(obit != ob) {
@@ -605,7 +623,8 @@ void fluidsimBake(struct Object *ob)
 	
 	// check if theres any fluid
 	// abort baking if not...
-	for(obit= G.main->object.first; obit; obit= obit->id.next) {
+	for(base=G.scene->base.first; base; base= base->next) {
+		obit = base->object;
 		if( (obit->fluidsimFlag & OB_FLUIDSIM_ENABLE) && 
 				(obit->type==OB_MESH) && (
 			  (obit->fluidsimSettings->type == OB_FLUIDSIM_FLUID) ||
@@ -749,7 +768,8 @@ void fluidsimBake(struct Object *ob)
 	
 	// init obj movement channels
 	channelObjCount=0;
-	for(obit= G.main->object.first; obit; obit= obit->id.next) {
+	for(base=G.scene->base.first; base; base= base->next) {
+		obit = base->object;
 		//{ snprintf(debugStrBuffer,256,"DEBUG object name=%s, type=%d ...\n", obit->id.name, obit->type); elbeemDebugOut(debugStrBuffer); } // DEBUG
 		if( (obit->fluidsimFlag & OB_FLUIDSIM_ENABLE) && 
 				(obit->type==OB_MESH) &&
@@ -952,7 +972,8 @@ void fluidsimBake(struct Object *ob)
 		
 		// init objects
 		channelObjCount = 0;
-		for(obit= G.main->object.first; obit; obit= obit->id.next) {
+		for(base=G.scene->base.first; base; base= base->next) {
+			obit = base->object;
 			//{ snprintf(debugStrBuffer,256,"DEBUG object name=%s, type=%d ...\n", obit->id.name, obit->type); elbeemDebugOut(debugStrBuffer); } // DEBUG
 			if( (obit->fluidsimFlag & OB_FLUIDSIM_ENABLE) &&  // if has to match 3 places! // CHECKMATCH
 					(obit->type==OB_MESH) &&
diff --git a/source/blender/src/interface.c b/source/blender/src/interface.c
index ab8e53c3cb3..6582866d9a1 100644
--- a/source/blender/src/interface.c
+++ b/source/blender/src/interface.c
@@ -3394,6 +3394,7 @@ static int ui_do_but_HSVCUBE(uiBut *but)
 			/* we redraw the entire block */
 			for (bt= but->block->buttons.first; bt; bt= bt->next) {
 				if(but->poin == bt->poin) VECCOPY(bt->hsv, but->hsv);
+				ui_check_but(bt);
 				ui_draw_but(bt);
 			}
 			ui_block_flush_back(but->block);
diff --git a/source/blender/src/meshtools.c b/source/blender/src/meshtools.c
index e27e772edee..0f30aef04df 100644
--- a/source/blender/src/meshtools.c
+++ b/source/blender/src/meshtools.c
@@ -957,6 +957,12 @@ int *mesh_get_x_mirror_faces(Object *ob)
 		mirrormf.v3= mirrorverts[mf->v1];
 		mirrormf.v4= (mf->v4)? mirrorverts[mf->v4]: 0;
 
+		/* make sure v4 is not 0 if a quad */
+		if(mf->v4 && mirrormf.v4==0) {
+			SWAP(int, mirrormf.v1, mirrormf.v3);
+			SWAP(int, mirrormf.v2, mirrormf.v4);
+		}
+
 		hashmf= BLI_ghash_lookup(fhash, &mirrormf);
 		if(hashmf) {
 			mirrorfaces[a*2]= hashmf - mface;
@@ -1020,7 +1026,7 @@ void objects_bake_render_menu(void)
 {
 	short event;
 
-	event= pupmenu("Bake Selected Meshes %t|Full Render %x1|Ambient Occlusion %x2|Normals %x3|Texture Only %x4|Displacement %x5");
+	event= pupmenu("Bake Selected Meshes %t|Full Render %x1|Ambient Occlusion %x2|Normals %x3|Texture Only %x4|Displacement %x5|Shadow %x6");
 	if (event < 1) return;
 	objects_bake_render_ui(event);
 }
@@ -1056,7 +1062,8 @@ void objects_bake_render(short event, char **error_msg)
 		else if(event==2) event= RE_BAKE_AO;
 		else if(event==3) event= RE_BAKE_NORMALS;
 		else if(event==4) event= RE_BAKE_TEXTURE;
-		else event= RE_BAKE_DISPLACEMENT;
+		else if(event==5) event= RE_BAKE_DISPLACEMENT;
+		else event= RE_BAKE_SHADOW;
 
 		if(event==RE_BAKE_AO) {
 			if(G.scene->world==NULL) {
diff --git a/source/blender/src/space.c b/source/blender/src/space.c
index 1a32bd35eca..e38a8b040ff 100644
--- a/source/blender/src/space.c
+++ b/source/blender/src/space.c
@@ -2974,8 +2974,11 @@ static void winqreadipospace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 				do_ipo_selectbuttons();
 				doredraw= 1;
 			}
+			else if(G.qual == LR_CTRLKEY) {
+				if (sipo->showkey==0)
+					add_vert_ipo();
+			}
 			else if(view2dmove(LEFTMOUSE));	/* only checks for sliders */
-			else if((G.qual & LR_CTRLKEY) && (sipo->showkey==0)) add_vert_ipo();
 			else {
 				do {
 					getmouseco_areawin(mval);
@@ -5121,7 +5124,7 @@ static void init_seqspace(ScrArea *sa)
 	sseq->v2d.min[0]= 10.0;
 	sseq->v2d.min[1]= 4.0;
 
-	sseq->v2d.max[0]= 32000.0;
+	sseq->v2d.max[0]= MAXFRAMEF;
 	sseq->v2d.max[1]= MAXSEQ;
 	
 	sseq->v2d.minzoom= 0.1f;
diff --git a/source/blender/src/toets.c b/source/blender/src/toets.c
index 5b6af61949f..5f80f14d069 100644
--- a/source/blender/src/toets.c
+++ b/source/blender/src/toets.c
@@ -228,8 +228,8 @@ void persptoetsen(unsigned short event)
 	}
 	else {
 		/* Indicate that this view is not inverted.
-		 * Don't do this for PADMINUS/PADPLUSKEY, though. (jobbe)*/
-		if (event != PADMINUS && event != PADPLUSKEY)
+		 * Don't do this for PADMINUS/PADPLUSKEY/PAD5, though. (jobbe)*/
+		if (! ELEM3(event, PADMINUS, PADPLUSKEY, PAD5) )
 			G.vd->flag2 &= ~V3D_OPP_DIRECTION_NAME;
 		
 
diff --git a/source/blender/src/transform.c b/source/blender/src/transform.c
index 10035c61651..4f6c33b0a64 100644
--- a/source/blender/src/transform.c
+++ b/source/blender/src/transform.c
@@ -135,24 +135,23 @@ static void helpline(TransInfo *t, float *vec)
 	
 	getmouseco_areawin(mval);
 	projectFloatView(t, vecrot, cent);	// no overflow in extreme cases
-	if(cent[0]!=IS_CLIPPED) {
-		persp(PERSP_WIN);
-		
-		glDrawBuffer(GL_FRONT);
-		
-		BIF_ThemeColor(TH_WIRE);
-		
-		setlinestyle(3);
-		glBegin(GL_LINE_STRIP); 
-		glVertex2sv(mval); 
-		glVertex2fv(cent); 
-		glEnd();
-		setlinestyle(0);
-		
-		persp(PERSP_VIEW);
-		bglFlush(); // flush display for frontbuffer
-		glDrawBuffer(GL_BACK);
-	}
+
+	persp(PERSP_WIN);
+	
+	glDrawBuffer(GL_FRONT);
+	
+	BIF_ThemeColor(TH_WIRE);
+	
+	setlinestyle(3);
+	glBegin(GL_LINE_STRIP); 
+	glVertex2sv(mval); 
+	glVertex2fv(cent); 
+	glEnd();
+	setlinestyle(0);
+	
+	persp(PERSP_VIEW);
+	bglFlush(); // flush display for frontbuffer
+	glDrawBuffer(GL_BACK);
 }
 
 
@@ -354,8 +353,9 @@ void convertViewVec(TransInfo *t, float *vec, short dx, short dy)
 
 void projectIntView(TransInfo *t, float *vec, int *adr)
 {
-	if (t->spacetype==SPACE_VIEW3D)
-		project_int(vec, adr);
+	if (t->spacetype==SPACE_VIEW3D) {
+		project_int_noclip(vec, adr);
+	}
 	else if(t->spacetype==SPACE_IMAGE) {
 		float aspx, aspy, v[2];
 		
@@ -376,8 +376,9 @@ void projectIntView(TransInfo *t, float *vec, int *adr)
 
 void projectFloatView(TransInfo *t, float *vec, float *adr)
 {
-	if (t->spacetype==SPACE_VIEW3D)
-		project_float(vec, adr);
+	if (t->spacetype==SPACE_VIEW3D) {
+		project_float_noclip(vec, adr);
+	}
 	else if(t->spacetype==SPACE_IMAGE) {
 		int a[2];
 		
diff --git a/source/blender/src/transform_conversions.c b/source/blender/src/transform_conversions.c
index 4be525f4945..dcebf6b7557 100644
--- a/source/blender/src/transform_conversions.c
+++ b/source/blender/src/transform_conversions.c
@@ -1365,7 +1365,7 @@ static void createTransCurveVerts(TransInfo *t)
 						tail++;
 					}
 					if(		propmode ||
-							((bezt->f1 & SELECT) && (G.f & G_HIDDENHANDLES)) ||
+							((bezt->f2 & SELECT) && (G.f & G_HIDDENHANDLES)) ||
 							((bezt->f3 & SELECT) && (G.f & G_HIDDENHANDLES)==0)
 					  ) {
 						VECCOPY(td->iloc, bezt->vec[2]);
diff --git a/source/blender/src/transform_manipulator.c b/source/blender/src/transform_manipulator.c
index 5c06aaea890..050360887b4 100644
--- a/source/blender/src/transform_manipulator.c
+++ b/source/blender/src/transform_manipulator.c
@@ -158,7 +158,7 @@ static void protectflag_to_drawflags(short protectflag, short *drawflags)
 }
 
 /* for pose mode */
-static void stats_pose(View3D *v3d, bPoseChannel *pchan, float *normal, float *plane)
+static void stats_pose(View3D *v3d, bPoseChannel *pchan)
 {
 	Bone *bone= pchan->bone;
 	
@@ -166,9 +166,6 @@ static void stats_pose(View3D *v3d, bPoseChannel *pchan, float *normal, float *p
 		if (bone->flag & BONE_TRANSFORM) {
 			calc_tw_center(pchan->pose_head);
 			protectflag_to_drawflags(pchan->protectflag, &v3d->twdrawflag);
-
-			VecAddf(normal, normal, pchan->pose_mat[2]);
-			VecAddf(plane, plane, pchan->pose_mat[1]);
 		}
 	}
 }
@@ -349,26 +346,24 @@ int calc_manipulator_stats(ScrArea *sa)
 		}
 	}
 	else if(ob && (ob->flag & OB_POSEMODE)) {
-		bArmature *arm= ob->data;
+		bArmature *arm = ob->data;
 		bPoseChannel *pchan;
 		int mode;
 		
 		if((ob->lay & G.vd->lay)==0) return 0;
 		
-		mode= Trans.mode;
-		Trans.mode= TFM_ROTATION;	// mislead counting bones... bah
+		mode = Trans.mode;
+		Trans.mode = TFM_ROTATION;	// mislead counting bones... bah
 		
 		/* count total, we use same method as transform will do */
 		Trans.total= 0;
 		count_bone_select(&Trans, arm, &arm->bonebase, 1);
-		totsel= Trans.total;
+		totsel = Trans.total;
 		if(totsel) {
 			/* use channels to get stats */
 			for(pchan= ob->pose->chanbase.first; pchan; pchan= pchan->next) {
-				stats_pose(v3d, pchan, normal, plane);
+				stats_pose(v3d, pchan);
 			}
-			//VecMulf(normal, -1.0);
-			VecMulf(plane, -1.0);
 			
 			VecMulf(G.scene->twcent, 1.0f/(float)totsel);	// centroid!
 			Mat4MulVecfl(ob->obmat, G.scene->twcent);
@@ -376,7 +371,7 @@ int calc_manipulator_stats(ScrArea *sa)
 			Mat4MulVecfl(ob->obmat, G.scene->twmax);
 		}
 		/* restore, mode can be TFM_INIT */
-		Trans.mode= mode;
+		Trans.mode = mode;
 	}
 	else if(G.f & (G_VERTEXPAINT + G_TEXTUREPAINT + G_WEIGHTPAINT + G_SCULPTMODE)) {
 		;
@@ -433,7 +428,7 @@ int calc_manipulator_stats(ScrArea *sa)
 			break;
 			
 		case V3D_MANIP_NORMAL:
-			if(G.obedit) {
+			if(G.obedit || ob->flag & OB_POSEMODE) {
 				float mat[3][3];
 				int type;
 				
@@ -479,34 +474,6 @@ int calc_manipulator_stats(ScrArea *sa)
 				}
 				break;
 			}
-			/* pose mode is a bit weird, so keep it separated */
-			else if (ob->flag & OB_POSEMODE)
-			{
-				strcpy(t->spacename, "normal");
-				if(normal[0]!=0.0 || normal[1]!=0.0 || normal[2]!=0.0) {
-					float imat[3][3], mat[3][3];
-					
-					/* we need the transpose of the inverse for a normal... */
-					Mat3CpyMat4(imat, ob->obmat);
-					
-					Mat3Inv(mat, imat);
-					Mat3Transp(mat);
-					Mat3MulVecfl(mat, normal);
-					Mat3MulVecfl(mat, plane);
-
-					Normalize(normal);
-					if(0.0==Normalize(plane)) VECCOPY(plane, mat[1]);
-					
-					VECCOPY(mat[2], normal);
-					Crossf(mat[0], normal, plane);
-					Crossf(mat[1], mat[2], mat[0]);
-					
-					Mat4CpyMat3(v3d->twmat, mat);
-					Mat4Ortho(v3d->twmat);
-
-					break;
-				}
-			}
 			/* no break we define 'normal' as 'local' in Object mode */
 		case V3D_MANIP_LOCAL:
 			strcpy(t->spacename, "local");
diff --git a/source/blender/src/transform_orientations.c b/source/blender/src/transform_orientations.c
index 6696fcf95d6..9c7a2f67b89 100644
--- a/source/blender/src/transform_orientations.c
+++ b/source/blender/src/transform_orientations.c
@@ -27,6 +27,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "DNA_armature_types.h"
+#include "DNA_action_types.h"
 #include "DNA_curve_types.h"
 #include "DNA_listBase.h"
 #include "DNA_object_types.h"
@@ -68,11 +69,17 @@ void BIF_clearTransformOrientation(void)
 }
  
 void BIF_manageTransformOrientation(int confirm, int set) {
+	Object *ob = OBACT;
 	int index = -1; 
 	
 	if (G.obedit) {
 		if (G.obedit->type == OB_MESH)
 			index = manageMeshSpace(confirm, set);
+		else if (G.obedit->type == OB_ARMATURE)
+			index = manageBoneSpace(confirm, set);
+	}
+	else if (ob && (ob->flag & OB_POSEMODE)) {
+			index = manageBoneSpace(confirm, set);
 	}
 	else {
 		index = manageObjectSpace(confirm, set);
@@ -122,6 +129,31 @@ int confirmSpace(int set, char text[])
 	}
 }
 
+int manageBoneSpace(int confirm, int set) {
+	float mat[3][3];
+	float normal[3], plane[3];
+	char name[36] = "";
+	int index;
+
+	getTransformOrientation(normal, plane, 0);
+	
+	if (confirm == 0 && confirmSpace(set, "Bone") == 0) {
+		return -1;
+	}
+
+	if (createSpaceNormalTangent(mat, normal, plane) == 0) {
+		error("Cannot use zero-length bone");
+		return -1;
+	}
+
+	strcpy(name, "Bone");
+
+	/* Input name */
+	sbutton(name, 1, 35, "name: ");
+
+	index = addMatrixSpace(mat, name);
+	return index;
+}
 
 int manageMeshSpace(int confirm, int set) {
 	float mat[3][3];
@@ -363,6 +395,29 @@ void applyTransformOrientation() {
   	}
 }
 
+static int count_bone_select(bArmature *arm, ListBase *lb, int do_it) 
+{
+	Bone *bone;
+	int do_next;
+	int total = 0;
+	
+	for(bone= lb->first; bone; bone= bone->next) {
+		bone->flag &= ~BONE_TRANSFORM;
+		do_next = do_it;
+		if(do_it) {
+			if(bone->layer & arm->layer) {
+				if (bone->flag & BONE_SELECTED) {
+					bone->flag |= BONE_TRANSFORM;
+					total++;
+					do_next= 0;	// no transform on children if one parent bone is selected
+				}
+			}
+		}
+		total += count_bone_select(arm, &bone->childbase, do_next);
+	}
+	
+	return total;
+}
 
 int getTransformOrientation(float normal[3], float plane[3], int activeOnly)
 {
@@ -375,6 +430,14 @@ int getTransformOrientation(float normal[3], float plane[3], int activeOnly)
 
 	if(G.obedit)
 	{
+		float imat[3][3], mat[3][3];
+		
+		/* we need the transpose of the inverse for a normal... */
+		Mat3CpyMat4(imat, ob->obmat);
+		
+		Mat3Inv(mat, imat);
+		Mat3Transp(mat);
+
 		ob= G.obedit;
 
 		if(G.obedit->type==OB_MESH)
@@ -639,12 +702,48 @@ int getTransformOrientation(float normal[3], float plane[3], int activeOnly)
 			}
 
 		}
-		
-		Mat4Mul3Vecfl(G.obedit->obmat, plane);
-		Mat4Mul3Vecfl(G.obedit->obmat, normal);
+
+		/* Vectors from edges don't need the special transpose inverse multiplication */
+		if (result == ORIENTATION_EDGE)
+		{
+			Mat4Mul3Vecfl(ob->obmat, normal);
+			Mat4Mul3Vecfl(ob->obmat, plane);
+		}
+		else
+		{
+			Mat3MulVecfl(mat, normal);
+			Mat3MulVecfl(mat, plane);
+		}
 	}
 	else if(ob && (ob->flag & OB_POSEMODE))
 	{
+		bArmature *arm= ob->data;
+		bPoseChannel *pchan;
+		int totsel;
+		
+		totsel = count_bone_select(arm, &arm->bonebase, 1);
+		if(totsel) {
+			float imat[3][3], mat[3][3];
+
+			/* use channels to get stats */
+			for(pchan= ob->pose->chanbase.first; pchan; pchan= pchan->next) {
+				if (pchan->bone && pchan->bone->flag & BONE_TRANSFORM) {
+					VecAddf(normal, normal, pchan->pose_mat[2]);
+					VecAddf(plane, plane, pchan->pose_mat[1]);
+				}
+			}
+			VecMulf(plane, -1.0);
+			
+			/* we need the transpose of the inverse for a normal... */
+			Mat3CpyMat4(imat, ob->obmat);
+			
+			Mat3Inv(mat, imat);
+			Mat3Transp(mat);
+			Mat3MulVecfl(mat, normal);
+			Mat3MulVecfl(mat, plane);
+			
+			result = ORIENTATION_EDGE;
+		}
 	}
 	else if(G.f & (G_VERTEXPAINT + G_TEXTUREPAINT + G_WEIGHTPAINT + G_SCULPTMODE))
 	{
diff --git a/source/blender/src/view.c b/source/blender/src/view.c
index 2904ca60a12..f53bcb3a9f7 100644
--- a/source/blender/src/view.c
+++ b/source/blender/src/view.c
@@ -228,6 +228,29 @@ void project_int(float *vec, int *adr)
 	}
 }
 
+void project_int_noclip(float *vec, int *adr)
+{
+	float fx, fy, vec4[4];
+
+	VECCOPY(vec4, vec);
+	vec4[3]= 1.0;
+	
+	Mat4MulVec4fl(G.vd->persmat, vec4);
+
+	if( fabs(vec4[3]) > BL_NEAR_CLIP ) {
+		fx = (curarea->winx/2)*(1 + vec4[0]/vec4[3]);
+		fy = (curarea->winy/2)*(1 + vec4[1]/vec4[3]);
+			
+		adr[0] = floor(fx); 
+		adr[1] = floor(fy);
+	}
+	else
+	{
+		adr[0] = curarea->winx / 2;
+		adr[1] = curarea->winy / 2;
+	}
+}
+
 void project_short_noclip(float *vec, short *adr)
 {
 	float fx, fy, vec4[4];
@@ -264,8 +287,28 @@ void project_float(float *vec, float *adr)
 	Mat4MulVec4fl(G.vd->persmat, vec4);
 
 	if( vec4[3]>BL_NEAR_CLIP ) {
-		adr[0]= (curarea->winx/2.0)+(curarea->winx/2.0)*vec4[0]/vec4[3];	
-		adr[1]= (curarea->winy/2.0)+(curarea->winy/2.0)*vec4[1]/vec4[3];
+		adr[0] = (curarea->winx/2.0)+(curarea->winx/2.0)*vec4[0]/vec4[3];	
+		adr[1] = (curarea->winy/2.0)+(curarea->winy/2.0)*vec4[1]/vec4[3];
+	}
+}
+
+void project_float_noclip(float *vec, float *adr)
+{
+	float vec4[4];
+
+	VECCOPY(vec4, vec);
+	vec4[3]= 1.0;
+	
+	Mat4MulVec4fl(G.vd->persmat, vec4);
+
+	if( fabs(vec4[3]) > BL_NEAR_CLIP ) {
+		adr[0] = (curarea->winx/2.0)+(curarea->winx/2.0)*vec4[0]/vec4[3];	
+		adr[1] = (curarea->winy/2.0)+(curarea->winy/2.0)*vec4[1]/vec4[3];
+	}
+	else
+	{
+		adr[0] = curarea->winx / 2.0f;
+		adr[1] = curarea->winy / 2.0f;
 	}
 }
 
@@ -1448,6 +1491,8 @@ void obmat_to_viewmat(Object *ob, short smooth)
 	float bmat[4][4];
 	float tmat[3][3];
 
+	G.vd->view= 0; /* dont show the grid */
+
 	Mat4CpyMat4(bmat, ob->obmat);
 	Mat4Ortho(bmat);
 	Mat4Invert(G.vd->viewmat, bmat);
diff --git a/source/creator/creator.c b/source/creator/creator.c
index a4588bb4597..2e6b5d7353e 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -219,7 +219,7 @@ static void print_help(void)
 	printf ("  -d\t\tTurn debugging on\n");
 	printf ("  -noaudio\tDisable audio on systems that support audio\n");
 	printf ("  -h\t\tPrint this help text\n");
-	printf ("  -y\t\tDisable script links, use -Y to find out why its -y\n");
+	printf ("  -y\t\tDisable automatic python script execution (scriptlinks, pydrivers, pyconstraints, pynodes)\n");
 	printf ("  -P <filename>\tRun the given Python script (filename or Blender Text)\n");
 #ifdef WIN32
 	printf ("  -R\t\tRegister .blend extension\n");
diff --git a/source/gameengine/Converter/BL_ArmatureObject.cpp b/source/gameengine/Converter/BL_ArmatureObject.cpp
index ff9c6a75aa9..08567dde840 100644
--- a/source/gameengine/Converter/BL_ArmatureObject.cpp
+++ b/source/gameengine/Converter/BL_ArmatureObject.cpp
@@ -153,9 +153,12 @@ void BL_ArmatureObject::GetPose(bPose **pose)
 		int copy_constraint_channels_hack = 1;
 		copy_pose(pose, m_pose, copy_constraint_channels_hack);
 	}
-	else
+	else {
+		if (*pose == m_pose)
+			// no need to copy if the pointers are the same
+			return;
 		extract_pose_from_pose(*pose, m_pose);
-
+	}
 }
 
 void BL_ArmatureObject::GetMRDPose(bPose **pose)
@@ -169,7 +172,11 @@ void BL_ArmatureObject::GetMRDPose(bPose **pose)
 	//}
 
 	if (!*pose)
-		copy_pose(pose, m_objArma->pose, 0);
+		// must duplicate the constraints too otherwise we have corruption in free_pose_channels()
+		// because it will free the blender constraints. 
+		// Ideally, blender should rememeber that the constraints were not copied so that
+		// free_pose_channels() would not free them.
+		copy_pose(pose, m_objArma->pose, 1);
 	else
 		extract_pose_from_pose(*pose, m_objArma->pose);
 
diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp
index dada47e2fa4..c192cd01261 100644
--- a/source/gameengine/Ketsji/KX_GameObject.cpp
+++ b/source/gameengine/Ketsji/KX_GameObject.cpp
@@ -580,7 +580,68 @@ void KX_GameObject::SetObjectColor(const MT_Vector4& rgbavec)
 	m_objectColor = rgbavec;
 }
 
+void KX_GameObject::AlignAxisToVect(const MT_Vector3& dir, int axis)
+{
+	MT_Matrix3x3 orimat;
+	MT_Vector3 vect,ori,z,x,y;
+	MT_Scalar len;
 
+	vect = dir;
+	len = vect.length();
+	if (MT_fuzzyZero(len))
+	{
+		cout << "alignAxisToVect() Error: Null vector!\n";
+		return;
+	}
+	// normalize
+	vect /= len;
+	orimat = GetSGNode()->GetWorldOrientation();
+	switch (axis)
+	{	
+		case 0: //x axis
+			ori = MT_Vector3(orimat[0][2], orimat[1][2], orimat[2][2]); //pivot axis
+			if (MT_abs(vect.dot(ori)) > 1.0-3.0*MT_EPSILON) //is the vector paralell to the pivot?
+				ori = MT_Vector3(orimat[0][1], orimat[1][1], orimat[2][1]); //change the pivot!
+			x = vect; 
+			y = ori.cross(x);
+			z = x.cross(y);
+			break;
+		case 1: //y axis
+			ori = MT_Vector3(orimat[0][0], orimat[1][0], orimat[2][0]);
+			if (MT_abs(vect.dot(ori)) > 1.0-3.0*MT_EPSILON)
+				ori = MT_Vector3(orimat[0][2], orimat[1][2], orimat[2][2]);
+			y = vect;
+			z = ori.cross(y);
+			x = y.cross(z);
+			break;
+		case 2: //z axis
+			ori = MT_Vector3(orimat[0][1], orimat[1][1], orimat[2][1]);
+			if (MT_abs(vect.dot(ori)) > 1.0-3.0*MT_EPSILON)
+				ori = MT_Vector3(orimat[0][0], orimat[1][0], orimat[2][0]);
+			z = vect;
+			x = ori.cross(z);
+			y = z.cross(x);
+			break;
+		default: //wrong input?
+			cout << "alignAxisToVect(): Wrong axis '" << axis <<"'\n";
+			return;
+	}
+	x.normalize(); //normalize the vectors
+	y.normalize();
+	z.normalize();
+	orimat = MT_Matrix3x3(	x[0],y[0],z[0],
+							x[1],y[1],z[1],
+							x[2],y[2],z[2]);
+	if (GetSGNode()->GetSGParent() != NULL)
+	{
+		// the object is a child, adapt its local orientation so that 
+		// the global orientation is aligned as we want.
+		MT_Matrix3x3 invori = GetSGNode()->GetSGParent()->GetWorldOrientation().inverse();
+		NodeSetLocalOrientation(invori*orimat);
+	}
+	else
+		NodeSetLocalOrientation(orimat);
+}
 
 MT_Vector3 KX_GameObject::GetLinearVelocity(bool local)
 {
@@ -723,6 +784,7 @@ void KX_GameObject::Suspend(void)
 
 PyMethodDef KX_GameObject::Methods[] = {
 	{"setVisible",(PyCFunction) KX_GameObject::sPySetVisible, METH_VARARGS},  
+	{"alignAxisToVect",(PyCFunction) KX_GameObject::sPyAlignAxisToVect, METH_VARARGS},
 	{"setPosition", (PyCFunction) KX_GameObject::sPySetPosition, METH_VARARGS},
 	{"getPosition", (PyCFunction) KX_GameObject::sPyGetPosition, METH_VARARGS},
 	{"getOrientation", (PyCFunction) KX_GameObject::sPyGetOrientation, METH_VARARGS},
@@ -1255,7 +1317,24 @@ PyObject* KX_GameObject::PySetOrientation(PyObject* self,
 	return NULL;
 }
 
-
+PyObject* KX_GameObject::PyAlignAxisToVect(PyObject* self, 
+										  PyObject* args, 
+										  PyObject* kwds)
+{
+	PyObject* pyvect;
+	int axis = 2; //z axis is the default
+	
+	if (PyArg_ParseTuple(args,"O|i",&pyvect,&axis))
+	{
+		MT_Vector3 vect;
+		if (PyVecTo(pyvect, vect))
+		{
+			AlignAxisToVect(vect,axis);				
+			Py_Return;
+		}
+	}
+	return NULL;
+}
 
 PyObject* KX_GameObject::PySetPosition(PyObject* self, 
 									   PyObject* args, 
diff --git a/source/gameengine/Ketsji/KX_GameObject.h b/source/gameengine/Ketsji/KX_GameObject.h
index 3758651f53d..56b9f3f6375 100644
--- a/source/gameengine/Ketsji/KX_GameObject.h
+++ b/source/gameengine/Ketsji/KX_GameObject.h
@@ -258,6 +258,15 @@ public:
 		bool local=false
 	);
 
+	/** 
+	 * Align the object to a given normal.
+	 */
+		void 
+	AlignAxisToVect(
+		const MT_Vector3& vect,
+		int axis = 2 
+	);
+
 	/** 
 	 * Quick'n'dirty obcolor ipo stuff
 	 */
@@ -662,6 +671,7 @@ public:
 	KX_PYMETHOD(KX_GameObject,GetOrientation);
 	KX_PYMETHOD(KX_GameObject,SetOrientation);
 	KX_PYMETHOD(KX_GameObject,SetVisible);
+	KX_PYMETHOD(KX_GameObject,AlignAxisToVect);
 	KX_PYMETHOD(KX_GameObject,SuspendDynamics);
 	KX_PYMETHOD(KX_GameObject,RestoreDynamics);
 	KX_PYMETHOD(KX_GameObject,EnableRigidBody);
diff --git a/source/gameengine/Ketsji/KX_RayCast.cpp b/source/gameengine/Ketsji/KX_RayCast.cpp
index ce7ed984985..b88741625b6 100644
--- a/source/gameengine/Ketsji/KX_RayCast.cpp
+++ b/source/gameengine/Ketsji/KX_RayCast.cpp
@@ -29,6 +29,7 @@
  */
 
 #include <stdlib.h>
+#include <stdio.h>
 
 #include "KX_RayCast.h"
 
diff --git a/source/gameengine/PyDoc/KX_GameObject.py b/source/gameengine/PyDoc/KX_GameObject.py
index fbd896a55d1..8d29a704380 100644
--- a/source/gameengine/PyDoc/KX_GameObject.py
+++ b/source/gameengine/PyDoc/KX_GameObject.py
@@ -51,6 +51,18 @@ class KX_GameObject:
 		@type orn: 3x3 rotation matrix, or Quaternion.
 		@param orn: a rotation matrix specifying the new rotation.
 		"""
+	def alignAxisToVect(vect, axis):
+		"""
+		Aligns any of the game object's axis along the given vector.
+		
+		@type vect: 3d vector.
+		@param vect: a vector to align the axis.
+		@type axis: integer.
+		@param axis:The axis you want to align
+					- 0: X axis
+					- 1: Y axis
+					- 2: Z axis (default) 
+		"""
 	def getOrientation():
 		"""
 		Gets the game object's orientation.
@@ -213,4 +225,5 @@ class KX_GameObject:
 		@rtype: 3-tuple (L{KX_GameObject}, 3-tuple (x,y,z), 3-tuple (nx,ny,nz))
 		@return: (object,hitpoint,hitnormal) or (None,None,None)
 		"""
-	
\ No newline at end of file
+
+
diff --git a/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp b/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
index 9454edfacfe..80d6d55df25 100644
--- a/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
+++ b/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
@@ -166,6 +166,10 @@ void RAS_2DFilterManager::StartShaderProgram(unsigned int shaderprogram)
 	GLint uniformLoc;
 	bgl::blUseProgramObjectARB(shaderprogram);
 	uniformLoc = bgl::blGetUniformLocationARB(shaderprogram, "bgl_RenderedTexture");
+	bgl::blActiveTextureARB(GL_TEXTURE0);
+	//glActiveTexture(GL_TEXTURE0);
+	glBindTexture(GL_TEXTURE_2D, texname);
+
     if (uniformLoc != -1)
     {
 		bgl::blUniform1iARB(uniformLoc, 0);
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h
index a18ed038f35..3e24ee204a1 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h
@@ -53,9 +53,9 @@
 #elif defined(__APPLE__)
 #  include "mac_compat_glext.h"
 #  include <OpenGL/glext.h>
-# else
+#else
 #  include <GL/glext.h>
-# endif
+#endif
 #endif
 
 #ifdef __sgi
diff --git a/tools/btools.py b/tools/btools.py
index 51367d6bd42..ad4cf71c3e8 100755
--- a/tools/btools.py
+++ b/tools/btools.py
@@ -192,6 +192,18 @@ def read_opts(cfg, args):
         ('BF_JPEG_LIB', 'JPEG library', ''),
         ('BF_JPEG_LIBPATH', 'JPEG library path', ''),
 
+        (BoolOption('WITH_BF_OPENJPEG', 'Use OPENJPEG if true', 'false')),
+        ('BF_OPENJPEG', 'OPENJPEG base path', ''),
+        ('BF_OPENJPEG_INC', 'OPENJPEG include path', ''),
+        ('BF_OPENJPEG_LIB', 'OPENJPEG library', ''),
+        ('BF_OPENJPEG_LIBPATH', 'OPENJPEG library path', ''),
+
+        (BoolOption('WITH_BF_REDCODE', 'Use REDCODE if true', 'false')),
+        ('BF_REDCODE', 'REDCODE base path', ''),
+        ('BF_REDCODE_INC', 'REDCODE include path', ''),
+        ('BF_REDCODE_LIB', 'REDCODE library', ''),
+        ('BF_REDCODE_LIBPATH', 'REDCODE library path', ''),
+
         (BoolOption('WITH_BF_PNG', 'Use PNG if true', 'true')),
         ('BF_PNG', 'PNG base path', ''),
         ('BF_PNG_INC', 'PNG include path', ''),

From 48bf0ef2edbde0b098cf1f3717087821e0e743e3 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Tue, 10 Jun 2008 15:25:05 +0000
Subject: [PATCH 043/252] Improvements to whole-word ops (thanks mindrones for
 suggestions).

---
 source/blender/blenkernel/intern/text.c | 76 +++++++++++++++----------
 1 file changed, 46 insertions(+), 30 deletions(-)

diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c
index 6031c2a8acc..1c7b505752f 100644
--- a/source/blender/blenkernel/intern/text.c
+++ b/source/blender/blenkernel/intern/text.c
@@ -703,28 +703,58 @@ void txt_move_right(Text *text, short sel)
 
 void txt_jump_left(Text *text, short sel)
 {
-	TextLine *l;
-	int c;
+	TextLine **linep, *oldl;
+	int *charp, oldc, count=-1;
+	unsigned char oldu;
+
 	if (!text) return;
-	if (!text->curl) return;
+	if(sel) txt_curs_sel(text, &linep, &charp);
+	else { txt_pop_first(text); txt_curs_cur(text, &linep, &charp); }
+	if (!*linep) return;
+
+	oldl= *linep;
+	oldc= *charp;
+	oldu= undoing;
+	undoing= 1; /* Don't push individual moves to undo stack */
+
 	do {
 		txt_move_left(text, sel);
-		l= sel ? text->sell : text->curl;
-		c= sel ? text->selc : text->curc;
-	} while (c>0 && c<l->len && !txt_word_boundary(l->line[c-1]));
+		count++;
+	} while (*charp>0 && *charp<(*linep)->len && txt_word_boundary((*linep)->line[*charp-1]));
+	if (!count) {
+		while (*charp>0 && *charp<(*linep)->len && !txt_word_boundary((*linep)->line[*charp-1]))
+			txt_move_left(text, sel);
+	}
+
+	undoing= oldu;
+	if(!undoing) txt_undo_add_toop(text, sel?UNDO_STO:UNDO_CTO, txt_get_span(text->lines.first, oldl), oldc, txt_get_span(text->lines.first, *linep), (unsigned short)*charp);
 }
 
 void txt_jump_right(Text *text, short sel)
 {
-	TextLine *l;
-	int c;
+	TextLine **linep, *oldl;
+	int *charp, oldc;
+	unsigned char oldu;
+
 	if (!text) return;
-	if (!text->curl) return;
+	if(sel) txt_curs_sel(text, &linep, &charp);
+	else { txt_pop_last(text); txt_curs_cur(text, &linep, &charp); }
+	if (!*linep) return;
+
+	oldl= *linep;
+	oldc= *charp;
+	oldu= undoing;
+	undoing= 1; /* Don't push individual moves to undo stack */
+
 	do {
 		txt_move_right(text, sel);
-		l= sel ? text->sell : text->curl;
-		c= sel ? text->selc : text->curc;
-	} while (c>0 && c<l->len && !txt_word_boundary(l->line[c-1]));
+	} while (*charp>0 && *charp<(*linep)->len && !txt_word_boundary((*linep)->line[*charp]));
+	while (*charp>0 && *charp<(*linep)->len && txt_word_boundary((*linep)->line[*charp])) {
+		txt_move_right(text, sel);
+	}
+
+	undoing= oldu;
+	if(!undoing) txt_undo_add_toop(text, sel?UNDO_STO:UNDO_CTO, txt_get_span(text->lines.first, oldl), oldc, txt_get_span(text->lines.first, *linep), (unsigned short)*charp);
 }
 
 void txt_move_bol (Text *text, short sel) 
@@ -2103,16 +2133,8 @@ void txt_delete_char (Text *text)
 
 void txt_delete_word (Text *text) 
 {
-	int i;
-	char ch;
-	if (!text) return;
-	if (!text->curl) return;
-	i= text->curc;
-	do {
-		ch= text->curl->line[i];
-		txt_delete_char(text);
-		i= text->curc;
-	} while (i<text->curl->len && !txt_word_boundary(ch));
+	txt_jump_right(text, 1);
+	txt_delete_sel(text);
 }
 
 void txt_backspace_char (Text *text) 
@@ -2157,14 +2179,8 @@ void txt_backspace_char (Text *text)
 
 void txt_backspace_word (Text *text) 
 {
-	int i;
-	if (!text) return;
-	if (!text->curl) return;
-	i= text->curc;
-	do {
-		txt_backspace_char(text);
-		i= text->curc;
-	} while (i>0 && !txt_word_boundary(text->curl->line[i-1]));
+	txt_jump_left(text, 1);
+	txt_delete_sel(text);
 }
 
 int txt_add_char (Text *text, char add) 

From dce7e0700142f6c273bb116472c59f773ca9ea49 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Tue, 10 Jun 2008 21:15:48 +0000
Subject: [PATCH 044/252] Skeleton generation

Add option to select bone placement on embedding (following last commit).

Add option for distance to embedding adaptive subdivide (for comparison with correlation based method)
---
 source/blender/makesdna/DNA_scene_types.h |   2 +
 source/blender/src/buttons_editing.c      |   6 +-
 source/blender/src/editarmature.c         | 206 ++++++++--------------
 3 files changed, 76 insertions(+), 138 deletions(-)

diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 1ddebf5d6e4..ba25dd7ae7d 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -834,6 +834,8 @@ typedef struct Scene {
 #define	SKGEN_CUT_ANGLE			16
 #define	SKGEN_CUT_CORRELATION	32
 #define	SKGEN_HARMONIC			64
+#define	SKGEN_STICK_TO_EMBEDDING	128
+#define	SKGEN_ADAPTIVE_DISTANCE		512
 
 #define	SKGEN_SUB_LENGTH		0
 #define	SKGEN_SUB_ANGLE			1
diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c
index 2b55fec084a..59d32dd37df 100644
--- a/source/blender/src/buttons_editing.c
+++ b/source/blender/src/buttons_editing.c
@@ -5063,8 +5063,10 @@ static void editing_panel_mesh_skgen(Object *ob, Mesh *me)
 				uiDefButF(block, NUM, B_DIFF, 							"T:",			1111, y,164,19, &G.scene->toolsettings->skgen_angle_limit,0.0, 90.0, 10, 0,			"Specify the threshold angle in degrees for subdivision");
 				break;
 			case SKGEN_SUB_CORRELATION:
-				uiDefButBitS(block, TOG, SKGEN_CUT_CORRELATION, B_DIFF, "Correlation",	1041, y, 67,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Subdivide arcs based on correlation");
-				uiDefButF(block, NUM, B_DIFF, 							"T:",			1111, y,164,19, &G.scene->toolsettings->skgen_correlation_limit,0.0, 1.0, 0.01, 0,	"Specify the threshold correlation for subdivision");
+				uiDefButBitS(block, TOG, SKGEN_CUT_CORRELATION, B_DIFF, "Adaptative",	1041, y, 67,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Subdivide arcs adaptatively");
+				uiDefButF(block, NUM, B_DIFF, 							"T:",			1111, y,114,19, &G.scene->toolsettings->skgen_correlation_limit,0.0, 1.0, 0.01, 0,	"Specify the adaptive threshold for subdivision");
+				uiDefButBitS(block, TOG, SKGEN_STICK_TO_EMBEDDING, B_DIFF,		"E",			1225, y, 25,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Stick endpoint to embedding");
+				uiDefButBitS(block, TOG, SKGEN_ADAPTIVE_DISTANCE, B_DIFF, 		"D",			1250, y, 25,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Adaptive distance (on) or variance(off)");
 				break;
 		}
 	}
diff --git a/source/blender/src/editarmature.c b/source/blender/src/editarmature.c
index ace3536a835..670b570a332 100644
--- a/source/blender/src/editarmature.c
+++ b/source/blender/src/editarmature.c
@@ -4207,9 +4207,7 @@ EditBone * subdivideByAngle(ReebArc *arc, ReebNode *head, ReebNode *tail)
 	return lastBone;
 }
 
-#if 1
-
-float calcCorrelation(ReebArc *arc, int start, int end, float v0[3], float n[3])
+float calcVariance(ReebArc *arc, int start, int end, float v0[3], float n[3])
 {
 	int len = 2 + abs(end - start);
 	
@@ -4257,134 +4255,47 @@ float calcCorrelation(ReebArc *arc, int start, int end, float v0[3], float n[3])
 		/* adding start(0) and end(1) values to s_t */
 		s_t += (avg_t * avg_t) + (1 - avg_t) * (1 - avg_t);
 		
-		return 1.0f - s_xyz / s_t; 
+		return s_xyz / s_t; 
 	}
 	else
 	{
-		return 1.0f;
+		return 0;
 	}
 }
 
+float calcDistance(ReebArc *arc, int start, int end, float head[3], float tail[3])
+{
+	ReebArcIterator iter;
+	EmbedBucket *bucket = NULL;
+	float max_dist = 0;
+	
+	/* calculate maximum distance */
+	for (initArcIterator2(&iter, arc, start, end), bucket = nextBucket(&iter);
+		bucket;
+		bucket = nextBucket(&iter))
+	{
+		float v1[3], v2[3], c[3];
+		float dist;
+		
+		VecSubf(v1, head, tail);
+		VecSubf(v2, bucket->p, tail);
+
+		Crossf(c, v1, v2);
+		
+		dist = Inpf(c, c) / Inpf(v1, v1);
+		
+		max_dist = dist > max_dist ? dist : max_dist;
+	}
+	
+	
+	return max_dist; 
+}
+
 EditBone * subdivideByCorrelation(ReebArc *arc, ReebNode *head, ReebNode *tail)
 {
 	ReebArcIterator iter;
 	float n[3];
-	float CORRELATION_THRESHOLD = G.scene->toolsettings->skgen_correlation_limit;
-	EditBone *lastBone = NULL;
-	
-	/* init iterator to get start and end from head */
-	initArcIterator(&iter, arc, head);
-	
-	/* Calculate overall */
-	VecSubf(n, arc->buckets[iter.end].p, head->p);
-	
-	if (G.scene->toolsettings->skgen_options & SKGEN_CUT_CORRELATION && 
-		calcCorrelation(arc, iter.start, iter.end, head->p, n) < CORRELATION_THRESHOLD)
-	{
-		EmbedBucket *bucket = NULL;
-		EmbedBucket *previous = NULL;
-		EditBone *child = NULL;
-		EditBone *parent = NULL;
-		int boneStart = iter.start;
-
-		parent = add_editbone("Bone");
-		parent->flag = BONE_SELECTED|BONE_TIPSEL|BONE_ROOTSEL;
-		VECCOPY(parent->head, head->p);
-		
-		for (previous = nextBucket(&iter), bucket = nextBucket(&iter);
-			bucket;
-			previous = bucket, bucket = nextBucket(&iter))
-		{
-			/* Calculate normal */
-			VecSubf(n, bucket->p, parent->head);
-
-			if (calcCorrelation(arc, boneStart, iter.index, parent->head, n) < CORRELATION_THRESHOLD)
-			{
-				VECCOPY(parent->tail, previous->p);
-
-				child = add_editbone("Bone");
-				VECCOPY(child->head, parent->tail);
-				child->parent = parent;
-				child->flag |= BONE_CONNECTED|BONE_SELECTED|BONE_TIPSEL|BONE_ROOTSEL;
-				
-				parent = child; // new child is next parent
-				boneStart = iter.index; // start from end
-			}
-		}
-
-		VECCOPY(parent->tail, tail->p);
-		
-		lastBone = parent; /* set last bone in the chain */
-	}
-	
-	return lastBone;
-}
-
-#else
-
-float calcCorrelation(ReebArc *arc, int start, int end, float v0[3], float n[3])
-{
-	int len = 2 + abs(end - start);
-	
-	if (len > 2)
-	{
-		ReebArcIterator iter;
-		EmbedBucket *bucket = NULL;
-		float avg_t = 0.0f;
-		float s_t = 0.0f;
-		float s_xyz = 0.0f;
-		
-		/* First pass, calculate average */
-		for (initArcIterator2(&iter, arc, start, end), bucket = nextBucket(&iter);
-			bucket;
-			bucket = nextBucket(&iter))
-		{
-			float v[3];
-			
-			VecSubf(v, bucket->p, v0);
-			Normalize(v);
-			avg_t += Inpf(v, n);
-		}
-		
-		avg_t /= Inpf(n, n);
-		avg_t += 1.0f; /* adding start (0) and end (1) values */
-		avg_t /= len;
-		
-		/* Second pass, calculate s_xyz and s_t */
-		for (initArcIterator2(&iter, arc, start, end), bucket = nextBucket(&iter);
-			bucket;
-			bucket = nextBucket(&iter))
-		{
-			float v[3], d[3];
-			float dt;
-			
-			VecSubf(v, bucket->p, v0);
-			Normalize(v);
-			Projf(d, v, n);
-			VecSubf(v, v, d);
-			
-			dt = VecLength(d) - avg_t;
-			
-			s_t += dt * dt;
-			s_xyz += Inpf(v, v);
-		}
-		
-		/* adding start(0) and end(1) values to s_t */
-		s_t += (avg_t * avg_t) + (1 - avg_t) * (1 - avg_t);
-		
-		return 1.0f - s_xyz / s_t; 
-	}
-	else
-	{
-		return 1.0f;
-	}
-}
-
-EditBone * subdivideByCorrelation(ReebArc *arc, ReebNode *head, ReebNode *tail)
-{
-	ReebArcIterator iter;
-	float n[3];
-	float CORRELATION_THRESHOLD = G.scene->toolsettings->skgen_correlation_limit;
+	float ADAPTIVE_THRESHOLD = G.scene->toolsettings->skgen_correlation_limit;
 	EditBone *lastBone = NULL;
 	
 	/* init iterator to get start and end from head */
@@ -4412,22 +4323,46 @@ EditBone * subdivideByCorrelation(ReebArc *arc, ReebNode *head, ReebNode *tail)
 			bucket;
 			previous = bucket, bucket = nextBucket(&iter))
 		{
-			float length;
-			
-			/* Calculate normal */
-			VecSubf(n, bucket->p, parent->head);
-			length = Normalize(n);
-			
-			total += 1;
-			VecAddf(normal, normal, n);
-			VECCOPY(avg_normal, normal);
-			VecMulf(avg_normal, 1.0f / total); 
+			float btail[3];
+			float value = 0;
 
-			if (calcCorrelation(arc, boneStart, iter.index, parent->head, avg_normal) < CORRELATION_THRESHOLD)
+			if (G.scene->toolsettings->skgen_options & SKGEN_STICK_TO_EMBEDDING)
 			{
-				VECCOPY(parent->tail, avg_normal);
-				VecMulf(parent->tail, length);
-				VecAddf(parent->tail, parent->tail, parent->head);
+				VECCOPY(btail, bucket->p);
+			}
+			else
+			{
+				float length;
+				
+				/* Calculate normal */
+				VecSubf(n, bucket->p, parent->head);
+				length = Normalize(n);
+				
+				total += 1;
+				VecAddf(normal, normal, n);
+				VECCOPY(avg_normal, normal);
+				VecMulf(avg_normal, 1.0f / total);
+				 
+				VECCOPY(btail, avg_normal);
+				VecMulf(btail, length);
+				VecAddf(btail, btail, parent->head);
+			}
+
+			if (G.scene->toolsettings->skgen_options & SKGEN_ADAPTIVE_DISTANCE)
+			{
+				value = calcDistance(arc, boneStart, iter.index, parent->head, btail);
+			}
+			else
+			{
+				float n[3];
+				
+				VecSubf(n, btail, parent->head);
+				value = calcVariance(arc, boneStart, iter.index, parent->head, n);
+			}
+
+			if (value > ADAPTIVE_THRESHOLD)
+			{
+				VECCOPY(parent->tail, btail);
 
 				child = add_editbone("Bone");
 				VECCOPY(child->head, parent->tail);
@@ -4449,7 +4384,6 @@ EditBone * subdivideByCorrelation(ReebArc *arc, ReebNode *head, ReebNode *tail)
 	
 	return lastBone;
 }
-#endif
 
 float arcLengthRatio(ReebArc *arc)
 {

From 512019c6f28dfeb7a4de1a0b81e938535d9bf8bc Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Fri, 13 Jun 2008 21:07:46 +0000
Subject: [PATCH 045/252] First draft for gradient descent optimization for
 aggressive retargetting (results no go)

---
 source/blender/include/reeb.h     |   1 +
 source/blender/src/autoarmature.c | 247 +++++++++++++++++++++++++++++-
 source/blender/src/reeb.c         |  20 ++-
 3 files changed, 265 insertions(+), 3 deletions(-)

diff --git a/source/blender/include/reeb.h b/source/blender/include/reeb.h
index 2395e294b85..ea556c8316d 100644
--- a/source/blender/include/reeb.h
+++ b/source/blender/include/reeb.h
@@ -129,6 +129,7 @@ void initArcIterator2(struct ReebArcIterator *iter, struct ReebArc *arc, int sta
 void initArcIteratorStart(struct ReebArcIterator *iter, struct ReebArc *arc, struct ReebNode *head, int start);
 struct EmbedBucket * nextBucket(struct ReebArcIterator *iter);
 struct EmbedBucket * nextNBucket(ReebArcIterator *iter, int n);
+struct EmbedBucket * peekBucket(ReebArcIterator *iter, int n);
 struct EmbedBucket * currentBucket(struct ReebArcIterator *iter);
 struct EmbedBucket * previousBucket(struct ReebArcIterator *iter);
 int iteratorStopped(struct ReebArcIterator *iter);
diff --git a/source/blender/src/autoarmature.c b/source/blender/src/autoarmature.c
index e9b3dad852f..cd0147a052e 100644
--- a/source/blender/src/autoarmature.c
+++ b/source/blender/src/autoarmature.c
@@ -539,6 +539,8 @@ static RetargetMode detectArcRetargetMode(RigArc *iarc)
 		mode = RETARGET_LENGTH;
 	}
 	
+	mode = RETARGET_AGGRESSIVE;
+	
 	return mode;
 }
 
@@ -553,6 +555,163 @@ static void printPositions(int *positions, int nb_positions)
 	printf("\n");
 }
 
+static float calcCost(ReebArc *earc, RigEdge *e1, RigEdge *e2, float *vec0, float *vec1, float *vec2, int i0, int i1, int i2)
+{
+	ReebArcIterator iter2;
+	EmbedBucket *bucket = NULL;
+	float max_dist;
+	
+	float vec_second[3], vec_first[3];
+	float angle = e1->angle;
+	float test_angle, length1, length2;
+	float new_cost = 0;
+
+	VecSubf(vec_second, vec2, vec1);
+	length2 = Normalize(vec_second);
+
+	VecSubf(vec_first, vec1, vec0); 
+	length1 = Normalize(vec_first);
+	
+	if (length1 > 0 && length2 > 0)
+	{
+		test_angle = saacos(Inpf(vec_first, vec_second));
+		/* ANGLE COST HERE */
+		new_cost += G.scene->toolsettings->skgen_retarget_angle_weight * fabs((test_angle - angle) / test_angle);
+	}
+	else
+	{
+		new_cost += M_PI;
+	}
+
+	/* LENGTH COST HERE */
+	new_cost += G.scene->toolsettings->skgen_retarget_length_weight * fabs((length1 - e1->length) / e1->length);
+	new_cost += G.scene->toolsettings->skgen_retarget_length_weight * fabs((length2 - e2->length) / e2->length);
+
+	/* calculate maximum distance */
+//	max_dist = 0;
+//	for (initArcIterator2(&iter2, earc, i0, i1), bucket = nextBucket(&iter2);
+//		bucket;
+//		bucket = nextBucket(&iter2))
+//	{
+//		float v1[3], v2[3], c[3];
+//		float dist;
+//		
+//		VecSubf(v1, vec0, vec1);
+//		VecSubf(v2, bucket->p, vec1);
+//
+//		Crossf(c, v1, v2);
+//		
+//		dist = Inpf(c, c) / Inpf(v1, v1);
+//		
+//		max_dist = dist > max_dist ? dist : max_dist;
+//	}
+//	
+//	new_cost += G.scene->toolsettings->skgen_retarget_length_weight * max_dist;
+//	
+//	max_dist = 0;
+//	for (initArcIterator2(&iter2, earc, i1, i2), bucket = nextBucket(&iter2);
+//		bucket;
+//		bucket = nextBucket(&iter2))
+//	{
+//		float v1[3], v2[3], c[3];
+//		float dist;
+//		
+//		VecSubf(v1, vec1, vec2);
+//		VecSubf(v2, bucket->p, vec2);
+//
+//		Crossf(c, v1, v2);
+//		
+//		dist = Inpf(c, c) / Inpf(v1, v1);
+//		
+//		max_dist = dist > max_dist ? dist : max_dist;
+//	}
+//	
+//	new_cost += G.scene->toolsettings->skgen_retarget_length_weight * max_dist;
+
+	return new_cost;
+}
+
+static void calcGradient(RigEdge *e1, RigEdge *e2, ReebArcIterator *iter, int index, int nb_joints, float *cost_cube, int *positions, float **vec_cache)
+{
+	EmbedBucket *bucket = NULL;
+	float *vec0, *vec1, *vec2;
+	float current_cost;
+	int i0, i1, i2;
+	int next_position;
+
+	vec0 = vec_cache[index];
+	vec1 = vec_cache[index + 1];
+	vec2 = vec_cache[index + 2];
+	
+	if (index == 0)
+	{
+		i0 = iter->start;
+	}
+	else
+	{
+		i0 = positions[index - 1];
+	}
+	
+	i1 = positions[index];
+	
+	if (index +1 == nb_joints)
+	{
+		i2 = iter->end;
+	}
+	else
+	{
+		i2 = positions[index + 1];
+	}
+
+
+	current_cost = calcCost(iter->arc, e1, e2, vec0, vec1, vec2, i0, i1, i2);
+	cost_cube[index * 3 + 1] = current_cost;
+	
+	next_position = positions[index] + 1;
+	
+	if (index + 1 < nb_joints && next_position == positions[index + 1])
+	{
+		cost_cube[index * 3 + 2] = 1;
+	}
+	else
+	{
+		bucket = peekBucket(iter, next_position);
+		
+		if (bucket == NULL)
+		{
+			cost_cube[index * 3 + 2] = 1;
+		}
+		else
+		{
+			vec1 = bucket->p;
+			
+			cost_cube[index * 3 + 2] = calcCost(iter->arc, e1, e2, vec0, vec1, vec2, i0, next_position, i2) - current_cost;
+		}
+	}
+
+	next_position = positions[index] - 1;
+	
+	if (index - 1 > -1 && next_position == positions[index - 1])
+	{
+		cost_cube[index * 3] = 1;
+	}
+	else
+	{
+		bucket = peekBucket(iter, next_position);
+		
+		if (bucket == NULL)
+		{
+			cost_cube[index * 3] = 1;
+		}
+		else
+		{
+			vec1 = bucket->p;
+			
+			cost_cube[index * 3] = calcCost(iter->arc, e1, e2, vec0, vec1, vec2, i0, next_position, i2) - current_cost;
+		}
+	}
+}
+
 static void retargetArctoArcAggresive(RigArc *iarc)
 {
 	ReebArcIterator iter;
@@ -598,6 +757,7 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 	for (i = 0; i < nb_joints; i++)
 	{
 		positions[i] = i + 1;
+		//positions[i] = (earc->bcount / nb_edges) * (i + 1);
 	}
 	
 	/* init cost cache */
@@ -609,6 +769,7 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 	vec_cache[0] = node_start->p;
 	vec_cache[nb_edges] = node_end->p;
 
+#if 1
 	while(1)
 	{
 		float cost = 0;
@@ -736,6 +897,89 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 			memcpy(best_positions, positions, sizeof(int) * nb_joints);
 		}
 	}
+#else
+	{
+		RigEdge *previous;
+		float *cost_cube;
+		
+		/* [joint: index][position: -1, 0, +2] */
+		cost_cube = MEM_callocN(sizeof(float) * 3 * nb_joints, "Cost Cube");
+		
+		initArcIterator(&iter, earc, node_start);
+
+		/* init vec_cache */
+		for (i = 0; i < nb_joints; i++)
+		{
+			bucket = peekBucket(&iter, positions[i]);
+			vec_cache[i + 1] = bucket->p;
+		}
+
+		/* init cost cube */
+		for (previous = iarc->edges.first, edge = previous->next, i = 0;
+			 edge;
+			 previous = edge, edge = edge->next, i += 1)
+		{
+			calcGradient(previous, edge, &iter, i, nb_joints, cost_cube, positions, vec_cache);
+		}
+
+		while(1)
+		{
+			float min_gradient = 0;
+			int moving_joint = -1;
+			int move_direction = -1;
+		
+			printf("-----------------\n");
+		
+			for (i = 0; i < nb_joints; i++)
+			{
+				printf("%i[%i]: %f\t\t(%f)\t\t%f\n", i, positions[i], cost_cube[i * 3], cost_cube[i * 3 + 1], cost_cube[i * 3 + 2]); 
+				if (cost_cube[i * 3] < min_gradient)
+				{
+					min_gradient = cost_cube[i * 3]; 
+					moving_joint = i;
+					move_direction = -1;
+				}
+				
+				if  (cost_cube[i * 3 + 2] < min_gradient)
+				{
+					min_gradient = cost_cube[i * 3 + 2]; 
+					moving_joint = i;
+					move_direction = 1;
+				}
+			}
+			
+			if (moving_joint == -1)
+			{
+				break;
+			}
+			
+			positions[moving_joint] += move_direction;
+			
+			/* update vector cache */
+			bucket = peekBucket(&iter, positions[moving_joint]);
+			vec_cache[moving_joint + 1] = bucket->p;
+
+			/* update cost cube */			
+			for (previous = iarc->edges.first, edge = previous->next, i = 0;
+				 edge;
+				 previous = edge, edge = edge->next, i += 1)
+			{
+				if (i == moving_joint - 1 ||
+					i == moving_joint ||
+					i == moving_joint + 1)
+				{
+					calcGradient(previous, edge, &iter, i, nb_joints, cost_cube, positions, vec_cache);
+				}
+			}
+			
+			
+		}
+		
+		memcpy(best_positions, positions, sizeof(int) * nb_joints);
+		
+		MEM_freeN(cost_cube);
+	}
+#endif
 
 	vec0 = node_start->p;
 	initArcIterator(&iter, earc, node_start);
@@ -767,7 +1011,8 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 			printf("===\n");
 			printvecf("vec0", vec0);
 			printvecf("vec1", vec1);
-			printf("position: %i\n", best_positions[i]);
+			if (i < nb_joints)
+				printf("position: %i\n", best_positions[i]);
 			printf("last_index: %i\n", last_index);
 		}
 		
diff --git a/source/blender/src/reeb.c b/source/blender/src/reeb.c
index 003cb707d1e..c1ac4295261 100644
--- a/source/blender/src/reeb.c
+++ b/source/blender/src/reeb.c
@@ -228,6 +228,7 @@ void calculateArcLength(ReebArc *arc)
 	bucket = nextBucket(&iter);
 	
 	vec0 = arc->head->p;
+	vec1 = arc->head->p; /* in case there's no embedding */
 	
 	while (bucket != NULL)
 	{
@@ -2431,8 +2432,8 @@ EmbedBucket * nextNBucket(ReebArcIterator *iter, int n)
 	iter->index += n * iter->stride;
 
 	/* check if passed end */
-	if ((iter->stride == 1 && iter->index < iter->end) ||
-		(iter->stride == -1 && iter->index > iter->end))
+	if ((iter->stride == 1 && iter->index <= iter->end) ||
+		(iter->stride == -1 && iter->index >= iter->end))
 	{
 		result = &(iter->arc->buckets[iter->index]);
 	}
@@ -2445,6 +2446,21 @@ EmbedBucket * nextNBucket(ReebArcIterator *iter, int n)
 	return result;
 }
 
+EmbedBucket * peekBucket(ReebArcIterator *iter, int n)
+{
+	EmbedBucket *result = NULL;
+	int index = iter->index + n * iter->stride;
+
+	/* check if passed end */
+	if ((iter->stride == 1 && index <= iter->end && index >= iter->start) ||
+		(iter->stride == -1 && index >= iter->end && index <= iter->start))
+	{
+		result = &(iter->arc->buckets[index]);
+	}
+	
+	return result;
+}
+
 EmbedBucket * previousBucket(struct ReebArcIterator *iter)
 {
 	EmbedBucket *result = NULL;

From d8171e4bc6c25200661542ad9a42e8e41bb748c4 Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Fri, 13 Jun 2008 22:23:24 +0000
Subject: [PATCH 046/252] soc-2008-mxcurioni: removed static dependencies
 (formerly fixed in app_blender/test_config.h). From now on, to use the
 branch, one needs to define a FREESTYLE_BLENDER_DIR environment variable to
 point to the Freestyle directory source/blender/freestyle

---
 .../intern/app_blender/AppConfig.cpp          |  6 +-----
 .../intern/app_blender/Controller.cpp         |  8 +++-----
 .../freestyle/intern/app_blender/api.cpp      | 19 ++++++++++++-------
 .../intern/app_blender/test_config.h          | 10 ----------
 4 files changed, 16 insertions(+), 27 deletions(-)
 delete mode 100644 source/blender/freestyle/intern/app_blender/test_config.h

diff --git a/source/blender/freestyle/intern/app_blender/AppConfig.cpp b/source/blender/freestyle/intern/app_blender/AppConfig.cpp
index a2fa8787fa9..37d139f54e3 100755
--- a/source/blender/freestyle/intern/app_blender/AppConfig.cpp
+++ b/source/blender/freestyle/intern/app_blender/AppConfig.cpp
@@ -18,8 +18,6 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "test_config.h"
-
 #include "AppConfig.h"
 #include <iostream>
 
@@ -34,10 +32,8 @@ namespace Config{
     _HomeDir = getEnvVar("HOME");
     // get the root directory
 	//soc
-	//setRootDir(getEnvVar("FREESTYLE_BLENDER_DIR"));
-	setRootDir( TEST_ROOT_DIR );
+	setRootDir(getEnvVar("FREESTYLE_BLENDER_DIR"));
 
-//setRootDir(QString("."));
     _pInstance = this;
   }
   void Path::setRootDir(const string& iRootDir){
diff --git a/source/blender/freestyle/intern/app_blender/Controller.cpp b/source/blender/freestyle/intern/app_blender/Controller.cpp
index 8b494ff5108..9abf082d5cc 100755
--- a/source/blender/freestyle/intern/app_blender/Controller.cpp
+++ b/source/blender/freestyle/intern/app_blender/Controller.cpp
@@ -64,8 +64,6 @@
 
 #include "../system/StringUtils.h"
 
-#include "test_config.h"
-
 Controller::Controller()
 {
 	
@@ -1062,7 +1060,7 @@ void Controller::init_options(){
 // 	Default init options
 
 	Config::Path * cpath = Config::Path::getInstance();
-
+	
 	// Directories
 	ViewMapIO::Options::setModelsPath( StringUtils::toAscii( cpath->getModelsPath() ) ); 
 	PythonInterpreter::Options::setPythonPath( StringUtils::toAscii( cpath->getPythonPath() ) );
@@ -1079,8 +1077,8 @@ void Controller::init_options(){
 
 	 // Papers Textures
 	vector<string> sl;
-	sl.push_back( StringUtils::toAscii( TEST_TEXTURE_FILE ) );
-	TextureManager::Options::setPaperTextures(sl);
+	sl.push_back( StringUtils::toAscii( cpath->getPapersDir() + Config::DEFAULT_PAPER_TEXTURE ) );
+	TextureManager::Options::setPaperTextures( sl );
 
 	// Drawing Buffers
 	setFrontBufferFlag(false);
diff --git a/source/blender/freestyle/intern/app_blender/api.cpp b/source/blender/freestyle/intern/app_blender/api.cpp
index c097b64ef53..2a7868304ea 100644
--- a/source/blender/freestyle/intern/app_blender/api.cpp
+++ b/source/blender/freestyle/intern/app_blender/api.cpp
@@ -2,7 +2,6 @@
 #include "AppGLWidget.h"
 #include "Controller.h"
 #include "AppConfig.h"
-#include "test_config.h"
 
 #include <iostream>
 
@@ -28,9 +27,8 @@ extern "C" {
 
 	static Controller *controller = NULL;
 	static AppGLWidget *view = NULL;
-
+	
 	void FRS_initialize(){
-		Config::Path pathconfig;
 		
 		if( controller == NULL )
 			controller = new Controller;
@@ -40,7 +38,8 @@ extern "C" {
 	}
 
 	void FRS_execute(Render* re) {
-			
+		
+		Config::Path pathconfig;
 		FRS_initialize();
 		
 		controller->SetView(view);
@@ -51,12 +50,15 @@ extern "C" {
 		view->_camera->setScreenWidthAndHeight(width, height);
 		//view->setCameraState(const float* position, const float* orientation) 
 		
-		BPY_run_python_script( TEST_3DS_EXPORT );
+		string script_3ds_export = 	pathconfig.getProjectDir() + 
+									Config::DIR_SEP + "python" + 
+									Config::DIR_SEP + "3ds_export.py";
+		BPY_run_python_script( const_cast<char *>(script_3ds_export.c_str()) );
 		
 		char btempdir[255];
 		BLI_where_is_temp(btempdir,1);
 		string exported_3ds_file =  btempdir;
-		exported_3ds_file += "/tmp_scene_freestyle.3ds";
+		exported_3ds_file += Config::DIR_SEP + "tmp_scene_freestyle.3ds";
 		if( BLI_exists( const_cast<char *>(exported_3ds_file.c_str()) ) ) {
 			controller->Load3DSFile( exported_3ds_file.c_str() );
 		}
@@ -65,7 +67,10 @@ extern "C" {
 			return;
 		}
 		
-		controller->InsertStyleModule( 0, TEST_STYLE_MODULE_FILE );
+		string style_module = pathconfig.getProjectDir() + 
+								Config::DIR_SEP + "style_modules" + 
+								Config::DIR_SEP + "contour.py";
+		controller->InsertStyleModule( 0, const_cast<char *>(style_module.c_str()) 	 );
 		controller->toggleLayer(0, true);
 		controller->ComputeViewMap();
 		
diff --git a/source/blender/freestyle/intern/app_blender/test_config.h b/source/blender/freestyle/intern/app_blender/test_config.h
deleted file mode 100644
index c2337c0ba4c..00000000000
--- a/source/blender/freestyle/intern/app_blender/test_config.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#define TEST_STYLE_MODULE_FILE "/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules/contour.py"
-
-#define TEST_ROOT_DIR "/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/soc-2008-mxcurioni/source/blender/freestyle"
-
-#define TEST_TEXTURE_FILE "/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/soc-2008-mxcurioni/source/blender/freestyle/data/textures/papers/whitepaper.jpg"
-
-
-
-
-#define TEST_3DS_EXPORT "/Users/mx/Documents/work/GSoC_2008/bf-blender/branches/soc-2008-mxcurioni/source/blender/freestyle/python/3ds_export.py"

From dfa10eba19012fb7a20233a3d434c67f32de10db Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Mon, 16 Jun 2008 00:51:19 +0000
Subject: [PATCH 047/252] soc-2008-mxcurioni: Freestyle now supports camera
 information (the image is still a bit larger than Blender's internal
 renderer, probably a field of view problem). 3d scene is now no longer
 rendered, only 2d scene (strokes from view map information) is. Style module
 is still static (contour.py), will soon be handled via independent UI panel.

Phase 1 is considered finished. Phase 2 starts now: the objective is integrating Freestyle as an independent render layer.
---
 .../intern/app_blender/AppGLWidget.cpp        |   2 +-
 .../intern/app_blender/AppGLWidget.h          |   6 +-
 .../intern/app_blender/Controller.cpp         | 288 +++++++++---------
 .../freestyle/intern/app_blender/api.cpp      |  33 +-
 .../blender/render/intern/source/pipeline.c   |  14 +-
 5 files changed, 189 insertions(+), 154 deletions(-)

diff --git a/source/blender/freestyle/intern/app_blender/AppGLWidget.cpp b/source/blender/freestyle/intern/app_blender/AppGLWidget.cpp
index a06e25d72be..34a96681c50 100755
--- a/source/blender/freestyle/intern/app_blender/AppGLWidget.cpp
+++ b/source/blender/freestyle/intern/app_blender/AppGLWidget.cpp
@@ -130,7 +130,7 @@ AppGLWidget::AppGLWidget(const char *iName)
   _debug = false;
   _selection_mode = false;
   _Draw2DScene = true;
-  _Draw3DScene = true;
+  _Draw3DScene = false;
   _drawEnvMap = false;
   _currentEnvMap = 1;
   _maxId = 0;
diff --git a/source/blender/freestyle/intern/app_blender/AppGLWidget.h b/source/blender/freestyle/intern/app_blender/AppGLWidget.h
index 319fc248494..175eb67ba69 100755
--- a/source/blender/freestyle/intern/app_blender/AppGLWidget.h
+++ b/source/blender/freestyle/intern/app_blender/AppGLWidget.h
@@ -401,9 +401,9 @@ public:
 
   inline bool getRecordFlag() const {return _record;}
 
-  void setCameraState(const float* position, const float* orientation) {
-    _camera->setPosition(Vec(position[0], position[1], position[2]));
-    _camera->setOrientation(Quaternion(orientation[0], orientation[1], orientation[2], orientation[3]));
+  void setCameraState(const Vec& position, const Quaternion& orientation) {
+    _camera->setPosition(position);
+    _camera->setOrientation(orientation);
   }
 
   void getCameraState(float* position, float* orientation) const {
diff --git a/source/blender/freestyle/intern/app_blender/Controller.cpp b/source/blender/freestyle/intern/app_blender/Controller.cpp
index 9abf082d5cc..9a820b835ca 100755
--- a/source/blender/freestyle/intern/app_blender/Controller.cpp
+++ b/source/blender/freestyle/intern/app_blender/Controller.cpp
@@ -209,7 +209,7 @@ int Controller::Load3DSFile(const char *iFileName)
   _RootNode->UpdateBBox(); // FIXME: Correct that by making a Renderer to compute the bbox
 
   _pView->SetModel(_RootNode);
-  _pView->FitBBox();
+  //_pView->FitBBox();
 
 
   _Chrono.start();
@@ -399,149 +399,149 @@ void Controller::SaveViewMapFile(const char *oFileName)
   cout << "ViewMap saving   : " << d << endl;
 }
 
-void Controller::LoadViewMapFile(const char *iFileName, bool only_camera)
-{
-  ifstream ifs(iFileName, ios::binary);
-  if (!ifs.is_open()) {
-    cerr << "Error: Cannot load this file" << endl;
-    return;
-  }
-//    char buffer[buffer_size];
-//  #if defined(__GNUC__) && (__GNUC__ < 3)
-//    ifs.rdbuf()->setbuf(buffer, buffer_size);
-//  # else
-//    ifs.rdbuf()->pubsetbuf(buffer, buffer_size);
-//  #endif
-
-  // Test File Magic and version
-  char tmp_buffer[256];
-  string test;
-  
-  ifs.getline(tmp_buffer, 255);
-  test = tmp_buffer;
-  if (test != Config::VIEWMAP_MAGIC) {
-    cerr << "Error: This is not a valid ." << Config::VIEWMAP_EXTENSION << " file" << endl;
-    return;
-  }
-  ifs.getline(tmp_buffer, 255);
-  test = tmp_buffer;
-  if (test != Config::VIEWMAP_VERSION && !only_camera) {
-    cerr << "Error: This version of the ." << Config::VIEWMAP_EXTENSION << " file format is no longer supported" << endl;
-    return;
-  }
-
-  // Read the models filenames and open them (if not already done)
-  string tmp;
-  vector<string> tmp_vec;
-  unsigned models_nb, i;
-
-  ifs.getline(tmp_buffer, 255);
-  models_nb = atoi(tmp_buffer);
-  for (i = 0; i < models_nb; i++) {
-    ifs.getline(tmp_buffer, 255);
-    tmp = tmp_buffer;
-    tmp_vec.push_back(tmp);
-  }
-  if (_ListOfModels != tmp_vec && !only_camera) {
-    CloseFile();
-    vector<string> pathnames;
-    int err = 0;
-    for (vector<string>::const_iterator i = tmp_vec.begin(); i != tmp_vec.end(); i++)
-      {
-	pathnames.clear();
-	StringUtils::getPathName(ViewMapIO::Options::getModelsPath(), *i, pathnames);
-	for (vector<string>::const_iterator j = pathnames.begin(); j != pathnames.end(); j++)
-	  if (!(err = Load3DSFile(j->c_str())))
-	    break;
-	if (err) {
-	  cerr << "Error: cannot find model \"" << *i << "\" - check the path in the Options" << endl;
-	  return;
-	}
-      }
-  }
-
-  // Set the camera position
-  float position[3];
-  float orientation[4];
-  ifs.read((char*)position, 3 * sizeof(*position));
-  ifs.read((char*)orientation, 4 * sizeof(*orientation));
-  _pView->setCameraState(position, orientation);
-  _pView->saveCameraState();
-
-  if (only_camera) {
-    return;
-  }
-
-  // Reset ViewMap
-  if(NULL != _ViewMap)
-    {
-      delete _ViewMap;
-      _ViewMap = 0;
-    }
-  _pView->DetachSilhouette();
-  if (NULL != _SilhouetteNode)
-    {
-      int ref = _SilhouetteNode->destroy();
-      if(0 == ref)
-	delete _SilhouetteNode;
-    }
-  //  if(NULL != _ProjectedSilhouette)
-  //    {
-  //      int ref = _ProjectedSilhouette->destroy();
-  //      if(0 == ref)
-  //	delete _ProjectedSilhouette;
-  //    }
-  //  if(NULL != _VisibleProjectedSilhouette)
-  //    {
-  //      int ref = _VisibleProjectedSilhouette->destroy();
-  //      if(0 == ref)
-  //	{
-  //	  delete _VisibleProjectedSilhouette;
-  //	  _VisibleProjectedSilhouette = 0;
-  //	}
-   // }
-  _ViewMap = new ViewMap();
-
-  // Read ViewMap
-  _Chrono.start();
-  if (ViewMapIO::load(ifs, _ViewMap, 0)) {
-    _Chrono.stop();
-
-    cerr << "Error: This is not a valid ." << Config::VIEWMAP_EXTENSION << " file" << endl;
-    return;
-  }
-
-  // Update display
-  ViewMapTesselator3D sTesselator3d;
-  //ViewMapTesselator2D sTesselator2d;
-  //sTesselator2d.SetNature(_edgeTesselationNature);
-  sTesselator3d.SetNature(_edgeTesselationNature);
-  
-  // Tesselate the 3D edges:
-  _SilhouetteNode = sTesselator3d.Tesselate(_ViewMap);
-  _SilhouetteNode->addRef();
-  
-  // Tesselate 2D edges
-  //  _ProjectedSilhouette = sTesselator2d.Tesselate(_ViewMap);
-  //  _ProjectedSilhouette->addRef();
-  //  
-  _pView->AddSilhouette(_SilhouetteNode);
-  //_pView->Add2DSilhouette(_ProjectedSilhouette);
-
-  // Update options window
-  //_pOptionsWindow->updateViewMapFormat();
-
-  real d = _Chrono.stop();
-  cout << "ViewMap loading  : " << d << endl;
-
-  // Compute the Directional ViewMap:
-  if(_ComputeSteerableViewMap){
-    ComputeSteerableViewMap();
-  }
-
-  // Reset Style modules modification flags
-  resetModified(true);
-}
+// void Controller::LoadViewMapFile(const char *iFileName, bool only_camera)
+// {
+//   ifstream ifs(iFileName, ios::binary);
+//   if (!ifs.is_open()) {
+//     cerr << "Error: Cannot load this file" << endl;
+//     return;
+//   }
+// //    char buffer[buffer_size];
+// //  #if defined(__GNUC__) && (__GNUC__ < 3)
+// //    ifs.rdbuf()->setbuf(buffer, buffer_size);
+// //  # else
+// //    ifs.rdbuf()->pubsetbuf(buffer, buffer_size);
+// //  #endif
+// 
+//   // Test File Magic and version
+//   char tmp_buffer[256];
+//   string test;
+//   
+//   ifs.getline(tmp_buffer, 255);
+//   test = tmp_buffer;
+//   if (test != Config::VIEWMAP_MAGIC) {
+//     cerr << "Error: This is not a valid ." << Config::VIEWMAP_EXTENSION << " file" << endl;
+//     return;
+//   }
+//   ifs.getline(tmp_buffer, 255);
+//   test = tmp_buffer;
+//   if (test != Config::VIEWMAP_VERSION && !only_camera) {
+//     cerr << "Error: This version of the ." << Config::VIEWMAP_EXTENSION << " file format is no longer supported" << endl;
+//     return;
+//   }
+// 
+//   // Read the models filenames and open them (if not already done)
+//   string tmp;
+//   vector<string> tmp_vec;
+//   unsigned models_nb, i;
+// 
+//   ifs.getline(tmp_buffer, 255);
+//   models_nb = atoi(tmp_buffer);
+//   for (i = 0; i < models_nb; i++) {
+//     ifs.getline(tmp_buffer, 255);
+//     tmp = tmp_buffer;
+//     tmp_vec.push_back(tmp);
+//   }
+//   if (_ListOfModels != tmp_vec && !only_camera) {
+//     CloseFile();
+//     vector<string> pathnames;
+//     int err = 0;
+//     for (vector<string>::const_iterator i = tmp_vec.begin(); i != tmp_vec.end(); i++)
+//       {
+// 	pathnames.clear();
+// 	StringUtils::getPathName(ViewMapIO::Options::getModelsPath(), *i, pathnames);
+// 	for (vector<string>::const_iterator j = pathnames.begin(); j != pathnames.end(); j++)
+// 	  if (!(err = Load3DSFile(j->c_str())))
+// 	    break;
+// 	if (err) {
+// 	  cerr << "Error: cannot find model \"" << *i << "\" - check the path in the Options" << endl;
+// 	  return;
+// 	}
+//       }
+//   }
+// 
+//   // Set the camera position
+//   float position[3];
+//   float orientation[4];
+//   ifs.read((char*)position, 3 * sizeof(*position));
+//   ifs.read((char*)orientation, 4 * sizeof(*orientation));
+//   _pView->setCameraState(position, orientation);
+//   _pView->saveCameraState();
+// 
+//   if (only_camera) {
+//     return;
+//   }
+// 
+//   // Reset ViewMap
+//   if(NULL != _ViewMap)
+//     {
+//       delete _ViewMap;
+//       _ViewMap = 0;
+//     }
+//   _pView->DetachSilhouette();
+//   if (NULL != _SilhouetteNode)
+//     {
+//       int ref = _SilhouetteNode->destroy();
+//       if(0 == ref)
+// 	delete _SilhouetteNode;
+//     }
+//   //  if(NULL != _ProjectedSilhouette)
+//   //    {
+//   //      int ref = _ProjectedSilhouette->destroy();
+//   //      if(0 == ref)
+//   //	delete _ProjectedSilhouette;
+//   //    }
+//   //  if(NULL != _VisibleProjectedSilhouette)
+//   //    {
+//   //      int ref = _VisibleProjectedSilhouette->destroy();
+//   //      if(0 == ref)
+//   //	{
+//   //	  delete _VisibleProjectedSilhouette;
+//   //	  _VisibleProjectedSilhouette = 0;
+//   //	}
+//    // }
+//   _ViewMap = new ViewMap();
+// 
+//   // Read ViewMap
+//   _Chrono.start();
+//   if (ViewMapIO::load(ifs, _ViewMap, 0)) {
+//     _Chrono.stop();
+// 
+//     cerr << "Error: This is not a valid ." << Config::VIEWMAP_EXTENSION << " file" << endl;
+//     return;
+//   }
+// 
+//   // Update display
+//   ViewMapTesselator3D sTesselator3d;
+//   //ViewMapTesselator2D sTesselator2d;
+//   //sTesselator2d.SetNature(_edgeTesselationNature);
+//   sTesselator3d.SetNature(_edgeTesselationNature);
+//   
+//   // Tesselate the 3D edges:
+//   _SilhouetteNode = sTesselator3d.Tesselate(_ViewMap);
+//   _SilhouetteNode->addRef();
+//   
+//   // Tesselate 2D edges
+//   //  _ProjectedSilhouette = sTesselator2d.Tesselate(_ViewMap);
+//   //  _ProjectedSilhouette->addRef();
+//   //  
+//   _pView->AddSilhouette(_SilhouetteNode);
+//   //_pView->Add2DSilhouette(_ProjectedSilhouette);
+// 
+//   // Update options window
+//   //_pOptionsWindow->updateViewMapFormat();
+// 
+//   real d = _Chrono.stop();
+//   cout << "ViewMap loading  : " << d << endl;
+// 
+//   // Compute the Directional ViewMap:
+//   if(_ComputeSteerableViewMap){
+//     ComputeSteerableViewMap();
+//   }
+// 
+//   // Reset Style modules modification flags
+//   resetModified(true);
+// }
 
 void Controller::ComputeViewMap()
 {
diff --git a/source/blender/freestyle/intern/app_blender/api.cpp b/source/blender/freestyle/intern/app_blender/api.cpp
index 2a7868304ea..ba583080e79 100644
--- a/source/blender/freestyle/intern/app_blender/api.cpp
+++ b/source/blender/freestyle/intern/app_blender/api.cpp
@@ -35,26 +35,41 @@ extern "C" {
 		
 		if( view == NULL )
 			view = new AppGLWidget;
+		
+		controller->SetView(view);
 	}
 
 	void FRS_execute(Render* re) {
 		
+		// instanciation
 		Config::Path pathconfig;
 		FRS_initialize();
 		
-		controller->SetView(view);
+		// initialize view dimensions
 		unsigned int width = re->winx;
 		unsigned int height = re->winy;
 		view->setWidth(width);
 		view->setHeight(height);
 		view->_camera->setScreenWidthAndHeight(width, height);
-		//view->setCameraState(const float* position, const float* orientation) 
 		
+		// initialize camera
+		Object* maincam_obj = re->scene->camera;
+		Vec camPosition(maincam_obj->obmat[3][0], maincam_obj->obmat[3][1], maincam_obj->obmat[3][2]);
+		Vec camUp( re->viewmat[0][1], re->viewmat[1][1], re->viewmat[2][1]);
+		Vec camDirection( -re->viewmat[0][2], -re->viewmat[1][2], - re->viewmat[2][2]);
+		
+		view->_camera->setType(Camera::PERSPECTIVE);
+		view->_camera->setPosition(camPosition);
+		view->_camera->setUpVector(camUp);	
+		view->_camera->setViewDirection(camDirection);	
+		
+		// export scene to 3ds format
 		string script_3ds_export = 	pathconfig.getProjectDir() + 
 									Config::DIR_SEP + "python" + 
 									Config::DIR_SEP + "3ds_export.py";
 		BPY_run_python_script( const_cast<char *>(script_3ds_export.c_str()) );
 		
+		// load 3ds scene
 		char btempdir[255];
 		BLI_where_is_temp(btempdir,1);
 		string exported_3ds_file =  btempdir;
@@ -67,22 +82,30 @@ extern "C" {
 			return;
 		}
 		
+		// add style module
 		string style_module = pathconfig.getProjectDir() + 
 								Config::DIR_SEP + "style_modules" + 
 								Config::DIR_SEP + "contour.py";
 		controller->InsertStyleModule( 0, const_cast<char *>(style_module.c_str()) 	 );
 		controller->toggleLayer(0, true);
+		
+		// compute view map
 		controller->ComputeViewMap();
 		
-		controller->DrawStrokes(); // build strokes
-		view->draw(); // render final result
+		// build strokes
+		controller->DrawStrokes(); 
 		
+		// render final result
+		view->draw(); 
+		
+		// copy result into render window
 		RenderResult rres;
 		RE_GetResultImage(re, &rres);
 		view->readPixels(0,0,width,height,AppGLWidget::RGBA, rres.rectf );		
 		re->result->renlay = render_get_active_layer(re, re->result);
 		re->display_draw(re->result, NULL);
-
+		
+		controller->CloseFile();
 	}
 	
 #ifdef __cplusplus
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 41ad21f4544..5b2c7114fe3 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -2194,14 +2194,26 @@ static void do_render_composite_fields_blur_3d(Render *re)
 
 static void freestyleRender(Render *re)
 {
+	float mat[4][4];
+	
+	// init render result
 	RE_FreeRenderResult(re->result);
 	re->result = new_render_result(re, &re->disprect, 0, RR_USEMEM);
 	
+	// set camera
 	RE_SetCamera(re, re->scene->camera);
 	
-	FRS_execute(re);
+	// set view
+	Mat4Ortho(re->scene->camera->obmat);
+	Mat4Invert(mat, re->scene->camera->obmat);
+	RE_SetView(re, mat);
 	
+	// run Freestyle
+	re->i.starttime = PIL_check_seconds_timer();
+	FRS_execute(re);
+	re->i.lastframetime = PIL_check_seconds_timer()- re->i.starttime;
 	re->stats_draw(&re->i);
+	
 	RE_Database_Free(re);
 }
 

From 05ce388f358b1cfa7bc7c63e29bd772efbf25d39 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Tue, 17 Jun 2008 19:26:26 +0000
Subject: [PATCH 048/252] Added functions to the BPy Text object for
 positioning the cursor and inserting text. It seems Text.write() actually
 inserts *then* moves to the end of the buffer, so it doesn't really append as
 it says in the docs. However, with these new functions both appending and
 inserting can be achieved.

---
 source/blender/blenkernel/BKE_text.h      |  1 +
 source/blender/blenkernel/intern/text.c   | 11 +++-
 source/blender/python/api2_2x/Text.c      | 69 +++++++++++++++++++++++
 source/blender/python/api2_2x/doc/Text.py | 25 ++++++++
 4 files changed, 104 insertions(+), 2 deletions(-)

diff --git a/source/blender/blenkernel/BKE_text.h b/source/blender/blenkernel/BKE_text.h
index 45b4034549f..10223589859 100644
--- a/source/blender/blenkernel/BKE_text.h
+++ b/source/blender/blenkernel/BKE_text.h
@@ -66,6 +66,7 @@ void	txt_move_eof		(struct Text *text, short sel);
 void	txt_move_bol		(struct Text *text, short sel);
 void	txt_move_eol		(struct Text *text, short sel);
 void	txt_move_toline		(struct Text *text, unsigned int line, short sel);
+void	txt_move_to			(struct Text *text, unsigned int line, unsigned int ch, short sel);
 void	txt_pop_sel			(struct Text *text);
 void	txt_delete_char		(struct Text *text);
 void	txt_delete_word		(struct Text *text);
diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c
index 1c7b505752f..fbb94289166 100644
--- a/source/blender/blenkernel/intern/text.c
+++ b/source/blender/blenkernel/intern/text.c
@@ -828,6 +828,11 @@ void txt_move_eof (Text *text, short sel)
 }
 
 void txt_move_toline (Text *text, unsigned int line, short sel)
+{
+	txt_move_to(text, line, 0, sel);
+}
+
+void txt_move_to (Text *text, unsigned int line, unsigned int ch, short sel)
 {
 	TextLine **linep, *oldl;
 	int *charp, oldc;
@@ -845,10 +850,12 @@ void txt_move_toline (Text *text, unsigned int line, short sel)
 		if ((*linep)->next) *linep= (*linep)->next;
 		else break;
 	}
-	*charp= 0;
+	if (ch>(*linep)->len)
+		ch= (*linep)->len;
+	*charp= ch;
 	
 	if(!sel) txt_pop_sel(text);
-	if(!undoing) txt_undo_add_toop(text, sel?UNDO_STO:UNDO_CTO, txt_get_span(text->lines.first, oldl), oldc, txt_get_span(text->lines.first, *linep), (unsigned short)*charp);	
+	if(!undoing) txt_undo_add_toop(text, sel?UNDO_STO:UNDO_CTO, txt_get_span(text->lines.first, oldl), oldc, txt_get_span(text->lines.first, *linep), (unsigned short)*charp);
 }
 
 /****************************/
diff --git a/source/blender/python/api2_2x/Text.c b/source/blender/python/api2_2x/Text.c
index 308ad094c7b..603deb768ad 100644
--- a/source/blender/python/api2_2x/Text.c
+++ b/source/blender/python/api2_2x/Text.c
@@ -91,8 +91,11 @@ static PyObject *Text_getFilename( BPy_Text * self );
 static PyObject *Text_getNLines( BPy_Text * self );
 static PyObject *Text_clear( BPy_Text * self );
 static PyObject *Text_write( BPy_Text * self, PyObject * value );
+static PyObject *Text_insert( BPy_Text * self, PyObject * value );
 static PyObject *Text_set( BPy_Text * self, PyObject * args );
 static PyObject *Text_asLines( BPy_Text * self );
+static PyObject *Text_getCursorPos( BPy_Text * self );
+static PyObject *Text_setCursorPos( BPy_Text * self, PyObject * args );
 
 /*****************************************************************************/
 /* Python BPy_Text methods table:                                            */
@@ -111,10 +114,16 @@ static PyMethodDef BPy_Text_methods[] = {
 	 "() - Clear Text buffer"},
 	{"write", ( PyCFunction ) Text_write, METH_O,
 	 "(line) - Append string 'str' to Text buffer"},
+	{"insert", ( PyCFunction ) Text_insert, METH_O,
+	 "(line) - Insert string 'str' to Text buffer at cursor location"},
 	{"set", ( PyCFunction ) Text_set, METH_VARARGS,
 	 "(name, val) - Set attribute 'name' to value 'val'"},
 	{"asLines", ( PyCFunction ) Text_asLines, METH_NOARGS,
 	 "() - Return text buffer as a list of lines"},
+	{"getCursorPos", ( PyCFunction ) Text_getCursorPos, METH_NOARGS,
+	 "() - Return cursor position as (row, col) tuple"},
+	{"setCursorPos", ( PyCFunction ) Text_setCursorPos, METH_VARARGS,
+	 "(row, col) - Set the cursor position to (row, col)"},
 	{NULL, NULL, 0, NULL}
 };
 
@@ -416,6 +425,26 @@ static PyObject *Text_write( BPy_Text * self, PyObject * value )
 	Py_RETURN_NONE;
 }
 
+static PyObject *Text_insert( BPy_Text * self, PyObject * value )
+{
+	char *str = PyString_AsString(value);
+	int oldstate;
+
+	if( !self->text )
+		return EXPP_ReturnPyObjError( PyExc_RuntimeError,
+					      "This object isn't linked to a Blender Text Object" );
+
+	if( !str )
+		return EXPP_ReturnPyObjError( PyExc_TypeError,
+					      "expected string argument" );
+
+	oldstate = txt_get_undostate(  );
+	txt_insert_buf( self->text, str );
+	txt_set_undostate( oldstate );
+
+	Py_RETURN_NONE;
+}
+
 static PyObject *Text_asLines( BPy_Text * self )
 {
 	TextLine *line;
@@ -442,6 +471,46 @@ static PyObject *Text_asLines( BPy_Text * self )
 	return list;
 }
 
+static PyObject *Text_getCursorPos( BPy_Text * self )
+{
+	Text *text;
+	TextLine *linep;
+	int row, col;
+
+	text = self->text;
+	if( !text )
+		return EXPP_ReturnPyObjError( PyExc_RuntimeError,
+					      "This object isn't linked to a Blender Text Object" );
+
+	for (row=0,linep=text->lines.first; linep!=text->curl; linep=linep->next)
+		row++;
+	col= text->curc;
+
+	return Py_BuildValue( "ii", row, col );
+}
+
+static PyObject *Text_setCursorPos( BPy_Text * self, PyObject * args )
+{
+	int row, col;
+	int oldstate;
+
+	if(!self->text)
+		return EXPP_ReturnPyObjError(PyExc_RuntimeError,
+					      "This object isn't linked to a Blender Text Object");
+
+	if (!PyArg_ParseTuple(args, "ii", &row, &col))
+		return EXPP_ReturnPyObjError(PyExc_TypeError,
+					      "expected two ints as arguments.");
+	if (col<0) col=0;
+	if (col>self->text->curl->len) col=self->text->curl->len;
+
+	oldstate = txt_get_undostate();
+	txt_move_to(self->text, row, col, 0);
+	txt_set_undostate(oldstate);
+
+	Py_RETURN_NONE;
+}
+
 /*****************************************************************************/
 /* Function:    Text_compare                                                 */
 /* Description: This is a callback function for the BPy_Text type. It        */
diff --git a/source/blender/python/api2_2x/doc/Text.py b/source/blender/python/api2_2x/doc/Text.py
index 98ecb664b71..4099b13828d 100644
--- a/source/blender/python/api2_2x/doc/Text.py
+++ b/source/blender/python/api2_2x/doc/Text.py
@@ -118,6 +118,13 @@ class Text:
 		@param data:  The string to append to the text buffer.
 		"""
 
+	def insert(data):
+		"""
+		Inserts a string into this Text buffer at the cursor.
+		@type data: string
+		@param data:  The string to insert into the text buffer.
+		"""
+
 	def asLines():
 		"""
 		Retrieve the contents of this Text buffer as a list of strings.
@@ -125,5 +132,23 @@ class Text:
 		@return:  A list of strings, one for each line in the buffer
 		"""
 
+	def getCursorPos():
+		"""
+		Retrieve the position of the cursor in this Text buffer.
+		@rtype: (int, int)
+		@return:  A pair (row, col) indexing the line and character of the
+			cursor.
+		"""
+
+	def setCursorPos(row, col):
+		"""
+		Set the position of the cursor in this Text buffer.
+		@type row: int
+		@param row:  The index of the line in which to position the cursor.
+		@type col: int
+		@param col:  The index of the character within the line to position the
+			cursor.
+		"""
+
 import id_generics
 Text.__doc__ += id_generics.attributes
\ No newline at end of file

From 42eed5093553de5242b5ba2b3eb965519716346c Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Tue, 17 Jun 2008 21:00:06 +0000
Subject: [PATCH 049/252] Distance parameter for retargeting. Keeps bones close
 to the embedding (pretty much the same thing as the correlation/distance
 parameter when generating).

This is very slow though, the naive approach to optimising the solution is starting to take its toll.
---
 source/blender/include/reeb.h             |   1 +
 source/blender/makesdna/DNA_scene_types.h |   2 +-
 source/blender/src/autoarmature.c         | 131 +++++++++++++---------
 source/blender/src/buttons_editing.c      |   5 +-
 source/blender/src/reeb.c                 |   6 +
 5 files changed, 89 insertions(+), 56 deletions(-)

diff --git a/source/blender/include/reeb.h b/source/blender/include/reeb.h
index ea556c8316d..c6be9ba2fbe 100644
--- a/source/blender/include/reeb.h
+++ b/source/blender/include/reeb.h
@@ -109,6 +109,7 @@ typedef struct ReebArcIterator {
 	int start;
 	int end;
 	int stride;
+	int length;
 } ReebArcIterator;
 
 struct EditMesh;
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index ba25dd7ae7d..1e10821ab37 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -435,6 +435,7 @@ typedef struct ToolSettings {
 	float skgen_symmetry_limit;
 	float skgen_retarget_angle_weight;
 	float skgen_retarget_length_weight;
+	float skgen_retarget_distance_weight;
 	short skgen_options;
 	char  skgen_postpro;
 	char  skgen_postpro_passes;
@@ -442,7 +443,6 @@ typedef struct ToolSettings {
 	
 	/* Alt+RMB option */
 	char edge_mode;
-	char pad3[4];
 } ToolSettings;
 
 /* Used by all brushes to store their properties, which can be directly set
diff --git a/source/blender/src/autoarmature.c b/source/blender/src/autoarmature.c
index cd0147a052e..a058c67c71a 100644
--- a/source/blender/src/autoarmature.c
+++ b/source/blender/src/autoarmature.c
@@ -555,15 +555,49 @@ static void printPositions(int *positions, int nb_positions)
 	printf("\n");
 }
 
-static float calcCost(ReebArc *earc, RigEdge *e1, RigEdge *e2, float *vec0, float *vec1, float *vec2, int i0, int i1, int i2)
+static float calcMaximumDistance(ReebArcIterator *iter, float *vec0, float *vec1, int i0, int i1)
 {
-	ReebArcIterator iter2;
 	EmbedBucket *bucket = NULL;
-	float max_dist;
+	float max_dist = 0;
+	float v1[3], v2[3], c[3];
+	float v1_inpf;
+
+	VecSubf(v1, vec0, vec1);
 	
+	v1_inpf = Inpf(v1, v1);
+	
+	if (v1_inpf > 0)
+	{
+		int j;
+		for (j = i0; j < i1; j++)
+		{
+			float dist;
+			
+			bucket = peekBucket(iter, j);
+
+			VecSubf(v2, bucket->p, vec1);
+	
+			Crossf(c, v1, v2);
+			
+			dist = Inpf(c, c) / v1_inpf;
+			
+			max_dist = dist > max_dist ? dist : max_dist;
+		}
+		
+		return max_dist;
+	}
+	else
+	{
+		return FLT_MAX;
+	}
+}
+
+static float calcCost(ReebArcIterator *iter, RigEdge *e1, RigEdge *e2, float *vec0, float *vec1, float *vec2, int i0, int i1, int i2)
+{
 	float vec_second[3], vec_first[3];
 	float angle = e1->angle;
 	float test_angle, length1, length2;
+	float max_dist;
 	float new_cost = 0;
 
 	VecSubf(vec_second, vec2, vec1);
@@ -588,45 +622,11 @@ static float calcCost(ReebArc *earc, RigEdge *e1, RigEdge *e2, float *vec0, floa
 	new_cost += G.scene->toolsettings->skgen_retarget_length_weight * fabs((length2 - e2->length) / e2->length);
 
 	/* calculate maximum distance */
-//	max_dist = 0;
-//	for (initArcIterator2(&iter2, earc, i0, i1), bucket = nextBucket(&iter2);
-//		bucket;
-//		bucket = nextBucket(&iter2))
-//	{
-//		float v1[3], v2[3], c[3];
-//		float dist;
-//		
-//		VecSubf(v1, vec0, vec1);
-//		VecSubf(v2, bucket->p, vec1);
-//
-//		Crossf(c, v1, v2);
-//		
-//		dist = Inpf(c, c) / Inpf(v1, v1);
-//		
-//		max_dist = dist > max_dist ? dist : max_dist;
-//	}
-//	
-//	new_cost += G.scene->toolsettings->skgen_retarget_length_weight * max_dist;
-//	
-//	max_dist = 0;
-//	for (initArcIterator2(&iter2, earc, i1, i2), bucket = nextBucket(&iter2);
-//		bucket;
-//		bucket = nextBucket(&iter2))
-//	{
-//		float v1[3], v2[3], c[3];
-//		float dist;
-//		
-//		VecSubf(v1, vec1, vec2);
-//		VecSubf(v2, bucket->p, vec2);
-//
-//		Crossf(c, v1, v2);
-//		
-//		dist = Inpf(c, c) / Inpf(v1, v1);
-//		
-//		max_dist = dist > max_dist ? dist : max_dist;
-//	}
-//	
-//	new_cost += G.scene->toolsettings->skgen_retarget_length_weight * max_dist;
+	max_dist = calcMaximumDistance(iter, vec0, vec1, i0, i1);
+	new_cost += G.scene->toolsettings->skgen_retarget_distance_weight * max_dist;
+	
+	max_dist = calcMaximumDistance(iter, vec1, vec2, i1, i2);
+	new_cost += G.scene->toolsettings->skgen_retarget_distance_weight * max_dist;
 
 	return new_cost;
 }
@@ -664,7 +664,7 @@ static void calcGradient(RigEdge *e1, RigEdge *e2, ReebArcIterator *iter, int in
 	}
 
 
-	current_cost = calcCost(iter->arc, e1, e2, vec0, vec1, vec2, i0, i1, i2);
+	current_cost = calcCost(iter, e1, e2, vec0, vec1, vec2, i0, i1, i2);
 	cost_cube[index * 3 + 1] = current_cost;
 	
 	next_position = positions[index] + 1;
@@ -685,7 +685,7 @@ static void calcGradient(RigEdge *e1, RigEdge *e2, ReebArcIterator *iter, int in
 		{
 			vec1 = bucket->p;
 			
-			cost_cube[index * 3 + 2] = calcCost(iter->arc, e1, e2, vec0, vec1, vec2, i0, next_position, i2) - current_cost;
+			cost_cube[index * 3 + 2] = calcCost(iter, e1, e2, vec0, vec1, vec2, i0, next_position, i2) - current_cost;
 		}
 	}
 
@@ -707,7 +707,7 @@ static void calcGradient(RigEdge *e1, RigEdge *e2, ReebArcIterator *iter, int in
 		{
 			vec1 = bucket->p;
 			
-			cost_cube[index * 3] = calcCost(iter->arc, e1, e2, vec0, vec1, vec2, i0, next_position, i2) - current_cost;
+			cost_cube[index * 3] = calcCost(iter, e1, e2, vec0, vec1, vec2, i0, next_position, i2) - current_cost;
 		}
 	}
 }
@@ -788,6 +788,7 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 			
 			positions[i] += 1;
 			need_calc = i;
+			
 			if (positions[i] + remaining_joints < earc->bcount)
 			{
 				break;
@@ -827,19 +828,33 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 			{ 
 				float vec_first[3], vec_second[3];
 				float length1, length2;
+				float max_dist;
+				float length_ratio;
 				float new_cost = 0;
+				int i1, i2;
 				
 				if (i < nb_joints)
 				{
-					bucket = nextNBucket(&iter, positions[i] - last_index);
+					i2 = positions[i];
+					bucket = peekBucket(&iter, positions[i]);
 					vec2 = bucket->p;
 					vec_cache[i + 1] = vec2; /* update cache for updated position */
 				}
 				else
 				{
+					i2 = iter.length;
 					vec2 = node_end->p;
 				}
 				
+				if (i > 0)
+				{
+					i1 = positions[i - 1];
+				}
+				else
+				{
+					i1 = 1;
+				}
+				
 				vec1 = vec_cache[i];
 				
 
@@ -847,7 +862,7 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 				length2 = Normalize(vec_second);
 	
 				/* check angle */
-				if (i != 0)
+				if (i != 0 && G.scene->toolsettings->skgen_retarget_angle_weight > 0)
 				{
 					RigEdge *previous = edge->prev;
 					float angle = previous->angle;
@@ -865,15 +880,25 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 					}
 					else
 					{
-						new_cost += M_PI;
+						new_cost += G.scene->toolsettings->skgen_retarget_angle_weight;
 					}
 				}
 	
 				/* LENGTH COST HERE */
-				new_cost += G.scene->toolsettings->skgen_retarget_length_weight * fabs((length2 - edge->length) / edge->length);
-				cost_cache[i] = new_cost;
+				if (G.scene->toolsettings->skgen_retarget_length_weight > 0)
+				{
+					length_ratio = fabs((length2 - edge->length) / edge->length);
+					new_cost += G.scene->toolsettings->skgen_retarget_length_weight * length_ratio * length_ratio;
+				}
 				
-				last_index =  positions[i];
+				/* DISTANCE COST HERE */
+				if (G.scene->toolsettings->skgen_retarget_distance_weight > 0)
+				{
+					max_dist = calcMaximumDistance(&iter, vec1, vec2, i1, i2);
+					new_cost += G.scene->toolsettings->skgen_retarget_distance_weight * max_dist;
+				}
+				
+				cost_cache[i] = new_cost;
 			}
 			
 			cost += cost_cache[i];
@@ -985,6 +1010,7 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 	initArcIterator(&iter, earc, node_start);
 	
 	printPositions(best_positions, nb_joints);
+	printf("min_cost %f\n", min_cost);
 	printf("buckets: %i\n", earc->bcount);
 
 	/* set joints to best position */
@@ -996,7 +1022,7 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 		
 		if (i < nb_joints)
 		{
-			bucket = nextNBucket(&iter, best_positions[i] - last_index);
+			bucket = peekBucket(&iter, best_positions[i]);
 			vec1 = bucket->p;
 		}
 		else
@@ -1017,7 +1043,6 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 		}
 		
 		vec0 = vec1;
-		last_index =  best_positions[i];
 	}
 	
 	MEM_freeN(positions);
diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c
index 59d32dd37df..77245049a1f 100644
--- a/source/blender/src/buttons_editing.c
+++ b/source/blender/src/buttons_editing.c
@@ -5011,8 +5011,9 @@ static void editing_panel_mesh_skgen_retarget(Object *ob, Mesh *me)
 	uiDefButF(block, NUM, B_DIFF, 							"T:",			1111,110,164,19, &G.scene->toolsettings->skgen_threshold_external,0.0, 1.0, 10, 0,	"Specify the threshold ratio for filtering external arcs");
 	uiBlockEndAlign(block);
 
-	uiDefButF(block, NUM, B_DIFF, 							"Angle:",			1025, 60, 125,19, &G.scene->toolsettings->skgen_retarget_angle_weight, 0, 10, 1, 0,		"Angle Weight");
-	uiDefButF(block, NUM, B_DIFF, 							"Length:",			1150, 60, 125,19, &G.scene->toolsettings->skgen_retarget_length_weight, 0, 10, 1, 0,		"Length Weight");
+	uiDefButF(block, NUM, B_DIFF, 							"Ang:",			1025, 60, 83,19, &G.scene->toolsettings->skgen_retarget_angle_weight, 0, 10, 1, 0,		"Angle Weight");
+	uiDefButF(block, NUM, B_DIFF, 							"Len:",			1108, 60, 83,19, &G.scene->toolsettings->skgen_retarget_length_weight, 0, 10, 1, 0,		"Length Weight");
+	uiDefButF(block, NUM, B_DIFF, 							"Dist:",		1191, 60, 84,19, &G.scene->toolsettings->skgen_retarget_distance_weight, 0, 10, 1, 0,		"Distance Weight");
 
 	uiBlockBeginAlign(block);
 	uiDefButBitS(block, TOG, SKGEN_SYMMETRY, B_DIFF, 		"Symmetry",		1025, 30,125,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Restore symmetries based on topology");
diff --git a/source/blender/src/reeb.c b/source/blender/src/reeb.c
index c1ac4295261..4153d4f87ff 100644
--- a/source/blender/src/reeb.c
+++ b/source/blender/src/reeb.c
@@ -2365,6 +2365,8 @@ void initArcIterator(ReebArcIterator *iter, ReebArc *arc, ReebNode *head)
 		iter->stride = -1;
 	}
 	
+	iter->length = arc->bcount;
+	
 	iter->index = iter->start - iter->stride;
 }
 
@@ -2387,6 +2389,8 @@ void initArcIteratorStart(struct ReebArcIterator *iter, struct ReebArc *arc, str
 	
 	iter->index = iter->start - iter->stride;
 	
+	iter->length = arc->bcount - start;
+
 	if (start >= arc->bcount)
 	{
 		iter->start = iter->end; /* stop iterator since it's past its end */
@@ -2410,6 +2414,8 @@ void initArcIterator2(ReebArcIterator *iter, ReebArc *arc, int start, int end)
 	}
 
 	iter->index = iter->start - iter->stride;
+
+	iter->length = abs(iter->end - iter->start) + 1;
 }
 
 EmbedBucket * nextBucket(ReebArcIterator *iter)

From b5bde6d4dc601cb106b3353ca1a43dedf0c0b522 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Fri, 20 Jun 2008 18:06:41 +0000
Subject: [PATCH 050/252] More params for reeb graph visualizer

---
 release/scripts/reeb.py | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/release/scripts/reeb.py b/release/scripts/reeb.py
index 4c4176739e1..63ab1203708 100644
--- a/release/scripts/reeb.py
+++ b/release/scripts/reeb.py
@@ -15,6 +15,20 @@ def name(count):
 		return "%05" % count
 
 def importGraph(count):
+	bNode = Blender.Draw.Create(1)
+	bSize = Blender.Draw.Create(0.01)
+
+	Block = []
+	
+	Block.append(("Size: ", bSize, 0.01, 10.0, "Size of the nodes"))
+	Block.append(("Nodes", bNode, "Import nodes as tetras"))
+	
+	retval = Blender.Draw.PupBlock("Reeb Graph Import", Block)
+	
+	if not retval:
+		return
+
+
 	me = Blender.Mesh.New("graph%s" % name(count))
 	scn = Blender.Scene.GetCurrent()
 	
@@ -27,8 +41,8 @@ def importGraph(count):
 	i = 0
 	first = False
 	
-	SIZE = 0.3
-	WITH_NODE = True
+	SIZE = float(bSize.val)
+	WITH_NODE = bool(bNode.val)
 	
 	def addNode(v, s, verts, faces):
 		if WITH_NODE:

From 39a7a2483875d75db29e5fb05aa123e009094957 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Sun, 22 Jun 2008 17:06:50 +0000
Subject: [PATCH 051/252] Display graph in 3d view

---
 source/blender/include/reeb.h        |   8 +-
 source/blender/src/buttons_editing.c |  20 +-
 source/blender/src/drawview.c        |   4 +
 source/blender/src/reeb.c            | 456 ++++++++++++++++++---------
 source/blender/src/usiblender.c      |   4 +
 5 files changed, 338 insertions(+), 154 deletions(-)

diff --git a/source/blender/include/reeb.h b/source/blender/include/reeb.h
index c6be9ba2fbe..58dfb207764 100644
--- a/source/blender/include/reeb.h
+++ b/source/blender/include/reeb.h
@@ -119,7 +119,7 @@ int weightFromDistance(struct EditMesh *em);
 int weightFromLoc(struct EditMesh *me, int axis);
 void weightToVCol(struct EditMesh *em, int index);
 void arcToVCol(struct ReebGraph *rg, struct EditMesh *em, int index);
-void angleToVCol(EditMesh *em, int index);
+void angleToVCol(struct EditMesh *em, int index);
 void renormalizeWeight(struct EditMesh *em, float newmax);
 
 ReebGraph * generateReebGraph(struct EditMesh *me, int subdivisions);
@@ -155,7 +155,13 @@ void verifyFaces(ReebGraph *rg);
 
 /*********************** PUBLIC *********************************/
 ReebGraph *BIF_ReebGraphFromEditMesh(void);
+
+void BIF_GlobalReebGraphFromEditMesh(void);
+void BIF_GlobalReebFree(void);
+
 void REEB_freeGraph(ReebGraph *rg);
 void REEB_exportGraph(ReebGraph *rg, int count);
+void REEB_draw();
+
 
 #endif /*REEB_H_*/
diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c
index 77245049a1f..df67ffccdeb 100644
--- a/source/blender/src/buttons_editing.c
+++ b/source/blender/src/buttons_editing.c
@@ -180,6 +180,8 @@
 #include "butspace.h" // own module
 #include "multires.h"
 
+#include "reeb.h"
+
 static float editbutweight= 1.0;
 float editbutvweight= 1;
 static int actmcol= 0, acttface= 0, acttface_rnd = 0, actmcol_rnd = 0;
@@ -4992,6 +4994,16 @@ static void skgen_reorder(void *option, void *arg2)
 	}
 }
 
+static void skgen_graphgen(void *arg1, void *arg2)
+{
+	BIF_GlobalReebGraphFromEditMesh();
+}
+
+static void skgen_graphfree(void *arg1, void *arg2)
+{
+	BIF_GlobalReebFree();
+}
+
 static void editing_panel_mesh_skgen_retarget(Object *ob, Mesh *me)
 {
 	uiBlock *block;
@@ -5035,10 +5047,14 @@ static void editing_panel_mesh_skgen(Object *ob, Mesh *me)
 	uiNewPanelTabbed("Mesh Tools More", "Editing");
 	if(uiNewPanel(curarea, block, "Skeleton Generator", "Editing", 960, 0, 318, 204)==0) return;
 	
-	uiDefBut(block, BUT, B_GEN_SKELETON, "Generate Skeleton",			1025,170,250,19, 0, 0, 0, 0, 0, "Generate Skeleton from Mesh");
+	uiDefBut(block, BUT, B_GEN_SKELETON, "Generate Skeleton",			1025,170,125,19, 0, 0, 0, 0, 0, "Generate Skeleton from Mesh");
+	but = uiDefBut(block, BUT, B_DIFF, "Generate",				1150,170,65,19, 0, 0, 0, 0, 0, "Generate Graph from Mesh");
+	uiButSetFunc(but, skgen_graphgen, NULL, NULL);
+	but = uiDefBut(block, BUT, B_DIFF, "Free",					1215,170,60,19, 0, 0, 0, 0, 0, "Free Graph from Mesh");
+	uiButSetFunc(but, skgen_graphfree, NULL, NULL);
 
 	uiBlockBeginAlign(block);
-	uiDefButS(block, NUM, B_DIFF, "Resolution:",							1025,150,225,19, &G.scene->toolsettings->skgen_resolution,10.0,1000.0, 0, 0,		"Specifies the resolution of the graph's embedding");
+	uiDefButS(block, NUM, B_DIFF, "Resolution:",							1025,150,225,19, &G.scene->toolsettings->skgen_resolution,2.0,1000.0, 0, 0,		"Specifies the resolution of the graph's embedding");
 	uiDefButBitS(block, TOG, SKGEN_HARMONIC, B_DIFF, 		"H",			1250,150, 25,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Apply harmonic smoothing to the weighting");
 	uiDefButBitS(block, TOG, SKGEN_FILTER_INTERNAL, B_DIFF, "Filter In",	1025,130, 83,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Filter internal small arcs from graph");
 	uiDefButF(block, NUM, B_DIFF, 							"T:",			1111,130,164,19, &G.scene->toolsettings->skgen_threshold_internal,0.0, 1.0, 10, 0,	"Specify the threshold ratio for filtering internal arcs");
diff --git a/source/blender/src/drawview.c b/source/blender/src/drawview.c
index 52e0d3d6f05..b3bc8f36388 100644
--- a/source/blender/src/drawview.c
+++ b/source/blender/src/drawview.c
@@ -159,6 +159,8 @@
 
 #include "RE_pipeline.h"	// make_stars
 
+#include "reeb.h"
+
 #include "multires.h"
 
 /* For MULTISAMPLE_ARB #define.
@@ -3145,6 +3147,8 @@ void drawview3dspace(ScrArea *sa, void *spacedata)
 			BIF_drawPropCircle(); // only editmode and particles have proportional edit
 		BIF_drawSnap();
 	}
+	
+	REEB_draw();
 
 	if(G.scene->radio) RAD_drawall(v3d->drawtype>=OB_SOLID);
 	
diff --git a/source/blender/src/reeb.c b/source/blender/src/reeb.c
index 4153d4f87ff..59afd0f1327 100644
--- a/source/blender/src/reeb.c
+++ b/source/blender/src/reeb.c
@@ -51,6 +51,7 @@
 #include "BIF_interface.h"
 #include "BIF_toolbox.h"
 #include "BIF_graphics.h"
+#include "BIF_gl.h"
 
 #include "BKE_global.h"
 #include "BKE_utildefines.h"
@@ -65,6 +66,9 @@
 /* REPLACE WITH NEW ONE IN UTILDEFINES ONCE PATCH IS APPLIED */
 #define FTOCHAR(val) (val<=0.0f)? 0 : ((val>(1.0f-0.5f/255.0f))? 255 : (char)((255.0f*val)+0.5f))
 
+ReebGraph *GLOBAL_RG = NULL;
+ReebGraph *FILTERED_RG = NULL;
+
 /*
  * Skeleton generation algorithm based on: 
  * "Harmonic Skeleton for Realistic Character Animation"
@@ -86,10 +90,10 @@ typedef enum {
 	MERGE_APPEND
 } MergeDirection;
 
-int mergeArcs(ReebGraph *rg, ReebArc *a0, ReebArc *a1);
-int mergeConnectedArcs(ReebGraph *rg, ReebArc *a0, ReebArc *a1);
+int mergeArcs(ReebGraph *GLOBAL_RG, ReebArc *a0, ReebArc *a1);
+int mergeConnectedArcs(ReebGraph *GLOBAL_RG, ReebArc *a0, ReebArc *a1);
 EditEdge * NextEdgeForVert(EditMesh *em, EditVert *v);
-void mergeArcFaces(ReebGraph *rg, ReebArc *aDst, ReebArc *aSrc);
+void mergeArcFaces(ReebGraph *GLOBAL_RG, ReebArc *aDst, ReebArc *aSrc);
 void addFacetoArc(ReebArc *arc, EditFace *efa);
 
 void REEB_RadialSymmetry(BNode* root_node, RadialArc* ring, int count);
@@ -243,11 +247,11 @@ void calculateArcLength(ReebArc *arc)
 	arc->length += VecLenf(arc->tail->p, vec1);	
 }
 
-void calculateGraphLength(ReebGraph *rg)
+void calculateGraphLength(ReebGraph *GLOBAL_RG)
 {
 	ReebArc *arc;
 	
-	for (arc = rg->arcs.first; arc; arc = arc->next)
+	for (arc = GLOBAL_RG->arcs.first; arc; arc = arc->next)
 	{
 		calculateArcLength(arc);
 	}
@@ -294,13 +298,13 @@ void REEB_freeArc(BArc *barc)
 	MEM_freeN(arc);
 }
 
-void REEB_freeGraph(ReebGraph *rg)
+void REEB_freeGraph(ReebGraph *GLOBAL_RG)
 {
 	ReebArc *arc;
 	ReebNode *node;
 	
 	// free nodes
-	for( node = rg->nodes.first; node; node = node->next )
+	for( node = GLOBAL_RG->nodes.first; node; node = node->next )
 	{
 		// Free adjacency lists
 		if (node->arcs != NULL)
@@ -308,10 +312,10 @@ void REEB_freeGraph(ReebGraph *rg)
 			MEM_freeN(node->arcs);
 		}
 	}
-	BLI_freelistN(&rg->nodes);
+	BLI_freelistN(&GLOBAL_RG->nodes);
 	
 	// free arcs
-	arc = rg->arcs.first;
+	arc = GLOBAL_RG->arcs.first;
 	while( arc )
 	{
 		ReebArc *next = arc->next;
@@ -320,23 +324,23 @@ void REEB_freeGraph(ReebGraph *rg)
 	}
 	
 	// free edge map
-	BLI_edgehash_free(rg->emap, NULL);
+	BLI_edgehash_free(GLOBAL_RG->emap, NULL);
 	
-	MEM_freeN(rg);
+	MEM_freeN(GLOBAL_RG);
 }
 
-void repositionNodes(ReebGraph *rg)
+void repositionNodes(ReebGraph *GLOBAL_RG)
 {
 	BArc *arc = NULL;
 	BNode *node = NULL;
 	
 	// Reset node positions
-	for(node = rg->nodes.first; node; node = node->next)
+	for(node = GLOBAL_RG->nodes.first; node; node = node->next)
 	{
 		node->p[0] = node->p[1] = node->p[2] = 0;
 	}
 	
-	for(arc = rg->arcs.first; arc; arc = arc->next)
+	for(arc = GLOBAL_RG->arcs.first; arc; arc = arc->next)
 	{
 		if (((ReebArc*)arc)->bcount > 0)
 		{
@@ -353,16 +357,16 @@ void repositionNodes(ReebGraph *rg)
 	}
 }
 
-void verifyNodeDegree(ReebGraph *rg)
+void verifyNodeDegree(ReebGraph *GLOBAL_RG)
 {
 #ifdef DEBUG_REEB
 	ReebNode *node = NULL;
 	ReebArc *arc = NULL;
 
-	for(node = rg->nodes.first; node; node = node->next)
+	for(node = GLOBAL_RG->nodes.first; node; node = node->next)
 	{
 		int count = 0;
-		for(arc = rg->arcs.first; arc; arc = arc->next)
+		for(arc = GLOBAL_RG->arcs.first; arc; arc = arc->next)
 		{
 			if (arc->head == node || arc->tail == node)
 			{
@@ -377,11 +381,11 @@ void verifyNodeDegree(ReebGraph *rg)
 #endif
 }
 
-void verifyBuckets(ReebGraph *rg)
+void verifyBuckets(ReebGraph *GLOBAL_RG)
 {
 #ifdef DEBUG_REEB
 	ReebArc *arc = NULL;
-	for(arc = rg->arcs.first; arc; arc = arc->next)
+	for(arc = GLOBAL_RG->arcs.first; arc; arc = arc->next)
 	{
 		ReebNode *head = (ReebNode*)arc->head;
 		ReebNode *tail = (ReebNode*)arc->tail;
@@ -413,12 +417,12 @@ void verifyBuckets(ReebGraph *rg)
 #endif
 }
 
-void verifyFaces(ReebGraph *rg)
+void verifyFaces(ReebGraph *GLOBAL_RG)
 {
 #ifdef DEBUG_REEB
 	int total = 0;
 	ReebArc *arc = NULL;
-	for(arc = rg->arcs.first; arc; arc = arc->next)
+	for(arc = GLOBAL_RG->arcs.first; arc; arc = arc->next)
 	{
 		total += BLI_ghash_size(arc->faces);
 	}
@@ -625,7 +629,7 @@ void REEB_AxialSymmetry(BNode* root_node, BNode* node1, BNode* node2, struct BAr
 
 /****************************************** SMOOTHING **************************************************/
 
-void postprocessGraph(ReebGraph *rg, char mode)
+void postprocessGraph(ReebGraph *GLOBAL_RG, char mode)
 {
 	ReebArc *arc;
 	float fac1 = 0, fac2 = 1, fac3 = 0;
@@ -648,7 +652,7 @@ void postprocessGraph(ReebGraph *rg, char mode)
 		return;
 	}
 	
-	for(arc = rg->arcs.first; arc; arc = arc->next)
+	for(arc = GLOBAL_RG->arcs.first; arc; arc = arc->next)
 	{
 		EmbedBucket *buckets = arc->buckets;
 		int bcount = arc->bcount;
@@ -683,9 +687,9 @@ int compareNodesWeight(void *vnode1, void *vnode2)
 	}
 }
 
-void sortNodes(ReebGraph *rg)
+void sortNodes(ReebGraph *GLOBAL_RG)
 {
-	BLI_sortlist(&rg->nodes, compareNodesWeight);
+	BLI_sortlist(&GLOBAL_RG->nodes, compareNodesWeight);
 }
 
 int compareArcsWeight(void *varc1, void *varc2)
@@ -709,9 +713,9 @@ int compareArcsWeight(void *varc1, void *varc2)
 	}
 }
 
-void sortArcs(ReebGraph *rg)
+void sortArcs(ReebGraph *GLOBAL_RG)
 {
-	BLI_sortlist(&rg->arcs, compareArcsWeight);
+	BLI_sortlist(&GLOBAL_RG->arcs, compareArcsWeight);
 }
 
 /****************************************** FILTERING **************************************************/
@@ -745,12 +749,12 @@ int compareArcs(void *varc1, void *varc2)
 	}
 }
 
-void filterArc(ReebGraph *rg, ReebNode *newNode, ReebNode *removedNode, ReebArc * srcArc, int merging)
+void filterArc(ReebGraph *GLOBAL_RG, ReebNode *newNode, ReebNode *removedNode, ReebArc * srcArc, int merging)
 {
 	ReebArc *arc = NULL, *nextArc = NULL;
 
 	/* first pass, merge buckets for arcs that spawned the two nodes into the source arc*/
-	for(arc = rg->arcs.first; arc; arc = arc->next)
+	for(arc = GLOBAL_RG->arcs.first; arc; arc = arc->next)
 	{
 		if (arc->head == srcArc->head && arc->tail == srcArc->tail && arc != srcArc)
 		{
@@ -761,7 +765,7 @@ void filterArc(ReebGraph *rg, ReebNode *newNode, ReebNode *removedNode, ReebArc
 	}
 
 	/* second pass, replace removedNode by newNode, remove arcs that are collapsed in a loop */
-	arc = rg->arcs.first;
+	arc = GLOBAL_RG->arcs.first;
 	while(arc)
 	{
 		nextArc = arc->next;
@@ -786,7 +790,7 @@ void filterArc(ReebGraph *rg, ReebNode *newNode, ReebNode *removedNode, ReebArc
 				// If it's safeArc, it'll be removed later, so keep it for now
 				if (arc != srcArc)
 				{
-					BLI_remlink(&rg->arcs, arc);
+					BLI_remlink(&GLOBAL_RG->arcs, arc);
 					REEB_freeArc((BArc*)arc);
 				}
 			}
@@ -796,13 +800,13 @@ void filterArc(ReebGraph *rg, ReebNode *newNode, ReebNode *removedNode, ReebArc
 				// Decrement degree from the other node
 				BLI_otherNode((BArc*)arc, (BNode*)newNode)->degree--;
 				
-				BLI_remlink(&rg->arcs, arc);
+				BLI_remlink(&GLOBAL_RG->arcs, arc);
 				REEB_freeArc((BArc*)arc);
 			}
 			else
 			{
 				newNode->degree++; // incrementing degree since we're adding an arc
-				mergeArcFaces(rg, arc, srcArc);
+				mergeArcFaces(GLOBAL_RG, arc, srcArc);
 
 				if (merging)
 				{
@@ -820,11 +824,11 @@ void filterArc(ReebGraph *rg, ReebNode *newNode, ReebNode *removedNode, ReebArc
 	}
 }
 
-void filterNullReebGraph(ReebGraph *rg)
+void filterNullReebGraph(ReebGraph *GLOBAL_RG)
 {
 	ReebArc *arc = NULL, *nextArc = NULL;
 	
-	arc = rg->arcs.first;
+	arc = GLOBAL_RG->arcs.first;
 	while(arc)
 	{
 		nextArc = arc->next;
@@ -840,29 +844,29 @@ void filterNullReebGraph(ReebGraph *rg)
 			//newNode->weight = FloatLerpf(newNode->weight, removedNode->weight, blend);
 			VecLerpf(newNode->p, newNode->p, removedNode->p, blend);
 			
-			filterArc(rg, newNode, removedNode, arc, 0);
+			filterArc(GLOBAL_RG, newNode, removedNode, arc, 0);
 
 			// Reset nextArc, it might have changed
 			nextArc = arc->next;
 			
-			BLI_remlink(&rg->arcs, arc);
+			BLI_remlink(&GLOBAL_RG->arcs, arc);
 			REEB_freeArc((BArc*)arc);
 			
-			BLI_freelinkN(&rg->nodes, removedNode);
+			BLI_freelinkN(&GLOBAL_RG->nodes, removedNode);
 		}
 		
 		arc = nextArc;
 	}
 }
 
-int filterInternalReebGraph(ReebGraph *rg, float threshold)
+int filterInternalReebGraph(ReebGraph *GLOBAL_RG, float threshold)
 {
 	ReebArc *arc = NULL, *nextArc = NULL;
 	int value = 0;
 	
-	BLI_sortlist(&rg->arcs, compareArcs);
+	BLI_sortlist(&GLOBAL_RG->arcs, compareArcs);
 
-	arc = rg->arcs.first;
+	arc = GLOBAL_RG->arcs.first;
 	while(arc)
 	{
 		nextArc = arc->next;
@@ -885,15 +889,15 @@ int filterInternalReebGraph(ReebGraph *rg, float threshold)
 				removedNode = arc->head;
 			}
 			
-			filterArc(rg, newNode, removedNode, arc, 1);
+			filterArc(GLOBAL_RG, newNode, removedNode, arc, 1);
 
 			// Reset nextArc, it might have changed
 			nextArc = arc->next;
 			
-			BLI_remlink(&rg->arcs, arc);
+			BLI_remlink(&GLOBAL_RG->arcs, arc);
 			REEB_freeArc((BArc*)arc);
 			
-			BLI_freelinkN(&rg->nodes, removedNode);
+			BLI_freelinkN(&GLOBAL_RG->nodes, removedNode);
 			value = 1;
 		}
 		
@@ -903,14 +907,14 @@ int filterInternalReebGraph(ReebGraph *rg, float threshold)
 	return value;
 }
 
-int filterExternalReebGraph(ReebGraph *rg, float threshold)
+int filterExternalReebGraph(ReebGraph *GLOBAL_RG, float threshold)
 {
 	ReebArc *arc = NULL, *nextArc = NULL;
 	int value = 0;
 	
-	BLI_sortlist(&rg->arcs, compareArcs);
+	BLI_sortlist(&GLOBAL_RG->arcs, compareArcs);
 
-	arc = rg->arcs.first;
+	arc = GLOBAL_RG->arcs.first;
 	while(arc)
 	{
 		nextArc = arc->next;
@@ -954,7 +958,7 @@ int filterExternalReebGraph(ReebGraph *rg, float threshold)
 			// Merging arc
 			if (merging)
 			{
-				filterArc(rg, newNode, removedNode, arc, 1);
+				filterArc(GLOBAL_RG, newNode, removedNode, arc, 1);
 			}
 			else
 			{
@@ -965,10 +969,10 @@ int filterExternalReebGraph(ReebGraph *rg, float threshold)
 			// Reset nextArc, it might have changed
 			nextArc = arc->next;
 			
-			BLI_remlink(&rg->arcs, arc);
+			BLI_remlink(&GLOBAL_RG->arcs, arc);
 			REEB_freeArc((BArc*)arc);
 			
-			BLI_freelinkN(&rg->nodes, removedNode);
+			BLI_freelinkN(&GLOBAL_RG->nodes, removedNode);
 			value = 1;
 		}
 		
@@ -978,12 +982,12 @@ int filterExternalReebGraph(ReebGraph *rg, float threshold)
 	return value;
 }
 
-int filterSmartReebGraph(ReebGraph *rg, float threshold)
+int filterSmartReebGraph(ReebGraph *GLOBAL_RG, float threshold)
 {
 	ReebArc *arc = NULL, *nextArc = NULL;
 	int value = 0;
 	
-	BLI_sortlist(&rg->arcs, compareArcs);
+	BLI_sortlist(&GLOBAL_RG->arcs, compareArcs);
 
 #ifdef DEBUG_REEB
 	{	
@@ -994,7 +998,7 @@ int filterSmartReebGraph(ReebGraph *rg, float threshold)
 	}
 #endif
 
-	arc = rg->arcs.first;
+	arc = GLOBAL_RG->arcs.first;
 	while(arc)
 	{
 		nextArc = arc->next;
@@ -1124,7 +1128,7 @@ int filterSmartReebGraph(ReebGraph *rg, float threshold)
 				// Merging arc
 				if (merging)
 				{
-					filterArc(rg, newNode, removedNode, arc, 1);
+					filterArc(GLOBAL_RG, newNode, removedNode, arc, 1);
 				}
 				else
 				{
@@ -1135,10 +1139,10 @@ int filterSmartReebGraph(ReebGraph *rg, float threshold)
 				// Reset nextArc, it might have changed
 				nextArc = arc->next;
 				
-				BLI_remlink(&rg->arcs, arc);
+				BLI_remlink(&GLOBAL_RG->arcs, arc);
 				REEB_freeArc((BArc*)arc);
 				
-				BLI_freelinkN(&rg->nodes, removedNode);
+				BLI_freelinkN(&GLOBAL_RG->nodes, removedNode);
 				value = 1;
 			}
 		}
@@ -1216,7 +1220,7 @@ void exportNode(FILE *f, char *text, ReebNode *node)
 	fprintf(f, "%s i:%i w:%f d:%i %f %f %f\n", text, node->index, node->weight, node->degree, node->p[0], node->p[1], node->p[2]);
 }
 
-void REEB_exportGraph(ReebGraph *rg, int count)
+void REEB_exportGraph(ReebGraph *GLOBAL_RG, int count)
 {
 	ReebArc *arc;
 	char filename[128];
@@ -1232,7 +1236,7 @@ void REEB_exportGraph(ReebGraph *rg, int count)
 	}
 	f = fopen(filename, "w");
 
-	for(arc = rg->arcs.first; arc; arc = arc->next)
+	for(arc = GLOBAL_RG->arcs.first; arc; arc = arc->next)
 	{
 		int i;
 		float p[3];
@@ -1256,11 +1260,11 @@ void REEB_exportGraph(ReebGraph *rg, int count)
 
 /***************************************** MAIN ALGORITHM **********************************************/
 
-ReebArc * findConnectedArc(ReebGraph *rg, ReebArc *arc, ReebNode *v)
+ReebArc * findConnectedArc(ReebGraph *GLOBAL_RG, ReebArc *arc, ReebNode *v)
 {
 	ReebArc *nextArc = arc->next;
 	
-	for(nextArc = rg->arcs.first; nextArc; nextArc = nextArc->next)
+	for(nextArc = GLOBAL_RG->arcs.first; nextArc; nextArc = nextArc->next)
 	{
 		if (arc != nextArc && (nextArc->head == v || nextArc->tail == v))
 		{
@@ -1272,24 +1276,24 @@ ReebArc * findConnectedArc(ReebGraph *rg, ReebArc *arc, ReebNode *v)
 }
 
 
-void removeNormalNodes(ReebGraph *rg)
+void removeNormalNodes(ReebGraph *GLOBAL_RG)
 {
 	ReebArc *arc;
 	
 	// Merge degree 2 nodes
-	for(arc = rg->arcs.first; arc; arc = arc->next)
+	for(arc = GLOBAL_RG->arcs.first; arc; arc = arc->next)
 	{
 		while (arc->head->degree == 2 || arc->tail->degree == 2)
 		{
 			// merge at v1
 			if (arc->head->degree == 2)
 			{
-				ReebArc *nextArc = (ReebArc*)BLI_findConnectedArc((BGraph*)rg, (BArc*)arc, (BNode*)arc->head);
+				ReebArc *nextArc = (ReebArc*)BLI_findConnectedArc((BGraph*)GLOBAL_RG, (BArc*)arc, (BNode*)arc->head);
 
 				// Merge arc only if needed
 				if (arc->head == nextArc->tail)
 				{				
-					mergeConnectedArcs(rg, arc, nextArc);
+					mergeConnectedArcs(GLOBAL_RG, arc, nextArc);
 				}
 				// Otherwise, mark down vert
 				else
@@ -1301,12 +1305,12 @@ void removeNormalNodes(ReebGraph *rg)
 			// merge at v2
 			if (arc->tail->degree == 2)
 			{
-				ReebArc *nextArc = (ReebArc*)BLI_findConnectedArc((BGraph*)rg, (BArc*)arc, (BNode*)arc->tail);
+				ReebArc *nextArc = (ReebArc*)BLI_findConnectedArc((BGraph*)GLOBAL_RG, (BArc*)arc, (BNode*)arc->tail);
 				
 				// Merge arc only if needed
 				if (arc->tail == nextArc->head)
 				{				
-					mergeConnectedArcs(rg, arc, nextArc);
+					mergeConnectedArcs(GLOBAL_RG, arc, nextArc);
 				}
 				// Otherwise, mark down vert
 				else
@@ -1349,7 +1353,7 @@ void addFacetoArc(ReebArc *arc, EditFace *efa)
 	BLI_ghash_insert(arc->faces, efa, efa);
 }
 
-void mergeArcFaces(ReebGraph *rg, ReebArc *aDst, ReebArc *aSrc)
+void mergeArcFaces(ReebGraph *GLOBAL_RG, ReebArc *aDst, ReebArc *aSrc)
 {
 	GHashIterator ghi;
 	
@@ -1362,7 +1366,7 @@ void mergeArcFaces(ReebGraph *rg, ReebArc *aDst, ReebArc *aSrc)
 	}
 } 
 
-void mergeArcEdges(ReebGraph *rg, ReebArc *aDst, ReebArc *aSrc, MergeDirection direction)
+void mergeArcEdges(ReebGraph *GLOBAL_RG, ReebArc *aDst, ReebArc *aSrc, MergeDirection direction)
 {
 	ReebEdge *e = NULL;
 	
@@ -1387,7 +1391,7 @@ void mergeArcEdges(ReebGraph *rg, ReebArc *aDst, ReebArc *aSrc, MergeDirection d
 			
 			if (direction == MERGE_LOWER)
 			{
-				void **p = BLI_edgehash_lookup_p(rg->emap, e->v1->index, e->v2->index);
+				void **p = BLI_edgehash_lookup_p(GLOBAL_RG->emap, e->v1->index, e->v2->index);
 				
 				newEdge->nextEdge = e;
 
@@ -1419,13 +1423,13 @@ void mergeArcEdges(ReebGraph *rg, ReebArc *aDst, ReebArc *aSrc, MergeDirection d
 } 
 
 // return 1 on full merge
-int mergeConnectedArcs(ReebGraph *rg, ReebArc *a0, ReebArc *a1)
+int mergeConnectedArcs(ReebGraph *GLOBAL_RG, ReebArc *a0, ReebArc *a1)
 {
 	int result = 0;
 	ReebNode *removedNode = NULL;
 	
-	mergeArcEdges(rg, a0, a1, MERGE_APPEND);
-	mergeArcFaces(rg, a0, a1);
+	mergeArcEdges(GLOBAL_RG, a0, a1, MERGE_APPEND);
+	mergeArcFaces(GLOBAL_RG, a0, a1);
 	
 	// Bring a0 to the combine length of both arcs
 	if (a0->tail == a1->head)
@@ -1444,16 +1448,16 @@ int mergeConnectedArcs(ReebGraph *rg, ReebArc *a0, ReebArc *a1)
 	mergeArcBuckets(a0, a1, a0->head->weight, a0->tail->weight);
 	
 	// remove a1 from graph
-	BLI_remlink(&rg->arcs, a1);
+	BLI_remlink(&GLOBAL_RG->arcs, a1);
 	REEB_freeArc((BArc*)a1);
 	
-	BLI_freelinkN(&rg->nodes, removedNode);
+	BLI_freelinkN(&GLOBAL_RG->nodes, removedNode);
 	result = 1;
 	
 	return result;
 }
 // return 1 on full merge
-int mergeArcs(ReebGraph *rg, ReebArc *a0, ReebArc *a1)
+int mergeArcs(ReebGraph *GLOBAL_RG, ReebArc *a0, ReebArc *a1)
 {
 	int result = 0;
 	// TRIANGLE POINTS DOWN
@@ -1461,8 +1465,8 @@ int mergeArcs(ReebGraph *rg, ReebArc *a0, ReebArc *a1)
 	{
 		if (a0->tail->weight == a1->tail->weight) // tails also the same, arcs can be totally merge together
 		{
-			mergeArcEdges(rg, a0, a1, MERGE_APPEND);
-			mergeArcFaces(rg, a0, a1);
+			mergeArcEdges(GLOBAL_RG, a0, a1, MERGE_APPEND);
+			mergeArcFaces(GLOBAL_RG, a0, a1);
 			
 			mergeArcBuckets(a0, a1, a0->head->weight, a0->tail->weight);
 			
@@ -1471,15 +1475,15 @@ int mergeArcs(ReebGraph *rg, ReebArc *a0, ReebArc *a1)
 			a1->tail->degree--;
 			
 			// remove a1 from graph
-			BLI_remlink(&rg->arcs, a1);
+			BLI_remlink(&GLOBAL_RG->arcs, a1);
 			
 			REEB_freeArc((BArc*)a1);
 			result = 1;
 		}
 		else if (a0->tail->weight > a1->tail->weight) // a1->tail->weight is in the middle
 		{
-			mergeArcEdges(rg, a1, a0, MERGE_LOWER);
-			mergeArcFaces(rg, a1, a0);
+			mergeArcEdges(GLOBAL_RG, a1, a0, MERGE_LOWER);
+			mergeArcFaces(GLOBAL_RG, a1, a0);
 
 			// Adjust node degree
 			a0->head->degree--;
@@ -1491,8 +1495,8 @@ int mergeArcs(ReebGraph *rg, ReebArc *a0, ReebArc *a1)
 		}
 		else // a0>n2 is in the middle
 		{
-			mergeArcEdges(rg, a0, a1, MERGE_LOWER);
-			mergeArcFaces(rg, a0, a1);
+			mergeArcEdges(GLOBAL_RG, a0, a1, MERGE_LOWER);
+			mergeArcFaces(GLOBAL_RG, a0, a1);
 			
 			// Adjust node degree
 			a1->head->degree--;
@@ -1508,8 +1512,8 @@ int mergeArcs(ReebGraph *rg, ReebArc *a0, ReebArc *a1)
 	{
 		if (a0->head->weight > a1->head->weight) // a0->head->weight is in the middle
 		{
-			mergeArcEdges(rg, a0, a1, MERGE_HIGHER);
-			mergeArcFaces(rg, a0, a1);
+			mergeArcEdges(GLOBAL_RG, a0, a1, MERGE_HIGHER);
+			mergeArcFaces(GLOBAL_RG, a0, a1);
 			
 			// Adjust node degree
 			a1->tail->degree--;
@@ -1521,8 +1525,8 @@ int mergeArcs(ReebGraph *rg, ReebArc *a0, ReebArc *a1)
 		}
 		else // a1->head->weight is in the middle
 		{
-			mergeArcEdges(rg, a1, a0, MERGE_HIGHER);
-			mergeArcFaces(rg, a1, a0);
+			mergeArcEdges(GLOBAL_RG, a1, a0, MERGE_HIGHER);
+			mergeArcFaces(GLOBAL_RG, a1, a0);
 
 			// Adjust node degree
 			a0->tail->degree--;
@@ -1541,12 +1545,12 @@ int mergeArcs(ReebGraph *rg, ReebArc *a0, ReebArc *a1)
 	return result;
 }
 
-void glueByMergeSort(ReebGraph *rg, ReebArc *a0, ReebArc *a1, ReebEdge *e0, ReebEdge *e1)
+void glueByMergeSort(ReebGraph *GLOBAL_RG, ReebArc *a0, ReebArc *a1, ReebEdge *e0, ReebEdge *e1)
 {
 	int total = 0;
 	while (total == 0 && a0 != a1 && a0 != NULL && a1 != NULL)
 	{
-		total = mergeArcs(rg, a0, a1);
+		total = mergeArcs(GLOBAL_RG, a0, a1);
 		
 		if (total == 0) // if it wasn't a total merge, go forward
 		{
@@ -1562,18 +1566,18 @@ void glueByMergeSort(ReebGraph *rg, ReebArc *a0, ReebArc *a1, ReebEdge *e0, Reeb
 	}
 }
 
-void mergePaths(ReebGraph *rg, ReebEdge *e0, ReebEdge *e1, ReebEdge *e2)
+void mergePaths(ReebGraph *GLOBAL_RG, ReebEdge *e0, ReebEdge *e1, ReebEdge *e2)
 {
 	ReebArc *a0, *a1, *a2;
 	a0 = e0->arc;
 	a1 = e1->arc;
 	a2 = e2->arc;
 	
-	glueByMergeSort(rg, a0, a1, e0, e1);
-	glueByMergeSort(rg, a0, a2, e0, e2);
+	glueByMergeSort(GLOBAL_RG, a0, a1, e0, e1);
+	glueByMergeSort(GLOBAL_RG, a0, a2, e0, e2);
 } 
 
-ReebNode * addNode(ReebGraph *rg, EditVert *eve, float weight)
+ReebNode * addNode(ReebGraph *GLOBAL_RG, EditVert *eve, float weight)
 {
 	ReebNode *node = NULL;
 	
@@ -1584,20 +1588,20 @@ ReebNode * addNode(ReebGraph *rg, EditVert *eve, float weight)
 	node->arcs = NULL;
 	node->degree = 0;
 	node->weight = weight;
-	node->index = rg->totnodes;
+	node->index = GLOBAL_RG->totnodes;
 	VECCOPY(node->p, eve->co);	
 	
-	BLI_addtail(&rg->nodes, node);
-	rg->totnodes++;
+	BLI_addtail(&GLOBAL_RG->nodes, node);
+	GLOBAL_RG->totnodes++;
 	
 	return node;
 }
 
-ReebEdge * createArc(ReebGraph *rg, ReebNode *node1, ReebNode *node2)
+ReebEdge * createArc(ReebGraph *GLOBAL_RG, ReebNode *node1, ReebNode *node2)
 {
 	ReebEdge *edge;
 	
-	edge = BLI_edgehash_lookup(rg->emap, node1->index, node2->index);
+	edge = BLI_edgehash_lookup(GLOBAL_RG->emap, node1->index, node2->index);
 	
 	// Only add existing edges that haven't been added yet
 	if (edge == NULL)
@@ -1632,14 +1636,14 @@ ReebEdge * createArc(ReebGraph *rg, ReebNode *node1, ReebNode *node2)
 		v1->degree++;
 		v2->degree++;
 
-		BLI_edgehash_insert(rg->emap, node1->index, node2->index, edge);
+		BLI_edgehash_insert(GLOBAL_RG->emap, node1->index, node2->index, edge);
 		
 		edge->arc = arc;
 		edge->nextEdge = NULL;
 		edge->v1 = v1;
 		edge->v2 = v2;
 		
-		BLI_addtail(&rg->arcs, arc);
+		BLI_addtail(&GLOBAL_RG->arcs, arc);
 		BLI_addtail(&arc->edges, edge);
 		
 		/* adding buckets for embedding */
@@ -1673,15 +1677,15 @@ ReebEdge * createArc(ReebGraph *rg, ReebNode *node1, ReebNode *node2)
 	return edge;
 }
 
-void addTriangleToGraph(ReebGraph *rg, ReebNode * n1, ReebNode * n2, ReebNode * n3, EditFace *efa)
+void addTriangleToGraph(ReebGraph *GLOBAL_RG, ReebNode * n1, ReebNode * n2, ReebNode * n3, EditFace *efa)
 {
 	ReebEdge *re1, *re2, *re3;
 	ReebEdge *e1, *e2, *e3;
 	float len1, len2, len3;
 	
-	re1 = createArc(rg, n1, n2);
-	re2 = createArc(rg, n2, n3);
-	re3 = createArc(rg, n3, n1);
+	re1 = createArc(GLOBAL_RG, n1, n2);
+	re2 = createArc(GLOBAL_RG, n2, n3);
+	re3 = createArc(GLOBAL_RG, n3, n1);
 	
 	addFacetoArc(re1->arc, efa);
 	addFacetoArc(re2->arc, efa);
@@ -1723,29 +1727,29 @@ void addTriangleToGraph(ReebGraph *rg, ReebNode * n1, ReebNode * n2, ReebNode *
 	}
 	
 	
-	mergePaths(rg, e1, e2, e3);
+	mergePaths(GLOBAL_RG, e1, e2, e3);
 }
 
 ReebGraph * newReebGraph()
 {
-	ReebGraph *rg;
-	rg = MEM_callocN(sizeof(ReebGraph), "reeb graph");
+	ReebGraph *GLOBAL_RG;
+	GLOBAL_RG = MEM_callocN(sizeof(ReebGraph), "reeb graph");
 	
-	rg->totnodes = 0;
-	rg->emap = BLI_edgehash_new();
+	GLOBAL_RG->totnodes = 0;
+	GLOBAL_RG->emap = BLI_edgehash_new();
 	
 	
-	rg->free_arc = REEB_freeArc;
-	rg->free_node = NULL;
-	rg->radial_symmetry = REEB_RadialSymmetry;
-	rg->axial_symmetry = REEB_AxialSymmetry;
+	GLOBAL_RG->free_arc = REEB_freeArc;
+	GLOBAL_RG->free_node = NULL;
+	GLOBAL_RG->radial_symmetry = REEB_RadialSymmetry;
+	GLOBAL_RG->axial_symmetry = REEB_AxialSymmetry;
 	
-	return rg;
+	return GLOBAL_RG;
 }
 
 ReebGraph * generateReebGraph(EditMesh *em, int subdivisions)
 {
-	ReebGraph *rg;
+	ReebGraph *GLOBAL_RG;
 	struct DynamicList * dlist;
 	EditVert *eve;
 	EditFace *efa;
@@ -1757,7 +1761,7 @@ ReebGraph * generateReebGraph(EditMesh *em, int subdivisions)
 	int countfaces = 0;
 #endif
  	
-	rg = newReebGraph();
+	GLOBAL_RG = newReebGraph();
 	
 	totvert = BLI_countlist(&em->verts);
 	totfaces = BLI_countlist(&em->faces);
@@ -1774,11 +1778,11 @@ ReebGraph * generateReebGraph(EditMesh *em, int subdivisions)
 	{
 		eve->hash = index;
 		eve->f2 = 0;
-		eve->tmp.p = addNode(rg, eve, eve->tmp.fp);
+		eve->tmp.p = addNode(GLOBAL_RG, eve, eve->tmp.fp);
 	}
 	
 	/* Temporarely convert node list to dynamic list, for indexed access */
-	dlist = BLI_dlist_from_listbase(&rg->nodes);
+	dlist = BLI_dlist_from_listbase(&GLOBAL_RG->nodes);
 	
 	/* Adding face, edge per edge */
 	for(efa = em->faces.first; efa; efa = efa->next)
@@ -1791,29 +1795,29 @@ ReebGraph * generateReebGraph(EditMesh *em, int subdivisions)
 			n2 = (ReebNode*)BLI_dlist_find_link(dlist, efa->v2->hash);
 			n3 = (ReebNode*)BLI_dlist_find_link(dlist, efa->v3->hash);
 			
-			addTriangleToGraph(rg, n1, n2, n3, efa);
+			addTriangleToGraph(GLOBAL_RG, n1, n2, n3, efa);
 			
 			if (efa->v4)
 			{
 				ReebNode *n4 = (ReebNode*)efa->v4->tmp.p;
-				addTriangleToGraph(rg, n1, n3, n4, efa);
+				addTriangleToGraph(GLOBAL_RG, n1, n3, n4, efa);
 			}
 #ifdef DEBUG_REEB
 			countfaces++;
 			if (countfaces % 100 == 0)
 			{
 				printf("face %i of %i\n", countfaces, totfaces);
-				verifyFaces(rg);
+				verifyFaces(GLOBAL_RG);
 			}
 #endif
 		}
 		
 	}
-	BLI_listbase_from_dlist(dlist, &rg->nodes);
+	BLI_listbase_from_dlist(dlist, &GLOBAL_RG->nodes);
 	
-	removeNormalNodes(rg);
+	removeNormalNodes(GLOBAL_RG);
 	
-	return rg;
+	return GLOBAL_RG;
 }
 
 /***************************************** WEIGHT UTILS **********************************************/
@@ -2073,8 +2077,9 @@ int weightFromDistance(EditMesh *em)
 	}
 
 	/* Initialize vertice flag and find at least one selected vertex */
-	for(eve = em->verts.first; eve && vCount == 0; eve = eve->next)
+	for(eve = em->verts.first; eve; eve = eve->next)
 	{
+		eve->tmp.fp = 0;
 		eve->f1 = 0;
 		if (eve->f & SELECT)
 		{
@@ -2094,6 +2099,7 @@ int weightFromDistance(EditMesh *em)
 		{
 			if (eve->f & SELECT)
 			{
+				printf("one\n");
 				current_eve = eve;
 				eve->f1 = 1;
 				
@@ -2170,14 +2176,27 @@ int weightFromDistance(EditMesh *em)
 							}				
 							current_eve->tmp.fp = currentWeight;
 						}
+						
+						
 					} while (select_eed != NULL);
 					
 					MEM_freeN(edges);
+					
+					printf("%i / %i\n", eIndex, totedge);
 				}
 			}
 		}
 	}
 
+	for(eve = em->verts.first; eve && vCount == 0; eve = eve->next)
+	{
+		if (eve->f1 == 0)
+		{
+			printf("vertex not reached\n");
+			break;
+		}
+	}
+
 	return 1;
 }
 
@@ -2269,14 +2288,14 @@ void blendColor(MCol *dst, MCol *src)
 #endif
 }
 
-void arcToVCol(ReebGraph *rg, EditMesh *em, int index)
+void arcToVCol(ReebGraph *GLOBAL_RG, EditMesh *em, int index)
 {
 	GHashIterator ghi;
 	EditFace *efa;
 	ReebArc *arc;
 	MCol *mcol;
 	MCol col;
-	int total = BLI_countlist(&rg->arcs);
+	int total = BLI_countlist(&GLOBAL_RG->arcs);
 	int i = 0;
 
 	if (!EM_vertColorCheck()) {
@@ -2304,7 +2323,7 @@ void arcToVCol(ReebGraph *rg, EditMesh *em, int index)
 		}
 	}
 
-	for (arc = rg->arcs.first; arc; arc = arc->next, i++)
+	for (arc = GLOBAL_RG->arcs.first; arc; arc = arc->next, i++)
 	{
 		float r,g,b;
 		col.a = 1;
@@ -2509,7 +2528,7 @@ struct EmbedBucket * currentBucket(struct ReebArcIterator *iter)
 ReebGraph *BIF_ReebGraphFromEditMesh(void)
 {
 	EditMesh *em = G.editMesh;
-	ReebGraph *rg = NULL;
+	ReebGraph *GLOBAL_RG = NULL;
 	int i;
 	
 	if (em == NULL)
@@ -2532,18 +2551,18 @@ ReebGraph *BIF_ReebGraphFromEditMesh(void)
 	weightToVCol(em, 1);
 #endif
 	
-	rg = generateReebGraph(em, G.scene->toolsettings->skgen_resolution);
+	GLOBAL_RG = generateReebGraph(em, G.scene->toolsettings->skgen_resolution);
 
-	REEB_exportGraph(rg, -1);
+	REEB_exportGraph(GLOBAL_RG, -1);
 
-	verifyBuckets(rg);
+	verifyBuckets(GLOBAL_RG);
 	
-	verifyFaces(rg);
+	verifyFaces(GLOBAL_RG);
 
 	/* Remove arcs without embedding */
-	filterNullReebGraph(rg);
+	filterNullReebGraph(GLOBAL_RG);
 
-	verifyBuckets(rg);
+	verifyBuckets(GLOBAL_RG);
 
 	i = 1;
 	/* filter until there's nothing more to do */
@@ -2553,49 +2572,184 @@ ReebGraph *BIF_ReebGraphFromEditMesh(void)
 		
 		if (G.scene->toolsettings->skgen_options & SKGEN_FILTER_EXTERNAL)
 		{
-			i |= filterExternalReebGraph(rg, G.scene->toolsettings->skgen_threshold_external * G.scene->toolsettings->skgen_resolution);
+			i |= filterExternalReebGraph(GLOBAL_RG, G.scene->toolsettings->skgen_threshold_external * G.scene->toolsettings->skgen_resolution);
 		}
 	
-		verifyBuckets(rg);
+		verifyBuckets(GLOBAL_RG);
 	
 		if (G.scene->toolsettings->skgen_options & SKGEN_FILTER_INTERNAL)
 		{
-			i |= filterInternalReebGraph(rg, G.scene->toolsettings->skgen_threshold_internal * G.scene->toolsettings->skgen_resolution);
+			i |= filterInternalReebGraph(GLOBAL_RG, G.scene->toolsettings->skgen_threshold_internal * G.scene->toolsettings->skgen_resolution);
 		}
 	}
 
-	filterSmartReebGraph(rg, 0.5);
+	//filterSmartReebGraph(GLOBAL_RG, 0.5);
 
 #ifdef DEBUG_REEB
-	arcToVCol(rg, em, 0);
+	arcToVCol(GLOBAL_RG, em, 0);
 	//angleToVCol(em, 1);
 #endif
 
-	verifyBuckets(rg);
+	verifyBuckets(GLOBAL_RG);
 
-	repositionNodes(rg);
+	repositionNodes(GLOBAL_RG);
 	
-	verifyBuckets(rg);
+	verifyBuckets(GLOBAL_RG);
 
 	/* Filtering might have created degree 2 nodes, so remove them */
-	removeNormalNodes(rg);
+	removeNormalNodes(GLOBAL_RG);
 	
-	verifyBuckets(rg);
+	verifyBuckets(GLOBAL_RG);
 
 	for(i = 0; i <  G.scene->toolsettings->skgen_postpro_passes; i++)
 	{
-		postprocessGraph(rg, G.scene->toolsettings->skgen_postpro);
+		postprocessGraph(GLOBAL_RG, G.scene->toolsettings->skgen_postpro);
 	}
 
-	BLI_buildAdjacencyList((BGraph*)rg);
+	BLI_buildAdjacencyList((BGraph*)GLOBAL_RG);
 	
-	sortNodes(rg);
+	sortNodes(GLOBAL_RG);
 	
-	sortArcs(rg);
+	sortArcs(GLOBAL_RG);
 	
-	REEB_exportGraph(rg, -1);
+	REEB_exportGraph(GLOBAL_RG, -1);
 	
-	calculateGraphLength(rg);
+	calculateGraphLength(GLOBAL_RG);
 	
-	return rg;
+	return GLOBAL_RG;
+}
+
+void BIF_GlobalReebFree()
+{
+	if (GLOBAL_RG != NULL)
+	{
+		REEB_freeGraph(GLOBAL_RG);
+		GLOBAL_RG = NULL;
+	}
+}
+
+void BIF_GlobalReebGraphFromEditMesh(void)
+{
+	EditMesh *em = G.editMesh;
+	int i;
+	
+	if (em == NULL)
+		return;
+
+	BIF_GlobalReebFree();
+
+	if (weightFromDistance(em) == 0)
+	{
+		error("No selected vertex\n");
+		return;
+	}
+	
+	renormalizeWeight(em, 1.0f);
+
+	if (G.scene->toolsettings->skgen_options & SKGEN_HARMONIC)
+	{
+		weightToHarmonic(em);
+	}
+	
+#ifdef DEBUG_REEB
+	weightToVCol(em, 0);
+#endif
+
+	GLOBAL_RG = generateReebGraph(em, G.scene->toolsettings->skgen_resolution);
+
+	REEB_exportGraph(GLOBAL_RG, -1);
+
+	verifyBuckets(GLOBAL_RG);
+	
+	verifyFaces(GLOBAL_RG);
+
+	/* Remove arcs without embedding */
+	filterNullReebGraph(GLOBAL_RG);
+
+	verifyBuckets(GLOBAL_RG);
+
+	i = 1;
+	/* filter until there's nothing more to do */
+	while (i == 1)
+	{
+		i = 0; /* no work done yet */
+		
+		if (G.scene->toolsettings->skgen_options & SKGEN_FILTER_EXTERNAL)
+		{
+			i |= filterExternalReebGraph(GLOBAL_RG, G.scene->toolsettings->skgen_threshold_external * G.scene->toolsettings->skgen_resolution);
+		}
+	
+		verifyBuckets(GLOBAL_RG);
+	
+		if (G.scene->toolsettings->skgen_options & SKGEN_FILTER_INTERNAL)
+		{
+			i |= filterInternalReebGraph(GLOBAL_RG, G.scene->toolsettings->skgen_threshold_internal * G.scene->toolsettings->skgen_resolution);
+		}
+	}
+
+	filterSmartReebGraph(GLOBAL_RG, 0.5);
+
+	verifyBuckets(GLOBAL_RG);
+
+	repositionNodes(GLOBAL_RG);
+	
+	verifyBuckets(GLOBAL_RG);
+
+	/* Filtering might have created degree 2 nodes, so remove them */
+	removeNormalNodes(GLOBAL_RG);
+	
+	verifyBuckets(GLOBAL_RG);
+
+#ifdef DEBUG_REEB
+	arcToVCol(GLOBAL_RG, em, 1);
+	//angleToVCol(em, 1);
+#endif
+
+	for(i = 0; i <  G.scene->toolsettings->skgen_postpro_passes; i++)
+	{
+		postprocessGraph(GLOBAL_RG, G.scene->toolsettings->skgen_postpro);
+	}
+
+	BLI_buildAdjacencyList((BGraph*)GLOBAL_RG);
+	
+	sortNodes(GLOBAL_RG);
+	
+	sortArcs(GLOBAL_RG);
+	
+	REEB_exportGraph(GLOBAL_RG, -1);
+	
+	calculateGraphLength(GLOBAL_RG);
+}
+
+void REEB_draw()
+{
+	ReebArc *arc;
+	
+	if (GLOBAL_RG == NULL)
+	{
+		return;
+	}
+	
+	glDisable(GL_DEPTH_TEST);
+	glColor3f(1, 0, 0);
+	
+	for (arc = GLOBAL_RG->arcs.first; arc; arc = arc->next)
+	{
+		ReebArcIterator iter;
+		EmbedBucket *bucket;
+		
+		initArcIterator(&iter, arc, arc->head);
+		
+		glBegin(GL_LINE_STRIP);
+			glVertex3fv(arc->head->p);
+			
+			for (bucket = nextBucket(&iter); bucket; bucket = nextBucket(&iter))
+			{
+				glVertex3fv(bucket->p);
+			}
+			
+			glVertex3fv(arc->tail->p);
+		glEnd();
+	}
+	glEnable(GL_DEPTH_TEST);
 }
diff --git a/source/blender/src/usiblender.c b/source/blender/src/usiblender.c
index 6c0838288b8..4b3eef88255 100644
--- a/source/blender/src/usiblender.c
+++ b/source/blender/src/usiblender.c
@@ -145,6 +145,8 @@
 
 #include "PIL_time.h"
 
+#include "reeb.h"
+
 /***/
 
 /* define for setting colors in theme below */
@@ -1048,6 +1050,8 @@ void exit_usiblender(void)
 	
 	BIF_clear_tempfiles();
 	
+	BIF_GlobalReebFree();
+	
 	tf= G.ttfdata.first;
 	while(tf)
 	{

From c0daf627333b21c72ec6d120805a74a8b274b429 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Mon, 23 Jun 2008 21:47:31 +0000
Subject: [PATCH 052/252] More robust primary symmetry axis algorithm (support
 branch in two) Draw primary axis and weight delta

---
 source/blender/blenlib/intern/graph.c     |  36 +-
 source/blender/makesdna/DNA_scene_types.h |   1 +
 source/blender/src/buttons_editing.c      |  18 +-
 source/blender/src/reeb.c                 | 434 +++++++++++++---------
 4 files changed, 292 insertions(+), 197 deletions(-)

diff --git a/source/blender/blenlib/intern/graph.c b/source/blender/blenlib/intern/graph.c
index 2c577983112..5c398339ec8 100644
--- a/source/blender/blenlib/intern/graph.c
+++ b/source/blender/blenlib/intern/graph.c
@@ -695,9 +695,14 @@ static void markdownSecondarySymmetry(BGraph *graph, BNode *node, int depth, int
 void markdownSymmetryArc(BGraph *graph, BArc *arc, BNode *node, int level, float limit)
 {
 	int i;
-	arc->symmetry_level = level;
-	
-	node = BLI_otherNode(arc, node);
+
+	/* if arc is null, we start straight from a node */	
+	if (arc)
+	{
+		arc->symmetry_level = level;
+		
+		node = BLI_otherNode(arc, node);
+	}
 	
 	for (i = 0; i < node->degree; i++)
 	{
@@ -727,7 +732,7 @@ void markdownSymmetryArc(BGraph *graph, BArc *arc, BNode *node, int level, float
 			/* true by default */
 			issymmetryAxis = 1;
 			
-			for (j = 0; j < node->degree && issymmetryAxis == 1; j++)
+			for (j = 0; j < node->degree; j++)
 			{
 				BArc *otherArc = node->arcs[j];
 				
@@ -736,6 +741,7 @@ void markdownSymmetryArc(BGraph *graph, BArc *arc, BNode *node, int level, float
 				{
 					/* not on the symmetry axis */
 					issymmetryAxis = 0;
+					break;
 				} 
 			}
 		}
@@ -748,11 +754,10 @@ void markdownSymmetryArc(BGraph *graph, BArc *arc, BNode *node, int level, float
 			{
 				arc = connectedArc;
 			}
-			else
+			else if (connectedArc->symmetry_level < arc->symmetry_level)
 			{
-				/* there can't be more than one symmetry arc */
-				arc = NULL;
-				break;
+				/* go with more complex subtree as symmetry arc */
+				arc = connectedArc;
 			}
 		}
 	}
@@ -796,12 +801,21 @@ void BLI_markdownSymmetry(BGraph *graph, BNode *root_node, float limit)
 
 	node = root_node;
 	
-	/* only work on acyclic graphs and if only one arc is incident on the first node */
-	if (node->degree == 1)
+	/* sanity check REMOVE ME */
+	if (node->degree > 0)
 	{
 		arc = node->arcs[0];
 		
-		markdownSymmetryArc(graph, arc, node, 1, limit);
+		if (node->degree == 1)
+		{
+			markdownSymmetryArc(graph, arc, node, 1, limit);
+		}
+		else
+		{
+			markdownSymmetryArc(graph, NULL, node, 1, limit);
+		}
+		
+
 
 		/* mark down non-symetric arcs */
 		for (arc = graph->arcs.first; arc; arc = arc->next)
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index bd3981ddc91..3255a58f68e 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -841,6 +841,7 @@ typedef struct Scene {
 #define	SKGEN_HARMONIC			64
 #define	SKGEN_STICK_TO_EMBEDDING	128
 #define	SKGEN_ADAPTIVE_DISTANCE		512
+#define SKGEN_FILTER_SMART		1024
 
 #define	SKGEN_SUB_LENGTH		0
 #define	SKGEN_SUB_ANGLE			1
diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c
index 0f101ce4318..58cc454424b 100644
--- a/source/blender/src/buttons_editing.c
+++ b/source/blender/src/buttons_editing.c
@@ -5021,9 +5021,10 @@ static void editing_panel_mesh_skgen_retarget(Object *ob, Mesh *me)
 	uiDefButS(block, NUM, B_DIFF, "Resolution:",							1025,150,225,19, &G.scene->toolsettings->skgen_resolution,10.0,1000.0, 0, 0,		"Specifies the resolution of the graph's embedding");
 	uiDefButBitS(block, TOG, SKGEN_HARMONIC, B_DIFF, 		"H",			1250,150, 25,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Apply harmonic smoothing to the weighting");
 	uiDefButBitS(block, TOG, SKGEN_FILTER_INTERNAL, B_DIFF, "Filter In",	1025,130, 83,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Filter internal small arcs from graph");
-	uiDefButF(block, NUM, B_DIFF, 							"T:",			1111,130,164,19, &G.scene->toolsettings->skgen_threshold_internal,0.0, 1.0, 10, 0,	"Specify the threshold ratio for filtering internal arcs");
-	uiDefButBitS(block, TOG, SKGEN_FILTER_EXTERNAL, B_DIFF, "Filter Ex",	1025,110, 83,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Filter external small arcs from graph");
-	uiDefButF(block, NUM, B_DIFF, 							"T:",			1111,110,164,19, &G.scene->toolsettings->skgen_threshold_external,0.0, 1.0, 10, 0,	"Specify the threshold ratio for filtering external arcs");
+	uiDefButF(block, NUM, B_DIFF, 							"",				1111,130,164,19, &G.scene->toolsettings->skgen_threshold_internal,0.0, 1.0, 10, 0,	"Specify the threshold ratio for filtering internal arcs");
+	uiDefButBitS(block, TOG, SKGEN_FILTER_EXTERNAL, B_DIFF, "Filter Ex",	1025,110, 53,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Filter external small arcs from graph");
+	uiDefButBitS(block, TOG, SKGEN_FILTER_SMART, 	B_DIFF, "Sm",			1078,110, 30,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Smart Filtering");
+	uiDefButF(block, NUM, B_DIFF, 							"",				1111,110,164,19, &G.scene->toolsettings->skgen_threshold_external,0.0, 1.0, 10, 0,	"Specify the threshold ratio for filtering external arcs");
 	uiBlockEndAlign(block);
 
 	uiDefButF(block, NUM, B_DIFF, 							"Ang:",			1025, 60, 83,19, &G.scene->toolsettings->skgen_retarget_angle_weight, 0, 10, 1, 0,		"Angle Weight");
@@ -5057,13 +5058,16 @@ static void editing_panel_mesh_skgen(Object *ob, Mesh *me)
 	uiButSetFunc(but, skgen_graphfree, NULL, NULL);
 
 	uiBlockBeginAlign(block);
-	uiDefButS(block, NUM, B_DIFF, "Resolution:",							1025,150,225,19, &G.scene->toolsettings->skgen_resolution,2.0,1000.0, 0, 0,		"Specifies the resolution of the graph's embedding");
+	uiDefButS(block, NUM, B_DIFF, "Resolution:",							1025,150,225,19, &G.scene->toolsettings->skgen_resolution,10.0,1000.0, 0, 0,		"Specifies the resolution of the graph's embedding");
 	uiDefButBitS(block, TOG, SKGEN_HARMONIC, B_DIFF, 		"H",			1250,150, 25,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Apply harmonic smoothing to the weighting");
 	uiDefButBitS(block, TOG, SKGEN_FILTER_INTERNAL, B_DIFF, "Filter In",	1025,130, 83,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Filter internal small arcs from graph");
-	uiDefButF(block, NUM, B_DIFF, 							"T:",			1111,130,164,19, &G.scene->toolsettings->skgen_threshold_internal,0.0, 1.0, 10, 0,	"Specify the threshold ratio for filtering internal arcs");
-	uiDefButBitS(block, TOG, SKGEN_FILTER_EXTERNAL, B_DIFF, "Filter Ex",	1025,110, 83,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Filter external small arcs from graph");
-	uiDefButF(block, NUM, B_DIFF, 							"T:",			1111,110,164,19, &G.scene->toolsettings->skgen_threshold_external,0.0, 1.0, 10, 0,	"Specify the threshold ratio for filtering external arcs");
+	uiDefButF(block, NUM, B_DIFF, 							"",				1111,130,164,19, &G.scene->toolsettings->skgen_threshold_internal,0.0, 1.0, 10, 0,	"Specify the threshold ratio for filtering internal arcs");
+	uiDefButBitS(block, TOG, SKGEN_FILTER_EXTERNAL, B_DIFF, "Filter Ex",	1025,110, 53,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Filter external small arcs from graph");
+	uiDefButBitS(block, TOG, SKGEN_FILTER_SMART, 	B_DIFF, "Sm",			1078,110, 30,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Smart Filtering");
+	uiDefButF(block, NUM, B_DIFF, 							"",				1111,110,164,19, &G.scene->toolsettings->skgen_threshold_external,0.0, 1.0, 10, 0,	"Specify the threshold ratio for filtering external arcs");
+	uiBlockEndAlign(block);
 
+	uiBlockBeginAlign(block);
 	for(i = 0; i < SKGEN_SUB_TOTAL; i++)
 	{
 		int y = 90 - 20 * i;
diff --git a/source/blender/src/reeb.c b/source/blender/src/reeb.c
index 59afd0f1327..f889537975b 100644
--- a/source/blender/src/reeb.c
+++ b/source/blender/src/reeb.c
@@ -46,6 +46,8 @@
 
 #include "BDR_editobject.h"
 
+#include "BMF_Api.h"
+
 #include "BIF_editmesh.h"
 #include "BIF_editarmature.h"
 #include "BIF_interface.h"
@@ -90,10 +92,10 @@ typedef enum {
 	MERGE_APPEND
 } MergeDirection;
 
-int mergeArcs(ReebGraph *GLOBAL_RG, ReebArc *a0, ReebArc *a1);
-int mergeConnectedArcs(ReebGraph *GLOBAL_RG, ReebArc *a0, ReebArc *a1);
+int mergeArcs(ReebGraph *rg, ReebArc *a0, ReebArc *a1);
+int mergeConnectedArcs(ReebGraph *rg, ReebArc *a0, ReebArc *a1);
 EditEdge * NextEdgeForVert(EditMesh *em, EditVert *v);
-void mergeArcFaces(ReebGraph *GLOBAL_RG, ReebArc *aDst, ReebArc *aSrc);
+void mergeArcFaces(ReebGraph *rg, ReebArc *aDst, ReebArc *aSrc);
 void addFacetoArc(ReebArc *arc, EditFace *efa);
 
 void REEB_RadialSymmetry(BNode* root_node, RadialArc* ring, int count);
@@ -247,11 +249,11 @@ void calculateArcLength(ReebArc *arc)
 	arc->length += VecLenf(arc->tail->p, vec1);	
 }
 
-void calculateGraphLength(ReebGraph *GLOBAL_RG)
+void calculateGraphLength(ReebGraph *rg)
 {
 	ReebArc *arc;
 	
-	for (arc = GLOBAL_RG->arcs.first; arc; arc = arc->next)
+	for (arc = rg->arcs.first; arc; arc = arc->next)
 	{
 		calculateArcLength(arc);
 	}
@@ -298,13 +300,13 @@ void REEB_freeArc(BArc *barc)
 	MEM_freeN(arc);
 }
 
-void REEB_freeGraph(ReebGraph *GLOBAL_RG)
+void REEB_freeGraph(ReebGraph *rg)
 {
 	ReebArc *arc;
 	ReebNode *node;
 	
 	// free nodes
-	for( node = GLOBAL_RG->nodes.first; node; node = node->next )
+	for( node = rg->nodes.first; node; node = node->next )
 	{
 		// Free adjacency lists
 		if (node->arcs != NULL)
@@ -312,10 +314,10 @@ void REEB_freeGraph(ReebGraph *GLOBAL_RG)
 			MEM_freeN(node->arcs);
 		}
 	}
-	BLI_freelistN(&GLOBAL_RG->nodes);
+	BLI_freelistN(&rg->nodes);
 	
 	// free arcs
-	arc = GLOBAL_RG->arcs.first;
+	arc = rg->arcs.first;
 	while( arc )
 	{
 		ReebArc *next = arc->next;
@@ -324,23 +326,43 @@ void REEB_freeGraph(ReebGraph *GLOBAL_RG)
 	}
 	
 	// free edge map
-	BLI_edgehash_free(GLOBAL_RG->emap, NULL);
+	BLI_edgehash_free(rg->emap, NULL);
 	
-	MEM_freeN(GLOBAL_RG);
+	MEM_freeN(rg);
 }
 
-void repositionNodes(ReebGraph *GLOBAL_RG)
+void NodeDegreeDecrement(ReebGraph *rg, ReebNode *node)
+{
+	node->degree--;
+
+//	if (node->degree == 0)
+//	{
+//		printf("would remove node %i\n", node->index);
+//	}
+}
+
+void NodeDegreeIncrement(ReebGraph *rg, ReebNode *node)
+{
+//	if (node->degree == 0)
+//	{
+//		printf("first connect node %i\n", node->index);
+//	}
+
+	node->degree++;
+}
+
+void repositionNodes(ReebGraph *rg)
 {
 	BArc *arc = NULL;
 	BNode *node = NULL;
 	
 	// Reset node positions
-	for(node = GLOBAL_RG->nodes.first; node; node = node->next)
+	for(node = rg->nodes.first; node; node = node->next)
 	{
 		node->p[0] = node->p[1] = node->p[2] = 0;
 	}
 	
-	for(arc = GLOBAL_RG->arcs.first; arc; arc = arc->next)
+	for(arc = rg->arcs.first; arc; arc = arc->next)
 	{
 		if (((ReebArc*)arc)->bcount > 0)
 		{
@@ -357,16 +379,16 @@ void repositionNodes(ReebGraph *GLOBAL_RG)
 	}
 }
 
-void verifyNodeDegree(ReebGraph *GLOBAL_RG)
+void verifyNodeDegree(ReebGraph *rg)
 {
-#ifdef DEBUG_REEB
+//#ifdef DEBUG_REEB
 	ReebNode *node = NULL;
 	ReebArc *arc = NULL;
 
-	for(node = GLOBAL_RG->nodes.first; node; node = node->next)
+	for(node = rg->nodes.first; node; node = node->next)
 	{
 		int count = 0;
-		for(arc = GLOBAL_RG->arcs.first; arc; arc = arc->next)
+		for(arc = rg->arcs.first; arc; arc = arc->next)
 		{
 			if (arc->head == node || arc->tail == node)
 			{
@@ -377,15 +399,19 @@ void verifyNodeDegree(ReebGraph *GLOBAL_RG)
 		{
 			printf("degree error in node %i: expected %i got %i\n", node->index, count, node->degree);
 		}
+		if (node->degree == 0)
+		{
+			printf("zero degree node %i with weight %f\n", node->index, node->weight);
+		}
 	}
-#endif
+//#endif
 }
 
-void verifyBuckets(ReebGraph *GLOBAL_RG)
+void verifyBuckets(ReebGraph *rg)
 {
 #ifdef DEBUG_REEB
 	ReebArc *arc = NULL;
-	for(arc = GLOBAL_RG->arcs.first; arc; arc = arc->next)
+	for(arc = rg->arcs.first; arc; arc = arc->next)
 	{
 		ReebNode *head = (ReebNode*)arc->head;
 		ReebNode *tail = (ReebNode*)arc->tail;
@@ -417,12 +443,12 @@ void verifyBuckets(ReebGraph *GLOBAL_RG)
 #endif
 }
 
-void verifyFaces(ReebGraph *GLOBAL_RG)
+void verifyFaces(ReebGraph *rg)
 {
 #ifdef DEBUG_REEB
 	int total = 0;
 	ReebArc *arc = NULL;
-	for(arc = GLOBAL_RG->arcs.first; arc; arc = arc->next)
+	for(arc = rg->arcs.first; arc; arc = arc->next)
 	{
 		total += BLI_ghash_size(arc->faces);
 	}
@@ -629,7 +655,7 @@ void REEB_AxialSymmetry(BNode* root_node, BNode* node1, BNode* node2, struct BAr
 
 /****************************************** SMOOTHING **************************************************/
 
-void postprocessGraph(ReebGraph *GLOBAL_RG, char mode)
+void postprocessGraph(ReebGraph *rg, char mode)
 {
 	ReebArc *arc;
 	float fac1 = 0, fac2 = 1, fac3 = 0;
@@ -652,7 +678,7 @@ void postprocessGraph(ReebGraph *GLOBAL_RG, char mode)
 		return;
 	}
 	
-	for(arc = GLOBAL_RG->arcs.first; arc; arc = arc->next)
+	for(arc = rg->arcs.first; arc; arc = arc->next)
 	{
 		EmbedBucket *buckets = arc->buckets;
 		int bcount = arc->bcount;
@@ -687,9 +713,9 @@ int compareNodesWeight(void *vnode1, void *vnode2)
 	}
 }
 
-void sortNodes(ReebGraph *GLOBAL_RG)
+void sortNodes(ReebGraph *rg)
 {
-	BLI_sortlist(&GLOBAL_RG->nodes, compareNodesWeight);
+	BLI_sortlist(&rg->nodes, compareNodesWeight);
 }
 
 int compareArcsWeight(void *varc1, void *varc2)
@@ -713,9 +739,9 @@ int compareArcsWeight(void *varc1, void *varc2)
 	}
 }
 
-void sortArcs(ReebGraph *GLOBAL_RG)
+void sortArcs(ReebGraph *rg)
 {
-	BLI_sortlist(&GLOBAL_RG->arcs, compareArcsWeight);
+	BLI_sortlist(&rg->arcs, compareArcsWeight);
 }
 
 /****************************************** FILTERING **************************************************/
@@ -749,12 +775,12 @@ int compareArcs(void *varc1, void *varc2)
 	}
 }
 
-void filterArc(ReebGraph *GLOBAL_RG, ReebNode *newNode, ReebNode *removedNode, ReebArc * srcArc, int merging)
+void filterArc(ReebGraph *rg, ReebNode *newNode, ReebNode *removedNode, ReebArc * srcArc, int merging)
 {
 	ReebArc *arc = NULL, *nextArc = NULL;
 
 	/* first pass, merge buckets for arcs that spawned the two nodes into the source arc*/
-	for(arc = GLOBAL_RG->arcs.first; arc; arc = arc->next)
+	for(arc = rg->arcs.first; arc; arc = arc->next)
 	{
 		if (arc->head == srcArc->head && arc->tail == srcArc->tail && arc != srcArc)
 		{
@@ -765,7 +791,7 @@ void filterArc(ReebGraph *GLOBAL_RG, ReebNode *newNode, ReebNode *removedNode, R
 	}
 
 	/* second pass, replace removedNode by newNode, remove arcs that are collapsed in a loop */
-	arc = GLOBAL_RG->arcs.first;
+	arc = rg->arcs.first;
 	while(arc)
 	{
 		nextArc = arc->next;
@@ -785,12 +811,13 @@ void filterArc(ReebGraph *GLOBAL_RG, ReebNode *newNode, ReebNode *removedNode, R
 			if (arc->head == arc->tail)
 			{
 				// v1 or v2 was already newNode, since we're removing an arc, decrement degree
-				newNode->degree--;
+				NodeDegreeDecrement(rg, newNode);
+				//newNode->degree--;
 				
 				// If it's safeArc, it'll be removed later, so keep it for now
 				if (arc != srcArc)
 				{
-					BLI_remlink(&GLOBAL_RG->arcs, arc);
+					BLI_remlink(&rg->arcs, arc);
 					REEB_freeArc((BArc*)arc);
 				}
 			}
@@ -798,15 +825,17 @@ void filterArc(ReebGraph *GLOBAL_RG, ReebNode *newNode, ReebNode *removedNode, R
 			else if (((ReebNode*)arc->head)->weight > ((ReebNode*)arc->tail)->weight)
 			{
 				// Decrement degree from the other node
-				BLI_otherNode((BArc*)arc, (BNode*)newNode)->degree--;
+				//BLI_otherNode((BArc*)arc, (BNode*)newNode)->degree--;
+				NodeDegreeDecrement(rg, (ReebNode*)BLI_otherNode((BArc*)arc, (BNode*)newNode));
 				
-				BLI_remlink(&GLOBAL_RG->arcs, arc);
+				BLI_remlink(&rg->arcs, arc);
 				REEB_freeArc((BArc*)arc);
 			}
 			else
 			{
-				newNode->degree++; // incrementing degree since we're adding an arc
-				mergeArcFaces(GLOBAL_RG, arc, srcArc);
+				//newNode->degree++; // incrementing degree since we're adding an arc
+				NodeDegreeIncrement(rg, newNode);
+				mergeArcFaces(rg, arc, srcArc);
 
 				if (merging)
 				{
@@ -824,11 +853,11 @@ void filterArc(ReebGraph *GLOBAL_RG, ReebNode *newNode, ReebNode *removedNode, R
 	}
 }
 
-void filterNullReebGraph(ReebGraph *GLOBAL_RG)
+void filterNullReebGraph(ReebGraph *rg)
 {
 	ReebArc *arc = NULL, *nextArc = NULL;
 	
-	arc = GLOBAL_RG->arcs.first;
+	arc = rg->arcs.first;
 	while(arc)
 	{
 		nextArc = arc->next;
@@ -844,29 +873,29 @@ void filterNullReebGraph(ReebGraph *GLOBAL_RG)
 			//newNode->weight = FloatLerpf(newNode->weight, removedNode->weight, blend);
 			VecLerpf(newNode->p, newNode->p, removedNode->p, blend);
 			
-			filterArc(GLOBAL_RG, newNode, removedNode, arc, 0);
+			filterArc(rg, newNode, removedNode, arc, 0);
 
 			// Reset nextArc, it might have changed
 			nextArc = arc->next;
 			
-			BLI_remlink(&GLOBAL_RG->arcs, arc);
+			BLI_remlink(&rg->arcs, arc);
 			REEB_freeArc((BArc*)arc);
 			
-			BLI_freelinkN(&GLOBAL_RG->nodes, removedNode);
+			BLI_freelinkN(&rg->nodes, removedNode);
 		}
 		
 		arc = nextArc;
 	}
 }
 
-int filterInternalReebGraph(ReebGraph *GLOBAL_RG, float threshold)
+int filterInternalReebGraph(ReebGraph *rg, float threshold)
 {
 	ReebArc *arc = NULL, *nextArc = NULL;
 	int value = 0;
 	
-	BLI_sortlist(&GLOBAL_RG->arcs, compareArcs);
+	BLI_sortlist(&rg->arcs, compareArcs);
 
-	arc = GLOBAL_RG->arcs.first;
+	arc = rg->arcs.first;
 	while(arc)
 	{
 		nextArc = arc->next;
@@ -889,15 +918,15 @@ int filterInternalReebGraph(ReebGraph *GLOBAL_RG, float threshold)
 				removedNode = arc->head;
 			}
 			
-			filterArc(GLOBAL_RG, newNode, removedNode, arc, 1);
+			filterArc(rg, newNode, removedNode, arc, 1);
 
 			// Reset nextArc, it might have changed
 			nextArc = arc->next;
 			
-			BLI_remlink(&GLOBAL_RG->arcs, arc);
+			BLI_remlink(&rg->arcs, arc);
 			REEB_freeArc((BArc*)arc);
 			
-			BLI_freelinkN(&GLOBAL_RG->nodes, removedNode);
+			BLI_freelinkN(&rg->nodes, removedNode);
 			value = 1;
 		}
 		
@@ -907,14 +936,14 @@ int filterInternalReebGraph(ReebGraph *GLOBAL_RG, float threshold)
 	return value;
 }
 
-int filterExternalReebGraph(ReebGraph *GLOBAL_RG, float threshold)
+int filterExternalReebGraph(ReebGraph *rg, float threshold)
 {
 	ReebArc *arc = NULL, *nextArc = NULL;
 	int value = 0;
 	
-	BLI_sortlist(&GLOBAL_RG->arcs, compareArcs);
+	BLI_sortlist(&rg->arcs, compareArcs);
 
-	arc = GLOBAL_RG->arcs.first;
+	arc = rg->arcs.first;
 	while(arc)
 	{
 		nextArc = arc->next;
@@ -958,21 +987,22 @@ int filterExternalReebGraph(ReebGraph *GLOBAL_RG, float threshold)
 			// Merging arc
 			if (merging)
 			{
-				filterArc(GLOBAL_RG, newNode, removedNode, arc, 1);
+				filterArc(rg, newNode, removedNode, arc, 1);
 			}
 			else
 			{
 				// removing arc, so we need to decrease the degree of the remaining node
-				newNode->degree--;
+				//newNode->degree--;
+				NodeDegreeDecrement(rg, newNode);
 			}
 
 			// Reset nextArc, it might have changed
 			nextArc = arc->next;
 			
-			BLI_remlink(&GLOBAL_RG->arcs, arc);
+			BLI_remlink(&rg->arcs, arc);
 			REEB_freeArc((BArc*)arc);
 			
-			BLI_freelinkN(&GLOBAL_RG->nodes, removedNode);
+			BLI_freelinkN(&rg->nodes, removedNode);
 			value = 1;
 		}
 		
@@ -982,12 +1012,12 @@ int filterExternalReebGraph(ReebGraph *GLOBAL_RG, float threshold)
 	return value;
 }
 
-int filterSmartReebGraph(ReebGraph *GLOBAL_RG, float threshold)
+int filterSmartReebGraph(ReebGraph *rg, float threshold)
 {
 	ReebArc *arc = NULL, *nextArc = NULL;
 	int value = 0;
 	
-	BLI_sortlist(&GLOBAL_RG->arcs, compareArcs);
+	BLI_sortlist(&rg->arcs, compareArcs);
 
 #ifdef DEBUG_REEB
 	{	
@@ -998,7 +1028,7 @@ int filterSmartReebGraph(ReebGraph *GLOBAL_RG, float threshold)
 	}
 #endif
 
-	arc = GLOBAL_RG->arcs.first;
+	arc = rg->arcs.first;
 	while(arc)
 	{
 		nextArc = arc->next;
@@ -1128,21 +1158,22 @@ int filterSmartReebGraph(ReebGraph *GLOBAL_RG, float threshold)
 				// Merging arc
 				if (merging)
 				{
-					filterArc(GLOBAL_RG, newNode, removedNode, arc, 1);
+					filterArc(rg, newNode, removedNode, arc, 1);
 				}
 				else
 				{
 					// removing arc, so we need to decrease the degree of the remaining node
-					newNode->degree--;
+					//newNode->degree--;
+					NodeDegreeDecrement(rg, newNode);
 				}
 	
 				// Reset nextArc, it might have changed
 				nextArc = arc->next;
 				
-				BLI_remlink(&GLOBAL_RG->arcs, arc);
+				BLI_remlink(&rg->arcs, arc);
 				REEB_freeArc((BArc*)arc);
 				
-				BLI_freelinkN(&GLOBAL_RG->nodes, removedNode);
+				BLI_freelinkN(&rg->nodes, removedNode);
 				value = 1;
 			}
 		}
@@ -1220,7 +1251,7 @@ void exportNode(FILE *f, char *text, ReebNode *node)
 	fprintf(f, "%s i:%i w:%f d:%i %f %f %f\n", text, node->index, node->weight, node->degree, node->p[0], node->p[1], node->p[2]);
 }
 
-void REEB_exportGraph(ReebGraph *GLOBAL_RG, int count)
+void REEB_exportGraph(ReebGraph *rg, int count)
 {
 	ReebArc *arc;
 	char filename[128];
@@ -1236,7 +1267,7 @@ void REEB_exportGraph(ReebGraph *GLOBAL_RG, int count)
 	}
 	f = fopen(filename, "w");
 
-	for(arc = GLOBAL_RG->arcs.first; arc; arc = arc->next)
+	for(arc = rg->arcs.first; arc; arc = arc->next)
 	{
 		int i;
 		float p[3];
@@ -1260,11 +1291,11 @@ void REEB_exportGraph(ReebGraph *GLOBAL_RG, int count)
 
 /***************************************** MAIN ALGORITHM **********************************************/
 
-ReebArc * findConnectedArc(ReebGraph *GLOBAL_RG, ReebArc *arc, ReebNode *v)
+ReebArc * findConnectedArc(ReebGraph *rg, ReebArc *arc, ReebNode *v)
 {
 	ReebArc *nextArc = arc->next;
 	
-	for(nextArc = GLOBAL_RG->arcs.first; nextArc; nextArc = nextArc->next)
+	for(nextArc = rg->arcs.first; nextArc; nextArc = nextArc->next)
 	{
 		if (arc != nextArc && (nextArc->head == v || nextArc->tail == v))
 		{
@@ -1276,24 +1307,24 @@ ReebArc * findConnectedArc(ReebGraph *GLOBAL_RG, ReebArc *arc, ReebNode *v)
 }
 
 
-void removeNormalNodes(ReebGraph *GLOBAL_RG)
+void removeNormalNodes(ReebGraph *rg)
 {
 	ReebArc *arc;
 	
 	// Merge degree 2 nodes
-	for(arc = GLOBAL_RG->arcs.first; arc; arc = arc->next)
+	for(arc = rg->arcs.first; arc; arc = arc->next)
 	{
 		while (arc->head->degree == 2 || arc->tail->degree == 2)
 		{
 			// merge at v1
 			if (arc->head->degree == 2)
 			{
-				ReebArc *nextArc = (ReebArc*)BLI_findConnectedArc((BGraph*)GLOBAL_RG, (BArc*)arc, (BNode*)arc->head);
+				ReebArc *nextArc = (ReebArc*)BLI_findConnectedArc((BGraph*)rg, (BArc*)arc, (BNode*)arc->head);
 
 				// Merge arc only if needed
 				if (arc->head == nextArc->tail)
 				{				
-					mergeConnectedArcs(GLOBAL_RG, arc, nextArc);
+					mergeConnectedArcs(rg, arc, nextArc);
 				}
 				// Otherwise, mark down vert
 				else
@@ -1305,12 +1336,12 @@ void removeNormalNodes(ReebGraph *GLOBAL_RG)
 			// merge at v2
 			if (arc->tail->degree == 2)
 			{
-				ReebArc *nextArc = (ReebArc*)BLI_findConnectedArc((BGraph*)GLOBAL_RG, (BArc*)arc, (BNode*)arc->tail);
+				ReebArc *nextArc = (ReebArc*)BLI_findConnectedArc((BGraph*)rg, (BArc*)arc, (BNode*)arc->tail);
 				
 				// Merge arc only if needed
 				if (arc->tail == nextArc->head)
 				{				
-					mergeConnectedArcs(GLOBAL_RG, arc, nextArc);
+					mergeConnectedArcs(rg, arc, nextArc);
 				}
 				// Otherwise, mark down vert
 				else
@@ -1353,7 +1384,7 @@ void addFacetoArc(ReebArc *arc, EditFace *efa)
 	BLI_ghash_insert(arc->faces, efa, efa);
 }
 
-void mergeArcFaces(ReebGraph *GLOBAL_RG, ReebArc *aDst, ReebArc *aSrc)
+void mergeArcFaces(ReebGraph *rg, ReebArc *aDst, ReebArc *aSrc)
 {
 	GHashIterator ghi;
 	
@@ -1366,7 +1397,7 @@ void mergeArcFaces(ReebGraph *GLOBAL_RG, ReebArc *aDst, ReebArc *aSrc)
 	}
 } 
 
-void mergeArcEdges(ReebGraph *GLOBAL_RG, ReebArc *aDst, ReebArc *aSrc, MergeDirection direction)
+void mergeArcEdges(ReebGraph *rg, ReebArc *aDst, ReebArc *aSrc, MergeDirection direction)
 {
 	ReebEdge *e = NULL;
 	
@@ -1391,7 +1422,7 @@ void mergeArcEdges(ReebGraph *GLOBAL_RG, ReebArc *aDst, ReebArc *aSrc, MergeDire
 			
 			if (direction == MERGE_LOWER)
 			{
-				void **p = BLI_edgehash_lookup_p(GLOBAL_RG->emap, e->v1->index, e->v2->index);
+				void **p = BLI_edgehash_lookup_p(rg->emap, e->v1->index, e->v2->index);
 				
 				newEdge->nextEdge = e;
 
@@ -1423,13 +1454,13 @@ void mergeArcEdges(ReebGraph *GLOBAL_RG, ReebArc *aDst, ReebArc *aSrc, MergeDire
 } 
 
 // return 1 on full merge
-int mergeConnectedArcs(ReebGraph *GLOBAL_RG, ReebArc *a0, ReebArc *a1)
+int mergeConnectedArcs(ReebGraph *rg, ReebArc *a0, ReebArc *a1)
 {
 	int result = 0;
 	ReebNode *removedNode = NULL;
 	
-	mergeArcEdges(GLOBAL_RG, a0, a1, MERGE_APPEND);
-	mergeArcFaces(GLOBAL_RG, a0, a1);
+	mergeArcEdges(rg, a0, a1, MERGE_APPEND);
+	mergeArcFaces(rg, a0, a1);
 	
 	// Bring a0 to the combine length of both arcs
 	if (a0->tail == a1->head)
@@ -1448,16 +1479,16 @@ int mergeConnectedArcs(ReebGraph *GLOBAL_RG, ReebArc *a0, ReebArc *a1)
 	mergeArcBuckets(a0, a1, a0->head->weight, a0->tail->weight);
 	
 	// remove a1 from graph
-	BLI_remlink(&GLOBAL_RG->arcs, a1);
+	BLI_remlink(&rg->arcs, a1);
 	REEB_freeArc((BArc*)a1);
 	
-	BLI_freelinkN(&GLOBAL_RG->nodes, removedNode);
+	BLI_freelinkN(&rg->nodes, removedNode);
 	result = 1;
 	
 	return result;
 }
 // return 1 on full merge
-int mergeArcs(ReebGraph *GLOBAL_RG, ReebArc *a0, ReebArc *a1)
+int mergeArcs(ReebGraph *rg, ReebArc *a0, ReebArc *a1)
 {
 	int result = 0;
 	// TRIANGLE POINTS DOWN
@@ -1465,29 +1496,33 @@ int mergeArcs(ReebGraph *GLOBAL_RG, ReebArc *a0, ReebArc *a1)
 	{
 		if (a0->tail->weight == a1->tail->weight) // tails also the same, arcs can be totally merge together
 		{
-			mergeArcEdges(GLOBAL_RG, a0, a1, MERGE_APPEND);
-			mergeArcFaces(GLOBAL_RG, a0, a1);
+			mergeArcEdges(rg, a0, a1, MERGE_APPEND);
+			mergeArcFaces(rg, a0, a1);
 			
 			mergeArcBuckets(a0, a1, a0->head->weight, a0->tail->weight);
 			
 			// Adjust node degree
-			a1->head->degree--;
-			a1->tail->degree--;
+			//a1->head->degree--;
+			NodeDegreeDecrement(rg, a1->head);
+			//a1->tail->degree--;
+			NodeDegreeDecrement(rg, a1->tail);
 			
 			// remove a1 from graph
-			BLI_remlink(&GLOBAL_RG->arcs, a1);
+			BLI_remlink(&rg->arcs, a1);
 			
 			REEB_freeArc((BArc*)a1);
 			result = 1;
 		}
 		else if (a0->tail->weight > a1->tail->weight) // a1->tail->weight is in the middle
 		{
-			mergeArcEdges(GLOBAL_RG, a1, a0, MERGE_LOWER);
-			mergeArcFaces(GLOBAL_RG, a1, a0);
+			mergeArcEdges(rg, a1, a0, MERGE_LOWER);
+			mergeArcFaces(rg, a1, a0);
 
 			// Adjust node degree
-			a0->head->degree--;
-			a1->tail->degree++;
+			//a0->head->degree--;
+			NodeDegreeDecrement(rg, a0->head);
+			//a1->tail->degree++;
+			NodeDegreeIncrement(rg, a1->tail);
 			
 			mergeArcBuckets(a1, a0, a1->head->weight, a1->tail->weight);
 			a0->head = a1->tail;
@@ -1495,12 +1530,14 @@ int mergeArcs(ReebGraph *GLOBAL_RG, ReebArc *a0, ReebArc *a1)
 		}
 		else // a0>n2 is in the middle
 		{
-			mergeArcEdges(GLOBAL_RG, a0, a1, MERGE_LOWER);
-			mergeArcFaces(GLOBAL_RG, a0, a1);
+			mergeArcEdges(rg, a0, a1, MERGE_LOWER);
+			mergeArcFaces(rg, a0, a1);
 			
 			// Adjust node degree
-			a1->head->degree--;
-			a0->tail->degree++;
+			//a1->head->degree--;
+			NodeDegreeDecrement(rg, a1->head);
+			//a0->tail->degree++;
+			NodeDegreeIncrement(rg, a0->tail);
 			
 			mergeArcBuckets(a0, a1, a0->head->weight, a0->tail->weight);
 			a1->head = a0->tail;
@@ -1512,12 +1549,14 @@ int mergeArcs(ReebGraph *GLOBAL_RG, ReebArc *a0, ReebArc *a1)
 	{
 		if (a0->head->weight > a1->head->weight) // a0->head->weight is in the middle
 		{
-			mergeArcEdges(GLOBAL_RG, a0, a1, MERGE_HIGHER);
-			mergeArcFaces(GLOBAL_RG, a0, a1);
+			mergeArcEdges(rg, a0, a1, MERGE_HIGHER);
+			mergeArcFaces(rg, a0, a1);
 			
 			// Adjust node degree
-			a1->tail->degree--;
-			a0->head->degree++;
+			//a1->tail->degree--;
+			NodeDegreeDecrement(rg, a1->tail);
+			//a0->head->degree++;
+			NodeDegreeIncrement(rg, a0->head);
 			
 			mergeArcBuckets(a0, a1, a0->head->weight, a0->tail->weight);
 			a1->tail = a0->head;
@@ -1525,12 +1564,14 @@ int mergeArcs(ReebGraph *GLOBAL_RG, ReebArc *a0, ReebArc *a1)
 		}
 		else // a1->head->weight is in the middle
 		{
-			mergeArcEdges(GLOBAL_RG, a1, a0, MERGE_HIGHER);
-			mergeArcFaces(GLOBAL_RG, a1, a0);
+			mergeArcEdges(rg, a1, a0, MERGE_HIGHER);
+			mergeArcFaces(rg, a1, a0);
 
 			// Adjust node degree
-			a0->tail->degree--;
-			a1->head->degree++;
+			//a0->tail->degree--;
+			NodeDegreeDecrement(rg, a0->tail);
+			//a1->head->degree++;
+			NodeDegreeIncrement(rg, a1->head);
 
 			mergeArcBuckets(a1, a0, a1->head->weight, a1->tail->weight);
 			a0->tail = a1->head;
@@ -1545,12 +1586,12 @@ int mergeArcs(ReebGraph *GLOBAL_RG, ReebArc *a0, ReebArc *a1)
 	return result;
 }
 
-void glueByMergeSort(ReebGraph *GLOBAL_RG, ReebArc *a0, ReebArc *a1, ReebEdge *e0, ReebEdge *e1)
+void glueByMergeSort(ReebGraph *rg, ReebArc *a0, ReebArc *a1, ReebEdge *e0, ReebEdge *e1)
 {
 	int total = 0;
 	while (total == 0 && a0 != a1 && a0 != NULL && a1 != NULL)
 	{
-		total = mergeArcs(GLOBAL_RG, a0, a1);
+		total = mergeArcs(rg, a0, a1);
 		
 		if (total == 0) // if it wasn't a total merge, go forward
 		{
@@ -1566,18 +1607,18 @@ void glueByMergeSort(ReebGraph *GLOBAL_RG, ReebArc *a0, ReebArc *a1, ReebEdge *e
 	}
 }
 
-void mergePaths(ReebGraph *GLOBAL_RG, ReebEdge *e0, ReebEdge *e1, ReebEdge *e2)
+void mergePaths(ReebGraph *rg, ReebEdge *e0, ReebEdge *e1, ReebEdge *e2)
 {
 	ReebArc *a0, *a1, *a2;
 	a0 = e0->arc;
 	a1 = e1->arc;
 	a2 = e2->arc;
 	
-	glueByMergeSort(GLOBAL_RG, a0, a1, e0, e1);
-	glueByMergeSort(GLOBAL_RG, a0, a2, e0, e2);
+	glueByMergeSort(rg, a0, a1, e0, e1);
+	glueByMergeSort(rg, a0, a2, e0, e2);
 } 
 
-ReebNode * addNode(ReebGraph *GLOBAL_RG, EditVert *eve, float weight)
+ReebNode * addNode(ReebGraph *rg, EditVert *eve, float weight)
 {
 	ReebNode *node = NULL;
 	
@@ -1588,20 +1629,20 @@ ReebNode * addNode(ReebGraph *GLOBAL_RG, EditVert *eve, float weight)
 	node->arcs = NULL;
 	node->degree = 0;
 	node->weight = weight;
-	node->index = GLOBAL_RG->totnodes;
+	node->index = rg->totnodes;
 	VECCOPY(node->p, eve->co);	
 	
-	BLI_addtail(&GLOBAL_RG->nodes, node);
-	GLOBAL_RG->totnodes++;
+	BLI_addtail(&rg->nodes, node);
+	rg->totnodes++;
 	
 	return node;
 }
 
-ReebEdge * createArc(ReebGraph *GLOBAL_RG, ReebNode *node1, ReebNode *node2)
+ReebEdge * createArc(ReebGraph *rg, ReebNode *node1, ReebNode *node2)
 {
 	ReebEdge *edge;
 	
-	edge = BLI_edgehash_lookup(GLOBAL_RG->emap, node1->index, node2->index);
+	edge = BLI_edgehash_lookup(rg->emap, node1->index, node2->index);
 	
 	// Only add existing edges that haven't been added yet
 	if (edge == NULL)
@@ -1633,17 +1674,19 @@ ReebEdge * createArc(ReebGraph *GLOBAL_RG, ReebNode *node1, ReebNode *node2)
 		arc->tail = v2;
 		
 		// increase node degree
-		v1->degree++;
-		v2->degree++;
+		//v1->degree++;
+		NodeDegreeIncrement(rg, v1);
+		//v2->degree++;
+		NodeDegreeIncrement(rg, v2);
 
-		BLI_edgehash_insert(GLOBAL_RG->emap, node1->index, node2->index, edge);
+		BLI_edgehash_insert(rg->emap, node1->index, node2->index, edge);
 		
 		edge->arc = arc;
 		edge->nextEdge = NULL;
 		edge->v1 = v1;
 		edge->v2 = v2;
 		
-		BLI_addtail(&GLOBAL_RG->arcs, arc);
+		BLI_addtail(&rg->arcs, arc);
 		BLI_addtail(&arc->edges, edge);
 		
 		/* adding buckets for embedding */
@@ -1677,15 +1720,15 @@ ReebEdge * createArc(ReebGraph *GLOBAL_RG, ReebNode *node1, ReebNode *node2)
 	return edge;
 }
 
-void addTriangleToGraph(ReebGraph *GLOBAL_RG, ReebNode * n1, ReebNode * n2, ReebNode * n3, EditFace *efa)
+void addTriangleToGraph(ReebGraph *rg, ReebNode * n1, ReebNode * n2, ReebNode * n3, EditFace *efa)
 {
 	ReebEdge *re1, *re2, *re3;
 	ReebEdge *e1, *e2, *e3;
 	float len1, len2, len3;
 	
-	re1 = createArc(GLOBAL_RG, n1, n2);
-	re2 = createArc(GLOBAL_RG, n2, n3);
-	re3 = createArc(GLOBAL_RG, n3, n1);
+	re1 = createArc(rg, n1, n2);
+	re2 = createArc(rg, n2, n3);
+	re3 = createArc(rg, n3, n1);
 	
 	addFacetoArc(re1->arc, efa);
 	addFacetoArc(re2->arc, efa);
@@ -1727,29 +1770,29 @@ void addTriangleToGraph(ReebGraph *GLOBAL_RG, ReebNode * n1, ReebNode * n2, Reeb
 	}
 	
 	
-	mergePaths(GLOBAL_RG, e1, e2, e3);
+	mergePaths(rg, e1, e2, e3);
 }
 
 ReebGraph * newReebGraph()
 {
-	ReebGraph *GLOBAL_RG;
-	GLOBAL_RG = MEM_callocN(sizeof(ReebGraph), "reeb graph");
+	ReebGraph *rg;
+	rg = MEM_callocN(sizeof(ReebGraph), "reeb graph");
 	
-	GLOBAL_RG->totnodes = 0;
-	GLOBAL_RG->emap = BLI_edgehash_new();
+	rg->totnodes = 0;
+	rg->emap = BLI_edgehash_new();
 	
 	
-	GLOBAL_RG->free_arc = REEB_freeArc;
-	GLOBAL_RG->free_node = NULL;
-	GLOBAL_RG->radial_symmetry = REEB_RadialSymmetry;
-	GLOBAL_RG->axial_symmetry = REEB_AxialSymmetry;
+	rg->free_arc = REEB_freeArc;
+	rg->free_node = NULL;
+	rg->radial_symmetry = REEB_RadialSymmetry;
+	rg->axial_symmetry = REEB_AxialSymmetry;
 	
-	return GLOBAL_RG;
+	return rg;
 }
 
 ReebGraph * generateReebGraph(EditMesh *em, int subdivisions)
 {
-	ReebGraph *GLOBAL_RG;
+	ReebGraph *rg;
 	struct DynamicList * dlist;
 	EditVert *eve;
 	EditFace *efa;
@@ -1761,7 +1804,7 @@ ReebGraph * generateReebGraph(EditMesh *em, int subdivisions)
 	int countfaces = 0;
 #endif
  	
-	GLOBAL_RG = newReebGraph();
+	rg = newReebGraph();
 	
 	totvert = BLI_countlist(&em->verts);
 	totfaces = BLI_countlist(&em->faces);
@@ -1774,15 +1817,19 @@ ReebGraph * generateReebGraph(EditMesh *em, int subdivisions)
 	renormalizeWeight(em, (float)subdivisions);
 
 	/* Adding vertice */
-	for(index = 0, eve = em->verts.first; eve; index++, eve = eve->next)
+	for(index = 0, eve = em->verts.first; eve; eve = eve->next)
 	{
-		eve->hash = index;
-		eve->f2 = 0;
-		eve->tmp.p = addNode(GLOBAL_RG, eve, eve->tmp.fp);
+		if (eve->h == 0)
+		{
+			eve->hash = index;
+			eve->f2 = 0;
+			eve->tmp.p = addNode(rg, eve, eve->tmp.fp);
+			index++;
+		}
 	}
 	
 	/* Temporarely convert node list to dynamic list, for indexed access */
-	dlist = BLI_dlist_from_listbase(&GLOBAL_RG->nodes);
+	dlist = BLI_dlist_from_listbase(&rg->nodes);
 	
 	/* Adding face, edge per edge */
 	for(efa = em->faces.first; efa; efa = efa->next)
@@ -1795,29 +1842,29 @@ ReebGraph * generateReebGraph(EditMesh *em, int subdivisions)
 			n2 = (ReebNode*)BLI_dlist_find_link(dlist, efa->v2->hash);
 			n3 = (ReebNode*)BLI_dlist_find_link(dlist, efa->v3->hash);
 			
-			addTriangleToGraph(GLOBAL_RG, n1, n2, n3, efa);
+			addTriangleToGraph(rg, n1, n2, n3, efa);
 			
 			if (efa->v4)
 			{
 				ReebNode *n4 = (ReebNode*)efa->v4->tmp.p;
-				addTriangleToGraph(GLOBAL_RG, n1, n3, n4, efa);
+				addTriangleToGraph(rg, n1, n3, n4, efa);
 			}
 #ifdef DEBUG_REEB
 			countfaces++;
 			if (countfaces % 100 == 0)
 			{
 				printf("face %i of %i\n", countfaces, totfaces);
-				verifyFaces(GLOBAL_RG);
+				verifyFaces(rg);
 			}
 #endif
 		}
 		
 	}
-	BLI_listbase_from_dlist(dlist, &GLOBAL_RG->nodes);
+	BLI_listbase_from_dlist(dlist, &rg->nodes);
 	
-	removeNormalNodes(GLOBAL_RG);
+	removeNormalNodes(rg);
 	
-	return GLOBAL_RG;
+	return rg;
 }
 
 /***************************************** WEIGHT UTILS **********************************************/
@@ -2099,7 +2146,6 @@ int weightFromDistance(EditMesh *em)
 		{
 			if (eve->f & SELECT)
 			{
-				printf("one\n");
 				current_eve = eve;
 				eve->f1 = 1;
 				
@@ -2288,14 +2334,14 @@ void blendColor(MCol *dst, MCol *src)
 #endif
 }
 
-void arcToVCol(ReebGraph *GLOBAL_RG, EditMesh *em, int index)
+void arcToVCol(ReebGraph *rg, EditMesh *em, int index)
 {
 	GHashIterator ghi;
 	EditFace *efa;
 	ReebArc *arc;
 	MCol *mcol;
 	MCol col;
-	int total = BLI_countlist(&GLOBAL_RG->arcs);
+	int total = BLI_countlist(&rg->arcs);
 	int i = 0;
 
 	if (!EM_vertColorCheck()) {
@@ -2323,7 +2369,7 @@ void arcToVCol(ReebGraph *GLOBAL_RG, EditMesh *em, int index)
 		}
 	}
 
-	for (arc = GLOBAL_RG->arcs.first; arc; arc = arc->next, i++)
+	for (arc = rg->arcs.first; arc; arc = arc->next, i++)
 	{
 		float r,g,b;
 		col.a = 1;
@@ -2528,7 +2574,7 @@ struct EmbedBucket * currentBucket(struct ReebArcIterator *iter)
 ReebGraph *BIF_ReebGraphFromEditMesh(void)
 {
 	EditMesh *em = G.editMesh;
-	ReebGraph *GLOBAL_RG = NULL;
+	ReebGraph *rg = NULL;
 	int i;
 	
 	if (em == NULL)
@@ -2551,18 +2597,18 @@ ReebGraph *BIF_ReebGraphFromEditMesh(void)
 	weightToVCol(em, 1);
 #endif
 	
-	GLOBAL_RG = generateReebGraph(em, G.scene->toolsettings->skgen_resolution);
+	rg = generateReebGraph(em, G.scene->toolsettings->skgen_resolution);
 
-	REEB_exportGraph(GLOBAL_RG, -1);
+	REEB_exportGraph(rg, -1);
 
-	verifyBuckets(GLOBAL_RG);
+	verifyBuckets(rg);
 	
-	verifyFaces(GLOBAL_RG);
+	verifyFaces(rg);
 
 	/* Remove arcs without embedding */
-	filterNullReebGraph(GLOBAL_RG);
+	filterNullReebGraph(rg);
 
-	verifyBuckets(GLOBAL_RG);
+	verifyBuckets(rg);
 
 	i = 1;
 	/* filter until there's nothing more to do */
@@ -2572,51 +2618,54 @@ ReebGraph *BIF_ReebGraphFromEditMesh(void)
 		
 		if (G.scene->toolsettings->skgen_options & SKGEN_FILTER_EXTERNAL)
 		{
-			i |= filterExternalReebGraph(GLOBAL_RG, G.scene->toolsettings->skgen_threshold_external * G.scene->toolsettings->skgen_resolution);
+			i |= filterExternalReebGraph(rg, G.scene->toolsettings->skgen_threshold_external * G.scene->toolsettings->skgen_resolution);
 		}
 	
-		verifyBuckets(GLOBAL_RG);
+		verifyBuckets(rg);
 	
 		if (G.scene->toolsettings->skgen_options & SKGEN_FILTER_INTERNAL)
 		{
-			i |= filterInternalReebGraph(GLOBAL_RG, G.scene->toolsettings->skgen_threshold_internal * G.scene->toolsettings->skgen_resolution);
+			i |= filterInternalReebGraph(rg, G.scene->toolsettings->skgen_threshold_internal * G.scene->toolsettings->skgen_resolution);
 		}
 	}
 
-	//filterSmartReebGraph(GLOBAL_RG, 0.5);
+	if (G.scene->toolsettings->skgen_options & SKGEN_FILTER_SMART)
+	{
+		filterSmartReebGraph(rg, 0.5);
+	}
 
 #ifdef DEBUG_REEB
-	arcToVCol(GLOBAL_RG, em, 0);
+	arcToVCol(rg, em, 0);
 	//angleToVCol(em, 1);
 #endif
 
-	verifyBuckets(GLOBAL_RG);
+	verifyBuckets(rg);
 
-	repositionNodes(GLOBAL_RG);
+	repositionNodes(rg);
 	
-	verifyBuckets(GLOBAL_RG);
+	verifyBuckets(rg);
 
 	/* Filtering might have created degree 2 nodes, so remove them */
-	removeNormalNodes(GLOBAL_RG);
+	removeNormalNodes(rg);
 	
-	verifyBuckets(GLOBAL_RG);
+	verifyBuckets(rg);
 
 	for(i = 0; i <  G.scene->toolsettings->skgen_postpro_passes; i++)
 	{
-		postprocessGraph(GLOBAL_RG, G.scene->toolsettings->skgen_postpro);
+		postprocessGraph(rg, G.scene->toolsettings->skgen_postpro);
 	}
 
-	BLI_buildAdjacencyList((BGraph*)GLOBAL_RG);
+	BLI_buildAdjacencyList((BGraph*)rg);
 	
-	sortNodes(GLOBAL_RG);
+	sortNodes(rg);
 	
-	sortArcs(GLOBAL_RG);
+	sortArcs(rg);
 	
-	REEB_exportGraph(GLOBAL_RG, -1);
+	REEB_exportGraph(rg, -1);
 	
-	calculateGraphLength(GLOBAL_RG);
+	calculateGraphLength(rg);
 	
-	return GLOBAL_RG;
+	return rg;
 }
 
 void BIF_GlobalReebFree()
@@ -2657,6 +2706,8 @@ void BIF_GlobalReebGraphFromEditMesh(void)
 
 	GLOBAL_RG = generateReebGraph(em, G.scene->toolsettings->skgen_resolution);
 
+	verifyNodeDegree(GLOBAL_RG);
+
 	REEB_exportGraph(GLOBAL_RG, -1);
 
 	verifyBuckets(GLOBAL_RG);
@@ -2687,7 +2738,10 @@ void BIF_GlobalReebGraphFromEditMesh(void)
 		}
 	}
 
-	filterSmartReebGraph(GLOBAL_RG, 0.5);
+	if (G.scene->toolsettings->skgen_options & SKGEN_FILTER_SMART)
+	{
+		filterSmartReebGraph(GLOBAL_RG, 0.5);
+	}
 
 	verifyBuckets(GLOBAL_RG);
 
@@ -2719,11 +2773,14 @@ void BIF_GlobalReebGraphFromEditMesh(void)
 	REEB_exportGraph(GLOBAL_RG, -1);
 	
 	calculateGraphLength(GLOBAL_RG);
+
+	BLI_markdownSymmetry((BGraph*)GLOBAL_RG, GLOBAL_RG->nodes.first, G.scene->toolsettings->skgen_symmetry_limit);
 }
 
 void REEB_draw()
 {
 	ReebArc *arc;
+	int i = 0;
 	
 	if (GLOBAL_RG == NULL)
 	{
@@ -2731,25 +2788,44 @@ void REEB_draw()
 	}
 	
 	glDisable(GL_DEPTH_TEST);
-	glColor3f(1, 0, 0);
-	
-	for (arc = GLOBAL_RG->arcs.first; arc; arc = arc->next)
+	for (arc = GLOBAL_RG->arcs.first; arc; arc = arc->next, i++)
 	{
 		ReebArcIterator iter;
 		EmbedBucket *bucket;
+		float vec[3];
+		char text[64];
 		
 		initArcIterator(&iter, arc, arc->head);
 		
+		if (arc->symmetry_level == 1)
+		{
+			glColor3f(1, 0, 0);
+		}
+		else
+		{
+			glColor3f(1, 0.5f, 0);
+		}
 		glBegin(GL_LINE_STRIP);
 			glVertex3fv(arc->head->p);
 			
-			for (bucket = nextBucket(&iter); bucket; bucket = nextBucket(&iter))
+			if (arc->bcount)
 			{
-				glVertex3fv(bucket->p);
+				for (bucket = nextBucket(&iter); bucket; bucket = nextBucket(&iter))
+				{
+					glVertex3fv(bucket->p);
+				}
 			}
 			
 			glVertex3fv(arc->tail->p);
 		glEnd();
+		
+		VecLerpf(vec, arc->head->p, arc->tail->p, 0.5f);
+		
+		sprintf(text, "%i - %0.3f", i, arc->tail->weight - arc->head->weight);
+		
+		glColor3f(0, 1, 0);
+		glRasterPos3fv(vec);
+		BMF_DrawString( G.fonts, text);
 	}
 	glEnable(GL_DEPTH_TEST);
 }

From bdc030c664640db727ea21a1e854bb62032bf705 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Tue, 24 Jun 2008 15:25:25 +0000
Subject: [PATCH 053/252] Text plugin basis with plugin for
 suggestions/completions. The suggest plugin works for imported global
 variables, methods, modules and module members. For example typing:

import Blender
from Blender import *
| <- cursor here suggests globals
Blender.Draw.gl| <- cursor here suggests all Draw members starting gl

Currently suggestions are listed in the console when the space is redrawn but will be presented as a menu-style list soon. Also to add are shortcut/activation keys to allow plugins to respond to certain key strokes.
---
 release/scripts/textplugin_suggest.py         | 234 ++++++++++++++++++
 source/blender/blenkernel/BKE_suggestions.h   |  77 ++++++
 .../blender/blenkernel/intern/suggestions.c   | 125 ++++++++++
 source/blender/python/BPY_interface.c         |   1 +
 source/blender/python/BPY_menus.c             |   5 +
 source/blender/python/BPY_menus.h             |   1 +
 source/blender/python/api2_2x/Text.c          |  57 +++++
 source/blender/python/api2_2x/doc/Text.py     |  12 +-
 source/blender/src/drawtext.c                 |  15 ++
 source/blender/src/header_text.c              |  32 +++
 source/blender/src/usiblender.c               |   3 +
 11 files changed, 561 insertions(+), 1 deletion(-)
 create mode 100644 release/scripts/textplugin_suggest.py
 create mode 100644 source/blender/blenkernel/BKE_suggestions.h
 create mode 100644 source/blender/blenkernel/intern/suggestions.c

diff --git a/release/scripts/textplugin_suggest.py b/release/scripts/textplugin_suggest.py
new file mode 100644
index 00000000000..77ae0488b1c
--- /dev/null
+++ b/release/scripts/textplugin_suggest.py
@@ -0,0 +1,234 @@
+#!BPY
+"""
+Name: 'Suggest'
+Blender: 243
+Group: 'TextPlugin'
+Tooltip: 'Suggests completions for the word at the cursor in a python script'
+"""
+
+import bpy
+from Blender  import Text
+from StringIO import StringIO
+from inspect  import *
+from tokenize import generate_tokens
+import token
+
+TK_TYPE  = 0
+TK_TOKEN = 1
+TK_START = 2 #(srow, scol)
+TK_END   = 3 #(erow, ecol)
+TK_LINE  = 4
+TK_ROW = 0
+TK_COL = 1
+
+keywords = ['and', 'del', 'from', 'not', 'while', 'as', 'elif', 'global',
+			'or', 'with', 'assert', 'else', 'if', 'pass', 'yield',
+			'break', 'except', 'import', 'print', 'class', 'exec', 'in',
+			'raise', 'continue', 'finally', 'is', 'return', 'def', 'for',
+			'lambda', 'try' ]
+
+execs = [] # Used to establish the same import context across defs (import is scope sensitive)
+
+def getTokens(txt):
+	global tokens_cached
+	if tokens_cached==None:
+		lines = txt.asLines()
+		str = '\n'.join(lines)
+		readline = StringIO(str).readline
+		g = generate_tokens(readline)
+		tokens = []
+		for t in g: tokens.append(t)
+		tokens_cached = tokens
+	return tokens_cached
+tokens_cached = None
+
+def isNameChar(s):
+	return s.isalnum() or s in ['_']
+
+# Returns words preceding the cursor that are separated by periods as a list in the
+# same order
+def getCompletionSymbols(txt):
+	(l, c)= txt.getCursorPos()
+	lines = txt.asLines()
+	line = lines[l]
+	a=0
+	for a in range(1, c+1):
+		if not isNameChar(line[c-a]) and line[c-a]!='.':
+			a -= 1
+			break
+	return line[c-a:c].split('.')
+
+
+# Returns a list of tuples of symbol names and their types (name, type) where
+# type is one of:
+#   m (module/class)  Has its own members (includes classes)
+#   v (variable)      Has a type which may have its own members
+#   f (function)      Callable and may have a return type (with its own members)
+# It also updates the global import context (via execs)
+def getGlobals(txt):
+	global execs
+	
+	tokens = getTokens(txt)
+	globals = dict()
+	for i in range(len(tokens)):
+		
+		# Handle all import statements
+		if i>=1 and tokens[i-1][TK_TOKEN]=='import':
+			
+			# Find 'from' if it exists
+			fr= -1
+			for a in range(1, i):
+				if tokens[i-a][TK_TYPE]==token.NEWLINE: break
+				if tokens[i-a][TK_TOKEN]=='from':
+					fr=i-a
+					break
+			
+			# Handle: import ___[,___]
+			if fr<0:
+				
+				while True:
+					if tokens[i][TK_TYPE]==token.NAME:
+						# Add the import to the execs list
+						x = tokens[i][TK_LINE].strip()
+						k = tokens[i][TK_TOKEN]
+						execs.append(x)
+						
+						# Add the symbol name to the return list
+						globals[k] = 'm'
+					elif tokens[i][TK_TOKEN]!=',':
+						break
+					i += 1
+			
+			# Handle statement: from ___[.___] import ___[,___]
+			else: # fr>=0:
+				
+				# Add the import to the execs list
+				x = tokens[i][TK_LINE].strip()
+				execs.append(x)
+				
+				# Import parent module so we can process it for sub modules
+				parent = ''.join([t[TK_TOKEN] for t in tokens[fr+1:i-1]])
+				exec "import "+parent
+				
+				# All submodules, functions, etc.
+				if tokens[i][TK_TOKEN]=='*':
+					
+					# Add each symbol name to the return list
+					exec "d="+parent+".__dict__.items()"
+					for k,v in d:
+						if not globals.has_key(k) or not globals[k]:
+							t='v'
+							if ismodule(v): t='m'
+							elif callable(v): t='f'
+							globals[k] = t
+				
+				# Specific function, submodule, etc.
+				else:
+					while True:
+						if tokens[i][TK_TYPE]==token.NAME:
+							k = tokens[i][TK_TOKEN]
+							if not globals.has_key(k) or not globals[k]:
+								t='v'
+								try:
+									exec 'v='+parent+'.'+k
+									if ismodule(v): t='m'
+									elif callable(v): t='f'
+								except: pass
+								globals[k] = t
+						elif tokens[i][TK_TOKEN]!=',':
+							break
+						i += 1
+					
+		elif tokens[i][TK_TYPE]==token.NAME and tokens[i][TK_TOKEN] not in keywords and (i==0 or tokens[i-1][TK_TOKEN]!='.'):
+			k = tokens[i][TK_TOKEN]
+			if not globals.has_key(k) or not globals[k]:
+				t=None
+				if (i>0 and tokens[i-1][TK_TOKEN]=='def'):
+					t='f'
+				else:
+					t='v'
+				globals[k] = t
+	
+	return globals
+
+def cmpi0(x, y):
+	return cmp(x[0].lower(), y[0].lower())
+
+def globalSuggest(txt, cs):
+	global execs
+	
+	suggestions = dict()
+	(row, col) = txt.getCursorPos()
+	globals = getGlobals(txt)
+	
+	# Sometimes we have conditional includes which will fail if the module
+	# cannot be found. So we protect outselves in a try block
+	for x in execs:
+		exec 'try: '+x+'\nexcept: pass'
+	
+	if len(cs)==0:
+		sub = ''
+	else:
+		sub = cs[0].lower()
+	print 'Search:', sub
+	
+	for k,t in globals.items():
+		if k.lower().startswith(sub):
+			suggestions[k] = t
+	
+	l = list(suggestions.items())
+	return sorted (l, cmp=cmpi0)
+
+# Only works for 'static' members (eg. Text.Get)
+def memberSuggest(txt, cs):
+	global execs
+	
+	# Populate the execs for imports
+	getGlobals(txt)
+	
+	# Sometimes we have conditional includes which will fail if the module
+	# cannot be found. So we protect outselves in a try block
+	for x in execs:
+		exec 'try: '+x+'\nexcept: pass'
+	
+	suggestions = dict()
+	(row, col) = txt.getCursorPos()
+	
+	sub = cs[len(cs)-1].lower()
+	print 'Search:', sub
+	
+	t=None
+	pre='.'.join(cs[:-1])
+	try:
+		exec "t="+pre
+	except:
+		print 'Failed to assign '+pre
+		print execs
+		print cs
+	
+	if t!=None:
+		for k,v in t.__dict__.items():
+			if ismodule(v): t='m'
+			elif callable(v): t='f'
+			else: t='v'
+			if k.lower().startswith(sub):
+				suggestions[k] = t
+	
+	l = list(suggestions.items())
+	return sorted (l, cmp=cmpi0)
+
+def main():
+	txt = bpy.data.texts.active
+	if txt==None: return
+	
+	cs = getCompletionSymbols(txt)
+	
+	if len(cs)<=1:
+		l = globalSuggest(txt, cs)
+		txt.suggest(l, cs[len(cs)-1])
+		
+	else:
+		l = memberSuggest(txt, cs)
+		txt.suggest(l, cs[len(cs)-1])
+
+main()
diff --git a/source/blender/blenkernel/BKE_suggestions.h b/source/blender/blenkernel/BKE_suggestions.h
new file mode 100644
index 00000000000..bc4e18f5a67
--- /dev/null
+++ b/source/blender/blenkernel/BKE_suggestions.h
@@ -0,0 +1,77 @@
+/**	
+ * $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 *****
+ */
+#ifndef BKE_SUGGESTIONS_H
+#define BKE_SUGGESTIONS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* ****************************************************************************
+Suggestions must be added in sorted order (no attempt is made to sort the list)
+The list is then divided up based on the prefix provided by update_suggestions:
+Example:
+  Prefix: ab
+  aaa <-- first
+  aab
+  aba <-- firstmatch
+  abb <-- lastmatch
+  baa
+  bab <-- last
+**************************************************************************** */
+
+struct Text;
+
+typedef struct SuggItem {
+	struct SuggItem *prev, *next;
+	char *name;
+	char type;
+} SuggItem;
+
+typedef struct SuggList {
+	SuggItem *first, *last;
+	SuggItem *firstmatch, *lastmatch;
+} SuggList;
+
+void free_suggestions();
+
+void add_suggestion(const char *name, char type);
+void update_suggestions(const char *prefix);
+SuggItem *suggest_first();
+SuggItem *suggest_last();
+
+void set_suggest_text(Text *text);
+void clear_suggest_text();
+short is_suggest_active(Text *text);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/source/blender/blenkernel/intern/suggestions.c b/source/blender/blenkernel/intern/suggestions.c
new file mode 100644
index 00000000000..3842146376d
--- /dev/null
+++ b/source/blender/blenkernel/intern/suggestions.c
@@ -0,0 +1,125 @@
+/**
+ * $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 <stdlib.h>
+#include <string.h>
+
+#include "MEM_guardedalloc.h"
+#include "BLI_blenlib.h"
+#include "DNA_text_types.h"
+#include "BKE_text.h"
+#include "BKE_suggestions.h"
+
+static SuggList suggestions= {NULL, NULL, NULL, NULL};
+static Text *suggText = NULL;
+
+void free_suggestions() {
+	SuggItem *item;
+	for (item = suggestions.last; item; item=item->prev)
+		MEM_freeN(item);
+	suggestions.first = suggestions.last = NULL;
+	suggestions.firstmatch = suggestions.lastmatch = NULL;
+}
+
+void add_suggestion(const char *name, char type) {
+	SuggItem *newitem;
+
+	newitem = MEM_mallocN(sizeof(SuggItem) + strlen(name) + 1, "SuggestionItem");
+	if (!newitem) {
+		printf("Failed to allocate memory for suggestion.\n");
+		return;
+	}
+
+	newitem->name = (char *) (newitem + 1);
+	strcpy(newitem->name, name);
+	newitem->type = type;
+	newitem->prev = newitem->next = NULL;
+
+	if (!suggestions.first) {
+		suggestions.first = suggestions.last = newitem;
+	} else {
+		newitem->prev = suggestions.last;
+		suggestions.last->next = newitem;
+		suggestions.last = newitem;
+	}
+}
+
+void update_suggestions(const char *prefix) {
+	SuggItem *match, *first, *last;
+	int cmp, len = strlen(prefix);
+
+	if (!suggestions.first) return;
+	if (len==0) {
+		suggestions.firstmatch = suggestions.first;
+		suggestions.lastmatch = suggestions.last;
+		return;
+	}
+	
+	first = last = NULL;
+	for (match=suggestions.first; match; match=match->next) {
+		cmp = strncmp(prefix, match->name, len);
+		if (cmp==0) {
+			if (!first)
+				first = match;
+		} else if (cmp<0) {
+			if (!last) {
+				last = match->prev;
+				break;
+			}
+		}
+	}
+	if (first) {
+		if (!last) last = suggestions.last;
+		suggestions.firstmatch = first;
+		suggestions.lastmatch = last;
+	} else {
+		suggestions.firstmatch = suggestions.lastmatch = NULL;
+	}
+}
+
+SuggItem *suggest_first() {
+	return suggestions.firstmatch;
+}
+
+SuggItem *suggest_last() {
+	return suggestions.lastmatch;
+}
+
+void set_suggest_text(Text *text) {
+	suggText = text;
+}
+
+void clear_suggest_text() {
+	free_suggestions();
+	suggText = NULL;
+}
+
+short is_suggest_active(Text *text) {
+	return suggText==text ? 1 : 0;
+}
diff --git a/source/blender/python/BPY_interface.c b/source/blender/python/BPY_interface.c
index 7c23c86d9ba..360c8fd7f04 100644
--- a/source/blender/python/BPY_interface.c
+++ b/source/blender/python/BPY_interface.c
@@ -1066,6 +1066,7 @@ int BPY_menu_do_python( short menutype, int event )
 	case PYMENU_RENDER:
 	case PYMENU_WIZARDS:
 	case PYMENU_SCRIPTTEMPLATE:
+	case PYMENU_TEXTPLUGIN:
 	case PYMENU_MESHFACEKEY:
 		break;
 
diff --git a/source/blender/python/BPY_menus.c b/source/blender/python/BPY_menus.c
index 82da9edbee6..08691973a92 100644
--- a/source/blender/python/BPY_menus.c
+++ b/source/blender/python/BPY_menus.c
@@ -106,6 +106,8 @@ static int bpymenu_group_atoi( char *str )
 		return PYMENU_ARMATURE;
 	else if( !strcmp( str, "ScriptTemplate" ) )
 		return PYMENU_SCRIPTTEMPLATE;
+	else if( !strcmp( str, "TextPlugin" ) )
+		return PYMENU_TEXTPLUGIN;
 	else if( !strcmp( str, "MeshFaceKey" ) )
 		return PYMENU_MESHFACEKEY;
 	else if( !strcmp( str, "AddMesh" ) )
@@ -184,6 +186,9 @@ char *BPyMenu_group_itoa( short menugroup )
 	case PYMENU_SCRIPTTEMPLATE:
 		return "ScriptTemplate";
 		break;
+	case PYMENU_TEXTPLUGIN:
+		return "TextPlugin";
+		break;
 	case PYMENU_MESHFACEKEY:
 		return "MeshFaceKey";
 		break;
diff --git a/source/blender/python/BPY_menus.h b/source/blender/python/BPY_menus.h
index 1b557f79286..e8bca09d50e 100644
--- a/source/blender/python/BPY_menus.h
+++ b/source/blender/python/BPY_menus.h
@@ -99,6 +99,7 @@ typedef enum {
 	PYMENU_UVCALCULATION,
 	PYMENU_ARMATURE,
 	PYMENU_SCRIPTTEMPLATE,
+	PYMENU_TEXTPLUGIN,
 	PYMENU_HELP,/*Main Help menu items - prob best to leave for 'official' ones*/
 	PYMENU_HELPSYSTEM,/* Resources, troubleshooting, system tools */
 	PYMENU_HELPWEBSITES,/* Help -> Websites submenu */
diff --git a/source/blender/python/api2_2x/Text.c b/source/blender/python/api2_2x/Text.c
index 603deb768ad..63c77c0bb3e 100644
--- a/source/blender/python/api2_2x/Text.c
+++ b/source/blender/python/api2_2x/Text.c
@@ -34,8 +34,11 @@
 #include "BKE_global.h"
 #include "BKE_main.h"
 #include "BIF_drawtext.h"
+#include "BIF_screen.h"
 #include "BKE_text.h"
+#include "BKE_suggestions.h"
 #include "BLI_blenlib.h"
+#include "DNA_screen_types.h"
 #include "DNA_space_types.h"
 #include "gen_utils.h"
 #include "gen_library.h"
@@ -96,6 +99,7 @@ static PyObject *Text_set( BPy_Text * self, PyObject * args );
 static PyObject *Text_asLines( BPy_Text * self );
 static PyObject *Text_getCursorPos( BPy_Text * self );
 static PyObject *Text_setCursorPos( BPy_Text * self, PyObject * args );
+static PyObject *Text_suggest( BPy_Text * self, PyObject * args );
 
 /*****************************************************************************/
 /* Python BPy_Text methods table:                                            */
@@ -124,6 +128,8 @@ static PyMethodDef BPy_Text_methods[] = {
 	 "() - Return cursor position as (row, col) tuple"},
 	{"setCursorPos", ( PyCFunction ) Text_setCursorPos, METH_VARARGS,
 	 "(row, col) - Set the cursor position to (row, col)"},
+	{"suggest", ( PyCFunction ) Text_suggest, METH_VARARGS,
+	 "(list) - List of tuples of the form (name, type) where type is one of 'm', 'v', 'f' for module, variable and function respectively"},
 	{NULL, NULL, 0, NULL}
 };
 
@@ -511,6 +517,57 @@ static PyObject *Text_setCursorPos( BPy_Text * self, PyObject * args )
 	Py_RETURN_NONE;
 }
 
+static PyObject *Text_suggest( BPy_Text * self, PyObject * args )
+{
+	PyObject *item = NULL;
+	PyObject *list = NULL, *resl = NULL;
+	int list_len, i;
+	char *prefix, *name, type;
+	SpaceText *st;
+
+	if(!self->text)
+		return EXPP_ReturnPyObjError(PyExc_RuntimeError,
+				"This object isn't linked to a Blender Text Object");
+
+	/* Parse args for a list of tuples */
+	if(!PyArg_ParseTuple(args, "O!s", &PyList_Type, &list, &prefix))
+		return EXPP_ReturnPyObjError(PyExc_TypeError,
+				"expected list of tuples followed by a string");
+
+	if (curarea->spacetype != SPACE_TEXT)
+		return EXPP_ReturnPyObjError(PyExc_RuntimeError,
+				"Active space type is not text");
+	
+	st = curarea->spacedata.first;
+	if (!st || !st->text)
+		return EXPP_ReturnPyObjError(PyExc_RuntimeError,
+				"Active text area has no Text object");
+	
+	list_len = PyList_Size(list);
+	clear_suggest_text();
+	
+	for (i = 0; i < list_len; i++) {
+		item = PyList_GetItem(list, i);
+		if (!PyTuple_Check(item) || PyTuple_GET_SIZE(item) != 2)
+			return EXPP_ReturnPyObjError(PyExc_AttributeError,
+					"list must contain only tuples of size 2" );
+
+		name = PyString_AsString(PyTuple_GetItem(item, 0));
+		type = PyString_AsString(PyTuple_GetItem(item, 1))[0];
+
+		if (!strlen(name) || (type!='m' && type!='v' && type!='f'))
+			return EXPP_ReturnPyObjError(PyExc_AttributeError,
+					"layer values must be in the range [1, 20]" );
+
+		add_suggestion(name, type);
+	}
+	update_suggestions(prefix);
+	set_suggest_text(st->text);
+	scrarea_queue_redraw(curarea);
+
+	Py_RETURN_NONE;
+}
+
 /*****************************************************************************/
 /* Function:    Text_compare                                                 */
 /* Description: This is a callback function for the BPy_Text type. It        */
diff --git a/source/blender/python/api2_2x/doc/Text.py b/source/blender/python/api2_2x/doc/Text.py
index 4099b13828d..920908eef81 100644
--- a/source/blender/python/api2_2x/doc/Text.py
+++ b/source/blender/python/api2_2x/doc/Text.py
@@ -150,5 +150,15 @@ class Text:
 			cursor.
 		"""
 
+	def suggest(list):
+		"""
+		Set the suggestion list to the given list of tuples. This list *must* be
+		sorted by its first element, name.
+		@type list: list of tuples
+		@param list:  List of pair-tuples of the form (name, type) where name is
+			the suggested name and type is one of 'm' (module or class), 'f'
+			(function or method), 'v' (variable).
+		"""
+
 import id_generics
-Text.__doc__ += id_generics.attributes
\ No newline at end of file
+Text.__doc__ += id_generics.attributes
diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index 882baa90c65..227d1f08c20 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -60,6 +60,7 @@
 #include "BKE_global.h"
 #include "BKE_main.h"
 #include "BKE_node.h"
+#include "BKE_suggestions.h"
 
 #include "BIF_gl.h"
 #include "BIF_glutil.h"
@@ -999,6 +1000,19 @@ static void do_selection(SpaceText *st, int selecting)
 		txt_undo_add_toop(st->text, UNDO_STO, sell, selc, linep2, charp2);
 }
 
+void draw_suggestion_list(SpaceText *st) {
+	SuggItem *item, *last;
+	
+	if (!is_suggest_active(st->text)) return;
+
+	for (item=suggest_first(), last=suggest_last(); item; item=item->next) {
+		/* Useful for testing but soon to be replaced by UI list */
+		printf("Suggest: %c %s\n", item->type, item->name);
+		if (item == last)
+			break;
+	}
+}
+
 void drawtextspace(ScrArea *sa, void *spacedata)
 {
 	SpaceText *st= curarea->spacedata.first;
@@ -1072,6 +1086,7 @@ void drawtextspace(ScrArea *sa, void *spacedata)
 	}
 
 	draw_textscroll(st);
+	draw_suggestion_list(st);
 
 	curarea->win_swap= WIN_BACK_OK;
 }
diff --git a/source/blender/src/header_text.c b/source/blender/src/header_text.c
index 7f281096479..e371bd56160 100644
--- a/source/blender/src/header_text.c
+++ b/source/blender/src/header_text.c
@@ -240,6 +240,37 @@ static uiBlock *text_template_scriptsmenu (void *args_unused)
 	return block;
 }
 
+static void do_text_plugin_scriptsmenu(void *arg, int event)
+{
+	BPY_menu_do_python(PYMENU_TEXTPLUGIN, event);
+	
+	allqueue(REDRAWIMAGE, 0);
+}
+
+static uiBlock *text_plugin_scriptsmenu (void *args_unused)
+{
+	uiBlock *block;
+	BPyMenu *pym;
+	int i= 0;
+	short yco = 20, menuwidth = 120;
+	
+	block= uiNewBlock(&curarea->uiblocks, "text_plugin_scriptsmenu", UI_EMBOSSP, UI_HELV, G.curscreen->mainwin);
+	uiBlockSetButmFunc(block, do_text_plugin_scriptsmenu, NULL);
+	
+	/* note that we acount for the N previous entries with i+20: */
+	for (pym = BPyMenuTable[PYMENU_TEXTPLUGIN]; 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;
+}
+
 /* action executed after clicking in File menu */
 static void do_text_filemenu(void *arg, int event)
 {
@@ -726,6 +757,7 @@ static uiBlock *text_filemenu(void *arg_unused)
 	}
 	
 	uiDefIconTextBlockBut(block, text_template_scriptsmenu, NULL, ICON_RIGHTARROW_THIN, "Script Templates", 0, yco-=20, 120, 19, "");
+	uiDefIconTextBlockBut(block, text_plugin_scriptsmenu, NULL, ICON_RIGHTARROW_THIN, "Text Plugins", 0, yco-=20, 120, 19, "");
 
 	if(curarea->headertype==HEADERTOP) {
 		uiBlockSetDirection(block, UI_DOWN);
diff --git a/source/blender/src/usiblender.c b/source/blender/src/usiblender.c
index 6c0838288b8..2e55f8cdbc2 100644
--- a/source/blender/src/usiblender.c
+++ b/source/blender/src/usiblender.c
@@ -67,6 +67,7 @@
 #include "DNA_sound_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
+#include "DNA_text_types.h"
 
 #include "BKE_blender.h"
 #include "BKE_curve.h"
@@ -79,6 +80,7 @@
 #include "BKE_mball.h"
 #include "BKE_node.h"
 #include "BKE_packedFile.h"
+#include "BKE_suggestions.h"
 #include "BKE_texture.h"
 #include "BKE_utildefines.h"
 #include "BKE_pointcache.h"
@@ -1091,6 +1093,7 @@ void exit_usiblender(void)
 	free_actcopybuf();
 	free_vertexpaint();
 	free_imagepaint();
+	free_suggestions();
 	
 	/* editnurb can remain to exist outside editmode */
 	freeNurblist(&editNurb);

From e68834c75bc3e69641a6332dab071ebaa2d9d1d3 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Wed, 25 Jun 2008 13:51:54 +0000
Subject: [PATCH 054/252] Added UI for suggestions list. Works with arrow-keys
 and mouse wheel, accept with Enter, reject with Esc or click elsewhere. Mouse
 selection not yet supported. The script is called from the File->Text Plugins
 menu.

Tidied python script, the C suggestions functions and fixed some bugs including suggestions not being freed properly.
---
 release/scripts/textplugin_suggest.py         | 128 +++++------
 source/blender/blenkernel/BKE_suggestions.h   |  14 +-
 .../blender/blenkernel/intern/suggestions.c   |  32 ++-
 source/blender/python/api2_2x/Text.c          |  14 +-
 source/blender/src/drawtext.c                 | 204 ++++++++++++++++--
 5 files changed, 295 insertions(+), 97 deletions(-)

diff --git a/release/scripts/textplugin_suggest.py b/release/scripts/textplugin_suggest.py
index 77ae0488b1c..9861298209c 100644
--- a/release/scripts/textplugin_suggest.py
+++ b/release/scripts/textplugin_suggest.py
@@ -6,12 +6,11 @@ Group: 'TextPlugin'
 Tooltip: 'Suggests completions for the word at the cursor in a python script'
 """
 
-import bpy
+import bpy, __builtin__, token
 from Blender  import Text
 from StringIO import StringIO
 from inspect  import *
 from tokenize import generate_tokens
-import token
 
 TK_TYPE  = 0
 TK_TOKEN = 1
@@ -21,32 +20,48 @@ TK_LINE  = 4
 TK_ROW = 0
 TK_COL = 1
 
+execs = [] # Used to establish the same import context across defs
+
 keywords = ['and', 'del', 'from', 'not', 'while', 'as', 'elif', 'global',
 			'or', 'with', 'assert', 'else', 'if', 'pass', 'yield',
 			'break', 'except', 'import', 'print', 'class', 'exec', 'in',
 			'raise', 'continue', 'finally', 'is', 'return', 'def', 'for',
 			'lambda', 'try' ]
 
-execs = [] # Used to establish the same import context across defs (import is scope sensitive)
+
+def getBuiltins():
+	builtins = []
+	bi = dir(__builtin__)
+	for k in bi:
+		v = eval(k)
+		if ismodule(v): t='m'
+		elif callable(v): t='f'
+		else: t='v'
+		builtins.append((k, t))
+	return builtins
+
+
+def getKeywords():
+	global keywords
+	return [(k, 'k') for k in keywords]
+
 
 def getTokens(txt):
-	global tokens_cached
-	if tokens_cached==None:
-		lines = txt.asLines()
-		str = '\n'.join(lines)
-		readline = StringIO(str).readline
-		g = generate_tokens(readline)
-		tokens = []
-		for t in g: tokens.append(t)
-		tokens_cached = tokens
-	return tokens_cached
-tokens_cached = None
+	lines = txt.asLines()
+	str = '\n'.join(lines)
+	readline = StringIO(str).readline
+	g = generate_tokens(readline)
+	tokens = []
+	for t in g: tokens.append(t)
+	return tokens
+
 
 def isNameChar(s):
-	return s.isalnum() or s in ['_']
+	return (s.isalnum() or s == '_')
 
-# Returns words preceding the cursor that are separated by periods as a list in the
-# same order
+
+# Returns words preceding the cursor that are separated by periods as a list in
+# the same order
 def getCompletionSymbols(txt):
 	(l, c)= txt.getCursorPos()
 	lines = txt.asLines()
@@ -68,7 +83,14 @@ def getCompletionSymbols(txt):
 def getGlobals(txt):
 	global execs
 	
-	tokens = getTokens(txt)
+	# Unfortunately, tokenize may fail if the script leaves brackets or strings
+	# open. For now we return an empty list, leaving builtins and keywords as
+	# the only globals. (on the TODO list)
+	try:
+		tokens = getTokens(txt)
+	except:
+		return []
+	
 	globals = dict()
 	for i in range(len(tokens)):
 		
@@ -92,6 +114,7 @@ def getGlobals(txt):
 						x = tokens[i][TK_LINE].strip()
 						k = tokens[i][TK_TOKEN]
 						execs.append(x)
+						exec 'try: '+x+'\nexcept: pass'
 						
 						# Add the symbol name to the return list
 						globals[k] = 'm'
@@ -105,16 +128,17 @@ def getGlobals(txt):
 				# Add the import to the execs list
 				x = tokens[i][TK_LINE].strip()
 				execs.append(x)
+				exec 'try: '+x+'\nexcept: pass'
 				
 				# Import parent module so we can process it for sub modules
 				parent = ''.join([t[TK_TOKEN] for t in tokens[fr+1:i-1]])
-				exec "import "+parent
+				exec 'try: import '+parent+'\nexcept: pass'
 				
 				# All submodules, functions, etc.
 				if tokens[i][TK_TOKEN]=='*':
 					
 					# Add each symbol name to the return list
-					exec "d="+parent+".__dict__.items()"
+					d = eval(parent).__dict__.items()
 					for k,v in d:
 						if not globals.has_key(k) or not globals[k]:
 							t='v'
@@ -130,7 +154,7 @@ def getGlobals(txt):
 							if not globals.has_key(k) or not globals[k]:
 								t='v'
 								try:
-									exec 'v='+parent+'.'+k
+									v = eval(parent+'.'+k)
 									if ismodule(v): t='m'
 									elif callable(v): t='f'
 								except: pass
@@ -149,35 +173,13 @@ def getGlobals(txt):
 					t='v'
 				globals[k] = t
 	
-	return globals
+	return globals.items()
 
-def cmpi0(x, y):
-	return cmp(x[0].lower(), y[0].lower())
 
 def globalSuggest(txt, cs):
-	global execs
-	
-	suggestions = dict()
-	(row, col) = txt.getCursorPos()
 	globals = getGlobals(txt)
-	
-	# Sometimes we have conditional includes which will fail if the module
-	# cannot be found. So we protect outselves in a try block
-	for x in execs:
-		exec 'try: '+x+'\nexcept: pass'
-	
-	if len(cs)==0:
-		sub = ''
-	else:
-		sub = cs[0].lower()
-	print 'Search:', sub
-	
-	for k,t in globals.items():
-		if k.lower().startswith(sub):
-			suggestions[k] = t
-	
-	l = list(suggestions.items())
-	return sorted (l, cmp=cmpi0)
+	return globals
+
 
 # Only works for 'static' members (eg. Text.Get)
 def memberSuggest(txt, cs):
@@ -194,28 +196,28 @@ def memberSuggest(txt, cs):
 	suggestions = dict()
 	(row, col) = txt.getCursorPos()
 	
-	sub = cs[len(cs)-1].lower()
-	print 'Search:', sub
+	sub = cs[len(cs)-1]
 	
-	t=None
+	m=None
 	pre='.'.join(cs[:-1])
 	try:
-		exec "t="+pre
+		m = eval(pre)
 	except:
-		print 'Failed to assign '+pre
-		print execs
-		print cs
+		print pre+ ' not found or not imported.'
 	
-	if t!=None:
-		for k,v in t.__dict__.items():
+	if m!=None:
+		for k,v in m.__dict__.items():
 			if ismodule(v): t='m'
 			elif callable(v): t='f'
 			else: t='v'
-			if k.lower().startswith(sub):
-				suggestions[k] = t
+			suggestions[k] = t
 	
-	l = list(suggestions.items())
-	return sorted (l, cmp=cmpi0)
+	return suggestions.items()
+
+
+def cmp0(x, y):
+	return cmp(x[0], y[0])
+
 
 def main():
 	txt = bpy.data.texts.active
@@ -225,10 +227,12 @@ def main():
 	
 	if len(cs)<=1:
 		l = globalSuggest(txt, cs)
-		txt.suggest(l, cs[len(cs)-1])
-		
+		l.extend(getBuiltins())
+		l.extend(getKeywords())
 	else:
 		l = memberSuggest(txt, cs)
-		txt.suggest(l, cs[len(cs)-1])
+	
+	l.sort(cmp=cmp0)
+	txt.suggest(l, cs[len(cs)-1])
 
 main()
diff --git a/source/blender/blenkernel/BKE_suggestions.h b/source/blender/blenkernel/BKE_suggestions.h
index bc4e18f5a67..d0f982263c0 100644
--- a/source/blender/blenkernel/BKE_suggestions.h
+++ b/source/blender/blenkernel/BKE_suggestions.h
@@ -57,18 +57,22 @@ typedef struct SuggItem {
 typedef struct SuggList {
 	SuggItem *first, *last;
 	SuggItem *firstmatch, *lastmatch;
+	SuggItem *selected;
 } SuggList;
 
 void free_suggestions();
 
-void add_suggestion(const char *name, char type);
-void update_suggestions(const char *prefix);
+void suggest_add(const char *name, char type);
+void suggest_prefix(const char *prefix);
 SuggItem *suggest_first();
 SuggItem *suggest_last();
 
-void set_suggest_text(Text *text);
-void clear_suggest_text();
-short is_suggest_active(Text *text);
+void suggest_set_text(Text *text);
+void suggest_clear_text();
+short suggest_is_active(Text *text);
+
+void suggest_set_selected(SuggItem *sel);
+SuggItem *suggest_get_selected();
 
 #ifdef __cplusplus
 }
diff --git a/source/blender/blenkernel/intern/suggestions.c b/source/blender/blenkernel/intern/suggestions.c
index 3842146376d..ae0c7baa146 100644
--- a/source/blender/blenkernel/intern/suggestions.c
+++ b/source/blender/blenkernel/intern/suggestions.c
@@ -40,14 +40,17 @@ static SuggList suggestions= {NULL, NULL, NULL, NULL};
 static Text *suggText = NULL;
 
 void free_suggestions() {
-	SuggItem *item;
-	for (item = suggestions.last; item; item=item->prev)
+	SuggItem *item, *prev;
+	for (item = suggestions.last; item; item=prev) {
+		prev = item->prev;
 		MEM_freeN(item);
+	}
 	suggestions.first = suggestions.last = NULL;
 	suggestions.firstmatch = suggestions.lastmatch = NULL;
+	suggestions.selected = NULL;
 }
 
-void add_suggestion(const char *name, char type) {
+void suggest_add(const char *name, char type) {
 	SuggItem *newitem;
 
 	newitem = MEM_mallocN(sizeof(SuggItem) + strlen(name) + 1, "SuggestionItem");
@@ -63,6 +66,7 @@ void add_suggestion(const char *name, char type) {
 
 	if (!suggestions.first) {
 		suggestions.first = suggestions.last = newitem;
+		suggestions.selected = newitem;
 	} else {
 		newitem->prev = suggestions.last;
 		suggestions.last->next = newitem;
@@ -70,13 +74,13 @@ void add_suggestion(const char *name, char type) {
 	}
 }
 
-void update_suggestions(const char *prefix) {
+void suggest_prefix(const char *prefix) {
 	SuggItem *match, *first, *last;
 	int cmp, len = strlen(prefix);
 
 	if (!suggestions.first) return;
 	if (len==0) {
-		suggestions.firstmatch = suggestions.first;
+		suggestions.selected = suggestions.firstmatch = suggestions.first;
 		suggestions.lastmatch = suggestions.last;
 		return;
 	}
@@ -96,10 +100,10 @@ void update_suggestions(const char *prefix) {
 	}
 	if (first) {
 		if (!last) last = suggestions.last;
-		suggestions.firstmatch = first;
+		suggestions.selected = suggestions.firstmatch = first;
 		suggestions.lastmatch = last;
 	} else {
-		suggestions.firstmatch = suggestions.lastmatch = NULL;
+		suggestions.selected = suggestions.firstmatch = suggestions.lastmatch = NULL;
 	}
 }
 
@@ -111,15 +115,23 @@ SuggItem *suggest_last() {
 	return suggestions.lastmatch;
 }
 
-void set_suggest_text(Text *text) {
+void suggest_set_text(Text *text) {
 	suggText = text;
 }
 
-void clear_suggest_text() {
+void suggest_clear_text() {
 	free_suggestions();
 	suggText = NULL;
 }
 
-short is_suggest_active(Text *text) {
+short suggest_is_active(Text *text) {
 	return suggText==text ? 1 : 0;
 }
+
+void suggest_set_selected(SuggItem *sel) {
+	suggestions.selected = sel;
+}
+
+SuggItem *suggest_get_selected() {
+	return suggestions.selected;
+}
diff --git a/source/blender/python/api2_2x/Text.c b/source/blender/python/api2_2x/Text.c
index 63c77c0bb3e..0c612a95f3a 100644
--- a/source/blender/python/api2_2x/Text.c
+++ b/source/blender/python/api2_2x/Text.c
@@ -129,7 +129,7 @@ static PyMethodDef BPy_Text_methods[] = {
 	{"setCursorPos", ( PyCFunction ) Text_setCursorPos, METH_VARARGS,
 	 "(row, col) - Set the cursor position to (row, col)"},
 	{"suggest", ( PyCFunction ) Text_suggest, METH_VARARGS,
-	 "(list) - List of tuples of the form (name, type) where type is one of 'm', 'v', 'f' for module, variable and function respectively"},
+	 "(list) - List of tuples of the form (name, type) where type is one of 'm', 'v', 'f', 'k' for module, variable, function and keyword respectively"},
 	{NULL, NULL, 0, NULL}
 };
 
@@ -544,7 +544,7 @@ static PyObject *Text_suggest( BPy_Text * self, PyObject * args )
 				"Active text area has no Text object");
 	
 	list_len = PyList_Size(list);
-	clear_suggest_text();
+	suggest_clear_text();
 	
 	for (i = 0; i < list_len; i++) {
 		item = PyList_GetItem(list, i);
@@ -555,14 +555,14 @@ static PyObject *Text_suggest( BPy_Text * self, PyObject * args )
 		name = PyString_AsString(PyTuple_GetItem(item, 0));
 		type = PyString_AsString(PyTuple_GetItem(item, 1))[0];
 
-		if (!strlen(name) || (type!='m' && type!='v' && type!='f'))
+		if (!strlen(name) || (type!='m' && type!='v' && type!='f' && type!='k'))
 			return EXPP_ReturnPyObjError(PyExc_AttributeError,
-					"layer values must be in the range [1, 20]" );
+					"names must be non-empty and types in ['m', 'v', 'f', 'k']" );
 
-		add_suggestion(name, type);
+		suggest_add(name, type);
 	}
-	update_suggestions(prefix);
-	set_suggest_text(st->text);
+	suggest_prefix(prefix);
+	suggest_set_text(st->text);
 	scrarea_queue_redraw(curarea);
 
 	Py_RETURN_NONE;
diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index 227d1f08c20..5cececa40a7 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -99,6 +99,10 @@ static int check_delim(char *string);
 static int check_numbers(char *string);
 static int check_builtinfuncs(char *string);
 static int check_specialvars(char *string);
+static int check_identifier(char ch);
+
+static void get_suggest_prefix(Text *text);
+static void confirm_suggestion(Text *text);
 
 static void *last_txt_find_string= NULL;
 
@@ -1000,16 +1004,63 @@ static void do_selection(SpaceText *st, int selecting)
 		txt_undo_add_toop(st->text, UNDO_STO, sell, selc, linep2, charp2);
 }
 
-void draw_suggestion_list(SpaceText *st) {
-	SuggItem *item, *last;
-	
-	if (!is_suggest_active(st->text)) return;
+#define SUGG_LIST_SIZE 7
+#define SUGG_LIST_WIDTH 20
 
-	for (item=suggest_first(), last=suggest_last(); item; item=item->next) {
-		/* Useful for testing but soon to be replaced by UI list */
-		printf("Suggest: %c %s\n", item->type, item->name);
-		if (item == last)
-			break;
+void draw_suggestion_list(SpaceText *st) {
+	SuggItem *item, *first, *last, *sel;
+	TextLine *tmp;
+	char str[SUGG_LIST_WIDTH+1];
+	int w, boxw=0, boxh, i, l, x, y, b;
+	
+	if (!st || !st->text) return;
+	if (!suggest_is_active(st->text)) return;
+
+	first = suggest_first();
+	last = suggest_last();
+	sel = suggest_get_selected();
+	//if (!first || !last || !sel) return;
+
+	for (tmp=st->text->curl, l=-st->top; tmp; tmp=tmp->prev, l++);
+	boxw = SUGG_LIST_WIDTH*spacetext_get_fontwidth(st) + 20;
+	boxh = SUGG_LIST_SIZE*st->lheight + 8;
+	x = spacetext_get_fontwidth(st)*st->text->curc + 50; // TODO: Replace + 50
+	y = curarea->winy - st->lheight*l - 2;
+	
+	BIF_ThemeColor(TH_SHADE1);
+	glRecti(x-1, y+1, x+boxw+1, y-boxh-1);
+	BIF_ThemeColor(TH_BACK);
+	glRecti(x, y, x+boxw, y-boxh);
+
+	for (i=0, item=sel; i<3 && item && item!=first; i++, item=item->prev);
+
+	for (i=0; i<SUGG_LIST_SIZE && item; i++, item=item->next) {
+
+		y -= st->lheight;
+
+		strncpy(str, item->name, SUGG_LIST_WIDTH);
+		str[SUGG_LIST_WIDTH] = '\0';
+
+		w = BMF_GetStringWidth(spacetext_get_font(st), str);
+		
+		if (item == sel) {
+			BIF_ThemeColor(TH_SHADE2);
+			glRecti(x+16, y-3, x+16+w, y+st->lheight-3);
+		}
+		b=1; /* b=1 colour block, text is default. b=0 no block, colour text */
+		switch (item->type) {
+			case 'k': BIF_ThemeColor(TH_SYNTAX_B); b=0; break;
+			case 'm': BIF_ThemeColor(TH_TEXT); break;
+			case 'f': BIF_ThemeColor(TH_SYNTAX_L); break;
+			case 'v': BIF_ThemeColor(TH_SYNTAX_N); break;
+		}
+		if (b) {
+			glRecti(x+8, y+2, x+11, y+5);
+			BIF_ThemeColor(TH_TEXT);
+		}
+		text_draw(st, str, 0, 0, 1, x+16, y-1, NULL);
+
+		if (item == last) break;
 	}
 }
 
@@ -1484,6 +1535,48 @@ static void set_tabs(Text *text)
 	st->currtab_set = setcurr_tab(text);
 }
 
+static void get_suggest_prefix(Text *text) {
+	int i, len;
+	char *line, tmp[256];
+
+	if (!text) return;
+	if (!suggest_is_active(text)) return;
+
+	line= text->curl->line;
+	for (i=text->curc-1; i>=0; i--)
+		if (!check_identifier(line[i]))
+			break;
+	i++;
+	len= text->curc-i;
+	if (len > 255) {
+		printf("Suggestion prefix too long\n");
+		return;
+	}
+	strncpy(tmp, line+i, len);
+	tmp[len]= '\0';
+	suggest_prefix(tmp);
+}
+
+static void confirm_suggestion(Text *text) {
+	int i, len;
+	char *line;
+	SuggItem *sel;
+
+	if (!text) return;
+	if (!suggest_is_active(text)) return;
+
+	sel = suggest_get_selected();
+	if (!sel) return;
+
+	line= text->curl->line;
+	for (i=text->curc-1; i>=0; i--)
+		if (!check_identifier(line[i]))
+			break;
+	i++;
+	len= text->curc-i;
+	txt_insert_buf(text, sel->name+len);
+}
+
 void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 {
 	unsigned short event= evt->event;
@@ -1492,6 +1585,7 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 	SpaceText *st= curarea->spacedata.first;
 	Text *text;
 	int do_draw=0, p;
+	int suggesting=0, do_suggest=0; /* 0:just redraw, -1:clear, 1:update prefix */
 	
 	if (st==NULL || st->spacetype != SPACE_TEXT) return;
 	
@@ -1554,6 +1648,8 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 		}
 		return;
 	}
+
+	suggesting = suggest_is_active(text);
 	
 	if (event==LEFTMOUSE) {
 		if (val) {
@@ -1573,6 +1669,7 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 				}
 				do_draw= 1;
 			}
+			do_suggest= -1;
 		}
 	} else if (event==MIDDLEMOUSE) {
 		if (val) {
@@ -1586,6 +1683,7 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			{
 				do_textscroll(st, 1);
 			}
+			do_suggest= -1;
 		}
 	} else if (event==RIGHTMOUSE) {
 		if (val) {
@@ -1618,6 +1716,7 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 				default:
 					break;
 			}
+			do_suggest= -1;
 		}
 	} else if (ascii) {
 		if (text && text->id.lib) {
@@ -1627,8 +1726,10 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			if (st->showsyntax) get_format_string(st);
 			pop_space_text(st);
 			do_draw= 1;
+			do_suggest= 1;
 		}
 	} else if (val) {
+		do_suggest= -1;
 		switch (event) {
 		case AKEY:
 			if (G.qual & LR_ALTKEY) {
@@ -1891,6 +1992,9 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 				do_draw= 1;
 			}
 			break;
+		case ESCKEY:
+			do_suggest= -1;
+			break;
 		case TABKEY:
 			if (text && text->id.lib) {
 				error_libdata();
@@ -1920,6 +2024,11 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 				error_libdata();
 				break;
 			}
+			if (suggesting) {
+				confirm_suggestion(text);
+				if (st->showsyntax) get_format_string(st);
+				break;
+			}
 			//double check tabs before splitting the line
 			st->currtab_set = setcurr_tab(text);
 			txt_split_curline(text);
@@ -1951,6 +2060,7 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			if (st->showsyntax) get_format_string(st);
 			do_draw= 1;
 			pop_space_text(st);
+			do_suggest= 1;
 			break;
 		case DELKEY:
 			if (text && text->id.lib) {
@@ -1970,8 +2080,16 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 		case INSERTKEY:
 			st->overwrite= !st->overwrite;
 			do_draw= 1;
+			do_suggest= 0;
 			break;
 		case DOWNARROWKEY:
+			if (suggesting) {
+				SuggItem *sel = suggest_get_selected();
+				if (sel && sel!=suggest_last() && sel->next)
+					suggest_set_selected(sel->next);
+				do_suggest= 0;
+				break;
+			}
 			txt_move_down(text, G.qual & LR_SHIFTKEY);
 			set_tabs(text);
 			do_draw= 1;
@@ -2000,17 +2118,42 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			pop_space_text(st);
 			break;
 		case UPARROWKEY:
+			if (suggesting) {
+				SuggItem *sel = suggest_get_selected();
+				if (sel && sel!=suggest_first() && sel->prev)
+					suggest_set_selected(sel->prev);
+				do_suggest= 0;
+				break;
+			}
 			txt_move_up(text, G.qual & LR_SHIFTKEY);
 			set_tabs(text);
 			do_draw= 1;
 			pop_space_text(st);
 			break;
 		case PAGEDOWNKEY:
-			screen_skip(st, st->viewlines);
+			if (suggesting) {
+				int i;
+				SuggItem *sel = suggest_get_selected();
+				for (i=0; i<SUGG_LIST_SIZE-1 && sel && sel!=suggest_last() && sel->next; i++, sel=sel->next)
+					suggest_set_selected(sel->next);
+				do_suggest= 0;
+				break;
+			} else {
+				screen_skip(st, st->viewlines);
+			}
 			do_draw= 1;
 			break;
 		case PAGEUPKEY:
-			screen_skip(st, -st->viewlines);
+			if (suggesting) {
+				int i;
+				SuggItem *sel = suggest_get_selected();
+				for (i=0; i<SUGG_LIST_SIZE-1 && sel && sel!=suggest_first() && sel->prev; i++, sel=sel->prev)
+					suggest_set_selected(sel->prev);
+				do_suggest= 0;
+				break;
+			} else {
+				screen_skip(st, -st->viewlines);
+			}
 			do_draw= 1;
 			break;
 		case HOMEKEY:
@@ -2024,16 +2167,41 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			pop_space_text(st);
 			break;
 		case WHEELUPMOUSE:
-			screen_skip(st, -U.wheellinescroll);
+			if (suggesting) {
+				SuggItem *sel = suggest_get_selected();
+				if (sel && sel!=suggest_first() && sel->prev)
+					suggest_set_selected(sel->prev);
+				do_suggest= 0;
+			} else {
+				screen_skip(st, -U.wheellinescroll);
+			}
 			do_draw= 1;
 			break;
 		case WHEELDOWNMOUSE:
-			screen_skip(st, U.wheellinescroll);
+			if (suggesting) {
+				SuggItem *sel = suggest_get_selected();
+				if (sel && sel!=suggest_last() && sel->next)
+					suggest_set_selected(sel->next);
+				do_suggest= 0;
+			} else {
+				screen_skip(st, U.wheellinescroll);
+			}
 			do_draw= 1;
 			break;
+		default:
+			do_suggest= 0;
 		}
 	}
 
+	if (suggesting) {
+		if (do_suggest == -1) {
+			suggest_clear_text();
+		} else if (do_suggest == 1) {
+			get_suggest_prefix(text);
+		}
+		do_draw= 1;
+	}
+
 	if (do_draw) {
 		ScrArea *sa;
 		
@@ -2223,6 +2391,16 @@ static int check_numbers(char *string)
 	return 0;
 }
 
+static int check_identifier(char ch) {
+	if (ch < '0') return 0;
+	if (ch <= '9') return 1;
+	if (ch < 'A') return 0;
+	if (ch <= 'Z' || ch == '_') return 1;
+	if (ch < 'a') return 0;
+	if (ch <= 'z') return 1;
+	return 0;
+}
+
 void convert_tabs (struct SpaceText *st, int tab)
 {
 	Text *text = st->text;

From fc392040dd035dc03899896cc56d337a8e97e78f Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Wed, 25 Jun 2008 21:00:39 +0000
Subject: [PATCH 055/252] Added readline() and reset() for reading lines from a
 Blender Text Object and resetting the pointer to the beginning of the buffer.
 readline() will return the '\n' character and return '' when the end of the
 buffer is reached in accordance with other readline methods.

---
 release/scripts/textplugin_suggest.py     |  8 +--
 source/blender/python/api2_2x/Text.c      | 76 ++++++++++++++++++-----
 source/blender/python/api2_2x/Text.h      |  2 +
 source/blender/python/api2_2x/doc/Text.py | 12 ++++
 4 files changed, 79 insertions(+), 19 deletions(-)

diff --git a/release/scripts/textplugin_suggest.py b/release/scripts/textplugin_suggest.py
index 9861298209c..6bb703faa83 100644
--- a/release/scripts/textplugin_suggest.py
+++ b/release/scripts/textplugin_suggest.py
@@ -33,7 +33,7 @@ def getBuiltins():
 	builtins = []
 	bi = dir(__builtin__)
 	for k in bi:
-		v = eval(k)
+		v = getattr(__builtin__, k)
 		if ismodule(v): t='m'
 		elif callable(v): t='f'
 		else: t='v'
@@ -47,10 +47,8 @@ def getKeywords():
 
 
 def getTokens(txt):
-	lines = txt.asLines()
-	str = '\n'.join(lines)
-	readline = StringIO(str).readline
-	g = generate_tokens(readline)
+	txt.reset()
+	g = generate_tokens(txt.readline)
 	tokens = []
 	for t in g: tokens.append(t)
 	return tokens
diff --git a/source/blender/python/api2_2x/Text.c b/source/blender/python/api2_2x/Text.c
index 0c612a95f3a..836d824e3b2 100644
--- a/source/blender/python/api2_2x/Text.c
+++ b/source/blender/python/api2_2x/Text.c
@@ -40,6 +40,7 @@
 #include "BLI_blenlib.h"
 #include "DNA_screen_types.h"
 #include "DNA_space_types.h"
+#include "MEM_guardedalloc.h"
 #include "gen_utils.h"
 #include "gen_library.h"
 #include "../BPY_extern.h"
@@ -93,6 +94,8 @@ struct PyMethodDef M_Text_methods[] = {
 static PyObject *Text_getFilename( BPy_Text * self );
 static PyObject *Text_getNLines( BPy_Text * self );
 static PyObject *Text_clear( BPy_Text * self );
+static PyObject *Text_reset( BPy_Text * self );
+static PyObject *Text_readline( BPy_Text * self );
 static PyObject *Text_write( BPy_Text * self, PyObject * value );
 static PyObject *Text_insert( BPy_Text * self, PyObject * value );
 static PyObject *Text_set( BPy_Text * self, PyObject * args );
@@ -116,6 +119,10 @@ static PyMethodDef BPy_Text_methods[] = {
 	 "(str) - Change Text Object name"},
 	{"clear", ( PyCFunction ) Text_clear, METH_NOARGS,
 	 "() - Clear Text buffer"},
+	{"reset", ( PyCFunction ) Text_reset, METH_NOARGS,
+	 "() - Moves the IO pointer back to the start of the Text buffer for reading"},
+	{"readline", ( PyCFunction ) Text_readline, METH_NOARGS,
+	 "() - Reads a line of text from the buffer and returns it incrementing the internal IO pointer."},
 	{"write", ( PyCFunction ) Text_write, METH_O,
 	 "(line) - Append string 'str' to Text buffer"},
 	{"insert", ( PyCFunction ) Text_insert, METH_O,
@@ -342,6 +349,8 @@ PyObject *Text_CreatePyObject( Text * txt )
 					      "couldn't create BPy_Text PyObject" );
 
 	pytxt->text = txt;
+	pytxt->iol = 0;
+	pytxt->ioc = 0;
 
 	return ( PyObject * ) pytxt;
 }
@@ -391,25 +400,45 @@ static PyObject *Text_clear( BPy_Text * self)
 	Py_RETURN_NONE;
 }
 
-static PyObject *Text_set( BPy_Text * self, PyObject * args )
+static PyObject *Text_reset( BPy_Text * self )
 {
-	int ival;
-	char *attr;
-
-	if( !PyArg_ParseTuple( args, "si", &attr, &ival ) )
-		return EXPP_ReturnPyObjError( PyExc_TypeError,
-					      "expected a string and an int as arguments" );
-
-	if( strcmp( "follow_cursor", attr ) == 0 ) {
-		if( ival )
-			self->text->flags |= EXPP_TEXT_MODE_FOLLOW;
-		else
-			self->text->flags &= EXPP_TEXT_MODE_FOLLOW;
-	}
+	self->iol = 0;
+	self->ioc = 0;
 
 	Py_RETURN_NONE;
 }
 
+static PyObject *Text_readline( BPy_Text * self )
+{
+	PyObject *tmpstr;
+	TextLine *line;
+	int i;
+	
+	if( !self->text )
+		return EXPP_ReturnPyObjError( PyExc_RuntimeError,
+					      "This object isn't linked to a Blender Text Object" );
+
+	for (i=0, line=self->text->lines.first; i<self->iol && line; i++, line=line->next);
+
+	if (!line) {
+		PyErr_SetString( PyExc_StopIteration, "End of buffer reached" );
+		return PyString_FromString( "" );
+	}
+
+	if (self->ioc > line->len)
+		return EXPP_ReturnPyObjError( PyExc_RuntimeError,
+						  "Line length exceeded, text may have changed while reading" );
+
+	tmpstr = PyString_FromString( line->line + self->ioc );
+	if (line->next)
+		PyString_ConcatAndDel( &tmpstr, PyString_FromString("\n") );
+
+	self->iol++;
+	self->ioc = 0;
+
+	return tmpstr;
+}
+
 static PyObject *Text_write( BPy_Text * self, PyObject * value )
 {
 	char *str = PyString_AsString(value);
@@ -451,6 +480,25 @@ static PyObject *Text_insert( BPy_Text * self, PyObject * value )
 	Py_RETURN_NONE;
 }
 
+static PyObject *Text_set( BPy_Text * self, PyObject * args )
+{
+	int ival;
+	char *attr;
+
+	if( !PyArg_ParseTuple( args, "si", &attr, &ival ) )
+		return EXPP_ReturnPyObjError( PyExc_TypeError,
+					      "expected a string and an int as arguments" );
+
+	if( strcmp( "follow_cursor", attr ) == 0 ) {
+		if( ival )
+			self->text->flags |= EXPP_TEXT_MODE_FOLLOW;
+		else
+			self->text->flags &= EXPP_TEXT_MODE_FOLLOW;
+	}
+
+	Py_RETURN_NONE;
+}
+
 static PyObject *Text_asLines( BPy_Text * self )
 {
 	TextLine *line;
diff --git a/source/blender/python/api2_2x/Text.h b/source/blender/python/api2_2x/Text.h
index 0c5e2607f03..eb64b6d43ea 100644
--- a/source/blender/python/api2_2x/Text.h
+++ b/source/blender/python/api2_2x/Text.h
@@ -41,6 +41,8 @@ extern PyTypeObject Text_Type;
 typedef struct {
 	PyObject_HEAD
 	Text * text; /* libdata must be second */
+	int iol; /* index of line being read */
+	int ioc; /* character offset in line being read */
 } BPy_Text;
 
 PyObject *Text_Init( void );
diff --git a/source/blender/python/api2_2x/doc/Text.py b/source/blender/python/api2_2x/doc/Text.py
index 920908eef81..1f38aadfa66 100644
--- a/source/blender/python/api2_2x/doc/Text.py
+++ b/source/blender/python/api2_2x/doc/Text.py
@@ -100,6 +100,18 @@ class Text:
 		Clear this Text object: its buffer becomes empty.
 		"""
 
+	def reset():
+		"""
+		Reset the read IO pointer to the start of the buffer.
+		"""
+
+	def readline():
+		"""
+		Reads a line of text from the buffer from the current IO pointer
+		position to the end of the line.
+		@rtype: string
+		"""
+
 	def set(attribute, value):
 		"""
 		Set this Text's attributes.

From 829b2668c50dec713fdb31ee2e3fc8f7658a68d3 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Thu, 26 Jun 2008 18:15:45 +0000
Subject: [PATCH 056/252] Starting to debug the elusive graph spliting bug
 Better check for RigGraph head Fix harmonic weighting for quads

---
 source/blender/blenlib/BLI_graph.h    |   3 +
 source/blender/blenlib/intern/graph.c |  71 +++++++++-
 source/blender/src/autoarmature.c     |  22 ++-
 source/blender/src/buttons_editing.c  |   2 +
 source/blender/src/reeb.c             | 188 ++++++++++++++++----------
 5 files changed, 212 insertions(+), 74 deletions(-)

diff --git a/source/blender/blenlib/BLI_graph.h b/source/blender/blenlib/BLI_graph.h
index 0763c7edff0..b1e4a9fec75 100644
--- a/source/blender/blenlib/BLI_graph.h
+++ b/source/blender/blenlib/BLI_graph.h
@@ -72,6 +72,9 @@ void BLI_flagArcs(BGraph *graph, int flag);
 
 int BLI_hasAdjacencyList(BGraph *rg);
 void BLI_buildAdjacencyList(BGraph *rg);
+void BLI_freeAdjacencyList(BGraph *rg);
+
+int BLI_FlagSubgraphs(BGraph *graph);
 
 void BLI_replaceNode(BGraph *graph, BNode *node_src, BNode *node_replaced);
 void BLI_removeDoubleNodes(BGraph *graph, float limit);
diff --git a/source/blender/blenlib/intern/graph.c b/source/blender/blenlib/intern/graph.c
index 5c398339ec8..44b74122371 100644
--- a/source/blender/blenlib/intern/graph.c
+++ b/source/blender/blenlib/intern/graph.c
@@ -80,8 +80,8 @@ void BLI_flagArcs(BGraph *graph, int flag)
 
 static void addArcToNodeAdjacencyList(BNode *node, BArc *arc)
 {
-	node->arcs[node->degree] = arc;
-	node->degree++;
+	node->arcs[node->flag] = arc;
+	node->flag++;
 }
 
 void BLI_buildAdjacencyList(BGraph *rg)
@@ -99,7 +99,7 @@ void BLI_buildAdjacencyList(BGraph *rg)
 		node->arcs = MEM_callocN((node->degree) * sizeof(BArc*), "adjacency list");
 		
 		/* temporary use to indicate the first index available in the lists */
-		node->degree = 0;
+		node->flag = 0;
 	}
 
 	for(arc = rg->arcs.first; arc; arc= arc->next)
@@ -107,6 +107,28 @@ void BLI_buildAdjacencyList(BGraph *rg)
 		addArcToNodeAdjacencyList(arc->head, arc);
 		addArcToNodeAdjacencyList(arc->tail, arc);
 	}
+
+	for(node = rg->nodes.first; node; node = node->next)
+	{
+		if (node->degree != node->flag)
+		{
+			printf("error in node [%p]. Added only %i arcs out of %i\n", node, node->flag, node->degree);
+		}
+	}
+}
+
+void BLI_freeAdjacencyList(BGraph *rg)
+{
+	BNode *node;
+
+	for(node = rg->nodes.first; node; node = node->next)
+	{
+		if (node->arcs != NULL)
+		{
+			MEM_freeN(node->arcs);
+			node->arcs = NULL;
+		}
+	}
 }
 
 int BLI_hasAdjacencyList(BGraph *rg)
@@ -173,6 +195,48 @@ void BLI_removeDoubleNodes(BGraph *graph, float limit)
 	}
 	
 }
+/************************************* SUBGRAPH DETECTION **********************************************/
+
+void flagSubgraph(BNode *node, int subgraph)
+{
+	if (node->flag == 0)
+	{
+		BArc *arc;
+		int i;
+		
+		node->flag = subgraph;
+		
+		for(i = 0; i < node->degree; i++)
+		{
+			arc = node->arcs[i];
+			flagSubgraph(BLI_otherNode(arc, node), subgraph);
+		}
+	}
+} 
+
+int BLI_FlagSubgraphs(BGraph *graph)
+{
+	BNode *node;
+	int subgraph = 0;
+
+	if (BLI_hasAdjacencyList(graph) == 0)
+	{
+		BLI_buildAdjacencyList(graph);
+	}
+	
+	BLI_flagNodes(graph, 0);
+	
+	for (node = graph->nodes.first; node; node = node->next)
+	{
+		if (node->flag == 0)
+		{
+			subgraph++;
+			flagSubgraph(node, subgraph);
+		}
+	}
+	
+	return subgraph;
+}
 
 /*************************************** CYCLE DETECTION ***********************************************/
 
@@ -790,6 +854,7 @@ void BLI_markdownSymmetry(BGraph *graph, BNode *root_node, float limit)
 	
 	if (BLI_isGraphCyclic(graph))
 	{
+		printf("cyclic\n");
 		return;
 	}
 	
diff --git a/source/blender/src/autoarmature.c b/source/blender/src/autoarmature.c
index a058c67c71a..2a139137a8e 100644
--- a/source/blender/src/autoarmature.c
+++ b/source/blender/src/autoarmature.c
@@ -364,7 +364,7 @@ static void RIG_arcFromBoneChain(RigGraph *rg, ListBase *list, EditBone *root_bo
 
 	if (contain_head)
 	{
-		rg->head = (RigNode*)arc->tail;
+		rg->head = arc->tail;
 	}
 }
 
@@ -379,6 +379,26 @@ static void RIG_findHead(RigGraph *rg)
 			
 			rg->head = (RigNode*)arc->head;
 		}
+		else
+		{
+			RigArc *arc;
+			
+			for (arc = rg->arcs.first; arc; arc = arc->next)
+			{
+				RigEdge *edge = arc->edges.last;
+				
+				if (edge->bone->flag & BONESEL_ANY)
+				{
+					rg->head = arc->tail;
+					break;
+				}
+			}
+		}
+		
+		if (rg->head == NULL)
+		{
+			rg->head = rg->nodes.first;
+		}
 	}
 }
 
diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c
index 58cc454424b..171856615ef 100644
--- a/source/blender/src/buttons_editing.c
+++ b/source/blender/src/buttons_editing.c
@@ -5000,11 +5000,13 @@ static void skgen_reorder(void *option, void *arg2)
 static void skgen_graphgen(void *arg1, void *arg2)
 {
 	BIF_GlobalReebGraphFromEditMesh();
+	allqueue(REDRAWVIEW3D, 0);
 }
 
 static void skgen_graphfree(void *arg1, void *arg2)
 {
 	BIF_GlobalReebFree();
+	allqueue(REDRAWVIEW3D, 0);
 }
 
 static void editing_panel_mesh_skgen_retarget(Object *ob, Mesh *me)
diff --git a/source/blender/src/reeb.c b/source/blender/src/reeb.c
index f889537975b..1c317f06176 100644
--- a/source/blender/src/reeb.c
+++ b/source/blender/src/reeb.c
@@ -779,14 +779,17 @@ void filterArc(ReebGraph *rg, ReebNode *newNode, ReebNode *removedNode, ReebArc
 {
 	ReebArc *arc = NULL, *nextArc = NULL;
 
-	/* first pass, merge buckets for arcs that spawned the two nodes into the source arc*/
-	for(arc = rg->arcs.first; arc; arc = arc->next)
+	if (merging)
 	{
-		if (arc->head == srcArc->head && arc->tail == srcArc->tail && arc != srcArc)
+		/* first pass, merge buckets for arcs that spawned the two nodes into the source arc*/
+		for(arc = rg->arcs.first; arc; arc = arc->next)
 		{
-			ReebNode *head = (ReebNode*)srcArc->head;
-			ReebNode *tail = (ReebNode*)srcArc->tail;
-			mergeArcBuckets(srcArc, arc, head->weight, tail->weight);
+			if (arc->head == srcArc->head && arc->tail == srcArc->tail && arc != srcArc)
+			{
+				ReebNode *head = (ReebNode*)srcArc->head;
+				ReebNode *tail = (ReebNode*)srcArc->tail;
+				mergeArcBuckets(srcArc, arc, head->weight, tail->weight);
+			}
 		}
 	}
 
@@ -814,13 +817,14 @@ void filterArc(ReebGraph *rg, ReebNode *newNode, ReebNode *removedNode, ReebArc
 				NodeDegreeDecrement(rg, newNode);
 				//newNode->degree--;
 				
-				// If it's safeArc, it'll be removed later, so keep it for now
+				// If it's srcArc, it'll be removed later, so keep it for now
 				if (arc != srcArc)
 				{
 					BLI_remlink(&rg->arcs, arc);
 					REEB_freeArc((BArc*)arc);
 				}
 			}
+#if 0
 			// Remove flipped arcs
 			else if (((ReebNode*)arc->head)->weight > ((ReebNode*)arc->tail)->weight)
 			{
@@ -831,6 +835,7 @@ void filterArc(ReebGraph *rg, ReebNode *newNode, ReebNode *removedNode, ReebArc
 				BLI_remlink(&rg->arcs, arc);
 				REEB_freeArc((BArc*)arc);
 			}
+#endif
 			else
 			{
 				//newNode->degree++; // incrementing degree since we're adding an arc
@@ -1929,6 +1934,35 @@ static float cotan_weight(float *v1, float *v2, float *v3)
 	return Inpf(a, b)/clen;
 }
 
+void addTriangle(EditVert *v1, EditVert *v2, EditVert *v3, long e1, long e2, long e3)
+{
+	/* Angle opposite e1 */
+	float t1= cotan_weight(v1->co, v2->co, v3->co) / e2;
+	
+	/* Angle opposite e2 */
+	float t2 = cotan_weight(v2->co, v3->co, v1->co) / e3;
+
+	/* Angle opposite e3 */
+	float t3 = cotan_weight(v3->co, v1->co, v2->co) / e1;
+	
+	int i1 = v1->hash;
+	int i2 = v2->hash;
+	int i3 = v3->hash;
+	
+	nlMatrixAdd(i1, i1, t2+t3);
+	nlMatrixAdd(i2, i2, t1+t3);
+	nlMatrixAdd(i3, i3, t1+t2);
+
+	nlMatrixAdd(i1, i2, -t3);
+	nlMatrixAdd(i2, i1, -t3);
+
+	nlMatrixAdd(i2, i3, -t1);
+	nlMatrixAdd(i3, i2, -t1);
+
+	nlMatrixAdd(i3, i1, -t2);
+	nlMatrixAdd(i1, i3, -t2);
+}
+
 int weightToHarmonic(EditMesh *em)
 {
 	NLboolean success;
@@ -1956,48 +1990,54 @@ int weightToHarmonic(EditMesh *em)
 	/* Find local extrema */
 	for(index = 0, eve = em->verts.first; eve; index++, eve = eve->next)
 	{
-		EditEdge *eed;
-		int maximum = 1;
-		int minimum = 1;
-		
-		eve->hash = index; /* Assign index to vertex */
-		
-		NextEdgeForVert(NULL, NULL); /* Reset next edge */
-		for(eed = NextEdgeForVert(em, eve); eed && (maximum || minimum); eed = NextEdgeForVert(em, eve))
+		if (eve->h == 0)
 		{
-			EditVert *eve2;
+			EditEdge *eed;
+			int maximum = 1;
+			int minimum = 1;
 			
-			if (eed->v1 == eve)
+			eve->hash = index; /* Assign index to vertex */
+			
+			NextEdgeForVert(NULL, NULL); /* Reset next edge */
+			for(eed = NextEdgeForVert(em, eve); eed && (maximum || minimum); eed = NextEdgeForVert(em, eve))
 			{
-				eve2 = eed->v2;
+				EditVert *eve2;
+				
+				if (eed->v1 == eve)
+				{
+					eve2 = eed->v2;
+				}
+				else
+				{
+					eve2 = eed->v1;
+				}
+				
+				if (eve2->h == 0)
+				{
+					/* Adjacent vertex is bigger, not a local maximum */
+					if (eve2->tmp.fp > eve->tmp.fp)
+					{
+						maximum = 0;
+					}
+					/* Adjacent vertex is smaller, not a local minimum */
+					else if (eve2->tmp.fp < eve->tmp.fp)
+					{
+						minimum = 0;
+					}
+				}
+			}
+			
+			if (maximum || minimum)
+			{
+				float w = eve->tmp.fp;
+				eve->f1 = 0;
+				nlSetVariable(0, index, w);
+				nlLockVariable(index);
 			}
 			else
 			{
-				eve2 = eed->v1;
+				eve->f1 = 1;
 			}
-			
-			/* Adjacent vertex is bigger, not a local maximum */
-			if (eve2->tmp.fp > eve->tmp.fp)
-			{
-				maximum = 0;
-			}
-			/* Adjacent vertex is smaller, not a local minimum */
-			else if (eve2->tmp.fp < eve->tmp.fp)
-			{
-				minimum = 0;
-			}
-		}
-		
-		if (maximum || minimum)
-		{
-			float w = eve->tmp.fp;
-			eve->f1 = 0;
-			nlSetVariable(0, index, w);
-			nlLockVariable(index);
-		}
-		else
-		{
-			eve->f1 = 1;
 		}
 	}
 	
@@ -2012,39 +2052,34 @@ int weightToHarmonic(EditMesh *em)
 	/* Add faces count to the edge weight */
 	for(efa = em->faces.first; efa; efa = efa->next)
 	{
-		efa->e1->tmp.l++;
-		efa->e2->tmp.l++;
-		efa->e3->tmp.l++;
+		if (efa->h == 0)
+		{
+			efa->e1->tmp.l++;
+			efa->e2->tmp.l++;
+			efa->e3->tmp.l++;
+			
+			if (efa->e4)
+			{
+				efa->e4->tmp.l++;
+			}
+		}
 	}
 
 	/* Add faces angle to the edge weight */
 	for(efa = em->faces.first; efa; efa = efa->next)
 	{
-		/* Angle opposite e1 */
-		float t1= cotan_weight(efa->v1->co, efa->v2->co, efa->v3->co) / efa->e2->tmp.l;
-		
-		/* Angle opposite e2 */
-		float t2 = cotan_weight(efa->v2->co, efa->v3->co, efa->v1->co) / efa->e3->tmp.l;
-
-		/* Angle opposite e3 */
-		float t3 = cotan_weight(efa->v3->co, efa->v1->co, efa->v2->co) / efa->e1->tmp.l;
-		
-		int i1 = efa->v1->hash;
-		int i2 = efa->v2->hash;
-		int i3 = efa->v3->hash;
-		
-		nlMatrixAdd(i1, i1, t2+t3);
-		nlMatrixAdd(i2, i2, t1+t3);
-		nlMatrixAdd(i3, i3, t1+t2);
-	
-		nlMatrixAdd(i1, i2, -t3);
-		nlMatrixAdd(i2, i1, -t3);
-	
-		nlMatrixAdd(i2, i3, -t1);
-		nlMatrixAdd(i3, i2, -t1);
-	
-		nlMatrixAdd(i3, i1, -t2);
-		nlMatrixAdd(i1, i3, -t2);
+		if (efa->h == 0)
+		{
+			if (efa->v4 == NULL)
+			{
+				addTriangle(efa->v1, efa->v2, efa->v3, efa->e1->tmp.l, efa->e2->tmp.l, efa->e3->tmp.l);
+			}
+			else
+			{
+				addTriangle(efa->v1, efa->v2, efa->v3, efa->e1->tmp.l, efa->e2->tmp.l, 2);
+				addTriangle(efa->v3, efa->v4, efa->v1, efa->e3->tmp.l, efa->e4->tmp.l, 2);
+			}
+		}
 	}
 	
 	nlEnd(NL_MATRIX);
@@ -2714,9 +2749,19 @@ void BIF_GlobalReebGraphFromEditMesh(void)
 	
 	verifyFaces(GLOBAL_RG);
 
+	printf("GENERATED\n");
+	printf("%i subgraphs\n", BLI_FlagSubgraphs((BGraph*)GLOBAL_RG));
+
 	/* Remove arcs without embedding */
 	filterNullReebGraph(GLOBAL_RG);
 
+	verifyNodeDegree(GLOBAL_RG);
+	
+	BLI_freeAdjacencyList((BGraph*)GLOBAL_RG);
+
+	printf("NULL FILTERED\n");
+	printf("%i subgraphs\n", BLI_FlagSubgraphs((BGraph*)GLOBAL_RG));
+
 	verifyBuckets(GLOBAL_RG);
 
 	i = 1;
@@ -2775,6 +2820,9 @@ void BIF_GlobalReebGraphFromEditMesh(void)
 	calculateGraphLength(GLOBAL_RG);
 
 	BLI_markdownSymmetry((BGraph*)GLOBAL_RG, GLOBAL_RG->nodes.first, G.scene->toolsettings->skgen_symmetry_limit);
+	
+	printf("DONE\n");
+	printf("%i subgraphs\n", BLI_FlagSubgraphs((BGraph*)GLOBAL_RG));
 }
 
 void REEB_draw()

From aee5e9561069628cc81bd230339043bee37a43e3 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Thu, 26 Jun 2008 18:28:33 +0000
Subject: [PATCH 057/252] Modifying a file externally or deleting a file linked
 with a Blender Text object presents options for reloading, saving or
 separating the Text object from the external file (like the make local idea).

---
 source/blender/blenkernel/intern/text.c  | 14 +++-
 source/blender/include/BIF_drawtext.h    |  1 +
 source/blender/makesdna/DNA_text_types.h |  6 +-
 source/blender/src/drawtext.c            | 93 +++++++++++++++++++++++-
 4 files changed, 110 insertions(+), 4 deletions(-)

diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c
index fbb94289166..f414498c1b9 100644
--- a/source/blender/blenkernel/intern/text.c
+++ b/source/blender/blenkernel/intern/text.c
@@ -30,6 +30,8 @@
  */
 
 #include <string.h> /* strstr */
+#include <sys/types.h>
+#include <sys/stat.h>
 
 #include "MEM_guardedalloc.h"
 
@@ -210,11 +212,12 @@ static void cleanup_textline(TextLine * tl)
 int reopen_text(Text *text)
 {
 	FILE *fp;
-	int i, llen, len;
+	int i, llen, len, res;
 	unsigned char *buffer;
 	TextLine *tmp;
 	char sfile[FILE_MAXFILE];
 	char str[FILE_MAXDIR+FILE_MAXFILE];
+	struct stat fst;
 
 	if (!text || !text->name) return 0;
 	
@@ -250,6 +253,9 @@ int reopen_text(Text *text)
 	fseek(fp, 0L, SEEK_SET);	
 
 	text->undo_pos= -1;
+
+	res= fstat(fp->_file, &fst);
+	text->mtime= fst.st_mtime;
 	
 	buffer= MEM_mallocN(len, "text_buffer");
 	// under windows fread can return less then len bytes because
@@ -308,12 +314,13 @@ int reopen_text(Text *text)
 Text *add_text(char *file) 
 {
 	FILE *fp;
-	int i, llen, len;
+	int i, llen, len, res;
 	unsigned char *buffer;
 	TextLine *tmp;
 	Text *ta;
 	char sfile[FILE_MAXFILE];
 	char str[FILE_MAXDIR+FILE_MAXFILE];
+	struct stat fst;
 
 	BLI_strncpy(str, file, FILE_MAXDIR+FILE_MAXFILE);
 	if (G.scene) /* can be NULL (bg mode) */
@@ -339,6 +346,9 @@ Text *add_text(char *file)
 	ta->name= MEM_mallocN(strlen(file)+1, "text_name");
 	strcpy(ta->name, file);
 
+	res= fstat(fp->_file, &fst);
+	ta->mtime= fst.st_mtime;
+
 	ta->undo_pos= -1;
 	ta->undo_len= TXT_INIT_UNDO;
 	ta->undo_buf= MEM_mallocN(ta->undo_len, "undo buf");
diff --git a/source/blender/include/BIF_drawtext.h b/source/blender/include/BIF_drawtext.h
index a75e0f1bd86..19f9d50e774 100644
--- a/source/blender/include/BIF_drawtext.h
+++ b/source/blender/include/BIF_drawtext.h
@@ -38,6 +38,7 @@ void unlink_text(struct Text *text);
 
 void free_textspace(struct SpaceText *st);
 
+int txt_file_modified(struct Text *text);
 void txt_write_file(struct Text *text);
 void add_text_fs(char *file);
 
diff --git a/source/blender/makesdna/DNA_text_types.h b/source/blender/makesdna/DNA_text_types.h
index d1859d22115..d6ec62e63c0 100644
--- a/source/blender/makesdna/DNA_text_types.h
+++ b/source/blender/makesdna/DNA_text_types.h
@@ -31,6 +31,8 @@
 #ifndef DNA_TEXT_TYPES_H
 #define DNA_TEXT_TYPES_H
 
+#include "time.h"
+
 #include "DNA_listBase.h"
 #include "DNA_ID.h"
 
@@ -46,7 +48,7 @@ typedef struct Text {
 	ID id;
 	
 	char *name;
-	
+
 	int flags, nlines;
 	
 	ListBase lines;
@@ -57,6 +59,8 @@ typedef struct Text {
 	int undo_pos, undo_len;
 	
 	void *compiled;
+	
+	time_t mtime;
 } Text;
 
 
diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index 5cececa40a7..cd8f9be18ed 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -31,6 +31,8 @@
 #include <math.h>
 #include <string.h>
 #include <ctype.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -105,6 +107,7 @@ static void get_suggest_prefix(Text *text);
 static void confirm_suggestion(Text *text);
 
 static void *last_txt_find_string= NULL;
+static double last_check_time= 0;
 
 static BMF_Font *spacetext_get_font(SpaceText *st) {
 	static BMF_Font *scr12= NULL;
@@ -1192,6 +1195,36 @@ void free_textspace(SpaceText *st)
 	st->text= NULL;
 }
 
+/* returns 0 if file on disk is the same or Text is in memory only
+   returns 1 if file has been modified on disk since last local edit
+   returns 2 if file on disk has been deleted
+   -1 is returned if an error occurs
+*/
+int txt_file_modified(Text *text)
+{
+	struct stat st;
+	int result;
+
+	if (!text || !text->name)
+		return 0;
+
+	if (!BLI_exists(text->name))
+		return 2;
+
+	result = stat(text->name, &st);
+	
+	if(result == -1)
+		return -1;
+
+	if((st.st_mode & S_IFMT) != S_IFREG)
+		return -1;
+
+	if (st.st_mtime > text->mtime)
+		return 1;
+
+	return 0;
+}
+
 static void save_mem_text(char *str)
 {
 	SpaceText *st= curarea->spacedata.first;
@@ -1218,6 +1251,8 @@ void txt_write_file(Text *text)
 {
 	FILE *fp;
 	TextLine *tmp;
+	int res;
+	struct stat fst;
 	
 	/* Do we need to get a filename? */
 	if (text->flags & TXT_ISMEM) {
@@ -1225,7 +1260,7 @@ void txt_write_file(Text *text)
 			activate_fileselect(FILE_SPECIAL, "SAVE TEXT FILE", text->name, save_mem_text);
 		else
 			activate_fileselect(FILE_SPECIAL, "SAVE TEXT FILE", text->id.name+2, save_mem_text);
-		return;	
+		return;
 	}
 	
 	/* Should we ask to save over? */
@@ -1252,6 +1287,9 @@ void txt_write_file(Text *text)
 	}
 	
 	fclose (fp);
+
+	res= stat(text->name, &fst);
+	text->mtime= fst.st_mtime;
 	
 	if (text->flags & TXT_ISDIRTY) text->flags ^= TXT_ISDIRTY;
 }
@@ -2193,6 +2231,59 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 		}
 	}
 
+	if (last_check_time < PIL_check_seconds_timer() - 1.0) {
+		switch (txt_file_modified(text)) {
+		case 1:
+			/* Modified locally and externally, ahhh. Offer more possibilites. */
+			if (text->flags & TXT_ISDIRTY) {
+				switch (pupmenu("External File Modified with Local Changes %t|Load external changes (overwrite local) %x0|Save local changes (overwrite external) %x1|Make text internal %x2")) {
+				case 0:
+					reopen_text(text);
+					if (st->showsyntax) get_format_string(st);
+					do_draw= 1;
+					break;
+				case 1:
+					txt_write_file(text);
+					do_draw= 1;
+					break;
+				case 2:
+					text->flags |= TXT_ISMEM | TXT_ISDIRTY | TXT_ISTMP;
+					MEM_freeN(text->name);
+					text->name= NULL;
+					do_draw= 1;
+					break;
+				}
+			} else {
+				switch (pupmenu("External File Modified %t|Reload from disk %x0|Make text internal %x1")) {
+				case 0:
+					reopen_text(text);
+					if (st->showsyntax) get_format_string(st);
+					do_draw= 1;
+					break;
+				case 1:
+					text->flags |= TXT_ISMEM | TXT_ISDIRTY | TXT_ISTMP;
+					MEM_freeN(text->name);
+					text->name= NULL;
+					do_draw= 1;
+					break;
+				}
+			}
+			break;
+		case 2:
+			switch (pupmenu("External File Deleted %t|Make text internal %x0")) {
+			case 0:
+				text->flags |= TXT_ISMEM | TXT_ISDIRTY | TXT_ISTMP;
+				MEM_freeN(text->name);
+				text->name= NULL;
+				do_draw= 1;
+				break;
+			}
+			break;
+		default:
+			last_check_time = PIL_check_seconds_timer();
+		}
+	}
+
 	if (suggesting) {
 		if (do_suggest == -1) {
 			suggest_clear_text();

From ab6e6b4c41c1f6b745adad320cfe3aeebb901e33 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Fri, 27 Jun 2008 19:55:08 +0000
Subject: [PATCH 058/252] Mouse selection (LMB) and confirmation (MMB) added to
 suggestions UI. Also fixed the problem of offset text (horizontally
 scrolled).

---
 source/blender/src/drawtext.c | 91 ++++++++++++++++++++++++++++++-----
 1 file changed, 80 insertions(+), 11 deletions(-)

diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index cd8f9be18ed..fc1967a2c86 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -88,6 +88,9 @@
 
 #define TEXTXLOC	38
 
+#define SUGG_LIST_SIZE 7
+#define SUGG_LIST_WIDTH 20
+
 /* forward declarations */
 
 void drawtextspace(ScrArea *sa, void *spacedata);
@@ -1007,8 +1010,62 @@ static void do_selection(SpaceText *st, int selecting)
 		txt_undo_add_toop(st->text, UNDO_STO, sell, selc, linep2, charp2);
 }
 
-#define SUGG_LIST_SIZE 7
-#define SUGG_LIST_WIDTH 20
+static int do_suggest_select(SpaceText *st)
+{
+	SuggItem *item, *first, *last, *sel;
+	short mval[2];
+	TextLine *tmp;
+	int l, x, y, w, h, i;
+	int seli, tgti;
+	
+	if (!st || !st->text) return 0;
+	if (!suggest_is_active(st->text)) return 0;
+
+	first = suggest_first();
+	last = suggest_last();
+	sel = suggest_get_selected();
+
+	if (!sel || !last || !first)
+		return 0;
+
+	/* Count the visible lines to the cursor */
+	for (tmp=st->text->curl, l=-st->top; tmp; tmp=tmp->prev, l++);
+	if (l<0) return 0;
+	
+	if(st->showlinenrs) {
+		x = spacetext_get_fontwidth(st)*(st->text->curc-st->left) + TXT_OFFSET + TEXTXLOC - 4;
+	} else {
+		x = spacetext_get_fontwidth(st)*(st->text->curc-st->left) + TXT_OFFSET - 4;
+	}
+	y = curarea->winy - st->lheight*l - 2;
+
+	w = SUGG_LIST_WIDTH*spacetext_get_fontwidth(st) + 20;
+	h = SUGG_LIST_SIZE*st->lheight + 8;
+
+	getmouseco_areawin(mval);
+
+	if (mval[0]<x || x+w<mval[0] || mval[1]<y-h || y<mval[1])
+		return 0;
+
+	/* Work out which of the visible SUGG_LIST_SIZE items is selected */
+	for (seli=0, item=sel; seli<3 && item && item!=first; seli++, item=item->prev);
+
+	/* Work out the target item index in the visible list */
+	tgti = (y-mval[1]-4) / st->lheight;
+	if (tgti<0 || tgti>SUGG_LIST_SIZE)
+		return 1;
+
+	if (seli<tgti) {
+		for (i=seli; i<tgti && sel && sel!=last; i++, sel=sel->next);
+		if (sel)
+			suggest_set_selected(sel);
+	} else {
+		for (i=seli; i>tgti && sel && sel!=first; i--, sel=sel->prev);
+		if (sel)
+			suggest_set_selected(sel);
+	}
+	return 1;
+}
 
 void draw_suggestion_list(SpaceText *st) {
 	SuggItem *item, *first, *last, *sel;
@@ -1022,13 +1079,20 @@ void draw_suggestion_list(SpaceText *st) {
 	first = suggest_first();
 	last = suggest_last();
 	sel = suggest_get_selected();
-	//if (!first || !last || !sel) return;
 
+	/* Count the visible lines to the cursor */
 	for (tmp=st->text->curl, l=-st->top; tmp; tmp=tmp->prev, l++);
+	if (l<0) return;
+	
+	if(st->showlinenrs) {
+		x = spacetext_get_fontwidth(st)*(st->text->curc-st->left) + TXT_OFFSET + TEXTXLOC - 4;
+	} else {
+		x = spacetext_get_fontwidth(st)*(st->text->curc-st->left) + TXT_OFFSET - 4;
+	}
+	y = curarea->winy - st->lheight*l - 2;
+
 	boxw = SUGG_LIST_WIDTH*spacetext_get_fontwidth(st) + 20;
 	boxh = SUGG_LIST_SIZE*st->lheight + 8;
-	x = spacetext_get_fontwidth(st)*st->text->curc + 50; // TODO: Replace + 50
-	y = curarea->winy - st->lheight*l - 2;
 	
 	BIF_ThemeColor(TH_SHADE1);
 	glRecti(x-1, y+1, x+boxw+1, y-boxh-1);
@@ -1698,6 +1762,10 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			
 			if (mval[0]>2 && mval[0]<20 && mval[1]>2 && mval[1]<curarea->winy-2) {
 				do_textscroll(st, 2);
+				do_suggest= -1;
+			} else if (do_suggest_select(st)) {
+				do_draw= 1;
+				do_suggest= 0;
 			} else {
 				do_selection(st, G.qual&LR_SHIFTKEY);
 				if (txt_has_sel(text)) {
@@ -1706,19 +1774,20 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 					MEM_freeN(buffer);
 				}
 				do_draw= 1;
+				do_suggest= -1;
 			}
-			do_suggest= -1;
 		}
 	} else if (event==MIDDLEMOUSE) {
 		if (val) {
-			if (U.uiflag & USER_MMB_PASTE)
-			{
+			if (do_suggest_select(st)) {
+				confirm_suggestion(text);
+				do_draw= 1;
+				do_suggest= 0;
+			} else if (U.uiflag & USER_MMB_PASTE) {
 				do_selection(st, G.qual&LR_SHIFTKEY);
 				get_selection_buffer(text);
 				do_draw= 1;
-			}
-			else
-			{
+			} else {
 				do_textscroll(st, 1);
 			}
 			do_suggest= -1;

From 14c1ed08108df6178a55f6d7f818f19a926ae1df Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Sat, 28 Jun 2008 00:07:22 +0000
Subject: [PATCH 059/252] Fixed own platform bug with stat/fstat.

---
 source/blender/blenkernel/intern/text.c | 16 ++++++++--------
 source/blender/src/drawtext.c           |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c
index f414498c1b9..91ea8744dad 100644
--- a/source/blender/blenkernel/intern/text.c
+++ b/source/blender/blenkernel/intern/text.c
@@ -217,7 +217,7 @@ int reopen_text(Text *text)
 	TextLine *tmp;
 	char sfile[FILE_MAXFILE];
 	char str[FILE_MAXDIR+FILE_MAXFILE];
-	struct stat fst;
+	struct stat st;
 
 	if (!text || !text->name) return 0;
 	
@@ -253,9 +253,6 @@ int reopen_text(Text *text)
 	fseek(fp, 0L, SEEK_SET);	
 
 	text->undo_pos= -1;
-
-	res= fstat(fp->_file, &fst);
-	text->mtime= fst.st_mtime;
 	
 	buffer= MEM_mallocN(len, "text_buffer");
 	// under windows fread can return less then len bytes because
@@ -263,6 +260,9 @@ int reopen_text(Text *text)
 	len = fread(buffer, 1, len, fp);
 
 	fclose(fp);
+
+	res= stat(str, &st);
+	text->mtime= st.st_mtime;
 	
 	text->nlines=0;
 	i=0;
@@ -320,7 +320,7 @@ Text *add_text(char *file)
 	Text *ta;
 	char sfile[FILE_MAXFILE];
 	char str[FILE_MAXDIR+FILE_MAXFILE];
-	struct stat fst;
+	struct stat st;
 
 	BLI_strncpy(str, file, FILE_MAXDIR+FILE_MAXFILE);
 	if (G.scene) /* can be NULL (bg mode) */
@@ -346,9 +346,6 @@ Text *add_text(char *file)
 	ta->name= MEM_mallocN(strlen(file)+1, "text_name");
 	strcpy(ta->name, file);
 
-	res= fstat(fp->_file, &fst);
-	ta->mtime= fst.st_mtime;
-
 	ta->undo_pos= -1;
 	ta->undo_len= TXT_INIT_UNDO;
 	ta->undo_buf= MEM_mallocN(ta->undo_len, "undo buf");
@@ -359,6 +356,9 @@ Text *add_text(char *file)
 	len = fread(buffer, 1, len, fp);
 
 	fclose(fp);
+
+	res= stat(str, &st);
+	ta->mtime= st.st_mtime;
 	
 	ta->nlines=0;
 	i=0;
diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index fc1967a2c86..c76ac47ffb7 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -1316,7 +1316,7 @@ void txt_write_file(Text *text)
 	FILE *fp;
 	TextLine *tmp;
 	int res;
-	struct stat fst;
+	struct stat st;
 	
 	/* Do we need to get a filename? */
 	if (text->flags & TXT_ISMEM) {
@@ -1352,8 +1352,8 @@ void txt_write_file(Text *text)
 	
 	fclose (fp);
 
-	res= stat(text->name, &fst);
-	text->mtime= fst.st_mtime;
+	res= stat(text->name, &st);
+	text->mtime= st.st_mtime;
 	
 	if (text->flags & TXT_ISDIRTY) text->flags ^= TXT_ISDIRTY;
 }

From ffb07fcfb3dc1228b0bdc411c286a1244daeed26 Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Wed, 2 Jul 2008 12:16:36 +0000
Subject: [PATCH 060/252] soc-2008-mxcurioni: renamed libQGLWidget's Camera
 class to AppGLWidget_Camera to use Blender's Camera struct, integrated the
 camera parameters from Blender. Perspective projection (precisely field of
 view) is now correct. Orthographic projection still having issues.

---
 .../intern/app_blender/AppGLWidget.cpp        |   2 +-
 .../intern/app_blender/AppGLWidget.h          |   2 +-
 .../intern/app_blender/AppGLWidget_camera.cpp | 152 +++++++++---------
 .../intern/app_blender/AppGLWidget_camera.h   |  10 +-
 .../app_blender/AppGLWidget_constraint.h      |   8 +-
 .../AppGLWidget_manipulatedCameraFrame.cpp    |   4 +-
 .../AppGLWidget_manipulatedCameraFrame.h      |   6 +-
 .../AppGLWidget_manipulatedFrame.cpp          |   2 +-
 .../AppGLWidget_manipulatedFrame.h            |   2 +-
 .../freestyle/intern/app_blender/api.cpp      |  19 ++-
 10 files changed, 110 insertions(+), 97 deletions(-)

diff --git a/source/blender/freestyle/intern/app_blender/AppGLWidget.cpp b/source/blender/freestyle/intern/app_blender/AppGLWidget.cpp
index 34a96681c50..2b43b2b9a0c 100755
--- a/source/blender/freestyle/intern/app_blender/AppGLWidget.cpp
+++ b/source/blender/freestyle/intern/app_blender/AppGLWidget.cpp
@@ -58,7 +58,7 @@ bool AppGLWidget::_backBufferFlag = true;
 AppGLWidget::AppGLWidget(const char *iName)
 {
   //soc
-  _camera = new Camera;	
+  _camera = new AppGLWidget_Camera;	
 
   _Fovy        = 30.f;
   //_SceneDepth = 2.f;
diff --git a/source/blender/freestyle/intern/app_blender/AppGLWidget.h b/source/blender/freestyle/intern/app_blender/AppGLWidget.h
index 175eb67ba69..bc18be00a31 100755
--- a/source/blender/freestyle/intern/app_blender/AppGLWidget.h
+++ b/source/blender/freestyle/intern/app_blender/AppGLWidget.h
@@ -90,7 +90,7 @@ public:
 		void setStateFileName(const string& name);
 	
 
-		Camera * _camera;
+		AppGLWidget_Camera * _camera;
 
 protected:
 	unsigned int _width, _height;
diff --git a/source/blender/freestyle/intern/app_blender/AppGLWidget_camera.cpp b/source/blender/freestyle/intern/app_blender/AppGLWidget_camera.cpp
index 23c3b2f09a4..26f2e024cd8 100644
--- a/source/blender/freestyle/intern/app_blender/AppGLWidget_camera.cpp
+++ b/source/blender/freestyle/intern/app_blender/AppGLWidget_camera.cpp
@@ -36,7 +36,7 @@ using namespace std;
 
  See IODistance(), physicalDistanceToScreen(), physicalScreenWidth() and focusDistance()
  documentations for default stereo parameter values. */
-Camera::Camera()
+AppGLWidget_Camera::AppGLWidget_Camera()
   : fieldOfView_(M_PI/4.0f)
 {
   // #CONNECTION# Camera copy constructor
@@ -85,7 +85,7 @@ Camera::Camera()
 
  The frame() is deleted, but the different keyFrameInterpolator() are \e not deleted (in case they
  are shared). */
-Camera::~Camera()
+AppGLWidget_Camera::~AppGLWidget_Camera()
 {
   delete frame_;
   //delete interpolationKfi_;
@@ -93,7 +93,7 @@ Camera::~Camera()
 
 
 /*! Copy constructor. Performs a deep copy using operator=(). */
-Camera::Camera(const Camera& camera)
+AppGLWidget_Camera::AppGLWidget_Camera(const AppGLWidget_Camera& camera)
 {
   // #CONNECTION# Camera constructor
   //interpolationKfi_ = new KeyFrameInterpolator;
@@ -122,7 +122,7 @@ Camera::Camera(const Camera& camera)
  camera()->setScreenWidthAndHeight(width(), height());
  \endcode
  The same applies to sceneCenter() and sceneRadius(), if needed. */
-Camera& Camera::operator=(const Camera& camera)
+AppGLWidget_Camera& AppGLWidget_Camera::operator=(const AppGLWidget_Camera& camera)
 {
   setScreenWidthAndHeight(camera.screenWidth(), camera.screenHeight());
   setFieldOfView(camera.fieldOfView());
@@ -164,7 +164,7 @@ Non-positive dimension are silently replaced by a 1 pixel value to ensure frustr
 
 If your Camera is used without a QGLViewer (offscreen rendering, shadow maps), use setAspectRatio()
 instead to define the projection matrix. */
-void Camera::setScreenWidthAndHeight(int width, int height)
+void AppGLWidget_Camera::setScreenWidthAndHeight(int width, int height)
 {
   // Prevent negative and zero dimensions that would cause divisions by zero.
 	screenWidth_  = width > 0 ? width : 1;
@@ -208,7 +208,7 @@ void Camera::setScreenWidthAndHeight(int width, int height)
 
  \attention The value is always positive although the clipping plane is positioned at a negative z
  value in the Camera coordinate system. This follows the \c gluPerspective standard. */
-float Camera::zNear() const
+float AppGLWidget_Camera::zNear() const
 {
   float z = distanceToSceneCenter() - zClippingCoefficient()*sceneRadius();
 
@@ -217,8 +217,8 @@ float Camera::zNear() const
   if (z < zMin)
     switch (type())
       {
-      case Camera::PERSPECTIVE  : z = zMin; break;
-      case Camera::ORTHOGRAPHIC : z = 0.0;  break;
+      case AppGLWidget_Camera::PERSPECTIVE  : z = zMin; break;
+      case AppGLWidget_Camera::ORTHOGRAPHIC : z = 0.0;  break;
       }
   return z;
 }
@@ -232,7 +232,7 @@ zFar = distanceToSceneCenter() + zClippingCoefficient()*sceneRadius();
 \endcode
 
 See the zNear() documentation for details. */
-float Camera::zFar() const
+float AppGLWidget_Camera::zFar() const
 {
   return distanceToSceneCenter() + zClippingCoefficient()*sceneRadius();
 }
@@ -241,12 +241,12 @@ float Camera::zFar() const
 
 Prefix the type with Camera, as in: \code camera()->setType(Camera::ORTHOGRAPHIC); // or even
 qglviewer::Camera::ORTHOGRAPHIC if you do not use namespace \endcode */
-void Camera::setType(Type type)
+void AppGLWidget_Camera::setType(Type type)
 {
   // make ORTHOGRAPHIC frustum fit PERSPECTIVE (at least in plane normal to viewDirection(), passing
   // through RAP) Done only when CHANGING type since orthoCoef_ may have been changed with a
   // setRevolveAroundPoint() in the meantime.
-  if ( (type == Camera::ORTHOGRAPHIC) && (type_ == Camera::PERSPECTIVE) )
+  if ( (type == AppGLWidget_Camera::ORTHOGRAPHIC) && (type_ == AppGLWidget_Camera::PERSPECTIVE) )
     orthoCoef_ = tan(fieldOfView()/2.0);
   type_ = type;
 }
@@ -264,7 +264,7 @@ use an instance of your new class to move the Camera.
 
 A \c NULL \p mcf pointer will silently be ignored. The calling method is responsible for
 deleting the previous frame() pointer if needed in order to prevent memory leaks. */
-void Camera::setFrame(ManipulatedCameraFrame* const mcf)
+void AppGLWidget_Camera::setFrame(ManipulatedCameraFrame* const mcf)
 {
   if (!mcf)
     return;
@@ -275,7 +275,7 @@ void Camera::setFrame(ManipulatedCameraFrame* const mcf)
 
 /*! Returns the distance from the Camera center to sceneCenter(), projected along the Camera Z axis.
   Used by zNear() and zFar() to optimize the Z range. */
-float Camera::distanceToSceneCenter() const
+float AppGLWidget_Camera::distanceToSceneCenter() const
 {
   return fabs((frame()->coordinatesOf(sceneCenter())).z);
 }
@@ -296,7 +296,7 @@ float Camera::distanceToSceneCenter() const
 
  Overload this method to change this behavior if desired, as is done in the 
  <a href="../examples/standardCamera.html">standardCamera example</a>. */
-void Camera::getOrthoWidthHeight(GLdouble& halfWidth, GLdouble& halfHeight) const
+void AppGLWidget_Camera::getOrthoWidthHeight(GLdouble& halfWidth, GLdouble& halfHeight) const
 {
   const float dist = orthoCoef_ * fabs(cameraCoordinatesOf(revolveAroundPoint()).z);
   //#CONNECTION# fitScreenRegion
@@ -322,14 +322,14 @@ void Camera::getOrthoWidthHeight(GLdouble& halfWidth, GLdouble& halfHeight) cons
  \note You must call this method if your Camera is not associated with a QGLViewer and is used for
  offscreen computations (using (un)projectedCoordinatesOf() for instance). loadProjectionMatrix()
  does it otherwise. */
-void Camera::computeProjectionMatrix() const
+void AppGLWidget_Camera::computeProjectionMatrix() const
 {
   const float ZNear = zNear();
   const float ZFar  = zFar();
 
   switch (type())
     {
-    case Camera::PERSPECTIVE:
+    case AppGLWidget_Camera::PERSPECTIVE:
       {
 	// #CONNECTION# all non null coefficients were set to 0.0 in constructor.
 	const float f = 1.0/tan(fieldOfView()/2.0);
@@ -342,7 +342,7 @@ void Camera::computeProjectionMatrix() const
 	// same as gluPerspective( 180.0*fieldOfView()/M_PI, aspectRatio(), zNear(), zFar() );
 	break;
       }
-    case Camera::ORTHOGRAPHIC:
+    case AppGLWidget_Camera::ORTHOGRAPHIC:
       {
 	GLdouble w, h;
 	getOrthoWidthHeight(w,h);
@@ -368,7 +368,7 @@ void Camera::computeProjectionMatrix() const
  \note You must call this method if your Camera is not associated with a QGLViewer and is used for
  offscreen computations (using (un)projectedCoordinatesOf() for instance). loadModelViewMatrix()
  does it otherwise. */
-void Camera::computeModelViewMatrix() const
+void AppGLWidget_Camera::computeModelViewMatrix() const
 {
   const Quaternion q = frame()->orientation();
 
@@ -427,7 +427,7 @@ void Camera::computeModelViewMatrix() const
 
  \attention If you use several OpenGL contexts and bypass the Qt main refresh loop, you should call
  QGLWidget::makeCurrent() before this method in order to activate the right OpenGL context. */
-void Camera::loadProjectionMatrix(bool reset) const
+void AppGLWidget_Camera::loadProjectionMatrix(bool reset) const
 {
   // WARNING: makeCurrent must be called by every calling method
   glMatrixMode(GL_PROJECTION);
@@ -464,7 +464,7 @@ void Camera::loadProjectionMatrix(bool reset) const
 
  \attention If you use several OpenGL contexts and bypass the Qt main refresh loop, you should call
  QGLWidget::makeCurrent() before this method in order to activate the right OpenGL context. */
-void Camera::loadModelViewMatrix(bool reset) const
+void AppGLWidget_Camera::loadModelViewMatrix(bool reset) const
 {
   // WARNING: makeCurrent must be called by every calling method
   glMatrixMode(GL_MODELVIEW);
@@ -500,7 +500,7 @@ void Camera::loadModelViewMatrix(bool reset) const
  Note that getProjectionMatrix() always returns the mono-vision matrix.
 
  \attention glMatrixMode is set to \c GL_PROJECTION. */
-void Camera::loadProjectionMatrixStereo(bool leftBuffer) const
+void AppGLWidget_Camera::loadProjectionMatrixStereo(bool leftBuffer) const
 {
   float left, right, bottom, top;
   float screenHalfWidth, halfWidth, side, shift, delta;
@@ -510,7 +510,7 @@ void Camera::loadProjectionMatrixStereo(bool leftBuffer) const
 
   switch (type())
     {
-    case Camera::PERSPECTIVE:
+    case AppGLWidget_Camera::PERSPECTIVE:
       // compute half width of screen,
       // corresponding to zero parallax plane to deduce decay of cameras
       screenHalfWidth = focusDistance() * tan(horizontalFieldOfView() / 2.0);
@@ -531,8 +531,8 @@ void Camera::loadProjectionMatrixStereo(bool leftBuffer) const
       glFrustum(left, right, bottom, top, zNear(), zFar() );
       break;
 
-    case Camera::ORTHOGRAPHIC:
-      cout << "Camera::setProjectionMatrixStereo: Stereo not available with Ortho mode";
+    case AppGLWidget_Camera::ORTHOGRAPHIC:
+      cout << "AppGLWidget_Camera::setProjectionMatrixStereo: Stereo not available with Ortho mode";
       break;
     }
 }
@@ -555,7 +555,7 @@ void Camera::loadProjectionMatrixStereo(bool leftBuffer) const
  href="../examples/contribs.html#anaglyph">anaglyph</a> examples for an illustration.
 
  \attention glMatrixMode is set to \c GL_MODELVIEW. */
-void Camera::loadModelViewMatrixStereo(bool leftBuffer) const
+void AppGLWidget_Camera::loadModelViewMatrixStereo(bool leftBuffer) const
 {
   // WARNING: makeCurrent must be called by every calling method
   glMatrixMode(GL_MODELVIEW);
@@ -585,7 +585,7 @@ void Camera::loadModelViewMatrixStereo(bool leftBuffer) const
  man page for details).
 
  See also getModelViewMatrix() and setFromProjectionMatrix(). */
-void Camera::getProjectionMatrix(GLdouble m[16]) const
+void AppGLWidget_Camera::getProjectionMatrix(GLdouble m[16]) const
 {
   // May not be needed, but easier and more robust like this.
   computeProjectionMatrix();
@@ -607,7 +607,7 @@ void Camera::getProjectionMatrix(GLdouble m[16]) const
  man page for details).
 
  See also getProjectionMatrix() and setFromModelViewMatrix(). */
-void Camera::getModelViewMatrix(GLdouble m[16]) const
+void AppGLWidget_Camera::getModelViewMatrix(GLdouble m[16]) const
 {
   // May not be needed, but easier like this.
   // Prevents from retrieving matrix in stereo mode -> overwrites shifted value.
@@ -619,7 +619,7 @@ void Camera::getModelViewMatrix(GLdouble m[16]) const
 /*! Fills \p m with the product of the ModelView and Projection matrices.
 
   Calls getModelViewMatrix() and getProjectionMatrix() and then fills \p m with the product of these two matrices. */
-void Camera::getModelViewProjectionMatrix(GLdouble m[16]) const
+void AppGLWidget_Camera::getModelViewProjectionMatrix(GLdouble m[16]) const
 {
   GLdouble mv[16];
   GLdouble proj[16];
@@ -639,18 +639,18 @@ void Camera::getModelViewProjectionMatrix(GLdouble m[16]) const
 }
 
 #ifndef DOXYGEN
-void Camera::getProjectionMatrix(GLfloat m[16]) const
+void AppGLWidget_Camera::getProjectionMatrix(GLfloat m[16]) const
 {
-  cout << "Warning : Camera::getProjectionMatrix requires a GLdouble matrix array";
+  cout << "Warning : AppGLWidget_Camera::getProjectionMatrix requires a GLdouble matrix array";
   static GLdouble mat[16];
   getProjectionMatrix(mat);
   for (int i=0; i<16; ++i)
     m[i] = float(mat[i]);
 }
 
-void Camera::getModelViewMatrix(GLfloat m[16]) const
+void AppGLWidget_Camera::getModelViewMatrix(GLfloat m[16]) const
 {
-  cout << "Warning : Camera::getModelViewMatrix requires a GLdouble matrix array";
+  cout << "Warning : AppGLWidget_Camera::getModelViewMatrix requires a GLdouble matrix array";
   static GLdouble mat[16];
   getModelViewMatrix(mat);
   for (int i=0; i<16; ++i)
@@ -662,7 +662,7 @@ void Camera::getModelViewMatrix(GLfloat m[16]) const
 
 \attention This methods also sets focusDistance() to sceneRadius() / tan(fieldOfView()/2) and
 flySpeed() to 1% of sceneRadius(). */
-void Camera::setSceneRadius(float radius)
+void AppGLWidget_Camera::setSceneRadius(float radius)
 {
   if (radius <= 0.0)
     {
@@ -679,7 +679,7 @@ void Camera::setSceneRadius(float radius)
 
 /*! Similar to setSceneRadius() and setSceneCenter(), but the scene limits are defined by a (world
   axis aligned) bounding box. */
-void Camera::setSceneBoundingBox(const Vec& min, const Vec& max)
+void AppGLWidget_Camera::setSceneBoundingBox(const Vec& min, const Vec& max)
 {
   setSceneCenter((min+max)/2.0);
   setSceneRadius(0.5*(max-min).norm());
@@ -689,7 +689,7 @@ void Camera::setSceneBoundingBox(const Vec& min, const Vec& max)
 /*! Sets the sceneCenter().
 
  \attention This method also sets the revolveAroundPoint() to sceneCenter(). */
-void Camera::setSceneCenter(const Vec& center)
+void AppGLWidget_Camera::setSceneCenter(const Vec& center)
 {
   sceneCenter_ = center;
   setRevolveAroundPoint(sceneCenter());
@@ -700,7 +700,7 @@ void Camera::setSceneCenter(const Vec& center)
   Returns \c true if a pointUnderPixel() was found and sceneCenter() was actually changed.
 
   See also setRevolveAroundPointFromPixel(). See the pointUnderPixel() documentation. */
-bool Camera::setSceneCenterFromPixel(const Point& pixel)
+bool AppGLWidget_Camera::setSceneCenterFromPixel(const Point& pixel)
 {
   bool found;
   Vec point = pointUnderPixel(pixel, found);
@@ -710,7 +710,7 @@ bool Camera::setSceneCenterFromPixel(const Point& pixel)
 }
 
 /*! Changes the revolveAroundPoint() to \p rap (defined in the world coordinate system). */
-void Camera::setRevolveAroundPoint(const Vec& rap)
+void AppGLWidget_Camera::setRevolveAroundPoint(const Vec& rap)
 {
   const float prevDist = fabs(cameraCoordinatesOf(revolveAroundPoint()).z);
 
@@ -733,7 +733,7 @@ revolveAroundPoint() is left unchanged.
 pointUnderPixel().
 
 See also setSceneCenterFromPixel(). */
-bool Camera::setRevolveAroundPointFromPixel(const Point& pixel)
+bool AppGLWidget_Camera::setRevolveAroundPointFromPixel(const Point& pixel)
 {
   bool found;
   Vec point = pointUnderPixel(pixel, found);
@@ -756,13 +756,13 @@ bool Camera::setRevolveAroundPointFromPixel(const Point& pixel)
  glVertex3fv(sceneCenter() + 20 * pixelGLRatio(sceneCenter()) * camera()->upVector());
  glEnd();
  \endcode */
-float Camera::pixelGLRatio(const Vec& position) const
+float AppGLWidget_Camera::pixelGLRatio(const Vec& position) const
 {
   switch (type())
     {
-    case Camera::PERSPECTIVE :
+    case AppGLWidget_Camera::PERSPECTIVE :
       return 2.0 * fabs((frame()->coordinatesOf(position)).z) * tan(fieldOfView()/2.0) / screenHeight();
-    case Camera::ORTHOGRAPHIC :
+    case AppGLWidget_Camera::ORTHOGRAPHIC :
       {
 	GLdouble w, h;
 	getOrthoWidthHeight(w,h);
@@ -798,7 +798,7 @@ float Camera::pixelGLRatio(const Vec& position) const
  \attention The fieldOfView() is clamped to M_PI/2.0. This happens when the Camera is at a distance
  lower than sqrt(2.0) * sceneRadius() from the sceneCenter(). It optimizes the shadow map
  resolution, although it may miss some parts of the scene. */
-void Camera::setFOVToFitScene()
+void AppGLWidget_Camera::setFOVToFitScene()
 {
   if (distanceToSceneCenter() > sqrt(2.0)*sceneRadius())
     setFieldOfView(2.0 * asin(sceneRadius() / distanceToSceneCenter()));
@@ -908,7 +908,7 @@ void Camera::setFOVToFitScene()
 
  \note The precision of the z-Buffer highly depends on how the zNear() and zFar() values are fitted
  to your scene. Loose boundaries will result in imprecision along the viewing direction. */
-Vec Camera::pointUnderPixel(const Point& pixel, bool& found) const
+Vec AppGLWidget_Camera::pointUnderPixel(const Point& pixel, bool& found) const
 {
   float depth;
   // Qt uses upper corner for its origin while GL uses the lower corner.
@@ -924,7 +924,7 @@ Vec Camera::pointUnderPixel(const Point& pixel, bool& found) const
  Simply calls fitSphere() on a sphere defined by sceneCenter() and sceneRadius().
 
  You will typically use this method in QGLViewer::init() after you defined a new sceneRadius(). */
-void Camera::showEntireScene()
+void AppGLWidget_Camera::showEntireScene()
 {
   fitSphere(sceneCenter(), sceneRadius());
 }
@@ -934,7 +934,7 @@ void Camera::showEntireScene()
 
  Simply projects the current position on a line passing through sceneCenter(). See also
  showEntireScene().*/
-void Camera::centerScene()
+void AppGLWidget_Camera::centerScene()
 {
   frame()->projectOnLine(sceneCenter(), viewDirection());
 }
@@ -945,7 +945,7 @@ void Camera::centerScene()
  The Camera position() is not modified. Simply setViewDirection().
 
  See also setUpVector(), setOrientation(), showEntireScene(), fitSphere() and fitBoundingBox(). */
-void Camera::lookAt(const Vec& target)
+void AppGLWidget_Camera::lookAt(const Vec& target)
 {
   setViewDirection(target - position());
 }
@@ -957,19 +957,19 @@ void Camera::lookAt(const Vec& target)
 
  You should therefore orientate the Camera before you call this method. See lookAt(),
  setOrientation() and setUpVector(). */
-void Camera::fitSphere(const Vec& center, float radius)
+void AppGLWidget_Camera::fitSphere(const Vec& center, float radius)
 {
   float distance = 0.0f;
   switch (type())
     {
-    case Camera::PERSPECTIVE :
+    case AppGLWidget_Camera::PERSPECTIVE :
       {
 	const float yview = radius / sin(fieldOfView()/2.0);
 	const float xview = radius / sin(horizontalFieldOfView()/2.0);
 	distance = qMax(xview,yview);
 	break;
       }
-    case Camera::ORTHOGRAPHIC :
+    case AppGLWidget_Camera::ORTHOGRAPHIC :
       {
 	distance = ((center-revolveAroundPoint()) * viewDirection()) + (radius / orthoCoef_);
 	break;
@@ -981,7 +981,7 @@ void Camera::fitSphere(const Vec& center, float radius)
 
 /*! Moves the Camera so that the (world axis aligned) bounding box (\p min, \p max) is entirely
   visible, using fitSphere(). */
-void Camera::fitBoundingBox(const Vec& min, const Vec& max)
+void AppGLWidget_Camera::fitBoundingBox(const Vec& min, const Vec& max)
 {
   float diameter = qMax(fabs(max[1]-min[1]), fabs(max[0]-min[0]));
   diameter = qMax(fabsf(max[2]-min[2]), diameter);
@@ -1001,7 +1001,7 @@ void Camera::fitBoundingBox(const Vec& min, const Vec& max)
  When \p noMove is \c true (default), the Camera position() is left unchanged, which is an intuitive
  behavior when the Camera is in a walkthrough fly mode (see the QGLViewer::MOVE_FORWARD and
  QGLViewer::MOVE_BACKWARD QGLViewer::MouseAction). */
-void Camera::setUpVector(const Vec& up, bool noMove)
+void AppGLWidget_Camera::setUpVector(const Vec& up, bool noMove)
 {
   Quaternion q(Vec(0.0, 1.0, 0.0), frame()->transformOf(up));
 
@@ -1025,7 +1025,7 @@ void Camera::setUpVector(const Vec& up, bool noMove)
 
  This method can be useful to create Quicktime VR panoramic sequences, see the
  QGLViewer::saveSnapshot() documentation for details. */
-void Camera::setOrientation(float theta, float phi)
+void AppGLWidget_Camera::setOrientation(float theta, float phi)
 {
   Vec axis(0.0, 1.0, 0.0);
   const Quaternion rot1(axis, theta);
@@ -1035,7 +1035,7 @@ void Camera::setOrientation(float theta, float phi)
 }
 
 /*! Sets the Camera orientation(), defined in the world coordinate system. */
-void Camera::setOrientation(const Quaternion& q)
+void AppGLWidget_Camera::setOrientation(const Quaternion& q)
 {
   frame()->setOrientation(q);
   //frame()->updateFlyUpVector();
@@ -1046,7 +1046,7 @@ void Camera::setOrientation(const Quaternion& q)
 
  The Camera position() is not modified. The Camera is rotated so that the horizon (defined by its
  upVector()) is preserved. See also lookAt() and setUpVector(). */
-void Camera::setViewDirection(const Vec& direction)
+void AppGLWidget_Camera::setViewDirection(const Vec& direction)
 {
   if (direction.squaredNorm() < 1E-10)
     return;
@@ -1096,7 +1096,7 @@ Only the orientation() and position() of the Camera are modified.
 
 \note If you defined your matrix as \c GLdouble \c mvm[4][4], pass \c &(mvm[0][0]) as a
 parameter. */
-void Camera::setFromModelViewMatrix(const GLdouble* const modelViewMatrix)
+void AppGLWidget_Camera::setFromModelViewMatrix(const GLdouble* const modelViewMatrix)
 {
   // Get upper left (rotation) matrix
   double upperLeft[3][3];
@@ -1134,7 +1134,7 @@ void Camera::setFromModelViewMatrix(const GLdouble* const modelViewMatrix)
  atan(1.0/projectionMatrix[5]).
 
  This code was written by Sylvain Paris. */
-void Camera::setFromProjectionMatrix(const float matrix[12])
+void AppGLWidget_Camera::setFromProjectionMatrix(const float matrix[12])
 {
   // The 3 lines of the matrix are the normals to the planes x=0, y=0, z=0
   // in the camera CS. As we normalize them, we do not need the 4th coordinate.
@@ -1284,7 +1284,7 @@ void Camera::setFromProjectionMatrix(const GLdouble* projectionMatrix)
 ///////////////////////// Camera to world transform ///////////////////////
 
 /*! Same as cameraCoordinatesOf(), but with \c float[3] parameters (\p src and \p res may be identical pointers). */
-void Camera::getCameraCoordinatesOf(const float src[3], float res[3]) const
+void AppGLWidget_Camera::getCameraCoordinatesOf(const float src[3], float res[3]) const
 {
   Vec r = cameraCoordinatesOf(Vec(src));
   for (int i=0; i<3; ++i)
@@ -1292,7 +1292,7 @@ void Camera::getCameraCoordinatesOf(const float src[3], float res[3]) const
 }
 
 /*! Same as worldCoordinatesOf(), but with \c float[3] parameters (\p src and \p res may be identical pointers). */
-void Camera::getWorldCoordinatesOf(const float src[3], float res[3]) const
+void AppGLWidget_Camera::getWorldCoordinatesOf(const float src[3], float res[3]) const
 {
   Vec r = worldCoordinatesOf(Vec(src));
   for (int i=0; i<3; ++i)
@@ -1304,7 +1304,7 @@ void Camera::getWorldCoordinatesOf(const float src[3], float res[3]) const
 This method is mainly used in conjunction with \c gluProject, which requires such a viewport.
 Returned values are (0, screenHeight(), screenWidth(), - screenHeight()), so that the origin is
 located in the \e upper left corner of the window (Qt style coordinate system). */
-void Camera::getViewport(GLint viewport[4]) const
+void AppGLWidget_Camera::getViewport(GLint viewport[4]) const
 {
   viewport[0] = 0;
   viewport[1] = screenHeight();
@@ -1337,7 +1337,7 @@ void Camera::getViewport(GLint viewport[4]) const
  If you call this method several times with no change in the matrices, consider precomputing the
  projection times modelview matrix to save computation time if required (\c P x \c M in the \c
  gluProject man page). */
-Vec Camera::projectedCoordinatesOf(const Vec& src, const Frame* frame) const
+Vec AppGLWidget_Camera::projectedCoordinatesOf(const Vec& src, const Frame* frame) const
 {
   GLdouble x,y,z;
   static GLint viewport[4];
@@ -1379,7 +1379,7 @@ Vec Camera::projectedCoordinatesOf(const Vec& src, const Frame* frame) const
  This method is not computationally optimized. If you call it several times with no change in the
  matrices, you should buffer the entire inverse projection matrix (modelview, projection and then
  viewport) to speed-up the queries. See the \c gluUnProject man page for details. */
-Vec Camera::unprojectedCoordinatesOf(const Vec& src, const Frame* frame) const
+Vec AppGLWidget_Camera::unprojectedCoordinatesOf(const Vec& src, const Frame* frame) const
 {
   GLdouble x,y,z;
   static GLint viewport[4];
@@ -1392,7 +1392,7 @@ Vec Camera::unprojectedCoordinatesOf(const Vec& src, const Frame* frame) const
 }
 
 /*! Same as projectedCoordinatesOf(), but with \c float parameters (\p src and \p res can be identical pointers). */
-void Camera::getProjectedCoordinatesOf(const float src[3], float res[3], const Frame* frame) const
+void AppGLWidget_Camera::getProjectedCoordinatesOf(const float src[3], float res[3], const Frame* frame) const
 {
   Vec r = projectedCoordinatesOf(Vec(src), frame);
   for (int i=0; i<3; ++i)
@@ -1400,7 +1400,7 @@ void Camera::getProjectedCoordinatesOf(const float src[3], float res[3], const F
 }
 
 /*! Same as unprojectedCoordinatesOf(), but with \c float parameters (\p src and \p res can be identical pointers). */
-void Camera::getUnprojectedCoordinatesOf(const float src[3], float res[3], const Frame* frame) const
+void AppGLWidget_Camera::getUnprojectedCoordinatesOf(const float src[3], float res[3], const Frame* frame) const
 {
   Vec r = unprojectedCoordinatesOf(Vec(src), frame);
   for (int i=0; i<3; ++i)
@@ -1532,11 +1532,11 @@ camera()->deletePath(i);
  This method is useful for analytical intersection in a selection method.
 
  See the <a href="../examples/select.html">select example</a> for an illustration. */
-void Camera::convertClickToLine(const Point& pixel, Vec& orig, Vec& dir) const
+void AppGLWidget_Camera::convertClickToLine(const Point& pixel, Vec& orig, Vec& dir) const
 {
   switch (type())
     {
-    case Camera::PERSPECTIVE:
+    case AppGLWidget_Camera::PERSPECTIVE:
       orig = position();
       dir = Vec( ((2.0 * pixel.x() / screenWidth()) - 1.0) * tan(fieldOfView()/2.0) * aspectRatio(),
 		 ((2.0 * (screenHeight()-pixel.y()) / screenHeight()) - 1.0) * tan(fieldOfView()/2.0),
@@ -1545,7 +1545,7 @@ void Camera::convertClickToLine(const Point& pixel, Vec& orig, Vec& dir) const
       dir.normalize();
       break;
 
-    case Camera::ORTHOGRAPHIC:
+    case AppGLWidget_Camera::ORTHOGRAPHIC:
       {
 	GLdouble w,h;
 	getOrthoWidthHeight(w,h);
@@ -1559,9 +1559,9 @@ void Camera::convertClickToLine(const Point& pixel, Vec& orig, Vec& dir) const
 
 #ifndef DOXYGEN
 /*! This method has been deprecated in libQGLViewer version 2.2.0 */
-void Camera::drawCamera(float, float, float)
+void AppGLWidget_Camera::drawCamera(float, float, float)
 {
-  cout << "drawCamera is deprecated. Use Camera::draw() instead.";
+  cout << "drawCamera is deprecated. Use AppGLWidget_Camera::draw() instead.";
 }
 #endif
 
@@ -1585,7 +1585,7 @@ The Camera is then correctly positioned and orientated.
 
 \note The drawing of a QGLViewer's own QGLViewer::camera() should not be visible, but may create
 artefacts due to numerical imprecisions. */
-void Camera::draw(bool drawFarPlane, float scale) const
+void AppGLWidget_Camera::draw(bool drawFarPlane, float scale) const
 {
   glPushMatrix();
   glMultMatrixd(frame()->worldMatrix());
@@ -1598,7 +1598,7 @@ void Camera::draw(bool drawFarPlane, float scale) const
 
   switch (type())
     {
-    case Camera::PERSPECTIVE:
+    case AppGLWidget_Camera::PERSPECTIVE:
       {
 	points[0].y = points[0].z * tan(fieldOfView()/2.0);
 	points[0].x = points[0].y * aspectRatio();
@@ -1609,7 +1609,7 @@ void Camera::draw(bool drawFarPlane, float scale) const
 	points[1].x = ratio * points[0].x;
 	break;
       }
-    case Camera::ORTHOGRAPHIC:
+    case AppGLWidget_Camera::ORTHOGRAPHIC:
       {
 	GLdouble hw, hh;
 	getOrthoWidthHeight(hw, hh);
@@ -1658,7 +1658,7 @@ void Camera::draw(bool drawFarPlane, float scale) const
   // Frustum lines
   switch (type())
     {
-    case Camera::PERSPECTIVE :
+    case AppGLWidget_Camera::PERSPECTIVE :
       glBegin(GL_LINES);
       glVertex3f(0.0f, 0.0f, 0.0f);
       glVertex3f( points[farIndex].x,  points[farIndex].y, -points[farIndex].z);
@@ -1670,7 +1670,7 @@ void Camera::draw(bool drawFarPlane, float scale) const
       glVertex3f( points[farIndex].x, -points[farIndex].y, -points[farIndex].z);
       glEnd();
       break;
-    case Camera::ORTHOGRAPHIC :
+    case AppGLWidget_Camera::ORTHOGRAPHIC :
       if (drawFarPlane)
 	{
 	  glBegin(GL_LINES);
@@ -1713,7 +1713,7 @@ applied in an other viewer to visualize the culling results:
  glClipPlane(GL_CLIP_PLANE0, coef[2]);
  glClipPlane(GL_CLIP_PLANE1, coef[3]);
 \endcode */
-void Camera::getFrustumPlanesCoefficients(GLdouble coef[6][4]) const
+void AppGLWidget_Camera::getFrustumPlanesCoefficients(GLdouble coef[6][4]) const
 {
   // Computed once and for all
   const Vec pos          = position();
@@ -1727,7 +1727,7 @@ void Camera::getFrustumPlanesCoefficients(GLdouble coef[6][4]) const
   
   switch (type())
     {
-    case Camera::PERSPECTIVE :
+    case AppGLWidget_Camera::PERSPECTIVE :
       {
 	const float hhfov = horizontalFieldOfView() / 2.0;
 	const float chhfov = cos(hhfov);
@@ -1768,7 +1768,7 @@ void Camera::getFrustumPlanesCoefficients(GLdouble coef[6][4]) const
 	
 	break;
       }
-    case Camera::ORTHOGRAPHIC :
+    case AppGLWidget_Camera::ORTHOGRAPHIC :
       normal[0] = -right;
       normal[1] =  right;
       normal[4] =  up;
diff --git a/source/blender/freestyle/intern/app_blender/AppGLWidget_camera.h b/source/blender/freestyle/intern/app_blender/AppGLWidget_camera.h
index cd349803712..e71e85839b1 100644
--- a/source/blender/freestyle/intern/app_blender/AppGLWidget_camera.h
+++ b/source/blender/freestyle/intern/app_blender/AppGLWidget_camera.h
@@ -79,15 +79,15 @@
   A Camera can also be used outside of a QGLViewer or even without OpenGL for its coordinate system
   conversion capabilities. Note however that some of them explicitly rely on the presence of a
   Z-buffer. \nosubgrouping */
-  class Camera
+  class AppGLWidget_Camera
   {
 
   public:
-    Camera();
-    virtual ~Camera();
+    AppGLWidget_Camera();
+    virtual ~AppGLWidget_Camera();
 
-    Camera(const Camera& camera);
-    Camera& operator=(const Camera& camera);
+    AppGLWidget_Camera(const AppGLWidget_Camera& camera);
+    AppGLWidget_Camera& operator=(const AppGLWidget_Camera& camera);
 
 
     /*! Enumerates the two possible types of Camera.
diff --git a/source/blender/freestyle/intern/app_blender/AppGLWidget_constraint.h b/source/blender/freestyle/intern/app_blender/AppGLWidget_constraint.h
index 64e8d333d74..4bd629a05de 100644
--- a/source/blender/freestyle/intern/app_blender/AppGLWidget_constraint.h
+++ b/source/blender/freestyle/intern/app_blender/AppGLWidget_constraint.h
@@ -31,7 +31,7 @@
 
 //namespace qglviewer {
   class Frame;
-  class Camera;
+  class AppGLWidget_Camera;
 
   /*! \brief An interface class for Frame constraints.
   \class Constraint constraint.h QGLViewer/constraint.h
@@ -322,7 +322,7 @@
   class CameraConstraint : public AxisPlaneConstraint
   {
   public:
-    explicit CameraConstraint(const Camera* const camera);
+    explicit CameraConstraint(const AppGLWidget_Camera* const camera);
     /*! Virtual destructor. Empty. */
     virtual ~CameraConstraint() {};
 
@@ -330,10 +330,10 @@
     virtual void constrainRotation   (Quaternion& rotation, Frame* const frame);
 
     /*! Returns the associated Camera. Set using the CameraConstraint constructor. */
-    const Camera* camera() const { return camera_; };
+    const AppGLWidget_Camera* camera() const { return camera_; };
 
   private:
-    const Camera* const camera_;
+    const AppGLWidget_Camera* const camera_;
   };
 
 //} // namespace qglviewer
diff --git a/source/blender/freestyle/intern/app_blender/AppGLWidget_manipulatedCameraFrame.cpp b/source/blender/freestyle/intern/app_blender/AppGLWidget_manipulatedCameraFrame.cpp
index 7b52b90eedc..dafd64c4d19 100644
--- a/source/blender/freestyle/intern/app_blender/AppGLWidget_manipulatedCameraFrame.cpp
+++ b/source/blender/freestyle/intern/app_blender/AppGLWidget_manipulatedCameraFrame.cpp
@@ -71,14 +71,14 @@ ManipulatedCameraFrame::ManipulatedCameraFrame(const ManipulatedCameraFrame& mcf
 ////////////////////////////////////////////////////////////////////////////////
 
 /*! Returns a Quaternion that is a rotation around current camera Y, proportionnal to the horizontal mouse position. */
-Quaternion ManipulatedCameraFrame::turnQuaternion(int x, const Camera* const camera)
+Quaternion ManipulatedCameraFrame::turnQuaternion(int x, const AppGLWidget_Camera* const camera)
 {
   return Quaternion(Vec(0.0, 1.0, 0.0), rotationSensitivity()*(prevPos_.x()-x)/camera->screenWidth());
 }
 
 /*! Returns a Quaternion that is the composition of two rotations, inferred from the
   mouse pitch (X axis) and yaw (flyUpVector() axis). */
-Quaternion ManipulatedCameraFrame::pitchYawQuaternion(int x, int y, const Camera* const camera)
+Quaternion ManipulatedCameraFrame::pitchYawQuaternion(int x, int y, const AppGLWidget_Camera* const camera)
 {
   const Quaternion rotX(Vec(1.0, 0.0, 0.0), rotationSensitivity()*(prevPos_.y()-y)/camera->screenHeight());
   const Quaternion rotY(transformOf(flyUpVector()), rotationSensitivity()*(prevPos_.x()-x)/camera->screenWidth());
diff --git a/source/blender/freestyle/intern/app_blender/AppGLWidget_manipulatedCameraFrame.h b/source/blender/freestyle/intern/app_blender/AppGLWidget_manipulatedCameraFrame.h
index df9d8f8e7e3..334fcfeade5 100644
--- a/source/blender/freestyle/intern/app_blender/AppGLWidget_manipulatedCameraFrame.h
+++ b/source/blender/freestyle/intern/app_blender/AppGLWidget_manipulatedCameraFrame.h
@@ -50,7 +50,7 @@
   class ManipulatedCameraFrame : public ManipulatedFrame
   {
 #ifndef DOXYGEN
-    friend class Camera;
+    friend class AppGLWidget_Camera;
     //friend class ::QGLViewer;
 #endif
 
@@ -151,8 +151,8 @@
 
   private:
     void updateFlyUpVector();
-    Quaternion turnQuaternion(int x, const Camera* const camera);
-    Quaternion pitchYawQuaternion(int x, int y, const Camera* const camera);
+    Quaternion turnQuaternion(int x, const AppGLWidget_Camera* const camera);
+    Quaternion pitchYawQuaternion(int x, int y, const AppGLWidget_Camera* const camera);
 
   private:
     // Fly mode data
diff --git a/source/blender/freestyle/intern/app_blender/AppGLWidget_manipulatedFrame.cpp b/source/blender/freestyle/intern/app_blender/AppGLWidget_manipulatedFrame.cpp
index 31243308472..3ec5e83bf50 100644
--- a/source/blender/freestyle/intern/app_blender/AppGLWidget_manipulatedFrame.cpp
+++ b/source/blender/freestyle/intern/app_blender/AppGLWidget_manipulatedFrame.cpp
@@ -97,7 +97,7 @@ static float projectOnBall(float x, float y)
 #ifndef DOXYGEN
 /*! Returns a quaternion computed according to the mouse motion. Mouse positions are projected on a
 deformed ball, centered on (\p cx,\p cy). */
-Quaternion ManipulatedFrame::deformedBallQuaternion(int x, int y, float cx, float cy, const Camera* const camera)
+Quaternion ManipulatedFrame::deformedBallQuaternion(int x, int y, float cx, float cy, const AppGLWidget_Camera* const camera)
 {
   // Points on the deformed ball
   float px = rotationSensitivity() * (prevPos_.x()  - cx) / camera->screenWidth();
diff --git a/source/blender/freestyle/intern/app_blender/AppGLWidget_manipulatedFrame.h b/source/blender/freestyle/intern/app_blender/AppGLWidget_manipulatedFrame.h
index 4dfc82c672a..e57dd9fc756 100644
--- a/source/blender/freestyle/intern/app_blender/AppGLWidget_manipulatedFrame.h
+++ b/source/blender/freestyle/intern/app_blender/AppGLWidget_manipulatedFrame.h
@@ -220,7 +220,7 @@
 
 #ifndef DOXYGEN
   protected:
-    Quaternion deformedBallQuaternion(int x, int y, float cx, float cy, const Camera* const camera);
+    Quaternion deformedBallQuaternion(int x, int y, float cx, float cy, const AppGLWidget_Camera* const camera);
 
     int action_; // Should be a QGLViewer::MouseAction, but include loop
     Constraint* previousConstraint_; // When manipulation is without Contraint.
diff --git a/source/blender/freestyle/intern/app_blender/api.cpp b/source/blender/freestyle/intern/app_blender/api.cpp
index ba583080e79..96edf7fcdba 100644
--- a/source/blender/freestyle/intern/app_blender/api.cpp
+++ b/source/blender/freestyle/intern/app_blender/api.cpp
@@ -9,6 +9,8 @@
 extern "C" {
 #endif
 
+#include "DNA_camera_types.h"
+
 #include "render_types.h"
 #include "renderpipeline.h"
 
@@ -54,14 +56,25 @@ extern "C" {
 		
 		// initialize camera
 		Object* maincam_obj = re->scene->camera;
+		Camera *cam = (Camera*) maincam_obj->data;
+
+		if(cam->type == CAM_PERSP){
+			view->_camera->setType(AppGLWidget_Camera::PERSPECTIVE);
+			view->_camera->setHorizontalFieldOfView( M_PI / 180.0f * cam->angle );
+		}
+		else if (cam->type == CAM_ORTHO){
+			view->_camera->setType(AppGLWidget_Camera::ORTHOGRAPHIC);
+			// view->_camera->setFocusDistance does not seem to work
+			// integrate cam->ortho_scale parameter
+		}
+		
 		Vec camPosition(maincam_obj->obmat[3][0], maincam_obj->obmat[3][1], maincam_obj->obmat[3][2]);
 		Vec camUp( re->viewmat[0][1], re->viewmat[1][1], re->viewmat[2][1]);
-		Vec camDirection( -re->viewmat[0][2], -re->viewmat[1][2], - re->viewmat[2][2]);
-		
-		view->_camera->setType(Camera::PERSPECTIVE);
+		Vec camDirection( -re->viewmat[0][2], -re->viewmat[1][2], -re->viewmat[2][2]);
 		view->_camera->setPosition(camPosition);
 		view->_camera->setUpVector(camUp);	
 		view->_camera->setViewDirection(camDirection);	
+	
 		
 		// export scene to 3ds format
 		string script_3ds_export = 	pathconfig.getProjectDir() + 

From d350e272e7f732bac32bdda5fadf406dc864853e Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Wed, 2 Jul 2008 21:36:45 +0000
Subject: [PATCH 061/252] Remove some debugging prints Better symmetry
 detection using subtree shapes instead of depth Fix the bug with flipping
 arcs caused by internal filtering

---
 source/blender/blenlib/BLI_graph.h    |   1 +
 source/blender/blenlib/intern/graph.c |  33 ++---
 source/blender/src/reeb.c             | 171 ++++++++++----------------
 3 files changed, 77 insertions(+), 128 deletions(-)

diff --git a/source/blender/blenlib/BLI_graph.h b/source/blender/blenlib/BLI_graph.h
index b1e4a9fec75..44131fbbff8 100644
--- a/source/blender/blenlib/BLI_graph.h
+++ b/source/blender/blenlib/BLI_graph.h
@@ -72,6 +72,7 @@ void BLI_flagArcs(BGraph *graph, int flag);
 
 int BLI_hasAdjacencyList(BGraph *rg);
 void BLI_buildAdjacencyList(BGraph *rg);
+void BLI_rebuildAdjacencyList(BGraph* rg);
 void BLI_freeAdjacencyList(BGraph *rg);
 
 int BLI_FlagSubgraphs(BGraph *graph);
diff --git a/source/blender/blenlib/intern/graph.c b/source/blender/blenlib/intern/graph.c
index 44b74122371..8c7e8ce8cd6 100644
--- a/source/blender/blenlib/intern/graph.c
+++ b/source/blender/blenlib/intern/graph.c
@@ -84,6 +84,12 @@ static void addArcToNodeAdjacencyList(BNode *node, BArc *arc)
 	node->flag++;
 }
 
+void BLI_rebuildAdjacencyList(BGraph *rg)
+{
+	BLI_freeAdjacencyList(rg);
+	BLI_buildAdjacencyList(rg);
+}
+
 void BLI_buildAdjacencyList(BGraph *rg)
 {
 	BNode *node;
@@ -310,7 +316,7 @@ BArc * BLI_findConnectedArc(BGraph *graph, BArc *arc, BNode *v)
 
 /*********************************** GRAPH AS TREE FUNCTIONS *******************************************/
 
-int BLI_subtreeDepth(BNode *node, BArc *rootArc)
+int BLI_subtreeShape(BNode *node, BArc *rootArc)
 {
 	int depth = 0;
 	
@@ -331,12 +337,14 @@ int BLI_subtreeDepth(BNode *node, BArc *rootArc)
 			if (arc != rootArc)
 			{
 				BNode *newNode = BLI_otherNode(arc, node);
-				depth = MAX2(depth, BLI_subtreeDepth(newNode, arc));
+				//depth = MAX2(depth, BLI_subtreeShape(newNode, arc));
+				depth += BLI_subtreeShape(newNode, arc);
 			}
 		}
 	}
 	
-	return depth + 1; //BLI_countlist(&rootArc->edges);
+	//return depth + 1;
+	return 10 * depth + 1;
 }
 
 /********************************* SYMMETRY DETECTION **************************************************/
@@ -519,11 +527,6 @@ static void handleRadialSymmetry(BGraph *graph, BNode *root_node, int depth, flo
 			}
 		}
 	}
-	
-	for (i = 0; i < total; i++)
-	{
-		printf("length %f\n", ring[i].arc->length);
-	}
 
 	/* Dispatch to specific symmetry tests */
 	first = 0;
@@ -556,7 +559,6 @@ static void handleRadialSymmetry(BGraph *graph, BNode *root_node, int depth, flo
 
 			if (sub_total == 1)
 			{
-				printf("no dispatch\n");
 				/* NOTHING TO DO */
 			}
 			else if (sub_total == 2)
@@ -564,8 +566,6 @@ static void handleRadialSymmetry(BGraph *graph, BNode *root_node, int depth, flo
 				BArc *arc1, *arc2;
 				BNode *node1, *node2;
 				
-				printf("dispatch axial\n");
-
 				arc1 = ring[first].arc;
 				arc2 = ring[last].arc;
 				
@@ -579,8 +579,6 @@ static void handleRadialSymmetry(BGraph *graph, BNode *root_node, int depth, flo
 				RadialArc *sub_ring = MEM_callocN(sizeof(RadialArc) * sub_total, "radial symmetry ring");
 				int sub_i;
 				
-				printf("dispatch radial sub ring\n");
-
 				/* fill in the sub ring */
 				for (sub_i = 0; sub_i < sub_total; sub_i++)
 				{
@@ -593,8 +591,6 @@ static void handleRadialSymmetry(BGraph *graph, BNode *root_node, int depth, flo
 			}
 			else if (sub_total == total)
 			{
-				printf("dispatch radial full ring\n");
-
 				testRadialSymmetry(graph, root_node, ring, total, axis, limit, group);
 			}
 			
@@ -660,7 +656,7 @@ static void testAxialSymmetry(BGraph *graph, BNode* root_node, BNode* node1, BNo
 	}
 	else
 	{
-		printf("not symmetric\n");
+		/* NOT SYMMETRIC */
 	}
 }
 
@@ -700,8 +696,6 @@ static void handleAxialSymmetry(BGraph *graph, BNode *root_node, int depth, floa
 		return;
 	}
 	
-	printf("symmetry length %f <> %f\n", arc1->length, arc2->length);
-	
 	testAxialSymmetry(graph, root_node, node1, node2, arc1, arc2, axis, limit, 1);
 }
 
@@ -777,7 +771,7 @@ void markdownSymmetryArc(BGraph *graph, BArc *arc, BNode *node, int level, float
 			BNode *connectedNode = BLI_otherNode(connectedArc, node);
 			
 			/* symmetry level is positive value, negative values is subtree depth */
-			connectedArc->symmetry_level = -BLI_subtreeDepth(connectedNode, connectedArc);
+			connectedArc->symmetry_level = -BLI_subtreeShape(connectedNode, connectedArc);
 		}
 	}
 
@@ -854,7 +848,6 @@ void BLI_markdownSymmetry(BGraph *graph, BNode *root_node, float limit)
 	
 	if (BLI_isGraphCyclic(graph))
 	{
-		printf("cyclic\n");
 		return;
 	}
 	
diff --git a/source/blender/src/reeb.c b/source/blender/src/reeb.c
index 1c317f06176..610d5d83d97 100644
--- a/source/blender/src/reeb.c
+++ b/source/blender/src/reeb.c
@@ -93,6 +93,7 @@ typedef enum {
 } MergeDirection;
 
 int mergeArcs(ReebGraph *rg, ReebArc *a0, ReebArc *a1);
+void mergeArcEdges(ReebGraph *rg, ReebArc *aDst, ReebArc *aSrc, MergeDirection direction);
 int mergeConnectedArcs(ReebGraph *rg, ReebArc *a0, ReebArc *a1);
 EditEdge * NextEdgeForVert(EditMesh *em, EditVert *v);
 void mergeArcFaces(ReebGraph *rg, ReebArc *aDst, ReebArc *aSrc);
@@ -824,18 +825,20 @@ void filterArc(ReebGraph *rg, ReebNode *newNode, ReebNode *removedNode, ReebArc
 					REEB_freeArc((BArc*)arc);
 				}
 			}
-#if 0
 			// Remove flipped arcs
 			else if (((ReebNode*)arc->head)->weight > ((ReebNode*)arc->tail)->weight)
 			{
+#if 0
 				// Decrement degree from the other node
 				//BLI_otherNode((BArc*)arc, (BNode*)newNode)->degree--;
 				NodeDegreeDecrement(rg, (ReebNode*)BLI_otherNode((BArc*)arc, (BNode*)newNode));
 				
 				BLI_remlink(&rg->arcs, arc);
 				REEB_freeArc((BArc*)arc);
-			}
+#else
+				printf("flipped\n");
 #endif
+			}
 			else
 			{
 				//newNode->degree++; // incrementing degree since we're adding an arc
@@ -911,6 +914,7 @@ int filterInternalReebGraph(ReebGraph *rg, float threshold)
 			ReebNode *newNode = NULL;
 			ReebNode *removedNode = NULL;
 			
+#if 0 // Old method
 			/* Keep the node with the highestn number of connected arcs */
 			if (arc->head->degree >= arc->tail->degree)
 			{
@@ -922,6 +926,11 @@ int filterInternalReebGraph(ReebGraph *rg, float threshold)
 				newNode = arc->tail;
 				removedNode = arc->head;
 			}
+#else
+			/* Always remove lower node, so arcs don't flip */
+			newNode = arc->head;
+			removedNode = arc->tail;
+#endif
 			
 			filterArc(rg, newNode, removedNode, arc, 1);
 
@@ -1017,6 +1026,41 @@ int filterExternalReebGraph(ReebGraph *rg, float threshold)
 	return value;
 }
 
+int filterCyclesReebGraph(ReebGraph *rg, float distance_threshold)
+{
+	int filtered = 0;
+	
+	if (BLI_isGraphCyclic((BGraph*)rg))
+	{
+		ReebArc *arc1, *arc2;
+		ReebArc *next2;
+		
+		for (arc1 = rg->arcs.first; arc1; arc1 = arc1->next)
+		{
+			for (arc2 = rg->arcs.first; arc2; arc2 = next2)
+			{
+				next2 = arc2->next;
+				if (arc1 != arc2 && arc1->head == arc2->head && arc1->tail == arc2->tail)
+				{
+					mergeArcEdges(rg, arc1, arc2, MERGE_APPEND);
+					mergeArcFaces(rg, arc1, arc2);
+					mergeArcBuckets(arc1, arc2, arc1->head->weight, arc1->tail->weight);
+
+					NodeDegreeDecrement(rg, arc1->head);
+					NodeDegreeDecrement(rg, arc1->tail);
+
+					BLI_remlink(&rg->arcs, arc2);
+					REEB_freeArc((BArc*)arc2);
+					
+					filtered = 1;
+				}
+			}
+		}
+	}
+	
+	return filtered;
+}
+
 int filterSmartReebGraph(ReebGraph *rg, float threshold)
 {
 	ReebArc *arc = NULL, *nextArc = NULL;
@@ -2634,17 +2678,27 @@ ReebGraph *BIF_ReebGraphFromEditMesh(void)
 	
 	rg = generateReebGraph(em, G.scene->toolsettings->skgen_resolution);
 
+	verifyNodeDegree(rg);
+
 	REEB_exportGraph(rg, -1);
 
 	verifyBuckets(rg);
 	
 	verifyFaces(rg);
 
+	printf("GENERATED\n");
+	printf("%i subgraphs\n", BLI_FlagSubgraphs((BGraph*)rg));
+
 	/* Remove arcs without embedding */
 	filterNullReebGraph(rg);
 
 	verifyBuckets(rg);
 
+	BLI_freeAdjacencyList((BGraph*)rg);
+
+	printf("NULL FILTERED\n");
+	printf("%i subgraphs\n", BLI_FlagSubgraphs((BGraph*)rg));
+
 	i = 1;
 	/* filter until there's nothing more to do */
 	while (i == 1)
@@ -2667,6 +2721,8 @@ ReebGraph *BIF_ReebGraphFromEditMesh(void)
 	if (G.scene->toolsettings->skgen_options & SKGEN_FILTER_SMART)
 	{
 		filterSmartReebGraph(rg, 0.5);
+		BLI_rebuildAdjacencyList((BGraph*)rg);
+		filterCyclesReebGraph(rg, 0.5);
 	}
 
 #ifdef DEBUG_REEB
@@ -2690,7 +2746,7 @@ ReebGraph *BIF_ReebGraphFromEditMesh(void)
 		postprocessGraph(rg, G.scene->toolsettings->skgen_postpro);
 	}
 
-	BLI_buildAdjacencyList((BGraph*)rg);
+	BLI_rebuildAdjacencyList((BGraph*)rg);
 	
 	sortNodes(rg);
 	
@@ -2700,6 +2756,9 @@ ReebGraph *BIF_ReebGraphFromEditMesh(void)
 	
 	calculateGraphLength(rg);
 	
+	printf("DONE\n");
+	printf("%i subgraphs\n", BLI_FlagSubgraphs((BGraph*)rg));
+
 	return rg;
 }
 
@@ -2714,115 +2773,11 @@ void BIF_GlobalReebFree()
 
 void BIF_GlobalReebGraphFromEditMesh(void)
 {
-	EditMesh *em = G.editMesh;
-	int i;
-	
-	if (em == NULL)
-		return;
-
 	BIF_GlobalReebFree();
-
-	if (weightFromDistance(em) == 0)
-	{
-		error("No selected vertex\n");
-		return;
-	}
 	
-	renormalizeWeight(em, 1.0f);
-
-	if (G.scene->toolsettings->skgen_options & SKGEN_HARMONIC)
-	{
-		weightToHarmonic(em);
-	}
-	
-#ifdef DEBUG_REEB
-	weightToVCol(em, 0);
-#endif
-
-	GLOBAL_RG = generateReebGraph(em, G.scene->toolsettings->skgen_resolution);
-
-	verifyNodeDegree(GLOBAL_RG);
-
-	REEB_exportGraph(GLOBAL_RG, -1);
-
-	verifyBuckets(GLOBAL_RG);
-	
-	verifyFaces(GLOBAL_RG);
-
-	printf("GENERATED\n");
-	printf("%i subgraphs\n", BLI_FlagSubgraphs((BGraph*)GLOBAL_RG));
-
-	/* Remove arcs without embedding */
-	filterNullReebGraph(GLOBAL_RG);
-
-	verifyNodeDegree(GLOBAL_RG);
-	
-	BLI_freeAdjacencyList((BGraph*)GLOBAL_RG);
-
-	printf("NULL FILTERED\n");
-	printf("%i subgraphs\n", BLI_FlagSubgraphs((BGraph*)GLOBAL_RG));
-
-	verifyBuckets(GLOBAL_RG);
-
-	i = 1;
-	/* filter until there's nothing more to do */
-	while (i == 1)
-	{
-		i = 0; /* no work done yet */
-		
-		if (G.scene->toolsettings->skgen_options & SKGEN_FILTER_EXTERNAL)
-		{
-			i |= filterExternalReebGraph(GLOBAL_RG, G.scene->toolsettings->skgen_threshold_external * G.scene->toolsettings->skgen_resolution);
-		}
-	
-		verifyBuckets(GLOBAL_RG);
-	
-		if (G.scene->toolsettings->skgen_options & SKGEN_FILTER_INTERNAL)
-		{
-			i |= filterInternalReebGraph(GLOBAL_RG, G.scene->toolsettings->skgen_threshold_internal * G.scene->toolsettings->skgen_resolution);
-		}
-	}
-
-	if (G.scene->toolsettings->skgen_options & SKGEN_FILTER_SMART)
-	{
-		filterSmartReebGraph(GLOBAL_RG, 0.5);
-	}
-
-	verifyBuckets(GLOBAL_RG);
-
-	repositionNodes(GLOBAL_RG);
-	
-	verifyBuckets(GLOBAL_RG);
-
-	/* Filtering might have created degree 2 nodes, so remove them */
-	removeNormalNodes(GLOBAL_RG);
-	
-	verifyBuckets(GLOBAL_RG);
-
-#ifdef DEBUG_REEB
-	arcToVCol(GLOBAL_RG, em, 1);
-	//angleToVCol(em, 1);
-#endif
-
-	for(i = 0; i <  G.scene->toolsettings->skgen_postpro_passes; i++)
-	{
-		postprocessGraph(GLOBAL_RG, G.scene->toolsettings->skgen_postpro);
-	}
-
-	BLI_buildAdjacencyList((BGraph*)GLOBAL_RG);
-	
-	sortNodes(GLOBAL_RG);
-	
-	sortArcs(GLOBAL_RG);
-	
-	REEB_exportGraph(GLOBAL_RG, -1);
-	
-	calculateGraphLength(GLOBAL_RG);
+	GLOBAL_RG = BIF_ReebGraphFromEditMesh();
 
 	BLI_markdownSymmetry((BGraph*)GLOBAL_RG, GLOBAL_RG->nodes.first, G.scene->toolsettings->skgen_symmetry_limit);
-	
-	printf("DONE\n");
-	printf("%i subgraphs\n", BLI_FlagSubgraphs((BGraph*)GLOBAL_RG));
 }
 
 void REEB_draw()

From a440769843c9e115cec1bb60099ab22080ffc147 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Thu, 3 Jul 2008 16:32:19 +0000
Subject: [PATCH 062/252] Fix arc flipping for null embedding filtering

---
 source/blender/src/reeb.c | 39 ++++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/source/blender/src/reeb.c b/source/blender/src/reeb.c
index 610d5d83d97..b6663f95eb2 100644
--- a/source/blender/src/reeb.c
+++ b/source/blender/src/reeb.c
@@ -163,6 +163,20 @@ void mergeArcBuckets(ReebArc *aDst, ReebArc *aSrc, float start, float end)
 	}
 }
 
+void flipArcBuckets(ReebArc *arc)
+{
+	int i, j;
+	
+	for (i = 0, j = arc->bcount - 1; i < j; i++, j--)
+	{
+		EmbedBucket tmp;
+		
+		tmp = arc->buckets[i];
+		arc->buckets[i] = arc->buckets[j];
+		arc->buckets[j] = tmp;
+	}
+}
+
 void allocArcBuckets(ReebArc *arc)
 {
 	int i;
@@ -825,22 +839,18 @@ void filterArc(ReebGraph *rg, ReebNode *newNode, ReebNode *removedNode, ReebArc
 					REEB_freeArc((BArc*)arc);
 				}
 			}
-			// Remove flipped arcs
-			else if (((ReebNode*)arc->head)->weight > ((ReebNode*)arc->tail)->weight)
-			{
-#if 0
-				// Decrement degree from the other node
-				//BLI_otherNode((BArc*)arc, (BNode*)newNode)->degree--;
-				NodeDegreeDecrement(rg, (ReebNode*)BLI_otherNode((BArc*)arc, (BNode*)newNode));
-				
-				BLI_remlink(&rg->arcs, arc);
-				REEB_freeArc((BArc*)arc);
-#else
-				printf("flipped\n");
-#endif
-			}
 			else
 			{
+				/* flip arcs that flipped can happen on diamond shapes, mostly on null arcs */
+				if (arc->head->weight > arc->tail->weight)
+				{
+					ReebNode *tmp;
+					tmp = arc->head;
+					arc->head = arc->tail;
+					arc->tail = tmp;
+					
+					flipArcBuckets(arc);
+				}
 				//newNode->degree++; // incrementing degree since we're adding an arc
 				NodeDegreeIncrement(rg, newNode);
 				mergeArcFaces(rg, arc, srcArc);
@@ -878,7 +888,6 @@ void filterNullReebGraph(ReebGraph *rg)
 			
 			blend = (float)newNode->degree / (float)(newNode->degree + removedNode->degree); // blending factors
 			
-			//newNode->weight = FloatLerpf(newNode->weight, removedNode->weight, blend);
 			VecLerpf(newNode->p, newNode->p, removedNode->p, blend);
 			
 			filterArc(rg, newNode, removedNode, arc, 0);

From a4b6f74a48f8dd992c0a65c19255cb3dd8f69511 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Thu, 3 Jul 2008 17:51:19 +0000
Subject: [PATCH 063/252] Reeb Graph Copy procedures, for multi resolution
 filtering

---
 source/blender/include/reeb.h |   1 +
 source/blender/src/reeb.c     | 563 ++++++++++++++++++++--------------
 2 files changed, 328 insertions(+), 236 deletions(-)

diff --git a/source/blender/include/reeb.h b/source/blender/include/reeb.h
index 58dfb207764..c6236069222 100644
--- a/source/blender/include/reeb.h
+++ b/source/blender/include/reeb.h
@@ -101,6 +101,7 @@ typedef struct ReebArc {
 
 	struct GHash *faces;	
 	float angle;
+	struct ReebArc *link; /* for multi resolution filtering, points to higher levels */
 } ReebArc;
 
 typedef struct ReebArcIterator {
diff --git a/source/blender/src/reeb.c b/source/blender/src/reeb.c
index b6663f95eb2..e3292403cc2 100644
--- a/source/blender/src/reeb.c
+++ b/source/blender/src/reeb.c
@@ -103,6 +103,327 @@ void REEB_RadialSymmetry(BNode* root_node, RadialArc* ring, int count);
 void REEB_AxialSymmetry(BNode* root_node, BNode* node1, BNode* node2, struct BArc* barc1, BArc* barc2);
 
 
+/***************************************** UTILS **********************************************/
+
+void REEB_freeArc(BArc *barc)
+{
+	ReebArc *arc = (ReebArc*)barc;
+	BLI_freelistN(&arc->edges);
+	
+	if (arc->buckets)
+		MEM_freeN(arc->buckets);
+		
+	if (arc->faces)
+		BLI_ghash_free(arc->faces, NULL, NULL);
+	
+	MEM_freeN(arc);
+}
+
+void REEB_freeGraph(ReebGraph *rg)
+{
+	ReebArc *arc;
+	ReebNode *node;
+	
+	// free nodes
+	for( node = rg->nodes.first; node; node = node->next )
+	{
+		// Free adjacency lists
+		if (node->arcs != NULL)
+		{
+			MEM_freeN(node->arcs);
+		}
+	}
+	BLI_freelistN(&rg->nodes);
+	
+	// free arcs
+	arc = rg->arcs.first;
+	while( arc )
+	{
+		ReebArc *next = arc->next;
+		REEB_freeArc((BArc*)arc);
+		arc = next;
+	}
+	
+	// free edge map
+	BLI_edgehash_free(rg->emap, NULL);
+	
+	MEM_freeN(rg);
+}
+
+ReebGraph * newReebGraph()
+{
+	ReebGraph *rg;
+	rg = MEM_callocN(sizeof(ReebGraph), "reeb graph");
+	
+	rg->totnodes = 0;
+	rg->emap = BLI_edgehash_new();
+	
+	
+	rg->free_arc = REEB_freeArc;
+	rg->free_node = NULL;
+	rg->radial_symmetry = REEB_RadialSymmetry;
+	rg->axial_symmetry = REEB_AxialSymmetry;
+	
+	return rg;
+}
+
+ReebNode * addNode(ReebGraph *rg, EditVert *eve, float weight)
+{
+	ReebNode *node = NULL;
+	
+	node = MEM_callocN(sizeof(ReebNode), "reeb node");
+	
+	node->flag = 0; // clear flag on init
+	node->symmetry_level = 0;
+	node->arcs = NULL;
+	node->degree = 0;
+	node->weight = weight;
+	node->index = rg->totnodes;
+	VECCOPY(node->p, eve->co);	
+	
+	BLI_addtail(&rg->nodes, node);
+	rg->totnodes++;
+	
+	return node;
+}
+
+ReebNode * copyNode(ReebGraph *rg, ReebNode *node)
+{
+	ReebNode *cp_node = NULL;
+	
+	cp_node = MEM_callocN(sizeof(ReebNode), "reeb node copy");
+	
+	memcpy(cp_node, node, sizeof(ReebNode));
+	
+	cp_node->prev = NULL;
+	cp_node->next = NULL;
+	cp_node->arcs = NULL;
+	
+	BLI_addtail(&rg->nodes, cp_node);
+	rg->totnodes++;
+	
+	return cp_node; 
+}
+
+ReebArc * copyArc(ReebGraph *rg, ReebArc *arc)
+{
+	ReebArc *cp_arc;
+	ReebNode *node;
+	
+	cp_arc = MEM_callocN(sizeof(ReebArc), "reeb arc copy");
+
+	memcpy(cp_arc, arc, sizeof(ReebArc));
+	
+	cp_arc->link = arc;
+	
+	cp_arc->head = NULL;
+	cp_arc->tail = NULL;
+
+	cp_arc->prev = NULL;
+	cp_arc->next = NULL;
+
+	cp_arc->edges.first = NULL;
+	cp_arc->edges.last = NULL;
+
+	/* copy buckets */	
+	cp_arc->buckets = MEM_callocN(sizeof(EmbedBucket) * cp_arc->bcount, "embed bucket");
+	memcpy(cp_arc->buckets, arc->buckets, sizeof(EmbedBucket) * cp_arc->bcount);
+	
+	/* copy faces map */
+	cp_arc->faces = BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp);
+	mergeArcFaces(rg, cp_arc, arc);
+	
+	/* find corresponding head and tail */
+	for (node = rg->nodes.first; node && (cp_arc->head == NULL || cp_arc->tail == NULL); node = node->next)
+	{
+		if (node->index == arc->head->index)
+		{
+			cp_arc->head = node;
+		}
+		else if (node->index == arc->tail->index)
+		{
+			cp_arc->tail = node;
+		}
+	}
+	
+	BLI_addtail(&rg->arcs, cp_arc);
+	
+	return cp_arc;
+}
+
+ReebGraph * copyReebGraph(ReebGraph *rg)
+{
+	ReebNode *node;
+	ReebArc *arc;
+	ReebGraph *cp_rg = newReebGraph();
+
+	/* Copy nodes */	
+	for (node = rg->nodes.first; node; node = node->next)
+	{
+		copyNode(cp_rg, node);
+	}
+	
+	/* Copy arcs */
+	for (arc = rg->arcs.first; arc; arc = arc->next)
+	{
+		copyArc(cp_rg, arc);
+	}
+	
+	BLI_rebuildAdjacencyList((BGraph*)cp_rg);
+	
+	return cp_rg;
+}
+
+ReebEdge * copyEdge(ReebEdge *edge)
+{
+	ReebEdge *newEdge = NULL;
+	
+	newEdge = MEM_callocN(sizeof(ReebEdge), "reeb edge");
+	memcpy(newEdge, edge, sizeof(ReebEdge));
+	
+	newEdge->next = NULL;
+	newEdge->prev = NULL;
+	
+	return newEdge;
+}
+
+void printArc(ReebArc *arc)
+{
+	ReebEdge *edge;
+	ReebNode *head = (ReebNode*)arc->head;
+	printf("arc: (%i)%f -> (%i)%f\n", head->index, head->weight, head->index, head->weight);
+	
+	for(edge = arc->edges.first; edge ; edge = edge->next)
+	{
+		printf("\tedge (%i, %i)\n", edge->v1->index, edge->v2->index);
+	}
+}
+
+void NodeDegreeDecrement(ReebGraph *rg, ReebNode *node)
+{
+	node->degree--;
+
+//	if (node->degree == 0)
+//	{
+//		printf("would remove node %i\n", node->index);
+//	}
+}
+
+void NodeDegreeIncrement(ReebGraph *rg, ReebNode *node)
+{
+//	if (node->degree == 0)
+//	{
+//		printf("first connect node %i\n", node->index);
+//	}
+
+	node->degree++;
+}
+
+void repositionNodes(ReebGraph *rg)
+{
+	BArc *arc = NULL;
+	BNode *node = NULL;
+	
+	// Reset node positions
+	for(node = rg->nodes.first; node; node = node->next)
+	{
+		node->p[0] = node->p[1] = node->p[2] = 0;
+	}
+	
+	for(arc = rg->arcs.first; arc; arc = arc->next)
+	{
+		if (((ReebArc*)arc)->bcount > 0)
+		{
+			float p[3];
+			
+			VECCOPY(p, ((ReebArc*)arc)->buckets[0].p);
+			VecMulf(p, 1.0f / arc->head->degree);
+			VecAddf(arc->head->p, arc->head->p, p);
+			
+			VECCOPY(p, ((ReebArc*)arc)->buckets[((ReebArc*)arc)->bcount - 1].p);
+			VecMulf(p, 1.0f / arc->tail->degree);
+			VecAddf(arc->tail->p, arc->tail->p, p);
+		}
+	}
+}
+
+void verifyNodeDegree(ReebGraph *rg)
+{
+//#ifdef DEBUG_REEB
+	ReebNode *node = NULL;
+	ReebArc *arc = NULL;
+
+	for(node = rg->nodes.first; node; node = node->next)
+	{
+		int count = 0;
+		for(arc = rg->arcs.first; arc; arc = arc->next)
+		{
+			if (arc->head == node || arc->tail == node)
+			{
+				count++;
+			}
+		}
+		if (count != node->degree)
+		{
+			printf("degree error in node %i: expected %i got %i\n", node->index, count, node->degree);
+		}
+		if (node->degree == 0)
+		{
+			printf("zero degree node %i with weight %f\n", node->index, node->weight);
+		}
+	}
+//#endif
+}
+
+void verifyBuckets(ReebGraph *rg)
+{
+#ifdef DEBUG_REEB
+	ReebArc *arc = NULL;
+	for(arc = rg->arcs.first; arc; arc = arc->next)
+	{
+		ReebNode *head = (ReebNode*)arc->head;
+		ReebNode *tail = (ReebNode*)arc->tail;
+
+		if (arc->bcount > 0)
+		{
+			int i;
+			for(i = 0; i < arc->bcount; i++)
+			{
+				if (arc->buckets[i].nv == 0)
+				{
+					printArc(arc);
+					printf("count error in bucket %i/%i\n", i+1, arc->bcount);
+				}
+			}
+			
+			if (ceil(head->weight) < arc->buckets[0].val)
+			{
+				printArc(arc);
+				printf("alloc error in first bucket: %f should be %f \n", arc->buckets[0].val, ceil(head->weight));
+			}
+			if (floor(tail->weight) < arc->buckets[arc->bcount - 1].val)
+			{
+				printArc(arc);
+				printf("alloc error in last bucket: %f should be %f \n", arc->buckets[arc->bcount - 1].val, floor(tail->weight));
+			}
+		}
+	}
+#endif
+}
+
+void verifyFaces(ReebGraph *rg)
+{
+#ifdef DEBUG_REEB
+	int total = 0;
+	ReebArc *arc = NULL;
+	for(arc = rg->arcs.first; arc; arc = arc->next)
+	{
+		total += BLI_ghash_size(arc->faces);
+	}
+	
+#endif
+}
+
 /***************************************** BUCKET UTILS **********************************************/
 
 void addVertToBucket(EmbedBucket *b, float co[3])
@@ -274,203 +595,6 @@ void calculateGraphLength(ReebGraph *rg)
 	}
 }
 
-/***************************************** UTILS **********************************************/
-
-ReebEdge * copyEdge(ReebEdge *edge)
-{
-	ReebEdge *newEdge = NULL;
-	
-	newEdge = MEM_callocN(sizeof(ReebEdge), "reeb edge");
-	memcpy(newEdge, edge, sizeof(ReebEdge));
-	
-	newEdge->next = NULL;
-	newEdge->prev = NULL;
-	
-	return newEdge;
-}
-
-void printArc(ReebArc *arc)
-{
-	ReebEdge *edge;
-	ReebNode *head = (ReebNode*)arc->head;
-	printf("arc: (%i)%f -> (%i)%f\n", head->index, head->weight, head->index, head->weight);
-	
-	for(edge = arc->edges.first; edge ; edge = edge->next)
-	{
-		printf("\tedge (%i, %i)\n", edge->v1->index, edge->v2->index);
-	}
-}
-
-void REEB_freeArc(BArc *barc)
-{
-	ReebArc *arc = (ReebArc*)barc;
-	BLI_freelistN(&arc->edges);
-	
-	if (arc->buckets)
-		MEM_freeN(arc->buckets);
-		
-	if (arc->faces)
-		BLI_ghash_free(arc->faces, NULL, NULL);
-	
-	MEM_freeN(arc);
-}
-
-void REEB_freeGraph(ReebGraph *rg)
-{
-	ReebArc *arc;
-	ReebNode *node;
-	
-	// free nodes
-	for( node = rg->nodes.first; node; node = node->next )
-	{
-		// Free adjacency lists
-		if (node->arcs != NULL)
-		{
-			MEM_freeN(node->arcs);
-		}
-	}
-	BLI_freelistN(&rg->nodes);
-	
-	// free arcs
-	arc = rg->arcs.first;
-	while( arc )
-	{
-		ReebArc *next = arc->next;
-		REEB_freeArc((BArc*)arc);
-		arc = next;
-	}
-	
-	// free edge map
-	BLI_edgehash_free(rg->emap, NULL);
-	
-	MEM_freeN(rg);
-}
-
-void NodeDegreeDecrement(ReebGraph *rg, ReebNode *node)
-{
-	node->degree--;
-
-//	if (node->degree == 0)
-//	{
-//		printf("would remove node %i\n", node->index);
-//	}
-}
-
-void NodeDegreeIncrement(ReebGraph *rg, ReebNode *node)
-{
-//	if (node->degree == 0)
-//	{
-//		printf("first connect node %i\n", node->index);
-//	}
-
-	node->degree++;
-}
-
-void repositionNodes(ReebGraph *rg)
-{
-	BArc *arc = NULL;
-	BNode *node = NULL;
-	
-	// Reset node positions
-	for(node = rg->nodes.first; node; node = node->next)
-	{
-		node->p[0] = node->p[1] = node->p[2] = 0;
-	}
-	
-	for(arc = rg->arcs.first; arc; arc = arc->next)
-	{
-		if (((ReebArc*)arc)->bcount > 0)
-		{
-			float p[3];
-			
-			VECCOPY(p, ((ReebArc*)arc)->buckets[0].p);
-			VecMulf(p, 1.0f / arc->head->degree);
-			VecAddf(arc->head->p, arc->head->p, p);
-			
-			VECCOPY(p, ((ReebArc*)arc)->buckets[((ReebArc*)arc)->bcount - 1].p);
-			VecMulf(p, 1.0f / arc->tail->degree);
-			VecAddf(arc->tail->p, arc->tail->p, p);
-		}
-	}
-}
-
-void verifyNodeDegree(ReebGraph *rg)
-{
-//#ifdef DEBUG_REEB
-	ReebNode *node = NULL;
-	ReebArc *arc = NULL;
-
-	for(node = rg->nodes.first; node; node = node->next)
-	{
-		int count = 0;
-		for(arc = rg->arcs.first; arc; arc = arc->next)
-		{
-			if (arc->head == node || arc->tail == node)
-			{
-				count++;
-			}
-		}
-		if (count != node->degree)
-		{
-			printf("degree error in node %i: expected %i got %i\n", node->index, count, node->degree);
-		}
-		if (node->degree == 0)
-		{
-			printf("zero degree node %i with weight %f\n", node->index, node->weight);
-		}
-	}
-//#endif
-}
-
-void verifyBuckets(ReebGraph *rg)
-{
-#ifdef DEBUG_REEB
-	ReebArc *arc = NULL;
-	for(arc = rg->arcs.first; arc; arc = arc->next)
-	{
-		ReebNode *head = (ReebNode*)arc->head;
-		ReebNode *tail = (ReebNode*)arc->tail;
-
-		if (arc->bcount > 0)
-		{
-			int i;
-			for(i = 0; i < arc->bcount; i++)
-			{
-				if (arc->buckets[i].nv == 0)
-				{
-					printArc(arc);
-					printf("count error in bucket %i/%i\n", i+1, arc->bcount);
-				}
-			}
-			
-			if (ceil(head->weight) < arc->buckets[0].val)
-			{
-				printArc(arc);
-				printf("alloc error in first bucket: %f should be %f \n", arc->buckets[0].val, ceil(head->weight));
-			}
-			if (floor(tail->weight) < arc->buckets[arc->bcount - 1].val)
-			{
-				printArc(arc);
-				printf("alloc error in last bucket: %f should be %f \n", arc->buckets[arc->bcount - 1].val, floor(tail->weight));
-			}
-		}
-	}
-#endif
-}
-
-void verifyFaces(ReebGraph *rg)
-{
-#ifdef DEBUG_REEB
-	int total = 0;
-	ReebArc *arc = NULL;
-	for(arc = rg->arcs.first; arc; arc = arc->next)
-	{
-		total += BLI_ghash_size(arc->faces);
-	}
-	
-#endif
-}
-
 /**************************************** SYMMETRY HANDLING ******************************************/
 
 void REEB_RadialSymmetry(BNode* root_node, RadialArc* ring, int count)
@@ -1676,26 +1800,6 @@ void mergePaths(ReebGraph *rg, ReebEdge *e0, ReebEdge *e1, ReebEdge *e2)
 	glueByMergeSort(rg, a0, a2, e0, e2);
 } 
 
-ReebNode * addNode(ReebGraph *rg, EditVert *eve, float weight)
-{
-	ReebNode *node = NULL;
-	
-	node = MEM_callocN(sizeof(ReebNode), "reeb node");
-	
-	node->flag = 0; // clear flag on init
-	node->symmetry_level = 0;
-	node->arcs = NULL;
-	node->degree = 0;
-	node->weight = weight;
-	node->index = rg->totnodes;
-	VECCOPY(node->p, eve->co);	
-	
-	BLI_addtail(&rg->nodes, node);
-	rg->totnodes++;
-	
-	return node;
-}
-
 ReebEdge * createArc(ReebGraph *rg, ReebNode *node1, ReebNode *node2)
 {
 	ReebEdge *edge;
@@ -1831,23 +1935,6 @@ void addTriangleToGraph(ReebGraph *rg, ReebNode * n1, ReebNode * n2, ReebNode *
 	mergePaths(rg, e1, e2, e3);
 }
 
-ReebGraph * newReebGraph()
-{
-	ReebGraph *rg;
-	rg = MEM_callocN(sizeof(ReebGraph), "reeb graph");
-	
-	rg->totnodes = 0;
-	rg->emap = BLI_edgehash_new();
-	
-	
-	rg->free_arc = REEB_freeArc;
-	rg->free_node = NULL;
-	rg->radial_symmetry = REEB_RadialSymmetry;
-	rg->axial_symmetry = REEB_AxialSymmetry;
-	
-	return rg;
-}
-
 ReebGraph * generateReebGraph(EditMesh *em, int subdivisions)
 {
 	ReebGraph *rg;
@@ -2782,11 +2869,15 @@ void BIF_GlobalReebFree()
 
 void BIF_GlobalReebGraphFromEditMesh(void)
 {
+	ReebGraph *rg;
+	
 	BIF_GlobalReebFree();
 	
-	GLOBAL_RG = BIF_ReebGraphFromEditMesh();
+	rg = BIF_ReebGraphFromEditMesh();
 
-	BLI_markdownSymmetry((BGraph*)GLOBAL_RG, GLOBAL_RG->nodes.first, G.scene->toolsettings->skgen_symmetry_limit);
+	BLI_markdownSymmetry((BGraph*)rg, rg->nodes.first, G.scene->toolsettings->skgen_symmetry_limit);
+	
+	GLOBAL_RG = rg;
 }
 
 void REEB_draw()

From 5bee0c9a82cf08205da50b529e51021645225314 Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Fri, 4 Jul 2008 07:59:19 +0000
Subject: [PATCH 064/252] soc-2008-mxcurioni: foundations for Freestyle as a
 render layer - new UI buttons and mode flags, Freestyle API refactoring,
 modified pipeline to incorporate the new render layer. Compared to
 previously, the layer functionality is available when selecting 'Blender
 Internal' as the rendering engine. Freestyle's result is not available in the
 layer yet. I need to integrate OpenGL offscreen rendering properly (with
 framebuffer objects) to reach that goal.

---
 .../{FST_freestyle.h => FRS_freestyle.h}      |  3 +-
 .../freestyle/intern/app_blender/api.cpp      | 67 ++++++++++++-------
 source/blender/makesdna/DNA_scene_types.h     |  2 +
 source/blender/python/api2_2x/sceneRender.c   |  4 ++
 .../blender/render/intern/source/pipeline.c   | 20 +++++-
 source/blender/src/buttons_scene.c            |  9 ++-
 6 files changed, 74 insertions(+), 31 deletions(-)
 rename source/blender/freestyle/{FST_freestyle.h => FRS_freestyle.h} (60%)

diff --git a/source/blender/freestyle/FST_freestyle.h b/source/blender/freestyle/FRS_freestyle.h
similarity index 60%
rename from source/blender/freestyle/FST_freestyle.h
rename to source/blender/freestyle/FRS_freestyle.h
index 1f516078258..060ccf6961a 100644
--- a/source/blender/freestyle/FST_freestyle.h
+++ b/source/blender/freestyle/FRS_freestyle.h
@@ -5,7 +5,8 @@
 extern "C" {
 #endif	
 	
-	void FRS_execute(Render* re);
+	void FRS_prepare(Render* re);
+	void FRS_execute(Render* re, int render_in_layer);
 
 #ifdef __cplusplus
 }
diff --git a/source/blender/freestyle/intern/app_blender/api.cpp b/source/blender/freestyle/intern/app_blender/api.cpp
index 96edf7fcdba..4ca13000ccb 100644
--- a/source/blender/freestyle/intern/app_blender/api.cpp
+++ b/source/blender/freestyle/intern/app_blender/api.cpp
@@ -27,11 +27,16 @@ using namespace std;
 extern "C" {
 #endif
 
+	static Config::Path *pathconfig = NULL;
 	static Controller *controller = NULL;
 	static AppGLWidget *view = NULL;
+
 	
 	void FRS_initialize(){
 		
+		if( pathconfig == NULL )
+			pathconfig = new Config::Path;
+		
 		if( controller == NULL )
 			controller = new Controller;
 		
@@ -41,20 +46,14 @@ extern "C" {
 		controller->SetView(view);
 	}
 
-	void FRS_execute(Render* re) {
-		
-		// instanciation
-		Config::Path pathconfig;
-		FRS_initialize();
-		
-		// initialize view dimensions
-		unsigned int width = re->winx;
-		unsigned int height = re->winy;
-		view->setWidth(width);
-		view->setHeight(height);
-		view->_camera->setScreenWidthAndHeight(width, height);
-		
-		// initialize camera
+
+	void FRS_init_view(Render* re){
+		view->setWidth( re->winx );
+		view->setHeight( re->winy );
+		view->_camera->setScreenWidthAndHeight( re->winx, re->winy);
+	}
+
+	void FRS_init_camera(Render* re){
 		Object* maincam_obj = re->scene->camera;
 		Camera *cam = (Camera*) maincam_obj->data;
 
@@ -62,22 +61,23 @@ extern "C" {
 			view->_camera->setType(AppGLWidget_Camera::PERSPECTIVE);
 			view->_camera->setHorizontalFieldOfView( M_PI / 180.0f * cam->angle );
 		}
-		else if (cam->type == CAM_ORTHO){
-			view->_camera->setType(AppGLWidget_Camera::ORTHOGRAPHIC);
-			// view->_camera->setFocusDistance does not seem to work
-			// integrate cam->ortho_scale parameter
-		}
+		// else if (cam->type == CAM_ORTHO){
+		// 	view->_camera->setType(AppGLWidget_Camera::ORTHOGRAPHIC);
+		// 	// view->_camera->setFocusDistance does not seem to work
+		// 	// integrate cam->ortho_scale parameter
+		// }
 		
 		Vec camPosition(maincam_obj->obmat[3][0], maincam_obj->obmat[3][1], maincam_obj->obmat[3][2]);
 		Vec camUp( re->viewmat[0][1], re->viewmat[1][1], re->viewmat[2][1]);
 		Vec camDirection( -re->viewmat[0][2], -re->viewmat[1][2], -re->viewmat[2][2]);
 		view->_camera->setPosition(camPosition);
 		view->_camera->setUpVector(camUp);	
-		view->_camera->setViewDirection(camDirection);	
+		view->_camera->setViewDirection(camDirection);
+	}
 	
-		
+	void FRS_scene_3ds_export(Render* re) {
 		// export scene to 3ds format
-		string script_3ds_export = 	pathconfig.getProjectDir() + 
+		string script_3ds_export = 	pathconfig->getProjectDir() + 
 									Config::DIR_SEP + "python" + 
 									Config::DIR_SEP + "3ds_export.py";
 		BPY_run_python_script( const_cast<char *>(script_3ds_export.c_str()) );
@@ -94,9 +94,20 @@ extern "C" {
 			cout << "Cannot find" << exported_3ds_file << endl;
 			return;
 		}
+	}
+	
+	void FRS_prepare(Render* re) {
+		FRS_initialize();
 		
+		FRS_init_view(re);
+		FRS_init_camera(re);
+		
+		FRS_scene_3ds_export(re);
+	}
+
+	void FRS_render(Render* re) {
 		// add style module
-		string style_module = pathconfig.getProjectDir() + 
+		string style_module = pathconfig->getProjectDir() + 
 								Config::DIR_SEP + "style_modules" + 
 								Config::DIR_SEP + "contour.py";
 		controller->InsertStyleModule( 0, const_cast<char *>(style_module.c_str()) 	 );
@@ -114,12 +125,20 @@ extern "C" {
 		// copy result into render window
 		RenderResult rres;
 		RE_GetResultImage(re, &rres);
-		view->readPixels(0,0,width,height,AppGLWidget::RGBA, rres.rectf );		
+		view->readPixels(0, 0, re->winx, re->winy, AppGLWidget::RGBA, rres.rectf );		
 		re->result->renlay = render_get_active_layer(re, re->result);
 		re->display_draw(re->result, NULL);
 		
 		controller->CloseFile();
 	}
+
+	void FRS_execute(Render* re, bool render_in_layer) {
+		
+		//if(render_in_layer)
+		// set-up offscreen rendering
+		
+		FRS_render(re);
+	}
 	
 #ifdef __cplusplus
 }
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 59a7ee69527..0b224a24d4d 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -134,6 +134,7 @@ typedef struct SceneRenderLayer {
 #define SCE_LAY_EDGE	8
 #define SCE_LAY_SKY		16
 #define SCE_LAY_STRAND	32
+#define SCE_LAY_FRS		64
 	/* flags between 32 and 0x8000 are set to 1 already, for future options */
 
 #define SCE_LAY_ALL_Z		0x8000
@@ -571,6 +572,7 @@ typedef struct Scene {
 #define R_ORTHO			0x0008
 #define R_ENVMAP		0x0010
 #define R_EDGE			0x0020
+#define R_EDGE_FRS		0x2000000 // will replace R_EDGE
 #define R_FIELDS		0x0040
 #define R_FIELDSTILL	0x0080
 #define R_RADIO			0x0100
diff --git a/source/blender/python/api2_2x/sceneRender.c b/source/blender/python/api2_2x/sceneRender.c
index 2174c435405..a6f35bf4d5d 100644
--- a/source/blender/python/api2_2x/sceneRender.c
+++ b/source/blender/python/api2_2x/sceneRender.c
@@ -3487,6 +3487,10 @@ static PyGetSetDef BPy_RenderLayer_getseters[] = {
 	 (getter)RenderLayer_getLayflagBits, (setter)RenderLayer_setLayflagBits,
 	 "Render Edge-enhance in this Layer (only works for Solid faces)",
 	 (void *)SCE_LAY_EDGE},
+	{"enableFreestyle",
+	 (getter)RenderLayer_getLayflagBits, (setter)RenderLayer_setLayflagBits,
+	 "Render Freestyle in this Layer",
+	 (void *)SCE_LAY_FRS},
 	{"enableSky",
 	 (getter)RenderLayer_getLayflagBits, (setter)RenderLayer_setLayflagBits,
 	 "Render Sky or backbuffer in this Layer",
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 5b2c7114fe3..8403d237f8f 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -70,7 +70,7 @@
 
 #endif /* disable yafray */
 
-#include "FST_freestyle.h"
+#include "FRS_freestyle.h"
 
 
 /* internal */
@@ -1621,7 +1621,7 @@ void RE_TileProcessor(Render *re, int firsttile, int threaded)
 
 static void do_render_3d(Render *re)
 {
-	
+	RenderLayer *rl;
 //	re->cfra= cfra;	/* <- unused! */
 	
 	/* make render verts/faces/halos/lamps */
@@ -1632,6 +1632,17 @@ static void do_render_3d(Render *re)
 	
 	threaded_tile_processor(re);
 	
+	/* Freestyle */
+	if( re->r.mode & R_EDGE_FRS ) {
+		for(rl = re->result->layers.first; rl; rl= rl->next) {
+			if(rl->layflag & SCE_LAY_FRS) {
+				printf("Freestyle as a render layer\n");
+				FRS_prepare(re);
+				FRS_execute(re,1);
+			}
+		}
+	}
+	
 	/* do left-over 3d post effects (flares) */
 	if(re->flag & R_HALO)
 		if(!re->test_break())
@@ -2208,9 +2219,12 @@ static void freestyleRender(Render *re)
 	Mat4Invert(mat, re->scene->camera->obmat);
 	RE_SetView(re, mat);
 	
+	// Freestyle initialization
+	FRS_prepare(re);
+	
 	// run Freestyle
 	re->i.starttime = PIL_check_seconds_timer();
-	FRS_execute(re);
+	FRS_execute(re, 0);
 	re->i.lastframetime = PIL_check_seconds_timer()- re->i.starttime;
 	re->stats_draw(&re->i);
 	
diff --git a/source/blender/src/buttons_scene.c b/source/blender/src/buttons_scene.c
index 78b6abb5773..198f853393d 100644
--- a/source/blender/src/buttons_scene.c
+++ b/source/blender/src/buttons_scene.c
@@ -2108,7 +2108,8 @@ static void render_panel_output(void)
 	/* Toon shading buttons */
 	uiBlockBeginAlign(block);
 	uiDefButBitI(block, TOG, R_EDGE, B_NOP,"Edge",   115, 89, 60, 20, &G.scene->r.mode, 0, 0, 0, 0, "Enable Toon Edge-enhance");
-	uiDefBlockBut(block, edge_render_menu, NULL, "Edge Settings", 175, 89, 135, 20, "Display Edge settings");
+	uiDefBlockBut(block, edge_render_menu, NULL, "Edge Settings", 175, 89, 75, 20, "Display Edge settings");
+	uiDefButBitI(block, TOG, R_EDGE_FRS, B_NOP,"Freestyle",   250, 89, 60, 20, &G.scene->r.mode, 0, 0, 0, 0, "Enable Freestyle");
 	uiBlockEndAlign(block);
 	
 	uiBlockBeginAlign(block);
@@ -3384,8 +3385,10 @@ static void render_panel_layers(void)
 	uiDefButBitI(block, TOG, SCE_LAY_HALO, B_NOP,"Halo",	95,  85, 40, 20, &srl->layflag, 0, 0, 0, 0, "Render Halos in this Layer (on top of Solid)");	
 	uiDefButBitI(block, TOG, SCE_LAY_ZTRA, B_NOP,"Ztra",	135, 85, 40, 20, &srl->layflag, 0, 0, 0, 0, "Render Z-Transparent faces in this Layer (On top of Solid and Halos)");	
 	uiDefButBitI(block, TOG, SCE_LAY_SKY, B_NOP,"Sky",		175, 85, 40, 20, &srl->layflag, 0, 0, 0, 0, "Render Sky or backbuffer in this Layer");	
-	uiDefButBitI(block, TOG, SCE_LAY_EDGE, B_NOP,"Edge",	215, 85, 45, 20, &srl->layflag, 0, 0, 0, 0, "Render Edge-enhance in this Layer (only works for Solid faces)");	
-	uiDefButBitI(block, TOG, SCE_LAY_STRAND, B_NOP,"Strand",260, 85, 50, 20, &srl->layflag, 0, 0, 0, 0, "Render Strands in this Layer");	
+	uiDefButBitI(block, TOG, SCE_LAY_EDGE, B_NOP,"Edge",	215, 85, 25, 20, &srl->layflag, 0, 0, 0, 0, "Render Edge-enhance in this Layer (only works for Solid faces)");
+	uiDefButBitI(block, TOG, SCE_LAY_FRS, B_NOP,"FrSt",	240, 85, 30, 20, &srl->layflag, 0, 0, 0, 0, "Render Freestyle in this Layer");	
+	uiDefButBitI(block, TOG, SCE_LAY_STRAND, B_NOP,"Strand",270, 85, 40, 20, &srl->layflag, 0, 0, 0, 0, "Render Strands in this Layer");	
+	
 	
 	uiDefIDPoinBut(block, test_grouppoin_but, ID_GR, B_SET_PASS, "Light:",	50, 65, 130, 20, &(srl->light_override), "Name of Group to use as Lamps instead");
 	uiDefIDPoinBut(block, test_matpoin_but, ID_MA, B_SET_PASS, "Mat:",	180, 65, 130, 20, &(srl->mat_override), "Name of Material to use as Materials instead");

From 44e13eb8d556796df7380c3eb5b5b7f850e87287 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Fri, 4 Jul 2008 17:05:06 +0000
Subject: [PATCH 065/252] Generate and display multi resolution filtering
 graphs

---
 source/blender/include/reeb.h             |   2 +
 source/blender/makesdna/DNA_scene_types.h |  23 ++-
 source/blender/src/buttons_editing.c      |  44 ++++-
 source/blender/src/reeb.c                 | 211 ++++++++++++++++------
 4 files changed, 203 insertions(+), 77 deletions(-)

diff --git a/source/blender/include/reeb.h b/source/blender/include/reeb.h
index c6236069222..b7a6ef20105 100644
--- a/source/blender/include/reeb.h
+++ b/source/blender/include/reeb.h
@@ -48,8 +48,10 @@ typedef struct ReebGraph {
 	AxialSymmetry	axial_symmetry;
 	/*********************************/
 	
+	int resolution;
 	int totnodes;
 	struct EdgeHash *emap;
+	struct ReebGraph *link; /* for multi resolution filtering, points to higher levels */
 } ReebGraph;
 
 typedef struct EmbedBucket {
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 3255a58f68e..ddfa4c7e330 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -832,16 +832,19 @@ typedef struct Scene {
 #define RETOPO_ELLIPSE 4
 
 /* toolsettings->skgen_options */
-#define SKGEN_FILTER_INTERNAL	1
-#define SKGEN_FILTER_EXTERNAL	2
-#define	SKGEN_SYMMETRY			4
-#define	SKGEN_CUT_LENGTH		8
-#define	SKGEN_CUT_ANGLE			16
-#define	SKGEN_CUT_CORRELATION	32
-#define	SKGEN_HARMONIC			64
-#define	SKGEN_STICK_TO_EMBEDDING	128
-#define	SKGEN_ADAPTIVE_DISTANCE		512
-#define SKGEN_FILTER_SMART		1024
+#define SKGEN_FILTER_INTERNAL	(1 << 0)
+#define SKGEN_FILTER_EXTERNAL	(1 << 1)
+#define	SKGEN_SYMMETRY			(1 << 2)
+#define	SKGEN_CUT_LENGTH		(1 << 3)
+#define	SKGEN_CUT_ANGLE			(1 << 4)
+#define	SKGEN_CUT_CORRELATION	(1 << 5)
+#define	SKGEN_HARMONIC			(1 << 6)
+#define	SKGEN_STICK_TO_EMBEDDING	(1 << 7)
+#define	SKGEN_ADAPTIVE_DISTANCE		(1 << 8)
+#define SKGEN_FILTER_SMART		(1 << 9)
+#define SKGEN_DISP_LENGTH		(1 << 10)
+#define SKGEN_DISP_WEIGHT		(1 << 11)
+#define SKGEN_DISP_ORIG			(1 << 12)
 
 #define	SKGEN_SUB_LENGTH		0
 #define	SKGEN_SUB_ANGLE			1
diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c
index 171856615ef..6ce9a0d4ca3 100644
--- a/source/blender/src/buttons_editing.c
+++ b/source/blender/src/buttons_editing.c
@@ -5009,13 +5009,42 @@ static void skgen_graphfree(void *arg1, void *arg2)
 	allqueue(REDRAWVIEW3D, 0);
 }
 
+static void editing_panel_mesh_skgen_display(Object *ob, Mesh *me)
+{
+	uiBlock *block;
+	uiBut *but;
+
+	block= uiNewBlock(&curarea->uiblocks, "editing_panel_mesh_skgen_display", UI_EMBOSS, UI_HELV, curarea->win);
+	uiNewPanelTabbed("Mesh Tools More", "Skgen");
+	if(uiNewPanel(curarea, block, "Graph", "Editing", 960, 0, 318, 204)==0) return;
+	
+	but = uiDefBut(block, BUT, B_DIFF, "Generate",				1025,170,125,19, 0, 0, 0, 0, 0, "Generate Graph from Mesh");
+	uiButSetFunc(but, skgen_graphgen, NULL, NULL);
+	but = uiDefBut(block, BUT, B_DIFF, "Free",					1150,170,125,19, 0, 0, 0, 0, 0, "Free Graph from Mesh");
+	uiButSetFunc(but, skgen_graphfree, NULL, NULL);
+
+	uiBlockBeginAlign(block);
+	uiDefButS(block, NUM, B_DIFF, "Resolution:",							1025,150,225,19, &G.scene->toolsettings->skgen_resolution,10.0,1000.0, 0, 0,		"Specifies the resolution of the graph's embedding");
+	uiDefButBitS(block, TOG, SKGEN_HARMONIC, B_DIFF, 		"H",			1250,150, 25,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Apply harmonic smoothing to the weighting");
+	uiDefButBitS(block, TOG, SKGEN_FILTER_INTERNAL, B_DIFF, "Filter In",	1025,130, 83,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Filter internal small arcs from graph");
+	uiDefButF(block, NUM, B_DIFF, 							"",				1111,130,164,19, &G.scene->toolsettings->skgen_threshold_internal,0.0, 1.0, 10, 0,	"Specify the threshold ratio for filtering internal arcs");
+	uiDefButBitS(block, TOG, SKGEN_FILTER_EXTERNAL, B_DIFF, "Filter Ex",	1025,110, 53,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Filter external small arcs from graph");
+	uiDefButBitS(block, TOG, SKGEN_FILTER_SMART, 	B_DIFF, "Sm",			1078,110, 30,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Smart Filtering");
+	uiDefButF(block, NUM, B_DIFF, 							"",				1111,110,164,19, &G.scene->toolsettings->skgen_threshold_external,0.0, 1.0, 10, 0,	"Specify the threshold ratio for filtering external arcs");
+	uiBlockEndAlign(block);
+	
+	uiDefButBitS(block, TOG, SKGEN_DISP_LENGTH, REDRAWVIEW3D,	"Length",			1025, 60, 83,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,		"Show Length");
+	uiDefButBitS(block, TOG, SKGEN_DISP_WEIGHT, REDRAWVIEW3D,	"Weight",			1108, 60, 83,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,		"Show Weight");
+	uiDefButBitS(block, TOG, SKGEN_DISP_ORIG, REDRAWVIEW3D,		"Original",			1191, 60, 84,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,		"Show Original Graph");
+}
+
 static void editing_panel_mesh_skgen_retarget(Object *ob, Mesh *me)
 {
 	uiBlock *block;
 
 	block= uiNewBlock(&curarea->uiblocks, "editing_panel_mesh_skgen_retarget", UI_EMBOSS, UI_HELV, curarea->win);
-	uiNewPanelTabbed("Mesh Tools More", "Editing");
-	if(uiNewPanel(curarea, block, "Skeleton Retargetting", "Editing", 960, 0, 318, 204)==0) return;
+	uiNewPanelTabbed("Mesh Tools More", "Skgen");
+	if(uiNewPanel(curarea, block, "Retarget", "Editing", 960, 0, 318, 204)==0) return;
 	
 	uiDefBut(block, BUT, B_RETARGET_SKELETON, "Retarget Skeleton",			1025,170,250,19, 0, 0, 0, 0, 0, "Retarget Selected Armature to this Mesh");
 
@@ -5050,14 +5079,10 @@ static void editing_panel_mesh_skgen(Object *ob, Mesh *me)
 	int i;
 
 	block= uiNewBlock(&curarea->uiblocks, "editing_panel_mesh_skgen", UI_EMBOSS, UI_HELV, curarea->win);
-	uiNewPanelTabbed("Mesh Tools More", "Editing");
-	if(uiNewPanel(curarea, block, "Skeleton Generator", "Editing", 960, 0, 318, 204)==0) return;
+	uiNewPanelTabbed("Mesh Tools More", "Skgen");
+	if(uiNewPanel(curarea, block, "Generator", "Editing", 960, 0, 318, 204)==0) return;
 	
-	uiDefBut(block, BUT, B_GEN_SKELETON, "Generate Skeleton",			1025,170,125,19, 0, 0, 0, 0, 0, "Generate Skeleton from Mesh");
-	but = uiDefBut(block, BUT, B_DIFF, "Generate",				1150,170,65,19, 0, 0, 0, 0, 0, "Generate Graph from Mesh");
-	uiButSetFunc(but, skgen_graphgen, NULL, NULL);
-	but = uiDefBut(block, BUT, B_DIFF, "Free",					1215,170,60,19, 0, 0, 0, 0, 0, "Free Graph from Mesh");
-	uiButSetFunc(but, skgen_graphfree, NULL, NULL);
+	uiDefBut(block, BUT, B_GEN_SKELETON, "Generate",			1025,170,250,19, 0, 0, 0, 0, 0, "Generate Skeleton from Mesh");
 
 	uiBlockBeginAlign(block);
 	uiDefButS(block, NUM, B_DIFF, "Resolution:",							1025,150,225,19, &G.scene->toolsettings->skgen_resolution,10.0,1000.0, 0, 0,		"Specifies the resolution of the graph's embedding");
@@ -6579,6 +6604,7 @@ void editing_panels()
 			
 			editing_panel_mesh_skgen(ob, ob->data);
 			editing_panel_mesh_skgen_retarget(ob, ob->data);
+			editing_panel_mesh_skgen_display(ob, ob->data);
 			
 			editing_panel_mesh_uvautocalculation();
 			if (EM_texFaceCheck())
diff --git a/source/blender/src/reeb.c b/source/blender/src/reeb.c
index e3292403cc2..3701f825b4c 100644
--- a/source/blender/src/reeb.c
+++ b/source/blender/src/reeb.c
@@ -147,6 +147,12 @@ void REEB_freeGraph(ReebGraph *rg)
 	// free edge map
 	BLI_edgehash_free(rg->emap, NULL);
 	
+	/* free linked graph */
+	if (rg->link)
+	{
+		REEB_freeGraph(rg->link);
+	}
+	
 	MEM_freeN(rg);
 }
 
@@ -256,6 +262,9 @@ ReebGraph * copyReebGraph(ReebGraph *rg)
 	ReebNode *node;
 	ReebArc *arc;
 	ReebGraph *cp_rg = newReebGraph();
+	
+	cp_rg->resolution = rg->resolution;
+	cp_rg->link = rg;
 
 	/* Copy nodes */	
 	for (node = rg->nodes.first; node; node = node->next)
@@ -1366,6 +1375,59 @@ int filterSmartReebGraph(ReebGraph *rg, float threshold)
 	return value;
 }
 
+void filterGraph(ReebGraph *rg, short options, float threshold_internal, float threshold_external)
+{
+	int done = 1;
+
+	/* filter until there's nothing more to do */
+	while (done == 1)
+	{
+		done = 0; /* no work done yet */
+		
+		if (options & SKGEN_FILTER_EXTERNAL)
+		{
+			done |= filterExternalReebGraph(rg, threshold_external * rg->resolution);
+		}
+	
+		verifyBuckets(rg);
+	
+		if (options & SKGEN_FILTER_INTERNAL)
+		{
+			done |= filterInternalReebGraph(rg, threshold_internal * rg->resolution);
+		}
+	}
+
+	if (options & SKGEN_FILTER_SMART)
+	{
+		filterSmartReebGraph(rg, 0.5);
+		BLI_rebuildAdjacencyList((BGraph*)rg);
+		filterCyclesReebGraph(rg, 0.5);
+	}
+	
+	repositionNodes(rg);
+
+	/* Filtering might have created degree 2 nodes, so remove them */
+	removeNormalNodes(rg);
+}
+
+void finalizeGraph(ReebGraph *rg, char passes, char method)
+{
+	int i;
+	
+	BLI_rebuildAdjacencyList((BGraph*)rg);
+
+	sortNodes(rg);
+	
+	sortArcs(rg);
+	
+	for(i = 0; i <  passes; i++)
+	{
+		postprocessGraph(rg, method);
+	}
+	
+	calculateGraphLength(rg);
+}
+
 /************************************** WEIGHT SPREADING ***********************************************/
 
 int compareVerts( const void* a, const void* b )
@@ -1951,6 +2013,8 @@ ReebGraph * generateReebGraph(EditMesh *em, int subdivisions)
  	
 	rg = newReebGraph();
 	
+	rg->resolution = subdivisions;
+	
 	totvert = BLI_countlist(&em->verts);
 	totfaces = BLI_countlist(&em->faces);
 	
@@ -1959,7 +2023,7 @@ ReebGraph * generateReebGraph(EditMesh *em, int subdivisions)
 	/* Spread weight to minimize errors */
 	spreadWeight(em);
 
-	renormalizeWeight(em, (float)subdivisions);
+	renormalizeWeight(em, (float)rg->resolution);
 
 	/* Adding vertice */
 	for(index = 0, eve = em->verts.first; eve; eve = eve->next)
@@ -2746,11 +2810,69 @@ struct EmbedBucket * currentBucket(struct ReebArcIterator *iter)
 
 /************************ PUBLIC FUNCTIONS *********************************************/
 
+ReebGraph *BIF_ReebGraphMultiFromEditMesh(void)
+{
+	EditMesh *em = G.editMesh;
+	ReebGraph *rg = NULL;
+	ReebGraph *rgi;
+	
+	if (em == NULL)
+		return NULL;
+
+	if (weightFromDistance(em) == 0)
+	{
+		error("No selected vertex\n");
+		return NULL;
+	}
+	
+	renormalizeWeight(em, 1.0f);
+
+	if (G.scene->toolsettings->skgen_options & SKGEN_HARMONIC)
+	{
+		weightToHarmonic(em);
+	}
+	
+#ifdef DEBUG_REEB
+	weightToVCol(em, 0);
+#endif
+	
+	rg = generateReebGraph(em, G.scene->toolsettings->skgen_resolution);
+
+	/* Remove arcs without embedding */
+	filterNullReebGraph(rg);
+
+	repositionNodes(rg);
+
+	/* Filtering might have created degree 2 nodes, so remove them */
+	removeNormalNodes(rg);
+	
+	rg = copyReebGraph(rg);
+	
+	for (rgi = rg; rgi; rgi = rgi->link)
+	{
+		/* don't fully filter last level */
+		if (rgi->link)
+		{
+			filterGraph(rgi, G.scene->toolsettings->skgen_options, G.scene->toolsettings->skgen_threshold_internal, G.scene->toolsettings->skgen_threshold_external);
+		}
+		/* on last level, only smart filter and loop filter */
+		else
+		{
+			filterGraph(rgi, SKGEN_FILTER_SMART, 0, 0);
+		}
+
+		finalizeGraph(rgi, G.scene->toolsettings->skgen_postpro_passes, G.scene->toolsettings->skgen_postpro);
+
+		BLI_markdownSymmetry((BGraph*)rgi, rgi->nodes.first, G.scene->toolsettings->skgen_symmetry_limit);
+	}
+
+	return rg;
+}
+
 ReebGraph *BIF_ReebGraphFromEditMesh(void)
 {
 	EditMesh *em = G.editMesh;
 	ReebGraph *rg = NULL;
-	int i;
 	
 	if (em == NULL)
 		return NULL;
@@ -2795,63 +2917,17 @@ ReebGraph *BIF_ReebGraphFromEditMesh(void)
 	printf("NULL FILTERED\n");
 	printf("%i subgraphs\n", BLI_FlagSubgraphs((BGraph*)rg));
 
-	i = 1;
-	/* filter until there's nothing more to do */
-	while (i == 1)
-	{
-		i = 0; /* no work done yet */
-		
-		if (G.scene->toolsettings->skgen_options & SKGEN_FILTER_EXTERNAL)
-		{
-			i |= filterExternalReebGraph(rg, G.scene->toolsettings->skgen_threshold_external * G.scene->toolsettings->skgen_resolution);
-		}
-	
-		verifyBuckets(rg);
-	
-		if (G.scene->toolsettings->skgen_options & SKGEN_FILTER_INTERNAL)
-		{
-			i |= filterInternalReebGraph(rg, G.scene->toolsettings->skgen_threshold_internal * G.scene->toolsettings->skgen_resolution);
-		}
-	}
+	filterGraph(rg, G.scene->toolsettings->skgen_options, G.scene->toolsettings->skgen_threshold_internal, G.scene->toolsettings->skgen_threshold_external);
 
-	if (G.scene->toolsettings->skgen_options & SKGEN_FILTER_SMART)
-	{
-		filterSmartReebGraph(rg, 0.5);
-		BLI_rebuildAdjacencyList((BGraph*)rg);
-		filterCyclesReebGraph(rg, 0.5);
-	}
+	finalizeGraph(rg, G.scene->toolsettings->skgen_postpro_passes, G.scene->toolsettings->skgen_postpro);
 
+	REEB_exportGraph(rg, -1);
+	
 #ifdef DEBUG_REEB
 	arcToVCol(rg, em, 0);
 	//angleToVCol(em, 1);
 #endif
 
-	verifyBuckets(rg);
-
-	repositionNodes(rg);
-	
-	verifyBuckets(rg);
-
-	/* Filtering might have created degree 2 nodes, so remove them */
-	removeNormalNodes(rg);
-	
-	verifyBuckets(rg);
-
-	for(i = 0; i <  G.scene->toolsettings->skgen_postpro_passes; i++)
-	{
-		postprocessGraph(rg, G.scene->toolsettings->skgen_postpro);
-	}
-
-	BLI_rebuildAdjacencyList((BGraph*)rg);
-	
-	sortNodes(rg);
-	
-	sortArcs(rg);
-	
-	REEB_exportGraph(rg, -1);
-	
-	calculateGraphLength(rg);
-	
 	printf("DONE\n");
 	printf("%i subgraphs\n", BLI_FlagSubgraphs((BGraph*)rg));
 
@@ -2873,15 +2949,14 @@ void BIF_GlobalReebGraphFromEditMesh(void)
 	
 	BIF_GlobalReebFree();
 	
-	rg = BIF_ReebGraphFromEditMesh();
+	rg = BIF_ReebGraphMultiFromEditMesh();
 
-	BLI_markdownSymmetry((BGraph*)rg, rg->nodes.first, G.scene->toolsettings->skgen_symmetry_limit);
-	
 	GLOBAL_RG = rg;
 }
 
 void REEB_draw()
 {
+	ReebGraph *rg;
 	ReebArc *arc;
 	int i = 0;
 	
@@ -2890,13 +2965,23 @@ void REEB_draw()
 		return;
 	}
 	
+	if (GLOBAL_RG->link && G.scene->toolsettings->skgen_options & SKGEN_DISP_ORIG)
+	{
+		rg = GLOBAL_RG->link;
+	}
+	else
+	{
+		rg = GLOBAL_RG;
+	}
+	
 	glDisable(GL_DEPTH_TEST);
-	for (arc = GLOBAL_RG->arcs.first; arc; arc = arc->next, i++)
+	for (arc = rg->arcs.first; arc; arc = arc->next, i++)
 	{
 		ReebArcIterator iter;
 		EmbedBucket *bucket;
 		float vec[3];
-		char text[64];
+		char text[128];
+		char *s = text;
 		
 		initArcIterator(&iter, arc, arc->head);
 		
@@ -2924,7 +3009,17 @@ void REEB_draw()
 		
 		VecLerpf(vec, arc->head->p, arc->tail->p, 0.5f);
 		
-		sprintf(text, "%i - %0.3f", i, arc->tail->weight - arc->head->weight);
+		s += sprintf(s, "%i", i);
+		
+		if (G.scene->toolsettings->skgen_options & SKGEN_DISP_WEIGHT)
+		{
+			s += sprintf(s, " - %0.3f", arc->tail->weight - arc->head->weight);
+		}
+		
+		if (G.scene->toolsettings->skgen_options & SKGEN_DISP_LENGTH)
+		{
+			s += sprintf(s, " - %0.3f", arc->length);
+		}
 		
 		glColor3f(0, 1, 0);
 		glRasterPos3fv(vec);

From 5200f51a876ee6519cfdcd2e29e1a2e265244a20 Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Sat, 5 Jul 2008 06:22:15 +0000
Subject: [PATCH 066/252] soc-2008-mxcurioni: first render layer implementation
 with frame buffer objects. It does not work yet: I cannot manage to read from
 the correct buffer yet.

---
 .../intern/app_blender/AppGLWidget.cpp        | 24 +++---
 .../intern/app_blender/AppGLWidget.h          | 33 ++++----
 .../freestyle/intern/app_blender/api.cpp      | 79 +++++++++++++++----
 .../blender/render/intern/source/pipeline.c   |  9 +--
 4 files changed, 98 insertions(+), 47 deletions(-)

diff --git a/source/blender/freestyle/intern/app_blender/AppGLWidget.cpp b/source/blender/freestyle/intern/app_blender/AppGLWidget.cpp
index 2b43b2b9a0c..9a5a21ca93c 100755
--- a/source/blender/freestyle/intern/app_blender/AppGLWidget.cpp
+++ b/source/blender/freestyle/intern/app_blender/AppGLWidget.cpp
@@ -152,6 +152,9 @@ AppGLWidget::AppGLWidget(const char *iName)
   //  _backBufferFlag = true;
   _record = false;
 
+
+	workingBuffer = GL_BACK; //soc
+
 }
 
 AppGLWidget::~AppGLWidget()
@@ -402,15 +405,16 @@ void AppGLWidget::prepareCanvas()
   makeCurrent();
   glPushAttrib(GL_ALL_ATTRIB_BITS);
 
-  if(_frontBufferFlag){
-    if(_backBufferFlag)
-      glDrawBuffer(GL_FRONT_AND_BACK);
-    else
-      glDrawBuffer(GL_FRONT);
-  }
-  else if(_backBufferFlag)
-    glDrawBuffer(GL_BACK);
-  
+  // if(_frontBufferFlag){
+  //   if(_backBufferFlag)
+  //     glDrawBuffer(GL_FRONT_AND_BACK);
+  //   else
+  //     glDrawBuffer(GL_FRONT);
+  // }
+  // else if(_backBufferFlag)
+  //   glDrawBuffer(GL_BACK);
+	glDrawBuffer( workingBuffer ); //soc
+
   // Projection Matrix
   //==================
   glMatrixMode(GL_PROJECTION);
@@ -427,7 +431,7 @@ void AppGLWidget::prepareCanvas()
 void AppGLWidget::releaseCanvas()
 {
   makeCurrent();
-  glDrawBuffer(GL_BACK);
+  glDrawBuffer( workingBuffer ); //soc
   glPopAttrib();
 }
 
diff --git a/source/blender/freestyle/intern/app_blender/AppGLWidget.h b/source/blender/freestyle/intern/app_blender/AppGLWidget.h
index bc18be00a31..447eece30c9 100755
--- a/source/blender/freestyle/intern/app_blender/AppGLWidget.h
+++ b/source/blender/freestyle/intern/app_blender/AppGLWidget.h
@@ -91,6 +91,7 @@ public:
 	
 
 		AppGLWidget_Camera * _camera;
+		int workingBuffer;
 
 protected:
 	unsigned int _width, _height;
@@ -342,7 +343,7 @@ public:
   {
     makeCurrent();
     //glReadBuffer(GL_FRONT); //in reality: glReadBuffer and glDrawBuffer are both set to GL_BACK
-    glReadBuffer(GL_BACK);
+    //glReadBuffer(GL_BACK);
     GLenum glformat;
     switch(format)
     {
@@ -371,21 +372,21 @@ public:
     BACK
   } GLBuffer;
 
-  void setReadPixelsBuffer(int iBuffer) 
-  {
-    makeCurrent();
-    switch(iBuffer)
-    {
-    case FRONT:
-      glReadBuffer(GL_FRONT);
-      break;
-    case BACK:
-      glReadBuffer(GL_BACK);
-      break;
-    default:
-      break;
-    }
-  }
+  // void setReadPixelsBuffer(int iBuffer) 
+  // {
+  //   makeCurrent();
+  //   switch(iBuffer)
+  //   {
+  //   case FRONT:
+  //     glReadBuffer(GL_FRONT);
+  //     break;
+  //   case BACK:
+  //     glReadBuffer(GL_BACK);
+  //     break;
+  //   default:
+  //     break;
+  //   }
+  // }
 
   BBox<Vec3r> scene3DBBox() const { return _ModelRootNode->bbox(); }
 
diff --git a/source/blender/freestyle/intern/app_blender/api.cpp b/source/blender/freestyle/intern/app_blender/api.cpp
index 4ca13000ccb..fc0e6764710 100644
--- a/source/blender/freestyle/intern/app_blender/api.cpp
+++ b/source/blender/freestyle/intern/app_blender/api.cpp
@@ -105,7 +105,14 @@ extern "C" {
 		FRS_scene_3ds_export(re);
 	}
 
-	void FRS_render(Render* re) {
+	void FRS_render(Render* re, int render_in_layer) {
+		
+		if(render_in_layer) {
+			view->workingBuffer = GL_COLOR_ATTACHMENT0_EXT;
+		} else {
+			view->workingBuffer = GL_BACK;
+		}
+		
 		// add style module
 		string style_module = pathconfig->getProjectDir() + 
 								Config::DIR_SEP + "style_modules" + 
@@ -121,23 +128,67 @@ extern "C" {
 		
 		// render final result
 		view->draw(); 
-		
-		// copy result into render window
-		RenderResult rres;
-		RE_GetResultImage(re, &rres);
-		view->readPixels(0, 0, re->winx, re->winy, AppGLWidget::RGBA, rres.rectf );		
-		re->result->renlay = render_get_active_layer(re, re->result);
-		re->display_draw(re->result, NULL);
-		
-		controller->CloseFile();
 	}
 
-	void FRS_execute(Render* re, bool render_in_layer) {
+	void FRS_execute(Render* re, int render_in_layer) {
 		
-		//if(render_in_layer)
-		// set-up offscreen rendering
+		GLuint framebuffer, renderbuffer;
+		GLenum status;
+		RenderLayer *rl;
 		
-		FRS_render(re);
+		if(render_in_layer) {
+			cout << "Freestyle as a render layer - SETUP" << endl;
+		
+			// set up frame buffer
+			glGenFramebuffersEXT(1, &framebuffer);
+			glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, framebuffer);
+
+			// set up render buffer
+			glGenRenderbuffersEXT(1, &renderbuffer);
+			glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, renderbuffer);
+			glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_RGBA8, re->winx, re->winy);
+			glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_RENDERBUFFER_EXT, renderbuffer);
+
+			// status verification 
+			status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
+			if (status != GL_FRAMEBUFFER_COMPLETE_EXT){
+				cout << "Framebuffer setup error" << endl;
+				return;
+			}
+			
+			glDrawBuffer(GL_COLOR_ATTACHMENT0_EXT);
+			
+		} else {
+			glDrawBuffer(GL_BACK);
+		}
+		
+		FRS_render(re, render_in_layer);
+		
+		if(render_in_layer) {
+			for(rl = (RenderLayer *)re->result->layers.first; rl; rl= rl->next) {
+				if(rl->layflag & SCE_LAY_FRS) {
+					cout << "Freestyle as a render layer - RESULT" << endl;
+
+					// transfer render to layer
+					glReadBuffer(GL_COLOR_ATTACHMENT0_EXT);
+					glReadPixels(0, 0, re->winx, re->winy, GL_RGBA, GL_FLOAT, rl->rectf );
+
+					// bind window
+					glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+					glDeleteRenderbuffersEXT(1, &renderbuffer);
+					glDeleteFramebuffersEXT(1, &framebuffer);
+				}
+			}
+		} else {
+			// copy result into render window
+			RenderResult rres;
+			RE_GetResultImage(re, &rres);
+			view->readPixels(0, 0, re->winx, re->winy, AppGLWidget::RGBA, rres.rectf );		
+			re->result->renlay = render_get_active_layer(re, re->result);
+			re->display_draw(re->result, NULL);
+		}
+		
+		controller->CloseFile();
 	}
 	
 #ifdef __cplusplus
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 8403d237f8f..d91736e9a10 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -1634,13 +1634,8 @@ static void do_render_3d(Render *re)
 	
 	/* Freestyle */
 	if( re->r.mode & R_EDGE_FRS ) {
-		for(rl = re->result->layers.first; rl; rl= rl->next) {
-			if(rl->layflag & SCE_LAY_FRS) {
-				printf("Freestyle as a render layer\n");
-				FRS_prepare(re);
-				FRS_execute(re,1);
-			}
-		}
+		FRS_prepare(re);
+		FRS_execute(re,1);
 	}
 	
 	/* do left-over 3d post effects (flares) */

From 65c9dfe436a9debb71f79a77f9eb0ec49cb8f4cd Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Sat, 5 Jul 2008 08:50:41 +0000
Subject: [PATCH 067/252] soc-2008-mxcurioni: render layer with FBOs -> render
 buffers, version 2. Still not working.

---
 .../intern/app_blender/AppGLWidget.cpp        |  4 +--
 .../freestyle/intern/app_blender/api.cpp      | 27 +++++++++++--------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/source/blender/freestyle/intern/app_blender/AppGLWidget.cpp b/source/blender/freestyle/intern/app_blender/AppGLWidget.cpp
index 9a5a21ca93c..16fb5eae57e 100755
--- a/source/blender/freestyle/intern/app_blender/AppGLWidget.cpp
+++ b/source/blender/freestyle/intern/app_blender/AppGLWidget.cpp
@@ -413,7 +413,7 @@ void AppGLWidget::prepareCanvas()
   // }
   // else if(_backBufferFlag)
   //   glDrawBuffer(GL_BACK);
-	glDrawBuffer( workingBuffer ); //soc
+	//glDrawBuffer( workingBuffer ); //soc
 
   // Projection Matrix
   //==================
@@ -431,7 +431,7 @@ void AppGLWidget::prepareCanvas()
 void AppGLWidget::releaseCanvas()
 {
   makeCurrent();
-  glDrawBuffer( workingBuffer ); //soc
+  //glDrawBuffer( workingBuffer ); //soc
   glPopAttrib();
 }
 
diff --git a/source/blender/freestyle/intern/app_blender/api.cpp b/source/blender/freestyle/intern/app_blender/api.cpp
index fc0e6764710..dfb8c073bdc 100644
--- a/source/blender/freestyle/intern/app_blender/api.cpp
+++ b/source/blender/freestyle/intern/app_blender/api.cpp
@@ -132,7 +132,7 @@ extern "C" {
 
 	void FRS_execute(Render* re, int render_in_layer) {
 		
-		GLuint framebuffer, renderbuffer;
+		GLuint framebuffer, renderbuffers[2];
 		GLenum status;
 		RenderLayer *rl;
 		
@@ -143,23 +143,28 @@ extern "C" {
 			glGenFramebuffersEXT(1, &framebuffer);
 			glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, framebuffer);
 
-			// set up render buffer
-			glGenRenderbuffersEXT(1, &renderbuffer);
-			glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, renderbuffer);
-			glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_RGBA8, re->winx, re->winy);
-			glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_RENDERBUFFER_EXT, renderbuffer);
+			// set up render buffer: one color buffer, one depth buffer
+			glGenRenderbuffersEXT(2, renderbuffers);
+			
+			glBindRenderbufferEXT(GL_RENDERBUFFER_EXT,	renderbuffers[0]);
+			glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_RGB, re->winx, re->winy);
+			glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_RENDERBUFFER_EXT, renderbuffers[0]);
+			
+			glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, renderbuffers[1]);
+			glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_DEPTH_COMPONENT, re->winx, re->winy);
+			glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, renderbuffers[1]);
 
 			// status verification 
 			status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
 			if (status != GL_FRAMEBUFFER_COMPLETE_EXT){
 				cout << "Framebuffer setup error" << endl;
+				glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+				glDeleteRenderbuffersEXT(2, renderbuffers);
+				glDeleteFramebuffersEXT(1, &framebuffer);
 				return;
 			}
 			
 			glDrawBuffer(GL_COLOR_ATTACHMENT0_EXT);
-			
-		} else {
-			glDrawBuffer(GL_BACK);
 		}
 		
 		FRS_render(re, render_in_layer);
@@ -168,14 +173,14 @@ extern "C" {
 			for(rl = (RenderLayer *)re->result->layers.first; rl; rl= rl->next) {
 				if(rl->layflag & SCE_LAY_FRS) {
 					cout << "Freestyle as a render layer - RESULT" << endl;
-
+					
 					// transfer render to layer
 					glReadBuffer(GL_COLOR_ATTACHMENT0_EXT);
 					glReadPixels(0, 0, re->winx, re->winy, GL_RGBA, GL_FLOAT, rl->rectf );
 
 					// bind window
 					glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
-					glDeleteRenderbuffersEXT(1, &renderbuffer);
+					glDeleteRenderbuffersEXT(2, renderbuffers);
 					glDeleteFramebuffersEXT(1, &framebuffer);
 				}
 			}

From d50fbd65685895d9edab98de02c3004ef14ddb13 Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Sat, 5 Jul 2008 11:13:57 +0000
Subject: [PATCH 068/252] soc-2008-mxcurioni: render buffer format

---
 source/blender/freestyle/intern/app_blender/api.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/source/blender/freestyle/intern/app_blender/api.cpp b/source/blender/freestyle/intern/app_blender/api.cpp
index dfb8c073bdc..1a56f5aa587 100644
--- a/source/blender/freestyle/intern/app_blender/api.cpp
+++ b/source/blender/freestyle/intern/app_blender/api.cpp
@@ -1,4 +1,3 @@
-
 #include "AppGLWidget.h"
 #include "Controller.h"
 #include "AppConfig.h"
@@ -147,7 +146,7 @@ extern "C" {
 			glGenRenderbuffersEXT(2, renderbuffers);
 			
 			glBindRenderbufferEXT(GL_RENDERBUFFER_EXT,	renderbuffers[0]);
-			glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_RGB, re->winx, re->winy);
+			glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_RGBA, re->winx, re->winy);
 			glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_RENDERBUFFER_EXT, renderbuffers[0]);
 			
 			glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, renderbuffers[1]);
@@ -164,7 +163,7 @@ extern "C" {
 				return;
 			}
 			
-			glDrawBuffer(GL_COLOR_ATTACHMENT0_EXT);
+			glDrawBuffer(GL_COLOR_ATTACHMENT0_EXT); // really needed ?
 		}
 		
 		FRS_render(re, render_in_layer);

From 85611d10451c1b14a89271c2cf53a9f268c89ede Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Sat, 5 Jul 2008 11:16:03 +0000
Subject: [PATCH 069/252] soc-2008-mxcurioni: render buffer modification

---
 source/blender/freestyle/intern/app_blender/api.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/source/blender/freestyle/intern/app_blender/api.cpp b/source/blender/freestyle/intern/app_blender/api.cpp
index 1a56f5aa587..737ae0c6625 100644
--- a/source/blender/freestyle/intern/app_blender/api.cpp
+++ b/source/blender/freestyle/intern/app_blender/api.cpp
@@ -163,6 +163,8 @@ extern "C" {
 				return;
 			}
 			
+			glPushAttrib(GL_VIEWPORT_BIT); 
+			glViewport(0, 0, re->winx, re->winy);
 			glDrawBuffer(GL_COLOR_ATTACHMENT0_EXT); // really needed ?
 		}
 		
@@ -179,6 +181,8 @@ extern "C" {
 
 					// bind window
 					glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+					glDrawBuffer(GL_BACK);
+					glPopAttrib();
 					glDeleteRenderbuffersEXT(2, renderbuffers);
 					glDeleteFramebuffersEXT(1, &framebuffer);
 				}

From de286af3f1f8fa42aaaaed6c0214531ed3cc6114 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Sat, 5 Jul 2008 22:01:46 +0000
Subject: [PATCH 070/252] Filter according to arc length, not weight different
 (more logic physical filtering)

---
 source/blender/blenlib/BLI_graph.h    |  1 +
 source/blender/blenlib/intern/graph.c |  9 +++--
 source/blender/src/reeb.c             | 48 +++++++++++++++------------
 3 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/source/blender/blenlib/BLI_graph.h b/source/blender/blenlib/BLI_graph.h
index 44131fbbff8..a814b6f8c96 100644
--- a/source/blender/blenlib/BLI_graph.h
+++ b/source/blender/blenlib/BLI_graph.h
@@ -66,6 +66,7 @@ typedef struct RadialArc
 BNode *BLI_otherNode(BArc *arc, BNode *node);
 
 void BLI_freeNode(BGraph *graph, BNode *node);
+void BLI_removeNode(BGraph *graph, BNode *node);
 
 void BLI_flagNodes(BGraph *graph, int flag);
 void BLI_flagArcs(BGraph *graph, int flag);
diff --git a/source/blender/blenlib/intern/graph.c b/source/blender/blenlib/intern/graph.c
index 8c7e8ce8cd6..1371e59a77a 100644
--- a/source/blender/blenlib/intern/graph.c
+++ b/source/blender/blenlib/intern/graph.c
@@ -53,6 +53,12 @@ void BLI_freeNode(BGraph *graph, BNode *node)
 	}
 }
 
+void BLI_removeNode(BGraph *graph, BNode *node)
+{
+	BLI_freeNode(graph, node);
+	BLI_freelinkN(&graph->nodes, node);
+}
+
 BNode *BLI_otherNode(BArc *arc, BNode *node)
 {
 	return (arc->head == node) ? arc->tail : arc->head;
@@ -194,8 +200,7 @@ void BLI_removeDoubleNodes(BGraph *graph, float limit)
 			{
 				BLI_replaceNode(graph, node_src, node_replaced);
 				
-				BLI_freeNode(graph, node_replaced);
-				BLI_freelinkN(&graph->nodes, node_replaced);
+				BLI_removeNode(graph, node_replaced);
 			}
 		}
 	}
diff --git a/source/blender/src/reeb.c b/source/blender/src/reeb.c
index 3701f825b4c..c47ae155a3a 100644
--- a/source/blender/src/reeb.c
+++ b/source/blender/src/reeb.c
@@ -127,11 +127,7 @@ void REEB_freeGraph(ReebGraph *rg)
 	// free nodes
 	for( node = rg->nodes.first; node; node = node->next )
 	{
-		// Free adjacency lists
-		if (node->arcs != NULL)
-		{
-			MEM_freeN(node->arcs);
-		}
+		BLI_freeNode((BGraph*)rg, (BNode*)node);
 	}
 	BLI_freelistN(&rg->nodes);
 	
@@ -896,10 +892,14 @@ void sortArcs(ReebGraph *rg)
 
 float lengthArc(ReebArc *arc)
 {
+#if 0
 	ReebNode *head = (ReebNode*)arc->head;
 	ReebNode *tail = (ReebNode*)arc->tail;
 	
 	return tail->weight - head->weight;
+#else
+	return arc->length;
+#endif
 }
 
 int compareArcs(void *varc1, void *varc2)
@@ -1031,7 +1031,7 @@ void filterNullReebGraph(ReebGraph *rg)
 			BLI_remlink(&rg->arcs, arc);
 			REEB_freeArc((BArc*)arc);
 			
-			BLI_freelinkN(&rg->nodes, removedNode);
+			BLI_removeNode((BGraph*)rg, (BNode*)removedNode);
 		}
 		
 		arc = nextArc;
@@ -1051,7 +1051,7 @@ int filterInternalReebGraph(ReebGraph *rg, float threshold)
 		nextArc = arc->next;
 
 		// Only collapse non-terminal arcs that are shorter than threshold
-		if ((arc->head->degree > 1 && arc->tail->degree > 1 && ((ReebNode*)arc->tail)->weight - ((ReebNode*)arc->head)->weight < threshold))
+		if (arc->head->degree > 1 && arc->tail->degree > 1 && (lengthArc(arc) < threshold))
 		{
 			ReebNode *newNode = NULL;
 			ReebNode *removedNode = NULL;
@@ -1082,7 +1082,7 @@ int filterInternalReebGraph(ReebGraph *rg, float threshold)
 			BLI_remlink(&rg->arcs, arc);
 			REEB_freeArc((BArc*)arc);
 			
-			BLI_freelinkN(&rg->nodes, removedNode);
+			BLI_removeNode((BGraph*)rg, (BNode*)removedNode);
 			value = 1;
 		}
 		
@@ -1099,13 +1099,13 @@ int filterExternalReebGraph(ReebGraph *rg, float threshold)
 	
 	BLI_sortlist(&rg->arcs, compareArcs);
 
-	arc = rg->arcs.first;
-	while(arc)
+	
+	for (arc = rg->arcs.first; arc; arc = nextArc)
 	{
 		nextArc = arc->next;
 
 		// Only collapse terminal arcs that are shorter than threshold
-		if ((arc->head->degree == 1 || arc->tail->degree == 1) && ((ReebNode*)arc->tail)->weight - ((ReebNode*)arc->head)->weight < threshold)
+		if ((arc->head->degree == 1 || arc->tail->degree == 1) && (lengthArc(arc) < threshold))
 		{
 			ReebNode *terminalNode = NULL;
 			ReebNode *middleNode = NULL;
@@ -1125,9 +1125,10 @@ int filterExternalReebGraph(ReebGraph *rg, float threshold)
 				middleNode = arc->head;
 			}
 			
-			// If middle node is a normal node, merge to terminal node
+			// If middle node is a normal node, it will be removed later
 			if (middleNode->degree == 2)
 			{
+//				continue;
 				merging = 1;
 				newNode = terminalNode;
 				removedNode = middleNode;
@@ -1158,12 +1159,13 @@ int filterExternalReebGraph(ReebGraph *rg, float threshold)
 			BLI_remlink(&rg->arcs, arc);
 			REEB_freeArc((BArc*)arc);
 			
-			BLI_freelinkN(&rg->nodes, removedNode);
+			BLI_removeNode((BGraph*)rg, (BNode*)removedNode);
 			value = 1;
 		}
-		
-		arc = nextArc;
 	}
+
+	/* join on normal nodes */	
+	removeNormalNodes(rg);
 	
 	return value;
 }
@@ -1378,6 +1380,8 @@ int filterSmartReebGraph(ReebGraph *rg, float threshold)
 void filterGraph(ReebGraph *rg, short options, float threshold_internal, float threshold_external)
 {
 	int done = 1;
+	
+	calculateGraphLength(rg);
 
 	/* filter until there's nothing more to do */
 	while (done == 1)
@@ -1386,14 +1390,14 @@ void filterGraph(ReebGraph *rg, short options, float threshold_internal, float t
 		
 		if (options & SKGEN_FILTER_EXTERNAL)
 		{
-			done |= filterExternalReebGraph(rg, threshold_external * rg->resolution);
+//			done |= filterExternalReebGraph(rg, threshold_external * rg->resolution);
+			done |= filterExternalReebGraph(rg, threshold_external);
 		}
 	
-		verifyBuckets(rg);
-	
 		if (options & SKGEN_FILTER_INTERNAL)
 		{
-			done |= filterInternalReebGraph(rg, threshold_internal * rg->resolution);
+//			done |= filterInternalReebGraph(rg, threshold_internal * rg->resolution);
+			done |= filterInternalReebGraph(rg, threshold_internal);
 		}
 	}
 
@@ -1424,8 +1428,6 @@ void finalizeGraph(ReebGraph *rg, char passes, char method)
 	{
 		postprocessGraph(rg, method);
 	}
-	
-	calculateGraphLength(rg);
 }
 
 /************************************** WEIGHT SPREADING ***********************************************/
@@ -1703,6 +1705,8 @@ int mergeConnectedArcs(ReebGraph *rg, ReebArc *a0, ReebArc *a1)
 	int result = 0;
 	ReebNode *removedNode = NULL;
 	
+	a0->length += a1->length;
+	
 	mergeArcEdges(rg, a0, a1, MERGE_APPEND);
 	mergeArcFaces(rg, a0, a1);
 	
@@ -1726,7 +1730,7 @@ int mergeConnectedArcs(ReebGraph *rg, ReebArc *a0, ReebArc *a1)
 	BLI_remlink(&rg->arcs, a1);
 	REEB_freeArc((BArc*)a1);
 	
-	BLI_freelinkN(&rg->nodes, removedNode);
+	BLI_removeNode((BGraph*)rg, (BNode*)removedNode);
 	result = 1;
 	
 	return result;

From f139e1f1b4a496b193d988cdde02e290dc8cb478 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Mon, 7 Jul 2008 17:27:22 +0000
Subject: [PATCH 071/252] Reeb multiresolution filtering, now with more than
 one level

---
 source/blender/include/reeb.h             |  1 +
 source/blender/makesdna/DNA_scene_types.h |  3 +++
 source/blender/src/autoarmature.c         |  6 +++--
 source/blender/src/buttons_editing.c      |  2 ++
 source/blender/src/reeb.c                 | 28 ++++++++++++++++-------
 5 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/source/blender/include/reeb.h b/source/blender/include/reeb.h
index b7a6ef20105..384e8d82b48 100644
--- a/source/blender/include/reeb.h
+++ b/source/blender/include/reeb.h
@@ -158,6 +158,7 @@ void verifyFaces(ReebGraph *rg);
 
 /*********************** PUBLIC *********************************/
 ReebGraph *BIF_ReebGraphFromEditMesh(void);
+ReebGraph *BIF_ReebGraphMultiFromEditMesh(void);
 
 void BIF_GlobalReebGraphFromEditMesh(void);
 void BIF_GlobalReebFree(void);
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index ddfa4c7e330..c235cfe2b31 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -440,6 +440,9 @@ typedef struct ToolSettings {
 	char  skgen_postpro;
 	char  skgen_postpro_passes;
 	char  skgen_subdivisions[3];
+	char  skgen_multi_level;
+	
+	char tpad[7];
 	
 	/* Alt+RMB option */
 	char edge_mode;
diff --git a/source/blender/src/autoarmature.c b/source/blender/src/autoarmature.c
index 2a139137a8e..4b0136092fd 100644
--- a/source/blender/src/autoarmature.c
+++ b/source/blender/src/autoarmature.c
@@ -1354,9 +1354,11 @@ void BIF_retargetArmature()
 	Base *base;
 	ReebGraph *reebg;
 	
-	reebg = BIF_ReebGraphFromEditMesh();
+	//reebg = BIF_ReebGraphFromEditMesh();
+	//BLI_markdownSymmetry((BGraph*)reebg, reebg->nodes.first, G.scene->toolsettings->skgen_symmetry_limit);
+	
+	reebg = BIF_ReebGraphMultiFromEditMesh();
 	
-	BLI_markdownSymmetry((BGraph*)reebg, reebg->nodes.first, G.scene->toolsettings->skgen_symmetry_limit);
 	
 	printf("Reeb Graph created\n");
 
diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c
index 6ce9a0d4ca3..7c8152b037d 100644
--- a/source/blender/src/buttons_editing.c
+++ b/source/blender/src/buttons_editing.c
@@ -5036,6 +5036,8 @@ static void editing_panel_mesh_skgen_display(Object *ob, Mesh *me)
 	uiDefButBitS(block, TOG, SKGEN_DISP_LENGTH, REDRAWVIEW3D,	"Length",			1025, 60, 83,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,		"Show Length");
 	uiDefButBitS(block, TOG, SKGEN_DISP_WEIGHT, REDRAWVIEW3D,	"Weight",			1108, 60, 83,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,		"Show Weight");
 	uiDefButBitS(block, TOG, SKGEN_DISP_ORIG, REDRAWVIEW3D,		"Original",			1191, 60, 84,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,		"Show Original Graph");
+
+	uiDefButC(block, NUM, REDRAWVIEW3D, 						"Level:",			1025, 40, 125,19, &G.scene->toolsettings->skgen_multi_level, 0, 5, 1, 0,"Specify the level to draw");
 }
 
 static void editing_panel_mesh_skgen_retarget(Object *ob, Mesh *me)
diff --git a/source/blender/src/reeb.c b/source/blender/src/reeb.c
index c47ae155a3a..20c9da75bb2 100644
--- a/source/blender/src/reeb.c
+++ b/source/blender/src/reeb.c
@@ -2066,13 +2066,16 @@ ReebGraph * generateReebGraph(EditMesh *em, int subdivisions)
 			countfaces++;
 			if (countfaces % 100 == 0)
 			{
-				printf("face %i of %i\n", countfaces, totfaces);
+				printf("\rface %i of %i", countfaces, totfaces);
 				verifyFaces(rg);
 			}
 #endif
 		}
-		
 	}
+	
+	printf("\n");
+	
+	
 	BLI_listbase_from_dlist(dlist, &rg->nodes);
 	
 	removeNormalNodes(rg);
@@ -2466,12 +2469,13 @@ int weightFromDistance(EditMesh *em)
 							current_eve->tmp.fp = currentWeight;
 						}
 						
+					printf("\redge %i / %i", eIndex, totedge);
 						
 					} while (select_eed != NULL);
 					
 					MEM_freeN(edges);
 					
-					printf("%i / %i\n", eIndex, totedge);
+					printf("\n");
 				}
 			}
 		}
@@ -2819,6 +2823,7 @@ ReebGraph *BIF_ReebGraphMultiFromEditMesh(void)
 	EditMesh *em = G.editMesh;
 	ReebGraph *rg = NULL;
 	ReebGraph *rgi;
+	int i, nb_levels = 5;
 	
 	if (em == NULL)
 		return NULL;
@@ -2850,14 +2855,19 @@ ReebGraph *BIF_ReebGraphMultiFromEditMesh(void)
 	/* Filtering might have created degree 2 nodes, so remove them */
 	removeNormalNodes(rg);
 	
-	rg = copyReebGraph(rg);
+	for (i = 0; i < nb_levels; i++)
+	{
+		rg = copyReebGraph(rg);
+	}
 	
-	for (rgi = rg; rgi; rgi = rgi->link)
+	for (rgi = rg, i = nb_levels; rgi; rgi = rgi->link, i--)
 	{
 		/* don't fully filter last level */
 		if (rgi->link)
 		{
-			filterGraph(rgi, G.scene->toolsettings->skgen_options, G.scene->toolsettings->skgen_threshold_internal, G.scene->toolsettings->skgen_threshold_external);
+			float internal_threshold = G.scene->toolsettings->skgen_threshold_internal * (i / (float)nb_levels);
+			float external_threshold = G.scene->toolsettings->skgen_threshold_external * (i / (float)nb_levels);
+			filterGraph(rgi, G.scene->toolsettings->skgen_options, internal_threshold, external_threshold);
 		}
 		/* on last level, only smart filter and loop filter */
 		else
@@ -2971,11 +2981,13 @@ void REEB_draw()
 	
 	if (GLOBAL_RG->link && G.scene->toolsettings->skgen_options & SKGEN_DISP_ORIG)
 	{
-		rg = GLOBAL_RG->link;
+		for (rg = GLOBAL_RG; rg->link; rg = rg->link) ;
 	}
 	else
 	{
-		rg = GLOBAL_RG;
+		i = G.scene->toolsettings->skgen_multi_level;
+		
+		for (rg = GLOBAL_RG; i && rg->link; i--, rg = rg->link) ;
 	}
 	
 	glDisable(GL_DEPTH_TEST);

From 52219d52dd5e4902f38d9be4d07f39e67ba461b2 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Mon, 7 Jul 2008 20:31:53 +0000
Subject: [PATCH 072/252] First draft: Use multiresolution graph for
 retargetting (enables bypassing small appendages that don't correspond to
 anything on the armature).

---
 source/blender/blenlib/BLI_graph.h    |  2 +
 source/blender/blenlib/intern/graph.c | 38 ++++++------
 source/blender/include/reeb.h         |  2 +
 source/blender/src/autoarmature.c     | 13 ++++-
 source/blender/src/buttons_editing.c  | 12 ++--
 source/blender/src/reeb.c             | 83 ++++++++++++++++++++++++---
 6 files changed, 118 insertions(+), 32 deletions(-)

diff --git a/source/blender/blenlib/BLI_graph.h b/source/blender/blenlib/BLI_graph.h
index a814b6f8c96..ae99ad5f5c7 100644
--- a/source/blender/blenlib/BLI_graph.h
+++ b/source/blender/blenlib/BLI_graph.h
@@ -78,6 +78,8 @@ void BLI_freeAdjacencyList(BGraph *rg);
 
 int BLI_FlagSubgraphs(BGraph *graph);
 
+int BLI_subtreeShape(BNode *node, BArc *rootArc, int include_root);
+
 void BLI_replaceNode(BGraph *graph, BNode *node_src, BNode *node_replaced);
 void BLI_removeDoubleNodes(BGraph *graph, float limit);
 
diff --git a/source/blender/blenlib/intern/graph.c b/source/blender/blenlib/intern/graph.c
index 1371e59a77a..2aea9bc0a4a 100644
--- a/source/blender/blenlib/intern/graph.c
+++ b/source/blender/blenlib/intern/graph.c
@@ -321,34 +321,40 @@ BArc * BLI_findConnectedArc(BGraph *graph, BArc *arc, BNode *v)
 
 /*********************************** GRAPH AS TREE FUNCTIONS *******************************************/
 
-int BLI_subtreeShape(BNode *node, BArc *rootArc)
+int BLI_subtreeShape(BNode *node, BArc *rootArc, int include_root)
 {
 	int depth = 0;
 	
-	/* Base case, no arcs leading away */
-	if (node->arcs == NULL || *(node->arcs) == NULL)
+	if (include_root)
 	{
-		return 0;
+		BNode *newNode = BLI_otherNode(rootArc, node);
+		depth = BLI_subtreeShape(newNode, rootArc, 0);
 	}
 	else
 	{
-		int i;
-
-		for(i = 0; i < node->degree; i++)
+		/* Base case, no arcs leading away */
+		if (node->arcs == NULL || *(node->arcs) == NULL)
 		{
-			BArc *arc = node->arcs[i];
-			
-			/* only arcs that go down the tree */
-			if (arc != rootArc)
+			return 0;
+		}
+		else
+		{
+			int i;
+	
+			for(i = 0; i < node->degree; i++)
 			{
-				BNode *newNode = BLI_otherNode(arc, node);
-				//depth = MAX2(depth, BLI_subtreeShape(newNode, arc));
-				depth += BLI_subtreeShape(newNode, arc);
+				BArc *arc = node->arcs[i];
+				
+				/* only arcs that go down the tree */
+				if (arc != rootArc)
+				{
+					BNode *newNode = BLI_otherNode(arc, node);
+					depth += BLI_subtreeShape(newNode, arc, 0);
+				}
 			}
 		}
 	}
 	
-	//return depth + 1;
 	return 10 * depth + 1;
 }
 
@@ -776,7 +782,7 @@ void markdownSymmetryArc(BGraph *graph, BArc *arc, BNode *node, int level, float
 			BNode *connectedNode = BLI_otherNode(connectedArc, node);
 			
 			/* symmetry level is positive value, negative values is subtree depth */
-			connectedArc->symmetry_level = -BLI_subtreeShape(connectedNode, connectedArc);
+			connectedArc->symmetry_level = -BLI_subtreeShape(connectedNode, connectedArc, 0);
 		}
 	}
 
diff --git a/source/blender/include/reeb.h b/source/blender/include/reeb.h
index 384e8d82b48..d4a5187df0f 100644
--- a/source/blender/include/reeb.h
+++ b/source/blender/include/reeb.h
@@ -163,6 +163,8 @@ ReebGraph *BIF_ReebGraphMultiFromEditMesh(void);
 void BIF_GlobalReebGraphFromEditMesh(void);
 void BIF_GlobalReebFree(void);
 
+ReebNode *BIF_otherNodeFromIndex(ReebArc *arc, ReebNode *node);
+
 void REEB_freeGraph(ReebGraph *rg);
 void REEB_exportGraph(ReebGraph *rg, int count);
 void REEB_draw();
diff --git a/source/blender/src/autoarmature.c b/source/blender/src/autoarmature.c
index 4b0136092fd..826e81259d9 100644
--- a/source/blender/src/autoarmature.c
+++ b/source/blender/src/autoarmature.c
@@ -1257,11 +1257,22 @@ static void findCorrespondingArc(RigArc *start_arc, RigNode *start_node, RigArc
 			next_earc->symmetry_group == symmetry_group &&
 			next_earc->symmetry_level == symmetry_level)
 		{
+			int ishape, eshape;
 
 			printf("-----------------------\n");
 			printf("CORRESPONDING ARC FOUND\n");
 			RIG_printArcBones(next_iarc);
 			printf("flag %i -- symmetry level %i -- symmetry flag %i\n", next_earc->flag, next_earc->symmetry_level, next_earc->symmetry_flag);
+			
+			ishape = BLI_subtreeShape((BNode*)start_node, (BArc*)next_iarc, 1);
+			eshape = BLI_subtreeShape((BNode*)enode, (BArc*)next_earc, 1);
+			
+			while (ishape > eshape && next_earc->link)
+			{
+				next_earc = next_earc->link;
+				enode = next_earc->head; //enode->link;
+				eshape = BLI_subtreeShape((BNode*)enode, (BArc*)next_earc, 1);
+			} 
 
 			next_earc->flag = 1; // mark as taken
 			next_iarc->link = next_earc;
@@ -1299,7 +1310,7 @@ static void retargetSubgraph(RigGraph *rigg, RigArc *start_arc, RigNode *start_n
 		
 	retargetArctoArc(iarc);
 	
-	enode = (ReebNode*)BLI_otherNode((BArc*)earc, (BNode*)enode);
+	enode = BIF_otherNodeFromIndex(earc, enode);
 	inode = (RigNode*)BLI_otherNode((BArc*)iarc, (BNode*)inode);
 	
 	inode->link = enode;
diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c
index 7c8152b037d..fd772066122 100644
--- a/source/blender/src/buttons_editing.c
+++ b/source/blender/src/buttons_editing.c
@@ -5027,10 +5027,10 @@ static void editing_panel_mesh_skgen_display(Object *ob, Mesh *me)
 	uiDefButS(block, NUM, B_DIFF, "Resolution:",							1025,150,225,19, &G.scene->toolsettings->skgen_resolution,10.0,1000.0, 0, 0,		"Specifies the resolution of the graph's embedding");
 	uiDefButBitS(block, TOG, SKGEN_HARMONIC, B_DIFF, 		"H",			1250,150, 25,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Apply harmonic smoothing to the weighting");
 	uiDefButBitS(block, TOG, SKGEN_FILTER_INTERNAL, B_DIFF, "Filter In",	1025,130, 83,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Filter internal small arcs from graph");
-	uiDefButF(block, NUM, B_DIFF, 							"",				1111,130,164,19, &G.scene->toolsettings->skgen_threshold_internal,0.0, 1.0, 10, 0,	"Specify the threshold ratio for filtering internal arcs");
+	uiDefButF(block, NUM, B_DIFF, 							"",				1111,130,164,19, &G.scene->toolsettings->skgen_threshold_internal,0.0, 5.0, 10, 0,	"Specify the threshold ratio for filtering internal arcs");
 	uiDefButBitS(block, TOG, SKGEN_FILTER_EXTERNAL, B_DIFF, "Filter Ex",	1025,110, 53,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Filter external small arcs from graph");
 	uiDefButBitS(block, TOG, SKGEN_FILTER_SMART, 	B_DIFF, "Sm",			1078,110, 30,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Smart Filtering");
-	uiDefButF(block, NUM, B_DIFF, 							"",				1111,110,164,19, &G.scene->toolsettings->skgen_threshold_external,0.0, 1.0, 10, 0,	"Specify the threshold ratio for filtering external arcs");
+	uiDefButF(block, NUM, B_DIFF, 							"",				1111,110,164,19, &G.scene->toolsettings->skgen_threshold_external,0.0, 5.0, 10, 0,	"Specify the threshold ratio for filtering external arcs");
 	uiBlockEndAlign(block);
 	
 	uiDefButBitS(block, TOG, SKGEN_DISP_LENGTH, REDRAWVIEW3D,	"Length",			1025, 60, 83,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,		"Show Length");
@@ -5054,10 +5054,10 @@ static void editing_panel_mesh_skgen_retarget(Object *ob, Mesh *me)
 	uiDefButS(block, NUM, B_DIFF, "Resolution:",							1025,150,225,19, &G.scene->toolsettings->skgen_resolution,10.0,1000.0, 0, 0,		"Specifies the resolution of the graph's embedding");
 	uiDefButBitS(block, TOG, SKGEN_HARMONIC, B_DIFF, 		"H",			1250,150, 25,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Apply harmonic smoothing to the weighting");
 	uiDefButBitS(block, TOG, SKGEN_FILTER_INTERNAL, B_DIFF, "Filter In",	1025,130, 83,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Filter internal small arcs from graph");
-	uiDefButF(block, NUM, B_DIFF, 							"",				1111,130,164,19, &G.scene->toolsettings->skgen_threshold_internal,0.0, 1.0, 10, 0,	"Specify the threshold ratio for filtering internal arcs");
+	uiDefButF(block, NUM, B_DIFF, 							"",				1111,130,164,19, &G.scene->toolsettings->skgen_threshold_internal,0.0, 5.0, 10, 0,	"Specify the threshold ratio for filtering internal arcs");
 	uiDefButBitS(block, TOG, SKGEN_FILTER_EXTERNAL, B_DIFF, "Filter Ex",	1025,110, 53,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Filter external small arcs from graph");
 	uiDefButBitS(block, TOG, SKGEN_FILTER_SMART, 	B_DIFF, "Sm",			1078,110, 30,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Smart Filtering");
-	uiDefButF(block, NUM, B_DIFF, 							"",				1111,110,164,19, &G.scene->toolsettings->skgen_threshold_external,0.0, 1.0, 10, 0,	"Specify the threshold ratio for filtering external arcs");
+	uiDefButF(block, NUM, B_DIFF, 							"",				1111,110,164,19, &G.scene->toolsettings->skgen_threshold_external,0.0, 5.0, 10, 0,	"Specify the threshold ratio for filtering external arcs");
 	uiBlockEndAlign(block);
 
 	uiDefButF(block, NUM, B_DIFF, 							"Ang:",			1025, 60, 83,19, &G.scene->toolsettings->skgen_retarget_angle_weight, 0, 10, 1, 0,		"Angle Weight");
@@ -5090,10 +5090,10 @@ static void editing_panel_mesh_skgen(Object *ob, Mesh *me)
 	uiDefButS(block, NUM, B_DIFF, "Resolution:",							1025,150,225,19, &G.scene->toolsettings->skgen_resolution,10.0,1000.0, 0, 0,		"Specifies the resolution of the graph's embedding");
 	uiDefButBitS(block, TOG, SKGEN_HARMONIC, B_DIFF, 		"H",			1250,150, 25,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Apply harmonic smoothing to the weighting");
 	uiDefButBitS(block, TOG, SKGEN_FILTER_INTERNAL, B_DIFF, "Filter In",	1025,130, 83,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Filter internal small arcs from graph");
-	uiDefButF(block, NUM, B_DIFF, 							"",				1111,130,164,19, &G.scene->toolsettings->skgen_threshold_internal,0.0, 1.0, 10, 0,	"Specify the threshold ratio for filtering internal arcs");
+	uiDefButF(block, NUM, B_DIFF, 							"",				1111,130,164,19, &G.scene->toolsettings->skgen_threshold_internal,0.0, 5.0, 10, 0,	"Specify the threshold ratio for filtering internal arcs");
 	uiDefButBitS(block, TOG, SKGEN_FILTER_EXTERNAL, B_DIFF, "Filter Ex",	1025,110, 53,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Filter external small arcs from graph");
 	uiDefButBitS(block, TOG, SKGEN_FILTER_SMART, 	B_DIFF, "Sm",			1078,110, 30,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Smart Filtering");
-	uiDefButF(block, NUM, B_DIFF, 							"",				1111,110,164,19, &G.scene->toolsettings->skgen_threshold_external,0.0, 1.0, 10, 0,	"Specify the threshold ratio for filtering external arcs");
+	uiDefButF(block, NUM, B_DIFF, 							"",				1111,110,164,19, &G.scene->toolsettings->skgen_threshold_external,0.0, 5.0, 10, 0,	"Specify the threshold ratio for filtering external arcs");
 	uiBlockEndAlign(block);
 
 	uiBlockBeginAlign(block);
diff --git a/source/blender/src/reeb.c b/source/blender/src/reeb.c
index 20c9da75bb2..a0d52944683 100644
--- a/source/blender/src/reeb.c
+++ b/source/blender/src/reeb.c
@@ -54,6 +54,7 @@
 #include "BIF_toolbox.h"
 #include "BIF_graphics.h"
 #include "BIF_gl.h"
+#include "BIF_resources.h"
 
 #include "BKE_global.h"
 #include "BKE_utildefines.h"
@@ -207,6 +208,11 @@ ReebNode * copyNode(ReebGraph *rg, ReebNode *node)
 	return cp_node; 
 }
 
+ReebNode *BIF_otherNodeFromIndex(ReebArc *arc, ReebNode *node)
+{
+	return (arc->head->index == node->index) ? arc->tail : arc->head;
+}
+
 ReebArc * copyArc(ReebGraph *rg, ReebArc *arc)
 {
 	ReebArc *cp_arc;
@@ -429,6 +435,28 @@ void verifyFaces(ReebGraph *rg)
 #endif
 }
 
+void verifyMultiResolutionLinks(ReebGraph *rg)
+{
+#ifdef DEBUG_REEB
+	ReebGraph *lower_rg = rg->link;
+	
+	if (lower_rg)
+	{
+		ReebArc *arc;
+		
+		for (arc = rg->arcs.first; arc; arc = arc->next)
+		{
+			if (BLI_findindex(&lower_rg->arcs, arc->link) == -1)
+			{
+				printf("missing arc %p\n", arc->link);
+			}
+		}
+		
+		
+		verifyMultiResolutionLinks(lower_rg);
+	}
+#endif
+}
 /***************************************** BUCKET UTILS **********************************************/
 
 void addVertToBucket(EmbedBucket *b, float co[3])
@@ -1555,22 +1583,35 @@ ReebArc * findConnectedArc(ReebGraph *rg, ReebArc *arc, ReebNode *v)
 
 void removeNormalNodes(ReebGraph *rg)
 {
-	ReebArc *arc;
+	ReebArc *arc, *nextArc;
 	
 	// Merge degree 2 nodes
-	for(arc = rg->arcs.first; arc; arc = arc->next)
+	for(arc = rg->arcs.first; arc; arc = nextArc)
 	{
+		nextArc = arc->next;
+		
 		while (arc->head->degree == 2 || arc->tail->degree == 2)
 		{
 			// merge at v1
 			if (arc->head->degree == 2)
 			{
-				ReebArc *nextArc = (ReebArc*)BLI_findConnectedArc((BGraph*)rg, (BArc*)arc, (BNode*)arc->head);
+				ReebArc *connectedArc = (ReebArc*)BLI_findConnectedArc((BGraph*)rg, (BArc*)arc, (BNode*)arc->head);
 
 				// Merge arc only if needed
-				if (arc->head == nextArc->tail)
-				{				
-					mergeConnectedArcs(rg, arc, nextArc);
+				if (arc->head == connectedArc->tail)
+				{		
+					/* remove furthest arc */		
+					if (arc->tail->weight < connectedArc->head->weight)
+					{
+						mergeConnectedArcs(rg, arc, connectedArc);
+						nextArc = arc->next;
+					}
+					else
+					{
+						mergeConnectedArcs(rg, connectedArc, arc);
+						break;
+						arc = connectedArc; /* arc was removed, continue with connected */
+					}
 				}
 				// Otherwise, mark down vert
 				else
@@ -1582,12 +1623,23 @@ void removeNormalNodes(ReebGraph *rg)
 			// merge at v2
 			if (arc->tail->degree == 2)
 			{
-				ReebArc *nextArc = (ReebArc*)BLI_findConnectedArc((BGraph*)rg, (BArc*)arc, (BNode*)arc->tail);
+				ReebArc *connectedArc = (ReebArc*)BLI_findConnectedArc((BGraph*)rg, (BArc*)arc, (BNode*)arc->tail);
 				
 				// Merge arc only if needed
-				if (arc->tail == nextArc->head)
+				if (arc->tail == connectedArc->head)
 				{				
-					mergeConnectedArcs(rg, arc, nextArc);
+					/* remove furthest arc */		
+					if (arc->head->weight < connectedArc->tail->weight)
+					{
+						mergeConnectedArcs(rg, arc, connectedArc);
+						nextArc = arc->next;
+					}
+					else
+					{
+						mergeConnectedArcs(rg, connectedArc, arc);
+						break;
+						arc = connectedArc; /* arc was removed, continue with connected */
+					}
 				}
 				// Otherwise, mark down vert
 				else
@@ -2879,6 +2931,8 @@ ReebGraph *BIF_ReebGraphMultiFromEditMesh(void)
 
 		BLI_markdownSymmetry((BGraph*)rgi, rgi->nodes.first, G.scene->toolsettings->skgen_symmetry_limit);
 	}
+	
+	verifyMultiResolutionLinks(rg);
 
 	return rg;
 }
@@ -2990,6 +3044,8 @@ void REEB_draw()
 		for (rg = GLOBAL_RG; i && rg->link; i--, rg = rg->link) ;
 	}
 	
+	glPointSize(BIF_GetThemeValuef(TH_VERTEX_SIZE));
+	
 	glDisable(GL_DEPTH_TEST);
 	for (arc = rg->arcs.first; arc; arc = arc->next, i++)
 	{
@@ -3022,6 +3078,13 @@ void REEB_draw()
 			
 			glVertex3fv(arc->tail->p);
 		glEnd();
+
+
+		glColor3f(1, 1, 1);				
+		glBegin(GL_POINTS);
+			glVertex3fv(arc->head->p);
+			glVertex3fv(arc->tail->p);
+		glEnd();
 		
 		VecLerpf(vec, arc->head->p, arc->tail->p, 0.5f);
 		
@@ -3042,4 +3105,6 @@ void REEB_draw()
 		BMF_DrawString( G.fonts, text);
 	}
 	glEnable(GL_DEPTH_TEST);
+	
+	glPointSize(1.0);
 }

From f8afbb40543240ea9e986dfef9ca3917b6e3bd38 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Tue, 8 Jul 2008 16:22:18 +0000
Subject: [PATCH 073/252] Start multi resolution search on first arc and
 smarter search (match first two levels only).

Now need a way to go back to lower levels at shared nodes.
---
 source/blender/blenlib/intern/graph.c |  6 ++--
 source/blender/src/autoarmature.c     | 45 ++++++++++++++++-----------
 source/blender/src/buttons_editing.c  | 45 ++++++++++-----------------
 source/blender/src/reeb.c             |  4 +--
 4 files changed, 48 insertions(+), 52 deletions(-)

diff --git a/source/blender/blenlib/intern/graph.c b/source/blender/blenlib/intern/graph.c
index 2aea9bc0a4a..9bdf286d248 100644
--- a/source/blender/blenlib/intern/graph.c
+++ b/source/blender/blenlib/intern/graph.c
@@ -328,7 +328,7 @@ int BLI_subtreeShape(BNode *node, BArc *rootArc, int include_root)
 	if (include_root)
 	{
 		BNode *newNode = BLI_otherNode(rootArc, node);
-		depth = BLI_subtreeShape(newNode, rootArc, 0);
+		return BLI_subtreeShape(newNode, rootArc, 0);
 	}
 	else
 	{
@@ -353,9 +353,9 @@ int BLI_subtreeShape(BNode *node, BArc *rootArc, int include_root)
 				}
 			}
 		}
+		
+		return 10 * depth + 1;
 	}
-	
-	return 10 * depth + 1;
 }
 
 /********************************* SYMMETRY DETECTION **************************************************/
diff --git a/source/blender/src/autoarmature.c b/source/blender/src/autoarmature.c
index 826e81259d9..aa0f6a44b68 100644
--- a/source/blender/src/autoarmature.c
+++ b/source/blender/src/autoarmature.c
@@ -1238,6 +1238,26 @@ static void retargetArctoArc(RigArc *iarc)
 	}
 }
 
+static void matchMultiResolutionArc(RigNode *start_node, RigArc *next_iarc, ReebArc *next_earc)
+{
+	ReebNode *enode = next_earc->head;
+	int ishape, eshape;
+	int MAGIC_NUMBER = 100; /* FIXME */
+
+	ishape = BLI_subtreeShape((BNode*)start_node, (BArc*)next_iarc, 1) % MAGIC_NUMBER;
+	eshape = BLI_subtreeShape((BNode*)enode, (BArc*)next_earc, 1) % MAGIC_NUMBER;
+	
+	while (ishape > eshape && next_earc->link)
+	{
+		next_earc = next_earc->link;
+		enode = next_earc->head;
+		eshape = BLI_subtreeShape((BNode*)enode, (BArc*)next_earc, 1) % MAGIC_NUMBER;
+	} 
+
+	next_earc->flag = 1; // mark as taken
+	next_iarc->link = next_earc;
+}
+
 static void findCorrespondingArc(RigArc *start_arc, RigNode *start_node, RigArc *next_iarc)
 {
 	ReebNode *enode = start_node->link;
@@ -1257,25 +1277,12 @@ static void findCorrespondingArc(RigArc *start_arc, RigNode *start_node, RigArc
 			next_earc->symmetry_group == symmetry_group &&
 			next_earc->symmetry_level == symmetry_level)
 		{
-			int ishape, eshape;
-
 			printf("-----------------------\n");
 			printf("CORRESPONDING ARC FOUND\n");
 			RIG_printArcBones(next_iarc);
 			printf("flag %i -- symmetry level %i -- symmetry flag %i\n", next_earc->flag, next_earc->symmetry_level, next_earc->symmetry_flag);
 			
-			ishape = BLI_subtreeShape((BNode*)start_node, (BArc*)next_iarc, 1);
-			eshape = BLI_subtreeShape((BNode*)enode, (BArc*)next_earc, 1);
-			
-			while (ishape > eshape && next_earc->link)
-			{
-				next_earc = next_earc->link;
-				enode = next_earc->head; //enode->link;
-				eshape = BLI_subtreeShape((BNode*)enode, (BArc*)next_earc, 1);
-			} 
-
-			next_earc->flag = 1; // mark as taken
-			next_iarc->link = next_earc;
+			matchMultiResolutionArc(start_node, next_iarc, next_earc);
 			break;
 		}
 	}
@@ -1347,12 +1354,12 @@ static void retargetGraphs(RigGraph *rigg)
 	
 	earc = reebg->arcs.first;
 	iarc = (RigArc*)rigg->head->arcs[0];
-	
-	iarc->link = earc;
-	earc->flag = 1;
-	
-	enode = earc->head;
 	inode = iarc->tail;
+	
+	matchMultiResolutionArc(inode, iarc, earc);
+
+	earc = iarc->link; /* find might have changed it */
+	enode = earc->head;
 
 	inode->link = enode;
 
diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c
index fd772066122..d487263b16d 100644
--- a/source/blender/src/buttons_editing.c
+++ b/source/blender/src/buttons_editing.c
@@ -5009,6 +5009,19 @@ static void skgen_graphfree(void *arg1, void *arg2)
 	allqueue(REDRAWVIEW3D, 0);
 }
 
+static void skgen_graph_block(uiBlock *block)
+{
+	uiBlockBeginAlign(block);
+	uiDefButS(block, NUM, B_DIFF, "Resolution:",							1025,150,225,19, &G.scene->toolsettings->skgen_resolution,10.0,1000.0, 0, 0,		"Specifies the resolution of the graph's embedding");
+	uiDefButBitS(block, TOG, SKGEN_HARMONIC, B_DIFF, 		"H",			1250,150, 25,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Apply harmonic smoothing to the weighting");
+	uiDefButBitS(block, TOG, SKGEN_FILTER_INTERNAL, B_DIFF, "Filter In",	1025,130, 83,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Filter internal small arcs from graph");
+	uiDefButF(block, NUM, B_DIFF, 							"",				1111,130,164,19, &G.scene->toolsettings->skgen_threshold_internal,0.0, 10.0, 10, 0,	"Specify the threshold ratio for filtering internal arcs");
+	uiDefButBitS(block, TOG, SKGEN_FILTER_EXTERNAL, B_DIFF, "Filter Ex",	1025,110, 53,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Filter external small arcs from graph");
+	uiDefButBitS(block, TOG, SKGEN_FILTER_SMART, 	B_DIFF, "Sm",			1078,110, 30,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Smart Filtering");
+	uiDefButF(block, NUM, B_DIFF, 							"",				1111,110,164,19, &G.scene->toolsettings->skgen_threshold_external,0.0, 10.0, 10, 0,	"Specify the threshold ratio for filtering external arcs");
+	uiBlockEndAlign(block);
+}
+
 static void editing_panel_mesh_skgen_display(Object *ob, Mesh *me)
 {
 	uiBlock *block;
@@ -5022,17 +5035,9 @@ static void editing_panel_mesh_skgen_display(Object *ob, Mesh *me)
 	uiButSetFunc(but, skgen_graphgen, NULL, NULL);
 	but = uiDefBut(block, BUT, B_DIFF, "Free",					1150,170,125,19, 0, 0, 0, 0, 0, "Free Graph from Mesh");
 	uiButSetFunc(but, skgen_graphfree, NULL, NULL);
-
-	uiBlockBeginAlign(block);
-	uiDefButS(block, NUM, B_DIFF, "Resolution:",							1025,150,225,19, &G.scene->toolsettings->skgen_resolution,10.0,1000.0, 0, 0,		"Specifies the resolution of the graph's embedding");
-	uiDefButBitS(block, TOG, SKGEN_HARMONIC, B_DIFF, 		"H",			1250,150, 25,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Apply harmonic smoothing to the weighting");
-	uiDefButBitS(block, TOG, SKGEN_FILTER_INTERNAL, B_DIFF, "Filter In",	1025,130, 83,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Filter internal small arcs from graph");
-	uiDefButF(block, NUM, B_DIFF, 							"",				1111,130,164,19, &G.scene->toolsettings->skgen_threshold_internal,0.0, 5.0, 10, 0,	"Specify the threshold ratio for filtering internal arcs");
-	uiDefButBitS(block, TOG, SKGEN_FILTER_EXTERNAL, B_DIFF, "Filter Ex",	1025,110, 53,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Filter external small arcs from graph");
-	uiDefButBitS(block, TOG, SKGEN_FILTER_SMART, 	B_DIFF, "Sm",			1078,110, 30,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Smart Filtering");
-	uiDefButF(block, NUM, B_DIFF, 							"",				1111,110,164,19, &G.scene->toolsettings->skgen_threshold_external,0.0, 5.0, 10, 0,	"Specify the threshold ratio for filtering external arcs");
-	uiBlockEndAlign(block);
 	
+	skgen_graph_block(block);
+
 	uiDefButBitS(block, TOG, SKGEN_DISP_LENGTH, REDRAWVIEW3D,	"Length",			1025, 60, 83,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,		"Show Length");
 	uiDefButBitS(block, TOG, SKGEN_DISP_WEIGHT, REDRAWVIEW3D,	"Weight",			1108, 60, 83,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,		"Show Weight");
 	uiDefButBitS(block, TOG, SKGEN_DISP_ORIG, REDRAWVIEW3D,		"Original",			1191, 60, 84,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,		"Show Original Graph");
@@ -5050,15 +5055,7 @@ static void editing_panel_mesh_skgen_retarget(Object *ob, Mesh *me)
 	
 	uiDefBut(block, BUT, B_RETARGET_SKELETON, "Retarget Skeleton",			1025,170,250,19, 0, 0, 0, 0, 0, "Retarget Selected Armature to this Mesh");
 
-	uiBlockBeginAlign(block);
-	uiDefButS(block, NUM, B_DIFF, "Resolution:",							1025,150,225,19, &G.scene->toolsettings->skgen_resolution,10.0,1000.0, 0, 0,		"Specifies the resolution of the graph's embedding");
-	uiDefButBitS(block, TOG, SKGEN_HARMONIC, B_DIFF, 		"H",			1250,150, 25,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Apply harmonic smoothing to the weighting");
-	uiDefButBitS(block, TOG, SKGEN_FILTER_INTERNAL, B_DIFF, "Filter In",	1025,130, 83,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Filter internal small arcs from graph");
-	uiDefButF(block, NUM, B_DIFF, 							"",				1111,130,164,19, &G.scene->toolsettings->skgen_threshold_internal,0.0, 5.0, 10, 0,	"Specify the threshold ratio for filtering internal arcs");
-	uiDefButBitS(block, TOG, SKGEN_FILTER_EXTERNAL, B_DIFF, "Filter Ex",	1025,110, 53,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Filter external small arcs from graph");
-	uiDefButBitS(block, TOG, SKGEN_FILTER_SMART, 	B_DIFF, "Sm",			1078,110, 30,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Smart Filtering");
-	uiDefButF(block, NUM, B_DIFF, 							"",				1111,110,164,19, &G.scene->toolsettings->skgen_threshold_external,0.0, 5.0, 10, 0,	"Specify the threshold ratio for filtering external arcs");
-	uiBlockEndAlign(block);
+	skgen_graph_block(block);
 
 	uiDefButF(block, NUM, B_DIFF, 							"Ang:",			1025, 60, 83,19, &G.scene->toolsettings->skgen_retarget_angle_weight, 0, 10, 1, 0,		"Angle Weight");
 	uiDefButF(block, NUM, B_DIFF, 							"Len:",			1108, 60, 83,19, &G.scene->toolsettings->skgen_retarget_length_weight, 0, 10, 1, 0,		"Length Weight");
@@ -5086,15 +5083,7 @@ static void editing_panel_mesh_skgen(Object *ob, Mesh *me)
 	
 	uiDefBut(block, BUT, B_GEN_SKELETON, "Generate",			1025,170,250,19, 0, 0, 0, 0, 0, "Generate Skeleton from Mesh");
 
-	uiBlockBeginAlign(block);
-	uiDefButS(block, NUM, B_DIFF, "Resolution:",							1025,150,225,19, &G.scene->toolsettings->skgen_resolution,10.0,1000.0, 0, 0,		"Specifies the resolution of the graph's embedding");
-	uiDefButBitS(block, TOG, SKGEN_HARMONIC, B_DIFF, 		"H",			1250,150, 25,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Apply harmonic smoothing to the weighting");
-	uiDefButBitS(block, TOG, SKGEN_FILTER_INTERNAL, B_DIFF, "Filter In",	1025,130, 83,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Filter internal small arcs from graph");
-	uiDefButF(block, NUM, B_DIFF, 							"",				1111,130,164,19, &G.scene->toolsettings->skgen_threshold_internal,0.0, 5.0, 10, 0,	"Specify the threshold ratio for filtering internal arcs");
-	uiDefButBitS(block, TOG, SKGEN_FILTER_EXTERNAL, B_DIFF, "Filter Ex",	1025,110, 53,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Filter external small arcs from graph");
-	uiDefButBitS(block, TOG, SKGEN_FILTER_SMART, 	B_DIFF, "Sm",			1078,110, 30,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Smart Filtering");
-	uiDefButF(block, NUM, B_DIFF, 							"",				1111,110,164,19, &G.scene->toolsettings->skgen_threshold_external,0.0, 5.0, 10, 0,	"Specify the threshold ratio for filtering external arcs");
-	uiBlockEndAlign(block);
+	skgen_graph_block(block);
 
 	uiBlockBeginAlign(block);
 	for(i = 0; i < SKGEN_SUB_TOTAL; i++)
diff --git a/source/blender/src/reeb.c b/source/blender/src/reeb.c
index a0d52944683..b65a23bee99 100644
--- a/source/blender/src/reeb.c
+++ b/source/blender/src/reeb.c
@@ -360,7 +360,7 @@ void repositionNodes(ReebGraph *rg)
 
 void verifyNodeDegree(ReebGraph *rg)
 {
-//#ifdef DEBUG_REEB
+#ifdef DEBUG_REEB
 	ReebNode *node = NULL;
 	ReebArc *arc = NULL;
 
@@ -383,7 +383,7 @@ void verifyNodeDegree(ReebGraph *rg)
 			printf("zero degree node %i with weight %f\n", node->index, node->weight);
 		}
 	}
-//#endif
+#endif
 }
 
 void verifyBuckets(ReebGraph *rg)

From daa853a31f95c4edacd16094e2a45f342f9930be Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Tue, 8 Jul 2008 19:34:20 +0000
Subject: [PATCH 074/252] Rename some struct members to reduce confusion Proper
 flag clearing for retarget on multi resolution

---
 source/blender/include/reeb.h     |  7 ++--
 source/blender/src/autoarmature.c | 55 ++++++++++++++---------------
 source/blender/src/reeb.c         | 58 ++++++++++++++++++++++++-------
 3 files changed, 76 insertions(+), 44 deletions(-)

diff --git a/source/blender/include/reeb.h b/source/blender/include/reeb.h
index d4a5187df0f..0be9dd29b86 100644
--- a/source/blender/include/reeb.h
+++ b/source/blender/include/reeb.h
@@ -51,7 +51,7 @@ typedef struct ReebGraph {
 	int resolution;
 	int totnodes;
 	struct EdgeHash *emap;
-	struct ReebGraph *link; /* for multi resolution filtering, points to higher levels */
+	struct ReebGraph *link_up; /* for multi resolution filtering, points to higher levels */
 } ReebGraph;
 
 typedef struct EmbedBucket {
@@ -75,6 +75,7 @@ typedef struct ReebNode {
 
 	int index;
 	float weight;
+	struct ReebNode *link_down; /* for multi resolution filtering, points to lower levels, if present */
 } ReebNode;
 
 typedef struct ReebEdge {
@@ -103,7 +104,7 @@ typedef struct ReebArc {
 
 	struct GHash *faces;	
 	float angle;
-	struct ReebArc *link; /* for multi resolution filtering, points to higher levels */
+	struct ReebArc *link_up; /* for multi resolution filtering, points to higher levels */
 } ReebArc;
 
 typedef struct ReebArcIterator {
@@ -159,12 +160,14 @@ void verifyFaces(ReebGraph *rg);
 /*********************** PUBLIC *********************************/
 ReebGraph *BIF_ReebGraphFromEditMesh(void);
 ReebGraph *BIF_ReebGraphMultiFromEditMesh(void);
+void BIF_flagMultiArcs(ReebGraph *rg, int flag);
 
 void BIF_GlobalReebGraphFromEditMesh(void);
 void BIF_GlobalReebFree(void);
 
 ReebNode *BIF_otherNodeFromIndex(ReebArc *arc, ReebNode *node);
 
+
 void REEB_freeGraph(ReebGraph *rg);
 void REEB_exportGraph(ReebGraph *rg, int count);
 void REEB_draw();
diff --git a/source/blender/src/autoarmature.c b/source/blender/src/autoarmature.c
index aa0f6a44b68..d24aef04bf6 100644
--- a/source/blender/src/autoarmature.c
+++ b/source/blender/src/autoarmature.c
@@ -81,7 +81,7 @@ typedef struct RigGraph {
 	/*********************************/
 
 	struct RigNode *head;
-	ReebGraph *link;
+	ReebGraph *link_mesh;
 } RigGraph;
 
 typedef struct RigNode {
@@ -97,7 +97,7 @@ typedef struct RigNode {
 	float symmetry_axis[3];
 	/*********************************/
 
-	ReebNode *link;
+	ReebNode *link_mesh;
 } RigNode;
 
 typedef struct RigArc {
@@ -114,7 +114,7 @@ typedef struct RigArc {
 	
 	ListBase edges;
 	int count;
-	ReebArc *link;
+	ReebArc *link_mesh;
 } RigArc;
 
 typedef struct RigEdge {
@@ -387,7 +387,7 @@ static void RIG_findHead(RigGraph *rg)
 			{
 				RigEdge *edge = arc->edges.last;
 				
-				if (edge->bone->flag & BONESEL_ANY)
+				if (edge->bone->flag & (BONE_TIPSEL|BONE_SELECTED))
 				{
 					rg->head = arc->tail;
 					break;
@@ -514,7 +514,7 @@ static void retargetArctoArcLength(RigArc *iarc);
 static RetargetMode detectArcRetargetMode(RigArc *iarc)
 {
 	RetargetMode mode = RETARGET_AGGRESSIVE;
-	ReebArc *earc = iarc->link;
+	ReebArc *earc = iarc->link_mesh;
 	RigEdge *edge;
 	int large_angle = 0;
 	float avg_angle = 0;
@@ -738,7 +738,7 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 	RigEdge *edge;
 	EmbedBucket *bucket = NULL;
 	ReebNode *node_start, *node_end;
-	ReebArc *earc = iarc->link;
+	ReebArc *earc = iarc->link_mesh;
 	float min_cost = FLT_MAX;
 	float *vec0, *vec1, *vec2;
 	float **vec_cache;
@@ -1074,7 +1074,7 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 static void retargetArctoArcLength(RigArc *iarc)
 {
 	ReebArcIterator iter;
-	ReebArc *earc = iarc->link;
+	ReebArc *earc = iarc->link_mesh;
 	ReebNode *node_start, *node_end;
 	RigEdge *edge;
 	EmbedBucket *bucket = NULL;
@@ -1203,7 +1203,7 @@ static void retargetArctoArcLength(RigArc *iarc)
 
 static void retargetArctoArc(RigArc *iarc)
 {
-	ReebArc *earc = iarc->link;
+	ReebArc *earc = iarc->link_mesh;
 	
 	if (BLI_countlist(&iarc->edges) == 1)
 	{
@@ -1247,27 +1247,27 @@ static void matchMultiResolutionArc(RigNode *start_node, RigArc *next_iarc, Reeb
 	ishape = BLI_subtreeShape((BNode*)start_node, (BArc*)next_iarc, 1) % MAGIC_NUMBER;
 	eshape = BLI_subtreeShape((BNode*)enode, (BArc*)next_earc, 1) % MAGIC_NUMBER;
 	
-	while (ishape > eshape && next_earc->link)
+	while (ishape > eshape && next_earc->link_up)
 	{
-		next_earc = next_earc->link;
+		next_earc = next_earc->link_up;
 		enode = next_earc->head;
 		eshape = BLI_subtreeShape((BNode*)enode, (BArc*)next_earc, 1) % MAGIC_NUMBER;
 	} 
 
 	next_earc->flag = 1; // mark as taken
-	next_iarc->link = next_earc;
+	next_iarc->link_mesh = next_earc;
 }
 
 static void findCorrespondingArc(RigArc *start_arc, RigNode *start_node, RigArc *next_iarc)
 {
-	ReebNode *enode = start_node->link;
+	ReebNode *enode = start_node->link_mesh;
 	ReebArc *next_earc;
 	int symmetry_level = next_iarc->symmetry_level;
 	int symmetry_group = next_iarc->symmetry_group;
 	int symmetry_flag = next_iarc->symmetry_flag;
 	int i;
 	
-	next_iarc->link = NULL;
+	next_iarc->link_mesh = NULL;
 		
 	for(i = 0; i < enode->degree; i++)
 	{
@@ -1288,7 +1288,7 @@ static void findCorrespondingArc(RigArc *start_arc, RigNode *start_node, RigArc
 	}
 	
 
-	if (next_iarc->link == NULL)
+	if (next_iarc->link_mesh == NULL)
 	{
 		printf("--------------------------\n");
 		printf("NO CORRESPONDING ARC FOUND\n");
@@ -1310,9 +1310,9 @@ static void findCorrespondingArc(RigArc *start_arc, RigNode *start_node, RigArc
 static void retargetSubgraph(RigGraph *rigg, RigArc *start_arc, RigNode *start_node)
 {
 	RigArc *iarc = start_arc;
-	ReebArc *earc = start_arc->link;
+	ReebArc *earc = start_arc->link_mesh;
 	RigNode *inode = start_node;
-	ReebNode *enode = start_node->link;
+	ReebNode *enode = start_node->link_mesh;
 	int i;
 		
 	retargetArctoArc(iarc);
@@ -1320,7 +1320,7 @@ static void retargetSubgraph(RigGraph *rigg, RigArc *start_arc, RigNode *start_n
 	enode = BIF_otherNodeFromIndex(earc, enode);
 	inode = (RigNode*)BLI_otherNode((BArc*)iarc, (BNode*)inode);
 	
-	inode->link = enode;
+	inode->link_mesh = enode;
 	
 	for(i = 0; i < inode->degree; i++)
 	{
@@ -1330,7 +1330,7 @@ static void retargetSubgraph(RigGraph *rigg, RigArc *start_arc, RigNode *start_n
 		if (next_iarc != iarc)
 		{
 			findCorrespondingArc(iarc, inode, next_iarc);
-			if (next_iarc->link)
+			if (next_iarc->link_mesh)
 			{
 				retargetSubgraph(rigg, next_iarc, inode);
 			}
@@ -1340,17 +1340,17 @@ static void retargetSubgraph(RigGraph *rigg, RigArc *start_arc, RigNode *start_n
 
 static void retargetGraphs(RigGraph *rigg)
 {
-	ReebGraph *reebg = rigg->link;
+	ReebGraph *reebg = rigg->link_mesh;
 	ReebArc *earc;
 	RigArc *iarc;
 	ReebNode *enode;
 	RigNode *inode;
 	
 	/* flag all ReebArcs as not taken */
-	for (earc = reebg->arcs.first; earc; earc = earc->next)
-	{
-		earc->flag = 0;
-	}
+	BIF_flagMultiArcs(reebg, 0);
+	
+	/* return to first level */
+	reebg = rigg->link_mesh;
 	
 	earc = reebg->arcs.first;
 	iarc = (RigArc*)rigg->head->arcs[0];
@@ -1358,10 +1358,10 @@ static void retargetGraphs(RigGraph *rigg)
 	
 	matchMultiResolutionArc(inode, iarc, earc);
 
-	earc = iarc->link; /* find might have changed it */
+	earc = iarc->link_mesh; /* find might have changed it */
 	enode = earc->head;
 
-	inode->link = enode;
+	inode->link_mesh = enode;
 
 	retargetSubgraph(rigg, iarc, inode);
 }
@@ -1372,9 +1372,6 @@ void BIF_retargetArmature()
 	Base *base;
 	ReebGraph *reebg;
 	
-	//reebg = BIF_ReebGraphFromEditMesh();
-	//BLI_markdownSymmetry((BGraph*)reebg, reebg->nodes.first, G.scene->toolsettings->skgen_symmetry_limit);
-	
 	reebg = BIF_ReebGraphMultiFromEditMesh();
 	
 	
@@ -1406,7 +1403,7 @@ void BIF_retargetArmature()
 		
 				RIG_printGraph(rigg);
 				
-				rigg->link = reebg;
+				rigg->link_mesh = reebg;
 				
 				printf("retargetting %s\n", ob->id.name);
 				
diff --git a/source/blender/src/reeb.c b/source/blender/src/reeb.c
index b65a23bee99..4b74e0e2e8e 100644
--- a/source/blender/src/reeb.c
+++ b/source/blender/src/reeb.c
@@ -145,9 +145,9 @@ void REEB_freeGraph(ReebGraph *rg)
 	BLI_edgehash_free(rg->emap, NULL);
 	
 	/* free linked graph */
-	if (rg->link)
+	if (rg->link_up)
 	{
-		REEB_freeGraph(rg->link);
+		REEB_freeGraph(rg->link_up);
 	}
 	
 	MEM_freeN(rg);
@@ -170,6 +170,14 @@ ReebGraph * newReebGraph()
 	return rg;
 }
 
+void BIF_flagMultiArcs(ReebGraph *rg, int flag)
+{
+	for ( ; rg; rg = rg->link_up)
+	{
+		BLI_flagArcs((BGraph*)rg, flag);
+	}
+}
+
 ReebNode * addNode(ReebGraph *rg, EditVert *eve, float weight)
 {
 	ReebNode *node = NULL;
@@ -208,6 +216,28 @@ ReebNode * copyNode(ReebGraph *rg, ReebNode *node)
 	return cp_node; 
 }
 
+void relinkNodes(ReebGraph *low_rg, ReebGraph *high_rg)
+{
+	ReebNode *low_node, *high_node;
+	
+	if (low_rg == NULL || high_rg == NULL)
+	{
+		return;
+	}
+	
+	for (low_node = low_rg->nodes.first; low_node; low_node = low_node->next)
+	{
+		for (high_node = high_rg->nodes.first; high_node; high_node = high_node->next)
+		{
+			if (low_node->index == high_node->index)
+			{
+				high_node->link_down = low_node;
+				break;
+			}
+		}
+	}
+}
+
 ReebNode *BIF_otherNodeFromIndex(ReebArc *arc, ReebNode *node)
 {
 	return (arc->head->index == node->index) ? arc->tail : arc->head;
@@ -222,7 +252,7 @@ ReebArc * copyArc(ReebGraph *rg, ReebArc *arc)
 
 	memcpy(cp_arc, arc, sizeof(ReebArc));
 	
-	cp_arc->link = arc;
+	cp_arc->link_up = arc;
 	
 	cp_arc->head = NULL;
 	cp_arc->tail = NULL;
@@ -266,7 +296,7 @@ ReebGraph * copyReebGraph(ReebGraph *rg)
 	ReebGraph *cp_rg = newReebGraph();
 	
 	cp_rg->resolution = rg->resolution;
-	cp_rg->link = rg;
+	cp_rg->link_up = rg;
 
 	/* Copy nodes */	
 	for (node = rg->nodes.first; node; node = node->next)
@@ -438,7 +468,7 @@ void verifyFaces(ReebGraph *rg)
 void verifyMultiResolutionLinks(ReebGraph *rg)
 {
 #ifdef DEBUG_REEB
-	ReebGraph *lower_rg = rg->link;
+	ReebGraph *lower_rg = rg->link_up;
 	
 	if (lower_rg)
 	{
@@ -446,9 +476,9 @@ void verifyMultiResolutionLinks(ReebGraph *rg)
 		
 		for (arc = rg->arcs.first; arc; arc = arc->next)
 		{
-			if (BLI_findindex(&lower_rg->arcs, arc->link) == -1)
+			if (BLI_findindex(&lower_rg->arcs, arc->link_up) == -1)
 			{
-				printf("missing arc %p\n", arc->link);
+				printf("missing arc %p\n", arc->link_up);
 			}
 		}
 		
@@ -2874,7 +2904,7 @@ ReebGraph *BIF_ReebGraphMultiFromEditMesh(void)
 {
 	EditMesh *em = G.editMesh;
 	ReebGraph *rg = NULL;
-	ReebGraph *rgi;
+	ReebGraph *rgi, *previous;
 	int i, nb_levels = 5;
 	
 	if (em == NULL)
@@ -2912,10 +2942,10 @@ ReebGraph *BIF_ReebGraphMultiFromEditMesh(void)
 		rg = copyReebGraph(rg);
 	}
 	
-	for (rgi = rg, i = nb_levels; rgi; rgi = rgi->link, i--)
+	for (rgi = rg, i = nb_levels, previous = NULL; rgi; previous = rgi, rgi = rgi->link_up, i--)
 	{
 		/* don't fully filter last level */
-		if (rgi->link)
+		if (rgi->link_up)
 		{
 			float internal_threshold = G.scene->toolsettings->skgen_threshold_internal * (i / (float)nb_levels);
 			float external_threshold = G.scene->toolsettings->skgen_threshold_external * (i / (float)nb_levels);
@@ -2930,6 +2960,8 @@ ReebGraph *BIF_ReebGraphMultiFromEditMesh(void)
 		finalizeGraph(rgi, G.scene->toolsettings->skgen_postpro_passes, G.scene->toolsettings->skgen_postpro);
 
 		BLI_markdownSymmetry((BGraph*)rgi, rgi->nodes.first, G.scene->toolsettings->skgen_symmetry_limit);
+		
+		relinkNodes(previous, rgi);
 	}
 	
 	verifyMultiResolutionLinks(rg);
@@ -3033,15 +3065,15 @@ void REEB_draw()
 		return;
 	}
 	
-	if (GLOBAL_RG->link && G.scene->toolsettings->skgen_options & SKGEN_DISP_ORIG)
+	if (GLOBAL_RG->link_up && G.scene->toolsettings->skgen_options & SKGEN_DISP_ORIG)
 	{
-		for (rg = GLOBAL_RG; rg->link; rg = rg->link) ;
+		for (rg = GLOBAL_RG; rg->link_up; rg = rg->link_up) ;
 	}
 	else
 	{
 		i = G.scene->toolsettings->skgen_multi_level;
 		
-		for (rg = GLOBAL_RG; i && rg->link; i--, rg = rg->link) ;
+		for (rg = GLOBAL_RG; i && rg->link_up; i--, rg = rg->link_up) ;
 	}
 	
 	glPointSize(BIF_GetThemeValuef(TH_VERTEX_SIZE));

From f7f0077294b727b673671af32a0fd9f86dbe353b Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Tue, 8 Jul 2008 22:55:00 +0000
Subject: [PATCH 075/252] soc-2008-mxcurioni: first (blank) file upload for
 SWIG removal, in source/blender/freestyle/intern/python. The migration will
 be based on source/blender/freestyle/intern/swig/ModuleWrapper.{cpp,h}

---
 source/blender/freestyle/SConscript           |  2 +-
 .../freestyle/intern/app_blender/api.cpp      | 72 ++++++++++++-------
 .../intern/python/BinaryPredicate0D.cpp       |  0
 .../intern/python/BinaryPredicate1D.cpp       |  0
 .../python/BinaryPredicate1D/FalseBP1D.cpp    |  0
 .../python/BinaryPredicate1D/Length2DBP1D.cpp |  0
 .../BinaryPredicate1D/SameShapeIdBP1D.cpp     |  0
 .../python/BinaryPredicate1D/TrueBP1D.cpp     |  0
 .../ViewMapGradientNormBP1D.cpp               |  0
 .../intern/python/CurvePointIterator.cpp      |  0
 .../freestyle/intern/python/EdgeModifier.cpp  |  0
 .../python/EdgeModifier/TimestampModifier.cpp |  0
 source/blender/freestyle/intern/python/Id.cpp |  0
 .../freestyle/intern/python/Interface0D.cpp   |  0
 .../intern/python/Interface0D/CurvePoint.cpp  |  0
 .../Interface0D/CurvePoint/StrokeVertex.cpp   |  0
 .../intern/python/Interface0D/SVertex.cpp     |  0
 .../intern/python/Interface0D/ViewVertex.cpp  |  0
 .../Interface0D/ViewVertex/NonTVertex.cpp     |  0
 .../python/Interface0D/ViewVertex/TVertex.cpp |  0
 .../intern/python/Interface0DIterator.cpp     |  0
 .../freestyle/intern/python/Interface1D.cpp   |  0
 .../intern/python/Interface1D/Curve.cpp       |  0
 .../intern/python/Interface1D/Curve/Chain.cpp |  0
 .../intern/python/Interface1D/FEdge.cpp       |  0
 .../python/Interface1D/FEdge/FEdgeSharp.cpp   |  0
 .../python/Interface1D/FEdge/FEdgeSmooth.cpp  |  0
 .../intern/python/Interface1D/Stroke.cpp      |  0
 .../intern/python/Interface1D/ViewEdge.cpp    |  0
 .../freestyle/intern/python/Material.cpp      |  0
 .../blender/freestyle/intern/python/Noise.cpp |  0
 .../freestyle/intern/python/Operators.cpp     |  0
 .../freestyle/intern/python/SShape.cpp        |  0
 .../intern/python/StrokeAttribute.cpp         |  0
 .../freestyle/intern/python/StrokeShader.cpp  |  0
 .../StrokeShader/BackboneStretcherShader.cpp  |  0
 .../python/StrokeShader/BezierCurveShader.cpp |  0
 .../StrokeShader/CalligraphicShader.cpp       |  0
 .../python/StrokeShader/ColorNoiseShader.cpp  |  0
 .../ColorVariationPatternShader.cpp           |  0
 .../StrokeShader/ConstantColorShader.cpp      |  0
 .../StrokeShader/ConstantThicknessShader.cpp  |  0
 .../ConstrainedIncreasingThicknessShader.cpp  |  0
 .../StrokeShader/GuidingLinesShader.cpp       |  0
 .../StrokeShader/IncreasingColorShader.cpp    |  0
 .../IncreasingThicknessShader.cpp             |  0
 .../StrokeShader/PolygonalizationShader.cpp   |  0
 .../python/StrokeShader/SamplingShader.cpp    |  0
 .../StrokeShader/SpatialNoiseShader.cpp       |  0
 .../StrokeShader/StrokeTextureShader.cpp      |  0
 .../StrokeShader/TextureAssignerShader.cpp    |  0
 .../StrokeShader/ThicknessNoiseShader.cpp     |  0
 .../ThicknessVariationPatternShader.cpp       |  0
 .../python/StrokeShader/TipRemoverShader.cpp  |  0
 .../python/StrokeShader/fstreamShader.cpp     |  0
 .../python/StrokeShader/streamShader.cpp      |  0
 .../intern/python/StrokeVertexIterator.cpp    |  0
 .../intern/python/UnaryFunction0D.cpp         |  0
 .../UnaryFunction0D_Id/ShapeIdF0D.cpp         |  0
 .../UnaryFunction0D_Material/MaterialF0D.cpp  |  0
 .../CurveNatureF0D.cpp                        |  0
 .../UnaryFunction0D_Vec2f/Normal2DF0D.cpp     |  0
 .../VertexOrientation2DF0D.cpp                |  0
 .../VertexOrientation3DF0D.cpp                |  0
 .../GetOccludeeF0D.cpp                        |  0
 .../UnaryFunction0D_ViewShape/GetShapeF0D.cpp |  0
 .../UnaryFunction0D_double/DensityF0D.cpp     |  0
 .../LocalAverageDepthF0D.cpp                  |  0
 .../GetCurvilinearAbscissaF0D.cpp             |  0
 .../UnaryFunction0D_float/GetParameterF0D.cpp |  0
 .../GetViewMapGradientNormF0D.cpp             |  0
 .../ReadCompleteViewMapPixelF0D.cpp           |  0
 .../UnaryFunction0D_float/ReadMapPixelF0D.cpp |  0
 .../ReadSteerableViewMapPixelF0D.cpp          |  0
 .../Curvature2DAngleF0D.cpp                   |  0
 .../UnaryFunction0D_real/GetProjectedXF0D.cpp |  0
 .../UnaryFunction0D_real/GetProjectedYF0D.cpp |  0
 .../UnaryFunction0D_real/GetProjectedZF0D.cpp |  0
 .../UnaryFunction0D_real/GetXF0D.cpp          |  0
 .../UnaryFunction0D_real/GetYF0D.cpp          |  0
 .../UnaryFunction0D_real/GetZF0D.cpp          |  0
 .../ZDiscontinuityF0D.cpp                     |  0
 .../QuantitativeInvisibilityF0D.cpp           |  0
 .../GetOccludersF0D.cpp                       |  0
 .../intern/python/UnaryFunction1D.cpp         |  0
 .../CurveNatureF1D.cpp                        |  0
 .../UnaryFunction1D_Vec2f/Normal2DF1D.cpp     |  0
 .../Orientation2DF1D.cpp                      |  0
 .../Orientation3DF1D.cpp                      |  0
 .../UnaryFunction1D_double/DensityF1D.cpp     |  0
 .../GetCompleteViewMapDensityF1D.cpp          |  0
 .../GetDirectionalViewMapDensityF1D.cpp       |  0
 .../LocalAverageDepthF1D.cpp                  |  0
 .../Curvature2DAngleF1D.cpp                   |  0
 .../UnaryFunction1D_real/GetProjectedXF1D.cpp |  0
 .../UnaryFunction1D_real/GetProjectedYF1D.cpp |  0
 .../UnaryFunction1D_real/GetProjectedZF1D.cpp |  0
 .../GetSteerableViewMapDensityF1D.cpp         |  0
 .../GetViewMapGradientNormF1D.cpp             |  0
 .../UnaryFunction1D_real/GetXF1D.cpp          |  0
 .../UnaryFunction1D_real/GetYF1D.cpp          |  0
 .../UnaryFunction1D_real/GetZF1D.cpp          |  0
 .../ZDiscontinuityF1D.cpp                     |  0
 .../QuantitativeInvisibilityF1D.cpp           |  0
 .../GetOccludeeF1D.cpp                        |  0
 .../GetOccludersF1D.cpp                       |  0
 .../GetShapeF1D.cpp                           |  0
 .../ChainingTimeStampF1D.cpp                  |  0
 .../IncrementChainingTimeStampF1D.cpp         |  0
 .../UnaryFunction1D_void/TimeStampF1D.cpp     |  0
 .../intern/python/UnaryPredicate0D.cpp        |  0
 .../python/UnaryPredicate0D/FalseUP0D.cpp     |  0
 .../python/UnaryPredicate0D/TrueUP0D.cpp      |  0
 .../intern/python/UnaryPredicate1D.cpp        |  0
 .../python/UnaryPredicate1D/ContourUP1D.cpp   |  0
 .../UnaryPredicate1D/DensityLowerThanUP1D.cpp |  0
 .../EqualToChainingTimeStampUP1D.cpp          |  0
 .../UnaryPredicate1D/EqualToTimeStampUP1D.cpp |  0
 .../UnaryPredicate1D/ExternalContourUP1D.cpp  |  0
 .../python/UnaryPredicate1D/FalseUP1D.cpp     |  0
 .../QuantitativeInvisibilityUP1D.cpp          |  0
 .../python/UnaryPredicate1D/ShapeUP1D.cpp     |  0
 .../python/UnaryPredicate1D/TrueUP1D.cpp      |  0
 .../intern/python/ViewEdgeIterator.cpp        |  0
 .../ViewEdgeIterator/ChainingIterator.cpp     |  0
 .../ChainPredicateIterator.cpp                |  0
 .../ChainSilhouetteIterator.cpp               |  0
 .../freestyle/intern/python/ViewMap.cpp       |  0
 .../freestyle/intern/python/ViewShape.cpp     |  0
 .../python/orientedViewEdgeIterator.cpp       |  0
 130 files changed, 46 insertions(+), 28 deletions(-)
 create mode 100644 source/blender/freestyle/intern/python/BinaryPredicate0D.cpp
 create mode 100644 source/blender/freestyle/intern/python/BinaryPredicate1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/BinaryPredicate1D/FalseBP1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/BinaryPredicate1D/Length2DBP1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/BinaryPredicate1D/SameShapeIdBP1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/BinaryPredicate1D/TrueBP1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/BinaryPredicate1D/ViewMapGradientNormBP1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/CurvePointIterator.cpp
 create mode 100644 source/blender/freestyle/intern/python/EdgeModifier.cpp
 create mode 100644 source/blender/freestyle/intern/python/EdgeModifier/TimestampModifier.cpp
 create mode 100644 source/blender/freestyle/intern/python/Id.cpp
 create mode 100644 source/blender/freestyle/intern/python/Interface0D.cpp
 create mode 100644 source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp
 create mode 100644 source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.cpp
 create mode 100644 source/blender/freestyle/intern/python/Interface0D/SVertex.cpp
 create mode 100644 source/blender/freestyle/intern/python/Interface0D/ViewVertex.cpp
 create mode 100644 source/blender/freestyle/intern/python/Interface0D/ViewVertex/NonTVertex.cpp
 create mode 100644 source/blender/freestyle/intern/python/Interface0D/ViewVertex/TVertex.cpp
 create mode 100644 source/blender/freestyle/intern/python/Interface0DIterator.cpp
 create mode 100644 source/blender/freestyle/intern/python/Interface1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/Interface1D/Curve.cpp
 create mode 100644 source/blender/freestyle/intern/python/Interface1D/Curve/Chain.cpp
 create mode 100644 source/blender/freestyle/intern/python/Interface1D/FEdge.cpp
 create mode 100644 source/blender/freestyle/intern/python/Interface1D/FEdge/FEdgeSharp.cpp
 create mode 100644 source/blender/freestyle/intern/python/Interface1D/FEdge/FEdgeSmooth.cpp
 create mode 100644 source/blender/freestyle/intern/python/Interface1D/Stroke.cpp
 create mode 100644 source/blender/freestyle/intern/python/Interface1D/ViewEdge.cpp
 create mode 100644 source/blender/freestyle/intern/python/Material.cpp
 create mode 100644 source/blender/freestyle/intern/python/Noise.cpp
 create mode 100644 source/blender/freestyle/intern/python/Operators.cpp
 create mode 100644 source/blender/freestyle/intern/python/SShape.cpp
 create mode 100644 source/blender/freestyle/intern/python/StrokeAttribute.cpp
 create mode 100644 source/blender/freestyle/intern/python/StrokeShader.cpp
 create mode 100644 source/blender/freestyle/intern/python/StrokeShader/BackboneStretcherShader.cpp
 create mode 100644 source/blender/freestyle/intern/python/StrokeShader/BezierCurveShader.cpp
 create mode 100644 source/blender/freestyle/intern/python/StrokeShader/CalligraphicShader.cpp
 create mode 100644 source/blender/freestyle/intern/python/StrokeShader/ColorNoiseShader.cpp
 create mode 100644 source/blender/freestyle/intern/python/StrokeShader/ColorVariationPatternShader.cpp
 create mode 100644 source/blender/freestyle/intern/python/StrokeShader/ConstantColorShader.cpp
 create mode 100644 source/blender/freestyle/intern/python/StrokeShader/ConstantThicknessShader.cpp
 create mode 100644 source/blender/freestyle/intern/python/StrokeShader/ConstrainedIncreasingThicknessShader.cpp
 create mode 100644 source/blender/freestyle/intern/python/StrokeShader/GuidingLinesShader.cpp
 create mode 100644 source/blender/freestyle/intern/python/StrokeShader/IncreasingColorShader.cpp
 create mode 100644 source/blender/freestyle/intern/python/StrokeShader/IncreasingThicknessShader.cpp
 create mode 100644 source/blender/freestyle/intern/python/StrokeShader/PolygonalizationShader.cpp
 create mode 100644 source/blender/freestyle/intern/python/StrokeShader/SamplingShader.cpp
 create mode 100644 source/blender/freestyle/intern/python/StrokeShader/SpatialNoiseShader.cpp
 create mode 100644 source/blender/freestyle/intern/python/StrokeShader/StrokeTextureShader.cpp
 create mode 100644 source/blender/freestyle/intern/python/StrokeShader/TextureAssignerShader.cpp
 create mode 100644 source/blender/freestyle/intern/python/StrokeShader/ThicknessNoiseShader.cpp
 create mode 100644 source/blender/freestyle/intern/python/StrokeShader/ThicknessVariationPatternShader.cpp
 create mode 100644 source/blender/freestyle/intern/python/StrokeShader/TipRemoverShader.cpp
 create mode 100644 source/blender/freestyle/intern/python/StrokeShader/fstreamShader.cpp
 create mode 100644 source/blender/freestyle/intern/python/StrokeShader/streamShader.cpp
 create mode 100644 source/blender/freestyle/intern/python/StrokeVertexIterator.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/ShapeIdF0D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/MaterialF0D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/CurveNatureF0D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/Normal2DF0D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/VertexOrientation2DF0D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/VertexOrientation3DF0D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/GetOccludeeF0D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/GetShapeF0D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/DensityF0D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/LocalAverageDepthF0D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetCurvilinearAbscissaF0D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetParameterF0D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetViewMapGradientNormF0D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadCompleteViewMapPixelF0D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadMapPixelF0D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadSteerableViewMapPixelF0D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/Curvature2DAngleF0D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedXF0D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedYF0D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedZF0D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetXF0D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetYF0D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetZF0D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/ZDiscontinuityF0D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/QuantitativeInvisibilityF0D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/GetOccludersF0D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/CurveNatureF1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/Normal2DF1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/Orientation2DF1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/Orientation3DF1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/DensityF1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/GetCompleteViewMapDensityF1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/GetDirectionalViewMapDensityF1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/LocalAverageDepthF1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/Curvature2DAngleF1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedXF1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedYF1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedZF1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetSteerableViewMapDensityF1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetViewMapGradientNormF1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetXF1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetYF1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetZF1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/ZDiscontinuityF1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned/QuantitativeInvisibilityF1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetOccludeeF1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetOccludersF1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetShapeF1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/ChainingTimeStampF1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/IncrementChainingTimeStampF1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/TimeStampF1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryPredicate0D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryPredicate0D/FalseUP0D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryPredicate0D/TrueUP0D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryPredicate1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryPredicate1D/ContourUP1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryPredicate1D/DensityLowerThanUP1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryPredicate1D/EqualToChainingTimeStampUP1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryPredicate1D/EqualToTimeStampUP1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryPredicate1D/ExternalContourUP1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryPredicate1D/FalseUP1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryPredicate1D/QuantitativeInvisibilityUP1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryPredicate1D/ShapeUP1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryPredicate1D/TrueUP1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/ViewEdgeIterator.cpp
 create mode 100644 source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator.cpp
 create mode 100644 source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/ChainPredicateIterator.cpp
 create mode 100644 source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/ChainSilhouetteIterator.cpp
 create mode 100644 source/blender/freestyle/intern/python/ViewMap.cpp
 create mode 100644 source/blender/freestyle/intern/python/ViewShape.cpp
 create mode 100644 source/blender/freestyle/intern/python/orientedViewEdgeIterator.cpp

diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript
index 656cecb4e75..31715bda5a3 100644
--- a/source/blender/freestyle/SConscript
+++ b/source/blender/freestyle/SConscript
@@ -7,7 +7,7 @@ defs = []
 incs = ''
 
 incs += '../blenkernel ../blenlib ../imbuf ../makesdna ../python '
-incs += '../render/extern/include ../render/intern/include'
+incs += '../render/extern/include ../render/intern/include ../include ../src'
 incs += ' #/extern/freestyle/lib3ds' 
 incs += ' ' + env['BF_PYTHON_INC']
 incs += ' ' + env['BF_LIB3DS_INC']
diff --git a/source/blender/freestyle/intern/app_blender/api.cpp b/source/blender/freestyle/intern/app_blender/api.cpp
index 36dac821898..2395df646f0 100644
--- a/source/blender/freestyle/intern/app_blender/api.cpp
+++ b/source/blender/freestyle/intern/app_blender/api.cpp
@@ -106,11 +106,12 @@ extern "C" {
 
 	void FRS_render(Render* re, int render_in_layer) {
 		
-		if(render_in_layer) {
-			view->workingBuffer = GL_COLOR_ATTACHMENT0_EXT;
-		} else {
-			view->workingBuffer = GL_BACK;
-		}
+		// if(render_in_layer) {
+		// 	view->workingBuffer = GL_COLOR_ATTACHMENT0_EXT;
+		// } else {
+		// 	view->workingBuffer = GL_BACK;
+		// }
+		view->workingBuffer = GL_BACK;
 		
 		// add style module
 		string style_module = pathconfig->getProjectDir() + 
@@ -134,8 +135,12 @@ extern "C" {
 		GLuint framebuffer, renderbuffers[2];
 		GLenum status;
 		RenderLayer *rl;
+		GLubyte *pixc;
 		
 		if(render_in_layer) {
+			
+			pixc = (GLubyte *) malloc( 4 * re->winx * re->winy * sizeof(GLubyte) );
+			
 			cout << "Freestyle as a render layer - SETUP" << endl;
 		
 			// set up frame buffer
@@ -146,7 +151,7 @@ extern "C" {
 			glGenRenderbuffersEXT(2, renderbuffers);
 			
 			glBindRenderbufferEXT(GL_RENDERBUFFER_EXT,	renderbuffers[0]);
-			glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_RGBA16F_ARB, re->winx, re->winy);
+			glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_RGBA, re->winx, re->winy);
 			glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_RENDERBUFFER_EXT, renderbuffers[0]);
 			
 			glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, renderbuffers[1]);
@@ -163,38 +168,51 @@ extern "C" {
 				return;
 			}
 			
-			glPushAttrib(GL_VIEWPORT_BIT); 
+			glPushAttrib(GL_VIEWPORT_BIT);
+			glDrawBuffer(GL_COLOR_ATTACHMENT0_EXT); // should not be needed
 			glViewport(0, 0, re->winx, re->winy);
-			glDrawBuffer(GL_COLOR_ATTACHMENT0_EXT); // really needed ?
-		}
-		
-		FRS_render(re, render_in_layer);
-		
-		if(render_in_layer) {
-			for(rl = (RenderLayer *)re->result->layers.first; rl; rl= rl->next) {
-				if(rl->layflag & SCE_LAY_FRS) {
-					cout << "Freestyle as a render layer - RESULT" << endl;
-					
-					// transfer render to layer
-					glReadBuffer(GL_COLOR_ATTACHMENT0_EXT);
-					glReadPixels(0, 0, re->winx, re->winy, GL_RGBA, GL_FLOAT, rl->rectf );
+			
+			FRS_render(re, render_in_layer);
 
-					// bind window
-					glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
-					glDrawBuffer(GL_BACK);
-					glPopAttrib();
-					glDeleteRenderbuffersEXT(2, renderbuffers);
-					glDeleteFramebuffersEXT(1, &framebuffer);
+			// keep first Freestyle layer
+			for(rl = (RenderLayer *)re->result->layers.first; rl; rl= rl->next)
+				if(rl->layflag & SCE_LAY_FRS)
+					break;
+
+			cout << "Freestyle as a render layer - RESULT" << endl;
+
+			// transfer render to layer
+			glReadBuffer(GL_COLOR_ATTACHMENT0_EXT);
+			glReadPixels(0, 0, re->winx, re->winy, GL_RGBA, GL_UNSIGNED_BYTE, pixc );
+
+			int p;
+			for(int i = 0; i < re->winx; i++) {
+				for(int j = 0; j < re->winy; j++){
+					p = 4*(i*re->winy + j);
+					*(rl->rectf + p    ) = 1.0*pixc[ p ]/255.0;
+					*(rl->rectf + p + 1) = 1.0*pixc[ p+1 ]/255.0;
+					*(rl->rectf + p + 2) = 1.0*pixc[ p+2 ]/255.0;
+					*(rl->rectf + p + 3) = 1.0*pixc[ p+3 ]/255.0;
 				}
 			}
+
+			// bind window
+			glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+			glDrawBuffer(GL_BACK);
+			glPopAttrib();
+			glDeleteRenderbuffersEXT(2, renderbuffers);
+			glDeleteFramebuffersEXT(1, &framebuffer);
+			
 		} else {
-			// copy result into render window
+			FRS_render(re, render_in_layer);
+			
 			RenderResult rres;
 			RE_GetResultImage(re, &rres);
 			view->readPixels(0, 0, re->winx, re->winy, AppGLWidget::RGBA, rres.rectf );		
 			re->result->renlay = render_get_active_layer(re, re->result);
 			re->display_draw(re->result, NULL);
 		}
+
 		
 		controller->CloseFile();
 	}
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate0D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate0D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/FalseBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/FalseBP1D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/Length2DBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/Length2DBP1D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/SameShapeIdBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/SameShapeIdBP1D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/TrueBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/TrueBP1D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/ViewMapGradientNormBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/ViewMapGradientNormBP1D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/CurvePointIterator.cpp b/source/blender/freestyle/intern/python/CurvePointIterator.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/EdgeModifier.cpp b/source/blender/freestyle/intern/python/EdgeModifier.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/EdgeModifier/TimestampModifier.cpp b/source/blender/freestyle/intern/python/EdgeModifier/TimestampModifier.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/Id.cpp b/source/blender/freestyle/intern/python/Id.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/Interface0D.cpp b/source/blender/freestyle/intern/python/Interface0D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp b/source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/Interface0D/SVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/SVertex.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/ViewVertex.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/NonTVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/NonTVertex.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/TVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/TVertex.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/Interface0DIterator.cpp b/source/blender/freestyle/intern/python/Interface0DIterator.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/Interface1D.cpp b/source/blender/freestyle/intern/python/Interface1D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/Interface1D/Curve.cpp b/source/blender/freestyle/intern/python/Interface1D/Curve.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/Interface1D/Curve/Chain.cpp b/source/blender/freestyle/intern/python/Interface1D/Curve/Chain.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/FEdgeSharp.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge/FEdgeSharp.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/FEdgeSmooth.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge/FEdgeSmooth.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/Interface1D/Stroke.cpp b/source/blender/freestyle/intern/python/Interface1D/Stroke.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/Interface1D/ViewEdge.cpp b/source/blender/freestyle/intern/python/Interface1D/ViewEdge.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/Material.cpp b/source/blender/freestyle/intern/python/Material.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/Noise.cpp b/source/blender/freestyle/intern/python/Noise.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/Operators.cpp b/source/blender/freestyle/intern/python/Operators.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/SShape.cpp b/source/blender/freestyle/intern/python/SShape.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/StrokeAttribute.cpp b/source/blender/freestyle/intern/python/StrokeAttribute.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/StrokeShader.cpp b/source/blender/freestyle/intern/python/StrokeShader.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BackboneStretcherShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BackboneStretcherShader.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BezierCurveShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BezierCurveShader.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/StrokeShader/CalligraphicShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/CalligraphicShader.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/StrokeShader/ColorNoiseShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/ColorNoiseShader.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/StrokeShader/ColorVariationPatternShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/ColorVariationPatternShader.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/StrokeShader/ConstantColorShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/ConstantColorShader.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/StrokeShader/ConstantThicknessShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/ConstantThicknessShader.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/StrokeShader/ConstrainedIncreasingThicknessShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/ConstrainedIncreasingThicknessShader.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/StrokeShader/GuidingLinesShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/GuidingLinesShader.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/StrokeShader/IncreasingColorShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/IncreasingColorShader.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/StrokeShader/IncreasingThicknessShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/IncreasingThicknessShader.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/StrokeShader/PolygonalizationShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/PolygonalizationShader.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/StrokeShader/SamplingShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/SamplingShader.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/StrokeShader/SpatialNoiseShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/SpatialNoiseShader.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/StrokeShader/StrokeTextureShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/StrokeTextureShader.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/StrokeShader/TextureAssignerShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/TextureAssignerShader.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/StrokeShader/ThicknessNoiseShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/ThicknessNoiseShader.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/StrokeShader/ThicknessVariationPatternShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/ThicknessVariationPatternShader.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/StrokeShader/TipRemoverShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/TipRemoverShader.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/StrokeShader/fstreamShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/fstreamShader.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/StrokeShader/streamShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/streamShader.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/StrokeVertexIterator.cpp b/source/blender/freestyle/intern/python/StrokeVertexIterator.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/ShapeIdF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/ShapeIdF0D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/MaterialF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/MaterialF0D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/CurveNatureF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/CurveNatureF0D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/Normal2DF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/Normal2DF0D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/VertexOrientation2DF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/VertexOrientation2DF0D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/VertexOrientation3DF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/VertexOrientation3DF0D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/GetOccludeeF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/GetOccludeeF0D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/GetShapeF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/GetShapeF0D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/DensityF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/DensityF0D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/LocalAverageDepthF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/LocalAverageDepthF0D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetCurvilinearAbscissaF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetCurvilinearAbscissaF0D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetParameterF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetParameterF0D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetViewMapGradientNormF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetViewMapGradientNormF0D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadCompleteViewMapPixelF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadCompleteViewMapPixelF0D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadMapPixelF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadMapPixelF0D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadSteerableViewMapPixelF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadSteerableViewMapPixelF0D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/Curvature2DAngleF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/Curvature2DAngleF0D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedXF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedXF0D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedYF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedYF0D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedZF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedZF0D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetXF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetXF0D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetYF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetYF0D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetZF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetZF0D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/ZDiscontinuityF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/ZDiscontinuityF0D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/QuantitativeInvisibilityF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/QuantitativeInvisibilityF0D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/GetOccludersF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/GetOccludersF0D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/CurveNatureF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/CurveNatureF1D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/Normal2DF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/Normal2DF1D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/Orientation2DF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/Orientation2DF1D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/Orientation3DF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/Orientation3DF1D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/DensityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/DensityF1D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/GetCompleteViewMapDensityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/GetCompleteViewMapDensityF1D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/GetDirectionalViewMapDensityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/GetDirectionalViewMapDensityF1D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/LocalAverageDepthF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/LocalAverageDepthF1D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/Curvature2DAngleF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/Curvature2DAngleF1D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedXF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedXF1D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedYF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedYF1D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedZF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedZF1D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetSteerableViewMapDensityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetSteerableViewMapDensityF1D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetViewMapGradientNormF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetViewMapGradientNormF1D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetXF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetXF1D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetYF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetYF1D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetZF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetZF1D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/ZDiscontinuityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/ZDiscontinuityF1D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned/QuantitativeInvisibilityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned/QuantitativeInvisibilityF1D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetOccludeeF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetOccludeeF1D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetOccludersF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetOccludersF1D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetShapeF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetShapeF1D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/ChainingTimeStampF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/ChainingTimeStampF1D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/IncrementChainingTimeStampF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/IncrementChainingTimeStampF1D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/TimeStampF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/TimeStampF1D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate0D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate0D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate0D/FalseUP0D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate0D/FalseUP0D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate0D/TrueUP0D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate0D/TrueUP0D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/ContourUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/ContourUP1D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/DensityLowerThanUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/DensityLowerThanUP1D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/EqualToChainingTimeStampUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/EqualToChainingTimeStampUP1D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/EqualToTimeStampUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/EqualToTimeStampUP1D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/ExternalContourUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/ExternalContourUP1D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/FalseUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/FalseUP1D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/QuantitativeInvisibilityUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/QuantitativeInvisibilityUP1D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/ShapeUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/ShapeUP1D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/TrueUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/TrueUP1D.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/ViewEdgeIterator.cpp b/source/blender/freestyle/intern/python/ViewEdgeIterator.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator.cpp b/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/ChainPredicateIterator.cpp b/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/ChainPredicateIterator.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/ChainSilhouetteIterator.cpp b/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/ChainSilhouetteIterator.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/ViewMap.cpp b/source/blender/freestyle/intern/python/ViewMap.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/ViewShape.cpp b/source/blender/freestyle/intern/python/ViewShape.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/orientedViewEdgeIterator.cpp b/source/blender/freestyle/intern/python/orientedViewEdgeIterator.cpp
new file mode 100644
index 00000000000..e69de29bb2d

From d760119f451ef9ff0218ad5e053e51d54c64fc1b Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Wed, 9 Jul 2008 08:24:13 +0000
Subject: [PATCH 076/252] soc-mx-2008: SWIG dependency - wrapper functions
 extracted from ModuleWrapper.cpp

---
 .../intern/python/BinaryPredicate0D.cpp       |   8 +
 .../intern/python/BinaryPredicate1D.cpp       |  12 +
 .../python/BinaryPredicate1D/FalseBP1D.cpp    |  16 +
 .../python/BinaryPredicate1D/Length2DBP1D.cpp |  16 +
 .../BinaryPredicate1D/SameShapeIdBP1D.cpp     |  16 +
 .../python/BinaryPredicate1D/TrueBP1D.cpp     |  16 +
 .../ViewMapGradientNormBP1D.cpp               |  12 +
 .../intern/python/CurvePointIterator.cpp      | 284 ++++++++++++++++++
 source/blender/freestyle/intern/python/Id.cpp |  32 ++
 .../freestyle/intern/python/Interface0D.cpp   |  68 +++++
 .../intern/python/Interface0D/CurvePoint.cpp  | 176 +++++++++++
 .../Interface0D/CurvePoint/StrokeVertex.cpp   | 104 +++++++
 .../intern/python/Interface0D/SVertex.cpp     | 268 +++++++++++++++++
 .../intern/python/Interface0D/ViewVertex.cpp  |  76 +++++
 .../Interface0D/ViewVertex/NonTVertex.cpp     | 132 ++++++++
 .../python/Interface0D/ViewVertex/TVertex.cpp | 184 ++++++++++++
 .../intern/python/Interface0DIterator.cpp     | 104 +++++++
 .../freestyle/intern/python/Interface1D.cpp   |  56 ++++
 .../intern/python/Interface1D/Curve.cpp       | 112 +++++++
 .../intern/python/Interface1D/FEdge.cpp       | 252 ++++++++++++++++
 .../python/Interface1D/FEdge/FEdgeSharp.cpp   |  44 +++
 .../python/Interface1D/FEdge/FEdgeSmooth.cpp  |  32 ++
 .../intern/python/Interface1D/Stroke.cpp      | 236 +++++++++++++++
 .../intern/python/Interface1D/ViewEdge.cpp    | 236 +++++++++++++++
 .../freestyle/intern/python/Material.cpp      | 112 +++++++
 .../blender/freestyle/intern/python/Noise.cpp |  48 +++
 .../freestyle/intern/python/Operators.cpp     | 104 +++++++
 .../freestyle/intern/python/SShape.cpp        | 120 ++++++++
 .../intern/python/StrokeAttribute.cpp         | 112 +++++++
 .../freestyle/intern/python/StrokeShader.cpp  |  12 +
 .../StrokeShader/BackboneStretcherShader.cpp  |   8 +
 .../python/StrokeShader/BezierCurveShader.cpp |   8 +
 .../StrokeShader/CalligraphicShader.cpp       |   4 +
 .../python/StrokeShader/ColorNoiseShader.cpp  |   8 +
 .../ColorVariationPatternShader.cpp           |   4 +
 .../StrokeShader/ConstantColorShader.cpp      |  12 +
 .../StrokeShader/ConstantThicknessShader.cpp  |   8 +
 .../ConstrainedIncreasingThicknessShader.cpp  |   4 +
 .../StrokeShader/GuidingLinesShader.cpp       |   8 +
 .../StrokeShader/IncreasingColorShader.cpp    |   8 +
 .../IncreasingThicknessShader.cpp             |   4 +
 .../StrokeShader/PolygonalizationShader.cpp   |   8 +
 .../python/StrokeShader/SamplingShader.cpp    |   8 +
 .../StrokeShader/SpatialNoiseShader.cpp       |   4 +
 .../StrokeShader/StrokeTextureShader.cpp      |   8 +
 .../StrokeShader/TextureAssignerShader.cpp    |   8 +
 .../StrokeShader/ThicknessNoiseShader.cpp     |   8 +
 .../ThicknessVariationPatternShader.cpp       |   4 +
 .../python/StrokeShader/TipRemoverShader.cpp  |   4 +
 .../python/StrokeShader/fstreamShader.cpp     |   8 +
 .../python/StrokeShader/streamShader.cpp      |  12 +
 .../intern/python/StrokeVertexIterator.cpp    | 260 ++++++++++++++++
 .../intern/python/UnaryFunction0D.cpp         |   0
 .../UnaryFunction0D/UnaryFunction0DDouble.cpp |  12 +
 .../UnaryFunction0D/UnaryFunction0DFloat.cpp  |  12 +
 .../UnaryFunction0D/UnaryFunction0DId.cpp     |  12 +
 .../UnaryFunction0DUnsigned.cpp               |  12 +
 .../UnaryFunction0D/UnaryFunction0DVec2f.cpp  |  12 +
 .../UnaryFunction0D/UnaryFunction0DVec3f.cpp  |  12 +
 .../UnaryFunction0DVectorViewShape.cpp        |   8 +
 .../UnaryFunction0DViewShape.cpp              |   8 +
 .../UnaryFunction0D_Id/ShapeIdF0D.cpp         |  16 +
 .../UnaryFunction0D_Material/MaterialF0D.cpp  |  16 +
 .../CurveNatureF0D.cpp                        |  16 +
 .../UnaryFunction0D_Vec2f/Normal2DF0D.cpp     |  16 +
 .../VertexOrientation2DF0D.cpp                |  16 +
 .../VertexOrientation3DF0D.cpp                |  16 +
 .../GetOccludeeF0D.cpp                        |  16 +
 .../UnaryFunction0D_ViewShape/GetShapeF0D.cpp |  16 +
 .../UnaryFunction0D_double/DensityF0D.cpp     |   0
 .../LocalAverageDepthF0D.cpp                  |   0
 .../GetCurvilinearAbscissaF0D.cpp             |  16 +
 .../UnaryFunction0D_float/GetParameterF0D.cpp |  16 +
 .../GetViewMapGradientNormF0D.cpp             |  12 +
 .../ReadCompleteViewMapPixelF0D.cpp           |  12 +
 .../UnaryFunction0D_float/ReadMapPixelF0D.cpp |  12 +
 .../ReadSteerableViewMapPixelF0D.cpp          |  12 +
 .../Curvature2DAngleF0D.cpp                   |  16 +
 .../UnaryFunction0D_real/GetProjectedXF0D.cpp |  16 +
 .../UnaryFunction0D_real/GetProjectedYF0D.cpp |  16 +
 .../UnaryFunction0D_real/GetProjectedZF0D.cpp |  16 +
 .../UnaryFunction0D_real/GetXF0D.cpp          |  16 +
 .../UnaryFunction0D_real/GetYF0D.cpp          |  16 +
 .../UnaryFunction0D_real/GetZF0D.cpp          |  16 +
 .../ZDiscontinuityF0D.cpp                     |  16 +
 .../QuantitativeInvisibilityF0D.cpp           |  16 +
 .../GetOccludersF0D.cpp                       |  16 +
 .../intern/python/UnaryFunction0DVoid.cpp     |  12 +
 .../intern/python/UnaryFunction1D.cpp         |   0
 .../UnaryFunction1D/UnaryFunction1DDouble.cpp |  20 ++
 .../UnaryFunction1D/UnaryFunction1DFloat.cpp  |  20 ++
 .../UnaryFunction1DUnsigned.cpp               |  20 ++
 .../UnaryFunction1D/UnaryFunction1DVec2f.cpp  |  20 ++
 .../UnaryFunction1D/UnaryFunction1DVec3f.cpp  |  20 ++
 .../UnaryFunction1DVectorViewShape.cpp        |  16 +
 .../CurveNatureF1D.cpp                        |  12 +
 .../UnaryFunction1D_Vec2f/Normal2DF1D.cpp     |  12 +
 .../Orientation2DF1D.cpp                      |  12 +
 .../Orientation3DF1D.cpp                      |  12 +
 .../UnaryFunction1D_double/DensityF1D.cpp     |   8 +
 .../GetCompleteViewMapDensityF1D.cpp          |  12 +
 .../GetDirectionalViewMapDensityF1D.cpp       |  12 +
 .../LocalAverageDepthF1D.cpp                  |  12 +
 .../Curvature2DAngleF1D.cpp                   |  12 +
 .../UnaryFunction1D_real/GetProjectedXF1D.cpp |  12 +
 .../UnaryFunction1D_real/GetProjectedYF1D.cpp |  12 +
 .../UnaryFunction1D_real/GetProjectedZF1D.cpp |  12 +
 .../GetSteerableViewMapDensityF1D.cpp         |   8 +
 .../GetViewMapGradientNormF1D.cpp             |  12 +
 .../UnaryFunction1D_real/GetXF1D.cpp          |  12 +
 .../UnaryFunction1D_real/GetYF1D.cpp          |  12 +
 .../UnaryFunction1D_real/GetZF1D.cpp          |  12 +
 .../ZDiscontinuityF1D.cpp                     |  12 +
 .../QuantitativeInvisibilityF1D.cpp           |  12 +
 .../GetOccludeeF1D.cpp                        |  12 +
 .../GetOccludersF1D.cpp                       |  12 +
 .../GetShapeF1D.cpp                           |  12 +
 .../ChainingTimeStampF1D.cpp                  |  16 +
 .../IncrementChainingTimeStampF1D.cpp         |  16 +
 .../UnaryFunction1D_void/TimeStampF1D.cpp     |  16 +
 .../intern/python/UnaryFunction1DVoid.cpp     |  20 ++
 .../intern/python/UnaryPredicate0D.cpp        |  12 +
 .../python/UnaryPredicate0D/FalseUP0D.cpp     |  12 +
 .../python/UnaryPredicate0D/TrueUP0D.cpp      |  12 +
 .../intern/python/UnaryPredicate1D.cpp        |  12 +
 .../python/UnaryPredicate1D/ContourUP1D.cpp   |  16 +
 .../UnaryPredicate1D/DensityLowerThanUP1D.cpp |  12 +
 .../EqualToChainingTimeStampUP1D.cpp          |  12 +
 .../UnaryPredicate1D/EqualToTimeStampUP1D.cpp |  12 +
 .../UnaryPredicate1D/ExternalContourUP1D.cpp  |  16 +
 .../python/UnaryPredicate1D/FalseUP1D.cpp     |  12 +
 .../QuantitativeInvisibilityUP1D.cpp          |  12 +
 .../python/UnaryPredicate1D/ShapeUP1D.cpp     |  12 +
 .../python/UnaryPredicate1D/TrueUP1D.cpp      |  12 +
 .../ViewEdgeIterator/ChainingIterator.cpp     |  36 +++
 .../ChainPredicateIterator.cpp                |  12 +
 .../ChainSilhouetteIterator.cpp               |  16 +
 .../freestyle/intern/python/ViewMap.cpp       | 104 +++++++
 .../freestyle/intern/python/ViewShape.cpp     |  88 ++++++
 139 files changed, 4736 insertions(+)
 delete mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DDouble.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DFloat.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DId.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DUnsigned.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVec2f.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVec3f.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVectorViewShape.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DViewShape.cpp
 delete mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/DensityF0D.cpp
 delete mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/LocalAverageDepthF0D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0DVoid.cpp
 delete mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DDouble.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DFloat.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DUnsigned.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVec2f.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVec3f.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVectorViewShape.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1DVoid.cpp

diff --git a/source/blender/freestyle/intern/python/BinaryPredicate0D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate0D.cpp
index e69de29bb2d..ea7b1fcca89 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate0D.cpp
+++ b/source/blender/freestyle/intern/python/BinaryPredicate0D.cpp
@@ -0,0 +1,8 @@
+SWIGINTERN PyObject *_wrap_BinaryPredicate0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_BinaryPredicate0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D.cpp
index e69de29bb2d..ebf4ab94ecb 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D.cpp
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_BinaryPredicate1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_BinaryPredicate1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_disown_BinaryPredicate1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/FalseBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/FalseBP1D.cpp
index e69de29bb2d..59946ce22e1 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D/FalseBP1D.cpp
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/FalseBP1D.cpp
@@ -0,0 +1,16 @@
+SWIGINTERN PyObject *_wrap_FalseBP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FalseBP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FalseBP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_FalseBP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/Length2DBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/Length2DBP1D.cpp
index e69de29bb2d..a249a230b87 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D/Length2DBP1D.cpp
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/Length2DBP1D.cpp
@@ -0,0 +1,16 @@
+SWIGINTERN PyObject *_wrap_Length2DBP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Length2DBP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Length2DBP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_Length2DBP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/SameShapeIdBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/SameShapeIdBP1D.cpp
index e69de29bb2d..d82c4166a09 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D/SameShapeIdBP1D.cpp
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/SameShapeIdBP1D.cpp
@@ -0,0 +1,16 @@
+SWIGINTERN PyObject *_wrap_SameShapeIdBP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SameShapeIdBP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_SameShapeIdBP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_SameShapeIdBP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/TrueBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/TrueBP1D.cpp
index e69de29bb2d..b0e5825e0d6 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D/TrueBP1D.cpp
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/TrueBP1D.cpp
@@ -0,0 +1,16 @@
+SWIGINTERN PyObject *_wrap_TrueBP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_TrueBP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_TrueBP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_TrueBP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/ViewMapGradientNormBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/ViewMapGradientNormBP1D.cpp
index e69de29bb2d..3bd22915831 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D/ViewMapGradientNormBP1D.cpp
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/ViewMapGradientNormBP1D.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_ViewMapGradientNormBP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMapGradientNormBP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ViewMapGradientNormBP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/CurvePointIterator.cpp b/source/blender/freestyle/intern/python/CurvePointIterator.cpp
index e69de29bb2d..4e4291a9c88 100644
--- a/source/blender/freestyle/intern/python/CurvePointIterator.cpp
+++ b/source/blender/freestyle/intern/python/CurvePointIterator.cpp
@@ -0,0 +1,284 @@
+SWIGINTERN PyObject *_wrap_CurvePointIterator__CurvilinearLength_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator__CurvilinearLength_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator__step_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator__step_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator___A_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator___A_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator___B_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator___B_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator__begin_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator__begin_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator__end_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator__end_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator__n_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator__n_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator__currentn_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator__currentn_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator__t_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator__t_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator__Point_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator__Point_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator__CurveLength_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator__CurveLength_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_CurvePointIterator__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_CurvePointIterator__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_CurvePointIterator__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_CurvePointIterator(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_CurvePointIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_copy(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_CastToInterface0DIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_getObject(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator___deref__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_isBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_isEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_getX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_getY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_getZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_getPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_getProjectedX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_getProjectedY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_getProjectedZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_getPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_getFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_getNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_castToSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_castToViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_castToNonTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_castToTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_A(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_B(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_t2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_SetA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_SetB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_SetT2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_fedge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_point2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_point3d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_normal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_shape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_occluders_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_occluders_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_occluders_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_occluders_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_occludee(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_occluded_shape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_occludee_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_z_discontinuity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_curvatureFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_directionFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/Id.cpp b/source/blender/freestyle/intern/python/Id.cpp
index e69de29bb2d..681db76faab 100644
--- a/source/blender/freestyle/intern/python/Id.cpp
+++ b/source/blender/freestyle/intern/python/Id.cpp
@@ -0,0 +1,32 @@
+SWIGINTERN PyObject *_wrap_Id_getFirst(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Id_getSecond(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Id_setFirst(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Id_setSecond(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Id___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Id___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Id___lt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_Id(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/Interface0D.cpp b/source/blender/freestyle/intern/python/Interface0D.cpp
index e69de29bb2d..54541cdb8cb 100644
--- a/source/blender/freestyle/intern/python/Interface0D.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D.cpp
@@ -0,0 +1,68 @@
+SWIGINTERN PyObject *_wrap_Interface0D_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0D_getX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0D_getY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0D_getZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0D_getPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0D_getProjectedX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0D_getProjectedY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0D_getProjectedZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0D_getPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0D_getFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0D_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0D_getNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0D_castToSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0D_castToViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0D_castToNonTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0D_castToTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Interface0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp b/source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp
index e69de29bb2d..7d966185449 100644
--- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp
@@ -0,0 +1,176 @@
+SWIGINTERN PyObject *_wrap_CurvePoint_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_getX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_getY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_getZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_getPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_getProjectedX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_getProjectedY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_getProjectedZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_getPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_getFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_getNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_castToSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_castToViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_castToNonTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_castToTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_CurvePoint__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_CurvePoint__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_CurvePoint__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_CurvePoint__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_CurvePoint(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_CurvePoint(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_A(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_B(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_t2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_SetA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_SetB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_SetT2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_fedge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_point2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_point3d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_normal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_shape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_occluders_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_occluders_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_occluders_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_occluders_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_occludee(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_occluded_shape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_occludee_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_z_discontinuity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_curvatureFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePoint_directionFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.cpp
index e69de29bb2d..aa98b1cc008 100644
--- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.cpp
@@ -0,0 +1,104 @@
+SWIGINTERN PyObject *_wrap_StrokeVertex_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_StrokeVertex__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_StrokeVertex__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_StrokeVertex__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_StrokeVertex__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_StrokeVertex__SWIG_4(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_StrokeVertex__SWIG_5(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_StrokeVertex(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_StrokeVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertex_x(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertex_y(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertex_getPoint(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertex_attribute__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertex_attribute__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertex_attribute(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertex_curvilinearAbscissa(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertex_strokeLength(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertex_u(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertex_SetX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertex_SetY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertex_SetPoint__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertex_SetPoint__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertex_SetPoint(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertex_SetAttribute(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertex_SetCurvilinearAbscissa(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertex_SetStrokeLength(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/Interface0D/SVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/SVertex.cpp
index e69de29bb2d..f6a4a26a65c 100644
--- a/source/blender/freestyle/intern/python/Interface0D/SVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/SVertex.cpp
@@ -0,0 +1,268 @@
+SWIGINTERN PyObject *_wrap_SVertex_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_getX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_getY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_getZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_getPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_getProjectedX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_getProjectedY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_getProjectedZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_getPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_getFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_getNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_castToSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_castToViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_castToNonTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_castToTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_userdata_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_userdata_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_SVertex__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_SVertex__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_SVertex__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_SVertex(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_SVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_dupplicate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_point3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_point2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_normals(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_normalsSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_fedges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_fedges_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_fedges_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_shape__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_z(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_viewvertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_SetPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_SetPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_AddNormal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_setCurvatureInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_getCurvatureInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_setCurvatureFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_setDirectionFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_curvatureFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_directionFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_SetId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_SetFEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_SetShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_SetViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_AddFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_Replace(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_fedge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_point2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_point3d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_normal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_shape_id(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_shape__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_shape(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_shape_importance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_qi(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_occluders_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_occluders_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_occluders_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_occluders_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_occludee(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_occluded_shape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_occludee_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SVertex_z_discontinuity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/ViewVertex.cpp
index e69de29bb2d..2b3e733e605 100644
--- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex.cpp
@@ -0,0 +1,76 @@
+SWIGINTERN PyObject *_wrap_ViewVertex_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVertex_userdata_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVertex_userdata_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVertex_getNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVertex_setNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVertex_Replace(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVertex_edges_begin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVertex_edges_begin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVertex_edges_begin(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVertex_edges_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVertex_edges_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVertex_edges_end(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVertex_edges_iterator__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVertex_edges_iterator__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVertex_edges_iterator(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVertex_edgesBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVertex_edgesEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVertex_edgesIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/NonTVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/NonTVertex.cpp
index e69de29bb2d..d287ddf0c72 100644
--- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/NonTVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/NonTVertex.cpp
@@ -0,0 +1,132 @@
+SWIGINTERN PyObject *_wrap_NonTVertex_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_getX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_getY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_getZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_getPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_getProjectedX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_getProjectedY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_getProjectedZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_getPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_castToSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_castToViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_castToNonTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_NonTVertex__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_NonTVertex__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_NonTVertex(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_NonTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_svertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_viewedges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_SetSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_SetViewEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_AddIncomingViewEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_AddOutgoingViewEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_AddViewEdge__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_AddViewEdge__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_AddViewEdge(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_Replace(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_edges_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_edges_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_edges_end(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_edgesBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_edgesEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_NonTVertex_edgesIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/TVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/TVertex.cpp
index e69de29bb2d..32e7ccd0ff8 100644
--- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/TVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/TVertex.cpp
@@ -0,0 +1,184 @@
+SWIGINTERN PyObject *_wrap_TVertex_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_getX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_getY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_getZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_getPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_getProjectedX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_getProjectedY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_getProjectedZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_getPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_castToViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_castToTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_TVertex__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_TVertex__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_TVertex(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_frontSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_backSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_frontEdgeA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_frontEdgeB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_backEdgeA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_backEdgeB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_SetFrontVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_SetBackSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_SetFrontEdgeA__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_SetFrontEdgeA__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_SetFrontEdgeA(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_SetFrontEdgeB__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_SetFrontEdgeB__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_SetFrontEdgeB(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_SetBackEdgeA__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_SetBackEdgeA__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_SetBackEdgeA(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_SetBackEdgeB__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_SetBackEdgeB__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_SetBackEdgeB(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_SetId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_GetSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_Replace(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_mate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_edges_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_edges_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_edges_end(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_edgesBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_edgesEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_TVertex_edgesIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_TVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/Interface0DIterator.cpp b/source/blender/freestyle/intern/python/Interface0DIterator.cpp
index e69de29bb2d..283dd48ce20 100644
--- a/source/blender/freestyle/intern/python/Interface0DIterator.cpp
+++ b/source/blender/freestyle/intern/python/Interface0DIterator.cpp
@@ -0,0 +1,104 @@
+SWIGINTERN PyObject *_wrap_Interface0DIterator_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator_getObject(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator___deref__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator_increment(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator_decrement(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator_isBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator_isEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator_t(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator_u(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator_getX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator_getY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator_getZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator_getPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator_getProjectedX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator_getProjectedY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator_getProjectedZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator_getPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator_getFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator_getNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator_castToSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator_castToViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator_castToNonTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface0DIterator_castToTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/Interface1D.cpp b/source/blender/freestyle/intern/python/Interface1D.cpp
index e69de29bb2d..0bbb6049d74 100644
--- a/source/blender/freestyle/intern/python/Interface1D.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D.cpp
@@ -0,0 +1,56 @@
+SWIGINTERN PyObject *_wrap_Interface1D_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface1D_verticesBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface1D_verticesEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface1D_pointsBegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface1D_pointsBegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface1D_pointsBegin(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface1D_pointsEnd__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface1D_pointsEnd__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface1D_pointsEnd(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface1D_getLength2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface1D_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface1D_getNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface1D_getTimeStamp(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Interface1D_setTimeStamp(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/Interface1D/Curve.cpp b/source/blender/freestyle/intern/python/Interface1D/Curve.cpp
index e69de29bb2d..758227e6ad9 100644
--- a/source/blender/freestyle/intern/python/Interface1D/Curve.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/Curve.cpp
@@ -0,0 +1,112 @@
+SWIGINTERN PyObject *_wrap_Curve_computeCurvatureAndOrientation(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_push_vertex_back__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_push_vertex_back__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_push_vertex_back(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_push_vertex_front__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_push_vertex_front__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_push_vertex_front(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_getLength2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_nSegments(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_setId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_curvePointsBegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_curvePointsBegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_curvePointsBegin(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_curvePointsEnd__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_curvePointsEnd__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_curvePointsEnd(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_curveVerticesBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_curveVerticesEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_verticesBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_verticesEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_pointsBegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_pointsBegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_pointsBegin(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_pointsEnd__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_pointsEnd__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Curve_pointsEnd(PyObject *self, PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge.cpp
index e69de29bb2d..4985a2d00a4 100644
--- a/source/blender/freestyle/intern/python/Interface1D/FEdge.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/FEdge.cpp
@@ -0,0 +1,252 @@
+SWIGINTERN PyObject *_wrap_FEdge_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_getLength2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_userdata_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_userdata_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FEdge__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FEdge__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FEdge__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_FEdge(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_FEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_dupplicate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_vertexA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_vertexB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_getNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_nextEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_previousEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_shape__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_invisibility(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_viewedge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_center3d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_center2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_aFace(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_getOccludeeIntersection(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_getOccludeeEmpty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_isSmooth(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_SetVertexA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_SetVertexB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_SetId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_SetNextEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_SetPreviousEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_SetNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_SetViewEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_SetaFace(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_SetOccludeeIntersection(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_SetOccludeeEmpty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_SetSmooth(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_CommonVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_min2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_max2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_shape_id(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_shape__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_shape(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_shape_importance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_qi(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_occluders_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_occluders_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_occluders_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_occluders_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_occludee(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_occluded_shape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_occludee_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_z_discontinuity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_viewedge_nature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_orientation2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_orientation3d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_verticesBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_verticesEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_pointsBegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_pointsBegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_pointsBegin(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_pointsEnd__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_pointsEnd__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdge_pointsEnd(PyObject *self, PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/FEdgeSharp.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge/FEdgeSharp.cpp
index e69de29bb2d..70a01ad4176 100644
--- a/source/blender/freestyle/intern/python/Interface1D/FEdge/FEdgeSharp.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/FEdgeSharp.cpp
@@ -0,0 +1,44 @@
+SWIGINTERN PyObject *_wrap_FEdgeSharp_dupplicate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSharp_normalA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSharp_normalB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSharp_aMaterialIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSharp_aMaterial(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSharp_bMaterialIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSharp_bMaterial(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSharp_SetNormalA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSharp_SetNormalB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSharp_SetaMaterialIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSharp_SetbMaterialIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/FEdgeSmooth.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge/FEdgeSmooth.cpp
index e69de29bb2d..9c478f24839 100644
--- a/source/blender/freestyle/intern/python/Interface1D/FEdge/FEdgeSmooth.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/FEdgeSmooth.cpp
@@ -0,0 +1,32 @@
+SWIGINTERN PyObject *_wrap_FEdgeSmooth_dupplicate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSmooth_face(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSmooth_normal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSmooth_materialIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSmooth_material(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSmooth_SetFace(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSmooth_SetNormal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgeSmooth_SetMaterialIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/Interface1D/Stroke.cpp b/source/blender/freestyle/intern/python/Interface1D/Stroke.cpp
index e69de29bb2d..c86c2eafac9 100644
--- a/source/blender/freestyle/intern/python/Interface1D/Stroke.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/Stroke.cpp
@@ -0,0 +1,236 @@
+SWIGINTERN PyObject *_wrap_Stroke_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Stroke__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Stroke__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Stroke(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_Stroke(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_ComputeSampling(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_Resample__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_Resample__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_Resample(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_RemoveVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_InsertVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_Render(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_RenderBasic(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_getLength2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_getMediumType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_getTextureId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_hasTips(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_vertices_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_viewedges_begin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_viewedges_begin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_viewedges_begin(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_viewedges_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_viewedges_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_viewedges_end(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_viewedges_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_getBeginningOrientation(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_getBeginningOrientationX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_getBeginningOrientationY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_getEndingOrientation(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_getEndingOrientationX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_getEndingOrientationY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_SetId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_SetLength(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_SetMediumType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_SetTextureId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_SetTips(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_push_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_push_front(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_AddViewEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_SetBeginningOrientation__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_SetBeginningOrientation__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_SetBeginningOrientation(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_SetEndingOrientation__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_SetEndingOrientation__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_SetEndingOrientation(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_strokeVerticesBegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_strokeVerticesBegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_strokeVerticesBegin(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_strokeVerticesEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_strokeVerticesSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_verticesBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_verticesEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_pointsBegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_pointsBegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_pointsBegin(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_pointsEnd__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_pointsEnd__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Stroke_pointsEnd(PyObject *self, PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/Interface1D/ViewEdge.cpp b/source/blender/freestyle/intern/python/Interface1D/ViewEdge.cpp
index e69de29bb2d..d9db8ea83c4 100644
--- a/source/blender/freestyle/intern/python/Interface1D/ViewEdge.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/ViewEdge.cpp
@@ -0,0 +1,236 @@
+SWIGINTERN PyObject *_wrap_ViewEdge_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_getNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_userdata_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_userdata_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewEdge__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewEdge__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewEdge__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewEdge__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewEdge(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ViewEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_A(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_B(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_fedgeA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_fedgeB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_viewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_aShape__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_isClosed(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_getChainingTimeStamp(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_aShape__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_aShape(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_bShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_occluders(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_splittingId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_SetA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_SetB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_SetNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_SetFEdgeA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_SetFEdgeB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_SetShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_SetId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_UpdateFEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_SetaShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_SetQI(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_setChainingTimeStamp(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_AddOccluder(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_setSplittingId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_intersect_2d_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_include_in_2d_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_getLength2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_qi(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_occluders_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_occluders_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_occluders_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_occluders_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_occludee(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_occluded_shape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_occludee_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_shape_id(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_shape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_shape_importance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_verticesBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_verticesEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_pointsBegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_pointsBegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_pointsBegin(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_pointsEnd__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_pointsEnd__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_pointsEnd(PyObject *self, PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/Material.cpp b/source/blender/freestyle/intern/python/Material.cpp
index e69de29bb2d..217e2d7e89c 100644
--- a/source/blender/freestyle/intern/python/Material.cpp
+++ b/source/blender/freestyle/intern/python/Material.cpp
@@ -0,0 +1,112 @@
+SWIGINTERN PyObject *_wrap_Material_diffuse(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_diffuseR(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_diffuseG(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_diffuseB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_diffuseA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_specular(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_specularR(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_specularG(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_specularB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_specularA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_ambient(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_ambientR(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_ambientG(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_ambientB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_ambientA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_emission(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_emissionR(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_emissionG(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_emissionB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_emissionA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_shininess(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_SetDiffuse(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_SetSpecular(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_SetAmbient(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_SetEmission(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Material_SetShininess(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Material___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Material___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/Noise.cpp b/source/blender/freestyle/intern/python/Noise.cpp
index e69de29bb2d..e64393d9b35 100644
--- a/source/blender/freestyle/intern/python/Noise.cpp
+++ b/source/blender/freestyle/intern/python/Noise.cpp
@@ -0,0 +1,48 @@
+SWIGINTERN PyObject *_wrap_Noise_turbulence1__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Noise_turbulence1__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Noise_turbulence1(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Noise_turbulence2__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Noise_turbulence2__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Noise_turbulence2(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Noise_turbulence3__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Noise_turbulence3__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Noise_turbulence3(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Noise_smoothNoise1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Noise_smoothNoise2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Noise_smoothNoise3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/Operators.cpp b/source/blender/freestyle/intern/python/Operators.cpp
index e69de29bb2d..df9fa4571aa 100644
--- a/source/blender/freestyle/intern/python/Operators.cpp
+++ b/source/blender/freestyle/intern/python/Operators.cpp
@@ -0,0 +1,104 @@
+SWIGINTERN PyObject *_wrap_Operators_select(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_chain__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_chain__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_chain(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_bidirectionalChain__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_bidirectionalChain__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_bidirectionalChain(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_sequentialSplit__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_sequentialSplit__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_sequentialSplit__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_sequentialSplit__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_sequentialSplit(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_recursiveSplit__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_recursiveSplit__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_recursiveSplit__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_recursiveSplit__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_recursiveSplit(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_sort(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_create(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_getViewEdgeFromIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_getChainFromIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_getStrokeFromIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_getViewEdgesSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_getChainsSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Operators_getStrokesSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_Operators(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/SShape.cpp b/source/blender/freestyle/intern/python/SShape.cpp
index e69de29bb2d..201fba6ed9d 100644
--- a/source/blender/freestyle/intern/python/SShape.cpp
+++ b/source/blender/freestyle/intern/python/SShape.cpp
@@ -0,0 +1,120 @@
+SWIGINTERN PyObject *_wrap_SShape_userdata_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_userdata_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_SShape__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_SShape__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_SShape(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_dupplicate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_SShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_AddEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_AddNewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_AddChain(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_CreateSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_SplitEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_SplitEdgeIn2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_SetBBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_ComputeBBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_RemoveEdgeFromChain(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_RemoveEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_GetVertexList(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_GetEdgeList(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_GetChains(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_bbox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_material(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_materials(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_viewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_importance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_SetId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_SetMaterials(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_SetViewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_SShape_SetImportance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/StrokeAttribute.cpp b/source/blender/freestyle/intern/python/StrokeAttribute.cpp
index e69de29bb2d..c38da608c2d 100644
--- a/source/blender/freestyle/intern/python/StrokeAttribute.cpp
+++ b/source/blender/freestyle/intern/python/StrokeAttribute.cpp
@@ -0,0 +1,112 @@
+SWIGINTERN PyObject *_wrap_StrokeAttribute_getColor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_getColorR(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_getColorG(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_getColorB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_getColorRGB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_getAlpha(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_getThickness(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_getThicknessR(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_getThicknessL(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_getThicknessRL(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_isVisible(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_getAttributeReal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_getAttributeVec2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_getAttributeVec3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_isAttributeAvailableReal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_isAttributeAvailableVec2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_isAttributeAvailableVec3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_setColor__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_setColor__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_setColor(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_setAlpha(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_setThickness__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_setThickness__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_setThickness(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_SetVisible(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_setAttributeReal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_setAttributeVec2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeAttribute_setAttributeVec3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/StrokeShader.cpp b/source/blender/freestyle/intern/python/StrokeShader.cpp
index e69de29bb2d..6348b654003 100644
--- a/source/blender/freestyle/intern/python/StrokeShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_StrokeShader_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_disown_StrokeShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BackboneStretcherShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BackboneStretcherShader.cpp
index e69de29bb2d..68ea395d7b9 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BackboneStretcherShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BackboneStretcherShader.cpp
@@ -0,0 +1,8 @@
+SWIGINTERN PyObject *_wrap_BackboneStretcherShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_BackboneStretcherShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BezierCurveShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BezierCurveShader.cpp
index e69de29bb2d..bf480135451 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BezierCurveShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BezierCurveShader.cpp
@@ -0,0 +1,8 @@
+SWIGINTERN PyObject *_wrap_BezierCurveShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_BezierCurveShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/StrokeShader/CalligraphicShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/CalligraphicShader.cpp
index e69de29bb2d..cf7caa68326 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/CalligraphicShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/CalligraphicShader.cpp
@@ -0,0 +1,4 @@
+SWIGINTERN PyObject *_wrap_CalligraphicShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/StrokeShader/ColorNoiseShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/ColorNoiseShader.cpp
index e69de29bb2d..34f21261c33 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/ColorNoiseShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/ColorNoiseShader.cpp
@@ -0,0 +1,8 @@
+SWIGINTERN PyObject *_wrap_ColorNoiseShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ColorNoiseShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/StrokeShader/ColorVariationPatternShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/ColorVariationPatternShader.cpp
index e69de29bb2d..4d97fbf6c3c 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/ColorVariationPatternShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/ColorVariationPatternShader.cpp
@@ -0,0 +1,4 @@
+SWIGINTERN PyObject *_wrap_ColorVariationPatternShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/StrokeShader/ConstantColorShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/ConstantColorShader.cpp
index e69de29bb2d..e1a58326696 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/ConstantColorShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/ConstantColorShader.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_ConstantColorShader_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ConstantColorShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ConstantColorShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/StrokeShader/ConstantThicknessShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/ConstantThicknessShader.cpp
index e69de29bb2d..3d6950d556e 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/ConstantThicknessShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/ConstantThicknessShader.cpp
@@ -0,0 +1,8 @@
+SWIGINTERN PyObject *_wrap_ConstantThicknessShader_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ConstantThicknessShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/StrokeShader/ConstrainedIncreasingThicknessShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/ConstrainedIncreasingThicknessShader.cpp
index e69de29bb2d..a0e0a4ace8c 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/ConstrainedIncreasingThicknessShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/ConstrainedIncreasingThicknessShader.cpp
@@ -0,0 +1,4 @@
+SWIGINTERN PyObject *_wrap_ConstrainedIncreasingThicknessShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/StrokeShader/GuidingLinesShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/GuidingLinesShader.cpp
index e69de29bb2d..fdd198a30af 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/GuidingLinesShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/GuidingLinesShader.cpp
@@ -0,0 +1,8 @@
+SWIGINTERN PyObject *_wrap_GuidingLinesShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GuidingLinesShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/StrokeShader/IncreasingColorShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/IncreasingColorShader.cpp
index e69de29bb2d..bfac8efda55 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/IncreasingColorShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/IncreasingColorShader.cpp
@@ -0,0 +1,8 @@
+SWIGINTERN PyObject *_wrap_IncreasingColorShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_IncreasingColorShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/StrokeShader/IncreasingThicknessShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/IncreasingThicknessShader.cpp
index e69de29bb2d..e17f06dfafb 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/IncreasingThicknessShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/IncreasingThicknessShader.cpp
@@ -0,0 +1,4 @@
+SWIGINTERN PyObject *_wrap_IncreasingThicknessShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/StrokeShader/PolygonalizationShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/PolygonalizationShader.cpp
index e69de29bb2d..533d481165f 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/PolygonalizationShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/PolygonalizationShader.cpp
@@ -0,0 +1,8 @@
+SWIGINTERN PyObject *_wrap_PolygonalizationShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_PolygonalizationShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/StrokeShader/SamplingShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/SamplingShader.cpp
index e69de29bb2d..698905ad292 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/SamplingShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/SamplingShader.cpp
@@ -0,0 +1,8 @@
+SWIGINTERN PyObject *_wrap_SamplingShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_SamplingShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/StrokeShader/SpatialNoiseShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/SpatialNoiseShader.cpp
index e69de29bb2d..68a41f48160 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/SpatialNoiseShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/SpatialNoiseShader.cpp
@@ -0,0 +1,4 @@
+SWIGINTERN PyObject *_wrap_SpatialNoiseShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/StrokeShader/StrokeTextureShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/StrokeTextureShader.cpp
index e69de29bb2d..317273262ae 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/StrokeTextureShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/StrokeTextureShader.cpp
@@ -0,0 +1,8 @@
+SWIGINTERN PyObject *_wrap_StrokeTextureShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_StrokeTextureShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/StrokeShader/TextureAssignerShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/TextureAssignerShader.cpp
index e69de29bb2d..4bb2f6bf03a 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/TextureAssignerShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/TextureAssignerShader.cpp
@@ -0,0 +1,8 @@
+SWIGINTERN PyObject *_wrap_TextureAssignerShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_TextureAssignerShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/StrokeShader/ThicknessNoiseShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/ThicknessNoiseShader.cpp
index e69de29bb2d..a0542e8d400 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/ThicknessNoiseShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/ThicknessNoiseShader.cpp
@@ -0,0 +1,8 @@
+SWIGINTERN PyObject *_wrap_ThicknessNoiseShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ThicknessNoiseShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/StrokeShader/ThicknessVariationPatternShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/ThicknessVariationPatternShader.cpp
index e69de29bb2d..992d526e728 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/ThicknessVariationPatternShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/ThicknessVariationPatternShader.cpp
@@ -0,0 +1,4 @@
+SWIGINTERN PyObject *_wrap_ThicknessVariationPatternShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/StrokeShader/TipRemoverShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/TipRemoverShader.cpp
index e69de29bb2d..883cd4c0ded 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/TipRemoverShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/TipRemoverShader.cpp
@@ -0,0 +1,4 @@
+SWIGINTERN PyObject *_wrap_TipRemoverShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/StrokeShader/fstreamShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/fstreamShader.cpp
index e69de29bb2d..275c7277ce4 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/fstreamShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/fstreamShader.cpp
@@ -0,0 +1,8 @@
+SWIGINTERN PyObject *_wrap_fstreamShader_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_fstreamShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/StrokeShader/streamShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/streamShader.cpp
index e69de29bb2d..4f36bfae337 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/streamShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/streamShader.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_streamShader_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_streamShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_streamShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/StrokeVertexIterator.cpp b/source/blender/freestyle/intern/python/StrokeVertexIterator.cpp
index e69de29bb2d..7997a73e28c 100644
--- a/source/blender/freestyle/intern/python/StrokeVertexIterator.cpp
+++ b/source/blender/freestyle/intern/python/StrokeVertexIterator.cpp
@@ -0,0 +1,260 @@
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_castToInterface0DIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getObject(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator___deref__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_increment(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_decrement(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_isBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_isEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_t(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_u(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_copy(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getIt(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_x(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_y(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getPoint(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_attribute__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_attribute__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_attribute(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_curvilinearAbscissa(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_strokeLength(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetPoint__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetPoint__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetPoint(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetAttribute(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetCurvilinearAbscissa(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetStrokeLength(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getProjectedX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getProjectedY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getProjectedZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_castToSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_castToViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_castToNonTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_castToTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_A(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_B(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_t2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetT2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_fedge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_point2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_point3d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_normal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_shape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_occluders_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_occluders_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_occluders_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_occluders_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_occludee(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_occluded_shape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_occludee_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_z_discontinuity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_curvatureFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_directionFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D.cpp
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DDouble.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DDouble.cpp
new file mode 100644
index 00000000000..a6ec72c8c19
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DDouble.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_UnaryFunction0DDouble_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction0DDouble___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DDouble(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DFloat.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DFloat.cpp
new file mode 100644
index 00000000000..3a4b0326cf7
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DFloat.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_UnaryFunction0DFloat_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction0DFloat___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DFloat(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DId.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DId.cpp
new file mode 100644
index 00000000000..8388d964479
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DId.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_UnaryFunction0DId_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction0DId___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DUnsigned.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DUnsigned.cpp
new file mode 100644
index 00000000000..9d2491bee33
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DUnsigned.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_UnaryFunction0DUnsigned_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction0DUnsigned___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DUnsigned(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVec2f.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVec2f.cpp
new file mode 100644
index 00000000000..36a7772ab72
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVec2f.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_UnaryFunction0DVec2f_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction0DVec2f___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DVec2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVec3f.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVec3f.cpp
new file mode 100644
index 00000000000..5996de16ac1
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVec3f.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_UnaryFunction0DVec3f_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction0DVec3f___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DVec3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVectorViewShape.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVectorViewShape.cpp
new file mode 100644
index 00000000000..0552b54aed8
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVectorViewShape.cpp
@@ -0,0 +1,8 @@
+SWIGINTERN PyObject *_wrap_UnaryFunction0DVectorViewShape_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction0DVectorViewShape___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DViewShape.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DViewShape.cpp
new file mode 100644
index 00000000000..a8af361cc63
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DViewShape.cpp
@@ -0,0 +1,8 @@
+SWIGINTERN PyObject *_wrap_UnaryFunction0DViewShape_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction0DViewShape___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/ShapeIdF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/ShapeIdF0D.cpp
index e69de29bb2d..bed3db84681 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/ShapeIdF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/ShapeIdF0D.cpp
@@ -0,0 +1,16 @@
+SWIGINTERN PyObject *_wrap_ShapeIdF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ShapeIdF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ShapeIdF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ShapeIdF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/MaterialF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/MaterialF0D.cpp
index e69de29bb2d..d12d4b6383d 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/MaterialF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/MaterialF0D.cpp
@@ -0,0 +1,16 @@
+SWIGINTERN PyObject *_wrap_MaterialF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_MaterialF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_MaterialF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_MaterialF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/CurveNatureF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/CurveNatureF0D.cpp
index e69de29bb2d..814c89c1766 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/CurveNatureF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/CurveNatureF0D.cpp
@@ -0,0 +1,16 @@
+SWIGINTERN PyObject *_wrap_CurveNatureF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurveNatureF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_CurveNatureF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_CurveNatureF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/Normal2DF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/Normal2DF0D.cpp
index e69de29bb2d..64ee307e011 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/Normal2DF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/Normal2DF0D.cpp
@@ -0,0 +1,16 @@
+SWIGINTERN PyObject *_wrap_Normal2DF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Normal2DF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Normal2DF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_Normal2DF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/VertexOrientation2DF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/VertexOrientation2DF0D.cpp
index e69de29bb2d..6611a23e41c 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/VertexOrientation2DF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/VertexOrientation2DF0D.cpp
@@ -0,0 +1,16 @@
+SWIGINTERN PyObject *_wrap_VertexOrientation2DF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_VertexOrientation2DF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_VertexOrientation2DF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_VertexOrientation2DF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/VertexOrientation3DF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/VertexOrientation3DF0D.cpp
index e69de29bb2d..24dabfcdc66 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/VertexOrientation3DF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/VertexOrientation3DF0D.cpp
@@ -0,0 +1,16 @@
+SWIGINTERN PyObject *_wrap_VertexOrientation3DF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_VertexOrientation3DF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_VertexOrientation3DF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_VertexOrientation3DF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/GetOccludeeF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/GetOccludeeF0D.cpp
index e69de29bb2d..9029b9ea863 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/GetOccludeeF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/GetOccludeeF0D.cpp
@@ -0,0 +1,16 @@
+SWIGINTERN PyObject *_wrap_GetOccludeeF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_GetOccludeeF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_GetOccludeeF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetOccludeeF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/GetShapeF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/GetShapeF0D.cpp
index e69de29bb2d..6e9d3abde41 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/GetShapeF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/GetShapeF0D.cpp
@@ -0,0 +1,16 @@
+SWIGINTERN PyObject *_wrap_GetShapeF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_GetShapeF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_GetShapeF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetShapeF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/DensityF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/DensityF0D.cpp
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/LocalAverageDepthF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/LocalAverageDepthF0D.cpp
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetCurvilinearAbscissaF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetCurvilinearAbscissaF0D.cpp
index e69de29bb2d..cf684395749 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetCurvilinearAbscissaF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetCurvilinearAbscissaF0D.cpp
@@ -0,0 +1,16 @@
+SWIGINTERN PyObject *_wrap_GetCurvilinearAbscissaF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_GetCurvilinearAbscissaF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_GetCurvilinearAbscissaF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetCurvilinearAbscissaF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetParameterF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetParameterF0D.cpp
index e69de29bb2d..aab03185ae8 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetParameterF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetParameterF0D.cpp
@@ -0,0 +1,16 @@
+SWIGINTERN PyObject *_wrap_GetParameterF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_GetParameterF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_GetParameterF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetParameterF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetViewMapGradientNormF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetViewMapGradientNormF0D.cpp
index e69de29bb2d..5007e5c68cd 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetViewMapGradientNormF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetViewMapGradientNormF0D.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_GetViewMapGradientNormF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_GetViewMapGradientNormF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetViewMapGradientNormF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadCompleteViewMapPixelF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadCompleteViewMapPixelF0D.cpp
index e69de29bb2d..c0dc2350a00 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadCompleteViewMapPixelF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadCompleteViewMapPixelF0D.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_ReadCompleteViewMapPixelF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ReadCompleteViewMapPixelF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ReadCompleteViewMapPixelF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadMapPixelF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadMapPixelF0D.cpp
index e69de29bb2d..4adcced09e5 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadMapPixelF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadMapPixelF0D.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_ReadMapPixelF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ReadMapPixelF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ReadMapPixelF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadSteerableViewMapPixelF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadSteerableViewMapPixelF0D.cpp
index e69de29bb2d..7c3c4c58120 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadSteerableViewMapPixelF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadSteerableViewMapPixelF0D.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_ReadSteerableViewMapPixelF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ReadSteerableViewMapPixelF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ReadSteerableViewMapPixelF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/Curvature2DAngleF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/Curvature2DAngleF0D.cpp
index e69de29bb2d..749af7bbf8b 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/Curvature2DAngleF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/Curvature2DAngleF0D.cpp
@@ -0,0 +1,16 @@
+SWIGINTERN PyObject *_wrap_Curvature2DAngleF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Curvature2DAngleF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_Curvature2DAngleF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_Curvature2DAngleF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedXF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedXF0D.cpp
index e69de29bb2d..727e617512a 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedXF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedXF0D.cpp
@@ -0,0 +1,16 @@
+SWIGINTERN PyObject *_wrap_GetProjectedXF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_GetProjectedXF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_GetProjectedXF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetProjectedXF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedYF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedYF0D.cpp
index e69de29bb2d..c135ac5a45c 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedYF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedYF0D.cpp
@@ -0,0 +1,16 @@
+SWIGINTERN PyObject *_wrap_GetProjectedYF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_GetProjectedYF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_GetProjectedYF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetProjectedYF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedZF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedZF0D.cpp
index e69de29bb2d..928e3ce73f8 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedZF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedZF0D.cpp
@@ -0,0 +1,16 @@
+SWIGINTERN PyObject *_wrap_GetProjectedZF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_GetProjectedZF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_GetProjectedZF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetProjectedZF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetXF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetXF0D.cpp
index e69de29bb2d..e6286fd53fe 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetXF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetXF0D.cpp
@@ -0,0 +1,16 @@
+SWIGINTERN PyObject *_wrap_GetXF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_GetXF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_GetXF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetXF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetYF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetYF0D.cpp
index e69de29bb2d..767c21d5592 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetYF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetYF0D.cpp
@@ -0,0 +1,16 @@
+SWIGINTERN PyObject *_wrap_GetYF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_GetYF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_GetYF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetYF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetZF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetZF0D.cpp
index e69de29bb2d..526a321f667 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetZF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetZF0D.cpp
@@ -0,0 +1,16 @@
+SWIGINTERN PyObject *_wrap_GetZF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_GetZF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_GetZF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetZF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/ZDiscontinuityF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/ZDiscontinuityF0D.cpp
index e69de29bb2d..d043f373dd1 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/ZDiscontinuityF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/ZDiscontinuityF0D.cpp
@@ -0,0 +1,16 @@
+SWIGINTERN PyObject *_wrap_ZDiscontinuityF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ZDiscontinuityF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ZDiscontinuityF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ZDiscontinuityF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/QuantitativeInvisibilityF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/QuantitativeInvisibilityF0D.cpp
index e69de29bb2d..edc9c97f740 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/QuantitativeInvisibilityF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/QuantitativeInvisibilityF0D.cpp
@@ -0,0 +1,16 @@
+SWIGINTERN PyObject *_wrap_QuantitativeInvisibilityF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_QuantitativeInvisibilityF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_QuantitativeInvisibilityF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_QuantitativeInvisibilityF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/GetOccludersF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/GetOccludersF0D.cpp
index e69de29bb2d..3968e1293a9 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/GetOccludersF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/GetOccludersF0D.cpp
@@ -0,0 +1,16 @@
+SWIGINTERN PyObject *_wrap_GetOccludersF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_GetOccludersF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_GetOccludersF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetOccludersF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0DVoid.cpp b/source/blender/freestyle/intern/python/UnaryFunction0DVoid.cpp
new file mode 100644
index 00000000000..f7c7dca2535
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0DVoid.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_UnaryFunction0DVoid_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction0DVoid___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DVoid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D.cpp
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DDouble.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DDouble.cpp
new file mode 100644
index 00000000000..b7194d3e116
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DDouble.cpp
@@ -0,0 +1,20 @@
+SWIGINTERN PyObject *_wrap_UnaryFunction1DDouble_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DDouble___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DDouble_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DDouble_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_disown_UnaryFunction1DDouble(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DFloat.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DFloat.cpp
new file mode 100644
index 00000000000..a41994114e4
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DFloat.cpp
@@ -0,0 +1,20 @@
+SWIGINTERN PyObject *_wrap_UnaryFunction1DFloat_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DFloat___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DFloat_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DFloat_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_disown_UnaryFunction1DFloat(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DUnsigned.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DUnsigned.cpp
new file mode 100644
index 00000000000..2b0b96e0357
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DUnsigned.cpp
@@ -0,0 +1,20 @@
+SWIGINTERN PyObject *_wrap_UnaryFunction1DUnsigned_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DUnsigned___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DUnsigned_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DUnsigned_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_disown_UnaryFunction1DUnsigned(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVec2f.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVec2f.cpp
new file mode 100644
index 00000000000..546a3f66399
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVec2f.cpp
@@ -0,0 +1,20 @@
+SWIGINTERN PyObject *_wrap_UnaryFunction1DVec2f_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DVec2f___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DVec2f_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DVec2f_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_disown_UnaryFunction1DVec2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVec3f.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVec3f.cpp
new file mode 100644
index 00000000000..28b73b81b8a
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVec3f.cpp
@@ -0,0 +1,20 @@
+SWIGINTERN PyObject *_wrap_UnaryFunction1DVec3f_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DVec3f___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DVec3f_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DVec3f_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_disown_UnaryFunction1DVec3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVectorViewShape.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVectorViewShape.cpp
new file mode 100644
index 00000000000..dafd9a65499
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVectorViewShape.cpp
@@ -0,0 +1,16 @@
+SWIGINTERN PyObject *_wrap_UnaryFunction1DVectorViewShape_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DVectorViewShape___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DVectorViewShape_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DVectorViewShape_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/CurveNatureF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/CurveNatureF1D.cpp
index e69de29bb2d..37046f061b7 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/CurveNatureF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/CurveNatureF1D.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_CurveNatureF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_CurveNatureF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_CurveNatureF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/Normal2DF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/Normal2DF1D.cpp
index e69de29bb2d..eff9b48cc02 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/Normal2DF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/Normal2DF1D.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_Normal2DF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Normal2DF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_Normal2DF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/Orientation2DF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/Orientation2DF1D.cpp
index e69de29bb2d..20cf0d51899 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/Orientation2DF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/Orientation2DF1D.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_Orientation2DF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Orientation2DF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_Orientation2DF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/Orientation3DF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/Orientation3DF1D.cpp
index e69de29bb2d..bb81f96636b 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/Orientation3DF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/Orientation3DF1D.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_Orientation3DF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Orientation3DF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_Orientation3DF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/DensityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/DensityF1D.cpp
index e69de29bb2d..c8d47b2459d 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/DensityF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/DensityF1D.cpp
@@ -0,0 +1,8 @@
+SWIGINTERN PyObject *_wrap_DensityF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_DensityF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/GetCompleteViewMapDensityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/GetCompleteViewMapDensityF1D.cpp
index e69de29bb2d..dd701012a52 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/GetCompleteViewMapDensityF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/GetCompleteViewMapDensityF1D.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_GetCompleteViewMapDensityF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_GetCompleteViewMapDensityF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetCompleteViewMapDensityF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/GetDirectionalViewMapDensityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/GetDirectionalViewMapDensityF1D.cpp
index e69de29bb2d..eb6f4944493 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/GetDirectionalViewMapDensityF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/GetDirectionalViewMapDensityF1D.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_GetDirectionalViewMapDensityF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_GetDirectionalViewMapDensityF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetDirectionalViewMapDensityF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/LocalAverageDepthF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/LocalAverageDepthF1D.cpp
index e69de29bb2d..72de11c5fa4 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/LocalAverageDepthF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/LocalAverageDepthF1D.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_LocalAverageDepthF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_LocalAverageDepthF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_LocalAverageDepthF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/Curvature2DAngleF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/Curvature2DAngleF1D.cpp
index e69de29bb2d..88d2c10e5a5 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/Curvature2DAngleF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/Curvature2DAngleF1D.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_Curvature2DAngleF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_Curvature2DAngleF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_Curvature2DAngleF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedXF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedXF1D.cpp
index e69de29bb2d..e61ee24e638 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedXF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedXF1D.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_GetProjectedXF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_GetProjectedXF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetProjectedXF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedYF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedYF1D.cpp
index e69de29bb2d..9e718a52d50 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedYF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedYF1D.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_GetProjectedYF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_GetProjectedYF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetProjectedYF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedZF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedZF1D.cpp
index e69de29bb2d..d06dbf3e22d 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedZF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedZF1D.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_GetProjectedZF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_GetProjectedZF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetProjectedZF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetSteerableViewMapDensityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetSteerableViewMapDensityF1D.cpp
index e69de29bb2d..1b86998ad8e 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetSteerableViewMapDensityF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetSteerableViewMapDensityF1D.cpp
@@ -0,0 +1,8 @@
+SWIGINTERN PyObject *_wrap_GetSteerableViewMapDensityF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_GetSteerableViewMapDensityF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetViewMapGradientNormF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetViewMapGradientNormF1D.cpp
index e69de29bb2d..4dc575822be 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetViewMapGradientNormF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetViewMapGradientNormF1D.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_GetViewMapGradientNormF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_GetViewMapGradientNormF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetViewMapGradientNormF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetXF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetXF1D.cpp
index e69de29bb2d..2a1b4a368dc 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetXF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetXF1D.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_GetXF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_GetXF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetXF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetYF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetYF1D.cpp
index e69de29bb2d..c63b097d650 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetYF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetYF1D.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_GetYF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_GetYF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetYF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetZF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetZF1D.cpp
index e69de29bb2d..c90b2827c38 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetZF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetZF1D.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_GetZF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_GetZF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetZF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/ZDiscontinuityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/ZDiscontinuityF1D.cpp
index e69de29bb2d..a546ba3a459 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/ZDiscontinuityF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/ZDiscontinuityF1D.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_ZDiscontinuityF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ZDiscontinuityF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ZDiscontinuityF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned/QuantitativeInvisibilityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned/QuantitativeInvisibilityF1D.cpp
index e69de29bb2d..af8855575b1 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned/QuantitativeInvisibilityF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned/QuantitativeInvisibilityF1D.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_QuantitativeInvisibilityF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_QuantitativeInvisibilityF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_QuantitativeInvisibilityF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetOccludeeF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetOccludeeF1D.cpp
index e69de29bb2d..2c64c360207 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetOccludeeF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetOccludeeF1D.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_GetOccludeeF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_GetOccludeeF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetOccludeeF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetOccludersF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetOccludersF1D.cpp
index e69de29bb2d..04031c34697 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetOccludersF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetOccludersF1D.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_GetOccludersF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_GetOccludersF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetOccludersF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetShapeF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetShapeF1D.cpp
index e69de29bb2d..839850b298e 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetShapeF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetShapeF1D.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_GetShapeF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_GetShapeF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_GetShapeF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/ChainingTimeStampF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/ChainingTimeStampF1D.cpp
index e69de29bb2d..db66d1526a8 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/ChainingTimeStampF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/ChainingTimeStampF1D.cpp
@@ -0,0 +1,16 @@
+SWIGINTERN PyObject *_wrap_ChainingTimeStampF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ChainingTimeStampF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ChainingTimeStampF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ChainingTimeStampF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/IncrementChainingTimeStampF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/IncrementChainingTimeStampF1D.cpp
index e69de29bb2d..0a9052e4fab 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/IncrementChainingTimeStampF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/IncrementChainingTimeStampF1D.cpp
@@ -0,0 +1,16 @@
+SWIGINTERN PyObject *_wrap_IncrementChainingTimeStampF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_IncrementChainingTimeStampF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_IncrementChainingTimeStampF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_IncrementChainingTimeStampF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/TimeStampF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/TimeStampF1D.cpp
index e69de29bb2d..27a6274940e 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/TimeStampF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/TimeStampF1D.cpp
@@ -0,0 +1,16 @@
+SWIGINTERN PyObject *_wrap_TimeStampF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_TimeStampF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_TimeStampF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_TimeStampF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1DVoid.cpp b/source/blender/freestyle/intern/python/UnaryFunction1DVoid.cpp
new file mode 100644
index 00000000000..5962613d088
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1DVoid.cpp
@@ -0,0 +1,20 @@
+SWIGINTERN PyObject *_wrap_UnaryFunction1DVoid_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DVoid___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DVoid_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryFunction1DVoid_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_disown_UnaryFunction1DVoid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate0D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate0D.cpp
index e69de29bb2d..0619e4d5bd0 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate0D.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_UnaryPredicate0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryPredicate0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_disown_UnaryPredicate0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate0D/FalseUP0D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate0D/FalseUP0D.cpp
index e69de29bb2d..5747ad1e6ea 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate0D/FalseUP0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate0D/FalseUP0D.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_FalseUP0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FalseUP0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_FalseUP0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate0D/TrueUP0D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate0D/TrueUP0D.cpp
index e69de29bb2d..897ebd8ba90 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate0D/TrueUP0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate0D/TrueUP0D.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_TrueUP0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_TrueUP0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_TrueUP0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D.cpp
index e69de29bb2d..a786c172563 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_UnaryPredicate1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_UnaryPredicate1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_disown_UnaryPredicate1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/ContourUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/ContourUP1D.cpp
index e69de29bb2d..d7a22ab9286 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/ContourUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/ContourUP1D.cpp
@@ -0,0 +1,16 @@
+SWIGINTERN PyObject *_wrap_ContourUP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ContourUP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ContourUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ContourUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/DensityLowerThanUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/DensityLowerThanUP1D.cpp
index e69de29bb2d..dc9ec4ee5bf 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/DensityLowerThanUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/DensityLowerThanUP1D.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_DensityLowerThanUP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_DensityLowerThanUP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_DensityLowerThanUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/EqualToChainingTimeStampUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/EqualToChainingTimeStampUP1D.cpp
index e69de29bb2d..a8a185a51fc 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/EqualToChainingTimeStampUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/EqualToChainingTimeStampUP1D.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_EqualToChainingTimeStampUP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_EqualToChainingTimeStampUP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_EqualToChainingTimeStampUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/EqualToTimeStampUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/EqualToTimeStampUP1D.cpp
index e69de29bb2d..b8083f3528e 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/EqualToTimeStampUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/EqualToTimeStampUP1D.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_EqualToTimeStampUP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_EqualToTimeStampUP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_EqualToTimeStampUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/ExternalContourUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/ExternalContourUP1D.cpp
index e69de29bb2d..8cdabb068ca 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/ExternalContourUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/ExternalContourUP1D.cpp
@@ -0,0 +1,16 @@
+SWIGINTERN PyObject *_wrap_ExternalContourUP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ExternalContourUP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ExternalContourUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ExternalContourUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/FalseUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/FalseUP1D.cpp
index e69de29bb2d..df1a53373c1 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/FalseUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/FalseUP1D.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_FalseUP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_FalseUP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_FalseUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/QuantitativeInvisibilityUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/QuantitativeInvisibilityUP1D.cpp
index e69de29bb2d..0fb10c1f36c 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/QuantitativeInvisibilityUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/QuantitativeInvisibilityUP1D.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_QuantitativeInvisibilityUP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_QuantitativeInvisibilityUP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_QuantitativeInvisibilityUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/ShapeUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/ShapeUP1D.cpp
index e69de29bb2d..752665b4aae 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/ShapeUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/ShapeUP1D.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_ShapeUP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ShapeUP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ShapeUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/TrueUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/TrueUP1D.cpp
index e69de29bb2d..2b4584c01de 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/TrueUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/TrueUP1D.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_TrueUP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_TrueUP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_TrueUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator.cpp b/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator.cpp
index e69de29bb2d..53dbfc9b320 100644
--- a/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator.cpp
+++ b/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator.cpp
@@ -0,0 +1,36 @@
+SWIGINTERN PyObject *_wrap_ChainingIterator_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ChainingIterator_init(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ChainingIterator_traverse(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ChainingIterator_getVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ChainingIterator_isIncrementing(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ChainingIterator_increment(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ChainingIterator_decrement(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ChainingIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_disown_ChainingIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/ChainPredicateIterator.cpp b/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/ChainPredicateIterator.cpp
index e69de29bb2d..2f4c5645b47 100644
--- a/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/ChainPredicateIterator.cpp
+++ b/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/ChainPredicateIterator.cpp
@@ -0,0 +1,12 @@
+SWIGINTERN PyObject *_wrap_ChainPredicateIterator_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ChainPredicateIterator_traverse(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_disown_ChainPredicateIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/ChainSilhouetteIterator.cpp b/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/ChainSilhouetteIterator.cpp
index e69de29bb2d..20a4a5d7c46 100644
--- a/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/ChainSilhouetteIterator.cpp
+++ b/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/ChainSilhouetteIterator.cpp
@@ -0,0 +1,16 @@
+SWIGINTERN PyObject *_wrap_ChainSilhouetteIterator_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ChainSilhouetteIterator_traverse(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ChainSilhouetteIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_disown_ChainSilhouetteIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/ViewMap.cpp b/source/blender/freestyle/intern/python/ViewMap.cpp
index e69de29bb2d..ecd3fe21e44 100644
--- a/source/blender/freestyle/intern/python/ViewMap.cpp
+++ b/source/blender/freestyle/intern/python/ViewMap.cpp
@@ -0,0 +1,104 @@
+SWIGINTERN PyObject *_wrap_ViewMap_userdata_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMap_userdata_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewMap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ViewMap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMap_GetClosestViewEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMap_GetClosestFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMap_getInstance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMap_ViewShapes(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMap_ViewEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMap_ViewVertices(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMap_FEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMap_SVertices(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMap_viewedges_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMap_viewedges_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMap_viewedges_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMap_viewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMap_shapeIdToIndexMap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMap_getScene3dBBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMap_AddViewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMap_AddViewEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMap_AddViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMap_AddFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMap_AddSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMap_setScene3dBBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMap_CreateTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewMap_InsertViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/ViewShape.cpp b/source/blender/freestyle/intern/python/ViewShape.cpp
index e69de29bb2d..f95e0f829b0 100644
--- a/source/blender/freestyle/intern/python/ViewShape.cpp
+++ b/source/blender/freestyle/intern/python/ViewShape.cpp
@@ -0,0 +1,88 @@
+SWIGINTERN PyObject *_wrap_ViewShape_userdata_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShape_userdata_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewShape__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewShape__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewShape__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_new_ViewShape(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShape_dupplicate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_ViewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShape_SplitEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShape_sshape__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShape_sshape__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShape_sshape(PyObject *self, PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShape_vertices(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShape_edges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShape_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShape_SetSShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShape_SetVertices(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShape_SetEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShape_AddVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShape_AddEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShape_RemoveEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShape_RemoveVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+}
+
+

From 4019cae181a20ecc766946ec2213068b19f11e68 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Wed, 9 Jul 2008 18:36:35 +0000
Subject: [PATCH 077/252] Fix external arc merging bug (could mess up node
 degrees)

---
 source/blender/src/reeb.c | 84 +++++++++++++++++++--------------------
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/source/blender/src/reeb.c b/source/blender/src/reeb.c
index 4b74e0e2e8e..d60a1ca8c8e 100644
--- a/source/blender/src/reeb.c
+++ b/source/blender/src/reeb.c
@@ -340,26 +340,32 @@ void printArc(ReebArc *arc)
 	}
 }
 
+#ifdef DEBUG_REEB_NODE
 void NodeDegreeDecrement(ReebGraph *rg, ReebNode *node)
 {
 	node->degree--;
 
-//	if (node->degree == 0)
-//	{
-//		printf("would remove node %i\n", node->index);
-//	}
+	if (node->degree == 0)
+	{
+		printf("would remove node %i\n", node->index);
+	}
 }
 
 void NodeDegreeIncrement(ReebGraph *rg, ReebNode *node)
 {
-//	if (node->degree == 0)
-//	{
-//		printf("first connect node %i\n", node->index);
-//	}
+	if (node->degree == 0)
+	{
+		printf("first connect node %i\n", node->index);
+	}
 
 	node->degree++;
 }
 
+#else
+#define NodeDegreeDecrement(rg, node) {node->degree--;}
+#define NodeDegreeIncrement(rg, node) {node->degree++;}
+#endif
+
 void repositionNodes(ReebGraph *rg)
 {
 	BArc *arc = NULL;
@@ -992,8 +998,8 @@ void filterArc(ReebGraph *rg, ReebNode *newNode, ReebNode *removedNode, ReebArc
 		{
 			if (arc->head == srcArc->head && arc->tail == srcArc->tail && arc != srcArc)
 			{
-				ReebNode *head = (ReebNode*)srcArc->head;
-				ReebNode *tail = (ReebNode*)srcArc->tail;
+				ReebNode *head = srcArc->head;
+				ReebNode *tail = srcArc->tail;
 				mergeArcBuckets(srcArc, arc, head->weight, tail->weight);
 			}
 		}
@@ -1021,7 +1027,6 @@ void filterArc(ReebGraph *rg, ReebNode *newNode, ReebNode *removedNode, ReebArc
 			{
 				// v1 or v2 was already newNode, since we're removing an arc, decrement degree
 				NodeDegreeDecrement(rg, newNode);
-				//newNode->degree--;
 				
 				// If it's srcArc, it'll be removed later, so keep it for now
 				if (arc != srcArc)
@@ -1032,7 +1037,7 @@ void filterArc(ReebGraph *rg, ReebNode *newNode, ReebNode *removedNode, ReebArc
 			}
 			else
 			{
-				/* flip arcs that flipped can happen on diamond shapes, mostly on null arcs */
+				/* flip arcs that flipped, can happen on diamond shapes, mostly on null arcs */
 				if (arc->head->weight > arc->tail->weight)
 				{
 					ReebNode *tmp;
@@ -1048,12 +1053,15 @@ void filterArc(ReebGraph *rg, ReebNode *newNode, ReebNode *removedNode, ReebArc
 
 				if (merging)
 				{
-					ReebNode *head = (ReebNode*)arc->head;
-					ReebNode *tail = (ReebNode*)arc->tail;
+					ReebNode *head = arc->head;
+					ReebNode *tail = arc->tail;
 
 					// resize bucket list
 					resizeArcBuckets(arc);
 					mergeArcBuckets(arc, srcArc, head->weight, tail->weight);
+					
+					/* update length */
+					arc->length += srcArc->length;
 				}
 			}
 		}
@@ -1167,9 +1175,7 @@ int filterExternalReebGraph(ReebGraph *rg, float threshold)
 		{
 			ReebNode *terminalNode = NULL;
 			ReebNode *middleNode = NULL;
-			ReebNode *newNode = NULL;
 			ReebNode *removedNode = NULL;
-			int merging = 0;
 			
 			// Assign terminal and middle nodes
 			if (arc->head->degree == 1)
@@ -1186,29 +1192,17 @@ int filterExternalReebGraph(ReebGraph *rg, float threshold)
 			// If middle node is a normal node, it will be removed later
 			if (middleNode->degree == 2)
 			{
-//				continue;
-				merging = 1;
-				newNode = terminalNode;
 				removedNode = middleNode;
+
+				filterArc(rg, terminalNode, removedNode, arc, 1);
 			}
 			// Otherwise, just plain remove of the arc
 			else
 			{
-				merging = 0;
-				newNode = middleNode;
 				removedNode = terminalNode;
-			}
-			
-			// Merging arc
-			if (merging)
-			{
-				filterArc(rg, newNode, removedNode, arc, 1);
-			}
-			else
-			{
+
 				// removing arc, so we need to decrease the degree of the remaining node
-				//newNode->degree--;
-				NodeDegreeDecrement(rg, newNode);
+				NodeDegreeDecrement(rg, middleNode);
 			}
 
 			// Reset nextArc, it might have changed
@@ -1441,6 +1435,8 @@ void filterGraph(ReebGraph *rg, short options, float threshold_internal, float t
 	
 	calculateGraphLength(rg);
 
+	verifyNodeDegree(rg);
+
 	/* filter until there's nothing more to do */
 	while (done == 1)
 	{
@@ -1450,12 +1446,14 @@ void filterGraph(ReebGraph *rg, short options, float threshold_internal, float t
 		{
 //			done |= filterExternalReebGraph(rg, threshold_external * rg->resolution);
 			done |= filterExternalReebGraph(rg, threshold_external);
+			verifyNodeDegree(rg);
 		}
 	
 		if (options & SKGEN_FILTER_INTERNAL)
 		{
 //			done |= filterInternalReebGraph(rg, threshold_internal * rg->resolution);
 			done |= filterInternalReebGraph(rg, threshold_internal);
+			verifyNodeDegree(rg);
 		}
 	}
 
@@ -1466,6 +1464,8 @@ void filterGraph(ReebGraph *rg, short options, float threshold_internal, float t
 		filterCyclesReebGraph(rg, 0.5);
 	}
 	
+	verifyNodeDegree(rg);
+
 	repositionNodes(rg);
 
 	/* Filtering might have created degree 2 nodes, so remove them */
@@ -1627,7 +1627,7 @@ void removeNormalNodes(ReebGraph *rg)
 			{
 				ReebArc *connectedArc = (ReebArc*)BLI_findConnectedArc((BGraph*)rg, (BArc*)arc, (BNode*)arc->head);
 
-				// Merge arc only if needed
+				/* If arcs are one after the other */
 				if (arc->head == connectedArc->tail)
 				{		
 					/* remove furthest arc */		
@@ -1639,14 +1639,14 @@ void removeNormalNodes(ReebGraph *rg)
 					else
 					{
 						mergeConnectedArcs(rg, connectedArc, arc);
-						break;
-						arc = connectedArc; /* arc was removed, continue with connected */
+						break; /* arc was removed, move to next */
 					}
 				}
-				// Otherwise, mark down vert
+				/* Otherwise, arcs are side by side */
 				else
 				{
-					arc->head->degree = 3;
+					/* Don't do anything, we need to keep the lowest node, even if degree 2 */
+					break;
 				}
 			}
 			
@@ -1655,7 +1655,7 @@ void removeNormalNodes(ReebGraph *rg)
 			{
 				ReebArc *connectedArc = (ReebArc*)BLI_findConnectedArc((BGraph*)rg, (BArc*)arc, (BNode*)arc->tail);
 				
-				// Merge arc only if needed
+				/* If arcs are one after the other */
 				if (arc->tail == connectedArc->head)
 				{				
 					/* remove furthest arc */		
@@ -1667,14 +1667,14 @@ void removeNormalNodes(ReebGraph *rg)
 					else
 					{
 						mergeConnectedArcs(rg, connectedArc, arc);
-						break;
-						arc = connectedArc; /* arc was removed, continue with connected */
+						break; /* arc was removed, move to next */
 					}
 				}
-				// Otherwise, mark down vert
+				/* Otherwise, arcs are side by side */
 				else
 				{
-					arc->tail->degree = 3;
+					/* Don't do anything, we need to keep the lowest node, even if degree 2 */
+					break;
 				}
 			}
 		}

From 686027a75af74b26c4d9fa662f82b00470b67c5b Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Wed, 9 Jul 2008 19:44:40 +0000
Subject: [PATCH 078/252] Multi resolution retargetting. Go back to lowest
 level on shared nodes.

---
 source/blender/include/reeb.h     |  2 +-
 source/blender/src/autoarmature.c |  7 ++++++-
 source/blender/src/reeb.c         | 10 ++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/source/blender/include/reeb.h b/source/blender/include/reeb.h
index 0be9dd29b86..389fed09ca1 100644
--- a/source/blender/include/reeb.h
+++ b/source/blender/include/reeb.h
@@ -166,7 +166,7 @@ void BIF_GlobalReebGraphFromEditMesh(void);
 void BIF_GlobalReebFree(void);
 
 ReebNode *BIF_otherNodeFromIndex(ReebArc *arc, ReebNode *node);
-
+ReebNode *BIF_lowestLevelNode(ReebNode *node);
 
 void REEB_freeGraph(ReebGraph *rg);
 void REEB_exportGraph(ReebGraph *rg, int count);
diff --git a/source/blender/src/autoarmature.c b/source/blender/src/autoarmature.c
index d24aef04bf6..ac2421438b2 100644
--- a/source/blender/src/autoarmature.c
+++ b/source/blender/src/autoarmature.c
@@ -1249,6 +1249,8 @@ static void matchMultiResolutionArc(RigNode *start_node, RigArc *next_iarc, Reeb
 	
 	while (ishape > eshape && next_earc->link_up)
 	{
+		next_earc->flag = 1; // mark previous as taken, to prevent backtrack on lower levels
+		
 		next_earc = next_earc->link_up;
 		enode = next_earc->head;
 		eshape = BLI_subtreeShape((BNode*)enode, (BArc*)next_earc, 1) % MAGIC_NUMBER;
@@ -1320,7 +1322,10 @@ static void retargetSubgraph(RigGraph *rigg, RigArc *start_arc, RigNode *start_n
 	enode = BIF_otherNodeFromIndex(earc, enode);
 	inode = (RigNode*)BLI_otherNode((BArc*)iarc, (BNode*)inode);
 	
-	inode->link_mesh = enode;
+	/* Link with lowest possible node
+	 * Enabling going back to lower levels for each arc
+	 * */
+	inode->link_mesh = BIF_lowestLevelNode(enode);
 	
 	for(i = 0; i < inode->degree; i++)
 	{
diff --git a/source/blender/src/reeb.c b/source/blender/src/reeb.c
index d60a1ca8c8e..7afb9b5f8da 100644
--- a/source/blender/src/reeb.c
+++ b/source/blender/src/reeb.c
@@ -243,6 +243,16 @@ ReebNode *BIF_otherNodeFromIndex(ReebArc *arc, ReebNode *node)
 	return (arc->head->index == node->index) ? arc->tail : arc->head;
 }
 
+ReebNode *BIF_lowestLevelNode(ReebNode *node)
+{
+	while (node->link_down)
+	{
+		node = node->link_down;
+	}
+	
+	return node;
+}
+
 ReebArc * copyArc(ReebGraph *rg, ReebArc *arc)
 {
 	ReebArc *cp_arc;

From 45ab006e7cf6138bfd9e0637a8e969a4489cefe2 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Wed, 9 Jul 2008 21:07:02 +0000
Subject: [PATCH 079/252] Draw node index Retargetting, go to higher levels no
 nodes when no match is found Fix bug in exterme threshold external filtering

---
 source/blender/include/reeb.h     |  1 +
 source/blender/src/autoarmature.c | 32 +++++++++++++++++++++++++++----
 source/blender/src/reeb.c         | 29 ++++++++++++++++++++++++----
 3 files changed, 54 insertions(+), 8 deletions(-)

diff --git a/source/blender/include/reeb.h b/source/blender/include/reeb.h
index 389fed09ca1..2eca4137a79 100644
--- a/source/blender/include/reeb.h
+++ b/source/blender/include/reeb.h
@@ -76,6 +76,7 @@ typedef struct ReebNode {
 	int index;
 	float weight;
 	struct ReebNode *link_down; /* for multi resolution filtering, points to lower levels, if present */
+	struct ReebNode *link_up;
 } ReebNode;
 
 typedef struct ReebEdge {
diff --git a/source/blender/src/autoarmature.c b/source/blender/src/autoarmature.c
index ac2421438b2..5fdb131abc2 100644
--- a/source/blender/src/autoarmature.c
+++ b/source/blender/src/autoarmature.c
@@ -630,7 +630,14 @@ static float calcCost(ReebArcIterator *iter, RigEdge *e1, RigEdge *e2, float *ve
 	{
 		test_angle = saacos(Inpf(vec_first, vec_second));
 		/* ANGLE COST HERE */
-		new_cost += G.scene->toolsettings->skgen_retarget_angle_weight * fabs((test_angle - angle) / test_angle);
+		if (angle > 0)
+		{
+			new_cost += G.scene->toolsettings->skgen_retarget_angle_weight * fabs((test_angle - angle) / angle);
+		}
+		else
+		{
+			new_cost += G.scene->toolsettings->skgen_retarget_angle_weight * fabs(test_angle);
+		}
 	}
 	else
 	{
@@ -886,7 +893,7 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 				{
 					RigEdge *previous = edge->prev;
 					float angle = previous->angle;
-					float test_angle = previous->angle;
+					float test_angle;
 					
 					vec0 = vec_cache[i - 1];
 					VecSubf(vec_first, vec1, vec0); 
@@ -896,7 +903,14 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 					{
 						test_angle = saacos(Inpf(vec_first, vec_second));
 						/* ANGLE COST HERE */
-						new_cost += G.scene->toolsettings->skgen_retarget_angle_weight * fabs((test_angle - angle) / test_angle);
+						if (angle > 0)
+						{
+							new_cost += G.scene->toolsettings->skgen_retarget_angle_weight * fabs((test_angle - angle) / angle);
+						}
+						else
+						{
+							new_cost += G.scene->toolsettings->skgen_retarget_angle_weight * fabs(test_angle);
+						}
 					}
 					else
 					{
@@ -1247,7 +1261,7 @@ static void matchMultiResolutionArc(RigNode *start_node, RigArc *next_iarc, Reeb
 	ishape = BLI_subtreeShape((BNode*)start_node, (BArc*)next_iarc, 1) % MAGIC_NUMBER;
 	eshape = BLI_subtreeShape((BNode*)enode, (BArc*)next_earc, 1) % MAGIC_NUMBER;
 	
-	while (ishape > eshape && next_earc->link_up)
+	while (ishape != eshape && next_earc->link_up)
 	{
 		next_earc->flag = 1; // mark previous as taken, to prevent backtrack on lower levels
 		
@@ -1289,7 +1303,17 @@ static void findCorrespondingArc(RigArc *start_arc, RigNode *start_node, RigArc
 		}
 	}
 	
+	/* not found, try at higher nodes (lower node might have filtered internal arcs, messing shape of tree */
+	if (next_iarc->link_mesh == NULL)
+	{
+		if (enode->link_up)
+		{
+			start_node->link_mesh = enode->link_up;
+			findCorrespondingArc(start_arc, start_node, next_iarc);
+		}
+	}
 
+	/* still not found, print debug info */
 	if (next_iarc->link_mesh == NULL)
 	{
 		printf("--------------------------\n");
diff --git a/source/blender/src/reeb.c b/source/blender/src/reeb.c
index 7afb9b5f8da..31a233452c3 100644
--- a/source/blender/src/reeb.c
+++ b/source/blender/src/reeb.c
@@ -210,6 +210,9 @@ ReebNode * copyNode(ReebGraph *rg, ReebNode *node)
 	cp_node->next = NULL;
 	cp_node->arcs = NULL;
 	
+	cp_node->link_up = NULL;
+	cp_node->link_down = NULL;
+	
 	BLI_addtail(&rg->nodes, cp_node);
 	rg->totnodes++;
 	
@@ -232,6 +235,7 @@ void relinkNodes(ReebGraph *low_rg, ReebGraph *high_rg)
 			if (low_node->index == high_node->index)
 			{
 				high_node->link_down = low_node;
+				low_node->link_up = high_node;
 				break;
 			}
 		}
@@ -1202,9 +1206,10 @@ int filterExternalReebGraph(ReebGraph *rg, float threshold)
 			// If middle node is a normal node, it will be removed later
 			if (middleNode->degree == 2)
 			{
-				removedNode = middleNode;
-
-				filterArc(rg, terminalNode, removedNode, arc, 1);
+				continue;
+//				removedNode = middleNode;
+//
+//				filterArc(rg, terminalNode, removedNode, arc, 1);
 			}
 			// Otherwise, just plain remove of the arc
 			else
@@ -3103,10 +3108,18 @@ void REEB_draw()
 		{
 			glColor3f(1, 0, 0);
 		}
-		else
+		else if (arc->head->symmetry_flag & SYM_AXIAL)
 		{
 			glColor3f(1, 0.5f, 0);
 		}
+		else if (arc->head->symmetry_flag & SYM_RADIAL)
+		{
+			glColor3f(0.5f, 1, 0);
+		}
+		else
+		{
+			glColor3f(1, 1, 0);
+		}
 		glBegin(GL_LINE_STRIP);
 			glVertex3fv(arc->head->p);
 			
@@ -3145,6 +3158,14 @@ void REEB_draw()
 		glColor3f(0, 1, 0);
 		glRasterPos3fv(vec);
 		BMF_DrawString( G.fonts, text);
+
+		sprintf(text, "%i", arc->head->index);
+		glRasterPos3fv(arc->head->p);
+		BMF_DrawString( G.fonts, text);
+
+		sprintf(text, "%i", arc->tail->index);
+		glRasterPos3fv(arc->tail->p);
+		BMF_DrawString( G.fonts, text);
 	}
 	glEnable(GL_DEPTH_TEST);
 	

From fbc105335f561400333ad3349538a0ca6e0fbd9d Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Thu, 10 Jul 2008 15:15:47 +0000
Subject: [PATCH 080/252] Special multi resolution lookup on first arc, because
 the lowest node can get filtered out too.

---
 source/blender/src/autoarmature.c | 35 ++++++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/source/blender/src/autoarmature.c b/source/blender/src/autoarmature.c
index 5fdb131abc2..487524865be 100644
--- a/source/blender/src/autoarmature.c
+++ b/source/blender/src/autoarmature.c
@@ -1274,6 +1274,36 @@ static void matchMultiResolutionArc(RigNode *start_node, RigArc *next_iarc, Reeb
 	next_iarc->link_mesh = next_earc;
 }
 
+static void matchMultiResolutionStartingArc(ReebGraph *reebg, RigArc *iarc, RigNode *inode)
+{
+	ReebArc *earc;
+	ReebNode *enode;
+	int ishape, eshape;
+	int MAGIC_NUMBER = 100; /* FIXME */
+	
+	earc = reebg->arcs.first;
+	enode = earc->head;
+	
+	ishape = BLI_subtreeShape((BNode*)inode, (BArc*)iarc, 1) % MAGIC_NUMBER;
+	eshape = BLI_subtreeShape((BNode*)enode, (BArc*)earc, 1) % MAGIC_NUMBER;
+	
+	while (ishape != eshape && reebg->link_up)
+	{
+		earc->flag = 1; // mark previous as taken, to prevent backtrack on lower levels
+		
+		reebg = reebg->link_up;
+		
+		earc = reebg->arcs.first;
+		enode = earc->head;
+		
+		eshape = BLI_subtreeShape((BNode*)enode, (BArc*)earc, 1) % MAGIC_NUMBER;
+	} 
+
+	earc->flag = 1; // mark as taken
+	iarc->link_mesh = earc;
+	inode->link_mesh = enode;
+}
+
 static void findCorrespondingArc(RigArc *start_arc, RigNode *start_node, RigArc *next_iarc)
 {
 	ReebNode *enode = start_node->link_mesh;
@@ -1381,13 +1411,12 @@ static void retargetGraphs(RigGraph *rigg)
 	/* return to first level */
 	reebg = rigg->link_mesh;
 	
-	earc = reebg->arcs.first;
 	iarc = (RigArc*)rigg->head->arcs[0];
 	inode = iarc->tail;
 	
-	matchMultiResolutionArc(inode, iarc, earc);
+	matchMultiResolutionStartingArc(reebg, iarc, inode);
 
-	earc = iarc->link_mesh; /* find might have changed it */
+	earc = iarc->link_mesh; /* has been set earlier */
 	enode = earc->head;
 
 	inode->link_mesh = enode;

From ccc62d3385f6961afeed795c495d5e4667810ece Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Thu, 10 Jul 2008 18:48:27 +0000
Subject: [PATCH 081/252] Use tree length as parameter for multi resolution
 filtering.

This is the begining of the simplification phase (meaning less parameters to mess up users)
---
 source/blender/blenlib/BLI_graph.h    |  5 ++-
 source/blender/blenlib/intern/graph.c | 53 +++++++++++++++++++++++++++
 source/blender/include/reeb.h         |  2 +
 source/blender/src/autoarmature.c     |  2 +
 source/blender/src/reeb.c             | 20 ++++++----
 5 files changed, 73 insertions(+), 9 deletions(-)

diff --git a/source/blender/blenlib/BLI_graph.h b/source/blender/blenlib/BLI_graph.h
index ae99ad5f5c7..d309d73fbee 100644
--- a/source/blender/blenlib/BLI_graph.h
+++ b/source/blender/blenlib/BLI_graph.h
@@ -24,6 +24,8 @@ typedef struct BGraph {
 	ListBase	arcs;
 	ListBase	nodes;
 	
+	float length;
+	
 	/* function pointer to deal with custom fonctionnality */
 	FreeArc			free_arc;
 	FreeNode		free_node;
@@ -79,6 +81,8 @@ void BLI_freeAdjacencyList(BGraph *rg);
 int BLI_FlagSubgraphs(BGraph *graph);
 
 int BLI_subtreeShape(BNode *node, BArc *rootArc, int include_root);
+float BLI_subtreeLength(BNode *node, BArc *rootArc);
+void BLI_calcGraphLength(BGraph *graph);
 
 void BLI_replaceNode(BGraph *graph, BNode *node_src, BNode *node_replaced);
 void BLI_removeDoubleNodes(BGraph *graph, float limit);
@@ -88,7 +92,6 @@ BArc * BLI_findConnectedArc(BGraph *graph, BArc *arc, BNode *v);
 int	BLI_isGraphCyclic(BGraph *graph);
 
 /*------------ Symmetry handling ------------*/
-//	float limit = G.scene->toolsettings->skgen_symmetry_limit;
 void BLI_markdownSymmetry(BGraph *graph, BNode *root_node, float limit);
 
 void BLI_mirrorAlongAxis(float v[3], float center[3], float axis[3]);
diff --git a/source/blender/blenlib/intern/graph.c b/source/blender/blenlib/intern/graph.c
index 9bdf286d248..a3089369c22 100644
--- a/source/blender/blenlib/intern/graph.c
+++ b/source/blender/blenlib/intern/graph.c
@@ -358,6 +358,59 @@ int BLI_subtreeShape(BNode *node, BArc *rootArc, int include_root)
 	}
 }
 
+float BLI_subtreeLength(BNode *node, BArc *rootArc)
+{
+	float length = 0;
+	int i;
+
+	for(i = 0; i < node->degree; i++)
+	{
+		BArc *arc = node->arcs[i];
+		
+		/* don't go back on the root arc */
+		if (arc != rootArc)
+		{
+			length = MAX2(length, BLI_subtreeLength(BLI_otherNode(arc, node), arc));
+		}
+	}
+	
+	if (rootArc)
+	{
+		length += rootArc->length;
+	}
+	
+	return length;
+}
+
+void BLI_calcGraphLength(BGraph *graph)
+{
+	if (BLI_isGraphCyclic(graph) == 0)
+	{
+		float length = 0;
+		int nb_subgraphs;
+		int i;
+		
+		nb_subgraphs = BLI_FlagSubgraphs(graph);
+		
+		for (i = 1; i <= nb_subgraphs; i++)
+		{
+			BNode *node;
+			
+			for (node = graph->nodes.first; node; node = node->next)
+			{
+				/* start on an external node  of the subgraph */
+				if (node->flag == i && node->degree == 1)
+				{
+					length = MAX2(length, BLI_subtreeLength(node, NULL));
+					break;
+				}
+			}
+		}
+		
+		graph->length = length;
+	}
+}
+
 /********************************* SYMMETRY DETECTION **************************************************/
 
 void markdownSymmetryArc(BGraph *graph, BArc *arc, BNode *node, int level, float limit);
diff --git a/source/blender/include/reeb.h b/source/blender/include/reeb.h
index 2eca4137a79..6baaaf1ca96 100644
--- a/source/blender/include/reeb.h
+++ b/source/blender/include/reeb.h
@@ -42,6 +42,8 @@ typedef struct ReebGraph {
 	ListBase	arcs;
 	ListBase	nodes;
 	
+	float length;
+	
 	FreeArc			free_arc;
 	FreeNode		free_node;
 	RadialSymmetry	radial_symmetry;
diff --git a/source/blender/src/autoarmature.c b/source/blender/src/autoarmature.c
index 487524865be..9af3d639894 100644
--- a/source/blender/src/autoarmature.c
+++ b/source/blender/src/autoarmature.c
@@ -74,6 +74,8 @@ typedef struct RigGraph {
 	ListBase	arcs;
 	ListBase	nodes;
 	
+	float length;
+	
 	FreeArc			free_arc;
 	FreeNode		free_node;
 	RadialSymmetry	radial_symmetry;
diff --git a/source/blender/src/reeb.c b/source/blender/src/reeb.c
index 31a233452c3..a174c5c199f 100644
--- a/source/blender/src/reeb.c
+++ b/source/blender/src/reeb.c
@@ -310,6 +310,7 @@ ReebGraph * copyReebGraph(ReebGraph *rg)
 	ReebGraph *cp_rg = newReebGraph();
 	
 	cp_rg->resolution = rg->resolution;
+	cp_rg->length = rg->length;
 	cp_rg->link_up = rg;
 
 	/* Copy nodes */	
@@ -2947,11 +2948,19 @@ ReebGraph *BIF_ReebGraphMultiFromEditMesh(void)
 	/* Remove arcs without embedding */
 	filterNullReebGraph(rg);
 
+	/* smart filter and loop filter on basic level */
+	filterGraph(rg, SKGEN_FILTER_SMART, 0, 0);
+
 	repositionNodes(rg);
 
 	/* Filtering might have created degree 2 nodes, so remove them */
 	removeNormalNodes(rg);
 	
+	BLI_rebuildAdjacencyList((BGraph*)rg);
+	
+	/* calc length before copy, so we have same length on all levels */
+	BLI_calcGraphLength((BGraph*)rg);
+
 	for (i = 0; i < nb_levels; i++)
 	{
 		rg = copyReebGraph(rg);
@@ -2959,18 +2968,13 @@ ReebGraph *BIF_ReebGraphMultiFromEditMesh(void)
 	
 	for (rgi = rg, i = nb_levels, previous = NULL; rgi; previous = rgi, rgi = rgi->link_up, i--)
 	{
-		/* don't fully filter last level */
+		/* don't filter last level */
 		if (rgi->link_up)
 		{
-			float internal_threshold = G.scene->toolsettings->skgen_threshold_internal * (i / (float)nb_levels);
-			float external_threshold = G.scene->toolsettings->skgen_threshold_external * (i / (float)nb_levels);
+			float internal_threshold = rg->length * G.scene->toolsettings->skgen_threshold_internal * (i / (float)nb_levels);
+			float external_threshold = rg->length * G.scene->toolsettings->skgen_threshold_external * (i / (float)nb_levels);
 			filterGraph(rgi, G.scene->toolsettings->skgen_options, internal_threshold, external_threshold);
 		}
-		/* on last level, only smart filter and loop filter */
-		else
-		{
-			filterGraph(rgi, SKGEN_FILTER_SMART, 0, 0);
-		}
 
 		finalizeGraph(rgi, G.scene->toolsettings->skgen_postpro_passes, G.scene->toolsettings->skgen_postpro);
 

From de1987eba84f828fdfddeb393d7faf089eb63c5b Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Thu, 10 Jul 2008 21:04:29 +0000
Subject: [PATCH 082/252] First draft for simulated annealing optimization
 method (disabled because not ok yet)

---
 source/blender/src/autoarmature.c | 162 ++++++++++++++++++++++++++++--
 1 file changed, 154 insertions(+), 8 deletions(-)

diff --git a/source/blender/src/autoarmature.c b/source/blender/src/autoarmature.c
index 9af3d639894..0644b484575 100644
--- a/source/blender/src/autoarmature.c
+++ b/source/blender/src/autoarmature.c
@@ -47,6 +47,7 @@
 #include "BLI_editVert.h"
 #include "BLI_ghash.h"
 #include "BLI_graph.h"
+#include "BLI_rand.h"
 
 #include "BDR_editobject.h"
 
@@ -591,7 +592,7 @@ static float calcMaximumDistance(ReebArcIterator *iter, float *vec0, float *vec1
 	if (v1_inpf > 0)
 	{
 		int j;
-		for (j = i0; j < i1; j++)
+		for (j = i0 + 1; j < i1 - 1; j++)
 		{
 			float dist;
 			
@@ -660,6 +661,8 @@ static float calcCost(ReebArcIterator *iter, RigEdge *e1, RigEdge *e2, float *ve
 	return new_cost;
 }
 
+#define MAX_COST 100 /* FIX ME */
+
 static void calcGradient(RigEdge *e1, RigEdge *e2, ReebArcIterator *iter, int index, int nb_joints, float *cost_cube, int *positions, float **vec_cache)
 {
 	EmbedBucket *bucket = NULL;
@@ -700,7 +703,7 @@ static void calcGradient(RigEdge *e1, RigEdge *e2, ReebArcIterator *iter, int in
 	
 	if (index + 1 < nb_joints && next_position == positions[index + 1])
 	{
-		cost_cube[index * 3 + 2] = 1;
+		cost_cube[index * 3 + 2] = MAX_COST;
 	}
 	else
 	{
@@ -708,7 +711,7 @@ static void calcGradient(RigEdge *e1, RigEdge *e2, ReebArcIterator *iter, int in
 		
 		if (bucket == NULL)
 		{
-			cost_cube[index * 3 + 2] = 1;
+			cost_cube[index * 3 + 2] = MAX_COST;
 		}
 		else
 		{
@@ -722,7 +725,7 @@ static void calcGradient(RigEdge *e1, RigEdge *e2, ReebArcIterator *iter, int in
 	
 	if (index - 1 > -1 && next_position == positions[index - 1])
 	{
-		cost_cube[index * 3] = 1;
+		cost_cube[index * 3] = MAX_COST;
 	}
 	else
 	{
@@ -730,7 +733,7 @@ static void calcGradient(RigEdge *e1, RigEdge *e2, ReebArcIterator *iter, int in
 		
 		if (bucket == NULL)
 		{
-			cost_cube[index * 3] = 1;
+			cost_cube[index * 3] = MAX_COST;
 		}
 		else
 		{
@@ -741,6 +744,73 @@ static void calcGradient(RigEdge *e1, RigEdge *e2, ReebArcIterator *iter, int in
 	}
 }
 
+static float probability(float delta_cost, float iterations)
+{
+	if (delta_cost < 0)
+	{
+		return 1;
+	}
+	else
+	{
+		float temperature = (1 - iterations);
+		return (float)exp(delta_cost) * temperature;
+	}
+}
+
+static int neighbour(int nb_joints, float *cost_cube, int *moving_joint, int *moving_direction)
+{
+	int total = 0;
+	int chosen = 0;
+	int i;
+	
+	for (i = 0; i < nb_joints; i++)
+	{
+		if (cost_cube[i * 3] < MAX_COST)
+		{
+			total++;
+		}
+		
+		if (cost_cube[i * 3 + 2] < MAX_COST)
+		{
+			total++;
+		}
+	}
+	
+	if (total == 0)
+	{
+		return 0;
+	}
+	
+	chosen = (int)BLI_drand() * total;
+	
+	for (i = 0; i < nb_joints; i++)
+	{
+		if (cost_cube[i * 3] < MAX_COST)
+		{
+			if (chosen == 0)
+			{
+				*moving_joint = i;
+				*moving_direction = -1;
+				break;
+			}
+			chosen--;
+		}
+		
+		if (cost_cube[i * 3 + 2] < MAX_COST)
+		{
+			if (chosen == 0)
+			{
+				*moving_joint = i;
+				*moving_direction = 1;
+				break;
+			}
+			chosen--;
+		}
+	}
+	
+	return 1;
+}
+
 static void retargetArctoArcAggresive(RigArc *iarc)
 {
 	ReebArcIterator iter;
@@ -798,7 +868,7 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 	vec_cache[0] = node_start->p;
 	vec_cache[nb_edges] = node_end->p;
 
-#if 1
+#if 1 /* BRUTE FORCE */
 	while(1)
 	{
 		float cost = 0;
@@ -958,12 +1028,88 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 			memcpy(best_positions, positions, sizeof(int) * nb_joints);
 		}
 	}
-#else
+#elif 1 /* SIMULATED ANNEALING */
+	{
+		RigEdge *previous;
+		float *cost_cube;
+		int k, kmax;
+		
+		kmax = 100;
+		
+		/* [joint: index][position: -1, 0, +1] */
+		cost_cube = MEM_callocN(sizeof(float) * 3 * nb_joints, "Cost Cube");
+		
+		initArcIterator(&iter, earc, node_start);
+
+		/* init vec_cache */
+		for (i = 0; i < nb_joints; i++)
+		{
+			bucket = peekBucket(&iter, positions[i]);
+			vec_cache[i + 1] = bucket->p;
+		}
+
+		/* init cost cube */
+		for (previous = iarc->edges.first, edge = previous->next, i = 0;
+			 edge;
+			 previous = edge, edge = edge->next, i += 1)
+		{
+			calcGradient(previous, edge, &iter, i, nb_joints, cost_cube, positions, vec_cache);
+		}
+		
+		for (k = 0; k < kmax; k++)
+		{
+			int status;
+			int moving_joint = -1;
+			int move_direction = -1;
+			float delta_cost;
+			
+			printf("\r%i", k);
+			
+			status = neighbour(nb_joints, cost_cube, &moving_joint, &move_direction);
+			
+			if (status == 0)
+			{
+				break;
+			}
+			
+			delta_cost = cost_cube[moving_joint * 3 + (1 + move_direction)];
+
+			if (probability(delta_cost, (float)k / (float)kmax) > BLI_frand())
+			{
+				/* update position */			
+				positions[moving_joint] += move_direction;
+				
+				/* update vector cache */
+				bucket = peekBucket(&iter, positions[moving_joint]);
+				vec_cache[moving_joint + 1] = bucket->p;
+	
+				/* update cost cube */			
+				for (previous = iarc->edges.first, edge = previous->next, i = 0;
+					 edge;
+					 previous = edge, edge = edge->next, i += 1)
+				{
+					if (i == moving_joint - 1 ||
+						i == moving_joint ||
+						i == moving_joint + 1)
+					{
+						calcGradient(previous, edge, &iter, i, nb_joints, cost_cube, positions, vec_cache);
+					}
+				}
+			}
+		}
+		
+		printf("\n");
+		
+		memcpy(best_positions, positions, sizeof(int) * nb_joints);
+		
+		MEM_freeN(cost_cube);
+	}	
+#else	  /* GRADIENT DESCENT*/
 	{
 		RigEdge *previous;
 		float *cost_cube;
 		
-		/* [joint: index][position: -1, 0, +2] */
+		/* [joint: index][position: -1, 0, +1] */
 		cost_cube = MEM_callocN(sizeof(float) * 3 * nb_joints, "Cost Cube");
 		
 		initArcIterator(&iter, earc, node_start);

From d124d3c5cdfdc9d470a4734281396b97c4d3afb5 Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Sat, 12 Jul 2008 04:02:08 +0000
Subject: [PATCH 083/252] soc-2008-mxcurioni: first part of the Freestyle
 Python implementation. A new Freestyle module is added. The following modules
 are implemented: BinaryPredicate0D, BinaryPredicate1D, Id, Interface0D,
 Interface1D. I added a Convert module to help in the creation of Python
 objects for Freestyle's data structures. I also added a missing file for
 guarded_alloc needed for compilation on Windows.

---
 intern/guardedalloc/intern/mmap_win.c         | 260 ++++++++++++++++++
 intern/guardedalloc/mmap_win.h                |  51 ++++
 source/blender/freestyle/SConscript           |  14 +-
 .../freestyle/intern/app_blender/api.cpp      | 111 +++-----
 .../intern/python/BinaryPredicate0D.cpp       | 147 +++++++++-
 .../intern/python/BinaryPredicate0D.h         |  37 +++
 .../intern/python/BinaryPredicate1D.cpp       | 150 +++++++++-
 .../intern/python/BinaryPredicate1D.h         |  37 +++
 .../python/BinaryPredicate1D/FalseBP1D.cpp    |   8 +-
 .../python/BinaryPredicate1D/Length2DBP1D.cpp |   8 +-
 .../BinaryPredicate1D/SameShapeIdBP1D.cpp     |   8 +-
 .../python/BinaryPredicate1D/TrueBP1D.cpp     |   8 +-
 .../ViewMapGradientNormBP1D.cpp               |   6 +-
 .../freestyle/intern/python/Convert.cpp       |  54 ++++
 .../blender/freestyle/intern/python/Convert.h |  32 +++
 .../intern/python/CurvePointIterator.cpp      | 142 +++++-----
 .../freestyle/intern/python/Freestyle.cpp     | 136 +++++++++
 .../freestyle/intern/python/Freestyle.h       |  32 +++
 source/blender/freestyle/intern/python/Id.cpp | 197 +++++++++++--
 source/blender/freestyle/intern/python/Id.h   |  39 +++
 .../freestyle/intern/python/Interface0D.cpp   | 179 ++++++++++--
 .../freestyle/intern/python/Interface0D.h     |  36 +++
 .../intern/python/Interface0D/CurvePoint.cpp  |  88 +++---
 .../Interface0D/CurvePoint/StrokeVertex.cpp   |  52 ++--
 .../intern/python/Interface0D/SVertex.cpp     | 134 ++++-----
 .../intern/python/Interface0D/ViewVertex.cpp  |  38 +--
 .../Interface0D/ViewVertex/NonTVertex.cpp     |  66 ++---
 .../python/Interface0D/ViewVertex/TVertex.cpp |  92 +++----
 .../intern/python/Interface0DIterator.cpp     |  52 ++--
 .../freestyle/intern/python/Interface1D.cpp   | 179 +++++++++---
 .../freestyle/intern/python/Interface1D.h     |  36 +++
 .../intern/python/Interface1D/Curve.cpp       |  56 ++--
 .../intern/python/Interface1D/FEdge.cpp       | 126 ++++-----
 .../python/Interface1D/FEdge/FEdgeSharp.cpp   |  22 +-
 .../python/Interface1D/FEdge/FEdgeSmooth.cpp  |  16 +-
 .../intern/python/Interface1D/Stroke.cpp      | 118 ++++----
 .../intern/python/Interface1D/ViewEdge.cpp    | 118 ++++----
 .../freestyle/intern/python/Material.cpp      |  56 ++--
 .../blender/freestyle/intern/python/Noise.cpp |  24 +-
 .../freestyle/intern/python/Operators.cpp     |  77 +-----
 .../freestyle/intern/python/SShape.cpp        |  60 ++--
 .../intern/python/StrokeAttribute.cpp         |  56 ++--
 .../freestyle/intern/python/StrokeShader.cpp  |   6 +-
 .../StrokeShader/BackboneStretcherShader.cpp  |   4 +-
 .../python/StrokeShader/BezierCurveShader.cpp |   4 +-
 .../StrokeShader/CalligraphicShader.cpp       |   2 +-
 .../python/StrokeShader/ColorNoiseShader.cpp  |   4 +-
 .../ColorVariationPatternShader.cpp           |   2 +-
 .../StrokeShader/ConstantColorShader.cpp      |   6 +-
 .../StrokeShader/ConstantThicknessShader.cpp  |   4 +-
 .../ConstrainedIncreasingThicknessShader.cpp  |   2 +-
 .../StrokeShader/GuidingLinesShader.cpp       |   4 +-
 .../StrokeShader/IncreasingColorShader.cpp    |   4 +-
 .../IncreasingThicknessShader.cpp             |   2 +-
 .../StrokeShader/PolygonalizationShader.cpp   |   4 +-
 .../python/StrokeShader/SamplingShader.cpp    |   4 +-
 .../StrokeShader/SpatialNoiseShader.cpp       |   2 +-
 .../StrokeShader/StrokeTextureShader.cpp      |   4 +-
 .../StrokeShader/TextureAssignerShader.cpp    |   4 +-
 .../StrokeShader/ThicknessNoiseShader.cpp     |   4 +-
 .../ThicknessVariationPatternShader.cpp       |   2 +-
 .../python/StrokeShader/TipRemoverShader.cpp  |   2 +-
 .../python/StrokeShader/fstreamShader.cpp     |   4 +-
 .../python/StrokeShader/streamShader.cpp      |   6 +-
 .../intern/python/StrokeVertexIterator.cpp    | 130 ++++-----
 .../UnaryFunction0D/UnaryFunction0DDouble.cpp |   6 +-
 .../UnaryFunction0D/UnaryFunction0DFloat.cpp  |   6 +-
 .../UnaryFunction0D/UnaryFunction0DId.cpp     |   6 +-
 .../UnaryFunction0DUnsigned.cpp               |   6 +-
 .../UnaryFunction0D/UnaryFunction0DVec2f.cpp  |   6 +-
 .../UnaryFunction0D/UnaryFunction0DVec3f.cpp  |   6 +-
 .../UnaryFunction0DVectorViewShape.cpp        |   4 +-
 .../UnaryFunction0DViewShape.cpp              |   4 +-
 .../UnaryFunction0D_Id/ShapeIdF0D.cpp         |   8 +-
 .../UnaryFunction0D_Material/MaterialF0D.cpp  |   8 +-
 .../CurveNatureF0D.cpp                        |   8 +-
 .../UnaryFunction0D_Vec2f/Normal2DF0D.cpp     |   8 +-
 .../VertexOrientation2DF0D.cpp                |   8 +-
 .../VertexOrientation3DF0D.cpp                |   8 +-
 .../GetOccludeeF0D.cpp                        |   8 +-
 .../UnaryFunction0D_ViewShape/GetShapeF0D.cpp |   8 +-
 .../UnaryFunction0D_double/DensityF0D.cpp     |  12 +
 .../LocalAverageDepthF0D.cpp                  |  12 +
 .../GetCurvilinearAbscissaF0D.cpp             |   8 +-
 .../UnaryFunction0D_float/GetParameterF0D.cpp |   8 +-
 .../GetViewMapGradientNormF0D.cpp             |   6 +-
 .../ReadCompleteViewMapPixelF0D.cpp           |   6 +-
 .../UnaryFunction0D_float/ReadMapPixelF0D.cpp |   6 +-
 .../ReadSteerableViewMapPixelF0D.cpp          |   6 +-
 .../Curvature2DAngleF0D.cpp                   |   8 +-
 .../UnaryFunction0D_real/GetProjectedXF0D.cpp |   8 +-
 .../UnaryFunction0D_real/GetProjectedYF0D.cpp |   8 +-
 .../UnaryFunction0D_real/GetProjectedZF0D.cpp |   8 +-
 .../UnaryFunction0D_real/GetXF0D.cpp          |   8 +-
 .../UnaryFunction0D_real/GetYF0D.cpp          |   8 +-
 .../UnaryFunction0D_real/GetZF0D.cpp          |   8 +-
 .../ZDiscontinuityF0D.cpp                     |   8 +-
 .../QuantitativeInvisibilityF0D.cpp           |   8 +-
 .../GetOccludersF0D.cpp                       |   8 +-
 .../intern/python/UnaryFunction0DVoid.cpp     |   6 +-
 .../UnaryFunction1D/UnaryFunction1DDouble.cpp |  10 +-
 .../UnaryFunction1D/UnaryFunction1DFloat.cpp  |  10 +-
 .../UnaryFunction1DUnsigned.cpp               |  10 +-
 .../UnaryFunction1D/UnaryFunction1DVec2f.cpp  |  10 +-
 .../UnaryFunction1D/UnaryFunction1DVec3f.cpp  |  10 +-
 .../UnaryFunction1DVectorViewShape.cpp        |   8 +-
 .../CurveNatureF1D.cpp                        |   6 +-
 .../UnaryFunction1D_Vec2f/Normal2DF1D.cpp     |   6 +-
 .../Orientation2DF1D.cpp                      |   6 +-
 .../Orientation3DF1D.cpp                      |   6 +-
 .../UnaryFunction1D_double/DensityF1D.cpp     |   4 +-
 .../GetCompleteViewMapDensityF1D.cpp          |   6 +-
 .../GetDirectionalViewMapDensityF1D.cpp       |   6 +-
 .../LocalAverageDepthF1D.cpp                  |   6 +-
 .../Curvature2DAngleF1D.cpp                   |   6 +-
 .../UnaryFunction1D_real/GetProjectedXF1D.cpp |   6 +-
 .../UnaryFunction1D_real/GetProjectedYF1D.cpp |   6 +-
 .../UnaryFunction1D_real/GetProjectedZF1D.cpp |   6 +-
 .../GetSteerableViewMapDensityF1D.cpp         |   4 +-
 .../GetViewMapGradientNormF1D.cpp             |   6 +-
 .../UnaryFunction1D_real/GetXF1D.cpp          |   6 +-
 .../UnaryFunction1D_real/GetYF1D.cpp          |   6 +-
 .../UnaryFunction1D_real/GetZF1D.cpp          |   6 +-
 .../ZDiscontinuityF1D.cpp                     |   6 +-
 .../QuantitativeInvisibilityF1D.cpp           |   6 +-
 .../GetOccludeeF1D.cpp                        |   6 +-
 .../GetOccludersF1D.cpp                       |   6 +-
 .../GetShapeF1D.cpp                           |   6 +-
 .../ChainingTimeStampF1D.cpp                  |   8 +-
 .../IncrementChainingTimeStampF1D.cpp         |   8 +-
 .../UnaryFunction1D_void/TimeStampF1D.cpp     |   8 +-
 .../intern/python/UnaryFunction1DVoid.cpp     |  10 +-
 .../intern/python/UnaryPredicate0D.cpp        |   6 +-
 .../python/UnaryPredicate0D/FalseUP0D.cpp     |   6 +-
 .../python/UnaryPredicate0D/TrueUP0D.cpp      |   6 +-
 .../intern/python/UnaryPredicate1D.cpp        |   6 +-
 .../python/UnaryPredicate1D/ContourUP1D.cpp   |   8 +-
 .../UnaryPredicate1D/DensityLowerThanUP1D.cpp |   6 +-
 .../EqualToChainingTimeStampUP1D.cpp          |   6 +-
 .../UnaryPredicate1D/EqualToTimeStampUP1D.cpp |   6 +-
 .../UnaryPredicate1D/ExternalContourUP1D.cpp  |   8 +-
 .../python/UnaryPredicate1D/FalseUP1D.cpp     |   6 +-
 .../QuantitativeInvisibilityUP1D.cpp          |   6 +-
 .../python/UnaryPredicate1D/ShapeUP1D.cpp     |   6 +-
 .../python/UnaryPredicate1D/TrueUP1D.cpp      |   6 +-
 .../ViewEdgeIterator/ChainingIterator.cpp     |  18 +-
 .../ChainPredicateIterator.cpp                |   6 +-
 .../ChainSilhouetteIterator.cpp               |   8 +-
 .../freestyle/intern/python/ViewMap.cpp       |  52 ++--
 .../freestyle/intern/python/ViewShape.cpp     |  44 +--
 source/blender/python/SConscript              |   2 +-
 source/blender/python/api2_2x/Blender.c       |   2 +
 .../blender/render/intern/source/pipeline.c   |   2 +-
 153 files changed, 2725 insertions(+), 1337 deletions(-)
 create mode 100644 intern/guardedalloc/intern/mmap_win.c
 create mode 100644 intern/guardedalloc/mmap_win.h
 create mode 100644 source/blender/freestyle/intern/python/BinaryPredicate0D.h
 create mode 100644 source/blender/freestyle/intern/python/BinaryPredicate1D.h
 create mode 100644 source/blender/freestyle/intern/python/Convert.cpp
 create mode 100644 source/blender/freestyle/intern/python/Convert.h
 create mode 100644 source/blender/freestyle/intern/python/Freestyle.cpp
 create mode 100644 source/blender/freestyle/intern/python/Freestyle.h
 create mode 100644 source/blender/freestyle/intern/python/Id.h
 create mode 100644 source/blender/freestyle/intern/python/Interface0D.h
 create mode 100644 source/blender/freestyle/intern/python/Interface1D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/DensityF0D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/LocalAverageDepthF0D.cpp

diff --git a/intern/guardedalloc/intern/mmap_win.c b/intern/guardedalloc/intern/mmap_win.c
new file mode 100644
index 00000000000..436c99344a7
--- /dev/null
+++ b/intern/guardedalloc/intern/mmap_win.c
@@ -0,0 +1,260 @@
+/**
+ * $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): Andrea Weikert.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+ 
+#if defined(WIN32)
+
+#include <windows.h>
+#include <errno.h>
+#include <io.h>
+#include <sys/types.h>
+#include <stdio.h>
+
+#include "mmap_win.h"
+
+#ifndef FILE_MAP_EXECUTE
+//not defined in earlier versions of the Platform  SDK (before February 2003)
+#define FILE_MAP_EXECUTE 0x0020
+#endif
+
+/* --------------------------------------------------------------------- */
+/* local storage definitions                                                    */
+/* --------------------------------------------------------------------- */
+/* all memory mapped chunks are put in linked lists */
+typedef struct mmapLink
+{
+	struct mmapLink *next,*prev;
+} mmapLink;
+
+typedef struct mmapListBase 
+{
+	void *first, *last;
+} mmapListBase;
+
+typedef struct MemMap {
+	struct MemMap *next,*prev;
+	void *mmap;
+	HANDLE fhandle;
+	HANDLE maphandle;
+} MemMap;
+
+/* --------------------------------------------------------------------- */
+/* local functions                                                       */
+/* --------------------------------------------------------------------- */
+
+static void mmap_addtail(volatile mmapListBase *listbase, void *vlink);
+static void mmap_remlink(volatile mmapListBase *listbase, void *vlink);
+static void *mmap_findlink(volatile mmapListBase *listbase, void *ptr);
+
+static int mmap_get_prot_flags (int flags);
+static int mmap_get_access_flags (int flags);
+
+/* --------------------------------------------------------------------- */
+/* vars                                                                  */
+/* --------------------------------------------------------------------- */
+volatile static struct mmapListBase _mmapbase;
+volatile static struct mmapListBase *mmapbase = &_mmapbase;
+
+
+/* --------------------------------------------------------------------- */
+/* implementation                                                        */
+/* --------------------------------------------------------------------- */
+
+/* mmap for windows */
+void *mmap(void *start, size_t len, int prot, int flags, int fd, off_t offset)
+{
+	HANDLE fhandle = INVALID_HANDLE_VALUE;
+	HANDLE maphandle;
+	int prot_flags = mmap_get_prot_flags(prot);
+	int access_flags = mmap_get_access_flags(prot);
+	MemMap *mm = NULL;
+	void *ptr = NULL;
+
+	if ( flags & MAP_FIXED ) {
+		return MAP_FAILED;
+	}
+
+	/*
+	if ( fd == -1 ) {
+		_set_errno( EBADF );
+        return MAP_FAILED;
+	}
+	*/
+
+	if ( fd != -1 ) {
+		fhandle = (HANDLE) _get_osfhandle (fd);
+	}
+	if ( fhandle == INVALID_HANDLE_VALUE ) {
+		if (!(flags & MAP_ANONYMOUS)) {
+			errno = EBADF;
+			return MAP_FAILED;
+		}
+	} else {
+		if ( !DuplicateHandle( GetCurrentProcess(), fhandle, GetCurrentProcess(),
+							&fhandle, 0, FALSE, DUPLICATE_SAME_ACCESS ) ) {
+			return MAP_FAILED;
+		}
+	}
+
+	maphandle = CreateFileMapping(fhandle, NULL, prot_flags, 0, len, NULL);
+	if ( maphandle == 0 ) {
+        errno = EBADF;
+		return MAP_FAILED;
+    }
+
+	ptr = MapViewOfFile(maphandle, access_flags, 0, offset, 0);
+	if ( ptr == NULL ) {
+		DWORD dwLastErr = GetLastError();
+		if ( dwLastErr == ERROR_MAPPED_ALIGNMENT )
+			errno=EINVAL;
+		else
+			errno=EACCES;
+		CloseHandle(maphandle);
+		return MAP_FAILED;
+	}
+
+	mm= (MemMap *)malloc(sizeof(MemMap));
+	if (!mm) {
+		errno=ENOMEM;
+	}
+	mm->fhandle = fhandle;
+	mm->maphandle = maphandle;
+	mm->mmap = ptr;
+	mmap_addtail(mmapbase, mm);
+
+    return ptr;
+}
+
+/* munmap for windows */
+long munmap(void *ptr, long size)
+{
+	MemMap *mm = mmap_findlink(mmapbase, ptr);
+	if (!mm) {
+		errno=EINVAL;
+        return -1; 
+	}
+	UnmapViewOfFile( mm->mmap );
+	CloseHandle( mm->maphandle );
+	CloseHandle( mm->fhandle);
+	mmap_remlink(mmapbase, mm);
+    return 0;
+}
+
+/* --------------------------------------------------------------------- */
+/* local functions                                                       */
+/* --------------------------------------------------------------------- */
+
+static void mmap_addtail(volatile mmapListBase *listbase, void *vlink)
+{
+	struct mmapLink *link= vlink;
+
+	if (link == 0) return;
+	if (listbase == 0) return;
+
+	link->next = 0;
+	link->prev = listbase->last;
+
+	if (listbase->last) ((struct mmapLink *)listbase->last)->next = link;
+	if (listbase->first == 0) listbase->first = link;
+	listbase->last = link;
+}
+
+static void mmap_remlink(volatile mmapListBase *listbase, void *vlink)
+{
+	struct mmapLink *link= vlink;
+
+	if (link == 0) return;
+	if (listbase == 0) return;
+
+	if (link->next) link->next->prev = link->prev;
+	if (link->prev) link->prev->next = link->next;
+
+	if (listbase->last == link) listbase->last = link->prev;
+	if (listbase->first == link) listbase->first = link->next;
+}
+
+static void *mmap_findlink(volatile mmapListBase *listbase, void *ptr)
+{
+	MemMap *mm;
+
+	if (ptr == 0) return NULL;
+	if (listbase == 0) return NULL;
+	
+	mm = (MemMap *)listbase->first;
+	while (mm) {
+		if (mm->mmap == ptr) {
+			return mm;
+		}
+		mm = mm->next;
+	}
+	return NULL;
+}
+
+static int mmap_get_prot_flags (int flags)
+{
+	int prot = PAGE_NOACCESS;
+
+	if ( ( flags & PROT_READ ) == PROT_READ ) {
+        if ( ( flags & PROT_WRITE ) == PROT_WRITE ) {
+            prot = (flags & PROT_EXEC) ? PAGE_EXECUTE_READWRITE : PAGE_READWRITE;
+		} else {
+			prot = (flags & PROT_EXEC) ? PAGE_EXECUTE_READ : PAGE_READONLY;
+		}
+    } else if ( ( flags & PROT_WRITE ) == PROT_WRITE ) {
+		prot = (flags & PROT_EXEC) ? PAGE_EXECUTE_READ : PAGE_WRITECOPY;
+    } else if ( ( flags & PROT_EXEC ) == PROT_EXEC ) {
+        prot = PAGE_EXECUTE_READ;
+    }
+	return prot;
+}
+
+static int mmap_get_access_flags (int flags)
+{
+	int access = 0;
+
+	if ( ( flags & PROT_READ ) == PROT_READ ) {
+        if ( ( flags & PROT_WRITE ) == PROT_WRITE ) {
+            access = FILE_MAP_WRITE;
+		} else {
+			access = (flags & PROT_EXEC) ? FILE_MAP_EXECUTE : FILE_MAP_READ;
+		}
+    } else if ( ( flags & PROT_WRITE ) == PROT_WRITE ) {
+		access = FILE_MAP_COPY;
+    } else if ( ( flags & PROT_EXEC ) == PROT_EXEC ) {
+        access = FILE_MAP_EXECUTE;
+    }
+	return access;
+}
+
+
+#endif // WIN32
+
+
+
+
+
diff --git a/intern/guardedalloc/mmap_win.h b/intern/guardedalloc/mmap_win.h
new file mode 100644
index 00000000000..53af86e1f66
--- /dev/null
+++ b/intern/guardedalloc/mmap_win.h
@@ -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) 2008 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): Andrea Weikert.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+ 
+#ifndef MMAP_WIN_H
+#define MMAP_WIN_H
+
+#define PROT_NONE 0
+#define PROT_READ 1
+#define PROT_WRITE 2
+#define PROT_EXEC 4
+
+#define MAP_FILE 0
+#define MAP_SHARED 1
+#define MAP_PRIVATE 2
+#define MAP_TYPE 0xF
+#define MAP_FIXED 0x10
+#define MAP_ANONYMOUS 0x20
+#define MAP_ANON MAP_ANONYMOUS
+
+#define MAP_FAILED ((void *)-1)
+
+void *mmap(void *start, size_t len, int prot, int flags, int fd, off_t offset);
+long munmap(void *ptr, long size);
+
+#endif
\ No newline at end of file
diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript
index 31715bda5a3..98a66e272be 100644
--- a/source/blender/freestyle/SConscript
+++ b/source/blender/freestyle/SConscript
@@ -56,10 +56,22 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'):
 prefix = 'intern/app_blender'
 app_sources = env.Glob(prefix + '/*.cpp')
 
+#	Python
+prefix = 'intern/python'
+# python_sources = env.Glob(prefix + '/*.cpp')
+python_sources = [
+					prefix + '/Freestyle.cpp',
+					prefix + '/Convert.cpp',
+					prefix + '/BinaryPredicate0D.cpp',
+					prefix + '/BinaryPredicate1D.cpp',
+					prefix + '/Id.cpp',
+					prefix + '/Interface0D.cpp',
+					prefix + '/Interface1D.cpp'
+				]
 
 sources = 	system_sources + image_sources + geometry_sources + scene_graph_sources \
 		  +	winged_edge_sources + view_map_sources + stroke_sources + rendering_sources \
-		  + app_sources
+		  + app_sources + python_sources
 
 env.BlenderLib (libname="bf_freestyle",
 				sources=sources,
diff --git a/source/blender/freestyle/intern/app_blender/api.cpp b/source/blender/freestyle/intern/app_blender/api.cpp
index 2395df646f0..2468839bdc7 100644
--- a/source/blender/freestyle/intern/app_blender/api.cpp
+++ b/source/blender/freestyle/intern/app_blender/api.cpp
@@ -106,12 +106,11 @@ extern "C" {
 
 	void FRS_render(Render* re, int render_in_layer) {
 		
-		// if(render_in_layer) {
-		// 	view->workingBuffer = GL_COLOR_ATTACHMENT0_EXT;
-		// } else {
-		// 	view->workingBuffer = GL_BACK;
-		// }
-		view->workingBuffer = GL_BACK;
+		if(render_in_layer) {
+			view->workingBuffer = GL_COLOR_ATTACHMENT1_EXT;
+		} else {
+			view->workingBuffer = GL_BACK;
+		}
 		
 		// add style module
 		string style_module = pathconfig->getProjectDir() + 
@@ -132,76 +131,52 @@ extern "C" {
 
 	void FRS_execute(Render* re, int render_in_layer) {
 		
-		GLuint framebuffer, renderbuffers[2];
-		GLenum status;
-		RenderLayer *rl;
-		GLubyte *pixc;
-		
 		if(render_in_layer) {
-			
-			pixc = (GLubyte *) malloc( 4 * re->winx * re->winy * sizeof(GLubyte) );
-			
-			cout << "Freestyle as a render layer - SETUP" << endl;
+
+		// 	GLenum status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
+		// 	switch(status){
+		// 		case GL_FRAMEBUFFER_COMPLETE_EXT:
+		// 		cout << "CORRECT: GL_FRAMEBUFFER_COMPLETE" << endl;
+		// 		break;
+		// 		case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT: 
+		// 		cout << "ERROR: GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT" << endl;
+		// 		break;
+		// 		case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT: 
+		// 		cout << "ERROR: GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT" << endl;
+		// 		break;
+		// 		case GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT: 
+		// 		cout << "ERROR: GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT" << endl;
+		// 		break;
+		// 		case GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT: 
+		// 		cout << "ERROR: GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT" << endl;
+		// 		break;
+		// 		case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT: 
+		// 		cout << "ERROR: GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT" << endl;
+		// 		break;
+		// 		case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT: 
+		// 		cout << "ERROR: GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT" << endl;
+		// 		break;
+		// 		case GL_FRAMEBUFFER_UNSUPPORTED_EXT: 
+		// 		cout << "ERROR: GL_FRAMEBUFFER_UNSUPPORTED" << endl;
+		// 		break;
+		// }
+		
+			RenderLayer *rl;
 		
-			// set up frame buffer
-			glGenFramebuffersEXT(1, &framebuffer);
-			glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, framebuffer);
-
-			// set up render buffer: one color buffer, one depth buffer
-			glGenRenderbuffersEXT(2, renderbuffers);
-			
-			glBindRenderbufferEXT(GL_RENDERBUFFER_EXT,	renderbuffers[0]);
-			glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_RGBA, re->winx, re->winy);
-			glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_RENDERBUFFER_EXT, renderbuffers[0]);
-			
-			glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, renderbuffers[1]);
-			glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_DEPTH_COMPONENT, re->winx, re->winy);
-			glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, renderbuffers[1]);
-
-			// status verification 
-			status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
-			if (status != GL_FRAMEBUFFER_COMPLETE_EXT){
-				cout << "Framebuffer setup error" << endl;
-				glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
-				glDeleteRenderbuffersEXT(2, renderbuffers);
-				glDeleteFramebuffersEXT(1, &framebuffer);
-				return;
-			}
-			
-			glPushAttrib(GL_VIEWPORT_BIT);
-			glDrawBuffer(GL_COLOR_ATTACHMENT0_EXT); // should not be needed
-			glViewport(0, 0, re->winx, re->winy);
-			
-			FRS_render(re, render_in_layer);
-
-			// keep first Freestyle layer
 			for(rl = (RenderLayer *)re->result->layers.first; rl; rl= rl->next)
 				if(rl->layflag & SCE_LAY_FRS)
 					break;
-
-			cout << "Freestyle as a render layer - RESULT" << endl;
-
-			// transfer render to layer
-			glReadBuffer(GL_COLOR_ATTACHMENT0_EXT);
-			glReadPixels(0, 0, re->winx, re->winy, GL_RGBA, GL_UNSIGNED_BYTE, pixc );
-
+			
 			int p;
-			for(int i = 0; i < re->winx; i++) {
-				for(int j = 0; j < re->winy; j++){
-					p = 4*(i*re->winy + j);
-					*(rl->rectf + p    ) = 1.0*pixc[ p ]/255.0;
-					*(rl->rectf + p + 1) = 1.0*pixc[ p+1 ]/255.0;
-					*(rl->rectf + p + 2) = 1.0*pixc[ p+2 ]/255.0;
-					*(rl->rectf + p + 3) = 1.0*pixc[ p+3 ]/255.0;
+			for(int j = 0; j < re->winy; j++) {
+				for(int i = 0; i < re->winx; i++){
+					p = 4*(j*re->winx + i);
+					rl->rectf[p]      *= 0.6;
+					rl->rectf[p + 1]  = 0.6 * rl->rectf[p + 1];
+					rl->rectf[p + 2] *= 0.6;
+					rl->rectf[p + 3]  = 1.0;
 				}
 			}
-
-			// bind window
-			glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
-			glDrawBuffer(GL_BACK);
-			glPopAttrib();
-			glDeleteRenderbuffersEXT(2, renderbuffers);
-			glDeleteFramebuffersEXT(1, &framebuffer);
 			
 		} else {
 			FRS_render(re, render_in_layer);
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate0D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate0D.cpp
index ea7b1fcca89..2c16adb7a82 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate0D.cpp
+++ b/source/blender/freestyle/intern/python/BinaryPredicate0D.cpp
@@ -1,8 +1,147 @@
-SWIGINTERN PyObject *_wrap_BinaryPredicate0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+#include "BinaryPredicate0D.h"
+
+#include "Convert.h"
+#include "Interface0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+
+/*-----------------------Python API function prototypes for the BinaryPredicate0D module--*/
+//static PyObject *Freestyle_testOutput( BPy_Freestyle * self );
+/*-----------------------BinaryPredicate0D module doc strings-----------------------------*/
+static char M_BinaryPredicate0D_doc[] = "The Blender.Freestyle.BinaryPredicate0D submodule";
+/*----------------------BinaryPredicate0D module method def----------------------------*/
+struct PyMethodDef M_BinaryPredicate0D_methods[] = {
+//	{"testOutput", ( PyCFunction ) Freestyle_testOutput, METH_NOARGS, "() - Return Curve Data name"},
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_Freestyle method def------------------------------*/
+
+PyTypeObject BinaryPredicate0D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"BinaryPredicate0D",				/* tp_name */
+	sizeof( BPy_BinaryPredicate0D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,						/* tp_dealloc */
+	NULL,                       /* printfunc tp_print; */
+	NULL,                       /* getattrfunc tp_getattr; */
+	NULL,                       /* setattrfunc tp_setattr; */
+	NULL,						/* tp_compare */
+	NULL,						/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,						/* struct PyMethodDef *tp_methods; */
+	NULL,                       /* struct PyMemberDef *tp_members; */
+	NULL,         				/* struct PyGetSetDef *tp_getset; */
+	NULL,                       /* struct _typeobject *tp_base; */
+	NULL,                       /* PyObject *tp_dict; */
+	NULL,                       /* descrgetfunc tp_descr_get; */
+	NULL,                       /* descrsetfunc tp_descr_set; */
+	0,                          /* long tp_dictoffset; */
+	NULL,                       /* initproc tp_init; */
+	NULL,                       /* allocfunc tp_alloc; */
+	NULL,                       /* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+PyObject *BinaryPredicate0D_Init( void )
+{
+	PyObject *submodule;
+	
+	if( PyType_Ready( &BinaryPredicate0D_Type ) < 0 )
+		return NULL;
+	
+	submodule = Py_InitModule3( "Blender.Freestyle.BinaryPredicate0D", M_BinaryPredicate0D_methods, M_BinaryPredicate0D_doc );
+	
+	return submodule;
+}
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+PyObject *BinaryPredicate0D_getName( BPy_BinaryPredicate0D *self, PyObject *args)
+{
+	return PyString_FromString( self->bp0D->getName().c_str() );
+}
+
+PyObject *BinaryPredicate0D___call__( BPy_BinaryPredicate0D *self, PyObject *args)
+{
+	BPy_BinaryPredicate0D *obj1;
+	BPy_Interface0D *obj2, *obj3;
+	bool b;
+
+	if (!PyArg_ParseTuple(args,(char *)"OOO:BinaryPredicate0D___call__", &obj1, obj2, &obj3))
+		cout << "ERROR: BinaryPredicate0D___call__ " << endl;		
+	
+	b = self->bp0D->operator()( *(obj2->if0D) , *(obj3->if0D) );
+	return PyBool_from_bool( b );
+
 }
 
 
-SWIGINTERN PyObject *_wrap_BinaryPredicate0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
 }
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate0D.h b/source/blender/freestyle/intern/python/BinaryPredicate0D.h
new file mode 100644
index 00000000000..30467d2e565
--- /dev/null
+++ b/source/blender/freestyle/intern/python/BinaryPredicate0D.h
@@ -0,0 +1,37 @@
+#ifndef FREESTYLE_PYTHON_BINARYPREDICATE0D_H
+#define FREESTYLE_PYTHON_BINARYPREDICATE0D_H
+
+#include "../stroke/Predicates0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject BinaryPredicate0D_Type;
+
+#define BPy_BinaryPredicate0D_Check(v) \
+    ((v)->ob_type == &BinaryPredicate0D_Type)
+
+/*---------------------------Python BPy_BinaryPredicate0D structure definition----------*/
+typedef struct {
+	PyObject_HEAD
+	BinaryPredicate0D *bp0D;
+} BPy_BinaryPredicate0D;
+
+/*---------------------------Python BPy_BinaryPredicate0D visible prototypes-----------*/
+
+PyObject *BinaryPredicate0D_Init( void );
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* FREESTYLE_PYTHON_BINARYPREDICATE0D_H */
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D.cpp
index ebf4ab94ecb..d6a99d689bb 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D.cpp
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D.cpp
@@ -1,12 +1,146 @@
-SWIGINTERN PyObject *_wrap_BinaryPredicate1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+#include "BinaryPredicate1D.h"
+
+#include "Convert.h"
+#include "Interface1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+
+/*-----------------------Python API function prototypes for the BinaryPredicate1D module--*/
+//static PyObject *Freestyle_testOutput( BPy_Freestyle * self );
+/*-----------------------BinaryPredicate1D module doc strings-----------------------------*/
+static char M_BinaryPredicate1D_doc[] = "The Blender.Freestyle.BinaryPredicate1D submodule";
+/*----------------------BinaryPredicate1D module method def----------------------------*/
+struct PyMethodDef M_BinaryPredicate1D_methods[] = {
+//	{"testOutput", ( PyCFunction ) Freestyle_testOutput, METH_NOARGS, "() - Return Curve Data name"},
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_Freestyle method def------------------------------*/
+
+PyTypeObject BinaryPredicate1D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"BinaryPredicate1D",				/* tp_name */
+	sizeof( BPy_BinaryPredicate1D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,						/* tp_dealloc */
+	NULL,                       /* printfunc tp_print; */
+	NULL,                       /* getattrfunc tp_getattr; */
+	NULL,                       /* setattrfunc tp_setattr; */
+	NULL,						/* tp_compare */
+	NULL,						/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,						/* struct PyMethodDef *tp_methods; */
+	NULL,                       /* struct PyMemberDef *tp_members; */
+	NULL,         				/* struct PyGetSetDef *tp_getset; */
+	NULL,                       /* struct _typeobject *tp_base; */
+	NULL,                       /* PyObject *tp_dict; */
+	NULL,                       /* descrgetfunc tp_descr_get; */
+	NULL,                       /* descrsetfunc tp_descr_set; */
+	0,                          /* long tp_dictoffset; */
+	NULL,                       /* initproc tp_init; */
+	NULL,                       /* allocfunc tp_alloc; */
+	NULL,                       /* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+PyObject *BinaryPredicate1D_Init( void )
+{
+	PyObject *submodule;
+	
+	if( PyType_Ready( &BinaryPredicate1D_Type ) < 0 )
+		return NULL;
+	
+	submodule = Py_InitModule3( "Blender.Freestyle.BinaryPredicate1D", M_BinaryPredicate1D_methods, M_BinaryPredicate1D_doc );
+	
+	return submodule;
+}
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+PyObject *BinaryPredicate1D_getName( BPy_BinaryPredicate1D *self, PyObject *args)
+{
+	return PyString_FromString( self->bp1D->getName().c_str() );
+}
+
+PyObject *BinaryPredicate1D___call__( BPy_BinaryPredicate1D *self, PyObject *args)
+{
+	BPy_BinaryPredicate1D *obj1;
+	BPy_Interface1D *obj2, *obj3;
+	bool b;
+	
+	if (!PyArg_ParseTuple(args,(char *)"OOO:BinaryPredicate1D___call__", &obj1, &obj2, &obj3))
+		cout << "ERROR: BinaryPredicate1D___call__ " << endl;		
+	
+	b = self->bp1D->operator()( *(obj2->if1D) , *(obj3->if1D) );
+	return PyBool_from_bool( b );
 }
 
 
-SWIGINTERN PyObject *_wrap_BinaryPredicate1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
 }
-
-
-SWIGINTERN PyObject *_wrap_disown_BinaryPredicate1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D.h b/source/blender/freestyle/intern/python/BinaryPredicate1D.h
new file mode 100644
index 00000000000..d401c585197
--- /dev/null
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D.h
@@ -0,0 +1,37 @@
+#ifndef FREESTYLE_PYTHON_BINARYPREDICATE1D_H
+#define FREESTYLE_PYTHON_BINARYPREDICATE1D_H
+
+#include "../stroke/Predicates1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject BinaryPredicate1D_Type;
+
+#define BPy_BinaryPredicate1D_Check(v) \
+    ((v)->ob_type == &BinaryPredicate1D_Type)
+
+/*---------------------------Python BPy_BinaryPredicate1D structure definition----------*/
+typedef struct {
+	PyObject_HEAD
+	BinaryPredicate1D *bp1D;
+} BPy_BinaryPredicate1D;
+
+/*---------------------------Python BPy_BinaryPredicate1D visible prototypes-----------*/
+
+PyObject *BinaryPredicate1D_Init( void );
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* FREESTYLE_PYTHON_BINARYPREDICATE1D_H */
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/FalseBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/FalseBP1D.cpp
index 59946ce22e1..1f1a1ec840b 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D/FalseBP1D.cpp
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/FalseBP1D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_FalseBP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FalseBP1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FalseBP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FalseBP1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_FalseBP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_FalseBP1D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_FalseBP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_FalseBP1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/Length2DBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/Length2DBP1D.cpp
index a249a230b87..402e59c3f29 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D/Length2DBP1D.cpp
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/Length2DBP1D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_Length2DBP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Length2DBP1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Length2DBP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Length2DBP1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Length2DBP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_Length2DBP1D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_Length2DBP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_Length2DBP1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/SameShapeIdBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/SameShapeIdBP1D.cpp
index d82c4166a09..d980750bb33 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D/SameShapeIdBP1D.cpp
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/SameShapeIdBP1D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_SameShapeIdBP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SameShapeIdBP1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SameShapeIdBP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SameShapeIdBP1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_SameShapeIdBP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_SameShapeIdBP1D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_SameShapeIdBP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_SameShapeIdBP1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/TrueBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/TrueBP1D.cpp
index b0e5825e0d6..2afd2e163ea 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D/TrueBP1D.cpp
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/TrueBP1D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_TrueBP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TrueBP1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TrueBP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TrueBP1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_TrueBP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_TrueBP1D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_TrueBP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_TrueBP1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/ViewMapGradientNormBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/ViewMapGradientNormBP1D.cpp
index 3bd22915831..873acd93149 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D/ViewMapGradientNormBP1D.cpp
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/ViewMapGradientNormBP1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_ViewMapGradientNormBP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMapGradientNormBP1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMapGradientNormBP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMapGradientNormBP1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ViewMapGradientNormBP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_ViewMapGradientNormBP1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/Convert.cpp b/source/blender/freestyle/intern/python/Convert.cpp
new file mode 100644
index 00000000000..c8ceddaf98b
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Convert.cpp
@@ -0,0 +1,54 @@
+#include "Convert.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+static char M_Convert_doc[] = "The Blender.Freestyle.Convert utility submodule";
+/*----------------------Freestyle module method def----------------------------*/
+struct PyMethodDef M_Convert_methods[] = {
+//	{"testOutput", ( PyCFunction ) Freestyle_testOutput, METH_NOARGS, "() - Return Curve Data name"},
+	{NULL, NULL, 0, NULL}
+};
+
+
+//-------------------MODULE INITIALIZATION--------------------------------
+PyObject *Convert_Init( void )
+{
+	return Py_InitModule3( "Blender.Freestyle.Convert", M_Convert_methods, M_Convert_doc );
+}
+
+//-------------------------------------------------------------------------
+
+PyObject *PyBool_from_bool( bool b ){
+	// SWIG_From_bool
+	return PyBool_FromLong( b ? 1 : 0);
+}
+
+
+PyObject *Vector_from_Vec2f( Vec2f vec ) {
+	float vec_data[2]; // because vec->_coord is protected
+	vec_data[0] = vec.x();		vec_data[1] = vec.y();
+	return newVectorObject( vec_data, 3, Py_NEW);
+}
+
+PyObject *Vector_from_Vec3f( Vec3f vec ) {
+	float vec_data[3]; // because vec->_coord is protected
+	vec_data[0] = vec.x();		vec_data[1] = vec.y(); 		vec_data[2] = vec.z(); 
+	return newVectorObject( vec_data, 3, Py_NEW);
+}
+
+PyObject *Vector_from_Vec3r( Vec3r vec ) {
+	float vec_data[3]; // because vec->_coord is protected
+	vec_data[0] = vec.x();		vec_data[1] = vec.y(); 		vec_data[2] = vec.z(); 
+	return newVectorObject( vec_data, 3, Py_NEW);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
\ No newline at end of file
diff --git a/source/blender/freestyle/intern/python/Convert.h b/source/blender/freestyle/intern/python/Convert.h
new file mode 100644
index 00000000000..d1bac93734a
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Convert.h
@@ -0,0 +1,32 @@
+#ifndef FREESTYLE_PYTHON_CONVERT_H
+#define FREESTYLE_PYTHON_CONVERT_H
+
+#include "../geometry/Geom.h"
+using namespace Geometry;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+#include "api2_2x/vector.h"
+#include "api2_2x/gen_utils.h"
+
+PyObject *Convert_Init( void );
+
+PyObject *PyBool_from_bool( bool b );
+
+PyObject *Vector_from_Vec2f( Vec2f v );
+PyObject *Vector_from_Vec3f( Vec3f v );
+PyObject *Vector_from_Vec3r( Vec3r v );
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* FREESTYLE_PYTHON_CONVERT_H */
diff --git a/source/blender/freestyle/intern/python/CurvePointIterator.cpp b/source/blender/freestyle/intern/python/CurvePointIterator.cpp
index 4e4291a9c88..57dc86ea5e4 100644
--- a/source/blender/freestyle/intern/python/CurvePointIterator.cpp
+++ b/source/blender/freestyle/intern/python/CurvePointIterator.cpp
@@ -1,284 +1,284 @@
-SWIGINTERN PyObject *_wrap_CurvePointIterator__CurvilinearLength_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator__CurvilinearLength_set(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator__CurvilinearLength_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator__CurvilinearLength_get(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator__step_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator__step_set(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator__step_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator__step_get(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator___A_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator___A_set(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator___A_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator___A_get(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator___B_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator___B_set(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator___B_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator___B_get(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator__begin_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator__begin_set(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator__begin_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator__begin_get(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator__end_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator__end_set(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator__end_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator__end_get(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator__n_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator__n_set(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator__n_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator__n_get(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator__currentn_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator__currentn_set(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator__currentn_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator__currentn_get(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator__t_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator__t_set(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator__t_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator__t_get(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator__Point_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator__Point_set(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator__Point_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator__Point_get(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator__CurveLength_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator__CurveLength_set(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator__CurveLength_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator__CurveLength_get(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_CurvePointIterator__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_CurvePointIterator__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_CurvePointIterator__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_CurvePointIterator__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_CurvePointIterator__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_CurvePointIterator__SWIG_2(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_CurvePointIterator(PyObject *self, PyObject *args) {
+ PyObject *_wrap_new_CurvePointIterator(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_CurvePointIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_CurvePointIterator(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_copy(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_copy(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_CastToInterface0DIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_CastToInterface0DIterator(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_getExactTypeName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator___eq__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_getObject(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_getObject(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator___deref__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator___deref__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_isBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_isBegin(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_isEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_isEnd(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_getX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_getX(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_getY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_getY(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_getZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_getZ(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_getPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_getPoint3D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_getProjectedX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_getProjectedX(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_getProjectedY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_getProjectedY(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_getProjectedZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_getProjectedZ(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_getPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_getPoint2D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_getFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_getFEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_getId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_getNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_getNature(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_castToSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_castToSVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_castToViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_castToViewVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_castToNonTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_castToNonTVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_castToTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_castToTVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_A(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_A(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_B(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_B(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_t2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_t2d(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_SetA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_SetA(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_SetB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_SetB(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_SetT2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_SetT2d(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_fedge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_fedge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_point2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_point2d(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_point3d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_point3d(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_normal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_normal(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_shape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_shape(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_occluders_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_occluders_begin(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_occluders_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_occluders_end(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_occluders_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_occluders_empty(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_occluders_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_occluders_size(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_occludee(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_occludee(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_occluded_shape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_occluded_shape(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_occludee_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_occludee_empty(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_z_discontinuity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_z_discontinuity(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_curvatureFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_curvatureFredo(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_directionFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_directionFredo(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/Freestyle.cpp b/source/blender/freestyle/intern/python/Freestyle.cpp
new file mode 100644
index 00000000000..e3a5cf91117
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Freestyle.cpp
@@ -0,0 +1,136 @@
+#include "Freestyle.h"
+
+#include "BinaryPredicate0D.h"
+#include "BinaryPredicate1D.h"
+#include "Id.h"
+#include "Interface0D.h"
+#include "Interface1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+
+/*-----------------------Python API function prototypes for the Freestyle module--*/
+//static PyObject *Freestyle_testOutput( BPy_Freestyle * self );
+/*-----------------------Freestyle module doc strings-----------------------------*/
+static char M_Freestyle_doc[] = "The Blender.Freestyle submodule";
+/*----------------------Freestyle module method def----------------------------*/
+struct PyMethodDef M_Freestyle_methods[] = {
+//	{"testOutput", ( PyCFunction ) Freestyle_testOutput, METH_NOARGS, "() - Return Curve Data name"},
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_Freestyle method def------------------------------*/
+
+PyTypeObject Freestyle_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"Freestyle",				/* tp_name */
+	sizeof( BPy_Freestyle ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,						/* tp_dealloc */
+	NULL,                       /* printfunc tp_print; */
+	NULL,                       /* getattrfunc tp_getattr; */
+	NULL,                       /* setattrfunc tp_setattr; */
+	NULL,						/* tp_compare */
+	NULL,						/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,						/* struct PyMethodDef *tp_methods; */
+	NULL,                       /* struct PyMemberDef *tp_members; */
+	NULL,         				/* struct PyGetSetDef *tp_getset; */
+	NULL,                       /* struct _typeobject *tp_base; */
+	NULL,                       /* PyObject *tp_dict; */
+	NULL,                       /* descrgetfunc tp_descr_get; */
+	NULL,                       /* descrsetfunc tp_descr_set; */
+	0,                          /* long tp_dictoffset; */
+	NULL,                       /* initproc tp_init; */
+	NULL,                       /* allocfunc tp_alloc; */
+	NULL,                       /* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+PyObject *Freestyle_Init( void )
+{
+	PyObject *submodule;
+	PyObject *dict;
+	
+	if( PyType_Ready( &Freestyle_Type ) < 0 )
+		return NULL;
+	
+	submodule = Py_InitModule3( "Blender.Freestyle", M_Freestyle_methods, M_Freestyle_doc );
+
+	dict = PyModule_GetDict( submodule );
+	PyDict_SetItemString( dict, "BinaryPredicate0D", BinaryPredicate0D_Init() );
+	PyDict_SetItemString( dict, "BinaryPredicate1D", BinaryPredicate1D_Init() );
+	PyDict_SetItemString( dict, "Interface0D", Interface0D_Init() );
+	PyDict_SetItemString( dict, "Interface1D", Interface1D_Init() );
+	PyDict_SetItemString( dict, "Id", Id_Init() );
+	
+	return submodule;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
\ No newline at end of file
diff --git a/source/blender/freestyle/intern/python/Freestyle.h b/source/blender/freestyle/intern/python/Freestyle.h
new file mode 100644
index 00000000000..7e7ed56f5f2
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Freestyle.h
@@ -0,0 +1,32 @@
+#ifndef FREESTYLE_PYTHON_FREESTYLE_H
+#define FREESTYLE_PYTHON_FREESTYLE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject Freestyle_Type;
+
+#define BPy_Freestyle_Check(v) \
+    ((v)->ob_type == &Freestyle_Type)
+
+/*---------------------------Python BPy_Freestyle structure definition----------*/
+typedef struct {
+	PyObject_HEAD 
+} BPy_Freestyle;
+
+/*---------------------------Python BPy_Freestyle visible prototypes-----------*/
+
+PyObject *Freestyle_Init( void );
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_FREESTYLE_H */
diff --git a/source/blender/freestyle/intern/python/Id.cpp b/source/blender/freestyle/intern/python/Id.cpp
index 681db76faab..a835efa78f7 100644
--- a/source/blender/freestyle/intern/python/Id.cpp
+++ b/source/blender/freestyle/intern/python/Id.cpp
@@ -1,32 +1,197 @@
-SWIGINTERN PyObject *_wrap_Id_getFirst(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+#include "Id.h"
+
+#include "Convert.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+
+/*-----------------------Python API function prototypes for the Id module--*/
+//static PyObject *Freestyle_testOutput( BPy_Freestyle * self );
+/*-----------------------Id module doc strings-----------------------------*/
+static char M_Id_doc[] = "The Blender.Freestyle.Id submodule";
+/*----------------------Id module method def----------------------------*/
+struct PyMethodDef M_Id_methods[] = {
+//	{"testOutput", ( PyCFunction ) Freestyle_testOutput, METH_NOARGS, "() - Return Curve Data name"},
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_Freestyle method def------------------------------*/
+
+PyTypeObject Id_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"Id",				/* tp_name */
+	sizeof( BPy_Id ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,						/* tp_dealloc */
+	NULL,                       /* printfunc tp_print; */
+	NULL,                       /* getattrfunc tp_getattr; */
+	NULL,                       /* setattrfunc tp_setattr; */
+	NULL,						/* tp_compare */
+	NULL,						/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,						/* struct PyMethodDef *tp_methods; */
+	NULL,                       /* struct PyMemberDef *tp_members; */
+	NULL,         				/* struct PyGetSetDef *tp_getset; */
+	NULL,                       /* struct _typeobject *tp_base; */
+	NULL,                       /* PyObject *tp_dict; */
+	NULL,                       /* descrgetfunc tp_descr_get; */
+	NULL,                       /* descrsetfunc tp_descr_set; */
+	0,                          /* long tp_dictoffset; */
+	NULL,                       /* initproc tp_init; */
+	NULL,                       /* allocfunc tp_alloc; */
+	NULL,                       /* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+PyObject *Id_Init( void )
+{
+	PyObject *submodule;
+	
+	if( PyType_Ready( &Id_Type ) < 0 )
+		return NULL;
+	
+	submodule = Py_InitModule3( "Blender.Freestyle.Id", M_Id_methods, M_Id_doc );
+	
+	return submodule;
+}
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+PyObject *Id_getFirst( BPy_Id *self ) {
+	return PyInt_FromLong( self->id->getFirst() );
 }
 
 
-SWIGINTERN PyObject *_wrap_Id_getSecond(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Id_getSecond( BPy_Id *self) {
+	return PyInt_FromLong( self->id->getSecond() );
 }
 
 
-SWIGINTERN PyObject *_wrap_Id_setFirst(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Id_setFirst( BPy_Id *self , PyObject *args) {
+	PyObject * obj1 = 0 ;
+	PyObject * obj2 = 0 ;
+	unsigned int i;
+
+	if( !PyArg_ParseTuple(args, (char *)"OO:Id_setFirst", &obj1, &obj2) )
+		cout << "ERROR: Id_setFirst" << endl;
+
+	i = static_cast<unsigned int>( PyInt_AsLong(obj2) );
+	self->id->setFirst( i );
+
+	Py_RETURN_NONE;
 }
 
 
-SWIGINTERN PyObject *_wrap_Id_setSecond(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Id_setSecond( BPy_Id *self , PyObject *args) {
+	PyObject * obj1 = 0 ;
+	PyObject * obj2 = 0 ;
+	unsigned int i;
+
+	if( !PyArg_ParseTuple(args, (char *)"OO:Id_setSecond", &obj1, &obj2) )
+		cout << "ERROR: Id_setSecond" << endl;
+
+	i = static_cast<unsigned int>( PyInt_AsLong(obj2) );
+	self->id->setSecond( i );
+
+	Py_RETURN_NONE;
+}
+
+PyObject *Id___eq__( BPy_Id *self , PyObject *args) {
+	BPy_Id * obj1 = 0 ;
+	BPy_Id * obj2 = 0 ;
+
+	if( !PyArg_ParseTuple(args, (char *)"OO:Id___eq__", &obj1, &obj2) )
+		cout << "ERROR: Id___eq__" << endl;
+	
+	return PyBool_from_bool( obj1->id == obj2->id );
 }
 
 
-SWIGINTERN PyObject *_wrap_Id___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Id___ne__(PyObject *self , PyObject *args) {
+	BPy_Id * obj1 = 0 ;
+	BPy_Id * obj2 = 0 ;
+
+	if( !PyArg_ParseTuple(args, (char *)"OO:Id___ne__", &obj1, &obj2) )
+		cout << "ERROR: Id___ne__" << endl;
+
+	return PyBool_from_bool( obj1->id != obj2->id );
+}
+
+PyObject *Id___lt__(PyObject *self , PyObject *args) {
+	BPy_Id * obj1 = 0 ;
+	BPy_Id * obj2 = 0 ;
+
+	if( !PyArg_ParseTuple(args, (char *)"OO:Id___lt__", &obj1, &obj2) )
+		cout << "ERROR: Id___lt__" << endl;
+
+	return PyBool_from_bool( obj1->id < obj2->id );
 }
 
 
-SWIGINTERN PyObject *_wrap_Id___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
 }
-
-
-SWIGINTERN PyObject *_wrap_Id___lt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-}
-
-
-SWIGINTERN PyObject *_wrap_delete_Id(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-}
-
-
+#endif
\ No newline at end of file
diff --git a/source/blender/freestyle/intern/python/Id.h b/source/blender/freestyle/intern/python/Id.h
new file mode 100644
index 00000000000..032f35f7094
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Id.h
@@ -0,0 +1,39 @@
+#ifndef FREESTYLE_PYTHON_ID_H
+#define FREESTYLE_PYTHON_ID_H
+
+#include <iostream>
+using namespace std;
+
+#include "../system/Id.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject Id_Type;
+
+#define BPy_Id_Check(v) \
+    ((v)->ob_type == &Id_Type)
+
+/*---------------------------Python BPy_Id structure definition----------*/
+typedef struct {
+	PyObject_HEAD
+	Id *id;
+} BPy_Id;
+
+/*---------------------------Python BPy_Id visible prototypes-----------*/
+
+PyObject *Id_Init( void );
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_ID_H */
diff --git a/source/blender/freestyle/intern/python/Interface0D.cpp b/source/blender/freestyle/intern/python/Interface0D.cpp
index 54541cdb8cb..e09e0447aa7 100644
--- a/source/blender/freestyle/intern/python/Interface0D.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D.cpp
@@ -1,68 +1,187 @@
-SWIGINTERN PyObject *_wrap_Interface0D_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+#include "Interface0D.h"
+
+#include "Convert.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+
+/*-----------------------Python API function prototypes for the Interface0D module--*/
+//static PyObject *Freestyle_testOutput( BPy_Freestyle * self );
+/*-----------------------Interface0D module doc strings-----------------------------*/
+static char M_Interface0D_doc[] = "The Blender.Freestyle.Interface0D submodule";
+/*----------------------Interface0D module method def----------------------------*/
+struct PyMethodDef M_Interface0D_methods[] = {
+//	{"testOutput", ( PyCFunction ) Freestyle_testOutput, METH_NOARGS, "() - Return Curve Data name"},
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_Freestyle method def------------------------------*/
+
+PyTypeObject Interface0D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"Interface0D",				/* tp_name */
+	sizeof( BPy_Interface0D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,						/* tp_dealloc */
+	NULL,                       /* printfunc tp_print; */
+	NULL,                       /* getattrfunc tp_getattr; */
+	NULL,                       /* setattrfunc tp_setattr; */
+	NULL,						/* tp_compare */
+	NULL,						/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,						/* struct PyMethodDef *tp_methods; */
+	NULL,                       /* struct PyMemberDef *tp_members; */
+	NULL,         				/* struct PyGetSetDef *tp_getset; */
+	NULL,                       /* struct _typeobject *tp_base; */
+	NULL,                       /* PyObject *tp_dict; */
+	NULL,                       /* descrgetfunc tp_descr_get; */
+	NULL,                       /* descrsetfunc tp_descr_set; */
+	0,                          /* long tp_dictoffset; */
+	NULL,                       /* initproc tp_init; */
+	NULL,                       /* allocfunc tp_alloc; */
+	NULL,                       /* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+PyObject *Interface0D_Init( void )
+{
+	PyObject *submodule;
+	
+	if( PyType_Ready( &Interface0D_Type ) < 0 )
+		return NULL;
+	
+	submodule = Py_InitModule3( "Blender.Freestyle.Interface0D", M_Interface0D_methods, M_Interface0D_doc );
+	
+	return submodule;
+}
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+PyObject *Interface0D_getExactTypeName( BPy_Interface0D *self ) {
+	return PyString_FromString( self->if0D->getExactTypeName().c_str() );	
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0D_getX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Interface0D_getX( BPy_Interface0D *self ) {
+	return PyFloat_FromDouble( self->if0D->getX() );
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0D_getY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Interface0D_getY( BPy_Interface0D *self ) {
+	return PyFloat_FromDouble( self->if0D->getY() );
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0D_getZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Interface0D_getZ( BPy_Interface0D *self ) {
+	return PyFloat_FromDouble( self->if0D->getZ() );
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0D_getPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Interface0D_getPoint3D( BPy_Interface0D *self ) {
+	return Vector_from_Vec3f( self->if0D->getPoint3D() );
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0D_getProjectedX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Interface0D_getProjectedX( BPy_Interface0D *self ) {
+	return PyFloat_FromDouble( self->if0D->getProjectedX() );
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0D_getProjectedY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Interface0D_getProjectedY( BPy_Interface0D *self ) {
+	return PyFloat_FromDouble( self->if0D->getProjectedY() );
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0D_getProjectedZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Interface0D_getProjectedZ( BPy_Interface0D *self ) {
+	return PyFloat_FromDouble( self->if0D->getProjectedZ() );
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0D_getPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Interface0D_getPoint2D( BPy_Interface0D *self ) {
+	return Vector_from_Vec2f( self->if0D->getPoint2D() );
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0D_getFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Interface0D_getFEdge( BPy_Interface0D *self ) {
+	// FEdge
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0D_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Interface0D_getId( BPy_Interface0D *self ) {
+	// Id
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0D_getNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Interface0D_getNature( BPy_Interface0D *self ) {
+	// VertexNature
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0D_castToSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
 }
-
-
-SWIGINTERN PyObject *_wrap_Interface0D_castToViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-}
-
-
-SWIGINTERN PyObject *_wrap_Interface0D_castToNonTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-}
-
-
-SWIGINTERN PyObject *_wrap_Interface0D_castToTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-}
-
-
-SWIGINTERN PyObject *_wrap_new_Interface0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-}
-
+#endif
 
diff --git a/source/blender/freestyle/intern/python/Interface0D.h b/source/blender/freestyle/intern/python/Interface0D.h
new file mode 100644
index 00000000000..e3e97cbaecd
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Interface0D.h
@@ -0,0 +1,36 @@
+#ifndef FREESTYLE_PYTHON_INTERFACE0D_H
+#define FREESTYLE_PYTHON_INTERFACE0D_H
+
+#include "../view_map/Interface0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject Interface0D_Type;
+
+#define BPy_Interface0D_Check(v) \
+    ((v)->ob_type == &Interface0D_Type)
+
+/*---------------------------Python BPy_Interface0D structure definition----------*/
+typedef struct {
+	PyObject_HEAD
+	Interface0D *if0D;
+} BPy_Interface0D;
+
+/*---------------------------Python BPy_Interface0D visible prototypes-----------*/
+
+PyObject *Interface0D_Init( void );
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_INTERFACE0D_H */
diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp b/source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp
index 7d966185449..6591973f8b3 100644
--- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp
@@ -1,176 +1,176 @@
-SWIGINTERN PyObject *_wrap_CurvePoint_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_getExactTypeName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_getX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_getX(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_getY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_getY(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_getZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_getZ(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_getPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_getPoint3D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_getProjectedX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_getProjectedX(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_getProjectedY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_getProjectedY(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_getProjectedZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_getProjectedZ(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_getPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_getPoint2D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_getFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_getFEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_getId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_getNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_getNature(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_castToSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_castToSVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_castToViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_castToViewVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_castToNonTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_castToNonTVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_castToTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_castToTVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_CurvePoint__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_CurvePoint__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_CurvePoint__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_CurvePoint__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_CurvePoint__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_CurvePoint__SWIG_2(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_CurvePoint__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_CurvePoint__SWIG_3(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_CurvePoint(PyObject *self, PyObject *args) {
+ PyObject *_wrap_new_CurvePoint(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_CurvePoint(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_CurvePoint(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint___eq__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_A(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_A(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_B(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_B(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_t2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_t2d(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_SetA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_SetA(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_SetB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_SetB(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_SetT2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_SetT2d(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_fedge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_fedge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_point2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_point2d(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_point3d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_point3d(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_normal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_normal(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_shape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_shape(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_occluders_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_occluders_begin(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_occluders_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_occluders_end(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_occluders_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_occluders_empty(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_occluders_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_occluders_size(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_occludee(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_occludee(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_occluded_shape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_occluded_shape(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_occludee_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_occludee_empty(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_z_discontinuity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_z_discontinuity(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_curvatureFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_curvatureFredo(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_directionFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_directionFredo(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.cpp
index aa98b1cc008..7f2e364d0b4 100644
--- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.cpp
@@ -1,104 +1,104 @@
-SWIGINTERN PyObject *_wrap_StrokeVertex_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertex_getExactTypeName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_StrokeVertex__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_StrokeVertex__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_StrokeVertex__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_StrokeVertex__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_StrokeVertex__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_StrokeVertex__SWIG_2(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_StrokeVertex__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_StrokeVertex__SWIG_3(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_StrokeVertex__SWIG_4(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_StrokeVertex__SWIG_4(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_StrokeVertex__SWIG_5(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_StrokeVertex__SWIG_5(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_StrokeVertex(PyObject *self, PyObject *args) {
+ PyObject *_wrap_new_StrokeVertex(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_StrokeVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_StrokeVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertex_x(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertex_x(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertex_y(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertex_y(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertex_getPoint(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertex_getPoint(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertex_attribute__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertex_attribute__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertex_attribute__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertex_attribute__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertex_attribute(PyObject *self, PyObject *args) {
+ PyObject *_wrap_StrokeVertex_attribute(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertex_curvilinearAbscissa(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertex_curvilinearAbscissa(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertex_strokeLength(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertex_strokeLength(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertex_u(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertex_u(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertex_SetX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertex_SetX(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertex_SetY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertex_SetY(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertex_SetPoint__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertex_SetPoint__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertex_SetPoint__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertex_SetPoint__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertex_SetPoint(PyObject *self, PyObject *args) {
+ PyObject *_wrap_StrokeVertex_SetPoint(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertex_SetAttribute(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertex_SetAttribute(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertex_SetCurvilinearAbscissa(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertex_SetCurvilinearAbscissa(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertex_SetStrokeLength(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertex_SetStrokeLength(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/Interface0D/SVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/SVertex.cpp
index f6a4a26a65c..41d01d4b649 100644
--- a/source/blender/freestyle/intern/python/Interface0D/SVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/SVertex.cpp
@@ -1,268 +1,268 @@
-SWIGINTERN PyObject *_wrap_SVertex_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_getExactTypeName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_getX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_getX(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_getY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_getY(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_getZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_getZ(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_getPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_getPoint3D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_getProjectedX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_getProjectedX(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_getProjectedY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_getProjectedY(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_getProjectedZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_getProjectedZ(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_getPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_getPoint2D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_getFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_getFEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_getId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_getNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_getNature(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_castToSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_castToSVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_castToViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_castToViewVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_castToNonTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_castToNonTVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_castToTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_castToTVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_userdata_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_userdata_set(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_userdata_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_userdata_get(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_SVertex__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_SVertex__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_SVertex__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_SVertex__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_SVertex__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_SVertex__SWIG_2(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_SVertex(PyObject *self, PyObject *args) {
+ PyObject *_wrap_new_SVertex(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_SVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_SVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_dupplicate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_dupplicate(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex___eq__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_point3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_point3D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_point2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_point2D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_normals(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_normals(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_normalsSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_normalsSize(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_fedges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_fedges(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_fedges_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_fedges_begin(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_fedges_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_fedges_end(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_shape__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_shape__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_z(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_z(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_viewvertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_viewvertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_SetPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_SetPoint3D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_SetPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_SetPoint2D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_AddNormal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_AddNormal(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_setCurvatureInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_setCurvatureInfo(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_getCurvatureInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_getCurvatureInfo(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_setCurvatureFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_setCurvatureFredo(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_setDirectionFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_setDirectionFredo(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_curvatureFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_curvatureFredo(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_directionFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_directionFredo(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_SetId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_SetId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_SetFEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_SetFEdges(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_SetShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_SetShape(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_SetViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_SetViewVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_AddFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_AddFEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_Replace(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_Replace(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_fedge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_fedge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_point2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_point2d(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_point3d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_point3d(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_normal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_normal(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_shape_id(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_shape_id(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_shape__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_shape__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_shape(PyObject *self, PyObject *args) {
+ PyObject *_wrap_SVertex_shape(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_shape_importance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_shape_importance(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_qi(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_qi(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_occluders_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_occluders_begin(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_occluders_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_occluders_end(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_occluders_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_occluders_empty(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_occluders_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_occluders_size(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_occludee(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_occludee(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_occluded_shape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_occluded_shape(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_occludee_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_occludee_empty(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_z_discontinuity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_z_discontinuity(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/ViewVertex.cpp
index 2b3e733e605..293f42949e3 100644
--- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex.cpp
@@ -1,76 +1,76 @@
-SWIGINTERN PyObject *_wrap_ViewVertex_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewVertex_getExactTypeName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVertex_userdata_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewVertex_userdata_set(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVertex_userdata_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewVertex_userdata_get(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_ViewVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVertex_getNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewVertex_getNature(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVertex_setNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewVertex_setNature(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVertex_Replace(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewVertex_Replace(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVertex_edges_begin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewVertex_edges_begin__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVertex_edges_begin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewVertex_edges_begin__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVertex_edges_begin(PyObject *self, PyObject *args) {
+ PyObject *_wrap_ViewVertex_edges_begin(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVertex_edges_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewVertex_edges_end__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVertex_edges_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewVertex_edges_end__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVertex_edges_end(PyObject *self, PyObject *args) {
+ PyObject *_wrap_ViewVertex_edges_end(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVertex_edges_iterator__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewVertex_edges_iterator__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVertex_edges_iterator__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewVertex_edges_iterator__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVertex_edges_iterator(PyObject *self, PyObject *args) {
+ PyObject *_wrap_ViewVertex_edges_iterator(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVertex_edgesBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewVertex_edgesBegin(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVertex_edgesEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewVertex_edgesEnd(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVertex_edgesIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewVertex_edgesIterator(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/NonTVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/NonTVertex.cpp
index d287ddf0c72..772a385139e 100644
--- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/NonTVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/NonTVertex.cpp
@@ -1,132 +1,132 @@
-SWIGINTERN PyObject *_wrap_NonTVertex_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_getExactTypeName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_getX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_getX(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_getY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_getY(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_getZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_getZ(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_getPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_getPoint3D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_getProjectedX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_getProjectedX(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_getProjectedY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_getProjectedY(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_getProjectedZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_getProjectedZ(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_getPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_getPoint2D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_getId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_castToSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_castToSVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_castToViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_castToViewVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_castToNonTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_castToNonTVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_NonTVertex__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_NonTVertex__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_NonTVertex__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_NonTVertex__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_NonTVertex(PyObject *self, PyObject *args) {
+ PyObject *_wrap_new_NonTVertex(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_NonTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_NonTVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_svertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_svertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_viewedges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_viewedges(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_SetSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_SetSVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_SetViewEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_SetViewEdges(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_AddIncomingViewEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_AddIncomingViewEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_AddOutgoingViewEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_AddOutgoingViewEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_AddViewEdge__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_AddViewEdge__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_AddViewEdge__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_AddViewEdge__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_AddViewEdge(PyObject *self, PyObject *args) {
+ PyObject *_wrap_NonTVertex_AddViewEdge(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_Replace(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_Replace(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_edges_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_edges_end__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_edges_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_edges_end__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_edges_end(PyObject *self, PyObject *args) {
+ PyObject *_wrap_NonTVertex_edges_end(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_edgesBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_edgesBegin(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_edgesEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_edgesEnd(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_edgesIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_edgesIterator(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/TVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/TVertex.cpp
index 32e7ccd0ff8..715170c1422 100644
--- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/TVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/TVertex.cpp
@@ -1,184 +1,184 @@
-SWIGINTERN PyObject *_wrap_TVertex_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_getExactTypeName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_getX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_getX(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_getY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_getY(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_getZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_getZ(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_getPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_getPoint3D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_getProjectedX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_getProjectedX(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_getProjectedY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_getProjectedY(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_getProjectedZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_getProjectedZ(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_getPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_getPoint2D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_getId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_castToViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_castToViewVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_castToTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_castToTVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_TVertex__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_TVertex__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_TVertex__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_TVertex__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_TVertex(PyObject *self, PyObject *args) {
+ PyObject *_wrap_new_TVertex(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_frontSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_frontSVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_backSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_backSVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_frontEdgeA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_frontEdgeA(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_frontEdgeB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_frontEdgeB(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_backEdgeA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_backEdgeA(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_backEdgeB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_backEdgeB(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_SetFrontVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_SetFrontVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_SetBackSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_SetBackSVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_SetFrontEdgeA__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_SetFrontEdgeA__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_SetFrontEdgeA__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_SetFrontEdgeA__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_SetFrontEdgeA(PyObject *self, PyObject *args) {
+ PyObject *_wrap_TVertex_SetFrontEdgeA(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_SetFrontEdgeB__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_SetFrontEdgeB__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_SetFrontEdgeB__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_SetFrontEdgeB__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_SetFrontEdgeB(PyObject *self, PyObject *args) {
+ PyObject *_wrap_TVertex_SetFrontEdgeB(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_SetBackEdgeA__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_SetBackEdgeA__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_SetBackEdgeA__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_SetBackEdgeA__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_SetBackEdgeA(PyObject *self, PyObject *args) {
+ PyObject *_wrap_TVertex_SetBackEdgeA(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_SetBackEdgeB__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_SetBackEdgeB__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_SetBackEdgeB__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_SetBackEdgeB__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_SetBackEdgeB(PyObject *self, PyObject *args) {
+ PyObject *_wrap_TVertex_SetBackEdgeB(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_SetId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_SetId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_GetSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_GetSVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_Replace(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_Replace(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_mate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_mate(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_edges_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_edges_end__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_edges_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_edges_end__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_edges_end(PyObject *self, PyObject *args) {
+ PyObject *_wrap_TVertex_edges_end(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_edgesBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_edgesBegin(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_edgesEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_edgesEnd(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_edgesIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_edgesIterator(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_TVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_TVertex(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/Interface0DIterator.cpp b/source/blender/freestyle/intern/python/Interface0DIterator.cpp
index 283dd48ce20..48b7560acea 100644
--- a/source/blender/freestyle/intern/python/Interface0DIterator.cpp
+++ b/source/blender/freestyle/intern/python/Interface0DIterator.cpp
@@ -1,104 +1,104 @@
-SWIGINTERN PyObject *_wrap_Interface0DIterator_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator_getExactTypeName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator_getObject(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator_getObject(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator___deref__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator___deref__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator_increment(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator_increment(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator_decrement(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator_decrement(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator_isBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator_isBegin(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator_isEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator_isEnd(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator___eq__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator___ne__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator_t(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator_t(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator_u(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator_u(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator_getX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator_getX(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator_getY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator_getY(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator_getZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator_getZ(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator_getPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator_getPoint3D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator_getProjectedX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator_getProjectedX(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator_getProjectedY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator_getProjectedY(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator_getProjectedZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator_getProjectedZ(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator_getPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator_getPoint2D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator_getFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator_getFEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator_getId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator_getNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator_getNature(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator_castToSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator_castToSVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator_castToViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator_castToViewVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator_castToNonTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator_castToNonTVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator_castToTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator_castToTVertex(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/Interface1D.cpp b/source/blender/freestyle/intern/python/Interface1D.cpp
index 0bbb6049d74..65641c6c8ff 100644
--- a/source/blender/freestyle/intern/python/Interface1D.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D.cpp
@@ -1,56 +1,171 @@
-SWIGINTERN PyObject *_wrap_Interface1D_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+#include "Interface1D.h"
+
+#include "Convert.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+
+/*-----------------------Python API function prototypes for the Interface1D module--*/
+//static PyObject *Freestyle_testOutput( BPy_Freestyle * self );
+/*-----------------------Interface1D module doc strings-----------------------------*/
+static char M_Interface1D_doc[] = "The Blender.Freestyle.Interface1D submodule";
+/*----------------------Interface1D module method def----------------------------*/
+struct PyMethodDef M_Interface1D_methods[] = {
+//	{"testOutput", ( PyCFunction ) Freestyle_testOutput, METH_NOARGS, "() - Return Curve Data name"},
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_Freestyle method def------------------------------*/
+
+PyTypeObject Interface1D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"Interface1D",				/* tp_name */
+	sizeof( BPy_Interface1D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,						/* tp_dealloc */
+	NULL,                       /* printfunc tp_print; */
+	NULL,                       /* getattrfunc tp_getattr; */
+	NULL,                       /* setattrfunc tp_setattr; */
+	NULL,						/* tp_compare */
+	NULL,						/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,						/* struct PyMethodDef *tp_methods; */
+	NULL,                       /* struct PyMemberDef *tp_members; */
+	NULL,         				/* struct PyGetSetDef *tp_getset; */
+	NULL,                       /* struct _typeobject *tp_base; */
+	NULL,                       /* PyObject *tp_dict; */
+	NULL,                       /* descrgetfunc tp_descr_get; */
+	NULL,                       /* descrsetfunc tp_descr_set; */
+	0,                          /* long tp_dictoffset; */
+	NULL,                       /* initproc tp_init; */
+	NULL,                       /* allocfunc tp_alloc; */
+	NULL,                       /* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+PyObject *Interface1D_Init( void )
+{
+	PyObject *submodule;
+	
+	if( PyType_Ready( &Interface1D_Type ) < 0 )
+		return NULL;
+	
+	submodule = Py_InitModule3( "Blender.Freestyle.Interface1D", M_Interface1D_methods, M_Interface1D_doc );
+	
+	return submodule;
 }
 
+//------------------------INSTANCE METHODS ----------------------------------
 
-SWIGINTERN PyObject *_wrap_Interface1D_verticesBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+
+PyObject *Interface1D_getExactTypeName( BPy_Interface1D *self ) {
+	return PyString_FromString( self->if1D->getExactTypeName().c_str() );	
 }
 
-
-SWIGINTERN PyObject *_wrap_Interface1D_verticesEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Interface1D_getVertices( BPy_Interface1D *self ) {
+	// Vector
 }
 
-
-SWIGINTERN PyObject *_wrap_Interface1D_pointsBegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Interface1D_getPoints( BPy_Interface1D *self ) {
+	// Vector
 }
 
-
-SWIGINTERN PyObject *_wrap_Interface1D_pointsBegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Interface1D_getLength2D( BPy_Interface1D *self ) {
+	return PyFloat_FromDouble( (double) self->if1D->getLength2D() );
 }
 
-
-SWIGINTERN PyObject *_wrap_Interface1D_pointsBegin(PyObject *self, PyObject *args) {
+PyObject *Interface1D_getId( BPy_Interface1D *self ) {
+	// Id
 }
 
-
-SWIGINTERN PyObject *_wrap_Interface1D_pointsEnd__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Interface1D_getNature( BPy_Interface1D *self ) {
+	// EdgeNature
 }
 
-
-SWIGINTERN PyObject *_wrap_Interface1D_pointsEnd__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Interface1D_getTimeStamp( BPy_Interface1D *self ) {
+	return PyInt_FromLong( self->if1D->getTimeStamp() );
 }
 
+PyObject *Interface1D_setTimeStamp( BPy_Interface1D *self, PyObject *args) {
+	PyObject * obj1 = 0 ;
+	PyObject * obj2 = 0 ;
+	unsigned int timestamp;
+	
+	if( !PyArg_ParseTuple(args, (char *)"OO:Interface1D_setTimeStamp", &obj1, &obj2) )
+		cout << "ERROR: Interface1D_setTimeStamp" << endl;
+	
+	timestamp = static_cast<unsigned int>( PyInt_AsLong(obj2) );
+	self->if1D->setTimeStamp( timestamp );
 
-SWIGINTERN PyObject *_wrap_Interface1D_pointsEnd(PyObject *self, PyObject *args) {
+	Py_RETURN_NONE;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
-SWIGINTERN PyObject *_wrap_Interface1D_getLength2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-}
-
-
-SWIGINTERN PyObject *_wrap_Interface1D_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-}
-
-
-SWIGINTERN PyObject *_wrap_Interface1D_getNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-}
-
-
-SWIGINTERN PyObject *_wrap_Interface1D_getTimeStamp(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-}
-
-
-SWIGINTERN PyObject *_wrap_Interface1D_setTimeStamp(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+#ifdef __cplusplus
 }
+#endif
 
 
diff --git a/source/blender/freestyle/intern/python/Interface1D.h b/source/blender/freestyle/intern/python/Interface1D.h
new file mode 100644
index 00000000000..7477d368372
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Interface1D.h
@@ -0,0 +1,36 @@
+#ifndef FREESTYLE_PYTHON_INTERFACE1D_H
+#define FREESTYLE_PYTHON_INTERFACE1D_H
+
+#include "../view_map/Interface1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject Interface1D_Type;
+
+#define BPy_Interface1D_Check(v) \
+    ((v)->ob_type == &Interface1D_Type)
+
+/*---------------------------Python BPy_Interface1D structure definition----------*/
+typedef struct {
+	PyObject_HEAD
+	Interface1D *if1D;
+} BPy_Interface1D;
+
+/*---------------------------Python BPy_Interface1D visible prototypes-----------*/
+
+PyObject *Interface1D_Init( void );
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_INTERFACE1D_H */
diff --git a/source/blender/freestyle/intern/python/Interface1D/Curve.cpp b/source/blender/freestyle/intern/python/Interface1D/Curve.cpp
index 758227e6ad9..4fac75b3f0d 100644
--- a/source/blender/freestyle/intern/python/Interface1D/Curve.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/Curve.cpp
@@ -1,112 +1,112 @@
-SWIGINTERN PyObject *_wrap_Curve_computeCurvatureAndOrientation(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curve_computeCurvatureAndOrientation(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_push_vertex_back__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curve_push_vertex_back__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_push_vertex_back__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curve_push_vertex_back__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_push_vertex_back(PyObject *self, PyObject *args) {
+ PyObject *_wrap_Curve_push_vertex_back(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_push_vertex_front__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curve_push_vertex_front__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_push_vertex_front__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curve_push_vertex_front__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_push_vertex_front(PyObject *self, PyObject *args) {
+ PyObject *_wrap_Curve_push_vertex_front(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curve_empty(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_getLength2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curve_getLength2D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curve_getId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_nSegments(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curve_nSegments(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_setId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curve_setId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_curvePointsBegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curve_curvePointsBegin__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_curvePointsBegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curve_curvePointsBegin__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_curvePointsBegin(PyObject *self, PyObject *args) {
+ PyObject *_wrap_Curve_curvePointsBegin(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_curvePointsEnd__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curve_curvePointsEnd__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_curvePointsEnd__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curve_curvePointsEnd__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_curvePointsEnd(PyObject *self, PyObject *args) {
+ PyObject *_wrap_Curve_curvePointsEnd(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_curveVerticesBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curve_curveVerticesBegin(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_curveVerticesEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curve_curveVerticesEnd(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_verticesBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curve_verticesBegin(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_verticesEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curve_verticesEnd(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_pointsBegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curve_pointsBegin__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_pointsBegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curve_pointsBegin__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_pointsBegin(PyObject *self, PyObject *args) {
+ PyObject *_wrap_Curve_pointsBegin(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_pointsEnd__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curve_pointsEnd__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_pointsEnd__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curve_pointsEnd__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_pointsEnd(PyObject *self, PyObject *args) {
+ PyObject *_wrap_Curve_pointsEnd(PyObject *self, PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge.cpp
index 4985a2d00a4..862456d2b7c 100644
--- a/source/blender/freestyle/intern/python/Interface1D/FEdge.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/FEdge.cpp
@@ -1,252 +1,252 @@
-SWIGINTERN PyObject *_wrap_FEdge_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_getExactTypeName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_getLength2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_getLength2D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_getId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_userdata_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_userdata_set(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_userdata_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_userdata_get(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_FEdge__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_FEdge__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_FEdge__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_FEdge__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_FEdge__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_FEdge__SWIG_2(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_FEdge(PyObject *self, PyObject *args) {
+ PyObject *_wrap_new_FEdge(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_FEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_FEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_dupplicate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_dupplicate(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_vertexA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_vertexA(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_vertexB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_vertexB(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_getNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_getNature(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_nextEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_nextEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_previousEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_previousEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_shape__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_shape__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_invisibility(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_invisibility(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_viewedge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_viewedge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_center3d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_center3d(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_center2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_center2d(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_aFace(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_aFace(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_getOccludeeIntersection(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_getOccludeeIntersection(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_getOccludeeEmpty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_getOccludeeEmpty(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_isSmooth(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_isSmooth(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_SetVertexA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_SetVertexA(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_SetVertexB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_SetVertexB(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_SetId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_SetId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_SetNextEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_SetNextEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_SetPreviousEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_SetPreviousEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_SetNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_SetNature(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_SetViewEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_SetViewEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_SetaFace(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_SetaFace(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_SetOccludeeIntersection(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_SetOccludeeIntersection(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_SetOccludeeEmpty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_SetOccludeeEmpty(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_SetSmooth(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_SetSmooth(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_CommonVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_CommonVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_min2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_min2d(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_max2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_max2d(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_shape_id(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_shape_id(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_shape__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_shape__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_shape(PyObject *self, PyObject *args) {
+ PyObject *_wrap_FEdge_shape(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_shape_importance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_shape_importance(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_qi(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_qi(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_occluders_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_occluders_begin(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_occluders_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_occluders_end(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_occluders_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_occluders_empty(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_occluders_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_occluders_size(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_occludee(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_occludee(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_occluded_shape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_occluded_shape(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_occludee_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_occludee_empty(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_z_discontinuity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_z_discontinuity(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_viewedge_nature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_viewedge_nature(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_orientation2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_orientation2d(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_orientation3d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_orientation3d(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_verticesBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_verticesBegin(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_verticesEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_verticesEnd(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_pointsBegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_pointsBegin__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_pointsBegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_pointsBegin__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_pointsBegin(PyObject *self, PyObject *args) {
+ PyObject *_wrap_FEdge_pointsBegin(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_pointsEnd__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_pointsEnd__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_pointsEnd__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_pointsEnd__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_pointsEnd(PyObject *self, PyObject *args) {
+ PyObject *_wrap_FEdge_pointsEnd(PyObject *self, PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/FEdgeSharp.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge/FEdgeSharp.cpp
index 70a01ad4176..d6bd8c6f085 100644
--- a/source/blender/freestyle/intern/python/Interface1D/FEdge/FEdgeSharp.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/FEdgeSharp.cpp
@@ -1,44 +1,44 @@
-SWIGINTERN PyObject *_wrap_FEdgeSharp_dupplicate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdgeSharp_dupplicate(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSharp_normalA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdgeSharp_normalA(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSharp_normalB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdgeSharp_normalB(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSharp_aMaterialIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdgeSharp_aMaterialIndex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSharp_aMaterial(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdgeSharp_aMaterial(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSharp_bMaterialIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdgeSharp_bMaterialIndex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSharp_bMaterial(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdgeSharp_bMaterial(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSharp_SetNormalA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdgeSharp_SetNormalA(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSharp_SetNormalB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdgeSharp_SetNormalB(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSharp_SetaMaterialIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdgeSharp_SetaMaterialIndex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSharp_SetbMaterialIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdgeSharp_SetbMaterialIndex(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/FEdgeSmooth.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge/FEdgeSmooth.cpp
index 9c478f24839..e453bbdc863 100644
--- a/source/blender/freestyle/intern/python/Interface1D/FEdge/FEdgeSmooth.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/FEdgeSmooth.cpp
@@ -1,32 +1,32 @@
-SWIGINTERN PyObject *_wrap_FEdgeSmooth_dupplicate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdgeSmooth_dupplicate(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSmooth_face(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdgeSmooth_face(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSmooth_normal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdgeSmooth_normal(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSmooth_materialIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdgeSmooth_materialIndex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSmooth_material(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdgeSmooth_material(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSmooth_SetFace(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdgeSmooth_SetFace(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSmooth_SetNormal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdgeSmooth_SetNormal(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSmooth_SetMaterialIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdgeSmooth_SetMaterialIndex(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/Interface1D/Stroke.cpp b/source/blender/freestyle/intern/python/Interface1D/Stroke.cpp
index c86c2eafac9..fe5feb7068b 100644
--- a/source/blender/freestyle/intern/python/Interface1D/Stroke.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/Stroke.cpp
@@ -1,236 +1,236 @@
-SWIGINTERN PyObject *_wrap_Stroke_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_getExactTypeName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_getId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Stroke__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_Stroke__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Stroke__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_Stroke__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Stroke(PyObject *self, PyObject *args) {
+ PyObject *_wrap_new_Stroke(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_Stroke(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_Stroke(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_ComputeSampling(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_ComputeSampling(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_Resample__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_Resample__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_Resample__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_Resample__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_Resample(PyObject *self, PyObject *args) {
+PyObject *Stroke_Resample(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_RemoveVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_RemoveVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_InsertVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_InsertVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_Render(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_Render(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_RenderBasic(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_RenderBasic(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_getLength2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_getLength2D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_getMediumType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_getMediumType(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_getTextureId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_getTextureId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_hasTips(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_hasTips(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_vertices_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_vertices_size(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_viewedges_begin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_viewedges_begin__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_viewedges_begin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_viewedges_begin__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_viewedges_begin(PyObject *self, PyObject *args) {
+PyObject *Stroke_viewedges_begin(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_viewedges_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_viewedges_end__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_viewedges_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_viewedges_end__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_viewedges_end(PyObject *self, PyObject *args) {
+PyObject *Stroke_viewedges_end(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_viewedges_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_viewedges_size(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_getBeginningOrientation(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_getBeginningOrientation(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_getBeginningOrientationX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_getBeginningOrientationX(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_getBeginningOrientationY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_getBeginningOrientationY(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_getEndingOrientation(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_getEndingOrientation(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_getEndingOrientationX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_getEndingOrientationX(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_getEndingOrientationY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_getEndingOrientationY(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_SetId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_SetId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_SetLength(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_SetLength(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_SetMediumType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_SetMediumType(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_SetTextureId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_SetTextureId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_SetTips(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_SetTips(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_push_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_push_back(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_push_front(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_push_front(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_AddViewEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_AddViewEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_SetBeginningOrientation__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_SetBeginningOrientation__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_SetBeginningOrientation__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_SetBeginningOrientation__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_SetBeginningOrientation(PyObject *self, PyObject *args) {
+PyObject *Stroke_SetBeginningOrientation(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_SetEndingOrientation__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_SetEndingOrientation__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_SetEndingOrientation__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_SetEndingOrientation__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_SetEndingOrientation(PyObject *self, PyObject *args) {
+PyObject *Stroke_SetEndingOrientation(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_strokeVerticesBegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_strokeVerticesBegin__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_strokeVerticesBegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_strokeVerticesBegin__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_strokeVerticesBegin(PyObject *self, PyObject *args) {
+PyObject *Stroke_strokeVerticesBegin(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_strokeVerticesEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_strokeVerticesEnd(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_strokeVerticesSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_strokeVerticesSize(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_verticesBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_verticesBegin(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_verticesEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_verticesEnd(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_pointsBegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_pointsBegin__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_pointsBegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_pointsBegin__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_pointsBegin(PyObject *self, PyObject *args) {
+PyObject *Stroke_pointsBegin(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_pointsEnd__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_pointsEnd__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_pointsEnd__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_pointsEnd__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_pointsEnd(PyObject *self, PyObject *args) {
+PyObject *Stroke_pointsEnd(PyObject *self, PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/Interface1D/ViewEdge.cpp b/source/blender/freestyle/intern/python/Interface1D/ViewEdge.cpp
index d9db8ea83c4..1b55b601c89 100644
--- a/source/blender/freestyle/intern/python/Interface1D/ViewEdge.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/ViewEdge.cpp
@@ -1,236 +1,236 @@
-SWIGINTERN PyObject *_wrap_ViewEdge_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_getExactTypeName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_getId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_getNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_getNature(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_userdata_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_userdata_set(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_userdata_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_userdata_get(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ViewEdge__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_ViewEdge__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ViewEdge__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_ViewEdge__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ViewEdge__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_ViewEdge__SWIG_2(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ViewEdge__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_ViewEdge__SWIG_3(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ViewEdge(PyObject *self, PyObject *args) {
+ PyObject *_wrap_new_ViewEdge(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ViewEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_ViewEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_A(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_A(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_B(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_B(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_fedgeA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_fedgeA(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_fedgeB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_fedgeB(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_viewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_viewShape(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_aShape__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_aShape__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_isClosed(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_isClosed(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_getChainingTimeStamp(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_getChainingTimeStamp(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_aShape__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_aShape__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_aShape(PyObject *self, PyObject *args) {
+ PyObject *_wrap_ViewEdge_aShape(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_bShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_bShape(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_occluders(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_occluders(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_splittingId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_splittingId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_SetA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_SetA(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_SetB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_SetB(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_SetNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_SetNature(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_SetFEdgeA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_SetFEdgeA(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_SetFEdgeB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_SetFEdgeB(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_SetShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_SetShape(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_SetId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_SetId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_UpdateFEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_UpdateFEdges(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_SetaShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_SetaShape(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_SetQI(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_SetQI(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_setChainingTimeStamp(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_setChainingTimeStamp(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_AddOccluder(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_AddOccluder(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_setSplittingId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_setSplittingId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_intersect_2d_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_intersect_2d_area(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_include_in_2d_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_include_in_2d_area(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_getLength2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_getLength2D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_qi(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_qi(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_occluders_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_occluders_begin(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_occluders_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_occluders_end(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_occluders_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_occluders_size(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_occluders_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_occluders_empty(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_occludee(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_occludee(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_occluded_shape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_occluded_shape(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_occludee_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_occludee_empty(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_shape_id(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_shape_id(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_shape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_shape(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_shape_importance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_shape_importance(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_verticesBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_verticesBegin(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_verticesEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_verticesEnd(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_pointsBegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_pointsBegin__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_pointsBegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_pointsBegin__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_pointsBegin(PyObject *self, PyObject *args) {
+ PyObject *_wrap_ViewEdge_pointsBegin(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_pointsEnd__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_pointsEnd__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_pointsEnd__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_pointsEnd__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_pointsEnd(PyObject *self, PyObject *args) {
+ PyObject *_wrap_ViewEdge_pointsEnd(PyObject *self, PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/Material.cpp b/source/blender/freestyle/intern/python/Material.cpp
index 217e2d7e89c..459de449336 100644
--- a/source/blender/freestyle/intern/python/Material.cpp
+++ b/source/blender/freestyle/intern/python/Material.cpp
@@ -1,112 +1,112 @@
-SWIGINTERN PyObject *_wrap_Material_diffuse(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_diffuse(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_diffuseR(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_diffuseR(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_diffuseG(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_diffuseG(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_diffuseB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_diffuseB(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_diffuseA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_diffuseA(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_specular(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_specular(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_specularR(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_specularR(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_specularG(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_specularG(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_specularB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_specularB(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_specularA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_specularA(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_ambient(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_ambient(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_ambientR(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_ambientR(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_ambientG(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_ambientG(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_ambientB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_ambientB(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_ambientA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_ambientA(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_emission(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_emission(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_emissionR(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_emissionR(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_emissionG(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_emissionG(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_emissionB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_emissionB(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_emissionA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_emissionA(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_shininess(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_shininess(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_SetDiffuse(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_SetDiffuse(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_SetSpecular(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_SetSpecular(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_SetAmbient(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_SetAmbient(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_SetEmission(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_SetEmission(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_SetShininess(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_SetShininess(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material___ne__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material___eq__(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/Noise.cpp b/source/blender/freestyle/intern/python/Noise.cpp
index e64393d9b35..8e6b7aa5022 100644
--- a/source/blender/freestyle/intern/python/Noise.cpp
+++ b/source/blender/freestyle/intern/python/Noise.cpp
@@ -1,48 +1,48 @@
-SWIGINTERN PyObject *_wrap_Noise_turbulence1__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Noise_turbulence1__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Noise_turbulence1__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Noise_turbulence1__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Noise_turbulence1(PyObject *self, PyObject *args) {
+ PyObject *_wrap_Noise_turbulence1(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Noise_turbulence2__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Noise_turbulence2__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Noise_turbulence2__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Noise_turbulence2__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Noise_turbulence2(PyObject *self, PyObject *args) {
+ PyObject *_wrap_Noise_turbulence2(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Noise_turbulence3__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Noise_turbulence3__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Noise_turbulence3__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Noise_turbulence3__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Noise_turbulence3(PyObject *self, PyObject *args) {
+ PyObject *_wrap_Noise_turbulence3(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Noise_smoothNoise1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Noise_smoothNoise1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Noise_smoothNoise2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Noise_smoothNoise2(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Noise_smoothNoise3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Noise_smoothNoise3(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/Operators.cpp b/source/blender/freestyle/intern/python/Operators.cpp
index df9fa4571aa..efae258d5ee 100644
--- a/source/blender/freestyle/intern/python/Operators.cpp
+++ b/source/blender/freestyle/intern/python/Operators.cpp
@@ -1,104 +1,57 @@
-SWIGINTERN PyObject *_wrap_Operators_select(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Operators_select(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Operators_chain__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Operators_chain(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Operators_chain__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Operators_bidirectionalChain(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Operators_chain(PyObject *self, PyObject *args) {
+PyObject *Operators_sequentialSplit(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Operators_bidirectionalChain__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Operators_recursiveSplit(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Operators_bidirectionalChain__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Operators_sort(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Operators_bidirectionalChain(PyObject *self, PyObject *args) {
+PyObject *Operators_create(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Operators_sequentialSplit__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Operators_getViewEdgeFromIndex(PyObject *self , PyObject *args) {
+
 }
 
 
-SWIGINTERN PyObject *_wrap_Operators_sequentialSplit__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Operators_getChainFromIndex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Operators_sequentialSplit__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Operators_getStrokeFromIndex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Operators_sequentialSplit__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Operators_getViewEdgesSize(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Operators_sequentialSplit(PyObject *self, PyObject *args) {
+PyObject *Operators_getChainsSize(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Operators_recursiveSplit__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Operators_getStrokesSize(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Operators_recursiveSplit__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-}
-
-
-SWIGINTERN PyObject *_wrap_Operators_recursiveSplit__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-}
-
-
-SWIGINTERN PyObject *_wrap_Operators_recursiveSplit__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-}
-
-
-SWIGINTERN PyObject *_wrap_Operators_recursiveSplit(PyObject *self, PyObject *args) {
-}
-
-
-SWIGINTERN PyObject *_wrap_Operators_sort(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-}
-
-
-SWIGINTERN PyObject *_wrap_Operators_create(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-}
-
-
-SWIGINTERN PyObject *_wrap_Operators_getViewEdgeFromIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-}
-
-
-SWIGINTERN PyObject *_wrap_Operators_getChainFromIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-}
-
-
-SWIGINTERN PyObject *_wrap_Operators_getStrokeFromIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-}
-
-
-SWIGINTERN PyObject *_wrap_Operators_getViewEdgesSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-}
-
-
-SWIGINTERN PyObject *_wrap_Operators_getChainsSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-}
-
-
-SWIGINTERN PyObject *_wrap_Operators_getStrokesSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-}
-
-
-SWIGINTERN PyObject *_wrap_delete_Operators(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *delete_Operators(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/SShape.cpp b/source/blender/freestyle/intern/python/SShape.cpp
index 201fba6ed9d..a5b1cf3f27a 100644
--- a/source/blender/freestyle/intern/python/SShape.cpp
+++ b/source/blender/freestyle/intern/python/SShape.cpp
@@ -1,120 +1,120 @@
-SWIGINTERN PyObject *_wrap_SShape_userdata_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_userdata_set(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_userdata_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_userdata_get(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_SShape__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_SShape__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_SShape__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_SShape__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_SShape(PyObject *self, PyObject *args) {
+ PyObject *_wrap_new_SShape(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_dupplicate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_dupplicate(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_SShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_SShape(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_AddEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_AddEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_AddNewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_AddNewVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_AddChain(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_AddChain(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_CreateSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_CreateSVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_SplitEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_SplitEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_SplitEdgeIn2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_SplitEdgeIn2(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_SetBBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_SetBBox(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_ComputeBBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_ComputeBBox(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_RemoveEdgeFromChain(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_RemoveEdgeFromChain(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_RemoveEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_RemoveEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_GetVertexList(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_GetVertexList(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_GetEdgeList(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_GetEdgeList(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_GetChains(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_GetChains(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_bbox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_bbox(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_material(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_material(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_materials(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_materials(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_viewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_viewShape(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_importance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_importance(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_getId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_SetId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_SetId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_SetMaterials(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_SetMaterials(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_SetViewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_SetViewShape(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_SetImportance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_SetImportance(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeAttribute.cpp b/source/blender/freestyle/intern/python/StrokeAttribute.cpp
index c38da608c2d..c54eca16e11 100644
--- a/source/blender/freestyle/intern/python/StrokeAttribute.cpp
+++ b/source/blender/freestyle/intern/python/StrokeAttribute.cpp
@@ -1,112 +1,112 @@
-SWIGINTERN PyObject *_wrap_StrokeAttribute_getColor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_getColor(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_getColorR(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_getColorR(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_getColorG(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_getColorG(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_getColorB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_getColorB(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_getColorRGB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_getColorRGB(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_getAlpha(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_getAlpha(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_getThickness(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_getThickness(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_getThicknessR(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_getThicknessR(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_getThicknessL(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_getThicknessL(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_getThicknessRL(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_getThicknessRL(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_isVisible(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_isVisible(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_getAttributeReal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_getAttributeReal(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_getAttributeVec2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_getAttributeVec2f(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_getAttributeVec3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_getAttributeVec3f(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_isAttributeAvailableReal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_isAttributeAvailableReal(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_isAttributeAvailableVec2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_isAttributeAvailableVec2f(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_isAttributeAvailableVec3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_isAttributeAvailableVec3f(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_setColor__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_setColor__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_setColor__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_setColor__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_setColor(PyObject *self, PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_setColor(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_setAlpha(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_setAlpha(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_setThickness__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_setThickness__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_setThickness__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_setThickness__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_setThickness(PyObject *self, PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_setThickness(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_SetVisible(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_SetVisible(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_setAttributeReal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_setAttributeReal(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_setAttributeVec2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_setAttributeVec2f(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_setAttributeVec3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_setAttributeVec3f(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeShader.cpp b/source/blender/freestyle/intern/python/StrokeShader.cpp
index 6348b654003..268d1fabe36 100644
--- a/source/blender/freestyle/intern/python/StrokeShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_StrokeShader_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeShader_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeShader_shade(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_disown_StrokeShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_disown_StrokeShader(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BackboneStretcherShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BackboneStretcherShader.cpp
index 68ea395d7b9..96fd31e982e 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BackboneStretcherShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BackboneStretcherShader.cpp
@@ -1,8 +1,8 @@
-SWIGINTERN PyObject *_wrap_BackboneStretcherShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_BackboneStretcherShader_shade(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_BackboneStretcherShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_BackboneStretcherShader(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BezierCurveShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BezierCurveShader.cpp
index bf480135451..a4d476bb2d6 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BezierCurveShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BezierCurveShader.cpp
@@ -1,8 +1,8 @@
-SWIGINTERN PyObject *_wrap_BezierCurveShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_BezierCurveShader_shade(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_BezierCurveShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_BezierCurveShader(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeShader/CalligraphicShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/CalligraphicShader.cpp
index cf7caa68326..2f7a422d311 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/CalligraphicShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/CalligraphicShader.cpp
@@ -1,4 +1,4 @@
-SWIGINTERN PyObject *_wrap_CalligraphicShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CalligraphicShader_shade(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeShader/ColorNoiseShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/ColorNoiseShader.cpp
index 34f21261c33..1b52e33fd8f 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/ColorNoiseShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/ColorNoiseShader.cpp
@@ -1,8 +1,8 @@
-SWIGINTERN PyObject *_wrap_ColorNoiseShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ColorNoiseShader_shade(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ColorNoiseShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_ColorNoiseShader(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeShader/ColorVariationPatternShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/ColorVariationPatternShader.cpp
index 4d97fbf6c3c..7529c869939 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/ColorVariationPatternShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/ColorVariationPatternShader.cpp
@@ -1,4 +1,4 @@
-SWIGINTERN PyObject *_wrap_ColorVariationPatternShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ColorVariationPatternShader_shade(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeShader/ConstantColorShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/ConstantColorShader.cpp
index e1a58326696..e636331c57c 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/ConstantColorShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/ConstantColorShader.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_ConstantColorShader_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ConstantColorShader_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ConstantColorShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ConstantColorShader_shade(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ConstantColorShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_ConstantColorShader(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeShader/ConstantThicknessShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/ConstantThicknessShader.cpp
index 3d6950d556e..1840ef71f6d 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/ConstantThicknessShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/ConstantThicknessShader.cpp
@@ -1,8 +1,8 @@
-SWIGINTERN PyObject *_wrap_ConstantThicknessShader_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ConstantThicknessShader_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ConstantThicknessShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ConstantThicknessShader_shade(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeShader/ConstrainedIncreasingThicknessShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/ConstrainedIncreasingThicknessShader.cpp
index a0e0a4ace8c..41eb1c94d17 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/ConstrainedIncreasingThicknessShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/ConstrainedIncreasingThicknessShader.cpp
@@ -1,4 +1,4 @@
-SWIGINTERN PyObject *_wrap_ConstrainedIncreasingThicknessShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ConstrainedIncreasingThicknessShader_shade(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeShader/GuidingLinesShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/GuidingLinesShader.cpp
index fdd198a30af..633523af330 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/GuidingLinesShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/GuidingLinesShader.cpp
@@ -1,8 +1,8 @@
-SWIGINTERN PyObject *_wrap_GuidingLinesShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GuidingLinesShader_shade(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GuidingLinesShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GuidingLinesShader(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeShader/IncreasingColorShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/IncreasingColorShader.cpp
index bfac8efda55..2fbb74f3768 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/IncreasingColorShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/IncreasingColorShader.cpp
@@ -1,8 +1,8 @@
-SWIGINTERN PyObject *_wrap_IncreasingColorShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_IncreasingColorShader_shade(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_IncreasingColorShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_IncreasingColorShader(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeShader/IncreasingThicknessShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/IncreasingThicknessShader.cpp
index e17f06dfafb..4d97f43841d 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/IncreasingThicknessShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/IncreasingThicknessShader.cpp
@@ -1,4 +1,4 @@
-SWIGINTERN PyObject *_wrap_IncreasingThicknessShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_IncreasingThicknessShader_shade(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeShader/PolygonalizationShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/PolygonalizationShader.cpp
index 533d481165f..098330d37bd 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/PolygonalizationShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/PolygonalizationShader.cpp
@@ -1,8 +1,8 @@
-SWIGINTERN PyObject *_wrap_PolygonalizationShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_PolygonalizationShader_shade(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_PolygonalizationShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_PolygonalizationShader(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeShader/SamplingShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/SamplingShader.cpp
index 698905ad292..3a42bda3b08 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/SamplingShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/SamplingShader.cpp
@@ -1,8 +1,8 @@
-SWIGINTERN PyObject *_wrap_SamplingShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SamplingShader_shade(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_SamplingShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_SamplingShader(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeShader/SpatialNoiseShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/SpatialNoiseShader.cpp
index 68a41f48160..ff90e7f973c 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/SpatialNoiseShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/SpatialNoiseShader.cpp
@@ -1,4 +1,4 @@
-SWIGINTERN PyObject *_wrap_SpatialNoiseShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SpatialNoiseShader_shade(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeShader/StrokeTextureShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/StrokeTextureShader.cpp
index 317273262ae..90636eb5aee 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/StrokeTextureShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/StrokeTextureShader.cpp
@@ -1,8 +1,8 @@
-SWIGINTERN PyObject *_wrap_StrokeTextureShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeTextureShader_shade(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_StrokeTextureShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_StrokeTextureShader(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeShader/TextureAssignerShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/TextureAssignerShader.cpp
index 4bb2f6bf03a..9a308d60ac3 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/TextureAssignerShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/TextureAssignerShader.cpp
@@ -1,8 +1,8 @@
-SWIGINTERN PyObject *_wrap_TextureAssignerShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TextureAssignerShader_shade(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_TextureAssignerShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_TextureAssignerShader(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeShader/ThicknessNoiseShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/ThicknessNoiseShader.cpp
index a0542e8d400..0c69aa5cfc1 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/ThicknessNoiseShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/ThicknessNoiseShader.cpp
@@ -1,8 +1,8 @@
-SWIGINTERN PyObject *_wrap_ThicknessNoiseShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ThicknessNoiseShader_shade(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ThicknessNoiseShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_ThicknessNoiseShader(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeShader/ThicknessVariationPatternShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/ThicknessVariationPatternShader.cpp
index 992d526e728..02326259be8 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/ThicknessVariationPatternShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/ThicknessVariationPatternShader.cpp
@@ -1,4 +1,4 @@
-SWIGINTERN PyObject *_wrap_ThicknessVariationPatternShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ThicknessVariationPatternShader_shade(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeShader/TipRemoverShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/TipRemoverShader.cpp
index 883cd4c0ded..4a202ddd6ee 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/TipRemoverShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/TipRemoverShader.cpp
@@ -1,4 +1,4 @@
-SWIGINTERN PyObject *_wrap_TipRemoverShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TipRemoverShader_shade(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeShader/fstreamShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/fstreamShader.cpp
index 275c7277ce4..dc19cde3871 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/fstreamShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/fstreamShader.cpp
@@ -1,8 +1,8 @@
-SWIGINTERN PyObject *_wrap_fstreamShader_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_fstreamShader_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_fstreamShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_fstreamShader_shade(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeShader/streamShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/streamShader.cpp
index 4f36bfae337..aa3250f858c 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/streamShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/streamShader.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_streamShader_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_streamShader_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_streamShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_streamShader_shade(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_streamShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_streamShader(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeVertexIterator.cpp b/source/blender/freestyle/intern/python/StrokeVertexIterator.cpp
index 7997a73e28c..3fae5a34060 100644
--- a/source/blender/freestyle/intern/python/StrokeVertexIterator.cpp
+++ b/source/blender/freestyle/intern/python/StrokeVertexIterator.cpp
@@ -1,260 +1,260 @@
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_castToInterface0DIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_castToInterface0DIterator(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_getExactTypeName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getObject(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_getObject(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator___deref__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator___deref__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_increment(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_increment(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_decrement(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_decrement(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_isBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_isBegin(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_isEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_isEnd(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator___eq__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_t(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_t(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_u(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_u(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_copy(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_copy(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getIt(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_getIt(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_x(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_x(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_y(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_y(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getPoint(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_getPoint(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_attribute__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_attribute__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_attribute__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_attribute__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_attribute(PyObject *self, PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_attribute(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_curvilinearAbscissa(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_curvilinearAbscissa(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_strokeLength(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_strokeLength(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_SetX(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_SetY(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetPoint__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_SetPoint__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetPoint__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_SetPoint__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetPoint(PyObject *self, PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_SetPoint(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetAttribute(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_SetAttribute(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetCurvilinearAbscissa(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_SetCurvilinearAbscissa(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetStrokeLength(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_SetStrokeLength(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_getX(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_getY(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_getZ(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_getPoint3D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getProjectedX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_getProjectedX(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getProjectedY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_getProjectedY(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getProjectedZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_getProjectedZ(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_getPoint2D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_getFEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_getId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_getNature(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_castToSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_castToSVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_castToViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_castToViewVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_castToNonTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_castToNonTVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_castToTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_castToTVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_A(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_A(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_B(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_B(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_t2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_t2d(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_SetA(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_SetB(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetT2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_SetT2d(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_fedge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_fedge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_point2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_point2d(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_point3d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_point3d(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_normal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_normal(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_shape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_shape(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_occluders_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_occluders_begin(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_occluders_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_occluders_end(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_occluders_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_occluders_empty(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_occluders_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_occluders_size(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_occludee(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_occludee(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_occluded_shape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_occluded_shape(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_occludee_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_occludee_empty(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_z_discontinuity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_z_discontinuity(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_curvatureFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_curvatureFredo(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_directionFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_directionFredo(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DDouble.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DDouble.cpp
index a6ec72c8c19..df286794dd3 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DDouble.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DDouble.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_UnaryFunction0DDouble_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction0DDouble_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction0DDouble___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction0DDouble___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DDouble(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_disown_UnaryFunction0DDouble(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DFloat.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DFloat.cpp
index 3a4b0326cf7..ccb89d91ecf 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DFloat.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DFloat.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_UnaryFunction0DFloat_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction0DFloat_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction0DFloat___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction0DFloat___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DFloat(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_disown_UnaryFunction0DFloat(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DId.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DId.cpp
index 8388d964479..b854b3ccaa4 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DId.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DId.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_UnaryFunction0DId_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction0DId_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction0DId___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction0DId___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_disown_UnaryFunction0DId(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DUnsigned.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DUnsigned.cpp
index 9d2491bee33..425d1cdabf5 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DUnsigned.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DUnsigned.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_UnaryFunction0DUnsigned_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction0DUnsigned_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction0DUnsigned___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction0DUnsigned___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DUnsigned(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_disown_UnaryFunction0DUnsigned(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVec2f.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVec2f.cpp
index 36a7772ab72..828d39b6de7 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVec2f.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVec2f.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_UnaryFunction0DVec2f_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction0DVec2f_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction0DVec2f___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction0DVec2f___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DVec2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_disown_UnaryFunction0DVec2f(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVec3f.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVec3f.cpp
index 5996de16ac1..b6a6d0264bc 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVec3f.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVec3f.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_UnaryFunction0DVec3f_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction0DVec3f_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction0DVec3f___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction0DVec3f___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DVec3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_disown_UnaryFunction0DVec3f(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVectorViewShape.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVectorViewShape.cpp
index 0552b54aed8..f9736680ab8 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVectorViewShape.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVectorViewShape.cpp
@@ -1,8 +1,8 @@
-SWIGINTERN PyObject *_wrap_UnaryFunction0DVectorViewShape_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction0DVectorViewShape_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction0DVectorViewShape___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction0DVectorViewShape___call__(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DViewShape.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DViewShape.cpp
index a8af361cc63..3dddb333a55 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DViewShape.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DViewShape.cpp
@@ -1,8 +1,8 @@
-SWIGINTERN PyObject *_wrap_UnaryFunction0DViewShape_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction0DViewShape_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction0DViewShape___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction0DViewShape___call__(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/ShapeIdF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/ShapeIdF0D.cpp
index bed3db84681..58fa20b8e95 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/ShapeIdF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/ShapeIdF0D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_ShapeIdF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ShapeIdF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ShapeIdF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ShapeIdF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ShapeIdF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_ShapeIdF0D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ShapeIdF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_ShapeIdF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/MaterialF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/MaterialF0D.cpp
index d12d4b6383d..167a68b8977 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/MaterialF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/MaterialF0D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_MaterialF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_MaterialF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_MaterialF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_MaterialF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_MaterialF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_MaterialF0D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_MaterialF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_MaterialF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/CurveNatureF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/CurveNatureF0D.cpp
index 814c89c1766..1b155757589 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/CurveNatureF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/CurveNatureF0D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_CurveNatureF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurveNatureF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurveNatureF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurveNatureF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_CurveNatureF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_CurveNatureF0D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_CurveNatureF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_CurveNatureF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/Normal2DF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/Normal2DF0D.cpp
index 64ee307e011..99f892529ab 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/Normal2DF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/Normal2DF0D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_Normal2DF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Normal2DF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Normal2DF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Normal2DF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Normal2DF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_Normal2DF0D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_Normal2DF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_Normal2DF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/VertexOrientation2DF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/VertexOrientation2DF0D.cpp
index 6611a23e41c..bf7fbfe2550 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/VertexOrientation2DF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/VertexOrientation2DF0D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_VertexOrientation2DF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_VertexOrientation2DF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_VertexOrientation2DF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_VertexOrientation2DF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_VertexOrientation2DF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_VertexOrientation2DF0D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_VertexOrientation2DF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_VertexOrientation2DF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/VertexOrientation3DF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/VertexOrientation3DF0D.cpp
index 24dabfcdc66..32d5ac529fa 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/VertexOrientation3DF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/VertexOrientation3DF0D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_VertexOrientation3DF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_VertexOrientation3DF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_VertexOrientation3DF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_VertexOrientation3DF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_VertexOrientation3DF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_VertexOrientation3DF0D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_VertexOrientation3DF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_VertexOrientation3DF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/GetOccludeeF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/GetOccludeeF0D.cpp
index 9029b9ea863..2dc779a3fdb 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/GetOccludeeF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/GetOccludeeF0D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_GetOccludeeF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetOccludeeF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetOccludeeF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetOccludeeF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GetOccludeeF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_GetOccludeeF0D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetOccludeeF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetOccludeeF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/GetShapeF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/GetShapeF0D.cpp
index 6e9d3abde41..92ec79efec5 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/GetShapeF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/GetShapeF0D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_GetShapeF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetShapeF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetShapeF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetShapeF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GetShapeF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_GetShapeF0D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetShapeF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetShapeF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/DensityF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/DensityF0D.cpp
new file mode 100644
index 00000000000..50986360f2c
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/DensityF0D.cpp
@@ -0,0 +1,12 @@
+ PyObject *_wrap_DensityF0D_getName(PyObject *self , PyObject *args) {
+}
+
+
+ PyObject *_wrap_DensityF0D___call__(PyObject *self , PyObject *args) {
+}
+
+
+ PyObject *_wrap_delete_DensityF0D(PyObject *self , PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/LocalAverageDepthF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/LocalAverageDepthF0D.cpp
new file mode 100644
index 00000000000..0738f2cf6dc
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/LocalAverageDepthF0D.cpp
@@ -0,0 +1,12 @@
+ PyObject *_wrap_LocalAverageDepthF0D_getName(PyObject *self , PyObject *args) {
+}
+
+
+ PyObject *_wrap_LocalAverageDepthF0D___call__(PyObject *self , PyObject *args) {
+}
+
+
+ PyObject *_wrap_delete_LocalAverageDepthF0D(PyObject *self , PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetCurvilinearAbscissaF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetCurvilinearAbscissaF0D.cpp
index cf684395749..359e3186905 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetCurvilinearAbscissaF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetCurvilinearAbscissaF0D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_GetCurvilinearAbscissaF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetCurvilinearAbscissaF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetCurvilinearAbscissaF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetCurvilinearAbscissaF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GetCurvilinearAbscissaF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_GetCurvilinearAbscissaF0D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetCurvilinearAbscissaF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetCurvilinearAbscissaF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetParameterF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetParameterF0D.cpp
index aab03185ae8..71b7ac85a7f 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetParameterF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetParameterF0D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_GetParameterF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetParameterF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetParameterF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetParameterF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GetParameterF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_GetParameterF0D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetParameterF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetParameterF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetViewMapGradientNormF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetViewMapGradientNormF0D.cpp
index 5007e5c68cd..8def0ea948f 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetViewMapGradientNormF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetViewMapGradientNormF0D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_GetViewMapGradientNormF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetViewMapGradientNormF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetViewMapGradientNormF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetViewMapGradientNormF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetViewMapGradientNormF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetViewMapGradientNormF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadCompleteViewMapPixelF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadCompleteViewMapPixelF0D.cpp
index c0dc2350a00..74fdf60dffc 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadCompleteViewMapPixelF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadCompleteViewMapPixelF0D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_ReadCompleteViewMapPixelF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ReadCompleteViewMapPixelF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ReadCompleteViewMapPixelF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ReadCompleteViewMapPixelF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ReadCompleteViewMapPixelF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_ReadCompleteViewMapPixelF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadMapPixelF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadMapPixelF0D.cpp
index 4adcced09e5..cb2bdd4c60a 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadMapPixelF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadMapPixelF0D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_ReadMapPixelF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ReadMapPixelF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ReadMapPixelF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ReadMapPixelF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ReadMapPixelF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_ReadMapPixelF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadSteerableViewMapPixelF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadSteerableViewMapPixelF0D.cpp
index 7c3c4c58120..dc32cf290a0 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadSteerableViewMapPixelF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadSteerableViewMapPixelF0D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_ReadSteerableViewMapPixelF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ReadSteerableViewMapPixelF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ReadSteerableViewMapPixelF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ReadSteerableViewMapPixelF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ReadSteerableViewMapPixelF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_ReadSteerableViewMapPixelF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/Curvature2DAngleF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/Curvature2DAngleF0D.cpp
index 749af7bbf8b..f91642ad7c1 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/Curvature2DAngleF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/Curvature2DAngleF0D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_Curvature2DAngleF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curvature2DAngleF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curvature2DAngleF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curvature2DAngleF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Curvature2DAngleF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_Curvature2DAngleF0D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_Curvature2DAngleF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_Curvature2DAngleF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedXF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedXF0D.cpp
index 727e617512a..f99666cdd65 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedXF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedXF0D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_GetProjectedXF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetProjectedXF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetProjectedXF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetProjectedXF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GetProjectedXF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_GetProjectedXF0D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetProjectedXF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetProjectedXF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedYF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedYF0D.cpp
index c135ac5a45c..44eb1d44bf2 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedYF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedYF0D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_GetProjectedYF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetProjectedYF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetProjectedYF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetProjectedYF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GetProjectedYF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_GetProjectedYF0D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetProjectedYF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetProjectedYF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedZF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedZF0D.cpp
index 928e3ce73f8..0257328973b 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedZF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedZF0D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_GetProjectedZF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetProjectedZF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetProjectedZF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetProjectedZF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GetProjectedZF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_GetProjectedZF0D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetProjectedZF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetProjectedZF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetXF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetXF0D.cpp
index e6286fd53fe..6bc16ad36d1 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetXF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetXF0D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_GetXF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetXF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetXF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetXF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GetXF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_GetXF0D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetXF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetXF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetYF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetYF0D.cpp
index 767c21d5592..c2651fc59be 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetYF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetYF0D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_GetYF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetYF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetYF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetYF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GetYF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_GetYF0D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetYF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetYF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetZF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetZF0D.cpp
index 526a321f667..e3f1f56a932 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetZF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetZF0D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_GetZF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetZF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetZF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetZF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GetZF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_GetZF0D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetZF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetZF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/ZDiscontinuityF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/ZDiscontinuityF0D.cpp
index d043f373dd1..c72e020066a 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/ZDiscontinuityF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/ZDiscontinuityF0D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_ZDiscontinuityF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ZDiscontinuityF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ZDiscontinuityF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ZDiscontinuityF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ZDiscontinuityF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_ZDiscontinuityF0D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ZDiscontinuityF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_ZDiscontinuityF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/QuantitativeInvisibilityF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/QuantitativeInvisibilityF0D.cpp
index edc9c97f740..15e3114b81a 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/QuantitativeInvisibilityF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/QuantitativeInvisibilityF0D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_QuantitativeInvisibilityF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_QuantitativeInvisibilityF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_QuantitativeInvisibilityF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_QuantitativeInvisibilityF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_QuantitativeInvisibilityF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_QuantitativeInvisibilityF0D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_QuantitativeInvisibilityF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_QuantitativeInvisibilityF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/GetOccludersF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/GetOccludersF0D.cpp
index 3968e1293a9..95de61007c1 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/GetOccludersF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/GetOccludersF0D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_GetOccludersF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetOccludersF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetOccludersF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetOccludersF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GetOccludersF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_GetOccludersF0D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetOccludersF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetOccludersF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0DVoid.cpp b/source/blender/freestyle/intern/python/UnaryFunction0DVoid.cpp
index f7c7dca2535..92a87b04a80 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0DVoid.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0DVoid.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_UnaryFunction0DVoid_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction0DVoid_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction0DVoid___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction0DVoid___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DVoid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_disown_UnaryFunction0DVoid(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DDouble.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DDouble.cpp
index b7194d3e116..ad7c6627799 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DDouble.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DDouble.cpp
@@ -1,20 +1,20 @@
-SWIGINTERN PyObject *_wrap_UnaryFunction1DDouble_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DDouble_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction1DDouble___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DDouble___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction1DDouble_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DDouble_setIntegrationType(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction1DDouble_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DDouble_getIntegrationType(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_disown_UnaryFunction1DDouble(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_disown_UnaryFunction1DDouble(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DFloat.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DFloat.cpp
index a41994114e4..cb572980f8f 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DFloat.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DFloat.cpp
@@ -1,20 +1,20 @@
-SWIGINTERN PyObject *_wrap_UnaryFunction1DFloat_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DFloat_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction1DFloat___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DFloat___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction1DFloat_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DFloat_setIntegrationType(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction1DFloat_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DFloat_getIntegrationType(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_disown_UnaryFunction1DFloat(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_disown_UnaryFunction1DFloat(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DUnsigned.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DUnsigned.cpp
index 2b0b96e0357..eb230a2d49f 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DUnsigned.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DUnsigned.cpp
@@ -1,20 +1,20 @@
-SWIGINTERN PyObject *_wrap_UnaryFunction1DUnsigned_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DUnsigned_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction1DUnsigned___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DUnsigned___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction1DUnsigned_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DUnsigned_setIntegrationType(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction1DUnsigned_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DUnsigned_getIntegrationType(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_disown_UnaryFunction1DUnsigned(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_disown_UnaryFunction1DUnsigned(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVec2f.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVec2f.cpp
index 546a3f66399..64fb6ef6ed7 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVec2f.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVec2f.cpp
@@ -1,20 +1,20 @@
-SWIGINTERN PyObject *_wrap_UnaryFunction1DVec2f_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DVec2f_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction1DVec2f___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DVec2f___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction1DVec2f_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DVec2f_setIntegrationType(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction1DVec2f_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DVec2f_getIntegrationType(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_disown_UnaryFunction1DVec2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_disown_UnaryFunction1DVec2f(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVec3f.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVec3f.cpp
index 28b73b81b8a..d7b360eb10e 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVec3f.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVec3f.cpp
@@ -1,20 +1,20 @@
-SWIGINTERN PyObject *_wrap_UnaryFunction1DVec3f_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DVec3f_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction1DVec3f___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DVec3f___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction1DVec3f_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DVec3f_setIntegrationType(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction1DVec3f_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DVec3f_getIntegrationType(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_disown_UnaryFunction1DVec3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_disown_UnaryFunction1DVec3f(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVectorViewShape.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVectorViewShape.cpp
index dafd9a65499..1fe16797593 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVectorViewShape.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVectorViewShape.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_UnaryFunction1DVectorViewShape_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DVectorViewShape_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction1DVectorViewShape___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DVectorViewShape___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction1DVectorViewShape_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DVectorViewShape_setIntegrationType(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction1DVectorViewShape_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DVectorViewShape_getIntegrationType(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/CurveNatureF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/CurveNatureF1D.cpp
index 37046f061b7..94d180e6cc8 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/CurveNatureF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/CurveNatureF1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_CurveNatureF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurveNatureF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurveNatureF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurveNatureF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_CurveNatureF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_CurveNatureF1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/Normal2DF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/Normal2DF1D.cpp
index eff9b48cc02..81e5a18cb2c 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/Normal2DF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/Normal2DF1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_Normal2DF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Normal2DF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Normal2DF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Normal2DF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_Normal2DF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_Normal2DF1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/Orientation2DF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/Orientation2DF1D.cpp
index 20cf0d51899..2d6cfed8575 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/Orientation2DF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/Orientation2DF1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_Orientation2DF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Orientation2DF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Orientation2DF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Orientation2DF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_Orientation2DF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_Orientation2DF1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/Orientation3DF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/Orientation3DF1D.cpp
index bb81f96636b..f416f2ace03 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/Orientation3DF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/Orientation3DF1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_Orientation3DF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Orientation3DF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Orientation3DF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Orientation3DF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_Orientation3DF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_Orientation3DF1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/DensityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/DensityF1D.cpp
index c8d47b2459d..861a94b7cd3 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/DensityF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/DensityF1D.cpp
@@ -1,8 +1,8 @@
-SWIGINTERN PyObject *_wrap_DensityF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_DensityF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_DensityF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_DensityF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/GetCompleteViewMapDensityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/GetCompleteViewMapDensityF1D.cpp
index dd701012a52..c8220604cb8 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/GetCompleteViewMapDensityF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/GetCompleteViewMapDensityF1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_GetCompleteViewMapDensityF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetCompleteViewMapDensityF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetCompleteViewMapDensityF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetCompleteViewMapDensityF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetCompleteViewMapDensityF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetCompleteViewMapDensityF1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/GetDirectionalViewMapDensityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/GetDirectionalViewMapDensityF1D.cpp
index eb6f4944493..b7c4e40fd82 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/GetDirectionalViewMapDensityF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/GetDirectionalViewMapDensityF1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_GetDirectionalViewMapDensityF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetDirectionalViewMapDensityF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetDirectionalViewMapDensityF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetDirectionalViewMapDensityF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetDirectionalViewMapDensityF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetDirectionalViewMapDensityF1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/LocalAverageDepthF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/LocalAverageDepthF1D.cpp
index 72de11c5fa4..6b9c687e9e0 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/LocalAverageDepthF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/LocalAverageDepthF1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_LocalAverageDepthF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_LocalAverageDepthF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_LocalAverageDepthF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_LocalAverageDepthF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_LocalAverageDepthF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_LocalAverageDepthF1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/Curvature2DAngleF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/Curvature2DAngleF1D.cpp
index 88d2c10e5a5..d2057990944 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/Curvature2DAngleF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/Curvature2DAngleF1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_Curvature2DAngleF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curvature2DAngleF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curvature2DAngleF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curvature2DAngleF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_Curvature2DAngleF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_Curvature2DAngleF1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedXF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedXF1D.cpp
index e61ee24e638..d7c8ace1bb2 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedXF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedXF1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_GetProjectedXF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetProjectedXF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetProjectedXF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetProjectedXF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetProjectedXF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetProjectedXF1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedYF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedYF1D.cpp
index 9e718a52d50..e567e07ba5a 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedYF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedYF1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_GetProjectedYF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetProjectedYF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetProjectedYF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetProjectedYF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetProjectedYF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetProjectedYF1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedZF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedZF1D.cpp
index d06dbf3e22d..b20ee1443e7 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedZF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedZF1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_GetProjectedZF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetProjectedZF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetProjectedZF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetProjectedZF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetProjectedZF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetProjectedZF1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetSteerableViewMapDensityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetSteerableViewMapDensityF1D.cpp
index 1b86998ad8e..21df4596b5e 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetSteerableViewMapDensityF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetSteerableViewMapDensityF1D.cpp
@@ -1,8 +1,8 @@
-SWIGINTERN PyObject *_wrap_GetSteerableViewMapDensityF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetSteerableViewMapDensityF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetSteerableViewMapDensityF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetSteerableViewMapDensityF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetViewMapGradientNormF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetViewMapGradientNormF1D.cpp
index 4dc575822be..bd5425450e8 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetViewMapGradientNormF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetViewMapGradientNormF1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_GetViewMapGradientNormF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetViewMapGradientNormF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetViewMapGradientNormF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetViewMapGradientNormF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetViewMapGradientNormF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetViewMapGradientNormF1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetXF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetXF1D.cpp
index 2a1b4a368dc..73b4df64df6 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetXF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetXF1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_GetXF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetXF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetXF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetXF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetXF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetXF1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetYF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetYF1D.cpp
index c63b097d650..36a1ffed9c6 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetYF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetYF1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_GetYF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetYF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetYF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetYF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetYF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetYF1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetZF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetZF1D.cpp
index c90b2827c38..ad0fc844a1c 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetZF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetZF1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_GetZF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetZF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetZF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetZF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetZF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetZF1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/ZDiscontinuityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/ZDiscontinuityF1D.cpp
index a546ba3a459..886607f7ca9 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/ZDiscontinuityF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/ZDiscontinuityF1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_ZDiscontinuityF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ZDiscontinuityF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ZDiscontinuityF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ZDiscontinuityF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ZDiscontinuityF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_ZDiscontinuityF1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned/QuantitativeInvisibilityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned/QuantitativeInvisibilityF1D.cpp
index af8855575b1..436b617886b 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned/QuantitativeInvisibilityF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned/QuantitativeInvisibilityF1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_QuantitativeInvisibilityF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_QuantitativeInvisibilityF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_QuantitativeInvisibilityF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_QuantitativeInvisibilityF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_QuantitativeInvisibilityF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_QuantitativeInvisibilityF1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetOccludeeF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetOccludeeF1D.cpp
index 2c64c360207..7df4ea835ca 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetOccludeeF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetOccludeeF1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_GetOccludeeF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetOccludeeF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetOccludeeF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetOccludeeF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetOccludeeF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetOccludeeF1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetOccludersF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetOccludersF1D.cpp
index 04031c34697..26c14fc4a81 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetOccludersF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetOccludersF1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_GetOccludersF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetOccludersF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetOccludersF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetOccludersF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetOccludersF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetOccludersF1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetShapeF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetShapeF1D.cpp
index 839850b298e..e1fd19d5d3b 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetShapeF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetShapeF1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_GetShapeF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetShapeF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetShapeF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetShapeF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetShapeF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetShapeF1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/ChainingTimeStampF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/ChainingTimeStampF1D.cpp
index db66d1526a8..daf3c773267 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/ChainingTimeStampF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/ChainingTimeStampF1D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_ChainingTimeStampF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ChainingTimeStampF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ChainingTimeStampF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ChainingTimeStampF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ChainingTimeStampF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_ChainingTimeStampF1D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ChainingTimeStampF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_ChainingTimeStampF1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/IncrementChainingTimeStampF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/IncrementChainingTimeStampF1D.cpp
index 0a9052e4fab..291d180a3fe 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/IncrementChainingTimeStampF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/IncrementChainingTimeStampF1D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_IncrementChainingTimeStampF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_IncrementChainingTimeStampF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_IncrementChainingTimeStampF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_IncrementChainingTimeStampF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_IncrementChainingTimeStampF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_IncrementChainingTimeStampF1D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_IncrementChainingTimeStampF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_IncrementChainingTimeStampF1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/TimeStampF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/TimeStampF1D.cpp
index 27a6274940e..8df3b712a30 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/TimeStampF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/TimeStampF1D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_TimeStampF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TimeStampF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TimeStampF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TimeStampF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_TimeStampF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_TimeStampF1D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_TimeStampF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_TimeStampF1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1DVoid.cpp b/source/blender/freestyle/intern/python/UnaryFunction1DVoid.cpp
index 5962613d088..13c8a088dfb 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1DVoid.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1DVoid.cpp
@@ -1,20 +1,20 @@
-SWIGINTERN PyObject *_wrap_UnaryFunction1DVoid_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DVoid_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction1DVoid___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DVoid___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction1DVoid_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DVoid_setIntegrationType(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction1DVoid_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DVoid_getIntegrationType(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_disown_UnaryFunction1DVoid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_disown_UnaryFunction1DVoid(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate0D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate0D.cpp
index 0619e4d5bd0..7c67de86079 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate0D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_UnaryPredicate0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryPredicate0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryPredicate0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryPredicate0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_disown_UnaryPredicate0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_disown_UnaryPredicate0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate0D/FalseUP0D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate0D/FalseUP0D.cpp
index 5747ad1e6ea..53930660f3f 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate0D/FalseUP0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate0D/FalseUP0D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_FalseUP0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FalseUP0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FalseUP0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FalseUP0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_FalseUP0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_FalseUP0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate0D/TrueUP0D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate0D/TrueUP0D.cpp
index 897ebd8ba90..776e49b5d77 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate0D/TrueUP0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate0D/TrueUP0D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_TrueUP0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TrueUP0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TrueUP0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TrueUP0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_TrueUP0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_TrueUP0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D.cpp
index a786c172563..0f2b5c4ad3a 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_UnaryPredicate1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryPredicate1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryPredicate1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryPredicate1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_disown_UnaryPredicate1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_disown_UnaryPredicate1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/ContourUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/ContourUP1D.cpp
index d7a22ab9286..89ba9f3f683 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/ContourUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/ContourUP1D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_ContourUP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ContourUP1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ContourUP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ContourUP1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ContourUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_ContourUP1D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ContourUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_ContourUP1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/DensityLowerThanUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/DensityLowerThanUP1D.cpp
index dc9ec4ee5bf..664d73d59c1 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/DensityLowerThanUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/DensityLowerThanUP1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_DensityLowerThanUP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_DensityLowerThanUP1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_DensityLowerThanUP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_DensityLowerThanUP1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_DensityLowerThanUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_DensityLowerThanUP1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/EqualToChainingTimeStampUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/EqualToChainingTimeStampUP1D.cpp
index a8a185a51fc..7cd9c17a99b 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/EqualToChainingTimeStampUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/EqualToChainingTimeStampUP1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_EqualToChainingTimeStampUP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_EqualToChainingTimeStampUP1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_EqualToChainingTimeStampUP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_EqualToChainingTimeStampUP1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_EqualToChainingTimeStampUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_EqualToChainingTimeStampUP1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/EqualToTimeStampUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/EqualToTimeStampUP1D.cpp
index b8083f3528e..d6925dd2b44 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/EqualToTimeStampUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/EqualToTimeStampUP1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_EqualToTimeStampUP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_EqualToTimeStampUP1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_EqualToTimeStampUP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_EqualToTimeStampUP1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_EqualToTimeStampUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_EqualToTimeStampUP1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/ExternalContourUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/ExternalContourUP1D.cpp
index 8cdabb068ca..9107f0fe326 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/ExternalContourUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/ExternalContourUP1D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_ExternalContourUP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ExternalContourUP1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ExternalContourUP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ExternalContourUP1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ExternalContourUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_ExternalContourUP1D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ExternalContourUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_ExternalContourUP1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/FalseUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/FalseUP1D.cpp
index df1a53373c1..6164463a3af 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/FalseUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/FalseUP1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_FalseUP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FalseUP1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FalseUP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FalseUP1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_FalseUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_FalseUP1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/QuantitativeInvisibilityUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/QuantitativeInvisibilityUP1D.cpp
index 0fb10c1f36c..fc538008446 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/QuantitativeInvisibilityUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/QuantitativeInvisibilityUP1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_QuantitativeInvisibilityUP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_QuantitativeInvisibilityUP1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_QuantitativeInvisibilityUP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_QuantitativeInvisibilityUP1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_QuantitativeInvisibilityUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_QuantitativeInvisibilityUP1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/ShapeUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/ShapeUP1D.cpp
index 752665b4aae..4ec5cc13b3a 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/ShapeUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/ShapeUP1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_ShapeUP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ShapeUP1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ShapeUP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ShapeUP1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ShapeUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_ShapeUP1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/TrueUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/TrueUP1D.cpp
index 2b4584c01de..7c8e0a6239d 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/TrueUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/TrueUP1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_TrueUP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TrueUP1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TrueUP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TrueUP1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_TrueUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_TrueUP1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator.cpp b/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator.cpp
index 53dbfc9b320..18ab37aeecd 100644
--- a/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator.cpp
+++ b/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator.cpp
@@ -1,36 +1,36 @@
-SWIGINTERN PyObject *_wrap_ChainingIterator_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ChainingIterator_getExactTypeName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ChainingIterator_init(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ChainingIterator_init(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ChainingIterator_traverse(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ChainingIterator_traverse(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ChainingIterator_getVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ChainingIterator_getVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ChainingIterator_isIncrementing(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ChainingIterator_isIncrementing(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ChainingIterator_increment(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ChainingIterator_increment(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ChainingIterator_decrement(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ChainingIterator_decrement(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ChainingIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_ChainingIterator(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_disown_ChainingIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_disown_ChainingIterator(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/ChainPredicateIterator.cpp b/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/ChainPredicateIterator.cpp
index 2f4c5645b47..3b3b4433e59 100644
--- a/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/ChainPredicateIterator.cpp
+++ b/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/ChainPredicateIterator.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_ChainPredicateIterator_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ChainPredicateIterator_getExactTypeName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ChainPredicateIterator_traverse(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ChainPredicateIterator_traverse(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_disown_ChainPredicateIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_disown_ChainPredicateIterator(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/ChainSilhouetteIterator.cpp b/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/ChainSilhouetteIterator.cpp
index 20a4a5d7c46..53d37c1578c 100644
--- a/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/ChainSilhouetteIterator.cpp
+++ b/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/ChainSilhouetteIterator.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_ChainSilhouetteIterator_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ChainSilhouetteIterator_getExactTypeName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ChainSilhouetteIterator_traverse(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ChainSilhouetteIterator_traverse(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ChainSilhouetteIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_ChainSilhouetteIterator(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_disown_ChainSilhouetteIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_disown_ChainSilhouetteIterator(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/ViewMap.cpp b/source/blender/freestyle/intern/python/ViewMap.cpp
index ecd3fe21e44..24a986b3885 100644
--- a/source/blender/freestyle/intern/python/ViewMap.cpp
+++ b/source/blender/freestyle/intern/python/ViewMap.cpp
@@ -1,104 +1,104 @@
-SWIGINTERN PyObject *_wrap_ViewMap_userdata_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_userdata_set(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_userdata_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_userdata_get(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ViewMap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_ViewMap(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ViewMap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_ViewMap(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_GetClosestViewEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_GetClosestViewEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_GetClosestFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_GetClosestFEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_getInstance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_getInstance(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_ViewShapes(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_ViewShapes(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_ViewEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_ViewEdges(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_ViewVertices(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_ViewVertices(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_FEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_FEdges(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_SVertices(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_SVertices(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_viewedges_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_viewedges_begin(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_viewedges_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_viewedges_end(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_viewedges_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_viewedges_size(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_viewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_viewShape(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_shapeIdToIndexMap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_shapeIdToIndexMap(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_getScene3dBBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_getScene3dBBox(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_AddViewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_AddViewShape(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_AddViewEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_AddViewEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_AddViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_AddViewVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_AddFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_AddFEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_AddSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_AddSVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_setScene3dBBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_setScene3dBBox(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_CreateTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_CreateTVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_InsertViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_InsertViewVertex(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/ViewShape.cpp b/source/blender/freestyle/intern/python/ViewShape.cpp
index f95e0f829b0..023ce06f44f 100644
--- a/source/blender/freestyle/intern/python/ViewShape.cpp
+++ b/source/blender/freestyle/intern/python/ViewShape.cpp
@@ -1,88 +1,88 @@
-SWIGINTERN PyObject *_wrap_ViewShape_userdata_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewShape_userdata_set(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShape_userdata_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewShape_userdata_get(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ViewShape__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_ViewShape__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ViewShape__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_ViewShape__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ViewShape__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_ViewShape__SWIG_2(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ViewShape(PyObject *self, PyObject *args) {
+ PyObject *_wrap_new_ViewShape(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShape_dupplicate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewShape_dupplicate(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ViewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_ViewShape(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShape_SplitEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewShape_SplitEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShape_sshape__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewShape_sshape__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShape_sshape__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewShape_sshape__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShape_sshape(PyObject *self, PyObject *args) {
+ PyObject *_wrap_ViewShape_sshape(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShape_vertices(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewShape_vertices(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShape_edges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewShape_edges(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShape_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewShape_getId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShape_SetSShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewShape_SetSShape(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShape_SetVertices(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewShape_SetVertices(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShape_SetEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewShape_SetEdges(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShape_AddVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewShape_AddVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShape_AddEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewShape_AddEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShape_RemoveEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewShape_RemoveEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShape_RemoveVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewShape_RemoveVertex(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/python/SConscript b/source/blender/python/SConscript
index 481fdcbe13e..8612a9d6ca9 100644
--- a/source/blender/python/SConscript
+++ b/source/blender/python/SConscript
@@ -4,7 +4,7 @@ Import ('env')
 sources = Split('BPY_interface.c BPY_menus.c') + env.Glob('api2_2x/*.c')
 
 incs = 'api2_2x ../blenkernel ../nodes ../blenlib ../blenloader'
-incs += ' ../render/extern/include ../radiosity/extern/include'
+incs += ' ../render/extern/include ../radiosity/extern/include ../freestyle/intern/python'
 incs += ' ../makesdna #intern/guardedalloc #intern/bmfont ../imbuf ../include'
 incs += ' ' + env['BF_PYTHON_INC']
 incs += ' ' + env['BF_OPENGL_INC']
diff --git a/source/blender/python/api2_2x/Blender.c b/source/blender/python/api2_2x/Blender.c
index d8385c1d660..633badb759d 100644
--- a/source/blender/python/api2_2x/Blender.c
+++ b/source/blender/python/api2_2x/Blender.c
@@ -97,6 +97,7 @@ struct ID; /*keep me up here */
 #include "World.h"
 #include "Types.h"
 #include "Particle.h"
+#include "Freestyle.h"
 
 /**********************************************************/
 /* Python API function prototypes for the Blender module.	*/
@@ -1095,4 +1096,5 @@ void M_Blender_Init(void)
 	PyDict_SetItemString(dict, "Window", Window_Init());
 	PyDict_SetItemString(dict, "World", World_Init());
 
+	PyDict_SetItemString(dict, "Freestyle", Freestyle_Init());
 }
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 93d2c12cbbe..888eca414d0 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -1621,7 +1621,7 @@ void RE_TileProcessor(Render *re, int firsttile, int threaded)
 
 static void do_render_3d(Render *re)
 {
-	RenderLayer *rl;
+
 //	re->cfra= cfra;	/* <- unused! */
 	
 	/* make render verts/faces/halos/lamps */

From 8398730043faeb9af860ca7a408a5a4ba49b46f1 Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Sat, 12 Jul 2008 05:02:47 +0000
Subject: [PATCH 084/252] soc-2008-mxcurioni: merge with trunk - rev 15540

---
 intern/ghost/intern/GHOST_SystemWin32.cpp     |   9 +
 intern/moto/include/GEN_Map.h                 |  18 ++
 .../blender/blenlib/BLI_blenlib.vcproj        |   6 +
 .../blender/blenkernel/BKE_bmeshCustomData.h  |   4 +-
 source/blender/blenkernel/BKE_customdata.h    |   6 +
 .../blenkernel/intern/BME_Customdata.c        |   9 +-
 .../blenkernel/intern/BME_conversions.c       | 271 ++++++++++++++++--
 source/blender/blenkernel/intern/BME_eulers.c |  14 +-
 .../blender/blenkernel/intern/BME_structure.c |   1 -
 source/blender/blenkernel/intern/BME_tools.c  |  82 +++++-
 .../blender/blenkernel/intern/DerivedMesh.c   |   2 +-
 source/blender/blenkernel/intern/customdata.c | 117 +++++++-
 source/blender/blenkernel/intern/library.c    |  60 ++--
 source/blender/blenkernel/intern/modifier.c   |   2 +-
 source/blender/blenkernel/intern/particle.c   |   2 +-
 .../blenkernel/intern/particle_system.c       |  10 +-
 source/blender/blenkernel/intern/pointcache.c |  16 +-
 source/blender/blenlib/BLI_mempool.h          |   4 +-
 source/blender/blenlib/intern/BLI_kdopbvh.c   |   2 +
 source/blender/blenlib/intern/BLI_mempool.c   |  13 +-
 source/blender/blenlib/intern/storage.c       |   1 +
 source/blender/blenlib/intern/util.c          |   1 +
 .../imbuf/intern/openexr/openexr_api.cpp      |  41 ++-
 source/blender/include/BDR_drawobject.h       |   1 +
 source/blender/include/BIF_editarmature.h     |   2 +-
 source/blender/include/BSE_sequence.h         |   2 +
 source/blender/makesdna/DNA_actuator_types.h  |  10 +-
 source/blender/makesdna/DNA_space_types.h     |  11 +-
 .../nodes/intern/CMP_nodes/CMP_gamma.c        |   2 +-
 source/blender/python/api2_2x/sceneSequence.c |  74 ++++-
 .../radiosity/intern/source/radrender.c       |  15 +-
 .../render/intern/source/convertblender.c     |   1 +
 source/blender/src/buttons_logic.c            |  98 ++++---
 source/blender/src/buttons_object.c           |   2 +-
 source/blender/src/buttons_scene.c            |   2 +-
 source/blender/src/buttons_shading.c          |   6 +-
 source/blender/src/drawarmature.c             |  17 +-
 source/blender/src/drawimage.c                |   2 +-
 source/blender/src/drawobject.c               |   8 +-
 source/blender/src/drawview.c                 |   4 +-
 source/blender/src/editarmature.c             |  51 +++-
 source/blender/src/editmesh_add.c             |  18 +-
 source/blender/src/editnla.c                  |  35 ++-
 source/blender/src/editsima.c                 |  16 +-
 source/blender/src/edittime.c                 |   4 +-
 source/blender/src/header_image.c             |  23 +-
 source/blender/src/header_view3d.c            |  15 +-
 source/blender/src/sequence.c                 |  10 +
 source/blender/src/space.c                    |  21 +-
 source/blender/src/transform_conversions.c    |   9 +-
 source/blender/src/usiblender.c               |   2 +
 source/blender/src/view.c                     |   2 +-
 source/blender/src/vpaint.c                   |  36 +--
 .../BlenderRoutines/KX_BlenderGL.cpp          |   2 +-
 .../Converter/BL_ActionActuator.cpp           |  32 ++-
 .../gameengine/Converter/BL_ActionActuator.h  |   5 +
 .../Converter/BL_BlenderDataConversion.cpp    | 121 ++++----
 .../gameengine/Converter/BL_MeshDeformer.cpp  | 164 ++++++-----
 source/gameengine/Converter/BL_MeshDeformer.h |  14 +-
 .../gameengine/Converter/BL_ShapeDeformer.h   |  11 +-
 .../gameengine/Converter/BL_SkinDeformer.cpp  |  53 ++--
 source/gameengine/Converter/BL_SkinDeformer.h |   6 +-
 .../Converter/BL_SkinMeshObject.cpp           |  84 ------
 .../gameengine/Converter/BL_SkinMeshObject.h  |  94 ------
 .../Converter/KX_ConvertActuators.cpp         |   8 +-
 source/gameengine/Expressions/PyObjectPlus.h  |  32 ++-
 .../GameLogic/SCA_ActuatorSensor.cpp          |   2 +-
 source/gameengine/GameLogic/SCA_IActuator.h   |   1 +
 source/gameengine/GameLogic/SCA_IObject.cpp   |   8 +-
 source/gameengine/GameLogic/SCA_IObject.h     |  15 +
 source/gameengine/GameLogic/SCA_ISensor.h     |   2 +
 source/gameengine/Ketsji/BL_BlenderShader.cpp |  80 ++++--
 source/gameengine/Ketsji/BL_BlenderShader.h   |  15 +-
 source/gameengine/Ketsji/BL_Material.cpp      |   6 +-
 source/gameengine/Ketsji/BL_Material.h        |   7 +-
 .../gameengine/Ketsji/KX_BlenderMaterial.cpp  | 100 +++++--
 source/gameengine/Ketsji/KX_BlenderMaterial.h |   2 +
 source/gameengine/Ketsji/KX_GameObject.cpp    |  92 +++---
 source/gameengine/Ketsji/KX_GameObject.h      |  17 +-
 .../gameengine/Ketsji/KX_IPO_SGController.cpp |  87 ++++--
 .../gameengine/Ketsji/KX_IPO_SGController.h   |   7 +-
 source/gameengine/Ketsji/KX_IpoActuator.cpp   | 171 +++++------
 source/gameengine/Ketsji/KX_IpoActuator.h     |  12 +-
 source/gameengine/Ketsji/KX_KetsjiEngine.cpp  |  46 ++-
 source/gameengine/Ketsji/KX_KetsjiEngine.h    |   1 +
 source/gameengine/Ketsji/KX_Light.cpp         |  80 +++++-
 source/gameengine/Ketsji/KX_Light.h           |  16 +-
 .../gameengine/Ketsji/KX_ParentActuator.cpp   |   6 +
 source/gameengine/Ketsji/KX_Scene.cpp         |  43 +--
 source/gameengine/Ketsji/KX_Scene.h           |   8 +-
 .../Ketsji/KX_TouchEventManager.cpp           |  16 +-
 source/gameengine/PyDoc/BL_ActionActuator.py  |  15 +
 .../Rasterizer/RAS_BucketManager.cpp          |   2 +-
 .../Rasterizer/RAS_IPolygonMaterial.cpp       |  16 ++
 .../Rasterizer/RAS_IPolygonMaterial.h         |   2 +
 .../gameengine/Rasterizer/RAS_IRasterizer.h   |  59 ++--
 .../Rasterizer/RAS_MaterialBucket.cpp         |  53 ++--
 .../Rasterizer/RAS_MaterialBucket.h           |  10 +-
 .../gameengine/Rasterizer/RAS_MeshObject.cpp  |  63 ++--
 source/gameengine/Rasterizer/RAS_MeshObject.h |   6 +-
 .../RAS_ListRasterizer.cpp                    |  25 +-
 .../RAS_OpenGLRasterizer/RAS_ListRasterizer.h |   8 +-
 .../RAS_OpenGLRasterizer.cpp                  | 102 ++-----
 .../RAS_OpenGLRasterizer.h                    |  10 +-
 .../RAS_VAOpenGLRasterizer.cpp                |  94 +++---
 .../RAS_VAOpenGLRasterizer.h                  |   8 +-
 source/gameengine/Rasterizer/RAS_TexVert.cpp  |  42 +--
 source/gameengine/Rasterizer/RAS_TexVert.h    |  24 +-
 source/gameengine/SceneGraph/SG_Controller.h  |   4 +-
 source/kernel/gen_system/GEN_HashedPtr.h      |   1 +
 source/kernel/gen_system/GEN_Map.h            |  18 ++
 tools/Blender.py                              |  27 +-
 112 files changed, 2057 insertions(+), 1188 deletions(-)

diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp
index 82a76b3c706..293f8fc1661 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.cpp
+++ b/intern/ghost/intern/GHOST_SystemWin32.cpp
@@ -302,6 +302,15 @@ GHOST_TSuccess GHOST_SystemWin32::init()
 {
 	GHOST_TSuccess success = GHOST_System::init();
 
+	/* Disable scaling on high DPI displays on Vista */
+	HMODULE user32 = ::LoadLibraryA("user32.dll");
+	typedef BOOL (WINAPI * LPFNSETPROCESSDPIAWARE)();
+	LPFNSETPROCESSDPIAWARE SetProcessDPIAware =
+		(LPFNSETPROCESSDPIAWARE)GetProcAddress(user32, "SetProcessDPIAware");
+	if (SetProcessDPIAware)
+		SetProcessDPIAware();
+	FreeLibrary(user32);
+
 	// Determine whether this system has a high frequency performance counter. */
 	m_hasPerformanceCounter = ::QueryPerformanceFrequency((LARGE_INTEGER*)&m_freq) == TRUE;
 	if (m_hasPerformanceCounter) {
diff --git a/intern/moto/include/GEN_Map.h b/intern/moto/include/GEN_Map.h
index db3335d6110..9f56924419e 100644
--- a/intern/moto/include/GEN_Map.h
+++ b/intern/moto/include/GEN_Map.h
@@ -82,6 +82,24 @@ public:
         }
         return 0;
     }
+
+    Key* getKey(int index) {
+        int count=0;
+        for (int i=0;i<m_num_buckets;i++)
+        {
+            Entry* bucket = m_buckets[i];
+            while(bucket)
+            {
+                if (count==index)
+                {
+                    return &bucket->m_key;
+                }
+                bucket = bucket->m_next;
+                count++;
+            }
+        }
+        return 0;
+    }
     
     void clear() {
         for (int i = 0; i < m_num_buckets; ++i) {
diff --git a/projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj b/projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj
index 34c195cf23d..0dfbcaa5577 100644
--- a/projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj
+++ b/projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj
@@ -358,6 +358,9 @@
 			<File
 				RelativePath="..\..\..\source\blender\blenlib\intern\BLI_memarena.c">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\blenlib\intern\BLI_mempool.c">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\blenlib\intern\boxpack2d.c">
 			</File>
@@ -473,6 +476,9 @@
 			<File
 				RelativePath="..\..\..\source\blender\blenlib\BLI_memarena.h">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\blenlib\BLI_mempool.h">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\blenlib\intern\BLI_scanfill.h">
 			</File>
diff --git a/source/blender/blenkernel/BKE_bmeshCustomData.h b/source/blender/blenkernel/BKE_bmeshCustomData.h
index 423f75e532d..4f5f2641f54 100644
--- a/source/blender/blenkernel/BKE_bmeshCustomData.h
+++ b/source/blender/blenkernel/BKE_bmeshCustomData.h
@@ -38,7 +38,7 @@
 #ifndef BKE_BMESHCUSTOMDATA_H
 #define BKE_BMESHCUSTOMDATA_H
 
-struct BME_mempool;
+struct BLI_mempool;
 
 /*Custom Data Types and defines
 	Eventual plan is to move almost everything to custom data and let caller
@@ -62,7 +62,7 @@ typedef struct BME_CustomDataLayer {
 
 typedef struct BME_CustomData {
 	struct BME_CustomDataLayer *layers;	/*Custom Data Layers*/
-	struct BME_mempool *pool;				/*pool for alloc of blocks*/
+	struct BLI_mempool *pool;				/*pool for alloc of blocks*/
 	int totlayer, totsize;         	/*total layers and total size in bytes of each block*/
 } BME_CustomData;
 
diff --git a/source/blender/blenkernel/BKE_customdata.h b/source/blender/blenkernel/BKE_customdata.h
index 81c2e4a4b94..e84c7d30956 100644
--- a/source/blender/blenkernel/BKE_customdata.h
+++ b/source/blender/blenkernel/BKE_customdata.h
@@ -41,6 +41,7 @@ extern const CustomDataMask CD_MASK_MESH;
 extern const CustomDataMask CD_MASK_EDITMESH;
 extern const CustomDataMask CD_MASK_DERIVEDMESH;
 extern const CustomDataMask CD_MASK_BMESH;
+extern const CustomDataMask CD_MASK_FACECORNERS;
 
 /* for ORIGINDEX layer type, indicates no original index for this element */
 #define ORIGINDEX_NONE -1
@@ -264,4 +265,9 @@ void CustomData_set_layer_unique_name(struct CustomData *data, int index);
 /* for file reading compatibility, returns false if the layer was freed,
    only after this test passes, layer->data should be assigned */
 int CustomData_verify_versions(struct CustomData *data, int index);
+
+/*BMesh specific customdata stuff*/
+void CustomData_to_bmeshpoly(struct CustomData *fdata, struct CustomData *pdata, struct CustomData *ldata);
+void CustomData_from_bmeshpoly(struct CustomData *fdata, struct CustomData *pdata, struct CustomData *ldata, int total);
+void CustomData_bmesh_init_pool(struct CustomData *data, int allocsize);
 #endif
diff --git a/source/blender/blenkernel/intern/BME_Customdata.c b/source/blender/blenkernel/intern/BME_Customdata.c
index 8b48efbdbd2..1fc8a4071dc 100644
--- a/source/blender/blenkernel/intern/BME_Customdata.c
+++ b/source/blender/blenkernel/intern/BME_Customdata.c
@@ -40,6 +40,7 @@
 #include "bmesh_private.h"
 #include <string.h>
 #include "MEM_guardedalloc.h"
+#include "BLI_mempool.h"
 
 /********************* Layer type information **********************/
 typedef struct BME_LayerTypeInfo {
@@ -83,7 +84,7 @@ void BME_CD_Create(BME_CustomData *data, BME_CustomDataInit *init, int initalloc
 	if(data->totlayer){
 		/*alloc memory*/
 		data->layers = MEM_callocN(sizeof(BME_CustomDataLayer)*data->totlayer, "BMesh Custom Data Layers");
-		data->pool = BME_mempool_create(data->totsize, initalloc, initalloc);
+		data->pool = BLI_mempool_create(data->totsize, initalloc, initalloc);
 		/*initialize layer data*/
 		for(i=0; i < BME_CD_NUMTYPES; i++){
 			if(init->layout[i]){
@@ -102,7 +103,7 @@ void BME_CD_Create(BME_CustomData *data, BME_CustomDataInit *init, int initalloc
 
 void BME_CD_Free(BME_CustomData *data)
 {
-	if(data->pool) BME_mempool_destroy(data->pool);
+	if(data->pool) BLI_mempool_destroy(data->pool);
 }
 
 /*Block level ops*/
@@ -119,7 +120,7 @@ void BME_CD_free_block(BME_CustomData *data, void **block)
 			typeInfo->free((char*)*block + offset, 1, typeInfo->size);
 		}
 	}
-	BME_mempool_free(data->pool, *block);
+	BLI_mempool_free(data->pool, *block);
 	*block = NULL;
 }
 
@@ -130,7 +131,7 @@ static void BME_CD_alloc_block(BME_CustomData *data, void **block)
 	if (*block) BME_CD_free_block(data, block); //if we copy layers that have their own free functions like deformverts
 	
 	if (data->totsize > 0)
-		*block = BME_mempool_alloc(data->pool);	
+		*block = BLI_mempool_alloc(data->pool);	
 	else
 		*block = NULL;
 }
diff --git a/source/blender/blenkernel/intern/BME_conversions.c b/source/blender/blenkernel/intern/BME_conversions.c
index 7952546de7c..daf0de5b748 100644
--- a/source/blender/blenkernel/intern/BME_conversions.c
+++ b/source/blender/blenkernel/intern/BME_conversions.c
@@ -55,14 +55,200 @@
 #include "bmesh_private.h"
 
 #include "BSE_edit.h"
-/*Converts an EditMesh to a BME_Mesh.*/
-static void bmesh_init_cdPool(CustomData *data, int allocsize){
-	if(data->totlayer)data->pool = BLI_mempool_create(data->totsize, allocsize, allocsize);
+
+/*merge these functions*/
+static void BME_DMcorners_to_loops(BME_Mesh *bm, CustomData *facedata, int index, BME_Poly *f, int numCol, int numTex){
+	int i, j;
+	BME_Loop *l;
+	MTFace *texface;
+	MTexPoly *texpoly;
+	MCol *mcol;
+	MLoopCol *mloopcol;
+	MLoopUV *mloopuv;
+
+	for(i=0; i< numTex; i++){
+		texface = CustomData_get_layer_n(facedata, CD_MTFACE, i);
+		texpoly = CustomData_bmesh_get_n(&bm->pdata, f->data, CD_MTEXPOLY, i);
+
+		texpoly->tpage = texface[index].tpage;
+		texpoly->flag = texface[index].flag;
+		texpoly->transp = texface[index].transp;
+		texpoly->mode = texface[index].mode;
+		texpoly->tile = texface[index].tile;
+		texpoly->unwrap = texface[index].unwrap;
+
+		j = 0;
+		l = f->loopbase;
+		do{
+			mloopuv = CustomData_bmesh_get_n(&bm->ldata, l->data, CD_MLOOPUV, i);
+			mloopuv->uv[0] = texface[index].uv[j][0];
+			mloopuv->uv[1] = texface[index].uv[j][1];
+			j++;
+			l = l->next;
+		}while(l!=f->loopbase);
+	}
+
+	for(i=0; i < numCol; i++){
+		mcol = CustomData_get_layer_n(facedata, CD_MCOL, i);
+		j = 0;
+		l = f->loopbase;
+		do{
+			mloopcol = CustomData_bmesh_get_n(&bm->ldata, l->data, CD_MLOOPCOL, i);
+			mloopcol->r = mcol[(index*4)+j].r;
+			mloopcol->g = mcol[(index*4)+j].g;
+			mloopcol->b = mcol[(index*4)+j].b;
+			mloopcol->a = mcol[(index*4)+j].a;
+			j++;
+			l = l->next;
+		}while(l!=f->loopbase);
+	}
 }
 
+static void BME_DMloops_to_corners(BME_Mesh *bm, CustomData *facedata, int index, BME_Poly *f,int numCol, int numTex){
+	int i, j;
+	BME_Loop *l;
+	MTFace *texface;
+	MTexPoly *texpoly;
+	MCol *mcol;
+	MLoopCol *mloopcol;
+	MLoopUV *mloopuv;
+
+	for(i=0; i < numTex; i++){
+		texface = CustomData_get_layer_n(facedata, CD_MTFACE, i);
+		texpoly = CustomData_bmesh_get_n(&bm->pdata, f->data, CD_MTEXPOLY, i);
+		
+		texface[index].tpage = texpoly->tpage;
+		texface[index].flag = texpoly->flag;
+		texface[index].transp = texpoly->transp;
+		texface[index].mode = texpoly->mode;
+		texface[index].tile = texpoly->tile;
+		texface[index].unwrap = texpoly->unwrap;
+
+		j = 0;
+		l = f->loopbase;
+		do{
+			mloopuv = CustomData_bmesh_get_n(&bm->ldata, l->data, CD_MLOOPUV, i);
+			texface[index].uv[j][0] = mloopuv->uv[0];
+			texface[index].uv[j][1] = mloopuv->uv[1];
+			j++;
+			l = l->next;
+		}while(l!=f->loopbase);
+
+	}
+	for(i=0; i < numCol; i++){
+		mcol = CustomData_get_layer_n(facedata,CD_MCOL, i);
+		j = 0;
+		l = f->loopbase;
+		do{
+			mloopcol = CustomData_bmesh_get_n(&bm->ldata, l->data, CD_MLOOPCOL, i);
+			mcol[(index*4) + j].r = mloopcol->r;
+			mcol[(index*4) + j].g = mloopcol->g;
+			mcol[(index*4) + j].b = mloopcol->b;
+			mcol[(index*4) + j].a = mloopcol->a;
+			j++;
+			l = l->next;
+		}while(l!=f->loopbase);
+	}
+}
+
+
+static void BME_corners_to_loops(BME_Mesh *bm, CustomData *facedata, void *face_block, BME_Poly *f,int numCol, int numTex){
+	int i, j;
+	BME_Loop *l;
+	MTFace *texface;
+	MTexPoly *texpoly;
+	MCol *mcol;
+	MLoopCol *mloopcol;
+	MLoopUV *mloopuv;
+
+	for(i=0; i < numTex; i++){
+		texface = CustomData_em_get_n(facedata, face_block, CD_MTFACE, i);
+		texpoly = CustomData_bmesh_get_n(&bm->pdata, f->data, CD_MTEXPOLY, i);
+		
+		texpoly->tpage = texface->tpage;
+		texpoly->flag = texface->flag;
+		texpoly->transp = texface->transp;
+		texpoly->mode = texface->mode;
+		texpoly->tile = texface->tile;
+		texpoly->unwrap = texface->unwrap;
+
+		j = 0;
+		l = f->loopbase;
+		do{
+			mloopuv = CustomData_bmesh_get_n(&bm->ldata, l->data, CD_MLOOPUV, i);
+			mloopuv->uv[0] = texface->uv[j][0];
+			mloopuv->uv[1] = texface->uv[j][1];
+			j++;
+			l = l->next;
+		}while(l!=f->loopbase);
+
+	}
+	for(i=0; i < numCol; i++){
+		mcol = CustomData_em_get_n(facedata, face_block, CD_MCOL, i);
+		j = 0;
+		l = f->loopbase;
+		do{
+			mloopcol = CustomData_bmesh_get_n(&bm->ldata, l->data, CD_MLOOPCOL, i);
+			mloopcol->r = mcol[j].r;
+			mloopcol->g = mcol[j].g;
+			mloopcol->b = mcol[j].b;
+			mloopcol->a = mcol[j].a;
+			j++;
+			l = l->next;
+		}while(l!=f->loopbase);
+	}
+}
+
+static void BME_loops_to_corners(BME_Mesh *bm, CustomData *facedata, void *face_block, BME_Poly *f,int numCol, int numTex){
+	int i, j;
+	BME_Loop *l;
+	MTFace *texface;
+	MTexPoly *texpoly;
+	MCol *mcol;
+	MLoopCol *mloopcol;
+	MLoopUV *mloopuv;
+
+	for(i=0; i < numTex; i++){
+		texface = CustomData_em_get_n(facedata, face_block, CD_MTFACE, i);
+		texpoly = CustomData_bmesh_get_n(&bm->pdata, f->data, CD_MTEXPOLY, i);
+		
+		texface->tpage = texpoly->tpage;
+		texface->flag = texpoly->flag;
+		texface->transp = texpoly->transp;
+		texface->mode = texpoly->mode;
+		texface->tile = texpoly->tile;
+		texface->unwrap = texpoly->unwrap;
+
+		j = 0;
+		l = f->loopbase;
+		do{
+			mloopuv = CustomData_bmesh_get_n(&bm->ldata, l->data, CD_MLOOPUV, i);
+			texface->uv[j][0] = mloopuv->uv[0];
+			texface->uv[j][1] = mloopuv->uv[1];
+			j++;
+			l = l->next;
+		}while(l!=f->loopbase);
+
+	}
+	for(i=0; i < numCol; i++){
+		mcol = CustomData_em_get_n(facedata, face_block, CD_MCOL, i);
+		j = 0;
+		l = f->loopbase;
+		do{
+			mloopcol = CustomData_bmesh_get_n(&bm->ldata, l->data, CD_MLOOPCOL, i);
+			mcol[j].r = mloopcol->r;
+			mcol[j].g = mloopcol->g;
+			mcol[j].b = mloopcol->b;
+			mcol[j].a = mloopcol->a;
+			j++;
+			l = l->next;
+		}while(l!=f->loopbase);
+	}
+}
+/*move the EditMesh conversion functions to editmesh_tools.c*/
 BME_Mesh *BME_editmesh_to_bmesh(EditMesh *em) {
 	BME_Mesh *bm;
-	int allocsize[4] = {512,512,2048,512};
+	int allocsize[4] = {512,512,2048,512}, numTex, numCol;
 	BME_Vert *v1, *v2;
 	BME_Edge *e, *edar[4];
 	BME_Poly *f;
@@ -74,8 +260,21 @@ BME_Mesh *BME_editmesh_to_bmesh(EditMesh *em) {
 	int len;
 	bm = BME_make_mesh(allocsize);
 
+	/*copy custom data layout*/
 	CustomData_copy(&em->vdata, &bm->vdata, CD_MASK_BMESH, CD_CALLOC, 0);
-	bmesh_init_cdPool(&bm->vdata, allocsize[0]);
+	CustomData_copy(&em->edata, &bm->edata, CD_MASK_BMESH, CD_CALLOC, 0);
+	CustomData_copy(&em->fdata, &bm->pdata, CD_MASK_BMESH, CD_CALLOC, 0);
+
+	/*copy face corner data*/
+	CustomData_to_bmeshpoly(&em->fdata, &bm->pdata, &bm->ldata);
+	/*initialize memory pools*/
+	CustomData_bmesh_init_pool(&bm->vdata, allocsize[0]);
+	CustomData_bmesh_init_pool(&bm->edata, allocsize[1]);
+	CustomData_bmesh_init_pool(&bm->ldata, allocsize[2]);
+	CustomData_bmesh_init_pool(&bm->pdata, allocsize[3]);
+	/*needed later*/
+	numTex = CustomData_number_of_layers(&bm->pdata, CD_MTEXPOLY);
+	numCol = CustomData_number_of_layers(&bm->ldata, CD_MLOOPCOL);
 
 	BME_model_begin(bm);
 	/*add verts*/
@@ -86,7 +285,6 @@ BME_Mesh *BME_editmesh_to_bmesh(EditMesh *em) {
 		v1->flag = eve->f;
 		v1->h = eve->h;
 		v1->bweight = eve->bweight;
-
 		/*Copy Custom Data*/
 		CustomData_bmesh_copy_data(&em->vdata, &bm->vdata, eve->data, &v1->data);
 		eve->tmp.v = (EditVert*)v1;
@@ -106,15 +304,10 @@ BME_Mesh *BME_editmesh_to_bmesh(EditMesh *em) {
 		if(eed->seam) e->flag |= ME_SEAM;
 		if(eed->h & EM_FGON) e->flag |= ME_FGON;
 		if(eed->h & 1) e->flag |= ME_HIDE;
-
-		/* link the edges for face construction;
-		 * kind of a dangerous thing - remember to cast back to BME_Edge before using! */
-		/*Copy CustomData*/
-
 		eed->tmp.e = (EditEdge*)e;
+		CustomData_bmesh_copy_data(&em->edata, &bm->edata, eed->data, &e->data);
 		eed = eed->next;
 	}
-
 	/*add faces.*/
 	efa= em->faces.first;
 	while(efa) {
@@ -143,12 +336,13 @@ BME_Mesh *BME_editmesh_to_bmesh(EditMesh *em) {
 			if(efa->f & 1) f->flag |= ME_FACE_SEL;
 			else f->flag &= ~ME_FACE_SEL;
 		}
+		CustomData_bmesh_copy_data(&em->fdata, &bm->pdata, efa->data, &f->data);
+		BME_corners_to_loops(bm, &em->fdata, efa->data, f,numCol,numTex);
 		efa = efa->next;
 	}
 	BME_model_end(bm);
 	return bm;
 }
-
 /* adds the geometry in the bmesh to G.editMesh (does not free G.editMesh)
  * if td != NULL, the transdata will be mapped to the EditVert's co */
 EditMesh *BME_bmesh_to_editmesh(BME_Mesh *bm, BME_TransData_Head *td) {
@@ -163,7 +357,7 @@ EditMesh *BME_bmesh_to_editmesh(BME_Mesh *bm, BME_TransData_Head *td) {
 	EditEdge *eed;
 	EditFace *efa;
 
-	int totvert, len, i;
+	int totvert, len, i, numTex, numCol;
 
 	em = G.editMesh;
 
@@ -171,6 +365,13 @@ EditMesh *BME_bmesh_to_editmesh(BME_Mesh *bm, BME_TransData_Head *td) {
 
 
 	CustomData_copy(&bm->vdata, &em->vdata, CD_MASK_BMESH, CD_CALLOC, 0);
+	CustomData_copy(&bm->edata, &em->edata, CD_MASK_BMESH, CD_CALLOC, 0);
+	CustomData_copy(&bm->pdata, &em->fdata, CD_MASK_BMESH, CD_CALLOC, 0);
+	CustomData_from_bmeshpoly(&em->fdata, &bm->pdata, &bm->ldata,0);
+	numTex = CustomData_number_of_layers(&bm->pdata, CD_MTEXPOLY);
+	numCol = CustomData_number_of_layers(&bm->ldata, CD_MLOOPCOL);
+
+
 	/* convert to EditMesh */
 	/* make editverts */
 	totvert = BLI_countlist(&(bm->verts));
@@ -202,6 +403,8 @@ EditMesh *BME_bmesh_to_editmesh(BME_Mesh *bm, BME_TransData_Head *td) {
 			if(e->flag & ME_HIDE) eed->h |= 1;
 			if(G.scene->selectmode==SCE_SELECT_EDGE) 
 				EM_select_edge(eed, eed->f & SELECT);
+		
+			CustomData_em_copy_data(&bm->edata, &em->edata, e->data, &eed->data);
 		}
 	}
 
@@ -228,6 +431,8 @@ EditMesh *BME_bmesh_to_editmesh(BME_Mesh *bm, BME_TransData_Head *td) {
 			if(f->flag & ME_HIDE) efa->h= 1;
 			if((G.f & G_FACESELECT) && (efa->f & SELECT))
 				EM_select_face(efa, 1); /* flush down */
+			CustomData_em_copy_data(&bm->pdata, &em->fdata, f->data, &efa->data);
+			BME_loops_to_corners(bm, &em->fdata, efa->data, f,numCol,numTex);
 		}
 	}
 
@@ -248,7 +453,7 @@ BME_Mesh *BME_derivedmesh_to_bmesh(DerivedMesh *dm)
 	MVert *mvert, *mv;
 	MEdge *medge, *me;
 	MFace *mface, *mf;
-	int totface,totedge,totvert,i,len;
+	int totface,totedge,totvert,i,len, numTex, numCol;
 	BME_Vert *v1=NULL,*v2=NULL, **vert_array;
 	BME_Edge *e=NULL;
 	BME_Poly *f=NULL;
@@ -256,6 +461,22 @@ BME_Mesh *BME_derivedmesh_to_bmesh(DerivedMesh *dm)
 	EdgeHash *edge_hash = BLI_edgehash_new();
 
 	bm = BME_make_mesh(allocsize);
+	/*copy custom data layout*/
+	CustomData_copy(&dm->vertData, &bm->vdata, CD_MASK_BMESH, CD_CALLOC, 0);
+	CustomData_copy(&dm->edgeData, &bm->edata, CD_MASK_BMESH, CD_CALLOC, 0);
+	CustomData_copy(&dm->faceData, &bm->pdata, CD_MASK_BMESH, CD_CALLOC, 0);
+
+	/*copy face corner data*/
+	CustomData_to_bmeshpoly(&dm->faceData, &bm->pdata, &bm->ldata);
+	/*initialize memory pools*/
+	CustomData_bmesh_init_pool(&bm->vdata, allocsize[0]);
+	CustomData_bmesh_init_pool(&bm->edata, allocsize[1]);
+	CustomData_bmesh_init_pool(&bm->ldata, allocsize[2]);
+	CustomData_bmesh_init_pool(&bm->pdata, allocsize[3]);
+	/*needed later*/
+	numTex = CustomData_number_of_layers(&bm->pdata, CD_MTEXPOLY);
+	numCol = CustomData_number_of_layers(&bm->ldata, CD_MLOOPCOL);
+
 	totvert = dm->getNumVerts(dm);
 	totedge = dm->getNumEdges(dm);
 	totface = dm->getNumFaces(dm);
@@ -272,6 +493,7 @@ BME_Mesh *BME_derivedmesh_to_bmesh(DerivedMesh *dm)
 		vert_array[i] = v1;
 		v1->flag = mv->flag;
 		v1->bweight = mv->bweight/255.0f;
+		CustomData_to_bmesh_block(&dm->vertData, &bm->vdata, i, &v1->data);
 	}
 	/*add edges*/
 	for(i=0,me = medge; i < totedge;i++,me++){
@@ -282,6 +504,7 @@ BME_Mesh *BME_derivedmesh_to_bmesh(DerivedMesh *dm)
 		e->bweight = me->bweight/255.0f;
 		e->flag = (unsigned char)me->flag;
 		BLI_edgehash_insert(edge_hash,me->v1,me->v2,e);
+		CustomData_to_bmesh_block(&dm->edgeData, &bm->edata, i, &e->data);
 	}
 	/*add faces.*/
 	for(i=0,mf = mface; i < totface;i++,mf++){
@@ -305,6 +528,8 @@ BME_Mesh *BME_derivedmesh_to_bmesh(DerivedMesh *dm)
 		f = BME_MF(bm,v1,v2,edar,len);
 		f->mat_nr = mf->mat_nr;
 		f->flag = mf->flag;
+		CustomData_to_bmesh_block(&dm->faceData,&bm->pdata,i,&f->data);
+		BME_DMcorners_to_loops(bm, &dm->faceData,i,f, numCol,numTex);
 	}
 	
 	BME_model_end(bm);
@@ -318,7 +543,7 @@ DerivedMesh *BME_bmesh_to_derivedmesh(BME_Mesh *bm, DerivedMesh *dm)
 	MFace *mface, *mf;
 	MEdge *medge, *me;
 	MVert *mvert, *mv;
-	int totface,totedge,totvert,i,bmeshok,len;
+	int totface,totedge,totvert,i,bmeshok,len, numTex, numCol;
 
 	BME_Vert *v1=NULL;
 	BME_Edge *e=NULL, *oe=NULL;
@@ -354,12 +579,21 @@ DerivedMesh *BME_bmesh_to_derivedmesh(BME_Mesh *bm, DerivedMesh *dm)
 	
 	/*convert back to mesh*/
 	result = CDDM_from_template(dm,totvert,totedge,totface);
+	CustomData_merge(&bm->vdata, &result->vertData, CD_MASK_BMESH, CD_CALLOC, totvert);
+	CustomData_merge(&bm->edata, &result->edgeData, CD_MASK_BMESH, CD_CALLOC, totedge);
+	CustomData_merge(&bm->pdata, &result->faceData, CD_MASK_BMESH, CD_CALLOC, totface);
+	CustomData_from_bmeshpoly(&result->faceData, &bm->pdata, &bm->ldata,totface);
+	numTex = CustomData_number_of_layers(&bm->pdata, CD_MTEXPOLY);
+	numCol = CustomData_number_of_layers(&bm->ldata, CD_MLOOPCOL);
+
+
 	/*Make Verts*/
 	mvert = CDDM_get_verts(result);
 	for(i=0,v1=bm->verts.first,mv=mvert;v1;v1=v1->next,i++,mv++){
 		VECCOPY(mv->co,v1->co);
 		mv->flag = (unsigned char)v1->flag;
 		mv->bweight = (char)(255.0*v1->bweight);
+		CustomData_from_bmesh_block(&bm->vdata, &result->vertData, &v1->data, i);
 	}
 	medge = CDDM_get_edges(result);
 	i=0;
@@ -377,6 +611,7 @@ DerivedMesh *BME_bmesh_to_derivedmesh(BME_Mesh *bm, DerivedMesh *dm)
 			me->crease = (char)(255.0*e->crease);
 			me->bweight = (char)(255.0*e->bweight);
 			me->flag = e->flag;
+			CustomData_from_bmesh_block(&bm->edata, &result->edgeData, &e->data, i);
 			me++;
 			i++;
 		}
@@ -398,9 +633,11 @@ DerivedMesh *BME_bmesh_to_derivedmesh(BME_Mesh *bm, DerivedMesh *dm)
 				if(mf->v3 == 0 || (len == 4 && mf->v4 == 0)){
 					test_index_face(mf, NULL, i, len);
 				}
-				i++;
 				mf->mat_nr = (unsigned char)f->mat_nr;
 				mf->flag = (unsigned char)f->flag;
+				CustomData_from_bmesh_block(&bm->pdata, &result->faceData, &f->data, i);
+				BME_DMloops_to_corners(bm, &result->faceData, i, f,numCol,numTex);
+				i++;
 			}
 		}
 	}
diff --git a/source/blender/blenkernel/intern/BME_eulers.c b/source/blender/blenkernel/intern/BME_eulers.c
index 3403f5829fe..801e0b8bdec 100644
--- a/source/blender/blenkernel/intern/BME_eulers.c
+++ b/source/blender/blenkernel/intern/BME_eulers.c
@@ -39,6 +39,7 @@
 #include "DNA_mesh_types.h"
 
 #include "BKE_utildefines.h"
+#include "BKE_customdata.h"
 #include "BKE_bmesh.h"
 
 #include "BLI_blenlib.h"
@@ -618,8 +619,8 @@ BME_Poly *BME_SFME(BME_Mesh *bm, BME_Poly *f, BME_Vert *v1, BME_Vert *v2, BME_Lo
 	BME_disk_append_edge(e, v2);
 	
 	f2 = BME_addpolylist(bm,f);
-	f1loop = BME_create_loop(bm,v2,e,f,NULL);
-	f2loop = BME_create_loop(bm,v1,e,f2,NULL);
+	f1loop = BME_create_loop(bm,v2,e,f,v2loop);
+	f2loop = BME_create_loop(bm,v1,e,f2,v1loop);
 	
 	f1loop->prev = v2loop->prev;
 	f2loop->prev = v1loop->prev;
@@ -663,16 +664,16 @@ BME_Poly *BME_SFME(BME_Mesh *bm, BME_Poly *f, BME_Vert *v1, BME_Vert *v2, BME_Lo
  *	Takes a an edge and pointer to one of its vertices and collapses
  *	the edge on that vertex.
  *	
- *	Before:		    OE      KE
+ *	Before:    OE      KE
  *             	 ------- -------
  *               |     ||      |
- *				OV     KV      TV
+ *		OV     KV      TV
  *
  *
  *   After:             OE      
  *             	 ---------------
  *               |             |
- *				OV             TV
+ *		OV             TV
  *
  *
  *	Restrictions:
@@ -723,6 +724,8 @@ int BME_JEKV(BME_Mesh *bm, BME_Edge *ke, BME_Vert *kv)
 			/*remove ke from tv's disk cycle*/
 			BME_disk_remove_edge(ke, tv);
 		
+			
+
 			/*deal with radial cycle of ke*/
 			if(ke->loop){
 				/*first step, fix the neighboring loops of all loops in ke's radial cycle*/
@@ -763,6 +766,7 @@ int BME_JEKV(BME_Mesh *bm, BME_Edge *ke, BME_Vert *kv)
 				
 			}
 			
+
 			/*Validate disk cycles*/
 			diskbase = BME_disk_getpointer(ov->edge,ov);
 			edok = BME_cycle_validate(valance1, diskbase);
diff --git a/source/blender/blenkernel/intern/BME_structure.c b/source/blender/blenkernel/intern/BME_structure.c
index 92ef9e3e03c..ca27f5efd10 100644
--- a/source/blender/blenkernel/intern/BME_structure.c
+++ b/source/blender/blenkernel/intern/BME_structure.c
@@ -41,7 +41,6 @@
 #include "BLI_blenlib.h"
 #include "BLI_linklist.h"
 #include "BLI_ghash.h"
-
 /**
  *	MISC utility functions.
  *
diff --git a/source/blender/blenkernel/intern/BME_tools.c b/source/blender/blenkernel/intern/BME_tools.c
index 916e6bee59f..90259031e5c 100644
--- a/source/blender/blenkernel/intern/BME_tools.c
+++ b/source/blender/blenkernel/intern/BME_tools.c
@@ -215,10 +215,42 @@ static void BME_data_interp_from_verts(BME_Mesh *bm, BME_Vert *v1, BME_Vert *v2,
 		src[1]= v2->data;
 		w[0] = 1.0f-fac;
 		w[1] = fac;
-		CustomData_em_interp(&bm->vdata, src, w, NULL, 2, v->data);
+		CustomData_bmesh_interp(&bm->vdata, src, w, NULL, 2, v->data);
 	}
 }
 
+
+static void BME_data_facevert_edgesplit(BME_Mesh *bm, BME_Vert *v1, BME_Vert *v2, BME_Vert *v, BME_Edge *e1, float fac){
+	void *src[2];
+	float w[2];
+	BME_Loop *l=NULL, *v1loop = NULL, *vloop = NULL, *v2loop = NULL;
+	
+	w[0] = 1.0f - fac;
+	w[1] = fac;
+
+	if(!e1->loop) return;
+	l = e1->loop;
+	do{
+		if(l->v == v1){ 
+			v1loop = l;
+			vloop = v1loop->next;
+			v2loop = vloop->next;
+		}else if(l->v == v){
+			v1loop = l->next;
+			vloop = l;
+			v2loop = l->prev;
+			
+		}
+
+		src[0] = v1loop->data;
+		src[1] = v2loop->data;					
+
+		CustomData_bmesh_interp(&bm->ldata, src,w, NULL, 2, vloop->data); 				
+		l = l->radial.next->data;
+	}while(l!=e1->loop);
+}
+
+
 /* a wrapper for BME_SEMV that transfers element flags */ /*add custom data interpolation in here!*/
 static BME_Vert *BME_split_edge(BME_Mesh *bm, BME_Vert *v, BME_Edge *e, BME_Edge **ne, float percent) {
 	BME_Vert *nv, *v2;
@@ -238,9 +270,37 @@ static BME_Vert *BME_split_edge(BME_Mesh *bm, BME_Vert *v, BME_Edge *e, BME_Edge
 		(*ne)->crease = e->crease;
 		(*ne)->bweight = e->bweight;
 	}
+	/*v->nv->v2*/
+	BME_data_facevert_edgesplit(bm,v2, v, nv, e, 0.75);	
 	return nv;
 }
 
+static void BME_collapse_vert(BME_Mesh *bm, BME_Edge *ke, BME_Vert *kv, float fac){
+	void *src[2];
+	float w[2];
+	BME_Loop *l=NULL, *kvloop=NULL, *tvloop=NULL;
+	BME_Vert *tv = BME_edge_getothervert(ke,kv);
+
+	w[0] = 1.0f - fac;
+	w[1] = fac;
+
+	if(ke->loop){
+		l = ke->loop;
+		do{
+			if(l->v == tv && l->next->v == kv){
+				tvloop = l;
+				kvloop = l->next;
+
+				src[0] = kvloop->data;
+				src[1] = tvloop->data;
+				CustomData_bmesh_interp(&bm->ldata, src,w, NULL, 2, kvloop->data); 								
+			}
+			l=l->radial.next->data;
+		}while(l!=ke->loop);
+	}
+	BME_JEKV(bm,ke,kv);
+}
+
 
 
 static int BME_bevel_is_split_vert(BME_Loop *l) {
@@ -367,6 +427,8 @@ static BME_Vert *BME_bevel_split_edge(BME_Mesh *bm, BME_Vert *v, BME_Vert *v1, B
 		ov = BME_edge_getothervert(e1,v);
 		sv = BME_split_edge(bm,v,e1,&ne,0);
 		//BME_data_interp_from_verts(bm, v, ov, sv, 0.25); /*this is technically wrong...*/
+		//BME_data_interp_from_faceverts(bm, v, ov, sv, 0.25);
+		//BME_data_interp_from_faceverts(bm, ov, v, sv, 0.25);
 		BME_assign_transdata(td, bm, sv, sv->co, sv->co, NULL, sv->co, 0, -1, -1, NULL); /* quick default */
 		sv->tflag1 |= BME_BEVEL_BEVEL;
 		ne->tflag1 = BME_BEVEL_ORIG; /* mark edge as original, even though it isn't */
@@ -408,6 +470,8 @@ static BME_Vert *BME_bevel_split_edge(BME_Mesh *bm, BME_Vert *v, BME_Vert *v1, B
 			ov = BME_edge_getothervert(l->e,v);
 			sv = BME_split_edge(bm,v,l->e,&ne,0);
 			//BME_data_interp_from_verts(bm, v, ov, sv, 0.25); /*this is technically wrong...*/
+			//BME_data_interp_from_faceverts(bm, v, ov, sv, 0.25);
+			//BME_data_interp_from_faceverts(bm, ov, v, sv, 0.25);
 			BME_assign_transdata(td, bm, sv, sv->co, sv->co, NULL, sv->co, 0, -1, -1, NULL); /* quick default */
 			sv->tflag1 |= BME_BEVEL_BEVEL;
 			ne->tflag1 = BME_BEVEL_ORIG; /* mark edge as original, even though it isn't */
@@ -586,12 +650,15 @@ static BME_Loop *BME_bevel_edge(BME_Mesh *bm, BME_Loop *l, float value, int opti
 		if (kl->v == kv) {
 			BME_split_face(bm,kl->f,kl->prev->v,kl->next->v,&nl,kl->prev->e);
 			BME_JFKE(bm,((BME_Loop*)kl->prev->radial.next->data)->f,kl->f,kl->prev->e);
-			BME_JEKV(bm,kl->e,kv);
+			BME_collapse_vert(bm, kl->e, kv, 1.0);
+			//BME_JEKV(bm,kl->e,kv);
+			
 		}
 		else {
 			BME_split_face(bm,kl->f,kl->next->next->v,kl->v,&nl,kl->next->e);
 			BME_JFKE(bm,((BME_Loop*)kl->next->radial.next->data)->f,kl->f,kl->next->e);
-			BME_JEKV(bm,kl->e,kv);
+			BME_collapse_vert(bm, kl->e, kv, 1.0);
+			//BME_JEKV(bm,kl->e,kv);
 		}
 		l = l->prev;
 	}
@@ -620,12 +687,14 @@ static BME_Loop *BME_bevel_edge(BME_Mesh *bm, BME_Loop *l, float value, int opti
 		if (kl->v == kv) {
 			BME_split_face(bm,kl->f,kl->prev->v,kl->next->v,&nl,kl->prev->e);
 			BME_JFKE(bm,((BME_Loop*)kl->prev->radial.next->data)->f,kl->f,kl->prev->e);
-			BME_JEKV(bm,kl->e,kv);
+			BME_collapse_vert(bm, kl->e, kv, 1.0);
+			//BME_JEKV(bm,kl->e,kv);
 		}
 		else {
 			BME_split_face(bm,kl->f,kl->next->next->v,kl->v,&nl,kl->next->e);
 			BME_JFKE(bm,((BME_Loop*)kl->next->radial.next->data)->f,kl->f,kl->next->e);
-			BME_JEKV(bm,kl->e,kv);
+			BME_collapse_vert(bm, kl->e, kv, 1.0);
+			//BME_JEKV(bm,kl->e,kv);
 		}
 	}
 
@@ -1092,7 +1161,8 @@ static void bmesh_dissolve_disk(BME_Mesh *bm, BME_Vert *v){
 				e = BME_disk_nextedge(e,v);
 			}while(e != v->edge);
 		}
-		BME_JEKV(bm,v->edge,v);
+		BME_collapse_vert(bm, v->edge, v, 1.0);
+		//BME_JEKV(bm,v->edge,v);
 	}
 }
 static BME_Mesh *BME_bevel_mesh(BME_Mesh *bm, float value, int res, int options, int defgrp_index, BME_TransData_Head *td) {
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 30405660658..4d3f9143b85 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -1052,7 +1052,7 @@ void emDM_copyEdgeArray(DerivedMesh *dm, MEdge *edge_r)
 
 	/* store vertex indices in tmp union */
 	for(ev = em->verts.first, i = 0; ev; ev = ev->next, ++i)
-		ev->tmp.l = (long) i++;
+		ev->tmp.l = (long) i;
 
 	for( ; ee; ee = ee->next, ++edge_r) {
 		edge_r->crease = (unsigned char) (ee->crease*255.0f);
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index 4880a246e1c..501293ecd81 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -360,8 +360,80 @@ static void layerDefault_origspace_face(void *data, int count)
 }
 /* --------- */
 
+static void layerDefault_mloopcol(void *data, int count)
+{
+	static MLoopCol default_mloopcol = {255,255,255,255};
+	MLoopCol *mlcol = (MLoopCol*)data;
+	int i;
+	for(i = 0; i < count; i++)
+		mlcol[i] = default_mloopcol;
 
+}
 
+static void layerInterp_mloopcol(void **sources, float *weights,
+				float *sub_weights, int count, void *dest)
+{
+	MLoopCol *mc = dest;
+	int i;
+	float *sub_weight;
+	struct {
+		float a;
+		float r;
+		float g;
+		float b;
+	} col;
+	col.a = col.r = col.g = col.b = 0;
+
+	sub_weight = sub_weights;
+	for(i = 0; i < count; ++i){
+		float weight = weights ? weights[i] : 1;
+		MLoopCol *src = sources[i];
+		if(sub_weights){
+			col.a += src->a * (*sub_weight) * weight;
+			col.r += src->r * (*sub_weight) * weight;
+			col.g += src->g * (*sub_weight) * weight;
+			col.b += src->b * (*sub_weight) * weight;
+			sub_weight++;		
+		} else {
+			col.a += src->a * weight;
+			col.r += src->r * weight;
+			col.g += src->g * weight;
+			col.b += src->b * weight;
+		}
+	}
+	mc->a = (int)col.a;
+	mc->r = (int)col.r;
+	mc->g = (int)col.g;
+	mc->b = (int)col.b;
+}
+static void layerInterp_mloopuv(void **sources, float *weights,
+				float *sub_weights, int count, void *dest)
+{
+	MLoopUV *mluv = dest;
+	int i;
+	float *sub_weight;
+	struct {
+		float u;
+		float v;
+	}uv;
+	uv.u = uv.v = 0.0;
+
+	sub_weight = sub_weights;
+	for(i = 0; i < count; ++i){
+		float weight = weights ? weights[i] : 1;
+		MLoopUV *src = sources[i];
+		if(sub_weights){
+			uv.u += src->uv[0] * (*sub_weight) * weight;
+			uv.v += src->uv[1] * (*sub_weight) * weight;
+			sub_weight++;		
+		} else {
+			uv.u += src->uv[0] * weight;
+			uv.v += src->uv[1] * weight;
+		}
+	}
+	mluv->uv[0] = uv.u;
+	mluv->uv[1] = uv.v;
+}
 
 static void layerInterp_mcol(void **sources, float *weights,
                              float *sub_weights, int count, void *dest)
@@ -433,6 +505,8 @@ static void layerDefault_mcol(void *data, int count)
 		mcol[i] = default_mcol;
 }
 
+
+
 const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
 	{sizeof(MVert), "MVert", 1, NULL, NULL, NULL, NULL, NULL, NULL},
 	{sizeof(MSticky), "MSticky", 1, NULL, NULL, NULL, layerInterp_msticky, NULL,
@@ -457,8 +531,8 @@ const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
 	 layerInterp_origspace_face, layerSwap_origspace_face, layerDefault_origspace_face},
 	{sizeof(float)*3, "", 0, NULL, NULL, NULL, NULL, NULL, NULL},
 	{sizeof(MTexPoly), "MTexPoly", 1, "Face Texture", NULL, NULL, NULL, NULL, NULL},
-	{sizeof(MLoopUV), "MLoopUV", 1, "UV coord", NULL, NULL, NULL, NULL, NULL},
-	{sizeof(MLoopCol), "MLoopCol", 1, "Col", NULL, NULL, NULL, NULL, NULL} 
+	{sizeof(MLoopUV), "MLoopUV", 1, "UV coord", NULL, NULL, layerInterp_mloopuv, NULL, NULL},
+	{sizeof(MLoopCol), "MLoopCol", 1, "Col", NULL, NULL, layerInterp_mloopcol, NULL, layerDefault_mloopcol} 
 };
 
 const char *LAYERTYPENAMES[CD_NUMTYPES] = {
@@ -480,7 +554,11 @@ const CustomDataMask CD_MASK_DERIVEDMESH =
 	CD_MASK_MCOL | CD_MASK_ORIGINDEX | CD_MASK_PROP_FLT | CD_MASK_PROP_INT |
 	CD_MASK_PROP_STR | CD_MASK_ORIGSPACE | CD_MASK_ORCO;
 const CustomDataMask CD_MASK_BMESH = 
-	CD_MASK_MDEFORMVERT | CD_MASK_MTFACE | CD_MASK_MCOL;
+	CD_MASK_MSTICKY | CD_MASK_MDEFORMVERT | CD_MASK_PROP_FLT | CD_MASK_PROP_INT | CD_MASK_PROP_STR;
+const CustomDataMask CD_MASK_FACECORNERS =
+	CD_MASK_MTFACE | CD_MASK_MCOL | CD_MASK_MTEXPOLY | CD_MASK_MLOOPUV |
+	CD_MASK_MLOOPCOL;
+
 
 static const LayerTypeInfo *layerType_getInfo(int type)
 {
@@ -1456,6 +1534,36 @@ void CustomData_from_em_block(const CustomData *source, CustomData *dest,
 }
 
 /*Bmesh functions*/
+/*needed to convert to/from different face reps*/
+void CustomData_to_bmeshpoly(CustomData *fdata, CustomData *pdata, CustomData *ldata)
+{
+	int i;
+	for(i=0; i < fdata->totlayer; i++){
+		if(fdata->layers[i].type == CD_MTFACE){
+			CustomData_add_layer(pdata, CD_MTEXPOLY, CD_CALLOC, &(fdata->layers[i].name), 0);
+			CustomData_add_layer(ldata, CD_MLOOPUV, CD_CALLOC, &(fdata->layers[i].name), 0);
+		}
+		else if(fdata->layers[i].type == CD_MCOL)
+			CustomData_add_layer(ldata, CD_MLOOPCOL, CD_CALLOC, &(fdata->layers[i].name), 0);
+	}		
+}
+void CustomData_from_bmeshpoly(CustomData *fdata, CustomData *pdata, CustomData *ldata, int total){
+	int i;
+	for(i=0; i < pdata->totlayer; i++){
+		if(pdata->layers[i].type == CD_MTEXPOLY)
+			CustomData_add_layer(fdata, CD_MTFACE, CD_CALLOC, &(pdata->layers[i].name), total);
+	}
+	for(i=0; i < ldata->totlayer; i++){
+		if(ldata->layers[i].type == CD_MLOOPCOL)
+			CustomData_add_layer(fdata, CD_MCOL, CD_CALLOC, &(ldata->layers[i].name), total);
+	}
+}
+
+
+void CustomData_bmesh_init_pool(CustomData *data, int allocsize){
+	if(data->totlayer)data->pool = BLI_mempool_create(data->totsize, allocsize, allocsize);
+}
+
 void CustomData_bmesh_free_block(CustomData *data, void **block)
 {
     const LayerTypeInfo *typeInfo;
@@ -1484,7 +1592,7 @@ static void CustomData_bmesh_alloc_block(CustomData *data, void **block)
 		CustomData_bmesh_free_block(data, block);
 
 	if (data->totsize > 0)
-		*block = BLI_mempool_alloc(data->pool);
+		*block = BLI_mempool_calloc(data->pool);
 	else
 		*block = NULL;
 }
@@ -1601,7 +1709,6 @@ void CustomData_bmesh_interp(CustomData *data, void **src_blocks, float *weights
 	for(i = 0; i < data->totlayer; ++i) {
 		CustomDataLayer *layer = &data->layers[i];
 		const LayerTypeInfo *typeInfo = layerType_getInfo(layer->type);
-
 		if(typeInfo->interp) {
 			for(j = 0; j < count; ++j)
 				sources[j] = (char *)src_blocks[j] + layer->offset;
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index 7c50b409693..c3dddf06e7c 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -224,48 +224,50 @@ void flag_all_listbases_ids(short flag, short value)
 /* note: MAX_LIBARRAY define should match this code */
 int set_listbasepointers(Main *main, ListBase **lb)
 {
+	int a = 0;
+
 	/* BACKWARDS! also watch order of free-ing! (mesh<->mat) */
 
-	lb[0]= &(main->ipo);
-	lb[1]= &(main->key);
-	lb[2]= &(main->image);
-	lb[3]= &(main->tex);
-	lb[4]= &(main->mat);
-	lb[5]= &(main->vfont);
+	lb[a++]= &(main->ipo);
+	lb[a++]= &(main->key);
+	lb[a++]= &(main->nodetree);
+	lb[a++]= &(main->image);
+	lb[a++]= &(main->tex);
+	lb[a++]= &(main->mat);
+	lb[a++]= &(main->vfont);
 	
 	/* Important!: When adding a new object type,
 	 * the specific data should be inserted here 
 	 */
 
-	lb[6]= &(main->armature);
-	lb[7]= &(main->action);
+	lb[a++]= &(main->armature);
+	lb[a++]= &(main->action);
 
-	lb[8]= &(main->mesh);
-	lb[9]= &(main->curve);
-	lb[10]= &(main->mball);
+	lb[a++]= &(main->mesh);
+	lb[a++]= &(main->curve);
+	lb[a++]= &(main->mball);
 
-	lb[11]= &(main->wave);
-	lb[12]= &(main->latt);
-	lb[13]= &(main->lamp);
-	lb[14]= &(main->camera);
+	lb[a++]= &(main->wave);
+	lb[a++]= &(main->latt);
+	lb[a++]= &(main->lamp);
+	lb[a++]= &(main->camera);
 	
-	lb[15]= &(main->text);
-	lb[16]= &(main->sound);
-	lb[17]= &(main->group);
-	lb[18]= &(main->nodetree);
-	lb[19]= &(main->brush);
-	lb[20]= &(main->script);
-	lb[21]= &(main->particle);
+	lb[a++]= &(main->text);
+	lb[a++]= &(main->sound);
+	lb[a++]= &(main->group);
+	lb[a++]= &(main->brush);
+	lb[a++]= &(main->script);
+	lb[a++]= &(main->particle);
 	
-	lb[22]= &(main->world);
-	lb[23]= &(main->screen);
-	lb[24]= &(main->object);
-	lb[25]= &(main->scene);
-	lb[26]= &(main->library);
+	lb[a++]= &(main->world);
+	lb[a++]= &(main->screen);
+	lb[a++]= &(main->object);
+	lb[a++]= &(main->scene);
+	lb[a++]= &(main->library);
 	
-	lb[27]= NULL;
+	lb[a]= NULL;
 
-	return 27;
+	return a;
 }
 
 /* *********** ALLOC AND FREE *****************
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index a0841bb9f03..f13f8ef0298 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -4920,7 +4920,7 @@ static void waveModifier_deformVertsEM(
 
 	if(!wmd->texture && !wmd->defgrp_name[0] && !(wmd->flag & MOD_WAVE_NORM))
 		dm = derivedData;
-	else if(derivedData) dm = derivedData;
+	else if(derivedData) dm = CDDM_copy(derivedData);
 	else dm = CDDM_from_editmesh(editData, ob->data);
 
 	if(wmd->flag & MOD_WAVE_NORM) {
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index 18fca5439ef..24a3d348ae7 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -1371,7 +1371,7 @@ void psys_particle_on_shape(int distr, int index, float *fuv, float *vec, float
 /************************************************/
 void psys_particle_on_emitter(Object *ob, ParticleSystemModifierData *psmd, int from, int index, int index_dmcache, float *fuv, float foffset, float *vec, float *nor, float *utan, float *vtan, float *orco, float *ornor){
 	if(psmd){
-		if(psmd->psys->part->distr==PART_DISTR_GRID){
+		if(psmd->psys->part->distr==PART_DISTR_GRID && psmd->psys->part->from != PART_FROM_VERT){
 			if(vec){
 				VECCOPY(vec,fuv);
 			}
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index 458171cc232..f70648965f4 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -168,7 +168,7 @@ static void realloc_particles(Object *ob, ParticleSystem *psys, int new_totpart)
 	int i, totpart, totsaved = 0;
 
 	if(new_totpart<0) {
-		if(psys->part->distr==PART_DISTR_GRID) {
+		if(psys->part->distr==PART_DISTR_GRID  && psys->part->from != PART_FROM_VERT) {
 			totpart= psys->part->grid_res;
 			totpart*=totpart*totpart;
 		}
@@ -1056,7 +1056,7 @@ int psys_threads_init_distribution(ParticleThread *threads, DerivedMesh *finaldm
 		dm= CDDM_from_mesh((Mesh*)ob->data, ob);
 
 		/* special handling of grid distribution */
-		if(part->distr==PART_DISTR_GRID){
+		if(part->distr==PART_DISTR_GRID && from != PART_FROM_VERT){
 			distribute_particles_in_grid(dm,psys);
 			dm->release(dm);
 			return 0;
@@ -1600,7 +1600,7 @@ void initialize_particle(ParticleData *pa, int p, Object *ob, ParticleSystem *ps
 
 	NormalQuat(pa->r_rot);
 
-	if(part->distr!=PART_DISTR_GRID){
+	if(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]))
 			pa->flag |= PARS_UNEXIST;
@@ -4515,7 +4515,7 @@ void psys_changed_type(ParticleSystem *psys)
 	if(part->from == PART_FROM_PARTICLE) {
 		if(part->type != PART_REACTOR)
 			part->from = PART_FROM_FACE;
-		if(part->distr == PART_DISTR_GRID)
+		if(part->distr == PART_DISTR_GRID && part->from != PART_FROM_VERT)
 			part->distr = PART_DISTR_JIT;
 	}
 
@@ -4710,7 +4710,7 @@ static void system_step(Object *ob, ParticleSystem *psys, ParticleSystemModifier
 	oldtotpart = psys->totpart;
 	oldtotchild = psys->totchild;
 
-	if(part->distr == PART_DISTR_GRID)
+	if(part->distr == PART_DISTR_GRID && part->from != PART_FROM_VERT)
 		totpart = part->grid_res*part->grid_res*part->grid_res;
 	else
 		totpart = psys->part->totpart;
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c
index 57ecffbb796..43805959e62 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -459,9 +459,10 @@ int BKE_ptcache_object_reset(Object *ob, int mode)
 	PTCacheID pid;
 	ParticleSystem *psys;
 	ModifierData *md;
-	int reset;
+	int reset, skip;
 
 	reset= 0;
+	skip= 0;
 
 	if(ob->soft) {
 		BKE_ptcache_id_from_softbody(&pid, ob, ob->soft);
@@ -469,11 +470,18 @@ int BKE_ptcache_object_reset(Object *ob, int mode)
 	}
 
 	for(psys=ob->particlesystem.first; psys; psys=psys->next) {
-		BKE_ptcache_id_from_particles(&pid, ob, psys);
-		reset |= BKE_ptcache_id_reset(&pid, mode);
-
+		/* 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);
+			if(mode == PSYS_RESET_ALL || !(psys->part->type == PART_HAIR && (pid.cache->flag & PTCACHE_BAKED))) 
+				reset |= BKE_ptcache_id_reset(&pid, mode);
+			else
+				skip = 1;
+		}
+
+		if(skip == 0) {
+			BKE_ptcache_id_from_particles(&pid, ob, psys);
 			reset |= BKE_ptcache_id_reset(&pid, mode);
 		}
 	}
diff --git a/source/blender/blenlib/BLI_mempool.h b/source/blender/blenlib/BLI_mempool.h
index a706e5f3874..8b31459dd38 100644
--- a/source/blender/blenlib/BLI_mempool.h
+++ b/source/blender/blenlib/BLI_mempool.h
@@ -36,7 +36,9 @@ typedef struct BLI_mempool BLI_mempool;
 
 BLI_mempool *BLI_mempool_create(int esize, int tote, int pchunk);
 void *BLI_mempool_alloc(BLI_mempool *pool);
+void *BLI_mempool_calloc(BLI_mempool *pool);
 void BLI_mempool_free(BLI_mempool *pool, void *addr);
 void BLI_mempool_destroy(BLI_mempool *pool);
 
-#endif
\ No newline at end of file
+
+#endif
diff --git a/source/blender/blenlib/intern/BLI_kdopbvh.c b/source/blender/blenlib/intern/BLI_kdopbvh.c
index a85883f6572..a97b9ca6672 100644
--- a/source/blender/blenlib/intern/BLI_kdopbvh.c
+++ b/source/blender/blenlib/intern/BLI_kdopbvh.c
@@ -523,6 +523,7 @@ static void bvh_div_nodes(BVHTree *tree, BVHNode *node, int start, int end, char
 	return;
 }
 
+#if 0
 static void verify_tree(BVHTree *tree)
 {
 	int i, j, check = 0;
@@ -569,6 +570,7 @@ static void verify_tree(BVHTree *tree)
 	
 	printf("branches: %d, leafs: %d, total: %d\n", tree->totbranch, tree->totleaf, tree->totbranch + tree->totleaf);
 }
+#endif
 	
 void BLI_bvhtree_balance(BVHTree *tree)
 {
diff --git a/source/blender/blenlib/intern/BLI_mempool.c b/source/blender/blenlib/intern/BLI_mempool.c
index 7bbf0c4732e..7ac7b8b1791 100644
--- a/source/blender/blenlib/intern/BLI_mempool.c
+++ b/source/blender/blenlib/intern/BLI_mempool.c
@@ -89,7 +89,6 @@ BLI_mempool *BLI_mempool_create(int esize, int tote, int pchunk)
 	curnode->next = NULL;
 	return pool;
 }
-
 void *BLI_mempool_alloc(BLI_mempool *pool){
 	void *retval=NULL;
 	BLI_freenode *curnode=NULL;
@@ -117,6 +116,16 @@ void *BLI_mempool_alloc(BLI_mempool *pool){
 	//memset(retval, 0, pool->esize);
 	return retval;
 }
+
+void *BLI_mempool_calloc(BLI_mempool *pool){
+	void *retval=NULL;
+	retval = BLI_mempool_alloc(pool);
+	memset(retval, 0, pool->esize);
+	return retval;
+}
+
+
+
 void BLI_mempool_free(BLI_mempool *pool, void *addr){ //doesnt protect against double frees, dont be stupid!
 	BLI_freenode *newhead = addr;
 	newhead->next = pool->free;
@@ -128,4 +137,4 @@ void BLI_mempool_destroy(BLI_mempool *pool)
 	for(mpchunk = pool->chunks.first; mpchunk; mpchunk = mpchunk->next) MEM_freeN(mpchunk->data);
 	BLI_freelistN(&(pool->chunks));
 	MEM_freeN(pool);
-}
\ No newline at end of file
+}
diff --git a/source/blender/blenlib/intern/storage.c b/source/blender/blenlib/intern/storage.c
index ca7a376d3a2..fbcc56ac21d 100644
--- a/source/blender/blenlib/intern/storage.c
+++ b/source/blender/blenlib/intern/storage.c
@@ -382,6 +382,7 @@ void BLI_adddirstrings()
 			pwuser = getpwuid(files[num].s.st_uid);
 			if ( pwuser ) {
 			strcpy(files[num].owner, pwuser->pw_name);
+			free(pwuser);
 			} else {
 				sprintf(files[num].owner, "%d", files[num].s.st_uid);
             }
diff --git a/source/blender/blenlib/intern/util.c b/source/blender/blenlib/intern/util.c
index 5a85fbfc375..48ebf770e1b 100644
--- a/source/blender/blenlib/intern/util.c
+++ b/source/blender/blenlib/intern/util.c
@@ -1722,6 +1722,7 @@ void BLI_where_am_i(char *fullname, const char *name)
 	path = br_find_exe( NULL );
 	if (path) {
 		strcpy(fullname, path);
+		free(path);
 		return;
 	}
 #endif
diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp
index b59908fef39..fe352610a40 100644
--- a/source/blender/imbuf/intern/openexr/openexr_api.cpp
+++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp
@@ -842,7 +842,7 @@ typedef struct RGBA
 } RGBA;
 
 
-#if 0
+/* debug only */
 static void exr_print_filecontents(InputFile *file)
 {
 	const ChannelList &channels = file->header().channels();
@@ -853,7 +853,27 @@ static void exr_print_filecontents(InputFile *file)
 		printf("OpenEXR-load: Found channel %s of type %d\n", i.name(), channel.type);
 	}
 }
-#endif
+
+/* for non-multilayer, map  R G B A channel names to something that's in this file */
+static const char *exr_rgba_channelname(InputFile *file, const char *chan)
+{
+	const ChannelList &channels = file->header().channels();
+	
+	for (ChannelList::ConstIterator i = channels.begin(); i != channels.end(); ++i)
+	{
+		const Channel &channel = i.channel();
+		const char *str= i.name();
+		int len= strlen(str);
+		if(len) {
+			if(BLI_strcasecmp(chan, str+len-1)==0) {
+				return str;
+			}
+		}
+	}
+	return chan;
+}
+
+
 
 static int exr_has_zbuffer(InputFile *file)
 {
@@ -896,7 +916,8 @@ struct ImBuf *imb_load_openexr(unsigned char *mem, int size, int flags)
 		//printf("OpenEXR-load: image data window %d %d %d %d\n", 
 		//	   dw.min.x, dw.min.y, dw.max.x, dw.max.y);
 
-		// exr_print_filecontents(file);
+		if(0) // debug
+			exr_print_filecontents(file);
 		
 		is_multi= exr_is_renderresult(file);
 		
@@ -935,11 +956,15 @@ struct ImBuf *imb_load_openexr(unsigned char *mem, int size, int flags)
 					/* but, since we read y-flipped (negative y stride) we move to last scanline */
 					first+= 4*(height-1)*width;
 					
-					frameBuffer.insert ("R", Slice (FLOAT,  (char *) first, xstride, ystride));
-					frameBuffer.insert ("G", Slice (FLOAT,  (char *) (first+1), xstride, ystride));
-					frameBuffer.insert ("B", Slice (FLOAT,  (char *) (first+2), xstride, ystride));
-																			/* 1.0 is fill value */
-					frameBuffer.insert ("A", Slice (FLOAT,  (char *) (first+3), xstride, ystride, 1, 1, 1.0f));
+					frameBuffer.insert ( exr_rgba_channelname(file, "R"), 
+										Slice (FLOAT,  (char *) first, xstride, ystride));
+					frameBuffer.insert ( exr_rgba_channelname(file, "G"), 
+										Slice (FLOAT,  (char *) (first+1), xstride, ystride));
+					frameBuffer.insert ( exr_rgba_channelname(file, "B"), 
+										Slice (FLOAT,  (char *) (first+2), xstride, ystride));
+																			
+					frameBuffer.insert ( exr_rgba_channelname(file, "A"), 
+										Slice (FLOAT,  (char *) (first+3), xstride, ystride, 1, 1, 1.0f)); /* 1.0 is fill value */
 
 					if(exr_has_zbuffer(file)) 
 					{
diff --git a/source/blender/include/BDR_drawobject.h b/source/blender/include/BDR_drawobject.h
index 3f9a6e438cc..de28db64c3b 100644
--- a/source/blender/include/BDR_drawobject.h
+++ b/source/blender/include/BDR_drawobject.h
@@ -63,6 +63,7 @@ void get_local_bounds(struct Object *ob, float *center, float *size);
 /* drawing flags: */
 #define DRAW_PICKING	1
 #define DRAW_CONSTCOLOR	2
+#define DRAW_SCENESET	4
 void draw_object(struct Base *base, int flag);
 void drawaxes(float size, int flag, char drawtype);
 
diff --git a/source/blender/include/BIF_editarmature.h b/source/blender/include/BIF_editarmature.h
index 0e1557ac378..24112c7f11a 100644
--- a/source/blender/include/BIF_editarmature.h
+++ b/source/blender/include/BIF_editarmature.h
@@ -80,7 +80,7 @@ void	clear_armature(struct Object *ob, char mode);
 void	delete_armature(void);
 void	deselectall_armature(int toggle, int doundo);
 void	deselectall_posearmature (struct Object *ob, int test, int doundo);
-int		draw_armature(struct Base *base, int dt);
+int		draw_armature(struct Base *base, int dt, int flag);
 
 void	extrude_armature(int forked);
 void	subdivide_armature(int numcuts);
diff --git a/source/blender/include/BSE_sequence.h b/source/blender/include/BSE_sequence.h
index 15a9218b735..0d96de7be60 100644
--- a/source/blender/include/BSE_sequence.h
+++ b/source/blender/include/BSE_sequence.h
@@ -92,6 +92,8 @@ void update_changed_seq_and_deps(struct Sequence *seq, int len_change, int ibuf_
 struct RenderResult;
 void do_render_seq(struct RenderResult *rr, int cfra);
 
+int seq_can_blend(struct Sequence *seq);
+
 #define SEQ_HAS_PATH(seq) (seq->type==SEQ_MOVIE || seq->type==SEQ_HD_SOUND || seq->type==SEQ_RAM_SOUND || seq->type==SEQ_IMAGE)
 
 #endif
diff --git a/source/blender/makesdna/DNA_actuator_types.h b/source/blender/makesdna/DNA_actuator_types.h
index 3cf80a4efa6..a467722e8e1 100644
--- a/source/blender/makesdna/DNA_actuator_types.h
+++ b/source/blender/makesdna/DNA_actuator_types.h
@@ -51,8 +51,9 @@ typedef struct bActionActuator {
 	int	sta, end;		/* Start & End frames */			
 	char	name[32];		/* For property-driven playback */	
 	char	frameProp[32];	/* Set this property to the actions current frame */
-	int	blendin;		/* Number of frames of blending */	
-	short	priority;		/* Execution priority */			
+	short	blendin;		/* Number of frames of blending */
+	short	priority;		/* Execution priority */
+	short	end_reset;	/* Ending the actuator (negative pulse) wont reset the the action to its starting frame */
 	short	strideaxis;		/* Displacement axis */
 	float	stridelength;	/* Displacement incurred by cycle */
 } bActionActuator;												
@@ -339,8 +340,9 @@ typedef struct FreeCamera {
 /* ipoactuator->flag */
 #define ACT_IPOFORCE        (1 << 0)
 #define ACT_IPOEND          (1 << 1)
-#define ACT_IPOFORCE_LOCAL  (1 << 2)
-#define ACT_IPOCHILD        (1 << 4)			
+#define ACT_IPOLOCAL		(1 << 2)
+#define ACT_IPOCHILD        (1 << 4)	
+#define ACT_IPOADD			(1 << 5)
 
 /* ipoactuator->flag for k2k */
 #define ACT_K2K_PREV		1
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index af60f9ca713..bc30a12ff27 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -232,8 +232,9 @@ typedef struct SpaceImage {
 	short imanr;
 	short curtile; /* the currently active tile of the image when tile is enabled, is kept in sync with the active faces tile */
 	int flag;
+	short selectmode;
 	short imtypenr, lock;
-	short pin, pad2;
+	short pin;
 	float zoom;
 	char dt_uv; /* UV draw type */
 	char sticky; /* sticky selection type */
@@ -496,6 +497,12 @@ typedef struct SpaceImaSel {
 #define SI_STICKY_DISABLE	1
 #define SI_STICKY_VERTEX	2
 
+/* SpaceImage->selectmode */
+#define SI_SELECT_VERTEX	0
+#define SI_SELECT_EDGE		1 /* not implemented */
+#define SI_SELECT_FACE		2
+#define SI_SELECT_ISLAND	3
+
 /* SpaceImage->flag */
 #define SI_BE_SQUARE	1<<0
 #define SI_EDITTILE		1<<1
@@ -503,7 +510,7 @@ typedef struct SpaceImaSel {
 #define SI_DRAWTOOL		1<<3
 #define SI_DEPRECATED1  1<<4	/* stick UVs to others in the same location */
 #define SI_DRAWSHADOW   1<<5
-#define SI_SELACTFACE   1<<6
+#define SI_SELACTFACE   1<<6	/* deprecated */
 #define SI_DEPRECATED2	1<<7
 #define SI_DEPRECATED3  1<<8	/* stick UV selection to mesh vertex (UVs wont always be touching) */
 #define SI_COORDFLOATS  1<<9
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_gamma.c b/source/blender/nodes/intern/CMP_nodes/CMP_gamma.c
index ff9e2b716ce..e77de3726cb 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_gamma.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_gamma.c
@@ -47,7 +47,7 @@ static void do_gamma(bNode *node, float *out, float *in, float *fac)
 	int i=0;
 	for(i=0; i<3; i++) {
 		/* check for negative to avoid nan's */
-		out[i] = (in[0] > 0.0f)? pow(in[i],fac[0]): in[0];
+		out[i] = (in[i] > 0.0f)? pow(in[i],fac[0]): in[i];
 	}
 	out[3] = in[3];
 }
diff --git a/source/blender/python/api2_2x/sceneSequence.c b/source/blender/python/api2_2x/sceneSequence.c
index 56821980cd2..0d3ad3fcb44 100644
--- a/source/blender/python/api2_2x/sceneSequence.c
+++ b/source/blender/python/api2_2x/sceneSequence.c
@@ -81,6 +81,7 @@ returns None if notfound.\nIf 'name' is not specified, it returns a list of all
 static PyObject *Sequence_copy( BPy_Sequence * self );
 static PyObject *Sequence_new( BPy_Sequence * self, PyObject * args );
 static PyObject *Sequence_remove( BPy_Sequence * self, PyObject * args );
+static PyObject *Sequence_rebuildProxy( BPy_Sequence * self );
 
 static PyObject *SceneSeq_new( BPy_SceneSeq * self, PyObject * args );
 static PyObject *SceneSeq_remove( BPy_SceneSeq * self, PyObject * args );
@@ -96,6 +97,8 @@ static PyMethodDef BPy_Sequence_methods[] = {
 	 "() - Return a copy of the sequence containing the same objects."},
 	{"copy", ( PyCFunction ) Sequence_copy, METH_NOARGS,
 	 "() - Return a copy of the sequence containing the same objects."},
+	{"rebuildProxy", ( PyCFunction ) Sequence_rebuildProxy, METH_VARARGS,
+	 "() - Rebuild the active strip's Proxy."},
 	{NULL, NULL, 0, NULL}
 };
 
@@ -309,6 +312,7 @@ static PyObject *Sequence_copy( BPy_Sequence * self )
 	Py_RETURN_NONE;
 }
 
+
 /*****************************************************************************/
 /* PythonTypeObject callback function prototypes			 */
 /*****************************************************************************/
@@ -383,8 +387,6 @@ static PyObject *SceneSeq_nextIter( BPy_Sequence * self )
 }
 
 
-
-
 static PyObject *Sequence_getName( BPy_Sequence * self )
 {
 	return PyString_FromString( self->seq->name+2 );
@@ -403,11 +405,13 @@ static int Sequence_setName( BPy_Sequence * self, PyObject * value )
 	return 0;
 }
 
+
 static PyObject *Sequence_getProxyDir( BPy_Sequence * self )
 {
 	return PyString_FromString( self->seq->strip->proxy ? self->seq->strip->proxy->dir : "" );
 }
 
+
 static int Sequence_setProxyDir( BPy_Sequence * self, PyObject * value )
 {
 	char *name = NULL;
@@ -430,6 +434,14 @@ static int Sequence_setProxyDir( BPy_Sequence * self, PyObject * value )
 }
 
 
+static PyObject *Sequence_rebuildProxy( BPy_Sequence * self )
+{
+	if (self->seq->strip->proxy)
+		seq_proxy_rebuild(self->seq);
+	Py_RETURN_NONE;
+}
+
+
 static PyObject *Sequence_getSound( BPy_Sequence * self )
 {
 	if (self->seq->type == SEQ_RAM_SOUND && self->seq->sound)
@@ -622,6 +634,54 @@ static int Sequence_setImages( BPy_Sequence * self, PyObject *value )
 	return 0;
 }
 
+static PyObject *M_Sequence_BlendModesDict( void )
+{
+	PyObject *M = PyConstant_New(  );
+
+	if( M ) {
+		BPy_constant *d = ( BPy_constant * ) M;
+		PyConstant_Insert( d, "CROSS", PyInt_FromLong( SEQ_CROSS ) );
+		PyConstant_Insert( d, "ADD", PyInt_FromLong( SEQ_ADD ) );
+		PyConstant_Insert( d, "SUBTRACT", PyInt_FromLong( SEQ_SUB ) );
+		PyConstant_Insert( d, "ALPHAOVER", PyInt_FromLong( SEQ_ALPHAOVER ) );
+		PyConstant_Insert( d, "ALPHAUNDER", PyInt_FromLong( SEQ_ALPHAUNDER ) );
+		PyConstant_Insert( d, "GAMMACROSS", PyInt_FromLong( SEQ_GAMCROSS ) );
+		PyConstant_Insert( d, "MULTIPLY", PyInt_FromLong( SEQ_MUL ) );
+		PyConstant_Insert( d, "OVERDROP", PyInt_FromLong( SEQ_OVERDROP ) );
+		PyConstant_Insert( d, "PLUGIN", PyInt_FromLong( SEQ_PLUGIN ) );
+		PyConstant_Insert( d, "WIPE", PyInt_FromLong( SEQ_WIPE ) );
+		PyConstant_Insert( d, "GLOW", PyInt_FromLong( SEQ_GLOW ) );
+		PyConstant_Insert( d, "TRANSFORM", PyInt_FromLong( SEQ_TRANSFORM ) );
+		PyConstant_Insert( d, "COLOR", PyInt_FromLong( SEQ_COLOR ) );
+		PyConstant_Insert( d, "SPEED", PyInt_FromLong( SEQ_SPEED ) );
+	}
+	return M;
+}
+
+static PyObject *Sequence_getBlendMode( BPy_Sequence * self )
+{
+	return PyInt_FromLong( self->seq->blend_mode );
+}
+
+static int Sequence_setBlendMode( BPy_Sequence * self, PyObject * value )
+{
+	struct Sequence *seq= self->seq;
+	int number = PyInt_AsLong( value );
+	
+	if( number==-1 && PyErr_Occurred() )
+		return EXPP_ReturnIntError( PyExc_TypeError, "expected an int value" );
+	
+	if ( !seq_can_blend(seq) )
+		return EXPP_ReturnIntError( PyExc_AttributeError, "this sequence type dosnt support blending" );	
+	
+	if (number<SEQ_EFFECT || number>SEQ_EFFECT_MAX)
+		return EXPP_ReturnIntError( PyExc_TypeError, "expected an int value" );
+	
+	seq->blend_mode=number;
+	
+	return 0;
+}
+
 /*
  * get floating point attributes
  */
@@ -836,7 +896,11 @@ static PyGetSetDef BPy_Sequence_getseters[] = {
 	 (getter)Sequence_getImages, (setter)Sequence_setImages,
 	 "Sequence scene",
 	  NULL},
-	  
+	{"blendMode",
+	 (getter)Sequence_getBlendMode, (setter)Sequence_setBlendMode,
+	 "Sequence Blend Mode",
+	  NULL},
+
 	{"type",
 	 (getter)getIntAttr, (setter)NULL,
 	 "",
@@ -1131,6 +1195,7 @@ PyObject *M_Sequence_Get( PyObject * self, PyObject * args )
 /*****************************************************************************/
 PyObject *Sequence_Init( void )
 {
+	PyObject *BlendModesDict = M_Sequence_BlendModesDict( );
 	PyObject *submodule;
 	if( PyType_Ready( &Sequence_Type ) < 0 )
 		return NULL;
@@ -1142,6 +1207,9 @@ PyObject *Sequence_Init( void )
 "The Blender Sequence module\n\n\
 This module provides access to **Sequence Data** in Blender.\n" );
 
+	if( BlendModesDict )
+		PyModule_AddObject( submodule, "BlendModes", BlendModesDict );
+
 	/*Add SUBMODULES to the module*/
 	/*PyDict_SetItemString(dict, "Constraint", Constraint_Init()); //creates a *new* module*/
 	return submodule;
diff --git a/source/blender/radiosity/intern/source/radrender.c b/source/blender/radiosity/intern/source/radrender.c
index e5ef1e9a4a2..68b5fa81f43 100644
--- a/source/blender/radiosity/intern/source/radrender.c
+++ b/source/blender/radiosity/intern/source/radrender.c
@@ -369,9 +369,18 @@ printf(" Rad elems: %d emittors %d\n", RG.totelem, RG.totpatch);
 			if(vlr->mat->mode & MA_RADIO) {
 				
 				/* during render, vlr->n gets flipped/corrected, we cannot have that */
-				if(vlr->v4) CalcNormFloat4(vlr->v1->co, vlr->v2->co, vlr->v3->co, vlr->v4->co, rf->norm);
-				else CalcNormFloat(vlr->v1->co, vlr->v2->co, vlr->v3->co, rf->norm);
-				
+				if (obr->ob->transflag & OB_NEG_SCALE){
+					/* The object has negative scale that will cause the normals to flip.
+						 To counter this unwanted normal flip, swap vertex 2 and 4 for a quad
+						 or vertex 2 and 3 (see flip_face) for a triangle in the call to CalcNormFloat4 
+						 in order to flip the normals back to the way they were in the original mesh. */
+					if(vlr->v4) CalcNormFloat4(vlr->v1->co, vlr->v4->co, vlr->v3->co, vlr->v2->co, rf->norm);
+					else CalcNormFloat(vlr->v1->co, vlr->v3->co, vlr->v2->co, rf->norm);
+				}else{
+					if(vlr->v4) CalcNormFloat4(vlr->v1->co, vlr->v2->co, vlr->v3->co, vlr->v4->co, rf->norm);
+					else CalcNormFloat(vlr->v1->co, vlr->v2->co, vlr->v3->co, rf->norm);
+				}
+
 				rf->totrad[0]= vlr->mat->emit*vlr->mat->r;
 				rf->totrad[1]= vlr->mat->emit*vlr->mat->g;
 				rf->totrad[2]= vlr->mat->emit*vlr->mat->b;
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index f9ec0e9d843..faa7a68f754 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -204,6 +204,7 @@ void RE_make_stars(Render *re, void (*initfunc)(void),
 	else stargrid *= 1.0;				/* then it draws fewer */
 	
 	if(re) MTC_Mat4Invert(mat, re->viewmat);
+	else MTC_Mat4One(mat);
 	
 	/* BOUNDING BOX CALCULATION
 		* bbox goes from z = loc_near_var | loc_far_var,
diff --git a/source/blender/src/buttons_logic.c b/source/blender/src/buttons_logic.c
index 1a9e1030688..cc4df06e22d 100644
--- a/source/blender/src/buttons_logic.c
+++ b/source/blender/src/buttons_logic.c
@@ -1560,7 +1560,6 @@ static void set_col_actuator(int item, int medium)
 static void change_object_actuator(void *act, void *arg)
 {
 	bObjectActuator *oa = act;
-	int i;
 
 	if (oa->type != oa->otype) {
 		switch (oa->type) {
@@ -1582,6 +1581,18 @@ static void change_object_actuator(void *act, void *arg)
 	}
 }
 
+static void change_ipo_actuator(void *arg1_but, void *arg2_ia)
+{
+	bIpoActuator *ia = arg2_ia;
+	uiBut *but = arg1_but;
+
+	if (but->retval & ACT_IPOFORCE)
+		ia->flag &= ~ACT_IPOADD;
+	else if (but->retval & ACT_IPOADD)
+		ia->flag &= ~ACT_IPOFORCE;
+	but->retval = B_REDR;
+}
+
 void update_object_actuator_PID(void *act, void *arg)
 {
 	bObjectActuator *oa = act;
@@ -1679,7 +1690,7 @@ static short draw_actuatorbuttons(Object *ob, bActuator *act, uiBlock *block, sh
 				uiDefButF(block, NUM, 0, "",		xco+45+2*wval, yco-148, wval, 19, oa->angularvelocity+2, -10000.0, 10000.0, 10, 0, "");
 				
 				uiDefBut(block, LABEL, 0, "damp",	xco, yco-171, 45, 19, NULL, 0, 0, 0, 0, "Number of frames to reach the target velocity");
-				uiDefButI(block, NUM, 0, "",		xco+45, yco-171, wval, 19, &oa->damping, 0.0, 1000.0, 100, 0, "");
+				uiDefButS(block, NUM, 0, "",		xco+45, yco-171, wval, 19, &oa->damping, 0.0, 1000.0, 100, 0, "");
 
 				uiDefButBitS(block, TOG, ACT_FORCE_LOCAL, 0, "L",		xco+45+3*wval, yco-45, 15, 19, &oa->flag, 0.0, 0.0, 0, 0, "Local transformation");
 				uiDefButBitS(block, TOG, ACT_TORQUE_LOCAL, 0, "L",		xco+45+3*wval, yco-64, 15, 19, &oa->flag, 0.0, 0.0, 0, 0, "Local transformation");
@@ -1758,23 +1769,27 @@ static short draw_actuatorbuttons(Object *ob, bActuator *act, uiBlock *block, sh
 #else
 			str= "Action types   %t|Play %x0|Flipper %x2|Loop Stop %x3|Loop End %x4|Property %x6";
 #endif
-			uiDefButS(block, MENU, B_REDR, str, xco+30, yco-24, (width-60)/2, 19, &aa->type, 0.0, 0.0, 0.0, 0.0, "Action playback type");
-			uiDefIDPoinBut(block, test_actionpoin_but, ID_AC, 1, "AC: ", xco+30 + ((width-60)/2), yco-24, (width-60)/2, 19, &aa->act, "Action name");
+			uiDefButS(block, MENU, B_REDR, str, xco+10, yco-24, width/3, 19, &aa->type, 0.0, 0.0, 0.0, 0.0, "Action playback type");
+			uiDefIDPoinBut(block, test_actionpoin_but, ID_AC, 1, "AC: ", xco+10+ (width/3), yco-24, ((width/3)*2) - (20 + 60), 19, &aa->act, "Action name");
+			
+			uiDefButBitS(block, TOGN, 1, 0, "Continue", xco+((width/3)*2)+20, yco-24, 60, 19,
+					 &aa->end_reset, 0.0, 0.0, 0, 0, "Restore last frame when switching on/off, otherwise play from the start each time");
+			
 			
 			if(aa->type == ACT_ACTION_FROM_PROP)
 			{
-				uiDefBut(block, TEX, 0, "Prop: ",xco+30, yco-44, width-60, 19, aa->name, 0.0, 31.0, 0, 0, "Use this property to define the Action position");
+				uiDefBut(block, TEX, 0, "Prop: ",xco+10, yco-44, width-20, 19, aa->name, 0.0, 31.0, 0, 0, "Use this property to define the Action position");
 			}
 			else
 			{
-				uiDefButI(block, NUM, 0, "Sta: ",xco+30, yco-44, (width-60)/2, 19, &aa->sta, 0.0, MAXFRAMEF, 0, 0, "Start frame");
-				uiDefButI(block, NUM, 0, "End: ",xco+30+(width-60)/2, yco-44, (width-60)/2, 19, &aa->end, 0.0, MAXFRAMEF, 0, 0, "End frame");
+				uiDefButI(block, NUM, 0, "Sta: ",xco+10, yco-44, (width-20)/2, 19, &aa->sta, 0.0, MAXFRAMEF, 0, 0, "Start frame");
+				uiDefButI(block, NUM, 0, "End: ",xco+10+(width-20)/2, yco-44, (width-20)/2, 19, &aa->end, 0.0, MAXFRAMEF, 0, 0, "End frame");
 			}
 						
-			uiDefButI(block, NUM, 0, "Blendin: ", xco+30, yco-64, (width-60)/2, 19, &aa->blendin, 0.0, MAXFRAMEF, 0.0, 0.0, "Number of frames of motion blending");
-			uiDefButS(block, NUM, 0, "Priority: ", xco+30+(width-60)/2, yco-64, (width-60)/2, 19, &aa->priority, 0.0, 100.0, 0.0, 0.0, "Execution priority - lower numbers will override actions with higher numbers, With 2 or more actions at once, the overriding channels must be lower in the stack");
+			uiDefButS(block, NUM, 0, "Blendin: ", xco+10, yco-64, (width-20)/2, 19, &aa->blendin, 0.0, 32767, 0.0, 0.0, "Number of frames of motion blending");
+			uiDefButS(block, NUM, 0, "Priority: ", xco+10+(width-20)/2, yco-64, (width-20)/2, 19, &aa->priority, 0.0, 100.0, 0.0, 0.0, "Execution priority - lower numbers will override actions with higher numbers, With 2 or more actions at once, the overriding channels must be lower in the stack");
 			
-			uiDefBut(block, TEX, 0, "FrameProp: ",xco+30, yco-84, width-60, 19, aa->frameProp, 0.0, 31.0, 0, 0, "Assign this property this actions current frame number");			
+			uiDefBut(block, TEX, 0, "FrameProp: ",xco+10, yco-84, width-20, 19, aa->frameProp, 0.0, 31.0, 0, 0, "Assign this property this actions current frame number");			
 
 			
 #ifdef __NLA_ACTION_BY_MOTION_ACTUATOR
@@ -1800,42 +1815,49 @@ static short draw_actuatorbuttons(Object *ob, bActuator *act, uiBlock *block, sh
 			
 			str = "Ipo types   %t|Play %x0|Ping Pong %x1|Flipper %x2|Loop Stop %x3|Loop End %x4|Property %x6";
 			
-			uiDefButS(block, MENU, B_REDR, str,		xco+20, yco-24, width-40 - (width-40)/3, 19, &ia->type, 0, 0, 0, 0, "");
-			uiDefButBitS(block, TOG, ACT_IPOCHILD,  B_REDR, 
-				"Child",	xco+20+0.666*(width-40), yco-24, (width-40)/3, 19, 
+			uiDefButS(block, MENU, B_REDR, str,		xco+10, yco-24, (width-20)/2, 19, &ia->type, 0, 0, 0, 0, "");
+
+			but = uiDefButBitS(block, TOG, ACT_IPOFORCE, ACT_IPOFORCE, 
+				"Force", xco+10+(width-20)/2, yco-24, (width-20)/4-10, 19, 
 				&ia->flag, 0, 0, 0, 0, 
-				"Add all children Objects as well");
+				"Convert Ipo to force. Force is applied in global or local coordinate according to Local flag"); 
+			uiButSetFunc(but, change_ipo_actuator, but, ia);
+
+			but = uiDefButBitS(block, TOG, ACT_IPOADD, ACT_IPOADD, 
+				"Add", xco+3*(width-20)/4, yco-24, (width-20)/4-10, 19, 
+				&ia->flag, 0, 0, 0, 0, 
+				"Ipo is added to the current loc/rot/scale in global or local coordinate according to Local flag"); 
+			uiButSetFunc(but, change_ipo_actuator, but, ia);
+			
+			/* Only show the do-force-local toggle if force is requested */
+			if (ia->flag & (ACT_IPOFORCE|ACT_IPOADD)) {
+				uiDefButBitS(block, TOG, ACT_IPOLOCAL, 0, 
+					"L", xco+width-30, yco-24, 20, 19, 
+					&ia->flag, 0, 0, 0, 0, 
+					"Let the ipo acts in local coordinates, used in Force and Add mode."); 
+			}
 
 			if(ia->type==ACT_IPO_FROM_PROP) {
 				uiDefBut(block, TEX, 0, 
-					"Prop: ",		xco+20, yco-44, width-40, 19, 
+					"Prop: ",		xco+10, yco-44, width-80, 19, 
 					ia->name, 0.0, 31.0, 0, 0, 
 					"Use this property to define the Ipo position");
 			}
 			else {
 				uiDefButI(block, NUM, 0, 
-					"Sta",		xco+20, yco-44, (width-100)/2, 19, 
+					"Sta",		xco+10, yco-44, (width-80)/2, 19, 
 					&ia->sta, 0.0, MAXFRAMEF, 0, 0, 
-					"Start frame");
+					"Start frame, (subtract 1 to match blenders frame numbers)");
 				uiDefButI(block, NUM, 0, 
-					"End",		xco+18+(width-90)/2, yco-44, (width-100)/2, 19, 
+					"End",		xco+10+(width-80)/2, yco-44, (width-80)/2, 19, 
 					&ia->end, 0.0, MAXFRAMEF, 0, 0, 
-					"End frame");
-				
-				uiDefButBitS(block, TOG, ACT_IPOFORCE, B_REDR, 
-					"Force", xco+width-78, yco-44, 43, 19, 
-					&ia->flag, 0, 0, 0, 0, 
-					"Convert Ipo to force"); 
-				
-				/* Only show the do-force-local toggle if force is requested */
-				if (ia->flag & ACT_IPOFORCE) {
-					uiDefButBitS(block, TOG, ACT_IPOFORCE_LOCAL, 0, 
-						"L", xco+width-35, yco-44, 15, 19, 
-						&ia->flag, 0, 0, 0, 0, 
-						"Let the force-ipo act in local coordinates."); 
-				}
-				
+					"End frame, (subtract 1 to match blenders frame numbers)");
 			}
+			uiDefButBitS(block, TOG, ACT_IPOCHILD,  B_REDR, 
+				"Child",	xco+10+(width-80), yco-44, 60, 19, 
+				&ia->flag, 0, 0, 0, 0, 
+				"Update IPO on all children Objects as well");
+
 			yco-= ysize;
 			break;
 		}
@@ -1967,7 +1989,7 @@ static short draw_actuatorbuttons(Object *ob, bActuator *act, uiBlock *block, sh
 			glRects(xco, yco-ysize, xco+width, yco);
 			uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
 	 
-			uiDefIDPoinBut(block, test_obpoin_but, ID_OB, 1, "OB:",		xco+10, yco-44, (width-20)/2, 19, &(eoa->ob), "Add this Object (cant be on an visible layer)");
+			uiDefIDPoinBut(block, test_obpoin_but, ID_OB, 1, "OB:",		xco+10, yco-44, (width-20)/2, 19, &(eoa->ob), "Add this Object and all its children (cant be on an visible layer)");
 			uiDefButI(block, NUM, 0, "Time:",	xco+10+(width-20)/2, yco-44, (width-20)/2, 19, &eoa->time, 0.0, 2000.0, 0, 0, "Duration the new Object lives");
 
 			wval= (width-60)/3;
@@ -2248,7 +2270,7 @@ static short draw_actuatorbuttons(Object *ob, bActuator *act, uiBlock *block, sh
 			uiDefBut(block, TEX, 0, "Prop: ",		xco+20, yco-44, width-40, 19, ga->name, 0.0, 31.0, 0, 0, "Use this property to define the Group position");
 		}
 		else {
-			uiDefButI(block, NUM, 0, "Sta",		xco+20, yco-44, (width-40)/2, 19, &ga->sta, 0.0, 2500.0, 0, 0, "Start frame");
+			uiDefButI(block, NUM, 0, "State",		xco+20, yco-44, (width-40)/2, 19, &ga->sta, 0.0, 2500.0, 0, 0, "Start frame");
 			uiDefButI(block, NUM, 0, "End",		xco+20+(width-40)/2, yco-44, (width-40)/2, 19, &ga->end, 0.0, 2500.0, 0, 0, "End frame");
 		}
 		yco-= ysize;
@@ -3171,7 +3193,7 @@ void logic_buts(void)
 					uiButSetFunc(but, check_object_state, but, &(ob->state));
 				}
 				for (stbit=0; stbit<5; stbit++) {
-					but = uiDefButBitI(block, controller_state_mask&(1<<(stbit+offset)) ? BUT_TOGDUAL:TOG, 1<<(stbit+offset+15), stbit+offset+15, "",	(short)(xco+35+12*stbit+13*offset), yco-12, 12, 12, (int *)&(ob->state), 0, 0, 0, 0, get_state_name(ob, (short)(stbit+offset+15)));
+					but = uiDefButBitI(block, controller_state_mask&(1<<(stbit+offset+15)) ? BUT_TOGDUAL:TOG, 1<<(stbit+offset+15), stbit+offset+15, "",	(short)(xco+35+12*stbit+13*offset), yco-12, 12, 12, (int *)&(ob->state), 0, 0, 0, 0, get_state_name(ob, (short)(stbit+offset+15)));
 					uiButSetFunc(but, check_object_state, but, &(ob->state));
 				}
 			}
@@ -3255,7 +3277,7 @@ void logic_buts(void)
 	uiDefButBitS(block, TOG, BUTS_SENS_SEL, B_REDR, "Sel", xco+80, yco+35, (width-70)/4, 19, &G.buts->scaflag, 0, 0, 0, 0, "Show all selected Objects");
 	uiDefButBitS(block, TOG, BUTS_SENS_ACT, B_REDR, "Act", xco+80+(width-70)/4, yco+35, (width-70)/4, 19, &G.buts->scaflag, 0, 0, 0, 0, "Show active Object");
 	uiDefButBitS(block, TOG, BUTS_SENS_LINK, B_REDR, "Link", xco+80+2*(width-70)/4, yco+35, (width-70)/4, 19, &G.buts->scaflag, 0, 0, 0, 0, "Show linked Objects to Controller");
-	uiDefButBitS(block, TOG, BUTS_SENS_STATE, B_REDR, "Sta", xco+80+3*(width-70)/4, yco+35, (width-70)/4, 19, &G.buts->scaflag, 0, 0, 0, 0, "Show only sensors connected to active states");
+	uiDefButBitS(block, TOG, BUTS_SENS_STATE, B_REDR, "State", xco+80+3*(width-70)/4, yco+35, (width-70)/4, 19, &G.buts->scaflag, 0, 0, 0, 0, "Show only sensors connected to active states");
 	uiBlockEndAlign(block);
 	
 	for(a=0; a<count; a++) {
@@ -3328,7 +3350,7 @@ void logic_buts(void)
 	uiDefButBitS(block, TOG, BUTS_ACT_SEL, B_REDR, "Sel", xco+110, yco+35, (width-100)/4, 19, &G.buts->scaflag, 0, 0, 0, 0, "Show all selected Objects");
 	uiDefButBitS(block, TOG, BUTS_ACT_ACT, B_REDR, "Act", xco+110+(width-100)/4, yco+35, (width-100)/4, 19, &G.buts->scaflag, 0, 0, 0, 0, "Show active Object");
 	uiDefButBitS(block, TOG, BUTS_ACT_LINK, B_REDR, "Link", xco+110+2*(width-100)/4, yco+35, (width-100)/4, 19, &G.buts->scaflag, 0, 0, 0, 0, "Show linked Objects to Controller");
-	uiDefButBitS(block, TOG, BUTS_ACT_STATE, B_REDR, "Sta", xco+110+3*(width-100)/4, yco+35, (width-100)/4, 19, &G.buts->scaflag, 0, 0, 0, 0, "Show only actuators connected to active states");
+	uiDefButBitS(block, TOG, BUTS_ACT_STATE, B_REDR, "State", xco+110+3*(width-100)/4, yco+35, (width-100)/4, 19, &G.buts->scaflag, 0, 0, 0, 0, "Show only actuators connected to active states");
 	uiBlockEndAlign(block);
 	for(a=0; a<count; a++) {
 		ob= (Object *)idar[a];
diff --git a/source/blender/src/buttons_object.c b/source/blender/src/buttons_object.c
index ba409723784..ebe770c89e7 100644
--- a/source/blender/src/buttons_object.c
+++ b/source/blender/src/buttons_object.c
@@ -4812,7 +4812,7 @@ static void object_panel_particle_system(Object *ob)
 	uiDefBut(block, LABEL, 0, "Basic:",					butx,(buty-=buth),butw,buth, NULL, 0.0, 0, 0, 0, "");
 	uiBlockBeginAlign(block);
 
-	if(part->distr==PART_DISTR_GRID)
+	if(part->distr==PART_DISTR_GRID && part->from != PART_FROM_VERT)
 		uiDefButI(block, NUM, B_PART_ALLOC, "Resol:",		butx,(buty-=buth),butw,buth, &part->grid_res, 1.0, 100.0, 0, 0, "The resolution of the particle grid");
 	else
 		uiDefButI(block, NUM, B_PART_ALLOC, "Amount:",		butx,(buty-=buth),butw,buth, &part->totpart, 0.0, 100000.0, 0, 0, "The total number of particles");
diff --git a/source/blender/src/buttons_scene.c b/source/blender/src/buttons_scene.c
index f136599519c..a58d44538a2 100644
--- a/source/blender/src/buttons_scene.c
+++ b/source/blender/src/buttons_scene.c
@@ -499,7 +499,7 @@ static char* seq_panel_blend_modes()
 	  so that would collide also.
 	*/
 
-	if (!(last_seq->type & SEQ_EFFECT)) {
+	if ( seq_can_blend(last_seq) ) {
 		int i;
 
 		for (i = SEQ_EFFECT; i <= SEQ_EFFECT_MAX; i++) {
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index ca6705b2084..1b580381ca5 100644
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -2900,15 +2900,15 @@ static void lamp_panel_lamp(Object *ob, Lamp *la)
 		uiBlockSetCol(block, TH_BUT_SETTING1);
 		uiDefButS(block, MENU, B_LAMPREDRAW,  "Falloff %t|Constant %x0|Inverse Linear %x1|Inverse Square %x2|Custom Curve %x3|Lin/Quad Weighted %x4|",
 			10,150,100,19, &la->falloff_type, 0,0,0,0, "Lamp falloff - intensity decay with distance");	
-		uiDefButBitS(block, TOG, LA_SPHERE, REDRAWVIEW3D,"Sphere",	10,130,100,19,&la->mode, 0, 0, 0, 0, "Sets light intensity to zero for objects beyond the distance value");
+		uiDefButBitS(block, TOG, LA_SPHERE, B_LAMPPRV,"Sphere",	10,130,100,19,&la->mode, 0, 0, 0, 0, "Sets light intensity to zero for objects beyond the distance value");
 	}
 
 	uiBlockBeginAlign(block);
 	uiBlockSetCol(block, TH_BUT_SETTING1);
 	uiDefButBitS(block, TOG, LA_LAYER, 0,"Layer",				10,70,100,19,&la->mode, 0, 0, 0, 0, "Illuminates objects in the same layer as the lamp only");
 	uiDefButBitS(block, TOG, LA_NEG, B_LAMPPRV,"Negative",	10,50,100,19,&la->mode, 0, 0, 0, 0, "Sets lamp to cast negative light");
-	uiDefButBitS(block, TOG, LA_NO_DIFF, 0,"No Diffuse",		10,30,100,19,&la->mode, 0, 0, 0, 0, "Disables diffuse shading of material illuminated by this lamp");
-	uiDefButBitS(block, TOG, LA_NO_SPEC, 0,"No Specular",		10,10,100,19,&la->mode, 0, 0, 0, 0, "Disables specular shading of material illuminated by this lamp");
+	uiDefButBitS(block, TOG, LA_NO_DIFF, B_LAMPPRV,"No Diffuse",		10,30,100,19,&la->mode, 0, 0, 0, 0, "Disables diffuse shading of material illuminated by this lamp");
+	uiDefButBitS(block, TOG, LA_NO_SPEC, B_LAMPPRV,"No Specular",		10,10,100,19,&la->mode, 0, 0, 0, 0, "Disables specular shading of material illuminated by this lamp");
 	uiBlockEndAlign(block);
 
 	uiBlockSetCol(block, TH_AUTO);
diff --git a/source/blender/src/drawarmature.c b/source/blender/src/drawarmature.c
index 73915a69139..6d78b21dfbb 100644
--- a/source/blender/src/drawarmature.c
+++ b/source/blender/src/drawarmature.c
@@ -2500,7 +2500,7 @@ static void draw_ghost_poses(Base *base)
 /* ********************************** Armature Drawing - Main ************************* */
 
 /* called from drawobject.c, return 1 if nothing was drawn */
-int draw_armature(Base *base, int dt)
+int draw_armature(Base *base, int dt, int flag)
 {
 	Object *ob= base->object;
 	bArmature *arm= ob->data;
@@ -2544,15 +2544,16 @@ int draw_armature(Base *base, int dt)
 						if (arm->ghostep)
 							draw_ghost_poses(base);
 					}
+					if ((flag & DRAW_SCENESET)==0) {
+						if(ob==OBACT) 
+							arm->flag |= ARM_POSEMODE;
+						else if(G.f & G_WEIGHTPAINT)
+							arm->flag |= ARM_POSEMODE;
 					
-					if(ob==OBACT) 
-						arm->flag |= ARM_POSEMODE;
-					else if(G.f & G_WEIGHTPAINT)
-						arm->flag |= ARM_POSEMODE;
-					
-					draw_pose_paths(ob);
+						draw_pose_paths(ob);
+					}
 				}	
-			}			
+			}
 			draw_pose_channels(base, dt);
 			arm->flag &= ~ARM_POSEMODE; 
 			
diff --git a/source/blender/src/drawimage.c b/source/blender/src/drawimage.c
index 547de85e856..14849cdd450 100644
--- a/source/blender/src/drawimage.c
+++ b/source/blender/src/drawimage.c
@@ -422,7 +422,7 @@ int draw_uvs_face_check(void)
 			return 1;
 		} 
 	} else {
-		if (G.sima->flag & SI_SELACTFACE) {
+		if (G.sima->selectmode == SI_SELECT_FACE) {
 			return 1;
 		}
 	}
diff --git a/source/blender/src/drawobject.c b/source/blender/src/drawobject.c
index 96ba8c71755..045bf292446 100644
--- a/source/blender/src/drawobject.c
+++ b/source/blender/src/drawobject.c
@@ -4620,7 +4620,7 @@ static void drawSolidSelect(Base *base)
 	}
 	else if(ob->type==OB_ARMATURE) {
 		if(!(ob->flag & OB_POSEMODE)) {
-			draw_armature(base, OB_WIRE);
+			draw_armature(base, OB_WIRE, 0);
 		}
 	}
 
@@ -4741,7 +4741,7 @@ void drawRBpivot(bRigidBodyJointConstraint *data){
 	setlinestyle(0);
 }
 
-/* flag can be DRAW_PICKING	and/or DRAW_CONSTCOLOR */
+/* flag can be DRAW_PICKING	and/or DRAW_CONSTCOLOR, DRAW_SCENESET */
 void draw_object(Base *base, int flag)
 {
 	static int warning_recursive= 0;
@@ -4943,7 +4943,7 @@ void draw_object(Base *base, int flag)
 
 	/* draw outline for selected solid objects, mesh does itself */
 	if((G.vd->flag & V3D_SELECT_OUTLINE) && ob->type!=OB_MESH) {
-		if(dt>OB_WIRE && dt<OB_TEXTURE && ob!=G.obedit) {
+		if(dt>OB_WIRE && dt<OB_TEXTURE && ob!=G.obedit && (flag && DRAW_SCENESET)==0) {
 			if (!(ob->dtx&OB_DRAWWIRE) && (ob->flag&SELECT) && !(flag&DRAW_PICKING)) {
 				drawSolidSelect(base);
 			}
@@ -5090,7 +5090,7 @@ void draw_object(Base *base, int flag)
 			break;
 		case OB_ARMATURE:
 			if(dt>OB_WIRE) set_gl_material(0);	// we use defmaterial
-			empty_object= draw_armature(base, dt);
+			empty_object= draw_armature(base, dt, flag);
 			break;
 		default:
 			drawaxes(1.0, flag, OB_ARROWS);
diff --git a/source/blender/src/drawview.c b/source/blender/src/drawview.c
index 2f1cdb8b951..f595a101f63 100644
--- a/source/blender/src/drawview.c
+++ b/source/blender/src/drawview.c
@@ -3097,7 +3097,7 @@ void drawview3dspace(ScrArea *sa, void *spacedata)
 			if(v3d->lay & base->lay) {
 				
 				BIF_ThemeColorBlend(TH_WIRE, TH_BACK, 0.6f);
-				draw_object(base, DRAW_CONSTCOLOR);
+				draw_object(base, DRAW_CONSTCOLOR|DRAW_SCENESET);
 
 				if(base->object->transflag & OB_DUPLI) {
 					draw_dupli_objects_color(v3d, base, TH_WIRE);
@@ -3319,7 +3319,7 @@ void drawview3d_render(struct View3D *v3d, int winx, int winy, float winmat[][4]
 					where_is_object(base->object);
 	
 					BIF_ThemeColorBlend(TH_WIRE, TH_BACK, 0.6f);
-					draw_object(base, DRAW_CONSTCOLOR);
+					draw_object(base, DRAW_CONSTCOLOR|DRAW_SCENESET);
 	
 					if(base->object->transflag & OB_DUPLI) {
 						draw_dupli_objects(v3d, base);
diff --git a/source/blender/src/editarmature.c b/source/blender/src/editarmature.c
index 39f93510358..6310dd0a262 100644
--- a/source/blender/src/editarmature.c
+++ b/source/blender/src/editarmature.c
@@ -1646,8 +1646,9 @@ void load_editArmature(void)
 }
 
 /* toggle==0: deselect
-   toggle==1: swap 
+   toggle==1: swap (based on test)
    toggle==2: only active tag
+   toggle==3: swap (no test)
 */
 void deselectall_armature(int toggle, int doundo)
 {
@@ -1670,18 +1671,30 @@ void deselectall_armature(int toggle, int doundo)
 	else sel= toggle;
 	
 	/*	Set the flags */
-	for (eBone=G.edbo.first;eBone;eBone=eBone->next){
-		if (sel==1) {
+	for (eBone=G.edbo.first;eBone;eBone=eBone->next) {
+		if (sel==3) {
+			/* invert selection of bone */
+			if ((arm->layer & eBone->layer) && (eBone->flag & BONE_HIDDEN_A)==0) {
+				eBone->flag ^= (BONE_SELECTED | BONE_TIPSEL | BONE_ROOTSEL);
+				eBone->flag &= ~BONE_ACTIVE;
+			}
+		}
+		else if (sel==1) {
+			/* select bone */
 			if(arm->layer & eBone->layer && (eBone->flag & BONE_HIDDEN_A)==0) {
 				eBone->flag |= (BONE_SELECTED | BONE_TIPSEL | BONE_ROOTSEL);
 				if(eBone->parent)
 					eBone->parent->flag |= (BONE_TIPSEL);
 			}
 		}
-		else if (sel==2)
+		else if (sel==2) {
+			/* clear active flag */
 			eBone->flag &= ~(BONE_ACTIVE);
-		else
+		}
+		else {
+			/* deselect bone */
 			eBone->flag &= ~(BONE_SELECTED | BONE_TIPSEL | BONE_ROOTSEL | BONE_ACTIVE);
+		}
 	}
 	
 	allqueue(REDRAWVIEW3D, 0);
@@ -3276,8 +3289,9 @@ int do_pose_selectbuffer(Base *base, unsigned int *buffer, short hits)
 }
 
 /* test==0: deselect all
-   test==1: swap select
-   test==2: only clear active tag 
+   test==1: swap select (apply to all the opposite of current situation) 
+   test==2: only clear active tag
+   test==3: swap select (no test / inverse selection status of all independently)
 */
 void deselectall_posearmature (Object *ob, int test, int doundo)
 {
@@ -3307,16 +3321,27 @@ void deselectall_posearmature (Object *ob, int test, int doundo)
 	/*	Set the flags accordingly	*/
 	for (pchan= ob->pose->chanbase.first; pchan; pchan= pchan->next) {
 		if ((pchan->bone->layer & arm->layer) && !(pchan->bone->flag & BONE_HIDDEN_P)) {
-			if (selectmode==0) pchan->bone->flag &= ~(BONE_SELECTED|BONE_TIPSEL|BONE_ROOTSEL|BONE_ACTIVE);
-			else if (selectmode==1) pchan->bone->flag |= BONE_SELECTED;
-			else pchan->bone->flag &= ~BONE_ACTIVE;
+			if (test==3) {
+				pchan->bone->flag ^= (BONE_SELECTED|BONE_TIPSEL|BONE_ROOTSEL);
+				pchan->bone->flag &= ~BONE_ACTIVE;
+			}
+			else {
+				if (selectmode==0) pchan->bone->flag &= ~(BONE_SELECTED|BONE_TIPSEL|BONE_ROOTSEL|BONE_ACTIVE);
+				else if (selectmode==1) pchan->bone->flag |= BONE_SELECTED;
+				else pchan->bone->flag &= ~BONE_ACTIVE;
+			}
 		}
 	}
 	
 	/* action editor */
-	deselect_actionchannels(ob->action, 0);	/* deselects for sure */
-	if (selectmode == 1)
-		deselect_actionchannels(ob->action, 1);	/* swaps */
+	if (test == 3) {
+		deselect_actionchannels(ob->action, 2); /* inverts selection */
+	}
+	else {
+		deselect_actionchannels(ob->action, 0);	/* deselects for sure */
+		if (selectmode == 1)
+			deselect_actionchannels(ob->action, 1);	/* swaps */
+	}
 	
 	allqueue(REDRAWBUTSEDIT, 0);
 	allqueue(REDRAWBUTSOBJECT, 0);
diff --git a/source/blender/src/editmesh_add.c b/source/blender/src/editmesh_add.c
index 952ae957f34..9516f39b05c 100644
--- a/source/blender/src/editmesh_add.c
+++ b/source/blender/src/editmesh_add.c
@@ -379,7 +379,7 @@ static EditFace *addface_from_edges(void)
 	
 	/* find the 4 edges */
 	for(eed= em->edges.first; eed; eed= eed->next) {
-		if(eed->f & SELECT) {
+		if( (eed->f & SELECT) || (eed->v1->f & eed->v2->f & SELECT) ) {
 			if(eedar[0]==NULL) eedar[0]= eed;
 			else if(eedar[1]==NULL) eedar[1]= eed;
 			else if(eedar[2]==NULL) eedar[2]= eed;
@@ -765,6 +765,7 @@ void addedgeface_mesh(void)
 				/* if 4 edges exist, we just create the face, convex or not */
 					efa= addface_from_edges();
 					if(efa==NULL) {
+						
 						/* the order of vertices can be anything, 6 cases to check */
 						if( convex(neweve[0]->co, neweve[1]->co, neweve[2]->co, neweve[3]->co) ) {
 							efa= addfacelist(neweve[0], neweve[1], neweve[2], neweve[3], NULL, NULL);
@@ -775,17 +776,16 @@ void addedgeface_mesh(void)
 						else if( convex(neweve[0]->co, neweve[2]->co, neweve[1]->co, neweve[3]->co) ) {
 							efa= addfacelist(neweve[0], neweve[2], neweve[1], neweve[3], NULL, NULL);
 						}
-						
-						else if( convex(neweve[1]->co, neweve[2]->co, neweve[3]->co, neweve[0]->co) ) {
-							efa= addfacelist(neweve[1], neweve[2], neweve[3], neweve[0], NULL, NULL);
+						else if( convex(neweve[0]->co, neweve[1]->co, neweve[3]->co, neweve[2]->co) ) {
+							efa= addfacelist(neweve[0], neweve[1], neweve[3], neweve[2], NULL, NULL);
 						}
-						else if( convex(neweve[1]->co, neweve[3]->co, neweve[0]->co, neweve[2]->co) ) {
-							efa= addfacelist(neweve[1], neweve[3], neweve[0], neweve[2], NULL, NULL);
+						else if( convex(neweve[0]->co, neweve[3]->co, neweve[2]->co, neweve[1]->co) ) {
+							efa= addfacelist(neweve[0], neweve[3], neweve[2], neweve[1], NULL, NULL);
 						}
-						else if( convex(neweve[1]->co, neweve[3]->co, neweve[2]->co, neweve[0]->co) ) {
-							efa= addfacelist(neweve[1], neweve[3], neweve[2], neweve[0], NULL, NULL);
+						else if( convex(neweve[0]->co, neweve[3]->co, neweve[1]->co, neweve[2]->co) ) {
+							efa= addfacelist(neweve[0], neweve[3], neweve[1], neweve[2], NULL, NULL);
 						}
-						else error("The selected vertices form a concave quad");
+						else printf("cannot find nice quad from concave set of vertices\n");
 					}
 				}
 			}
diff --git a/source/blender/src/editnla.c b/source/blender/src/editnla.c
index d758f34949a..dbc0deecb2c 100644
--- a/source/blender/src/editnla.c
+++ b/source/blender/src/editnla.c
@@ -501,26 +501,47 @@ static void set_active_strip(Object *ob, bActionStrip *act)
 {
 	bActionStrip *strip;
 	
+	/* make sure all other strips are not active */
 	for (strip = ob->nlastrips.first; strip; strip=strip->next)
 		strip->flag &= ~ACTSTRIP_ACTIVE;
 	
-	if(act) {
+	/* act is new active strip */
+	if (act) {
+		/* set active flag for this strip */
 		act->flag |= ACTSTRIP_ACTIVE;
-	
-		if(ob->action!=act->act) {
-			if(ob->action) ob->action->id.us--;
-			if(act->act->id.lib) {
+		
+		/* check if active action will still be the same one */
+		if (ob->action != act->act) {
+			/* clear object's links with its current action (if present) */
+			if (ob->action) {
+				ob->action->id.us--;
+			}
+			
+			/* only set object's action to active strip's action if possible */
+			if (act->act->id.lib) {
 				ob->action= NULL;
 			}
 			else {
 				ob->action= act->act;
 				id_us_plus(&ob->action->id);
-			}			
+			}	
+			
+			/* request redrawing in relevant spaces */
 			allqueue(REDRAWIPO, 0);
 			allqueue(REDRAWVIEW3D, 0);
 			allqueue(REDRAWACTION, 0);
 			allqueue(REDRAWNLA, 0);
-			ob->ctime= -1234567.0f;	// eveil! 
+			
+			/* when only showing action (i.e. nla-override off), 
+			 * reset pose to restpose for armatures 
+			 */
+			if ((ob->nlaflag & OB_NLA_OVERRIDE)==0) {
+				if (ob->type == OB_ARMATURE)
+					rest_pose(ob->pose);
+			}
+			
+			/* flush depsgraph */
+			ob->ctime= -1234567.0f;	// evil! 
 			DAG_object_flush_update(G.scene, ob, OB_RECALC_OB|OB_RECALC_DATA);
 		}
 	}	
diff --git a/source/blender/src/editsima.c b/source/blender/src/editsima.c
index 18a9803dcae..69070d61bf0 100644
--- a/source/blender/src/editsima.c
+++ b/source/blender/src/editsima.c
@@ -694,7 +694,7 @@ void mouse_select_sima(void)
 	EditFace *efa;
 	MTFace *tf, *nearesttf;
 	EditFace *nearestefa=NULL;
-	int a, selectsticky, edgeloop, actface, nearestuv, nearestedge, i, shift;
+	int a, selectsticky, edgeloop, actface, nearestuv, nearestedge, i, shift, island=0;
 	char sticky= 0;
 	int flush = 0; /* 0 == dont flush, 1 == sel, -1 == desel;  only use when selection sync is enabled */
 	unsigned int hitv[4], nearestv;
@@ -706,7 +706,7 @@ void mouse_select_sima(void)
 	
 	edgeloop= G.qual & LR_ALTKEY;
 	shift= G.qual & LR_SHIFTKEY;
-
+	
 	if (G.sima->flag & SI_SYNC_UVSEL) {
 		/* copy from mesh */
 		if (G.scene->selectmode == SCE_SELECT_FACE) {
@@ -718,7 +718,8 @@ void mouse_select_sima(void)
 		}
 	} else {
 		/* normal operation */
-		actface= G.sima->flag & SI_SELACTFACE;
+		actface= G.sima->selectmode == SI_SELECT_FACE;
+		island= G.sima->selectmode == SI_SELECT_ISLAND;
 		
 		switch(G.sima->sticky) {
 		case SI_STICKY_LOC:
@@ -760,6 +761,9 @@ void mouse_select_sima(void)
 		
 		if (nearestefa->v4)	hitv[3]= nearestefa->v4->tmp.l;
 		else				hitv[3]= 0xFFFFFFFF;
+	}
+	else if (island) {
+
 	}
 	else {
 		find_nearest_uv(&nearesttf, &nearestefa, &nearestv, &nearestuv);
@@ -774,7 +778,11 @@ void mouse_select_sima(void)
 		}
 	}
 
-	if(!edgeloop && shift) {
+	if (island) {
+		if(shift) select_linked_tface_uv(1);
+		else select_linked_tface_uv(0);
+	}
+	else if(!edgeloop && shift) {
 		/* (de)select face */
 		if(actface) {
 			if(simaFaceSel_Check(nearestefa, nearesttf)) {
diff --git a/source/blender/src/edittime.c b/source/blender/src/edittime.c
index 5a10ea65738..2c37a0eb20f 100644
--- a/source/blender/src/edittime.c
+++ b/source/blender/src/edittime.c
@@ -803,11 +803,11 @@ static void timeline_force_draw(short val)
 		if(sa->spacetype==SPACE_VIEW3D) {
 			if(sa==samin || (val & TIME_ALL_3D_WIN)) dodraw= 1;
 		}
-		else if(ELEM6(sa->spacetype, SPACE_NLA, SPACE_IPO, SPACE_SEQ, SPACE_BUTS, SPACE_ACTION, SPACE_SOUND)) {
+		else if(ELEM5(sa->spacetype, SPACE_NLA, SPACE_IPO, SPACE_SEQ, SPACE_ACTION, SPACE_SOUND)) {
 			if(val & TIME_ALL_ANIM_WIN) dodraw= 1;
 		}
 		else if(sa->spacetype==SPACE_BUTS) {
-			if(val & TIME_ALL_BUTS_WIN) dodraw= 1;
+			if(val & TIME_ALL_BUTS_WIN) dodraw= 2;
 		}
 		else if(sa->spacetype==SPACE_IMAGE) {
 			if (val & TIME_ALL_IMAGE_WIN) dodraw = 1;
diff --git a/source/blender/src/header_image.c b/source/blender/src/header_image.c
index 7ac57cb839b..fac9e3af1af 100644
--- a/source/blender/src/header_image.c
+++ b/source/blender/src/header_image.c
@@ -1214,28 +1214,31 @@ void image_buttons(void)
 			uiBlockBeginAlign(block);
 			
 			/* B_SEL_VERT & B_SEL_FACE are not defined here which is a bit bad, BUT it works even if image editor is fullscreen */
-			uiDefIconButBitS(block, TOG, SCE_SELECT_VERTEX, B_SEL_VERT, ICON_VERTEXSEL, xco,0,XIC,YIC, &G.scene->selectmode, 1.0, 0.0, 0, 0, "Vertex select mode (Ctrl Tab 1)");
-			xco+= XIC;
+			uiDefIconButBitS(block, TOG, SCE_SELECT_VERTEX, B_SEL_VERT, ICON_VERTEXSEL,
+				xco,0,XIC,YIC, &G.scene->selectmode, 1.0, 0.0, 0, 0, "Vertex select mode (Ctrl Tab 1)");
 			/* no edge */
 			/*uiDefIconButBitS(block, TOG, SCE_SELECT_EDGE, B_SEL_EDGE, ICON_EDGESEL, xco,0,XIC,YIC, &G.scene->selectmode, 1.0, 0.0, 0, 0, "Edge select mode (Ctrl Tab 2)");
 			xco+= XIC; */
-			uiDefIconButBitS(block, TOG, SCE_SELECT_FACE, B_SEL_FACE, ICON_FACESEL, xco,0,XIC,YIC, &G.scene->selectmode, 1.0, 0.0, 0, 0, "Face select mode (Ctrl Tab 3)");
-			xco+= XIC+8;
+			uiDefIconButBitS(block, TOG, SCE_SELECT_FACE, B_SEL_FACE, ICON_FACESEL,
+				xco+=XIC,0,XIC,YIC, &G.scene->selectmode, 1.0, 0.0, 0, 0, "Face select mode (Ctrl Tab 3)");
 			uiBlockEndAlign(block);
 			
 		} else {
 			uiBlockBeginAlign(block);
-			uiDefIconButBitI(block, TOGN, SI_SELACTFACE, B_REDR, ICON_VERTEXSEL, xco,0,XIC,YIC, &G.sima->flag, 1.0, 0.0, 0, 0, "UV Vertex select mode");
-			xco+= XIC;
-			uiDefIconButBitI(block, TOG, SI_SELACTFACE, B_REDR, ICON_FACESEL, xco,0,XIC,YIC, &G.sima->flag, 0, 0, 0, 0, "UV Face select mode");
-			xco+= XIC+8;
-			uiBlockEndAlign(block);
 			
+			uiDefIconButS(block,  ROW, B_REDR, ICON_VERTEXSEL,
+				xco,0,XIC,YIC, &G.sima->selectmode, 0.0, SI_SELECT_VERTEX, 0, 0, "UV vertex select mode");
+			uiDefIconButS(block,  ROW, B_REDR, ICON_FACESEL,
+				xco+=XIC,0,XIC,YIC, &G.sima->selectmode, 0.0, SI_SELECT_FACE, 0, 0, "UV Face select mode");
+			uiDefIconButS(block,  ROW, B_REDR, ICON_MESH,
+				xco+=XIC,0,XIC,YIC, &G.sima->selectmode, 0.0, SI_SELECT_ISLAND, 0, 0, "UV Island select mode");
+			uiBlockEndAlign(block);
+
 			/* would use these if const's could go in strings 
 			 * SI_STICKY_LOC SI_STICKY_DISABLE SI_STICKY_VERTEX */
 			ubut = uiDefIconTextButC(block, ICONTEXTROW, B_REDR, ICON_STICKY_UVS_LOC,
 					"Sticky UV Selection: %t|Disable%x1|Shared Location%x0|Shared Vertex%x2",
-					xco,0,XIC+10,YIC, &(G.sima->sticky), 0, 3.0, 0, 0,
+					xco+=XIC+10,0,XIC+10,YIC, &(G.sima->sticky), 0, 3.0, 0, 0,
 					"Sticky UV Selection (Hotkeys: Shift C, Alt C, Ctrl C)");
 			
 		}
diff --git a/source/blender/src/header_view3d.c b/source/blender/src/header_view3d.c
index 1ada2729289..0f3a46c8a8c 100644
--- a/source/blender/src/header_view3d.c
+++ b/source/blender/src/header_view3d.c
@@ -1313,6 +1313,9 @@ static void do_view3d_select_armaturemenu(void *arg, int event)
 		case 3: /* Select Parent(s) */	
 			select_bone_parent();
 			break;
+		case 4: /* Swap Select All */
+			deselectall_armature(3, 1);
+			break;
 	}
 	allqueue(REDRAWVIEW3D, 0);
 }
@@ -1331,6 +1334,8 @@ static uiBlock *view3d_select_armaturemenu(void *arg_unused)
 	
 	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, "Swap Select All|Ctrl I",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 4, "");
+	
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Select Parent(s)|P",					0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 3, "");
 
 	if(curarea->headertype==HEADERTOP) {
@@ -1356,12 +1361,15 @@ static void do_view3d_select_pose_armaturemenu(void *arg, int event)
 	case 2: /* Select/Deselect all */
 		deselectall_posearmature(OBACT, 1, 1);
 		break;
-	case 3:
+	case 3: /* Select Target(s) of Constraint(s) */
 		pose_select_constraint_target();
 		break;
-	case 4:
+	case 4: /* Select Bone's Parent */
 		select_bone_parent();
 		break;
+	case 5: /* Swap Select All */
+		deselectall_posearmature(OBACT, 3, 1);
+		break;
 	}
 	allqueue(REDRAWVIEW3D, 0);
 }
@@ -1379,6 +1387,7 @@ static uiBlock *view3d_select_pose_armaturemenu(void *arg_unused)
 	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, "Swap Select All|Ctrl I",				0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 5, "");
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Select Constraint Target|W",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 3, "");
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Select Parent(s)|P",					0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 4, "");
 
@@ -4106,7 +4115,7 @@ static uiBlock *view3d_pose_armature_ikmenu(void *arg_unused)
 	block= uiNewBlock(&curarea->uiblocks, "view3d_pose_armature_ikmenu", UI_EMBOSSP, UI_HELV, G.curscreen->mainwin);
 	uiBlockSetButmFunc(block, do_view3d_pose_armature_ikmenu, NULL);
 	
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Add IK to Bone...|Ctrl I",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Add IK to Bone...|Shift I",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Clear IK...|Alt I",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 2, "");
 	
 	uiBlockSetDirection(block, UI_RIGHT);
diff --git a/source/blender/src/sequence.c b/source/blender/src/sequence.c
index 6851929bbc2..9426548dc38 100644
--- a/source/blender/src/sequence.c
+++ b/source/blender/src/sequence.c
@@ -2380,6 +2380,16 @@ ImBuf *give_ibuf_seq(int rectx, int recty, int cfra, int chanshown)
 	return i;
 }
 
+/* check used when we need to change seq->blend_mode but not to effect or audio strips */
+int seq_can_blend(Sequence *seq)
+{
+	if (ELEM4(seq->type, SEQ_IMAGE, SEQ_META, SEQ_SCENE, SEQ_MOVIE)) {
+		return 1;
+	} else {
+		return 0;
+	}
+}
+
 /* threading api */
 
 static ListBase running_threads;
diff --git a/source/blender/src/space.c b/source/blender/src/space.c
index 4422411b1c5..3b8bb4c3929 100644
--- a/source/blender/src/space.c
+++ b/source/blender/src/space.c
@@ -2189,10 +2189,14 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 				break;
 			case IKEY:
 				if(G.qual==LR_CTRLKEY) {
-					if(ob && (ob->flag & OB_POSEMODE) && ob->type==OB_ARMATURE)
-						pose_add_IK();
-					else if(ob && G.obedit)
-						selectswap_mesh();
+					if((ob) && (ob->flag & OB_POSEMODE) && (ob->type==OB_ARMATURE))
+						deselectall_posearmature(ob, 3, 1);
+					else if(ob && G.obedit) {
+						if(G.obedit->type == OB_ARMATURE)
+							deselectall_armature(3, 1);
+						else
+							selectswap_mesh();
+					}
 					else
 						selectswap();
 				}
@@ -2200,6 +2204,10 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 					if(ob && (ob->flag & OB_POSEMODE) && ob->type==OB_ARMATURE)
 						pose_clear_IK();
 				}
+				else if(G.qual==LR_SHIFTKEY) {
+					if(ob && (ob->flag & OB_POSEMODE) && ob->type==OB_ARMATURE)
+						pose_add_IK();
+				}
 				break;
 				
 			case JKEY:
@@ -4432,7 +4440,10 @@ static void winqreadinfospace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 
 		switch(event) {
 		case UI_BUT_EVENT:
-			if(val==REDRAWTIME) allqueue(REDRAWTIME, 0);
+			if(val==REDRAWTIME) {
+				allqueue(REDRAWTIME, 0);
+				addqueue(sa->win, REDRAW, 1);
+			}
 			else if(val==B_ADD_THEME) {
 				bTheme *btheme, *new;
 				
diff --git a/source/blender/src/transform_conversions.c b/source/blender/src/transform_conversions.c
index dcebf6b7557..10e49cdd218 100644
--- a/source/blender/src/transform_conversions.c
+++ b/source/blender/src/transform_conversions.c
@@ -3610,6 +3610,7 @@ void special_aftertrans_update(TransInfo *t)
 	Base *base;
 	short redrawipo=0, resetslowpar=1;
 	int cancelled= (t->state == TRANS_CANCEL);
+	short duplicate= (t->undostr && strstr(t->undostr, "Duplicate")) ? 1 : 0;
 	
 	if (t->spacetype==SPACE_VIEW3D) {
 		if (G.obedit) {
@@ -3622,7 +3623,7 @@ void special_aftertrans_update(TransInfo *t)
 			}
 		}
 	}
-	if (t->spacetype == SPACE_ACTION) {
+	else if (t->spacetype == SPACE_ACTION) {
 		void *data;
 		short datatype;
 		
@@ -3644,7 +3645,7 @@ void special_aftertrans_update(TransInfo *t)
 			
 			/* Do curve cleanups? */
 			if ( (G.saction->flag & SACTION_NOTRANSKEYCULL)==0 && 
-			     (cancelled == 0) )
+			     ((cancelled == 0) || (duplicate)) )
 			{
 				posttrans_action_clean((bAction *)data);
 			}
@@ -3659,7 +3660,7 @@ void special_aftertrans_update(TransInfo *t)
 				IpoCurve *icu;
 				
 				if ( (G.saction->flag & SACTION_NOTRANSKEYCULL)==0 && 
-				     (cancelled == 0) )
+				     ((cancelled == 0) || (duplicate)) )
 				{
 					posttrans_ipo_clean(key->ipo);
 				}
@@ -3685,7 +3686,7 @@ void special_aftertrans_update(TransInfo *t)
 		
 		/* after transform, remove duplicate keyframes on a frame that resulted from transform */
 		if ( (G.snla->flag & SNLA_NOTRANSKEYCULL)==0 && 
-			 (cancelled == 0) )
+			 ((cancelled == 0) || (duplicate)) )
 		{
 			posttrans_nla_clean(t);
 		}
diff --git a/source/blender/src/usiblender.c b/source/blender/src/usiblender.c
index 2a4672e3052..4aea0df74b9 100644
--- a/source/blender/src/usiblender.c
+++ b/source/blender/src/usiblender.c
@@ -34,6 +34,8 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "GL/glew.h"
+
 #ifdef WIN32
 #include <windows.h> /* need to include windows.h so _WIN32_IE is defined  */
 #ifndef _WIN32_IE
diff --git a/source/blender/src/view.c b/source/blender/src/view.c
index f457f9203ff..12450bee9de 100644
--- a/source/blender/src/view.c
+++ b/source/blender/src/view.c
@@ -1154,7 +1154,7 @@ void viewmoveNDOF(int mode)
     float q1[4];
     float obofs[3];
     float reverse;
-    float diff[4];
+    //float diff[4];
     float d, curareaX, curareaY;
     float mat[3][3];
     float upvec[3];
diff --git a/source/blender/src/vpaint.c b/source/blender/src/vpaint.c
index 4e883caba55..935c546a235 100644
--- a/source/blender/src/vpaint.c
+++ b/source/blender/src/vpaint.c
@@ -566,9 +566,9 @@ static unsigned int mcol_blend(unsigned int col1, unsigned int col2, int fac)
 	cp=  (char *)&col;
 	
 	cp[0]= 255;
-	cp[1]= (mfac*cp1[1]+fac*cp2[1])>>8;
-	cp[2]= (mfac*cp1[2]+fac*cp2[2])>>8;
-	cp[3]= (mfac*cp1[3]+fac*cp2[3])>>8;
+	cp[1]= (mfac*cp1[1]+fac*cp2[1])/255;
+	cp[2]= (mfac*cp1[2]+fac*cp2[2])/255;
+	cp[3]= (mfac*cp1[3]+fac*cp2[3])/255;
 	
 	return col;
 }
@@ -586,11 +586,11 @@ static unsigned int mcol_add(unsigned int col1, unsigned int col2, int fac)
 	cp=  (char *)&col;
 	
 	cp[0]= 255;
-	temp= cp1[1] + ((fac*cp2[1])>>8);
+	temp= cp1[1] + ((fac*cp2[1])/255);
 	if(temp>254) cp[1]= 255; else cp[1]= temp;
-	temp= cp1[2] + ((fac*cp2[2])>>8);
+	temp= cp1[2] + ((fac*cp2[2])/255);
 	if(temp>254) cp[2]= 255; else cp[2]= temp;
-	temp= cp1[3] + ((fac*cp2[3])>>8);
+	temp= cp1[3] + ((fac*cp2[3])/255);
 	if(temp>254) cp[3]= 255; else cp[3]= temp;
 	
 	return col;
@@ -609,11 +609,11 @@ static unsigned int mcol_sub(unsigned int col1, unsigned int col2, int fac)
 	cp=  (char *)&col;
 	
 	cp[0]= 255;
-	temp= cp1[1] - ((fac*cp2[1])>>8);
+	temp= cp1[1] - ((fac*cp2[1])/255);
 	if(temp<0) cp[1]= 0; else cp[1]= temp;
-	temp= cp1[2] - ((fac*cp2[2])>>8);
+	temp= cp1[2] - ((fac*cp2[2])/255);
 	if(temp<0) cp[2]= 0; else cp[2]= temp;
-	temp= cp1[3] - ((fac*cp2[3])>>8);
+	temp= cp1[3] - ((fac*cp2[3])/255);
 	if(temp<0) cp[3]= 0; else cp[3]= temp;
 	
 	return col;
@@ -635,9 +635,9 @@ static unsigned int mcol_mul(unsigned int col1, unsigned int col2, int fac)
 	
 	/* first mul, then blend the fac */
 	cp[0]= 255;
-	cp[1]= (mfac*cp1[1] + fac*((cp2[1]*cp1[1])>>8)  )>>8;
-	cp[2]= (mfac*cp1[2] + fac*((cp2[2]*cp1[2])>>8)  )>>8;
-	cp[3]= (mfac*cp1[3] + fac*((cp2[3]*cp1[3])>>8)  )>>8;
+	cp[1]= (mfac*cp1[1] + fac*((cp2[1]*cp1[1])/255)  )/255;
+	cp[2]= (mfac*cp1[2] + fac*((cp2[2]*cp1[2])/255)  )/255;
+	cp[3]= (mfac*cp1[3] + fac*((cp2[3]*cp1[3])/255)  )/255;
 
 	
 	return col;
@@ -664,9 +664,9 @@ static unsigned int mcol_lighten(unsigned int col1, unsigned int col2, int fac)
 		return col1;
 	
 	cp[0]= 255;
-	cp[1]= (mfac*cp1[1]+fac*cp2[1])>>8;
-	cp[2]= (mfac*cp1[2]+fac*cp2[2])>>8;
-	cp[3]= (mfac*cp1[3]+fac*cp2[3])>>8;
+	cp[1]= (mfac*cp1[1]+fac*cp2[1])/255;
+	cp[2]= (mfac*cp1[2]+fac*cp2[2])/255;
+	cp[3]= (mfac*cp1[3]+fac*cp2[3])/255;
 	
 	return col;
 }
@@ -692,9 +692,9 @@ static unsigned int mcol_darken(unsigned int col1, unsigned int col2, int fac)
 		return col1;
 	
 	cp[0]= 255;
-	cp[1]= (mfac*cp1[1]+fac*cp2[1])>>8;
-	cp[2]= (mfac*cp1[2]+fac*cp2[2])>>8;
-	cp[3]= (mfac*cp1[3]+fac*cp2[3])>>8;
+	cp[1]= (mfac*cp1[1]+fac*cp2[1])/255;
+	cp[2]= (mfac*cp1[2]+fac*cp2[2])/255;
+	cp[3]= (mfac*cp1[3]+fac*cp2[3])/255;
 	return col;
 }
 
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp b/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
index 230d6b262c6..ed6ea7c5f6a 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
+++ b/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
@@ -26,6 +26,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#include "GL/glew.h"
 #include "KX_BlenderGL.h"
 
 #ifdef HAVE_CONFIG_H
@@ -44,7 +45,6 @@
 
 #include "BMF_Api.h"
 
-#include "GL/glew.h"
 #include "BIF_gl.h"
 
 #include "BL_Material.h" // MAXTEX
diff --git a/source/gameengine/Converter/BL_ActionActuator.cpp b/source/gameengine/Converter/BL_ActionActuator.cpp
index 44f6ec1af90..5d6dd694765 100644
--- a/source/gameengine/Converter/BL_ActionActuator.cpp
+++ b/source/gameengine/Converter/BL_ActionActuator.cpp
@@ -184,6 +184,11 @@ bool BL_ActionActuator::Update(double curtime, bool frame)
 		
 		if (bNegativeEvent)
 		{
+			// dont continue where we left off when restarting
+			if (m_end_reset) {
+				m_flag &= ~ACT_FLAG_LOCKINPUT;
+			}
+			
 			if (!(m_flag & ACT_FLAG_ACTIVE))
 				return false;
 			m_flag &= ~ACT_FLAG_ACTIVE;
@@ -472,8 +477,10 @@ PyMethodDef BL_ActionActuator::Methods[] = {
 	{"getFrameProperty", (PyCFunction) BL_ActionActuator::sPyGetFrameProperty, METH_VARARGS, GetFrameProperty_doc},
 	{"setChannel", (PyCFunction) BL_ActionActuator::sPySetChannel, METH_VARARGS, SetChannel_doc},
 //	{"getChannel", (PyCFunction) BL_ActionActuator::sPyGetChannel, METH_VARARGS},
-	{"getType", (PyCFunction) BL_ActionActuator::sPyGetType, METH_VARARGS, GetType_doc},	
+	{"getType", (PyCFunction) BL_ActionActuator::sPyGetType, METH_VARARGS, GetType_doc},
 	{"setType", (PyCFunction) BL_ActionActuator::sPySetType, METH_VARARGS, SetType_doc},
+	{"getContinue", (PyCFunction) BL_ActionActuator::sPyGetContinue, METH_NOARGS, 0},	
+	{"setContinue", (PyCFunction) BL_ActionActuator::sPySetContinue, METH_O, 0},
 	{NULL,NULL} //Sentinel
 };
 
@@ -978,7 +985,26 @@ PyObject* BL_ActionActuator::PySetType(PyObject* self,
 	default:
 		printf("Invalid type for action actuator: %d\n", typeArg); /* error */
     }
-	
-    Py_Return;
+	Py_RETURN_NONE;
+}
+
+PyObject* BL_ActionActuator::PyGetContinue(PyObject* self) {
+    return PyInt_FromLong((long)(m_end_reset==0));
+}
+
+PyObject* BL_ActionActuator::PySetContinue(PyObject* self, PyObject* value) {
+	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;
 }
 
diff --git a/source/gameengine/Converter/BL_ActionActuator.h b/source/gameengine/Converter/BL_ActionActuator.h
index 190f727c9c3..a67b6d29b74 100644
--- a/source/gameengine/Converter/BL_ActionActuator.h
+++ b/source/gameengine/Converter/BL_ActionActuator.h
@@ -47,6 +47,7 @@ public:
 						short	playtype,
 						short	blendin,
 						short	priority,
+						short	end_reset,
 						float	stride,
 						PyTypeObject* T=&Type) 
 		: SCA_IActuator(gameobj,T),
@@ -64,6 +65,7 @@ public:
 		m_stridelength(stride),
 		m_playtype(playtype),
 		m_priority(priority),
+		m_end_reset(end_reset),
 		m_pose(NULL),
 		m_blendpose(NULL),
 		m_userpose(NULL),
@@ -101,6 +103,8 @@ public:
 //	KX_PYMETHOD(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);
 
 	virtual PyObject* _getattr(const STR_String& attr);
 
@@ -137,6 +141,7 @@ protected:
 	float	m_stridelength;
 	short	m_playtype;
 	short	m_priority;
+	short	m_end_reset;
 	struct bPose* m_pose;
 	struct bPose* m_blendpose;
 	struct bPose* m_userpose;
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
index 665783a1ba5..f3e22cd297a 100644
--- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp
+++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
@@ -312,11 +312,13 @@ BL_Material* ConvertMaterial(
 	Mesh* mesh, 
 	Material *mat, 
 	MTFace* tface,  
+	const char *tfaceName,
 	MFace* mface, 
 	MCol* mmcol, 
 	int lightlayer, 
 	Object* blenderobj,
-	MTF_localLayer *layers)
+	MTF_localLayer *layers,
+	bool glslmat)
 {
 	//this needs some type of manager
 	BL_Material *material = new BL_Material();
@@ -335,7 +337,7 @@ BL_Material* ConvertMaterial(
 	if(validmat) {
 
 		// use vertex colors by explicitly setting
-		if(mat->mode &MA_VERTEXCOLP)
+		if(mat->mode &MA_VERTEXCOLP || glslmat)
 			type = 0;
 
 		// use lighting?
@@ -558,6 +560,7 @@ BL_Material* ConvertMaterial(
 	}
 	else {
 		int valid = 0;
+
 		// check for tface tex to fallback on
 		if( validface ){
 
@@ -590,6 +593,7 @@ BL_Material* ConvertMaterial(
 	}
 	MT_Point2 uv[4];
 	MT_Point2 uv2[4];
+	const char *uvName = "", *uv2Name = "";
 
 	uv[0]= uv[1]= uv[2]= uv[3]= MT_Point2(0.0f, 0.0f);
 	uv2[0]= uv2[1]= uv2[2]= uv2[3]= MT_Point2(0.0f, 0.0f);
@@ -616,6 +620,8 @@ BL_Material* ConvertMaterial(
 
 		if (mface->v4) 
 			uv[3]	= MT_Point2(tface->uv[3]);
+
+		uvName = tfaceName;
 	} 
 	else {
 		// nothing at all
@@ -641,39 +647,38 @@ BL_Material* ConvertMaterial(
 				isFirstSet = false;
 			else
 			{
-				MT_Point2 uvSet[4];
 				for (int lay=0; lay<MAX_MTFACE; lay++)
 				{
 					MTF_localLayer& layer = layers[lay];
 					if (layer.face == 0) break;
 
-
-					bool processed = false;
 					if (strcmp(map.uvCoName.ReadPtr(), layer.name)==0)
 					{
+						MT_Point2 uvSet[4];
+
 						uvSet[0]	= MT_Point2(layer.face->uv[0]);
 						uvSet[1]	= MT_Point2(layer.face->uv[1]);
 						uvSet[2]	= MT_Point2(layer.face->uv[2]);
 
 						if (mface->v4) 
 							uvSet[3]	= MT_Point2(layer.face->uv[3]);
+						else
+							uvSet[3]	= MT_Point2(0.0f, 0.0f);
 
-						processed = true;
-					}
-
-					if (!processed) continue;
-
-					if (isFirstSet)
-					{
-						uv[0] = uvSet[0]; uv[1] = uvSet[1];
-						uv[2] = uvSet[2]; uv[3] = uvSet[3];
-						isFirstSet = false;
-					}
-					else
-					{
-						uv2[0] = uvSet[0]; uv2[1] = uvSet[1];
-						uv2[2] = uvSet[2]; uv2[3] = uvSet[3];
-						map.mapping |= USECUSTOMUV;
+						if (isFirstSet)
+						{
+							uv[0] = uvSet[0]; uv[1] = uvSet[1];
+							uv[2] = uvSet[2]; uv[3] = uvSet[3];
+							isFirstSet = false;
+							uvName = layer.name;
+						}
+						else
+						{
+							uv2[0] = uvSet[0]; uv2[1] = uvSet[1];
+							uv2[2] = uvSet[2]; uv2[3] = uvSet[3];
+							map.mapping |= USECUSTOMUV;
+							uv2Name = layer.name;
+						}
 					}
 				}
 			}
@@ -693,9 +698,8 @@ BL_Material* ConvertMaterial(
 	}
 
 	material->SetConversionRGB(rgb);
-	material->SetConversionUV(uv);
-	material->SetConversionUV2(uv2);
-
+	material->SetConversionUV(uvName, uv);
+	material->SetConversionUV2(uv2Name, uv2);
 
 	material->ras_mode |= (mface->v4==0)?TRIANGLE:0;
 	if(validmat)
@@ -797,6 +801,7 @@ RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, RAS_IRenderTools*
 	
 	MFace* mface = static_cast<MFace*>(mesh->mface);
 	MTFace* tface = static_cast<MTFace*>(mesh->mtface);
+	const char *tfaceName = "";
 	MCol* mmcol = mesh->mcol;
 	MT_assert(mface || mesh->totface == 0);
 
@@ -832,14 +837,14 @@ RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, RAS_IRenderTools*
 
 			layers[validLayers].face = (MTFace*)mesh->fdata.layers[i].data;;
 			layers[validLayers].name = mesh->fdata.layers[i].name;
+			if(tface == layers[validLayers].face)
+				tfaceName = layers[validLayers].name;
 			validLayers++;
 		}
 	}
 
 	meshobj->SetName(mesh->id.name);
 	meshobj->m_xyz_index_to_vertex_index_mapping.resize(mesh->totvert);
-	if(skinMesh)
-		((BL_SkinMeshObject*)meshobj)->m_mvert_to_dvert_mapping.resize(mesh->totvert);
 	for (int f=0;f<mesh->totface;f++,mface++)
 	{
 		
@@ -898,8 +903,7 @@ RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, RAS_IRenderTools*
 					else 
 						ma = give_current_material(blenderobj, 1);
 
-					bl_mat = ConvertMaterial(mesh, ma, tface, mface, mmcol, lightlayer, blenderobj, layers);
-					bl_mat->glslmat = converter->GetGLSLMaterials();
+					bl_mat = ConvertMaterial(mesh, ma, tface, tfaceName, mface, mmcol, lightlayer, blenderobj, layers, converter->GetGLSLMaterials());
 					// set the index were dealing with
 					bl_mat->material_index =  (int)mface->mat_nr;
 
@@ -1059,35 +1063,25 @@ RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, RAS_IRenderTools*
 				int nverts = mface->v4?4:3;
 				int vtxarray = meshobj->FindVertexArray(nverts,polymat);
 				RAS_Polygon* poly = new RAS_Polygon(bucket,polyvisible,nverts,vtxarray);
-				if (skinMesh) {
-					int d1, d2, d3, d4=0;
-					bool flat;
 
+				bool flat;
+
+				if (skinMesh) {
 					/* If the face is set to solid, all fnors are the same */
 					if (mface->flag & ME_SMOOTH)
 						flat = false;
 					else
 						flat = true;
-					
-					d1=((BL_SkinMeshObject*)meshobj)->FindOrAddDeform(vtxarray, mface->v1, &mesh->dvert[mface->v1], polymat);
-					d2=((BL_SkinMeshObject*)meshobj)->FindOrAddDeform(vtxarray, mface->v2, &mesh->dvert[mface->v2], polymat);
-					d3=((BL_SkinMeshObject*)meshobj)->FindOrAddDeform(vtxarray, mface->v3, &mesh->dvert[mface->v3], polymat);
-					if (nverts==4)
-						d4=((BL_SkinMeshObject*)meshobj)->FindOrAddDeform(vtxarray, mface->v4, &mesh->dvert[mface->v4], polymat);
-					poly->SetVertex(0,((BL_SkinMeshObject*)meshobj)->FindOrAddVertex(vtxarray,pt0,uv0,uv20,tan0,rgb0,no0,d1,flat,polymat,mface->v1));
-					poly->SetVertex(1,((BL_SkinMeshObject*)meshobj)->FindOrAddVertex(vtxarray,pt1,uv1,uv21,tan1,rgb1,no1,d2,flat,polymat,mface->v2));
-					poly->SetVertex(2,((BL_SkinMeshObject*)meshobj)->FindOrAddVertex(vtxarray,pt2,uv2,uv22,tan2,rgb2,no2,d3,flat,polymat,mface->v3));
-					if (nverts==4)
-						poly->SetVertex(3,((BL_SkinMeshObject*)meshobj)->FindOrAddVertex(vtxarray,pt3,uv3,uv23,tan3,rgb3,no3,d4,flat,polymat,mface->v4));
 				}
 				else
-				{
-					poly->SetVertex(0,meshobj->FindOrAddVertex(vtxarray,pt0,uv0,uv20,tan0,rgb0,no0,false,polymat,mface->v1));
-					poly->SetVertex(1,meshobj->FindOrAddVertex(vtxarray,pt1,uv1,uv21,tan1,rgb1,no1,false,polymat,mface->v2));
-					poly->SetVertex(2,meshobj->FindOrAddVertex(vtxarray,pt2,uv2,uv22,tan2,rgb2,no2,false,polymat,mface->v3));
-					if (nverts==4)
-						poly->SetVertex(3,meshobj->FindOrAddVertex(vtxarray,pt3,uv3,uv23,tan3,rgb3,no3,false,polymat,mface->v4));
-				}
+					flat = false;
+
+				poly->SetVertex(0,meshobj->FindOrAddVertex(vtxarray,pt0,uv0,uv20,tan0,rgb0,no0,flat,polymat,mface->v1));
+				poly->SetVertex(1,meshobj->FindOrAddVertex(vtxarray,pt1,uv1,uv21,tan1,rgb1,no1,flat,polymat,mface->v2));
+				poly->SetVertex(2,meshobj->FindOrAddVertex(vtxarray,pt2,uv2,uv22,tan2,rgb2,no2,flat,polymat,mface->v3));
+				if (nverts==4)
+					poly->SetVertex(3,meshobj->FindOrAddVertex(vtxarray,pt3,uv3,uv23,tan3,rgb3,no3,flat,polymat,mface->v4));
+
 				meshobj->AddPolygon(poly);
 				if (poly->IsCollider())
 				{
@@ -1125,8 +1119,6 @@ RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, RAS_IRenderTools*
 		}
 	}
 	meshobj->m_xyz_index_to_vertex_index_mapping.clear();
-	if(skinMesh)
-		((BL_SkinMeshObject*)meshobj)->m_mvert_to_dvert_mapping.clear();
 	meshobj->UpdateMaterialList();
 
 	// pre calculate texture generation
@@ -1545,7 +1537,7 @@ void BL_CreatePhysicsObjectNew(KX_GameObject* gameobj,
 
 
 
-static KX_LightObject *gamelight_from_blamp(Lamp *la, unsigned int layerflag, KX_Scene *kxscene, RAS_IRenderTools *rendertools, KX_BlenderSceneConverter *converter) {
+static KX_LightObject *gamelight_from_blamp(Object *ob, Lamp *la, unsigned int layerflag, KX_Scene *kxscene, RAS_IRenderTools *rendertools, KX_BlenderSceneConverter *converter) {
 	RAS_LightObject lightobj;
 	KX_LightObject *gamelight;
 	
@@ -1577,8 +1569,15 @@ static KX_LightObject *gamelight_from_blamp(Lamp *la, unsigned int layerflag, KX
 	} else {
 		lightobj.m_type = RAS_LightObject::LIGHT_NORMAL;
 	}
+
+#ifdef BLENDER_GLSL
+	if(converter->GetGLSLMaterials())
+		GPU_lamp_from_blender(ob, la);
 	
-	gamelight = new KX_LightObject(kxscene, KX_Scene::m_callbacks, rendertools, lightobj);
+	gamelight = new KX_LightObject(kxscene, KX_Scene::m_callbacks, rendertools, lightobj, ob->gpulamp);
+#else
+	gamelight = new KX_LightObject(kxscene, KX_Scene::m_callbacks, rendertools, lightobj, NULL);
+#endif
 	BL_ConvertLampIpos(la, gamelight, converter);
 	
 	return gamelight;
@@ -1610,7 +1609,7 @@ static KX_GameObject *gameobject_from_blenderobject(
 	{
 	case OB_LAMP:
 	{
-		KX_LightObject* gamelight= gamelight_from_blamp(static_cast<Lamp*>(ob->data), ob->lay, kxscene, rendertools, converter);
+		KX_LightObject* gamelight= gamelight_from_blamp(ob, static_cast<Lamp*>(ob->data), ob->lay, kxscene, rendertools, converter);
 		gameobj = gamelight;
 		
 		gamelight->AddRef();
@@ -1660,7 +1659,7 @@ static KX_GameObject *gameobject_from_blenderobject(
 		// two options exists for deform: shape keys and armature
 		// only support relative shape key
 		bool bHasShapeKey = mesh->key != NULL && mesh->key->type==KEY_RELATIVE;
-		bool bHasDvert = mesh->dvert != NULL;
+		bool bHasDvert = mesh->dvert != NULL && ob->defbase.first;
 		bool bHasArmature = (ob->parent && ob->parent->type == OB_ARMATURE && ob->partype==PARSKEL && bHasDvert);
 
 		if (bHasShapeKey) {
@@ -1671,13 +1670,15 @@ static KX_GameObject *gameobject_from_blenderobject(
 			if (bHasArmature)
 				dcont->LoadShapeDrivers(ob->parent);
 		} else if (bHasArmature) {
-			BL_SkinDeformer *dcont = new BL_SkinDeformer(ob, (BL_SkinMeshObject*)meshobj );				
+			BL_SkinDeformer *dcont = new BL_SkinDeformer((BL_DeformableGameObject*)gameobj,
+															ob, (BL_SkinMeshObject*)meshobj);
 			((BL_DeformableGameObject*)gameobj)->m_pDeformer = dcont;
 		} else if (bHasDvert) {
 			// this case correspond to a mesh that can potentially deform but not with the
 			// object to which it is attached for the moment. A skin mesh was created in
 			// BL_ConvertMesh() so must create a deformer too!
-			BL_MeshDeformer *dcont = new BL_MeshDeformer(ob, (BL_SkinMeshObject*)meshobj );
+			BL_MeshDeformer *dcont = new BL_MeshDeformer((BL_DeformableGameObject*)gameobj,
+														  ob, (BL_SkinMeshObject*)meshobj);
 			((BL_DeformableGameObject*)gameobj)->m_pDeformer = dcont;
 		}
 		
@@ -2075,7 +2076,8 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
 	if (blenderscene->camera) {
 		KX_Camera *gamecamera= (KX_Camera*) converter->FindGameObject(blenderscene->camera);
 		
-		kxscene->SetActiveCamera(gamecamera);
+		if(gamecamera)
+			kxscene->SetActiveCamera(gamecamera);
 	}
 
 	//	Set up armatures
@@ -2331,7 +2333,8 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
 	{
 		KX_GameObject* gameobj = static_cast<KX_GameObject*>(logicbrick_conversionlist->GetValue(i));
 		struct Object* blenderobj = converter->FindBlenderObject(gameobj);
-		gameobj->SetState((blenderobj->init_state)?blenderobj->init_state:blenderobj->state);
+		gameobj->SetInitState((blenderobj->init_state)?blenderobj->init_state:blenderobj->state);
+		gameobj->ResetState();
 	}
 
 #endif //CONVERT_LOGIC
diff --git a/source/gameengine/Converter/BL_MeshDeformer.cpp b/source/gameengine/Converter/BL_MeshDeformer.cpp
index 212827a660f..39d66a90e92 100644
--- a/source/gameengine/Converter/BL_MeshDeformer.cpp
+++ b/source/gameengine/Converter/BL_MeshDeformer.cpp
@@ -39,6 +39,7 @@
 #endif
 
 #include "RAS_IPolygonMaterial.h"
+#include "BL_DeformableGameObject.h"
 #include "BL_MeshDeformer.h"
 #include "BL_SkinMeshObject.h"
 #include "DNA_mesh_types.h"
@@ -47,33 +48,40 @@
 #include "GEN_Map.h"
 #include "STR_HashedString.h"
 
-bool BL_MeshDeformer::Apply(RAS_IPolyMaterial *mat)
+bool BL_MeshDeformer::Apply(RAS_IPolyMaterial*)
 {
-	size_t			i, j, index;
-	vecVertexArray	array;
-	vecIndexArrays	mvarray;
-	vecIndexArrays	diarray;
+	size_t i, j;
+	float *co;
 
-	RAS_TexVert *tv;
-	MVert	*mvert;
+	// only apply once per frame if the mesh is actually modified
+	if(m_pMeshObject->MeshModified() &&
+	   m_lastDeformUpdate != m_gameobj->GetLastFrame()) {
+		// For each material
+		for(RAS_MaterialBucket::Set::iterator mit = m_pMeshObject->GetFirstMaterial();
+			mit != m_pMeshObject->GetLastMaterial(); ++ mit) {
+			RAS_IPolyMaterial *mat = (*mit)->GetPolyMaterial();
 
-	// For each material
-	array = m_pMeshObject->GetVertexCache(mat);
-	mvarray = m_pMeshObject->GetMVertCache(mat);
-	diarray = m_pMeshObject->GetDIndexCache(mat);
+			vecVertexArray& vertexarrays = m_pMeshObject->GetVertexCache(mat);
 
-	// For each array
-	for (i=0; i<array.size(); i++){
-		//	For each vertex
-		for (j=0; j<array[i]->size(); j++){
-			tv = &((*array[i])[j]);
-			index = ((*diarray[i])[j]);
+			// For each array
+			for (i=0; i<vertexarrays.size(); i++){
+				KX_VertexArray& vertexarray = (*vertexarrays[i]);
 
-			mvert = &(m_bmesh->mvert[((*mvarray[i])[index])]);
-			tv->SetXYZ(MT_Point3(mvert->co));
+				//	For each vertex
+				for (j=0; j<vertexarray.size(); j++){
+					RAS_TexVert& v = vertexarray[j];
+					co = m_bmesh->mvert[v.getOrigIndex()].co;
+					v.SetXYZ(MT_Point3(co));
+				}
+			}
 		}
+
+		m_lastDeformUpdate = m_gameobj->GetLastFrame();
+
+		return true;
 	}
-	return true;
+
+	return false;
 }
 
 BL_MeshDeformer::~BL_MeshDeformer()
@@ -92,83 +100,86 @@ void BL_MeshDeformer::RecalcNormals()
 	/* We don't normalize for performance, not doing it for faces normals
 	 * gives area-weight normals which often look better anyway, and use
 	 * GL_NORMALIZE so we don't have to do per vertex normalization either
-	 * since the GPU can do it faster
-	 *
-	 * There's a lot of indirection here to get to the data, can this work
-	 * with less arrays/indirection? */
-
-	vecIndexArrays indexarrays;
-	vecIndexArrays mvarrays;
-	vecIndexArrays diarrays;
-	vecVertexArray vertexarrays;
+	 * since the GPU can do it faster */
 	size_t i, j;
 
 	/* set vertex normals to zero */
-	for (i=0; i<(size_t)m_bmesh->totvert; i++)
-		m_transnors[i] = MT_Vector3(0.0f, 0.0f, 0.0f);
+	memset(m_transnors, 0, sizeof(float)*3*m_bmesh->totvert);
 
 	/* add face normals to vertices. */
 	for(RAS_MaterialBucket::Set::iterator mit = m_pMeshObject->GetFirstMaterial();
 		mit != m_pMeshObject->GetLastMaterial(); ++ mit) {
 		RAS_IPolyMaterial *mat = (*mit)->GetPolyMaterial();
 
-		indexarrays = m_pMeshObject->GetIndexCache(mat);
-		vertexarrays = m_pMeshObject->GetVertexCache(mat);
-		diarrays = m_pMeshObject->GetDIndexCache(mat);
-		mvarrays = m_pMeshObject->GetMVertCache(mat);
+		const vecIndexArrays& indexarrays = m_pMeshObject->GetIndexCache(mat);
+		vecVertexArray& vertexarrays = m_pMeshObject->GetVertexCache(mat);
 
 		for (i=0; i<indexarrays.size(); i++) {
 			KX_VertexArray& vertexarray = (*vertexarrays[i]);
-			const KX_IndexArray& mvarray = (*mvarrays[i]);
-			const KX_IndexArray& diarray = (*diarrays[i]);
 			const KX_IndexArray& indexarray = (*indexarrays[i]);
 			int nvert = mat->UsesTriangles()? 3: 4;
 
 			for(j=0; j<indexarray.size(); j+=nvert) {
-				MT_Point3 mv1, mv2, mv3, mv4, fnor;
-				int i1 = indexarray[j];
-				int i2 = indexarray[j+1];
-				int i3 = indexarray[j+2];
-				RAS_TexVert& v1 = vertexarray[i1];
-				RAS_TexVert& v2 = vertexarray[i2];
-				RAS_TexVert& v3 = vertexarray[i3];
+				RAS_TexVert& v1 = vertexarray[indexarray[j]];
+				RAS_TexVert& v2 = vertexarray[indexarray[j+1]];
+				RAS_TexVert& v3 = vertexarray[indexarray[j+2]];
+				RAS_TexVert *v4 = NULL;
 
+				const float *co1 = v1.getLocalXYZ();
+				const float *co2 = v2.getLocalXYZ();
+				const float *co3 = v3.getLocalXYZ();
+				const float *co4 = NULL;
+				
 				/* compute face normal */
-				mv1 = MT_Point3(v1.getLocalXYZ());
-				mv2 = MT_Point3(v2.getLocalXYZ());
-				mv3 = MT_Point3(v3.getLocalXYZ());
+				float fnor[3], n1[3], n2[3];
 
 				if(nvert == 4) {
-					int i4 = indexarray[j+3];
-					RAS_TexVert& v4 = vertexarray[i4];
-					mv4 = MT_Point3(v4.getLocalXYZ());
+					v4 = &vertexarray[indexarray[j+3]];
+					co4 = v4->getLocalXYZ();
 
-					fnor = (((mv2-mv1).cross(mv3-mv2))+((mv4-mv3).cross(mv1-mv4))); //.safe_normalized();
+					n1[0]= co1[0]-co3[0];
+					n1[1]= co1[1]-co3[1];
+					n1[2]= co1[2]-co3[2];
+
+					n2[0]= co2[0]-co4[0];
+					n2[1]= co2[1]-co4[1];
+					n2[2]= co2[2]-co4[2];
 				}
-				else
-					fnor = ((mv2-mv1).cross(mv3-mv2)); //.safe_normalized();
+				else {
+					n1[0]= co1[0]-co2[0];
+					n2[0]= co2[0]-co3[0];
+					n1[1]= co1[1]-co2[1];
+
+					n2[1]= co2[1]-co3[1];
+					n1[2]= co1[2]-co2[2];
+					n2[2]= co2[2]-co3[2];
+				}
+
+				fnor[0]= n1[1]*n2[2] - n1[2]*n2[1];
+				fnor[1]= n1[2]*n2[0] - n1[0]*n2[2];
+				fnor[2]= n1[0]*n2[1] - n1[1]*n2[0];
 
 				/* add to vertices for smooth normals */
-				m_transnors[mvarray[diarray[i1]]] += fnor;
-				m_transnors[mvarray[diarray[i2]]] += fnor;
-				m_transnors[mvarray[diarray[i3]]] += fnor;
+				float *vn1 = m_transnors[v1.getOrigIndex()];
+				float *vn2 = m_transnors[v2.getOrigIndex()];
+				float *vn3 = m_transnors[v3.getOrigIndex()];
+
+				vn1[0] += fnor[0]; vn1[1] += fnor[1]; vn1[2] += fnor[2];
+				vn2[0] += fnor[0]; vn2[1] += fnor[1]; vn2[2] += fnor[2];
+				vn3[0] += fnor[0]; vn3[1] += fnor[1]; vn3[2] += fnor[2];
+
+				if(v4) {
+					float *vn4 = m_transnors[v4->getOrigIndex()];
+					vn4[0] += fnor[0]; vn4[1] += fnor[1]; vn4[2] += fnor[2];
+				}
 
 				/* in case of flat - just assign, the vertices are split */
 				if(v1.getFlag() & TV_CALCFACENORMAL) {
 					v1.SetNormal(fnor);
 					v2.SetNormal(fnor);
 					v3.SetNormal(fnor);
-				}
-
-				if(nvert == 4) {
-					int i4 = indexarray[j+3];
-					RAS_TexVert& v4 = vertexarray[i4];
-
-					/* same as above */
-					m_transnors[mvarray[diarray[i4]]] += fnor;
-
-					if(v4.getFlag() & TV_CALCFACENORMAL)
-						v4.SetNormal(fnor);
+					if(v4)
+						v4->SetNormal(fnor);
 				}
 			}
 		}
@@ -179,18 +190,17 @@ void BL_MeshDeformer::RecalcNormals()
 		mit != m_pMeshObject->GetLastMaterial(); ++ mit) {
 		RAS_IPolyMaterial *mat = (*mit)->GetPolyMaterial();
 
-		vertexarrays = m_pMeshObject->GetVertexCache(mat);
-		diarrays = m_pMeshObject->GetDIndexCache(mat);
-		mvarrays = m_pMeshObject->GetMVertCache(mat);
+		vecVertexArray& vertexarrays = m_pMeshObject->GetVertexCache(mat);
 
 		for (i=0; i<vertexarrays.size(); i++) {
 			KX_VertexArray& vertexarray = (*vertexarrays[i]);
-			const KX_IndexArray& mvarray = (*mvarrays[i]);
-			const KX_IndexArray& diarray = (*diarrays[i]);
 			
-			for(j=0; j<vertexarray.size(); j++)
-				if(!(vertexarray[j].getFlag() & TV_CALCFACENORMAL))
-					vertexarray[j].SetNormal(m_transnors[mvarray[diarray[j]]]); //.safe_normalized()
+			for(j=0; j<vertexarray.size(); j++) {
+				RAS_TexVert& v = vertexarray[j];
+
+				if(!(v.getFlag() & TV_CALCFACENORMAL))
+					v.SetNormal(m_transnors[v.getOrigIndex()]); //.safe_normalized()
+			}
 		}
 	}
 }
@@ -204,8 +214,8 @@ void BL_MeshDeformer::VerifyStorage()
 		if (m_transnors)
 			delete [] m_transnors;
 		
-		m_transverts=new float[(sizeof(*m_transverts)*m_bmesh->totvert)][3];
-		m_transnors=new MT_Vector3[m_bmesh->totvert];
+		m_transverts=new float[m_bmesh->totvert][3];
+		m_transnors=new float[m_bmesh->totvert][3];
 		m_tvtot = m_bmesh->totvert;
 	}
 }
diff --git a/source/gameengine/Converter/BL_MeshDeformer.h b/source/gameengine/Converter/BL_MeshDeformer.h
index 8d8b56b1eed..e9f7f0b192f 100644
--- a/source/gameengine/Converter/BL_MeshDeformer.h
+++ b/source/gameengine/Converter/BL_MeshDeformer.h
@@ -40,19 +40,25 @@
 #pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
 #endif //WIN32
 
+class BL_DeformableGameObject;
+
 class BL_MeshDeformer : public RAS_Deformer
 {
 public:
 	void VerifyStorage();
 	void RecalcNormals();
 	virtual void Relink(GEN_Map<class GEN_HashedPtr, void*>*map){};
-	BL_MeshDeformer(struct Object* obj, class BL_SkinMeshObject *meshobj ):
+	BL_MeshDeformer(BL_DeformableGameObject *gameobj,
+					struct Object* obj,
+					class BL_SkinMeshObject *meshobj ):
 		m_pMeshObject(meshobj),
 		m_bmesh((struct Mesh*)(obj->data)),
 		m_transverts(0),
 		m_transnors(0),
 		m_objMesh(obj),
-		m_tvtot(0)
+		m_tvtot(0),
+		m_gameobj(gameobj),
+		m_lastDeformUpdate(-1)
 	{};
 	virtual ~BL_MeshDeformer();
 	virtual void SetSimulatedTime(double time){};
@@ -68,10 +74,12 @@ protected:
 	// this is so m_transverts doesn't need to be converted
 	// before deformation
 	float						(*m_transverts)[3];
-	MT_Vector3*					m_transnors;
+	float 						(*m_transnors)[3];
 	struct Object*				m_objMesh; 
 	// --
 	int							m_tvtot;
+	BL_DeformableGameObject*	m_gameobj;
+	double					 	m_lastDeformUpdate;
 };
 
 #endif
diff --git a/source/gameengine/Converter/BL_ShapeDeformer.h b/source/gameengine/Converter/BL_ShapeDeformer.h
index 9f8361dbaca..5f0188e3a42 100644
--- a/source/gameengine/Converter/BL_ShapeDeformer.h
+++ b/source/gameengine/Converter/BL_ShapeDeformer.h
@@ -58,9 +58,8 @@ public:
                      Object *bmeshobj,
                      BL_SkinMeshObject *mesh)
 					:	
-						BL_SkinDeformer(bmeshobj, mesh),
-						m_lastShapeUpdate(-1),
-						m_gameobj(gameobj)
+						BL_SkinDeformer(gameobj,bmeshobj, mesh),
+						m_lastShapeUpdate(-1)
 	{
 	};
 
@@ -72,9 +71,8 @@ public:
 					bool release_object,
 					BL_ArmatureObject* arma = NULL)
 					:
-						BL_SkinDeformer(bmeshobj_old, bmeshobj_new, mesh, release_object, arma),
-						m_lastShapeUpdate(-1),
-						m_gameobj(gameobj)
+						BL_SkinDeformer(gameobj, bmeshobj_old, bmeshobj_new, mesh, release_object, arma),
+						m_lastShapeUpdate(-1)
 	{
 	};
 
@@ -94,7 +92,6 @@ public:
 protected:
 	vector<IpoCurve*>		 m_shapeDrivers;
 	double					 m_lastShapeUpdate;
-	BL_DeformableGameObject* m_gameobj;
 
 };
 
diff --git a/source/gameengine/Converter/BL_SkinDeformer.cpp b/source/gameengine/Converter/BL_SkinDeformer.cpp
index dd7119b1031..d3442fe5298 100644
--- a/source/gameengine/Converter/BL_SkinDeformer.cpp
+++ b/source/gameengine/Converter/BL_SkinDeformer.cpp
@@ -57,11 +57,12 @@ extern "C"{
 #define __NLA_DEFNORMALS
 //#undef __NLA_DEFNORMALS
 
-BL_SkinDeformer::BL_SkinDeformer(struct Object *bmeshobj, 
+BL_SkinDeformer::BL_SkinDeformer(BL_DeformableGameObject *gameobj,
+								struct Object *bmeshobj, 
 								class BL_SkinMeshObject *mesh,
 								BL_ArmatureObject* arma)
 							:	//
-							BL_MeshDeformer(bmeshobj, mesh),
+							BL_MeshDeformer(gameobj, bmeshobj, mesh),
 							m_armobj(arma),
 							m_lastArmaUpdate(-1),
 							m_defbase(&bmeshobj->defbase),
@@ -71,12 +72,13 @@ BL_SkinDeformer::BL_SkinDeformer(struct Object *bmeshobj,
 };
 
 BL_SkinDeformer::BL_SkinDeformer(
+	BL_DeformableGameObject *gameobj,
 	struct Object *bmeshobj_old,	// Blender object that owns the new mesh
 	struct Object *bmeshobj_new,	// Blender object that owns the original mesh
 	class BL_SkinMeshObject *mesh,
 	bool release_object,
 	BL_ArmatureObject* arma)	:	
-		BL_MeshDeformer(bmeshobj_old, mesh),
+		BL_MeshDeformer(gameobj, bmeshobj_old, mesh),
 		m_armobj(arma),
 		m_lastArmaUpdate(-1),
 		m_defbase(&bmeshobj_old->defbase),
@@ -96,35 +98,32 @@ BL_SkinDeformer::~BL_SkinDeformer()
 		m_armobj->Release();
 }
 
-bool BL_SkinDeformer::Apply(RAS_IPolyMaterial *mat)
+bool BL_SkinDeformer::Apply(RAS_IPolyMaterial *)
 {
-	size_t			i, j, index;
-	vecVertexArray	array;
-	vecIndexArrays	mvarray;
-	vecMDVertArray	dvarray;
-	vecIndexArrays	diarray;
+	size_t i, j;
 
-	RAS_TexVert *tv;
-	MT_Point3 pt;
-//	float co[3];
+	if (!Update())
+		// no need to update the cache
+		return false;
 
-	Update();
+	// Update all materials at once, so we can do the above update test
+	// without ending up with some materials not updated
+	for(RAS_MaterialBucket::Set::iterator mit = m_pMeshObject->GetFirstMaterial();
+		mit != m_pMeshObject->GetLastMaterial(); ++ mit) {
+		RAS_IPolyMaterial *mat = (*mit)->GetPolyMaterial();
 
-	array = m_pMeshObject->GetVertexCache(mat);
-	mvarray = m_pMeshObject->GetMVertCache(mat);
-	diarray = m_pMeshObject->GetDIndexCache(mat);
-	// For each array
-	for (i=0; i<array.size(); i++) {
-		//	For each vertex
-		for (j=0; j<array[i]->size(); j++) {
+		vecVertexArray& vertexarrays = m_pMeshObject->GetVertexCache(mat);
 
-			tv = &((*array[i])[j]);
-			
-			index = ((*diarray[i])[j]);
-			
-			//	Copy the untransformed data from the original mvert
-			//	Set the data
-			tv->SetXYZ(m_transverts[((*mvarray[i])[index])]);
+		// For each array
+		for (i=0; i<vertexarrays.size(); i++) {
+			KX_VertexArray& vertexarray = (*vertexarrays[i]);
+
+			// For each vertex
+			// copy the untransformed data from the original mvert
+			for (j=0; j<vertexarray.size(); j++) {
+				RAS_TexVert& v = vertexarray[j];
+				v.SetXYZ(m_transverts[v.getOrigIndex()]);
+			}
 		}
 	}
 
diff --git a/source/gameengine/Converter/BL_SkinDeformer.h b/source/gameengine/Converter/BL_SkinDeformer.h
index c5568c049cb..f35db8273c4 100644
--- a/source/gameengine/Converter/BL_SkinDeformer.h
+++ b/source/gameengine/Converter/BL_SkinDeformer.h
@@ -63,12 +63,14 @@ public:
 	}
 	void SetArmature (class BL_ArmatureObject *armobj);
 
-	BL_SkinDeformer(struct Object *bmeshobj, 
+	BL_SkinDeformer(BL_DeformableGameObject *gameobj,
+					struct Object *bmeshobj, 
 					class BL_SkinMeshObject *mesh,
 					BL_ArmatureObject* arma = NULL);
 
 	/* this second constructor is needed for making a mesh deformable on the fly. */
-	BL_SkinDeformer(struct Object *bmeshobj_old,
+	BL_SkinDeformer(BL_DeformableGameObject *gameobj,
+					struct Object *bmeshobj_old,
 					struct Object *bmeshobj_new,
 					class BL_SkinMeshObject *mesh,
 					bool release_object,
diff --git a/source/gameengine/Converter/BL_SkinMeshObject.cpp b/source/gameengine/Converter/BL_SkinMeshObject.cpp
index 49492923c7c..fa215df1e1c 100644
--- a/source/gameengine/Converter/BL_SkinMeshObject.cpp
+++ b/source/gameengine/Converter/BL_SkinMeshObject.cpp
@@ -43,90 +43,6 @@
 #include "KX_GameObject.h"
 #include "RAS_BucketManager.h"
 
-void BL_SkinMeshObject::AddPolygon(RAS_Polygon* poly)
-{
-	/* We're overriding this so that we can eventually associate faces with verts somehow */
-
-	//	For vertIndex in poly:
-	//		find the appropriate normal
-
-	RAS_MeshObject::AddPolygon(poly);
-}
-
-int BL_SkinMeshObject::FindOrAddDeform(unsigned int vtxarray, unsigned int mv, struct MDeformVert *dv, RAS_IPolyMaterial* mat)
-{
-	BL_SkinArrayOptimizer* ao = (BL_SkinArrayOptimizer*)GetArrayOptimizer(mat);//*(m_matVertexArrays[*mat]);
-	int numvert = ao->m_MvertArrayCache1[vtxarray]->size();
-
-	/* Check to see if this has already been pushed */
-	for (vector<BL_MDVertMap>::iterator it = m_mvert_to_dvert_mapping[mv].begin();
-	     it != m_mvert_to_dvert_mapping[mv].end();
-	     it++)
-	{
-		if(it->mat == mat)
-			return it->index;
-	}
-
-	ao->m_MvertArrayCache1[vtxarray]->push_back(mv);
-	ao->m_DvertArrayCache1[vtxarray]->push_back(dv);
-
-	BL_MDVertMap mdmap;
-	mdmap.mat = mat;
-	mdmap.index = numvert;
-	m_mvert_to_dvert_mapping[mv].push_back(mdmap);
-	
-	return numvert;
-};
-
-int	BL_SkinMeshObject::FindVertexArray(int numverts,RAS_IPolyMaterial* polymat)
-{
-	int array=-1;
-	
-	BL_SkinArrayOptimizer* ao = (BL_SkinArrayOptimizer*)GetArrayOptimizer(polymat);
-
-
-	for (size_t i=0;i<ao->m_VertexArrayCache1.size();i++)
-	{
-		if ( (ao->m_TriangleArrayCount[i] + (numverts-2)) < BUCKET_MAX_TRIANGLES) 
-		{
-			 if((ao->m_VertexArrayCache1[i]->size()+numverts < BUCKET_MAX_INDICES))
-				{
-					array = i;
-					ao->m_TriangleArrayCount[array]+=numverts-2;
-					break;
-				}
-		}
-	}
-	
-
-	if (array == -1)
-	{
-		array = ao->m_VertexArrayCache1.size();
-		
-		vector<RAS_TexVert>* va = new vector<RAS_TexVert>;
-		ao->m_VertexArrayCache1.push_back(va);
-		
-		KX_IndexArray *ia = new KX_IndexArray();
-		ao->m_IndexArrayCache1.push_back(ia);
-
-		KX_IndexArray *bva = new KX_IndexArray();
-		ao->m_MvertArrayCache1.push_back(bva);
-
-		BL_DeformVertArray *dva = new BL_DeformVertArray();
-		ao->m_DvertArrayCache1.push_back(dva);
-
-		KX_IndexArray *da = new KX_IndexArray();
-		ao->m_DIndexArrayCache1.push_back(da);
-
-		ao->m_TriangleArrayCount.push_back(numverts-2);
-
-	}
-
-		
-	return array;
-}
-
-
 //void BL_SkinMeshObject::Bucketize(double* oglmatrix,void* clientobj,bool useObjectColor,const MT_Vector4& rgbavec,RAS_BucketManager* bucketmgr)
 void BL_SkinMeshObject::Bucketize(double* oglmatrix,void* clientobj,bool useObjectColor,const MT_Vector4& rgbavec)
 {
diff --git a/source/gameengine/Converter/BL_SkinMeshObject.h b/source/gameengine/Converter/BL_SkinMeshObject.h
index cc2b8de600e..c21fb64204b 100644
--- a/source/gameengine/Converter/BL_SkinMeshObject.h
+++ b/source/gameengine/Converter/BL_SkinMeshObject.h
@@ -44,78 +44,19 @@
 #include "DNA_key_types.h"
 #include "DNA_meshdata_types.h"
 
-typedef vector<struct MVert*> BL_MVertArray;
-typedef vector<struct MDeformVert*> BL_DeformVertArray;
-typedef vector<class BL_TexVert> BL_VertexArray;
-
-
-typedef vector<vector<struct MDeformVert*>*> vecMDVertArray;
-typedef vector<vector<class BL_TexVert>*> vecBVertexArray;
-
-class BL_SkinArrayOptimizer : public KX_ArrayOptimizer  
-{
-public:
-	BL_SkinArrayOptimizer(int index)
-		:KX_ArrayOptimizer (index) {};
-	virtual ~BL_SkinArrayOptimizer(){
-
-		for (vector<KX_IndexArray*>::iterator itv = m_MvertArrayCache1.begin();
-		!(itv == m_MvertArrayCache1.end());itv++)
-		{
-			delete (*itv);
-		}
-		for (vector<BL_DeformVertArray*>::iterator itd = m_DvertArrayCache1.begin();
-		!(itd == m_DvertArrayCache1.end());itd++)
-		{
-			delete (*itd);
-		}
-		for (vector<KX_IndexArray*>::iterator iti = m_DIndexArrayCache1.begin();
-		!(iti == m_DIndexArrayCache1.end());iti++)
-		{
-			delete (*iti);
-		}
-		
-		m_MvertArrayCache1.clear();
-		m_DvertArrayCache1.clear();
-		m_DIndexArrayCache1.clear();
-	};
-
-	vector<KX_IndexArray*>		m_MvertArrayCache1;
-	vector<BL_DeformVertArray*>	m_DvertArrayCache1;
-	vector<KX_IndexArray*>		m_DIndexArrayCache1;
-
-};
-
 class BL_SkinMeshObject : public RAS_MeshObject
 {
 
 //	enum	{	BUCKET_MAX_INDICES = 16384};//2048};//8192};
 //	enum	{	BUCKET_MAX_TRIANGLES = 4096};
 
-	KX_ArrayOptimizer*		GetArrayOptimizer(RAS_IPolyMaterial* polymat)
-	{
-		KX_ArrayOptimizer** aop = (m_matVertexArrayS[*polymat]);
-		if (aop)
-			return *aop;
-		int numelements = m_matVertexArrayS.size();
-		m_sortedMaterials.push_back(polymat);
-		
-		BL_SkinArrayOptimizer* ao = new BL_SkinArrayOptimizer(numelements);
-		m_matVertexArrayS.insert(*polymat,ao);
-		return ao;
-	}
-
 protected:
 	vector<int>				 m_cacheWeightIndex;
 
 public:
-	struct BL_MDVertMap { RAS_IPolyMaterial *mat; int index; };
-	vector<vector<BL_MDVertMap> >	m_mvert_to_dvert_mapping;
-
 	void Bucketize(double* oglmatrix,void* clientobj,bool useObjectColor,const MT_Vector4& rgbavec);
 //	void Bucketize(double* oglmatrix,void* clientobj,bool useObjectColor,const MT_Vector4& rgbavec,class RAS_BucketManager* bucketmgr);
 
-	int FindVertexArray(int numverts,RAS_IPolyMaterial* polymat);
 	BL_SkinMeshObject(Mesh* mesh, int lightlayer) : RAS_MeshObject (mesh, lightlayer)
 	{ 
 		m_class = 1;
@@ -144,42 +85,7 @@ public:
 			}
 		}
 	};
-
-	const vecIndexArrays& GetDIndexCache (RAS_IPolyMaterial* mat)
-	{
-		BL_SkinArrayOptimizer* ao = (BL_SkinArrayOptimizer*)GetArrayOptimizer(mat);//*(m_matVertexArrays[*mat]);
-		return ao->m_DIndexArrayCache1;
-	}
-	const vecMDVertArray&	GetDVertCache (RAS_IPolyMaterial* mat)
-	{
-		BL_SkinArrayOptimizer* ao = (BL_SkinArrayOptimizer*)GetArrayOptimizer(mat);//*(m_matVertexArrays[*mat]);
-		return ao->m_DvertArrayCache1;
-	}
-	const vecIndexArrays&	GetMVertCache (RAS_IPolyMaterial* mat)
-	{
-		BL_SkinArrayOptimizer* ao = (BL_SkinArrayOptimizer*)GetArrayOptimizer(mat);//*(m_matVertexArrays[*mat]);
-		return ao->m_MvertArrayCache1;
-	}
 	
-	void AddPolygon(RAS_Polygon* poly);
-	int FindOrAddDeform(unsigned int vtxarray, unsigned int mv, struct MDeformVert *dv, RAS_IPolyMaterial* mat);
-	int FindOrAddVertex(int vtxarray,const MT_Point3& xyz,
-		const MT_Point2& uv,
-		const MT_Point2& uv2,
-		const MT_Vector4& tangent,
-		const unsigned int rgbacolor,
-		const MT_Vector3& normal, int defnr, bool flat, RAS_IPolyMaterial* mat, int origindex)
-	{
-		BL_SkinArrayOptimizer* ao = (BL_SkinArrayOptimizer*)GetArrayOptimizer(mat);
-		int numverts = ao->m_VertexArrayCache1[vtxarray]->size();
-		int index = RAS_MeshObject::FindOrAddVertex(vtxarray, xyz, uv, uv2, tangent, rgbacolor, normal, flat, mat, origindex);
-
-		/* this means a new vertex was added, so we add the defnr too */
-		if(index == numverts)
-			ao->m_DIndexArrayCache1[vtxarray]->push_back(defnr);
-
-		return index;
-	}
 	// for shape keys, 
 	void CheckWeightCache(struct Object* obj);
 
diff --git a/source/gameengine/Converter/KX_ConvertActuators.cpp b/source/gameengine/Converter/KX_ConvertActuators.cpp
index 6e05ea31fe8..1f87e9d9ac7 100644
--- a/source/gameengine/Converter/KX_ConvertActuators.cpp
+++ b/source/gameengine/Converter/KX_ConvertActuators.cpp
@@ -193,6 +193,7 @@ void BL_ConvertActuators(char* maggiename,
 						actact->type, // + 1, because Blender starts to count at zero,
 						actact->blendin,
 						actact->priority,
+						actact->end_reset,
 						actact->stridelength
 						// Ketsji at 1, because zero is reserved for "NoDef"
 						);
@@ -233,7 +234,8 @@ void BL_ConvertActuators(char* maggiename,
 				STR_String propname = ( ipoact->name ? ipoact->name : "");
 				// first bit?
 				bool ipo_as_force = (ipoact->flag & ACT_IPOFORCE);
-				bool force_local = (ipoact->flag & ACT_IPOFORCE_LOCAL);
+				bool local = (ipoact->flag & ACT_IPOLOCAL);
+				bool ipo_add = (ipoact->flag & ACT_IPOADD);
 				
 				KX_IpoActuator* tmpbaseact = new KX_IpoActuator(
 					gameobj,
@@ -244,8 +246,8 @@ void BL_ConvertActuators(char* maggiename,
 					ipoact->type + 1, // + 1, because Blender starts to count at zero,
 					// Ketsji at 1, because zero is reserved for "NoDef"
 					ipo_as_force,
-					force_local
-					);
+					ipo_add,
+					local);
 				baseact = tmpbaseact;
 				break;
 			}
diff --git a/source/gameengine/Expressions/PyObjectPlus.h b/source/gameengine/Expressions/PyObjectPlus.h
index 04cc119efee..2bcb604dd23 100644
--- a/source/gameengine/Expressions/PyObjectPlus.h
+++ b/source/gameengine/Expressions/PyObjectPlus.h
@@ -76,18 +76,36 @@ static inline void Py_Fatal(char *M) {
   virtual PyTypeObject *GetType(void) {return &Type;}; \
   virtual PyParentObject *GetParents(void) {return Parents;}
 
+
 								// This defines the _getattr_up macro
 								// which allows attribute and method calls
 								// to be properly passed up the hierarchy.
 #define _getattr_up(Parent) \
-  PyObject *rvalue = Py_FindMethod(Methods, this, const_cast<char*>(attr.ReadPtr())); \
-  if (rvalue == NULL) \
-    { \
-      PyErr_Clear(); \
-      return Parent::_getattr(attr); \
+  PyObject *rvalue = NULL; \
+  if (attr=="__methods__") { \
+    PyObject *_attr_string = NULL; \
+    PyMethodDef *meth = Methods; \
+    rvalue = Parent::_getattr(attr); \
+    if (rvalue==NULL) { \
+    	PyErr_Clear(); \
+    	rvalue = PyList_New(0); \
     } \
-  else \
-    return rvalue 
+    if (meth) { \
+      for (; meth->ml_name != NULL; meth++) { \
+        _attr_string = PyString_FromString(meth->ml_name); \
+		PyList_Append(rvalue, _attr_string); \
+		Py_DECREF(_attr_string); \
+	  } \
+	} \
+  } else { \
+    rvalue = Py_FindMethod(Methods, this, const_cast<char*>(attr.ReadPtr())); \
+    if (rvalue == NULL) { \
+      PyErr_Clear(); \
+      rvalue = Parent::_getattr(attr); \
+    } \
+  } \
+  return rvalue; \
+
 
 /**
  * These macros are helpfull when embedding Python routines. The second
diff --git a/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp b/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
index 9645bfbed4a..e1c8ef87dd1 100644
--- a/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
+++ b/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
@@ -111,7 +111,7 @@ void SCA_ActuatorSensor::Update()
 {
 	if (m_actuator)
 	{
-		m_midresult = m_actuator->IsActive();
+		m_midresult = m_actuator->IsActive() && !m_actuator->IsNegativeEvent();
 	}
 }
 
diff --git a/source/gameengine/GameLogic/SCA_IActuator.h b/source/gameengine/GameLogic/SCA_IActuator.h
index 774b27c5ad4..7ffb21b5490 100644
--- a/source/gameengine/GameLogic/SCA_IActuator.h
+++ b/source/gameengine/GameLogic/SCA_IActuator.h
@@ -87,6 +87,7 @@ public:
 	bool IsNegativeEvent() const;
 	virtual ~SCA_IActuator();
 
+	void ClrLink() { m_links=0; }
 	void IncLink() { m_links++; }
 	void DecLink();
 	bool IsNoLink() const { return !m_links; }
diff --git a/source/gameengine/GameLogic/SCA_IObject.cpp b/source/gameengine/GameLogic/SCA_IObject.cpp
index 27e7d5faada..c5bb4a41552 100644
--- a/source/gameengine/GameLogic/SCA_IObject.cpp
+++ b/source/gameengine/GameLogic/SCA_IObject.cpp
@@ -40,7 +40,7 @@
 
 MT_Point3 SCA_IObject::m_sDummy=MT_Point3(0,0,0);
 
-SCA_IObject::SCA_IObject(PyTypeObject* T): m_state(0), CValue(T)
+SCA_IObject::SCA_IObject(PyTypeObject* T): m_initState(0), m_state(0), CValue(T)
 {
 	m_suspended = false;
 }
@@ -164,7 +164,9 @@ void SCA_IObject::ReParentLogic()
 	{
 		SCA_IActuator* newactuator = (SCA_IActuator*) (*ita)->GetReplica();
 		newactuator->ReParent(this);
+		// actuators are initially not connected to any controller
 		newactuator->SetActive(false);
+		newactuator->ClrLink();
 		oldactuators[act++] = newactuator;
 	}
 
@@ -175,6 +177,7 @@ void SCA_IObject::ReParentLogic()
 	{
 		SCA_IController* newcontroller = (SCA_IController*)(*itc)->GetReplica();
 		newcontroller->ReParent(this);
+		newcontroller->SetActive(false);
 		oldcontrollers[con++]=newcontroller;
 
 	}
@@ -186,6 +189,9 @@ void SCA_IObject::ReParentLogic()
 	{
 		SCA_ISensor* newsensor = (SCA_ISensor*)(*its)->GetReplica();
 		newsensor->ReParent(this);
+		newsensor->SetActive(false);
+		// sensors are initially not connected to any controller
+		newsensor->ClrLink();
 		oldsensors[sen++] = newsensor;
 	}
 
diff --git a/source/gameengine/GameLogic/SCA_IObject.h b/source/gameengine/GameLogic/SCA_IObject.h
index 07b4310a91e..38a7ed29dca 100644
--- a/source/gameengine/GameLogic/SCA_IObject.h
+++ b/source/gameengine/GameLogic/SCA_IObject.h
@@ -68,6 +68,11 @@ protected:
 	 */
 	bool m_suspended;
 
+	/**
+	 * init state of object (used when object is created)
+	 */
+	unsigned int			m_initState;
+
 	/**
 	 * current state = bit mask of state that are active
 	 */
@@ -117,6 +122,16 @@ public:
 	 */
 	void Resume(void);
 
+	/**
+	 * Set init state
+	 */
+	void SetInitState(unsigned int initState) { m_initState = initState; }
+
+	/**
+	 * initialize the state when object is created
+	 */
+	void ResetState(void) { SetState(m_initState); }
+
 	/**
 	 * Set the object state
 	 */
diff --git a/source/gameengine/GameLogic/SCA_ISensor.h b/source/gameengine/GameLogic/SCA_ISensor.h
index f2ed6a803c2..4ce49e71507 100644
--- a/source/gameengine/GameLogic/SCA_ISensor.h
+++ b/source/gameengine/GameLogic/SCA_ISensor.h
@@ -126,6 +126,8 @@ public:
 	/** Resume sensing. */
 	void Resume();
 
+	void ClrLink()
+		{ m_links = 0; }
 	void IncLink()
 		{ m_links++; }
 	void DecLink();
diff --git a/source/gameengine/Ketsji/BL_BlenderShader.cpp b/source/gameengine/Ketsji/BL_BlenderShader.cpp
index 06e012123b1..dd45d522b9f 100644
--- a/source/gameengine/Ketsji/BL_BlenderShader.cpp
+++ b/source/gameengine/Ketsji/BL_BlenderShader.cpp
@@ -1,9 +1,11 @@
 
 #include "DNA_customdata_types.h"
+#include "DNA_material_types.h"
 
 #include "BL_BlenderShader.h"
+#include "BL_Material.h"
 
-#if 0
+#ifdef BLENDER_GLSL
 #include "GPU_extensions.h"
 #include "GPU_material.h"
 #endif
@@ -13,29 +15,32 @@
 
 const bool BL_BlenderShader::Ok()const
 {
-#if 0
+#ifdef BLENDER_GLSL
 	return (mGPUMat != 0);
+#else
+	return 0;
 #endif
-
-	return false;
 }
 
-BL_BlenderShader::BL_BlenderShader(struct Material *ma)
+BL_BlenderShader::BL_BlenderShader(struct Material *ma, int lightlayer)
 :
-#if 0
+#ifdef BLENDER_GLSL
 	mGPUMat(0),
 #endif
-	mBound(false)
+	mBound(false),
+	mLightLayer(lightlayer)
 {
-#if 0
-	if(ma)
-		mGPUMat = GPU_material_from_blender(ma, GPU_PROFILE_DERIVEDMESH);
+#ifdef BLENDER_GLSL
+	if(ma) {
+		GPU_material_from_blender(ma);
+		mGPUMat = ma->gpumaterial;
+	}
 #endif
 }
 
 BL_BlenderShader::~BL_BlenderShader()
 {
-#if 0
+#ifdef BLENDER_GLSL
 	if(mGPUMat) {
 		GPU_material_unbind(mGPUMat);
 		mGPUMat = 0;
@@ -43,16 +48,12 @@ BL_BlenderShader::~BL_BlenderShader()
 #endif
 }
 
-void BL_BlenderShader::ApplyShader()
-{
-}
-
 void BL_BlenderShader::SetProg(bool enable)
 {
-#if 0
+#ifdef BLENDER_GLSL
 	if(mGPUMat) {
 		if(enable) {
-			GPU_material_bind(mGPUMat);
+			GPU_material_bind(mGPUMat, mLightLayer);
 			mBound = true;
 		}
 		else {
@@ -65,7 +66,7 @@ void BL_BlenderShader::SetProg(bool enable)
 
 int BL_BlenderShader::GetAttribNum()
 {
-#if 0
+#ifdef BLENDER_GLSL
 	GPUVertexAttribs attribs;
 	int i, enabled = 0;
 
@@ -82,17 +83,19 @@ int BL_BlenderShader::GetAttribNum()
 		enabled = BL_MAX_ATTRIB;
 
 	return enabled;
-#endif
-
+#else
 	return 0;
+#endif
 }
 
-void BL_BlenderShader::SetTexCoords(RAS_IRasterizer* ras)
+void BL_BlenderShader::SetAttribs(RAS_IRasterizer* ras, const BL_Material *mat)
 {
-#if 0
+#ifdef BLENDER_GLSL
 	GPUVertexAttribs attribs;
 	int i, attrib_num;
 
+	ras->SetAttribNum(0);
+
 	if(!mGPUMat)
 		return;
 
@@ -109,14 +112,24 @@ void BL_BlenderShader::SetTexCoords(RAS_IRasterizer* ras)
 			if(attribs.layer[i].glindex > attrib_num)
 				continue;
 
-			if(attribs.layer[i].type == CD_MTFACE)
-				ras->SetAttrib(RAS_IRasterizer::RAS_TEXCO_UV1, attribs.layer[i].glindex);
+			if(attribs.layer[i].type == CD_MTFACE) {
+				if(!mat->uvName.IsEmpty() && strcmp(mat->uvName.ReadPtr(), attribs.layer[i].name) == 0)
+					ras->SetAttrib(RAS_IRasterizer::RAS_TEXCO_UV1, attribs.layer[i].glindex);
+				else if(!mat->uv2Name.IsEmpty() && strcmp(mat->uv2Name.ReadPtr(), attribs.layer[i].name) == 0)
+					ras->SetAttrib(RAS_IRasterizer::RAS_TEXCO_UV2, attribs.layer[i].glindex);
+				else
+					ras->SetAttrib(RAS_IRasterizer::RAS_TEXCO_UV1, attribs.layer[i].glindex);
+			}
 			else if(attribs.layer[i].type == CD_TANGENT)
 				ras->SetAttrib(RAS_IRasterizer::RAS_TEXTANGENT, attribs.layer[i].glindex);
 			else if(attribs.layer[i].type == CD_ORCO)
 				ras->SetAttrib(RAS_IRasterizer::RAS_TEXCO_ORCO, attribs.layer[i].glindex);
 			else if(attribs.layer[i].type == CD_NORMAL)
 				ras->SetAttrib(RAS_IRasterizer::RAS_TEXCO_NORM, attribs.layer[i].glindex);
+			else if(attribs.layer[i].type == CD_MCOL)
+				ras->SetAttrib(RAS_IRasterizer::RAS_TEXCO_VCOL, attribs.layer[i].glindex);
+			else
+				ras->SetAttrib(RAS_IRasterizer::RAS_TEXCO_DISABLE, attribs.layer[i].glindex);
 		}
 
 		ras->EnableTextures(true);
@@ -128,8 +141,8 @@ void BL_BlenderShader::SetTexCoords(RAS_IRasterizer* ras)
 
 void BL_BlenderShader::Update( const KX_MeshSlot & ms, RAS_IRasterizer* rasty )
 {
-#if 0
-	float obmat[4][4], viewmat[4][4];
+#ifdef BLENDER_GLSL
+	float obmat[4][4], viewmat[4][4], viewinvmat[4][4];
 
 	if(!mGPUMat || !mBound)
 		return;
@@ -142,7 +155,20 @@ void BL_BlenderShader::Update( const KX_MeshSlot & ms, RAS_IRasterizer* rasty )
 	model.getValue((float*)obmat);
 	view.getValue((float*)viewmat);
 
-	GPU_material_bind_uniforms(mGPUMat, obmat, viewmat);
+	view.invert();
+	view.getValue((float*)viewinvmat);
+
+	GPU_material_bind_uniforms(mGPUMat, obmat, viewmat, viewinvmat);
+#endif
+}
+
+bool BL_BlenderShader::Equals(BL_BlenderShader *blshader)
+{
+#ifdef BLENDER_GLSL
+	/* to avoid unneeded state switches */
+	return (blshader && mGPUMat == blshader->mGPUMat && mLightLayer == blshader->mLightLayer);
+#else
+	return true;
 #endif
 }
 
diff --git a/source/gameengine/Ketsji/BL_BlenderShader.h b/source/gameengine/Ketsji/BL_BlenderShader.h
index 4cab0e644c3..b758d1a9cba 100644
--- a/source/gameengine/Ketsji/BL_BlenderShader.h
+++ b/source/gameengine/Ketsji/BL_BlenderShader.h
@@ -2,7 +2,7 @@
 #ifndef __BL_GPUSHADER_H__
 #define __BL_GPUSHADER_H__
 
-#if 0
+#ifdef BLENDER_GLSL
 #include "GPU_material.h"
 #endif
 
@@ -12,7 +12,10 @@
 #include "MT_Tuple3.h"
 #include "MT_Tuple4.h"
 
+#include "RAS_IPolygonMaterial.h"
+
 struct Material;
+class BL_Material;
 
 #define BL_MAX_ATTRIB	16
 
@@ -23,22 +26,24 @@ struct Material;
 class BL_BlenderShader
 {
 private:
-#if 0
+#ifdef BLENDER_GLSL
 	GPUMaterial		*mGPUMat;
 #endif
 	bool			mBound;
+	int				mLightLayer;
 
 public:
-	BL_BlenderShader(struct Material *ma);
+	BL_BlenderShader(struct Material *ma, int lightlayer);
 	virtual ~BL_BlenderShader();
 
 	const bool			Ok()const;
 	void				SetProg(bool enable);
 
-	void ApplyShader();
-	void SetTexCoords(class RAS_IRasterizer* ras);
 	int GetAttribNum();
+	void SetAttribs(class RAS_IRasterizer* ras, const BL_Material *mat);
 	void Update(const class KX_MeshSlot & ms, class RAS_IRasterizer* rasty);
+
+	bool Equals(BL_BlenderShader *blshader);
 };
 
 #endif//__BL_GPUSHADER_H__
diff --git a/source/gameengine/Ketsji/BL_Material.cpp b/source/gameengine/Ketsji/BL_Material.cpp
index f5312ccd023..7e3d6984f19 100644
--- a/source/gameengine/Ketsji/BL_Material.cpp
+++ b/source/gameengine/Ketsji/BL_Material.cpp
@@ -105,7 +105,8 @@ void BL_Material::GetConversionRGB(unsigned int *nrgb) {
 	*nrgb   = rgb[3];
 }
 
-void BL_Material::SetConversionUV(MT_Point2 *nuv) {
+void BL_Material::SetConversionUV(const STR_String& name, MT_Point2 *nuv) {
+	uvName = name;
 	uv[0] = *nuv++;
 	uv[1] = *nuv++;
 	uv[2] = *nuv++;
@@ -118,7 +119,8 @@ void BL_Material::GetConversionUV(MT_Point2 *nuv){
 	*nuv++ = uv[2];
 	*nuv   = uv[3];
 }
-void BL_Material::SetConversionUV2(MT_Point2 *nuv) {
+void BL_Material::SetConversionUV2(const STR_String& name, MT_Point2 *nuv) {
+	uv2Name = name;
 	uv2[0] = *nuv++;
 	uv2[1] = *nuv++;
 	uv2[2] = *nuv++;
diff --git a/source/gameengine/Ketsji/BL_Material.h b/source/gameengine/Ketsji/BL_Material.h
index ddb6662830a..568f7e171de 100644
--- a/source/gameengine/Ketsji/BL_Material.h
+++ b/source/gameengine/Ketsji/BL_Material.h
@@ -83,13 +83,16 @@ public:
 	MT_Point2 uv[4];
 	MT_Point2 uv2[4];
 
+	STR_String uvName;
+	STR_String uv2Name;
+
 	void SetConversionRGB(unsigned int *rgb);
 	void GetConversionRGB(unsigned int *rgb);
 
-	void SetConversionUV(MT_Point2 *uv);
+	void SetConversionUV(const STR_String& name, MT_Point2 *uv);
 	void GetConversionUV(MT_Point2 *uv);
 
-	void SetConversionUV2(MT_Point2 *uv);
+	void SetConversionUV2(const STR_String& name, MT_Point2 *uv);
 	void GetConversionUV2(MT_Point2 *uv);
 
 	void SetSharedMaterial(bool v);
diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
index 02b1ffd432a..0f445a9f32e 100644
--- a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
+++ b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
@@ -38,6 +38,8 @@ extern "C" {
 // ------------------------------------
 #define spit(x) std::cout << x << std::endl;
 
+BL_BlenderShader *KX_BlenderMaterial::mLastBlenderShader = NULL;
+
 //static PyObject *gTextureDict = 0;
 
 KX_BlenderMaterial::KX_BlenderMaterial(
@@ -126,32 +128,31 @@ void KX_BlenderMaterial::OnConstruction()
 		// when material are reused between objects
 		return;
 	
-	if(mMaterial->glslmat) {
+	if(mMaterial->glslmat)
 		SetBlenderGLSLShader();
-	}
-	else {
-		// for each unique material...
-		int i;
-		for(i=0; i<mMaterial->num_enabled; i++) {
-			if( mMaterial->mapping[i].mapping & USEENV ) {
-				if(!GLEW_ARB_texture_cube_map) {
-					spit("CubeMap textures not supported");
-					continue;
-				}
-				if(!mTextures[i].InitCubeMap(i, mMaterial->cubemap[i] ) )
+
+	// for each unique material...
+	int i;
+	for(i=0; i<mMaterial->num_enabled; i++) {
+		if( mMaterial->mapping[i].mapping & USEENV ) {
+			if(!GLEW_ARB_texture_cube_map) {
+				spit("CubeMap textures not supported");
+				continue;
+			}
+			if(!mTextures[i].InitCubeMap(i, mMaterial->cubemap[i] ) )
+				spit("unable to initialize image("<<i<<") in "<< 
+						 mMaterial->matname<< ", image will not be available");
+		} 
+	
+		else {
+			if( mMaterial->img[i] ) {
+				if( ! mTextures[i].InitFromImage(i, mMaterial->img[i], (mMaterial->flag[i] &MIPMAP)!=0 ))
 					spit("unable to initialize image("<<i<<") in "<< 
-							 mMaterial->matname<< ", image will not be available");
-			} 
-		
-			else {
-				if( mMaterial->img[i] ) {
-					if( ! mTextures[i].InitFromImage(i, mMaterial->img[i], (mMaterial->flag[i] &MIPMAP)!=0 ))
-						spit("unable to initialize image("<<i<<") in "<< 
-							mMaterial->matname<< ", image will not be available");
-				}
+						mMaterial->matname<< ", image will not be available");
 			}
 		}
 	}
+
 	mBlendFunc[0] =0;
 	mBlendFunc[1] =0;
 	mConstructed = true;
@@ -168,7 +169,11 @@ void KX_BlenderMaterial::OnExit()
 	}
 
 	if( mBlenderShader ) {
-		mBlenderShader->SetProg(false);
+		if(mBlenderShader == mLastBlenderShader) {
+			mBlenderShader->SetProg(false);
+			mLastBlenderShader = NULL;
+		}
+
 		delete mBlenderShader;
 		mBlenderShader = 0;
 	}
@@ -225,14 +230,23 @@ void KX_BlenderMaterial::setBlenderShaderData( bool enable, RAS_IRasterizer *ras
 {
 	if( !enable || !mBlenderShader->Ok() ) {
 		// frame cleanup.
-		mBlenderShader->SetProg(false);
+		if(mLastBlenderShader) {
+			mLastBlenderShader->SetProg(false);
+			mLastBlenderShader= NULL;
+		}
 		BL_Texture::DisableAllTextures();
 		return;
 	}
 
-	BL_Texture::DisableAllTextures();
-	mBlenderShader->SetProg(true);
-	mBlenderShader->ApplyShader();
+	if(!mBlenderShader->Equals(mLastBlenderShader)) {
+		BL_Texture::DisableAllTextures();
+
+		if(mLastBlenderShader)
+			mLastBlenderShader->SetProg(false);
+
+		mBlenderShader->SetProg(true);
+		mLastBlenderShader= mBlenderShader;
+	}
 }
 
 void KX_BlenderMaterial::setTexData( bool enable, RAS_IRasterizer *ras)
@@ -298,7 +312,12 @@ KX_BlenderMaterial::ActivatShaders(
 	// reset... 
 	if(tmp->mMaterial->IsShared()) 
 		cachingInfo =0;
-	
+
+	if(mLastBlenderShader) {
+		mLastBlenderShader->SetProg(false);
+		mLastBlenderShader= NULL;
+	}
+
 	if (GetCachingInfo() != cachingInfo) {
 
 		if (!cachingInfo)
@@ -372,7 +391,7 @@ KX_BlenderMaterial::ActivateBlenderShaders(
 	}
 
 	ActivatGLMaterials(rasty);
-	mBlenderShader->SetTexCoords(rasty);
+	mBlenderShader->SetAttribs(rasty, mMaterial);
 }
 
 void
@@ -382,6 +401,12 @@ KX_BlenderMaterial::ActivateMat(
 	)const
 {
 	KX_BlenderMaterial *tmp = const_cast<KX_BlenderMaterial*>(this);
+
+	if(mLastBlenderShader) {
+		mLastBlenderShader->SetProg(false);
+		mLastBlenderShader= NULL;
+	}
+
 	if (GetCachingInfo() != cachingInfo) {
 		if (!cachingInfo) 
 			tmp->setTexData( false,rasty );
@@ -460,17 +485,29 @@ KX_BlenderMaterial::Activate(
 	return dopass;
 }
 
+bool KX_BlenderMaterial::UsesLighting(RAS_IRasterizer *rasty) const
+{
+	if(!RAS_IPolyMaterial::UsesLighting(rasty))
+		return false;
+
+	if(mShader && mShader->Ok());
+	else if(mBlenderShader && mBlenderShader->Ok())
+		return false;
+	
+	return true;
+}
+
 void KX_BlenderMaterial::ActivateMeshSlot(const KX_MeshSlot & ms, RAS_IRasterizer* rasty) const
 {
 	if(mShader && GLEW_ARB_shader_objects)
 		mShader->Update(ms, rasty);
-	if(mBlenderShader && GLEW_ARB_shader_objects)
+	else if(mBlenderShader && GLEW_ARB_shader_objects)
 		mBlenderShader->Update(ms, rasty);
 }
 
 void KX_BlenderMaterial::ActivatGLMaterials( RAS_IRasterizer* rasty )const
 {
-	if(!mBlenderShader) {
+	if(mShader || !mBlenderShader) {
 		rasty->SetSpecularity(
 			mMaterial->speccolor[0]*mMaterial->spec_f,
 			mMaterial->speccolor[1]*mMaterial->spec_f,
@@ -506,6 +543,7 @@ void KX_BlenderMaterial::ActivateTexGen(RAS_IRasterizer *ras) const
 		ras->SetAttribNum(0);
 		if(mShader && GLEW_ARB_shader_objects) {
 			if(mShader->GetAttribute() == BL_Shader::SHD_TANGENT) {
+				ras->SetAttrib(RAS_IRasterizer::RAS_TEXCO_DISABLE, 0);
 				ras->SetAttrib(RAS_IRasterizer::RAS_TEXTANGENT, 1);
 				ras->SetAttribNum(2);
 			}
@@ -793,7 +831,7 @@ KX_PYMETHODDEF_DOC( KX_BlenderMaterial, getShader , "getShader()")
 void KX_BlenderMaterial::SetBlenderGLSLShader(void)
 {
 	if(!mBlenderShader)
-		mBlenderShader = new BL_BlenderShader(mMaterial->material);
+		mBlenderShader = new BL_BlenderShader(mMaterial->material, m_lightlayer);
 
 	if(!mBlenderShader->Ok()) {
 		delete mBlenderShader;
diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.h b/source/gameengine/Ketsji/KX_BlenderMaterial.h
index 62e96b71937..bf6d2095e7c 100644
--- a/source/gameengine/Ketsji/KX_BlenderMaterial.h
+++ b/source/gameengine/Ketsji/KX_BlenderMaterial.h
@@ -94,6 +94,7 @@ private:
 	BL_Material*		mMaterial;
 	BL_Shader*			mShader;
 	BL_BlenderShader*	mBlenderShader;
+	static BL_BlenderShader *mLastBlenderShader;
 	KX_Scene*		mScene;
 	BL_Texture		mTextures[MAXTEX];		// texture array
 	bool			mUserDefBlend;
@@ -106,6 +107,7 @@ private:
 	void ActivatGLMaterials( RAS_IRasterizer* rasty )const;
 	void ActivateTexGen( RAS_IRasterizer *ras ) const;
 
+	bool UsesLighting(RAS_IRasterizer *rasty) const;
 
 	// message centers
 	void	setTexData( bool enable,RAS_IRasterizer *ras);
diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp
index bde5e2cd0a2..2ac4f909077 100644
--- a/source/gameengine/Ketsji/KX_GameObject.cpp
+++ b/source/gameengine/Ketsji/KX_GameObject.cpp
@@ -405,34 +405,25 @@ void KX_GameObject::ResetDebugColor()
 	SetDebugColor(0xff000000);
 }
 
+void KX_GameObject::InitIPO(bool ipo_as_force,
+							bool ipo_add,
+							bool ipo_local)
+{
+	SGControllerList::iterator it = GetSGNode()->GetSGControllerList().begin();
 
+	while (it != GetSGNode()->GetSGControllerList().end()) {
+		(*it)->SetOption(SG_Controller::SG_CONTR_IPO_RESET, true);
+		(*it)->SetOption(SG_Controller::SG_CONTR_IPO_IPO_AS_FORCE, ipo_as_force);
+		(*it)->SetOption(SG_Controller::SG_CONTR_IPO_IPO_ADD, ipo_add);
+		(*it)->SetOption(SG_Controller::SG_CONTR_IPO_LOCAL, ipo_local);
+		it++;
+	}
+} 
 
 void KX_GameObject::UpdateIPO(float curframetime,
-							  bool recurse,
-							  bool ipo_as_force,
-							  bool force_local) 
+							  bool recurse) 
 {
-
-	// The ipo-actuator needs a sumo reference... this is retrieved (unfortunately)
-	// by the iposgcontr itself...
-//		ipocontr->SetSumoReference(gameobj->GetSumoScene(), 
-//								   gameobj->GetSumoObject());
-
-
-	// The ipo has to be treated as a force, and not a displacement!
-	// For this case, we send some settings to the controller. This
-	// may need some caching...
-	if (ipo_as_force) {
-		SGControllerList::iterator it = GetSGNode()->GetSGControllerList().begin();
-
-		while (it != GetSGNode()->GetSGControllerList().end()) {
-			(*it)->SetOption(SG_Controller::SG_CONTR_IPO_IPO_AS_FORCE, ipo_as_force);
-			(*it)->SetOption(SG_Controller::SG_CONTR_IPO_FORCES_ACT_LOCAL, force_local);
-			it++;
-		}
-	} 
-
-	// The rest is the 'normal' update procedure.
+	// just the 'normal' update procedure.
 	GetSGNode()->SetSimulatedTime(curframetime,recurse);
 	GetSGNode()->UpdateWorldData(curframetime);
 	UpdateTransform();
@@ -581,7 +572,7 @@ void KX_GameObject::SetObjectColor(const MT_Vector4& rgbavec)
 	m_objectColor = rgbavec;
 }
 
-void KX_GameObject::AlignAxisToVect(const MT_Vector3& dir, int axis)
+void KX_GameObject::AlignAxisToVect(const MT_Vector3& dir, int axis, float fac)
 {
 	MT_Matrix3x3 orimat;
 	MT_Vector3 vect,ori,z,x,y;
@@ -594,6 +585,11 @@ void KX_GameObject::AlignAxisToVect(const MT_Vector3& dir, int axis)
 		cout << "alignAxisToVect() Error: Null vector!\n";
 		return;
 	}
+	
+	if (fac<=0.0) {
+		return;
+	}
+	
 	// normalize
 	vect /= len;
 	orimat = GetSGNode()->GetWorldOrientation();
@@ -603,7 +599,14 @@ void KX_GameObject::AlignAxisToVect(const MT_Vector3& dir, int axis)
 			ori = MT_Vector3(orimat[0][2], orimat[1][2], orimat[2][2]); //pivot axis
 			if (MT_abs(vect.dot(ori)) > 1.0-3.0*MT_EPSILON) //is the vector paralell to the pivot?
 				ori = MT_Vector3(orimat[0][1], orimat[1][1], orimat[2][1]); //change the pivot!
-			x = vect; 
+			if (fac == 1.0) {
+				x = vect;
+			} else {
+				x = (vect * fac) + ((orimat * MT_Vector3(1.0, 0.0, 0.0)) * (1-fac));
+				len = x.length();
+				if (MT_fuzzyZero(len)) x = vect;
+				else x /= len;
+			}
 			y = ori.cross(x);
 			z = x.cross(y);
 			break;
@@ -611,7 +614,14 @@ void KX_GameObject::AlignAxisToVect(const MT_Vector3& dir, int axis)
 			ori = MT_Vector3(orimat[0][0], orimat[1][0], orimat[2][0]);
 			if (MT_abs(vect.dot(ori)) > 1.0-3.0*MT_EPSILON)
 				ori = MT_Vector3(orimat[0][2], orimat[1][2], orimat[2][2]);
-			y = vect;
+			if (fac == 1.0) {
+				y = vect;
+			} else {
+				y = (vect * fac) + ((orimat * MT_Vector3(0.0, 1.0, 0.0)) * (1-fac));
+				len = y.length();
+				if (MT_fuzzyZero(len)) y = vect;
+				else y /= len;
+			}
 			z = ori.cross(y);
 			x = y.cross(z);
 			break;
@@ -619,7 +629,14 @@ void KX_GameObject::AlignAxisToVect(const MT_Vector3& dir, int axis)
 			ori = MT_Vector3(orimat[0][1], orimat[1][1], orimat[2][1]);
 			if (MT_abs(vect.dot(ori)) > 1.0-3.0*MT_EPSILON)
 				ori = MT_Vector3(orimat[0][0], orimat[1][0], orimat[2][0]);
-			z = vect;
+			if (fac == 1.0) {
+				z = vect;
+			} else {
+				z = (vect * fac) + ((orimat * MT_Vector3(0.0, 0.0, 1.0)) * (1-fac));
+				len = z.length();
+				if (MT_fuzzyZero(len)) z = vect;
+				else z /= len;
+			}
 			x = ori.cross(z);
 			y = z.cross(x);
 			break;
@@ -1289,7 +1306,7 @@ PyObject* KX_GameObject::PyGetMesh(PyObject* self,
 			return meshproxy;
 		}
 	}
-	return NULL;
+	Py_RETURN_NONE;
 }
 
 
@@ -1395,13 +1412,14 @@ PyObject* KX_GameObject::PyAlignAxisToVect(PyObject* self,
 {
 	PyObject* pyvect;
 	int axis = 2; //z axis is the default
+	float fac = 1.0;
 	
-	if (PyArg_ParseTuple(args,"O|i",&pyvect,&axis))
+	if (PyArg_ParseTuple(args,"O|if",&pyvect,&axis, &fac))
 	{
 		MT_Vector3 vect;
 		if (PyVecTo(pyvect, vect))
 		{
-			AlignAxisToVect(vect,axis);				
+			AlignAxisToVect(vect,axis,fac);
 			Py_RETURN_NONE;
 		}
 	}
@@ -1590,14 +1608,18 @@ KX_PYMETHODDEF_DOC(KX_GameObject, rayCast,
 		other = static_cast<KX_GameObject*>(pyfrom);
 		fromPoint = other->NodeGetWorldPosition();
 	}
-
-	if (dist != 0.0f)
-	{
+	
+	if (dist != 0.0f) {
 		MT_Vector3 toDir = toPoint-fromPoint;
+		if (MT_fuzzyZero(toDir.length2())) {
+			return Py_BuildValue("OOO", Py_None, Py_None, Py_None);
+		}
 		toDir.normalize();
 		toPoint = fromPoint + (dist) * toDir;
+	} else if (MT_fuzzyZero((toPoint-fromPoint).length2())) {
+		return Py_BuildValue("OOO", Py_None, Py_None, Py_None);
 	}
-
+	
 	MT_Point3 resultPoint;
 	MT_Vector3 resultNormal;
 	PHY_IPhysicsEnvironment* pe = GetPhysicsEnvironment();
diff --git a/source/gameengine/Ketsji/KX_GameObject.h b/source/gameengine/Ketsji/KX_GameObject.h
index 5e44a36515d..ddbf863aa1a 100644
--- a/source/gameengine/Ketsji/KX_GameObject.h
+++ b/source/gameengine/Ketsji/KX_GameObject.h
@@ -278,7 +278,8 @@ public:
 		void 
 	AlignAxisToVect(
 		const MT_Vector3& vect,
-		int axis = 2 
+		int axis = 2,
+		float fac = 1.0
 	);
 
 	/** 
@@ -489,15 +490,23 @@ public:
 	UpdateNonDynas(
 	);
 
+	/**
+	 * Function to set IPO option at start of IPO
+	 */ 
+		void	
+	InitIPO(
+		bool ipo_as_force,
+		bool ipo_add,
+		bool ipo_local
+	);
+
 	/**
 	 * Odd function to update an ipo. ???
 	 */ 
 		void	
 	UpdateIPO(
 		float curframetime,
-		bool recurse, 
-		bool ipo_as_force,
-		bool force_ipo_local
+		bool recurse
 	);
 	/**
 	 * Updates Material Ipo data 
diff --git a/source/gameengine/Ketsji/KX_IPO_SGController.cpp b/source/gameengine/Ketsji/KX_IPO_SGController.cpp
index 5303e9a9e85..d3aa924665e 100644
--- a/source/gameengine/Ketsji/KX_IPO_SGController.cpp
+++ b/source/gameengine/Ketsji/KX_IPO_SGController.cpp
@@ -55,7 +55,8 @@ typedef unsigned long uint_ptr;
 // start on another frame, the 1.0 should change.
 KX_IpoSGController::KX_IpoSGController() 
 : m_ipo_as_force(false),
-  m_force_ipo_acts_local(false),
+  m_ipo_add(false),
+  m_ipo_local(false),
   m_modified(true),
   m_ipo_start_initialized(false),
   m_ipotime(1.0)
@@ -75,8 +76,23 @@ void KX_IpoSGController::SetOption(
 		m_ipo_as_force = (value != 0);
 		m_modified = true;
 		break;
-	case SG_CONTR_IPO_FORCES_ACT_LOCAL:
-		m_force_ipo_acts_local = (value != 0);
+	case SG_CONTR_IPO_IPO_ADD:
+		m_ipo_add = (value != 0);
+		m_modified = true;
+		break;
+	case SG_CONTR_IPO_RESET:
+		if (m_ipo_start_initialized && value) {
+			m_ipo_start_initialized = false;
+			m_modified = true;
+		}
+		break;
+	case SG_CONTR_IPO_LOCAL:
+		if (value/* && ((SG_Node*)m_pObject)->GetSGParent() == NULL*/) {
+			// only accept local Ipo if the object has no parent
+			m_ipo_local = true;
+		} else {
+			m_ipo_local = false;
+		}
 		m_modified = true;
 		break;
 	default:
@@ -129,15 +145,19 @@ bool KX_IpoSGController::Update(double currentTime)
 			{
 				if (m_game_object && ob) 
 				{
-					m_game_object->GetPhysicsController()->ApplyForce(m_force_ipo_acts_local ?
+					m_game_object->GetPhysicsController()->ApplyForce(m_ipo_local ?
 						ob->GetWorldOrientation() * m_ipo_xform.GetPosition() :
 						m_ipo_xform.GetPosition(), false);
 				}
 			} 
 			else
 			{
-				//by default, leave object as it stands
-				MT_Point3 newPosition = ob->GetLocalPosition();
+				// Local ipo should be defined with the object position at (0,0,0)
+				// Local transform is applied to the object based on initial position
+				MT_Point3 newPosition(0.0,0.0,0.0);
+				
+				if (!m_ipo_add)
+					newPosition = ob->GetLocalPosition();
 				//apply separate IPO channels if there is any data in them
 				//Loc and dLoc act by themselves or are additive
 				//LocX and dLocX
@@ -145,23 +165,28 @@ bool KX_IpoSGController::Update(double currentTime)
 					newPosition[0] = (m_ipo_channels_active[OB_DLOC_X] ? m_ipo_xform.GetPosition()[0] + m_ipo_xform.GetDeltaPosition()[0] : m_ipo_xform.GetPosition()[0]);
 				}
 				else if (m_ipo_channels_active[OB_DLOC_X] && m_ipo_start_initialized) {
-					newPosition[0] = (m_ipo_start_point[0] + m_ipo_xform.GetDeltaPosition()[0]);
+					newPosition[0] = (((!m_ipo_add)?m_ipo_start_point[0]:0.0) + m_ipo_xform.GetDeltaPosition()[0]);
 				}
 				//LocY and dLocY
 				if (m_ipo_channels_active[OB_LOC_Y]) {
 					newPosition[1] = (m_ipo_channels_active[OB_DLOC_Y] ? m_ipo_xform.GetPosition()[1] + m_ipo_xform.GetDeltaPosition()[1] : m_ipo_xform.GetPosition()[1]);
 				}
 				else if (m_ipo_channels_active[OB_DLOC_Y] && m_ipo_start_initialized) {
-					newPosition[1] = (m_ipo_start_point[1] + m_ipo_xform.GetDeltaPosition()[1]);
+					newPosition[1] = (((!m_ipo_add)?m_ipo_start_point[1]:0.0) + m_ipo_xform.GetDeltaPosition()[1]);
 				}
 				//LocZ and dLocZ
 				if (m_ipo_channels_active[OB_LOC_Z]) {
 					newPosition[2] = (m_ipo_channels_active[OB_DLOC_Z] ? m_ipo_xform.GetPosition()[2] + m_ipo_xform.GetDeltaPosition()[2] : m_ipo_xform.GetPosition()[2]);
 				}
 				else if (m_ipo_channels_active[OB_DLOC_Z] && m_ipo_start_initialized) {
-					newPosition[2] = (m_ipo_start_point[2] + m_ipo_xform.GetDeltaPosition()[2]);
+					newPosition[2] = (((!m_ipo_add)?m_ipo_start_point[2]:0.0) + m_ipo_xform.GetDeltaPosition()[2]);
+				}
+				if (m_ipo_add) {
+					if (m_ipo_local)
+						newPosition = m_ipo_start_point + m_ipo_start_scale*(m_ipo_start_orient*newPosition);
+					else
+						newPosition = m_ipo_start_point + newPosition;
 				}
-				
 				ob->SetLocalPosition(newPosition);
 			}
 		}
@@ -170,21 +195,23 @@ bool KX_IpoSGController::Update(double currentTime)
 			if (m_ipo_as_force) {
 				
 				if (m_game_object && ob) {
-					m_game_object->ApplyTorque(m_force_ipo_acts_local ?
+					m_game_object->ApplyTorque(m_ipo_local ?
 						ob->GetWorldOrientation() * m_ipo_xform.GetEulerAngles() :
 						m_ipo_xform.GetEulerAngles(), false);
 				}
 			} else {
-				double yaw, pitch,  roll;	//final Euler angles
+				double yaw=0, pitch=0,  roll=0;	//final Euler angles
 				double tempYaw=0, tempPitch=0, tempRoll=0;	//temp holders
-				ob->GetLocalOrientation().getEuler(yaw, pitch, roll);
+				if (!m_ipo_add)
+					ob->GetLocalOrientation().getEuler(yaw, pitch, roll);
 
 				//RotX and dRotX
 				if (m_ipo_channels_active[OB_ROT_X]) {
 					yaw = (m_ipo_channels_active[OB_DROT_X] ? (m_ipo_xform.GetEulerAngles()[0] + m_ipo_xform.GetDeltaEulerAngles()[0]) : m_ipo_xform.GetEulerAngles()[0] );
 				}
 				else if (m_ipo_channels_active[OB_DROT_X] && m_ipo_start_initialized) {
-					m_ipo_start_orient.getEuler(tempYaw, tempPitch, tempRoll);
+					if (!m_ipo_add)
+						m_ipo_start_orient.getEuler(tempYaw, tempPitch, tempRoll);
 					yaw = tempYaw + m_ipo_xform.GetDeltaEulerAngles()[0];
 				}
 
@@ -193,7 +220,8 @@ bool KX_IpoSGController::Update(double currentTime)
 					pitch = (m_ipo_channels_active[OB_DROT_Y] ? (m_ipo_xform.GetEulerAngles()[1] + m_ipo_xform.GetDeltaEulerAngles()[1]) : m_ipo_xform.GetEulerAngles()[1] );
 				}
 				else if (m_ipo_channels_active[OB_DROT_Y] && m_ipo_start_initialized) {
-					m_ipo_start_orient.getEuler(tempYaw, tempPitch, tempRoll);
+					if (!m_ipo_add)
+						m_ipo_start_orient.getEuler(tempYaw, tempPitch, tempRoll);
 					pitch = tempPitch + m_ipo_xform.GetDeltaEulerAngles()[1];
 				}
 				
@@ -202,23 +230,34 @@ bool KX_IpoSGController::Update(double currentTime)
 					roll = (m_ipo_channels_active[OB_DROT_Z] ? (m_ipo_xform.GetEulerAngles()[2] + m_ipo_xform.GetDeltaEulerAngles()[2]) : m_ipo_xform.GetEulerAngles()[2] );
 				}
 				else if (m_ipo_channels_active[OB_DROT_Z] && m_ipo_start_initialized) {
-					m_ipo_start_orient.getEuler(tempYaw, tempPitch, tempRoll);
+					if (!m_ipo_add)
+						m_ipo_start_orient.getEuler(tempYaw, tempPitch, tempRoll);
 					roll = tempRoll + m_ipo_xform.GetDeltaEulerAngles()[2];
 				}
-
-				ob->SetLocalOrientation(MT_Vector3(yaw, pitch, roll));
+				if (m_ipo_add) {
+					MT_Matrix3x3 rotation(MT_Vector3(yaw, pitch, roll));
+					if (m_ipo_local)
+						rotation = m_ipo_start_orient * rotation;
+					else
+						rotation = rotation * m_ipo_start_orient;
+					ob->SetLocalOrientation(rotation);
+				} else {
+					ob->SetLocalOrientation(MT_Vector3(yaw, pitch, roll));
+				}
 			}
 		}
 		//modifies scale?
 		if (m_ipo_channels_active[OB_SIZE_X] || m_ipo_channels_active[OB_SIZE_Y] || m_ipo_channels_active[OB_SIZE_Z] || m_ipo_channels_active[OB_DSIZE_X] || m_ipo_channels_active[OB_DSIZE_Y] || m_ipo_channels_active[OB_DSIZE_Z]) {
 			//default is no scale change
-			MT_Vector3 newScale = ob->GetLocalScale();
+			MT_Vector3 newScale(1.0,1.0,1.0);
+			if (!m_ipo_add)
+				newScale = ob->GetLocalScale();
 
 			if (m_ipo_channels_active[OB_SIZE_X]) {
 				newScale[0] = (m_ipo_channels_active[OB_DSIZE_X] ? (m_ipo_xform.GetScaling()[0] + m_ipo_xform.GetDeltaScaling()[0]) : m_ipo_xform.GetScaling()[0]);
 			}
 			else if (m_ipo_channels_active[OB_DSIZE_X] && m_ipo_start_initialized) {
-				newScale[0] = (m_ipo_xform.GetDeltaScaling()[0] + m_ipo_start_scale[0]);
+				newScale[0] = (m_ipo_xform.GetDeltaScaling()[0] + ((!m_ipo_add)?m_ipo_start_scale[0]:0.0));
 			}
 
 			//RotY dRotY
@@ -226,7 +265,7 @@ bool KX_IpoSGController::Update(double currentTime)
 				newScale[1] = (m_ipo_channels_active[OB_DSIZE_Y] ? (m_ipo_xform.GetScaling()[1] + m_ipo_xform.GetDeltaScaling()[1]): m_ipo_xform.GetScaling()[1]);
 			}
 			else if (m_ipo_channels_active[OB_DSIZE_Y] && m_ipo_start_initialized) {
-				newScale[1] = (m_ipo_xform.GetDeltaScaling()[1] + m_ipo_start_scale[1]);
+				newScale[1] = (m_ipo_xform.GetDeltaScaling()[1] + ((!m_ipo_add)?m_ipo_start_scale[1]:0.0));
 			}
 			
 			//RotZ and dRotZ
@@ -234,7 +273,11 @@ bool KX_IpoSGController::Update(double currentTime)
 				newScale[2] = (m_ipo_channels_active[OB_DSIZE_Z] ? (m_ipo_xform.GetScaling()[2] + m_ipo_xform.GetDeltaScaling()[2]) : m_ipo_xform.GetScaling()[2]);
 			}
 			else if (m_ipo_channels_active[OB_DSIZE_Z] && m_ipo_start_initialized) {
-				newScale[2] = (m_ipo_xform.GetDeltaScaling()[2] + m_ipo_start_scale[2]);
+				newScale[2] = (m_ipo_xform.GetDeltaScaling()[2] + ((!m_ipo_add)?m_ipo_start_scale[2]:1.0));
+			}
+
+			if (m_ipo_add) {
+				newScale = m_ipo_start_scale * newScale;
 			}
 
 			ob->SetLocalScale(newScale);
diff --git a/source/gameengine/Ketsji/KX_IPO_SGController.h b/source/gameengine/Ketsji/KX_IPO_SGController.h
index 7b5a151b41c..0bd8980f11c 100644
--- a/source/gameengine/Ketsji/KX_IPO_SGController.h
+++ b/source/gameengine/Ketsji/KX_IPO_SGController.h
@@ -48,8 +48,11 @@ class KX_IpoSGController : public SG_Controller
 	/** Interpret the ipo as a force rather than a displacement? */
 	bool                m_ipo_as_force;
 
-	/** Ipo-as-force acts in local rather than in global coordinates? */
-	bool                m_force_ipo_acts_local;
+	/** Add Ipo curve to current loc/rot/scale */
+	bool                m_ipo_add;
+
+	/** Ipo must be applied in local coordinate rather than in global coordinates (used for force and Add mode)*/
+	bool                m_ipo_local;
 	
 	/** Were settings altered since the last update? */
 	bool				m_modified;
diff --git a/source/gameengine/Ketsji/KX_IpoActuator.cpp b/source/gameengine/Ketsji/KX_IpoActuator.cpp
index cf246342cf9..b7103f49aee 100644
--- a/source/gameengine/Ketsji/KX_IpoActuator.cpp
+++ b/source/gameengine/Ketsji/KX_IpoActuator.cpp
@@ -59,40 +59,6 @@ STR_String KX_IpoActuator::S_KX_ACT_IPO_FROM_PROP_STRING = "FromProp";
 /* ------------------------------------------------------------------------- */
 /* Native functions                                                          */
 /* ------------------------------------------------------------------------- */
-/** Another poltergeist? This seems to be a very transient class... */
-class CIpoAction : public CAction
-{
-	float		m_curtime;
-	bool		m_recurse;
-	KX_GameObject* m_gameobj;
-	bool        m_ipo_as_force;
-	bool        m_force_ipo_local;
-
-public:
-	CIpoAction(KX_GameObject* gameobj,
-		float curtime,
-		bool recurse, 
-		bool ipo_as_force,
-		bool force_ipo_local) :
-	  m_curtime(curtime) ,
-	  m_recurse(recurse),
-	  m_gameobj(gameobj),
-	  m_ipo_as_force(ipo_as_force),
-	  m_force_ipo_local(force_ipo_local) 
-	  {
-		  /* intentionally empty */
-	  };
-
-	virtual void Execute() const
-	{
-		m_gameobj->UpdateIPO(
-			m_curtime, 
-			m_recurse, 
-			m_ipo_as_force, 
-			m_force_ipo_local);
-	};
-
-};
 
 KX_IpoActuator::KX_IpoActuator(SCA_IObject* gameobj,
 							   const STR_String& propname,
@@ -101,7 +67,8 @@ KX_IpoActuator::KX_IpoActuator(SCA_IObject* gameobj,
 							   bool recurse,
 							   int acttype,
 							   bool ipo_as_force,
-							   bool force_ipo_local,
+							   bool ipo_add,
+							   bool ipo_local,
 							   PyTypeObject* T) 
 	: SCA_IActuator(gameobj,T),
 	m_bNegativeEvent(false),
@@ -112,7 +79,8 @@ KX_IpoActuator::KX_IpoActuator(SCA_IObject* gameobj,
 	m_direction(1),
 	m_propname(propname),
 	m_ipo_as_force(ipo_as_force),
-	m_force_ipo_local(force_ipo_local),
+	m_ipo_add(ipo_add),
+	m_ipo_local(ipo_local),
 	m_type((IpoActType)acttype)
 {
 	m_starttime = -2.0*fabs(m_endframe - m_startframe) - 1.0;
@@ -160,7 +128,7 @@ bool KX_IpoActuator::ClampLocalTime()
 
 void KX_IpoActuator::SetStartTime(float curtime)
 {
-	float direction = m_startframe < m_endframe ? 1.0 : -1.0;
+	float direction = m_startframe < m_endframe ? 1.0f : -1.0f;
 
 	curtime = curtime - KX_KetsjiEngine::GetSuspendedDelta();	
 	if (m_direction > 0)
@@ -195,31 +163,26 @@ bool KX_IpoActuator::Update(double curtime, bool frame)
 	// maybe there are events for us in the queue !
 	bool bNegativeEvent = false;
 	int numevents = 0;
+	bool bIpoStart = false;
 
 	if (frame)
 	{
 		numevents = m_events.size();
-		for (vector<CValue*>::iterator i=m_events.end(); !(i==m_events.begin());)
-		{
-			--i;
-			if ((*i)->GetNumber() == 0.0f)
-				bNegativeEvent = true;
-			
-			(*i)->Release();
-		}
-		m_events.clear();
+		bNegativeEvent = IsNegativeEvent();
+		RemoveAllEvents();
 	}
 	
-	double  start_smaller_then_end = ( m_startframe < m_endframe ? 1.0 : -1.0);
+	float  start_smaller_then_end = ( m_startframe < m_endframe ? 1.0f : -1.0f);
 
 	bool result=true;
 	if (!bNegativeEvent)
 	{
-		if (m_starttime < -2.0*start_smaller_then_end*(m_endframe - m_startframe))
+		if (m_starttime < -2.0f*start_smaller_then_end*(m_endframe - m_startframe))
 		{
 			// start for all Ipo, initial start for LOOP_STOP
 			m_starttime = curtime - KX_KetsjiEngine::GetSuspendedDelta();
 			m_bIpoPlaying = true;
+			bIpoStart = true;
 		}
 	}	
 
@@ -230,7 +193,7 @@ bool KX_IpoActuator::Update(double curtime, bool frame)
 	{
 		// Check if playing forwards.  result = ! finished
 		
-		if (start_smaller_then_end > 0.0)
+		if (start_smaller_then_end > 0.f)
 			result = (m_localtime < m_endframe && m_bIpoPlaying);
 		else
 			result = (m_localtime > m_endframe && m_bIpoPlaying);
@@ -241,14 +204,10 @@ bool KX_IpoActuator::Update(double curtime, bool frame)
 		
 			/* Perform clamping */
 			ClampLocalTime();
-			
-			CIpoAction ipoaction(
-				(KX_GameObject*)GetParent(), 
-				m_localtime, 
-				m_recurse, 
-				m_ipo_as_force,
-				m_force_ipo_local);
-			GetParent()->Execute(ipoaction);
+	
+			if (bIpoStart)
+				((KX_GameObject*)GetParent())->InitIPO(m_ipo_as_force, m_ipo_add, m_ipo_local);
+			((KX_GameObject*)GetParent())->UpdateIPO(m_localtime,m_recurse);
 		} else
 		{
 			m_localtime=m_startframe;
@@ -270,13 +229,9 @@ bool KX_IpoActuator::Update(double curtime, bool frame)
 			m_direction = -m_direction;
 		}
 		
-		CIpoAction ipoaction(
-			(KX_GameObject*) GetParent(),
-			m_localtime,
-			m_recurse, 
-			m_ipo_as_force,
-			m_force_ipo_local);
-		GetParent()->Execute(ipoaction);
+		if (bIpoStart && m_direction > 0)
+			((KX_GameObject*)GetParent())->InitIPO(m_ipo_as_force, m_ipo_add, m_ipo_local);
+		((KX_GameObject*)GetParent())->UpdateIPO(m_localtime,m_recurse);
 		break;
 	}
 	case KX_ACT_IPO_FLIPPER:
@@ -299,14 +254,10 @@ bool KX_IpoActuator::Update(double curtime, bool frame)
 		
 		if (ClampLocalTime() && m_localtime == m_startframe)
 			result = false;
-			
-		CIpoAction ipoaction(
-			(KX_GameObject*) GetParent(),
-			m_localtime,
-			m_recurse,
-			m_ipo_as_force,
-			m_force_ipo_local);
-		GetParent()->Execute(ipoaction);
+
+		if (bIpoStart)
+			((KX_GameObject*)GetParent())->InitIPO(m_ipo_as_force, m_ipo_add, m_ipo_local);			
+		((KX_GameObject*)GetParent())->UpdateIPO(m_localtime,m_recurse);
 		break;
 	}
 
@@ -352,8 +303,12 @@ bool KX_IpoActuator::Update(double curtime, bool frame)
 				if (!m_bNegativeEvent){
 					/* Perform wraparound */
 					SetLocalTime(curtime);
-					m_localtime = m_startframe + fmod(m_localtime, m_startframe - m_endframe);
+					if (start_smaller_then_end > 0.f)
+						m_localtime = m_startframe + fmod(m_localtime - m_startframe, m_endframe - m_startframe);
+					else
+						m_localtime = m_startframe - fmod(m_startframe - m_localtime, m_startframe - m_endframe);
 					SetStartTime(curtime);
+					bIpoStart = true;
 				}
 				else
 				{	
@@ -365,13 +320,9 @@ bool KX_IpoActuator::Update(double curtime, bool frame)
 			}
 		}
 		
-		CIpoAction ipoaction(
-			(KX_GameObject*) GetParent(),
-			m_localtime,
-			m_recurse,
-			m_ipo_as_force,
-			m_force_ipo_local);
-		GetParent()->Execute(ipoaction);
+		if (m_bIpoPlaying && bIpoStart)
+			((KX_GameObject*)GetParent())->InitIPO(m_ipo_as_force, m_ipo_add, m_ipo_local);
+		((KX_GameObject*)GetParent())->UpdateIPO(m_localtime,m_recurse);
 		break;
 	}
 	
@@ -391,14 +342,9 @@ bool KX_IpoActuator::Update(double curtime, bool frame)
 		{
 			m_localtime = propval->GetNumber(); 
 	
-			CIpoAction ipoaction(
-				(KX_GameObject*) GetParent(),
-				m_localtime,
-				m_recurse,
-				m_ipo_as_force,
-				m_force_ipo_local);
-			GetParent()->Execute(ipoaction);
-
+			if (bIpoStart)
+				((KX_GameObject*)GetParent())->InitIPO(m_ipo_as_force, m_ipo_add, m_ipo_local);
+			((KX_GameObject*)GetParent())->UpdateIPO(m_localtime,m_recurse);
 		} else
 		{
 			result = false;
@@ -493,6 +439,10 @@ PyMethodDef KX_IpoActuator::Methods[] = {
 		METH_VARARGS, SetIpoAsForce_doc},
 	{"getIpoAsForce", (PyCFunction) KX_IpoActuator::sPyGetIpoAsForce, 
 		METH_VARARGS, GetIpoAsForce_doc},
+	{"setIpoAdd", (PyCFunction) KX_IpoActuator::sPySetIpoAdd, 
+		METH_VARARGS, SetIpoAdd_doc},
+	{"getIpoAdd", (PyCFunction) KX_IpoActuator::sPyGetIpoAdd, 
+		METH_VARARGS, GetIpoAdd_doc},
 	{"setType", (PyCFunction) KX_IpoActuator::sPySetType, 
 		METH_VARARGS, SetType_doc},
 	{"getType", (PyCFunction) KX_IpoActuator::sPyGetType, 
@@ -512,11 +462,11 @@ PyObject* KX_IpoActuator::_getattr(const STR_String& attr) {
 
 /* set --------------------------------------------------------------------- */
 char KX_IpoActuator::Set_doc[] = 
-"set(mode, startframe, endframe, force?)\n"
-"\t - mode:       Play, PingPong, Flipper, LoopStop, LoopEnd or FromProp (string)\n"
+"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 - force?    : interpret this ipo as a force? (KX_TRUE, KX_FALSE)"
+"\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* self, 
 								PyObject* args, 
@@ -543,7 +493,8 @@ PyObject* KX_IpoActuator::PySet(PyObject* self,
 		m_type         = modenum;
 		m_startframe    = startFrame;
 		m_endframe      = stopFrame;
-		m_ipo_as_force = PyArgToBool(forceToggle);
+		m_ipo_as_force = forceToggle == 1;
+		m_ipo_add = forceToggle == 2;
 		break;
 	default:
 		; /* error */
@@ -641,6 +592,8 @@ PyObject* KX_IpoActuator::PySetIpoAsForce(PyObject* self,
 	}
 
 	m_ipo_as_force = PyArgToBool(boolArg);
+	if (m_ipo_as_force)
+		m_ipo_add = false;
 	
 	Py_Return;	
 }
@@ -654,6 +607,36 @@ PyObject* KX_IpoActuator::PyGetIpoAsForce(PyObject* self,
 	return BoolToPyArg(m_ipo_as_force);
 }
 
+/* 6. setIpoAsForce:                                                           */
+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* self, 
+									  PyObject* args, 
+									  PyObject* kwds) { 
+	int boolArg;
+	
+	if (!PyArg_ParseTuple(args, "i", &boolArg)) {
+		return NULL;
+	}
+
+	m_ipo_add = PyArgToBool(boolArg);
+	if (m_ipo_add)
+		m_ipo_as_force = false;
+	
+	Py_Return;	
+}
+/* 7. getIpoAsForce:                                                         */
+char KX_IpoActuator::GetIpoAdd_doc[] = 
+"getIpoAsAdd()\n"
+"\tReturns whether to interpret the ipo as additive rather than absolute.\n";
+PyObject* KX_IpoActuator::PyGetIpoAdd(PyObject* self, 
+									  PyObject* args, 
+									  PyObject* kwds) {
+	return BoolToPyArg(m_ipo_add);
+}
+
 /* 8. setType:                                                               */
 char KX_IpoActuator::SetType_doc[] = 
 "setType(mode)\n"
@@ -701,7 +684,7 @@ PyObject* KX_IpoActuator::PySetForceIpoActsLocal(PyObject* self,
 		return NULL;
 	}
 
-	m_force_ipo_local = PyArgToBool(boolArg);
+	m_ipo_local = PyArgToBool(boolArg);
 	
 	Py_Return;	
 }
@@ -713,7 +696,7 @@ char KX_IpoActuator::GetForceIpoActsLocal_doc[] =
 PyObject* KX_IpoActuator::PyGetForceIpoActsLocal(PyObject* self, 
 									   	         PyObject* args, 
 										         PyObject* kwds) {
-	return BoolToPyArg(m_force_ipo_local);
+	return BoolToPyArg(m_ipo_local);
 }
 
 
diff --git a/source/gameengine/Ketsji/KX_IpoActuator.h b/source/gameengine/Ketsji/KX_IpoActuator.h
index 79e8daa3f87..ae554fb0fce 100644
--- a/source/gameengine/Ketsji/KX_IpoActuator.h
+++ b/source/gameengine/Ketsji/KX_IpoActuator.h
@@ -75,8 +75,11 @@ protected:
 	/** Interpret the ipo as a force? */
 	bool    m_ipo_as_force;
 	
-	/** Apply a force-ipo locally? */
-	bool    m_force_ipo_local;
+	/** Add Ipo curve to current loc/rot/scale */
+	bool    m_ipo_add;
+	
+	/** The Ipo curve is applied in local coordinates */
+	bool    m_ipo_local;
 
 	bool	m_bIpoPlaying;
 
@@ -113,7 +116,8 @@ public:
 				   bool recurse,
 				   int acttype,
 				   bool ipo_as_force, 
-				   bool force_ipo_local, 
+				   bool ipo_add,
+				   bool ipo_local,
 				   PyTypeObject* T=&Type);
 	virtual ~KX_IpoActuator() {};
 
@@ -144,6 +148,8 @@ public:
 	KX_PYMETHOD_DOC(KX_IpoActuator,GetEnd);
 	KX_PYMETHOD_DOC(KX_IpoActuator,SetIpoAsForce);
 	KX_PYMETHOD_DOC(KX_IpoActuator,GetIpoAsForce);
+	KX_PYMETHOD_DOC(KX_IpoActuator,SetIpoAdd);
+	KX_PYMETHOD_DOC(KX_IpoActuator,GetIpoAdd);
 	KX_PYMETHOD_DOC(KX_IpoActuator,SetType);
 	KX_PYMETHOD_DOC(KX_IpoActuator,GetType);
 	KX_PYMETHOD_DOC(KX_IpoActuator,SetForceIpoActsLocal);
diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
index 56a06786679..20187a193ba 100644
--- a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
+++ b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
@@ -55,6 +55,7 @@
 #include "KX_Scene.h"
 #include "MT_CmMatrix4x4.h"
 #include "KX_Camera.h"
+#include "KX_Light.h"
 #include "KX_PythonInit.h"
 #include "KX_PyConstraintBinding.h"
 #include "PHY_IPhysicsEnvironment.h"
@@ -614,6 +615,9 @@ void KX_KetsjiEngine::Render()
 		// pass the scene's worldsettings to the rasterizer
 		SetWorldSettings(scene->GetWorldInfo());
 
+		// shadow buffers
+		RenderShadowBuffers(scene);
+
 		// Avoid drawing the scene with the active camera twice when it's viewport is enabled
 		if(cam && !cam->GetViewport())
 		{
@@ -885,8 +889,48 @@ void KX_KetsjiEngine::SetupRenderFrame(KX_Scene *scene, KX_Camera* cam)
 		viewport.GetTop()
 	);	
 
-}		
+}
 
+void KX_KetsjiEngine::RenderShadowBuffers(KX_Scene *scene)
+{
+	CListValue *lightlist = scene->GetLightList();
+	int i, drawmode;
+
+	for(i=0; i<lightlist->GetCount(); i++) {
+		KX_LightObject *light = (KX_LightObject*)lightlist->GetValue(i);
+
+		light->Update();
+
+		if(m_drawingmode == RAS_IRasterizer::KX_TEXTURED && light->HasShadowBuffer()) {
+			/* make temporary camera */
+			RAS_CameraData camdata = RAS_CameraData();
+			KX_Camera *cam = new KX_Camera(scene, scene->m_callbacks, camdata, false);
+			cam->SetName("__shadow__cam__");
+
+			MT_Transform camtrans;
+
+			/* switch drawmode for speed */
+			drawmode = m_rasterizer->GetDrawingMode();
+			m_rasterizer->SetDrawingMode(RAS_IRasterizer::KX_SHADOW);
+
+			/* binds framebuffer object, sets up camera .. */
+			light->BindShadowBuffer(m_rasterizer, cam, camtrans);
+
+			/* update scene */
+			scene->UpdateMeshTransformations();
+			scene->CalculateVisibleMeshes(m_rasterizer, cam, light->GetShadowLayer());
+
+			/* render */
+			m_rasterizer->ClearDepthBuffer();
+			scene->RenderBuckets(camtrans, m_rasterizer, m_rendertools);
+
+			/* unbind framebuffer object, restore drawmode, free camera */
+			light->UnbindShadowBuffer(m_rasterizer);
+			m_rasterizer->SetDrawingMode(drawmode);
+			cam->Release();
+		}
+	}
+}
 	
 // update graphics
 void KX_KetsjiEngine::RenderFrame(KX_Scene* scene, KX_Camera* cam)
diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.h b/source/gameengine/Ketsji/KX_KetsjiEngine.h
index 4c09bc3fcd5..77b69ec2d9e 100644
--- a/source/gameengine/Ketsji/KX_KetsjiEngine.h
+++ b/source/gameengine/Ketsji/KX_KetsjiEngine.h
@@ -179,6 +179,7 @@ private:
 	void					RenderFrame(KX_Scene* scene, KX_Camera* cam);
 	void					PostRenderFrame();
 	void					RenderDebugProperties();
+	void					RenderShadowBuffers(KX_Scene *scene);
 	void					SetBackGround(KX_WorldInfo* worldinfo);
 	void					SetWorldSettings(KX_WorldInfo* worldinfo);
 	void					DoSound(KX_Scene* scene);
diff --git a/source/gameengine/Ketsji/KX_Light.cpp b/source/gameengine/Ketsji/KX_Light.cpp
index 7decc5bc769..4e3d6180d22 100644
--- a/source/gameengine/Ketsji/KX_Light.cpp
+++ b/source/gameengine/Ketsji/KX_Light.cpp
@@ -36,14 +36,20 @@
 #endif
 
 #include "KX_Light.h"
+#include "KX_Camera.h"
+#include "RAS_IRasterizer.h"
 #include "RAS_IRenderTools.h"
 
 #include "KX_PyMath.h"
 
+#ifdef BLENDER_GLSL
+#include "GPU_material.h"
+#endif
  
 KX_LightObject::KX_LightObject(void* sgReplicationInfo,SG_Callbacks callbacks,
 							   class RAS_IRenderTools* rendertools,
 							   const RAS_LightObject&	lightobj,
+							   struct GPULamp *gpulamp,
 							   PyTypeObject* T
 							   )
  :
@@ -53,12 +59,12 @@ KX_LightObject::KX_LightObject(void* sgReplicationInfo,SG_Callbacks callbacks,
 	m_lightobj = lightobj;
 	m_lightobj.m_worldmatrix = GetOpenGLMatrixPtr();
 	m_rendertools->AddLight(&m_lightobj);
+	m_gpulamp = gpulamp;
 };
 
 
 KX_LightObject::~KX_LightObject()
 {
-
 	m_rendertools->RemoveLight(&m_lightobj);
 }
 
@@ -78,6 +84,78 @@ CValue*		KX_LightObject::GetReplica()
 	return replica;
 }
 
+void KX_LightObject::Update()
+{
+#ifdef BLENDER_GLSL
+	if(m_gpulamp) {
+		float obmat[4][4];
+		double *dobmat = GetOpenGLMatrixPtr()->getPointer();
+
+		for(int i=0; i<4; i++)
+			for(int j=0; j<4; j++, dobmat++)
+				obmat[i][j] = (float)*dobmat;
+
+		GPU_lamp_update(m_gpulamp, obmat);
+	}
+#endif
+}
+
+bool KX_LightObject::HasShadowBuffer()
+{
+#ifdef BLENDER_GLSL
+	return (m_gpulamp && GPU_lamp_has_shadow_buffer(m_gpulamp));
+#else
+	return false;
+#endif
+}
+
+int KX_LightObject::GetShadowLayer()
+{
+#ifdef BLENDER_GLSL
+	if(m_gpulamp)
+		return GPU_lamp_shadow_layer(m_gpulamp);
+	else
+#endif
+		return 0;
+}
+
+void KX_LightObject::BindShadowBuffer(RAS_IRasterizer *ras, KX_Camera *cam, MT_Transform& camtrans)
+{
+#ifdef BLENDER_GLSL
+	float viewmat[4][4], winmat[4][4];
+	int winsize;
+
+	/* bind framebuffer */
+	GPU_lamp_shadow_buffer_bind(m_gpulamp, viewmat, &winsize, winmat);
+
+	/* setup camera transformation */
+	MT_Matrix4x4 modelviewmat((float*)viewmat);
+	MT_Matrix4x4 projectionmat((float*)winmat);
+
+	MT_Transform trans = MT_Transform((float*)viewmat);
+	camtrans.invert(trans);
+
+	cam->SetModelviewMatrix(modelviewmat);
+	cam->SetProjectionMatrix(projectionmat);
+	
+	cam->NodeSetLocalPosition(camtrans.getOrigin());
+	cam->NodeSetLocalOrientation(camtrans.getBasis());
+	cam->NodeUpdateGS(0,true);
+
+	/* setup rasterizer transformations */
+	ras->SetProjectionMatrix(projectionmat);
+	ras->SetViewMatrix(modelviewmat, cam->NodeGetWorldPosition(),
+		cam->GetCameraLocation(), cam->GetCameraOrientation());
+#endif
+}
+
+void KX_LightObject::UnbindShadowBuffer(RAS_IRasterizer *ras)
+{
+#ifdef BLENDER_GLSL
+	GPU_lamp_shadow_buffer_unbind(m_gpulamp);
+#endif
+}
+
 PyObject* KX_LightObject::_getattr(const STR_String& attr)
 {
 	if (attr == "layer")
diff --git a/source/gameengine/Ketsji/KX_Light.h b/source/gameengine/Ketsji/KX_Light.h
index 236d3e4e12e..62eb26c61a8 100644
--- a/source/gameengine/Ketsji/KX_Light.h
+++ b/source/gameengine/Ketsji/KX_Light.h
@@ -32,19 +32,33 @@
 #include "RAS_LightObject.h"
 #include "KX_GameObject.h"
 
+struct GPULamp;
+class KX_Camera;
+class RAS_IRasterizer;
+class RAS_IRenderTools;
+class MT_Transform;
+
 class KX_LightObject : public KX_GameObject
 {
 	Py_Header;
 protected:
 	RAS_LightObject		m_lightobj;
 	class RAS_IRenderTools*	m_rendertools;	//needed for registering and replication of lightobj
+	struct GPULamp		*m_gpulamp;
 	static char		doc[];
 
 public:
-	KX_LightObject(void* sgReplicationInfo,SG_Callbacks callbacks,class RAS_IRenderTools* rendertools,const struct RAS_LightObject&	lightobj, PyTypeObject *T = &Type);
+	KX_LightObject(void* sgReplicationInfo,SG_Callbacks callbacks,class RAS_IRenderTools* rendertools,const struct RAS_LightObject&	lightobj, struct GPULamp *gpulamp, PyTypeObject *T = &Type);
 	virtual ~KX_LightObject();
 	virtual CValue*		GetReplica();
 	RAS_LightObject*	GetLightData() { return &m_lightobj;}
+
+	/* GLSL shadow */
+	bool HasShadowBuffer();
+	int GetShadowLayer();
+	void BindShadowBuffer(class RAS_IRasterizer *ras, class KX_Camera *cam, class MT_Transform& camtrans);
+	void UnbindShadowBuffer(class RAS_IRasterizer *ras);
+	void Update();
 	
 	virtual PyObject* _getattr(const STR_String& attr); /* lens, near, far, projection_matrix */
 	virtual int       _setattr(const STR_String& attr, PyObject *pyvalue);
diff --git a/source/gameengine/Ketsji/KX_ParentActuator.cpp b/source/gameengine/Ketsji/KX_ParentActuator.cpp
index 5c433cb68b1..8b379bcd44f 100644
--- a/source/gameengine/Ketsji/KX_ParentActuator.cpp
+++ b/source/gameengine/Ketsji/KX_ParentActuator.cpp
@@ -77,6 +77,12 @@ CValue* KX_ParentActuator::GetReplica()
 
 bool KX_ParentActuator::Update()
 {
+	bool bNegativeEvent = IsNegativeEvent();
+	RemoveAllEvents();
+
+	if (bNegativeEvent)
+		return false; // do nothing on negative events
+
 	KX_GameObject *obj = (KX_GameObject*) GetParent();
 	KX_Scene *scene = PHY_GetActiveScene();
 	switch (m_mode) {
diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp
index 337b1af6df7..065800379d8 100644
--- a/source/gameengine/Ketsji/KX_Scene.cpp
+++ b/source/gameengine/Ketsji/KX_Scene.cpp
@@ -601,6 +601,8 @@ void KX_Scene::ReplicateLogic(KX_GameObject* newobj)
 			}
 		}
 	}
+	// ready to set initial state
+	newobj->ResetState();
 }
 
 
@@ -886,6 +888,7 @@ void KX_Scene::ReplaceMesh(class CValue* obj,void* meshobj)
 			else if (bHasArmature) 
 			{
 				BL_SkinDeformer* skinDeformer = new BL_SkinDeformer(
+					newobj,
 					oldblendobj, blendobj,
 					static_cast<BL_SkinMeshObject*>(mesh),
 					true,
@@ -897,7 +900,7 @@ void KX_Scene::ReplaceMesh(class CValue* obj,void* meshobj)
 			else if (bHasDvert)
 			{
 				BL_MeshDeformer* meshdeformer = new BL_MeshDeformer(
-					oldblendobj, static_cast<BL_SkinMeshObject*>(mesh)
+					newobj, oldblendobj, static_cast<BL_SkinMeshObject*>(mesh)
 				);
 				newobj->m_pDeformer = meshdeformer;
 			}
@@ -1002,12 +1005,13 @@ void KX_Scene::UpdateMeshTransformations()
 	}
 }
 
-void KX_Scene::MarkVisible(SG_Tree *node, RAS_IRasterizer* rasty, KX_Camera* cam)
+void KX_Scene::MarkVisible(SG_Tree *node, RAS_IRasterizer* rasty, KX_Camera* cam, int layer)
 {
 	int intersect = KX_Camera::INTERSECT;
 	KX_GameObject *gameobj = node->Client()?(KX_GameObject*) node->Client()->GetSGClientObject():NULL;
-	bool dotest = (gameobj && gameobj->GetVisible()) || node->Left() || node->Right();
-	
+	bool visible = (gameobj && gameobj->GetVisible() && (!layer || (gameobj->GetLayer() & layer)));
+	bool dotest = visible || node->Left() || node->Right();
+
 	/* If the camera is inside the box, assume intersect. */
 	if (dotest && !node->inside( cam->NodeGetWorldPosition()))
 	{
@@ -1031,19 +1035,19 @@ void KX_Scene::MarkVisible(SG_Tree *node, RAS_IRasterizer* rasty, KX_Camera* cam
 			break;
 		case KX_Camera::INTERSECT:
 			if (gameobj)
-				MarkVisible(rasty, gameobj,cam);
+				MarkVisible(rasty, gameobj, cam, layer);
 			if (node->Left())
-				MarkVisible(node->Left(), rasty,cam);
+				MarkVisible(node->Left(), rasty, cam, layer);
 			if (node->Right())
-				MarkVisible(node->Right(), rasty,cam);
+				MarkVisible(node->Right(), rasty, cam, layer);
 			break;
 		case KX_Camera::INSIDE:
-			MarkSubTreeVisible(node, rasty, true,cam);
+			MarkSubTreeVisible(node, rasty, true, cam, layer);
 			break;
 	}
 }
 
-void KX_Scene::MarkSubTreeVisible(SG_Tree *node, RAS_IRasterizer* rasty, bool visible,KX_Camera* cam)
+void KX_Scene::MarkSubTreeVisible(SG_Tree *node, RAS_IRasterizer* rasty, bool visible, KX_Camera* cam, int layer)
 {
 	if (node->Client())
 	{
@@ -1066,16 +1070,23 @@ void KX_Scene::MarkSubTreeVisible(SG_Tree *node, RAS_IRasterizer* rasty, bool vi
 		}
 	}
 	if (node->Left())
-		MarkSubTreeVisible(node->Left(), rasty, visible,cam);
+		MarkSubTreeVisible(node->Left(), rasty, visible, cam, layer);
 	if (node->Right())
-		MarkSubTreeVisible(node->Right(), rasty, visible,cam);
+		MarkSubTreeVisible(node->Right(), rasty, visible, cam, layer);
 }
 
-void KX_Scene::MarkVisible(RAS_IRasterizer* rasty, KX_GameObject* gameobj,KX_Camera*  cam)
+void KX_Scene::MarkVisible(RAS_IRasterizer* rasty, KX_GameObject* gameobj,KX_Camera*  cam,int layer)
 {
 	// User (Python/Actuator) has forced object invisible...
 	if (!gameobj->GetVisible())
 		return;
+	
+	// Shadow lamp layers
+	if(layer && !(gameobj->GetLayer() & layer)) {
+		gameobj->MarkVisible(false);
+		return;
+	}
+
 	// If Frustum culling is off, the object is always visible.
 	bool vis = !cam->GetFrustumCulling();
 	
@@ -1125,20 +1136,20 @@ void KX_Scene::MarkVisible(RAS_IRasterizer* rasty, KX_GameObject* gameobj,KX_Cam
 	}
 }
 
-void KX_Scene::CalculateVisibleMeshes(RAS_IRasterizer* rasty,KX_Camera* cam)
+void KX_Scene::CalculateVisibleMeshes(RAS_IRasterizer* rasty,KX_Camera* cam, int layer)
 {
 // FIXME: When tree is operational
 #if 1
 	// do this incrementally in the future
 	for (int i = 0; i < m_objectlist->GetCount(); i++)
 	{
-		MarkVisible(rasty, static_cast<KX_GameObject*>(m_objectlist->GetValue(i)), cam);
+		MarkVisible(rasty, static_cast<KX_GameObject*>(m_objectlist->GetValue(i)), cam, layer);
 	}
 #else
 	if (cam->GetFrustumCulling())
-		MarkVisible(m_objecttree, rasty, cam);
+		MarkVisible(m_objecttree, rasty, cam, layer);
 	else
-		MarkSubTreeVisible(m_objecttree, rasty, true, cam);
+		MarkSubTreeVisible(m_objecttree, rasty, true, cam, layer);
 #endif
 }
 
diff --git a/source/gameengine/Ketsji/KX_Scene.h b/source/gameengine/Ketsji/KX_Scene.h
index 733df2f69a1..28dee1b5893 100644
--- a/source/gameengine/Ketsji/KX_Scene.h
+++ b/source/gameengine/Ketsji/KX_Scene.h
@@ -260,9 +260,9 @@ protected:
 	/**
 	 * Visibility testing functions.
 	 */
-	void MarkVisible(SG_Tree *node, RAS_IRasterizer* rasty, KX_Camera*cam);
-	void MarkSubTreeVisible(SG_Tree *node, RAS_IRasterizer* rasty, bool visible, KX_Camera*cam);
-	void MarkVisible(RAS_IRasterizer* rasty, KX_GameObject* gameobj, KX_Camera*cam);
+	void MarkVisible(SG_Tree *node, RAS_IRasterizer* rasty, KX_Camera*cam,int layer=0);
+	void MarkSubTreeVisible(SG_Tree *node, RAS_IRasterizer* rasty, bool visible, KX_Camera*cam,int layer=0);
+	void MarkVisible(RAS_IRasterizer* rasty, KX_GameObject* gameobj, KX_Camera*cam, int layer=0);
 
 	double				m_suspendedtime;
 	double				m_suspendeddelta;
@@ -483,7 +483,7 @@ public:
 	void SetNetworkScene(NG_NetworkScene *newScene);
 	void SetWorldInfo(class KX_WorldInfo* wi);
 	KX_WorldInfo* GetWorldInfo();
-	void CalculateVisibleMeshes(RAS_IRasterizer* rasty, KX_Camera *cam);
+	void CalculateVisibleMeshes(RAS_IRasterizer* rasty, KX_Camera *cam, int layer=0);
 	void UpdateMeshTransformations();
 	KX_Camera* GetpCamera();
 	SND_Scene* GetSoundScene();
diff --git a/source/gameengine/Ketsji/KX_TouchEventManager.cpp b/source/gameengine/Ketsji/KX_TouchEventManager.cpp
index 80ee15a9475..423543eef5c 100644
--- a/source/gameengine/Ketsji/KX_TouchEventManager.cpp
+++ b/source/gameengine/Ketsji/KX_TouchEventManager.cpp
@@ -137,14 +137,18 @@ void KX_TouchEventManager::NextFrame()
 //			KX_GameObject* gameOb1 = ctrl1->getClientInfo();
 
 			KX_ClientObjectInfo *client_info = static_cast<KX_ClientObjectInfo *>(ctrl1->getNewClientInfo());
-	
 			list<SCA_ISensor*>::iterator sit;
-			for ( sit = client_info->m_sensors.begin(); sit != client_info->m_sensors.end(); ++sit)
-				static_cast<KX_TouchSensor*>(*sit)->NewHandleCollision((*cit).first, (*cit).second, NULL);
-		
+			if (client_info) {
+				for ( sit = client_info->m_sensors.begin(); sit != client_info->m_sensors.end(); ++sit) {
+					static_cast<KX_TouchSensor*>(*sit)->NewHandleCollision((*cit).first, (*cit).second, NULL);
+				}
+			}
 			client_info = static_cast<KX_ClientObjectInfo *>((*cit).second->getNewClientInfo());
-			for ( sit = client_info->m_sensors.begin(); sit != client_info->m_sensors.end(); ++sit)
-				static_cast<KX_TouchSensor*>(*sit)->NewHandleCollision((*cit).second, (*cit).first, NULL);
+			if (client_info) {
+				for ( sit = client_info->m_sensors.begin(); sit != client_info->m_sensors.end(); ++sit) {
+					static_cast<KX_TouchSensor*>(*sit)->NewHandleCollision((*cit).second, (*cit).first, NULL);
+				}
+			}
 		}
 			
 		m_newCollisions.clear();
diff --git a/source/gameengine/PyDoc/BL_ActionActuator.py b/source/gameengine/PyDoc/BL_ActionActuator.py
index 41f41080c31..d56888cde80 100644
--- a/source/gameengine/PyDoc/BL_ActionActuator.py
+++ b/source/gameengine/PyDoc/BL_ActionActuator.py
@@ -86,6 +86,14 @@ class BL_ActionActuator(SCA_IActuator):
 		@param mode: KX_ACTIONACT_PLAY, KX_ACTIONACT_PROPERTY, KX_ACTIONACT_FLIPPER, KX_ACTIONACT_LOOPSTOP, KX_ACTIONACT_LOOPEND
 		@type mode: integer
 		"""
+	
+	def setContinue(cont):
+		"""
+		Set the actions continue option True or False. see getContinue.
+
+		@param cont: The continue option.
+		@type cont: bool
+		"""
 
 	def getType():
 		"""
@@ -94,6 +102,13 @@ class BL_ActionActuator(SCA_IActuator):
 		@rtype: integer
 		@return: KX_ACTIONACT_PLAY, KX_ACTIONACT_PROPERTY, KX_ACTIONACT_FLIPPER, KX_ACTIONACT_LOOPSTOP, KX_ACTIONACT_LOOPEND
 		"""
+
+	def getContinue():
+		"""
+		When True, the action will always play from where last left off, otherwise negative events to this actuator will reset it to its start frame.
+	    
+		@rtype: bool
+		"""
 	
 	def getAction():
 		"""
diff --git a/source/gameengine/Rasterizer/RAS_BucketManager.cpp b/source/gameengine/Rasterizer/RAS_BucketManager.cpp
index 50df1a1e2ea..b4492ca03a9 100644
--- a/source/gameengine/Rasterizer/RAS_BucketManager.cpp
+++ b/source/gameengine/Rasterizer/RAS_BucketManager.cpp
@@ -109,7 +109,7 @@ void RAS_BucketManager::RenderAlphaBuckets(
 	// it is needed for compatibility.
 	rasty->SetDepthMask(RAS_IRasterizer::KX_DEPTHMASK_DISABLED);
 
-	int drawingmode;
+	RAS_IRasterizer::DrawMode drawingmode;
 	std::multiset< alphamesh, backtofront>::iterator msit = alphameshset.begin();
 	for (; msit != alphameshset.end(); ++msit)
 	{
diff --git a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
index bff98abe058..cb10ba6bf37 100644
--- a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
+++ b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
@@ -27,6 +27,7 @@
  */
 
 #include "RAS_IPolygonMaterial.h"
+#include "RAS_IRasterizer.h"
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -148,4 +149,19 @@ const unsigned int	RAS_IPolyMaterial::GetFlag() const
 	return m_flag;
 }
 
+bool RAS_IPolyMaterial::UsesLighting(RAS_IRasterizer *rasty) const
+{
+	bool dolights = false;
+
+	if(m_flag & RAS_BLENDERMAT)
+		dolights = (m_flag &RAS_MULTILIGHT)!=0;
+	else if(rasty->GetDrawingMode() < RAS_IRasterizer::KX_SOLID);
+	else if(rasty->GetDrawingMode() == RAS_IRasterizer::KX_SHADOW);
+	else
+		dolights = (m_drawingmode & 16)!=0;
+	
+	return dolights;
+}
+
 unsigned int RAS_IPolyMaterial::m_newpolymatid = 0;
+
diff --git a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
index 09824f6975c..d2d1dba99d9 100644
--- a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
+++ b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
@@ -140,6 +140,8 @@ public:
 	const STR_String&	GetMaterialName() const;
 	const STR_String&	GetTextureName() const;
 	const unsigned int	GetFlag() const;
+
+	virtual bool		UsesLighting(RAS_IRasterizer *rasty) const;
 	
 	/*
 	 * PreCalculate texture gen
diff --git a/source/gameengine/Rasterizer/RAS_IRasterizer.h b/source/gameengine/Rasterizer/RAS_IRasterizer.h
index dbedc492afa..d4a9177a85d 100644
--- a/source/gameengine/Rasterizer/RAS_IRasterizer.h
+++ b/source/gameengine/Rasterizer/RAS_IRasterizer.h
@@ -33,12 +33,23 @@
 #pragma warning (disable:4786)
 #endif
 
+#include "STR_HashedString.h"
+
 #include "MT_CmMatrix4x4.h"
 #include "MT_Matrix4x4.h"
 
+#include "RAS_TexVert.h"
+
+#include <vector>
+using namespace std;
+
 class RAS_ICanvas;
 class RAS_IPolyMaterial;
-#include "RAS_MaterialBucket.h"
+
+typedef vector<unsigned short> KX_IndexArray;
+typedef vector<RAS_TexVert> KX_VertexArray;
+typedef vector< KX_VertexArray* >  vecVertexArray;
+typedef vector< KX_IndexArray* > vecIndexArrays;
 
 /**
  * 3D rendering device context interface. 
@@ -62,7 +73,18 @@ public:
 			KX_WIREFRAME,
 			KX_SOLID,
 			KX_SHADED,
-			KX_TEXTURED 
+			KX_TEXTURED,
+			KX_SHADOW
+	};
+
+	/**
+	 * Drawing modes
+	 */
+
+	enum DrawMode {
+		KX_MODE_LINES = 1,
+		KX_MODE_TRIANGLES,
+		KX_MODE_QUADS
 	};
 
 	/**
@@ -111,6 +133,7 @@ public:
 		RAS_TEXCO_NORM,		//< Normal coordinates 
 		RAS_TEXTANGENT,		//<
 		RAS_TEXCO_UV2,		//<
+		RAS_TEXCO_VCOL,		//< Vertex Color
 		RAS_TEXCO_DISABLE	//< Disable this texture unit (cached)
 	};
 
@@ -197,45 +220,37 @@ public:
 	 * IndexPrimitives: Renders primitives.
 	 * @param vertexarrays is an array of vertex arrays
 	 * @param indexarrays is an array of index arrays
-	 * @param mode determines the type of primitive stored in the vertex/index arrays:
-	 *              0 triangles
-	 *              1 lines (default)
-	 *              2 quads
-	 * @param polymat (reserved)
+	 * @param mode determines the type of primitive stored in the vertex/index arrays
 	 * @param useObjectColor will render the object using @param rgbacolor instead of 
 	 *  vertex colors.
 	 */
-	virtual void	IndexPrimitives( const vecVertexArray& vertexarrays,
+	virtual void IndexPrimitives( const vecVertexArray& vertexarrays,
 							const vecIndexArrays & indexarrays,
-							int mode,
-							class RAS_IPolyMaterial* polymat,
-							class RAS_IRenderTools* rendertools,
+							DrawMode mode,
 							bool useObjectColor,
 							const MT_Vector4& rgbacolor,
 							class KX_ListSlot** slot)=0;
 
+	virtual void IndexPrimitivesMulti( 
+						const vecVertexArray& vertexarrays,
+						const vecIndexArrays & indexarrays,
+						DrawMode mode,
+						bool useObjectColor,
+						const MT_Vector4& rgbacolor,
+						class KX_ListSlot** slot)=0;
+
 	/**
 	 * IndexPrimitives_3DText will render text into the polygons.
 	 * The text to be rendered is from @param rendertools client object's text property.
 	 */
 	virtual void	IndexPrimitives_3DText( const vecVertexArray& vertexarrays,
 							const vecIndexArrays & indexarrays,
-							int mode,
+							DrawMode mode,
 							class RAS_IPolyMaterial* polymat,
 							class RAS_IRenderTools* rendertools,
 							bool useObjectColor,
 							const MT_Vector4& rgbacolor)=0;
 
-	virtual void IndexPrimitivesMulti( 
-						const vecVertexArray& vertexarrays,
-						const vecIndexArrays & indexarrays,
-						int mode,
-						class RAS_IPolyMaterial* polymat,
-						class RAS_IRenderTools* rendertools,
-						bool useObjectColor,
-						const MT_Vector4& rgbacolor,
-						class KX_ListSlot** slot)=0;
-
 	virtual void	SetProjectionMatrix(MT_CmMatrix4x4 & mat)=0;
 	/* This one should become our final version, methinks. */
 	/**
diff --git a/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp b/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
index 1beade7acf7..e295d69e48e 100644
--- a/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
+++ b/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
@@ -167,38 +167,30 @@ RAS_MaterialBucket::T_MeshSlotList::iterator RAS_MaterialBucket::msEnd()
 }
 
 bool RAS_MaterialBucket::ActivateMaterial(const MT_Transform& cameratrans, RAS_IRasterizer* rasty,
-	RAS_IRenderTools *rendertools, int &drawmode)
+	RAS_IRenderTools *rendertools, RAS_IRasterizer::DrawMode &drawmode)
 {
 	rendertools->SetViewMat(cameratrans);
 
 	if (!rasty->SetMaterial(*m_material))
 		return false;
 	
-	bool dolights = false;
-	const unsigned int flag = m_material->GetFlag();
-
-	if( flag & RAS_BLENDERMAT)
-		dolights = (flag &RAS_MULTILIGHT)!=0;
-	else
-		dolights = (m_material->GetDrawingMode()&16)!=0;
-
-	if ((rasty->GetDrawingMode() < RAS_IRasterizer::KX_SOLID) || !dolights)
-	{
-		rendertools->ProcessLighting(-1);
-	}
-	else
-	{
+	if (m_material->UsesLighting(rasty))
 		rendertools->ProcessLighting(RAS_IRenderTools::RAS_LIGHT_OBJECT_LAYER/*m_material->GetLightLayer()*/);
-	}
+	else
+		rendertools->ProcessLighting(-1);
 
-	drawmode = (rasty->GetDrawingMode()  < RAS_IRasterizer::KX_SOLID ? 	
-		1:	(m_material->UsesTriangles() ? 0 : 2));
+	if(rasty->GetDrawingMode() < RAS_IRasterizer::KX_SOLID)
+		drawmode = RAS_IRasterizer::KX_MODE_LINES;
+	else if(m_material->UsesTriangles())
+		drawmode = RAS_IRasterizer::KX_MODE_TRIANGLES;
+	else
+		drawmode = RAS_IRasterizer::KX_MODE_QUADS;
 	
 	return true;
 }
 
 void RAS_MaterialBucket::RenderMeshSlot(const MT_Transform& cameratrans, RAS_IRasterizer* rasty,
-	RAS_IRenderTools* rendertools, const KX_MeshSlot &ms, int drawmode)
+	RAS_IRenderTools* rendertools, const KX_MeshSlot &ms, RAS_IRasterizer::DrawMode drawmode)
 {
 	if (!ms.m_bVisible)
 		return;
@@ -225,6 +217,17 @@ void RAS_MaterialBucket::RenderMeshSlot(const MT_Transform& cameratrans, RAS_IRa
 			ms.m_DisplayList->SetModified(ms.m_mesh->MeshModified());
 	}
 
+	// verify if we can use display list, not for deformed object, and
+	// also don't create a new display list when drawing shadow buffers,
+	// then it won't have texture coordinates for actual drawing
+	KX_ListSlot **displaylist;
+	if(ms.m_pDeformer)
+		displaylist = 0;
+	else if(!ms.m_DisplayList && rasty->GetDrawingMode() == RAS_IRasterizer::KX_SHADOW)
+		displaylist = 0;
+	else
+		displaylist = &ms.m_DisplayList;
+
 	// Use the text-specific IndexPrimitives for text faces
 	if (m_material->GetDrawingMode() & RAS_IRasterizer::RAS_RENDER_3DPOLYGON_TEXT)
 	{
@@ -245,12 +248,9 @@ void RAS_MaterialBucket::RenderMeshSlot(const MT_Transform& cameratrans, RAS_IRa
 				ms.m_mesh->GetVertexCache(m_material), 
 				ms.m_mesh->GetIndexCache(m_material), 
 				drawmode,
-				m_material,
-				rendertools,
 				ms.m_bObjectColor,
 				ms.m_RGBAcolor,
-				(ms.m_pDeformer)? 0: &ms.m_DisplayList
-				);
+				displaylist);
 	}
 
 	// Use the normal IndexPrimitives
@@ -260,12 +260,9 @@ void RAS_MaterialBucket::RenderMeshSlot(const MT_Transform& cameratrans, RAS_IRa
 				ms.m_mesh->GetVertexCache(m_material), 
 				ms.m_mesh->GetIndexCache(m_material), 
 				drawmode,
-				m_material,
-				rendertools, // needed for textprinting on polys
 				ms.m_bObjectColor,
 				ms.m_RGBAcolor,
-				(ms.m_pDeformer)? 0: &ms.m_DisplayList
-				);
+				displaylist);
 	}
 
 	if(rasty->QueryLists()) {
@@ -287,7 +284,7 @@ void RAS_MaterialBucket::Render(const MT_Transform& cameratrans,
 
 	//rasty->SetMaterial(*m_material);
 	
-	int drawmode;
+	RAS_IRasterizer::DrawMode drawmode;
 	for (T_MeshSlotList::const_iterator it = m_meshSlots.begin();
 	! (it == m_meshSlots.end()); ++it)
 	{
diff --git a/source/gameengine/Rasterizer/RAS_MaterialBucket.h b/source/gameengine/Rasterizer/RAS_MaterialBucket.h
index 5ad0c173a56..13d8a53714a 100644
--- a/source/gameengine/Rasterizer/RAS_MaterialBucket.h
+++ b/source/gameengine/Rasterizer/RAS_MaterialBucket.h
@@ -35,17 +35,13 @@
 
 #include "MT_Transform.h"
 #include "RAS_IPolygonMaterial.h"
+#include "RAS_IRasterizer.h"
 #include "RAS_Deformer.h"	// __NLA
 #include <vector>
 #include <map>
 #include <set>
 using namespace std;
 
-typedef vector<unsigned short> KX_IndexArray;
-typedef vector<RAS_TexVert> KX_VertexArray;
-typedef vector< KX_VertexArray* >  vecVertexArray;
-typedef vector< KX_IndexArray* > vecIndexArrays;
-
 /**
  * KX_VertexIndex
  */
@@ -146,9 +142,9 @@ public:
 								const MT_Vector4& rgbavec);
 
 	void RenderMeshSlot(const MT_Transform& cameratrans, RAS_IRasterizer* rasty,
-		RAS_IRenderTools* rendertools, const KX_MeshSlot &ms, int drawmode);
+		RAS_IRenderTools* rendertools, const KX_MeshSlot &ms, RAS_IRasterizer::DrawMode drawmode);
 	bool ActivateMaterial(const MT_Transform& cameratrans, RAS_IRasterizer* rasty,
-		RAS_IRenderTools *rendertools, int &drawmode);
+		RAS_IRenderTools *rendertools, RAS_IRasterizer::DrawMode& drawmode);
 	
 	unsigned int NumMeshSlots();
 	T_MeshSlotList::iterator msBegin();
diff --git a/source/gameengine/Rasterizer/RAS_MeshObject.cpp b/source/gameengine/Rasterizer/RAS_MeshObject.cpp
index d7ab88a6b06..4420f16c56d 100644
--- a/source/gameengine/Rasterizer/RAS_MeshObject.cpp
+++ b/source/gameengine/Rasterizer/RAS_MeshObject.cpp
@@ -68,8 +68,8 @@ RAS_MeshObject::RAS_MeshObject(Mesh* mesh, int lightlayer)
 	m_lightlayer(lightlayer),
 	m_zsort(false),
 	m_MeshMod(true),
-	m_class(0),
-	m_mesh(mesh)
+	m_mesh(mesh),
+	m_class(0)
 {
 }
 
@@ -259,18 +259,18 @@ int RAS_MeshObject::FindOrAddVertex(int vtxarray,
 									const MT_Vector3& normal,
 									bool flat,
 									RAS_IPolyMaterial* mat,
-									int orgindex)
+									int origindex)
 {
-	KX_ArrayOptimizer* ao = GetArrayOptimizer(mat);//*(m_matVertexArrays[*mat]);
+	KX_ArrayOptimizer* ao = GetArrayOptimizer(mat);
 	
 	int numverts = ao->m_VertexArrayCache1[vtxarray]->size();//m_VertexArrayCount[vtxarray];
-	RAS_TexVert newvert(xyz,uv,uv2,tangent,rgbacolor,normal, flat? TV_CALCFACENORMAL: 0);
+	RAS_TexVert newvert(xyz,uv,uv2,tangent,rgbacolor,normal, flat? TV_CALCFACENORMAL: 0,origindex);
 
 #define KX_FIND_SHARED_VERTICES
 #ifdef KX_FIND_SHARED_VERTICES
 	if(!flat) {
-		for (std::vector<RAS_MatArrayIndex>::iterator it = m_xyz_index_to_vertex_index_mapping[orgindex].begin();
-			 it != m_xyz_index_to_vertex_index_mapping[orgindex].end();
+		for (std::vector<RAS_MatArrayIndex>::iterator it = m_xyz_index_to_vertex_index_mapping[origindex].begin();
+			 it != m_xyz_index_to_vertex_index_mapping[origindex].end();
 			 it++)
 		{
 			if ((*it).m_arrayindex1 == ao->m_index1 &&
@@ -293,22 +293,18 @@ int RAS_MeshObject::FindOrAddVertex(int vtxarray,
 	idx.m_array = vtxarray;
 	idx.m_index = numverts;
 	idx.m_matid = mat;
-	m_xyz_index_to_vertex_index_mapping[orgindex].push_back(idx); 
+	m_xyz_index_to_vertex_index_mapping[origindex].push_back(idx); 
 	
 	return numverts;
 }
 
-
-
-const vecVertexArray& RAS_MeshObject::GetVertexCache (RAS_IPolyMaterial* mat)
+vecVertexArray& RAS_MeshObject::GetVertexCache (RAS_IPolyMaterial* mat)
 {
-	KX_ArrayOptimizer* ao = GetArrayOptimizer(mat);//*(m_matVertexArrays[*mat]);
+	KX_ArrayOptimizer* ao = GetArrayOptimizer(mat);
 
 	return ao->m_VertexArrayCache1;
 }
 
-
-
 int RAS_MeshObject::GetVertexArrayLength(RAS_IPolyMaterial* mat)
 {
 	int len = 0;
@@ -362,7 +358,7 @@ RAS_TexVert* RAS_MeshObject::GetVertex(unsigned int matid,
 
 const vecIndexArrays& RAS_MeshObject::GetIndexCache (RAS_IPolyMaterial* mat)
 {
-	KX_ArrayOptimizer* ao = GetArrayOptimizer(mat);//*(m_matVertexArrays[*mat]);
+	KX_ArrayOptimizer* ao = GetArrayOptimizer(mat);
 
 	return ao->m_IndexArrayCache1;
 }
@@ -371,16 +367,27 @@ const vecIndexArrays& RAS_MeshObject::GetIndexCache (RAS_IPolyMaterial* mat)
 
 KX_ArrayOptimizer* RAS_MeshObject::GetArrayOptimizer(RAS_IPolyMaterial* polymat)
 {
-	KX_ArrayOptimizer** aop = (m_matVertexArrayS[*polymat]);
+	KX_ArrayOptimizer** aop = m_matVertexArrayS[polymat];
 
-	if (aop)
+	if(aop)
 		return *aop;
 	
+	// didn't find array, but an array might already exist
+	// for a material equal to this one
+	for(int i=0;i<m_matVertexArrayS.size();i++) {
+		RAS_IPolyMaterial *mat = (RAS_IPolyMaterial*)(m_matVertexArrayS.getKey(i)->getValue());
+		if(*mat == *polymat) {
+			m_matVertexArrayS.insert(polymat, *m_matVertexArrayS.at(i));
+			return *m_matVertexArrayS.at(i);
+		}
+	}
+
+	// create new array
 	int numelements = m_matVertexArrayS.size();
 	m_sortedMaterials.push_back(polymat);
-		
+
 	KX_ArrayOptimizer* ao = new KX_ArrayOptimizer(numelements);
-	m_matVertexArrayS.insert(*polymat,ao);
+	m_matVertexArrayS.insert(polymat, ao);
 	
 	return ao;
 }
@@ -463,7 +470,7 @@ RAS_TexVert* RAS_MeshObject::GetVertex(short array,
 									   unsigned int index,
 									   RAS_IPolyMaterial* polymat)
 {
-	 KX_ArrayOptimizer* ao = GetArrayOptimizer(polymat);//*(m_matVertexArrays[*polymat]);
+	 KX_ArrayOptimizer* ao = GetArrayOptimizer(polymat);
 	return &((*(ao->m_VertexArrayCache1)[array])[index]);
 }
 
@@ -471,13 +478,19 @@ RAS_TexVert* RAS_MeshObject::GetVertex(short array,
 
 void RAS_MeshObject::ClearArrayData()
 {
-	for (int i=0;i<m_matVertexArrayS.size();i++)
-	{
+	for (int i=0;i<m_matVertexArrayS.size();i++) {
 		KX_ArrayOptimizer** ao = m_matVertexArrayS.at(i);
-		if (ao)
-		{
-			delete *ao;
+
+		// we have duplicate entries, only free once
+		for(int j=i+1;j<m_matVertexArrayS.size();j++) {
+			if(ao == m_matVertexArrayS.at(j)) {
+				ao = NULL;
+				break;
+			}
 		}
+
+		if (ao)
+			delete *ao;
 	}
 }
 
diff --git a/source/gameengine/Rasterizer/RAS_MeshObject.h b/source/gameengine/Rasterizer/RAS_MeshObject.h
index d9aa133efb2..0d06748f91f 100644
--- a/source/gameengine/Rasterizer/RAS_MeshObject.h
+++ b/source/gameengine/Rasterizer/RAS_MeshObject.h
@@ -142,7 +142,7 @@ protected:
 	enum { BUCKET_MAX_INDICES = 65535 };//2048};//8192};
 	enum { BUCKET_MAX_TRIANGLES = 65535 };
 	
-	GEN_Map<class RAS_IPolyMaterial,KX_ArrayOptimizer*> m_matVertexArrayS;
+	GEN_Map<GEN_HashedPtr,KX_ArrayOptimizer*> m_matVertexArrayS;
 	
 	RAS_MaterialBucket::Set			m_materials;
 	Mesh*							m_mesh;
@@ -242,10 +242,10 @@ public:
 							const MT_Vector3& normal,
 							bool flat,
 							RAS_IPolyMaterial* mat,
-							int orgindex
+							int origindex
 						);
 	
-	const vecVertexArray&	GetVertexCache (RAS_IPolyMaterial* mat);
+	vecVertexArray&		GetVertexCache (RAS_IPolyMaterial* mat);
 	
 	int					GetVertexArrayLength(RAS_IPolyMaterial* mat);
 
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
index 39080b80492..c2687319717 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
@@ -161,9 +161,7 @@ void RAS_ListRasterizer::ReleaseAlloc()
 void RAS_ListRasterizer::IndexPrimitives(
 	const vecVertexArray & vertexarrays,
 	const vecIndexArrays & indexarrays,
-	int mode,
-	class RAS_IPolyMaterial* polymat,
-	class RAS_IRenderTools* rendertools,
+	DrawMode mode,
 	bool useObjectColor,
 	const MT_Vector4& rgbacolor,
 	class KX_ListSlot** slot)
@@ -185,15 +183,13 @@ void RAS_ListRasterizer::IndexPrimitives(
 	if (mUseVertexArrays) {
 		RAS_VAOpenGLRasterizer::IndexPrimitives(
 				vertexarrays, indexarrays,
-				mode, polymat,
-				rendertools, useObjectColor,
+				mode, useObjectColor,
 				rgbacolor,slot
 		);
 	} else {
 		RAS_OpenGLRasterizer::IndexPrimitives(
 				vertexarrays, indexarrays,
-				mode, polymat,
-				rendertools, useObjectColor,
+				mode, useObjectColor,
 				rgbacolor,slot
 		);
 	}
@@ -208,9 +204,7 @@ void RAS_ListRasterizer::IndexPrimitives(
 void RAS_ListRasterizer::IndexPrimitivesMulti(
 		const vecVertexArray& vertexarrays,
 		const vecIndexArrays & indexarrays,
-		int mode,
-		class RAS_IPolyMaterial* polymat,
-		class RAS_IRenderTools* rendertools,
+		DrawMode mode,
 		bool useObjectColor,
 		const MT_Vector4& rgbacolor,
 		class KX_ListSlot** slot)
@@ -230,18 +224,19 @@ void RAS_ListRasterizer::IndexPrimitivesMulti(
 		}
 	}
 
-	if (mUseVertexArrays) {
+	// workaround: note how we do not use vertex arrays for making display
+	// lists, since glVertexAttribPointerARB doesn't seem to work correct
+	// in display lists on ATI? either a bug in the driver or in Blender ..
+	if (mUseVertexArrays && !localSlot) {
 		RAS_VAOpenGLRasterizer::IndexPrimitivesMulti(
 				vertexarrays, indexarrays,
-				mode, polymat,
-				rendertools, useObjectColor,
+				mode, useObjectColor,
 				rgbacolor,slot
 		);
 	} else {
 		RAS_OpenGLRasterizer::IndexPrimitivesMulti(
 				vertexarrays, indexarrays,
-				mode, polymat,
-				rendertools, useObjectColor,
+				mode, useObjectColor,
 				rgbacolor,slot
 		);
 	}
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
index 4b3304d7396..b1b19144c12 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
@@ -52,9 +52,7 @@ public:
 	virtual void IndexPrimitives(
 			const vecVertexArray& vertexarrays,
 			const vecIndexArrays & indexarrays,
-			int mode,
-			class RAS_IPolyMaterial* polymat,
-			class RAS_IRenderTools* rendertools,
+			DrawMode mode,
 			bool useObjectColor,
 			const MT_Vector4& rgbacolor,
 			class KX_ListSlot** slot
@@ -63,9 +61,7 @@ public:
 	virtual void IndexPrimitivesMulti(
 			const vecVertexArray& vertexarrays,
 			const vecIndexArrays & indexarrays,
-			int mode,
-			class RAS_IPolyMaterial* polymat,
-			class RAS_IRenderTools* rendertools,
+			DrawMode mode,
 			bool useObjectColor,
 			const MT_Vector4& rgbacolor,
 			class KX_ListSlot** slot
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
index 18147b53f4c..dcc36bf5a39 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
@@ -368,23 +368,11 @@ void RAS_OpenGLRasterizer::SetDrawingMode(int drawingmode)
 
 	switch (m_drawingmode)
 	{
-	case KX_BOUNDINGBOX:
-		{
-		}
 	case KX_WIREFRAME:
 		{
 			glDisable (GL_CULL_FACE);
 			break;
 		}
-	case KX_TEXTURED:
-		{
-		}
-	case KX_SHADED:
-		{
-		}
-	case KX_SOLID:
-		{
-		}
 	default:
 		{
 		}
@@ -603,33 +591,14 @@ void RAS_OpenGLRasterizer::GetViewMatrix(MT_Matrix4x4 &mat) const
 
 void RAS_OpenGLRasterizer::IndexPrimitives(const vecVertexArray & vertexarrays,
 									const vecIndexArrays & indexarrays,
-									int mode,
-									class RAS_IPolyMaterial* polymat,
-									class RAS_IRenderTools* rendertools,
+									DrawMode mode,
 									bool useObjectColor,
 									const MT_Vector4& rgbacolor,
 									class KX_ListSlot** slot
 									)
 { 
-	GLenum drawmode;
-	switch (mode)
-	{
-	case 0:
-		drawmode = GL_TRIANGLES;
-		break;
-	case 1:
-		drawmode = GL_LINES;
-		break;
-	case 2:
-		drawmode = GL_QUADS;
-		break;
-	default:
-		drawmode = GL_LINES;
-		break;
-	}
-	
-	const RAS_TexVert* vertexarray ;
-	unsigned int numindices,vt;
+	const RAS_TexVert* vertexarray;
+	unsigned int numindices, vt;
 
 	for (vt=0;vt<vertexarrays.size();vt++)
 	{
@@ -643,7 +612,7 @@ void RAS_OpenGLRasterizer::IndexPrimitives(const vecVertexArray & vertexarrays,
 		int vindex=0;
 		switch (mode)
 		{
-		case 1:
+		case KX_MODE_LINES:
 			{
 				glBegin(GL_LINES);
 				vindex=0;
@@ -655,7 +624,7 @@ void RAS_OpenGLRasterizer::IndexPrimitives(const vecVertexArray & vertexarrays,
 				glEnd();
 			}
 			break;
-		case 2:
+		case KX_MODE_QUADS:
 			{
 				glBegin(GL_QUADS);
 				vindex=0;
@@ -723,7 +692,7 @@ void RAS_OpenGLRasterizer::IndexPrimitives(const vecVertexArray & vertexarrays,
 				glEnd();	
 				break;
 			}
-		case 0:
+		case KX_MODE_TRIANGLES:
 			{
 				glBegin(GL_TRIANGLES);
 				vindex=0;
@@ -788,32 +757,14 @@ void RAS_OpenGLRasterizer::IndexPrimitives(const vecVertexArray & vertexarrays,
 
 void RAS_OpenGLRasterizer::IndexPrimitives_3DText(const vecVertexArray & vertexarrays,
 									const vecIndexArrays & indexarrays,
-									int mode,
+									DrawMode mode,
 									class RAS_IPolyMaterial* polymat,
 									class RAS_IRenderTools* rendertools,
 									bool useObjectColor,
 									const MT_Vector4& rgbacolor
 									)
 { 
-	GLenum drawmode;
-	switch (mode)
-	{
-	case 0:
-		drawmode = GL_TRIANGLES;
-		break;
-	case 1:
-		drawmode = GL_LINES;
-		break;
-	case 2:
-		drawmode = GL_QUADS;
-		break;
-	default:
-		drawmode = GL_LINES;
-		break;
-	}
-	
-	const RAS_TexVert* vertexarray ;
-	
+	const RAS_TexVert* vertexarray;
 	unsigned int numindices, vt;
 	
 	if (useObjectColor)
@@ -838,7 +789,7 @@ void RAS_OpenGLRasterizer::IndexPrimitives_3DText(const vecVertexArray & vertexa
 		int vindex=0;
 		switch (mode)
 		{
-		case 1:
+		case KX_MODE_LINES:
 			{
 				glBegin(GL_LINES);
 				vindex=0;
@@ -850,7 +801,7 @@ void RAS_OpenGLRasterizer::IndexPrimitives_3DText(const vecVertexArray & vertexa
 				glEnd();
 			}
 			break;
-		case 2:
+		case KX_MODE_QUADS:
 			{
 				vindex=0;
 				for (unsigned int i=0;i<numindices;i+=4)
@@ -883,7 +834,7 @@ void RAS_OpenGLRasterizer::IndexPrimitives_3DText(const vecVertexArray & vertexa
 				}
 				break;
 			}
-		case 0:
+		case KX_MODE_TRIANGLES:
 			{
 				glBegin(GL_TRIANGLES);
 				vindex=0;
@@ -999,6 +950,9 @@ void RAS_OpenGLRasterizer::TexCoord(const RAS_TexVert &tv)
 			case RAS_TEXCO_UV2:
 				glVertexAttrib2fvARB(unit, tv.getUV2());
 				break;
+			case RAS_TEXCO_VCOL:
+				glVertexAttrib4ubvARB(unit, tv.getRGBA());
+				break;
 			default:
 				break;
 			}
@@ -1037,32 +991,14 @@ void RAS_OpenGLRasterizer::Tangent(	const RAS_TexVert& v1,
 void RAS_OpenGLRasterizer::IndexPrimitivesMulti(
 		const vecVertexArray& vertexarrays,
 		const vecIndexArrays & indexarrays,
-		int mode,
-		class RAS_IPolyMaterial* polymat,
-		class RAS_IRenderTools* rendertools,
+		DrawMode mode,
 		bool useObjectColor,
 		const MT_Vector4& rgbacolor,
 		class KX_ListSlot** slot
 		)
 { 
-	GLenum drawmode;
-	switch (mode)
-	{
-	case 0:
-		drawmode = GL_TRIANGLES;
-		break;
-	case 1:
-		drawmode = GL_LINES;
-		break;
-	case 2:
-		drawmode = GL_QUADS;
-		break;
-	default:
-		drawmode = GL_LINES;
-		break;
-	}
 
-	const RAS_TexVert* vertexarray ;
+	const RAS_TexVert* vertexarray;
 	unsigned int numindices,vt;
 
 	for (vt=0;vt<vertexarrays.size();vt++)
@@ -1077,7 +1013,7 @@ void RAS_OpenGLRasterizer::IndexPrimitivesMulti(
 		int vindex=0;
 		switch (mode)
 		{
-		case 1:
+		case KX_MODE_LINES:
 			{
 				glBegin(GL_LINES);
 				vindex=0;
@@ -1089,7 +1025,7 @@ void RAS_OpenGLRasterizer::IndexPrimitivesMulti(
 				glEnd();
 			}
 			break;
-		case 2:
+		case KX_MODE_QUADS:
 			{
 				glBegin(GL_QUADS);
 				vindex=0;
@@ -1166,7 +1102,7 @@ void RAS_OpenGLRasterizer::IndexPrimitivesMulti(
 				glEnd();	
 				break;
 			}
-		case 0:
+		case KX_MODE_TRIANGLES:
 			{
 				glBegin(GL_TRIANGLES);
 				vindex=0;
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
index 1f0709e081a..0d54552db05 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
@@ -148,9 +148,7 @@ public:
 	virtual void	IndexPrimitives(
 						const vecVertexArray& vertexarrays,
 						const vecIndexArrays & indexarrays,
-						int mode,
-						class RAS_IPolyMaterial* polymat,
-						class RAS_IRenderTools* rendertools,
+						DrawMode mode,
 						bool useObjectColor,
 						const MT_Vector4& rgbacolor,
 						class KX_ListSlot** slot
@@ -159,7 +157,7 @@ public:
 	virtual void	IndexPrimitives_3DText(
 						const vecVertexArray& vertexarrays,
 						const vecIndexArrays & indexarrays,
-						int mode,
+						DrawMode mode,
 						class RAS_IPolyMaterial* polymat,
 						class RAS_IRenderTools* rendertools,
 						bool useObjectColor,
@@ -169,9 +167,7 @@ public:
 	virtual void IndexPrimitivesMulti( 
 						const vecVertexArray& vertexarrays,
 						const vecIndexArrays & indexarrays,
-						int mode,
-						class RAS_IPolyMaterial* polymat,
-						class RAS_IRenderTools* rendertools,
+						DrawMode mode,
 						bool useObjectColor,
 						const MT_Vector4& rgbacolor,
 						class KX_ListSlot** slot);
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
index c4702fe5a74..c78a97ad7be 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
@@ -59,9 +59,9 @@ bool RAS_VAOpenGLRasterizer::Init(void)
 	if (result)
 	{
 		glEnableClientState(GL_VERTEX_ARRAY);
-		glDisableClientState(GL_TEXTURE_COORD_ARRAY);
 		glEnableClientState(GL_NORMAL_ARRAY);
 		glDisableClientState(GL_COLOR_ARRAY);
+		glDisableClientState(GL_TEXTURE_COORD_ARRAY);
 
 		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 	}
@@ -77,13 +77,16 @@ void RAS_VAOpenGLRasterizer::SetDrawingMode(int drawingmode)
 	{
 		case KX_BOUNDINGBOX:
 		case KX_WIREFRAME:
-			glDisable (GL_CULL_FACE);
+			glDisableClientState(GL_COLOR_ARRAY);
+			glDisable(GL_CULL_FACE);
+			break;
+		case KX_SOLID:
+			glDisableClientState(GL_COLOR_ARRAY);
 			break;
 		case KX_TEXTURED:
 		case KX_SHADED:
+		case KX_SHADOW:
 			glEnableClientState(GL_COLOR_ARRAY);
-		case KX_SOLID:
-			break;
 		default:
 			break;
 	}
@@ -102,30 +105,23 @@ void RAS_VAOpenGLRasterizer::Exit()
 
 void RAS_VAOpenGLRasterizer::IndexPrimitives( const vecVertexArray& vertexarrays,
 							const vecIndexArrays & indexarrays,
-							int mode,
-							class RAS_IPolyMaterial* polymat,
-							class RAS_IRenderTools* rendertools,
+							DrawMode mode,
 							bool useObjectColor,
 							const MT_Vector4& rgbacolor,
 							class KX_ListSlot** slot)
 {
 	static const GLsizei vtxstride = sizeof(RAS_TexVert);
 	GLenum drawmode;
-	switch (mode)
-	{
-		case 0:
-			drawmode = GL_TRIANGLES;
-			break;
-		case 2:
-			drawmode = GL_QUADS;
-			break;
-		case 1:	//lines
-		default:
-			drawmode = GL_LINES;
-			break;
-	}
+	if(mode == KX_MODE_TRIANGLES)
+		drawmode = GL_TRIANGLES;
+	else if(mode == KX_MODE_QUADS)
+		drawmode = GL_QUADS;
+	else
+		drawmode = GL_LINES;
+
 	const RAS_TexVert* vertexarray;
 	unsigned int numindices, vt;
+
 	if (drawmode != GL_LINES)
 	{
 		if (useObjectColor)
@@ -157,9 +153,10 @@ void RAS_VAOpenGLRasterizer::IndexPrimitives( const vecVertexArray& vertexarrays
 			continue;
 		
 		glVertexPointer(3,GL_FLOAT,vtxstride,vertexarray->getLocalXYZ());
-		glTexCoordPointer(2,GL_FLOAT,vtxstride,vertexarray->getUV1());
-		glColorPointer(4,GL_UNSIGNED_BYTE,vtxstride,vertexarray->getRGBA());
 		glNormalPointer(GL_FLOAT,vtxstride,vertexarray->getNormal());
+		glTexCoordPointer(2,GL_FLOAT,vtxstride,vertexarray->getUV1());
+		if(glIsEnabled(GL_COLOR_ARRAY))
+			glColorPointer(4,GL_UNSIGNED_BYTE,vtxstride,vertexarray->getRGBA());
 
 		//if(m_Lock)
 		//	local->Begin(vertexarrays[vt]->size());
@@ -169,8 +166,6 @@ void RAS_VAOpenGLRasterizer::IndexPrimitives( const vecVertexArray& vertexarrays
 
 		//if(m_Lock)
 		//	local->End();
-
-
 	}
 
 	glDisableClientState(GL_TEXTURE_COORD_ARRAY);
@@ -178,28 +173,21 @@ void RAS_VAOpenGLRasterizer::IndexPrimitives( const vecVertexArray& vertexarrays
 
 void RAS_VAOpenGLRasterizer::IndexPrimitivesMulti( const vecVertexArray& vertexarrays,
 							const vecIndexArrays & indexarrays,
-							int mode,
-							class RAS_IPolyMaterial* polymat,
-							class RAS_IRenderTools* rendertools,
+							DrawMode mode,
 							bool useObjectColor,
 							const MT_Vector4& rgbacolor,
 							class KX_ListSlot** slot)
 {
 	static const GLsizei vtxstride = sizeof(RAS_TexVert);
+
 	GLenum drawmode;
-	switch (mode)
-	{
-		case 0:
-			drawmode = GL_TRIANGLES;
-			break;
-		case 2:
-			drawmode = GL_QUADS;
-			break;
-		case 1:	//lines
-		default:
-			drawmode = GL_LINES;
-			break;
-	}
+	if(mode == KX_MODE_TRIANGLES)
+		drawmode = GL_TRIANGLES;
+	else if(mode == KX_MODE_QUADS)
+		drawmode = GL_QUADS;
+	else
+		drawmode = GL_LINES;
+
 	const RAS_TexVert* vertexarray;
 	unsigned int numindices, vt;
 
@@ -232,10 +220,10 @@ void RAS_VAOpenGLRasterizer::IndexPrimitivesMulti( const vecVertexArray& vertexa
 			continue;
 
 		glVertexPointer(3,GL_FLOAT,vtxstride,vertexarray->getLocalXYZ());
-		TexCoordPtr(vertexarray);
-
-		glColorPointer(4,GL_UNSIGNED_BYTE,vtxstride,vertexarray->getRGBA());
 		glNormalPointer(GL_FLOAT,vtxstride,vertexarray->getNormal());
+		TexCoordPtr(vertexarray);
+		if(glIsEnabled(GL_COLOR_ARRAY))
+			glColorPointer(4,GL_UNSIGNED_BYTE,vtxstride,vertexarray->getRGBA());
 
 		//if(m_Lock)
 		//	local->Begin(vertexarrays[vt]->size());
@@ -296,19 +284,22 @@ void RAS_VAOpenGLRasterizer::TexCoordPtr(const RAS_TexVert *tv)
 			switch(m_attrib[unit]) {
 			case RAS_TEXCO_ORCO:
 			case RAS_TEXCO_GLOB:
-				glVertexAttribPointer(unit, 3, GL_FLOAT, GL_FALSE, sizeof(RAS_TexVert), tv->getLocalXYZ());
+				glVertexAttribPointerARB(unit, 3, GL_FLOAT, GL_FALSE, sizeof(RAS_TexVert), tv->getLocalXYZ());
 				break;
 			case RAS_TEXCO_UV1:
-				glVertexAttribPointer(unit, 2, GL_FLOAT, GL_FALSE, sizeof(RAS_TexVert), tv->getUV1());
+				glVertexAttribPointerARB(unit, 2, GL_FLOAT, GL_FALSE, sizeof(RAS_TexVert), tv->getUV1());
 				break;
 			case RAS_TEXCO_NORM:
-				glVertexAttribPointer(unit, 3, GL_FLOAT, GL_FALSE, sizeof(RAS_TexVert), tv->getNormal());
+				glVertexAttribPointerARB(unit, 3, GL_FLOAT, GL_FALSE, sizeof(RAS_TexVert), tv->getNormal());
 				break;
 			case RAS_TEXTANGENT:
-				glVertexAttribPointer(unit, 4, GL_FLOAT, GL_FALSE, sizeof(RAS_TexVert), tv->getTangent());
+				glVertexAttribPointerARB(unit, 4, GL_FLOAT, GL_FALSE, sizeof(RAS_TexVert), tv->getTangent());
 				break;
 			case RAS_TEXCO_UV2:
-				glVertexAttribPointer(unit, 2, GL_FLOAT, GL_FALSE, sizeof(RAS_TexVert), tv->getUV2());
+				glVertexAttribPointerARB(unit, 2, GL_FLOAT, GL_FALSE, sizeof(RAS_TexVert), tv->getUV2());
+				break;
+			case RAS_TEXCO_VCOL:
+				glVertexAttribPointerARB(unit, 4, GL_UNSIGNED_BYTE, GL_FALSE, sizeof(RAS_TexVert), tv->getRGBA());
 				break;
 			default:
 				break;
@@ -386,11 +377,12 @@ void RAS_VAOpenGLRasterizer::EnableTextures(bool enable)
 			case RAS_TEXCO_NORM:
 			case RAS_TEXTANGENT:
 			case RAS_TEXCO_UV2:
-				if(enable) glEnableVertexAttribArray(unit);
-				else glDisableVertexAttribArray(unit);
+			case RAS_TEXCO_VCOL:
+				if(enable) glEnableVertexAttribArrayARB(unit);
+				else glDisableVertexAttribArrayARB(unit);
 				break;
 			default:
-				glDisableVertexAttribArray(unit);
+				glDisableVertexAttribArrayARB(unit);
 				break;
 			}
 		}
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
index ea08887028f..e4cc4ace0e8 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
@@ -52,9 +52,7 @@ public:
 
 	virtual void	IndexPrimitives( const vecVertexArray& vertexarrays,
 		const vecIndexArrays & indexarrays,
-		int mode,
-		class RAS_IPolyMaterial* polymat,
-		class RAS_IRenderTools* rendertools,
+		DrawMode mode,
 		bool useObjectColor,
 		const MT_Vector4& rgbacolor,
 		class KX_ListSlot** slot);
@@ -62,9 +60,7 @@ public:
 	virtual void IndexPrimitivesMulti( 
 		const vecVertexArray& vertexarrays,
 		const vecIndexArrays & indexarrays,
-		int mode,
-		class RAS_IPolyMaterial* polymat,
-		class RAS_IRenderTools* rendertools,
+		DrawMode mode,
 		bool useObjectColor,
 		const MT_Vector4& rgbacolor,
 		class KX_ListSlot** slot);
diff --git a/source/gameengine/Rasterizer/RAS_TexVert.cpp b/source/gameengine/Rasterizer/RAS_TexVert.cpp
index 61ac456b2bc..935633dc636 100644
--- a/source/gameengine/Rasterizer/RAS_TexVert.cpp
+++ b/source/gameengine/Rasterizer/RAS_TexVert.cpp
@@ -40,7 +40,8 @@ RAS_TexVert::RAS_TexVert(const MT_Point3& xyz,
 						 const MT_Vector4& tangent,
 						 const unsigned int rgba,
 						 const MT_Vector3& normal,
-						 const short flag) 
+						 const short flag,
+						 const unsigned int origindex)
 {
 	xyz.getValue(m_localxyz);
 	uv.getValue(m_uv1);
@@ -49,6 +50,7 @@ RAS_TexVert::RAS_TexVert(const MT_Point3& xyz,
 	SetNormal(normal);
 	tangent.getValue(m_tangent);
 	m_flag = flag;
+	m_origindex = origindex;
 	m_unit = 2;
 }
 
@@ -107,44 +109,6 @@ void RAS_TexVert::SetNormal(const MT_Vector3& normal)
 	normal.getValue(m_normal);
 }
 
-#ifndef RAS_TexVert_INLINE
-
-// leave multiline for debugging
-const float* RAS_TexVert::getUV1 () const
-{
-	return m_uv1;
-}
-
-const float* RAS_TexVert::getUV2 () const
-{
-	return m_uv2;
-}
-
-
-
-const float* RAS_TexVert::getNormal() const
-{
-	return m_normal;
-}
-
-const float* RAS_TexVert::getTangent() const
-{
-	return m_tangent;
-}
-
-
-const float* RAS_TexVert::getLocalXYZ() const
-{ 
-	return m_localxyz;
-}
-
-const unsigned char* RAS_TexVert::getRGBA() const
-{
-	return (unsigned char*) &m_rgba;
-}
-
-#endif
-
 // compare two vertices, and return TRUE if both are almost identical (they can be shared)
 bool RAS_TexVert::closeTo(const RAS_TexVert* other)
 {
diff --git a/source/gameengine/Rasterizer/RAS_TexVert.h b/source/gameengine/Rasterizer/RAS_TexVert.h
index 84135db918f..bf092b4b230 100644
--- a/source/gameengine/Rasterizer/RAS_TexVert.h
+++ b/source/gameengine/Rasterizer/RAS_TexVert.h
@@ -42,8 +42,6 @@ static MT_Point2 g_pt2;
 
 #define TV_MAX				3//match Def in BL_Material.h
 
-#define RAS_TexVert_INLINE 1
-
 class RAS_TexVert
 {
 	
@@ -55,9 +53,10 @@ class RAS_TexVert
 	float			m_normal[3];	// 3*2 =  6 
 	short			m_flag;			//        2
 	unsigned int	m_unit;			//		  4
+	unsigned int	m_origindex;		//        4
 									//---------
-									//       52
-	//32 bytes total size, fits nice = 52 = not fit nice.
+									//       56
+	// 32 bytes total size, fits nice = 56 = not fit nice.
 	// We'll go for 64 bytes total size - 24 bytes left.
 public:
 	short getFlag() const;
@@ -71,11 +70,10 @@ public:
 				const MT_Vector4& tangent,
 				const unsigned int rgba,
 				const MT_Vector3& normal,
-				const short flag);
+				const short flag,
+				const unsigned int origindex);
 	~RAS_TexVert() {};
 
-	// leave multiline for debugging
-#ifdef RAS_TexVert_INLINE
 	const float* getUV1 () const { 
 		return m_uv1;
 	};
@@ -99,13 +97,11 @@ public:
 	const unsigned char* getRGBA() const {
 		return (unsigned char *) &m_rgba;
 	}
-#else
-	const float* getUV1 () const;
-	const float* getUV2 () const;
-	const float*		getNormal() const;
-	const float*		getLocalXYZ() const;
-	const unsigned char*	getRGBA() const;
-#endif
+
+	const unsigned int getOrigIndex() const {
+		return m_origindex;
+	}
+
 	void				SetXYZ(const MT_Point3& xyz);
 	void				SetUV(const MT_Point2& uv);
 	void				SetUV2(const MT_Point2& uv);
diff --git a/source/gameengine/SceneGraph/SG_Controller.h b/source/gameengine/SceneGraph/SG_Controller.h
index d65a2f0c256..c32885b915f 100644
--- a/source/gameengine/SceneGraph/SG_Controller.h
+++ b/source/gameengine/SceneGraph/SG_Controller.h
@@ -101,7 +101,9 @@ public:
 	enum SG_Controller_option {
 		SG_CONTR_NODEF = 0,
 		SG_CONTR_IPO_IPO_AS_FORCE,
-		SG_CONTR_IPO_FORCES_ACT_LOCAL,
+		SG_CONTR_IPO_IPO_ADD,
+		SG_CONTR_IPO_LOCAL,
+		SG_CONTR_IPO_RESET,
 		SG_CONTR_CAMIPO_LENS,
 		SG_CONTR_CAMIPO_CLIPEND,
 		SG_CONTR_CAMIPO_CLIPSTART,
diff --git a/source/kernel/gen_system/GEN_HashedPtr.h b/source/kernel/gen_system/GEN_HashedPtr.h
index 777ec76e067..13faa5f227b 100644
--- a/source/kernel/gen_system/GEN_HashedPtr.h
+++ b/source/kernel/gen_system/GEN_HashedPtr.h
@@ -39,6 +39,7 @@ public:
 	GEN_HashedPtr(void* val) : m_valptr(val) {};
 	unsigned int hash() const { return GEN_Hash(m_valptr);};
 	inline friend bool operator ==(const GEN_HashedPtr & rhs, const GEN_HashedPtr & lhs) { return rhs.m_valptr == lhs.m_valptr;};
+	void *getValue() const { return m_valptr; }
 };
 
 #endif //__GEN_HASHEDPTR
diff --git a/source/kernel/gen_system/GEN_Map.h b/source/kernel/gen_system/GEN_Map.h
index f9c14800499..37c75d8293a 100644
--- a/source/kernel/gen_system/GEN_Map.h
+++ b/source/kernel/gen_system/GEN_Map.h
@@ -82,6 +82,24 @@ public:
         }
         return 0;
     }
+
+    Key* getKey(int index) {
+        int count=0;
+        for (int i=0;i<m_num_buckets;i++)
+        {
+            Entry* bucket = m_buckets[i];
+            while(bucket)
+            {
+                if (count==index)
+                {
+                    return &bucket->m_key;
+                }
+                bucket = bucket->m_next;
+                count++;
+            }
+        }
+        return 0;
+    }
     
     void clear() {
         for (int i = 0; i < m_num_buckets; ++i) {
diff --git a/tools/Blender.py b/tools/Blender.py
index 633a576efee..5eaeab7f5ae 100644
--- a/tools/Blender.py
+++ b/tools/Blender.py
@@ -69,10 +69,10 @@ def internal_lib_to_dict(dict = None, libtype = None, libname = None, priority =
         dict[libtype][priority] = libname
 
 # libtype and priority can both be lists, for defining lib in multiple places
-def add_lib_to_dict(dict = None, libtype = None, libname = None, priority = 100):
+def add_lib_to_dict(env, dict = None, libtype = None, libname = None, priority = 100):
     if not dict or not libtype or not libname:
         print "Passed wrong arg"
-        Exit()
+        env.Exit()
 
     if type(libtype) is str and type(priority) is int:
         internal_lib_to_dict(dict, libtype, libname, priority)
@@ -82,10 +82,10 @@ def add_lib_to_dict(dict = None, libtype = None, libname = None, priority = 100)
                 internal_lib_to_dict(dict, lt, libname, p)
         else:
             print "libtype and priority lists are unequal in length"
-            Exit()
+            env.Exit()
     else:
         print "Wrong type combinations for libtype and priority. Only str and int or list and list"
-        Exit()
+        env.Exit()
 
 def create_blender_liblist(lenv = None, libtype = None):
     if not lenv or not libtype:
@@ -93,11 +93,9 @@ def create_blender_liblist(lenv = None, libtype = None):
 
     lst = []
     if libtype in possible_types:
-        sortlist = []
-        for k,v in libs[libtype].iteritems():
-            sortlist.append(k)
-        sortlist.sort()
         curlib = libs[libtype]
+        sortlist = curlib.keys()
+        sortlist.sort()
         for sk in sortlist:
             v = curlib[sk]
             lst.append('#' + root_build_dir + 'lib/'+lenv['LIBPREFIX'] + v + lenv['LIBSUFFIX'])
@@ -177,11 +175,10 @@ def propose_priorities():
     for t in possible_types:
         print bc.OKGREEN+"\t"+t+bc.ENDC
         new_priority = 0
-        sortlist = []
-        for k,v in libs[t].iteritems():
-            sortlist.append(k)
-        sortlist.sort()
         curlib = libs[t]
+        sortlist = curlib.keys()
+        sortlist.sort()
+
         for sk in sortlist:
             v = curlib[sk]
             #for p,v in sorted(libs[t].iteritems()):
@@ -370,7 +367,7 @@ class BlenderEnvironment(SConsEnvironment):
         global libs
         if not self or not libname or not source:
             print bc.FAIL+'Cannot continue.  Missing argument for BlenderRes '+libname+bc.ENDC
-            Exit()
+            self.Exit()
         if self['OURPLATFORM'] not in ('win32-vc','win32-mingw','linuxcross'):
             print bc.FAIL+'BlenderRes is for windows only!'+bc.END
             self.Exit()
@@ -385,7 +382,7 @@ class BlenderEnvironment(SConsEnvironment):
     def BlenderLib(self=None, libname=None, sources=None, includes=[], defines=[], libtype='common', priority = 100, compileflags=None):
         if not self or not libname or not sources:
             print bc.FAIL+'Cannot continue. Missing argument for BuildBlenderLib '+libname+bc.ENDC
-            Exit()
+            self.Exit()
         if libname in quickie or len(quickie)==0:
             if libname in quickdebug: 
                 print bc.HEADER+'Configuring library '+bc.ENDC+bc.OKGREEN+libname +bc.ENDC+bc.OKBLUE+ " (debug mode)" + bc.ENDC
@@ -421,7 +418,7 @@ class BlenderEnvironment(SConsEnvironment):
         else:
             print bc.WARNING+'Not building '+bc.ENDC+bc.OKGREEN+libname+bc.ENDC+' for '+bc.OKBLUE+'BF_QUICK'+bc.ENDC
         # note: libs is a global
-        add_lib_to_dict(libs, libtype, libname, priority)
+        add_lib_to_dict(self, libs, libtype, libname, priority)
 
     def BlenderProg(self=None, builddir=None, progname=None, sources=None, includes=None, libs=None, libpath=None, binarykind=''):
         print bc.HEADER+'Configuring program '+bc.ENDC+bc.OKGREEN+progname+bc.ENDC

From 915baebda66c1ac2f75497f47f76a9d5a502836b Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Sun, 13 Jul 2008 18:24:27 +0000
Subject: [PATCH 085/252] Get simulated annealing working correctly. Meaning
 bone arc retargeting is much faster than before.

Still need to do stability tests and analysis (brute force is probably better in some situations).
---
 source/blender/src/autoarmature.c | 112 +++++++++++++++++-------------
 1 file changed, 62 insertions(+), 50 deletions(-)

diff --git a/source/blender/src/autoarmature.c b/source/blender/src/autoarmature.c
index 0644b484575..1aab8ceaa2a 100644
--- a/source/blender/src/autoarmature.c
+++ b/source/blender/src/autoarmature.c
@@ -578,49 +578,68 @@ static void printPositions(int *positions, int nb_positions)
 	printf("\n");
 }
 
-static float calcMaximumDistance(ReebArcIterator *iter, float *vec0, float *vec1, int i0, int i1)
+static float costDistance(ReebArcIterator *iter, float *vec0, float *vec1, int i0, int i1)
 {
 	EmbedBucket *bucket = NULL;
 	float max_dist = 0;
 	float v1[3], v2[3], c[3];
 	float v1_inpf;
 
-	VecSubf(v1, vec0, vec1);
-	
-	v1_inpf = Inpf(v1, v1);
-	
-	if (v1_inpf > 0)
+	if (G.scene->toolsettings->skgen_retarget_distance_weight > 0)
 	{
-		int j;
-		for (j = i0 + 1; j < i1 - 1; j++)
+		VecSubf(v1, vec0, vec1);
+		
+		v1_inpf = Inpf(v1, v1);
+		
+		if (v1_inpf > 0)
 		{
-			float dist;
-			
-			bucket = peekBucket(iter, j);
-
-			VecSubf(v2, bucket->p, vec1);
+			int j;
+			for (j = i0 + 1; j < i1 - 1; j++)
+			{
+				float dist;
+				
+				bucket = peekBucket(iter, j);
 	
-			Crossf(c, v1, v2);
+				VecSubf(v2, bucket->p, vec1);
+		
+				Crossf(c, v1, v2);
+				
+				dist = Inpf(c, c) / v1_inpf;
+				
+				max_dist = dist > max_dist ? dist : max_dist;
+			}
 			
-			dist = Inpf(c, c) / v1_inpf;
-			
-			max_dist = dist > max_dist ? dist : max_dist;
+			return max_dist;
+		}
+		else
+		{
+			return FLT_MAX;
 		}
 		
-		return max_dist;
+		return G.scene->toolsettings->skgen_retarget_distance_weight * max_dist;
 	}
 	else
 	{
-		return FLT_MAX;
+		return 0;
 	}
 }
 
+static float costAngle(float original_angle, float current_angle)
+{
+	return 0;
+}
+
+static float costLength(float original_length, float current_length)
+{
+	float length_ratio = fabs((current_length - original_length) / original_length);
+	return G.scene->toolsettings->skgen_retarget_length_weight * length_ratio * length_ratio;
+}
+
 static float calcCost(ReebArcIterator *iter, RigEdge *e1, RigEdge *e2, float *vec0, float *vec1, float *vec2, int i0, int i1, int i2)
 {
 	float vec_second[3], vec_first[3];
 	float angle = e1->angle;
 	float test_angle, length1, length2;
-	float max_dist;
 	float new_cost = 0;
 
 	VecSubf(vec_second, vec2, vec1);
@@ -647,16 +666,13 @@ static float calcCost(ReebArcIterator *iter, RigEdge *e1, RigEdge *e2, float *ve
 		new_cost += M_PI;
 	}
 
-	/* LENGTH COST HERE */
-	new_cost += G.scene->toolsettings->skgen_retarget_length_weight * fabs((length1 - e1->length) / e1->length);
-	new_cost += G.scene->toolsettings->skgen_retarget_length_weight * fabs((length2 - e2->length) / e2->length);
+	/* Length cost */
+	new_cost += costLength(e1->length, length1);
+	new_cost += costLength(e2->length, length2);
 
-	/* calculate maximum distance */
-	max_dist = calcMaximumDistance(iter, vec0, vec1, i0, i1);
-	new_cost += G.scene->toolsettings->skgen_retarget_distance_weight * max_dist;
-	
-	max_dist = calcMaximumDistance(iter, vec1, vec2, i1, i2);
-	new_cost += G.scene->toolsettings->skgen_retarget_distance_weight * max_dist;
+	/* Distance cost */
+	new_cost += costDistance(iter, vec0, vec1, i0, i1);
+	new_cost += costDistance(iter, vec1, vec2, i1, i2);
 
 	return new_cost;
 }
@@ -781,7 +797,7 @@ static int neighbour(int nb_joints, float *cost_cube, int *moving_joint, int *mo
 		return 0;
 	}
 	
-	chosen = (int)BLI_drand() * total;
+	chosen = (int)(BLI_drand() * total);
 	
 	for (i = 0; i < nb_joints; i++)
 	{
@@ -868,7 +884,7 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 	vec_cache[0] = node_start->p;
 	vec_cache[nb_edges] = node_end->p;
 
-#if 1 /* BRUTE FORCE */
+#if 0 /* BRUTE FORCE */
 	while(1)
 	{
 		float cost = 0;
@@ -927,8 +943,6 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 			{ 
 				float vec_first[3], vec_second[3];
 				float length1, length2;
-				float max_dist;
-				float length_ratio;
 				float new_cost = 0;
 				int i1, i2;
 				
@@ -990,19 +1004,11 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 					}
 				}
 	
-				/* LENGTH COST HERE */
-				if (G.scene->toolsettings->skgen_retarget_length_weight > 0)
-				{
-					length_ratio = fabs((length2 - edge->length) / edge->length);
-					new_cost += G.scene->toolsettings->skgen_retarget_length_weight * length_ratio * length_ratio;
-				}
+				/* Length Cost */
+				new_cost += costLength(edge->length, length2);
 				
-				/* DISTANCE COST HERE */
-				if (G.scene->toolsettings->skgen_retarget_distance_weight > 0)
-				{
-					max_dist = calcMaximumDistance(&iter, vec1, vec2, i1, i2);
-					new_cost += G.scene->toolsettings->skgen_retarget_distance_weight * max_dist;
-				}
+				/* Distance Cost */
+				new_cost += calcMaximumDistance(&iter, vec1, vec2, i1, i2);
 				
 				cost_cache[i] = new_cost;
 			}
@@ -1034,7 +1040,9 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 		float *cost_cube;
 		int k, kmax;
 		
-		kmax = 100;
+		kmax = 10000;
+		
+		BLI_srand(nb_joints);
 		
 		/* [joint: index][position: -1, 0, +1] */
 		cost_cube = MEM_callocN(sizeof(float) * 3 * nb_joints, "Cost Cube");
@@ -1047,6 +1055,8 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 			bucket = peekBucket(&iter, positions[i]);
 			vec_cache[i + 1] = bucket->p;
 		}
+		
+		min_cost = 0;
 
 		/* init cost cube */
 		for (previous = iarc->edges.first, edge = previous->next, i = 0;
@@ -1054,6 +1064,8 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 			 previous = edge, edge = edge->next, i += 1)
 		{
 			calcGradient(previous, edge, &iter, i, nb_joints, cost_cube, positions, vec_cache);
+			
+			min_cost += cost_cube[3 * i + 1];
 		}
 		
 		for (k = 0; k < kmax; k++)
@@ -1063,8 +1075,6 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 			int move_direction = -1;
 			float delta_cost;
 			
-			printf("\r%i", k);
-			
 			status = neighbour(nb_joints, cost_cube, &moving_joint, &move_direction);
 			
 			if (status == 0)
@@ -1082,6 +1092,10 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 				/* update vector cache */
 				bucket = peekBucket(&iter, positions[moving_joint]);
 				vec_cache[moving_joint + 1] = bucket->p;
+				
+				min_cost += delta_cost;
+
+				printf("%i: %0.3f\n", k, delta_cost);
 	
 				/* update cost cube */			
 				for (previous = iarc->edges.first, edge = previous->next, i = 0;
@@ -1098,8 +1112,6 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 			}
 		}
 		
-		printf("\n");
-		
 		memcpy(best_positions, positions, sizeof(int) * nb_joints);
 		
 		MEM_freeN(cost_cube);

From 657a3676bd3b0b5b63bbff2293e84e42aba6fead Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Mon, 14 Jul 2008 19:05:25 +0000
Subject: [PATCH 086/252] First draft of subgraph joining

---
 source/blender/src/reeb.c | 219 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 211 insertions(+), 8 deletions(-)

diff --git a/source/blender/src/reeb.c b/source/blender/src/reeb.c
index a174c5c199f..3aa521482d3 100644
--- a/source/blender/src/reeb.c
+++ b/source/blender/src/reeb.c
@@ -103,6 +103,8 @@ void addFacetoArc(ReebArc *arc, EditFace *efa);
 void REEB_RadialSymmetry(BNode* root_node, RadialArc* ring, int count);
 void REEB_AxialSymmetry(BNode* root_node, BNode* node1, BNode* node2, struct BArc* barc1, BArc* barc2);
 
+void flipArcBuckets(ReebArc *arc);
+
 
 /***************************************** UTILS **********************************************/
 
@@ -355,6 +357,16 @@ void printArc(ReebArc *arc)
 	}
 }
 
+void flipArc(ReebArc *arc)
+{
+	ReebNode *tmp;
+	tmp = arc->head;
+	arc->head = arc->tail;
+	arc->tail = tmp;
+	
+	flipArcBuckets(arc);
+}
+
 #ifdef DEBUG_REEB_NODE
 void NodeDegreeDecrement(ReebGraph *rg, ReebNode *node)
 {
@@ -585,8 +597,8 @@ void flipArcBuckets(ReebArc *arc)
 void allocArcBuckets(ReebArc *arc)
 {
 	int i;
-	float start = ceil(((ReebNode*)arc->head)->weight);
-	arc->bcount = (int)(floor(((ReebNode*)arc->tail)->weight) - start) + 1;
+	float start = ceil(arc->head->weight);
+	arc->bcount = (int)(floor(arc->tail->weight) - start) + 1;
 	
 	if (arc->bcount > 0)
 	{
@@ -641,6 +653,86 @@ void resizeArcBuckets(ReebArc *arc)
 	}
 }
 
+void reweightBuckets(ReebArc *arc)
+{
+	int i;
+	float start = ceil((arc->head)->weight);
+	
+	if (arc->bcount > 0)
+	{
+		for(i = 0; i < arc->bcount; i++)
+		{
+			arc->buckets[i].val = start + i;
+		}
+	}
+}
+
+static void interpolateBuckets(ReebArc *arc, float *start_p, float *end_p, int start_index, int end_index)
+{
+	int total;
+	int j;
+	
+	total = end_index - start_index + 2;
+	
+	for (j = start_index; j <= end_index; j++)
+	{
+		EmbedBucket *empty = arc->buckets + j;
+		empty->nv = 1;
+		VecLerpf(empty->p, start_p, end_p, (float)(j - start_index + 1) / total);
+	}
+}
+
+void fillArcEmptyBuckets(ReebArc *arc)
+{
+	float *start_p, *end_p;
+	int start_index, end_index;
+	int missing = 0;
+	int i;
+	
+	start_p = arc->head->p;
+	
+	for(i = 0; i < arc->bcount; i++)
+	{
+		EmbedBucket *bucket = arc->buckets + i;
+		
+		if (missing)
+		{
+			if (bucket->nv > 0)
+			{
+				missing = 0;
+				
+				end_p = bucket->p;
+				end_index = i - 1;
+				
+				interpolateBuckets(arc, start_p, end_p, start_index, end_index);
+			}
+		}
+		else
+		{
+			if (bucket->nv == 0)
+			{
+				missing = 1;
+				
+				if (i > 0)
+				{
+					start_p = arc->buckets[i - 1].p;
+				}
+				start_index = i;
+			}
+		}
+	}
+	
+	if (missing)
+	{
+		end_p = arc->tail->p;
+		end_index = arc->bcount - 1;
+		
+		interpolateBuckets(arc, start_p, end_p, start_index, end_index);
+	}
+}
+
+/**************************************** LENGTH CALCULATIONS ****************************************/
+
 void calculateArcLength(ReebArc *arc)
 {
 	ReebArcIterator iter;
@@ -966,6 +1058,120 @@ void sortArcs(ReebGraph *rg)
 {
 	BLI_sortlist(&rg->arcs, compareArcsWeight);
 }
+/******************************************* JOINING ***************************************************/
+
+void reweightArc(ReebArc *arc, ReebNode *start_node, float start_weight)
+{
+	float delta_weight = arc->tail->weight - arc->head->weight;
+	
+	if (arc->tail == start_node)
+	{
+		flipArc(arc);
+	}
+	
+	arc->head->weight = start_weight;
+	arc->tail->weight = start_weight + delta_weight;
+	
+	reweightBuckets(arc);
+	
+	/* recurse here */
+} 
+
+void reweightSubgraph(ReebGraph *rg, ReebNode *start_node, float start_weight)
+{
+	ReebArc *arc;
+	
+	arc = start_node->arcs[0];
+	
+	reweightArc(arc, start_node, start_weight);
+}
+
+int joinSubgraphsEnds(ReebGraph *rg, float threshold, int nb_subgraphs)
+{
+	int joined = 0;
+	int subgraph;
+	
+	for (subgraph = 1; subgraph <= nb_subgraphs; subgraph++)
+	{
+		ReebNode *start_node, *end_node;
+		
+		for (start_node = rg->nodes.first; start_node; start_node = start_node->next)
+		{
+			if (start_node->flag == subgraph && start_node->degree == 1)
+			{
+				for (end_node = rg->nodes.first; end_node; end_node = end_node->next)
+				{
+					if (end_node->flag != subgraph && end_node->degree == 1 && VecLenf(start_node->p, end_node->p) < threshold)
+					{
+						break;
+					}
+				}
+				
+				if (end_node)
+				{
+					ReebArc *start_arc, *end_arc;
+					int merging = 0;
+					
+					start_arc = start_node->arcs[0];
+					end_arc = end_node->arcs[0];
+					
+					if (start_arc->tail == start_node)
+					{
+						reweightSubgraph(rg, end_node, start_node->weight);
+						
+						end_arc->head = start_node;
+						
+						merging = 1;
+					}
+					else if (start_arc->head == start_node)
+					{
+						reweightSubgraph(rg, start_node, end_node->weight);
+
+						end_arc->tail = start_node;
+
+						merging = 1;
+					}
+					
+
+					if (merging)
+					{					
+						resizeArcBuckets(end_arc);
+						fillArcEmptyBuckets(end_arc);
+						
+						NodeDegreeIncrement(rg, start_node);
+						
+						BLI_removeNode((BGraph*)rg, (BNode*)end_node);
+					}
+					
+					joined = 1;
+					break;
+				}
+			}
+		}
+	}
+	
+	return joined;
+}
+
+int joinSubgraphs(ReebGraph *rg, float threshold)
+{
+	int nb_subgraphs;
+	int joined = 0;
+	
+	BLI_rebuildAdjacencyList((BGraph*)rg);
+	
+	nb_subgraphs = BLI_FlagSubgraphs((BGraph*)rg);
+	
+	joined |= joinSubgraphsEnds(rg, threshold, nb_subgraphs);
+	
+	if (joined)
+	{
+		removeNormalNodes(rg);
+		BLI_rebuildAdjacencyList((BGraph*)rg);
+	}
+	
+	return joined;
+}
 
 /****************************************** FILTERING **************************************************/
 
@@ -1055,12 +1261,7 @@ void filterArc(ReebGraph *rg, ReebNode *newNode, ReebNode *removedNode, ReebArc
 				/* flip arcs that flipped, can happen on diamond shapes, mostly on null arcs */
 				if (arc->head->weight > arc->tail->weight)
 				{
-					ReebNode *tmp;
-					tmp = arc->head;
-					arc->head = arc->tail;
-					arc->tail = tmp;
-					
-					flipArcBuckets(arc);
+					flipArc(arc);
 				}
 				//newNode->degree++; // incrementing degree since we're adding an arc
 				NodeDegreeIncrement(rg, newNode);
@@ -2956,6 +3157,8 @@ ReebGraph *BIF_ReebGraphMultiFromEditMesh(void)
 	/* Filtering might have created degree 2 nodes, so remove them */
 	removeNormalNodes(rg);
 	
+	joinSubgraphs(rg, 1.5);
+	
 	BLI_rebuildAdjacencyList((BGraph*)rg);
 	
 	/* calc length before copy, so we have same length on all levels */

From ac6641664e79fee9b8e503c6db278f5739ddb317 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Mon, 14 Jul 2008 20:30:23 +0000
Subject: [PATCH 087/252] Subgraph joins to non-terminal nodes

---
 source/blender/src/reeb.c | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/source/blender/src/reeb.c b/source/blender/src/reeb.c
index 3aa521482d3..8834e1c1a5e 100644
--- a/source/blender/src/reeb.c
+++ b/source/blender/src/reeb.c
@@ -1073,6 +1073,8 @@ void reweightArc(ReebArc *arc, ReebNode *start_node, float start_weight)
 	arc->tail->weight = start_weight + delta_weight;
 	
 	reweightBuckets(arc);
+	resizeArcBuckets(arc);
+	fillArcEmptyBuckets(arc);
 	
 	/* recurse here */
 } 
@@ -1093,15 +1095,17 @@ int joinSubgraphsEnds(ReebGraph *rg, float threshold, int nb_subgraphs)
 	
 	for (subgraph = 1; subgraph <= nb_subgraphs; subgraph++)
 	{
-		ReebNode *start_node, *end_node;
+		ReebNode *start_node, *end_node, *next_node;
 		
-		for (start_node = rg->nodes.first; start_node; start_node = start_node->next)
+		for (start_node = rg->nodes.first; start_node; start_node = next_node)
 		{
+			next_node = start_node->next;
+			
 			if (start_node->flag == subgraph && start_node->degree == 1)
 			{
 				for (end_node = rg->nodes.first; end_node; end_node = end_node->next)
 				{
-					if (end_node->flag != subgraph && end_node->degree == 1 && VecLenf(start_node->p, end_node->p) < threshold)
+					if (end_node->flag != subgraph && VecLenf(start_node->p, end_node->p) < threshold)
 					{
 						break;
 					}
@@ -1119,7 +1123,7 @@ int joinSubgraphsEnds(ReebGraph *rg, float threshold, int nb_subgraphs)
 					{
 						reweightSubgraph(rg, end_node, start_node->weight);
 						
-						end_arc->head = start_node;
+						start_arc->tail = end_node;
 						
 						merging = 1;
 					}
@@ -1127,7 +1131,7 @@ int joinSubgraphsEnds(ReebGraph *rg, float threshold, int nb_subgraphs)
 					{
 						reweightSubgraph(rg, start_node, end_node->weight);
 
-						end_arc->tail = start_node;
+						start_arc->head = end_node;
 
 						merging = 1;
 					}
@@ -1135,12 +1139,12 @@ int joinSubgraphsEnds(ReebGraph *rg, float threshold, int nb_subgraphs)
 
 					if (merging)
 					{					
-						resizeArcBuckets(end_arc);
-						fillArcEmptyBuckets(end_arc);
+						resizeArcBuckets(start_arc);
+						fillArcEmptyBuckets(start_arc);
 						
-						NodeDegreeIncrement(rg, start_node);
+						NodeDegreeIncrement(rg, end_node);
 						
-						BLI_removeNode((BGraph*)rg, (BNode*)end_node);
+						BLI_removeNode((BGraph*)rg, (BNode*)start_node);
 					}
 					
 					joined = 1;

From 96e52b09da9c808a6d10526f2115178e8499ebec Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Tue, 15 Jul 2008 01:07:19 +0000
Subject: [PATCH 088/252] soc-2008-mxcurioni: Reimplemented the Freestyle
 Python API's files to be correctly used as classes and not submodules. Added
 and integrated object lifecycle functions (__new__, __alloc__, __repr__) for
 the previous classes: BinaryPredicate0D, BinaryPredicate1D, Id, Interface0D,
 Interface1D. All of these classes were tested within Blender's Python
 interpreter with simple test cases and their getter/setters were corrected.

Interface0DIterator was modified to allow BPy_Interface1D to be instantiated: verticesBegin(), verticesEnd(), pointsBegin(float) and pointsEnd(float) are not pure virtual functions anymore. If they are called directly from  BPy_Interface1D (instead of its subclasses), an error message is displayed.
---
 .../intern/python/BinaryPredicate0D.cpp       | 107 +++++++-----
 .../intern/python/BinaryPredicate0D.h         |   2 +-
 .../intern/python/BinaryPredicate1D.cpp       | 108 +++++++-----
 .../intern/python/BinaryPredicate1D.h         |   3 +-
 .../freestyle/intern/python/Convert.cpp       |  12 +-
 .../blender/freestyle/intern/python/Convert.h |   4 +
 .../freestyle/intern/python/Freestyle.cpp     |  22 +--
 source/blender/freestyle/intern/python/Id.cpp | 163 ++++++++++++------
 source/blender/freestyle/intern/python/Id.h   |   3 +-
 .../freestyle/intern/python/Interface0D.cpp   | 115 ++++++++----
 .../freestyle/intern/python/Interface0D.h     |   3 +-
 .../freestyle/intern/python/Interface1D.cpp   | 121 ++++++++-----
 .../freestyle/intern/python/Interface1D.h     |   2 +-
 .../freestyle/intern/view_map/Interface1D.h   |  23 ++-
 14 files changed, 454 insertions(+), 234 deletions(-)

diff --git a/source/blender/freestyle/intern/python/BinaryPredicate0D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate0D.cpp
index 2c16adb7a82..107216a6b50 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate0D.cpp
+++ b/source/blender/freestyle/intern/python/BinaryPredicate0D.cpp
@@ -9,18 +9,22 @@ extern "C" {
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
+/*---------------  Python API function prototypes for BinaryPredicate0D instance  -----------*/
+static PyObject * BinaryPredicate0D___new__(PyTypeObject *type, PyObject *args, PyObject *kwds);
+static void BinaryPredicate0D___dealloc__(BPy_BinaryPredicate0D *self);
+static PyObject * BinaryPredicate0D___repr__(BPy_BinaryPredicate0D *self);
 
-/*-----------------------Python API function prototypes for the BinaryPredicate0D module--*/
-//static PyObject *Freestyle_testOutput( BPy_Freestyle * self );
-/*-----------------------BinaryPredicate0D module doc strings-----------------------------*/
-static char M_BinaryPredicate0D_doc[] = "The Blender.Freestyle.BinaryPredicate0D submodule";
-/*----------------------BinaryPredicate0D module method def----------------------------*/
-struct PyMethodDef M_BinaryPredicate0D_methods[] = {
-//	{"testOutput", ( PyCFunction ) Freestyle_testOutput, METH_NOARGS, "() - Return Curve Data name"},
+static PyObject * BinaryPredicate0D_getName( BPy_BinaryPredicate0D *self, PyObject *args);
+static PyObject * BinaryPredicate0D___call__( BPy_BinaryPredicate0D *self, PyObject *args);
+
+/*----------------------BinaryPredicate0D instance definitions ----------------------------*/
+static PyMethodDef BPy_BinaryPredicate0D_methods[] = {
+	{"getName", ( PyCFunction ) BinaryPredicate0D_getName, METH_NOARGS, "（ ）Returns the string of the name of the binary predicate."},
+	{"__call__", ( PyCFunction ) BinaryPredicate0D___call__, METH_VARARGS, "BinaryPredicate0D（Interface0D, Interface0D ）. Must be overloaded by inherited classes. It evaluates a relation between two Interface0D." },
 	{NULL, NULL, 0, NULL}
 };
 
-/*-----------------------BPy_Freestyle method def------------------------------*/
+/*-----------------------BPy_BinaryPredicate0D type definition ------------------------------*/
 
 PyTypeObject BinaryPredicate0D_Type = {
 	PyObject_HEAD_INIT( NULL ) 
@@ -30,12 +34,12 @@ PyTypeObject BinaryPredicate0D_Type = {
 	0,							/* tp_itemsize */
 	
 	/* methods */
-	NULL,						/* tp_dealloc */
-	NULL,                       /* printfunc tp_print; */
-	NULL,                       /* getattrfunc tp_getattr; */
-	NULL,                       /* setattrfunc tp_setattr; */
-	NULL,						/* tp_compare */
-	NULL,						/* tp_repr */
+	(destructor)BinaryPredicate0D___dealloc__,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	(reprfunc)BinaryPredicate0D___repr__,					/* tp_repr */
 
 	/* Method suites for standard classes */
 
@@ -78,17 +82,17 @@ PyTypeObject BinaryPredicate0D_Type = {
 	NULL,                       /* iternextfunc tp_iternext; */
 
   /*** Attribute descriptor and subclassing stuff ***/
-	NULL,						/* struct PyMethodDef *tp_methods; */
-	NULL,                       /* struct PyMemberDef *tp_members; */
-	NULL,         				/* struct PyGetSetDef *tp_getset; */
-	NULL,                       /* struct _typeobject *tp_base; */
-	NULL,                       /* PyObject *tp_dict; */
-	NULL,                       /* descrgetfunc tp_descr_get; */
-	NULL,                       /* descrsetfunc tp_descr_set; */
-	0,                          /* long tp_dictoffset; */
-	NULL,                       /* initproc tp_init; */
-	NULL,                       /* allocfunc tp_alloc; */
-	NULL,                       /* newfunc tp_new; */
+	BPy_BinaryPredicate0D_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	NULL,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	NULL,                       	/* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	(newfunc)BinaryPredicate0D___new__,		/* newfunc tp_new; */
 	
 	/*  Low-level free-memory routine */
 	NULL,                       /* freefunc tp_free;  */
@@ -106,35 +110,60 @@ PyTypeObject BinaryPredicate0D_Type = {
 };
 
 //-------------------MODULE INITIALIZATION--------------------------------
-PyObject *BinaryPredicate0D_Init( void )
+PyMODINIT_FUNC BinaryPredicate0D_Init( PyObject *module )
 {
-	PyObject *submodule;
-	
+	if( module == NULL )
+		return;
+
 	if( PyType_Ready( &BinaryPredicate0D_Type ) < 0 )
-		return NULL;
-	
-	submodule = Py_InitModule3( "Blender.Freestyle.BinaryPredicate0D", M_BinaryPredicate0D_methods, M_BinaryPredicate0D_doc );
-	
-	return submodule;
+		return;
+
+	Py_INCREF( &BinaryPredicate0D_Type );
+	PyModule_AddObject(module, "BinaryPredicate0D", (PyObject *)&BinaryPredicate0D_Type);
 }
 
 //------------------------INSTANCE METHODS ----------------------------------
 
-PyObject *BinaryPredicate0D_getName( BPy_BinaryPredicate0D *self, PyObject *args)
+PyObject * BinaryPredicate0D___new__(PyTypeObject *type, PyObject *args, PyObject *kwds)
+{
+    BPy_BinaryPredicate0D *self;
+
+    self = (BPy_BinaryPredicate0D *)type->tp_alloc(type, 0);
+    if (self != NULL) {
+        self->bp0D = new BinaryPredicate0D();
+    }
+
+    return (PyObject *)self;
+}
+
+void BinaryPredicate0D___dealloc__(BPy_BinaryPredicate0D* self)
+{
+	delete self->bp0D;
+    self->ob_type->tp_free((PyObject*)self);
+}
+
+PyObject * BinaryPredicate0D___repr__(BPy_BinaryPredicate0D* self)
+{
+    return PyString_FromFormat("type: %s - address: %p", self->bp0D->getName().c_str(), self->bp0D );
+}
+
+
+PyObject * BinaryPredicate0D_getName( BPy_BinaryPredicate0D *self, PyObject *args)
 {
 	return PyString_FromString( self->bp0D->getName().c_str() );
 }
 
-PyObject *BinaryPredicate0D___call__( BPy_BinaryPredicate0D *self, PyObject *args)
+PyObject * BinaryPredicate0D___call__( BPy_BinaryPredicate0D *self, PyObject *args)
 {
-	BPy_BinaryPredicate0D *obj1;
-	BPy_Interface0D *obj2, *obj3;
+	BPy_Interface0D *obj1, *obj2;
 	bool b;
 
-	if (!PyArg_ParseTuple(args,(char *)"OOO:BinaryPredicate0D___call__", &obj1, obj2, &obj3))
+	if( !PyArg_ParseTuple(args,(char *)"OO:BinaryPredicate0D___call__", &obj1, obj2) ) {
 		cout << "ERROR: BinaryPredicate0D___call__ " << endl;		
+		return NULL;
+	}
 	
-	b = self->bp0D->operator()( *(obj2->if0D) , *(obj3->if0D) );
+	b = self->bp0D->operator()( *(obj1->if0D) , *(obj2->if0D) );
 	return PyBool_from_bool( b );
 
 }
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate0D.h b/source/blender/freestyle/intern/python/BinaryPredicate0D.h
index 30467d2e565..6ad25ab2816 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate0D.h
+++ b/source/blender/freestyle/intern/python/BinaryPredicate0D.h
@@ -24,7 +24,7 @@ typedef struct {
 
 /*---------------------------Python BPy_BinaryPredicate0D visible prototypes-----------*/
 
-PyObject *BinaryPredicate0D_Init( void );
+PyMODINIT_FUNC BinaryPredicate0D_Init( PyObject *module );
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D.cpp
index d6a99d689bb..afdab7c08ed 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D.cpp
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D.cpp
@@ -9,33 +9,36 @@ extern "C" {
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
+/*---------------  Python API function prototypes for BinaryPredicate1D instance  -----------*/
+static PyObject * BinaryPredicate1D___new__(PyTypeObject *type, PyObject *args, PyObject *kwds);
+static void BinaryPredicate1D___dealloc__(BPy_BinaryPredicate1D *self);
+static PyObject * BinaryPredicate1D___repr__(BPy_BinaryPredicate1D *self);
 
-/*-----------------------Python API function prototypes for the BinaryPredicate1D module--*/
-//static PyObject *Freestyle_testOutput( BPy_Freestyle * self );
-/*-----------------------BinaryPredicate1D module doc strings-----------------------------*/
-static char M_BinaryPredicate1D_doc[] = "The Blender.Freestyle.BinaryPredicate1D submodule";
-/*----------------------BinaryPredicate1D module method def----------------------------*/
-struct PyMethodDef M_BinaryPredicate1D_methods[] = {
-//	{"testOutput", ( PyCFunction ) Freestyle_testOutput, METH_NOARGS, "() - Return Curve Data name"},
+static PyObject * BinaryPredicate1D_getName( BPy_BinaryPredicate1D *self, PyObject *args);
+static PyObject * BinaryPredicate1D___call__( BPy_BinaryPredicate1D *self, PyObject *args);
+
+/*----------------------BinaryPredicate1D instance definitions ----------------------------*/
+static PyMethodDef BPy_BinaryPredicate1D_methods[] = {
+	{"getName", ( PyCFunction ) BinaryPredicate1D_getName, METH_NOARGS, "（ ）Returns the string of the name of the binary predicate."},
+	{"__call__", ( PyCFunction ) BinaryPredicate1D___call__, METH_VARARGS, "BinaryPredicate1D（Interface1D, Interface1D ）. Must be overloaded by inherited classes. It evaluates a relation between two Interface1D." },
 	{NULL, NULL, 0, NULL}
 };
 
-/*-----------------------BPy_Freestyle method def------------------------------*/
-
+/*-----------------------BPy_BinaryPredicate1D type definition ------------------------------*/
 PyTypeObject BinaryPredicate1D_Type = {
 	PyObject_HEAD_INIT( NULL ) 
-	0,							/* ob_size */
+	0,									/* ob_size */
 	"BinaryPredicate1D",				/* tp_name */
 	sizeof( BPy_BinaryPredicate1D ),	/* tp_basicsize */
-	0,							/* tp_itemsize */
+	0,									/* tp_itemsize */
 	
 	/* methods */
-	NULL,						/* tp_dealloc */
-	NULL,                       /* printfunc tp_print; */
-	NULL,                       /* getattrfunc tp_getattr; */
-	NULL,                       /* setattrfunc tp_setattr; */
-	NULL,						/* tp_compare */
-	NULL,						/* tp_repr */
+	(destructor)BinaryPredicate1D___dealloc__,		/* tp_dealloc */
+	NULL,                       					/* printfunc tp_print; */
+	NULL,                       					/* getattrfunc tp_getattr; */
+	NULL,                       					/* setattrfunc tp_setattr; */
+	NULL,											/* tp_compare */
+	(reprfunc)BinaryPredicate1D___repr__,						/* tp_repr */
 
 	/* Method suites for standard classes */
 
@@ -78,17 +81,17 @@ PyTypeObject BinaryPredicate1D_Type = {
 	NULL,                       /* iternextfunc tp_iternext; */
 
   /*** Attribute descriptor and subclassing stuff ***/
-	NULL,						/* struct PyMethodDef *tp_methods; */
-	NULL,                       /* struct PyMemberDef *tp_members; */
-	NULL,         				/* struct PyGetSetDef *tp_getset; */
-	NULL,                       /* struct _typeobject *tp_base; */
-	NULL,                       /* PyObject *tp_dict; */
-	NULL,                       /* descrgetfunc tp_descr_get; */
-	NULL,                       /* descrsetfunc tp_descr_set; */
-	0,                          /* long tp_dictoffset; */
-	NULL,                       /* initproc tp_init; */
-	NULL,                       /* allocfunc tp_alloc; */
-	NULL,                       /* newfunc tp_new; */
+	BPy_BinaryPredicate1D_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,							/*  struct PyMemberDef *tp_members; */
+	NULL,							/*  struct PyGetSetDef *tp_getset; */
+	NULL,							/*  struct _typeobject *tp_base; */
+	NULL,                       	/* PyObject *tp_dict; */
+	NULL,                       	/* descrgetfunc tp_descr_get; */
+	NULL,                       	/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	NULL,                       	/* initproc tp_init; */
+	NULL,                       	/* allocfunc tp_alloc; */
+	BinaryPredicate1D___new__,		/* newfunc tp_new; */
 	
 	/*  Low-level free-memory routine */
 	NULL,                       /* freefunc tp_free;  */
@@ -106,20 +109,44 @@ PyTypeObject BinaryPredicate1D_Type = {
 };
 
 //-------------------MODULE INITIALIZATION--------------------------------
-PyObject *BinaryPredicate1D_Init( void )
+PyMODINIT_FUNC BinaryPredicate1D_Init( PyObject *module )
 {
-	PyObject *submodule;
-	
+	if( module == NULL )
+		return;
+
 	if( PyType_Ready( &BinaryPredicate1D_Type ) < 0 )
-		return NULL;
-	
-	submodule = Py_InitModule3( "Blender.Freestyle.BinaryPredicate1D", M_BinaryPredicate1D_methods, M_BinaryPredicate1D_doc );
-	
-	return submodule;
+		return;
+
+	Py_INCREF( &BinaryPredicate1D_Type );
+	PyModule_AddObject(module, "BinaryPredicate1D", (PyObject *)&BinaryPredicate1D_Type);
 }
 
+
 //------------------------INSTANCE METHODS ----------------------------------
 
+PyObject * BinaryPredicate1D___new__(PyTypeObject *type, PyObject *args, PyObject *kwds)
+{
+    BPy_BinaryPredicate1D *self;
+
+    self = (BPy_BinaryPredicate1D *)type->tp_alloc(type, 0);
+    if (self != NULL) {
+        self->bp1D = new BinaryPredicate1D();
+    }
+
+    return (PyObject *)self;
+}
+
+void BinaryPredicate1D___dealloc__(BPy_BinaryPredicate1D* self)
+{
+	delete self->bp1D;
+    self->ob_type->tp_free((PyObject*)self);
+}
+
+PyObject * BinaryPredicate1D___repr__(BPy_BinaryPredicate1D* self)
+{
+    return PyString_FromFormat("type: %s - address: %p", self->bp1D->getName().c_str(), self->bp1D );
+}
+
 PyObject *BinaryPredicate1D_getName( BPy_BinaryPredicate1D *self, PyObject *args)
 {
 	return PyString_FromString( self->bp1D->getName().c_str() );
@@ -127,14 +154,15 @@ PyObject *BinaryPredicate1D_getName( BPy_BinaryPredicate1D *self, PyObject *args
 
 PyObject *BinaryPredicate1D___call__( BPy_BinaryPredicate1D *self, PyObject *args)
 {
-	BPy_BinaryPredicate1D *obj1;
-	BPy_Interface1D *obj2, *obj3;
+	BPy_Interface1D *obj1, *obj2;
 	bool b;
 	
-	if (!PyArg_ParseTuple(args,(char *)"OOO:BinaryPredicate1D___call__", &obj1, &obj2, &obj3))
+	if( !PyArg_ParseTuple(args,(char *)"OO:BinaryPredicate1D___call__", &obj1, &obj2) ) {
 		cout << "ERROR: BinaryPredicate1D___call__ " << endl;		
+		return NULL;
+	}
 	
-	b = self->bp1D->operator()( *(obj2->if1D) , *(obj3->if1D) );
+	b = self->bp1D->operator()( *(obj1->if1D) , *(obj2->if1D) );
 	return PyBool_from_bool( b );
 }
 
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D.h b/source/blender/freestyle/intern/python/BinaryPredicate1D.h
index d401c585197..2745ca6fc3f 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D.h
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D.h
@@ -24,8 +24,7 @@ typedef struct {
 
 /*---------------------------Python BPy_BinaryPredicate1D visible prototypes-----------*/
 
-PyObject *BinaryPredicate1D_Init( void );
-
+PyMODINIT_FUNC BinaryPredicate1D_Init( PyObject *module );
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/source/blender/freestyle/intern/python/Convert.cpp b/source/blender/freestyle/intern/python/Convert.cpp
index c8ceddaf98b..d87848cde8e 100644
--- a/source/blender/freestyle/intern/python/Convert.cpp
+++ b/source/blender/freestyle/intern/python/Convert.cpp
@@ -32,7 +32,7 @@ PyObject *PyBool_from_bool( bool b ){
 PyObject *Vector_from_Vec2f( Vec2f vec ) {
 	float vec_data[2]; // because vec->_coord is protected
 	vec_data[0] = vec.x();		vec_data[1] = vec.y();
-	return newVectorObject( vec_data, 3, Py_NEW);
+	return newVectorObject( vec_data, 2, Py_NEW);
 }
 
 PyObject *Vector_from_Vec3f( Vec3f vec ) {
@@ -47,6 +47,16 @@ PyObject *Vector_from_Vec3r( Vec3r vec ) {
 	return newVectorObject( vec_data, 3, Py_NEW);
 }
 
+PyObject *BPy_Id_from_Id( Id id ) {
+	BPy_Id *py_id;
+	
+	py_id = (BPy_Id *) Id_Type.tp_new( &Id_Type, 0, 0 );
+	py_id->id->setFirst( id.getFirst() );
+	py_id->id->setSecond( id.getSecond() );
+	
+	return (PyObject *)py_id;
+}
+
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/Convert.h b/source/blender/freestyle/intern/python/Convert.h
index d1bac93734a..a2e7eeafd94 100644
--- a/source/blender/freestyle/intern/python/Convert.h
+++ b/source/blender/freestyle/intern/python/Convert.h
@@ -4,6 +4,8 @@
 #include "../geometry/Geom.h"
 using namespace Geometry;
 
+#include "Id.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -22,6 +24,8 @@ PyObject *Vector_from_Vec2f( Vec2f v );
 PyObject *Vector_from_Vec3f( Vec3f v );
 PyObject *Vector_from_Vec3r( Vec3r v );
 
+PyObject *BPy_Id_from_Id( Id id );
+
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/Freestyle.cpp b/source/blender/freestyle/intern/python/Freestyle.cpp
index e3a5cf91117..93d01b29040 100644
--- a/source/blender/freestyle/intern/python/Freestyle.cpp
+++ b/source/blender/freestyle/intern/python/Freestyle.cpp
@@ -111,22 +111,22 @@ PyTypeObject Freestyle_Type = {
 //-------------------MODULE INITIALIZATION--------------------------------
 PyObject *Freestyle_Init( void )
 {
-	PyObject *submodule;
-	PyObject *dict;
+	PyObject *module;
 	
 	if( PyType_Ready( &Freestyle_Type ) < 0 )
 		return NULL;
 	
-	submodule = Py_InitModule3( "Blender.Freestyle", M_Freestyle_methods, M_Freestyle_doc );
-
-	dict = PyModule_GetDict( submodule );
-	PyDict_SetItemString( dict, "BinaryPredicate0D", BinaryPredicate0D_Init() );
-	PyDict_SetItemString( dict, "BinaryPredicate1D", BinaryPredicate1D_Init() );
-	PyDict_SetItemString( dict, "Interface0D", Interface0D_Init() );
-	PyDict_SetItemString( dict, "Interface1D", Interface1D_Init() );
-	PyDict_SetItemString( dict, "Id", Id_Init() );
+	// initialize modules
+	module = Py_InitModule3( "Blender.Freestyle", M_Freestyle_methods, M_Freestyle_doc );
 	
-	return submodule;
+	// attach its classes (adding the object types to the module)
+	BinaryPredicate0D_Init( module );
+	BinaryPredicate1D_Init( module );
+	Id_Init( module );
+	Interface0D_Init( module );
+	Interface1D_Init( module );
+	
+	return module;
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/Id.cpp b/source/blender/freestyle/intern/python/Id.cpp
index a835efa78f7..1f862df0204 100644
--- a/source/blender/freestyle/intern/python/Id.cpp
+++ b/source/blender/freestyle/intern/python/Id.cpp
@@ -8,33 +8,48 @@ extern "C" {
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
+/*---------------  Python API function prototypes for Id instance  -----------*/
+static PyObject * Id___new__(PyTypeObject *type, PyObject *args, PyObject *kwds);
+static void Id___dealloc__(BPy_Id *self);
+static int Id___init__(BPy_Id *self, PyObject *args, PyObject *kwds);
+static PyObject * Id___repr__(BPy_Id* self);
 
-/*-----------------------Python API function prototypes for the Id module--*/
-//static PyObject *Freestyle_testOutput( BPy_Freestyle * self );
-/*-----------------------Id module doc strings-----------------------------*/
-static char M_Id_doc[] = "The Blender.Freestyle.Id submodule";
-/*----------------------Id module method def----------------------------*/
-struct PyMethodDef M_Id_methods[] = {
-//	{"testOutput", ( PyCFunction ) Freestyle_testOutput, METH_NOARGS, "() - Return Curve Data name"},
+static PyObject * Id_getFirst( BPy_Id *self );
+static PyObject * Id_getSecond( BPy_Id *self);
+static PyObject * Id_setFirst( BPy_Id *self , PyObject *args);
+static PyObject * Id_setSecond( BPy_Id *self , PyObject *args);
+static PyObject * Id___eq__( BPy_Id *self , PyObject *args);
+static PyObject * Id___ne__( BPy_Id *self , PyObject *args);
+static PyObject * Id___lt__( BPy_Id *self , PyObject *args);
+
+/*----------------------Id instance definitions ----------------------------*/
+static PyMethodDef BPy_Id_methods[] = {
+	{"getFirst", ( PyCFunction ) Id_getFirst, METH_NOARGS, "Returns the first Id number"},
+	{"getSecond", ( PyCFunction ) Id_getSecond, METH_NOARGS, "Returns the second Id number" },
+	{"setFirst", ( PyCFunction ) Id_setFirst, METH_VARARGS, "Sets the first number constituing the Id" },
+	{"setSecond", ( PyCFunction ) Id_setSecond, METH_VARARGS, "Sets the second number constituing the Id" },
+	{"__eq__", ( PyCFunction ) Id___eq__, METH_VARARGS, "Operator ==" },
+	{"__ne__", ( PyCFunction ) Id___ne__, METH_VARARGS, "Operator !=" },
+	{"__lt__", ( PyCFunction ) Id___lt__, METH_VARARGS, "Operator <" },
 	{NULL, NULL, 0, NULL}
 };
 
-/*-----------------------BPy_Freestyle method def------------------------------*/
+/*-----------------------BPy_Id type definition ------------------------------*/
 
 PyTypeObject Id_Type = {
 	PyObject_HEAD_INIT( NULL ) 
 	0,							/* ob_size */
-	"Id",				/* tp_name */
-	sizeof( BPy_Id ),	/* tp_basicsize */
+	"Id",						/* tp_name */
+	sizeof( BPy_Id ),			/* tp_basicsize */
 	0,							/* tp_itemsize */
 	
 	/* methods */
-	NULL,						/* tp_dealloc */
+	(destructor)Id___dealloc__,	/* tp_dealloc */
 	NULL,                       /* printfunc tp_print; */
 	NULL,                       /* getattrfunc tp_getattr; */
 	NULL,                       /* setattrfunc tp_setattr; */
 	NULL,						/* tp_compare */
-	NULL,						/* tp_repr */
+	(reprfunc)Id___repr__,				/* tp_repr */
 
 	/* Method suites for standard classes */
 
@@ -77,17 +92,17 @@ PyTypeObject Id_Type = {
 	NULL,                       /* iternextfunc tp_iternext; */
 
   /*** Attribute descriptor and subclassing stuff ***/
-	NULL,						/* struct PyMethodDef *tp_methods; */
-	NULL,                       /* struct PyMemberDef *tp_members; */
-	NULL,         				/* struct PyGetSetDef *tp_getset; */
-	NULL,                       /* struct _typeobject *tp_base; */
-	NULL,                       /* PyObject *tp_dict; */
-	NULL,                       /* descrgetfunc tp_descr_get; */
-	NULL,                       /* descrsetfunc tp_descr_set; */
-	0,                          /* long tp_dictoffset; */
-	NULL,                       /* initproc tp_init; */
-	NULL,                       /* allocfunc tp_alloc; */
-	NULL,                       /* newfunc tp_new; */
+	BPy_Id_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	NULL,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)Id___init__,           /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	Id___new__,						/* newfunc tp_new; */
 	
 	/*  Low-level free-memory routine */
 	NULL,                       /* freefunc tp_free;  */
@@ -105,20 +120,57 @@ PyTypeObject Id_Type = {
 };
 
 //-------------------MODULE INITIALIZATION--------------------------------
-PyObject *Id_Init( void )
+PyMODINIT_FUNC Id_Init( PyObject *module )
 {
-	PyObject *submodule;
-	
+	if( module == NULL )
+		return;
+
 	if( PyType_Ready( &Id_Type ) < 0 )
-		return NULL;
-	
-	submodule = Py_InitModule3( "Blender.Freestyle.Id", M_Id_methods, M_Id_doc );
-	
-	return submodule;
+		return;
+
+	Py_INCREF( &Id_Type );
+	PyModule_AddObject(module, "Id", (PyObject *)&Id_Type);
 }
 
 //------------------------INSTANCE METHODS ----------------------------------
 
+PyObject * Id___new__(PyTypeObject *type, PyObject *args, PyObject *kwds)
+{
+    BPy_Id *self;
+
+    self = (BPy_Id *)type->tp_alloc(type, 0);
+    if (self != NULL) {
+        self->id = new Id();
+    }
+
+    return (PyObject *)self;
+}
+
+void Id___dealloc__(BPy_Id* self)
+{
+	delete self->id;
+    self->ob_type->tp_free((PyObject*)self);
+}
+
+int Id___init__(BPy_Id *self, PyObject *args, PyObject *kwds)
+{
+    int first = 0, second = 0;
+    static char *kwlist[] = {"first", "second", NULL};
+
+    if (! PyArg_ParseTupleAndKeywords(args, kwds, "|ii", kwlist, &first, &second) )
+        return -1;
+
+	self->id->setFirst( first );
+	self->id->setSecond( second );
+
+    return 0;
+}
+
+PyObject * Id___repr__(BPy_Id* self)
+{
+    return PyString_FromFormat("[ first: %i, second: %i ](BPy_Id)", self->id->getFirst(), self->id->getSecond() );
+}
+
 PyObject *Id_getFirst( BPy_Id *self ) {
 	return PyInt_FromLong( self->id->getFirst() );
 }
@@ -130,14 +182,13 @@ PyObject *Id_getSecond( BPy_Id *self) {
 
 
 PyObject *Id_setFirst( BPy_Id *self , PyObject *args) {
-	PyObject * obj1 = 0 ;
-	PyObject * obj2 = 0 ;
 	unsigned int i;
 
-	if( !PyArg_ParseTuple(args, (char *)"OO:Id_setFirst", &obj1, &obj2) )
+	if( !PyArg_ParseTuple(args, (char *)"i:Id_setFirst", i) ) {
 		cout << "ERROR: Id_setFirst" << endl;
+		Py_RETURN_NONE;
+	}
 
-	i = static_cast<unsigned int>( PyInt_AsLong(obj2) );
 	self->id->setFirst( i );
 
 	Py_RETURN_NONE;
@@ -145,48 +196,50 @@ PyObject *Id_setFirst( BPy_Id *self , PyObject *args) {
 
 
 PyObject *Id_setSecond( BPy_Id *self , PyObject *args) {
-	PyObject * obj1 = 0 ;
-	PyObject * obj2 = 0 ;
 	unsigned int i;
 
-	if( !PyArg_ParseTuple(args, (char *)"OO:Id_setSecond", &obj1, &obj2) )
+	if( !PyArg_ParseTuple(args, (char *)"i:Id_setSecond", i) ) {
 		cout << "ERROR: Id_setSecond" << endl;
+		Py_RETURN_NONE;
+	}
 
-	i = static_cast<unsigned int>( PyInt_AsLong(obj2) );
 	self->id->setSecond( i );
 
 	Py_RETURN_NONE;
 }
 
 PyObject *Id___eq__( BPy_Id *self , PyObject *args) {
-	BPy_Id * obj1 = 0 ;
-	BPy_Id * obj2 = 0 ;
+	BPy_Id * other = 0 ;
 
-	if( !PyArg_ParseTuple(args, (char *)"OO:Id___eq__", &obj1, &obj2) )
+	if( !PyArg_ParseTuple(args, (char *)"O:Id___eq__", &other) ) {
 		cout << "ERROR: Id___eq__" << endl;
+		Py_RETURN_NONE;
+	}
 	
-	return PyBool_from_bool( obj1->id == obj2->id );
+	return PyBool_from_bool( self->id == other->id );
 }
 
 
-PyObject *Id___ne__(PyObject *self , PyObject *args) {
-	BPy_Id * obj1 = 0 ;
-	BPy_Id * obj2 = 0 ;
+PyObject *Id___ne__(BPy_Id *self , PyObject *args) {
+	BPy_Id * other = 0 ;
 
-	if( !PyArg_ParseTuple(args, (char *)"OO:Id___ne__", &obj1, &obj2) )
+	if( !PyArg_ParseTuple(args, (char *)"O:Id___ne__", &other) ) {
 		cout << "ERROR: Id___ne__" << endl;
-
-	return PyBool_from_bool( obj1->id != obj2->id );
+		Py_RETURN_NONE;
+	}
+	
+	return PyBool_from_bool( self->id != other->id );
 }
 
-PyObject *Id___lt__(PyObject *self , PyObject *args) {
-	BPy_Id * obj1 = 0 ;
-	BPy_Id * obj2 = 0 ;
+PyObject *Id___lt__(BPy_Id *self , PyObject *args) {
+	BPy_Id * other = 0 ;
 
-	if( !PyArg_ParseTuple(args, (char *)"OO:Id___lt__", &obj1, &obj2) )
+	if( !PyArg_ParseTuple(args, (char *)"O:Id___lt__", &other) ) {
 		cout << "ERROR: Id___lt__" << endl;
-
-	return PyBool_from_bool( obj1->id < obj2->id );
+		Py_RETURN_NONE;
+	}
+	
+	return PyBool_from_bool( self->id <= other->id );
 }
 
 
diff --git a/source/blender/freestyle/intern/python/Id.h b/source/blender/freestyle/intern/python/Id.h
index 032f35f7094..608ff3eef99 100644
--- a/source/blender/freestyle/intern/python/Id.h
+++ b/source/blender/freestyle/intern/python/Id.h
@@ -27,8 +27,7 @@ typedef struct {
 
 /*---------------------------Python BPy_Id visible prototypes-----------*/
 
-PyObject *Id_Init( void );
-
+PyMODINIT_FUNC Id_Init( PyObject *module );
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/source/blender/freestyle/intern/python/Interface0D.cpp b/source/blender/freestyle/intern/python/Interface0D.cpp
index e09e0447aa7..47b9b28839f 100644
--- a/source/blender/freestyle/intern/python/Interface0D.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D.cpp
@@ -8,18 +8,42 @@ extern "C" {
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
+/*---------------  Python API function prototypes for Interface0D instance  -----------*/
+static PyObject * Interface0D___new__(PyTypeObject *type, PyObject *args, PyObject *kwds);
+static void Interface0D___dealloc__(BPy_Interface0D *self);
+static PyObject * Interface0D___repr__(BPy_Interface0D *self);
 
-/*-----------------------Python API function prototypes for the Interface0D module--*/
-//static PyObject *Freestyle_testOutput( BPy_Freestyle * self );
-/*-----------------------Interface0D module doc strings-----------------------------*/
-static char M_Interface0D_doc[] = "The Blender.Freestyle.Interface0D submodule";
-/*----------------------Interface0D module method def----------------------------*/
-struct PyMethodDef M_Interface0D_methods[] = {
-//	{"testOutput", ( PyCFunction ) Freestyle_testOutput, METH_NOARGS, "() - Return Curve Data name"},
+static PyObject *Interface0D_getExactTypeName( BPy_Interface0D *self );
+static PyObject *Interface0D_getX( BPy_Interface0D *self );
+static PyObject *Interface0D_getY( BPy_Interface0D *self );
+static PyObject *Interface0D_getZ( BPy_Interface0D *self );
+static PyObject *Interface0D_getPoint3D( BPy_Interface0D *self );
+static PyObject *Interface0D_getProjectedX( BPy_Interface0D *self );
+static PyObject *Interface0D_getProjectedY( BPy_Interface0D *self );
+static PyObject *Interface0D_getProjectedZ( BPy_Interface0D *self );
+static PyObject *Interface0D_getPoint2D( BPy_Interface0D *self );
+static PyObject *Interface0D_getFEdge( BPy_Interface0D *self );
+static PyObject *Interface0D_getId( BPy_Interface0D *self );
+static PyObject *Interface0D_getNature( BPy_Interface0D *self ); 
+
+/*----------------------Interface0D instance definitions ----------------------------*/
+static PyMethodDef BPy_Interface0D_methods[] = {
+	{"getExactTypeName", ( PyCFunction ) Interface0D_getExactTypeName, METH_NOARGS, "（ ）Returns the string of the name of the interface."},
+	{"getX", ( PyCFunction ) Interface0D_getX, METH_NOARGS, "（ ）Returns the 3D x coordinate of the point. "},
+	{"getY", ( PyCFunction ) Interface0D_getY, METH_NOARGS, "（ ）Returns the 3D y coordinate of the point. "},
+	{"getZ", ( PyCFunction ) Interface0D_getZ, METH_NOARGS, "（ ）Returns the 3D z coordinate of the point. "},
+	{"getPoint3D", ( PyCFunction ) Interface0D_getPoint3D, METH_NOARGS, "() Returns the 3D point."},
+	{"getProjectedX", ( PyCFunction ) Interface0D_getProjectedX, METH_NOARGS, "() Returns the 2D x coordinate of the point."},
+	{"getProjectedY", ( PyCFunction ) Interface0D_getProjectedY, METH_NOARGS, "() Returns the 2D y coordinate of the point."},
+	{"getProjectedZ", ( PyCFunction ) Interface0D_getProjectedZ, METH_NOARGS, "() Returns the 2D z coordinate of the point."},
+	{"getPoint2D", ( PyCFunction ) Interface0D_getPoint2D, METH_NOARGS, "() Returns the 2D point."},
+	{"getFEdge", ( PyCFunction ) Interface0D_getFEdge, METH_NOARGS, "() Returns the FEdge that lies between this Interface0D and the Interface0D given as argument."},
+	{"getId", ( PyCFunction ) Interface0D_getId, METH_NOARGS, "() Returns the Id of the point."},
+	{"getNature", ( PyCFunction ) Interface0D_getNature, METH_NOARGS, "() Returns the nature of the point."},	
 	{NULL, NULL, 0, NULL}
 };
 
-/*-----------------------BPy_Freestyle method def------------------------------*/
+/*-----------------------BPy_Interface0D type definition ------------------------------*/
 
 PyTypeObject Interface0D_Type = {
 	PyObject_HEAD_INIT( NULL ) 
@@ -29,12 +53,12 @@ PyTypeObject Interface0D_Type = {
 	0,							/* tp_itemsize */
 	
 	/* methods */
-	NULL,						/* tp_dealloc */
-	NULL,                       /* printfunc tp_print; */
-	NULL,                       /* getattrfunc tp_getattr; */
-	NULL,                       /* setattrfunc tp_setattr; */
-	NULL,						/* tp_compare */
-	NULL,						/* tp_repr */
+	(destructor)Interface0D___dealloc__,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	(reprfunc)Interface0D___repr__,					/* tp_repr */
 
 	/* Method suites for standard classes */
 
@@ -77,17 +101,17 @@ PyTypeObject Interface0D_Type = {
 	NULL,                       /* iternextfunc tp_iternext; */
 
   /*** Attribute descriptor and subclassing stuff ***/
-	NULL,						/* struct PyMethodDef *tp_methods; */
-	NULL,                       /* struct PyMemberDef *tp_members; */
-	NULL,         				/* struct PyGetSetDef *tp_getset; */
-	NULL,                       /* struct _typeobject *tp_base; */
-	NULL,                       /* PyObject *tp_dict; */
-	NULL,                       /* descrgetfunc tp_descr_get; */
-	NULL,                       /* descrsetfunc tp_descr_set; */
-	0,                          /* long tp_dictoffset; */
-	NULL,                       /* initproc tp_init; */
-	NULL,                       /* allocfunc tp_alloc; */
-	NULL,                       /* newfunc tp_new; */
+	BPy_Interface0D_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	NULL,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	NULL,                       	/* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	(newfunc)Interface0D___new__,		/* newfunc tp_new; */
 	
 	/*  Low-level free-memory routine */
 	NULL,                       /* freefunc tp_free;  */
@@ -105,20 +129,43 @@ PyTypeObject Interface0D_Type = {
 };
 
 //-------------------MODULE INITIALIZATION--------------------------------
-PyObject *Interface0D_Init( void )
+PyMODINIT_FUNC Interface0D_Init( PyObject *module )
 {
-	PyObject *submodule;
-	
+	if( module == NULL )
+		return;
+
 	if( PyType_Ready( &Interface0D_Type ) < 0 )
-		return NULL;
-	
-	submodule = Py_InitModule3( "Blender.Freestyle.Interface0D", M_Interface0D_methods, M_Interface0D_doc );
-	
-	return submodule;
+		return;
+
+	Py_INCREF( &Interface0D_Type );
+	PyModule_AddObject(module, "Interface0D", (PyObject *)&Interface0D_Type);
 }
 
 //------------------------INSTANCE METHODS ----------------------------------
 
+PyObject * Interface0D___new__(PyTypeObject *type, PyObject *args, PyObject *kwds)
+{
+    BPy_Interface0D *self;
+
+    self = (BPy_Interface0D *)type->tp_alloc(type, 0);
+    if (self != NULL) {
+        self->if0D = new Interface0D();
+    }
+
+    return (PyObject *)self;
+}
+
+void Interface0D___dealloc__(BPy_Interface0D* self)
+{
+	delete self->if0D;
+    self->ob_type->tp_free((PyObject*)self);
+}
+
+PyObject * Interface0D___repr__(BPy_Interface0D* self)
+{
+    return PyString_FromFormat("type: %s - address: %p", self->if0D->getExactTypeName().c_str(), self->if0D );
+}
+
 PyObject *Interface0D_getExactTypeName( BPy_Interface0D *self ) {
 	return PyString_FromString( self->if0D->getExactTypeName().c_str() );	
 }
@@ -170,7 +217,7 @@ PyObject *Interface0D_getFEdge( BPy_Interface0D *self ) {
 
 
 PyObject *Interface0D_getId( BPy_Interface0D *self ) {
-	// Id
+	return BPy_Id_from_Id( self->if0D->getId() );
 }
 
 
diff --git a/source/blender/freestyle/intern/python/Interface0D.h b/source/blender/freestyle/intern/python/Interface0D.h
index e3e97cbaecd..10df1463da8 100644
--- a/source/blender/freestyle/intern/python/Interface0D.h
+++ b/source/blender/freestyle/intern/python/Interface0D.h
@@ -24,8 +24,7 @@ typedef struct {
 
 /*---------------------------Python BPy_Interface0D visible prototypes-----------*/
 
-PyObject *Interface0D_Init( void );
-
+PyMODINIT_FUNC Interface0D_Init( PyObject *module );
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/source/blender/freestyle/intern/python/Interface1D.cpp b/source/blender/freestyle/intern/python/Interface1D.cpp
index 65641c6c8ff..7511401198b 100644
--- a/source/blender/freestyle/intern/python/Interface1D.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D.cpp
@@ -8,18 +8,34 @@ extern "C" {
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
+/*---------------  Python API function prototypes for Interface1D instance  -----------*/
+static PyObject * Interface1D___new__(PyTypeObject *type, PyObject *args, PyObject *kwds);
+static void Interface1D___dealloc__(BPy_Interface1D *self);
+static PyObject * Interface1D___repr__(BPy_Interface1D *self);
 
-/*-----------------------Python API function prototypes for the Interface1D module--*/
-//static PyObject *Freestyle_testOutput( BPy_Freestyle * self );
-/*-----------------------Interface1D module doc strings-----------------------------*/
-static char M_Interface1D_doc[] = "The Blender.Freestyle.Interface1D submodule";
-/*----------------------Interface1D module method def----------------------------*/
-struct PyMethodDef M_Interface1D_methods[] = {
-//	{"testOutput", ( PyCFunction ) Freestyle_testOutput, METH_NOARGS, "() - Return Curve Data name"},
+static PyObject *Interface1D_getExactTypeName( BPy_Interface1D *self );
+static PyObject *Interface1D_getVertices( BPy_Interface1D *self );
+static PyObject *Interface1D_getPoints( BPy_Interface1D *self );
+static PyObject *Interface1D_getLength2D( BPy_Interface1D *self );
+static PyObject *Interface1D_getId( BPy_Interface1D *self );
+static PyObject *Interface1D_getNature( BPy_Interface1D *self );
+static PyObject *Interface1D_getTimeStamp( BPy_Interface1D *self );
+static PyObject *Interface1D_setTimeStamp( BPy_Interface1D *self, PyObject *args);
+
+/*----------------------Interface1D instance definitions ----------------------------*/
+static PyMethodDef BPy_Interface1D_methods[] = {
+	{"getExactTypeName", ( PyCFunction ) Interface1D_getExactTypeName, METH_NOARGS, "（ ）Returns the string of the name of the interface."},
+	{"getVertices", ( PyCFunction ) Interface1D_getVertices, METH_NOARGS, "Returns the vertices"},
+	{"getPoints", ( PyCFunction ) Interface1D_getPoints, METH_NOARGS, "Returns the points. The difference with getVertices() is that here we can iterate over points of the 1D element at any given sampling. At each call, a virtual point is created."},
+	{"getLength2D", ( PyCFunction ) Interface1D_getLength2D, METH_NOARGS, "Returns the 2D length of the 1D element"},
+	{"getId", ( PyCFunction ) Interface1D_getId, METH_NOARGS, "Returns the Id of the 1D element"},
+	{"getNature", ( PyCFunction ) Interface1D_getNature, METH_NOARGS, "Returns the nature of the 1D element"},
+	{"getTimeStamp", ( PyCFunction ) Interface1D_getTimeStamp, METH_NOARGS, "Returns the time stamp of the 1D element. Mainly used for selection"},
+	{"setTimeStamp", ( PyCFunction ) Interface1D_setTimeStamp, METH_VARARGS, "Sets the time stamp for the 1D element"},
 	{NULL, NULL, 0, NULL}
 };
 
-/*-----------------------BPy_Freestyle method def------------------------------*/
+/*-----------------------BPy_Interface1D type definition ------------------------------*/
 
 PyTypeObject Interface1D_Type = {
 	PyObject_HEAD_INIT( NULL ) 
@@ -29,12 +45,12 @@ PyTypeObject Interface1D_Type = {
 	0,							/* tp_itemsize */
 	
 	/* methods */
-	NULL,						/* tp_dealloc */
-	NULL,                       /* printfunc tp_print; */
-	NULL,                       /* getattrfunc tp_getattr; */
-	NULL,                       /* setattrfunc tp_setattr; */
-	NULL,						/* tp_compare */
-	NULL,						/* tp_repr */
+	(destructor)Interface1D___dealloc__,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	(reprfunc)Interface1D___repr__,					/* tp_repr */
 
 	/* Method suites for standard classes */
 
@@ -77,17 +93,17 @@ PyTypeObject Interface1D_Type = {
 	NULL,                       /* iternextfunc tp_iternext; */
 
   /*** Attribute descriptor and subclassing stuff ***/
-	NULL,						/* struct PyMethodDef *tp_methods; */
-	NULL,                       /* struct PyMemberDef *tp_members; */
-	NULL,         				/* struct PyGetSetDef *tp_getset; */
-	NULL,                       /* struct _typeobject *tp_base; */
-	NULL,                       /* PyObject *tp_dict; */
-	NULL,                       /* descrgetfunc tp_descr_get; */
-	NULL,                       /* descrsetfunc tp_descr_set; */
-	0,                          /* long tp_dictoffset; */
-	NULL,                       /* initproc tp_init; */
-	NULL,                       /* allocfunc tp_alloc; */
-	NULL,                       /* newfunc tp_new; */
+	BPy_Interface1D_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	NULL,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	NULL,                       	/* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	(newfunc)Interface1D___new__,		/* newfunc tp_new; */
 	
 	/*  Low-level free-memory routine */
 	NULL,                       /* freefunc tp_free;  */
@@ -105,31 +121,53 @@ PyTypeObject Interface1D_Type = {
 };
 
 //-------------------MODULE INITIALIZATION--------------------------------
-PyObject *Interface1D_Init( void )
+PyMODINIT_FUNC Interface1D_Init( PyObject *module )
 {
-	PyObject *submodule;
-	
+	if( module == NULL )
+		return;
+
 	if( PyType_Ready( &Interface1D_Type ) < 0 )
-		return NULL;
-	
-	submodule = Py_InitModule3( "Blender.Freestyle.Interface1D", M_Interface1D_methods, M_Interface1D_doc );
-	
-	return submodule;
+		return;
+
+	Py_INCREF( &Interface1D_Type );
+	PyModule_AddObject(module, "Interface1D", (PyObject *)&Interface1D_Type);
 }
 
 //------------------------INSTANCE METHODS ----------------------------------
 
+PyObject * Interface1D___new__(PyTypeObject *type, PyObject *args, PyObject *kwds)
+{
+    BPy_Interface1D *self;
+
+    self = (BPy_Interface1D *)type->tp_alloc(type, 0);
+    if (self != NULL) {
+        self->if1D = new Interface1D();
+    }
+
+    return (PyObject *)self;
+}
+
+void Interface1D___dealloc__(BPy_Interface1D* self)
+{
+	delete self->if1D;
+    self->ob_type->tp_free((PyObject*)self);
+}
+
+PyObject * Interface1D___repr__(BPy_Interface1D* self)
+{
+    return PyString_FromFormat("type: %s - address: %p", self->if1D->getExactTypeName().c_str(), self->if1D );
+}
 
 PyObject *Interface1D_getExactTypeName( BPy_Interface1D *self ) {
 	return PyString_FromString( self->if1D->getExactTypeName().c_str() );	
 }
 
 PyObject *Interface1D_getVertices( BPy_Interface1D *self ) {
-	// Vector
+	return PyList_New(0);
 }
 
 PyObject *Interface1D_getPoints( BPy_Interface1D *self ) {
-	// Vector
+	return PyList_New(0);
 }
 
 PyObject *Interface1D_getLength2D( BPy_Interface1D *self ) {
@@ -137,7 +175,7 @@ PyObject *Interface1D_getLength2D( BPy_Interface1D *self ) {
 }
 
 PyObject *Interface1D_getId( BPy_Interface1D *self ) {
-	// Id
+	return BPy_Id_from_Id( self->if1D->getId() );
 }
 
 PyObject *Interface1D_getNature( BPy_Interface1D *self ) {
@@ -149,14 +187,13 @@ PyObject *Interface1D_getTimeStamp( BPy_Interface1D *self ) {
 }
 
 PyObject *Interface1D_setTimeStamp( BPy_Interface1D *self, PyObject *args) {
-	PyObject * obj1 = 0 ;
-	PyObject * obj2 = 0 ;
-	unsigned int timestamp;
-	
-	if( !PyArg_ParseTuple(args, (char *)"OO:Interface1D_setTimeStamp", &obj1, &obj2) )
+	int timestamp = 0 ;
+
+	if( !PyArg_ParseTuple(args, (char *)"i:Interface1D_setTimeStamp", &timestamp) ) {
 		cout << "ERROR: Interface1D_setTimeStamp" << endl;
+		Py_RETURN_NONE;
+	}
 	
-	timestamp = static_cast<unsigned int>( PyInt_AsLong(obj2) );
 	self->if1D->setTimeStamp( timestamp );
 
 	Py_RETURN_NONE;
diff --git a/source/blender/freestyle/intern/python/Interface1D.h b/source/blender/freestyle/intern/python/Interface1D.h
index 7477d368372..f39203744e4 100644
--- a/source/blender/freestyle/intern/python/Interface1D.h
+++ b/source/blender/freestyle/intern/python/Interface1D.h
@@ -24,7 +24,7 @@ typedef struct {
 
 /*---------------------------Python BPy_Interface1D visible prototypes-----------*/
 
-PyObject *Interface1D_Init( void );
+PyMODINIT_FUNC Interface1D_Init( PyObject *module );
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/view_map/Interface1D.h b/source/blender/freestyle/intern/view_map/Interface1D.h
index 96dd94c36f9..8c75afc73df 100755
--- a/source/blender/freestyle/intern/view_map/Interface1D.h
+++ b/source/blender/freestyle/intern/view_map/Interface1D.h
@@ -139,11 +139,19 @@ public:
   /*! Returns an iterator over the Interface1D vertices,
    *  pointing to the first vertex.
    */
-  virtual Interface0DIterator verticesBegin() = 0;
+  virtual Interface0DIterator verticesBegin() {
+	    cerr << "Warning: method verticesBegin() not implemented" << endl;
+	    return Interface0DIterator();
+  }
+	
   /*! Returns an iterator over the Interface1D vertices,
    *  pointing after the last vertex.
    */
-  virtual Interface0DIterator verticesEnd() = 0;
+  virtual Interface0DIterator verticesEnd(){
+	    cerr << "Warning: method verticesEnd() not implemented" << endl;
+	    return Interface0DIterator();
+  }
+
   /*! Returns an iterator over the Interface1D points,
    *  pointing to the first point. The difference with
    *  verticesBegin() is that here we can iterate over
@@ -153,7 +161,11 @@ public:
    *    The sampling with which we want to iterate over points of
    *    this 1D element.
    */
-  virtual Interface0DIterator pointsBegin(float t=0.f) = 0;
+  virtual Interface0DIterator pointsBegin(float t=0.f) {
+	    cerr << "Warning: method pointsBegin() not implemented" << endl;
+	    return Interface0DIterator();
+  }
+
   /*! Returns an iterator over the Interface1D points,
    *  pointing after the last point. The difference with
    *  verticesEnd() is that here we can iterate over
@@ -163,7 +175,10 @@ public:
    *    The sampling with which we want to iterate over points of
    *    this 1D element.
    */
-  virtual Interface0DIterator pointsEnd(float t=0.f) = 0;
+  virtual Interface0DIterator pointsEnd(float t=0.f) {
+	    cerr << "Warning: method pointsEnd() not implemented" << endl;
+	    return Interface0DIterator();
+  }
 
   // Data access methods
 

From cc1a6b398da9bd2cec78c4242c5b205f079aa4a6 Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Tue, 15 Jul 2008 05:33:12 +0000
Subject: [PATCH 089/252] soc-2008-mxcurioni: reimplemented the
 initialization/allocation for base classes. The Python object type tp_new
 slot is now set to PyType_GenericNew, instead of the former custom functions.
 As a note, by default, Python does not set this slot: it is therefore
 mandatory for the base classes. For children classes, only __init__ is
 needed.

To make our base classes subclasses, the Py_TPFLAGS_BASETYPE flag was added to the object type tp_flags slot.

Finally, I began to implement CurvePoint, descendant of Interface0D. This commit allowed me to verify that my SWIG replacement method works: interfaces are well taken into account by children. For a test, use the following code:

================================

import Blender
from Blender import Freestyle
from Blender.Freestyle import *

print Interface0D()
print CurvePoint()

================================

The __repr__ method is only implemented in Interface0D:

PyObject * Interface0D___repr__(BPy_Interface0D* self)
{
   return PyString_FromFormat("type: %s - address: %p", self->if0D->getExactTypeName().c_str(), self->if0D );}

and the result is of the form:

type: Interface0D - address: 0x18e5ccc0
type: CurvePoint - address: 0x18e473f0

As you can see, the correct getExactTypeName of the class is called.
---
 source/blender/freestyle/SConscript           |   1 +
 .../intern/python/BinaryPredicate0D.cpp       |  21 +-
 .../intern/python/BinaryPredicate1D.cpp       |  20 +-
 .../freestyle/intern/python/Freestyle.cpp     |   2 +
 source/blender/freestyle/intern/python/Id.cpp |  34 +-
 .../freestyle/intern/python/Interface0D.cpp   |  26 +-
 .../intern/python/Interface0D/CurvePoint.cpp  | 402 ++++++++++--------
 .../intern/python/Interface0D/CurvePoint.h    |  31 ++
 .../freestyle/intern/python/Interface1D.cpp   |  20 +-
 9 files changed, 311 insertions(+), 246 deletions(-)
 create mode 100644 source/blender/freestyle/intern/python/Interface0D/CurvePoint.h

diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript
index 98a66e272be..f54c12470a6 100644
--- a/source/blender/freestyle/SConscript
+++ b/source/blender/freestyle/SConscript
@@ -66,6 +66,7 @@ python_sources = [
 					prefix + '/BinaryPredicate1D.cpp',
 					prefix + '/Id.cpp',
 					prefix + '/Interface0D.cpp',
+					prefix + '/Interface0D/CurvePoint.cpp',
 					prefix + '/Interface1D.cpp'
 				]
 
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate0D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate0D.cpp
index 107216a6b50..d76c1ba78ba 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate0D.cpp
+++ b/source/blender/freestyle/intern/python/BinaryPredicate0D.cpp
@@ -10,7 +10,7 @@ extern "C" {
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 /*---------------  Python API function prototypes for BinaryPredicate0D instance  -----------*/
-static PyObject * BinaryPredicate0D___new__(PyTypeObject *type, PyObject *args, PyObject *kwds);
+static int BinaryPredicate0D___init__(BPy_BinaryPredicate0D *self, PyObject *args, PyObject *kwds);
 static void BinaryPredicate0D___dealloc__(BPy_BinaryPredicate0D *self);
 static PyObject * BinaryPredicate0D___repr__(BPy_BinaryPredicate0D *self);
 
@@ -59,7 +59,7 @@ PyTypeObject BinaryPredicate0D_Type = {
 	NULL,                       /* PyBufferProcs *tp_as_buffer; */
 
   /*** Flags to define presence of optional/expanded features ***/
-	Py_TPFLAGS_DEFAULT, 		/* long tp_flags; */
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
 
 	NULL,                       /*  char *tp_doc;  Documentation string */
   /*** Assigned meaning in release 2.0 ***/
@@ -90,9 +90,9 @@ PyTypeObject BinaryPredicate0D_Type = {
 	NULL,							/* descrgetfunc tp_descr_get; */
 	NULL,							/* descrsetfunc tp_descr_set; */
 	0,                          	/* long tp_dictoffset; */
-	NULL,                       	/* initproc tp_init; */
+	(initproc)BinaryPredicate0D___init__, /* initproc tp_init; */
 	NULL,							/* allocfunc tp_alloc; */
-	(newfunc)BinaryPredicate0D___new__,		/* newfunc tp_new; */
+	PyType_GenericNew,		/* newfunc tp_new; */
 	
 	/*  Low-level free-memory routine */
 	NULL,                       /* freefunc tp_free;  */
@@ -124,16 +124,10 @@ PyMODINIT_FUNC BinaryPredicate0D_Init( PyObject *module )
 
 //------------------------INSTANCE METHODS ----------------------------------
 
-PyObject * BinaryPredicate0D___new__(PyTypeObject *type, PyObject *args, PyObject *kwds)
+int BinaryPredicate0D___init__(BPy_BinaryPredicate0D *self, PyObject *args, PyObject *kwds)
 {
-    BPy_BinaryPredicate0D *self;
-
-    self = (BPy_BinaryPredicate0D *)type->tp_alloc(type, 0);
-    if (self != NULL) {
-        self->bp0D = new BinaryPredicate0D();
-    }
-
-    return (PyObject *)self;
+	self->bp0D = new BinaryPredicate0D();
+	return 0;
 }
 
 void BinaryPredicate0D___dealloc__(BPy_BinaryPredicate0D* self)
@@ -142,6 +136,7 @@ void BinaryPredicate0D___dealloc__(BPy_BinaryPredicate0D* self)
     self->ob_type->tp_free((PyObject*)self);
 }
 
+
 PyObject * BinaryPredicate0D___repr__(BPy_BinaryPredicate0D* self)
 {
     return PyString_FromFormat("type: %s - address: %p", self->bp0D->getName().c_str(), self->bp0D );
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D.cpp
index afdab7c08ed..73d5a3a4232 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D.cpp
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D.cpp
@@ -10,7 +10,7 @@ extern "C" {
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 /*---------------  Python API function prototypes for BinaryPredicate1D instance  -----------*/
-static PyObject * BinaryPredicate1D___new__(PyTypeObject *type, PyObject *args, PyObject *kwds);
+static int BinaryPredicate1D___init__(BPy_BinaryPredicate1D *self, PyObject *args, PyObject *kwds);
 static void BinaryPredicate1D___dealloc__(BPy_BinaryPredicate1D *self);
 static PyObject * BinaryPredicate1D___repr__(BPy_BinaryPredicate1D *self);
 
@@ -58,7 +58,7 @@ PyTypeObject BinaryPredicate1D_Type = {
 	NULL,                       /* PyBufferProcs *tp_as_buffer; */
 
   /*** Flags to define presence of optional/expanded features ***/
-	Py_TPFLAGS_DEFAULT, 		/* long tp_flags; */
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
 
 	NULL,                       /*  char *tp_doc;  Documentation string */
   /*** Assigned meaning in release 2.0 ***/
@@ -89,9 +89,9 @@ PyTypeObject BinaryPredicate1D_Type = {
 	NULL,                       	/* descrgetfunc tp_descr_get; */
 	NULL,                       	/* descrsetfunc tp_descr_set; */
 	0,                          	/* long tp_dictoffset; */
-	NULL,                       	/* initproc tp_init; */
+	(initproc)BinaryPredicate1D___init__,                       	/* initproc tp_init; */
 	NULL,                       	/* allocfunc tp_alloc; */
-	BinaryPredicate1D___new__,		/* newfunc tp_new; */
+	PyType_GenericNew,		/* newfunc tp_new; */
 	
 	/*  Low-level free-memory routine */
 	NULL,                       /* freefunc tp_free;  */
@@ -124,16 +124,10 @@ PyMODINIT_FUNC BinaryPredicate1D_Init( PyObject *module )
 
 //------------------------INSTANCE METHODS ----------------------------------
 
-PyObject * BinaryPredicate1D___new__(PyTypeObject *type, PyObject *args, PyObject *kwds)
+int BinaryPredicate1D___init__(BPy_BinaryPredicate1D *self, PyObject *args, PyObject *kwds)
 {
-    BPy_BinaryPredicate1D *self;
-
-    self = (BPy_BinaryPredicate1D *)type->tp_alloc(type, 0);
-    if (self != NULL) {
-        self->bp1D = new BinaryPredicate1D();
-    }
-
-    return (PyObject *)self;
+	self->bp1D = new BinaryPredicate1D();
+	return 0;
 }
 
 void BinaryPredicate1D___dealloc__(BPy_BinaryPredicate1D* self)
diff --git a/source/blender/freestyle/intern/python/Freestyle.cpp b/source/blender/freestyle/intern/python/Freestyle.cpp
index 93d01b29040..9630aa38f80 100644
--- a/source/blender/freestyle/intern/python/Freestyle.cpp
+++ b/source/blender/freestyle/intern/python/Freestyle.cpp
@@ -4,8 +4,10 @@
 #include "BinaryPredicate1D.h"
 #include "Id.h"
 #include "Interface0D.h"
+#include "Interface0D/CurvePoint.h"
 #include "Interface1D.h"
 
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/source/blender/freestyle/intern/python/Id.cpp b/source/blender/freestyle/intern/python/Id.cpp
index 1f862df0204..3c769933dcc 100644
--- a/source/blender/freestyle/intern/python/Id.cpp
+++ b/source/blender/freestyle/intern/python/Id.cpp
@@ -9,9 +9,8 @@ extern "C" {
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 /*---------------  Python API function prototypes for Id instance  -----------*/
-static PyObject * Id___new__(PyTypeObject *type, PyObject *args, PyObject *kwds);
-static void Id___dealloc__(BPy_Id *self);
 static int Id___init__(BPy_Id *self, PyObject *args, PyObject *kwds);
+static void Id___dealloc__(BPy_Id *self);
 static PyObject * Id___repr__(BPy_Id* self);
 
 static PyObject * Id_getFirst( BPy_Id *self );
@@ -69,7 +68,7 @@ PyTypeObject Id_Type = {
 	NULL,                       /* PyBufferProcs *tp_as_buffer; */
 
   /*** Flags to define presence of optional/expanded features ***/
-	Py_TPFLAGS_DEFAULT, 		/* long tp_flags; */
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
 
 	NULL,                       /*  char *tp_doc;  Documentation string */
   /*** Assigned meaning in release 2.0 ***/
@@ -102,7 +101,7 @@ PyTypeObject Id_Type = {
 	0,                          	/* long tp_dictoffset; */
 	(initproc)Id___init__,           /* initproc tp_init; */
 	NULL,							/* allocfunc tp_alloc; */
-	Id___new__,						/* newfunc tp_new; */
+	PyType_GenericNew,						/* newfunc tp_new; */
 	
 	/*  Low-level free-memory routine */
 	NULL,                       /* freefunc tp_free;  */
@@ -134,24 +133,6 @@ PyMODINIT_FUNC Id_Init( PyObject *module )
 
 //------------------------INSTANCE METHODS ----------------------------------
 
-PyObject * Id___new__(PyTypeObject *type, PyObject *args, PyObject *kwds)
-{
-    BPy_Id *self;
-
-    self = (BPy_Id *)type->tp_alloc(type, 0);
-    if (self != NULL) {
-        self->id = new Id();
-    }
-
-    return (PyObject *)self;
-}
-
-void Id___dealloc__(BPy_Id* self)
-{
-	delete self->id;
-    self->ob_type->tp_free((PyObject*)self);
-}
-
 int Id___init__(BPy_Id *self, PyObject *args, PyObject *kwds)
 {
     int first = 0, second = 0;
@@ -160,12 +141,17 @@ int Id___init__(BPy_Id *self, PyObject *args, PyObject *kwds)
     if (! PyArg_ParseTupleAndKeywords(args, kwds, "|ii", kwlist, &first, &second) )
         return -1;
 
-	self->id->setFirst( first );
-	self->id->setSecond( second );
+	self->id = new Id( first, second );
 
     return 0;
 }
 
+void Id___dealloc__(BPy_Id* self)
+{
+	delete self->id;
+    self->ob_type->tp_free((PyObject*)self);
+}
+
 PyObject * Id___repr__(BPy_Id* self)
 {
     return PyString_FromFormat("[ first: %i, second: %i ](BPy_Id)", self->id->getFirst(), self->id->getSecond() );
diff --git a/source/blender/freestyle/intern/python/Interface0D.cpp b/source/blender/freestyle/intern/python/Interface0D.cpp
index 47b9b28839f..216dbaec1e9 100644
--- a/source/blender/freestyle/intern/python/Interface0D.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D.cpp
@@ -1,6 +1,7 @@
 #include "Interface0D.h"
 
 #include "Convert.h"
+#include "Interface0D/CurvePoint.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -9,7 +10,7 @@ extern "C" {
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 /*---------------  Python API function prototypes for Interface0D instance  -----------*/
-static PyObject * Interface0D___new__(PyTypeObject *type, PyObject *args, PyObject *kwds);
+static int Interface0D___init__(BPy_Interface0D *self, PyObject *args, PyObject *kwds);
 static void Interface0D___dealloc__(BPy_Interface0D *self);
 static PyObject * Interface0D___repr__(BPy_Interface0D *self);
 
@@ -78,7 +79,7 @@ PyTypeObject Interface0D_Type = {
 	NULL,                       /* PyBufferProcs *tp_as_buffer; */
 
   /*** Flags to define presence of optional/expanded features ***/
-	Py_TPFLAGS_DEFAULT, 		/* long tp_flags; */
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
 
 	NULL,                       /*  char *tp_doc;  Documentation string */
   /*** Assigned meaning in release 2.0 ***/
@@ -109,9 +110,9 @@ PyTypeObject Interface0D_Type = {
 	NULL,							/* descrgetfunc tp_descr_get; */
 	NULL,							/* descrsetfunc tp_descr_set; */
 	0,                          	/* long tp_dictoffset; */
-	NULL,                       	/* initproc tp_init; */
+	(initproc)Interface0D___init__,                       	/* initproc tp_init; */
 	NULL,							/* allocfunc tp_alloc; */
-	(newfunc)Interface0D___new__,		/* newfunc tp_new; */
+	PyType_GenericNew,		/* newfunc tp_new; */
 	
 	/*  Low-level free-memory routine */
 	NULL,                       /* freefunc tp_free;  */
@@ -136,23 +137,22 @@ PyMODINIT_FUNC Interface0D_Init( PyObject *module )
 
 	if( PyType_Ready( &Interface0D_Type ) < 0 )
 		return;
+		
+	if( PyType_Ready( &CurvePoint_Type ) < 0 )
+		return;
 
 	Py_INCREF( &Interface0D_Type );
 	PyModule_AddObject(module, "Interface0D", (PyObject *)&Interface0D_Type);
+	Py_INCREF( &CurvePoint_Type );
+	PyModule_AddObject(module, "CurvePoint", (PyObject *)&CurvePoint_Type);
 }
 
 //------------------------INSTANCE METHODS ----------------------------------
 
-PyObject * Interface0D___new__(PyTypeObject *type, PyObject *args, PyObject *kwds)
+int Interface0D___init__(BPy_Interface0D *self, PyObject *args, PyObject *kwds)
 {
-    BPy_Interface0D *self;
-
-    self = (BPy_Interface0D *)type->tp_alloc(type, 0);
-    if (self != NULL) {
-        self->if0D = new Interface0D();
-    }
-
-    return (PyObject *)self;
+	self->if0D = new Interface0D();
+	return 0;
 }
 
 void Interface0D___dealloc__(BPy_Interface0D* self)
diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp b/source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp
index 6591973f8b3..e360062b9d6 100644
--- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp
@@ -1,176 +1,238 @@
-PyObject *CurvePoint_getExactTypeName(PyObject *self , PyObject *args) {
+#include "CurvePoint.h"
+
+#include "../Convert.h"
+#include "../../stroke/Curve.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for CurvePoint instance  -----------*/
+static int CurvePoint___init__(BPy_CurvePoint *self, PyObject *args, PyObject *kwds);
+
+/*----------------------CurvePoint instance definitions ----------------------------*/
+static PyMethodDef BPy_CurvePoint_methods[] = {	
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_CurvePoint type definition ------------------------------*/
+
+PyTypeObject CurvePoint_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"CurvePoint",				/* tp_name */
+	sizeof( BPy_CurvePoint ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_CurvePoint_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&Interface0D_Type,				/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)CurvePoint___init__,                       	/* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int CurvePoint___init__(BPy_CurvePoint *self, PyObject *args, PyObject *kwds)
+{
+
+	self->py_if0D.if0D = new CurvePoint();
+	return 0;
 }
 
 
-PyObject *CurvePoint_getX(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_getY(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_getZ(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_getPoint3D(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_getProjectedX(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_getProjectedY(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_getProjectedZ(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_getPoint2D(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_getFEdge(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_getId(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_getNature(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_castToSVertex(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_castToViewVertex(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_castToNonTVertex(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_castToTVertex(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_CurvePoint__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_CurvePoint__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_CurvePoint__SWIG_2(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_CurvePoint__SWIG_3(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_CurvePoint(PyObject *self, PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_CurvePoint(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint___eq__(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_A(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_B(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_t2d(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_SetA(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_SetB(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_SetT2d(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_fedge(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_point2d(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_point3d(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_normal(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_shape(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_occluders_begin(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_occluders_end(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_occluders_empty(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_occluders_size(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_occludee(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_occluded_shape(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_occludee_empty(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_z_discontinuity(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_curvatureFredo(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_directionFredo(PyObject *self , PyObject *args) {
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
 }
+#endif
+
+
+ 
+// 
+//  PyObject *_wrap_new_CurvePoint__SWIG_0(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_new_CurvePoint__SWIG_1(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_new_CurvePoint__SWIG_2(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_new_CurvePoint__SWIG_3(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_new_CurvePoint(PyObject *self, PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_delete_CurvePoint(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+// PyObject *CurvePoint___eq__(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+// PyObject *CurvePoint_A(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+// PyObject *CurvePoint_B(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+// PyObject *CurvePoint_t2d(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+// PyObject *CurvePoint_SetA(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+// PyObject *CurvePoint_SetB(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+// PyObject *CurvePoint_SetT2d(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+// PyObject *CurvePoint_fedge(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+// PyObject *CurvePoint_point2d(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+// PyObject *CurvePoint_point3d(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+// PyObject *CurvePoint_normal(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+// PyObject *CurvePoint_shape(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+// PyObject *CurvePoint_occluders_begin(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+// PyObject *CurvePoint_occluders_end(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+// PyObject *CurvePoint_occluders_empty(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+// PyObject *CurvePoint_occluders_size(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+// PyObject *CurvePoint_occludee(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+// PyObject *CurvePoint_occluded_shape(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+// PyObject *CurvePoint_occludee_empty(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+// PyObject *CurvePoint_z_discontinuity(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+// PyObject *CurvePoint_curvatureFredo(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+// PyObject *CurvePoint_directionFredo(PyObject *self , PyObject *args) {
+// }
 
 
diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint.h b/source/blender/freestyle/intern/python/Interface0D/CurvePoint.h
new file mode 100644
index 00000000000..096de2efed3
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint.h
@@ -0,0 +1,31 @@
+#ifndef FREESTYLE_PYTHON_CURVEPOINT_H
+#define FREESTYLE_PYTHON_CURVEPOINT_H
+
+#include "../Interface0D.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject CurvePoint_Type;
+
+#define BPy_CurvePoint_Check(v) \
+    ((v)->ob_type == &CurvePoint_Type)
+
+/*---------------------------Python BPy_CurvePoint structure definition----------*/
+typedef struct {
+	BPy_Interface0D py_if0D;
+} BPy_CurvePoint;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_CURVEPOINT_H */
diff --git a/source/blender/freestyle/intern/python/Interface1D.cpp b/source/blender/freestyle/intern/python/Interface1D.cpp
index 7511401198b..27bb71b2f50 100644
--- a/source/blender/freestyle/intern/python/Interface1D.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D.cpp
@@ -9,7 +9,7 @@ extern "C" {
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 /*---------------  Python API function prototypes for Interface1D instance  -----------*/
-static PyObject * Interface1D___new__(PyTypeObject *type, PyObject *args, PyObject *kwds);
+static int Interface1D___init__(BPy_Interface1D *self, PyObject *args, PyObject *kwds);
 static void Interface1D___dealloc__(BPy_Interface1D *self);
 static PyObject * Interface1D___repr__(BPy_Interface1D *self);
 
@@ -70,7 +70,7 @@ PyTypeObject Interface1D_Type = {
 	NULL,                       /* PyBufferProcs *tp_as_buffer; */
 
   /*** Flags to define presence of optional/expanded features ***/
-	Py_TPFLAGS_DEFAULT, 		/* long tp_flags; */
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
 
 	NULL,                       /*  char *tp_doc;  Documentation string */
   /*** Assigned meaning in release 2.0 ***/
@@ -101,9 +101,9 @@ PyTypeObject Interface1D_Type = {
 	NULL,							/* descrgetfunc tp_descr_get; */
 	NULL,							/* descrsetfunc tp_descr_set; */
 	0,                          	/* long tp_dictoffset; */
-	NULL,                       	/* initproc tp_init; */
+	(initproc)Interface1D___init__,                       	/* initproc tp_init; */
 	NULL,							/* allocfunc tp_alloc; */
-	(newfunc)Interface1D___new__,		/* newfunc tp_new; */
+	PyType_GenericNew,		/* newfunc tp_new; */
 	
 	/*  Low-level free-memory routine */
 	NULL,                       /* freefunc tp_free;  */
@@ -135,16 +135,10 @@ PyMODINIT_FUNC Interface1D_Init( PyObject *module )
 
 //------------------------INSTANCE METHODS ----------------------------------
 
-PyObject * Interface1D___new__(PyTypeObject *type, PyObject *args, PyObject *kwds)
+int Interface1D___init__(BPy_Interface1D *self, PyObject *args, PyObject *kwds)
 {
-    BPy_Interface1D *self;
-
-    self = (BPy_Interface1D *)type->tp_alloc(type, 0);
-    if (self != NULL) {
-        self->if1D = new Interface1D();
-    }
-
-    return (PyObject *)self;
+	self->if1D = new Interface1D();
+	return 0;
 }
 
 void Interface1D___dealloc__(BPy_Interface1D* self)

From dbb61988fdaa6085912dee6ab8f5569e63ef88fb Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Tue, 15 Jul 2008 07:04:31 +0000
Subject: [PATCH 090/252] Any script can now register a unique key combination
 as part of its bpy header. For a supported space type, the user may press
 this shortcut to invoke the script.

Space types that are to support shortcuts like this should call BPY_menu_do_shortcut(...) from the event queue read method (See winqreadtextspace in drawtext.c for example)
---
 release/scripts/textplugin_suggest.py |  65 +++++++++
 source/blender/include/BIF_keyval.h   |   3 +
 source/blender/python/BPY_extern.h    |   2 +
 source/blender/python/BPY_interface.c |  34 ++++-
 source/blender/python/BPY_menus.c     |  35 ++++-
 source/blender/python/BPY_menus.h     |   1 +
 source/blender/src/drawtext.c         |  24 +++-
 source/blender/src/keyval.c           | 195 ++++++++++++++++++++++++++
 8 files changed, 349 insertions(+), 10 deletions(-)

diff --git a/release/scripts/textplugin_suggest.py b/release/scripts/textplugin_suggest.py
index 6bb703faa83..c4fce9ad7a9 100644
--- a/release/scripts/textplugin_suggest.py
+++ b/release/scripts/textplugin_suggest.py
@@ -3,6 +3,7 @@
 Name: 'Suggest'
 Blender: 243
 Group: 'TextPlugin'
+Shortcut: 'Ctrl+Space'
 Tooltip: 'Suggests completions for the word at the cursor in a python script'
 """
 
@@ -72,6 +73,70 @@ def getCompletionSymbols(txt):
 	return line[c-a:c].split('.')
 
 
+def getImports(txt):
+	imports = []
+	
+	# Unfortunately, tokenize may fail if the script leaves brackets or strings
+	# open. For now we return an empty list until I have a better idea. Maybe
+	# parse manually.
+	try:
+		tokens = getTokens(txt)
+	except:
+		return []
+	
+	for i in range(1, len(tokens)):
+		
+		# Handle all import statements
+		if tokens[i-1][TK_TOKEN] == 'import':
+			
+			# Find 'from' if it exists
+			fr = -1
+			for a in range(1, i):
+				if tokens[i-a][TK_TYPE] == token.NEWLINE: break
+				if tokens[i-a][TK_TOKEN] == 'from':
+					fr = i-a
+					break
+			
+			# Handle: import ___[.___][,___[.___]]
+			if fr<0:
+				parent = ''
+			
+			# Handle: from ___[.___] import ___[,___]
+			else: # fr>=0:
+				parent = ''.join([t[TK_TOKEN] for t in tokens[fr+1:i-1]])
+			
+			module = ''
+			while i < len(tokens)-1:
+				if tokens[i][TK_TYPE] == token.NAME:
+				
+					# Get the module name
+					module = module + tokens[i][TK_TOKEN]
+					
+					if tokens[i+1][TK_TOKEN] == '.':
+						module += '.'
+						i += 1
+					else:
+						# Add the module name and parent to the dict
+						imports.append((module, parent))
+						module = ''
+					
+				elif tokens[i][TK_TOKEN]!=',':
+					break
+				
+				i += 1
+				
+	# Process imports for: from ___ import *
+	for imp,frm in imports:
+		print imp, frm
+		if frm == '':
+			try: __import__(imp)
+			except: print '^ERR^'
+		else:
+			try: __import__(frm, globals(), locals(), [imp])
+			except: print '^ERR^'
+	
+
+
 # Returns a list of tuples of symbol names and their types (name, type) where
 # type is one of:
 #   m (module/class)  Has its own members (includes classes)
diff --git a/source/blender/include/BIF_keyval.h b/source/blender/include/BIF_keyval.h
index 70d248ded91..9693684e425 100644
--- a/source/blender/include/BIF_keyval.h
+++ b/source/blender/include/BIF_keyval.h
@@ -31,6 +31,9 @@
 #define BIF_KEYVAL_H
 
 char *key_event_to_string(unsigned short event);
+int decode_key_string(char *str, unsigned short *key, unsigned short *qual);
 
 #endif
 
+
+
diff --git a/source/blender/python/BPY_extern.h b/source/blender/python/BPY_extern.h
index f6a27b80733..3a826d49542 100644
--- a/source/blender/python/BPY_extern.h
+++ b/source/blender/python/BPY_extern.h
@@ -91,6 +91,8 @@ extern "C" {
 
 	int BPY_txt_do_python_Text( struct Text *text );
 	int BPY_menu_do_python( short menutype, int event );
+	int BPY_menu_do_shortcut( short menutype, unsigned short key, unsigned short modifiers );
+	int BPY_menu_invoke( struct BPyMenu *pym, short menutype );
 	void BPY_run_python_script( char *filename );
 	int BPY_run_script(struct Script *script);
 	void BPY_free_compiled_text( struct Text *text );
diff --git a/source/blender/python/BPY_interface.c b/source/blender/python/BPY_interface.c
index 360c8fd7f04..e9600e9369f 100644
--- a/source/blender/python/BPY_interface.c
+++ b/source/blender/python/BPY_interface.c
@@ -972,8 +972,38 @@ int BPY_run_script(Script *script)
 *****************************************************************************/
 int BPY_menu_do_python( short menutype, int event )
 {
-	char *argstr = NULL;
 	BPyMenu *pym;
+	pym = BPyMenu_GetEntry( menutype, ( short ) event );
+	return BPY_menu_invoke( pym, menutype );
+}
+	
+/****************************************************************************
+* Description: This function executes the script by its shortcut.
+* Notes:	It is called by the ui code in src/???.c when a user presses an
+*		unassigned key combination. Scripts are searched in the BPyMenuTable,
+*		using the given menutype and event values to know which one to invoke.
+*****************************************************************************/
+int BPY_menu_do_shortcut( short menutype, unsigned short key, unsigned short qual )
+{
+	BPyMenu *pym;
+	pym = BPyMenu_GetEntry( menutype, 0 );
+
+	while ( pym ) {
+		if ( pym->key && pym->key == key && pym->qual == qual ) {
+			return BPY_menu_invoke( pym, menutype );
+		}
+		pym = pym->next;
+	}
+	
+	return 0;
+}
+
+/****************************************************************************
+* Description: This function executes the script described by a menu item.
+*****************************************************************************/
+int BPY_menu_invoke( BPyMenu *pym, short menutype )
+{
+	char *argstr = NULL;
 	BPySubMenu *pysm;
 	char scriptname[21];
 	Script *script = NULL;
@@ -981,8 +1011,6 @@ int BPY_menu_do_python( short menutype, int event )
 	PyGILState_STATE gilstate;
 	char filestr[FILE_MAX];
 
-	pym = BPyMenu_GetEntry( menutype, ( short ) event );
-
 	if( !pym )
 		return 0;
 
diff --git a/source/blender/python/BPY_menus.c b/source/blender/python/BPY_menus.c
index 08691973a92..69b50e5c47a 100644
--- a/source/blender/python/BPY_menus.c
+++ b/source/blender/python/BPY_menus.c
@@ -42,6 +42,7 @@
 #endif
 #include "BKE_global.h"
 #include "BKE_utildefines.h"
+#include "BIF_keyval.h"
 #include "BLI_blenlib.h"
 #include "MEM_guardedalloc.h"
 #include "DNA_userdef_types.h"	/* for U.pythondir */
@@ -333,6 +334,23 @@ static void bpymenu_set_tooltip( BPyMenu * pymenu, char *tip )
 	return;
 }
 
+static void bpymenu_set_shortcut( BPyMenu * pymenu, char *combi )
+{
+	unsigned short key, qual;
+
+	if( !pymenu )
+		return;
+
+	if (!decode_key_string(combi, &key, &qual)) {
+		return; /* TODO: Print some error */
+	}
+
+	pymenu->key = key;
+	pymenu->qual = qual;
+
+	return;
+}
+
 /* bpymenu_AddEntry:
  * try to find an existing pymenu entry with the given type and name;
  * if found, update it with new info, otherwise create a new one and fill it.
@@ -693,6 +711,7 @@ void BPyMenu_PrintAllEntries( void )
  * # Blender: <code>short int</code> (minimal Blender version)
  * # Group: 'group name' (defines menu)
  * # Submenu: 'submenu name' related_1word_arg
+ * # Shortcut: Modifier+Key (optional shortcut combination for supported groups)
  * # Tooltip: 'tooltip for the menu'
  * # \"\"\"
  *
@@ -801,13 +820,19 @@ static int bpymenu_ParseFile(FILE *file, char *fname, int is_userdir)
 					if ((matches == 3) && (strstr(head, "Submenu:") != NULL)) {
 						bpymenu_AddSubEntry(scriptMenu, middle, tail);
 					} else {
-						/* Tooltip: 'tooltip for the menu */
+						/* Shortcut: 'key+combination' */
 						matches = sscanf(line, "%[^']'%[^']'%c", head, middle, tail);
-						if ((matches == 3) && ((strstr(head, "Tooltip:") != NULL) ||
-							(strstr(head, "Tip:") != NULL))) {
-							bpymenu_set_tooltip(scriptMenu, middle);
+						if ((matches == 3) && (strstr(head, "Shortcut:") != NULL)) {
+							bpymenu_set_shortcut(scriptMenu, middle);
+						} else {
+							/* Tooltip: 'tooltip for the menu */
+							matches = sscanf(line, "%[^']'%[^']'%c", head, middle, tail);
+							if ((matches == 3) && ((strstr(head, "Tooltip:") != NULL) ||
+								(strstr(head, "Tip:") != NULL))) {
+								bpymenu_set_tooltip(scriptMenu, middle);
+							}
+							parser_state = 0;
 						}
-						parser_state = 0;
 					}
 					break;
 
diff --git a/source/blender/python/BPY_menus.h b/source/blender/python/BPY_menus.h
index e8bca09d50e..576d7b8dcd6 100644
--- a/source/blender/python/BPY_menus.h
+++ b/source/blender/python/BPY_menus.h
@@ -59,6 +59,7 @@ typedef struct BPyMenu {
 	char *name;
 	char *filename;
 	char *tooltip;
+	unsigned short key, qual;	/* Registered shortcut key */
 	short version;		/* Blender version */
 	int dir;		/* 0: default, 1: U.pythondir */
 	struct BPySubMenu *submenus;
diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index c76ac47ffb7..b8cf99383a0 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -81,6 +81,7 @@
 #include "BSE_filesel.h"
 
 #include "BPY_extern.h"
+#include "BPY_menus.h"
 
 #include "mydevice.h"
 #include "blendef.h" 
@@ -1833,10 +1834,17 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			if (st->showsyntax) get_format_string(st);
 			pop_space_text(st);
 			do_draw= 1;
-			do_suggest= 1;
+			if (suggesting && ispunct(ascii)) {
+				confirm_suggestion(text);
+				if (st->showsyntax) get_format_string(st);
+				do_suggest= 0;
+			} else {
+				do_suggest= 1;
+			}
 		}
 	} else if (val) {
-		do_suggest= -1;
+		do_suggest= -1; /* Note that the default label sets this to 0,
+						so -1 only applies to the explicit cases below */
 		switch (event) {
 		case AKEY:
 			if (G.qual & LR_ALTKEY) {
@@ -2102,6 +2110,12 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 		case ESCKEY:
 			do_suggest= -1;
 			break;
+		case SPACEKEY:
+			if (suggesting) {
+				confirm_suggestion(text);
+				if (st->showsyntax) get_format_string(st);
+			}
+			break;
 		case TABKEY:
 			if (text && text->id.lib) {
 				error_libdata();
@@ -2300,6 +2314,12 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 		}
 	}
 
+	if (event && val) {
+		if (BPY_menu_do_shortcut(PYMENU_TEXTPLUGIN, event, G.qual)) {
+			do_draw= 1;
+		}
+	}
+
 	if (last_check_time < PIL_check_seconds_timer() - 1.0) {
 		switch (txt_file_modified(text)) {
 		case 1:
diff --git a/source/blender/src/keyval.c b/source/blender/src/keyval.c
index dab4b4ae839..f59cce0da8f 100644
--- a/source/blender/src/keyval.c
+++ b/source/blender/src/keyval.c
@@ -27,6 +27,11 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#include "stdio.h"
+#include "ctype.h"
+#include "string.h"
+
+#include "BKE_global.h"
 #include "BLI_blenlib.h"
 #include "BLI_arithb.h"
 #include "BIF_keyval.h"
@@ -349,3 +354,193 @@ char *key_event_to_string(unsigned short event)
 	
 	return "";
 }
+
+/* 
+ * Decodes key combination strings [qual1+[qual2+[...]]]keyname
+ * The '+'s may be replaced by '-' or ' ' characters to support different
+ * formats. No additional whitespace is allowed. The keyname may be an internal
+ * name, like "RETKEY", or a more common name, like "Return". Decoding is case-
+ * insensitive.
+ *
+ * Example strings: "Ctrl+L", "ALT-ESC", "Shift A"
+ *
+ * Returns 1 if successful. 
+ */
+int decode_key_string(char *str, unsigned short *key, unsigned short *qual)
+{
+	int i, prev, len, invalid=0;
+
+	len= strlen(str);
+	*key= *qual= 0;
+
+	/* Convert to upper case */
+	for (i=0; i<len; i++) {
+		str[i]= toupper(str[i]);
+	}
+
+	/* Handle modifiers */
+	for (prev=i=0; i<len; i++) {
+		if (str[i]==' ' || str[i]=='+' || str[i]=='-') {
+			if (!strncmp(str+prev, "CTRL", i-prev)) *qual |= LR_CTRLKEY;
+			else if (!strncmp(str+prev, "ALT", i-prev)) *qual |= LR_ALTKEY;
+			else if (!strncmp(str+prev, "SHIFT", i-prev)) *qual |= LR_SHIFTKEY;
+			else if (!strncmp(str+prev, "COMMAND", i-prev)) *qual |= LR_COMMANDKEY;
+			prev=i+1;
+		}
+	}
+
+	/* Compare last part against key names */
+	if (len-prev==1 || len-prev==4 && !strncmp(str+prev, "KEY", 3)) {
+		
+		if (str[prev]>='A' && str[prev]<='Z') {
+			*key= str[prev]-'A'+AKEY;
+		} else if (str[prev]>='0' && str[prev]<='9') {
+			*key= str[prev]-'0'+ZEROKEY;
+		} else {
+			invalid= 1;
+		}
+	
+	} else if (!strncmp(str+prev, "ZEROKEY", len-prev) || !strncmp(str+prev, "ZERO", len-prev)) {
+		*key= ZEROKEY;
+	} else if (!strncmp(str+prev, "ONEKEY", len-prev) || !strncmp(str+prev, "ONE", len-prev)) {
+		*key= ONEKEY;
+	} else if (!strncmp(str+prev, "TWOKEY", len-prev) || !strncmp(str+prev, "TWO", len-prev)) {
+		*key= TWOKEY;
+	} else if (!strncmp(str+prev, "THREEKEY", len-prev) || !strncmp(str+prev, "THREE", len-prev)) {
+		*key= THREEKEY;
+	} else if (!strncmp(str+prev, "FOURKEY", len-prev) || !strncmp(str+prev, "FOUR", len-prev)) {
+		*key= FOURKEY;
+	} else if (!strncmp(str+prev, "FIVEKEY", len-prev) || !strncmp(str+prev, "FIVE", len-prev)) {
+		*key= FIVEKEY;
+	} else if (!strncmp(str+prev, "SIZEKEY", len-prev) || !strncmp(str+prev, "SIX", len-prev)) {
+		*key= SIXKEY;
+	} else if (!strncmp(str+prev, "SEVENKEY", len-prev) || !strncmp(str+prev, "SEVEN", len-prev)) {
+		*key= SEVENKEY;
+	} else if (!strncmp(str+prev, "EIGHTKEY", len-prev) || !strncmp(str+prev, "EIGHT", len-prev)) {
+		*key= EIGHTKEY;
+	} else if (!strncmp(str+prev, "NINEKEY", len-prev) || !strncmp(str+prev, "NINE", len-prev)) {
+		*key= NINEKEY;
+
+	} else if (!strncmp(str+prev, "ESCKEY", len-prev) || !strncmp(str+prev, "ESC", len-prev)) {
+		*key= ESCKEY;
+	} else if (!strncmp(str+prev, "TABKEY", len-prev) || !strncmp(str+prev, "TAB", len-prev)) {
+		*key= TABKEY;
+	} else if (!strncmp(str+prev, "RETKEY", len-prev) || !strncmp(str+prev, "RETURN", len-prev) || !strncmp(str+prev, "ENTER", len-prev)) {
+		*key= RETKEY;
+	} else if (!strncmp(str+prev, "SPACEKEY", len-prev) || !strncmp(str+prev, "SPACE", len-prev)) {
+		*key= SPACEKEY;
+	} else if (!strncmp(str+prev, "LINEFEEDKEY", len-prev) || !strncmp(str+prev, "LINEFEED", len-prev)) {
+		*key= LINEFEEDKEY;
+	} else if (!strncmp(str+prev, "BACKSPACEKEY", len-prev) || !strncmp(str+prev, "BACKSPACE", len-prev)) {
+		*key= BACKSPACEKEY;
+	} else if (!strncmp(str+prev, "DELKEY", len-prev) || !strncmp(str+prev, "DELETE", len-prev)) {
+		*key= DELKEY;
+	
+	} else if (!strncmp(str+prev, "SEMICOLONKEY", len-prev) || !strncmp(str+prev, "SEMICOLON", len-prev)) {
+		*key= SEMICOLONKEY;
+	} else if (!strncmp(str+prev, "PERIODKEY", len-prev) || !strncmp(str+prev, "PERIOD", len-prev)) {
+		*key= PERIODKEY;
+	} else if (!strncmp(str+prev, "COMMAKEY", len-prev) || !strncmp(str+prev, "COMMA", len-prev)) {
+		*key= COMMAKEY;
+	} else if (!strncmp(str+prev, "QUOTEKEY", len-prev) || !strncmp(str+prev, "QUOTE", len-prev)) {
+		*key= QUOTEKEY;
+	} else if (!strncmp(str+prev, "ACCENTGRAVEKEY", len-prev) || !strncmp(str+prev, "ACCENTGRAVE", len-prev)) {
+		*key= ACCENTGRAVEKEY;
+	} else if (!strncmp(str+prev, "MINUSKEY", len-prev) || !strncmp(str+prev, "MINUS", len-prev)) {
+		*key= MINUSKEY;
+	} else if (!strncmp(str+prev, "SLASHKEY", len-prev) || !strncmp(str+prev, "SLASH", len-prev)) {
+		*key= SLASHKEY;
+	} else if (!strncmp(str+prev, "BACKSLASHKEY", len-prev) || !strncmp(str+prev, "BACKSLASH", len-prev)) {
+		*key= BACKSLASHKEY;
+	} else if (!strncmp(str+prev, "EQUALKEY", len-prev) || !strncmp(str+prev, "EQUAL", len-prev)) {
+		*key= EQUALKEY;
+	} else if (!strncmp(str+prev, "LEFTBRACKETKEY", len-prev) || !strncmp(str+prev, "LEFTBRACKET", len-prev)) {
+		*key= LEFTBRACKETKEY;
+	} else if (!strncmp(str+prev, "RIGHTBRACKETKEY", len-prev) || !strncmp(str+prev, "RIGHTBRACKET", len-prev)) {
+		*key= RIGHTBRACKETKEY;
+	} else if (!strncmp(str+prev, "DELKEY", len-prev) || !strncmp(str+prev, "DELETE", len-prev)) {
+		*key= DELKEY;
+	
+	} else if (!strncmp(str+prev, "LEFTARROWKEY", len-prev) || !strncmp(str+prev, "LEFTARROW", len-prev)) {
+		*key= LEFTARROWKEY;
+	} else if (!strncmp(str+prev, "DOWNARROWKEY", len-prev) || !strncmp(str+prev, "DOWNARROW", len-prev)) {
+		*key= DOWNARROWKEY;
+	} else if (!strncmp(str+prev, "RIGHTARROWKEY", len-prev) || !strncmp(str+prev, "RIGHTARROW", len-prev)) {
+		*key= RIGHTARROWKEY;
+	} else if (!strncmp(str+prev, "UPARROWKEY", len-prev) || !strncmp(str+prev, "UPARROW", len-prev)) {
+		*key= UPARROWKEY;
+
+	} else if (!strncmp(str+prev, "PAD", 3)) {
+		
+		if (len-prev<=4) {
+		
+			if (str[prev]>='0' && str[prev]<='9') {
+				*key= str[prev]-'0'+ZEROKEY;
+			} else {
+				invalid= 1;
+			}
+		
+		} else if (!strncmp(str+prev+3, "PERIODKEY", len-prev-3) || !strncmp(str+prev+3, "PERIOD", len-prev-3)) {
+			*key= PADPERIOD;
+		} else if (!strncmp(str+prev+3, "SLASHKEY", len-prev-3) || !strncmp(str+prev+3, "SLASH", len-prev-3)) {
+			*key= PADSLASHKEY;
+		} else if (!strncmp(str+prev+3, "ASTERKEY", len-prev-3) || !strncmp(str+prev+3, "ASTERISK", len-prev-3)) {
+			*key= PADASTERKEY;
+		} else if (!strncmp(str+prev+3, "MINUSKEY", len-prev-3) || !strncmp(str+prev+3, "MINUS", len-prev-3)) {
+			*key= PADMINUS;
+		} else if (!strncmp(str+prev+3, "ENTERKEY", len-prev-3) || !strncmp(str+prev+3, "ENTER", len-prev-3)) {
+			*key= PADENTER;
+		} else if (!strncmp(str+prev+3, "PLUSKEY", len-prev-3) || !strncmp(str+prev+3, "PLUS", len-prev-3)) {
+			*key= PADPLUSKEY;
+		} else {
+			invalid= 1;
+		}
+
+	} else if (!strncmp(str+prev, "F1KEY", len-prev) || !strncmp(str+prev, "F1", len-prev)) {
+		*key= F1KEY;
+	} else if (!strncmp(str+prev, "F2KEY", len-prev) || !strncmp(str+prev, "F2", len-prev)) {
+		*key= F2KEY;
+	} else if (!strncmp(str+prev, "F3KEY", len-prev) || !strncmp(str+prev, "F3", len-prev)) {
+		*key= F3KEY;
+	} else if (!strncmp(str+prev, "F4KEY", len-prev) || !strncmp(str+prev, "F4", len-prev)) {
+		*key= F4KEY;
+	} else if (!strncmp(str+prev, "F5KEY", len-prev) || !strncmp(str+prev, "F5", len-prev)) {
+		*key= F5KEY;
+	} else if (!strncmp(str+prev, "F6KEY", len-prev) || !strncmp(str+prev, "F6", len-prev)) {
+		*key= F6KEY;
+	} else if (!strncmp(str+prev, "F7KEY", len-prev) || !strncmp(str+prev, "F7", len-prev)) {
+		*key= F7KEY;
+	} else if (!strncmp(str+prev, "F8KEY", len-prev) || !strncmp(str+prev, "F8", len-prev)) {
+		*key= F8KEY;
+	} else if (!strncmp(str+prev, "F9KEY", len-prev) || !strncmp(str+prev, "F9", len-prev)) {
+		*key= F9KEY;
+	} else if (!strncmp(str+prev, "F10KEY", len-prev) || !strncmp(str+prev, "F10", len-prev)) {
+		*key= F10KEY;
+	} else if (!strncmp(str+prev, "F11KEY", len-prev) || !strncmp(str+prev, "F11", len-prev)) {
+		*key= F11KEY;
+	} else if (!strncmp(str+prev, "F12KEY", len-prev) || !strncmp(str+prev, "F12", len-prev)) {
+		*key= F12KEY;
+
+	} else if (!strncmp(str+prev, "PAUSEKEY", len-prev) || !strncmp(str+prev, "PAUSE", len-prev)) {
+		*key= PAUSEKEY;
+	} else if (!strncmp(str+prev, "INSERTKEY", len-prev) || !strncmp(str+prev, "INSERT", len-prev)) {
+		*key= INSERTKEY;
+	} else if (!strncmp(str+prev, "HOMEKEY", len-prev) || !strncmp(str+prev, "HOME", len-prev)) {
+		*key= HOMEKEY;
+	} else if (!strncmp(str+prev, "PAGEUPKEY", len-prev) || !strncmp(str+prev, "PAGEUP", len-prev)) {
+		*key= PAGEUPKEY;
+	} else if (!strncmp(str+prev, "PAGEDOWNKEY", len-prev) || !strncmp(str+prev, "PAGEDOWN", len-prev)) {
+		*key= PAGEDOWNKEY;
+	} else if (!strncmp(str+prev, "ENDKEY", len-prev) || !strncmp(str+prev, "END", len-prev)) {
+		*key= ENDKEY;
+	
+	} else {
+		invalid= 1;
+	}
+
+	if (!invalid && *key) {
+		return 1;
+	}
+	
+	return 0;
+}

From aeb4d0c631537d93de084301cac6a5dc981b6655 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Tue, 15 Jul 2008 07:34:46 +0000
Subject: [PATCH 091/252] Created a BPy module BPyTextPlugin to centralize
 functions used across the text plugin scripts. Also created two more scripts
 to handle imports and member suggestions.

---
 release/scripts/bpymodules/BPyTextPlugin.py | 271 ++++++++++++++++
 release/scripts/textplugin_imports.py       |  71 +++++
 release/scripts/textplugin_membersuggest.py |  67 ++++
 release/scripts/textplugin_suggest.py       | 337 +++-----------------
 source/blender/python/BPY_extern.h          |   1 +
 5 files changed, 459 insertions(+), 288 deletions(-)
 create mode 100644 release/scripts/bpymodules/BPyTextPlugin.py
 create mode 100644 release/scripts/textplugin_imports.py
 create mode 100644 release/scripts/textplugin_membersuggest.py

diff --git a/release/scripts/bpymodules/BPyTextPlugin.py b/release/scripts/bpymodules/BPyTextPlugin.py
new file mode 100644
index 00000000000..38bdab82a2d
--- /dev/null
+++ b/release/scripts/bpymodules/BPyTextPlugin.py
@@ -0,0 +1,271 @@
+import bpy, sys
+import __builtin__, tokenize
+from tokenize import generate_tokens
+# TODO: Remove the dependency for a full Python installation. Currently only the
+# tokenize module is required 
+
+# Context types
+NORMAL = 0
+SINGLE_QUOTE = 1
+DOUBLE_QUOTE = 2
+COMMENT = 3
+
+# Python keywords
+KEYWORDS = ['and', 'del', 'from', 'not', 'while', 'as', 'elif', 'global',
+			'or', 'with', 'assert', 'else', 'if', 'pass', 'yield',
+			'break', 'except', 'import', 'print', 'class', 'exec', 'in',
+			'raise', 'continue', 'finally', 'is', 'return', 'def', 'for',
+			'lambda', 'try' ]
+
+
+def suggest_cmp(x, y):
+	"""Use this method when sorting a list for suggestions"""
+	
+	return cmp(x[0], y[0])
+
+def get_module(name):
+	"""Returns the module specified by its name. This module is imported and as
+	such will run any initialization code specified within the module."""
+	
+	mod = __import__(name)
+	components = name.split('.')
+	for comp in components[1:]:
+		mod = getattr(mod, comp)
+	return mod
+
+def is_module(m):
+	"""Taken from the inspect module of the standard Python installation"""
+	
+	return isinstance(m, type(bpy))
+
+def type_char(v):
+	if is_module(v):
+		return 'm'
+	elif callable(v):
+		return 'f'
+	else: 
+		return 'v'
+
+def get_context(line, cursor):
+	"""Establishes the context of the cursor in the given line
+	
+	Returns one of:
+	  NORMAL - Cursor is in a normal context
+	  SINGLE_QUOTE - Cursor is inside a single quoted string
+	  DOUBLE_QUOTE - Cursor is inside a double quoted string
+	  COMMENT - Cursor is inside a comment
+	
+	"""
+	
+	# Detect context (in string or comment)
+	in_str = 0			# 1-single quotes, 2-double quotes
+	for i in range(cursor):
+		if not in_str:
+			if line[i] == "'": in_str = 1
+			elif line[i] == '"': in_str = 2
+			elif line[i] == '#': return 3 # In a comment so quit
+		else:
+			if in_str == 1:
+				if line[i] == "'":
+					in_str = 0
+					# In again if ' escaped, out again if \ escaped, and so on
+					for a in range(1, i+1):
+						if line[i-a] == '\\': in_str = 1-in_str
+						else: break
+			elif in_str == 2:
+				if line[i] == '"':
+					in_str = 0
+					# In again if " escaped, out again if \ escaped, and so on
+					for a in range(1, i+1):
+						if line[i-a] == '\\': in_str = 2-in_str
+						else: break
+	return in_str
+
+def current_line(txt):
+	"""Extracts the Python script line at the cursor in the Blender Text object
+	provided and cursor position within this line as the tuple pair (line,
+	cursor)"""
+	
+	(lineindex, cursor) = txt.getCursorPos()
+	lines = txt.asLines()
+	line = lines[lineindex]
+	
+	# Join previous lines to this line if spanning
+	i = lineindex - 1
+	while i > 0:
+		earlier = lines[i].rstrip()
+		if earlier.endswith('\\'):
+			line = earlier[:-1] + ' ' + line
+			cursor += len(earlier)
+		i -= 1
+	
+	# Join later lines while there is an explicit joining character
+	i = lineindex
+	while i < len(lines)-1 and line[i].rstrip().endswith('\\'):
+		later = lines[i+1].strip()
+		line = line + ' ' + later[:-1]
+	
+	return line, cursor
+
+def get_targets(line, cursor):
+	"""Parses a period separated string of valid names preceding the cursor and
+	returns them as a list in the same order."""
+	
+	targets = []
+	i = cursor - 1
+	while i >= 0 and (line[i].isalnum() or line[i] == '_' or line[i] == '.'):
+		i -= 1
+	
+	pre = line[i+1:cursor]
+	return pre.split('.')
+
+def get_imports(txt):
+	"""Returns a dictionary which maps symbol names in the source code to their
+	respective modules.
+	
+	The line 'from Blender import Text as BText' for example, results in the
+	mapping 'BText' : <module 'Blender.Text' (built-in)>
+	
+	Note that this method imports the modules to provide this mapping as as such
+	will execute any initilization code found within.
+	"""
+	
+	# Unfortunately, generate_tokens may fail if the script leaves brackets or
+	# strings open or there are other syntax errors. For now we return an empty
+	# dictionary until an alternative parse method is implemented.
+	try:
+		txt.reset()
+		tokens = generate_tokens(txt.readline)
+	except:
+		return dict()
+	
+	imports = dict()
+	step = 0
+	
+	for type, string, start, end, line in tokens:
+		store = False
+		
+		# Default, look for 'from' or 'import' to start
+		if step == 0:
+			if string == 'from':
+				tmp = []
+				step = 1
+			elif string == 'import':
+				fromname = None
+				tmp = []
+				step = 2
+		
+		# Found a 'from', create fromname in form '???.???...'
+		elif step == 1:
+			if string == 'import':
+				fromname = '.'.join(tmp)
+				tmp = []
+				step = 2
+			elif type == tokenize.NAME:
+				tmp.append(string)
+			elif string != '.':
+				step = 0 # Invalid syntax
+		
+		# Found 'import', fromname is populated or None, create impname
+		elif step == 2:
+			if string == 'as':
+				impname = '.'.join(tmp)
+				step = 3
+			elif type == tokenize.NAME:
+				tmp.append(string)
+			elif string != '.':
+				impname = '.'.join(tmp)
+				symbol = impname
+				store = True
+		
+		# Found 'as', change symbol to this value and go back to step 2
+		elif step == 3:
+			if type == tokenize.NAME:
+				symbol = string
+			else:
+				store = True
+		
+		# Both impname and symbol have now been populated so we can import
+		if store:
+			
+			# Handle special case of 'import *'
+			if impname == '*':
+				parent = get_module(fromname)
+				for symbol, attr in parent.__dict__.items():
+					imports[symbol] = attr
+				
+			else:
+				# Try importing the name as a module
+				try:
+					if fromname:
+						module = get_module(fromname +'.'+ impname)
+					else:
+						module = get_module(impname)
+					imports[symbol] = module
+				except:
+					# Try importing name as an attribute of the parent
+					try:
+						module = __import__(fromname, globals(), locals(), [impname])
+						imports[symbol] = getattr(module, impname)
+					except:
+						pass
+			
+			# More to import from the same module?
+			if string == ',':
+				tmp = []
+				step = 2
+			else:
+				step = 0
+	
+	return imports
+
+
+def get_builtins():
+	"""Returns a dictionary of built-in modules, functions and variables."""
+	
+	return __builtin__.__dict__
+
+def get_defs(txt):
+	"""Returns a dictionary which maps definition names in the source code to
+	a list of their parameter names.
+	
+	The line 'def doit(one, two, three): print one' for example, results in the
+	mapping 'doit' : [ 'one', 'two', 'three' ]
+	"""
+	
+	# See above for problems with generate_tokens
+	try:
+		txt.reset()
+		tokens = generate_tokens(txt.readline)
+	except:
+		return dict()
+	
+	defs = dict()
+	step = 0
+	
+	for type, string, start, end, line in tokens:
+		
+		# Look for 'def'
+		if step == 0:
+			if string == 'def':
+				name = None
+				step = 1
+		
+		# Found 'def', look for name followed by '('
+		elif step == 1:
+			if type == tokenize.NAME:
+				name = string
+				params = []
+			elif name and string == '(':
+				step = 2
+		
+		# Found 'def' name '(', now identify the parameters upto ')'
+		# TODO: Handle ellipsis '...'
+		elif step == 2:
+			if type == tokenize.NAME:
+				params.append(string)
+			elif string == ')':
+				defs[name] = params
+				step = 0
+		
+	return defs
diff --git a/release/scripts/textplugin_imports.py b/release/scripts/textplugin_imports.py
new file mode 100644
index 00000000000..af335eb5418
--- /dev/null
+++ b/release/scripts/textplugin_imports.py
@@ -0,0 +1,71 @@
+#!BPY
+"""
+Name: 'Import Complete'
+Blender: 246
+Group: 'TextPlugin'
+Shortcut: 'Space'
+Tooltip: 'Lists modules when import or from is typed'
+"""
+
+# Only run if we have the required modules
+OK = False
+try:
+	import bpy, sys
+	from BPyTextPlugin import *
+	OK = True
+except:
+	pass
+
+def main():
+	txt = bpy.data.texts.active
+	line, c = current_line(txt)
+	
+	# Check we are in a normal context
+	if get_context(line, c) != 0:
+		return
+	
+	pos = line.rfind('from ', 0, c)
+	
+	# No 'from' found
+	if pos == -1:
+		# Check instead for straight 'import'
+		pos2 = line.rfind('import ', 0, c)
+		if pos2 != -1 and pos2 == c-7:
+			items = [(m, 'm') for m in sys.builtin_module_names]
+			items.sort(cmp = suggest_cmp)
+			txt.suggest(items, '')
+	
+	# Immediate 'from' before cursor
+	elif pos == c-5:
+		items = [(m, 'm') for m in sys.builtin_module_names]
+		items.sort(cmp = suggest_cmp)
+		txt.suggest(items, '')
+	
+	# Found 'from' earlier
+	else:
+		pos2 = line.rfind('import ', pos+5, c)
+		
+		# No 'import' found after 'from' so suggest it
+		if pos2 == -1:
+			txt.suggest([('import', 'k')], '')
+			
+		# Immediate 'import' before cursor and after 'from...'
+		elif pos2 == c-7 or line[c-2] == ',':
+			between = line[pos+5:pos2-1].strip()
+			try:
+				mod = get_module(between)
+			except:
+				print 'Module not found:', between
+				return
+			
+			items = [('*', 'k')]
+			for (k,v) in mod.__dict__.items():
+				if is_module(v): t = 'm'
+				elif callable(v): t = 'f'
+				else: t = 'v'
+				items.append((k, t))
+			items.sort(cmp = suggest_cmp)
+			txt.suggest(items, '')
+
+if OK:
+	main()
diff --git a/release/scripts/textplugin_membersuggest.py b/release/scripts/textplugin_membersuggest.py
new file mode 100644
index 00000000000..d1ab588ba86
--- /dev/null
+++ b/release/scripts/textplugin_membersuggest.py
@@ -0,0 +1,67 @@
+#!BPY
+"""
+Name: 'Member Suggest'
+Blender: 246
+Group: 'TextPlugin'
+Shortcut: 'Period'
+Tooltip: 'Lists members of the object preceding the cursor in the current text \
+space'
+"""
+
+# Only run if we have the required modules
+try:
+	import bpy
+	from BPyTextPlugin import *
+	OK = True
+except:
+	OK = False
+
+def main():
+	txt = bpy.data.texts.active
+	(line, c) = current_line(txt)
+	
+	# Check we are in a normal context
+	if get_context(line, c) != NORMAL:
+		return
+	
+	pre = get_targets(line, c)
+	
+	if len(pre) <= 1:
+		return
+	
+	list = []
+	
+	imports = get_imports(txt)
+	
+	# Identify the root (root.sub.sub.)
+	if imports.has_key(pre[0]):
+		obj = imports[pre[0]]
+	else:
+		return
+	
+	# Step through sub-attributes
+	try:
+		for name in pre[1:-1]:
+			obj = getattr(obj, name)
+	except:
+		print "Attribute not found '%s' in '%s'" % (name, '.'.join(pre))
+		return
+	
+	try:
+		attr = obj.__dict__.keys()
+	except:
+		attr = dir(obj)
+	
+	for k in attr:
+		v = getattr(obj, k)
+		if is_module(v): t = 'm'
+		elif callable(v): t = 'f'
+		else: t = 'v'
+		list.append((k, t))
+	
+	if list != []:
+		list.sort(cmp = suggest_cmp)
+		txt.suggest(list, pre[-1])
+
+if OK:
+	main()
diff --git a/release/scripts/textplugin_suggest.py b/release/scripts/textplugin_suggest.py
index c4fce9ad7a9..8e14dffca9c 100644
--- a/release/scripts/textplugin_suggest.py
+++ b/release/scripts/textplugin_suggest.py
@@ -1,301 +1,62 @@
 #!BPY
 """
-Name: 'Suggest'
-Blender: 243
+Name: 'Suggest All'
+Blender: 246
 Group: 'TextPlugin'
 Shortcut: 'Ctrl+Space'
-Tooltip: 'Suggests completions for the word at the cursor in a python script'
+Tooltip: 'Performs suggestions based on the context of the cursor'
 """
 
-import bpy, __builtin__, token
-from Blender  import Text
-from StringIO import StringIO
-from inspect  import *
-from tokenize import generate_tokens
-
-TK_TYPE  = 0
-TK_TOKEN = 1
-TK_START = 2 #(srow, scol)
-TK_END   = 3 #(erow, ecol)
-TK_LINE  = 4
-TK_ROW = 0
-TK_COL = 1
-
-execs = [] # Used to establish the same import context across defs
-
-keywords = ['and', 'del', 'from', 'not', 'while', 'as', 'elif', 'global',
-			'or', 'with', 'assert', 'else', 'if', 'pass', 'yield',
-			'break', 'except', 'import', 'print', 'class', 'exec', 'in',
-			'raise', 'continue', 'finally', 'is', 'return', 'def', 'for',
-			'lambda', 'try' ]
-
-
-def getBuiltins():
-	builtins = []
-	bi = dir(__builtin__)
-	for k in bi:
-		v = getattr(__builtin__, k)
-		if ismodule(v): t='m'
-		elif callable(v): t='f'
-		else: t='v'
-		builtins.append((k, t))
-	return builtins
-
-
-def getKeywords():
-	global keywords
-	return [(k, 'k') for k in keywords]
-
-
-def getTokens(txt):
-	txt.reset()
-	g = generate_tokens(txt.readline)
-	tokens = []
-	for t in g: tokens.append(t)
-	return tokens
-
-
-def isNameChar(s):
-	return (s.isalnum() or s == '_')
-
-
-# Returns words preceding the cursor that are separated by periods as a list in
-# the same order
-def getCompletionSymbols(txt):
-	(l, c)= txt.getCursorPos()
-	lines = txt.asLines()
-	line = lines[l]
-	a=0
-	for a in range(1, c+1):
-		if not isNameChar(line[c-a]) and line[c-a]!='.':
-			a -= 1
-			break
-	return line[c-a:c].split('.')
-
-
-def getImports(txt):
-	imports = []
-	
-	# Unfortunately, tokenize may fail if the script leaves brackets or strings
-	# open. For now we return an empty list until I have a better idea. Maybe
-	# parse manually.
-	try:
-		tokens = getTokens(txt)
-	except:
-		return []
-	
-	for i in range(1, len(tokens)):
-		
-		# Handle all import statements
-		if tokens[i-1][TK_TOKEN] == 'import':
-			
-			# Find 'from' if it exists
-			fr = -1
-			for a in range(1, i):
-				if tokens[i-a][TK_TYPE] == token.NEWLINE: break
-				if tokens[i-a][TK_TOKEN] == 'from':
-					fr = i-a
-					break
-			
-			# Handle: import ___[.___][,___[.___]]
-			if fr<0:
-				parent = ''
-			
-			# Handle: from ___[.___] import ___[,___]
-			else: # fr>=0:
-				parent = ''.join([t[TK_TOKEN] for t in tokens[fr+1:i-1]])
-			
-			module = ''
-			while i < len(tokens)-1:
-				if tokens[i][TK_TYPE] == token.NAME:
-				
-					# Get the module name
-					module = module + tokens[i][TK_TOKEN]
-					
-					if tokens[i+1][TK_TOKEN] == '.':
-						module += '.'
-						i += 1
-					else:
-						# Add the module name and parent to the dict
-						imports.append((module, parent))
-						module = ''
-					
-				elif tokens[i][TK_TOKEN]!=',':
-					break
-				
-				i += 1
-				
-	# Process imports for: from ___ import *
-	for imp,frm in imports:
-		print imp, frm
-		if frm == '':
-			try: __import__(imp)
-			except: print '^ERR^'
-		else:
-			try: __import__(frm, globals(), locals(), [imp])
-			except: print '^ERR^'
-	
-
-
-# Returns a list of tuples of symbol names and their types (name, type) where
-# type is one of:
-#   m (module/class)  Has its own members (includes classes)
-#   v (variable)      Has a type which may have its own members
-#   f (function)      Callable and may have a return type (with its own members)
-# It also updates the global import context (via execs)
-def getGlobals(txt):
-	global execs
-	
-	# Unfortunately, tokenize may fail if the script leaves brackets or strings
-	# open. For now we return an empty list, leaving builtins and keywords as
-	# the only globals. (on the TODO list)
-	try:
-		tokens = getTokens(txt)
-	except:
-		return []
-	
-	globals = dict()
-	for i in range(len(tokens)):
-		
-		# Handle all import statements
-		if i>=1 and tokens[i-1][TK_TOKEN]=='import':
-			
-			# Find 'from' if it exists
-			fr= -1
-			for a in range(1, i):
-				if tokens[i-a][TK_TYPE]==token.NEWLINE: break
-				if tokens[i-a][TK_TOKEN]=='from':
-					fr=i-a
-					break
-			
-			# Handle: import ___[,___]
-			if fr<0:
-				
-				while True:
-					if tokens[i][TK_TYPE]==token.NAME:
-						# Add the import to the execs list
-						x = tokens[i][TK_LINE].strip()
-						k = tokens[i][TK_TOKEN]
-						execs.append(x)
-						exec 'try: '+x+'\nexcept: pass'
-						
-						# Add the symbol name to the return list
-						globals[k] = 'm'
-					elif tokens[i][TK_TOKEN]!=',':
-						break
-					i += 1
-			
-			# Handle statement: from ___[.___] import ___[,___]
-			else: # fr>=0:
-				
-				# Add the import to the execs list
-				x = tokens[i][TK_LINE].strip()
-				execs.append(x)
-				exec 'try: '+x+'\nexcept: pass'
-				
-				# Import parent module so we can process it for sub modules
-				parent = ''.join([t[TK_TOKEN] for t in tokens[fr+1:i-1]])
-				exec 'try: import '+parent+'\nexcept: pass'
-				
-				# All submodules, functions, etc.
-				if tokens[i][TK_TOKEN]=='*':
-					
-					# Add each symbol name to the return list
-					d = eval(parent).__dict__.items()
-					for k,v in d:
-						if not globals.has_key(k) or not globals[k]:
-							t='v'
-							if ismodule(v): t='m'
-							elif callable(v): t='f'
-							globals[k] = t
-				
-				# Specific function, submodule, etc.
-				else:
-					while True:
-						if tokens[i][TK_TYPE]==token.NAME:
-							k = tokens[i][TK_TOKEN]
-							if not globals.has_key(k) or not globals[k]:
-								t='v'
-								try:
-									v = eval(parent+'.'+k)
-									if ismodule(v): t='m'
-									elif callable(v): t='f'
-								except: pass
-								globals[k] = t
-						elif tokens[i][TK_TOKEN]!=',':
-							break
-						i += 1
-					
-		elif tokens[i][TK_TYPE]==token.NAME and tokens[i][TK_TOKEN] not in keywords and (i==0 or tokens[i-1][TK_TOKEN]!='.'):
-			k = tokens[i][TK_TOKEN]
-			if not globals.has_key(k) or not globals[k]:
-				t=None
-				if (i>0 and tokens[i-1][TK_TOKEN]=='def'):
-					t='f'
-				else:
-					t='v'
-				globals[k] = t
-	
-	return globals.items()
-
-
-def globalSuggest(txt, cs):
-	globals = getGlobals(txt)
-	return globals
-
-
-# Only works for 'static' members (eg. Text.Get)
-def memberSuggest(txt, cs):
-	global execs
-	
-	# Populate the execs for imports
-	getGlobals(txt)
-	
-	# Sometimes we have conditional includes which will fail if the module
-	# cannot be found. So we protect outselves in a try block
-	for x in execs:
-		exec 'try: '+x+'\nexcept: pass'
-	
-	suggestions = dict()
-	(row, col) = txt.getCursorPos()
-	
-	sub = cs[len(cs)-1]
-	
-	m=None
-	pre='.'.join(cs[:-1])
-	try:
-		m = eval(pre)
-	except:
-		print pre+ ' not found or not imported.'
-	
-	if m!=None:
-		for k,v in m.__dict__.items():
-			if ismodule(v): t='m'
-			elif callable(v): t='f'
-			else: t='v'
-			suggestions[k] = t
-	
-	return suggestions.items()
-
-
-def cmp0(x, y):
-	return cmp(x[0], y[0])
-
+# Only run if we have the required modules
+try:
+	import bpy
+	from BPyTextPlugin import *
+	OK = True
+except:
+	OK = False
 
 def main():
 	txt = bpy.data.texts.active
-	if txt==None: return
+	(line, c) = current_line(txt)
 	
-	cs = getCompletionSymbols(txt)
+	# Check we are in a normal context
+	if get_context(line, c) != NORMAL:
+		return
 	
-	if len(cs)<=1:
-		l = globalSuggest(txt, cs)
-		l.extend(getBuiltins())
-		l.extend(getKeywords())
-	else:
-		l = memberSuggest(txt, cs)
+	# Check that which precedes the cursor and perform the following:
+	# Period(.)				- Run textplugin_membersuggest.py
+	# 'import' or 'from'	- Run textplugin_imports.py
+	# Other                 - Continue this script (global suggest)
+	pre = get_targets(line, c)
 	
-	l.sort(cmp=cmp0)
-	txt.suggest(l, cs[len(cs)-1])
+	count = len(pre)
+	
+	if count > 1: # Period found
+		import textplugin_membersuggest
+		textplugin_membersuggest.main()
+		return
+	# Look for 'import' or 'from'
+	elif line.rfind('import ', 0, c) == c-7 or line.rfind('from ', 0, c) == c-5:
+		import textplugin_imports
+		textplugin_imports.main()
+		return
+	
+	list = []
+	
+	for k in KEYWORDS:
+		list.append((k, 'k'))
+	
+	for k, v in get_builtins().items():
+		list.append((k, type_char(v)))
+	
+	for k, v in get_imports(txt).items():
+		list.append((k, type_char(v)))
+	
+	for k, v in get_defs(txt).items():
+		list.append((k, 'f'))
+	
+	list.sort(cmp = suggest_cmp)
+	txt.suggest(list, pre[-1])
 
-main()
+if OK:
+	main()
diff --git a/source/blender/python/BPY_extern.h b/source/blender/python/BPY_extern.h
index 3a826d49542..3d9b45051fb 100644
--- a/source/blender/python/BPY_extern.h
+++ b/source/blender/python/BPY_extern.h
@@ -48,6 +48,7 @@ struct bPythonConstraint; /* DNA_constraint_types.h */
 struct bConstraintOb; /* DNA_constraint_types.h */
 struct bConstraintTarget; /* DNA_constraint_types.h*/
 struct Script;				/* DNA_screen_types.h */
+struct BPyMenu;
 #ifdef __cplusplus
 extern "C" {
 #endif

From 9037159d7a5d2e114174e77ca1e763c68de14b44 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Tue, 15 Jul 2008 12:55:20 +0000
Subject: [PATCH 092/252] Text plugin script updates: Better error handling,
 variable parsing, token caching for repeat parsing of the same document.
 Fixed joining of multiline statements and context detection.

---
 release/scripts/bpymodules/BPyTextPlugin.py | 153 +++++++++++++++-----
 release/scripts/textplugin_imports.py       |   8 +-
 release/scripts/textplugin_membersuggest.py |  21 +--
 release/scripts/textplugin_suggest.py       |  45 ++++--
 4 files changed, 159 insertions(+), 68 deletions(-)

diff --git a/release/scripts/bpymodules/BPyTextPlugin.py b/release/scripts/bpymodules/BPyTextPlugin.py
index 38bdab82a2d..2489c22f600 100644
--- a/release/scripts/bpymodules/BPyTextPlugin.py
+++ b/release/scripts/bpymodules/BPyTextPlugin.py
@@ -1,6 +1,7 @@
-import bpy, sys
+import bpy
 import __builtin__, tokenize
-from tokenize import generate_tokens
+from Blender.sys import time
+from tokenize import generate_tokens, TokenError
 # TODO: Remove the dependency for a full Python installation. Currently only the
 # tokenize module is required 
 
@@ -17,15 +18,33 @@ KEYWORDS = ['and', 'del', 'from', 'not', 'while', 'as', 'elif', 'global',
 			'raise', 'continue', 'finally', 'is', 'return', 'def', 'for',
 			'lambda', 'try' ]
 
+# Used to cache the return value of generate_tokens
+_token_cache = None
+_cache_update = 0
 
 def suggest_cmp(x, y):
-	"""Use this method when sorting a list for suggestions"""
+	"""Use this method when sorting a list of suggestions.
+	"""
 	
 	return cmp(x[0], y[0])
 
+def cached_generate_tokens(txt, since=1):
+	"""A caching version of generate tokens for multiple parsing of the same
+	document within a given timescale.
+	"""
+	
+	global _token_cache, _cache_update
+	
+	if _cache_update < time() - since:
+		txt.reset()
+		_token_cache = [g for g in generate_tokens(txt.readline)]
+		_cache_update = time()
+	return _token_cache
+
 def get_module(name):
-	"""Returns the module specified by its name. This module is imported and as
-	such will run any initialization code specified within the module."""
+	"""Returns the module specified by its name. The module itself is imported
+	by this method and, as such, any initialization code will be executed.
+	"""
 	
 	mod = __import__(name)
 	components = name.split('.')
@@ -34,11 +53,21 @@ def get_module(name):
 	return mod
 
 def is_module(m):
-	"""Taken from the inspect module of the standard Python installation"""
+	"""Taken from the inspect module of the standard Python installation.
+	"""
 	
 	return isinstance(m, type(bpy))
 
 def type_char(v):
+	"""Returns the character used to signify the type of a variable. Use this
+	method to identify the type character for an item in a suggestion list.
+	
+	The following values are returned:
+	  'm' if the parameter is a module
+	  'f' if the parameter is callable
+	  'v' if the parameter is variable or otherwise indeterminable
+	"""
+	
 	if is_module(v):
 		return 'm'
 	elif callable(v):
@@ -46,8 +75,8 @@ def type_char(v):
 	else: 
 		return 'v'
 
-def get_context(line, cursor):
-	"""Establishes the context of the cursor in the given line
+def get_context(txt):
+	"""Establishes the context of the cursor in the given Blender Text object
 	
 	Returns one of:
 	  NORMAL - Cursor is in a normal context
@@ -57,28 +86,43 @@ def get_context(line, cursor):
 	
 	"""
 	
+	l, cursor = txt.getCursorPos()
+	lines = txt.asLines()[:l+1]
+	
 	# Detect context (in string or comment)
 	in_str = 0			# 1-single quotes, 2-double quotes
-	for i in range(cursor):
-		if not in_str:
-			if line[i] == "'": in_str = 1
-			elif line[i] == '"': in_str = 2
-			elif line[i] == '#': return 3 # In a comment so quit
+	for line in lines:
+		if l == 0:
+			end = cursor
 		else:
-			if in_str == 1:
-				if line[i] == "'":
-					in_str = 0
-					# In again if ' escaped, out again if \ escaped, and so on
-					for a in range(1, i+1):
-						if line[i-a] == '\\': in_str = 1-in_str
-						else: break
-			elif in_str == 2:
-				if line[i] == '"':
-					in_str = 0
-					# In again if " escaped, out again if \ escaped, and so on
-					for a in range(1, i+1):
-						if line[i-a] == '\\': in_str = 2-in_str
-						else: break
+			end = len(line)
+			l -= 1
+		
+		# Comments end at new lines
+		if in_str == 3:
+			in_str = 0
+		
+		for i in range(end):
+			if in_str == 0:
+				if line[i] == "'": in_str = 1
+				elif line[i] == '"': in_str = 2
+				elif line[i] == '#': in_str = 3
+			else:
+				if in_str == 1:
+					if line[i] == "'":
+						in_str = 0
+						# In again if ' escaped, out again if \ escaped, and so on
+						for a in range(i-1, -1, -1):
+							if line[a] == '\\': in_str = 1-in_str
+							else: break
+				elif in_str == 2:
+					if line[i] == '"':
+						in_str = 0
+						# In again if " escaped, out again if \ escaped, and so on
+						for a in range(i-1, -1, -1):
+							if line[i-a] == '\\': in_str = 2-in_str
+							else: break
+		
 	return in_str
 
 def current_line(txt):
@@ -101,9 +145,10 @@ def current_line(txt):
 	
 	# Join later lines while there is an explicit joining character
 	i = lineindex
-	while i < len(lines)-1 and line[i].rstrip().endswith('\\'):
+	while i < len(lines)-1 and lines[i].rstrip().endswith('\\'):
 		later = lines[i+1].strip()
 		line = line + ' ' + later[:-1]
+		i += 1
 	
 	return line, cursor
 
@@ -134,9 +179,8 @@ def get_imports(txt):
 	# strings open or there are other syntax errors. For now we return an empty
 	# dictionary until an alternative parse method is implemented.
 	try:
-		txt.reset()
-		tokens = generate_tokens(txt.readline)
-	except:
+		tokens = cached_generate_tokens(txt)
+	except TokenError:
 		return dict()
 	
 	imports = dict()
@@ -191,8 +235,7 @@ def get_imports(txt):
 			# Handle special case of 'import *'
 			if impname == '*':
 				parent = get_module(fromname)
-				for symbol, attr in parent.__dict__.items():
-					imports[symbol] = attr
+				imports.update(parent.__dict__)
 				
 			else:
 				# Try importing the name as a module
@@ -202,12 +245,12 @@ def get_imports(txt):
 					else:
 						module = get_module(impname)
 					imports[symbol] = module
-				except:
+				except (ImportError, ValueError, AttributeError, TypeError):
 					# Try importing name as an attribute of the parent
 					try:
 						module = __import__(fromname, globals(), locals(), [impname])
 						imports[symbol] = getattr(module, impname)
-					except:
+					except (ImportError, ValueError, AttributeError, TypeError):
 						pass
 			
 			# More to import from the same module?
@@ -219,7 +262,6 @@ def get_imports(txt):
 	
 	return imports
 
-
 def get_builtins():
 	"""Returns a dictionary of built-in modules, functions and variables."""
 	
@@ -235,9 +277,8 @@ def get_defs(txt):
 	
 	# See above for problems with generate_tokens
 	try:
-		txt.reset()
-		tokens = generate_tokens(txt.readline)
-	except:
+		tokens = cached_generate_tokens(txt)
+	except TokenError:
 		return dict()
 	
 	defs = dict()
@@ -269,3 +310,37 @@ def get_defs(txt):
 				step = 0
 		
 	return defs
+
+def get_vars(txt):
+	"""Returns a dictionary of variable names found in the specified Text
+	object. This method locates all names followed directly by an equal sign:
+	'a = ???' or indirectly as part of a tuple/list assignment or inside a
+	'for ??? in ???:' block.
+	"""
+	
+	# See above for problems with generate_tokens
+	try:
+		tokens = cached_generate_tokens(txt)
+	except TokenError:
+		return []
+	
+	vars = []
+	accum = [] # Used for tuple/list assignment
+	foring = False
+	
+	for type, string, start, end, line in tokens:
+		
+		# Look for names
+		if string == 'for':
+			foring = True
+		if string == '=' or (foring and string == 'in'):
+			vars.extend(accum)
+			accum = []
+			foring = False
+		elif type == tokenize.NAME:
+			accum.append(string)
+		elif not string in [',', '(', ')', '[', ']']:
+			accum = []
+			foring = False
+		
+	return vars
diff --git a/release/scripts/textplugin_imports.py b/release/scripts/textplugin_imports.py
index af335eb5418..1773427bb01 100644
--- a/release/scripts/textplugin_imports.py
+++ b/release/scripts/textplugin_imports.py
@@ -13,7 +13,7 @@ try:
 	import bpy, sys
 	from BPyTextPlugin import *
 	OK = True
-except:
+except ImportError:
 	pass
 
 def main():
@@ -21,7 +21,7 @@ def main():
 	line, c = current_line(txt)
 	
 	# Check we are in a normal context
-	if get_context(line, c) != 0:
+	if get_context(txt) != 0:
 		return
 	
 	pos = line.rfind('from ', 0, c)
@@ -30,7 +30,7 @@ def main():
 	if pos == -1:
 		# Check instead for straight 'import'
 		pos2 = line.rfind('import ', 0, c)
-		if pos2 != -1 and pos2 == c-7:
+		if pos2 != -1 and (pos2 == c-7 or (pos2 < c-7 and line[c-2]==',')):
 			items = [(m, 'm') for m in sys.builtin_module_names]
 			items.sort(cmp = suggest_cmp)
 			txt.suggest(items, '')
@@ -54,7 +54,7 @@ def main():
 			between = line[pos+5:pos2-1].strip()
 			try:
 				mod = get_module(between)
-			except:
+			except ImportError:
 				print 'Module not found:', between
 				return
 			
diff --git a/release/scripts/textplugin_membersuggest.py b/release/scripts/textplugin_membersuggest.py
index d1ab588ba86..57c920c2bf9 100644
--- a/release/scripts/textplugin_membersuggest.py
+++ b/release/scripts/textplugin_membersuggest.py
@@ -13,7 +13,7 @@ try:
 	import bpy
 	from BPyTextPlugin import *
 	OK = True
-except:
+except ImportError:
 	OK = False
 
 def main():
@@ -21,7 +21,7 @@ def main():
 	(line, c) = current_line(txt)
 	
 	# Check we are in a normal context
-	if get_context(line, c) != NORMAL:
+	if get_context(txt) != NORMAL:
 		return
 	
 	pre = get_targets(line, c)
@@ -43,21 +43,24 @@ def main():
 	try:
 		for name in pre[1:-1]:
 			obj = getattr(obj, name)
-	except:
+	except AttributeError:
 		print "Attribute not found '%s' in '%s'" % (name, '.'.join(pre))
 		return
 	
 	try:
 		attr = obj.__dict__.keys()
-	except:
+	except AttributeError:
 		attr = dir(obj)
 	
 	for k in attr:
-		v = getattr(obj, k)
-		if is_module(v): t = 'm'
-		elif callable(v): t = 'f'
-		else: t = 'v'
-		list.append((k, t))
+		try:
+			v = getattr(obj, k)
+			if is_module(v): t = 'm'
+			elif callable(v): t = 'f'
+			else: t = 'v'
+			list.append((k, t))
+		except (AttributeError, TypeError): # Some attributes are not readable
+			pass
 	
 	if list != []:
 		list.sort(cmp = suggest_cmp)
diff --git a/release/scripts/textplugin_suggest.py b/release/scripts/textplugin_suggest.py
index 8e14dffca9c..770d2759bcc 100644
--- a/release/scripts/textplugin_suggest.py
+++ b/release/scripts/textplugin_suggest.py
@@ -12,36 +12,46 @@ try:
 	import bpy
 	from BPyTextPlugin import *
 	OK = True
-except:
+except ImportError:
 	OK = False
 
+def check_membersuggest(line, c):
+	pos = line.rfind('.', 0, c)
+	if pos == -1:
+		return False
+	for s in line[pos+1:c]:
+		if not s.isalnum() and not s == '_':
+			return False
+	return True
+
+def check_imports(line, c):
+	if line.rfind('import ', 0, c) == c-7:
+		return True
+	if line.rfind('from ', 0, c) == c-5:
+		return True
+	return False
+
 def main():
 	txt = bpy.data.texts.active
 	(line, c) = current_line(txt)
 	
 	# Check we are in a normal context
-	if get_context(line, c) != NORMAL:
+	if get_context(txt) != NORMAL:
 		return
 	
-	# Check that which precedes the cursor and perform the following:
-	# Period(.)				- Run textplugin_membersuggest.py
-	# 'import' or 'from'	- Run textplugin_imports.py
-	# Other                 - Continue this script (global suggest)
-	pre = get_targets(line, c)
+	# Check the character preceding the cursor and execute the corresponding script
 	
-	count = len(pre)
-	
-	if count > 1: # Period found
+	if check_membersuggest(line, c):
 		import textplugin_membersuggest
-		textplugin_membersuggest.main()
-		return
-	# Look for 'import' or 'from'
-	elif line.rfind('import ', 0, c) == c-7 or line.rfind('from ', 0, c) == c-5:
-		import textplugin_imports
-		textplugin_imports.main()
 		return
 	
+	elif check_imports(line, c):
+		import textplugin_imports
+		return
+	
+	# Otherwise we suggest globals, keywords, etc.
 	list = []
+	pre = get_targets(line, c)
 	
 	for k in KEYWORDS:
 		list.append((k, 'k'))
@@ -55,6 +65,9 @@ def main():
 	for k, v in get_defs(txt).items():
 		list.append((k, 'f'))
 	
+	for k in get_vars(txt):
+		list.append((k, 'v'))
+	
 	list.sort(cmp = suggest_cmp)
 	txt.suggest(list, pre[-1])
 

From 512eec04aa239d49ea655151cdd34ba5d754c466 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Tue, 15 Jul 2008 17:03:59 +0000
Subject: [PATCH 093/252] Made suggestions case-insensitive which also puts _
 prefixed items at the bottom. Improvements have also been made to the way the
 list works, when it should disappear/update/confirm, etc.

---
 release/scripts/bpymodules/BPyTextPlugin.py   |  2 +-
 .../blender/blenkernel/intern/suggestions.c   | 23 +++--
 source/blender/src/drawtext.c                 | 91 +++++++++++++------
 3 files changed, 82 insertions(+), 34 deletions(-)

diff --git a/release/scripts/bpymodules/BPyTextPlugin.py b/release/scripts/bpymodules/BPyTextPlugin.py
index 2489c22f600..44038cfc3f6 100644
--- a/release/scripts/bpymodules/BPyTextPlugin.py
+++ b/release/scripts/bpymodules/BPyTextPlugin.py
@@ -26,7 +26,7 @@ def suggest_cmp(x, y):
 	"""Use this method when sorting a list of suggestions.
 	"""
 	
-	return cmp(x[0], y[0])
+	return cmp(x[0].upper(), y[0].upper())
 
 def cached_generate_tokens(txt, since=1):
 	"""A caching version of generate tokens for multiple parsing of the same
diff --git a/source/blender/blenkernel/intern/suggestions.c b/source/blender/blenkernel/intern/suggestions.c
index ae0c7baa146..dd5b770db93 100644
--- a/source/blender/blenkernel/intern/suggestions.c
+++ b/source/blender/blenkernel/intern/suggestions.c
@@ -22,13 +22,14 @@
  *
  * The Original Code is: all of this file.
  *
- * Contributor(s): none yet.
+ * Contributor(s): Ian Thompson.
  *
  * ***** END GPL LICENSE BLOCK *****
  */
 
 #include <stdlib.h>
 #include <string.h>
+#include <ctype.h>
 
 #include "MEM_guardedalloc.h"
 #include "BLI_blenlib.h"
@@ -36,9 +37,19 @@
 #include "BKE_text.h"
 #include "BKE_suggestions.h"
 
-static SuggList suggestions= {NULL, NULL, NULL, NULL};
+static SuggList suggestions= {NULL, NULL, NULL, NULL, NULL};
 static Text *suggText = NULL;
+static SuggItem *lastInsert= NULL;
 
+static suggest_cmp(const char *first, const char *second, int len) {	
+	int cmp, i;
+	for (cmp=0, i=0; i<len; i++) {
+		if (cmp= toupper(first[i]) - toupper(second[i])) {
+			break;
+		}
+	}
+	return cmp;
+}
 void free_suggestions() {
 	SuggItem *item, *prev;
 	for (item = suggestions.last; item; item=prev) {
@@ -66,17 +77,17 @@ void suggest_add(const char *name, char type) {
 
 	if (!suggestions.first) {
 		suggestions.first = suggestions.last = newitem;
-		suggestions.selected = newitem;
 	} else {
 		newitem->prev = suggestions.last;
 		suggestions.last->next = newitem;
 		suggestions.last = newitem;
 	}
+	suggestions.selected = NULL;
 }
 
 void suggest_prefix(const char *prefix) {
 	SuggItem *match, *first, *last;
-	int cmp, len = strlen(prefix);
+	int cmp, len = strlen(prefix), i;
 
 	if (!suggestions.first) return;
 	if (len==0) {
@@ -87,7 +98,7 @@ void suggest_prefix(const char *prefix) {
 	
 	first = last = NULL;
 	for (match=suggestions.first; match; match=match->next) {
-		cmp = strncmp(prefix, match->name, len);
+		cmp = suggest_cmp(prefix, match->name, len);
 		if (cmp==0) {
 			if (!first)
 				first = match;
@@ -103,7 +114,7 @@ void suggest_prefix(const char *prefix) {
 		suggestions.selected = suggestions.firstmatch = first;
 		suggestions.lastmatch = last;
 	} else {
-		suggestions.selected = suggestions.firstmatch = suggestions.lastmatch = NULL;
+		suggestions.firstmatch = suggestions.lastmatch = NULL;
 	}
 }
 
diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index b8cf99383a0..ae994b3e61d 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -108,7 +108,7 @@ static int check_specialvars(char *string);
 static int check_identifier(char ch);
 
 static void get_suggest_prefix(Text *text);
-static void confirm_suggestion(Text *text);
+static void confirm_suggestion(Text *text, int skipleft);
 
 static void *last_txt_find_string= NULL;
 static double last_check_time= 0;
@@ -1026,7 +1026,7 @@ static int do_suggest_select(SpaceText *st)
 	last = suggest_last();
 	sel = suggest_get_selected();
 
-	if (!sel || !last || !first)
+	if (!last || !first)
 		return 0;
 
 	/* Count the visible lines to the cursor */
@@ -1100,7 +1100,10 @@ void draw_suggestion_list(SpaceText *st) {
 	BIF_ThemeColor(TH_BACK);
 	glRecti(x, y, x+boxw, y-boxh);
 
+	/* Set the top 'item' of the visible list */
 	for (i=0, item=sel; i<3 && item && item!=first; i++, item=item->prev);
+	if (!item)
+		item = first;
 
 	for (i=0; i<SUGG_LIST_SIZE && item; i++, item=item->next) {
 
@@ -1653,15 +1656,15 @@ static void get_suggest_prefix(Text *text) {
 	len= text->curc-i;
 	if (len > 255) {
 		printf("Suggestion prefix too long\n");
-		return;
+		len = 255;
 	}
 	strncpy(tmp, line+i, len);
 	tmp[len]= '\0';
 	suggest_prefix(tmp);
 }
 
-static void confirm_suggestion(Text *text) {
-	int i, len;
+static void confirm_suggestion(Text *text, int skipleft) {
+	int i, over=0;
 	char *line;
 	SuggItem *sel;
 
@@ -1672,12 +1675,25 @@ static void confirm_suggestion(Text *text) {
 	if (!sel) return;
 
 	line= text->curl->line;
-	for (i=text->curc-1; i>=0; i--)
+	i=text->curc-skipleft-1;
+	while (i>=0) {
 		if (!check_identifier(line[i]))
 			break;
-	i++;
-	len= text->curc-i;
-	txt_insert_buf(text, sel->name+len);
+		over++;
+		i--;
+	}
+
+	for (i=0; i<skipleft; i++)
+		txt_move_left(text, 0);
+	for (i=0; i<over; i++)
+		txt_move_left(text, 1);
+
+	txt_insert_buf(text, sel->name);
+	
+	for (i=0; i<skipleft; i++)
+		txt_move_right(text, 0);
+
+	suggest_clear_text();
 }
 
 void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
@@ -1752,7 +1768,7 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 		return;
 	}
 
-	suggesting = suggest_is_active(text);
+	suggesting = st->showsyntax && suggest_is_active(text);
 	
 	if (event==LEFTMOUSE) {
 		if (val) {
@@ -1781,7 +1797,7 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 	} else if (event==MIDDLEMOUSE) {
 		if (val) {
 			if (do_suggest_select(st)) {
-				confirm_suggestion(text);
+				confirm_suggestion(text, 0);
 				do_draw= 1;
 				do_suggest= 0;
 			} else if (U.uiflag & USER_MMB_PASTE) {
@@ -1834,12 +1850,14 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			if (st->showsyntax) get_format_string(st);
 			pop_space_text(st);
 			do_draw= 1;
-			if (suggesting && ispunct(ascii)) {
-				confirm_suggestion(text);
-				if (st->showsyntax) get_format_string(st);
-				do_suggest= 0;
-			} else {
-				do_suggest= 1;
+			if (suggesting) {
+				if (ispunct(ascii) || check_whitespace(ascii)) {
+					confirm_suggestion(text, 1);
+					if (st->showsyntax) get_format_string(st);
+					do_suggest= 0;
+				} else {
+					do_suggest= 1;
+				}
 			}
 		}
 	} else if (val) {
@@ -2110,12 +2128,6 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 		case ESCKEY:
 			do_suggest= -1;
 			break;
-		case SPACEKEY:
-			if (suggesting) {
-				confirm_suggestion(text);
-				if (st->showsyntax) get_format_string(st);
-			}
-			break;
 		case TABKEY:
 			if (text && text->id.lib) {
 				error_libdata();
@@ -2146,7 +2158,7 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 				break;
 			}
 			if (suggesting) {
-				confirm_suggestion(text);
+				confirm_suggestion(text, 0);
 				if (st->showsyntax) get_format_string(st);
 				break;
 			}
@@ -2174,14 +2186,24 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			}
 			if (G.qual & (LR_ALTKEY | LR_CTRLKEY)) {
 				txt_backspace_word(text);
+				do_suggest= -1;
 			} else {
+				/* Work out which char we are about to delete */
+				if (text && text->curl && text->curc > 0) {
+					char ch= text->curl->line[text->curc-1];
+					if (ispunct(ch) || check_whitespace(ch))
+						do_suggest= -1;
+					else
+						do_suggest= 1;
+				} else {
+					do_suggest= -1;
+				}
 				txt_backspace_char(text);
 			}
 			set_tabs(text);
 			if (st->showsyntax) get_format_string(st);
 			do_draw= 1;
 			pop_space_text(st);
-			do_suggest= 1;
 			break;
 		case DELKEY:
 			if (text && text->id.lib) {
@@ -2206,8 +2228,11 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 		case DOWNARROWKEY:
 			if (suggesting) {
 				SuggItem *sel = suggest_get_selected();
-				if (sel && sel!=suggest_last() && sel->next)
+				if (!sel) {
+					suggest_set_selected(suggest_first());
+				} else if (sel!=suggest_last() && sel->next) {
 					suggest_set_selected(sel->next);
+				}
 				do_suggest= 0;
 				break;
 			}
@@ -2255,6 +2280,8 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			if (suggesting) {
 				int i;
 				SuggItem *sel = suggest_get_selected();
+				if (!sel)
+					sel = suggest_first();
 				for (i=0; i<SUGG_LIST_SIZE-1 && sel && sel!=suggest_last() && sel->next; i++, sel=sel->next)
 					suggest_set_selected(sel->next);
 				do_suggest= 0;
@@ -2301,8 +2328,11 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 		case WHEELDOWNMOUSE:
 			if (suggesting) {
 				SuggItem *sel = suggest_get_selected();
-				if (sel && sel!=suggest_last() && sel->next)
+				if (!sel) {
+					suggest_set_selected(suggest_first());
+				} else if (sel && sel!=suggest_last() && sel->next) {
 					suggest_set_selected(sel->next);
+				}
 				do_suggest= 0;
 			} else {
 				screen_skip(st, U.wheellinescroll);
@@ -2310,6 +2340,7 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			do_draw= 1;
 			break;
 		default:
+			/* We don't want all sorts of events closing the suggestions box */
 			do_suggest= 0;
 		}
 	}
@@ -2581,6 +2612,12 @@ static int check_identifier(char ch) {
 	return 0;
 }
 
+static int check_whitespace(char ch) {
+	if (ch == ' ' || ch == '\t' || ch == '\r' || ch == '\n')
+		return 1;
+	return 0;
+}
+
 void convert_tabs (struct SpaceText *st, int tab)
 {
 	Text *text = st->text;

From 08039ef38fa6d39f756860032659cc3678137ced Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Tue, 15 Jul 2008 19:38:48 +0000
Subject: [PATCH 094/252] Optimization method selectable at runtime Start multi
 resolution match from node, not arc (solve problem with Rinky) various
 uglyness being cleaned up or factored out

---
 source/blender/blenlib/BLI_graph.h        |   2 +
 source/blender/blenlib/intern/graph.c     |   2 +-
 source/blender/makesdna/DNA_scene_types.h |   3 +-
 source/blender/src/autoarmature.c         | 424 +++++++++++-----------
 source/blender/src/buttons_editing.c      |  40 +-
 source/blender/src/reeb.c                 |   9 +-
 6 files changed, 242 insertions(+), 238 deletions(-)

diff --git a/source/blender/blenlib/BLI_graph.h b/source/blender/blenlib/BLI_graph.h
index d309d73fbee..dba02932e02 100644
--- a/source/blender/blenlib/BLI_graph.h
+++ b/source/blender/blenlib/BLI_graph.h
@@ -80,6 +80,8 @@ void BLI_freeAdjacencyList(BGraph *rg);
 
 int BLI_FlagSubgraphs(BGraph *graph);
 
+#define SHAPE_RADIX 10 /* each shape level is encoded this base */
+
 int BLI_subtreeShape(BNode *node, BArc *rootArc, int include_root);
 float BLI_subtreeLength(BNode *node, BArc *rootArc);
 void BLI_calcGraphLength(BGraph *graph);
diff --git a/source/blender/blenlib/intern/graph.c b/source/blender/blenlib/intern/graph.c
index a3089369c22..fce9d0b6d95 100644
--- a/source/blender/blenlib/intern/graph.c
+++ b/source/blender/blenlib/intern/graph.c
@@ -354,7 +354,7 @@ int BLI_subtreeShape(BNode *node, BArc *rootArc, int include_root)
 			}
 		}
 		
-		return 10 * depth + 1;
+		return SHAPE_RADIX * depth + 1;
 	}
 }
 
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index c235cfe2b31..e7376534e27 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -441,8 +441,9 @@ typedef struct ToolSettings {
 	char  skgen_postpro_passes;
 	char  skgen_subdivisions[3];
 	char  skgen_multi_level;
+	char  skgen_optimisation_method;
 	
-	char tpad[7];
+	char tpad[6];
 	
 	/* Alt+RMB option */
 	char edge_mode;
diff --git a/source/blender/src/autoarmature.c b/source/blender/src/autoarmature.c
index 1aab8ceaa2a..6c10deb1ae7 100644
--- a/source/blender/src/autoarmature.c
+++ b/source/blender/src/autoarmature.c
@@ -34,6 +34,8 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "PIL_time.h"
+
 #include "DNA_ID.h"
 #include "DNA_armature_types.h"
 #include "DNA_mesh_types.h"
@@ -578,6 +580,8 @@ static void printPositions(int *positions, int nb_positions)
 	printf("\n");
 }
 
+#define MAX_COST 100 /* FIX ME */
+
 static float costDistance(ReebArcIterator *iter, float *vec0, float *vec1, int i0, int i1)
 {
 	EmbedBucket *bucket = NULL;
@@ -613,7 +617,7 @@ static float costDistance(ReebArcIterator *iter, float *vec0, float *vec1, int i
 		}
 		else
 		{
-			return FLT_MAX;
+			return MAX_COST;
 		}
 		
 		return G.scene->toolsettings->skgen_retarget_distance_weight * max_dist;
@@ -624,9 +628,34 @@ static float costDistance(ReebArcIterator *iter, float *vec0, float *vec1, int i
 	}
 }
 
-static float costAngle(float original_angle, float current_angle)
+static float costAngle(float original_angle, float vec_first[3], float vec_second[3], float length1, float length2)
 {
-	return 0;
+	if (G.scene->toolsettings->skgen_retarget_angle_weight > 0)
+	{
+		float current_angle;
+		
+		if (length1 > 0 && length2 > 0)
+		{
+			current_angle = saacos(Inpf(vec_first, vec_second));
+
+			if (original_angle > 0)
+			{
+				return G.scene->toolsettings->skgen_retarget_angle_weight * fabs((current_angle - original_angle) / original_angle);
+			}
+			else
+			{
+				return G.scene->toolsettings->skgen_retarget_angle_weight * fabs(current_angle);
+			}
+		}
+		else
+		{
+			return G.scene->toolsettings->skgen_retarget_angle_weight * M_PI;
+		}
+	}
+	else
+	{
+		return 0;
+	}
 }
 
 static float costLength(float original_length, float current_length)
@@ -638,8 +667,7 @@ static float costLength(float original_length, float current_length)
 static float calcCost(ReebArcIterator *iter, RigEdge *e1, RigEdge *e2, float *vec0, float *vec1, float *vec2, int i0, int i1, int i2)
 {
 	float vec_second[3], vec_first[3];
-	float angle = e1->angle;
-	float test_angle, length1, length2;
+	float length1, length2;
 	float new_cost = 0;
 
 	VecSubf(vec_second, vec2, vec1);
@@ -647,24 +675,9 @@ static float calcCost(ReebArcIterator *iter, RigEdge *e1, RigEdge *e2, float *ve
 
 	VecSubf(vec_first, vec1, vec0); 
 	length1 = Normalize(vec_first);
-	
-	if (length1 > 0 && length2 > 0)
-	{
-		test_angle = saacos(Inpf(vec_first, vec_second));
-		/* ANGLE COST HERE */
-		if (angle > 0)
-		{
-			new_cost += G.scene->toolsettings->skgen_retarget_angle_weight * fabs((test_angle - angle) / angle);
-		}
-		else
-		{
-			new_cost += G.scene->toolsettings->skgen_retarget_angle_weight * fabs(test_angle);
-		}
-	}
-	else
-	{
-		new_cost += M_PI;
-	}
+
+	/* Angle cost */	
+	new_cost += costAngle(e1->angle, vec_first, vec_second, length1, length2);
 
 	/* Length cost */
 	new_cost += costLength(e1->length, length1);
@@ -677,8 +690,6 @@ static float calcCost(ReebArcIterator *iter, RigEdge *e1, RigEdge *e2, float *ve
 	return new_cost;
 }
 
-#define MAX_COST 100 /* FIX ME */
-
 static void calcGradient(RigEdge *e1, RigEdge *e2, ReebArcIterator *iter, int index, int nb_joints, float *cost_cube, int *positions, float **vec_cache)
 {
 	EmbedBucket *bucket = NULL;
@@ -760,7 +771,7 @@ static void calcGradient(RigEdge *e1, RigEdge *e2, ReebArcIterator *iter, int in
 	}
 }
 
-static float probability(float delta_cost, float iterations)
+static float probability(float delta_cost, float temperature)
 {
 	if (delta_cost < 0)
 	{
@@ -768,7 +779,6 @@ static float probability(float delta_cost, float iterations)
 	}
 	else
 	{
-		float temperature = (1 - iterations);
 		return (float)exp(delta_cost) * temperature;
 	}
 }
@@ -884,163 +894,154 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 	vec_cache[0] = node_start->p;
 	vec_cache[nb_edges] = node_end->p;
 
-#if 0 /* BRUTE FORCE */
-	while(1)
+	/* BRUTE FORCE */
+	if (G.scene->toolsettings->skgen_optimisation_method == 0)
 	{
-		float cost = 0;
-		int need_calc = 0;
-		
-		/* increment to next possible solution */
-		
-		i = nb_joints - 1;
-
-		/* increment positions, starting from the last one
-		 * until a valid increment is found
-		 * */
-		for (i = must_move; i >= 0; i--)
+		while(1)
 		{
-			int remaining_joints = nb_joints - (i + 1); 
+			float cost = 0;
+			int need_calc = 0;
 			
-			positions[i] += 1;
-			need_calc = i;
+			/* increment to next possible solution */
 			
-			if (positions[i] + remaining_joints < earc->bcount)
+			i = nb_joints - 1;
+	
+			/* increment positions, starting from the last one
+			 * until a valid increment is found
+			 * */
+			for (i = must_move; i >= 0; i--)
+			{
+				int remaining_joints = nb_joints - (i + 1); 
+				
+				positions[i] += 1;
+				need_calc = i;
+				
+				if (positions[i] + remaining_joints < earc->bcount)
+				{
+					break;
+				}
+			}
+			
+			if (first_pass)
+			{
+				need_calc = 0;
+				first_pass = 0;
+			}
+	
+			if (i == -1)
 			{
 				break;
 			}
-		}
+			
+			/* reset joints following the last increment*/
+			for (i = i + 1; i < nb_joints; i++)
+			{
+				positions[i] = positions[i - 1] + 1;
+			}
 		
-		if (first_pass)
-		{
-			need_calc = 0;
-			first_pass = 0;
-		}
-
-		if (i == -1)
-		{
-			break;
-		}
-		
-		/* reset joints following the last increment*/
-		for (i = i + 1; i < nb_joints; i++)
-		{
-			positions[i] = positions[i - 1] + 1;
-		}
+			/* calculating cost */
+			initArcIterator(&iter, earc, node_start);
+			
+			vec0 = NULL;
+			vec1 = node_start->p;
+			vec2 = NULL;
+			
+			for (edge = iarc->edges.first, i = 0, last_index = 0;
+				 edge;
+				 edge = edge->next, i += 1)
+			{
 	
-		/* calculating cost */
-		initArcIterator(&iter, earc, node_start);
-		
-		vec0 = NULL;
-		vec1 = node_start->p;
-		vec2 = NULL;
-		
-		for (edge = iarc->edges.first, i = 0, last_index = 0;
-			 edge;
-			 edge = edge->next, i += 1)
-		{
-
-			if (i >= need_calc)
-			{ 
-				float vec_first[3], vec_second[3];
-				float length1, length2;
-				float new_cost = 0;
-				int i1, i2;
-				
-				if (i < nb_joints)
-				{
-					i2 = positions[i];
-					bucket = peekBucket(&iter, positions[i]);
-					vec2 = bucket->p;
-					vec_cache[i + 1] = vec2; /* update cache for updated position */
-				}
-				else
-				{
-					i2 = iter.length;
-					vec2 = node_end->p;
-				}
-				
-				if (i > 0)
-				{
-					i1 = positions[i - 1];
-				}
-				else
-				{
-					i1 = 1;
-				}
-				
-				vec1 = vec_cache[i];
-				
-
-				VecSubf(vec_second, vec2, vec1);
-				length2 = Normalize(vec_second);
-	
-				/* check angle */
-				if (i != 0 && G.scene->toolsettings->skgen_retarget_angle_weight > 0)
-				{
-					RigEdge *previous = edge->prev;
-					float angle = previous->angle;
-					float test_angle;
+				if (i >= need_calc)
+				{ 
+					float vec_first[3], vec_second[3];
+					float length1, length2;
+					float new_cost = 0;
+					int i1, i2;
 					
-					vec0 = vec_cache[i - 1];
-					VecSubf(vec_first, vec1, vec0); 
-					length1 = Normalize(vec_first);
-					
-					if (length1 > 0 && length2 > 0)
+					if (i < nb_joints)
 					{
-						test_angle = saacos(Inpf(vec_first, vec_second));
-						/* ANGLE COST HERE */
-						if (angle > 0)
-						{
-							new_cost += G.scene->toolsettings->skgen_retarget_angle_weight * fabs((test_angle - angle) / angle);
-						}
-						else
-						{
-							new_cost += G.scene->toolsettings->skgen_retarget_angle_weight * fabs(test_angle);
-						}
+						i2 = positions[i];
+						bucket = peekBucket(&iter, positions[i]);
+						vec2 = bucket->p;
+						vec_cache[i + 1] = vec2; /* update cache for updated position */
 					}
 					else
 					{
-						new_cost += G.scene->toolsettings->skgen_retarget_angle_weight;
+						i2 = iter.length;
+						vec2 = node_end->p;
 					}
-				}
+					
+					if (i > 0)
+					{
+						i1 = positions[i - 1];
+					}
+					else
+					{
+						i1 = 1;
+					}
+					
+					vec1 = vec_cache[i];
+					
 	
-				/* Length Cost */
-				new_cost += costLength(edge->length, length2);
-				
-				/* Distance Cost */
-				new_cost += calcMaximumDistance(&iter, vec1, vec2, i1, i2);
-				
-				cost_cache[i] = new_cost;
-			}
-			
-			cost += cost_cache[i];
-			
-			if (cost > min_cost)
-			{
-				must_move = i;
-				break;
-			}
-		}
+					VecSubf(vec_second, vec2, vec1);
+					length2 = Normalize(vec_second);
 		
-		if (must_move != i || must_move > nb_joints - 1)
-		{
-			must_move = nb_joints - 1;
-		}
-
-		/* cost optimizing */
-		if (cost < min_cost)
-		{
-			min_cost = cost;
-			memcpy(best_positions, positions, sizeof(int) * nb_joints);
+					/* check angle */
+					if (i != 0 && G.scene->toolsettings->skgen_retarget_angle_weight > 0)
+					{
+						RigEdge *previous = edge->prev;
+						
+						vec0 = vec_cache[i - 1];
+						VecSubf(vec_first, vec1, vec0); 
+						length1 = Normalize(vec_first);
+						
+						/* Angle cost */	
+						new_cost += costAngle(previous->angle, vec_first, vec_second, length1, length2);
+					}
+		
+					/* Length Cost */
+					new_cost += costLength(edge->length, length2);
+					
+					/* Distance Cost */
+					new_cost += costDistance(&iter, vec1, vec2, i1, i2);
+					
+					cost_cache[i] = new_cost;
+				}
+				
+				cost += cost_cache[i];
+				
+				if (cost > min_cost)
+				{
+					must_move = i;
+					break;
+				}
+			}
+			
+			if (must_move != i || must_move > nb_joints - 1)
+			{
+				must_move = nb_joints - 1;
+			}
+	
+			/* cost optimizing */
+			if (cost < min_cost)
+			{
+				min_cost = cost;
+				memcpy(best_positions, positions, sizeof(int) * nb_joints);
+			}
 		}
 	}
-#elif 1 /* SIMULATED ANNEALING */
+	/* SIMULATED ANNEALING */
+#define ANNEALING_ITERATION
+	else if (G.scene->toolsettings->skgen_optimisation_method == 1)
 	{
 		RigEdge *previous;
 		float *cost_cube;
-		int k, kmax;
-		
-		kmax = 10000;
+#ifdef ANNEALING_ITERATION
+		int k, kmax = 100000;
+#else
+		double time_start, time_current, time_length = 3;
+		int k;
+#endif
 		
 		BLI_srand(nb_joints);
 		
@@ -1068,12 +1069,21 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 			min_cost += cost_cube[3 * i + 1];
 		}
 		
+		printf("initial cost: %f\n", min_cost);
+		
+#ifdef ANNEALING_ITERATION
 		for (k = 0; k < kmax; k++)
+#else
+		for (time_start = PIL_check_seconds_timer(), time_current = time_start, k = 0;
+			 time_current - time_start < time_length;
+			 time_current = PIL_check_seconds_timer(), k++)
+#endif
 		{
 			int status;
 			int moving_joint = -1;
 			int move_direction = -1;
 			float delta_cost;
+			float temperature;
 			
 			status = neighbour(nb_joints, cost_cube, &moving_joint, &move_direction);
 			
@@ -1084,7 +1094,13 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 			
 			delta_cost = cost_cube[moving_joint * 3 + (1 + move_direction)];
 
-			if (probability(delta_cost, (float)k / (float)kmax) > BLI_frand())
+#ifdef ANNEALING_ITERATION
+			temperature = 1 - (float)k / (float)kmax;
+#else
+			temperature = 1 - (float)((time_current - time_start) / time_length);
+			temperature = temperature * temperature;
+#endif
+			if (probability(delta_cost, temperature) > BLI_frand())
 			{
 				/* update position */			
 				positions[moving_joint] += move_direction;
@@ -1095,7 +1111,7 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 				
 				min_cost += delta_cost;
 
-				printf("%i: %0.3f\n", k, delta_cost);
+				//printf("%i: %0.3f\n", k, delta_cost);
 	
 				/* update cost cube */			
 				for (previous = iarc->edges.first, edge = previous->next, i = 0;
@@ -1112,11 +1128,14 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 			}
 		}
 		
+		printf("k = %i\n", k);
+		
 		memcpy(best_positions, positions, sizeof(int) * nb_joints);
 		
 		MEM_freeN(cost_cube);
 	}	
-#else	  /* GRADIENT DESCENT*/
+	/* GRADIENT DESCENT*/
+	else if (G.scene->toolsettings->skgen_optimisation_method == 2)
 	{
 		RigEdge *previous;
 		float *cost_cube;
@@ -1198,7 +1217,6 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 		
 		MEM_freeN(cost_cube);
 	}
-#endif
 
 	vec0 = node_start->p;
 	initArcIterator(&iter, earc, node_start);
@@ -1416,10 +1434,10 @@ static void matchMultiResolutionArc(RigNode *start_node, RigArc *next_iarc, Reeb
 {
 	ReebNode *enode = next_earc->head;
 	int ishape, eshape;
-	int MAGIC_NUMBER = 100; /* FIXME */
+	int shape_levels = SHAPE_RADIX * SHAPE_RADIX; /* two levels */
 
-	ishape = BLI_subtreeShape((BNode*)start_node, (BArc*)next_iarc, 1) % MAGIC_NUMBER;
-	eshape = BLI_subtreeShape((BNode*)enode, (BArc*)next_earc, 1) % MAGIC_NUMBER;
+	ishape = BLI_subtreeShape((BNode*)start_node, (BArc*)next_iarc, 1) % shape_levels;
+	eshape = BLI_subtreeShape((BNode*)enode, (BArc*)next_earc, 1) % shape_levels;
 	
 	while (ishape != eshape && next_earc->link_up)
 	{
@@ -1427,40 +1445,33 @@ static void matchMultiResolutionArc(RigNode *start_node, RigArc *next_iarc, Reeb
 		
 		next_earc = next_earc->link_up;
 		enode = next_earc->head;
-		eshape = BLI_subtreeShape((BNode*)enode, (BArc*)next_earc, 1) % MAGIC_NUMBER;
+		eshape = BLI_subtreeShape((BNode*)enode, (BArc*)next_earc, 1) % shape_levels;
 	} 
 
 	next_earc->flag = 1; // mark as taken
 	next_iarc->link_mesh = next_earc;
 }
 
-static void matchMultiResolutionStartingArc(ReebGraph *reebg, RigArc *iarc, RigNode *inode)
+static void matchMultiResolutionStartingNode(ReebGraph *reebg, RigNode *inode)
 {
-	ReebArc *earc;
 	ReebNode *enode;
 	int ishape, eshape;
-	int MAGIC_NUMBER = 100; /* FIXME */
+	int shape_levels = SHAPE_RADIX * SHAPE_RADIX; /* two levels */
 	
-	earc = reebg->arcs.first;
-	enode = earc->head;
+	enode = reebg->nodes.first;
 	
-	ishape = BLI_subtreeShape((BNode*)inode, (BArc*)iarc, 1) % MAGIC_NUMBER;
-	eshape = BLI_subtreeShape((BNode*)enode, (BArc*)earc, 1) % MAGIC_NUMBER;
+	ishape = BLI_subtreeShape((BNode*)inode, NULL, 0) % shape_levels;
+	eshape = BLI_subtreeShape((BNode*)enode, NULL, 0) % shape_levels;
 	
 	while (ishape != eshape && reebg->link_up)
 	{
-		earc->flag = 1; // mark previous as taken, to prevent backtrack on lower levels
-		
 		reebg = reebg->link_up;
 		
-		earc = reebg->arcs.first;
-		enode = earc->head;
+		enode = reebg->nodes.first;
 		
-		eshape = BLI_subtreeShape((BNode*)enode, (BArc*)earc, 1) % MAGIC_NUMBER;
+		eshape = BLI_subtreeShape((BNode*)enode, NULL, 0) % shape_levels;
 	} 
 
-	earc->flag = 1; // mark as taken
-	iarc->link_mesh = earc;
 	inode->link_mesh = enode;
 }
 
@@ -1525,30 +1536,34 @@ static void findCorrespondingArc(RigArc *start_arc, RigNode *start_node, RigArc
 
 static void retargetSubgraph(RigGraph *rigg, RigArc *start_arc, RigNode *start_node)
 {
-	RigArc *iarc = start_arc;
-	ReebArc *earc = start_arc->link_mesh;
 	RigNode *inode = start_node;
-	ReebNode *enode = start_node->link_mesh;
 	int i;
+
+	/* no start arc on first node */
+	if (start_arc)
+	{		
+		ReebNode *enode = start_node->link_mesh;
+		ReebArc *earc = start_arc->link_mesh;
 		
-	retargetArctoArc(iarc);
+		retargetArctoArc(start_arc);
+		
+		enode = BIF_otherNodeFromIndex(earc, enode);
+		inode = (RigNode*)BLI_otherNode((BArc*)start_arc, (BNode*)inode);
 	
-	enode = BIF_otherNodeFromIndex(earc, enode);
-	inode = (RigNode*)BLI_otherNode((BArc*)iarc, (BNode*)inode);
-	
-	/* Link with lowest possible node
-	 * Enabling going back to lower levels for each arc
-	 * */
-	inode->link_mesh = BIF_lowestLevelNode(enode);
+		/* Link with lowest possible node
+		 * Enabling going back to lower levels for each arc
+		 * */
+		inode->link_mesh = BIF_lowestLevelNode(enode);
+	}
 	
 	for(i = 0; i < inode->degree; i++)
 	{
 		RigArc *next_iarc = (RigArc*)inode->arcs[i];
 		
 		/* no back tracking */
-		if (next_iarc != iarc)
+		if (next_iarc != start_arc)
 		{
-			findCorrespondingArc(iarc, inode, next_iarc);
+			findCorrespondingArc(start_arc, inode, next_iarc);
 			if (next_iarc->link_mesh)
 			{
 				retargetSubgraph(rigg, next_iarc, inode);
@@ -1560,9 +1575,6 @@ static void retargetSubgraph(RigGraph *rigg, RigArc *start_arc, RigNode *start_n
 static void retargetGraphs(RigGraph *rigg)
 {
 	ReebGraph *reebg = rigg->link_mesh;
-	ReebArc *earc;
-	RigArc *iarc;
-	ReebNode *enode;
 	RigNode *inode;
 	
 	/* flag all ReebArcs as not taken */
@@ -1571,17 +1583,11 @@ static void retargetGraphs(RigGraph *rigg)
 	/* return to first level */
 	reebg = rigg->link_mesh;
 	
-	iarc = (RigArc*)rigg->head->arcs[0];
-	inode = iarc->tail;
+	inode = rigg->head;
 	
-	matchMultiResolutionStartingArc(reebg, iarc, inode);
+	matchMultiResolutionStartingNode(reebg, inode);
 
-	earc = iarc->link_mesh; /* has been set earlier */
-	enode = earc->head;
-
-	inode->link_mesh = enode;
-
-	retargetSubgraph(rigg, iarc, inode);
+	retargetSubgraph(rigg, NULL, inode);
 }
 
 void BIF_retargetArmature()
diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c
index 4df4826de28..c0f1a1f99b9 100644
--- a/source/blender/src/buttons_editing.c
+++ b/source/blender/src/buttons_editing.c
@@ -5019,6 +5019,14 @@ static void skgen_graph_block(uiBlock *block)
 	uiDefButBitS(block, TOG, SKGEN_FILTER_EXTERNAL, B_DIFF, "Filter Ex",	1025,110, 53,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Filter external small arcs from graph");
 	uiDefButBitS(block, TOG, SKGEN_FILTER_SMART, 	B_DIFF, "Sm",			1078,110, 30,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Smart Filtering");
 	uiDefButF(block, NUM, B_DIFF, 							"",				1111,110,164,19, &G.scene->toolsettings->skgen_threshold_external,0.0, 10.0, 10, 0,	"Specify the threshold ratio for filtering external arcs");
+	
+	uiDefButBitS(block, TOG, SKGEN_SYMMETRY, B_DIFF, 		"Symmetry",		1025, 90,125,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Restore symmetries based on topology");
+	uiDefButF(block, NUM, B_DIFF, 							"T:",			1150, 90,125,19, &G.scene->toolsettings->skgen_symmetry_limit,0.0, 1.0, 10, 0,	"Specify the threshold distance for considering potential symmetric arcs");
+	uiDefButC(block, NUM, B_DIFF, 							"P:",			1025, 70, 62,19, &G.scene->toolsettings->skgen_postpro_passes, 0, 10, 10, 0,		"Specify the number of processing passes on the embeddings");
+	uiDefButC(block, ROW, B_DIFF,							"Smooth",		1087, 70, 63,19, &G.scene->toolsettings->skgen_postpro, 5.0, (float)SKGEN_SMOOTH, 0, 0, "Smooth embeddings");
+	uiDefButC(block, ROW, B_DIFF,							"Average",		1150, 70, 62,19, &G.scene->toolsettings->skgen_postpro, 5.0, (float)SKGEN_AVERAGE, 0, 0, "Average embeddings");
+	uiDefButC(block, ROW, B_DIFF,							"Sharpen",		1212, 70, 63,19, &G.scene->toolsettings->skgen_postpro, 5.0, (float)SKGEN_SHARPEN, 0, 0, "Sharpen embeddings");
+
 	uiBlockEndAlign(block);
 }
 
@@ -5038,11 +5046,11 @@ static void editing_panel_mesh_skgen_display(Object *ob, Mesh *me)
 	
 	skgen_graph_block(block);
 
-	uiDefButBitS(block, TOG, SKGEN_DISP_LENGTH, REDRAWVIEW3D,	"Length",			1025, 60, 83,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,		"Show Length");
-	uiDefButBitS(block, TOG, SKGEN_DISP_WEIGHT, REDRAWVIEW3D,	"Weight",			1108, 60, 83,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,		"Show Weight");
-	uiDefButBitS(block, TOG, SKGEN_DISP_ORIG, REDRAWVIEW3D,		"Original",			1191, 60, 84,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,		"Show Original Graph");
+	uiDefButBitS(block, TOG, SKGEN_DISP_LENGTH, REDRAWVIEW3D,	"Length",			1025, 40, 83,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,		"Show Length");
+	uiDefButBitS(block, TOG, SKGEN_DISP_WEIGHT, REDRAWVIEW3D,	"Weight",			1108, 40, 83,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,		"Show Weight");
+	uiDefButBitS(block, TOG, SKGEN_DISP_ORIG, REDRAWVIEW3D,		"Original",			1191, 40, 84,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,		"Show Original Graph");
 
-	uiDefButC(block, NUM, REDRAWVIEW3D, 						"Level:",			1025, 40, 125,19, &G.scene->toolsettings->skgen_multi_level, 0, 5, 1, 0,"Specify the level to draw");
+	uiDefButC(block, NUM, REDRAWVIEW3D, 						"Level:",			1025, 20, 125,19, &G.scene->toolsettings->skgen_multi_level, 0, 5, 1, 0,"Specify the level to draw");
 }
 
 static void editing_panel_mesh_skgen_retarget(Object *ob, Mesh *me)
@@ -5057,18 +5065,10 @@ static void editing_panel_mesh_skgen_retarget(Object *ob, Mesh *me)
 
 	skgen_graph_block(block);
 
-	uiDefButF(block, NUM, B_DIFF, 							"Ang:",			1025, 60, 83,19, &G.scene->toolsettings->skgen_retarget_angle_weight, 0, 10, 1, 0,		"Angle Weight");
-	uiDefButF(block, NUM, B_DIFF, 							"Len:",			1108, 60, 83,19, &G.scene->toolsettings->skgen_retarget_length_weight, 0, 10, 1, 0,		"Length Weight");
-	uiDefButF(block, NUM, B_DIFF, 							"Dist:",		1191, 60, 84,19, &G.scene->toolsettings->skgen_retarget_distance_weight, 0, 10, 1, 0,		"Distance Weight");
-
-	uiBlockBeginAlign(block);
-	uiDefButBitS(block, TOG, SKGEN_SYMMETRY, B_DIFF, 		"Symmetry",		1025, 30,125,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Restore symmetries based on topology");
-	uiDefButF(block, NUM, B_DIFF, 							"T:",			1150, 30,125,19, &G.scene->toolsettings->skgen_symmetry_limit,0.0, 1.0, 10, 0,	"Specify the threshold distance for considering potential symmetric arcs");
-	uiDefButC(block, NUM, B_DIFF, 							"P:",			1025, 10, 62,19, &G.scene->toolsettings->skgen_postpro_passes, 0, 10, 10, 0,		"Specify the number of processing passes on the embeddings");
-	uiDefButC(block, ROW, B_DIFF,							"Smooth",		1087, 10, 63,19, &G.scene->toolsettings->skgen_postpro, 5.0, (float)SKGEN_SMOOTH, 0, 0, "Smooth embeddings");
-	uiDefButC(block, ROW, B_DIFF,							"Average",		1150, 10, 62,19, &G.scene->toolsettings->skgen_postpro, 5.0, (float)SKGEN_AVERAGE, 0, 0, "Average embeddings");
-	uiDefButC(block, ROW, B_DIFF,							"Sharpen",		1212, 10, 63,19, &G.scene->toolsettings->skgen_postpro, 5.0, (float)SKGEN_SHARPEN, 0, 0, "Sharpen embeddings");
-	uiBlockEndAlign(block);
+	uiDefButF(block, NUM, B_DIFF, 							"Ang:",			1025, 40, 83,19, &G.scene->toolsettings->skgen_retarget_angle_weight, 0, 10, 1, 0,		"Angle Weight");
+	uiDefButF(block, NUM, B_DIFF, 							"Len:",			1108, 40, 83,19, &G.scene->toolsettings->skgen_retarget_length_weight, 0, 10, 1, 0,		"Length Weight");
+	uiDefButF(block, NUM, B_DIFF, 							"Dist:",		1191, 40, 84,19, &G.scene->toolsettings->skgen_retarget_distance_weight, 0, 10, 1, 0,		"Distance Weight");
+	uiDefButC(block, NUM, B_DIFF, 							"Method:",		1025, 20, 125,19, &G.scene->toolsettings->skgen_optimisation_method, 0, 2, 1, 0,"Optimisation Method (0: brute, 1: annealing, 3: gradient");
 }
 
 static void editing_panel_mesh_skgen(Object *ob, Mesh *me)
@@ -5088,7 +5088,7 @@ static void editing_panel_mesh_skgen(Object *ob, Mesh *me)
 	uiBlockBeginAlign(block);
 	for(i = 0; i < SKGEN_SUB_TOTAL; i++)
 	{
-		int y = 90 - 20 * i;
+		int y = 50 - 20 * i;
 		
 		but = uiDefIconBut(block, BUT, B_MODIFIER_RECALC, VICON_MOVE_DOWN, 		1025, y, 16, 19, NULL, 0.0, 0.0, 0.0, 0.0, "Change the order the subdivisions algorithm are applied");
 		uiButSetFunc(but, skgen_reorder, SET_INT_IN_POINTER(i), NULL);
@@ -5113,12 +5113,6 @@ static void editing_panel_mesh_skgen(Object *ob, Mesh *me)
 		}
 	}
 
-	uiDefButBitS(block, TOG, SKGEN_SYMMETRY, B_DIFF, 		"Symmetry",		1025, 30,125,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,					"Restore symmetries based on topology");
-	uiDefButF(block, NUM, B_DIFF, 							"T:",			1150, 30,125,19, &G.scene->toolsettings->skgen_symmetry_limit,0.0, 1.0, 10, 0,	"Specify the threshold distance for considering potential symmetric arcs");
-	uiDefButC(block, NUM, B_DIFF, 							"P:",			1025, 10, 62,19, &G.scene->toolsettings->skgen_postpro_passes, 0, 10, 10, 0,		"Specify the number of processing passes on the embeddings");
-	uiDefButC(block, ROW, B_DIFF,							"Smooth",		1087, 10, 63,19, &G.scene->toolsettings->skgen_postpro, 5.0, (float)SKGEN_SMOOTH, 0, 0, "Smooth embeddings");
-	uiDefButC(block, ROW, B_DIFF,							"Average",		1150, 10, 62,19, &G.scene->toolsettings->skgen_postpro, 5.0, (float)SKGEN_AVERAGE, 0, 0, "Average embeddings");
-	uiDefButC(block, ROW, B_DIFF,							"Sharpen",		1212, 10, 63,19, &G.scene->toolsettings->skgen_postpro, 5.0, (float)SKGEN_SHARPEN, 0, 0, "Sharpen embeddings");
 	uiBlockEndAlign(block);
 }
 
diff --git a/source/blender/src/reeb.c b/source/blender/src/reeb.c
index 8834e1c1a5e..71eb550fd21 100644
--- a/source/blender/src/reeb.c
+++ b/source/blender/src/reeb.c
@@ -86,6 +86,7 @@ ReebGraph *FILTERED_RG = NULL;
  * */
  
 #define DEBUG_REEB
+#define DEBUG_REEB_NODE
 
 typedef enum {
 	MERGE_LOWER,
@@ -380,10 +381,10 @@ void NodeDegreeDecrement(ReebGraph *rg, ReebNode *node)
 
 void NodeDegreeIncrement(ReebGraph *rg, ReebNode *node)
 {
-	if (node->degree == 0)
-	{
-		printf("first connect node %i\n", node->index);
-	}
+//	if (node->degree == 0)
+//	{
+//		printf("first connect node %i\n", node->index);
+//	}
 
 	node->degree++;
 }

From db5a83d083c1517316ff94a011c4a21e0ada7d34 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Tue, 15 Jul 2008 21:07:13 +0000
Subject: [PATCH 095/252] More merging goodness 	fix adjacency list inline
 instead of having to rebuild fully 	reweight joined graphs properly

---
 source/blender/blenlib/BLI_graph.h    |  1 +
 source/blender/blenlib/intern/graph.c | 38 +++++++++++++---
 source/blender/src/reeb.c             | 64 ++++++++++++++++++---------
 3 files changed, 77 insertions(+), 26 deletions(-)

diff --git a/source/blender/blenlib/BLI_graph.h b/source/blender/blenlib/BLI_graph.h
index dba02932e02..be5d1f5d10c 100644
--- a/source/blender/blenlib/BLI_graph.h
+++ b/source/blender/blenlib/BLI_graph.h
@@ -76,6 +76,7 @@ void BLI_flagArcs(BGraph *graph, int flag);
 int BLI_hasAdjacencyList(BGraph *rg);
 void BLI_buildAdjacencyList(BGraph *rg);
 void BLI_rebuildAdjacencyList(BGraph* rg);
+void BLI_rebuildAdjacencyListForNode(BGraph* rg, BNode *node);
 void BLI_freeAdjacencyList(BGraph *rg);
 
 int BLI_FlagSubgraphs(BGraph *graph);
diff --git a/source/blender/blenlib/intern/graph.c b/source/blender/blenlib/intern/graph.c
index fce9d0b6d95..32d9f3b91b7 100644
--- a/source/blender/blenlib/intern/graph.c
+++ b/source/blender/blenlib/intern/graph.c
@@ -90,12 +90,6 @@ static void addArcToNodeAdjacencyList(BNode *node, BArc *arc)
 	node->flag++;
 }
 
-void BLI_rebuildAdjacencyList(BGraph *rg)
-{
-	BLI_freeAdjacencyList(rg);
-	BLI_buildAdjacencyList(rg);
-}
-
 void BLI_buildAdjacencyList(BGraph *rg)
 {
 	BNode *node;
@@ -129,6 +123,38 @@ void BLI_buildAdjacencyList(BGraph *rg)
 	}
 }
 
+void BLI_rebuildAdjacencyListForNode(BGraph* rg, BNode *node)
+{
+	BArc *arc;
+
+	if (node->arcs != NULL)
+	{
+		MEM_freeN(node->arcs);
+	}
+	
+	node->arcs = MEM_callocN((node->degree) * sizeof(BArc*), "adjacency list");
+	
+	/* temporary use to indicate the first index available in the lists */
+	node->flag = 0;
+
+	for(arc = rg->arcs.first; arc; arc= arc->next)
+	{
+		if (arc->head == node)
+		{
+			addArcToNodeAdjacencyList(arc->head, arc);
+		}
+		else if (arc->tail == node)
+		{
+			addArcToNodeAdjacencyList(arc->tail, arc);
+		}
+	}
+
+	if (node->degree != node->flag)
+	{
+		printf("error in node [%p]. Added only %i arcs out of %i\n", node, node->flag, node->degree);
+	}
+}
+
 void BLI_freeAdjacencyList(BGraph *rg)
 {
 	BNode *node;
diff --git a/source/blender/src/reeb.c b/source/blender/src/reeb.c
index 71eb550fd21..b3fe465830a 100644
--- a/source/blender/src/reeb.c
+++ b/source/blender/src/reeb.c
@@ -328,7 +328,7 @@ ReebGraph * copyReebGraph(ReebGraph *rg)
 		copyArc(cp_rg, arc);
 	}
 	
-	BLI_rebuildAdjacencyList((BGraph*)cp_rg);
+	BLI_buildAdjacencyList((BGraph*)cp_rg);
 	
 	return cp_rg;
 }
@@ -1063,30 +1063,51 @@ void sortArcs(ReebGraph *rg)
 
 void reweightArc(ReebArc *arc, ReebNode *start_node, float start_weight)
 {
-	float delta_weight = arc->tail->weight - arc->head->weight;
+	ReebNode *node;
+	float old_weight;
+	float end_weight = start_weight + (arc->tail->weight - arc->head->weight);
+	int i;
 	
 	if (arc->tail == start_node)
 	{
 		flipArc(arc);
 	}
 	
+	node = arc->tail;
+	
+	for (i = 0; i < node->degree; i++)
+	{
+		ReebArc *next_arc = node->arcs[i];
+		
+		if (next_arc != arc) /* prevent backtracking */
+		{
+			reweightArc(next_arc, node, end_weight);
+		}
+	}
+	
+	old_weight = arc->head->weight; /* backup head weight, other arcs need it intact, it will be fixed by the source arc */
+	
 	arc->head->weight = start_weight;
-	arc->tail->weight = start_weight + delta_weight;
+	arc->tail->weight = end_weight;
 	
 	reweightBuckets(arc);
 	resizeArcBuckets(arc);
 	fillArcEmptyBuckets(arc);
 	
-	/* recurse here */
+	arc->head->weight = old_weight;
 } 
 
 void reweightSubgraph(ReebGraph *rg, ReebNode *start_node, float start_weight)
 {
-	ReebArc *arc;
-	
-	arc = start_node->arcs[0];
-	
-	reweightArc(arc, start_node, start_weight);
+	int i;
+		
+	for (i = 0; i < start_node->degree; i++)
+	{
+		ReebArc *next_arc = start_node->arcs[i];
+		
+		reweightArc(next_arc, start_node, start_weight);
+	}
+	start_node->weight = start_weight;
 }
 
 int joinSubgraphsEnds(ReebGraph *rg, float threshold, int nb_subgraphs)
@@ -1144,6 +1165,7 @@ int joinSubgraphsEnds(ReebGraph *rg, float threshold, int nb_subgraphs)
 						fillArcEmptyBuckets(start_arc);
 						
 						NodeDegreeIncrement(rg, end_node);
+						BLI_rebuildAdjacencyListForNode((BGraph*)rg, (BNode*)end_node);
 						
 						BLI_removeNode((BGraph*)rg, (BNode*)start_node);
 					}
@@ -1163,16 +1185,20 @@ int joinSubgraphs(ReebGraph *rg, float threshold)
 	int nb_subgraphs;
 	int joined = 0;
 	
-	BLI_rebuildAdjacencyList((BGraph*)rg);
+	BLI_buildAdjacencyList((BGraph*)rg);
 	
 	nb_subgraphs = BLI_FlagSubgraphs((BGraph*)rg);
 	
-	joined |= joinSubgraphsEnds(rg, threshold, nb_subgraphs);
-	
-	if (joined)
+	if (nb_subgraphs > 1)
 	{
-		removeNormalNodes(rg);
-		BLI_rebuildAdjacencyList((BGraph*)rg);
+		joined |= joinSubgraphsEnds(rg, threshold, nb_subgraphs);
+		
+		if (joined)
+		{
+			verifyNodeDegree(rg);
+			removeNormalNodes(rg);
+			BLI_buildAdjacencyList((BGraph*)rg);
+		}
 	}
 	
 	return joined;
@@ -1682,7 +1708,7 @@ void filterGraph(ReebGraph *rg, short options, float threshold_internal, float t
 	if (options & SKGEN_FILTER_SMART)
 	{
 		filterSmartReebGraph(rg, 0.5);
-		BLI_rebuildAdjacencyList((BGraph*)rg);
+		BLI_buildAdjacencyList((BGraph*)rg);
 		filterCyclesReebGraph(rg, 0.5);
 	}
 	
@@ -1698,7 +1724,7 @@ void finalizeGraph(ReebGraph *rg, char passes, char method)
 {
 	int i;
 	
-	BLI_rebuildAdjacencyList((BGraph*)rg);
+	BLI_buildAdjacencyList((BGraph*)rg);
 
 	sortNodes(rg);
 	
@@ -3162,9 +3188,7 @@ ReebGraph *BIF_ReebGraphMultiFromEditMesh(void)
 	/* Filtering might have created degree 2 nodes, so remove them */
 	removeNormalNodes(rg);
 	
-	joinSubgraphs(rg, 1.5);
-	
-	BLI_rebuildAdjacencyList((BGraph*)rg);
+	joinSubgraphs(rg, 1.0);
 	
 	/* calc length before copy, so we have same length on all levels */
 	BLI_calcGraphLength((BGraph*)rg);

From cc89221a2461e289edb380922d9f53566dc2a9eb Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Wed, 16 Jul 2008 10:33:48 +0000
Subject: [PATCH 096/252] Previously relying on import to run scripts didn't
 work every time and was not the right way to do it. Also fixed a problem with
 'import *' not working and added the sys.modules list to the import
 suggestion list with a timed update.

---
 release/scripts/bpymodules/BPyTextPlugin.py | 38 ++++++++++++++-------
 release/scripts/textplugin_imports.py       | 12 +++----
 release/scripts/textplugin_membersuggest.py |  8 ++---
 release/scripts/textplugin_suggest.py       |  5 ++-
 4 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/release/scripts/bpymodules/BPyTextPlugin.py b/release/scripts/bpymodules/BPyTextPlugin.py
index 44038cfc3f6..7ff9db3e5c2 100644
--- a/release/scripts/bpymodules/BPyTextPlugin.py
+++ b/release/scripts/bpymodules/BPyTextPlugin.py
@@ -1,9 +1,9 @@
-import bpy
+import bpy, sys
 import __builtin__, tokenize
 from Blender.sys import time
 from tokenize import generate_tokens, TokenError
-# TODO: Remove the dependency for a full Python installation. Currently only the
-# tokenize module is required 
+
+# TODO: Remove the dependency for a full Python installation.
 
 # Context types
 NORMAL = 0
@@ -22,6 +22,23 @@ KEYWORDS = ['and', 'del', 'from', 'not', 'while', 'as', 'elif', 'global',
 _token_cache = None
 _cache_update = 0
 
+ModuleType = type(__builtin__)
+_modules = dict([(n, None) for n in sys.builtin_module_names])
+_modules_updated = 0
+
+def get_modules(since=1):
+	"""Returns the set of built-in modules and any modules that have been
+	imported into the system upto 'since' seconds ago.
+	"""
+	
+	global _modules, _modules_updated
+	
+	t = time()
+	if _modules_updated < t - since:
+		_modules.update(sys.modules)
+		_modules_updated = t
+	return _modules.keys()
+
 def suggest_cmp(x, y):
 	"""Use this method when sorting a list of suggestions.
 	"""
@@ -35,10 +52,11 @@ def cached_generate_tokens(txt, since=1):
 	
 	global _token_cache, _cache_update
 	
-	if _cache_update < time() - since:
+	t = time()
+	if _cache_update < t - since:
 		txt.reset()
 		_token_cache = [g for g in generate_tokens(txt.readline)]
-		_cache_update = time()
+		_cache_update = t
 	return _token_cache
 
 def get_module(name):
@@ -52,12 +70,6 @@ def get_module(name):
 		mod = getattr(mod, comp)
 	return mod
 
-def is_module(m):
-	"""Taken from the inspect module of the standard Python installation.
-	"""
-	
-	return isinstance(m, type(bpy))
-
 def type_char(v):
 	"""Returns the character used to signify the type of a variable. Use this
 	method to identify the type character for an item in a suggestion list.
@@ -68,7 +80,7 @@ def type_char(v):
 	  'v' if the parameter is variable or otherwise indeterminable
 	"""
 	
-	if is_module(v):
+	if isinstance(v, ModuleType):
 		return 'm'
 	elif callable(v):
 		return 'f'
@@ -215,7 +227,7 @@ def get_imports(txt):
 			if string == 'as':
 				impname = '.'.join(tmp)
 				step = 3
-			elif type == tokenize.NAME:
+			elif type == tokenize.NAME or string == '*':
 				tmp.append(string)
 			elif string != '.':
 				impname = '.'.join(tmp)
diff --git a/release/scripts/textplugin_imports.py b/release/scripts/textplugin_imports.py
index 1773427bb01..978efeb2c49 100644
--- a/release/scripts/textplugin_imports.py
+++ b/release/scripts/textplugin_imports.py
@@ -31,13 +31,13 @@ def main():
 		# Check instead for straight 'import'
 		pos2 = line.rfind('import ', 0, c)
 		if pos2 != -1 and (pos2 == c-7 or (pos2 < c-7 and line[c-2]==',')):
-			items = [(m, 'm') for m in sys.builtin_module_names]
+			items = [(m, 'm') for m in get_modules()]
 			items.sort(cmp = suggest_cmp)
 			txt.suggest(items, '')
 	
 	# Immediate 'from' before cursor
 	elif pos == c-5:
-		items = [(m, 'm') for m in sys.builtin_module_names]
+		items = [(m, 'm') for m in get_modules()]
 		items.sort(cmp = suggest_cmp)
 		txt.suggest(items, '')
 	
@@ -60,12 +60,10 @@ def main():
 			
 			items = [('*', 'k')]
 			for (k,v) in mod.__dict__.items():
-				if is_module(v): t = 'm'
-				elif callable(v): t = 'f'
-				else: t = 'v'
-				items.append((k, t))
+				items.append((k, type_char(v)))
 			items.sort(cmp = suggest_cmp)
 			txt.suggest(items, '')
 
-if OK:
+# Check we are running as a script and not imported as a module
+if __name__ == "__main__" and OK:
 	main()
diff --git a/release/scripts/textplugin_membersuggest.py b/release/scripts/textplugin_membersuggest.py
index 57c920c2bf9..61c803e9c0c 100644
--- a/release/scripts/textplugin_membersuggest.py
+++ b/release/scripts/textplugin_membersuggest.py
@@ -55,10 +55,7 @@ def main():
 	for k in attr:
 		try:
 			v = getattr(obj, k)
-			if is_module(v): t = 'm'
-			elif callable(v): t = 'f'
-			else: t = 'v'
-			list.append((k, t))
+			list.append((k, type_char(v)))
 		except (AttributeError, TypeError): # Some attributes are not readable
 			pass
 	
@@ -66,5 +63,6 @@ def main():
 		list.sort(cmp = suggest_cmp)
 		txt.suggest(list, pre[-1])
 
-if OK:
+# Check we are running as a script and not imported as a module
+if __name__ == "__main__" and OK:
 	main()
diff --git a/release/scripts/textplugin_suggest.py b/release/scripts/textplugin_suggest.py
index 770d2759bcc..3014aaf381f 100644
--- a/release/scripts/textplugin_suggest.py
+++ b/release/scripts/textplugin_suggest.py
@@ -43,10 +43,12 @@ def main():
 	
 	if check_membersuggest(line, c):
 		import textplugin_membersuggest
+		textplugin_membersuggest.main()
 		return
 	
 	elif check_imports(line, c):
 		import textplugin_imports
+		textplugin_imports.main()
 		return
 	
 	# Otherwise we suggest globals, keywords, etc.
@@ -71,5 +73,6 @@ def main():
 	list.sort(cmp = suggest_cmp)
 	txt.suggest(list, pre[-1])
 
-if OK:
+# Check we are running as a script and not imported as a module
+if __name__ == "__main__" and OK:
 	main()

From 062643eefd81e41bc4f396edb75ac3b21b0f17dc Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Wed, 16 Jul 2008 12:56:23 +0000
Subject: [PATCH 097/252] Fixed error when scripts were run without a visible
 Text to work on.

---
 release/scripts/textplugin_imports.py       | 3 +++
 release/scripts/textplugin_membersuggest.py | 3 +++
 release/scripts/textplugin_suggest.py       | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/release/scripts/textplugin_imports.py b/release/scripts/textplugin_imports.py
index 978efeb2c49..2186adf5c73 100644
--- a/release/scripts/textplugin_imports.py
+++ b/release/scripts/textplugin_imports.py
@@ -18,6 +18,9 @@ except ImportError:
 
 def main():
 	txt = bpy.data.texts.active
+	if not txt:
+		return
+	
 	line, c = current_line(txt)
 	
 	# Check we are in a normal context
diff --git a/release/scripts/textplugin_membersuggest.py b/release/scripts/textplugin_membersuggest.py
index 61c803e9c0c..d175549a7bd 100644
--- a/release/scripts/textplugin_membersuggest.py
+++ b/release/scripts/textplugin_membersuggest.py
@@ -18,6 +18,9 @@ except ImportError:
 
 def main():
 	txt = bpy.data.texts.active
+	if not txt:
+		return
+	
 	(line, c) = current_line(txt)
 	
 	# Check we are in a normal context
diff --git a/release/scripts/textplugin_suggest.py b/release/scripts/textplugin_suggest.py
index 3014aaf381f..20e248017af 100644
--- a/release/scripts/textplugin_suggest.py
+++ b/release/scripts/textplugin_suggest.py
@@ -33,6 +33,9 @@ def check_imports(line, c):
 
 def main():
 	txt = bpy.data.texts.active
+	if not txt:
+		return
+	
 	(line, c) = current_line(txt)
 	
 	# Check we are in a normal context

From e4748940c0a61171d5c4e45d8d5a9637d05ac429 Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Thu, 17 Jul 2008 06:35:30 +0000
Subject: [PATCH 098/252] soc-2008-mxcurioni: SWIG removal - completed SVertex
 and CurvePoint classes migration. Stabilized a lot of the code for C++ ->
 Python conversion. Added the correct rich comparison operator and tested it.
 Corrected 'dupplicate' typo and changde to __copy__ for Python API.

From now on, when a set should be output (PySet_Type), it is given as a list (PyList_Type). The reason is that it doesn't really matter what we bring back to the Python interpreter. The set is guaranteed in memory on the C++ side.

For the CurvePoint class, the userdata variable is not yet ported (and will probably available as a list or a dictionary). The CurvePoint implementation works except for the initialization from other CurvePoints: somehow, the inner variables don't seem to be correctly handled. I do not know if it is a bug in Freestyle or if the CurvePoint object's state is correct for my test case. CurvePoint needs more testing.
---
 source/blender/freestyle/SConscript           |   1 +
 .../intern/python/BinaryPredicate0D.cpp       |   2 +-
 .../intern/python/BinaryPredicate1D.cpp       |   2 +-
 .../freestyle/intern/python/Convert.cpp       |  67 ++-
 .../blender/freestyle/intern/python/Convert.h |   4 +-
 source/blender/freestyle/intern/python/Id.cpp |  64 +--
 .../freestyle/intern/python/Interface0D.cpp   |  14 +-
 .../intern/python/Interface0D/CurvePoint.cpp  | 234 ++++-----
 .../intern/python/Interface0D/CurvePoint.h    |   3 +-
 .../intern/python/Interface0D/SVertex.cpp     | 483 +++++++++---------
 .../freestyle/intern/python/Interface1D.cpp   |   2 +-
 .../python/Interface1D/FEdge/FEdgeSharp.cpp   |   2 +-
 .../freestyle/intern/swig/ModuleWrapper.cpp   |  80 +--
 .../freestyle/intern/view_map/Silhouette.h    |  12 +-
 .../freestyle/intern/view_map/ViewMap.h       |  18 +-
 .../freestyle/intern/winged_edge/WEdge.cpp    |  20 +-
 .../freestyle/intern/winged_edge/WEdge.h      |  10 +-
 .../freestyle/intern/winged_edge/WXEdge.h     |   8 +-
 source/blender/freestyle/python/Freestyle.py  |  16 +-
 19 files changed, 518 insertions(+), 524 deletions(-)

diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript
index f54c12470a6..42d78a393eb 100644
--- a/source/blender/freestyle/SConscript
+++ b/source/blender/freestyle/SConscript
@@ -67,6 +67,7 @@ python_sources = [
 					prefix + '/Id.cpp',
 					prefix + '/Interface0D.cpp',
 					prefix + '/Interface0D/CurvePoint.cpp',
+					prefix + '/Interface0D/SVertex.cpp',
 					prefix + '/Interface1D.cpp'
 				]
 
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate0D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate0D.cpp
index d76c1ba78ba..67358c65bbf 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate0D.cpp
+++ b/source/blender/freestyle/intern/python/BinaryPredicate0D.cpp
@@ -153,7 +153,7 @@ PyObject * BinaryPredicate0D___call__( BPy_BinaryPredicate0D *self, PyObject *ar
 	BPy_Interface0D *obj1, *obj2;
 	bool b;
 
-	if( !PyArg_ParseTuple(args,(char *)"OO:BinaryPredicate0D___call__", &obj1, obj2) ) {
+	if( !PyArg_ParseTuple(args,(char *)"OO", &obj1, &obj2) ) {
 		cout << "ERROR: BinaryPredicate0D___call__ " << endl;		
 		return NULL;
 	}
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D.cpp
index 73d5a3a4232..bf2772ecdcc 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D.cpp
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D.cpp
@@ -151,7 +151,7 @@ PyObject *BinaryPredicate1D___call__( BPy_BinaryPredicate1D *self, PyObject *arg
 	BPy_Interface1D *obj1, *obj2;
 	bool b;
 	
-	if( !PyArg_ParseTuple(args,(char *)"OO:BinaryPredicate1D___call__", &obj1, &obj2) ) {
+	if( !PyArg_ParseTuple(args,(char *)"OO", &obj1, &obj2) ) {
 		cout << "ERROR: BinaryPredicate1D___call__ " << endl;		
 		return NULL;
 	}
diff --git a/source/blender/freestyle/intern/python/Convert.cpp b/source/blender/freestyle/intern/python/Convert.cpp
index d87848cde8e..59b2406f480 100644
--- a/source/blender/freestyle/intern/python/Convert.cpp
+++ b/source/blender/freestyle/intern/python/Convert.cpp
@@ -7,21 +7,6 @@ extern "C" {
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-static char M_Convert_doc[] = "The Blender.Freestyle.Convert utility submodule";
-/*----------------------Freestyle module method def----------------------------*/
-struct PyMethodDef M_Convert_methods[] = {
-//	{"testOutput", ( PyCFunction ) Freestyle_testOutput, METH_NOARGS, "() - Return Curve Data name"},
-	{NULL, NULL, 0, NULL}
-};
-
-
-//-------------------MODULE INITIALIZATION--------------------------------
-PyObject *Convert_Init( void )
-{
-	return Py_InitModule3( "Blender.Freestyle.Convert", M_Convert_methods, M_Convert_doc );
-}
-
-//-------------------------------------------------------------------------
 
 PyObject *PyBool_from_bool( bool b ){
 	// SWIG_From_bool
@@ -31,32 +16,64 @@ PyObject *PyBool_from_bool( bool b ){
 
 PyObject *Vector_from_Vec2f( Vec2f vec ) {
 	float vec_data[2]; // because vec->_coord is protected
-	vec_data[0] = vec.x();		vec_data[1] = vec.y();
-	return newVectorObject( vec_data, 2, Py_NEW);
+
+	if( &vec != 0 ){
+		vec_data[0] = vec.x();		vec_data[1] = vec.y();
+		return newVectorObject( vec_data, 2, Py_NEW);
+	} 
+
+	Py_RETURN_NONE;
 }
 
 PyObject *Vector_from_Vec3f( Vec3f vec ) {
 	float vec_data[3]; // because vec->_coord is protected
-	vec_data[0] = vec.x();		vec_data[1] = vec.y(); 		vec_data[2] = vec.z(); 
-	return newVectorObject( vec_data, 3, Py_NEW);
+	
+	if( &vec != 0 ){
+		vec_data[0] = vec.x();		vec_data[1] = vec.y(); 		vec_data[2] = vec.z(); 
+		return newVectorObject( vec_data, 3, Py_NEW);
+	} 
+
+	Py_RETURN_NONE;
 }
 
 PyObject *Vector_from_Vec3r( Vec3r vec ) {
 	float vec_data[3]; // because vec->_coord is protected
-	vec_data[0] = vec.x();		vec_data[1] = vec.y(); 		vec_data[2] = vec.z(); 
-	return newVectorObject( vec_data, 3, Py_NEW);
+	
+	if( &vec != 0 ){
+		vec_data[0] = vec.x();		vec_data[1] = vec.y(); 		vec_data[2] = vec.z(); 
+		return newVectorObject( vec_data, 3, Py_NEW);
+	} 
+
+	Py_RETURN_NONE;
 }
 
 PyObject *BPy_Id_from_Id( Id id ) {
 	BPy_Id *py_id;
 	
-	py_id = (BPy_Id *) Id_Type.tp_new( &Id_Type, 0, 0 );
-	py_id->id->setFirst( id.getFirst() );
-	py_id->id->setSecond( id.getSecond() );
+	if( &id != 0 ) {
+		py_id = (BPy_Id *) Id_Type.tp_new( &Id_Type, 0, 0 );
+		py_id->id = new Id( id.getFirst(), id.getSecond() );
+
+		return (PyObject *)py_id;
+	}
 	
-	return (PyObject *)py_id;
+	Py_RETURN_NONE;
 }
 
+PyObject *BPy_SVertex_from_SVertex( SVertex sv ) {
+	BPy_SVertex *py_sv;
+
+	if( &sv != 0 ) {
+		py_sv = (BPy_SVertex *) SVertex_Type.tp_new( &SVertex_Type, 0, 0 );
+		py_sv->sv = new SVertex( sv );
+		py_sv->py_if0D.if0D = py_sv->sv;
+
+		return (PyObject *)py_sv;
+	}
+
+	Py_RETURN_NONE;
+}
+	
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/Convert.h b/source/blender/freestyle/intern/python/Convert.h
index a2e7eeafd94..ba8e3ea02d2 100644
--- a/source/blender/freestyle/intern/python/Convert.h
+++ b/source/blender/freestyle/intern/python/Convert.h
@@ -5,6 +5,7 @@
 using namespace Geometry;
 
 #include "Id.h"
+#include "Interface0D/SVertex.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -16,8 +17,6 @@ extern "C" {
 #include "api2_2x/vector.h"
 #include "api2_2x/gen_utils.h"
 
-PyObject *Convert_Init( void );
-
 PyObject *PyBool_from_bool( bool b );
 
 PyObject *Vector_from_Vec2f( Vec2f v );
@@ -25,6 +24,7 @@ PyObject *Vector_from_Vec3f( Vec3f v );
 PyObject *Vector_from_Vec3r( Vec3r v );
 
 PyObject *BPy_Id_from_Id( Id id );
+PyObject *BPy_SVertex_from_SVertex( SVertex sv );
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/source/blender/freestyle/intern/python/Id.cpp b/source/blender/freestyle/intern/python/Id.cpp
index 3c769933dcc..4f2964d8060 100644
--- a/source/blender/freestyle/intern/python/Id.cpp
+++ b/source/blender/freestyle/intern/python/Id.cpp
@@ -12,14 +12,12 @@ extern "C" {
 static int Id___init__(BPy_Id *self, PyObject *args, PyObject *kwds);
 static void Id___dealloc__(BPy_Id *self);
 static PyObject * Id___repr__(BPy_Id* self);
+static PyObject * Id_RichCompare(BPy_Id *o1, BPy_Id *o2, int opid);
 
 static PyObject * Id_getFirst( BPy_Id *self );
 static PyObject * Id_getSecond( BPy_Id *self);
 static PyObject * Id_setFirst( BPy_Id *self , PyObject *args);
 static PyObject * Id_setSecond( BPy_Id *self , PyObject *args);
-static PyObject * Id___eq__( BPy_Id *self , PyObject *args);
-static PyObject * Id___ne__( BPy_Id *self , PyObject *args);
-static PyObject * Id___lt__( BPy_Id *self , PyObject *args);
 
 /*----------------------Id instance definitions ----------------------------*/
 static PyMethodDef BPy_Id_methods[] = {
@@ -27,9 +25,6 @@ static PyMethodDef BPy_Id_methods[] = {
 	{"getSecond", ( PyCFunction ) Id_getSecond, METH_NOARGS, "Returns the second Id number" },
 	{"setFirst", ( PyCFunction ) Id_setFirst, METH_VARARGS, "Sets the first number constituing the Id" },
 	{"setSecond", ( PyCFunction ) Id_setSecond, METH_VARARGS, "Sets the second number constituing the Id" },
-	{"__eq__", ( PyCFunction ) Id___eq__, METH_VARARGS, "Operator ==" },
-	{"__ne__", ( PyCFunction ) Id___ne__, METH_VARARGS, "Operator !=" },
-	{"__lt__", ( PyCFunction ) Id___lt__, METH_VARARGS, "Operator <" },
 	{NULL, NULL, 0, NULL}
 };
 
@@ -80,7 +75,7 @@ PyTypeObject Id_Type = {
 
   /***  Assigned meaning in release 2.1 ***/
   /*** rich comparisons ***/
-	NULL,                       /* richcmpfunc tp_richcompare; */
+	(richcmpfunc)Id_RichCompare,                   /* richcmpfunc tp_richcompare; */
 
   /***  weak reference enabler ***/
 	0,                          /* long tp_weaklistoffset; */
@@ -170,7 +165,7 @@ PyObject *Id_getSecond( BPy_Id *self) {
 PyObject *Id_setFirst( BPy_Id *self , PyObject *args) {
 	unsigned int i;
 
-	if( !PyArg_ParseTuple(args, (char *)"i:Id_setFirst", i) ) {
+	if( !PyArg_ParseTuple(args, (char *)"i", &i) ) {
 		cout << "ERROR: Id_setFirst" << endl;
 		Py_RETURN_NONE;
 	}
@@ -184,7 +179,7 @@ PyObject *Id_setFirst( BPy_Id *self , PyObject *args) {
 PyObject *Id_setSecond( BPy_Id *self , PyObject *args) {
 	unsigned int i;
 
-	if( !PyArg_ParseTuple(args, (char *)"i:Id_setSecond", i) ) {
+	if( !PyArg_ParseTuple(args, (char *)"i", &i) ) {
 		cout << "ERROR: Id_setSecond" << endl;
 		Py_RETURN_NONE;
 	}
@@ -194,38 +189,29 @@ PyObject *Id_setSecond( BPy_Id *self , PyObject *args) {
 	Py_RETURN_NONE;
 }
 
-PyObject *Id___eq__( BPy_Id *self , PyObject *args) {
-	BPy_Id * other = 0 ;
-
-	if( !PyArg_ParseTuple(args, (char *)"O:Id___eq__", &other) ) {
-		cout << "ERROR: Id___eq__" << endl;
-		Py_RETURN_NONE;
+PyObject * Id_RichCompare(BPy_Id *o1, BPy_Id *o2, int opid) {
+	switch(opid){
+		case Py_LT:
+			return PyBool_from_bool( o1->id->operator<(*(o2->id)) );
+			break;
+		case Py_LE:
+			return PyBool_from_bool( o1->id->operator<(*(o2->id)) || o1->id->operator<(*(o2->id)) );
+			break;
+		case Py_EQ:
+			return PyBool_from_bool( o1->id->operator==(*(o2->id)) );
+			break;
+		case Py_NE:
+			return PyBool_from_bool( o1->id->operator!=(*(o2->id)) );
+			break;
+		case Py_GT:
+			return PyBool_from_bool(!( o1->id->operator<(*(o2->id)) || o1->id->operator<(*(o2->id)) ));
+			break;
+		case Py_GE:
+			return PyBool_from_bool(!( o1->id->operator<(*(o2->id)) ));
+			break;
 	}
 	
-	return PyBool_from_bool( self->id == other->id );
-}
-
-
-PyObject *Id___ne__(BPy_Id *self , PyObject *args) {
-	BPy_Id * other = 0 ;
-
-	if( !PyArg_ParseTuple(args, (char *)"O:Id___ne__", &other) ) {
-		cout << "ERROR: Id___ne__" << endl;
-		Py_RETURN_NONE;
-	}
-	
-	return PyBool_from_bool( self->id != other->id );
-}
-
-PyObject *Id___lt__(BPy_Id *self , PyObject *args) {
-	BPy_Id * other = 0 ;
-
-	if( !PyArg_ParseTuple(args, (char *)"O:Id___lt__", &other) ) {
-		cout << "ERROR: Id___lt__" << endl;
-		Py_RETURN_NONE;
-	}
-	
-	return PyBool_from_bool( self->id <= other->id );
+	Py_RETURN_NONE;
 }
 
 
diff --git a/source/blender/freestyle/intern/python/Interface0D.cpp b/source/blender/freestyle/intern/python/Interface0D.cpp
index 216dbaec1e9..27804b3d276 100644
--- a/source/blender/freestyle/intern/python/Interface0D.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D.cpp
@@ -2,6 +2,7 @@
 
 #include "Convert.h"
 #include "Interface0D/CurvePoint.h"
+#include "Interface0D/SVertex.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -137,14 +138,19 @@ PyMODINIT_FUNC Interface0D_Init( PyObject *module )
 
 	if( PyType_Ready( &Interface0D_Type ) < 0 )
 		return;
-		
-	if( PyType_Ready( &CurvePoint_Type ) < 0 )
-		return;
-
 	Py_INCREF( &Interface0D_Type );
 	PyModule_AddObject(module, "Interface0D", (PyObject *)&Interface0D_Type);
+	
+	if( PyType_Ready( &CurvePoint_Type ) < 0 )
+		return;
 	Py_INCREF( &CurvePoint_Type );
 	PyModule_AddObject(module, "CurvePoint", (PyObject *)&CurvePoint_Type);
+	
+	if( PyType_Ready( &SVertex_Type ) < 0 )
+		return;
+	Py_INCREF( &SVertex_Type );
+	PyModule_AddObject(module, "SVertex", (PyObject *)&SVertex_Type);	
+	
 }
 
 //------------------------INSTANCE METHODS ----------------------------------
diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp b/source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp
index e360062b9d6..5a81f07973d 100644
--- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp
@@ -11,9 +11,25 @@ extern "C" {
 
 /*---------------  Python API function prototypes for CurvePoint instance  -----------*/
 static int CurvePoint___init__(BPy_CurvePoint *self, PyObject *args, PyObject *kwds);
+static PyObject * CurvePoint___copy__( BPy_CurvePoint *self );
+static PyObject * CurvePoint_A( BPy_CurvePoint *self );
+static PyObject * CurvePoint_B( BPy_CurvePoint *self );
+static PyObject * CurvePoint_t2d( BPy_CurvePoint *self );
+static PyObject *CurvePoint_SetA( BPy_CurvePoint *self , PyObject *args);
+static PyObject *CurvePoint_SetB( BPy_CurvePoint *self , PyObject *args);
+static PyObject *CurvePoint_SetT2d( BPy_CurvePoint *self , PyObject *args);
+static PyObject *CurvePoint_curvatureFredo( BPy_CurvePoint *self , PyObject *args);
 
 /*----------------------CurvePoint instance definitions ----------------------------*/
 static PyMethodDef BPy_CurvePoint_methods[] = {	
+	{"__copy__", ( PyCFunction ) CurvePoint___copy__, METH_NOARGS, "（ ）Cloning method."},
+	{"A", ( PyCFunction ) CurvePoint_A, METH_NOARGS, "（ ）Returns the first SVertex upon which the CurvePoint is built."},
+	{"B", ( PyCFunction ) CurvePoint_B, METH_NOARGS, "（ ）Returns the second SVertex upon which the CurvePoint is built."},
+	{"t2d", ( PyCFunction ) CurvePoint_t2d, METH_NOARGS, "（ ）Returns the interpolation parameter."},
+	{"SetA", ( PyCFunction ) CurvePoint_SetA, METH_VARARGS, "（SVertex sv ）Sets the first SVertex upon which to build the CurvePoint."},
+	{"SetB", ( PyCFunction ) CurvePoint_SetB, METH_VARARGS, "（SVertex sv ）Sets the second SVertex upon which to build the CurvePoint."},
+	{"SetT2d", ( PyCFunction ) CurvePoint_SetT2d, METH_VARARGS, "（ ）Sets the 2D interpolation parameter to use."},
+	{"curvatureFredo", ( PyCFunction ) CurvePoint_curvatureFredo, METH_NOARGS, "（ ）angle in radians."},
 	{NULL, NULL, 0, NULL}
 };
 
@@ -110,129 +126,113 @@ PyTypeObject CurvePoint_Type = {
 int CurvePoint___init__(BPy_CurvePoint *self, PyObject *args, PyObject *kwds)
 {
 
-	self->py_if0D.if0D = new CurvePoint();
+	PyObject *obj1 = 0, *obj2 = 0 , *obj3 = 0;
+
+    if (! PyArg_ParseTuple(args, "|OOO", &obj1, &obj2, &obj3) )
+        return -1;
+
+	if( !obj1 && !obj2 && !obj3 ){
+		self->cp = new CurvePoint();
+	} else if( PyFloat_Check(obj3) ) {
+		if( BPy_SVertex_Check(obj1) && BPy_SVertex_Check(obj2) ) {
+			self->cp = new CurvePoint(  ((BPy_SVertex *) obj1)->sv,
+										((BPy_SVertex *) obj2)->sv,
+										PyFloat_AsDouble( obj3 ) );
+		} else if( BPy_CurvePoint_Check(obj1) && BPy_CurvePoint_Check(obj2) ) {
+			self->cp = new CurvePoint(  ((BPy_CurvePoint *) obj1)->cp,
+										((BPy_CurvePoint *) obj2)->cp,
+										PyFloat_AsDouble( obj3 ) );
+		} else {
+			return -1;	
+		}		
+	} else {
+		return -1;
+	}
+
+	self->py_if0D.if0D = self->cp;
+
 	return 0;
 }
 
+PyObject * CurvePoint___copy__( BPy_CurvePoint *self ) {
+	BPy_CurvePoint *py_cp;
+	
+	py_cp = (BPy_CurvePoint *) CurvePoint_Type.tp_new( &CurvePoint_Type, 0, 0 );
+	
+	py_cp->cp = new CurvePoint( *(self->cp) );
+	py_cp->py_if0D.if0D = py_cp->cp;
+
+	return (PyObject *) py_cp;
+}
+
+PyObject * CurvePoint_A( BPy_CurvePoint *self ) {
+	if( self->cp->A() )
+		return BPy_SVertex_from_SVertex( *(self->cp->A()) );
+
+	Py_RETURN_NONE;
+}
+
+PyObject * CurvePoint_B( BPy_CurvePoint *self ) {
+	if( self->cp->B() )
+		return BPy_SVertex_from_SVertex( *(self->cp->B()) );
+
+	Py_RETURN_NONE;
+}
+
+PyObject * CurvePoint_t2d( BPy_CurvePoint *self ) {
+	return PyFloat_FromDouble( self->cp->t2d() );
+}
+
+PyObject *CurvePoint_SetA( BPy_CurvePoint *self , PyObject *args) {
+	PyObject *py_sv;
+
+	if(!( PyArg_ParseTuple(args, "O", &py_sv) && BPy_SVertex_Check(py_sv)  )) {
+		cout << "ERROR: CurvePoint_SetA" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->cp->SetA( ((BPy_SVertex *) py_sv)->sv );
+
+	Py_RETURN_NONE;
+}
+
+PyObject *CurvePoint_SetB( BPy_CurvePoint *self , PyObject *args) {
+	PyObject *py_sv;
+
+	if(!( PyArg_ParseTuple(args, "O", &py_sv) && BPy_SVertex_Check(py_sv)  )) {
+		cout << "ERROR: CurvePoint_SetB" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->cp->SetB( ((BPy_SVertex *) py_sv)->sv );
+
+	Py_RETURN_NONE;
+}
+
+PyObject *CurvePoint_SetT2d( BPy_CurvePoint *self , PyObject *args) {
+	float t;
+
+	if( !PyArg_ParseTuple(args, "f", &t) ) {
+		cout << "ERROR: CurvePoint_SetT2d" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->cp->SetT2d( t );
+
+	Py_RETURN_NONE;
+}
+
+PyObject *CurvePoint_curvatureFredo( BPy_CurvePoint *self , PyObject *args) {
+	return PyFloat_FromDouble( self->cp->curvatureFredo() );
+}
+
+///bool 	operator== (const CurvePoint &b)
+
+
+
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 #ifdef __cplusplus
 }
 #endif
-
-
- 
-// 
-//  PyObject *_wrap_new_CurvePoint__SWIG_0(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-//  PyObject *_wrap_new_CurvePoint__SWIG_1(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-//  PyObject *_wrap_new_CurvePoint__SWIG_2(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-//  PyObject *_wrap_new_CurvePoint__SWIG_3(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-//  PyObject *_wrap_new_CurvePoint(PyObject *self, PyObject *args) {
-// }
-// 
-// 
-//  PyObject *_wrap_delete_CurvePoint(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-// PyObject *CurvePoint___eq__(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-// PyObject *CurvePoint_A(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-// PyObject *CurvePoint_B(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-// PyObject *CurvePoint_t2d(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-// PyObject *CurvePoint_SetA(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-// PyObject *CurvePoint_SetB(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-// PyObject *CurvePoint_SetT2d(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-// PyObject *CurvePoint_fedge(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-// PyObject *CurvePoint_point2d(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-// PyObject *CurvePoint_point3d(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-// PyObject *CurvePoint_normal(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-// PyObject *CurvePoint_shape(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-// PyObject *CurvePoint_occluders_begin(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-// PyObject *CurvePoint_occluders_end(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-// PyObject *CurvePoint_occluders_empty(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-// PyObject *CurvePoint_occluders_size(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-// PyObject *CurvePoint_occludee(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-// PyObject *CurvePoint_occluded_shape(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-// PyObject *CurvePoint_occludee_empty(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-// PyObject *CurvePoint_z_discontinuity(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-// PyObject *CurvePoint_curvatureFredo(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-// PyObject *CurvePoint_directionFredo(PyObject *self , PyObject *args) {
-// }
-
-
diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint.h b/source/blender/freestyle/intern/python/Interface0D/CurvePoint.h
index 096de2efed3..ac30f74c4dd 100644
--- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint.h
+++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint.h
@@ -2,7 +2,7 @@
 #define FREESTYLE_PYTHON_CURVEPOINT_H
 
 #include "../Interface0D.h"
-
+#include "../../stroke/Curve.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -20,6 +20,7 @@ extern PyTypeObject CurvePoint_Type;
 /*---------------------------Python BPy_CurvePoint structure definition----------*/
 typedef struct {
 	BPy_Interface0D py_if0D;
+	CurvePoint *cp;
 } BPy_CurvePoint;
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/Interface0D/SVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/SVertex.cpp
index 41d01d4b649..fd5b372a1d9 100644
--- a/source/blender/freestyle/intern/python/Interface0D/SVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/SVertex.cpp
@@ -1,268 +1,251 @@
- PyObject *_wrap_SVertex_getExactTypeName(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_getX(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_getY(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_getZ(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_getPoint3D(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_getProjectedX(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_getProjectedY(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_getProjectedZ(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_getPoint2D(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_getFEdge(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_getId(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_getNature(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_castToSVertex(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_castToViewVertex(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_castToNonTVertex(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_castToTVertex(PyObject *self , PyObject *args) {
-}
+#include "SVertex.h"
+
+#include "../Convert.h"
+#include "../Id.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for SVertex instance  -----------*/
+static int SVertex___init__(BPy_SVertex *self, PyObject *args, PyObject *kwds);
+static PyObject * SVertex___copy__( BPy_SVertex *self );
+static PyObject * SVertex_normals( BPy_SVertex *self );
+static PyObject * SVertex_normalsSize( BPy_SVertex *self );
+static PyObject * SVertex_SetPoint3D( BPy_SVertex *self , PyObject *args);
+static PyObject * SVertex_SetPoint2D( BPy_SVertex *self , PyObject *args);
+static PyObject * SVertex_AddNormal( BPy_SVertex *self , PyObject *args);
+static PyObject * SVertex_SetId( BPy_SVertex *self , PyObject *args);
+/*----------------------SVertex instance definitions ----------------------------*/
+static PyMethodDef BPy_SVertex_methods[] = {
+	{"__copy__", ( PyCFunction ) SVertex___copy__, METH_NOARGS, "（ ）Cloning method."},
+	{"normals", ( PyCFunction ) SVertex_normals, METH_NOARGS, "Returns the normals for this Vertex as a list. In a smooth surface, a vertex has exactly one normal. In a sharp surface, a vertex can have any number of normals."},
+	{"normalsSize", ( PyCFunction ) SVertex_normalsSize, METH_NOARGS, "Returns the number of different normals for this vertex." },
+	{"SetPoint3D", ( PyCFunction ) SVertex_SetPoint3D, METH_VARARGS, "Sets the 3D coordinates of the SVertex." },
+	{"SetPoint2D", ( PyCFunction ) SVertex_SetPoint2D, METH_VARARGS, "Sets the 3D projected coordinates of the SVertex." },
+	{"AddNormal", ( PyCFunction ) SVertex_AddNormal, METH_VARARGS, "Adds a normal to the Svertex's set of normals. If the same normal is already in the set, nothing changes." },
+	{"SetId", ( PyCFunction ) SVertex_SetId, METH_VARARGS, "Sets the Id." },
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_SVertex type definition ------------------------------*/
+
+PyTypeObject SVertex_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"SVertex",				/* tp_name */
+	sizeof( BPy_SVertex ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_SVertex_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&Interface0D_Type,				/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)SVertex___init__,                       	/* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int SVertex___init__(BPy_SVertex *self, PyObject *args, PyObject *kwds)
+{
+	PyObject *py_point = 0;
+	BPy_Id *py_id = 0;
+
+    if (! PyArg_ParseTuple(args, "|OO", &py_point, &py_id) )
+        return -1;
+	
+	if( py_point && py_id && PyList_Check(py_point) && PyList_Size(py_point) == 3 ) {
+		Vec3r v( 	PyFloat_AsDouble( PyList_GetItem(py_point, 0) ),
+					PyFloat_AsDouble( PyList_GetItem(py_point, 1) ),
+					PyFloat_AsDouble( PyList_GetItem(py_point, 2) )  );
+					
+		self->sv = new SVertex( v, *(py_id->id) );
+	} else {
+		self->sv = new SVertex();
+	}
+	
+	self->py_if0D.if0D = self->sv;
+	
+	return 0;
+}
+
+PyObject * SVertex___copy__( BPy_SVertex *self ) {
+	BPy_SVertex *py_svertex;
+	
+	py_svertex = (BPy_SVertex *) SVertex_Type.tp_new( &SVertex_Type, 0, 0 );
+	
+	py_svertex->sv = self->sv->duplicate();
+	py_svertex->py_if0D.if0D = py_svertex->sv;
+
+	return (PyObject *) py_svertex;
+}
+
+
+PyObject * SVertex_normals( BPy_SVertex *self ) {
+	PyObject *py_normals; 
+	set< Vec3r > normals;
+	
+	py_normals  = PyList_New(NULL);
+	normals = self->sv->normals();
+		
+	for( set< Vec3r >::iterator set_iterator = normals.begin(); set_iterator != normals.end(); set_iterator++ ) {
+		PyList_Append( py_normals, Vector_from_Vec3r(*set_iterator) );
+	}
+	
+	return py_normals;
+}
+
+PyObject * SVertex_normalsSize( BPy_SVertex *self ) {
+	return PyInt_FromLong( self->sv->normalsSize() );
+}
+
+PyObject *SVertex_SetPoint3D( BPy_SVertex *self , PyObject *args) {
+	PyObject *py_point;
+
+	if(!( PyArg_ParseTuple(args, "O", &py_point) 
+			&& PyList_Check(py_point) && PyList_Size(py_point) == 3 )) {
+		cout << "ERROR: SVertex_SetPoint3D" << endl;
+		Py_RETURN_NONE;
+	}
+
+	Vec3r v( 	PyFloat_AsDouble( PyList_GetItem(py_point, 0) ),
+				PyFloat_AsDouble( PyList_GetItem(py_point, 1) ),
+				PyFloat_AsDouble( PyList_GetItem(py_point, 2) )  );
+	self->sv->SetPoint3D( v );
+
+	Py_RETURN_NONE;
+}
+
+PyObject *SVertex_SetPoint2D( BPy_SVertex *self , PyObject *args) {
+	PyObject *py_point;
+
+	if(!( PyArg_ParseTuple(args, "O", &py_point) 
+			&& PyList_Check(py_point) && PyList_Size(py_point) == 3 )) {
+		cout << "ERROR: SVertex_SetPoint2D" << endl;
+		Py_RETURN_NONE;
+	}
 
+	Vec3r v( 	PyFloat_AsDouble( PyList_GetItem(py_point, 0) ),
+				PyFloat_AsDouble( PyList_GetItem(py_point, 1) ),
+				PyFloat_AsDouble( PyList_GetItem(py_point, 2) )  );
+	self->sv->SetPoint2D( v );
 
- PyObject *_wrap_SVertex_userdata_set(PyObject *self , PyObject *args) {
+	Py_RETURN_NONE;
 }
 
+PyObject *SVertex_AddNormal( BPy_SVertex *self , PyObject *args) {
+	PyObject *py_normal;
 
- PyObject *_wrap_SVertex_userdata_get(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_SVertex__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_SVertex__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_SVertex__SWIG_2(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_SVertex(PyObject *self, PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_SVertex(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_dupplicate(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex___eq__(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_point3D(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_point2D(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_normals(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_normalsSize(PyObject *self , PyObject *args) {
-}
+	if(!( PyArg_ParseTuple(args, "O", &py_normal) 
+			&& PyList_Check(py_normal) && PyList_Size(py_normal) == 3 )) {
+		cout << "ERROR: SVertex_AddNormal" << endl;
+		Py_RETURN_NONE;
+	}
+	
+	cout << "yoyo" << endl;
 
+	Vec3r n( 	PyFloat_AsDouble( PyList_GetItem(py_normal, 0) ),
+				PyFloat_AsDouble( PyList_GetItem(py_normal, 1) ),
+				PyFloat_AsDouble( PyList_GetItem(py_normal, 2) )  );
+	self->sv->AddNormal( n );
 
- PyObject *_wrap_SVertex_fedges(PyObject *self , PyObject *args) {
+	Py_RETURN_NONE;
 }
 
+PyObject *SVertex_SetId( BPy_SVertex *self , PyObject *args) {
+	BPy_Id *py_id;
 
- PyObject *_wrap_SVertex_fedges_begin(PyObject *self , PyObject *args) {
-}
+	if( !PyArg_ParseTuple(args, "O", &py_id) ) {
+		cout << "ERROR: SVertex_SetId" << endl;
+		Py_RETURN_NONE;
+	}
 
+	self->sv->SetId( *(py_id->id) );
 
- PyObject *_wrap_SVertex_fedges_end(PyObject *self , PyObject *args) {
+	Py_RETURN_NONE;
 }
 
+// virtual bool 	operator== (const SVertex &iBrother)
+// ViewVertex * 	viewvertex ()
+// void 	AddFEdge (FEdge *iFEdge)
 
- PyObject *_wrap_SVertex_shape__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_z(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_viewvertex(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_SetPoint3D(PyObject *self , PyObject *args) {
-}
-
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_SVertex_SetPoint2D(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_SVertex_AddNormal(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_setCurvatureInfo(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_getCurvatureInfo(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_setCurvatureFredo(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_setDirectionFredo(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_curvatureFredo(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_directionFredo(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_SetId(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_SetFEdges(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_SetShape(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_SetViewVertex(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_AddFEdge(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_Replace(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_fedge(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_point2d(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_point3d(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_normal(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_shape_id(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_shape__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_shape(PyObject *self, PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_shape_importance(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_qi(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_occluders_begin(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_occluders_end(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_occluders_empty(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_occluders_size(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_occludee(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_occluded_shape(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_occludee_empty(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SVertex_z_discontinuity(PyObject *self , PyObject *args) {
-}
-
+#endif
 
diff --git a/source/blender/freestyle/intern/python/Interface1D.cpp b/source/blender/freestyle/intern/python/Interface1D.cpp
index 27bb71b2f50..27c5f4d08ff 100644
--- a/source/blender/freestyle/intern/python/Interface1D.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D.cpp
@@ -183,7 +183,7 @@ PyObject *Interface1D_getTimeStamp( BPy_Interface1D *self ) {
 PyObject *Interface1D_setTimeStamp( BPy_Interface1D *self, PyObject *args) {
 	int timestamp = 0 ;
 
-	if( !PyArg_ParseTuple(args, (char *)"i:Interface1D_setTimeStamp", &timestamp) ) {
+	if( !PyArg_ParseTuple(args, (char *)"i", &timestamp) ) {
 		cout << "ERROR: Interface1D_setTimeStamp" << endl;
 		Py_RETURN_NONE;
 	}
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/FEdgeSharp.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge/FEdgeSharp.cpp
index d6bd8c6f085..da409ffe209 100644
--- a/source/blender/freestyle/intern/python/Interface1D/FEdge/FEdgeSharp.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/FEdgeSharp.cpp
@@ -1,4 +1,4 @@
- PyObject *_wrap_FEdgeSharp_dupplicate(PyObject *self , PyObject *args) {
+ PyObject *_wrap_FEdgeSharp_duplicate(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/swig/ModuleWrapper.cpp b/source/blender/freestyle/intern/swig/ModuleWrapper.cpp
index 94662595bd9..df94340e88a 100755
--- a/source/blender/freestyle/intern/swig/ModuleWrapper.cpp
+++ b/source/blender/freestyle/intern/swig/ModuleWrapper.cpp
@@ -29688,7 +29688,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_dupplicate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SVertex_duplicate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SVertex *arg1 = (SVertex *) 0 ;
   SVertex *result = 0 ;
@@ -29696,15 +29696,15 @@ SWIGINTERN PyObject *_wrap_SVertex_dupplicate(PyObject *SWIGUNUSEDPARM(self), Py
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_dupplicate",&obj0)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"O:SVertex_duplicate",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_dupplicate" "', argument " "1"" of type '" "SVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_duplicate" "', argument " "1"" of type '" "SVertex *""'"); 
   }
   arg1 = reinterpret_cast< SVertex * >(argp1);
   {
     try {
-      result = (SVertex *)(arg1)->dupplicate();
+      result = (SVertex *)(arg1)->duplicate();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -31592,7 +31592,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_dupplicate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FEdge_duplicate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FEdge *arg1 = (FEdge *) 0 ;
   FEdge *result = 0 ;
@@ -31600,15 +31600,15 @@ SWIGINTERN PyObject *_wrap_FEdge_dupplicate(PyObject *SWIGUNUSEDPARM(self), PyOb
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FEdge_dupplicate",&obj0)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdge_duplicate",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_dupplicate" "', argument " "1"" of type '" "FEdge *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_duplicate" "', argument " "1"" of type '" "FEdge *""'"); 
   }
   arg1 = reinterpret_cast< FEdge * >(argp1);
   {
     try {
-      result = (FEdge *)(arg1)->dupplicate();
+      result = (FEdge *)(arg1)->duplicate();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -34543,7 +34543,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_dupplicate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_duplicate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
   SVertex *result = 0 ;
@@ -34551,15 +34551,15 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_dupplicate(PyObject *SWIGUNUSEDP
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_dupplicate",&obj0)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSVertexIterator_duplicate",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_dupplicate" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_duplicate" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
   }
   arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
   {
     try {
-      result = (SVertex *)(*arg1)->dupplicate();
+      result = (SVertex *)(*arg1)->duplicate();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -36256,7 +36256,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSharp_dupplicate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FEdgeSharp_duplicate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FEdgeSharp *arg1 = (FEdgeSharp *) 0 ;
   FEdge *result = 0 ;
@@ -36264,15 +36264,15 @@ SWIGINTERN PyObject *_wrap_FEdgeSharp_dupplicate(PyObject *SWIGUNUSEDPARM(self),
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSharp_dupplicate",&obj0)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSharp_duplicate",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeSharp, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSharp_dupplicate" "', argument " "1"" of type '" "FEdgeSharp *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSharp_duplicate" "', argument " "1"" of type '" "FEdgeSharp *""'"); 
   }
   arg1 = reinterpret_cast< FEdgeSharp * >(argp1);
   {
     try {
-      result = (FEdge *)(arg1)->dupplicate();
+      result = (FEdge *)(arg1)->duplicate();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -36843,7 +36843,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSmooth_dupplicate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FEdgeSmooth_duplicate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FEdgeSmooth *arg1 = (FEdgeSmooth *) 0 ;
   FEdge *result = 0 ;
@@ -36851,15 +36851,15 @@ SWIGINTERN PyObject *_wrap_FEdgeSmooth_dupplicate(PyObject *SWIGUNUSEDPARM(self)
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSmooth_dupplicate",&obj0)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgeSmooth_duplicate",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeSmooth, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSmooth_dupplicate" "', argument " "1"" of type '" "FEdgeSmooth *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSmooth_duplicate" "', argument " "1"" of type '" "FEdgeSmooth *""'"); 
   }
   arg1 = reinterpret_cast< FEdgeSmooth * >(argp1);
   {
     try {
-      result = (FEdge *)(arg1)->dupplicate();
+      result = (FEdge *)(arg1)->duplicate();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -37278,7 +37278,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_dupplicate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SShape_duplicate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SShape *arg1 = (SShape *) 0 ;
   SShape *result = 0 ;
@@ -37286,15 +37286,15 @@ SWIGINTERN PyObject *_wrap_SShape_dupplicate(PyObject *SWIGUNUSEDPARM(self), PyO
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SShape_dupplicate",&obj0)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"O:SShape_duplicate",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SShape, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_dupplicate" "', argument " "1"" of type '" "SShape *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_duplicate" "', argument " "1"" of type '" "SShape *""'"); 
   }
   arg1 = reinterpret_cast< SShape * >(argp1);
   {
     try {
-      result = (SShape *)(arg1)->dupplicate();
+      result = (SShape *)(arg1)->duplicate();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -54232,7 +54232,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShape_dupplicate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewShape_duplicate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewShape *arg1 = (ViewShape *) 0 ;
   ViewShape *result = 0 ;
@@ -54240,15 +54240,15 @@ SWIGINTERN PyObject *_wrap_ViewShape_dupplicate(PyObject *SWIGUNUSEDPARM(self),
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ViewShape_dupplicate",&obj0)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewShape_duplicate",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewShape, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShape_dupplicate" "', argument " "1"" of type '" "ViewShape *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShape_duplicate" "', argument " "1"" of type '" "ViewShape *""'"); 
   }
   arg1 = reinterpret_cast< ViewShape * >(argp1);
   {
     try {
-      result = (ViewShape *)(arg1)->dupplicate();
+      result = (ViewShape *)(arg1)->duplicate();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -56608,7 +56608,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_dupplicate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_duplicate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
   SVertex *result = 0 ;
@@ -56616,15 +56616,15 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_dupplicate(PyObject *SWIGUNUS
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_dupplicate",&obj0)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeSVertexIterator_duplicate",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_dupplicate" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_duplicate" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
   }
   arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
   {
     try {
-      result = (SVertex *)(*arg1)->dupplicate();
+      result = (SVertex *)(*arg1)->duplicate();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -106893,7 +106893,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"SVertex_userdata_get", _wrap_SVertex_userdata_get, METH_VARARGS, NULL},
 	 { (char *)"new_SVertex", _wrap_new_SVertex, METH_VARARGS, NULL},
 	 { (char *)"delete_SVertex", _wrap_delete_SVertex, METH_VARARGS, NULL},
-	 { (char *)"SVertex_dupplicate", _wrap_SVertex_dupplicate, METH_VARARGS, NULL},
+	 { (char *)"SVertex_duplicate", _wrap_SVertex_duplicate, METH_VARARGS, NULL},
 	 { (char *)"SVertex___eq__", _wrap_SVertex___eq__, METH_VARARGS, NULL},
 	 { (char *)"SVertex_point3D", _wrap_SVertex_point3D, METH_VARARGS, NULL},
 	 { (char *)"SVertex_point2D", _wrap_SVertex_point2D, METH_VARARGS, NULL},
@@ -106943,7 +106943,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"FEdge_userdata_get", _wrap_FEdge_userdata_get, METH_VARARGS, NULL},
 	 { (char *)"new_FEdge", _wrap_new_FEdge, METH_VARARGS, NULL},
 	 { (char *)"delete_FEdge", _wrap_delete_FEdge, METH_VARARGS, NULL},
-	 { (char *)"FEdge_dupplicate", _wrap_FEdge_dupplicate, METH_VARARGS, NULL},
+	 { (char *)"FEdge_duplicate", _wrap_FEdge_duplicate, METH_VARARGS, NULL},
 	 { (char *)"FEdge_vertexA", _wrap_FEdge_vertexA, METH_VARARGS, NULL},
 	 { (char *)"FEdge_vertexB", _wrap_FEdge_vertexB, METH_VARARGS, NULL},
 	 { (char *)"FEdge_getNature", _wrap_FEdge_getNature, METH_VARARGS, NULL},
@@ -107021,7 +107021,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"FEdgeSVertexIterator_castToTVertex", _wrap_FEdgeSVertexIterator_castToTVertex, METH_VARARGS, NULL},
 	 { (char *)"FEdgeSVertexIterator_userdata_set", _wrap_FEdgeSVertexIterator_userdata_set, METH_VARARGS, NULL},
 	 { (char *)"FEdgeSVertexIterator_userdata_get", _wrap_FEdgeSVertexIterator_userdata_get, METH_VARARGS, NULL},
-	 { (char *)"FEdgeSVertexIterator_dupplicate", _wrap_FEdgeSVertexIterator_dupplicate, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_duplicate", _wrap_FEdgeSVertexIterator_duplicate, METH_VARARGS, NULL},
 	 { (char *)"FEdgeSVertexIterator_point3D", _wrap_FEdgeSVertexIterator_point3D, METH_VARARGS, NULL},
 	 { (char *)"FEdgeSVertexIterator_point2D", _wrap_FEdgeSVertexIterator_point2D, METH_VARARGS, NULL},
 	 { (char *)"FEdgeSVertexIterator_normals", _wrap_FEdgeSVertexIterator_normals, METH_VARARGS, NULL},
@@ -107065,7 +107065,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"FEdgeSVertexIterator_swigregister", FEdgeSVertexIterator_swigregister, METH_VARARGS, NULL},
 	 { (char *)"new_FEdgeSharp", _wrap_new_FEdgeSharp, METH_VARARGS, NULL},
 	 { (char *)"delete_FEdgeSharp", _wrap_delete_FEdgeSharp, METH_VARARGS, NULL},
-	 { (char *)"FEdgeSharp_dupplicate", _wrap_FEdgeSharp_dupplicate, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSharp_duplicate", _wrap_FEdgeSharp_duplicate, METH_VARARGS, NULL},
 	 { (char *)"FEdgeSharp_normalA", _wrap_FEdgeSharp_normalA, METH_VARARGS, NULL},
 	 { (char *)"FEdgeSharp_normalB", _wrap_FEdgeSharp_normalB, METH_VARARGS, NULL},
 	 { (char *)"FEdgeSharp_aMaterialIndex", _wrap_FEdgeSharp_aMaterialIndex, METH_VARARGS, NULL},
@@ -107079,7 +107079,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"FEdgeSharp_swigregister", FEdgeSharp_swigregister, METH_VARARGS, NULL},
 	 { (char *)"new_FEdgeSmooth", _wrap_new_FEdgeSmooth, METH_VARARGS, NULL},
 	 { (char *)"delete_FEdgeSmooth", _wrap_delete_FEdgeSmooth, METH_VARARGS, NULL},
-	 { (char *)"FEdgeSmooth_dupplicate", _wrap_FEdgeSmooth_dupplicate, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSmooth_duplicate", _wrap_FEdgeSmooth_duplicate, METH_VARARGS, NULL},
 	 { (char *)"FEdgeSmooth_face", _wrap_FEdgeSmooth_face, METH_VARARGS, NULL},
 	 { (char *)"FEdgeSmooth_normal", _wrap_FEdgeSmooth_normal, METH_VARARGS, NULL},
 	 { (char *)"FEdgeSmooth_materialIndex", _wrap_FEdgeSmooth_materialIndex, METH_VARARGS, NULL},
@@ -107091,7 +107091,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"SShape_userdata_set", _wrap_SShape_userdata_set, METH_VARARGS, NULL},
 	 { (char *)"SShape_userdata_get", _wrap_SShape_userdata_get, METH_VARARGS, NULL},
 	 { (char *)"new_SShape", _wrap_new_SShape, METH_VARARGS, NULL},
-	 { (char *)"SShape_dupplicate", _wrap_SShape_dupplicate, METH_VARARGS, NULL},
+	 { (char *)"SShape_duplicate", _wrap_SShape_duplicate, METH_VARARGS, NULL},
 	 { (char *)"delete_SShape", _wrap_delete_SShape, METH_VARARGS, NULL},
 	 { (char *)"SShape_AddEdge", _wrap_SShape_AddEdge, METH_VARARGS, NULL},
 	 { (char *)"SShape_AddNewVertex", _wrap_SShape_AddNewVertex, METH_VARARGS, NULL},
@@ -107439,7 +107439,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"ViewShape_userdata_set", _wrap_ViewShape_userdata_set, METH_VARARGS, NULL},
 	 { (char *)"ViewShape_userdata_get", _wrap_ViewShape_userdata_get, METH_VARARGS, NULL},
 	 { (char *)"new_ViewShape", _wrap_new_ViewShape, METH_VARARGS, NULL},
-	 { (char *)"ViewShape_dupplicate", _wrap_ViewShape_dupplicate, METH_VARARGS, NULL},
+	 { (char *)"ViewShape_duplicate", _wrap_ViewShape_duplicate, METH_VARARGS, NULL},
 	 { (char *)"delete_ViewShape", _wrap_delete_ViewShape, METH_VARARGS, NULL},
 	 { (char *)"ViewShape_SplitEdge", _wrap_ViewShape_SplitEdge, METH_VARARGS, NULL},
 	 { (char *)"ViewShape_sshape", _wrap_ViewShape_sshape, METH_VARARGS, NULL},
@@ -107494,7 +107494,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"ViewEdgeSVertexIterator_castToTVertex", _wrap_ViewEdgeSVertexIterator_castToTVertex, METH_VARARGS, NULL},
 	 { (char *)"ViewEdgeSVertexIterator_userdata_set", _wrap_ViewEdgeSVertexIterator_userdata_set, METH_VARARGS, NULL},
 	 { (char *)"ViewEdgeSVertexIterator_userdata_get", _wrap_ViewEdgeSVertexIterator_userdata_get, METH_VARARGS, NULL},
-	 { (char *)"ViewEdgeSVertexIterator_dupplicate", _wrap_ViewEdgeSVertexIterator_dupplicate, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_duplicate", _wrap_ViewEdgeSVertexIterator_duplicate, METH_VARARGS, NULL},
 	 { (char *)"ViewEdgeSVertexIterator_point3D", _wrap_ViewEdgeSVertexIterator_point3D, METH_VARARGS, NULL},
 	 { (char *)"ViewEdgeSVertexIterator_point2D", _wrap_ViewEdgeSVertexIterator_point2D, METH_VARARGS, NULL},
 	 { (char *)"ViewEdgeSVertexIterator_normals", _wrap_ViewEdgeSVertexIterator_normals, METH_VARARGS, NULL},
diff --git a/source/blender/freestyle/intern/view_map/Silhouette.h b/source/blender/freestyle/intern/view_map/Silhouette.h
index 958c0545d6d..c6a1763eec6 100755
--- a/source/blender/freestyle/intern/view_map/Silhouette.h
+++ b/source/blender/freestyle/intern/view_map/Silhouette.h
@@ -206,7 +206,7 @@ public:
   }
 
   /*! Cloning method. */
-  virtual SVertex * dupplicate() {
+  virtual SVertex * duplicate() {
     SVertex *clone = new SVertex(*this);
     return clone;
   }
@@ -455,7 +455,7 @@ public:
   /*! Destructor */
   virtual ~FEdge() {}
   /*! Cloning method. */
-  virtual FEdge* dupplicate()
+  virtual FEdge* duplicate()
   {
     FEdge *clone = new FEdge(*this);
     return clone;
@@ -805,7 +805,7 @@ public:
   /*! Destructor. */
   virtual ~FEdgeSharp() {}
   /*! Cloning method. */
-  virtual FEdge* dupplicate(){
+  virtual FEdge* duplicate(){
     FEdge *clone = new FEdgeSharp(*this);
     return clone;
   }
@@ -886,7 +886,7 @@ public:
   /*! Destructor. */
   virtual ~FEdgeSmooth() {}
   /*! Cloning method. */
-  virtual FEdge* dupplicate(){
+  virtual FEdge* duplicate(){
     FEdge *clone = new FEdgeSmooth(*this);
     return clone;
   }
@@ -980,7 +980,7 @@ public:
         e!=eend;
         e++)
       {
-        FEdge *newe = (*e)->dupplicate();
+        FEdge *newe = (*e)->duplicate();
         _edgesList.push_back(newe);
       } 
 
@@ -1053,7 +1053,7 @@ public:
       }  
   }
   /*! Cloning method. */
-  virtual SShape * dupplicate()
+  virtual SShape * duplicate()
   {
     SShape *clone = new SShape(*this);
     return clone;
diff --git a/source/blender/freestyle/intern/view_map/ViewMap.h b/source/blender/freestyle/intern/view_map/ViewMap.h
index bdbb140e130..7528d27cac6 100755
--- a/source/blender/freestyle/intern/view_map/ViewMap.h
+++ b/source/blender/freestyle/intern/view_map/ViewMap.h
@@ -254,7 +254,7 @@ protected:
     userdata = 0;
   }
   /*! Cloning method. */
-  virtual ViewVertex * dupplicate() = 0;
+  virtual ViewVertex * duplicate() = 0;
   
 public:
   /*! Destructor. */
@@ -443,7 +443,7 @@ protected:
   }
 
   /*! Cloning method. */
-  virtual ViewVertex * dupplicate()
+  virtual ViewVertex * duplicate()
   {
     TVertex *clone = new TVertex(*this);
     return clone;
@@ -650,7 +650,7 @@ protected:
     _ViewEdges = iBrother._ViewEdges;
   }
   /*! Cloning method. */
-  virtual ViewVertex * dupplicate()
+  virtual ViewVertex * duplicate()
   {
     NonTVertex *clone = new NonTVertex(*this);
     return clone;
@@ -878,7 +878,7 @@ protected:
     userdata = 0;
   }
   /*! Cloning method. */
-  virtual ViewEdge * dupplicate()
+  virtual ViewEdge * duplicate()
   {
     ViewEdge *clone = new ViewEdge(*this);
     return clone;
@@ -1107,22 +1107,22 @@ public:
     _SShape = iBrother._SShape;
 
     vector<ViewVertex*>& vvertices = iBrother.vertices();
-    // dupplicate vertices
+    // duplicate vertices
     for(vv=vvertices.begin(), vvend=vvertices.end();
     vv!=vvend;
     vv++)
     {
-      ViewVertex * newVertex = (*vv)->dupplicate();
+      ViewVertex * newVertex = (*vv)->duplicate();
       AddVertex(newVertex);
     }
 
     vector<ViewEdge*>& vvedges = iBrother.edges();
-    // dupplicate edges
+    // duplicate edges
     for(ve=vvedges.begin(), veend=vvedges.end();
     ve!=veend;
     ve++)
     {
-      ViewEdge * newEdge = (*ve)->dupplicate();
+      ViewEdge * newEdge = (*ve)->duplicate();
       AddEdge(newEdge); // here the shape is set as the edge's shape
     }
 
@@ -1209,7 +1209,7 @@ public:
   }
 
   /*! Cloning method. */
-  virtual ViewShape * dupplicate()
+  virtual ViewShape * duplicate()
   {
     ViewShape *clone = new ViewShape(*this);
     return clone;
diff --git a/source/blender/freestyle/intern/winged_edge/WEdge.cpp b/source/blender/freestyle/intern/winged_edge/WEdge.cpp
index 79b3a8dae26..3f27bf6a8a0 100755
--- a/source/blender/freestyle/intern/winged_edge/WEdge.cpp
+++ b/source/blender/freestyle/intern/winged_edge/WEdge.cpp
@@ -70,7 +70,7 @@ WVertex::WVertex(WVertex& iBrother)
   ((vertexdata*)(iBrother.userdata))->_copy = this;
 }
 
-WVertex* WVertex::dupplicate()
+WVertex* WVertex::duplicate()
 {
   WVertex *clone = new WVertex(*this);
   return clone;
@@ -180,7 +180,7 @@ WOEdge::WOEdge(WOEdge& iBrother)
     ((oedgedata*)(iBrother.userdata))->_copy = this;
 }
 
-WOEdge * WOEdge::dupplicate()
+WOEdge * WOEdge::duplicate()
 {
   WOEdge *clone = new WOEdge(*this);
   return clone;
@@ -221,10 +221,10 @@ WEdge::WEdge(WEdge& iBrother)
 
   if(NULL != aoedge)
     //_paOEdge = new WOEdge(*aoedge);
-    _paOEdge = aoedge->dupplicate();
+    _paOEdge = aoedge->duplicate();
   if(NULL != boedge)
     //_pbOEdge = new WOEdge(*boedge);
-    _pbOEdge = boedge->dupplicate();
+    _pbOEdge = boedge->duplicate();
   
   _nOEdges = iBrother.GetNumberOfOEdges();
   _Id = iBrother.GetId();
@@ -232,7 +232,7 @@ WEdge::WEdge(WEdge& iBrother)
   ((edgedata*)(iBrother.userdata))->_copy = this;
 }
 
-WEdge * WEdge::dupplicate()
+WEdge * WEdge::duplicate()
 {
   WEdge *clone = new WEdge(*this);
   return clone;
@@ -260,7 +260,7 @@ WFace::WFace(WFace& iBrother)
   ((facedata*)(iBrother.userdata))->_copy = this;
 }
 
-WFace * WFace::dupplicate()
+WFace * WFace::duplicate()
 {
   WFace * clone = new WFace(*this);
   return clone;
@@ -466,7 +466,7 @@ WShape * WFace::getShape()
 LIB_WINGED_EDGE_EXPORT
 unsigned WShape::_SceneCurrentId = 0;
 
-WShape * WShape::dupplicate()
+WShape * WShape::duplicate()
 {
   WShape *clone = new WShape(*this);
   return clone;
@@ -485,7 +485,7 @@ WShape::WShape(WShape& iBrother)
   v++)
   {
     //WVertex *newVertex = new WVertex(*(*v));
-    WVertex *newVertex = (*v)->dupplicate();
+    WVertex *newVertex = (*v)->duplicate();
 
     newVertex->SetShape(this);
     AddVertex(newVertex);
@@ -498,7 +498,7 @@ WShape::WShape(WShape& iBrother)
   e++)
   {
     //WEdge *newEdge = new WEdge(*(*e));
-    WEdge *newEdge = (*e)->dupplicate();
+    WEdge *newEdge = (*e)->duplicate();
     AddEdge(newEdge);
   }
 
@@ -509,7 +509,7 @@ WShape::WShape(WShape& iBrother)
   f++)
   {
     //WFace *newFace = new WFace(*(*f));
-    WFace *newFace = (*f)->dupplicate();
+    WFace *newFace = (*f)->duplicate();
     AddFace(newFace);
   }
 
diff --git a/source/blender/freestyle/intern/winged_edge/WEdge.h b/source/blender/freestyle/intern/winged_edge/WEdge.h
index 1ab37246469..b4c6a38f5bd 100755
--- a/source/blender/freestyle/intern/winged_edge/WEdge.h
+++ b/source/blender/freestyle/intern/winged_edge/WEdge.h
@@ -68,7 +68,7 @@ public:
   inline WVertex(const Vec3r &v) {_Id = 0; _Vertex = v; userdata = NULL; _Shape = NULL;_Smooth=true;_Border=-1;}
   /*! Copy constructor */
   WVertex(WVertex& iBrother);
-  virtual WVertex * dupplicate(); 
+  virtual WVertex * duplicate(); 
   virtual ~WVertex() {}
 
   /*! accessors */
@@ -314,7 +314,7 @@ public:
 
   /*! copy constructor */
   WOEdge(WOEdge& iBrother);
-  virtual WOEdge * dupplicate();
+  virtual WOEdge * duplicate();
 
   /*! accessors */
   //  inline WOEdge *GetaCWEdge() {return _paCWEdge;}
@@ -393,7 +393,7 @@ public:
 
   /*! Copy constructor */
   WEdge(WEdge& iBrother);
-  virtual WEdge * dupplicate();
+  virtual WEdge * duplicate();
 
   virtual ~WEdge()
   {
@@ -502,7 +502,7 @@ public:
   inline WFace() {userdata = NULL;_MaterialIndex = 0;}
   /*! copy constructor */
   WFace(WFace& iBrother);
-  virtual WFace * dupplicate();
+  virtual WFace * duplicate();
   virtual ~WFace() {}
 
   /*! accessors */
@@ -709,7 +709,7 @@ public:
   inline WShape() {_meanEdgeSize = 0;_Id = _SceneCurrentId; _SceneCurrentId++;}
   /*! copy constructor */
   WShape(WShape& iBrother);
-  virtual WShape * dupplicate();
+  virtual WShape * duplicate();
   virtual ~WShape()
   {
     if(_EdgeList.size() != 0)
diff --git a/source/blender/freestyle/intern/winged_edge/WXEdge.h b/source/blender/freestyle/intern/winged_edge/WXEdge.h
index 66204ba5e99..8c53bb8390e 100755
--- a/source/blender/freestyle/intern/winged_edge/WXEdge.h
+++ b/source/blender/freestyle/intern/winged_edge/WXEdge.h
@@ -58,7 +58,7 @@ public:
   WXVertex(WXVertex& iBrother)
     : WVertex(iBrother)
   {_curvatures = new CurvatureInfo(*iBrother._curvatures);}
-  virtual WVertex * dupplicate()
+  virtual WVertex * duplicate()
   {
     WXVertex *clone = new WXVertex(*this);
     return clone;
@@ -109,7 +109,7 @@ public:
   inline WXEdge(WXEdge& iBrother)
     : WEdge(iBrother)
   {_nature = iBrother.nature();_front = iBrother._front;_order = iBrother._order;}
-  virtual WEdge * dupplicate()
+  virtual WEdge * duplicate()
   {
     WXEdge *clone = new WXEdge(*this);
     return clone;
@@ -334,7 +334,7 @@ public:
       _SmoothLayers.push_back(new WXFaceLayer(**wxf));
     }
   }
-  virtual WFace * dupplicate()
+  virtual WFace * duplicate()
   {
     WXFace * clone = new WXFace(*this);
     return clone;
@@ -471,7 +471,7 @@ public:
   {
     _computeViewIndependant = iBrother._computeViewIndependant;
   }
-  virtual WShape * dupplicate()
+  virtual WShape * duplicate()
   {
     WXShape *clone = new WXShape(*this);
     return clone;
diff --git a/source/blender/freestyle/python/Freestyle.py b/source/blender/freestyle/python/Freestyle.py
index 43ae6772f35..40e879654bc 100755
--- a/source/blender/freestyle/python/Freestyle.py
+++ b/source/blender/freestyle/python/Freestyle.py
@@ -853,7 +853,7 @@ class SVertex(Interface0D):
         except: self.this = this
     __swig_destroy__ = _Freestyle.delete_SVertex
     __del__ = lambda self : None;
-    def dupplicate(*args): return _Freestyle.SVertex_dupplicate(*args)
+    def duplicate(*args): return _Freestyle.SVertex_duplicate(*args)
     def __eq__(*args): return _Freestyle.SVertex___eq__(*args)
     def point3D(*args): return _Freestyle.SVertex_point3D(*args)
     def point2D(*args): return _Freestyle.SVertex_point2D(*args)
@@ -921,7 +921,7 @@ class FEdge(Interface1D):
         except: self.this = this
     __swig_destroy__ = _Freestyle.delete_FEdge
     __del__ = lambda self : None;
-    def dupplicate(*args): return _Freestyle.FEdge_dupplicate(*args)
+    def duplicate(*args): return _Freestyle.FEdge_duplicate(*args)
     def vertexA(*args): return _Freestyle.FEdge_vertexA(*args)
     def vertexB(*args): return _Freestyle.FEdge_vertexB(*args)
     def getNature(*args): return _Freestyle.FEdge_getNature(*args)
@@ -1016,7 +1016,7 @@ class FEdgeSVertexIterator(Interface0DIteratorNested):
     __swig_setmethods__["userdata"] = _Freestyle.FEdgeSVertexIterator_userdata_set
     __swig_getmethods__["userdata"] = _Freestyle.FEdgeSVertexIterator_userdata_get
     if _newclass:userdata = _swig_property(_Freestyle.FEdgeSVertexIterator_userdata_get, _Freestyle.FEdgeSVertexIterator_userdata_set)
-    def dupplicate(*args): return _Freestyle.FEdgeSVertexIterator_dupplicate(*args)
+    def duplicate(*args): return _Freestyle.FEdgeSVertexIterator_duplicate(*args)
     def point3D(*args): return _Freestyle.FEdgeSVertexIterator_point3D(*args)
     def point2D(*args): return _Freestyle.FEdgeSVertexIterator_point2D(*args)
     def normals(*args): return _Freestyle.FEdgeSVertexIterator_normals(*args)
@@ -1074,7 +1074,7 @@ class FEdgeSharp(FEdge):
         except: self.this = this
     __swig_destroy__ = _Freestyle.delete_FEdgeSharp
     __del__ = lambda self : None;
-    def dupplicate(*args): return _Freestyle.FEdgeSharp_dupplicate(*args)
+    def duplicate(*args): return _Freestyle.FEdgeSharp_duplicate(*args)
     def normalA(*args): return _Freestyle.FEdgeSharp_normalA(*args)
     def normalB(*args): return _Freestyle.FEdgeSharp_normalB(*args)
     def aMaterialIndex(*args): return _Freestyle.FEdgeSharp_aMaterialIndex(*args)
@@ -1102,7 +1102,7 @@ class FEdgeSmooth(FEdge):
         except: self.this = this
     __swig_destroy__ = _Freestyle.delete_FEdgeSmooth
     __del__ = lambda self : None;
-    def dupplicate(*args): return _Freestyle.FEdgeSmooth_dupplicate(*args)
+    def duplicate(*args): return _Freestyle.FEdgeSmooth_duplicate(*args)
     def face(*args): return _Freestyle.FEdgeSmooth_face(*args)
     def normal(*args): return _Freestyle.FEdgeSmooth_normal(*args)
     def materialIndex(*args): return _Freestyle.FEdgeSmooth_materialIndex(*args)
@@ -1126,7 +1126,7 @@ class SShape(_object):
         this = _Freestyle.new_SShape(*args)
         try: self.this.append(this)
         except: self.this = this
-    def dupplicate(*args): return _Freestyle.SShape_dupplicate(*args)
+    def duplicate(*args): return _Freestyle.SShape_duplicate(*args)
     __swig_destroy__ = _Freestyle.delete_SShape
     __del__ = lambda self : None;
     def AddEdge(*args): return _Freestyle.SShape_AddEdge(*args)
@@ -1623,7 +1623,7 @@ class ViewShape(_object):
         this = _Freestyle.new_ViewShape(*args)
         try: self.this.append(this)
         except: self.this = this
-    def dupplicate(*args): return _Freestyle.ViewShape_dupplicate(*args)
+    def duplicate(*args): return _Freestyle.ViewShape_duplicate(*args)
     __swig_destroy__ = _Freestyle.delete_ViewShape
     __del__ = lambda self : None;
     def SplitEdge(*args): return _Freestyle.ViewShape_SplitEdge(*args)
@@ -1706,7 +1706,7 @@ class ViewEdgeSVertexIterator(Interface0DIteratorNested):
     __swig_setmethods__["userdata"] = _Freestyle.ViewEdgeSVertexIterator_userdata_set
     __swig_getmethods__["userdata"] = _Freestyle.ViewEdgeSVertexIterator_userdata_get
     if _newclass:userdata = _swig_property(_Freestyle.ViewEdgeSVertexIterator_userdata_get, _Freestyle.ViewEdgeSVertexIterator_userdata_set)
-    def dupplicate(*args): return _Freestyle.ViewEdgeSVertexIterator_dupplicate(*args)
+    def duplicate(*args): return _Freestyle.ViewEdgeSVertexIterator_duplicate(*args)
     def point3D(*args): return _Freestyle.ViewEdgeSVertexIterator_point3D(*args)
     def point2D(*args): return _Freestyle.ViewEdgeSVertexIterator_point2D(*args)
     def normals(*args): return _Freestyle.ViewEdgeSVertexIterator_normals(*args)

From 426451a44dcdad93c409129dfefc3db39c75cf72 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Thu, 17 Jul 2008 17:33:45 +0000
Subject: [PATCH 099/252] More levels for multi resolution (smoother
 progression between filtering values). Also different progression for
 internal edges filtering than external edges (small internal and less
 important than small external).

---
 source/blender/include/reeb.h        |  3 +++
 source/blender/src/buttons_editing.c |  2 +-
 source/blender/src/reeb.c            | 15 ++++++++++++++-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/source/blender/include/reeb.h b/source/blender/include/reeb.h
index 6baaaf1ca96..815afed6dfa 100644
--- a/source/blender/include/reeb.h
+++ b/source/blender/include/reeb.h
@@ -161,6 +161,9 @@ void verifyBuckets(ReebGraph *rg);
 void verifyFaces(ReebGraph *rg);
 
 /*********************** PUBLIC *********************************/
+
+#define REEB_MAX_MULTI_LEVEL	10
+
 ReebGraph *BIF_ReebGraphFromEditMesh(void);
 ReebGraph *BIF_ReebGraphMultiFromEditMesh(void);
 void BIF_flagMultiArcs(ReebGraph *rg, int flag);
diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c
index c0f1a1f99b9..da3f98231a0 100644
--- a/source/blender/src/buttons_editing.c
+++ b/source/blender/src/buttons_editing.c
@@ -5050,7 +5050,7 @@ static void editing_panel_mesh_skgen_display(Object *ob, Mesh *me)
 	uiDefButBitS(block, TOG, SKGEN_DISP_WEIGHT, REDRAWVIEW3D,	"Weight",			1108, 40, 83,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,		"Show Weight");
 	uiDefButBitS(block, TOG, SKGEN_DISP_ORIG, REDRAWVIEW3D,		"Original",			1191, 40, 84,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,		"Show Original Graph");
 
-	uiDefButC(block, NUM, REDRAWVIEW3D, 						"Level:",			1025, 20, 125,19, &G.scene->toolsettings->skgen_multi_level, 0, 5, 1, 0,"Specify the level to draw");
+	uiDefButC(block, NUM, REDRAWVIEW3D, 						"Level:",			1025, 20, 125,19, &G.scene->toolsettings->skgen_multi_level, 0, REEB_MAX_MULTI_LEVEL, 1, 0,"Specify the level to draw");
 }
 
 static void editing_panel_mesh_skgen_retarget(Object *ob, Mesh *me)
diff --git a/source/blender/src/reeb.c b/source/blender/src/reeb.c
index b3fe465830a..0a3f81de8e6 100644
--- a/source/blender/src/reeb.c
+++ b/source/blender/src/reeb.c
@@ -3153,7 +3153,7 @@ ReebGraph *BIF_ReebGraphMultiFromEditMesh(void)
 	EditMesh *em = G.editMesh;
 	ReebGraph *rg = NULL;
 	ReebGraph *rgi, *previous;
-	int i, nb_levels = 5;
+	int i, nb_levels = REEB_MAX_MULTI_LEVEL;
 	
 	if (em == NULL)
 		return NULL;
@@ -3205,6 +3205,19 @@ ReebGraph *BIF_ReebGraphMultiFromEditMesh(void)
 		{
 			float internal_threshold = rg->length * G.scene->toolsettings->skgen_threshold_internal * (i / (float)nb_levels);
 			float external_threshold = rg->length * G.scene->toolsettings->skgen_threshold_external * (i / (float)nb_levels);
+
+			/* filter internal progressively in second half only*/
+			if (i > nb_levels / 2)
+			{
+				internal_threshold = rg->length * G.scene->toolsettings->skgen_threshold_internal;
+			}
+			else
+			{
+				internal_threshold = rg->length * G.scene->toolsettings->skgen_threshold_internal * (2 * i / (float)nb_levels);
+			}
+			
+			external_threshold = rg->length * G.scene->toolsettings->skgen_threshold_external * (i / (float)nb_levels);
+
 			filterGraph(rgi, G.scene->toolsettings->skgen_options, internal_threshold, external_threshold);
 		}
 

From 98d85c304781a5f7dd4a0b1639bc34f001593464 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Thu, 17 Jul 2008 19:19:43 +0000
Subject: [PATCH 100/252] Solve a crasher bug in the brute force solver

---
 source/blender/src/autoarmature.c | 34 ++++++++++++++++---------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/source/blender/src/autoarmature.c b/source/blender/src/autoarmature.c
index 6c10deb1ae7..bc5aeb81579 100644
--- a/source/blender/src/autoarmature.c
+++ b/source/blender/src/autoarmature.c
@@ -906,27 +906,29 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 			
 			i = nb_joints - 1;
 	
-			/* increment positions, starting from the last one
-			 * until a valid increment is found
-			 * */
-			for (i = must_move; i >= 0; i--)
-			{
-				int remaining_joints = nb_joints - (i + 1); 
-				
-				positions[i] += 1;
-				need_calc = i;
-				
-				if (positions[i] + remaining_joints < earc->bcount)
-				{
-					break;
-				}
-			}
-			
 			if (first_pass)
 			{
 				need_calc = 0;
 				first_pass = 0;
 			}
+			else
+			{
+				/* increment positions, starting from the last one
+				 * until a valid increment is found
+				 * */
+				for (i = must_move; i >= 0; i--)
+				{
+					int remaining_joints = nb_joints - (i + 1); 
+					
+					positions[i] += 1;
+					need_calc = i;
+					
+					if (positions[i] + remaining_joints <= earc->bcount)
+					{
+						break;
+					}
+				}
+			}
 	
 			if (i == -1)
 			{

From 1b46522ec4995ff7856e47dfc580ac1aee69a7b8 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Thu, 17 Jul 2008 20:46:12 +0000
Subject: [PATCH 101/252] Max cost for collapsed bones

---
 source/blender/src/autoarmature.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/source/blender/src/autoarmature.c b/source/blender/src/autoarmature.c
index bc5aeb81579..c50085885ef 100644
--- a/source/blender/src/autoarmature.c
+++ b/source/blender/src/autoarmature.c
@@ -660,8 +660,15 @@ static float costAngle(float original_angle, float vec_first[3], float vec_secon
 
 static float costLength(float original_length, float current_length)
 {
-	float length_ratio = fabs((current_length - original_length) / original_length);
-	return G.scene->toolsettings->skgen_retarget_length_weight * length_ratio * length_ratio;
+	if (current_length == 0)
+	{
+		return MAX_COST;
+	}
+	else
+	{
+		float length_ratio = fabs((current_length - original_length) / original_length);
+		return G.scene->toolsettings->skgen_retarget_length_weight * length_ratio * length_ratio;
+	}
 }
 
 static float calcCost(ReebArcIterator *iter, RigEdge *e1, RigEdge *e2, float *vec0, float *vec1, float *vec2, int i0, int i1, int i2)

From d3973dac717da1557a9a8d50f5c13e25ae75eaa8 Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Fri, 18 Jul 2008 02:55:23 +0000
Subject: [PATCH 102/252] soc-2008-mxcurioni: FEdge class added. Modifed
 converting functions to passing-by-reference format. Improved the type
 checking for FEdge and CurvePoint. Modified FEdge C++ class to test for null
 vertices. Updated previous classes to support FEdge.

So far, whenever a Python object is created from its corresponding C++ object, the input object reference is copied into a new object. Due to Freestyle's functions (especially regarding the way it is iterated), it is currently impossible to deal with a pointer-based Python object. It is not a real drawback, just an aspect to keep in mind.
---
 source/blender/freestyle/SConscript           |   3 +-
 .../freestyle/intern/python/Convert.cpp       |  79 ++-
 .../blender/freestyle/intern/python/Convert.h |  16 +-
 .../freestyle/intern/python/Interface0D.cpp   |  30 +-
 .../intern/python/Interface0D/CurvePoint.cpp  |   9 +-
 .../intern/python/Interface0D/SVertex.cpp     |  24 +-
 .../intern/python/Interface0D/SVertex.h       |  33 ++
 .../freestyle/intern/python/Interface1D.cpp   |  12 +-
 .../intern/python/Interface1D/FEdge.cpp       | 531 ++++++++++--------
 .../intern/python/Interface1D/FEdge.h         |  32 ++
 .../freestyle/intern/view_map/Silhouette.h    |   2 +
 11 files changed, 474 insertions(+), 297 deletions(-)
 create mode 100644 source/blender/freestyle/intern/python/Interface0D/SVertex.h
 create mode 100644 source/blender/freestyle/intern/python/Interface1D/FEdge.h

diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript
index 42d78a393eb..5a7745292a4 100644
--- a/source/blender/freestyle/SConscript
+++ b/source/blender/freestyle/SConscript
@@ -68,7 +68,8 @@ python_sources = [
 					prefix + '/Interface0D.cpp',
 					prefix + '/Interface0D/CurvePoint.cpp',
 					prefix + '/Interface0D/SVertex.cpp',
-					prefix + '/Interface1D.cpp'
+					prefix + '/Interface1D.cpp',
+					prefix + '/Interface1D/FEdge.cpp'
 				]
 
 sources = 	system_sources + image_sources + geometry_sources + scene_graph_sources \
diff --git a/source/blender/freestyle/intern/python/Convert.cpp b/source/blender/freestyle/intern/python/Convert.cpp
index 59b2406f480..47ad6f3c0ad 100644
--- a/source/blender/freestyle/intern/python/Convert.cpp
+++ b/source/blender/freestyle/intern/python/Convert.cpp
@@ -9,71 +9,64 @@ extern "C" {
 
 
 PyObject *PyBool_from_bool( bool b ){
-	// SWIG_From_bool
 	return PyBool_FromLong( b ? 1 : 0);
 }
 
 
-PyObject *Vector_from_Vec2f( Vec2f vec ) {
+PyObject *Vector_from_Vec2f( Vec2f& vec ) {
 	float vec_data[2]; // because vec->_coord is protected
 
-	if( &vec != 0 ){
-		vec_data[0] = vec.x();		vec_data[1] = vec.y();
-		return newVectorObject( vec_data, 2, Py_NEW);
-	} 
-
-	Py_RETURN_NONE;
+	vec_data[0] = vec.x();		vec_data[1] = vec.y();
+	return newVectorObject( vec_data, 2, Py_NEW);
 }
 
-PyObject *Vector_from_Vec3f( Vec3f vec ) {
+PyObject *Vector_from_Vec3f( Vec3f& vec ) {
 	float vec_data[3]; // because vec->_coord is protected
 	
-	if( &vec != 0 ){
-		vec_data[0] = vec.x();		vec_data[1] = vec.y(); 		vec_data[2] = vec.z(); 
-		return newVectorObject( vec_data, 3, Py_NEW);
-	} 
-
-	Py_RETURN_NONE;
+	vec_data[0] = vec.x();		vec_data[1] = vec.y(); 		vec_data[2] = vec.z(); 
+	return newVectorObject( vec_data, 3, Py_NEW);
 }
 
-PyObject *Vector_from_Vec3r( Vec3r vec ) {
+PyObject *Vector_from_Vec3r( Vec3r& vec ) {
 	float vec_data[3]; // because vec->_coord is protected
 	
-	if( &vec != 0 ){
-		vec_data[0] = vec.x();		vec_data[1] = vec.y(); 		vec_data[2] = vec.z(); 
-		return newVectorObject( vec_data, 3, Py_NEW);
-	} 
-
-	Py_RETURN_NONE;
+	vec_data[0] = vec.x();		vec_data[1] = vec.y(); 		vec_data[2] = vec.z(); 
+	return newVectorObject( vec_data, 3, Py_NEW);
 }
 
-PyObject *BPy_Id_from_Id( Id id ) {
-	BPy_Id *py_id;
-	
-	if( &id != 0 ) {
-		py_id = (BPy_Id *) Id_Type.tp_new( &Id_Type, 0, 0 );
-		py_id->id = new Id( id.getFirst(), id.getSecond() );
+PyObject *BPy_Id_from_Id( Id& id ) {
+	PyObject *py_id = Id_Type.tp_new( &Id_Type, 0, 0 );
+	((BPy_Id *) py_id)->id = new Id( id.getFirst(), id.getSecond() );
 
-		return (PyObject *)py_id;
-	}
-	
-	Py_RETURN_NONE;
+	return py_id;
 }
 
-PyObject *BPy_SVertex_from_SVertex( SVertex sv ) {
-	BPy_SVertex *py_sv;
+PyObject *BPy_Interface0D_from_Interface0D( Interface0D& if0D ) {
+	PyObject *py_if0D =  Interface0D_Type.tp_new( &Interface0D_Type, 0, 0 );
+	((BPy_Interface0D *) py_if0D)->if0D = &if0D;
 
-	if( &sv != 0 ) {
-		py_sv = (BPy_SVertex *) SVertex_Type.tp_new( &SVertex_Type, 0, 0 );
-		py_sv->sv = new SVertex( sv );
-		py_sv->py_if0D.if0D = py_sv->sv;
-
-		return (PyObject *)py_sv;
-	}
-
-	Py_RETURN_NONE;
+	return py_if0D;
 }
+
+PyObject *BPy_SVertex_from_SVertex( SVertex& sv ) {
+	PyObject *py_sv = SVertex_Type.tp_new( &SVertex_Type, 0, 0 );
+	((BPy_SVertex *) py_sv)->sv = new SVertex( sv );
+	((BPy_SVertex *) py_sv)->py_if0D.if0D = ((BPy_SVertex *) py_sv)->sv;
+
+	return py_sv;
+}
+
+PyObject *BPy_FEdge_from_FEdge( FEdge& fe ) {
+	PyObject *py_fe = FEdge_Type.tp_new( &FEdge_Type, 0, 0 );
+	((BPy_FEdge *) py_fe)->fe = new FEdge( fe );
+	((BPy_FEdge *) py_fe)->py_if1D.if1D = ((BPy_FEdge *) py_fe)->fe;
+
+	return py_fe;
+}
+
 	
+
+
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/Convert.h b/source/blender/freestyle/intern/python/Convert.h
index ba8e3ea02d2..edd62b1f24a 100644
--- a/source/blender/freestyle/intern/python/Convert.h
+++ b/source/blender/freestyle/intern/python/Convert.h
@@ -5,7 +5,9 @@
 using namespace Geometry;
 
 #include "Id.h"
+#include "Interface0D.h"
 #include "Interface0D/SVertex.h"
+#include "Interface1D/FEdge.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -17,14 +19,16 @@ extern "C" {
 #include "api2_2x/vector.h"
 #include "api2_2x/gen_utils.h"
 
-PyObject *PyBool_from_bool( bool b );
+PyObject * PyBool_from_bool( bool b );
 
-PyObject *Vector_from_Vec2f( Vec2f v );
-PyObject *Vector_from_Vec3f( Vec3f v );
-PyObject *Vector_from_Vec3r( Vec3r v );
+PyObject * Vector_from_Vec2f( Vec2f& v );
+PyObject * Vector_from_Vec3f( Vec3f& v );
+PyObject * Vector_from_Vec3r( Vec3r& v );
 
-PyObject *BPy_Id_from_Id( Id id );
-PyObject *BPy_SVertex_from_SVertex( SVertex sv );
+PyObject * BPy_Id_from_Id( Id& id );
+PyObject * BPy_SVertex_from_SVertex( SVertex& sv );
+PyObject * BPy_FEdge_from_FEdge( FEdge& fe );
+PyObject * BPy_Interface0D_from_Interface0D( Interface0D& if0D );
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/source/blender/freestyle/intern/python/Interface0D.cpp b/source/blender/freestyle/intern/python/Interface0D.cpp
index 27804b3d276..39c2146e015 100644
--- a/source/blender/freestyle/intern/python/Interface0D.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D.cpp
@@ -3,6 +3,7 @@
 #include "Convert.h"
 #include "Interface0D/CurvePoint.h"
 #include "Interface0D/SVertex.h"
+#include "Interface1D/FEdge.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -24,7 +25,7 @@ static PyObject *Interface0D_getProjectedX( BPy_Interface0D *self );
 static PyObject *Interface0D_getProjectedY( BPy_Interface0D *self );
 static PyObject *Interface0D_getProjectedZ( BPy_Interface0D *self );
 static PyObject *Interface0D_getPoint2D( BPy_Interface0D *self );
-static PyObject *Interface0D_getFEdge( BPy_Interface0D *self );
+static PyObject *Interface0D_getFEdge( BPy_Interface0D *self, PyObject *args );
 static PyObject *Interface0D_getId( BPy_Interface0D *self );
 static PyObject *Interface0D_getNature( BPy_Interface0D *self ); 
 
@@ -39,7 +40,7 @@ static PyMethodDef BPy_Interface0D_methods[] = {
 	{"getProjectedY", ( PyCFunction ) Interface0D_getProjectedY, METH_NOARGS, "() Returns the 2D y coordinate of the point."},
 	{"getProjectedZ", ( PyCFunction ) Interface0D_getProjectedZ, METH_NOARGS, "() Returns the 2D z coordinate of the point."},
 	{"getPoint2D", ( PyCFunction ) Interface0D_getPoint2D, METH_NOARGS, "() Returns the 2D point."},
-	{"getFEdge", ( PyCFunction ) Interface0D_getFEdge, METH_NOARGS, "() Returns the FEdge that lies between this Interface0D and the Interface0D given as argument."},
+	{"getFEdge", ( PyCFunction ) Interface0D_getFEdge, METH_VARARGS, "(Interface0D i) Returns the FEdge that lies between this Interface0D and the Interface0D given as argument."},
 	{"getId", ( PyCFunction ) Interface0D_getId, METH_NOARGS, "() Returns the Id of the point."},
 	{"getNature", ( PyCFunction ) Interface0D_getNature, METH_NOARGS, "() Returns the nature of the point."},	
 	{NULL, NULL, 0, NULL}
@@ -193,7 +194,8 @@ PyObject *Interface0D_getZ( BPy_Interface0D *self ) {
 
 
 PyObject *Interface0D_getPoint3D( BPy_Interface0D *self ) {
-	return Vector_from_Vec3f( self->if0D->getPoint3D() );
+	Vec3f v( self->if0D->getPoint3D() );
+	return Vector_from_Vec3f( v );
 }
 
 
@@ -213,22 +215,36 @@ PyObject *Interface0D_getProjectedZ( BPy_Interface0D *self ) {
 
 
 PyObject *Interface0D_getPoint2D( BPy_Interface0D *self ) {
-	return Vector_from_Vec2f( self->if0D->getPoint2D() );
+	Vec2f v( self->if0D->getPoint2D() );
+	return Vector_from_Vec2f( v );
 }
 
 
-PyObject *Interface0D_getFEdge( BPy_Interface0D *self ) {
-	// FEdge
+PyObject *Interface0D_getFEdge( BPy_Interface0D *self, PyObject *args ) {
+	PyObject *py_if0D;
+
+	if(!( PyArg_ParseTuple(args, "O", &py_if0D) && BPy_Interface0D_Check(py_if0D) )) {
+		cout << "ERROR: Interface0D_getFEdge" << endl;
+		Py_RETURN_NONE;
+	}
+
+	FEdge *fe = self->if0D->getFEdge(*( ((BPy_Interface0D *) py_if0D)->if0D ));
+	if( fe )
+		return BPy_FEdge_from_FEdge( *fe );
+	
+	Py_RETURN_NONE;
 }
 
 
 PyObject *Interface0D_getId( BPy_Interface0D *self ) {
-	return BPy_Id_from_Id( self->if0D->getId() );
+	Id id( self->if0D->getId() );
+	return BPy_Id_from_Id( id );
 }
 
 
 PyObject *Interface0D_getNature( BPy_Interface0D *self ) {
 	// VertexNature
+	Py_RETURN_NONE;
 }
 
 
diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp b/source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp
index 5a81f07973d..f76fc9c9931 100644
--- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp
@@ -1,7 +1,6 @@
 #include "CurvePoint.h"
 
 #include "../Convert.h"
-#include "../../stroke/Curve.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -166,15 +165,15 @@ PyObject * CurvePoint___copy__( BPy_CurvePoint *self ) {
 }
 
 PyObject * CurvePoint_A( BPy_CurvePoint *self ) {
-	if( self->cp->A() )
-		return BPy_SVertex_from_SVertex( *(self->cp->A()) );
+	if( SVertex *A = self->cp->A() )
+		return BPy_SVertex_from_SVertex( *A );
 
 	Py_RETURN_NONE;
 }
 
 PyObject * CurvePoint_B( BPy_CurvePoint *self ) {
-	if( self->cp->B() )
-		return BPy_SVertex_from_SVertex( *(self->cp->B()) );
+	if( SVertex *B = self->cp->B() )
+		return BPy_SVertex_from_SVertex( *B );
 
 	Py_RETURN_NONE;
 }
diff --git a/source/blender/freestyle/intern/python/Interface0D/SVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/SVertex.cpp
index fd5b372a1d9..eb91d7daf10 100644
--- a/source/blender/freestyle/intern/python/Interface0D/SVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/SVertex.cpp
@@ -18,6 +18,8 @@ static PyObject * SVertex_SetPoint3D( BPy_SVertex *self , PyObject *args);
 static PyObject * SVertex_SetPoint2D( BPy_SVertex *self , PyObject *args);
 static PyObject * SVertex_AddNormal( BPy_SVertex *self , PyObject *args);
 static PyObject * SVertex_SetId( BPy_SVertex *self , PyObject *args);
+static PyObject *SVertex_AddFEdge( BPy_SVertex *self , PyObject *args);
+
 /*----------------------SVertex instance definitions ----------------------------*/
 static PyMethodDef BPy_SVertex_methods[] = {
 	{"__copy__", ( PyCFunction ) SVertex___copy__, METH_NOARGS, "（ ）Cloning method."},
@@ -27,6 +29,7 @@ static PyMethodDef BPy_SVertex_methods[] = {
 	{"SetPoint2D", ( PyCFunction ) SVertex_SetPoint2D, METH_VARARGS, "Sets the 3D projected coordinates of the SVertex." },
 	{"AddNormal", ( PyCFunction ) SVertex_AddNormal, METH_VARARGS, "Adds a normal to the Svertex's set of normals. If the same normal is already in the set, nothing changes." },
 	{"SetId", ( PyCFunction ) SVertex_SetId, METH_VARARGS, "Sets the Id." },
+	{"AddFEdge", ( PyCFunction ) SVertex_AddFEdge, METH_VARARGS, "Add an FEdge to the list of edges emanating from this SVertex." },	
 	{NULL, NULL, 0, NULL}
 };
 
@@ -163,7 +166,8 @@ PyObject * SVertex_normals( BPy_SVertex *self ) {
 	normals = self->sv->normals();
 		
 	for( set< Vec3r >::iterator set_iterator = normals.begin(); set_iterator != normals.end(); set_iterator++ ) {
-		PyList_Append( py_normals, Vector_from_Vec3r(*set_iterator) );
+		Vec3r v( *set_iterator );
+		PyList_Append( py_normals, Vector_from_Vec3r(v) );
 	}
 	
 	return py_normals;
@@ -215,8 +219,6 @@ PyObject *SVertex_AddNormal( BPy_SVertex *self , PyObject *args) {
 		cout << "ERROR: SVertex_AddNormal" << endl;
 		Py_RETURN_NONE;
 	}
-	
-	cout << "yoyo" << endl;
 
 	Vec3r n( 	PyFloat_AsDouble( PyList_GetItem(py_normal, 0) ),
 				PyFloat_AsDouble( PyList_GetItem(py_normal, 1) ),
@@ -239,9 +241,23 @@ PyObject *SVertex_SetId( BPy_SVertex *self , PyObject *args) {
 	Py_RETURN_NONE;
 }
 
+PyObject *SVertex_AddFEdge( BPy_SVertex *self , PyObject *args) {
+	PyObject *py_fe;
+
+	if(!( PyArg_ParseTuple(args, "O", &py_fe) && BPy_FEdge_Check(py_fe) )) {
+		cout << "ERROR: SVertex_AddFEdge" << endl;
+		Py_RETURN_NONE;
+	}
+	
+	self->sv->AddFEdge( ((BPy_FEdge *) py_fe)->fe );
+
+	Py_RETURN_NONE;
+}
+
+
 // virtual bool 	operator== (const SVertex &iBrother)
 // ViewVertex * 	viewvertex ()
-// void 	AddFEdge (FEdge *iFEdge)
+
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/source/blender/freestyle/intern/python/Interface0D/SVertex.h b/source/blender/freestyle/intern/python/Interface0D/SVertex.h
new file mode 100644
index 00000000000..ac89133ab55
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Interface0D/SVertex.h
@@ -0,0 +1,33 @@
+#ifndef FREESTYLE_PYTHON_SVERTEX_H
+#define FREESTYLE_PYTHON_SVERTEX_H
+
+#include "../../view_map/Silhouette.h"
+#include "../Interface0D.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject SVertex_Type;
+
+#define BPy_SVertex_Check(v) \
+    ((v)->ob_type == &SVertex_Type)
+
+/*---------------------------Python BPy_SVertex structure definition----------*/
+typedef struct {
+	BPy_Interface0D py_if0D;
+	SVertex *sv;
+} BPy_SVertex;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_SVERTEX_H */
diff --git a/source/blender/freestyle/intern/python/Interface1D.cpp b/source/blender/freestyle/intern/python/Interface1D.cpp
index 27c5f4d08ff..971403b3354 100644
--- a/source/blender/freestyle/intern/python/Interface1D.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D.cpp
@@ -1,6 +1,7 @@
 #include "Interface1D.h"
 
 #include "Convert.h"
+#include "Interface1D/FEdge.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -128,9 +129,14 @@ PyMODINIT_FUNC Interface1D_Init( PyObject *module )
 
 	if( PyType_Ready( &Interface1D_Type ) < 0 )
 		return;
-
 	Py_INCREF( &Interface1D_Type );
 	PyModule_AddObject(module, "Interface1D", (PyObject *)&Interface1D_Type);
+	
+	if( PyType_Ready( &FEdge_Type ) < 0 )
+		return;
+	Py_INCREF( &FEdge_Type );
+	PyModule_AddObject(module, "FEdge", (PyObject *)&FEdge_Type);
+	
 }
 
 //------------------------INSTANCE METHODS ----------------------------------
@@ -169,11 +175,13 @@ PyObject *Interface1D_getLength2D( BPy_Interface1D *self ) {
 }
 
 PyObject *Interface1D_getId( BPy_Interface1D *self ) {
-	return BPy_Id_from_Id( self->if1D->getId() );
+	Id id( self->if1D->getId() );
+	return BPy_Id_from_Id( id );
 }
 
 PyObject *Interface1D_getNature( BPy_Interface1D *self ) {
 	// EdgeNature
+	Py_RETURN_NONE;
 }
 
 PyObject *Interface1D_getTimeStamp( BPy_Interface1D *self ) {
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge.cpp
index 862456d2b7c..e8e5c6787e3 100644
--- a/source/blender/freestyle/intern/python/Interface1D/FEdge.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/FEdge.cpp
@@ -1,252 +1,325 @@
- PyObject *_wrap_FEdge_getExactTypeName(PyObject *self , PyObject *args) {
+#include "FEdge.h"
+
+#include "../Convert.h"
+#include "../Interface0D/SVertex.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for FEdge instance  -----------*/
+static int FEdge___init__(BPy_FEdge *self, PyObject *args, PyObject *kwds);
+static PyObject * FEdge___copy__( BPy_FEdge *self );
+static PyObject * FEdge_vertexA( BPy_FEdge *self );
+static PyObject * FEdge_vertexB( BPy_FEdge *self );
+static PyObject * FEdge___getitem__( BPy_FEdge *self, PyObject *args );
+static PyObject * FEdge_nextEdge( BPy_FEdge *self );
+static PyObject * FEdge_previousEdge( BPy_FEdge *self );
+static PyObject * FEdge_getVertices( BPy_FEdge *self );
+static PyObject * FEdge_getPoints( BPy_FEdge *self );
+static PyObject * FEdge_isSmooth( BPy_FEdge *self );
+static PyObject * FEdge_SetVertexA( BPy_FEdge *self , PyObject *args);
+static PyObject * FEdge_SetVertexB( BPy_FEdge *self , PyObject *args);
+static PyObject * FEdge_SetId( BPy_FEdge *self , PyObject *args);
+static PyObject * FEdge_SetNextEdge( BPy_FEdge *self , PyObject *args);
+static PyObject * FEdge_SetPreviousEdge( BPy_FEdge *self , PyObject *args);
+static PyObject * FEdge_SetSmooth( BPy_FEdge *self , PyObject *args); 
+
+/*----------------------FEdge instance definitions ----------------------------*/
+static PyMethodDef BPy_FEdge_methods[] = {	
+	{"__copy__", ( PyCFunction ) FEdge___copy__, METH_NOARGS, "() Cloning method."},
+	{"vertexA", ( PyCFunction ) FEdge_vertexA, METH_NOARGS, "() Returns the first SVertex."},
+	{"vertexB", ( PyCFunction ) FEdge_vertexB, METH_NOARGS, "() Returns the second SVertex."},
+	{"__getitem__", ( PyCFunction ) FEdge___getitem__, METH_VARARGS, "(int i) Returns the first SVertex if i=0, the seccond SVertex if i=1."},
+	{"nextEdge", ( PyCFunction ) FEdge_nextEdge, METH_NOARGS, "() Returns the FEdge following this one in the ViewEdge. If this FEdge is the last of the ViewEdge, 0 is returned."},
+	{"previousEdge", ( PyCFunction ) FEdge_previousEdge, METH_NOARGS, "Returns the Edge preceding this one in the ViewEdge. If this FEdge is the first one of the ViewEdge, 0 is returned."},
+	{"getVertices", ( PyCFunction ) FEdge_getVertices, METH_NOARGS, "Returns the vertices"},
+	{"getPoints", ( PyCFunction ) FEdge_getPoints, METH_NOARGS, "Returns the points. The difference with getVertices() is that here we can iterate over points of the 1D element at any given sampling. At each call, a virtual point is created."}, 
+	{"isSmooth", ( PyCFunction ) FEdge_isSmooth, METH_NOARGS, "() Returns true if this FEdge is a smooth FEdge."},
+	{"SetVertexA", ( PyCFunction ) FEdge_SetVertexA, METH_VARARGS, "(SVertex v) Sets the first SVertex. ."},
+	{"SetVertexB", ( PyCFunction ) FEdge_SetVertexB, METH_VARARGS, "(SVertex v) Sets the second SVertex. "},
+	{"SetId", ( PyCFunction ) FEdge_SetId, METH_VARARGS, "(Id id) Sets the FEdge Id ."},
+	{"SetNextEdge", ( PyCFunction ) FEdge_SetNextEdge, METH_VARARGS, "(FEdge e) Sets the pointer to the next FEdge. "},
+	{"SetPreviousEdge", ( PyCFunction ) FEdge_SetPreviousEdge, METH_VARARGS, "(FEdge e) Sets the pointer to the previous FEdge. "},
+	{"SetSmooth", ( PyCFunction ) FEdge_SetSmooth, METH_VARARGS, "(bool b) Sets the flag telling whether this FEdge is smooth or sharp. true for Smooth, false for Sharp. "},
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_FEdge type definition ------------------------------*/
+
+PyTypeObject FEdge_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"FEdge",				/* tp_name */
+	sizeof( BPy_FEdge ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_FEdge_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&Interface1D_Type,				/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)FEdge___init__,                       	/* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+
+
+//------------------------INSTANCE METHODS ----------------------------------
+	
+int FEdge___init__(BPy_FEdge *self, PyObject *args, PyObject *kwds)
+{
+
+	PyObject *obj1 = 0, *obj2 = 0;
+
+    if (! PyArg_ParseTuple(args, "|OO", &obj1, &obj2) )
+        return -1;
+
+	if( !obj1 && !obj2 ){
+		self->fe = new FEdge();
+	} else if( BPy_SVertex_Check(obj1) && BPy_SVertex_Check(obj2) ) {
+		self->fe = new FEdge( ((BPy_SVertex *) obj1)->sv, ((BPy_SVertex *) obj2)->sv );
+	} else {
+		return -1;
+	}
+
+	self->py_if1D.if1D = self->fe;
+
+	return 0;
 }
 
 
- PyObject *_wrap_FEdge_getLength2D(PyObject *self , PyObject *args) {
+PyObject * FEdge___copy__( BPy_FEdge *self ) {
+	BPy_FEdge *py_fe;
+	
+	py_fe = (BPy_FEdge *) FEdge_Type.tp_new( &FEdge_Type, 0, 0 );
+	
+	py_fe->fe = new FEdge( *(self->fe) );
+	py_fe->py_if1D.if1D = py_fe->fe;
+
+	return (PyObject *) py_fe;
+}
+
+PyObject * FEdge_vertexA( BPy_FEdge *self ) {	
+	if( self->fe->vertexA() ){
+		return BPy_SVertex_from_SVertex( *(self->fe->vertexA()) );
+	}
+		
+	Py_RETURN_NONE;
+}
+
+PyObject * FEdge_vertexB( BPy_FEdge *self ) {
+	if( self->fe->vertexB() ){
+		return BPy_SVertex_from_SVertex( *(self->fe->vertexB()) );
+	}
+		
+	Py_RETURN_NONE;
 }
 
 
- PyObject *_wrap_FEdge_getId(PyObject *self , PyObject *args) {
+PyObject * FEdge___getitem__( BPy_FEdge *self, PyObject *args ) {
+	int i;
+
+	if(!( PyArg_ParseTuple(args, "i", &i) && (i == 0 || i == 1)  )) {
+		cout << "ERROR: FEdge___getitem__" << endl;
+		Py_RETURN_NONE;
+	}
+	
+	if( SVertex *v = self->fe->operator[](i) )
+		return BPy_SVertex_from_SVertex( *v );
+
+	Py_RETURN_NONE;
+}
+
+PyObject * FEdge_nextEdge( BPy_FEdge *self ) {
+	if( FEdge *fe = self->fe->nextEdge() )
+		return BPy_FEdge_from_FEdge( *fe );
+
+	Py_RETURN_NONE;
+}
+
+PyObject * FEdge_previousEdge( BPy_FEdge *self ) {
+	if( FEdge *fe = self->fe->previousEdge() )
+		return BPy_FEdge_from_FEdge( *fe );
+
+	Py_RETURN_NONE;
+}
+
+PyObject * FEdge_isSmooth( BPy_FEdge *self ) {
+	return PyBool_from_bool( self->fe->isSmooth() );
+}
+	
+PyObject *FEdge_SetVertexA( BPy_FEdge *self , PyObject *args) {
+	PyObject *py_sv;
+
+	if(!( PyArg_ParseTuple(args, "O", &py_sv) && BPy_SVertex_Check(py_sv) )) {
+		cout << "ERROR: FEdge_SetVertexA" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->fe->SetVertexA( ((BPy_SVertex *) py_sv)->sv );
+
+	Py_RETURN_NONE;
+}
+
+PyObject *FEdge_SetVertexB( BPy_FEdge *self , PyObject *args) {
+	PyObject *py_sv;
+
+	if(!( PyArg_ParseTuple(args, "O", &py_sv) && BPy_SVertex_Check(py_sv) )) {
+		cout << "ERROR: FEdge_SetVertexB" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->fe->SetVertexB( ((BPy_SVertex *) py_sv)->sv );
+
+	Py_RETURN_NONE;
+}
+
+PyObject *FEdge_SetId( BPy_FEdge *self , PyObject *args) {
+	PyObject *py_id;
+
+	if(!( PyArg_ParseTuple(args, "O", &py_id) && BPy_Id_Check(py_id) )) {
+		cout << "ERROR: FEdge_SetId" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->fe->SetId(*( ((BPy_Id *) py_id)->id ));
+
+	Py_RETURN_NONE;
 }
 
 
- PyObject *_wrap_FEdge_userdata_set(PyObject *self , PyObject *args) {
+PyObject *FEdge_SetNextEdge( BPy_FEdge *self , PyObject *args) {
+	PyObject *py_fe;
+
+	if(!( PyArg_ParseTuple(args, "O", &py_fe) && BPy_FEdge_Check(py_fe) )) {
+		cout << "ERROR: FEdge_SetNextEdge" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->fe->SetNextEdge( ((BPy_FEdge *) py_fe)->fe );
+
+	Py_RETURN_NONE;
 }
 
+PyObject *FEdge_SetPreviousEdge( BPy_FEdge *self , PyObject *args) {
+	PyObject *py_fe;
 
- PyObject *_wrap_FEdge_userdata_get(PyObject *self , PyObject *args) {
+	if(!( PyArg_ParseTuple(args, "O", &py_fe) && BPy_FEdge_Check(py_fe) )) {
+		cout << "ERROR: FEdge_SetPreviousEdge" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->fe->SetPreviousEdge( ((BPy_FEdge *) py_fe)->fe );
+
+	Py_RETURN_NONE;
 }
 
+PyObject *FEdge_SetSmooth( BPy_FEdge *self , PyObject *args) {
+	int b;
 
- PyObject *_wrap_new_FEdge__SWIG_0(PyObject *self , PyObject *args) {
+	if(!( PyArg_ParseTuple(args, "i", &b) )) {
+		cout << "ERROR: FEdge_SetSmooth" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->fe->SetSmooth( (bool) b );
+
+	Py_RETURN_NONE;
 }
 
-
- PyObject *_wrap_new_FEdge__SWIG_1(PyObject *self , PyObject *args) {
+PyObject *FEdge_getVertices( BPy_FEdge *self ) {
+	PyObject *py_vertices = PyList_New(NULL);
+		
+	for( Interface0DIterator it = self->fe->verticesBegin(); it != self->fe->verticesEnd(); it++ ) {
+		PyList_Append( py_vertices, BPy_Interface0D_from_Interface0D( *it ) );
+	}
+	
+	return py_vertices;
 }
 
-
- PyObject *_wrap_new_FEdge__SWIG_2(PyObject *self , PyObject *args) {
+PyObject *FEdge_getPoints( BPy_FEdge *self ) {
+	PyObject *py_points = PyList_New(NULL);
+	
+	for( Interface0DIterator it = self->fe->pointsBegin(); it != self->fe->pointsEnd(); it++ ) {
+		PyList_Append( py_points, BPy_Interface0D_from_Interface0D( *it ) );
+	}
+	
+	return py_points;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_new_FEdge(PyObject *self, PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_delete_FEdge(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_dupplicate(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_vertexA(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_vertexB(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_getNature(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_nextEdge(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_previousEdge(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_shape__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_invisibility(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_viewedge(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_center3d(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_center2d(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_aFace(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_getOccludeeIntersection(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_getOccludeeEmpty(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_isSmooth(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_SetVertexA(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_SetVertexB(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_SetId(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_SetNextEdge(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_SetPreviousEdge(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_SetNature(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_SetViewEdge(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_SetaFace(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_SetOccludeeIntersection(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_SetOccludeeEmpty(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_SetSmooth(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_CommonVertex(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_min2d(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_max2d(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_shape_id(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_shape__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_shape(PyObject *self, PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_shape_importance(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_qi(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_occluders_begin(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_occluders_end(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_occluders_empty(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_occluders_size(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_occludee(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_occluded_shape(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_occludee_empty(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_z_discontinuity(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_viewedge_nature(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_orientation2d(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_orientation3d(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_verticesBegin(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_verticesEnd(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_pointsBegin__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_pointsBegin__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_pointsBegin(PyObject *self, PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_pointsEnd__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_pointsEnd__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdge_pointsEnd(PyObject *self, PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge.h b/source/blender/freestyle/intern/python/Interface1D/FEdge.h
new file mode 100644
index 00000000000..39c9c56e391
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Interface1D/FEdge.h
@@ -0,0 +1,32 @@
+#ifndef FREESTYLE_PYTHON_FEDGE_H
+#define FREESTYLE_PYTHON_FEDGE_H
+
+#include "../Interface1D.h"
+#include "../../view_map/Silhouette.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject FEdge_Type;
+
+#define BPy_FEdge_Check(v) \
+    ((v)->ob_type == &FEdge_Type)
+
+/*---------------------------Python BPy_FEdge structure definition----------*/
+typedef struct {
+	BPy_Interface1D py_if1D;
+	FEdge *fe;
+} BPy_FEdge;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_FEDGE_H */
diff --git a/source/blender/freestyle/intern/view_map/Silhouette.h b/source/blender/freestyle/intern/view_map/Silhouette.h
index c6a1763eec6..15947fe3ba4 100755
--- a/source/blender/freestyle/intern/view_map/Silhouette.h
+++ b/source/blender/freestyle/intern/view_map/Silhouette.h
@@ -412,6 +412,8 @@ public:
   /*! Default constructor */
   inline FEdge() {
     userdata = NULL;
+    _VertexA = NULL;
+    _VertexB = NULL;
     _Nature = Nature::NO_FEATURE;
     _NextEdge = NULL;
     _PreviousEdge = NULL;

From 21674d2db2dbc932fa87699768c1ebb2f61bc941 Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Fri, 18 Jul 2008 04:59:07 +0000
Subject: [PATCH 103/252] soc-2008-mxcurioni: canvas for  UnaryFunction0D,
 UnaryFunction1D, UnaryPredicate0D, UnaryPredicate1D.

UnaryFunction0D and UnaryFunction1D implementations are going to be really challenging due to the changes in the infrastructure: UnaryFunction0D<T> and UnaryFunction0D<T> are templates and must be determined for compile-time. The easiest solution is to support each type individually; unfortunately, it removes the benefit of using an interface. To find a middle ground, a general unary function Python object type was created for 0D and 1D. In both cases, the types have a void* pointer keeping the address of the current unary function type. I am not sure yet if it will work.

Interface0DIterator being removed by a list type, the t() and u() coordinate functions will to be transferred somehow, probably directly at the Interface0D level.
---
 .../freestyle/intern/python/Freestyle.cpp     |   9 +-
 .../intern/python/UnaryFunction0D.cpp         | 173 +++++++++++++++++
 .../freestyle/intern/python/UnaryFunction0D.h |  35 ++++
 .../intern/python/UnaryFunction0DVoid.cpp     |  12 --
 .../intern/python/UnaryFunction1D.cpp         | 175 ++++++++++++++++++
 .../freestyle/intern/python/UnaryFunction1D.h |  35 ++++
 .../intern/python/UnaryFunction1DVoid.cpp     |  20 --
 .../intern/python/UnaryPredicate0D.cpp        | 164 +++++++++++++++-
 .../intern/python/UnaryPredicate0D.h          |  35 ++++
 .../intern/python/UnaryPredicate1D.cpp        | 164 +++++++++++++++-
 .../intern/python/UnaryPredicate1D.h          |  35 ++++
 11 files changed, 818 insertions(+), 39 deletions(-)
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D.h
 delete mode 100644 source/blender/freestyle/intern/python/UnaryFunction0DVoid.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D.h
 delete mode 100644 source/blender/freestyle/intern/python/UnaryFunction1DVoid.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryPredicate0D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryPredicate1D.h

diff --git a/source/blender/freestyle/intern/python/Freestyle.cpp b/source/blender/freestyle/intern/python/Freestyle.cpp
index 9630aa38f80..809568abe2c 100644
--- a/source/blender/freestyle/intern/python/Freestyle.cpp
+++ b/source/blender/freestyle/intern/python/Freestyle.cpp
@@ -6,7 +6,10 @@
 #include "Interface0D.h"
 #include "Interface0D/CurvePoint.h"
 #include "Interface1D.h"
-
+#include "UnaryFunction0D.h"
+#include "UnaryFunction1D.h"
+#include "UnaryPredicate0D.h"
+#include "UnaryPredicate1D.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -127,6 +130,10 @@ PyObject *Freestyle_Init( void )
 	Id_Init( module );
 	Interface0D_Init( module );
 	Interface1D_Init( module );
+	UnaryFunction0D_Init( module );
+	UnaryFunction1D_Init( module );
+	UnaryPredicate0D_Init( module );
+	UnaryPredicate1D_Init( module );
 	
 	return module;
 }
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D.cpp
new file mode 100644
index 00000000000..b9da3dfc20d
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D.cpp
@@ -0,0 +1,173 @@
+#include "UnaryFunction0D.h"
+
+#include "Convert.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for UnaryFunction0D instance  -----------*/
+static int UnaryFunction0D___init__(BPy_UnaryFunction0D *self, PyObject *args, PyObject *kwds);
+static void UnaryFunction0D___dealloc__(BPy_UnaryFunction0D *self);
+static PyObject * UnaryFunction0D___repr__(BPy_UnaryFunction0D *self);
+
+static PyObject * UnaryFunction0D_getName( BPy_UnaryFunction0D *self, PyObject *args);
+static PyObject * UnaryFunction0D___call__( BPy_UnaryFunction0D *self, PyObject *args);
+
+/*----------------------UnaryFunction0D instance definitions ----------------------------*/
+static PyMethodDef BPy_UnaryFunction0D_methods[] = {
+	{"getName", ( PyCFunction ) UnaryFunction0D_getName, METH_NOARGS, ""},
+	{"__call__", ( PyCFunction ) UnaryFunction0D___call__, METH_VARARGS, "" },
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_UnaryFunction0D type definition ------------------------------*/
+
+PyTypeObject UnaryFunction0D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"UnaryFunction0D",				/* tp_name */
+	sizeof( BPy_UnaryFunction0D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	(destructor)UnaryFunction0D___dealloc__,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	(reprfunc)UnaryFunction0D___repr__,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_UnaryFunction0D_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	NULL,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)UnaryFunction0D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	PyType_GenericNew,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+PyMODINIT_FUNC UnaryFunction0D_Init( PyObject *module )
+{
+	if( module == NULL )
+		return;
+
+	if( PyType_Ready( &UnaryFunction0D_Type ) < 0 )
+		return;
+	Py_INCREF( &UnaryFunction0D_Type );
+	PyModule_AddObject(module, "UnaryFunction0D", (PyObject *)&UnaryFunction0D_Type);
+}
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int UnaryFunction0D___init__(BPy_UnaryFunction0D *self, PyObject *args, PyObject *kwds)
+{
+	return 0;
+}
+
+void UnaryFunction0D___dealloc__(BPy_UnaryFunction0D* self)
+{
+	//delete self->uf0D;
+    self->ob_type->tp_free((PyObject*)self);
+}
+
+
+PyObject * UnaryFunction0D___repr__(BPy_UnaryFunction0D* self)
+{
+    return PyString_FromFormat("type: %s - address: %p", ((UnaryFunction0D<void> *) self->uf0D)->getName().c_str(), self->uf0D );
+}
+
+
+PyObject * UnaryFunction0D_getName( BPy_UnaryFunction0D *self, PyObject *args)
+{
+	return PyString_FromString( ((UnaryFunction0D<void> *) self->uf0D)->getName().c_str() );
+}
+
+PyObject * UnaryFunction0D___call__( BPy_UnaryFunction0D *self, PyObject *args)
+{
+	PyObject *l;
+
+	if( !PyArg_ParseTuple(args, "O", &l) ) {
+		cout << "ERROR: UnaryFunction0D___call__ " << endl;		
+		return NULL;
+	}
+	
+	// pb: operator() is called on Interface0DIterator while we have a list
+	// solutions:
+	// 1)reconvert back to iterator ?
+	// 2) adapt interface0d to have t(), u() functions
+	
+	// b = self->bp0D->operator()( *(obj1->uf0D) );
+	// return PyBool_from_bool( b );
+	
+	Py_RETURN_NONE;
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D.h
new file mode 100644
index 00000000000..365b340d96c
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D.h
@@ -0,0 +1,35 @@
+#ifndef FREESTYLE_PYTHON_UNARYFUNCTION0D_H
+#define FREESTYLE_PYTHON_UNARYFUNCTION0D_H
+
+#include "../view_map/Functions0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject UnaryFunction0D_Type;
+
+#define BPy_UnaryFunction0D_Check(v) \
+    ((v)->ob_type == &UnaryFunction0D_Type)
+
+/*---------------------------Python BPy_UnaryFunction0D structure definition----------*/
+typedef struct {
+	PyObject_HEAD
+	void *uf0D;
+} BPy_UnaryFunction0D;
+
+/*---------------------------Python BPy_UnaryFunction0D visible prototypes-----------*/
+
+PyMODINIT_FUNC UnaryFunction0D_Init( PyObject *module );
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_UNARYFUNCTION0D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0DVoid.cpp b/source/blender/freestyle/intern/python/UnaryFunction0DVoid.cpp
deleted file mode 100644
index 92a87b04a80..00000000000
--- a/source/blender/freestyle/intern/python/UnaryFunction0DVoid.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
- PyObject *_wrap_UnaryFunction0DVoid_getName(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_UnaryFunction0DVoid___call__(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_disown_UnaryFunction0DVoid(PyObject *self , PyObject *args) {
-}
-
-
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D.cpp
new file mode 100644
index 00000000000..db026ced338
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D.cpp
@@ -0,0 +1,175 @@
+#include "UnaryFunction1D.h"
+
+#include "Convert.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for UnaryFunction1D instance  -----------*/
+static int UnaryFunction1D___init__(BPy_UnaryFunction1D *self, PyObject *args, PyObject *kwds);
+static void UnaryFunction1D___dealloc__(BPy_UnaryFunction1D *self);
+static PyObject * UnaryFunction1D___repr__(BPy_UnaryFunction1D *self);
+
+static PyObject * UnaryFunction1D_getName( BPy_UnaryFunction1D *self, PyObject *args);
+static PyObject * UnaryFunction1D___call__( BPy_UnaryFunction1D *self, PyObject *args);
+
+/*----------------------UnaryFunction1D instance definitions ----------------------------*/
+static PyMethodDef BPy_UnaryFunction1D_methods[] = {
+	{"getName", ( PyCFunction ) UnaryFunction1D_getName, METH_NOARGS, ""},
+	{"__call__", ( PyCFunction ) UnaryFunction1D___call__, METH_VARARGS, "" },
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_UnaryFunction1D type definition ------------------------------*/
+
+PyTypeObject UnaryFunction1D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"UnaryFunction1D",				/* tp_name */
+	sizeof( BPy_UnaryFunction1D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	(destructor)UnaryFunction1D___dealloc__,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	(reprfunc)UnaryFunction1D___repr__,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	NULL,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_UnaryFunction1D_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	NULL,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	NULL,                          	/* long tp_dictoffset; */
+	(initproc)UnaryFunction1D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	PyType_GenericNew,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+PyMODINIT_FUNC UnaryFunction1D_Init( PyObject *module )
+{
+	if( module == NULL )
+		return;
+
+	if( PyType_Ready( &UnaryFunction1D_Type ) < 0 )
+		return;
+	Py_INCREF( &UnaryFunction1D_Type );
+	PyModule_AddObject(module, "UnaryFunction1D", (PyObject *)&UnaryFunction1D_Type);
+}
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int UnaryFunction1D___init__(BPy_UnaryFunction1D *self, PyObject *args, PyObject *kwds)
+{
+	return 0;
+}
+
+void UnaryFunction1D___dealloc__(BPy_UnaryFunction1D* self)
+{
+	//delete self->uf1D;
+    self->ob_type->tp_free((PyObject*)self);
+}
+
+
+PyObject * UnaryFunction1D___repr__(BPy_UnaryFunction1D* self)
+{
+    return PyString_FromFormat("type: %s - address: %p", ((UnaryFunction1D<void> *) self->uf1D)->getName().c_str(), self->uf1D );
+}
+
+
+PyObject * UnaryFunction1D_getName( BPy_UnaryFunction1D *self, PyObject *args)
+{
+	return PyString_FromString( ((UnaryFunction1D<void> *) self->uf1D)->getName().c_str() );
+}
+
+PyObject * UnaryFunction1D___call__( BPy_UnaryFunction1D *self, PyObject *args)
+{
+	PyObject *l;
+
+	if( !PyArg_ParseTuple(args, "O", &l) ) {
+		cout << "ERROR: UnaryFunction1D___call__ " << endl;		
+		return NULL;
+	}
+	
+	// pb: operator() is called on Interface0DIterator while we have a list
+	// solutions:
+	// 1)reconvert back to iterator ?
+	// 2) adapt interface0d to have t(), u() functions
+	
+	// b = self->bp0D->operator()( *(obj1->uf0D) );
+	// return PyBool_from_bool( b );
+	
+	Py_RETURN_NONE;
+}
+
+// void 	setIntegrationType (IntegrationType integration)
+// IntegrationType 	getIntegrationType () const
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D.h
new file mode 100644
index 00000000000..2ad187ca81d
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D.h
@@ -0,0 +1,35 @@
+#ifndef FREESTYLE_PYTHON_UNARYFUNCTION1D_H
+#define FREESTYLE_PYTHON_UNARYFUNCTION1D_H
+
+#include "../view_map/Functions1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject UnaryFunction1D_Type;
+
+#define BPy_UnaryFunction1D_Check(v) \
+    ((v)->ob_type == &UnaryFunction1D_Type)
+
+/*---------------------------Python BPy_UnaryFunction1D structure definition----------*/
+typedef struct {
+	PyObject_HEAD
+ 	void *uf1D;
+} BPy_UnaryFunction1D;
+
+/*---------------------------Python BPy_UnaryFunction1D visible prototypes-----------*/
+
+PyMODINIT_FUNC UnaryFunction1D_Init( PyObject *module );
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_UNARYFUNCTION1D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1DVoid.cpp b/source/blender/freestyle/intern/python/UnaryFunction1DVoid.cpp
deleted file mode 100644
index 13c8a088dfb..00000000000
--- a/source/blender/freestyle/intern/python/UnaryFunction1DVoid.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
- PyObject *_wrap_UnaryFunction1DVoid_getName(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_UnaryFunction1DVoid___call__(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_UnaryFunction1DVoid_setIntegrationType(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_UnaryFunction1DVoid_getIntegrationType(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_disown_UnaryFunction1DVoid(PyObject *self , PyObject *args) {
-}
-
-
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate0D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate0D.cpp
index 7c67de86079..1d2fd6b284f 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate0D.cpp
@@ -1,12 +1,170 @@
- PyObject *_wrap_UnaryPredicate0D_getName(PyObject *self , PyObject *args) {
+#include "UnaryPredicate0D.h"
+
+#include "Convert.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for UnaryPredicate0D instance  -----------*/
+static int UnaryPredicate0D___init__(BPy_UnaryPredicate0D *self, PyObject *args, PyObject *kwds);
+static void UnaryPredicate0D___dealloc__(BPy_UnaryPredicate0D *self);
+static PyObject * UnaryPredicate0D___repr__(BPy_UnaryPredicate0D *self);
+
+static PyObject * UnaryPredicate0D_getName( BPy_UnaryPredicate0D *self, PyObject *args);
+static PyObject * UnaryPredicate0D___call__( BPy_UnaryPredicate0D *self, PyObject *args);
+
+/*----------------------UnaryPredicate0D instance definitions ----------------------------*/
+static PyMethodDef BPy_UnaryPredicate0D_methods[] = {
+	{"getName", ( PyCFunction ) UnaryPredicate0D_getName, METH_NOARGS, ""},
+	{"__call__", ( PyCFunction ) UnaryPredicate0D___call__, METH_VARARGS, "" },
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_UnaryPredicate0D type definition ------------------------------*/
+
+PyTypeObject UnaryPredicate0D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"UnaryPredicate0D",				/* tp_name */
+	sizeof( BPy_UnaryPredicate0D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	(destructor)UnaryPredicate0D___dealloc__,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	(reprfunc)UnaryPredicate0D___repr__,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_UnaryPredicate0D_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	NULL,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)UnaryPredicate0D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	PyType_GenericNew,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+PyMODINIT_FUNC UnaryPredicate0D_Init( PyObject *module )
+{
+	if( module == NULL )
+		return;
+
+	if( PyType_Ready( &UnaryPredicate0D_Type ) < 0 )
+		return;
+	Py_INCREF( &UnaryPredicate0D_Type );
+	PyModule_AddObject(module, "UnaryPredicate0D", (PyObject *)&UnaryPredicate0D_Type);
+}
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int UnaryPredicate0D___init__(BPy_UnaryPredicate0D *self, PyObject *args, PyObject *kwds)
+{
+	return 0;
+}
+
+void UnaryPredicate0D___dealloc__(BPy_UnaryPredicate0D* self)
+{
+	delete self->up0D;
+    self->ob_type->tp_free((PyObject*)self);
 }
 
 
- PyObject *_wrap_UnaryPredicate0D___call__(PyObject *self , PyObject *args) {
+PyObject * UnaryPredicate0D___repr__(BPy_UnaryPredicate0D* self)
+{
+    return PyString_FromFormat("type: %s - address: %p", self->up0D->getName().c_str(), self->up0D );
 }
 
 
- PyObject *_wrap_disown_UnaryPredicate0D(PyObject *self , PyObject *args) {
+PyObject * UnaryPredicate0D_getName( BPy_UnaryPredicate0D *self, PyObject *args)
+{
+	return PyString_FromString( self->up0D->getName().c_str() );
+}
+
+PyObject * UnaryPredicate0D___call__( BPy_UnaryPredicate0D *self, PyObject *args)
+{
+	PyObject *l;
+
+	if( !PyArg_ParseTuple(args, "O", &l) ) {
+		cout << "ERROR: UnaryPredicate0D___call__ " << endl;		
+		return NULL;
+	}
+	
+	//TBD
+	
+	Py_RETURN_NONE;
 }
 
 
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate0D.h b/source/blender/freestyle/intern/python/UnaryPredicate0D.h
new file mode 100644
index 00000000000..c8b9008380a
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryPredicate0D.h
@@ -0,0 +1,35 @@
+#ifndef FREESTYLE_PYTHON_UNARYPREDICATE0D_H
+#define FREESTYLE_PYTHON_UNARYPREDICATE0D_H
+
+#include "../stroke/Predicates0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject UnaryPredicate0D_Type;
+
+#define BPy_UnaryPredicate0D_Check(v) \
+    ((v)->ob_type == &UnaryPredicate0D_Type)
+
+/*---------------------------Python BPy_UnaryPredicate0D structure definition----------*/
+typedef struct {
+	PyObject_HEAD
+	UnaryPredicate0D *up0D;
+} BPy_UnaryPredicate0D;
+
+/*---------------------------Python BPy_UnaryPredicate0D visible prototypes-----------*/
+
+PyMODINIT_FUNC UnaryPredicate0D_Init( PyObject *module );
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_UNARYPREDICATE0D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D.cpp
index 0f2b5c4ad3a..bbbc9bfcc43 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D.cpp
@@ -1,12 +1,170 @@
- PyObject *_wrap_UnaryPredicate1D_getName(PyObject *self , PyObject *args) {
+#include "UnaryPredicate1D.h"
+
+#include "Convert.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for UnaryPredicate1D instance  -----------*/
+static int UnaryPredicate1D___init__(BPy_UnaryPredicate1D *self, PyObject *args, PyObject *kwds);
+static void UnaryPredicate1D___dealloc__(BPy_UnaryPredicate1D *self);
+static PyObject * UnaryPredicate1D___repr__(BPy_UnaryPredicate1D *self);
+
+static PyObject * UnaryPredicate1D_getName( BPy_UnaryPredicate1D *self, PyObject *args);
+static PyObject * UnaryPredicate1D___call__( BPy_UnaryPredicate1D *self, PyObject *args);
+
+/*----------------------UnaryPredicate1D instance definitions ----------------------------*/
+static PyMethodDef BPy_UnaryPredicate1D_methods[] = {
+	{"getName", ( PyCFunction ) UnaryPredicate1D_getName, METH_NOARGS, ""},
+	{"__call__", ( PyCFunction ) UnaryPredicate1D___call__, METH_VARARGS, "" },
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_UnaryPredicate1D type definition ------------------------------*/
+
+PyTypeObject UnaryPredicate1D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"UnaryPredicate1D",				/* tp_name */
+	sizeof( BPy_UnaryPredicate1D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	(destructor)UnaryPredicate1D___dealloc__,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	(reprfunc)UnaryPredicate1D___repr__,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_UnaryPredicate1D_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	NULL,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)UnaryPredicate1D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	PyType_GenericNew,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+PyMODINIT_FUNC UnaryPredicate1D_Init( PyObject *module )
+{
+	if( module == NULL )
+		return;
+
+	if( PyType_Ready( &UnaryPredicate1D_Type ) < 0 )
+		return;
+	Py_INCREF( &UnaryPredicate1D_Type );
+	PyModule_AddObject(module, "UnaryPredicate1D", (PyObject *)&UnaryPredicate1D_Type);
+}
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int UnaryPredicate1D___init__(BPy_UnaryPredicate1D *self, PyObject *args, PyObject *kwds)
+{
+	return 0;
+}
+
+void UnaryPredicate1D___dealloc__(BPy_UnaryPredicate1D* self)
+{
+	delete self->up1D;
+    self->ob_type->tp_free((PyObject*)self);
 }
 
 
- PyObject *_wrap_UnaryPredicate1D___call__(PyObject *self , PyObject *args) {
+PyObject * UnaryPredicate1D___repr__(BPy_UnaryPredicate1D* self)
+{
+    return PyString_FromFormat("type: %s - address: %p", self->up1D->getName().c_str(), self->up1D );
 }
 
 
- PyObject *_wrap_disown_UnaryPredicate1D(PyObject *self , PyObject *args) {
+PyObject * UnaryPredicate1D_getName( BPy_UnaryPredicate1D *self, PyObject *args)
+{
+	return PyString_FromString( self->up1D->getName().c_str() );
+}
+
+PyObject * UnaryPredicate1D___call__( BPy_UnaryPredicate1D *self, PyObject *args)
+{
+	PyObject *l;
+
+	if( !PyArg_ParseTuple(args, "O", &l) ) {
+		cout << "ERROR: UnaryPredicate1D___call__ " << endl;		
+		return NULL;
+	}
+	
+	//TBD
+	
+	Py_RETURN_NONE;
 }
 
 
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D.h
new file mode 100644
index 00000000000..8bb33782133
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D.h
@@ -0,0 +1,35 @@
+#ifndef FREESTYLE_PYTHON_UNARYPREDICATE1D_H
+#define FREESTYLE_PYTHON_UNARYPREDICATE1D_H
+
+#include "../stroke/Predicates1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject UnaryPredicate1D_Type;
+
+#define BPy_UnaryPredicate1D_Check(v) \
+    ((v)->ob_type == &UnaryPredicate1D_Type)
+
+/*---------------------------Python BPy_UnaryPredicate1D structure definition----------*/
+typedef struct {
+	PyObject_HEAD
+	UnaryPredicate1D *up1D;
+} BPy_UnaryPredicate1D;
+
+/*---------------------------Python BPy_UnaryPredicate1D visible prototypes-----------*/
+
+PyMODINIT_FUNC UnaryPredicate1D_Init( PyObject *module );
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_UNARYPREDICATE1D_H */

From b205cf34b4586cd2ebd51a655ce30be4dcccc48c Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Fri, 18 Jul 2008 11:00:34 +0000
Subject: [PATCH 104/252] All parsing is now done in one sweep and cached to
 allow details to be obtained without re-parsing. A text can be manually
 parsed with parse_text(text) which also updates the cache.

---
 release/scripts/bpymodules/BPyTextPlugin.py | 577 ++++++++++++++------
 release/scripts/textplugin_imports.py       |   2 +-
 release/scripts/textplugin_membersuggest.py |  11 +-
 3 files changed, 405 insertions(+), 185 deletions(-)

diff --git a/release/scripts/bpymodules/BPyTextPlugin.py b/release/scripts/bpymodules/BPyTextPlugin.py
index 7ff9db3e5c2..8b67937bb9e 100644
--- a/release/scripts/bpymodules/BPyTextPlugin.py
+++ b/release/scripts/bpymodules/BPyTextPlugin.py
@@ -5,12 +5,37 @@ from tokenize import generate_tokens, TokenError
 
 # TODO: Remove the dependency for a full Python installation.
 
+class ClassDesc():
+	
+	def __init__(self, name, defs, vars):
+		self.name = name
+		self.defs = defs
+		self.vars = vars
+
+class ScriptDesc():
+	
+	def __init__(self, name, imports, classes, defs, vars, incomplete=False):
+		self.name = name
+		self.imports = imports
+		self.classes = classes
+		self.defs = defs
+		self.vars = vars
+		self.incomplete = incomplete
+		self.time = 0
+	
+	def set_time(self):
+		self.time = time()
+
 # Context types
+UNSET = -1
 NORMAL = 0
 SINGLE_QUOTE = 1
 DOUBLE_QUOTE = 2
 COMMENT = 3
 
+# Special period constants
+AUTO = -1
+
 # Python keywords
 KEYWORDS = ['and', 'del', 'from', 'not', 'while', 'as', 'elif', 'global',
 			'or', 'with', 'assert', 'else', 'if', 'pass', 'yield',
@@ -18,13 +43,318 @@ KEYWORDS = ['and', 'del', 'from', 'not', 'while', 'as', 'elif', 'global',
 			'raise', 'continue', 'finally', 'is', 'return', 'def', 'for',
 			'lambda', 'try' ]
 
-# Used to cache the return value of generate_tokens
-_token_cache = None
-_cache_update = 0
-
 ModuleType = type(__builtin__)
+NoneScriptDesc = ScriptDesc('', dict(), dict(), dict(), dict(), True)
+
 _modules = dict([(n, None) for n in sys.builtin_module_names])
 _modules_updated = 0
+_parse_cache = dict()
+
+def get_cached_descriptor(txt, period=AUTO):
+	"""Returns the cached ScriptDesc for the specified Text object 'txt'. If the
+	script has not been parsed in the last 'period' seconds it will be reparsed
+	to obtain this descriptor.
+	
+	Specifying AUTO for the period (default) will choose a period based on the
+	size of the Text object. Larger texts are parsed less often.
+	"""
+	
+	global _parse_cache, NoneScriptDesc, AUTO
+	
+	if period == AUTO:
+		m = txt.nlines
+		r = 1
+		while True:
+			m = m >> 2
+			if not m: break
+			r = r << 1
+		period = r
+	
+	key = hash(txt)
+	parse = True
+	if _parse_cache.has_key(key):
+		desc = _parse_cache[key]
+		if desc.time >= time() - period:
+			parse = desc.incomplete
+	
+	if parse:
+		try:
+			desc = parse_text(txt)
+		except:
+			if _parse_cache.has_key(key):
+				del _parse_cache[key]
+			desc = NoneScriptDesc
+	
+	return desc
+
+def parse_text(txt):
+	"""Parses an entire script's text and returns a ScriptDesc instance
+	containing information about the script.
+	
+	If the text is not a valid Python script a TokenError will be thrown.
+	Currently this means leaving brackets open will result in the script failing
+	to complete.
+	"""
+	
+	global NORMAL, SINGLE_QUOTE, DOUBLE_QUOTE, COMMENT
+	
+	txt.reset()
+	tokens = generate_tokens(txt.readline) # Throws TokenError
+	
+	curl, cursor = txt.getCursorPos()
+	linen = curl + 1 # Token line numbers are one-based
+	
+	imports = dict()
+	imp_step = 0
+	
+	classes = dict()
+	cls_step = 0
+	
+	defs = dict()
+	def_step = 0
+	
+	vars = dict()
+	var_step = 0
+	var_accum = dict()
+	var_forflag = False
+	
+	indent = 0
+	prev_type = -1
+	prev_string = ''
+	incomplete = False
+	
+	try:
+	 for type, string, start, end, line in tokens:
+		
+		#################
+		## Indentation ##
+		#################
+		
+		if type == tokenize.INDENT:
+			indent += 1
+		elif type == tokenize.DEDENT:
+			indent -= 1
+		
+		#########################
+		## Module importing... ##
+		#########################
+		
+		imp_store = False
+		
+		# Default, look for 'from' or 'import' to start
+		if imp_step == 0:
+			if string == 'from':
+				imp_tmp = []
+				imp_step = 1
+			elif string == 'import':
+				imp_from = None
+				imp_tmp = []
+				imp_step = 2
+		
+		# Found a 'from', create imp_from in form '???.???...'
+		elif imp_step == 1:
+			if string == 'import':
+				imp_from = '.'.join(imp_tmp)
+				imp_tmp = []
+				imp_step = 2
+			elif type == tokenize.NAME:
+				imp_tmp.append(string)
+			elif string != '.':
+				imp_step = 0 # Invalid syntax
+		
+		# Found 'import', imp_from is populated or None, create imp_name
+		elif imp_step == 2:
+			if string == 'as':
+				imp_name = '.'.join(imp_tmp)
+				imp_step = 3
+			elif type == tokenize.NAME or string == '*':
+				imp_tmp.append(string)
+			elif string != '.':
+				imp_name = '.'.join(imp_tmp)
+				imp_symb = imp_name
+				imp_store = True
+		
+		# Found 'as', change imp_symb to this value and go back to step 2
+		elif imp_step == 3:
+			if type == tokenize.NAME:
+				imp_symb = string
+			else:
+				imp_store = True
+		
+		# Both imp_name and imp_symb have now been populated so we can import
+		if imp_store:
+			
+			# Handle special case of 'import *'
+			if imp_name == '*':
+				parent = get_module(imp_from)
+				imports.update(parent.__dict__)
+				
+			else:
+				# Try importing the name as a module
+				try:
+					if imp_from:
+						module = get_module(imp_from +'.'+ imp_name)
+					else:
+						module = get_module(imp_name)
+					imports[imp_symb] = module
+				except (ImportError, ValueError, AttributeError, TypeError):
+					# Try importing name as an attribute of the parent
+					try:
+						module = __import__(imp_from, globals(), locals(), [imp_name])
+						imports[imp_symb] = getattr(module, imp_name)
+					except (ImportError, ValueError, AttributeError, TypeError):
+						pass
+			
+			# More to import from the same module?
+			if string == ',':
+				imp_tmp = []
+				imp_step = 2
+			else:
+				imp_step = 0
+		
+		###################
+		## Class parsing ##
+		###################
+		
+		# If we are inside a class then def and variable parsing should be done
+		# for the class. Otherwise the definitions are considered global
+		
+		# Look for 'class'
+		if cls_step == 0:
+			if string == 'class':
+				cls_name = None
+				cls_indent = indent
+				cls_step = 1
+		
+		# Found 'class', look for cls_name followed by '('
+		elif cls_step == 1:
+			if not cls_name:
+				if type == tokenize.NAME:
+					cls_name = string
+					cls_sline = False
+					cls_defs = dict()
+					cls_vars = dict()
+			elif string == ':':
+				cls_step = 2
+		
+		# Found 'class' name ... ':', now check if it's a single line statement
+		elif cls_step == 2:
+			if type == tokenize.NEWLINE:
+				cls_sline = False
+				cls_step = 3
+			elif type != tokenize.COMMENT and type != tokenize.NL:
+				cls_sline = True
+				cls_step = 3
+		
+		elif cls_step == 3:
+			if cls_sline:
+				if type == tokenize.NEWLINE:
+					classes[cls_name] = ClassDesc(cls_name, cls_defs, cls_vars)
+					cls_step = 0
+			else:
+				if type == tokenize.DEDENT and indent <= cls_indent:
+					classes[cls_name] = ClassDesc(cls_name, cls_defs, cls_vars)
+					cls_step = 0
+		
+		#################
+		## Def parsing ##
+		#################
+		
+		# Look for 'def'
+		if def_step == 0:
+			if string == 'def':
+				def_name = None
+				def_step = 1
+		
+		# Found 'def', look for def_name followed by '('
+		elif def_step == 1:
+			if type == tokenize.NAME:
+				def_name = string
+				def_params = []
+			elif def_name and string == '(':
+				def_step = 2
+		
+		# Found 'def' name '(', now identify the parameters upto ')'
+		# TODO: Handle ellipsis '...'
+		elif def_step == 2:
+			if type == tokenize.NAME:
+				def_params.append(string)
+			elif string == ')':
+				if cls_step > 0: # Parsing a class
+					cls_defs[def_name] = def_params
+				else:
+					defs[def_name] = def_params
+				def_step = 0
+		
+		##########################
+		## Variable assignation ##
+		##########################
+		
+		if cls_step > 0: # Parsing a class
+			# Look for 'self.???'
+			if var_step == 0:
+				if string == 'self':
+					var_step = 1
+			elif var_step == 1:
+				if string == '.':
+					var_name = None
+					var_step = 2
+				else:
+					var_step = 0
+			elif var_step == 2:
+				if type == tokenize.NAME:
+					var_name = string
+					var_step = 3
+			elif var_step == 3:
+				if string == '=':
+					cls_vars[var_name] = True
+					var_step = 0
+		
+		elif def_step > 0: # Parsing a def
+			# Look for 'global ???[,???]'
+			if var_step == 0:
+				if string == 'global':
+					var_step = 1
+			elif var_step == 1:
+				if type == tokenize.NAME:
+					vars[string] = True
+				elif string != ',' and type != tokenize.NL:
+					var_step == 0
+		
+		else: # In global scope
+			# Look for names
+			if string == 'for':
+				var_accum = dict()
+				var_forflag = True
+			elif string == '=' or (var_forflag and string == 'in'):
+				vars.update(var_accum)
+				var_accum = dict()
+				var_forflag = False
+			elif type == tokenize.NAME:
+				var_accum[string] = True
+			elif not string in [',', '(', ')', '[', ']']:
+				var_accum = dict()
+				var_forflag = False
+		
+		#######################
+		## General utilities ##
+		#######################
+		
+		prev_type = type
+		prev_string = string
+	
+	 # end:for
+	
+	except TokenError:
+		incomplete = True
+		pass
+	
+	desc = ScriptDesc(txt.name, imports, classes, defs, vars, incomplete)
+	desc.set_time()
+	
+	global _parse_cache
+	_parse_cache[hash(txt.name)] = desc
+	return desc
 
 def get_modules(since=1):
 	"""Returns the set of built-in modules and any modules that have been
@@ -45,20 +375,6 @@ def suggest_cmp(x, y):
 	
 	return cmp(x[0].upper(), y[0].upper())
 
-def cached_generate_tokens(txt, since=1):
-	"""A caching version of generate tokens for multiple parsing of the same
-	document within a given timescale.
-	"""
-	
-	global _token_cache, _cache_update
-	
-	t = time()
-	if _cache_update < t - since:
-		txt.reset()
-		_token_cache = [g for g in generate_tokens(txt.readline)]
-		_cache_update = t
-	return _token_cache
-
 def get_module(name):
 	"""Returns the module specified by its name. The module itself is imported
 	by this method and, as such, any initialization code will be executed.
@@ -78,6 +394,7 @@ def type_char(v):
 	  'm' if the parameter is a module
 	  'f' if the parameter is callable
 	  'v' if the parameter is variable or otherwise indeterminable
+	
 	"""
 	
 	if isinstance(v, ModuleType):
@@ -140,7 +457,8 @@ def get_context(txt):
 def current_line(txt):
 	"""Extracts the Python script line at the cursor in the Blender Text object
 	provided and cursor position within this line as the tuple pair (line,
-	cursor)"""
+	cursor).
+	"""
 	
 	(lineindex, cursor) = txt.getCursorPos()
 	lines = txt.asLines()
@@ -166,7 +484,8 @@ def current_line(txt):
 
 def get_targets(line, cursor):
 	"""Parses a period separated string of valid names preceding the cursor and
-	returns them as a list in the same order."""
+	returns them as a list in the same order.
+	"""
 	
 	targets = []
 	i = cursor - 1
@@ -176,6 +495,25 @@ def get_targets(line, cursor):
 	pre = line[i+1:cursor]
 	return pre.split('.')
 
+def get_defs(txt):
+	"""Returns a dictionary which maps definition names in the source code to
+	a list of their parameter names.
+	
+	The line 'def doit(one, two, three): print one' for example, results in the
+	mapping 'doit' : [ 'one', 'two', 'three' ]
+	"""
+	
+	return get_cached_descriptor(txt).defs
+
+def get_vars(txt):
+	"""Returns a dictionary of variable names found in the specified Text
+	object. This method locates all names followed directly by an equal sign:
+	'a = ???' or indirectly as part of a tuple/list assignment or inside a
+	'for ??? in ???:' block.
+	"""
+	
+	return get_cached_descriptor(txt).vars
+
 def get_imports(txt):
 	"""Returns a dictionary which maps symbol names in the source code to their
 	respective modules.
@@ -187,172 +525,51 @@ def get_imports(txt):
 	will execute any initilization code found within.
 	"""
 	
-	# Unfortunately, generate_tokens may fail if the script leaves brackets or
-	# strings open or there are other syntax errors. For now we return an empty
-	# dictionary until an alternative parse method is implemented.
-	try:
-		tokens = cached_generate_tokens(txt)
-	except TokenError:
-		return dict()
-	
-	imports = dict()
-	step = 0
-	
-	for type, string, start, end, line in tokens:
-		store = False
-		
-		# Default, look for 'from' or 'import' to start
-		if step == 0:
-			if string == 'from':
-				tmp = []
-				step = 1
-			elif string == 'import':
-				fromname = None
-				tmp = []
-				step = 2
-		
-		# Found a 'from', create fromname in form '???.???...'
-		elif step == 1:
-			if string == 'import':
-				fromname = '.'.join(tmp)
-				tmp = []
-				step = 2
-			elif type == tokenize.NAME:
-				tmp.append(string)
-			elif string != '.':
-				step = 0 # Invalid syntax
-		
-		# Found 'import', fromname is populated or None, create impname
-		elif step == 2:
-			if string == 'as':
-				impname = '.'.join(tmp)
-				step = 3
-			elif type == tokenize.NAME or string == '*':
-				tmp.append(string)
-			elif string != '.':
-				impname = '.'.join(tmp)
-				symbol = impname
-				store = True
-		
-		# Found 'as', change symbol to this value and go back to step 2
-		elif step == 3:
-			if type == tokenize.NAME:
-				symbol = string
-			else:
-				store = True
-		
-		# Both impname and symbol have now been populated so we can import
-		if store:
-			
-			# Handle special case of 'import *'
-			if impname == '*':
-				parent = get_module(fromname)
-				imports.update(parent.__dict__)
-				
-			else:
-				# Try importing the name as a module
-				try:
-					if fromname:
-						module = get_module(fromname +'.'+ impname)
-					else:
-						module = get_module(impname)
-					imports[symbol] = module
-				except (ImportError, ValueError, AttributeError, TypeError):
-					# Try importing name as an attribute of the parent
-					try:
-						module = __import__(fromname, globals(), locals(), [impname])
-						imports[symbol] = getattr(module, impname)
-					except (ImportError, ValueError, AttributeError, TypeError):
-						pass
-			
-			# More to import from the same module?
-			if string == ',':
-				tmp = []
-				step = 2
-			else:
-				step = 0
-	
-	return imports
+	return get_cached_descriptor(txt).imports
 
 def get_builtins():
 	"""Returns a dictionary of built-in modules, functions and variables."""
 	
 	return __builtin__.__dict__
 
-def get_defs(txt):
-	"""Returns a dictionary which maps definition names in the source code to
-	a list of their parameter names.
-	
-	The line 'def doit(one, two, three): print one' for example, results in the
-	mapping 'doit' : [ 'one', 'two', 'three' ]
-	"""
-	
-	# See above for problems with generate_tokens
-	try:
-		tokens = cached_generate_tokens(txt)
-	except TokenError:
-		return dict()
-	
-	defs = dict()
-	step = 0
-	
-	for type, string, start, end, line in tokens:
-		
-		# Look for 'def'
-		if step == 0:
-			if string == 'def':
-				name = None
-				step = 1
-		
-		# Found 'def', look for name followed by '('
-		elif step == 1:
-			if type == tokenize.NAME:
-				name = string
-				params = []
-			elif name and string == '(':
-				step = 2
-		
-		# Found 'def' name '(', now identify the parameters upto ')'
-		# TODO: Handle ellipsis '...'
-		elif step == 2:
-			if type == tokenize.NAME:
-				params.append(string)
-			elif string == ')':
-				defs[name] = params
-				step = 0
-		
-	return defs
 
-def get_vars(txt):
-	"""Returns a dictionary of variable names found in the specified Text
-	object. This method locates all names followed directly by an equal sign:
-	'a = ???' or indirectly as part of a tuple/list assignment or inside a
-	'for ??? in ???:' block.
+#################################
+## Debugging utility functions ##
+#################################
+
+def print_cache_for(txt, period=sys.maxint):
+	"""Prints out the data cached for a given Text object. If no period is
+	given the text will not be reparsed and the cached version will be returned.
+	Otherwise if the period has expired the text will be reparsed.
 	"""
 	
-	# See above for problems with generate_tokens
-	try:
-		tokens = cached_generate_tokens(txt)
-	except TokenError:
-		return []
-	
-	vars = []
-	accum = [] # Used for tuple/list assignment
-	foring = False
-	
-	for type, string, start, end, line in tokens:
-		
-		# Look for names
-		if string == 'for':
-			foring = True
-		if string == '=' or (foring and string == 'in'):
-			vars.extend(accum)
-			accum = []
-			foring = False
-		elif type == tokenize.NAME:
-			accum.append(string)
-		elif not string in [',', '(', ')', '[', ']']:
-			accum = []
-			foring = False
-		
-	return vars
+	desc = get_cached_descriptor(txt, period)
+	print '================================================'
+	print 'Name:', desc.name, '('+str(hash(txt))+')'
+	print '------------------------------------------------'
+	print 'Defs:'
+	for name, params in desc.defs.items():
+		print ' ', name, params
+	print '------------------------------------------------'
+	print 'Vars:'
+	for name in desc.vars.keys():
+		print ' ', name
+	print '------------------------------------------------'
+	print 'Imports:'
+	for name, item in desc.imports.items():
+		print ' ', name.ljust(15), item
+	print '------------------------------------------------'
+	print 'Classes:'
+	for clsnme, clsdsc in desc.classes.items():
+		print '  *********************************'
+		print '  Name:', clsnme
+		print '  ---------------------------------'
+		print '  Defs:'
+		for name, params in clsdsc.defs.items():
+			print '   ', name, params
+		print '  ---------------------------------'
+		print '  Vars:'
+		for name in clsdsc.vars.keys():
+			print '   ', name
+		print '  *********************************'
+	print '================================================'
diff --git a/release/scripts/textplugin_imports.py b/release/scripts/textplugin_imports.py
index 2186adf5c73..8596827ee35 100644
--- a/release/scripts/textplugin_imports.py
+++ b/release/scripts/textplugin_imports.py
@@ -24,7 +24,7 @@ def main():
 	line, c = current_line(txt)
 	
 	# Check we are in a normal context
-	if get_context(txt) != 0:
+	if get_context(txt) != NORMAL:
 		return
 	
 	pos = line.rfind('from ', 0, c)
diff --git a/release/scripts/textplugin_membersuggest.py b/release/scripts/textplugin_membersuggest.py
index d175549a7bd..daa361e3163 100644
--- a/release/scripts/textplugin_membersuggest.py
+++ b/release/scripts/textplugin_membersuggest.py
@@ -4,8 +4,7 @@ Name: 'Member Suggest'
 Blender: 246
 Group: 'TextPlugin'
 Shortcut: 'Period'
-Tooltip: 'Lists members of the object preceding the cursor in the current text \
-space'
+Tooltip: 'Lists members of the object preceding the cursor in the current text space'
 """
 
 # Only run if we have the required modules
@@ -32,13 +31,14 @@ def main():
 	if len(pre) <= 1:
 		return
 	
-	list = []
-	
 	imports = get_imports(txt)
+	builtins = get_builtins()
 	
 	# Identify the root (root.sub.sub.)
 	if imports.has_key(pre[0]):
 		obj = imports[pre[0]]
+	elif builtins.has_key(pre[0]):
+		obj = builtins[pre[0]]
 	else:
 		return
 	
@@ -52,9 +52,12 @@ def main():
 	
 	try:
 		attr = obj.__dict__.keys()
+		if not attr:
+			attr = dir(obj)
 	except AttributeError:
 		attr = dir(obj)
 	
+	list = []
 	for k in attr:
 		try:
 			v = getattr(obj, k)

From c0dfe80e0d7444d9a25f9abd3f42e228b02e5e38 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Fri, 18 Jul 2008 17:57:34 +0000
Subject: [PATCH 105/252] Fix misceleanous errors/tweaks in cost calculations -
 Angle cost could easily balloon up, don't use relative difference - fix error
 with ends (wrong indexes) - add missing out of bound preventions

---
 source/blender/src/autoarmature.c | 70 ++++++++++++++++++-------------
 1 file changed, 42 insertions(+), 28 deletions(-)

diff --git a/source/blender/src/autoarmature.c b/source/blender/src/autoarmature.c
index c50085885ef..ae93a96bde7 100644
--- a/source/blender/src/autoarmature.c
+++ b/source/blender/src/autoarmature.c
@@ -569,6 +569,29 @@ static RetargetMode detectArcRetargetMode(RigArc *iarc)
 	return mode;
 }
 
+static void printCostCube(float *cost_cube, int nb_joints)
+{
+	int i;
+	
+	for (i = 0; i < nb_joints; i++)
+	{
+		printf("%0.3f ", cost_cube[3 * i]);
+	}
+	printf("\n");
+
+	for (i = 0; i < nb_joints; i++)
+	{
+		printf("%0.3f ", cost_cube[3 * i + 1]);
+	}
+	printf("\n");
+
+	for (i = 0; i < nb_joints; i++)
+	{
+		printf("%0.3f ", cost_cube[3 * i + 2]);
+	}
+	printf("\n");
+}
+
 static void printPositions(int *positions, int nb_positions)
 {
 	int i;
@@ -638,14 +661,7 @@ static float costAngle(float original_angle, float vec_first[3], float vec_secon
 		{
 			current_angle = saacos(Inpf(vec_first, vec_second));
 
-			if (original_angle > 0)
-			{
-				return G.scene->toolsettings->skgen_retarget_angle_weight * fabs((current_angle - original_angle) / original_angle);
-			}
-			else
-			{
-				return G.scene->toolsettings->skgen_retarget_angle_weight * fabs(current_angle);
-			}
+			return G.scene->toolsettings->skgen_retarget_angle_weight * fabs(current_angle - original_angle);
 		}
 		else
 		{
@@ -711,7 +727,7 @@ static void calcGradient(RigEdge *e1, RigEdge *e2, ReebArcIterator *iter, int in
 	
 	if (index == 0)
 	{
-		i0 = iter->start;
+		i0 = 0;
 	}
 	else
 	{
@@ -722,7 +738,7 @@ static void calcGradient(RigEdge *e1, RigEdge *e2, ReebArcIterator *iter, int in
 	
 	if (index +1 == nb_joints)
 	{
-		i2 = iter->end;
+		i2 = iter->length;
 	}
 	else
 	{
@@ -739,6 +755,10 @@ static void calcGradient(RigEdge *e1, RigEdge *e2, ReebArcIterator *iter, int in
 	{
 		cost_cube[index * 3 + 2] = MAX_COST;
 	}
+	else if (next_position > iter->length) /* positions are indexed at 1, so length is last */
+	{
+		cost_cube[index * 3 + 2] = MAX_COST;
+	}
 	else
 	{
 		bucket = peekBucket(iter, next_position);
@@ -761,6 +781,10 @@ static void calcGradient(RigEdge *e1, RigEdge *e2, ReebArcIterator *iter, int in
 	{
 		cost_cube[index * 3] = MAX_COST;
 	}
+	else if (next_position < 1) /* positions are indexed at 1, so 1 is first */
+	{
+		cost_cube[index * 3] = MAX_COST;
+	}
 	else
 	{
 		bucket = peekBucket(iter, next_position);
@@ -864,8 +888,6 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 	int first_pass = 1;
 	int must_move = nb_joints - 1;
 	int i;
-	
-	printf("aggressive\n");
 
 	positions = MEM_callocN(sizeof(int) * nb_joints, "Aggresive positions");
 	best_positions = MEM_callocN(sizeof(int) * nb_joints, "Best Aggresive positions");
@@ -1045,6 +1067,7 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 	{
 		RigEdge *previous;
 		float *cost_cube;
+		float cost;
 #ifdef ANNEALING_ITERATION
 		int k, kmax = 100000;
 #else
@@ -1066,7 +1089,7 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 			vec_cache[i + 1] = bucket->p;
 		}
 		
-		min_cost = 0;
+		cost = 0;
 
 		/* init cost cube */
 		for (previous = iarc->edges.first, edge = previous->next, i = 0;
@@ -1075,10 +1098,10 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 		{
 			calcGradient(previous, edge, &iter, i, nb_joints, cost_cube, positions, vec_cache);
 			
-			min_cost += cost_cube[3 * i + 1];
+			cost += cost_cube[3 * i + 1];
 		}
 		
-		printf("initial cost: %f\n", min_cost);
+		printf("initial cost: %f\n", cost);
 		
 #ifdef ANNEALING_ITERATION
 		for (k = 0; k < kmax; k++)
@@ -1118,9 +1141,7 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 				bucket = peekBucket(&iter, positions[moving_joint]);
 				vec_cache[moving_joint + 1] = bucket->p;
 				
-				min_cost += delta_cost;
-
-				//printf("%i: %0.3f\n", k, delta_cost);
+				cost += delta_cost;
 	
 				/* update cost cube */			
 				for (previous = iarc->edges.first, edge = previous->next, i = 0;
@@ -1137,7 +1158,9 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 			}
 		}
 		
-		printf("k = %i\n", k);
+		min_cost = cost;
+		
+//		printf("k = %i\n", k);
 		
 		memcpy(best_positions, positions, sizeof(int) * nb_joints);
 		
@@ -1175,11 +1198,8 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 			int moving_joint = -1;
 			int move_direction = -1;
 		
-			printf("-----------------\n");
-		
 			for (i = 0; i < nb_joints; i++)
 			{
-				printf("%i[%i]: %f\t\t(%f)\t\t%f\n", i, positions[i], cost_cube[i * 3], cost_cube[i * 3 + 1], cost_cube[i * 3 + 2]); 
 				if (cost_cube[i * 3] < min_gradient)
 				{
 					min_gradient = cost_cube[i * 3]; 
@@ -1255,12 +1275,6 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 		{
 			VECCOPY(bone->head, vec0);
 			VECCOPY(bone->tail, vec1);
-			printf("===\n");
-			printvecf("vec0", vec0);
-			printvecf("vec1", vec1);
-			if (i < nb_joints)
-				printf("position: %i\n", best_positions[i]);
-			printf("last_index: %i\n", last_index);
 		}
 		
 		vec0 = vec1;

From 25de50180597bbf2375f78cd12cada794a03412d Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Fri, 18 Jul 2008 19:09:41 +0000
Subject: [PATCH 106/252] Exponential cooling off and progressive minimization
 for simulated annealing

---
 source/blender/src/autoarmature.c | 40 +++++++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 5 deletions(-)

diff --git a/source/blender/src/autoarmature.c b/source/blender/src/autoarmature.c
index ae93a96bde7..728cbff77da 100644
--- a/source/blender/src/autoarmature.c
+++ b/source/blender/src/autoarmature.c
@@ -592,6 +592,19 @@ static void printCostCube(float *cost_cube, int nb_joints)
 	printf("\n");
 }
 
+static void printMovesNeeded(int *positions, int nb_positions)
+{
+	int moves = 0;
+	int i;
+	
+	for (i = 0; i < nb_positions; i++)
+	{
+		moves += positions[i] - (i + 1);
+	}
+	
+	printf("%i moves needed\n", moves);
+}
+
 static void printPositions(int *positions, int nb_positions)
 {
 	int i;
@@ -810,7 +823,7 @@ static float probability(float delta_cost, float temperature)
 	}
 	else
 	{
-		return (float)exp(delta_cost) * temperature;
+		return (float)exp(delta_cost / temperature);
 	}
 }
 
@@ -1069,7 +1082,9 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 		float *cost_cube;
 		float cost;
 #ifdef ANNEALING_ITERATION
-		int k, kmax = 100000;
+		int k;
+		//int kmax = 100000;
+		int kmax = nb_joints * earc->bcount * 200;
 #else
 		double time_start, time_current, time_length = 3;
 		int k;
@@ -1102,6 +1117,7 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 		}
 		
 		printf("initial cost: %f\n", cost);
+		printf("kmax: %i\n", kmax);
 		
 #ifdef ANNEALING_ITERATION
 		for (k = 0; k < kmax; k++)
@@ -1121,6 +1137,12 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 			
 			if (status == 0)
 			{
+				/* if current state is still a minimum, copy it */
+				if (cost < min_cost)
+				{
+					min_cost = cost;
+					memcpy(best_positions, positions, sizeof(int) * nb_joints);
+				}
 				break;
 			}
 			
@@ -1143,6 +1165,13 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 				
 				cost += delta_cost;
 	
+				/* cost optimizing */
+				if (cost < min_cost)
+				{
+					min_cost = cost;
+					memcpy(best_positions, positions, sizeof(int) * nb_joints);
+				}
+
 				/* update cost cube */			
 				for (previous = iarc->edges.first, edge = previous->next, i = 0;
 					 edge;
@@ -1157,12 +1186,12 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 				}
 			}
 		}
-		
-		min_cost = cost;
+
+		//min_cost = cost;
+		//memcpy(best_positions, positions, sizeof(int) * nb_joints);
 		
 //		printf("k = %i\n", k);
 		
-		memcpy(best_positions, positions, sizeof(int) * nb_joints);
 		
 		MEM_freeN(cost_cube);
 	}	
@@ -1251,6 +1280,7 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 	initArcIterator(&iter, earc, node_start);
 	
 	printPositions(best_positions, nb_joints);
+	printMovesNeeded(best_positions, nb_joints);
 	printf("min_cost %f\n", min_cost);
 	printf("buckets: %i\n", earc->bcount);
 

From 16d7d12123d25a353043cefe2c9e4664476224d7 Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Fri, 18 Jul 2008 20:31:40 +0000
Subject: [PATCH 107/252] soc-2008-mxcurioni: Added IntegrationType and Nature
 classes, used to store constants used throughout Freestyle

---
 source/blender/freestyle/SConscript           |   8 +-
 .../freestyle/intern/python/Convert.cpp       |   2 -
 .../blender/freestyle/intern/python/Convert.h |   1 +
 .../freestyle/intern/python/Freestyle.cpp     |   4 +
 .../intern/python/IntegrationType.cpp         | 153 +++++++++++++
 .../freestyle/intern/python/IntegrationType.h |  34 +++
 .../intern/python/Interface0D/ViewVertex.cpp  | 215 ++++++++++++------
 .../intern/python/Interface0D/ViewVertex.h    |  33 +++
 .../freestyle/intern/python/Nature.cpp        | 149 ++++++++++++
 .../blender/freestyle/intern/python/Nature.h  |  34 +++
 10 files changed, 560 insertions(+), 73 deletions(-)
 create mode 100644 source/blender/freestyle/intern/python/IntegrationType.cpp
 create mode 100644 source/blender/freestyle/intern/python/IntegrationType.h
 create mode 100644 source/blender/freestyle/intern/python/Interface0D/ViewVertex.h
 create mode 100644 source/blender/freestyle/intern/python/Nature.cpp
 create mode 100644 source/blender/freestyle/intern/python/Nature.h

diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript
index 5a7745292a4..8e50d0ba5da 100644
--- a/source/blender/freestyle/SConscript
+++ b/source/blender/freestyle/SConscript
@@ -65,11 +65,17 @@ python_sources = [
 					prefix + '/BinaryPredicate0D.cpp',
 					prefix + '/BinaryPredicate1D.cpp',
 					prefix + '/Id.cpp',
+					prefix + '/IntegrationType.cpp',
 					prefix + '/Interface0D.cpp',
 					prefix + '/Interface0D/CurvePoint.cpp',
 					prefix + '/Interface0D/SVertex.cpp',
 					prefix + '/Interface1D.cpp',
-					prefix + '/Interface1D/FEdge.cpp'
+					prefix + '/Interface1D/FEdge.cpp',
+					prefix + '/Nature.cpp',
+					prefix + '/UnaryFunction0D.cpp',
+					prefix + '/UnaryFunction1D.cpp',
+					prefix + '/UnaryPredicate0D.cpp',
+					prefix + '/UnaryPredicate1D.cpp'
 				]
 
 sources = 	system_sources + image_sources + geometry_sources + scene_graph_sources \
diff --git a/source/blender/freestyle/intern/python/Convert.cpp b/source/blender/freestyle/intern/python/Convert.cpp
index 47ad6f3c0ad..42250fbe97b 100644
--- a/source/blender/freestyle/intern/python/Convert.cpp
+++ b/source/blender/freestyle/intern/python/Convert.cpp
@@ -64,8 +64,6 @@ PyObject *BPy_FEdge_from_FEdge( FEdge& fe ) {
 	return py_fe;
 }
 
-	
-
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/source/blender/freestyle/intern/python/Convert.h b/source/blender/freestyle/intern/python/Convert.h
index edd62b1f24a..ce38f8cbc22 100644
--- a/source/blender/freestyle/intern/python/Convert.h
+++ b/source/blender/freestyle/intern/python/Convert.h
@@ -5,6 +5,7 @@
 using namespace Geometry;
 
 #include "Id.h"
+#include "IntegrationType.h"
 #include "Interface0D.h"
 #include "Interface0D/SVertex.h"
 #include "Interface1D/FEdge.h"
diff --git a/source/blender/freestyle/intern/python/Freestyle.cpp b/source/blender/freestyle/intern/python/Freestyle.cpp
index 809568abe2c..5f98f0f2a89 100644
--- a/source/blender/freestyle/intern/python/Freestyle.cpp
+++ b/source/blender/freestyle/intern/python/Freestyle.cpp
@@ -3,9 +3,11 @@
 #include "BinaryPredicate0D.h"
 #include "BinaryPredicate1D.h"
 #include "Id.h"
+#include "IntegrationType.h"
 #include "Interface0D.h"
 #include "Interface0D/CurvePoint.h"
 #include "Interface1D.h"
+#include "Nature.h"
 #include "UnaryFunction0D.h"
 #include "UnaryFunction1D.h"
 #include "UnaryPredicate0D.h"
@@ -128,8 +130,10 @@ PyObject *Freestyle_Init( void )
 	BinaryPredicate0D_Init( module );
 	BinaryPredicate1D_Init( module );
 	Id_Init( module );
+	IntegrationType_Init( module );
 	Interface0D_Init( module );
 	Interface1D_Init( module );
+	Nature_Init( module );
 	UnaryFunction0D_Init( module );
 	UnaryFunction1D_Init( module );
 	UnaryPredicate0D_Init( module );
diff --git a/source/blender/freestyle/intern/python/IntegrationType.cpp b/source/blender/freestyle/intern/python/IntegrationType.cpp
new file mode 100644
index 00000000000..ff6bd3d4794
--- /dev/null
+++ b/source/blender/freestyle/intern/python/IntegrationType.cpp
@@ -0,0 +1,153 @@
+#include "IntegrationType.h"
+
+#include "Convert.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for IntegrationType instance  -----------*/
+static int IntegrationType___init__(BPy_IntegrationType *self, PyObject *args, PyObject *kwds);
+
+/*----------------------IntegrationType instance definitions ----------------------------*/
+static PyMethodDef BPy_IntegrationType_methods[] = {
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_IntegrationType type definition ------------------------------*/
+
+PyTypeObject IntegrationType_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"IntegrationType",				/* tp_name */
+	sizeof( BPy_IntegrationType ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_IntegrationType_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&PyInt_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)IntegrationType___init__,                       	/* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	PyType_GenericNew,			/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+PyMODINIT_FUNC IntegrationType_Init( PyObject *module )
+{	
+	PyObject *tmp;
+	
+	if( module == NULL )
+		return;
+
+	if( PyType_Ready( &IntegrationType_Type ) < 0 )
+		return;
+	Py_INCREF( &IntegrationType_Type );
+	PyModule_AddObject(module, "IntegrationType", (PyObject *)&IntegrationType_Type);
+
+	tmp = PyInt_FromLong( MEAN );
+	PyDict_SetItemString( IntegrationType_Type.tp_dict, "MEAN", tmp);
+	Py_DECREF(tmp);
+	
+	tmp = PyInt_FromLong( MIN );
+	PyDict_SetItemString( IntegrationType_Type.tp_dict, "MIN", tmp);
+	Py_DECREF(tmp);
+	
+	tmp = PyInt_FromLong( MAX );
+	PyDict_SetItemString( IntegrationType_Type.tp_dict, "MAX", tmp);
+	Py_DECREF(tmp);
+	
+	tmp = PyInt_FromLong( FIRST );
+	PyDict_SetItemString( IntegrationType_Type.tp_dict, "FIRST", tmp);
+	Py_DECREF(tmp);
+	
+	tmp = PyInt_FromLong( LAST );
+	PyDict_SetItemString( IntegrationType_Type.tp_dict, "LAST", tmp);
+	Py_DECREF(tmp);
+	
+	
+}
+
+int IntegrationType___init__(BPy_IntegrationType *self, PyObject *args, PyObject *kwds)
+{
+    if (PyInt_Type.tp_init((PyObject *)self, args, kwds) < 0)
+        return -1;
+	
+	return 0;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/source/blender/freestyle/intern/python/IntegrationType.h b/source/blender/freestyle/intern/python/IntegrationType.h
new file mode 100644
index 00000000000..2ac81fdddfb
--- /dev/null
+++ b/source/blender/freestyle/intern/python/IntegrationType.h
@@ -0,0 +1,34 @@
+#ifndef FREESTYLE_PYTHON_INTEGRATIONTYPE_H
+#define FREESTYLE_PYTHON_INTEGRATIONTYPE_H
+
+#include "../view_map/Interface1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject IntegrationType_Type;
+
+#define BPy_IntegrationType_Check(v) \
+    ((v)->ob_type == &IntegrationType_Type)
+
+/*---------------------------Python BPy_IntegrationType structure definition----------*/
+typedef struct {
+	PyIntObject i;
+} BPy_IntegrationType;
+
+/*---------------------------Python BPy_IntegrationType visible prototypes-----------*/
+
+PyMODINIT_FUNC IntegrationType_Init( PyObject *module );
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_INTEGRATIONTYPE_H */
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/ViewVertex.cpp
index 293f42949e3..66583d21605 100644
--- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex.cpp
@@ -1,76 +1,151 @@
- PyObject *_wrap_ViewVertex_getExactTypeName(PyObject *self , PyObject *args) {
+#include "SVertex.h"
+
+#include "../Convert.h"
+#include "../Id.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for ViewVertex instance  -----------*/
+static int ViewVertex___init__(BPy_ViewVertex *self);
+//static PyObject * ViewVertex___copy__( BPy_ViewVertex *self );
+
+
+/*----------------------ViewVertex instance definitions ----------------------------*/
+static PyMethodDef BPy_ViewVertex_methods[] = {
+//	{"__copy__", ( PyCFunction ) ViewVertex___copy__, METH_NOARGS, "（ ）Cloning method."},
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_ViewVertex type definition ------------------------------*/
+
+PyTypeObject ViewVertex_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"ViewVertex",				/* tp_name */
+	sizeof( BPy_ViewVertex ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_ViewVertex_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&Interface0D_Type,				/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)ViewVertex___init__,                       	/* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int ViewVertex___init__(BPy_ViewVertex *self )
+{
+	PyObject *py_point = 0;
+	BPy_Id *py_id = 0;
+
+	self->vv = new ViewVertex();
+	self->py_if0D.if0D = self->vv;
+	
+	return 0;
 }
 
+// PyObject * ViewVertex___copy__( BPy_ViewVertex *self ) {
+// 	BPy_ViewVertex *py_vv;
+// 	
+// 	py_vv = (BPy_ViewVertex *) ViewVertex_Type.tp_new( &ViewVertex_Type, 0, 0 );
+// 	
+// 	py_vv->vv = self->vv->duplicate();
+// 	py_svertex->py_if0D.if0D = py_svertex->sv;
+// 
+// 	return (PyObject *) py_svertex;
+// }
 
- PyObject *_wrap_ViewVertex_userdata_set(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewVertex_userdata_get(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_ViewVertex(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewVertex_getNature(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewVertex_setNature(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewVertex_Replace(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewVertex_edges_begin__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewVertex_edges_begin__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewVertex_edges_begin(PyObject *self, PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewVertex_edges_end__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewVertex_edges_end__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewVertex_edges_end(PyObject *self, PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewVertex_edges_iterator__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewVertex_edges_iterator__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewVertex_edges_iterator(PyObject *self, PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewVertex_edgesBegin(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewVertex_edgesEnd(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewVertex_edgesIterator(PyObject *self , PyObject *args) {
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
 }
+#endif
 
 
+// virtual string 	getExactTypeName () const
+//  	ViewVertex ()
+// virtual 	~ViewVertex ()
+// virtual Nature::VertexNature 	getNature () const
+// void 	setNature (Nature::VertexNature iNature)
+// virtual ViewVertexInternal::orientedViewEdgeIterator 	edgesBegin ()=0
+// virtual ViewVertexInternal::orientedViewEdgeIterator 	edgesEnd ()=0
+// virtual ViewVertexInternal::orientedViewEdgeIterator 	edgesIterator (ViewEdge *iEdge)=0
+// 
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex.h b/source/blender/freestyle/intern/python/Interface0D/ViewVertex.h
new file mode 100644
index 00000000000..b869df377fc
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex.h
@@ -0,0 +1,33 @@
+#ifndef FREESTYLE_PYTHON_VIEWVERTEX_H
+#define FREESTYLE_PYTHON_VIEWVERTEX_H
+
+#include "../../view_map/ViewMap.h"
+#include "../Interface0D.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject ViewVertex_Type;
+
+#define BPy_ViewVertex_Check(v) \
+    ((v)->ob_type == &ViewVertex_Type)
+
+/*---------------------------Python BPy_ViewVertex structure definition----------*/
+typedef struct {
+	BPy_Interface0D py_if0D;
+	ViewVertex *vv;
+} BPy_ViewVertex;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_VIEWVERTEX_H */
diff --git a/source/blender/freestyle/intern/python/Nature.cpp b/source/blender/freestyle/intern/python/Nature.cpp
new file mode 100644
index 00000000000..fb4ba6bae37
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Nature.cpp
@@ -0,0 +1,149 @@
+#include "Nature.h"
+
+#include "Convert.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for Nature instance  -----------*/
+static int Nature___init__(BPy_Nature *self, PyObject *args, PyObject *kwds);
+
+/*----------------------Nature instance definitions ----------------------------*/
+static PyMethodDef BPy_Nature_methods[] = {
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_Nature type definition ------------------------------*/
+
+PyTypeObject Nature_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"Nature",				/* tp_name */
+	sizeof( BPy_Nature ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_Nature_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&PyInt_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)Nature___init__,                       	/* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	PyType_GenericNew,			/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+PyMODINIT_FUNC Nature_Init( PyObject *module )
+{	
+	PyObject *tmp;
+	
+	if( module == NULL )
+		return;
+
+	if( PyType_Ready( &Nature_Type ) < 0 )
+		return;
+	Py_INCREF( &Nature_Type );
+	PyModule_AddObject(module, "Nature", (PyObject *)&Nature_Type);
+
+	// VertexNature
+	tmp = PyInt_FromLong( Nature::POINT ); PyDict_SetItemString( Nature_Type.tp_dict, "POINT", tmp); Py_DECREF(tmp);
+	tmp = PyInt_FromLong( Nature::S_VERTEX ); PyDict_SetItemString( Nature_Type.tp_dict, "S_VERTEX", tmp); Py_DECREF(tmp);
+	tmp = PyInt_FromLong( Nature::VIEW_VERTEX ); PyDict_SetItemString( Nature_Type.tp_dict, "VIEW_VERTEX", tmp); Py_DECREF(tmp);
+	tmp = PyInt_FromLong( Nature::NON_T_VERTEX ); PyDict_SetItemString( Nature_Type.tp_dict, "NON_T_VERTEX", tmp); Py_DECREF(tmp);
+	tmp = PyInt_FromLong( Nature::T_VERTEX ); PyDict_SetItemString( Nature_Type.tp_dict, "T_VERTEX", tmp); Py_DECREF(tmp);
+	tmp = PyInt_FromLong( Nature::CUSP ); PyDict_SetItemString( Nature_Type.tp_dict, "CUSP", tmp); Py_DECREF(tmp);
+	
+	// EdgeNature
+	tmp = PyInt_FromLong( Nature::NO_FEATURE ); PyDict_SetItemString( Nature_Type.tp_dict, "NO_FEATURE", tmp); Py_DECREF(tmp);
+	tmp = PyInt_FromLong( Nature::SILHOUETTE ); PyDict_SetItemString( Nature_Type.tp_dict, "SILHOUETTE", tmp); Py_DECREF(tmp);
+	tmp = PyInt_FromLong( Nature::BORDER ); PyDict_SetItemString( Nature_Type.tp_dict, "BORDER", tmp); Py_DECREF(tmp);
+	tmp = PyInt_FromLong( Nature::CREASE ); PyDict_SetItemString( Nature_Type.tp_dict, "CREASE", tmp); Py_DECREF(tmp);
+	tmp = PyInt_FromLong( Nature::RIDGE ); PyDict_SetItemString( Nature_Type.tp_dict, "RIDGE", tmp); Py_DECREF(tmp);
+	tmp = PyInt_FromLong( Nature::VALLEY ); PyDict_SetItemString( Nature_Type.tp_dict, "VALLEY", tmp); Py_DECREF(tmp);
+	tmp = PyInt_FromLong( Nature::SUGGESTIVE_CONTOUR ); PyDict_SetItemString( Nature_Type.tp_dict, "SUGGESTIVE_CONTOUR", tmp); Py_DECREF(tmp);
+	
+}
+
+int Nature___init__(BPy_Nature *self, PyObject *args, PyObject *kwds)
+{
+    if (PyInt_Type.tp_init((PyObject *)self, args, kwds) < 0)
+        return -1;
+	
+	return 0;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/source/blender/freestyle/intern/python/Nature.h b/source/blender/freestyle/intern/python/Nature.h
new file mode 100644
index 00000000000..d0bc4de6fc0
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Nature.h
@@ -0,0 +1,34 @@
+#ifndef FREESTYLE_PYTHON_NATURE_H
+#define FREESTYLE_PYTHON_NATURE_H
+
+#include "../winged_edge/Nature.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject Nature_Type;
+
+#define BPy_Nature_Check(v) \
+    ((v)->ob_type == &Nature_Type)
+
+/*---------------------------Python BPy_Nature structure definition----------*/
+typedef struct {
+	PyIntObject i;
+} BPy_Nature;
+
+/*---------------------------Python BPy_Nature visible prototypes-----------*/
+
+PyMODINIT_FUNC Nature_Init( PyObject *module );
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_NATURE_H */

From 123407e0b4ec616aef40216ab76e559e0dee5711 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Fri, 18 Jul 2008 23:12:19 +0000
Subject: [PATCH 108/252] Added a documentation panel with primitive word-wrap
 functionality. It can be displayed by Text.showDoc(string) in python and has
 a text-plugin script for function docs which may be invoked with Ctrl+I
 inside its params list. Eg. type "dir(" <Ctrl+I>

---
 release/scripts/textplugin_functiondocs.py    |  68 ++++++
 source/blender/blenkernel/BKE_suggestions.h   |  14 +-
 .../blender/blenkernel/intern/suggestions.c   |  74 ++++++-
 source/blender/python/api2_2x/Text.c          |  43 +++-
 source/blender/src/drawtext.c                 | 197 +++++++++++++-----
 5 files changed, 325 insertions(+), 71 deletions(-)
 create mode 100644 release/scripts/textplugin_functiondocs.py

diff --git a/release/scripts/textplugin_functiondocs.py b/release/scripts/textplugin_functiondocs.py
new file mode 100644
index 00000000000..2277b7e68b5
--- /dev/null
+++ b/release/scripts/textplugin_functiondocs.py
@@ -0,0 +1,68 @@
+#!BPY
+"""
+Name: 'Function Documentation'
+Blender: 246
+Group: 'TextPlugin'
+Shortcut: 'Ctrl+I'
+Tooltip: 'Attempts to display documentation about the function preceding the cursor.'
+"""
+
+# Only run if we have the required modules
+try:
+	import bpy
+	from BPyTextPlugin import *
+	OK = True
+except ImportError:
+	OK = False
+
+def main():
+	txt = bpy.data.texts.active
+	if not txt:
+		return
+	
+	(line, c) = current_line(txt)
+	
+	# Check we are in a normal context
+	if get_context(txt) != NORMAL:
+		return
+	
+	# Look backwards for first '(' without ')'
+	b = 0
+	for i in range(c-1, -1, -1):
+		if line[i] == ')': b += 1
+		elif line[i] == '(':
+			b -= 1
+			if b < 0:
+				c = i
+				break
+	
+	pre = get_targets(line, c)
+	
+	if len(pre) == 0:
+		return
+	
+	imports = get_imports(txt)
+	builtins = get_builtins()
+	
+	# Identify the root (root.sub.sub.)
+	if imports.has_key(pre[0]):
+		obj = imports[pre[0]]
+	elif builtins.has_key(pre[0]):
+		obj = builtins[pre[0]]
+	else:
+		return
+	
+	# Step through sub-attributes
+	try:
+		for name in pre[1:]:
+			obj = getattr(obj, name)
+	except AttributeError:
+		print "Attribute not found '%s' in '%s'" % (name, '.'.join(pre))
+		return
+	
+	if hasattr(obj, '__doc__') and obj.__doc__:
+		txt.showDocs(obj.__doc__)
+
+# Check we are running as a script and not imported as a module
+if __name__ == "__main__" and OK:
+	main()
diff --git a/source/blender/blenkernel/BKE_suggestions.h b/source/blender/blenkernel/BKE_suggestions.h
index d0f982263c0..cbddbcfc8ad 100644
--- a/source/blender/blenkernel/BKE_suggestions.h
+++ b/source/blender/blenkernel/BKE_suggestions.h
@@ -60,20 +60,26 @@ typedef struct SuggList {
 	SuggItem *selected;
 } SuggList;
 
+/* Free all suggestion related memory */
 void free_suggestions();
 
+/* Used to identify which Text object the current tools should appear against */
+void suggest_set_active(Text *text);
+void suggest_clear_active();
+short suggest_is_active(Text *text);
+
 void suggest_add(const char *name, char type);
 void suggest_prefix(const char *prefix);
 SuggItem *suggest_first();
 SuggItem *suggest_last();
 
-void suggest_set_text(Text *text);
-void suggest_clear_text();
-short suggest_is_active(Text *text);
-
 void suggest_set_selected(SuggItem *sel);
 SuggItem *suggest_get_selected();
 
+void suggest_documentation(const char *docs);
+char *suggest_get_docs();
+void suggest_clear_docs();
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/source/blender/blenkernel/intern/suggestions.c b/source/blender/blenkernel/intern/suggestions.c
index dd5b770db93..e2c951f2284 100644
--- a/source/blender/blenkernel/intern/suggestions.c
+++ b/source/blender/blenkernel/intern/suggestions.c
@@ -37,20 +37,23 @@
 #include "BKE_text.h"
 #include "BKE_suggestions.h"
 
-static SuggList suggestions= {NULL, NULL, NULL, NULL, NULL};
+static SuggList suggestions = {NULL, NULL, NULL, NULL, NULL};
 static Text *suggText = NULL;
-static SuggItem *lastInsert= NULL;
+static SuggItem *lastInsert = NULL;
+static char *documentation = NULL;
+static int doc_lines = 0;
 
-static suggest_cmp(const char *first, const char *second, int len) {	
+static int suggest_cmp(const char *first, const char *second, int len) {	
 	int cmp, i;
 	for (cmp=0, i=0; i<len; i++) {
-		if (cmp= toupper(first[i]) - toupper(second[i])) {
+		if (cmp= toupper(first[i])-toupper(second[i])) {
 			break;
 		}
 	}
 	return cmp;
 }
-void free_suggestions() {
+
+static void sugg_free() {
 	SuggItem *item, *prev;
 	for (item = suggestions.last; item; item=prev) {
 		prev = item->prev;
@@ -61,6 +64,18 @@ void free_suggestions() {
 	suggestions.selected = NULL;
 }
 
+static void docs_free() {
+	if (documentation) {
+		MEM_freeN(documentation);
+		documentation = NULL;
+	}
+}
+
+void free_suggestions() {
+	sugg_free();
+	docs_free();
+}
+
 void suggest_add(const char *name, char type) {
 	SuggItem *newitem;
 
@@ -87,7 +102,7 @@ void suggest_add(const char *name, char type) {
 
 void suggest_prefix(const char *prefix) {
 	SuggItem *match, *first, *last;
-	int cmp, len = strlen(prefix), i;
+	int cmp, len = strlen(prefix);
 
 	if (!suggestions.first) return;
 	if (len==0) {
@@ -111,10 +126,13 @@ void suggest_prefix(const char *prefix) {
 	}
 	if (first) {
 		if (!last) last = suggestions.last;
-		suggestions.selected = suggestions.firstmatch = first;
+		suggestions.firstmatch = first;
 		suggestions.lastmatch = last;
+		suggestions.selected = first;
 	} else {
-		suggestions.firstmatch = suggestions.lastmatch = NULL;
+		suggestions.firstmatch = NULL;
+		suggestions.lastmatch = NULL;
+		suggestions.selected = NULL;
 	}
 }
 
@@ -126,11 +144,13 @@ SuggItem *suggest_last() {
 	return suggestions.lastmatch;
 }
 
-void suggest_set_text(Text *text) {
+void suggest_set_active(Text *text) {
+	if (suggText == text) return;
+	suggest_clear_active();
 	suggText = text;
 }
 
-void suggest_clear_text() {
+void suggest_clear_active() {
 	free_suggestions();
 	suggText = NULL;
 }
@@ -146,3 +166,37 @@ void suggest_set_selected(SuggItem *sel) {
 SuggItem *suggest_get_selected() {
 	return suggestions.selected;
 }
+
+/* Documentation methods */
+
+void suggest_documentation(const char *docs) {
+	int len;
+
+	if (!docs) return;
+
+	len = strlen(docs);
+
+	if (documentation) {
+		MEM_freeN(documentation);
+		documentation = NULL;
+	}
+
+	/* Ensure documentation ends with a '\n' */
+	if (docs[len-1] != '\n') {
+		documentation = MEM_mallocN(len+2, "Documentation");
+		strncpy(documentation, docs, len);
+		documentation[len++] = '\n';
+	} else {
+		documentation = MEM_mallocN(len+1, "Documentation");
+		strncpy(documentation, docs, len);
+	}
+	documentation[len] = '\0';
+}
+
+char *suggest_get_docs() {
+	return documentation;
+}
+
+void suggest_clear_docs() {
+	docs_free();
+}
diff --git a/source/blender/python/api2_2x/Text.c b/source/blender/python/api2_2x/Text.c
index 836d824e3b2..ecfb6ba1018 100644
--- a/source/blender/python/api2_2x/Text.c
+++ b/source/blender/python/api2_2x/Text.c
@@ -103,6 +103,7 @@ static PyObject *Text_asLines( BPy_Text * self );
 static PyObject *Text_getCursorPos( BPy_Text * self );
 static PyObject *Text_setCursorPos( BPy_Text * self, PyObject * args );
 static PyObject *Text_suggest( BPy_Text * self, PyObject * args );
+static PyObject *Text_showDocs( BPy_Text * self, PyObject * args );
 
 /*****************************************************************************/
 /* Python BPy_Text methods table:                                            */
@@ -136,7 +137,9 @@ static PyMethodDef BPy_Text_methods[] = {
 	{"setCursorPos", ( PyCFunction ) Text_setCursorPos, METH_VARARGS,
 	 "(row, col) - Set the cursor position to (row, col)"},
 	{"suggest", ( PyCFunction ) Text_suggest, METH_VARARGS,
-	 "(list) - List of tuples of the form (name, type) where type is one of 'm', 'v', 'f', 'k' for module, variable, function and keyword respectively"},
+	 "(list, prefix) - List of tuples of the form (name, type) where type is one of 'm', 'v', 'f', 'k' for module, variable, function and keyword respectively"},
+	{"showDocs", ( PyCFunction ) Text_showDocs, METH_VARARGS,
+	 "(docs) - Documentation string"},
 	{NULL, NULL, 0, NULL}
 };
 
@@ -548,7 +551,7 @@ static PyObject *Text_setCursorPos( BPy_Text * self, PyObject * args )
 	int row, col;
 	int oldstate;
 
-	if(!self->text)
+	if (!self->text)
 		return EXPP_ReturnPyObjError(PyExc_RuntimeError,
 					      "This object isn't linked to a Blender Text Object");
 
@@ -573,12 +576,12 @@ static PyObject *Text_suggest( BPy_Text * self, PyObject * args )
 	char *prefix, *name, type;
 	SpaceText *st;
 
-	if(!self->text)
+	if (!self->text)
 		return EXPP_ReturnPyObjError(PyExc_RuntimeError,
 				"This object isn't linked to a Blender Text Object");
 
 	/* Parse args for a list of tuples */
-	if(!PyArg_ParseTuple(args, "O!s", &PyList_Type, &list, &prefix))
+	if (!PyArg_ParseTuple(args, "O!s", &PyList_Type, &list, &prefix))
 		return EXPP_ReturnPyObjError(PyExc_TypeError,
 				"expected list of tuples followed by a string");
 
@@ -591,8 +594,8 @@ static PyObject *Text_suggest( BPy_Text * self, PyObject * args )
 		return EXPP_ReturnPyObjError(PyExc_RuntimeError,
 				"Active text area has no Text object");
 	
+	suggest_set_active(st->text);
 	list_len = PyList_Size(list);
-	suggest_clear_text();
 	
 	for (i = 0; i < list_len; i++) {
 		item = PyList_GetItem(list, i);
@@ -610,7 +613,35 @@ static PyObject *Text_suggest( BPy_Text * self, PyObject * args )
 		suggest_add(name, type);
 	}
 	suggest_prefix(prefix);
-	suggest_set_text(st->text);
+	scrarea_queue_redraw(curarea);
+
+	Py_RETURN_NONE;
+}
+
+static PyObject *Text_showDocs( BPy_Text * self, PyObject * args )
+{
+	char *docs;
+	SpaceText *st;
+
+	if (!self->text)
+		return EXPP_ReturnPyObjError(PyExc_RuntimeError,
+				"This object isn't linked to a Blender Text Object");
+
+	if (!PyArg_ParseTuple(args, "s", &docs))
+		return EXPP_ReturnPyObjError( PyExc_TypeError,
+					      "expected a string as argument" );
+
+	if (curarea->spacetype != SPACE_TEXT)
+		return EXPP_ReturnPyObjError(PyExc_RuntimeError,
+				"Active space type is not text");
+	
+	st = curarea->spacedata.first;
+	if (!st || !st->text)
+		return EXPP_ReturnPyObjError(PyExc_RuntimeError,
+				"Active text area has no Text object");
+
+	suggest_set_active(st->text);
+	suggest_documentation(docs);
 	scrarea_queue_redraw(curarea);
 
 	Py_RETURN_NONE;
diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index ae994b3e61d..4ae87f64c47 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -87,10 +87,14 @@
 #include "blendef.h" 
 #include "winlay.h"
 
-#define TEXTXLOC	38
+#define TEXTXLOC		38
 
-#define SUGG_LIST_SIZE 7
-#define SUGG_LIST_WIDTH 20
+#define SUGG_LIST_SIZE	7
+#define SUGG_LIST_WIDTH	20
+#define DOC_WIDTH		40
+
+#define TOOL_SUGG_LIST	0x01
+#define TOOL_DOCUMENT	0x02
 
 /* forward declarations */
 
@@ -106,6 +110,7 @@ static int check_numbers(char *string);
 static int check_builtinfuncs(char *string);
 static int check_specialvars(char *string);
 static int check_identifier(char ch);
+static int check_whitespace(char ch);
 
 static void get_suggest_prefix(Text *text);
 static void confirm_suggestion(Text *text, int skipleft);
@@ -1068,7 +1073,78 @@ static int do_suggest_select(SpaceText *st)
 	return 1;
 }
 
-void draw_suggestion_list(SpaceText *st) {
+void draw_documentation(SpaceText *st)
+{
+	TextLine *tmp;
+	char *docs, buf[DOC_WIDTH+1];
+	int len, prevsp, i, a;
+	int boxw=0, boxh, l, x, y;
+	
+	if (!st || !st->text) return;
+	if (!suggest_is_active(st->text)) return;
+	
+	docs = suggest_get_docs();
+
+	if (!docs) return;
+
+	/* Count the visible lines to the cursor */
+	for (tmp=st->text->curl, l=-st->top; tmp; tmp=tmp->prev, l++);
+	if (l<0) return;
+	
+	if(st->showlinenrs) {
+		x = spacetext_get_fontwidth(st)*(st->text->curc-st->left) + TXT_OFFSET + TEXTXLOC - 4;
+	} else {
+		x = spacetext_get_fontwidth(st)*(st->text->curc-st->left) + TXT_OFFSET - 4;
+	}
+	if (suggest_first()) {
+		x += SUGG_LIST_WIDTH*spacetext_get_fontwidth(st) + 50;
+	}
+	y = curarea->winy - st->lheight*l - 2;
+
+	len = strlen(docs);
+
+	boxw = DOC_WIDTH*spacetext_get_fontwidth(st) + 20;
+	boxh = (2*len/DOC_WIDTH+1)*st->lheight + 8; /* Rough guess at box height */
+	
+	BIF_ThemeColor(TH_SHADE1);
+	glRecti(x-1, y+1, x+boxw+1, y-boxh-1);
+	BIF_ThemeColor(TH_BACK);
+	glRecti(x, y, x+boxw, y-boxh);
+	BIF_ThemeColor(TH_TEXT);
+
+	len = strlen(docs);
+	prevsp = a = 0;
+
+	for (i=0; i<len; i++) {
+		if (docs[i] == ' ' || docs[i] == '\t' || docs[i] == '\n') {
+
+			/* If we would exceed the line length, print up to the last space */
+			if (a + i-prevsp > DOC_WIDTH) {
+				y -= st->lheight;
+				buf[a] = '\0';
+				text_draw(st, buf, 0, 0, 1, x+4, y-1, NULL);
+				a = 0;
+			}
+
+			/* Buffer up the next bit ready to draw */
+			if (i-prevsp > DOC_WIDTH) break; /* TODO: Deal with long, unbroken strings */
+			strncpy(buf+a, docs+prevsp, i-prevsp);
+			a += i-prevsp;
+			prevsp = i;
+
+			/* Hit a new line, print what we have */
+			if (docs[i] == '\n') {
+				y -= st->lheight;
+				buf[a] = '\0';
+				text_draw(st, buf, 0, 0, 1, x+4, y-1, NULL);
+				a = 0;
+			}
+		}
+	}
+}
+
+void draw_suggestion_list(SpaceText *st)
+{
 	SuggItem *item, *first, *last, *sel;
 	TextLine *tmp;
 	char str[SUGG_LIST_WIDTH+1];
@@ -1079,6 +1155,9 @@ void draw_suggestion_list(SpaceText *st) {
 
 	first = suggest_first();
 	last = suggest_last();
+
+	if (!first || !last) return;
+
 	sel = suggest_get_selected();
 
 	/* Count the visible lines to the cursor */
@@ -1208,6 +1287,7 @@ void drawtextspace(ScrArea *sa, void *spacedata)
 	}
 
 	draw_textscroll(st);
+	draw_documentation(st);
 	draw_suggestion_list(st);
 
 	curarea->win_swap= WIN_BACK_OK;
@@ -1693,7 +1773,7 @@ static void confirm_suggestion(Text *text, int skipleft) {
 	for (i=0; i<skipleft; i++)
 		txt_move_right(text, 0);
 
-	suggest_clear_text();
+	suggest_clear_active();
 }
 
 void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
@@ -1704,7 +1784,7 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 	SpaceText *st= curarea->spacedata.first;
 	Text *text;
 	int do_draw=0, p;
-	int suggesting=0, do_suggest=0; /* 0:just redraw, -1:clear, 1:update prefix */
+	int tools=0, tools_cancel=0, tools_update=0; /* Bitmasks for operations */
 	
 	if (st==NULL || st->spacetype != SPACE_TEXT) return;
 	
@@ -1768,7 +1848,10 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 		return;
 	}
 
-	suggesting = st->showsyntax && suggest_is_active(text);
+	if (st->showsyntax && suggest_is_active(text)) {
+		if (suggest_first()) tools |= TOOL_SUGG_LIST;
+		if (suggest_get_docs()) tools |= TOOL_DOCUMENT;
+	}
 	
 	if (event==LEFTMOUSE) {
 		if (val) {
@@ -1779,10 +1862,9 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			
 			if (mval[0]>2 && mval[0]<20 && mval[1]>2 && mval[1]<curarea->winy-2) {
 				do_textscroll(st, 2);
-				do_suggest= -1;
+				tools_cancel |= TOOL_SUGG_LIST | TOOL_DOCUMENT;
 			} else if (do_suggest_select(st)) {
 				do_draw= 1;
-				do_suggest= 0;
 			} else {
 				do_selection(st, G.qual&LR_SHIFTKEY);
 				if (txt_has_sel(text)) {
@@ -1791,7 +1873,7 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 					MEM_freeN(buffer);
 				}
 				do_draw= 1;
-				do_suggest= -1;
+				tools_cancel |= TOOL_SUGG_LIST | TOOL_DOCUMENT;
 			}
 		}
 	} else if (event==MIDDLEMOUSE) {
@@ -1799,15 +1881,16 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			if (do_suggest_select(st)) {
 				confirm_suggestion(text, 0);
 				do_draw= 1;
-				do_suggest= 0;
-			} else if (U.uiflag & USER_MMB_PASTE) {
-				do_selection(st, G.qual&LR_SHIFTKEY);
-				get_selection_buffer(text);
-				do_draw= 1;
 			} else {
-				do_textscroll(st, 1);
+				if (U.uiflag & USER_MMB_PASTE) {
+					do_selection(st, G.qual&LR_SHIFTKEY);
+					get_selection_buffer(text);
+					do_draw= 1;
+				} else {
+					do_textscroll(st, 1);
+				}
+				tools_cancel |= TOOL_SUGG_LIST | TOOL_DOCUMENT;
 			}
-			do_suggest= -1;
 		}
 	} else if (event==RIGHTMOUSE) {
 		if (val) {
@@ -1840,7 +1923,7 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 				default:
 					break;
 			}
-			do_suggest= -1;
+			tools_cancel |= TOOL_SUGG_LIST | TOOL_DOCUMENT;
 		}
 	} else if (ascii) {
 		if (text && text->id.lib) {
@@ -1850,19 +1933,23 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			if (st->showsyntax) get_format_string(st);
 			pop_space_text(st);
 			do_draw= 1;
-			if (suggesting) {
-				if (ispunct(ascii) || check_whitespace(ascii)) {
+			if (tools & TOOL_SUGG_LIST) {
+				if ((ascii != '_' && ascii != '*' && ispunct(ascii)) || check_whitespace(ascii)) {
 					confirm_suggestion(text, 1);
 					if (st->showsyntax) get_format_string(st);
-					do_suggest= 0;
 				} else {
-					do_suggest= 1;
+					tools_update |= TOOL_SUGG_LIST;
 				}
 			}
+			tools_cancel |= TOOL_DOCUMENT;
 		}
 	} else if (val) {
-		do_suggest= -1; /* Note that the default label sets this to 0,
-						so -1 only applies to the explicit cases below */
+
+		/* Cases that require tools not to be cancelled must explicitly say so.
+		 * The default case does this to prevent window/mousemove events
+		 * from cancelling. */
+		tools_cancel |= TOOL_SUGG_LIST | TOOL_DOCUMENT;
+
 		switch (event) {
 		case AKEY:
 			if (G.qual & LR_ALTKEY) {
@@ -2126,7 +2213,10 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			}
 			break;
 		case ESCKEY:
-			do_suggest= -1;
+			/* To allow ESC to close one tool at a time we remove all others from the cancel list */
+			if (tools & TOOL_DOCUMENT) {
+				tools_cancel &= ~TOOL_SUGG_LIST;
+			}
 			break;
 		case TABKEY:
 			if (text && text->id.lib) {
@@ -2157,7 +2247,7 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 				error_libdata();
 				break;
 			}
-			if (suggesting) {
+			if (tools & TOOL_SUGG_LIST) {
 				confirm_suggestion(text, 0);
 				if (st->showsyntax) get_format_string(st);
 				break;
@@ -2186,17 +2276,14 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			}
 			if (G.qual & (LR_ALTKEY | LR_CTRLKEY)) {
 				txt_backspace_word(text);
-				do_suggest= -1;
+				tools_cancel |= TOOL_SUGG_LIST;
 			} else {
 				/* Work out which char we are about to delete */
 				if (text && text->curl && text->curc > 0) {
 					char ch= text->curl->line[text->curc-1];
-					if (ispunct(ch) || check_whitespace(ch))
-						do_suggest= -1;
-					else
-						do_suggest= 1;
-				} else {
-					do_suggest= -1;
+					if (!ispunct(ch) && !check_whitespace(ch)) {
+						tools_update |= TOOL_SUGG_LIST;
+					}
 				}
 				txt_backspace_char(text);
 			}
@@ -2223,17 +2310,17 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 		case INSERTKEY:
 			st->overwrite= !st->overwrite;
 			do_draw= 1;
-			do_suggest= 0;
+			tools_cancel = 0;
 			break;
 		case DOWNARROWKEY:
-			if (suggesting) {
+			if (tools & TOOL_SUGG_LIST) {
 				SuggItem *sel = suggest_get_selected();
 				if (!sel) {
 					suggest_set_selected(suggest_first());
 				} else if (sel!=suggest_last() && sel->next) {
 					suggest_set_selected(sel->next);
 				}
-				do_suggest= 0;
+				tools_cancel &= ~TOOL_SUGG_LIST;
 				break;
 			}
 			txt_move_down(text, G.qual & LR_SHIFTKEY);
@@ -2264,11 +2351,11 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			pop_space_text(st);
 			break;
 		case UPARROWKEY:
-			if (suggesting) {
+			if (tools & TOOL_SUGG_LIST) {
 				SuggItem *sel = suggest_get_selected();
 				if (sel && sel!=suggest_first() && sel->prev)
 					suggest_set_selected(sel->prev);
-				do_suggest= 0;
+				tools_cancel &= ~TOOL_SUGG_LIST;
 				break;
 			}
 			txt_move_up(text, G.qual & LR_SHIFTKEY);
@@ -2277,14 +2364,14 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			pop_space_text(st);
 			break;
 		case PAGEDOWNKEY:
-			if (suggesting) {
+			if (tools & TOOL_SUGG_LIST) {
 				int i;
 				SuggItem *sel = suggest_get_selected();
 				if (!sel)
 					sel = suggest_first();
 				for (i=0; i<SUGG_LIST_SIZE-1 && sel && sel!=suggest_last() && sel->next; i++, sel=sel->next)
 					suggest_set_selected(sel->next);
-				do_suggest= 0;
+				tools_cancel &= ~TOOL_SUGG_LIST;
 				break;
 			} else {
 				screen_skip(st, st->viewlines);
@@ -2292,12 +2379,12 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			do_draw= 1;
 			break;
 		case PAGEUPKEY:
-			if (suggesting) {
+			if (tools & TOOL_SUGG_LIST) {
 				int i;
 				SuggItem *sel = suggest_get_selected();
 				for (i=0; i<SUGG_LIST_SIZE-1 && sel && sel!=suggest_first() && sel->prev; i++, sel=sel->prev)
 					suggest_set_selected(sel->prev);
-				do_suggest= 0;
+				tools_cancel &= ~TOOL_SUGG_LIST;
 				break;
 			} else {
 				screen_skip(st, -st->viewlines);
@@ -2315,33 +2402,35 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			pop_space_text(st);
 			break;
 		case WHEELUPMOUSE:
-			if (suggesting) {
+			if (tools & TOOL_SUGG_LIST) {
 				SuggItem *sel = suggest_get_selected();
 				if (sel && sel!=suggest_first() && sel->prev)
 					suggest_set_selected(sel->prev);
-				do_suggest= 0;
+				tools_cancel &= ~TOOL_SUGG_LIST;
 			} else {
 				screen_skip(st, -U.wheellinescroll);
+				tools_cancel &= ~TOOL_DOCUMENT;
 			}
 			do_draw= 1;
 			break;
 		case WHEELDOWNMOUSE:
-			if (suggesting) {
+			if (tools & TOOL_SUGG_LIST) {
 				SuggItem *sel = suggest_get_selected();
 				if (!sel) {
 					suggest_set_selected(suggest_first());
 				} else if (sel && sel!=suggest_last() && sel->next) {
 					suggest_set_selected(sel->next);
 				}
-				do_suggest= 0;
+				tools_cancel &= ~TOOL_SUGG_LIST;
 			} else {
 				screen_skip(st, U.wheellinescroll);
+				tools_cancel &= ~TOOL_DOCUMENT;
 			}
 			do_draw= 1;
 			break;
 		default:
 			/* We don't want all sorts of events closing the suggestions box */
-			do_suggest= 0;
+			tools_cancel &= ~TOOL_SUGG_LIST & ~TOOL_DOCUMENT;
 		}
 	}
 
@@ -2404,11 +2493,17 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 		}
 	}
 
-	if (suggesting) {
-		if (do_suggest == -1) {
-			suggest_clear_text();
-		} else if (do_suggest == 1) {
+	if (tools & TOOL_SUGG_LIST) {
+		if (tools_update & TOOL_SUGG_LIST) {
 			get_suggest_prefix(text);
+		} else if (tools_cancel & TOOL_SUGG_LIST) {
+			suggest_clear_active();
+		}
+		do_draw= 1;
+	}
+	if (tools & TOOL_DOCUMENT) {
+		if (tools_cancel & TOOL_DOCUMENT) {
+			suggest_clear_docs();
 		}
 		do_draw= 1;
 	}

From f042a468fdd0f06ca41c022c9ed6ac59d35ff143 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Fri, 18 Jul 2008 23:35:34 +0000
Subject: [PATCH 109/252] Merged 15170:15635 from trunk (no conflicts or even
 merges)

---
 CMakeLists.txt                                |   27 +-
 README                                        |   14 +-
 blenderplayer/CMakeLists.txt                  |    1 +
 extern/CMakeLists.txt                         |    3 +
 extern/Makefile                               |    2 +-
 extern/SConscript                             |    2 +
 extern/glew/CMakeLists.txt                    |   33 +
 extern/glew/README.txt                        |   18 +
 extern/glew/SConscript                        |   12 +
 extern/glew/include/GL/glew.h                 | 9797 +++++++++++++++++
 extern/glew/include/GL/glxew.h                | 1062 ++
 extern/glew/include/GL/wglew.h                |  934 ++
 extern/glew/make/msvc_7_0/glew_vc7.vcproj     |  146 +
 extern/glew/src/Makefile                      |   56 +
 extern/glew/src/glew.c                        | 9756 ++++++++++++++++
 extern/libopenjpeg/opj_malloc.h               |    6 +-
 extern/libopenjpeg/patches/osx.patch          |   17 +
 extern/libredcode/debayer.c                   |   24 +-
 extern/make/msvc_7_0/extern.sln               |   65 +
 intern/bsp/intern/BSP_CSGMesh.cpp             |    2 +-
 intern/container/CTR_TaggedIndex.h            |   16 +
 intern/decimation/intern/LOD_ManMesh2.cpp     |    6 +-
 intern/elbeem/intern/solver_init.cpp          |    2 +-
 intern/ghost/intern/GHOST_SystemWin32.cpp     |   17 +
 intern/ghost/intern/GHOST_SystemX11.cpp       |    8 +-
 intern/ghost/intern/GHOST_WindowWin32.cpp     |    8 +
 intern/iksolver/intern/IK_QTask.h             |    2 +-
 intern/moto/include/GEN_Map.h                 |   18 +
 intern/moto/include/MT_random.h               |    6 +-
 intern/moto/intern/MT_random.cpp              |   10 +-
 projectfiles_vc7/blender/blender.vcproj       |    4 +-
 .../blender/blenkernel/BKE_blenkernel.vcproj  |    9 +-
 .../blender/blenlib/BLI_blenlib.vcproj        |   12 +
 .../blender/render/BRE_render.vcproj          |    8 +-
 projectfiles_vc7/blender/src/BL_src.vcproj    |    4 +-
 .../blenderhook/KX_blenderhook.vcproj         |    4 +-
 .../gameengine/converter/KX_converter.vcproj  |   12 +
 .../gameengine/gamelogic/SCA_GameLogic.vcproj |   36 +
 .../gameplayer/common/GP_common.vcproj        |    4 +-
 .../gameplayer/ghost/GP_ghost.vcproj          |    8 +-
 .../gameengine/ketsji/KX_ketsji.vcproj        |   30 +-
 .../rasterizer/RAS_rasterizer.vcproj          |   12 +-
 .../RAS_openglrasterizer.vcproj               |   21 +-
 release/datafiles/blenderbuttons              |  Bin 69070 -> 69599 bytes
 release/scripts/DirectX8Exporter.py           |   34 +-
 release/scripts/animation_bake_constraints.py |  792 ++
 release/scripts/bpymodules/BPyArmature.py     |   75 +-
 release/scripts/c3d_import.py                 | 1243 +++
 release/scripts/ms3d_import.py                |  132 +-
 release/scripts/vrml97_export.py              |   78 +-
 release/windows/installer/00.sconsblender.nsi |   25 +-
 source/Makefile                               |    1 +
 source/blender/blenkernel/BKE_action.h        |    5 +
 source/blender/blenkernel/BKE_bmesh.h         |   21 +-
 .../blender/blenkernel/BKE_bmeshCustomData.h  |    4 +-
 source/blender/blenkernel/BKE_cloth.h         |    2 +-
 source/blender/blenkernel/BKE_customdata.h    |   29 +
 source/blender/blenkernel/BKE_ipo.h           |    8 +
 source/blender/blenkernel/BKE_key.h           |   11 +
 source/blender/blenkernel/BKE_object.h        |    1 +
 source/blender/blenkernel/BKE_scene.h         |    2 +-
 .../blenkernel/intern/BME_Customdata.c        |    9 +-
 .../blenkernel/intern/BME_conversions.c       |  286 +-
 source/blender/blenkernel/intern/BME_eulers.c |   14 +-
 source/blender/blenkernel/intern/BME_mesh.c   |   80 +-
 .../blender/blenkernel/intern/BME_structure.c |  135 +-
 source/blender/blenkernel/intern/BME_tools.c  |  105 +-
 .../blender/blenkernel/intern/DerivedMesh.c   |    6 +-
 source/blender/blenkernel/intern/action.c     |   26 +-
 source/blender/blenkernel/intern/armature.c   |   61 +-
 .../blender/blenkernel/intern/bmesh_private.h |    6 -
 .../blender/blenkernel/intern/cdderivedmesh.c |    9 +
 source/blender/blenkernel/intern/cloth.c      |    4 +-
 source/blender/blenkernel/intern/collision.c  |  473 +-
 source/blender/blenkernel/intern/customdata.c |  384 +-
 source/blender/blenkernel/intern/image.c      |   18 +-
 source/blender/blenkernel/intern/implicit.c   |   13 +-
 source/blender/blenkernel/intern/ipo.c        |    2 +-
 source/blender/blenkernel/intern/key.c        |    2 +-
 source/blender/blenkernel/intern/library.c    |   62 +-
 source/blender/blenkernel/intern/modifier.c   |  269 +-
 source/blender/blenkernel/intern/object.c     |   41 +
 source/blender/blenkernel/intern/particle.c   |    2 +-
 .../blenkernel/intern/particle_system.c       |   28 +-
 source/blender/blenkernel/intern/pointcache.c |   16 +-
 source/blender/blenkernel/intern/sca.c        |    7 +
 source/blender/blenkernel/intern/text.c       |    3 +-
 source/blender/blenlib/BLI_arithb.h           |   11 +
 source/blender/blenlib/BLI_mempool.h          |   44 +
 source/blender/blenlib/BLI_winstuff.h         |    3 +
 source/blender/blenlib/intern/BLI_kdopbvh.c   |    2 +
 source/blender/blenlib/intern/BLI_mempool.c   |  140 +
 source/blender/blenlib/intern/arithb.c        |  447 +-
 source/blender/blenlib/intern/util.c          |   36 +-
 source/blender/blenloader/intern/readfile.c   |   37 +
 source/blender/blenloader/intern/writefile.c  |    7 +
 source/blender/imbuf/IMB_imbuf_types.h        |    1 +
 source/blender/imbuf/intern/IMB_anim.h        |    3 +-
 source/blender/imbuf/intern/anim.c            |   88 +-
 source/blender/imbuf/intern/cineon/dpxlib.c   |   45 +-
 .../imbuf/intern/openexr/openexr_api.cpp      |   43 +-
 source/blender/include/BDR_drawobject.h       |    1 +
 source/blender/include/BDR_editcurve.h        |    1 +
 source/blender/include/BIF_butspace.h         |    2 +
 source/blender/include/BIF_editaction.h       |    2 +
 source/blender/include/BIF_editarmature.h     |    2 +-
 source/blender/include/BIF_interface.h        |    1 +
 source/blender/include/BIF_oops.h             |   10 +
 source/blender/include/BIF_resources.h        |    5 +-
 source/blender/include/BSE_sequence.h         |    2 +
 source/blender/include/BSE_view.h             |    2 +
 source/blender/include/blendef.h              |    6 +
 source/blender/include/butspace.h             |    4 +
 source/blender/include/transform.h            |   11 +-
 source/blender/makesdna/DNA_actuator_types.h  |   69 +-
 .../blender/makesdna/DNA_controller_types.h   |    7 +-
 .../blender/makesdna/DNA_customdata_types.h   |   10 +-
 source/blender/makesdna/DNA_lamp_types.h      |   19 +
 source/blender/makesdna/DNA_meshdata_types.h  |   19 +-
 source/blender/makesdna/DNA_modifier_types.h  |    6 +-
 source/blender/makesdna/DNA_object_types.h    |    6 +-
 source/blender/makesdna/DNA_scene_types.h     |    9 +-
 source/blender/makesdna/DNA_sensor_types.h    |   10 +-
 source/blender/makesdna/DNA_space_types.h     |   12 +-
 source/blender/makesdna/DNA_userdef_types.h   |    3 +-
 .../nodes/intern/CMP_nodes/CMP_gamma.c        |    2 +-
 .../blender/nodes/intern/CMP_nodes/CMP_math.c |   20 +-
 .../blender/nodes/intern/SHD_nodes/SHD_math.c |   18 +-
 source/blender/python/BPY_interface.c         |   39 +-
 source/blender/python/api2_2x/CurNurb.c       |   34 +
 source/blender/python/api2_2x/Lamp.c          |   13 +-
 source/blender/python/api2_2x/Mathutils.c     |  111 +-
 source/blender/python/api2_2x/doc/Curve.py    |    2 +
 source/blender/python/api2_2x/doc/Render.py   |    4 +-
 source/blender/python/api2_2x/matrix.c        |    2 +-
 source/blender/python/api2_2x/sceneRender.c   |    2 +-
 source/blender/python/api2_2x/sceneSequence.c |   74 +-
 .../radiosity/intern/source/radrender.c       |   15 +-
 .../render/intern/include/pixelshading.h      |    1 +
 .../render/intern/include/render_types.h      |    4 +
 source/blender/render/intern/include/sunsky.h |  141 +
 .../render/intern/source/convertblender.c     |   29 +-
 .../blender/render/intern/source/pipeline.c   |    6 +-
 .../render/intern/source/pixelshading.c       |   78 +-
 .../blender/render/intern/source/rendercore.c |  106 +
 source/blender/render/intern/source/shadbuf.c |    4 +-
 source/blender/render/intern/source/sunsky.c  |  492 +
 source/blender/render/intern/source/zbuf.c    |   24 +-
 source/blender/src/CMakeLists.txt             |    2 +-
 source/blender/src/Makefile                   |    1 +
 source/blender/src/SConscript                 |    2 +-
 source/blender/src/blenderbuttons.c           | 4338 ++++----
 source/blender/src/buttons_editing.c          |   68 +-
 source/blender/src/buttons_logic.c            | 1169 +-
 source/blender/src/buttons_object.c           |    4 +-
 source/blender/src/buttons_scene.c            |   84 +-
 source/blender/src/buttons_shading.c          |   47 +-
 source/blender/src/drawaction.c               |  120 +-
 source/blender/src/drawarmature.c             |   17 +-
 source/blender/src/drawimage.c                |    2 +-
 source/blender/src/drawmesh.c                 |   12 +-
 source/blender/src/drawnode.c                 |    2 +-
 source/blender/src/drawobject.c               |    8 +-
 source/blender/src/drawoops.c                 |    9 +
 source/blender/src/drawview.c                 |    7 +-
 source/blender/src/editaction.c               |  121 +-
 source/blender/src/editarmature.c             |   51 +-
 source/blender/src/editcurve.c                |   56 +
 source/blender/src/editfont.c                 |    4 +-
 source/blender/src/editmesh.c                 |   11 +-
 source/blender/src/editmesh_add.c             |   18 +-
 source/blender/src/editmesh_lib.c             |   13 +-
 source/blender/src/editmesh_mods.c            |    4 +-
 source/blender/src/editnla.c                  |   35 +-
 source/blender/src/editobject.c               |    8 +-
 source/blender/src/editparticle.c             |   36 +-
 source/blender/src/editseq.c                  |   20 +-
 source/blender/src/editsima.c                 |   22 +-
 source/blender/src/editsound.c                |    2 +-
 source/blender/src/edittime.c                 |    4 +-
 source/blender/src/header_image.c             |   23 +-
 source/blender/src/header_oops.c              |    4 +-
 source/blender/src/header_view3d.c            |   31 +-
 source/blender/src/headerbuttons.c            |    1 +
 source/blender/src/interface.c                |    8 +-
 source/blender/src/interface_draw.c           |    8 +-
 source/blender/src/oops.c                     |  113 +-
 source/blender/src/poselib.c                  |   18 +-
 source/blender/src/poseobject.c               |    4 +-
 source/blender/src/resources.c                |   28 +
 source/blender/src/sequence.c                 |   24 +-
 source/blender/src/space.c                    |   69 +-
 source/blender/src/transform.c                |  129 +-
 source/blender/src/transform_constraints.c    |   35 +-
 source/blender/src/transform_conversions.c    |    7 +-
 source/blender/src/transform_generics.c       |   10 +-
 source/blender/src/transform_snap.c           |  645 +-
 source/blender/src/usiblender.c               |   14 +-
 source/blender/src/view.c                     |  134 +-
 source/blender/src/vpaint.c                   |   36 +-
 source/creator/CMakeLists.txt                 |    1 +
 source/creator/creator.c                      |    4 +-
 .../BlenderRoutines/BL_KetsjiEmbedStart.cpp   |   89 +-
 .../gameengine/BlenderRoutines/CMakeLists.txt |    1 +
 .../BlenderRoutines/KX_BlenderCanvas.h        |    8 +-
 .../BlenderRoutines/KX_BlenderGL.cpp          |   59 +-
 .../BlenderRoutines/KX_BlenderRenderTools.cpp |   17 +-
 .../BlenderRoutines/KX_BlenderRenderTools.h   |    2 +-
 source/gameengine/BlenderRoutines/Makefile    |    3 +-
 source/gameengine/BlenderRoutines/SConscript  |    1 +
 .../BlenderRoutines/mac_compat_glext.h        |  132 -
 .../Converter/BL_ActionActuator.cpp           |  122 +-
 .../gameengine/Converter/BL_ActionActuator.h  |   12 +-
 .../Converter/BL_ArmatureObject.cpp           |    7 +-
 .../Converter/BL_BlenderDataConversion.cpp    |  433 +-
 .../Converter/BL_DeformableGameObject.cpp     |   47 +
 .../Converter/BL_DeformableGameObject.h       |   40 +-
 .../gameengine/Converter/BL_MeshDeformer.cpp  |  212 +-
 source/gameengine/Converter/BL_MeshDeformer.h |   23 +-
 .../Converter/BL_ShapeActionActuator.cpp      |  821 ++
 .../Converter/BL_ShapeActionActuator.h        |  133 +
 .../gameengine/Converter/BL_ShapeDeformer.cpp |  181 +
 .../gameengine/Converter/BL_ShapeDeformer.h   |   99 +
 .../gameengine/Converter/BL_SkinDeformer.cpp  |  135 +-
 source/gameengine/Converter/BL_SkinDeformer.h |   53 +-
 .../Converter/BL_SkinMeshObject.cpp           |  142 +-
 .../gameengine/Converter/BL_SkinMeshObject.h  |  141 +-
 .../Converter/KX_BlenderSceneConverter.cpp    |   14 +-
 .../Converter/KX_BlenderSceneConverter.h      |    5 +
 .../Converter/KX_ConvertActuators.cpp         |  196 +-
 .../Converter/KX_ConvertControllers.cpp       |   29 +
 .../Converter/KX_ConvertSensors.cpp           |   19 +-
 source/gameengine/Expressions/PyObjectPlus.h  |   59 +-
 source/gameengine/Expressions/Value.cpp       |   39 +-
 source/gameengine/Expressions/Value.h         |    3 +
 .../GameLogic/SCA_2DFilterActuator.cpp        |   10 +-
 .../GameLogic/SCA_2DFilterActuator.h          |    4 +-
 .../GameLogic/SCA_ActuatorEventManager.cpp    |   76 +
 .../GameLogic/SCA_ActuatorEventManager.h      |   52 +
 .../GameLogic/SCA_ActuatorSensor.cpp          |  196 +
 .../gameengine/GameLogic/SCA_ActuatorSensor.h |   74 +
 .../gameengine/GameLogic/SCA_AlwaysSensor.cpp |    7 +-
 .../gameengine/GameLogic/SCA_AlwaysSensor.h   |    2 +
 .../gameengine/GameLogic/SCA_EventManager.cpp |    4 +-
 .../gameengine/GameLogic/SCA_EventManager.h   |    4 +-
 source/gameengine/GameLogic/SCA_IActuator.cpp |   10 +
 source/gameengine/GameLogic/SCA_IActuator.h   |    8 +
 .../gameengine/GameLogic/SCA_IController.cpp  |   97 +-
 source/gameengine/GameLogic/SCA_IController.h |    4 +
 .../gameengine/GameLogic/SCA_ILogicBrick.cpp  |   12 +-
 source/gameengine/GameLogic/SCA_ILogicBrick.h |    4 +-
 source/gameengine/GameLogic/SCA_IObject.cpp   |   55 +-
 source/gameengine/GameLogic/SCA_IObject.h     |   36 +-
 source/gameengine/GameLogic/SCA_ISensor.cpp   |   58 +-
 source/gameengine/GameLogic/SCA_ISensor.h     |   22 +
 .../GameLogic/SCA_JoystickSensor.cpp          |   14 +-
 .../gameengine/GameLogic/SCA_JoystickSensor.h |    1 +
 .../GameLogic/SCA_KeyboardSensor.cpp          |   46 +-
 .../gameengine/GameLogic/SCA_KeyboardSensor.h |    2 +
 .../gameengine/GameLogic/SCA_LogicManager.cpp |   24 +-
 .../gameengine/GameLogic/SCA_MouseSensor.cpp  |   25 +-
 source/gameengine/GameLogic/SCA_MouseSensor.h |    2 +-
 .../GameLogic/SCA_NANDController.cpp          |  144 +
 .../gameengine/GameLogic/SCA_NANDController.h |   56 +
 .../GameLogic/SCA_NORController.cpp           |  144 +
 .../gameengine/GameLogic/SCA_NORController.h  |   56 +
 .../GameLogic/SCA_PropertySensor.cpp          |   15 +-
 .../gameengine/GameLogic/SCA_PropertySensor.h |    1 +
 .../GameLogic/SCA_PythonController.cpp        |   94 +-
 .../GameLogic/SCA_PythonController.h          |   20 +-
 .../gameengine/GameLogic/SCA_RandomSensor.cpp |   16 +-
 .../gameengine/GameLogic/SCA_RandomSensor.h   |    1 +
 .../GameLogic/SCA_XNORController.cpp          |  148 +
 .../gameengine/GameLogic/SCA_XNORController.h |   56 +
 .../GameLogic/SCA_XORController.cpp           |  148 +
 .../gameengine/GameLogic/SCA_XORController.h  |   56 +
 .../GamePlayer/common/CMakeLists.txt          |    1 +
 .../gameengine/GamePlayer/common/GPC_Canvas.h |   18 +-
 .../GamePlayer/common/GPC_PolygonMaterial.cpp |   30 +-
 .../GamePlayer/common/GPC_RenderTools.cpp     |   18 +-
 .../GamePlayer/common/GPC_RenderTools.h       |   17 +-
 source/gameengine/GamePlayer/common/Makefile  |    1 +
 .../gameengine/GamePlayer/common/SConscript   |    3 +-
 .../GamePlayer/ghost/CMakeLists.txt           |    1 +
 .../GamePlayer/ghost/GPG_Application.cpp      |   55 +-
 .../GamePlayer/ghost/GPG_Application.h        |    1 +
 .../gameengine/GamePlayer/ghost/GPG_ghost.cpp |    3 +-
 source/gameengine/GamePlayer/ghost/Makefile   |    1 +
 source/gameengine/GamePlayer/ghost/SConscript |    3 +-
 source/gameengine/Ketsji/BL_BlenderShader.cpp |  175 +
 source/gameengine/Ketsji/BL_BlenderShader.h   |   49 +
 source/gameengine/Ketsji/BL_Material.cpp      |    7 +-
 source/gameengine/Ketsji/BL_Material.h        |   10 +-
 source/gameengine/Ketsji/BL_Shader.cpp        |  306 +-
 source/gameengine/Ketsji/BL_Texture.cpp       |  161 +-
 source/gameengine/Ketsji/CMakeLists.txt       |    1 +
 .../KXNetwork/KX_NetworkMessageActuator.cpp   |   14 +-
 .../KXNetwork/KX_NetworkMessageSensor.cpp     |   10 +-
 .../KXNetwork/KX_NetworkMessageSensor.h       |    1 +
 .../gameengine/Ketsji/KX_BlenderMaterial.cpp  |  326 +-
 source/gameengine/Ketsji/KX_BlenderMaterial.h |   15 +-
 .../Ketsji/KX_BulletPhysicsController.cpp     |   30 +-
 .../Ketsji/KX_BulletPhysicsController.h       |    6 +-
 source/gameengine/Ketsji/KX_Camera.cpp        |    8 +-
 .../Ketsji/KX_ConstraintActuator.cpp          |  574 +-
 .../gameengine/Ketsji/KX_ConstraintActuator.h |   59 +-
 source/gameengine/Ketsji/KX_GameObject.cpp    |  571 +-
 source/gameengine/Ketsji/KX_GameObject.h      |  144 +-
 .../gameengine/Ketsji/KX_IPO_SGController.cpp |   87 +-
 .../gameengine/Ketsji/KX_IPO_SGController.h   |    7 +-
 .../gameengine/Ketsji/KX_IPhysicsController.h |    3 +-
 source/gameengine/Ketsji/KX_ISceneConverter.h |    3 +
 source/gameengine/Ketsji/KX_IpoActuator.cpp   |  177 +-
 source/gameengine/Ketsji/KX_IpoActuator.h     |   12 +-
 source/gameengine/Ketsji/KX_KetsjiEngine.cpp  |   64 +-
 source/gameengine/Ketsji/KX_KetsjiEngine.h    |   11 +
 source/gameengine/Ketsji/KX_Light.cpp         |   80 +-
 source/gameengine/Ketsji/KX_Light.h           |   16 +-
 source/gameengine/Ketsji/KX_MeshProxy.cpp     |   12 +
 .../gameengine/Ketsji/KX_MouseFocusSensor.cpp |   21 +-
 .../gameengine/Ketsji/KX_MouseFocusSensor.h   |    1 +
 source/gameengine/Ketsji/KX_NearSensor.cpp    |    9 +-
 .../gameengine/Ketsji/KX_ObjectActuator.cpp   |  340 +-
 source/gameengine/Ketsji/KX_ObjectActuator.h  |   47 +-
 .../Ketsji/KX_OdePhysicsController.cpp        |    2 +-
 .../Ketsji/KX_OdePhysicsController.h          |    2 +-
 .../gameengine/Ketsji/KX_ParentActuator.cpp   |    6 +
 .../Ketsji/KX_PhysicsObjectWrapper.cpp        |   12 +
 .../Ketsji/KX_PyConstraintBinding.cpp         |   63 +-
 source/gameengine/Ketsji/KX_PythonInit.cpp    |  131 +-
 source/gameengine/Ketsji/KX_PythonInit.h      |    1 -
 source/gameengine/Ketsji/KX_RadarSensor.cpp   |   10 +-
 source/gameengine/Ketsji/KX_RayCast.cpp       |    2 +-
 source/gameengine/Ketsji/KX_RaySensor.cpp     |   24 +-
 source/gameengine/Ketsji/KX_RaySensor.h       |    1 +
 .../Ketsji/KX_SCA_AddObjectActuator.cpp       |   39 +-
 .../Ketsji/KX_SCA_AddObjectActuator.h         |   10 +-
 .../Ketsji/KX_SCA_DynamicActuator.cpp         |  206 +
 .../Ketsji/KX_SCA_DynamicActuator.h           |   76 +
 .../Ketsji/KX_SG_NodeRelationships.h          |   15 +
 source/gameengine/Ketsji/KX_Scene.cpp         |  430 +-
 source/gameengine/Ketsji/KX_Scene.h           |   24 +-
 source/gameengine/Ketsji/KX_SoundActuator.cpp |    3 +-
 source/gameengine/Ketsji/KX_StateActuator.cpp |  207 +
 source/gameengine/Ketsji/KX_StateActuator.h   |   83 +
 .../Ketsji/KX_SumoPhysicsController.cpp       |    2 +-
 .../Ketsji/KX_SumoPhysicsController.h         |    4 +-
 .../Ketsji/KX_TouchEventManager.cpp           |   16 +-
 source/gameengine/Ketsji/KX_TouchSensor.cpp   |   26 +-
 source/gameengine/Ketsji/KX_TouchSensor.h     |    1 +
 .../gameengine/Ketsji/KX_TrackToActuator.cpp  |   35 +-
 .../gameengine/Ketsji/KX_VehicleWrapper.cpp   |   33 +-
 source/gameengine/Ketsji/Makefile             |    1 +
 source/gameengine/Ketsji/SConscript           |    2 +-
 source/gameengine/PyDoc/BL_ActionActuator.py  |   15 +
 source/gameengine/PyDoc/KX_GameObject.py      |   69 +-
 .../gameengine/PyDoc/SCA_PythonController.py  |    8 +
 source/gameengine/Rasterizer/CMakeLists.txt   |    3 +
 source/gameengine/Rasterizer/Makefile         |    4 +
 .../Rasterizer/RAS_2DFilterManager.cpp        |  277 +-
 .../Rasterizer/RAS_2DFilterManager.h          |   32 +-
 .../Rasterizer/RAS_BucketManager.cpp          |    2 +-
 source/gameengine/Rasterizer/RAS_CameraData.h |    4 +-
 source/gameengine/Rasterizer/RAS_Deformer.h   |    2 +-
 .../Rasterizer/RAS_IPolygonMaterial.cpp       |   18 +-
 .../Rasterizer/RAS_IPolygonMaterial.h         |    4 +-
 .../gameengine/Rasterizer/RAS_IRasterizer.h   |   88 +-
 .../gameengine/Rasterizer/RAS_IRenderTools.h  |    2 +-
 .../Rasterizer/RAS_MaterialBucket.cpp         |   88 +-
 .../Rasterizer/RAS_MaterialBucket.h           |   10 +-
 .../gameengine/Rasterizer/RAS_MeshObject.cpp  |   83 +-
 source/gameengine/Rasterizer/RAS_MeshObject.h |   12 +-
 .../RAS_OpenGLRasterizer/ARB_multitexture.h   |  150 -
 .../RAS_OpenGLRasterizer/CMakeLists.txt       |    1 +
 .../EXT_separate_specular_color.h             |   12 -
 .../Rasterizer/RAS_OpenGLRasterizer/Makefile  |    1 +
 .../RAS_GLExtensionManager.cpp                |  674 +-
 .../RAS_GLExtensionManager.h                  |  507 +-
 .../RAS_ListRasterizer.cpp                    |   44 +-
 .../RAS_OpenGLRasterizer/RAS_ListRasterizer.h |    8 +-
 .../RAS_OpenGLRasterizer.cpp                  | 1124 +-
 .../RAS_OpenGLRasterizer.h                    |   47 +-
 .../RAS_VAOpenGLRasterizer.cpp                |  337 +-
 .../RAS_VAOpenGLRasterizer.h                  |   15 +-
 .../RAS_OpenGLRasterizer/SConscript           |    6 +-
 .../RAS_OpenGLRasterizer/mkglext.py           |  627 --
 source/gameengine/Rasterizer/RAS_TexVert.cpp  |   42 +-
 source/gameengine/Rasterizer/RAS_TexVert.h    |   24 +-
 source/gameengine/Rasterizer/SConscript       |    3 +-
 source/gameengine/SceneGraph/SG_Controller.h  |    4 +-
 source/gameengine/SceneGraph/SG_IObject.cpp   |    6 +-
 source/gameengine/SceneGraph/SG_IObject.h     |    2 +-
 source/gameengine/SceneGraph/SG_Node.cpp      |   40 +-
 source/gameengine/SceneGraph/SG_Node.h        |   10 +-
 .../gameengine/SceneGraph/SG_ParentRelation.h |   10 +
 source/gameengine/SceneGraph/SG_Spatial.cpp   |    7 +
 source/gameengine/SceneGraph/SG_Spatial.h     |    4 +
 source/kernel/gen_system/GEN_HashedPtr.h      |    1 +
 source/kernel/gen_system/GEN_Map.h            |   18 +
 source/nan_definitions.mk                     |    1 +
 tools/Blender.py                              |   27 +-
 401 files changed, 41462 insertions(+), 9816 deletions(-)
 create mode 100644 extern/glew/CMakeLists.txt
 create mode 100644 extern/glew/README.txt
 create mode 100644 extern/glew/SConscript
 create mode 100644 extern/glew/include/GL/glew.h
 create mode 100644 extern/glew/include/GL/glxew.h
 create mode 100644 extern/glew/include/GL/wglew.h
 create mode 100644 extern/glew/make/msvc_7_0/glew_vc7.vcproj
 create mode 100644 extern/glew/src/Makefile
 create mode 100644 extern/glew/src/glew.c
 create mode 100644 extern/libopenjpeg/patches/osx.patch
 create mode 100644 release/scripts/animation_bake_constraints.py
 create mode 100644 release/scripts/c3d_import.py
 create mode 100644 source/blender/blenlib/BLI_mempool.h
 create mode 100644 source/blender/blenlib/intern/BLI_mempool.c
 create mode 100644 source/blender/render/intern/include/sunsky.h
 create mode 100644 source/blender/render/intern/source/sunsky.c
 delete mode 100644 source/gameengine/BlenderRoutines/mac_compat_glext.h
 create mode 100644 source/gameengine/Converter/BL_ShapeActionActuator.cpp
 create mode 100644 source/gameengine/Converter/BL_ShapeActionActuator.h
 create mode 100644 source/gameengine/Converter/BL_ShapeDeformer.cpp
 create mode 100644 source/gameengine/Converter/BL_ShapeDeformer.h
 create mode 100644 source/gameengine/GameLogic/SCA_ActuatorEventManager.cpp
 create mode 100644 source/gameengine/GameLogic/SCA_ActuatorEventManager.h
 create mode 100644 source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
 create mode 100644 source/gameengine/GameLogic/SCA_ActuatorSensor.h
 create mode 100644 source/gameengine/GameLogic/SCA_NANDController.cpp
 create mode 100644 source/gameengine/GameLogic/SCA_NANDController.h
 create mode 100644 source/gameengine/GameLogic/SCA_NORController.cpp
 create mode 100644 source/gameengine/GameLogic/SCA_NORController.h
 create mode 100644 source/gameengine/GameLogic/SCA_XNORController.cpp
 create mode 100644 source/gameengine/GameLogic/SCA_XNORController.h
 create mode 100644 source/gameengine/GameLogic/SCA_XORController.cpp
 create mode 100644 source/gameengine/GameLogic/SCA_XORController.h
 create mode 100644 source/gameengine/Ketsji/BL_BlenderShader.cpp
 create mode 100644 source/gameengine/Ketsji/BL_BlenderShader.h
 create mode 100644 source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
 create mode 100644 source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
 create mode 100644 source/gameengine/Ketsji/KX_StateActuator.cpp
 create mode 100644 source/gameengine/Ketsji/KX_StateActuator.h
 delete mode 100644 source/gameengine/Rasterizer/RAS_OpenGLRasterizer/ARB_multitexture.h
 delete mode 100644 source/gameengine/Rasterizer/RAS_OpenGLRasterizer/EXT_separate_specular_color.h
 delete mode 100644 source/gameengine/Rasterizer/RAS_OpenGLRasterizer/mkglext.py

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b58fe945663..5a23e77d9f8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -197,10 +197,17 @@ IF(UNIX)
 ENDIF(UNIX)
 
 IF(WIN32)
-  INCLUDE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake)
 
+  INCLUDE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake)
+  
   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)
+
   SET(PYTHON ${LIBDIR}/python)
   SET(PYTHON_VERSION 2.5)
   SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
@@ -214,12 +221,20 @@ IF(WIN32)
   SET(OPENAL_LIB openal_static)
   SET(OPENAL_LIBPATH ${OPENAL}/lib)
 
-  SET(PNG_LIB libpng_st)
+  IF(CMAKE_CL_64)
+  	SET(PNG_LIB libpng)
+  ELSE(CMAKE_CL_64)
+  	SET(PNG_LIB libpng_st)
+  ENDIF(CMAKE_CL_64)
   SET(JPEG_LIB libjpeg)
 
   SET(ZLIB ${LIBDIR}/zlib)
   SET(ZLIB_INC ${ZLIB}/include)
-  SET(ZLIB_LIB libz)
+  IF(CMAKE_CL_64)
+  	SET(ZLIB_LIB zlib)
+  ELSE(CMAKE_CL_64)
+  	SET(ZLIB_LIB libz)
+  ENDIF(CMAKE_CL_64)
   SET(ZLIB_LIBPATH ${ZLIB}/lib)
   
   SET(PTHREADS ${LIBDIR}/pthreads)
@@ -302,7 +317,11 @@ IF(WIN32)
   
   SET(WINTAB_INC ${LIBDIR}/wintab/include) 
 
-  SET(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib")
+  IF(CMAKE_CL_64)
+  SET(PLATFORM_LINKFLAGS "/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 ")
 ENDIF(WIN32)
 
diff --git a/README b/README
index d123a90ba48..1a7964f954e 100644
--- a/README
+++ b/README
@@ -24,22 +24,22 @@ dir to one of these locations (your home directory being recommended).
 -------------------------------------Links--------------------------------------
 
 Getting Involved:
-http://www.blender.org/docs/get_involved.html
+http://www.blender.org/community/get-involved
 
 Community:
-http://www.blender3d.org/Community/
+http://www.blender.org/Community
 
 Main blender development site:
-http://www.blender.org/
+http://www.blender.org
 
 The Blender project homepage:
-http://projects.blender.org/projects/bf-blender/
+http://projects.blender.org/projects/bf-blender
 
 Documentation:
-http://www.blender.org/modules.php?op=modload&name=documentation&file=index
+http://www.blender.org/education-help
 
 Bug tracker:
-http://projects.blender.org/tracker/?atid=125&group_id=9&func=browse
+http://www.blender.org/development/report-a-bug
 
 Feature request tracker:
-http://projects.blender.org/tracker/?atid=128&group_id=9&func=browse
+http://wiki.blender.org/index.php/Requests
diff --git a/blenderplayer/CMakeLists.txt b/blenderplayer/CMakeLists.txt
index 62b64ff04bb..d90639562d2 100644
--- a/blenderplayer/CMakeLists.txt
+++ b/blenderplayer/CMakeLists.txt
@@ -108,6 +108,7 @@ IF(UNIX)
     blenkernel_blc
     bf_quicktime
     extern_binreloc
+	extern_glew
   ) 
 
   FOREACH(SORTLIB ${BLENDER_SORTED_LIBS})
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index d092e0d494d..ee5cab31e09 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -43,3 +43,6 @@ ENDIF(WITH_VERSE)
 IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
   SUBDIRS(binreloc)
 ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+
+SUBDIRS(glew)
+
diff --git a/extern/Makefile b/extern/Makefile
index fd4573cc8b1..26ee25b608f 100644
--- a/extern/Makefile
+++ b/extern/Makefile
@@ -30,7 +30,7 @@ include nan_definitions.mk
 
 SOURCEDIR = extern
 DIR = $(OCGDIR)/extern
-DIRS = qhull/src solid 
+DIRS = qhull/src solid glew/src
 
 ifeq ($(WITH_FREETYPE2), true)
     DIRS += bFTGL/src
diff --git a/extern/SConscript b/extern/SConscript
index c94b6573eb9..6612d38f4cf 100644
--- a/extern/SConscript
+++ b/extern/SConscript
@@ -2,6 +2,8 @@
 
 Import('env')
 
+SConscript(['glew/SConscript'])
+
 if env['WITH_BF_GAMEENGINE']:
     SConscript(['qhull/SConscript',
             'solid/SConscript'])
diff --git a/extern/glew/CMakeLists.txt b/extern/glew/CMakeLists.txt
new file mode 100644
index 00000000000..53ef014927c
--- /dev/null
+++ b/extern/glew/CMakeLists.txt
@@ -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) 2006, Blender Foundation
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): Jacques Beaurain.
+#
+# ***** END GPL LICENSE BLOCK *****
+
+SET(INC include src)
+
+SET(SRC
+  src/glew.c
+)
+
+BLENDERLIB(extern_glew "${SRC}" "${INC}")
diff --git a/extern/glew/README.txt b/extern/glew/README.txt
new file mode 100644
index 00000000000..1b19c53523f
--- /dev/null
+++ b/extern/glew/README.txt
@@ -0,0 +1,18 @@
+See doc/index.html for more information.
+
+If you downloaded the tarball from the GLEW website, you just need to:
+
+    Unix:
+
+        make
+
+    Windows:
+
+        use the project file in build/vc6/
+
+If you wish to build GLEW from scratch (update the extension data from
+the net or add your own extension information), you need a Unix
+environment (including wget, perl, and GNU make).  The extension data
+is regenerated from the top level source directory with:
+
+        make extensions
diff --git a/extern/glew/SConscript b/extern/glew/SConscript
new file mode 100644
index 00000000000..32b3b478113
--- /dev/null
+++ b/extern/glew/SConscript
@@ -0,0 +1,12 @@
+#!/usr/bin/python
+import sys
+import os
+
+Import('env')
+
+sources = ['src/glew.c']
+
+defs = ''
+incs = 'include'
+
+env.BlenderLib ( 'extern_glew', sources, Split(incs), Split(defs), libtype=['intern', 'player'], priority=[25, 50])
diff --git a/extern/glew/include/GL/glew.h b/extern/glew/include/GL/glew.h
new file mode 100644
index 00000000000..fd3fe10b938
--- /dev/null
+++ b/extern/glew/include/GL/glew.h
@@ -0,0 +1,9797 @@
+/*
+** The OpenGL Extension Wrangler Library
+** Copyright (C) 2002-2006, Milan Ikits <milan ikits[]ieee org>
+** Copyright (C) 2002-2006, Marcelo E. Magallon <mmagallo[]debian org>
+** Copyright (C) 2002, Lev Povalahev
+** All rights reserved.
+** 
+** Redistribution and use in source and binary forms, with or without 
+** modification, are permitted provided that the following conditions are met:
+** 
+** * Redistributions of source code must retain the above copyright notice, 
+**   this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright notice, 
+**   this list of conditions and the following disclaimer in the documentation 
+**   and/or other materials provided with the distribution.
+** * The name of the author may be used to endorse or promote products 
+**   derived from this software without specific prior written permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+** ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
+** LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+** CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+** SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+** INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+** CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+** ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+** THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/*
+** License Applicability. Except to the extent portions of this file are
+** made subject to an alternative license as permitted in the SGI Free
+** Software License B, Version 1.1 (the "License"), the contents of this
+** file are subject only to the provisions of the License. You may not use
+** this file except in compliance with the License. You may obtain a copy
+** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
+** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** 
+** http://oss.sgi.com/projects/FreeB
+** 
+** Note that, as provided in the License, the Software is distributed on an
+** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
+** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
+** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
+** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+** 
+** Original Code. The Original Code is: OpenGL Sample Implementation,
+** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
+** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
+** Copyright in any portions created by third parties is as indicated
+** elsewhere herein. All Rights Reserved.
+** 
+** Additional Notice Provisions: This software was created using the
+** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has
+** not been independently verified as being compliant with the OpenGL(R)
+** version 1.2.1 Specification.
+*/
+
+/* added this here for blender, should be moved elsewhere */
+#define GLEW_STATIC
+
+#ifndef __glew_h__
+#define __glew_h__
+#define __GLEW_H__
+
+#if defined(__gl_h_) || defined(__GL_H__)
+#error gl.h included before glew.h
+#endif
+#if defined(__glext_h_) || defined(__GLEXT_H_)
+#error glext.h included before glew.h
+#endif
+#if defined(__gl_ATI_h_)
+#error glATI.h included before glew.h
+#endif
+
+#define __gl_h_
+#define __GL_H__
+#define __glext_h_
+#define __GLEXT_H_
+#define __gl_ATI_h_
+
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW32__)
+
+/*
+ * GLEW does not include <windows.h> to avoid name space pollution.
+ * GL needs GLAPI and GLAPIENTRY, GLU needs APIENTRY, CALLBACK, and wchar_t
+ * defined properly.
+ */
+/* <windef.h> */
+#ifndef APIENTRY
+#define GLEW_APIENTRY_DEFINED
+#  if defined(__CYGWIN__) || defined(__MINGW32__)
+#    define APIENTRY __stdcall
+#  elif (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED) || defined(__BORLANDC__)
+#    define APIENTRY __stdcall
+#  else
+#    define APIENTRY
+#  endif
+#endif
+#ifndef GLAPI
+#  if defined(__CYGWIN__) || defined(__MINGW32__)
+#    define GLAPI extern
+#  endif
+#endif
+/* <winnt.h> */
+#ifndef CALLBACK
+#define GLEW_CALLBACK_DEFINED
+#  if defined(__CYGWIN__) || defined(__MINGW32__)
+#    define CALLBACK __attribute__ ((__stdcall__))
+#  elif (defined(_M_MRX000) || defined(_M_IX86) || defined(_M_ALPHA) || defined(_M_PPC)) && !defined(MIDL_PASS)
+#    define CALLBACK __stdcall
+#  else
+#    define CALLBACK
+#  endif
+#endif
+/* <wingdi.h> and <winnt.h> */
+#ifndef WINGDIAPI
+#define GLEW_WINGDIAPI_DEFINED
+#define WINGDIAPI __declspec(dllimport)
+#endif
+/* <ctype.h> */
+#if (defined(_MSC_VER) || defined(__BORLANDC__)) && !defined(_WCHAR_T_DEFINED)
+typedef unsigned short wchar_t;
+#  define _WCHAR_T_DEFINED
+#endif
+/* <stddef.h> */
+#if !defined(_W64)
+#  if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 1300
+#    define _W64 __w64
+#  else
+#    define _W64
+#  endif
+#endif
+#if !defined(_PTRDIFF_T_DEFINED) && !defined(_PTRDIFF_T_)
+#  ifdef _WIN64
+typedef __int64 ptrdiff_t;
+#  else
+typedef _W64 int ptrdiff_t;
+#  endif
+#  define _PTRDIFF_T_DEFINED
+#  define _PTRDIFF_T_
+#endif
+
+#ifndef GLAPI
+#  if defined(__CYGWIN__) || defined(__MINGW32__)
+#    define GLAPI extern
+#  else
+#    define GLAPI WINGDIAPI
+#  endif
+#endif
+
+#ifndef GLAPIENTRY
+#define GLAPIENTRY APIENTRY
+#endif
+
+/*
+ * GLEW_STATIC needs to be set when using the static version.
+ * GLEW_BUILD is set when building the DLL version.
+ */
+#ifdef GLEW_STATIC
+#  define GLEWAPI extern
+#else
+#  ifdef GLEW_BUILD
+#    define GLEWAPI extern __declspec(dllexport)
+#  else
+#    define GLEWAPI extern __declspec(dllimport)
+#  endif
+#endif
+
+#else /* _UNIX */
+
+/*
+ * Needed for ptrdiff_t in turn needed by VBO.  This is defined by ISO
+ * C.  On my system, this amounts to _3 lines_ of included code, all of
+ * them pretty much harmless.  If you know of a way of detecting 32 vs
+ * 64 _targets_ at compile time you are free to replace this with
+ * something that's portable.  For now, _this_ is the portable solution.
+ * (mem, 2004-01-04)
+ */
+
+#include <stddef.h>
+
+#define GLEW_APIENTRY_DEFINED
+#define APIENTRY
+#define GLEWAPI extern
+
+/* <glu.h> */
+#ifndef GLAPI
+#define GLAPI extern
+#endif
+#ifndef GLAPIENTRY
+#define GLAPIENTRY
+#endif
+
+#endif /* _WIN32 */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* ----------------------------- GL_VERSION_1_1 ---------------------------- */
+
+#ifndef GL_VERSION_1_1
+#define GL_VERSION_1_1 1
+
+#if defined(__APPLE__)
+typedef unsigned long GLenum;
+typedef unsigned long GLbitfield;
+typedef unsigned long GLuint;
+typedef long GLint;
+typedef long GLsizei;
+#else
+typedef unsigned int GLenum;
+typedef unsigned int GLbitfield;
+typedef unsigned int GLuint;
+typedef int GLint;
+typedef int GLsizei;
+#endif
+typedef unsigned char GLboolean;
+typedef signed char GLbyte;
+typedef short GLshort;
+typedef unsigned char GLubyte;
+typedef unsigned short GLushort;
+typedef float GLfloat;
+typedef float GLclampf;
+typedef double GLdouble;
+typedef double GLclampd;
+typedef void GLvoid;
+
+#define GL_ACCUM 0x0100
+#define GL_LOAD 0x0101
+#define GL_RETURN 0x0102
+#define GL_MULT 0x0103
+#define GL_ADD 0x0104
+#define GL_NEVER 0x0200
+#define GL_LESS 0x0201
+#define GL_EQUAL 0x0202
+#define GL_LEQUAL 0x0203
+#define GL_GREATER 0x0204
+#define GL_NOTEQUAL 0x0205
+#define GL_GEQUAL 0x0206
+#define GL_ALWAYS 0x0207
+#define GL_CURRENT_BIT 0x00000001
+#define GL_POINT_BIT 0x00000002
+#define GL_LINE_BIT 0x00000004
+#define GL_POLYGON_BIT 0x00000008
+#define GL_POLYGON_STIPPLE_BIT 0x00000010
+#define GL_PIXEL_MODE_BIT 0x00000020
+#define GL_LIGHTING_BIT 0x00000040
+#define GL_FOG_BIT 0x00000080
+#define GL_DEPTH_BUFFER_BIT 0x00000100
+#define GL_ACCUM_BUFFER_BIT 0x00000200
+#define GL_STENCIL_BUFFER_BIT 0x00000400
+#define GL_VIEWPORT_BIT 0x00000800
+#define GL_TRANSFORM_BIT 0x00001000
+#define GL_ENABLE_BIT 0x00002000
+#define GL_COLOR_BUFFER_BIT 0x00004000
+#define GL_HINT_BIT 0x00008000
+#define GL_EVAL_BIT 0x00010000
+#define GL_LIST_BIT 0x00020000
+#define GL_TEXTURE_BIT 0x00040000
+#define GL_SCISSOR_BIT 0x00080000
+#define GL_ALL_ATTRIB_BITS 0x000fffff
+#define GL_POINTS 0x0000
+#define GL_LINES 0x0001
+#define GL_LINE_LOOP 0x0002
+#define GL_LINE_STRIP 0x0003
+#define GL_TRIANGLES 0x0004
+#define GL_TRIANGLE_STRIP 0x0005
+#define GL_TRIANGLE_FAN 0x0006
+#define GL_QUADS 0x0007
+#define GL_QUAD_STRIP 0x0008
+#define GL_POLYGON 0x0009
+#define GL_ZERO 0
+#define GL_ONE 1
+#define GL_SRC_COLOR 0x0300
+#define GL_ONE_MINUS_SRC_COLOR 0x0301
+#define GL_SRC_ALPHA 0x0302
+#define GL_ONE_MINUS_SRC_ALPHA 0x0303
+#define GL_DST_ALPHA 0x0304
+#define GL_ONE_MINUS_DST_ALPHA 0x0305
+#define GL_DST_COLOR 0x0306
+#define GL_ONE_MINUS_DST_COLOR 0x0307
+#define GL_SRC_ALPHA_SATURATE 0x0308
+#define GL_TRUE 1
+#define GL_FALSE 0
+#define GL_CLIP_PLANE0 0x3000
+#define GL_CLIP_PLANE1 0x3001
+#define GL_CLIP_PLANE2 0x3002
+#define GL_CLIP_PLANE3 0x3003
+#define GL_CLIP_PLANE4 0x3004
+#define GL_CLIP_PLANE5 0x3005
+#define GL_BYTE 0x1400
+#define GL_UNSIGNED_BYTE 0x1401
+#define GL_SHORT 0x1402
+#define GL_UNSIGNED_SHORT 0x1403
+#define GL_INT 0x1404
+#define GL_UNSIGNED_INT 0x1405
+#define GL_FLOAT 0x1406
+#define GL_2_BYTES 0x1407
+#define GL_3_BYTES 0x1408
+#define GL_4_BYTES 0x1409
+#define GL_DOUBLE 0x140A
+#define GL_NONE 0
+#define GL_FRONT_LEFT 0x0400
+#define GL_FRONT_RIGHT 0x0401
+#define GL_BACK_LEFT 0x0402
+#define GL_BACK_RIGHT 0x0403
+#define GL_FRONT 0x0404
+#define GL_BACK 0x0405
+#define GL_LEFT 0x0406
+#define GL_RIGHT 0x0407
+#define GL_FRONT_AND_BACK 0x0408
+#define GL_AUX0 0x0409
+#define GL_AUX1 0x040A
+#define GL_AUX2 0x040B
+#define GL_AUX3 0x040C
+#define GL_NO_ERROR 0
+#define GL_INVALID_ENUM 0x0500
+#define GL_INVALID_VALUE 0x0501
+#define GL_INVALID_OPERATION 0x0502
+#define GL_STACK_OVERFLOW 0x0503
+#define GL_STACK_UNDERFLOW 0x0504
+#define GL_OUT_OF_MEMORY 0x0505
+#define GL_2D 0x0600
+#define GL_3D 0x0601
+#define GL_3D_COLOR 0x0602
+#define GL_3D_COLOR_TEXTURE 0x0603
+#define GL_4D_COLOR_TEXTURE 0x0604
+#define GL_PASS_THROUGH_TOKEN 0x0700
+#define GL_POINT_TOKEN 0x0701
+#define GL_LINE_TOKEN 0x0702
+#define GL_POLYGON_TOKEN 0x0703
+#define GL_BITMAP_TOKEN 0x0704
+#define GL_DRAW_PIXEL_TOKEN 0x0705
+#define GL_COPY_PIXEL_TOKEN 0x0706
+#define GL_LINE_RESET_TOKEN 0x0707
+#define GL_EXP 0x0800
+#define GL_EXP2 0x0801
+#define GL_CW 0x0900
+#define GL_CCW 0x0901
+#define GL_COEFF 0x0A00
+#define GL_ORDER 0x0A01
+#define GL_DOMAIN 0x0A02
+#define GL_CURRENT_COLOR 0x0B00
+#define GL_CURRENT_INDEX 0x0B01
+#define GL_CURRENT_NORMAL 0x0B02
+#define GL_CURRENT_TEXTURE_COORDS 0x0B03
+#define GL_CURRENT_RASTER_COLOR 0x0B04
+#define GL_CURRENT_RASTER_INDEX 0x0B05
+#define GL_CURRENT_RASTER_TEXTURE_COORDS 0x0B06
+#define GL_CURRENT_RASTER_POSITION 0x0B07
+#define GL_CURRENT_RASTER_POSITION_VALID 0x0B08
+#define GL_CURRENT_RASTER_DISTANCE 0x0B09
+#define GL_POINT_SMOOTH 0x0B10
+#define GL_POINT_SIZE 0x0B11
+#define GL_POINT_SIZE_RANGE 0x0B12
+#define GL_POINT_SIZE_GRANULARITY 0x0B13
+#define GL_LINE_SMOOTH 0x0B20
+#define GL_LINE_WIDTH 0x0B21
+#define GL_LINE_WIDTH_RANGE 0x0B22
+#define GL_LINE_WIDTH_GRANULARITY 0x0B23
+#define GL_LINE_STIPPLE 0x0B24
+#define GL_LINE_STIPPLE_PATTERN 0x0B25
+#define GL_LINE_STIPPLE_REPEAT 0x0B26
+#define GL_LIST_MODE 0x0B30
+#define GL_MAX_LIST_NESTING 0x0B31
+#define GL_LIST_BASE 0x0B32
+#define GL_LIST_INDEX 0x0B33
+#define GL_POLYGON_MODE 0x0B40
+#define GL_POLYGON_SMOOTH 0x0B41
+#define GL_POLYGON_STIPPLE 0x0B42
+#define GL_EDGE_FLAG 0x0B43
+#define GL_CULL_FACE 0x0B44
+#define GL_CULL_FACE_MODE 0x0B45
+#define GL_FRONT_FACE 0x0B46
+#define GL_LIGHTING 0x0B50
+#define GL_LIGHT_MODEL_LOCAL_VIEWER 0x0B51
+#define GL_LIGHT_MODEL_TWO_SIDE 0x0B52
+#define GL_LIGHT_MODEL_AMBIENT 0x0B53
+#define GL_SHADE_MODEL 0x0B54
+#define GL_COLOR_MATERIAL_FACE 0x0B55
+#define GL_COLOR_MATERIAL_PARAMETER 0x0B56
+#define GL_COLOR_MATERIAL 0x0B57
+#define GL_FOG 0x0B60
+#define GL_FOG_INDEX 0x0B61
+#define GL_FOG_DENSITY 0x0B62
+#define GL_FOG_START 0x0B63
+#define GL_FOG_END 0x0B64
+#define GL_FOG_MODE 0x0B65
+#define GL_FOG_COLOR 0x0B66
+#define GL_DEPTH_RANGE 0x0B70
+#define GL_DEPTH_TEST 0x0B71
+#define GL_DEPTH_WRITEMASK 0x0B72
+#define GL_DEPTH_CLEAR_VALUE 0x0B73
+#define GL_DEPTH_FUNC 0x0B74
+#define GL_ACCUM_CLEAR_VALUE 0x0B80
+#define GL_STENCIL_TEST 0x0B90
+#define GL_STENCIL_CLEAR_VALUE 0x0B91
+#define GL_STENCIL_FUNC 0x0B92
+#define GL_STENCIL_VALUE_MASK 0x0B93
+#define GL_STENCIL_FAIL 0x0B94
+#define GL_STENCIL_PASS_DEPTH_FAIL 0x0B95
+#define GL_STENCIL_PASS_DEPTH_PASS 0x0B96
+#define GL_STENCIL_REF 0x0B97
+#define GL_STENCIL_WRITEMASK 0x0B98
+#define GL_MATRIX_MODE 0x0BA0
+#define GL_NORMALIZE 0x0BA1
+#define GL_VIEWPORT 0x0BA2
+#define GL_MODELVIEW_STACK_DEPTH 0x0BA3
+#define GL_PROJECTION_STACK_DEPTH 0x0BA4
+#define GL_TEXTURE_STACK_DEPTH 0x0BA5
+#define GL_MODELVIEW_MATRIX 0x0BA6
+#define GL_PROJECTION_MATRIX 0x0BA7
+#define GL_TEXTURE_MATRIX 0x0BA8
+#define GL_ATTRIB_STACK_DEPTH 0x0BB0
+#define GL_CLIENT_ATTRIB_STACK_DEPTH 0x0BB1
+#define GL_ALPHA_TEST 0x0BC0
+#define GL_ALPHA_TEST_FUNC 0x0BC1
+#define GL_ALPHA_TEST_REF 0x0BC2
+#define GL_DITHER 0x0BD0
+#define GL_BLEND_DST 0x0BE0
+#define GL_BLEND_SRC 0x0BE1
+#define GL_BLEND 0x0BE2
+#define GL_LOGIC_OP_MODE 0x0BF0
+#define GL_INDEX_LOGIC_OP 0x0BF1
+#define GL_COLOR_LOGIC_OP 0x0BF2
+#define GL_AUX_BUFFERS 0x0C00
+#define GL_DRAW_BUFFER 0x0C01
+#define GL_READ_BUFFER 0x0C02
+#define GL_SCISSOR_BOX 0x0C10
+#define GL_SCISSOR_TEST 0x0C11
+#define GL_INDEX_CLEAR_VALUE 0x0C20
+#define GL_INDEX_WRITEMASK 0x0C21
+#define GL_COLOR_CLEAR_VALUE 0x0C22
+#define GL_COLOR_WRITEMASK 0x0C23
+#define GL_INDEX_MODE 0x0C30
+#define GL_RGBA_MODE 0x0C31
+#define GL_DOUBLEBUFFER 0x0C32
+#define GL_STEREO 0x0C33
+#define GL_RENDER_MODE 0x0C40
+#define GL_PERSPECTIVE_CORRECTION_HINT 0x0C50
+#define GL_POINT_SMOOTH_HINT 0x0C51
+#define GL_LINE_SMOOTH_HINT 0x0C52
+#define GL_POLYGON_SMOOTH_HINT 0x0C53
+#define GL_FOG_HINT 0x0C54
+#define GL_TEXTURE_GEN_S 0x0C60
+#define GL_TEXTURE_GEN_T 0x0C61
+#define GL_TEXTURE_GEN_R 0x0C62
+#define GL_TEXTURE_GEN_Q 0x0C63
+#define GL_PIXEL_MAP_I_TO_I 0x0C70
+#define GL_PIXEL_MAP_S_TO_S 0x0C71
+#define GL_PIXEL_MAP_I_TO_R 0x0C72
+#define GL_PIXEL_MAP_I_TO_G 0x0C73
+#define GL_PIXEL_MAP_I_TO_B 0x0C74
+#define GL_PIXEL_MAP_I_TO_A 0x0C75
+#define GL_PIXEL_MAP_R_TO_R 0x0C76
+#define GL_PIXEL_MAP_G_TO_G 0x0C77
+#define GL_PIXEL_MAP_B_TO_B 0x0C78
+#define GL_PIXEL_MAP_A_TO_A 0x0C79
+#define GL_PIXEL_MAP_I_TO_I_SIZE 0x0CB0
+#define GL_PIXEL_MAP_S_TO_S_SIZE 0x0CB1
+#define GL_PIXEL_MAP_I_TO_R_SIZE 0x0CB2
+#define GL_PIXEL_MAP_I_TO_G_SIZE 0x0CB3
+#define GL_PIXEL_MAP_I_TO_B_SIZE 0x0CB4
+#define GL_PIXEL_MAP_I_TO_A_SIZE 0x0CB5
+#define GL_PIXEL_MAP_R_TO_R_SIZE 0x0CB6
+#define GL_PIXEL_MAP_G_TO_G_SIZE 0x0CB7
+#define GL_PIXEL_MAP_B_TO_B_SIZE 0x0CB8
+#define GL_PIXEL_MAP_A_TO_A_SIZE 0x0CB9
+#define GL_UNPACK_SWAP_BYTES 0x0CF0
+#define GL_UNPACK_LSB_FIRST 0x0CF1
+#define GL_UNPACK_ROW_LENGTH 0x0CF2
+#define GL_UNPACK_SKIP_ROWS 0x0CF3
+#define GL_UNPACK_SKIP_PIXELS 0x0CF4
+#define GL_UNPACK_ALIGNMENT 0x0CF5
+#define GL_PACK_SWAP_BYTES 0x0D00
+#define GL_PACK_LSB_FIRST 0x0D01
+#define GL_PACK_ROW_LENGTH 0x0D02
+#define GL_PACK_SKIP_ROWS 0x0D03
+#define GL_PACK_SKIP_PIXELS 0x0D04
+#define GL_PACK_ALIGNMENT 0x0D05
+#define GL_MAP_COLOR 0x0D10
+#define GL_MAP_STENCIL 0x0D11
+#define GL_INDEX_SHIFT 0x0D12
+#define GL_INDEX_OFFSET 0x0D13
+#define GL_RED_SCALE 0x0D14
+#define GL_RED_BIAS 0x0D15
+#define GL_ZOOM_X 0x0D16
+#define GL_ZOOM_Y 0x0D17
+#define GL_GREEN_SCALE 0x0D18
+#define GL_GREEN_BIAS 0x0D19
+#define GL_BLUE_SCALE 0x0D1A
+#define GL_BLUE_BIAS 0x0D1B
+#define GL_ALPHA_SCALE 0x0D1C
+#define GL_ALPHA_BIAS 0x0D1D
+#define GL_DEPTH_SCALE 0x0D1E
+#define GL_DEPTH_BIAS 0x0D1F
+#define GL_MAX_EVAL_ORDER 0x0D30
+#define GL_MAX_LIGHTS 0x0D31
+#define GL_MAX_CLIP_PLANES 0x0D32
+#define GL_MAX_TEXTURE_SIZE 0x0D33
+#define GL_MAX_PIXEL_MAP_TABLE 0x0D34
+#define GL_MAX_ATTRIB_STACK_DEPTH 0x0D35
+#define GL_MAX_MODELVIEW_STACK_DEPTH 0x0D36
+#define GL_MAX_NAME_STACK_DEPTH 0x0D37
+#define GL_MAX_PROJECTION_STACK_DEPTH 0x0D38
+#define GL_MAX_TEXTURE_STACK_DEPTH 0x0D39
+#define GL_MAX_VIEWPORT_DIMS 0x0D3A
+#define GL_MAX_CLIENT_ATTRIB_STACK_DEPTH 0x0D3B
+#define GL_SUBPIXEL_BITS 0x0D50
+#define GL_INDEX_BITS 0x0D51
+#define GL_RED_BITS 0x0D52
+#define GL_GREEN_BITS 0x0D53
+#define GL_BLUE_BITS 0x0D54
+#define GL_ALPHA_BITS 0x0D55
+#define GL_DEPTH_BITS 0x0D56
+#define GL_STENCIL_BITS 0x0D57
+#define GL_ACCUM_RED_BITS 0x0D58
+#define GL_ACCUM_GREEN_BITS 0x0D59
+#define GL_ACCUM_BLUE_BITS 0x0D5A
+#define GL_ACCUM_ALPHA_BITS 0x0D5B
+#define GL_NAME_STACK_DEPTH 0x0D70
+#define GL_AUTO_NORMAL 0x0D80
+#define GL_MAP1_COLOR_4 0x0D90
+#define GL_MAP1_INDEX 0x0D91
+#define GL_MAP1_NORMAL 0x0D92
+#define GL_MAP1_TEXTURE_COORD_1 0x0D93
+#define GL_MAP1_TEXTURE_COORD_2 0x0D94
+#define GL_MAP1_TEXTURE_COORD_3 0x0D95
+#define GL_MAP1_TEXTURE_COORD_4 0x0D96
+#define GL_MAP1_VERTEX_3 0x0D97
+#define GL_MAP1_VERTEX_4 0x0D98
+#define GL_MAP2_COLOR_4 0x0DB0
+#define GL_MAP2_INDEX 0x0DB1
+#define GL_MAP2_NORMAL 0x0DB2
+#define GL_MAP2_TEXTURE_COORD_1 0x0DB3
+#define GL_MAP2_TEXTURE_COORD_2 0x0DB4
+#define GL_MAP2_TEXTURE_COORD_3 0x0DB5
+#define GL_MAP2_TEXTURE_COORD_4 0x0DB6
+#define GL_MAP2_VERTEX_3 0x0DB7
+#define GL_MAP2_VERTEX_4 0x0DB8
+#define GL_MAP1_GRID_DOMAIN 0x0DD0
+#define GL_MAP1_GRID_SEGMENTS 0x0DD1
+#define GL_MAP2_GRID_DOMAIN 0x0DD2
+#define GL_MAP2_GRID_SEGMENTS 0x0DD3
+#define GL_TEXTURE_1D 0x0DE0
+#define GL_TEXTURE_2D 0x0DE1
+#define GL_FEEDBACK_BUFFER_POINTER 0x0DF0
+#define GL_FEEDBACK_BUFFER_SIZE 0x0DF1
+#define GL_FEEDBACK_BUFFER_TYPE 0x0DF2
+#define GL_SELECTION_BUFFER_POINTER 0x0DF3
+#define GL_SELECTION_BUFFER_SIZE 0x0DF4
+#define GL_TEXTURE_WIDTH 0x1000
+#define GL_TEXTURE_HEIGHT 0x1001
+#define GL_TEXTURE_INTERNAL_FORMAT 0x1003
+#define GL_TEXTURE_BORDER_COLOR 0x1004
+#define GL_TEXTURE_BORDER 0x1005
+#define GL_DONT_CARE 0x1100
+#define GL_FASTEST 0x1101
+#define GL_NICEST 0x1102
+#define GL_LIGHT0 0x4000
+#define GL_LIGHT1 0x4001
+#define GL_LIGHT2 0x4002
+#define GL_LIGHT3 0x4003
+#define GL_LIGHT4 0x4004
+#define GL_LIGHT5 0x4005
+#define GL_LIGHT6 0x4006
+#define GL_LIGHT7 0x4007
+#define GL_AMBIENT 0x1200
+#define GL_DIFFUSE 0x1201
+#define GL_SPECULAR 0x1202
+#define GL_POSITION 0x1203
+#define GL_SPOT_DIRECTION 0x1204
+#define GL_SPOT_EXPONENT 0x1205
+#define GL_SPOT_CUTOFF 0x1206
+#define GL_CONSTANT_ATTENUATION 0x1207
+#define GL_LINEAR_ATTENUATION 0x1208
+#define GL_QUADRATIC_ATTENUATION 0x1209
+#define GL_COMPILE 0x1300
+#define GL_COMPILE_AND_EXECUTE 0x1301
+#define GL_CLEAR 0x1500
+#define GL_AND 0x1501
+#define GL_AND_REVERSE 0x1502
+#define GL_COPY 0x1503
+#define GL_AND_INVERTED 0x1504
+#define GL_NOOP 0x1505
+#define GL_XOR 0x1506
+#define GL_OR 0x1507
+#define GL_NOR 0x1508
+#define GL_EQUIV 0x1509
+#define GL_INVERT 0x150A
+#define GL_OR_REVERSE 0x150B
+#define GL_COPY_INVERTED 0x150C
+#define GL_OR_INVERTED 0x150D
+#define GL_NAND 0x150E
+#define GL_SET 0x150F
+#define GL_EMISSION 0x1600
+#define GL_SHININESS 0x1601
+#define GL_AMBIENT_AND_DIFFUSE 0x1602
+#define GL_COLOR_INDEXES 0x1603
+#define GL_MODELVIEW 0x1700
+#define GL_PROJECTION 0x1701
+#define GL_TEXTURE 0x1702
+#define GL_COLOR 0x1800
+#define GL_DEPTH 0x1801
+#define GL_STENCIL 0x1802
+#define GL_COLOR_INDEX 0x1900
+#define GL_STENCIL_INDEX 0x1901
+#define GL_DEPTH_COMPONENT 0x1902
+#define GL_RED 0x1903
+#define GL_GREEN 0x1904
+#define GL_BLUE 0x1905
+#define GL_ALPHA 0x1906
+#define GL_RGB 0x1907
+#define GL_RGBA 0x1908
+#define GL_LUMINANCE 0x1909
+#define GL_LUMINANCE_ALPHA 0x190A
+#define GL_BITMAP 0x1A00
+#define GL_POINT 0x1B00
+#define GL_LINE 0x1B01
+#define GL_FILL 0x1B02
+#define GL_RENDER 0x1C00
+#define GL_FEEDBACK 0x1C01
+#define GL_SELECT 0x1C02
+#define GL_FLAT 0x1D00
+#define GL_SMOOTH 0x1D01
+#define GL_KEEP 0x1E00
+#define GL_REPLACE 0x1E01
+#define GL_INCR 0x1E02
+#define GL_DECR 0x1E03
+#define GL_VENDOR 0x1F00
+#define GL_RENDERER 0x1F01
+#define GL_VERSION 0x1F02
+#define GL_EXTENSIONS 0x1F03
+#define GL_S 0x2000
+#define GL_T 0x2001
+#define GL_R 0x2002
+#define GL_Q 0x2003
+#define GL_MODULATE 0x2100
+#define GL_DECAL 0x2101
+#define GL_TEXTURE_ENV_MODE 0x2200
+#define GL_TEXTURE_ENV_COLOR 0x2201
+#define GL_TEXTURE_ENV 0x2300
+#define GL_EYE_LINEAR 0x2400
+#define GL_OBJECT_LINEAR 0x2401
+#define GL_SPHERE_MAP 0x2402
+#define GL_TEXTURE_GEN_MODE 0x2500
+#define GL_OBJECT_PLANE 0x2501
+#define GL_EYE_PLANE 0x2502
+#define GL_NEAREST 0x2600
+#define GL_LINEAR 0x2601
+#define GL_NEAREST_MIPMAP_NEAREST 0x2700
+#define GL_LINEAR_MIPMAP_NEAREST 0x2701
+#define GL_NEAREST_MIPMAP_LINEAR 0x2702
+#define GL_LINEAR_MIPMAP_LINEAR 0x2703
+#define GL_TEXTURE_MAG_FILTER 0x2800
+#define GL_TEXTURE_MIN_FILTER 0x2801
+#define GL_TEXTURE_WRAP_S 0x2802
+#define GL_TEXTURE_WRAP_T 0x2803
+#define GL_CLAMP 0x2900
+#define GL_REPEAT 0x2901
+#define GL_CLIENT_PIXEL_STORE_BIT 0x00000001
+#define GL_CLIENT_VERTEX_ARRAY_BIT 0x00000002
+#define GL_CLIENT_ALL_ATTRIB_BITS 0xffffffff
+#define GL_POLYGON_OFFSET_FACTOR 0x8038
+#define GL_POLYGON_OFFSET_UNITS 0x2A00
+#define GL_POLYGON_OFFSET_POINT 0x2A01
+#define GL_POLYGON_OFFSET_LINE 0x2A02
+#define GL_POLYGON_OFFSET_FILL 0x8037
+#define GL_ALPHA4 0x803B
+#define GL_ALPHA8 0x803C
+#define GL_ALPHA12 0x803D
+#define GL_ALPHA16 0x803E
+#define GL_LUMINANCE4 0x803F
+#define GL_LUMINANCE8 0x8040
+#define GL_LUMINANCE12 0x8041
+#define GL_LUMINANCE16 0x8042
+#define GL_LUMINANCE4_ALPHA4 0x8043
+#define GL_LUMINANCE6_ALPHA2 0x8044
+#define GL_LUMINANCE8_ALPHA8 0x8045
+#define GL_LUMINANCE12_ALPHA4 0x8046
+#define GL_LUMINANCE12_ALPHA12 0x8047
+#define GL_LUMINANCE16_ALPHA16 0x8048
+#define GL_INTENSITY 0x8049
+#define GL_INTENSITY4 0x804A
+#define GL_INTENSITY8 0x804B
+#define GL_INTENSITY12 0x804C
+#define GL_INTENSITY16 0x804D
+#define GL_R3_G3_B2 0x2A10
+#define GL_RGB4 0x804F
+#define GL_RGB5 0x8050
+#define GL_RGB8 0x8051
+#define GL_RGB10 0x8052
+#define GL_RGB12 0x8053
+#define GL_RGB16 0x8054
+#define GL_RGBA2 0x8055
+#define GL_RGBA4 0x8056
+#define GL_RGB5_A1 0x8057
+#define GL_RGBA8 0x8058
+#define GL_RGB10_A2 0x8059
+#define GL_RGBA12 0x805A
+#define GL_RGBA16 0x805B
+#define GL_TEXTURE_RED_SIZE 0x805C
+#define GL_TEXTURE_GREEN_SIZE 0x805D
+#define GL_TEXTURE_BLUE_SIZE 0x805E
+#define GL_TEXTURE_ALPHA_SIZE 0x805F
+#define GL_TEXTURE_LUMINANCE_SIZE 0x8060
+#define GL_TEXTURE_INTENSITY_SIZE 0x8061
+#define GL_PROXY_TEXTURE_1D 0x8063
+#define GL_PROXY_TEXTURE_2D 0x8064
+#define GL_TEXTURE_PRIORITY 0x8066
+#define GL_TEXTURE_RESIDENT 0x8067
+#define GL_TEXTURE_BINDING_1D 0x8068
+#define GL_TEXTURE_BINDING_2D 0x8069
+#define GL_VERTEX_ARRAY 0x8074
+#define GL_NORMAL_ARRAY 0x8075
+#define GL_COLOR_ARRAY 0x8076
+#define GL_INDEX_ARRAY 0x8077
+#define GL_TEXTURE_COORD_ARRAY 0x8078
+#define GL_EDGE_FLAG_ARRAY 0x8079
+#define GL_VERTEX_ARRAY_SIZE 0x807A
+#define GL_VERTEX_ARRAY_TYPE 0x807B
+#define GL_VERTEX_ARRAY_STRIDE 0x807C
+#define GL_NORMAL_ARRAY_TYPE 0x807E
+#define GL_NORMAL_ARRAY_STRIDE 0x807F
+#define GL_COLOR_ARRAY_SIZE 0x8081
+#define GL_COLOR_ARRAY_TYPE 0x8082
+#define GL_COLOR_ARRAY_STRIDE 0x8083
+#define GL_INDEX_ARRAY_TYPE 0x8085
+#define GL_INDEX_ARRAY_STRIDE 0x8086
+#define GL_TEXTURE_COORD_ARRAY_SIZE 0x8088
+#define GL_TEXTURE_COORD_ARRAY_TYPE 0x8089
+#define GL_TEXTURE_COORD_ARRAY_STRIDE 0x808A
+#define GL_EDGE_FLAG_ARRAY_STRIDE 0x808C
+#define GL_VERTEX_ARRAY_POINTER 0x808E
+#define GL_NORMAL_ARRAY_POINTER 0x808F
+#define GL_COLOR_ARRAY_POINTER 0x8090
+#define GL_INDEX_ARRAY_POINTER 0x8091
+#define GL_TEXTURE_COORD_ARRAY_POINTER 0x8092
+#define GL_EDGE_FLAG_ARRAY_POINTER 0x8093
+#define GL_V2F 0x2A20
+#define GL_V3F 0x2A21
+#define GL_C4UB_V2F 0x2A22
+#define GL_C4UB_V3F 0x2A23
+#define GL_C3F_V3F 0x2A24
+#define GL_N3F_V3F 0x2A25
+#define GL_C4F_N3F_V3F 0x2A26
+#define GL_T2F_V3F 0x2A27
+#define GL_T4F_V4F 0x2A28
+#define GL_T2F_C4UB_V3F 0x2A29
+#define GL_T2F_C3F_V3F 0x2A2A
+#define GL_T2F_N3F_V3F 0x2A2B
+#define GL_T2F_C4F_N3F_V3F 0x2A2C
+#define GL_T4F_C4F_N3F_V4F 0x2A2D
+#define GL_LOGIC_OP GL_INDEX_LOGIC_OP
+#define GL_TEXTURE_COMPONENTS GL_TEXTURE_INTERNAL_FORMAT
+#define GL_COLOR_INDEX1_EXT 0x80E2
+#define GL_COLOR_INDEX2_EXT 0x80E3
+#define GL_COLOR_INDEX4_EXT 0x80E4
+#define GL_COLOR_INDEX8_EXT 0x80E5
+#define GL_COLOR_INDEX12_EXT 0x80E6
+#define GL_COLOR_INDEX16_EXT 0x80E7
+
+GLAPI void GLAPIENTRY glAccum (GLenum op, GLfloat value);
+GLAPI void GLAPIENTRY glAlphaFunc (GLenum func, GLclampf ref);
+GLAPI GLboolean GLAPIENTRY glAreTexturesResident (GLsizei n, const GLuint *textures, GLboolean *residences);
+GLAPI void GLAPIENTRY glArrayElement (GLint i);
+GLAPI void GLAPIENTRY glBegin (GLenum mode);
+GLAPI void GLAPIENTRY glBindTexture (GLenum target, GLuint texture);
+GLAPI void GLAPIENTRY glBitmap (GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap);
+GLAPI void GLAPIENTRY glBlendFunc (GLenum sfactor, GLenum dfactor);
+GLAPI void GLAPIENTRY glCallList (GLuint list);
+GLAPI void GLAPIENTRY glCallLists (GLsizei n, GLenum type, const GLvoid *lists);
+GLAPI void GLAPIENTRY glClear (GLbitfield mask);
+GLAPI void GLAPIENTRY glClearAccum (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
+GLAPI void GLAPIENTRY glClearColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+GLAPI void GLAPIENTRY glClearDepth (GLclampd depth);
+GLAPI void GLAPIENTRY glClearIndex (GLfloat c);
+GLAPI void GLAPIENTRY glClearStencil (GLint s);
+GLAPI void GLAPIENTRY glClipPlane (GLenum plane, const GLdouble *equation);
+GLAPI void GLAPIENTRY glColor3b (GLbyte red, GLbyte green, GLbyte blue);
+GLAPI void GLAPIENTRY glColor3bv (const GLbyte *v);
+GLAPI void GLAPIENTRY glColor3d (GLdouble red, GLdouble green, GLdouble blue);
+GLAPI void GLAPIENTRY glColor3dv (const GLdouble *v);
+GLAPI void GLAPIENTRY glColor3f (GLfloat red, GLfloat green, GLfloat blue);
+GLAPI void GLAPIENTRY glColor3fv (const GLfloat *v);
+GLAPI void GLAPIENTRY glColor3i (GLint red, GLint green, GLint blue);
+GLAPI void GLAPIENTRY glColor3iv (const GLint *v);
+GLAPI void GLAPIENTRY glColor3s (GLshort red, GLshort green, GLshort blue);
+GLAPI void GLAPIENTRY glColor3sv (const GLshort *v);
+GLAPI void GLAPIENTRY glColor3ub (GLubyte red, GLubyte green, GLubyte blue);
+GLAPI void GLAPIENTRY glColor3ubv (const GLubyte *v);
+GLAPI void GLAPIENTRY glColor3ui (GLuint red, GLuint green, GLuint blue);
+GLAPI void GLAPIENTRY glColor3uiv (const GLuint *v);
+GLAPI void GLAPIENTRY glColor3us (GLushort red, GLushort green, GLushort blue);
+GLAPI void GLAPIENTRY glColor3usv (const GLushort *v);
+GLAPI void GLAPIENTRY glColor4b (GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha);
+GLAPI void GLAPIENTRY glColor4bv (const GLbyte *v);
+GLAPI void GLAPIENTRY glColor4d (GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha);
+GLAPI void GLAPIENTRY glColor4dv (const GLdouble *v);
+GLAPI void GLAPIENTRY glColor4f (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
+GLAPI void GLAPIENTRY glColor4fv (const GLfloat *v);
+GLAPI void GLAPIENTRY glColor4i (GLint red, GLint green, GLint blue, GLint alpha);
+GLAPI void GLAPIENTRY glColor4iv (const GLint *v);
+GLAPI void GLAPIENTRY glColor4s (GLshort red, GLshort green, GLshort blue, GLshort alpha);
+GLAPI void GLAPIENTRY glColor4sv (const GLshort *v);
+GLAPI void GLAPIENTRY glColor4ub (GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha);
+GLAPI void GLAPIENTRY glColor4ubv (const GLubyte *v);
+GLAPI void GLAPIENTRY glColor4ui (GLuint red, GLuint green, GLuint blue, GLuint alpha);
+GLAPI void GLAPIENTRY glColor4uiv (const GLuint *v);
+GLAPI void GLAPIENTRY glColor4us (GLushort red, GLushort green, GLushort blue, GLushort alpha);
+GLAPI void GLAPIENTRY glColor4usv (const GLushort *v);
+GLAPI void GLAPIENTRY glColorMask (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
+GLAPI void GLAPIENTRY glColorMaterial (GLenum face, GLenum mode);
+GLAPI void GLAPIENTRY glColorPointer (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+GLAPI void GLAPIENTRY glCopyPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum type);
+GLAPI void GLAPIENTRY glCopyTexImage1D (GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLint border);
+GLAPI void GLAPIENTRY glCopyTexImage2D (GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+GLAPI void GLAPIENTRY glCopyTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+GLAPI void GLAPIENTRY glCopyTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void GLAPIENTRY glCullFace (GLenum mode);
+GLAPI void GLAPIENTRY glDeleteLists (GLuint list, GLsizei range);
+GLAPI void GLAPIENTRY glDeleteTextures (GLsizei n, const GLuint *textures);
+GLAPI void GLAPIENTRY glDepthFunc (GLenum func);
+GLAPI void GLAPIENTRY glDepthMask (GLboolean flag);
+GLAPI void GLAPIENTRY glDepthRange (GLclampd zNear, GLclampd zFar);
+GLAPI void GLAPIENTRY glDisable (GLenum cap);
+GLAPI void GLAPIENTRY glDisableClientState (GLenum array);
+GLAPI void GLAPIENTRY glDrawArrays (GLenum mode, GLint first, GLsizei count);
+GLAPI void GLAPIENTRY glDrawBuffer (GLenum mode);
+GLAPI void GLAPIENTRY glDrawElements (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices);
+GLAPI void GLAPIENTRY glDrawPixels (GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void GLAPIENTRY glEdgeFlag (GLboolean flag);
+GLAPI void GLAPIENTRY glEdgeFlagPointer (GLsizei stride, const GLvoid *pointer);
+GLAPI void GLAPIENTRY glEdgeFlagv (const GLboolean *flag);
+GLAPI void GLAPIENTRY glEnable (GLenum cap);
+GLAPI void GLAPIENTRY glEnableClientState (GLenum array);
+GLAPI void GLAPIENTRY glEnd (void);
+GLAPI void GLAPIENTRY glEndList (void);
+GLAPI void GLAPIENTRY glEvalCoord1d (GLdouble u);
+GLAPI void GLAPIENTRY glEvalCoord1dv (const GLdouble *u);
+GLAPI void GLAPIENTRY glEvalCoord1f (GLfloat u);
+GLAPI void GLAPIENTRY glEvalCoord1fv (const GLfloat *u);
+GLAPI void GLAPIENTRY glEvalCoord2d (GLdouble u, GLdouble v);
+GLAPI void GLAPIENTRY glEvalCoord2dv (const GLdouble *u);
+GLAPI void GLAPIENTRY glEvalCoord2f (GLfloat u, GLfloat v);
+GLAPI void GLAPIENTRY glEvalCoord2fv (const GLfloat *u);
+GLAPI void GLAPIENTRY glEvalMesh1 (GLenum mode, GLint i1, GLint i2);
+GLAPI void GLAPIENTRY glEvalMesh2 (GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2);
+GLAPI void GLAPIENTRY glEvalPoint1 (GLint i);
+GLAPI void GLAPIENTRY glEvalPoint2 (GLint i, GLint j);
+GLAPI void GLAPIENTRY glFeedbackBuffer (GLsizei size, GLenum type, GLfloat *buffer);
+GLAPI void GLAPIENTRY glFinish (void);
+GLAPI void GLAPIENTRY glFlush (void);
+GLAPI void GLAPIENTRY glFogf (GLenum pname, GLfloat param);
+GLAPI void GLAPIENTRY glFogfv (GLenum pname, const GLfloat *params);
+GLAPI void GLAPIENTRY glFogi (GLenum pname, GLint param);
+GLAPI void GLAPIENTRY glFogiv (GLenum pname, const GLint *params);
+GLAPI void GLAPIENTRY glFrontFace (GLenum mode);
+GLAPI void GLAPIENTRY glFrustum (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
+GLAPI GLuint GLAPIENTRY glGenLists (GLsizei range);
+GLAPI void GLAPIENTRY glGenTextures (GLsizei n, GLuint *textures);
+GLAPI void GLAPIENTRY glGetBooleanv (GLenum pname, GLboolean *params);
+GLAPI void GLAPIENTRY glGetClipPlane (GLenum plane, GLdouble *equation);
+GLAPI void GLAPIENTRY glGetDoublev (GLenum pname, GLdouble *params);
+GLAPI GLenum GLAPIENTRY glGetError (void);
+GLAPI void GLAPIENTRY glGetFloatv (GLenum pname, GLfloat *params);
+GLAPI void GLAPIENTRY glGetIntegerv (GLenum pname, GLint *params);
+GLAPI void GLAPIENTRY glGetLightfv (GLenum light, GLenum pname, GLfloat *params);
+GLAPI void GLAPIENTRY glGetLightiv (GLenum light, GLenum pname, GLint *params);
+GLAPI void GLAPIENTRY glGetMapdv (GLenum target, GLenum query, GLdouble *v);
+GLAPI void GLAPIENTRY glGetMapfv (GLenum target, GLenum query, GLfloat *v);
+GLAPI void GLAPIENTRY glGetMapiv (GLenum target, GLenum query, GLint *v);
+GLAPI void GLAPIENTRY glGetMaterialfv (GLenum face, GLenum pname, GLfloat *params);
+GLAPI void GLAPIENTRY glGetMaterialiv (GLenum face, GLenum pname, GLint *params);
+GLAPI void GLAPIENTRY glGetPixelMapfv (GLenum map, GLfloat *values);
+GLAPI void GLAPIENTRY glGetPixelMapuiv (GLenum map, GLuint *values);
+GLAPI void GLAPIENTRY glGetPixelMapusv (GLenum map, GLushort *values);
+GLAPI void GLAPIENTRY glGetPointerv (GLenum pname, GLvoid* *params);
+GLAPI void GLAPIENTRY glGetPolygonStipple (GLubyte *mask);
+GLAPI const GLubyte * GLAPIENTRY glGetString (GLenum name);
+GLAPI void GLAPIENTRY glGetTexEnvfv (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void GLAPIENTRY glGetTexEnviv (GLenum target, GLenum pname, GLint *params);
+GLAPI void GLAPIENTRY glGetTexGendv (GLenum coord, GLenum pname, GLdouble *params);
+GLAPI void GLAPIENTRY glGetTexGenfv (GLenum coord, GLenum pname, GLfloat *params);
+GLAPI void GLAPIENTRY glGetTexGeniv (GLenum coord, GLenum pname, GLint *params);
+GLAPI void GLAPIENTRY glGetTexImage (GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels);
+GLAPI void GLAPIENTRY glGetTexLevelParameterfv (GLenum target, GLint level, GLenum pname, GLfloat *params);
+GLAPI void GLAPIENTRY glGetTexLevelParameteriv (GLenum target, GLint level, GLenum pname, GLint *params);
+GLAPI void GLAPIENTRY glGetTexParameterfv (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void GLAPIENTRY glGetTexParameteriv (GLenum target, GLenum pname, GLint *params);
+GLAPI void GLAPIENTRY glHint (GLenum target, GLenum mode);
+GLAPI void GLAPIENTRY glIndexMask (GLuint mask);
+GLAPI void GLAPIENTRY glIndexPointer (GLenum type, GLsizei stride, const GLvoid *pointer);
+GLAPI void GLAPIENTRY glIndexd (GLdouble c);
+GLAPI void GLAPIENTRY glIndexdv (const GLdouble *c);
+GLAPI void GLAPIENTRY glIndexf (GLfloat c);
+GLAPI void GLAPIENTRY glIndexfv (const GLfloat *c);
+GLAPI void GLAPIENTRY glIndexi (GLint c);
+GLAPI void GLAPIENTRY glIndexiv (const GLint *c);
+GLAPI void GLAPIENTRY glIndexs (GLshort c);
+GLAPI void GLAPIENTRY glIndexsv (const GLshort *c);
+GLAPI void GLAPIENTRY glIndexub (GLubyte c);
+GLAPI void GLAPIENTRY glIndexubv (const GLubyte *c);
+GLAPI void GLAPIENTRY glInitNames (void);
+GLAPI void GLAPIENTRY glInterleavedArrays (GLenum format, GLsizei stride, const GLvoid *pointer);
+GLAPI GLboolean GLAPIENTRY glIsEnabled (GLenum cap);
+GLAPI GLboolean GLAPIENTRY glIsList (GLuint list);
+GLAPI GLboolean GLAPIENTRY glIsTexture (GLuint texture);
+GLAPI void GLAPIENTRY glLightModelf (GLenum pname, GLfloat param);
+GLAPI void GLAPIENTRY glLightModelfv (GLenum pname, const GLfloat *params);
+GLAPI void GLAPIENTRY glLightModeli (GLenum pname, GLint param);
+GLAPI void GLAPIENTRY glLightModeliv (GLenum pname, const GLint *params);
+GLAPI void GLAPIENTRY glLightf (GLenum light, GLenum pname, GLfloat param);
+GLAPI void GLAPIENTRY glLightfv (GLenum light, GLenum pname, const GLfloat *params);
+GLAPI void GLAPIENTRY glLighti (GLenum light, GLenum pname, GLint param);
+GLAPI void GLAPIENTRY glLightiv (GLenum light, GLenum pname, const GLint *params);
+GLAPI void GLAPIENTRY glLineStipple (GLint factor, GLushort pattern);
+GLAPI void GLAPIENTRY glLineWidth (GLfloat width);
+GLAPI void GLAPIENTRY glListBase (GLuint base);
+GLAPI void GLAPIENTRY glLoadIdentity (void);
+GLAPI void GLAPIENTRY glLoadMatrixd (const GLdouble *m);
+GLAPI void GLAPIENTRY glLoadMatrixf (const GLfloat *m);
+GLAPI void GLAPIENTRY glLoadName (GLuint name);
+GLAPI void GLAPIENTRY glLogicOp (GLenum opcode);
+GLAPI void GLAPIENTRY glMap1d (GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points);
+GLAPI void GLAPIENTRY glMap1f (GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points);
+GLAPI void GLAPIENTRY glMap2d (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points);
+GLAPI void GLAPIENTRY glMap2f (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points);
+GLAPI void GLAPIENTRY glMapGrid1d (GLint un, GLdouble u1, GLdouble u2);
+GLAPI void GLAPIENTRY glMapGrid1f (GLint un, GLfloat u1, GLfloat u2);
+GLAPI void GLAPIENTRY glMapGrid2d (GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2);
+GLAPI void GLAPIENTRY glMapGrid2f (GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2);
+GLAPI void GLAPIENTRY glMaterialf (GLenum face, GLenum pname, GLfloat param);
+GLAPI void GLAPIENTRY glMaterialfv (GLenum face, GLenum pname, const GLfloat *params);
+GLAPI void GLAPIENTRY glMateriali (GLenum face, GLenum pname, GLint param);
+GLAPI void GLAPIENTRY glMaterialiv (GLenum face, GLenum pname, const GLint *params);
+GLAPI void GLAPIENTRY glMatrixMode (GLenum mode);
+GLAPI void GLAPIENTRY glMultMatrixd (const GLdouble *m);
+GLAPI void GLAPIENTRY glMultMatrixf (const GLfloat *m);
+GLAPI void GLAPIENTRY glNewList (GLuint list, GLenum mode);
+GLAPI void GLAPIENTRY glNormal3b (GLbyte nx, GLbyte ny, GLbyte nz);
+GLAPI void GLAPIENTRY glNormal3bv (const GLbyte *v);
+GLAPI void GLAPIENTRY glNormal3d (GLdouble nx, GLdouble ny, GLdouble nz);
+GLAPI void GLAPIENTRY glNormal3dv (const GLdouble *v);
+GLAPI void GLAPIENTRY glNormal3f (GLfloat nx, GLfloat ny, GLfloat nz);
+GLAPI void GLAPIENTRY glNormal3fv (const GLfloat *v);
+GLAPI void GLAPIENTRY glNormal3i (GLint nx, GLint ny, GLint nz);
+GLAPI void GLAPIENTRY glNormal3iv (const GLint *v);
+GLAPI void GLAPIENTRY glNormal3s (GLshort nx, GLshort ny, GLshort nz);
+GLAPI void GLAPIENTRY glNormal3sv (const GLshort *v);
+GLAPI void GLAPIENTRY glNormalPointer (GLenum type, GLsizei stride, const GLvoid *pointer);
+GLAPI void GLAPIENTRY glOrtho (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
+GLAPI void GLAPIENTRY glPassThrough (GLfloat token);
+GLAPI void GLAPIENTRY glPixelMapfv (GLenum map, GLsizei mapsize, const GLfloat *values);
+GLAPI void GLAPIENTRY glPixelMapuiv (GLenum map, GLsizei mapsize, const GLuint *values);
+GLAPI void GLAPIENTRY glPixelMapusv (GLenum map, GLsizei mapsize, const GLushort *values);
+GLAPI void GLAPIENTRY glPixelStoref (GLenum pname, GLfloat param);
+GLAPI void GLAPIENTRY glPixelStorei (GLenum pname, GLint param);
+GLAPI void GLAPIENTRY glPixelTransferf (GLenum pname, GLfloat param);
+GLAPI void GLAPIENTRY glPixelTransferi (GLenum pname, GLint param);
+GLAPI void GLAPIENTRY glPixelZoom (GLfloat xfactor, GLfloat yfactor);
+GLAPI void GLAPIENTRY glPointSize (GLfloat size);
+GLAPI void GLAPIENTRY glPolygonMode (GLenum face, GLenum mode);
+GLAPI void GLAPIENTRY glPolygonOffset (GLfloat factor, GLfloat units);
+GLAPI void GLAPIENTRY glPolygonStipple (const GLubyte *mask);
+GLAPI void GLAPIENTRY glPopAttrib (void);
+GLAPI void GLAPIENTRY glPopClientAttrib (void);
+GLAPI void GLAPIENTRY glPopMatrix (void);
+GLAPI void GLAPIENTRY glPopName (void);
+GLAPI void GLAPIENTRY glPrioritizeTextures (GLsizei n, const GLuint *textures, const GLclampf *priorities);
+GLAPI void GLAPIENTRY glPushAttrib (GLbitfield mask);
+GLAPI void GLAPIENTRY glPushClientAttrib (GLbitfield mask);
+GLAPI void GLAPIENTRY glPushMatrix (void);
+GLAPI void GLAPIENTRY glPushName (GLuint name);
+GLAPI void GLAPIENTRY glRasterPos2d (GLdouble x, GLdouble y);
+GLAPI void GLAPIENTRY glRasterPos2dv (const GLdouble *v);
+GLAPI void GLAPIENTRY glRasterPos2f (GLfloat x, GLfloat y);
+GLAPI void GLAPIENTRY glRasterPos2fv (const GLfloat *v);
+GLAPI void GLAPIENTRY glRasterPos2i (GLint x, GLint y);
+GLAPI void GLAPIENTRY glRasterPos2iv (const GLint *v);
+GLAPI void GLAPIENTRY glRasterPos2s (GLshort x, GLshort y);
+GLAPI void GLAPIENTRY glRasterPos2sv (const GLshort *v);
+GLAPI void GLAPIENTRY glRasterPos3d (GLdouble x, GLdouble y, GLdouble z);
+GLAPI void GLAPIENTRY glRasterPos3dv (const GLdouble *v);
+GLAPI void GLAPIENTRY glRasterPos3f (GLfloat x, GLfloat y, GLfloat z);
+GLAPI void GLAPIENTRY glRasterPos3fv (const GLfloat *v);
+GLAPI void GLAPIENTRY glRasterPos3i (GLint x, GLint y, GLint z);
+GLAPI void GLAPIENTRY glRasterPos3iv (const GLint *v);
+GLAPI void GLAPIENTRY glRasterPos3s (GLshort x, GLshort y, GLshort z);
+GLAPI void GLAPIENTRY glRasterPos3sv (const GLshort *v);
+GLAPI void GLAPIENTRY glRasterPos4d (GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void GLAPIENTRY glRasterPos4dv (const GLdouble *v);
+GLAPI void GLAPIENTRY glRasterPos4f (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void GLAPIENTRY glRasterPos4fv (const GLfloat *v);
+GLAPI void GLAPIENTRY glRasterPos4i (GLint x, GLint y, GLint z, GLint w);
+GLAPI void GLAPIENTRY glRasterPos4iv (const GLint *v);
+GLAPI void GLAPIENTRY glRasterPos4s (GLshort x, GLshort y, GLshort z, GLshort w);
+GLAPI void GLAPIENTRY glRasterPos4sv (const GLshort *v);
+GLAPI void GLAPIENTRY glReadBuffer (GLenum mode);
+GLAPI void GLAPIENTRY glReadPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels);
+GLAPI void GLAPIENTRY glRectd (GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2);
+GLAPI void GLAPIENTRY glRectdv (const GLdouble *v1, const GLdouble *v2);
+GLAPI void GLAPIENTRY glRectf (GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2);
+GLAPI void GLAPIENTRY glRectfv (const GLfloat *v1, const GLfloat *v2);
+GLAPI void GLAPIENTRY glRecti (GLint x1, GLint y1, GLint x2, GLint y2);
+GLAPI void GLAPIENTRY glRectiv (const GLint *v1, const GLint *v2);
+GLAPI void GLAPIENTRY glRects (GLshort x1, GLshort y1, GLshort x2, GLshort y2);
+GLAPI void GLAPIENTRY glRectsv (const GLshort *v1, const GLshort *v2);
+GLAPI GLint GLAPIENTRY glRenderMode (GLenum mode);
+GLAPI void GLAPIENTRY glRotated (GLdouble angle, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void GLAPIENTRY glRotatef (GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void GLAPIENTRY glScaled (GLdouble x, GLdouble y, GLdouble z);
+GLAPI void GLAPIENTRY glScalef (GLfloat x, GLfloat y, GLfloat z);
+GLAPI void GLAPIENTRY glScissor (GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void GLAPIENTRY glSelectBuffer (GLsizei size, GLuint *buffer);
+GLAPI void GLAPIENTRY glShadeModel (GLenum mode);
+GLAPI void GLAPIENTRY glStencilFunc (GLenum func, GLint ref, GLuint mask);
+GLAPI void GLAPIENTRY glStencilMask (GLuint mask);
+GLAPI void GLAPIENTRY glStencilOp (GLenum fail, GLenum zfail, GLenum zpass);
+GLAPI void GLAPIENTRY glTexCoord1d (GLdouble s);
+GLAPI void GLAPIENTRY glTexCoord1dv (const GLdouble *v);
+GLAPI void GLAPIENTRY glTexCoord1f (GLfloat s);
+GLAPI void GLAPIENTRY glTexCoord1fv (const GLfloat *v);
+GLAPI void GLAPIENTRY glTexCoord1i (GLint s);
+GLAPI void GLAPIENTRY glTexCoord1iv (const GLint *v);
+GLAPI void GLAPIENTRY glTexCoord1s (GLshort s);
+GLAPI void GLAPIENTRY glTexCoord1sv (const GLshort *v);
+GLAPI void GLAPIENTRY glTexCoord2d (GLdouble s, GLdouble t);
+GLAPI void GLAPIENTRY glTexCoord2dv (const GLdouble *v);
+GLAPI void GLAPIENTRY glTexCoord2f (GLfloat s, GLfloat t);
+GLAPI void GLAPIENTRY glTexCoord2fv (const GLfloat *v);
+GLAPI void GLAPIENTRY glTexCoord2i (GLint s, GLint t);
+GLAPI void GLAPIENTRY glTexCoord2iv (const GLint *v);
+GLAPI void GLAPIENTRY glTexCoord2s (GLshort s, GLshort t);
+GLAPI void GLAPIENTRY glTexCoord2sv (const GLshort *v);
+GLAPI void GLAPIENTRY glTexCoord3d (GLdouble s, GLdouble t, GLdouble r);
+GLAPI void GLAPIENTRY glTexCoord3dv (const GLdouble *v);
+GLAPI void GLAPIENTRY glTexCoord3f (GLfloat s, GLfloat t, GLfloat r);
+GLAPI void GLAPIENTRY glTexCoord3fv (const GLfloat *v);
+GLAPI void GLAPIENTRY glTexCoord3i (GLint s, GLint t, GLint r);
+GLAPI void GLAPIENTRY glTexCoord3iv (const GLint *v);
+GLAPI void GLAPIENTRY glTexCoord3s (GLshort s, GLshort t, GLshort r);
+GLAPI void GLAPIENTRY glTexCoord3sv (const GLshort *v);
+GLAPI void GLAPIENTRY glTexCoord4d (GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+GLAPI void GLAPIENTRY glTexCoord4dv (const GLdouble *v);
+GLAPI void GLAPIENTRY glTexCoord4f (GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+GLAPI void GLAPIENTRY glTexCoord4fv (const GLfloat *v);
+GLAPI void GLAPIENTRY glTexCoord4i (GLint s, GLint t, GLint r, GLint q);
+GLAPI void GLAPIENTRY glTexCoord4iv (const GLint *v);
+GLAPI void GLAPIENTRY glTexCoord4s (GLshort s, GLshort t, GLshort r, GLshort q);
+GLAPI void GLAPIENTRY glTexCoord4sv (const GLshort *v);
+GLAPI void GLAPIENTRY glTexCoordPointer (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+GLAPI void GLAPIENTRY glTexEnvf (GLenum target, GLenum pname, GLfloat param);
+GLAPI void GLAPIENTRY glTexEnvfv (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void GLAPIENTRY glTexEnvi (GLenum target, GLenum pname, GLint param);
+GLAPI void GLAPIENTRY glTexEnviv (GLenum target, GLenum pname, const GLint *params);
+GLAPI void GLAPIENTRY glTexGend (GLenum coord, GLenum pname, GLdouble param);
+GLAPI void GLAPIENTRY glTexGendv (GLenum coord, GLenum pname, const GLdouble *params);
+GLAPI void GLAPIENTRY glTexGenf (GLenum coord, GLenum pname, GLfloat param);
+GLAPI void GLAPIENTRY glTexGenfv (GLenum coord, GLenum pname, const GLfloat *params);
+GLAPI void GLAPIENTRY glTexGeni (GLenum coord, GLenum pname, GLint param);
+GLAPI void GLAPIENTRY glTexGeniv (GLenum coord, GLenum pname, const GLint *params);
+GLAPI void GLAPIENTRY glTexImage1D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void GLAPIENTRY glTexImage2D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void GLAPIENTRY glTexParameterf (GLenum target, GLenum pname, GLfloat param);
+GLAPI void GLAPIENTRY glTexParameterfv (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void GLAPIENTRY glTexParameteri (GLenum target, GLenum pname, GLint param);
+GLAPI void GLAPIENTRY glTexParameteriv (GLenum target, GLenum pname, const GLint *params);
+GLAPI void GLAPIENTRY glTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void GLAPIENTRY glTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
+GLAPI void GLAPIENTRY glTranslated (GLdouble x, GLdouble y, GLdouble z);
+GLAPI void GLAPIENTRY glTranslatef (GLfloat x, GLfloat y, GLfloat z);
+GLAPI void GLAPIENTRY glVertex2d (GLdouble x, GLdouble y);
+GLAPI void GLAPIENTRY glVertex2dv (const GLdouble *v);
+GLAPI void GLAPIENTRY glVertex2f (GLfloat x, GLfloat y);
+GLAPI void GLAPIENTRY glVertex2fv (const GLfloat *v);
+GLAPI void GLAPIENTRY glVertex2i (GLint x, GLint y);
+GLAPI void GLAPIENTRY glVertex2iv (const GLint *v);
+GLAPI void GLAPIENTRY glVertex2s (GLshort x, GLshort y);
+GLAPI void GLAPIENTRY glVertex2sv (const GLshort *v);
+GLAPI void GLAPIENTRY glVertex3d (GLdouble x, GLdouble y, GLdouble z);
+GLAPI void GLAPIENTRY glVertex3dv (const GLdouble *v);
+GLAPI void GLAPIENTRY glVertex3f (GLfloat x, GLfloat y, GLfloat z);
+GLAPI void GLAPIENTRY glVertex3fv (const GLfloat *v);
+GLAPI void GLAPIENTRY glVertex3i (GLint x, GLint y, GLint z);
+GLAPI void GLAPIENTRY glVertex3iv (const GLint *v);
+GLAPI void GLAPIENTRY glVertex3s (GLshort x, GLshort y, GLshort z);
+GLAPI void GLAPIENTRY glVertex3sv (const GLshort *v);
+GLAPI void GLAPIENTRY glVertex4d (GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void GLAPIENTRY glVertex4dv (const GLdouble *v);
+GLAPI void GLAPIENTRY glVertex4f (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void GLAPIENTRY glVertex4fv (const GLfloat *v);
+GLAPI void GLAPIENTRY glVertex4i (GLint x, GLint y, GLint z, GLint w);
+GLAPI void GLAPIENTRY glVertex4iv (const GLint *v);
+GLAPI void GLAPIENTRY glVertex4s (GLshort x, GLshort y, GLshort z, GLshort w);
+GLAPI void GLAPIENTRY glVertex4sv (const GLshort *v);
+GLAPI void GLAPIENTRY glVertexPointer (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
+GLAPI void GLAPIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei height);
+
+#define GLEW_VERSION_1_1 GLEW_GET_VAR(__GLEW_VERSION_1_1)
+
+#endif /* GL_VERSION_1_1 */
+
+/* ---------------------------------- GLU ---------------------------------- */
+
+/* this is where we can safely include GLU */
+#if defined(__APPLE__) && defined(__MACH__)
+#include <OpenGL/glu.h>
+#else
+#include <GL/glu.h>
+#endif
+
+/* ----------------------------- GL_VERSION_1_2 ---------------------------- */
+
+#ifndef GL_VERSION_1_2
+#define GL_VERSION_1_2 1
+
+#define GL_SMOOTH_POINT_SIZE_RANGE 0x0B12
+#define GL_SMOOTH_POINT_SIZE_GRANULARITY 0x0B13
+#define GL_SMOOTH_LINE_WIDTH_RANGE 0x0B22
+#define GL_SMOOTH_LINE_WIDTH_GRANULARITY 0x0B23
+#define GL_UNSIGNED_BYTE_3_3_2 0x8032
+#define GL_UNSIGNED_SHORT_4_4_4_4 0x8033
+#define GL_UNSIGNED_SHORT_5_5_5_1 0x8034
+#define GL_UNSIGNED_INT_8_8_8_8 0x8035
+#define GL_UNSIGNED_INT_10_10_10_2 0x8036
+#define GL_RESCALE_NORMAL 0x803A
+#define GL_TEXTURE_BINDING_3D 0x806A
+#define GL_PACK_SKIP_IMAGES 0x806B
+#define GL_PACK_IMAGE_HEIGHT 0x806C
+#define GL_UNPACK_SKIP_IMAGES 0x806D
+#define GL_UNPACK_IMAGE_HEIGHT 0x806E
+#define GL_TEXTURE_3D 0x806F
+#define GL_PROXY_TEXTURE_3D 0x8070
+#define GL_TEXTURE_DEPTH 0x8071
+#define GL_TEXTURE_WRAP_R 0x8072
+#define GL_MAX_3D_TEXTURE_SIZE 0x8073
+#define GL_BGR 0x80E0
+#define GL_BGRA 0x80E1
+#define GL_MAX_ELEMENTS_VERTICES 0x80E8
+#define GL_MAX_ELEMENTS_INDICES 0x80E9
+#define GL_CLAMP_TO_EDGE 0x812F
+#define GL_TEXTURE_MIN_LOD 0x813A
+#define GL_TEXTURE_MAX_LOD 0x813B
+#define GL_TEXTURE_BASE_LEVEL 0x813C
+#define GL_TEXTURE_MAX_LEVEL 0x813D
+#define GL_LIGHT_MODEL_COLOR_CONTROL 0x81F8
+#define GL_SINGLE_COLOR 0x81F9
+#define GL_SEPARATE_SPECULAR_COLOR 0x81FA
+#define GL_UNSIGNED_BYTE_2_3_3_REV 0x8362
+#define GL_UNSIGNED_SHORT_5_6_5 0x8363
+#define GL_UNSIGNED_SHORT_5_6_5_REV 0x8364
+#define GL_UNSIGNED_SHORT_4_4_4_4_REV 0x8365
+#define GL_UNSIGNED_SHORT_1_5_5_5_REV 0x8366
+#define GL_UNSIGNED_INT_8_8_8_8_REV 0x8367
+#define GL_UNSIGNED_INT_2_10_10_10_REV 0x8368
+#define GL_ALIASED_POINT_SIZE_RANGE 0x846D
+#define GL_ALIASED_LINE_WIDTH_RANGE 0x846E
+
+typedef void (GLAPIENTRY * PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (GLAPIENTRY * PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
+typedef void (GLAPIENTRY * PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (GLAPIENTRY * PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+
+#define glCopyTexSubImage3D GLEW_GET_FUN(__glewCopyTexSubImage3D)
+#define glDrawRangeElements GLEW_GET_FUN(__glewDrawRangeElements)
+#define glTexImage3D GLEW_GET_FUN(__glewTexImage3D)
+#define glTexSubImage3D GLEW_GET_FUN(__glewTexSubImage3D)
+
+#define GLEW_VERSION_1_2 GLEW_GET_VAR(__GLEW_VERSION_1_2)
+
+#endif /* GL_VERSION_1_2 */
+
+/* ----------------------------- GL_VERSION_1_3 ---------------------------- */
+
+#ifndef GL_VERSION_1_3
+#define GL_VERSION_1_3 1
+
+#define GL_MULTISAMPLE 0x809D
+#define GL_SAMPLE_ALPHA_TO_COVERAGE 0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE 0x809F
+#define GL_SAMPLE_COVERAGE 0x80A0
+#define GL_SAMPLE_BUFFERS 0x80A8
+#define GL_SAMPLES 0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE 0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT 0x80AB
+#define GL_CLAMP_TO_BORDER 0x812D
+#define GL_TEXTURE0 0x84C0
+#define GL_TEXTURE1 0x84C1
+#define GL_TEXTURE2 0x84C2
+#define GL_TEXTURE3 0x84C3
+#define GL_TEXTURE4 0x84C4
+#define GL_TEXTURE5 0x84C5
+#define GL_TEXTURE6 0x84C6
+#define GL_TEXTURE7 0x84C7
+#define GL_TEXTURE8 0x84C8
+#define GL_TEXTURE9 0x84C9
+#define GL_TEXTURE10 0x84CA
+#define GL_TEXTURE11 0x84CB
+#define GL_TEXTURE12 0x84CC
+#define GL_TEXTURE13 0x84CD
+#define GL_TEXTURE14 0x84CE
+#define GL_TEXTURE15 0x84CF
+#define GL_TEXTURE16 0x84D0
+#define GL_TEXTURE17 0x84D1
+#define GL_TEXTURE18 0x84D2
+#define GL_TEXTURE19 0x84D3
+#define GL_TEXTURE20 0x84D4
+#define GL_TEXTURE21 0x84D5
+#define GL_TEXTURE22 0x84D6
+#define GL_TEXTURE23 0x84D7
+#define GL_TEXTURE24 0x84D8
+#define GL_TEXTURE25 0x84D9
+#define GL_TEXTURE26 0x84DA
+#define GL_TEXTURE27 0x84DB
+#define GL_TEXTURE28 0x84DC
+#define GL_TEXTURE29 0x84DD
+#define GL_TEXTURE30 0x84DE
+#define GL_TEXTURE31 0x84DF
+#define GL_ACTIVE_TEXTURE 0x84E0
+#define GL_CLIENT_ACTIVE_TEXTURE 0x84E1
+#define GL_MAX_TEXTURE_UNITS 0x84E2
+#define GL_TRANSPOSE_MODELVIEW_MATRIX 0x84E3
+#define GL_TRANSPOSE_PROJECTION_MATRIX 0x84E4
+#define GL_TRANSPOSE_TEXTURE_MATRIX 0x84E5
+#define GL_TRANSPOSE_COLOR_MATRIX 0x84E6
+#define GL_SUBTRACT 0x84E7
+#define GL_COMPRESSED_ALPHA 0x84E9
+#define GL_COMPRESSED_LUMINANCE 0x84EA
+#define GL_COMPRESSED_LUMINANCE_ALPHA 0x84EB
+#define GL_COMPRESSED_INTENSITY 0x84EC
+#define GL_COMPRESSED_RGB 0x84ED
+#define GL_COMPRESSED_RGBA 0x84EE
+#define GL_TEXTURE_COMPRESSION_HINT 0x84EF
+#define GL_NORMAL_MAP 0x8511
+#define GL_REFLECTION_MAP 0x8512
+#define GL_TEXTURE_CUBE_MAP 0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP 0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X 0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X 0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y 0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y 0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z 0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP 0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE 0x851C
+#define GL_COMBINE 0x8570
+#define GL_COMBINE_RGB 0x8571
+#define GL_COMBINE_ALPHA 0x8572
+#define GL_RGB_SCALE 0x8573
+#define GL_ADD_SIGNED 0x8574
+#define GL_INTERPOLATE 0x8575
+#define GL_CONSTANT 0x8576
+#define GL_PRIMARY_COLOR 0x8577
+#define GL_PREVIOUS 0x8578
+#define GL_SOURCE0_RGB 0x8580
+#define GL_SOURCE1_RGB 0x8581
+#define GL_SOURCE2_RGB 0x8582
+#define GL_SOURCE0_ALPHA 0x8588
+#define GL_SOURCE1_ALPHA 0x8589
+#define GL_SOURCE2_ALPHA 0x858A
+#define GL_OPERAND0_RGB 0x8590
+#define GL_OPERAND1_RGB 0x8591
+#define GL_OPERAND2_RGB 0x8592
+#define GL_OPERAND0_ALPHA 0x8598
+#define GL_OPERAND1_ALPHA 0x8599
+#define GL_OPERAND2_ALPHA 0x859A
+#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE 0x86A0
+#define GL_TEXTURE_COMPRESSED 0x86A1
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS 0x86A3
+#define GL_DOT3_RGB 0x86AE
+#define GL_DOT3_RGBA 0x86AF
+#define GL_MULTISAMPLE_BIT 0x20000000
+
+typedef void (GLAPIENTRY * PFNGLACTIVETEXTUREPROC) (GLenum texture);
+typedef void (GLAPIENTRY * PFNGLCLIENTACTIVETEXTUREPROC) (GLenum texture);
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (GLAPIENTRY * PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint lod, GLvoid *img);
+typedef void (GLAPIENTRY * PFNGLLOADTRANSPOSEMATRIXDPROC) (const GLdouble m[16]);
+typedef void (GLAPIENTRY * PFNGLLOADTRANSPOSEMATRIXFPROC) (const GLfloat m[16]);
+typedef void (GLAPIENTRY * PFNGLMULTTRANSPOSEMATRIXDPROC) (const GLdouble m[16]);
+typedef void (GLAPIENTRY * PFNGLMULTTRANSPOSEMATRIXFPROC) (const GLfloat m[16]);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1DPROC) (GLenum target, GLdouble s);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1DVPROC) (GLenum target, const GLdouble *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1FPROC) (GLenum target, GLfloat s);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1FVPROC) (GLenum target, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1IPROC) (GLenum target, GLint s);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1IVPROC) (GLenum target, const GLint *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1SPROC) (GLenum target, GLshort s);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1SVPROC) (GLenum target, const GLshort *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2DPROC) (GLenum target, GLdouble s, GLdouble t);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2DVPROC) (GLenum target, const GLdouble *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2FVPROC) (GLenum target, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2IPROC) (GLenum target, GLint s, GLint t);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2IVPROC) (GLenum target, const GLint *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2SPROC) (GLenum target, GLshort s, GLshort t);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2SVPROC) (GLenum target, const GLshort *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3DVPROC) (GLenum target, const GLdouble *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3FVPROC) (GLenum target, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3IPROC) (GLenum target, GLint s, GLint t, GLint r);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3IVPROC) (GLenum target, const GLint *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3SPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3SVPROC) (GLenum target, const GLshort *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4DVPROC) (GLenum target, const GLdouble *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4FVPROC) (GLenum target, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4IPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4IVPROC) (GLenum target, const GLint *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4SPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4SVPROC) (GLenum target, const GLshort *v);
+typedef void (GLAPIENTRY * PFNGLSAMPLECOVERAGEPROC) (GLclampf value, GLboolean invert);
+
+#define glActiveTexture GLEW_GET_FUN(__glewActiveTexture)
+#define glClientActiveTexture GLEW_GET_FUN(__glewClientActiveTexture)
+#define glCompressedTexImage1D GLEW_GET_FUN(__glewCompressedTexImage1D)
+#define glCompressedTexImage2D GLEW_GET_FUN(__glewCompressedTexImage2D)
+#define glCompressedTexImage3D GLEW_GET_FUN(__glewCompressedTexImage3D)
+#define glCompressedTexSubImage1D GLEW_GET_FUN(__glewCompressedTexSubImage1D)
+#define glCompressedTexSubImage2D GLEW_GET_FUN(__glewCompressedTexSubImage2D)
+#define glCompressedTexSubImage3D GLEW_GET_FUN(__glewCompressedTexSubImage3D)
+#define glGetCompressedTexImage GLEW_GET_FUN(__glewGetCompressedTexImage)
+#define glLoadTransposeMatrixd GLEW_GET_FUN(__glewLoadTransposeMatrixd)
+#define glLoadTransposeMatrixf GLEW_GET_FUN(__glewLoadTransposeMatrixf)
+#define glMultTransposeMatrixd GLEW_GET_FUN(__glewMultTransposeMatrixd)
+#define glMultTransposeMatrixf GLEW_GET_FUN(__glewMultTransposeMatrixf)
+#define glMultiTexCoord1d GLEW_GET_FUN(__glewMultiTexCoord1d)
+#define glMultiTexCoord1dv GLEW_GET_FUN(__glewMultiTexCoord1dv)
+#define glMultiTexCoord1f GLEW_GET_FUN(__glewMultiTexCoord1f)
+#define glMultiTexCoord1fv GLEW_GET_FUN(__glewMultiTexCoord1fv)
+#define glMultiTexCoord1i GLEW_GET_FUN(__glewMultiTexCoord1i)
+#define glMultiTexCoord1iv GLEW_GET_FUN(__glewMultiTexCoord1iv)
+#define glMultiTexCoord1s GLEW_GET_FUN(__glewMultiTexCoord1s)
+#define glMultiTexCoord1sv GLEW_GET_FUN(__glewMultiTexCoord1sv)
+#define glMultiTexCoord2d GLEW_GET_FUN(__glewMultiTexCoord2d)
+#define glMultiTexCoord2dv GLEW_GET_FUN(__glewMultiTexCoord2dv)
+#define glMultiTexCoord2f GLEW_GET_FUN(__glewMultiTexCoord2f)
+#define glMultiTexCoord2fv GLEW_GET_FUN(__glewMultiTexCoord2fv)
+#define glMultiTexCoord2i GLEW_GET_FUN(__glewMultiTexCoord2i)
+#define glMultiTexCoord2iv GLEW_GET_FUN(__glewMultiTexCoord2iv)
+#define glMultiTexCoord2s GLEW_GET_FUN(__glewMultiTexCoord2s)
+#define glMultiTexCoord2sv GLEW_GET_FUN(__glewMultiTexCoord2sv)
+#define glMultiTexCoord3d GLEW_GET_FUN(__glewMultiTexCoord3d)
+#define glMultiTexCoord3dv GLEW_GET_FUN(__glewMultiTexCoord3dv)
+#define glMultiTexCoord3f GLEW_GET_FUN(__glewMultiTexCoord3f)
+#define glMultiTexCoord3fv GLEW_GET_FUN(__glewMultiTexCoord3fv)
+#define glMultiTexCoord3i GLEW_GET_FUN(__glewMultiTexCoord3i)
+#define glMultiTexCoord3iv GLEW_GET_FUN(__glewMultiTexCoord3iv)
+#define glMultiTexCoord3s GLEW_GET_FUN(__glewMultiTexCoord3s)
+#define glMultiTexCoord3sv GLEW_GET_FUN(__glewMultiTexCoord3sv)
+#define glMultiTexCoord4d GLEW_GET_FUN(__glewMultiTexCoord4d)
+#define glMultiTexCoord4dv GLEW_GET_FUN(__glewMultiTexCoord4dv)
+#define glMultiTexCoord4f GLEW_GET_FUN(__glewMultiTexCoord4f)
+#define glMultiTexCoord4fv GLEW_GET_FUN(__glewMultiTexCoord4fv)
+#define glMultiTexCoord4i GLEW_GET_FUN(__glewMultiTexCoord4i)
+#define glMultiTexCoord4iv GLEW_GET_FUN(__glewMultiTexCoord4iv)
+#define glMultiTexCoord4s GLEW_GET_FUN(__glewMultiTexCoord4s)
+#define glMultiTexCoord4sv GLEW_GET_FUN(__glewMultiTexCoord4sv)
+#define glSampleCoverage GLEW_GET_FUN(__glewSampleCoverage)
+
+#define GLEW_VERSION_1_3 GLEW_GET_VAR(__GLEW_VERSION_1_3)
+
+#endif /* GL_VERSION_1_3 */
+
+/* ----------------------------- GL_VERSION_1_4 ---------------------------- */
+
+#ifndef GL_VERSION_1_4
+#define GL_VERSION_1_4 1
+
+#define GL_BLEND_DST_RGB 0x80C8
+#define GL_BLEND_SRC_RGB 0x80C9
+#define GL_BLEND_DST_ALPHA 0x80CA
+#define GL_BLEND_SRC_ALPHA 0x80CB
+#define GL_POINT_SIZE_MIN 0x8126
+#define GL_POINT_SIZE_MAX 0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE 0x8128
+#define GL_POINT_DISTANCE_ATTENUATION 0x8129
+#define GL_GENERATE_MIPMAP 0x8191
+#define GL_GENERATE_MIPMAP_HINT 0x8192
+#define GL_DEPTH_COMPONENT16 0x81A5
+#define GL_DEPTH_COMPONENT24 0x81A6
+#define GL_DEPTH_COMPONENT32 0x81A7
+#define GL_MIRRORED_REPEAT 0x8370
+#define GL_FOG_COORDINATE_SOURCE 0x8450
+#define GL_FOG_COORDINATE 0x8451
+#define GL_FRAGMENT_DEPTH 0x8452
+#define GL_CURRENT_FOG_COORDINATE 0x8453
+#define GL_FOG_COORDINATE_ARRAY_TYPE 0x8454
+#define GL_FOG_COORDINATE_ARRAY_STRIDE 0x8455
+#define GL_FOG_COORDINATE_ARRAY_POINTER 0x8456
+#define GL_FOG_COORDINATE_ARRAY 0x8457
+#define GL_COLOR_SUM 0x8458
+#define GL_CURRENT_SECONDARY_COLOR 0x8459
+#define GL_SECONDARY_COLOR_ARRAY_SIZE 0x845A
+#define GL_SECONDARY_COLOR_ARRAY_TYPE 0x845B
+#define GL_SECONDARY_COLOR_ARRAY_STRIDE 0x845C
+#define GL_SECONDARY_COLOR_ARRAY_POINTER 0x845D
+#define GL_SECONDARY_COLOR_ARRAY 0x845E
+#define GL_MAX_TEXTURE_LOD_BIAS 0x84FD
+#define GL_TEXTURE_FILTER_CONTROL 0x8500
+#define GL_TEXTURE_LOD_BIAS 0x8501
+#define GL_INCR_WRAP 0x8507
+#define GL_DECR_WRAP 0x8508
+#define GL_TEXTURE_DEPTH_SIZE 0x884A
+#define GL_DEPTH_TEXTURE_MODE 0x884B
+#define GL_TEXTURE_COMPARE_MODE 0x884C
+#define GL_TEXTURE_COMPARE_FUNC 0x884D
+#define GL_COMPARE_R_TO_TEXTURE 0x884E
+
+typedef void (GLAPIENTRY * PFNGLBLENDCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONPROC) (GLenum mode);
+typedef void (GLAPIENTRY * PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+typedef void (GLAPIENTRY * PFNGLFOGCOORDPOINTERPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (GLAPIENTRY * PFNGLFOGCOORDDPROC) (GLdouble coord);
+typedef void (GLAPIENTRY * PFNGLFOGCOORDDVPROC) (const GLdouble *coord);
+typedef void (GLAPIENTRY * PFNGLFOGCOORDFPROC) (GLfloat coord);
+typedef void (GLAPIENTRY * PFNGLFOGCOORDFVPROC) (const GLfloat *coord);
+typedef void (GLAPIENTRY * PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
+typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, GLsizei *count, GLenum type, const GLvoid **indices, GLsizei primcount);
+typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERFPROC) (GLenum pname, GLfloat param);
+typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERFVPROC) (GLenum pname, GLfloat *params);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3BPROC) (GLbyte red, GLbyte green, GLbyte blue);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3BVPROC) (const GLbyte *v);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3DPROC) (GLdouble red, GLdouble green, GLdouble blue);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3DVPROC) (const GLdouble *v);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3FPROC) (GLfloat red, GLfloat green, GLfloat blue);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3FVPROC) (const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3IPROC) (GLint red, GLint green, GLint blue);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3IVPROC) (const GLint *v);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3SPROC) (GLshort red, GLshort green, GLshort blue);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3SVPROC) (const GLshort *v);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3UBPROC) (GLubyte red, GLubyte green, GLubyte blue);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3UBVPROC) (const GLubyte *v);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3UIPROC) (GLuint red, GLuint green, GLuint blue);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3UIVPROC) (const GLuint *v);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3USPROC) (GLushort red, GLushort green, GLushort blue);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3USVPROC) (const GLushort *v);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLORPOINTERPROC) (GLint size, GLenum type, GLsizei stride, GLvoid *pointer);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2DPROC) (GLdouble x, GLdouble y);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2DVPROC) (const GLdouble *p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2FPROC) (GLfloat x, GLfloat y);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2FVPROC) (const GLfloat *p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2IPROC) (GLint x, GLint y);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2IVPROC) (const GLint *p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2SPROC) (GLshort x, GLshort y);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2SVPROC) (const GLshort *p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3DPROC) (GLdouble x, GLdouble y, GLdouble z);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3DVPROC) (const GLdouble *p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3FPROC) (GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3FVPROC) (const GLfloat *p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3IPROC) (GLint x, GLint y, GLint z);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3IVPROC) (const GLint *p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3SPROC) (GLshort x, GLshort y, GLshort z);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3SVPROC) (const GLshort *p);
+
+#define glBlendColor GLEW_GET_FUN(__glewBlendColor)
+#define glBlendEquation GLEW_GET_FUN(__glewBlendEquation)
+#define glBlendFuncSeparate GLEW_GET_FUN(__glewBlendFuncSeparate)
+#define glFogCoordPointer GLEW_GET_FUN(__glewFogCoordPointer)
+#define glFogCoordd GLEW_GET_FUN(__glewFogCoordd)
+#define glFogCoorddv GLEW_GET_FUN(__glewFogCoorddv)
+#define glFogCoordf GLEW_GET_FUN(__glewFogCoordf)
+#define glFogCoordfv GLEW_GET_FUN(__glewFogCoordfv)
+#define glMultiDrawArrays GLEW_GET_FUN(__glewMultiDrawArrays)
+#define glMultiDrawElements GLEW_GET_FUN(__glewMultiDrawElements)
+#define glPointParameterf GLEW_GET_FUN(__glewPointParameterf)
+#define glPointParameterfv GLEW_GET_FUN(__glewPointParameterfv)
+#define glSecondaryColor3b GLEW_GET_FUN(__glewSecondaryColor3b)
+#define glSecondaryColor3bv GLEW_GET_FUN(__glewSecondaryColor3bv)
+#define glSecondaryColor3d GLEW_GET_FUN(__glewSecondaryColor3d)
+#define glSecondaryColor3dv GLEW_GET_FUN(__glewSecondaryColor3dv)
+#define glSecondaryColor3f GLEW_GET_FUN(__glewSecondaryColor3f)
+#define glSecondaryColor3fv GLEW_GET_FUN(__glewSecondaryColor3fv)
+#define glSecondaryColor3i GLEW_GET_FUN(__glewSecondaryColor3i)
+#define glSecondaryColor3iv GLEW_GET_FUN(__glewSecondaryColor3iv)
+#define glSecondaryColor3s GLEW_GET_FUN(__glewSecondaryColor3s)
+#define glSecondaryColor3sv GLEW_GET_FUN(__glewSecondaryColor3sv)
+#define glSecondaryColor3ub GLEW_GET_FUN(__glewSecondaryColor3ub)
+#define glSecondaryColor3ubv GLEW_GET_FUN(__glewSecondaryColor3ubv)
+#define glSecondaryColor3ui GLEW_GET_FUN(__glewSecondaryColor3ui)
+#define glSecondaryColor3uiv GLEW_GET_FUN(__glewSecondaryColor3uiv)
+#define glSecondaryColor3us GLEW_GET_FUN(__glewSecondaryColor3us)
+#define glSecondaryColor3usv GLEW_GET_FUN(__glewSecondaryColor3usv)
+#define glSecondaryColorPointer GLEW_GET_FUN(__glewSecondaryColorPointer)
+#define glWindowPos2d GLEW_GET_FUN(__glewWindowPos2d)
+#define glWindowPos2dv GLEW_GET_FUN(__glewWindowPos2dv)
+#define glWindowPos2f GLEW_GET_FUN(__glewWindowPos2f)
+#define glWindowPos2fv GLEW_GET_FUN(__glewWindowPos2fv)
+#define glWindowPos2i GLEW_GET_FUN(__glewWindowPos2i)
+#define glWindowPos2iv GLEW_GET_FUN(__glewWindowPos2iv)
+#define glWindowPos2s GLEW_GET_FUN(__glewWindowPos2s)
+#define glWindowPos2sv GLEW_GET_FUN(__glewWindowPos2sv)
+#define glWindowPos3d GLEW_GET_FUN(__glewWindowPos3d)
+#define glWindowPos3dv GLEW_GET_FUN(__glewWindowPos3dv)
+#define glWindowPos3f GLEW_GET_FUN(__glewWindowPos3f)
+#define glWindowPos3fv GLEW_GET_FUN(__glewWindowPos3fv)
+#define glWindowPos3i GLEW_GET_FUN(__glewWindowPos3i)
+#define glWindowPos3iv GLEW_GET_FUN(__glewWindowPos3iv)
+#define glWindowPos3s GLEW_GET_FUN(__glewWindowPos3s)
+#define glWindowPos3sv GLEW_GET_FUN(__glewWindowPos3sv)
+
+#define GLEW_VERSION_1_4 GLEW_GET_VAR(__GLEW_VERSION_1_4)
+
+#endif /* GL_VERSION_1_4 */
+
+/* ----------------------------- GL_VERSION_1_5 ---------------------------- */
+
+#ifndef GL_VERSION_1_5
+#define GL_VERSION_1_5 1
+
+#define GL_FOG_COORD_SRC GL_FOG_COORDINATE_SOURCE
+#define GL_FOG_COORD GL_FOG_COORDINATE
+#define GL_FOG_COORD_ARRAY GL_FOG_COORDINATE_ARRAY
+#define GL_SRC0_RGB GL_SOURCE0_RGB
+#define GL_FOG_COORD_ARRAY_POINTER GL_FOG_COORDINATE_ARRAY_POINTER
+#define GL_FOG_COORD_ARRAY_TYPE GL_FOG_COORDINATE_ARRAY_TYPE
+#define GL_SRC1_ALPHA GL_SOURCE1_ALPHA
+#define GL_CURRENT_FOG_COORD GL_CURRENT_FOG_COORDINATE
+#define GL_FOG_COORD_ARRAY_STRIDE GL_FOG_COORDINATE_ARRAY_STRIDE
+#define GL_SRC0_ALPHA GL_SOURCE0_ALPHA
+#define GL_SRC1_RGB GL_SOURCE1_RGB
+#define GL_FOG_COORD_ARRAY_BUFFER_BINDING GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING
+#define GL_SRC2_ALPHA GL_SOURCE2_ALPHA
+#define GL_SRC2_RGB GL_SOURCE2_RGB
+#define GL_BUFFER_SIZE 0x8764
+#define GL_BUFFER_USAGE 0x8765
+#define GL_QUERY_COUNTER_BITS 0x8864
+#define GL_CURRENT_QUERY 0x8865
+#define GL_QUERY_RESULT 0x8866
+#define GL_QUERY_RESULT_AVAILABLE 0x8867
+#define GL_ARRAY_BUFFER 0x8892
+#define GL_ELEMENT_ARRAY_BUFFER 0x8893
+#define GL_ARRAY_BUFFER_BINDING 0x8894
+#define GL_ELEMENT_ARRAY_BUFFER_BINDING 0x8895
+#define GL_VERTEX_ARRAY_BUFFER_BINDING 0x8896
+#define GL_NORMAL_ARRAY_BUFFER_BINDING 0x8897
+#define GL_COLOR_ARRAY_BUFFER_BINDING 0x8898
+#define GL_INDEX_ARRAY_BUFFER_BINDING 0x8899
+#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 0x889A
+#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING 0x889B
+#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING 0x889C
+#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING 0x889D
+#define GL_WEIGHT_ARRAY_BUFFER_BINDING 0x889E
+#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F
+#define GL_READ_ONLY 0x88B8
+#define GL_WRITE_ONLY 0x88B9
+#define GL_READ_WRITE 0x88BA
+#define GL_BUFFER_ACCESS 0x88BB
+#define GL_BUFFER_MAPPED 0x88BC
+#define GL_BUFFER_MAP_POINTER 0x88BD
+#define GL_STREAM_DRAW 0x88E0
+#define GL_STREAM_READ 0x88E1
+#define GL_STREAM_COPY 0x88E2
+#define GL_STATIC_DRAW 0x88E4
+#define GL_STATIC_READ 0x88E5
+#define GL_STATIC_COPY 0x88E6
+#define GL_DYNAMIC_DRAW 0x88E8
+#define GL_DYNAMIC_READ 0x88E9
+#define GL_DYNAMIC_COPY 0x88EA
+#define GL_SAMPLES_PASSED 0x8914
+
+typedef ptrdiff_t GLsizeiptr;
+typedef ptrdiff_t GLintptr;
+
+typedef void (GLAPIENTRY * PFNGLBEGINQUERYPROC) (GLenum target, GLuint id);
+typedef void (GLAPIENTRY * PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
+typedef void (GLAPIENTRY * PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, const GLvoid* data, GLenum usage);
+typedef void (GLAPIENTRY * PFNGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid* data);
+typedef void (GLAPIENTRY * PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint* buffers);
+typedef void (GLAPIENTRY * PFNGLDELETEQUERIESPROC) (GLsizei n, const GLuint* ids);
+typedef void (GLAPIENTRY * PFNGLENDQUERYPROC) (GLenum target);
+typedef void (GLAPIENTRY * PFNGLGENBUFFERSPROC) (GLsizei n, GLuint* buffers);
+typedef void (GLAPIENTRY * PFNGLGENQUERIESPROC) (GLsizei n, GLuint* ids);
+typedef void (GLAPIENTRY * PFNGLGETBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETBUFFERPOINTERVPROC) (GLenum target, GLenum pname, GLvoid** params);
+typedef void (GLAPIENTRY * PFNGLGETBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, GLvoid* data);
+typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTIVPROC) (GLuint id, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTUIVPROC) (GLuint id, GLenum pname, GLuint* params);
+typedef void (GLAPIENTRY * PFNGLGETQUERYIVPROC) (GLenum target, GLenum pname, GLint* params);
+typedef GLboolean (GLAPIENTRY * PFNGLISBUFFERPROC) (GLuint buffer);
+typedef GLboolean (GLAPIENTRY * PFNGLISQUERYPROC) (GLuint id);
+typedef GLvoid* (GLAPIENTRY * PFNGLMAPBUFFERPROC) (GLenum target, GLenum access);
+typedef GLboolean (GLAPIENTRY * PFNGLUNMAPBUFFERPROC) (GLenum target);
+
+#define glBeginQuery GLEW_GET_FUN(__glewBeginQuery)
+#define glBindBuffer GLEW_GET_FUN(__glewBindBuffer)
+#define glBufferData GLEW_GET_FUN(__glewBufferData)
+#define glBufferSubData GLEW_GET_FUN(__glewBufferSubData)
+#define glDeleteBuffers GLEW_GET_FUN(__glewDeleteBuffers)
+#define glDeleteQueries GLEW_GET_FUN(__glewDeleteQueries)
+#define glEndQuery GLEW_GET_FUN(__glewEndQuery)
+#define glGenBuffers GLEW_GET_FUN(__glewGenBuffers)
+#define glGenQueries GLEW_GET_FUN(__glewGenQueries)
+#define glGetBufferParameteriv GLEW_GET_FUN(__glewGetBufferParameteriv)
+#define glGetBufferPointerv GLEW_GET_FUN(__glewGetBufferPointerv)
+#define glGetBufferSubData GLEW_GET_FUN(__glewGetBufferSubData)
+#define glGetQueryObjectiv GLEW_GET_FUN(__glewGetQueryObjectiv)
+#define glGetQueryObjectuiv GLEW_GET_FUN(__glewGetQueryObjectuiv)
+#define glGetQueryiv GLEW_GET_FUN(__glewGetQueryiv)
+#define glIsBuffer GLEW_GET_FUN(__glewIsBuffer)
+#define glIsQuery GLEW_GET_FUN(__glewIsQuery)
+#define glMapBuffer GLEW_GET_FUN(__glewMapBuffer)
+#define glUnmapBuffer GLEW_GET_FUN(__glewUnmapBuffer)
+
+#define GLEW_VERSION_1_5 GLEW_GET_VAR(__GLEW_VERSION_1_5)
+
+#endif /* GL_VERSION_1_5 */
+
+/* ----------------------------- GL_VERSION_2_0 ---------------------------- */
+
+#ifndef GL_VERSION_2_0
+#define GL_VERSION_2_0 1
+
+#define GL_BLEND_EQUATION_RGB GL_BLEND_EQUATION
+#define GL_VERTEX_ATTRIB_ARRAY_ENABLED 0x8622
+#define GL_VERTEX_ATTRIB_ARRAY_SIZE 0x8623
+#define GL_VERTEX_ATTRIB_ARRAY_STRIDE 0x8624
+#define GL_VERTEX_ATTRIB_ARRAY_TYPE 0x8625
+#define GL_CURRENT_VERTEX_ATTRIB 0x8626
+#define GL_VERTEX_PROGRAM_POINT_SIZE 0x8642
+#define GL_VERTEX_PROGRAM_TWO_SIDE 0x8643
+#define GL_VERTEX_ATTRIB_ARRAY_POINTER 0x8645
+#define GL_STENCIL_BACK_FUNC 0x8800
+#define GL_STENCIL_BACK_FAIL 0x8801
+#define GL_STENCIL_BACK_PASS_DEPTH_FAIL 0x8802
+#define GL_STENCIL_BACK_PASS_DEPTH_PASS 0x8803
+#define GL_MAX_DRAW_BUFFERS 0x8824
+#define GL_DRAW_BUFFER0 0x8825
+#define GL_DRAW_BUFFER1 0x8826
+#define GL_DRAW_BUFFER2 0x8827
+#define GL_DRAW_BUFFER3 0x8828
+#define GL_DRAW_BUFFER4 0x8829
+#define GL_DRAW_BUFFER5 0x882A
+#define GL_DRAW_BUFFER6 0x882B
+#define GL_DRAW_BUFFER7 0x882C
+#define GL_DRAW_BUFFER8 0x882D
+#define GL_DRAW_BUFFER9 0x882E
+#define GL_DRAW_BUFFER10 0x882F
+#define GL_DRAW_BUFFER11 0x8830
+#define GL_DRAW_BUFFER12 0x8831
+#define GL_DRAW_BUFFER13 0x8832
+#define GL_DRAW_BUFFER14 0x8833
+#define GL_DRAW_BUFFER15 0x8834
+#define GL_BLEND_EQUATION_ALPHA 0x883D
+#define GL_POINT_SPRITE 0x8861
+#define GL_COORD_REPLACE 0x8862
+#define GL_MAX_VERTEX_ATTRIBS 0x8869
+#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A
+#define GL_MAX_TEXTURE_COORDS 0x8871
+#define GL_MAX_TEXTURE_IMAGE_UNITS 0x8872
+#define GL_FRAGMENT_SHADER 0x8B30
+#define GL_VERTEX_SHADER 0x8B31
+#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49
+#define GL_MAX_VERTEX_UNIFORM_COMPONENTS 0x8B4A
+#define GL_MAX_VARYING_FLOATS 0x8B4B
+#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C
+#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D
+#define GL_SHADER_TYPE 0x8B4F
+#define GL_FLOAT_VEC2 0x8B50
+#define GL_FLOAT_VEC3 0x8B51
+#define GL_FLOAT_VEC4 0x8B52
+#define GL_INT_VEC2 0x8B53
+#define GL_INT_VEC3 0x8B54
+#define GL_INT_VEC4 0x8B55
+#define GL_BOOL 0x8B56
+#define GL_BOOL_VEC2 0x8B57
+#define GL_BOOL_VEC3 0x8B58
+#define GL_BOOL_VEC4 0x8B59
+#define GL_FLOAT_MAT2 0x8B5A
+#define GL_FLOAT_MAT3 0x8B5B
+#define GL_FLOAT_MAT4 0x8B5C
+#define GL_SAMPLER_1D 0x8B5D
+#define GL_SAMPLER_2D 0x8B5E
+#define GL_SAMPLER_3D 0x8B5F
+#define GL_SAMPLER_CUBE 0x8B60
+#define GL_SAMPLER_1D_SHADOW 0x8B61
+#define GL_SAMPLER_2D_SHADOW 0x8B62
+#define GL_DELETE_STATUS 0x8B80
+#define GL_COMPILE_STATUS 0x8B81
+#define GL_LINK_STATUS 0x8B82
+#define GL_VALIDATE_STATUS 0x8B83
+#define GL_INFO_LOG_LENGTH 0x8B84
+#define GL_ATTACHED_SHADERS 0x8B85
+#define GL_ACTIVE_UNIFORMS 0x8B86
+#define GL_ACTIVE_UNIFORM_MAX_LENGTH 0x8B87
+#define GL_SHADER_SOURCE_LENGTH 0x8B88
+#define GL_ACTIVE_ATTRIBUTES 0x8B89
+#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH 0x8B8A
+#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT 0x8B8B
+#define GL_SHADING_LANGUAGE_VERSION 0x8B8C
+#define GL_CURRENT_PROGRAM 0x8B8D
+#define GL_POINT_SPRITE_COORD_ORIGIN 0x8CA0
+#define GL_LOWER_LEFT 0x8CA1
+#define GL_UPPER_LEFT 0x8CA2
+#define GL_STENCIL_BACK_REF 0x8CA3
+#define GL_STENCIL_BACK_VALUE_MASK 0x8CA4
+#define GL_STENCIL_BACK_WRITEMASK 0x8CA5
+
+typedef char GLchar;
+
+typedef void (GLAPIENTRY * PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader);
+typedef void (GLAPIENTRY * PFNGLBINDATTRIBLOCATIONPROC) (GLuint program, GLuint index, const GLchar* name);
+typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONSEPARATEPROC) (GLenum, GLenum);
+typedef void (GLAPIENTRY * PFNGLCOMPILESHADERPROC) (GLuint shader);
+typedef GLuint (GLAPIENTRY * PFNGLCREATEPROGRAMPROC) (void);
+typedef GLuint (GLAPIENTRY * PFNGLCREATESHADERPROC) (GLenum type);
+typedef void (GLAPIENTRY * PFNGLDELETEPROGRAMPROC) (GLuint program);
+typedef void (GLAPIENTRY * PFNGLDELETESHADERPROC) (GLuint shader);
+typedef void (GLAPIENTRY * PFNGLDETACHSHADERPROC) (GLuint program, GLuint shader);
+typedef void (GLAPIENTRY * PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint);
+typedef void (GLAPIENTRY * PFNGLDRAWBUFFERSPROC) (GLsizei n, const GLenum* bufs);
+typedef void (GLAPIENTRY * PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint);
+typedef void (GLAPIENTRY * PFNGLGETACTIVEATTRIBPROC) (GLuint program, GLuint index, GLsizei maxLength, GLsizei* length, GLint* size, GLenum* type, GLchar* name);
+typedef void (GLAPIENTRY * PFNGLGETACTIVEUNIFORMPROC) (GLuint program, GLuint index, GLsizei maxLength, GLsizei* length, GLint* size, GLenum* type, GLchar* name);
+typedef void (GLAPIENTRY * PFNGLGETATTACHEDSHADERSPROC) (GLuint program, GLsizei maxCount, GLsizei* count, GLuint* shaders);
+typedef GLint (GLAPIENTRY * PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const GLchar* name);
+typedef void (GLAPIENTRY * PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei* length, GLchar* infoLog);
+typedef void (GLAPIENTRY * PFNGLGETPROGRAMIVPROC) (GLuint program, GLenum pname, GLint* param);
+typedef void (GLAPIENTRY * PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei* length, GLchar* infoLog);
+typedef void (GLAPIENTRY * PFNGLGETSHADERSOURCEPROC) (GLint obj, GLsizei maxLength, GLsizei* length, GLchar* source);
+typedef void (GLAPIENTRY * PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint* param);
+typedef GLint (GLAPIENTRY * PFNGLGETUNIFORMLOCATIONPROC) (GLint programObj, const GLchar* name);
+typedef void (GLAPIENTRY * PFNGLGETUNIFORMFVPROC) (GLuint program, GLint location, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETUNIFORMIVPROC) (GLuint program, GLint location, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBPOINTERVPROC) (GLuint, GLenum, GLvoid*);
+typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBDVPROC) (GLuint, GLenum, GLdouble*);
+typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBFVPROC) (GLuint, GLenum, GLfloat*);
+typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBIVPROC) (GLuint, GLenum, GLint*);
+typedef GLboolean (GLAPIENTRY * PFNGLISPROGRAMPROC) (GLuint program);
+typedef GLboolean (GLAPIENTRY * PFNGLISSHADERPROC) (GLuint shader);
+typedef void (GLAPIENTRY * PFNGLLINKPROGRAMPROC) (GLuint program);
+typedef void (GLAPIENTRY * PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const GLchar** strings, const GLint* lengths);
+typedef void (GLAPIENTRY * PFNGLSTENCILFUNCSEPARATEPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+typedef void (GLAPIENTRY * PFNGLSTENCILMASKSEPARATEPROC) (GLenum, GLuint);
+typedef void (GLAPIENTRY * PFNGLSTENCILOPSEPARATEPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
+typedef void (GLAPIENTRY * PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0);
+typedef void (GLAPIENTRY * PFNGLUNIFORM1FVPROC) (GLint location, GLsizei count, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM1IPROC) (GLint location, GLint v0);
+typedef void (GLAPIENTRY * PFNGLUNIFORM1IVPROC) (GLint location, GLsizei count, const GLint* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM2FPROC) (GLint location, GLfloat v0, GLfloat v1);
+typedef void (GLAPIENTRY * PFNGLUNIFORM2FVPROC) (GLint location, GLsizei count, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM2IPROC) (GLint location, GLint v0, GLint v1);
+typedef void (GLAPIENTRY * PFNGLUNIFORM2IVPROC) (GLint location, GLsizei count, const GLint* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM3FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+typedef void (GLAPIENTRY * PFNGLUNIFORM3FVPROC) (GLint location, GLsizei count, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM3IPROC) (GLint location, GLint v0, GLint v1, GLint v2);
+typedef void (GLAPIENTRY * PFNGLUNIFORM3IVPROC) (GLint location, GLsizei count, const GLint* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM4FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+typedef void (GLAPIENTRY * PFNGLUNIFORM4FVPROC) (GLint location, GLsizei count, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM4IPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+typedef void (GLAPIENTRY * PFNGLUNIFORM4IVPROC) (GLint location, GLsizei count, const GLint* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLUSEPROGRAMPROC) (GLuint program);
+typedef void (GLAPIENTRY * PFNGLVALIDATEPROGRAMPROC) (GLuint program);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1DPROC) (GLuint index, GLdouble x);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1DVPROC) (GLuint index, const GLdouble* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1FPROC) (GLuint index, GLfloat x);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1FVPROC) (GLuint index, const GLfloat* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1SPROC) (GLuint index, GLshort x);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1SVPROC) (GLuint index, const GLshort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2DPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2DVPROC) (GLuint index, const GLdouble* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2FPROC) (GLuint index, GLfloat x, GLfloat y);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2FVPROC) (GLuint index, const GLfloat* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2SPROC) (GLuint index, GLshort x, GLshort y);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2SVPROC) (GLuint index, const GLshort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3DVPROC) (GLuint index, const GLdouble* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3FVPROC) (GLuint index, const GLfloat* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3SPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3SVPROC) (GLuint index, const GLshort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NBVPROC) (GLuint index, const GLbyte* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NIVPROC) (GLuint index, const GLint* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NSVPROC) (GLuint index, const GLshort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NUBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NUBVPROC) (GLuint index, const GLubyte* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NUIVPROC) (GLuint index, const GLuint* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NUSVPROC) (GLuint index, const GLushort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4BVPROC) (GLuint index, const GLbyte* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4DVPROC) (GLuint index, const GLdouble* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4FVPROC) (GLuint index, const GLfloat* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4IVPROC) (GLuint index, const GLint* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4SPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4SVPROC) (GLuint index, const GLshort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4UBVPROC) (GLuint index, const GLubyte* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4UIVPROC) (GLuint index, const GLuint* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4USVPROC) (GLuint index, const GLushort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid* pointer);
+
+#define glAttachShader GLEW_GET_FUN(__glewAttachShader)
+#define glBindAttribLocation GLEW_GET_FUN(__glewBindAttribLocation)
+#define glBlendEquationSeparate GLEW_GET_FUN(__glewBlendEquationSeparate)
+#define glCompileShader GLEW_GET_FUN(__glewCompileShader)
+#define glCreateProgram GLEW_GET_FUN(__glewCreateProgram)
+#define glCreateShader GLEW_GET_FUN(__glewCreateShader)
+#define glDeleteProgram GLEW_GET_FUN(__glewDeleteProgram)
+#define glDeleteShader GLEW_GET_FUN(__glewDeleteShader)
+#define glDetachShader GLEW_GET_FUN(__glewDetachShader)
+#define glDisableVertexAttribArray GLEW_GET_FUN(__glewDisableVertexAttribArray)
+#define glDrawBuffers GLEW_GET_FUN(__glewDrawBuffers)
+#define glEnableVertexAttribArray GLEW_GET_FUN(__glewEnableVertexAttribArray)
+#define glGetActiveAttrib GLEW_GET_FUN(__glewGetActiveAttrib)
+#define glGetActiveUniform GLEW_GET_FUN(__glewGetActiveUniform)
+#define glGetAttachedShaders GLEW_GET_FUN(__glewGetAttachedShaders)
+#define glGetAttribLocation GLEW_GET_FUN(__glewGetAttribLocation)
+#define glGetProgramInfoLog GLEW_GET_FUN(__glewGetProgramInfoLog)
+#define glGetProgramiv GLEW_GET_FUN(__glewGetProgramiv)
+#define glGetShaderInfoLog GLEW_GET_FUN(__glewGetShaderInfoLog)
+#define glGetShaderSource GLEW_GET_FUN(__glewGetShaderSource)
+#define glGetShaderiv GLEW_GET_FUN(__glewGetShaderiv)
+#define glGetUniformLocation GLEW_GET_FUN(__glewGetUniformLocation)
+#define glGetUniformfv GLEW_GET_FUN(__glewGetUniformfv)
+#define glGetUniformiv GLEW_GET_FUN(__glewGetUniformiv)
+#define glGetVertexAttribPointerv GLEW_GET_FUN(__glewGetVertexAttribPointerv)
+#define glGetVertexAttribdv GLEW_GET_FUN(__glewGetVertexAttribdv)
+#define glGetVertexAttribfv GLEW_GET_FUN(__glewGetVertexAttribfv)
+#define glGetVertexAttribiv GLEW_GET_FUN(__glewGetVertexAttribiv)
+#define glIsProgram GLEW_GET_FUN(__glewIsProgram)
+#define glIsShader GLEW_GET_FUN(__glewIsShader)
+#define glLinkProgram GLEW_GET_FUN(__glewLinkProgram)
+#define glShaderSource GLEW_GET_FUN(__glewShaderSource)
+#define glStencilFuncSeparate GLEW_GET_FUN(__glewStencilFuncSeparate)
+#define glStencilMaskSeparate GLEW_GET_FUN(__glewStencilMaskSeparate)
+#define glStencilOpSeparate GLEW_GET_FUN(__glewStencilOpSeparate)
+#define glUniform1f GLEW_GET_FUN(__glewUniform1f)
+#define glUniform1fv GLEW_GET_FUN(__glewUniform1fv)
+#define glUniform1i GLEW_GET_FUN(__glewUniform1i)
+#define glUniform1iv GLEW_GET_FUN(__glewUniform1iv)
+#define glUniform2f GLEW_GET_FUN(__glewUniform2f)
+#define glUniform2fv GLEW_GET_FUN(__glewUniform2fv)
+#define glUniform2i GLEW_GET_FUN(__glewUniform2i)
+#define glUniform2iv GLEW_GET_FUN(__glewUniform2iv)
+#define glUniform3f GLEW_GET_FUN(__glewUniform3f)
+#define glUniform3fv GLEW_GET_FUN(__glewUniform3fv)
+#define glUniform3i GLEW_GET_FUN(__glewUniform3i)
+#define glUniform3iv GLEW_GET_FUN(__glewUniform3iv)
+#define glUniform4f GLEW_GET_FUN(__glewUniform4f)
+#define glUniform4fv GLEW_GET_FUN(__glewUniform4fv)
+#define glUniform4i GLEW_GET_FUN(__glewUniform4i)
+#define glUniform4iv GLEW_GET_FUN(__glewUniform4iv)
+#define glUniformMatrix2fv GLEW_GET_FUN(__glewUniformMatrix2fv)
+#define glUniformMatrix3fv GLEW_GET_FUN(__glewUniformMatrix3fv)
+#define glUniformMatrix4fv GLEW_GET_FUN(__glewUniformMatrix4fv)
+#define glUseProgram GLEW_GET_FUN(__glewUseProgram)
+#define glValidateProgram GLEW_GET_FUN(__glewValidateProgram)
+#define glVertexAttrib1d GLEW_GET_FUN(__glewVertexAttrib1d)
+#define glVertexAttrib1dv GLEW_GET_FUN(__glewVertexAttrib1dv)
+#define glVertexAttrib1f GLEW_GET_FUN(__glewVertexAttrib1f)
+#define glVertexAttrib1fv GLEW_GET_FUN(__glewVertexAttrib1fv)
+#define glVertexAttrib1s GLEW_GET_FUN(__glewVertexAttrib1s)
+#define glVertexAttrib1sv GLEW_GET_FUN(__glewVertexAttrib1sv)
+#define glVertexAttrib2d GLEW_GET_FUN(__glewVertexAttrib2d)
+#define glVertexAttrib2dv GLEW_GET_FUN(__glewVertexAttrib2dv)
+#define glVertexAttrib2f GLEW_GET_FUN(__glewVertexAttrib2f)
+#define glVertexAttrib2fv GLEW_GET_FUN(__glewVertexAttrib2fv)
+#define glVertexAttrib2s GLEW_GET_FUN(__glewVertexAttrib2s)
+#define glVertexAttrib2sv GLEW_GET_FUN(__glewVertexAttrib2sv)
+#define glVertexAttrib3d GLEW_GET_FUN(__glewVertexAttrib3d)
+#define glVertexAttrib3dv GLEW_GET_FUN(__glewVertexAttrib3dv)
+#define glVertexAttrib3f GLEW_GET_FUN(__glewVertexAttrib3f)
+#define glVertexAttrib3fv GLEW_GET_FUN(__glewVertexAttrib3fv)
+#define glVertexAttrib3s GLEW_GET_FUN(__glewVertexAttrib3s)
+#define glVertexAttrib3sv GLEW_GET_FUN(__glewVertexAttrib3sv)
+#define glVertexAttrib4Nbv GLEW_GET_FUN(__glewVertexAttrib4Nbv)
+#define glVertexAttrib4Niv GLEW_GET_FUN(__glewVertexAttrib4Niv)
+#define glVertexAttrib4Nsv GLEW_GET_FUN(__glewVertexAttrib4Nsv)
+#define glVertexAttrib4Nub GLEW_GET_FUN(__glewVertexAttrib4Nub)
+#define glVertexAttrib4Nubv GLEW_GET_FUN(__glewVertexAttrib4Nubv)
+#define glVertexAttrib4Nuiv GLEW_GET_FUN(__glewVertexAttrib4Nuiv)
+#define glVertexAttrib4Nusv GLEW_GET_FUN(__glewVertexAttrib4Nusv)
+#define glVertexAttrib4bv GLEW_GET_FUN(__glewVertexAttrib4bv)
+#define glVertexAttrib4d GLEW_GET_FUN(__glewVertexAttrib4d)
+#define glVertexAttrib4dv GLEW_GET_FUN(__glewVertexAttrib4dv)
+#define glVertexAttrib4f GLEW_GET_FUN(__glewVertexAttrib4f)
+#define glVertexAttrib4fv GLEW_GET_FUN(__glewVertexAttrib4fv)
+#define glVertexAttrib4iv GLEW_GET_FUN(__glewVertexAttrib4iv)
+#define glVertexAttrib4s GLEW_GET_FUN(__glewVertexAttrib4s)
+#define glVertexAttrib4sv GLEW_GET_FUN(__glewVertexAttrib4sv)
+#define glVertexAttrib4ubv GLEW_GET_FUN(__glewVertexAttrib4ubv)
+#define glVertexAttrib4uiv GLEW_GET_FUN(__glewVertexAttrib4uiv)
+#define glVertexAttrib4usv GLEW_GET_FUN(__glewVertexAttrib4usv)
+#define glVertexAttribPointer GLEW_GET_FUN(__glewVertexAttribPointer)
+
+#define GLEW_VERSION_2_0 GLEW_GET_VAR(__GLEW_VERSION_2_0)
+
+#endif /* GL_VERSION_2_0 */
+
+/* -------------------------- GL_3DFX_multisample -------------------------- */
+
+#ifndef GL_3DFX_multisample
+#define GL_3DFX_multisample 1
+
+#define GL_MULTISAMPLE_3DFX 0x86B2
+#define GL_SAMPLE_BUFFERS_3DFX 0x86B3
+#define GL_SAMPLES_3DFX 0x86B4
+#define GL_MULTISAMPLE_BIT_3DFX 0x20000000
+
+#define GLEW_3DFX_multisample GLEW_GET_VAR(__GLEW_3DFX_multisample)
+
+#endif /* GL_3DFX_multisample */
+
+/* ---------------------------- GL_3DFX_tbuffer ---------------------------- */
+
+#ifndef GL_3DFX_tbuffer
+#define GL_3DFX_tbuffer 1
+
+typedef void (GLAPIENTRY * PFNGLTBUFFERMASK3DFXPROC) (GLuint mask);
+
+#define glTbufferMask3DFX GLEW_GET_FUN(__glewTbufferMask3DFX)
+
+#define GLEW_3DFX_tbuffer GLEW_GET_VAR(__GLEW_3DFX_tbuffer)
+
+#endif /* GL_3DFX_tbuffer */
+
+/* -------------------- GL_3DFX_texture_compression_FXT1 ------------------- */
+
+#ifndef GL_3DFX_texture_compression_FXT1
+#define GL_3DFX_texture_compression_FXT1 1
+
+#define GL_COMPRESSED_RGB_FXT1_3DFX 0x86B0
+#define GL_COMPRESSED_RGBA_FXT1_3DFX 0x86B1
+
+#define GLEW_3DFX_texture_compression_FXT1 GLEW_GET_VAR(__GLEW_3DFX_texture_compression_FXT1)
+
+#endif /* GL_3DFX_texture_compression_FXT1 */
+
+/* ------------------------ GL_APPLE_client_storage ------------------------ */
+
+#ifndef GL_APPLE_client_storage
+#define GL_APPLE_client_storage 1
+
+#define GL_UNPACK_CLIENT_STORAGE_APPLE 0x85B2
+
+#define GLEW_APPLE_client_storage GLEW_GET_VAR(__GLEW_APPLE_client_storage)
+
+#endif /* GL_APPLE_client_storage */
+
+/* ------------------------- GL_APPLE_element_array ------------------------ */
+
+#ifndef GL_APPLE_element_array
+#define GL_APPLE_element_array 1
+
+#define GL_ELEMENT_ARRAY_APPLE 0x8768
+#define GL_ELEMENT_ARRAY_TYPE_APPLE 0x8769
+#define GL_ELEMENT_ARRAY_POINTER_APPLE 0x876A
+
+typedef void (GLAPIENTRY * PFNGLDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, GLint first, GLsizei count);
+typedef void (GLAPIENTRY * PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, GLint first, GLsizei count);
+typedef void (GLAPIENTRY * PFNGLELEMENTPOINTERAPPLEPROC) (GLenum type, const void* pointer);
+typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, const GLint* first, const GLsizei *count, GLsizei primcount);
+typedef void (GLAPIENTRY * PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, const GLint* first, const GLsizei *count, GLsizei primcount);
+
+#define glDrawElementArrayAPPLE GLEW_GET_FUN(__glewDrawElementArrayAPPLE)
+#define glDrawRangeElementArrayAPPLE GLEW_GET_FUN(__glewDrawRangeElementArrayAPPLE)
+#define glElementPointerAPPLE GLEW_GET_FUN(__glewElementPointerAPPLE)
+#define glMultiDrawElementArrayAPPLE GLEW_GET_FUN(__glewMultiDrawElementArrayAPPLE)
+#define glMultiDrawRangeElementArrayAPPLE GLEW_GET_FUN(__glewMultiDrawRangeElementArrayAPPLE)
+
+#define GLEW_APPLE_element_array GLEW_GET_VAR(__GLEW_APPLE_element_array)
+
+#endif /* GL_APPLE_element_array */
+
+/* ----------------------------- GL_APPLE_fence ---------------------------- */
+
+#ifndef GL_APPLE_fence
+#define GL_APPLE_fence 1
+
+#define GL_DRAW_PIXELS_APPLE 0x8A0A
+#define GL_FENCE_APPLE 0x8A0B
+
+typedef void (GLAPIENTRY * PFNGLDELETEFENCESAPPLEPROC) (GLsizei n, const GLuint* fences);
+typedef void (GLAPIENTRY * PFNGLFINISHFENCEAPPLEPROC) (GLuint fence);
+typedef void (GLAPIENTRY * PFNGLFINISHOBJECTAPPLEPROC) (GLenum object, GLint name);
+typedef void (GLAPIENTRY * PFNGLGENFENCESAPPLEPROC) (GLsizei n, GLuint* fences);
+typedef GLboolean (GLAPIENTRY * PFNGLISFENCEAPPLEPROC) (GLuint fence);
+typedef void (GLAPIENTRY * PFNGLSETFENCEAPPLEPROC) (GLuint fence);
+typedef GLboolean (GLAPIENTRY * PFNGLTESTFENCEAPPLEPROC) (GLuint fence);
+typedef GLboolean (GLAPIENTRY * PFNGLTESTOBJECTAPPLEPROC) (GLenum object, GLuint name);
+
+#define glDeleteFencesAPPLE GLEW_GET_FUN(__glewDeleteFencesAPPLE)
+#define glFinishFenceAPPLE GLEW_GET_FUN(__glewFinishFenceAPPLE)
+#define glFinishObjectAPPLE GLEW_GET_FUN(__glewFinishObjectAPPLE)
+#define glGenFencesAPPLE GLEW_GET_FUN(__glewGenFencesAPPLE)
+#define glIsFenceAPPLE GLEW_GET_FUN(__glewIsFenceAPPLE)
+#define glSetFenceAPPLE GLEW_GET_FUN(__glewSetFenceAPPLE)
+#define glTestFenceAPPLE GLEW_GET_FUN(__glewTestFenceAPPLE)
+#define glTestObjectAPPLE GLEW_GET_FUN(__glewTestObjectAPPLE)
+
+#define GLEW_APPLE_fence GLEW_GET_VAR(__GLEW_APPLE_fence)
+
+#endif /* GL_APPLE_fence */
+
+/* ------------------------- GL_APPLE_float_pixels ------------------------- */
+
+#ifndef GL_APPLE_float_pixels
+#define GL_APPLE_float_pixels 1
+
+#define GL_HALF_APPLE 0x140B
+#define GL_RGBA_FLOAT32_APPLE 0x8814
+#define GL_RGB_FLOAT32_APPLE 0x8815
+#define GL_ALPHA_FLOAT32_APPLE 0x8816
+#define GL_INTENSITY_FLOAT32_APPLE 0x8817
+#define GL_LUMINANCE_FLOAT32_APPLE 0x8818
+#define GL_LUMINANCE_ALPHA_FLOAT32_APPLE 0x8819
+#define GL_RGBA_FLOAT16_APPLE 0x881A
+#define GL_RGB_FLOAT16_APPLE 0x881B
+#define GL_ALPHA_FLOAT16_APPLE 0x881C
+#define GL_INTENSITY_FLOAT16_APPLE 0x881D
+#define GL_LUMINANCE_FLOAT16_APPLE 0x881E
+#define GL_LUMINANCE_ALPHA_FLOAT16_APPLE 0x881F
+#define GL_COLOR_FLOAT_APPLE 0x8A0F
+
+#define GLEW_APPLE_float_pixels GLEW_GET_VAR(__GLEW_APPLE_float_pixels)
+
+#endif /* GL_APPLE_float_pixels */
+
+/* ------------------------- GL_APPLE_pixel_buffer ------------------------- */
+
+#ifndef GL_APPLE_pixel_buffer
+#define GL_APPLE_pixel_buffer 1
+
+#define GL_MIN_PBUFFER_VIEWPORT_DIMS_APPLE 0x8A10
+
+#define GLEW_APPLE_pixel_buffer GLEW_GET_VAR(__GLEW_APPLE_pixel_buffer)
+
+#endif /* GL_APPLE_pixel_buffer */
+
+/* ------------------------ GL_APPLE_specular_vector ----------------------- */
+
+#ifndef GL_APPLE_specular_vector
+#define GL_APPLE_specular_vector 1
+
+#define GL_LIGHT_MODEL_SPECULAR_VECTOR_APPLE 0x85B0
+
+#define GLEW_APPLE_specular_vector GLEW_GET_VAR(__GLEW_APPLE_specular_vector)
+
+#endif /* GL_APPLE_specular_vector */
+
+/* ------------------------- GL_APPLE_texture_range ------------------------ */
+
+#ifndef GL_APPLE_texture_range
+#define GL_APPLE_texture_range 1
+
+#define GL_TEXTURE_RANGE_LENGTH_APPLE 0x85B7
+#define GL_TEXTURE_RANGE_POINTER_APPLE 0x85B8
+#define GL_TEXTURE_STORAGE_HINT_APPLE 0x85BC
+#define GL_STORAGE_PRIVATE_APPLE 0x85BD
+#define GL_STORAGE_CACHED_APPLE 0x85BE
+#define GL_STORAGE_SHARED_APPLE 0x85BF
+
+typedef void (GLAPIENTRY * PFNGLGETTEXPARAMETERPOINTERVAPPLEPROC) (GLenum target, GLenum pname, GLvoid **params);
+typedef void (GLAPIENTRY * PFNGLTEXTURERANGEAPPLEPROC) (GLenum target, GLsizei length, GLvoid *pointer);
+
+#define glGetTexParameterPointervAPPLE GLEW_GET_FUN(__glewGetTexParameterPointervAPPLE)
+#define glTextureRangeAPPLE GLEW_GET_FUN(__glewTextureRangeAPPLE)
+
+#define GLEW_APPLE_texture_range GLEW_GET_VAR(__GLEW_APPLE_texture_range)
+
+#endif /* GL_APPLE_texture_range */
+
+/* ------------------------ GL_APPLE_transform_hint ------------------------ */
+
+#ifndef GL_APPLE_transform_hint
+#define GL_APPLE_transform_hint 1
+
+#define GL_TRANSFORM_HINT_APPLE 0x85B1
+
+#define GLEW_APPLE_transform_hint GLEW_GET_VAR(__GLEW_APPLE_transform_hint)
+
+#endif /* GL_APPLE_transform_hint */
+
+/* ---------------------- GL_APPLE_vertex_array_object --------------------- */
+
+#ifndef GL_APPLE_vertex_array_object
+#define GL_APPLE_vertex_array_object 1
+
+#define GL_VERTEX_ARRAY_BINDING_APPLE 0x85B5
+
+typedef void (GLAPIENTRY * PFNGLBINDVERTEXARRAYAPPLEPROC) (GLuint array);
+typedef void (GLAPIENTRY * PFNGLDELETEVERTEXARRAYSAPPLEPROC) (GLsizei n, const GLuint* arrays);
+typedef void (GLAPIENTRY * PFNGLGENVERTEXARRAYSAPPLEPROC) (GLsizei n, const GLuint* arrays);
+typedef GLboolean (GLAPIENTRY * PFNGLISVERTEXARRAYAPPLEPROC) (GLuint array);
+
+#define glBindVertexArrayAPPLE GLEW_GET_FUN(__glewBindVertexArrayAPPLE)
+#define glDeleteVertexArraysAPPLE GLEW_GET_FUN(__glewDeleteVertexArraysAPPLE)
+#define glGenVertexArraysAPPLE GLEW_GET_FUN(__glewGenVertexArraysAPPLE)
+#define glIsVertexArrayAPPLE GLEW_GET_FUN(__glewIsVertexArrayAPPLE)
+
+#define GLEW_APPLE_vertex_array_object GLEW_GET_VAR(__GLEW_APPLE_vertex_array_object)
+
+#endif /* GL_APPLE_vertex_array_object */
+
+/* ---------------------- GL_APPLE_vertex_array_range ---------------------- */
+
+#ifndef GL_APPLE_vertex_array_range
+#define GL_APPLE_vertex_array_range 1
+
+#define GL_VERTEX_ARRAY_RANGE_APPLE 0x851D
+#define GL_VERTEX_ARRAY_RANGE_LENGTH_APPLE 0x851E
+#define GL_VERTEX_ARRAY_STORAGE_HINT_APPLE 0x851F
+#define GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_APPLE 0x8520
+#define GL_VERTEX_ARRAY_RANGE_POINTER_APPLE 0x8521
+#define GL_STORAGE_CACHED_APPLE 0x85BE
+#define GL_STORAGE_SHARED_APPLE 0x85BF
+
+typedef void (GLAPIENTRY * PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, void* pointer);
+typedef void (GLAPIENTRY * PFNGLVERTEXARRAYPARAMETERIAPPLEPROC) (GLenum pname, GLint param);
+typedef void (GLAPIENTRY * PFNGLVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, void* pointer);
+
+#define glFlushVertexArrayRangeAPPLE GLEW_GET_FUN(__glewFlushVertexArrayRangeAPPLE)
+#define glVertexArrayParameteriAPPLE GLEW_GET_FUN(__glewVertexArrayParameteriAPPLE)
+#define glVertexArrayRangeAPPLE GLEW_GET_FUN(__glewVertexArrayRangeAPPLE)
+
+#define GLEW_APPLE_vertex_array_range GLEW_GET_VAR(__GLEW_APPLE_vertex_array_range)
+
+#endif /* GL_APPLE_vertex_array_range */
+
+/* --------------------------- GL_APPLE_ycbcr_422 -------------------------- */
+
+#ifndef GL_APPLE_ycbcr_422
+#define GL_APPLE_ycbcr_422 1
+
+#define GL_YCBCR_422_APPLE 0x85B9
+#define GL_UNSIGNED_SHORT_8_8_APPLE 0x85BA
+#define GL_UNSIGNED_SHORT_8_8_REV_APPLE 0x85BB
+
+#define GLEW_APPLE_ycbcr_422 GLEW_GET_VAR(__GLEW_APPLE_ycbcr_422)
+
+#endif /* GL_APPLE_ycbcr_422 */
+
+/* ----------------------- GL_ARB_color_buffer_float ----------------------- */
+
+#ifndef GL_ARB_color_buffer_float
+#define GL_ARB_color_buffer_float 1
+
+#define GL_RGBA_FLOAT_MODE_ARB 0x8820
+#define GL_CLAMP_VERTEX_COLOR_ARB 0x891A
+#define GL_CLAMP_FRAGMENT_COLOR_ARB 0x891B
+#define GL_CLAMP_READ_COLOR_ARB 0x891C
+#define GL_FIXED_ONLY_ARB 0x891D
+
+typedef void (GLAPIENTRY * PFNGLCLAMPCOLORARBPROC) (GLenum target, GLenum clamp);
+
+#define glClampColorARB GLEW_GET_FUN(__glewClampColorARB)
+
+#define GLEW_ARB_color_buffer_float GLEW_GET_VAR(__GLEW_ARB_color_buffer_float)
+
+#endif /* GL_ARB_color_buffer_float */
+
+/* -------------------------- GL_ARB_depth_texture ------------------------- */
+
+#ifndef GL_ARB_depth_texture
+#define GL_ARB_depth_texture 1
+
+#define GL_DEPTH_COMPONENT16_ARB 0x81A5
+#define GL_DEPTH_COMPONENT24_ARB 0x81A6
+#define GL_DEPTH_COMPONENT32_ARB 0x81A7
+#define GL_TEXTURE_DEPTH_SIZE_ARB 0x884A
+#define GL_DEPTH_TEXTURE_MODE_ARB 0x884B
+
+#define GLEW_ARB_depth_texture GLEW_GET_VAR(__GLEW_ARB_depth_texture)
+
+#endif /* GL_ARB_depth_texture */
+
+/* -------------------------- GL_ARB_draw_buffers -------------------------- */
+
+#ifndef GL_ARB_draw_buffers
+#define GL_ARB_draw_buffers 1
+
+#define GL_MAX_DRAW_BUFFERS_ARB 0x8824
+#define GL_DRAW_BUFFER0_ARB 0x8825
+#define GL_DRAW_BUFFER1_ARB 0x8826
+#define GL_DRAW_BUFFER2_ARB 0x8827
+#define GL_DRAW_BUFFER3_ARB 0x8828
+#define GL_DRAW_BUFFER4_ARB 0x8829
+#define GL_DRAW_BUFFER5_ARB 0x882A
+#define GL_DRAW_BUFFER6_ARB 0x882B
+#define GL_DRAW_BUFFER7_ARB 0x882C
+#define GL_DRAW_BUFFER8_ARB 0x882D
+#define GL_DRAW_BUFFER9_ARB 0x882E
+#define GL_DRAW_BUFFER10_ARB 0x882F
+#define GL_DRAW_BUFFER11_ARB 0x8830
+#define GL_DRAW_BUFFER12_ARB 0x8831
+#define GL_DRAW_BUFFER13_ARB 0x8832
+#define GL_DRAW_BUFFER14_ARB 0x8833
+#define GL_DRAW_BUFFER15_ARB 0x8834
+
+typedef void (GLAPIENTRY * PFNGLDRAWBUFFERSARBPROC) (GLsizei n, const GLenum* bufs);
+
+#define glDrawBuffersARB GLEW_GET_FUN(__glewDrawBuffersARB)
+
+#define GLEW_ARB_draw_buffers GLEW_GET_VAR(__GLEW_ARB_draw_buffers)
+
+#endif /* GL_ARB_draw_buffers */
+
+/* ------------------------ GL_ARB_fragment_program ------------------------ */
+
+#ifndef GL_ARB_fragment_program
+#define GL_ARB_fragment_program 1
+
+#define GL_FRAGMENT_PROGRAM_ARB 0x8804
+#define GL_PROGRAM_ALU_INSTRUCTIONS_ARB 0x8805
+#define GL_PROGRAM_TEX_INSTRUCTIONS_ARB 0x8806
+#define GL_PROGRAM_TEX_INDIRECTIONS_ARB 0x8807
+#define GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x8808
+#define GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x8809
+#define GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x880A
+#define GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB 0x880B
+#define GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB 0x880C
+#define GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB 0x880D
+#define GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x880E
+#define GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x880F
+#define GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x8810
+#define GL_MAX_TEXTURE_COORDS_ARB 0x8871
+#define GL_MAX_TEXTURE_IMAGE_UNITS_ARB 0x8872
+
+#define GLEW_ARB_fragment_program GLEW_GET_VAR(__GLEW_ARB_fragment_program)
+
+#endif /* GL_ARB_fragment_program */
+
+/* --------------------- GL_ARB_fragment_program_shadow -------------------- */
+
+#ifndef GL_ARB_fragment_program_shadow
+#define GL_ARB_fragment_program_shadow 1
+
+#define GLEW_ARB_fragment_program_shadow GLEW_GET_VAR(__GLEW_ARB_fragment_program_shadow)
+
+#endif /* GL_ARB_fragment_program_shadow */
+
+/* ------------------------- GL_ARB_fragment_shader ------------------------ */
+
+#ifndef GL_ARB_fragment_shader
+#define GL_ARB_fragment_shader 1
+
+#define GL_FRAGMENT_SHADER_ARB 0x8B30
+#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB 0x8B49
+#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB 0x8B8B
+
+#define GLEW_ARB_fragment_shader GLEW_GET_VAR(__GLEW_ARB_fragment_shader)
+
+#endif /* GL_ARB_fragment_shader */
+
+/* ------------------------ GL_ARB_half_float_pixel ------------------------ */
+
+#ifndef GL_ARB_half_float_pixel
+#define GL_ARB_half_float_pixel 1
+
+#define GL_HALF_FLOAT_ARB 0x140B
+
+#define GLEW_ARB_half_float_pixel GLEW_GET_VAR(__GLEW_ARB_half_float_pixel)
+
+#endif /* GL_ARB_half_float_pixel */
+
+/* ----------------------------- GL_ARB_imaging ---------------------------- */
+
+#ifndef GL_ARB_imaging
+#define GL_ARB_imaging 1
+
+#define GL_CONSTANT_COLOR 0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR 0x8002
+#define GL_CONSTANT_ALPHA 0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004
+#define GL_BLEND_COLOR 0x8005
+#define GL_FUNC_ADD 0x8006
+#define GL_MIN 0x8007
+#define GL_MAX 0x8008
+#define GL_BLEND_EQUATION 0x8009
+#define GL_FUNC_SUBTRACT 0x800A
+#define GL_FUNC_REVERSE_SUBTRACT 0x800B
+#define GL_CONVOLUTION_1D 0x8010
+#define GL_CONVOLUTION_2D 0x8011
+#define GL_SEPARABLE_2D 0x8012
+#define GL_CONVOLUTION_BORDER_MODE 0x8013
+#define GL_CONVOLUTION_FILTER_SCALE 0x8014
+#define GL_CONVOLUTION_FILTER_BIAS 0x8015
+#define GL_REDUCE 0x8016
+#define GL_CONVOLUTION_FORMAT 0x8017
+#define GL_CONVOLUTION_WIDTH 0x8018
+#define GL_CONVOLUTION_HEIGHT 0x8019
+#define GL_MAX_CONVOLUTION_WIDTH 0x801A
+#define GL_MAX_CONVOLUTION_HEIGHT 0x801B
+#define GL_POST_CONVOLUTION_RED_SCALE 0x801C
+#define GL_POST_CONVOLUTION_GREEN_SCALE 0x801D
+#define GL_POST_CONVOLUTION_BLUE_SCALE 0x801E
+#define GL_POST_CONVOLUTION_ALPHA_SCALE 0x801F
+#define GL_POST_CONVOLUTION_RED_BIAS 0x8020
+#define GL_POST_CONVOLUTION_GREEN_BIAS 0x8021
+#define GL_POST_CONVOLUTION_BLUE_BIAS 0x8022
+#define GL_POST_CONVOLUTION_ALPHA_BIAS 0x8023
+#define GL_HISTOGRAM 0x8024
+#define GL_PROXY_HISTOGRAM 0x8025
+#define GL_HISTOGRAM_WIDTH 0x8026
+#define GL_HISTOGRAM_FORMAT 0x8027
+#define GL_HISTOGRAM_RED_SIZE 0x8028
+#define GL_HISTOGRAM_GREEN_SIZE 0x8029
+#define GL_HISTOGRAM_BLUE_SIZE 0x802A
+#define GL_HISTOGRAM_ALPHA_SIZE 0x802B
+#define GL_HISTOGRAM_LUMINANCE_SIZE 0x802C
+#define GL_HISTOGRAM_SINK 0x802D
+#define GL_MINMAX 0x802E
+#define GL_MINMAX_FORMAT 0x802F
+#define GL_MINMAX_SINK 0x8030
+#define GL_TABLE_TOO_LARGE 0x8031
+#define GL_COLOR_MATRIX 0x80B1
+#define GL_COLOR_MATRIX_STACK_DEPTH 0x80B2
+#define GL_MAX_COLOR_MATRIX_STACK_DEPTH 0x80B3
+#define GL_POST_COLOR_MATRIX_RED_SCALE 0x80B4
+#define GL_POST_COLOR_MATRIX_GREEN_SCALE 0x80B5
+#define GL_POST_COLOR_MATRIX_BLUE_SCALE 0x80B6
+#define GL_POST_COLOR_MATRIX_ALPHA_SCALE 0x80B7
+#define GL_POST_COLOR_MATRIX_RED_BIAS 0x80B8
+#define GL_POST_COLOR_MATRIX_GREEN_BIAS 0x80B9
+#define GL_POST_COLOR_MATRIX_BLUE_BIAS 0x80BA
+#define GL_POST_COLOR_MATRIX_ALPHA_BIAS 0x80BB
+#define GL_COLOR_TABLE 0x80D0
+#define GL_POST_CONVOLUTION_COLOR_TABLE 0x80D1
+#define GL_POST_COLOR_MATRIX_COLOR_TABLE 0x80D2
+#define GL_PROXY_COLOR_TABLE 0x80D3
+#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4
+#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5
+#define GL_COLOR_TABLE_SCALE 0x80D6
+#define GL_COLOR_TABLE_BIAS 0x80D7
+#define GL_COLOR_TABLE_FORMAT 0x80D8
+#define GL_COLOR_TABLE_WIDTH 0x80D9
+#define GL_COLOR_TABLE_RED_SIZE 0x80DA
+#define GL_COLOR_TABLE_GREEN_SIZE 0x80DB
+#define GL_COLOR_TABLE_BLUE_SIZE 0x80DC
+#define GL_COLOR_TABLE_ALPHA_SIZE 0x80DD
+#define GL_COLOR_TABLE_LUMINANCE_SIZE 0x80DE
+#define GL_COLOR_TABLE_INTENSITY_SIZE 0x80DF
+#define GL_IGNORE_BORDER 0x8150
+#define GL_CONSTANT_BORDER 0x8151
+#define GL_WRAP_BORDER 0x8152
+#define GL_REPLICATE_BORDER 0x8153
+#define GL_CONVOLUTION_BORDER_COLOR 0x8154
+
+typedef void (GLAPIENTRY * PFNGLCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
+typedef void (GLAPIENTRY * PFNGLCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
+typedef void (GLAPIENTRY * PFNGLCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (GLAPIENTRY * PFNGLCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (GLAPIENTRY * PFNGLCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
+typedef void (GLAPIENTRY * PFNGLCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
+typedef void (GLAPIENTRY * PFNGLCONVOLUTIONPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat params);
+typedef void (GLAPIENTRY * PFNGLCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (GLAPIENTRY * PFNGLCONVOLUTIONPARAMETERIPROC) (GLenum target, GLenum pname, GLint params);
+typedef void (GLAPIENTRY * PFNGLCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (GLAPIENTRY * PFNGLCOPYCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
+typedef void (GLAPIENTRY * PFNGLCOPYCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (GLAPIENTRY * PFNGLCOPYCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (GLAPIENTRY * PFNGLCOPYCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (GLAPIENTRY * PFNGLGETCOLORTABLEPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table);
+typedef void (GLAPIENTRY * PFNGLGETCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (GLAPIENTRY * PFNGLGETCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (GLAPIENTRY * PFNGLGETCONVOLUTIONFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image);
+typedef void (GLAPIENTRY * PFNGLGETCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (GLAPIENTRY * PFNGLGETCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (GLAPIENTRY * PFNGLGETHISTOGRAMPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
+typedef void (GLAPIENTRY * PFNGLGETHISTOGRAMPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (GLAPIENTRY * PFNGLGETHISTOGRAMPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (GLAPIENTRY * PFNGLGETMINMAXPROC) (GLenum target, GLboolean reset, GLenum format, GLenum types, GLvoid *values);
+typedef void (GLAPIENTRY * PFNGLGETMINMAXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (GLAPIENTRY * PFNGLGETMINMAXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (GLAPIENTRY * PFNGLGETSEPARABLEFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
+typedef void (GLAPIENTRY * PFNGLHISTOGRAMPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
+typedef void (GLAPIENTRY * PFNGLMINMAXPROC) (GLenum target, GLenum internalformat, GLboolean sink);
+typedef void (GLAPIENTRY * PFNGLRESETHISTOGRAMPROC) (GLenum target);
+typedef void (GLAPIENTRY * PFNGLRESETMINMAXPROC) (GLenum target);
+typedef void (GLAPIENTRY * PFNGLSEPARABLEFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
+
+#define glColorSubTable GLEW_GET_FUN(__glewColorSubTable)
+#define glColorTable GLEW_GET_FUN(__glewColorTable)
+#define glColorTableParameterfv GLEW_GET_FUN(__glewColorTableParameterfv)
+#define glColorTableParameteriv GLEW_GET_FUN(__glewColorTableParameteriv)
+#define glConvolutionFilter1D GLEW_GET_FUN(__glewConvolutionFilter1D)
+#define glConvolutionFilter2D GLEW_GET_FUN(__glewConvolutionFilter2D)
+#define glConvolutionParameterf GLEW_GET_FUN(__glewConvolutionParameterf)
+#define glConvolutionParameterfv GLEW_GET_FUN(__glewConvolutionParameterfv)
+#define glConvolutionParameteri GLEW_GET_FUN(__glewConvolutionParameteri)
+#define glConvolutionParameteriv GLEW_GET_FUN(__glewConvolutionParameteriv)
+#define glCopyColorSubTable GLEW_GET_FUN(__glewCopyColorSubTable)
+#define glCopyColorTable GLEW_GET_FUN(__glewCopyColorTable)
+#define glCopyConvolutionFilter1D GLEW_GET_FUN(__glewCopyConvolutionFilter1D)
+#define glCopyConvolutionFilter2D GLEW_GET_FUN(__glewCopyConvolutionFilter2D)
+#define glGetColorTable GLEW_GET_FUN(__glewGetColorTable)
+#define glGetColorTableParameterfv GLEW_GET_FUN(__glewGetColorTableParameterfv)
+#define glGetColorTableParameteriv GLEW_GET_FUN(__glewGetColorTableParameteriv)
+#define glGetConvolutionFilter GLEW_GET_FUN(__glewGetConvolutionFilter)
+#define glGetConvolutionParameterfv GLEW_GET_FUN(__glewGetConvolutionParameterfv)
+#define glGetConvolutionParameteriv GLEW_GET_FUN(__glewGetConvolutionParameteriv)
+#define glGetHistogram GLEW_GET_FUN(__glewGetHistogram)
+#define glGetHistogramParameterfv GLEW_GET_FUN(__glewGetHistogramParameterfv)
+#define glGetHistogramParameteriv GLEW_GET_FUN(__glewGetHistogramParameteriv)
+#define glGetMinmax GLEW_GET_FUN(__glewGetMinmax)
+#define glGetMinmaxParameterfv GLEW_GET_FUN(__glewGetMinmaxParameterfv)
+#define glGetMinmaxParameteriv GLEW_GET_FUN(__glewGetMinmaxParameteriv)
+#define glGetSeparableFilter GLEW_GET_FUN(__glewGetSeparableFilter)
+#define glHistogram GLEW_GET_FUN(__glewHistogram)
+#define glMinmax GLEW_GET_FUN(__glewMinmax)
+#define glResetHistogram GLEW_GET_FUN(__glewResetHistogram)
+#define glResetMinmax GLEW_GET_FUN(__glewResetMinmax)
+#define glSeparableFilter2D GLEW_GET_FUN(__glewSeparableFilter2D)
+
+#define GLEW_ARB_imaging GLEW_GET_VAR(__GLEW_ARB_imaging)
+
+#endif /* GL_ARB_imaging */
+
+/* ------------------------- GL_ARB_matrix_palette ------------------------- */
+
+#ifndef GL_ARB_matrix_palette
+#define GL_ARB_matrix_palette 1
+
+#define GL_MATRIX_PALETTE_ARB 0x8840
+#define GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB 0x8841
+#define GL_MAX_PALETTE_MATRICES_ARB 0x8842
+#define GL_CURRENT_PALETTE_MATRIX_ARB 0x8843
+#define GL_MATRIX_INDEX_ARRAY_ARB 0x8844
+#define GL_CURRENT_MATRIX_INDEX_ARB 0x8845
+#define GL_MATRIX_INDEX_ARRAY_SIZE_ARB 0x8846
+#define GL_MATRIX_INDEX_ARRAY_TYPE_ARB 0x8847
+#define GL_MATRIX_INDEX_ARRAY_STRIDE_ARB 0x8848
+#define GL_MATRIX_INDEX_ARRAY_POINTER_ARB 0x8849
+
+typedef void (GLAPIENTRY * PFNGLCURRENTPALETTEMATRIXARBPROC) (GLint index);
+typedef void (GLAPIENTRY * PFNGLMATRIXINDEXPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, GLvoid *pointer);
+typedef void (GLAPIENTRY * PFNGLMATRIXINDEXUBVARBPROC) (GLint size, GLubyte *indices);
+typedef void (GLAPIENTRY * PFNGLMATRIXINDEXUIVARBPROC) (GLint size, GLuint *indices);
+typedef void (GLAPIENTRY * PFNGLMATRIXINDEXUSVARBPROC) (GLint size, GLushort *indices);
+
+#define glCurrentPaletteMatrixARB GLEW_GET_FUN(__glewCurrentPaletteMatrixARB)
+#define glMatrixIndexPointerARB GLEW_GET_FUN(__glewMatrixIndexPointerARB)
+#define glMatrixIndexubvARB GLEW_GET_FUN(__glewMatrixIndexubvARB)
+#define glMatrixIndexuivARB GLEW_GET_FUN(__glewMatrixIndexuivARB)
+#define glMatrixIndexusvARB GLEW_GET_FUN(__glewMatrixIndexusvARB)
+
+#define GLEW_ARB_matrix_palette GLEW_GET_VAR(__GLEW_ARB_matrix_palette)
+
+#endif /* GL_ARB_matrix_palette */
+
+/* --------------------------- GL_ARB_multisample -------------------------- */
+
+#ifndef GL_ARB_multisample
+#define GL_ARB_multisample 1
+
+#define GL_MULTISAMPLE_ARB 0x809D
+#define GL_SAMPLE_ALPHA_TO_COVERAGE_ARB 0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_ARB 0x809F
+#define GL_SAMPLE_COVERAGE_ARB 0x80A0
+#define GL_SAMPLE_BUFFERS_ARB 0x80A8
+#define GL_SAMPLES_ARB 0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE_ARB 0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT_ARB 0x80AB
+#define GL_MULTISAMPLE_BIT_ARB 0x20000000
+
+typedef void (GLAPIENTRY * PFNGLSAMPLECOVERAGEARBPROC) (GLclampf value, GLboolean invert);
+
+#define glSampleCoverageARB GLEW_GET_FUN(__glewSampleCoverageARB)
+
+#define GLEW_ARB_multisample GLEW_GET_VAR(__GLEW_ARB_multisample)
+
+#endif /* GL_ARB_multisample */
+
+/* -------------------------- GL_ARB_multitexture -------------------------- */
+
+#ifndef GL_ARB_multitexture
+#define GL_ARB_multitexture 1
+
+#define GL_TEXTURE0_ARB 0x84C0
+#define GL_TEXTURE1_ARB 0x84C1
+#define GL_TEXTURE2_ARB 0x84C2
+#define GL_TEXTURE3_ARB 0x84C3
+#define GL_TEXTURE4_ARB 0x84C4
+#define GL_TEXTURE5_ARB 0x84C5
+#define GL_TEXTURE6_ARB 0x84C6
+#define GL_TEXTURE7_ARB 0x84C7
+#define GL_TEXTURE8_ARB 0x84C8
+#define GL_TEXTURE9_ARB 0x84C9
+#define GL_TEXTURE10_ARB 0x84CA
+#define GL_TEXTURE11_ARB 0x84CB
+#define GL_TEXTURE12_ARB 0x84CC
+#define GL_TEXTURE13_ARB 0x84CD
+#define GL_TEXTURE14_ARB 0x84CE
+#define GL_TEXTURE15_ARB 0x84CF
+#define GL_TEXTURE16_ARB 0x84D0
+#define GL_TEXTURE17_ARB 0x84D1
+#define GL_TEXTURE18_ARB 0x84D2
+#define GL_TEXTURE19_ARB 0x84D3
+#define GL_TEXTURE20_ARB 0x84D4
+#define GL_TEXTURE21_ARB 0x84D5
+#define GL_TEXTURE22_ARB 0x84D6
+#define GL_TEXTURE23_ARB 0x84D7
+#define GL_TEXTURE24_ARB 0x84D8
+#define GL_TEXTURE25_ARB 0x84D9
+#define GL_TEXTURE26_ARB 0x84DA
+#define GL_TEXTURE27_ARB 0x84DB
+#define GL_TEXTURE28_ARB 0x84DC
+#define GL_TEXTURE29_ARB 0x84DD
+#define GL_TEXTURE30_ARB 0x84DE
+#define GL_TEXTURE31_ARB 0x84DF
+#define GL_ACTIVE_TEXTURE_ARB 0x84E0
+#define GL_CLIENT_ACTIVE_TEXTURE_ARB 0x84E1
+#define GL_MAX_TEXTURE_UNITS_ARB 0x84E2
+
+typedef void (GLAPIENTRY * PFNGLACTIVETEXTUREARBPROC) (GLenum texture);
+typedef void (GLAPIENTRY * PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1IARBPROC) (GLenum target, GLint s);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1IVARBPROC) (GLenum target, const GLint *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1SARBPROC) (GLenum target, GLshort s);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2DARBPROC) (GLenum target, GLdouble s, GLdouble t);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2IARBPROC) (GLenum target, GLint s, GLint t);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2IVARBPROC) (GLenum target, const GLint *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2SARBPROC) (GLenum target, GLshort s, GLshort t);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3IARBPROC) (GLenum target, GLint s, GLint t, GLint r);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3IVARBPROC) (GLenum target, const GLint *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v);
+
+#define glActiveTextureARB GLEW_GET_FUN(__glewActiveTextureARB)
+#define glClientActiveTextureARB GLEW_GET_FUN(__glewClientActiveTextureARB)
+#define glMultiTexCoord1dARB GLEW_GET_FUN(__glewMultiTexCoord1dARB)
+#define glMultiTexCoord1dvARB GLEW_GET_FUN(__glewMultiTexCoord1dvARB)
+#define glMultiTexCoord1fARB GLEW_GET_FUN(__glewMultiTexCoord1fARB)
+#define glMultiTexCoord1fvARB GLEW_GET_FUN(__glewMultiTexCoord1fvARB)
+#define glMultiTexCoord1iARB GLEW_GET_FUN(__glewMultiTexCoord1iARB)
+#define glMultiTexCoord1ivARB GLEW_GET_FUN(__glewMultiTexCoord1ivARB)
+#define glMultiTexCoord1sARB GLEW_GET_FUN(__glewMultiTexCoord1sARB)
+#define glMultiTexCoord1svARB GLEW_GET_FUN(__glewMultiTexCoord1svARB)
+#define glMultiTexCoord2dARB GLEW_GET_FUN(__glewMultiTexCoord2dARB)
+#define glMultiTexCoord2dvARB GLEW_GET_FUN(__glewMultiTexCoord2dvARB)
+#define glMultiTexCoord2fARB GLEW_GET_FUN(__glewMultiTexCoord2fARB)
+#define glMultiTexCoord2fvARB GLEW_GET_FUN(__glewMultiTexCoord2fvARB)
+#define glMultiTexCoord2iARB GLEW_GET_FUN(__glewMultiTexCoord2iARB)
+#define glMultiTexCoord2ivARB GLEW_GET_FUN(__glewMultiTexCoord2ivARB)
+#define glMultiTexCoord2sARB GLEW_GET_FUN(__glewMultiTexCoord2sARB)
+#define glMultiTexCoord2svARB GLEW_GET_FUN(__glewMultiTexCoord2svARB)
+#define glMultiTexCoord3dARB GLEW_GET_FUN(__glewMultiTexCoord3dARB)
+#define glMultiTexCoord3dvARB GLEW_GET_FUN(__glewMultiTexCoord3dvARB)
+#define glMultiTexCoord3fARB GLEW_GET_FUN(__glewMultiTexCoord3fARB)
+#define glMultiTexCoord3fvARB GLEW_GET_FUN(__glewMultiTexCoord3fvARB)
+#define glMultiTexCoord3iARB GLEW_GET_FUN(__glewMultiTexCoord3iARB)
+#define glMultiTexCoord3ivARB GLEW_GET_FUN(__glewMultiTexCoord3ivARB)
+#define glMultiTexCoord3sARB GLEW_GET_FUN(__glewMultiTexCoord3sARB)
+#define glMultiTexCoord3svARB GLEW_GET_FUN(__glewMultiTexCoord3svARB)
+#define glMultiTexCoord4dARB GLEW_GET_FUN(__glewMultiTexCoord4dARB)
+#define glMultiTexCoord4dvARB GLEW_GET_FUN(__glewMultiTexCoord4dvARB)
+#define glMultiTexCoord4fARB GLEW_GET_FUN(__glewMultiTexCoord4fARB)
+#define glMultiTexCoord4fvARB GLEW_GET_FUN(__glewMultiTexCoord4fvARB)
+#define glMultiTexCoord4iARB GLEW_GET_FUN(__glewMultiTexCoord4iARB)
+#define glMultiTexCoord4ivARB GLEW_GET_FUN(__glewMultiTexCoord4ivARB)
+#define glMultiTexCoord4sARB GLEW_GET_FUN(__glewMultiTexCoord4sARB)
+#define glMultiTexCoord4svARB GLEW_GET_FUN(__glewMultiTexCoord4svARB)
+
+#define GLEW_ARB_multitexture GLEW_GET_VAR(__GLEW_ARB_multitexture)
+
+#endif /* GL_ARB_multitexture */
+
+/* ------------------------- GL_ARB_occlusion_query ------------------------ */
+
+#ifndef GL_ARB_occlusion_query
+#define GL_ARB_occlusion_query 1
+
+#define GL_QUERY_COUNTER_BITS_ARB 0x8864
+#define GL_CURRENT_QUERY_ARB 0x8865
+#define GL_QUERY_RESULT_ARB 0x8866
+#define GL_QUERY_RESULT_AVAILABLE_ARB 0x8867
+#define GL_SAMPLES_PASSED_ARB 0x8914
+
+typedef void (GLAPIENTRY * PFNGLBEGINQUERYARBPROC) (GLenum target, GLuint id);
+typedef void (GLAPIENTRY * PFNGLDELETEQUERIESARBPROC) (GLsizei n, const GLuint* ids);
+typedef void (GLAPIENTRY * PFNGLENDQUERYARBPROC) (GLenum target);
+typedef void (GLAPIENTRY * PFNGLGENQUERIESARBPROC) (GLsizei n, GLuint* ids);
+typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTIVARBPROC) (GLuint id, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTUIVARBPROC) (GLuint id, GLenum pname, GLuint* params);
+typedef void (GLAPIENTRY * PFNGLGETQUERYIVARBPROC) (GLenum target, GLenum pname, GLint* params);
+typedef GLboolean (GLAPIENTRY * PFNGLISQUERYARBPROC) (GLuint id);
+
+#define glBeginQueryARB GLEW_GET_FUN(__glewBeginQueryARB)
+#define glDeleteQueriesARB GLEW_GET_FUN(__glewDeleteQueriesARB)
+#define glEndQueryARB GLEW_GET_FUN(__glewEndQueryARB)
+#define glGenQueriesARB GLEW_GET_FUN(__glewGenQueriesARB)
+#define glGetQueryObjectivARB GLEW_GET_FUN(__glewGetQueryObjectivARB)
+#define glGetQueryObjectuivARB GLEW_GET_FUN(__glewGetQueryObjectuivARB)
+#define glGetQueryivARB GLEW_GET_FUN(__glewGetQueryivARB)
+#define glIsQueryARB GLEW_GET_FUN(__glewIsQueryARB)
+
+#define GLEW_ARB_occlusion_query GLEW_GET_VAR(__GLEW_ARB_occlusion_query)
+
+#endif /* GL_ARB_occlusion_query */
+
+/* ----------------------- GL_ARB_pixel_buffer_object ---------------------- */
+
+#ifndef GL_ARB_pixel_buffer_object
+#define GL_ARB_pixel_buffer_object 1
+
+#define GL_PIXEL_PACK_BUFFER_ARB 0x88EB
+#define GL_PIXEL_UNPACK_BUFFER_ARB 0x88EC
+#define GL_PIXEL_PACK_BUFFER_BINDING_ARB 0x88ED
+#define GL_PIXEL_UNPACK_BUFFER_BINDING_ARB 0x88EF
+
+#define GLEW_ARB_pixel_buffer_object GLEW_GET_VAR(__GLEW_ARB_pixel_buffer_object)
+
+#endif /* GL_ARB_pixel_buffer_object */
+
+/* ------------------------ GL_ARB_point_parameters ------------------------ */
+
+#ifndef GL_ARB_point_parameters
+#define GL_ARB_point_parameters 1
+
+#define GL_POINT_SIZE_MIN_ARB 0x8126
+#define GL_POINT_SIZE_MAX_ARB 0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE_ARB 0x8128
+#define GL_POINT_DISTANCE_ATTENUATION_ARB 0x8129
+
+typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERFARBPROC) (GLenum pname, GLfloat param);
+typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERFVARBPROC) (GLenum pname, GLfloat* params);
+
+#define glPointParameterfARB GLEW_GET_FUN(__glewPointParameterfARB)
+#define glPointParameterfvARB GLEW_GET_FUN(__glewPointParameterfvARB)
+
+#define GLEW_ARB_point_parameters GLEW_GET_VAR(__GLEW_ARB_point_parameters)
+
+#endif /* GL_ARB_point_parameters */
+
+/* -------------------------- GL_ARB_point_sprite -------------------------- */
+
+#ifndef GL_ARB_point_sprite
+#define GL_ARB_point_sprite 1
+
+#define GL_POINT_SPRITE_ARB 0x8861
+#define GL_COORD_REPLACE_ARB 0x8862
+
+#define GLEW_ARB_point_sprite GLEW_GET_VAR(__GLEW_ARB_point_sprite)
+
+#endif /* GL_ARB_point_sprite */
+
+/* ------------------------- GL_ARB_shader_objects ------------------------- */
+
+#ifndef GL_ARB_shader_objects
+#define GL_ARB_shader_objects 1
+
+#define GL_PROGRAM_OBJECT_ARB 0x8B40
+#define GL_SHADER_OBJECT_ARB 0x8B48
+#define GL_OBJECT_TYPE_ARB 0x8B4E
+#define GL_OBJECT_SUBTYPE_ARB 0x8B4F
+#define GL_FLOAT_VEC2_ARB 0x8B50
+#define GL_FLOAT_VEC3_ARB 0x8B51
+#define GL_FLOAT_VEC4_ARB 0x8B52
+#define GL_INT_VEC2_ARB 0x8B53
+#define GL_INT_VEC3_ARB 0x8B54
+#define GL_INT_VEC4_ARB 0x8B55
+#define GL_BOOL_ARB 0x8B56
+#define GL_BOOL_VEC2_ARB 0x8B57
+#define GL_BOOL_VEC3_ARB 0x8B58
+#define GL_BOOL_VEC4_ARB 0x8B59
+#define GL_FLOAT_MAT2_ARB 0x8B5A
+#define GL_FLOAT_MAT3_ARB 0x8B5B
+#define GL_FLOAT_MAT4_ARB 0x8B5C
+#define GL_SAMPLER_1D_ARB 0x8B5D
+#define GL_SAMPLER_2D_ARB 0x8B5E
+#define GL_SAMPLER_3D_ARB 0x8B5F
+#define GL_SAMPLER_CUBE_ARB 0x8B60
+#define GL_SAMPLER_1D_SHADOW_ARB 0x8B61
+#define GL_SAMPLER_2D_SHADOW_ARB 0x8B62
+#define GL_SAMPLER_2D_RECT_ARB 0x8B63
+#define GL_SAMPLER_2D_RECT_SHADOW_ARB 0x8B64
+#define GL_OBJECT_DELETE_STATUS_ARB 0x8B80
+#define GL_OBJECT_COMPILE_STATUS_ARB 0x8B81
+#define GL_OBJECT_LINK_STATUS_ARB 0x8B82
+#define GL_OBJECT_VALIDATE_STATUS_ARB 0x8B83
+#define GL_OBJECT_INFO_LOG_LENGTH_ARB 0x8B84
+#define GL_OBJECT_ATTACHED_OBJECTS_ARB 0x8B85
+#define GL_OBJECT_ACTIVE_UNIFORMS_ARB 0x8B86
+#define GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB 0x8B87
+#define GL_OBJECT_SHADER_SOURCE_LENGTH_ARB 0x8B88
+
+typedef char GLcharARB;
+typedef unsigned int GLhandleARB;
+
+typedef void (GLAPIENTRY * PFNGLATTACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB obj);
+typedef void (GLAPIENTRY * PFNGLCOMPILESHADERARBPROC) (GLhandleARB shaderObj);
+typedef GLhandleARB (GLAPIENTRY * PFNGLCREATEPROGRAMOBJECTARBPROC) (void);
+typedef GLhandleARB (GLAPIENTRY * PFNGLCREATESHADEROBJECTARBPROC) (GLenum shaderType);
+typedef void (GLAPIENTRY * PFNGLDELETEOBJECTARBPROC) (GLhandleARB obj);
+typedef void (GLAPIENTRY * PFNGLDETACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB attachedObj);
+typedef void (GLAPIENTRY * PFNGLGETACTIVEUNIFORMARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei* length, GLint *size, GLenum *type, GLcharARB *name);
+typedef void (GLAPIENTRY * PFNGLGETATTACHEDOBJECTSARBPROC) (GLhandleARB containerObj, GLsizei maxCount, GLsizei* count, GLhandleARB *obj);
+typedef GLhandleARB (GLAPIENTRY * PFNGLGETHANDLEARBPROC) (GLenum pname);
+typedef void (GLAPIENTRY * PFNGLGETINFOLOGARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei* length, GLcharARB *infoLog);
+typedef void (GLAPIENTRY * PFNGLGETOBJECTPARAMETERFVARBPROC) (GLhandleARB obj, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETOBJECTPARAMETERIVARBPROC) (GLhandleARB obj, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETSHADERSOURCEARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei* length, GLcharARB *source);
+typedef GLint (GLAPIENTRY * PFNGLGETUNIFORMLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB* name);
+typedef void (GLAPIENTRY * PFNGLGETUNIFORMFVARBPROC) (GLhandleARB programObj, GLint location, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETUNIFORMIVARBPROC) (GLhandleARB programObj, GLint location, GLint* params);
+typedef void (GLAPIENTRY * PFNGLLINKPROGRAMARBPROC) (GLhandleARB programObj);
+typedef void (GLAPIENTRY * PFNGLSHADERSOURCEARBPROC) (GLhandleARB shaderObj, GLsizei count, const GLcharARB ** string, const GLint *length);
+typedef void (GLAPIENTRY * PFNGLUNIFORM1FARBPROC) (GLint location, GLfloat v0);
+typedef void (GLAPIENTRY * PFNGLUNIFORM1FVARBPROC) (GLint location, GLsizei count, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM1IARBPROC) (GLint location, GLint v0);
+typedef void (GLAPIENTRY * PFNGLUNIFORM1IVARBPROC) (GLint location, GLsizei count, const GLint* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM2FARBPROC) (GLint location, GLfloat v0, GLfloat v1);
+typedef void (GLAPIENTRY * PFNGLUNIFORM2FVARBPROC) (GLint location, GLsizei count, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM2IARBPROC) (GLint location, GLint v0, GLint v1);
+typedef void (GLAPIENTRY * PFNGLUNIFORM2IVARBPROC) (GLint location, GLsizei count, const GLint* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM3FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+typedef void (GLAPIENTRY * PFNGLUNIFORM3FVARBPROC) (GLint location, GLsizei count, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM3IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2);
+typedef void (GLAPIENTRY * PFNGLUNIFORM3IVARBPROC) (GLint location, GLsizei count, const GLint* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM4FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+typedef void (GLAPIENTRY * PFNGLUNIFORM4FVARBPROC) (GLint location, GLsizei count, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORM4IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+typedef void (GLAPIENTRY * PFNGLUNIFORM4IVARBPROC) (GLint location, GLsizei count, const GLint* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX2FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX3FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX4FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+typedef void (GLAPIENTRY * PFNGLUSEPROGRAMOBJECTARBPROC) (GLhandleARB programObj);
+typedef void (GLAPIENTRY * PFNGLVALIDATEPROGRAMARBPROC) (GLhandleARB programObj);
+
+#define glAttachObjectARB GLEW_GET_FUN(__glewAttachObjectARB)
+#define glCompileShaderARB GLEW_GET_FUN(__glewCompileShaderARB)
+#define glCreateProgramObjectARB GLEW_GET_FUN(__glewCreateProgramObjectARB)
+#define glCreateShaderObjectARB GLEW_GET_FUN(__glewCreateShaderObjectARB)
+#define glDeleteObjectARB GLEW_GET_FUN(__glewDeleteObjectARB)
+#define glDetachObjectARB GLEW_GET_FUN(__glewDetachObjectARB)
+#define glGetActiveUniformARB GLEW_GET_FUN(__glewGetActiveUniformARB)
+#define glGetAttachedObjectsARB GLEW_GET_FUN(__glewGetAttachedObjectsARB)
+#define glGetHandleARB GLEW_GET_FUN(__glewGetHandleARB)
+#define glGetInfoLogARB GLEW_GET_FUN(__glewGetInfoLogARB)
+#define glGetObjectParameterfvARB GLEW_GET_FUN(__glewGetObjectParameterfvARB)
+#define glGetObjectParameterivARB GLEW_GET_FUN(__glewGetObjectParameterivARB)
+#define glGetShaderSourceARB GLEW_GET_FUN(__glewGetShaderSourceARB)
+#define glGetUniformLocationARB GLEW_GET_FUN(__glewGetUniformLocationARB)
+#define glGetUniformfvARB GLEW_GET_FUN(__glewGetUniformfvARB)
+#define glGetUniformivARB GLEW_GET_FUN(__glewGetUniformivARB)
+#define glLinkProgramARB GLEW_GET_FUN(__glewLinkProgramARB)
+#define glShaderSourceARB GLEW_GET_FUN(__glewShaderSourceARB)
+#define glUniform1fARB GLEW_GET_FUN(__glewUniform1fARB)
+#define glUniform1fvARB GLEW_GET_FUN(__glewUniform1fvARB)
+#define glUniform1iARB GLEW_GET_FUN(__glewUniform1iARB)
+#define glUniform1ivARB GLEW_GET_FUN(__glewUniform1ivARB)
+#define glUniform2fARB GLEW_GET_FUN(__glewUniform2fARB)
+#define glUniform2fvARB GLEW_GET_FUN(__glewUniform2fvARB)
+#define glUniform2iARB GLEW_GET_FUN(__glewUniform2iARB)
+#define glUniform2ivARB GLEW_GET_FUN(__glewUniform2ivARB)
+#define glUniform3fARB GLEW_GET_FUN(__glewUniform3fARB)
+#define glUniform3fvARB GLEW_GET_FUN(__glewUniform3fvARB)
+#define glUniform3iARB GLEW_GET_FUN(__glewUniform3iARB)
+#define glUniform3ivARB GLEW_GET_FUN(__glewUniform3ivARB)
+#define glUniform4fARB GLEW_GET_FUN(__glewUniform4fARB)
+#define glUniform4fvARB GLEW_GET_FUN(__glewUniform4fvARB)
+#define glUniform4iARB GLEW_GET_FUN(__glewUniform4iARB)
+#define glUniform4ivARB GLEW_GET_FUN(__glewUniform4ivARB)
+#define glUniformMatrix2fvARB GLEW_GET_FUN(__glewUniformMatrix2fvARB)
+#define glUniformMatrix3fvARB GLEW_GET_FUN(__glewUniformMatrix3fvARB)
+#define glUniformMatrix4fvARB GLEW_GET_FUN(__glewUniformMatrix4fvARB)
+#define glUseProgramObjectARB GLEW_GET_FUN(__glewUseProgramObjectARB)
+#define glValidateProgramARB GLEW_GET_FUN(__glewValidateProgramARB)
+
+#define GLEW_ARB_shader_objects GLEW_GET_VAR(__GLEW_ARB_shader_objects)
+
+#endif /* GL_ARB_shader_objects */
+
+/* ---------------------- GL_ARB_shading_language_100 ---------------------- */
+
+#ifndef GL_ARB_shading_language_100
+#define GL_ARB_shading_language_100 1
+
+#define GL_SHADING_LANGUAGE_VERSION_ARB 0x8B8C
+
+#define GLEW_ARB_shading_language_100 GLEW_GET_VAR(__GLEW_ARB_shading_language_100)
+
+#endif /* GL_ARB_shading_language_100 */
+
+/* ----------------------------- GL_ARB_shadow ----------------------------- */
+
+#ifndef GL_ARB_shadow
+#define GL_ARB_shadow 1
+
+#define GL_TEXTURE_COMPARE_MODE_ARB 0x884C
+#define GL_TEXTURE_COMPARE_FUNC_ARB 0x884D
+#define GL_COMPARE_R_TO_TEXTURE_ARB 0x884E
+
+#define GLEW_ARB_shadow GLEW_GET_VAR(__GLEW_ARB_shadow)
+
+#endif /* GL_ARB_shadow */
+
+/* ------------------------- GL_ARB_shadow_ambient ------------------------- */
+
+#ifndef GL_ARB_shadow_ambient
+#define GL_ARB_shadow_ambient 1
+
+#define GL_TEXTURE_COMPARE_FAIL_VALUE_ARB 0x80BF
+
+#define GLEW_ARB_shadow_ambient GLEW_GET_VAR(__GLEW_ARB_shadow_ambient)
+
+#endif /* GL_ARB_shadow_ambient */
+
+/* ---------------------- GL_ARB_texture_border_clamp ---------------------- */
+
+#ifndef GL_ARB_texture_border_clamp
+#define GL_ARB_texture_border_clamp 1
+
+#define GL_CLAMP_TO_BORDER_ARB 0x812D
+
+#define GLEW_ARB_texture_border_clamp GLEW_GET_VAR(__GLEW_ARB_texture_border_clamp)
+
+#endif /* GL_ARB_texture_border_clamp */
+
+/* ----------------------- GL_ARB_texture_compression ---------------------- */
+
+#ifndef GL_ARB_texture_compression
+#define GL_ARB_texture_compression 1
+
+#define GL_COMPRESSED_ALPHA_ARB 0x84E9
+#define GL_COMPRESSED_LUMINANCE_ARB 0x84EA
+#define GL_COMPRESSED_LUMINANCE_ALPHA_ARB 0x84EB
+#define GL_COMPRESSED_INTENSITY_ARB 0x84EC
+#define GL_COMPRESSED_RGB_ARB 0x84ED
+#define GL_COMPRESSED_RGBA_ARB 0x84EE
+#define GL_TEXTURE_COMPRESSION_HINT_ARB 0x84EF
+#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB 0x86A0
+#define GL_TEXTURE_COMPRESSED_ARB 0x86A1
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A3
+
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXIMAGE1DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void* data);
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXIMAGE2DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void* data);
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXIMAGE3DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void* data);
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void* data);
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void* data);
+typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void* data);
+typedef void (GLAPIENTRY * PFNGLGETCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint lod, void* img);
+
+#define glCompressedTexImage1DARB GLEW_GET_FUN(__glewCompressedTexImage1DARB)
+#define glCompressedTexImage2DARB GLEW_GET_FUN(__glewCompressedTexImage2DARB)
+#define glCompressedTexImage3DARB GLEW_GET_FUN(__glewCompressedTexImage3DARB)
+#define glCompressedTexSubImage1DARB GLEW_GET_FUN(__glewCompressedTexSubImage1DARB)
+#define glCompressedTexSubImage2DARB GLEW_GET_FUN(__glewCompressedTexSubImage2DARB)
+#define glCompressedTexSubImage3DARB GLEW_GET_FUN(__glewCompressedTexSubImage3DARB)
+#define glGetCompressedTexImageARB GLEW_GET_FUN(__glewGetCompressedTexImageARB)
+
+#define GLEW_ARB_texture_compression GLEW_GET_VAR(__GLEW_ARB_texture_compression)
+
+#endif /* GL_ARB_texture_compression */
+
+/* ------------------------ GL_ARB_texture_cube_map ------------------------ */
+
+#ifndef GL_ARB_texture_cube_map
+#define GL_ARB_texture_cube_map 1
+
+#define GL_NORMAL_MAP_ARB 0x8511
+#define GL_REFLECTION_MAP_ARB 0x8512
+#define GL_TEXTURE_CUBE_MAP_ARB 0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP_ARB 0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP_ARB 0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB 0x851C
+
+#define GLEW_ARB_texture_cube_map GLEW_GET_VAR(__GLEW_ARB_texture_cube_map)
+
+#endif /* GL_ARB_texture_cube_map */
+
+/* ------------------------- GL_ARB_texture_env_add ------------------------ */
+
+#ifndef GL_ARB_texture_env_add
+#define GL_ARB_texture_env_add 1
+
+#define GLEW_ARB_texture_env_add GLEW_GET_VAR(__GLEW_ARB_texture_env_add)
+
+#endif /* GL_ARB_texture_env_add */
+
+/* ----------------------- GL_ARB_texture_env_combine ---------------------- */
+
+#ifndef GL_ARB_texture_env_combine
+#define GL_ARB_texture_env_combine 1
+
+#define GL_SUBTRACT_ARB 0x84E7
+#define GL_COMBINE_ARB 0x8570
+#define GL_COMBINE_RGB_ARB 0x8571
+#define GL_COMBINE_ALPHA_ARB 0x8572
+#define GL_RGB_SCALE_ARB 0x8573
+#define GL_ADD_SIGNED_ARB 0x8574
+#define GL_INTERPOLATE_ARB 0x8575
+#define GL_CONSTANT_ARB 0x8576
+#define GL_PRIMARY_COLOR_ARB 0x8577
+#define GL_PREVIOUS_ARB 0x8578
+#define GL_SOURCE0_RGB_ARB 0x8580
+#define GL_SOURCE1_RGB_ARB 0x8581
+#define GL_SOURCE2_RGB_ARB 0x8582
+#define GL_SOURCE0_ALPHA_ARB 0x8588
+#define GL_SOURCE1_ALPHA_ARB 0x8589
+#define GL_SOURCE2_ALPHA_ARB 0x858A
+#define GL_OPERAND0_RGB_ARB 0x8590
+#define GL_OPERAND1_RGB_ARB 0x8591
+#define GL_OPERAND2_RGB_ARB 0x8592
+#define GL_OPERAND0_ALPHA_ARB 0x8598
+#define GL_OPERAND1_ALPHA_ARB 0x8599
+#define GL_OPERAND2_ALPHA_ARB 0x859A
+
+#define GLEW_ARB_texture_env_combine GLEW_GET_VAR(__GLEW_ARB_texture_env_combine)
+
+#endif /* GL_ARB_texture_env_combine */
+
+/* ---------------------- GL_ARB_texture_env_crossbar ---------------------- */
+
+#ifndef GL_ARB_texture_env_crossbar
+#define GL_ARB_texture_env_crossbar 1
+
+#define GLEW_ARB_texture_env_crossbar GLEW_GET_VAR(__GLEW_ARB_texture_env_crossbar)
+
+#endif /* GL_ARB_texture_env_crossbar */
+
+/* ------------------------ GL_ARB_texture_env_dot3 ------------------------ */
+
+#ifndef GL_ARB_texture_env_dot3
+#define GL_ARB_texture_env_dot3 1
+
+#define GL_DOT3_RGB_ARB 0x86AE
+#define GL_DOT3_RGBA_ARB 0x86AF
+
+#define GLEW_ARB_texture_env_dot3 GLEW_GET_VAR(__GLEW_ARB_texture_env_dot3)
+
+#endif /* GL_ARB_texture_env_dot3 */
+
+/* -------------------------- GL_ARB_texture_float ------------------------- */
+
+#ifndef GL_ARB_texture_float
+#define GL_ARB_texture_float 1
+
+#define GL_RGBA32F_ARB 0x8814
+#define GL_RGB32F_ARB 0x8815
+#define GL_ALPHA32F_ARB 0x8816
+#define GL_INTENSITY32F_ARB 0x8817
+#define GL_LUMINANCE32F_ARB 0x8818
+#define GL_LUMINANCE_ALPHA32F_ARB 0x8819
+#define GL_RGBA16F_ARB 0x881A
+#define GL_RGB16F_ARB 0x881B
+#define GL_ALPHA16F_ARB 0x881C
+#define GL_INTENSITY16F_ARB 0x881D
+#define GL_LUMINANCE16F_ARB 0x881E
+#define GL_LUMINANCE_ALPHA16F_ARB 0x881F
+#define GL_TEXTURE_RED_TYPE_ARB 0x8C10
+#define GL_TEXTURE_GREEN_TYPE_ARB 0x8C11
+#define GL_TEXTURE_BLUE_TYPE_ARB 0x8C12
+#define GL_TEXTURE_ALPHA_TYPE_ARB 0x8C13
+#define GL_TEXTURE_LUMINANCE_TYPE_ARB 0x8C14
+#define GL_TEXTURE_INTENSITY_TYPE_ARB 0x8C15
+#define GL_TEXTURE_DEPTH_TYPE_ARB 0x8C16
+#define GL_UNSIGNED_NORMALIZED_ARB 0x8C17
+
+#define GLEW_ARB_texture_float GLEW_GET_VAR(__GLEW_ARB_texture_float)
+
+#endif /* GL_ARB_texture_float */
+
+/* --------------------- GL_ARB_texture_mirrored_repeat -------------------- */
+
+#ifndef GL_ARB_texture_mirrored_repeat
+#define GL_ARB_texture_mirrored_repeat 1
+
+#define GL_MIRRORED_REPEAT_ARB 0x8370
+
+#define GLEW_ARB_texture_mirrored_repeat GLEW_GET_VAR(__GLEW_ARB_texture_mirrored_repeat)
+
+#endif /* GL_ARB_texture_mirrored_repeat */
+
+/* -------------------- GL_ARB_texture_non_power_of_two -------------------- */
+
+#ifndef GL_ARB_texture_non_power_of_two
+#define GL_ARB_texture_non_power_of_two 1
+
+#define GLEW_ARB_texture_non_power_of_two GLEW_GET_VAR(__GLEW_ARB_texture_non_power_of_two)
+
+#endif /* GL_ARB_texture_non_power_of_two */
+
+/* ------------------------ GL_ARB_texture_rectangle ----------------------- */
+
+#ifndef GL_ARB_texture_rectangle
+#define GL_ARB_texture_rectangle 1
+
+#define GL_TEXTURE_RECTANGLE_ARB 0x84F5
+#define GL_TEXTURE_BINDING_RECTANGLE_ARB 0x84F6
+#define GL_PROXY_TEXTURE_RECTANGLE_ARB 0x84F7
+#define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8
+#define GL_SAMPLER_2D_RECT_ARB 0x8B63
+#define GL_SAMPLER_2D_RECT_SHADOW_ARB 0x8B64
+
+#define GLEW_ARB_texture_rectangle GLEW_GET_VAR(__GLEW_ARB_texture_rectangle)
+
+#endif /* GL_ARB_texture_rectangle */
+
+/* ------------------------ GL_ARB_transpose_matrix ------------------------ */
+
+#ifndef GL_ARB_transpose_matrix
+#define GL_ARB_transpose_matrix 1
+
+#define GL_TRANSPOSE_MODELVIEW_MATRIX_ARB 0x84E3
+#define GL_TRANSPOSE_PROJECTION_MATRIX_ARB 0x84E4
+#define GL_TRANSPOSE_TEXTURE_MATRIX_ARB 0x84E5
+#define GL_TRANSPOSE_COLOR_MATRIX_ARB 0x84E6
+
+typedef void (GLAPIENTRY * PFNGLLOADTRANSPOSEMATRIXDARBPROC) (GLdouble m[16]);
+typedef void (GLAPIENTRY * PFNGLLOADTRANSPOSEMATRIXFARBPROC) (GLfloat m[16]);
+typedef void (GLAPIENTRY * PFNGLMULTTRANSPOSEMATRIXDARBPROC) (GLdouble m[16]);
+typedef void (GLAPIENTRY * PFNGLMULTTRANSPOSEMATRIXFARBPROC) (GLfloat m[16]);
+
+#define glLoadTransposeMatrixdARB GLEW_GET_FUN(__glewLoadTransposeMatrixdARB)
+#define glLoadTransposeMatrixfARB GLEW_GET_FUN(__glewLoadTransposeMatrixfARB)
+#define glMultTransposeMatrixdARB GLEW_GET_FUN(__glewMultTransposeMatrixdARB)
+#define glMultTransposeMatrixfARB GLEW_GET_FUN(__glewMultTransposeMatrixfARB)
+
+#define GLEW_ARB_transpose_matrix GLEW_GET_VAR(__GLEW_ARB_transpose_matrix)
+
+#endif /* GL_ARB_transpose_matrix */
+
+/* -------------------------- GL_ARB_vertex_blend -------------------------- */
+
+#ifndef GL_ARB_vertex_blend
+#define GL_ARB_vertex_blend 1
+
+#define GL_MODELVIEW0_ARB 0x1700
+#define GL_MODELVIEW1_ARB 0x850A
+#define GL_MAX_VERTEX_UNITS_ARB 0x86A4
+#define GL_ACTIVE_VERTEX_UNITS_ARB 0x86A5
+#define GL_WEIGHT_SUM_UNITY_ARB 0x86A6
+#define GL_VERTEX_BLEND_ARB 0x86A7
+#define GL_CURRENT_WEIGHT_ARB 0x86A8
+#define GL_WEIGHT_ARRAY_TYPE_ARB 0x86A9
+#define GL_WEIGHT_ARRAY_STRIDE_ARB 0x86AA
+#define GL_WEIGHT_ARRAY_SIZE_ARB 0x86AB
+#define GL_WEIGHT_ARRAY_POINTER_ARB 0x86AC
+#define GL_WEIGHT_ARRAY_ARB 0x86AD
+#define GL_MODELVIEW2_ARB 0x8722
+#define GL_MODELVIEW3_ARB 0x8723
+#define GL_MODELVIEW4_ARB 0x8724
+#define GL_MODELVIEW5_ARB 0x8725
+#define GL_MODELVIEW6_ARB 0x8726
+#define GL_MODELVIEW7_ARB 0x8727
+#define GL_MODELVIEW8_ARB 0x8728
+#define GL_MODELVIEW9_ARB 0x8729
+#define GL_MODELVIEW10_ARB 0x872A
+#define GL_MODELVIEW11_ARB 0x872B
+#define GL_MODELVIEW12_ARB 0x872C
+#define GL_MODELVIEW13_ARB 0x872D
+#define GL_MODELVIEW14_ARB 0x872E
+#define GL_MODELVIEW15_ARB 0x872F
+#define GL_MODELVIEW16_ARB 0x8730
+#define GL_MODELVIEW17_ARB 0x8731
+#define GL_MODELVIEW18_ARB 0x8732
+#define GL_MODELVIEW19_ARB 0x8733
+#define GL_MODELVIEW20_ARB 0x8734
+#define GL_MODELVIEW21_ARB 0x8735
+#define GL_MODELVIEW22_ARB 0x8736
+#define GL_MODELVIEW23_ARB 0x8737
+#define GL_MODELVIEW24_ARB 0x8738
+#define GL_MODELVIEW25_ARB 0x8739
+#define GL_MODELVIEW26_ARB 0x873A
+#define GL_MODELVIEW27_ARB 0x873B
+#define GL_MODELVIEW28_ARB 0x873C
+#define GL_MODELVIEW29_ARB 0x873D
+#define GL_MODELVIEW30_ARB 0x873E
+#define GL_MODELVIEW31_ARB 0x873F
+
+typedef void (GLAPIENTRY * PFNGLVERTEXBLENDARBPROC) (GLint count);
+typedef void (GLAPIENTRY * PFNGLWEIGHTPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, GLvoid *pointer);
+typedef void (GLAPIENTRY * PFNGLWEIGHTBVARBPROC) (GLint size, GLbyte *weights);
+typedef void (GLAPIENTRY * PFNGLWEIGHTDVARBPROC) (GLint size, GLdouble *weights);
+typedef void (GLAPIENTRY * PFNGLWEIGHTFVARBPROC) (GLint size, GLfloat *weights);
+typedef void (GLAPIENTRY * PFNGLWEIGHTIVARBPROC) (GLint size, GLint *weights);
+typedef void (GLAPIENTRY * PFNGLWEIGHTSVARBPROC) (GLint size, GLshort *weights);
+typedef void (GLAPIENTRY * PFNGLWEIGHTUBVARBPROC) (GLint size, GLubyte *weights);
+typedef void (GLAPIENTRY * PFNGLWEIGHTUIVARBPROC) (GLint size, GLuint *weights);
+typedef void (GLAPIENTRY * PFNGLWEIGHTUSVARBPROC) (GLint size, GLushort *weights);
+
+#define glVertexBlendARB GLEW_GET_FUN(__glewVertexBlendARB)
+#define glWeightPointerARB GLEW_GET_FUN(__glewWeightPointerARB)
+#define glWeightbvARB GLEW_GET_FUN(__glewWeightbvARB)
+#define glWeightdvARB GLEW_GET_FUN(__glewWeightdvARB)
+#define glWeightfvARB GLEW_GET_FUN(__glewWeightfvARB)
+#define glWeightivARB GLEW_GET_FUN(__glewWeightivARB)
+#define glWeightsvARB GLEW_GET_FUN(__glewWeightsvARB)
+#define glWeightubvARB GLEW_GET_FUN(__glewWeightubvARB)
+#define glWeightuivARB GLEW_GET_FUN(__glewWeightuivARB)
+#define glWeightusvARB GLEW_GET_FUN(__glewWeightusvARB)
+
+#define GLEW_ARB_vertex_blend GLEW_GET_VAR(__GLEW_ARB_vertex_blend)
+
+#endif /* GL_ARB_vertex_blend */
+
+/* ---------------------- GL_ARB_vertex_buffer_object ---------------------- */
+
+#ifndef GL_ARB_vertex_buffer_object
+#define GL_ARB_vertex_buffer_object 1
+
+#define GL_BUFFER_SIZE_ARB 0x8764
+#define GL_BUFFER_USAGE_ARB 0x8765
+#define GL_ARRAY_BUFFER_ARB 0x8892
+#define GL_ELEMENT_ARRAY_BUFFER_ARB 0x8893
+#define GL_ARRAY_BUFFER_BINDING_ARB 0x8894
+#define GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB 0x8895
+#define GL_VERTEX_ARRAY_BUFFER_BINDING_ARB 0x8896
+#define GL_NORMAL_ARRAY_BUFFER_BINDING_ARB 0x8897
+#define GL_COLOR_ARRAY_BUFFER_BINDING_ARB 0x8898
+#define GL_INDEX_ARRAY_BUFFER_BINDING_ARB 0x8899
+#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB 0x889A
+#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB 0x889B
+#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB 0x889C
+#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB 0x889D
+#define GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB 0x889E
+#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB 0x889F
+#define GL_READ_ONLY_ARB 0x88B8
+#define GL_WRITE_ONLY_ARB 0x88B9
+#define GL_READ_WRITE_ARB 0x88BA
+#define GL_BUFFER_ACCESS_ARB 0x88BB
+#define GL_BUFFER_MAPPED_ARB 0x88BC
+#define GL_BUFFER_MAP_POINTER_ARB 0x88BD
+#define GL_STREAM_DRAW_ARB 0x88E0
+#define GL_STREAM_READ_ARB 0x88E1
+#define GL_STREAM_COPY_ARB 0x88E2
+#define GL_STATIC_DRAW_ARB 0x88E4
+#define GL_STATIC_READ_ARB 0x88E5
+#define GL_STATIC_COPY_ARB 0x88E6
+#define GL_DYNAMIC_DRAW_ARB 0x88E8
+#define GL_DYNAMIC_READ_ARB 0x88E9
+#define GL_DYNAMIC_COPY_ARB 0x88EA
+
+typedef ptrdiff_t GLsizeiptrARB;
+typedef ptrdiff_t GLintptrARB;
+
+typedef void (GLAPIENTRY * PFNGLBINDBUFFERARBPROC) (GLenum target, GLuint buffer);
+typedef void (GLAPIENTRY * PFNGLBUFFERDATAARBPROC) (GLenum target, GLsizeiptrARB size, const GLvoid* data, GLenum usage);
+typedef void (GLAPIENTRY * PFNGLBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid* data);
+typedef void (GLAPIENTRY * PFNGLDELETEBUFFERSARBPROC) (GLsizei n, const GLuint* buffers);
+typedef void (GLAPIENTRY * PFNGLGENBUFFERSARBPROC) (GLsizei n, GLuint* buffers);
+typedef void (GLAPIENTRY * PFNGLGETBUFFERPARAMETERIVARBPROC) (GLenum target, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETBUFFERPOINTERVARBPROC) (GLenum target, GLenum pname, GLvoid** params);
+typedef void (GLAPIENTRY * PFNGLGETBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid* data);
+typedef GLboolean (GLAPIENTRY * PFNGLISBUFFERARBPROC) (GLuint buffer);
+typedef GLvoid * (GLAPIENTRY * PFNGLMAPBUFFERARBPROC) (GLenum target, GLenum access);
+typedef GLboolean (GLAPIENTRY * PFNGLUNMAPBUFFERARBPROC) (GLenum target);
+
+#define glBindBufferARB GLEW_GET_FUN(__glewBindBufferARB)
+#define glBufferDataARB GLEW_GET_FUN(__glewBufferDataARB)
+#define glBufferSubDataARB GLEW_GET_FUN(__glewBufferSubDataARB)
+#define glDeleteBuffersARB GLEW_GET_FUN(__glewDeleteBuffersARB)
+#define glGenBuffersARB GLEW_GET_FUN(__glewGenBuffersARB)
+#define glGetBufferParameterivARB GLEW_GET_FUN(__glewGetBufferParameterivARB)
+#define glGetBufferPointervARB GLEW_GET_FUN(__glewGetBufferPointervARB)
+#define glGetBufferSubDataARB GLEW_GET_FUN(__glewGetBufferSubDataARB)
+#define glIsBufferARB GLEW_GET_FUN(__glewIsBufferARB)
+#define glMapBufferARB GLEW_GET_FUN(__glewMapBufferARB)
+#define glUnmapBufferARB GLEW_GET_FUN(__glewUnmapBufferARB)
+
+#define GLEW_ARB_vertex_buffer_object GLEW_GET_VAR(__GLEW_ARB_vertex_buffer_object)
+
+#endif /* GL_ARB_vertex_buffer_object */
+
+/* ------------------------- GL_ARB_vertex_program ------------------------- */
+
+#ifndef GL_ARB_vertex_program
+#define GL_ARB_vertex_program 1
+
+#define GL_COLOR_SUM_ARB 0x8458
+#define GL_VERTEX_PROGRAM_ARB 0x8620
+#define GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB 0x8622
+#define GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB 0x8623
+#define GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB 0x8624
+#define GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB 0x8625
+#define GL_CURRENT_VERTEX_ATTRIB_ARB 0x8626
+#define GL_PROGRAM_LENGTH_ARB 0x8627
+#define GL_PROGRAM_STRING_ARB 0x8628
+#define GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB 0x862E
+#define GL_MAX_PROGRAM_MATRICES_ARB 0x862F
+#define GL_CURRENT_MATRIX_STACK_DEPTH_ARB 0x8640
+#define GL_CURRENT_MATRIX_ARB 0x8641
+#define GL_VERTEX_PROGRAM_POINT_SIZE_ARB 0x8642
+#define GL_VERTEX_PROGRAM_TWO_SIDE_ARB 0x8643
+#define GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB 0x8645
+#define GL_PROGRAM_ERROR_POSITION_ARB 0x864B
+#define GL_PROGRAM_BINDING_ARB 0x8677
+#define GL_MAX_VERTEX_ATTRIBS_ARB 0x8869
+#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB 0x886A
+#define GL_PROGRAM_ERROR_STRING_ARB 0x8874
+#define GL_PROGRAM_FORMAT_ASCII_ARB 0x8875
+#define GL_PROGRAM_FORMAT_ARB 0x8876
+#define GL_PROGRAM_INSTRUCTIONS_ARB 0x88A0
+#define GL_MAX_PROGRAM_INSTRUCTIONS_ARB 0x88A1
+#define GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A2
+#define GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A3
+#define GL_PROGRAM_TEMPORARIES_ARB 0x88A4
+#define GL_MAX_PROGRAM_TEMPORARIES_ARB 0x88A5
+#define GL_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A6
+#define GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A7
+#define GL_PROGRAM_PARAMETERS_ARB 0x88A8
+#define GL_MAX_PROGRAM_PARAMETERS_ARB 0x88A9
+#define GL_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AA
+#define GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AB
+#define GL_PROGRAM_ATTRIBS_ARB 0x88AC
+#define GL_MAX_PROGRAM_ATTRIBS_ARB 0x88AD
+#define GL_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AE
+#define GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AF
+#define GL_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B0
+#define GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B1
+#define GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B2
+#define GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B3
+#define GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB 0x88B4
+#define GL_MAX_PROGRAM_ENV_PARAMETERS_ARB 0x88B5
+#define GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB 0x88B6
+#define GL_TRANSPOSE_CURRENT_MATRIX_ARB 0x88B7
+#define GL_MATRIX0_ARB 0x88C0
+#define GL_MATRIX1_ARB 0x88C1
+#define GL_MATRIX2_ARB 0x88C2
+#define GL_MATRIX3_ARB 0x88C3
+#define GL_MATRIX4_ARB 0x88C4
+#define GL_MATRIX5_ARB 0x88C5
+#define GL_MATRIX6_ARB 0x88C6
+#define GL_MATRIX7_ARB 0x88C7
+#define GL_MATRIX8_ARB 0x88C8
+#define GL_MATRIX9_ARB 0x88C9
+#define GL_MATRIX10_ARB 0x88CA
+#define GL_MATRIX11_ARB 0x88CB
+#define GL_MATRIX12_ARB 0x88CC
+#define GL_MATRIX13_ARB 0x88CD
+#define GL_MATRIX14_ARB 0x88CE
+#define GL_MATRIX15_ARB 0x88CF
+#define GL_MATRIX16_ARB 0x88D0
+#define GL_MATRIX17_ARB 0x88D1
+#define GL_MATRIX18_ARB 0x88D2
+#define GL_MATRIX19_ARB 0x88D3
+#define GL_MATRIX20_ARB 0x88D4
+#define GL_MATRIX21_ARB 0x88D5
+#define GL_MATRIX22_ARB 0x88D6
+#define GL_MATRIX23_ARB 0x88D7
+#define GL_MATRIX24_ARB 0x88D8
+#define GL_MATRIX25_ARB 0x88D9
+#define GL_MATRIX26_ARB 0x88DA
+#define GL_MATRIX27_ARB 0x88DB
+#define GL_MATRIX28_ARB 0x88DC
+#define GL_MATRIX29_ARB 0x88DD
+#define GL_MATRIX30_ARB 0x88DE
+#define GL_MATRIX31_ARB 0x88DF
+
+typedef void (GLAPIENTRY * PFNGLBINDPROGRAMARBPROC) (GLenum target, GLuint program);
+typedef void (GLAPIENTRY * PFNGLDELETEPROGRAMSARBPROC) (GLsizei n, const GLuint* programs);
+typedef void (GLAPIENTRY * PFNGLDISABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
+typedef void (GLAPIENTRY * PFNGLENABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
+typedef void (GLAPIENTRY * PFNGLGENPROGRAMSARBPROC) (GLsizei n, GLuint* programs);
+typedef void (GLAPIENTRY * PFNGLGETPROGRAMENVPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble* params);
+typedef void (GLAPIENTRY * PFNGLGETPROGRAMENVPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble* params);
+typedef void (GLAPIENTRY * PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETPROGRAMSTRINGARBPROC) (GLenum target, GLenum pname, void* string);
+typedef void (GLAPIENTRY * PFNGLGETPROGRAMIVARBPROC) (GLenum target, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBPOINTERVARBPROC) (GLuint index, GLenum pname, GLvoid** pointer);
+typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBDVARBPROC) (GLuint index, GLenum pname, GLdouble* params);
+typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBFVARBPROC) (GLuint index, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBIVARBPROC) (GLuint index, GLenum pname, GLint* params);
+typedef GLboolean (GLAPIENTRY * PFNGLISPROGRAMARBPROC) (GLuint program);
+typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble* params);
+typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble* params);
+typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLPROGRAMSTRINGARBPROC) (GLenum target, GLenum format, GLsizei len, const void* string);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1DARBPROC) (GLuint index, GLdouble x);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1DVARBPROC) (GLuint index, const GLdouble* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1FARBPROC) (GLuint index, GLfloat x);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1FVARBPROC) (GLuint index, const GLfloat* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1SARBPROC) (GLuint index, GLshort x);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1SVARBPROC) (GLuint index, const GLshort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2DARBPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2DVARBPROC) (GLuint index, const GLdouble* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2FARBPROC) (GLuint index, GLfloat x, GLfloat y);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2FVARBPROC) (GLuint index, const GLfloat* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2SARBPROC) (GLuint index, GLshort x, GLshort y);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2SVARBPROC) (GLuint index, const GLshort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3DVARBPROC) (GLuint index, const GLdouble* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3FVARBPROC) (GLuint index, const GLfloat* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3SVARBPROC) (GLuint index, const GLshort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NBVARBPROC) (GLuint index, const GLbyte* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NIVARBPROC) (GLuint index, const GLint* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NSVARBPROC) (GLuint index, const GLshort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NUBARBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NUBVARBPROC) (GLuint index, const GLubyte* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NUIVARBPROC) (GLuint index, const GLuint* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NUSVARBPROC) (GLuint index, const GLushort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4BVARBPROC) (GLuint index, const GLbyte* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4DVARBPROC) (GLuint index, const GLdouble* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4FVARBPROC) (GLuint index, const GLfloat* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4IVARBPROC) (GLuint index, const GLint* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4SVARBPROC) (GLuint index, const GLshort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4UBVARBPROC) (GLuint index, const GLubyte* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4UIVARBPROC) (GLuint index, const GLuint* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4USVARBPROC) (GLuint index, const GLushort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBPOINTERARBPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void* pointer);
+
+#define glBindProgramARB GLEW_GET_FUN(__glewBindProgramARB)
+#define glDeleteProgramsARB GLEW_GET_FUN(__glewDeleteProgramsARB)
+#define glDisableVertexAttribArrayARB GLEW_GET_FUN(__glewDisableVertexAttribArrayARB)
+#define glEnableVertexAttribArrayARB GLEW_GET_FUN(__glewEnableVertexAttribArrayARB)
+#define glGenProgramsARB GLEW_GET_FUN(__glewGenProgramsARB)
+#define glGetProgramEnvParameterdvARB GLEW_GET_FUN(__glewGetProgramEnvParameterdvARB)
+#define glGetProgramEnvParameterfvARB GLEW_GET_FUN(__glewGetProgramEnvParameterfvARB)
+#define glGetProgramLocalParameterdvARB GLEW_GET_FUN(__glewGetProgramLocalParameterdvARB)
+#define glGetProgramLocalParameterfvARB GLEW_GET_FUN(__glewGetProgramLocalParameterfvARB)
+#define glGetProgramStringARB GLEW_GET_FUN(__glewGetProgramStringARB)
+#define glGetProgramivARB GLEW_GET_FUN(__glewGetProgramivARB)
+#define glGetVertexAttribPointervARB GLEW_GET_FUN(__glewGetVertexAttribPointervARB)
+#define glGetVertexAttribdvARB GLEW_GET_FUN(__glewGetVertexAttribdvARB)
+#define glGetVertexAttribfvARB GLEW_GET_FUN(__glewGetVertexAttribfvARB)
+#define glGetVertexAttribivARB GLEW_GET_FUN(__glewGetVertexAttribivARB)
+#define glIsProgramARB GLEW_GET_FUN(__glewIsProgramARB)
+#define glProgramEnvParameter4dARB GLEW_GET_FUN(__glewProgramEnvParameter4dARB)
+#define glProgramEnvParameter4dvARB GLEW_GET_FUN(__glewProgramEnvParameter4dvARB)
+#define glProgramEnvParameter4fARB GLEW_GET_FUN(__glewProgramEnvParameter4fARB)
+#define glProgramEnvParameter4fvARB GLEW_GET_FUN(__glewProgramEnvParameter4fvARB)
+#define glProgramLocalParameter4dARB GLEW_GET_FUN(__glewProgramLocalParameter4dARB)
+#define glProgramLocalParameter4dvARB GLEW_GET_FUN(__glewProgramLocalParameter4dvARB)
+#define glProgramLocalParameter4fARB GLEW_GET_FUN(__glewProgramLocalParameter4fARB)
+#define glProgramLocalParameter4fvARB GLEW_GET_FUN(__glewProgramLocalParameter4fvARB)
+#define glProgramStringARB GLEW_GET_FUN(__glewProgramStringARB)
+#define glVertexAttrib1dARB GLEW_GET_FUN(__glewVertexAttrib1dARB)
+#define glVertexAttrib1dvARB GLEW_GET_FUN(__glewVertexAttrib1dvARB)
+#define glVertexAttrib1fARB GLEW_GET_FUN(__glewVertexAttrib1fARB)
+#define glVertexAttrib1fvARB GLEW_GET_FUN(__glewVertexAttrib1fvARB)
+#define glVertexAttrib1sARB GLEW_GET_FUN(__glewVertexAttrib1sARB)
+#define glVertexAttrib1svARB GLEW_GET_FUN(__glewVertexAttrib1svARB)
+#define glVertexAttrib2dARB GLEW_GET_FUN(__glewVertexAttrib2dARB)
+#define glVertexAttrib2dvARB GLEW_GET_FUN(__glewVertexAttrib2dvARB)
+#define glVertexAttrib2fARB GLEW_GET_FUN(__glewVertexAttrib2fARB)
+#define glVertexAttrib2fvARB GLEW_GET_FUN(__glewVertexAttrib2fvARB)
+#define glVertexAttrib2sARB GLEW_GET_FUN(__glewVertexAttrib2sARB)
+#define glVertexAttrib2svARB GLEW_GET_FUN(__glewVertexAttrib2svARB)
+#define glVertexAttrib3dARB GLEW_GET_FUN(__glewVertexAttrib3dARB)
+#define glVertexAttrib3dvARB GLEW_GET_FUN(__glewVertexAttrib3dvARB)
+#define glVertexAttrib3fARB GLEW_GET_FUN(__glewVertexAttrib3fARB)
+#define glVertexAttrib3fvARB GLEW_GET_FUN(__glewVertexAttrib3fvARB)
+#define glVertexAttrib3sARB GLEW_GET_FUN(__glewVertexAttrib3sARB)
+#define glVertexAttrib3svARB GLEW_GET_FUN(__glewVertexAttrib3svARB)
+#define glVertexAttrib4NbvARB GLEW_GET_FUN(__glewVertexAttrib4NbvARB)
+#define glVertexAttrib4NivARB GLEW_GET_FUN(__glewVertexAttrib4NivARB)
+#define glVertexAttrib4NsvARB GLEW_GET_FUN(__glewVertexAttrib4NsvARB)
+#define glVertexAttrib4NubARB GLEW_GET_FUN(__glewVertexAttrib4NubARB)
+#define glVertexAttrib4NubvARB GLEW_GET_FUN(__glewVertexAttrib4NubvARB)
+#define glVertexAttrib4NuivARB GLEW_GET_FUN(__glewVertexAttrib4NuivARB)
+#define glVertexAttrib4NusvARB GLEW_GET_FUN(__glewVertexAttrib4NusvARB)
+#define glVertexAttrib4bvARB GLEW_GET_FUN(__glewVertexAttrib4bvARB)
+#define glVertexAttrib4dARB GLEW_GET_FUN(__glewVertexAttrib4dARB)
+#define glVertexAttrib4dvARB GLEW_GET_FUN(__glewVertexAttrib4dvARB)
+#define glVertexAttrib4fARB GLEW_GET_FUN(__glewVertexAttrib4fARB)
+#define glVertexAttrib4fvARB GLEW_GET_FUN(__glewVertexAttrib4fvARB)
+#define glVertexAttrib4ivARB GLEW_GET_FUN(__glewVertexAttrib4ivARB)
+#define glVertexAttrib4sARB GLEW_GET_FUN(__glewVertexAttrib4sARB)
+#define glVertexAttrib4svARB GLEW_GET_FUN(__glewVertexAttrib4svARB)
+#define glVertexAttrib4ubvARB GLEW_GET_FUN(__glewVertexAttrib4ubvARB)
+#define glVertexAttrib4uivARB GLEW_GET_FUN(__glewVertexAttrib4uivARB)
+#define glVertexAttrib4usvARB GLEW_GET_FUN(__glewVertexAttrib4usvARB)
+#define glVertexAttribPointerARB GLEW_GET_FUN(__glewVertexAttribPointerARB)
+
+#define GLEW_ARB_vertex_program GLEW_GET_VAR(__GLEW_ARB_vertex_program)
+
+#endif /* GL_ARB_vertex_program */
+
+/* -------------------------- GL_ARB_vertex_shader ------------------------- */
+
+#ifndef GL_ARB_vertex_shader
+#define GL_ARB_vertex_shader 1
+
+#define GL_VERTEX_SHADER_ARB 0x8B31
+#define GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB 0x8B4A
+#define GL_MAX_VARYING_FLOATS_ARB 0x8B4B
+#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB 0x8B4C
+#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB 0x8B4D
+#define GL_OBJECT_ACTIVE_ATTRIBUTES_ARB 0x8B89
+#define GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB 0x8B8A
+
+typedef void (GLAPIENTRY * PFNGLBINDATTRIBLOCATIONARBPROC) (GLhandleARB programObj, GLuint index, const GLcharARB* name);
+typedef void (GLAPIENTRY * PFNGLGETACTIVEATTRIBARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei* length, GLint *size, GLenum *type, GLcharARB *name);
+typedef GLint (GLAPIENTRY * PFNGLGETATTRIBLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB* name);
+
+#define glBindAttribLocationARB GLEW_GET_FUN(__glewBindAttribLocationARB)
+#define glGetActiveAttribARB GLEW_GET_FUN(__glewGetActiveAttribARB)
+#define glGetAttribLocationARB GLEW_GET_FUN(__glewGetAttribLocationARB)
+
+#define GLEW_ARB_vertex_shader GLEW_GET_VAR(__GLEW_ARB_vertex_shader)
+
+#endif /* GL_ARB_vertex_shader */
+
+/* --------------------------- GL_ARB_window_pos --------------------------- */
+
+#ifndef GL_ARB_window_pos
+#define GL_ARB_window_pos 1
+
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2DARBPROC) (GLdouble x, GLdouble y);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2DVARBPROC) (const GLdouble* p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2FARBPROC) (GLfloat x, GLfloat y);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2FVARBPROC) (const GLfloat* p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2IARBPROC) (GLint x, GLint y);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2IVARBPROC) (const GLint* p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2SARBPROC) (GLshort x, GLshort y);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2SVARBPROC) (const GLshort* p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3DARBPROC) (GLdouble x, GLdouble y, GLdouble z);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3DVARBPROC) (const GLdouble* p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3FARBPROC) (GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3FVARBPROC) (const GLfloat* p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3IARBPROC) (GLint x, GLint y, GLint z);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3IVARBPROC) (const GLint* p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3SARBPROC) (GLshort x, GLshort y, GLshort z);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3SVARBPROC) (const GLshort* p);
+
+#define glWindowPos2dARB GLEW_GET_FUN(__glewWindowPos2dARB)
+#define glWindowPos2dvARB GLEW_GET_FUN(__glewWindowPos2dvARB)
+#define glWindowPos2fARB GLEW_GET_FUN(__glewWindowPos2fARB)
+#define glWindowPos2fvARB GLEW_GET_FUN(__glewWindowPos2fvARB)
+#define glWindowPos2iARB GLEW_GET_FUN(__glewWindowPos2iARB)
+#define glWindowPos2ivARB GLEW_GET_FUN(__glewWindowPos2ivARB)
+#define glWindowPos2sARB GLEW_GET_FUN(__glewWindowPos2sARB)
+#define glWindowPos2svARB GLEW_GET_FUN(__glewWindowPos2svARB)
+#define glWindowPos3dARB GLEW_GET_FUN(__glewWindowPos3dARB)
+#define glWindowPos3dvARB GLEW_GET_FUN(__glewWindowPos3dvARB)
+#define glWindowPos3fARB GLEW_GET_FUN(__glewWindowPos3fARB)
+#define glWindowPos3fvARB GLEW_GET_FUN(__glewWindowPos3fvARB)
+#define glWindowPos3iARB GLEW_GET_FUN(__glewWindowPos3iARB)
+#define glWindowPos3ivARB GLEW_GET_FUN(__glewWindowPos3ivARB)
+#define glWindowPos3sARB GLEW_GET_FUN(__glewWindowPos3sARB)
+#define glWindowPos3svARB GLEW_GET_FUN(__glewWindowPos3svARB)
+
+#define GLEW_ARB_window_pos GLEW_GET_VAR(__GLEW_ARB_window_pos)
+
+#endif /* GL_ARB_window_pos */
+
+/* ------------------------- GL_ATIX_point_sprites ------------------------- */
+
+#ifndef GL_ATIX_point_sprites
+#define GL_ATIX_point_sprites 1
+
+#define GLEW_ATIX_point_sprites GLEW_GET_VAR(__GLEW_ATIX_point_sprites)
+
+#endif /* GL_ATIX_point_sprites */
+
+/* ---------------------- GL_ATIX_texture_env_combine3 --------------------- */
+
+#ifndef GL_ATIX_texture_env_combine3
+#define GL_ATIX_texture_env_combine3 1
+
+#define GL_MODULATE_ADD_ATIX 0x8744
+#define GL_MODULATE_SIGNED_ADD_ATIX 0x8745
+#define GL_MODULATE_SUBTRACT_ATIX 0x8746
+
+#define GLEW_ATIX_texture_env_combine3 GLEW_GET_VAR(__GLEW_ATIX_texture_env_combine3)
+
+#endif /* GL_ATIX_texture_env_combine3 */
+
+/* ----------------------- GL_ATIX_texture_env_route ----------------------- */
+
+#ifndef GL_ATIX_texture_env_route
+#define GL_ATIX_texture_env_route 1
+
+#define GL_SECONDARY_COLOR_ATIX 0x8747
+#define GL_TEXTURE_OUTPUT_RGB_ATIX 0x8748
+#define GL_TEXTURE_OUTPUT_ALPHA_ATIX 0x8749
+
+#define GLEW_ATIX_texture_env_route GLEW_GET_VAR(__GLEW_ATIX_texture_env_route)
+
+#endif /* GL_ATIX_texture_env_route */
+
+/* ---------------- GL_ATIX_vertex_shader_output_point_size ---------------- */
+
+#ifndef GL_ATIX_vertex_shader_output_point_size
+#define GL_ATIX_vertex_shader_output_point_size 1
+
+#define GL_OUTPUT_POINT_SIZE_ATIX 0x610E
+
+#define GLEW_ATIX_vertex_shader_output_point_size GLEW_GET_VAR(__GLEW_ATIX_vertex_shader_output_point_size)
+
+#endif /* GL_ATIX_vertex_shader_output_point_size */
+
+/* -------------------------- GL_ATI_draw_buffers -------------------------- */
+
+#ifndef GL_ATI_draw_buffers
+#define GL_ATI_draw_buffers 1
+
+#define GL_MAX_DRAW_BUFFERS_ATI 0x8824
+#define GL_DRAW_BUFFER0_ATI 0x8825
+#define GL_DRAW_BUFFER1_ATI 0x8826
+#define GL_DRAW_BUFFER2_ATI 0x8827
+#define GL_DRAW_BUFFER3_ATI 0x8828
+#define GL_DRAW_BUFFER4_ATI 0x8829
+#define GL_DRAW_BUFFER5_ATI 0x882A
+#define GL_DRAW_BUFFER6_ATI 0x882B
+#define GL_DRAW_BUFFER7_ATI 0x882C
+#define GL_DRAW_BUFFER8_ATI 0x882D
+#define GL_DRAW_BUFFER9_ATI 0x882E
+#define GL_DRAW_BUFFER10_ATI 0x882F
+#define GL_DRAW_BUFFER11_ATI 0x8830
+#define GL_DRAW_BUFFER12_ATI 0x8831
+#define GL_DRAW_BUFFER13_ATI 0x8832
+#define GL_DRAW_BUFFER14_ATI 0x8833
+#define GL_DRAW_BUFFER15_ATI 0x8834
+
+typedef void (GLAPIENTRY * PFNGLDRAWBUFFERSATIPROC) (GLsizei n, const GLenum* bufs);
+
+#define glDrawBuffersATI GLEW_GET_FUN(__glewDrawBuffersATI)
+
+#define GLEW_ATI_draw_buffers GLEW_GET_VAR(__GLEW_ATI_draw_buffers)
+
+#endif /* GL_ATI_draw_buffers */
+
+/* -------------------------- GL_ATI_element_array ------------------------- */
+
+#ifndef GL_ATI_element_array
+#define GL_ATI_element_array 1
+
+#define GL_ELEMENT_ARRAY_ATI 0x8768
+#define GL_ELEMENT_ARRAY_TYPE_ATI 0x8769
+#define GL_ELEMENT_ARRAY_POINTER_ATI 0x876A
+
+typedef void (GLAPIENTRY * PFNGLDRAWELEMENTARRAYATIPROC) (GLenum mode, GLsizei count);
+typedef void (GLAPIENTRY * PFNGLDRAWRANGEELEMENTARRAYATIPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count);
+typedef void (GLAPIENTRY * PFNGLELEMENTPOINTERATIPROC) (GLenum type, const void* pointer);
+
+#define glDrawElementArrayATI GLEW_GET_FUN(__glewDrawElementArrayATI)
+#define glDrawRangeElementArrayATI GLEW_GET_FUN(__glewDrawRangeElementArrayATI)
+#define glElementPointerATI GLEW_GET_FUN(__glewElementPointerATI)
+
+#define GLEW_ATI_element_array GLEW_GET_VAR(__GLEW_ATI_element_array)
+
+#endif /* GL_ATI_element_array */
+
+/* ------------------------- GL_ATI_envmap_bumpmap ------------------------- */
+
+#ifndef GL_ATI_envmap_bumpmap
+#define GL_ATI_envmap_bumpmap 1
+
+#define GL_BUMP_ROT_MATRIX_ATI 0x8775
+#define GL_BUMP_ROT_MATRIX_SIZE_ATI 0x8776
+#define GL_BUMP_NUM_TEX_UNITS_ATI 0x8777
+#define GL_BUMP_TEX_UNITS_ATI 0x8778
+#define GL_DUDV_ATI 0x8779
+#define GL_DU8DV8_ATI 0x877A
+#define GL_BUMP_ENVMAP_ATI 0x877B
+#define GL_BUMP_TARGET_ATI 0x877C
+
+typedef void (GLAPIENTRY * PFNGLGETTEXBUMPPARAMETERFVATIPROC) (GLenum pname, GLfloat *param);
+typedef void (GLAPIENTRY * PFNGLGETTEXBUMPPARAMETERIVATIPROC) (GLenum pname, GLint *param);
+typedef void (GLAPIENTRY * PFNGLTEXBUMPPARAMETERFVATIPROC) (GLenum pname, GLfloat *param);
+typedef void (GLAPIENTRY * PFNGLTEXBUMPPARAMETERIVATIPROC) (GLenum pname, GLint *param);
+
+#define glGetTexBumpParameterfvATI GLEW_GET_FUN(__glewGetTexBumpParameterfvATI)
+#define glGetTexBumpParameterivATI GLEW_GET_FUN(__glewGetTexBumpParameterivATI)
+#define glTexBumpParameterfvATI GLEW_GET_FUN(__glewTexBumpParameterfvATI)
+#define glTexBumpParameterivATI GLEW_GET_FUN(__glewTexBumpParameterivATI)
+
+#define GLEW_ATI_envmap_bumpmap GLEW_GET_VAR(__GLEW_ATI_envmap_bumpmap)
+
+#endif /* GL_ATI_envmap_bumpmap */
+
+/* ------------------------- GL_ATI_fragment_shader ------------------------ */
+
+#ifndef GL_ATI_fragment_shader
+#define GL_ATI_fragment_shader 1
+
+#define GL_RED_BIT_ATI 0x00000001
+#define GL_2X_BIT_ATI 0x00000001
+#define GL_4X_BIT_ATI 0x00000002
+#define GL_GREEN_BIT_ATI 0x00000002
+#define GL_COMP_BIT_ATI 0x00000002
+#define GL_BLUE_BIT_ATI 0x00000004
+#define GL_8X_BIT_ATI 0x00000004
+#define GL_NEGATE_BIT_ATI 0x00000004
+#define GL_BIAS_BIT_ATI 0x00000008
+#define GL_HALF_BIT_ATI 0x00000008
+#define GL_QUARTER_BIT_ATI 0x00000010
+#define GL_EIGHTH_BIT_ATI 0x00000020
+#define GL_SATURATE_BIT_ATI 0x00000040
+#define GL_FRAGMENT_SHADER_ATI 0x8920
+#define GL_REG_0_ATI 0x8921
+#define GL_REG_1_ATI 0x8922
+#define GL_REG_2_ATI 0x8923
+#define GL_REG_3_ATI 0x8924
+#define GL_REG_4_ATI 0x8925
+#define GL_REG_5_ATI 0x8926
+#define GL_CON_0_ATI 0x8941
+#define GL_CON_1_ATI 0x8942
+#define GL_CON_2_ATI 0x8943
+#define GL_CON_3_ATI 0x8944
+#define GL_CON_4_ATI 0x8945
+#define GL_CON_5_ATI 0x8946
+#define GL_CON_6_ATI 0x8947
+#define GL_CON_7_ATI 0x8948
+#define GL_MOV_ATI 0x8961
+#define GL_ADD_ATI 0x8963
+#define GL_MUL_ATI 0x8964
+#define GL_SUB_ATI 0x8965
+#define GL_DOT3_ATI 0x8966
+#define GL_DOT4_ATI 0x8967
+#define GL_MAD_ATI 0x8968
+#define GL_LERP_ATI 0x8969
+#define GL_CND_ATI 0x896A
+#define GL_CND0_ATI 0x896B
+#define GL_DOT2_ADD_ATI 0x896C
+#define GL_SECONDARY_INTERPOLATOR_ATI 0x896D
+#define GL_NUM_FRAGMENT_REGISTERS_ATI 0x896E
+#define GL_NUM_FRAGMENT_CONSTANTS_ATI 0x896F
+#define GL_NUM_PASSES_ATI 0x8970
+#define GL_NUM_INSTRUCTIONS_PER_PASS_ATI 0x8971
+#define GL_NUM_INSTRUCTIONS_TOTAL_ATI 0x8972
+#define GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI 0x8973
+#define GL_NUM_LOOPBACK_COMPONENTS_ATI 0x8974
+#define GL_COLOR_ALPHA_PAIRING_ATI 0x8975
+#define GL_SWIZZLE_STR_ATI 0x8976
+#define GL_SWIZZLE_STQ_ATI 0x8977
+#define GL_SWIZZLE_STR_DR_ATI 0x8978
+#define GL_SWIZZLE_STQ_DQ_ATI 0x8979
+#define GL_SWIZZLE_STRQ_ATI 0x897A
+#define GL_SWIZZLE_STRQ_DQ_ATI 0x897B
+
+typedef void (GLAPIENTRY * PFNGLALPHAFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
+typedef void (GLAPIENTRY * PFNGLALPHAFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
+typedef void (GLAPIENTRY * PFNGLALPHAFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
+typedef void (GLAPIENTRY * PFNGLBEGINFRAGMENTSHADERATIPROC) (void);
+typedef void (GLAPIENTRY * PFNGLBINDFRAGMENTSHADERATIPROC) (GLuint id);
+typedef void (GLAPIENTRY * PFNGLCOLORFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
+typedef void (GLAPIENTRY * PFNGLCOLORFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
+typedef void (GLAPIENTRY * PFNGLCOLORFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
+typedef void (GLAPIENTRY * PFNGLDELETEFRAGMENTSHADERATIPROC) (GLuint id);
+typedef void (GLAPIENTRY * PFNGLENDFRAGMENTSHADERATIPROC) (void);
+typedef GLuint (GLAPIENTRY * PFNGLGENFRAGMENTSHADERSATIPROC) (GLuint range);
+typedef void (GLAPIENTRY * PFNGLPASSTEXCOORDATIPROC) (GLuint dst, GLuint coord, GLenum swizzle);
+typedef void (GLAPIENTRY * PFNGLSAMPLEMAPATIPROC) (GLuint dst, GLuint interp, GLenum swizzle);
+typedef void (GLAPIENTRY * PFNGLSETFRAGMENTSHADERCONSTANTATIPROC) (GLuint dst, const GLfloat* value);
+
+#define glAlphaFragmentOp1ATI GLEW_GET_FUN(__glewAlphaFragmentOp1ATI)
+#define glAlphaFragmentOp2ATI GLEW_GET_FUN(__glewAlphaFragmentOp2ATI)
+#define glAlphaFragmentOp3ATI GLEW_GET_FUN(__glewAlphaFragmentOp3ATI)
+#define glBeginFragmentShaderATI GLEW_GET_FUN(__glewBeginFragmentShaderATI)
+#define glBindFragmentShaderATI GLEW_GET_FUN(__glewBindFragmentShaderATI)
+#define glColorFragmentOp1ATI GLEW_GET_FUN(__glewColorFragmentOp1ATI)
+#define glColorFragmentOp2ATI GLEW_GET_FUN(__glewColorFragmentOp2ATI)
+#define glColorFragmentOp3ATI GLEW_GET_FUN(__glewColorFragmentOp3ATI)
+#define glDeleteFragmentShaderATI GLEW_GET_FUN(__glewDeleteFragmentShaderATI)
+#define glEndFragmentShaderATI GLEW_GET_FUN(__glewEndFragmentShaderATI)
+#define glGenFragmentShadersATI GLEW_GET_FUN(__glewGenFragmentShadersATI)
+#define glPassTexCoordATI GLEW_GET_FUN(__glewPassTexCoordATI)
+#define glSampleMapATI GLEW_GET_FUN(__glewSampleMapATI)
+#define glSetFragmentShaderConstantATI GLEW_GET_FUN(__glewSetFragmentShaderConstantATI)
+
+#define GLEW_ATI_fragment_shader GLEW_GET_VAR(__GLEW_ATI_fragment_shader)
+
+#endif /* GL_ATI_fragment_shader */
+
+/* ------------------------ GL_ATI_map_object_buffer ----------------------- */
+
+#ifndef GL_ATI_map_object_buffer
+#define GL_ATI_map_object_buffer 1
+
+typedef void* (GLAPIENTRY * PFNGLMAPOBJECTBUFFERATIPROC) (GLuint buffer);
+typedef void (GLAPIENTRY * PFNGLUNMAPOBJECTBUFFERATIPROC) (GLuint buffer);
+
+#define glMapObjectBufferATI GLEW_GET_FUN(__glewMapObjectBufferATI)
+#define glUnmapObjectBufferATI GLEW_GET_FUN(__glewUnmapObjectBufferATI)
+
+#define GLEW_ATI_map_object_buffer GLEW_GET_VAR(__GLEW_ATI_map_object_buffer)
+
+#endif /* GL_ATI_map_object_buffer */
+
+/* -------------------------- GL_ATI_pn_triangles -------------------------- */
+
+#ifndef GL_ATI_pn_triangles
+#define GL_ATI_pn_triangles 1
+
+#define GL_PN_TRIANGLES_ATI 0x87F0
+#define GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F1
+#define GL_PN_TRIANGLES_POINT_MODE_ATI 0x87F2
+#define GL_PN_TRIANGLES_NORMAL_MODE_ATI 0x87F3
+#define GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F4
+#define GL_PN_TRIANGLES_POINT_MODE_LINEAR_ATI 0x87F5
+#define GL_PN_TRIANGLES_POINT_MODE_CUBIC_ATI 0x87F6
+#define GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI 0x87F7
+#define GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI 0x87F8
+
+typedef void (GLAPIENTRY * PFNGLPNTRIANGLESFATIPROC) (GLenum pname, GLfloat param);
+typedef void (GLAPIENTRY * PFNGLPNTRIANGLESIATIPROC) (GLenum pname, GLint param);
+
+#define glPNTrianglesfATI GLEW_GET_FUN(__glPNTrianglewesfATI)
+#define glPNTrianglesiATI GLEW_GET_FUN(__glPNTrianglewesiATI)
+
+#define GLEW_ATI_pn_triangles GLEW_GET_VAR(__GLEW_ATI_pn_triangles)
+
+#endif /* GL_ATI_pn_triangles */
+
+/* ------------------------ GL_ATI_separate_stencil ------------------------ */
+
+#ifndef GL_ATI_separate_stencil
+#define GL_ATI_separate_stencil 1
+
+#define GL_STENCIL_BACK_FUNC_ATI 0x8800
+#define GL_STENCIL_BACK_FAIL_ATI 0x8801
+#define GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI 0x8802
+#define GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI 0x8803
+
+typedef void (GLAPIENTRY * PFNGLSTENCILFUNCSEPARATEATIPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+typedef void (GLAPIENTRY * PFNGLSTENCILOPSEPARATEATIPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
+
+#define glStencilFuncSeparateATI GLEW_GET_FUN(__glewStencilFuncSeparateATI)
+#define glStencilOpSeparateATI GLEW_GET_FUN(__glewStencilOpSeparateATI)
+
+#define GLEW_ATI_separate_stencil GLEW_GET_VAR(__GLEW_ATI_separate_stencil)
+
+#endif /* GL_ATI_separate_stencil */
+
+/* ---------------------- GL_ATI_text_fragment_shader ---------------------- */
+
+#ifndef GL_ATI_text_fragment_shader
+#define GL_ATI_text_fragment_shader 1
+
+#define GL_TEXT_FRAGMENT_SHADER_ATI 0x8200
+
+#define GLEW_ATI_text_fragment_shader GLEW_GET_VAR(__GLEW_ATI_text_fragment_shader)
+
+#endif /* GL_ATI_text_fragment_shader */
+
+/* --------------------- GL_ATI_texture_compression_3dc -------------------- */
+
+#ifndef GL_ATI_texture_compression_3dc
+#define GL_ATI_texture_compression_3dc 1
+
+#define GL_COMPRESSED_RGB_3DC_ATI 0x8837
+
+#define GLEW_ATI_texture_compression_3dc GLEW_GET_VAR(__GLEW_ATI_texture_compression_3dc)
+
+#endif /* GL_ATI_texture_compression_3dc */
+
+/* ---------------------- GL_ATI_texture_env_combine3 ---------------------- */
+
+#ifndef GL_ATI_texture_env_combine3
+#define GL_ATI_texture_env_combine3 1
+
+#define GL_MODULATE_ADD_ATI 0x8744
+#define GL_MODULATE_SIGNED_ADD_ATI 0x8745
+#define GL_MODULATE_SUBTRACT_ATI 0x8746
+
+#define GLEW_ATI_texture_env_combine3 GLEW_GET_VAR(__GLEW_ATI_texture_env_combine3)
+
+#endif /* GL_ATI_texture_env_combine3 */
+
+/* -------------------------- GL_ATI_texture_float ------------------------- */
+
+#ifndef GL_ATI_texture_float
+#define GL_ATI_texture_float 1
+
+#define GL_RGBA_FLOAT32_ATI 0x8814
+#define GL_RGB_FLOAT32_ATI 0x8815
+#define GL_ALPHA_FLOAT32_ATI 0x8816
+#define GL_INTENSITY_FLOAT32_ATI 0x8817
+#define GL_LUMINANCE_FLOAT32_ATI 0x8818
+#define GL_LUMINANCE_ALPHA_FLOAT32_ATI 0x8819
+#define GL_RGBA_FLOAT16_ATI 0x881A
+#define GL_RGB_FLOAT16_ATI 0x881B
+#define GL_ALPHA_FLOAT16_ATI 0x881C
+#define GL_INTENSITY_FLOAT16_ATI 0x881D
+#define GL_LUMINANCE_FLOAT16_ATI 0x881E
+#define GL_LUMINANCE_ALPHA_FLOAT16_ATI 0x881F
+
+#define GLEW_ATI_texture_float GLEW_GET_VAR(__GLEW_ATI_texture_float)
+
+#endif /* GL_ATI_texture_float */
+
+/* ----------------------- GL_ATI_texture_mirror_once ---------------------- */
+
+#ifndef GL_ATI_texture_mirror_once
+#define GL_ATI_texture_mirror_once 1
+
+#define GL_MIRROR_CLAMP_ATI 0x8742
+#define GL_MIRROR_CLAMP_TO_EDGE_ATI 0x8743
+
+#define GLEW_ATI_texture_mirror_once GLEW_GET_VAR(__GLEW_ATI_texture_mirror_once)
+
+#endif /* GL_ATI_texture_mirror_once */
+
+/* ----------------------- GL_ATI_vertex_array_object ---------------------- */
+
+#ifndef GL_ATI_vertex_array_object
+#define GL_ATI_vertex_array_object 1
+
+#define GL_STATIC_ATI 0x8760
+#define GL_DYNAMIC_ATI 0x8761
+#define GL_PRESERVE_ATI 0x8762
+#define GL_DISCARD_ATI 0x8763
+#define GL_OBJECT_BUFFER_SIZE_ATI 0x8764
+#define GL_OBJECT_BUFFER_USAGE_ATI 0x8765
+#define GL_ARRAY_OBJECT_BUFFER_ATI 0x8766
+#define GL_ARRAY_OBJECT_OFFSET_ATI 0x8767
+
+typedef void (GLAPIENTRY * PFNGLARRAYOBJECTATIPROC) (GLenum array, GLint size, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
+typedef void (GLAPIENTRY * PFNGLFREEOBJECTBUFFERATIPROC) (GLuint buffer);
+typedef void (GLAPIENTRY * PFNGLGETARRAYOBJECTFVATIPROC) (GLenum array, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETARRAYOBJECTIVATIPROC) (GLenum array, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETOBJECTBUFFERFVATIPROC) (GLuint buffer, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETOBJECTBUFFERIVATIPROC) (GLuint buffer, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETVARIANTARRAYOBJECTFVATIPROC) (GLuint id, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETVARIANTARRAYOBJECTIVATIPROC) (GLuint id, GLenum pname, GLint* params);
+typedef GLboolean (GLAPIENTRY * PFNGLISOBJECTBUFFERATIPROC) (GLuint buffer);
+typedef GLuint (GLAPIENTRY * PFNGLNEWOBJECTBUFFERATIPROC) (GLsizei size, const void* pointer, GLenum usage);
+typedef void (GLAPIENTRY * PFNGLUPDATEOBJECTBUFFERATIPROC) (GLuint buffer, GLuint offset, GLsizei size, const void* pointer, GLenum preserve);
+typedef void (GLAPIENTRY * PFNGLVARIANTARRAYOBJECTATIPROC) (GLuint id, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
+
+#define glArrayObjectATI GLEW_GET_FUN(__glewArrayObjectATI)
+#define glFreeObjectBufferATI GLEW_GET_FUN(__glewFreeObjectBufferATI)
+#define glGetArrayObjectfvATI GLEW_GET_FUN(__glewGetArrayObjectfvATI)
+#define glGetArrayObjectivATI GLEW_GET_FUN(__glewGetArrayObjectivATI)
+#define glGetObjectBufferfvATI GLEW_GET_FUN(__glewGetObjectBufferfvATI)
+#define glGetObjectBufferivATI GLEW_GET_FUN(__glewGetObjectBufferivATI)
+#define glGetVariantArrayObjectfvATI GLEW_GET_FUN(__glewGetVariantArrayObjectfvATI)
+#define glGetVariantArrayObjectivATI GLEW_GET_FUN(__glewGetVariantArrayObjectivATI)
+#define glIsObjectBufferATI GLEW_GET_FUN(__glewIsObjectBufferATI)
+#define glNewObjectBufferATI GLEW_GET_FUN(__glewNewObjectBufferATI)
+#define glUpdateObjectBufferATI GLEW_GET_FUN(__glewUpdateObjectBufferATI)
+#define glVariantArrayObjectATI GLEW_GET_FUN(__glewVariantArrayObjectATI)
+
+#define GLEW_ATI_vertex_array_object GLEW_GET_VAR(__GLEW_ATI_vertex_array_object)
+
+#endif /* GL_ATI_vertex_array_object */
+
+/* ------------------- GL_ATI_vertex_attrib_array_object ------------------- */
+
+#ifndef GL_ATI_vertex_attrib_array_object
+#define GL_ATI_vertex_attrib_array_object 1
+
+typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC) (GLuint index, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC) (GLuint index, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBARRAYOBJECTATIPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset);
+
+#define glGetVertexAttribArrayObjectfvATI GLEW_GET_FUN(__glewGetVertexAttribArrayObjectfvATI)
+#define glGetVertexAttribArrayObjectivATI GLEW_GET_FUN(__glewGetVertexAttribArrayObjectivATI)
+#define glVertexAttribArrayObjectATI GLEW_GET_FUN(__glewVertexAttribArrayObjectATI)
+
+#define GLEW_ATI_vertex_attrib_array_object GLEW_GET_VAR(__GLEW_ATI_vertex_attrib_array_object)
+
+#endif /* GL_ATI_vertex_attrib_array_object */
+
+/* ------------------------- GL_ATI_vertex_streams ------------------------- */
+
+#ifndef GL_ATI_vertex_streams
+#define GL_ATI_vertex_streams 1
+
+#define GL_MAX_VERTEX_STREAMS_ATI 0x876B
+#define GL_VERTEX_SOURCE_ATI 0x876C
+#define GL_VERTEX_STREAM0_ATI 0x876D
+#define GL_VERTEX_STREAM1_ATI 0x876E
+#define GL_VERTEX_STREAM2_ATI 0x876F
+#define GL_VERTEX_STREAM3_ATI 0x8770
+#define GL_VERTEX_STREAM4_ATI 0x8771
+#define GL_VERTEX_STREAM5_ATI 0x8772
+#define GL_VERTEX_STREAM6_ATI 0x8773
+#define GL_VERTEX_STREAM7_ATI 0x8774
+
+typedef void (GLAPIENTRY * PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC) (GLenum stream);
+typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3BATIPROC) (GLenum stream, GLbyte x, GLbyte y, GLbyte z);
+typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3BVATIPROC) (GLenum stream, const GLbyte *v);
+typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z);
+typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3DVATIPROC) (GLenum stream, const GLdouble *v);
+typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3FVATIPROC) (GLenum stream, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3IATIPROC) (GLenum stream, GLint x, GLint y, GLint z);
+typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3IVATIPROC) (GLenum stream, const GLint *v);
+typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z);
+typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3SVATIPROC) (GLenum stream, const GLshort *v);
+typedef void (GLAPIENTRY * PFNGLVERTEXBLENDENVFATIPROC) (GLenum pname, GLfloat param);
+typedef void (GLAPIENTRY * PFNGLVERTEXBLENDENVIATIPROC) (GLenum pname, GLint param);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM2DATIPROC) (GLenum stream, GLdouble x, GLdouble y);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM2DVATIPROC) (GLenum stream, const GLdouble *v);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM2FATIPROC) (GLenum stream, GLfloat x, GLfloat y);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM2FVATIPROC) (GLenum stream, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM2IATIPROC) (GLenum stream, GLint x, GLint y);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM2IVATIPROC) (GLenum stream, const GLint *v);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM2SATIPROC) (GLenum stream, GLshort x, GLshort y);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM2SVATIPROC) (GLenum stream, const GLshort *v);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM3DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM3DVATIPROC) (GLenum stream, const GLdouble *v);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM3FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM3FVATIPROC) (GLenum stream, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM3IATIPROC) (GLenum stream, GLint x, GLint y, GLint z);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM3IVATIPROC) (GLenum stream, const GLint *v);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM3SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM3SVATIPROC) (GLenum stream, const GLshort *v);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM4DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM4DVATIPROC) (GLenum stream, const GLdouble *v);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM4FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM4FVATIPROC) (GLenum stream, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM4IATIPROC) (GLenum stream, GLint x, GLint y, GLint z, GLint w);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM4IVATIPROC) (GLenum stream, const GLint *v);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM4SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM4SVATIPROC) (GLenum stream, const GLshort *v);
+
+#define glClientActiveVertexStreamATI GLEW_GET_FUN(__glewClientActiveVertexStreamATI)
+#define glNormalStream3bATI GLEW_GET_FUN(__glewNormalStream3bATI)
+#define glNormalStream3bvATI GLEW_GET_FUN(__glewNormalStream3bvATI)
+#define glNormalStream3dATI GLEW_GET_FUN(__glewNormalStream3dATI)
+#define glNormalStream3dvATI GLEW_GET_FUN(__glewNormalStream3dvATI)
+#define glNormalStream3fATI GLEW_GET_FUN(__glewNormalStream3fATI)
+#define glNormalStream3fvATI GLEW_GET_FUN(__glewNormalStream3fvATI)
+#define glNormalStream3iATI GLEW_GET_FUN(__glewNormalStream3iATI)
+#define glNormalStream3ivATI GLEW_GET_FUN(__glewNormalStream3ivATI)
+#define glNormalStream3sATI GLEW_GET_FUN(__glewNormalStream3sATI)
+#define glNormalStream3svATI GLEW_GET_FUN(__glewNormalStream3svATI)
+#define glVertexBlendEnvfATI GLEW_GET_FUN(__glewVertexBlendEnvfATI)
+#define glVertexBlendEnviATI GLEW_GET_FUN(__glewVertexBlendEnviATI)
+#define glVertexStream2dATI GLEW_GET_FUN(__glewVertexStream2dATI)
+#define glVertexStream2dvATI GLEW_GET_FUN(__glewVertexStream2dvATI)
+#define glVertexStream2fATI GLEW_GET_FUN(__glewVertexStream2fATI)
+#define glVertexStream2fvATI GLEW_GET_FUN(__glewVertexStream2fvATI)
+#define glVertexStream2iATI GLEW_GET_FUN(__glewVertexStream2iATI)
+#define glVertexStream2ivATI GLEW_GET_FUN(__glewVertexStream2ivATI)
+#define glVertexStream2sATI GLEW_GET_FUN(__glewVertexStream2sATI)
+#define glVertexStream2svATI GLEW_GET_FUN(__glewVertexStream2svATI)
+#define glVertexStream3dATI GLEW_GET_FUN(__glewVertexStream3dATI)
+#define glVertexStream3dvATI GLEW_GET_FUN(__glewVertexStream3dvATI)
+#define glVertexStream3fATI GLEW_GET_FUN(__glewVertexStream3fATI)
+#define glVertexStream3fvATI GLEW_GET_FUN(__glewVertexStream3fvATI)
+#define glVertexStream3iATI GLEW_GET_FUN(__glewVertexStream3iATI)
+#define glVertexStream3ivATI GLEW_GET_FUN(__glewVertexStream3ivATI)
+#define glVertexStream3sATI GLEW_GET_FUN(__glewVertexStream3sATI)
+#define glVertexStream3svATI GLEW_GET_FUN(__glewVertexStream3svATI)
+#define glVertexStream4dATI GLEW_GET_FUN(__glewVertexStream4dATI)
+#define glVertexStream4dvATI GLEW_GET_FUN(__glewVertexStream4dvATI)
+#define glVertexStream4fATI GLEW_GET_FUN(__glewVertexStream4fATI)
+#define glVertexStream4fvATI GLEW_GET_FUN(__glewVertexStream4fvATI)
+#define glVertexStream4iATI GLEW_GET_FUN(__glewVertexStream4iATI)
+#define glVertexStream4ivATI GLEW_GET_FUN(__glewVertexStream4ivATI)
+#define glVertexStream4sATI GLEW_GET_FUN(__glewVertexStream4sATI)
+#define glVertexStream4svATI GLEW_GET_FUN(__glewVertexStream4svATI)
+
+#define GLEW_ATI_vertex_streams GLEW_GET_VAR(__GLEW_ATI_vertex_streams)
+
+#endif /* GL_ATI_vertex_streams */
+
+/* --------------------------- GL_EXT_422_pixels --------------------------- */
+
+#ifndef GL_EXT_422_pixels
+#define GL_EXT_422_pixels 1
+
+#define GL_422_EXT 0x80CC
+#define GL_422_REV_EXT 0x80CD
+#define GL_422_AVERAGE_EXT 0x80CE
+#define GL_422_REV_AVERAGE_EXT 0x80CF
+
+#define GLEW_EXT_422_pixels GLEW_GET_VAR(__GLEW_EXT_422_pixels)
+
+#endif /* GL_EXT_422_pixels */
+
+/* ---------------------------- GL_EXT_Cg_shader --------------------------- */
+
+#ifndef GL_EXT_Cg_shader
+#define GL_EXT_Cg_shader 1
+
+#define GL_CG_VERTEX_SHADER_EXT 0x890E
+#define GL_CG_FRAGMENT_SHADER_EXT 0x890F
+
+#define GLEW_EXT_Cg_shader GLEW_GET_VAR(__GLEW_EXT_Cg_shader)
+
+#endif /* GL_EXT_Cg_shader */
+
+/* ------------------------------ GL_EXT_abgr ------------------------------ */
+
+#ifndef GL_EXT_abgr
+#define GL_EXT_abgr 1
+
+#define GL_ABGR_EXT 0x8000
+
+#define GLEW_EXT_abgr GLEW_GET_VAR(__GLEW_EXT_abgr)
+
+#endif /* GL_EXT_abgr */
+
+/* ------------------------------ GL_EXT_bgra ------------------------------ */
+
+#ifndef GL_EXT_bgra
+#define GL_EXT_bgra 1
+
+#define GL_BGR_EXT 0x80E0
+#define GL_BGRA_EXT 0x80E1
+
+#define GLEW_EXT_bgra GLEW_GET_VAR(__GLEW_EXT_bgra)
+
+#endif /* GL_EXT_bgra */
+
+/* --------------------------- GL_EXT_blend_color -------------------------- */
+
+#ifndef GL_EXT_blend_color
+#define GL_EXT_blend_color 1
+
+#define GL_CONSTANT_COLOR_EXT 0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR_EXT 0x8002
+#define GL_CONSTANT_ALPHA_EXT 0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA_EXT 0x8004
+#define GL_BLEND_COLOR_EXT 0x8005
+
+typedef void (GLAPIENTRY * PFNGLBLENDCOLOREXTPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+
+#define glBlendColorEXT GLEW_GET_FUN(__glewBlendColorEXT)
+
+#define GLEW_EXT_blend_color GLEW_GET_VAR(__GLEW_EXT_blend_color)
+
+#endif /* GL_EXT_blend_color */
+
+/* --------------------- GL_EXT_blend_equation_separate -------------------- */
+
+#ifndef GL_EXT_blend_equation_separate
+#define GL_EXT_blend_equation_separate 1
+
+#define GL_BLEND_EQUATION_RGB_EXT 0x8009
+#define GL_BLEND_EQUATION_ALPHA_EXT 0x883D
+
+typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONSEPARATEEXTPROC) (GLenum modeRGB, GLenum modeAlpha);
+
+#define glBlendEquationSeparateEXT GLEW_GET_FUN(__glewBlendEquationSeparateEXT)
+
+#define GLEW_EXT_blend_equation_separate GLEW_GET_VAR(__GLEW_EXT_blend_equation_separate)
+
+#endif /* GL_EXT_blend_equation_separate */
+
+/* ----------------------- GL_EXT_blend_func_separate ---------------------- */
+
+#ifndef GL_EXT_blend_func_separate
+#define GL_EXT_blend_func_separate 1
+
+#define GL_BLEND_DST_RGB_EXT 0x80C8
+#define GL_BLEND_SRC_RGB_EXT 0x80C9
+#define GL_BLEND_DST_ALPHA_EXT 0x80CA
+#define GL_BLEND_SRC_ALPHA_EXT 0x80CB
+
+typedef void (GLAPIENTRY * PFNGLBLENDFUNCSEPARATEEXTPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+
+#define glBlendFuncSeparateEXT GLEW_GET_FUN(__glewBlendFuncSeparateEXT)
+
+#define GLEW_EXT_blend_func_separate GLEW_GET_VAR(__GLEW_EXT_blend_func_separate)
+
+#endif /* GL_EXT_blend_func_separate */
+
+/* ------------------------- GL_EXT_blend_logic_op ------------------------- */
+
+#ifndef GL_EXT_blend_logic_op
+#define GL_EXT_blend_logic_op 1
+
+#define GLEW_EXT_blend_logic_op GLEW_GET_VAR(__GLEW_EXT_blend_logic_op)
+
+#endif /* GL_EXT_blend_logic_op */
+
+/* -------------------------- GL_EXT_blend_minmax -------------------------- */
+
+#ifndef GL_EXT_blend_minmax
+#define GL_EXT_blend_minmax 1
+
+#define GL_FUNC_ADD_EXT 0x8006
+#define GL_MIN_EXT 0x8007
+#define GL_MAX_EXT 0x8008
+#define GL_BLEND_EQUATION_EXT 0x8009
+
+typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONEXTPROC) (GLenum mode);
+
+#define glBlendEquationEXT GLEW_GET_FUN(__glewBlendEquationEXT)
+
+#define GLEW_EXT_blend_minmax GLEW_GET_VAR(__GLEW_EXT_blend_minmax)
+
+#endif /* GL_EXT_blend_minmax */
+
+/* ------------------------- GL_EXT_blend_subtract ------------------------- */
+
+#ifndef GL_EXT_blend_subtract
+#define GL_EXT_blend_subtract 1
+
+#define GL_FUNC_SUBTRACT_EXT 0x800A
+#define GL_FUNC_REVERSE_SUBTRACT_EXT 0x800B
+
+#define GLEW_EXT_blend_subtract GLEW_GET_VAR(__GLEW_EXT_blend_subtract)
+
+#endif /* GL_EXT_blend_subtract */
+
+/* ------------------------ GL_EXT_clip_volume_hint ------------------------ */
+
+#ifndef GL_EXT_clip_volume_hint
+#define GL_EXT_clip_volume_hint 1
+
+#define GL_CLIP_VOLUME_CLIPPING_HINT_EXT 0x80F0
+
+#define GLEW_EXT_clip_volume_hint GLEW_GET_VAR(__GLEW_EXT_clip_volume_hint)
+
+#endif /* GL_EXT_clip_volume_hint */
+
+/* ------------------------------ GL_EXT_cmyka ----------------------------- */
+
+#ifndef GL_EXT_cmyka
+#define GL_EXT_cmyka 1
+
+#define GL_CMYK_EXT 0x800C
+#define GL_CMYKA_EXT 0x800D
+#define GL_PACK_CMYK_HINT_EXT 0x800E
+#define GL_UNPACK_CMYK_HINT_EXT 0x800F
+
+#define GLEW_EXT_cmyka GLEW_GET_VAR(__GLEW_EXT_cmyka)
+
+#endif /* GL_EXT_cmyka */
+
+/* ------------------------- GL_EXT_color_subtable ------------------------- */
+
+#ifndef GL_EXT_color_subtable
+#define GL_EXT_color_subtable 1
+
+typedef void (GLAPIENTRY * PFNGLCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const void* data);
+typedef void (GLAPIENTRY * PFNGLCOPYCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
+
+#define glColorSubTableEXT GLEW_GET_FUN(__glewColorSubTableEXT)
+#define glCopyColorSubTableEXT GLEW_GET_FUN(__glewCopyColorSubTableEXT)
+
+#define GLEW_EXT_color_subtable GLEW_GET_VAR(__GLEW_EXT_color_subtable)
+
+#endif /* GL_EXT_color_subtable */
+
+/* ---------------------- GL_EXT_compiled_vertex_array --------------------- */
+
+#ifndef GL_EXT_compiled_vertex_array
+#define GL_EXT_compiled_vertex_array 1
+
+typedef void (GLAPIENTRY * PFNGLLOCKARRAYSEXTPROC) (GLint first, GLsizei count);
+typedef void (GLAPIENTRY * PFNGLUNLOCKARRAYSEXTPROC) (void);
+
+#define glLockArraysEXT GLEW_GET_FUN(__glewLockArraysEXT)
+#define glUnlockArraysEXT GLEW_GET_FUN(__glewUnlockArraysEXT)
+
+#define GLEW_EXT_compiled_vertex_array GLEW_GET_VAR(__GLEW_EXT_compiled_vertex_array)
+
+#endif /* GL_EXT_compiled_vertex_array */
+
+/* --------------------------- GL_EXT_convolution -------------------------- */
+
+#ifndef GL_EXT_convolution
+#define GL_EXT_convolution 1
+
+#define GL_CONVOLUTION_1D_EXT 0x8010
+#define GL_CONVOLUTION_2D_EXT 0x8011
+#define GL_SEPARABLE_2D_EXT 0x8012
+#define GL_CONVOLUTION_BORDER_MODE_EXT 0x8013
+#define GL_CONVOLUTION_FILTER_SCALE_EXT 0x8014
+#define GL_CONVOLUTION_FILTER_BIAS_EXT 0x8015
+#define GL_REDUCE_EXT 0x8016
+#define GL_CONVOLUTION_FORMAT_EXT 0x8017
+#define GL_CONVOLUTION_WIDTH_EXT 0x8018
+#define GL_CONVOLUTION_HEIGHT_EXT 0x8019
+#define GL_MAX_CONVOLUTION_WIDTH_EXT 0x801A
+#define GL_MAX_CONVOLUTION_HEIGHT_EXT 0x801B
+#define GL_POST_CONVOLUTION_RED_SCALE_EXT 0x801C
+#define GL_POST_CONVOLUTION_GREEN_SCALE_EXT 0x801D
+#define GL_POST_CONVOLUTION_BLUE_SCALE_EXT 0x801E
+#define GL_POST_CONVOLUTION_ALPHA_SCALE_EXT 0x801F
+#define GL_POST_CONVOLUTION_RED_BIAS_EXT 0x8020
+#define GL_POST_CONVOLUTION_GREEN_BIAS_EXT 0x8021
+#define GL_POST_CONVOLUTION_BLUE_BIAS_EXT 0x8022
+#define GL_POST_CONVOLUTION_ALPHA_BIAS_EXT 0x8023
+
+typedef void (GLAPIENTRY * PFNGLCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void* image);
+typedef void (GLAPIENTRY * PFNGLCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void* image);
+typedef void (GLAPIENTRY * PFNGLCONVOLUTIONPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat param);
+typedef void (GLAPIENTRY * PFNGLCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLCONVOLUTIONPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint param);
+typedef void (GLAPIENTRY * PFNGLCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint* params);
+typedef void (GLAPIENTRY * PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (GLAPIENTRY * PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (GLAPIENTRY * PFNGLGETCONVOLUTIONFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, void* image);
+typedef void (GLAPIENTRY * PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETSEPARABLEFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, void* row, void* column, void* span);
+typedef void (GLAPIENTRY * PFNGLSEPARABLEFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void* row, const void* column);
+
+#define glConvolutionFilter1DEXT GLEW_GET_FUN(__glewConvolutionFilter1DEXT)
+#define glConvolutionFilter2DEXT GLEW_GET_FUN(__glewConvolutionFilter2DEXT)
+#define glConvolutionParameterfEXT GLEW_GET_FUN(__glewConvolutionParameterfEXT)
+#define glConvolutionParameterfvEXT GLEW_GET_FUN(__glewConvolutionParameterfvEXT)
+#define glConvolutionParameteriEXT GLEW_GET_FUN(__glewConvolutionParameteriEXT)
+#define glConvolutionParameterivEXT GLEW_GET_FUN(__glewConvolutionParameterivEXT)
+#define glCopyConvolutionFilter1DEXT GLEW_GET_FUN(__glewCopyConvolutionFilter1DEXT)
+#define glCopyConvolutionFilter2DEXT GLEW_GET_FUN(__glewCopyConvolutionFilter2DEXT)
+#define glGetConvolutionFilterEXT GLEW_GET_FUN(__glewGetConvolutionFilterEXT)
+#define glGetConvolutionParameterfvEXT GLEW_GET_FUN(__glewGetConvolutionParameterfvEXT)
+#define glGetConvolutionParameterivEXT GLEW_GET_FUN(__glewGetConvolutionParameterivEXT)
+#define glGetSeparableFilterEXT GLEW_GET_FUN(__glewGetSeparableFilterEXT)
+#define glSeparableFilter2DEXT GLEW_GET_FUN(__glewSeparableFilter2DEXT)
+
+#define GLEW_EXT_convolution GLEW_GET_VAR(__GLEW_EXT_convolution)
+
+#endif /* GL_EXT_convolution */
+
+/* ------------------------ GL_EXT_coordinate_frame ------------------------ */
+
+#ifndef GL_EXT_coordinate_frame
+#define GL_EXT_coordinate_frame 1
+
+#define GL_TANGENT_ARRAY_EXT 0x8439
+#define GL_BINORMAL_ARRAY_EXT 0x843A
+#define GL_CURRENT_TANGENT_EXT 0x843B
+#define GL_CURRENT_BINORMAL_EXT 0x843C
+#define GL_TANGENT_ARRAY_TYPE_EXT 0x843E
+#define GL_TANGENT_ARRAY_STRIDE_EXT 0x843F
+#define GL_BINORMAL_ARRAY_TYPE_EXT 0x8440
+#define GL_BINORMAL_ARRAY_STRIDE_EXT 0x8441
+#define GL_TANGENT_ARRAY_POINTER_EXT 0x8442
+#define GL_BINORMAL_ARRAY_POINTER_EXT 0x8443
+#define GL_MAP1_TANGENT_EXT 0x8444
+#define GL_MAP2_TANGENT_EXT 0x8445
+#define GL_MAP1_BINORMAL_EXT 0x8446
+#define GL_MAP2_BINORMAL_EXT 0x8447
+
+typedef void (GLAPIENTRY * PFNGLBINORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, void* pointer);
+typedef void (GLAPIENTRY * PFNGLTANGENTPOINTEREXTPROC) (GLenum type, GLsizei stride, void* pointer);
+
+#define glBinormalPointerEXT GLEW_GET_FUN(__glewBinormalPointerEXT)
+#define glTangentPointerEXT GLEW_GET_FUN(__glewTangentPointerEXT)
+
+#define GLEW_EXT_coordinate_frame GLEW_GET_VAR(__GLEW_EXT_coordinate_frame)
+
+#endif /* GL_EXT_coordinate_frame */
+
+/* -------------------------- GL_EXT_copy_texture -------------------------- */
+
+#ifndef GL_EXT_copy_texture
+#define GL_EXT_copy_texture 1
+
+typedef void (GLAPIENTRY * PFNGLCOPYTEXIMAGE1DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+typedef void (GLAPIENTRY * PFNGLCOPYTEXIMAGE2DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+typedef void (GLAPIENTRY * PFNGLCOPYTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+typedef void (GLAPIENTRY * PFNGLCOPYTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (GLAPIENTRY * PFNGLCOPYTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+
+#define glCopyTexImage1DEXT GLEW_GET_FUN(__glewCopyTexImage1DEXT)
+#define glCopyTexImage2DEXT GLEW_GET_FUN(__glewCopyTexImage2DEXT)
+#define glCopyTexSubImage1DEXT GLEW_GET_FUN(__glewCopyTexSubImage1DEXT)
+#define glCopyTexSubImage2DEXT GLEW_GET_FUN(__glewCopyTexSubImage2DEXT)
+#define glCopyTexSubImage3DEXT GLEW_GET_FUN(__glewCopyTexSubImage3DEXT)
+
+#define GLEW_EXT_copy_texture GLEW_GET_VAR(__GLEW_EXT_copy_texture)
+
+#endif /* GL_EXT_copy_texture */
+
+/* --------------------------- GL_EXT_cull_vertex -------------------------- */
+
+#ifndef GL_EXT_cull_vertex
+#define GL_EXT_cull_vertex 1
+
+typedef void (GLAPIENTRY * PFNGLCULLPARAMETERDVEXTPROC) (GLenum pname, GLdouble* params);
+typedef void (GLAPIENTRY * PFNGLCULLPARAMETERFVEXTPROC) (GLenum pname, GLfloat* params);
+
+#define glCullParameterdvEXT GLEW_GET_FUN(__glewCullParameterdvEXT)
+#define glCullParameterfvEXT GLEW_GET_FUN(__glewCullParameterfvEXT)
+
+#define GLEW_EXT_cull_vertex GLEW_GET_VAR(__GLEW_EXT_cull_vertex)
+
+#endif /* GL_EXT_cull_vertex */
+
+/* ------------------------ GL_EXT_depth_bounds_test ----------------------- */
+
+#ifndef GL_EXT_depth_bounds_test
+#define GL_EXT_depth_bounds_test 1
+
+#define GL_DEPTH_BOUNDS_TEST_EXT 0x8890
+#define GL_DEPTH_BOUNDS_EXT 0x8891
+
+typedef void (GLAPIENTRY * PFNGLDEPTHBOUNDSEXTPROC) (GLclampd zmin, GLclampd zmax);
+
+#define glDepthBoundsEXT GLEW_GET_FUN(__glewDepthBoundsEXT)
+
+#define GLEW_EXT_depth_bounds_test GLEW_GET_VAR(__GLEW_EXT_depth_bounds_test)
+
+#endif /* GL_EXT_depth_bounds_test */
+
+/* ----------------------- GL_EXT_draw_range_elements ---------------------- */
+
+#ifndef GL_EXT_draw_range_elements
+#define GL_EXT_draw_range_elements 1
+
+#define GL_MAX_ELEMENTS_VERTICES 0x80E8
+#define GL_MAX_ELEMENTS_INDICES 0x80E9
+
+typedef void (GLAPIENTRY * PFNGLDRAWRANGEELEMENTSEXTPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
+
+#define glDrawRangeElementsEXT GLEW_GET_FUN(__glewDrawRangeElementsEXT)
+
+#define GLEW_EXT_draw_range_elements GLEW_GET_VAR(__GLEW_EXT_draw_range_elements)
+
+#endif /* GL_EXT_draw_range_elements */
+
+/* ---------------------------- GL_EXT_fog_coord --------------------------- */
+
+#ifndef GL_EXT_fog_coord
+#define GL_EXT_fog_coord 1
+
+#define GL_FOG_COORDINATE_SOURCE_EXT 0x8450
+#define GL_FOG_COORDINATE_EXT 0x8451
+#define GL_FRAGMENT_DEPTH_EXT 0x8452
+#define GL_CURRENT_FOG_COORDINATE_EXT 0x8453
+#define GL_FOG_COORDINATE_ARRAY_TYPE_EXT 0x8454
+#define GL_FOG_COORDINATE_ARRAY_STRIDE_EXT 0x8455
+#define GL_FOG_COORDINATE_ARRAY_POINTER_EXT 0x8456
+#define GL_FOG_COORDINATE_ARRAY_EXT 0x8457
+
+typedef void (GLAPIENTRY * PFNGLFOGCOORDPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer);
+typedef void (GLAPIENTRY * PFNGLFOGCOORDDEXTPROC) (GLdouble coord);
+typedef void (GLAPIENTRY * PFNGLFOGCOORDDVEXTPROC) (const GLdouble *coord);
+typedef void (GLAPIENTRY * PFNGLFOGCOORDFEXTPROC) (GLfloat coord);
+typedef void (GLAPIENTRY * PFNGLFOGCOORDFVEXTPROC) (const GLfloat *coord);
+
+#define glFogCoordPointerEXT GLEW_GET_FUN(__glewFogCoordPointerEXT)
+#define glFogCoorddEXT GLEW_GET_FUN(__glewFogCoorddEXT)
+#define glFogCoorddvEXT GLEW_GET_FUN(__glewFogCoorddvEXT)
+#define glFogCoordfEXT GLEW_GET_FUN(__glewFogCoordfEXT)
+#define glFogCoordfvEXT GLEW_GET_FUN(__glewFogCoordfvEXT)
+
+#define GLEW_EXT_fog_coord GLEW_GET_VAR(__GLEW_EXT_fog_coord)
+
+#endif /* GL_EXT_fog_coord */
+
+/* ------------------------ GL_EXT_fragment_lighting ----------------------- */
+
+#ifndef GL_EXT_fragment_lighting
+#define GL_EXT_fragment_lighting 1
+
+#define GL_FRAGMENT_LIGHTING_EXT 0x8400
+#define GL_FRAGMENT_COLOR_MATERIAL_EXT 0x8401
+#define GL_FRAGMENT_COLOR_MATERIAL_FACE_EXT 0x8402
+#define GL_FRAGMENT_COLOR_MATERIAL_PARAMETER_EXT 0x8403
+#define GL_MAX_FRAGMENT_LIGHTS_EXT 0x8404
+#define GL_MAX_ACTIVE_LIGHTS_EXT 0x8405
+#define GL_CURRENT_RASTER_NORMAL_EXT 0x8406
+#define GL_LIGHT_ENV_MODE_EXT 0x8407
+#define GL_FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_EXT 0x8408
+#define GL_FRAGMENT_LIGHT_MODEL_TWO_SIDE_EXT 0x8409
+#define GL_FRAGMENT_LIGHT_MODEL_AMBIENT_EXT 0x840A
+#define GL_FRAGMENT_LIGHT_MODEL_NORMAL_INTERPOLATION_EXT 0x840B
+#define GL_FRAGMENT_LIGHT0_EXT 0x840C
+#define GL_FRAGMENT_LIGHT7_EXT 0x8413
+
+typedef void (GLAPIENTRY * PFNGLFRAGMENTCOLORMATERIALEXTPROC) (GLenum face, GLenum mode);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTMODELFEXTPROC) (GLenum pname, GLfloat param);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTMODELFVEXTPROC) (GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTMODELIEXTPROC) (GLenum pname, GLint param);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTMODELIVEXTPROC) (GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTFEXTPROC) (GLenum light, GLenum pname, GLfloat param);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTFVEXTPROC) (GLenum light, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTIEXTPROC) (GLenum light, GLenum pname, GLint param);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTIVEXTPROC) (GLenum light, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTMATERIALFEXTPROC) (GLenum face, GLenum pname, const GLfloat param);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTMATERIALFVEXTPROC) (GLenum face, GLenum pname, const GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTMATERIALIEXTPROC) (GLenum face, GLenum pname, const GLint param);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTMATERIALIVEXTPROC) (GLenum face, GLenum pname, const GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETFRAGMENTLIGHTFVEXTPROC) (GLenum light, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETFRAGMENTLIGHTIVEXTPROC) (GLenum light, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETFRAGMENTMATERIALFVEXTPROC) (GLenum face, GLenum pname, const GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETFRAGMENTMATERIALIVEXTPROC) (GLenum face, GLenum pname, const GLint* params);
+typedef void (GLAPIENTRY * PFNGLLIGHTENVIEXTPROC) (GLenum pname, GLint param);
+
+#define glFragmentColorMaterialEXT GLEW_GET_FUN(__glewFragmentColorMaterialEXT)
+#define glFragmentLightModelfEXT GLEW_GET_FUN(__glewFragmentLightModelfEXT)
+#define glFragmentLightModelfvEXT GLEW_GET_FUN(__glewFragmentLightModelfvEXT)
+#define glFragmentLightModeliEXT GLEW_GET_FUN(__glewFragmentLightModeliEXT)
+#define glFragmentLightModelivEXT GLEW_GET_FUN(__glewFragmentLightModelivEXT)
+#define glFragmentLightfEXT GLEW_GET_FUN(__glewFragmentLightfEXT)
+#define glFragmentLightfvEXT GLEW_GET_FUN(__glewFragmentLightfvEXT)
+#define glFragmentLightiEXT GLEW_GET_FUN(__glewFragmentLightiEXT)
+#define glFragmentLightivEXT GLEW_GET_FUN(__glewFragmentLightivEXT)
+#define glFragmentMaterialfEXT GLEW_GET_FUN(__glewFragmentMaterialfEXT)
+#define glFragmentMaterialfvEXT GLEW_GET_FUN(__glewFragmentMaterialfvEXT)
+#define glFragmentMaterialiEXT GLEW_GET_FUN(__glewFragmentMaterialiEXT)
+#define glFragmentMaterialivEXT GLEW_GET_FUN(__glewFragmentMaterialivEXT)
+#define glGetFragmentLightfvEXT GLEW_GET_FUN(__glewGetFragmentLightfvEXT)
+#define glGetFragmentLightivEXT GLEW_GET_FUN(__glewGetFragmentLightivEXT)
+#define glGetFragmentMaterialfvEXT GLEW_GET_FUN(__glewGetFragmentMaterialfvEXT)
+#define glGetFragmentMaterialivEXT GLEW_GET_FUN(__glewGetFragmentMaterialivEXT)
+#define glLightEnviEXT GLEW_GET_FUN(__glewLightEnviEXT)
+
+#define GLEW_EXT_fragment_lighting GLEW_GET_VAR(__GLEW_EXT_fragment_lighting)
+
+#endif /* GL_EXT_fragment_lighting */
+
+/* ------------------------ GL_EXT_framebuffer_blit ------------------------ */
+
+#ifndef GL_EXT_framebuffer_blit
+#define GL_EXT_framebuffer_blit 1
+
+#define GL_DRAW_FRAMEBUFFER_BINDING_EXT 0x8CA6
+#define GL_READ_FRAMEBUFFER_EXT 0x8CA8
+#define GL_DRAW_FRAMEBUFFER_EXT 0x8CA9
+#define GL_READ_FRAMEBUFFER_BINDING_EXT 0x8CAA
+
+typedef void (GLAPIENTRY * PFNGLBLITFRAMEBUFFEREXTPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+
+#define glBlitFramebufferEXT GLEW_GET_FUN(__glewBlitFramebufferEXT)
+
+#define GLEW_EXT_framebuffer_blit GLEW_GET_VAR(__GLEW_EXT_framebuffer_blit)
+
+#endif /* GL_EXT_framebuffer_blit */
+
+/* --------------------- GL_EXT_framebuffer_multisample -------------------- */
+
+#ifndef GL_EXT_framebuffer_multisample
+#define GL_EXT_framebuffer_multisample 1
+
+#define GL_RENDERBUFFER_SAMPLES_EXT 0x8CAB
+
+typedef void (GLAPIENTRY * PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+
+#define glRenderbufferStorageMultisampleEXT GLEW_GET_FUN(__glewRenderbufferStorageMultisampleEXT)
+
+#define GLEW_EXT_framebuffer_multisample GLEW_GET_VAR(__GLEW_EXT_framebuffer_multisample)
+
+#endif /* GL_EXT_framebuffer_multisample */
+
+/* ----------------------- GL_EXT_framebuffer_object ----------------------- */
+
+#ifndef GL_EXT_framebuffer_object
+#define GL_EXT_framebuffer_object 1
+
+#define GL_INVALID_FRAMEBUFFER_OPERATION_EXT 0x0506
+#define GL_MAX_RENDERBUFFER_SIZE_EXT 0x84E8
+#define GL_FRAMEBUFFER_BINDING_EXT 0x8CA6
+#define GL_RENDERBUFFER_BINDING_EXT 0x8CA7
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT 0x8CD0
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT 0x8CD1
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT 0x8CD2
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT 0x8CD3
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT 0x8CD4
+#define GL_FRAMEBUFFER_COMPLETE_EXT 0x8CD5
+#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT 0x8CD6
+#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT 0x8CD7
+#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT 0x8CD9
+#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT 0x8CDA
+#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT 0x8CDB
+#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT 0x8CDC
+#define GL_FRAMEBUFFER_UNSUPPORTED_EXT 0x8CDD
+#define GL_MAX_COLOR_ATTACHMENTS_EXT 0x8CDF
+#define GL_COLOR_ATTACHMENT0_EXT 0x8CE0
+#define GL_COLOR_ATTACHMENT1_EXT 0x8CE1
+#define GL_COLOR_ATTACHMENT2_EXT 0x8CE2
+#define GL_COLOR_ATTACHMENT3_EXT 0x8CE3
+#define GL_COLOR_ATTACHMENT4_EXT 0x8CE4
+#define GL_COLOR_ATTACHMENT5_EXT 0x8CE5
+#define GL_COLOR_ATTACHMENT6_EXT 0x8CE6
+#define GL_COLOR_ATTACHMENT7_EXT 0x8CE7
+#define GL_COLOR_ATTACHMENT8_EXT 0x8CE8
+#define GL_COLOR_ATTACHMENT9_EXT 0x8CE9
+#define GL_COLOR_ATTACHMENT10_EXT 0x8CEA
+#define GL_COLOR_ATTACHMENT11_EXT 0x8CEB
+#define GL_COLOR_ATTACHMENT12_EXT 0x8CEC
+#define GL_COLOR_ATTACHMENT13_EXT 0x8CED
+#define GL_COLOR_ATTACHMENT14_EXT 0x8CEE
+#define GL_COLOR_ATTACHMENT15_EXT 0x8CEF
+#define GL_DEPTH_ATTACHMENT_EXT 0x8D00
+#define GL_STENCIL_ATTACHMENT_EXT 0x8D20
+#define GL_FRAMEBUFFER_EXT 0x8D40
+#define GL_RENDERBUFFER_EXT 0x8D41
+#define GL_RENDERBUFFER_WIDTH_EXT 0x8D42
+#define GL_RENDERBUFFER_HEIGHT_EXT 0x8D43
+#define GL_RENDERBUFFER_INTERNAL_FORMAT_EXT 0x8D44
+#define GL_STENCIL_INDEX1_EXT 0x8D46
+#define GL_STENCIL_INDEX4_EXT 0x8D47
+#define GL_STENCIL_INDEX8_EXT 0x8D48
+#define GL_STENCIL_INDEX16_EXT 0x8D49
+#define GL_RENDERBUFFER_RED_SIZE_EXT 0x8D50
+#define GL_RENDERBUFFER_GREEN_SIZE_EXT 0x8D51
+#define GL_RENDERBUFFER_BLUE_SIZE_EXT 0x8D52
+#define GL_RENDERBUFFER_ALPHA_SIZE_EXT 0x8D53
+#define GL_RENDERBUFFER_DEPTH_SIZE_EXT 0x8D54
+#define GL_RENDERBUFFER_STENCIL_SIZE_EXT 0x8D55
+
+typedef void (GLAPIENTRY * PFNGLBINDFRAMEBUFFEREXTPROC) (GLenum target, GLuint framebuffer);
+typedef void (GLAPIENTRY * PFNGLBINDRENDERBUFFEREXTPROC) (GLenum target, GLuint renderbuffer);
+typedef GLenum (GLAPIENTRY * PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC) (GLenum target);
+typedef void (GLAPIENTRY * PFNGLDELETEFRAMEBUFFERSEXTPROC) (GLsizei n, const GLuint* framebuffers);
+typedef void (GLAPIENTRY * PFNGLDELETERENDERBUFFERSEXTPROC) (GLsizei n, const GLuint* renderbuffers);
+typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURE1DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURE2DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURE3DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+typedef void (GLAPIENTRY * PFNGLGENFRAMEBUFFERSEXTPROC) (GLsizei n, GLuint* framebuffers);
+typedef void (GLAPIENTRY * PFNGLGENRENDERBUFFERSEXTPROC) (GLsizei n, GLuint* renderbuffers);
+typedef void (GLAPIENTRY * PFNGLGENERATEMIPMAPEXTPROC) (GLenum target);
+typedef void (GLAPIENTRY * PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLenum target, GLenum attachment, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint* params);
+typedef GLboolean (GLAPIENTRY * PFNGLISFRAMEBUFFEREXTPROC) (GLuint framebuffer);
+typedef GLboolean (GLAPIENTRY * PFNGLISRENDERBUFFEREXTPROC) (GLuint renderbuffer);
+typedef void (GLAPIENTRY * PFNGLRENDERBUFFERSTORAGEEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+
+#define glBindFramebufferEXT GLEW_GET_FUN(__glewBindFramebufferEXT)
+#define glBindRenderbufferEXT GLEW_GET_FUN(__glewBindRenderbufferEXT)
+#define glCheckFramebufferStatusEXT GLEW_GET_FUN(__glewCheckFramebufferStatusEXT)
+#define glDeleteFramebuffersEXT GLEW_GET_FUN(__glewDeleteFramebuffersEXT)
+#define glDeleteRenderbuffersEXT GLEW_GET_FUN(__glewDeleteRenderbuffersEXT)
+#define glFramebufferRenderbufferEXT GLEW_GET_FUN(__glewFramebufferRenderbufferEXT)
+#define glFramebufferTexture1DEXT GLEW_GET_FUN(__glewFramebufferTexture1DEXT)
+#define glFramebufferTexture2DEXT GLEW_GET_FUN(__glewFramebufferTexture2DEXT)
+#define glFramebufferTexture3DEXT GLEW_GET_FUN(__glewFramebufferTexture3DEXT)
+#define glGenFramebuffersEXT GLEW_GET_FUN(__glewGenFramebuffersEXT)
+#define glGenRenderbuffersEXT GLEW_GET_FUN(__glewGenRenderbuffersEXT)
+#define glGenerateMipmapEXT GLEW_GET_FUN(__glewGenerateMipmapEXT)
+#define glGetFramebufferAttachmentParameterivEXT GLEW_GET_FUN(__glewGetFramebufferAttachmentParameterivEXT)
+#define glGetRenderbufferParameterivEXT GLEW_GET_FUN(__glewGetRenderbufferParameterivEXT)
+#define glIsFramebufferEXT GLEW_GET_FUN(__glewIsFramebufferEXT)
+#define glIsRenderbufferEXT GLEW_GET_FUN(__glewIsRenderbufferEXT)
+#define glRenderbufferStorageEXT GLEW_GET_FUN(__glewRenderbufferStorageEXT)
+
+#define GLEW_EXT_framebuffer_object GLEW_GET_VAR(__GLEW_EXT_framebuffer_object)
+
+#endif /* GL_EXT_framebuffer_object */
+
+/* ---------------------------- GL_EXT_histogram --------------------------- */
+
+#ifndef GL_EXT_histogram
+#define GL_EXT_histogram 1
+
+#define GL_HISTOGRAM_EXT 0x8024
+#define GL_PROXY_HISTOGRAM_EXT 0x8025
+#define GL_HISTOGRAM_WIDTH_EXT 0x8026
+#define GL_HISTOGRAM_FORMAT_EXT 0x8027
+#define GL_HISTOGRAM_RED_SIZE_EXT 0x8028
+#define GL_HISTOGRAM_GREEN_SIZE_EXT 0x8029
+#define GL_HISTOGRAM_BLUE_SIZE_EXT 0x802A
+#define GL_HISTOGRAM_ALPHA_SIZE_EXT 0x802B
+#define GL_HISTOGRAM_LUMINANCE_SIZE_EXT 0x802C
+#define GL_HISTOGRAM_SINK_EXT 0x802D
+#define GL_MINMAX_EXT 0x802E
+#define GL_MINMAX_FORMAT_EXT 0x802F
+#define GL_MINMAX_SINK_EXT 0x8030
+
+typedef void (GLAPIENTRY * PFNGLGETHISTOGRAMEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, void* values);
+typedef void (GLAPIENTRY * PFNGLGETHISTOGRAMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETHISTOGRAMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETMINMAXEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, void* values);
+typedef void (GLAPIENTRY * PFNGLGETMINMAXPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETMINMAXPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLHISTOGRAMEXTPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
+typedef void (GLAPIENTRY * PFNGLMINMAXEXTPROC) (GLenum target, GLenum internalformat, GLboolean sink);
+typedef void (GLAPIENTRY * PFNGLRESETHISTOGRAMEXTPROC) (GLenum target);
+typedef void (GLAPIENTRY * PFNGLRESETMINMAXEXTPROC) (GLenum target);
+
+#define glGetHistogramEXT GLEW_GET_FUN(__glewGetHistogramEXT)
+#define glGetHistogramParameterfvEXT GLEW_GET_FUN(__glewGetHistogramParameterfvEXT)
+#define glGetHistogramParameterivEXT GLEW_GET_FUN(__glewGetHistogramParameterivEXT)
+#define glGetMinmaxEXT GLEW_GET_FUN(__glewGetMinmaxEXT)
+#define glGetMinmaxParameterfvEXT GLEW_GET_FUN(__glewGetMinmaxParameterfvEXT)
+#define glGetMinmaxParameterivEXT GLEW_GET_FUN(__glewGetMinmaxParameterivEXT)
+#define glHistogramEXT GLEW_GET_FUN(__glewHistogramEXT)
+#define glMinmaxEXT GLEW_GET_FUN(__glewMinmaxEXT)
+#define glResetHistogramEXT GLEW_GET_FUN(__glewResetHistogramEXT)
+#define glResetMinmaxEXT GLEW_GET_FUN(__glewResetMinmaxEXT)
+
+#define GLEW_EXT_histogram GLEW_GET_VAR(__GLEW_EXT_histogram)
+
+#endif /* GL_EXT_histogram */
+
+/* ----------------------- GL_EXT_index_array_formats ---------------------- */
+
+#ifndef GL_EXT_index_array_formats
+#define GL_EXT_index_array_formats 1
+
+#define GLEW_EXT_index_array_formats GLEW_GET_VAR(__GLEW_EXT_index_array_formats)
+
+#endif /* GL_EXT_index_array_formats */
+
+/* --------------------------- GL_EXT_index_func --------------------------- */
+
+#ifndef GL_EXT_index_func
+#define GL_EXT_index_func 1
+
+typedef void (GLAPIENTRY * PFNGLINDEXFUNCEXTPROC) (GLenum func, GLfloat ref);
+
+#define glIndexFuncEXT GLEW_GET_FUN(__glewIndexFuncEXT)
+
+#define GLEW_EXT_index_func GLEW_GET_VAR(__GLEW_EXT_index_func)
+
+#endif /* GL_EXT_index_func */
+
+/* ------------------------- GL_EXT_index_material ------------------------- */
+
+#ifndef GL_EXT_index_material
+#define GL_EXT_index_material 1
+
+typedef void (GLAPIENTRY * PFNGLINDEXMATERIALEXTPROC) (GLenum face, GLenum mode);
+
+#define glIndexMaterialEXT GLEW_GET_FUN(__glewIndexMaterialEXT)
+
+#define GLEW_EXT_index_material GLEW_GET_VAR(__GLEW_EXT_index_material)
+
+#endif /* GL_EXT_index_material */
+
+/* -------------------------- GL_EXT_index_texture ------------------------- */
+
+#ifndef GL_EXT_index_texture
+#define GL_EXT_index_texture 1
+
+#define GLEW_EXT_index_texture GLEW_GET_VAR(__GLEW_EXT_index_texture)
+
+#endif /* GL_EXT_index_texture */
+
+/* -------------------------- GL_EXT_light_texture ------------------------- */
+
+#ifndef GL_EXT_light_texture
+#define GL_EXT_light_texture 1
+
+#define GL_FRAGMENT_MATERIAL_EXT 0x8349
+#define GL_FRAGMENT_NORMAL_EXT 0x834A
+#define GL_FRAGMENT_COLOR_EXT 0x834C
+#define GL_ATTENUATION_EXT 0x834D
+#define GL_SHADOW_ATTENUATION_EXT 0x834E
+#define GL_TEXTURE_APPLICATION_MODE_EXT 0x834F
+#define GL_TEXTURE_LIGHT_EXT 0x8350
+#define GL_TEXTURE_MATERIAL_FACE_EXT 0x8351
+#define GL_TEXTURE_MATERIAL_PARAMETER_EXT 0x8352
+#define GL_FRAGMENT_DEPTH_EXT 0x8452
+
+typedef void (GLAPIENTRY * PFNGLAPPLYTEXTUREEXTPROC) (GLenum mode);
+typedef void (GLAPIENTRY * PFNGLTEXTURELIGHTEXTPROC) (GLenum pname);
+typedef void (GLAPIENTRY * PFNGLTEXTUREMATERIALEXTPROC) (GLenum face, GLenum mode);
+
+#define glApplyTextureEXT GLEW_GET_FUN(__glewApplyTextureEXT)
+#define glTextureLightEXT GLEW_GET_FUN(__glewTextureLightEXT)
+#define glTextureMaterialEXT GLEW_GET_FUN(__glewTextureMaterialEXT)
+
+#define GLEW_EXT_light_texture GLEW_GET_VAR(__GLEW_EXT_light_texture)
+
+#endif /* GL_EXT_light_texture */
+
+/* ------------------------- GL_EXT_misc_attribute ------------------------- */
+
+#ifndef GL_EXT_misc_attribute
+#define GL_EXT_misc_attribute 1
+
+#define GLEW_EXT_misc_attribute GLEW_GET_VAR(__GLEW_EXT_misc_attribute)
+
+#endif /* GL_EXT_misc_attribute */
+
+/* ------------------------ GL_EXT_multi_draw_arrays ----------------------- */
+
+#ifndef GL_EXT_multi_draw_arrays
+#define GL_EXT_multi_draw_arrays 1
+
+typedef void (GLAPIENTRY * PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, GLint* first, GLsizei *count, GLsizei primcount);
+typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, GLsizei* count, GLenum type, const GLvoid **indices, GLsizei primcount);
+
+#define glMultiDrawArraysEXT GLEW_GET_FUN(__glewMultiDrawArraysEXT)
+#define glMultiDrawElementsEXT GLEW_GET_FUN(__glewMultiDrawElementsEXT)
+
+#define GLEW_EXT_multi_draw_arrays GLEW_GET_VAR(__GLEW_EXT_multi_draw_arrays)
+
+#endif /* GL_EXT_multi_draw_arrays */
+
+/* --------------------------- GL_EXT_multisample -------------------------- */
+
+#ifndef GL_EXT_multisample
+#define GL_EXT_multisample 1
+
+#define GL_MULTISAMPLE_EXT 0x809D
+#define GL_SAMPLE_ALPHA_TO_MASK_EXT 0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_EXT 0x809F
+#define GL_SAMPLE_MASK_EXT 0x80A0
+#define GL_1PASS_EXT 0x80A1
+#define GL_2PASS_0_EXT 0x80A2
+#define GL_2PASS_1_EXT 0x80A3
+#define GL_4PASS_0_EXT 0x80A4
+#define GL_4PASS_1_EXT 0x80A5
+#define GL_4PASS_2_EXT 0x80A6
+#define GL_4PASS_3_EXT 0x80A7
+#define GL_SAMPLE_BUFFERS_EXT 0x80A8
+#define GL_SAMPLES_EXT 0x80A9
+#define GL_SAMPLE_MASK_VALUE_EXT 0x80AA
+#define GL_SAMPLE_MASK_INVERT_EXT 0x80AB
+#define GL_SAMPLE_PATTERN_EXT 0x80AC
+#define GL_MULTISAMPLE_BIT_EXT 0x20000000
+
+typedef void (GLAPIENTRY * PFNGLSAMPLEMASKEXTPROC) (GLclampf value, GLboolean invert);
+typedef void (GLAPIENTRY * PFNGLSAMPLEPATTERNEXTPROC) (GLenum pattern);
+
+#define glSampleMaskEXT GLEW_GET_FUN(__glewSampleMaskEXT)
+#define glSamplePatternEXT GLEW_GET_FUN(__glewSamplePatternEXT)
+
+#define GLEW_EXT_multisample GLEW_GET_VAR(__GLEW_EXT_multisample)
+
+#endif /* GL_EXT_multisample */
+
+/* ---------------------- GL_EXT_packed_depth_stencil ---------------------- */
+
+#ifndef GL_EXT_packed_depth_stencil
+#define GL_EXT_packed_depth_stencil 1
+
+#define GL_DEPTH_STENCIL_EXT 0x84F9
+#define GL_UNSIGNED_INT_24_8_EXT 0x84FA
+#define GL_DEPTH24_STENCIL8_EXT 0x88F0
+#define GL_TEXTURE_STENCIL_SIZE_EXT 0x88F1
+
+#define GLEW_EXT_packed_depth_stencil GLEW_GET_VAR(__GLEW_EXT_packed_depth_stencil)
+
+#endif /* GL_EXT_packed_depth_stencil */
+
+/* -------------------------- GL_EXT_packed_pixels ------------------------- */
+
+#ifndef GL_EXT_packed_pixels
+#define GL_EXT_packed_pixels 1
+
+#define GL_UNSIGNED_BYTE_3_3_2_EXT 0x8032
+#define GL_UNSIGNED_SHORT_4_4_4_4_EXT 0x8033
+#define GL_UNSIGNED_SHORT_5_5_5_1_EXT 0x8034
+#define GL_UNSIGNED_INT_8_8_8_8_EXT 0x8035
+#define GL_UNSIGNED_INT_10_10_10_2_EXT 0x8036
+
+#define GLEW_EXT_packed_pixels GLEW_GET_VAR(__GLEW_EXT_packed_pixels)
+
+#endif /* GL_EXT_packed_pixels */
+
+/* ------------------------ GL_EXT_paletted_texture ------------------------ */
+
+#ifndef GL_EXT_paletted_texture
+#define GL_EXT_paletted_texture 1
+
+#define GL_TEXTURE_1D 0x0DE0
+#define GL_TEXTURE_2D 0x0DE1
+#define GL_PROXY_TEXTURE_1D 0x8063
+#define GL_PROXY_TEXTURE_2D 0x8064
+#define GL_TEXTURE_3D_EXT 0x806F
+#define GL_PROXY_TEXTURE_3D_EXT 0x8070
+#define GL_COLOR_TABLE_FORMAT_EXT 0x80D8
+#define GL_COLOR_TABLE_WIDTH_EXT 0x80D9
+#define GL_COLOR_TABLE_RED_SIZE_EXT 0x80DA
+#define GL_COLOR_TABLE_GREEN_SIZE_EXT 0x80DB
+#define GL_COLOR_TABLE_BLUE_SIZE_EXT 0x80DC
+#define GL_COLOR_TABLE_ALPHA_SIZE_EXT 0x80DD
+#define GL_COLOR_TABLE_LUMINANCE_SIZE_EXT 0x80DE
+#define GL_COLOR_TABLE_INTENSITY_SIZE_EXT 0x80DF
+#define GL_COLOR_INDEX1_EXT 0x80E2
+#define GL_COLOR_INDEX2_EXT 0x80E3
+#define GL_COLOR_INDEX4_EXT 0x80E4
+#define GL_COLOR_INDEX8_EXT 0x80E5
+#define GL_COLOR_INDEX12_EXT 0x80E6
+#define GL_COLOR_INDEX16_EXT 0x80E7
+#define GL_TEXTURE_INDEX_SIZE_EXT 0x80ED
+#define GL_TEXTURE_CUBE_MAP_ARB 0x8513
+#define GL_PROXY_TEXTURE_CUBE_MAP_ARB 0x851B
+
+typedef void (GLAPIENTRY * PFNGLCOLORTABLEEXTPROC) (GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const void* data);
+typedef void (GLAPIENTRY * PFNGLGETCOLORTABLEEXTPROC) (GLenum target, GLenum format, GLenum type, void* data);
+typedef void (GLAPIENTRY * PFNGLGETCOLORTABLEPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETCOLORTABLEPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint* params);
+
+#define glColorTableEXT GLEW_GET_FUN(__glewColorTableEXT)
+#define glGetColorTableEXT GLEW_GET_FUN(__glewGetColorTableEXT)
+#define glGetColorTableParameterfvEXT GLEW_GET_FUN(__glewGetColorTableParameterfvEXT)
+#define glGetColorTableParameterivEXT GLEW_GET_FUN(__glewGetColorTableParameterivEXT)
+
+#define GLEW_EXT_paletted_texture GLEW_GET_VAR(__GLEW_EXT_paletted_texture)
+
+#endif /* GL_EXT_paletted_texture */
+
+/* ----------------------- GL_EXT_pixel_buffer_object ---------------------- */
+
+#ifndef GL_EXT_pixel_buffer_object
+#define GL_EXT_pixel_buffer_object 1
+
+#define GL_PIXEL_PACK_BUFFER_EXT 0x88EB
+#define GL_PIXEL_UNPACK_BUFFER_EXT 0x88EC
+#define GL_PIXEL_PACK_BUFFER_BINDING_EXT 0x88ED
+#define GL_PIXEL_UNPACK_BUFFER_BINDING_EXT 0x88EF
+
+#define GLEW_EXT_pixel_buffer_object GLEW_GET_VAR(__GLEW_EXT_pixel_buffer_object)
+
+#endif /* GL_EXT_pixel_buffer_object */
+
+/* ------------------------- GL_EXT_pixel_transform ------------------------ */
+
+#ifndef GL_EXT_pixel_transform
+#define GL_EXT_pixel_transform 1
+
+#define GL_PIXEL_TRANSFORM_2D_EXT 0x8330
+#define GL_PIXEL_MAG_FILTER_EXT 0x8331
+#define GL_PIXEL_MIN_FILTER_EXT 0x8332
+#define GL_PIXEL_CUBIC_WEIGHT_EXT 0x8333
+#define GL_CUBIC_EXT 0x8334
+#define GL_AVERAGE_EXT 0x8335
+#define GL_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8336
+#define GL_MAX_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8337
+#define GL_PIXEL_TRANSFORM_2D_MATRIX_EXT 0x8338
+
+typedef void (GLAPIENTRY * PFNGLGETPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint* params);
+typedef void (GLAPIENTRY * PFNGLPIXELTRANSFORMPARAMETERFEXTPROC) (GLenum target, GLenum pname, const GLfloat param);
+typedef void (GLAPIENTRY * PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLPIXELTRANSFORMPARAMETERIEXTPROC) (GLenum target, GLenum pname, const GLint param);
+typedef void (GLAPIENTRY * PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint* params);
+
+#define glGetPixelTransformParameterfvEXT GLEW_GET_FUN(__glewGetPixelTransformParameterfvEXT)
+#define glGetPixelTransformParameterivEXT GLEW_GET_FUN(__glewGetPixelTransformParameterivEXT)
+#define glPixelTransformParameterfEXT GLEW_GET_FUN(__glewPixelTransformParameterfEXT)
+#define glPixelTransformParameterfvEXT GLEW_GET_FUN(__glewPixelTransformParameterfvEXT)
+#define glPixelTransformParameteriEXT GLEW_GET_FUN(__glewPixelTransformParameteriEXT)
+#define glPixelTransformParameterivEXT GLEW_GET_FUN(__glewPixelTransformParameterivEXT)
+
+#define GLEW_EXT_pixel_transform GLEW_GET_VAR(__GLEW_EXT_pixel_transform)
+
+#endif /* GL_EXT_pixel_transform */
+
+/* ------------------- GL_EXT_pixel_transform_color_table ------------------ */
+
+#ifndef GL_EXT_pixel_transform_color_table
+#define GL_EXT_pixel_transform_color_table 1
+
+#define GLEW_EXT_pixel_transform_color_table GLEW_GET_VAR(__GLEW_EXT_pixel_transform_color_table)
+
+#endif /* GL_EXT_pixel_transform_color_table */
+
+/* ------------------------ GL_EXT_point_parameters ------------------------ */
+
+#ifndef GL_EXT_point_parameters
+#define GL_EXT_point_parameters 1
+
+#define GL_POINT_SIZE_MIN_EXT 0x8126
+#define GL_POINT_SIZE_MAX_EXT 0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE_EXT 0x8128
+#define GL_DISTANCE_ATTENUATION_EXT 0x8129
+
+typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERFEXTPROC) (GLenum pname, GLfloat param);
+typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERFVEXTPROC) (GLenum pname, GLfloat* params);
+
+#define glPointParameterfEXT GLEW_GET_FUN(__glewPointParameterfEXT)
+#define glPointParameterfvEXT GLEW_GET_FUN(__glewPointParameterfvEXT)
+
+#define GLEW_EXT_point_parameters GLEW_GET_VAR(__GLEW_EXT_point_parameters)
+
+#endif /* GL_EXT_point_parameters */
+
+/* ------------------------- GL_EXT_polygon_offset ------------------------- */
+
+#ifndef GL_EXT_polygon_offset
+#define GL_EXT_polygon_offset 1
+
+#define GL_POLYGON_OFFSET_EXT 0x8037
+#define GL_POLYGON_OFFSET_FACTOR_EXT 0x8038
+#define GL_POLYGON_OFFSET_BIAS_EXT 0x8039
+
+typedef void (GLAPIENTRY * PFNGLPOLYGONOFFSETEXTPROC) (GLfloat factor, GLfloat bias);
+
+#define glPolygonOffsetEXT GLEW_GET_FUN(__glewPolygonOffsetEXT)
+
+#define GLEW_EXT_polygon_offset GLEW_GET_VAR(__GLEW_EXT_polygon_offset)
+
+#endif /* GL_EXT_polygon_offset */
+
+/* ------------------------- GL_EXT_rescale_normal ------------------------- */
+
+#ifndef GL_EXT_rescale_normal
+#define GL_EXT_rescale_normal 1
+
+#define GLEW_EXT_rescale_normal GLEW_GET_VAR(__GLEW_EXT_rescale_normal)
+
+#endif /* GL_EXT_rescale_normal */
+
+/* -------------------------- GL_EXT_scene_marker -------------------------- */
+
+#ifndef GL_EXT_scene_marker
+#define GL_EXT_scene_marker 1
+
+typedef void (GLAPIENTRY * PFNGLBEGINSCENEEXTPROC) (void);
+typedef void (GLAPIENTRY * PFNGLENDSCENEEXTPROC) (void);
+
+#define glBeginSceneEXT GLEW_GET_FUN(__glewBeginSceneEXT)
+#define glEndSceneEXT GLEW_GET_FUN(__glewEndSceneEXT)
+
+#define GLEW_EXT_scene_marker GLEW_GET_VAR(__GLEW_EXT_scene_marker)
+
+#endif /* GL_EXT_scene_marker */
+
+/* ------------------------- GL_EXT_secondary_color ------------------------ */
+
+#ifndef GL_EXT_secondary_color
+#define GL_EXT_secondary_color 1
+
+#define GL_COLOR_SUM_EXT 0x8458
+#define GL_CURRENT_SECONDARY_COLOR_EXT 0x8459
+#define GL_SECONDARY_COLOR_ARRAY_SIZE_EXT 0x845A
+#define GL_SECONDARY_COLOR_ARRAY_TYPE_EXT 0x845B
+#define GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT 0x845C
+#define GL_SECONDARY_COLOR_ARRAY_POINTER_EXT 0x845D
+#define GL_SECONDARY_COLOR_ARRAY_EXT 0x845E
+
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3BEXTPROC) (GLbyte red, GLbyte green, GLbyte blue);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3BVEXTPROC) (const GLbyte *v);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3DEXTPROC) (GLdouble red, GLdouble green, GLdouble blue);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3DVEXTPROC) (const GLdouble *v);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3FEXTPROC) (GLfloat red, GLfloat green, GLfloat blue);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3FVEXTPROC) (const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3IEXTPROC) (GLint red, GLint green, GLint blue);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3IVEXTPROC) (const GLint *v);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3SEXTPROC) (GLshort red, GLshort green, GLshort blue);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3SVEXTPROC) (const GLshort *v);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3UBEXTPROC) (GLubyte red, GLubyte green, GLubyte blue);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3UBVEXTPROC) (const GLubyte *v);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3UIEXTPROC) (GLuint red, GLuint green, GLuint blue);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3UIVEXTPROC) (const GLuint *v);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3USEXTPROC) (GLushort red, GLushort green, GLushort blue);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3USVEXTPROC) (const GLushort *v);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLvoid *pointer);
+
+#define glSecondaryColor3bEXT GLEW_GET_FUN(__glewSecondaryColor3bEXT)
+#define glSecondaryColor3bvEXT GLEW_GET_FUN(__glewSecondaryColor3bvEXT)
+#define glSecondaryColor3dEXT GLEW_GET_FUN(__glewSecondaryColor3dEXT)
+#define glSecondaryColor3dvEXT GLEW_GET_FUN(__glewSecondaryColor3dvEXT)
+#define glSecondaryColor3fEXT GLEW_GET_FUN(__glewSecondaryColor3fEXT)
+#define glSecondaryColor3fvEXT GLEW_GET_FUN(__glewSecondaryColor3fvEXT)
+#define glSecondaryColor3iEXT GLEW_GET_FUN(__glewSecondaryColor3iEXT)
+#define glSecondaryColor3ivEXT GLEW_GET_FUN(__glewSecondaryColor3ivEXT)
+#define glSecondaryColor3sEXT GLEW_GET_FUN(__glewSecondaryColor3sEXT)
+#define glSecondaryColor3svEXT GLEW_GET_FUN(__glewSecondaryColor3svEXT)
+#define glSecondaryColor3ubEXT GLEW_GET_FUN(__glewSecondaryColor3ubEXT)
+#define glSecondaryColor3ubvEXT GLEW_GET_FUN(__glewSecondaryColor3ubvEXT)
+#define glSecondaryColor3uiEXT GLEW_GET_FUN(__glewSecondaryColor3uiEXT)
+#define glSecondaryColor3uivEXT GLEW_GET_FUN(__glewSecondaryColor3uivEXT)
+#define glSecondaryColor3usEXT GLEW_GET_FUN(__glewSecondaryColor3usEXT)
+#define glSecondaryColor3usvEXT GLEW_GET_FUN(__glewSecondaryColor3usvEXT)
+#define glSecondaryColorPointerEXT GLEW_GET_FUN(__glewSecondaryColorPointerEXT)
+
+#define GLEW_EXT_secondary_color GLEW_GET_VAR(__GLEW_EXT_secondary_color)
+
+#endif /* GL_EXT_secondary_color */
+
+/* --------------------- GL_EXT_separate_specular_color -------------------- */
+
+#ifndef GL_EXT_separate_specular_color
+#define GL_EXT_separate_specular_color 1
+
+#define GL_LIGHT_MODEL_COLOR_CONTROL_EXT 0x81F8
+#define GL_SINGLE_COLOR_EXT 0x81F9
+#define GL_SEPARATE_SPECULAR_COLOR_EXT 0x81FA
+
+#define GLEW_EXT_separate_specular_color GLEW_GET_VAR(__GLEW_EXT_separate_specular_color)
+
+#endif /* GL_EXT_separate_specular_color */
+
+/* -------------------------- GL_EXT_shadow_funcs -------------------------- */
+
+#ifndef GL_EXT_shadow_funcs
+#define GL_EXT_shadow_funcs 1
+
+#define GLEW_EXT_shadow_funcs GLEW_GET_VAR(__GLEW_EXT_shadow_funcs)
+
+#endif /* GL_EXT_shadow_funcs */
+
+/* --------------------- GL_EXT_shared_texture_palette --------------------- */
+
+#ifndef GL_EXT_shared_texture_palette
+#define GL_EXT_shared_texture_palette 1
+
+#define GL_SHARED_TEXTURE_PALETTE_EXT 0x81FB
+
+#define GLEW_EXT_shared_texture_palette GLEW_GET_VAR(__GLEW_EXT_shared_texture_palette)
+
+#endif /* GL_EXT_shared_texture_palette */
+
+/* ------------------------ GL_EXT_stencil_clear_tag ----------------------- */
+
+#ifndef GL_EXT_stencil_clear_tag
+#define GL_EXT_stencil_clear_tag 1
+
+#define GL_STENCIL_TAG_BITS_EXT 0x88F2
+#define GL_STENCIL_CLEAR_TAG_VALUE_EXT 0x88F3
+
+#define GLEW_EXT_stencil_clear_tag GLEW_GET_VAR(__GLEW_EXT_stencil_clear_tag)
+
+#endif /* GL_EXT_stencil_clear_tag */
+
+/* ------------------------ GL_EXT_stencil_two_side ------------------------ */
+
+#ifndef GL_EXT_stencil_two_side
+#define GL_EXT_stencil_two_side 1
+
+#define GL_STENCIL_TEST_TWO_SIDE_EXT 0x8910
+#define GL_ACTIVE_STENCIL_FACE_EXT 0x8911
+
+typedef void (GLAPIENTRY * PFNGLACTIVESTENCILFACEEXTPROC) (GLenum face);
+
+#define glActiveStencilFaceEXT GLEW_GET_FUN(__glewActiveStencilFaceEXT)
+
+#define GLEW_EXT_stencil_two_side GLEW_GET_VAR(__GLEW_EXT_stencil_two_side)
+
+#endif /* GL_EXT_stencil_two_side */
+
+/* -------------------------- GL_EXT_stencil_wrap -------------------------- */
+
+#ifndef GL_EXT_stencil_wrap
+#define GL_EXT_stencil_wrap 1
+
+#define GL_INCR_WRAP_EXT 0x8507
+#define GL_DECR_WRAP_EXT 0x8508
+
+#define GLEW_EXT_stencil_wrap GLEW_GET_VAR(__GLEW_EXT_stencil_wrap)
+
+#endif /* GL_EXT_stencil_wrap */
+
+/* --------------------------- GL_EXT_subtexture --------------------------- */
+
+#ifndef GL_EXT_subtexture
+#define GL_EXT_subtexture 1
+
+typedef void (GLAPIENTRY * PFNGLTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void* pixels);
+typedef void (GLAPIENTRY * PFNGLTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void* pixels);
+typedef void (GLAPIENTRY * PFNGLTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void* pixels);
+
+#define glTexSubImage1DEXT GLEW_GET_FUN(__glewTexSubImage1DEXT)
+#define glTexSubImage2DEXT GLEW_GET_FUN(__glewTexSubImage2DEXT)
+#define glTexSubImage3DEXT GLEW_GET_FUN(__glewTexSubImage3DEXT)
+
+#define GLEW_EXT_subtexture GLEW_GET_VAR(__GLEW_EXT_subtexture)
+
+#endif /* GL_EXT_subtexture */
+
+/* ----------------------------- GL_EXT_texture ---------------------------- */
+
+#ifndef GL_EXT_texture
+#define GL_EXT_texture 1
+
+#define GL_ALPHA4_EXT 0x803B
+#define GL_ALPHA8_EXT 0x803C
+#define GL_ALPHA12_EXT 0x803D
+#define GL_ALPHA16_EXT 0x803E
+#define GL_LUMINANCE4_EXT 0x803F
+#define GL_LUMINANCE8_EXT 0x8040
+#define GL_LUMINANCE12_EXT 0x8041
+#define GL_LUMINANCE16_EXT 0x8042
+#define GL_LUMINANCE4_ALPHA4_EXT 0x8043
+#define GL_LUMINANCE6_ALPHA2_EXT 0x8044
+#define GL_LUMINANCE8_ALPHA8_EXT 0x8045
+#define GL_LUMINANCE12_ALPHA4_EXT 0x8046
+#define GL_LUMINANCE12_ALPHA12_EXT 0x8047
+#define GL_LUMINANCE16_ALPHA16_EXT 0x8048
+#define GL_INTENSITY_EXT 0x8049
+#define GL_INTENSITY4_EXT 0x804A
+#define GL_INTENSITY8_EXT 0x804B
+#define GL_INTENSITY12_EXT 0x804C
+#define GL_INTENSITY16_EXT 0x804D
+#define GL_RGB2_EXT 0x804E
+#define GL_RGB4_EXT 0x804F
+#define GL_RGB5_EXT 0x8050
+#define GL_RGB8_EXT 0x8051
+#define GL_RGB10_EXT 0x8052
+#define GL_RGB12_EXT 0x8053
+#define GL_RGB16_EXT 0x8054
+#define GL_RGBA2_EXT 0x8055
+#define GL_RGBA4_EXT 0x8056
+#define GL_RGB5_A1_EXT 0x8057
+#define GL_RGBA8_EXT 0x8058
+#define GL_RGB10_A2_EXT 0x8059
+#define GL_RGBA12_EXT 0x805A
+#define GL_RGBA16_EXT 0x805B
+#define GL_TEXTURE_RED_SIZE_EXT 0x805C
+#define GL_TEXTURE_GREEN_SIZE_EXT 0x805D
+#define GL_TEXTURE_BLUE_SIZE_EXT 0x805E
+#define GL_TEXTURE_ALPHA_SIZE_EXT 0x805F
+#define GL_TEXTURE_LUMINANCE_SIZE_EXT 0x8060
+#define GL_TEXTURE_INTENSITY_SIZE_EXT 0x8061
+#define GL_REPLACE_EXT 0x8062
+#define GL_PROXY_TEXTURE_1D_EXT 0x8063
+#define GL_PROXY_TEXTURE_2D_EXT 0x8064
+
+#define GLEW_EXT_texture GLEW_GET_VAR(__GLEW_EXT_texture)
+
+#endif /* GL_EXT_texture */
+
+/* ---------------------------- GL_EXT_texture3D --------------------------- */
+
+#ifndef GL_EXT_texture3D
+#define GL_EXT_texture3D 1
+
+#define GL_PACK_SKIP_IMAGES_EXT 0x806B
+#define GL_PACK_IMAGE_HEIGHT_EXT 0x806C
+#define GL_UNPACK_SKIP_IMAGES_EXT 0x806D
+#define GL_UNPACK_IMAGE_HEIGHT_EXT 0x806E
+#define GL_TEXTURE_3D_EXT 0x806F
+#define GL_PROXY_TEXTURE_3D_EXT 0x8070
+#define GL_TEXTURE_DEPTH_EXT 0x8071
+#define GL_TEXTURE_WRAP_R_EXT 0x8072
+#define GL_MAX_3D_TEXTURE_SIZE_EXT 0x8073
+
+typedef void (GLAPIENTRY * PFNGLTEXIMAGE3DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void* pixels);
+
+#define glTexImage3DEXT GLEW_GET_FUN(__glewTexImage3DEXT)
+
+#define GLEW_EXT_texture3D GLEW_GET_VAR(__GLEW_EXT_texture3D)
+
+#endif /* GL_EXT_texture3D */
+
+/* -------------------- GL_EXT_texture_compression_dxt1 -------------------- */
+
+#ifndef GL_EXT_texture_compression_dxt1
+#define GL_EXT_texture_compression_dxt1 1
+
+#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT 0x83F0
+#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT 0x83F1
+
+#define GLEW_EXT_texture_compression_dxt1 GLEW_GET_VAR(__GLEW_EXT_texture_compression_dxt1)
+
+#endif /* GL_EXT_texture_compression_dxt1 */
+
+/* -------------------- GL_EXT_texture_compression_s3tc -------------------- */
+
+#ifndef GL_EXT_texture_compression_s3tc
+#define GL_EXT_texture_compression_s3tc 1
+
+#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT 0x83F0
+#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT 0x83F1
+#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT 0x83F2
+#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT 0x83F3
+
+#define GLEW_EXT_texture_compression_s3tc GLEW_GET_VAR(__GLEW_EXT_texture_compression_s3tc)
+
+#endif /* GL_EXT_texture_compression_s3tc */
+
+/* ------------------------ GL_EXT_texture_cube_map ------------------------ */
+
+#ifndef GL_EXT_texture_cube_map
+#define GL_EXT_texture_cube_map 1
+
+#define GL_NORMAL_MAP_EXT 0x8511
+#define GL_REFLECTION_MAP_EXT 0x8512
+#define GL_TEXTURE_CUBE_MAP_EXT 0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP_EXT 0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_EXT 0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_EXT 0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_EXT 0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT 0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_EXT 0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT 0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP_EXT 0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_EXT 0x851C
+
+#define GLEW_EXT_texture_cube_map GLEW_GET_VAR(__GLEW_EXT_texture_cube_map)
+
+#endif /* GL_EXT_texture_cube_map */
+
+/* ----------------------- GL_EXT_texture_edge_clamp ----------------------- */
+
+#ifndef GL_EXT_texture_edge_clamp
+#define GL_EXT_texture_edge_clamp 1
+
+#define GL_CLAMP_TO_EDGE_EXT 0x812F
+
+#define GLEW_EXT_texture_edge_clamp GLEW_GET_VAR(__GLEW_EXT_texture_edge_clamp)
+
+#endif /* GL_EXT_texture_edge_clamp */
+
+/* --------------------------- GL_EXT_texture_env -------------------------- */
+
+#ifndef GL_EXT_texture_env
+#define GL_EXT_texture_env 1
+
+#define GL_TEXTURE_ENV0_EXT 0
+#define GL_ENV_BLEND_EXT 0
+#define GL_TEXTURE_ENV_SHIFT_EXT 0
+#define GL_ENV_REPLACE_EXT 0
+#define GL_ENV_ADD_EXT 0
+#define GL_ENV_SUBTRACT_EXT 0
+#define GL_TEXTURE_ENV_MODE_ALPHA_EXT 0
+#define GL_ENV_REVERSE_SUBTRACT_EXT 0
+#define GL_ENV_REVERSE_BLEND_EXT 0
+#define GL_ENV_COPY_EXT 0
+#define GL_ENV_MODULATE_EXT 0
+
+#define GLEW_EXT_texture_env GLEW_GET_VAR(__GLEW_EXT_texture_env)
+
+#endif /* GL_EXT_texture_env */
+
+/* ------------------------- GL_EXT_texture_env_add ------------------------ */
+
+#ifndef GL_EXT_texture_env_add
+#define GL_EXT_texture_env_add 1
+
+#define GLEW_EXT_texture_env_add GLEW_GET_VAR(__GLEW_EXT_texture_env_add)
+
+#endif /* GL_EXT_texture_env_add */
+
+/* ----------------------- GL_EXT_texture_env_combine ---------------------- */
+
+#ifndef GL_EXT_texture_env_combine
+#define GL_EXT_texture_env_combine 1
+
+#define GL_COMBINE_EXT 0x8570
+#define GL_COMBINE_RGB_EXT 0x8571
+#define GL_COMBINE_ALPHA_EXT 0x8572
+#define GL_RGB_SCALE_EXT 0x8573
+#define GL_ADD_SIGNED_EXT 0x8574
+#define GL_INTERPOLATE_EXT 0x8575
+#define GL_CONSTANT_EXT 0x8576
+#define GL_PRIMARY_COLOR_EXT 0x8577
+#define GL_PREVIOUS_EXT 0x8578
+#define GL_SOURCE0_RGB_EXT 0x8580
+#define GL_SOURCE1_RGB_EXT 0x8581
+#define GL_SOURCE2_RGB_EXT 0x8582
+#define GL_SOURCE0_ALPHA_EXT 0x8588
+#define GL_SOURCE1_ALPHA_EXT 0x8589
+#define GL_SOURCE2_ALPHA_EXT 0x858A
+#define GL_OPERAND0_RGB_EXT 0x8590
+#define GL_OPERAND1_RGB_EXT 0x8591
+#define GL_OPERAND2_RGB_EXT 0x8592
+#define GL_OPERAND0_ALPHA_EXT 0x8598
+#define GL_OPERAND1_ALPHA_EXT 0x8599
+#define GL_OPERAND2_ALPHA_EXT 0x859A
+
+#define GLEW_EXT_texture_env_combine GLEW_GET_VAR(__GLEW_EXT_texture_env_combine)
+
+#endif /* GL_EXT_texture_env_combine */
+
+/* ------------------------ GL_EXT_texture_env_dot3 ------------------------ */
+
+#ifndef GL_EXT_texture_env_dot3
+#define GL_EXT_texture_env_dot3 1
+
+#define GL_DOT3_RGB_EXT 0x8740
+#define GL_DOT3_RGBA_EXT 0x8741
+
+#define GLEW_EXT_texture_env_dot3 GLEW_GET_VAR(__GLEW_EXT_texture_env_dot3)
+
+#endif /* GL_EXT_texture_env_dot3 */
+
+/* ------------------- GL_EXT_texture_filter_anisotropic ------------------- */
+
+#ifndef GL_EXT_texture_filter_anisotropic
+#define GL_EXT_texture_filter_anisotropic 1
+
+#define GL_TEXTURE_MAX_ANISOTROPY_EXT 0x84FE
+#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF
+
+#define GLEW_EXT_texture_filter_anisotropic GLEW_GET_VAR(__GLEW_EXT_texture_filter_anisotropic)
+
+#endif /* GL_EXT_texture_filter_anisotropic */
+
+/* ------------------------ GL_EXT_texture_lod_bias ------------------------ */
+
+#ifndef GL_EXT_texture_lod_bias
+#define GL_EXT_texture_lod_bias 1
+
+#define GL_MAX_TEXTURE_LOD_BIAS_EXT 0x84FD
+#define GL_TEXTURE_FILTER_CONTROL_EXT 0x8500
+#define GL_TEXTURE_LOD_BIAS_EXT 0x8501
+
+#define GLEW_EXT_texture_lod_bias GLEW_GET_VAR(__GLEW_EXT_texture_lod_bias)
+
+#endif /* GL_EXT_texture_lod_bias */
+
+/* ---------------------- GL_EXT_texture_mirror_clamp ---------------------- */
+
+#ifndef GL_EXT_texture_mirror_clamp
+#define GL_EXT_texture_mirror_clamp 1
+
+#define GL_MIRROR_CLAMP_EXT 0x8742
+#define GL_MIRROR_CLAMP_TO_EDGE_EXT 0x8743
+#define GL_MIRROR_CLAMP_TO_BORDER_EXT 0x8912
+
+#define GLEW_EXT_texture_mirror_clamp GLEW_GET_VAR(__GLEW_EXT_texture_mirror_clamp)
+
+#endif /* GL_EXT_texture_mirror_clamp */
+
+/* ------------------------- GL_EXT_texture_object ------------------------- */
+
+#ifndef GL_EXT_texture_object
+#define GL_EXT_texture_object 1
+
+#define GL_TEXTURE_PRIORITY_EXT 0x8066
+#define GL_TEXTURE_RESIDENT_EXT 0x8067
+#define GL_TEXTURE_1D_BINDING_EXT 0x8068
+#define GL_TEXTURE_2D_BINDING_EXT 0x8069
+#define GL_TEXTURE_3D_BINDING_EXT 0x806A
+
+typedef GLboolean (GLAPIENTRY * PFNGLARETEXTURESRESIDENTEXTPROC) (GLsizei n, const GLuint* textures, GLboolean* residences);
+typedef void (GLAPIENTRY * PFNGLBINDTEXTUREEXTPROC) (GLenum target, GLuint texture);
+typedef void (GLAPIENTRY * PFNGLDELETETEXTURESEXTPROC) (GLsizei n, const GLuint* textures);
+typedef void (GLAPIENTRY * PFNGLGENTEXTURESEXTPROC) (GLsizei n, GLuint* textures);
+typedef GLboolean (GLAPIENTRY * PFNGLISTEXTUREEXTPROC) (GLuint texture);
+typedef void (GLAPIENTRY * PFNGLPRIORITIZETEXTURESEXTPROC) (GLsizei n, const GLuint* textures, const GLclampf* priorities);
+
+#define glAreTexturesResidentEXT GLEW_GET_FUN(__glewAreTexturesResidentEXT)
+#define glBindTextureEXT GLEW_GET_FUN(__glewBindTextureEXT)
+#define glDeleteTexturesEXT GLEW_GET_FUN(__glewDeleteTexturesEXT)
+#define glGenTexturesEXT GLEW_GET_FUN(__glewGenTexturesEXT)
+#define glIsTextureEXT GLEW_GET_FUN(__glewIsTextureEXT)
+#define glPrioritizeTexturesEXT GLEW_GET_FUN(__glewPrioritizeTexturesEXT)
+
+#define GLEW_EXT_texture_object GLEW_GET_VAR(__GLEW_EXT_texture_object)
+
+#endif /* GL_EXT_texture_object */
+
+/* --------------------- GL_EXT_texture_perturb_normal --------------------- */
+
+#ifndef GL_EXT_texture_perturb_normal
+#define GL_EXT_texture_perturb_normal 1
+
+#define GL_PERTURB_EXT 0x85AE
+#define GL_TEXTURE_NORMAL_EXT 0x85AF
+
+typedef void (GLAPIENTRY * PFNGLTEXTURENORMALEXTPROC) (GLenum mode);
+
+#define glTextureNormalEXT GLEW_GET_FUN(__glewTextureNormalEXT)
+
+#define GLEW_EXT_texture_perturb_normal GLEW_GET_VAR(__GLEW_EXT_texture_perturb_normal)
+
+#endif /* GL_EXT_texture_perturb_normal */
+
+/* ------------------------ GL_EXT_texture_rectangle ----------------------- */
+
+#ifndef GL_EXT_texture_rectangle
+#define GL_EXT_texture_rectangle 1
+
+#define GL_TEXTURE_RECTANGLE_EXT 0x84F5
+#define GL_TEXTURE_BINDING_RECTANGLE_EXT 0x84F6
+#define GL_PROXY_TEXTURE_RECTANGLE_EXT 0x84F7
+#define GL_MAX_RECTANGLE_TEXTURE_SIZE_EXT 0x84F8
+
+#define GLEW_EXT_texture_rectangle GLEW_GET_VAR(__GLEW_EXT_texture_rectangle)
+
+#endif /* GL_EXT_texture_rectangle */
+
+/* -------------------------- GL_EXT_texture_sRGB -------------------------- */
+
+#ifndef GL_EXT_texture_sRGB
+#define GL_EXT_texture_sRGB 1
+
+#define GL_SRGB_EXT 0x8C40
+#define GL_SRGB8_EXT 0x8C41
+#define GL_SRGB_ALPHA_EXT 0x8C42
+#define GL_SRGB8_ALPHA8_EXT 0x8C43
+#define GL_SLUMINANCE_ALPHA_EXT 0x8C44
+#define GL_SLUMINANCE8_ALPHA8_EXT 0x8C45
+#define GL_SLUMINANCE_EXT 0x8C46
+#define GL_SLUMINANCE8_EXT 0x8C47
+#define GL_COMPRESSED_SRGB_EXT 0x8C48
+#define GL_COMPRESSED_SRGB_ALPHA_EXT 0x8C49
+#define GL_COMPRESSED_SLUMINANCE_EXT 0x8C4A
+#define GL_COMPRESSED_SLUMINANCE_ALPHA_EXT 0x8C4B
+#define GL_COMPRESSED_SRGB_S3TC_DXT1_EXT 0x8C4C
+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT 0x8C4D
+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT 0x8C4E
+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT 0x8C4F
+
+#define GLEW_EXT_texture_sRGB GLEW_GET_VAR(__GLEW_EXT_texture_sRGB)
+
+#endif /* GL_EXT_texture_sRGB */
+
+/* -------------------------- GL_EXT_vertex_array -------------------------- */
+
+#ifndef GL_EXT_vertex_array
+#define GL_EXT_vertex_array 1
+
+#define GL_DOUBLE_EXT 0x140A
+#define GL_VERTEX_ARRAY_EXT 0x8074
+#define GL_NORMAL_ARRAY_EXT 0x8075
+#define GL_COLOR_ARRAY_EXT 0x8076
+#define GL_INDEX_ARRAY_EXT 0x8077
+#define GL_TEXTURE_COORD_ARRAY_EXT 0x8078
+#define GL_EDGE_FLAG_ARRAY_EXT 0x8079
+#define GL_VERTEX_ARRAY_SIZE_EXT 0x807A
+#define GL_VERTEX_ARRAY_TYPE_EXT 0x807B
+#define GL_VERTEX_ARRAY_STRIDE_EXT 0x807C
+#define GL_VERTEX_ARRAY_COUNT_EXT 0x807D
+#define GL_NORMAL_ARRAY_TYPE_EXT 0x807E
+#define GL_NORMAL_ARRAY_STRIDE_EXT 0x807F
+#define GL_NORMAL_ARRAY_COUNT_EXT 0x8080
+#define GL_COLOR_ARRAY_SIZE_EXT 0x8081
+#define GL_COLOR_ARRAY_TYPE_EXT 0x8082
+#define GL_COLOR_ARRAY_STRIDE_EXT 0x8083
+#define GL_COLOR_ARRAY_COUNT_EXT 0x8084
+#define GL_INDEX_ARRAY_TYPE_EXT 0x8085
+#define GL_INDEX_ARRAY_STRIDE_EXT 0x8086
+#define GL_INDEX_ARRAY_COUNT_EXT 0x8087
+#define GL_TEXTURE_COORD_ARRAY_SIZE_EXT 0x8088
+#define GL_TEXTURE_COORD_ARRAY_TYPE_EXT 0x8089
+#define GL_TEXTURE_COORD_ARRAY_STRIDE_EXT 0x808A
+#define GL_TEXTURE_COORD_ARRAY_COUNT_EXT 0x808B
+#define GL_EDGE_FLAG_ARRAY_STRIDE_EXT 0x808C
+#define GL_EDGE_FLAG_ARRAY_COUNT_EXT 0x808D
+#define GL_VERTEX_ARRAY_POINTER_EXT 0x808E
+#define GL_NORMAL_ARRAY_POINTER_EXT 0x808F
+#define GL_COLOR_ARRAY_POINTER_EXT 0x8090
+#define GL_INDEX_ARRAY_POINTER_EXT 0x8091
+#define GL_TEXTURE_COORD_ARRAY_POINTER_EXT 0x8092
+#define GL_EDGE_FLAG_ARRAY_POINTER_EXT 0x8093
+
+typedef void (GLAPIENTRY * PFNGLARRAYELEMENTEXTPROC) (GLint i);
+typedef void (GLAPIENTRY * PFNGLCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const void* pointer);
+typedef void (GLAPIENTRY * PFNGLDRAWARRAYSEXTPROC) (GLenum mode, GLint first, GLsizei count);
+typedef void (GLAPIENTRY * PFNGLEDGEFLAGPOINTEREXTPROC) (GLsizei stride, GLsizei count, const GLboolean* pointer);
+typedef void (GLAPIENTRY * PFNGLGETPOINTERVEXTPROC) (GLenum pname, void** params);
+typedef void (GLAPIENTRY * PFNGLINDEXPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const void* pointer);
+typedef void (GLAPIENTRY * PFNGLNORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const void* pointer);
+typedef void (GLAPIENTRY * PFNGLTEXCOORDPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const void* pointer);
+typedef void (GLAPIENTRY * PFNGLVERTEXPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const void* pointer);
+
+#define glArrayElementEXT GLEW_GET_FUN(__glewArrayElementEXT)
+#define glColorPointerEXT GLEW_GET_FUN(__glewColorPointerEXT)
+#define glDrawArraysEXT GLEW_GET_FUN(__glewDrawArraysEXT)
+#define glEdgeFlagPointerEXT GLEW_GET_FUN(__glewEdgeFlagPointerEXT)
+#define glGetPointervEXT GLEW_GET_FUN(__glewGetPointervEXT)
+#define glIndexPointerEXT GLEW_GET_FUN(__glewIndexPointerEXT)
+#define glNormalPointerEXT GLEW_GET_FUN(__glewNormalPointerEXT)
+#define glTexCoordPointerEXT GLEW_GET_FUN(__glewTexCoordPointerEXT)
+#define glVertexPointerEXT GLEW_GET_FUN(__glewVertexPointerEXT)
+
+#define GLEW_EXT_vertex_array GLEW_GET_VAR(__GLEW_EXT_vertex_array)
+
+#endif /* GL_EXT_vertex_array */
+
+/* -------------------------- GL_EXT_vertex_shader ------------------------- */
+
+#ifndef GL_EXT_vertex_shader
+#define GL_EXT_vertex_shader 1
+
+#define GL_VERTEX_SHADER_EXT 0x8780
+#define GL_VERTEX_SHADER_BINDING_EXT 0x8781
+#define GL_OP_INDEX_EXT 0x8782
+#define GL_OP_NEGATE_EXT 0x8783
+#define GL_OP_DOT3_EXT 0x8784
+#define GL_OP_DOT4_EXT 0x8785
+#define GL_OP_MUL_EXT 0x8786
+#define GL_OP_ADD_EXT 0x8787
+#define GL_OP_MADD_EXT 0x8788
+#define GL_OP_FRAC_EXT 0x8789
+#define GL_OP_MAX_EXT 0x878A
+#define GL_OP_MIN_EXT 0x878B
+#define GL_OP_SET_GE_EXT 0x878C
+#define GL_OP_SET_LT_EXT 0x878D
+#define GL_OP_CLAMP_EXT 0x878E
+#define GL_OP_FLOOR_EXT 0x878F
+#define GL_OP_ROUND_EXT 0x8790
+#define GL_OP_EXP_BASE_2_EXT 0x8791
+#define GL_OP_LOG_BASE_2_EXT 0x8792
+#define GL_OP_POWER_EXT 0x8793
+#define GL_OP_RECIP_EXT 0x8794
+#define GL_OP_RECIP_SQRT_EXT 0x8795
+#define GL_OP_SUB_EXT 0x8796
+#define GL_OP_CROSS_PRODUCT_EXT 0x8797
+#define GL_OP_MULTIPLY_MATRIX_EXT 0x8798
+#define GL_OP_MOV_EXT 0x8799
+#define GL_OUTPUT_VERTEX_EXT 0x879A
+#define GL_OUTPUT_COLOR0_EXT 0x879B
+#define GL_OUTPUT_COLOR1_EXT 0x879C
+#define GL_OUTPUT_TEXTURE_COORD0_EXT 0x879D
+#define GL_OUTPUT_TEXTURE_COORD1_EXT 0x879E
+#define GL_OUTPUT_TEXTURE_COORD2_EXT 0x879F
+#define GL_OUTPUT_TEXTURE_COORD3_EXT 0x87A0
+#define GL_OUTPUT_TEXTURE_COORD4_EXT 0x87A1
+#define GL_OUTPUT_TEXTURE_COORD5_EXT 0x87A2
+#define GL_OUTPUT_TEXTURE_COORD6_EXT 0x87A3
+#define GL_OUTPUT_TEXTURE_COORD7_EXT 0x87A4
+#define GL_OUTPUT_TEXTURE_COORD8_EXT 0x87A5
+#define GL_OUTPUT_TEXTURE_COORD9_EXT 0x87A6
+#define GL_OUTPUT_TEXTURE_COORD10_EXT 0x87A7
+#define GL_OUTPUT_TEXTURE_COORD11_EXT 0x87A8
+#define GL_OUTPUT_TEXTURE_COORD12_EXT 0x87A9
+#define GL_OUTPUT_TEXTURE_COORD13_EXT 0x87AA
+#define GL_OUTPUT_TEXTURE_COORD14_EXT 0x87AB
+#define GL_OUTPUT_TEXTURE_COORD15_EXT 0x87AC
+#define GL_OUTPUT_TEXTURE_COORD16_EXT 0x87AD
+#define GL_OUTPUT_TEXTURE_COORD17_EXT 0x87AE
+#define GL_OUTPUT_TEXTURE_COORD18_EXT 0x87AF
+#define GL_OUTPUT_TEXTURE_COORD19_EXT 0x87B0
+#define GL_OUTPUT_TEXTURE_COORD20_EXT 0x87B1
+#define GL_OUTPUT_TEXTURE_COORD21_EXT 0x87B2
+#define GL_OUTPUT_TEXTURE_COORD22_EXT 0x87B3
+#define GL_OUTPUT_TEXTURE_COORD23_EXT 0x87B4
+#define GL_OUTPUT_TEXTURE_COORD24_EXT 0x87B5
+#define GL_OUTPUT_TEXTURE_COORD25_EXT 0x87B6
+#define GL_OUTPUT_TEXTURE_COORD26_EXT 0x87B7
+#define GL_OUTPUT_TEXTURE_COORD27_EXT 0x87B8
+#define GL_OUTPUT_TEXTURE_COORD28_EXT 0x87B9
+#define GL_OUTPUT_TEXTURE_COORD29_EXT 0x87BA
+#define GL_OUTPUT_TEXTURE_COORD30_EXT 0x87BB
+#define GL_OUTPUT_TEXTURE_COORD31_EXT 0x87BC
+#define GL_OUTPUT_FOG_EXT 0x87BD
+#define GL_SCALAR_EXT 0x87BE
+#define GL_VECTOR_EXT 0x87BF
+#define GL_MATRIX_EXT 0x87C0
+#define GL_VARIANT_EXT 0x87C1
+#define GL_INVARIANT_EXT 0x87C2
+#define GL_LOCAL_CONSTANT_EXT 0x87C3
+#define GL_LOCAL_EXT 0x87C4
+#define GL_MAX_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87C5
+#define GL_MAX_VERTEX_SHADER_VARIANTS_EXT 0x87C6
+#define GL_MAX_VERTEX_SHADER_INVARIANTS_EXT 0x87C7
+#define GL_MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87C8
+#define GL_MAX_VERTEX_SHADER_LOCALS_EXT 0x87C9
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CA
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT 0x87CB
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INVARIANTS_EXT 0x87CC
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87CD
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT 0x87CE
+#define GL_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CF
+#define GL_VERTEX_SHADER_VARIANTS_EXT 0x87D0
+#define GL_VERTEX_SHADER_INVARIANTS_EXT 0x87D1
+#define GL_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87D2
+#define GL_VERTEX_SHADER_LOCALS_EXT 0x87D3
+#define GL_VERTEX_SHADER_OPTIMIZED_EXT 0x87D4
+#define GL_X_EXT 0x87D5
+#define GL_Y_EXT 0x87D6
+#define GL_Z_EXT 0x87D7
+#define GL_W_EXT 0x87D8
+#define GL_NEGATIVE_X_EXT 0x87D9
+#define GL_NEGATIVE_Y_EXT 0x87DA
+#define GL_NEGATIVE_Z_EXT 0x87DB
+#define GL_NEGATIVE_W_EXT 0x87DC
+#define GL_ZERO_EXT 0x87DD
+#define GL_ONE_EXT 0x87DE
+#define GL_NEGATIVE_ONE_EXT 0x87DF
+#define GL_NORMALIZED_RANGE_EXT 0x87E0
+#define GL_FULL_RANGE_EXT 0x87E1
+#define GL_CURRENT_VERTEX_EXT 0x87E2
+#define GL_MVP_MATRIX_EXT 0x87E3
+#define GL_VARIANT_VALUE_EXT 0x87E4
+#define GL_VARIANT_DATATYPE_EXT 0x87E5
+#define GL_VARIANT_ARRAY_STRIDE_EXT 0x87E6
+#define GL_VARIANT_ARRAY_TYPE_EXT 0x87E7
+#define GL_VARIANT_ARRAY_EXT 0x87E8
+#define GL_VARIANT_ARRAY_POINTER_EXT 0x87E9
+#define GL_INVARIANT_VALUE_EXT 0x87EA
+#define GL_INVARIANT_DATATYPE_EXT 0x87EB
+#define GL_LOCAL_CONSTANT_VALUE_EXT 0x87EC
+#define GL_LOCAL_CONSTANT_DATATYPE_EXT 0x87ED
+
+typedef void (GLAPIENTRY * PFNGLBEGINVERTEXSHADEREXTPROC) (void);
+typedef GLuint (GLAPIENTRY * PFNGLBINDLIGHTPARAMETEREXTPROC) (GLenum light, GLenum value);
+typedef GLuint (GLAPIENTRY * PFNGLBINDMATERIALPARAMETEREXTPROC) (GLenum face, GLenum value);
+typedef GLuint (GLAPIENTRY * PFNGLBINDPARAMETEREXTPROC) (GLenum value);
+typedef GLuint (GLAPIENTRY * PFNGLBINDTEXGENPARAMETEREXTPROC) (GLenum unit, GLenum coord, GLenum value);
+typedef GLuint (GLAPIENTRY * PFNGLBINDTEXTUREUNITPARAMETEREXTPROC) (GLenum unit, GLenum value);
+typedef void (GLAPIENTRY * PFNGLBINDVERTEXSHADEREXTPROC) (GLuint id);
+typedef void (GLAPIENTRY * PFNGLDELETEVERTEXSHADEREXTPROC) (GLuint id);
+typedef void (GLAPIENTRY * PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
+typedef void (GLAPIENTRY * PFNGLENABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
+typedef void (GLAPIENTRY * PFNGLENDVERTEXSHADEREXTPROC) (void);
+typedef void (GLAPIENTRY * PFNGLEXTRACTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
+typedef GLuint (GLAPIENTRY * PFNGLGENSYMBOLSEXTPROC) (GLenum dataType, GLenum storageType, GLenum range, GLuint components);
+typedef GLuint (GLAPIENTRY * PFNGLGENVERTEXSHADERSEXTPROC) (GLuint range);
+typedef void (GLAPIENTRY * PFNGLGETINVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
+typedef void (GLAPIENTRY * PFNGLGETINVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
+typedef void (GLAPIENTRY * PFNGLGETINVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
+typedef void (GLAPIENTRY * PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
+typedef void (GLAPIENTRY * PFNGLGETLOCALCONSTANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
+typedef void (GLAPIENTRY * PFNGLGETLOCALCONSTANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
+typedef void (GLAPIENTRY * PFNGLGETVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
+typedef void (GLAPIENTRY * PFNGLGETVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
+typedef void (GLAPIENTRY * PFNGLGETVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
+typedef void (GLAPIENTRY * PFNGLGETVARIANTPOINTERVEXTPROC) (GLuint id, GLenum value, GLvoid **data);
+typedef void (GLAPIENTRY * PFNGLINSERTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
+typedef GLboolean (GLAPIENTRY * PFNGLISVARIANTENABLEDEXTPROC) (GLuint id, GLenum cap);
+typedef void (GLAPIENTRY * PFNGLSETINVARIANTEXTPROC) (GLuint id, GLenum type, GLvoid *addr);
+typedef void (GLAPIENTRY * PFNGLSETLOCALCONSTANTEXTPROC) (GLuint id, GLenum type, GLvoid *addr);
+typedef void (GLAPIENTRY * PFNGLSHADEROP1EXTPROC) (GLenum op, GLuint res, GLuint arg1);
+typedef void (GLAPIENTRY * PFNGLSHADEROP2EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2);
+typedef void (GLAPIENTRY * PFNGLSHADEROP3EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2, GLuint arg3);
+typedef void (GLAPIENTRY * PFNGLSWIZZLEEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
+typedef void (GLAPIENTRY * PFNGLVARIANTPOINTEREXTPROC) (GLuint id, GLenum type, GLuint stride, GLvoid *addr);
+typedef void (GLAPIENTRY * PFNGLVARIANTBVEXTPROC) (GLuint id, GLbyte *addr);
+typedef void (GLAPIENTRY * PFNGLVARIANTDVEXTPROC) (GLuint id, GLdouble *addr);
+typedef void (GLAPIENTRY * PFNGLVARIANTFVEXTPROC) (GLuint id, GLfloat *addr);
+typedef void (GLAPIENTRY * PFNGLVARIANTIVEXTPROC) (GLuint id, GLint *addr);
+typedef void (GLAPIENTRY * PFNGLVARIANTSVEXTPROC) (GLuint id, GLshort *addr);
+typedef void (GLAPIENTRY * PFNGLVARIANTUBVEXTPROC) (GLuint id, GLubyte *addr);
+typedef void (GLAPIENTRY * PFNGLVARIANTUIVEXTPROC) (GLuint id, GLuint *addr);
+typedef void (GLAPIENTRY * PFNGLVARIANTUSVEXTPROC) (GLuint id, GLushort *addr);
+typedef void (GLAPIENTRY * PFNGLWRITEMASKEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
+
+#define glBeginVertexShaderEXT GLEW_GET_FUN(__glewBeginVertexShaderEXT)
+#define glBindLightParameterEXT GLEW_GET_FUN(__glewBindLightParameterEXT)
+#define glBindMaterialParameterEXT GLEW_GET_FUN(__glewBindMaterialParameterEXT)
+#define glBindParameterEXT GLEW_GET_FUN(__glewBindParameterEXT)
+#define glBindTexGenParameterEXT GLEW_GET_FUN(__glewBindTexGenParameterEXT)
+#define glBindTextureUnitParameterEXT GLEW_GET_FUN(__glewBindTextureUnitParameterEXT)
+#define glBindVertexShaderEXT GLEW_GET_FUN(__glewBindVertexShaderEXT)
+#define glDeleteVertexShaderEXT GLEW_GET_FUN(__glewDeleteVertexShaderEXT)
+#define glDisableVariantClientStateEXT GLEW_GET_FUN(__glewDisableVariantClientStateEXT)
+#define glEnableVariantClientStateEXT GLEW_GET_FUN(__glewEnableVariantClientStateEXT)
+#define glEndVertexShaderEXT GLEW_GET_FUN(__glewEndVertexShaderEXT)
+#define glExtractComponentEXT GLEW_GET_FUN(__glewExtractComponentEXT)
+#define glGenSymbolsEXT GLEW_GET_FUN(__glewGenSymbolsEXT)
+#define glGenVertexShadersEXT GLEW_GET_FUN(__glewGenVertexShadersEXT)
+#define glGetInvariantBooleanvEXT GLEW_GET_FUN(__glewGetInvariantBooleanvEXT)
+#define glGetInvariantFloatvEXT GLEW_GET_FUN(__glewGetInvariantFloatvEXT)
+#define glGetInvariantIntegervEXT GLEW_GET_FUN(__glewGetInvariantIntegervEXT)
+#define glGetLocalConstantBooleanvEXT GLEW_GET_FUN(__glewGetLocalConstantBooleanvEXT)
+#define glGetLocalConstantFloatvEXT GLEW_GET_FUN(__glewGetLocalConstantFloatvEXT)
+#define glGetLocalConstantIntegervEXT GLEW_GET_FUN(__glewGetLocalConstantIntegervEXT)
+#define glGetVariantBooleanvEXT GLEW_GET_FUN(__glewGetVariantBooleanvEXT)
+#define glGetVariantFloatvEXT GLEW_GET_FUN(__glewGetVariantFloatvEXT)
+#define glGetVariantIntegervEXT GLEW_GET_FUN(__glewGetVariantIntegervEXT)
+#define glGetVariantPointervEXT GLEW_GET_FUN(__glewGetVariantPointervEXT)
+#define glInsertComponentEXT GLEW_GET_FUN(__glewInsertComponentEXT)
+#define glIsVariantEnabledEXT GLEW_GET_FUN(__glewIsVariantEnabledEXT)
+#define glSetInvariantEXT GLEW_GET_FUN(__glewSetInvariantEXT)
+#define glSetLocalConstantEXT GLEW_GET_FUN(__glewSetLocalConstantEXT)
+#define glShaderOp1EXT GLEW_GET_FUN(__glewShaderOp1EXT)
+#define glShaderOp2EXT GLEW_GET_FUN(__glewShaderOp2EXT)
+#define glShaderOp3EXT GLEW_GET_FUN(__glewShaderOp3EXT)
+#define glSwizzleEXT GLEW_GET_FUN(__glewSwizzleEXT)
+#define glVariantPointerEXT GLEW_GET_FUN(__glewVariantPointerEXT)
+#define glVariantbvEXT GLEW_GET_FUN(__glewVariantbvEXT)
+#define glVariantdvEXT GLEW_GET_FUN(__glewVariantdvEXT)
+#define glVariantfvEXT GLEW_GET_FUN(__glewVariantfvEXT)
+#define glVariantivEXT GLEW_GET_FUN(__glewVariantivEXT)
+#define glVariantsvEXT GLEW_GET_FUN(__glewVariantsvEXT)
+#define glVariantubvEXT GLEW_GET_FUN(__glewVariantubvEXT)
+#define glVariantuivEXT GLEW_GET_FUN(__glewVariantuivEXT)
+#define glVariantusvEXT GLEW_GET_FUN(__glewVariantusvEXT)
+#define glWriteMaskEXT GLEW_GET_FUN(__glewWriteMaskEXT)
+
+#define GLEW_EXT_vertex_shader GLEW_GET_VAR(__GLEW_EXT_vertex_shader)
+
+#endif /* GL_EXT_vertex_shader */
+
+/* ------------------------ GL_EXT_vertex_weighting ------------------------ */
+
+#ifndef GL_EXT_vertex_weighting
+#define GL_EXT_vertex_weighting 1
+
+#define GL_MODELVIEW0_STACK_DEPTH_EXT 0x0BA3
+#define GL_MODELVIEW0_MATRIX_EXT 0x0BA6
+#define GL_MODELVIEW0_EXT 0x1700
+#define GL_MODELVIEW1_STACK_DEPTH_EXT 0x8502
+#define GL_MODELVIEW1_MATRIX_EXT 0x8506
+#define GL_VERTEX_WEIGHTING_EXT 0x8509
+#define GL_MODELVIEW1_EXT 0x850A
+#define GL_CURRENT_VERTEX_WEIGHT_EXT 0x850B
+#define GL_VERTEX_WEIGHT_ARRAY_EXT 0x850C
+#define GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT 0x850D
+#define GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT 0x850E
+#define GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT 0x850F
+#define GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT 0x8510
+
+typedef void (GLAPIENTRY * PFNGLVERTEXWEIGHTPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, void* pointer);
+typedef void (GLAPIENTRY * PFNGLVERTEXWEIGHTFEXTPROC) (GLfloat weight);
+typedef void (GLAPIENTRY * PFNGLVERTEXWEIGHTFVEXTPROC) (GLfloat* weight);
+
+#define glVertexWeightPointerEXT GLEW_GET_FUN(__glewVertexWeightPointerEXT)
+#define glVertexWeightfEXT GLEW_GET_FUN(__glewVertexWeightfEXT)
+#define glVertexWeightfvEXT GLEW_GET_FUN(__glewVertexWeightfvEXT)
+
+#define GLEW_EXT_vertex_weighting GLEW_GET_VAR(__GLEW_EXT_vertex_weighting)
+
+#endif /* GL_EXT_vertex_weighting */
+
+/* ------------------------ GL_GREMEDY_string_marker ----------------------- */
+
+#ifndef GL_GREMEDY_string_marker
+#define GL_GREMEDY_string_marker 1
+
+typedef void (GLAPIENTRY * PFNGLSTRINGMARKERGREMEDYPROC) (GLsizei len, const void* string);
+
+#define glStringMarkerGREMEDY GLEW_GET_FUN(__glewStringMarkerGREMEDY)
+
+#define GLEW_GREMEDY_string_marker GLEW_GET_VAR(__GLEW_GREMEDY_string_marker)
+
+#endif /* GL_GREMEDY_string_marker */
+
+/* --------------------- GL_HP_convolution_border_modes -------------------- */
+
+#ifndef GL_HP_convolution_border_modes
+#define GL_HP_convolution_border_modes 1
+
+#define GLEW_HP_convolution_border_modes GLEW_GET_VAR(__GLEW_HP_convolution_border_modes)
+
+#endif /* GL_HP_convolution_border_modes */
+
+/* ------------------------- GL_HP_image_transform ------------------------- */
+
+#ifndef GL_HP_image_transform
+#define GL_HP_image_transform 1
+
+typedef void (GLAPIENTRY * PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, const GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, const GLint* params);
+typedef void (GLAPIENTRY * PFNGLIMAGETRANSFORMPARAMETERFHPPROC) (GLenum target, GLenum pname, const GLfloat param);
+typedef void (GLAPIENTRY * PFNGLIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, const GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLIMAGETRANSFORMPARAMETERIHPPROC) (GLenum target, GLenum pname, const GLint param);
+typedef void (GLAPIENTRY * PFNGLIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, const GLint* params);
+
+#define glGetImageTransformParameterfvHP GLEW_GET_FUN(__glewGetImageTransformParameterfvHP)
+#define glGetImageTransformParameterivHP GLEW_GET_FUN(__glewGetImageTransformParameterivHP)
+#define glImageTransformParameterfHP GLEW_GET_FUN(__glewImageTransformParameterfHP)
+#define glImageTransformParameterfvHP GLEW_GET_FUN(__glewImageTransformParameterfvHP)
+#define glImageTransformParameteriHP GLEW_GET_FUN(__glewImageTransformParameteriHP)
+#define glImageTransformParameterivHP GLEW_GET_FUN(__glewImageTransformParameterivHP)
+
+#define GLEW_HP_image_transform GLEW_GET_VAR(__GLEW_HP_image_transform)
+
+#endif /* GL_HP_image_transform */
+
+/* -------------------------- GL_HP_occlusion_test ------------------------- */
+
+#ifndef GL_HP_occlusion_test
+#define GL_HP_occlusion_test 1
+
+#define GL_OCCLUSION_TEST_HP 0x8165
+#define GL_OCCLUSION_TEST_RESULT_HP 0x8166
+
+#define GLEW_HP_occlusion_test GLEW_GET_VAR(__GLEW_HP_occlusion_test)
+
+#endif /* GL_HP_occlusion_test */
+
+/* ------------------------- GL_HP_texture_lighting ------------------------ */
+
+#ifndef GL_HP_texture_lighting
+#define GL_HP_texture_lighting 1
+
+#define GLEW_HP_texture_lighting GLEW_GET_VAR(__GLEW_HP_texture_lighting)
+
+#endif /* GL_HP_texture_lighting */
+
+/* --------------------------- GL_IBM_cull_vertex -------------------------- */
+
+#ifndef GL_IBM_cull_vertex
+#define GL_IBM_cull_vertex 1
+
+#define GL_CULL_VERTEX_IBM 103050
+
+#define GLEW_IBM_cull_vertex GLEW_GET_VAR(__GLEW_IBM_cull_vertex)
+
+#endif /* GL_IBM_cull_vertex */
+
+/* ---------------------- GL_IBM_multimode_draw_arrays --------------------- */
+
+#ifndef GL_IBM_multimode_draw_arrays
+#define GL_IBM_multimode_draw_arrays 1
+
+typedef void (GLAPIENTRY * PFNGLMULTIMODEDRAWARRAYSIBMPROC) (const GLenum* mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride);
+typedef void (GLAPIENTRY * PFNGLMULTIMODEDRAWELEMENTSIBMPROC) (const GLenum* mode, const GLsizei *count, GLenum type, const GLvoid * const *indices, GLsizei primcount, GLint modestride);
+
+#define glMultiModeDrawArraysIBM GLEW_GET_FUN(__glewMultiModeDrawArraysIBM)
+#define glMultiModeDrawElementsIBM GLEW_GET_FUN(__glewMultiModeDrawElementsIBM)
+
+#define GLEW_IBM_multimode_draw_arrays GLEW_GET_VAR(__GLEW_IBM_multimode_draw_arrays)
+
+#endif /* GL_IBM_multimode_draw_arrays */
+
+/* ------------------------- GL_IBM_rasterpos_clip ------------------------- */
+
+#ifndef GL_IBM_rasterpos_clip
+#define GL_IBM_rasterpos_clip 1
+
+#define GL_RASTER_POSITION_UNCLIPPED_IBM 103010
+
+#define GLEW_IBM_rasterpos_clip GLEW_GET_VAR(__GLEW_IBM_rasterpos_clip)
+
+#endif /* GL_IBM_rasterpos_clip */
+
+/* --------------------------- GL_IBM_static_data -------------------------- */
+
+#ifndef GL_IBM_static_data
+#define GL_IBM_static_data 1
+
+#define GL_ALL_STATIC_DATA_IBM 103060
+#define GL_STATIC_VERTEX_ARRAY_IBM 103061
+
+#define GLEW_IBM_static_data GLEW_GET_VAR(__GLEW_IBM_static_data)
+
+#endif /* GL_IBM_static_data */
+
+/* --------------------- GL_IBM_texture_mirrored_repeat -------------------- */
+
+#ifndef GL_IBM_texture_mirrored_repeat
+#define GL_IBM_texture_mirrored_repeat 1
+
+#define GL_MIRRORED_REPEAT_IBM 0x8370
+
+#define GLEW_IBM_texture_mirrored_repeat GLEW_GET_VAR(__GLEW_IBM_texture_mirrored_repeat)
+
+#endif /* GL_IBM_texture_mirrored_repeat */
+
+/* ----------------------- GL_IBM_vertex_array_lists ----------------------- */
+
+#ifndef GL_IBM_vertex_array_lists
+#define GL_IBM_vertex_array_lists 1
+
+#define GL_VERTEX_ARRAY_LIST_IBM 103070
+#define GL_NORMAL_ARRAY_LIST_IBM 103071
+#define GL_COLOR_ARRAY_LIST_IBM 103072
+#define GL_INDEX_ARRAY_LIST_IBM 103073
+#define GL_TEXTURE_COORD_ARRAY_LIST_IBM 103074
+#define GL_EDGE_FLAG_ARRAY_LIST_IBM 103075
+#define GL_FOG_COORDINATE_ARRAY_LIST_IBM 103076
+#define GL_SECONDARY_COLOR_ARRAY_LIST_IBM 103077
+#define GL_VERTEX_ARRAY_LIST_STRIDE_IBM 103080
+#define GL_NORMAL_ARRAY_LIST_STRIDE_IBM 103081
+#define GL_COLOR_ARRAY_LIST_STRIDE_IBM 103082
+#define GL_INDEX_ARRAY_LIST_STRIDE_IBM 103083
+#define GL_TEXTURE_COORD_ARRAY_LIST_STRIDE_IBM 103084
+#define GL_EDGE_FLAG_ARRAY_LIST_STRIDE_IBM 103085
+#define GL_FOG_COORDINATE_ARRAY_LIST_STRIDE_IBM 103086
+#define GL_SECONDARY_COLOR_ARRAY_LIST_STRIDE_IBM 103087
+
+typedef void (GLAPIENTRY * PFNGLCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid ** pointer, GLint ptrstride);
+typedef void (GLAPIENTRY * PFNGLEDGEFLAGPOINTERLISTIBMPROC) (GLint stride, const GLboolean ** pointer, GLint ptrstride);
+typedef void (GLAPIENTRY * PFNGLFOGCOORDPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid ** pointer, GLint ptrstride);
+typedef void (GLAPIENTRY * PFNGLINDEXPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid ** pointer, GLint ptrstride);
+typedef void (GLAPIENTRY * PFNGLNORMALPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid ** pointer, GLint ptrstride);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid ** pointer, GLint ptrstride);
+typedef void (GLAPIENTRY * PFNGLTEXCOORDPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid ** pointer, GLint ptrstride);
+typedef void (GLAPIENTRY * PFNGLVERTEXPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid ** pointer, GLint ptrstride);
+
+#define glColorPointerListIBM GLEW_GET_FUN(__glewColorPointerListIBM)
+#define glEdgeFlagPointerListIBM GLEW_GET_FUN(__glewEdgeFlagPointerListIBM)
+#define glFogCoordPointerListIBM GLEW_GET_FUN(__glewFogCoordPointerListIBM)
+#define glIndexPointerListIBM GLEW_GET_FUN(__glewIndexPointerListIBM)
+#define glNormalPointerListIBM GLEW_GET_FUN(__glewNormalPointerListIBM)
+#define glSecondaryColorPointerListIBM GLEW_GET_FUN(__glewSecondaryColorPointerListIBM)
+#define glTexCoordPointerListIBM GLEW_GET_FUN(__glewTexCoordPointerListIBM)
+#define glVertexPointerListIBM GLEW_GET_FUN(__glewVertexPointerListIBM)
+
+#define GLEW_IBM_vertex_array_lists GLEW_GET_VAR(__GLEW_IBM_vertex_array_lists)
+
+#endif /* GL_IBM_vertex_array_lists */
+
+/* -------------------------- GL_INGR_color_clamp -------------------------- */
+
+#ifndef GL_INGR_color_clamp
+#define GL_INGR_color_clamp 1
+
+#define GL_RED_MIN_CLAMP_INGR 0x8560
+#define GL_GREEN_MIN_CLAMP_INGR 0x8561
+#define GL_BLUE_MIN_CLAMP_INGR 0x8562
+#define GL_ALPHA_MIN_CLAMP_INGR 0x8563
+#define GL_RED_MAX_CLAMP_INGR 0x8564
+#define GL_GREEN_MAX_CLAMP_INGR 0x8565
+#define GL_BLUE_MAX_CLAMP_INGR 0x8566
+#define GL_ALPHA_MAX_CLAMP_INGR 0x8567
+
+#define GLEW_INGR_color_clamp GLEW_GET_VAR(__GLEW_INGR_color_clamp)
+
+#endif /* GL_INGR_color_clamp */
+
+/* ------------------------- GL_INGR_interlace_read ------------------------ */
+
+#ifndef GL_INGR_interlace_read
+#define GL_INGR_interlace_read 1
+
+#define GL_INTERLACE_READ_INGR 0x8568
+
+#define GLEW_INGR_interlace_read GLEW_GET_VAR(__GLEW_INGR_interlace_read)
+
+#endif /* GL_INGR_interlace_read */
+
+/* ------------------------ GL_INTEL_parallel_arrays ----------------------- */
+
+#ifndef GL_INTEL_parallel_arrays
+#define GL_INTEL_parallel_arrays 1
+
+#define GL_PARALLEL_ARRAYS_INTEL 0x83F4
+#define GL_VERTEX_ARRAY_PARALLEL_POINTERS_INTEL 0x83F5
+#define GL_NORMAL_ARRAY_PARALLEL_POINTERS_INTEL 0x83F6
+#define GL_COLOR_ARRAY_PARALLEL_POINTERS_INTEL 0x83F7
+#define GL_TEXTURE_COORD_ARRAY_PARALLEL_POINTERS_INTEL 0x83F8
+
+typedef void (GLAPIENTRY * PFNGLCOLORPOINTERVINTELPROC) (GLint size, GLenum type, const void** pointer);
+typedef void (GLAPIENTRY * PFNGLNORMALPOINTERVINTELPROC) (GLenum type, const void** pointer);
+typedef void (GLAPIENTRY * PFNGLTEXCOORDPOINTERVINTELPROC) (GLint size, GLenum type, const void** pointer);
+typedef void (GLAPIENTRY * PFNGLVERTEXPOINTERVINTELPROC) (GLint size, GLenum type, const void** pointer);
+
+#define glColorPointervINTEL GLEW_GET_FUN(__glewColorPointervINTEL)
+#define glNormalPointervINTEL GLEW_GET_FUN(__glewNormalPointervINTEL)
+#define glTexCoordPointervINTEL GLEW_GET_FUN(__glewTexCoordPointervINTEL)
+#define glVertexPointervINTEL GLEW_GET_FUN(__glewVertexPointervINTEL)
+
+#define GLEW_INTEL_parallel_arrays GLEW_GET_VAR(__GLEW_INTEL_parallel_arrays)
+
+#endif /* GL_INTEL_parallel_arrays */
+
+/* ------------------------ GL_INTEL_texture_scissor ----------------------- */
+
+#ifndef GL_INTEL_texture_scissor
+#define GL_INTEL_texture_scissor 1
+
+typedef void (GLAPIENTRY * PFNGLTEXSCISSORFUNCINTELPROC) (GLenum target, GLenum lfunc, GLenum hfunc);
+typedef void (GLAPIENTRY * PFNGLTEXSCISSORINTELPROC) (GLenum target, GLclampf tlow, GLclampf thigh);
+
+#define glTexScissorFuncINTEL GLEW_GET_FUN(__glewTexScissorFuncINTEL)
+#define glTexScissorINTEL GLEW_GET_FUN(__glewTexScissorINTEL)
+
+#define GLEW_INTEL_texture_scissor GLEW_GET_VAR(__GLEW_INTEL_texture_scissor)
+
+#endif /* GL_INTEL_texture_scissor */
+
+/* -------------------------- GL_KTX_buffer_region ------------------------- */
+
+#ifndef GL_KTX_buffer_region
+#define GL_KTX_buffer_region 1
+
+#define GL_KTX_FRONT_REGION 0x0
+#define GL_KTX_BACK_REGION 0x1
+#define GL_KTX_Z_REGION 0x2
+#define GL_KTX_STENCIL_REGION 0x3
+
+typedef GLuint (GLAPIENTRY * PFNGLBUFFERREGIONENABLEDEXTPROC) (void);
+typedef void (GLAPIENTRY * PFNGLDELETEBUFFERREGIONEXTPROC) (GLenum region);
+typedef void (GLAPIENTRY * PFNGLDRAWBUFFERREGIONEXTPROC) (GLuint region, GLint x, GLint y, GLsizei width, GLsizei height, GLint xDest, GLint yDest);
+typedef GLuint (GLAPIENTRY * PFNGLNEWBUFFERREGIONEXTPROC) (GLenum region);
+typedef void (GLAPIENTRY * PFNGLREADBUFFERREGIONEXTPROC) (GLuint region, GLint x, GLint y, GLsizei width, GLsizei height);
+
+#define glBufferRegionEnabledEXT GLEW_GET_FUN(__glewBufferRegionEnabledEXT)
+#define glDeleteBufferRegionEXT GLEW_GET_FUN(__glewDeleteBufferRegionEXT)
+#define glDrawBufferRegionEXT GLEW_GET_FUN(__glewDrawBufferRegionEXT)
+#define glNewBufferRegionEXT GLEW_GET_FUN(__glewNewBufferRegionEXT)
+#define glReadBufferRegionEXT GLEW_GET_FUN(__glewReadBufferRegionEXT)
+
+#define GLEW_KTX_buffer_region GLEW_GET_VAR(__GLEW_KTX_buffer_region)
+
+#endif /* GL_KTX_buffer_region */
+
+/* ------------------------- GL_MESAX_texture_stack ------------------------ */
+
+#ifndef GL_MESAX_texture_stack
+#define GL_MESAX_texture_stack 1
+
+#define GL_TEXTURE_1D_STACK_MESAX 0x8759
+#define GL_TEXTURE_2D_STACK_MESAX 0x875A
+#define GL_PROXY_TEXTURE_1D_STACK_MESAX 0x875B
+#define GL_PROXY_TEXTURE_2D_STACK_MESAX 0x875C
+#define GL_TEXTURE_1D_STACK_BINDING_MESAX 0x875D
+#define GL_TEXTURE_2D_STACK_BINDING_MESAX 0x875E
+
+#define GLEW_MESAX_texture_stack GLEW_GET_VAR(__GLEW_MESAX_texture_stack)
+
+#endif /* GL_MESAX_texture_stack */
+
+/* -------------------------- GL_MESA_pack_invert -------------------------- */
+
+#ifndef GL_MESA_pack_invert
+#define GL_MESA_pack_invert 1
+
+#define GL_PACK_INVERT_MESA 0x8758
+
+#define GLEW_MESA_pack_invert GLEW_GET_VAR(__GLEW_MESA_pack_invert)
+
+#endif /* GL_MESA_pack_invert */
+
+/* ------------------------- GL_MESA_resize_buffers ------------------------ */
+
+#ifndef GL_MESA_resize_buffers
+#define GL_MESA_resize_buffers 1
+
+typedef void (GLAPIENTRY * PFNGLRESIZEBUFFERSMESAPROC) (void);
+
+#define glResizeBuffersMESA GLEW_GET_FUN(__glewResizeBuffersMESA)
+
+#define GLEW_MESA_resize_buffers GLEW_GET_VAR(__GLEW_MESA_resize_buffers)
+
+#endif /* GL_MESA_resize_buffers */
+
+/* --------------------------- GL_MESA_window_pos -------------------------- */
+
+#ifndef GL_MESA_window_pos
+#define GL_MESA_window_pos 1
+
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2DMESAPROC) (GLdouble x, GLdouble y);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2DVMESAPROC) (const GLdouble* p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2FMESAPROC) (GLfloat x, GLfloat y);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2FVMESAPROC) (const GLfloat* p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2IMESAPROC) (GLint x, GLint y);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2IVMESAPROC) (const GLint* p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2SMESAPROC) (GLshort x, GLshort y);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS2SVMESAPROC) (const GLshort* p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3DMESAPROC) (GLdouble x, GLdouble y, GLdouble z);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3DVMESAPROC) (const GLdouble* p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3FMESAPROC) (GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3FVMESAPROC) (const GLfloat* p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3IMESAPROC) (GLint x, GLint y, GLint z);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3IVMESAPROC) (const GLint* p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3SMESAPROC) (GLshort x, GLshort y, GLshort z);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS3SVMESAPROC) (const GLshort* p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS4DMESAPROC) (GLdouble x, GLdouble y, GLdouble z, GLdouble);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS4DVMESAPROC) (const GLdouble* p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS4FMESAPROC) (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS4FVMESAPROC) (const GLfloat* p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS4IMESAPROC) (GLint x, GLint y, GLint z, GLint w);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS4IVMESAPROC) (const GLint* p);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS4SMESAPROC) (GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (GLAPIENTRY * PFNGLWINDOWPOS4SVMESAPROC) (const GLshort* p);
+
+#define glWindowPos2dMESA GLEW_GET_FUN(__glewWindowPos2dMESA)
+#define glWindowPos2dvMESA GLEW_GET_FUN(__glewWindowPos2dvMESA)
+#define glWindowPos2fMESA GLEW_GET_FUN(__glewWindowPos2fMESA)
+#define glWindowPos2fvMESA GLEW_GET_FUN(__glewWindowPos2fvMESA)
+#define glWindowPos2iMESA GLEW_GET_FUN(__glewWindowPos2iMESA)
+#define glWindowPos2ivMESA GLEW_GET_FUN(__glewWindowPos2ivMESA)
+#define glWindowPos2sMESA GLEW_GET_FUN(__glewWindowPos2sMESA)
+#define glWindowPos2svMESA GLEW_GET_FUN(__glewWindowPos2svMESA)
+#define glWindowPos3dMESA GLEW_GET_FUN(__glewWindowPos3dMESA)
+#define glWindowPos3dvMESA GLEW_GET_FUN(__glewWindowPos3dvMESA)
+#define glWindowPos3fMESA GLEW_GET_FUN(__glewWindowPos3fMESA)
+#define glWindowPos3fvMESA GLEW_GET_FUN(__glewWindowPos3fvMESA)
+#define glWindowPos3iMESA GLEW_GET_FUN(__glewWindowPos3iMESA)
+#define glWindowPos3ivMESA GLEW_GET_FUN(__glewWindowPos3ivMESA)
+#define glWindowPos3sMESA GLEW_GET_FUN(__glewWindowPos3sMESA)
+#define glWindowPos3svMESA GLEW_GET_FUN(__glewWindowPos3svMESA)
+#define glWindowPos4dMESA GLEW_GET_FUN(__glewWindowPos4dMESA)
+#define glWindowPos4dvMESA GLEW_GET_FUN(__glewWindowPos4dvMESA)
+#define glWindowPos4fMESA GLEW_GET_FUN(__glewWindowPos4fMESA)
+#define glWindowPos4fvMESA GLEW_GET_FUN(__glewWindowPos4fvMESA)
+#define glWindowPos4iMESA GLEW_GET_FUN(__glewWindowPos4iMESA)
+#define glWindowPos4ivMESA GLEW_GET_FUN(__glewWindowPos4ivMESA)
+#define glWindowPos4sMESA GLEW_GET_FUN(__glewWindowPos4sMESA)
+#define glWindowPos4svMESA GLEW_GET_FUN(__glewWindowPos4svMESA)
+
+#define GLEW_MESA_window_pos GLEW_GET_VAR(__GLEW_MESA_window_pos)
+
+#endif /* GL_MESA_window_pos */
+
+/* ------------------------- GL_MESA_ycbcr_texture ------------------------- */
+
+#ifndef GL_MESA_ycbcr_texture
+#define GL_MESA_ycbcr_texture 1
+
+#define GL_UNSIGNED_SHORT_8_8_MESA 0x85BA
+#define GL_UNSIGNED_SHORT_8_8_REV_MESA 0x85BB
+#define GL_YCBCR_MESA 0x8757
+
+#define GLEW_MESA_ycbcr_texture GLEW_GET_VAR(__GLEW_MESA_ycbcr_texture)
+
+#endif /* GL_MESA_ycbcr_texture */
+
+/* --------------------------- GL_NV_blend_square -------------------------- */
+
+#ifndef GL_NV_blend_square
+#define GL_NV_blend_square 1
+
+#define GLEW_NV_blend_square GLEW_GET_VAR(__GLEW_NV_blend_square)
+
+#endif /* GL_NV_blend_square */
+
+/* ----------------------- GL_NV_copy_depth_to_color ----------------------- */
+
+#ifndef GL_NV_copy_depth_to_color
+#define GL_NV_copy_depth_to_color 1
+
+#define GL_DEPTH_STENCIL_TO_RGBA_NV 0x886E
+#define GL_DEPTH_STENCIL_TO_BGRA_NV 0x886F
+
+#define GLEW_NV_copy_depth_to_color GLEW_GET_VAR(__GLEW_NV_copy_depth_to_color)
+
+#endif /* GL_NV_copy_depth_to_color */
+
+/* --------------------------- GL_NV_depth_clamp --------------------------- */
+
+#ifndef GL_NV_depth_clamp
+#define GL_NV_depth_clamp 1
+
+#define GL_DEPTH_CLAMP_NV 0x864F
+
+#define GLEW_NV_depth_clamp GLEW_GET_VAR(__GLEW_NV_depth_clamp)
+
+#endif /* GL_NV_depth_clamp */
+
+/* ---------------------------- GL_NV_evaluators --------------------------- */
+
+#ifndef GL_NV_evaluators
+#define GL_NV_evaluators 1
+
+#define GL_EVAL_2D_NV 0x86C0
+#define GL_EVAL_TRIANGULAR_2D_NV 0x86C1
+#define GL_MAP_TESSELLATION_NV 0x86C2
+#define GL_MAP_ATTRIB_U_ORDER_NV 0x86C3
+#define GL_MAP_ATTRIB_V_ORDER_NV 0x86C4
+#define GL_EVAL_FRACTIONAL_TESSELLATION_NV 0x86C5
+#define GL_EVAL_VERTEX_ATTRIB0_NV 0x86C6
+#define GL_EVAL_VERTEX_ATTRIB1_NV 0x86C7
+#define GL_EVAL_VERTEX_ATTRIB2_NV 0x86C8
+#define GL_EVAL_VERTEX_ATTRIB3_NV 0x86C9
+#define GL_EVAL_VERTEX_ATTRIB4_NV 0x86CA
+#define GL_EVAL_VERTEX_ATTRIB5_NV 0x86CB
+#define GL_EVAL_VERTEX_ATTRIB6_NV 0x86CC
+#define GL_EVAL_VERTEX_ATTRIB7_NV 0x86CD
+#define GL_EVAL_VERTEX_ATTRIB8_NV 0x86CE
+#define GL_EVAL_VERTEX_ATTRIB9_NV 0x86CF
+#define GL_EVAL_VERTEX_ATTRIB10_NV 0x86D0
+#define GL_EVAL_VERTEX_ATTRIB11_NV 0x86D1
+#define GL_EVAL_VERTEX_ATTRIB12_NV 0x86D2
+#define GL_EVAL_VERTEX_ATTRIB13_NV 0x86D3
+#define GL_EVAL_VERTEX_ATTRIB14_NV 0x86D4
+#define GL_EVAL_VERTEX_ATTRIB15_NV 0x86D5
+#define GL_MAX_MAP_TESSELLATION_NV 0x86D6
+#define GL_MAX_RATIONAL_EVAL_ORDER_NV 0x86D7
+
+typedef void (GLAPIENTRY * PFNGLEVALMAPSNVPROC) (GLenum target, GLenum mode);
+typedef void (GLAPIENTRY * PFNGLGETMAPATTRIBPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETMAPATTRIBPARAMETERIVNVPROC) (GLenum target, GLuint index, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, void* points);
+typedef void (GLAPIENTRY * PFNGLGETMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const void* points);
+typedef void (GLAPIENTRY * PFNGLMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, const GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, const GLint* params);
+
+#define glEvalMapsNV GLEW_GET_FUN(__glewEvalMapsNV)
+#define glGetMapAttribParameterfvNV GLEW_GET_FUN(__glewGetMapAttribParameterfvNV)
+#define glGetMapAttribParameterivNV GLEW_GET_FUN(__glewGetMapAttribParameterivNV)
+#define glGetMapControlPointsNV GLEW_GET_FUN(__glewGetMapControlPointsNV)
+#define glGetMapParameterfvNV GLEW_GET_FUN(__glewGetMapParameterfvNV)
+#define glGetMapParameterivNV GLEW_GET_FUN(__glewGetMapParameterivNV)
+#define glMapControlPointsNV GLEW_GET_FUN(__glewMapControlPointsNV)
+#define glMapParameterfvNV GLEW_GET_FUN(__glewMapParameterfvNV)
+#define glMapParameterivNV GLEW_GET_FUN(__glewMapParameterivNV)
+
+#define GLEW_NV_evaluators GLEW_GET_VAR(__GLEW_NV_evaluators)
+
+#endif /* GL_NV_evaluators */
+
+/* ------------------------------ GL_NV_fence ------------------------------ */
+
+#ifndef GL_NV_fence
+#define GL_NV_fence 1
+
+#define GL_ALL_COMPLETED_NV 0x84F2
+#define GL_FENCE_STATUS_NV 0x84F3
+#define GL_FENCE_CONDITION_NV 0x84F4
+
+typedef void (GLAPIENTRY * PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint* fences);
+typedef void (GLAPIENTRY * PFNGLFINISHFENCENVPROC) (GLuint fence);
+typedef void (GLAPIENTRY * PFNGLGENFENCESNVPROC) (GLsizei n, GLuint* fences);
+typedef void (GLAPIENTRY * PFNGLGETFENCEIVNVPROC) (GLuint fence, GLenum pname, GLint* params);
+typedef GLboolean (GLAPIENTRY * PFNGLISFENCENVPROC) (GLuint fence);
+typedef void (GLAPIENTRY * PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition);
+typedef GLboolean (GLAPIENTRY * PFNGLTESTFENCENVPROC) (GLuint fence);
+
+#define glDeleteFencesNV GLEW_GET_FUN(__glewDeleteFencesNV)
+#define glFinishFenceNV GLEW_GET_FUN(__glewFinishFenceNV)
+#define glGenFencesNV GLEW_GET_FUN(__glewGenFencesNV)
+#define glGetFenceivNV GLEW_GET_FUN(__glewGetFenceivNV)
+#define glIsFenceNV GLEW_GET_FUN(__glewIsFenceNV)
+#define glSetFenceNV GLEW_GET_FUN(__glewSetFenceNV)
+#define glTestFenceNV GLEW_GET_FUN(__glewTestFenceNV)
+
+#define GLEW_NV_fence GLEW_GET_VAR(__GLEW_NV_fence)
+
+#endif /* GL_NV_fence */
+
+/* --------------------------- GL_NV_float_buffer -------------------------- */
+
+#ifndef GL_NV_float_buffer
+#define GL_NV_float_buffer 1
+
+#define GL_FLOAT_R_NV 0x8880
+#define GL_FLOAT_RG_NV 0x8881
+#define GL_FLOAT_RGB_NV 0x8882
+#define GL_FLOAT_RGBA_NV 0x8883
+#define GL_FLOAT_R16_NV 0x8884
+#define GL_FLOAT_R32_NV 0x8885
+#define GL_FLOAT_RG16_NV 0x8886
+#define GL_FLOAT_RG32_NV 0x8887
+#define GL_FLOAT_RGB16_NV 0x8888
+#define GL_FLOAT_RGB32_NV 0x8889
+#define GL_FLOAT_RGBA16_NV 0x888A
+#define GL_FLOAT_RGBA32_NV 0x888B
+#define GL_TEXTURE_FLOAT_COMPONENTS_NV 0x888C
+#define GL_FLOAT_CLEAR_COLOR_VALUE_NV 0x888D
+#define GL_FLOAT_RGBA_MODE_NV 0x888E
+
+#define GLEW_NV_float_buffer GLEW_GET_VAR(__GLEW_NV_float_buffer)
+
+#endif /* GL_NV_float_buffer */
+
+/* --------------------------- GL_NV_fog_distance -------------------------- */
+
+#ifndef GL_NV_fog_distance
+#define GL_NV_fog_distance 1
+
+#define GL_FOG_DISTANCE_MODE_NV 0x855A
+#define GL_EYE_RADIAL_NV 0x855B
+#define GL_EYE_PLANE_ABSOLUTE_NV 0x855C
+
+#define GLEW_NV_fog_distance GLEW_GET_VAR(__GLEW_NV_fog_distance)
+
+#endif /* GL_NV_fog_distance */
+
+/* ------------------------- GL_NV_fragment_program ------------------------ */
+
+#ifndef GL_NV_fragment_program
+#define GL_NV_fragment_program 1
+
+#define GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV 0x8868
+#define GL_FRAGMENT_PROGRAM_NV 0x8870
+#define GL_MAX_TEXTURE_COORDS_NV 0x8871
+#define GL_MAX_TEXTURE_IMAGE_UNITS_NV 0x8872
+#define GL_FRAGMENT_PROGRAM_BINDING_NV 0x8873
+#define GL_PROGRAM_ERROR_STRING_NV 0x8874
+
+typedef void (GLAPIENTRY * PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC) (GLuint id, GLsizei len, const GLubyte* name, GLdouble *params);
+typedef void (GLAPIENTRY * PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC) (GLuint id, GLsizei len, const GLubyte* name, GLfloat *params);
+typedef void (GLAPIENTRY * PFNGLPROGRAMNAMEDPARAMETER4DNVPROC) (GLuint id, GLsizei len, const GLubyte* name, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (GLAPIENTRY * PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC) (GLuint id, GLsizei len, const GLubyte* name, const GLdouble v[]);
+typedef void (GLAPIENTRY * PFNGLPROGRAMNAMEDPARAMETER4FNVPROC) (GLuint id, GLsizei len, const GLubyte* name, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (GLAPIENTRY * PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC) (GLuint id, GLsizei len, const GLubyte* name, const GLfloat v[]);
+
+#define glGetProgramNamedParameterdvNV GLEW_GET_FUN(__glewGetProgramNamedParameterdvNV)
+#define glGetProgramNamedParameterfvNV GLEW_GET_FUN(__glewGetProgramNamedParameterfvNV)
+#define glProgramNamedParameter4dNV GLEW_GET_FUN(__glewProgramNamedParameter4dNV)
+#define glProgramNamedParameter4dvNV GLEW_GET_FUN(__glewProgramNamedParameter4dvNV)
+#define glProgramNamedParameter4fNV GLEW_GET_FUN(__glewProgramNamedParameter4fNV)
+#define glProgramNamedParameter4fvNV GLEW_GET_FUN(__glewProgramNamedParameter4fvNV)
+
+#define GLEW_NV_fragment_program GLEW_GET_VAR(__GLEW_NV_fragment_program)
+
+#endif /* GL_NV_fragment_program */
+
+/* ------------------------ GL_NV_fragment_program2 ------------------------ */
+
+#ifndef GL_NV_fragment_program2
+#define GL_NV_fragment_program2 1
+
+#define GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV 0x88F4
+#define GL_MAX_PROGRAM_CALL_DEPTH_NV 0x88F5
+#define GL_MAX_PROGRAM_IF_DEPTH_NV 0x88F6
+#define GL_MAX_PROGRAM_LOOP_DEPTH_NV 0x88F7
+#define GL_MAX_PROGRAM_LOOP_COUNT_NV 0x88F8
+
+#define GLEW_NV_fragment_program2 GLEW_GET_VAR(__GLEW_NV_fragment_program2)
+
+#endif /* GL_NV_fragment_program2 */
+
+/* --------------------- GL_NV_fragment_program_option --------------------- */
+
+#ifndef GL_NV_fragment_program_option
+#define GL_NV_fragment_program_option 1
+
+#define GLEW_NV_fragment_program_option GLEW_GET_VAR(__GLEW_NV_fragment_program_option)
+
+#endif /* GL_NV_fragment_program_option */
+
+/* ---------------------------- GL_NV_half_float --------------------------- */
+
+#ifndef GL_NV_half_float
+#define GL_NV_half_float 1
+
+#define GL_HALF_FLOAT_NV 0x140B
+
+typedef unsigned short GLhalf;
+
+typedef void (GLAPIENTRY * PFNGLCOLOR3HNVPROC) (GLhalf red, GLhalf green, GLhalf blue);
+typedef void (GLAPIENTRY * PFNGLCOLOR3HVNVPROC) (const GLhalf* v);
+typedef void (GLAPIENTRY * PFNGLCOLOR4HNVPROC) (GLhalf red, GLhalf green, GLhalf blue, GLhalf alpha);
+typedef void (GLAPIENTRY * PFNGLCOLOR4HVNVPROC) (const GLhalf* v);
+typedef void (GLAPIENTRY * PFNGLFOGCOORDHNVPROC) (GLhalf fog);
+typedef void (GLAPIENTRY * PFNGLFOGCOORDHVNVPROC) (const GLhalf* fog);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1HNVPROC) (GLenum target, GLhalf s);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1HVNVPROC) (GLenum target, const GLhalf* v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2HNVPROC) (GLenum target, GLhalf s, GLhalf t);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2HVNVPROC) (GLenum target, const GLhalf* v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3HNVPROC) (GLenum target, GLhalf s, GLhalf t, GLhalf r);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3HVNVPROC) (GLenum target, const GLhalf* v);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4HNVPROC) (GLenum target, GLhalf s, GLhalf t, GLhalf r, GLhalf q);
+typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4HVNVPROC) (GLenum target, const GLhalf* v);
+typedef void (GLAPIENTRY * PFNGLNORMAL3HNVPROC) (GLhalf nx, GLhalf ny, GLhalf nz);
+typedef void (GLAPIENTRY * PFNGLNORMAL3HVNVPROC) (const GLhalf* v);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3HNVPROC) (GLhalf red, GLhalf green, GLhalf blue);
+typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3HVNVPROC) (const GLhalf* v);
+typedef void (GLAPIENTRY * PFNGLTEXCOORD1HNVPROC) (GLhalf s);
+typedef void (GLAPIENTRY * PFNGLTEXCOORD1HVNVPROC) (const GLhalf* v);
+typedef void (GLAPIENTRY * PFNGLTEXCOORD2HNVPROC) (GLhalf s, GLhalf t);
+typedef void (GLAPIENTRY * PFNGLTEXCOORD2HVNVPROC) (const GLhalf* v);
+typedef void (GLAPIENTRY * PFNGLTEXCOORD3HNVPROC) (GLhalf s, GLhalf t, GLhalf r);
+typedef void (GLAPIENTRY * PFNGLTEXCOORD3HVNVPROC) (const GLhalf* v);
+typedef void (GLAPIENTRY * PFNGLTEXCOORD4HNVPROC) (GLhalf s, GLhalf t, GLhalf r, GLhalf q);
+typedef void (GLAPIENTRY * PFNGLTEXCOORD4HVNVPROC) (const GLhalf* v);
+typedef void (GLAPIENTRY * PFNGLVERTEX2HNVPROC) (GLhalf x, GLhalf y);
+typedef void (GLAPIENTRY * PFNGLVERTEX2HVNVPROC) (const GLhalf* v);
+typedef void (GLAPIENTRY * PFNGLVERTEX3HNVPROC) (GLhalf x, GLhalf y, GLhalf z);
+typedef void (GLAPIENTRY * PFNGLVERTEX3HVNVPROC) (const GLhalf* v);
+typedef void (GLAPIENTRY * PFNGLVERTEX4HNVPROC) (GLhalf x, GLhalf y, GLhalf z, GLhalf w);
+typedef void (GLAPIENTRY * PFNGLVERTEX4HVNVPROC) (const GLhalf* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1HNVPROC) (GLuint index, GLhalf x);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1HVNVPROC) (GLuint index, const GLhalf* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2HNVPROC) (GLuint index, GLhalf x, GLhalf y);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2HVNVPROC) (GLuint index, const GLhalf* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3HNVPROC) (GLuint index, GLhalf x, GLhalf y, GLhalf z);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3HVNVPROC) (GLuint index, const GLhalf* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4HNVPROC) (GLuint index, GLhalf x, GLhalf y, GLhalf z, GLhalf w);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4HVNVPROC) (GLuint index, const GLhalf* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS1HVNVPROC) (GLuint index, GLsizei n, const GLhalf* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS2HVNVPROC) (GLuint index, GLsizei n, const GLhalf* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS3HVNVPROC) (GLuint index, GLsizei n, const GLhalf* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS4HVNVPROC) (GLuint index, GLsizei n, const GLhalf* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXWEIGHTHNVPROC) (GLhalf weight);
+typedef void (GLAPIENTRY * PFNGLVERTEXWEIGHTHVNVPROC) (const GLhalf* weight);
+
+#define glColor3hNV GLEW_GET_FUN(__glewColor3hNV)
+#define glColor3hvNV GLEW_GET_FUN(__glewColor3hvNV)
+#define glColor4hNV GLEW_GET_FUN(__glewColor4hNV)
+#define glColor4hvNV GLEW_GET_FUN(__glewColor4hvNV)
+#define glFogCoordhNV GLEW_GET_FUN(__glewFogCoordhNV)
+#define glFogCoordhvNV GLEW_GET_FUN(__glewFogCoordhvNV)
+#define glMultiTexCoord1hNV GLEW_GET_FUN(__glewMultiTexCoord1hNV)
+#define glMultiTexCoord1hvNV GLEW_GET_FUN(__glewMultiTexCoord1hvNV)
+#define glMultiTexCoord2hNV GLEW_GET_FUN(__glewMultiTexCoord2hNV)
+#define glMultiTexCoord2hvNV GLEW_GET_FUN(__glewMultiTexCoord2hvNV)
+#define glMultiTexCoord3hNV GLEW_GET_FUN(__glewMultiTexCoord3hNV)
+#define glMultiTexCoord3hvNV GLEW_GET_FUN(__glewMultiTexCoord3hvNV)
+#define glMultiTexCoord4hNV GLEW_GET_FUN(__glewMultiTexCoord4hNV)
+#define glMultiTexCoord4hvNV GLEW_GET_FUN(__glewMultiTexCoord4hvNV)
+#define glNormal3hNV GLEW_GET_FUN(__glewNormal3hNV)
+#define glNormal3hvNV GLEW_GET_FUN(__glewNormal3hvNV)
+#define glSecondaryColor3hNV GLEW_GET_FUN(__glewSecondaryColor3hNV)
+#define glSecondaryColor3hvNV GLEW_GET_FUN(__glewSecondaryColor3hvNV)
+#define glTexCoord1hNV GLEW_GET_FUN(__glewTexCoord1hNV)
+#define glTexCoord1hvNV GLEW_GET_FUN(__glewTexCoord1hvNV)
+#define glTexCoord2hNV GLEW_GET_FUN(__glewTexCoord2hNV)
+#define glTexCoord2hvNV GLEW_GET_FUN(__glewTexCoord2hvNV)
+#define glTexCoord3hNV GLEW_GET_FUN(__glewTexCoord3hNV)
+#define glTexCoord3hvNV GLEW_GET_FUN(__glewTexCoord3hvNV)
+#define glTexCoord4hNV GLEW_GET_FUN(__glewTexCoord4hNV)
+#define glTexCoord4hvNV GLEW_GET_FUN(__glewTexCoord4hvNV)
+#define glVertex2hNV GLEW_GET_FUN(__glewVertex2hNV)
+#define glVertex2hvNV GLEW_GET_FUN(__glewVertex2hvNV)
+#define glVertex3hNV GLEW_GET_FUN(__glewVertex3hNV)
+#define glVertex3hvNV GLEW_GET_FUN(__glewVertex3hvNV)
+#define glVertex4hNV GLEW_GET_FUN(__glewVertex4hNV)
+#define glVertex4hvNV GLEW_GET_FUN(__glewVertex4hvNV)
+#define glVertexAttrib1hNV GLEW_GET_FUN(__glewVertexAttrib1hNV)
+#define glVertexAttrib1hvNV GLEW_GET_FUN(__glewVertexAttrib1hvNV)
+#define glVertexAttrib2hNV GLEW_GET_FUN(__glewVertexAttrib2hNV)
+#define glVertexAttrib2hvNV GLEW_GET_FUN(__glewVertexAttrib2hvNV)
+#define glVertexAttrib3hNV GLEW_GET_FUN(__glewVertexAttrib3hNV)
+#define glVertexAttrib3hvNV GLEW_GET_FUN(__glewVertexAttrib3hvNV)
+#define glVertexAttrib4hNV GLEW_GET_FUN(__glewVertexAttrib4hNV)
+#define glVertexAttrib4hvNV GLEW_GET_FUN(__glewVertexAttrib4hvNV)
+#define glVertexAttribs1hvNV GLEW_GET_FUN(__glewVertexAttribs1hvNV)
+#define glVertexAttribs2hvNV GLEW_GET_FUN(__glewVertexAttribs2hvNV)
+#define glVertexAttribs3hvNV GLEW_GET_FUN(__glewVertexAttribs3hvNV)
+#define glVertexAttribs4hvNV GLEW_GET_FUN(__glewVertexAttribs4hvNV)
+#define glVertexWeighthNV GLEW_GET_FUN(__glewVertexWeighthNV)
+#define glVertexWeighthvNV GLEW_GET_FUN(__glewVertexWeighthvNV)
+
+#define GLEW_NV_half_float GLEW_GET_VAR(__GLEW_NV_half_float)
+
+#endif /* GL_NV_half_float */
+
+/* ------------------------ GL_NV_light_max_exponent ----------------------- */
+
+#ifndef GL_NV_light_max_exponent
+#define GL_NV_light_max_exponent 1
+
+#define GL_MAX_SHININESS_NV 0x8504
+#define GL_MAX_SPOT_EXPONENT_NV 0x8505
+
+#define GLEW_NV_light_max_exponent GLEW_GET_VAR(__GLEW_NV_light_max_exponent)
+
+#endif /* GL_NV_light_max_exponent */
+
+/* --------------------- GL_NV_multisample_filter_hint --------------------- */
+
+#ifndef GL_NV_multisample_filter_hint
+#define GL_NV_multisample_filter_hint 1
+
+#define GL_MULTISAMPLE_FILTER_HINT_NV 0x8534
+
+#define GLEW_NV_multisample_filter_hint GLEW_GET_VAR(__GLEW_NV_multisample_filter_hint)
+
+#endif /* GL_NV_multisample_filter_hint */
+
+/* ------------------------- GL_NV_occlusion_query ------------------------- */
+
+#ifndef GL_NV_occlusion_query
+#define GL_NV_occlusion_query 1
+
+#define GL_PIXEL_COUNTER_BITS_NV 0x8864
+#define GL_CURRENT_OCCLUSION_QUERY_ID_NV 0x8865
+#define GL_PIXEL_COUNT_NV 0x8866
+#define GL_PIXEL_COUNT_AVAILABLE_NV 0x8867
+
+typedef void (GLAPIENTRY * PFNGLBEGINOCCLUSIONQUERYNVPROC) (GLuint id);
+typedef void (GLAPIENTRY * PFNGLDELETEOCCLUSIONQUERIESNVPROC) (GLsizei n, const GLuint* ids);
+typedef void (GLAPIENTRY * PFNGLENDOCCLUSIONQUERYNVPROC) (void);
+typedef void (GLAPIENTRY * PFNGLGENOCCLUSIONQUERIESNVPROC) (GLsizei n, GLuint* ids);
+typedef void (GLAPIENTRY * PFNGLGETOCCLUSIONQUERYIVNVPROC) (GLuint id, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETOCCLUSIONQUERYUIVNVPROC) (GLuint id, GLenum pname, GLuint* params);
+typedef GLboolean (GLAPIENTRY * PFNGLISOCCLUSIONQUERYNVPROC) (GLuint id);
+
+#define glBeginOcclusionQueryNV GLEW_GET_FUN(__glewBeginOcclusionQueryNV)
+#define glDeleteOcclusionQueriesNV GLEW_GET_FUN(__glewDeleteOcclusionQueriesNV)
+#define glEndOcclusionQueryNV GLEW_GET_FUN(__glewEndOcclusionQueryNV)
+#define glGenOcclusionQueriesNV GLEW_GET_FUN(__glewGenOcclusionQueriesNV)
+#define glGetOcclusionQueryivNV GLEW_GET_FUN(__glewGetOcclusionQueryivNV)
+#define glGetOcclusionQueryuivNV GLEW_GET_FUN(__glewGetOcclusionQueryuivNV)
+#define glIsOcclusionQueryNV GLEW_GET_FUN(__glewIsOcclusionQueryNV)
+
+#define GLEW_NV_occlusion_query GLEW_GET_VAR(__GLEW_NV_occlusion_query)
+
+#endif /* GL_NV_occlusion_query */
+
+/* ----------------------- GL_NV_packed_depth_stencil ---------------------- */
+
+#ifndef GL_NV_packed_depth_stencil
+#define GL_NV_packed_depth_stencil 1
+
+#define GL_DEPTH_STENCIL_NV 0x84F9
+#define GL_UNSIGNED_INT_24_8_NV 0x84FA
+
+#define GLEW_NV_packed_depth_stencil GLEW_GET_VAR(__GLEW_NV_packed_depth_stencil)
+
+#endif /* GL_NV_packed_depth_stencil */
+
+/* ------------------------- GL_NV_pixel_data_range ------------------------ */
+
+#ifndef GL_NV_pixel_data_range
+#define GL_NV_pixel_data_range 1
+
+#define GL_WRITE_PIXEL_DATA_RANGE_NV 0x8878
+#define GL_READ_PIXEL_DATA_RANGE_NV 0x8879
+#define GL_WRITE_PIXEL_DATA_RANGE_LENGTH_NV 0x887A
+#define GL_READ_PIXEL_DATA_RANGE_LENGTH_NV 0x887B
+#define GL_WRITE_PIXEL_DATA_RANGE_POINTER_NV 0x887C
+#define GL_READ_PIXEL_DATA_RANGE_POINTER_NV 0x887D
+
+typedef void (GLAPIENTRY * PFNGLFLUSHPIXELDATARANGENVPROC) (GLenum target);
+typedef void (GLAPIENTRY * PFNGLPIXELDATARANGENVPROC) (GLenum target, GLsizei length, void* pointer);
+
+#define glFlushPixelDataRangeNV GLEW_GET_FUN(__glewFlushPixelDataRangeNV)
+#define glPixelDataRangeNV GLEW_GET_FUN(__glewPixelDataRangeNV)
+
+#define GLEW_NV_pixel_data_range GLEW_GET_VAR(__GLEW_NV_pixel_data_range)
+
+#endif /* GL_NV_pixel_data_range */
+
+/* --------------------------- GL_NV_point_sprite -------------------------- */
+
+#ifndef GL_NV_point_sprite
+#define GL_NV_point_sprite 1
+
+#define GL_POINT_SPRITE_NV 0x8861
+#define GL_COORD_REPLACE_NV 0x8862
+#define GL_POINT_SPRITE_R_MODE_NV 0x8863
+
+typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERINVPROC) (GLenum pname, GLint param);
+typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERIVNVPROC) (GLenum pname, const GLint* params);
+
+#define glPointParameteriNV GLEW_GET_FUN(__glewPointParameteriNV)
+#define glPointParameterivNV GLEW_GET_FUN(__glewPointParameterivNV)
+
+#define GLEW_NV_point_sprite GLEW_GET_VAR(__GLEW_NV_point_sprite)
+
+#endif /* GL_NV_point_sprite */
+
+/* ------------------------ GL_NV_primitive_restart ------------------------ */
+
+#ifndef GL_NV_primitive_restart
+#define GL_NV_primitive_restart 1
+
+#define GL_PRIMITIVE_RESTART_NV 0x8558
+#define GL_PRIMITIVE_RESTART_INDEX_NV 0x8559
+
+typedef void (GLAPIENTRY * PFNGLPRIMITIVERESTARTINDEXNVPROC) (GLuint index);
+typedef void (GLAPIENTRY * PFNGLPRIMITIVERESTARTNVPROC) (void);
+
+#define glPrimitiveRestartIndexNV GLEW_GET_FUN(__glewPrimitiveRestartIndexNV)
+#define glPrimitiveRestartNV GLEW_GET_FUN(__glewPrimitiveRestartNV)
+
+#define GLEW_NV_primitive_restart GLEW_GET_VAR(__GLEW_NV_primitive_restart)
+
+#endif /* GL_NV_primitive_restart */
+
+/* ------------------------ GL_NV_register_combiners ----------------------- */
+
+#ifndef GL_NV_register_combiners
+#define GL_NV_register_combiners 1
+
+#define GL_REGISTER_COMBINERS_NV 0x8522
+#define GL_VARIABLE_A_NV 0x8523
+#define GL_VARIABLE_B_NV 0x8524
+#define GL_VARIABLE_C_NV 0x8525
+#define GL_VARIABLE_D_NV 0x8526
+#define GL_VARIABLE_E_NV 0x8527
+#define GL_VARIABLE_F_NV 0x8528
+#define GL_VARIABLE_G_NV 0x8529
+#define GL_CONSTANT_COLOR0_NV 0x852A
+#define GL_CONSTANT_COLOR1_NV 0x852B
+#define GL_PRIMARY_COLOR_NV 0x852C
+#define GL_SECONDARY_COLOR_NV 0x852D
+#define GL_SPARE0_NV 0x852E
+#define GL_SPARE1_NV 0x852F
+#define GL_DISCARD_NV 0x8530
+#define GL_E_TIMES_F_NV 0x8531
+#define GL_SPARE0_PLUS_SECONDARY_COLOR_NV 0x8532
+#define GL_UNSIGNED_IDENTITY_NV 0x8536
+#define GL_UNSIGNED_INVERT_NV 0x8537
+#define GL_EXPAND_NORMAL_NV 0x8538
+#define GL_EXPAND_NEGATE_NV 0x8539
+#define GL_HALF_BIAS_NORMAL_NV 0x853A
+#define GL_HALF_BIAS_NEGATE_NV 0x853B
+#define GL_SIGNED_IDENTITY_NV 0x853C
+#define GL_SIGNED_NEGATE_NV 0x853D
+#define GL_SCALE_BY_TWO_NV 0x853E
+#define GL_SCALE_BY_FOUR_NV 0x853F
+#define GL_SCALE_BY_ONE_HALF_NV 0x8540
+#define GL_BIAS_BY_NEGATIVE_ONE_HALF_NV 0x8541
+#define GL_COMBINER_INPUT_NV 0x8542
+#define GL_COMBINER_MAPPING_NV 0x8543
+#define GL_COMBINER_COMPONENT_USAGE_NV 0x8544
+#define GL_COMBINER_AB_DOT_PRODUCT_NV 0x8545
+#define GL_COMBINER_CD_DOT_PRODUCT_NV 0x8546
+#define GL_COMBINER_MUX_SUM_NV 0x8547
+#define GL_COMBINER_SCALE_NV 0x8548
+#define GL_COMBINER_BIAS_NV 0x8549
+#define GL_COMBINER_AB_OUTPUT_NV 0x854A
+#define GL_COMBINER_CD_OUTPUT_NV 0x854B
+#define GL_COMBINER_SUM_OUTPUT_NV 0x854C
+#define GL_MAX_GENERAL_COMBINERS_NV 0x854D
+#define GL_NUM_GENERAL_COMBINERS_NV 0x854E
+#define GL_COLOR_SUM_CLAMP_NV 0x854F
+#define GL_COMBINER0_NV 0x8550
+#define GL_COMBINER1_NV 0x8551
+#define GL_COMBINER2_NV 0x8552
+#define GL_COMBINER3_NV 0x8553
+#define GL_COMBINER4_NV 0x8554
+#define GL_COMBINER5_NV 0x8555
+#define GL_COMBINER6_NV 0x8556
+#define GL_COMBINER7_NV 0x8557
+
+typedef void (GLAPIENTRY * PFNGLCOMBINERINPUTNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
+typedef void (GLAPIENTRY * PFNGLCOMBINEROUTPUTNVPROC) (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum);
+typedef void (GLAPIENTRY * PFNGLCOMBINERPARAMETERFNVPROC) (GLenum pname, GLfloat param);
+typedef void (GLAPIENTRY * PFNGLCOMBINERPARAMETERFVNVPROC) (GLenum pname, const GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLCOMBINERPARAMETERINVPROC) (GLenum pname, GLint param);
+typedef void (GLAPIENTRY * PFNGLCOMBINERPARAMETERIVNVPROC) (GLenum pname, const GLint* params);
+typedef void (GLAPIENTRY * PFNGLFINALCOMBINERINPUTNVPROC) (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
+typedef void (GLAPIENTRY * PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC) (GLenum variable, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC) (GLenum variable, GLenum pname, GLint* params);
+
+#define glCombinerInputNV GLEW_GET_FUN(__glewCombinerInputNV)
+#define glCombinerOutputNV GLEW_GET_FUN(__glewCombinerOutputNV)
+#define glCombinerParameterfNV GLEW_GET_FUN(__glewCombinerParameterfNV)
+#define glCombinerParameterfvNV GLEW_GET_FUN(__glewCombinerParameterfvNV)
+#define glCombinerParameteriNV GLEW_GET_FUN(__glewCombinerParameteriNV)
+#define glCombinerParameterivNV GLEW_GET_FUN(__glewCombinerParameterivNV)
+#define glFinalCombinerInputNV GLEW_GET_FUN(__glewFinalCombinerInputNV)
+#define glGetCombinerInputParameterfvNV GLEW_GET_FUN(__glewGetCombinerInputParameterfvNV)
+#define glGetCombinerInputParameterivNV GLEW_GET_FUN(__glewGetCombinerInputParameterivNV)
+#define glGetCombinerOutputParameterfvNV GLEW_GET_FUN(__glewGetCombinerOutputParameterfvNV)
+#define glGetCombinerOutputParameterivNV GLEW_GET_FUN(__glewGetCombinerOutputParameterivNV)
+#define glGetFinalCombinerInputParameterfvNV GLEW_GET_FUN(__glewGetFinalCombinerInputParameterfvNV)
+#define glGetFinalCombinerInputParameterivNV GLEW_GET_FUN(__glewGetFinalCombinerInputParameterivNV)
+
+#define GLEW_NV_register_combiners GLEW_GET_VAR(__GLEW_NV_register_combiners)
+
+#endif /* GL_NV_register_combiners */
+
+/* ----------------------- GL_NV_register_combiners2 ----------------------- */
+
+#ifndef GL_NV_register_combiners2
+#define GL_NV_register_combiners2 1
+
+#define GL_PER_STAGE_CONSTANTS_NV 0x8535
+
+typedef void (GLAPIENTRY * PFNGLCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, const GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, GLfloat* params);
+
+#define glCombinerStageParameterfvNV GLEW_GET_FUN(__glewCombinerStageParameterfvNV)
+#define glGetCombinerStageParameterfvNV GLEW_GET_FUN(__glewGetCombinerStageParameterfvNV)
+
+#define GLEW_NV_register_combiners2 GLEW_GET_VAR(__GLEW_NV_register_combiners2)
+
+#endif /* GL_NV_register_combiners2 */
+
+/* -------------------------- GL_NV_texgen_emboss -------------------------- */
+
+#ifndef GL_NV_texgen_emboss
+#define GL_NV_texgen_emboss 1
+
+#define GL_EMBOSS_LIGHT_NV 0x855D
+#define GL_EMBOSS_CONSTANT_NV 0x855E
+#define GL_EMBOSS_MAP_NV 0x855F
+
+#define GLEW_NV_texgen_emboss GLEW_GET_VAR(__GLEW_NV_texgen_emboss)
+
+#endif /* GL_NV_texgen_emboss */
+
+/* ------------------------ GL_NV_texgen_reflection ------------------------ */
+
+#ifndef GL_NV_texgen_reflection
+#define GL_NV_texgen_reflection 1
+
+#define GL_NORMAL_MAP_NV 0x8511
+#define GL_REFLECTION_MAP_NV 0x8512
+
+#define GLEW_NV_texgen_reflection GLEW_GET_VAR(__GLEW_NV_texgen_reflection)
+
+#endif /* GL_NV_texgen_reflection */
+
+/* --------------------- GL_NV_texture_compression_vtc --------------------- */
+
+#ifndef GL_NV_texture_compression_vtc
+#define GL_NV_texture_compression_vtc 1
+
+#define GLEW_NV_texture_compression_vtc GLEW_GET_VAR(__GLEW_NV_texture_compression_vtc)
+
+#endif /* GL_NV_texture_compression_vtc */
+
+/* ----------------------- GL_NV_texture_env_combine4 ---------------------- */
+
+#ifndef GL_NV_texture_env_combine4
+#define GL_NV_texture_env_combine4 1
+
+#define GL_COMBINE4_NV 0x8503
+#define GL_SOURCE3_RGB_NV 0x8583
+#define GL_SOURCE3_ALPHA_NV 0x858B
+#define GL_OPERAND3_RGB_NV 0x8593
+#define GL_OPERAND3_ALPHA_NV 0x859B
+
+#define GLEW_NV_texture_env_combine4 GLEW_GET_VAR(__GLEW_NV_texture_env_combine4)
+
+#endif /* GL_NV_texture_env_combine4 */
+
+/* ---------------------- GL_NV_texture_expand_normal ---------------------- */
+
+#ifndef GL_NV_texture_expand_normal
+#define GL_NV_texture_expand_normal 1
+
+#define GL_TEXTURE_UNSIGNED_REMAP_MODE_NV 0x888F
+
+#define GLEW_NV_texture_expand_normal GLEW_GET_VAR(__GLEW_NV_texture_expand_normal)
+
+#endif /* GL_NV_texture_expand_normal */
+
+/* ------------------------ GL_NV_texture_rectangle ------------------------ */
+
+#ifndef GL_NV_texture_rectangle
+#define GL_NV_texture_rectangle 1
+
+#define GL_TEXTURE_RECTANGLE_NV 0x84F5
+#define GL_TEXTURE_BINDING_RECTANGLE_NV 0x84F6
+#define GL_PROXY_TEXTURE_RECTANGLE_NV 0x84F7
+#define GL_MAX_RECTANGLE_TEXTURE_SIZE_NV 0x84F8
+
+#define GLEW_NV_texture_rectangle GLEW_GET_VAR(__GLEW_NV_texture_rectangle)
+
+#endif /* GL_NV_texture_rectangle */
+
+/* -------------------------- GL_NV_texture_shader ------------------------- */
+
+#ifndef GL_NV_texture_shader
+#define GL_NV_texture_shader 1
+
+#define GL_OFFSET_TEXTURE_RECTANGLE_NV 0x864C
+#define GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV 0x864D
+#define GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV 0x864E
+#define GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV 0x86D9
+#define GL_UNSIGNED_INT_S8_S8_8_8_NV 0x86DA
+#define GL_UNSIGNED_INT_8_8_S8_S8_REV_NV 0x86DB
+#define GL_DSDT_MAG_INTENSITY_NV 0x86DC
+#define GL_SHADER_CONSISTENT_NV 0x86DD
+#define GL_TEXTURE_SHADER_NV 0x86DE
+#define GL_SHADER_OPERATION_NV 0x86DF
+#define GL_CULL_MODES_NV 0x86E0
+#define GL_OFFSET_TEXTURE_MATRIX_NV 0x86E1
+#define GL_OFFSET_TEXTURE_SCALE_NV 0x86E2
+#define GL_OFFSET_TEXTURE_BIAS_NV 0x86E3
+#define GL_PREVIOUS_TEXTURE_INPUT_NV 0x86E4
+#define GL_CONST_EYE_NV 0x86E5
+#define GL_PASS_THROUGH_NV 0x86E6
+#define GL_CULL_FRAGMENT_NV 0x86E7
+#define GL_OFFSET_TEXTURE_2D_NV 0x86E8
+#define GL_DEPENDENT_AR_TEXTURE_2D_NV 0x86E9
+#define GL_DEPENDENT_GB_TEXTURE_2D_NV 0x86EA
+#define GL_DOT_PRODUCT_NV 0x86EC
+#define GL_DOT_PRODUCT_DEPTH_REPLACE_NV 0x86ED
+#define GL_DOT_PRODUCT_TEXTURE_2D_NV 0x86EE
+#define GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV 0x86F0
+#define GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV 0x86F1
+#define GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV 0x86F2
+#define GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV 0x86F3
+#define GL_HILO_NV 0x86F4
+#define GL_DSDT_NV 0x86F5
+#define GL_DSDT_MAG_NV 0x86F6
+#define GL_DSDT_MAG_VIB_NV 0x86F7
+#define GL_HILO16_NV 0x86F8
+#define GL_SIGNED_HILO_NV 0x86F9
+#define GL_SIGNED_HILO16_NV 0x86FA
+#define GL_SIGNED_RGBA_NV 0x86FB
+#define GL_SIGNED_RGBA8_NV 0x86FC
+#define GL_SIGNED_RGB_NV 0x86FE
+#define GL_SIGNED_RGB8_NV 0x86FF
+#define GL_SIGNED_LUMINANCE_NV 0x8701
+#define GL_SIGNED_LUMINANCE8_NV 0x8702
+#define GL_SIGNED_LUMINANCE_ALPHA_NV 0x8703
+#define GL_SIGNED_LUMINANCE8_ALPHA8_NV 0x8704
+#define GL_SIGNED_ALPHA_NV 0x8705
+#define GL_SIGNED_ALPHA8_NV 0x8706
+#define GL_SIGNED_INTENSITY_NV 0x8707
+#define GL_SIGNED_INTENSITY8_NV 0x8708
+#define GL_DSDT8_NV 0x8709
+#define GL_DSDT8_MAG8_NV 0x870A
+#define GL_DSDT8_MAG8_INTENSITY8_NV 0x870B
+#define GL_SIGNED_RGB_UNSIGNED_ALPHA_NV 0x870C
+#define GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV 0x870D
+#define GL_HI_SCALE_NV 0x870E
+#define GL_LO_SCALE_NV 0x870F
+#define GL_DS_SCALE_NV 0x8710
+#define GL_DT_SCALE_NV 0x8711
+#define GL_MAGNITUDE_SCALE_NV 0x8712
+#define GL_VIBRANCE_SCALE_NV 0x8713
+#define GL_HI_BIAS_NV 0x8714
+#define GL_LO_BIAS_NV 0x8715
+#define GL_DS_BIAS_NV 0x8716
+#define GL_DT_BIAS_NV 0x8717
+#define GL_MAGNITUDE_BIAS_NV 0x8718
+#define GL_VIBRANCE_BIAS_NV 0x8719
+#define GL_TEXTURE_BORDER_VALUES_NV 0x871A
+#define GL_TEXTURE_HI_SIZE_NV 0x871B
+#define GL_TEXTURE_LO_SIZE_NV 0x871C
+#define GL_TEXTURE_DS_SIZE_NV 0x871D
+#define GL_TEXTURE_DT_SIZE_NV 0x871E
+#define GL_TEXTURE_MAG_SIZE_NV 0x871F
+
+#define GLEW_NV_texture_shader GLEW_GET_VAR(__GLEW_NV_texture_shader)
+
+#endif /* GL_NV_texture_shader */
+
+/* ------------------------- GL_NV_texture_shader2 ------------------------- */
+
+#ifndef GL_NV_texture_shader2
+#define GL_NV_texture_shader2 1
+
+#define GL_UNSIGNED_INT_S8_S8_8_8_NV 0x86DA
+#define GL_UNSIGNED_INT_8_8_S8_S8_REV_NV 0x86DB
+#define GL_DSDT_MAG_INTENSITY_NV 0x86DC
+#define GL_DOT_PRODUCT_TEXTURE_3D_NV 0x86EF
+#define GL_HILO_NV 0x86F4
+#define GL_DSDT_NV 0x86F5
+#define GL_DSDT_MAG_NV 0x86F6
+#define GL_DSDT_MAG_VIB_NV 0x86F7
+#define GL_HILO16_NV 0x86F8
+#define GL_SIGNED_HILO_NV 0x86F9
+#define GL_SIGNED_HILO16_NV 0x86FA
+#define GL_SIGNED_RGBA_NV 0x86FB
+#define GL_SIGNED_RGBA8_NV 0x86FC
+#define GL_SIGNED_RGB_NV 0x86FE
+#define GL_SIGNED_RGB8_NV 0x86FF
+#define GL_SIGNED_LUMINANCE_NV 0x8701
+#define GL_SIGNED_LUMINANCE8_NV 0x8702
+#define GL_SIGNED_LUMINANCE_ALPHA_NV 0x8703
+#define GL_SIGNED_LUMINANCE8_ALPHA8_NV 0x8704
+#define GL_SIGNED_ALPHA_NV 0x8705
+#define GL_SIGNED_ALPHA8_NV 0x8706
+#define GL_SIGNED_INTENSITY_NV 0x8707
+#define GL_SIGNED_INTENSITY8_NV 0x8708
+#define GL_DSDT8_NV 0x8709
+#define GL_DSDT8_MAG8_NV 0x870A
+#define GL_DSDT8_MAG8_INTENSITY8_NV 0x870B
+#define GL_SIGNED_RGB_UNSIGNED_ALPHA_NV 0x870C
+#define GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV 0x870D
+
+#define GLEW_NV_texture_shader2 GLEW_GET_VAR(__GLEW_NV_texture_shader2)
+
+#endif /* GL_NV_texture_shader2 */
+
+/* ------------------------- GL_NV_texture_shader3 ------------------------- */
+
+#ifndef GL_NV_texture_shader3
+#define GL_NV_texture_shader3 1
+
+#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_NV 0x8850
+#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV 0x8851
+#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8852
+#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV 0x8853
+#define GL_OFFSET_HILO_TEXTURE_2D_NV 0x8854
+#define GL_OFFSET_HILO_TEXTURE_RECTANGLE_NV 0x8855
+#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV 0x8856
+#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8857
+#define GL_DEPENDENT_HILO_TEXTURE_2D_NV 0x8858
+#define GL_DEPENDENT_RGB_TEXTURE_3D_NV 0x8859
+#define GL_DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV 0x885A
+#define GL_DOT_PRODUCT_PASS_THROUGH_NV 0x885B
+#define GL_DOT_PRODUCT_TEXTURE_1D_NV 0x885C
+#define GL_DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV 0x885D
+#define GL_HILO8_NV 0x885E
+#define GL_SIGNED_HILO8_NV 0x885F
+#define GL_FORCE_BLUE_TO_ONE_NV 0x8860
+
+#define GLEW_NV_texture_shader3 GLEW_GET_VAR(__GLEW_NV_texture_shader3)
+
+#endif /* GL_NV_texture_shader3 */
+
+/* ------------------------ GL_NV_vertex_array_range ----------------------- */
+
+#ifndef GL_NV_vertex_array_range
+#define GL_NV_vertex_array_range 1
+
+#define GL_VERTEX_ARRAY_RANGE_NV 0x851D
+#define GL_VERTEX_ARRAY_RANGE_LENGTH_NV 0x851E
+#define GL_VERTEX_ARRAY_RANGE_VALID_NV 0x851F
+#define GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV 0x8520
+#define GL_VERTEX_ARRAY_RANGE_POINTER_NV 0x8521
+
+typedef void (GLAPIENTRY * PFNGLFLUSHVERTEXARRAYRANGENVPROC) (void);
+typedef void (GLAPIENTRY * PFNGLVERTEXARRAYRANGENVPROC) (GLsizei length, void* pointer);
+
+#define glFlushVertexArrayRangeNV GLEW_GET_FUN(__glewFlushVertexArrayRangeNV)
+#define glVertexArrayRangeNV GLEW_GET_FUN(__glewVertexArrayRangeNV)
+
+#define GLEW_NV_vertex_array_range GLEW_GET_VAR(__GLEW_NV_vertex_array_range)
+
+#endif /* GL_NV_vertex_array_range */
+
+/* ----------------------- GL_NV_vertex_array_range2 ----------------------- */
+
+#ifndef GL_NV_vertex_array_range2
+#define GL_NV_vertex_array_range2 1
+
+#define GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV 0x8533
+
+#define GLEW_NV_vertex_array_range2 GLEW_GET_VAR(__GLEW_NV_vertex_array_range2)
+
+#endif /* GL_NV_vertex_array_range2 */
+
+/* -------------------------- GL_NV_vertex_program ------------------------- */
+
+#ifndef GL_NV_vertex_program
+#define GL_NV_vertex_program 1
+
+#define GL_VERTEX_PROGRAM_NV 0x8620
+#define GL_VERTEX_STATE_PROGRAM_NV 0x8621
+#define GL_ATTRIB_ARRAY_SIZE_NV 0x8623
+#define GL_ATTRIB_ARRAY_STRIDE_NV 0x8624
+#define GL_ATTRIB_ARRAY_TYPE_NV 0x8625
+#define GL_CURRENT_ATTRIB_NV 0x8626
+#define GL_PROGRAM_LENGTH_NV 0x8627
+#define GL_PROGRAM_STRING_NV 0x8628
+#define GL_MODELVIEW_PROJECTION_NV 0x8629
+#define GL_IDENTITY_NV 0x862A
+#define GL_INVERSE_NV 0x862B
+#define GL_TRANSPOSE_NV 0x862C
+#define GL_INVERSE_TRANSPOSE_NV 0x862D
+#define GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV 0x862E
+#define GL_MAX_TRACK_MATRICES_NV 0x862F
+#define GL_MATRIX0_NV 0x8630
+#define GL_MATRIX1_NV 0x8631
+#define GL_MATRIX2_NV 0x8632
+#define GL_MATRIX3_NV 0x8633
+#define GL_MATRIX4_NV 0x8634
+#define GL_MATRIX5_NV 0x8635
+#define GL_MATRIX6_NV 0x8636
+#define GL_MATRIX7_NV 0x8637
+#define GL_CURRENT_MATRIX_STACK_DEPTH_NV 0x8640
+#define GL_CURRENT_MATRIX_NV 0x8641
+#define GL_VERTEX_PROGRAM_POINT_SIZE_NV 0x8642
+#define GL_VERTEX_PROGRAM_TWO_SIDE_NV 0x8643
+#define GL_PROGRAM_PARAMETER_NV 0x8644
+#define GL_ATTRIB_ARRAY_POINTER_NV 0x8645
+#define GL_PROGRAM_TARGET_NV 0x8646
+#define GL_PROGRAM_RESIDENT_NV 0x8647
+#define GL_TRACK_MATRIX_NV 0x8648
+#define GL_TRACK_MATRIX_TRANSFORM_NV 0x8649
+#define GL_VERTEX_PROGRAM_BINDING_NV 0x864A
+#define GL_PROGRAM_ERROR_POSITION_NV 0x864B
+#define GL_VERTEX_ATTRIB_ARRAY0_NV 0x8650
+#define GL_VERTEX_ATTRIB_ARRAY1_NV 0x8651
+#define GL_VERTEX_ATTRIB_ARRAY2_NV 0x8652
+#define GL_VERTEX_ATTRIB_ARRAY3_NV 0x8653
+#define GL_VERTEX_ATTRIB_ARRAY4_NV 0x8654
+#define GL_VERTEX_ATTRIB_ARRAY5_NV 0x8655
+#define GL_VERTEX_ATTRIB_ARRAY6_NV 0x8656
+#define GL_VERTEX_ATTRIB_ARRAY7_NV 0x8657
+#define GL_VERTEX_ATTRIB_ARRAY8_NV 0x8658
+#define GL_VERTEX_ATTRIB_ARRAY9_NV 0x8659
+#define GL_VERTEX_ATTRIB_ARRAY10_NV 0x865A
+#define GL_VERTEX_ATTRIB_ARRAY11_NV 0x865B
+#define GL_VERTEX_ATTRIB_ARRAY12_NV 0x865C
+#define GL_VERTEX_ATTRIB_ARRAY13_NV 0x865D
+#define GL_VERTEX_ATTRIB_ARRAY14_NV 0x865E
+#define GL_VERTEX_ATTRIB_ARRAY15_NV 0x865F
+#define GL_MAP1_VERTEX_ATTRIB0_4_NV 0x8660
+#define GL_MAP1_VERTEX_ATTRIB1_4_NV 0x8661
+#define GL_MAP1_VERTEX_ATTRIB2_4_NV 0x8662
+#define GL_MAP1_VERTEX_ATTRIB3_4_NV 0x8663
+#define GL_MAP1_VERTEX_ATTRIB4_4_NV 0x8664
+#define GL_MAP1_VERTEX_ATTRIB5_4_NV 0x8665
+#define GL_MAP1_VERTEX_ATTRIB6_4_NV 0x8666
+#define GL_MAP1_VERTEX_ATTRIB7_4_NV 0x8667
+#define GL_MAP1_VERTEX_ATTRIB8_4_NV 0x8668
+#define GL_MAP1_VERTEX_ATTRIB9_4_NV 0x8669
+#define GL_MAP1_VERTEX_ATTRIB10_4_NV 0x866A
+#define GL_MAP1_VERTEX_ATTRIB11_4_NV 0x866B
+#define GL_MAP1_VERTEX_ATTRIB12_4_NV 0x866C
+#define GL_MAP1_VERTEX_ATTRIB13_4_NV 0x866D
+#define GL_MAP1_VERTEX_ATTRIB14_4_NV 0x866E
+#define GL_MAP1_VERTEX_ATTRIB15_4_NV 0x866F
+#define GL_MAP2_VERTEX_ATTRIB0_4_NV 0x8670
+#define GL_MAP2_VERTEX_ATTRIB1_4_NV 0x8671
+#define GL_MAP2_VERTEX_ATTRIB2_4_NV 0x8672
+#define GL_MAP2_VERTEX_ATTRIB3_4_NV 0x8673
+#define GL_MAP2_VERTEX_ATTRIB4_4_NV 0x8674
+#define GL_MAP2_VERTEX_ATTRIB5_4_NV 0x8675
+#define GL_MAP2_VERTEX_ATTRIB6_4_NV 0x8676
+#define GL_MAP2_VERTEX_ATTRIB7_4_NV 0x8677
+#define GL_MAP2_VERTEX_ATTRIB8_4_NV 0x8678
+#define GL_MAP2_VERTEX_ATTRIB9_4_NV 0x8679
+#define GL_MAP2_VERTEX_ATTRIB10_4_NV 0x867A
+#define GL_MAP2_VERTEX_ATTRIB11_4_NV 0x867B
+#define GL_MAP2_VERTEX_ATTRIB12_4_NV 0x867C
+#define GL_MAP2_VERTEX_ATTRIB13_4_NV 0x867D
+#define GL_MAP2_VERTEX_ATTRIB14_4_NV 0x867E
+#define GL_MAP2_VERTEX_ATTRIB15_4_NV 0x867F
+
+typedef GLboolean (GLAPIENTRY * PFNGLAREPROGRAMSRESIDENTNVPROC) (GLsizei n, const GLuint* ids, GLboolean *residences);
+typedef void (GLAPIENTRY * PFNGLBINDPROGRAMNVPROC) (GLenum target, GLuint id);
+typedef void (GLAPIENTRY * PFNGLDELETEPROGRAMSNVPROC) (GLsizei n, const GLuint* ids);
+typedef void (GLAPIENTRY * PFNGLEXECUTEPROGRAMNVPROC) (GLenum target, GLuint id, const GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGENPROGRAMSNVPROC) (GLsizei n, GLuint* ids);
+typedef void (GLAPIENTRY * PFNGLGETPROGRAMPARAMETERDVNVPROC) (GLenum target, GLuint index, GLenum pname, GLdouble* params);
+typedef void (GLAPIENTRY * PFNGLGETPROGRAMPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETPROGRAMSTRINGNVPROC) (GLuint id, GLenum pname, GLubyte* program);
+typedef void (GLAPIENTRY * PFNGLGETPROGRAMIVNVPROC) (GLuint id, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETTRACKMATRIXIVNVPROC) (GLenum target, GLuint address, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBPOINTERVNVPROC) (GLuint index, GLenum pname, GLvoid** pointer);
+typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBDVNVPROC) (GLuint index, GLenum pname, GLdouble* params);
+typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBFVNVPROC) (GLuint index, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBIVNVPROC) (GLuint index, GLenum pname, GLint* params);
+typedef GLboolean (GLAPIENTRY * PFNGLISPROGRAMNVPROC) (GLuint id);
+typedef void (GLAPIENTRY * PFNGLLOADPROGRAMNVPROC) (GLenum target, GLuint id, GLsizei len, const GLubyte* program);
+typedef void (GLAPIENTRY * PFNGLPROGRAMPARAMETER4DNVPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (GLAPIENTRY * PFNGLPROGRAMPARAMETER4DVNVPROC) (GLenum target, GLuint index, const GLdouble* params);
+typedef void (GLAPIENTRY * PFNGLPROGRAMPARAMETER4FNVPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (GLAPIENTRY * PFNGLPROGRAMPARAMETER4FVNVPROC) (GLenum target, GLuint index, const GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLPROGRAMPARAMETERS4DVNVPROC) (GLenum target, GLuint index, GLuint num, const GLdouble* params);
+typedef void (GLAPIENTRY * PFNGLPROGRAMPARAMETERS4FVNVPROC) (GLenum target, GLuint index, GLuint num, const GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLREQUESTRESIDENTPROGRAMSNVPROC) (GLsizei n, GLuint* ids);
+typedef void (GLAPIENTRY * PFNGLTRACKMATRIXNVPROC) (GLenum target, GLuint address, GLenum matrix, GLenum transform);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1DNVPROC) (GLuint index, GLdouble x);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1DVNVPROC) (GLuint index, const GLdouble* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1FNVPROC) (GLuint index, GLfloat x);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1FVNVPROC) (GLuint index, const GLfloat* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1SNVPROC) (GLuint index, GLshort x);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1SVNVPROC) (GLuint index, const GLshort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2DNVPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2DVNVPROC) (GLuint index, const GLdouble* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2FNVPROC) (GLuint index, GLfloat x, GLfloat y);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2FVNVPROC) (GLuint index, const GLfloat* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2SNVPROC) (GLuint index, GLshort x, GLshort y);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2SVNVPROC) (GLuint index, const GLshort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3DVNVPROC) (GLuint index, const GLdouble* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3FVNVPROC) (GLuint index, const GLfloat* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3SVNVPROC) (GLuint index, const GLshort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4DVNVPROC) (GLuint index, const GLdouble* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4FVNVPROC) (GLuint index, const GLfloat* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4SVNVPROC) (GLuint index, const GLshort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4UBNVPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4UBVNVPROC) (GLuint index, const GLubyte* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBPOINTERNVPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const void* pointer);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS1DVNVPROC) (GLuint index, GLsizei n, const GLdouble* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS1FVNVPROC) (GLuint index, GLsizei n, const GLfloat* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS1SVNVPROC) (GLuint index, GLsizei n, const GLshort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS2DVNVPROC) (GLuint index, GLsizei n, const GLdouble* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS2FVNVPROC) (GLuint index, GLsizei n, const GLfloat* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS2SVNVPROC) (GLuint index, GLsizei n, const GLshort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS3DVNVPROC) (GLuint index, GLsizei n, const GLdouble* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS3FVNVPROC) (GLuint index, GLsizei n, const GLfloat* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS3SVNVPROC) (GLuint index, GLsizei n, const GLshort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS4DVNVPROC) (GLuint index, GLsizei n, const GLdouble* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS4FVNVPROC) (GLuint index, GLsizei n, const GLfloat* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS4SVNVPROC) (GLuint index, GLsizei n, const GLshort* v);
+typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS4UBVNVPROC) (GLuint index, GLsizei n, const GLubyte* v);
+
+#define glAreProgramsResidentNV GLEW_GET_FUN(__glewAreProgramsResidentNV)
+#define glBindProgramNV GLEW_GET_FUN(__glewBindProgramNV)
+#define glDeleteProgramsNV GLEW_GET_FUN(__glewDeleteProgramsNV)
+#define glExecuteProgramNV GLEW_GET_FUN(__glewExecuteProgramNV)
+#define glGenProgramsNV GLEW_GET_FUN(__glewGenProgramsNV)
+#define glGetProgramParameterdvNV GLEW_GET_FUN(__glewGetProgramParameterdvNV)
+#define glGetProgramParameterfvNV GLEW_GET_FUN(__glewGetProgramParameterfvNV)
+#define glGetProgramStringNV GLEW_GET_FUN(__glewGetProgramStringNV)
+#define glGetProgramivNV GLEW_GET_FUN(__glewGetProgramivNV)
+#define glGetTrackMatrixivNV GLEW_GET_FUN(__glewGetTrackMatrixivNV)
+#define glGetVertexAttribPointervNV GLEW_GET_FUN(__glewGetVertexAttribPointervNV)
+#define glGetVertexAttribdvNV GLEW_GET_FUN(__glewGetVertexAttribdvNV)
+#define glGetVertexAttribfvNV GLEW_GET_FUN(__glewGetVertexAttribfvNV)
+#define glGetVertexAttribivNV GLEW_GET_FUN(__glewGetVertexAttribivNV)
+#define glIsProgramNV GLEW_GET_FUN(__glewIsProgramNV)
+#define glLoadProgramNV GLEW_GET_FUN(__glewLoadProgramNV)
+#define glProgramParameter4dNV GLEW_GET_FUN(__glewProgramParameter4dNV)
+#define glProgramParameter4dvNV GLEW_GET_FUN(__glewProgramParameter4dvNV)
+#define glProgramParameter4fNV GLEW_GET_FUN(__glewProgramParameter4fNV)
+#define glProgramParameter4fvNV GLEW_GET_FUN(__glewProgramParameter4fvNV)
+#define glProgramParameters4dvNV GLEW_GET_FUN(__glewProgramParameters4dvNV)
+#define glProgramParameters4fvNV GLEW_GET_FUN(__glewProgramParameters4fvNV)
+#define glRequestResidentProgramsNV GLEW_GET_FUN(__glewRequestResidentProgramsNV)
+#define glTrackMatrixNV GLEW_GET_FUN(__glewTrackMatrixNV)
+#define glVertexAttrib1dNV GLEW_GET_FUN(__glewVertexAttrib1dNV)
+#define glVertexAttrib1dvNV GLEW_GET_FUN(__glewVertexAttrib1dvNV)
+#define glVertexAttrib1fNV GLEW_GET_FUN(__glewVertexAttrib1fNV)
+#define glVertexAttrib1fvNV GLEW_GET_FUN(__glewVertexAttrib1fvNV)
+#define glVertexAttrib1sNV GLEW_GET_FUN(__glewVertexAttrib1sNV)
+#define glVertexAttrib1svNV GLEW_GET_FUN(__glewVertexAttrib1svNV)
+#define glVertexAttrib2dNV GLEW_GET_FUN(__glewVertexAttrib2dNV)
+#define glVertexAttrib2dvNV GLEW_GET_FUN(__glewVertexAttrib2dvNV)
+#define glVertexAttrib2fNV GLEW_GET_FUN(__glewVertexAttrib2fNV)
+#define glVertexAttrib2fvNV GLEW_GET_FUN(__glewVertexAttrib2fvNV)
+#define glVertexAttrib2sNV GLEW_GET_FUN(__glewVertexAttrib2sNV)
+#define glVertexAttrib2svNV GLEW_GET_FUN(__glewVertexAttrib2svNV)
+#define glVertexAttrib3dNV GLEW_GET_FUN(__glewVertexAttrib3dNV)
+#define glVertexAttrib3dvNV GLEW_GET_FUN(__glewVertexAttrib3dvNV)
+#define glVertexAttrib3fNV GLEW_GET_FUN(__glewVertexAttrib3fNV)
+#define glVertexAttrib3fvNV GLEW_GET_FUN(__glewVertexAttrib3fvNV)
+#define glVertexAttrib3sNV GLEW_GET_FUN(__glewVertexAttrib3sNV)
+#define glVertexAttrib3svNV GLEW_GET_FUN(__glewVertexAttrib3svNV)
+#define glVertexAttrib4dNV GLEW_GET_FUN(__glewVertexAttrib4dNV)
+#define glVertexAttrib4dvNV GLEW_GET_FUN(__glewVertexAttrib4dvNV)
+#define glVertexAttrib4fNV GLEW_GET_FUN(__glewVertexAttrib4fNV)
+#define glVertexAttrib4fvNV GLEW_GET_FUN(__glewVertexAttrib4fvNV)
+#define glVertexAttrib4sNV GLEW_GET_FUN(__glewVertexAttrib4sNV)
+#define glVertexAttrib4svNV GLEW_GET_FUN(__glewVertexAttrib4svNV)
+#define glVertexAttrib4ubNV GLEW_GET_FUN(__glewVertexAttrib4ubNV)
+#define glVertexAttrib4ubvNV GLEW_GET_FUN(__glewVertexAttrib4ubvNV)
+#define glVertexAttribPointerNV GLEW_GET_FUN(__glewVertexAttribPointerNV)
+#define glVertexAttribs1dvNV GLEW_GET_FUN(__glewVertexAttribs1dvNV)
+#define glVertexAttribs1fvNV GLEW_GET_FUN(__glewVertexAttribs1fvNV)
+#define glVertexAttribs1svNV GLEW_GET_FUN(__glewVertexAttribs1svNV)
+#define glVertexAttribs2dvNV GLEW_GET_FUN(__glewVertexAttribs2dvNV)
+#define glVertexAttribs2fvNV GLEW_GET_FUN(__glewVertexAttribs2fvNV)
+#define glVertexAttribs2svNV GLEW_GET_FUN(__glewVertexAttribs2svNV)
+#define glVertexAttribs3dvNV GLEW_GET_FUN(__glewVertexAttribs3dvNV)
+#define glVertexAttribs3fvNV GLEW_GET_FUN(__glewVertexAttribs3fvNV)
+#define glVertexAttribs3svNV GLEW_GET_FUN(__glewVertexAttribs3svNV)
+#define glVertexAttribs4dvNV GLEW_GET_FUN(__glewVertexAttribs4dvNV)
+#define glVertexAttribs4fvNV GLEW_GET_FUN(__glewVertexAttribs4fvNV)
+#define glVertexAttribs4svNV GLEW_GET_FUN(__glewVertexAttribs4svNV)
+#define glVertexAttribs4ubvNV GLEW_GET_FUN(__glewVertexAttribs4ubvNV)
+
+#define GLEW_NV_vertex_program GLEW_GET_VAR(__GLEW_NV_vertex_program)
+
+#endif /* GL_NV_vertex_program */
+
+/* ------------------------ GL_NV_vertex_program1_1 ------------------------ */
+
+#ifndef GL_NV_vertex_program1_1
+#define GL_NV_vertex_program1_1 1
+
+#define GLEW_NV_vertex_program1_1 GLEW_GET_VAR(__GLEW_NV_vertex_program1_1)
+
+#endif /* GL_NV_vertex_program1_1 */
+
+/* ------------------------- GL_NV_vertex_program2 ------------------------- */
+
+#ifndef GL_NV_vertex_program2
+#define GL_NV_vertex_program2 1
+
+#define GLEW_NV_vertex_program2 GLEW_GET_VAR(__GLEW_NV_vertex_program2)
+
+#endif /* GL_NV_vertex_program2 */
+
+/* ---------------------- GL_NV_vertex_program2_option --------------------- */
+
+#ifndef GL_NV_vertex_program2_option
+#define GL_NV_vertex_program2_option 1
+
+#define GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV 0x88F4
+#define GL_MAX_PROGRAM_CALL_DEPTH_NV 0x88F5
+
+#define GLEW_NV_vertex_program2_option GLEW_GET_VAR(__GLEW_NV_vertex_program2_option)
+
+#endif /* GL_NV_vertex_program2_option */
+
+/* ------------------------- GL_NV_vertex_program3 ------------------------- */
+
+#ifndef GL_NV_vertex_program3
+#define GL_NV_vertex_program3 1
+
+#define MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB 0x8B4C
+
+#define GLEW_NV_vertex_program3 GLEW_GET_VAR(__GLEW_NV_vertex_program3)
+
+#endif /* GL_NV_vertex_program3 */
+
+/* ---------------------------- GL_OML_interlace --------------------------- */
+
+#ifndef GL_OML_interlace
+#define GL_OML_interlace 1
+
+#define GL_INTERLACE_OML 0x8980
+#define GL_INTERLACE_READ_OML 0x8981
+
+#define GLEW_OML_interlace GLEW_GET_VAR(__GLEW_OML_interlace)
+
+#endif /* GL_OML_interlace */
+
+/* ---------------------------- GL_OML_resample ---------------------------- */
+
+#ifndef GL_OML_resample
+#define GL_OML_resample 1
+
+#define GL_PACK_RESAMPLE_OML 0x8984
+#define GL_UNPACK_RESAMPLE_OML 0x8985
+#define GL_RESAMPLE_REPLICATE_OML 0x8986
+#define GL_RESAMPLE_ZERO_FILL_OML 0x8987
+#define GL_RESAMPLE_AVERAGE_OML 0x8988
+#define GL_RESAMPLE_DECIMATE_OML 0x8989
+
+#define GLEW_OML_resample GLEW_GET_VAR(__GLEW_OML_resample)
+
+#endif /* GL_OML_resample */
+
+/* ---------------------------- GL_OML_subsample --------------------------- */
+
+#ifndef GL_OML_subsample
+#define GL_OML_subsample 1
+
+#define GL_FORMAT_SUBSAMPLE_24_24_OML 0x8982
+#define GL_FORMAT_SUBSAMPLE_244_244_OML 0x8983
+
+#define GLEW_OML_subsample GLEW_GET_VAR(__GLEW_OML_subsample)
+
+#endif /* GL_OML_subsample */
+
+/* --------------------------- GL_PGI_misc_hints --------------------------- */
+
+#ifndef GL_PGI_misc_hints
+#define GL_PGI_misc_hints 1
+
+#define GL_PREFER_DOUBLEBUFFER_HINT_PGI 107000
+#define GL_CONSERVE_MEMORY_HINT_PGI 107005
+#define GL_RECLAIM_MEMORY_HINT_PGI 107006
+#define GL_NATIVE_GRAPHICS_HANDLE_PGI 107010
+#define GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI 107011
+#define GL_NATIVE_GRAPHICS_END_HINT_PGI 107012
+#define GL_ALWAYS_FAST_HINT_PGI 107020
+#define GL_ALWAYS_SOFT_HINT_PGI 107021
+#define GL_ALLOW_DRAW_OBJ_HINT_PGI 107022
+#define GL_ALLOW_DRAW_WIN_HINT_PGI 107023
+#define GL_ALLOW_DRAW_FRG_HINT_PGI 107024
+#define GL_ALLOW_DRAW_MEM_HINT_PGI 107025
+#define GL_STRICT_DEPTHFUNC_HINT_PGI 107030
+#define GL_STRICT_LIGHTING_HINT_PGI 107031
+#define GL_STRICT_SCISSOR_HINT_PGI 107032
+#define GL_FULL_STIPPLE_HINT_PGI 107033
+#define GL_CLIP_NEAR_HINT_PGI 107040
+#define GL_CLIP_FAR_HINT_PGI 107041
+#define GL_WIDE_LINE_HINT_PGI 107042
+#define GL_BACK_NORMALS_HINT_PGI 107043
+
+#define GLEW_PGI_misc_hints GLEW_GET_VAR(__GLEW_PGI_misc_hints)
+
+#endif /* GL_PGI_misc_hints */
+
+/* -------------------------- GL_PGI_vertex_hints -------------------------- */
+
+#ifndef GL_PGI_vertex_hints
+#define GL_PGI_vertex_hints 1
+
+#define GL_VERTEX23_BIT_PGI 0x00000004
+#define GL_VERTEX4_BIT_PGI 0x00000008
+#define GL_COLOR3_BIT_PGI 0x00010000
+#define GL_COLOR4_BIT_PGI 0x00020000
+#define GL_EDGEFLAG_BIT_PGI 0x00040000
+#define GL_INDEX_BIT_PGI 0x00080000
+#define GL_MAT_AMBIENT_BIT_PGI 0x00100000
+#define GL_VERTEX_DATA_HINT_PGI 107050
+#define GL_VERTEX_CONSISTENT_HINT_PGI 107051
+#define GL_MATERIAL_SIDE_HINT_PGI 107052
+#define GL_MAX_VERTEX_HINT_PGI 107053
+#define GL_MAT_AMBIENT_AND_DIFFUSE_BIT_PGI 0x00200000
+#define GL_MAT_DIFFUSE_BIT_PGI 0x00400000
+#define GL_MAT_EMISSION_BIT_PGI 0x00800000
+#define GL_MAT_COLOR_INDEXES_BIT_PGI 0x01000000
+#define GL_MAT_SHININESS_BIT_PGI 0x02000000
+#define GL_MAT_SPECULAR_BIT_PGI 0x04000000
+#define GL_NORMAL_BIT_PGI 0x08000000
+#define GL_TEXCOORD1_BIT_PGI 0x10000000
+#define GL_TEXCOORD2_BIT_PGI 0x20000000
+#define GL_TEXCOORD3_BIT_PGI 0x40000000
+#define GL_TEXCOORD4_BIT_PGI 0x80000000
+
+#define GLEW_PGI_vertex_hints GLEW_GET_VAR(__GLEW_PGI_vertex_hints)
+
+#endif /* GL_PGI_vertex_hints */
+
+/* ----------------------- GL_REND_screen_coordinates ---------------------- */
+
+#ifndef GL_REND_screen_coordinates
+#define GL_REND_screen_coordinates 1
+
+#define GL_SCREEN_COORDINATES_REND 0x8490
+#define GL_INVERTED_SCREEN_W_REND 0x8491
+
+#define GLEW_REND_screen_coordinates GLEW_GET_VAR(__GLEW_REND_screen_coordinates)
+
+#endif /* GL_REND_screen_coordinates */
+
+/* ------------------------------- GL_S3_s3tc ------------------------------ */
+
+#ifndef GL_S3_s3tc
+#define GL_S3_s3tc 1
+
+#define GL_RGB_S3TC 0x83A0
+#define GL_RGB4_S3TC 0x83A1
+#define GL_RGBA_S3TC 0x83A2
+#define GL_RGBA4_S3TC 0x83A3
+#define GL_RGBA_DXT5_S3TC 0x83A4
+#define GL_RGBA4_DXT5_S3TC 0x83A5
+
+#define GLEW_S3_s3tc GLEW_GET_VAR(__GLEW_S3_s3tc)
+
+#endif /* GL_S3_s3tc */
+
+/* -------------------------- GL_SGIS_color_range -------------------------- */
+
+#ifndef GL_SGIS_color_range
+#define GL_SGIS_color_range 1
+
+#define GL_EXTENDED_RANGE_SGIS 0x85A5
+#define GL_MIN_RED_SGIS 0x85A6
+#define GL_MAX_RED_SGIS 0x85A7
+#define GL_MIN_GREEN_SGIS 0x85A8
+#define GL_MAX_GREEN_SGIS 0x85A9
+#define GL_MIN_BLUE_SGIS 0x85AA
+#define GL_MAX_BLUE_SGIS 0x85AB
+#define GL_MIN_ALPHA_SGIS 0x85AC
+#define GL_MAX_ALPHA_SGIS 0x85AD
+
+#define GLEW_SGIS_color_range GLEW_GET_VAR(__GLEW_SGIS_color_range)
+
+#endif /* GL_SGIS_color_range */
+
+/* ------------------------- GL_SGIS_detail_texture ------------------------ */
+
+#ifndef GL_SGIS_detail_texture
+#define GL_SGIS_detail_texture 1
+
+typedef void (GLAPIENTRY * PFNGLDETAILTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat* points);
+typedef void (GLAPIENTRY * PFNGLGETDETAILTEXFUNCSGISPROC) (GLenum target, GLfloat* points);
+
+#define glDetailTexFuncSGIS GLEW_GET_FUN(__glewDetailTexFuncSGIS)
+#define glGetDetailTexFuncSGIS GLEW_GET_FUN(__glewGetDetailTexFuncSGIS)
+
+#define GLEW_SGIS_detail_texture GLEW_GET_VAR(__GLEW_SGIS_detail_texture)
+
+#endif /* GL_SGIS_detail_texture */
+
+/* -------------------------- GL_SGIS_fog_function ------------------------- */
+
+#ifndef GL_SGIS_fog_function
+#define GL_SGIS_fog_function 1
+
+typedef void (GLAPIENTRY * PFNGLFOGFUNCSGISPROC) (GLsizei n, const GLfloat* points);
+typedef void (GLAPIENTRY * PFNGLGETFOGFUNCSGISPROC) (GLfloat* points);
+
+#define glFogFuncSGIS GLEW_GET_FUN(__glewFogFuncSGIS)
+#define glGetFogFuncSGIS GLEW_GET_FUN(__glewGetFogFuncSGIS)
+
+#define GLEW_SGIS_fog_function GLEW_GET_VAR(__GLEW_SGIS_fog_function)
+
+#endif /* GL_SGIS_fog_function */
+
+/* ------------------------ GL_SGIS_generate_mipmap ------------------------ */
+
+#ifndef GL_SGIS_generate_mipmap
+#define GL_SGIS_generate_mipmap 1
+
+#define GL_GENERATE_MIPMAP_SGIS 0x8191
+#define GL_GENERATE_MIPMAP_HINT_SGIS 0x8192
+
+#define GLEW_SGIS_generate_mipmap GLEW_GET_VAR(__GLEW_SGIS_generate_mipmap)
+
+#endif /* GL_SGIS_generate_mipmap */
+
+/* -------------------------- GL_SGIS_multisample -------------------------- */
+
+#ifndef GL_SGIS_multisample
+#define GL_SGIS_multisample 1
+
+#define GL_MULTISAMPLE_SGIS 0x809D
+#define GL_SAMPLE_ALPHA_TO_MASK_SGIS 0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_SGIS 0x809F
+#define GL_SAMPLE_MASK_SGIS 0x80A0
+#define GL_1PASS_SGIS 0x80A1
+#define GL_2PASS_0_SGIS 0x80A2
+#define GL_2PASS_1_SGIS 0x80A3
+#define GL_4PASS_0_SGIS 0x80A4
+#define GL_4PASS_1_SGIS 0x80A5
+#define GL_4PASS_2_SGIS 0x80A6
+#define GL_4PASS_3_SGIS 0x80A7
+#define GL_SAMPLE_BUFFERS_SGIS 0x80A8
+#define GL_SAMPLES_SGIS 0x80A9
+#define GL_SAMPLE_MASK_VALUE_SGIS 0x80AA
+#define GL_SAMPLE_MASK_INVERT_SGIS 0x80AB
+#define GL_SAMPLE_PATTERN_SGIS 0x80AC
+#define GL_MULTISAMPLE_BIT_EXT 0x20000000
+
+typedef void (GLAPIENTRY * PFNGLSAMPLEMASKSGISPROC) (GLclampf value, GLboolean invert);
+typedef void (GLAPIENTRY * PFNGLSAMPLEPATTERNSGISPROC) (GLenum pattern);
+
+#define glSampleMaskSGIS GLEW_GET_FUN(__glewSampleMaskSGIS)
+#define glSamplePatternSGIS GLEW_GET_FUN(__glewSamplePatternSGIS)
+
+#define GLEW_SGIS_multisample GLEW_GET_VAR(__GLEW_SGIS_multisample)
+
+#endif /* GL_SGIS_multisample */
+
+/* ------------------------- GL_SGIS_pixel_texture ------------------------- */
+
+#ifndef GL_SGIS_pixel_texture
+#define GL_SGIS_pixel_texture 1
+
+#define GLEW_SGIS_pixel_texture GLEW_GET_VAR(__GLEW_SGIS_pixel_texture)
+
+#endif /* GL_SGIS_pixel_texture */
+
+/* ------------------------ GL_SGIS_sharpen_texture ------------------------ */
+
+#ifndef GL_SGIS_sharpen_texture
+#define GL_SGIS_sharpen_texture 1
+
+typedef void (GLAPIENTRY * PFNGLGETSHARPENTEXFUNCSGISPROC) (GLenum target, GLfloat* points);
+typedef void (GLAPIENTRY * PFNGLSHARPENTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat* points);
+
+#define glGetSharpenTexFuncSGIS GLEW_GET_FUN(__glewGetSharpenTexFuncSGIS)
+#define glSharpenTexFuncSGIS GLEW_GET_FUN(__glewSharpenTexFuncSGIS)
+
+#define GLEW_SGIS_sharpen_texture GLEW_GET_VAR(__GLEW_SGIS_sharpen_texture)
+
+#endif /* GL_SGIS_sharpen_texture */
+
+/* --------------------------- GL_SGIS_texture4D --------------------------- */
+
+#ifndef GL_SGIS_texture4D
+#define GL_SGIS_texture4D 1
+
+typedef void (GLAPIENTRY * PFNGLTEXIMAGE4DSGISPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei extent, GLint border, GLenum format, GLenum type, const void* pixels);
+typedef void (GLAPIENTRY * PFNGLTEXSUBIMAGE4DSGISPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei extent, GLenum format, GLenum type, const void* pixels);
+
+#define glTexImage4DSGIS GLEW_GET_FUN(__glewTexImage4DSGIS)
+#define glTexSubImage4DSGIS GLEW_GET_FUN(__glewTexSubImage4DSGIS)
+
+#define GLEW_SGIS_texture4D GLEW_GET_VAR(__GLEW_SGIS_texture4D)
+
+#endif /* GL_SGIS_texture4D */
+
+/* ---------------------- GL_SGIS_texture_border_clamp --------------------- */
+
+#ifndef GL_SGIS_texture_border_clamp
+#define GL_SGIS_texture_border_clamp 1
+
+#define GL_CLAMP_TO_BORDER_SGIS 0x812D
+
+#define GLEW_SGIS_texture_border_clamp GLEW_GET_VAR(__GLEW_SGIS_texture_border_clamp)
+
+#endif /* GL_SGIS_texture_border_clamp */
+
+/* ----------------------- GL_SGIS_texture_edge_clamp ---------------------- */
+
+#ifndef GL_SGIS_texture_edge_clamp
+#define GL_SGIS_texture_edge_clamp 1
+
+#define GL_CLAMP_TO_EDGE_SGIS 0x812F
+
+#define GLEW_SGIS_texture_edge_clamp GLEW_GET_VAR(__GLEW_SGIS_texture_edge_clamp)
+
+#endif /* GL_SGIS_texture_edge_clamp */
+
+/* ------------------------ GL_SGIS_texture_filter4 ------------------------ */
+
+#ifndef GL_SGIS_texture_filter4
+#define GL_SGIS_texture_filter4 1
+
+typedef void (GLAPIENTRY * PFNGLGETTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLfloat* weights);
+typedef void (GLAPIENTRY * PFNGLTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLsizei n, const GLfloat* weights);
+
+#define glGetTexFilterFuncSGIS GLEW_GET_FUN(__glewGetTexFilterFuncSGIS)
+#define glTexFilterFuncSGIS GLEW_GET_FUN(__glewTexFilterFuncSGIS)
+
+#define GLEW_SGIS_texture_filter4 GLEW_GET_VAR(__GLEW_SGIS_texture_filter4)
+
+#endif /* GL_SGIS_texture_filter4 */
+
+/* -------------------------- GL_SGIS_texture_lod -------------------------- */
+
+#ifndef GL_SGIS_texture_lod
+#define GL_SGIS_texture_lod 1
+
+#define GL_TEXTURE_MIN_LOD_SGIS 0x813A
+#define GL_TEXTURE_MAX_LOD_SGIS 0x813B
+#define GL_TEXTURE_BASE_LEVEL_SGIS 0x813C
+#define GL_TEXTURE_MAX_LEVEL_SGIS 0x813D
+
+#define GLEW_SGIS_texture_lod GLEW_GET_VAR(__GLEW_SGIS_texture_lod)
+
+#endif /* GL_SGIS_texture_lod */
+
+/* ------------------------- GL_SGIS_texture_select ------------------------ */
+
+#ifndef GL_SGIS_texture_select
+#define GL_SGIS_texture_select 1
+
+#define GLEW_SGIS_texture_select GLEW_GET_VAR(__GLEW_SGIS_texture_select)
+
+#endif /* GL_SGIS_texture_select */
+
+/* ----------------------------- GL_SGIX_async ----------------------------- */
+
+#ifndef GL_SGIX_async
+#define GL_SGIX_async 1
+
+#define GL_ASYNC_MARKER_SGIX 0x8329
+
+typedef void (GLAPIENTRY * PFNGLASYNCMARKERSGIXPROC) (GLuint marker);
+typedef void (GLAPIENTRY * PFNGLDELETEASYNCMARKERSSGIXPROC) (GLuint marker, GLsizei range);
+typedef GLint (GLAPIENTRY * PFNGLFINISHASYNCSGIXPROC) (GLuint* markerp);
+typedef GLuint (GLAPIENTRY * PFNGLGENASYNCMARKERSSGIXPROC) (GLsizei range);
+typedef GLboolean (GLAPIENTRY * PFNGLISASYNCMARKERSGIXPROC) (GLuint marker);
+typedef GLint (GLAPIENTRY * PFNGLPOLLASYNCSGIXPROC) (GLuint* markerp);
+
+#define glAsyncMarkerSGIX GLEW_GET_FUN(__glewAsyncMarkerSGIX)
+#define glDeleteAsyncMarkersSGIX GLEW_GET_FUN(__glewDeleteAsyncMarkersSGIX)
+#define glFinishAsyncSGIX GLEW_GET_FUN(__glewFinishAsyncSGIX)
+#define glGenAsyncMarkersSGIX GLEW_GET_FUN(__glewGenAsyncMarkersSGIX)
+#define glIsAsyncMarkerSGIX GLEW_GET_FUN(__glewIsAsyncMarkerSGIX)
+#define glPollAsyncSGIX GLEW_GET_FUN(__glewPollAsyncSGIX)
+
+#define GLEW_SGIX_async GLEW_GET_VAR(__GLEW_SGIX_async)
+
+#endif /* GL_SGIX_async */
+
+/* ------------------------ GL_SGIX_async_histogram ------------------------ */
+
+#ifndef GL_SGIX_async_histogram
+#define GL_SGIX_async_histogram 1
+
+#define GL_ASYNC_HISTOGRAM_SGIX 0x832C
+#define GL_MAX_ASYNC_HISTOGRAM_SGIX 0x832D
+
+#define GLEW_SGIX_async_histogram GLEW_GET_VAR(__GLEW_SGIX_async_histogram)
+
+#endif /* GL_SGIX_async_histogram */
+
+/* -------------------------- GL_SGIX_async_pixel -------------------------- */
+
+#ifndef GL_SGIX_async_pixel
+#define GL_SGIX_async_pixel 1
+
+#define GL_ASYNC_TEX_IMAGE_SGIX 0x835C
+#define GL_ASYNC_DRAW_PIXELS_SGIX 0x835D
+#define GL_ASYNC_READ_PIXELS_SGIX 0x835E
+#define GL_MAX_ASYNC_TEX_IMAGE_SGIX 0x835F
+#define GL_MAX_ASYNC_DRAW_PIXELS_SGIX 0x8360
+#define GL_MAX_ASYNC_READ_PIXELS_SGIX 0x8361
+
+#define GLEW_SGIX_async_pixel GLEW_GET_VAR(__GLEW_SGIX_async_pixel)
+
+#endif /* GL_SGIX_async_pixel */
+
+/* ----------------------- GL_SGIX_blend_alpha_minmax ---------------------- */
+
+#ifndef GL_SGIX_blend_alpha_minmax
+#define GL_SGIX_blend_alpha_minmax 1
+
+#define GL_ALPHA_MIN_SGIX 0x8320
+#define GL_ALPHA_MAX_SGIX 0x8321
+
+#define GLEW_SGIX_blend_alpha_minmax GLEW_GET_VAR(__GLEW_SGIX_blend_alpha_minmax)
+
+#endif /* GL_SGIX_blend_alpha_minmax */
+
+/* ---------------------------- GL_SGIX_clipmap ---------------------------- */
+
+#ifndef GL_SGIX_clipmap
+#define GL_SGIX_clipmap 1
+
+#define GLEW_SGIX_clipmap GLEW_GET_VAR(__GLEW_SGIX_clipmap)
+
+#endif /* GL_SGIX_clipmap */
+
+/* ------------------------- GL_SGIX_depth_texture ------------------------- */
+
+#ifndef GL_SGIX_depth_texture
+#define GL_SGIX_depth_texture 1
+
+#define GL_DEPTH_COMPONENT16_SGIX 0x81A5
+#define GL_DEPTH_COMPONENT24_SGIX 0x81A6
+#define GL_DEPTH_COMPONENT32_SGIX 0x81A7
+
+#define GLEW_SGIX_depth_texture GLEW_GET_VAR(__GLEW_SGIX_depth_texture)
+
+#endif /* GL_SGIX_depth_texture */
+
+/* -------------------------- GL_SGIX_flush_raster ------------------------- */
+
+#ifndef GL_SGIX_flush_raster
+#define GL_SGIX_flush_raster 1
+
+typedef void (GLAPIENTRY * PFNGLFLUSHRASTERSGIXPROC) (void);
+
+#define glFlushRasterSGIX GLEW_GET_FUN(__glewFlushRasterSGIX)
+
+#define GLEW_SGIX_flush_raster GLEW_GET_VAR(__GLEW_SGIX_flush_raster)
+
+#endif /* GL_SGIX_flush_raster */
+
+/* --------------------------- GL_SGIX_fog_offset -------------------------- */
+
+#ifndef GL_SGIX_fog_offset
+#define GL_SGIX_fog_offset 1
+
+#define GL_FOG_OFFSET_SGIX 0x8198
+#define GL_FOG_OFFSET_VALUE_SGIX 0x8199
+
+#define GLEW_SGIX_fog_offset GLEW_GET_VAR(__GLEW_SGIX_fog_offset)
+
+#endif /* GL_SGIX_fog_offset */
+
+/* -------------------------- GL_SGIX_fog_texture -------------------------- */
+
+#ifndef GL_SGIX_fog_texture
+#define GL_SGIX_fog_texture 1
+
+#define GL_TEXTURE_FOG_SGIX 0
+#define GL_FOG_PATCHY_FACTOR_SGIX 0
+#define GL_FRAGMENT_FOG_SGIX 0
+
+typedef void (GLAPIENTRY * PFNGLTEXTUREFOGSGIXPROC) (GLenum pname);
+
+#define glTextureFogSGIX GLEW_GET_FUN(__glewTextureFogSGIX)
+
+#define GLEW_SGIX_fog_texture GLEW_GET_VAR(__GLEW_SGIX_fog_texture)
+
+#endif /* GL_SGIX_fog_texture */
+
+#if 0
+/* ------------------- GL_SGIX_fragment_specular_lighting ------------------ */
+
+#ifndef GL_SGIX_fragment_specular_lighting
+#define GL_SGIX_fragment_specular_lighting 1
+
+typedef void (GLAPIENTRY * PFNGLFRAGMENTCOLORMATERIALSGIXPROC) (GLenum face, GLenum mode);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTMODELFSGIXPROC) (GLenum pname, GLfloat param);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTMODELFVSGIXPROC) (GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTMODELISGIXPROC) (GLenum pname, GLint param);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTMODELIVSGIXPROC) (GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTFSGIXPROC) (GLenum light, GLenum pname, GLfloat param);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTISGIXPROC) (GLenum light, GLenum pname, const GLint param);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, const GLint* params);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTMATERIALFSGIXPROC) (GLenum face, GLenum pname, const GLfloat param);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, const GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTMATERIALISGIXPROC) (GLenum face, GLenum pname, const GLint param);
+typedef void (GLAPIENTRY * PFNGLFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, const GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum value, const GLfloat* data);
+typedef void (GLAPIENTRY * PFNGLGETFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum value, const GLint* data);
+typedef void (GLAPIENTRY * PFNGLGETFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, const GLfloat* data);
+typedef void (GLAPIENTRY * PFNGLGETFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, const GLint* data);
+
+#define glFragmentColorMaterialSGIX GLEW_GET_FUN(__glewFragmentColorMaterialSGIX)
+#define glFragmentLightModelfSGIX GLEW_GET_FUN(__glewFragmentLightModelfSGIX)
+#define glFragmentLightModelfvSGIX GLEW_GET_FUN(__glewFragmentLightModelfvSGIX)
+#define glFragmentLightModeliSGIX GLEW_GET_FUN(__glewFragmentLightModeliSGIX)
+#define glFragmentLightModelivSGIX GLEW_GET_FUN(__glewFragmentLightModelivSGIX)
+#define glFragmentLightfSGIX GLEW_GET_FUN(__glewFragmentLightfSGIX)
+#define glFragmentLightfvSGIX GLEW_GET_FUN(__glewFragmentLightfvSGIX)
+#define glFragmentLightiSGIX GLEW_GET_FUN(__glewFragmentLightiSGIX)
+#define glFragmentLightivSGIX GLEW_GET_FUN(__glewFragmentLightivSGIX)
+#define glFragmentMaterialfSGIX GLEW_GET_FUN(__glewFragmentMaterialfSGIX)
+#define glFragmentMaterialfvSGIX GLEW_GET_FUN(__glewFragmentMaterialfvSGIX)
+#define glFragmentMaterialiSGIX GLEW_GET_FUN(__glewFragmentMaterialiSGIX)
+#define glFragmentMaterialivSGIX GLEW_GET_FUN(__glewFragmentMaterialivSGIX)
+#define glGetFragmentLightfvSGIX GLEW_GET_FUN(__glewGetFragmentLightfvSGIX)
+#define glGetFragmentLightivSGIX GLEW_GET_FUN(__glewGetFragmentLightivSGIX)
+#define glGetFragmentMaterialfvSGIX GLEW_GET_FUN(__glewGetFragmentMaterialfvSGIX)
+#define glGetFragmentMaterialivSGIX GLEW_GET_FUN(__glewGetFragmentMaterialivSGIX)
+
+#define GLEW_SGIX_fragment_specular_lighting GLEW_GET_VAR(__GLEW_SGIX_fragment_specular_lighting)
+#endif
+
+#endif /* GL_SGIX_fragment_specular_lighting */
+
+/* --------------------------- GL_SGIX_framezoom --------------------------- */
+
+#ifndef GL_SGIX_framezoom
+#define GL_SGIX_framezoom 1
+
+typedef void (GLAPIENTRY * PFNGLFRAMEZOOMSGIXPROC) (GLint factor);
+
+#define glFrameZoomSGIX GLEW_GET_FUN(__glewFrameZoomSGIX)
+
+#define GLEW_SGIX_framezoom GLEW_GET_VAR(__GLEW_SGIX_framezoom)
+
+#endif /* GL_SGIX_framezoom */
+
+/* --------------------------- GL_SGIX_interlace --------------------------- */
+
+#ifndef GL_SGIX_interlace
+#define GL_SGIX_interlace 1
+
+#define GL_INTERLACE_SGIX 0x8094
+
+#define GLEW_SGIX_interlace GLEW_GET_VAR(__GLEW_SGIX_interlace)
+
+#endif /* GL_SGIX_interlace */
+
+/* ------------------------- GL_SGIX_ir_instrument1 ------------------------ */
+
+#ifndef GL_SGIX_ir_instrument1
+#define GL_SGIX_ir_instrument1 1
+
+#define GLEW_SGIX_ir_instrument1 GLEW_GET_VAR(__GLEW_SGIX_ir_instrument1)
+
+#endif /* GL_SGIX_ir_instrument1 */
+
+/* ------------------------- GL_SGIX_list_priority ------------------------- */
+
+#ifndef GL_SGIX_list_priority
+#define GL_SGIX_list_priority 1
+
+#define GLEW_SGIX_list_priority GLEW_GET_VAR(__GLEW_SGIX_list_priority)
+
+#endif /* GL_SGIX_list_priority */
+
+/* ------------------------- GL_SGIX_pixel_texture ------------------------- */
+
+#ifndef GL_SGIX_pixel_texture
+#define GL_SGIX_pixel_texture 1
+
+typedef void (GLAPIENTRY * PFNGLPIXELTEXGENSGIXPROC) (GLenum mode);
+
+#define glPixelTexGenSGIX GLEW_GET_FUN(__glewPixelTexGenSGIX)
+
+#define GLEW_SGIX_pixel_texture GLEW_GET_VAR(__GLEW_SGIX_pixel_texture)
+
+#endif /* GL_SGIX_pixel_texture */
+
+/* ----------------------- GL_SGIX_pixel_texture_bits ---------------------- */
+
+#ifndef GL_SGIX_pixel_texture_bits
+#define GL_SGIX_pixel_texture_bits 1
+
+#define GLEW_SGIX_pixel_texture_bits GLEW_GET_VAR(__GLEW_SGIX_pixel_texture_bits)
+
+#endif /* GL_SGIX_pixel_texture_bits */
+
+/* ------------------------ GL_SGIX_reference_plane ------------------------ */
+
+#ifndef GL_SGIX_reference_plane
+#define GL_SGIX_reference_plane 1
+
+typedef void (GLAPIENTRY * PFNGLREFERENCEPLANESGIXPROC) (const GLdouble* equation);
+
+#define glReferencePlaneSGIX GLEW_GET_FUN(__glewReferencePlaneSGIX)
+
+#define GLEW_SGIX_reference_plane GLEW_GET_VAR(__GLEW_SGIX_reference_plane)
+
+#endif /* GL_SGIX_reference_plane */
+
+/* ---------------------------- GL_SGIX_resample --------------------------- */
+
+#ifndef GL_SGIX_resample
+#define GL_SGIX_resample 1
+
+#define GL_PACK_RESAMPLE_SGIX 0x842E
+#define GL_UNPACK_RESAMPLE_SGIX 0x842F
+#define GL_RESAMPLE_DECIMATE_SGIX 0x8430
+#define GL_RESAMPLE_REPLICATE_SGIX 0x8433
+#define GL_RESAMPLE_ZERO_FILL_SGIX 0x8434
+
+#define GLEW_SGIX_resample GLEW_GET_VAR(__GLEW_SGIX_resample)
+
+#endif /* GL_SGIX_resample */
+
+/* ----------------------------- GL_SGIX_shadow ---------------------------- */
+
+#ifndef GL_SGIX_shadow
+#define GL_SGIX_shadow 1
+
+#define GL_TEXTURE_COMPARE_SGIX 0x819A
+#define GL_TEXTURE_COMPARE_OPERATOR_SGIX 0x819B
+#define GL_TEXTURE_LEQUAL_R_SGIX 0x819C
+#define GL_TEXTURE_GEQUAL_R_SGIX 0x819D
+
+#define GLEW_SGIX_shadow GLEW_GET_VAR(__GLEW_SGIX_shadow)
+
+#endif /* GL_SGIX_shadow */
+
+/* ------------------------- GL_SGIX_shadow_ambient ------------------------ */
+
+#ifndef GL_SGIX_shadow_ambient
+#define GL_SGIX_shadow_ambient 1
+
+#define GL_SHADOW_AMBIENT_SGIX 0x80BF
+
+#define GLEW_SGIX_shadow_ambient GLEW_GET_VAR(__GLEW_SGIX_shadow_ambient)
+
+#endif /* GL_SGIX_shadow_ambient */
+
+/* ----------------------------- GL_SGIX_sprite ---------------------------- */
+
+#ifndef GL_SGIX_sprite
+#define GL_SGIX_sprite 1
+
+typedef void (GLAPIENTRY * PFNGLSPRITEPARAMETERFSGIXPROC) (GLenum pname, GLfloat param);
+typedef void (GLAPIENTRY * PFNGLSPRITEPARAMETERFVSGIXPROC) (GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLSPRITEPARAMETERISGIXPROC) (GLenum pname, GLint param);
+typedef void (GLAPIENTRY * PFNGLSPRITEPARAMETERIVSGIXPROC) (GLenum pname, GLint* params);
+
+#define glSpriteParameterfSGIX GLEW_GET_FUN(__glewSpriteParameterfSGIX)
+#define glSpriteParameterfvSGIX GLEW_GET_FUN(__glewSpriteParameterfvSGIX)
+#define glSpriteParameteriSGIX GLEW_GET_FUN(__glewSpriteParameteriSGIX)
+#define glSpriteParameterivSGIX GLEW_GET_FUN(__glewSpriteParameterivSGIX)
+
+#define GLEW_SGIX_sprite GLEW_GET_VAR(__GLEW_SGIX_sprite)
+
+#endif /* GL_SGIX_sprite */
+
+/* ----------------------- GL_SGIX_tag_sample_buffer ----------------------- */
+
+#ifndef GL_SGIX_tag_sample_buffer
+#define GL_SGIX_tag_sample_buffer 1
+
+typedef void (GLAPIENTRY * PFNGLTAGSAMPLEBUFFERSGIXPROC) (void);
+
+#define glTagSampleBufferSGIX GLEW_GET_FUN(__glewTagSampleBufferSGIX)
+
+#define GLEW_SGIX_tag_sample_buffer GLEW_GET_VAR(__GLEW_SGIX_tag_sample_buffer)
+
+#endif /* GL_SGIX_tag_sample_buffer */
+
+/* ------------------------ GL_SGIX_texture_add_env ------------------------ */
+
+#ifndef GL_SGIX_texture_add_env
+#define GL_SGIX_texture_add_env 1
+
+#define GLEW_SGIX_texture_add_env GLEW_GET_VAR(__GLEW_SGIX_texture_add_env)
+
+#endif /* GL_SGIX_texture_add_env */
+
+/* -------------------- GL_SGIX_texture_coordinate_clamp ------------------- */
+
+#ifndef GL_SGIX_texture_coordinate_clamp
+#define GL_SGIX_texture_coordinate_clamp 1
+
+#define GL_TEXTURE_MAX_CLAMP_S_SGIX 0x8369
+#define GL_TEXTURE_MAX_CLAMP_T_SGIX 0x836A
+#define GL_TEXTURE_MAX_CLAMP_R_SGIX 0x836B
+
+#define GLEW_SGIX_texture_coordinate_clamp GLEW_GET_VAR(__GLEW_SGIX_texture_coordinate_clamp)
+
+#endif /* GL_SGIX_texture_coordinate_clamp */
+
+/* ------------------------ GL_SGIX_texture_lod_bias ----------------------- */
+
+#ifndef GL_SGIX_texture_lod_bias
+#define GL_SGIX_texture_lod_bias 1
+
+#define GLEW_SGIX_texture_lod_bias GLEW_GET_VAR(__GLEW_SGIX_texture_lod_bias)
+
+#endif /* GL_SGIX_texture_lod_bias */
+
+/* ---------------------- GL_SGIX_texture_multi_buffer --------------------- */
+
+#ifndef GL_SGIX_texture_multi_buffer
+#define GL_SGIX_texture_multi_buffer 1
+
+#define GL_TEXTURE_MULTI_BUFFER_HINT_SGIX 0x812E
+
+#define GLEW_SGIX_texture_multi_buffer GLEW_GET_VAR(__GLEW_SGIX_texture_multi_buffer)
+
+#endif /* GL_SGIX_texture_multi_buffer */
+
+/* ------------------------- GL_SGIX_texture_range ------------------------- */
+
+#ifndef GL_SGIX_texture_range
+#define GL_SGIX_texture_range 1
+
+#define GL_RGB_SIGNED_SGIX 0x85E0
+#define GL_RGBA_SIGNED_SGIX 0x85E1
+#define GL_ALPHA_SIGNED_SGIX 0x85E2
+#define GL_LUMINANCE_SIGNED_SGIX 0x85E3
+#define GL_INTENSITY_SIGNED_SGIX 0x85E4
+#define GL_LUMINANCE_ALPHA_SIGNED_SGIX 0x85E5
+#define GL_RGB16_SIGNED_SGIX 0x85E6
+#define GL_RGBA16_SIGNED_SGIX 0x85E7
+#define GL_ALPHA16_SIGNED_SGIX 0x85E8
+#define GL_LUMINANCE16_SIGNED_SGIX 0x85E9
+#define GL_INTENSITY16_SIGNED_SGIX 0x85EA
+#define GL_LUMINANCE16_ALPHA16_SIGNED_SGIX 0x85EB
+#define GL_RGB_EXTENDED_RANGE_SGIX 0x85EC
+#define GL_RGBA_EXTENDED_RANGE_SGIX 0x85ED
+#define GL_ALPHA_EXTENDED_RANGE_SGIX 0x85EE
+#define GL_LUMINANCE_EXTENDED_RANGE_SGIX 0x85EF
+#define GL_INTENSITY_EXTENDED_RANGE_SGIX 0x85F0
+#define GL_LUMINANCE_ALPHA_EXTENDED_RANGE_SGIX 0x85F1
+#define GL_RGB16_EXTENDED_RANGE_SGIX 0x85F2
+#define GL_RGBA16_EXTENDED_RANGE_SGIX 0x85F3
+#define GL_ALPHA16_EXTENDED_RANGE_SGIX 0x85F4
+#define GL_LUMINANCE16_EXTENDED_RANGE_SGIX 0x85F5
+#define GL_INTENSITY16_EXTENDED_RANGE_SGIX 0x85F6
+#define GL_LUMINANCE16_ALPHA16_EXTENDED_RANGE_SGIX 0x85F7
+#define GL_MIN_LUMINANCE_SGIS 0x85F8
+#define GL_MAX_LUMINANCE_SGIS 0x85F9
+#define GL_MIN_INTENSITY_SGIS 0x85FA
+#define GL_MAX_INTENSITY_SGIS 0x85FB
+
+#define GLEW_SGIX_texture_range GLEW_GET_VAR(__GLEW_SGIX_texture_range)
+
+#endif /* GL_SGIX_texture_range */
+
+/* ----------------------- GL_SGIX_texture_scale_bias ---------------------- */
+
+#ifndef GL_SGIX_texture_scale_bias
+#define GL_SGIX_texture_scale_bias 1
+
+#define GL_POST_TEXTURE_FILTER_BIAS_SGIX 0x8179
+#define GL_POST_TEXTURE_FILTER_SCALE_SGIX 0x817A
+#define GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX 0x817B
+#define GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX 0x817C
+
+#define GLEW_SGIX_texture_scale_bias GLEW_GET_VAR(__GLEW_SGIX_texture_scale_bias)
+
+#endif /* GL_SGIX_texture_scale_bias */
+
+/* ------------------------- GL_SGIX_vertex_preclip ------------------------ */
+
+#ifndef GL_SGIX_vertex_preclip
+#define GL_SGIX_vertex_preclip 1
+
+#define GL_VERTEX_PRECLIP_SGIX 0x83EE
+#define GL_VERTEX_PRECLIP_HINT_SGIX 0x83EF
+
+#define GLEW_SGIX_vertex_preclip GLEW_GET_VAR(__GLEW_SGIX_vertex_preclip)
+
+#endif /* GL_SGIX_vertex_preclip */
+
+/* ---------------------- GL_SGIX_vertex_preclip_hint ---------------------- */
+
+#ifndef GL_SGIX_vertex_preclip_hint
+#define GL_SGIX_vertex_preclip_hint 1
+
+#define GL_VERTEX_PRECLIP_SGIX 0x83EE
+#define GL_VERTEX_PRECLIP_HINT_SGIX 0x83EF
+
+#define GLEW_SGIX_vertex_preclip_hint GLEW_GET_VAR(__GLEW_SGIX_vertex_preclip_hint)
+
+#endif /* GL_SGIX_vertex_preclip_hint */
+
+/* ----------------------------- GL_SGIX_ycrcb ----------------------------- */
+
+#ifndef GL_SGIX_ycrcb
+#define GL_SGIX_ycrcb 1
+
+#define GLEW_SGIX_ycrcb GLEW_GET_VAR(__GLEW_SGIX_ycrcb)
+
+#endif /* GL_SGIX_ycrcb */
+
+/* -------------------------- GL_SGI_color_matrix -------------------------- */
+
+#ifndef GL_SGI_color_matrix
+#define GL_SGI_color_matrix 1
+
+#define GL_COLOR_MATRIX_SGI 0x80B1
+#define GL_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B2
+#define GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B3
+#define GL_POST_COLOR_MATRIX_RED_SCALE_SGI 0x80B4
+#define GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI 0x80B5
+#define GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI 0x80B6
+#define GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI 0x80B7
+#define GL_POST_COLOR_MATRIX_RED_BIAS_SGI 0x80B8
+#define GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI 0x80B9
+#define GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI 0x80BA
+#define GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI 0x80BB
+
+#define GLEW_SGI_color_matrix GLEW_GET_VAR(__GLEW_SGI_color_matrix)
+
+#endif /* GL_SGI_color_matrix */
+
+/* --------------------------- GL_SGI_color_table -------------------------- */
+
+#ifndef GL_SGI_color_table
+#define GL_SGI_color_table 1
+
+#define GL_COLOR_TABLE_SGI 0x80D0
+#define GL_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D1
+#define GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D2
+#define GL_PROXY_COLOR_TABLE_SGI 0x80D3
+#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D4
+#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D5
+#define GL_COLOR_TABLE_SCALE_SGI 0x80D6
+#define GL_COLOR_TABLE_BIAS_SGI 0x80D7
+#define GL_COLOR_TABLE_FORMAT_SGI 0x80D8
+#define GL_COLOR_TABLE_WIDTH_SGI 0x80D9
+#define GL_COLOR_TABLE_RED_SIZE_SGI 0x80DA
+#define GL_COLOR_TABLE_GREEN_SIZE_SGI 0x80DB
+#define GL_COLOR_TABLE_BLUE_SIZE_SGI 0x80DC
+#define GL_COLOR_TABLE_ALPHA_SIZE_SGI 0x80DD
+#define GL_COLOR_TABLE_LUMINANCE_SIZE_SGI 0x80DE
+#define GL_COLOR_TABLE_INTENSITY_SIZE_SGI 0x80DF
+
+typedef void (GLAPIENTRY * PFNGLCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, const GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, const GLint* params);
+typedef void (GLAPIENTRY * PFNGLCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void* table);
+typedef void (GLAPIENTRY * PFNGLCOPYCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (GLAPIENTRY * PFNGLGETCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, GLfloat* params);
+typedef void (GLAPIENTRY * PFNGLGETCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETCOLORTABLESGIPROC) (GLenum target, GLenum format, GLenum type, void* table);
+
+#define glColorTableParameterfvSGI GLEW_GET_FUN(__glewColorTableParameterfvSGI)
+#define glColorTableParameterivSGI GLEW_GET_FUN(__glewColorTableParameterivSGI)
+#define glColorTableSGI GLEW_GET_FUN(__glewColorTableSGI)
+#define glCopyColorTableSGI GLEW_GET_FUN(__glewCopyColorTableSGI)
+#define glGetColorTableParameterfvSGI GLEW_GET_FUN(__glewGetColorTableParameterfvSGI)
+#define glGetColorTableParameterivSGI GLEW_GET_FUN(__glewGetColorTableParameterivSGI)
+#define glGetColorTableSGI GLEW_GET_FUN(__glewGetColorTableSGI)
+
+#define GLEW_SGI_color_table GLEW_GET_VAR(__GLEW_SGI_color_table)
+
+#endif /* GL_SGI_color_table */
+
+/* ----------------------- GL_SGI_texture_color_table ---------------------- */
+
+#ifndef GL_SGI_texture_color_table
+#define GL_SGI_texture_color_table 1
+
+#define GL_TEXTURE_COLOR_TABLE_SGI 0x80BC
+#define GL_PROXY_TEXTURE_COLOR_TABLE_SGI 0x80BD
+
+#define GLEW_SGI_texture_color_table GLEW_GET_VAR(__GLEW_SGI_texture_color_table)
+
+#endif /* GL_SGI_texture_color_table */
+
+/* ------------------------- GL_SUNX_constant_data ------------------------- */
+
+#ifndef GL_SUNX_constant_data
+#define GL_SUNX_constant_data 1
+
+#define GL_UNPACK_CONSTANT_DATA_SUNX 0x81D5
+#define GL_TEXTURE_CONSTANT_DATA_SUNX 0x81D6
+
+typedef void (GLAPIENTRY * PFNGLFINISHTEXTURESUNXPROC) (void);
+
+#define glFinishTextureSUNX GLEW_GET_FUN(__glewFinishTextureSUNX)
+
+#define GLEW_SUNX_constant_data GLEW_GET_VAR(__GLEW_SUNX_constant_data)
+
+#endif /* GL_SUNX_constant_data */
+
+/* -------------------- GL_SUN_convolution_border_modes -------------------- */
+
+#ifndef GL_SUN_convolution_border_modes
+#define GL_SUN_convolution_border_modes 1
+
+#define GL_WRAP_BORDER_SUN 0x81D4
+
+#define GLEW_SUN_convolution_border_modes GLEW_GET_VAR(__GLEW_SUN_convolution_border_modes)
+
+#endif /* GL_SUN_convolution_border_modes */
+
+/* -------------------------- GL_SUN_global_alpha -------------------------- */
+
+#ifndef GL_SUN_global_alpha
+#define GL_SUN_global_alpha 1
+
+#define GL_GLOBAL_ALPHA_SUN 0x81D9
+#define GL_GLOBAL_ALPHA_FACTOR_SUN 0x81DA
+
+typedef void (GLAPIENTRY * PFNGLGLOBALALPHAFACTORBSUNPROC) (GLbyte factor);
+typedef void (GLAPIENTRY * PFNGLGLOBALALPHAFACTORDSUNPROC) (GLdouble factor);
+typedef void (GLAPIENTRY * PFNGLGLOBALALPHAFACTORFSUNPROC) (GLfloat factor);
+typedef void (GLAPIENTRY * PFNGLGLOBALALPHAFACTORISUNPROC) (GLint factor);
+typedef void (GLAPIENTRY * PFNGLGLOBALALPHAFACTORSSUNPROC) (GLshort factor);
+typedef void (GLAPIENTRY * PFNGLGLOBALALPHAFACTORUBSUNPROC) (GLubyte factor);
+typedef void (GLAPIENTRY * PFNGLGLOBALALPHAFACTORUISUNPROC) (GLuint factor);
+typedef void (GLAPIENTRY * PFNGLGLOBALALPHAFACTORUSSUNPROC) (GLushort factor);
+
+#define glGlobalAlphaFactorbSUN GLEW_GET_FUN(__glewGlobalAlphaFactorbSUN)
+#define glGlobalAlphaFactordSUN GLEW_GET_FUN(__glewGlobalAlphaFactordSUN)
+#define glGlobalAlphaFactorfSUN GLEW_GET_FUN(__glewGlobalAlphaFactorfSUN)
+#define glGlobalAlphaFactoriSUN GLEW_GET_FUN(__glewGlobalAlphaFactoriSUN)
+#define glGlobalAlphaFactorsSUN GLEW_GET_FUN(__glewGlobalAlphaFactorsSUN)
+#define glGlobalAlphaFactorubSUN GLEW_GET_FUN(__glewGlobalAlphaFactorubSUN)
+#define glGlobalAlphaFactoruiSUN GLEW_GET_FUN(__glewGlobalAlphaFactoruiSUN)
+#define glGlobalAlphaFactorusSUN GLEW_GET_FUN(__glewGlobalAlphaFactorusSUN)
+
+#define GLEW_SUN_global_alpha GLEW_GET_VAR(__GLEW_SUN_global_alpha)
+
+#endif /* GL_SUN_global_alpha */
+
+/* --------------------------- GL_SUN_mesh_array --------------------------- */
+
+#ifndef GL_SUN_mesh_array
+#define GL_SUN_mesh_array 1
+
+#define GL_QUAD_MESH_SUN 0x8614
+#define GL_TRIANGLE_MESH_SUN 0x8615
+
+#define GLEW_SUN_mesh_array GLEW_GET_VAR(__GLEW_SUN_mesh_array)
+
+#endif /* GL_SUN_mesh_array */
+
+/* ------------------------ GL_SUN_read_video_pixels ----------------------- */
+
+#ifndef GL_SUN_read_video_pixels
+#define GL_SUN_read_video_pixels 1
+
+typedef void (GLAPIENTRY * PFNGLREADVIDEOPIXELSSUNPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid* pixels);
+
+#define glReadVideoPixelsSUN GLEW_GET_FUN(__glewReadVideoPixelsSUN)
+
+#define GLEW_SUN_read_video_pixels GLEW_GET_VAR(__GLEW_SUN_read_video_pixels)
+
+#endif /* GL_SUN_read_video_pixels */
+
+/* --------------------------- GL_SUN_slice_accum -------------------------- */
+
+#ifndef GL_SUN_slice_accum
+#define GL_SUN_slice_accum 1
+
+#define GL_SLICE_ACCUM_SUN 0x85CC
+
+#define GLEW_SUN_slice_accum GLEW_GET_VAR(__GLEW_SUN_slice_accum)
+
+#endif /* GL_SUN_slice_accum */
+
+/* -------------------------- GL_SUN_triangle_list ------------------------- */
+
+#ifndef GL_SUN_triangle_list
+#define GL_SUN_triangle_list 1
+
+#define GL_RESTART_SUN 0x01
+#define GL_REPLACE_MIDDLE_SUN 0x02
+#define GL_REPLACE_OLDEST_SUN 0x03
+#define GL_TRIANGLE_LIST_SUN 0x81D7
+#define GL_REPLACEMENT_CODE_SUN 0x81D8
+#define GL_REPLACEMENT_CODE_ARRAY_SUN 0x85C0
+#define GL_REPLACEMENT_CODE_ARRAY_TYPE_SUN 0x85C1
+#define GL_REPLACEMENT_CODE_ARRAY_STRIDE_SUN 0x85C2
+#define GL_REPLACEMENT_CODE_ARRAY_POINTER_SUN 0x85C3
+#define GL_R1UI_V3F_SUN 0x85C4
+#define GL_R1UI_C4UB_V3F_SUN 0x85C5
+#define GL_R1UI_C3F_V3F_SUN 0x85C6
+#define GL_R1UI_N3F_V3F_SUN 0x85C7
+#define GL_R1UI_C4F_N3F_V3F_SUN 0x85C8
+#define GL_R1UI_T2F_V3F_SUN 0x85C9
+#define GL_R1UI_T2F_N3F_V3F_SUN 0x85CA
+#define GL_R1UI_T2F_C4F_N3F_V3F_SUN 0x85CB
+
+typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEPOINTERSUNPROC) (GLenum type, GLsizei stride, const void* pointer);
+typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUBSUNPROC) (GLubyte code);
+typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUBVSUNPROC) (const GLubyte* code);
+typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUISUNPROC) (GLuint code);
+typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUIVSUNPROC) (const GLuint* code);
+typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUSSUNPROC) (GLushort code);
+typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUSVSUNPROC) (const GLushort* code);
+
+#define glReplacementCodePointerSUN GLEW_GET_FUN(__glewReplacementCodePointerSUN)
+#define glReplacementCodeubSUN GLEW_GET_FUN(__glewReplacementCodeubSUN)
+#define glReplacementCodeubvSUN GLEW_GET_FUN(__glewReplacementCodeubvSUN)
+#define glReplacementCodeuiSUN GLEW_GET_FUN(__glewReplacementCodeuiSUN)
+#define glReplacementCodeuivSUN GLEW_GET_FUN(__glewReplacementCodeuivSUN)
+#define glReplacementCodeusSUN GLEW_GET_FUN(__glewReplacementCodeusSUN)
+#define glReplacementCodeusvSUN GLEW_GET_FUN(__glewReplacementCodeusvSUN)
+
+#define GLEW_SUN_triangle_list GLEW_GET_VAR(__GLEW_SUN_triangle_list)
+
+#endif /* GL_SUN_triangle_list */
+
+/* ----------------------------- GL_SUN_vertex ----------------------------- */
+
+#ifndef GL_SUN_vertex
+#define GL_SUN_vertex 1
+
+typedef void (GLAPIENTRY * PFNGLCOLOR3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLCOLOR3FVERTEX3FVSUNPROC) (const GLfloat* c, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat* c, const GLfloat *n, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLCOLOR4UBVERTEX2FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y);
+typedef void (GLAPIENTRY * PFNGLCOLOR4UBVERTEX2FVSUNPROC) (const GLubyte* c, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLCOLOR4UBVERTEX3FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLCOLOR4UBVERTEX3FVSUNPROC) (const GLubyte* c, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLNORMAL3FVERTEX3FSUNPROC) (GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLNORMAL3FVERTEX3FVSUNPROC) (const GLfloat* n, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC) (const GLuint* rc, const GLfloat *c, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint* rc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC) (GLuint rc, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC) (const GLuint* rc, const GLubyte *c, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC) (const GLuint* rc, const GLfloat *n, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint* rc, const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLuint* rc, const GLfloat *tc, const GLfloat *n, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC) (const GLuint* rc, const GLfloat *tc, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC) (GLuint rc, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC) (const GLuint* rc, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC) (const GLfloat* tc, const GLfloat *c, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat* tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC) (const GLfloat* tc, const GLubyte *c, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat* tc, const GLfloat *n, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLTEXCOORD2FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GLAPIENTRY * PFNGLTEXCOORD2FVERTEX3FVSUNPROC) (const GLfloat* tc, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (GLAPIENTRY * PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC) (const GLfloat* tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (GLAPIENTRY * PFNGLTEXCOORD4FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (GLAPIENTRY * PFNGLTEXCOORD4FVERTEX4FVSUNPROC) (const GLfloat* tc, const GLfloat *v);
+
+#define glColor3fVertex3fSUN GLEW_GET_FUN(__glewColor3fVertex3fSUN)
+#define glColor3fVertex3fvSUN GLEW_GET_FUN(__glewColor3fVertex3fvSUN)
+#define glColor4fNormal3fVertex3fSUN GLEW_GET_FUN(__glewColor4fNormal3fVertex3fSUN)
+#define glColor4fNormal3fVertex3fvSUN GLEW_GET_FUN(__glewColor4fNormal3fVertex3fvSUN)
+#define glColor4ubVertex2fSUN GLEW_GET_FUN(__glewColor4ubVertex2fSUN)
+#define glColor4ubVertex2fvSUN GLEW_GET_FUN(__glewColor4ubVertex2fvSUN)
+#define glColor4ubVertex3fSUN GLEW_GET_FUN(__glewColor4ubVertex3fSUN)
+#define glColor4ubVertex3fvSUN GLEW_GET_FUN(__glewColor4ubVertex3fvSUN)
+#define glNormal3fVertex3fSUN GLEW_GET_FUN(__glewNormal3fVertex3fSUN)
+#define glNormal3fVertex3fvSUN GLEW_GET_FUN(__glewNormal3fVertex3fvSUN)
+#define glReplacementCodeuiColor3fVertex3fSUN GLEW_GET_FUN(__glewReplacementCodeuiColor3fVertex3fSUN)
+#define glReplacementCodeuiColor3fVertex3fvSUN GLEW_GET_FUN(__glewReplacementCodeuiColor3fVertex3fvSUN)
+#define glReplacementCodeuiColor4fNormal3fVertex3fSUN GLEW_GET_FUN(__glewReplacementCodeuiColor4fNormal3fVertex3fSUN)
+#define glReplacementCodeuiColor4fNormal3fVertex3fvSUN GLEW_GET_FUN(__glewReplacementCodeuiColor4fNormal3fVertex3fvSUN)
+#define glReplacementCodeuiColor4ubVertex3fSUN GLEW_GET_FUN(__glewReplacementCodeuiColor4ubVertex3fSUN)
+#define glReplacementCodeuiColor4ubVertex3fvSUN GLEW_GET_FUN(__glewReplacementCodeuiColor4ubVertex3fvSUN)
+#define glReplacementCodeuiNormal3fVertex3fSUN GLEW_GET_FUN(__glewReplacementCodeuiNormal3fVertex3fSUN)
+#define glReplacementCodeuiNormal3fVertex3fvSUN GLEW_GET_FUN(__glewReplacementCodeuiNormal3fVertex3fvSUN)
+#define glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN GLEW_GET_FUN(__glewReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN)
+#define glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN GLEW_GET_FUN(__glewReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN)
+#define glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN GLEW_GET_FUN(__glewReplacementCodeuiTexCoord2fNormal3fVertex3fSUN)
+#define glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN GLEW_GET_FUN(__glewReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN)
+#define glReplacementCodeuiTexCoord2fVertex3fSUN GLEW_GET_FUN(__glewReplacementCodeuiTexCoord2fVertex3fSUN)
+#define glReplacementCodeuiTexCoord2fVertex3fvSUN GLEW_GET_FUN(__glewReplacementCodeuiTexCoord2fVertex3fvSUN)
+#define glReplacementCodeuiVertex3fSUN GLEW_GET_FUN(__glewReplacementCodeuiVertex3fSUN)
+#define glReplacementCodeuiVertex3fvSUN GLEW_GET_FUN(__glewReplacementCodeuiVertex3fvSUN)
+#define glTexCoord2fColor3fVertex3fSUN GLEW_GET_FUN(__glewTexCoord2fColor3fVertex3fSUN)
+#define glTexCoord2fColor3fVertex3fvSUN GLEW_GET_FUN(__glewTexCoord2fColor3fVertex3fvSUN)
+#define glTexCoord2fColor4fNormal3fVertex3fSUN GLEW_GET_FUN(__glewTexCoord2fColor4fNormal3fVertex3fSUN)
+#define glTexCoord2fColor4fNormal3fVertex3fvSUN GLEW_GET_FUN(__glewTexCoord2fColor4fNormal3fVertex3fvSUN)
+#define glTexCoord2fColor4ubVertex3fSUN GLEW_GET_FUN(__glewTexCoord2fColor4ubVertex3fSUN)
+#define glTexCoord2fColor4ubVertex3fvSUN GLEW_GET_FUN(__glewTexCoord2fColor4ubVertex3fvSUN)
+#define glTexCoord2fNormal3fVertex3fSUN GLEW_GET_FUN(__glewTexCoord2fNormal3fVertex3fSUN)
+#define glTexCoord2fNormal3fVertex3fvSUN GLEW_GET_FUN(__glewTexCoord2fNormal3fVertex3fvSUN)
+#define glTexCoord2fVertex3fSUN GLEW_GET_FUN(__glewTexCoord2fVertex3fSUN)
+#define glTexCoord2fVertex3fvSUN GLEW_GET_FUN(__glewTexCoord2fVertex3fvSUN)
+#define glTexCoord4fColor4fNormal3fVertex4fSUN GLEW_GET_FUN(__glewTexCoord4fColor4fNormal3fVertex4fSUN)
+#define glTexCoord4fColor4fNormal3fVertex4fvSUN GLEW_GET_FUN(__glewTexCoord4fColor4fNormal3fVertex4fvSUN)
+#define glTexCoord4fVertex4fSUN GLEW_GET_FUN(__glewTexCoord4fVertex4fSUN)
+#define glTexCoord4fVertex4fvSUN GLEW_GET_FUN(__glewTexCoord4fVertex4fvSUN)
+
+#define GLEW_SUN_vertex GLEW_GET_VAR(__GLEW_SUN_vertex)
+
+#endif /* GL_SUN_vertex */
+
+/* -------------------------- GL_WIN_phong_shading ------------------------- */
+
+#ifndef GL_WIN_phong_shading
+#define GL_WIN_phong_shading 1
+
+#define GL_PHONG_WIN 0x80EA
+#define GL_PHONG_HINT_WIN 0x80EB
+
+#define GLEW_WIN_phong_shading GLEW_GET_VAR(__GLEW_WIN_phong_shading)
+
+#endif /* GL_WIN_phong_shading */
+
+/* -------------------------- GL_WIN_specular_fog -------------------------- */
+
+#ifndef GL_WIN_specular_fog
+#define GL_WIN_specular_fog 1
+
+#define GL_FOG_SPECULAR_TEXTURE_WIN 0x80EC
+
+#define GLEW_WIN_specular_fog GLEW_GET_VAR(__GLEW_WIN_specular_fog)
+
+#endif /* GL_WIN_specular_fog */
+
+/* ---------------------------- GL_WIN_swap_hint --------------------------- */
+
+#ifndef GL_WIN_swap_hint
+#define GL_WIN_swap_hint 1
+
+typedef void (GLAPIENTRY * PFNGLADDSWAPHINTRECTWINPROC) (GLint x, GLint y, GLsizei width, GLsizei height);
+
+#define glAddSwapHintRectWIN GLEW_GET_FUN(__glewAddSwapHintRectWIN)
+
+#define GLEW_WIN_swap_hint GLEW_GET_VAR(__GLEW_WIN_swap_hint)
+
+#endif /* GL_WIN_swap_hint */
+
+/* ------------------------------------------------------------------------- */
+
+#if defined(GLEW_MX) && defined(_WIN32)
+#define GLEW_FUN_EXPORT
+#else
+#define GLEW_FUN_EXPORT GLEWAPI
+#endif /* GLEW_MX */
+
+#if defined(GLEW_MX)
+#define GLEW_VAR_EXPORT
+#else
+#define GLEW_VAR_EXPORT GLEWAPI
+#endif /* GLEW_MX */
+
+#if defined(GLEW_MX) && defined(_WIN32)
+struct GLEWContextStruct
+{
+#endif /* GLEW_MX */
+
+GLEW_FUN_EXPORT PFNGLCOPYTEXSUBIMAGE3DPROC __glewCopyTexSubImage3D;
+GLEW_FUN_EXPORT PFNGLDRAWRANGEELEMENTSPROC __glewDrawRangeElements;
+GLEW_FUN_EXPORT PFNGLTEXIMAGE3DPROC __glewTexImage3D;
+GLEW_FUN_EXPORT PFNGLTEXSUBIMAGE3DPROC __glewTexSubImage3D;
+
+GLEW_FUN_EXPORT PFNGLACTIVETEXTUREPROC __glewActiveTexture;
+GLEW_FUN_EXPORT PFNGLCLIENTACTIVETEXTUREPROC __glewClientActiveTexture;
+GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXIMAGE1DPROC __glewCompressedTexImage1D;
+GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXIMAGE2DPROC __glewCompressedTexImage2D;
+GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXIMAGE3DPROC __glewCompressedTexImage3D;
+GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC __glewCompressedTexSubImage1D;
+GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC __glewCompressedTexSubImage2D;
+GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC __glewCompressedTexSubImage3D;
+GLEW_FUN_EXPORT PFNGLGETCOMPRESSEDTEXIMAGEPROC __glewGetCompressedTexImage;
+GLEW_FUN_EXPORT PFNGLLOADTRANSPOSEMATRIXDPROC __glewLoadTransposeMatrixd;
+GLEW_FUN_EXPORT PFNGLLOADTRANSPOSEMATRIXFPROC __glewLoadTransposeMatrixf;
+GLEW_FUN_EXPORT PFNGLMULTTRANSPOSEMATRIXDPROC __glewMultTransposeMatrixd;
+GLEW_FUN_EXPORT PFNGLMULTTRANSPOSEMATRIXFPROC __glewMultTransposeMatrixf;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1DPROC __glewMultiTexCoord1d;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1DVPROC __glewMultiTexCoord1dv;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1FPROC __glewMultiTexCoord1f;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1FVPROC __glewMultiTexCoord1fv;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1IPROC __glewMultiTexCoord1i;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1IVPROC __glewMultiTexCoord1iv;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1SPROC __glewMultiTexCoord1s;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1SVPROC __glewMultiTexCoord1sv;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2DPROC __glewMultiTexCoord2d;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2DVPROC __glewMultiTexCoord2dv;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2FPROC __glewMultiTexCoord2f;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2FVPROC __glewMultiTexCoord2fv;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2IPROC __glewMultiTexCoord2i;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2IVPROC __glewMultiTexCoord2iv;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2SPROC __glewMultiTexCoord2s;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2SVPROC __glewMultiTexCoord2sv;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3DPROC __glewMultiTexCoord3d;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3DVPROC __glewMultiTexCoord3dv;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3FPROC __glewMultiTexCoord3f;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3FVPROC __glewMultiTexCoord3fv;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3IPROC __glewMultiTexCoord3i;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3IVPROC __glewMultiTexCoord3iv;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3SPROC __glewMultiTexCoord3s;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3SVPROC __glewMultiTexCoord3sv;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4DPROC __glewMultiTexCoord4d;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4DVPROC __glewMultiTexCoord4dv;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4FPROC __glewMultiTexCoord4f;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4FVPROC __glewMultiTexCoord4fv;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4IPROC __glewMultiTexCoord4i;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4IVPROC __glewMultiTexCoord4iv;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4SPROC __glewMultiTexCoord4s;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4SVPROC __glewMultiTexCoord4sv;
+GLEW_FUN_EXPORT PFNGLSAMPLECOVERAGEPROC __glewSampleCoverage;
+
+GLEW_FUN_EXPORT PFNGLBLENDCOLORPROC __glewBlendColor;
+GLEW_FUN_EXPORT PFNGLBLENDEQUATIONPROC __glewBlendEquation;
+GLEW_FUN_EXPORT PFNGLBLENDFUNCSEPARATEPROC __glewBlendFuncSeparate;
+GLEW_FUN_EXPORT PFNGLFOGCOORDPOINTERPROC __glewFogCoordPointer;
+GLEW_FUN_EXPORT PFNGLFOGCOORDDPROC __glewFogCoordd;
+GLEW_FUN_EXPORT PFNGLFOGCOORDDVPROC __glewFogCoorddv;
+GLEW_FUN_EXPORT PFNGLFOGCOORDFPROC __glewFogCoordf;
+GLEW_FUN_EXPORT PFNGLFOGCOORDFVPROC __glewFogCoordfv;
+GLEW_FUN_EXPORT PFNGLMULTIDRAWARRAYSPROC __glewMultiDrawArrays;
+GLEW_FUN_EXPORT PFNGLMULTIDRAWELEMENTSPROC __glewMultiDrawElements;
+GLEW_FUN_EXPORT PFNGLPOINTPARAMETERFPROC __glewPointParameterf;
+GLEW_FUN_EXPORT PFNGLPOINTPARAMETERFVPROC __glewPointParameterfv;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3BPROC __glewSecondaryColor3b;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3BVPROC __glewSecondaryColor3bv;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3DPROC __glewSecondaryColor3d;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3DVPROC __glewSecondaryColor3dv;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3FPROC __glewSecondaryColor3f;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3FVPROC __glewSecondaryColor3fv;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3IPROC __glewSecondaryColor3i;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3IVPROC __glewSecondaryColor3iv;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3SPROC __glewSecondaryColor3s;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3SVPROC __glewSecondaryColor3sv;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3UBPROC __glewSecondaryColor3ub;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3UBVPROC __glewSecondaryColor3ubv;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3UIPROC __glewSecondaryColor3ui;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3UIVPROC __glewSecondaryColor3uiv;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3USPROC __glewSecondaryColor3us;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3USVPROC __glewSecondaryColor3usv;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLORPOINTERPROC __glewSecondaryColorPointer;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2DPROC __glewWindowPos2d;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2DVPROC __glewWindowPos2dv;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2FPROC __glewWindowPos2f;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2FVPROC __glewWindowPos2fv;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2IPROC __glewWindowPos2i;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2IVPROC __glewWindowPos2iv;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2SPROC __glewWindowPos2s;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2SVPROC __glewWindowPos2sv;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3DPROC __glewWindowPos3d;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3DVPROC __glewWindowPos3dv;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3FPROC __glewWindowPos3f;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3FVPROC __glewWindowPos3fv;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3IPROC __glewWindowPos3i;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3IVPROC __glewWindowPos3iv;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3SPROC __glewWindowPos3s;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3SVPROC __glewWindowPos3sv;
+
+GLEW_FUN_EXPORT PFNGLBEGINQUERYPROC __glewBeginQuery;
+GLEW_FUN_EXPORT PFNGLBINDBUFFERPROC __glewBindBuffer;
+GLEW_FUN_EXPORT PFNGLBUFFERDATAPROC __glewBufferData;
+GLEW_FUN_EXPORT PFNGLBUFFERSUBDATAPROC __glewBufferSubData;
+GLEW_FUN_EXPORT PFNGLDELETEBUFFERSPROC __glewDeleteBuffers;
+GLEW_FUN_EXPORT PFNGLDELETEQUERIESPROC __glewDeleteQueries;
+GLEW_FUN_EXPORT PFNGLENDQUERYPROC __glewEndQuery;
+GLEW_FUN_EXPORT PFNGLGENBUFFERSPROC __glewGenBuffers;
+GLEW_FUN_EXPORT PFNGLGENQUERIESPROC __glewGenQueries;
+GLEW_FUN_EXPORT PFNGLGETBUFFERPARAMETERIVPROC __glewGetBufferParameteriv;
+GLEW_FUN_EXPORT PFNGLGETBUFFERPOINTERVPROC __glewGetBufferPointerv;
+GLEW_FUN_EXPORT PFNGLGETBUFFERSUBDATAPROC __glewGetBufferSubData;
+GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTIVPROC __glewGetQueryObjectiv;
+GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTUIVPROC __glewGetQueryObjectuiv;
+GLEW_FUN_EXPORT PFNGLGETQUERYIVPROC __glewGetQueryiv;
+GLEW_FUN_EXPORT PFNGLISBUFFERPROC __glewIsBuffer;
+GLEW_FUN_EXPORT PFNGLISQUERYPROC __glewIsQuery;
+GLEW_FUN_EXPORT PFNGLMAPBUFFERPROC __glewMapBuffer;
+GLEW_FUN_EXPORT PFNGLUNMAPBUFFERPROC __glewUnmapBuffer;
+
+GLEW_FUN_EXPORT PFNGLATTACHSHADERPROC __glewAttachShader;
+GLEW_FUN_EXPORT PFNGLBINDATTRIBLOCATIONPROC __glewBindAttribLocation;
+GLEW_FUN_EXPORT PFNGLBLENDEQUATIONSEPARATEPROC __glewBlendEquationSeparate;
+GLEW_FUN_EXPORT PFNGLCOMPILESHADERPROC __glewCompileShader;
+GLEW_FUN_EXPORT PFNGLCREATEPROGRAMPROC __glewCreateProgram;
+GLEW_FUN_EXPORT PFNGLCREATESHADERPROC __glewCreateShader;
+GLEW_FUN_EXPORT PFNGLDELETEPROGRAMPROC __glewDeleteProgram;
+GLEW_FUN_EXPORT PFNGLDELETESHADERPROC __glewDeleteShader;
+GLEW_FUN_EXPORT PFNGLDETACHSHADERPROC __glewDetachShader;
+GLEW_FUN_EXPORT PFNGLDISABLEVERTEXATTRIBARRAYPROC __glewDisableVertexAttribArray;
+GLEW_FUN_EXPORT PFNGLDRAWBUFFERSPROC __glewDrawBuffers;
+GLEW_FUN_EXPORT PFNGLENABLEVERTEXATTRIBARRAYPROC __glewEnableVertexAttribArray;
+GLEW_FUN_EXPORT PFNGLGETACTIVEATTRIBPROC __glewGetActiveAttrib;
+GLEW_FUN_EXPORT PFNGLGETACTIVEUNIFORMPROC __glewGetActiveUniform;
+GLEW_FUN_EXPORT PFNGLGETATTACHEDSHADERSPROC __glewGetAttachedShaders;
+GLEW_FUN_EXPORT PFNGLGETATTRIBLOCATIONPROC __glewGetAttribLocation;
+GLEW_FUN_EXPORT PFNGLGETPROGRAMINFOLOGPROC __glewGetProgramInfoLog;
+GLEW_FUN_EXPORT PFNGLGETPROGRAMIVPROC __glewGetProgramiv;
+GLEW_FUN_EXPORT PFNGLGETSHADERINFOLOGPROC __glewGetShaderInfoLog;
+GLEW_FUN_EXPORT PFNGLGETSHADERSOURCEPROC __glewGetShaderSource;
+GLEW_FUN_EXPORT PFNGLGETSHADERIVPROC __glewGetShaderiv;
+GLEW_FUN_EXPORT PFNGLGETUNIFORMLOCATIONPROC __glewGetUniformLocation;
+GLEW_FUN_EXPORT PFNGLGETUNIFORMFVPROC __glewGetUniformfv;
+GLEW_FUN_EXPORT PFNGLGETUNIFORMIVPROC __glewGetUniformiv;
+GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBPOINTERVPROC __glewGetVertexAttribPointerv;
+GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBDVPROC __glewGetVertexAttribdv;
+GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBFVPROC __glewGetVertexAttribfv;
+GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBIVPROC __glewGetVertexAttribiv;
+GLEW_FUN_EXPORT PFNGLISPROGRAMPROC __glewIsProgram;
+GLEW_FUN_EXPORT PFNGLISSHADERPROC __glewIsShader;
+GLEW_FUN_EXPORT PFNGLLINKPROGRAMPROC __glewLinkProgram;
+GLEW_FUN_EXPORT PFNGLSHADERSOURCEPROC __glewShaderSource;
+GLEW_FUN_EXPORT PFNGLSTENCILFUNCSEPARATEPROC __glewStencilFuncSeparate;
+GLEW_FUN_EXPORT PFNGLSTENCILMASKSEPARATEPROC __glewStencilMaskSeparate;
+GLEW_FUN_EXPORT PFNGLSTENCILOPSEPARATEPROC __glewStencilOpSeparate;
+GLEW_FUN_EXPORT PFNGLUNIFORM1FPROC __glewUniform1f;
+GLEW_FUN_EXPORT PFNGLUNIFORM1FVPROC __glewUniform1fv;
+GLEW_FUN_EXPORT PFNGLUNIFORM1IPROC __glewUniform1i;
+GLEW_FUN_EXPORT PFNGLUNIFORM1IVPROC __glewUniform1iv;
+GLEW_FUN_EXPORT PFNGLUNIFORM2FPROC __glewUniform2f;
+GLEW_FUN_EXPORT PFNGLUNIFORM2FVPROC __glewUniform2fv;
+GLEW_FUN_EXPORT PFNGLUNIFORM2IPROC __glewUniform2i;
+GLEW_FUN_EXPORT PFNGLUNIFORM2IVPROC __glewUniform2iv;
+GLEW_FUN_EXPORT PFNGLUNIFORM3FPROC __glewUniform3f;
+GLEW_FUN_EXPORT PFNGLUNIFORM3FVPROC __glewUniform3fv;
+GLEW_FUN_EXPORT PFNGLUNIFORM3IPROC __glewUniform3i;
+GLEW_FUN_EXPORT PFNGLUNIFORM3IVPROC __glewUniform3iv;
+GLEW_FUN_EXPORT PFNGLUNIFORM4FPROC __glewUniform4f;
+GLEW_FUN_EXPORT PFNGLUNIFORM4FVPROC __glewUniform4fv;
+GLEW_FUN_EXPORT PFNGLUNIFORM4IPROC __glewUniform4i;
+GLEW_FUN_EXPORT PFNGLUNIFORM4IVPROC __glewUniform4iv;
+GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX2FVPROC __glewUniformMatrix2fv;
+GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX3FVPROC __glewUniformMatrix3fv;
+GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX4FVPROC __glewUniformMatrix4fv;
+GLEW_FUN_EXPORT PFNGLUSEPROGRAMPROC __glewUseProgram;
+GLEW_FUN_EXPORT PFNGLVALIDATEPROGRAMPROC __glewValidateProgram;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1DPROC __glewVertexAttrib1d;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1DVPROC __glewVertexAttrib1dv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1FPROC __glewVertexAttrib1f;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1FVPROC __glewVertexAttrib1fv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1SPROC __glewVertexAttrib1s;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1SVPROC __glewVertexAttrib1sv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2DPROC __glewVertexAttrib2d;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2DVPROC __glewVertexAttrib2dv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2FPROC __glewVertexAttrib2f;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2FVPROC __glewVertexAttrib2fv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2SPROC __glewVertexAttrib2s;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2SVPROC __glewVertexAttrib2sv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3DPROC __glewVertexAttrib3d;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3DVPROC __glewVertexAttrib3dv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3FPROC __glewVertexAttrib3f;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3FVPROC __glewVertexAttrib3fv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3SPROC __glewVertexAttrib3s;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3SVPROC __glewVertexAttrib3sv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NBVPROC __glewVertexAttrib4Nbv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NIVPROC __glewVertexAttrib4Niv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NSVPROC __glewVertexAttrib4Nsv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NUBPROC __glewVertexAttrib4Nub;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NUBVPROC __glewVertexAttrib4Nubv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NUIVPROC __glewVertexAttrib4Nuiv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NUSVPROC __glewVertexAttrib4Nusv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4BVPROC __glewVertexAttrib4bv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4DPROC __glewVertexAttrib4d;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4DVPROC __glewVertexAttrib4dv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4FPROC __glewVertexAttrib4f;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4FVPROC __glewVertexAttrib4fv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4IVPROC __glewVertexAttrib4iv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4SPROC __glewVertexAttrib4s;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4SVPROC __glewVertexAttrib4sv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4UBVPROC __glewVertexAttrib4ubv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4UIVPROC __glewVertexAttrib4uiv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4USVPROC __glewVertexAttrib4usv;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBPOINTERPROC __glewVertexAttribPointer;
+
+GLEW_FUN_EXPORT PFNGLTBUFFERMASK3DFXPROC __glewTbufferMask3DFX;
+
+GLEW_FUN_EXPORT PFNGLDRAWELEMENTARRAYAPPLEPROC __glewDrawElementArrayAPPLE;
+GLEW_FUN_EXPORT PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC __glewDrawRangeElementArrayAPPLE;
+GLEW_FUN_EXPORT PFNGLELEMENTPOINTERAPPLEPROC __glewElementPointerAPPLE;
+GLEW_FUN_EXPORT PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC __glewMultiDrawElementArrayAPPLE;
+GLEW_FUN_EXPORT PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC __glewMultiDrawRangeElementArrayAPPLE;
+
+GLEW_FUN_EXPORT PFNGLDELETEFENCESAPPLEPROC __glewDeleteFencesAPPLE;
+GLEW_FUN_EXPORT PFNGLFINISHFENCEAPPLEPROC __glewFinishFenceAPPLE;
+GLEW_FUN_EXPORT PFNGLFINISHOBJECTAPPLEPROC __glewFinishObjectAPPLE;
+GLEW_FUN_EXPORT PFNGLGENFENCESAPPLEPROC __glewGenFencesAPPLE;
+GLEW_FUN_EXPORT PFNGLISFENCEAPPLEPROC __glewIsFenceAPPLE;
+GLEW_FUN_EXPORT PFNGLSETFENCEAPPLEPROC __glewSetFenceAPPLE;
+GLEW_FUN_EXPORT PFNGLTESTFENCEAPPLEPROC __glewTestFenceAPPLE;
+GLEW_FUN_EXPORT PFNGLTESTOBJECTAPPLEPROC __glewTestObjectAPPLE;
+
+GLEW_FUN_EXPORT PFNGLGETTEXPARAMETERPOINTERVAPPLEPROC __glewGetTexParameterPointervAPPLE;
+GLEW_FUN_EXPORT PFNGLTEXTURERANGEAPPLEPROC __glewTextureRangeAPPLE;
+
+GLEW_FUN_EXPORT PFNGLBINDVERTEXARRAYAPPLEPROC __glewBindVertexArrayAPPLE;
+GLEW_FUN_EXPORT PFNGLDELETEVERTEXARRAYSAPPLEPROC __glewDeleteVertexArraysAPPLE;
+GLEW_FUN_EXPORT PFNGLGENVERTEXARRAYSAPPLEPROC __glewGenVertexArraysAPPLE;
+GLEW_FUN_EXPORT PFNGLISVERTEXARRAYAPPLEPROC __glewIsVertexArrayAPPLE;
+
+GLEW_FUN_EXPORT PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC __glewFlushVertexArrayRangeAPPLE;
+GLEW_FUN_EXPORT PFNGLVERTEXARRAYPARAMETERIAPPLEPROC __glewVertexArrayParameteriAPPLE;
+GLEW_FUN_EXPORT PFNGLVERTEXARRAYRANGEAPPLEPROC __glewVertexArrayRangeAPPLE;
+
+GLEW_FUN_EXPORT PFNGLCLAMPCOLORARBPROC __glewClampColorARB;
+
+GLEW_FUN_EXPORT PFNGLDRAWBUFFERSARBPROC __glewDrawBuffersARB;
+
+GLEW_FUN_EXPORT PFNGLCOLORSUBTABLEPROC __glewColorSubTable;
+GLEW_FUN_EXPORT PFNGLCOLORTABLEPROC __glewColorTable;
+GLEW_FUN_EXPORT PFNGLCOLORTABLEPARAMETERFVPROC __glewColorTableParameterfv;
+GLEW_FUN_EXPORT PFNGLCOLORTABLEPARAMETERIVPROC __glewColorTableParameteriv;
+GLEW_FUN_EXPORT PFNGLCONVOLUTIONFILTER1DPROC __glewConvolutionFilter1D;
+GLEW_FUN_EXPORT PFNGLCONVOLUTIONFILTER2DPROC __glewConvolutionFilter2D;
+GLEW_FUN_EXPORT PFNGLCONVOLUTIONPARAMETERFPROC __glewConvolutionParameterf;
+GLEW_FUN_EXPORT PFNGLCONVOLUTIONPARAMETERFVPROC __glewConvolutionParameterfv;
+GLEW_FUN_EXPORT PFNGLCONVOLUTIONPARAMETERIPROC __glewConvolutionParameteri;
+GLEW_FUN_EXPORT PFNGLCONVOLUTIONPARAMETERIVPROC __glewConvolutionParameteriv;
+GLEW_FUN_EXPORT PFNGLCOPYCOLORSUBTABLEPROC __glewCopyColorSubTable;
+GLEW_FUN_EXPORT PFNGLCOPYCOLORTABLEPROC __glewCopyColorTable;
+GLEW_FUN_EXPORT PFNGLCOPYCONVOLUTIONFILTER1DPROC __glewCopyConvolutionFilter1D;
+GLEW_FUN_EXPORT PFNGLCOPYCONVOLUTIONFILTER2DPROC __glewCopyConvolutionFilter2D;
+GLEW_FUN_EXPORT PFNGLGETCOLORTABLEPROC __glewGetColorTable;
+GLEW_FUN_EXPORT PFNGLGETCOLORTABLEPARAMETERFVPROC __glewGetColorTableParameterfv;
+GLEW_FUN_EXPORT PFNGLGETCOLORTABLEPARAMETERIVPROC __glewGetColorTableParameteriv;
+GLEW_FUN_EXPORT PFNGLGETCONVOLUTIONFILTERPROC __glewGetConvolutionFilter;
+GLEW_FUN_EXPORT PFNGLGETCONVOLUTIONPARAMETERFVPROC __glewGetConvolutionParameterfv;
+GLEW_FUN_EXPORT PFNGLGETCONVOLUTIONPARAMETERIVPROC __glewGetConvolutionParameteriv;
+GLEW_FUN_EXPORT PFNGLGETHISTOGRAMPROC __glewGetHistogram;
+GLEW_FUN_EXPORT PFNGLGETHISTOGRAMPARAMETERFVPROC __glewGetHistogramParameterfv;
+GLEW_FUN_EXPORT PFNGLGETHISTOGRAMPARAMETERIVPROC __glewGetHistogramParameteriv;
+GLEW_FUN_EXPORT PFNGLGETMINMAXPROC __glewGetMinmax;
+GLEW_FUN_EXPORT PFNGLGETMINMAXPARAMETERFVPROC __glewGetMinmaxParameterfv;
+GLEW_FUN_EXPORT PFNGLGETMINMAXPARAMETERIVPROC __glewGetMinmaxParameteriv;
+GLEW_FUN_EXPORT PFNGLGETSEPARABLEFILTERPROC __glewGetSeparableFilter;
+GLEW_FUN_EXPORT PFNGLHISTOGRAMPROC __glewHistogram;
+GLEW_FUN_EXPORT PFNGLMINMAXPROC __glewMinmax;
+GLEW_FUN_EXPORT PFNGLRESETHISTOGRAMPROC __glewResetHistogram;
+GLEW_FUN_EXPORT PFNGLRESETMINMAXPROC __glewResetMinmax;
+GLEW_FUN_EXPORT PFNGLSEPARABLEFILTER2DPROC __glewSeparableFilter2D;
+
+GLEW_FUN_EXPORT PFNGLCURRENTPALETTEMATRIXARBPROC __glewCurrentPaletteMatrixARB;
+GLEW_FUN_EXPORT PFNGLMATRIXINDEXPOINTERARBPROC __glewMatrixIndexPointerARB;
+GLEW_FUN_EXPORT PFNGLMATRIXINDEXUBVARBPROC __glewMatrixIndexubvARB;
+GLEW_FUN_EXPORT PFNGLMATRIXINDEXUIVARBPROC __glewMatrixIndexuivARB;
+GLEW_FUN_EXPORT PFNGLMATRIXINDEXUSVARBPROC __glewMatrixIndexusvARB;
+
+GLEW_FUN_EXPORT PFNGLSAMPLECOVERAGEARBPROC __glewSampleCoverageARB;
+
+GLEW_FUN_EXPORT PFNGLACTIVETEXTUREARBPROC __glewActiveTextureARB;
+GLEW_FUN_EXPORT PFNGLCLIENTACTIVETEXTUREARBPROC __glewClientActiveTextureARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1DARBPROC __glewMultiTexCoord1dARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1DVARBPROC __glewMultiTexCoord1dvARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1FARBPROC __glewMultiTexCoord1fARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1FVARBPROC __glewMultiTexCoord1fvARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1IARBPROC __glewMultiTexCoord1iARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1IVARBPROC __glewMultiTexCoord1ivARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1SARBPROC __glewMultiTexCoord1sARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1SVARBPROC __glewMultiTexCoord1svARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2DARBPROC __glewMultiTexCoord2dARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2DVARBPROC __glewMultiTexCoord2dvARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2FARBPROC __glewMultiTexCoord2fARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2FVARBPROC __glewMultiTexCoord2fvARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2IARBPROC __glewMultiTexCoord2iARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2IVARBPROC __glewMultiTexCoord2ivARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2SARBPROC __glewMultiTexCoord2sARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2SVARBPROC __glewMultiTexCoord2svARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3DARBPROC __glewMultiTexCoord3dARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3DVARBPROC __glewMultiTexCoord3dvARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3FARBPROC __glewMultiTexCoord3fARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3FVARBPROC __glewMultiTexCoord3fvARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3IARBPROC __glewMultiTexCoord3iARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3IVARBPROC __glewMultiTexCoord3ivARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3SARBPROC __glewMultiTexCoord3sARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3SVARBPROC __glewMultiTexCoord3svARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4DARBPROC __glewMultiTexCoord4dARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4DVARBPROC __glewMultiTexCoord4dvARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4FARBPROC __glewMultiTexCoord4fARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4FVARBPROC __glewMultiTexCoord4fvARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4IARBPROC __glewMultiTexCoord4iARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4IVARBPROC __glewMultiTexCoord4ivARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4SARBPROC __glewMultiTexCoord4sARB;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4SVARBPROC __glewMultiTexCoord4svARB;
+
+GLEW_FUN_EXPORT PFNGLBEGINQUERYARBPROC __glewBeginQueryARB;
+GLEW_FUN_EXPORT PFNGLDELETEQUERIESARBPROC __glewDeleteQueriesARB;
+GLEW_FUN_EXPORT PFNGLENDQUERYARBPROC __glewEndQueryARB;
+GLEW_FUN_EXPORT PFNGLGENQUERIESARBPROC __glewGenQueriesARB;
+GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTIVARBPROC __glewGetQueryObjectivARB;
+GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTUIVARBPROC __glewGetQueryObjectuivARB;
+GLEW_FUN_EXPORT PFNGLGETQUERYIVARBPROC __glewGetQueryivARB;
+GLEW_FUN_EXPORT PFNGLISQUERYARBPROC __glewIsQueryARB;
+
+GLEW_FUN_EXPORT PFNGLPOINTPARAMETERFARBPROC __glewPointParameterfARB;
+GLEW_FUN_EXPORT PFNGLPOINTPARAMETERFVARBPROC __glewPointParameterfvARB;
+
+GLEW_FUN_EXPORT PFNGLATTACHOBJECTARBPROC __glewAttachObjectARB;
+GLEW_FUN_EXPORT PFNGLCOMPILESHADERARBPROC __glewCompileShaderARB;
+GLEW_FUN_EXPORT PFNGLCREATEPROGRAMOBJECTARBPROC __glewCreateProgramObjectARB;
+GLEW_FUN_EXPORT PFNGLCREATESHADEROBJECTARBPROC __glewCreateShaderObjectARB;
+GLEW_FUN_EXPORT PFNGLDELETEOBJECTARBPROC __glewDeleteObjectARB;
+GLEW_FUN_EXPORT PFNGLDETACHOBJECTARBPROC __glewDetachObjectARB;
+GLEW_FUN_EXPORT PFNGLGETACTIVEUNIFORMARBPROC __glewGetActiveUniformARB;
+GLEW_FUN_EXPORT PFNGLGETATTACHEDOBJECTSARBPROC __glewGetAttachedObjectsARB;
+GLEW_FUN_EXPORT PFNGLGETHANDLEARBPROC __glewGetHandleARB;
+GLEW_FUN_EXPORT PFNGLGETINFOLOGARBPROC __glewGetInfoLogARB;
+GLEW_FUN_EXPORT PFNGLGETOBJECTPARAMETERFVARBPROC __glewGetObjectParameterfvARB;
+GLEW_FUN_EXPORT PFNGLGETOBJECTPARAMETERIVARBPROC __glewGetObjectParameterivARB;
+GLEW_FUN_EXPORT PFNGLGETSHADERSOURCEARBPROC __glewGetShaderSourceARB;
+GLEW_FUN_EXPORT PFNGLGETUNIFORMLOCATIONARBPROC __glewGetUniformLocationARB;
+GLEW_FUN_EXPORT PFNGLGETUNIFORMFVARBPROC __glewGetUniformfvARB;
+GLEW_FUN_EXPORT PFNGLGETUNIFORMIVARBPROC __glewGetUniformivARB;
+GLEW_FUN_EXPORT PFNGLLINKPROGRAMARBPROC __glewLinkProgramARB;
+GLEW_FUN_EXPORT PFNGLSHADERSOURCEARBPROC __glewShaderSourceARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM1FARBPROC __glewUniform1fARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM1FVARBPROC __glewUniform1fvARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM1IARBPROC __glewUniform1iARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM1IVARBPROC __glewUniform1ivARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM2FARBPROC __glewUniform2fARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM2FVARBPROC __glewUniform2fvARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM2IARBPROC __glewUniform2iARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM2IVARBPROC __glewUniform2ivARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM3FARBPROC __glewUniform3fARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM3FVARBPROC __glewUniform3fvARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM3IARBPROC __glewUniform3iARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM3IVARBPROC __glewUniform3ivARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM4FARBPROC __glewUniform4fARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM4FVARBPROC __glewUniform4fvARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM4IARBPROC __glewUniform4iARB;
+GLEW_FUN_EXPORT PFNGLUNIFORM4IVARBPROC __glewUniform4ivARB;
+GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX2FVARBPROC __glewUniformMatrix2fvARB;
+GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX3FVARBPROC __glewUniformMatrix3fvARB;
+GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX4FVARBPROC __glewUniformMatrix4fvARB;
+GLEW_FUN_EXPORT PFNGLUSEPROGRAMOBJECTARBPROC __glewUseProgramObjectARB;
+GLEW_FUN_EXPORT PFNGLVALIDATEPROGRAMARBPROC __glewValidateProgramARB;
+
+GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXIMAGE1DARBPROC __glewCompressedTexImage1DARB;
+GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXIMAGE2DARBPROC __glewCompressedTexImage2DARB;
+GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXIMAGE3DARBPROC __glewCompressedTexImage3DARB;
+GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC __glewCompressedTexSubImage1DARB;
+GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC __glewCompressedTexSubImage2DARB;
+GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC __glewCompressedTexSubImage3DARB;
+GLEW_FUN_EXPORT PFNGLGETCOMPRESSEDTEXIMAGEARBPROC __glewGetCompressedTexImageARB;
+
+GLEW_FUN_EXPORT PFNGLLOADTRANSPOSEMATRIXDARBPROC __glewLoadTransposeMatrixdARB;
+GLEW_FUN_EXPORT PFNGLLOADTRANSPOSEMATRIXFARBPROC __glewLoadTransposeMatrixfARB;
+GLEW_FUN_EXPORT PFNGLMULTTRANSPOSEMATRIXDARBPROC __glewMultTransposeMatrixdARB;
+GLEW_FUN_EXPORT PFNGLMULTTRANSPOSEMATRIXFARBPROC __glewMultTransposeMatrixfARB;
+
+GLEW_FUN_EXPORT PFNGLVERTEXBLENDARBPROC __glewVertexBlendARB;
+GLEW_FUN_EXPORT PFNGLWEIGHTPOINTERARBPROC __glewWeightPointerARB;
+GLEW_FUN_EXPORT PFNGLWEIGHTBVARBPROC __glewWeightbvARB;
+GLEW_FUN_EXPORT PFNGLWEIGHTDVARBPROC __glewWeightdvARB;
+GLEW_FUN_EXPORT PFNGLWEIGHTFVARBPROC __glewWeightfvARB;
+GLEW_FUN_EXPORT PFNGLWEIGHTIVARBPROC __glewWeightivARB;
+GLEW_FUN_EXPORT PFNGLWEIGHTSVARBPROC __glewWeightsvARB;
+GLEW_FUN_EXPORT PFNGLWEIGHTUBVARBPROC __glewWeightubvARB;
+GLEW_FUN_EXPORT PFNGLWEIGHTUIVARBPROC __glewWeightuivARB;
+GLEW_FUN_EXPORT PFNGLWEIGHTUSVARBPROC __glewWeightusvARB;
+
+GLEW_FUN_EXPORT PFNGLBINDBUFFERARBPROC __glewBindBufferARB;
+GLEW_FUN_EXPORT PFNGLBUFFERDATAARBPROC __glewBufferDataARB;
+GLEW_FUN_EXPORT PFNGLBUFFERSUBDATAARBPROC __glewBufferSubDataARB;
+GLEW_FUN_EXPORT PFNGLDELETEBUFFERSARBPROC __glewDeleteBuffersARB;
+GLEW_FUN_EXPORT PFNGLGENBUFFERSARBPROC __glewGenBuffersARB;
+GLEW_FUN_EXPORT PFNGLGETBUFFERPARAMETERIVARBPROC __glewGetBufferParameterivARB;
+GLEW_FUN_EXPORT PFNGLGETBUFFERPOINTERVARBPROC __glewGetBufferPointervARB;
+GLEW_FUN_EXPORT PFNGLGETBUFFERSUBDATAARBPROC __glewGetBufferSubDataARB;
+GLEW_FUN_EXPORT PFNGLISBUFFERARBPROC __glewIsBufferARB;
+GLEW_FUN_EXPORT PFNGLMAPBUFFERARBPROC __glewMapBufferARB;
+GLEW_FUN_EXPORT PFNGLUNMAPBUFFERARBPROC __glewUnmapBufferARB;
+
+GLEW_FUN_EXPORT PFNGLBINDPROGRAMARBPROC __glewBindProgramARB;
+GLEW_FUN_EXPORT PFNGLDELETEPROGRAMSARBPROC __glewDeleteProgramsARB;
+GLEW_FUN_EXPORT PFNGLDISABLEVERTEXATTRIBARRAYARBPROC __glewDisableVertexAttribArrayARB;
+GLEW_FUN_EXPORT PFNGLENABLEVERTEXATTRIBARRAYARBPROC __glewEnableVertexAttribArrayARB;
+GLEW_FUN_EXPORT PFNGLGENPROGRAMSARBPROC __glewGenProgramsARB;
+GLEW_FUN_EXPORT PFNGLGETPROGRAMENVPARAMETERDVARBPROC __glewGetProgramEnvParameterdvARB;
+GLEW_FUN_EXPORT PFNGLGETPROGRAMENVPARAMETERFVARBPROC __glewGetProgramEnvParameterfvARB;
+GLEW_FUN_EXPORT PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC __glewGetProgramLocalParameterdvARB;
+GLEW_FUN_EXPORT PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC __glewGetProgramLocalParameterfvARB;
+GLEW_FUN_EXPORT PFNGLGETPROGRAMSTRINGARBPROC __glewGetProgramStringARB;
+GLEW_FUN_EXPORT PFNGLGETPROGRAMIVARBPROC __glewGetProgramivARB;
+GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBPOINTERVARBPROC __glewGetVertexAttribPointervARB;
+GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBDVARBPROC __glewGetVertexAttribdvARB;
+GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBFVARBPROC __glewGetVertexAttribfvARB;
+GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBIVARBPROC __glewGetVertexAttribivARB;
+GLEW_FUN_EXPORT PFNGLISPROGRAMARBPROC __glewIsProgramARB;
+GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETER4DARBPROC __glewProgramEnvParameter4dARB;
+GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETER4DVARBPROC __glewProgramEnvParameter4dvARB;
+GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETER4FARBPROC __glewProgramEnvParameter4fARB;
+GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETER4FVARBPROC __glewProgramEnvParameter4fvARB;
+GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETER4DARBPROC __glewProgramLocalParameter4dARB;
+GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETER4DVARBPROC __glewProgramLocalParameter4dvARB;
+GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETER4FARBPROC __glewProgramLocalParameter4fARB;
+GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETER4FVARBPROC __glewProgramLocalParameter4fvARB;
+GLEW_FUN_EXPORT PFNGLPROGRAMSTRINGARBPROC __glewProgramStringARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1DARBPROC __glewVertexAttrib1dARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1DVARBPROC __glewVertexAttrib1dvARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1FARBPROC __glewVertexAttrib1fARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1FVARBPROC __glewVertexAttrib1fvARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1SARBPROC __glewVertexAttrib1sARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1SVARBPROC __glewVertexAttrib1svARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2DARBPROC __glewVertexAttrib2dARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2DVARBPROC __glewVertexAttrib2dvARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2FARBPROC __glewVertexAttrib2fARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2FVARBPROC __glewVertexAttrib2fvARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2SARBPROC __glewVertexAttrib2sARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2SVARBPROC __glewVertexAttrib2svARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3DARBPROC __glewVertexAttrib3dARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3DVARBPROC __glewVertexAttrib3dvARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3FARBPROC __glewVertexAttrib3fARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3FVARBPROC __glewVertexAttrib3fvARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3SARBPROC __glewVertexAttrib3sARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3SVARBPROC __glewVertexAttrib3svARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NBVARBPROC __glewVertexAttrib4NbvARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NIVARBPROC __glewVertexAttrib4NivARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NSVARBPROC __glewVertexAttrib4NsvARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NUBARBPROC __glewVertexAttrib4NubARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NUBVARBPROC __glewVertexAttrib4NubvARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NUIVARBPROC __glewVertexAttrib4NuivARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NUSVARBPROC __glewVertexAttrib4NusvARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4BVARBPROC __glewVertexAttrib4bvARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4DARBPROC __glewVertexAttrib4dARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4DVARBPROC __glewVertexAttrib4dvARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4FARBPROC __glewVertexAttrib4fARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4FVARBPROC __glewVertexAttrib4fvARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4IVARBPROC __glewVertexAttrib4ivARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4SARBPROC __glewVertexAttrib4sARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4SVARBPROC __glewVertexAttrib4svARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4UBVARBPROC __glewVertexAttrib4ubvARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4UIVARBPROC __glewVertexAttrib4uivARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4USVARBPROC __glewVertexAttrib4usvARB;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBPOINTERARBPROC __glewVertexAttribPointerARB;
+
+GLEW_FUN_EXPORT PFNGLBINDATTRIBLOCATIONARBPROC __glewBindAttribLocationARB;
+GLEW_FUN_EXPORT PFNGLGETACTIVEATTRIBARBPROC __glewGetActiveAttribARB;
+GLEW_FUN_EXPORT PFNGLGETATTRIBLOCATIONARBPROC __glewGetAttribLocationARB;
+
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2DARBPROC __glewWindowPos2dARB;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2DVARBPROC __glewWindowPos2dvARB;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2FARBPROC __glewWindowPos2fARB;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2FVARBPROC __glewWindowPos2fvARB;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2IARBPROC __glewWindowPos2iARB;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2IVARBPROC __glewWindowPos2ivARB;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2SARBPROC __glewWindowPos2sARB;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2SVARBPROC __glewWindowPos2svARB;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3DARBPROC __glewWindowPos3dARB;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3DVARBPROC __glewWindowPos3dvARB;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3FARBPROC __glewWindowPos3fARB;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3FVARBPROC __glewWindowPos3fvARB;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3IARBPROC __glewWindowPos3iARB;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3IVARBPROC __glewWindowPos3ivARB;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3SARBPROC __glewWindowPos3sARB;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3SVARBPROC __glewWindowPos3svARB;
+
+GLEW_FUN_EXPORT PFNGLDRAWBUFFERSATIPROC __glewDrawBuffersATI;
+
+GLEW_FUN_EXPORT PFNGLDRAWELEMENTARRAYATIPROC __glewDrawElementArrayATI;
+GLEW_FUN_EXPORT PFNGLDRAWRANGEELEMENTARRAYATIPROC __glewDrawRangeElementArrayATI;
+GLEW_FUN_EXPORT PFNGLELEMENTPOINTERATIPROC __glewElementPointerATI;
+
+GLEW_FUN_EXPORT PFNGLGETTEXBUMPPARAMETERFVATIPROC __glewGetTexBumpParameterfvATI;
+GLEW_FUN_EXPORT PFNGLGETTEXBUMPPARAMETERIVATIPROC __glewGetTexBumpParameterivATI;
+GLEW_FUN_EXPORT PFNGLTEXBUMPPARAMETERFVATIPROC __glewTexBumpParameterfvATI;
+GLEW_FUN_EXPORT PFNGLTEXBUMPPARAMETERIVATIPROC __glewTexBumpParameterivATI;
+
+GLEW_FUN_EXPORT PFNGLALPHAFRAGMENTOP1ATIPROC __glewAlphaFragmentOp1ATI;
+GLEW_FUN_EXPORT PFNGLALPHAFRAGMENTOP2ATIPROC __glewAlphaFragmentOp2ATI;
+GLEW_FUN_EXPORT PFNGLALPHAFRAGMENTOP3ATIPROC __glewAlphaFragmentOp3ATI;
+GLEW_FUN_EXPORT PFNGLBEGINFRAGMENTSHADERATIPROC __glewBeginFragmentShaderATI;
+GLEW_FUN_EXPORT PFNGLBINDFRAGMENTSHADERATIPROC __glewBindFragmentShaderATI;
+GLEW_FUN_EXPORT PFNGLCOLORFRAGMENTOP1ATIPROC __glewColorFragmentOp1ATI;
+GLEW_FUN_EXPORT PFNGLCOLORFRAGMENTOP2ATIPROC __glewColorFragmentOp2ATI;
+GLEW_FUN_EXPORT PFNGLCOLORFRAGMENTOP3ATIPROC __glewColorFragmentOp3ATI;
+GLEW_FUN_EXPORT PFNGLDELETEFRAGMENTSHADERATIPROC __glewDeleteFragmentShaderATI;
+GLEW_FUN_EXPORT PFNGLENDFRAGMENTSHADERATIPROC __glewEndFragmentShaderATI;
+GLEW_FUN_EXPORT PFNGLGENFRAGMENTSHADERSATIPROC __glewGenFragmentShadersATI;
+GLEW_FUN_EXPORT PFNGLPASSTEXCOORDATIPROC __glewPassTexCoordATI;
+GLEW_FUN_EXPORT PFNGLSAMPLEMAPATIPROC __glewSampleMapATI;
+GLEW_FUN_EXPORT PFNGLSETFRAGMENTSHADERCONSTANTATIPROC __glewSetFragmentShaderConstantATI;
+
+GLEW_FUN_EXPORT PFNGLMAPOBJECTBUFFERATIPROC __glewMapObjectBufferATI;
+GLEW_FUN_EXPORT PFNGLUNMAPOBJECTBUFFERATIPROC __glewUnmapObjectBufferATI;
+
+GLEW_FUN_EXPORT PFNGLPNTRIANGLESFATIPROC __glPNTrianglewesfATI;
+GLEW_FUN_EXPORT PFNGLPNTRIANGLESIATIPROC __glPNTrianglewesiATI;
+
+GLEW_FUN_EXPORT PFNGLSTENCILFUNCSEPARATEATIPROC __glewStencilFuncSeparateATI;
+GLEW_FUN_EXPORT PFNGLSTENCILOPSEPARATEATIPROC __glewStencilOpSeparateATI;
+
+GLEW_FUN_EXPORT PFNGLARRAYOBJECTATIPROC __glewArrayObjectATI;
+GLEW_FUN_EXPORT PFNGLFREEOBJECTBUFFERATIPROC __glewFreeObjectBufferATI;
+GLEW_FUN_EXPORT PFNGLGETARRAYOBJECTFVATIPROC __glewGetArrayObjectfvATI;
+GLEW_FUN_EXPORT PFNGLGETARRAYOBJECTIVATIPROC __glewGetArrayObjectivATI;
+GLEW_FUN_EXPORT PFNGLGETOBJECTBUFFERFVATIPROC __glewGetObjectBufferfvATI;
+GLEW_FUN_EXPORT PFNGLGETOBJECTBUFFERIVATIPROC __glewGetObjectBufferivATI;
+GLEW_FUN_EXPORT PFNGLGETVARIANTARRAYOBJECTFVATIPROC __glewGetVariantArrayObjectfvATI;
+GLEW_FUN_EXPORT PFNGLGETVARIANTARRAYOBJECTIVATIPROC __glewGetVariantArrayObjectivATI;
+GLEW_FUN_EXPORT PFNGLISOBJECTBUFFERATIPROC __glewIsObjectBufferATI;
+GLEW_FUN_EXPORT PFNGLNEWOBJECTBUFFERATIPROC __glewNewObjectBufferATI;
+GLEW_FUN_EXPORT PFNGLUPDATEOBJECTBUFFERATIPROC __glewUpdateObjectBufferATI;
+GLEW_FUN_EXPORT PFNGLVARIANTARRAYOBJECTATIPROC __glewVariantArrayObjectATI;
+
+GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC __glewGetVertexAttribArrayObjectfvATI;
+GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC __glewGetVertexAttribArrayObjectivATI;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBARRAYOBJECTATIPROC __glewVertexAttribArrayObjectATI;
+
+GLEW_FUN_EXPORT PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC __glewClientActiveVertexStreamATI;
+GLEW_FUN_EXPORT PFNGLNORMALSTREAM3BATIPROC __glewNormalStream3bATI;
+GLEW_FUN_EXPORT PFNGLNORMALSTREAM3BVATIPROC __glewNormalStream3bvATI;
+GLEW_FUN_EXPORT PFNGLNORMALSTREAM3DATIPROC __glewNormalStream3dATI;
+GLEW_FUN_EXPORT PFNGLNORMALSTREAM3DVATIPROC __glewNormalStream3dvATI;
+GLEW_FUN_EXPORT PFNGLNORMALSTREAM3FATIPROC __glewNormalStream3fATI;
+GLEW_FUN_EXPORT PFNGLNORMALSTREAM3FVATIPROC __glewNormalStream3fvATI;
+GLEW_FUN_EXPORT PFNGLNORMALSTREAM3IATIPROC __glewNormalStream3iATI;
+GLEW_FUN_EXPORT PFNGLNORMALSTREAM3IVATIPROC __glewNormalStream3ivATI;
+GLEW_FUN_EXPORT PFNGLNORMALSTREAM3SATIPROC __glewNormalStream3sATI;
+GLEW_FUN_EXPORT PFNGLNORMALSTREAM3SVATIPROC __glewNormalStream3svATI;
+GLEW_FUN_EXPORT PFNGLVERTEXBLENDENVFATIPROC __glewVertexBlendEnvfATI;
+GLEW_FUN_EXPORT PFNGLVERTEXBLENDENVIATIPROC __glewVertexBlendEnviATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM2DATIPROC __glewVertexStream2dATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM2DVATIPROC __glewVertexStream2dvATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM2FATIPROC __glewVertexStream2fATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM2FVATIPROC __glewVertexStream2fvATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM2IATIPROC __glewVertexStream2iATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM2IVATIPROC __glewVertexStream2ivATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM2SATIPROC __glewVertexStream2sATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM2SVATIPROC __glewVertexStream2svATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM3DATIPROC __glewVertexStream3dATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM3DVATIPROC __glewVertexStream3dvATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM3FATIPROC __glewVertexStream3fATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM3FVATIPROC __glewVertexStream3fvATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM3IATIPROC __glewVertexStream3iATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM3IVATIPROC __glewVertexStream3ivATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM3SATIPROC __glewVertexStream3sATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM3SVATIPROC __glewVertexStream3svATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM4DATIPROC __glewVertexStream4dATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM4DVATIPROC __glewVertexStream4dvATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM4FATIPROC __glewVertexStream4fATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM4FVATIPROC __glewVertexStream4fvATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM4IATIPROC __glewVertexStream4iATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM4IVATIPROC __glewVertexStream4ivATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM4SATIPROC __glewVertexStream4sATI;
+GLEW_FUN_EXPORT PFNGLVERTEXSTREAM4SVATIPROC __glewVertexStream4svATI;
+
+GLEW_FUN_EXPORT PFNGLBLENDCOLOREXTPROC __glewBlendColorEXT;
+
+GLEW_FUN_EXPORT PFNGLBLENDEQUATIONSEPARATEEXTPROC __glewBlendEquationSeparateEXT;
+
+GLEW_FUN_EXPORT PFNGLBLENDFUNCSEPARATEEXTPROC __glewBlendFuncSeparateEXT;
+
+GLEW_FUN_EXPORT PFNGLBLENDEQUATIONEXTPROC __glewBlendEquationEXT;
+
+GLEW_FUN_EXPORT PFNGLCOLORSUBTABLEEXTPROC __glewColorSubTableEXT;
+GLEW_FUN_EXPORT PFNGLCOPYCOLORSUBTABLEEXTPROC __glewCopyColorSubTableEXT;
+
+GLEW_FUN_EXPORT PFNGLLOCKARRAYSEXTPROC __glewLockArraysEXT;
+GLEW_FUN_EXPORT PFNGLUNLOCKARRAYSEXTPROC __glewUnlockArraysEXT;
+
+GLEW_FUN_EXPORT PFNGLCONVOLUTIONFILTER1DEXTPROC __glewConvolutionFilter1DEXT;
+GLEW_FUN_EXPORT PFNGLCONVOLUTIONFILTER2DEXTPROC __glewConvolutionFilter2DEXT;
+GLEW_FUN_EXPORT PFNGLCONVOLUTIONPARAMETERFEXTPROC __glewConvolutionParameterfEXT;
+GLEW_FUN_EXPORT PFNGLCONVOLUTIONPARAMETERFVEXTPROC __glewConvolutionParameterfvEXT;
+GLEW_FUN_EXPORT PFNGLCONVOLUTIONPARAMETERIEXTPROC __glewConvolutionParameteriEXT;
+GLEW_FUN_EXPORT PFNGLCONVOLUTIONPARAMETERIVEXTPROC __glewConvolutionParameterivEXT;
+GLEW_FUN_EXPORT PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC __glewCopyConvolutionFilter1DEXT;
+GLEW_FUN_EXPORT PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC __glewCopyConvolutionFilter2DEXT;
+GLEW_FUN_EXPORT PFNGLGETCONVOLUTIONFILTEREXTPROC __glewGetConvolutionFilterEXT;
+GLEW_FUN_EXPORT PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC __glewGetConvolutionParameterfvEXT;
+GLEW_FUN_EXPORT PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC __glewGetConvolutionParameterivEXT;
+GLEW_FUN_EXPORT PFNGLGETSEPARABLEFILTEREXTPROC __glewGetSeparableFilterEXT;
+GLEW_FUN_EXPORT PFNGLSEPARABLEFILTER2DEXTPROC __glewSeparableFilter2DEXT;
+
+GLEW_FUN_EXPORT PFNGLBINORMALPOINTEREXTPROC __glewBinormalPointerEXT;
+GLEW_FUN_EXPORT PFNGLTANGENTPOINTEREXTPROC __glewTangentPointerEXT;
+
+GLEW_FUN_EXPORT PFNGLCOPYTEXIMAGE1DEXTPROC __glewCopyTexImage1DEXT;
+GLEW_FUN_EXPORT PFNGLCOPYTEXIMAGE2DEXTPROC __glewCopyTexImage2DEXT;
+GLEW_FUN_EXPORT PFNGLCOPYTEXSUBIMAGE1DEXTPROC __glewCopyTexSubImage1DEXT;
+GLEW_FUN_EXPORT PFNGLCOPYTEXSUBIMAGE2DEXTPROC __glewCopyTexSubImage2DEXT;
+GLEW_FUN_EXPORT PFNGLCOPYTEXSUBIMAGE3DEXTPROC __glewCopyTexSubImage3DEXT;
+
+GLEW_FUN_EXPORT PFNGLCULLPARAMETERDVEXTPROC __glewCullParameterdvEXT;
+GLEW_FUN_EXPORT PFNGLCULLPARAMETERFVEXTPROC __glewCullParameterfvEXT;
+
+GLEW_FUN_EXPORT PFNGLDEPTHBOUNDSEXTPROC __glewDepthBoundsEXT;
+
+GLEW_FUN_EXPORT PFNGLDRAWRANGEELEMENTSEXTPROC __glewDrawRangeElementsEXT;
+
+GLEW_FUN_EXPORT PFNGLFOGCOORDPOINTEREXTPROC __glewFogCoordPointerEXT;
+GLEW_FUN_EXPORT PFNGLFOGCOORDDEXTPROC __glewFogCoorddEXT;
+GLEW_FUN_EXPORT PFNGLFOGCOORDDVEXTPROC __glewFogCoorddvEXT;
+GLEW_FUN_EXPORT PFNGLFOGCOORDFEXTPROC __glewFogCoordfEXT;
+GLEW_FUN_EXPORT PFNGLFOGCOORDFVEXTPROC __glewFogCoordfvEXT;
+
+GLEW_FUN_EXPORT PFNGLFRAGMENTCOLORMATERIALEXTPROC __glewFragmentColorMaterialEXT;
+GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTMODELFEXTPROC __glewFragmentLightModelfEXT;
+GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTMODELFVEXTPROC __glewFragmentLightModelfvEXT;
+GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTMODELIEXTPROC __glewFragmentLightModeliEXT;
+GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTMODELIVEXTPROC __glewFragmentLightModelivEXT;
+GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTFEXTPROC __glewFragmentLightfEXT;
+GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTFVEXTPROC __glewFragmentLightfvEXT;
+GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTIEXTPROC __glewFragmentLightiEXT;
+GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTIVEXTPROC __glewFragmentLightivEXT;
+GLEW_FUN_EXPORT PFNGLFRAGMENTMATERIALFEXTPROC __glewFragmentMaterialfEXT;
+GLEW_FUN_EXPORT PFNGLFRAGMENTMATERIALFVEXTPROC __glewFragmentMaterialfvEXT;
+GLEW_FUN_EXPORT PFNGLFRAGMENTMATERIALIEXTPROC __glewFragmentMaterialiEXT;
+GLEW_FUN_EXPORT PFNGLFRAGMENTMATERIALIVEXTPROC __glewFragmentMaterialivEXT;
+GLEW_FUN_EXPORT PFNGLGETFRAGMENTLIGHTFVEXTPROC __glewGetFragmentLightfvEXT;
+GLEW_FUN_EXPORT PFNGLGETFRAGMENTLIGHTIVEXTPROC __glewGetFragmentLightivEXT;
+GLEW_FUN_EXPORT PFNGLGETFRAGMENTMATERIALFVEXTPROC __glewGetFragmentMaterialfvEXT;
+GLEW_FUN_EXPORT PFNGLGETFRAGMENTMATERIALIVEXTPROC __glewGetFragmentMaterialivEXT;
+GLEW_FUN_EXPORT PFNGLLIGHTENVIEXTPROC __glewLightEnviEXT;
+
+GLEW_FUN_EXPORT PFNGLBLITFRAMEBUFFEREXTPROC __glewBlitFramebufferEXT;
+
+GLEW_FUN_EXPORT PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC __glewRenderbufferStorageMultisampleEXT;
+
+GLEW_FUN_EXPORT PFNGLBINDFRAMEBUFFEREXTPROC __glewBindFramebufferEXT;
+GLEW_FUN_EXPORT PFNGLBINDRENDERBUFFEREXTPROC __glewBindRenderbufferEXT;
+GLEW_FUN_EXPORT PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC __glewCheckFramebufferStatusEXT;
+GLEW_FUN_EXPORT PFNGLDELETEFRAMEBUFFERSEXTPROC __glewDeleteFramebuffersEXT;
+GLEW_FUN_EXPORT PFNGLDELETERENDERBUFFERSEXTPROC __glewDeleteRenderbuffersEXT;
+GLEW_FUN_EXPORT PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC __glewFramebufferRenderbufferEXT;
+GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTURE1DEXTPROC __glewFramebufferTexture1DEXT;
+GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTURE2DEXTPROC __glewFramebufferTexture2DEXT;
+GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTURE3DEXTPROC __glewFramebufferTexture3DEXT;
+GLEW_FUN_EXPORT PFNGLGENFRAMEBUFFERSEXTPROC __glewGenFramebuffersEXT;
+GLEW_FUN_EXPORT PFNGLGENRENDERBUFFERSEXTPROC __glewGenRenderbuffersEXT;
+GLEW_FUN_EXPORT PFNGLGENERATEMIPMAPEXTPROC __glewGenerateMipmapEXT;
+GLEW_FUN_EXPORT PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC __glewGetFramebufferAttachmentParameterivEXT;
+GLEW_FUN_EXPORT PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC __glewGetRenderbufferParameterivEXT;
+GLEW_FUN_EXPORT PFNGLISFRAMEBUFFEREXTPROC __glewIsFramebufferEXT;
+GLEW_FUN_EXPORT PFNGLISRENDERBUFFEREXTPROC __glewIsRenderbufferEXT;
+GLEW_FUN_EXPORT PFNGLRENDERBUFFERSTORAGEEXTPROC __glewRenderbufferStorageEXT;
+
+GLEW_FUN_EXPORT PFNGLGETHISTOGRAMEXTPROC __glewGetHistogramEXT;
+GLEW_FUN_EXPORT PFNGLGETHISTOGRAMPARAMETERFVEXTPROC __glewGetHistogramParameterfvEXT;
+GLEW_FUN_EXPORT PFNGLGETHISTOGRAMPARAMETERIVEXTPROC __glewGetHistogramParameterivEXT;
+GLEW_FUN_EXPORT PFNGLGETMINMAXEXTPROC __glewGetMinmaxEXT;
+GLEW_FUN_EXPORT PFNGLGETMINMAXPARAMETERFVEXTPROC __glewGetMinmaxParameterfvEXT;
+GLEW_FUN_EXPORT PFNGLGETMINMAXPARAMETERIVEXTPROC __glewGetMinmaxParameterivEXT;
+GLEW_FUN_EXPORT PFNGLHISTOGRAMEXTPROC __glewHistogramEXT;
+GLEW_FUN_EXPORT PFNGLMINMAXEXTPROC __glewMinmaxEXT;
+GLEW_FUN_EXPORT PFNGLRESETHISTOGRAMEXTPROC __glewResetHistogramEXT;
+GLEW_FUN_EXPORT PFNGLRESETMINMAXEXTPROC __glewResetMinmaxEXT;
+
+GLEW_FUN_EXPORT PFNGLINDEXFUNCEXTPROC __glewIndexFuncEXT;
+
+GLEW_FUN_EXPORT PFNGLINDEXMATERIALEXTPROC __glewIndexMaterialEXT;
+
+GLEW_FUN_EXPORT PFNGLAPPLYTEXTUREEXTPROC __glewApplyTextureEXT;
+GLEW_FUN_EXPORT PFNGLTEXTURELIGHTEXTPROC __glewTextureLightEXT;
+GLEW_FUN_EXPORT PFNGLTEXTUREMATERIALEXTPROC __glewTextureMaterialEXT;
+
+GLEW_FUN_EXPORT PFNGLMULTIDRAWARRAYSEXTPROC __glewMultiDrawArraysEXT;
+GLEW_FUN_EXPORT PFNGLMULTIDRAWELEMENTSEXTPROC __glewMultiDrawElementsEXT;
+
+GLEW_FUN_EXPORT PFNGLSAMPLEMASKEXTPROC __glewSampleMaskEXT;
+GLEW_FUN_EXPORT PFNGLSAMPLEPATTERNEXTPROC __glewSamplePatternEXT;
+
+GLEW_FUN_EXPORT PFNGLCOLORTABLEEXTPROC __glewColorTableEXT;
+GLEW_FUN_EXPORT PFNGLGETCOLORTABLEEXTPROC __glewGetColorTableEXT;
+GLEW_FUN_EXPORT PFNGLGETCOLORTABLEPARAMETERFVEXTPROC __glewGetColorTableParameterfvEXT;
+GLEW_FUN_EXPORT PFNGLGETCOLORTABLEPARAMETERIVEXTPROC __glewGetColorTableParameterivEXT;
+
+GLEW_FUN_EXPORT PFNGLGETPIXELTRANSFORMPARAMETERFVEXTPROC __glewGetPixelTransformParameterfvEXT;
+GLEW_FUN_EXPORT PFNGLGETPIXELTRANSFORMPARAMETERIVEXTPROC __glewGetPixelTransformParameterivEXT;
+GLEW_FUN_EXPORT PFNGLPIXELTRANSFORMPARAMETERFEXTPROC __glewPixelTransformParameterfEXT;
+GLEW_FUN_EXPORT PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC __glewPixelTransformParameterfvEXT;
+GLEW_FUN_EXPORT PFNGLPIXELTRANSFORMPARAMETERIEXTPROC __glewPixelTransformParameteriEXT;
+GLEW_FUN_EXPORT PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC __glewPixelTransformParameterivEXT;
+
+GLEW_FUN_EXPORT PFNGLPOINTPARAMETERFEXTPROC __glewPointParameterfEXT;
+GLEW_FUN_EXPORT PFNGLPOINTPARAMETERFVEXTPROC __glewPointParameterfvEXT;
+
+GLEW_FUN_EXPORT PFNGLPOLYGONOFFSETEXTPROC __glewPolygonOffsetEXT;
+
+GLEW_FUN_EXPORT PFNGLBEGINSCENEEXTPROC __glewBeginSceneEXT;
+GLEW_FUN_EXPORT PFNGLENDSCENEEXTPROC __glewEndSceneEXT;
+
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3BEXTPROC __glewSecondaryColor3bEXT;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3BVEXTPROC __glewSecondaryColor3bvEXT;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3DEXTPROC __glewSecondaryColor3dEXT;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3DVEXTPROC __glewSecondaryColor3dvEXT;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3FEXTPROC __glewSecondaryColor3fEXT;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3FVEXTPROC __glewSecondaryColor3fvEXT;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3IEXTPROC __glewSecondaryColor3iEXT;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3IVEXTPROC __glewSecondaryColor3ivEXT;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3SEXTPROC __glewSecondaryColor3sEXT;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3SVEXTPROC __glewSecondaryColor3svEXT;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3UBEXTPROC __glewSecondaryColor3ubEXT;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3UBVEXTPROC __glewSecondaryColor3ubvEXT;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3UIEXTPROC __glewSecondaryColor3uiEXT;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3UIVEXTPROC __glewSecondaryColor3uivEXT;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3USEXTPROC __glewSecondaryColor3usEXT;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3USVEXTPROC __glewSecondaryColor3usvEXT;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLORPOINTEREXTPROC __glewSecondaryColorPointerEXT;
+
+GLEW_FUN_EXPORT PFNGLACTIVESTENCILFACEEXTPROC __glewActiveStencilFaceEXT;
+
+GLEW_FUN_EXPORT PFNGLTEXSUBIMAGE1DEXTPROC __glewTexSubImage1DEXT;
+GLEW_FUN_EXPORT PFNGLTEXSUBIMAGE2DEXTPROC __glewTexSubImage2DEXT;
+GLEW_FUN_EXPORT PFNGLTEXSUBIMAGE3DEXTPROC __glewTexSubImage3DEXT;
+
+GLEW_FUN_EXPORT PFNGLTEXIMAGE3DEXTPROC __glewTexImage3DEXT;
+
+GLEW_FUN_EXPORT PFNGLARETEXTURESRESIDENTEXTPROC __glewAreTexturesResidentEXT;
+GLEW_FUN_EXPORT PFNGLBINDTEXTUREEXTPROC __glewBindTextureEXT;
+GLEW_FUN_EXPORT PFNGLDELETETEXTURESEXTPROC __glewDeleteTexturesEXT;
+GLEW_FUN_EXPORT PFNGLGENTEXTURESEXTPROC __glewGenTexturesEXT;
+GLEW_FUN_EXPORT PFNGLISTEXTUREEXTPROC __glewIsTextureEXT;
+GLEW_FUN_EXPORT PFNGLPRIORITIZETEXTURESEXTPROC __glewPrioritizeTexturesEXT;
+
+GLEW_FUN_EXPORT PFNGLTEXTURENORMALEXTPROC __glewTextureNormalEXT;
+
+GLEW_FUN_EXPORT PFNGLARRAYELEMENTEXTPROC __glewArrayElementEXT;
+GLEW_FUN_EXPORT PFNGLCOLORPOINTEREXTPROC __glewColorPointerEXT;
+GLEW_FUN_EXPORT PFNGLDRAWARRAYSEXTPROC __glewDrawArraysEXT;
+GLEW_FUN_EXPORT PFNGLEDGEFLAGPOINTEREXTPROC __glewEdgeFlagPointerEXT;
+GLEW_FUN_EXPORT PFNGLGETPOINTERVEXTPROC __glewGetPointervEXT;
+GLEW_FUN_EXPORT PFNGLINDEXPOINTEREXTPROC __glewIndexPointerEXT;
+GLEW_FUN_EXPORT PFNGLNORMALPOINTEREXTPROC __glewNormalPointerEXT;
+GLEW_FUN_EXPORT PFNGLTEXCOORDPOINTEREXTPROC __glewTexCoordPointerEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXPOINTEREXTPROC __glewVertexPointerEXT;
+
+GLEW_FUN_EXPORT PFNGLBEGINVERTEXSHADEREXTPROC __glewBeginVertexShaderEXT;
+GLEW_FUN_EXPORT PFNGLBINDLIGHTPARAMETEREXTPROC __glewBindLightParameterEXT;
+GLEW_FUN_EXPORT PFNGLBINDMATERIALPARAMETEREXTPROC __glewBindMaterialParameterEXT;
+GLEW_FUN_EXPORT PFNGLBINDPARAMETEREXTPROC __glewBindParameterEXT;
+GLEW_FUN_EXPORT PFNGLBINDTEXGENPARAMETEREXTPROC __glewBindTexGenParameterEXT;
+GLEW_FUN_EXPORT PFNGLBINDTEXTUREUNITPARAMETEREXTPROC __glewBindTextureUnitParameterEXT;
+GLEW_FUN_EXPORT PFNGLBINDVERTEXSHADEREXTPROC __glewBindVertexShaderEXT;
+GLEW_FUN_EXPORT PFNGLDELETEVERTEXSHADEREXTPROC __glewDeleteVertexShaderEXT;
+GLEW_FUN_EXPORT PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC __glewDisableVariantClientStateEXT;
+GLEW_FUN_EXPORT PFNGLENABLEVARIANTCLIENTSTATEEXTPROC __glewEnableVariantClientStateEXT;
+GLEW_FUN_EXPORT PFNGLENDVERTEXSHADEREXTPROC __glewEndVertexShaderEXT;
+GLEW_FUN_EXPORT PFNGLEXTRACTCOMPONENTEXTPROC __glewExtractComponentEXT;
+GLEW_FUN_EXPORT PFNGLGENSYMBOLSEXTPROC __glewGenSymbolsEXT;
+GLEW_FUN_EXPORT PFNGLGENVERTEXSHADERSEXTPROC __glewGenVertexShadersEXT;
+GLEW_FUN_EXPORT PFNGLGETINVARIANTBOOLEANVEXTPROC __glewGetInvariantBooleanvEXT;
+GLEW_FUN_EXPORT PFNGLGETINVARIANTFLOATVEXTPROC __glewGetInvariantFloatvEXT;
+GLEW_FUN_EXPORT PFNGLGETINVARIANTINTEGERVEXTPROC __glewGetInvariantIntegervEXT;
+GLEW_FUN_EXPORT PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC __glewGetLocalConstantBooleanvEXT;
+GLEW_FUN_EXPORT PFNGLGETLOCALCONSTANTFLOATVEXTPROC __glewGetLocalConstantFloatvEXT;
+GLEW_FUN_EXPORT PFNGLGETLOCALCONSTANTINTEGERVEXTPROC __glewGetLocalConstantIntegervEXT;
+GLEW_FUN_EXPORT PFNGLGETVARIANTBOOLEANVEXTPROC __glewGetVariantBooleanvEXT;
+GLEW_FUN_EXPORT PFNGLGETVARIANTFLOATVEXTPROC __glewGetVariantFloatvEXT;
+GLEW_FUN_EXPORT PFNGLGETVARIANTINTEGERVEXTPROC __glewGetVariantIntegervEXT;
+GLEW_FUN_EXPORT PFNGLGETVARIANTPOINTERVEXTPROC __glewGetVariantPointervEXT;
+GLEW_FUN_EXPORT PFNGLINSERTCOMPONENTEXTPROC __glewInsertComponentEXT;
+GLEW_FUN_EXPORT PFNGLISVARIANTENABLEDEXTPROC __glewIsVariantEnabledEXT;
+GLEW_FUN_EXPORT PFNGLSETINVARIANTEXTPROC __glewSetInvariantEXT;
+GLEW_FUN_EXPORT PFNGLSETLOCALCONSTANTEXTPROC __glewSetLocalConstantEXT;
+GLEW_FUN_EXPORT PFNGLSHADEROP1EXTPROC __glewShaderOp1EXT;
+GLEW_FUN_EXPORT PFNGLSHADEROP2EXTPROC __glewShaderOp2EXT;
+GLEW_FUN_EXPORT PFNGLSHADEROP3EXTPROC __glewShaderOp3EXT;
+GLEW_FUN_EXPORT PFNGLSWIZZLEEXTPROC __glewSwizzleEXT;
+GLEW_FUN_EXPORT PFNGLVARIANTPOINTEREXTPROC __glewVariantPointerEXT;
+GLEW_FUN_EXPORT PFNGLVARIANTBVEXTPROC __glewVariantbvEXT;
+GLEW_FUN_EXPORT PFNGLVARIANTDVEXTPROC __glewVariantdvEXT;
+GLEW_FUN_EXPORT PFNGLVARIANTFVEXTPROC __glewVariantfvEXT;
+GLEW_FUN_EXPORT PFNGLVARIANTIVEXTPROC __glewVariantivEXT;
+GLEW_FUN_EXPORT PFNGLVARIANTSVEXTPROC __glewVariantsvEXT;
+GLEW_FUN_EXPORT PFNGLVARIANTUBVEXTPROC __glewVariantubvEXT;
+GLEW_FUN_EXPORT PFNGLVARIANTUIVEXTPROC __glewVariantuivEXT;
+GLEW_FUN_EXPORT PFNGLVARIANTUSVEXTPROC __glewVariantusvEXT;
+GLEW_FUN_EXPORT PFNGLWRITEMASKEXTPROC __glewWriteMaskEXT;
+
+GLEW_FUN_EXPORT PFNGLVERTEXWEIGHTPOINTEREXTPROC __glewVertexWeightPointerEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXWEIGHTFEXTPROC __glewVertexWeightfEXT;
+GLEW_FUN_EXPORT PFNGLVERTEXWEIGHTFVEXTPROC __glewVertexWeightfvEXT;
+
+GLEW_FUN_EXPORT PFNGLSTRINGMARKERGREMEDYPROC __glewStringMarkerGREMEDY;
+
+GLEW_FUN_EXPORT PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC __glewGetImageTransformParameterfvHP;
+GLEW_FUN_EXPORT PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC __glewGetImageTransformParameterivHP;
+GLEW_FUN_EXPORT PFNGLIMAGETRANSFORMPARAMETERFHPPROC __glewImageTransformParameterfHP;
+GLEW_FUN_EXPORT PFNGLIMAGETRANSFORMPARAMETERFVHPPROC __glewImageTransformParameterfvHP;
+GLEW_FUN_EXPORT PFNGLIMAGETRANSFORMPARAMETERIHPPROC __glewImageTransformParameteriHP;
+GLEW_FUN_EXPORT PFNGLIMAGETRANSFORMPARAMETERIVHPPROC __glewImageTransformParameterivHP;
+
+GLEW_FUN_EXPORT PFNGLMULTIMODEDRAWARRAYSIBMPROC __glewMultiModeDrawArraysIBM;
+GLEW_FUN_EXPORT PFNGLMULTIMODEDRAWELEMENTSIBMPROC __glewMultiModeDrawElementsIBM;
+
+GLEW_FUN_EXPORT PFNGLCOLORPOINTERLISTIBMPROC __glewColorPointerListIBM;
+GLEW_FUN_EXPORT PFNGLEDGEFLAGPOINTERLISTIBMPROC __glewEdgeFlagPointerListIBM;
+GLEW_FUN_EXPORT PFNGLFOGCOORDPOINTERLISTIBMPROC __glewFogCoordPointerListIBM;
+GLEW_FUN_EXPORT PFNGLINDEXPOINTERLISTIBMPROC __glewIndexPointerListIBM;
+GLEW_FUN_EXPORT PFNGLNORMALPOINTERLISTIBMPROC __glewNormalPointerListIBM;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLORPOINTERLISTIBMPROC __glewSecondaryColorPointerListIBM;
+GLEW_FUN_EXPORT PFNGLTEXCOORDPOINTERLISTIBMPROC __glewTexCoordPointerListIBM;
+GLEW_FUN_EXPORT PFNGLVERTEXPOINTERLISTIBMPROC __glewVertexPointerListIBM;
+
+GLEW_FUN_EXPORT PFNGLCOLORPOINTERVINTELPROC __glewColorPointervINTEL;
+GLEW_FUN_EXPORT PFNGLNORMALPOINTERVINTELPROC __glewNormalPointervINTEL;
+GLEW_FUN_EXPORT PFNGLTEXCOORDPOINTERVINTELPROC __glewTexCoordPointervINTEL;
+GLEW_FUN_EXPORT PFNGLVERTEXPOINTERVINTELPROC __glewVertexPointervINTEL;
+
+GLEW_FUN_EXPORT PFNGLTEXSCISSORFUNCINTELPROC __glewTexScissorFuncINTEL;
+GLEW_FUN_EXPORT PFNGLTEXSCISSORINTELPROC __glewTexScissorINTEL;
+
+GLEW_FUN_EXPORT PFNGLBUFFERREGIONENABLEDEXTPROC __glewBufferRegionEnabledEXT;
+GLEW_FUN_EXPORT PFNGLDELETEBUFFERREGIONEXTPROC __glewDeleteBufferRegionEXT;
+GLEW_FUN_EXPORT PFNGLDRAWBUFFERREGIONEXTPROC __glewDrawBufferRegionEXT;
+GLEW_FUN_EXPORT PFNGLNEWBUFFERREGIONEXTPROC __glewNewBufferRegionEXT;
+GLEW_FUN_EXPORT PFNGLREADBUFFERREGIONEXTPROC __glewReadBufferRegionEXT;
+
+GLEW_FUN_EXPORT PFNGLRESIZEBUFFERSMESAPROC __glewResizeBuffersMESA;
+
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2DMESAPROC __glewWindowPos2dMESA;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2DVMESAPROC __glewWindowPos2dvMESA;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2FMESAPROC __glewWindowPos2fMESA;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2FVMESAPROC __glewWindowPos2fvMESA;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2IMESAPROC __glewWindowPos2iMESA;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2IVMESAPROC __glewWindowPos2ivMESA;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2SMESAPROC __glewWindowPos2sMESA;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS2SVMESAPROC __glewWindowPos2svMESA;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3DMESAPROC __glewWindowPos3dMESA;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3DVMESAPROC __glewWindowPos3dvMESA;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3FMESAPROC __glewWindowPos3fMESA;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3FVMESAPROC __glewWindowPos3fvMESA;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3IMESAPROC __glewWindowPos3iMESA;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3IVMESAPROC __glewWindowPos3ivMESA;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3SMESAPROC __glewWindowPos3sMESA;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS3SVMESAPROC __glewWindowPos3svMESA;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS4DMESAPROC __glewWindowPos4dMESA;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS4DVMESAPROC __glewWindowPos4dvMESA;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS4FMESAPROC __glewWindowPos4fMESA;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS4FVMESAPROC __glewWindowPos4fvMESA;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS4IMESAPROC __glewWindowPos4iMESA;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS4IVMESAPROC __glewWindowPos4ivMESA;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS4SMESAPROC __glewWindowPos4sMESA;
+GLEW_FUN_EXPORT PFNGLWINDOWPOS4SVMESAPROC __glewWindowPos4svMESA;
+
+GLEW_FUN_EXPORT PFNGLEVALMAPSNVPROC __glewEvalMapsNV;
+GLEW_FUN_EXPORT PFNGLGETMAPATTRIBPARAMETERFVNVPROC __glewGetMapAttribParameterfvNV;
+GLEW_FUN_EXPORT PFNGLGETMAPATTRIBPARAMETERIVNVPROC __glewGetMapAttribParameterivNV;
+GLEW_FUN_EXPORT PFNGLGETMAPCONTROLPOINTSNVPROC __glewGetMapControlPointsNV;
+GLEW_FUN_EXPORT PFNGLGETMAPPARAMETERFVNVPROC __glewGetMapParameterfvNV;
+GLEW_FUN_EXPORT PFNGLGETMAPPARAMETERIVNVPROC __glewGetMapParameterivNV;
+GLEW_FUN_EXPORT PFNGLMAPCONTROLPOINTSNVPROC __glewMapControlPointsNV;
+GLEW_FUN_EXPORT PFNGLMAPPARAMETERFVNVPROC __glewMapParameterfvNV;
+GLEW_FUN_EXPORT PFNGLMAPPARAMETERIVNVPROC __glewMapParameterivNV;
+
+GLEW_FUN_EXPORT PFNGLDELETEFENCESNVPROC __glewDeleteFencesNV;
+GLEW_FUN_EXPORT PFNGLFINISHFENCENVPROC __glewFinishFenceNV;
+GLEW_FUN_EXPORT PFNGLGENFENCESNVPROC __glewGenFencesNV;
+GLEW_FUN_EXPORT PFNGLGETFENCEIVNVPROC __glewGetFenceivNV;
+GLEW_FUN_EXPORT PFNGLISFENCENVPROC __glewIsFenceNV;
+GLEW_FUN_EXPORT PFNGLSETFENCENVPROC __glewSetFenceNV;
+GLEW_FUN_EXPORT PFNGLTESTFENCENVPROC __glewTestFenceNV;
+
+GLEW_FUN_EXPORT PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC __glewGetProgramNamedParameterdvNV;
+GLEW_FUN_EXPORT PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC __glewGetProgramNamedParameterfvNV;
+GLEW_FUN_EXPORT PFNGLPROGRAMNAMEDPARAMETER4DNVPROC __glewProgramNamedParameter4dNV;
+GLEW_FUN_EXPORT PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC __glewProgramNamedParameter4dvNV;
+GLEW_FUN_EXPORT PFNGLPROGRAMNAMEDPARAMETER4FNVPROC __glewProgramNamedParameter4fNV;
+GLEW_FUN_EXPORT PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC __glewProgramNamedParameter4fvNV;
+
+GLEW_FUN_EXPORT PFNGLCOLOR3HNVPROC __glewColor3hNV;
+GLEW_FUN_EXPORT PFNGLCOLOR3HVNVPROC __glewColor3hvNV;
+GLEW_FUN_EXPORT PFNGLCOLOR4HNVPROC __glewColor4hNV;
+GLEW_FUN_EXPORT PFNGLCOLOR4HVNVPROC __glewColor4hvNV;
+GLEW_FUN_EXPORT PFNGLFOGCOORDHNVPROC __glewFogCoordhNV;
+GLEW_FUN_EXPORT PFNGLFOGCOORDHVNVPROC __glewFogCoordhvNV;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1HNVPROC __glewMultiTexCoord1hNV;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1HVNVPROC __glewMultiTexCoord1hvNV;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2HNVPROC __glewMultiTexCoord2hNV;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2HVNVPROC __glewMultiTexCoord2hvNV;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3HNVPROC __glewMultiTexCoord3hNV;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3HVNVPROC __glewMultiTexCoord3hvNV;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4HNVPROC __glewMultiTexCoord4hNV;
+GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4HVNVPROC __glewMultiTexCoord4hvNV;
+GLEW_FUN_EXPORT PFNGLNORMAL3HNVPROC __glewNormal3hNV;
+GLEW_FUN_EXPORT PFNGLNORMAL3HVNVPROC __glewNormal3hvNV;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3HNVPROC __glewSecondaryColor3hNV;
+GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3HVNVPROC __glewSecondaryColor3hvNV;
+GLEW_FUN_EXPORT PFNGLTEXCOORD1HNVPROC __glewTexCoord1hNV;
+GLEW_FUN_EXPORT PFNGLTEXCOORD1HVNVPROC __glewTexCoord1hvNV;
+GLEW_FUN_EXPORT PFNGLTEXCOORD2HNVPROC __glewTexCoord2hNV;
+GLEW_FUN_EXPORT PFNGLTEXCOORD2HVNVPROC __glewTexCoord2hvNV;
+GLEW_FUN_EXPORT PFNGLTEXCOORD3HNVPROC __glewTexCoord3hNV;
+GLEW_FUN_EXPORT PFNGLTEXCOORD3HVNVPROC __glewTexCoord3hvNV;
+GLEW_FUN_EXPORT PFNGLTEXCOORD4HNVPROC __glewTexCoord4hNV;
+GLEW_FUN_EXPORT PFNGLTEXCOORD4HVNVPROC __glewTexCoord4hvNV;
+GLEW_FUN_EXPORT PFNGLVERTEX2HNVPROC __glewVertex2hNV;
+GLEW_FUN_EXPORT PFNGLVERTEX2HVNVPROC __glewVertex2hvNV;
+GLEW_FUN_EXPORT PFNGLVERTEX3HNVPROC __glewVertex3hNV;
+GLEW_FUN_EXPORT PFNGLVERTEX3HVNVPROC __glewVertex3hvNV;
+GLEW_FUN_EXPORT PFNGLVERTEX4HNVPROC __glewVertex4hNV;
+GLEW_FUN_EXPORT PFNGLVERTEX4HVNVPROC __glewVertex4hvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1HNVPROC __glewVertexAttrib1hNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1HVNVPROC __glewVertexAttrib1hvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2HNVPROC __glewVertexAttrib2hNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2HVNVPROC __glewVertexAttrib2hvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3HNVPROC __glewVertexAttrib3hNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3HVNVPROC __glewVertexAttrib3hvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4HNVPROC __glewVertexAttrib4hNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4HVNVPROC __glewVertexAttrib4hvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS1HVNVPROC __glewVertexAttribs1hvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS2HVNVPROC __glewVertexAttribs2hvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS3HVNVPROC __glewVertexAttribs3hvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS4HVNVPROC __glewVertexAttribs4hvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXWEIGHTHNVPROC __glewVertexWeighthNV;
+GLEW_FUN_EXPORT PFNGLVERTEXWEIGHTHVNVPROC __glewVertexWeighthvNV;
+
+GLEW_FUN_EXPORT PFNGLBEGINOCCLUSIONQUERYNVPROC __glewBeginOcclusionQueryNV;
+GLEW_FUN_EXPORT PFNGLDELETEOCCLUSIONQUERIESNVPROC __glewDeleteOcclusionQueriesNV;
+GLEW_FUN_EXPORT PFNGLENDOCCLUSIONQUERYNVPROC __glewEndOcclusionQueryNV;
+GLEW_FUN_EXPORT PFNGLGENOCCLUSIONQUERIESNVPROC __glewGenOcclusionQueriesNV;
+GLEW_FUN_EXPORT PFNGLGETOCCLUSIONQUERYIVNVPROC __glewGetOcclusionQueryivNV;
+GLEW_FUN_EXPORT PFNGLGETOCCLUSIONQUERYUIVNVPROC __glewGetOcclusionQueryuivNV;
+GLEW_FUN_EXPORT PFNGLISOCCLUSIONQUERYNVPROC __glewIsOcclusionQueryNV;
+
+GLEW_FUN_EXPORT PFNGLFLUSHPIXELDATARANGENVPROC __glewFlushPixelDataRangeNV;
+GLEW_FUN_EXPORT PFNGLPIXELDATARANGENVPROC __glewPixelDataRangeNV;
+
+GLEW_FUN_EXPORT PFNGLPOINTPARAMETERINVPROC __glewPointParameteriNV;
+GLEW_FUN_EXPORT PFNGLPOINTPARAMETERIVNVPROC __glewPointParameterivNV;
+
+GLEW_FUN_EXPORT PFNGLPRIMITIVERESTARTINDEXNVPROC __glewPrimitiveRestartIndexNV;
+GLEW_FUN_EXPORT PFNGLPRIMITIVERESTARTNVPROC __glewPrimitiveRestartNV;
+
+GLEW_FUN_EXPORT PFNGLCOMBINERINPUTNVPROC __glewCombinerInputNV;
+GLEW_FUN_EXPORT PFNGLCOMBINEROUTPUTNVPROC __glewCombinerOutputNV;
+GLEW_FUN_EXPORT PFNGLCOMBINERPARAMETERFNVPROC __glewCombinerParameterfNV;
+GLEW_FUN_EXPORT PFNGLCOMBINERPARAMETERFVNVPROC __glewCombinerParameterfvNV;
+GLEW_FUN_EXPORT PFNGLCOMBINERPARAMETERINVPROC __glewCombinerParameteriNV;
+GLEW_FUN_EXPORT PFNGLCOMBINERPARAMETERIVNVPROC __glewCombinerParameterivNV;
+GLEW_FUN_EXPORT PFNGLFINALCOMBINERINPUTNVPROC __glewFinalCombinerInputNV;
+GLEW_FUN_EXPORT PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC __glewGetCombinerInputParameterfvNV;
+GLEW_FUN_EXPORT PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC __glewGetCombinerInputParameterivNV;
+GLEW_FUN_EXPORT PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC __glewGetCombinerOutputParameterfvNV;
+GLEW_FUN_EXPORT PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC __glewGetCombinerOutputParameterivNV;
+GLEW_FUN_EXPORT PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC __glewGetFinalCombinerInputParameterfvNV;
+GLEW_FUN_EXPORT PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC __glewGetFinalCombinerInputParameterivNV;
+
+GLEW_FUN_EXPORT PFNGLCOMBINERSTAGEPARAMETERFVNVPROC __glewCombinerStageParameterfvNV;
+GLEW_FUN_EXPORT PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC __glewGetCombinerStageParameterfvNV;
+
+GLEW_FUN_EXPORT PFNGLFLUSHVERTEXARRAYRANGENVPROC __glewFlushVertexArrayRangeNV;
+GLEW_FUN_EXPORT PFNGLVERTEXARRAYRANGENVPROC __glewVertexArrayRangeNV;
+
+GLEW_FUN_EXPORT PFNGLAREPROGRAMSRESIDENTNVPROC __glewAreProgramsResidentNV;
+GLEW_FUN_EXPORT PFNGLBINDPROGRAMNVPROC __glewBindProgramNV;
+GLEW_FUN_EXPORT PFNGLDELETEPROGRAMSNVPROC __glewDeleteProgramsNV;
+GLEW_FUN_EXPORT PFNGLEXECUTEPROGRAMNVPROC __glewExecuteProgramNV;
+GLEW_FUN_EXPORT PFNGLGENPROGRAMSNVPROC __glewGenProgramsNV;
+GLEW_FUN_EXPORT PFNGLGETPROGRAMPARAMETERDVNVPROC __glewGetProgramParameterdvNV;
+GLEW_FUN_EXPORT PFNGLGETPROGRAMPARAMETERFVNVPROC __glewGetProgramParameterfvNV;
+GLEW_FUN_EXPORT PFNGLGETPROGRAMSTRINGNVPROC __glewGetProgramStringNV;
+GLEW_FUN_EXPORT PFNGLGETPROGRAMIVNVPROC __glewGetProgramivNV;
+GLEW_FUN_EXPORT PFNGLGETTRACKMATRIXIVNVPROC __glewGetTrackMatrixivNV;
+GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBPOINTERVNVPROC __glewGetVertexAttribPointervNV;
+GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBDVNVPROC __glewGetVertexAttribdvNV;
+GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBFVNVPROC __glewGetVertexAttribfvNV;
+GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBIVNVPROC __glewGetVertexAttribivNV;
+GLEW_FUN_EXPORT PFNGLISPROGRAMNVPROC __glewIsProgramNV;
+GLEW_FUN_EXPORT PFNGLLOADPROGRAMNVPROC __glewLoadProgramNV;
+GLEW_FUN_EXPORT PFNGLPROGRAMPARAMETER4DNVPROC __glewProgramParameter4dNV;
+GLEW_FUN_EXPORT PFNGLPROGRAMPARAMETER4DVNVPROC __glewProgramParameter4dvNV;
+GLEW_FUN_EXPORT PFNGLPROGRAMPARAMETER4FNVPROC __glewProgramParameter4fNV;
+GLEW_FUN_EXPORT PFNGLPROGRAMPARAMETER4FVNVPROC __glewProgramParameter4fvNV;
+GLEW_FUN_EXPORT PFNGLPROGRAMPARAMETERS4DVNVPROC __glewProgramParameters4dvNV;
+GLEW_FUN_EXPORT PFNGLPROGRAMPARAMETERS4FVNVPROC __glewProgramParameters4fvNV;
+GLEW_FUN_EXPORT PFNGLREQUESTRESIDENTPROGRAMSNVPROC __glewRequestResidentProgramsNV;
+GLEW_FUN_EXPORT PFNGLTRACKMATRIXNVPROC __glewTrackMatrixNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1DNVPROC __glewVertexAttrib1dNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1DVNVPROC __glewVertexAttrib1dvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1FNVPROC __glewVertexAttrib1fNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1FVNVPROC __glewVertexAttrib1fvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1SNVPROC __glewVertexAttrib1sNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1SVNVPROC __glewVertexAttrib1svNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2DNVPROC __glewVertexAttrib2dNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2DVNVPROC __glewVertexAttrib2dvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2FNVPROC __glewVertexAttrib2fNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2FVNVPROC __glewVertexAttrib2fvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2SNVPROC __glewVertexAttrib2sNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2SVNVPROC __glewVertexAttrib2svNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3DNVPROC __glewVertexAttrib3dNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3DVNVPROC __glewVertexAttrib3dvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3FNVPROC __glewVertexAttrib3fNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3FVNVPROC __glewVertexAttrib3fvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3SNVPROC __glewVertexAttrib3sNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3SVNVPROC __glewVertexAttrib3svNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4DNVPROC __glewVertexAttrib4dNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4DVNVPROC __glewVertexAttrib4dvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4FNVPROC __glewVertexAttrib4fNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4FVNVPROC __glewVertexAttrib4fvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4SNVPROC __glewVertexAttrib4sNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4SVNVPROC __glewVertexAttrib4svNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4UBNVPROC __glewVertexAttrib4ubNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4UBVNVPROC __glewVertexAttrib4ubvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBPOINTERNVPROC __glewVertexAttribPointerNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS1DVNVPROC __glewVertexAttribs1dvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS1FVNVPROC __glewVertexAttribs1fvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS1SVNVPROC __glewVertexAttribs1svNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS2DVNVPROC __glewVertexAttribs2dvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS2FVNVPROC __glewVertexAttribs2fvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS2SVNVPROC __glewVertexAttribs2svNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS3DVNVPROC __glewVertexAttribs3dvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS3FVNVPROC __glewVertexAttribs3fvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS3SVNVPROC __glewVertexAttribs3svNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS4DVNVPROC __glewVertexAttribs4dvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS4FVNVPROC __glewVertexAttribs4fvNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS4SVNVPROC __glewVertexAttribs4svNV;
+GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS4UBVNVPROC __glewVertexAttribs4ubvNV;
+
+GLEW_FUN_EXPORT PFNGLDETAILTEXFUNCSGISPROC __glewDetailTexFuncSGIS;
+GLEW_FUN_EXPORT PFNGLGETDETAILTEXFUNCSGISPROC __glewGetDetailTexFuncSGIS;
+
+GLEW_FUN_EXPORT PFNGLFOGFUNCSGISPROC __glewFogFuncSGIS;
+GLEW_FUN_EXPORT PFNGLGETFOGFUNCSGISPROC __glewGetFogFuncSGIS;
+
+GLEW_FUN_EXPORT PFNGLSAMPLEMASKSGISPROC __glewSampleMaskSGIS;
+GLEW_FUN_EXPORT PFNGLSAMPLEPATTERNSGISPROC __glewSamplePatternSGIS;
+
+GLEW_FUN_EXPORT PFNGLGETSHARPENTEXFUNCSGISPROC __glewGetSharpenTexFuncSGIS;
+GLEW_FUN_EXPORT PFNGLSHARPENTEXFUNCSGISPROC __glewSharpenTexFuncSGIS;
+
+GLEW_FUN_EXPORT PFNGLTEXIMAGE4DSGISPROC __glewTexImage4DSGIS;
+GLEW_FUN_EXPORT PFNGLTEXSUBIMAGE4DSGISPROC __glewTexSubImage4DSGIS;
+
+GLEW_FUN_EXPORT PFNGLGETTEXFILTERFUNCSGISPROC __glewGetTexFilterFuncSGIS;
+GLEW_FUN_EXPORT PFNGLTEXFILTERFUNCSGISPROC __glewTexFilterFuncSGIS;
+
+GLEW_FUN_EXPORT PFNGLASYNCMARKERSGIXPROC __glewAsyncMarkerSGIX;
+GLEW_FUN_EXPORT PFNGLDELETEASYNCMARKERSSGIXPROC __glewDeleteAsyncMarkersSGIX;
+GLEW_FUN_EXPORT PFNGLFINISHASYNCSGIXPROC __glewFinishAsyncSGIX;
+GLEW_FUN_EXPORT PFNGLGENASYNCMARKERSSGIXPROC __glewGenAsyncMarkersSGIX;
+GLEW_FUN_EXPORT PFNGLISASYNCMARKERSGIXPROC __glewIsAsyncMarkerSGIX;
+GLEW_FUN_EXPORT PFNGLPOLLASYNCSGIXPROC __glewPollAsyncSGIX;
+
+GLEW_FUN_EXPORT PFNGLFLUSHRASTERSGIXPROC __glewFlushRasterSGIX;
+
+GLEW_FUN_EXPORT PFNGLTEXTUREFOGSGIXPROC __glewTextureFogSGIX;
+
+#if 0
+GLEW_FUN_EXPORT PFNGLFRAGMENTCOLORMATERIALSGIXPROC __glewFragmentColorMaterialSGIX;
+GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTMODELFSGIXPROC __glewFragmentLightModelfSGIX;
+GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTMODELFVSGIXPROC __glewFragmentLightModelfvSGIX;
+GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTMODELISGIXPROC __glewFragmentLightModeliSGIX;
+GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTMODELIVSGIXPROC __glewFragmentLightModelivSGIX;
+GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTFSGIXPROC __glewFragmentLightfSGIX;
+GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTFVSGIXPROC __glewFragmentLightfvSGIX;
+GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTISGIXPROC __glewFragmentLightiSGIX;
+GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTIVSGIXPROC __glewFragmentLightivSGIX;
+GLEW_FUN_EXPORT PFNGLFRAGMENTMATERIALFSGIXPROC __glewFragmentMaterialfSGIX;
+GLEW_FUN_EXPORT PFNGLFRAGMENTMATERIALFVSGIXPROC __glewFragmentMaterialfvSGIX;
+GLEW_FUN_EXPORT PFNGLFRAGMENTMATERIALISGIXPROC __glewFragmentMaterialiSGIX;
+GLEW_FUN_EXPORT PFNGLFRAGMENTMATERIALIVSGIXPROC __glewFragmentMaterialivSGIX;
+GLEW_FUN_EXPORT PFNGLGETFRAGMENTLIGHTFVSGIXPROC __glewGetFragmentLightfvSGIX;
+GLEW_FUN_EXPORT PFNGLGETFRAGMENTLIGHTIVSGIXPROC __glewGetFragmentLightivSGIX;
+GLEW_FUN_EXPORT PFNGLGETFRAGMENTMATERIALFVSGIXPROC __glewGetFragmentMaterialfvSGIX;
+GLEW_FUN_EXPORT PFNGLGETFRAGMENTMATERIALIVSGIXPROC __glewGetFragmentMaterialivSGIX;
+#endif
+
+GLEW_FUN_EXPORT PFNGLFRAMEZOOMSGIXPROC __glewFrameZoomSGIX;
+
+GLEW_FUN_EXPORT PFNGLPIXELTEXGENSGIXPROC __glewPixelTexGenSGIX;
+
+GLEW_FUN_EXPORT PFNGLREFERENCEPLANESGIXPROC __glewReferencePlaneSGIX;
+
+GLEW_FUN_EXPORT PFNGLSPRITEPARAMETERFSGIXPROC __glewSpriteParameterfSGIX;
+GLEW_FUN_EXPORT PFNGLSPRITEPARAMETERFVSGIXPROC __glewSpriteParameterfvSGIX;
+GLEW_FUN_EXPORT PFNGLSPRITEPARAMETERISGIXPROC __glewSpriteParameteriSGIX;
+GLEW_FUN_EXPORT PFNGLSPRITEPARAMETERIVSGIXPROC __glewSpriteParameterivSGIX;
+
+GLEW_FUN_EXPORT PFNGLTAGSAMPLEBUFFERSGIXPROC __glewTagSampleBufferSGIX;
+
+GLEW_FUN_EXPORT PFNGLCOLORTABLEPARAMETERFVSGIPROC __glewColorTableParameterfvSGI;
+GLEW_FUN_EXPORT PFNGLCOLORTABLEPARAMETERIVSGIPROC __glewColorTableParameterivSGI;
+GLEW_FUN_EXPORT PFNGLCOLORTABLESGIPROC __glewColorTableSGI;
+GLEW_FUN_EXPORT PFNGLCOPYCOLORTABLESGIPROC __glewCopyColorTableSGI;
+GLEW_FUN_EXPORT PFNGLGETCOLORTABLEPARAMETERFVSGIPROC __glewGetColorTableParameterfvSGI;
+GLEW_FUN_EXPORT PFNGLGETCOLORTABLEPARAMETERIVSGIPROC __glewGetColorTableParameterivSGI;
+GLEW_FUN_EXPORT PFNGLGETCOLORTABLESGIPROC __glewGetColorTableSGI;
+
+GLEW_FUN_EXPORT PFNGLFINISHTEXTURESUNXPROC __glewFinishTextureSUNX;
+
+GLEW_FUN_EXPORT PFNGLGLOBALALPHAFACTORBSUNPROC __glewGlobalAlphaFactorbSUN;
+GLEW_FUN_EXPORT PFNGLGLOBALALPHAFACTORDSUNPROC __glewGlobalAlphaFactordSUN;
+GLEW_FUN_EXPORT PFNGLGLOBALALPHAFACTORFSUNPROC __glewGlobalAlphaFactorfSUN;
+GLEW_FUN_EXPORT PFNGLGLOBALALPHAFACTORISUNPROC __glewGlobalAlphaFactoriSUN;
+GLEW_FUN_EXPORT PFNGLGLOBALALPHAFACTORSSUNPROC __glewGlobalAlphaFactorsSUN;
+GLEW_FUN_EXPORT PFNGLGLOBALALPHAFACTORUBSUNPROC __glewGlobalAlphaFactorubSUN;
+GLEW_FUN_EXPORT PFNGLGLOBALALPHAFACTORUISUNPROC __glewGlobalAlphaFactoruiSUN;
+GLEW_FUN_EXPORT PFNGLGLOBALALPHAFACTORUSSUNPROC __glewGlobalAlphaFactorusSUN;
+
+GLEW_FUN_EXPORT PFNGLREADVIDEOPIXELSSUNPROC __glewReadVideoPixelsSUN;
+
+GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEPOINTERSUNPROC __glewReplacementCodePointerSUN;
+GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUBSUNPROC __glewReplacementCodeubSUN;
+GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUBVSUNPROC __glewReplacementCodeubvSUN;
+GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUISUNPROC __glewReplacementCodeuiSUN;
+GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUIVSUNPROC __glewReplacementCodeuivSUN;
+GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUSSUNPROC __glewReplacementCodeusSUN;
+GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUSVSUNPROC __glewReplacementCodeusvSUN;
+
+GLEW_FUN_EXPORT PFNGLCOLOR3FVERTEX3FSUNPROC __glewColor3fVertex3fSUN;
+GLEW_FUN_EXPORT PFNGLCOLOR3FVERTEX3FVSUNPROC __glewColor3fVertex3fvSUN;
+GLEW_FUN_EXPORT PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC __glewColor4fNormal3fVertex3fSUN;
+GLEW_FUN_EXPORT PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC __glewColor4fNormal3fVertex3fvSUN;
+GLEW_FUN_EXPORT PFNGLCOLOR4UBVERTEX2FSUNPROC __glewColor4ubVertex2fSUN;
+GLEW_FUN_EXPORT PFNGLCOLOR4UBVERTEX2FVSUNPROC __glewColor4ubVertex2fvSUN;
+GLEW_FUN_EXPORT PFNGLCOLOR4UBVERTEX3FSUNPROC __glewColor4ubVertex3fSUN;
+GLEW_FUN_EXPORT PFNGLCOLOR4UBVERTEX3FVSUNPROC __glewColor4ubVertex3fvSUN;
+GLEW_FUN_EXPORT PFNGLNORMAL3FVERTEX3FSUNPROC __glewNormal3fVertex3fSUN;
+GLEW_FUN_EXPORT PFNGLNORMAL3FVERTEX3FVSUNPROC __glewNormal3fVertex3fvSUN;
+GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC __glewReplacementCodeuiColor3fVertex3fSUN;
+GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC __glewReplacementCodeuiColor3fVertex3fvSUN;
+GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC __glewReplacementCodeuiColor4fNormal3fVertex3fSUN;
+GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC __glewReplacementCodeuiColor4fNormal3fVertex3fvSUN;
+GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC __glewReplacementCodeuiColor4ubVertex3fSUN;
+GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC __glewReplacementCodeuiColor4ubVertex3fvSUN;
+GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC __glewReplacementCodeuiNormal3fVertex3fSUN;
+GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC __glewReplacementCodeuiNormal3fVertex3fvSUN;
+GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC __glewReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN;
+GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC __glewReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN;
+GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC __glewReplacementCodeuiTexCoord2fNormal3fVertex3fSUN;
+GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC __glewReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN;
+GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC __glewReplacementCodeuiTexCoord2fVertex3fSUN;
+GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC __glewReplacementCodeuiTexCoord2fVertex3fvSUN;
+GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC __glewReplacementCodeuiVertex3fSUN;
+GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC __glewReplacementCodeuiVertex3fvSUN;
+GLEW_FUN_EXPORT PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC __glewTexCoord2fColor3fVertex3fSUN;
+GLEW_FUN_EXPORT PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC __glewTexCoord2fColor3fVertex3fvSUN;
+GLEW_FUN_EXPORT PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC __glewTexCoord2fColor4fNormal3fVertex3fSUN;
+GLEW_FUN_EXPORT PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC __glewTexCoord2fColor4fNormal3fVertex3fvSUN;
+GLEW_FUN_EXPORT PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC __glewTexCoord2fColor4ubVertex3fSUN;
+GLEW_FUN_EXPORT PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC __glewTexCoord2fColor4ubVertex3fvSUN;
+GLEW_FUN_EXPORT PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC __glewTexCoord2fNormal3fVertex3fSUN;
+GLEW_FUN_EXPORT PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC __glewTexCoord2fNormal3fVertex3fvSUN;
+GLEW_FUN_EXPORT PFNGLTEXCOORD2FVERTEX3FSUNPROC __glewTexCoord2fVertex3fSUN;
+GLEW_FUN_EXPORT PFNGLTEXCOORD2FVERTEX3FVSUNPROC __glewTexCoord2fVertex3fvSUN;
+GLEW_FUN_EXPORT PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC __glewTexCoord4fColor4fNormal3fVertex4fSUN;
+GLEW_FUN_EXPORT PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC __glewTexCoord4fColor4fNormal3fVertex4fvSUN;
+GLEW_FUN_EXPORT PFNGLTEXCOORD4FVERTEX4FSUNPROC __glewTexCoord4fVertex4fSUN;
+GLEW_FUN_EXPORT PFNGLTEXCOORD4FVERTEX4FVSUNPROC __glewTexCoord4fVertex4fvSUN;
+
+GLEW_FUN_EXPORT PFNGLADDSWAPHINTRECTWINPROC __glewAddSwapHintRectWIN;
+
+#if defined(GLEW_MX) && !defined(_WIN32)
+struct GLEWContextStruct
+{
+#endif /* GLEW_MX */
+
+GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_1_1;
+GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_1_2;
+GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_1_3;
+GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_1_4;
+GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_1_5;
+GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_2_0;
+GLEW_VAR_EXPORT GLboolean __GLEW_3DFX_multisample;
+GLEW_VAR_EXPORT GLboolean __GLEW_3DFX_tbuffer;
+GLEW_VAR_EXPORT GLboolean __GLEW_3DFX_texture_compression_FXT1;
+GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_client_storage;
+GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_element_array;
+GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_fence;
+GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_float_pixels;
+GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_pixel_buffer;
+GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_specular_vector;
+GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_texture_range;
+GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_transform_hint;
+GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_vertex_array_object;
+GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_vertex_array_range;
+GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_ycbcr_422;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_color_buffer_float;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_depth_texture;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_draw_buffers;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_fragment_program;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_fragment_program_shadow;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_fragment_shader;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_half_float_pixel;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_imaging;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_matrix_palette;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_multisample;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_multitexture;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_occlusion_query;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_pixel_buffer_object;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_point_parameters;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_point_sprite;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_objects;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shading_language_100;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shadow;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shadow_ambient;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_border_clamp;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_compression;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_cube_map;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_env_add;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_env_combine;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_env_crossbar;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_env_dot3;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_float;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_mirrored_repeat;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_non_power_of_two;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_rectangle;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_transpose_matrix;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_vertex_blend;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_vertex_buffer_object;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_vertex_program;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_vertex_shader;
+GLEW_VAR_EXPORT GLboolean __GLEW_ARB_window_pos;
+GLEW_VAR_EXPORT GLboolean __GLEW_ATIX_point_sprites;
+GLEW_VAR_EXPORT GLboolean __GLEW_ATIX_texture_env_combine3;
+GLEW_VAR_EXPORT GLboolean __GLEW_ATIX_texture_env_route;
+GLEW_VAR_EXPORT GLboolean __GLEW_ATIX_vertex_shader_output_point_size;
+GLEW_VAR_EXPORT GLboolean __GLEW_ATI_draw_buffers;
+GLEW_VAR_EXPORT GLboolean __GLEW_ATI_element_array;
+GLEW_VAR_EXPORT GLboolean __GLEW_ATI_envmap_bumpmap;
+GLEW_VAR_EXPORT GLboolean __GLEW_ATI_fragment_shader;
+GLEW_VAR_EXPORT GLboolean __GLEW_ATI_map_object_buffer;
+GLEW_VAR_EXPORT GLboolean __GLEW_ATI_pn_triangles;
+GLEW_VAR_EXPORT GLboolean __GLEW_ATI_separate_stencil;
+GLEW_VAR_EXPORT GLboolean __GLEW_ATI_text_fragment_shader;
+GLEW_VAR_EXPORT GLboolean __GLEW_ATI_texture_compression_3dc;
+GLEW_VAR_EXPORT GLboolean __GLEW_ATI_texture_env_combine3;
+GLEW_VAR_EXPORT GLboolean __GLEW_ATI_texture_float;
+GLEW_VAR_EXPORT GLboolean __GLEW_ATI_texture_mirror_once;
+GLEW_VAR_EXPORT GLboolean __GLEW_ATI_vertex_array_object;
+GLEW_VAR_EXPORT GLboolean __GLEW_ATI_vertex_attrib_array_object;
+GLEW_VAR_EXPORT GLboolean __GLEW_ATI_vertex_streams;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_422_pixels;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_Cg_shader;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_abgr;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_bgra;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_blend_color;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_blend_equation_separate;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_blend_func_separate;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_blend_logic_op;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_blend_minmax;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_blend_subtract;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_clip_volume_hint;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_cmyka;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_color_subtable;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_compiled_vertex_array;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_convolution;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_coordinate_frame;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_copy_texture;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_cull_vertex;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_depth_bounds_test;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_draw_range_elements;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_fog_coord;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_fragment_lighting;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_framebuffer_blit;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_framebuffer_multisample;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_framebuffer_object;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_histogram;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_index_array_formats;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_index_func;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_index_material;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_index_texture;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_light_texture;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_misc_attribute;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_multi_draw_arrays;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_multisample;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_packed_depth_stencil;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_packed_pixels;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_paletted_texture;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_pixel_buffer_object;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_pixel_transform;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_pixel_transform_color_table;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_point_parameters;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_polygon_offset;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_rescale_normal;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_scene_marker;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_secondary_color;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_separate_specular_color;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_shadow_funcs;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_shared_texture_palette;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_stencil_clear_tag;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_stencil_two_side;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_stencil_wrap;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_subtexture;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture3D;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_compression_dxt1;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_compression_s3tc;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_cube_map;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_edge_clamp;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_env;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_env_add;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_env_combine;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_env_dot3;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_filter_anisotropic;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_lod_bias;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_mirror_clamp;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_object;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_perturb_normal;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_rectangle;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_sRGB;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_vertex_array;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_vertex_shader;
+GLEW_VAR_EXPORT GLboolean __GLEW_EXT_vertex_weighting;
+GLEW_VAR_EXPORT GLboolean __GLEW_GREMEDY_string_marker;
+GLEW_VAR_EXPORT GLboolean __GLEW_HP_convolution_border_modes;
+GLEW_VAR_EXPORT GLboolean __GLEW_HP_image_transform;
+GLEW_VAR_EXPORT GLboolean __GLEW_HP_occlusion_test;
+GLEW_VAR_EXPORT GLboolean __GLEW_HP_texture_lighting;
+GLEW_VAR_EXPORT GLboolean __GLEW_IBM_cull_vertex;
+GLEW_VAR_EXPORT GLboolean __GLEW_IBM_multimode_draw_arrays;
+GLEW_VAR_EXPORT GLboolean __GLEW_IBM_rasterpos_clip;
+GLEW_VAR_EXPORT GLboolean __GLEW_IBM_static_data;
+GLEW_VAR_EXPORT GLboolean __GLEW_IBM_texture_mirrored_repeat;
+GLEW_VAR_EXPORT GLboolean __GLEW_IBM_vertex_array_lists;
+GLEW_VAR_EXPORT GLboolean __GLEW_INGR_color_clamp;
+GLEW_VAR_EXPORT GLboolean __GLEW_INGR_interlace_read;
+GLEW_VAR_EXPORT GLboolean __GLEW_INTEL_parallel_arrays;
+GLEW_VAR_EXPORT GLboolean __GLEW_INTEL_texture_scissor;
+GLEW_VAR_EXPORT GLboolean __GLEW_KTX_buffer_region;
+GLEW_VAR_EXPORT GLboolean __GLEW_MESAX_texture_stack;
+GLEW_VAR_EXPORT GLboolean __GLEW_MESA_pack_invert;
+GLEW_VAR_EXPORT GLboolean __GLEW_MESA_resize_buffers;
+GLEW_VAR_EXPORT GLboolean __GLEW_MESA_window_pos;
+GLEW_VAR_EXPORT GLboolean __GLEW_MESA_ycbcr_texture;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_blend_square;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_copy_depth_to_color;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_depth_clamp;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_evaluators;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_fence;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_float_buffer;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_fog_distance;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_fragment_program;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_fragment_program2;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_fragment_program_option;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_half_float;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_light_max_exponent;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_multisample_filter_hint;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_occlusion_query;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_packed_depth_stencil;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_pixel_data_range;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_point_sprite;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_primitive_restart;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_register_combiners;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_register_combiners2;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_texgen_emboss;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_texgen_reflection;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_compression_vtc;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_env_combine4;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_expand_normal;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_rectangle;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_shader;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_shader2;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_shader3;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_array_range;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_array_range2;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_program;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_program1_1;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_program2;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_program2_option;
+GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_program3;
+GLEW_VAR_EXPORT GLboolean __GLEW_OML_interlace;
+GLEW_VAR_EXPORT GLboolean __GLEW_OML_resample;
+GLEW_VAR_EXPORT GLboolean __GLEW_OML_subsample;
+GLEW_VAR_EXPORT GLboolean __GLEW_PGI_misc_hints;
+GLEW_VAR_EXPORT GLboolean __GLEW_PGI_vertex_hints;
+GLEW_VAR_EXPORT GLboolean __GLEW_REND_screen_coordinates;
+GLEW_VAR_EXPORT GLboolean __GLEW_S3_s3tc;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_color_range;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_detail_texture;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_fog_function;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_generate_mipmap;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_multisample;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_pixel_texture;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_sharpen_texture;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_texture4D;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_texture_border_clamp;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_texture_edge_clamp;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_texture_filter4;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_texture_lod;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_texture_select;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_async;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_async_histogram;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_async_pixel;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_blend_alpha_minmax;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_clipmap;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_depth_texture;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_flush_raster;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_fog_offset;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_fog_texture;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_fragment_specular_lighting;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_framezoom;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_interlace;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_ir_instrument1;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_list_priority;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_pixel_texture;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_pixel_texture_bits;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_reference_plane;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_resample;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_shadow;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_shadow_ambient;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_sprite;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_tag_sample_buffer;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_texture_add_env;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_texture_coordinate_clamp;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_texture_lod_bias;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_texture_multi_buffer;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_texture_range;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_texture_scale_bias;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_vertex_preclip;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_vertex_preclip_hint;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_ycrcb;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGI_color_matrix;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGI_color_table;
+GLEW_VAR_EXPORT GLboolean __GLEW_SGI_texture_color_table;
+GLEW_VAR_EXPORT GLboolean __GLEW_SUNX_constant_data;
+GLEW_VAR_EXPORT GLboolean __GLEW_SUN_convolution_border_modes;
+GLEW_VAR_EXPORT GLboolean __GLEW_SUN_global_alpha;
+GLEW_VAR_EXPORT GLboolean __GLEW_SUN_mesh_array;
+GLEW_VAR_EXPORT GLboolean __GLEW_SUN_read_video_pixels;
+GLEW_VAR_EXPORT GLboolean __GLEW_SUN_slice_accum;
+GLEW_VAR_EXPORT GLboolean __GLEW_SUN_triangle_list;
+GLEW_VAR_EXPORT GLboolean __GLEW_SUN_vertex;
+GLEW_VAR_EXPORT GLboolean __GLEW_WIN_phong_shading;
+GLEW_VAR_EXPORT GLboolean __GLEW_WIN_specular_fog;
+GLEW_VAR_EXPORT GLboolean __GLEW_WIN_swap_hint;
+
+#ifdef GLEW_MX
+}; /* GLEWContextStruct */
+#endif /* GLEW_MX */
+
+/* ------------------------------------------------------------------------- */
+
+/* error codes */
+#define GLEW_OK 0
+#define GLEW_NO_ERROR 0
+#define GLEW_ERROR_NO_GL_VERSION 1  /* missing GL version */
+#define GLEW_ERROR_GL_VERSION_10_ONLY 2  /* GL 1.1 and up are not supported */
+#define GLEW_ERROR_GLX_VERSION_11_ONLY 3  /* GLX 1.2 and up are not supported */
+
+/* string codes */
+#define GLEW_VERSION 1
+
+/* API */
+#ifdef GLEW_MX
+
+typedef struct GLEWContextStruct GLEWContext;
+GLEWAPI GLenum glewContextInit (GLEWContext* ctx);
+GLEWAPI GLboolean glewContextIsSupported (GLEWContext* ctx, const char* name);
+
+#define glewInit() glewContextInit(glewGetContext())
+#define glewIsSupported(x) glewContextIsSupported(glewGetContext(), x)
+#define glewIsExtensionSupported(x) glewIsSupported(x)
+
+#ifdef _WIN32
+#  define GLEW_GET_VAR(x) glewGetContext()->x
+#  define GLEW_GET_FUN(x) glewGetContext()->x
+#else
+#  define GLEW_GET_VAR(x) glewGetContext()->x
+#  define GLEW_GET_FUN(x) x
+#endif
+
+#else /* GLEW_MX */
+
+GLEWAPI GLenum glewInit ();
+GLEWAPI GLboolean glewIsSupported (const char* name);
+#define glewIsExtensionSupported(x) glewIsSupported(x)
+
+#define GLEW_GET_VAR(x) x
+#define GLEW_GET_FUN(x) x
+
+#endif /* GLEW_MX */
+
+GLEWAPI GLboolean glewExperimental;
+GLEWAPI GLboolean glewGetExtension (const char* name);
+GLEWAPI const GLubyte* glewGetErrorString (GLenum error);
+GLEWAPI const GLubyte* glewGetString (GLenum name);
+
+#ifdef __cplusplus
+}
+#endif
+
+#ifdef GLEW_APIENTRY_DEFINED
+#undef GLEW_APIENTRY_DEFINED
+#undef APIENTRY
+#undef GLAPIENTRY
+#endif
+
+#ifdef GLEW_CALLBACK_DEFINED
+#undef GLEW_CALLBACK_DEFINED
+#undef CALLBACK
+#endif
+
+#ifdef GLEW_WINGDIAPI_DEFINED
+#undef GLEW_WINGDIAPI_DEFINED
+#undef WINGDIAPI
+#endif
+
+#undef GLAPI
+/* #undef GLEWAPI */
+
+#endif /* __glew_h__ */
diff --git a/extern/glew/include/GL/glxew.h b/extern/glew/include/GL/glxew.h
new file mode 100644
index 00000000000..d21397aeed4
--- /dev/null
+++ b/extern/glew/include/GL/glxew.h
@@ -0,0 +1,1062 @@
+/*
+** The OpenGL Extension Wrangler Library
+** Copyright (C) 2002-2006, Milan Ikits <milan ikits[]ieee org>
+** Copyright (C) 2002-2006, Marcelo E. Magallon <mmagallo[]debian org>
+** Copyright (C) 2002, Lev Povalahev
+** All rights reserved.
+** 
+** Redistribution and use in source and binary forms, with or without 
+** modification, are permitted provided that the following conditions are met:
+** 
+** * Redistributions of source code must retain the above copyright notice, 
+**   this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright notice, 
+**   this list of conditions and the following disclaimer in the documentation 
+**   and/or other materials provided with the distribution.
+** * The name of the author may be used to endorse or promote products 
+**   derived from this software without specific prior written permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+** ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
+** LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+** CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+** SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+** INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+** CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+** ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+** THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/*
+** The contents of this file are subject to the GLX Public License Version 1.0
+** (the "License"). You may not use this file except in compliance with the
+** License. You may obtain a copy of the License at Silicon Graphics, Inc.,
+** attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
+** or at http://www.sgi.com/software/opensource/glx/license.html.
+**
+** Software distributed under the License is distributed on an "AS IS"
+** basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
+** IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
+** PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
+** language governing rights and limitations under the License.
+**
+** The Original Software is GLX version 1.2 source code, released February,
+** 1999. The developer of the Original Software is Silicon Graphics, Inc.
+** Those portions of the Subject Software created by Silicon Graphics, Inc.
+** are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
+*/
+
+#ifndef __glxew_h__
+#define __glxew_h__
+#define __GLXEW_H__
+
+#ifdef __glxext_h_
+#error glxext.h included before glxew.h
+#endif
+
+#define __glxext_h_
+#define __GLX_glx_h__
+
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/Xmd.h>
+#include <GL/glew.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* ---------------------------- GLX_VERSION_1_0 --------------------------- */
+
+#ifndef GLX_VERSION_1_0
+#define GLX_VERSION_1_0 1
+
+#define GLX_USE_GL 1
+#define GLX_BUFFER_SIZE 2
+#define GLX_LEVEL 3
+#define GLX_RGBA 4
+#define GLX_DOUBLEBUFFER 5
+#define GLX_STEREO 6
+#define GLX_AUX_BUFFERS 7
+#define GLX_RED_SIZE 8
+#define GLX_GREEN_SIZE 9
+#define GLX_BLUE_SIZE 10
+#define GLX_ALPHA_SIZE 11
+#define GLX_DEPTH_SIZE 12
+#define GLX_STENCIL_SIZE 13
+#define GLX_ACCUM_RED_SIZE 14
+#define GLX_ACCUM_GREEN_SIZE 15
+#define GLX_ACCUM_BLUE_SIZE 16
+#define GLX_ACCUM_ALPHA_SIZE 17
+#define GLX_BAD_SCREEN 1
+#define GLX_BAD_ATTRIBUTE 2
+#define GLX_NO_EXTENSION 3
+#define GLX_BAD_VISUAL 4
+#define GLX_BAD_CONTEXT 5
+#define GLX_BAD_VALUE 6
+#define GLX_BAD_ENUM 7
+
+typedef XID GLXDrawable;
+typedef XID GLXPixmap;
+typedef struct __GLXcontextRec *GLXContext;
+
+extern Bool glXQueryExtension (Display *dpy, int *errorBase, int *eventBase);
+extern Bool glXQueryVersion (Display *dpy, int *major, int *minor);
+extern int glXGetConfig (Display *dpy, XVisualInfo *vis, int attrib, int *value);
+extern XVisualInfo* glXChooseVisual (Display *dpy, int screen, int *attribList);
+extern GLXPixmap glXCreateGLXPixmap (Display *dpy, XVisualInfo *vis, Pixmap pixmap);
+extern void glXDestroyGLXPixmap (Display *dpy, GLXPixmap pix);
+extern GLXContext glXCreateContext (Display *dpy, XVisualInfo *vis, GLXContext shareList, Bool direct);
+extern void glXDestroyContext (Display *dpy, GLXContext ctx);
+extern Bool glXIsDirect (Display *dpy, GLXContext ctx);
+extern void glXCopyContext (Display *dpy, GLXContext src, GLXContext dst, GLuint mask);
+extern Bool glXMakeCurrent (Display *dpy, GLXDrawable drawable, GLXContext ctx);
+extern GLXContext glXGetCurrentContext (void);
+extern GLXDrawable glXGetCurrentDrawable (void);
+extern void glXWaitGL (void);
+extern void glXWaitX (void);
+extern void glXSwapBuffers (Display *dpy, GLXDrawable drawable);
+extern void glXUseXFont (Font font, int first, int count, int listBase);
+
+#define GLXEW_VERSION_1_0 GLXEW_GET_VAR(__GLXEW_VERSION_1_0)
+
+#endif /* GLX_VERSION_1_0 */
+
+/* ---------------------------- GLX_VERSION_1_1 --------------------------- */
+
+#ifndef GLX_VERSION_1_1
+#define GLX_VERSION_1_1
+
+#define GLX_VENDOR 0x1
+#define GLX_VERSION 0x2
+#define GLX_EXTENSIONS 0x3
+
+extern const char* glXQueryExtensionsString (Display *dpy, int screen);
+extern const char* glXGetClientString (Display *dpy, int name);
+extern const char* glXQueryServerString (Display *dpy, int screen, int name);
+
+#define GLXEW_VERSION_1_1 GLXEW_GET_VAR(__GLXEW_VERSION_1_1)
+
+#endif /* GLX_VERSION_1_1 */
+
+/* ---------------------------- GLX_VERSION_1_2 ---------------------------- */
+
+#ifndef GLX_VERSION_1_2
+#define GLX_VERSION_1_2 1
+
+typedef Display* ( * PFNGLXGETCURRENTDISPLAYPROC) (void);
+
+#define glXGetCurrentDisplay GLXEW_GET_FUN(__glewXGetCurrentDisplay)
+
+#define GLXEW_VERSION_1_2 GLXEW_GET_VAR(__GLXEW_VERSION_1_2)
+
+#endif /* GLX_VERSION_1_2 */
+
+/* ---------------------------- GLX_VERSION_1_3 ---------------------------- */
+
+#ifndef GLX_VERSION_1_3
+#define GLX_VERSION_1_3 1
+
+#define GLX_RGBA_BIT 0x00000001
+#define GLX_FRONT_LEFT_BUFFER_BIT 0x00000001
+#define GLX_WINDOW_BIT 0x00000001
+#define GLX_COLOR_INDEX_BIT 0x00000002
+#define GLX_PIXMAP_BIT 0x00000002
+#define GLX_FRONT_RIGHT_BUFFER_BIT 0x00000002
+#define GLX_BACK_LEFT_BUFFER_BIT 0x00000004
+#define GLX_PBUFFER_BIT 0x00000004
+#define GLX_BACK_RIGHT_BUFFER_BIT 0x00000008
+#define GLX_AUX_BUFFERS_BIT 0x00000010
+#define GLX_CONFIG_CAVEAT 0x20
+#define GLX_DEPTH_BUFFER_BIT 0x00000020
+#define GLX_X_VISUAL_TYPE 0x22
+#define GLX_TRANSPARENT_TYPE 0x23
+#define GLX_TRANSPARENT_INDEX_VALUE 0x24
+#define GLX_TRANSPARENT_RED_VALUE 0x25
+#define GLX_TRANSPARENT_GREEN_VALUE 0x26
+#define GLX_TRANSPARENT_BLUE_VALUE 0x27
+#define GLX_TRANSPARENT_ALPHA_VALUE 0x28
+#define GLX_STENCIL_BUFFER_BIT 0x00000040
+#define GLX_ACCUM_BUFFER_BIT 0x00000080
+#define GLX_NONE 0x8000
+#define GLX_SLOW_CONFIG 0x8001
+#define GLX_TRUE_COLOR 0x8002
+#define GLX_DIRECT_COLOR 0x8003
+#define GLX_PSEUDO_COLOR 0x8004
+#define GLX_STATIC_COLOR 0x8005
+#define GLX_GRAY_SCALE 0x8006
+#define GLX_STATIC_GRAY 0x8007
+#define GLX_TRANSPARENT_RGB 0x8008
+#define GLX_TRANSPARENT_INDEX 0x8009
+#define GLX_VISUAL_ID 0x800B
+#define GLX_SCREEN 0x800C
+#define GLX_NON_CONFORMANT_CONFIG 0x800D
+#define GLX_DRAWABLE_TYPE 0x8010
+#define GLX_RENDER_TYPE 0x8011
+#define GLX_X_RENDERABLE 0x8012
+#define GLX_FBCONFIG_ID 0x8013
+#define GLX_RGBA_TYPE 0x8014
+#define GLX_COLOR_INDEX_TYPE 0x8015
+#define GLX_MAX_PBUFFER_WIDTH 0x8016
+#define GLX_MAX_PBUFFER_HEIGHT 0x8017
+#define GLX_MAX_PBUFFER_PIXELS 0x8018
+#define GLX_PRESERVED_CONTENTS 0x801B
+#define GLX_LARGEST_PBUFFER 0x801C
+#define GLX_WIDTH 0x801D
+#define GLX_HEIGHT 0x801E
+#define GLX_EVENT_MASK 0x801F
+#define GLX_DAMAGED 0x8020
+#define GLX_SAVED 0x8021
+#define GLX_WINDOW 0x8022
+#define GLX_PBUFFER 0x8023
+#define GLX_PBUFFER_HEIGHT 0x8040
+#define GLX_PBUFFER_WIDTH 0x8041
+#define GLX_PBUFFER_CLOBBER_MASK 0x08000000
+#define GLX_DONT_CARE 0xFFFFFFFF
+
+typedef XID GLXFBConfigID;
+typedef XID GLXWindow;
+typedef XID GLXPbuffer;
+typedef struct __GLXFBConfigRec *GLXFBConfig;
+typedef struct { int event_type; int draw_type; unsigned long serial; Bool send_event; Display *display; GLXDrawable drawable; unsigned int buffer_mask; unsigned int aux_buffer; int x, y; int width, height; int count; } GLXPbufferClobberEvent;
+typedef union __GLXEvent { GLXPbufferClobberEvent glxpbufferclobber; long pad[24]; } GLXEvent;
+
+typedef GLXFBConfig* ( * PFNGLXCHOOSEFBCONFIGPROC) (Display *dpy, int screen, const int *attrib_list, int *nelements);
+typedef GLXContext ( * PFNGLXCREATENEWCONTEXTPROC) (Display *dpy, GLXFBConfig config, int render_type, GLXContext share_list, Bool direct);
+typedef GLXPbuffer ( * PFNGLXCREATEPBUFFERPROC) (Display *dpy, GLXFBConfig config, const int *attrib_list);
+typedef GLXPixmap ( * PFNGLXCREATEPIXMAPPROC) (Display *dpy, GLXFBConfig config, Pixmap pixmap, const int *attrib_list);
+typedef GLXWindow ( * PFNGLXCREATEWINDOWPROC) (Display *dpy, GLXFBConfig config, Window win, const int *attrib_list);
+typedef void ( * PFNGLXDESTROYPBUFFERPROC) (Display *dpy, GLXPbuffer pbuf);
+typedef void ( * PFNGLXDESTROYPIXMAPPROC) (Display *dpy, GLXPixmap pixmap);
+typedef void ( * PFNGLXDESTROYWINDOWPROC) (Display *dpy, GLXWindow win);
+typedef GLXDrawable ( * PFNGLXGETCURRENTREADDRAWABLEPROC) (void);
+typedef int ( * PFNGLXGETFBCONFIGATTRIBPROC) (Display *dpy, GLXFBConfig config, int attribute, int *value);
+typedef GLXFBConfig* ( * PFNGLXGETFBCONFIGSPROC) (Display *dpy, int screen, int *nelements);
+typedef void ( * PFNGLXGETSELECTEDEVENTPROC) (Display *dpy, GLXDrawable draw, unsigned long *event_mask);
+typedef XVisualInfo* ( * PFNGLXGETVISUALFROMFBCONFIGPROC) (Display *dpy, GLXFBConfig config);
+typedef Bool ( * PFNGLXMAKECONTEXTCURRENTPROC) (Display *display, GLXDrawable draw, GLXDrawable read, GLXContext ctx);
+typedef int ( * PFNGLXQUERYCONTEXTPROC) (Display *dpy, GLXContext ctx, int attribute, int *value);
+typedef void ( * PFNGLXQUERYDRAWABLEPROC) (Display *dpy, GLXDrawable draw, int attribute, unsigned int *value);
+typedef void ( * PFNGLXSELECTEVENTPROC) (Display *dpy, GLXDrawable draw, unsigned long event_mask);
+
+#define glXChooseFBConfig GLXEW_GET_FUN(__glewXChooseFBConfig)
+#define glXCreateNewContext GLXEW_GET_FUN(__glewXCreateNewContext)
+#define glXCreatePbuffer GLXEW_GET_FUN(__glewXCreatePbuffer)
+#define glXCreatePixmap GLXEW_GET_FUN(__glewXCreatePixmap)
+#define glXCreateWindow GLXEW_GET_FUN(__glewXCreateWindow)
+#define glXDestroyPbuffer GLXEW_GET_FUN(__glewXDestroyPbuffer)
+#define glXDestroyPixmap GLXEW_GET_FUN(__glewXDestroyPixmap)
+#define glXDestroyWindow GLXEW_GET_FUN(__glewXDestroyWindow)
+#define glXGetCurrentReadDrawable GLXEW_GET_FUN(__glewXGetCurrentReadDrawable)
+#define glXGetFBConfigAttrib GLXEW_GET_FUN(__glewXGetFBConfigAttrib)
+#define glXGetFBConfigs GLXEW_GET_FUN(__glewXGetFBConfigs)
+#define glXGetSelectedEvent GLXEW_GET_FUN(__glewXGetSelectedEvent)
+#define glXGetVisualFromFBConfig GLXEW_GET_FUN(__glewXGetVisualFromFBConfig)
+#define glXMakeContextCurrent GLXEW_GET_FUN(__glewXMakeContextCurrent)
+#define glXQueryContext GLXEW_GET_FUN(__glewXQueryContext)
+#define glXQueryDrawable GLXEW_GET_FUN(__glewXQueryDrawable)
+#define glXSelectEvent GLXEW_GET_FUN(__glewXSelectEvent)
+
+#define GLXEW_VERSION_1_3 GLXEW_GET_VAR(__GLXEW_VERSION_1_3)
+
+#endif /* GLX_VERSION_1_3 */
+
+/* ---------------------------- GLX_VERSION_1_4 ---------------------------- */
+
+#ifndef GLX_VERSION_1_4
+#define GLX_VERSION_1_4 1
+
+#define GLX_SAMPLE_BUFFERS 100000
+#define GLX_SAMPLES 100001
+
+extern void ( * glXGetProcAddress (const GLubyte *procName)) (void);
+
+#define GLXEW_VERSION_1_4 GLXEW_GET_VAR(__GLXEW_VERSION_1_4)
+
+#endif /* GLX_VERSION_1_4 */
+
+/* -------------------------- GLX_3DFX_multisample ------------------------- */
+
+#ifndef GLX_3DFX_multisample
+#define GLX_3DFX_multisample 1
+
+#define GLX_SAMPLE_BUFFERS_3DFX 0x8050
+#define GLX_SAMPLES_3DFX 0x8051
+
+#define GLXEW_3DFX_multisample GLXEW_GET_VAR(__GLXEW_3DFX_multisample)
+
+#endif /* GLX_3DFX_multisample */
+
+/* ------------------------- GLX_ARB_fbconfig_float ------------------------ */
+
+#ifndef GLX_ARB_fbconfig_float
+#define GLX_ARB_fbconfig_float 1
+
+#define GLX_RGBA_FLOAT_BIT 0x00000004
+#define GLX_RGBA_FLOAT_TYPE 0x20B9
+
+#define GLXEW_ARB_fbconfig_float GLXEW_GET_VAR(__GLXEW_ARB_fbconfig_float)
+
+#endif /* GLX_ARB_fbconfig_float */
+
+/* ------------------------ GLX_ARB_get_proc_address ----------------------- */
+
+#ifndef GLX_ARB_get_proc_address
+#define GLX_ARB_get_proc_address 1
+
+extern void ( * glXGetProcAddressARB (const GLubyte *procName)) (void);
+
+#define GLXEW_ARB_get_proc_address GLXEW_GET_VAR(__GLXEW_ARB_get_proc_address)
+
+#endif /* GLX_ARB_get_proc_address */
+
+/* -------------------------- GLX_ARB_multisample -------------------------- */
+
+#ifndef GLX_ARB_multisample
+#define GLX_ARB_multisample 1
+
+#define GLX_SAMPLE_BUFFERS_ARB 100000
+#define GLX_SAMPLES_ARB 100001
+
+#define GLXEW_ARB_multisample GLXEW_GET_VAR(__GLXEW_ARB_multisample)
+
+#endif /* GLX_ARB_multisample */
+
+/* ----------------------- GLX_ATI_pixel_format_float ---------------------- */
+
+#ifndef GLX_ATI_pixel_format_float
+#define GLX_ATI_pixel_format_float 1
+
+#define GLX_RGBA_FLOAT_ATI_BIT 0x00000100
+
+#define GLXEW_ATI_pixel_format_float GLXEW_GET_VAR(__GLXEW_ATI_pixel_format_float)
+
+#endif /* GLX_ATI_pixel_format_float */
+
+/* ------------------------- GLX_ATI_render_texture ------------------------ */
+
+#ifndef GLX_ATI_render_texture
+#define GLX_ATI_render_texture 1
+
+#define GLX_BIND_TO_TEXTURE_RGB_ATI 0x9800
+#define GLX_BIND_TO_TEXTURE_RGBA_ATI 0x9801
+#define GLX_TEXTURE_FORMAT_ATI 0x9802
+#define GLX_TEXTURE_TARGET_ATI 0x9803
+#define GLX_MIPMAP_TEXTURE_ATI 0x9804
+#define GLX_TEXTURE_RGB_ATI 0x9805
+#define GLX_TEXTURE_RGBA_ATI 0x9806
+#define GLX_NO_TEXTURE_ATI 0x9807
+#define GLX_TEXTURE_CUBE_MAP_ATI 0x9808
+#define GLX_TEXTURE_1D_ATI 0x9809
+#define GLX_TEXTURE_2D_ATI 0x980A
+#define GLX_MIPMAP_LEVEL_ATI 0x980B
+#define GLX_CUBE_MAP_FACE_ATI 0x980C
+#define GLX_TEXTURE_CUBE_MAP_POSITIVE_X_ATI 0x980D
+#define GLX_TEXTURE_CUBE_MAP_NEGATIVE_X_ATI 0x980E
+#define GLX_TEXTURE_CUBE_MAP_POSITIVE_Y_ATI 0x980F
+#define GLX_TEXTURE_CUBE_MAP_NEGATIVE_Y_ATI 0x9810
+#define GLX_TEXTURE_CUBE_MAP_POSITIVE_Z_ATI 0x9811
+#define GLX_TEXTURE_CUBE_MAP_NEGATIVE_Z_ATI 0x9812
+#define GLX_FRONT_LEFT_ATI 0x9813
+#define GLX_FRONT_RIGHT_ATI 0x9814
+#define GLX_BACK_LEFT_ATI 0x9815
+#define GLX_BACK_RIGHT_ATI 0x9816
+#define GLX_AUX0_ATI 0x9817
+#define GLX_AUX1_ATI 0x9818
+#define GLX_AUX2_ATI 0x9819
+#define GLX_AUX3_ATI 0x981A
+#define GLX_AUX4_ATI 0x981B
+#define GLX_AUX5_ATI 0x981C
+#define GLX_AUX6_ATI 0x981D
+#define GLX_AUX7_ATI 0x981E
+#define GLX_AUX8_ATI 0x981F
+#define GLX_AUX9_ATI 0x9820
+#define GLX_BIND_TO_TEXTURE_LUMINANCE_ATI 0x9821
+#define GLX_BIND_TO_TEXTURE_INTENSITY_ATI 0x9822
+
+typedef void ( * PFNGLXBINDTEXIMAGEATIPROC) (Display *dpy, GLXPbuffer pbuf, int buffer);
+typedef void ( * PFNGLXDRAWABLEATTRIBATIPROC) (Display *dpy, GLXDrawable draw, const int *attrib_list);
+typedef void ( * PFNGLXRELEASETEXIMAGEATIPROC) (Display *dpy, GLXPbuffer pbuf, int buffer);
+
+#define glXBindTexImageATI GLXEW_GET_FUN(__glewXBindTexImageATI)
+#define glXDrawableAttribATI GLXEW_GET_FUN(__glewXDrawableAttribATI)
+#define glXReleaseTexImageATI GLXEW_GET_FUN(__glewXReleaseTexImageATI)
+
+#define GLXEW_ATI_render_texture GLXEW_GET_VAR(__GLXEW_ATI_render_texture)
+
+#endif /* GLX_ATI_render_texture */
+
+/* ------------------------- GLX_EXT_import_context ------------------------ */
+
+#ifndef GLX_EXT_import_context
+#define GLX_EXT_import_context 1
+
+#define GLX_SHARE_CONTEXT_EXT 0x800A
+#define GLX_VISUAL_ID_EXT 0x800B
+#define GLX_SCREEN_EXT 0x800C
+
+typedef XID GLXContextID;
+
+typedef void ( * PFNGLXFREECONTEXTEXTPROC) (Display* dpy, GLXContext context);
+typedef GLXContextID ( * PFNGLXGETCONTEXTIDEXTPROC) (const GLXContext context);
+typedef GLXContext ( * PFNGLXIMPORTCONTEXTEXTPROC) (Display* dpy, GLXContextID contextID);
+typedef int ( * PFNGLXQUERYCONTEXTINFOEXTPROC) (Display* dpy, GLXContext context, int attribute,int *value);
+
+#define glXFreeContextEXT GLXEW_GET_FUN(__glewXFreeContextEXT)
+#define glXGetContextIDEXT GLXEW_GET_FUN(__glewXGetContextIDEXT)
+#define glXImportContextEXT GLXEW_GET_FUN(__glewXImportContextEXT)
+#define glXQueryContextInfoEXT GLXEW_GET_FUN(__glewXQueryContextInfoEXT)
+
+#define GLXEW_EXT_import_context GLXEW_GET_VAR(__GLXEW_EXT_import_context)
+
+#endif /* GLX_EXT_import_context */
+
+/* -------------------------- GLX_EXT_scene_marker ------------------------- */
+
+#ifndef GLX_EXT_scene_marker
+#define GLX_EXT_scene_marker 1
+
+#define GLXEW_EXT_scene_marker GLXEW_GET_VAR(__GLXEW_EXT_scene_marker)
+
+#endif /* GLX_EXT_scene_marker */
+
+/* -------------------------- GLX_EXT_visual_info -------------------------- */
+
+#ifndef GLX_EXT_visual_info
+#define GLX_EXT_visual_info 1
+
+#define GLX_X_VISUAL_TYPE_EXT 0x22
+#define GLX_TRANSPARENT_TYPE_EXT 0x23
+#define GLX_TRANSPARENT_INDEX_VALUE_EXT 0x24
+#define GLX_TRANSPARENT_RED_VALUE_EXT 0x25
+#define GLX_TRANSPARENT_GREEN_VALUE_EXT 0x26
+#define GLX_TRANSPARENT_BLUE_VALUE_EXT 0x27
+#define GLX_TRANSPARENT_ALPHA_VALUE_EXT 0x28
+#define GLX_NONE_EXT 0x8000
+#define GLX_TRUE_COLOR_EXT 0x8002
+#define GLX_DIRECT_COLOR_EXT 0x8003
+#define GLX_PSEUDO_COLOR_EXT 0x8004
+#define GLX_STATIC_COLOR_EXT 0x8005
+#define GLX_GRAY_SCALE_EXT 0x8006
+#define GLX_STATIC_GRAY_EXT 0x8007
+#define GLX_TRANSPARENT_RGB_EXT 0x8008
+#define GLX_TRANSPARENT_INDEX_EXT 0x8009
+
+#define GLXEW_EXT_visual_info GLXEW_GET_VAR(__GLXEW_EXT_visual_info)
+
+#endif /* GLX_EXT_visual_info */
+
+/* ------------------------- GLX_EXT_visual_rating ------------------------- */
+
+#ifndef GLX_EXT_visual_rating
+#define GLX_EXT_visual_rating 1
+
+#define GLX_VISUAL_CAVEAT_EXT 0x20
+#define GLX_SLOW_VISUAL_EXT 0x8001
+#define GLX_NON_CONFORMANT_VISUAL_EXT 0x800D
+
+#define GLXEW_EXT_visual_rating GLXEW_GET_VAR(__GLXEW_EXT_visual_rating)
+
+#endif /* GLX_EXT_visual_rating */
+
+/* -------------------------- GLX_MESA_agp_offset -------------------------- */
+
+#ifndef GLX_MESA_agp_offset
+#define GLX_MESA_agp_offset 1
+
+typedef unsigned int ( * PFNGLXGETAGPOFFSETMESAPROC) (const void* pointer);
+
+#define glXGetAGPOffsetMESA GLXEW_GET_FUN(__glewXGetAGPOffsetMESA)
+
+#define GLXEW_MESA_agp_offset GLXEW_GET_VAR(__GLXEW_MESA_agp_offset)
+
+#endif /* GLX_MESA_agp_offset */
+
+/* ------------------------ GLX_MESA_copy_sub_buffer ----------------------- */
+
+#ifndef GLX_MESA_copy_sub_buffer
+#define GLX_MESA_copy_sub_buffer 1
+
+typedef void ( * PFNGLXCOPYSUBBUFFERMESAPROC) (Display* dpy, GLXDrawable drawable, int x, int y, int width, int height);
+
+#define glXCopySubBufferMESA GLXEW_GET_FUN(__glewXCopySubBufferMESA)
+
+#define GLXEW_MESA_copy_sub_buffer GLXEW_GET_VAR(__GLXEW_MESA_copy_sub_buffer)
+
+#endif /* GLX_MESA_copy_sub_buffer */
+
+/* ------------------------ GLX_MESA_pixmap_colormap ----------------------- */
+
+#ifndef GLX_MESA_pixmap_colormap
+#define GLX_MESA_pixmap_colormap 1
+
+typedef GLXPixmap ( * PFNGLXCREATEGLXPIXMAPMESAPROC) (Display* dpy, XVisualInfo *visual, Pixmap pixmap, Colormap cmap);
+
+#define glXCreateGLXPixmapMESA GLXEW_GET_FUN(__glewXCreateGLXPixmapMESA)
+
+#define GLXEW_MESA_pixmap_colormap GLXEW_GET_VAR(__GLXEW_MESA_pixmap_colormap)
+
+#endif /* GLX_MESA_pixmap_colormap */
+
+/* ------------------------ GLX_MESA_release_buffers ----------------------- */
+
+#ifndef GLX_MESA_release_buffers
+#define GLX_MESA_release_buffers 1
+
+typedef Bool ( * PFNGLXRELEASEBUFFERSMESAPROC) (Display* dpy, GLXDrawable d);
+
+#define glXReleaseBuffersMESA GLXEW_GET_FUN(__glewXReleaseBuffersMESA)
+
+#define GLXEW_MESA_release_buffers GLXEW_GET_VAR(__GLXEW_MESA_release_buffers)
+
+#endif /* GLX_MESA_release_buffers */
+
+/* ------------------------- GLX_MESA_set_3dfx_mode ------------------------ */
+
+#ifndef GLX_MESA_set_3dfx_mode
+#define GLX_MESA_set_3dfx_mode 1
+
+#define GLX_3DFX_WINDOW_MODE_MESA 0x1
+#define GLX_3DFX_FULLSCREEN_MODE_MESA 0x2
+
+typedef GLboolean ( * PFNGLXSET3DFXMODEMESAPROC) (GLint mode);
+
+#define glXSet3DfxModeMESA GLXEW_GET_FUN(__glewXSet3DfxModeMESA)
+
+#define GLXEW_MESA_set_3dfx_mode GLXEW_GET_VAR(__GLXEW_MESA_set_3dfx_mode)
+
+#endif /* GLX_MESA_set_3dfx_mode */
+
+/* -------------------------- GLX_NV_float_buffer -------------------------- */
+
+#ifndef GLX_NV_float_buffer
+#define GLX_NV_float_buffer 1
+
+#define GLX_FLOAT_COMPONENTS_NV 0x20B0
+
+#define GLXEW_NV_float_buffer GLXEW_GET_VAR(__GLXEW_NV_float_buffer)
+
+#endif /* GLX_NV_float_buffer */
+
+/* ----------------------- GLX_NV_vertex_array_range ----------------------- */
+
+#ifndef GLX_NV_vertex_array_range
+#define GLX_NV_vertex_array_range 1
+
+typedef void * ( * PFNGLXALLOCATEMEMORYNVPROC) (GLsizei size, GLfloat readFrequency, GLfloat writeFrequency, GLfloat priority);
+typedef void ( * PFNGLXFREEMEMORYNVPROC) (void *pointer);
+
+#define glXAllocateMemoryNV GLXEW_GET_FUN(__glewXAllocateMemoryNV)
+#define glXFreeMemoryNV GLXEW_GET_FUN(__glewXFreeMemoryNV)
+
+#define GLXEW_NV_vertex_array_range GLXEW_GET_VAR(__GLXEW_NV_vertex_array_range)
+
+#endif /* GLX_NV_vertex_array_range */
+
+/* -------------------------- GLX_OML_swap_method -------------------------- */
+
+#ifndef GLX_OML_swap_method
+#define GLX_OML_swap_method 1
+
+#define GLX_SWAP_METHOD_OML 0x8060
+#define GLX_SWAP_EXCHANGE_OML 0x8061
+#define GLX_SWAP_COPY_OML 0x8062
+#define GLX_SWAP_UNDEFINED_OML 0x8063
+
+#define GLXEW_OML_swap_method GLXEW_GET_VAR(__GLXEW_OML_swap_method)
+
+#endif /* GLX_OML_swap_method */
+
+/* -------------------------- GLX_OML_sync_control ------------------------- */
+
+#if !defined(GLX_OML_sync_control) && defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
+#include <inttypes.h>
+#define GLX_OML_sync_control 1
+
+typedef Bool ( * PFNGLXGETMSCRATEOMLPROC) (Display* dpy, GLXDrawable drawable, int32_t* numerator, int32_t* denominator);
+typedef Bool ( * PFNGLXGETSYNCVALUESOMLPROC) (Display* dpy, GLXDrawable drawable, int64_t* ust, int64_t* msc, int64_t* sbc);
+typedef int64_t ( * PFNGLXSWAPBUFFERSMSCOMLPROC) (Display* dpy, GLXDrawable drawable, int64_t target_msc, int64_t divisor, int64_t remainder);
+typedef Bool ( * PFNGLXWAITFORMSCOMLPROC) (Display* dpy, GLXDrawable drawable, int64_t target_msc, int64_t divisor, int64_t remainder, int64_t* ust, int64_t* msc, int64_t* sbc);
+typedef Bool ( * PFNGLXWAITFORSBCOMLPROC) (Display* dpy, GLXDrawable drawable, int64_t target_sbc, int64_t* ust, int64_t* msc, int64_t* sbc);
+
+#define glXGetMscRateOML GLXEW_GET_FUN(__glewXGetMscRateOML)
+#define glXGetSyncValuesOML GLXEW_GET_FUN(__glewXGetSyncValuesOML)
+#define glXSwapBuffersMscOML GLXEW_GET_FUN(__glewXSwapBuffersMscOML)
+#define glXWaitForMscOML GLXEW_GET_FUN(__glewXWaitForMscOML)
+#define glXWaitForSbcOML GLXEW_GET_FUN(__glewXWaitForSbcOML)
+
+#define GLXEW_OML_sync_control GLXEW_GET_VAR(__GLXEW_OML_sync_control)
+
+#endif /* GLX_OML_sync_control */
+
+/* ------------------------ GLX_SGIS_blended_overlay ----------------------- */
+
+#ifndef GLX_SGIS_blended_overlay
+#define GLX_SGIS_blended_overlay 1
+
+#define GLX_BLENDED_RGBA_SGIS 0x8025
+
+#define GLXEW_SGIS_blended_overlay GLXEW_GET_VAR(__GLXEW_SGIS_blended_overlay)
+
+#endif /* GLX_SGIS_blended_overlay */
+
+/* -------------------------- GLX_SGIS_color_range ------------------------- */
+
+#ifndef GLX_SGIS_color_range
+#define GLX_SGIS_color_range 1
+
+#define GLX_MIN_RED_SGIS 0
+#define GLX_MAX_GREEN_SGIS 0
+#define GLX_MIN_BLUE_SGIS 0
+#define GLX_MAX_ALPHA_SGIS 0
+#define GLX_MIN_GREEN_SGIS 0
+#define GLX_MIN_ALPHA_SGIS 0
+#define GLX_MAX_RED_SGIS 0
+#define GLX_EXTENDED_RANGE_SGIS 0
+#define GLX_MAX_BLUE_SGIS 0
+
+#define GLXEW_SGIS_color_range GLXEW_GET_VAR(__GLXEW_SGIS_color_range)
+
+#endif /* GLX_SGIS_color_range */
+
+/* -------------------------- GLX_SGIS_multisample ------------------------- */
+
+#ifndef GLX_SGIS_multisample
+#define GLX_SGIS_multisample 1
+
+#define GLX_SAMPLE_BUFFERS_SGIS 100000
+#define GLX_SAMPLES_SGIS 100001
+
+#define GLXEW_SGIS_multisample GLXEW_GET_VAR(__GLXEW_SGIS_multisample)
+
+#endif /* GLX_SGIS_multisample */
+
+/* ---------------------- GLX_SGIS_shared_multisample ---------------------- */
+
+#ifndef GLX_SGIS_shared_multisample
+#define GLX_SGIS_shared_multisample 1
+
+#define GLX_MULTISAMPLE_SUB_RECT_WIDTH_SGIS 0x8026
+#define GLX_MULTISAMPLE_SUB_RECT_HEIGHT_SGIS 0x8027
+
+#define GLXEW_SGIS_shared_multisample GLXEW_GET_VAR(__GLXEW_SGIS_shared_multisample)
+
+#endif /* GLX_SGIS_shared_multisample */
+
+/* --------------------------- GLX_SGIX_fbconfig --------------------------- */
+
+#ifndef GLX_SGIX_fbconfig
+#define GLX_SGIX_fbconfig 1
+
+#define GLX_WINDOW_BIT_SGIX 0x00000001
+#define GLX_RGBA_BIT_SGIX 0x00000001
+#define GLX_PIXMAP_BIT_SGIX 0x00000002
+#define GLX_COLOR_INDEX_BIT_SGIX 0x00000002
+#define GLX_SCREEN_EXT 0x800C
+#define GLX_DRAWABLE_TYPE_SGIX 0x8010
+#define GLX_RENDER_TYPE_SGIX 0x8011
+#define GLX_X_RENDERABLE_SGIX 0x8012
+#define GLX_FBCONFIG_ID_SGIX 0x8013
+#define GLX_RGBA_TYPE_SGIX 0x8014
+#define GLX_COLOR_INDEX_TYPE_SGIX 0x8015
+
+typedef XID GLXFBConfigIDSGIX;
+typedef struct __GLXFBConfigRec *GLXFBConfigSGIX;
+
+typedef GLXFBConfigSGIX* ( * PFNGLXCHOOSEFBCONFIGSGIXPROC) (Display *dpy, int screen, const int *attrib_list, int *nelements);
+typedef GLXContext ( * PFNGLXCREATECONTEXTWITHCONFIGSGIXPROC) (Display* dpy, GLXFBConfig config, int render_type, GLXContext share_list, Bool direct);
+typedef GLXPixmap ( * PFNGLXCREATEGLXPIXMAPWITHCONFIGSGIXPROC) (Display* dpy, GLXFBConfig config, Pixmap pixmap);
+typedef int ( * PFNGLXGETFBCONFIGATTRIBSGIXPROC) (Display* dpy, GLXFBConfigSGIX config, int attribute, int *value);
+typedef GLXFBConfigSGIX ( * PFNGLXGETFBCONFIGFROMVISUALSGIXPROC) (Display* dpy, XVisualInfo *vis);
+typedef XVisualInfo* ( * PFNGLXGETVISUALFROMFBCONFIGSGIXPROC) (Display *dpy, GLXFBConfig config);
+
+#define glXChooseFBConfigSGIX GLXEW_GET_FUN(__glewXChooseFBConfigSGIX)
+#define glXCreateContextWithConfigSGIX GLXEW_GET_FUN(__glewXCreateContextWithConfigSGIX)
+#define glXCreateGLXPixmapWithConfigSGIX GLXEW_GET_FUN(__glewXCreateGLXPixmapWithConfigSGIX)
+#define glXGetFBConfigAttribSGIX GLXEW_GET_FUN(__glewXGetFBConfigAttribSGIX)
+#define glXGetFBConfigFromVisualSGIX GLXEW_GET_FUN(__glewXGetFBConfigFromVisualSGIX)
+#define glXGetVisualFromFBConfigSGIX GLXEW_GET_FUN(__glewXGetVisualFromFBConfigSGIX)
+
+#define GLXEW_SGIX_fbconfig GLXEW_GET_VAR(__GLXEW_SGIX_fbconfig)
+
+#endif /* GLX_SGIX_fbconfig */
+
+/* ---------------------------- GLX_SGIX_pbuffer --------------------------- */
+
+#ifndef GLX_SGIX_pbuffer
+#define GLX_SGIX_pbuffer 1
+
+#define GLX_FRONT_LEFT_BUFFER_BIT_SGIX 0x00000001
+#define GLX_FRONT_RIGHT_BUFFER_BIT_SGIX 0x00000002
+#define GLX_PBUFFER_BIT_SGIX 0x00000004
+#define GLX_BACK_LEFT_BUFFER_BIT_SGIX 0x00000004
+#define GLX_BACK_RIGHT_BUFFER_BIT_SGIX 0x00000008
+#define GLX_AUX_BUFFERS_BIT_SGIX 0x00000010
+#define GLX_DEPTH_BUFFER_BIT_SGIX 0x00000020
+#define GLX_STENCIL_BUFFER_BIT_SGIX 0x00000040
+#define GLX_ACCUM_BUFFER_BIT_SGIX 0x00000080
+#define GLX_SAMPLE_BUFFERS_BIT_SGIX 0x00000100
+#define GLX_MAX_PBUFFER_WIDTH_SGIX 0x8016
+#define GLX_MAX_PBUFFER_HEIGHT_SGIX 0x8017
+#define GLX_MAX_PBUFFER_PIXELS_SGIX 0x8018
+#define GLX_OPTIMAL_PBUFFER_WIDTH_SGIX 0x8019
+#define GLX_OPTIMAL_PBUFFER_HEIGHT_SGIX 0x801A
+#define GLX_PRESERVED_CONTENTS_SGIX 0x801B
+#define GLX_LARGEST_PBUFFER_SGIX 0x801C
+#define GLX_WIDTH_SGIX 0x801D
+#define GLX_HEIGHT_SGIX 0x801E
+#define GLX_EVENT_MASK_SGIX 0x801F
+#define GLX_DAMAGED_SGIX 0x8020
+#define GLX_SAVED_SGIX 0x8021
+#define GLX_WINDOW_SGIX 0x8022
+#define GLX_PBUFFER_SGIX 0x8023
+#define GLX_BUFFER_CLOBBER_MASK_SGIX 0x08000000
+
+typedef XID GLXPbufferSGIX;
+typedef struct { int type; unsigned long serial; Bool send_event; Display *display; GLXDrawable drawable; int event_type; int draw_type; unsigned int mask; int x, y; int width, height; int count; } GLXBufferClobberEventSGIX;
+
+typedef GLXPbuffer ( * PFNGLXCREATEGLXPBUFFERSGIXPROC) (Display* dpy, GLXFBConfig config, unsigned int width, unsigned int height, int *attrib_list);
+typedef void ( * PFNGLXDESTROYGLXPBUFFERSGIXPROC) (Display* dpy, GLXPbuffer pbuf);
+typedef void ( * PFNGLXGETSELECTEDEVENTSGIXPROC) (Display* dpy, GLXDrawable drawable, unsigned long *mask);
+typedef void ( * PFNGLXQUERYGLXPBUFFERSGIXPROC) (Display* dpy, GLXPbuffer pbuf, int attribute, unsigned int *value);
+typedef void ( * PFNGLXSELECTEVENTSGIXPROC) (Display* dpy, GLXDrawable drawable, unsigned long mask);
+
+#define glXCreateGLXPbufferSGIX GLXEW_GET_FUN(__glewXCreateGLXPbufferSGIX)
+#define glXDestroyGLXPbufferSGIX GLXEW_GET_FUN(__glewXDestroyGLXPbufferSGIX)
+#define glXGetSelectedEventSGIX GLXEW_GET_FUN(__glewXGetSelectedEventSGIX)
+#define glXQueryGLXPbufferSGIX GLXEW_GET_FUN(__glewXQueryGLXPbufferSGIX)
+#define glXSelectEventSGIX GLXEW_GET_FUN(__glewXSelectEventSGIX)
+
+#define GLXEW_SGIX_pbuffer GLXEW_GET_VAR(__GLXEW_SGIX_pbuffer)
+
+#endif /* GLX_SGIX_pbuffer */
+
+/* ------------------------- GLX_SGIX_swap_barrier ------------------------- */
+
+#ifndef GLX_SGIX_swap_barrier
+#define GLX_SGIX_swap_barrier 1
+
+typedef void ( * PFNGLXBINDSWAPBARRIERSGIXPROC) (Display *dpy, GLXDrawable drawable, int barrier);
+typedef Bool ( * PFNGLXQUERYMAXSWAPBARRIERSSGIXPROC) (Display *dpy, int screen, int *max);
+
+#define glXBindSwapBarrierSGIX GLXEW_GET_FUN(__glewXBindSwapBarrierSGIX)
+#define glXQueryMaxSwapBarriersSGIX GLXEW_GET_FUN(__glewXQueryMaxSwapBarriersSGIX)
+
+#define GLXEW_SGIX_swap_barrier GLXEW_GET_VAR(__GLXEW_SGIX_swap_barrier)
+
+#endif /* GLX_SGIX_swap_barrier */
+
+/* -------------------------- GLX_SGIX_swap_group -------------------------- */
+
+#ifndef GLX_SGIX_swap_group
+#define GLX_SGIX_swap_group 1
+
+typedef void ( * PFNGLXJOINSWAPGROUPSGIXPROC) (Display *dpy, GLXDrawable drawable, GLXDrawable member);
+
+#define glXJoinSwapGroupSGIX GLXEW_GET_FUN(__glewXJoinSwapGroupSGIX)
+
+#define GLXEW_SGIX_swap_group GLXEW_GET_VAR(__GLXEW_SGIX_swap_group)
+
+#endif /* GLX_SGIX_swap_group */
+
+/* ------------------------- GLX_SGIX_video_resize ------------------------- */
+
+#ifndef GLX_SGIX_video_resize
+#define GLX_SGIX_video_resize 1
+
+#define GLX_SYNC_FRAME_SGIX 0x00000000
+#define GLX_SYNC_SWAP_SGIX 0x00000001
+
+typedef int ( * PFNGLXBINDCHANNELTOWINDOWSGIXPROC) (Display* display, int screen, int channel, Window window);
+typedef int ( * PFNGLXCHANNELRECTSGIXPROC) (Display* display, int screen, int channel, int x, int y, int w, int h);
+typedef int ( * PFNGLXCHANNELRECTSYNCSGIXPROC) (Display* display, int screen, int channel, GLenum synctype);
+typedef int ( * PFNGLXQUERYCHANNELDELTASSGIXPROC) (Display* display, int screen, int channel, int *x, int *y, int *w, int *h);
+typedef int ( * PFNGLXQUERYCHANNELRECTSGIXPROC) (Display* display, int screen, int channel, int *dx, int *dy, int *dw, int *dh);
+
+#define glXBindChannelToWindowSGIX GLXEW_GET_FUN(__glewXBindChannelToWindowSGIX)
+#define glXChannelRectSGIX GLXEW_GET_FUN(__glewXChannelRectSGIX)
+#define glXChannelRectSyncSGIX GLXEW_GET_FUN(__glewXChannelRectSyncSGIX)
+#define glXQueryChannelDeltasSGIX GLXEW_GET_FUN(__glewXQueryChannelDeltasSGIX)
+#define glXQueryChannelRectSGIX GLXEW_GET_FUN(__glewXQueryChannelRectSGIX)
+
+#define GLXEW_SGIX_video_resize GLXEW_GET_VAR(__GLXEW_SGIX_video_resize)
+
+#endif /* GLX_SGIX_video_resize */
+
+/* ---------------------- GLX_SGIX_visual_select_group --------------------- */
+
+#ifndef GLX_SGIX_visual_select_group
+#define GLX_SGIX_visual_select_group 1
+
+#define GLX_VISUAL_SELECT_GROUP_SGIX 0x8028
+
+#define GLXEW_SGIX_visual_select_group GLXEW_GET_VAR(__GLXEW_SGIX_visual_select_group)
+
+#endif /* GLX_SGIX_visual_select_group */
+
+/* ---------------------------- GLX_SGI_cushion ---------------------------- */
+
+#ifndef GLX_SGI_cushion
+#define GLX_SGI_cushion 1
+
+typedef void ( * PFNGLXCUSHIONSGIPROC) (Display* dpy, Window window, float cushion);
+
+#define glXCushionSGI GLXEW_GET_FUN(__glewXCushionSGI)
+
+#define GLXEW_SGI_cushion GLXEW_GET_VAR(__GLXEW_SGI_cushion)
+
+#endif /* GLX_SGI_cushion */
+
+/* ----------------------- GLX_SGI_make_current_read ----------------------- */
+
+#ifndef GLX_SGI_make_current_read
+#define GLX_SGI_make_current_read 1
+
+typedef GLXDrawable ( * PFNGLXGETCURRENTREADDRAWABLESGIPROC) (void);
+typedef Bool ( * PFNGLXMAKECURRENTREADSGIPROC) (Display* dpy, GLXDrawable draw, GLXDrawable read, GLXContext ctx);
+
+#define glXGetCurrentReadDrawableSGI GLXEW_GET_FUN(__glewXGetCurrentReadDrawableSGI)
+#define glXMakeCurrentReadSGI GLXEW_GET_FUN(__glewXMakeCurrentReadSGI)
+
+#define GLXEW_SGI_make_current_read GLXEW_GET_VAR(__GLXEW_SGI_make_current_read)
+
+#endif /* GLX_SGI_make_current_read */
+
+/* -------------------------- GLX_SGI_swap_control ------------------------- */
+
+#ifndef GLX_SGI_swap_control
+#define GLX_SGI_swap_control 1
+
+typedef int ( * PFNGLXSWAPINTERVALSGIPROC) (int interval);
+
+#define glXSwapIntervalSGI GLXEW_GET_FUN(__glewXSwapIntervalSGI)
+
+#define GLXEW_SGI_swap_control GLXEW_GET_VAR(__GLXEW_SGI_swap_control)
+
+#endif /* GLX_SGI_swap_control */
+
+/* --------------------------- GLX_SGI_video_sync -------------------------- */
+
+#ifndef GLX_SGI_video_sync
+#define GLX_SGI_video_sync 1
+
+typedef int ( * PFNGLXGETVIDEOSYNCSGIPROC) (uint* count);
+typedef int ( * PFNGLXWAITVIDEOSYNCSGIPROC) (int divisor, int remainder, unsigned int* count);
+
+#define glXGetVideoSyncSGI GLXEW_GET_FUN(__glewXGetVideoSyncSGI)
+#define glXWaitVideoSyncSGI GLXEW_GET_FUN(__glewXWaitVideoSyncSGI)
+
+#define GLXEW_SGI_video_sync GLXEW_GET_VAR(__GLXEW_SGI_video_sync)
+
+#endif /* GLX_SGI_video_sync */
+
+/* --------------------- GLX_SUN_get_transparent_index --------------------- */
+
+#ifndef GLX_SUN_get_transparent_index
+#define GLX_SUN_get_transparent_index 1
+
+typedef Status ( * PFNGLXGETTRANSPARENTINDEXSUNPROC) (Display* dpy, Window overlay, Window underlay, unsigned long *pTransparentIndex);
+
+#define glXGetTransparentIndexSUN GLXEW_GET_FUN(__glewXGetTransparentIndexSUN)
+
+#define GLXEW_SUN_get_transparent_index GLXEW_GET_VAR(__GLXEW_SUN_get_transparent_index)
+
+#endif /* GLX_SUN_get_transparent_index */
+
+/* -------------------------- GLX_SUN_video_resize ------------------------- */
+
+#ifndef GLX_SUN_video_resize
+#define GLX_SUN_video_resize 1
+
+#define GLX_VIDEO_RESIZE_SUN 0x8171
+#define GL_VIDEO_RESIZE_COMPENSATION_SUN 0x85CD
+
+typedef int ( * PFNGLXGETVIDEORESIZESUNPROC) (Display* display, GLXDrawable window, float* factor);
+typedef int ( * PFNGLXVIDEORESIZESUNPROC) (Display* display, GLXDrawable window, float factor);
+
+#define glXGetVideoResizeSUN GLXEW_GET_FUN(__glewXGetVideoResizeSUN)
+#define glXVideoResizeSUN GLXEW_GET_FUN(__glewXVideoResizeSUN)
+
+#define GLXEW_SUN_video_resize GLXEW_GET_VAR(__GLXEW_SUN_video_resize)
+
+#endif /* GLX_SUN_video_resize */
+
+/* ------------------------------------------------------------------------- */
+
+#ifdef GLEW_MX
+#define GLXEW_EXPORT
+#else
+#define GLXEW_EXPORT extern
+#endif /* GLEW_MX */
+
+extern PFNGLXGETCURRENTDISPLAYPROC __glewXGetCurrentDisplay;
+
+extern PFNGLXCHOOSEFBCONFIGPROC __glewXChooseFBConfig;
+extern PFNGLXCREATENEWCONTEXTPROC __glewXCreateNewContext;
+extern PFNGLXCREATEPBUFFERPROC __glewXCreatePbuffer;
+extern PFNGLXCREATEPIXMAPPROC __glewXCreatePixmap;
+extern PFNGLXCREATEWINDOWPROC __glewXCreateWindow;
+extern PFNGLXDESTROYPBUFFERPROC __glewXDestroyPbuffer;
+extern PFNGLXDESTROYPIXMAPPROC __glewXDestroyPixmap;
+extern PFNGLXDESTROYWINDOWPROC __glewXDestroyWindow;
+extern PFNGLXGETCURRENTREADDRAWABLEPROC __glewXGetCurrentReadDrawable;
+extern PFNGLXGETFBCONFIGATTRIBPROC __glewXGetFBConfigAttrib;
+extern PFNGLXGETFBCONFIGSPROC __glewXGetFBConfigs;
+extern PFNGLXGETSELECTEDEVENTPROC __glewXGetSelectedEvent;
+extern PFNGLXGETVISUALFROMFBCONFIGPROC __glewXGetVisualFromFBConfig;
+extern PFNGLXMAKECONTEXTCURRENTPROC __glewXMakeContextCurrent;
+extern PFNGLXQUERYCONTEXTPROC __glewXQueryContext;
+extern PFNGLXQUERYDRAWABLEPROC __glewXQueryDrawable;
+extern PFNGLXSELECTEVENTPROC __glewXSelectEvent;
+
+extern PFNGLXBINDTEXIMAGEATIPROC __glewXBindTexImageATI;
+extern PFNGLXDRAWABLEATTRIBATIPROC __glewXDrawableAttribATI;
+extern PFNGLXRELEASETEXIMAGEATIPROC __glewXReleaseTexImageATI;
+
+extern PFNGLXFREECONTEXTEXTPROC __glewXFreeContextEXT;
+extern PFNGLXGETCONTEXTIDEXTPROC __glewXGetContextIDEXT;
+extern PFNGLXIMPORTCONTEXTEXTPROC __glewXImportContextEXT;
+extern PFNGLXQUERYCONTEXTINFOEXTPROC __glewXQueryContextInfoEXT;
+
+extern PFNGLXGETAGPOFFSETMESAPROC __glewXGetAGPOffsetMESA;
+
+extern PFNGLXCOPYSUBBUFFERMESAPROC __glewXCopySubBufferMESA;
+
+extern PFNGLXCREATEGLXPIXMAPMESAPROC __glewXCreateGLXPixmapMESA;
+
+extern PFNGLXRELEASEBUFFERSMESAPROC __glewXReleaseBuffersMESA;
+
+extern PFNGLXSET3DFXMODEMESAPROC __glewXSet3DfxModeMESA;
+
+extern PFNGLXALLOCATEMEMORYNVPROC __glewXAllocateMemoryNV;
+extern PFNGLXFREEMEMORYNVPROC __glewXFreeMemoryNV;
+
+#ifdef GLX_OML_sync_control
+extern PFNGLXGETMSCRATEOMLPROC __glewXGetMscRateOML;
+extern PFNGLXGETSYNCVALUESOMLPROC __glewXGetSyncValuesOML;
+extern PFNGLXSWAPBUFFERSMSCOMLPROC __glewXSwapBuffersMscOML;
+extern PFNGLXWAITFORMSCOMLPROC __glewXWaitForMscOML;
+extern PFNGLXWAITFORSBCOMLPROC __glewXWaitForSbcOML;
+#endif
+
+extern PFNGLXCHOOSEFBCONFIGSGIXPROC __glewXChooseFBConfigSGIX;
+extern PFNGLXCREATECONTEXTWITHCONFIGSGIXPROC __glewXCreateContextWithConfigSGIX;
+extern PFNGLXCREATEGLXPIXMAPWITHCONFIGSGIXPROC __glewXCreateGLXPixmapWithConfigSGIX;
+extern PFNGLXGETFBCONFIGATTRIBSGIXPROC __glewXGetFBConfigAttribSGIX;
+extern PFNGLXGETFBCONFIGFROMVISUALSGIXPROC __glewXGetFBConfigFromVisualSGIX;
+extern PFNGLXGETVISUALFROMFBCONFIGSGIXPROC __glewXGetVisualFromFBConfigSGIX;
+
+extern PFNGLXCREATEGLXPBUFFERSGIXPROC __glewXCreateGLXPbufferSGIX;
+extern PFNGLXDESTROYGLXPBUFFERSGIXPROC __glewXDestroyGLXPbufferSGIX;
+extern PFNGLXGETSELECTEDEVENTSGIXPROC __glewXGetSelectedEventSGIX;
+extern PFNGLXQUERYGLXPBUFFERSGIXPROC __glewXQueryGLXPbufferSGIX;
+extern PFNGLXSELECTEVENTSGIXPROC __glewXSelectEventSGIX;
+
+extern PFNGLXBINDSWAPBARRIERSGIXPROC __glewXBindSwapBarrierSGIX;
+extern PFNGLXQUERYMAXSWAPBARRIERSSGIXPROC __glewXQueryMaxSwapBarriersSGIX;
+
+extern PFNGLXJOINSWAPGROUPSGIXPROC __glewXJoinSwapGroupSGIX;
+
+extern PFNGLXBINDCHANNELTOWINDOWSGIXPROC __glewXBindChannelToWindowSGIX;
+extern PFNGLXCHANNELRECTSGIXPROC __glewXChannelRectSGIX;
+extern PFNGLXCHANNELRECTSYNCSGIXPROC __glewXChannelRectSyncSGIX;
+extern PFNGLXQUERYCHANNELDELTASSGIXPROC __glewXQueryChannelDeltasSGIX;
+extern PFNGLXQUERYCHANNELRECTSGIXPROC __glewXQueryChannelRectSGIX;
+
+extern PFNGLXCUSHIONSGIPROC __glewXCushionSGI;
+
+extern PFNGLXGETCURRENTREADDRAWABLESGIPROC __glewXGetCurrentReadDrawableSGI;
+extern PFNGLXMAKECURRENTREADSGIPROC __glewXMakeCurrentReadSGI;
+
+extern PFNGLXSWAPINTERVALSGIPROC __glewXSwapIntervalSGI;
+
+extern PFNGLXGETVIDEOSYNCSGIPROC __glewXGetVideoSyncSGI;
+extern PFNGLXWAITVIDEOSYNCSGIPROC __glewXWaitVideoSyncSGI;
+
+extern PFNGLXGETTRANSPARENTINDEXSUNPROC __glewXGetTransparentIndexSUN;
+
+extern PFNGLXGETVIDEORESIZESUNPROC __glewXGetVideoResizeSUN;
+extern PFNGLXVIDEORESIZESUNPROC __glewXVideoResizeSUN;
+
+#if defined(GLEW_MX)
+struct GLXEWContextStruct
+{
+#endif /* GLEW_MX */
+
+GLXEW_EXPORT GLboolean __GLXEW_VERSION_1_0;
+GLXEW_EXPORT GLboolean __GLXEW_VERSION_1_1;
+GLXEW_EXPORT GLboolean __GLXEW_VERSION_1_2;
+GLXEW_EXPORT GLboolean __GLXEW_VERSION_1_3;
+GLXEW_EXPORT GLboolean __GLXEW_VERSION_1_4;
+GLXEW_EXPORT GLboolean __GLXEW_3DFX_multisample;
+GLXEW_EXPORT GLboolean __GLXEW_ARB_fbconfig_float;
+GLXEW_EXPORT GLboolean __GLXEW_ARB_get_proc_address;
+GLXEW_EXPORT GLboolean __GLXEW_ARB_multisample;
+GLXEW_EXPORT GLboolean __GLXEW_ATI_pixel_format_float;
+GLXEW_EXPORT GLboolean __GLXEW_ATI_render_texture;
+GLXEW_EXPORT GLboolean __GLXEW_EXT_import_context;
+GLXEW_EXPORT GLboolean __GLXEW_EXT_scene_marker;
+GLXEW_EXPORT GLboolean __GLXEW_EXT_visual_info;
+GLXEW_EXPORT GLboolean __GLXEW_EXT_visual_rating;
+GLXEW_EXPORT GLboolean __GLXEW_MESA_agp_offset;
+GLXEW_EXPORT GLboolean __GLXEW_MESA_copy_sub_buffer;
+GLXEW_EXPORT GLboolean __GLXEW_MESA_pixmap_colormap;
+GLXEW_EXPORT GLboolean __GLXEW_MESA_release_buffers;
+GLXEW_EXPORT GLboolean __GLXEW_MESA_set_3dfx_mode;
+GLXEW_EXPORT GLboolean __GLXEW_NV_float_buffer;
+GLXEW_EXPORT GLboolean __GLXEW_NV_vertex_array_range;
+GLXEW_EXPORT GLboolean __GLXEW_OML_swap_method;
+GLXEW_EXPORT GLboolean __GLXEW_OML_sync_control;
+GLXEW_EXPORT GLboolean __GLXEW_SGIS_blended_overlay;
+GLXEW_EXPORT GLboolean __GLXEW_SGIS_color_range;
+GLXEW_EXPORT GLboolean __GLXEW_SGIS_multisample;
+GLXEW_EXPORT GLboolean __GLXEW_SGIS_shared_multisample;
+GLXEW_EXPORT GLboolean __GLXEW_SGIX_fbconfig;
+GLXEW_EXPORT GLboolean __GLXEW_SGIX_pbuffer;
+GLXEW_EXPORT GLboolean __GLXEW_SGIX_swap_barrier;
+GLXEW_EXPORT GLboolean __GLXEW_SGIX_swap_group;
+GLXEW_EXPORT GLboolean __GLXEW_SGIX_video_resize;
+GLXEW_EXPORT GLboolean __GLXEW_SGIX_visual_select_group;
+GLXEW_EXPORT GLboolean __GLXEW_SGI_cushion;
+GLXEW_EXPORT GLboolean __GLXEW_SGI_make_current_read;
+GLXEW_EXPORT GLboolean __GLXEW_SGI_swap_control;
+GLXEW_EXPORT GLboolean __GLXEW_SGI_video_sync;
+GLXEW_EXPORT GLboolean __GLXEW_SUN_get_transparent_index;
+GLXEW_EXPORT GLboolean __GLXEW_SUN_video_resize;
+
+#ifdef GLEW_MX
+}; /* GLXEWContextStruct */
+#endif /* GLEW_MX */
+
+/* ------------------------------------------------------------------------ */
+
+#ifdef GLEW_MX
+
+typedef struct GLXEWContextStruct GLXEWContext;
+extern GLenum glxewContextInit (GLXEWContext* ctx);
+extern GLboolean glxewContextIsSupported (GLXEWContext* ctx, const char* name);
+
+#define glxewInit() glxewContextInit(glxewGetContext())
+#define glxewIsSupported(x) glxewContextIsSupported(glxewGetContext(), x)
+
+#define GLXEW_GET_VAR(x) glxewGetContext()->x
+#define GLXEW_GET_FUN(x) x
+
+#else /* GLEW_MX */
+
+#define GLXEW_GET_VAR(x) x
+#define GLXEW_GET_FUN(x) x
+
+extern GLboolean glxewIsSupported (const char* name);
+
+#endif /* GLEW_MX */
+
+extern GLboolean glxewGetExtension (const char* name);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __glxew_h__ */
diff --git a/extern/glew/include/GL/wglew.h b/extern/glew/include/GL/wglew.h
new file mode 100644
index 00000000000..febb1d07399
--- /dev/null
+++ b/extern/glew/include/GL/wglew.h
@@ -0,0 +1,934 @@
+/*
+** The OpenGL Extension Wrangler Library
+** Copyright (C) 2002-2006, Milan Ikits <milan ikits[]ieee org>
+** Copyright (C) 2002-2006, Marcelo E. Magallon <mmagallo[]debian org>
+** Copyright (C) 2002, Lev Povalahev
+** All rights reserved.
+** 
+** Redistribution and use in source and binary forms, with or without 
+** modification, are permitted provided that the following conditions are met:
+** 
+** * Redistributions of source code must retain the above copyright notice, 
+**   this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright notice, 
+**   this list of conditions and the following disclaimer in the documentation 
+**   and/or other materials provided with the distribution.
+** * The name of the author may be used to endorse or promote products 
+**   derived from this software without specific prior written permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+** ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
+** LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+** CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+** SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+** INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+** CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+** ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+** THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef __wglew_h__
+#define __wglew_h__
+#define __WGLEW_H__
+
+#ifdef __wglext_h_
+#error wglext.h included before wglew.h
+#endif
+
+#define __wglext_h_
+
+#if !defined(APIENTRY) && !defined(__CYGWIN__)
+#  ifndef WIN32_LEAN_AND_MEAN
+#    define WIN32_LEAN_AND_MEAN 1
+#  endif
+#include <windows.h>
+#endif
+
+/*
+ * GLEW_STATIC needs to be set when using the static version.
+ * GLEW_BUILD is set when building the DLL version.
+ */
+#ifdef GLEW_STATIC
+#  define GLEWAPI extern
+#else
+#  ifdef GLEW_BUILD
+#    define GLEWAPI extern __declspec(dllexport)
+#  else
+#    define GLEWAPI extern __declspec(dllimport)
+#  endif
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* -------------------------- WGL_3DFX_multisample ------------------------- */
+
+#ifndef WGL_3DFX_multisample
+#define WGL_3DFX_multisample 1
+
+#define WGL_SAMPLE_BUFFERS_3DFX 0x2060
+#define WGL_SAMPLES_3DFX 0x2061
+
+#define WGLEW_3DFX_multisample WGLEW_GET_VAR(__WGLEW_3DFX_multisample)
+
+#endif /* WGL_3DFX_multisample */
+
+/* ------------------------- WGL_3DL_stereo_control ------------------------ */
+
+#ifndef WGL_3DL_stereo_control
+#define WGL_3DL_stereo_control 1
+
+#define WGL_STEREO_EMITTER_ENABLE_3DL 0x2055
+#define WGL_STEREO_EMITTER_DISABLE_3DL 0x2056
+#define WGL_STEREO_POLARITY_NORMAL_3DL 0x2057
+#define WGL_STEREO_POLARITY_INVERT_3DL 0x2058
+
+typedef BOOL (WINAPI * PFNWGLSETSTEREOEMITTERSTATE3DLPROC) (HDC hDC, UINT uState);
+
+#define wglSetStereoEmitterState3DL WGLEW_GET_FUN(__wglewSetStereoEmitterState3DL)
+
+#define WGLEW_3DL_stereo_control WGLEW_GET_VAR(__WGLEW_3DL_stereo_control)
+
+#endif /* WGL_3DL_stereo_control */
+
+/* ------------------------- WGL_ARB_buffer_region ------------------------- */
+
+#ifndef WGL_ARB_buffer_region
+#define WGL_ARB_buffer_region 1
+
+#define WGL_FRONT_COLOR_BUFFER_BIT_ARB 0x00000001
+#define WGL_BACK_COLOR_BUFFER_BIT_ARB 0x00000002
+#define WGL_DEPTH_BUFFER_BIT_ARB 0x00000004
+#define WGL_STENCIL_BUFFER_BIT_ARB 0x00000008
+
+typedef HANDLE (WINAPI * PFNWGLCREATEBUFFERREGIONARBPROC) (HDC hDC, int iLayerPlane, UINT uType);
+typedef VOID (WINAPI * PFNWGLDELETEBUFFERREGIONARBPROC) (HANDLE hRegion);
+typedef BOOL (WINAPI * PFNWGLRESTOREBUFFERREGIONARBPROC) (HANDLE hRegion, int x, int y, int width, int height, int xSrc, int ySrc);
+typedef BOOL (WINAPI * PFNWGLSAVEBUFFERREGIONARBPROC) (HANDLE hRegion, int x, int y, int width, int height);
+
+#define wglCreateBufferRegionARB WGLEW_GET_FUN(__wglewCreateBufferRegionARB)
+#define wglDeleteBufferRegionARB WGLEW_GET_FUN(__wglewDeleteBufferRegionARB)
+#define wglRestoreBufferRegionARB WGLEW_GET_FUN(__wglewRestoreBufferRegionARB)
+#define wglSaveBufferRegionARB WGLEW_GET_FUN(__wglewSaveBufferRegionARB)
+
+#define WGLEW_ARB_buffer_region WGLEW_GET_VAR(__WGLEW_ARB_buffer_region)
+
+#endif /* WGL_ARB_buffer_region */
+
+/* ----------------------- WGL_ARB_extensions_string ----------------------- */
+
+#ifndef WGL_ARB_extensions_string
+#define WGL_ARB_extensions_string 1
+
+typedef const char* (WINAPI * PFNWGLGETEXTENSIONSSTRINGARBPROC) (HDC hdc);
+
+#define wglGetExtensionsStringARB WGLEW_GET_FUN(__wglewGetExtensionsStringARB)
+
+#define WGLEW_ARB_extensions_string WGLEW_GET_VAR(__WGLEW_ARB_extensions_string)
+
+#endif /* WGL_ARB_extensions_string */
+
+/* ----------------------- WGL_ARB_make_current_read ----------------------- */
+
+#ifndef WGL_ARB_make_current_read
+#define WGL_ARB_make_current_read 1
+
+typedef HDC (WINAPI * PFNWGLGETCURRENTREADDCARBPROC) (VOID);
+typedef BOOL (WINAPI * PFNWGLMAKECONTEXTCURRENTARBPROC) (HDC hDrawDC, HDC hReadDC, HGLRC hglrc);
+
+#define wglGetCurrentReadDCARB WGLEW_GET_FUN(__wglewGetCurrentReadDCARB)
+#define wglMakeContextCurrentARB WGLEW_GET_FUN(__wglewMakeContextCurrentARB)
+
+#define WGLEW_ARB_make_current_read WGLEW_GET_VAR(__WGLEW_ARB_make_current_read)
+
+#endif /* WGL_ARB_make_current_read */
+
+/* -------------------------- WGL_ARB_multisample -------------------------- */
+
+#ifndef WGL_ARB_multisample
+#define WGL_ARB_multisample 1
+
+#define WGL_SAMPLE_BUFFERS_ARB 0x2041
+#define WGL_SAMPLES_ARB 0x2042
+
+#define WGLEW_ARB_multisample WGLEW_GET_VAR(__WGLEW_ARB_multisample)
+
+#endif /* WGL_ARB_multisample */
+
+/* ---------------------------- WGL_ARB_pbuffer ---------------------------- */
+
+#ifndef WGL_ARB_pbuffer
+#define WGL_ARB_pbuffer 1
+
+#define WGL_DRAW_TO_PBUFFER_ARB 0x202D
+#define WGL_MAX_PBUFFER_PIXELS_ARB 0x202E
+#define WGL_MAX_PBUFFER_WIDTH_ARB 0x202F
+#define WGL_MAX_PBUFFER_HEIGHT_ARB 0x2030
+#define WGL_PBUFFER_LARGEST_ARB 0x2033
+#define WGL_PBUFFER_WIDTH_ARB 0x2034
+#define WGL_PBUFFER_HEIGHT_ARB 0x2035
+#define WGL_PBUFFER_LOST_ARB 0x2036
+
+DECLARE_HANDLE(HPBUFFERARB);
+
+typedef HPBUFFERARB (WINAPI * PFNWGLCREATEPBUFFERARBPROC) (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int* piAttribList);
+typedef BOOL (WINAPI * PFNWGLDESTROYPBUFFERARBPROC) (HPBUFFERARB hPbuffer);
+typedef HDC (WINAPI * PFNWGLGETPBUFFERDCARBPROC) (HPBUFFERARB hPbuffer);
+typedef BOOL (WINAPI * PFNWGLQUERYPBUFFERARBPROC) (HPBUFFERARB hPbuffer, int iAttribute, int* piValue);
+typedef int (WINAPI * PFNWGLRELEASEPBUFFERDCARBPROC) (HPBUFFERARB hPbuffer, HDC hDC);
+
+#define wglCreatePbufferARB WGLEW_GET_FUN(__wglewCreatePbufferARB)
+#define wglDestroyPbufferARB WGLEW_GET_FUN(__wglewDestroyPbufferARB)
+#define wglGetPbufferDCARB WGLEW_GET_FUN(__wglewGetPbufferDCARB)
+#define wglQueryPbufferARB WGLEW_GET_FUN(__wglewQueryPbufferARB)
+#define wglReleasePbufferDCARB WGLEW_GET_FUN(__wglewReleasePbufferDCARB)
+
+#define WGLEW_ARB_pbuffer WGLEW_GET_VAR(__WGLEW_ARB_pbuffer)
+
+#endif /* WGL_ARB_pbuffer */
+
+/* -------------------------- WGL_ARB_pixel_format ------------------------- */
+
+#ifndef WGL_ARB_pixel_format
+#define WGL_ARB_pixel_format 1
+
+#define WGL_NUMBER_PIXEL_FORMATS_ARB 0x2000
+#define WGL_DRAW_TO_WINDOW_ARB 0x2001
+#define WGL_DRAW_TO_BITMAP_ARB 0x2002
+#define WGL_ACCELERATION_ARB 0x2003
+#define WGL_NEED_PALETTE_ARB 0x2004
+#define WGL_NEED_SYSTEM_PALETTE_ARB 0x2005
+#define WGL_SWAP_LAYER_BUFFERS_ARB 0x2006
+#define WGL_SWAP_METHOD_ARB 0x2007
+#define WGL_NUMBER_OVERLAYS_ARB 0x2008
+#define WGL_NUMBER_UNDERLAYS_ARB 0x2009
+#define WGL_TRANSPARENT_ARB 0x200A
+#define WGL_SHARE_DEPTH_ARB 0x200C
+#define WGL_SHARE_STENCIL_ARB 0x200D
+#define WGL_SHARE_ACCUM_ARB 0x200E
+#define WGL_SUPPORT_GDI_ARB 0x200F
+#define WGL_SUPPORT_OPENGL_ARB 0x2010
+#define WGL_DOUBLE_BUFFER_ARB 0x2011
+#define WGL_STEREO_ARB 0x2012
+#define WGL_PIXEL_TYPE_ARB 0x2013
+#define WGL_COLOR_BITS_ARB 0x2014
+#define WGL_RED_BITS_ARB 0x2015
+#define WGL_RED_SHIFT_ARB 0x2016
+#define WGL_GREEN_BITS_ARB 0x2017
+#define WGL_GREEN_SHIFT_ARB 0x2018
+#define WGL_BLUE_BITS_ARB 0x2019
+#define WGL_BLUE_SHIFT_ARB 0x201A
+#define WGL_ALPHA_BITS_ARB 0x201B
+#define WGL_ALPHA_SHIFT_ARB 0x201C
+#define WGL_ACCUM_BITS_ARB 0x201D
+#define WGL_ACCUM_RED_BITS_ARB 0x201E
+#define WGL_ACCUM_GREEN_BITS_ARB 0x201F
+#define WGL_ACCUM_BLUE_BITS_ARB 0x2020
+#define WGL_ACCUM_ALPHA_BITS_ARB 0x2021
+#define WGL_DEPTH_BITS_ARB 0x2022
+#define WGL_STENCIL_BITS_ARB 0x2023
+#define WGL_AUX_BUFFERS_ARB 0x2024
+#define WGL_NO_ACCELERATION_ARB 0x2025
+#define WGL_GENERIC_ACCELERATION_ARB 0x2026
+#define WGL_FULL_ACCELERATION_ARB 0x2027
+#define WGL_SWAP_EXCHANGE_ARB 0x2028
+#define WGL_SWAP_COPY_ARB 0x2029
+#define WGL_SWAP_UNDEFINED_ARB 0x202A
+#define WGL_TYPE_RGBA_ARB 0x202B
+#define WGL_TYPE_COLORINDEX_ARB 0x202C
+#define WGL_TRANSPARENT_RED_VALUE_ARB 0x2037
+#define WGL_TRANSPARENT_GREEN_VALUE_ARB 0x2038
+#define WGL_TRANSPARENT_BLUE_VALUE_ARB 0x2039
+#define WGL_TRANSPARENT_ALPHA_VALUE_ARB 0x203A
+#define WGL_TRANSPARENT_INDEX_VALUE_ARB 0x203B
+
+typedef BOOL (WINAPI * PFNWGLCHOOSEPIXELFORMATARBPROC) (HDC hdc, const int* piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats);
+typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBFVARBPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int* piAttributes, FLOAT *pfValues);
+typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBIVARBPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int* piAttributes, int *piValues);
+
+#define wglChoosePixelFormatARB WGLEW_GET_FUN(__wglewChoosePixelFormatARB)
+#define wglGetPixelFormatAttribfvARB WGLEW_GET_FUN(__wglewGetPixelFormatAttribfvARB)
+#define wglGetPixelFormatAttribivARB WGLEW_GET_FUN(__wglewGetPixelFormatAttribivARB)
+
+#define WGLEW_ARB_pixel_format WGLEW_GET_VAR(__WGLEW_ARB_pixel_format)
+
+#endif /* WGL_ARB_pixel_format */
+
+/* ----------------------- WGL_ARB_pixel_format_float ---------------------- */
+
+#ifndef WGL_ARB_pixel_format_float
+#define WGL_ARB_pixel_format_float 1
+
+#define WGL_TYPE_RGBA_FLOAT_ARB 0x21A0
+
+#define WGLEW_ARB_pixel_format_float WGLEW_GET_VAR(__WGLEW_ARB_pixel_format_float)
+
+#endif /* WGL_ARB_pixel_format_float */
+
+/* ------------------------- WGL_ARB_render_texture ------------------------ */
+
+#ifndef WGL_ARB_render_texture
+#define WGL_ARB_render_texture 1
+
+#define WGL_BIND_TO_TEXTURE_RGB_ARB 0x2070
+#define WGL_BIND_TO_TEXTURE_RGBA_ARB 0x2071
+#define WGL_TEXTURE_FORMAT_ARB 0x2072
+#define WGL_TEXTURE_TARGET_ARB 0x2073
+#define WGL_MIPMAP_TEXTURE_ARB 0x2074
+#define WGL_TEXTURE_RGB_ARB 0x2075
+#define WGL_TEXTURE_RGBA_ARB 0x2076
+#define WGL_NO_TEXTURE_ARB 0x2077
+#define WGL_TEXTURE_CUBE_MAP_ARB 0x2078
+#define WGL_TEXTURE_1D_ARB 0x2079
+#define WGL_TEXTURE_2D_ARB 0x207A
+#define WGL_MIPMAP_LEVEL_ARB 0x207B
+#define WGL_CUBE_MAP_FACE_ARB 0x207C
+#define WGL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x207D
+#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x207E
+#define WGL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x207F
+#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x2080
+#define WGL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x2081
+#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x2082
+#define WGL_FRONT_LEFT_ARB 0x2083
+#define WGL_FRONT_RIGHT_ARB 0x2084
+#define WGL_BACK_LEFT_ARB 0x2085
+#define WGL_BACK_RIGHT_ARB 0x2086
+#define WGL_AUX0_ARB 0x2087
+#define WGL_AUX1_ARB 0x2088
+#define WGL_AUX2_ARB 0x2089
+#define WGL_AUX3_ARB 0x208A
+#define WGL_AUX4_ARB 0x208B
+#define WGL_AUX5_ARB 0x208C
+#define WGL_AUX6_ARB 0x208D
+#define WGL_AUX7_ARB 0x208E
+#define WGL_AUX8_ARB 0x208F
+#define WGL_AUX9_ARB 0x2090
+
+typedef BOOL (WINAPI * PFNWGLBINDTEXIMAGEARBPROC) (HPBUFFERARB hPbuffer, int iBuffer);
+typedef BOOL (WINAPI * PFNWGLRELEASETEXIMAGEARBPROC) (HPBUFFERARB hPbuffer, int iBuffer);
+typedef BOOL (WINAPI * PFNWGLSETPBUFFERATTRIBARBPROC) (HPBUFFERARB hPbuffer, const int* piAttribList);
+
+#define wglBindTexImageARB WGLEW_GET_FUN(__wglewBindTexImageARB)
+#define wglReleaseTexImageARB WGLEW_GET_FUN(__wglewReleaseTexImageARB)
+#define wglSetPbufferAttribARB WGLEW_GET_FUN(__wglewSetPbufferAttribARB)
+
+#define WGLEW_ARB_render_texture WGLEW_GET_VAR(__WGLEW_ARB_render_texture)
+
+#endif /* WGL_ARB_render_texture */
+
+/* ----------------------- WGL_ATI_pixel_format_float ---------------------- */
+
+#ifndef WGL_ATI_pixel_format_float
+#define WGL_ATI_pixel_format_float 1
+
+#define WGL_TYPE_RGBA_FLOAT_ATI 0x21A0
+#define GL_RGBA_FLOAT_MODE_ATI 0x8820
+#define GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI 0x8835
+
+#define WGLEW_ATI_pixel_format_float WGLEW_GET_VAR(__WGLEW_ATI_pixel_format_float)
+
+#endif /* WGL_ATI_pixel_format_float */
+
+/* -------------------- WGL_ATI_render_texture_rectangle ------------------- */
+
+#ifndef WGL_ATI_render_texture_rectangle
+#define WGL_ATI_render_texture_rectangle 1
+
+#define WGL_TEXTURE_RECTANGLE_ATI 0x21A5
+
+#define WGLEW_ATI_render_texture_rectangle WGLEW_GET_VAR(__WGLEW_ATI_render_texture_rectangle)
+
+#endif /* WGL_ATI_render_texture_rectangle */
+
+/* -------------------------- WGL_EXT_depth_float -------------------------- */
+
+#ifndef WGL_EXT_depth_float
+#define WGL_EXT_depth_float 1
+
+#define WGL_DEPTH_FLOAT_EXT 0x2040
+
+#define WGLEW_EXT_depth_float WGLEW_GET_VAR(__WGLEW_EXT_depth_float)
+
+#endif /* WGL_EXT_depth_float */
+
+/* ---------------------- WGL_EXT_display_color_table ---------------------- */
+
+#ifndef WGL_EXT_display_color_table
+#define WGL_EXT_display_color_table 1
+
+typedef GLboolean (WINAPI * PFNWGLBINDDISPLAYCOLORTABLEEXTPROC) (GLushort id);
+typedef GLboolean (WINAPI * PFNWGLCREATEDISPLAYCOLORTABLEEXTPROC) (GLushort id);
+typedef void (WINAPI * PFNWGLDESTROYDISPLAYCOLORTABLEEXTPROC) (GLushort id);
+typedef GLboolean (WINAPI * PFNWGLLOADDISPLAYCOLORTABLEEXTPROC) (GLushort* table, GLuint length);
+
+#define wglBindDisplayColorTableEXT WGLEW_GET_FUN(__wglewBindDisplayColorTableEXT)
+#define wglCreateDisplayColorTableEXT WGLEW_GET_FUN(__wglewCreateDisplayColorTableEXT)
+#define wglDestroyDisplayColorTableEXT WGLEW_GET_FUN(__wglewDestroyDisplayColorTableEXT)
+#define wglLoadDisplayColorTableEXT WGLEW_GET_FUN(__wglewLoadDisplayColorTableEXT)
+
+#define WGLEW_EXT_display_color_table WGLEW_GET_VAR(__WGLEW_EXT_display_color_table)
+
+#endif /* WGL_EXT_display_color_table */
+
+/* ----------------------- WGL_EXT_extensions_string ----------------------- */
+
+#ifndef WGL_EXT_extensions_string
+#define WGL_EXT_extensions_string 1
+
+typedef const char* (WINAPI * PFNWGLGETEXTENSIONSSTRINGEXTPROC) (void);
+
+#define wglGetExtensionsStringEXT WGLEW_GET_FUN(__wglewGetExtensionsStringEXT)
+
+#define WGLEW_EXT_extensions_string WGLEW_GET_VAR(__WGLEW_EXT_extensions_string)
+
+#endif /* WGL_EXT_extensions_string */
+
+/* ----------------------- WGL_EXT_make_current_read ----------------------- */
+
+#ifndef WGL_EXT_make_current_read
+#define WGL_EXT_make_current_read 1
+
+typedef HDC (WINAPI * PFNWGLGETCURRENTREADDCEXTPROC) (VOID);
+typedef BOOL (WINAPI * PFNWGLMAKECONTEXTCURRENTEXTPROC) (HDC hDrawDC, HDC hReadDC, HGLRC hglrc);
+
+#define wglGetCurrentReadDCEXT WGLEW_GET_FUN(__wglewGetCurrentReadDCEXT)
+#define wglMakeContextCurrentEXT WGLEW_GET_FUN(__wglewMakeContextCurrentEXT)
+
+#define WGLEW_EXT_make_current_read WGLEW_GET_VAR(__WGLEW_EXT_make_current_read)
+
+#endif /* WGL_EXT_make_current_read */
+
+/* -------------------------- WGL_EXT_multisample -------------------------- */
+
+#ifndef WGL_EXT_multisample
+#define WGL_EXT_multisample 1
+
+#define WGL_SAMPLE_BUFFERS_EXT 0x2041
+#define WGL_SAMPLES_EXT 0x2042
+
+#define WGLEW_EXT_multisample WGLEW_GET_VAR(__WGLEW_EXT_multisample)
+
+#endif /* WGL_EXT_multisample */
+
+/* ---------------------------- WGL_EXT_pbuffer ---------------------------- */
+
+#ifndef WGL_EXT_pbuffer
+#define WGL_EXT_pbuffer 1
+
+#define WGL_DRAW_TO_PBUFFER_EXT 0x202D
+#define WGL_MAX_PBUFFER_PIXELS_EXT 0x202E
+#define WGL_MAX_PBUFFER_WIDTH_EXT 0x202F
+#define WGL_MAX_PBUFFER_HEIGHT_EXT 0x2030
+#define WGL_OPTIMAL_PBUFFER_WIDTH_EXT 0x2031
+#define WGL_OPTIMAL_PBUFFER_HEIGHT_EXT 0x2032
+#define WGL_PBUFFER_LARGEST_EXT 0x2033
+#define WGL_PBUFFER_WIDTH_EXT 0x2034
+#define WGL_PBUFFER_HEIGHT_EXT 0x2035
+
+DECLARE_HANDLE(HPBUFFEREXT);
+
+typedef HPBUFFEREXT (WINAPI * PFNWGLCREATEPBUFFEREXTPROC) (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int* piAttribList);
+typedef BOOL (WINAPI * PFNWGLDESTROYPBUFFEREXTPROC) (HPBUFFEREXT hPbuffer);
+typedef HDC (WINAPI * PFNWGLGETPBUFFERDCEXTPROC) (HPBUFFEREXT hPbuffer);
+typedef BOOL (WINAPI * PFNWGLQUERYPBUFFEREXTPROC) (HPBUFFEREXT hPbuffer, int iAttribute, int* piValue);
+typedef int (WINAPI * PFNWGLRELEASEPBUFFERDCEXTPROC) (HPBUFFEREXT hPbuffer, HDC hDC);
+
+#define wglCreatePbufferEXT WGLEW_GET_FUN(__wglewCreatePbufferEXT)
+#define wglDestroyPbufferEXT WGLEW_GET_FUN(__wglewDestroyPbufferEXT)
+#define wglGetPbufferDCEXT WGLEW_GET_FUN(__wglewGetPbufferDCEXT)
+#define wglQueryPbufferEXT WGLEW_GET_FUN(__wglewQueryPbufferEXT)
+#define wglReleasePbufferDCEXT WGLEW_GET_FUN(__wglewReleasePbufferDCEXT)
+
+#define WGLEW_EXT_pbuffer WGLEW_GET_VAR(__WGLEW_EXT_pbuffer)
+
+#endif /* WGL_EXT_pbuffer */
+
+/* -------------------------- WGL_EXT_pixel_format ------------------------- */
+
+#ifndef WGL_EXT_pixel_format
+#define WGL_EXT_pixel_format 1
+
+#define WGL_NUMBER_PIXEL_FORMATS_EXT 0x2000
+#define WGL_DRAW_TO_WINDOW_EXT 0x2001
+#define WGL_DRAW_TO_BITMAP_EXT 0x2002
+#define WGL_ACCELERATION_EXT 0x2003
+#define WGL_NEED_PALETTE_EXT 0x2004
+#define WGL_NEED_SYSTEM_PALETTE_EXT 0x2005
+#define WGL_SWAP_LAYER_BUFFERS_EXT 0x2006
+#define WGL_SWAP_METHOD_EXT 0x2007
+#define WGL_NUMBER_OVERLAYS_EXT 0x2008
+#define WGL_NUMBER_UNDERLAYS_EXT 0x2009
+#define WGL_TRANSPARENT_EXT 0x200A
+#define WGL_TRANSPARENT_VALUE_EXT 0x200B
+#define WGL_SHARE_DEPTH_EXT 0x200C
+#define WGL_SHARE_STENCIL_EXT 0x200D
+#define WGL_SHARE_ACCUM_EXT 0x200E
+#define WGL_SUPPORT_GDI_EXT 0x200F
+#define WGL_SUPPORT_OPENGL_EXT 0x2010
+#define WGL_DOUBLE_BUFFER_EXT 0x2011
+#define WGL_STEREO_EXT 0x2012
+#define WGL_PIXEL_TYPE_EXT 0x2013
+#define WGL_COLOR_BITS_EXT 0x2014
+#define WGL_RED_BITS_EXT 0x2015
+#define WGL_RED_SHIFT_EXT 0x2016
+#define WGL_GREEN_BITS_EXT 0x2017
+#define WGL_GREEN_SHIFT_EXT 0x2018
+#define WGL_BLUE_BITS_EXT 0x2019
+#define WGL_BLUE_SHIFT_EXT 0x201A
+#define WGL_ALPHA_BITS_EXT 0x201B
+#define WGL_ALPHA_SHIFT_EXT 0x201C
+#define WGL_ACCUM_BITS_EXT 0x201D
+#define WGL_ACCUM_RED_BITS_EXT 0x201E
+#define WGL_ACCUM_GREEN_BITS_EXT 0x201F
+#define WGL_ACCUM_BLUE_BITS_EXT 0x2020
+#define WGL_ACCUM_ALPHA_BITS_EXT 0x2021
+#define WGL_DEPTH_BITS_EXT 0x2022
+#define WGL_STENCIL_BITS_EXT 0x2023
+#define WGL_AUX_BUFFERS_EXT 0x2024
+#define WGL_NO_ACCELERATION_EXT 0x2025
+#define WGL_GENERIC_ACCELERATION_EXT 0x2026
+#define WGL_FULL_ACCELERATION_EXT 0x2027
+#define WGL_SWAP_EXCHANGE_EXT 0x2028
+#define WGL_SWAP_COPY_EXT 0x2029
+#define WGL_SWAP_UNDEFINED_EXT 0x202A
+#define WGL_TYPE_RGBA_EXT 0x202B
+#define WGL_TYPE_COLORINDEX_EXT 0x202C
+
+typedef BOOL (WINAPI * PFNWGLCHOOSEPIXELFORMATEXTPROC) (HDC hdc, const int* piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats);
+typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBFVEXTPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int* piAttributes, FLOAT *pfValues);
+typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBIVEXTPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int* piAttributes, int *piValues);
+
+#define wglChoosePixelFormatEXT WGLEW_GET_FUN(__wglewChoosePixelFormatEXT)
+#define wglGetPixelFormatAttribfvEXT WGLEW_GET_FUN(__wglewGetPixelFormatAttribfvEXT)
+#define wglGetPixelFormatAttribivEXT WGLEW_GET_FUN(__wglewGetPixelFormatAttribivEXT)
+
+#define WGLEW_EXT_pixel_format WGLEW_GET_VAR(__WGLEW_EXT_pixel_format)
+
+#endif /* WGL_EXT_pixel_format */
+
+/* -------------------------- WGL_EXT_swap_control ------------------------- */
+
+#ifndef WGL_EXT_swap_control
+#define WGL_EXT_swap_control 1
+
+typedef int (WINAPI * PFNWGLGETSWAPINTERVALEXTPROC) (void);
+typedef BOOL (WINAPI * PFNWGLSWAPINTERVALEXTPROC) (int interval);
+
+#define wglGetSwapIntervalEXT WGLEW_GET_FUN(__wglewGetSwapIntervalEXT)
+#define wglSwapIntervalEXT WGLEW_GET_FUN(__wglewSwapIntervalEXT)
+
+#define WGLEW_EXT_swap_control WGLEW_GET_VAR(__WGLEW_EXT_swap_control)
+
+#endif /* WGL_EXT_swap_control */
+
+/* --------------------- WGL_I3D_digital_video_control --------------------- */
+
+#ifndef WGL_I3D_digital_video_control
+#define WGL_I3D_digital_video_control 1
+
+#define WGL_DIGITAL_VIDEO_CURSOR_ALPHA_FRAMEBUFFER_I3D 0x2050
+#define WGL_DIGITAL_VIDEO_CURSOR_ALPHA_VALUE_I3D 0x2051
+#define WGL_DIGITAL_VIDEO_CURSOR_INCLUDED_I3D 0x2052
+#define WGL_DIGITAL_VIDEO_GAMMA_CORRECTED_I3D 0x2053
+
+typedef BOOL (WINAPI * PFNWGLGETDIGITALVIDEOPARAMETERSI3DPROC) (HDC hDC, int iAttribute, int* piValue);
+typedef BOOL (WINAPI * PFNWGLSETDIGITALVIDEOPARAMETERSI3DPROC) (HDC hDC, int iAttribute, const int* piValue);
+
+#define wglGetDigitalVideoParametersI3D WGLEW_GET_FUN(__wglewGetDigitalVideoParametersI3D)
+#define wglSetDigitalVideoParametersI3D WGLEW_GET_FUN(__wglewSetDigitalVideoParametersI3D)
+
+#define WGLEW_I3D_digital_video_control WGLEW_GET_VAR(__WGLEW_I3D_digital_video_control)
+
+#endif /* WGL_I3D_digital_video_control */
+
+/* ----------------------------- WGL_I3D_gamma ----------------------------- */
+
+#ifndef WGL_I3D_gamma
+#define WGL_I3D_gamma 1
+
+#define WGL_GAMMA_TABLE_SIZE_I3D 0x204E
+#define WGL_GAMMA_EXCLUDE_DESKTOP_I3D 0x204F
+
+typedef BOOL (WINAPI * PFNWGLGETGAMMATABLEI3DPROC) (HDC hDC, int iEntries, USHORT* puRed, USHORT *puGreen, USHORT *puBlue);
+typedef BOOL (WINAPI * PFNWGLGETGAMMATABLEPARAMETERSI3DPROC) (HDC hDC, int iAttribute, int* piValue);
+typedef BOOL (WINAPI * PFNWGLSETGAMMATABLEI3DPROC) (HDC hDC, int iEntries, const USHORT* puRed, const USHORT *puGreen, const USHORT *puBlue);
+typedef BOOL (WINAPI * PFNWGLSETGAMMATABLEPARAMETERSI3DPROC) (HDC hDC, int iAttribute, const int* piValue);
+
+#define wglGetGammaTableI3D WGLEW_GET_FUN(__wglewGetGammaTableI3D)
+#define wglGetGammaTableParametersI3D WGLEW_GET_FUN(__wglewGetGammaTableParametersI3D)
+#define wglSetGammaTableI3D WGLEW_GET_FUN(__wglewSetGammaTableI3D)
+#define wglSetGammaTableParametersI3D WGLEW_GET_FUN(__wglewSetGammaTableParametersI3D)
+
+#define WGLEW_I3D_gamma WGLEW_GET_VAR(__WGLEW_I3D_gamma)
+
+#endif /* WGL_I3D_gamma */
+
+/* ---------------------------- WGL_I3D_genlock ---------------------------- */
+
+#ifndef WGL_I3D_genlock
+#define WGL_I3D_genlock 1
+
+#define WGL_GENLOCK_SOURCE_MULTIVIEW_I3D 0x2044
+#define WGL_GENLOCK_SOURCE_EXTERNAL_SYNC_I3D 0x2045
+#define WGL_GENLOCK_SOURCE_EXTERNAL_FIELD_I3D 0x2046
+#define WGL_GENLOCK_SOURCE_EXTERNAL_TTL_I3D 0x2047
+#define WGL_GENLOCK_SOURCE_DIGITAL_SYNC_I3D 0x2048
+#define WGL_GENLOCK_SOURCE_DIGITAL_FIELD_I3D 0x2049
+#define WGL_GENLOCK_SOURCE_EDGE_FALLING_I3D 0x204A
+#define WGL_GENLOCK_SOURCE_EDGE_RISING_I3D 0x204B
+#define WGL_GENLOCK_SOURCE_EDGE_BOTH_I3D 0x204C
+
+typedef BOOL (WINAPI * PFNWGLDISABLEGENLOCKI3DPROC) (HDC hDC);
+typedef BOOL (WINAPI * PFNWGLENABLEGENLOCKI3DPROC) (HDC hDC);
+typedef BOOL (WINAPI * PFNWGLGENLOCKSAMPLERATEI3DPROC) (HDC hDC, UINT uRate);
+typedef BOOL (WINAPI * PFNWGLGENLOCKSOURCEDELAYI3DPROC) (HDC hDC, UINT uDelay);
+typedef BOOL (WINAPI * PFNWGLGENLOCKSOURCEEDGEI3DPROC) (HDC hDC, UINT uEdge);
+typedef BOOL (WINAPI * PFNWGLGENLOCKSOURCEI3DPROC) (HDC hDC, UINT uSource);
+typedef BOOL (WINAPI * PFNWGLGETGENLOCKSAMPLERATEI3DPROC) (HDC hDC, UINT* uRate);
+typedef BOOL (WINAPI * PFNWGLGETGENLOCKSOURCEDELAYI3DPROC) (HDC hDC, UINT* uDelay);
+typedef BOOL (WINAPI * PFNWGLGETGENLOCKSOURCEEDGEI3DPROC) (HDC hDC, UINT* uEdge);
+typedef BOOL (WINAPI * PFNWGLGETGENLOCKSOURCEI3DPROC) (HDC hDC, UINT* uSource);
+typedef BOOL (WINAPI * PFNWGLISENABLEDGENLOCKI3DPROC) (HDC hDC, BOOL* pFlag);
+typedef BOOL (WINAPI * PFNWGLQUERYGENLOCKMAXSOURCEDELAYI3DPROC) (HDC hDC, UINT* uMaxLineDelay, UINT *uMaxPixelDelay);
+
+#define wglDisableGenlockI3D WGLEW_GET_FUN(__wglewDisableGenlockI3D)
+#define wglEnableGenlockI3D WGLEW_GET_FUN(__wglewEnableGenlockI3D)
+#define wglGenlockSampleRateI3D WGLEW_GET_FUN(__wglewGenlockSampleRateI3D)
+#define wglGenlockSourceDelayI3D WGLEW_GET_FUN(__wglewGenlockSourceDelayI3D)
+#define wglGenlockSourceEdgeI3D WGLEW_GET_FUN(__wglewGenlockSourceEdgeI3D)
+#define wglGenlockSourceI3D WGLEW_GET_FUN(__wglewGenlockSourceI3D)
+#define wglGetGenlockSampleRateI3D WGLEW_GET_FUN(__wglewGetGenlockSampleRateI3D)
+#define wglGetGenlockSourceDelayI3D WGLEW_GET_FUN(__wglewGetGenlockSourceDelayI3D)
+#define wglGetGenlockSourceEdgeI3D WGLEW_GET_FUN(__wglewGetGenlockSourceEdgeI3D)
+#define wglGetGenlockSourceI3D WGLEW_GET_FUN(__wglewGetGenlockSourceI3D)
+#define wglIsEnabledGenlockI3D WGLEW_GET_FUN(__wglewIsEnabledGenlockI3D)
+#define wglQueryGenlockMaxSourceDelayI3D WGLEW_GET_FUN(__wglewQueryGenlockMaxSourceDelayI3D)
+
+#define WGLEW_I3D_genlock WGLEW_GET_VAR(__WGLEW_I3D_genlock)
+
+#endif /* WGL_I3D_genlock */
+
+/* -------------------------- WGL_I3D_image_buffer ------------------------- */
+
+#ifndef WGL_I3D_image_buffer
+#define WGL_I3D_image_buffer 1
+
+#define WGL_IMAGE_BUFFER_MIN_ACCESS_I3D 0x00000001
+#define WGL_IMAGE_BUFFER_LOCK_I3D 0x00000002
+
+typedef BOOL (WINAPI * PFNWGLASSOCIATEIMAGEBUFFEREVENTSI3DPROC) (HDC hdc, HANDLE* pEvent, LPVOID *pAddress, DWORD *pSize, UINT count);
+typedef LPVOID (WINAPI * PFNWGLCREATEIMAGEBUFFERI3DPROC) (HDC hDC, DWORD dwSize, UINT uFlags);
+typedef BOOL (WINAPI * PFNWGLDESTROYIMAGEBUFFERI3DPROC) (HDC hDC, LPVOID pAddress);
+typedef BOOL (WINAPI * PFNWGLRELEASEIMAGEBUFFEREVENTSI3DPROC) (HDC hdc, LPVOID* pAddress, UINT count);
+
+#define wglAssociateImageBufferEventsI3D WGLEW_GET_FUN(__wglewAssociateImageBufferEventsI3D)
+#define wglCreateImageBufferI3D WGLEW_GET_FUN(__wglewCreateImageBufferI3D)
+#define wglDestroyImageBufferI3D WGLEW_GET_FUN(__wglewDestroyImageBufferI3D)
+#define wglReleaseImageBufferEventsI3D WGLEW_GET_FUN(__wglewReleaseImageBufferEventsI3D)
+
+#define WGLEW_I3D_image_buffer WGLEW_GET_VAR(__WGLEW_I3D_image_buffer)
+
+#endif /* WGL_I3D_image_buffer */
+
+/* ------------------------ WGL_I3D_swap_frame_lock ------------------------ */
+
+#ifndef WGL_I3D_swap_frame_lock
+#define WGL_I3D_swap_frame_lock 1
+
+typedef BOOL (WINAPI * PFNWGLDISABLEFRAMELOCKI3DPROC) (VOID);
+typedef BOOL (WINAPI * PFNWGLENABLEFRAMELOCKI3DPROC) (VOID);
+typedef BOOL (WINAPI * PFNWGLISENABLEDFRAMELOCKI3DPROC) (BOOL* pFlag);
+typedef BOOL (WINAPI * PFNWGLQUERYFRAMELOCKMASTERI3DPROC) (BOOL* pFlag);
+
+#define wglDisableFrameLockI3D WGLEW_GET_FUN(__wglewDisableFrameLockI3D)
+#define wglEnableFrameLockI3D WGLEW_GET_FUN(__wglewEnableFrameLockI3D)
+#define wglIsEnabledFrameLockI3D WGLEW_GET_FUN(__wglewIsEnabledFrameLockI3D)
+#define wglQueryFrameLockMasterI3D WGLEW_GET_FUN(__wglewQueryFrameLockMasterI3D)
+
+#define WGLEW_I3D_swap_frame_lock WGLEW_GET_VAR(__WGLEW_I3D_swap_frame_lock)
+
+#endif /* WGL_I3D_swap_frame_lock */
+
+/* ------------------------ WGL_I3D_swap_frame_usage ----------------------- */
+
+#ifndef WGL_I3D_swap_frame_usage
+#define WGL_I3D_swap_frame_usage 1
+
+typedef BOOL (WINAPI * PFNWGLBEGINFRAMETRACKINGI3DPROC) (void);
+typedef BOOL (WINAPI * PFNWGLENDFRAMETRACKINGI3DPROC) (void);
+typedef BOOL (WINAPI * PFNWGLGETFRAMEUSAGEI3DPROC) (float* pUsage);
+typedef BOOL (WINAPI * PFNWGLQUERYFRAMETRACKINGI3DPROC) (DWORD* pFrameCount, DWORD *pMissedFrames, float *pLastMissedUsage);
+
+#define wglBeginFrameTrackingI3D WGLEW_GET_FUN(__wglewBeginFrameTrackingI3D)
+#define wglEndFrameTrackingI3D WGLEW_GET_FUN(__wglewEndFrameTrackingI3D)
+#define wglGetFrameUsageI3D WGLEW_GET_FUN(__wglewGetFrameUsageI3D)
+#define wglQueryFrameTrackingI3D WGLEW_GET_FUN(__wglewQueryFrameTrackingI3D)
+
+#define WGLEW_I3D_swap_frame_usage WGLEW_GET_VAR(__WGLEW_I3D_swap_frame_usage)
+
+#endif /* WGL_I3D_swap_frame_usage */
+
+/* -------------------------- WGL_NV_float_buffer -------------------------- */
+
+#ifndef WGL_NV_float_buffer
+#define WGL_NV_float_buffer 1
+
+#define WGL_FLOAT_COMPONENTS_NV 0x20B0
+#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_R_NV 0x20B1
+#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RG_NV 0x20B2
+#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGB_NV 0x20B3
+#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGBA_NV 0x20B4
+#define WGL_TEXTURE_FLOAT_R_NV 0x20B5
+#define WGL_TEXTURE_FLOAT_RG_NV 0x20B6
+#define WGL_TEXTURE_FLOAT_RGB_NV 0x20B7
+#define WGL_TEXTURE_FLOAT_RGBA_NV 0x20B8
+
+#define WGLEW_NV_float_buffer WGLEW_GET_VAR(__WGLEW_NV_float_buffer)
+
+#endif /* WGL_NV_float_buffer */
+
+/* ---------------------- WGL_NV_render_depth_texture ---------------------- */
+
+#ifndef WGL_NV_render_depth_texture
+#define WGL_NV_render_depth_texture 1
+
+#define WGL_NO_TEXTURE_ARB 0x2077
+#define WGL_BIND_TO_TEXTURE_DEPTH_NV 0x20A3
+#define WGL_BIND_TO_TEXTURE_RECTANGLE_DEPTH_NV 0x20A4
+#define WGL_DEPTH_TEXTURE_FORMAT_NV 0x20A5
+#define WGL_TEXTURE_DEPTH_COMPONENT_NV 0x20A6
+#define WGL_DEPTH_COMPONENT_NV 0x20A7
+
+#define WGLEW_NV_render_depth_texture WGLEW_GET_VAR(__WGLEW_NV_render_depth_texture)
+
+#endif /* WGL_NV_render_depth_texture */
+
+/* -------------------- WGL_NV_render_texture_rectangle -------------------- */
+
+#ifndef WGL_NV_render_texture_rectangle
+#define WGL_NV_render_texture_rectangle 1
+
+#define WGL_BIND_TO_TEXTURE_RECTANGLE_RGB_NV 0x20A0
+#define WGL_BIND_TO_TEXTURE_RECTANGLE_RGBA_NV 0x20A1
+#define WGL_TEXTURE_RECTANGLE_NV 0x20A2
+
+#define WGLEW_NV_render_texture_rectangle WGLEW_GET_VAR(__WGLEW_NV_render_texture_rectangle)
+
+#endif /* WGL_NV_render_texture_rectangle */
+
+/* ----------------------- WGL_NV_vertex_array_range ----------------------- */
+
+#ifndef WGL_NV_vertex_array_range
+#define WGL_NV_vertex_array_range 1
+
+typedef void * (WINAPI * PFNWGLALLOCATEMEMORYNVPROC) (GLsizei size, GLfloat readFrequency, GLfloat writeFrequency, GLfloat priority);
+typedef void (WINAPI * PFNWGLFREEMEMORYNVPROC) (void *pointer);
+
+#define wglAllocateMemoryNV WGLEW_GET_FUN(__wglewAllocateMemoryNV)
+#define wglFreeMemoryNV WGLEW_GET_FUN(__wglewFreeMemoryNV)
+
+#define WGLEW_NV_vertex_array_range WGLEW_GET_VAR(__WGLEW_NV_vertex_array_range)
+
+#endif /* WGL_NV_vertex_array_range */
+
+/* -------------------------- WGL_OML_sync_control ------------------------- */
+
+#ifndef WGL_OML_sync_control
+#define WGL_OML_sync_control 1
+
+typedef BOOL (WINAPI * PFNWGLGETMSCRATEOMLPROC) (HDC hdc, INT32* numerator, INT32 *denominator);
+typedef BOOL (WINAPI * PFNWGLGETSYNCVALUESOMLPROC) (HDC hdc, INT64* ust, INT64 *msc, INT64 *sbc);
+typedef INT64 (WINAPI * PFNWGLSWAPBUFFERSMSCOMLPROC) (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder);
+typedef INT64 (WINAPI * PFNWGLSWAPLAYERBUFFERSMSCOMLPROC) (HDC hdc, INT fuPlanes, INT64 target_msc, INT64 divisor, INT64 remainder);
+typedef BOOL (WINAPI * PFNWGLWAITFORMSCOMLPROC) (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder, INT64* ust, INT64 *msc, INT64 *sbc);
+typedef BOOL (WINAPI * PFNWGLWAITFORSBCOMLPROC) (HDC hdc, INT64 target_sbc, INT64* ust, INT64 *msc, INT64 *sbc);
+
+#define wglGetMscRateOML WGLEW_GET_FUN(__wglewGetMscRateOML)
+#define wglGetSyncValuesOML WGLEW_GET_FUN(__wglewGetSyncValuesOML)
+#define wglSwapBuffersMscOML WGLEW_GET_FUN(__wglewSwapBuffersMscOML)
+#define wglSwapLayerBuffersMscOML WGLEW_GET_FUN(__wglewSwapLayerBuffersMscOML)
+#define wglWaitForMscOML WGLEW_GET_FUN(__wglewWaitForMscOML)
+#define wglWaitForSbcOML WGLEW_GET_FUN(__wglewWaitForSbcOML)
+
+#define WGLEW_OML_sync_control WGLEW_GET_VAR(__WGLEW_OML_sync_control)
+
+#endif /* WGL_OML_sync_control */
+
+/* ------------------------------------------------------------------------- */
+
+#ifdef GLEW_MX
+#define WGLEW_EXPORT
+#else
+#define WGLEW_EXPORT GLEWAPI
+#endif /* GLEW_MX */
+
+#ifdef GLEW_MX
+struct WGLEWContextStruct
+{
+#endif /* GLEW_MX */
+
+WGLEW_EXPORT PFNWGLSETSTEREOEMITTERSTATE3DLPROC __wglewSetStereoEmitterState3DL;
+
+WGLEW_EXPORT PFNWGLCREATEBUFFERREGIONARBPROC __wglewCreateBufferRegionARB;
+WGLEW_EXPORT PFNWGLDELETEBUFFERREGIONARBPROC __wglewDeleteBufferRegionARB;
+WGLEW_EXPORT PFNWGLRESTOREBUFFERREGIONARBPROC __wglewRestoreBufferRegionARB;
+WGLEW_EXPORT PFNWGLSAVEBUFFERREGIONARBPROC __wglewSaveBufferRegionARB;
+
+WGLEW_EXPORT PFNWGLGETEXTENSIONSSTRINGARBPROC __wglewGetExtensionsStringARB;
+
+WGLEW_EXPORT PFNWGLGETCURRENTREADDCARBPROC __wglewGetCurrentReadDCARB;
+WGLEW_EXPORT PFNWGLMAKECONTEXTCURRENTARBPROC __wglewMakeContextCurrentARB;
+
+WGLEW_EXPORT PFNWGLCREATEPBUFFERARBPROC __wglewCreatePbufferARB;
+WGLEW_EXPORT PFNWGLDESTROYPBUFFERARBPROC __wglewDestroyPbufferARB;
+WGLEW_EXPORT PFNWGLGETPBUFFERDCARBPROC __wglewGetPbufferDCARB;
+WGLEW_EXPORT PFNWGLQUERYPBUFFERARBPROC __wglewQueryPbufferARB;
+WGLEW_EXPORT PFNWGLRELEASEPBUFFERDCARBPROC __wglewReleasePbufferDCARB;
+
+WGLEW_EXPORT PFNWGLCHOOSEPIXELFORMATARBPROC __wglewChoosePixelFormatARB;
+WGLEW_EXPORT PFNWGLGETPIXELFORMATATTRIBFVARBPROC __wglewGetPixelFormatAttribfvARB;
+WGLEW_EXPORT PFNWGLGETPIXELFORMATATTRIBIVARBPROC __wglewGetPixelFormatAttribivARB;
+
+WGLEW_EXPORT PFNWGLBINDTEXIMAGEARBPROC __wglewBindTexImageARB;
+WGLEW_EXPORT PFNWGLRELEASETEXIMAGEARBPROC __wglewReleaseTexImageARB;
+WGLEW_EXPORT PFNWGLSETPBUFFERATTRIBARBPROC __wglewSetPbufferAttribARB;
+
+WGLEW_EXPORT PFNWGLBINDDISPLAYCOLORTABLEEXTPROC __wglewBindDisplayColorTableEXT;
+WGLEW_EXPORT PFNWGLCREATEDISPLAYCOLORTABLEEXTPROC __wglewCreateDisplayColorTableEXT;
+WGLEW_EXPORT PFNWGLDESTROYDISPLAYCOLORTABLEEXTPROC __wglewDestroyDisplayColorTableEXT;
+WGLEW_EXPORT PFNWGLLOADDISPLAYCOLORTABLEEXTPROC __wglewLoadDisplayColorTableEXT;
+
+WGLEW_EXPORT PFNWGLGETEXTENSIONSSTRINGEXTPROC __wglewGetExtensionsStringEXT;
+
+WGLEW_EXPORT PFNWGLGETCURRENTREADDCEXTPROC __wglewGetCurrentReadDCEXT;
+WGLEW_EXPORT PFNWGLMAKECONTEXTCURRENTEXTPROC __wglewMakeContextCurrentEXT;
+
+WGLEW_EXPORT PFNWGLCREATEPBUFFEREXTPROC __wglewCreatePbufferEXT;
+WGLEW_EXPORT PFNWGLDESTROYPBUFFEREXTPROC __wglewDestroyPbufferEXT;
+WGLEW_EXPORT PFNWGLGETPBUFFERDCEXTPROC __wglewGetPbufferDCEXT;
+WGLEW_EXPORT PFNWGLQUERYPBUFFEREXTPROC __wglewQueryPbufferEXT;
+WGLEW_EXPORT PFNWGLRELEASEPBUFFERDCEXTPROC __wglewReleasePbufferDCEXT;
+
+WGLEW_EXPORT PFNWGLCHOOSEPIXELFORMATEXTPROC __wglewChoosePixelFormatEXT;
+WGLEW_EXPORT PFNWGLGETPIXELFORMATATTRIBFVEXTPROC __wglewGetPixelFormatAttribfvEXT;
+WGLEW_EXPORT PFNWGLGETPIXELFORMATATTRIBIVEXTPROC __wglewGetPixelFormatAttribivEXT;
+
+WGLEW_EXPORT PFNWGLGETSWAPINTERVALEXTPROC __wglewGetSwapIntervalEXT;
+WGLEW_EXPORT PFNWGLSWAPINTERVALEXTPROC __wglewSwapIntervalEXT;
+
+WGLEW_EXPORT PFNWGLGETDIGITALVIDEOPARAMETERSI3DPROC __wglewGetDigitalVideoParametersI3D;
+WGLEW_EXPORT PFNWGLSETDIGITALVIDEOPARAMETERSI3DPROC __wglewSetDigitalVideoParametersI3D;
+
+WGLEW_EXPORT PFNWGLGETGAMMATABLEI3DPROC __wglewGetGammaTableI3D;
+WGLEW_EXPORT PFNWGLGETGAMMATABLEPARAMETERSI3DPROC __wglewGetGammaTableParametersI3D;
+WGLEW_EXPORT PFNWGLSETGAMMATABLEI3DPROC __wglewSetGammaTableI3D;
+WGLEW_EXPORT PFNWGLSETGAMMATABLEPARAMETERSI3DPROC __wglewSetGammaTableParametersI3D;
+
+WGLEW_EXPORT PFNWGLDISABLEGENLOCKI3DPROC __wglewDisableGenlockI3D;
+WGLEW_EXPORT PFNWGLENABLEGENLOCKI3DPROC __wglewEnableGenlockI3D;
+WGLEW_EXPORT PFNWGLGENLOCKSAMPLERATEI3DPROC __wglewGenlockSampleRateI3D;
+WGLEW_EXPORT PFNWGLGENLOCKSOURCEDELAYI3DPROC __wglewGenlockSourceDelayI3D;
+WGLEW_EXPORT PFNWGLGENLOCKSOURCEEDGEI3DPROC __wglewGenlockSourceEdgeI3D;
+WGLEW_EXPORT PFNWGLGENLOCKSOURCEI3DPROC __wglewGenlockSourceI3D;
+WGLEW_EXPORT PFNWGLGETGENLOCKSAMPLERATEI3DPROC __wglewGetGenlockSampleRateI3D;
+WGLEW_EXPORT PFNWGLGETGENLOCKSOURCEDELAYI3DPROC __wglewGetGenlockSourceDelayI3D;
+WGLEW_EXPORT PFNWGLGETGENLOCKSOURCEEDGEI3DPROC __wglewGetGenlockSourceEdgeI3D;
+WGLEW_EXPORT PFNWGLGETGENLOCKSOURCEI3DPROC __wglewGetGenlockSourceI3D;
+WGLEW_EXPORT PFNWGLISENABLEDGENLOCKI3DPROC __wglewIsEnabledGenlockI3D;
+WGLEW_EXPORT PFNWGLQUERYGENLOCKMAXSOURCEDELAYI3DPROC __wglewQueryGenlockMaxSourceDelayI3D;
+
+WGLEW_EXPORT PFNWGLASSOCIATEIMAGEBUFFEREVENTSI3DPROC __wglewAssociateImageBufferEventsI3D;
+WGLEW_EXPORT PFNWGLCREATEIMAGEBUFFERI3DPROC __wglewCreateImageBufferI3D;
+WGLEW_EXPORT PFNWGLDESTROYIMAGEBUFFERI3DPROC __wglewDestroyImageBufferI3D;
+WGLEW_EXPORT PFNWGLRELEASEIMAGEBUFFEREVENTSI3DPROC __wglewReleaseImageBufferEventsI3D;
+
+WGLEW_EXPORT PFNWGLDISABLEFRAMELOCKI3DPROC __wglewDisableFrameLockI3D;
+WGLEW_EXPORT PFNWGLENABLEFRAMELOCKI3DPROC __wglewEnableFrameLockI3D;
+WGLEW_EXPORT PFNWGLISENABLEDFRAMELOCKI3DPROC __wglewIsEnabledFrameLockI3D;
+WGLEW_EXPORT PFNWGLQUERYFRAMELOCKMASTERI3DPROC __wglewQueryFrameLockMasterI3D;
+
+WGLEW_EXPORT PFNWGLBEGINFRAMETRACKINGI3DPROC __wglewBeginFrameTrackingI3D;
+WGLEW_EXPORT PFNWGLENDFRAMETRACKINGI3DPROC __wglewEndFrameTrackingI3D;
+WGLEW_EXPORT PFNWGLGETFRAMEUSAGEI3DPROC __wglewGetFrameUsageI3D;
+WGLEW_EXPORT PFNWGLQUERYFRAMETRACKINGI3DPROC __wglewQueryFrameTrackingI3D;
+
+WGLEW_EXPORT PFNWGLALLOCATEMEMORYNVPROC __wglewAllocateMemoryNV;
+WGLEW_EXPORT PFNWGLFREEMEMORYNVPROC __wglewFreeMemoryNV;
+
+WGLEW_EXPORT PFNWGLGETMSCRATEOMLPROC __wglewGetMscRateOML;
+WGLEW_EXPORT PFNWGLGETSYNCVALUESOMLPROC __wglewGetSyncValuesOML;
+WGLEW_EXPORT PFNWGLSWAPBUFFERSMSCOMLPROC __wglewSwapBuffersMscOML;
+WGLEW_EXPORT PFNWGLSWAPLAYERBUFFERSMSCOMLPROC __wglewSwapLayerBuffersMscOML;
+WGLEW_EXPORT PFNWGLWAITFORMSCOMLPROC __wglewWaitForMscOML;
+WGLEW_EXPORT PFNWGLWAITFORSBCOMLPROC __wglewWaitForSbcOML;
+WGLEW_EXPORT GLboolean __WGLEW_3DFX_multisample;
+WGLEW_EXPORT GLboolean __WGLEW_3DL_stereo_control;
+WGLEW_EXPORT GLboolean __WGLEW_ARB_buffer_region;
+WGLEW_EXPORT GLboolean __WGLEW_ARB_extensions_string;
+WGLEW_EXPORT GLboolean __WGLEW_ARB_make_current_read;
+WGLEW_EXPORT GLboolean __WGLEW_ARB_multisample;
+WGLEW_EXPORT GLboolean __WGLEW_ARB_pbuffer;
+WGLEW_EXPORT GLboolean __WGLEW_ARB_pixel_format;
+WGLEW_EXPORT GLboolean __WGLEW_ARB_pixel_format_float;
+WGLEW_EXPORT GLboolean __WGLEW_ARB_render_texture;
+WGLEW_EXPORT GLboolean __WGLEW_ATI_pixel_format_float;
+WGLEW_EXPORT GLboolean __WGLEW_ATI_render_texture_rectangle;
+WGLEW_EXPORT GLboolean __WGLEW_EXT_depth_float;
+WGLEW_EXPORT GLboolean __WGLEW_EXT_display_color_table;
+WGLEW_EXPORT GLboolean __WGLEW_EXT_extensions_string;
+WGLEW_EXPORT GLboolean __WGLEW_EXT_make_current_read;
+WGLEW_EXPORT GLboolean __WGLEW_EXT_multisample;
+WGLEW_EXPORT GLboolean __WGLEW_EXT_pbuffer;
+WGLEW_EXPORT GLboolean __WGLEW_EXT_pixel_format;
+WGLEW_EXPORT GLboolean __WGLEW_EXT_swap_control;
+WGLEW_EXPORT GLboolean __WGLEW_I3D_digital_video_control;
+WGLEW_EXPORT GLboolean __WGLEW_I3D_gamma;
+WGLEW_EXPORT GLboolean __WGLEW_I3D_genlock;
+WGLEW_EXPORT GLboolean __WGLEW_I3D_image_buffer;
+WGLEW_EXPORT GLboolean __WGLEW_I3D_swap_frame_lock;
+WGLEW_EXPORT GLboolean __WGLEW_I3D_swap_frame_usage;
+WGLEW_EXPORT GLboolean __WGLEW_NV_float_buffer;
+WGLEW_EXPORT GLboolean __WGLEW_NV_render_depth_texture;
+WGLEW_EXPORT GLboolean __WGLEW_NV_render_texture_rectangle;
+WGLEW_EXPORT GLboolean __WGLEW_NV_vertex_array_range;
+WGLEW_EXPORT GLboolean __WGLEW_OML_sync_control;
+
+#ifdef GLEW_MX
+}; /* WGLEWContextStruct */
+#endif /* GLEW_MX */
+
+/* ------------------------------------------------------------------------- */
+
+#ifdef GLEW_MX
+
+typedef struct WGLEWContextStruct WGLEWContext;
+GLEWAPI GLenum wglewContextInit (WGLEWContext* ctx);
+GLEWAPI GLboolean wglewContextIsSupported (WGLEWContext* ctx, const char* name);
+
+#define wglewInit() wglewContextInit(wglewGetContext())
+#define wglewIsSupported(x) wglewContextIsSupported(wglewGetContext(), x)
+
+#define WGLEW_GET_VAR(x) wglewGetContext()->x
+#define WGLEW_GET_FUN(x) wglewGetContext()->x
+
+#else /* GLEW_MX */
+
+#define WGLEW_GET_VAR(x) x
+#define WGLEW_GET_FUN(x) x
+
+GLEWAPI GLboolean wglewIsSupported (const char* name);
+
+#endif /* GLEW_MX */
+
+GLEWAPI GLboolean wglewGetExtension (const char* name);
+
+#ifdef __cplusplus
+}
+#endif
+
+#undef GLEWAPI
+
+#endif /* __wglew_h__ */
diff --git a/extern/glew/make/msvc_7_0/glew_vc7.vcproj b/extern/glew/make/msvc_7_0/glew_vc7.vcproj
new file mode 100644
index 00000000000..a8141587350
--- /dev/null
+++ b/extern/glew/make/msvc_7_0/glew_vc7.vcproj
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="glew"
+	ProjectGUID="{BAC615B0-F1AF-418B-8D23-A10FD8870D6A}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Blender Debug|Win32"
+			OutputDirectory="..\..\..\..\..\build\msvc_7\extern\glew\debug"
+			IntermediateDirectory="..\..\..\..\..\build\msvc_7\extern\glew\debug"
+			ConfigurationType="4"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				MinimalRebuild="FALSE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\extern\glew\debug\glew.pch"
+				AssemblerListingLocation="..\..\..\..\..\build\msvc_7\extern\glew\debug\"
+				ObjectFile="..\..\..\..\..\build\msvc_7\extern\glew\debug\"
+				ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\extern\glew\debug\"
+				WarningLevel="2"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\..\..\..\..\build\msvc_7\libs\extern\debug\glew.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="Copying GLEW files library (debug target) to lib tree."
+				CommandLine="ECHO Copying header files
+IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\glew\include\GL MKDIR ..\..\..\..\..\build\msvc_7\extern\glew\include\GL
+XCOPY /Y ..\..\include\GL\*.h ..\..\..\..\..\build\msvc_7\extern\glew\include\GL
+ECHO Done
+"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Blender Release|Win32"
+			OutputDirectory="..\..\..\..\..\build\msvc_7\extern\glew"
+			IntermediateDirectory="..\..\..\..\..\build\msvc_7\extern\glew"
+			ConfigurationType="4"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				StringPooling="TRUE"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile="..\..\..\..\..\build\msvc_7\extern\glew\glew.pch"
+				AssemblerListingLocation="..\..\..\..\..\build\msvc_7\extern\glew\"
+				ObjectFile="..\..\..\..\..\build\msvc_7\extern\glew\"
+				ProgramDataBaseFileName="..\..\..\..\..\build\msvc_7\extern\glew\"
+				WarningLevel="2"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\..\..\..\..\build\msvc_7\libs\extern\glew.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="Copying GLEW files library to lib tree."
+				CommandLine="ECHO Copying header files
+IF NOT EXIST ..\..\..\..\..\build\msvc_7\extern\glew\include\GL MKDIR ..\..\..\..\..\build\msvc_7\extern\glew\include\GL
+XCOPY /Y ..\..\include\GL\*.h ..\..\..\..\..\build\msvc_7\extern\glew\include\GL
+ECHO Done
+"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath="..\..\src\glew.c">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath="..\..\include\GL\glew.h">
+			</File>
+			<File
+				RelativePath="..\..\include\GL\glxew.h">
+			</File>
+			<File
+				RelativePath="..\..\include\GL\wglew.h">
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/extern/glew/src/Makefile b/extern/glew/src/Makefile
new file mode 100644
index 00000000000..55cc7cfccad
--- /dev/null
+++ b/extern/glew/src/Makefile
@@ -0,0 +1,56 @@
+#
+# $Id$
+#
+# ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version. The Blender
+# Foundation also sells licenses for use in proprietary software under
+# the Blender License.  See http://www.blender.org/BL/ for information
+# about this.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): none yet.
+#
+# ***** END GPL/BL DUAL LICENSE BLOCK *****
+#
+#
+
+LIBNAME = glew
+DIR = $(OCGDIR)/extern/$(LIBNAME)
+
+CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
+
+CPPFLAGS += -I../include
+
+CSRCS = glew.c
+CCSRCS = 
+include nan_compile.mk 
+
+install: all debug
+	@[ -d $(NAN_GLEW) ] || mkdir -p $(NAN_GLEW)
+	@[ -d $(NAN_GLEW)/include/GL ] || mkdir -p $(NAN_GLEW)/include/GL
+	@[ -d $(NAN_GLEW)/lib ] || mkdir -p $(NAN_GLEW)/lib
+	@[ -d $(NAN_GLEW)/lib/debug ] || mkdir -p $(NAN_GLEW)/lib/debug
+	@$(NANBLENDERHOME)/intern/tools/cpifdiff.sh $(DIR)/lib$(LIBNAME).a $(NAN_GLEW)/lib/
+ifeq ($(OS),darwin)
+	ranlib $(NAN_GLEW)/lib/lib$(LIBNAME).a
+	ranlib $(NAN_GLEW)/lib/lib$(LIBNAME).a
+endif
+	@$(NANBLENDERHOME)/intern/tools/cpifdiff.sh ../include/GL/*.h $(NAN_GLEW)/include/GL
+
diff --git a/extern/glew/src/glew.c b/extern/glew/src/glew.c
new file mode 100644
index 00000000000..593f0e58f7c
--- /dev/null
+++ b/extern/glew/src/glew.c
@@ -0,0 +1,9756 @@
+/*
+** The OpenGL Extension Wrangler Library
+** Copyright (C) 2002-2006, Milan Ikits <milan ikits[]ieee org>
+** Copyright (C) 2002-2006, Marcelo E. Magallon <mmagallo[]debian org>
+** Copyright (C) 2002, Lev Povalahev
+** All rights reserved.
+** 
+** Redistribution and use in source and binary forms, with or without 
+** modification, are permitted provided that the following conditions are met:
+** 
+** * Redistributions of source code must retain the above copyright notice, 
+**   this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright notice, 
+**   this list of conditions and the following disclaimer in the documentation 
+**   and/or other materials provided with the distribution.
+** * The name of the author may be used to endorse or promote products 
+**   derived from this software without specific prior written permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+** ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
+** LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+** CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+** SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+** INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+** CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+** ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+** THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include <GL/glew.h>
+#if defined(_WIN32)
+#  include <GL/wglew.h>
+#elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
+#  include <GL/glxew.h>
+#endif
+
+/*
+ * Define glewGetContext and related helper macros.
+ */
+#ifdef GLEW_MX
+#  define glewGetContext() ctx
+#  ifdef _WIN32
+#    define GLEW_CONTEXT_ARG_DEF_INIT GLEWContext* ctx
+#    define GLEW_CONTEXT_ARG_VAR_INIT ctx
+#    define wglewGetContext() ctx
+#    define WGLEW_CONTEXT_ARG_DEF_INIT WGLEWContext* ctx
+#    define WGLEW_CONTEXT_ARG_DEF_LIST WGLEWContext* ctx
+#  else /* _WIN32 */
+#    define GLEW_CONTEXT_ARG_DEF_INIT void
+#    define GLEW_CONTEXT_ARG_VAR_INIT
+#    define glxewGetContext() ctx
+#    define GLXEW_CONTEXT_ARG_DEF_INIT void
+#    define GLXEW_CONTEXT_ARG_DEF_LIST GLXEWContext* ctx
+#  endif /* _WIN32 */
+#  define GLEW_CONTEXT_ARG_DEF_LIST GLEWContext* ctx
+#else /* GLEW_MX */
+#  define GLEW_CONTEXT_ARG_DEF_INIT void
+#  define GLEW_CONTEXT_ARG_VAR_INIT
+#  define GLEW_CONTEXT_ARG_DEF_LIST void
+#  define WGLEW_CONTEXT_ARG_DEF_INIT void
+#  define WGLEW_CONTEXT_ARG_DEF_LIST void
+#  define GLXEW_CONTEXT_ARG_DEF_INIT void
+#  define GLXEW_CONTEXT_ARG_DEF_LIST void
+#endif /* GLEW_MX */
+
+#if defined(__APPLE__)
+#include <mach-o/dyld.h>
+#include <stdlib.h>
+#include <string.h>
+
+void* NSGLGetProcAddress (const GLubyte *name)
+{
+  NSSymbol symbol;
+  char* symbolName;
+  /* prepend a '_' for the Unix C symbol mangling convention */
+  symbolName = malloc(strlen((const char*)name) + 2);
+  strcpy(symbolName+1, (const char*)name);
+  symbolName[0] = '_';
+  symbol = NULL;
+  if (NSIsSymbolNameDefined(symbolName))
+    symbol = NSLookupAndBindSymbol(symbolName);
+  free(symbolName);
+  return symbol ? NSAddressOfSymbol(symbol) : NULL;
+}
+#endif /* __APPLE__ */
+
+#if defined(__sgi) || defined (__sun)
+#include <dlfcn.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+void* dlGetProcAddress (const GLubyte* name)
+{
+  static void* h = NULL;
+  static void* gpa;
+
+  if (h == NULL)
+  {
+    if ((h = dlopen(NULL, RTLD_LAZY | RTLD_LOCAL)) == NULL) return NULL;
+    gpa = dlsym(h, "glXGetProcAddress");
+  }
+
+  if (gpa != NULL)
+    return ((void*(*)(const GLubyte*))gpa)(name);
+  else
+    return dlsym(h, (const char*)name);
+}
+#endif /* __sgi || __sun */
+
+/*
+ * Define glewGetProcAddress.
+ */
+#if defined(_WIN32)
+#  define glewGetProcAddress(name) wglGetProcAddress((LPCSTR)name)
+#else
+#  if defined(__APPLE__)
+#    define glewGetProcAddress(name) NSGLGetProcAddress(name)
+#  else
+#    if defined(__sgi) || defined(__sun)
+#      define glewGetProcAddress(name) dlGetProcAddress(name)
+#    else /* __linux */
+#      define glewGetProcAddress(name) (*glXGetProcAddressARB)(name)
+#    endif
+#  endif
+#endif
+
+/*
+ * GLEW, just like OpenGL or GLU, does not rely on the standard C library.
+ * These functions implement the functionality required in this file.
+ */
+
+static GLuint _glewStrLen (const GLubyte* s)
+{
+  GLuint i=0;
+  if (s == NULL) return 0;
+  while (s[i] != '\0') i++;
+  return i;
+}
+
+static GLuint _glewStrCLen (const GLubyte* s, GLubyte c)
+{
+  GLuint i=0;
+  if (s == NULL) return 0;
+  while (s[i] != '\0' && s[i] != c) i++;
+  return s[i] == c ? i : 0;
+}
+
+static GLboolean _glewStrSame (const GLubyte* a, const GLubyte* b, GLuint n)
+{
+  GLuint i=0;
+  if(a == NULL || b == NULL)
+    return (a == NULL && b == NULL && n == 0) ? GL_TRUE : GL_FALSE;
+  while (i < n && a[i] != '\0' && b[i] != '\0' && a[i] == b[i]) i++;
+  return i == n ? GL_TRUE : GL_FALSE;
+}
+
+static GLboolean _glewStrSame1 (GLubyte** a, GLuint* na, const GLubyte* b, GLuint nb)
+{
+  while (*na > 0 && (**a == ' ' || **a == '\n' || **a == '\r' || **a == '\t'))
+  {
+    (*a)++;
+    (*na)--;
+  }
+  if(*na >= nb)
+  {
+    GLuint i=0;
+    while (i < nb && (*a)+i != NULL && b+i != NULL && (*a)[i] == b[i]) i++;
+	if(i == nb)
+	{
+		*a = *a + nb;
+		*na = *na - nb;
+		return GL_TRUE;
+	}
+  }
+  return GL_FALSE;
+}
+
+static GLboolean _glewStrSame2 (GLubyte** a, GLuint* na, const GLubyte* b, GLuint nb)
+{
+  if(*na >= nb)
+  {
+    GLuint i=0;
+    while (i < nb && (*a)+i != NULL && b+i != NULL && (*a)[i] == b[i]) i++;
+	if(i == nb)
+	{
+		*a = *a + nb;
+		*na = *na - nb;
+		return GL_TRUE;
+	}
+  }
+  return GL_FALSE;
+}
+
+static GLboolean _glewStrSame3 (GLubyte** a, GLuint* na, const GLubyte* b, GLuint nb)
+{
+  if(*na >= nb)
+  {
+    GLuint i=0;
+    while (i < nb && (*a)+i != NULL && b+i != NULL && (*a)[i] == b[i]) i++;
+    if (i == nb && (*na == nb || (*a)[i] == ' ' || (*a)[i] == '\n' || (*a)[i] == '\r' || (*a)[i] == '\t'))
+    {
+      *a = *a + nb;
+      *na = *na - nb;
+      return GL_TRUE;
+    }
+  }
+  return GL_FALSE;
+}
+
+#if !defined(_WIN32) || !defined(GLEW_MX)
+
+PFNGLCOPYTEXSUBIMAGE3DPROC __glewCopyTexSubImage3D = NULL;
+PFNGLDRAWRANGEELEMENTSPROC __glewDrawRangeElements = NULL;
+PFNGLTEXIMAGE3DPROC __glewTexImage3D = NULL;
+PFNGLTEXSUBIMAGE3DPROC __glewTexSubImage3D = NULL;
+
+PFNGLACTIVETEXTUREPROC __glewActiveTexture = NULL;
+PFNGLCLIENTACTIVETEXTUREPROC __glewClientActiveTexture = NULL;
+PFNGLCOMPRESSEDTEXIMAGE1DPROC __glewCompressedTexImage1D = NULL;
+PFNGLCOMPRESSEDTEXIMAGE2DPROC __glewCompressedTexImage2D = NULL;
+PFNGLCOMPRESSEDTEXIMAGE3DPROC __glewCompressedTexImage3D = NULL;
+PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC __glewCompressedTexSubImage1D = NULL;
+PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC __glewCompressedTexSubImage2D = NULL;
+PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC __glewCompressedTexSubImage3D = NULL;
+PFNGLGETCOMPRESSEDTEXIMAGEPROC __glewGetCompressedTexImage = NULL;
+PFNGLLOADTRANSPOSEMATRIXDPROC __glewLoadTransposeMatrixd = NULL;
+PFNGLLOADTRANSPOSEMATRIXFPROC __glewLoadTransposeMatrixf = NULL;
+PFNGLMULTTRANSPOSEMATRIXDPROC __glewMultTransposeMatrixd = NULL;
+PFNGLMULTTRANSPOSEMATRIXFPROC __glewMultTransposeMatrixf = NULL;
+PFNGLMULTITEXCOORD1DPROC __glewMultiTexCoord1d = NULL;
+PFNGLMULTITEXCOORD1DVPROC __glewMultiTexCoord1dv = NULL;
+PFNGLMULTITEXCOORD1FPROC __glewMultiTexCoord1f = NULL;
+PFNGLMULTITEXCOORD1FVPROC __glewMultiTexCoord1fv = NULL;
+PFNGLMULTITEXCOORD1IPROC __glewMultiTexCoord1i = NULL;
+PFNGLMULTITEXCOORD1IVPROC __glewMultiTexCoord1iv = NULL;
+PFNGLMULTITEXCOORD1SPROC __glewMultiTexCoord1s = NULL;
+PFNGLMULTITEXCOORD1SVPROC __glewMultiTexCoord1sv = NULL;
+PFNGLMULTITEXCOORD2DPROC __glewMultiTexCoord2d = NULL;
+PFNGLMULTITEXCOORD2DVPROC __glewMultiTexCoord2dv = NULL;
+PFNGLMULTITEXCOORD2FPROC __glewMultiTexCoord2f = NULL;
+PFNGLMULTITEXCOORD2FVPROC __glewMultiTexCoord2fv = NULL;
+PFNGLMULTITEXCOORD2IPROC __glewMultiTexCoord2i = NULL;
+PFNGLMULTITEXCOORD2IVPROC __glewMultiTexCoord2iv = NULL;
+PFNGLMULTITEXCOORD2SPROC __glewMultiTexCoord2s = NULL;
+PFNGLMULTITEXCOORD2SVPROC __glewMultiTexCoord2sv = NULL;
+PFNGLMULTITEXCOORD3DPROC __glewMultiTexCoord3d = NULL;
+PFNGLMULTITEXCOORD3DVPROC __glewMultiTexCoord3dv = NULL;
+PFNGLMULTITEXCOORD3FPROC __glewMultiTexCoord3f = NULL;
+PFNGLMULTITEXCOORD3FVPROC __glewMultiTexCoord3fv = NULL;
+PFNGLMULTITEXCOORD3IPROC __glewMultiTexCoord3i = NULL;
+PFNGLMULTITEXCOORD3IVPROC __glewMultiTexCoord3iv = NULL;
+PFNGLMULTITEXCOORD3SPROC __glewMultiTexCoord3s = NULL;
+PFNGLMULTITEXCOORD3SVPROC __glewMultiTexCoord3sv = NULL;
+PFNGLMULTITEXCOORD4DPROC __glewMultiTexCoord4d = NULL;
+PFNGLMULTITEXCOORD4DVPROC __glewMultiTexCoord4dv = NULL;
+PFNGLMULTITEXCOORD4FPROC __glewMultiTexCoord4f = NULL;
+PFNGLMULTITEXCOORD4FVPROC __glewMultiTexCoord4fv = NULL;
+PFNGLMULTITEXCOORD4IPROC __glewMultiTexCoord4i = NULL;
+PFNGLMULTITEXCOORD4IVPROC __glewMultiTexCoord4iv = NULL;
+PFNGLMULTITEXCOORD4SPROC __glewMultiTexCoord4s = NULL;
+PFNGLMULTITEXCOORD4SVPROC __glewMultiTexCoord4sv = NULL;
+PFNGLSAMPLECOVERAGEPROC __glewSampleCoverage = NULL;
+
+PFNGLBLENDCOLORPROC __glewBlendColor = NULL;
+PFNGLBLENDEQUATIONPROC __glewBlendEquation = NULL;
+PFNGLBLENDFUNCSEPARATEPROC __glewBlendFuncSeparate = NULL;
+PFNGLFOGCOORDPOINTERPROC __glewFogCoordPointer = NULL;
+PFNGLFOGCOORDDPROC __glewFogCoordd = NULL;
+PFNGLFOGCOORDDVPROC __glewFogCoorddv = NULL;
+PFNGLFOGCOORDFPROC __glewFogCoordf = NULL;
+PFNGLFOGCOORDFVPROC __glewFogCoordfv = NULL;
+PFNGLMULTIDRAWARRAYSPROC __glewMultiDrawArrays = NULL;
+PFNGLMULTIDRAWELEMENTSPROC __glewMultiDrawElements = NULL;
+PFNGLPOINTPARAMETERFPROC __glewPointParameterf = NULL;
+PFNGLPOINTPARAMETERFVPROC __glewPointParameterfv = NULL;
+PFNGLSECONDARYCOLOR3BPROC __glewSecondaryColor3b = NULL;
+PFNGLSECONDARYCOLOR3BVPROC __glewSecondaryColor3bv = NULL;
+PFNGLSECONDARYCOLOR3DPROC __glewSecondaryColor3d = NULL;
+PFNGLSECONDARYCOLOR3DVPROC __glewSecondaryColor3dv = NULL;
+PFNGLSECONDARYCOLOR3FPROC __glewSecondaryColor3f = NULL;
+PFNGLSECONDARYCOLOR3FVPROC __glewSecondaryColor3fv = NULL;
+PFNGLSECONDARYCOLOR3IPROC __glewSecondaryColor3i = NULL;
+PFNGLSECONDARYCOLOR3IVPROC __glewSecondaryColor3iv = NULL;
+PFNGLSECONDARYCOLOR3SPROC __glewSecondaryColor3s = NULL;
+PFNGLSECONDARYCOLOR3SVPROC __glewSecondaryColor3sv = NULL;
+PFNGLSECONDARYCOLOR3UBPROC __glewSecondaryColor3ub = NULL;
+PFNGLSECONDARYCOLOR3UBVPROC __glewSecondaryColor3ubv = NULL;
+PFNGLSECONDARYCOLOR3UIPROC __glewSecondaryColor3ui = NULL;
+PFNGLSECONDARYCOLOR3UIVPROC __glewSecondaryColor3uiv = NULL;
+PFNGLSECONDARYCOLOR3USPROC __glewSecondaryColor3us = NULL;
+PFNGLSECONDARYCOLOR3USVPROC __glewSecondaryColor3usv = NULL;
+PFNGLSECONDARYCOLORPOINTERPROC __glewSecondaryColorPointer = NULL;
+PFNGLWINDOWPOS2DPROC __glewWindowPos2d = NULL;
+PFNGLWINDOWPOS2DVPROC __glewWindowPos2dv = NULL;
+PFNGLWINDOWPOS2FPROC __glewWindowPos2f = NULL;
+PFNGLWINDOWPOS2FVPROC __glewWindowPos2fv = NULL;
+PFNGLWINDOWPOS2IPROC __glewWindowPos2i = NULL;
+PFNGLWINDOWPOS2IVPROC __glewWindowPos2iv = NULL;
+PFNGLWINDOWPOS2SPROC __glewWindowPos2s = NULL;
+PFNGLWINDOWPOS2SVPROC __glewWindowPos2sv = NULL;
+PFNGLWINDOWPOS3DPROC __glewWindowPos3d = NULL;
+PFNGLWINDOWPOS3DVPROC __glewWindowPos3dv = NULL;
+PFNGLWINDOWPOS3FPROC __glewWindowPos3f = NULL;
+PFNGLWINDOWPOS3FVPROC __glewWindowPos3fv = NULL;
+PFNGLWINDOWPOS3IPROC __glewWindowPos3i = NULL;
+PFNGLWINDOWPOS3IVPROC __glewWindowPos3iv = NULL;
+PFNGLWINDOWPOS3SPROC __glewWindowPos3s = NULL;
+PFNGLWINDOWPOS3SVPROC __glewWindowPos3sv = NULL;
+
+PFNGLBEGINQUERYPROC __glewBeginQuery = NULL;
+PFNGLBINDBUFFERPROC __glewBindBuffer = NULL;
+PFNGLBUFFERDATAPROC __glewBufferData = NULL;
+PFNGLBUFFERSUBDATAPROC __glewBufferSubData = NULL;
+PFNGLDELETEBUFFERSPROC __glewDeleteBuffers = NULL;
+PFNGLDELETEQUERIESPROC __glewDeleteQueries = NULL;
+PFNGLENDQUERYPROC __glewEndQuery = NULL;
+PFNGLGENBUFFERSPROC __glewGenBuffers = NULL;
+PFNGLGENQUERIESPROC __glewGenQueries = NULL;
+PFNGLGETBUFFERPARAMETERIVPROC __glewGetBufferParameteriv = NULL;
+PFNGLGETBUFFERPOINTERVPROC __glewGetBufferPointerv = NULL;
+PFNGLGETBUFFERSUBDATAPROC __glewGetBufferSubData = NULL;
+PFNGLGETQUERYOBJECTIVPROC __glewGetQueryObjectiv = NULL;
+PFNGLGETQUERYOBJECTUIVPROC __glewGetQueryObjectuiv = NULL;
+PFNGLGETQUERYIVPROC __glewGetQueryiv = NULL;
+PFNGLISBUFFERPROC __glewIsBuffer = NULL;
+PFNGLISQUERYPROC __glewIsQuery = NULL;
+PFNGLMAPBUFFERPROC __glewMapBuffer = NULL;
+PFNGLUNMAPBUFFERPROC __glewUnmapBuffer = NULL;
+
+PFNGLATTACHSHADERPROC __glewAttachShader = NULL;
+PFNGLBINDATTRIBLOCATIONPROC __glewBindAttribLocation = NULL;
+PFNGLBLENDEQUATIONSEPARATEPROC __glewBlendEquationSeparate = NULL;
+PFNGLCOMPILESHADERPROC __glewCompileShader = NULL;
+PFNGLCREATEPROGRAMPROC __glewCreateProgram = NULL;
+PFNGLCREATESHADERPROC __glewCreateShader = NULL;
+PFNGLDELETEPROGRAMPROC __glewDeleteProgram = NULL;
+PFNGLDELETESHADERPROC __glewDeleteShader = NULL;
+PFNGLDETACHSHADERPROC __glewDetachShader = NULL;
+PFNGLDISABLEVERTEXATTRIBARRAYPROC __glewDisableVertexAttribArray = NULL;
+PFNGLDRAWBUFFERSPROC __glewDrawBuffers = NULL;
+PFNGLENABLEVERTEXATTRIBARRAYPROC __glewEnableVertexAttribArray = NULL;
+PFNGLGETACTIVEATTRIBPROC __glewGetActiveAttrib = NULL;
+PFNGLGETACTIVEUNIFORMPROC __glewGetActiveUniform = NULL;
+PFNGLGETATTACHEDSHADERSPROC __glewGetAttachedShaders = NULL;
+PFNGLGETATTRIBLOCATIONPROC __glewGetAttribLocation = NULL;
+PFNGLGETPROGRAMINFOLOGPROC __glewGetProgramInfoLog = NULL;
+PFNGLGETPROGRAMIVPROC __glewGetProgramiv = NULL;
+PFNGLGETSHADERINFOLOGPROC __glewGetShaderInfoLog = NULL;
+PFNGLGETSHADERSOURCEPROC __glewGetShaderSource = NULL;
+PFNGLGETSHADERIVPROC __glewGetShaderiv = NULL;
+PFNGLGETUNIFORMLOCATIONPROC __glewGetUniformLocation = NULL;
+PFNGLGETUNIFORMFVPROC __glewGetUniformfv = NULL;
+PFNGLGETUNIFORMIVPROC __glewGetUniformiv = NULL;
+PFNGLGETVERTEXATTRIBPOINTERVPROC __glewGetVertexAttribPointerv = NULL;
+PFNGLGETVERTEXATTRIBDVPROC __glewGetVertexAttribdv = NULL;
+PFNGLGETVERTEXATTRIBFVPROC __glewGetVertexAttribfv = NULL;
+PFNGLGETVERTEXATTRIBIVPROC __glewGetVertexAttribiv = NULL;
+PFNGLISPROGRAMPROC __glewIsProgram = NULL;
+PFNGLISSHADERPROC __glewIsShader = NULL;
+PFNGLLINKPROGRAMPROC __glewLinkProgram = NULL;
+PFNGLSHADERSOURCEPROC __glewShaderSource = NULL;
+PFNGLSTENCILFUNCSEPARATEPROC __glewStencilFuncSeparate = NULL;
+PFNGLSTENCILMASKSEPARATEPROC __glewStencilMaskSeparate = NULL;
+PFNGLSTENCILOPSEPARATEPROC __glewStencilOpSeparate = NULL;
+PFNGLUNIFORM1FPROC __glewUniform1f = NULL;
+PFNGLUNIFORM1FVPROC __glewUniform1fv = NULL;
+PFNGLUNIFORM1IPROC __glewUniform1i = NULL;
+PFNGLUNIFORM1IVPROC __glewUniform1iv = NULL;
+PFNGLUNIFORM2FPROC __glewUniform2f = NULL;
+PFNGLUNIFORM2FVPROC __glewUniform2fv = NULL;
+PFNGLUNIFORM2IPROC __glewUniform2i = NULL;
+PFNGLUNIFORM2IVPROC __glewUniform2iv = NULL;
+PFNGLUNIFORM3FPROC __glewUniform3f = NULL;
+PFNGLUNIFORM3FVPROC __glewUniform3fv = NULL;
+PFNGLUNIFORM3IPROC __glewUniform3i = NULL;
+PFNGLUNIFORM3IVPROC __glewUniform3iv = NULL;
+PFNGLUNIFORM4FPROC __glewUniform4f = NULL;
+PFNGLUNIFORM4FVPROC __glewUniform4fv = NULL;
+PFNGLUNIFORM4IPROC __glewUniform4i = NULL;
+PFNGLUNIFORM4IVPROC __glewUniform4iv = NULL;
+PFNGLUNIFORMMATRIX2FVPROC __glewUniformMatrix2fv = NULL;
+PFNGLUNIFORMMATRIX3FVPROC __glewUniformMatrix3fv = NULL;
+PFNGLUNIFORMMATRIX4FVPROC __glewUniformMatrix4fv = NULL;
+PFNGLUSEPROGRAMPROC __glewUseProgram = NULL;
+PFNGLVALIDATEPROGRAMPROC __glewValidateProgram = NULL;
+PFNGLVERTEXATTRIB1DPROC __glewVertexAttrib1d = NULL;
+PFNGLVERTEXATTRIB1DVPROC __glewVertexAttrib1dv = NULL;
+PFNGLVERTEXATTRIB1FPROC __glewVertexAttrib1f = NULL;
+PFNGLVERTEXATTRIB1FVPROC __glewVertexAttrib1fv = NULL;
+PFNGLVERTEXATTRIB1SPROC __glewVertexAttrib1s = NULL;
+PFNGLVERTEXATTRIB1SVPROC __glewVertexAttrib1sv = NULL;
+PFNGLVERTEXATTRIB2DPROC __glewVertexAttrib2d = NULL;
+PFNGLVERTEXATTRIB2DVPROC __glewVertexAttrib2dv = NULL;
+PFNGLVERTEXATTRIB2FPROC __glewVertexAttrib2f = NULL;
+PFNGLVERTEXATTRIB2FVPROC __glewVertexAttrib2fv = NULL;
+PFNGLVERTEXATTRIB2SPROC __glewVertexAttrib2s = NULL;
+PFNGLVERTEXATTRIB2SVPROC __glewVertexAttrib2sv = NULL;
+PFNGLVERTEXATTRIB3DPROC __glewVertexAttrib3d = NULL;
+PFNGLVERTEXATTRIB3DVPROC __glewVertexAttrib3dv = NULL;
+PFNGLVERTEXATTRIB3FPROC __glewVertexAttrib3f = NULL;
+PFNGLVERTEXATTRIB3FVPROC __glewVertexAttrib3fv = NULL;
+PFNGLVERTEXATTRIB3SPROC __glewVertexAttrib3s = NULL;
+PFNGLVERTEXATTRIB3SVPROC __glewVertexAttrib3sv = NULL;
+PFNGLVERTEXATTRIB4NBVPROC __glewVertexAttrib4Nbv = NULL;
+PFNGLVERTEXATTRIB4NIVPROC __glewVertexAttrib4Niv = NULL;
+PFNGLVERTEXATTRIB4NSVPROC __glewVertexAttrib4Nsv = NULL;
+PFNGLVERTEXATTRIB4NUBPROC __glewVertexAttrib4Nub = NULL;
+PFNGLVERTEXATTRIB4NUBVPROC __glewVertexAttrib4Nubv = NULL;
+PFNGLVERTEXATTRIB4NUIVPROC __glewVertexAttrib4Nuiv = NULL;
+PFNGLVERTEXATTRIB4NUSVPROC __glewVertexAttrib4Nusv = NULL;
+PFNGLVERTEXATTRIB4BVPROC __glewVertexAttrib4bv = NULL;
+PFNGLVERTEXATTRIB4DPROC __glewVertexAttrib4d = NULL;
+PFNGLVERTEXATTRIB4DVPROC __glewVertexAttrib4dv = NULL;
+PFNGLVERTEXATTRIB4FPROC __glewVertexAttrib4f = NULL;
+PFNGLVERTEXATTRIB4FVPROC __glewVertexAttrib4fv = NULL;
+PFNGLVERTEXATTRIB4IVPROC __glewVertexAttrib4iv = NULL;
+PFNGLVERTEXATTRIB4SPROC __glewVertexAttrib4s = NULL;
+PFNGLVERTEXATTRIB4SVPROC __glewVertexAttrib4sv = NULL;
+PFNGLVERTEXATTRIB4UBVPROC __glewVertexAttrib4ubv = NULL;
+PFNGLVERTEXATTRIB4UIVPROC __glewVertexAttrib4uiv = NULL;
+PFNGLVERTEXATTRIB4USVPROC __glewVertexAttrib4usv = NULL;
+PFNGLVERTEXATTRIBPOINTERPROC __glewVertexAttribPointer = NULL;
+
+PFNGLTBUFFERMASK3DFXPROC __glewTbufferMask3DFX = NULL;
+
+PFNGLDRAWELEMENTARRAYAPPLEPROC __glewDrawElementArrayAPPLE = NULL;
+PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC __glewDrawRangeElementArrayAPPLE = NULL;
+PFNGLELEMENTPOINTERAPPLEPROC __glewElementPointerAPPLE = NULL;
+PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC __glewMultiDrawElementArrayAPPLE = NULL;
+PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC __glewMultiDrawRangeElementArrayAPPLE = NULL;
+
+PFNGLDELETEFENCESAPPLEPROC __glewDeleteFencesAPPLE = NULL;
+PFNGLFINISHFENCEAPPLEPROC __glewFinishFenceAPPLE = NULL;
+PFNGLFINISHOBJECTAPPLEPROC __glewFinishObjectAPPLE = NULL;
+PFNGLGENFENCESAPPLEPROC __glewGenFencesAPPLE = NULL;
+PFNGLISFENCEAPPLEPROC __glewIsFenceAPPLE = NULL;
+PFNGLSETFENCEAPPLEPROC __glewSetFenceAPPLE = NULL;
+PFNGLTESTFENCEAPPLEPROC __glewTestFenceAPPLE = NULL;
+PFNGLTESTOBJECTAPPLEPROC __glewTestObjectAPPLE = NULL;
+
+PFNGLGETTEXPARAMETERPOINTERVAPPLEPROC __glewGetTexParameterPointervAPPLE = NULL;
+PFNGLTEXTURERANGEAPPLEPROC __glewTextureRangeAPPLE = NULL;
+
+PFNGLBINDVERTEXARRAYAPPLEPROC __glewBindVertexArrayAPPLE = NULL;
+PFNGLDELETEVERTEXARRAYSAPPLEPROC __glewDeleteVertexArraysAPPLE = NULL;
+PFNGLGENVERTEXARRAYSAPPLEPROC __glewGenVertexArraysAPPLE = NULL;
+PFNGLISVERTEXARRAYAPPLEPROC __glewIsVertexArrayAPPLE = NULL;
+
+PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC __glewFlushVertexArrayRangeAPPLE = NULL;
+PFNGLVERTEXARRAYPARAMETERIAPPLEPROC __glewVertexArrayParameteriAPPLE = NULL;
+PFNGLVERTEXARRAYRANGEAPPLEPROC __glewVertexArrayRangeAPPLE = NULL;
+
+PFNGLCLAMPCOLORARBPROC __glewClampColorARB = NULL;
+
+PFNGLDRAWBUFFERSARBPROC __glewDrawBuffersARB = NULL;
+
+PFNGLCOLORSUBTABLEPROC __glewColorSubTable = NULL;
+PFNGLCOLORTABLEPROC __glewColorTable = NULL;
+PFNGLCOLORTABLEPARAMETERFVPROC __glewColorTableParameterfv = NULL;
+PFNGLCOLORTABLEPARAMETERIVPROC __glewColorTableParameteriv = NULL;
+PFNGLCONVOLUTIONFILTER1DPROC __glewConvolutionFilter1D = NULL;
+PFNGLCONVOLUTIONFILTER2DPROC __glewConvolutionFilter2D = NULL;
+PFNGLCONVOLUTIONPARAMETERFPROC __glewConvolutionParameterf = NULL;
+PFNGLCONVOLUTIONPARAMETERFVPROC __glewConvolutionParameterfv = NULL;
+PFNGLCONVOLUTIONPARAMETERIPROC __glewConvolutionParameteri = NULL;
+PFNGLCONVOLUTIONPARAMETERIVPROC __glewConvolutionParameteriv = NULL;
+PFNGLCOPYCOLORSUBTABLEPROC __glewCopyColorSubTable = NULL;
+PFNGLCOPYCOLORTABLEPROC __glewCopyColorTable = NULL;
+PFNGLCOPYCONVOLUTIONFILTER1DPROC __glewCopyConvolutionFilter1D = NULL;
+PFNGLCOPYCONVOLUTIONFILTER2DPROC __glewCopyConvolutionFilter2D = NULL;
+PFNGLGETCOLORTABLEPROC __glewGetColorTable = NULL;
+PFNGLGETCOLORTABLEPARAMETERFVPROC __glewGetColorTableParameterfv = NULL;
+PFNGLGETCOLORTABLEPARAMETERIVPROC __glewGetColorTableParameteriv = NULL;
+PFNGLGETCONVOLUTIONFILTERPROC __glewGetConvolutionFilter = NULL;
+PFNGLGETCONVOLUTIONPARAMETERFVPROC __glewGetConvolutionParameterfv = NULL;
+PFNGLGETCONVOLUTIONPARAMETERIVPROC __glewGetConvolutionParameteriv = NULL;
+PFNGLGETHISTOGRAMPROC __glewGetHistogram = NULL;
+PFNGLGETHISTOGRAMPARAMETERFVPROC __glewGetHistogramParameterfv = NULL;
+PFNGLGETHISTOGRAMPARAMETERIVPROC __glewGetHistogramParameteriv = NULL;
+PFNGLGETMINMAXPROC __glewGetMinmax = NULL;
+PFNGLGETMINMAXPARAMETERFVPROC __glewGetMinmaxParameterfv = NULL;
+PFNGLGETMINMAXPARAMETERIVPROC __glewGetMinmaxParameteriv = NULL;
+PFNGLGETSEPARABLEFILTERPROC __glewGetSeparableFilter = NULL;
+PFNGLHISTOGRAMPROC __glewHistogram = NULL;
+PFNGLMINMAXPROC __glewMinmax = NULL;
+PFNGLRESETHISTOGRAMPROC __glewResetHistogram = NULL;
+PFNGLRESETMINMAXPROC __glewResetMinmax = NULL;
+PFNGLSEPARABLEFILTER2DPROC __glewSeparableFilter2D = NULL;
+
+PFNGLCURRENTPALETTEMATRIXARBPROC __glewCurrentPaletteMatrixARB = NULL;
+PFNGLMATRIXINDEXPOINTERARBPROC __glewMatrixIndexPointerARB = NULL;
+PFNGLMATRIXINDEXUBVARBPROC __glewMatrixIndexubvARB = NULL;
+PFNGLMATRIXINDEXUIVARBPROC __glewMatrixIndexuivARB = NULL;
+PFNGLMATRIXINDEXUSVARBPROC __glewMatrixIndexusvARB = NULL;
+
+PFNGLSAMPLECOVERAGEARBPROC __glewSampleCoverageARB = NULL;
+
+PFNGLACTIVETEXTUREARBPROC __glewActiveTextureARB = NULL;
+PFNGLCLIENTACTIVETEXTUREARBPROC __glewClientActiveTextureARB = NULL;
+PFNGLMULTITEXCOORD1DARBPROC __glewMultiTexCoord1dARB = NULL;
+PFNGLMULTITEXCOORD1DVARBPROC __glewMultiTexCoord1dvARB = NULL;
+PFNGLMULTITEXCOORD1FARBPROC __glewMultiTexCoord1fARB = NULL;
+PFNGLMULTITEXCOORD1FVARBPROC __glewMultiTexCoord1fvARB = NULL;
+PFNGLMULTITEXCOORD1IARBPROC __glewMultiTexCoord1iARB = NULL;
+PFNGLMULTITEXCOORD1IVARBPROC __glewMultiTexCoord1ivARB = NULL;
+PFNGLMULTITEXCOORD1SARBPROC __glewMultiTexCoord1sARB = NULL;
+PFNGLMULTITEXCOORD1SVARBPROC __glewMultiTexCoord1svARB = NULL;
+PFNGLMULTITEXCOORD2DARBPROC __glewMultiTexCoord2dARB = NULL;
+PFNGLMULTITEXCOORD2DVARBPROC __glewMultiTexCoord2dvARB = NULL;
+PFNGLMULTITEXCOORD2FARBPROC __glewMultiTexCoord2fARB = NULL;
+PFNGLMULTITEXCOORD2FVARBPROC __glewMultiTexCoord2fvARB = NULL;
+PFNGLMULTITEXCOORD2IARBPROC __glewMultiTexCoord2iARB = NULL;
+PFNGLMULTITEXCOORD2IVARBPROC __glewMultiTexCoord2ivARB = NULL;
+PFNGLMULTITEXCOORD2SARBPROC __glewMultiTexCoord2sARB = NULL;
+PFNGLMULTITEXCOORD2SVARBPROC __glewMultiTexCoord2svARB = NULL;
+PFNGLMULTITEXCOORD3DARBPROC __glewMultiTexCoord3dARB = NULL;
+PFNGLMULTITEXCOORD3DVARBPROC __glewMultiTexCoord3dvARB = NULL;
+PFNGLMULTITEXCOORD3FARBPROC __glewMultiTexCoord3fARB = NULL;
+PFNGLMULTITEXCOORD3FVARBPROC __glewMultiTexCoord3fvARB = NULL;
+PFNGLMULTITEXCOORD3IARBPROC __glewMultiTexCoord3iARB = NULL;
+PFNGLMULTITEXCOORD3IVARBPROC __glewMultiTexCoord3ivARB = NULL;
+PFNGLMULTITEXCOORD3SARBPROC __glewMultiTexCoord3sARB = NULL;
+PFNGLMULTITEXCOORD3SVARBPROC __glewMultiTexCoord3svARB = NULL;
+PFNGLMULTITEXCOORD4DARBPROC __glewMultiTexCoord4dARB = NULL;
+PFNGLMULTITEXCOORD4DVARBPROC __glewMultiTexCoord4dvARB = NULL;
+PFNGLMULTITEXCOORD4FARBPROC __glewMultiTexCoord4fARB = NULL;
+PFNGLMULTITEXCOORD4FVARBPROC __glewMultiTexCoord4fvARB = NULL;
+PFNGLMULTITEXCOORD4IARBPROC __glewMultiTexCoord4iARB = NULL;
+PFNGLMULTITEXCOORD4IVARBPROC __glewMultiTexCoord4ivARB = NULL;
+PFNGLMULTITEXCOORD4SARBPROC __glewMultiTexCoord4sARB = NULL;
+PFNGLMULTITEXCOORD4SVARBPROC __glewMultiTexCoord4svARB = NULL;
+
+PFNGLBEGINQUERYARBPROC __glewBeginQueryARB = NULL;
+PFNGLDELETEQUERIESARBPROC __glewDeleteQueriesARB = NULL;
+PFNGLENDQUERYARBPROC __glewEndQueryARB = NULL;
+PFNGLGENQUERIESARBPROC __glewGenQueriesARB = NULL;
+PFNGLGETQUERYOBJECTIVARBPROC __glewGetQueryObjectivARB = NULL;
+PFNGLGETQUERYOBJECTUIVARBPROC __glewGetQueryObjectuivARB = NULL;
+PFNGLGETQUERYIVARBPROC __glewGetQueryivARB = NULL;
+PFNGLISQUERYARBPROC __glewIsQueryARB = NULL;
+
+PFNGLPOINTPARAMETERFARBPROC __glewPointParameterfARB = NULL;
+PFNGLPOINTPARAMETERFVARBPROC __glewPointParameterfvARB = NULL;
+
+PFNGLATTACHOBJECTARBPROC __glewAttachObjectARB = NULL;
+PFNGLCOMPILESHADERARBPROC __glewCompileShaderARB = NULL;
+PFNGLCREATEPROGRAMOBJECTARBPROC __glewCreateProgramObjectARB = NULL;
+PFNGLCREATESHADEROBJECTARBPROC __glewCreateShaderObjectARB = NULL;
+PFNGLDELETEOBJECTARBPROC __glewDeleteObjectARB = NULL;
+PFNGLDETACHOBJECTARBPROC __glewDetachObjectARB = NULL;
+PFNGLGETACTIVEUNIFORMARBPROC __glewGetActiveUniformARB = NULL;
+PFNGLGETATTACHEDOBJECTSARBPROC __glewGetAttachedObjectsARB = NULL;
+PFNGLGETHANDLEARBPROC __glewGetHandleARB = NULL;
+PFNGLGETINFOLOGARBPROC __glewGetInfoLogARB = NULL;
+PFNGLGETOBJECTPARAMETERFVARBPROC __glewGetObjectParameterfvARB = NULL;
+PFNGLGETOBJECTPARAMETERIVARBPROC __glewGetObjectParameterivARB = NULL;
+PFNGLGETSHADERSOURCEARBPROC __glewGetShaderSourceARB = NULL;
+PFNGLGETUNIFORMLOCATIONARBPROC __glewGetUniformLocationARB = NULL;
+PFNGLGETUNIFORMFVARBPROC __glewGetUniformfvARB = NULL;
+PFNGLGETUNIFORMIVARBPROC __glewGetUniformivARB = NULL;
+PFNGLLINKPROGRAMARBPROC __glewLinkProgramARB = NULL;
+PFNGLSHADERSOURCEARBPROC __glewShaderSourceARB = NULL;
+PFNGLUNIFORM1FARBPROC __glewUniform1fARB = NULL;
+PFNGLUNIFORM1FVARBPROC __glewUniform1fvARB = NULL;
+PFNGLUNIFORM1IARBPROC __glewUniform1iARB = NULL;
+PFNGLUNIFORM1IVARBPROC __glewUniform1ivARB = NULL;
+PFNGLUNIFORM2FARBPROC __glewUniform2fARB = NULL;
+PFNGLUNIFORM2FVARBPROC __glewUniform2fvARB = NULL;
+PFNGLUNIFORM2IARBPROC __glewUniform2iARB = NULL;
+PFNGLUNIFORM2IVARBPROC __glewUniform2ivARB = NULL;
+PFNGLUNIFORM3FARBPROC __glewUniform3fARB = NULL;
+PFNGLUNIFORM3FVARBPROC __glewUniform3fvARB = NULL;
+PFNGLUNIFORM3IARBPROC __glewUniform3iARB = NULL;
+PFNGLUNIFORM3IVARBPROC __glewUniform3ivARB = NULL;
+PFNGLUNIFORM4FARBPROC __glewUniform4fARB = NULL;
+PFNGLUNIFORM4FVARBPROC __glewUniform4fvARB = NULL;
+PFNGLUNIFORM4IARBPROC __glewUniform4iARB = NULL;
+PFNGLUNIFORM4IVARBPROC __glewUniform4ivARB = NULL;
+PFNGLUNIFORMMATRIX2FVARBPROC __glewUniformMatrix2fvARB = NULL;
+PFNGLUNIFORMMATRIX3FVARBPROC __glewUniformMatrix3fvARB = NULL;
+PFNGLUNIFORMMATRIX4FVARBPROC __glewUniformMatrix4fvARB = NULL;
+PFNGLUSEPROGRAMOBJECTARBPROC __glewUseProgramObjectARB = NULL;
+PFNGLVALIDATEPROGRAMARBPROC __glewValidateProgramARB = NULL;
+
+PFNGLCOMPRESSEDTEXIMAGE1DARBPROC __glewCompressedTexImage1DARB = NULL;
+PFNGLCOMPRESSEDTEXIMAGE2DARBPROC __glewCompressedTexImage2DARB = NULL;
+PFNGLCOMPRESSEDTEXIMAGE3DARBPROC __glewCompressedTexImage3DARB = NULL;
+PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC __glewCompressedTexSubImage1DARB = NULL;
+PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC __glewCompressedTexSubImage2DARB = NULL;
+PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC __glewCompressedTexSubImage3DARB = NULL;
+PFNGLGETCOMPRESSEDTEXIMAGEARBPROC __glewGetCompressedTexImageARB = NULL;
+
+PFNGLLOADTRANSPOSEMATRIXDARBPROC __glewLoadTransposeMatrixdARB = NULL;
+PFNGLLOADTRANSPOSEMATRIXFARBPROC __glewLoadTransposeMatrixfARB = NULL;
+PFNGLMULTTRANSPOSEMATRIXDARBPROC __glewMultTransposeMatrixdARB = NULL;
+PFNGLMULTTRANSPOSEMATRIXFARBPROC __glewMultTransposeMatrixfARB = NULL;
+
+PFNGLVERTEXBLENDARBPROC __glewVertexBlendARB = NULL;
+PFNGLWEIGHTPOINTERARBPROC __glewWeightPointerARB = NULL;
+PFNGLWEIGHTBVARBPROC __glewWeightbvARB = NULL;
+PFNGLWEIGHTDVARBPROC __glewWeightdvARB = NULL;
+PFNGLWEIGHTFVARBPROC __glewWeightfvARB = NULL;
+PFNGLWEIGHTIVARBPROC __glewWeightivARB = NULL;
+PFNGLWEIGHTSVARBPROC __glewWeightsvARB = NULL;
+PFNGLWEIGHTUBVARBPROC __glewWeightubvARB = NULL;
+PFNGLWEIGHTUIVARBPROC __glewWeightuivARB = NULL;
+PFNGLWEIGHTUSVARBPROC __glewWeightusvARB = NULL;
+
+PFNGLBINDBUFFERARBPROC __glewBindBufferARB = NULL;
+PFNGLBUFFERDATAARBPROC __glewBufferDataARB = NULL;
+PFNGLBUFFERSUBDATAARBPROC __glewBufferSubDataARB = NULL;
+PFNGLDELETEBUFFERSARBPROC __glewDeleteBuffersARB = NULL;
+PFNGLGENBUFFERSARBPROC __glewGenBuffersARB = NULL;
+PFNGLGETBUFFERPARAMETERIVARBPROC __glewGetBufferParameterivARB = NULL;
+PFNGLGETBUFFERPOINTERVARBPROC __glewGetBufferPointervARB = NULL;
+PFNGLGETBUFFERSUBDATAARBPROC __glewGetBufferSubDataARB = NULL;
+PFNGLISBUFFERARBPROC __glewIsBufferARB = NULL;
+PFNGLMAPBUFFERARBPROC __glewMapBufferARB = NULL;
+PFNGLUNMAPBUFFERARBPROC __glewUnmapBufferARB = NULL;
+
+PFNGLBINDPROGRAMARBPROC __glewBindProgramARB = NULL;
+PFNGLDELETEPROGRAMSARBPROC __glewDeleteProgramsARB = NULL;
+PFNGLDISABLEVERTEXATTRIBARRAYARBPROC __glewDisableVertexAttribArrayARB = NULL;
+PFNGLENABLEVERTEXATTRIBARRAYARBPROC __glewEnableVertexAttribArrayARB = NULL;
+PFNGLGENPROGRAMSARBPROC __glewGenProgramsARB = NULL;
+PFNGLGETPROGRAMENVPARAMETERDVARBPROC __glewGetProgramEnvParameterdvARB = NULL;
+PFNGLGETPROGRAMENVPARAMETERFVARBPROC __glewGetProgramEnvParameterfvARB = NULL;
+PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC __glewGetProgramLocalParameterdvARB = NULL;
+PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC __glewGetProgramLocalParameterfvARB = NULL;
+PFNGLGETPROGRAMSTRINGARBPROC __glewGetProgramStringARB = NULL;
+PFNGLGETPROGRAMIVARBPROC __glewGetProgramivARB = NULL;
+PFNGLGETVERTEXATTRIBPOINTERVARBPROC __glewGetVertexAttribPointervARB = NULL;
+PFNGLGETVERTEXATTRIBDVARBPROC __glewGetVertexAttribdvARB = NULL;
+PFNGLGETVERTEXATTRIBFVARBPROC __glewGetVertexAttribfvARB = NULL;
+PFNGLGETVERTEXATTRIBIVARBPROC __glewGetVertexAttribivARB = NULL;
+PFNGLISPROGRAMARBPROC __glewIsProgramARB = NULL;
+PFNGLPROGRAMENVPARAMETER4DARBPROC __glewProgramEnvParameter4dARB = NULL;
+PFNGLPROGRAMENVPARAMETER4DVARBPROC __glewProgramEnvParameter4dvARB = NULL;
+PFNGLPROGRAMENVPARAMETER4FARBPROC __glewProgramEnvParameter4fARB = NULL;
+PFNGLPROGRAMENVPARAMETER4FVARBPROC __glewProgramEnvParameter4fvARB = NULL;
+PFNGLPROGRAMLOCALPARAMETER4DARBPROC __glewProgramLocalParameter4dARB = NULL;
+PFNGLPROGRAMLOCALPARAMETER4DVARBPROC __glewProgramLocalParameter4dvARB = NULL;
+PFNGLPROGRAMLOCALPARAMETER4FARBPROC __glewProgramLocalParameter4fARB = NULL;
+PFNGLPROGRAMLOCALPARAMETER4FVARBPROC __glewProgramLocalParameter4fvARB = NULL;
+PFNGLPROGRAMSTRINGARBPROC __glewProgramStringARB = NULL;
+PFNGLVERTEXATTRIB1DARBPROC __glewVertexAttrib1dARB = NULL;
+PFNGLVERTEXATTRIB1DVARBPROC __glewVertexAttrib1dvARB = NULL;
+PFNGLVERTEXATTRIB1FARBPROC __glewVertexAttrib1fARB = NULL;
+PFNGLVERTEXATTRIB1FVARBPROC __glewVertexAttrib1fvARB = NULL;
+PFNGLVERTEXATTRIB1SARBPROC __glewVertexAttrib1sARB = NULL;
+PFNGLVERTEXATTRIB1SVARBPROC __glewVertexAttrib1svARB = NULL;
+PFNGLVERTEXATTRIB2DARBPROC __glewVertexAttrib2dARB = NULL;
+PFNGLVERTEXATTRIB2DVARBPROC __glewVertexAttrib2dvARB = NULL;
+PFNGLVERTEXATTRIB2FARBPROC __glewVertexAttrib2fARB = NULL;
+PFNGLVERTEXATTRIB2FVARBPROC __glewVertexAttrib2fvARB = NULL;
+PFNGLVERTEXATTRIB2SARBPROC __glewVertexAttrib2sARB = NULL;
+PFNGLVERTEXATTRIB2SVARBPROC __glewVertexAttrib2svARB = NULL;
+PFNGLVERTEXATTRIB3DARBPROC __glewVertexAttrib3dARB = NULL;
+PFNGLVERTEXATTRIB3DVARBPROC __glewVertexAttrib3dvARB = NULL;
+PFNGLVERTEXATTRIB3FARBPROC __glewVertexAttrib3fARB = NULL;
+PFNGLVERTEXATTRIB3FVARBPROC __glewVertexAttrib3fvARB = NULL;
+PFNGLVERTEXATTRIB3SARBPROC __glewVertexAttrib3sARB = NULL;
+PFNGLVERTEXATTRIB3SVARBPROC __glewVertexAttrib3svARB = NULL;
+PFNGLVERTEXATTRIB4NBVARBPROC __glewVertexAttrib4NbvARB = NULL;
+PFNGLVERTEXATTRIB4NIVARBPROC __glewVertexAttrib4NivARB = NULL;
+PFNGLVERTEXATTRIB4NSVARBPROC __glewVertexAttrib4NsvARB = NULL;
+PFNGLVERTEXATTRIB4NUBARBPROC __glewVertexAttrib4NubARB = NULL;
+PFNGLVERTEXATTRIB4NUBVARBPROC __glewVertexAttrib4NubvARB = NULL;
+PFNGLVERTEXATTRIB4NUIVARBPROC __glewVertexAttrib4NuivARB = NULL;
+PFNGLVERTEXATTRIB4NUSVARBPROC __glewVertexAttrib4NusvARB = NULL;
+PFNGLVERTEXATTRIB4BVARBPROC __glewVertexAttrib4bvARB = NULL;
+PFNGLVERTEXATTRIB4DARBPROC __glewVertexAttrib4dARB = NULL;
+PFNGLVERTEXATTRIB4DVARBPROC __glewVertexAttrib4dvARB = NULL;
+PFNGLVERTEXATTRIB4FARBPROC __glewVertexAttrib4fARB = NULL;
+PFNGLVERTEXATTRIB4FVARBPROC __glewVertexAttrib4fvARB = NULL;
+PFNGLVERTEXATTRIB4IVARBPROC __glewVertexAttrib4ivARB = NULL;
+PFNGLVERTEXATTRIB4SARBPROC __glewVertexAttrib4sARB = NULL;
+PFNGLVERTEXATTRIB4SVARBPROC __glewVertexAttrib4svARB = NULL;
+PFNGLVERTEXATTRIB4UBVARBPROC __glewVertexAttrib4ubvARB = NULL;
+PFNGLVERTEXATTRIB4UIVARBPROC __glewVertexAttrib4uivARB = NULL;
+PFNGLVERTEXATTRIB4USVARBPROC __glewVertexAttrib4usvARB = NULL;
+PFNGLVERTEXATTRIBPOINTERARBPROC __glewVertexAttribPointerARB = NULL;
+
+PFNGLBINDATTRIBLOCATIONARBPROC __glewBindAttribLocationARB = NULL;
+PFNGLGETACTIVEATTRIBARBPROC __glewGetActiveAttribARB = NULL;
+PFNGLGETATTRIBLOCATIONARBPROC __glewGetAttribLocationARB = NULL;
+
+PFNGLWINDOWPOS2DARBPROC __glewWindowPos2dARB = NULL;
+PFNGLWINDOWPOS2DVARBPROC __glewWindowPos2dvARB = NULL;
+PFNGLWINDOWPOS2FARBPROC __glewWindowPos2fARB = NULL;
+PFNGLWINDOWPOS2FVARBPROC __glewWindowPos2fvARB = NULL;
+PFNGLWINDOWPOS2IARBPROC __glewWindowPos2iARB = NULL;
+PFNGLWINDOWPOS2IVARBPROC __glewWindowPos2ivARB = NULL;
+PFNGLWINDOWPOS2SARBPROC __glewWindowPos2sARB = NULL;
+PFNGLWINDOWPOS2SVARBPROC __glewWindowPos2svARB = NULL;
+PFNGLWINDOWPOS3DARBPROC __glewWindowPos3dARB = NULL;
+PFNGLWINDOWPOS3DVARBPROC __glewWindowPos3dvARB = NULL;
+PFNGLWINDOWPOS3FARBPROC __glewWindowPos3fARB = NULL;
+PFNGLWINDOWPOS3FVARBPROC __glewWindowPos3fvARB = NULL;
+PFNGLWINDOWPOS3IARBPROC __glewWindowPos3iARB = NULL;
+PFNGLWINDOWPOS3IVARBPROC __glewWindowPos3ivARB = NULL;
+PFNGLWINDOWPOS3SARBPROC __glewWindowPos3sARB = NULL;
+PFNGLWINDOWPOS3SVARBPROC __glewWindowPos3svARB = NULL;
+
+PFNGLDRAWBUFFERSATIPROC __glewDrawBuffersATI = NULL;
+
+PFNGLDRAWELEMENTARRAYATIPROC __glewDrawElementArrayATI = NULL;
+PFNGLDRAWRANGEELEMENTARRAYATIPROC __glewDrawRangeElementArrayATI = NULL;
+PFNGLELEMENTPOINTERATIPROC __glewElementPointerATI = NULL;
+
+PFNGLGETTEXBUMPPARAMETERFVATIPROC __glewGetTexBumpParameterfvATI = NULL;
+PFNGLGETTEXBUMPPARAMETERIVATIPROC __glewGetTexBumpParameterivATI = NULL;
+PFNGLTEXBUMPPARAMETERFVATIPROC __glewTexBumpParameterfvATI = NULL;
+PFNGLTEXBUMPPARAMETERIVATIPROC __glewTexBumpParameterivATI = NULL;
+
+PFNGLALPHAFRAGMENTOP1ATIPROC __glewAlphaFragmentOp1ATI = NULL;
+PFNGLALPHAFRAGMENTOP2ATIPROC __glewAlphaFragmentOp2ATI = NULL;
+PFNGLALPHAFRAGMENTOP3ATIPROC __glewAlphaFragmentOp3ATI = NULL;
+PFNGLBEGINFRAGMENTSHADERATIPROC __glewBeginFragmentShaderATI = NULL;
+PFNGLBINDFRAGMENTSHADERATIPROC __glewBindFragmentShaderATI = NULL;
+PFNGLCOLORFRAGMENTOP1ATIPROC __glewColorFragmentOp1ATI = NULL;
+PFNGLCOLORFRAGMENTOP2ATIPROC __glewColorFragmentOp2ATI = NULL;
+PFNGLCOLORFRAGMENTOP3ATIPROC __glewColorFragmentOp3ATI = NULL;
+PFNGLDELETEFRAGMENTSHADERATIPROC __glewDeleteFragmentShaderATI = NULL;
+PFNGLENDFRAGMENTSHADERATIPROC __glewEndFragmentShaderATI = NULL;
+PFNGLGENFRAGMENTSHADERSATIPROC __glewGenFragmentShadersATI = NULL;
+PFNGLPASSTEXCOORDATIPROC __glewPassTexCoordATI = NULL;
+PFNGLSAMPLEMAPATIPROC __glewSampleMapATI = NULL;
+PFNGLSETFRAGMENTSHADERCONSTANTATIPROC __glewSetFragmentShaderConstantATI = NULL;
+
+PFNGLMAPOBJECTBUFFERATIPROC __glewMapObjectBufferATI = NULL;
+PFNGLUNMAPOBJECTBUFFERATIPROC __glewUnmapObjectBufferATI = NULL;
+
+PFNGLPNTRIANGLESFATIPROC __glPNTrianglewesfATI = NULL;
+PFNGLPNTRIANGLESIATIPROC __glPNTrianglewesiATI = NULL;
+
+PFNGLSTENCILFUNCSEPARATEATIPROC __glewStencilFuncSeparateATI = NULL;
+PFNGLSTENCILOPSEPARATEATIPROC __glewStencilOpSeparateATI = NULL;
+
+PFNGLARRAYOBJECTATIPROC __glewArrayObjectATI = NULL;
+PFNGLFREEOBJECTBUFFERATIPROC __glewFreeObjectBufferATI = NULL;
+PFNGLGETARRAYOBJECTFVATIPROC __glewGetArrayObjectfvATI = NULL;
+PFNGLGETARRAYOBJECTIVATIPROC __glewGetArrayObjectivATI = NULL;
+PFNGLGETOBJECTBUFFERFVATIPROC __glewGetObjectBufferfvATI = NULL;
+PFNGLGETOBJECTBUFFERIVATIPROC __glewGetObjectBufferivATI = NULL;
+PFNGLGETVARIANTARRAYOBJECTFVATIPROC __glewGetVariantArrayObjectfvATI = NULL;
+PFNGLGETVARIANTARRAYOBJECTIVATIPROC __glewGetVariantArrayObjectivATI = NULL;
+PFNGLISOBJECTBUFFERATIPROC __glewIsObjectBufferATI = NULL;
+PFNGLNEWOBJECTBUFFERATIPROC __glewNewObjectBufferATI = NULL;
+PFNGLUPDATEOBJECTBUFFERATIPROC __glewUpdateObjectBufferATI = NULL;
+PFNGLVARIANTARRAYOBJECTATIPROC __glewVariantArrayObjectATI = NULL;
+
+PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC __glewGetVertexAttribArrayObjectfvATI = NULL;
+PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC __glewGetVertexAttribArrayObjectivATI = NULL;
+PFNGLVERTEXATTRIBARRAYOBJECTATIPROC __glewVertexAttribArrayObjectATI = NULL;
+
+PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC __glewClientActiveVertexStreamATI = NULL;
+PFNGLNORMALSTREAM3BATIPROC __glewNormalStream3bATI = NULL;
+PFNGLNORMALSTREAM3BVATIPROC __glewNormalStream3bvATI = NULL;
+PFNGLNORMALSTREAM3DATIPROC __glewNormalStream3dATI = NULL;
+PFNGLNORMALSTREAM3DVATIPROC __glewNormalStream3dvATI = NULL;
+PFNGLNORMALSTREAM3FATIPROC __glewNormalStream3fATI = NULL;
+PFNGLNORMALSTREAM3FVATIPROC __glewNormalStream3fvATI = NULL;
+PFNGLNORMALSTREAM3IATIPROC __glewNormalStream3iATI = NULL;
+PFNGLNORMALSTREAM3IVATIPROC __glewNormalStream3ivATI = NULL;
+PFNGLNORMALSTREAM3SATIPROC __glewNormalStream3sATI = NULL;
+PFNGLNORMALSTREAM3SVATIPROC __glewNormalStream3svATI = NULL;
+PFNGLVERTEXBLENDENVFATIPROC __glewVertexBlendEnvfATI = NULL;
+PFNGLVERTEXBLENDENVIATIPROC __glewVertexBlendEnviATI = NULL;
+PFNGLVERTEXSTREAM2DATIPROC __glewVertexStream2dATI = NULL;
+PFNGLVERTEXSTREAM2DVATIPROC __glewVertexStream2dvATI = NULL;
+PFNGLVERTEXSTREAM2FATIPROC __glewVertexStream2fATI = NULL;
+PFNGLVERTEXSTREAM2FVATIPROC __glewVertexStream2fvATI = NULL;
+PFNGLVERTEXSTREAM2IATIPROC __glewVertexStream2iATI = NULL;
+PFNGLVERTEXSTREAM2IVATIPROC __glewVertexStream2ivATI = NULL;
+PFNGLVERTEXSTREAM2SATIPROC __glewVertexStream2sATI = NULL;
+PFNGLVERTEXSTREAM2SVATIPROC __glewVertexStream2svATI = NULL;
+PFNGLVERTEXSTREAM3DATIPROC __glewVertexStream3dATI = NULL;
+PFNGLVERTEXSTREAM3DVATIPROC __glewVertexStream3dvATI = NULL;
+PFNGLVERTEXSTREAM3FATIPROC __glewVertexStream3fATI = NULL;
+PFNGLVERTEXSTREAM3FVATIPROC __glewVertexStream3fvATI = NULL;
+PFNGLVERTEXSTREAM3IATIPROC __glewVertexStream3iATI = NULL;
+PFNGLVERTEXSTREAM3IVATIPROC __glewVertexStream3ivATI = NULL;
+PFNGLVERTEXSTREAM3SATIPROC __glewVertexStream3sATI = NULL;
+PFNGLVERTEXSTREAM3SVATIPROC __glewVertexStream3svATI = NULL;
+PFNGLVERTEXSTREAM4DATIPROC __glewVertexStream4dATI = NULL;
+PFNGLVERTEXSTREAM4DVATIPROC __glewVertexStream4dvATI = NULL;
+PFNGLVERTEXSTREAM4FATIPROC __glewVertexStream4fATI = NULL;
+PFNGLVERTEXSTREAM4FVATIPROC __glewVertexStream4fvATI = NULL;
+PFNGLVERTEXSTREAM4IATIPROC __glewVertexStream4iATI = NULL;
+PFNGLVERTEXSTREAM4IVATIPROC __glewVertexStream4ivATI = NULL;
+PFNGLVERTEXSTREAM4SATIPROC __glewVertexStream4sATI = NULL;
+PFNGLVERTEXSTREAM4SVATIPROC __glewVertexStream4svATI = NULL;
+
+PFNGLBLENDCOLOREXTPROC __glewBlendColorEXT = NULL;
+
+PFNGLBLENDEQUATIONSEPARATEEXTPROC __glewBlendEquationSeparateEXT = NULL;
+
+PFNGLBLENDFUNCSEPARATEEXTPROC __glewBlendFuncSeparateEXT = NULL;
+
+PFNGLBLENDEQUATIONEXTPROC __glewBlendEquationEXT = NULL;
+
+PFNGLCOLORSUBTABLEEXTPROC __glewColorSubTableEXT = NULL;
+PFNGLCOPYCOLORSUBTABLEEXTPROC __glewCopyColorSubTableEXT = NULL;
+
+PFNGLLOCKARRAYSEXTPROC __glewLockArraysEXT = NULL;
+PFNGLUNLOCKARRAYSEXTPROC __glewUnlockArraysEXT = NULL;
+
+PFNGLCONVOLUTIONFILTER1DEXTPROC __glewConvolutionFilter1DEXT = NULL;
+PFNGLCONVOLUTIONFILTER2DEXTPROC __glewConvolutionFilter2DEXT = NULL;
+PFNGLCONVOLUTIONPARAMETERFEXTPROC __glewConvolutionParameterfEXT = NULL;
+PFNGLCONVOLUTIONPARAMETERFVEXTPROC __glewConvolutionParameterfvEXT = NULL;
+PFNGLCONVOLUTIONPARAMETERIEXTPROC __glewConvolutionParameteriEXT = NULL;
+PFNGLCONVOLUTIONPARAMETERIVEXTPROC __glewConvolutionParameterivEXT = NULL;
+PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC __glewCopyConvolutionFilter1DEXT = NULL;
+PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC __glewCopyConvolutionFilter2DEXT = NULL;
+PFNGLGETCONVOLUTIONFILTEREXTPROC __glewGetConvolutionFilterEXT = NULL;
+PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC __glewGetConvolutionParameterfvEXT = NULL;
+PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC __glewGetConvolutionParameterivEXT = NULL;
+PFNGLGETSEPARABLEFILTEREXTPROC __glewGetSeparableFilterEXT = NULL;
+PFNGLSEPARABLEFILTER2DEXTPROC __glewSeparableFilter2DEXT = NULL;
+
+PFNGLBINORMALPOINTEREXTPROC __glewBinormalPointerEXT = NULL;
+PFNGLTANGENTPOINTEREXTPROC __glewTangentPointerEXT = NULL;
+
+PFNGLCOPYTEXIMAGE1DEXTPROC __glewCopyTexImage1DEXT = NULL;
+PFNGLCOPYTEXIMAGE2DEXTPROC __glewCopyTexImage2DEXT = NULL;
+PFNGLCOPYTEXSUBIMAGE1DEXTPROC __glewCopyTexSubImage1DEXT = NULL;
+PFNGLCOPYTEXSUBIMAGE2DEXTPROC __glewCopyTexSubImage2DEXT = NULL;
+PFNGLCOPYTEXSUBIMAGE3DEXTPROC __glewCopyTexSubImage3DEXT = NULL;
+
+PFNGLCULLPARAMETERDVEXTPROC __glewCullParameterdvEXT = NULL;
+PFNGLCULLPARAMETERFVEXTPROC __glewCullParameterfvEXT = NULL;
+
+PFNGLDEPTHBOUNDSEXTPROC __glewDepthBoundsEXT = NULL;
+
+PFNGLDRAWRANGEELEMENTSEXTPROC __glewDrawRangeElementsEXT = NULL;
+
+PFNGLFOGCOORDPOINTEREXTPROC __glewFogCoordPointerEXT = NULL;
+PFNGLFOGCOORDDEXTPROC __glewFogCoorddEXT = NULL;
+PFNGLFOGCOORDDVEXTPROC __glewFogCoorddvEXT = NULL;
+PFNGLFOGCOORDFEXTPROC __glewFogCoordfEXT = NULL;
+PFNGLFOGCOORDFVEXTPROC __glewFogCoordfvEXT = NULL;
+
+PFNGLFRAGMENTCOLORMATERIALEXTPROC __glewFragmentColorMaterialEXT = NULL;
+PFNGLFRAGMENTLIGHTMODELFEXTPROC __glewFragmentLightModelfEXT = NULL;
+PFNGLFRAGMENTLIGHTMODELFVEXTPROC __glewFragmentLightModelfvEXT = NULL;
+PFNGLFRAGMENTLIGHTMODELIEXTPROC __glewFragmentLightModeliEXT = NULL;
+PFNGLFRAGMENTLIGHTMODELIVEXTPROC __glewFragmentLightModelivEXT = NULL;
+PFNGLFRAGMENTLIGHTFEXTPROC __glewFragmentLightfEXT = NULL;
+PFNGLFRAGMENTLIGHTFVEXTPROC __glewFragmentLightfvEXT = NULL;
+PFNGLFRAGMENTLIGHTIEXTPROC __glewFragmentLightiEXT = NULL;
+PFNGLFRAGMENTLIGHTIVEXTPROC __glewFragmentLightivEXT = NULL;
+PFNGLFRAGMENTMATERIALFEXTPROC __glewFragmentMaterialfEXT = NULL;
+PFNGLFRAGMENTMATERIALFVEXTPROC __glewFragmentMaterialfvEXT = NULL;
+PFNGLFRAGMENTMATERIALIEXTPROC __glewFragmentMaterialiEXT = NULL;
+PFNGLFRAGMENTMATERIALIVEXTPROC __glewFragmentMaterialivEXT = NULL;
+PFNGLGETFRAGMENTLIGHTFVEXTPROC __glewGetFragmentLightfvEXT = NULL;
+PFNGLGETFRAGMENTLIGHTIVEXTPROC __glewGetFragmentLightivEXT = NULL;
+PFNGLGETFRAGMENTMATERIALFVEXTPROC __glewGetFragmentMaterialfvEXT = NULL;
+PFNGLGETFRAGMENTMATERIALIVEXTPROC __glewGetFragmentMaterialivEXT = NULL;
+PFNGLLIGHTENVIEXTPROC __glewLightEnviEXT = NULL;
+
+PFNGLBLITFRAMEBUFFEREXTPROC __glewBlitFramebufferEXT = NULL;
+
+PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC __glewRenderbufferStorageMultisampleEXT = NULL;
+
+PFNGLBINDFRAMEBUFFEREXTPROC __glewBindFramebufferEXT = NULL;
+PFNGLBINDRENDERBUFFEREXTPROC __glewBindRenderbufferEXT = NULL;
+PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC __glewCheckFramebufferStatusEXT = NULL;
+PFNGLDELETEFRAMEBUFFERSEXTPROC __glewDeleteFramebuffersEXT = NULL;
+PFNGLDELETERENDERBUFFERSEXTPROC __glewDeleteRenderbuffersEXT = NULL;
+PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC __glewFramebufferRenderbufferEXT = NULL;
+PFNGLFRAMEBUFFERTEXTURE1DEXTPROC __glewFramebufferTexture1DEXT = NULL;
+PFNGLFRAMEBUFFERTEXTURE2DEXTPROC __glewFramebufferTexture2DEXT = NULL;
+PFNGLFRAMEBUFFERTEXTURE3DEXTPROC __glewFramebufferTexture3DEXT = NULL;
+PFNGLGENFRAMEBUFFERSEXTPROC __glewGenFramebuffersEXT = NULL;
+PFNGLGENRENDERBUFFERSEXTPROC __glewGenRenderbuffersEXT = NULL;
+PFNGLGENERATEMIPMAPEXTPROC __glewGenerateMipmapEXT = NULL;
+PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC __glewGetFramebufferAttachmentParameterivEXT = NULL;
+PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC __glewGetRenderbufferParameterivEXT = NULL;
+PFNGLISFRAMEBUFFEREXTPROC __glewIsFramebufferEXT = NULL;
+PFNGLISRENDERBUFFEREXTPROC __glewIsRenderbufferEXT = NULL;
+PFNGLRENDERBUFFERSTORAGEEXTPROC __glewRenderbufferStorageEXT = NULL;
+
+PFNGLGETHISTOGRAMEXTPROC __glewGetHistogramEXT = NULL;
+PFNGLGETHISTOGRAMPARAMETERFVEXTPROC __glewGetHistogramParameterfvEXT = NULL;
+PFNGLGETHISTOGRAMPARAMETERIVEXTPROC __glewGetHistogramParameterivEXT = NULL;
+PFNGLGETMINMAXEXTPROC __glewGetMinmaxEXT = NULL;
+PFNGLGETMINMAXPARAMETERFVEXTPROC __glewGetMinmaxParameterfvEXT = NULL;
+PFNGLGETMINMAXPARAMETERIVEXTPROC __glewGetMinmaxParameterivEXT = NULL;
+PFNGLHISTOGRAMEXTPROC __glewHistogramEXT = NULL;
+PFNGLMINMAXEXTPROC __glewMinmaxEXT = NULL;
+PFNGLRESETHISTOGRAMEXTPROC __glewResetHistogramEXT = NULL;
+PFNGLRESETMINMAXEXTPROC __glewResetMinmaxEXT = NULL;
+
+PFNGLINDEXFUNCEXTPROC __glewIndexFuncEXT = NULL;
+
+PFNGLINDEXMATERIALEXTPROC __glewIndexMaterialEXT = NULL;
+
+PFNGLAPPLYTEXTUREEXTPROC __glewApplyTextureEXT = NULL;
+PFNGLTEXTURELIGHTEXTPROC __glewTextureLightEXT = NULL;
+PFNGLTEXTUREMATERIALEXTPROC __glewTextureMaterialEXT = NULL;
+
+PFNGLMULTIDRAWARRAYSEXTPROC __glewMultiDrawArraysEXT = NULL;
+PFNGLMULTIDRAWELEMENTSEXTPROC __glewMultiDrawElementsEXT = NULL;
+
+PFNGLSAMPLEMASKEXTPROC __glewSampleMaskEXT = NULL;
+PFNGLSAMPLEPATTERNEXTPROC __glewSamplePatternEXT = NULL;
+
+PFNGLCOLORTABLEEXTPROC __glewColorTableEXT = NULL;
+PFNGLGETCOLORTABLEEXTPROC __glewGetColorTableEXT = NULL;
+PFNGLGETCOLORTABLEPARAMETERFVEXTPROC __glewGetColorTableParameterfvEXT = NULL;
+PFNGLGETCOLORTABLEPARAMETERIVEXTPROC __glewGetColorTableParameterivEXT = NULL;
+
+PFNGLGETPIXELTRANSFORMPARAMETERFVEXTPROC __glewGetPixelTransformParameterfvEXT = NULL;
+PFNGLGETPIXELTRANSFORMPARAMETERIVEXTPROC __glewGetPixelTransformParameterivEXT = NULL;
+PFNGLPIXELTRANSFORMPARAMETERFEXTPROC __glewPixelTransformParameterfEXT = NULL;
+PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC __glewPixelTransformParameterfvEXT = NULL;
+PFNGLPIXELTRANSFORMPARAMETERIEXTPROC __glewPixelTransformParameteriEXT = NULL;
+PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC __glewPixelTransformParameterivEXT = NULL;
+
+PFNGLPOINTPARAMETERFEXTPROC __glewPointParameterfEXT = NULL;
+PFNGLPOINTPARAMETERFVEXTPROC __glewPointParameterfvEXT = NULL;
+
+PFNGLPOLYGONOFFSETEXTPROC __glewPolygonOffsetEXT = NULL;
+
+PFNGLBEGINSCENEEXTPROC __glewBeginSceneEXT = NULL;
+PFNGLENDSCENEEXTPROC __glewEndSceneEXT = NULL;
+
+PFNGLSECONDARYCOLOR3BEXTPROC __glewSecondaryColor3bEXT = NULL;
+PFNGLSECONDARYCOLOR3BVEXTPROC __glewSecondaryColor3bvEXT = NULL;
+PFNGLSECONDARYCOLOR3DEXTPROC __glewSecondaryColor3dEXT = NULL;
+PFNGLSECONDARYCOLOR3DVEXTPROC __glewSecondaryColor3dvEXT = NULL;
+PFNGLSECONDARYCOLOR3FEXTPROC __glewSecondaryColor3fEXT = NULL;
+PFNGLSECONDARYCOLOR3FVEXTPROC __glewSecondaryColor3fvEXT = NULL;
+PFNGLSECONDARYCOLOR3IEXTPROC __glewSecondaryColor3iEXT = NULL;
+PFNGLSECONDARYCOLOR3IVEXTPROC __glewSecondaryColor3ivEXT = NULL;
+PFNGLSECONDARYCOLOR3SEXTPROC __glewSecondaryColor3sEXT = NULL;
+PFNGLSECONDARYCOLOR3SVEXTPROC __glewSecondaryColor3svEXT = NULL;
+PFNGLSECONDARYCOLOR3UBEXTPROC __glewSecondaryColor3ubEXT = NULL;
+PFNGLSECONDARYCOLOR3UBVEXTPROC __glewSecondaryColor3ubvEXT = NULL;
+PFNGLSECONDARYCOLOR3UIEXTPROC __glewSecondaryColor3uiEXT = NULL;
+PFNGLSECONDARYCOLOR3UIVEXTPROC __glewSecondaryColor3uivEXT = NULL;
+PFNGLSECONDARYCOLOR3USEXTPROC __glewSecondaryColor3usEXT = NULL;
+PFNGLSECONDARYCOLOR3USVEXTPROC __glewSecondaryColor3usvEXT = NULL;
+PFNGLSECONDARYCOLORPOINTEREXTPROC __glewSecondaryColorPointerEXT = NULL;
+
+PFNGLACTIVESTENCILFACEEXTPROC __glewActiveStencilFaceEXT = NULL;
+
+PFNGLTEXSUBIMAGE1DEXTPROC __glewTexSubImage1DEXT = NULL;
+PFNGLTEXSUBIMAGE2DEXTPROC __glewTexSubImage2DEXT = NULL;
+PFNGLTEXSUBIMAGE3DEXTPROC __glewTexSubImage3DEXT = NULL;
+
+PFNGLTEXIMAGE3DEXTPROC __glewTexImage3DEXT = NULL;
+
+PFNGLARETEXTURESRESIDENTEXTPROC __glewAreTexturesResidentEXT = NULL;
+PFNGLBINDTEXTUREEXTPROC __glewBindTextureEXT = NULL;
+PFNGLDELETETEXTURESEXTPROC __glewDeleteTexturesEXT = NULL;
+PFNGLGENTEXTURESEXTPROC __glewGenTexturesEXT = NULL;
+PFNGLISTEXTUREEXTPROC __glewIsTextureEXT = NULL;
+PFNGLPRIORITIZETEXTURESEXTPROC __glewPrioritizeTexturesEXT = NULL;
+
+PFNGLTEXTURENORMALEXTPROC __glewTextureNormalEXT = NULL;
+
+PFNGLARRAYELEMENTEXTPROC __glewArrayElementEXT = NULL;
+PFNGLCOLORPOINTEREXTPROC __glewColorPointerEXT = NULL;
+PFNGLDRAWARRAYSEXTPROC __glewDrawArraysEXT = NULL;
+PFNGLEDGEFLAGPOINTEREXTPROC __glewEdgeFlagPointerEXT = NULL;
+PFNGLGETPOINTERVEXTPROC __glewGetPointervEXT = NULL;
+PFNGLINDEXPOINTEREXTPROC __glewIndexPointerEXT = NULL;
+PFNGLNORMALPOINTEREXTPROC __glewNormalPointerEXT = NULL;
+PFNGLTEXCOORDPOINTEREXTPROC __glewTexCoordPointerEXT = NULL;
+PFNGLVERTEXPOINTEREXTPROC __glewVertexPointerEXT = NULL;
+
+PFNGLBEGINVERTEXSHADEREXTPROC __glewBeginVertexShaderEXT = NULL;
+PFNGLBINDLIGHTPARAMETEREXTPROC __glewBindLightParameterEXT = NULL;
+PFNGLBINDMATERIALPARAMETEREXTPROC __glewBindMaterialParameterEXT = NULL;
+PFNGLBINDPARAMETEREXTPROC __glewBindParameterEXT = NULL;
+PFNGLBINDTEXGENPARAMETEREXTPROC __glewBindTexGenParameterEXT = NULL;
+PFNGLBINDTEXTUREUNITPARAMETEREXTPROC __glewBindTextureUnitParameterEXT = NULL;
+PFNGLBINDVERTEXSHADEREXTPROC __glewBindVertexShaderEXT = NULL;
+PFNGLDELETEVERTEXSHADEREXTPROC __glewDeleteVertexShaderEXT = NULL;
+PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC __glewDisableVariantClientStateEXT = NULL;
+PFNGLENABLEVARIANTCLIENTSTATEEXTPROC __glewEnableVariantClientStateEXT = NULL;
+PFNGLENDVERTEXSHADEREXTPROC __glewEndVertexShaderEXT = NULL;
+PFNGLEXTRACTCOMPONENTEXTPROC __glewExtractComponentEXT = NULL;
+PFNGLGENSYMBOLSEXTPROC __glewGenSymbolsEXT = NULL;
+PFNGLGENVERTEXSHADERSEXTPROC __glewGenVertexShadersEXT = NULL;
+PFNGLGETINVARIANTBOOLEANVEXTPROC __glewGetInvariantBooleanvEXT = NULL;
+PFNGLGETINVARIANTFLOATVEXTPROC __glewGetInvariantFloatvEXT = NULL;
+PFNGLGETINVARIANTINTEGERVEXTPROC __glewGetInvariantIntegervEXT = NULL;
+PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC __glewGetLocalConstantBooleanvEXT = NULL;
+PFNGLGETLOCALCONSTANTFLOATVEXTPROC __glewGetLocalConstantFloatvEXT = NULL;
+PFNGLGETLOCALCONSTANTINTEGERVEXTPROC __glewGetLocalConstantIntegervEXT = NULL;
+PFNGLGETVARIANTBOOLEANVEXTPROC __glewGetVariantBooleanvEXT = NULL;
+PFNGLGETVARIANTFLOATVEXTPROC __glewGetVariantFloatvEXT = NULL;
+PFNGLGETVARIANTINTEGERVEXTPROC __glewGetVariantIntegervEXT = NULL;
+PFNGLGETVARIANTPOINTERVEXTPROC __glewGetVariantPointervEXT = NULL;
+PFNGLINSERTCOMPONENTEXTPROC __glewInsertComponentEXT = NULL;
+PFNGLISVARIANTENABLEDEXTPROC __glewIsVariantEnabledEXT = NULL;
+PFNGLSETINVARIANTEXTPROC __glewSetInvariantEXT = NULL;
+PFNGLSETLOCALCONSTANTEXTPROC __glewSetLocalConstantEXT = NULL;
+PFNGLSHADEROP1EXTPROC __glewShaderOp1EXT = NULL;
+PFNGLSHADEROP2EXTPROC __glewShaderOp2EXT = NULL;
+PFNGLSHADEROP3EXTPROC __glewShaderOp3EXT = NULL;
+PFNGLSWIZZLEEXTPROC __glewSwizzleEXT = NULL;
+PFNGLVARIANTPOINTEREXTPROC __glewVariantPointerEXT = NULL;
+PFNGLVARIANTBVEXTPROC __glewVariantbvEXT = NULL;
+PFNGLVARIANTDVEXTPROC __glewVariantdvEXT = NULL;
+PFNGLVARIANTFVEXTPROC __glewVariantfvEXT = NULL;
+PFNGLVARIANTIVEXTPROC __glewVariantivEXT = NULL;
+PFNGLVARIANTSVEXTPROC __glewVariantsvEXT = NULL;
+PFNGLVARIANTUBVEXTPROC __glewVariantubvEXT = NULL;
+PFNGLVARIANTUIVEXTPROC __glewVariantuivEXT = NULL;
+PFNGLVARIANTUSVEXTPROC __glewVariantusvEXT = NULL;
+PFNGLWRITEMASKEXTPROC __glewWriteMaskEXT = NULL;
+
+PFNGLVERTEXWEIGHTPOINTEREXTPROC __glewVertexWeightPointerEXT = NULL;
+PFNGLVERTEXWEIGHTFEXTPROC __glewVertexWeightfEXT = NULL;
+PFNGLVERTEXWEIGHTFVEXTPROC __glewVertexWeightfvEXT = NULL;
+
+PFNGLSTRINGMARKERGREMEDYPROC __glewStringMarkerGREMEDY = NULL;
+
+PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC __glewGetImageTransformParameterfvHP = NULL;
+PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC __glewGetImageTransformParameterivHP = NULL;
+PFNGLIMAGETRANSFORMPARAMETERFHPPROC __glewImageTransformParameterfHP = NULL;
+PFNGLIMAGETRANSFORMPARAMETERFVHPPROC __glewImageTransformParameterfvHP = NULL;
+PFNGLIMAGETRANSFORMPARAMETERIHPPROC __glewImageTransformParameteriHP = NULL;
+PFNGLIMAGETRANSFORMPARAMETERIVHPPROC __glewImageTransformParameterivHP = NULL;
+
+PFNGLMULTIMODEDRAWARRAYSIBMPROC __glewMultiModeDrawArraysIBM = NULL;
+PFNGLMULTIMODEDRAWELEMENTSIBMPROC __glewMultiModeDrawElementsIBM = NULL;
+
+PFNGLCOLORPOINTERLISTIBMPROC __glewColorPointerListIBM = NULL;
+PFNGLEDGEFLAGPOINTERLISTIBMPROC __glewEdgeFlagPointerListIBM = NULL;
+PFNGLFOGCOORDPOINTERLISTIBMPROC __glewFogCoordPointerListIBM = NULL;
+PFNGLINDEXPOINTERLISTIBMPROC __glewIndexPointerListIBM = NULL;
+PFNGLNORMALPOINTERLISTIBMPROC __glewNormalPointerListIBM = NULL;
+PFNGLSECONDARYCOLORPOINTERLISTIBMPROC __glewSecondaryColorPointerListIBM = NULL;
+PFNGLTEXCOORDPOINTERLISTIBMPROC __glewTexCoordPointerListIBM = NULL;
+PFNGLVERTEXPOINTERLISTIBMPROC __glewVertexPointerListIBM = NULL;
+
+PFNGLCOLORPOINTERVINTELPROC __glewColorPointervINTEL = NULL;
+PFNGLNORMALPOINTERVINTELPROC __glewNormalPointervINTEL = NULL;
+PFNGLTEXCOORDPOINTERVINTELPROC __glewTexCoordPointervINTEL = NULL;
+PFNGLVERTEXPOINTERVINTELPROC __glewVertexPointervINTEL = NULL;
+
+PFNGLTEXSCISSORFUNCINTELPROC __glewTexScissorFuncINTEL = NULL;
+PFNGLTEXSCISSORINTELPROC __glewTexScissorINTEL = NULL;
+
+PFNGLBUFFERREGIONENABLEDEXTPROC __glewBufferRegionEnabledEXT = NULL;
+PFNGLDELETEBUFFERREGIONEXTPROC __glewDeleteBufferRegionEXT = NULL;
+PFNGLDRAWBUFFERREGIONEXTPROC __glewDrawBufferRegionEXT = NULL;
+PFNGLNEWBUFFERREGIONEXTPROC __glewNewBufferRegionEXT = NULL;
+PFNGLREADBUFFERREGIONEXTPROC __glewReadBufferRegionEXT = NULL;
+
+PFNGLRESIZEBUFFERSMESAPROC __glewResizeBuffersMESA = NULL;
+
+PFNGLWINDOWPOS2DMESAPROC __glewWindowPos2dMESA = NULL;
+PFNGLWINDOWPOS2DVMESAPROC __glewWindowPos2dvMESA = NULL;
+PFNGLWINDOWPOS2FMESAPROC __glewWindowPos2fMESA = NULL;
+PFNGLWINDOWPOS2FVMESAPROC __glewWindowPos2fvMESA = NULL;
+PFNGLWINDOWPOS2IMESAPROC __glewWindowPos2iMESA = NULL;
+PFNGLWINDOWPOS2IVMESAPROC __glewWindowPos2ivMESA = NULL;
+PFNGLWINDOWPOS2SMESAPROC __glewWindowPos2sMESA = NULL;
+PFNGLWINDOWPOS2SVMESAPROC __glewWindowPos2svMESA = NULL;
+PFNGLWINDOWPOS3DMESAPROC __glewWindowPos3dMESA = NULL;
+PFNGLWINDOWPOS3DVMESAPROC __glewWindowPos3dvMESA = NULL;
+PFNGLWINDOWPOS3FMESAPROC __glewWindowPos3fMESA = NULL;
+PFNGLWINDOWPOS3FVMESAPROC __glewWindowPos3fvMESA = NULL;
+PFNGLWINDOWPOS3IMESAPROC __glewWindowPos3iMESA = NULL;
+PFNGLWINDOWPOS3IVMESAPROC __glewWindowPos3ivMESA = NULL;
+PFNGLWINDOWPOS3SMESAPROC __glewWindowPos3sMESA = NULL;
+PFNGLWINDOWPOS3SVMESAPROC __glewWindowPos3svMESA = NULL;
+PFNGLWINDOWPOS4DMESAPROC __glewWindowPos4dMESA = NULL;
+PFNGLWINDOWPOS4DVMESAPROC __glewWindowPos4dvMESA = NULL;
+PFNGLWINDOWPOS4FMESAPROC __glewWindowPos4fMESA = NULL;
+PFNGLWINDOWPOS4FVMESAPROC __glewWindowPos4fvMESA = NULL;
+PFNGLWINDOWPOS4IMESAPROC __glewWindowPos4iMESA = NULL;
+PFNGLWINDOWPOS4IVMESAPROC __glewWindowPos4ivMESA = NULL;
+PFNGLWINDOWPOS4SMESAPROC __glewWindowPos4sMESA = NULL;
+PFNGLWINDOWPOS4SVMESAPROC __glewWindowPos4svMESA = NULL;
+
+PFNGLEVALMAPSNVPROC __glewEvalMapsNV = NULL;
+PFNGLGETMAPATTRIBPARAMETERFVNVPROC __glewGetMapAttribParameterfvNV = NULL;
+PFNGLGETMAPATTRIBPARAMETERIVNVPROC __glewGetMapAttribParameterivNV = NULL;
+PFNGLGETMAPCONTROLPOINTSNVPROC __glewGetMapControlPointsNV = NULL;
+PFNGLGETMAPPARAMETERFVNVPROC __glewGetMapParameterfvNV = NULL;
+PFNGLGETMAPPARAMETERIVNVPROC __glewGetMapParameterivNV = NULL;
+PFNGLMAPCONTROLPOINTSNVPROC __glewMapControlPointsNV = NULL;
+PFNGLMAPPARAMETERFVNVPROC __glewMapParameterfvNV = NULL;
+PFNGLMAPPARAMETERIVNVPROC __glewMapParameterivNV = NULL;
+
+PFNGLDELETEFENCESNVPROC __glewDeleteFencesNV = NULL;
+PFNGLFINISHFENCENVPROC __glewFinishFenceNV = NULL;
+PFNGLGENFENCESNVPROC __glewGenFencesNV = NULL;
+PFNGLGETFENCEIVNVPROC __glewGetFenceivNV = NULL;
+PFNGLISFENCENVPROC __glewIsFenceNV = NULL;
+PFNGLSETFENCENVPROC __glewSetFenceNV = NULL;
+PFNGLTESTFENCENVPROC __glewTestFenceNV = NULL;
+
+PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC __glewGetProgramNamedParameterdvNV = NULL;
+PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC __glewGetProgramNamedParameterfvNV = NULL;
+PFNGLPROGRAMNAMEDPARAMETER4DNVPROC __glewProgramNamedParameter4dNV = NULL;
+PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC __glewProgramNamedParameter4dvNV = NULL;
+PFNGLPROGRAMNAMEDPARAMETER4FNVPROC __glewProgramNamedParameter4fNV = NULL;
+PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC __glewProgramNamedParameter4fvNV = NULL;
+
+PFNGLCOLOR3HNVPROC __glewColor3hNV = NULL;
+PFNGLCOLOR3HVNVPROC __glewColor3hvNV = NULL;
+PFNGLCOLOR4HNVPROC __glewColor4hNV = NULL;
+PFNGLCOLOR4HVNVPROC __glewColor4hvNV = NULL;
+PFNGLFOGCOORDHNVPROC __glewFogCoordhNV = NULL;
+PFNGLFOGCOORDHVNVPROC __glewFogCoordhvNV = NULL;
+PFNGLMULTITEXCOORD1HNVPROC __glewMultiTexCoord1hNV = NULL;
+PFNGLMULTITEXCOORD1HVNVPROC __glewMultiTexCoord1hvNV = NULL;
+PFNGLMULTITEXCOORD2HNVPROC __glewMultiTexCoord2hNV = NULL;
+PFNGLMULTITEXCOORD2HVNVPROC __glewMultiTexCoord2hvNV = NULL;
+PFNGLMULTITEXCOORD3HNVPROC __glewMultiTexCoord3hNV = NULL;
+PFNGLMULTITEXCOORD3HVNVPROC __glewMultiTexCoord3hvNV = NULL;
+PFNGLMULTITEXCOORD4HNVPROC __glewMultiTexCoord4hNV = NULL;
+PFNGLMULTITEXCOORD4HVNVPROC __glewMultiTexCoord4hvNV = NULL;
+PFNGLNORMAL3HNVPROC __glewNormal3hNV = NULL;
+PFNGLNORMAL3HVNVPROC __glewNormal3hvNV = NULL;
+PFNGLSECONDARYCOLOR3HNVPROC __glewSecondaryColor3hNV = NULL;
+PFNGLSECONDARYCOLOR3HVNVPROC __glewSecondaryColor3hvNV = NULL;
+PFNGLTEXCOORD1HNVPROC __glewTexCoord1hNV = NULL;
+PFNGLTEXCOORD1HVNVPROC __glewTexCoord1hvNV = NULL;
+PFNGLTEXCOORD2HNVPROC __glewTexCoord2hNV = NULL;
+PFNGLTEXCOORD2HVNVPROC __glewTexCoord2hvNV = NULL;
+PFNGLTEXCOORD3HNVPROC __glewTexCoord3hNV = NULL;
+PFNGLTEXCOORD3HVNVPROC __glewTexCoord3hvNV = NULL;
+PFNGLTEXCOORD4HNVPROC __glewTexCoord4hNV = NULL;
+PFNGLTEXCOORD4HVNVPROC __glewTexCoord4hvNV = NULL;
+PFNGLVERTEX2HNVPROC __glewVertex2hNV = NULL;
+PFNGLVERTEX2HVNVPROC __glewVertex2hvNV = NULL;
+PFNGLVERTEX3HNVPROC __glewVertex3hNV = NULL;
+PFNGLVERTEX3HVNVPROC __glewVertex3hvNV = NULL;
+PFNGLVERTEX4HNVPROC __glewVertex4hNV = NULL;
+PFNGLVERTEX4HVNVPROC __glewVertex4hvNV = NULL;
+PFNGLVERTEXATTRIB1HNVPROC __glewVertexAttrib1hNV = NULL;
+PFNGLVERTEXATTRIB1HVNVPROC __glewVertexAttrib1hvNV = NULL;
+PFNGLVERTEXATTRIB2HNVPROC __glewVertexAttrib2hNV = NULL;
+PFNGLVERTEXATTRIB2HVNVPROC __glewVertexAttrib2hvNV = NULL;
+PFNGLVERTEXATTRIB3HNVPROC __glewVertexAttrib3hNV = NULL;
+PFNGLVERTEXATTRIB3HVNVPROC __glewVertexAttrib3hvNV = NULL;
+PFNGLVERTEXATTRIB4HNVPROC __glewVertexAttrib4hNV = NULL;
+PFNGLVERTEXATTRIB4HVNVPROC __glewVertexAttrib4hvNV = NULL;
+PFNGLVERTEXATTRIBS1HVNVPROC __glewVertexAttribs1hvNV = NULL;
+PFNGLVERTEXATTRIBS2HVNVPROC __glewVertexAttribs2hvNV = NULL;
+PFNGLVERTEXATTRIBS3HVNVPROC __glewVertexAttribs3hvNV = NULL;
+PFNGLVERTEXATTRIBS4HVNVPROC __glewVertexAttribs4hvNV = NULL;
+PFNGLVERTEXWEIGHTHNVPROC __glewVertexWeighthNV = NULL;
+PFNGLVERTEXWEIGHTHVNVPROC __glewVertexWeighthvNV = NULL;
+
+PFNGLBEGINOCCLUSIONQUERYNVPROC __glewBeginOcclusionQueryNV = NULL;
+PFNGLDELETEOCCLUSIONQUERIESNVPROC __glewDeleteOcclusionQueriesNV = NULL;
+PFNGLENDOCCLUSIONQUERYNVPROC __glewEndOcclusionQueryNV = NULL;
+PFNGLGENOCCLUSIONQUERIESNVPROC __glewGenOcclusionQueriesNV = NULL;
+PFNGLGETOCCLUSIONQUERYIVNVPROC __glewGetOcclusionQueryivNV = NULL;
+PFNGLGETOCCLUSIONQUERYUIVNVPROC __glewGetOcclusionQueryuivNV = NULL;
+PFNGLISOCCLUSIONQUERYNVPROC __glewIsOcclusionQueryNV = NULL;
+
+PFNGLFLUSHPIXELDATARANGENVPROC __glewFlushPixelDataRangeNV = NULL;
+PFNGLPIXELDATARANGENVPROC __glewPixelDataRangeNV = NULL;
+
+PFNGLPOINTPARAMETERINVPROC __glewPointParameteriNV = NULL;
+PFNGLPOINTPARAMETERIVNVPROC __glewPointParameterivNV = NULL;
+
+PFNGLPRIMITIVERESTARTINDEXNVPROC __glewPrimitiveRestartIndexNV = NULL;
+PFNGLPRIMITIVERESTARTNVPROC __glewPrimitiveRestartNV = NULL;
+
+PFNGLCOMBINERINPUTNVPROC __glewCombinerInputNV = NULL;
+PFNGLCOMBINEROUTPUTNVPROC __glewCombinerOutputNV = NULL;
+PFNGLCOMBINERPARAMETERFNVPROC __glewCombinerParameterfNV = NULL;
+PFNGLCOMBINERPARAMETERFVNVPROC __glewCombinerParameterfvNV = NULL;
+PFNGLCOMBINERPARAMETERINVPROC __glewCombinerParameteriNV = NULL;
+PFNGLCOMBINERPARAMETERIVNVPROC __glewCombinerParameterivNV = NULL;
+PFNGLFINALCOMBINERINPUTNVPROC __glewFinalCombinerInputNV = NULL;
+PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC __glewGetCombinerInputParameterfvNV = NULL;
+PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC __glewGetCombinerInputParameterivNV = NULL;
+PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC __glewGetCombinerOutputParameterfvNV = NULL;
+PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC __glewGetCombinerOutputParameterivNV = NULL;
+PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC __glewGetFinalCombinerInputParameterfvNV = NULL;
+PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC __glewGetFinalCombinerInputParameterivNV = NULL;
+
+PFNGLCOMBINERSTAGEPARAMETERFVNVPROC __glewCombinerStageParameterfvNV = NULL;
+PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC __glewGetCombinerStageParameterfvNV = NULL;
+
+PFNGLFLUSHVERTEXARRAYRANGENVPROC __glewFlushVertexArrayRangeNV = NULL;
+PFNGLVERTEXARRAYRANGENVPROC __glewVertexArrayRangeNV = NULL;
+
+PFNGLAREPROGRAMSRESIDENTNVPROC __glewAreProgramsResidentNV = NULL;
+PFNGLBINDPROGRAMNVPROC __glewBindProgramNV = NULL;
+PFNGLDELETEPROGRAMSNVPROC __glewDeleteProgramsNV = NULL;
+PFNGLEXECUTEPROGRAMNVPROC __glewExecuteProgramNV = NULL;
+PFNGLGENPROGRAMSNVPROC __glewGenProgramsNV = NULL;
+PFNGLGETPROGRAMPARAMETERDVNVPROC __glewGetProgramParameterdvNV = NULL;
+PFNGLGETPROGRAMPARAMETERFVNVPROC __glewGetProgramParameterfvNV = NULL;
+PFNGLGETPROGRAMSTRINGNVPROC __glewGetProgramStringNV = NULL;
+PFNGLGETPROGRAMIVNVPROC __glewGetProgramivNV = NULL;
+PFNGLGETTRACKMATRIXIVNVPROC __glewGetTrackMatrixivNV = NULL;
+PFNGLGETVERTEXATTRIBPOINTERVNVPROC __glewGetVertexAttribPointervNV = NULL;
+PFNGLGETVERTEXATTRIBDVNVPROC __glewGetVertexAttribdvNV = NULL;
+PFNGLGETVERTEXATTRIBFVNVPROC __glewGetVertexAttribfvNV = NULL;
+PFNGLGETVERTEXATTRIBIVNVPROC __glewGetVertexAttribivNV = NULL;
+PFNGLISPROGRAMNVPROC __glewIsProgramNV = NULL;
+PFNGLLOADPROGRAMNVPROC __glewLoadProgramNV = NULL;
+PFNGLPROGRAMPARAMETER4DNVPROC __glewProgramParameter4dNV = NULL;
+PFNGLPROGRAMPARAMETER4DVNVPROC __glewProgramParameter4dvNV = NULL;
+PFNGLPROGRAMPARAMETER4FNVPROC __glewProgramParameter4fNV = NULL;
+PFNGLPROGRAMPARAMETER4FVNVPROC __glewProgramParameter4fvNV = NULL;
+PFNGLPROGRAMPARAMETERS4DVNVPROC __glewProgramParameters4dvNV = NULL;
+PFNGLPROGRAMPARAMETERS4FVNVPROC __glewProgramParameters4fvNV = NULL;
+PFNGLREQUESTRESIDENTPROGRAMSNVPROC __glewRequestResidentProgramsNV = NULL;
+PFNGLTRACKMATRIXNVPROC __glewTrackMatrixNV = NULL;
+PFNGLVERTEXATTRIB1DNVPROC __glewVertexAttrib1dNV = NULL;
+PFNGLVERTEXATTRIB1DVNVPROC __glewVertexAttrib1dvNV = NULL;
+PFNGLVERTEXATTRIB1FNVPROC __glewVertexAttrib1fNV = NULL;
+PFNGLVERTEXATTRIB1FVNVPROC __glewVertexAttrib1fvNV = NULL;
+PFNGLVERTEXATTRIB1SNVPROC __glewVertexAttrib1sNV = NULL;
+PFNGLVERTEXATTRIB1SVNVPROC __glewVertexAttrib1svNV = NULL;
+PFNGLVERTEXATTRIB2DNVPROC __glewVertexAttrib2dNV = NULL;
+PFNGLVERTEXATTRIB2DVNVPROC __glewVertexAttrib2dvNV = NULL;
+PFNGLVERTEXATTRIB2FNVPROC __glewVertexAttrib2fNV = NULL;
+PFNGLVERTEXATTRIB2FVNVPROC __glewVertexAttrib2fvNV = NULL;
+PFNGLVERTEXATTRIB2SNVPROC __glewVertexAttrib2sNV = NULL;
+PFNGLVERTEXATTRIB2SVNVPROC __glewVertexAttrib2svNV = NULL;
+PFNGLVERTEXATTRIB3DNVPROC __glewVertexAttrib3dNV = NULL;
+PFNGLVERTEXATTRIB3DVNVPROC __glewVertexAttrib3dvNV = NULL;
+PFNGLVERTEXATTRIB3FNVPROC __glewVertexAttrib3fNV = NULL;
+PFNGLVERTEXATTRIB3FVNVPROC __glewVertexAttrib3fvNV = NULL;
+PFNGLVERTEXATTRIB3SNVPROC __glewVertexAttrib3sNV = NULL;
+PFNGLVERTEXATTRIB3SVNVPROC __glewVertexAttrib3svNV = NULL;
+PFNGLVERTEXATTRIB4DNVPROC __glewVertexAttrib4dNV = NULL;
+PFNGLVERTEXATTRIB4DVNVPROC __glewVertexAttrib4dvNV = NULL;
+PFNGLVERTEXATTRIB4FNVPROC __glewVertexAttrib4fNV = NULL;
+PFNGLVERTEXATTRIB4FVNVPROC __glewVertexAttrib4fvNV = NULL;
+PFNGLVERTEXATTRIB4SNVPROC __glewVertexAttrib4sNV = NULL;
+PFNGLVERTEXATTRIB4SVNVPROC __glewVertexAttrib4svNV = NULL;
+PFNGLVERTEXATTRIB4UBNVPROC __glewVertexAttrib4ubNV = NULL;
+PFNGLVERTEXATTRIB4UBVNVPROC __glewVertexAttrib4ubvNV = NULL;
+PFNGLVERTEXATTRIBPOINTERNVPROC __glewVertexAttribPointerNV = NULL;
+PFNGLVERTEXATTRIBS1DVNVPROC __glewVertexAttribs1dvNV = NULL;
+PFNGLVERTEXATTRIBS1FVNVPROC __glewVertexAttribs1fvNV = NULL;
+PFNGLVERTEXATTRIBS1SVNVPROC __glewVertexAttribs1svNV = NULL;
+PFNGLVERTEXATTRIBS2DVNVPROC __glewVertexAttribs2dvNV = NULL;
+PFNGLVERTEXATTRIBS2FVNVPROC __glewVertexAttribs2fvNV = NULL;
+PFNGLVERTEXATTRIBS2SVNVPROC __glewVertexAttribs2svNV = NULL;
+PFNGLVERTEXATTRIBS3DVNVPROC __glewVertexAttribs3dvNV = NULL;
+PFNGLVERTEXATTRIBS3FVNVPROC __glewVertexAttribs3fvNV = NULL;
+PFNGLVERTEXATTRIBS3SVNVPROC __glewVertexAttribs3svNV = NULL;
+PFNGLVERTEXATTRIBS4DVNVPROC __glewVertexAttribs4dvNV = NULL;
+PFNGLVERTEXATTRIBS4FVNVPROC __glewVertexAttribs4fvNV = NULL;
+PFNGLVERTEXATTRIBS4SVNVPROC __glewVertexAttribs4svNV = NULL;
+PFNGLVERTEXATTRIBS4UBVNVPROC __glewVertexAttribs4ubvNV = NULL;
+
+PFNGLDETAILTEXFUNCSGISPROC __glewDetailTexFuncSGIS = NULL;
+PFNGLGETDETAILTEXFUNCSGISPROC __glewGetDetailTexFuncSGIS = NULL;
+
+PFNGLFOGFUNCSGISPROC __glewFogFuncSGIS = NULL;
+PFNGLGETFOGFUNCSGISPROC __glewGetFogFuncSGIS = NULL;
+
+PFNGLSAMPLEMASKSGISPROC __glewSampleMaskSGIS = NULL;
+PFNGLSAMPLEPATTERNSGISPROC __glewSamplePatternSGIS = NULL;
+
+PFNGLGETSHARPENTEXFUNCSGISPROC __glewGetSharpenTexFuncSGIS = NULL;
+PFNGLSHARPENTEXFUNCSGISPROC __glewSharpenTexFuncSGIS = NULL;
+
+PFNGLTEXIMAGE4DSGISPROC __glewTexImage4DSGIS = NULL;
+PFNGLTEXSUBIMAGE4DSGISPROC __glewTexSubImage4DSGIS = NULL;
+
+PFNGLGETTEXFILTERFUNCSGISPROC __glewGetTexFilterFuncSGIS = NULL;
+PFNGLTEXFILTERFUNCSGISPROC __glewTexFilterFuncSGIS = NULL;
+
+PFNGLASYNCMARKERSGIXPROC __glewAsyncMarkerSGIX = NULL;
+PFNGLDELETEASYNCMARKERSSGIXPROC __glewDeleteAsyncMarkersSGIX = NULL;
+PFNGLFINISHASYNCSGIXPROC __glewFinishAsyncSGIX = NULL;
+PFNGLGENASYNCMARKERSSGIXPROC __glewGenAsyncMarkersSGIX = NULL;
+PFNGLISASYNCMARKERSGIXPROC __glewIsAsyncMarkerSGIX = NULL;
+PFNGLPOLLASYNCSGIXPROC __glewPollAsyncSGIX = NULL;
+
+PFNGLFLUSHRASTERSGIXPROC __glewFlushRasterSGIX = NULL;
+
+PFNGLTEXTUREFOGSGIXPROC __glewTextureFogSGIX = NULL;
+
+#if 0
+PFNGLFRAGMENTCOLORMATERIALSGIXPROC __glewFragmentColorMaterialSGIX = NULL;
+PFNGLFRAGMENTLIGHTMODELFSGIXPROC __glewFragmentLightModelfSGIX = NULL;
+PFNGLFRAGMENTLIGHTMODELFVSGIXPROC __glewFragmentLightModelfvSGIX = NULL;
+PFNGLFRAGMENTLIGHTMODELISGIXPROC __glewFragmentLightModeliSGIX = NULL;
+PFNGLFRAGMENTLIGHTMODELIVSGIXPROC __glewFragmentLightModelivSGIX = NULL;
+PFNGLFRAGMENTLIGHTFSGIXPROC __glewFragmentLightfSGIX = NULL;
+PFNGLFRAGMENTLIGHTFVSGIXPROC __glewFragmentLightfvSGIX = NULL;
+PFNGLFRAGMENTLIGHTISGIXPROC __glewFragmentLightiSGIX = NULL;
+PFNGLFRAGMENTLIGHTIVSGIXPROC __glewFragmentLightivSGIX = NULL;
+PFNGLFRAGMENTMATERIALFSGIXPROC __glewFragmentMaterialfSGIX = NULL;
+PFNGLFRAGMENTMATERIALFVSGIXPROC __glewFragmentMaterialfvSGIX = NULL;
+PFNGLFRAGMENTMATERIALISGIXPROC __glewFragmentMaterialiSGIX = NULL;
+PFNGLFRAGMENTMATERIALIVSGIXPROC __glewFragmentMaterialivSGIX = NULL;
+PFNGLGETFRAGMENTLIGHTFVSGIXPROC __glewGetFragmentLightfvSGIX = NULL;
+PFNGLGETFRAGMENTLIGHTIVSGIXPROC __glewGetFragmentLightivSGIX = NULL;
+PFNGLGETFRAGMENTMATERIALFVSGIXPROC __glewGetFragmentMaterialfvSGIX = NULL;
+PFNGLGETFRAGMENTMATERIALIVSGIXPROC __glewGetFragmentMaterialivSGIX = NULL;
+#endif
+
+PFNGLFRAMEZOOMSGIXPROC __glewFrameZoomSGIX = NULL;
+
+PFNGLPIXELTEXGENSGIXPROC __glewPixelTexGenSGIX = NULL;
+
+PFNGLREFERENCEPLANESGIXPROC __glewReferencePlaneSGIX = NULL;
+
+PFNGLSPRITEPARAMETERFSGIXPROC __glewSpriteParameterfSGIX = NULL;
+PFNGLSPRITEPARAMETERFVSGIXPROC __glewSpriteParameterfvSGIX = NULL;
+PFNGLSPRITEPARAMETERISGIXPROC __glewSpriteParameteriSGIX = NULL;
+PFNGLSPRITEPARAMETERIVSGIXPROC __glewSpriteParameterivSGIX = NULL;
+
+PFNGLTAGSAMPLEBUFFERSGIXPROC __glewTagSampleBufferSGIX = NULL;
+
+PFNGLCOLORTABLEPARAMETERFVSGIPROC __glewColorTableParameterfvSGI = NULL;
+PFNGLCOLORTABLEPARAMETERIVSGIPROC __glewColorTableParameterivSGI = NULL;
+PFNGLCOLORTABLESGIPROC __glewColorTableSGI = NULL;
+PFNGLCOPYCOLORTABLESGIPROC __glewCopyColorTableSGI = NULL;
+PFNGLGETCOLORTABLEPARAMETERFVSGIPROC __glewGetColorTableParameterfvSGI = NULL;
+PFNGLGETCOLORTABLEPARAMETERIVSGIPROC __glewGetColorTableParameterivSGI = NULL;
+PFNGLGETCOLORTABLESGIPROC __glewGetColorTableSGI = NULL;
+
+PFNGLFINISHTEXTURESUNXPROC __glewFinishTextureSUNX = NULL;
+
+PFNGLGLOBALALPHAFACTORBSUNPROC __glewGlobalAlphaFactorbSUN = NULL;
+PFNGLGLOBALALPHAFACTORDSUNPROC __glewGlobalAlphaFactordSUN = NULL;
+PFNGLGLOBALALPHAFACTORFSUNPROC __glewGlobalAlphaFactorfSUN = NULL;
+PFNGLGLOBALALPHAFACTORISUNPROC __glewGlobalAlphaFactoriSUN = NULL;
+PFNGLGLOBALALPHAFACTORSSUNPROC __glewGlobalAlphaFactorsSUN = NULL;
+PFNGLGLOBALALPHAFACTORUBSUNPROC __glewGlobalAlphaFactorubSUN = NULL;
+PFNGLGLOBALALPHAFACTORUISUNPROC __glewGlobalAlphaFactoruiSUN = NULL;
+PFNGLGLOBALALPHAFACTORUSSUNPROC __glewGlobalAlphaFactorusSUN = NULL;
+
+PFNGLREADVIDEOPIXELSSUNPROC __glewReadVideoPixelsSUN = NULL;
+
+PFNGLREPLACEMENTCODEPOINTERSUNPROC __glewReplacementCodePointerSUN = NULL;
+PFNGLREPLACEMENTCODEUBSUNPROC __glewReplacementCodeubSUN = NULL;
+PFNGLREPLACEMENTCODEUBVSUNPROC __glewReplacementCodeubvSUN = NULL;
+PFNGLREPLACEMENTCODEUISUNPROC __glewReplacementCodeuiSUN = NULL;
+PFNGLREPLACEMENTCODEUIVSUNPROC __glewReplacementCodeuivSUN = NULL;
+PFNGLREPLACEMENTCODEUSSUNPROC __glewReplacementCodeusSUN = NULL;
+PFNGLREPLACEMENTCODEUSVSUNPROC __glewReplacementCodeusvSUN = NULL;
+
+PFNGLCOLOR3FVERTEX3FSUNPROC __glewColor3fVertex3fSUN = NULL;
+PFNGLCOLOR3FVERTEX3FVSUNPROC __glewColor3fVertex3fvSUN = NULL;
+PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC __glewColor4fNormal3fVertex3fSUN = NULL;
+PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC __glewColor4fNormal3fVertex3fvSUN = NULL;
+PFNGLCOLOR4UBVERTEX2FSUNPROC __glewColor4ubVertex2fSUN = NULL;
+PFNGLCOLOR4UBVERTEX2FVSUNPROC __glewColor4ubVertex2fvSUN = NULL;
+PFNGLCOLOR4UBVERTEX3FSUNPROC __glewColor4ubVertex3fSUN = NULL;
+PFNGLCOLOR4UBVERTEX3FVSUNPROC __glewColor4ubVertex3fvSUN = NULL;
+PFNGLNORMAL3FVERTEX3FSUNPROC __glewNormal3fVertex3fSUN = NULL;
+PFNGLNORMAL3FVERTEX3FVSUNPROC __glewNormal3fVertex3fvSUN = NULL;
+PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC __glewReplacementCodeuiColor3fVertex3fSUN = NULL;
+PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC __glewReplacementCodeuiColor3fVertex3fvSUN = NULL;
+PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC __glewReplacementCodeuiColor4fNormal3fVertex3fSUN = NULL;
+PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC __glewReplacementCodeuiColor4fNormal3fVertex3fvSUN = NULL;
+PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC __glewReplacementCodeuiColor4ubVertex3fSUN = NULL;
+PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC __glewReplacementCodeuiColor4ubVertex3fvSUN = NULL;
+PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC __glewReplacementCodeuiNormal3fVertex3fSUN = NULL;
+PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC __glewReplacementCodeuiNormal3fVertex3fvSUN = NULL;
+PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC __glewReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN = NULL;
+PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC __glewReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN = NULL;
+PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC __glewReplacementCodeuiTexCoord2fNormal3fVertex3fSUN = NULL;
+PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC __glewReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN = NULL;
+PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC __glewReplacementCodeuiTexCoord2fVertex3fSUN = NULL;
+PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC __glewReplacementCodeuiTexCoord2fVertex3fvSUN = NULL;
+PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC __glewReplacementCodeuiVertex3fSUN = NULL;
+PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC __glewReplacementCodeuiVertex3fvSUN = NULL;
+PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC __glewTexCoord2fColor3fVertex3fSUN = NULL;
+PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC __glewTexCoord2fColor3fVertex3fvSUN = NULL;
+PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC __glewTexCoord2fColor4fNormal3fVertex3fSUN = NULL;
+PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC __glewTexCoord2fColor4fNormal3fVertex3fvSUN = NULL;
+PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC __glewTexCoord2fColor4ubVertex3fSUN = NULL;
+PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC __glewTexCoord2fColor4ubVertex3fvSUN = NULL;
+PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC __glewTexCoord2fNormal3fVertex3fSUN = NULL;
+PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC __glewTexCoord2fNormal3fVertex3fvSUN = NULL;
+PFNGLTEXCOORD2FVERTEX3FSUNPROC __glewTexCoord2fVertex3fSUN = NULL;
+PFNGLTEXCOORD2FVERTEX3FVSUNPROC __glewTexCoord2fVertex3fvSUN = NULL;
+PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC __glewTexCoord4fColor4fNormal3fVertex4fSUN = NULL;
+PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC __glewTexCoord4fColor4fNormal3fVertex4fvSUN = NULL;
+PFNGLTEXCOORD4FVERTEX4FSUNPROC __glewTexCoord4fVertex4fSUN = NULL;
+PFNGLTEXCOORD4FVERTEX4FVSUNPROC __glewTexCoord4fVertex4fvSUN = NULL;
+
+PFNGLADDSWAPHINTRECTWINPROC __glewAddSwapHintRectWIN = NULL;
+
+#endif /* !WIN32 || !GLEW_MX */
+
+#if !defined(GLEW_MX)
+
+GLboolean __GLEW_VERSION_1_1 = GL_FALSE;
+GLboolean __GLEW_VERSION_1_2 = GL_FALSE;
+GLboolean __GLEW_VERSION_1_3 = GL_FALSE;
+GLboolean __GLEW_VERSION_1_4 = GL_FALSE;
+GLboolean __GLEW_VERSION_1_5 = GL_FALSE;
+GLboolean __GLEW_VERSION_2_0 = GL_FALSE;
+GLboolean __GLEW_3DFX_multisample = GL_FALSE;
+GLboolean __GLEW_3DFX_tbuffer = GL_FALSE;
+GLboolean __GLEW_3DFX_texture_compression_FXT1 = GL_FALSE;
+GLboolean __GLEW_APPLE_client_storage = GL_FALSE;
+GLboolean __GLEW_APPLE_element_array = GL_FALSE;
+GLboolean __GLEW_APPLE_fence = GL_FALSE;
+GLboolean __GLEW_APPLE_float_pixels = GL_FALSE;
+GLboolean __GLEW_APPLE_pixel_buffer = GL_FALSE;
+GLboolean __GLEW_APPLE_specular_vector = GL_FALSE;
+GLboolean __GLEW_APPLE_texture_range = GL_FALSE;
+GLboolean __GLEW_APPLE_transform_hint = GL_FALSE;
+GLboolean __GLEW_APPLE_vertex_array_object = GL_FALSE;
+GLboolean __GLEW_APPLE_vertex_array_range = GL_FALSE;
+GLboolean __GLEW_APPLE_ycbcr_422 = GL_FALSE;
+GLboolean __GLEW_ARB_color_buffer_float = GL_FALSE;
+GLboolean __GLEW_ARB_depth_texture = GL_FALSE;
+GLboolean __GLEW_ARB_draw_buffers = GL_FALSE;
+GLboolean __GLEW_ARB_fragment_program = GL_FALSE;
+GLboolean __GLEW_ARB_fragment_program_shadow = GL_FALSE;
+GLboolean __GLEW_ARB_fragment_shader = GL_FALSE;
+GLboolean __GLEW_ARB_half_float_pixel = GL_FALSE;
+GLboolean __GLEW_ARB_imaging = GL_FALSE;
+GLboolean __GLEW_ARB_matrix_palette = GL_FALSE;
+GLboolean __GLEW_ARB_multisample = GL_FALSE;
+GLboolean __GLEW_ARB_multitexture = GL_FALSE;
+GLboolean __GLEW_ARB_occlusion_query = GL_FALSE;
+GLboolean __GLEW_ARB_pixel_buffer_object = GL_FALSE;
+GLboolean __GLEW_ARB_point_parameters = GL_FALSE;
+GLboolean __GLEW_ARB_point_sprite = GL_FALSE;
+GLboolean __GLEW_ARB_shader_objects = GL_FALSE;
+GLboolean __GLEW_ARB_shading_language_100 = GL_FALSE;
+GLboolean __GLEW_ARB_shadow = GL_FALSE;
+GLboolean __GLEW_ARB_shadow_ambient = GL_FALSE;
+GLboolean __GLEW_ARB_texture_border_clamp = GL_FALSE;
+GLboolean __GLEW_ARB_texture_compression = GL_FALSE;
+GLboolean __GLEW_ARB_texture_cube_map = GL_FALSE;
+GLboolean __GLEW_ARB_texture_env_add = GL_FALSE;
+GLboolean __GLEW_ARB_texture_env_combine = GL_FALSE;
+GLboolean __GLEW_ARB_texture_env_crossbar = GL_FALSE;
+GLboolean __GLEW_ARB_texture_env_dot3 = GL_FALSE;
+GLboolean __GLEW_ARB_texture_float = GL_FALSE;
+GLboolean __GLEW_ARB_texture_mirrored_repeat = GL_FALSE;
+GLboolean __GLEW_ARB_texture_non_power_of_two = GL_FALSE;
+GLboolean __GLEW_ARB_texture_rectangle = GL_FALSE;
+GLboolean __GLEW_ARB_transpose_matrix = GL_FALSE;
+GLboolean __GLEW_ARB_vertex_blend = GL_FALSE;
+GLboolean __GLEW_ARB_vertex_buffer_object = GL_FALSE;
+GLboolean __GLEW_ARB_vertex_program = GL_FALSE;
+GLboolean __GLEW_ARB_vertex_shader = GL_FALSE;
+GLboolean __GLEW_ARB_window_pos = GL_FALSE;
+GLboolean __GLEW_ATIX_point_sprites = GL_FALSE;
+GLboolean __GLEW_ATIX_texture_env_combine3 = GL_FALSE;
+GLboolean __GLEW_ATIX_texture_env_route = GL_FALSE;
+GLboolean __GLEW_ATIX_vertex_shader_output_point_size = GL_FALSE;
+GLboolean __GLEW_ATI_draw_buffers = GL_FALSE;
+GLboolean __GLEW_ATI_element_array = GL_FALSE;
+GLboolean __GLEW_ATI_envmap_bumpmap = GL_FALSE;
+GLboolean __GLEW_ATI_fragment_shader = GL_FALSE;
+GLboolean __GLEW_ATI_map_object_buffer = GL_FALSE;
+GLboolean __GLEW_ATI_pn_triangles = GL_FALSE;
+GLboolean __GLEW_ATI_separate_stencil = GL_FALSE;
+GLboolean __GLEW_ATI_text_fragment_shader = GL_FALSE;
+GLboolean __GLEW_ATI_texture_compression_3dc = GL_FALSE;
+GLboolean __GLEW_ATI_texture_env_combine3 = GL_FALSE;
+GLboolean __GLEW_ATI_texture_float = GL_FALSE;
+GLboolean __GLEW_ATI_texture_mirror_once = GL_FALSE;
+GLboolean __GLEW_ATI_vertex_array_object = GL_FALSE;
+GLboolean __GLEW_ATI_vertex_attrib_array_object = GL_FALSE;
+GLboolean __GLEW_ATI_vertex_streams = GL_FALSE;
+GLboolean __GLEW_EXT_422_pixels = GL_FALSE;
+GLboolean __GLEW_EXT_Cg_shader = GL_FALSE;
+GLboolean __GLEW_EXT_abgr = GL_FALSE;
+GLboolean __GLEW_EXT_bgra = GL_FALSE;
+GLboolean __GLEW_EXT_blend_color = GL_FALSE;
+GLboolean __GLEW_EXT_blend_equation_separate = GL_FALSE;
+GLboolean __GLEW_EXT_blend_func_separate = GL_FALSE;
+GLboolean __GLEW_EXT_blend_logic_op = GL_FALSE;
+GLboolean __GLEW_EXT_blend_minmax = GL_FALSE;
+GLboolean __GLEW_EXT_blend_subtract = GL_FALSE;
+GLboolean __GLEW_EXT_clip_volume_hint = GL_FALSE;
+GLboolean __GLEW_EXT_cmyka = GL_FALSE;
+GLboolean __GLEW_EXT_color_subtable = GL_FALSE;
+GLboolean __GLEW_EXT_compiled_vertex_array = GL_FALSE;
+GLboolean __GLEW_EXT_convolution = GL_FALSE;
+GLboolean __GLEW_EXT_coordinate_frame = GL_FALSE;
+GLboolean __GLEW_EXT_copy_texture = GL_FALSE;
+GLboolean __GLEW_EXT_cull_vertex = GL_FALSE;
+GLboolean __GLEW_EXT_depth_bounds_test = GL_FALSE;
+GLboolean __GLEW_EXT_draw_range_elements = GL_FALSE;
+GLboolean __GLEW_EXT_fog_coord = GL_FALSE;
+GLboolean __GLEW_EXT_fragment_lighting = GL_FALSE;
+GLboolean __GLEW_EXT_framebuffer_blit = GL_FALSE;
+GLboolean __GLEW_EXT_framebuffer_multisample = GL_FALSE;
+GLboolean __GLEW_EXT_framebuffer_object = GL_FALSE;
+GLboolean __GLEW_EXT_histogram = GL_FALSE;
+GLboolean __GLEW_EXT_index_array_formats = GL_FALSE;
+GLboolean __GLEW_EXT_index_func = GL_FALSE;
+GLboolean __GLEW_EXT_index_material = GL_FALSE;
+GLboolean __GLEW_EXT_index_texture = GL_FALSE;
+GLboolean __GLEW_EXT_light_texture = GL_FALSE;
+GLboolean __GLEW_EXT_misc_attribute = GL_FALSE;
+GLboolean __GLEW_EXT_multi_draw_arrays = GL_FALSE;
+GLboolean __GLEW_EXT_multisample = GL_FALSE;
+GLboolean __GLEW_EXT_packed_depth_stencil = GL_FALSE;
+GLboolean __GLEW_EXT_packed_pixels = GL_FALSE;
+GLboolean __GLEW_EXT_paletted_texture = GL_FALSE;
+GLboolean __GLEW_EXT_pixel_buffer_object = GL_FALSE;
+GLboolean __GLEW_EXT_pixel_transform = GL_FALSE;
+GLboolean __GLEW_EXT_pixel_transform_color_table = GL_FALSE;
+GLboolean __GLEW_EXT_point_parameters = GL_FALSE;
+GLboolean __GLEW_EXT_polygon_offset = GL_FALSE;
+GLboolean __GLEW_EXT_rescale_normal = GL_FALSE;
+GLboolean __GLEW_EXT_scene_marker = GL_FALSE;
+GLboolean __GLEW_EXT_secondary_color = GL_FALSE;
+GLboolean __GLEW_EXT_separate_specular_color = GL_FALSE;
+GLboolean __GLEW_EXT_shadow_funcs = GL_FALSE;
+GLboolean __GLEW_EXT_shared_texture_palette = GL_FALSE;
+GLboolean __GLEW_EXT_stencil_clear_tag = GL_FALSE;
+GLboolean __GLEW_EXT_stencil_two_side = GL_FALSE;
+GLboolean __GLEW_EXT_stencil_wrap = GL_FALSE;
+GLboolean __GLEW_EXT_subtexture = GL_FALSE;
+GLboolean __GLEW_EXT_texture = GL_FALSE;
+GLboolean __GLEW_EXT_texture3D = GL_FALSE;
+GLboolean __GLEW_EXT_texture_compression_dxt1 = GL_FALSE;
+GLboolean __GLEW_EXT_texture_compression_s3tc = GL_FALSE;
+GLboolean __GLEW_EXT_texture_cube_map = GL_FALSE;
+GLboolean __GLEW_EXT_texture_edge_clamp = GL_FALSE;
+GLboolean __GLEW_EXT_texture_env = GL_FALSE;
+GLboolean __GLEW_EXT_texture_env_add = GL_FALSE;
+GLboolean __GLEW_EXT_texture_env_combine = GL_FALSE;
+GLboolean __GLEW_EXT_texture_env_dot3 = GL_FALSE;
+GLboolean __GLEW_EXT_texture_filter_anisotropic = GL_FALSE;
+GLboolean __GLEW_EXT_texture_lod_bias = GL_FALSE;
+GLboolean __GLEW_EXT_texture_mirror_clamp = GL_FALSE;
+GLboolean __GLEW_EXT_texture_object = GL_FALSE;
+GLboolean __GLEW_EXT_texture_perturb_normal = GL_FALSE;
+GLboolean __GLEW_EXT_texture_rectangle = GL_FALSE;
+GLboolean __GLEW_EXT_texture_sRGB = GL_FALSE;
+GLboolean __GLEW_EXT_vertex_array = GL_FALSE;
+GLboolean __GLEW_EXT_vertex_shader = GL_FALSE;
+GLboolean __GLEW_EXT_vertex_weighting = GL_FALSE;
+GLboolean __GLEW_GREMEDY_string_marker = GL_FALSE;
+GLboolean __GLEW_HP_convolution_border_modes = GL_FALSE;
+GLboolean __GLEW_HP_image_transform = GL_FALSE;
+GLboolean __GLEW_HP_occlusion_test = GL_FALSE;
+GLboolean __GLEW_HP_texture_lighting = GL_FALSE;
+GLboolean __GLEW_IBM_cull_vertex = GL_FALSE;
+GLboolean __GLEW_IBM_multimode_draw_arrays = GL_FALSE;
+GLboolean __GLEW_IBM_rasterpos_clip = GL_FALSE;
+GLboolean __GLEW_IBM_static_data = GL_FALSE;
+GLboolean __GLEW_IBM_texture_mirrored_repeat = GL_FALSE;
+GLboolean __GLEW_IBM_vertex_array_lists = GL_FALSE;
+GLboolean __GLEW_INGR_color_clamp = GL_FALSE;
+GLboolean __GLEW_INGR_interlace_read = GL_FALSE;
+GLboolean __GLEW_INTEL_parallel_arrays = GL_FALSE;
+GLboolean __GLEW_INTEL_texture_scissor = GL_FALSE;
+GLboolean __GLEW_KTX_buffer_region = GL_FALSE;
+GLboolean __GLEW_MESAX_texture_stack = GL_FALSE;
+GLboolean __GLEW_MESA_pack_invert = GL_FALSE;
+GLboolean __GLEW_MESA_resize_buffers = GL_FALSE;
+GLboolean __GLEW_MESA_window_pos = GL_FALSE;
+GLboolean __GLEW_MESA_ycbcr_texture = GL_FALSE;
+GLboolean __GLEW_NV_blend_square = GL_FALSE;
+GLboolean __GLEW_NV_copy_depth_to_color = GL_FALSE;
+GLboolean __GLEW_NV_depth_clamp = GL_FALSE;
+GLboolean __GLEW_NV_evaluators = GL_FALSE;
+GLboolean __GLEW_NV_fence = GL_FALSE;
+GLboolean __GLEW_NV_float_buffer = GL_FALSE;
+GLboolean __GLEW_NV_fog_distance = GL_FALSE;
+GLboolean __GLEW_NV_fragment_program = GL_FALSE;
+GLboolean __GLEW_NV_fragment_program2 = GL_FALSE;
+GLboolean __GLEW_NV_fragment_program_option = GL_FALSE;
+GLboolean __GLEW_NV_half_float = GL_FALSE;
+GLboolean __GLEW_NV_light_max_exponent = GL_FALSE;
+GLboolean __GLEW_NV_multisample_filter_hint = GL_FALSE;
+GLboolean __GLEW_NV_occlusion_query = GL_FALSE;
+GLboolean __GLEW_NV_packed_depth_stencil = GL_FALSE;
+GLboolean __GLEW_NV_pixel_data_range = GL_FALSE;
+GLboolean __GLEW_NV_point_sprite = GL_FALSE;
+GLboolean __GLEW_NV_primitive_restart = GL_FALSE;
+GLboolean __GLEW_NV_register_combiners = GL_FALSE;
+GLboolean __GLEW_NV_register_combiners2 = GL_FALSE;
+GLboolean __GLEW_NV_texgen_emboss = GL_FALSE;
+GLboolean __GLEW_NV_texgen_reflection = GL_FALSE;
+GLboolean __GLEW_NV_texture_compression_vtc = GL_FALSE;
+GLboolean __GLEW_NV_texture_env_combine4 = GL_FALSE;
+GLboolean __GLEW_NV_texture_expand_normal = GL_FALSE;
+GLboolean __GLEW_NV_texture_rectangle = GL_FALSE;
+GLboolean __GLEW_NV_texture_shader = GL_FALSE;
+GLboolean __GLEW_NV_texture_shader2 = GL_FALSE;
+GLboolean __GLEW_NV_texture_shader3 = GL_FALSE;
+GLboolean __GLEW_NV_vertex_array_range = GL_FALSE;
+GLboolean __GLEW_NV_vertex_array_range2 = GL_FALSE;
+GLboolean __GLEW_NV_vertex_program = GL_FALSE;
+GLboolean __GLEW_NV_vertex_program1_1 = GL_FALSE;
+GLboolean __GLEW_NV_vertex_program2 = GL_FALSE;
+GLboolean __GLEW_NV_vertex_program2_option = GL_FALSE;
+GLboolean __GLEW_NV_vertex_program3 = GL_FALSE;
+GLboolean __GLEW_OML_interlace = GL_FALSE;
+GLboolean __GLEW_OML_resample = GL_FALSE;
+GLboolean __GLEW_OML_subsample = GL_FALSE;
+GLboolean __GLEW_PGI_misc_hints = GL_FALSE;
+GLboolean __GLEW_PGI_vertex_hints = GL_FALSE;
+GLboolean __GLEW_REND_screen_coordinates = GL_FALSE;
+GLboolean __GLEW_S3_s3tc = GL_FALSE;
+GLboolean __GLEW_SGIS_color_range = GL_FALSE;
+GLboolean __GLEW_SGIS_detail_texture = GL_FALSE;
+GLboolean __GLEW_SGIS_fog_function = GL_FALSE;
+GLboolean __GLEW_SGIS_generate_mipmap = GL_FALSE;
+GLboolean __GLEW_SGIS_multisample = GL_FALSE;
+GLboolean __GLEW_SGIS_pixel_texture = GL_FALSE;
+GLboolean __GLEW_SGIS_sharpen_texture = GL_FALSE;
+GLboolean __GLEW_SGIS_texture4D = GL_FALSE;
+GLboolean __GLEW_SGIS_texture_border_clamp = GL_FALSE;
+GLboolean __GLEW_SGIS_texture_edge_clamp = GL_FALSE;
+GLboolean __GLEW_SGIS_texture_filter4 = GL_FALSE;
+GLboolean __GLEW_SGIS_texture_lod = GL_FALSE;
+GLboolean __GLEW_SGIS_texture_select = GL_FALSE;
+GLboolean __GLEW_SGIX_async = GL_FALSE;
+GLboolean __GLEW_SGIX_async_histogram = GL_FALSE;
+GLboolean __GLEW_SGIX_async_pixel = GL_FALSE;
+GLboolean __GLEW_SGIX_blend_alpha_minmax = GL_FALSE;
+GLboolean __GLEW_SGIX_clipmap = GL_FALSE;
+GLboolean __GLEW_SGIX_depth_texture = GL_FALSE;
+GLboolean __GLEW_SGIX_flush_raster = GL_FALSE;
+GLboolean __GLEW_SGIX_fog_offset = GL_FALSE;
+GLboolean __GLEW_SGIX_fog_texture = GL_FALSE;
+GLboolean __GLEW_SGIX_fragment_specular_lighting = GL_FALSE;
+GLboolean __GLEW_SGIX_framezoom = GL_FALSE;
+GLboolean __GLEW_SGIX_interlace = GL_FALSE;
+GLboolean __GLEW_SGIX_ir_instrument1 = GL_FALSE;
+GLboolean __GLEW_SGIX_list_priority = GL_FALSE;
+GLboolean __GLEW_SGIX_pixel_texture = GL_FALSE;
+GLboolean __GLEW_SGIX_pixel_texture_bits = GL_FALSE;
+GLboolean __GLEW_SGIX_reference_plane = GL_FALSE;
+GLboolean __GLEW_SGIX_resample = GL_FALSE;
+GLboolean __GLEW_SGIX_shadow = GL_FALSE;
+GLboolean __GLEW_SGIX_shadow_ambient = GL_FALSE;
+GLboolean __GLEW_SGIX_sprite = GL_FALSE;
+GLboolean __GLEW_SGIX_tag_sample_buffer = GL_FALSE;
+GLboolean __GLEW_SGIX_texture_add_env = GL_FALSE;
+GLboolean __GLEW_SGIX_texture_coordinate_clamp = GL_FALSE;
+GLboolean __GLEW_SGIX_texture_lod_bias = GL_FALSE;
+GLboolean __GLEW_SGIX_texture_multi_buffer = GL_FALSE;
+GLboolean __GLEW_SGIX_texture_range = GL_FALSE;
+GLboolean __GLEW_SGIX_texture_scale_bias = GL_FALSE;
+GLboolean __GLEW_SGIX_vertex_preclip = GL_FALSE;
+GLboolean __GLEW_SGIX_vertex_preclip_hint = GL_FALSE;
+GLboolean __GLEW_SGIX_ycrcb = GL_FALSE;
+GLboolean __GLEW_SGI_color_matrix = GL_FALSE;
+GLboolean __GLEW_SGI_color_table = GL_FALSE;
+GLboolean __GLEW_SGI_texture_color_table = GL_FALSE;
+GLboolean __GLEW_SUNX_constant_data = GL_FALSE;
+GLboolean __GLEW_SUN_convolution_border_modes = GL_FALSE;
+GLboolean __GLEW_SUN_global_alpha = GL_FALSE;
+GLboolean __GLEW_SUN_mesh_array = GL_FALSE;
+GLboolean __GLEW_SUN_read_video_pixels = GL_FALSE;
+GLboolean __GLEW_SUN_slice_accum = GL_FALSE;
+GLboolean __GLEW_SUN_triangle_list = GL_FALSE;
+GLboolean __GLEW_SUN_vertex = GL_FALSE;
+GLboolean __GLEW_WIN_phong_shading = GL_FALSE;
+GLboolean __GLEW_WIN_specular_fog = GL_FALSE;
+GLboolean __GLEW_WIN_swap_hint = GL_FALSE;
+
+#endif /* !GLEW_MX */
+
+#ifdef GL_VERSION_1_2
+
+static GLboolean _glewInit_GL_VERSION_1_2 (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glCopyTexSubImage3D = (PFNGLCOPYTEXSUBIMAGE3DPROC)glewGetProcAddress((const GLubyte*)"glCopyTexSubImage3D")) == NULL) || r;
+  r = ((glDrawRangeElements = (PFNGLDRAWRANGEELEMENTSPROC)glewGetProcAddress((const GLubyte*)"glDrawRangeElements")) == NULL) || r;
+  r = ((glTexImage3D = (PFNGLTEXIMAGE3DPROC)glewGetProcAddress((const GLubyte*)"glTexImage3D")) == NULL) || r;
+  r = ((glTexSubImage3D = (PFNGLTEXSUBIMAGE3DPROC)glewGetProcAddress((const GLubyte*)"glTexSubImage3D")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_VERSION_1_2 */
+
+#ifdef GL_VERSION_1_3
+
+static GLboolean _glewInit_GL_VERSION_1_3 (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glActiveTexture = (PFNGLACTIVETEXTUREPROC)glewGetProcAddress((const GLubyte*)"glActiveTexture")) == NULL) || r;
+  r = ((glClientActiveTexture = (PFNGLCLIENTACTIVETEXTUREPROC)glewGetProcAddress((const GLubyte*)"glClientActiveTexture")) == NULL) || r;
+  r = ((glCompressedTexImage1D = (PFNGLCOMPRESSEDTEXIMAGE1DPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexImage1D")) == NULL) || r;
+  r = ((glCompressedTexImage2D = (PFNGLCOMPRESSEDTEXIMAGE2DPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexImage2D")) == NULL) || r;
+  r = ((glCompressedTexImage3D = (PFNGLCOMPRESSEDTEXIMAGE3DPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexImage3D")) == NULL) || r;
+  r = ((glCompressedTexSubImage1D = (PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexSubImage1D")) == NULL) || r;
+  r = ((glCompressedTexSubImage2D = (PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexSubImage2D")) == NULL) || r;
+  r = ((glCompressedTexSubImage3D = (PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexSubImage3D")) == NULL) || r;
+  r = ((glGetCompressedTexImage = (PFNGLGETCOMPRESSEDTEXIMAGEPROC)glewGetProcAddress((const GLubyte*)"glGetCompressedTexImage")) == NULL) || r;
+  r = ((glLoadTransposeMatrixd = (PFNGLLOADTRANSPOSEMATRIXDPROC)glewGetProcAddress((const GLubyte*)"glLoadTransposeMatrixd")) == NULL) || r;
+  r = ((glLoadTransposeMatrixf = (PFNGLLOADTRANSPOSEMATRIXFPROC)glewGetProcAddress((const GLubyte*)"glLoadTransposeMatrixf")) == NULL) || r;
+  r = ((glMultTransposeMatrixd = (PFNGLMULTTRANSPOSEMATRIXDPROC)glewGetProcAddress((const GLubyte*)"glMultTransposeMatrixd")) == NULL) || r;
+  r = ((glMultTransposeMatrixf = (PFNGLMULTTRANSPOSEMATRIXFPROC)glewGetProcAddress((const GLubyte*)"glMultTransposeMatrixf")) == NULL) || r;
+  r = ((glMultiTexCoord1d = (PFNGLMULTITEXCOORD1DPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1d")) == NULL) || r;
+  r = ((glMultiTexCoord1dv = (PFNGLMULTITEXCOORD1DVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1dv")) == NULL) || r;
+  r = ((glMultiTexCoord1f = (PFNGLMULTITEXCOORD1FPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1f")) == NULL) || r;
+  r = ((glMultiTexCoord1fv = (PFNGLMULTITEXCOORD1FVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1fv")) == NULL) || r;
+  r = ((glMultiTexCoord1i = (PFNGLMULTITEXCOORD1IPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1i")) == NULL) || r;
+  r = ((glMultiTexCoord1iv = (PFNGLMULTITEXCOORD1IVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1iv")) == NULL) || r;
+  r = ((glMultiTexCoord1s = (PFNGLMULTITEXCOORD1SPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1s")) == NULL) || r;
+  r = ((glMultiTexCoord1sv = (PFNGLMULTITEXCOORD1SVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1sv")) == NULL) || r;
+  r = ((glMultiTexCoord2d = (PFNGLMULTITEXCOORD2DPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2d")) == NULL) || r;
+  r = ((glMultiTexCoord2dv = (PFNGLMULTITEXCOORD2DVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2dv")) == NULL) || r;
+  r = ((glMultiTexCoord2f = (PFNGLMULTITEXCOORD2FPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2f")) == NULL) || r;
+  r = ((glMultiTexCoord2fv = (PFNGLMULTITEXCOORD2FVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2fv")) == NULL) || r;
+  r = ((glMultiTexCoord2i = (PFNGLMULTITEXCOORD2IPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2i")) == NULL) || r;
+  r = ((glMultiTexCoord2iv = (PFNGLMULTITEXCOORD2IVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2iv")) == NULL) || r;
+  r = ((glMultiTexCoord2s = (PFNGLMULTITEXCOORD2SPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2s")) == NULL) || r;
+  r = ((glMultiTexCoord2sv = (PFNGLMULTITEXCOORD2SVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2sv")) == NULL) || r;
+  r = ((glMultiTexCoord3d = (PFNGLMULTITEXCOORD3DPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3d")) == NULL) || r;
+  r = ((glMultiTexCoord3dv = (PFNGLMULTITEXCOORD3DVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3dv")) == NULL) || r;
+  r = ((glMultiTexCoord3f = (PFNGLMULTITEXCOORD3FPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3f")) == NULL) || r;
+  r = ((glMultiTexCoord3fv = (PFNGLMULTITEXCOORD3FVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3fv")) == NULL) || r;
+  r = ((glMultiTexCoord3i = (PFNGLMULTITEXCOORD3IPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3i")) == NULL) || r;
+  r = ((glMultiTexCoord3iv = (PFNGLMULTITEXCOORD3IVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3iv")) == NULL) || r;
+  r = ((glMultiTexCoord3s = (PFNGLMULTITEXCOORD3SPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3s")) == NULL) || r;
+  r = ((glMultiTexCoord3sv = (PFNGLMULTITEXCOORD3SVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3sv")) == NULL) || r;
+  r = ((glMultiTexCoord4d = (PFNGLMULTITEXCOORD4DPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4d")) == NULL) || r;
+  r = ((glMultiTexCoord4dv = (PFNGLMULTITEXCOORD4DVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4dv")) == NULL) || r;
+  r = ((glMultiTexCoord4f = (PFNGLMULTITEXCOORD4FPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4f")) == NULL) || r;
+  r = ((glMultiTexCoord4fv = (PFNGLMULTITEXCOORD4FVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4fv")) == NULL) || r;
+  r = ((glMultiTexCoord4i = (PFNGLMULTITEXCOORD4IPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4i")) == NULL) || r;
+  r = ((glMultiTexCoord4iv = (PFNGLMULTITEXCOORD4IVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4iv")) == NULL) || r;
+  r = ((glMultiTexCoord4s = (PFNGLMULTITEXCOORD4SPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4s")) == NULL) || r;
+  r = ((glMultiTexCoord4sv = (PFNGLMULTITEXCOORD4SVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4sv")) == NULL) || r;
+  r = ((glSampleCoverage = (PFNGLSAMPLECOVERAGEPROC)glewGetProcAddress((const GLubyte*)"glSampleCoverage")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_VERSION_1_3 */
+
+#ifdef GL_VERSION_1_4
+
+static GLboolean _glewInit_GL_VERSION_1_4 (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBlendColor = (PFNGLBLENDCOLORPROC)glewGetProcAddress((const GLubyte*)"glBlendColor")) == NULL) || r;
+  r = ((glBlendEquation = (PFNGLBLENDEQUATIONPROC)glewGetProcAddress((const GLubyte*)"glBlendEquation")) == NULL) || r;
+  r = ((glBlendFuncSeparate = (PFNGLBLENDFUNCSEPARATEPROC)glewGetProcAddress((const GLubyte*)"glBlendFuncSeparate")) == NULL) || r;
+  r = ((glFogCoordPointer = (PFNGLFOGCOORDPOINTERPROC)glewGetProcAddress((const GLubyte*)"glFogCoordPointer")) == NULL) || r;
+  r = ((glFogCoordd = (PFNGLFOGCOORDDPROC)glewGetProcAddress((const GLubyte*)"glFogCoordd")) == NULL) || r;
+  r = ((glFogCoorddv = (PFNGLFOGCOORDDVPROC)glewGetProcAddress((const GLubyte*)"glFogCoorddv")) == NULL) || r;
+  r = ((glFogCoordf = (PFNGLFOGCOORDFPROC)glewGetProcAddress((const GLubyte*)"glFogCoordf")) == NULL) || r;
+  r = ((glFogCoordfv = (PFNGLFOGCOORDFVPROC)glewGetProcAddress((const GLubyte*)"glFogCoordfv")) == NULL) || r;
+  r = ((glMultiDrawArrays = (PFNGLMULTIDRAWARRAYSPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawArrays")) == NULL) || r;
+  r = ((glMultiDrawElements = (PFNGLMULTIDRAWELEMENTSPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawElements")) == NULL) || r;
+  r = ((glPointParameterf = (PFNGLPOINTPARAMETERFPROC)glewGetProcAddress((const GLubyte*)"glPointParameterf")) == NULL) || r;
+  r = ((glPointParameterfv = (PFNGLPOINTPARAMETERFVPROC)glewGetProcAddress((const GLubyte*)"glPointParameterfv")) == NULL) || r;
+  r = ((glSecondaryColor3b = (PFNGLSECONDARYCOLOR3BPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3b")) == NULL) || r;
+  r = ((glSecondaryColor3bv = (PFNGLSECONDARYCOLOR3BVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3bv")) == NULL) || r;
+  r = ((glSecondaryColor3d = (PFNGLSECONDARYCOLOR3DPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3d")) == NULL) || r;
+  r = ((glSecondaryColor3dv = (PFNGLSECONDARYCOLOR3DVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3dv")) == NULL) || r;
+  r = ((glSecondaryColor3f = (PFNGLSECONDARYCOLOR3FPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3f")) == NULL) || r;
+  r = ((glSecondaryColor3fv = (PFNGLSECONDARYCOLOR3FVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3fv")) == NULL) || r;
+  r = ((glSecondaryColor3i = (PFNGLSECONDARYCOLOR3IPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3i")) == NULL) || r;
+  r = ((glSecondaryColor3iv = (PFNGLSECONDARYCOLOR3IVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3iv")) == NULL) || r;
+  r = ((glSecondaryColor3s = (PFNGLSECONDARYCOLOR3SPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3s")) == NULL) || r;
+  r = ((glSecondaryColor3sv = (PFNGLSECONDARYCOLOR3SVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3sv")) == NULL) || r;
+  r = ((glSecondaryColor3ub = (PFNGLSECONDARYCOLOR3UBPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3ub")) == NULL) || r;
+  r = ((glSecondaryColor3ubv = (PFNGLSECONDARYCOLOR3UBVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3ubv")) == NULL) || r;
+  r = ((glSecondaryColor3ui = (PFNGLSECONDARYCOLOR3UIPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3ui")) == NULL) || r;
+  r = ((glSecondaryColor3uiv = (PFNGLSECONDARYCOLOR3UIVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3uiv")) == NULL) || r;
+  r = ((glSecondaryColor3us = (PFNGLSECONDARYCOLOR3USPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3us")) == NULL) || r;
+  r = ((glSecondaryColor3usv = (PFNGLSECONDARYCOLOR3USVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3usv")) == NULL) || r;
+  r = ((glSecondaryColorPointer = (PFNGLSECONDARYCOLORPOINTERPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColorPointer")) == NULL) || r;
+  r = ((glWindowPos2d = (PFNGLWINDOWPOS2DPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2d")) == NULL) || r;
+  r = ((glWindowPos2dv = (PFNGLWINDOWPOS2DVPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2dv")) == NULL) || r;
+  r = ((glWindowPos2f = (PFNGLWINDOWPOS2FPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2f")) == NULL) || r;
+  r = ((glWindowPos2fv = (PFNGLWINDOWPOS2FVPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2fv")) == NULL) || r;
+  r = ((glWindowPos2i = (PFNGLWINDOWPOS2IPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2i")) == NULL) || r;
+  r = ((glWindowPos2iv = (PFNGLWINDOWPOS2IVPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2iv")) == NULL) || r;
+  r = ((glWindowPos2s = (PFNGLWINDOWPOS2SPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2s")) == NULL) || r;
+  r = ((glWindowPos2sv = (PFNGLWINDOWPOS2SVPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2sv")) == NULL) || r;
+  r = ((glWindowPos3d = (PFNGLWINDOWPOS3DPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3d")) == NULL) || r;
+  r = ((glWindowPos3dv = (PFNGLWINDOWPOS3DVPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3dv")) == NULL) || r;
+  r = ((glWindowPos3f = (PFNGLWINDOWPOS3FPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3f")) == NULL) || r;
+  r = ((glWindowPos3fv = (PFNGLWINDOWPOS3FVPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3fv")) == NULL) || r;
+  r = ((glWindowPos3i = (PFNGLWINDOWPOS3IPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3i")) == NULL) || r;
+  r = ((glWindowPos3iv = (PFNGLWINDOWPOS3IVPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3iv")) == NULL) || r;
+  r = ((glWindowPos3s = (PFNGLWINDOWPOS3SPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3s")) == NULL) || r;
+  r = ((glWindowPos3sv = (PFNGLWINDOWPOS3SVPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3sv")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_VERSION_1_4 */
+
+#ifdef GL_VERSION_1_5
+
+static GLboolean _glewInit_GL_VERSION_1_5 (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBeginQuery = (PFNGLBEGINQUERYPROC)glewGetProcAddress((const GLubyte*)"glBeginQuery")) == NULL) || r;
+  r = ((glBindBuffer = (PFNGLBINDBUFFERPROC)glewGetProcAddress((const GLubyte*)"glBindBuffer")) == NULL) || r;
+  r = ((glBufferData = (PFNGLBUFFERDATAPROC)glewGetProcAddress((const GLubyte*)"glBufferData")) == NULL) || r;
+  r = ((glBufferSubData = (PFNGLBUFFERSUBDATAPROC)glewGetProcAddress((const GLubyte*)"glBufferSubData")) == NULL) || r;
+  r = ((glDeleteBuffers = (PFNGLDELETEBUFFERSPROC)glewGetProcAddress((const GLubyte*)"glDeleteBuffers")) == NULL) || r;
+  r = ((glDeleteQueries = (PFNGLDELETEQUERIESPROC)glewGetProcAddress((const GLubyte*)"glDeleteQueries")) == NULL) || r;
+  r = ((glEndQuery = (PFNGLENDQUERYPROC)glewGetProcAddress((const GLubyte*)"glEndQuery")) == NULL) || r;
+  r = ((glGenBuffers = (PFNGLGENBUFFERSPROC)glewGetProcAddress((const GLubyte*)"glGenBuffers")) == NULL) || r;
+  r = ((glGenQueries = (PFNGLGENQUERIESPROC)glewGetProcAddress((const GLubyte*)"glGenQueries")) == NULL) || r;
+  r = ((glGetBufferParameteriv = (PFNGLGETBUFFERPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glGetBufferParameteriv")) == NULL) || r;
+  r = ((glGetBufferPointerv = (PFNGLGETBUFFERPOINTERVPROC)glewGetProcAddress((const GLubyte*)"glGetBufferPointerv")) == NULL) || r;
+  r = ((glGetBufferSubData = (PFNGLGETBUFFERSUBDATAPROC)glewGetProcAddress((const GLubyte*)"glGetBufferSubData")) == NULL) || r;
+  r = ((glGetQueryObjectiv = (PFNGLGETQUERYOBJECTIVPROC)glewGetProcAddress((const GLubyte*)"glGetQueryObjectiv")) == NULL) || r;
+  r = ((glGetQueryObjectuiv = (PFNGLGETQUERYOBJECTUIVPROC)glewGetProcAddress((const GLubyte*)"glGetQueryObjectuiv")) == NULL) || r;
+  r = ((glGetQueryiv = (PFNGLGETQUERYIVPROC)glewGetProcAddress((const GLubyte*)"glGetQueryiv")) == NULL) || r;
+  r = ((glIsBuffer = (PFNGLISBUFFERPROC)glewGetProcAddress((const GLubyte*)"glIsBuffer")) == NULL) || r;
+  r = ((glIsQuery = (PFNGLISQUERYPROC)glewGetProcAddress((const GLubyte*)"glIsQuery")) == NULL) || r;
+  r = ((glMapBuffer = (PFNGLMAPBUFFERPROC)glewGetProcAddress((const GLubyte*)"glMapBuffer")) == NULL) || r;
+  r = ((glUnmapBuffer = (PFNGLUNMAPBUFFERPROC)glewGetProcAddress((const GLubyte*)"glUnmapBuffer")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_VERSION_1_5 */
+
+#ifdef GL_VERSION_2_0
+
+static GLboolean _glewInit_GL_VERSION_2_0 (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glAttachShader = (PFNGLATTACHSHADERPROC)glewGetProcAddress((const GLubyte*)"glAttachShader")) == NULL) || r;
+  r = ((glBindAttribLocation = (PFNGLBINDATTRIBLOCATIONPROC)glewGetProcAddress((const GLubyte*)"glBindAttribLocation")) == NULL) || r;
+  r = ((glBlendEquationSeparate = (PFNGLBLENDEQUATIONSEPARATEPROC)glewGetProcAddress((const GLubyte*)"glBlendEquationSeparate")) == NULL) || r;
+  r = ((glCompileShader = (PFNGLCOMPILESHADERPROC)glewGetProcAddress((const GLubyte*)"glCompileShader")) == NULL) || r;
+  r = ((glCreateProgram = (PFNGLCREATEPROGRAMPROC)glewGetProcAddress((const GLubyte*)"glCreateProgram")) == NULL) || r;
+  r = ((glCreateShader = (PFNGLCREATESHADERPROC)glewGetProcAddress((const GLubyte*)"glCreateShader")) == NULL) || r;
+  r = ((glDeleteProgram = (PFNGLDELETEPROGRAMPROC)glewGetProcAddress((const GLubyte*)"glDeleteProgram")) == NULL) || r;
+  r = ((glDeleteShader = (PFNGLDELETESHADERPROC)glewGetProcAddress((const GLubyte*)"glDeleteShader")) == NULL) || r;
+  r = ((glDetachShader = (PFNGLDETACHSHADERPROC)glewGetProcAddress((const GLubyte*)"glDetachShader")) == NULL) || r;
+  r = ((glDisableVertexAttribArray = (PFNGLDISABLEVERTEXATTRIBARRAYPROC)glewGetProcAddress((const GLubyte*)"glDisableVertexAttribArray")) == NULL) || r;
+  r = ((glDrawBuffers = (PFNGLDRAWBUFFERSPROC)glewGetProcAddress((const GLubyte*)"glDrawBuffers")) == NULL) || r;
+  r = ((glEnableVertexAttribArray = (PFNGLENABLEVERTEXATTRIBARRAYPROC)glewGetProcAddress((const GLubyte*)"glEnableVertexAttribArray")) == NULL) || r;
+  r = ((glGetActiveAttrib = (PFNGLGETACTIVEATTRIBPROC)glewGetProcAddress((const GLubyte*)"glGetActiveAttrib")) == NULL) || r;
+  r = ((glGetActiveUniform = (PFNGLGETACTIVEUNIFORMPROC)glewGetProcAddress((const GLubyte*)"glGetActiveUniform")) == NULL) || r;
+  r = ((glGetAttachedShaders = (PFNGLGETATTACHEDSHADERSPROC)glewGetProcAddress((const GLubyte*)"glGetAttachedShaders")) == NULL) || r;
+  r = ((glGetAttribLocation = (PFNGLGETATTRIBLOCATIONPROC)glewGetProcAddress((const GLubyte*)"glGetAttribLocation")) == NULL) || r;
+  r = ((glGetProgramInfoLog = (PFNGLGETPROGRAMINFOLOGPROC)glewGetProcAddress((const GLubyte*)"glGetProgramInfoLog")) == NULL) || r;
+  r = ((glGetProgramiv = (PFNGLGETPROGRAMIVPROC)glewGetProcAddress((const GLubyte*)"glGetProgramiv")) == NULL) || r;
+  r = ((glGetShaderInfoLog = (PFNGLGETSHADERINFOLOGPROC)glewGetProcAddress((const GLubyte*)"glGetShaderInfoLog")) == NULL) || r;
+  r = ((glGetShaderSource = (PFNGLGETSHADERSOURCEPROC)glewGetProcAddress((const GLubyte*)"glGetShaderSource")) == NULL) || r;
+  r = ((glGetShaderiv = (PFNGLGETSHADERIVPROC)glewGetProcAddress((const GLubyte*)"glGetShaderiv")) == NULL) || r;
+  r = ((glGetUniformLocation = (PFNGLGETUNIFORMLOCATIONPROC)glewGetProcAddress((const GLubyte*)"glGetUniformLocation")) == NULL) || r;
+  r = ((glGetUniformfv = (PFNGLGETUNIFORMFVPROC)glewGetProcAddress((const GLubyte*)"glGetUniformfv")) == NULL) || r;
+  r = ((glGetUniformiv = (PFNGLGETUNIFORMIVPROC)glewGetProcAddress((const GLubyte*)"glGetUniformiv")) == NULL) || r;
+  r = ((glGetVertexAttribPointerv = (PFNGLGETVERTEXATTRIBPOINTERVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribPointerv")) == NULL) || r;
+  r = ((glGetVertexAttribdv = (PFNGLGETVERTEXATTRIBDVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribdv")) == NULL) || r;
+  r = ((glGetVertexAttribfv = (PFNGLGETVERTEXATTRIBFVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribfv")) == NULL) || r;
+  r = ((glGetVertexAttribiv = (PFNGLGETVERTEXATTRIBIVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribiv")) == NULL) || r;
+  r = ((glIsProgram = (PFNGLISPROGRAMPROC)glewGetProcAddress((const GLubyte*)"glIsProgram")) == NULL) || r;
+  r = ((glIsShader = (PFNGLISSHADERPROC)glewGetProcAddress((const GLubyte*)"glIsShader")) == NULL) || r;
+  r = ((glLinkProgram = (PFNGLLINKPROGRAMPROC)glewGetProcAddress((const GLubyte*)"glLinkProgram")) == NULL) || r;
+  r = ((glShaderSource = (PFNGLSHADERSOURCEPROC)glewGetProcAddress((const GLubyte*)"glShaderSource")) == NULL) || r;
+  r = ((glStencilFuncSeparate = (PFNGLSTENCILFUNCSEPARATEPROC)glewGetProcAddress((const GLubyte*)"glStencilFuncSeparate")) == NULL) || r;
+  r = ((glStencilMaskSeparate = (PFNGLSTENCILMASKSEPARATEPROC)glewGetProcAddress((const GLubyte*)"glStencilMaskSeparate")) == NULL) || r;
+  r = ((glStencilOpSeparate = (PFNGLSTENCILOPSEPARATEPROC)glewGetProcAddress((const GLubyte*)"glStencilOpSeparate")) == NULL) || r;
+  r = ((glUniform1f = (PFNGLUNIFORM1FPROC)glewGetProcAddress((const GLubyte*)"glUniform1f")) == NULL) || r;
+  r = ((glUniform1fv = (PFNGLUNIFORM1FVPROC)glewGetProcAddress((const GLubyte*)"glUniform1fv")) == NULL) || r;
+  r = ((glUniform1i = (PFNGLUNIFORM1IPROC)glewGetProcAddress((const GLubyte*)"glUniform1i")) == NULL) || r;
+  r = ((glUniform1iv = (PFNGLUNIFORM1IVPROC)glewGetProcAddress((const GLubyte*)"glUniform1iv")) == NULL) || r;
+  r = ((glUniform2f = (PFNGLUNIFORM2FPROC)glewGetProcAddress((const GLubyte*)"glUniform2f")) == NULL) || r;
+  r = ((glUniform2fv = (PFNGLUNIFORM2FVPROC)glewGetProcAddress((const GLubyte*)"glUniform2fv")) == NULL) || r;
+  r = ((glUniform2i = (PFNGLUNIFORM2IPROC)glewGetProcAddress((const GLubyte*)"glUniform2i")) == NULL) || r;
+  r = ((glUniform2iv = (PFNGLUNIFORM2IVPROC)glewGetProcAddress((const GLubyte*)"glUniform2iv")) == NULL) || r;
+  r = ((glUniform3f = (PFNGLUNIFORM3FPROC)glewGetProcAddress((const GLubyte*)"glUniform3f")) == NULL) || r;
+  r = ((glUniform3fv = (PFNGLUNIFORM3FVPROC)glewGetProcAddress((const GLubyte*)"glUniform3fv")) == NULL) || r;
+  r = ((glUniform3i = (PFNGLUNIFORM3IPROC)glewGetProcAddress((const GLubyte*)"glUniform3i")) == NULL) || r;
+  r = ((glUniform3iv = (PFNGLUNIFORM3IVPROC)glewGetProcAddress((const GLubyte*)"glUniform3iv")) == NULL) || r;
+  r = ((glUniform4f = (PFNGLUNIFORM4FPROC)glewGetProcAddress((const GLubyte*)"glUniform4f")) == NULL) || r;
+  r = ((glUniform4fv = (PFNGLUNIFORM4FVPROC)glewGetProcAddress((const GLubyte*)"glUniform4fv")) == NULL) || r;
+  r = ((glUniform4i = (PFNGLUNIFORM4IPROC)glewGetProcAddress((const GLubyte*)"glUniform4i")) == NULL) || r;
+  r = ((glUniform4iv = (PFNGLUNIFORM4IVPROC)glewGetProcAddress((const GLubyte*)"glUniform4iv")) == NULL) || r;
+  r = ((glUniformMatrix2fv = (PFNGLUNIFORMMATRIX2FVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix2fv")) == NULL) || r;
+  r = ((glUniformMatrix3fv = (PFNGLUNIFORMMATRIX3FVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix3fv")) == NULL) || r;
+  r = ((glUniformMatrix4fv = (PFNGLUNIFORMMATRIX4FVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix4fv")) == NULL) || r;
+  r = ((glUseProgram = (PFNGLUSEPROGRAMPROC)glewGetProcAddress((const GLubyte*)"glUseProgram")) == NULL) || r;
+  r = ((glValidateProgram = (PFNGLVALIDATEPROGRAMPROC)glewGetProcAddress((const GLubyte*)"glValidateProgram")) == NULL) || r;
+  r = ((glVertexAttrib1d = (PFNGLVERTEXATTRIB1DPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1d")) == NULL) || r;
+  r = ((glVertexAttrib1dv = (PFNGLVERTEXATTRIB1DVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1dv")) == NULL) || r;
+  r = ((glVertexAttrib1f = (PFNGLVERTEXATTRIB1FPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1f")) == NULL) || r;
+  r = ((glVertexAttrib1fv = (PFNGLVERTEXATTRIB1FVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1fv")) == NULL) || r;
+  r = ((glVertexAttrib1s = (PFNGLVERTEXATTRIB1SPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1s")) == NULL) || r;
+  r = ((glVertexAttrib1sv = (PFNGLVERTEXATTRIB1SVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1sv")) == NULL) || r;
+  r = ((glVertexAttrib2d = (PFNGLVERTEXATTRIB2DPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2d")) == NULL) || r;
+  r = ((glVertexAttrib2dv = (PFNGLVERTEXATTRIB2DVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2dv")) == NULL) || r;
+  r = ((glVertexAttrib2f = (PFNGLVERTEXATTRIB2FPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2f")) == NULL) || r;
+  r = ((glVertexAttrib2fv = (PFNGLVERTEXATTRIB2FVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2fv")) == NULL) || r;
+  r = ((glVertexAttrib2s = (PFNGLVERTEXATTRIB2SPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2s")) == NULL) || r;
+  r = ((glVertexAttrib2sv = (PFNGLVERTEXATTRIB2SVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2sv")) == NULL) || r;
+  r = ((glVertexAttrib3d = (PFNGLVERTEXATTRIB3DPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3d")) == NULL) || r;
+  r = ((glVertexAttrib3dv = (PFNGLVERTEXATTRIB3DVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3dv")) == NULL) || r;
+  r = ((glVertexAttrib3f = (PFNGLVERTEXATTRIB3FPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3f")) == NULL) || r;
+  r = ((glVertexAttrib3fv = (PFNGLVERTEXATTRIB3FVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3fv")) == NULL) || r;
+  r = ((glVertexAttrib3s = (PFNGLVERTEXATTRIB3SPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3s")) == NULL) || r;
+  r = ((glVertexAttrib3sv = (PFNGLVERTEXATTRIB3SVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3sv")) == NULL) || r;
+  r = ((glVertexAttrib4Nbv = (PFNGLVERTEXATTRIB4NBVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4Nbv")) == NULL) || r;
+  r = ((glVertexAttrib4Niv = (PFNGLVERTEXATTRIB4NIVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4Niv")) == NULL) || r;
+  r = ((glVertexAttrib4Nsv = (PFNGLVERTEXATTRIB4NSVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4Nsv")) == NULL) || r;
+  r = ((glVertexAttrib4Nub = (PFNGLVERTEXATTRIB4NUBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4Nub")) == NULL) || r;
+  r = ((glVertexAttrib4Nubv = (PFNGLVERTEXATTRIB4NUBVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4Nubv")) == NULL) || r;
+  r = ((glVertexAttrib4Nuiv = (PFNGLVERTEXATTRIB4NUIVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4Nuiv")) == NULL) || r;
+  r = ((glVertexAttrib4Nusv = (PFNGLVERTEXATTRIB4NUSVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4Nusv")) == NULL) || r;
+  r = ((glVertexAttrib4bv = (PFNGLVERTEXATTRIB4BVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4bv")) == NULL) || r;
+  r = ((glVertexAttrib4d = (PFNGLVERTEXATTRIB4DPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4d")) == NULL) || r;
+  r = ((glVertexAttrib4dv = (PFNGLVERTEXATTRIB4DVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4dv")) == NULL) || r;
+  r = ((glVertexAttrib4f = (PFNGLVERTEXATTRIB4FPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4f")) == NULL) || r;
+  r = ((glVertexAttrib4fv = (PFNGLVERTEXATTRIB4FVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4fv")) == NULL) || r;
+  r = ((glVertexAttrib4iv = (PFNGLVERTEXATTRIB4IVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4iv")) == NULL) || r;
+  r = ((glVertexAttrib4s = (PFNGLVERTEXATTRIB4SPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4s")) == NULL) || r;
+  r = ((glVertexAttrib4sv = (PFNGLVERTEXATTRIB4SVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4sv")) == NULL) || r;
+  r = ((glVertexAttrib4ubv = (PFNGLVERTEXATTRIB4UBVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4ubv")) == NULL) || r;
+  r = ((glVertexAttrib4uiv = (PFNGLVERTEXATTRIB4UIVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4uiv")) == NULL) || r;
+  r = ((glVertexAttrib4usv = (PFNGLVERTEXATTRIB4USVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4usv")) == NULL) || r;
+  r = ((glVertexAttribPointer = (PFNGLVERTEXATTRIBPOINTERPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribPointer")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_VERSION_2_0 */
+
+#ifdef GL_3DFX_multisample
+
+#endif /* GL_3DFX_multisample */
+
+#ifdef GL_3DFX_tbuffer
+
+static GLboolean _glewInit_GL_3DFX_tbuffer (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glTbufferMask3DFX = (PFNGLTBUFFERMASK3DFXPROC)glewGetProcAddress((const GLubyte*)"glTbufferMask3DFX")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_3DFX_tbuffer */
+
+#ifdef GL_3DFX_texture_compression_FXT1
+
+#endif /* GL_3DFX_texture_compression_FXT1 */
+
+#ifdef GL_APPLE_client_storage
+
+#endif /* GL_APPLE_client_storage */
+
+#ifdef GL_APPLE_element_array
+
+static GLboolean _glewInit_GL_APPLE_element_array (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glDrawElementArrayAPPLE = (PFNGLDRAWELEMENTARRAYAPPLEPROC)glewGetProcAddress((const GLubyte*)"glDrawElementArrayAPPLE")) == NULL) || r;
+  r = ((glDrawRangeElementArrayAPPLE = (PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC)glewGetProcAddress((const GLubyte*)"glDrawRangeElementArrayAPPLE")) == NULL) || r;
+  r = ((glElementPointerAPPLE = (PFNGLELEMENTPOINTERAPPLEPROC)glewGetProcAddress((const GLubyte*)"glElementPointerAPPLE")) == NULL) || r;
+  r = ((glMultiDrawElementArrayAPPLE = (PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawElementArrayAPPLE")) == NULL) || r;
+  r = ((glMultiDrawRangeElementArrayAPPLE = (PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawRangeElementArrayAPPLE")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_APPLE_element_array */
+
+#ifdef GL_APPLE_fence
+
+static GLboolean _glewInit_GL_APPLE_fence (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glDeleteFencesAPPLE = (PFNGLDELETEFENCESAPPLEPROC)glewGetProcAddress((const GLubyte*)"glDeleteFencesAPPLE")) == NULL) || r;
+  r = ((glFinishFenceAPPLE = (PFNGLFINISHFENCEAPPLEPROC)glewGetProcAddress((const GLubyte*)"glFinishFenceAPPLE")) == NULL) || r;
+  r = ((glFinishObjectAPPLE = (PFNGLFINISHOBJECTAPPLEPROC)glewGetProcAddress((const GLubyte*)"glFinishObjectAPPLE")) == NULL) || r;
+  r = ((glGenFencesAPPLE = (PFNGLGENFENCESAPPLEPROC)glewGetProcAddress((const GLubyte*)"glGenFencesAPPLE")) == NULL) || r;
+  r = ((glIsFenceAPPLE = (PFNGLISFENCEAPPLEPROC)glewGetProcAddress((const GLubyte*)"glIsFenceAPPLE")) == NULL) || r;
+  r = ((glSetFenceAPPLE = (PFNGLSETFENCEAPPLEPROC)glewGetProcAddress((const GLubyte*)"glSetFenceAPPLE")) == NULL) || r;
+  r = ((glTestFenceAPPLE = (PFNGLTESTFENCEAPPLEPROC)glewGetProcAddress((const GLubyte*)"glTestFenceAPPLE")) == NULL) || r;
+  r = ((glTestObjectAPPLE = (PFNGLTESTOBJECTAPPLEPROC)glewGetProcAddress((const GLubyte*)"glTestObjectAPPLE")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_APPLE_fence */
+
+#ifdef GL_APPLE_float_pixels
+
+#endif /* GL_APPLE_float_pixels */
+
+#ifdef GL_APPLE_pixel_buffer
+
+#endif /* GL_APPLE_pixel_buffer */
+
+#ifdef GL_APPLE_specular_vector
+
+#endif /* GL_APPLE_specular_vector */
+
+#ifdef GL_APPLE_texture_range
+
+static GLboolean _glewInit_GL_APPLE_texture_range (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetTexParameterPointervAPPLE = (PFNGLGETTEXPARAMETERPOINTERVAPPLEPROC)glewGetProcAddress((const GLubyte*)"glGetTexParameterPointervAPPLE")) == NULL) || r;
+  r = ((glTextureRangeAPPLE = (PFNGLTEXTURERANGEAPPLEPROC)glewGetProcAddress((const GLubyte*)"glTextureRangeAPPLE")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_APPLE_texture_range */
+
+#ifdef GL_APPLE_transform_hint
+
+#endif /* GL_APPLE_transform_hint */
+
+#ifdef GL_APPLE_vertex_array_object
+
+static GLboolean _glewInit_GL_APPLE_vertex_array_object (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBindVertexArrayAPPLE = (PFNGLBINDVERTEXARRAYAPPLEPROC)glewGetProcAddress((const GLubyte*)"glBindVertexArrayAPPLE")) == NULL) || r;
+  r = ((glDeleteVertexArraysAPPLE = (PFNGLDELETEVERTEXARRAYSAPPLEPROC)glewGetProcAddress((const GLubyte*)"glDeleteVertexArraysAPPLE")) == NULL) || r;
+  r = ((glGenVertexArraysAPPLE = (PFNGLGENVERTEXARRAYSAPPLEPROC)glewGetProcAddress((const GLubyte*)"glGenVertexArraysAPPLE")) == NULL) || r;
+  r = ((glIsVertexArrayAPPLE = (PFNGLISVERTEXARRAYAPPLEPROC)glewGetProcAddress((const GLubyte*)"glIsVertexArrayAPPLE")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_APPLE_vertex_array_object */
+
+#ifdef GL_APPLE_vertex_array_range
+
+static GLboolean _glewInit_GL_APPLE_vertex_array_range (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glFlushVertexArrayRangeAPPLE = (PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC)glewGetProcAddress((const GLubyte*)"glFlushVertexArrayRangeAPPLE")) == NULL) || r;
+  r = ((glVertexArrayParameteriAPPLE = (PFNGLVERTEXARRAYPARAMETERIAPPLEPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayParameteriAPPLE")) == NULL) || r;
+  r = ((glVertexArrayRangeAPPLE = (PFNGLVERTEXARRAYRANGEAPPLEPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayRangeAPPLE")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_APPLE_vertex_array_range */
+
+#ifdef GL_APPLE_ycbcr_422
+
+#endif /* GL_APPLE_ycbcr_422 */
+
+#ifdef GL_ARB_color_buffer_float
+
+static GLboolean _glewInit_GL_ARB_color_buffer_float (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glClampColorARB = (PFNGLCLAMPCOLORARBPROC)glewGetProcAddress((const GLubyte*)"glClampColorARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_color_buffer_float */
+
+#ifdef GL_ARB_depth_texture
+
+#endif /* GL_ARB_depth_texture */
+
+#ifdef GL_ARB_draw_buffers
+
+static GLboolean _glewInit_GL_ARB_draw_buffers (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glDrawBuffersARB = (PFNGLDRAWBUFFERSARBPROC)glewGetProcAddress((const GLubyte*)"glDrawBuffersARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_draw_buffers */
+
+#ifdef GL_ARB_fragment_program
+
+#endif /* GL_ARB_fragment_program */
+
+#ifdef GL_ARB_fragment_program_shadow
+
+#endif /* GL_ARB_fragment_program_shadow */
+
+#ifdef GL_ARB_fragment_shader
+
+#endif /* GL_ARB_fragment_shader */
+
+#ifdef GL_ARB_half_float_pixel
+
+#endif /* GL_ARB_half_float_pixel */
+
+#ifdef GL_ARB_imaging
+
+static GLboolean _glewInit_GL_ARB_imaging (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBlendEquation = (PFNGLBLENDEQUATIONPROC)glewGetProcAddress((const GLubyte*)"glBlendEquation")) == NULL) || r;
+  r = ((glColorSubTable = (PFNGLCOLORSUBTABLEPROC)glewGetProcAddress((const GLubyte*)"glColorSubTable")) == NULL) || r;
+  r = ((glColorTable = (PFNGLCOLORTABLEPROC)glewGetProcAddress((const GLubyte*)"glColorTable")) == NULL) || r;
+  r = ((glColorTableParameterfv = (PFNGLCOLORTABLEPARAMETERFVPROC)glewGetProcAddress((const GLubyte*)"glColorTableParameterfv")) == NULL) || r;
+  r = ((glColorTableParameteriv = (PFNGLCOLORTABLEPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glColorTableParameteriv")) == NULL) || r;
+  r = ((glConvolutionFilter1D = (PFNGLCONVOLUTIONFILTER1DPROC)glewGetProcAddress((const GLubyte*)"glConvolutionFilter1D")) == NULL) || r;
+  r = ((glConvolutionFilter2D = (PFNGLCONVOLUTIONFILTER2DPROC)glewGetProcAddress((const GLubyte*)"glConvolutionFilter2D")) == NULL) || r;
+  r = ((glConvolutionParameterf = (PFNGLCONVOLUTIONPARAMETERFPROC)glewGetProcAddress((const GLubyte*)"glConvolutionParameterf")) == NULL) || r;
+  r = ((glConvolutionParameterfv = (PFNGLCONVOLUTIONPARAMETERFVPROC)glewGetProcAddress((const GLubyte*)"glConvolutionParameterfv")) == NULL) || r;
+  r = ((glConvolutionParameteri = (PFNGLCONVOLUTIONPARAMETERIPROC)glewGetProcAddress((const GLubyte*)"glConvolutionParameteri")) == NULL) || r;
+  r = ((glConvolutionParameteriv = (PFNGLCONVOLUTIONPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glConvolutionParameteriv")) == NULL) || r;
+  r = ((glCopyColorSubTable = (PFNGLCOPYCOLORSUBTABLEPROC)glewGetProcAddress((const GLubyte*)"glCopyColorSubTable")) == NULL) || r;
+  r = ((glCopyColorTable = (PFNGLCOPYCOLORTABLEPROC)glewGetProcAddress((const GLubyte*)"glCopyColorTable")) == NULL) || r;
+  r = ((glCopyConvolutionFilter1D = (PFNGLCOPYCONVOLUTIONFILTER1DPROC)glewGetProcAddress((const GLubyte*)"glCopyConvolutionFilter1D")) == NULL) || r;
+  r = ((glCopyConvolutionFilter2D = (PFNGLCOPYCONVOLUTIONFILTER2DPROC)glewGetProcAddress((const GLubyte*)"glCopyConvolutionFilter2D")) == NULL) || r;
+  r = ((glGetColorTable = (PFNGLGETCOLORTABLEPROC)glewGetProcAddress((const GLubyte*)"glGetColorTable")) == NULL) || r;
+  r = ((glGetColorTableParameterfv = (PFNGLGETCOLORTABLEPARAMETERFVPROC)glewGetProcAddress((const GLubyte*)"glGetColorTableParameterfv")) == NULL) || r;
+  r = ((glGetColorTableParameteriv = (PFNGLGETCOLORTABLEPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glGetColorTableParameteriv")) == NULL) || r;
+  r = ((glGetConvolutionFilter = (PFNGLGETCONVOLUTIONFILTERPROC)glewGetProcAddress((const GLubyte*)"glGetConvolutionFilter")) == NULL) || r;
+  r = ((glGetConvolutionParameterfv = (PFNGLGETCONVOLUTIONPARAMETERFVPROC)glewGetProcAddress((const GLubyte*)"glGetConvolutionParameterfv")) == NULL) || r;
+  r = ((glGetConvolutionParameteriv = (PFNGLGETCONVOLUTIONPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glGetConvolutionParameteriv")) == NULL) || r;
+  r = ((glGetHistogram = (PFNGLGETHISTOGRAMPROC)glewGetProcAddress((const GLubyte*)"glGetHistogram")) == NULL) || r;
+  r = ((glGetHistogramParameterfv = (PFNGLGETHISTOGRAMPARAMETERFVPROC)glewGetProcAddress((const GLubyte*)"glGetHistogramParameterfv")) == NULL) || r;
+  r = ((glGetHistogramParameteriv = (PFNGLGETHISTOGRAMPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glGetHistogramParameteriv")) == NULL) || r;
+  r = ((glGetMinmax = (PFNGLGETMINMAXPROC)glewGetProcAddress((const GLubyte*)"glGetMinmax")) == NULL) || r;
+  r = ((glGetMinmaxParameterfv = (PFNGLGETMINMAXPARAMETERFVPROC)glewGetProcAddress((const GLubyte*)"glGetMinmaxParameterfv")) == NULL) || r;
+  r = ((glGetMinmaxParameteriv = (PFNGLGETMINMAXPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glGetMinmaxParameteriv")) == NULL) || r;
+  r = ((glGetSeparableFilter = (PFNGLGETSEPARABLEFILTERPROC)glewGetProcAddress((const GLubyte*)"glGetSeparableFilter")) == NULL) || r;
+  r = ((glHistogram = (PFNGLHISTOGRAMPROC)glewGetProcAddress((const GLubyte*)"glHistogram")) == NULL) || r;
+  r = ((glMinmax = (PFNGLMINMAXPROC)glewGetProcAddress((const GLubyte*)"glMinmax")) == NULL) || r;
+  r = ((glResetHistogram = (PFNGLRESETHISTOGRAMPROC)glewGetProcAddress((const GLubyte*)"glResetHistogram")) == NULL) || r;
+  r = ((glResetMinmax = (PFNGLRESETMINMAXPROC)glewGetProcAddress((const GLubyte*)"glResetMinmax")) == NULL) || r;
+  r = ((glSeparableFilter2D = (PFNGLSEPARABLEFILTER2DPROC)glewGetProcAddress((const GLubyte*)"glSeparableFilter2D")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_imaging */
+
+#ifdef GL_ARB_matrix_palette
+
+static GLboolean _glewInit_GL_ARB_matrix_palette (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glCurrentPaletteMatrixARB = (PFNGLCURRENTPALETTEMATRIXARBPROC)glewGetProcAddress((const GLubyte*)"glCurrentPaletteMatrixARB")) == NULL) || r;
+  r = ((glMatrixIndexPointerARB = (PFNGLMATRIXINDEXPOINTERARBPROC)glewGetProcAddress((const GLubyte*)"glMatrixIndexPointerARB")) == NULL) || r;
+  r = ((glMatrixIndexubvARB = (PFNGLMATRIXINDEXUBVARBPROC)glewGetProcAddress((const GLubyte*)"glMatrixIndexubvARB")) == NULL) || r;
+  r = ((glMatrixIndexuivARB = (PFNGLMATRIXINDEXUIVARBPROC)glewGetProcAddress((const GLubyte*)"glMatrixIndexuivARB")) == NULL) || r;
+  r = ((glMatrixIndexusvARB = (PFNGLMATRIXINDEXUSVARBPROC)glewGetProcAddress((const GLubyte*)"glMatrixIndexusvARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_matrix_palette */
+
+#ifdef GL_ARB_multisample
+
+static GLboolean _glewInit_GL_ARB_multisample (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glSampleCoverageARB = (PFNGLSAMPLECOVERAGEARBPROC)glewGetProcAddress((const GLubyte*)"glSampleCoverageARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_multisample */
+
+#ifdef GL_ARB_multitexture
+
+static GLboolean _glewInit_GL_ARB_multitexture (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glActiveTextureARB = (PFNGLACTIVETEXTUREARBPROC)glewGetProcAddress((const GLubyte*)"glActiveTextureARB")) == NULL) || r;
+  r = ((glClientActiveTextureARB = (PFNGLCLIENTACTIVETEXTUREARBPROC)glewGetProcAddress((const GLubyte*)"glClientActiveTextureARB")) == NULL) || r;
+  r = ((glMultiTexCoord1dARB = (PFNGLMULTITEXCOORD1DARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1dARB")) == NULL) || r;
+  r = ((glMultiTexCoord1dvARB = (PFNGLMULTITEXCOORD1DVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1dvARB")) == NULL) || r;
+  r = ((glMultiTexCoord1fARB = (PFNGLMULTITEXCOORD1FARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1fARB")) == NULL) || r;
+  r = ((glMultiTexCoord1fvARB = (PFNGLMULTITEXCOORD1FVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1fvARB")) == NULL) || r;
+  r = ((glMultiTexCoord1iARB = (PFNGLMULTITEXCOORD1IARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1iARB")) == NULL) || r;
+  r = ((glMultiTexCoord1ivARB = (PFNGLMULTITEXCOORD1IVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1ivARB")) == NULL) || r;
+  r = ((glMultiTexCoord1sARB = (PFNGLMULTITEXCOORD1SARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1sARB")) == NULL) || r;
+  r = ((glMultiTexCoord1svARB = (PFNGLMULTITEXCOORD1SVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1svARB")) == NULL) || r;
+  r = ((glMultiTexCoord2dARB = (PFNGLMULTITEXCOORD2DARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2dARB")) == NULL) || r;
+  r = ((glMultiTexCoord2dvARB = (PFNGLMULTITEXCOORD2DVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2dvARB")) == NULL) || r;
+  r = ((glMultiTexCoord2fARB = (PFNGLMULTITEXCOORD2FARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2fARB")) == NULL) || r;
+  r = ((glMultiTexCoord2fvARB = (PFNGLMULTITEXCOORD2FVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2fvARB")) == NULL) || r;
+  r = ((glMultiTexCoord2iARB = (PFNGLMULTITEXCOORD2IARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2iARB")) == NULL) || r;
+  r = ((glMultiTexCoord2ivARB = (PFNGLMULTITEXCOORD2IVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2ivARB")) == NULL) || r;
+  r = ((glMultiTexCoord2sARB = (PFNGLMULTITEXCOORD2SARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2sARB")) == NULL) || r;
+  r = ((glMultiTexCoord2svARB = (PFNGLMULTITEXCOORD2SVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2svARB")) == NULL) || r;
+  r = ((glMultiTexCoord3dARB = (PFNGLMULTITEXCOORD3DARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3dARB")) == NULL) || r;
+  r = ((glMultiTexCoord3dvARB = (PFNGLMULTITEXCOORD3DVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3dvARB")) == NULL) || r;
+  r = ((glMultiTexCoord3fARB = (PFNGLMULTITEXCOORD3FARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3fARB")) == NULL) || r;
+  r = ((glMultiTexCoord3fvARB = (PFNGLMULTITEXCOORD3FVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3fvARB")) == NULL) || r;
+  r = ((glMultiTexCoord3iARB = (PFNGLMULTITEXCOORD3IARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3iARB")) == NULL) || r;
+  r = ((glMultiTexCoord3ivARB = (PFNGLMULTITEXCOORD3IVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3ivARB")) == NULL) || r;
+  r = ((glMultiTexCoord3sARB = (PFNGLMULTITEXCOORD3SARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3sARB")) == NULL) || r;
+  r = ((glMultiTexCoord3svARB = (PFNGLMULTITEXCOORD3SVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3svARB")) == NULL) || r;
+  r = ((glMultiTexCoord4dARB = (PFNGLMULTITEXCOORD4DARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4dARB")) == NULL) || r;
+  r = ((glMultiTexCoord4dvARB = (PFNGLMULTITEXCOORD4DVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4dvARB")) == NULL) || r;
+  r = ((glMultiTexCoord4fARB = (PFNGLMULTITEXCOORD4FARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4fARB")) == NULL) || r;
+  r = ((glMultiTexCoord4fvARB = (PFNGLMULTITEXCOORD4FVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4fvARB")) == NULL) || r;
+  r = ((glMultiTexCoord4iARB = (PFNGLMULTITEXCOORD4IARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4iARB")) == NULL) || r;
+  r = ((glMultiTexCoord4ivARB = (PFNGLMULTITEXCOORD4IVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4ivARB")) == NULL) || r;
+  r = ((glMultiTexCoord4sARB = (PFNGLMULTITEXCOORD4SARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4sARB")) == NULL) || r;
+  r = ((glMultiTexCoord4svARB = (PFNGLMULTITEXCOORD4SVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4svARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_multitexture */
+
+#ifdef GL_ARB_occlusion_query
+
+static GLboolean _glewInit_GL_ARB_occlusion_query (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBeginQueryARB = (PFNGLBEGINQUERYARBPROC)glewGetProcAddress((const GLubyte*)"glBeginQueryARB")) == NULL) || r;
+  r = ((glDeleteQueriesARB = (PFNGLDELETEQUERIESARBPROC)glewGetProcAddress((const GLubyte*)"glDeleteQueriesARB")) == NULL) || r;
+  r = ((glEndQueryARB = (PFNGLENDQUERYARBPROC)glewGetProcAddress((const GLubyte*)"glEndQueryARB")) == NULL) || r;
+  r = ((glGenQueriesARB = (PFNGLGENQUERIESARBPROC)glewGetProcAddress((const GLubyte*)"glGenQueriesARB")) == NULL) || r;
+  r = ((glGetQueryObjectivARB = (PFNGLGETQUERYOBJECTIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetQueryObjectivARB")) == NULL) || r;
+  r = ((glGetQueryObjectuivARB = (PFNGLGETQUERYOBJECTUIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetQueryObjectuivARB")) == NULL) || r;
+  r = ((glGetQueryivARB = (PFNGLGETQUERYIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetQueryivARB")) == NULL) || r;
+  r = ((glIsQueryARB = (PFNGLISQUERYARBPROC)glewGetProcAddress((const GLubyte*)"glIsQueryARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_occlusion_query */
+
+#ifdef GL_ARB_pixel_buffer_object
+
+#endif /* GL_ARB_pixel_buffer_object */
+
+#ifdef GL_ARB_point_parameters
+
+static GLboolean _glewInit_GL_ARB_point_parameters (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glPointParameterfARB = (PFNGLPOINTPARAMETERFARBPROC)glewGetProcAddress((const GLubyte*)"glPointParameterfARB")) == NULL) || r;
+  r = ((glPointParameterfvARB = (PFNGLPOINTPARAMETERFVARBPROC)glewGetProcAddress((const GLubyte*)"glPointParameterfvARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_point_parameters */
+
+#ifdef GL_ARB_point_sprite
+
+#endif /* GL_ARB_point_sprite */
+
+#ifdef GL_ARB_shader_objects
+
+static GLboolean _glewInit_GL_ARB_shader_objects (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glAttachObjectARB = (PFNGLATTACHOBJECTARBPROC)glewGetProcAddress((const GLubyte*)"glAttachObjectARB")) == NULL) || r;
+  r = ((glCompileShaderARB = (PFNGLCOMPILESHADERARBPROC)glewGetProcAddress((const GLubyte*)"glCompileShaderARB")) == NULL) || r;
+  r = ((glCreateProgramObjectARB = (PFNGLCREATEPROGRAMOBJECTARBPROC)glewGetProcAddress((const GLubyte*)"glCreateProgramObjectARB")) == NULL) || r;
+  r = ((glCreateShaderObjectARB = (PFNGLCREATESHADEROBJECTARBPROC)glewGetProcAddress((const GLubyte*)"glCreateShaderObjectARB")) == NULL) || r;
+  r = ((glDeleteObjectARB = (PFNGLDELETEOBJECTARBPROC)glewGetProcAddress((const GLubyte*)"glDeleteObjectARB")) == NULL) || r;
+  r = ((glDetachObjectARB = (PFNGLDETACHOBJECTARBPROC)glewGetProcAddress((const GLubyte*)"glDetachObjectARB")) == NULL) || r;
+  r = ((glGetActiveUniformARB = (PFNGLGETACTIVEUNIFORMARBPROC)glewGetProcAddress((const GLubyte*)"glGetActiveUniformARB")) == NULL) || r;
+  r = ((glGetAttachedObjectsARB = (PFNGLGETATTACHEDOBJECTSARBPROC)glewGetProcAddress((const GLubyte*)"glGetAttachedObjectsARB")) == NULL) || r;
+  r = ((glGetHandleARB = (PFNGLGETHANDLEARBPROC)glewGetProcAddress((const GLubyte*)"glGetHandleARB")) == NULL) || r;
+  r = ((glGetInfoLogARB = (PFNGLGETINFOLOGARBPROC)glewGetProcAddress((const GLubyte*)"glGetInfoLogARB")) == NULL) || r;
+  r = ((glGetObjectParameterfvARB = (PFNGLGETOBJECTPARAMETERFVARBPROC)glewGetProcAddress((const GLubyte*)"glGetObjectParameterfvARB")) == NULL) || r;
+  r = ((glGetObjectParameterivARB = (PFNGLGETOBJECTPARAMETERIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetObjectParameterivARB")) == NULL) || r;
+  r = ((glGetShaderSourceARB = (PFNGLGETSHADERSOURCEARBPROC)glewGetProcAddress((const GLubyte*)"glGetShaderSourceARB")) == NULL) || r;
+  r = ((glGetUniformLocationARB = (PFNGLGETUNIFORMLOCATIONARBPROC)glewGetProcAddress((const GLubyte*)"glGetUniformLocationARB")) == NULL) || r;
+  r = ((glGetUniformfvARB = (PFNGLGETUNIFORMFVARBPROC)glewGetProcAddress((const GLubyte*)"glGetUniformfvARB")) == NULL) || r;
+  r = ((glGetUniformivARB = (PFNGLGETUNIFORMIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetUniformivARB")) == NULL) || r;
+  r = ((glLinkProgramARB = (PFNGLLINKPROGRAMARBPROC)glewGetProcAddress((const GLubyte*)"glLinkProgramARB")) == NULL) || r;
+  r = ((glShaderSourceARB = (PFNGLSHADERSOURCEARBPROC)glewGetProcAddress((const GLubyte*)"glShaderSourceARB")) == NULL) || r;
+  r = ((glUniform1fARB = (PFNGLUNIFORM1FARBPROC)glewGetProcAddress((const GLubyte*)"glUniform1fARB")) == NULL) || r;
+  r = ((glUniform1fvARB = (PFNGLUNIFORM1FVARBPROC)glewGetProcAddress((const GLubyte*)"glUniform1fvARB")) == NULL) || r;
+  r = ((glUniform1iARB = (PFNGLUNIFORM1IARBPROC)glewGetProcAddress((const GLubyte*)"glUniform1iARB")) == NULL) || r;
+  r = ((glUniform1ivARB = (PFNGLUNIFORM1IVARBPROC)glewGetProcAddress((const GLubyte*)"glUniform1ivARB")) == NULL) || r;
+  r = ((glUniform2fARB = (PFNGLUNIFORM2FARBPROC)glewGetProcAddress((const GLubyte*)"glUniform2fARB")) == NULL) || r;
+  r = ((glUniform2fvARB = (PFNGLUNIFORM2FVARBPROC)glewGetProcAddress((const GLubyte*)"glUniform2fvARB")) == NULL) || r;
+  r = ((glUniform2iARB = (PFNGLUNIFORM2IARBPROC)glewGetProcAddress((const GLubyte*)"glUniform2iARB")) == NULL) || r;
+  r = ((glUniform2ivARB = (PFNGLUNIFORM2IVARBPROC)glewGetProcAddress((const GLubyte*)"glUniform2ivARB")) == NULL) || r;
+  r = ((glUniform3fARB = (PFNGLUNIFORM3FARBPROC)glewGetProcAddress((const GLubyte*)"glUniform3fARB")) == NULL) || r;
+  r = ((glUniform3fvARB = (PFNGLUNIFORM3FVARBPROC)glewGetProcAddress((const GLubyte*)"glUniform3fvARB")) == NULL) || r;
+  r = ((glUniform3iARB = (PFNGLUNIFORM3IARBPROC)glewGetProcAddress((const GLubyte*)"glUniform3iARB")) == NULL) || r;
+  r = ((glUniform3ivARB = (PFNGLUNIFORM3IVARBPROC)glewGetProcAddress((const GLubyte*)"glUniform3ivARB")) == NULL) || r;
+  r = ((glUniform4fARB = (PFNGLUNIFORM4FARBPROC)glewGetProcAddress((const GLubyte*)"glUniform4fARB")) == NULL) || r;
+  r = ((glUniform4fvARB = (PFNGLUNIFORM4FVARBPROC)glewGetProcAddress((const GLubyte*)"glUniform4fvARB")) == NULL) || r;
+  r = ((glUniform4iARB = (PFNGLUNIFORM4IARBPROC)glewGetProcAddress((const GLubyte*)"glUniform4iARB")) == NULL) || r;
+  r = ((glUniform4ivARB = (PFNGLUNIFORM4IVARBPROC)glewGetProcAddress((const GLubyte*)"glUniform4ivARB")) == NULL) || r;
+  r = ((glUniformMatrix2fvARB = (PFNGLUNIFORMMATRIX2FVARBPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix2fvARB")) == NULL) || r;
+  r = ((glUniformMatrix3fvARB = (PFNGLUNIFORMMATRIX3FVARBPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix3fvARB")) == NULL) || r;
+  r = ((glUniformMatrix4fvARB = (PFNGLUNIFORMMATRIX4FVARBPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix4fvARB")) == NULL) || r;
+  r = ((glUseProgramObjectARB = (PFNGLUSEPROGRAMOBJECTARBPROC)glewGetProcAddress((const GLubyte*)"glUseProgramObjectARB")) == NULL) || r;
+  r = ((glValidateProgramARB = (PFNGLVALIDATEPROGRAMARBPROC)glewGetProcAddress((const GLubyte*)"glValidateProgramARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_shader_objects */
+
+#ifdef GL_ARB_shading_language_100
+
+#endif /* GL_ARB_shading_language_100 */
+
+#ifdef GL_ARB_shadow
+
+#endif /* GL_ARB_shadow */
+
+#ifdef GL_ARB_shadow_ambient
+
+#endif /* GL_ARB_shadow_ambient */
+
+#ifdef GL_ARB_texture_border_clamp
+
+#endif /* GL_ARB_texture_border_clamp */
+
+#ifdef GL_ARB_texture_compression
+
+static GLboolean _glewInit_GL_ARB_texture_compression (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glCompressedTexImage1DARB = (PFNGLCOMPRESSEDTEXIMAGE1DARBPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexImage1DARB")) == NULL) || r;
+  r = ((glCompressedTexImage2DARB = (PFNGLCOMPRESSEDTEXIMAGE2DARBPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexImage2DARB")) == NULL) || r;
+  r = ((glCompressedTexImage3DARB = (PFNGLCOMPRESSEDTEXIMAGE3DARBPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexImage3DARB")) == NULL) || r;
+  r = ((glCompressedTexSubImage1DARB = (PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexSubImage1DARB")) == NULL) || r;
+  r = ((glCompressedTexSubImage2DARB = (PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexSubImage2DARB")) == NULL) || r;
+  r = ((glCompressedTexSubImage3DARB = (PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexSubImage3DARB")) == NULL) || r;
+  r = ((glGetCompressedTexImageARB = (PFNGLGETCOMPRESSEDTEXIMAGEARBPROC)glewGetProcAddress((const GLubyte*)"glGetCompressedTexImageARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_texture_compression */
+
+#ifdef GL_ARB_texture_cube_map
+
+#endif /* GL_ARB_texture_cube_map */
+
+#ifdef GL_ARB_texture_env_add
+
+#endif /* GL_ARB_texture_env_add */
+
+#ifdef GL_ARB_texture_env_combine
+
+#endif /* GL_ARB_texture_env_combine */
+
+#ifdef GL_ARB_texture_env_crossbar
+
+#endif /* GL_ARB_texture_env_crossbar */
+
+#ifdef GL_ARB_texture_env_dot3
+
+#endif /* GL_ARB_texture_env_dot3 */
+
+#ifdef GL_ARB_texture_float
+
+#endif /* GL_ARB_texture_float */
+
+#ifdef GL_ARB_texture_mirrored_repeat
+
+#endif /* GL_ARB_texture_mirrored_repeat */
+
+#ifdef GL_ARB_texture_non_power_of_two
+
+#endif /* GL_ARB_texture_non_power_of_two */
+
+#ifdef GL_ARB_texture_rectangle
+
+#endif /* GL_ARB_texture_rectangle */
+
+#ifdef GL_ARB_transpose_matrix
+
+static GLboolean _glewInit_GL_ARB_transpose_matrix (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glLoadTransposeMatrixdARB = (PFNGLLOADTRANSPOSEMATRIXDARBPROC)glewGetProcAddress((const GLubyte*)"glLoadTransposeMatrixdARB")) == NULL) || r;
+  r = ((glLoadTransposeMatrixfARB = (PFNGLLOADTRANSPOSEMATRIXFARBPROC)glewGetProcAddress((const GLubyte*)"glLoadTransposeMatrixfARB")) == NULL) || r;
+  r = ((glMultTransposeMatrixdARB = (PFNGLMULTTRANSPOSEMATRIXDARBPROC)glewGetProcAddress((const GLubyte*)"glMultTransposeMatrixdARB")) == NULL) || r;
+  r = ((glMultTransposeMatrixfARB = (PFNGLMULTTRANSPOSEMATRIXFARBPROC)glewGetProcAddress((const GLubyte*)"glMultTransposeMatrixfARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_transpose_matrix */
+
+#ifdef GL_ARB_vertex_blend
+
+static GLboolean _glewInit_GL_ARB_vertex_blend (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glVertexBlendARB = (PFNGLVERTEXBLENDARBPROC)glewGetProcAddress((const GLubyte*)"glVertexBlendARB")) == NULL) || r;
+  r = ((glWeightPointerARB = (PFNGLWEIGHTPOINTERARBPROC)glewGetProcAddress((const GLubyte*)"glWeightPointerARB")) == NULL) || r;
+  r = ((glWeightbvARB = (PFNGLWEIGHTBVARBPROC)glewGetProcAddress((const GLubyte*)"glWeightbvARB")) == NULL) || r;
+  r = ((glWeightdvARB = (PFNGLWEIGHTDVARBPROC)glewGetProcAddress((const GLubyte*)"glWeightdvARB")) == NULL) || r;
+  r = ((glWeightfvARB = (PFNGLWEIGHTFVARBPROC)glewGetProcAddress((const GLubyte*)"glWeightfvARB")) == NULL) || r;
+  r = ((glWeightivARB = (PFNGLWEIGHTIVARBPROC)glewGetProcAddress((const GLubyte*)"glWeightivARB")) == NULL) || r;
+  r = ((glWeightsvARB = (PFNGLWEIGHTSVARBPROC)glewGetProcAddress((const GLubyte*)"glWeightsvARB")) == NULL) || r;
+  r = ((glWeightubvARB = (PFNGLWEIGHTUBVARBPROC)glewGetProcAddress((const GLubyte*)"glWeightubvARB")) == NULL) || r;
+  r = ((glWeightuivARB = (PFNGLWEIGHTUIVARBPROC)glewGetProcAddress((const GLubyte*)"glWeightuivARB")) == NULL) || r;
+  r = ((glWeightusvARB = (PFNGLWEIGHTUSVARBPROC)glewGetProcAddress((const GLubyte*)"glWeightusvARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_vertex_blend */
+
+#ifdef GL_ARB_vertex_buffer_object
+
+static GLboolean _glewInit_GL_ARB_vertex_buffer_object (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBindBufferARB = (PFNGLBINDBUFFERARBPROC)glewGetProcAddress((const GLubyte*)"glBindBufferARB")) == NULL) || r;
+  r = ((glBufferDataARB = (PFNGLBUFFERDATAARBPROC)glewGetProcAddress((const GLubyte*)"glBufferDataARB")) == NULL) || r;
+  r = ((glBufferSubDataARB = (PFNGLBUFFERSUBDATAARBPROC)glewGetProcAddress((const GLubyte*)"glBufferSubDataARB")) == NULL) || r;
+  r = ((glDeleteBuffersARB = (PFNGLDELETEBUFFERSARBPROC)glewGetProcAddress((const GLubyte*)"glDeleteBuffersARB")) == NULL) || r;
+  r = ((glGenBuffersARB = (PFNGLGENBUFFERSARBPROC)glewGetProcAddress((const GLubyte*)"glGenBuffersARB")) == NULL) || r;
+  r = ((glGetBufferParameterivARB = (PFNGLGETBUFFERPARAMETERIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetBufferParameterivARB")) == NULL) || r;
+  r = ((glGetBufferPointervARB = (PFNGLGETBUFFERPOINTERVARBPROC)glewGetProcAddress((const GLubyte*)"glGetBufferPointervARB")) == NULL) || r;
+  r = ((glGetBufferSubDataARB = (PFNGLGETBUFFERSUBDATAARBPROC)glewGetProcAddress((const GLubyte*)"glGetBufferSubDataARB")) == NULL) || r;
+  r = ((glIsBufferARB = (PFNGLISBUFFERARBPROC)glewGetProcAddress((const GLubyte*)"glIsBufferARB")) == NULL) || r;
+  r = ((glMapBufferARB = (PFNGLMAPBUFFERARBPROC)glewGetProcAddress((const GLubyte*)"glMapBufferARB")) == NULL) || r;
+  r = ((glUnmapBufferARB = (PFNGLUNMAPBUFFERARBPROC)glewGetProcAddress((const GLubyte*)"glUnmapBufferARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_vertex_buffer_object */
+
+#ifdef GL_ARB_vertex_program
+
+static GLboolean _glewInit_GL_ARB_vertex_program (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBindProgramARB = (PFNGLBINDPROGRAMARBPROC)glewGetProcAddress((const GLubyte*)"glBindProgramARB")) == NULL) || r;
+  r = ((glDeleteProgramsARB = (PFNGLDELETEPROGRAMSARBPROC)glewGetProcAddress((const GLubyte*)"glDeleteProgramsARB")) == NULL) || r;
+  r = ((glDisableVertexAttribArrayARB = (PFNGLDISABLEVERTEXATTRIBARRAYARBPROC)glewGetProcAddress((const GLubyte*)"glDisableVertexAttribArrayARB")) == NULL) || r;
+  r = ((glEnableVertexAttribArrayARB = (PFNGLENABLEVERTEXATTRIBARRAYARBPROC)glewGetProcAddress((const GLubyte*)"glEnableVertexAttribArrayARB")) == NULL) || r;
+  r = ((glGenProgramsARB = (PFNGLGENPROGRAMSARBPROC)glewGetProcAddress((const GLubyte*)"glGenProgramsARB")) == NULL) || r;
+  r = ((glGetProgramEnvParameterdvARB = (PFNGLGETPROGRAMENVPARAMETERDVARBPROC)glewGetProcAddress((const GLubyte*)"glGetProgramEnvParameterdvARB")) == NULL) || r;
+  r = ((glGetProgramEnvParameterfvARB = (PFNGLGETPROGRAMENVPARAMETERFVARBPROC)glewGetProcAddress((const GLubyte*)"glGetProgramEnvParameterfvARB")) == NULL) || r;
+  r = ((glGetProgramLocalParameterdvARB = (PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC)glewGetProcAddress((const GLubyte*)"glGetProgramLocalParameterdvARB")) == NULL) || r;
+  r = ((glGetProgramLocalParameterfvARB = (PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC)glewGetProcAddress((const GLubyte*)"glGetProgramLocalParameterfvARB")) == NULL) || r;
+  r = ((glGetProgramStringARB = (PFNGLGETPROGRAMSTRINGARBPROC)glewGetProcAddress((const GLubyte*)"glGetProgramStringARB")) == NULL) || r;
+  r = ((glGetProgramivARB = (PFNGLGETPROGRAMIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetProgramivARB")) == NULL) || r;
+  r = ((glGetVertexAttribPointervARB = (PFNGLGETVERTEXATTRIBPOINTERVARBPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribPointervARB")) == NULL) || r;
+  r = ((glGetVertexAttribdvARB = (PFNGLGETVERTEXATTRIBDVARBPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribdvARB")) == NULL) || r;
+  r = ((glGetVertexAttribfvARB = (PFNGLGETVERTEXATTRIBFVARBPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribfvARB")) == NULL) || r;
+  r = ((glGetVertexAttribivARB = (PFNGLGETVERTEXATTRIBIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribivARB")) == NULL) || r;
+  r = ((glIsProgramARB = (PFNGLISPROGRAMARBPROC)glewGetProcAddress((const GLubyte*)"glIsProgramARB")) == NULL) || r;
+  r = ((glProgramEnvParameter4dARB = (PFNGLPROGRAMENVPARAMETER4DARBPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParameter4dARB")) == NULL) || r;
+  r = ((glProgramEnvParameter4dvARB = (PFNGLPROGRAMENVPARAMETER4DVARBPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParameter4dvARB")) == NULL) || r;
+  r = ((glProgramEnvParameter4fARB = (PFNGLPROGRAMENVPARAMETER4FARBPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParameter4fARB")) == NULL) || r;
+  r = ((glProgramEnvParameter4fvARB = (PFNGLPROGRAMENVPARAMETER4FVARBPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParameter4fvARB")) == NULL) || r;
+  r = ((glProgramLocalParameter4dARB = (PFNGLPROGRAMLOCALPARAMETER4DARBPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParameter4dARB")) == NULL) || r;
+  r = ((glProgramLocalParameter4dvARB = (PFNGLPROGRAMLOCALPARAMETER4DVARBPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParameter4dvARB")) == NULL) || r;
+  r = ((glProgramLocalParameter4fARB = (PFNGLPROGRAMLOCALPARAMETER4FARBPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParameter4fARB")) == NULL) || r;
+  r = ((glProgramLocalParameter4fvARB = (PFNGLPROGRAMLOCALPARAMETER4FVARBPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParameter4fvARB")) == NULL) || r;
+  r = ((glProgramStringARB = (PFNGLPROGRAMSTRINGARBPROC)glewGetProcAddress((const GLubyte*)"glProgramStringARB")) == NULL) || r;
+  r = ((glVertexAttrib1dARB = (PFNGLVERTEXATTRIB1DARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1dARB")) == NULL) || r;
+  r = ((glVertexAttrib1dvARB = (PFNGLVERTEXATTRIB1DVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1dvARB")) == NULL) || r;
+  r = ((glVertexAttrib1fARB = (PFNGLVERTEXATTRIB1FARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1fARB")) == NULL) || r;
+  r = ((glVertexAttrib1fvARB = (PFNGLVERTEXATTRIB1FVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1fvARB")) == NULL) || r;
+  r = ((glVertexAttrib1sARB = (PFNGLVERTEXATTRIB1SARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1sARB")) == NULL) || r;
+  r = ((glVertexAttrib1svARB = (PFNGLVERTEXATTRIB1SVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1svARB")) == NULL) || r;
+  r = ((glVertexAttrib2dARB = (PFNGLVERTEXATTRIB2DARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2dARB")) == NULL) || r;
+  r = ((glVertexAttrib2dvARB = (PFNGLVERTEXATTRIB2DVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2dvARB")) == NULL) || r;
+  r = ((glVertexAttrib2fARB = (PFNGLVERTEXATTRIB2FARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2fARB")) == NULL) || r;
+  r = ((glVertexAttrib2fvARB = (PFNGLVERTEXATTRIB2FVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2fvARB")) == NULL) || r;
+  r = ((glVertexAttrib2sARB = (PFNGLVERTEXATTRIB2SARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2sARB")) == NULL) || r;
+  r = ((glVertexAttrib2svARB = (PFNGLVERTEXATTRIB2SVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2svARB")) == NULL) || r;
+  r = ((glVertexAttrib3dARB = (PFNGLVERTEXATTRIB3DARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3dARB")) == NULL) || r;
+  r = ((glVertexAttrib3dvARB = (PFNGLVERTEXATTRIB3DVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3dvARB")) == NULL) || r;
+  r = ((glVertexAttrib3fARB = (PFNGLVERTEXATTRIB3FARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3fARB")) == NULL) || r;
+  r = ((glVertexAttrib3fvARB = (PFNGLVERTEXATTRIB3FVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3fvARB")) == NULL) || r;
+  r = ((glVertexAttrib3sARB = (PFNGLVERTEXATTRIB3SARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3sARB")) == NULL) || r;
+  r = ((glVertexAttrib3svARB = (PFNGLVERTEXATTRIB3SVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3svARB")) == NULL) || r;
+  r = ((glVertexAttrib4NbvARB = (PFNGLVERTEXATTRIB4NBVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4NbvARB")) == NULL) || r;
+  r = ((glVertexAttrib4NivARB = (PFNGLVERTEXATTRIB4NIVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4NivARB")) == NULL) || r;
+  r = ((glVertexAttrib4NsvARB = (PFNGLVERTEXATTRIB4NSVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4NsvARB")) == NULL) || r;
+  r = ((glVertexAttrib4NubARB = (PFNGLVERTEXATTRIB4NUBARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4NubARB")) == NULL) || r;
+  r = ((glVertexAttrib4NubvARB = (PFNGLVERTEXATTRIB4NUBVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4NubvARB")) == NULL) || r;
+  r = ((glVertexAttrib4NuivARB = (PFNGLVERTEXATTRIB4NUIVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4NuivARB")) == NULL) || r;
+  r = ((glVertexAttrib4NusvARB = (PFNGLVERTEXATTRIB4NUSVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4NusvARB")) == NULL) || r;
+  r = ((glVertexAttrib4bvARB = (PFNGLVERTEXATTRIB4BVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4bvARB")) == NULL) || r;
+  r = ((glVertexAttrib4dARB = (PFNGLVERTEXATTRIB4DARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4dARB")) == NULL) || r;
+  r = ((glVertexAttrib4dvARB = (PFNGLVERTEXATTRIB4DVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4dvARB")) == NULL) || r;
+  r = ((glVertexAttrib4fARB = (PFNGLVERTEXATTRIB4FARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4fARB")) == NULL) || r;
+  r = ((glVertexAttrib4fvARB = (PFNGLVERTEXATTRIB4FVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4fvARB")) == NULL) || r;
+  r = ((glVertexAttrib4ivARB = (PFNGLVERTEXATTRIB4IVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4ivARB")) == NULL) || r;
+  r = ((glVertexAttrib4sARB = (PFNGLVERTEXATTRIB4SARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4sARB")) == NULL) || r;
+  r = ((glVertexAttrib4svARB = (PFNGLVERTEXATTRIB4SVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4svARB")) == NULL) || r;
+  r = ((glVertexAttrib4ubvARB = (PFNGLVERTEXATTRIB4UBVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4ubvARB")) == NULL) || r;
+  r = ((glVertexAttrib4uivARB = (PFNGLVERTEXATTRIB4UIVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4uivARB")) == NULL) || r;
+  r = ((glVertexAttrib4usvARB = (PFNGLVERTEXATTRIB4USVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4usvARB")) == NULL) || r;
+  r = ((glVertexAttribPointerARB = (PFNGLVERTEXATTRIBPOINTERARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribPointerARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_vertex_program */
+
+#ifdef GL_ARB_vertex_shader
+
+static GLboolean _glewInit_GL_ARB_vertex_shader (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBindAttribLocationARB = (PFNGLBINDATTRIBLOCATIONARBPROC)glewGetProcAddress((const GLubyte*)"glBindAttribLocationARB")) == NULL) || r;
+  r = ((glGetActiveAttribARB = (PFNGLGETACTIVEATTRIBARBPROC)glewGetProcAddress((const GLubyte*)"glGetActiveAttribARB")) == NULL) || r;
+  r = ((glGetAttribLocationARB = (PFNGLGETATTRIBLOCATIONARBPROC)glewGetProcAddress((const GLubyte*)"glGetAttribLocationARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_vertex_shader */
+
+#ifdef GL_ARB_window_pos
+
+static GLboolean _glewInit_GL_ARB_window_pos (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glWindowPos2dARB = (PFNGLWINDOWPOS2DARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2dARB")) == NULL) || r;
+  r = ((glWindowPos2dvARB = (PFNGLWINDOWPOS2DVARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2dvARB")) == NULL) || r;
+  r = ((glWindowPos2fARB = (PFNGLWINDOWPOS2FARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2fARB")) == NULL) || r;
+  r = ((glWindowPos2fvARB = (PFNGLWINDOWPOS2FVARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2fvARB")) == NULL) || r;
+  r = ((glWindowPos2iARB = (PFNGLWINDOWPOS2IARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2iARB")) == NULL) || r;
+  r = ((glWindowPos2ivARB = (PFNGLWINDOWPOS2IVARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2ivARB")) == NULL) || r;
+  r = ((glWindowPos2sARB = (PFNGLWINDOWPOS2SARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2sARB")) == NULL) || r;
+  r = ((glWindowPos2svARB = (PFNGLWINDOWPOS2SVARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2svARB")) == NULL) || r;
+  r = ((glWindowPos3dARB = (PFNGLWINDOWPOS3DARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3dARB")) == NULL) || r;
+  r = ((glWindowPos3dvARB = (PFNGLWINDOWPOS3DVARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3dvARB")) == NULL) || r;
+  r = ((glWindowPos3fARB = (PFNGLWINDOWPOS3FARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3fARB")) == NULL) || r;
+  r = ((glWindowPos3fvARB = (PFNGLWINDOWPOS3FVARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3fvARB")) == NULL) || r;
+  r = ((glWindowPos3iARB = (PFNGLWINDOWPOS3IARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3iARB")) == NULL) || r;
+  r = ((glWindowPos3ivARB = (PFNGLWINDOWPOS3IVARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3ivARB")) == NULL) || r;
+  r = ((glWindowPos3sARB = (PFNGLWINDOWPOS3SARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3sARB")) == NULL) || r;
+  r = ((glWindowPos3svARB = (PFNGLWINDOWPOS3SVARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3svARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ARB_window_pos */
+
+#ifdef GL_ATIX_point_sprites
+
+#endif /* GL_ATIX_point_sprites */
+
+#ifdef GL_ATIX_texture_env_combine3
+
+#endif /* GL_ATIX_texture_env_combine3 */
+
+#ifdef GL_ATIX_texture_env_route
+
+#endif /* GL_ATIX_texture_env_route */
+
+#ifdef GL_ATIX_vertex_shader_output_point_size
+
+#endif /* GL_ATIX_vertex_shader_output_point_size */
+
+#ifdef GL_ATI_draw_buffers
+
+static GLboolean _glewInit_GL_ATI_draw_buffers (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glDrawBuffersATI = (PFNGLDRAWBUFFERSATIPROC)glewGetProcAddress((const GLubyte*)"glDrawBuffersATI")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ATI_draw_buffers */
+
+#ifdef GL_ATI_element_array
+
+static GLboolean _glewInit_GL_ATI_element_array (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glDrawElementArrayATI = (PFNGLDRAWELEMENTARRAYATIPROC)glewGetProcAddress((const GLubyte*)"glDrawElementArrayATI")) == NULL) || r;
+  r = ((glDrawRangeElementArrayATI = (PFNGLDRAWRANGEELEMENTARRAYATIPROC)glewGetProcAddress((const GLubyte*)"glDrawRangeElementArrayATI")) == NULL) || r;
+  r = ((glElementPointerATI = (PFNGLELEMENTPOINTERATIPROC)glewGetProcAddress((const GLubyte*)"glElementPointerATI")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ATI_element_array */
+
+#ifdef GL_ATI_envmap_bumpmap
+
+static GLboolean _glewInit_GL_ATI_envmap_bumpmap (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetTexBumpParameterfvATI = (PFNGLGETTEXBUMPPARAMETERFVATIPROC)glewGetProcAddress((const GLubyte*)"glGetTexBumpParameterfvATI")) == NULL) || r;
+  r = ((glGetTexBumpParameterivATI = (PFNGLGETTEXBUMPPARAMETERIVATIPROC)glewGetProcAddress((const GLubyte*)"glGetTexBumpParameterivATI")) == NULL) || r;
+  r = ((glTexBumpParameterfvATI = (PFNGLTEXBUMPPARAMETERFVATIPROC)glewGetProcAddress((const GLubyte*)"glTexBumpParameterfvATI")) == NULL) || r;
+  r = ((glTexBumpParameterivATI = (PFNGLTEXBUMPPARAMETERIVATIPROC)glewGetProcAddress((const GLubyte*)"glTexBumpParameterivATI")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ATI_envmap_bumpmap */
+
+#ifdef GL_ATI_fragment_shader
+
+static GLboolean _glewInit_GL_ATI_fragment_shader (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glAlphaFragmentOp1ATI = (PFNGLALPHAFRAGMENTOP1ATIPROC)glewGetProcAddress((const GLubyte*)"glAlphaFragmentOp1ATI")) == NULL) || r;
+  r = ((glAlphaFragmentOp2ATI = (PFNGLALPHAFRAGMENTOP2ATIPROC)glewGetProcAddress((const GLubyte*)"glAlphaFragmentOp2ATI")) == NULL) || r;
+  r = ((glAlphaFragmentOp3ATI = (PFNGLALPHAFRAGMENTOP3ATIPROC)glewGetProcAddress((const GLubyte*)"glAlphaFragmentOp3ATI")) == NULL) || r;
+  r = ((glBeginFragmentShaderATI = (PFNGLBEGINFRAGMENTSHADERATIPROC)glewGetProcAddress((const GLubyte*)"glBeginFragmentShaderATI")) == NULL) || r;
+  r = ((glBindFragmentShaderATI = (PFNGLBINDFRAGMENTSHADERATIPROC)glewGetProcAddress((const GLubyte*)"glBindFragmentShaderATI")) == NULL) || r;
+  r = ((glColorFragmentOp1ATI = (PFNGLCOLORFRAGMENTOP1ATIPROC)glewGetProcAddress((const GLubyte*)"glColorFragmentOp1ATI")) == NULL) || r;
+  r = ((glColorFragmentOp2ATI = (PFNGLCOLORFRAGMENTOP2ATIPROC)glewGetProcAddress((const GLubyte*)"glColorFragmentOp2ATI")) == NULL) || r;
+  r = ((glColorFragmentOp3ATI = (PFNGLCOLORFRAGMENTOP3ATIPROC)glewGetProcAddress((const GLubyte*)"glColorFragmentOp3ATI")) == NULL) || r;
+  r = ((glDeleteFragmentShaderATI = (PFNGLDELETEFRAGMENTSHADERATIPROC)glewGetProcAddress((const GLubyte*)"glDeleteFragmentShaderATI")) == NULL) || r;
+  r = ((glEndFragmentShaderATI = (PFNGLENDFRAGMENTSHADERATIPROC)glewGetProcAddress((const GLubyte*)"glEndFragmentShaderATI")) == NULL) || r;
+  r = ((glGenFragmentShadersATI = (PFNGLGENFRAGMENTSHADERSATIPROC)glewGetProcAddress((const GLubyte*)"glGenFragmentShadersATI")) == NULL) || r;
+  r = ((glPassTexCoordATI = (PFNGLPASSTEXCOORDATIPROC)glewGetProcAddress((const GLubyte*)"glPassTexCoordATI")) == NULL) || r;
+  r = ((glSampleMapATI = (PFNGLSAMPLEMAPATIPROC)glewGetProcAddress((const GLubyte*)"glSampleMapATI")) == NULL) || r;
+  r = ((glSetFragmentShaderConstantATI = (PFNGLSETFRAGMENTSHADERCONSTANTATIPROC)glewGetProcAddress((const GLubyte*)"glSetFragmentShaderConstantATI")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ATI_fragment_shader */
+
+#ifdef GL_ATI_map_object_buffer
+
+static GLboolean _glewInit_GL_ATI_map_object_buffer (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glMapObjectBufferATI = (PFNGLMAPOBJECTBUFFERATIPROC)glewGetProcAddress((const GLubyte*)"glMapObjectBufferATI")) == NULL) || r;
+  r = ((glUnmapObjectBufferATI = (PFNGLUNMAPOBJECTBUFFERATIPROC)glewGetProcAddress((const GLubyte*)"glUnmapObjectBufferATI")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ATI_map_object_buffer */
+
+#ifdef GL_ATI_pn_triangles
+
+static GLboolean _glewInit_GL_ATI_pn_triangles (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glPNTrianglesfATI = (PFNGLPNTRIANGLESFATIPROC)glewGetProcAddress((const GLubyte*)"glPNTrianglesfATI")) == NULL) || r;
+  r = ((glPNTrianglesiATI = (PFNGLPNTRIANGLESIATIPROC)glewGetProcAddress((const GLubyte*)"glPNTrianglesiATI")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ATI_pn_triangles */
+
+#ifdef GL_ATI_separate_stencil
+
+static GLboolean _glewInit_GL_ATI_separate_stencil (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glStencilFuncSeparateATI = (PFNGLSTENCILFUNCSEPARATEATIPROC)glewGetProcAddress((const GLubyte*)"glStencilFuncSeparateATI")) == NULL) || r;
+  r = ((glStencilOpSeparateATI = (PFNGLSTENCILOPSEPARATEATIPROC)glewGetProcAddress((const GLubyte*)"glStencilOpSeparateATI")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ATI_separate_stencil */
+
+#ifdef GL_ATI_text_fragment_shader
+
+#endif /* GL_ATI_text_fragment_shader */
+
+#ifdef GL_ATI_texture_compression_3dc
+
+#endif /* GL_ATI_texture_compression_3dc */
+
+#ifdef GL_ATI_texture_env_combine3
+
+#endif /* GL_ATI_texture_env_combine3 */
+
+#ifdef GL_ATI_texture_float
+
+#endif /* GL_ATI_texture_float */
+
+#ifdef GL_ATI_texture_mirror_once
+
+#endif /* GL_ATI_texture_mirror_once */
+
+#ifdef GL_ATI_vertex_array_object
+
+static GLboolean _glewInit_GL_ATI_vertex_array_object (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glArrayObjectATI = (PFNGLARRAYOBJECTATIPROC)glewGetProcAddress((const GLubyte*)"glArrayObjectATI")) == NULL) || r;
+  r = ((glFreeObjectBufferATI = (PFNGLFREEOBJECTBUFFERATIPROC)glewGetProcAddress((const GLubyte*)"glFreeObjectBufferATI")) == NULL) || r;
+  r = ((glGetArrayObjectfvATI = (PFNGLGETARRAYOBJECTFVATIPROC)glewGetProcAddress((const GLubyte*)"glGetArrayObjectfvATI")) == NULL) || r;
+  r = ((glGetArrayObjectivATI = (PFNGLGETARRAYOBJECTIVATIPROC)glewGetProcAddress((const GLubyte*)"glGetArrayObjectivATI")) == NULL) || r;
+  r = ((glGetObjectBufferfvATI = (PFNGLGETOBJECTBUFFERFVATIPROC)glewGetProcAddress((const GLubyte*)"glGetObjectBufferfvATI")) == NULL) || r;
+  r = ((glGetObjectBufferivATI = (PFNGLGETOBJECTBUFFERIVATIPROC)glewGetProcAddress((const GLubyte*)"glGetObjectBufferivATI")) == NULL) || r;
+  r = ((glGetVariantArrayObjectfvATI = (PFNGLGETVARIANTARRAYOBJECTFVATIPROC)glewGetProcAddress((const GLubyte*)"glGetVariantArrayObjectfvATI")) == NULL) || r;
+  r = ((glGetVariantArrayObjectivATI = (PFNGLGETVARIANTARRAYOBJECTIVATIPROC)glewGetProcAddress((const GLubyte*)"glGetVariantArrayObjectivATI")) == NULL) || r;
+  r = ((glIsObjectBufferATI = (PFNGLISOBJECTBUFFERATIPROC)glewGetProcAddress((const GLubyte*)"glIsObjectBufferATI")) == NULL) || r;
+  r = ((glNewObjectBufferATI = (PFNGLNEWOBJECTBUFFERATIPROC)glewGetProcAddress((const GLubyte*)"glNewObjectBufferATI")) == NULL) || r;
+  r = ((glUpdateObjectBufferATI = (PFNGLUPDATEOBJECTBUFFERATIPROC)glewGetProcAddress((const GLubyte*)"glUpdateObjectBufferATI")) == NULL) || r;
+  r = ((glVariantArrayObjectATI = (PFNGLVARIANTARRAYOBJECTATIPROC)glewGetProcAddress((const GLubyte*)"glVariantArrayObjectATI")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ATI_vertex_array_object */
+
+#ifdef GL_ATI_vertex_attrib_array_object
+
+static GLboolean _glewInit_GL_ATI_vertex_attrib_array_object (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetVertexAttribArrayObjectfvATI = (PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribArrayObjectfvATI")) == NULL) || r;
+  r = ((glGetVertexAttribArrayObjectivATI = (PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribArrayObjectivATI")) == NULL) || r;
+  r = ((glVertexAttribArrayObjectATI = (PFNGLVERTEXATTRIBARRAYOBJECTATIPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribArrayObjectATI")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ATI_vertex_attrib_array_object */
+
+#ifdef GL_ATI_vertex_streams
+
+static GLboolean _glewInit_GL_ATI_vertex_streams (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glClientActiveVertexStreamATI = (PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC)glewGetProcAddress((const GLubyte*)"glClientActiveVertexStreamATI")) == NULL) || r;
+  r = ((glNormalStream3bATI = (PFNGLNORMALSTREAM3BATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3bATI")) == NULL) || r;
+  r = ((glNormalStream3bvATI = (PFNGLNORMALSTREAM3BVATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3bvATI")) == NULL) || r;
+  r = ((glNormalStream3dATI = (PFNGLNORMALSTREAM3DATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3dATI")) == NULL) || r;
+  r = ((glNormalStream3dvATI = (PFNGLNORMALSTREAM3DVATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3dvATI")) == NULL) || r;
+  r = ((glNormalStream3fATI = (PFNGLNORMALSTREAM3FATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3fATI")) == NULL) || r;
+  r = ((glNormalStream3fvATI = (PFNGLNORMALSTREAM3FVATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3fvATI")) == NULL) || r;
+  r = ((glNormalStream3iATI = (PFNGLNORMALSTREAM3IATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3iATI")) == NULL) || r;
+  r = ((glNormalStream3ivATI = (PFNGLNORMALSTREAM3IVATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3ivATI")) == NULL) || r;
+  r = ((glNormalStream3sATI = (PFNGLNORMALSTREAM3SATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3sATI")) == NULL) || r;
+  r = ((glNormalStream3svATI = (PFNGLNORMALSTREAM3SVATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3svATI")) == NULL) || r;
+  r = ((glVertexBlendEnvfATI = (PFNGLVERTEXBLENDENVFATIPROC)glewGetProcAddress((const GLubyte*)"glVertexBlendEnvfATI")) == NULL) || r;
+  r = ((glVertexBlendEnviATI = (PFNGLVERTEXBLENDENVIATIPROC)glewGetProcAddress((const GLubyte*)"glVertexBlendEnviATI")) == NULL) || r;
+  r = ((glVertexStream2dATI = (PFNGLVERTEXSTREAM2DATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream2dATI")) == NULL) || r;
+  r = ((glVertexStream2dvATI = (PFNGLVERTEXSTREAM2DVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream2dvATI")) == NULL) || r;
+  r = ((glVertexStream2fATI = (PFNGLVERTEXSTREAM2FATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream2fATI")) == NULL) || r;
+  r = ((glVertexStream2fvATI = (PFNGLVERTEXSTREAM2FVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream2fvATI")) == NULL) || r;
+  r = ((glVertexStream2iATI = (PFNGLVERTEXSTREAM2IATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream2iATI")) == NULL) || r;
+  r = ((glVertexStream2ivATI = (PFNGLVERTEXSTREAM2IVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream2ivATI")) == NULL) || r;
+  r = ((glVertexStream2sATI = (PFNGLVERTEXSTREAM2SATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream2sATI")) == NULL) || r;
+  r = ((glVertexStream2svATI = (PFNGLVERTEXSTREAM2SVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream2svATI")) == NULL) || r;
+  r = ((glVertexStream3dATI = (PFNGLVERTEXSTREAM3DATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream3dATI")) == NULL) || r;
+  r = ((glVertexStream3dvATI = (PFNGLVERTEXSTREAM3DVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream3dvATI")) == NULL) || r;
+  r = ((glVertexStream3fATI = (PFNGLVERTEXSTREAM3FATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream3fATI")) == NULL) || r;
+  r = ((glVertexStream3fvATI = (PFNGLVERTEXSTREAM3FVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream3fvATI")) == NULL) || r;
+  r = ((glVertexStream3iATI = (PFNGLVERTEXSTREAM3IATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream3iATI")) == NULL) || r;
+  r = ((glVertexStream3ivATI = (PFNGLVERTEXSTREAM3IVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream3ivATI")) == NULL) || r;
+  r = ((glVertexStream3sATI = (PFNGLVERTEXSTREAM3SATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream3sATI")) == NULL) || r;
+  r = ((glVertexStream3svATI = (PFNGLVERTEXSTREAM3SVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream3svATI")) == NULL) || r;
+  r = ((glVertexStream4dATI = (PFNGLVERTEXSTREAM4DATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream4dATI")) == NULL) || r;
+  r = ((glVertexStream4dvATI = (PFNGLVERTEXSTREAM4DVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream4dvATI")) == NULL) || r;
+  r = ((glVertexStream4fATI = (PFNGLVERTEXSTREAM4FATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream4fATI")) == NULL) || r;
+  r = ((glVertexStream4fvATI = (PFNGLVERTEXSTREAM4FVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream4fvATI")) == NULL) || r;
+  r = ((glVertexStream4iATI = (PFNGLVERTEXSTREAM4IATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream4iATI")) == NULL) || r;
+  r = ((glVertexStream4ivATI = (PFNGLVERTEXSTREAM4IVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream4ivATI")) == NULL) || r;
+  r = ((glVertexStream4sATI = (PFNGLVERTEXSTREAM4SATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream4sATI")) == NULL) || r;
+  r = ((glVertexStream4svATI = (PFNGLVERTEXSTREAM4SVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream4svATI")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_ATI_vertex_streams */
+
+#ifdef GL_EXT_422_pixels
+
+#endif /* GL_EXT_422_pixels */
+
+#ifdef GL_EXT_Cg_shader
+
+#endif /* GL_EXT_Cg_shader */
+
+#ifdef GL_EXT_abgr
+
+#endif /* GL_EXT_abgr */
+
+#ifdef GL_EXT_bgra
+
+#endif /* GL_EXT_bgra */
+
+#ifdef GL_EXT_blend_color
+
+static GLboolean _glewInit_GL_EXT_blend_color (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBlendColorEXT = (PFNGLBLENDCOLOREXTPROC)glewGetProcAddress((const GLubyte*)"glBlendColorEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_blend_color */
+
+#ifdef GL_EXT_blend_equation_separate
+
+static GLboolean _glewInit_GL_EXT_blend_equation_separate (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBlendEquationSeparateEXT = (PFNGLBLENDEQUATIONSEPARATEEXTPROC)glewGetProcAddress((const GLubyte*)"glBlendEquationSeparateEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_blend_equation_separate */
+
+#ifdef GL_EXT_blend_func_separate
+
+static GLboolean _glewInit_GL_EXT_blend_func_separate (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBlendFuncSeparateEXT = (PFNGLBLENDFUNCSEPARATEEXTPROC)glewGetProcAddress((const GLubyte*)"glBlendFuncSeparateEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_blend_func_separate */
+
+#ifdef GL_EXT_blend_logic_op
+
+#endif /* GL_EXT_blend_logic_op */
+
+#ifdef GL_EXT_blend_minmax
+
+static GLboolean _glewInit_GL_EXT_blend_minmax (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBlendEquationEXT = (PFNGLBLENDEQUATIONEXTPROC)glewGetProcAddress((const GLubyte*)"glBlendEquationEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_blend_minmax */
+
+#ifdef GL_EXT_blend_subtract
+
+#endif /* GL_EXT_blend_subtract */
+
+#ifdef GL_EXT_clip_volume_hint
+
+#endif /* GL_EXT_clip_volume_hint */
+
+#ifdef GL_EXT_cmyka
+
+#endif /* GL_EXT_cmyka */
+
+#ifdef GL_EXT_color_subtable
+
+static GLboolean _glewInit_GL_EXT_color_subtable (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glColorSubTableEXT = (PFNGLCOLORSUBTABLEEXTPROC)glewGetProcAddress((const GLubyte*)"glColorSubTableEXT")) == NULL) || r;
+  r = ((glCopyColorSubTableEXT = (PFNGLCOPYCOLORSUBTABLEEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyColorSubTableEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_color_subtable */
+
+#ifdef GL_EXT_compiled_vertex_array
+
+static GLboolean _glewInit_GL_EXT_compiled_vertex_array (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glLockArraysEXT = (PFNGLLOCKARRAYSEXTPROC)glewGetProcAddress((const GLubyte*)"glLockArraysEXT")) == NULL) || r;
+  r = ((glUnlockArraysEXT = (PFNGLUNLOCKARRAYSEXTPROC)glewGetProcAddress((const GLubyte*)"glUnlockArraysEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_compiled_vertex_array */
+
+#ifdef GL_EXT_convolution
+
+static GLboolean _glewInit_GL_EXT_convolution (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glConvolutionFilter1DEXT = (PFNGLCONVOLUTIONFILTER1DEXTPROC)glewGetProcAddress((const GLubyte*)"glConvolutionFilter1DEXT")) == NULL) || r;
+  r = ((glConvolutionFilter2DEXT = (PFNGLCONVOLUTIONFILTER2DEXTPROC)glewGetProcAddress((const GLubyte*)"glConvolutionFilter2DEXT")) == NULL) || r;
+  r = ((glConvolutionParameterfEXT = (PFNGLCONVOLUTIONPARAMETERFEXTPROC)glewGetProcAddress((const GLubyte*)"glConvolutionParameterfEXT")) == NULL) || r;
+  r = ((glConvolutionParameterfvEXT = (PFNGLCONVOLUTIONPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glConvolutionParameterfvEXT")) == NULL) || r;
+  r = ((glConvolutionParameteriEXT = (PFNGLCONVOLUTIONPARAMETERIEXTPROC)glewGetProcAddress((const GLubyte*)"glConvolutionParameteriEXT")) == NULL) || r;
+  r = ((glConvolutionParameterivEXT = (PFNGLCONVOLUTIONPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glConvolutionParameterivEXT")) == NULL) || r;
+  r = ((glCopyConvolutionFilter1DEXT = (PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyConvolutionFilter1DEXT")) == NULL) || r;
+  r = ((glCopyConvolutionFilter2DEXT = (PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyConvolutionFilter2DEXT")) == NULL) || r;
+  r = ((glGetConvolutionFilterEXT = (PFNGLGETCONVOLUTIONFILTEREXTPROC)glewGetProcAddress((const GLubyte*)"glGetConvolutionFilterEXT")) == NULL) || r;
+  r = ((glGetConvolutionParameterfvEXT = (PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetConvolutionParameterfvEXT")) == NULL) || r;
+  r = ((glGetConvolutionParameterivEXT = (PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetConvolutionParameterivEXT")) == NULL) || r;
+  r = ((glGetSeparableFilterEXT = (PFNGLGETSEPARABLEFILTEREXTPROC)glewGetProcAddress((const GLubyte*)"glGetSeparableFilterEXT")) == NULL) || r;
+  r = ((glSeparableFilter2DEXT = (PFNGLSEPARABLEFILTER2DEXTPROC)glewGetProcAddress((const GLubyte*)"glSeparableFilter2DEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_convolution */
+
+#ifdef GL_EXT_coordinate_frame
+
+static GLboolean _glewInit_GL_EXT_coordinate_frame (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBinormalPointerEXT = (PFNGLBINORMALPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glBinormalPointerEXT")) == NULL) || r;
+  r = ((glTangentPointerEXT = (PFNGLTANGENTPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glTangentPointerEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_coordinate_frame */
+
+#ifdef GL_EXT_copy_texture
+
+static GLboolean _glewInit_GL_EXT_copy_texture (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glCopyTexImage1DEXT = (PFNGLCOPYTEXIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyTexImage1DEXT")) == NULL) || r;
+  r = ((glCopyTexImage2DEXT = (PFNGLCOPYTEXIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyTexImage2DEXT")) == NULL) || r;
+  r = ((glCopyTexSubImage1DEXT = (PFNGLCOPYTEXSUBIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyTexSubImage1DEXT")) == NULL) || r;
+  r = ((glCopyTexSubImage2DEXT = (PFNGLCOPYTEXSUBIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyTexSubImage2DEXT")) == NULL) || r;
+  r = ((glCopyTexSubImage3DEXT = (PFNGLCOPYTEXSUBIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyTexSubImage3DEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_copy_texture */
+
+#ifdef GL_EXT_cull_vertex
+
+static GLboolean _glewInit_GL_EXT_cull_vertex (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glCullParameterdvEXT = (PFNGLCULLPARAMETERDVEXTPROC)glewGetProcAddress((const GLubyte*)"glCullParameterdvEXT")) == NULL) || r;
+  r = ((glCullParameterfvEXT = (PFNGLCULLPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glCullParameterfvEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_cull_vertex */
+
+#ifdef GL_EXT_depth_bounds_test
+
+static GLboolean _glewInit_GL_EXT_depth_bounds_test (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glDepthBoundsEXT = (PFNGLDEPTHBOUNDSEXTPROC)glewGetProcAddress((const GLubyte*)"glDepthBoundsEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_depth_bounds_test */
+
+#ifdef GL_EXT_draw_range_elements
+
+static GLboolean _glewInit_GL_EXT_draw_range_elements (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glDrawRangeElementsEXT = (PFNGLDRAWRANGEELEMENTSEXTPROC)glewGetProcAddress((const GLubyte*)"glDrawRangeElementsEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_draw_range_elements */
+
+#ifdef GL_EXT_fog_coord
+
+static GLboolean _glewInit_GL_EXT_fog_coord (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glFogCoordPointerEXT = (PFNGLFOGCOORDPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glFogCoordPointerEXT")) == NULL) || r;
+  r = ((glFogCoorddEXT = (PFNGLFOGCOORDDEXTPROC)glewGetProcAddress((const GLubyte*)"glFogCoorddEXT")) == NULL) || r;
+  r = ((glFogCoorddvEXT = (PFNGLFOGCOORDDVEXTPROC)glewGetProcAddress((const GLubyte*)"glFogCoorddvEXT")) == NULL) || r;
+  r = ((glFogCoordfEXT = (PFNGLFOGCOORDFEXTPROC)glewGetProcAddress((const GLubyte*)"glFogCoordfEXT")) == NULL) || r;
+  r = ((glFogCoordfvEXT = (PFNGLFOGCOORDFVEXTPROC)glewGetProcAddress((const GLubyte*)"glFogCoordfvEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_fog_coord */
+
+#ifdef GL_EXT_fragment_lighting
+
+static GLboolean _glewInit_GL_EXT_fragment_lighting (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glFragmentColorMaterialEXT = (PFNGLFRAGMENTCOLORMATERIALEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentColorMaterialEXT")) == NULL) || r;
+  r = ((glFragmentLightModelfEXT = (PFNGLFRAGMENTLIGHTMODELFEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightModelfEXT")) == NULL) || r;
+  r = ((glFragmentLightModelfvEXT = (PFNGLFRAGMENTLIGHTMODELFVEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightModelfvEXT")) == NULL) || r;
+  r = ((glFragmentLightModeliEXT = (PFNGLFRAGMENTLIGHTMODELIEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightModeliEXT")) == NULL) || r;
+  r = ((glFragmentLightModelivEXT = (PFNGLFRAGMENTLIGHTMODELIVEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightModelivEXT")) == NULL) || r;
+  r = ((glFragmentLightfEXT = (PFNGLFRAGMENTLIGHTFEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightfEXT")) == NULL) || r;
+  r = ((glFragmentLightfvEXT = (PFNGLFRAGMENTLIGHTFVEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightfvEXT")) == NULL) || r;
+  r = ((glFragmentLightiEXT = (PFNGLFRAGMENTLIGHTIEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightiEXT")) == NULL) || r;
+  r = ((glFragmentLightivEXT = (PFNGLFRAGMENTLIGHTIVEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightivEXT")) == NULL) || r;
+  r = ((glFragmentMaterialfEXT = (PFNGLFRAGMENTMATERIALFEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentMaterialfEXT")) == NULL) || r;
+  r = ((glFragmentMaterialfvEXT = (PFNGLFRAGMENTMATERIALFVEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentMaterialfvEXT")) == NULL) || r;
+  r = ((glFragmentMaterialiEXT = (PFNGLFRAGMENTMATERIALIEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentMaterialiEXT")) == NULL) || r;
+  r = ((glFragmentMaterialivEXT = (PFNGLFRAGMENTMATERIALIVEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentMaterialivEXT")) == NULL) || r;
+  r = ((glGetFragmentLightfvEXT = (PFNGLGETFRAGMENTLIGHTFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetFragmentLightfvEXT")) == NULL) || r;
+  r = ((glGetFragmentLightivEXT = (PFNGLGETFRAGMENTLIGHTIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetFragmentLightivEXT")) == NULL) || r;
+  r = ((glGetFragmentMaterialfvEXT = (PFNGLGETFRAGMENTMATERIALFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetFragmentMaterialfvEXT")) == NULL) || r;
+  r = ((glGetFragmentMaterialivEXT = (PFNGLGETFRAGMENTMATERIALIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetFragmentMaterialivEXT")) == NULL) || r;
+  r = ((glLightEnviEXT = (PFNGLLIGHTENVIEXTPROC)glewGetProcAddress((const GLubyte*)"glLightEnviEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_fragment_lighting */
+
+#ifdef GL_EXT_framebuffer_blit
+
+static GLboolean _glewInit_GL_EXT_framebuffer_blit (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBlitFramebufferEXT = (PFNGLBLITFRAMEBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glBlitFramebufferEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_framebuffer_blit */
+
+#ifdef GL_EXT_framebuffer_multisample
+
+static GLboolean _glewInit_GL_EXT_framebuffer_multisample (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glRenderbufferStorageMultisampleEXT = (PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC)glewGetProcAddress((const GLubyte*)"glRenderbufferStorageMultisampleEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_framebuffer_multisample */
+
+#ifdef GL_EXT_framebuffer_object
+
+static GLboolean _glewInit_GL_EXT_framebuffer_object (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBindFramebufferEXT = (PFNGLBINDFRAMEBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glBindFramebufferEXT")) == NULL) || r;
+  r = ((glBindRenderbufferEXT = (PFNGLBINDRENDERBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glBindRenderbufferEXT")) == NULL) || r;
+  r = ((glCheckFramebufferStatusEXT = (PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC)glewGetProcAddress((const GLubyte*)"glCheckFramebufferStatusEXT")) == NULL) || r;
+  r = ((glDeleteFramebuffersEXT = (PFNGLDELETEFRAMEBUFFERSEXTPROC)glewGetProcAddress((const GLubyte*)"glDeleteFramebuffersEXT")) == NULL) || r;
+  r = ((glDeleteRenderbuffersEXT = (PFNGLDELETERENDERBUFFERSEXTPROC)glewGetProcAddress((const GLubyte*)"glDeleteRenderbuffersEXT")) == NULL) || r;
+  r = ((glFramebufferRenderbufferEXT = (PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferRenderbufferEXT")) == NULL) || r;
+  r = ((glFramebufferTexture1DEXT = (PFNGLFRAMEBUFFERTEXTURE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTexture1DEXT")) == NULL) || r;
+  r = ((glFramebufferTexture2DEXT = (PFNGLFRAMEBUFFERTEXTURE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTexture2DEXT")) == NULL) || r;
+  r = ((glFramebufferTexture3DEXT = (PFNGLFRAMEBUFFERTEXTURE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTexture3DEXT")) == NULL) || r;
+  r = ((glGenFramebuffersEXT = (PFNGLGENFRAMEBUFFERSEXTPROC)glewGetProcAddress((const GLubyte*)"glGenFramebuffersEXT")) == NULL) || r;
+  r = ((glGenRenderbuffersEXT = (PFNGLGENRENDERBUFFERSEXTPROC)glewGetProcAddress((const GLubyte*)"glGenRenderbuffersEXT")) == NULL) || r;
+  r = ((glGenerateMipmapEXT = (PFNGLGENERATEMIPMAPEXTPROC)glewGetProcAddress((const GLubyte*)"glGenerateMipmapEXT")) == NULL) || r;
+  r = ((glGetFramebufferAttachmentParameterivEXT = (PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetFramebufferAttachmentParameterivEXT")) == NULL) || r;
+  r = ((glGetRenderbufferParameterivEXT = (PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetRenderbufferParameterivEXT")) == NULL) || r;
+  r = ((glIsFramebufferEXT = (PFNGLISFRAMEBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glIsFramebufferEXT")) == NULL) || r;
+  r = ((glIsRenderbufferEXT = (PFNGLISRENDERBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glIsRenderbufferEXT")) == NULL) || r;
+  r = ((glRenderbufferStorageEXT = (PFNGLRENDERBUFFERSTORAGEEXTPROC)glewGetProcAddress((const GLubyte*)"glRenderbufferStorageEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_framebuffer_object */
+
+#ifdef GL_EXT_histogram
+
+static GLboolean _glewInit_GL_EXT_histogram (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetHistogramEXT = (PFNGLGETHISTOGRAMEXTPROC)glewGetProcAddress((const GLubyte*)"glGetHistogramEXT")) == NULL) || r;
+  r = ((glGetHistogramParameterfvEXT = (PFNGLGETHISTOGRAMPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetHistogramParameterfvEXT")) == NULL) || r;
+  r = ((glGetHistogramParameterivEXT = (PFNGLGETHISTOGRAMPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetHistogramParameterivEXT")) == NULL) || r;
+  r = ((glGetMinmaxEXT = (PFNGLGETMINMAXEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMinmaxEXT")) == NULL) || r;
+  r = ((glGetMinmaxParameterfvEXT = (PFNGLGETMINMAXPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMinmaxParameterfvEXT")) == NULL) || r;
+  r = ((glGetMinmaxParameterivEXT = (PFNGLGETMINMAXPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMinmaxParameterivEXT")) == NULL) || r;
+  r = ((glHistogramEXT = (PFNGLHISTOGRAMEXTPROC)glewGetProcAddress((const GLubyte*)"glHistogramEXT")) == NULL) || r;
+  r = ((glMinmaxEXT = (PFNGLMINMAXEXTPROC)glewGetProcAddress((const GLubyte*)"glMinmaxEXT")) == NULL) || r;
+  r = ((glResetHistogramEXT = (PFNGLRESETHISTOGRAMEXTPROC)glewGetProcAddress((const GLubyte*)"glResetHistogramEXT")) == NULL) || r;
+  r = ((glResetMinmaxEXT = (PFNGLRESETMINMAXEXTPROC)glewGetProcAddress((const GLubyte*)"glResetMinmaxEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_histogram */
+
+#ifdef GL_EXT_index_array_formats
+
+#endif /* GL_EXT_index_array_formats */
+
+#ifdef GL_EXT_index_func
+
+static GLboolean _glewInit_GL_EXT_index_func (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glIndexFuncEXT = (PFNGLINDEXFUNCEXTPROC)glewGetProcAddress((const GLubyte*)"glIndexFuncEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_index_func */
+
+#ifdef GL_EXT_index_material
+
+static GLboolean _glewInit_GL_EXT_index_material (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glIndexMaterialEXT = (PFNGLINDEXMATERIALEXTPROC)glewGetProcAddress((const GLubyte*)"glIndexMaterialEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_index_material */
+
+#ifdef GL_EXT_index_texture
+
+#endif /* GL_EXT_index_texture */
+
+#ifdef GL_EXT_light_texture
+
+static GLboolean _glewInit_GL_EXT_light_texture (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glApplyTextureEXT = (PFNGLAPPLYTEXTUREEXTPROC)glewGetProcAddress((const GLubyte*)"glApplyTextureEXT")) == NULL) || r;
+  r = ((glTextureLightEXT = (PFNGLTEXTURELIGHTEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureLightEXT")) == NULL) || r;
+  r = ((glTextureMaterialEXT = (PFNGLTEXTUREMATERIALEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureMaterialEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_light_texture */
+
+#ifdef GL_EXT_misc_attribute
+
+#endif /* GL_EXT_misc_attribute */
+
+#ifdef GL_EXT_multi_draw_arrays
+
+static GLboolean _glewInit_GL_EXT_multi_draw_arrays (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glMultiDrawArraysEXT = (PFNGLMULTIDRAWARRAYSEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawArraysEXT")) == NULL) || r;
+  r = ((glMultiDrawElementsEXT = (PFNGLMULTIDRAWELEMENTSEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawElementsEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_multi_draw_arrays */
+
+#ifdef GL_EXT_multisample
+
+static GLboolean _glewInit_GL_EXT_multisample (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glSampleMaskEXT = (PFNGLSAMPLEMASKEXTPROC)glewGetProcAddress((const GLubyte*)"glSampleMaskEXT")) == NULL) || r;
+  r = ((glSamplePatternEXT = (PFNGLSAMPLEPATTERNEXTPROC)glewGetProcAddress((const GLubyte*)"glSamplePatternEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_multisample */
+
+#ifdef GL_EXT_packed_depth_stencil
+
+#endif /* GL_EXT_packed_depth_stencil */
+
+#ifdef GL_EXT_packed_pixels
+
+#endif /* GL_EXT_packed_pixels */
+
+#ifdef GL_EXT_paletted_texture
+
+static GLboolean _glewInit_GL_EXT_paletted_texture (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glColorTableEXT = (PFNGLCOLORTABLEEXTPROC)glewGetProcAddress((const GLubyte*)"glColorTableEXT")) == NULL) || r;
+  r = ((glGetColorTableEXT = (PFNGLGETCOLORTABLEEXTPROC)glewGetProcAddress((const GLubyte*)"glGetColorTableEXT")) == NULL) || r;
+  r = ((glGetColorTableParameterfvEXT = (PFNGLGETCOLORTABLEPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetColorTableParameterfvEXT")) == NULL) || r;
+  r = ((glGetColorTableParameterivEXT = (PFNGLGETCOLORTABLEPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetColorTableParameterivEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_paletted_texture */
+
+#ifdef GL_EXT_pixel_buffer_object
+
+#endif /* GL_EXT_pixel_buffer_object */
+
+#ifdef GL_EXT_pixel_transform
+
+static GLboolean _glewInit_GL_EXT_pixel_transform (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetPixelTransformParameterfvEXT = (PFNGLGETPIXELTRANSFORMPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetPixelTransformParameterfvEXT")) == NULL) || r;
+  r = ((glGetPixelTransformParameterivEXT = (PFNGLGETPIXELTRANSFORMPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetPixelTransformParameterivEXT")) == NULL) || r;
+  r = ((glPixelTransformParameterfEXT = (PFNGLPIXELTRANSFORMPARAMETERFEXTPROC)glewGetProcAddress((const GLubyte*)"glPixelTransformParameterfEXT")) == NULL) || r;
+  r = ((glPixelTransformParameterfvEXT = (PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glPixelTransformParameterfvEXT")) == NULL) || r;
+  r = ((glPixelTransformParameteriEXT = (PFNGLPIXELTRANSFORMPARAMETERIEXTPROC)glewGetProcAddress((const GLubyte*)"glPixelTransformParameteriEXT")) == NULL) || r;
+  r = ((glPixelTransformParameterivEXT = (PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glPixelTransformParameterivEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_pixel_transform */
+
+#ifdef GL_EXT_pixel_transform_color_table
+
+#endif /* GL_EXT_pixel_transform_color_table */
+
+#ifdef GL_EXT_point_parameters
+
+static GLboolean _glewInit_GL_EXT_point_parameters (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glPointParameterfEXT = (PFNGLPOINTPARAMETERFEXTPROC)glewGetProcAddress((const GLubyte*)"glPointParameterfEXT")) == NULL) || r;
+  r = ((glPointParameterfvEXT = (PFNGLPOINTPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glPointParameterfvEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_point_parameters */
+
+#ifdef GL_EXT_polygon_offset
+
+static GLboolean _glewInit_GL_EXT_polygon_offset (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glPolygonOffsetEXT = (PFNGLPOLYGONOFFSETEXTPROC)glewGetProcAddress((const GLubyte*)"glPolygonOffsetEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_polygon_offset */
+
+#ifdef GL_EXT_rescale_normal
+
+#endif /* GL_EXT_rescale_normal */
+
+#ifdef GL_EXT_scene_marker
+
+static GLboolean _glewInit_GL_EXT_scene_marker (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBeginSceneEXT = (PFNGLBEGINSCENEEXTPROC)glewGetProcAddress((const GLubyte*)"glBeginSceneEXT")) == NULL) || r;
+  r = ((glEndSceneEXT = (PFNGLENDSCENEEXTPROC)glewGetProcAddress((const GLubyte*)"glEndSceneEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_scene_marker */
+
+#ifdef GL_EXT_secondary_color
+
+static GLboolean _glewInit_GL_EXT_secondary_color (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glSecondaryColor3bEXT = (PFNGLSECONDARYCOLOR3BEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3bEXT")) == NULL) || r;
+  r = ((glSecondaryColor3bvEXT = (PFNGLSECONDARYCOLOR3BVEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3bvEXT")) == NULL) || r;
+  r = ((glSecondaryColor3dEXT = (PFNGLSECONDARYCOLOR3DEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3dEXT")) == NULL) || r;
+  r = ((glSecondaryColor3dvEXT = (PFNGLSECONDARYCOLOR3DVEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3dvEXT")) == NULL) || r;
+  r = ((glSecondaryColor3fEXT = (PFNGLSECONDARYCOLOR3FEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3fEXT")) == NULL) || r;
+  r = ((glSecondaryColor3fvEXT = (PFNGLSECONDARYCOLOR3FVEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3fvEXT")) == NULL) || r;
+  r = ((glSecondaryColor3iEXT = (PFNGLSECONDARYCOLOR3IEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3iEXT")) == NULL) || r;
+  r = ((glSecondaryColor3ivEXT = (PFNGLSECONDARYCOLOR3IVEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3ivEXT")) == NULL) || r;
+  r = ((glSecondaryColor3sEXT = (PFNGLSECONDARYCOLOR3SEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3sEXT")) == NULL) || r;
+  r = ((glSecondaryColor3svEXT = (PFNGLSECONDARYCOLOR3SVEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3svEXT")) == NULL) || r;
+  r = ((glSecondaryColor3ubEXT = (PFNGLSECONDARYCOLOR3UBEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3ubEXT")) == NULL) || r;
+  r = ((glSecondaryColor3ubvEXT = (PFNGLSECONDARYCOLOR3UBVEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3ubvEXT")) == NULL) || r;
+  r = ((glSecondaryColor3uiEXT = (PFNGLSECONDARYCOLOR3UIEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3uiEXT")) == NULL) || r;
+  r = ((glSecondaryColor3uivEXT = (PFNGLSECONDARYCOLOR3UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3uivEXT")) == NULL) || r;
+  r = ((glSecondaryColor3usEXT = (PFNGLSECONDARYCOLOR3USEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3usEXT")) == NULL) || r;
+  r = ((glSecondaryColor3usvEXT = (PFNGLSECONDARYCOLOR3USVEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3usvEXT")) == NULL) || r;
+  r = ((glSecondaryColorPointerEXT = (PFNGLSECONDARYCOLORPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColorPointerEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_secondary_color */
+
+#ifdef GL_EXT_separate_specular_color
+
+#endif /* GL_EXT_separate_specular_color */
+
+#ifdef GL_EXT_shadow_funcs
+
+#endif /* GL_EXT_shadow_funcs */
+
+#ifdef GL_EXT_shared_texture_palette
+
+#endif /* GL_EXT_shared_texture_palette */
+
+#ifdef GL_EXT_stencil_clear_tag
+
+#endif /* GL_EXT_stencil_clear_tag */
+
+#ifdef GL_EXT_stencil_two_side
+
+static GLboolean _glewInit_GL_EXT_stencil_two_side (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glActiveStencilFaceEXT = (PFNGLACTIVESTENCILFACEEXTPROC)glewGetProcAddress((const GLubyte*)"glActiveStencilFaceEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_stencil_two_side */
+
+#ifdef GL_EXT_stencil_wrap
+
+#endif /* GL_EXT_stencil_wrap */
+
+#ifdef GL_EXT_subtexture
+
+static GLboolean _glewInit_GL_EXT_subtexture (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glTexSubImage1DEXT = (PFNGLTEXSUBIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glTexSubImage1DEXT")) == NULL) || r;
+  r = ((glTexSubImage2DEXT = (PFNGLTEXSUBIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glTexSubImage2DEXT")) == NULL) || r;
+  r = ((glTexSubImage3DEXT = (PFNGLTEXSUBIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glTexSubImage3DEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_subtexture */
+
+#ifdef GL_EXT_texture
+
+#endif /* GL_EXT_texture */
+
+#ifdef GL_EXT_texture3D
+
+static GLboolean _glewInit_GL_EXT_texture3D (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glTexImage3DEXT = (PFNGLTEXIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glTexImage3DEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_texture3D */
+
+#ifdef GL_EXT_texture_compression_dxt1
+
+#endif /* GL_EXT_texture_compression_dxt1 */
+
+#ifdef GL_EXT_texture_compression_s3tc
+
+#endif /* GL_EXT_texture_compression_s3tc */
+
+#ifdef GL_EXT_texture_cube_map
+
+#endif /* GL_EXT_texture_cube_map */
+
+#ifdef GL_EXT_texture_edge_clamp
+
+#endif /* GL_EXT_texture_edge_clamp */
+
+#ifdef GL_EXT_texture_env
+
+#endif /* GL_EXT_texture_env */
+
+#ifdef GL_EXT_texture_env_add
+
+#endif /* GL_EXT_texture_env_add */
+
+#ifdef GL_EXT_texture_env_combine
+
+#endif /* GL_EXT_texture_env_combine */
+
+#ifdef GL_EXT_texture_env_dot3
+
+#endif /* GL_EXT_texture_env_dot3 */
+
+#ifdef GL_EXT_texture_filter_anisotropic
+
+#endif /* GL_EXT_texture_filter_anisotropic */
+
+#ifdef GL_EXT_texture_lod_bias
+
+#endif /* GL_EXT_texture_lod_bias */
+
+#ifdef GL_EXT_texture_mirror_clamp
+
+#endif /* GL_EXT_texture_mirror_clamp */
+
+#ifdef GL_EXT_texture_object
+
+static GLboolean _glewInit_GL_EXT_texture_object (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glAreTexturesResidentEXT = (PFNGLARETEXTURESRESIDENTEXTPROC)glewGetProcAddress((const GLubyte*)"glAreTexturesResidentEXT")) == NULL) || r;
+  r = ((glBindTextureEXT = (PFNGLBINDTEXTUREEXTPROC)glewGetProcAddress((const GLubyte*)"glBindTextureEXT")) == NULL) || r;
+  r = ((glDeleteTexturesEXT = (PFNGLDELETETEXTURESEXTPROC)glewGetProcAddress((const GLubyte*)"glDeleteTexturesEXT")) == NULL) || r;
+  r = ((glGenTexturesEXT = (PFNGLGENTEXTURESEXTPROC)glewGetProcAddress((const GLubyte*)"glGenTexturesEXT")) == NULL) || r;
+  r = ((glIsTextureEXT = (PFNGLISTEXTUREEXTPROC)glewGetProcAddress((const GLubyte*)"glIsTextureEXT")) == NULL) || r;
+  r = ((glPrioritizeTexturesEXT = (PFNGLPRIORITIZETEXTURESEXTPROC)glewGetProcAddress((const GLubyte*)"glPrioritizeTexturesEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_texture_object */
+
+#ifdef GL_EXT_texture_perturb_normal
+
+static GLboolean _glewInit_GL_EXT_texture_perturb_normal (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glTextureNormalEXT = (PFNGLTEXTURENORMALEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureNormalEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_texture_perturb_normal */
+
+#ifdef GL_EXT_texture_rectangle
+
+#endif /* GL_EXT_texture_rectangle */
+
+#ifdef GL_EXT_texture_sRGB
+
+#endif /* GL_EXT_texture_sRGB */
+
+#ifdef GL_EXT_vertex_array
+
+static GLboolean _glewInit_GL_EXT_vertex_array (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glArrayElementEXT = (PFNGLARRAYELEMENTEXTPROC)glewGetProcAddress((const GLubyte*)"glArrayElementEXT")) == NULL) || r;
+  r = ((glColorPointerEXT = (PFNGLCOLORPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glColorPointerEXT")) == NULL) || r;
+  r = ((glDrawArraysEXT = (PFNGLDRAWARRAYSEXTPROC)glewGetProcAddress((const GLubyte*)"glDrawArraysEXT")) == NULL) || r;
+  r = ((glEdgeFlagPointerEXT = (PFNGLEDGEFLAGPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glEdgeFlagPointerEXT")) == NULL) || r;
+  r = ((glGetPointervEXT = (PFNGLGETPOINTERVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetPointervEXT")) == NULL) || r;
+  r = ((glIndexPointerEXT = (PFNGLINDEXPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glIndexPointerEXT")) == NULL) || r;
+  r = ((glNormalPointerEXT = (PFNGLNORMALPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glNormalPointerEXT")) == NULL) || r;
+  r = ((glTexCoordPointerEXT = (PFNGLTEXCOORDPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glTexCoordPointerEXT")) == NULL) || r;
+  r = ((glVertexPointerEXT = (PFNGLVERTEXPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glVertexPointerEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_vertex_array */
+
+#ifdef GL_EXT_vertex_shader
+
+static GLboolean _glewInit_GL_EXT_vertex_shader (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBeginVertexShaderEXT = (PFNGLBEGINVERTEXSHADEREXTPROC)glewGetProcAddress((const GLubyte*)"glBeginVertexShaderEXT")) == NULL) || r;
+  r = ((glBindLightParameterEXT = (PFNGLBINDLIGHTPARAMETEREXTPROC)glewGetProcAddress((const GLubyte*)"glBindLightParameterEXT")) == NULL) || r;
+  r = ((glBindMaterialParameterEXT = (PFNGLBINDMATERIALPARAMETEREXTPROC)glewGetProcAddress((const GLubyte*)"glBindMaterialParameterEXT")) == NULL) || r;
+  r = ((glBindParameterEXT = (PFNGLBINDPARAMETEREXTPROC)glewGetProcAddress((const GLubyte*)"glBindParameterEXT")) == NULL) || r;
+  r = ((glBindTexGenParameterEXT = (PFNGLBINDTEXGENPARAMETEREXTPROC)glewGetProcAddress((const GLubyte*)"glBindTexGenParameterEXT")) == NULL) || r;
+  r = ((glBindTextureUnitParameterEXT = (PFNGLBINDTEXTUREUNITPARAMETEREXTPROC)glewGetProcAddress((const GLubyte*)"glBindTextureUnitParameterEXT")) == NULL) || r;
+  r = ((glBindVertexShaderEXT = (PFNGLBINDVERTEXSHADEREXTPROC)glewGetProcAddress((const GLubyte*)"glBindVertexShaderEXT")) == NULL) || r;
+  r = ((glDeleteVertexShaderEXT = (PFNGLDELETEVERTEXSHADEREXTPROC)glewGetProcAddress((const GLubyte*)"glDeleteVertexShaderEXT")) == NULL) || r;
+  r = ((glDisableVariantClientStateEXT = (PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC)glewGetProcAddress((const GLubyte*)"glDisableVariantClientStateEXT")) == NULL) || r;
+  r = ((glEnableVariantClientStateEXT = (PFNGLENABLEVARIANTCLIENTSTATEEXTPROC)glewGetProcAddress((const GLubyte*)"glEnableVariantClientStateEXT")) == NULL) || r;
+  r = ((glEndVertexShaderEXT = (PFNGLENDVERTEXSHADEREXTPROC)glewGetProcAddress((const GLubyte*)"glEndVertexShaderEXT")) == NULL) || r;
+  r = ((glExtractComponentEXT = (PFNGLEXTRACTCOMPONENTEXTPROC)glewGetProcAddress((const GLubyte*)"glExtractComponentEXT")) == NULL) || r;
+  r = ((glGenSymbolsEXT = (PFNGLGENSYMBOLSEXTPROC)glewGetProcAddress((const GLubyte*)"glGenSymbolsEXT")) == NULL) || r;
+  r = ((glGenVertexShadersEXT = (PFNGLGENVERTEXSHADERSEXTPROC)glewGetProcAddress((const GLubyte*)"glGenVertexShadersEXT")) == NULL) || r;
+  r = ((glGetInvariantBooleanvEXT = (PFNGLGETINVARIANTBOOLEANVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetInvariantBooleanvEXT")) == NULL) || r;
+  r = ((glGetInvariantFloatvEXT = (PFNGLGETINVARIANTFLOATVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetInvariantFloatvEXT")) == NULL) || r;
+  r = ((glGetInvariantIntegervEXT = (PFNGLGETINVARIANTINTEGERVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetInvariantIntegervEXT")) == NULL) || r;
+  r = ((glGetLocalConstantBooleanvEXT = (PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetLocalConstantBooleanvEXT")) == NULL) || r;
+  r = ((glGetLocalConstantFloatvEXT = (PFNGLGETLOCALCONSTANTFLOATVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetLocalConstantFloatvEXT")) == NULL) || r;
+  r = ((glGetLocalConstantIntegervEXT = (PFNGLGETLOCALCONSTANTINTEGERVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetLocalConstantIntegervEXT")) == NULL) || r;
+  r = ((glGetVariantBooleanvEXT = (PFNGLGETVARIANTBOOLEANVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetVariantBooleanvEXT")) == NULL) || r;
+  r = ((glGetVariantFloatvEXT = (PFNGLGETVARIANTFLOATVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetVariantFloatvEXT")) == NULL) || r;
+  r = ((glGetVariantIntegervEXT = (PFNGLGETVARIANTINTEGERVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetVariantIntegervEXT")) == NULL) || r;
+  r = ((glGetVariantPointervEXT = (PFNGLGETVARIANTPOINTERVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetVariantPointervEXT")) == NULL) || r;
+  r = ((glInsertComponentEXT = (PFNGLINSERTCOMPONENTEXTPROC)glewGetProcAddress((const GLubyte*)"glInsertComponentEXT")) == NULL) || r;
+  r = ((glIsVariantEnabledEXT = (PFNGLISVARIANTENABLEDEXTPROC)glewGetProcAddress((const GLubyte*)"glIsVariantEnabledEXT")) == NULL) || r;
+  r = ((glSetInvariantEXT = (PFNGLSETINVARIANTEXTPROC)glewGetProcAddress((const GLubyte*)"glSetInvariantEXT")) == NULL) || r;
+  r = ((glSetLocalConstantEXT = (PFNGLSETLOCALCONSTANTEXTPROC)glewGetProcAddress((const GLubyte*)"glSetLocalConstantEXT")) == NULL) || r;
+  r = ((glShaderOp1EXT = (PFNGLSHADEROP1EXTPROC)glewGetProcAddress((const GLubyte*)"glShaderOp1EXT")) == NULL) || r;
+  r = ((glShaderOp2EXT = (PFNGLSHADEROP2EXTPROC)glewGetProcAddress((const GLubyte*)"glShaderOp2EXT")) == NULL) || r;
+  r = ((glShaderOp3EXT = (PFNGLSHADEROP3EXTPROC)glewGetProcAddress((const GLubyte*)"glShaderOp3EXT")) == NULL) || r;
+  r = ((glSwizzleEXT = (PFNGLSWIZZLEEXTPROC)glewGetProcAddress((const GLubyte*)"glSwizzleEXT")) == NULL) || r;
+  r = ((glVariantPointerEXT = (PFNGLVARIANTPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glVariantPointerEXT")) == NULL) || r;
+  r = ((glVariantbvEXT = (PFNGLVARIANTBVEXTPROC)glewGetProcAddress((const GLubyte*)"glVariantbvEXT")) == NULL) || r;
+  r = ((glVariantdvEXT = (PFNGLVARIANTDVEXTPROC)glewGetProcAddress((const GLubyte*)"glVariantdvEXT")) == NULL) || r;
+  r = ((glVariantfvEXT = (PFNGLVARIANTFVEXTPROC)glewGetProcAddress((const GLubyte*)"glVariantfvEXT")) == NULL) || r;
+  r = ((glVariantivEXT = (PFNGLVARIANTIVEXTPROC)glewGetProcAddress((const GLubyte*)"glVariantivEXT")) == NULL) || r;
+  r = ((glVariantsvEXT = (PFNGLVARIANTSVEXTPROC)glewGetProcAddress((const GLubyte*)"glVariantsvEXT")) == NULL) || r;
+  r = ((glVariantubvEXT = (PFNGLVARIANTUBVEXTPROC)glewGetProcAddress((const GLubyte*)"glVariantubvEXT")) == NULL) || r;
+  r = ((glVariantuivEXT = (PFNGLVARIANTUIVEXTPROC)glewGetProcAddress((const GLubyte*)"glVariantuivEXT")) == NULL) || r;
+  r = ((glVariantusvEXT = (PFNGLVARIANTUSVEXTPROC)glewGetProcAddress((const GLubyte*)"glVariantusvEXT")) == NULL) || r;
+  r = ((glWriteMaskEXT = (PFNGLWRITEMASKEXTPROC)glewGetProcAddress((const GLubyte*)"glWriteMaskEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_vertex_shader */
+
+#ifdef GL_EXT_vertex_weighting
+
+static GLboolean _glewInit_GL_EXT_vertex_weighting (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glVertexWeightPointerEXT = (PFNGLVERTEXWEIGHTPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glVertexWeightPointerEXT")) == NULL) || r;
+  r = ((glVertexWeightfEXT = (PFNGLVERTEXWEIGHTFEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexWeightfEXT")) == NULL) || r;
+  r = ((glVertexWeightfvEXT = (PFNGLVERTEXWEIGHTFVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexWeightfvEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_EXT_vertex_weighting */
+
+#ifdef GL_GREMEDY_string_marker
+
+static GLboolean _glewInit_GL_GREMEDY_string_marker (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glStringMarkerGREMEDY = (PFNGLSTRINGMARKERGREMEDYPROC)glewGetProcAddress((const GLubyte*)"glStringMarkerGREMEDY")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_GREMEDY_string_marker */
+
+#ifdef GL_HP_convolution_border_modes
+
+#endif /* GL_HP_convolution_border_modes */
+
+#ifdef GL_HP_image_transform
+
+static GLboolean _glewInit_GL_HP_image_transform (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetImageTransformParameterfvHP = (PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC)glewGetProcAddress((const GLubyte*)"glGetImageTransformParameterfvHP")) == NULL) || r;
+  r = ((glGetImageTransformParameterivHP = (PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC)glewGetProcAddress((const GLubyte*)"glGetImageTransformParameterivHP")) == NULL) || r;
+  r = ((glImageTransformParameterfHP = (PFNGLIMAGETRANSFORMPARAMETERFHPPROC)glewGetProcAddress((const GLubyte*)"glImageTransformParameterfHP")) == NULL) || r;
+  r = ((glImageTransformParameterfvHP = (PFNGLIMAGETRANSFORMPARAMETERFVHPPROC)glewGetProcAddress((const GLubyte*)"glImageTransformParameterfvHP")) == NULL) || r;
+  r = ((glImageTransformParameteriHP = (PFNGLIMAGETRANSFORMPARAMETERIHPPROC)glewGetProcAddress((const GLubyte*)"glImageTransformParameteriHP")) == NULL) || r;
+  r = ((glImageTransformParameterivHP = (PFNGLIMAGETRANSFORMPARAMETERIVHPPROC)glewGetProcAddress((const GLubyte*)"glImageTransformParameterivHP")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_HP_image_transform */
+
+#ifdef GL_HP_occlusion_test
+
+#endif /* GL_HP_occlusion_test */
+
+#ifdef GL_HP_texture_lighting
+
+#endif /* GL_HP_texture_lighting */
+
+#ifdef GL_IBM_cull_vertex
+
+#endif /* GL_IBM_cull_vertex */
+
+#ifdef GL_IBM_multimode_draw_arrays
+
+static GLboolean _glewInit_GL_IBM_multimode_draw_arrays (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glMultiModeDrawArraysIBM = (PFNGLMULTIMODEDRAWARRAYSIBMPROC)glewGetProcAddress((const GLubyte*)"glMultiModeDrawArraysIBM")) == NULL) || r;
+  r = ((glMultiModeDrawElementsIBM = (PFNGLMULTIMODEDRAWELEMENTSIBMPROC)glewGetProcAddress((const GLubyte*)"glMultiModeDrawElementsIBM")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_IBM_multimode_draw_arrays */
+
+#ifdef GL_IBM_rasterpos_clip
+
+#endif /* GL_IBM_rasterpos_clip */
+
+#ifdef GL_IBM_static_data
+
+#endif /* GL_IBM_static_data */
+
+#ifdef GL_IBM_texture_mirrored_repeat
+
+#endif /* GL_IBM_texture_mirrored_repeat */
+
+#ifdef GL_IBM_vertex_array_lists
+
+static GLboolean _glewInit_GL_IBM_vertex_array_lists (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glColorPointerListIBM = (PFNGLCOLORPOINTERLISTIBMPROC)glewGetProcAddress((const GLubyte*)"glColorPointerListIBM")) == NULL) || r;
+  r = ((glEdgeFlagPointerListIBM = (PFNGLEDGEFLAGPOINTERLISTIBMPROC)glewGetProcAddress((const GLubyte*)"glEdgeFlagPointerListIBM")) == NULL) || r;
+  r = ((glFogCoordPointerListIBM = (PFNGLFOGCOORDPOINTERLISTIBMPROC)glewGetProcAddress((const GLubyte*)"glFogCoordPointerListIBM")) == NULL) || r;
+  r = ((glIndexPointerListIBM = (PFNGLINDEXPOINTERLISTIBMPROC)glewGetProcAddress((const GLubyte*)"glIndexPointerListIBM")) == NULL) || r;
+  r = ((glNormalPointerListIBM = (PFNGLNORMALPOINTERLISTIBMPROC)glewGetProcAddress((const GLubyte*)"glNormalPointerListIBM")) == NULL) || r;
+  r = ((glSecondaryColorPointerListIBM = (PFNGLSECONDARYCOLORPOINTERLISTIBMPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColorPointerListIBM")) == NULL) || r;
+  r = ((glTexCoordPointerListIBM = (PFNGLTEXCOORDPOINTERLISTIBMPROC)glewGetProcAddress((const GLubyte*)"glTexCoordPointerListIBM")) == NULL) || r;
+  r = ((glVertexPointerListIBM = (PFNGLVERTEXPOINTERLISTIBMPROC)glewGetProcAddress((const GLubyte*)"glVertexPointerListIBM")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_IBM_vertex_array_lists */
+
+#ifdef GL_INGR_color_clamp
+
+#endif /* GL_INGR_color_clamp */
+
+#ifdef GL_INGR_interlace_read
+
+#endif /* GL_INGR_interlace_read */
+
+#ifdef GL_INTEL_parallel_arrays
+
+static GLboolean _glewInit_GL_INTEL_parallel_arrays (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glColorPointervINTEL = (PFNGLCOLORPOINTERVINTELPROC)glewGetProcAddress((const GLubyte*)"glColorPointervINTEL")) == NULL) || r;
+  r = ((glNormalPointervINTEL = (PFNGLNORMALPOINTERVINTELPROC)glewGetProcAddress((const GLubyte*)"glNormalPointervINTEL")) == NULL) || r;
+  r = ((glTexCoordPointervINTEL = (PFNGLTEXCOORDPOINTERVINTELPROC)glewGetProcAddress((const GLubyte*)"glTexCoordPointervINTEL")) == NULL) || r;
+  r = ((glVertexPointervINTEL = (PFNGLVERTEXPOINTERVINTELPROC)glewGetProcAddress((const GLubyte*)"glVertexPointervINTEL")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_INTEL_parallel_arrays */
+
+#ifdef GL_INTEL_texture_scissor
+
+static GLboolean _glewInit_GL_INTEL_texture_scissor (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glTexScissorFuncINTEL = (PFNGLTEXSCISSORFUNCINTELPROC)glewGetProcAddress((const GLubyte*)"glTexScissorFuncINTEL")) == NULL) || r;
+  r = ((glTexScissorINTEL = (PFNGLTEXSCISSORINTELPROC)glewGetProcAddress((const GLubyte*)"glTexScissorINTEL")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_INTEL_texture_scissor */
+
+#ifdef GL_KTX_buffer_region
+
+static GLboolean _glewInit_GL_KTX_buffer_region (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBufferRegionEnabledEXT = (PFNGLBUFFERREGIONENABLEDEXTPROC)glewGetProcAddress((const GLubyte*)"glBufferRegionEnabledEXT")) == NULL) || r;
+  r = ((glDeleteBufferRegionEXT = (PFNGLDELETEBUFFERREGIONEXTPROC)glewGetProcAddress((const GLubyte*)"glDeleteBufferRegionEXT")) == NULL) || r;
+  r = ((glDrawBufferRegionEXT = (PFNGLDRAWBUFFERREGIONEXTPROC)glewGetProcAddress((const GLubyte*)"glDrawBufferRegionEXT")) == NULL) || r;
+  r = ((glNewBufferRegionEXT = (PFNGLNEWBUFFERREGIONEXTPROC)glewGetProcAddress((const GLubyte*)"glNewBufferRegionEXT")) == NULL) || r;
+  r = ((glReadBufferRegionEXT = (PFNGLREADBUFFERREGIONEXTPROC)glewGetProcAddress((const GLubyte*)"glReadBufferRegionEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_KTX_buffer_region */
+
+#ifdef GL_MESAX_texture_stack
+
+#endif /* GL_MESAX_texture_stack */
+
+#ifdef GL_MESA_pack_invert
+
+#endif /* GL_MESA_pack_invert */
+
+#ifdef GL_MESA_resize_buffers
+
+static GLboolean _glewInit_GL_MESA_resize_buffers (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glResizeBuffersMESA = (PFNGLRESIZEBUFFERSMESAPROC)glewGetProcAddress((const GLubyte*)"glResizeBuffersMESA")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_MESA_resize_buffers */
+
+#ifdef GL_MESA_window_pos
+
+static GLboolean _glewInit_GL_MESA_window_pos (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glWindowPos2dMESA = (PFNGLWINDOWPOS2DMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2dMESA")) == NULL) || r;
+  r = ((glWindowPos2dvMESA = (PFNGLWINDOWPOS2DVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2dvMESA")) == NULL) || r;
+  r = ((glWindowPos2fMESA = (PFNGLWINDOWPOS2FMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2fMESA")) == NULL) || r;
+  r = ((glWindowPos2fvMESA = (PFNGLWINDOWPOS2FVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2fvMESA")) == NULL) || r;
+  r = ((glWindowPos2iMESA = (PFNGLWINDOWPOS2IMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2iMESA")) == NULL) || r;
+  r = ((glWindowPos2ivMESA = (PFNGLWINDOWPOS2IVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2ivMESA")) == NULL) || r;
+  r = ((glWindowPos2sMESA = (PFNGLWINDOWPOS2SMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2sMESA")) == NULL) || r;
+  r = ((glWindowPos2svMESA = (PFNGLWINDOWPOS2SVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2svMESA")) == NULL) || r;
+  r = ((glWindowPos3dMESA = (PFNGLWINDOWPOS3DMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3dMESA")) == NULL) || r;
+  r = ((glWindowPos3dvMESA = (PFNGLWINDOWPOS3DVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3dvMESA")) == NULL) || r;
+  r = ((glWindowPos3fMESA = (PFNGLWINDOWPOS3FMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3fMESA")) == NULL) || r;
+  r = ((glWindowPos3fvMESA = (PFNGLWINDOWPOS3FVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3fvMESA")) == NULL) || r;
+  r = ((glWindowPos3iMESA = (PFNGLWINDOWPOS3IMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3iMESA")) == NULL) || r;
+  r = ((glWindowPos3ivMESA = (PFNGLWINDOWPOS3IVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3ivMESA")) == NULL) || r;
+  r = ((glWindowPos3sMESA = (PFNGLWINDOWPOS3SMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3sMESA")) == NULL) || r;
+  r = ((glWindowPos3svMESA = (PFNGLWINDOWPOS3SVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3svMESA")) == NULL) || r;
+  r = ((glWindowPos4dMESA = (PFNGLWINDOWPOS4DMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos4dMESA")) == NULL) || r;
+  r = ((glWindowPos4dvMESA = (PFNGLWINDOWPOS4DVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos4dvMESA")) == NULL) || r;
+  r = ((glWindowPos4fMESA = (PFNGLWINDOWPOS4FMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos4fMESA")) == NULL) || r;
+  r = ((glWindowPos4fvMESA = (PFNGLWINDOWPOS4FVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos4fvMESA")) == NULL) || r;
+  r = ((glWindowPos4iMESA = (PFNGLWINDOWPOS4IMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos4iMESA")) == NULL) || r;
+  r = ((glWindowPos4ivMESA = (PFNGLWINDOWPOS4IVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos4ivMESA")) == NULL) || r;
+  r = ((glWindowPos4sMESA = (PFNGLWINDOWPOS4SMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos4sMESA")) == NULL) || r;
+  r = ((glWindowPos4svMESA = (PFNGLWINDOWPOS4SVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos4svMESA")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_MESA_window_pos */
+
+#ifdef GL_MESA_ycbcr_texture
+
+#endif /* GL_MESA_ycbcr_texture */
+
+#ifdef GL_NV_blend_square
+
+#endif /* GL_NV_blend_square */
+
+#ifdef GL_NV_copy_depth_to_color
+
+#endif /* GL_NV_copy_depth_to_color */
+
+#ifdef GL_NV_depth_clamp
+
+#endif /* GL_NV_depth_clamp */
+
+#ifdef GL_NV_evaluators
+
+static GLboolean _glewInit_GL_NV_evaluators (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glEvalMapsNV = (PFNGLEVALMAPSNVPROC)glewGetProcAddress((const GLubyte*)"glEvalMapsNV")) == NULL) || r;
+  r = ((glGetMapAttribParameterfvNV = (PFNGLGETMAPATTRIBPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetMapAttribParameterfvNV")) == NULL) || r;
+  r = ((glGetMapAttribParameterivNV = (PFNGLGETMAPATTRIBPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetMapAttribParameterivNV")) == NULL) || r;
+  r = ((glGetMapControlPointsNV = (PFNGLGETMAPCONTROLPOINTSNVPROC)glewGetProcAddress((const GLubyte*)"glGetMapControlPointsNV")) == NULL) || r;
+  r = ((glGetMapParameterfvNV = (PFNGLGETMAPPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetMapParameterfvNV")) == NULL) || r;
+  r = ((glGetMapParameterivNV = (PFNGLGETMAPPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetMapParameterivNV")) == NULL) || r;
+  r = ((glMapControlPointsNV = (PFNGLMAPCONTROLPOINTSNVPROC)glewGetProcAddress((const GLubyte*)"glMapControlPointsNV")) == NULL) || r;
+  r = ((glMapParameterfvNV = (PFNGLMAPPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glMapParameterfvNV")) == NULL) || r;
+  r = ((glMapParameterivNV = (PFNGLMAPPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glMapParameterivNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_evaluators */
+
+#ifdef GL_NV_fence
+
+static GLboolean _glewInit_GL_NV_fence (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glDeleteFencesNV = (PFNGLDELETEFENCESNVPROC)glewGetProcAddress((const GLubyte*)"glDeleteFencesNV")) == NULL) || r;
+  r = ((glFinishFenceNV = (PFNGLFINISHFENCENVPROC)glewGetProcAddress((const GLubyte*)"glFinishFenceNV")) == NULL) || r;
+  r = ((glGenFencesNV = (PFNGLGENFENCESNVPROC)glewGetProcAddress((const GLubyte*)"glGenFencesNV")) == NULL) || r;
+  r = ((glGetFenceivNV = (PFNGLGETFENCEIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetFenceivNV")) == NULL) || r;
+  r = ((glIsFenceNV = (PFNGLISFENCENVPROC)glewGetProcAddress((const GLubyte*)"glIsFenceNV")) == NULL) || r;
+  r = ((glSetFenceNV = (PFNGLSETFENCENVPROC)glewGetProcAddress((const GLubyte*)"glSetFenceNV")) == NULL) || r;
+  r = ((glTestFenceNV = (PFNGLTESTFENCENVPROC)glewGetProcAddress((const GLubyte*)"glTestFenceNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_fence */
+
+#ifdef GL_NV_float_buffer
+
+#endif /* GL_NV_float_buffer */
+
+#ifdef GL_NV_fog_distance
+
+#endif /* GL_NV_fog_distance */
+
+#ifdef GL_NV_fragment_program
+
+static GLboolean _glewInit_GL_NV_fragment_program (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetProgramNamedParameterdvNV = (PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC)glewGetProcAddress((const GLubyte*)"glGetProgramNamedParameterdvNV")) == NULL) || r;
+  r = ((glGetProgramNamedParameterfvNV = (PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetProgramNamedParameterfvNV")) == NULL) || r;
+  r = ((glProgramNamedParameter4dNV = (PFNGLPROGRAMNAMEDPARAMETER4DNVPROC)glewGetProcAddress((const GLubyte*)"glProgramNamedParameter4dNV")) == NULL) || r;
+  r = ((glProgramNamedParameter4dvNV = (PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramNamedParameter4dvNV")) == NULL) || r;
+  r = ((glProgramNamedParameter4fNV = (PFNGLPROGRAMNAMEDPARAMETER4FNVPROC)glewGetProcAddress((const GLubyte*)"glProgramNamedParameter4fNV")) == NULL) || r;
+  r = ((glProgramNamedParameter4fvNV = (PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramNamedParameter4fvNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_fragment_program */
+
+#ifdef GL_NV_fragment_program2
+
+#endif /* GL_NV_fragment_program2 */
+
+#ifdef GL_NV_fragment_program_option
+
+#endif /* GL_NV_fragment_program_option */
+
+#ifdef GL_NV_half_float
+
+static GLboolean _glewInit_GL_NV_half_float (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glColor3hNV = (PFNGLCOLOR3HNVPROC)glewGetProcAddress((const GLubyte*)"glColor3hNV")) == NULL) || r;
+  r = ((glColor3hvNV = (PFNGLCOLOR3HVNVPROC)glewGetProcAddress((const GLubyte*)"glColor3hvNV")) == NULL) || r;
+  r = ((glColor4hNV = (PFNGLCOLOR4HNVPROC)glewGetProcAddress((const GLubyte*)"glColor4hNV")) == NULL) || r;
+  r = ((glColor4hvNV = (PFNGLCOLOR4HVNVPROC)glewGetProcAddress((const GLubyte*)"glColor4hvNV")) == NULL) || r;
+  r = ((glFogCoordhNV = (PFNGLFOGCOORDHNVPROC)glewGetProcAddress((const GLubyte*)"glFogCoordhNV")) == NULL) || r;
+  r = ((glFogCoordhvNV = (PFNGLFOGCOORDHVNVPROC)glewGetProcAddress((const GLubyte*)"glFogCoordhvNV")) == NULL) || r;
+  r = ((glMultiTexCoord1hNV = (PFNGLMULTITEXCOORD1HNVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1hNV")) == NULL) || r;
+  r = ((glMultiTexCoord1hvNV = (PFNGLMULTITEXCOORD1HVNVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1hvNV")) == NULL) || r;
+  r = ((glMultiTexCoord2hNV = (PFNGLMULTITEXCOORD2HNVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2hNV")) == NULL) || r;
+  r = ((glMultiTexCoord2hvNV = (PFNGLMULTITEXCOORD2HVNVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2hvNV")) == NULL) || r;
+  r = ((glMultiTexCoord3hNV = (PFNGLMULTITEXCOORD3HNVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3hNV")) == NULL) || r;
+  r = ((glMultiTexCoord3hvNV = (PFNGLMULTITEXCOORD3HVNVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3hvNV")) == NULL) || r;
+  r = ((glMultiTexCoord4hNV = (PFNGLMULTITEXCOORD4HNVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4hNV")) == NULL) || r;
+  r = ((glMultiTexCoord4hvNV = (PFNGLMULTITEXCOORD4HVNVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4hvNV")) == NULL) || r;
+  r = ((glNormal3hNV = (PFNGLNORMAL3HNVPROC)glewGetProcAddress((const GLubyte*)"glNormal3hNV")) == NULL) || r;
+  r = ((glNormal3hvNV = (PFNGLNORMAL3HVNVPROC)glewGetProcAddress((const GLubyte*)"glNormal3hvNV")) == NULL) || r;
+  r = ((glSecondaryColor3hNV = (PFNGLSECONDARYCOLOR3HNVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3hNV")) == NULL) || r;
+  r = ((glSecondaryColor3hvNV = (PFNGLSECONDARYCOLOR3HVNVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3hvNV")) == NULL) || r;
+  r = ((glTexCoord1hNV = (PFNGLTEXCOORD1HNVPROC)glewGetProcAddress((const GLubyte*)"glTexCoord1hNV")) == NULL) || r;
+  r = ((glTexCoord1hvNV = (PFNGLTEXCOORD1HVNVPROC)glewGetProcAddress((const GLubyte*)"glTexCoord1hvNV")) == NULL) || r;
+  r = ((glTexCoord2hNV = (PFNGLTEXCOORD2HNVPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2hNV")) == NULL) || r;
+  r = ((glTexCoord2hvNV = (PFNGLTEXCOORD2HVNVPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2hvNV")) == NULL) || r;
+  r = ((glTexCoord3hNV = (PFNGLTEXCOORD3HNVPROC)glewGetProcAddress((const GLubyte*)"glTexCoord3hNV")) == NULL) || r;
+  r = ((glTexCoord3hvNV = (PFNGLTEXCOORD3HVNVPROC)glewGetProcAddress((const GLubyte*)"glTexCoord3hvNV")) == NULL) || r;
+  r = ((glTexCoord4hNV = (PFNGLTEXCOORD4HNVPROC)glewGetProcAddress((const GLubyte*)"glTexCoord4hNV")) == NULL) || r;
+  r = ((glTexCoord4hvNV = (PFNGLTEXCOORD4HVNVPROC)glewGetProcAddress((const GLubyte*)"glTexCoord4hvNV")) == NULL) || r;
+  r = ((glVertex2hNV = (PFNGLVERTEX2HNVPROC)glewGetProcAddress((const GLubyte*)"glVertex2hNV")) == NULL) || r;
+  r = ((glVertex2hvNV = (PFNGLVERTEX2HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertex2hvNV")) == NULL) || r;
+  r = ((glVertex3hNV = (PFNGLVERTEX3HNVPROC)glewGetProcAddress((const GLubyte*)"glVertex3hNV")) == NULL) || r;
+  r = ((glVertex3hvNV = (PFNGLVERTEX3HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertex3hvNV")) == NULL) || r;
+  r = ((glVertex4hNV = (PFNGLVERTEX4HNVPROC)glewGetProcAddress((const GLubyte*)"glVertex4hNV")) == NULL) || r;
+  r = ((glVertex4hvNV = (PFNGLVERTEX4HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertex4hvNV")) == NULL) || r;
+  r = ((glVertexAttrib1hNV = (PFNGLVERTEXATTRIB1HNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1hNV")) == NULL) || r;
+  r = ((glVertexAttrib1hvNV = (PFNGLVERTEXATTRIB1HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1hvNV")) == NULL) || r;
+  r = ((glVertexAttrib2hNV = (PFNGLVERTEXATTRIB2HNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2hNV")) == NULL) || r;
+  r = ((glVertexAttrib2hvNV = (PFNGLVERTEXATTRIB2HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2hvNV")) == NULL) || r;
+  r = ((glVertexAttrib3hNV = (PFNGLVERTEXATTRIB3HNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3hNV")) == NULL) || r;
+  r = ((glVertexAttrib3hvNV = (PFNGLVERTEXATTRIB3HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3hvNV")) == NULL) || r;
+  r = ((glVertexAttrib4hNV = (PFNGLVERTEXATTRIB4HNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4hNV")) == NULL) || r;
+  r = ((glVertexAttrib4hvNV = (PFNGLVERTEXATTRIB4HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4hvNV")) == NULL) || r;
+  r = ((glVertexAttribs1hvNV = (PFNGLVERTEXATTRIBS1HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs1hvNV")) == NULL) || r;
+  r = ((glVertexAttribs2hvNV = (PFNGLVERTEXATTRIBS2HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs2hvNV")) == NULL) || r;
+  r = ((glVertexAttribs3hvNV = (PFNGLVERTEXATTRIBS3HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs3hvNV")) == NULL) || r;
+  r = ((glVertexAttribs4hvNV = (PFNGLVERTEXATTRIBS4HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs4hvNV")) == NULL) || r;
+  r = ((glVertexWeighthNV = (PFNGLVERTEXWEIGHTHNVPROC)glewGetProcAddress((const GLubyte*)"glVertexWeighthNV")) == NULL) || r;
+  r = ((glVertexWeighthvNV = (PFNGLVERTEXWEIGHTHVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexWeighthvNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_half_float */
+
+#ifdef GL_NV_light_max_exponent
+
+#endif /* GL_NV_light_max_exponent */
+
+#ifdef GL_NV_multisample_filter_hint
+
+#endif /* GL_NV_multisample_filter_hint */
+
+#ifdef GL_NV_occlusion_query
+
+static GLboolean _glewInit_GL_NV_occlusion_query (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glBeginOcclusionQueryNV = (PFNGLBEGINOCCLUSIONQUERYNVPROC)glewGetProcAddress((const GLubyte*)"glBeginOcclusionQueryNV")) == NULL) || r;
+  r = ((glDeleteOcclusionQueriesNV = (PFNGLDELETEOCCLUSIONQUERIESNVPROC)glewGetProcAddress((const GLubyte*)"glDeleteOcclusionQueriesNV")) == NULL) || r;
+  r = ((glEndOcclusionQueryNV = (PFNGLENDOCCLUSIONQUERYNVPROC)glewGetProcAddress((const GLubyte*)"glEndOcclusionQueryNV")) == NULL) || r;
+  r = ((glGenOcclusionQueriesNV = (PFNGLGENOCCLUSIONQUERIESNVPROC)glewGetProcAddress((const GLubyte*)"glGenOcclusionQueriesNV")) == NULL) || r;
+  r = ((glGetOcclusionQueryivNV = (PFNGLGETOCCLUSIONQUERYIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetOcclusionQueryivNV")) == NULL) || r;
+  r = ((glGetOcclusionQueryuivNV = (PFNGLGETOCCLUSIONQUERYUIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetOcclusionQueryuivNV")) == NULL) || r;
+  r = ((glIsOcclusionQueryNV = (PFNGLISOCCLUSIONQUERYNVPROC)glewGetProcAddress((const GLubyte*)"glIsOcclusionQueryNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_occlusion_query */
+
+#ifdef GL_NV_packed_depth_stencil
+
+#endif /* GL_NV_packed_depth_stencil */
+
+#ifdef GL_NV_pixel_data_range
+
+static GLboolean _glewInit_GL_NV_pixel_data_range (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glFlushPixelDataRangeNV = (PFNGLFLUSHPIXELDATARANGENVPROC)glewGetProcAddress((const GLubyte*)"glFlushPixelDataRangeNV")) == NULL) || r;
+  r = ((glPixelDataRangeNV = (PFNGLPIXELDATARANGENVPROC)glewGetProcAddress((const GLubyte*)"glPixelDataRangeNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_pixel_data_range */
+
+#ifdef GL_NV_point_sprite
+
+static GLboolean _glewInit_GL_NV_point_sprite (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glPointParameteriNV = (PFNGLPOINTPARAMETERINVPROC)glewGetProcAddress((const GLubyte*)"glPointParameteriNV")) == NULL) || r;
+  r = ((glPointParameterivNV = (PFNGLPOINTPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glPointParameterivNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_point_sprite */
+
+#ifdef GL_NV_primitive_restart
+
+static GLboolean _glewInit_GL_NV_primitive_restart (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glPrimitiveRestartIndexNV = (PFNGLPRIMITIVERESTARTINDEXNVPROC)glewGetProcAddress((const GLubyte*)"glPrimitiveRestartIndexNV")) == NULL) || r;
+  r = ((glPrimitiveRestartNV = (PFNGLPRIMITIVERESTARTNVPROC)glewGetProcAddress((const GLubyte*)"glPrimitiveRestartNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_primitive_restart */
+
+#ifdef GL_NV_register_combiners
+
+static GLboolean _glewInit_GL_NV_register_combiners (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glCombinerInputNV = (PFNGLCOMBINERINPUTNVPROC)glewGetProcAddress((const GLubyte*)"glCombinerInputNV")) == NULL) || r;
+  r = ((glCombinerOutputNV = (PFNGLCOMBINEROUTPUTNVPROC)glewGetProcAddress((const GLubyte*)"glCombinerOutputNV")) == NULL) || r;
+  r = ((glCombinerParameterfNV = (PFNGLCOMBINERPARAMETERFNVPROC)glewGetProcAddress((const GLubyte*)"glCombinerParameterfNV")) == NULL) || r;
+  r = ((glCombinerParameterfvNV = (PFNGLCOMBINERPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glCombinerParameterfvNV")) == NULL) || r;
+  r = ((glCombinerParameteriNV = (PFNGLCOMBINERPARAMETERINVPROC)glewGetProcAddress((const GLubyte*)"glCombinerParameteriNV")) == NULL) || r;
+  r = ((glCombinerParameterivNV = (PFNGLCOMBINERPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glCombinerParameterivNV")) == NULL) || r;
+  r = ((glFinalCombinerInputNV = (PFNGLFINALCOMBINERINPUTNVPROC)glewGetProcAddress((const GLubyte*)"glFinalCombinerInputNV")) == NULL) || r;
+  r = ((glGetCombinerInputParameterfvNV = (PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetCombinerInputParameterfvNV")) == NULL) || r;
+  r = ((glGetCombinerInputParameterivNV = (PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetCombinerInputParameterivNV")) == NULL) || r;
+  r = ((glGetCombinerOutputParameterfvNV = (PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetCombinerOutputParameterfvNV")) == NULL) || r;
+  r = ((glGetCombinerOutputParameterivNV = (PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetCombinerOutputParameterivNV")) == NULL) || r;
+  r = ((glGetFinalCombinerInputParameterfvNV = (PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetFinalCombinerInputParameterfvNV")) == NULL) || r;
+  r = ((glGetFinalCombinerInputParameterivNV = (PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetFinalCombinerInputParameterivNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_register_combiners */
+
+#ifdef GL_NV_register_combiners2
+
+static GLboolean _glewInit_GL_NV_register_combiners2 (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glCombinerStageParameterfvNV = (PFNGLCOMBINERSTAGEPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glCombinerStageParameterfvNV")) == NULL) || r;
+  r = ((glGetCombinerStageParameterfvNV = (PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetCombinerStageParameterfvNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_register_combiners2 */
+
+#ifdef GL_NV_texgen_emboss
+
+#endif /* GL_NV_texgen_emboss */
+
+#ifdef GL_NV_texgen_reflection
+
+#endif /* GL_NV_texgen_reflection */
+
+#ifdef GL_NV_texture_compression_vtc
+
+#endif /* GL_NV_texture_compression_vtc */
+
+#ifdef GL_NV_texture_env_combine4
+
+#endif /* GL_NV_texture_env_combine4 */
+
+#ifdef GL_NV_texture_expand_normal
+
+#endif /* GL_NV_texture_expand_normal */
+
+#ifdef GL_NV_texture_rectangle
+
+#endif /* GL_NV_texture_rectangle */
+
+#ifdef GL_NV_texture_shader
+
+#endif /* GL_NV_texture_shader */
+
+#ifdef GL_NV_texture_shader2
+
+#endif /* GL_NV_texture_shader2 */
+
+#ifdef GL_NV_texture_shader3
+
+#endif /* GL_NV_texture_shader3 */
+
+#ifdef GL_NV_vertex_array_range
+
+static GLboolean _glewInit_GL_NV_vertex_array_range (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glFlushVertexArrayRangeNV = (PFNGLFLUSHVERTEXARRAYRANGENVPROC)glewGetProcAddress((const GLubyte*)"glFlushVertexArrayRangeNV")) == NULL) || r;
+  r = ((glVertexArrayRangeNV = (PFNGLVERTEXARRAYRANGENVPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayRangeNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_vertex_array_range */
+
+#ifdef GL_NV_vertex_array_range2
+
+#endif /* GL_NV_vertex_array_range2 */
+
+#ifdef GL_NV_vertex_program
+
+static GLboolean _glewInit_GL_NV_vertex_program (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glAreProgramsResidentNV = (PFNGLAREPROGRAMSRESIDENTNVPROC)glewGetProcAddress((const GLubyte*)"glAreProgramsResidentNV")) == NULL) || r;
+  r = ((glBindProgramNV = (PFNGLBINDPROGRAMNVPROC)glewGetProcAddress((const GLubyte*)"glBindProgramNV")) == NULL) || r;
+  r = ((glDeleteProgramsNV = (PFNGLDELETEPROGRAMSNVPROC)glewGetProcAddress((const GLubyte*)"glDeleteProgramsNV")) == NULL) || r;
+  r = ((glExecuteProgramNV = (PFNGLEXECUTEPROGRAMNVPROC)glewGetProcAddress((const GLubyte*)"glExecuteProgramNV")) == NULL) || r;
+  r = ((glGenProgramsNV = (PFNGLGENPROGRAMSNVPROC)glewGetProcAddress((const GLubyte*)"glGenProgramsNV")) == NULL) || r;
+  r = ((glGetProgramParameterdvNV = (PFNGLGETPROGRAMPARAMETERDVNVPROC)glewGetProcAddress((const GLubyte*)"glGetProgramParameterdvNV")) == NULL) || r;
+  r = ((glGetProgramParameterfvNV = (PFNGLGETPROGRAMPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetProgramParameterfvNV")) == NULL) || r;
+  r = ((glGetProgramStringNV = (PFNGLGETPROGRAMSTRINGNVPROC)glewGetProcAddress((const GLubyte*)"glGetProgramStringNV")) == NULL) || r;
+  r = ((glGetProgramivNV = (PFNGLGETPROGRAMIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetProgramivNV")) == NULL) || r;
+  r = ((glGetTrackMatrixivNV = (PFNGLGETTRACKMATRIXIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetTrackMatrixivNV")) == NULL) || r;
+  r = ((glGetVertexAttribPointervNV = (PFNGLGETVERTEXATTRIBPOINTERVNVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribPointervNV")) == NULL) || r;
+  r = ((glGetVertexAttribdvNV = (PFNGLGETVERTEXATTRIBDVNVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribdvNV")) == NULL) || r;
+  r = ((glGetVertexAttribfvNV = (PFNGLGETVERTEXATTRIBFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribfvNV")) == NULL) || r;
+  r = ((glGetVertexAttribivNV = (PFNGLGETVERTEXATTRIBIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribivNV")) == NULL) || r;
+  r = ((glIsProgramNV = (PFNGLISPROGRAMNVPROC)glewGetProcAddress((const GLubyte*)"glIsProgramNV")) == NULL) || r;
+  r = ((glLoadProgramNV = (PFNGLLOADPROGRAMNVPROC)glewGetProcAddress((const GLubyte*)"glLoadProgramNV")) == NULL) || r;
+  r = ((glProgramParameter4dNV = (PFNGLPROGRAMPARAMETER4DNVPROC)glewGetProcAddress((const GLubyte*)"glProgramParameter4dNV")) == NULL) || r;
+  r = ((glProgramParameter4dvNV = (PFNGLPROGRAMPARAMETER4DVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramParameter4dvNV")) == NULL) || r;
+  r = ((glProgramParameter4fNV = (PFNGLPROGRAMPARAMETER4FNVPROC)glewGetProcAddress((const GLubyte*)"glProgramParameter4fNV")) == NULL) || r;
+  r = ((glProgramParameter4fvNV = (PFNGLPROGRAMPARAMETER4FVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramParameter4fvNV")) == NULL) || r;
+  r = ((glProgramParameters4dvNV = (PFNGLPROGRAMPARAMETERS4DVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramParameters4dvNV")) == NULL) || r;
+  r = ((glProgramParameters4fvNV = (PFNGLPROGRAMPARAMETERS4FVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramParameters4fvNV")) == NULL) || r;
+  r = ((glRequestResidentProgramsNV = (PFNGLREQUESTRESIDENTPROGRAMSNVPROC)glewGetProcAddress((const GLubyte*)"glRequestResidentProgramsNV")) == NULL) || r;
+  r = ((glTrackMatrixNV = (PFNGLTRACKMATRIXNVPROC)glewGetProcAddress((const GLubyte*)"glTrackMatrixNV")) == NULL) || r;
+  r = ((glVertexAttrib1dNV = (PFNGLVERTEXATTRIB1DNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1dNV")) == NULL) || r;
+  r = ((glVertexAttrib1dvNV = (PFNGLVERTEXATTRIB1DVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1dvNV")) == NULL) || r;
+  r = ((glVertexAttrib1fNV = (PFNGLVERTEXATTRIB1FNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1fNV")) == NULL) || r;
+  r = ((glVertexAttrib1fvNV = (PFNGLVERTEXATTRIB1FVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1fvNV")) == NULL) || r;
+  r = ((glVertexAttrib1sNV = (PFNGLVERTEXATTRIB1SNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1sNV")) == NULL) || r;
+  r = ((glVertexAttrib1svNV = (PFNGLVERTEXATTRIB1SVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1svNV")) == NULL) || r;
+  r = ((glVertexAttrib2dNV = (PFNGLVERTEXATTRIB2DNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2dNV")) == NULL) || r;
+  r = ((glVertexAttrib2dvNV = (PFNGLVERTEXATTRIB2DVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2dvNV")) == NULL) || r;
+  r = ((glVertexAttrib2fNV = (PFNGLVERTEXATTRIB2FNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2fNV")) == NULL) || r;
+  r = ((glVertexAttrib2fvNV = (PFNGLVERTEXATTRIB2FVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2fvNV")) == NULL) || r;
+  r = ((glVertexAttrib2sNV = (PFNGLVERTEXATTRIB2SNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2sNV")) == NULL) || r;
+  r = ((glVertexAttrib2svNV = (PFNGLVERTEXATTRIB2SVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2svNV")) == NULL) || r;
+  r = ((glVertexAttrib3dNV = (PFNGLVERTEXATTRIB3DNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3dNV")) == NULL) || r;
+  r = ((glVertexAttrib3dvNV = (PFNGLVERTEXATTRIB3DVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3dvNV")) == NULL) || r;
+  r = ((glVertexAttrib3fNV = (PFNGLVERTEXATTRIB3FNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3fNV")) == NULL) || r;
+  r = ((glVertexAttrib3fvNV = (PFNGLVERTEXATTRIB3FVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3fvNV")) == NULL) || r;
+  r = ((glVertexAttrib3sNV = (PFNGLVERTEXATTRIB3SNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3sNV")) == NULL) || r;
+  r = ((glVertexAttrib3svNV = (PFNGLVERTEXATTRIB3SVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3svNV")) == NULL) || r;
+  r = ((glVertexAttrib4dNV = (PFNGLVERTEXATTRIB4DNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4dNV")) == NULL) || r;
+  r = ((glVertexAttrib4dvNV = (PFNGLVERTEXATTRIB4DVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4dvNV")) == NULL) || r;
+  r = ((glVertexAttrib4fNV = (PFNGLVERTEXATTRIB4FNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4fNV")) == NULL) || r;
+  r = ((glVertexAttrib4fvNV = (PFNGLVERTEXATTRIB4FVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4fvNV")) == NULL) || r;
+  r = ((glVertexAttrib4sNV = (PFNGLVERTEXATTRIB4SNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4sNV")) == NULL) || r;
+  r = ((glVertexAttrib4svNV = (PFNGLVERTEXATTRIB4SVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4svNV")) == NULL) || r;
+  r = ((glVertexAttrib4ubNV = (PFNGLVERTEXATTRIB4UBNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4ubNV")) == NULL) || r;
+  r = ((glVertexAttrib4ubvNV = (PFNGLVERTEXATTRIB4UBVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4ubvNV")) == NULL) || r;
+  r = ((glVertexAttribPointerNV = (PFNGLVERTEXATTRIBPOINTERNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribPointerNV")) == NULL) || r;
+  r = ((glVertexAttribs1dvNV = (PFNGLVERTEXATTRIBS1DVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs1dvNV")) == NULL) || r;
+  r = ((glVertexAttribs1fvNV = (PFNGLVERTEXATTRIBS1FVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs1fvNV")) == NULL) || r;
+  r = ((glVertexAttribs1svNV = (PFNGLVERTEXATTRIBS1SVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs1svNV")) == NULL) || r;
+  r = ((glVertexAttribs2dvNV = (PFNGLVERTEXATTRIBS2DVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs2dvNV")) == NULL) || r;
+  r = ((glVertexAttribs2fvNV = (PFNGLVERTEXATTRIBS2FVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs2fvNV")) == NULL) || r;
+  r = ((glVertexAttribs2svNV = (PFNGLVERTEXATTRIBS2SVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs2svNV")) == NULL) || r;
+  r = ((glVertexAttribs3dvNV = (PFNGLVERTEXATTRIBS3DVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs3dvNV")) == NULL) || r;
+  r = ((glVertexAttribs3fvNV = (PFNGLVERTEXATTRIBS3FVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs3fvNV")) == NULL) || r;
+  r = ((glVertexAttribs3svNV = (PFNGLVERTEXATTRIBS3SVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs3svNV")) == NULL) || r;
+  r = ((glVertexAttribs4dvNV = (PFNGLVERTEXATTRIBS4DVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs4dvNV")) == NULL) || r;
+  r = ((glVertexAttribs4fvNV = (PFNGLVERTEXATTRIBS4FVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs4fvNV")) == NULL) || r;
+  r = ((glVertexAttribs4svNV = (PFNGLVERTEXATTRIBS4SVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs4svNV")) == NULL) || r;
+  r = ((glVertexAttribs4ubvNV = (PFNGLVERTEXATTRIBS4UBVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs4ubvNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_NV_vertex_program */
+
+#ifdef GL_NV_vertex_program1_1
+
+#endif /* GL_NV_vertex_program1_1 */
+
+#ifdef GL_NV_vertex_program2
+
+#endif /* GL_NV_vertex_program2 */
+
+#ifdef GL_NV_vertex_program2_option
+
+#endif /* GL_NV_vertex_program2_option */
+
+#ifdef GL_NV_vertex_program3
+
+#endif /* GL_NV_vertex_program3 */
+
+#ifdef GL_OML_interlace
+
+#endif /* GL_OML_interlace */
+
+#ifdef GL_OML_resample
+
+#endif /* GL_OML_resample */
+
+#ifdef GL_OML_subsample
+
+#endif /* GL_OML_subsample */
+
+#ifdef GL_PGI_misc_hints
+
+#endif /* GL_PGI_misc_hints */
+
+#ifdef GL_PGI_vertex_hints
+
+#endif /* GL_PGI_vertex_hints */
+
+#ifdef GL_REND_screen_coordinates
+
+#endif /* GL_REND_screen_coordinates */
+
+#ifdef GL_S3_s3tc
+
+#endif /* GL_S3_s3tc */
+
+#ifdef GL_SGIS_color_range
+
+#endif /* GL_SGIS_color_range */
+
+#ifdef GL_SGIS_detail_texture
+
+static GLboolean _glewInit_GL_SGIS_detail_texture (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glDetailTexFuncSGIS = (PFNGLDETAILTEXFUNCSGISPROC)glewGetProcAddress((const GLubyte*)"glDetailTexFuncSGIS")) == NULL) || r;
+  r = ((glGetDetailTexFuncSGIS = (PFNGLGETDETAILTEXFUNCSGISPROC)glewGetProcAddress((const GLubyte*)"glGetDetailTexFuncSGIS")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SGIS_detail_texture */
+
+#ifdef GL_SGIS_fog_function
+
+static GLboolean _glewInit_GL_SGIS_fog_function (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glFogFuncSGIS = (PFNGLFOGFUNCSGISPROC)glewGetProcAddress((const GLubyte*)"glFogFuncSGIS")) == NULL) || r;
+  r = ((glGetFogFuncSGIS = (PFNGLGETFOGFUNCSGISPROC)glewGetProcAddress((const GLubyte*)"glGetFogFuncSGIS")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SGIS_fog_function */
+
+#ifdef GL_SGIS_generate_mipmap
+
+#endif /* GL_SGIS_generate_mipmap */
+
+#ifdef GL_SGIS_multisample
+
+static GLboolean _glewInit_GL_SGIS_multisample (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glSampleMaskSGIS = (PFNGLSAMPLEMASKSGISPROC)glewGetProcAddress((const GLubyte*)"glSampleMaskSGIS")) == NULL) || r;
+  r = ((glSamplePatternSGIS = (PFNGLSAMPLEPATTERNSGISPROC)glewGetProcAddress((const GLubyte*)"glSamplePatternSGIS")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SGIS_multisample */
+
+#ifdef GL_SGIS_pixel_texture
+
+#endif /* GL_SGIS_pixel_texture */
+
+#ifdef GL_SGIS_sharpen_texture
+
+static GLboolean _glewInit_GL_SGIS_sharpen_texture (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetSharpenTexFuncSGIS = (PFNGLGETSHARPENTEXFUNCSGISPROC)glewGetProcAddress((const GLubyte*)"glGetSharpenTexFuncSGIS")) == NULL) || r;
+  r = ((glSharpenTexFuncSGIS = (PFNGLSHARPENTEXFUNCSGISPROC)glewGetProcAddress((const GLubyte*)"glSharpenTexFuncSGIS")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SGIS_sharpen_texture */
+
+#ifdef GL_SGIS_texture4D
+
+static GLboolean _glewInit_GL_SGIS_texture4D (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glTexImage4DSGIS = (PFNGLTEXIMAGE4DSGISPROC)glewGetProcAddress((const GLubyte*)"glTexImage4DSGIS")) == NULL) || r;
+  r = ((glTexSubImage4DSGIS = (PFNGLTEXSUBIMAGE4DSGISPROC)glewGetProcAddress((const GLubyte*)"glTexSubImage4DSGIS")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SGIS_texture4D */
+
+#ifdef GL_SGIS_texture_border_clamp
+
+#endif /* GL_SGIS_texture_border_clamp */
+
+#ifdef GL_SGIS_texture_edge_clamp
+
+#endif /* GL_SGIS_texture_edge_clamp */
+
+#ifdef GL_SGIS_texture_filter4
+
+static GLboolean _glewInit_GL_SGIS_texture_filter4 (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGetTexFilterFuncSGIS = (PFNGLGETTEXFILTERFUNCSGISPROC)glewGetProcAddress((const GLubyte*)"glGetTexFilterFuncSGIS")) == NULL) || r;
+  r = ((glTexFilterFuncSGIS = (PFNGLTEXFILTERFUNCSGISPROC)glewGetProcAddress((const GLubyte*)"glTexFilterFuncSGIS")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SGIS_texture_filter4 */
+
+#ifdef GL_SGIS_texture_lod
+
+#endif /* GL_SGIS_texture_lod */
+
+#ifdef GL_SGIS_texture_select
+
+#endif /* GL_SGIS_texture_select */
+
+#ifdef GL_SGIX_async
+
+static GLboolean _glewInit_GL_SGIX_async (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glAsyncMarkerSGIX = (PFNGLASYNCMARKERSGIXPROC)glewGetProcAddress((const GLubyte*)"glAsyncMarkerSGIX")) == NULL) || r;
+  r = ((glDeleteAsyncMarkersSGIX = (PFNGLDELETEASYNCMARKERSSGIXPROC)glewGetProcAddress((const GLubyte*)"glDeleteAsyncMarkersSGIX")) == NULL) || r;
+  r = ((glFinishAsyncSGIX = (PFNGLFINISHASYNCSGIXPROC)glewGetProcAddress((const GLubyte*)"glFinishAsyncSGIX")) == NULL) || r;
+  r = ((glGenAsyncMarkersSGIX = (PFNGLGENASYNCMARKERSSGIXPROC)glewGetProcAddress((const GLubyte*)"glGenAsyncMarkersSGIX")) == NULL) || r;
+  r = ((glIsAsyncMarkerSGIX = (PFNGLISASYNCMARKERSGIXPROC)glewGetProcAddress((const GLubyte*)"glIsAsyncMarkerSGIX")) == NULL) || r;
+  r = ((glPollAsyncSGIX = (PFNGLPOLLASYNCSGIXPROC)glewGetProcAddress((const GLubyte*)"glPollAsyncSGIX")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SGIX_async */
+
+#ifdef GL_SGIX_async_histogram
+
+#endif /* GL_SGIX_async_histogram */
+
+#ifdef GL_SGIX_async_pixel
+
+#endif /* GL_SGIX_async_pixel */
+
+#ifdef GL_SGIX_blend_alpha_minmax
+
+#endif /* GL_SGIX_blend_alpha_minmax */
+
+#ifdef GL_SGIX_clipmap
+
+#endif /* GL_SGIX_clipmap */
+
+#ifdef GL_SGIX_depth_texture
+
+#endif /* GL_SGIX_depth_texture */
+
+#ifdef GL_SGIX_flush_raster
+
+static GLboolean _glewInit_GL_SGIX_flush_raster (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glFlushRasterSGIX = (PFNGLFLUSHRASTERSGIXPROC)glewGetProcAddress((const GLubyte*)"glFlushRasterSGIX")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SGIX_flush_raster */
+
+#ifdef GL_SGIX_fog_offset
+
+#endif /* GL_SGIX_fog_offset */
+
+#ifdef GL_SGIX_fog_texture
+
+static GLboolean _glewInit_GL_SGIX_fog_texture (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glTextureFogSGIX = (PFNGLTEXTUREFOGSGIXPROC)glewGetProcAddress((const GLubyte*)"glTextureFogSGIX")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SGIX_fog_texture */
+
+#ifdef GL_SGIX_fragment_specular_lighting
+
+static GLboolean _glewInit_GL_SGIX_fragment_specular_lighting (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+#if 0
+  r = ((glFragmentColorMaterialSGIX = (PFNGLFRAGMENTCOLORMATERIALSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentColorMaterialSGIX")) == NULL) || r;
+  r = ((glFragmentLightModelfSGIX = (PFNGLFRAGMENTLIGHTMODELFSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightModelfSGIX")) == NULL) || r;
+  r = ((glFragmentLightModelfvSGIX = (PFNGLFRAGMENTLIGHTMODELFVSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightModelfvSGIX")) == NULL) || r;
+  r = ((glFragmentLightModeliSGIX = (PFNGLFRAGMENTLIGHTMODELISGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightModeliSGIX")) == NULL) || r;
+  r = ((glFragmentLightModelivSGIX = (PFNGLFRAGMENTLIGHTMODELIVSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightModelivSGIX")) == NULL) || r;
+  r = ((glFragmentLightfSGIX = (PFNGLFRAGMENTLIGHTFSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightfSGIX")) == NULL) || r;
+  r = ((glFragmentLightfvSGIX = (PFNGLFRAGMENTLIGHTFVSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightfvSGIX")) == NULL) || r;
+  r = ((glFragmentLightiSGIX = (PFNGLFRAGMENTLIGHTISGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightiSGIX")) == NULL) || r;
+  r = ((glFragmentLightivSGIX = (PFNGLFRAGMENTLIGHTIVSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightivSGIX")) == NULL) || r;
+  r = ((glFragmentMaterialfSGIX = (PFNGLFRAGMENTMATERIALFSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentMaterialfSGIX")) == NULL) || r;
+  r = ((glFragmentMaterialfvSGIX = (PFNGLFRAGMENTMATERIALFVSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentMaterialfvSGIX")) == NULL) || r;
+  r = ((glFragmentMaterialiSGIX = (PFNGLFRAGMENTMATERIALISGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentMaterialiSGIX")) == NULL) || r;
+  r = ((glFragmentMaterialivSGIX = (PFNGLFRAGMENTMATERIALIVSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentMaterialivSGIX")) == NULL) || r;
+  r = ((glGetFragmentLightfvSGIX = (PFNGLGETFRAGMENTLIGHTFVSGIXPROC)glewGetProcAddress((const GLubyte*)"glGetFragmentLightfvSGIX")) == NULL) || r;
+  r = ((glGetFragmentLightivSGIX = (PFNGLGETFRAGMENTLIGHTIVSGIXPROC)glewGetProcAddress((const GLubyte*)"glGetFragmentLightivSGIX")) == NULL) || r;
+  r = ((glGetFragmentMaterialfvSGIX = (PFNGLGETFRAGMENTMATERIALFVSGIXPROC)glewGetProcAddress((const GLubyte*)"glGetFragmentMaterialfvSGIX")) == NULL) || r;
+  r = ((glGetFragmentMaterialivSGIX = (PFNGLGETFRAGMENTMATERIALIVSGIXPROC)glewGetProcAddress((const GLubyte*)"glGetFragmentMaterialivSGIX")) == NULL) || r;
+#endif
+
+  return r;
+}
+
+#endif /* GL_SGIX_fragment_specular_lighting */
+
+#ifdef GL_SGIX_framezoom
+
+static GLboolean _glewInit_GL_SGIX_framezoom (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glFrameZoomSGIX = (PFNGLFRAMEZOOMSGIXPROC)glewGetProcAddress((const GLubyte*)"glFrameZoomSGIX")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SGIX_framezoom */
+
+#ifdef GL_SGIX_interlace
+
+#endif /* GL_SGIX_interlace */
+
+#ifdef GL_SGIX_ir_instrument1
+
+#endif /* GL_SGIX_ir_instrument1 */
+
+#ifdef GL_SGIX_list_priority
+
+#endif /* GL_SGIX_list_priority */
+
+#ifdef GL_SGIX_pixel_texture
+
+static GLboolean _glewInit_GL_SGIX_pixel_texture (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glPixelTexGenSGIX = (PFNGLPIXELTEXGENSGIXPROC)glewGetProcAddress((const GLubyte*)"glPixelTexGenSGIX")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SGIX_pixel_texture */
+
+#ifdef GL_SGIX_pixel_texture_bits
+
+#endif /* GL_SGIX_pixel_texture_bits */
+
+#ifdef GL_SGIX_reference_plane
+
+static GLboolean _glewInit_GL_SGIX_reference_plane (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glReferencePlaneSGIX = (PFNGLREFERENCEPLANESGIXPROC)glewGetProcAddress((const GLubyte*)"glReferencePlaneSGIX")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SGIX_reference_plane */
+
+#ifdef GL_SGIX_resample
+
+#endif /* GL_SGIX_resample */
+
+#ifdef GL_SGIX_shadow
+
+#endif /* GL_SGIX_shadow */
+
+#ifdef GL_SGIX_shadow_ambient
+
+#endif /* GL_SGIX_shadow_ambient */
+
+#ifdef GL_SGIX_sprite
+
+static GLboolean _glewInit_GL_SGIX_sprite (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glSpriteParameterfSGIX = (PFNGLSPRITEPARAMETERFSGIXPROC)glewGetProcAddress((const GLubyte*)"glSpriteParameterfSGIX")) == NULL) || r;
+  r = ((glSpriteParameterfvSGIX = (PFNGLSPRITEPARAMETERFVSGIXPROC)glewGetProcAddress((const GLubyte*)"glSpriteParameterfvSGIX")) == NULL) || r;
+  r = ((glSpriteParameteriSGIX = (PFNGLSPRITEPARAMETERISGIXPROC)glewGetProcAddress((const GLubyte*)"glSpriteParameteriSGIX")) == NULL) || r;
+  r = ((glSpriteParameterivSGIX = (PFNGLSPRITEPARAMETERIVSGIXPROC)glewGetProcAddress((const GLubyte*)"glSpriteParameterivSGIX")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SGIX_sprite */
+
+#ifdef GL_SGIX_tag_sample_buffer
+
+static GLboolean _glewInit_GL_SGIX_tag_sample_buffer (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glTagSampleBufferSGIX = (PFNGLTAGSAMPLEBUFFERSGIXPROC)glewGetProcAddress((const GLubyte*)"glTagSampleBufferSGIX")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SGIX_tag_sample_buffer */
+
+#ifdef GL_SGIX_texture_add_env
+
+#endif /* GL_SGIX_texture_add_env */
+
+#ifdef GL_SGIX_texture_coordinate_clamp
+
+#endif /* GL_SGIX_texture_coordinate_clamp */
+
+#ifdef GL_SGIX_texture_lod_bias
+
+#endif /* GL_SGIX_texture_lod_bias */
+
+#ifdef GL_SGIX_texture_multi_buffer
+
+#endif /* GL_SGIX_texture_multi_buffer */
+
+#ifdef GL_SGIX_texture_range
+
+#endif /* GL_SGIX_texture_range */
+
+#ifdef GL_SGIX_texture_scale_bias
+
+#endif /* GL_SGIX_texture_scale_bias */
+
+#ifdef GL_SGIX_vertex_preclip
+
+#endif /* GL_SGIX_vertex_preclip */
+
+#ifdef GL_SGIX_vertex_preclip_hint
+
+#endif /* GL_SGIX_vertex_preclip_hint */
+
+#ifdef GL_SGIX_ycrcb
+
+#endif /* GL_SGIX_ycrcb */
+
+#ifdef GL_SGI_color_matrix
+
+#endif /* GL_SGI_color_matrix */
+
+#ifdef GL_SGI_color_table
+
+static GLboolean _glewInit_GL_SGI_color_table (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glColorTableParameterfvSGI = (PFNGLCOLORTABLEPARAMETERFVSGIPROC)glewGetProcAddress((const GLubyte*)"glColorTableParameterfvSGI")) == NULL) || r;
+  r = ((glColorTableParameterivSGI = (PFNGLCOLORTABLEPARAMETERIVSGIPROC)glewGetProcAddress((const GLubyte*)"glColorTableParameterivSGI")) == NULL) || r;
+  r = ((glColorTableSGI = (PFNGLCOLORTABLESGIPROC)glewGetProcAddress((const GLubyte*)"glColorTableSGI")) == NULL) || r;
+  r = ((glCopyColorTableSGI = (PFNGLCOPYCOLORTABLESGIPROC)glewGetProcAddress((const GLubyte*)"glCopyColorTableSGI")) == NULL) || r;
+  r = ((glGetColorTableParameterfvSGI = (PFNGLGETCOLORTABLEPARAMETERFVSGIPROC)glewGetProcAddress((const GLubyte*)"glGetColorTableParameterfvSGI")) == NULL) || r;
+  r = ((glGetColorTableParameterivSGI = (PFNGLGETCOLORTABLEPARAMETERIVSGIPROC)glewGetProcAddress((const GLubyte*)"glGetColorTableParameterivSGI")) == NULL) || r;
+  r = ((glGetColorTableSGI = (PFNGLGETCOLORTABLESGIPROC)glewGetProcAddress((const GLubyte*)"glGetColorTableSGI")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SGI_color_table */
+
+#ifdef GL_SGI_texture_color_table
+
+#endif /* GL_SGI_texture_color_table */
+
+#ifdef GL_SUNX_constant_data
+
+static GLboolean _glewInit_GL_SUNX_constant_data (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glFinishTextureSUNX = (PFNGLFINISHTEXTURESUNXPROC)glewGetProcAddress((const GLubyte*)"glFinishTextureSUNX")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SUNX_constant_data */
+
+#ifdef GL_SUN_convolution_border_modes
+
+#endif /* GL_SUN_convolution_border_modes */
+
+#ifdef GL_SUN_global_alpha
+
+static GLboolean _glewInit_GL_SUN_global_alpha (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glGlobalAlphaFactorbSUN = (PFNGLGLOBALALPHAFACTORBSUNPROC)glewGetProcAddress((const GLubyte*)"glGlobalAlphaFactorbSUN")) == NULL) || r;
+  r = ((glGlobalAlphaFactordSUN = (PFNGLGLOBALALPHAFACTORDSUNPROC)glewGetProcAddress((const GLubyte*)"glGlobalAlphaFactordSUN")) == NULL) || r;
+  r = ((glGlobalAlphaFactorfSUN = (PFNGLGLOBALALPHAFACTORFSUNPROC)glewGetProcAddress((const GLubyte*)"glGlobalAlphaFactorfSUN")) == NULL) || r;
+  r = ((glGlobalAlphaFactoriSUN = (PFNGLGLOBALALPHAFACTORISUNPROC)glewGetProcAddress((const GLubyte*)"glGlobalAlphaFactoriSUN")) == NULL) || r;
+  r = ((glGlobalAlphaFactorsSUN = (PFNGLGLOBALALPHAFACTORSSUNPROC)glewGetProcAddress((const GLubyte*)"glGlobalAlphaFactorsSUN")) == NULL) || r;
+  r = ((glGlobalAlphaFactorubSUN = (PFNGLGLOBALALPHAFACTORUBSUNPROC)glewGetProcAddress((const GLubyte*)"glGlobalAlphaFactorubSUN")) == NULL) || r;
+  r = ((glGlobalAlphaFactoruiSUN = (PFNGLGLOBALALPHAFACTORUISUNPROC)glewGetProcAddress((const GLubyte*)"glGlobalAlphaFactoruiSUN")) == NULL) || r;
+  r = ((glGlobalAlphaFactorusSUN = (PFNGLGLOBALALPHAFACTORUSSUNPROC)glewGetProcAddress((const GLubyte*)"glGlobalAlphaFactorusSUN")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SUN_global_alpha */
+
+#ifdef GL_SUN_mesh_array
+
+#endif /* GL_SUN_mesh_array */
+
+#ifdef GL_SUN_read_video_pixels
+
+static GLboolean _glewInit_GL_SUN_read_video_pixels (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glReadVideoPixelsSUN = (PFNGLREADVIDEOPIXELSSUNPROC)glewGetProcAddress((const GLubyte*)"glReadVideoPixelsSUN")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SUN_read_video_pixels */
+
+#ifdef GL_SUN_slice_accum
+
+#endif /* GL_SUN_slice_accum */
+
+#ifdef GL_SUN_triangle_list
+
+static GLboolean _glewInit_GL_SUN_triangle_list (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glReplacementCodePointerSUN = (PFNGLREPLACEMENTCODEPOINTERSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodePointerSUN")) == NULL) || r;
+  r = ((glReplacementCodeubSUN = (PFNGLREPLACEMENTCODEUBSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeubSUN")) == NULL) || r;
+  r = ((glReplacementCodeubvSUN = (PFNGLREPLACEMENTCODEUBVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeubvSUN")) == NULL) || r;
+  r = ((glReplacementCodeuiSUN = (PFNGLREPLACEMENTCODEUISUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiSUN")) == NULL) || r;
+  r = ((glReplacementCodeuivSUN = (PFNGLREPLACEMENTCODEUIVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuivSUN")) == NULL) || r;
+  r = ((glReplacementCodeusSUN = (PFNGLREPLACEMENTCODEUSSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeusSUN")) == NULL) || r;
+  r = ((glReplacementCodeusvSUN = (PFNGLREPLACEMENTCODEUSVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeusvSUN")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SUN_triangle_list */
+
+#ifdef GL_SUN_vertex
+
+static GLboolean _glewInit_GL_SUN_vertex (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glColor3fVertex3fSUN = (PFNGLCOLOR3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glColor3fVertex3fSUN")) == NULL) || r;
+  r = ((glColor3fVertex3fvSUN = (PFNGLCOLOR3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glColor3fVertex3fvSUN")) == NULL) || r;
+  r = ((glColor4fNormal3fVertex3fSUN = (PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glColor4fNormal3fVertex3fSUN")) == NULL) || r;
+  r = ((glColor4fNormal3fVertex3fvSUN = (PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glColor4fNormal3fVertex3fvSUN")) == NULL) || r;
+  r = ((glColor4ubVertex2fSUN = (PFNGLCOLOR4UBVERTEX2FSUNPROC)glewGetProcAddress((const GLubyte*)"glColor4ubVertex2fSUN")) == NULL) || r;
+  r = ((glColor4ubVertex2fvSUN = (PFNGLCOLOR4UBVERTEX2FVSUNPROC)glewGetProcAddress((const GLubyte*)"glColor4ubVertex2fvSUN")) == NULL) || r;
+  r = ((glColor4ubVertex3fSUN = (PFNGLCOLOR4UBVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glColor4ubVertex3fSUN")) == NULL) || r;
+  r = ((glColor4ubVertex3fvSUN = (PFNGLCOLOR4UBVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glColor4ubVertex3fvSUN")) == NULL) || r;
+  r = ((glNormal3fVertex3fSUN = (PFNGLNORMAL3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glNormal3fVertex3fSUN")) == NULL) || r;
+  r = ((glNormal3fVertex3fvSUN = (PFNGLNORMAL3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glNormal3fVertex3fvSUN")) == NULL) || r;
+  r = ((glReplacementCodeuiColor3fVertex3fSUN = (PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiColor3fVertex3fSUN")) == NULL) || r;
+  r = ((glReplacementCodeuiColor3fVertex3fvSUN = (PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiColor3fVertex3fvSUN")) == NULL) || r;
+  r = ((glReplacementCodeuiColor4fNormal3fVertex3fSUN = (PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiColor4fNormal3fVertex3fSUN")) == NULL) || r;
+  r = ((glReplacementCodeuiColor4fNormal3fVertex3fvSUN = (PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiColor4fNormal3fVertex3fvSUN")) == NULL) || r;
+  r = ((glReplacementCodeuiColor4ubVertex3fSUN = (PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiColor4ubVertex3fSUN")) == NULL) || r;
+  r = ((glReplacementCodeuiColor4ubVertex3fvSUN = (PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiColor4ubVertex3fvSUN")) == NULL) || r;
+  r = ((glReplacementCodeuiNormal3fVertex3fSUN = (PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiNormal3fVertex3fSUN")) == NULL) || r;
+  r = ((glReplacementCodeuiNormal3fVertex3fvSUN = (PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiNormal3fVertex3fvSUN")) == NULL) || r;
+  r = ((glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN = (PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN")) == NULL) || r;
+  r = ((glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN = (PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN")) == NULL) || r;
+  r = ((glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN = (PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN")) == NULL) || r;
+  r = ((glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN = (PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN")) == NULL) || r;
+  r = ((glReplacementCodeuiTexCoord2fVertex3fSUN = (PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiTexCoord2fVertex3fSUN")) == NULL) || r;
+  r = ((glReplacementCodeuiTexCoord2fVertex3fvSUN = (PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiTexCoord2fVertex3fvSUN")) == NULL) || r;
+  r = ((glReplacementCodeuiVertex3fSUN = (PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiVertex3fSUN")) == NULL) || r;
+  r = ((glReplacementCodeuiVertex3fvSUN = (PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiVertex3fvSUN")) == NULL) || r;
+  r = ((glTexCoord2fColor3fVertex3fSUN = (PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fColor3fVertex3fSUN")) == NULL) || r;
+  r = ((glTexCoord2fColor3fVertex3fvSUN = (PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fColor3fVertex3fvSUN")) == NULL) || r;
+  r = ((glTexCoord2fColor4fNormal3fVertex3fSUN = (PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fColor4fNormal3fVertex3fSUN")) == NULL) || r;
+  r = ((glTexCoord2fColor4fNormal3fVertex3fvSUN = (PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fColor4fNormal3fVertex3fvSUN")) == NULL) || r;
+  r = ((glTexCoord2fColor4ubVertex3fSUN = (PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fColor4ubVertex3fSUN")) == NULL) || r;
+  r = ((glTexCoord2fColor4ubVertex3fvSUN = (PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fColor4ubVertex3fvSUN")) == NULL) || r;
+  r = ((glTexCoord2fNormal3fVertex3fSUN = (PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fNormal3fVertex3fSUN")) == NULL) || r;
+  r = ((glTexCoord2fNormal3fVertex3fvSUN = (PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fNormal3fVertex3fvSUN")) == NULL) || r;
+  r = ((glTexCoord2fVertex3fSUN = (PFNGLTEXCOORD2FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fVertex3fSUN")) == NULL) || r;
+  r = ((glTexCoord2fVertex3fvSUN = (PFNGLTEXCOORD2FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fVertex3fvSUN")) == NULL) || r;
+  r = ((glTexCoord4fColor4fNormal3fVertex4fSUN = (PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord4fColor4fNormal3fVertex4fSUN")) == NULL) || r;
+  r = ((glTexCoord4fColor4fNormal3fVertex4fvSUN = (PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord4fColor4fNormal3fVertex4fvSUN")) == NULL) || r;
+  r = ((glTexCoord4fVertex4fSUN = (PFNGLTEXCOORD4FVERTEX4FSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord4fVertex4fSUN")) == NULL) || r;
+  r = ((glTexCoord4fVertex4fvSUN = (PFNGLTEXCOORD4FVERTEX4FVSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord4fVertex4fvSUN")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_SUN_vertex */
+
+#ifdef GL_WIN_phong_shading
+
+#endif /* GL_WIN_phong_shading */
+
+#ifdef GL_WIN_specular_fog
+
+#endif /* GL_WIN_specular_fog */
+
+#ifdef GL_WIN_swap_hint
+
+static GLboolean _glewInit_GL_WIN_swap_hint (GLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glAddSwapHintRectWIN = (PFNGLADDSWAPHINTRECTWINPROC)glewGetProcAddress((const GLubyte*)"glAddSwapHintRectWIN")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GL_WIN_swap_hint */
+
+/* ------------------------------------------------------------------------- */
+
+/* 
+ * Search for name in the extensions string. Use of strstr()
+ * is not sufficient because extension names can be prefixes of
+ * other extension names. Could use strtok() but the constant
+ * string returned by glGetString might be in read-only memory.
+ */
+GLboolean glewGetExtension (const char* name)
+{    
+  GLubyte* p;
+  GLubyte* end;
+  GLuint len = _glewStrLen((const GLubyte*)name);
+  p = (GLubyte*)glGetString(GL_EXTENSIONS);
+  if (0 == p) return GL_FALSE;
+  end = p + _glewStrLen(p);
+  while (p < end)
+  {
+    GLuint n = _glewStrCLen(p, ' ');
+    if (len == n && _glewStrSame((const GLubyte*)name, p, n)) return GL_TRUE;
+    p += n+1;
+  }
+  return GL_FALSE;
+}
+
+/* ------------------------------------------------------------------------- */
+
+#ifndef GLEW_MX
+static
+#endif
+GLenum glewContextInit (GLEW_CONTEXT_ARG_DEF_LIST)
+{
+  const GLubyte* s;
+  GLuint dot, major, minor;
+  /* query opengl version */
+  s = glGetString(GL_VERSION);
+  dot = _glewStrCLen(s, '.');
+  major = dot-1;
+  minor = dot+1;
+  if (dot == 0 || s[minor] == '\0')
+    return GLEW_ERROR_NO_GL_VERSION;
+  if (s[major] == '1' && s[minor] == '0')
+  {
+	return GLEW_ERROR_GL_VERSION_10_ONLY;
+  }
+  else
+  {
+	if (s[major] >= '2')
+	{
+	  GLEW_VERSION_1_1 = GL_TRUE;
+	  GLEW_VERSION_1_2 = GL_TRUE;
+      GLEW_VERSION_1_3 = GL_TRUE;
+      GLEW_VERSION_1_4 = GL_TRUE;
+	  GLEW_VERSION_1_5 = GL_TRUE;
+	  GLEW_VERSION_2_0 = GL_TRUE;
+	}
+	else
+	{
+	  if (s[minor] >= '5')
+	  {
+		GLEW_VERSION_1_1 = GL_TRUE;
+		GLEW_VERSION_1_2 = GL_TRUE;
+		GLEW_VERSION_1_3 = GL_TRUE;
+		GLEW_VERSION_1_4 = GL_TRUE;
+		GLEW_VERSION_1_5 = GL_TRUE;
+		GLEW_VERSION_2_0 = GL_FALSE;
+	  }
+	  if (s[minor] == '4')
+	  {
+		GLEW_VERSION_1_1 = GL_TRUE;
+		GLEW_VERSION_1_2 = GL_TRUE;
+		GLEW_VERSION_1_3 = GL_TRUE;
+		GLEW_VERSION_1_4 = GL_TRUE;
+		GLEW_VERSION_1_5 = GL_FALSE;
+		GLEW_VERSION_2_0 = GL_FALSE;
+	  }
+	  if (s[minor] == '3')
+	  {
+		GLEW_VERSION_1_1 = GL_TRUE;
+		GLEW_VERSION_1_2 = GL_TRUE;
+		GLEW_VERSION_1_3 = GL_TRUE;
+		GLEW_VERSION_1_4 = GL_FALSE;
+		GLEW_VERSION_1_5 = GL_FALSE;
+		GLEW_VERSION_2_0 = GL_FALSE;
+	  }
+	  if (s[minor] == '2')
+	  {
+		GLEW_VERSION_1_1 = GL_TRUE;
+		GLEW_VERSION_1_2 = GL_TRUE;
+		GLEW_VERSION_1_3 = GL_FALSE;
+		GLEW_VERSION_1_4 = GL_FALSE;
+		GLEW_VERSION_1_5 = GL_FALSE;
+		GLEW_VERSION_2_0 = GL_FALSE;
+	  }
+	  if (s[minor] < '2')
+	  {
+		GLEW_VERSION_1_1 = GL_TRUE;
+		GLEW_VERSION_1_2 = GL_FALSE;
+		GLEW_VERSION_1_3 = GL_FALSE;
+		GLEW_VERSION_1_4 = GL_FALSE;
+		GLEW_VERSION_1_5 = GL_FALSE;
+		GLEW_VERSION_2_0 = GL_FALSE;
+	  }
+	}
+  }
+  /* initialize extensions */
+#ifdef GL_VERSION_1_2
+  if (glewExperimental || GLEW_VERSION_1_2) GLEW_VERSION_1_2 = !_glewInit_GL_VERSION_1_2(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_VERSION_1_2 */
+#ifdef GL_VERSION_1_3
+  if (glewExperimental || GLEW_VERSION_1_3) GLEW_VERSION_1_3 = !_glewInit_GL_VERSION_1_3(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_VERSION_1_3 */
+#ifdef GL_VERSION_1_4
+  if (glewExperimental || GLEW_VERSION_1_4) GLEW_VERSION_1_4 = !_glewInit_GL_VERSION_1_4(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_VERSION_1_4 */
+#ifdef GL_VERSION_1_5
+  if (glewExperimental || GLEW_VERSION_1_5) GLEW_VERSION_1_5 = !_glewInit_GL_VERSION_1_5(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_VERSION_1_5 */
+#ifdef GL_VERSION_2_0
+  if (glewExperimental || GLEW_VERSION_2_0) GLEW_VERSION_2_0 = !_glewInit_GL_VERSION_2_0(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_VERSION_2_0 */
+#ifdef GL_3DFX_multisample
+  GLEW_3DFX_multisample = glewGetExtension("GL_3DFX_multisample");
+#endif /* GL_3DFX_multisample */
+#ifdef GL_3DFX_tbuffer
+  GLEW_3DFX_tbuffer = glewGetExtension("GL_3DFX_tbuffer");
+  if (glewExperimental || GLEW_3DFX_tbuffer) GLEW_3DFX_tbuffer = !_glewInit_GL_3DFX_tbuffer(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_3DFX_tbuffer */
+#ifdef GL_3DFX_texture_compression_FXT1
+  GLEW_3DFX_texture_compression_FXT1 = glewGetExtension("GL_3DFX_texture_compression_FXT1");
+#endif /* GL_3DFX_texture_compression_FXT1 */
+#ifdef GL_APPLE_client_storage
+  GLEW_APPLE_client_storage = glewGetExtension("GL_APPLE_client_storage");
+#endif /* GL_APPLE_client_storage */
+#ifdef GL_APPLE_element_array
+  GLEW_APPLE_element_array = glewGetExtension("GL_APPLE_element_array");
+  if (glewExperimental || GLEW_APPLE_element_array) GLEW_APPLE_element_array = !_glewInit_GL_APPLE_element_array(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_APPLE_element_array */
+#ifdef GL_APPLE_fence
+  GLEW_APPLE_fence = glewGetExtension("GL_APPLE_fence");
+  if (glewExperimental || GLEW_APPLE_fence) GLEW_APPLE_fence = !_glewInit_GL_APPLE_fence(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_APPLE_fence */
+#ifdef GL_APPLE_float_pixels
+  GLEW_APPLE_float_pixels = glewGetExtension("GL_APPLE_float_pixels");
+#endif /* GL_APPLE_float_pixels */
+#ifdef GL_APPLE_pixel_buffer
+  GLEW_APPLE_pixel_buffer = glewGetExtension("GL_APPLE_pixel_buffer");
+#endif /* GL_APPLE_pixel_buffer */
+#ifdef GL_APPLE_specular_vector
+  GLEW_APPLE_specular_vector = glewGetExtension("GL_APPLE_specular_vector");
+#endif /* GL_APPLE_specular_vector */
+#ifdef GL_APPLE_texture_range
+  GLEW_APPLE_texture_range = glewGetExtension("GL_APPLE_texture_range");
+  if (glewExperimental || GLEW_APPLE_texture_range) GLEW_APPLE_texture_range = !_glewInit_GL_APPLE_texture_range(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_APPLE_texture_range */
+#ifdef GL_APPLE_transform_hint
+  GLEW_APPLE_transform_hint = glewGetExtension("GL_APPLE_transform_hint");
+#endif /* GL_APPLE_transform_hint */
+#ifdef GL_APPLE_vertex_array_object
+  GLEW_APPLE_vertex_array_object = glewGetExtension("GL_APPLE_vertex_array_object");
+  if (glewExperimental || GLEW_APPLE_vertex_array_object) GLEW_APPLE_vertex_array_object = !_glewInit_GL_APPLE_vertex_array_object(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_APPLE_vertex_array_object */
+#ifdef GL_APPLE_vertex_array_range
+  GLEW_APPLE_vertex_array_range = glewGetExtension("GL_APPLE_vertex_array_range");
+  if (glewExperimental || GLEW_APPLE_vertex_array_range) GLEW_APPLE_vertex_array_range = !_glewInit_GL_APPLE_vertex_array_range(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_APPLE_vertex_array_range */
+#ifdef GL_APPLE_ycbcr_422
+  GLEW_APPLE_ycbcr_422 = glewGetExtension("GL_APPLE_ycbcr_422");
+#endif /* GL_APPLE_ycbcr_422 */
+#ifdef GL_ARB_color_buffer_float
+  GLEW_ARB_color_buffer_float = glewGetExtension("GL_ARB_color_buffer_float");
+  if (glewExperimental || GLEW_ARB_color_buffer_float) GLEW_ARB_color_buffer_float = !_glewInit_GL_ARB_color_buffer_float(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_ARB_color_buffer_float */
+#ifdef GL_ARB_depth_texture
+  GLEW_ARB_depth_texture = glewGetExtension("GL_ARB_depth_texture");
+#endif /* GL_ARB_depth_texture */
+#ifdef GL_ARB_draw_buffers
+  GLEW_ARB_draw_buffers = glewGetExtension("GL_ARB_draw_buffers");
+  if (glewExperimental || GLEW_ARB_draw_buffers) GLEW_ARB_draw_buffers = !_glewInit_GL_ARB_draw_buffers(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_ARB_draw_buffers */
+#ifdef GL_ARB_fragment_program
+  GLEW_ARB_fragment_program = glewGetExtension("GL_ARB_fragment_program");
+#endif /* GL_ARB_fragment_program */
+#ifdef GL_ARB_fragment_program_shadow
+  GLEW_ARB_fragment_program_shadow = glewGetExtension("GL_ARB_fragment_program_shadow");
+#endif /* GL_ARB_fragment_program_shadow */
+#ifdef GL_ARB_fragment_shader
+  GLEW_ARB_fragment_shader = glewGetExtension("GL_ARB_fragment_shader");
+#endif /* GL_ARB_fragment_shader */
+#ifdef GL_ARB_half_float_pixel
+  GLEW_ARB_half_float_pixel = glewGetExtension("GL_ARB_half_float_pixel");
+#endif /* GL_ARB_half_float_pixel */
+#ifdef GL_ARB_imaging
+  GLEW_ARB_imaging = glewGetExtension("GL_ARB_imaging");
+  if (glewExperimental || GLEW_ARB_imaging) GLEW_ARB_imaging = !_glewInit_GL_ARB_imaging(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_ARB_imaging */
+#ifdef GL_ARB_matrix_palette
+  GLEW_ARB_matrix_palette = glewGetExtension("GL_ARB_matrix_palette");
+  if (glewExperimental || GLEW_ARB_matrix_palette) GLEW_ARB_matrix_palette = !_glewInit_GL_ARB_matrix_palette(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_ARB_matrix_palette */
+#ifdef GL_ARB_multisample
+  GLEW_ARB_multisample = glewGetExtension("GL_ARB_multisample");
+  if (glewExperimental || GLEW_ARB_multisample) GLEW_ARB_multisample = !_glewInit_GL_ARB_multisample(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_ARB_multisample */
+#ifdef GL_ARB_multitexture
+  GLEW_ARB_multitexture = glewGetExtension("GL_ARB_multitexture");
+  if (glewExperimental || GLEW_ARB_multitexture) GLEW_ARB_multitexture = !_glewInit_GL_ARB_multitexture(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_ARB_multitexture */
+#ifdef GL_ARB_occlusion_query
+  GLEW_ARB_occlusion_query = glewGetExtension("GL_ARB_occlusion_query");
+  if (glewExperimental || GLEW_ARB_occlusion_query) GLEW_ARB_occlusion_query = !_glewInit_GL_ARB_occlusion_query(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_ARB_occlusion_query */
+#ifdef GL_ARB_pixel_buffer_object
+  GLEW_ARB_pixel_buffer_object = glewGetExtension("GL_ARB_pixel_buffer_object");
+#endif /* GL_ARB_pixel_buffer_object */
+#ifdef GL_ARB_point_parameters
+  GLEW_ARB_point_parameters = glewGetExtension("GL_ARB_point_parameters");
+  if (glewExperimental || GLEW_ARB_point_parameters) GLEW_ARB_point_parameters = !_glewInit_GL_ARB_point_parameters(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_ARB_point_parameters */
+#ifdef GL_ARB_point_sprite
+  GLEW_ARB_point_sprite = glewGetExtension("GL_ARB_point_sprite");
+#endif /* GL_ARB_point_sprite */
+#ifdef GL_ARB_shader_objects
+  GLEW_ARB_shader_objects = glewGetExtension("GL_ARB_shader_objects");
+  if (glewExperimental || GLEW_ARB_shader_objects) GLEW_ARB_shader_objects = !_glewInit_GL_ARB_shader_objects(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_ARB_shader_objects */
+#ifdef GL_ARB_shading_language_100
+  GLEW_ARB_shading_language_100 = glewGetExtension("GL_ARB_shading_language_100");
+#endif /* GL_ARB_shading_language_100 */
+#ifdef GL_ARB_shadow
+  GLEW_ARB_shadow = glewGetExtension("GL_ARB_shadow");
+#endif /* GL_ARB_shadow */
+#ifdef GL_ARB_shadow_ambient
+  GLEW_ARB_shadow_ambient = glewGetExtension("GL_ARB_shadow_ambient");
+#endif /* GL_ARB_shadow_ambient */
+#ifdef GL_ARB_texture_border_clamp
+  GLEW_ARB_texture_border_clamp = glewGetExtension("GL_ARB_texture_border_clamp");
+#endif /* GL_ARB_texture_border_clamp */
+#ifdef GL_ARB_texture_compression
+  GLEW_ARB_texture_compression = glewGetExtension("GL_ARB_texture_compression");
+  if (glewExperimental || GLEW_ARB_texture_compression) GLEW_ARB_texture_compression = !_glewInit_GL_ARB_texture_compression(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_ARB_texture_compression */
+#ifdef GL_ARB_texture_cube_map
+  GLEW_ARB_texture_cube_map = glewGetExtension("GL_ARB_texture_cube_map");
+#endif /* GL_ARB_texture_cube_map */
+#ifdef GL_ARB_texture_env_add
+  GLEW_ARB_texture_env_add = glewGetExtension("GL_ARB_texture_env_add");
+#endif /* GL_ARB_texture_env_add */
+#ifdef GL_ARB_texture_env_combine
+  GLEW_ARB_texture_env_combine = glewGetExtension("GL_ARB_texture_env_combine");
+#endif /* GL_ARB_texture_env_combine */
+#ifdef GL_ARB_texture_env_crossbar
+  GLEW_ARB_texture_env_crossbar = glewGetExtension("GL_ARB_texture_env_crossbar");
+#endif /* GL_ARB_texture_env_crossbar */
+#ifdef GL_ARB_texture_env_dot3
+  GLEW_ARB_texture_env_dot3 = glewGetExtension("GL_ARB_texture_env_dot3");
+#endif /* GL_ARB_texture_env_dot3 */
+#ifdef GL_ARB_texture_float
+  GLEW_ARB_texture_float = glewGetExtension("GL_ARB_texture_float");
+#endif /* GL_ARB_texture_float */
+#ifdef GL_ARB_texture_mirrored_repeat
+  GLEW_ARB_texture_mirrored_repeat = glewGetExtension("GL_ARB_texture_mirrored_repeat");
+#endif /* GL_ARB_texture_mirrored_repeat */
+#ifdef GL_ARB_texture_non_power_of_two
+  GLEW_ARB_texture_non_power_of_two = glewGetExtension("GL_ARB_texture_non_power_of_two");
+#endif /* GL_ARB_texture_non_power_of_two */
+#ifdef GL_ARB_texture_rectangle
+  GLEW_ARB_texture_rectangle = glewGetExtension("GL_ARB_texture_rectangle");
+#endif /* GL_ARB_texture_rectangle */
+#ifdef GL_ARB_transpose_matrix
+  GLEW_ARB_transpose_matrix = glewGetExtension("GL_ARB_transpose_matrix");
+  if (glewExperimental || GLEW_ARB_transpose_matrix) GLEW_ARB_transpose_matrix = !_glewInit_GL_ARB_transpose_matrix(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_ARB_transpose_matrix */
+#ifdef GL_ARB_vertex_blend
+  GLEW_ARB_vertex_blend = glewGetExtension("GL_ARB_vertex_blend");
+  if (glewExperimental || GLEW_ARB_vertex_blend) GLEW_ARB_vertex_blend = !_glewInit_GL_ARB_vertex_blend(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_ARB_vertex_blend */
+#ifdef GL_ARB_vertex_buffer_object
+  GLEW_ARB_vertex_buffer_object = glewGetExtension("GL_ARB_vertex_buffer_object");
+  if (glewExperimental || GLEW_ARB_vertex_buffer_object) GLEW_ARB_vertex_buffer_object = !_glewInit_GL_ARB_vertex_buffer_object(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_ARB_vertex_buffer_object */
+#ifdef GL_ARB_vertex_program
+  GLEW_ARB_vertex_program = glewGetExtension("GL_ARB_vertex_program");
+  if (glewExperimental || GLEW_ARB_vertex_program) GLEW_ARB_vertex_program = !_glewInit_GL_ARB_vertex_program(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_ARB_vertex_program */
+#ifdef GL_ARB_vertex_shader
+  GLEW_ARB_vertex_shader = glewGetExtension("GL_ARB_vertex_shader");
+  if (glewExperimental || GLEW_ARB_vertex_shader) { GLEW_ARB_vertex_shader = !_glewInit_GL_ARB_vertex_shader(GLEW_CONTEXT_ARG_VAR_INIT); _glewInit_GL_ARB_vertex_program(GLEW_CONTEXT_ARG_VAR_INIT); }
+#endif /* GL_ARB_vertex_shader */
+#ifdef GL_ARB_window_pos
+  GLEW_ARB_window_pos = glewGetExtension("GL_ARB_window_pos");
+  if (glewExperimental || GLEW_ARB_window_pos) GLEW_ARB_window_pos = !_glewInit_GL_ARB_window_pos(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_ARB_window_pos */
+#ifdef GL_ATIX_point_sprites
+  GLEW_ATIX_point_sprites = glewGetExtension("GL_ATIX_point_sprites");
+#endif /* GL_ATIX_point_sprites */
+#ifdef GL_ATIX_texture_env_combine3
+  GLEW_ATIX_texture_env_combine3 = glewGetExtension("GL_ATIX_texture_env_combine3");
+#endif /* GL_ATIX_texture_env_combine3 */
+#ifdef GL_ATIX_texture_env_route
+  GLEW_ATIX_texture_env_route = glewGetExtension("GL_ATIX_texture_env_route");
+#endif /* GL_ATIX_texture_env_route */
+#ifdef GL_ATIX_vertex_shader_output_point_size
+  GLEW_ATIX_vertex_shader_output_point_size = glewGetExtension("GL_ATIX_vertex_shader_output_point_size");
+#endif /* GL_ATIX_vertex_shader_output_point_size */
+#ifdef GL_ATI_draw_buffers
+  GLEW_ATI_draw_buffers = glewGetExtension("GL_ATI_draw_buffers");
+  if (glewExperimental || GLEW_ATI_draw_buffers) GLEW_ATI_draw_buffers = !_glewInit_GL_ATI_draw_buffers(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_ATI_draw_buffers */
+#ifdef GL_ATI_element_array
+  GLEW_ATI_element_array = glewGetExtension("GL_ATI_element_array");
+  if (glewExperimental || GLEW_ATI_element_array) GLEW_ATI_element_array = !_glewInit_GL_ATI_element_array(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_ATI_element_array */
+#ifdef GL_ATI_envmap_bumpmap
+  GLEW_ATI_envmap_bumpmap = glewGetExtension("GL_ATI_envmap_bumpmap");
+  if (glewExperimental || GLEW_ATI_envmap_bumpmap) GLEW_ATI_envmap_bumpmap = !_glewInit_GL_ATI_envmap_bumpmap(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_ATI_envmap_bumpmap */
+#ifdef GL_ATI_fragment_shader
+  GLEW_ATI_fragment_shader = glewGetExtension("GL_ATI_fragment_shader");
+  if (glewExperimental || GLEW_ATI_fragment_shader) GLEW_ATI_fragment_shader = !_glewInit_GL_ATI_fragment_shader(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_ATI_fragment_shader */
+#ifdef GL_ATI_map_object_buffer
+  GLEW_ATI_map_object_buffer = glewGetExtension("GL_ATI_map_object_buffer");
+  if (glewExperimental || GLEW_ATI_map_object_buffer) GLEW_ATI_map_object_buffer = !_glewInit_GL_ATI_map_object_buffer(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_ATI_map_object_buffer */
+#ifdef GL_ATI_pn_triangles
+  GLEW_ATI_pn_triangles = glewGetExtension("GL_ATI_pn_triangles");
+  if (glewExperimental || GLEW_ATI_pn_triangles) GLEW_ATI_pn_triangles = !_glewInit_GL_ATI_pn_triangles(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_ATI_pn_triangles */
+#ifdef GL_ATI_separate_stencil
+  GLEW_ATI_separate_stencil = glewGetExtension("GL_ATI_separate_stencil");
+  if (glewExperimental || GLEW_ATI_separate_stencil) GLEW_ATI_separate_stencil = !_glewInit_GL_ATI_separate_stencil(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_ATI_separate_stencil */
+#ifdef GL_ATI_text_fragment_shader
+  GLEW_ATI_text_fragment_shader = glewGetExtension("GL_ATI_text_fragment_shader");
+#endif /* GL_ATI_text_fragment_shader */
+#ifdef GL_ATI_texture_compression_3dc
+  GLEW_ATI_texture_compression_3dc = glewGetExtension("GL_ATI_texture_compression_3dc");
+#endif /* GL_ATI_texture_compression_3dc */
+#ifdef GL_ATI_texture_env_combine3
+  GLEW_ATI_texture_env_combine3 = glewGetExtension("GL_ATI_texture_env_combine3");
+#endif /* GL_ATI_texture_env_combine3 */
+#ifdef GL_ATI_texture_float
+  GLEW_ATI_texture_float = glewGetExtension("GL_ATI_texture_float");
+#endif /* GL_ATI_texture_float */
+#ifdef GL_ATI_texture_mirror_once
+  GLEW_ATI_texture_mirror_once = glewGetExtension("GL_ATI_texture_mirror_once");
+#endif /* GL_ATI_texture_mirror_once */
+#ifdef GL_ATI_vertex_array_object
+  GLEW_ATI_vertex_array_object = glewGetExtension("GL_ATI_vertex_array_object");
+  if (glewExperimental || GLEW_ATI_vertex_array_object) GLEW_ATI_vertex_array_object = !_glewInit_GL_ATI_vertex_array_object(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_ATI_vertex_array_object */
+#ifdef GL_ATI_vertex_attrib_array_object
+  GLEW_ATI_vertex_attrib_array_object = glewGetExtension("GL_ATI_vertex_attrib_array_object");
+  if (glewExperimental || GLEW_ATI_vertex_attrib_array_object) GLEW_ATI_vertex_attrib_array_object = !_glewInit_GL_ATI_vertex_attrib_array_object(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_ATI_vertex_attrib_array_object */
+#ifdef GL_ATI_vertex_streams
+  GLEW_ATI_vertex_streams = glewGetExtension("GL_ATI_vertex_streams");
+  if (glewExperimental || GLEW_ATI_vertex_streams) GLEW_ATI_vertex_streams = !_glewInit_GL_ATI_vertex_streams(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_ATI_vertex_streams */
+#ifdef GL_EXT_422_pixels
+  GLEW_EXT_422_pixels = glewGetExtension("GL_EXT_422_pixels");
+#endif /* GL_EXT_422_pixels */
+#ifdef GL_EXT_Cg_shader
+  GLEW_EXT_Cg_shader = glewGetExtension("GL_EXT_Cg_shader");
+#endif /* GL_EXT_Cg_shader */
+#ifdef GL_EXT_abgr
+  GLEW_EXT_abgr = glewGetExtension("GL_EXT_abgr");
+#endif /* GL_EXT_abgr */
+#ifdef GL_EXT_bgra
+  GLEW_EXT_bgra = glewGetExtension("GL_EXT_bgra");
+#endif /* GL_EXT_bgra */
+#ifdef GL_EXT_blend_color
+  GLEW_EXT_blend_color = glewGetExtension("GL_EXT_blend_color");
+  if (glewExperimental || GLEW_EXT_blend_color) GLEW_EXT_blend_color = !_glewInit_GL_EXT_blend_color(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_EXT_blend_color */
+#ifdef GL_EXT_blend_equation_separate
+  GLEW_EXT_blend_equation_separate = glewGetExtension("GL_EXT_blend_equation_separate");
+  if (glewExperimental || GLEW_EXT_blend_equation_separate) GLEW_EXT_blend_equation_separate = !_glewInit_GL_EXT_blend_equation_separate(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_EXT_blend_equation_separate */
+#ifdef GL_EXT_blend_func_separate
+  GLEW_EXT_blend_func_separate = glewGetExtension("GL_EXT_blend_func_separate");
+  if (glewExperimental || GLEW_EXT_blend_func_separate) GLEW_EXT_blend_func_separate = !_glewInit_GL_EXT_blend_func_separate(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_EXT_blend_func_separate */
+#ifdef GL_EXT_blend_logic_op
+  GLEW_EXT_blend_logic_op = glewGetExtension("GL_EXT_blend_logic_op");
+#endif /* GL_EXT_blend_logic_op */
+#ifdef GL_EXT_blend_minmax
+  GLEW_EXT_blend_minmax = glewGetExtension("GL_EXT_blend_minmax");
+  if (glewExperimental || GLEW_EXT_blend_minmax) GLEW_EXT_blend_minmax = !_glewInit_GL_EXT_blend_minmax(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_EXT_blend_minmax */
+#ifdef GL_EXT_blend_subtract
+  GLEW_EXT_blend_subtract = glewGetExtension("GL_EXT_blend_subtract");
+#endif /* GL_EXT_blend_subtract */
+#ifdef GL_EXT_clip_volume_hint
+  GLEW_EXT_clip_volume_hint = glewGetExtension("GL_EXT_clip_volume_hint");
+#endif /* GL_EXT_clip_volume_hint */
+#ifdef GL_EXT_cmyka
+  GLEW_EXT_cmyka = glewGetExtension("GL_EXT_cmyka");
+#endif /* GL_EXT_cmyka */
+#ifdef GL_EXT_color_subtable
+  GLEW_EXT_color_subtable = glewGetExtension("GL_EXT_color_subtable");
+  if (glewExperimental || GLEW_EXT_color_subtable) GLEW_EXT_color_subtable = !_glewInit_GL_EXT_color_subtable(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_EXT_color_subtable */
+#ifdef GL_EXT_compiled_vertex_array
+  GLEW_EXT_compiled_vertex_array = glewGetExtension("GL_EXT_compiled_vertex_array");
+  if (glewExperimental || GLEW_EXT_compiled_vertex_array) GLEW_EXT_compiled_vertex_array = !_glewInit_GL_EXT_compiled_vertex_array(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_EXT_compiled_vertex_array */
+#ifdef GL_EXT_convolution
+  GLEW_EXT_convolution = glewGetExtension("GL_EXT_convolution");
+  if (glewExperimental || GLEW_EXT_convolution) GLEW_EXT_convolution = !_glewInit_GL_EXT_convolution(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_EXT_convolution */
+#ifdef GL_EXT_coordinate_frame
+  GLEW_EXT_coordinate_frame = glewGetExtension("GL_EXT_coordinate_frame");
+  if (glewExperimental || GLEW_EXT_coordinate_frame) GLEW_EXT_coordinate_frame = !_glewInit_GL_EXT_coordinate_frame(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_EXT_coordinate_frame */
+#ifdef GL_EXT_copy_texture
+  GLEW_EXT_copy_texture = glewGetExtension("GL_EXT_copy_texture");
+  if (glewExperimental || GLEW_EXT_copy_texture) GLEW_EXT_copy_texture = !_glewInit_GL_EXT_copy_texture(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_EXT_copy_texture */
+#ifdef GL_EXT_cull_vertex
+  GLEW_EXT_cull_vertex = glewGetExtension("GL_EXT_cull_vertex");
+  if (glewExperimental || GLEW_EXT_cull_vertex) GLEW_EXT_cull_vertex = !_glewInit_GL_EXT_cull_vertex(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_EXT_cull_vertex */
+#ifdef GL_EXT_depth_bounds_test
+  GLEW_EXT_depth_bounds_test = glewGetExtension("GL_EXT_depth_bounds_test");
+  if (glewExperimental || GLEW_EXT_depth_bounds_test) GLEW_EXT_depth_bounds_test = !_glewInit_GL_EXT_depth_bounds_test(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_EXT_depth_bounds_test */
+#ifdef GL_EXT_draw_range_elements
+  GLEW_EXT_draw_range_elements = glewGetExtension("GL_EXT_draw_range_elements");
+  if (glewExperimental || GLEW_EXT_draw_range_elements) GLEW_EXT_draw_range_elements = !_glewInit_GL_EXT_draw_range_elements(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_EXT_draw_range_elements */
+#ifdef GL_EXT_fog_coord
+  GLEW_EXT_fog_coord = glewGetExtension("GL_EXT_fog_coord");
+  if (glewExperimental || GLEW_EXT_fog_coord) GLEW_EXT_fog_coord = !_glewInit_GL_EXT_fog_coord(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_EXT_fog_coord */
+#ifdef GL_EXT_fragment_lighting
+  GLEW_EXT_fragment_lighting = glewGetExtension("GL_EXT_fragment_lighting");
+  if (glewExperimental || GLEW_EXT_fragment_lighting) GLEW_EXT_fragment_lighting = !_glewInit_GL_EXT_fragment_lighting(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_EXT_fragment_lighting */
+#ifdef GL_EXT_framebuffer_blit
+  GLEW_EXT_framebuffer_blit = glewGetExtension("GL_EXT_framebuffer_blit");
+  if (glewExperimental || GLEW_EXT_framebuffer_blit) GLEW_EXT_framebuffer_blit = !_glewInit_GL_EXT_framebuffer_blit(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_EXT_framebuffer_blit */
+#ifdef GL_EXT_framebuffer_multisample
+  GLEW_EXT_framebuffer_multisample = glewGetExtension("GL_EXT_framebuffer_multisample");
+  if (glewExperimental || GLEW_EXT_framebuffer_multisample) GLEW_EXT_framebuffer_multisample = !_glewInit_GL_EXT_framebuffer_multisample(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_EXT_framebuffer_multisample */
+#ifdef GL_EXT_framebuffer_object
+  GLEW_EXT_framebuffer_object = glewGetExtension("GL_EXT_framebuffer_object");
+  if (glewExperimental || GLEW_EXT_framebuffer_object) GLEW_EXT_framebuffer_object = !_glewInit_GL_EXT_framebuffer_object(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_EXT_framebuffer_object */
+#ifdef GL_EXT_histogram
+  GLEW_EXT_histogram = glewGetExtension("GL_EXT_histogram");
+  if (glewExperimental || GLEW_EXT_histogram) GLEW_EXT_histogram = !_glewInit_GL_EXT_histogram(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_EXT_histogram */
+#ifdef GL_EXT_index_array_formats
+  GLEW_EXT_index_array_formats = glewGetExtension("GL_EXT_index_array_formats");
+#endif /* GL_EXT_index_array_formats */
+#ifdef GL_EXT_index_func
+  GLEW_EXT_index_func = glewGetExtension("GL_EXT_index_func");
+  if (glewExperimental || GLEW_EXT_index_func) GLEW_EXT_index_func = !_glewInit_GL_EXT_index_func(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_EXT_index_func */
+#ifdef GL_EXT_index_material
+  GLEW_EXT_index_material = glewGetExtension("GL_EXT_index_material");
+  if (glewExperimental || GLEW_EXT_index_material) GLEW_EXT_index_material = !_glewInit_GL_EXT_index_material(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_EXT_index_material */
+#ifdef GL_EXT_index_texture
+  GLEW_EXT_index_texture = glewGetExtension("GL_EXT_index_texture");
+#endif /* GL_EXT_index_texture */
+#ifdef GL_EXT_light_texture
+  GLEW_EXT_light_texture = glewGetExtension("GL_EXT_light_texture");
+  if (glewExperimental || GLEW_EXT_light_texture) GLEW_EXT_light_texture = !_glewInit_GL_EXT_light_texture(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_EXT_light_texture */
+#ifdef GL_EXT_misc_attribute
+  GLEW_EXT_misc_attribute = glewGetExtension("GL_EXT_misc_attribute");
+#endif /* GL_EXT_misc_attribute */
+#ifdef GL_EXT_multi_draw_arrays
+  GLEW_EXT_multi_draw_arrays = glewGetExtension("GL_EXT_multi_draw_arrays");
+  if (glewExperimental || GLEW_EXT_multi_draw_arrays) GLEW_EXT_multi_draw_arrays = !_glewInit_GL_EXT_multi_draw_arrays(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_EXT_multi_draw_arrays */
+#ifdef GL_EXT_multisample
+  GLEW_EXT_multisample = glewGetExtension("GL_EXT_multisample");
+  if (glewExperimental || GLEW_EXT_multisample) GLEW_EXT_multisample = !_glewInit_GL_EXT_multisample(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_EXT_multisample */
+#ifdef GL_EXT_packed_depth_stencil
+  GLEW_EXT_packed_depth_stencil = glewGetExtension("GL_EXT_packed_depth_stencil");
+#endif /* GL_EXT_packed_depth_stencil */
+#ifdef GL_EXT_packed_pixels
+  GLEW_EXT_packed_pixels = glewGetExtension("GL_EXT_packed_pixels");
+#endif /* GL_EXT_packed_pixels */
+#ifdef GL_EXT_paletted_texture
+  GLEW_EXT_paletted_texture = glewGetExtension("GL_EXT_paletted_texture");
+  if (glewExperimental || GLEW_EXT_paletted_texture) GLEW_EXT_paletted_texture = !_glewInit_GL_EXT_paletted_texture(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_EXT_paletted_texture */
+#ifdef GL_EXT_pixel_buffer_object
+  GLEW_EXT_pixel_buffer_object = glewGetExtension("GL_EXT_pixel_buffer_object");
+#endif /* GL_EXT_pixel_buffer_object */
+#ifdef GL_EXT_pixel_transform
+  GLEW_EXT_pixel_transform = glewGetExtension("GL_EXT_pixel_transform");
+  if (glewExperimental || GLEW_EXT_pixel_transform) GLEW_EXT_pixel_transform = !_glewInit_GL_EXT_pixel_transform(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_EXT_pixel_transform */
+#ifdef GL_EXT_pixel_transform_color_table
+  GLEW_EXT_pixel_transform_color_table = glewGetExtension("GL_EXT_pixel_transform_color_table");
+#endif /* GL_EXT_pixel_transform_color_table */
+#ifdef GL_EXT_point_parameters
+  GLEW_EXT_point_parameters = glewGetExtension("GL_EXT_point_parameters");
+  if (glewExperimental || GLEW_EXT_point_parameters) GLEW_EXT_point_parameters = !_glewInit_GL_EXT_point_parameters(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_EXT_point_parameters */
+#ifdef GL_EXT_polygon_offset
+  GLEW_EXT_polygon_offset = glewGetExtension("GL_EXT_polygon_offset");
+  if (glewExperimental || GLEW_EXT_polygon_offset) GLEW_EXT_polygon_offset = !_glewInit_GL_EXT_polygon_offset(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_EXT_polygon_offset */
+#ifdef GL_EXT_rescale_normal
+  GLEW_EXT_rescale_normal = glewGetExtension("GL_EXT_rescale_normal");
+#endif /* GL_EXT_rescale_normal */
+#ifdef GL_EXT_scene_marker
+  GLEW_EXT_scene_marker = glewGetExtension("GL_EXT_scene_marker");
+  if (glewExperimental || GLEW_EXT_scene_marker) GLEW_EXT_scene_marker = !_glewInit_GL_EXT_scene_marker(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_EXT_scene_marker */
+#ifdef GL_EXT_secondary_color
+  GLEW_EXT_secondary_color = glewGetExtension("GL_EXT_secondary_color");
+  if (glewExperimental || GLEW_EXT_secondary_color) GLEW_EXT_secondary_color = !_glewInit_GL_EXT_secondary_color(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_EXT_secondary_color */
+#ifdef GL_EXT_separate_specular_color
+  GLEW_EXT_separate_specular_color = glewGetExtension("GL_EXT_separate_specular_color");
+#endif /* GL_EXT_separate_specular_color */
+#ifdef GL_EXT_shadow_funcs
+  GLEW_EXT_shadow_funcs = glewGetExtension("GL_EXT_shadow_funcs");
+#endif /* GL_EXT_shadow_funcs */
+#ifdef GL_EXT_shared_texture_palette
+  GLEW_EXT_shared_texture_palette = glewGetExtension("GL_EXT_shared_texture_palette");
+#endif /* GL_EXT_shared_texture_palette */
+#ifdef GL_EXT_stencil_clear_tag
+  GLEW_EXT_stencil_clear_tag = glewGetExtension("GL_EXT_stencil_clear_tag");
+#endif /* GL_EXT_stencil_clear_tag */
+#ifdef GL_EXT_stencil_two_side
+  GLEW_EXT_stencil_two_side = glewGetExtension("GL_EXT_stencil_two_side");
+  if (glewExperimental || GLEW_EXT_stencil_two_side) GLEW_EXT_stencil_two_side = !_glewInit_GL_EXT_stencil_two_side(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_EXT_stencil_two_side */
+#ifdef GL_EXT_stencil_wrap
+  GLEW_EXT_stencil_wrap = glewGetExtension("GL_EXT_stencil_wrap");
+#endif /* GL_EXT_stencil_wrap */
+#ifdef GL_EXT_subtexture
+  GLEW_EXT_subtexture = glewGetExtension("GL_EXT_subtexture");
+  if (glewExperimental || GLEW_EXT_subtexture) GLEW_EXT_subtexture = !_glewInit_GL_EXT_subtexture(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_EXT_subtexture */
+#ifdef GL_EXT_texture
+  GLEW_EXT_texture = glewGetExtension("GL_EXT_texture");
+#endif /* GL_EXT_texture */
+#ifdef GL_EXT_texture3D
+  GLEW_EXT_texture3D = glewGetExtension("GL_EXT_texture3D");
+  if (glewExperimental || GLEW_EXT_texture3D) GLEW_EXT_texture3D = !_glewInit_GL_EXT_texture3D(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_EXT_texture3D */
+#ifdef GL_EXT_texture_compression_dxt1
+  GLEW_EXT_texture_compression_dxt1 = glewGetExtension("GL_EXT_texture_compression_dxt1");
+#endif /* GL_EXT_texture_compression_dxt1 */
+#ifdef GL_EXT_texture_compression_s3tc
+  GLEW_EXT_texture_compression_s3tc = glewGetExtension("GL_EXT_texture_compression_s3tc");
+#endif /* GL_EXT_texture_compression_s3tc */
+#ifdef GL_EXT_texture_cube_map
+  GLEW_EXT_texture_cube_map = glewGetExtension("GL_EXT_texture_cube_map");
+#endif /* GL_EXT_texture_cube_map */
+#ifdef GL_EXT_texture_edge_clamp
+  GLEW_EXT_texture_edge_clamp = glewGetExtension("GL_EXT_texture_edge_clamp");
+#endif /* GL_EXT_texture_edge_clamp */
+#ifdef GL_EXT_texture_env
+  GLEW_EXT_texture_env = glewGetExtension("GL_EXT_texture_env");
+#endif /* GL_EXT_texture_env */
+#ifdef GL_EXT_texture_env_add
+  GLEW_EXT_texture_env_add = glewGetExtension("GL_EXT_texture_env_add");
+#endif /* GL_EXT_texture_env_add */
+#ifdef GL_EXT_texture_env_combine
+  GLEW_EXT_texture_env_combine = glewGetExtension("GL_EXT_texture_env_combine");
+#endif /* GL_EXT_texture_env_combine */
+#ifdef GL_EXT_texture_env_dot3
+  GLEW_EXT_texture_env_dot3 = glewGetExtension("GL_EXT_texture_env_dot3");
+#endif /* GL_EXT_texture_env_dot3 */
+#ifdef GL_EXT_texture_filter_anisotropic
+  GLEW_EXT_texture_filter_anisotropic = glewGetExtension("GL_EXT_texture_filter_anisotropic");
+#endif /* GL_EXT_texture_filter_anisotropic */
+#ifdef GL_EXT_texture_lod_bias
+  GLEW_EXT_texture_lod_bias = glewGetExtension("GL_EXT_texture_lod_bias");
+#endif /* GL_EXT_texture_lod_bias */
+#ifdef GL_EXT_texture_mirror_clamp
+  GLEW_EXT_texture_mirror_clamp = glewGetExtension("GL_EXT_texture_mirror_clamp");
+#endif /* GL_EXT_texture_mirror_clamp */
+#ifdef GL_EXT_texture_object
+  GLEW_EXT_texture_object = glewGetExtension("GL_EXT_texture_object");
+  if (glewExperimental || GLEW_EXT_texture_object) GLEW_EXT_texture_object = !_glewInit_GL_EXT_texture_object(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_EXT_texture_object */
+#ifdef GL_EXT_texture_perturb_normal
+  GLEW_EXT_texture_perturb_normal = glewGetExtension("GL_EXT_texture_perturb_normal");
+  if (glewExperimental || GLEW_EXT_texture_perturb_normal) GLEW_EXT_texture_perturb_normal = !_glewInit_GL_EXT_texture_perturb_normal(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_EXT_texture_perturb_normal */
+#ifdef GL_EXT_texture_rectangle
+  GLEW_EXT_texture_rectangle = glewGetExtension("GL_EXT_texture_rectangle");
+#endif /* GL_EXT_texture_rectangle */
+#ifdef GL_EXT_texture_sRGB
+  GLEW_EXT_texture_sRGB = glewGetExtension("GL_EXT_texture_sRGB");
+#endif /* GL_EXT_texture_sRGB */
+#ifdef GL_EXT_vertex_array
+  GLEW_EXT_vertex_array = glewGetExtension("GL_EXT_vertex_array");
+  if (glewExperimental || GLEW_EXT_vertex_array) GLEW_EXT_vertex_array = !_glewInit_GL_EXT_vertex_array(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_EXT_vertex_array */
+#ifdef GL_EXT_vertex_shader
+  GLEW_EXT_vertex_shader = glewGetExtension("GL_EXT_vertex_shader");
+  if (glewExperimental || GLEW_EXT_vertex_shader) GLEW_EXT_vertex_shader = !_glewInit_GL_EXT_vertex_shader(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_EXT_vertex_shader */
+#ifdef GL_EXT_vertex_weighting
+  GLEW_EXT_vertex_weighting = glewGetExtension("GL_EXT_vertex_weighting");
+  if (glewExperimental || GLEW_EXT_vertex_weighting) GLEW_EXT_vertex_weighting = !_glewInit_GL_EXT_vertex_weighting(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_EXT_vertex_weighting */
+#ifdef GL_GREMEDY_string_marker
+  GLEW_GREMEDY_string_marker = glewGetExtension("GL_GREMEDY_string_marker");
+  if (glewExperimental || GLEW_GREMEDY_string_marker) GLEW_GREMEDY_string_marker = !_glewInit_GL_GREMEDY_string_marker(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_GREMEDY_string_marker */
+#ifdef GL_HP_convolution_border_modes
+  GLEW_HP_convolution_border_modes = glewGetExtension("GL_HP_convolution_border_modes");
+#endif /* GL_HP_convolution_border_modes */
+#ifdef GL_HP_image_transform
+  GLEW_HP_image_transform = glewGetExtension("GL_HP_image_transform");
+  if (glewExperimental || GLEW_HP_image_transform) GLEW_HP_image_transform = !_glewInit_GL_HP_image_transform(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_HP_image_transform */
+#ifdef GL_HP_occlusion_test
+  GLEW_HP_occlusion_test = glewGetExtension("GL_HP_occlusion_test");
+#endif /* GL_HP_occlusion_test */
+#ifdef GL_HP_texture_lighting
+  GLEW_HP_texture_lighting = glewGetExtension("GL_HP_texture_lighting");
+#endif /* GL_HP_texture_lighting */
+#ifdef GL_IBM_cull_vertex
+  GLEW_IBM_cull_vertex = glewGetExtension("GL_IBM_cull_vertex");
+#endif /* GL_IBM_cull_vertex */
+#ifdef GL_IBM_multimode_draw_arrays
+  GLEW_IBM_multimode_draw_arrays = glewGetExtension("GL_IBM_multimode_draw_arrays");
+  if (glewExperimental || GLEW_IBM_multimode_draw_arrays) GLEW_IBM_multimode_draw_arrays = !_glewInit_GL_IBM_multimode_draw_arrays(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_IBM_multimode_draw_arrays */
+#ifdef GL_IBM_rasterpos_clip
+  GLEW_IBM_rasterpos_clip = glewGetExtension("GL_IBM_rasterpos_clip");
+#endif /* GL_IBM_rasterpos_clip */
+#ifdef GL_IBM_static_data
+  GLEW_IBM_static_data = glewGetExtension("GL_IBM_static_data");
+#endif /* GL_IBM_static_data */
+#ifdef GL_IBM_texture_mirrored_repeat
+  GLEW_IBM_texture_mirrored_repeat = glewGetExtension("GL_IBM_texture_mirrored_repeat");
+#endif /* GL_IBM_texture_mirrored_repeat */
+#ifdef GL_IBM_vertex_array_lists
+  GLEW_IBM_vertex_array_lists = glewGetExtension("GL_IBM_vertex_array_lists");
+  if (glewExperimental || GLEW_IBM_vertex_array_lists) GLEW_IBM_vertex_array_lists = !_glewInit_GL_IBM_vertex_array_lists(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_IBM_vertex_array_lists */
+#ifdef GL_INGR_color_clamp
+  GLEW_INGR_color_clamp = glewGetExtension("GL_INGR_color_clamp");
+#endif /* GL_INGR_color_clamp */
+#ifdef GL_INGR_interlace_read
+  GLEW_INGR_interlace_read = glewGetExtension("GL_INGR_interlace_read");
+#endif /* GL_INGR_interlace_read */
+#ifdef GL_INTEL_parallel_arrays
+  GLEW_INTEL_parallel_arrays = glewGetExtension("GL_INTEL_parallel_arrays");
+  if (glewExperimental || GLEW_INTEL_parallel_arrays) GLEW_INTEL_parallel_arrays = !_glewInit_GL_INTEL_parallel_arrays(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_INTEL_parallel_arrays */
+#ifdef GL_INTEL_texture_scissor
+  GLEW_INTEL_texture_scissor = glewGetExtension("GL_INTEL_texture_scissor");
+  if (glewExperimental || GLEW_INTEL_texture_scissor) GLEW_INTEL_texture_scissor = !_glewInit_GL_INTEL_texture_scissor(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_INTEL_texture_scissor */
+#ifdef GL_KTX_buffer_region
+  GLEW_KTX_buffer_region = glewGetExtension("GL_KTX_buffer_region");
+  if (glewExperimental || GLEW_KTX_buffer_region) GLEW_KTX_buffer_region = !_glewInit_GL_KTX_buffer_region(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_KTX_buffer_region */
+#ifdef GL_MESAX_texture_stack
+  GLEW_MESAX_texture_stack = glewGetExtension("GL_MESAX_texture_stack");
+#endif /* GL_MESAX_texture_stack */
+#ifdef GL_MESA_pack_invert
+  GLEW_MESA_pack_invert = glewGetExtension("GL_MESA_pack_invert");
+#endif /* GL_MESA_pack_invert */
+#ifdef GL_MESA_resize_buffers
+  GLEW_MESA_resize_buffers = glewGetExtension("GL_MESA_resize_buffers");
+  if (glewExperimental || GLEW_MESA_resize_buffers) GLEW_MESA_resize_buffers = !_glewInit_GL_MESA_resize_buffers(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_MESA_resize_buffers */
+#ifdef GL_MESA_window_pos
+  GLEW_MESA_window_pos = glewGetExtension("GL_MESA_window_pos");
+  if (glewExperimental || GLEW_MESA_window_pos) GLEW_MESA_window_pos = !_glewInit_GL_MESA_window_pos(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_MESA_window_pos */
+#ifdef GL_MESA_ycbcr_texture
+  GLEW_MESA_ycbcr_texture = glewGetExtension("GL_MESA_ycbcr_texture");
+#endif /* GL_MESA_ycbcr_texture */
+#ifdef GL_NV_blend_square
+  GLEW_NV_blend_square = glewGetExtension("GL_NV_blend_square");
+#endif /* GL_NV_blend_square */
+#ifdef GL_NV_copy_depth_to_color
+  GLEW_NV_copy_depth_to_color = glewGetExtension("GL_NV_copy_depth_to_color");
+#endif /* GL_NV_copy_depth_to_color */
+#ifdef GL_NV_depth_clamp
+  GLEW_NV_depth_clamp = glewGetExtension("GL_NV_depth_clamp");
+#endif /* GL_NV_depth_clamp */
+#ifdef GL_NV_evaluators
+  GLEW_NV_evaluators = glewGetExtension("GL_NV_evaluators");
+  if (glewExperimental || GLEW_NV_evaluators) GLEW_NV_evaluators = !_glewInit_GL_NV_evaluators(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_NV_evaluators */
+#ifdef GL_NV_fence
+  GLEW_NV_fence = glewGetExtension("GL_NV_fence");
+  if (glewExperimental || GLEW_NV_fence) GLEW_NV_fence = !_glewInit_GL_NV_fence(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_NV_fence */
+#ifdef GL_NV_float_buffer
+  GLEW_NV_float_buffer = glewGetExtension("GL_NV_float_buffer");
+#endif /* GL_NV_float_buffer */
+#ifdef GL_NV_fog_distance
+  GLEW_NV_fog_distance = glewGetExtension("GL_NV_fog_distance");
+#endif /* GL_NV_fog_distance */
+#ifdef GL_NV_fragment_program
+  GLEW_NV_fragment_program = glewGetExtension("GL_NV_fragment_program");
+  if (glewExperimental || GLEW_NV_fragment_program) GLEW_NV_fragment_program = !_glewInit_GL_NV_fragment_program(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_NV_fragment_program */
+#ifdef GL_NV_fragment_program2
+  GLEW_NV_fragment_program2 = glewGetExtension("GL_NV_fragment_program2");
+#endif /* GL_NV_fragment_program2 */
+#ifdef GL_NV_fragment_program_option
+  GLEW_NV_fragment_program_option = glewGetExtension("GL_NV_fragment_program_option");
+#endif /* GL_NV_fragment_program_option */
+#ifdef GL_NV_half_float
+  GLEW_NV_half_float = glewGetExtension("GL_NV_half_float");
+  if (glewExperimental || GLEW_NV_half_float) GLEW_NV_half_float = !_glewInit_GL_NV_half_float(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_NV_half_float */
+#ifdef GL_NV_light_max_exponent
+  GLEW_NV_light_max_exponent = glewGetExtension("GL_NV_light_max_exponent");
+#endif /* GL_NV_light_max_exponent */
+#ifdef GL_NV_multisample_filter_hint
+  GLEW_NV_multisample_filter_hint = glewGetExtension("GL_NV_multisample_filter_hint");
+#endif /* GL_NV_multisample_filter_hint */
+#ifdef GL_NV_occlusion_query
+  GLEW_NV_occlusion_query = glewGetExtension("GL_NV_occlusion_query");
+  if (glewExperimental || GLEW_NV_occlusion_query) GLEW_NV_occlusion_query = !_glewInit_GL_NV_occlusion_query(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_NV_occlusion_query */
+#ifdef GL_NV_packed_depth_stencil
+  GLEW_NV_packed_depth_stencil = glewGetExtension("GL_NV_packed_depth_stencil");
+#endif /* GL_NV_packed_depth_stencil */
+#ifdef GL_NV_pixel_data_range
+  GLEW_NV_pixel_data_range = glewGetExtension("GL_NV_pixel_data_range");
+  if (glewExperimental || GLEW_NV_pixel_data_range) GLEW_NV_pixel_data_range = !_glewInit_GL_NV_pixel_data_range(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_NV_pixel_data_range */
+#ifdef GL_NV_point_sprite
+  GLEW_NV_point_sprite = glewGetExtension("GL_NV_point_sprite");
+  if (glewExperimental || GLEW_NV_point_sprite) GLEW_NV_point_sprite = !_glewInit_GL_NV_point_sprite(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_NV_point_sprite */
+#ifdef GL_NV_primitive_restart
+  GLEW_NV_primitive_restart = glewGetExtension("GL_NV_primitive_restart");
+  if (glewExperimental || GLEW_NV_primitive_restart) GLEW_NV_primitive_restart = !_glewInit_GL_NV_primitive_restart(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_NV_primitive_restart */
+#ifdef GL_NV_register_combiners
+  GLEW_NV_register_combiners = glewGetExtension("GL_NV_register_combiners");
+  if (glewExperimental || GLEW_NV_register_combiners) GLEW_NV_register_combiners = !_glewInit_GL_NV_register_combiners(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_NV_register_combiners */
+#ifdef GL_NV_register_combiners2
+  GLEW_NV_register_combiners2 = glewGetExtension("GL_NV_register_combiners2");
+  if (glewExperimental || GLEW_NV_register_combiners2) GLEW_NV_register_combiners2 = !_glewInit_GL_NV_register_combiners2(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_NV_register_combiners2 */
+#ifdef GL_NV_texgen_emboss
+  GLEW_NV_texgen_emboss = glewGetExtension("GL_NV_texgen_emboss");
+#endif /* GL_NV_texgen_emboss */
+#ifdef GL_NV_texgen_reflection
+  GLEW_NV_texgen_reflection = glewGetExtension("GL_NV_texgen_reflection");
+#endif /* GL_NV_texgen_reflection */
+#ifdef GL_NV_texture_compression_vtc
+  GLEW_NV_texture_compression_vtc = glewGetExtension("GL_NV_texture_compression_vtc");
+#endif /* GL_NV_texture_compression_vtc */
+#ifdef GL_NV_texture_env_combine4
+  GLEW_NV_texture_env_combine4 = glewGetExtension("GL_NV_texture_env_combine4");
+#endif /* GL_NV_texture_env_combine4 */
+#ifdef GL_NV_texture_expand_normal
+  GLEW_NV_texture_expand_normal = glewGetExtension("GL_NV_texture_expand_normal");
+#endif /* GL_NV_texture_expand_normal */
+#ifdef GL_NV_texture_rectangle
+  GLEW_NV_texture_rectangle = glewGetExtension("GL_NV_texture_rectangle");
+#endif /* GL_NV_texture_rectangle */
+#ifdef GL_NV_texture_shader
+  GLEW_NV_texture_shader = glewGetExtension("GL_NV_texture_shader");
+#endif /* GL_NV_texture_shader */
+#ifdef GL_NV_texture_shader2
+  GLEW_NV_texture_shader2 = glewGetExtension("GL_NV_texture_shader2");
+#endif /* GL_NV_texture_shader2 */
+#ifdef GL_NV_texture_shader3
+  GLEW_NV_texture_shader3 = glewGetExtension("GL_NV_texture_shader3");
+#endif /* GL_NV_texture_shader3 */
+#ifdef GL_NV_vertex_array_range
+  GLEW_NV_vertex_array_range = glewGetExtension("GL_NV_vertex_array_range");
+  if (glewExperimental || GLEW_NV_vertex_array_range) GLEW_NV_vertex_array_range = !_glewInit_GL_NV_vertex_array_range(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_NV_vertex_array_range */
+#ifdef GL_NV_vertex_array_range2
+  GLEW_NV_vertex_array_range2 = glewGetExtension("GL_NV_vertex_array_range2");
+#endif /* GL_NV_vertex_array_range2 */
+#ifdef GL_NV_vertex_program
+  GLEW_NV_vertex_program = glewGetExtension("GL_NV_vertex_program");
+  if (glewExperimental || GLEW_NV_vertex_program) GLEW_NV_vertex_program = !_glewInit_GL_NV_vertex_program(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_NV_vertex_program */
+#ifdef GL_NV_vertex_program1_1
+  GLEW_NV_vertex_program1_1 = glewGetExtension("GL_NV_vertex_program1_1");
+#endif /* GL_NV_vertex_program1_1 */
+#ifdef GL_NV_vertex_program2
+  GLEW_NV_vertex_program2 = glewGetExtension("GL_NV_vertex_program2");
+#endif /* GL_NV_vertex_program2 */
+#ifdef GL_NV_vertex_program2_option
+  GLEW_NV_vertex_program2_option = glewGetExtension("GL_NV_vertex_program2_option");
+#endif /* GL_NV_vertex_program2_option */
+#ifdef GL_NV_vertex_program3
+  GLEW_NV_vertex_program3 = glewGetExtension("GL_NV_vertex_program3");
+#endif /* GL_NV_vertex_program3 */
+#ifdef GL_OML_interlace
+  GLEW_OML_interlace = glewGetExtension("GL_OML_interlace");
+#endif /* GL_OML_interlace */
+#ifdef GL_OML_resample
+  GLEW_OML_resample = glewGetExtension("GL_OML_resample");
+#endif /* GL_OML_resample */
+#ifdef GL_OML_subsample
+  GLEW_OML_subsample = glewGetExtension("GL_OML_subsample");
+#endif /* GL_OML_subsample */
+#ifdef GL_PGI_misc_hints
+  GLEW_PGI_misc_hints = glewGetExtension("GL_PGI_misc_hints");
+#endif /* GL_PGI_misc_hints */
+#ifdef GL_PGI_vertex_hints
+  GLEW_PGI_vertex_hints = glewGetExtension("GL_PGI_vertex_hints");
+#endif /* GL_PGI_vertex_hints */
+#ifdef GL_REND_screen_coordinates
+  GLEW_REND_screen_coordinates = glewGetExtension("GL_REND_screen_coordinates");
+#endif /* GL_REND_screen_coordinates */
+#ifdef GL_S3_s3tc
+  GLEW_S3_s3tc = glewGetExtension("GL_S3_s3tc");
+#endif /* GL_S3_s3tc */
+#ifdef GL_SGIS_color_range
+  GLEW_SGIS_color_range = glewGetExtension("GL_SGIS_color_range");
+#endif /* GL_SGIS_color_range */
+#ifdef GL_SGIS_detail_texture
+  GLEW_SGIS_detail_texture = glewGetExtension("GL_SGIS_detail_texture");
+  if (glewExperimental || GLEW_SGIS_detail_texture) GLEW_SGIS_detail_texture = !_glewInit_GL_SGIS_detail_texture(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_SGIS_detail_texture */
+#ifdef GL_SGIS_fog_function
+  GLEW_SGIS_fog_function = glewGetExtension("GL_SGIS_fog_function");
+  if (glewExperimental || GLEW_SGIS_fog_function) GLEW_SGIS_fog_function = !_glewInit_GL_SGIS_fog_function(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_SGIS_fog_function */
+#ifdef GL_SGIS_generate_mipmap
+  GLEW_SGIS_generate_mipmap = glewGetExtension("GL_SGIS_generate_mipmap");
+#endif /* GL_SGIS_generate_mipmap */
+#ifdef GL_SGIS_multisample
+  GLEW_SGIS_multisample = glewGetExtension("GL_SGIS_multisample");
+  if (glewExperimental || GLEW_SGIS_multisample) GLEW_SGIS_multisample = !_glewInit_GL_SGIS_multisample(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_SGIS_multisample */
+#ifdef GL_SGIS_pixel_texture
+  GLEW_SGIS_pixel_texture = glewGetExtension("GL_SGIS_pixel_texture");
+#endif /* GL_SGIS_pixel_texture */
+#ifdef GL_SGIS_sharpen_texture
+  GLEW_SGIS_sharpen_texture = glewGetExtension("GL_SGIS_sharpen_texture");
+  if (glewExperimental || GLEW_SGIS_sharpen_texture) GLEW_SGIS_sharpen_texture = !_glewInit_GL_SGIS_sharpen_texture(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_SGIS_sharpen_texture */
+#ifdef GL_SGIS_texture4D
+  GLEW_SGIS_texture4D = glewGetExtension("GL_SGIS_texture4D");
+  if (glewExperimental || GLEW_SGIS_texture4D) GLEW_SGIS_texture4D = !_glewInit_GL_SGIS_texture4D(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_SGIS_texture4D */
+#ifdef GL_SGIS_texture_border_clamp
+  GLEW_SGIS_texture_border_clamp = glewGetExtension("GL_SGIS_texture_border_clamp");
+#endif /* GL_SGIS_texture_border_clamp */
+#ifdef GL_SGIS_texture_edge_clamp
+  GLEW_SGIS_texture_edge_clamp = glewGetExtension("GL_SGIS_texture_edge_clamp");
+#endif /* GL_SGIS_texture_edge_clamp */
+#ifdef GL_SGIS_texture_filter4
+  GLEW_SGIS_texture_filter4 = glewGetExtension("GL_SGIS_texture_filter4");
+  if (glewExperimental || GLEW_SGIS_texture_filter4) GLEW_SGIS_texture_filter4 = !_glewInit_GL_SGIS_texture_filter4(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_SGIS_texture_filter4 */
+#ifdef GL_SGIS_texture_lod
+  GLEW_SGIS_texture_lod = glewGetExtension("GL_SGIS_texture_lod");
+#endif /* GL_SGIS_texture_lod */
+#ifdef GL_SGIS_texture_select
+  GLEW_SGIS_texture_select = glewGetExtension("GL_SGIS_texture_select");
+#endif /* GL_SGIS_texture_select */
+#ifdef GL_SGIX_async
+  GLEW_SGIX_async = glewGetExtension("GL_SGIX_async");
+  if (glewExperimental || GLEW_SGIX_async) GLEW_SGIX_async = !_glewInit_GL_SGIX_async(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_SGIX_async */
+#ifdef GL_SGIX_async_histogram
+  GLEW_SGIX_async_histogram = glewGetExtension("GL_SGIX_async_histogram");
+#endif /* GL_SGIX_async_histogram */
+#ifdef GL_SGIX_async_pixel
+  GLEW_SGIX_async_pixel = glewGetExtension("GL_SGIX_async_pixel");
+#endif /* GL_SGIX_async_pixel */
+#ifdef GL_SGIX_blend_alpha_minmax
+  GLEW_SGIX_blend_alpha_minmax = glewGetExtension("GL_SGIX_blend_alpha_minmax");
+#endif /* GL_SGIX_blend_alpha_minmax */
+#ifdef GL_SGIX_clipmap
+  GLEW_SGIX_clipmap = glewGetExtension("GL_SGIX_clipmap");
+#endif /* GL_SGIX_clipmap */
+#ifdef GL_SGIX_depth_texture
+  GLEW_SGIX_depth_texture = glewGetExtension("GL_SGIX_depth_texture");
+#endif /* GL_SGIX_depth_texture */
+#ifdef GL_SGIX_flush_raster
+  GLEW_SGIX_flush_raster = glewGetExtension("GL_SGIX_flush_raster");
+  if (glewExperimental || GLEW_SGIX_flush_raster) GLEW_SGIX_flush_raster = !_glewInit_GL_SGIX_flush_raster(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_SGIX_flush_raster */
+#ifdef GL_SGIX_fog_offset
+  GLEW_SGIX_fog_offset = glewGetExtension("GL_SGIX_fog_offset");
+#endif /* GL_SGIX_fog_offset */
+#ifdef GL_SGIX_fog_texture
+  GLEW_SGIX_fog_texture = glewGetExtension("GL_SGIX_fog_texture");
+  if (glewExperimental || GLEW_SGIX_fog_texture) GLEW_SGIX_fog_texture = !_glewInit_GL_SGIX_fog_texture(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_SGIX_fog_texture */
+#ifdef GL_SGIX_fragment_specular_lighting
+  GLEW_SGIX_fragment_specular_lighting = glewGetExtension("GL_SGIX_fragment_specular_lighting");
+  if (glewExperimental || GLEW_SGIX_fragment_specular_lighting) GLEW_SGIX_fragment_specular_lighting = !_glewInit_GL_SGIX_fragment_specular_lighting(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_SGIX_fragment_specular_lighting */
+#ifdef GL_SGIX_framezoom
+  GLEW_SGIX_framezoom = glewGetExtension("GL_SGIX_framezoom");
+  if (glewExperimental || GLEW_SGIX_framezoom) GLEW_SGIX_framezoom = !_glewInit_GL_SGIX_framezoom(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_SGIX_framezoom */
+#ifdef GL_SGIX_interlace
+  GLEW_SGIX_interlace = glewGetExtension("GL_SGIX_interlace");
+#endif /* GL_SGIX_interlace */
+#ifdef GL_SGIX_ir_instrument1
+  GLEW_SGIX_ir_instrument1 = glewGetExtension("GL_SGIX_ir_instrument1");
+#endif /* GL_SGIX_ir_instrument1 */
+#ifdef GL_SGIX_list_priority
+  GLEW_SGIX_list_priority = glewGetExtension("GL_SGIX_list_priority");
+#endif /* GL_SGIX_list_priority */
+#ifdef GL_SGIX_pixel_texture
+  GLEW_SGIX_pixel_texture = glewGetExtension("GL_SGIX_pixel_texture");
+  if (glewExperimental || GLEW_SGIX_pixel_texture) GLEW_SGIX_pixel_texture = !_glewInit_GL_SGIX_pixel_texture(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_SGIX_pixel_texture */
+#ifdef GL_SGIX_pixel_texture_bits
+  GLEW_SGIX_pixel_texture_bits = glewGetExtension("GL_SGIX_pixel_texture_bits");
+#endif /* GL_SGIX_pixel_texture_bits */
+#ifdef GL_SGIX_reference_plane
+  GLEW_SGIX_reference_plane = glewGetExtension("GL_SGIX_reference_plane");
+  if (glewExperimental || GLEW_SGIX_reference_plane) GLEW_SGIX_reference_plane = !_glewInit_GL_SGIX_reference_plane(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_SGIX_reference_plane */
+#ifdef GL_SGIX_resample
+  GLEW_SGIX_resample = glewGetExtension("GL_SGIX_resample");
+#endif /* GL_SGIX_resample */
+#ifdef GL_SGIX_shadow
+  GLEW_SGIX_shadow = glewGetExtension("GL_SGIX_shadow");
+#endif /* GL_SGIX_shadow */
+#ifdef GL_SGIX_shadow_ambient
+  GLEW_SGIX_shadow_ambient = glewGetExtension("GL_SGIX_shadow_ambient");
+#endif /* GL_SGIX_shadow_ambient */
+#ifdef GL_SGIX_sprite
+  GLEW_SGIX_sprite = glewGetExtension("GL_SGIX_sprite");
+  if (glewExperimental || GLEW_SGIX_sprite) GLEW_SGIX_sprite = !_glewInit_GL_SGIX_sprite(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_SGIX_sprite */
+#ifdef GL_SGIX_tag_sample_buffer
+  GLEW_SGIX_tag_sample_buffer = glewGetExtension("GL_SGIX_tag_sample_buffer");
+  if (glewExperimental || GLEW_SGIX_tag_sample_buffer) GLEW_SGIX_tag_sample_buffer = !_glewInit_GL_SGIX_tag_sample_buffer(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_SGIX_tag_sample_buffer */
+#ifdef GL_SGIX_texture_add_env
+  GLEW_SGIX_texture_add_env = glewGetExtension("GL_SGIX_texture_add_env");
+#endif /* GL_SGIX_texture_add_env */
+#ifdef GL_SGIX_texture_coordinate_clamp
+  GLEW_SGIX_texture_coordinate_clamp = glewGetExtension("GL_SGIX_texture_coordinate_clamp");
+#endif /* GL_SGIX_texture_coordinate_clamp */
+#ifdef GL_SGIX_texture_lod_bias
+  GLEW_SGIX_texture_lod_bias = glewGetExtension("GL_SGIX_texture_lod_bias");
+#endif /* GL_SGIX_texture_lod_bias */
+#ifdef GL_SGIX_texture_multi_buffer
+  GLEW_SGIX_texture_multi_buffer = glewGetExtension("GL_SGIX_texture_multi_buffer");
+#endif /* GL_SGIX_texture_multi_buffer */
+#ifdef GL_SGIX_texture_range
+  GLEW_SGIX_texture_range = glewGetExtension("GL_SGIX_texture_range");
+#endif /* GL_SGIX_texture_range */
+#ifdef GL_SGIX_texture_scale_bias
+  GLEW_SGIX_texture_scale_bias = glewGetExtension("GL_SGIX_texture_scale_bias");
+#endif /* GL_SGIX_texture_scale_bias */
+#ifdef GL_SGIX_vertex_preclip
+  GLEW_SGIX_vertex_preclip = glewGetExtension("GL_SGIX_vertex_preclip");
+#endif /* GL_SGIX_vertex_preclip */
+#ifdef GL_SGIX_vertex_preclip_hint
+  GLEW_SGIX_vertex_preclip_hint = glewGetExtension("GL_SGIX_vertex_preclip_hint");
+#endif /* GL_SGIX_vertex_preclip_hint */
+#ifdef GL_SGIX_ycrcb
+  GLEW_SGIX_ycrcb = glewGetExtension("GL_SGIX_ycrcb");
+#endif /* GL_SGIX_ycrcb */
+#ifdef GL_SGI_color_matrix
+  GLEW_SGI_color_matrix = glewGetExtension("GL_SGI_color_matrix");
+#endif /* GL_SGI_color_matrix */
+#ifdef GL_SGI_color_table
+  GLEW_SGI_color_table = glewGetExtension("GL_SGI_color_table");
+  if (glewExperimental || GLEW_SGI_color_table) GLEW_SGI_color_table = !_glewInit_GL_SGI_color_table(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_SGI_color_table */
+#ifdef GL_SGI_texture_color_table
+  GLEW_SGI_texture_color_table = glewGetExtension("GL_SGI_texture_color_table");
+#endif /* GL_SGI_texture_color_table */
+#ifdef GL_SUNX_constant_data
+  GLEW_SUNX_constant_data = glewGetExtension("GL_SUNX_constant_data");
+  if (glewExperimental || GLEW_SUNX_constant_data) GLEW_SUNX_constant_data = !_glewInit_GL_SUNX_constant_data(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_SUNX_constant_data */
+#ifdef GL_SUN_convolution_border_modes
+  GLEW_SUN_convolution_border_modes = glewGetExtension("GL_SUN_convolution_border_modes");
+#endif /* GL_SUN_convolution_border_modes */
+#ifdef GL_SUN_global_alpha
+  GLEW_SUN_global_alpha = glewGetExtension("GL_SUN_global_alpha");
+  if (glewExperimental || GLEW_SUN_global_alpha) GLEW_SUN_global_alpha = !_glewInit_GL_SUN_global_alpha(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_SUN_global_alpha */
+#ifdef GL_SUN_mesh_array
+  GLEW_SUN_mesh_array = glewGetExtension("GL_SUN_mesh_array");
+#endif /* GL_SUN_mesh_array */
+#ifdef GL_SUN_read_video_pixels
+  GLEW_SUN_read_video_pixels = glewGetExtension("GL_SUN_read_video_pixels");
+  if (glewExperimental || GLEW_SUN_read_video_pixels) GLEW_SUN_read_video_pixels = !_glewInit_GL_SUN_read_video_pixels(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_SUN_read_video_pixels */
+#ifdef GL_SUN_slice_accum
+  GLEW_SUN_slice_accum = glewGetExtension("GL_SUN_slice_accum");
+#endif /* GL_SUN_slice_accum */
+#ifdef GL_SUN_triangle_list
+  GLEW_SUN_triangle_list = glewGetExtension("GL_SUN_triangle_list");
+  if (glewExperimental || GLEW_SUN_triangle_list) GLEW_SUN_triangle_list = !_glewInit_GL_SUN_triangle_list(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_SUN_triangle_list */
+#ifdef GL_SUN_vertex
+  GLEW_SUN_vertex = glewGetExtension("GL_SUN_vertex");
+  if (glewExperimental || GLEW_SUN_vertex) GLEW_SUN_vertex = !_glewInit_GL_SUN_vertex(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_SUN_vertex */
+#ifdef GL_WIN_phong_shading
+  GLEW_WIN_phong_shading = glewGetExtension("GL_WIN_phong_shading");
+#endif /* GL_WIN_phong_shading */
+#ifdef GL_WIN_specular_fog
+  GLEW_WIN_specular_fog = glewGetExtension("GL_WIN_specular_fog");
+#endif /* GL_WIN_specular_fog */
+#ifdef GL_WIN_swap_hint
+  GLEW_WIN_swap_hint = glewGetExtension("GL_WIN_swap_hint");
+  if (glewExperimental || GLEW_WIN_swap_hint) GLEW_WIN_swap_hint = !_glewInit_GL_WIN_swap_hint(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GL_WIN_swap_hint */
+
+  return GLEW_OK;
+}
+
+
+#if defined(_WIN32)
+
+#if !defined(GLEW_MX)
+
+PFNWGLSETSTEREOEMITTERSTATE3DLPROC __wglewSetStereoEmitterState3DL = NULL;
+
+PFNWGLCREATEBUFFERREGIONARBPROC __wglewCreateBufferRegionARB = NULL;
+PFNWGLDELETEBUFFERREGIONARBPROC __wglewDeleteBufferRegionARB = NULL;
+PFNWGLRESTOREBUFFERREGIONARBPROC __wglewRestoreBufferRegionARB = NULL;
+PFNWGLSAVEBUFFERREGIONARBPROC __wglewSaveBufferRegionARB = NULL;
+
+PFNWGLGETEXTENSIONSSTRINGARBPROC __wglewGetExtensionsStringARB = NULL;
+
+PFNWGLGETCURRENTREADDCARBPROC __wglewGetCurrentReadDCARB = NULL;
+PFNWGLMAKECONTEXTCURRENTARBPROC __wglewMakeContextCurrentARB = NULL;
+
+PFNWGLCREATEPBUFFERARBPROC __wglewCreatePbufferARB = NULL;
+PFNWGLDESTROYPBUFFERARBPROC __wglewDestroyPbufferARB = NULL;
+PFNWGLGETPBUFFERDCARBPROC __wglewGetPbufferDCARB = NULL;
+PFNWGLQUERYPBUFFERARBPROC __wglewQueryPbufferARB = NULL;
+PFNWGLRELEASEPBUFFERDCARBPROC __wglewReleasePbufferDCARB = NULL;
+
+PFNWGLCHOOSEPIXELFORMATARBPROC __wglewChoosePixelFormatARB = NULL;
+PFNWGLGETPIXELFORMATATTRIBFVARBPROC __wglewGetPixelFormatAttribfvARB = NULL;
+PFNWGLGETPIXELFORMATATTRIBIVARBPROC __wglewGetPixelFormatAttribivARB = NULL;
+
+PFNWGLBINDTEXIMAGEARBPROC __wglewBindTexImageARB = NULL;
+PFNWGLRELEASETEXIMAGEARBPROC __wglewReleaseTexImageARB = NULL;
+PFNWGLSETPBUFFERATTRIBARBPROC __wglewSetPbufferAttribARB = NULL;
+
+PFNWGLBINDDISPLAYCOLORTABLEEXTPROC __wglewBindDisplayColorTableEXT = NULL;
+PFNWGLCREATEDISPLAYCOLORTABLEEXTPROC __wglewCreateDisplayColorTableEXT = NULL;
+PFNWGLDESTROYDISPLAYCOLORTABLEEXTPROC __wglewDestroyDisplayColorTableEXT = NULL;
+PFNWGLLOADDISPLAYCOLORTABLEEXTPROC __wglewLoadDisplayColorTableEXT = NULL;
+
+PFNWGLGETEXTENSIONSSTRINGEXTPROC __wglewGetExtensionsStringEXT = NULL;
+
+PFNWGLGETCURRENTREADDCEXTPROC __wglewGetCurrentReadDCEXT = NULL;
+PFNWGLMAKECONTEXTCURRENTEXTPROC __wglewMakeContextCurrentEXT = NULL;
+
+PFNWGLCREATEPBUFFEREXTPROC __wglewCreatePbufferEXT = NULL;
+PFNWGLDESTROYPBUFFEREXTPROC __wglewDestroyPbufferEXT = NULL;
+PFNWGLGETPBUFFERDCEXTPROC __wglewGetPbufferDCEXT = NULL;
+PFNWGLQUERYPBUFFEREXTPROC __wglewQueryPbufferEXT = NULL;
+PFNWGLRELEASEPBUFFERDCEXTPROC __wglewReleasePbufferDCEXT = NULL;
+
+PFNWGLCHOOSEPIXELFORMATEXTPROC __wglewChoosePixelFormatEXT = NULL;
+PFNWGLGETPIXELFORMATATTRIBFVEXTPROC __wglewGetPixelFormatAttribfvEXT = NULL;
+PFNWGLGETPIXELFORMATATTRIBIVEXTPROC __wglewGetPixelFormatAttribivEXT = NULL;
+
+PFNWGLGETSWAPINTERVALEXTPROC __wglewGetSwapIntervalEXT = NULL;
+PFNWGLSWAPINTERVALEXTPROC __wglewSwapIntervalEXT = NULL;
+
+PFNWGLGETDIGITALVIDEOPARAMETERSI3DPROC __wglewGetDigitalVideoParametersI3D = NULL;
+PFNWGLSETDIGITALVIDEOPARAMETERSI3DPROC __wglewSetDigitalVideoParametersI3D = NULL;
+
+PFNWGLGETGAMMATABLEI3DPROC __wglewGetGammaTableI3D = NULL;
+PFNWGLGETGAMMATABLEPARAMETERSI3DPROC __wglewGetGammaTableParametersI3D = NULL;
+PFNWGLSETGAMMATABLEI3DPROC __wglewSetGammaTableI3D = NULL;
+PFNWGLSETGAMMATABLEPARAMETERSI3DPROC __wglewSetGammaTableParametersI3D = NULL;
+
+PFNWGLDISABLEGENLOCKI3DPROC __wglewDisableGenlockI3D = NULL;
+PFNWGLENABLEGENLOCKI3DPROC __wglewEnableGenlockI3D = NULL;
+PFNWGLGENLOCKSAMPLERATEI3DPROC __wglewGenlockSampleRateI3D = NULL;
+PFNWGLGENLOCKSOURCEDELAYI3DPROC __wglewGenlockSourceDelayI3D = NULL;
+PFNWGLGENLOCKSOURCEEDGEI3DPROC __wglewGenlockSourceEdgeI3D = NULL;
+PFNWGLGENLOCKSOURCEI3DPROC __wglewGenlockSourceI3D = NULL;
+PFNWGLGETGENLOCKSAMPLERATEI3DPROC __wglewGetGenlockSampleRateI3D = NULL;
+PFNWGLGETGENLOCKSOURCEDELAYI3DPROC __wglewGetGenlockSourceDelayI3D = NULL;
+PFNWGLGETGENLOCKSOURCEEDGEI3DPROC __wglewGetGenlockSourceEdgeI3D = NULL;
+PFNWGLGETGENLOCKSOURCEI3DPROC __wglewGetGenlockSourceI3D = NULL;
+PFNWGLISENABLEDGENLOCKI3DPROC __wglewIsEnabledGenlockI3D = NULL;
+PFNWGLQUERYGENLOCKMAXSOURCEDELAYI3DPROC __wglewQueryGenlockMaxSourceDelayI3D = NULL;
+
+PFNWGLASSOCIATEIMAGEBUFFEREVENTSI3DPROC __wglewAssociateImageBufferEventsI3D = NULL;
+PFNWGLCREATEIMAGEBUFFERI3DPROC __wglewCreateImageBufferI3D = NULL;
+PFNWGLDESTROYIMAGEBUFFERI3DPROC __wglewDestroyImageBufferI3D = NULL;
+PFNWGLRELEASEIMAGEBUFFEREVENTSI3DPROC __wglewReleaseImageBufferEventsI3D = NULL;
+
+PFNWGLDISABLEFRAMELOCKI3DPROC __wglewDisableFrameLockI3D = NULL;
+PFNWGLENABLEFRAMELOCKI3DPROC __wglewEnableFrameLockI3D = NULL;
+PFNWGLISENABLEDFRAMELOCKI3DPROC __wglewIsEnabledFrameLockI3D = NULL;
+PFNWGLQUERYFRAMELOCKMASTERI3DPROC __wglewQueryFrameLockMasterI3D = NULL;
+
+PFNWGLBEGINFRAMETRACKINGI3DPROC __wglewBeginFrameTrackingI3D = NULL;
+PFNWGLENDFRAMETRACKINGI3DPROC __wglewEndFrameTrackingI3D = NULL;
+PFNWGLGETFRAMEUSAGEI3DPROC __wglewGetFrameUsageI3D = NULL;
+PFNWGLQUERYFRAMETRACKINGI3DPROC __wglewQueryFrameTrackingI3D = NULL;
+
+PFNWGLALLOCATEMEMORYNVPROC __wglewAllocateMemoryNV = NULL;
+PFNWGLFREEMEMORYNVPROC __wglewFreeMemoryNV = NULL;
+
+PFNWGLGETMSCRATEOMLPROC __wglewGetMscRateOML = NULL;
+PFNWGLGETSYNCVALUESOMLPROC __wglewGetSyncValuesOML = NULL;
+PFNWGLSWAPBUFFERSMSCOMLPROC __wglewSwapBuffersMscOML = NULL;
+PFNWGLSWAPLAYERBUFFERSMSCOMLPROC __wglewSwapLayerBuffersMscOML = NULL;
+PFNWGLWAITFORMSCOMLPROC __wglewWaitForMscOML = NULL;
+PFNWGLWAITFORSBCOMLPROC __wglewWaitForSbcOML = NULL;
+GLboolean __WGLEW_3DFX_multisample = GL_FALSE;
+GLboolean __WGLEW_3DL_stereo_control = GL_FALSE;
+GLboolean __WGLEW_ARB_buffer_region = GL_FALSE;
+GLboolean __WGLEW_ARB_extensions_string = GL_FALSE;
+GLboolean __WGLEW_ARB_make_current_read = GL_FALSE;
+GLboolean __WGLEW_ARB_multisample = GL_FALSE;
+GLboolean __WGLEW_ARB_pbuffer = GL_FALSE;
+GLboolean __WGLEW_ARB_pixel_format = GL_FALSE;
+GLboolean __WGLEW_ARB_pixel_format_float = GL_FALSE;
+GLboolean __WGLEW_ARB_render_texture = GL_FALSE;
+GLboolean __WGLEW_ATI_pixel_format_float = GL_FALSE;
+GLboolean __WGLEW_ATI_render_texture_rectangle = GL_FALSE;
+GLboolean __WGLEW_EXT_depth_float = GL_FALSE;
+GLboolean __WGLEW_EXT_display_color_table = GL_FALSE;
+GLboolean __WGLEW_EXT_extensions_string = GL_FALSE;
+GLboolean __WGLEW_EXT_make_current_read = GL_FALSE;
+GLboolean __WGLEW_EXT_multisample = GL_FALSE;
+GLboolean __WGLEW_EXT_pbuffer = GL_FALSE;
+GLboolean __WGLEW_EXT_pixel_format = GL_FALSE;
+GLboolean __WGLEW_EXT_swap_control = GL_FALSE;
+GLboolean __WGLEW_I3D_digital_video_control = GL_FALSE;
+GLboolean __WGLEW_I3D_gamma = GL_FALSE;
+GLboolean __WGLEW_I3D_genlock = GL_FALSE;
+GLboolean __WGLEW_I3D_image_buffer = GL_FALSE;
+GLboolean __WGLEW_I3D_swap_frame_lock = GL_FALSE;
+GLboolean __WGLEW_I3D_swap_frame_usage = GL_FALSE;
+GLboolean __WGLEW_NV_float_buffer = GL_FALSE;
+GLboolean __WGLEW_NV_render_depth_texture = GL_FALSE;
+GLboolean __WGLEW_NV_render_texture_rectangle = GL_FALSE;
+GLboolean __WGLEW_NV_vertex_array_range = GL_FALSE;
+GLboolean __WGLEW_OML_sync_control = GL_FALSE;
+
+#endif /* !GLEW_MX */
+
+#ifdef WGL_3DFX_multisample
+
+#endif /* WGL_3DFX_multisample */
+
+#ifdef WGL_3DL_stereo_control
+
+static GLboolean _glewInit_WGL_3DL_stereo_control (WGLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglSetStereoEmitterState3DL = (PFNWGLSETSTEREOEMITTERSTATE3DLPROC)glewGetProcAddress((const GLubyte*)"wglSetStereoEmitterState3DL")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_3DL_stereo_control */
+
+#ifdef WGL_ARB_buffer_region
+
+static GLboolean _glewInit_WGL_ARB_buffer_region (WGLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglCreateBufferRegionARB = (PFNWGLCREATEBUFFERREGIONARBPROC)glewGetProcAddress((const GLubyte*)"wglCreateBufferRegionARB")) == NULL) || r;
+  r = ((wglDeleteBufferRegionARB = (PFNWGLDELETEBUFFERREGIONARBPROC)glewGetProcAddress((const GLubyte*)"wglDeleteBufferRegionARB")) == NULL) || r;
+  r = ((wglRestoreBufferRegionARB = (PFNWGLRESTOREBUFFERREGIONARBPROC)glewGetProcAddress((const GLubyte*)"wglRestoreBufferRegionARB")) == NULL) || r;
+  r = ((wglSaveBufferRegionARB = (PFNWGLSAVEBUFFERREGIONARBPROC)glewGetProcAddress((const GLubyte*)"wglSaveBufferRegionARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_ARB_buffer_region */
+
+#ifdef WGL_ARB_extensions_string
+
+static GLboolean _glewInit_WGL_ARB_extensions_string (WGLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglGetExtensionsStringARB = (PFNWGLGETEXTENSIONSSTRINGARBPROC)glewGetProcAddress((const GLubyte*)"wglGetExtensionsStringARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_ARB_extensions_string */
+
+#ifdef WGL_ARB_make_current_read
+
+static GLboolean _glewInit_WGL_ARB_make_current_read (WGLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglGetCurrentReadDCARB = (PFNWGLGETCURRENTREADDCARBPROC)glewGetProcAddress((const GLubyte*)"wglGetCurrentReadDCARB")) == NULL) || r;
+  r = ((wglMakeContextCurrentARB = (PFNWGLMAKECONTEXTCURRENTARBPROC)glewGetProcAddress((const GLubyte*)"wglMakeContextCurrentARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_ARB_make_current_read */
+
+#ifdef WGL_ARB_multisample
+
+#endif /* WGL_ARB_multisample */
+
+#ifdef WGL_ARB_pbuffer
+
+static GLboolean _glewInit_WGL_ARB_pbuffer (WGLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglCreatePbufferARB = (PFNWGLCREATEPBUFFERARBPROC)glewGetProcAddress((const GLubyte*)"wglCreatePbufferARB")) == NULL) || r;
+  r = ((wglDestroyPbufferARB = (PFNWGLDESTROYPBUFFERARBPROC)glewGetProcAddress((const GLubyte*)"wglDestroyPbufferARB")) == NULL) || r;
+  r = ((wglGetPbufferDCARB = (PFNWGLGETPBUFFERDCARBPROC)glewGetProcAddress((const GLubyte*)"wglGetPbufferDCARB")) == NULL) || r;
+  r = ((wglQueryPbufferARB = (PFNWGLQUERYPBUFFERARBPROC)glewGetProcAddress((const GLubyte*)"wglQueryPbufferARB")) == NULL) || r;
+  r = ((wglReleasePbufferDCARB = (PFNWGLRELEASEPBUFFERDCARBPROC)glewGetProcAddress((const GLubyte*)"wglReleasePbufferDCARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_ARB_pbuffer */
+
+#ifdef WGL_ARB_pixel_format
+
+static GLboolean _glewInit_WGL_ARB_pixel_format (WGLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglChoosePixelFormatARB = (PFNWGLCHOOSEPIXELFORMATARBPROC)glewGetProcAddress((const GLubyte*)"wglChoosePixelFormatARB")) == NULL) || r;
+  r = ((wglGetPixelFormatAttribfvARB = (PFNWGLGETPIXELFORMATATTRIBFVARBPROC)glewGetProcAddress((const GLubyte*)"wglGetPixelFormatAttribfvARB")) == NULL) || r;
+  r = ((wglGetPixelFormatAttribivARB = (PFNWGLGETPIXELFORMATATTRIBIVARBPROC)glewGetProcAddress((const GLubyte*)"wglGetPixelFormatAttribivARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_ARB_pixel_format */
+
+#ifdef WGL_ARB_pixel_format_float
+
+#endif /* WGL_ARB_pixel_format_float */
+
+#ifdef WGL_ARB_render_texture
+
+static GLboolean _glewInit_WGL_ARB_render_texture (WGLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglBindTexImageARB = (PFNWGLBINDTEXIMAGEARBPROC)glewGetProcAddress((const GLubyte*)"wglBindTexImageARB")) == NULL) || r;
+  r = ((wglReleaseTexImageARB = (PFNWGLRELEASETEXIMAGEARBPROC)glewGetProcAddress((const GLubyte*)"wglReleaseTexImageARB")) == NULL) || r;
+  r = ((wglSetPbufferAttribARB = (PFNWGLSETPBUFFERATTRIBARBPROC)glewGetProcAddress((const GLubyte*)"wglSetPbufferAttribARB")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_ARB_render_texture */
+
+#ifdef WGL_ATI_pixel_format_float
+
+#endif /* WGL_ATI_pixel_format_float */
+
+#ifdef WGL_ATI_render_texture_rectangle
+
+#endif /* WGL_ATI_render_texture_rectangle */
+
+#ifdef WGL_EXT_depth_float
+
+#endif /* WGL_EXT_depth_float */
+
+#ifdef WGL_EXT_display_color_table
+
+static GLboolean _glewInit_WGL_EXT_display_color_table (WGLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglBindDisplayColorTableEXT = (PFNWGLBINDDISPLAYCOLORTABLEEXTPROC)glewGetProcAddress((const GLubyte*)"wglBindDisplayColorTableEXT")) == NULL) || r;
+  r = ((wglCreateDisplayColorTableEXT = (PFNWGLCREATEDISPLAYCOLORTABLEEXTPROC)glewGetProcAddress((const GLubyte*)"wglCreateDisplayColorTableEXT")) == NULL) || r;
+  r = ((wglDestroyDisplayColorTableEXT = (PFNWGLDESTROYDISPLAYCOLORTABLEEXTPROC)glewGetProcAddress((const GLubyte*)"wglDestroyDisplayColorTableEXT")) == NULL) || r;
+  r = ((wglLoadDisplayColorTableEXT = (PFNWGLLOADDISPLAYCOLORTABLEEXTPROC)glewGetProcAddress((const GLubyte*)"wglLoadDisplayColorTableEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_EXT_display_color_table */
+
+#ifdef WGL_EXT_extensions_string
+
+static GLboolean _glewInit_WGL_EXT_extensions_string (WGLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglGetExtensionsStringEXT = (PFNWGLGETEXTENSIONSSTRINGEXTPROC)glewGetProcAddress((const GLubyte*)"wglGetExtensionsStringEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_EXT_extensions_string */
+
+#ifdef WGL_EXT_make_current_read
+
+static GLboolean _glewInit_WGL_EXT_make_current_read (WGLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglGetCurrentReadDCEXT = (PFNWGLGETCURRENTREADDCEXTPROC)glewGetProcAddress((const GLubyte*)"wglGetCurrentReadDCEXT")) == NULL) || r;
+  r = ((wglMakeContextCurrentEXT = (PFNWGLMAKECONTEXTCURRENTEXTPROC)glewGetProcAddress((const GLubyte*)"wglMakeContextCurrentEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_EXT_make_current_read */
+
+#ifdef WGL_EXT_multisample
+
+#endif /* WGL_EXT_multisample */
+
+#ifdef WGL_EXT_pbuffer
+
+static GLboolean _glewInit_WGL_EXT_pbuffer (WGLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglCreatePbufferEXT = (PFNWGLCREATEPBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"wglCreatePbufferEXT")) == NULL) || r;
+  r = ((wglDestroyPbufferEXT = (PFNWGLDESTROYPBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"wglDestroyPbufferEXT")) == NULL) || r;
+  r = ((wglGetPbufferDCEXT = (PFNWGLGETPBUFFERDCEXTPROC)glewGetProcAddress((const GLubyte*)"wglGetPbufferDCEXT")) == NULL) || r;
+  r = ((wglQueryPbufferEXT = (PFNWGLQUERYPBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"wglQueryPbufferEXT")) == NULL) || r;
+  r = ((wglReleasePbufferDCEXT = (PFNWGLRELEASEPBUFFERDCEXTPROC)glewGetProcAddress((const GLubyte*)"wglReleasePbufferDCEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_EXT_pbuffer */
+
+#ifdef WGL_EXT_pixel_format
+
+static GLboolean _glewInit_WGL_EXT_pixel_format (WGLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglChoosePixelFormatEXT = (PFNWGLCHOOSEPIXELFORMATEXTPROC)glewGetProcAddress((const GLubyte*)"wglChoosePixelFormatEXT")) == NULL) || r;
+  r = ((wglGetPixelFormatAttribfvEXT = (PFNWGLGETPIXELFORMATATTRIBFVEXTPROC)glewGetProcAddress((const GLubyte*)"wglGetPixelFormatAttribfvEXT")) == NULL) || r;
+  r = ((wglGetPixelFormatAttribivEXT = (PFNWGLGETPIXELFORMATATTRIBIVEXTPROC)glewGetProcAddress((const GLubyte*)"wglGetPixelFormatAttribivEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_EXT_pixel_format */
+
+#ifdef WGL_EXT_swap_control
+
+static GLboolean _glewInit_WGL_EXT_swap_control (WGLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglGetSwapIntervalEXT = (PFNWGLGETSWAPINTERVALEXTPROC)glewGetProcAddress((const GLubyte*)"wglGetSwapIntervalEXT")) == NULL) || r;
+  r = ((wglSwapIntervalEXT = (PFNWGLSWAPINTERVALEXTPROC)glewGetProcAddress((const GLubyte*)"wglSwapIntervalEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_EXT_swap_control */
+
+#ifdef WGL_I3D_digital_video_control
+
+static GLboolean _glewInit_WGL_I3D_digital_video_control (WGLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglGetDigitalVideoParametersI3D = (PFNWGLGETDIGITALVIDEOPARAMETERSI3DPROC)glewGetProcAddress((const GLubyte*)"wglGetDigitalVideoParametersI3D")) == NULL) || r;
+  r = ((wglSetDigitalVideoParametersI3D = (PFNWGLSETDIGITALVIDEOPARAMETERSI3DPROC)glewGetProcAddress((const GLubyte*)"wglSetDigitalVideoParametersI3D")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_I3D_digital_video_control */
+
+#ifdef WGL_I3D_gamma
+
+static GLboolean _glewInit_WGL_I3D_gamma (WGLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglGetGammaTableI3D = (PFNWGLGETGAMMATABLEI3DPROC)glewGetProcAddress((const GLubyte*)"wglGetGammaTableI3D")) == NULL) || r;
+  r = ((wglGetGammaTableParametersI3D = (PFNWGLGETGAMMATABLEPARAMETERSI3DPROC)glewGetProcAddress((const GLubyte*)"wglGetGammaTableParametersI3D")) == NULL) || r;
+  r = ((wglSetGammaTableI3D = (PFNWGLSETGAMMATABLEI3DPROC)glewGetProcAddress((const GLubyte*)"wglSetGammaTableI3D")) == NULL) || r;
+  r = ((wglSetGammaTableParametersI3D = (PFNWGLSETGAMMATABLEPARAMETERSI3DPROC)glewGetProcAddress((const GLubyte*)"wglSetGammaTableParametersI3D")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_I3D_gamma */
+
+#ifdef WGL_I3D_genlock
+
+static GLboolean _glewInit_WGL_I3D_genlock (WGLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglDisableGenlockI3D = (PFNWGLDISABLEGENLOCKI3DPROC)glewGetProcAddress((const GLubyte*)"wglDisableGenlockI3D")) == NULL) || r;
+  r = ((wglEnableGenlockI3D = (PFNWGLENABLEGENLOCKI3DPROC)glewGetProcAddress((const GLubyte*)"wglEnableGenlockI3D")) == NULL) || r;
+  r = ((wglGenlockSampleRateI3D = (PFNWGLGENLOCKSAMPLERATEI3DPROC)glewGetProcAddress((const GLubyte*)"wglGenlockSampleRateI3D")) == NULL) || r;
+  r = ((wglGenlockSourceDelayI3D = (PFNWGLGENLOCKSOURCEDELAYI3DPROC)glewGetProcAddress((const GLubyte*)"wglGenlockSourceDelayI3D")) == NULL) || r;
+  r = ((wglGenlockSourceEdgeI3D = (PFNWGLGENLOCKSOURCEEDGEI3DPROC)glewGetProcAddress((const GLubyte*)"wglGenlockSourceEdgeI3D")) == NULL) || r;
+  r = ((wglGenlockSourceI3D = (PFNWGLGENLOCKSOURCEI3DPROC)glewGetProcAddress((const GLubyte*)"wglGenlockSourceI3D")) == NULL) || r;
+  r = ((wglGetGenlockSampleRateI3D = (PFNWGLGETGENLOCKSAMPLERATEI3DPROC)glewGetProcAddress((const GLubyte*)"wglGetGenlockSampleRateI3D")) == NULL) || r;
+  r = ((wglGetGenlockSourceDelayI3D = (PFNWGLGETGENLOCKSOURCEDELAYI3DPROC)glewGetProcAddress((const GLubyte*)"wglGetGenlockSourceDelayI3D")) == NULL) || r;
+  r = ((wglGetGenlockSourceEdgeI3D = (PFNWGLGETGENLOCKSOURCEEDGEI3DPROC)glewGetProcAddress((const GLubyte*)"wglGetGenlockSourceEdgeI3D")) == NULL) || r;
+  r = ((wglGetGenlockSourceI3D = (PFNWGLGETGENLOCKSOURCEI3DPROC)glewGetProcAddress((const GLubyte*)"wglGetGenlockSourceI3D")) == NULL) || r;
+  r = ((wglIsEnabledGenlockI3D = (PFNWGLISENABLEDGENLOCKI3DPROC)glewGetProcAddress((const GLubyte*)"wglIsEnabledGenlockI3D")) == NULL) || r;
+  r = ((wglQueryGenlockMaxSourceDelayI3D = (PFNWGLQUERYGENLOCKMAXSOURCEDELAYI3DPROC)glewGetProcAddress((const GLubyte*)"wglQueryGenlockMaxSourceDelayI3D")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_I3D_genlock */
+
+#ifdef WGL_I3D_image_buffer
+
+static GLboolean _glewInit_WGL_I3D_image_buffer (WGLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglAssociateImageBufferEventsI3D = (PFNWGLASSOCIATEIMAGEBUFFEREVENTSI3DPROC)glewGetProcAddress((const GLubyte*)"wglAssociateImageBufferEventsI3D")) == NULL) || r;
+  r = ((wglCreateImageBufferI3D = (PFNWGLCREATEIMAGEBUFFERI3DPROC)glewGetProcAddress((const GLubyte*)"wglCreateImageBufferI3D")) == NULL) || r;
+  r = ((wglDestroyImageBufferI3D = (PFNWGLDESTROYIMAGEBUFFERI3DPROC)glewGetProcAddress((const GLubyte*)"wglDestroyImageBufferI3D")) == NULL) || r;
+  r = ((wglReleaseImageBufferEventsI3D = (PFNWGLRELEASEIMAGEBUFFEREVENTSI3DPROC)glewGetProcAddress((const GLubyte*)"wglReleaseImageBufferEventsI3D")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_I3D_image_buffer */
+
+#ifdef WGL_I3D_swap_frame_lock
+
+static GLboolean _glewInit_WGL_I3D_swap_frame_lock (WGLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglDisableFrameLockI3D = (PFNWGLDISABLEFRAMELOCKI3DPROC)glewGetProcAddress((const GLubyte*)"wglDisableFrameLockI3D")) == NULL) || r;
+  r = ((wglEnableFrameLockI3D = (PFNWGLENABLEFRAMELOCKI3DPROC)glewGetProcAddress((const GLubyte*)"wglEnableFrameLockI3D")) == NULL) || r;
+  r = ((wglIsEnabledFrameLockI3D = (PFNWGLISENABLEDFRAMELOCKI3DPROC)glewGetProcAddress((const GLubyte*)"wglIsEnabledFrameLockI3D")) == NULL) || r;
+  r = ((wglQueryFrameLockMasterI3D = (PFNWGLQUERYFRAMELOCKMASTERI3DPROC)glewGetProcAddress((const GLubyte*)"wglQueryFrameLockMasterI3D")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_I3D_swap_frame_lock */
+
+#ifdef WGL_I3D_swap_frame_usage
+
+static GLboolean _glewInit_WGL_I3D_swap_frame_usage (WGLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglBeginFrameTrackingI3D = (PFNWGLBEGINFRAMETRACKINGI3DPROC)glewGetProcAddress((const GLubyte*)"wglBeginFrameTrackingI3D")) == NULL) || r;
+  r = ((wglEndFrameTrackingI3D = (PFNWGLENDFRAMETRACKINGI3DPROC)glewGetProcAddress((const GLubyte*)"wglEndFrameTrackingI3D")) == NULL) || r;
+  r = ((wglGetFrameUsageI3D = (PFNWGLGETFRAMEUSAGEI3DPROC)glewGetProcAddress((const GLubyte*)"wglGetFrameUsageI3D")) == NULL) || r;
+  r = ((wglQueryFrameTrackingI3D = (PFNWGLQUERYFRAMETRACKINGI3DPROC)glewGetProcAddress((const GLubyte*)"wglQueryFrameTrackingI3D")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_I3D_swap_frame_usage */
+
+#ifdef WGL_NV_float_buffer
+
+#endif /* WGL_NV_float_buffer */
+
+#ifdef WGL_NV_render_depth_texture
+
+#endif /* WGL_NV_render_depth_texture */
+
+#ifdef WGL_NV_render_texture_rectangle
+
+#endif /* WGL_NV_render_texture_rectangle */
+
+#ifdef WGL_NV_vertex_array_range
+
+static GLboolean _glewInit_WGL_NV_vertex_array_range (WGLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglAllocateMemoryNV = (PFNWGLALLOCATEMEMORYNVPROC)glewGetProcAddress((const GLubyte*)"wglAllocateMemoryNV")) == NULL) || r;
+  r = ((wglFreeMemoryNV = (PFNWGLFREEMEMORYNVPROC)glewGetProcAddress((const GLubyte*)"wglFreeMemoryNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_NV_vertex_array_range */
+
+#ifdef WGL_OML_sync_control
+
+static GLboolean _glewInit_WGL_OML_sync_control (WGLEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((wglGetMscRateOML = (PFNWGLGETMSCRATEOMLPROC)glewGetProcAddress((const GLubyte*)"wglGetMscRateOML")) == NULL) || r;
+  r = ((wglGetSyncValuesOML = (PFNWGLGETSYNCVALUESOMLPROC)glewGetProcAddress((const GLubyte*)"wglGetSyncValuesOML")) == NULL) || r;
+  r = ((wglSwapBuffersMscOML = (PFNWGLSWAPBUFFERSMSCOMLPROC)glewGetProcAddress((const GLubyte*)"wglSwapBuffersMscOML")) == NULL) || r;
+  r = ((wglSwapLayerBuffersMscOML = (PFNWGLSWAPLAYERBUFFERSMSCOMLPROC)glewGetProcAddress((const GLubyte*)"wglSwapLayerBuffersMscOML")) == NULL) || r;
+  r = ((wglWaitForMscOML = (PFNWGLWAITFORMSCOMLPROC)glewGetProcAddress((const GLubyte*)"wglWaitForMscOML")) == NULL) || r;
+  r = ((wglWaitForSbcOML = (PFNWGLWAITFORSBCOMLPROC)glewGetProcAddress((const GLubyte*)"wglWaitForSbcOML")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* WGL_OML_sync_control */
+
+/* ------------------------------------------------------------------------- */
+
+static PFNWGLGETEXTENSIONSSTRINGARBPROC _wglewGetExtensionsStringARB = NULL;
+static PFNWGLGETEXTENSIONSSTRINGEXTPROC _wglewGetExtensionsStringEXT = NULL;
+
+GLboolean wglewGetExtension (const char* name)
+{    
+  GLubyte* p;
+  GLubyte* end;
+  GLuint len = _glewStrLen((const GLubyte*)name);
+  if (_wglewGetExtensionsStringARB == NULL)
+    if (_wglewGetExtensionsStringEXT == NULL)
+      return GL_FALSE;
+    else
+      p = (GLubyte*)_wglewGetExtensionsStringEXT();
+  else
+    p = (GLubyte*)_wglewGetExtensionsStringARB(wglGetCurrentDC());
+  if (0 == p) return GL_FALSE;
+  end = p + _glewStrLen(p);
+  while (p < end)
+  {
+    GLuint n = _glewStrCLen(p, ' ');
+    if (len == n && _glewStrSame((const GLubyte*)name, p, n)) return GL_TRUE;
+    p += n+1;
+  }
+  return GL_FALSE;
+}
+
+GLenum wglewContextInit (WGLEW_CONTEXT_ARG_DEF_LIST)
+{
+  GLboolean crippled;
+  /* find wgl extension string query functions */
+  if (_wglewGetExtensionsStringARB == NULL)
+    _wglewGetExtensionsStringARB = (PFNWGLGETEXTENSIONSSTRINGARBPROC)glewGetProcAddress((const GLubyte*)"wglGetExtensionsStringARB");
+  if (_wglewGetExtensionsStringEXT == NULL)
+    _wglewGetExtensionsStringEXT = (PFNWGLGETEXTENSIONSSTRINGEXTPROC)glewGetProcAddress((const GLubyte*)"wglGetExtensionsStringEXT");
+  /* initialize extensions */
+  crippled = _wglewGetExtensionsStringARB == NULL && _wglewGetExtensionsStringEXT == NULL;
+#ifdef WGL_3DFX_multisample
+  WGLEW_3DFX_multisample = wglewGetExtension("WGL_3DFX_multisample");
+#endif /* WGL_3DFX_multisample */
+#ifdef WGL_3DL_stereo_control
+  WGLEW_3DL_stereo_control = wglewGetExtension("WGL_3DL_stereo_control");
+  if (glewExperimental || WGLEW_3DL_stereo_control|| crippled) WGLEW_3DL_stereo_control= !_glewInit_WGL_3DL_stereo_control(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* WGL_3DL_stereo_control */
+#ifdef WGL_ARB_buffer_region
+  WGLEW_ARB_buffer_region = wglewGetExtension("WGL_ARB_buffer_region");
+  if (glewExperimental || WGLEW_ARB_buffer_region|| crippled) WGLEW_ARB_buffer_region= !_glewInit_WGL_ARB_buffer_region(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* WGL_ARB_buffer_region */
+#ifdef WGL_ARB_extensions_string
+  WGLEW_ARB_extensions_string = wglewGetExtension("WGL_ARB_extensions_string");
+  if (glewExperimental || WGLEW_ARB_extensions_string|| crippled) WGLEW_ARB_extensions_string= !_glewInit_WGL_ARB_extensions_string(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* WGL_ARB_extensions_string */
+#ifdef WGL_ARB_make_current_read
+  WGLEW_ARB_make_current_read = wglewGetExtension("WGL_ARB_make_current_read");
+  if (glewExperimental || WGLEW_ARB_make_current_read|| crippled) WGLEW_ARB_make_current_read= !_glewInit_WGL_ARB_make_current_read(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* WGL_ARB_make_current_read */
+#ifdef WGL_ARB_multisample
+  WGLEW_ARB_multisample = wglewGetExtension("WGL_ARB_multisample");
+#endif /* WGL_ARB_multisample */
+#ifdef WGL_ARB_pbuffer
+  WGLEW_ARB_pbuffer = wglewGetExtension("WGL_ARB_pbuffer");
+  if (glewExperimental || WGLEW_ARB_pbuffer|| crippled) WGLEW_ARB_pbuffer= !_glewInit_WGL_ARB_pbuffer(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* WGL_ARB_pbuffer */
+#ifdef WGL_ARB_pixel_format
+  WGLEW_ARB_pixel_format = wglewGetExtension("WGL_ARB_pixel_format");
+  if (glewExperimental || WGLEW_ARB_pixel_format|| crippled) WGLEW_ARB_pixel_format= !_glewInit_WGL_ARB_pixel_format(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* WGL_ARB_pixel_format */
+#ifdef WGL_ARB_pixel_format_float
+  WGLEW_ARB_pixel_format_float = wglewGetExtension("WGL_ARB_pixel_format_float");
+#endif /* WGL_ARB_pixel_format_float */
+#ifdef WGL_ARB_render_texture
+  WGLEW_ARB_render_texture = wglewGetExtension("WGL_ARB_render_texture");
+  if (glewExperimental || WGLEW_ARB_render_texture|| crippled) WGLEW_ARB_render_texture= !_glewInit_WGL_ARB_render_texture(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* WGL_ARB_render_texture */
+#ifdef WGL_ATI_pixel_format_float
+  WGLEW_ATI_pixel_format_float = wglewGetExtension("WGL_ATI_pixel_format_float");
+#endif /* WGL_ATI_pixel_format_float */
+#ifdef WGL_ATI_render_texture_rectangle
+  WGLEW_ATI_render_texture_rectangle = wglewGetExtension("WGL_ATI_render_texture_rectangle");
+#endif /* WGL_ATI_render_texture_rectangle */
+#ifdef WGL_EXT_depth_float
+  WGLEW_EXT_depth_float = wglewGetExtension("WGL_EXT_depth_float");
+#endif /* WGL_EXT_depth_float */
+#ifdef WGL_EXT_display_color_table
+  WGLEW_EXT_display_color_table = wglewGetExtension("WGL_EXT_display_color_table");
+  if (glewExperimental || WGLEW_EXT_display_color_table|| crippled) WGLEW_EXT_display_color_table= !_glewInit_WGL_EXT_display_color_table(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* WGL_EXT_display_color_table */
+#ifdef WGL_EXT_extensions_string
+  WGLEW_EXT_extensions_string = wglewGetExtension("WGL_EXT_extensions_string");
+  if (glewExperimental || WGLEW_EXT_extensions_string|| crippled) WGLEW_EXT_extensions_string= !_glewInit_WGL_EXT_extensions_string(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* WGL_EXT_extensions_string */
+#ifdef WGL_EXT_make_current_read
+  WGLEW_EXT_make_current_read = wglewGetExtension("WGL_EXT_make_current_read");
+  if (glewExperimental || WGLEW_EXT_make_current_read|| crippled) WGLEW_EXT_make_current_read= !_glewInit_WGL_EXT_make_current_read(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* WGL_EXT_make_current_read */
+#ifdef WGL_EXT_multisample
+  WGLEW_EXT_multisample = wglewGetExtension("WGL_EXT_multisample");
+#endif /* WGL_EXT_multisample */
+#ifdef WGL_EXT_pbuffer
+  WGLEW_EXT_pbuffer = wglewGetExtension("WGL_EXT_pbuffer");
+  if (glewExperimental || WGLEW_EXT_pbuffer|| crippled) WGLEW_EXT_pbuffer= !_glewInit_WGL_EXT_pbuffer(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* WGL_EXT_pbuffer */
+#ifdef WGL_EXT_pixel_format
+  WGLEW_EXT_pixel_format = wglewGetExtension("WGL_EXT_pixel_format");
+  if (glewExperimental || WGLEW_EXT_pixel_format|| crippled) WGLEW_EXT_pixel_format= !_glewInit_WGL_EXT_pixel_format(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* WGL_EXT_pixel_format */
+#ifdef WGL_EXT_swap_control
+  WGLEW_EXT_swap_control = wglewGetExtension("WGL_EXT_swap_control");
+  if (glewExperimental || WGLEW_EXT_swap_control|| crippled) WGLEW_EXT_swap_control= !_glewInit_WGL_EXT_swap_control(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* WGL_EXT_swap_control */
+#ifdef WGL_I3D_digital_video_control
+  WGLEW_I3D_digital_video_control = wglewGetExtension("WGL_I3D_digital_video_control");
+  if (glewExperimental || WGLEW_I3D_digital_video_control|| crippled) WGLEW_I3D_digital_video_control= !_glewInit_WGL_I3D_digital_video_control(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* WGL_I3D_digital_video_control */
+#ifdef WGL_I3D_gamma
+  WGLEW_I3D_gamma = wglewGetExtension("WGL_I3D_gamma");
+  if (glewExperimental || WGLEW_I3D_gamma|| crippled) WGLEW_I3D_gamma= !_glewInit_WGL_I3D_gamma(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* WGL_I3D_gamma */
+#ifdef WGL_I3D_genlock
+  WGLEW_I3D_genlock = wglewGetExtension("WGL_I3D_genlock");
+  if (glewExperimental || WGLEW_I3D_genlock|| crippled) WGLEW_I3D_genlock= !_glewInit_WGL_I3D_genlock(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* WGL_I3D_genlock */
+#ifdef WGL_I3D_image_buffer
+  WGLEW_I3D_image_buffer = wglewGetExtension("WGL_I3D_image_buffer");
+  if (glewExperimental || WGLEW_I3D_image_buffer|| crippled) WGLEW_I3D_image_buffer= !_glewInit_WGL_I3D_image_buffer(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* WGL_I3D_image_buffer */
+#ifdef WGL_I3D_swap_frame_lock
+  WGLEW_I3D_swap_frame_lock = wglewGetExtension("WGL_I3D_swap_frame_lock");
+  if (glewExperimental || WGLEW_I3D_swap_frame_lock|| crippled) WGLEW_I3D_swap_frame_lock= !_glewInit_WGL_I3D_swap_frame_lock(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* WGL_I3D_swap_frame_lock */
+#ifdef WGL_I3D_swap_frame_usage
+  WGLEW_I3D_swap_frame_usage = wglewGetExtension("WGL_I3D_swap_frame_usage");
+  if (glewExperimental || WGLEW_I3D_swap_frame_usage|| crippled) WGLEW_I3D_swap_frame_usage= !_glewInit_WGL_I3D_swap_frame_usage(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* WGL_I3D_swap_frame_usage */
+#ifdef WGL_NV_float_buffer
+  WGLEW_NV_float_buffer = wglewGetExtension("WGL_NV_float_buffer");
+#endif /* WGL_NV_float_buffer */
+#ifdef WGL_NV_render_depth_texture
+  WGLEW_NV_render_depth_texture = wglewGetExtension("WGL_NV_render_depth_texture");
+#endif /* WGL_NV_render_depth_texture */
+#ifdef WGL_NV_render_texture_rectangle
+  WGLEW_NV_render_texture_rectangle = wglewGetExtension("WGL_NV_render_texture_rectangle");
+#endif /* WGL_NV_render_texture_rectangle */
+#ifdef WGL_NV_vertex_array_range
+  WGLEW_NV_vertex_array_range = wglewGetExtension("WGL_NV_vertex_array_range");
+  if (glewExperimental || WGLEW_NV_vertex_array_range|| crippled) WGLEW_NV_vertex_array_range= !_glewInit_WGL_NV_vertex_array_range(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* WGL_NV_vertex_array_range */
+#ifdef WGL_OML_sync_control
+  WGLEW_OML_sync_control = wglewGetExtension("WGL_OML_sync_control");
+  if (glewExperimental || WGLEW_OML_sync_control|| crippled) WGLEW_OML_sync_control= !_glewInit_WGL_OML_sync_control(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* WGL_OML_sync_control */
+
+  return GLEW_OK;
+}
+
+#elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
+
+PFNGLXGETCURRENTDISPLAYPROC __glewXGetCurrentDisplay = NULL;
+
+PFNGLXCHOOSEFBCONFIGPROC __glewXChooseFBConfig = NULL;
+PFNGLXCREATENEWCONTEXTPROC __glewXCreateNewContext = NULL;
+PFNGLXCREATEPBUFFERPROC __glewXCreatePbuffer = NULL;
+PFNGLXCREATEPIXMAPPROC __glewXCreatePixmap = NULL;
+PFNGLXCREATEWINDOWPROC __glewXCreateWindow = NULL;
+PFNGLXDESTROYPBUFFERPROC __glewXDestroyPbuffer = NULL;
+PFNGLXDESTROYPIXMAPPROC __glewXDestroyPixmap = NULL;
+PFNGLXDESTROYWINDOWPROC __glewXDestroyWindow = NULL;
+PFNGLXGETCURRENTREADDRAWABLEPROC __glewXGetCurrentReadDrawable = NULL;
+PFNGLXGETFBCONFIGATTRIBPROC __glewXGetFBConfigAttrib = NULL;
+PFNGLXGETFBCONFIGSPROC __glewXGetFBConfigs = NULL;
+PFNGLXGETSELECTEDEVENTPROC __glewXGetSelectedEvent = NULL;
+PFNGLXGETVISUALFROMFBCONFIGPROC __glewXGetVisualFromFBConfig = NULL;
+PFNGLXMAKECONTEXTCURRENTPROC __glewXMakeContextCurrent = NULL;
+PFNGLXQUERYCONTEXTPROC __glewXQueryContext = NULL;
+PFNGLXQUERYDRAWABLEPROC __glewXQueryDrawable = NULL;
+PFNGLXSELECTEVENTPROC __glewXSelectEvent = NULL;
+
+PFNGLXBINDTEXIMAGEATIPROC __glewXBindTexImageATI = NULL;
+PFNGLXDRAWABLEATTRIBATIPROC __glewXDrawableAttribATI = NULL;
+PFNGLXRELEASETEXIMAGEATIPROC __glewXReleaseTexImageATI = NULL;
+
+PFNGLXFREECONTEXTEXTPROC __glewXFreeContextEXT = NULL;
+PFNGLXGETCONTEXTIDEXTPROC __glewXGetContextIDEXT = NULL;
+PFNGLXIMPORTCONTEXTEXTPROC __glewXImportContextEXT = NULL;
+PFNGLXQUERYCONTEXTINFOEXTPROC __glewXQueryContextInfoEXT = NULL;
+
+PFNGLXGETAGPOFFSETMESAPROC __glewXGetAGPOffsetMESA = NULL;
+
+PFNGLXCOPYSUBBUFFERMESAPROC __glewXCopySubBufferMESA = NULL;
+
+PFNGLXCREATEGLXPIXMAPMESAPROC __glewXCreateGLXPixmapMESA = NULL;
+
+PFNGLXRELEASEBUFFERSMESAPROC __glewXReleaseBuffersMESA = NULL;
+
+PFNGLXSET3DFXMODEMESAPROC __glewXSet3DfxModeMESA = NULL;
+
+PFNGLXALLOCATEMEMORYNVPROC __glewXAllocateMemoryNV = NULL;
+PFNGLXFREEMEMORYNVPROC __glewXFreeMemoryNV = NULL;
+
+#ifdef GLX_OML_sync_control
+PFNGLXGETMSCRATEOMLPROC __glewXGetMscRateOML = NULL;
+PFNGLXGETSYNCVALUESOMLPROC __glewXGetSyncValuesOML = NULL;
+PFNGLXSWAPBUFFERSMSCOMLPROC __glewXSwapBuffersMscOML = NULL;
+PFNGLXWAITFORMSCOMLPROC __glewXWaitForMscOML = NULL;
+PFNGLXWAITFORSBCOMLPROC __glewXWaitForSbcOML = NULL;
+#endif
+
+PFNGLXCHOOSEFBCONFIGSGIXPROC __glewXChooseFBConfigSGIX = NULL;
+PFNGLXCREATECONTEXTWITHCONFIGSGIXPROC __glewXCreateContextWithConfigSGIX = NULL;
+PFNGLXCREATEGLXPIXMAPWITHCONFIGSGIXPROC __glewXCreateGLXPixmapWithConfigSGIX = NULL;
+PFNGLXGETFBCONFIGATTRIBSGIXPROC __glewXGetFBConfigAttribSGIX = NULL;
+PFNGLXGETFBCONFIGFROMVISUALSGIXPROC __glewXGetFBConfigFromVisualSGIX = NULL;
+PFNGLXGETVISUALFROMFBCONFIGSGIXPROC __glewXGetVisualFromFBConfigSGIX = NULL;
+
+PFNGLXCREATEGLXPBUFFERSGIXPROC __glewXCreateGLXPbufferSGIX = NULL;
+PFNGLXDESTROYGLXPBUFFERSGIXPROC __glewXDestroyGLXPbufferSGIX = NULL;
+PFNGLXGETSELECTEDEVENTSGIXPROC __glewXGetSelectedEventSGIX = NULL;
+PFNGLXQUERYGLXPBUFFERSGIXPROC __glewXQueryGLXPbufferSGIX = NULL;
+PFNGLXSELECTEVENTSGIXPROC __glewXSelectEventSGIX = NULL;
+
+PFNGLXBINDSWAPBARRIERSGIXPROC __glewXBindSwapBarrierSGIX = NULL;
+PFNGLXQUERYMAXSWAPBARRIERSSGIXPROC __glewXQueryMaxSwapBarriersSGIX = NULL;
+
+PFNGLXJOINSWAPGROUPSGIXPROC __glewXJoinSwapGroupSGIX = NULL;
+
+PFNGLXBINDCHANNELTOWINDOWSGIXPROC __glewXBindChannelToWindowSGIX = NULL;
+PFNGLXCHANNELRECTSGIXPROC __glewXChannelRectSGIX = NULL;
+PFNGLXCHANNELRECTSYNCSGIXPROC __glewXChannelRectSyncSGIX = NULL;
+PFNGLXQUERYCHANNELDELTASSGIXPROC __glewXQueryChannelDeltasSGIX = NULL;
+PFNGLXQUERYCHANNELRECTSGIXPROC __glewXQueryChannelRectSGIX = NULL;
+
+PFNGLXCUSHIONSGIPROC __glewXCushionSGI = NULL;
+
+PFNGLXGETCURRENTREADDRAWABLESGIPROC __glewXGetCurrentReadDrawableSGI = NULL;
+PFNGLXMAKECURRENTREADSGIPROC __glewXMakeCurrentReadSGI = NULL;
+
+PFNGLXSWAPINTERVALSGIPROC __glewXSwapIntervalSGI = NULL;
+
+PFNGLXGETVIDEOSYNCSGIPROC __glewXGetVideoSyncSGI = NULL;
+PFNGLXWAITVIDEOSYNCSGIPROC __glewXWaitVideoSyncSGI = NULL;
+
+PFNGLXGETTRANSPARENTINDEXSUNPROC __glewXGetTransparentIndexSUN = NULL;
+
+PFNGLXGETVIDEORESIZESUNPROC __glewXGetVideoResizeSUN = NULL;
+PFNGLXVIDEORESIZESUNPROC __glewXVideoResizeSUN = NULL;
+
+#if !defined(GLEW_MX)
+
+GLboolean __GLXEW_VERSION_1_0 = GL_FALSE;
+GLboolean __GLXEW_VERSION_1_1 = GL_FALSE;
+GLboolean __GLXEW_VERSION_1_2 = GL_FALSE;
+GLboolean __GLXEW_VERSION_1_3 = GL_FALSE;
+GLboolean __GLXEW_VERSION_1_4 = GL_FALSE;
+GLboolean __GLXEW_3DFX_multisample = GL_FALSE;
+GLboolean __GLXEW_ARB_fbconfig_float = GL_FALSE;
+GLboolean __GLXEW_ARB_get_proc_address = GL_FALSE;
+GLboolean __GLXEW_ARB_multisample = GL_FALSE;
+GLboolean __GLXEW_ATI_pixel_format_float = GL_FALSE;
+GLboolean __GLXEW_ATI_render_texture = GL_FALSE;
+GLboolean __GLXEW_EXT_import_context = GL_FALSE;
+GLboolean __GLXEW_EXT_scene_marker = GL_FALSE;
+GLboolean __GLXEW_EXT_visual_info = GL_FALSE;
+GLboolean __GLXEW_EXT_visual_rating = GL_FALSE;
+GLboolean __GLXEW_MESA_agp_offset = GL_FALSE;
+GLboolean __GLXEW_MESA_copy_sub_buffer = GL_FALSE;
+GLboolean __GLXEW_MESA_pixmap_colormap = GL_FALSE;
+GLboolean __GLXEW_MESA_release_buffers = GL_FALSE;
+GLboolean __GLXEW_MESA_set_3dfx_mode = GL_FALSE;
+GLboolean __GLXEW_NV_float_buffer = GL_FALSE;
+GLboolean __GLXEW_NV_vertex_array_range = GL_FALSE;
+GLboolean __GLXEW_OML_swap_method = GL_FALSE;
+#ifdef GLX_OML_sync_control
+GLboolean __GLXEW_OML_sync_control = GL_FALSE;
+#endif
+GLboolean __GLXEW_SGIS_blended_overlay = GL_FALSE;
+GLboolean __GLXEW_SGIS_color_range = GL_FALSE;
+GLboolean __GLXEW_SGIS_multisample = GL_FALSE;
+GLboolean __GLXEW_SGIS_shared_multisample = GL_FALSE;
+GLboolean __GLXEW_SGIX_fbconfig = GL_FALSE;
+GLboolean __GLXEW_SGIX_pbuffer = GL_FALSE;
+GLboolean __GLXEW_SGIX_swap_barrier = GL_FALSE;
+GLboolean __GLXEW_SGIX_swap_group = GL_FALSE;
+GLboolean __GLXEW_SGIX_video_resize = GL_FALSE;
+GLboolean __GLXEW_SGIX_visual_select_group = GL_FALSE;
+GLboolean __GLXEW_SGI_cushion = GL_FALSE;
+GLboolean __GLXEW_SGI_make_current_read = GL_FALSE;
+GLboolean __GLXEW_SGI_swap_control = GL_FALSE;
+GLboolean __GLXEW_SGI_video_sync = GL_FALSE;
+GLboolean __GLXEW_SUN_get_transparent_index = GL_FALSE;
+GLboolean __GLXEW_SUN_video_resize = GL_FALSE;
+
+#endif /* !GLEW_MX */
+
+#ifdef GLX_VERSION_1_2
+
+static GLboolean _glewInit_GLX_VERSION_1_2 (GLXEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXGetCurrentDisplay = (PFNGLXGETCURRENTDISPLAYPROC)glewGetProcAddress((const GLubyte*)"glXGetCurrentDisplay")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_VERSION_1_2 */
+
+#ifdef GLX_VERSION_1_3
+
+static GLboolean _glewInit_GLX_VERSION_1_3 (GLXEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXChooseFBConfig = (PFNGLXCHOOSEFBCONFIGPROC)glewGetProcAddress((const GLubyte*)"glXChooseFBConfig")) == NULL) || r;
+  r = ((glXCreateNewContext = (PFNGLXCREATENEWCONTEXTPROC)glewGetProcAddress((const GLubyte*)"glXCreateNewContext")) == NULL) || r;
+  r = ((glXCreatePbuffer = (PFNGLXCREATEPBUFFERPROC)glewGetProcAddress((const GLubyte*)"glXCreatePbuffer")) == NULL) || r;
+  r = ((glXCreatePixmap = (PFNGLXCREATEPIXMAPPROC)glewGetProcAddress((const GLubyte*)"glXCreatePixmap")) == NULL) || r;
+  r = ((glXCreateWindow = (PFNGLXCREATEWINDOWPROC)glewGetProcAddress((const GLubyte*)"glXCreateWindow")) == NULL) || r;
+  r = ((glXDestroyPbuffer = (PFNGLXDESTROYPBUFFERPROC)glewGetProcAddress((const GLubyte*)"glXDestroyPbuffer")) == NULL) || r;
+  r = ((glXDestroyPixmap = (PFNGLXDESTROYPIXMAPPROC)glewGetProcAddress((const GLubyte*)"glXDestroyPixmap")) == NULL) || r;
+  r = ((glXDestroyWindow = (PFNGLXDESTROYWINDOWPROC)glewGetProcAddress((const GLubyte*)"glXDestroyWindow")) == NULL) || r;
+  r = ((glXGetCurrentReadDrawable = (PFNGLXGETCURRENTREADDRAWABLEPROC)glewGetProcAddress((const GLubyte*)"glXGetCurrentReadDrawable")) == NULL) || r;
+  r = ((glXGetFBConfigAttrib = (PFNGLXGETFBCONFIGATTRIBPROC)glewGetProcAddress((const GLubyte*)"glXGetFBConfigAttrib")) == NULL) || r;
+  r = ((glXGetFBConfigs = (PFNGLXGETFBCONFIGSPROC)glewGetProcAddress((const GLubyte*)"glXGetFBConfigs")) == NULL) || r;
+  r = ((glXGetSelectedEvent = (PFNGLXGETSELECTEDEVENTPROC)glewGetProcAddress((const GLubyte*)"glXGetSelectedEvent")) == NULL) || r;
+  r = ((glXGetVisualFromFBConfig = (PFNGLXGETVISUALFROMFBCONFIGPROC)glewGetProcAddress((const GLubyte*)"glXGetVisualFromFBConfig")) == NULL) || r;
+  r = ((glXMakeContextCurrent = (PFNGLXMAKECONTEXTCURRENTPROC)glewGetProcAddress((const GLubyte*)"glXMakeContextCurrent")) == NULL) || r;
+  r = ((glXQueryContext = (PFNGLXQUERYCONTEXTPROC)glewGetProcAddress((const GLubyte*)"glXQueryContext")) == NULL) || r;
+  r = ((glXQueryDrawable = (PFNGLXQUERYDRAWABLEPROC)glewGetProcAddress((const GLubyte*)"glXQueryDrawable")) == NULL) || r;
+  r = ((glXSelectEvent = (PFNGLXSELECTEVENTPROC)glewGetProcAddress((const GLubyte*)"glXSelectEvent")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_VERSION_1_3 */
+
+#ifdef GLX_VERSION_1_4
+
+#endif /* GLX_VERSION_1_4 */
+
+#ifdef GLX_3DFX_multisample
+
+#endif /* GLX_3DFX_multisample */
+
+#ifdef GLX_ARB_fbconfig_float
+
+#endif /* GLX_ARB_fbconfig_float */
+
+#ifdef GLX_ARB_get_proc_address
+
+#endif /* GLX_ARB_get_proc_address */
+
+#ifdef GLX_ARB_multisample
+
+#endif /* GLX_ARB_multisample */
+
+#ifdef GLX_ATI_pixel_format_float
+
+#endif /* GLX_ATI_pixel_format_float */
+
+#ifdef GLX_ATI_render_texture
+
+static GLboolean _glewInit_GLX_ATI_render_texture (GLXEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXBindTexImageATI = (PFNGLXBINDTEXIMAGEATIPROC)glewGetProcAddress((const GLubyte*)"glXBindTexImageATI")) == NULL) || r;
+  r = ((glXDrawableAttribATI = (PFNGLXDRAWABLEATTRIBATIPROC)glewGetProcAddress((const GLubyte*)"glXDrawableAttribATI")) == NULL) || r;
+  r = ((glXReleaseTexImageATI = (PFNGLXRELEASETEXIMAGEATIPROC)glewGetProcAddress((const GLubyte*)"glXReleaseTexImageATI")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_ATI_render_texture */
+
+#ifdef GLX_EXT_import_context
+
+static GLboolean _glewInit_GLX_EXT_import_context (GLXEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXFreeContextEXT = (PFNGLXFREECONTEXTEXTPROC)glewGetProcAddress((const GLubyte*)"glXFreeContextEXT")) == NULL) || r;
+  r = ((glXGetContextIDEXT = (PFNGLXGETCONTEXTIDEXTPROC)glewGetProcAddress((const GLubyte*)"glXGetContextIDEXT")) == NULL) || r;
+  r = ((glXImportContextEXT = (PFNGLXIMPORTCONTEXTEXTPROC)glewGetProcAddress((const GLubyte*)"glXImportContextEXT")) == NULL) || r;
+  r = ((glXQueryContextInfoEXT = (PFNGLXQUERYCONTEXTINFOEXTPROC)glewGetProcAddress((const GLubyte*)"glXQueryContextInfoEXT")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_EXT_import_context */
+
+#ifdef GLX_EXT_scene_marker
+
+#endif /* GLX_EXT_scene_marker */
+
+#ifdef GLX_EXT_visual_info
+
+#endif /* GLX_EXT_visual_info */
+
+#ifdef GLX_EXT_visual_rating
+
+#endif /* GLX_EXT_visual_rating */
+
+#ifdef GLX_MESA_agp_offset
+
+static GLboolean _glewInit_GLX_MESA_agp_offset (GLXEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXGetAGPOffsetMESA = (PFNGLXGETAGPOFFSETMESAPROC)glewGetProcAddress((const GLubyte*)"glXGetAGPOffsetMESA")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_MESA_agp_offset */
+
+#ifdef GLX_MESA_copy_sub_buffer
+
+static GLboolean _glewInit_GLX_MESA_copy_sub_buffer (GLXEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXCopySubBufferMESA = (PFNGLXCOPYSUBBUFFERMESAPROC)glewGetProcAddress((const GLubyte*)"glXCopySubBufferMESA")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_MESA_copy_sub_buffer */
+
+#ifdef GLX_MESA_pixmap_colormap
+
+static GLboolean _glewInit_GLX_MESA_pixmap_colormap (GLXEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXCreateGLXPixmapMESA = (PFNGLXCREATEGLXPIXMAPMESAPROC)glewGetProcAddress((const GLubyte*)"glXCreateGLXPixmapMESA")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_MESA_pixmap_colormap */
+
+#ifdef GLX_MESA_release_buffers
+
+static GLboolean _glewInit_GLX_MESA_release_buffers (GLXEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXReleaseBuffersMESA = (PFNGLXRELEASEBUFFERSMESAPROC)glewGetProcAddress((const GLubyte*)"glXReleaseBuffersMESA")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_MESA_release_buffers */
+
+#ifdef GLX_MESA_set_3dfx_mode
+
+static GLboolean _glewInit_GLX_MESA_set_3dfx_mode (GLXEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXSet3DfxModeMESA = (PFNGLXSET3DFXMODEMESAPROC)glewGetProcAddress((const GLubyte*)"glXSet3DfxModeMESA")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_MESA_set_3dfx_mode */
+
+#ifdef GLX_NV_float_buffer
+
+#endif /* GLX_NV_float_buffer */
+
+#ifdef GLX_NV_vertex_array_range
+
+static GLboolean _glewInit_GLX_NV_vertex_array_range (GLXEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXAllocateMemoryNV = (PFNGLXALLOCATEMEMORYNVPROC)glewGetProcAddress((const GLubyte*)"glXAllocateMemoryNV")) == NULL) || r;
+  r = ((glXFreeMemoryNV = (PFNGLXFREEMEMORYNVPROC)glewGetProcAddress((const GLubyte*)"glXFreeMemoryNV")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_NV_vertex_array_range */
+
+#ifdef GLX_OML_swap_method
+
+#endif /* GLX_OML_swap_method */
+
+#if defined(GLX_OML_sync_control) && defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
+#include <inttypes.h>
+
+static GLboolean _glewInit_GLX_OML_sync_control (GLXEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXGetMscRateOML = (PFNGLXGETMSCRATEOMLPROC)glewGetProcAddress((const GLubyte*)"glXGetMscRateOML")) == NULL) || r;
+  r = ((glXGetSyncValuesOML = (PFNGLXGETSYNCVALUESOMLPROC)glewGetProcAddress((const GLubyte*)"glXGetSyncValuesOML")) == NULL) || r;
+  r = ((glXSwapBuffersMscOML = (PFNGLXSWAPBUFFERSMSCOMLPROC)glewGetProcAddress((const GLubyte*)"glXSwapBuffersMscOML")) == NULL) || r;
+  r = ((glXWaitForMscOML = (PFNGLXWAITFORMSCOMLPROC)glewGetProcAddress((const GLubyte*)"glXWaitForMscOML")) == NULL) || r;
+  r = ((glXWaitForSbcOML = (PFNGLXWAITFORSBCOMLPROC)glewGetProcAddress((const GLubyte*)"glXWaitForSbcOML")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_OML_sync_control */
+
+#ifdef GLX_SGIS_blended_overlay
+
+#endif /* GLX_SGIS_blended_overlay */
+
+#ifdef GLX_SGIS_color_range
+
+#endif /* GLX_SGIS_color_range */
+
+#ifdef GLX_SGIS_multisample
+
+#endif /* GLX_SGIS_multisample */
+
+#ifdef GLX_SGIS_shared_multisample
+
+#endif /* GLX_SGIS_shared_multisample */
+
+#ifdef GLX_SGIX_fbconfig
+
+static GLboolean _glewInit_GLX_SGIX_fbconfig (GLXEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXChooseFBConfigSGIX = (PFNGLXCHOOSEFBCONFIGSGIXPROC)glewGetProcAddress((const GLubyte*)"glXChooseFBConfigSGIX")) == NULL) || r;
+  r = ((glXCreateContextWithConfigSGIX = (PFNGLXCREATECONTEXTWITHCONFIGSGIXPROC)glewGetProcAddress((const GLubyte*)"glXCreateContextWithConfigSGIX")) == NULL) || r;
+  r = ((glXCreateGLXPixmapWithConfigSGIX = (PFNGLXCREATEGLXPIXMAPWITHCONFIGSGIXPROC)glewGetProcAddress((const GLubyte*)"glXCreateGLXPixmapWithConfigSGIX")) == NULL) || r;
+  r = ((glXGetFBConfigAttribSGIX = (PFNGLXGETFBCONFIGATTRIBSGIXPROC)glewGetProcAddress((const GLubyte*)"glXGetFBConfigAttribSGIX")) == NULL) || r;
+  r = ((glXGetFBConfigFromVisualSGIX = (PFNGLXGETFBCONFIGFROMVISUALSGIXPROC)glewGetProcAddress((const GLubyte*)"glXGetFBConfigFromVisualSGIX")) == NULL) || r;
+  r = ((glXGetVisualFromFBConfigSGIX = (PFNGLXGETVISUALFROMFBCONFIGSGIXPROC)glewGetProcAddress((const GLubyte*)"glXGetVisualFromFBConfigSGIX")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_SGIX_fbconfig */
+
+#ifdef GLX_SGIX_pbuffer
+
+static GLboolean _glewInit_GLX_SGIX_pbuffer (GLXEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXCreateGLXPbufferSGIX = (PFNGLXCREATEGLXPBUFFERSGIXPROC)glewGetProcAddress((const GLubyte*)"glXCreateGLXPbufferSGIX")) == NULL) || r;
+  r = ((glXDestroyGLXPbufferSGIX = (PFNGLXDESTROYGLXPBUFFERSGIXPROC)glewGetProcAddress((const GLubyte*)"glXDestroyGLXPbufferSGIX")) == NULL) || r;
+  r = ((glXGetSelectedEventSGIX = (PFNGLXGETSELECTEDEVENTSGIXPROC)glewGetProcAddress((const GLubyte*)"glXGetSelectedEventSGIX")) == NULL) || r;
+  r = ((glXQueryGLXPbufferSGIX = (PFNGLXQUERYGLXPBUFFERSGIXPROC)glewGetProcAddress((const GLubyte*)"glXQueryGLXPbufferSGIX")) == NULL) || r;
+  r = ((glXSelectEventSGIX = (PFNGLXSELECTEVENTSGIXPROC)glewGetProcAddress((const GLubyte*)"glXSelectEventSGIX")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_SGIX_pbuffer */
+
+#ifdef GLX_SGIX_swap_barrier
+
+static GLboolean _glewInit_GLX_SGIX_swap_barrier (GLXEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXBindSwapBarrierSGIX = (PFNGLXBINDSWAPBARRIERSGIXPROC)glewGetProcAddress((const GLubyte*)"glXBindSwapBarrierSGIX")) == NULL) || r;
+  r = ((glXQueryMaxSwapBarriersSGIX = (PFNGLXQUERYMAXSWAPBARRIERSSGIXPROC)glewGetProcAddress((const GLubyte*)"glXQueryMaxSwapBarriersSGIX")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_SGIX_swap_barrier */
+
+#ifdef GLX_SGIX_swap_group
+
+static GLboolean _glewInit_GLX_SGIX_swap_group (GLXEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXJoinSwapGroupSGIX = (PFNGLXJOINSWAPGROUPSGIXPROC)glewGetProcAddress((const GLubyte*)"glXJoinSwapGroupSGIX")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_SGIX_swap_group */
+
+#ifdef GLX_SGIX_video_resize
+
+static GLboolean _glewInit_GLX_SGIX_video_resize (GLXEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXBindChannelToWindowSGIX = (PFNGLXBINDCHANNELTOWINDOWSGIXPROC)glewGetProcAddress((const GLubyte*)"glXBindChannelToWindowSGIX")) == NULL) || r;
+  r = ((glXChannelRectSGIX = (PFNGLXCHANNELRECTSGIXPROC)glewGetProcAddress((const GLubyte*)"glXChannelRectSGIX")) == NULL) || r;
+  r = ((glXChannelRectSyncSGIX = (PFNGLXCHANNELRECTSYNCSGIXPROC)glewGetProcAddress((const GLubyte*)"glXChannelRectSyncSGIX")) == NULL) || r;
+  r = ((glXQueryChannelDeltasSGIX = (PFNGLXQUERYCHANNELDELTASSGIXPROC)glewGetProcAddress((const GLubyte*)"glXQueryChannelDeltasSGIX")) == NULL) || r;
+  r = ((glXQueryChannelRectSGIX = (PFNGLXQUERYCHANNELRECTSGIXPROC)glewGetProcAddress((const GLubyte*)"glXQueryChannelRectSGIX")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_SGIX_video_resize */
+
+#ifdef GLX_SGIX_visual_select_group
+
+#endif /* GLX_SGIX_visual_select_group */
+
+#ifdef GLX_SGI_cushion
+
+static GLboolean _glewInit_GLX_SGI_cushion (GLXEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXCushionSGI = (PFNGLXCUSHIONSGIPROC)glewGetProcAddress((const GLubyte*)"glXCushionSGI")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_SGI_cushion */
+
+#ifdef GLX_SGI_make_current_read
+
+static GLboolean _glewInit_GLX_SGI_make_current_read (GLXEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXGetCurrentReadDrawableSGI = (PFNGLXGETCURRENTREADDRAWABLESGIPROC)glewGetProcAddress((const GLubyte*)"glXGetCurrentReadDrawableSGI")) == NULL) || r;
+  r = ((glXMakeCurrentReadSGI = (PFNGLXMAKECURRENTREADSGIPROC)glewGetProcAddress((const GLubyte*)"glXMakeCurrentReadSGI")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_SGI_make_current_read */
+
+#ifdef GLX_SGI_swap_control
+
+static GLboolean _glewInit_GLX_SGI_swap_control (GLXEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXSwapIntervalSGI = (PFNGLXSWAPINTERVALSGIPROC)glewGetProcAddress((const GLubyte*)"glXSwapIntervalSGI")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_SGI_swap_control */
+
+#ifdef GLX_SGI_video_sync
+
+static GLboolean _glewInit_GLX_SGI_video_sync (GLXEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXGetVideoSyncSGI = (PFNGLXGETVIDEOSYNCSGIPROC)glewGetProcAddress((const GLubyte*)"glXGetVideoSyncSGI")) == NULL) || r;
+  r = ((glXWaitVideoSyncSGI = (PFNGLXWAITVIDEOSYNCSGIPROC)glewGetProcAddress((const GLubyte*)"glXWaitVideoSyncSGI")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_SGI_video_sync */
+
+#ifdef GLX_SUN_get_transparent_index
+
+static GLboolean _glewInit_GLX_SUN_get_transparent_index (GLXEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXGetTransparentIndexSUN = (PFNGLXGETTRANSPARENTINDEXSUNPROC)glewGetProcAddress((const GLubyte*)"glXGetTransparentIndexSUN")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_SUN_get_transparent_index */
+
+#ifdef GLX_SUN_video_resize
+
+static GLboolean _glewInit_GLX_SUN_video_resize (GLXEW_CONTEXT_ARG_DEF_INIT)
+{
+  GLboolean r = GL_FALSE;
+
+  r = ((glXGetVideoResizeSUN = (PFNGLXGETVIDEORESIZESUNPROC)glewGetProcAddress((const GLubyte*)"glXGetVideoResizeSUN")) == NULL) || r;
+  r = ((glXVideoResizeSUN = (PFNGLXVIDEORESIZESUNPROC)glewGetProcAddress((const GLubyte*)"glXVideoResizeSUN")) == NULL) || r;
+
+  return r;
+}
+
+#endif /* GLX_SUN_video_resize */
+
+/* ------------------------------------------------------------------------ */
+
+GLboolean glxewGetExtension (const char* name)
+{    
+  GLubyte* p;
+  GLubyte* end;
+  GLuint len = _glewStrLen((const GLubyte*)name);
+/*   if (glXQueryExtensionsString == NULL || glXGetCurrentDisplay == NULL) return GL_FALSE; */
+/*   p = (GLubyte*)glXQueryExtensionsString(glXGetCurrentDisplay(), DefaultScreen(glXGetCurrentDisplay())); */
+  if (glXGetClientString == NULL || glXGetCurrentDisplay == NULL) return GL_FALSE;
+  p = (GLubyte*)glXGetClientString(glXGetCurrentDisplay(), GLX_EXTENSIONS);
+  if (0 == p) return GL_FALSE;
+  end = p + _glewStrLen(p);
+  while (p < end)
+  {
+    GLuint n = _glewStrCLen(p, ' ');
+    if (len == n && _glewStrSame((const GLubyte*)name, p, n)) return GL_TRUE;
+    p += n+1;
+  }
+  return GL_FALSE;
+}
+
+GLenum glxewContextInit (GLXEW_CONTEXT_ARG_DEF_LIST)
+{
+  int major, minor;
+  /* initialize core GLX 1.2 */
+  if (_glewInit_GLX_VERSION_1_2(GLEW_CONTEXT_ARG_VAR_INIT)) return GLEW_ERROR_GLX_VERSION_11_ONLY;
+  /* initialize flags */
+  GLXEW_VERSION_1_0 = GL_TRUE;
+  GLXEW_VERSION_1_1 = GL_TRUE;
+  GLXEW_VERSION_1_2 = GL_TRUE;
+  GLXEW_VERSION_1_3 = GL_TRUE;
+  GLXEW_VERSION_1_4 = GL_TRUE;
+  /* query GLX version */
+  glXQueryVersion(glXGetCurrentDisplay(), &major, &minor);
+  if (major == 1 && minor <= 3)
+  {
+    switch (minor)
+    {
+      case 3:
+      GLXEW_VERSION_1_4 = GL_FALSE;
+      break;
+      case 2:
+      GLXEW_VERSION_1_4 = GL_FALSE;
+      GLXEW_VERSION_1_3 = GL_FALSE;
+      break;
+      default:
+      return GLEW_ERROR_GLX_VERSION_11_ONLY;
+      break;
+    }
+  }
+  /* initialize extensions */
+#ifdef GLX_VERSION_1_3
+  if (glewExperimental || GLXEW_VERSION_1_3) GLXEW_VERSION_1_3 = !_glewInit_GLX_VERSION_1_3(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GLX_VERSION_1_3 */
+#ifdef GLX_3DFX_multisample
+  GLXEW_3DFX_multisample = glxewGetExtension("GLX_3DFX_multisample");
+#endif /* GLX_3DFX_multisample */
+#ifdef GLX_ARB_fbconfig_float
+  GLXEW_ARB_fbconfig_float = glxewGetExtension("GLX_ARB_fbconfig_float");
+#endif /* GLX_ARB_fbconfig_float */
+#ifdef GLX_ARB_get_proc_address
+  GLXEW_ARB_get_proc_address = glxewGetExtension("GLX_ARB_get_proc_address");
+#endif /* GLX_ARB_get_proc_address */
+#ifdef GLX_ARB_multisample
+  GLXEW_ARB_multisample = glxewGetExtension("GLX_ARB_multisample");
+#endif /* GLX_ARB_multisample */
+#ifdef GLX_ATI_pixel_format_float
+  GLXEW_ATI_pixel_format_float = glxewGetExtension("GLX_ATI_pixel_format_float");
+#endif /* GLX_ATI_pixel_format_float */
+#ifdef GLX_ATI_render_texture
+  GLXEW_ATI_render_texture = glxewGetExtension("GLX_ATI_render_texture");
+  if (glewExperimental || GLXEW_ATI_render_texture) GLXEW_ATI_render_texture = !_glewInit_GLX_ATI_render_texture(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GLX_ATI_render_texture */
+#ifdef GLX_EXT_import_context
+  GLXEW_EXT_import_context = glxewGetExtension("GLX_EXT_import_context");
+  if (glewExperimental || GLXEW_EXT_import_context) GLXEW_EXT_import_context = !_glewInit_GLX_EXT_import_context(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GLX_EXT_import_context */
+#ifdef GLX_EXT_scene_marker
+  GLXEW_EXT_scene_marker = glxewGetExtension("GLX_EXT_scene_marker");
+#endif /* GLX_EXT_scene_marker */
+#ifdef GLX_EXT_visual_info
+  GLXEW_EXT_visual_info = glxewGetExtension("GLX_EXT_visual_info");
+#endif /* GLX_EXT_visual_info */
+#ifdef GLX_EXT_visual_rating
+  GLXEW_EXT_visual_rating = glxewGetExtension("GLX_EXT_visual_rating");
+#endif /* GLX_EXT_visual_rating */
+#ifdef GLX_MESA_agp_offset
+  GLXEW_MESA_agp_offset = glxewGetExtension("GLX_MESA_agp_offset");
+  if (glewExperimental || GLXEW_MESA_agp_offset) GLXEW_MESA_agp_offset = !_glewInit_GLX_MESA_agp_offset(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GLX_MESA_agp_offset */
+#ifdef GLX_MESA_copy_sub_buffer
+  GLXEW_MESA_copy_sub_buffer = glxewGetExtension("GLX_MESA_copy_sub_buffer");
+  if (glewExperimental || GLXEW_MESA_copy_sub_buffer) GLXEW_MESA_copy_sub_buffer = !_glewInit_GLX_MESA_copy_sub_buffer(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GLX_MESA_copy_sub_buffer */
+#ifdef GLX_MESA_pixmap_colormap
+  GLXEW_MESA_pixmap_colormap = glxewGetExtension("GLX_MESA_pixmap_colormap");
+  if (glewExperimental || GLXEW_MESA_pixmap_colormap) GLXEW_MESA_pixmap_colormap = !_glewInit_GLX_MESA_pixmap_colormap(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GLX_MESA_pixmap_colormap */
+#ifdef GLX_MESA_release_buffers
+  GLXEW_MESA_release_buffers = glxewGetExtension("GLX_MESA_release_buffers");
+  if (glewExperimental || GLXEW_MESA_release_buffers) GLXEW_MESA_release_buffers = !_glewInit_GLX_MESA_release_buffers(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GLX_MESA_release_buffers */
+#ifdef GLX_MESA_set_3dfx_mode
+  GLXEW_MESA_set_3dfx_mode = glxewGetExtension("GLX_MESA_set_3dfx_mode");
+  if (glewExperimental || GLXEW_MESA_set_3dfx_mode) GLXEW_MESA_set_3dfx_mode = !_glewInit_GLX_MESA_set_3dfx_mode(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GLX_MESA_set_3dfx_mode */
+#ifdef GLX_NV_float_buffer
+  GLXEW_NV_float_buffer = glxewGetExtension("GLX_NV_float_buffer");
+#endif /* GLX_NV_float_buffer */
+#ifdef GLX_NV_vertex_array_range
+  GLXEW_NV_vertex_array_range = glxewGetExtension("GLX_NV_vertex_array_range");
+  if (glewExperimental || GLXEW_NV_vertex_array_range) GLXEW_NV_vertex_array_range = !_glewInit_GLX_NV_vertex_array_range(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GLX_NV_vertex_array_range */
+#ifdef GLX_OML_swap_method
+  GLXEW_OML_swap_method = glxewGetExtension("GLX_OML_swap_method");
+#endif /* GLX_OML_swap_method */
+#if defined(GLX_OML_sync_control) && defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
+#include <inttypes.h>
+  GLXEW_OML_sync_control = glxewGetExtension("GLX_OML_sync_control");
+  if (glewExperimental || GLXEW_OML_sync_control) GLXEW_OML_sync_control = !_glewInit_GLX_OML_sync_control(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GLX_OML_sync_control */
+#ifdef GLX_SGIS_blended_overlay
+  GLXEW_SGIS_blended_overlay = glxewGetExtension("GLX_SGIS_blended_overlay");
+#endif /* GLX_SGIS_blended_overlay */
+#ifdef GLX_SGIS_color_range
+  GLXEW_SGIS_color_range = glxewGetExtension("GLX_SGIS_color_range");
+#endif /* GLX_SGIS_color_range */
+#ifdef GLX_SGIS_multisample
+  GLXEW_SGIS_multisample = glxewGetExtension("GLX_SGIS_multisample");
+#endif /* GLX_SGIS_multisample */
+#ifdef GLX_SGIS_shared_multisample
+  GLXEW_SGIS_shared_multisample = glxewGetExtension("GLX_SGIS_shared_multisample");
+#endif /* GLX_SGIS_shared_multisample */
+#ifdef GLX_SGIX_fbconfig
+  GLXEW_SGIX_fbconfig = glxewGetExtension("GLX_SGIX_fbconfig");
+  if (glewExperimental || GLXEW_SGIX_fbconfig) GLXEW_SGIX_fbconfig = !_glewInit_GLX_SGIX_fbconfig(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GLX_SGIX_fbconfig */
+#ifdef GLX_SGIX_pbuffer
+  GLXEW_SGIX_pbuffer = glxewGetExtension("GLX_SGIX_pbuffer");
+  if (glewExperimental || GLXEW_SGIX_pbuffer) GLXEW_SGIX_pbuffer = !_glewInit_GLX_SGIX_pbuffer(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GLX_SGIX_pbuffer */
+#ifdef GLX_SGIX_swap_barrier
+  GLXEW_SGIX_swap_barrier = glxewGetExtension("GLX_SGIX_swap_barrier");
+  if (glewExperimental || GLXEW_SGIX_swap_barrier) GLXEW_SGIX_swap_barrier = !_glewInit_GLX_SGIX_swap_barrier(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GLX_SGIX_swap_barrier */
+#ifdef GLX_SGIX_swap_group
+  GLXEW_SGIX_swap_group = glxewGetExtension("GLX_SGIX_swap_group");
+  if (glewExperimental || GLXEW_SGIX_swap_group) GLXEW_SGIX_swap_group = !_glewInit_GLX_SGIX_swap_group(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GLX_SGIX_swap_group */
+#ifdef GLX_SGIX_video_resize
+  GLXEW_SGIX_video_resize = glxewGetExtension("GLX_SGIX_video_resize");
+  if (glewExperimental || GLXEW_SGIX_video_resize) GLXEW_SGIX_video_resize = !_glewInit_GLX_SGIX_video_resize(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GLX_SGIX_video_resize */
+#ifdef GLX_SGIX_visual_select_group
+  GLXEW_SGIX_visual_select_group = glxewGetExtension("GLX_SGIX_visual_select_group");
+#endif /* GLX_SGIX_visual_select_group */
+#ifdef GLX_SGI_cushion
+  GLXEW_SGI_cushion = glxewGetExtension("GLX_SGI_cushion");
+  if (glewExperimental || GLXEW_SGI_cushion) GLXEW_SGI_cushion = !_glewInit_GLX_SGI_cushion(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GLX_SGI_cushion */
+#ifdef GLX_SGI_make_current_read
+  GLXEW_SGI_make_current_read = glxewGetExtension("GLX_SGI_make_current_read");
+  if (glewExperimental || GLXEW_SGI_make_current_read) GLXEW_SGI_make_current_read = !_glewInit_GLX_SGI_make_current_read(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GLX_SGI_make_current_read */
+#ifdef GLX_SGI_swap_control
+  GLXEW_SGI_swap_control = glxewGetExtension("GLX_SGI_swap_control");
+  if (glewExperimental || GLXEW_SGI_swap_control) GLXEW_SGI_swap_control = !_glewInit_GLX_SGI_swap_control(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GLX_SGI_swap_control */
+#ifdef GLX_SGI_video_sync
+  GLXEW_SGI_video_sync = glxewGetExtension("GLX_SGI_video_sync");
+  if (glewExperimental || GLXEW_SGI_video_sync) GLXEW_SGI_video_sync = !_glewInit_GLX_SGI_video_sync(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GLX_SGI_video_sync */
+#ifdef GLX_SUN_get_transparent_index
+  GLXEW_SUN_get_transparent_index = glxewGetExtension("GLX_SUN_get_transparent_index");
+  if (glewExperimental || GLXEW_SUN_get_transparent_index) GLXEW_SUN_get_transparent_index = !_glewInit_GLX_SUN_get_transparent_index(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GLX_SUN_get_transparent_index */
+#ifdef GLX_SUN_video_resize
+  GLXEW_SUN_video_resize = glxewGetExtension("GLX_SUN_video_resize");
+  if (glewExperimental || GLXEW_SUN_video_resize) GLXEW_SUN_video_resize = !_glewInit_GLX_SUN_video_resize(GLEW_CONTEXT_ARG_VAR_INIT);
+#endif /* GLX_SUN_video_resize */
+
+  return GLEW_OK;
+}
+
+#endif /* !__APPLE__ || GLEW_APPLE_GLX */
+
+/* ------------------------------------------------------------------------ */
+
+const GLubyte* glewGetErrorString (GLenum error)
+{
+  static const GLubyte* _glewErrorString[] =
+  {
+    (const GLubyte*)"No error",
+    (const GLubyte*)"Missing GL version",
+    (const GLubyte*)"GL 1.1 and up are not supported",
+    (const GLubyte*)"GLX 1.2 and up are not supported",
+    (const GLubyte*)"Unknown error"
+  };
+  const int max_error = sizeof(_glewErrorString)/sizeof(*_glewErrorString) - 1;
+  return _glewErrorString[(int)error > max_error ? max_error : (int)error];
+}
+
+const GLubyte* glewGetString (GLenum name)
+{
+  static const GLubyte* _glewString[] =
+  {
+    (const GLubyte*)NULL,
+    (const GLubyte*)"1.3.4"
+  };
+  const int max_string = sizeof(_glewString)/sizeof(*_glewString) - 1;
+  return _glewString[(int)name > max_string ? 0 : (int)name];
+}
+
+/* ------------------------------------------------------------------------ */
+
+GLboolean glewExperimental = GL_FALSE;
+
+#if !defined(GLEW_MX)
+
+#if defined(_WIN32)
+extern GLenum wglewContextInit (void);
+#elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX) /* _UNIX */
+extern GLenum glxewContextInit (void);
+#endif /* _WIN32 */
+
+GLenum glewInit ()
+{
+  GLenum r;
+  if ( (r = glewContextInit()) ) return r;
+#if defined(_WIN32)
+  return wglewContextInit();
+#elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX) /* _UNIX */
+  return glxewContextInit();
+#else
+  return r;
+#endif /* _WIN32 */
+}
+
+#endif /* !GLEW_MX */
+#ifdef GLEW_MX
+GLboolean glewContextIsSupported (GLEWContext* ctx, const char* name)
+#else
+GLboolean glewIsSupported (const char* name)
+#endif
+{
+  GLubyte* pos = (GLubyte*)name;
+  GLuint len = _glewStrLen(pos);
+  GLboolean ret = GL_TRUE;
+  while (ret && len > 0)
+  {
+    if (_glewStrSame1(&pos, &len, (const GLubyte*)"GL_", 3))
+    {
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"VERSION_", 8))
+      {
+#ifdef GL_VERSION_1_2
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"1_2", 3))
+        {
+          ret = GLEW_VERSION_1_2;
+          continue;
+        }
+#endif
+#ifdef GL_VERSION_1_3
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"1_3", 3))
+        {
+          ret = GLEW_VERSION_1_3;
+          continue;
+        }
+#endif
+#ifdef GL_VERSION_1_4
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"1_4", 3))
+        {
+          ret = GLEW_VERSION_1_4;
+          continue;
+        }
+#endif
+#ifdef GL_VERSION_1_5
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"1_5", 3))
+        {
+          ret = GLEW_VERSION_1_5;
+          continue;
+        }
+#endif
+#ifdef GL_VERSION_2_0
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"2_0", 3))
+        {
+          ret = GLEW_VERSION_2_0;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"3DFX_", 5))
+      {
+#ifdef GL_3DFX_multisample
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11))
+        {
+          ret = GLEW_3DFX_multisample;
+          continue;
+        }
+#endif
+#ifdef GL_3DFX_tbuffer
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"tbuffer", 7))
+        {
+          ret = GLEW_3DFX_tbuffer;
+          continue;
+        }
+#endif
+#ifdef GL_3DFX_texture_compression_FXT1
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_FXT1", 24))
+        {
+          ret = GLEW_3DFX_texture_compression_FXT1;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"APPLE_", 6))
+      {
+#ifdef GL_APPLE_client_storage
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"client_storage", 14))
+        {
+          ret = GLEW_APPLE_client_storage;
+          continue;
+        }
+#endif
+#ifdef GL_APPLE_element_array
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"element_array", 13))
+        {
+          ret = GLEW_APPLE_element_array;
+          continue;
+        }
+#endif
+#ifdef GL_APPLE_fence
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fence", 5))
+        {
+          ret = GLEW_APPLE_fence;
+          continue;
+        }
+#endif
+#ifdef GL_APPLE_float_pixels
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"float_pixels", 12))
+        {
+          ret = GLEW_APPLE_float_pixels;
+          continue;
+        }
+#endif
+#ifdef GL_APPLE_pixel_buffer
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_buffer", 12))
+        {
+          ret = GLEW_APPLE_pixel_buffer;
+          continue;
+        }
+#endif
+#ifdef GL_APPLE_specular_vector
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"specular_vector", 15))
+        {
+          ret = GLEW_APPLE_specular_vector;
+          continue;
+        }
+#endif
+#ifdef GL_APPLE_texture_range
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_range", 13))
+        {
+          ret = GLEW_APPLE_texture_range;
+          continue;
+        }
+#endif
+#ifdef GL_APPLE_transform_hint
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"transform_hint", 14))
+        {
+          ret = GLEW_APPLE_transform_hint;
+          continue;
+        }
+#endif
+#ifdef GL_APPLE_vertex_array_object
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_object", 19))
+        {
+          ret = GLEW_APPLE_vertex_array_object;
+          continue;
+        }
+#endif
+#ifdef GL_APPLE_vertex_array_range
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_range", 18))
+        {
+          ret = GLEW_APPLE_vertex_array_range;
+          continue;
+        }
+#endif
+#ifdef GL_APPLE_ycbcr_422
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"ycbcr_422", 9))
+        {
+          ret = GLEW_APPLE_ycbcr_422;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"ARB_", 4))
+      {
+#ifdef GL_ARB_color_buffer_float
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"color_buffer_float", 18))
+        {
+          ret = GLEW_ARB_color_buffer_float;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_depth_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"depth_texture", 13))
+        {
+          ret = GLEW_ARB_depth_texture;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_draw_buffers
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"draw_buffers", 12))
+        {
+          ret = GLEW_ARB_draw_buffers;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_fragment_program
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_program", 16))
+        {
+          ret = GLEW_ARB_fragment_program;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_fragment_program_shadow
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_program_shadow", 23))
+        {
+          ret = GLEW_ARB_fragment_program_shadow;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_fragment_shader
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_shader", 15))
+        {
+          ret = GLEW_ARB_fragment_shader;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_half_float_pixel
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"half_float_pixel", 16))
+        {
+          ret = GLEW_ARB_half_float_pixel;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_imaging
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"imaging", 7))
+        {
+          ret = GLEW_ARB_imaging;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_matrix_palette
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"matrix_palette", 14))
+        {
+          ret = GLEW_ARB_matrix_palette;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_multisample
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11))
+        {
+          ret = GLEW_ARB_multisample;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_multitexture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multitexture", 12))
+        {
+          ret = GLEW_ARB_multitexture;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_occlusion_query
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"occlusion_query", 15))
+        {
+          ret = GLEW_ARB_occlusion_query;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_pixel_buffer_object
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_buffer_object", 19))
+        {
+          ret = GLEW_ARB_pixel_buffer_object;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_point_parameters
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"point_parameters", 16))
+        {
+          ret = GLEW_ARB_point_parameters;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_point_sprite
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"point_sprite", 12))
+        {
+          ret = GLEW_ARB_point_sprite;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_shader_objects
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_objects", 14))
+        {
+          ret = GLEW_ARB_shader_objects;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_shading_language_100
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shading_language_100", 20))
+        {
+          ret = GLEW_ARB_shading_language_100;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_shadow
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shadow", 6))
+        {
+          ret = GLEW_ARB_shadow;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_shadow_ambient
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shadow_ambient", 14))
+        {
+          ret = GLEW_ARB_shadow_ambient;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_texture_border_clamp
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_border_clamp", 20))
+        {
+          ret = GLEW_ARB_texture_border_clamp;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_texture_compression
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression", 19))
+        {
+          ret = GLEW_ARB_texture_compression;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_texture_cube_map
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_cube_map", 16))
+        {
+          ret = GLEW_ARB_texture_cube_map;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_texture_env_add
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_add", 15))
+        {
+          ret = GLEW_ARB_texture_env_add;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_texture_env_combine
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_combine", 19))
+        {
+          ret = GLEW_ARB_texture_env_combine;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_texture_env_crossbar
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_crossbar", 20))
+        {
+          ret = GLEW_ARB_texture_env_crossbar;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_texture_env_dot3
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_dot3", 16))
+        {
+          ret = GLEW_ARB_texture_env_dot3;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_texture_float
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_float", 13))
+        {
+          ret = GLEW_ARB_texture_float;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_texture_mirrored_repeat
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_mirrored_repeat", 23))
+        {
+          ret = GLEW_ARB_texture_mirrored_repeat;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_texture_non_power_of_two
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_non_power_of_two", 24))
+        {
+          ret = GLEW_ARB_texture_non_power_of_two;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_texture_rectangle
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_rectangle", 17))
+        {
+          ret = GLEW_ARB_texture_rectangle;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_transpose_matrix
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"transpose_matrix", 16))
+        {
+          ret = GLEW_ARB_transpose_matrix;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_vertex_blend
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_blend", 12))
+        {
+          ret = GLEW_ARB_vertex_blend;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_vertex_buffer_object
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_buffer_object", 20))
+        {
+          ret = GLEW_ARB_vertex_buffer_object;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_vertex_program
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_program", 14))
+        {
+          ret = GLEW_ARB_vertex_program;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_vertex_shader
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_shader", 13))
+        {
+          ret = GLEW_ARB_vertex_shader;
+          continue;
+        }
+#endif
+#ifdef GL_ARB_window_pos
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"window_pos", 10))
+        {
+          ret = GLEW_ARB_window_pos;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"ATIX_", 5))
+      {
+#ifdef GL_ATIX_point_sprites
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"point_sprites", 13))
+        {
+          ret = GLEW_ATIX_point_sprites;
+          continue;
+        }
+#endif
+#ifdef GL_ATIX_texture_env_combine3
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_combine3", 20))
+        {
+          ret = GLEW_ATIX_texture_env_combine3;
+          continue;
+        }
+#endif
+#ifdef GL_ATIX_texture_env_route
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_route", 17))
+        {
+          ret = GLEW_ATIX_texture_env_route;
+          continue;
+        }
+#endif
+#ifdef GL_ATIX_vertex_shader_output_point_size
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_shader_output_point_size", 31))
+        {
+          ret = GLEW_ATIX_vertex_shader_output_point_size;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"ATI_", 4))
+      {
+#ifdef GL_ATI_draw_buffers
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"draw_buffers", 12))
+        {
+          ret = GLEW_ATI_draw_buffers;
+          continue;
+        }
+#endif
+#ifdef GL_ATI_element_array
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"element_array", 13))
+        {
+          ret = GLEW_ATI_element_array;
+          continue;
+        }
+#endif
+#ifdef GL_ATI_envmap_bumpmap
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"envmap_bumpmap", 14))
+        {
+          ret = GLEW_ATI_envmap_bumpmap;
+          continue;
+        }
+#endif
+#ifdef GL_ATI_fragment_shader
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_shader", 15))
+        {
+          ret = GLEW_ATI_fragment_shader;
+          continue;
+        }
+#endif
+#ifdef GL_ATI_map_object_buffer
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"map_object_buffer", 17))
+        {
+          ret = GLEW_ATI_map_object_buffer;
+          continue;
+        }
+#endif
+#ifdef GL_ATI_pn_triangles
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pn_triangles", 12))
+        {
+          ret = GLEW_ATI_pn_triangles;
+          continue;
+        }
+#endif
+#ifdef GL_ATI_separate_stencil
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"separate_stencil", 16))
+        {
+          ret = GLEW_ATI_separate_stencil;
+          continue;
+        }
+#endif
+#ifdef GL_ATI_text_fragment_shader
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"text_fragment_shader", 20))
+        {
+          ret = GLEW_ATI_text_fragment_shader;
+          continue;
+        }
+#endif
+#ifdef GL_ATI_texture_compression_3dc
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_3dc", 23))
+        {
+          ret = GLEW_ATI_texture_compression_3dc;
+          continue;
+        }
+#endif
+#ifdef GL_ATI_texture_env_combine3
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_combine3", 20))
+        {
+          ret = GLEW_ATI_texture_env_combine3;
+          continue;
+        }
+#endif
+#ifdef GL_ATI_texture_float
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_float", 13))
+        {
+          ret = GLEW_ATI_texture_float;
+          continue;
+        }
+#endif
+#ifdef GL_ATI_texture_mirror_once
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_mirror_once", 19))
+        {
+          ret = GLEW_ATI_texture_mirror_once;
+          continue;
+        }
+#endif
+#ifdef GL_ATI_vertex_array_object
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_object", 19))
+        {
+          ret = GLEW_ATI_vertex_array_object;
+          continue;
+        }
+#endif
+#ifdef GL_ATI_vertex_attrib_array_object
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_attrib_array_object", 26))
+        {
+          ret = GLEW_ATI_vertex_attrib_array_object;
+          continue;
+        }
+#endif
+#ifdef GL_ATI_vertex_streams
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_streams", 14))
+        {
+          ret = GLEW_ATI_vertex_streams;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"EXT_", 4))
+      {
+#ifdef GL_EXT_422_pixels
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"422_pixels", 10))
+        {
+          ret = GLEW_EXT_422_pixels;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_Cg_shader
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"Cg_shader", 9))
+        {
+          ret = GLEW_EXT_Cg_shader;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_abgr
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"abgr", 4))
+        {
+          ret = GLEW_EXT_abgr;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_bgra
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"bgra", 4))
+        {
+          ret = GLEW_EXT_bgra;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_blend_color
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_color", 11))
+        {
+          ret = GLEW_EXT_blend_color;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_blend_equation_separate
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_equation_separate", 23))
+        {
+          ret = GLEW_EXT_blend_equation_separate;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_blend_func_separate
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_func_separate", 19))
+        {
+          ret = GLEW_EXT_blend_func_separate;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_blend_logic_op
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_logic_op", 14))
+        {
+          ret = GLEW_EXT_blend_logic_op;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_blend_minmax
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_minmax", 12))
+        {
+          ret = GLEW_EXT_blend_minmax;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_blend_subtract
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_subtract", 14))
+        {
+          ret = GLEW_EXT_blend_subtract;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_clip_volume_hint
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"clip_volume_hint", 16))
+        {
+          ret = GLEW_EXT_clip_volume_hint;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_cmyka
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"cmyka", 5))
+        {
+          ret = GLEW_EXT_cmyka;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_color_subtable
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"color_subtable", 14))
+        {
+          ret = GLEW_EXT_color_subtable;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_compiled_vertex_array
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"compiled_vertex_array", 21))
+        {
+          ret = GLEW_EXT_compiled_vertex_array;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_convolution
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"convolution", 11))
+        {
+          ret = GLEW_EXT_convolution;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_coordinate_frame
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"coordinate_frame", 16))
+        {
+          ret = GLEW_EXT_coordinate_frame;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_copy_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"copy_texture", 12))
+        {
+          ret = GLEW_EXT_copy_texture;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_cull_vertex
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"cull_vertex", 11))
+        {
+          ret = GLEW_EXT_cull_vertex;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_depth_bounds_test
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"depth_bounds_test", 17))
+        {
+          ret = GLEW_EXT_depth_bounds_test;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_draw_range_elements
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"draw_range_elements", 19))
+        {
+          ret = GLEW_EXT_draw_range_elements;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_fog_coord
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fog_coord", 9))
+        {
+          ret = GLEW_EXT_fog_coord;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_fragment_lighting
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_lighting", 17))
+        {
+          ret = GLEW_EXT_fragment_lighting;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_framebuffer_blit
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_blit", 16))
+        {
+          ret = GLEW_EXT_framebuffer_blit;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_framebuffer_multisample
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_multisample", 23))
+        {
+          ret = GLEW_EXT_framebuffer_multisample;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_framebuffer_object
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_object", 18))
+        {
+          ret = GLEW_EXT_framebuffer_object;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_histogram
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"histogram", 9))
+        {
+          ret = GLEW_EXT_histogram;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_index_array_formats
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"index_array_formats", 19))
+        {
+          ret = GLEW_EXT_index_array_formats;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_index_func
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"index_func", 10))
+        {
+          ret = GLEW_EXT_index_func;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_index_material
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"index_material", 14))
+        {
+          ret = GLEW_EXT_index_material;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_index_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"index_texture", 13))
+        {
+          ret = GLEW_EXT_index_texture;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_light_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"light_texture", 13))
+        {
+          ret = GLEW_EXT_light_texture;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_misc_attribute
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"misc_attribute", 14))
+        {
+          ret = GLEW_EXT_misc_attribute;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_multi_draw_arrays
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multi_draw_arrays", 17))
+        {
+          ret = GLEW_EXT_multi_draw_arrays;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_multisample
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11))
+        {
+          ret = GLEW_EXT_multisample;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_packed_depth_stencil
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"packed_depth_stencil", 20))
+        {
+          ret = GLEW_EXT_packed_depth_stencil;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_packed_pixels
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"packed_pixels", 13))
+        {
+          ret = GLEW_EXT_packed_pixels;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_paletted_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"paletted_texture", 16))
+        {
+          ret = GLEW_EXT_paletted_texture;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_pixel_buffer_object
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_buffer_object", 19))
+        {
+          ret = GLEW_EXT_pixel_buffer_object;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_pixel_transform
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_transform", 15))
+        {
+          ret = GLEW_EXT_pixel_transform;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_pixel_transform_color_table
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_transform_color_table", 27))
+        {
+          ret = GLEW_EXT_pixel_transform_color_table;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_point_parameters
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"point_parameters", 16))
+        {
+          ret = GLEW_EXT_point_parameters;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_polygon_offset
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"polygon_offset", 14))
+        {
+          ret = GLEW_EXT_polygon_offset;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_rescale_normal
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"rescale_normal", 14))
+        {
+          ret = GLEW_EXT_rescale_normal;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_scene_marker
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"scene_marker", 12))
+        {
+          ret = GLEW_EXT_scene_marker;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_secondary_color
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"secondary_color", 15))
+        {
+          ret = GLEW_EXT_secondary_color;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_separate_specular_color
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"separate_specular_color", 23))
+        {
+          ret = GLEW_EXT_separate_specular_color;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_shadow_funcs
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shadow_funcs", 12))
+        {
+          ret = GLEW_EXT_shadow_funcs;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_shared_texture_palette
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shared_texture_palette", 22))
+        {
+          ret = GLEW_EXT_shared_texture_palette;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_stencil_clear_tag
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"stencil_clear_tag", 17))
+        {
+          ret = GLEW_EXT_stencil_clear_tag;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_stencil_two_side
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"stencil_two_side", 16))
+        {
+          ret = GLEW_EXT_stencil_two_side;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_stencil_wrap
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"stencil_wrap", 12))
+        {
+          ret = GLEW_EXT_stencil_wrap;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_subtexture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"subtexture", 10))
+        {
+          ret = GLEW_EXT_subtexture;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture", 7))
+        {
+          ret = GLEW_EXT_texture;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture3D
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture3D", 9))
+        {
+          ret = GLEW_EXT_texture3D;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_compression_dxt1
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_dxt1", 24))
+        {
+          ret = GLEW_EXT_texture_compression_dxt1;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_compression_s3tc
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_s3tc", 24))
+        {
+          ret = GLEW_EXT_texture_compression_s3tc;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_cube_map
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_cube_map", 16))
+        {
+          ret = GLEW_EXT_texture_cube_map;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_edge_clamp
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_edge_clamp", 18))
+        {
+          ret = GLEW_EXT_texture_edge_clamp;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_env
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env", 11))
+        {
+          ret = GLEW_EXT_texture_env;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_env_add
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_add", 15))
+        {
+          ret = GLEW_EXT_texture_env_add;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_env_combine
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_combine", 19))
+        {
+          ret = GLEW_EXT_texture_env_combine;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_env_dot3
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_dot3", 16))
+        {
+          ret = GLEW_EXT_texture_env_dot3;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_filter_anisotropic
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_filter_anisotropic", 26))
+        {
+          ret = GLEW_EXT_texture_filter_anisotropic;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_lod_bias
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_lod_bias", 16))
+        {
+          ret = GLEW_EXT_texture_lod_bias;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_mirror_clamp
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_mirror_clamp", 20))
+        {
+          ret = GLEW_EXT_texture_mirror_clamp;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_object
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_object", 14))
+        {
+          ret = GLEW_EXT_texture_object;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_perturb_normal
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_perturb_normal", 22))
+        {
+          ret = GLEW_EXT_texture_perturb_normal;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_rectangle
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_rectangle", 17))
+        {
+          ret = GLEW_EXT_texture_rectangle;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_texture_sRGB
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_sRGB", 12))
+        {
+          ret = GLEW_EXT_texture_sRGB;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_vertex_array
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array", 12))
+        {
+          ret = GLEW_EXT_vertex_array;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_vertex_shader
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_shader", 13))
+        {
+          ret = GLEW_EXT_vertex_shader;
+          continue;
+        }
+#endif
+#ifdef GL_EXT_vertex_weighting
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_weighting", 16))
+        {
+          ret = GLEW_EXT_vertex_weighting;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"GREMEDY_", 8))
+      {
+#ifdef GL_GREMEDY_string_marker
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"string_marker", 13))
+        {
+          ret = GLEW_GREMEDY_string_marker;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"HP_", 3))
+      {
+#ifdef GL_HP_convolution_border_modes
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"convolution_border_modes", 24))
+        {
+          ret = GLEW_HP_convolution_border_modes;
+          continue;
+        }
+#endif
+#ifdef GL_HP_image_transform
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"image_transform", 15))
+        {
+          ret = GLEW_HP_image_transform;
+          continue;
+        }
+#endif
+#ifdef GL_HP_occlusion_test
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"occlusion_test", 14))
+        {
+          ret = GLEW_HP_occlusion_test;
+          continue;
+        }
+#endif
+#ifdef GL_HP_texture_lighting
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_lighting", 16))
+        {
+          ret = GLEW_HP_texture_lighting;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"IBM_", 4))
+      {
+#ifdef GL_IBM_cull_vertex
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"cull_vertex", 11))
+        {
+          ret = GLEW_IBM_cull_vertex;
+          continue;
+        }
+#endif
+#ifdef GL_IBM_multimode_draw_arrays
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multimode_draw_arrays", 21))
+        {
+          ret = GLEW_IBM_multimode_draw_arrays;
+          continue;
+        }
+#endif
+#ifdef GL_IBM_rasterpos_clip
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"rasterpos_clip", 14))
+        {
+          ret = GLEW_IBM_rasterpos_clip;
+          continue;
+        }
+#endif
+#ifdef GL_IBM_static_data
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"static_data", 11))
+        {
+          ret = GLEW_IBM_static_data;
+          continue;
+        }
+#endif
+#ifdef GL_IBM_texture_mirrored_repeat
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_mirrored_repeat", 23))
+        {
+          ret = GLEW_IBM_texture_mirrored_repeat;
+          continue;
+        }
+#endif
+#ifdef GL_IBM_vertex_array_lists
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_lists", 18))
+        {
+          ret = GLEW_IBM_vertex_array_lists;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"INGR_", 5))
+      {
+#ifdef GL_INGR_color_clamp
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"color_clamp", 11))
+        {
+          ret = GLEW_INGR_color_clamp;
+          continue;
+        }
+#endif
+#ifdef GL_INGR_interlace_read
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"interlace_read", 14))
+        {
+          ret = GLEW_INGR_interlace_read;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"INTEL_", 6))
+      {
+#ifdef GL_INTEL_parallel_arrays
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"parallel_arrays", 15))
+        {
+          ret = GLEW_INTEL_parallel_arrays;
+          continue;
+        }
+#endif
+#ifdef GL_INTEL_texture_scissor
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_scissor", 15))
+        {
+          ret = GLEW_INTEL_texture_scissor;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"KTX_", 4))
+      {
+#ifdef GL_KTX_buffer_region
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"buffer_region", 13))
+        {
+          ret = GLEW_KTX_buffer_region;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"MESAX_", 6))
+      {
+#ifdef GL_MESAX_texture_stack
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_stack", 13))
+        {
+          ret = GLEW_MESAX_texture_stack;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"MESA_", 5))
+      {
+#ifdef GL_MESA_pack_invert
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pack_invert", 11))
+        {
+          ret = GLEW_MESA_pack_invert;
+          continue;
+        }
+#endif
+#ifdef GL_MESA_resize_buffers
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"resize_buffers", 14))
+        {
+          ret = GLEW_MESA_resize_buffers;
+          continue;
+        }
+#endif
+#ifdef GL_MESA_window_pos
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"window_pos", 10))
+        {
+          ret = GLEW_MESA_window_pos;
+          continue;
+        }
+#endif
+#ifdef GL_MESA_ycbcr_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"ycbcr_texture", 13))
+        {
+          ret = GLEW_MESA_ycbcr_texture;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"NV_", 3))
+      {
+#ifdef GL_NV_blend_square
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_square", 12))
+        {
+          ret = GLEW_NV_blend_square;
+          continue;
+        }
+#endif
+#ifdef GL_NV_copy_depth_to_color
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"copy_depth_to_color", 19))
+        {
+          ret = GLEW_NV_copy_depth_to_color;
+          continue;
+        }
+#endif
+#ifdef GL_NV_depth_clamp
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"depth_clamp", 11))
+        {
+          ret = GLEW_NV_depth_clamp;
+          continue;
+        }
+#endif
+#ifdef GL_NV_evaluators
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"evaluators", 10))
+        {
+          ret = GLEW_NV_evaluators;
+          continue;
+        }
+#endif
+#ifdef GL_NV_fence
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fence", 5))
+        {
+          ret = GLEW_NV_fence;
+          continue;
+        }
+#endif
+#ifdef GL_NV_float_buffer
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"float_buffer", 12))
+        {
+          ret = GLEW_NV_float_buffer;
+          continue;
+        }
+#endif
+#ifdef GL_NV_fog_distance
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fog_distance", 12))
+        {
+          ret = GLEW_NV_fog_distance;
+          continue;
+        }
+#endif
+#ifdef GL_NV_fragment_program
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_program", 16))
+        {
+          ret = GLEW_NV_fragment_program;
+          continue;
+        }
+#endif
+#ifdef GL_NV_fragment_program2
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_program2", 17))
+        {
+          ret = GLEW_NV_fragment_program2;
+          continue;
+        }
+#endif
+#ifdef GL_NV_fragment_program_option
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_program_option", 23))
+        {
+          ret = GLEW_NV_fragment_program_option;
+          continue;
+        }
+#endif
+#ifdef GL_NV_half_float
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"half_float", 10))
+        {
+          ret = GLEW_NV_half_float;
+          continue;
+        }
+#endif
+#ifdef GL_NV_light_max_exponent
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"light_max_exponent", 18))
+        {
+          ret = GLEW_NV_light_max_exponent;
+          continue;
+        }
+#endif
+#ifdef GL_NV_multisample_filter_hint
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample_filter_hint", 23))
+        {
+          ret = GLEW_NV_multisample_filter_hint;
+          continue;
+        }
+#endif
+#ifdef GL_NV_occlusion_query
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"occlusion_query", 15))
+        {
+          ret = GLEW_NV_occlusion_query;
+          continue;
+        }
+#endif
+#ifdef GL_NV_packed_depth_stencil
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"packed_depth_stencil", 20))
+        {
+          ret = GLEW_NV_packed_depth_stencil;
+          continue;
+        }
+#endif
+#ifdef GL_NV_pixel_data_range
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_data_range", 16))
+        {
+          ret = GLEW_NV_pixel_data_range;
+          continue;
+        }
+#endif
+#ifdef GL_NV_point_sprite
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"point_sprite", 12))
+        {
+          ret = GLEW_NV_point_sprite;
+          continue;
+        }
+#endif
+#ifdef GL_NV_primitive_restart
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"primitive_restart", 17))
+        {
+          ret = GLEW_NV_primitive_restart;
+          continue;
+        }
+#endif
+#ifdef GL_NV_register_combiners
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"register_combiners", 18))
+        {
+          ret = GLEW_NV_register_combiners;
+          continue;
+        }
+#endif
+#ifdef GL_NV_register_combiners2
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"register_combiners2", 19))
+        {
+          ret = GLEW_NV_register_combiners2;
+          continue;
+        }
+#endif
+#ifdef GL_NV_texgen_emboss
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texgen_emboss", 13))
+        {
+          ret = GLEW_NV_texgen_emboss;
+          continue;
+        }
+#endif
+#ifdef GL_NV_texgen_reflection
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texgen_reflection", 17))
+        {
+          ret = GLEW_NV_texgen_reflection;
+          continue;
+        }
+#endif
+#ifdef GL_NV_texture_compression_vtc
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_vtc", 23))
+        {
+          ret = GLEW_NV_texture_compression_vtc;
+          continue;
+        }
+#endif
+#ifdef GL_NV_texture_env_combine4
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_combine4", 20))
+        {
+          ret = GLEW_NV_texture_env_combine4;
+          continue;
+        }
+#endif
+#ifdef GL_NV_texture_expand_normal
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_expand_normal", 21))
+        {
+          ret = GLEW_NV_texture_expand_normal;
+          continue;
+        }
+#endif
+#ifdef GL_NV_texture_rectangle
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_rectangle", 17))
+        {
+          ret = GLEW_NV_texture_rectangle;
+          continue;
+        }
+#endif
+#ifdef GL_NV_texture_shader
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_shader", 14))
+        {
+          ret = GLEW_NV_texture_shader;
+          continue;
+        }
+#endif
+#ifdef GL_NV_texture_shader2
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_shader2", 15))
+        {
+          ret = GLEW_NV_texture_shader2;
+          continue;
+        }
+#endif
+#ifdef GL_NV_texture_shader3
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_shader3", 15))
+        {
+          ret = GLEW_NV_texture_shader3;
+          continue;
+        }
+#endif
+#ifdef GL_NV_vertex_array_range
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_range", 18))
+        {
+          ret = GLEW_NV_vertex_array_range;
+          continue;
+        }
+#endif
+#ifdef GL_NV_vertex_array_range2
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_range2", 19))
+        {
+          ret = GLEW_NV_vertex_array_range2;
+          continue;
+        }
+#endif
+#ifdef GL_NV_vertex_program
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_program", 14))
+        {
+          ret = GLEW_NV_vertex_program;
+          continue;
+        }
+#endif
+#ifdef GL_NV_vertex_program1_1
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_program1_1", 17))
+        {
+          ret = GLEW_NV_vertex_program1_1;
+          continue;
+        }
+#endif
+#ifdef GL_NV_vertex_program2
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_program2", 15))
+        {
+          ret = GLEW_NV_vertex_program2;
+          continue;
+        }
+#endif
+#ifdef GL_NV_vertex_program2_option
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_program2_option", 22))
+        {
+          ret = GLEW_NV_vertex_program2_option;
+          continue;
+        }
+#endif
+#ifdef GL_NV_vertex_program3
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_program3", 15))
+        {
+          ret = GLEW_NV_vertex_program3;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"OML_", 4))
+      {
+#ifdef GL_OML_interlace
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"interlace", 9))
+        {
+          ret = GLEW_OML_interlace;
+          continue;
+        }
+#endif
+#ifdef GL_OML_resample
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"resample", 8))
+        {
+          ret = GLEW_OML_resample;
+          continue;
+        }
+#endif
+#ifdef GL_OML_subsample
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"subsample", 9))
+        {
+          ret = GLEW_OML_subsample;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"PGI_", 4))
+      {
+#ifdef GL_PGI_misc_hints
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"misc_hints", 10))
+        {
+          ret = GLEW_PGI_misc_hints;
+          continue;
+        }
+#endif
+#ifdef GL_PGI_vertex_hints
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_hints", 12))
+        {
+          ret = GLEW_PGI_vertex_hints;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"REND_", 5))
+      {
+#ifdef GL_REND_screen_coordinates
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"screen_coordinates", 18))
+        {
+          ret = GLEW_REND_screen_coordinates;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"S3_", 3))
+      {
+#ifdef GL_S3_s3tc
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"s3tc", 4))
+        {
+          ret = GLEW_S3_s3tc;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"SGIS_", 5))
+      {
+#ifdef GL_SGIS_color_range
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"color_range", 11))
+        {
+          ret = GLEW_SGIS_color_range;
+          continue;
+        }
+#endif
+#ifdef GL_SGIS_detail_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"detail_texture", 14))
+        {
+          ret = GLEW_SGIS_detail_texture;
+          continue;
+        }
+#endif
+#ifdef GL_SGIS_fog_function
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fog_function", 12))
+        {
+          ret = GLEW_SGIS_fog_function;
+          continue;
+        }
+#endif
+#ifdef GL_SGIS_generate_mipmap
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"generate_mipmap", 15))
+        {
+          ret = GLEW_SGIS_generate_mipmap;
+          continue;
+        }
+#endif
+#ifdef GL_SGIS_multisample
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11))
+        {
+          ret = GLEW_SGIS_multisample;
+          continue;
+        }
+#endif
+#ifdef GL_SGIS_pixel_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_texture", 13))
+        {
+          ret = GLEW_SGIS_pixel_texture;
+          continue;
+        }
+#endif
+#ifdef GL_SGIS_sharpen_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"sharpen_texture", 15))
+        {
+          ret = GLEW_SGIS_sharpen_texture;
+          continue;
+        }
+#endif
+#ifdef GL_SGIS_texture4D
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture4D", 9))
+        {
+          ret = GLEW_SGIS_texture4D;
+          continue;
+        }
+#endif
+#ifdef GL_SGIS_texture_border_clamp
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_border_clamp", 20))
+        {
+          ret = GLEW_SGIS_texture_border_clamp;
+          continue;
+        }
+#endif
+#ifdef GL_SGIS_texture_edge_clamp
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_edge_clamp", 18))
+        {
+          ret = GLEW_SGIS_texture_edge_clamp;
+          continue;
+        }
+#endif
+#ifdef GL_SGIS_texture_filter4
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_filter4", 15))
+        {
+          ret = GLEW_SGIS_texture_filter4;
+          continue;
+        }
+#endif
+#ifdef GL_SGIS_texture_lod
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_lod", 11))
+        {
+          ret = GLEW_SGIS_texture_lod;
+          continue;
+        }
+#endif
+#ifdef GL_SGIS_texture_select
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_select", 14))
+        {
+          ret = GLEW_SGIS_texture_select;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"SGIX_", 5))
+      {
+#ifdef GL_SGIX_async
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"async", 5))
+        {
+          ret = GLEW_SGIX_async;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_async_histogram
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"async_histogram", 15))
+        {
+          ret = GLEW_SGIX_async_histogram;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_async_pixel
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"async_pixel", 11))
+        {
+          ret = GLEW_SGIX_async_pixel;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_blend_alpha_minmax
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_alpha_minmax", 18))
+        {
+          ret = GLEW_SGIX_blend_alpha_minmax;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_clipmap
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"clipmap", 7))
+        {
+          ret = GLEW_SGIX_clipmap;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_depth_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"depth_texture", 13))
+        {
+          ret = GLEW_SGIX_depth_texture;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_flush_raster
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"flush_raster", 12))
+        {
+          ret = GLEW_SGIX_flush_raster;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_fog_offset
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fog_offset", 10))
+        {
+          ret = GLEW_SGIX_fog_offset;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_fog_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fog_texture", 11))
+        {
+          ret = GLEW_SGIX_fog_texture;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_fragment_specular_lighting
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_specular_lighting", 26))
+        {
+          ret = GLEW_SGIX_fragment_specular_lighting;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_framezoom
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"framezoom", 9))
+        {
+          ret = GLEW_SGIX_framezoom;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_interlace
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"interlace", 9))
+        {
+          ret = GLEW_SGIX_interlace;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_ir_instrument1
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"ir_instrument1", 14))
+        {
+          ret = GLEW_SGIX_ir_instrument1;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_list_priority
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"list_priority", 13))
+        {
+          ret = GLEW_SGIX_list_priority;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_pixel_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_texture", 13))
+        {
+          ret = GLEW_SGIX_pixel_texture;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_pixel_texture_bits
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_texture_bits", 18))
+        {
+          ret = GLEW_SGIX_pixel_texture_bits;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_reference_plane
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"reference_plane", 15))
+        {
+          ret = GLEW_SGIX_reference_plane;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_resample
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"resample", 8))
+        {
+          ret = GLEW_SGIX_resample;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_shadow
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shadow", 6))
+        {
+          ret = GLEW_SGIX_shadow;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_shadow_ambient
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shadow_ambient", 14))
+        {
+          ret = GLEW_SGIX_shadow_ambient;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_sprite
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"sprite", 6))
+        {
+          ret = GLEW_SGIX_sprite;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_tag_sample_buffer
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"tag_sample_buffer", 17))
+        {
+          ret = GLEW_SGIX_tag_sample_buffer;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_texture_add_env
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_add_env", 15))
+        {
+          ret = GLEW_SGIX_texture_add_env;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_texture_coordinate_clamp
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_coordinate_clamp", 24))
+        {
+          ret = GLEW_SGIX_texture_coordinate_clamp;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_texture_lod_bias
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_lod_bias", 16))
+        {
+          ret = GLEW_SGIX_texture_lod_bias;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_texture_multi_buffer
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_multi_buffer", 20))
+        {
+          ret = GLEW_SGIX_texture_multi_buffer;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_texture_range
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_range", 13))
+        {
+          ret = GLEW_SGIX_texture_range;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_texture_scale_bias
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_scale_bias", 18))
+        {
+          ret = GLEW_SGIX_texture_scale_bias;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_vertex_preclip
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_preclip", 14))
+        {
+          ret = GLEW_SGIX_vertex_preclip;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_vertex_preclip_hint
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_preclip_hint", 19))
+        {
+          ret = GLEW_SGIX_vertex_preclip_hint;
+          continue;
+        }
+#endif
+#ifdef GL_SGIX_ycrcb
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"ycrcb", 5))
+        {
+          ret = GLEW_SGIX_ycrcb;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"SGI_", 4))
+      {
+#ifdef GL_SGI_color_matrix
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"color_matrix", 12))
+        {
+          ret = GLEW_SGI_color_matrix;
+          continue;
+        }
+#endif
+#ifdef GL_SGI_color_table
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"color_table", 11))
+        {
+          ret = GLEW_SGI_color_table;
+          continue;
+        }
+#endif
+#ifdef GL_SGI_texture_color_table
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_color_table", 19))
+        {
+          ret = GLEW_SGI_texture_color_table;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"SUNX_", 5))
+      {
+#ifdef GL_SUNX_constant_data
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"constant_data", 13))
+        {
+          ret = GLEW_SUNX_constant_data;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"SUN_", 4))
+      {
+#ifdef GL_SUN_convolution_border_modes
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"convolution_border_modes", 24))
+        {
+          ret = GLEW_SUN_convolution_border_modes;
+          continue;
+        }
+#endif
+#ifdef GL_SUN_global_alpha
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"global_alpha", 12))
+        {
+          ret = GLEW_SUN_global_alpha;
+          continue;
+        }
+#endif
+#ifdef GL_SUN_mesh_array
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"mesh_array", 10))
+        {
+          ret = GLEW_SUN_mesh_array;
+          continue;
+        }
+#endif
+#ifdef GL_SUN_read_video_pixels
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"read_video_pixels", 17))
+        {
+          ret = GLEW_SUN_read_video_pixels;
+          continue;
+        }
+#endif
+#ifdef GL_SUN_slice_accum
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"slice_accum", 11))
+        {
+          ret = GLEW_SUN_slice_accum;
+          continue;
+        }
+#endif
+#ifdef GL_SUN_triangle_list
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"triangle_list", 13))
+        {
+          ret = GLEW_SUN_triangle_list;
+          continue;
+        }
+#endif
+#ifdef GL_SUN_vertex
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex", 6))
+        {
+          ret = GLEW_SUN_vertex;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"WIN_", 4))
+      {
+#ifdef GL_WIN_phong_shading
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"phong_shading", 13))
+        {
+          ret = GLEW_WIN_phong_shading;
+          continue;
+        }
+#endif
+#ifdef GL_WIN_specular_fog
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"specular_fog", 12))
+        {
+          ret = GLEW_WIN_specular_fog;
+          continue;
+        }
+#endif
+#ifdef GL_WIN_swap_hint
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_hint", 9))
+        {
+          ret = GLEW_WIN_swap_hint;
+          continue;
+        }
+#endif
+      }
+    }
+    ret = (len == 0);
+  }
+  return ret;
+}
+
+#if defined(_WIN32)
+
+#if defined(GLEW_MX)
+GLboolean wglewContextIsSupported (WGLEWContext* ctx, const char* name)
+#else
+GLboolean wglewIsSupported (const char* name)
+#endif
+{
+  GLubyte* pos = (GLubyte*)name;
+  GLuint len = _glewStrLen(pos);
+  GLboolean ret = GL_TRUE;
+  while (ret && len > 0)
+  {
+    if (_glewStrSame1(&pos, &len, (const GLubyte*)"WGL_", 4))
+    {
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"3DFX_", 5))
+      {
+#ifdef WGL_3DFX_multisample
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11))
+        {
+          ret = WGLEW_3DFX_multisample;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"3DL_", 4))
+      {
+#ifdef WGL_3DL_stereo_control
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"stereo_control", 14))
+        {
+          ret = WGLEW_3DL_stereo_control;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"ARB_", 4))
+      {
+#ifdef WGL_ARB_buffer_region
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"buffer_region", 13))
+        {
+          ret = WGLEW_ARB_buffer_region;
+          continue;
+        }
+#endif
+#ifdef WGL_ARB_extensions_string
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"extensions_string", 17))
+        {
+          ret = WGLEW_ARB_extensions_string;
+          continue;
+        }
+#endif
+#ifdef WGL_ARB_make_current_read
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"make_current_read", 17))
+        {
+          ret = WGLEW_ARB_make_current_read;
+          continue;
+        }
+#endif
+#ifdef WGL_ARB_multisample
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11))
+        {
+          ret = WGLEW_ARB_multisample;
+          continue;
+        }
+#endif
+#ifdef WGL_ARB_pbuffer
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pbuffer", 7))
+        {
+          ret = WGLEW_ARB_pbuffer;
+          continue;
+        }
+#endif
+#ifdef WGL_ARB_pixel_format
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_format", 12))
+        {
+          ret = WGLEW_ARB_pixel_format;
+          continue;
+        }
+#endif
+#ifdef WGL_ARB_pixel_format_float
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_format_float", 18))
+        {
+          ret = WGLEW_ARB_pixel_format_float;
+          continue;
+        }
+#endif
+#ifdef WGL_ARB_render_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"render_texture", 14))
+        {
+          ret = WGLEW_ARB_render_texture;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"ATI_", 4))
+      {
+#ifdef WGL_ATI_pixel_format_float
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_format_float", 18))
+        {
+          ret = WGLEW_ATI_pixel_format_float;
+          continue;
+        }
+#endif
+#ifdef WGL_ATI_render_texture_rectangle
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"render_texture_rectangle", 24))
+        {
+          ret = WGLEW_ATI_render_texture_rectangle;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"EXT_", 4))
+      {
+#ifdef WGL_EXT_depth_float
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"depth_float", 11))
+        {
+          ret = WGLEW_EXT_depth_float;
+          continue;
+        }
+#endif
+#ifdef WGL_EXT_display_color_table
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"display_color_table", 19))
+        {
+          ret = WGLEW_EXT_display_color_table;
+          continue;
+        }
+#endif
+#ifdef WGL_EXT_extensions_string
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"extensions_string", 17))
+        {
+          ret = WGLEW_EXT_extensions_string;
+          continue;
+        }
+#endif
+#ifdef WGL_EXT_make_current_read
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"make_current_read", 17))
+        {
+          ret = WGLEW_EXT_make_current_read;
+          continue;
+        }
+#endif
+#ifdef WGL_EXT_multisample
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11))
+        {
+          ret = WGLEW_EXT_multisample;
+          continue;
+        }
+#endif
+#ifdef WGL_EXT_pbuffer
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pbuffer", 7))
+        {
+          ret = WGLEW_EXT_pbuffer;
+          continue;
+        }
+#endif
+#ifdef WGL_EXT_pixel_format
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_format", 12))
+        {
+          ret = WGLEW_EXT_pixel_format;
+          continue;
+        }
+#endif
+#ifdef WGL_EXT_swap_control
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_control", 12))
+        {
+          ret = WGLEW_EXT_swap_control;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"I3D_", 4))
+      {
+#ifdef WGL_I3D_digital_video_control
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"digital_video_control", 21))
+        {
+          ret = WGLEW_I3D_digital_video_control;
+          continue;
+        }
+#endif
+#ifdef WGL_I3D_gamma
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"gamma", 5))
+        {
+          ret = WGLEW_I3D_gamma;
+          continue;
+        }
+#endif
+#ifdef WGL_I3D_genlock
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"genlock", 7))
+        {
+          ret = WGLEW_I3D_genlock;
+          continue;
+        }
+#endif
+#ifdef WGL_I3D_image_buffer
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"image_buffer", 12))
+        {
+          ret = WGLEW_I3D_image_buffer;
+          continue;
+        }
+#endif
+#ifdef WGL_I3D_swap_frame_lock
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_frame_lock", 15))
+        {
+          ret = WGLEW_I3D_swap_frame_lock;
+          continue;
+        }
+#endif
+#ifdef WGL_I3D_swap_frame_usage
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_frame_usage", 16))
+        {
+          ret = WGLEW_I3D_swap_frame_usage;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"NV_", 3))
+      {
+#ifdef WGL_NV_float_buffer
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"float_buffer", 12))
+        {
+          ret = WGLEW_NV_float_buffer;
+          continue;
+        }
+#endif
+#ifdef WGL_NV_render_depth_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"render_depth_texture", 20))
+        {
+          ret = WGLEW_NV_render_depth_texture;
+          continue;
+        }
+#endif
+#ifdef WGL_NV_render_texture_rectangle
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"render_texture_rectangle", 24))
+        {
+          ret = WGLEW_NV_render_texture_rectangle;
+          continue;
+        }
+#endif
+#ifdef WGL_NV_vertex_array_range
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_range", 18))
+        {
+          ret = WGLEW_NV_vertex_array_range;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"OML_", 4))
+      {
+#ifdef WGL_OML_sync_control
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"sync_control", 12))
+        {
+          ret = WGLEW_OML_sync_control;
+          continue;
+        }
+#endif
+      }
+    }
+    ret = (len == 0);
+  }
+  return ret;
+}
+
+#elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX)
+
+#if defined(GLEW_MX)
+GLboolean glxewContextIsSupported (GLXEWContext* ctx, const char* name)
+#else
+GLboolean glxewIsSupported (const char* name)
+#endif
+{
+  GLubyte* pos = (GLubyte*)name;
+  GLuint len = _glewStrLen(pos);
+  GLboolean ret = GL_TRUE;
+  while (ret && len > 0)
+  {
+    if(_glewStrSame1(&pos, &len, (const GLubyte*)"GLX_", 4))
+    {
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"VERSION_", 8))
+      {
+#ifdef GLX_VERSION_1_2
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"1_2", 3))
+        {
+          ret = GLXEW_VERSION_1_2;
+          continue;
+        }
+#endif
+#ifdef GLX_VERSION_1_3
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"1_3", 3))
+        {
+          ret = GLXEW_VERSION_1_3;
+          continue;
+        }
+#endif
+#ifdef GLX_VERSION_1_4
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"1_4", 3))
+        {
+          ret = GLXEW_VERSION_1_4;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"3DFX_", 5))
+      {
+#ifdef GLX_3DFX_multisample
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11))
+        {
+          ret = GLXEW_3DFX_multisample;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"ARB_", 4))
+      {
+#ifdef GLX_ARB_fbconfig_float
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fbconfig_float", 14))
+        {
+          ret = GLXEW_ARB_fbconfig_float;
+          continue;
+        }
+#endif
+#ifdef GLX_ARB_get_proc_address
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"get_proc_address", 16))
+        {
+          ret = GLXEW_ARB_get_proc_address;
+          continue;
+        }
+#endif
+#ifdef GLX_ARB_multisample
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11))
+        {
+          ret = GLXEW_ARB_multisample;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"ATI_", 4))
+      {
+#ifdef GLX_ATI_pixel_format_float
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_format_float", 18))
+        {
+          ret = GLXEW_ATI_pixel_format_float;
+          continue;
+        }
+#endif
+#ifdef GLX_ATI_render_texture
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"render_texture", 14))
+        {
+          ret = GLXEW_ATI_render_texture;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"EXT_", 4))
+      {
+#ifdef GLX_EXT_import_context
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"import_context", 14))
+        {
+          ret = GLXEW_EXT_import_context;
+          continue;
+        }
+#endif
+#ifdef GLX_EXT_scene_marker
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"scene_marker", 12))
+        {
+          ret = GLXEW_EXT_scene_marker;
+          continue;
+        }
+#endif
+#ifdef GLX_EXT_visual_info
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"visual_info", 11))
+        {
+          ret = GLXEW_EXT_visual_info;
+          continue;
+        }
+#endif
+#ifdef GLX_EXT_visual_rating
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"visual_rating", 13))
+        {
+          ret = GLXEW_EXT_visual_rating;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"MESA_", 5))
+      {
+#ifdef GLX_MESA_agp_offset
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"agp_offset", 10))
+        {
+          ret = GLXEW_MESA_agp_offset;
+          continue;
+        }
+#endif
+#ifdef GLX_MESA_copy_sub_buffer
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"copy_sub_buffer", 15))
+        {
+          ret = GLXEW_MESA_copy_sub_buffer;
+          continue;
+        }
+#endif
+#ifdef GLX_MESA_pixmap_colormap
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixmap_colormap", 15))
+        {
+          ret = GLXEW_MESA_pixmap_colormap;
+          continue;
+        }
+#endif
+#ifdef GLX_MESA_release_buffers
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"release_buffers", 15))
+        {
+          ret = GLXEW_MESA_release_buffers;
+          continue;
+        }
+#endif
+#ifdef GLX_MESA_set_3dfx_mode
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"set_3dfx_mode", 13))
+        {
+          ret = GLXEW_MESA_set_3dfx_mode;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"NV_", 3))
+      {
+#ifdef GLX_NV_float_buffer
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"float_buffer", 12))
+        {
+          ret = GLXEW_NV_float_buffer;
+          continue;
+        }
+#endif
+#ifdef GLX_NV_vertex_array_range
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_range", 18))
+        {
+          ret = GLXEW_NV_vertex_array_range;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"OML_", 4))
+      {
+#ifdef GLX_OML_swap_method
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_method", 11))
+        {
+          ret = GLXEW_OML_swap_method;
+          continue;
+        }
+#endif
+#if defined(GLX_OML_sync_control) && defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
+#include <inttypes.h>
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"sync_control", 12))
+        {
+          ret = GLXEW_OML_sync_control;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"SGIS_", 5))
+      {
+#ifdef GLX_SGIS_blended_overlay
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"blended_overlay", 15))
+        {
+          ret = GLXEW_SGIS_blended_overlay;
+          continue;
+        }
+#endif
+#ifdef GLX_SGIS_color_range
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"color_range", 11))
+        {
+          ret = GLXEW_SGIS_color_range;
+          continue;
+        }
+#endif
+#ifdef GLX_SGIS_multisample
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11))
+        {
+          ret = GLXEW_SGIS_multisample;
+          continue;
+        }
+#endif
+#ifdef GLX_SGIS_shared_multisample
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"shared_multisample", 18))
+        {
+          ret = GLXEW_SGIS_shared_multisample;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"SGIX_", 5))
+      {
+#ifdef GLX_SGIX_fbconfig
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"fbconfig", 8))
+        {
+          ret = GLXEW_SGIX_fbconfig;
+          continue;
+        }
+#endif
+#ifdef GLX_SGIX_pbuffer
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"pbuffer", 7))
+        {
+          ret = GLXEW_SGIX_pbuffer;
+          continue;
+        }
+#endif
+#ifdef GLX_SGIX_swap_barrier
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_barrier", 12))
+        {
+          ret = GLXEW_SGIX_swap_barrier;
+          continue;
+        }
+#endif
+#ifdef GLX_SGIX_swap_group
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_group", 10))
+        {
+          ret = GLXEW_SGIX_swap_group;
+          continue;
+        }
+#endif
+#ifdef GLX_SGIX_video_resize
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"video_resize", 12))
+        {
+          ret = GLXEW_SGIX_video_resize;
+          continue;
+        }
+#endif
+#ifdef GLX_SGIX_visual_select_group
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"visual_select_group", 19))
+        {
+          ret = GLXEW_SGIX_visual_select_group;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"SGI_", 4))
+      {
+#ifdef GLX_SGI_cushion
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"cushion", 7))
+        {
+          ret = GLXEW_SGI_cushion;
+          continue;
+        }
+#endif
+#ifdef GLX_SGI_make_current_read
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"make_current_read", 17))
+        {
+          ret = GLXEW_SGI_make_current_read;
+          continue;
+        }
+#endif
+#ifdef GLX_SGI_swap_control
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_control", 12))
+        {
+          ret = GLXEW_SGI_swap_control;
+          continue;
+        }
+#endif
+#ifdef GLX_SGI_video_sync
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"video_sync", 10))
+        {
+          ret = GLXEW_SGI_video_sync;
+          continue;
+        }
+#endif
+      }
+      if (_glewStrSame2(&pos, &len, (const GLubyte*)"SUN_", 4))
+      {
+#ifdef GLX_SUN_get_transparent_index
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"get_transparent_index", 21))
+        {
+          ret = GLXEW_SUN_get_transparent_index;
+          continue;
+        }
+#endif
+#ifdef GLX_SUN_video_resize
+        if (_glewStrSame3(&pos, &len, (const GLubyte*)"video_resize", 12))
+        {
+          ret = GLXEW_SUN_video_resize;
+          continue;
+        }
+#endif
+      }
+    }
+    ret = (len == 0);
+  }
+  return ret;
+}
+
+#endif /* _WIN32 */
diff --git a/extern/libopenjpeg/opj_malloc.h b/extern/libopenjpeg/opj_malloc.h
index 79698f8ff1b..4e9727af0f3 100644
--- a/extern/libopenjpeg/opj_malloc.h
+++ b/extern/libopenjpeg/opj_malloc.h
@@ -76,8 +76,10 @@ Allocate memory aligned to a 16 byte boundry
 	#if defined(__sun)
 			#define HAVE_MEMALIGN
 		#elif defined(__GNUC__)
-			#define HAVE_MEMALIGN
-			#include <malloc.h>		
+                        #ifndef __APPLE__
+			    #define HAVE_MEMALIGN
+			    #include <malloc.h>
+                        #endif
 		/* Linux x86_64 and OSX always align allocations to 16 bytes */
 		#elif !defined(__amd64__) && !defined(__APPLE__)	
 			/* FIXME: Yes, this is a big assumption */
diff --git a/extern/libopenjpeg/patches/osx.patch b/extern/libopenjpeg/patches/osx.patch
new file mode 100644
index 00000000000..c518978eed6
--- /dev/null
+++ b/extern/libopenjpeg/patches/osx.patch
@@ -0,0 +1,17 @@
+Index: opj_malloc.h
+===================================================================
+--- opj_malloc.h	(revision 15089)
++++ opj_malloc.h	(working copy)
+@@ -76,8 +76,10 @@
+ 	#if defined(__sun)
+ 			#define HAVE_MEMALIGN
+ 		#elif defined(__GNUC__)
+-			#define HAVE_MEMALIGN
+-			#include <malloc.h>		
++                        #ifndef __APPLE__
++			    #define HAVE_MEMALIGN
++			    #include <malloc.h>
++                        #endif
+ 		/* Linux x86_64 and OSX always align allocations to 16 bytes */
+ 		#elif !defined(__amd64__) && !defined(__APPLE__)	
+ 			/* FIXME: Yes, this is a big assumption */
diff --git a/extern/libredcode/debayer.c b/extern/libredcode/debayer.c
index f7f22e1cc54..de7bec510cb 100644
--- a/extern/libredcode/debayer.c
+++ b/extern/libredcode/debayer.c
@@ -9,8 +9,6 @@ void redcode_ycbcr2rgb_fullscale(
 	int x,y;
 	int pix_max = 4096;
 	int mask = pix_max - 1;
-	float Kb = 0.0722;
-	float Kr = 0.2126;
 	float *o;
 
 	for (y = 0; y < height; y++) {
@@ -25,9 +23,9 @@ void redcode_ycbcr2rgb_fullscale(
 			float y2  = (planes[3][i] & mask);
 			float y2p = (planes[3][i_p] & mask);
 
-			float b_ = cb * (1.0 - Kb)/(pix_max/2);
-			float r_ = cr * (1.0 - Kr)/(pix_max/2);
-			float g_ = (- Kr * r_ - Kb * b_)/(1.0 - Kr - Kb);
+			float b_ = cb /(pix_max/2);
+			float r_ = cr /(pix_max/2);
+			float g_ = 0.0;
 		
 			float y_[4] = {y1 / pix_max, 
 				       (y2 + y2p)/2 / pix_max, 
@@ -68,8 +66,6 @@ void redcode_ycbcr2rgb_halfscale(
 	int x,y;
 	int pix_max = 4096;
 	int mask = pix_max - 1;
-	float Kb = 0.0722;
-	float Kr = 0.2126;
 
 	for (y = 0; y < height; y++) {
 		float *o = out + width * (height - y - 1);
@@ -80,9 +76,9 @@ void redcode_ycbcr2rgb_halfscale(
 			float cr  = (planes[2][i] & mask)  - pix_max/2;
 			float y2  = (planes[3][i] & mask);
 
-			float b_ = cb * (1.0 - Kb)/(pix_max/2);
-			float r_ = cr * (1.0 - Kr)/(pix_max/2);
-			float g_ = (- Kr * r_ - Kb * b_)/(1.0 - Kr - Kb);
+			float b_ = cb /(pix_max/2);
+			float r_ = cr /(pix_max/2);
+			float g_ = 0.0;
 			
 			float y = (y1 + y2)/2 / pix_max;
 
@@ -101,8 +97,6 @@ void redcode_ycbcr2rgb_quarterscale(
 	int x,y;
 	int pix_max = 4096;
 	int mask = pix_max - 1;
-	float Kb = 0.0722;
-	float Kr = 0.2126;
 
 	for (y = 0; y < height; y += 2) {
 		float *o = out + (width/2) * (height/2 - y/2 - 1);
@@ -113,9 +107,9 @@ void redcode_ycbcr2rgb_quarterscale(
 			float cr  = (planes[2][i] & mask)  - pix_max/2;
 			float y2  = planes[3][i] & mask;
 
-			float b_ = cb * (1.0 - Kb)/(pix_max/2);
-			float r_ = cr * (1.0 - Kr)/(pix_max/2);
-			float g_ = (- Kr * r_ - Kb * b_)/(1.0 - Kr - Kb);
+			float b_ = cb /(pix_max/2);
+			float r_ = cr /(pix_max/2);
+			float g_ = 0.0;
 			
 			float y = (y1 + y2)/2 / pix_max;
 			
diff --git a/extern/make/msvc_7_0/extern.sln b/extern/make/msvc_7_0/extern.sln
index afc88ddda8e..e4bc550f503 100644
--- a/extern/make/msvc_7_0/extern.sln
+++ b/extern/make/msvc_7_0/extern.sln
@@ -8,6 +8,7 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "solid", "..\..\solid\make\msvc_7_0\solid.vcproj", "{D696C86B-0B53-4471-A50D-5B983A6FA4AD}"
 	ProjectSection(ProjectDependencies) = postProject
 		{6461F05D-4698-47AB-A8E8-1CA2ACC9948B} = {6461F05D-4698-47AB-A8E8-1CA2ACC9948B}
+		{BAC615B0-F1AF-418B-8D23-A10FD8870D6A} = {BAC615B0-F1AF-418B-8D23-A10FD8870D6A}
 		{0112CAD5-3584-412A-A2E5-1315A00437B4} = {0112CAD5-3584-412A-A2E5-1315A00437B4}
 		{B83C6BED-11EC-46C8-AFFA-121EEDE94373} = {B83C6BED-11EC-46C8-AFFA-121EEDE94373}
 		{524264F4-DF21-4B79-847F-E7CA643ECD0B} = {524264F4-DF21-4B79-847F-E7CA643ECD0B}
@@ -46,6 +47,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bullet2", "..\..\bullet2\ma
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glew", "..\..\glew\make\msvc_7_0\glew_vc7.vcproj", "{BAC615B0-F1AF-418B-8D23-A10FD8870D6A}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		3D Plugin Debug = 3D Plugin Debug
@@ -54,6 +59,10 @@ Global
 		Blender Release = Blender Release
 		BlenderPlayer Debug = BlenderPlayer Debug
 		BlenderPlayer Release = BlenderPlayer Release
+		Debug = Debug
+		Release = Release
+	EndGlobalSection
+	GlobalSection(ProjectDependencies) = postSolution
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
 		{9C71A793-C177-4CAB-8EC5-923D500B39F8}.3D Plugin Debug.ActiveCfg = 3D Plugin Debug|Win32
@@ -68,6 +77,10 @@ Global
 		{9C71A793-C177-4CAB-8EC5-923D500B39F8}.BlenderPlayer Debug.Build.0 = Blender Release|Win32
 		{9C71A793-C177-4CAB-8EC5-923D500B39F8}.BlenderPlayer Release.ActiveCfg = Blender Release|Win32
 		{9C71A793-C177-4CAB-8EC5-923D500B39F8}.BlenderPlayer Release.Build.0 = Blender Release|Win32
+		{9C71A793-C177-4CAB-8EC5-923D500B39F8}.Debug.ActiveCfg = 3D Plugin Debug|Win32
+		{9C71A793-C177-4CAB-8EC5-923D500B39F8}.Debug.Build.0 = 3D Plugin Debug|Win32
+		{9C71A793-C177-4CAB-8EC5-923D500B39F8}.Release.ActiveCfg = 3D Plugin Release|Win32
+		{9C71A793-C177-4CAB-8EC5-923D500B39F8}.Release.Build.0 = 3D Plugin Release|Win32
 		{D696C86B-0B53-4471-A50D-5B983A6FA4AD}.3D Plugin Debug.ActiveCfg = 3D Plugin Debug|Win32
 		{D696C86B-0B53-4471-A50D-5B983A6FA4AD}.3D Plugin Debug.Build.0 = 3D Plugin Debug|Win32
 		{D696C86B-0B53-4471-A50D-5B983A6FA4AD}.3D Plugin Release.ActiveCfg = 3D Plugin Release|Win32
@@ -80,6 +93,10 @@ Global
 		{D696C86B-0B53-4471-A50D-5B983A6FA4AD}.BlenderPlayer Debug.Build.0 = Blender Release|Win32
 		{D696C86B-0B53-4471-A50D-5B983A6FA4AD}.BlenderPlayer Release.ActiveCfg = Blender Release|Win32
 		{D696C86B-0B53-4471-A50D-5B983A6FA4AD}.BlenderPlayer Release.Build.0 = Blender Release|Win32
+		{D696C86B-0B53-4471-A50D-5B983A6FA4AD}.Debug.ActiveCfg = 3D Plugin Debug|Win32
+		{D696C86B-0B53-4471-A50D-5B983A6FA4AD}.Debug.Build.0 = 3D Plugin Debug|Win32
+		{D696C86B-0B53-4471-A50D-5B983A6FA4AD}.Release.ActiveCfg = 3D Plugin Release|Win32
+		{D696C86B-0B53-4471-A50D-5B983A6FA4AD}.Release.Build.0 = 3D Plugin Release|Win32
 		{6461F05D-4698-47AB-A8E8-1CA2ACC9948B}.3D Plugin Debug.ActiveCfg = 3D Plugin Debug|Win32
 		{6461F05D-4698-47AB-A8E8-1CA2ACC9948B}.3D Plugin Debug.Build.0 = 3D Plugin Debug|Win32
 		{6461F05D-4698-47AB-A8E8-1CA2ACC9948B}.3D Plugin Release.ActiveCfg = 3D Plugin Release|Win32
@@ -92,6 +109,10 @@ Global
 		{6461F05D-4698-47AB-A8E8-1CA2ACC9948B}.BlenderPlayer Debug.Build.0 = Blender Debug|Win32
 		{6461F05D-4698-47AB-A8E8-1CA2ACC9948B}.BlenderPlayer Release.ActiveCfg = Blender Debug|Win32
 		{6461F05D-4698-47AB-A8E8-1CA2ACC9948B}.BlenderPlayer Release.Build.0 = Blender Debug|Win32
+		{6461F05D-4698-47AB-A8E8-1CA2ACC9948B}.Debug.ActiveCfg = 3D Plugin Debug|Win32
+		{6461F05D-4698-47AB-A8E8-1CA2ACC9948B}.Debug.Build.0 = 3D Plugin Debug|Win32
+		{6461F05D-4698-47AB-A8E8-1CA2ACC9948B}.Release.ActiveCfg = 3D Plugin Release|Win32
+		{6461F05D-4698-47AB-A8E8-1CA2ACC9948B}.Release.Build.0 = 3D Plugin Release|Win32
 		{524264F4-DF21-4B79-847F-E7CA643ECD0B}.3D Plugin Debug.ActiveCfg = 3D Plugin Debug|Win32
 		{524264F4-DF21-4B79-847F-E7CA643ECD0B}.3D Plugin Debug.Build.0 = 3D Plugin Debug|Win32
 		{524264F4-DF21-4B79-847F-E7CA643ECD0B}.3D Plugin Release.ActiveCfg = 3D Plugin Release|Win32
@@ -104,6 +125,10 @@ Global
 		{524264F4-DF21-4B79-847F-E7CA643ECD0B}.BlenderPlayer Debug.Build.0 = Blender Release|Win32
 		{524264F4-DF21-4B79-847F-E7CA643ECD0B}.BlenderPlayer Release.ActiveCfg = Blender Release|Win32
 		{524264F4-DF21-4B79-847F-E7CA643ECD0B}.BlenderPlayer Release.Build.0 = Blender Release|Win32
+		{524264F4-DF21-4B79-847F-E7CA643ECD0B}.Debug.ActiveCfg = 3D Plugin Debug|Win32
+		{524264F4-DF21-4B79-847F-E7CA643ECD0B}.Debug.Build.0 = 3D Plugin Debug|Win32
+		{524264F4-DF21-4B79-847F-E7CA643ECD0B}.Release.ActiveCfg = 3D Plugin Release|Win32
+		{524264F4-DF21-4B79-847F-E7CA643ECD0B}.Release.Build.0 = 3D Plugin Release|Win32
 		{B83C6BED-11EC-46C8-AFFA-121EEDE94373}.3D Plugin Debug.ActiveCfg = 3D Plugin Debug|Win32
 		{B83C6BED-11EC-46C8-AFFA-121EEDE94373}.3D Plugin Debug.Build.0 = 3D Plugin Debug|Win32
 		{B83C6BED-11EC-46C8-AFFA-121EEDE94373}.3D Plugin Release.ActiveCfg = 3D Plugin Release|Win32
@@ -116,6 +141,10 @@ Global
 		{B83C6BED-11EC-46C8-AFFA-121EEDE94373}.BlenderPlayer Debug.Build.0 = Blender Debug|Win32
 		{B83C6BED-11EC-46C8-AFFA-121EEDE94373}.BlenderPlayer Release.ActiveCfg = Blender Debug|Win32
 		{B83C6BED-11EC-46C8-AFFA-121EEDE94373}.BlenderPlayer Release.Build.0 = Blender Debug|Win32
+		{B83C6BED-11EC-46C8-AFFA-121EEDE94373}.Debug.ActiveCfg = 3D Plugin Debug|Win32
+		{B83C6BED-11EC-46C8-AFFA-121EEDE94373}.Debug.Build.0 = 3D Plugin Debug|Win32
+		{B83C6BED-11EC-46C8-AFFA-121EEDE94373}.Release.ActiveCfg = 3D Plugin Release|Win32
+		{B83C6BED-11EC-46C8-AFFA-121EEDE94373}.Release.Build.0 = 3D Plugin Release|Win32
 		{0112CAD5-3584-412A-A2E5-1315A00437B4}.3D Plugin Debug.ActiveCfg = 3D Plugin Debug|Win32
 		{0112CAD5-3584-412A-A2E5-1315A00437B4}.3D Plugin Debug.Build.0 = 3D Plugin Debug|Win32
 		{0112CAD5-3584-412A-A2E5-1315A00437B4}.3D Plugin Release.ActiveCfg = 3D Plugin Release|Win32
@@ -128,6 +157,10 @@ Global
 		{0112CAD5-3584-412A-A2E5-1315A00437B4}.BlenderPlayer Debug.Build.0 = Blender Debug|Win32
 		{0112CAD5-3584-412A-A2E5-1315A00437B4}.BlenderPlayer Release.ActiveCfg = Blender Debug|Win32
 		{0112CAD5-3584-412A-A2E5-1315A00437B4}.BlenderPlayer Release.Build.0 = Blender Debug|Win32
+		{0112CAD5-3584-412A-A2E5-1315A00437B4}.Debug.ActiveCfg = 3D Plugin Debug|Win32
+		{0112CAD5-3584-412A-A2E5-1315A00437B4}.Debug.Build.0 = 3D Plugin Debug|Win32
+		{0112CAD5-3584-412A-A2E5-1315A00437B4}.Release.ActiveCfg = 3D Plugin Release|Win32
+		{0112CAD5-3584-412A-A2E5-1315A00437B4}.Release.Build.0 = 3D Plugin Release|Win32
 		{F9850C15-FF0A-429E-9D47-89FB433C9BD8}.3D Plugin Debug.ActiveCfg = 3D Plugin Debug|Win32
 		{F9850C15-FF0A-429E-9D47-89FB433C9BD8}.3D Plugin Debug.Build.0 = 3D Plugin Debug|Win32
 		{F9850C15-FF0A-429E-9D47-89FB433C9BD8}.3D Plugin Release.ActiveCfg = 3D Plugin Release|Win32
@@ -140,6 +173,10 @@ Global
 		{F9850C15-FF0A-429E-9D47-89FB433C9BD8}.BlenderPlayer Debug.Build.0 = Blender Release|Win32
 		{F9850C15-FF0A-429E-9D47-89FB433C9BD8}.BlenderPlayer Release.ActiveCfg = Blender Release|Win32
 		{F9850C15-FF0A-429E-9D47-89FB433C9BD8}.BlenderPlayer Release.Build.0 = Blender Release|Win32
+		{F9850C15-FF0A-429E-9D47-89FB433C9BD8}.Debug.ActiveCfg = 3D Plugin Debug|Win32
+		{F9850C15-FF0A-429E-9D47-89FB433C9BD8}.Debug.Build.0 = 3D Plugin Debug|Win32
+		{F9850C15-FF0A-429E-9D47-89FB433C9BD8}.Release.ActiveCfg = 3D Plugin Release|Win32
+		{F9850C15-FF0A-429E-9D47-89FB433C9BD8}.Release.Build.0 = 3D Plugin Release|Win32
 		{F9850C15-FF0A-429E-9D47-89FB433C9BD8}.3D Plugin Debug.ActiveCfg = 3D Plugin Debug|Win32
 		{F9850C15-FF0A-429E-9D47-89FB433C9BD8}.3D Plugin Debug.Build.0 = 3D Plugin Debug|Win32
 		{F9850C15-FF0A-429E-9D47-89FB433C9BD8}.3D Plugin Release.ActiveCfg = 3D Plugin Release|Win32
@@ -152,6 +189,10 @@ Global
 		{F9850C15-FF0A-429E-9D47-89FB433C9BD8}.BlenderPlayer Debug.Build.0 = Blender Release|Win32
 		{F9850C15-FF0A-429E-9D47-89FB433C9BD8}.BlenderPlayer Release.ActiveCfg = Blender Release|Win32
 		{F9850C15-FF0A-429E-9D47-89FB433C9BD8}.BlenderPlayer Release.Build.0 = Blender Release|Win32
+		{F9850C15-FF0A-429E-9D47-89FB433C9BD8}.Debug.ActiveCfg = 3D Plugin Debug|Win32
+		{F9850C15-FF0A-429E-9D47-89FB433C9BD8}.Debug.Build.0 = 3D Plugin Debug|Win32
+		{F9850C15-FF0A-429E-9D47-89FB433C9BD8}.Release.ActiveCfg = 3D Plugin Release|Win32
+		{F9850C15-FF0A-429E-9D47-89FB433C9BD8}.Release.Build.0 = 3D Plugin Release|Win32
 		{FC752464-F413-4D4F-842D-A5D3AA0E6A3D}.3D Plugin Debug.ActiveCfg = 3D Plugin Debug|Win32
 		{FC752464-F413-4D4F-842D-A5D3AA0E6A3D}.3D Plugin Release.ActiveCfg = 3D Plugin Release|Win32
 		{FC752464-F413-4D4F-842D-A5D3AA0E6A3D}.Blender Debug.ActiveCfg = Blender Debug|Win32
@@ -160,6 +201,10 @@ Global
 		{FC752464-F413-4D4F-842D-A5D3AA0E6A3D}.Blender Release.Build.0 = Blender Release|Win32
 		{FC752464-F413-4D4F-842D-A5D3AA0E6A3D}.BlenderPlayer Debug.ActiveCfg = BlenderPlayer Debug|Win32
 		{FC752464-F413-4D4F-842D-A5D3AA0E6A3D}.BlenderPlayer Release.ActiveCfg = BlenderPlayer Release|Win32
+		{FC752464-F413-4D4F-842D-A5D3AA0E6A3D}.Debug.ActiveCfg = BlenderPlayer Debug|Win32
+		{FC752464-F413-4D4F-842D-A5D3AA0E6A3D}.Debug.Build.0 = BlenderPlayer Debug|Win32
+		{FC752464-F413-4D4F-842D-A5D3AA0E6A3D}.Release.ActiveCfg = BlenderPlayer Release|Win32
+		{FC752464-F413-4D4F-842D-A5D3AA0E6A3D}.Release.Build.0 = BlenderPlayer Release|Win32
 		{FFD3C64A-30E2-4BC7-BC8F-51818C320400}.3D Plugin Debug.ActiveCfg = 3D Plugin Debug|Win32
 		{FFD3C64A-30E2-4BC7-BC8F-51818C320400}.3D Plugin Debug.Build.0 = 3D Plugin Debug|Win32
 		{FFD3C64A-30E2-4BC7-BC8F-51818C320400}.3D Plugin Release.ActiveCfg = 3D Plugin Release|Win32
@@ -172,6 +217,26 @@ Global
 		{FFD3C64A-30E2-4BC7-BC8F-51818C320400}.BlenderPlayer Debug.Build.0 = Blender Release|Win32
 		{FFD3C64A-30E2-4BC7-BC8F-51818C320400}.BlenderPlayer Release.ActiveCfg = Blender Release|Win32
 		{FFD3C64A-30E2-4BC7-BC8F-51818C320400}.BlenderPlayer Release.Build.0 = Blender Release|Win32
+		{FFD3C64A-30E2-4BC7-BC8F-51818C320400}.Debug.ActiveCfg = 3D Plugin Debug|Win32
+		{FFD3C64A-30E2-4BC7-BC8F-51818C320400}.Debug.Build.0 = 3D Plugin Debug|Win32
+		{FFD3C64A-30E2-4BC7-BC8F-51818C320400}.Release.ActiveCfg = 3D Plugin Release|Win32
+		{FFD3C64A-30E2-4BC7-BC8F-51818C320400}.Release.Build.0 = 3D Plugin Release|Win32
+		{BAC615B0-F1AF-418B-8D23-A10FD8870D6A}.3D Plugin Debug.ActiveCfg = Blender Release|Win32
+		{BAC615B0-F1AF-418B-8D23-A10FD8870D6A}.3D Plugin Debug.Build.0 = Blender Release|Win32
+		{BAC615B0-F1AF-418B-8D23-A10FD8870D6A}.3D Plugin Release.ActiveCfg = Blender Release|Win32
+		{BAC615B0-F1AF-418B-8D23-A10FD8870D6A}.3D Plugin Release.Build.0 = Blender Release|Win32
+		{BAC615B0-F1AF-418B-8D23-A10FD8870D6A}.Blender Debug.ActiveCfg = Blender Debug|Win32
+		{BAC615B0-F1AF-418B-8D23-A10FD8870D6A}.Blender Debug.Build.0 = Blender Debug|Win32
+		{BAC615B0-F1AF-418B-8D23-A10FD8870D6A}.Blender Release.ActiveCfg = Blender Release|Win32
+		{BAC615B0-F1AF-418B-8D23-A10FD8870D6A}.Blender Release.Build.0 = Blender Release|Win32
+		{BAC615B0-F1AF-418B-8D23-A10FD8870D6A}.BlenderPlayer Debug.ActiveCfg = Blender Release|Win32
+		{BAC615B0-F1AF-418B-8D23-A10FD8870D6A}.BlenderPlayer Debug.Build.0 = Blender Release|Win32
+		{BAC615B0-F1AF-418B-8D23-A10FD8870D6A}.BlenderPlayer Release.ActiveCfg = Blender Release|Win32
+		{BAC615B0-F1AF-418B-8D23-A10FD8870D6A}.BlenderPlayer Release.Build.0 = Blender Release|Win32
+		{BAC615B0-F1AF-418B-8D23-A10FD8870D6A}.Debug.ActiveCfg = Blender Debug|Win32
+		{BAC615B0-F1AF-418B-8D23-A10FD8870D6A}.Debug.Build.0 = Blender Debug|Win32
+		{BAC615B0-F1AF-418B-8D23-A10FD8870D6A}.Release.ActiveCfg = Blender Release|Win32
+		{BAC615B0-F1AF-418B-8D23-A10FD8870D6A}.Release.Build.0 = Blender Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
diff --git a/intern/bsp/intern/BSP_CSGMesh.cpp b/intern/bsp/intern/BSP_CSGMesh.cpp
index 553f39a4642..ca7795b3cf5 100644
--- a/intern/bsp/intern/BSP_CSGMesh.cpp
+++ b/intern/bsp/intern/BSP_CSGMesh.cpp
@@ -197,7 +197,7 @@ BuildEdges(
 
 		for (int vert = 0; vert < vertex_num; ++vert) {
 
-			BSP_FaceInd fi(f_it - f_it_begin);
+			BSP_FaceInd fi(size_t (f_it - f_it_begin));
 			InsertEdge(prev_vi,face.m_verts[vert],fi,dummy);
 			prev_vi = face.m_verts[vert];
 		}
diff --git a/intern/container/CTR_TaggedIndex.h b/intern/container/CTR_TaggedIndex.h
index 7a7bd85e890..68d2536c879 100644
--- a/intern/container/CTR_TaggedIndex.h
+++ b/intern/container/CTR_TaggedIndex.h
@@ -93,6 +93,16 @@ public:
 	}
 
 
+#if defined(_WIN64)
+	CTR_TaggedIndex(
+		const unsigned __int64 val
+	) :
+		m_val ( ((unsigned __int64)val & index_mask)
+				| ( (empty_tag << tag_shift)
+					& (~index_mask) ) ) {
+	}
+#endif
+
 	CTR_TaggedIndex(
 		const CTR_TaggedIndex &my_index
 	):
@@ -124,6 +134,12 @@ public:
 		return (long int)(m_val & index_mask);
 	}
 
+#if defined(_WIN64)
+	operator unsigned __int64 () const {
+			return (unsigned __int64)(m_val & index_mask);
+		}
+#endif
+
 		bool
 	IsEmpty(
 	) const {
diff --git a/intern/decimation/intern/LOD_ManMesh2.cpp b/intern/decimation/intern/LOD_ManMesh2.cpp
index eeb497bb09e..2fe49b36583 100644
--- a/intern/decimation/intern/LOD_ManMesh2.cpp
+++ b/intern/decimation/intern/LOD_ManMesh2.cpp
@@ -477,7 +477,7 @@ DeleteVertex(
 		return;
 	}
 
-	LOD_VertexInd last = LOD_VertexInd(verts.end() - verts.begin() - 1);
+	LOD_VertexInd last = LOD_VertexInd(size_t(verts.end() - verts.begin() - 1));
 
 	if (!(last == v)) {
 
@@ -533,7 +533,7 @@ DeleteEdge(
 		return;
 	}
 
-	LOD_EdgeInd last = LOD_EdgeInd(edges.end() - edges.begin() - 1);
+	LOD_EdgeInd last = LOD_EdgeInd(size_t(edges.end() - edges.begin() - 1));
 
 	if (!(last == e)) {
 		vector<LOD_EdgeInd> e_verts;
@@ -573,7 +573,7 @@ DeleteFace(
 		return;
 	}
 
-	LOD_FaceInd last = LOD_FaceInd(faces.end() - faces.begin() - 1);
+	LOD_FaceInd last = LOD_FaceInd(size_t (faces.end() - faces.begin() - 1));
 
 	if (!(last == f)) {
 		
diff --git a/intern/elbeem/intern/solver_init.cpp b/intern/elbeem/intern/solver_init.cpp
index c953d2f47da..a873f3c6987 100644
--- a/intern/elbeem/intern/solver_init.cpp
+++ b/intern/elbeem/intern/solver_init.cpp
@@ -694,7 +694,7 @@ bool LbmFsgrSolver::initializeSolverMemory()
 		double maxDefaultMemChunk = 2.*1024.*1024.*1024.;
 		//std::cerr<<" memEstFine "<< memEstFine <<" maxWin:" <<maxWinMemChunk <<" maxMac:" <<maxMacMemChunk ; // DEBUG
 #ifdef WIN32
-		if(memEstFine> maxWinMemChunk) {
+		if(sizeof(void *)==4 && memEstFine>maxWinMemChunk) {
 			memBlockAllocProblem = true;
 		}
 #endif // WIN32
diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp
index 82a76b3c706..f5c7c08ebfe 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.cpp
+++ b/intern/ghost/intern/GHOST_SystemWin32.cpp
@@ -42,6 +42,14 @@
 
 #include "GHOST_SystemWin32.h"
 
+// win64 doesn't define GWL_USERDATA
+#ifdef WIN32
+#ifndef GWL_USERDATA
+#define GWL_USERDATA GWLP_USERDATA
+#define GWL_WNDPROC GWLP_WNDPROC
+#endif
+#endif
+
 /*
  * According to the docs the mouse wheel message is supported from windows 98 
  * upwards. Leaving WINVER at default value, the WM_MOUSEWHEEL message and the 
@@ -302,6 +310,15 @@ GHOST_TSuccess GHOST_SystemWin32::init()
 {
 	GHOST_TSuccess success = GHOST_System::init();
 
+	/* Disable scaling on high DPI displays on Vista */
+	HMODULE user32 = ::LoadLibraryA("user32.dll");
+	typedef BOOL (WINAPI * LPFNSETPROCESSDPIAWARE)();
+	LPFNSETPROCESSDPIAWARE SetProcessDPIAware =
+		(LPFNSETPROCESSDPIAWARE)GetProcAddress(user32, "SetProcessDPIAware");
+	if (SetProcessDPIAware)
+		SetProcessDPIAware();
+	FreeLibrary(user32);
+
 	// Determine whether this system has a high frequency performance counter. */
 	m_hasPerformanceCounter = ::QueryPerformanceFrequency((LARGE_INTEGER*)&m_freq) == TRUE;
 	if (m_hasPerformanceCounter) {
diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp
index ff1bf51bbb5..3003e0b8b14 100644
--- a/intern/ghost/intern/GHOST_SystemX11.cpp
+++ b/intern/ghost/intern/GHOST_SystemX11.cpp
@@ -488,12 +488,12 @@ GHOST_SystemX11::processEvent(XEvent *xe)
 					data.changed = 1;
 					data.delta = xcme.data.s[8] - data.time;
 					data.time = xcme.data.s[8];
-					data.tx = xcme.data.s[2];
-					data.ty = xcme.data.s[3];
-					data.tz = xcme.data.s[4];
+					data.tx = xcme.data.s[2] >> 2;
+					data.ty = xcme.data.s[3] >> 2;
+					data.tz = xcme.data.s[4] >> 2;
 					data.rx = xcme.data.s[5];
 					data.ry = xcme.data.s[6];
-					data.rz = xcme.data.s[7];
+					data.rz =-xcme.data.s[7];
 					g_event = new GHOST_EventNDOF(getMilliSeconds(),
 					                              GHOST_kEventNDOFMotion,
 					                              window, data);
diff --git a/intern/ghost/intern/GHOST_WindowWin32.cpp b/intern/ghost/intern/GHOST_WindowWin32.cpp
index 905b2f7ac63..fef58d071a4 100644
--- a/intern/ghost/intern/GHOST_WindowWin32.cpp
+++ b/intern/ghost/intern/GHOST_WindowWin32.cpp
@@ -48,6 +48,14 @@
 #define M_PI 3.1415926536
 #endif
 
+// win64 doesn't define GWL_USERDATA
+#ifdef WIN32
+#ifndef GWL_USERDATA
+#define GWL_USERDATA GWLP_USERDATA
+#define GWL_WNDPROC GWLP_WNDPROC
+#endif
+#endif
+
 LPCSTR GHOST_WindowWin32::s_windowClassName = "GHOST_WindowClass";
 const int GHOST_WindowWin32::s_maxTitleLength = 128;
 HGLRC GHOST_WindowWin32::s_firsthGLRc = NULL;
diff --git a/intern/iksolver/intern/IK_QTask.h b/intern/iksolver/intern/IK_QTask.h
index c291a0e7e50..4d469d737f8 100644
--- a/intern/iksolver/intern/IK_QTask.h
+++ b/intern/iksolver/intern/IK_QTask.h
@@ -74,7 +74,7 @@ public:
 
 	virtual bool PositionTask() const { return false; }
 
-	virtual void Scale(float scale) {}
+	virtual void Scale(float) {}
 
 protected:
 	int m_id;
diff --git a/intern/moto/include/GEN_Map.h b/intern/moto/include/GEN_Map.h
index db3335d6110..9f56924419e 100644
--- a/intern/moto/include/GEN_Map.h
+++ b/intern/moto/include/GEN_Map.h
@@ -82,6 +82,24 @@ public:
         }
         return 0;
     }
+
+    Key* getKey(int index) {
+        int count=0;
+        for (int i=0;i<m_num_buckets;i++)
+        {
+            Entry* bucket = m_buckets[i];
+            while(bucket)
+            {
+                if (count==index)
+                {
+                    return &bucket->m_key;
+                }
+                bucket = bucket->m_next;
+                count++;
+            }
+        }
+        return 0;
+    }
     
     void clear() {
         for (int i = 0; i < m_num_buckets; ++i) {
diff --git a/intern/moto/include/MT_random.h b/intern/moto/include/MT_random.h
index d7da546cf03..3afe1dd1662 100644
--- a/intern/moto/include/MT_random.h
+++ b/intern/moto/include/MT_random.h
@@ -31,10 +31,10 @@
 
 #include <limits.h>
 
-#define MT_RAND_MAX ULONG_MAX
+#define MT_RAND_MAX UINT_MAX
 
-extern void          MT_srand(unsigned long);
-extern unsigned long MT_rand();
+extern void          MT_srand(unsigned int);
+extern unsigned int  MT_rand();
 
 #endif
 
diff --git a/intern/moto/intern/MT_random.cpp b/intern/moto/intern/MT_random.cpp
index 96cb394d3da..b8302e093ca 100644
--- a/intern/moto/intern/MT_random.cpp
+++ b/intern/moto/intern/MT_random.cpp
@@ -76,11 +76,11 @@
 #define TEMPERING_SHIFT_T(y)  (y << 15)
 #define TEMPERING_SHIFT_L(y)  (y >> 18)
 
-static unsigned long mt[N]; /* the array for the state vector  */
+static unsigned int mt[N]; /* the array for the state vector  */
 static int mti = N+1; /* mti==N+1 means mt[N] is not initialized */
 
 /* initializing the array with a NONZERO seed */
-void MT_srand(unsigned long seed)
+void MT_srand(unsigned int seed)
 {
     /* setting initial seeds to mt[N] using         */
     /* the generator Line 25 of Table 1 in          */
@@ -91,12 +91,12 @@ void MT_srand(unsigned long seed)
         mt[mti] = (69069 * mt[mti-1]) & 0xffffffff;
 }
 
-unsigned long MT_rand()
+unsigned int MT_rand()
 {
-    static unsigned long mag01[2] = { 0x0, MATRIX_A };
+    static unsigned int mag01[2] = { 0x0, MATRIX_A };
     /* mag01[x] = x * MATRIX_A  for x=0,1 */
 
-    unsigned long y;
+    unsigned int y;
 
     if (mti >= N) { /* generate N words at one time */
         int kk;
diff --git a/projectfiles_vc7/blender/blender.vcproj b/projectfiles_vc7/blender/blender.vcproj
index 2f73bfefd27..6372a2f73f5 100644
--- a/projectfiles_vc7/blender/blender.vcproj
+++ b/projectfiles_vc7/blender/blender.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="SDL.lib freetype2ST.lib ftgl_static.lib gnu_gettext.lib qtmlClient.lib openal_static.lib libsoundsystem.lib libopenalsoundsystem.lib libdummysoundsystem.lib libguardedalloc.lib libbsp.lib libbmfont.lib libghost.lib libstring.lib ws2_32.lib dxguid.lib opengl32.lib libjpeg.lib glu32.lib vfw32.lib winmm.lib libdecimation.lib libiksolver.lib libpng_st.lib zlib.lib libmoto.lib solid.lib qhull.lib libopennl.lib Bullet.lib python25.lib libelbeem.lib libboolop.lib pthreadVSE2.lib pthreadVC2.lib libtiff.lib broad.lib complex.lib convex.lib memutil.lib verse.lib Half.lib Iex.lib IlmImf.lib Imath.lib IlmThread.lib avcodec-51.lib avformat-52.lib avutil-49.lib swscale-0.lib"
+				AdditionalDependencies="SDL.lib freetype2ST.lib ftgl_static.lib gnu_gettext.lib qtmlClient.lib openal_static.lib libsoundsystem.lib libopenalsoundsystem.lib libdummysoundsystem.lib libguardedalloc.lib libbsp.lib libbmfont.lib libghost.lib libstring.lib ws2_32.lib dxguid.lib opengl32.lib libjpeg.lib glu32.lib vfw32.lib winmm.lib libdecimation.lib libiksolver.lib libpng_st.lib zlib.lib libmoto.lib solid.lib qhull.lib libopennl.lib Bullet.lib python25.lib libelbeem.lib libboolop.lib pthreadVSE2.lib pthreadVC2.lib libtiff.lib broad.lib complex.lib convex.lib memutil.lib verse.lib Half.lib Iex.lib IlmImf.lib Imath.lib IlmThread.lib avcodec-51.lib avformat-52.lib avutil-49.lib swscale-0.lib glew.lib"
 				ShowProgress="0"
 				OutputFile="..\..\bin\blender.exe"
 				LinkIncremental="1"
@@ -124,7 +124,7 @@ ECHO Done
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386
 "
-				AdditionalDependencies="SDL.lib freetype2ST.lib ftgl_static.lib gnu_gettext.lib qtmlClient.lib openal_static.lib libsoundsystem.lib libopenalsoundsystem.lib libdummysoundsystem.lib libguardedalloc.lib libbsp.lib libbmfont.lib libghost.lib libstring.lib ws2_32.lib dxguid.lib opengl32.lib libjpeg.lib glu32.lib vfw32.lib winmm.lib libdecimation.lib libiksolver.lib libpng_st.lib zlib.lib libmoto.lib solid.lib qhull.lib libopennl.lib Bullet.lib python25_d.lib libelbeem.lib libboolop.lib pthreadVSE2.lib pthreadVC2.lib libtiff.lib broad.lib complex.lib convex.lib memutil.lib verse.lib Half.lib Iex.lib Imath.lib IlmImf.lib IlmThread.lib avcodec-51.lib avformat-52.lib avutil-49.lib swscale-0.lib"
+				AdditionalDependencies="SDL.lib freetype2ST.lib ftgl_static.lib gnu_gettext.lib qtmlClient.lib openal_static.lib libsoundsystem.lib libopenalsoundsystem.lib libdummysoundsystem.lib libguardedalloc.lib libbsp.lib libbmfont.lib libghost.lib libstring.lib ws2_32.lib dxguid.lib opengl32.lib libjpeg.lib glu32.lib vfw32.lib winmm.lib libdecimation.lib libiksolver.lib libpng_st.lib zlib.lib libmoto.lib solid.lib qhull.lib libopennl.lib Bullet.lib python25_d.lib libelbeem.lib libboolop.lib pthreadVSE2.lib pthreadVC2.lib libtiff.lib broad.lib complex.lib convex.lib memutil.lib verse.lib Half.lib Iex.lib Imath.lib IlmImf.lib IlmThread.lib avcodec-51.lib avformat-52.lib avutil-49.lib swscale-0.lib glew.lib"
 				ShowProgress="0"
 				OutputFile="..\..\bin\debug\blender.exe"
 				LinkIncremental="2"
diff --git a/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj b/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
index 98bb21e7ad1..8efff1742b0 100644
--- a/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
+++ b/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
@@ -344,6 +344,9 @@
 			<File
 				RelativePath="..\..\..\source\blender\blenkernel\intern\BME_conversions.c">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\blenkernel\intern\BME_Customdata.c">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\blenkernel\intern\BME_eulers.c">
 			</File>
@@ -425,9 +428,6 @@
 			<File
 				RelativePath="..\..\..\source\blender\blenkernel\intern\ipo.c">
 			</File>
-			<File
-				RelativePath="..\..\..\source\blender\blenkernel\intern\kdop.c">
-			</File>
 			<File
 				RelativePath="..\..\..\source\blender\blenkernel\intern\key.c">
 			</File>
@@ -558,6 +558,9 @@
 			<File
 				RelativePath="..\..\..\source\blender\blenkernel\BKE_bmesh.h">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\blenkernel\BKE_bmeshCustomData.h">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\blenkernel\BKE_bmfont.h">
 			</File>
diff --git a/projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj b/projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj
index 8a2b8b95e38..0dfbcaa5577 100644
--- a/projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj
+++ b/projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj
@@ -346,6 +346,9 @@
 			<File
 				RelativePath="..\..\..\source\blender\blenlib\intern\BLI_heap.c">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\blenlib\intern\BLI_kdopbvh.c">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\blenlib\intern\BLI_kdtree.c">
 			</File>
@@ -355,6 +358,9 @@
 			<File
 				RelativePath="..\..\..\source\blender\blenlib\intern\BLI_memarena.c">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\blenlib\intern\BLI_mempool.c">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\blenlib\intern\boxpack2d.c">
 			</File>
@@ -458,6 +464,9 @@
 			<File
 				RelativePath="..\..\..\source\blender\blenlib\BLI_jitter.h">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\blenlib\BLI_kdopbvh.h">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\blenlib\BLI_kdtree.h">
 			</File>
@@ -467,6 +476,9 @@
 			<File
 				RelativePath="..\..\..\source\blender\blenlib\BLI_memarena.h">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\blenlib\BLI_mempool.h">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\blenlib\intern\BLI_scanfill.h">
 			</File>
diff --git a/projectfiles_vc7/blender/render/BRE_render.vcproj b/projectfiles_vc7/blender/render/BRE_render.vcproj
index 4869dd606f1..4331d6e1579 100644
--- a/projectfiles_vc7/blender/render/BRE_render.vcproj
+++ b/projectfiles_vc7/blender/render/BRE_render.vcproj
@@ -74,7 +74,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\lib\windows\sdl\include;..\..\..\..\build\msvc_7\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\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"
+				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_QUICKTIME;WITH_OPENEXR;_USE_MATH_DEFINES"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				DefaultCharIsUnsigned="TRUE"
@@ -175,6 +175,9 @@
 			<File
 				RelativePath="..\..\..\source\blender\render\intern\source\strand.c">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\render\intern\source\sunsky.c">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\render\intern\source\texture.c">
 			</File>
@@ -245,6 +248,9 @@
 			<File
 				RelativePath="..\..\..\source\blender\render\intern\include\strand.h">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\render\intern\include\sunsky.h">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\render\intern\include\texture.h">
 			</File>
diff --git a/projectfiles_vc7/blender/src/BL_src.vcproj b/projectfiles_vc7/blender/src/BL_src.vcproj
index 6f91aeed8b5..226bedbbfd8 100644
--- a/projectfiles_vc7/blender/src/BL_src.vcproj
+++ b/projectfiles_vc7/blender/src/BL_src.vcproj
@@ -21,7 +21,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\build\msvc_7\intern\bsp\include;..\..\..\..\build\msvc_7\intern\ghost\include;..\..\..\..\build\msvc_7\intern\elbeem\include;..\..\..\..\build\msvc_7\intern\opennl\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\blenkey\include;..\..\..\..\build\msvc_7\intern\decimation\include;..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\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_7\extern\verse\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\ffmpeg\include"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\build\msvc_7\intern\bsp\include;..\..\..\..\build\msvc_7\intern\ghost\include;..\..\..\..\build\msvc_7\intern\elbeem\include;..\..\..\..\build\msvc_7\intern\opennl\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\blenkey\include;..\..\..\..\build\msvc_7\intern\decimation\include;..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\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_7\extern\verse\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\ffmpeg\include"
 				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"
@@ -73,7 +73,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\build\msvc_7\intern\bsp\include;..\..\..\..\build\msvc_7\intern\ghost\include;..\..\..\..\build\msvc_7\intern\elbeem\include;..\..\..\..\build\msvc_7\intern\opennl\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\blenkey\include;..\..\..\..\build\msvc_7\intern\decimation\include;..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\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_7\extern\verse\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\ffmpeg\include"
+				AdditionalIncludeDirectories="..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\build\msvc_7\intern\bsp\include;..\..\..\..\build\msvc_7\intern\ghost\include;..\..\..\..\build\msvc_7\intern\elbeem\include;..\..\..\..\build\msvc_7\intern\opennl\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\blenkey\include;..\..\..\..\build\msvc_7\intern\decimation\include;..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\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_7\extern\verse\include;..\..\..\..\lib\windows\pthreads\include;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\..\build\msvc_7\extern\glew\include"
 				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_vc7/gameengine/blenderhook/KX_blenderhook.vcproj b/projectfiles_vc7/gameengine/blenderhook/KX_blenderhook.vcproj
index c54666c08cd..b020d88b2b3 100644
--- a/projectfiles_vc7/gameengine/blenderhook/KX_blenderhook.vcproj
+++ b/projectfiles_vc7/gameengine/blenderhook/KX_blenderhook.vcproj
@@ -21,7 +21,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\solid\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"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\build\msvc_7\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"
 				PreprocessorDefinitions="WIN32;_LIB;_DEBUG;WITH_GLEXT"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -74,7 +74,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\solid\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"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\build\msvc_7\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"
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;USE_SUMO_SOLID;WITH_GLEXT"
 				StringPooling="TRUE"
 				BasicRuntimeChecks="0"
diff --git a/projectfiles_vc7/gameengine/converter/KX_converter.vcproj b/projectfiles_vc7/gameengine/converter/KX_converter.vcproj
index 36a49364dfc..239a5a38a79 100644
--- a/projectfiles_vc7/gameengine/converter/KX_converter.vcproj
+++ b/projectfiles_vc7/gameengine/converter/KX_converter.vcproj
@@ -347,6 +347,12 @@
 			<File
 				RelativePath="..\..\..\source\gameengine\Converter\BL_MeshDeformer.cpp">
 			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\Converter\BL_ShapeActionActuator.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\Converter\BL_ShapeDeformer.cpp">
+			</File>
 			<File
 				RelativePath="..\..\..\source\gameengine\Converter\BL_SkinDeformer.cpp">
 			</File>
@@ -396,6 +402,12 @@
 			<File
 				RelativePath="..\..\..\source\gameengine\Converter\BL_MeshDeformer.h">
 			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\Converter\BL_ShapeActionActuator.h">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\Converter\BL_ShapeDeformer.h">
+			</File>
 			<File
 				RelativePath="..\..\..\source\gameengine\Converter\BL_SkinDeformer.h">
 			</File>
diff --git a/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj b/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj
index 07fcfa64a72..7e2db4f564f 100644
--- a/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj
+++ b/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj
@@ -332,6 +332,12 @@
 			<File
 				RelativePath="..\..\..\source\gameengine\GameLogic\SCA_2DFilterActuator.cpp">
 			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\GameLogic\SCA_ActuatorEventManager.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\GameLogic\SCA_ActuatorSensor.cpp">
+			</File>
 			<File
 				RelativePath="..\..\..\source\gameengine\GameLogic\SCA_AlwaysEventManager.cpp">
 			</File>
@@ -395,6 +401,12 @@
 			<File
 				RelativePath="..\..\..\source\gameengine\GameLogic\SCA_MouseSensor.cpp">
 			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\GameLogic\SCA_NANDController.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\GameLogic\SCA_NORController.cpp">
+			</File>
 			<File
 				RelativePath="..\..\..\source\gameengine\GameLogic\SCA_ORController.cpp">
 			</File>
@@ -425,6 +437,12 @@
 			<File
 				RelativePath="..\..\..\source\gameengine\GameLogic\SCA_TimeEventManager.cpp">
 			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\GameLogic\SCA_XNORController.cpp">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\GameLogic\SCA_XORController.cpp">
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -432,6 +450,12 @@
 			<File
 				RelativePath="..\..\..\source\gameengine\GameLogic\SCA_2DFilterActuator.h">
 			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\GameLogic\SCA_ActuatorEventManager.h">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\GameLogic\SCA_ActuatorSensor.h">
+			</File>
 			<File
 				RelativePath="..\..\..\source\gameengine\GameLogic\SCA_AlwaysEventManager.h">
 			</File>
@@ -498,6 +522,12 @@
 			<File
 				RelativePath="..\..\..\source\gameengine\GameLogic\SCA_MouseSensor.h">
 			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\GameLogic\SCA_NANDController.h">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\GameLogic\SCA_NORController.h">
+			</File>
 			<File
 				RelativePath="..\..\..\source\gameengine\GameLogic\SCA_ORController.h">
 			</File>
@@ -528,6 +558,12 @@
 			<File
 				RelativePath="..\..\..\source\gameengine\GameLogic\SCA_TimeEventManager.h">
 			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\GameLogic\SCA_XNORController.h">
+			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\GameLogic\SCA_XORController.h">
+			</File>
 		</Filter>
 	</Files>
 	<Globals>
diff --git a/projectfiles_vc7/gameengine/gameplayer/common/GP_common.vcproj b/projectfiles_vc7/gameengine/gameplayer/common/GP_common.vcproj
index cba8b1558c9..223a1187347 100644
--- a/projectfiles_vc7/gameengine/gameplayer/common/GP_common.vcproj
+++ b/projectfiles_vc7/gameengine/gameplayer/common/GP_common.vcproj
@@ -124,7 +124,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\..\lib\windows\zlib\include;..\..\..\..\..\lib\windows\png\include;..\..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\..\build\msvc_7\intern\openal\include;..\..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\..\build\msvc_7\intern\SoundSystem\include;..\..\..\..\..\build\msvc_7\extern\solid\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"
+				AdditionalIncludeDirectories="..\..\..\..\..\lib\windows\zlib\include;..\..\..\..\..\lib\windows\png\include;..\..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\..\build\msvc_7\intern\openal\include;..\..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\..\build\msvc_7\intern\SoundSystem\include;..\..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\..\build\msvc_7\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"
 				PreprocessorDefinitions="WIN32,_LIB,_DEBUG"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -175,7 +175,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\..\lib\windows\zlib\include;..\..\..\..\..\lib\windows\png\include;..\..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\..\build\msvc_7\intern\openal\include;..\..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\..\build\msvc_7\intern\SoundSystem\include;..\..\..\..\..\build\msvc_7\extern\solid\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"
+				AdditionalIncludeDirectories="..\..\..\..\..\lib\windows\zlib\include;..\..\..\..\..\lib\windows\png\include;..\..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\..\build\msvc_7\intern\openal\include;..\..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\..\build\msvc_7\intern\SoundSystem\include;..\..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\..\build\msvc_7\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"
 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
diff --git a/projectfiles_vc7/gameengine/gameplayer/ghost/GP_ghost.vcproj b/projectfiles_vc7/gameengine/gameplayer/ghost/GP_ghost.vcproj
index c2122f060d6..8f79250d1ea 100644
--- a/projectfiles_vc7/gameengine/gameplayer/ghost/GP_ghost.vcproj
+++ b/projectfiles_vc7/gameengine/gameplayer/ghost/GP_ghost.vcproj
@@ -21,7 +21,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\ghost\include;..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\build\msvc_7\intern\openal\include;..\..\..\..\..\build\msvc_7\intern\opennl\include;..\..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\..\build\msvc_7\intern\iksolver\include;..\..\..\..\..\build\msvc_7\intern\SoundSystem\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"
+				AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\ghost\include;..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\build\msvc_7\intern\openal\include;..\..\..\..\..\build\msvc_7\intern\opennl\include;..\..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\..\build\msvc_7\intern\iksolver\include;..\..\..\..\..\build\msvc_7\intern\SoundSystem\include;..\..\..\..\..\build\msvc_7\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"
 				PreprocessorDefinitions="WIN32,_CONSOLE,dSINGLE, _DEBUG"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -40,7 +40,7 @@
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386
 "
-				AdditionalDependencies="libguardedalloc.lib libstring.lib libghost.lib odelib.lib fmodvc.lib libbmfont.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 libmoto.lib libSoundSystem.lib qtmlClient.lib libDummySoundSystem.lib libOpenALSoundSystem.lib SDL.lib solid.lib freetype2ST.lib Bullet.lib libdecimation.lib python25_d.lib pthreadVSE2.lib pthreadVC2.lib verse.lib libopennl.lib avcodec-51.lib avformat-52.lib avutil-49.lib swscale-0.lib"
+				AdditionalDependencies="libguardedalloc.lib libstring.lib libghost.lib odelib.lib fmodvc.lib libbmfont.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 libmoto.lib libSoundSystem.lib qtmlClient.lib libDummySoundSystem.lib libOpenALSoundSystem.lib SDL.lib solid.lib freetype2ST.lib Bullet.lib libdecimation.lib python25_d.lib pthreadVSE2.lib pthreadVC2.lib verse.lib libopennl.lib avcodec-51.lib avformat-52.lib avutil-49.lib swscale-0.lib glew.lib"
 				ShowProgress="0"
 				OutputFile="..\..\..\..\bin\debug\blenderplayer.exe"
 				LinkIncremental="2"
@@ -98,7 +98,7 @@ ECHO Done
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\ghost\include;..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\build\msvc_7\intern\openal\include;..\..\..\..\..\build\msvc_7\intern\opennl\include;..\..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\..\build\msvc_7\intern\iksolver\include;..\..\..\..\..\build\msvc_7\intern\SoundSystem\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"
+				AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\ghost\include;..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\build\msvc_7\intern\openal\include;..\..\..\..\..\build\msvc_7\intern\opennl\include;..\..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\..\build\msvc_7\intern\iksolver\include;..\..\..\..\..\build\msvc_7\intern\SoundSystem\include;..\..\..\..\..\build\msvc_7\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"
 				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -117,7 +117,7 @@ ECHO Done
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="libguardedalloc.lib libstring.lib libghost.lib odelib.lib fmodvc.lib libbmfont.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 libmoto.lib libSoundSystem.lib qtmlClient.lib libDummySoundSystem.lib libOpenALSoundSystem.lib SDL.lib solid.lib freetype2ST.lib Bullet.lib libdecimation.lib python25.lib pthreadVSE2.lib pthreadVC2.lib verse.lib libopennl.lib avcodec-51.lib avformat-52.lib avutil-49.lib swscale-0.lib"
+				AdditionalDependencies="libguardedalloc.lib libstring.lib libghost.lib odelib.lib fmodvc.lib libbmfont.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 libmoto.lib libSoundSystem.lib qtmlClient.lib libDummySoundSystem.lib libOpenALSoundSystem.lib SDL.lib solid.lib freetype2ST.lib Bullet.lib libdecimation.lib python25.lib pthreadVSE2.lib pthreadVC2.lib verse.lib libopennl.lib avcodec-51.lib avformat-52.lib avutil-49.lib swscale-0.lib glew.lib"
 				OutputFile="..\..\..\..\bin\blenderplayer.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
diff --git a/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj b/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
index 2b7a24ed7ad..9d5a9f55074 100644
--- a/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
+++ b/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
@@ -21,7 +21,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\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"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\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"
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;USE_SUMO_SOLID"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -74,7 +74,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\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"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\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"
 				PreprocessorDefinitions="WIN32;_LIB;EXP_PYTHON_EMBEDDING;_DEBUG;USE_SUMO_SOLID"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -126,7 +126,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\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"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\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"
 				PreprocessorDefinitions="JANCODEPANCO;WIN32;_LIB;EXP_PYTHON_EMBEDDING;_DEBUG;USE_SUMO_SOLID;WITH_GLEXT"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -179,7 +179,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\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"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\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"
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;USE_SUMO_SOLID;WITH_GLEXT"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -232,7 +232,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\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"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\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"
 				PreprocessorDefinitions="JANCODEPANCO;WIN32;_LIB;EXP_PYTHON_EMBEDDING;_DEBUG;USE_SUMO_SOLID;WITH_GLEXT"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -284,7 +284,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\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"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\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"
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;USE_SUMO_SOLID;WITH_GLEXT"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -333,6 +333,9 @@
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			<File
+				RelativePath="..\..\..\source\gameengine\Ketsji\BL_BlenderShader.cpp">
+			</File>
 			<File
 				RelativePath="..\..\..\source\gameengine\Ketsji\BL_Material.cpp">
 			</File>
@@ -459,6 +462,9 @@
 				<File
 					RelativePath="..\..\..\source\gameengine\Ketsji\KX_SCA_AddObjectActuator.cpp">
 				</File>
+				<File
+					RelativePath="..\..\..\source\gameengine\Ketsji\KX_SCA_DynamicActuator.cpp">
+				</File>
 				<File
 					RelativePath="..\..\..\source\gameengine\Ketsji\KX_SCA_EndObjectActuator.cpp">
 				</File>
@@ -471,6 +477,9 @@
 				<File
 					RelativePath="..\..\..\source\gameengine\Ketsji\KX_SoundActuator.cpp">
 				</File>
+				<File
+					RelativePath="..\..\..\source\gameengine\Ketsji\KX_StateActuator.cpp">
+				</File>
 				<File
 					RelativePath="..\..\..\source\gameengine\Ketsji\KX_TrackToActuator.cpp">
 				</File>
@@ -539,6 +548,9 @@
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl">
+			<File
+				RelativePath="..\..\..\source\gameengine\Ketsji\BL_BlenderShader.h">
+			</File>
 			<File
 				RelativePath="..\..\..\source\gameengine\Ketsji\BL_Material.h">
 			</File>
@@ -677,6 +689,9 @@
 				<File
 					RelativePath="..\..\..\source\gameengine\Ketsji\KX_SCA_AddObjectActuator.h">
 				</File>
+				<File
+					RelativePath="..\..\..\source\gameengine\Ketsji\KX_SCA_DynamicActuator.h">
+				</File>
 				<File
 					RelativePath="..\..\..\source\gameengine\Ketsji\KX_SCA_EndObjectActuator.h">
 				</File>
@@ -689,6 +704,9 @@
 				<File
 					RelativePath="..\..\..\source\gameengine\Ketsji\KX_SoundActuator.h">
 				</File>
+				<File
+					RelativePath="..\..\..\source\gameengine\Ketsji\KX_StateActuator.h">
+				</File>
 				<File
 					RelativePath="..\..\..\source\gameengine\Ketsji\KX_TrackToActuator.h">
 				</File>
diff --git a/projectfiles_vc7/gameengine/rasterizer/RAS_rasterizer.vcproj b/projectfiles_vc7/gameengine/rasterizer/RAS_rasterizer.vcproj
index 40a92a5c181..9d55a7712fc 100644
--- a/projectfiles_vc7/gameengine/rasterizer/RAS_rasterizer.vcproj
+++ b/projectfiles_vc7/gameengine/rasterizer/RAS_rasterizer.vcproj
@@ -21,7 +21,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\source\kernel\gen_system"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Expressions;..\..\..\..\lib\windows\python\include\python2.5"
 				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_GLEXT"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -73,7 +73,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\source\kernel\gen_system"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\source\kernel\gen_system"
 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -125,7 +125,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\source\kernel\gen_system"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Expressions;..\..\..\..\lib\windows\python\include\python2.5"
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;WITH_GLEXT"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -177,7 +177,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\source\kernel\gen_system"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\source\kernel\gen_system"
 				PreprocessorDefinitions="_DEBUG,WIN32,_LIB"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -229,7 +229,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\source\kernel\gen_system"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Expressions;..\..\..\..\lib\windows\python\include\python2.5"
 				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_GLEXT"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -281,7 +281,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\source\kernel\gen_system"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\Expressions;..\..\..\..\lib\windows\python\include\python2.5"
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;WITH_GLEXT"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
diff --git a/projectfiles_vc7/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.vcproj b/projectfiles_vc7/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.vcproj
index b21c0fff7ee..c3b417a95f6 100644
--- a/projectfiles_vc7/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.vcproj
+++ b/projectfiles_vc7/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.vcproj
@@ -21,7 +21,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\gameengine\Rasterizer"
+				AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\gameengine\Rasterizer"
 				PreprocessorDefinitions="_DEBUG,WIN32,_LIB"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -73,7 +73,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\gameengine\Rasterizer"
+				AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\gameengine\Rasterizer"
 				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_GLEXT"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -125,7 +125,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\gameengine\Rasterizer"
+				AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\gameengine\Rasterizer"
 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -177,7 +177,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\gameengine\Rasterizer"
+				AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\gameengine\Rasterizer"
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;WITH_GLEXT"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -229,7 +229,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\gameengine\Rasterizer"
+				AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\gameengine\Rasterizer"
 				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_GLEXT"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -281,7 +281,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\gameengine\Rasterizer"
+				AdditionalIncludeDirectories="..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\source\kernel\gen_system;..\..\..\..\source\gameengine\Rasterizer"
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;WITH_GLEXT"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -345,15 +345,6 @@
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl">
-			<File
-				RelativePath="..\..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer\ARB_multitexture.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer\EXT_separate_specular_color.h">
-			</File>
-			<File
-				RelativePath="..\..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer\glext.h">
-			</File>
 			<File
 				RelativePath="..\..\..\..\source\gameengine\Rasterizer\RAS_OpenGLRasterizer\RAS_GLExtensionManager.h">
 			</File>
diff --git a/release/datafiles/blenderbuttons b/release/datafiles/blenderbuttons
index ebd0ec82ebda124f306c90764fe75abfb055b279..a4834091692c0cc61b50ad4c1604350d12622b2e 100644
GIT binary patch
literal 69599
zcmZ^~by!qg*f+X|mhMjJMv?AD8brE5X@-=BLApUwX_0Q}F6nNiyStmSpZELTbDe+A
zzzpn}xi;)s>%P~oR=Apq90n>WDgXc&@8zX6000jB6#}3jfj@fUMlJt4a?y~J1j<Lr
z_rL=rGetRR;N`!s?AC$=@R?VR^13bnfQI+q9RmDFCkCHHc73lbgZvi}4-Ex^=0}(g
z0Mx*HX$eh_`9oh%1I?}Hmj{9B>XX6-Sj5BERZ<(Z!hyMW1YFfev#l!0Wyzo2pjShz
zHuJ@Me}C%Qyt46dL8O?DTO?4#L&TAYvo{I(H<rG0(>FX0>tM@PA9?6$Np;yC_Re(4
z+<Ln6$&8kkkx_403n6p(@4=sy>sW5}e-EhA1=0`!>SGkx|9RD+ffo3mxBd69062DI
z@Gbt&1JeKdhO-o4<=SMq#q-a{pS8Ag%e=`QBRku+h^|NTwf;KyzpJaQ4GhSgcKWhX
zP8J(oIEdN`3z-@&x<_ubw_WCeTOlcyBwjDr+wW1Xo37>h^_W4}>!Sj5=N{LG|KwFw
zq5LWe3ipb_Ln7W|HS^eXDlyNBDJ0=9Dq(J|I1u>#Dx$mjdO<tg!$SKgGXE)*jwPm2
z@9V?xq5l3j{n!HKG{UUZ)YK&$N~FB)y6W8hVojDj85tP>c6#av+<tiXS~;3EGGOMX
z<uTLAY?(d<@ANMX=A}A&{qD2T452rsT|prmmzS>hawL#9Z{FYoDp{h+^BYZ3R2F5#
zz;E6iV;yNepo2XFvs4Qzs#}5p&@nR7($M7eT$ZWosL~F-&bWWNHQu1;Cwldm)e0E)
zsxaYC<p9|1o>b8HD!FOIh0_G9?Di2K+S8Jf2vU-h8R|t+($mSa;^N|#;`g<@Ya#w2
z53P6}JJCd8DIF=hJ(9&0GjFf-=x;h1OI`@8Hx5aG|1P-t8Cs&IPxj5do;^UD&v<&J
zuzP_SI>7z*?P^`fkrYEhJb1-=nwmjBf4)9ksITbu!kukN9<Y#RNO<*2qsXZzf`AcX
zvep$$tM_nxxi>|&TwVGKDVGwd6@nCa*Ylf=ki%eCQ_rraT|g<7YYmGBj{J?EnVH$4
zGdLy;<zX$|rxy}NYwmH`tV;b7Jw%p{ZP}#U$@Y%B2l1ccF;SaH&I6pAF{<d!*b$Vx
zN%J^m;Pqs>@3`mZ9Fc&U4v+V5G4HcNs9?l0QQceh%#)Loo7UFW6hB*k=U0i$!^FCu
z>iBrebQLKvB3IkvF8Mis`4e|D(nx>M?hD7UF>7+=*>f=B7Pvih5S$2ccY;9!@O(;+
z3n6jw@iZ&fCwy_|%Nm|$X0NRkA=Rj2fTneEfVjz7r+YS=rucnD47~;W$1pL$=sMXB
zcr0NU_#p*_hPpRcGNz<agx}tJup|r+e^(-8NK#PLF4b|GSEo$=WXeTM7PO-EsG1=d
zyw)8mlvJLWxFXW=uiBE9o4Yz5GEVuaC&`E3_x|0$=x9D3qe{zBH9Rt=$-!(HMqgR9
ze#3|dwC@;J8Ro$BaoV(xn;S>oO#Sq(WLKb-@ofgSKkN2rh9bn|>Hf-|quO-AIlIv)
zR>NAlWX=%Va&4)zKF(`xgm=r*JIuk`xkip|Rb>V0O~c682j3wAwAiW4!SzQ*N0&Jz
z$_-hQNF^C@dG5Pb!O2#MckHmbnaMIuI}1~(&QiZ2z1!luGRu@N;NDZ#C`x?C_xTTD
zZEfvKZQIz`SjG9}rNy)jkEQoWe>|<2>$~Vgjpi;D6y5Pz%fb4cr<=Vg<ai@dD@FVc
zt;dpgGxDu386jiO@n>w<a7xDU>zXvS@3R*ae?b=;AiyqIVYxT6E4A9x#};8@vnX7o
zx~2N{$1$FeQD<Hp|Amv4!~u(EjUvsp%3HE%F5=5^GITERg+T$L9L4wVJBvOPkj7}2
z=>`A#_3OX7yyPVl;zd$T8_Fs>9m^CU>kh$i2`^}Ef>%I|%vrvp@({Ut)AhQE=AGKt
zu8iQ%XEzsb+#x6)m`=5!r|{xgk=jlhNA%<Q_I4tY)bZj4Q#sk$0728xZeS&0#mL}b
zgl*a3ki}cGGDclpU8m8YKKop=*?SxBQC+!g`n50l>{iEq+}zyEGzhO=z52y|W7{*O
zDyH22cs|6t<*A|)!wK6%#-e=0>T~iU!`Zy>5LN|VqN1ah%wrkbxw1HMB6{Eg`V-dh
zs0Q&o9fc{gXwmt*_|z#?$2P)LM!2nogW<XkW|SE-NxO3X`jHZ#25aO_R07#rC5?Q`
z9=Q^yDIA9P&iX?SL9g&KtJ=nfhYjW^-NLGNo;bfJAsBw5H=_89Rp)zy=}nW&fuMhu
z#cQwEqQpQum9HGR!ga*$Vo?QE%RQjz?Bco8X<(olD{Bd2Tz)|0Cd{(EfM;fAcIxM9
z&|f#!)SUjw6&f1aZN+6W-5+oNOktbqvruOrH?)OOF^gW7{D(_aw5{ltk9aWVof4bv
zTkmHtm)-WF+cYJH!djbx;|bC?R-`;&H<$DB@}f2GD0&!iSfm`RuFmlKTo(Rv_^-Ok
ztS18LjOY|m<?O$9lFX6%*?82^T0QE1FIRlZNanrio88Ojc5hbeimxjI#HSa{C6qZ$
z#lU<`bavu;S1=l}n4d5m?t9v`o12?Zt&(7^5*cf2X3B{+80Vw0P5jh6^78yemEUYl
z`=a`q1E*!r{ZjrqbWFnL=)V!P_VN-0J5F3ulFWivyQ<jJyRC~mkNdp>!*V<U0Rc1M
zWpHrNYoqmMSx5!tRec-aih+)P$?v*5KA)bRepYst%G9@k6VTtGLDjlUY_{G|&JYvH
zg)>PZY(!1-2P<f&TOC0Sey3oXR7A>0hmu=kOO4X{9cf+B+{#2J|N4{d;1HLmPR$gY
zJ<sdqr8)$F^v?>ZjJ%T4a2+XxelRV}h<~1$R;r9gqKqe}R4;Z?fx=;NvXRbbcF;`q
z@r9|z0s(-HW{0X2xO`t=nV%IsUtKlPhZ4r{GAN6zB}<0Kyz@fJT|T@!zyNzzWc!3w
zkX~7cLeag{#UDGaynjfWrT%~G*hfCmf>m7BHO7Vh$Lx)8tMGi{Hn{GNCmUV2HAByY
zP^8)Z2JJuqqeg9~w(NPkN_t_ejbQhHVw-|VZuesYn<Gp|#LPlCz;3YthlGU0<K^kb
zY5mWu-77CmO--HF-ysLxU0vCT9o@BJzglWEkJG#^%1QA@+|c-kEXiIeDk|DeiRkxG
z0R}v9&d$z)x_|tS=ZyV*&&ukTy{v|k*>|T3uz+m2SjxhZ61>)j<K_Y^3c*Wz6%`ea
zYH0*O?iIh5-P<Y%!|e2o)!XasH@_m|#!&viWhS4{lwMtKGkcm1MtBOVirStwe%UVF
zty+ye%oh?9YgZ`Kav2G}3&o`H`e(vbqpwRU=xWvMbf%AYJhmhH)ciMjv7-e3!Ss`C
z$doyxbh-WGC7CC4c=$i?A^})OXGXe$PwOl~Qb@4I$j|ajnX(ACd&oP!^Of15dS7E5
zov``&`Q}+Gu-9R(t*upJ-d7(Tq$uRME;YH0Ti0@s0bt*C_*)5~&&$I;^*}kAE{eZh
z@qc-efB)X8(COQN1szym@i^n}zOC)*AO<c2fks%l6F@Q#PguKAMW}49gs-oNCd&>6
zu)qPZ8eBcr=h?$EseQsBwc(JaPW%xKt9kc}j!|fdVqEhP5e_2#8V4NUKW0^mH%o;^
z_2cv=6^gdKO-I=uXdP{p-ofFZ4GgPxCVzzU6J6DY_QX<UAbAKEOis?013Y7k`M>h>
zfBycBYdcroGoB-Lw(NaEBPd9!S5{XP`kANbr1(^bWxV_ga*c(2Lsvq2`XcpX`E>O5
zpLPkmTc1j{13Pz^yOGf{<Hh!f&|8mF6Dq)CC&N81D+>!C7V&!b<?wGnm3g0+=y^Xa
z;=h0YbcHET;upxgsHwSNtZZy1)mz9n*T)p!DJEziUytc)bka)l(BfJVSA`CC?2w2@
z3#-^&Y9(oTXYji^Sj747Vm9{{Drdcba4suV)c1aFwz6HL$RbG6G;K)3JNW5H7AQ4(
zJ~fIT|EMKtXhzt1MtCy*k4b!uQyaSBaNKY&+4vzGT5`L9Dwc;24w&ub_X#UIkD1w7
z$uh0n{QT{59?DtI=ZEVfTl`m*5ifBxQrT11WTb*NwV%oDQfGbYkYsal47<Bb-hKZ;
z;BQHa8;RqXrfrtd^jD8=gBQNT#18u<fl);=cSbT#Bd5F^6I^_wg@r6lkB}T|SEzvE
zl45m3!{Fk5Qq7OrxlK)^Gao<4))>D$7gn{n&psf-OuIv#j<3AEx`u|xmW`IxiZsvc
znN`c&Uj2P==zMUYNxfqRN7V1QfXl(3^7Nv!+%mz@caBH6!3?jXeP}3Rw_FOBApmR$
zDg}YyRB~|ONM_fcJ=~(CoJAS@SkSZZv10!Ej@NgYoua;{->O`{gCsL32;p0LdepC9
zbRZh+-0J_6V(j-`r_L#D_%~ZR1sXOPnK!+FfaflFrd}!$uW2C~nzf*hkL)ol;M{BV
zdulQ{S#I@xdU{gr?d>Ie*Y{CdzfVT?QazedL~w7t$N1z!@y84%TZ_(){(X{Gql!5e
z_43V2!H?EX0uLL<B13_2fvo6A(S|pz0w=~fYNwEnzP^I)FKArso-Yf}Pa*$oI5@$P
zsy2t@gB+lJ+n5TT3+whjR<NMLJ`Da)z1^k(I=&N#na|f)pSd4w+q1q0Z-Mnt0^hXZ
zV1>M|Dh1Wn(#J-mS)RSZ*WLZU8$8Zlk7f!4=17G|7EDQ$%t#c>tS>;@0<Hw*Sni8I
zmT+ai0L0O<293^$r4z8pZ<Akq^JmS6ejuV?VYwHYz9qggQQoe6IolAED*KpglqYRy
zNP%BltHxwAZxN<T3$Z_Qj3F0*OHx2gQn0?OkW@3FzP~z&UEwh7TBDUq->&g`@o57n
zDJf6S&%f5E5Vf=jtK}AkBggp`NIkKy`AG0Y5iQH`IE&+IfBo}}jCeBEGfiMD#byFP
zRvw)p<zEmJRqoIs`UT>-6V%ky0BSHC_}v#nAqB!4snmwG`$-Mq15SxJxlgu~jxA+{
z^O)bN+v@#3x6TrrEKVFl<a$;<j<q*FD9g)J<1r{v+c&P{%feXKp)zV}YRghsBA4<u
zHa064J7awcbhyjYMIXZD>EQaD=s@ap(nDlS{?=+d+wkRaM=Xo$yV6YApO!{rPD23!
ztJ63+)lB|3=5xm{>>_UK(gl%s?co)PgyT@LXQOXT`%e(vX7`HyrIMRiqnu1RGjnrg
zN3Japbn$zhTTC~(9W2l6xqiI?8&RNP^Oq40cJ|ihu8CO=Sck1lVO7wx{Toq!V%D>?
z4Wm%{KQ9Y=k*5b_L9bSXgQEKU;`F<pwa)6jUPg!C{*9j(r9FE^)8M*?TN+$zo%)d)
zTbvp@8*Fyr;o<Hg38lHub7lIW@w9T11#?m*Q<9b>i@#>RH$${4jO^>*#DhH@BvRnT
zfv6uH!N=t<@7uSya}g10dU_FM`t99^|FAYzI|HYAamV%G=@JHl0G%SuL7p9m0Qbj<
z{kxs*ZArrlYp#w&7W%|NL8hcDj?k{M<@QhX;wk6>AhF;Rj6uPYYk%IBaB4Sf3bIWO
zlbbpq?@aaX6{o|OcpWd!Mkqyxo72*=XnIypwD0Z~4I>%iH9>|UYrJ5+JNg)x_>tdO
z4Fh*IwuD}x`sT!fNPMasC@4U-sRb&s-+QdEU4qTZ*yjwfH}=KX;BO~mHw+cy{#c!w
zr9n;+!{bXr8&qI?{BbDF=pe$ReinLCymL}a<5X}mXNFMYNht2&aXSk(Z=|fDA;k%s
zTB*%*DcpFSKb9zgQlXfhSj1c=ADo@f{aIL9kGu}5Ek`!}79Td&a->4p-&Nitmv0;E
z4iXSl0)@m;PL3yS)-*Jo-X1<{^)J4*jcW_hWNf}Z?B<*O@l*_SbN~RJB|a%>>taUR
zm>m(8z^EES&hNO|CKe1axf(rr`J#AW6oU5wu51>1*)@SezE~u2X)pC+sr7i6xHWI&
zqETjju+lEZVbCxxuVZ6tiw0cU91E3~w=T}Q@`}71@vZz<=g{$P6D|{QR4W;uwH(u5
znS~S8=uvPOwxG0$1G$|5mMWIrQWJqN<(Qy*+l;p%2xUc!G;QJrENH;f=puI%jc<bh
zH9jFB@c!Owx@1O;If?L0TQW~G$LJ$gt#aT=e>It?55I`pzGmRf%Hlh5IU-0zWMnft
zXX#IWPz6DPE>C#Jgoo$M%J{Viw@@dC<!BVG+uv7a*m#^wn~7`Dnt1JNXD<X~Gk)s#
zV}50x0!2cA^N3iO9s4(p4FH}ottK1n=*v3+=P%aTI_D3%xf5Yd8@&*q>yiHU{Vc`_
zXLG>VsFnVw>Z@DGg*d-$_p+;6diB)0UEfK~%muVu*)jM)Wx1jZXPj~iy4n$tRhU@Z
zN^2GptI3=MDGi?q4GGZ-2@XzTO&YvNN=m}yL;b*@x(3*Zcx_5M9R95mlc&Qqh8x6@
z>~N}4DbecZ+#x7wTWaXc`LcXJ3|xrs=fhut3&nL7IC63S$u-G{{^ZQ1T2dV>k4MbA
z_U{+KnsGYce6Oj+8-(Hw5qGN<_<8x)JoYK)`^+VYy24&=tVqO6$(+vpu<q^sJ+53k
zG+6p|-TC)c=GxwCA>hz~cfubWLhWA~*1<{)8~-p-YLw7i8*-{gePg4e?Qbmkd~Q$k
zy&>;>jt^1)6Qe9FEvL%#>v{DG`v#8`JYymwX=P_oatHsG-z@9xuKa6-d}dn!{<1x~
zoRGE0Dr(e!@FJ4|km?+Kl6#YX;)`ECJnJ|&VSR;Y5*AK0yF-BvM#aZB*3w+B8McHj
z7e<xbK(w1sUw2s5dYvya-%{ti6#ZbY8b!%{j|yY0mnnsZH(V#<^RvMDK|w$ovh0f_
zU@l*K;9J-CT8x7PaM$YqX9iwM)z6J1M3XXkTG^<MOc8Ha!igQgV==s6N{9gWb;1Ct
z@Wbq%7Zo#5)~P$24nbNFj2<U}?x=_w>mMH;9`bTNkP#8dt*@`or*nAQKGY-6PtsRf
zO}xe@B&^fdBiCJ?(@pnO4&dg(LZ`@L>wMnu#ok{FHdbAdG)C@OF}gb_99paE(}VNR
ze>j4TwJQo;lr`yFw;wb^mWxoNyh$No*IXCVh0yt*LiM!^P0NsA&1bv(R<<ePAYFeC
z-WT#(ojy|m+D>%Jk+jx#$ASkTWY_8aphmdwhyH)1$Fm!_4L^kc)ggI-|06+yI%GZM
zf0avz1`Oc;N|TNooB^`c!1hSm&Uydz_I7ylogn23C_RFoC$HUKdmqcOOg91Fk+Ub=
z^X`9^4SrAe&EMLtM`N46w_oRn3qCx~r;RPOHQfDJJ3tkOh@)iJ<>rl9!*@iti_TUU
zpZKBpbKl<Gz2Q<F+nk%3aZ1$qAg7S!wsKcm$~I4lHc~UE;O(#|a5!Jf>aagu^w0l%
zp|aeU-f0%tjl%)>p1raYdFS{4&Y*P6*V-N#af1Y@VR(30mNim2m5b)NBLJS`BdBa#
ze!lzm?VBKiu^bXj&?O3njJl^lSy@@_@!0A#ZeU&SdJ#p5B1)&r?^aKe$pNXh9Q?tn
zhx1JRcjj~usXNr97|g7@mMMMb&!0Z^=%%FCKDt{s{sSp5`;GmQRYBuP)8Ic!AN!@Z
zf0L{RGO%Anys!HUR5I=@`9@10Dpw}TFWr|t0?u%6-+EQWP0iWdfr{e;s5mZs3hi7#
zhh5{NXg8*B(FSo5vMMPuZwcz%&nucNbOV*V`*qgzLA%U(KkKAXQE2c1tunnCtG-G^
zG{XK@G}(!`mSpt6YTFIeHS>ECGpJd(HbLxE+r*^sgEbU3yk*93jc@>%GrUkiLR|a5
z`#b2Mm-=^jvI3xE;3#X`g}m#S1aI@AQ_&m?on+npsd0<;1r4a*fA_+;n(zYITn7gl
zS@6N`2Zzi;^44ejo_3KaSaRD&u}&Sbv9t4AkmZv%F<QQ6DLbpxw&>M*6o~1*zdES$
zy!b3=IZD26L5cS1t!{H^N~_1&dSg*hQMr~CRpd@Z8=jlT)Q{TXTvMENqHmN$A(vPi
z7w=JWi%QIUP<Xfun@C;xDoEz<$$aEU`HD12(M|YaAKrd1{T=8jC<@>LO30N7*xzKB
zKi0vYxF=4A8WQ}CfeSI!<IzB&p@pElqM=Egj7ToG9TBGq8YeRL!C7i{Z?|tA|5&2c
zLqtS0^onL$omQMBX)=1ud;P4c9?H?}dlIWGMsoTq!RUkc`OM5rPwVsj!FggL{-3@y
z?K&Zlk1v8VYzsUQa-Y+<O>J0YWcQzNyd!7SgJ~yU;}wRnsAJNVJ!8Dz5E#4V21onI
zpz@M$_NH*o_<eTQjm6_sq~xJjUu%=w{<I+zv-fjj-(?PNj+$;RJ!{+i@4IMA%HVcs
zNjF)%r<?tXOF({SRO0dc+=hXr_%4G-E{Hs=g=Bk;$XoTa*z^tLYcyF!2r}~fVo{&H
z+v1-G-AW0JZlfdZKUw_F&y2!noi~&yDwn7W*o~|{oI&-(4A)M=aDYhc4<$Hp>FIXf
zZShtM4u>1X>ZV)oL7l)Q5mYLO*mPhY3REVt{O(_Y7Kc;vAT<b{!R~Dz%JAFgY`tgd
z!-o&<O{Ys-01wawNgo;**n_Nc1CY8$Kr}o$+RbAOk-cDxtoV{Lp+M#4W5+Hl_Nk0Q
zMk*)1jc#Ua!7}w58&DkmXqH*1WjRR(E*_Cr^&>cdq&y#x1<!<d`csqTi74-~cj?^Z
zD9n`_rVKd1@guE5098Cm%7R3#`glJ=8jG0L=gDRgvvw(BjMcX=6oBB*&*>P_cc35~
z1wStT-&Ii8M<eNoCa9+KzZo@h7Y9``a+s{y$goDothc{UDYmL#u`Kvxdh4mL_XVWm
zY@=_>tctj?u`&8u$b=XP+IGiK#rvh%{UjMY#e@TrtDv8{N)H@*5&j^n-%12QP!92V
zegJ@E!0#+_ynW5=yeeH1?dVg1GH=M#$vQSV5$g3S_#=^X7-M%I+Q#dN9@Vc0jdJ0$
z;sakBV@cM*s`R5=X3G6&@wd`+<Qx(4)d>MA$yt^8C(hptOL94e-lR`o5u}S+_9wWz
zXql+RH3!u5p8N0!_B}VAQ{fih9YXc_GI-!h=l;gfR=Q`j9@Q@-fbwtL06u^pr|>k9
zZY30v9EGYVov*BprGK{4>Rq31O3Z~G2*Q-L-HF`j^C9(ArF>z^Sj$9(JfH7Mv$JPx
z-}d+SPvGI<E%Wp99o)~G^-^yl)web`(cvneK)m3~A5%TUbn4L(3Rv`kBy)jwm~)s&
zG04m~KpcPg^u6UE-kp<hX4wCTt{RjTnSD4(KP-#S@KI4JwCe@Wrm+co+&SP*abSUj
zL)*FlRhe<SUw-7*Bdk>!fEJ*G`wPEH2a9FSLnUI0)tRhK)&K#HFhtl?K&%oYB)DR$
zj1kD=ru>42gHHqF1K5%VERbB;qJTK~Y&;r^5_;7(Yn$;Ji)@R}p9k%`pV0`}toZAE
z+ihlwJt9rVZKA=}n79zK_gxp&;Gg+&aQyqne2JRIlc&z%!Ni4y@d5!+Tl3!GZyJ_&
zOnFWqiR(@ma5)7@*6Q$gZl{TfiGRu!IFUW)pzI-pTM~QVb4X;6iHBUl$pK5WUbnKu
zLZhlO_{twp-YlH$a-jdO_a-9S<wal!d!HGfxFQqx9@!hu^E)ngZc~nNDpgQz3XQh)
zgfjJ4s<l^yVj`ilXfk(at*@DU9)E0UP8Y+;#$4*<S;(=UUsvGo5v!`Ke;P+dKzvK-
zXV&&JU+Gt=IZfdd-oo3d9}>2EHz^Bvqnn$X9^M;}9~X~lq;R9ekl8UkJoAN%>!2!T
zs-<mzZ|{Vkuw0+A;D?3R^UBev018UK4bfQ^A2hS^A$sF<zocS4H&)aJ`vo)|1xH4>
z(9w~)b#v7E>!j$ikwDF)q#hXwskb0Me=y^gg9^y>Ie)JX>V%)Qw6qH76_YEWtyfyK
zhM<i52P7Zsz^|U(UWR(vep)yxc*SPN^f!|I8&}yuLD-^Mr=Bf>l3|2F1)EHdMFAIT
zKcaTGx^2G4vy?BP!x((KO@StLg|e?NqBNU9nk*Q(iOGT+ow$;e)nQl203pO<8dvf?
zlA02VXR^k9G~Vkc5bZGM*`m<ARt&ae&db7)WWbSpmSTSL=OBzY16Ux7XsiCCK2?n<
zFijR;)Q$yUaA!25xjYbrmwJ=DkPZuA?ug_ad#Bc^y-fRF0}#sE6nzWdkt7n!^A^rv
zt=fLr;w?!P=+AY6rWEK=VdLT9y@1BVKx9P3=ETG{yPH6al#LBbSw%&tICV!93HRZ0
zJ;x0lF?{5F>ZwPkD&LkiAGvG=A48f<WNyDA!Q>Aws1>47D%VNG(@y{CJ}c+u{r)9G
zulDPo@70&qXmR4c?R$B=_4$Q<pc4C{7m)Q*k0m19y6c&AE(mL5pV-PgI$zv1{TSMM
zi&GlcI%E5oiqDzR>4G|TK$lxucE;4?`nJoeK~q;J`?_kHq*-#S(A|cDYFy*RMRB=C
zq(XxwNkdyIpW>CWh<~*QytVZapM0f=u)hMc&b50qrO+3)7)p`-Z@2m;_$UYrF&i;&
z(9P{~aj?yNKNuRaW1*ubf*nGz$wf<DK_Oxc{7^nr|NbrL`*bz8h^H#tx$^rH+Op>k
z#pcdVE+{QCadP%GpS0O}Jsj010K#NsWDmNLQRD}<a8rSf#8wDIdo<Xuf_?Ip*jAZ6
zaZQut|CG$7@nf~cQ<<1t<=a}0vQVNu%e#=5?}fIabkG3;%1AL=Kxz$$Gb_@u59ELr
z1nQReRz{FjBFTP6025nMDRGh=^VAc-Gsp*X0{<rqkZOB%&YXA8kRpt^sx8^CpitDC
zbSeg`V0+1U3;aOM2Nxb>*bdv6GXae>XTkulYY<Wp_T&O?*FBCn5@0LZIf2r#f{~Y(
zcdni*8-V>y#Acf5@w6MuV>c&sUC?cx&XO1@l8BQbxtGoX^dp^Hjbd?VWo!P9M>l@?
zU?f^BCN6(nk&}NLumiU#h<Ucn0hsig!9$8ceKJz0rncVT$oKX08l%sTs|ZE(!@;YA
z`W8}hI_BaJWIo+bB8UT0-d^ZvL^v6}2+_&iAAj<E!cVe69XwFZ2wMN`9O$r)(Rv0C
zT}|5N_kHYcvN@=5C5dySayj$(cRRV_*D&FIyNGS{QuwV}uDya*I17ioZ)UM6uhv$E
zhrrIePYcS+&R!<dS%*=<7mdL0{FFriYC(Ty59)*MQQFz9urfiWEdZR}`Luvu9KYK>
zz8~o2)J^U~QZKzk^!4<9kPs4nt|8L3Lu6S9+~2p+H8EKY1i@ZR%|n}DM)?@X*9%6|
z_+l|Bg;N15Z2$kSF8wxE_#9<qbkwMO<E#c0<HoHVQW#=#o9ym7FPB?sBWb;YjMqFB
z2R)>9`oa+0qW<P~b?jJ+N5iSup{plpA%n8?@d)+Hc)fvdT$wEJOJh$ONK5mm4F!h3
zgP=`2#-lO_JCpuVq%6<RQ^A^th7M62iDuIqd7D`bZWYL@DMxG*l<bELxf$~_N8CVA
z5V)v1v?Tj|6DOt0r2!P0_rNmpc%VixLr@fwqajODF;m`N4ETpWe^`l^jqERVfSD7+
zuOj3n;#M!XQow#-PmTzVc7I0^{}9{GzU(ihBYKt=!X$1%*7CB_{n#D~&C}Rv@z0%*
z2YqftC=|N6wWXdgfRLvVu9(6x04~52bcZP-CLOR_`-QpzxhUcZpN283UrQ>6uyG;u
zuPrvDHs>J<10AkKlqhyBw6&JhX-mGhd$+y|mIDE;BfMX<9Tq*<f9vyQD?G3Oo3=@R
z*;&fS9ZzmoAtAz#&V~U?I}T@PEC;?o_G0!$dk!B1QDX9O7%Ha2EYRStfVx4G&Y$}6
zMPsqmUoxwSYym^tf1s4d*{Gf+!oOT?)*}Y!jw4MP)fQxJN;`bu=F?;01|i~KS-`G!
zD1Yrsi9F-~L^cB6)sMf|m)&S?a#WBDtZh=vd#;y3Fo<UPm6ul=c?(@``A#X|jNqCk
zCLaMu<#$WNlm|jDuy$MoerKyOT|yv`Gr1V@e?oqbw*w<dRE(>ZMHMb3B_(s<LL`cm
z{TalgFY?ODwL66~U^b@2b*0VMxTmjAY^K6kjE;_OytK45#MQ#WLYxkF4WuN0o83A0
zCiBq#Yd}+ZiYY(nqoQ^{<j?GHga3wwuZddr<Xm3?v1Cr>4EGhAs&UB%Yl-kx=6V`I
zQd{Wtk)fE$YW59=pt5f>@qhM`e4d8wx{$6>DErhQ>CbF{5L>dTL%0hE_)$B~{_`Ae
z82+-HXU#goHu=DaI>=`ll?uWI-{CCeV+^k&jdC}ra&L#G%s;$AVP<mt;E&f~Eh*0l
z$kg$M!24jqd(6N7t*5A0o4nx`giQlG(c7rr>@f$n1#AHMyvbUi%{qLns}UE3LB>Ec
zn>Ajyu<9cbkc&cd0eM6)aaY`fAHLYt-#w6<s)B&Ra-}Ug=qk`;e!uc=Z=FG@Y^%rE
zX&&Y~xMmKBIn5Aq#{@Y|-w<c}qS|L(`*~>>7ne7mKu}bEb9x#V*|Sb~*EN<QWq&iu
z|9t)d!zaaf0f#7FpV2Zu463N;)CPI&bWojDo}9=gJy$LUPpmBA*`RgzJLFU6{;<UF
z$fTr(d~UmSyq|D1y(RSYd%*Z4bqB}V6Cs>Vy#Hm-Yo}dw8SBOdThD>_ZxA4@k>zP!
z#Y0eWCj20D^edlVTAv;XJ21R6Sz!(NQ!jd_;v0s#c-f85FYWO2f*;53pK5B}&1<!>
z>+?<>9@@pZR-5{)vO|>&es<lSZLAH~v~OdBH!R?0(IqyYqKO$lARxd6(8>7VYh$zT
zfZRR=SJ)5Q7h;#=Qr#fC2~AaEcpWd#W!i;sxYABV-beH1O?=z!dL$hSi-MSWZxkgD
z4^O?TprK;K@Uz$6V7^3P=xwI3)B01j&vSOBh?n0U9<jk|6vC-)Z>+mHrsBR}M1=OG
z0@bW;P-(Y)aF2ci)_biY0u1@WwOt1|fp{#x7S61@dbKTKrVV*qn51_sM)X74miUYe
zc<{$%nga|!w}J_Xflj~+;I|LGsM%`5u36+8=xB+`ZO>a+rHORh(Qmk5@6!h!fr}`3
zL?Do&O*gq;N-Q$oB5m|7paHb&mOm|Ht|)SiIXM1e?S}6V1=5Z-`;>r}+D9?l1knI`
z&MCkL)g*lD;&-y&DJYrz3&O?+S#lXS<cHT&Pfw5YLG85zH5g$K;^xLn^LzU)Y7x4h
z2fZH{cRX6!92yzvX>f`TZ306Leb9wE<>hM2F^`yyO|YTm&052Pu+gbRTV!&7LLE5T
z(9pwgss!fzpQQ^|+98WnaDxy}MZ}uS3(4qNWYo9lQhi4e(6Yb!pB?RxD_h-TE8760
z*);xNI|QZ%g^kS#YQ-8=hu-xLOHEti-@T|{md{Y0*xAfwLQQq8zzBVo)4Q3>E7S<R
zyzmeNw5MD0eA}!1ljIii1ER^7a6KW(1bbD3`NhzT%8^Gg)}HrRx1*zQ)Xb<g!4>qe
zA`A@q-Ndgk0x8PYv-->e7Y+L6S)ONqpB+|@Azj=(Mws`-_<D|s+|+!EFuR$ap5{qr
z>R=m+g6V>b-HH&dCW0DPHjA*Z&+gwUbH%Z(Ew@>lT4@e3gm@i<5H2v^fK9?>0%HJ;
zJk3v^@|Fboyl0iJ`&z~P1YLJ4Gm*5!?rffu3L1ZYEda#PLokn*ZY<>G9eHCpeU93p
z>=iFxat}lXM@Rrp{n8v}fCF-Bv+eE8M(K?Uizhs@;~jiOjoYDxi~+M5x@yt7T?Y)D
z;!YyA?kUPnM-WfxU}#)pY7MhN`VME$S=AohWC4V72B&P44;#QwHua$G$)Xycwox+#
zJG<Z$+sKKn{wIy0t1^*xEVlS)c*0yH<%S!0Vv~VLpGcaSvKcC#8)`M+e47yNx6y_Y
zqQ3@99!RSlKCe**Pr*$X`Ea(JcG=HGQHhCqKi-}p0LRTIq6MTmBAhMaK0oT1L|T5+
zmptGB#7ubDE^57kZy%Zhdpf>xGUy?Qc9h5k-s&4{>YG*lo%qLu&><vOJ?a(o<>-tW
zIkx}Xx^t$wwxUq52M(ty#59^5zZNN3KJ1rD&o!p?KN>47wjXUTv?(X8Q`Nxy;M}*q
z|7Ig5?epTzGk=^VWkS8WLx+1GdUj%+Vw;|T62k``Kw3_&-dcjX<W^tp)7^>H61E<B
zH8;TJxZ1&$q)}@nJ$%}ysgTEMYZjf8lT+W-)m6@vG)NCh^LH`%wu76@Y_OeJN`W`L
zpw-Td8%`Gn`+-8U%CA@Uk#*K!l$GP*%SH%q8Oq;jfD3Xf#|mc_nUI_^aBhRikSaHQ
zL9P@_E}l%$hMtOCCh%2`LVm>yFrHt#BiLq+bA+9cDgNo8j9|-brQO>Qh%Y!eI$b&e
zvUuhzC(i8-M{DyEzlGy5_Ua<8@FJWHYIJ~0@vnk{zBkqLmV3+B+Yj8?*_-*IzxC^*
zFP4pOeqE(YblA;WH~4P#^st1YPTgPC>|Y}Neta+{JT~%O8QowU%zSmdmH!qZ>X!%?
zq}H0bH7Jlhn7#9;FjNyF&p4S1hAE*76rhGgzM`IKENAfQbnNSUMNRih%1>`e7?Tu)
zz!l^7?(XixLLfH}&y@)X1rxyPAj{wabQCx70WPoM-7O%QueEZIm`3i6!()Gz$#I1J
zSFX!r?!u9q#dJuvOF(EH?(2!>yXW6N(Iz<eUrKgCEBW8`_SQ?hk3Z71)jL%Pr7X}%
zZdIgW`B%fp$TL%8|FotkJJo+Y3X3s8KND-`3q|B&X@#hV0JV5c*cfe1sh)e|aEHS;
z6ymC&u?-Skl|!ZbQs2kf0L$`Yc*lilv9$4a*2s}}SHlzn{`Ggqb!!_;sk*4xl3Z@{
zC-6US4n?NML%=MRLj`lh*3rLZohVqeior4T4KVFLdmXT{8K5CY_K<JofZv>UQZce4
z+b8Gd#uMC_R-)XnC6EEvF)>1w5L94vcY4<7nI$Ur@D~XDA&r1?D?u&2LBFPrxxbTe
z!sae12?xq?E}pG-LiCyb$tdD|+?2yrIqecxsMY+#%eM)~Nb)~_{(PpCvRDEY`%_O?
zXc%l`*xt2u*6?Y`aRa(Q*+3OQ=J4p-@dL=~Wx01abMKCB=O(_P{ol0l|BuRF5he>F
zjQ>&jN495Y9b!)WSNtjYtmL7dJLRTlEM<CrI+<iy?+*UiY2Ru2*NSl1^fTR+O=@^3
z2s`EeqJB13Rd)Ga(Ry;zwdU!RD|eNsDD1g<L5%%I;`_PGI?Kv;eW`WXC{mi6t96J^
z_V%LJy4C$_Mwup`cI|89#%L&LLvmbX@H?%4X_KFua$g@j+9R7Oh#m6jySR99^-0hh
zSlJqy+Wjdr!0y-9{{1o9$K>0=)~A){g`o?&xuK!+VVnJKf_H*M_;-~<J|DH)n%R9V
zR~n9;r3CG)V;4q!i8c4%t_*!Ny``NmX&1`UWZB}Yug<3RdAK=22AJ?8P%=~sJkAFg
zZD0By+~xtRS50M;@_>k`5o5Nvu>O~k397%(Bj@~Zn4Nx*ei0wp=c_p?T3#B$QaxI#
zai}mq=D9I#TMQMi9ZI=TYfO_K4^r&+geBaSd+3%EK7xqXO`@W)?$>?Qx{b6kF?j0U
z%nN!G;(jr|9rn!~V_6RmtS~yCMYaK`lT&;bMV5Mw8cMkI*RNmUTwk3@V6UJVHa&D2
zucN7&!F6+Gr@tb_p>nI=S9`PgY;fN6m1kOCBlHceSLaXyR!$Hk3z<t&^ghH_B|0&*
zD@|1(eXZnXe;sUG*xstzjamiBwBG<(>IzXol@fJx&Hk-JvB3y~c0Umi3?8r8`1#5O
zi{wBzt}+2x*KZz=^))p$S>kMPJ8M<w+evQ@ga)~pZrz}ZwUMFF1zTzw&ws{wQQx4v
z_V>zk_zL_n7gv|(=U$HcnpmmYl?R2iLS+-5%gdxSil+PK=G-Mfpl%r^{j;1Nyn&3G
z5mcHqzAI_1!ewQ(x4(P?V`$Lx>M>EWXHb1xY;s)ddXu4YQ?A6&yo%EI{Pb|P(N95K
zeX~peM!zaNy}Zo8s8E6BXu80oDjvj2;?Xnn^>bKX@3r25da;n#-7I5DodQ;v<q*gG
zgTwjsvg^L@kZEZJ;>w@Zl*p8`KX{zaMz4uicNU{j_9+>5_LI0A5kfJydQ+_Q2MhD?
zC5^GMsL~sCqArMD0xH@TR!#-_AXrf(@Y5;qr?Q>Fir5HuG+!>MJ<IY5(t^1FQ*0hO
z(hT9?U0k{lRTJP*X8Dxpf_n7~Oe?7kIrHnf%^yp#i?s(K-NK1dQlem@2F1oAGnvB;
z&2%H+fe94s=^|Dy*=Ol$%vk$cb-fhp?6&31T@swHtJ&g(Gd3tPW+<-PJ$J9Wy!&nO
zYi~vCnc5mQ8SuB}sxJTSYDEXsY*}OS;l5I3`125YZ&}aq?B0#yvGH`n46ykg)qc5)
z?qStZ1LO@G#y_=Dxj1KX5u=kqOk{n8HxxEl7wSe@WLrjRtQDA1XfR&Nc1q_)lpS;{
ziP#kwVj`Ln*2Oxe`W<erFOHA_$#7z%GR$<n>h-_z-6xAeE}#8@o@@C_VVYpiGyK`t
zsOfnWHg)WzUMCihUzoa!gqyycRkqw@H{6~+WAQ`r8Rz)jJQWmB>*y_Oy_9{lHp=9Y
zZofloCHo|Xeq4OCzvCp^3Kd=cs&%JTZt(r7SFs{QDecXYV!_n<29}r!7!WB-6Z7{Y
zhNT@D-drCoq*S`>j4E|B@*q3AxLB*J<A9naXzZ^Z9YuF^h=b{K^WoGt95X^inu4N&
zf?iXs6)n!S(3Li_Pz<s!dtj2<5ad0%Szh}^OBzM4psW2b_^R!eg!}U^cH=hTajSQd
zuj4zWrmCy;$}$D)=WCGjH1<H{{Myr&e2n#1hrG#PILYbZ@xM<KKV|-tNIn*6`ti2I
z11;aVEq^emq<d)pc>>L}=$N#H@#vMWyYBGgXxsGW$~Ge2v^NSpa^|n4j9Q@LJMMya
z3Qhg>3iWUeY?<t~P6?#Gz8Hd6ZB&XzX#vr{R}R+K%n!0>cjHq}Umu72;$jsnB8N*O
z1cnDIn8)3aEHwvrIZ<!{+}ou+?M9yYYlrYRe<aul*FvQpsu&rG(s+H4GPJO0VzD@}
zXr^cA&uZzdzTCV~U=|m+h+GqA4qm2y%cuGpMykYh2H+`ik?>dM&tm-jidR%)%M~13
z&)C%@o4vBSe0u#YySxo|D``t@dg-gW-0Ip|!0M{baJpZB!^*$<JFe$#vgyqu40bB)
zh~ROXATFz*@o<?{JVJco-I}X$8_nJM+DL=`ja(!JpUVlHFzGU)m>a%UXg$z+eQR6h
zSFXlnm9UWtgTZ_x!(ucB!5s1p6B84PlA_{JrjWY>kv7_Iu6M3qx}kv6vv{+N&}>28
z#7?F+$Fh$48vahKfWRb}D&n9ZBS6fR4+3pJC+?GGC|usVA!h9u>{6edjF1gPXnXX>
zleUHZDv@_QaLJsixnQuWe~{(Zt5+h(a7+em!paA~Zg(&#`N#Y8EQNb;6F+K+7Zu7}
z_N!Bh`PI_c4t{tcM!DEVEDP{8-LrYl<)+${3kh}68aqAun8n+)yM#EFhS8p~-6tmM
z_I2tG)KvL&`XMR?>8tp)j9IIX&8mU72%VZ9l=of6@y5Bmr>z8-zWy0XUoHvuTtp~e
zc0Tx7r?qc%b$5TKAJXo4$e_Pn3#C$^^4g_IL7yND^6vue2rQjgkX|0gITvXbH-P&g
z`lDrOy{`6yL9eHCZjJ~{KQ?$?Fq9iMhotdAC;tPB-rn9q>8ju?zxTaax;Yz6Vy(v{
z<2^JlsRD%&qTzIb1Uh<pPe^}~LS7^Lk<ol2^!f2_52QWhF87z#*pk@9#D7oc!33G(
z<?ck*`@G2w_A`-+I5V&U0P(tl!|WSB-ZpPPKT%XPwD*RFhMZs~3k=Kucm-sDkKvzm
z7ct%u_#ZUp-*iG{AK^pg5JV|wXiYF_q{W$eoVQatEvBu5(dRxnGM?E=h_-s22zwq0
zEotqkpV{f^vX1Z}U7nzY49NP~^S~4fSzF-(bb_Lmvcx}p>Pq)-L63pY7v)D{XiHg2
z8yagzh=Ioq#RUw3OPC5&d=egy=Gwf{dPtNDJ??o)Hj(g|^hM3U;(Duk#Kj4Jl^>J5
zuhZhK1ZOrEE-g9|{5wiP7+zowLuwHI6%xhtV3XDq;b9(f7N>-X3ANYFarC%KE<g#N
zu=kEw4=v+IaQKJZ$IlpF;Y+Z0iO_;=oD5vjTI5~X3foY}!%a-0)X?q<Q&2jHP#~jt
zL2_ypv*PN06o>^bY99>HV>UX}G8KcjOKRK6MpZ|=2mOSs|IIDwxq=ouVe9!I>lnz$
zxr5?Nz@9@foF?R1lf#BKTdG^V1@<m*FF@aEo3H0{AaZ@<*Iyh4^7!K9d75orS2hBG
z{09y4YXxwXZK_Hhq{By@C{U%c6LV#n!o_e*-BGds*leZ#b^x6A1*&PZTD&j*U@qTV
z5$yTbZkpA?(TCTa@W}V4#7JYJg2;LqlqGGCxRkiBTm>my_1Hr&BO?~uJuh4mwukTf
zji%4QDenTLvdYLPedvVhi5NECI6U?CS?0B>Fe>>9W=6a=e2ZY`ew4fLc$8UhD{*(`
z)VdthjrWztLmg==9p&^%DjoMF5E&~u)cx4`B5O=^>gXzk$m}Y_jYv*b?#AF|PcSxx
zuq|T5T-Fp!u*ZsksphnKrbj0bx!5_TvYB2HnJlv`abS}3Q)6Lb_Ews9>x7uzZtt=o
z2Z)2+1aRG-el=Ha*c||myvc1j>RMP1N@|<TAM$-Fowo*6K`_yrjNJvfMF+hG&|FYt
zW`7;jg1TxbcdIp;_44$0)8e=790#a{_is6;i}_Qwdf)VVpR|Tb1R||{x6E8?zuQh@
z)xUgX|C{+c5Dpd^D)&7riwcZ~g9+(YM-m;csBhL&`KJGVf8zIl7Orzx^3n!l`9D9k
z3kePxLuXN}IN&-?J<+qa3M00Z1jAt~Gm8C}$bE3}H*gtV@b%@{7hCCju|2Xumg%f`
zb9PCeQ~By`+b}OYv?R_U;{<J{zD`fhg0q9XunBJyGaoi^vINM&dmz*-a=aJ5mn>;S
zPZ;<D{oxGob)K%D-r}hS;uW2399M8%br!6yy(&ByVk4avj#`y4!SScH{c2<#)LSS~
z7KD{63y7?sWX8jIoYZV|r>Cpgi~o7vInP()L1N{^iE)$|P_;gww+@6&o(oPh?W-5O
z4Vc*L_(?9@Dd4(S{-<!4_|ARB$R;@f8CL8%UhL52T7ubPWZ21tu2f1{yCu`$^O`7W
zE|Oic3%MJ)qgiMPHXHW>>b6%P^?S<w`BNue{@3$rAeL-b3$r>^jZ=O&*#03v6y-Y<
zkdzaYXjhEFVT;+FuJX!39s}&G6;N@4g8q~lwd!%8yb5<=z%{`Sryf73@_qOc6cl9A
z`zL(X3UKR1Y4}hX(Wb;uZGY={d%9LRk()pzJ+vUZU>20s?k`5!y-M}|ePP*$pTF}-
z;UH8#ZFlt8DAeCPvb8;KL$y^iL|42$q82Ill77DSX@2sr_k5g{?<m}*k&kMh8xYd!
zfh_;?MP~ebbA(5d)p(#NF#hKL`J(L^<=&SJ`}~ds{d6O62M^Fv4_NbNT^(RltHu`=
z;@O&?DVg#9a&-J~wPU=Iz$w<;b{rVHjERC?X!zT8pi^0&*L-nT$0x1s>cByy$ybEq
zOS<CCqUNLf(R?u2>8}Mn&o{|a>q+a$uK7r#!(w8#b&|JAG+DxW%pA!>SNt9@?(Xiu
z*t4XP68hlKP<&dN;*lFNSP1_>jgOVeV-->X`oQ--k7s?7sqX9}2-p}GNS0KcEg26I
zsqVt|NzfhE3Oma2b}`+IL<DEBEc`B+wDt6w5IXkB_#Bk<Ypf=A#2!!K!D#W?-kv}{
zeK|AZXA{s?*AW{q=zDzJ{Fou=_BADi=<4#a#ngj>dJ4s`&W@xsMArPNNhr11N;eQ^
zT>daE6MHQA<Fik#^HMLZw()aW%`pH!h|I*bCGtpq0eLQw@5%{ag}sklV_yvs!6p#x
zn>2JJ`$ADn1H+xl^uQrU26(tQ)9j>U+a|ChZ@H?x)B*+A)<I0TPbw41cQz4Pfekd=
zUZj|$_Nu@YJP`=C;s^&2OIsaFePB)^=Kid7aExLJ^f{U65_+{#UXe!%2I369rQdg$
zmC!W`B>lub=tjykQ(HJwFFZT2poo#YmCcu`re7faJY$y5pAnj+y16z9MPzDJ5B92s
z6nlvbDjYbj&Dr*kh(vz-eNHG~ABn18AUn{gc>C#u#=_wiJG9P0{C(#~$7z(9IHWcA
z{Otv_iv{?sF=UuN;BfcwkmBL(eL%#n=Zd=xF-IS^{j}3O*#3Fs$27Qi01%gUbPUT=
zO`pq5>Snp0m50Hvy&wQOwKfFhiAkp5oUfFHKR-VQ0HICieNZX$c(8A|9~Ht_^F8oB
zsJd#UUGr!C{TtQ#!&$w^=pf7EEDoiZ=u5j`Af+%RRyzS<cI75gOqLK<U?&O^f{!Rw
z5Vj)&UX2aLIi@9*Gc37^;6=_-)FZ9W|51t3jus)NlOdfgVz>^~Uu*tAv%@I-L5dyr
z<1I?_jYN;j4fV-EYzNl<;;H(72lB%mp(|cadu0FWBSS+A`WTH%Cwf-AD;%d&C(<em
zTYI0r@KCKX{dtXJW^PvHJ?C(^*f_<^X#%oIC(w`4>v;inYn^(B3<#i-&Tks0kQd88
zS*xb0i7+(#M+xKuZ@IbSQ&Ny?^)P}Z1HhP5PD2ARpTnYfETsteu4$H)7S9Vxe-L1;
z#70J5fEDyBRyOypK>GCn(rJ+rgFairz&`MZ)qx@z7N=ojH?o&1=Ks7Q#->v#z)KfY
ziAH1=)d@>z{xShB*ae^7{#yX!YPcP}pey{FZ3x^;f@W%JY9yOmrF)k3&KeiY6o5OU
z!JWc#;I`Zqux7-|wD5u@C$h$NR4WPm8x3NRseG_05J%h~L2$b~z8*K0&4^y30qSU%
z88Gh7DW{dkitMst#IZiI^H{3B28b9fHK&U(?3n#Y9GX>rOAif=Zq2E4#Uq8}Qu@Ro
z_iCKDKbssoL}a8-I!m;QpLK98*kgxp@gl&)(UVg<bmy0JU5o(W?#lc?zf_kY=Ia(Q
z7aLk{c4)7eu9c^-$8SBRT6}47legcq-#`d#;Pv*0KVy))!cp>Lpe2_C7B8bv;)sut
znr0(`bBubk0~;2`KW(kdR52}HW|@Z3%k^j41i(IT&Lnozo1U45(FmX3;b;4th8<A&
zr&Jj8ULH+o@5=veS5HmE2J_9pI2;$a$b!jPv%B*xEVza$tBIecZEbCSZf<UKwzjqz
znC@s&Qdw{?l?=guTC4N_?J`6Y@2cz!#H!Pl0msI#g%+s;<N;2!axv)1ECT`mn*|^P
zIl=l-^wv;{IT+-{1`S^p{L`zeo`Z`Wz9=+D3rCYFQ9o~UIK3`sMkM!4QD0IJUpq9k
z<%z1uC@YI`LZO<>_;FNXn4;Z*%T__MC5U}a7=Z-3xe%n*<#^$3fGgPn7|mZjVB0yn
zE>;Z&ut_M5oQ~Ex?FZ+AHa~6FbMHBMyZbRiW94DorZ2Ll|Ln79_rp_YB8bf#Sc?ba
zjLny&Ro;C@jZkJ2)}n$YNfl|{htru|#)M%Tvo=mNHvJ~8rp%ySapA(F;?z%Sa~UiD
z)gLA=EPC-~GjpJG^k`wv6<PAI&gcaMIsaK%B~?t|<Yvh9+$PDnx;}FHsI6_j*x&^2
zt6*YbkyKH^L_#M9jE#+54`wmc)zv{C7QH(gq|+Gc#e~9F5UCLKJ1dYqw}AQtRl<N~
z8@Pt%X_XjqBn;SL{Iz6M%`|8MQ@|*a@+5kHC$w0SFw>~0+MV#TR9R9u5P3*xcFr0M
zqPO3J$Thlb>1<XXdPWi=p{$Gn@&i^R3{w2bMCjzN_w`S*IyySAa1ARSQiB!`9JZlv
zF)YvZBmk(x^{W{V{2h?$&OD1pk^Rk}(pkVjb?dgBG_wyD0ep~8s?A3xbz)e@u?c@5
zaoI3KL$T)1*eom^5l5Z}{mYoN>D3Mr3|W+pY$MC%oa=xFD|xtXJ>^sQz*pDl1=wK_
z)0_8P_*C|e<Oq^DQRAJ8X3O!ebD3qgThd=1)5G7e*UOS4=SZN@2AL2Oj(;cP&7DAL
zRRJiCfn8wmdozkxkX%iF-h|WY8A?<sj-Uu~-k<?yG<mSZ7{mw0xEjFu|B&_7VO4Eg
zyo*hjgfvL0G!oL?sep)-beDo49edMANJt1sNq2WkiHIQG9n#(PCilMk$NSzVo{zKH
z9?x2Pt}(~>)kF&!L-|~`kRGUHi>WZ}iwSig#X>k8zWCGvN^P9+<r-ATpN%C1dZ^4O
z_YD8pARX@SBf6&Xp0TkNX}5T}iy(qY*mZfz!CkhAQ+m^1Vdt+Vka=f2R&>G5%#67x
zDT&M2;qQ0N_6o5e{{06T4qE-_bS?|=?adxs+E9O%^RT$KOPk=|iQ9fVI;#>Z3pM7^
z{)89*kcDvGK+RpNU}tA1EnS9X$4P%NG6WUPA#|m2L5F|s<xNKtYQ$5X9{a<LyWNPh
z&5Fm*^yTL@4%h6wkWV;xwH_!lp!Hds-nn}?Er&wi(P8^n#eecrmeD+c=$lP~<@P2S
z!t*)nD}vMq#%E%*1k!`19Xc8t0&a(xIN~>mzQFPA-LzbDT!9o%7)|jt{#j>4*W0_j
zN89s_G|Bwl{#?sF49?hl4_bmD^hoN?_|n$)&onirXS=h<cei_Y3as?X$ylw#)zyFO
z9dZHOv$f?()s_dc8Nd}GdX{~c1;C7oOdpK_$_DU_1=rS|ImaoDW<GtE_`>BCOI*(G
zMEPSbZtjYCfFW%WV|6uhC)$O*yv&^kO?{~y5NJ{&u%KSZ2aU6eyroh-pJ#M$B%hz!
zLdOfk!EkI`d@NuugVexnv7_E;eF+GJCz?I^wc|xm78b{LrwLJwuHBk!IQ)?|D=n=#
zd-6+Q1&!>t;29GDdg4ktxTiiOnv1vB(kV|*rjtLiBkq#zDCkDNaQJG5My34x0-fMF
zCl!YRqp1xCvcn>jC-LL^XuDAL&r)_YLlhCt6LY%@Gja$y{clGWs!vp!^qAsN_>Yp=
z$8GyNVOmRSu*?S&)t)p#s$O&3H_}ilib7&cc;~?|1U((cZrj8uetR72_te67obtE-
z-LVim4+ZY#)>el4m}IuPWPU+#NeeZwp|1WgR81dEy#E>_%P1I^&KSznw3bNu6*8rJ
zbeCj9!iz=1>&#YQgH!ir)RBT*$rvW_0wrKk0uz-9HCyCs-F#(aWfk?G?(VC|jmU4J
zf)j8nxc@7Mi%aw1mcHeKHvV-jGK2xEW|07%(aBb6>#aJlGUzx(wSD7c>`KFsmUe|n
zSXuphM<WJk{O$a{gxb_*hm6@D4WR3f7jCd``fCx|bv6%=EL>fC_Kl{plG57+>>5$P
zwcSNyocH9(u^Ah#?l4;G-*p#U5t_YufiIZ9C{POu3e@xq5xSYa;H#j8dQ<4BM)h4<
zGi#*%_o>@?VV$HJ2~w9|x>?&5L>Z{QDC&9iEJ{d=pS)3%m(b|NG&E+^+{Ll$hDI3u
z_IxG6u#?$*vnr}a{IJ6$G6tn|uwFJiwXUge6_3HRR{Wx<i^4lUkQ=4r$PFs%O{&vw
z{klf_m=&VFhNNh8>zZLW(^l*KZzH6y`nkx^0zA3K=)+~tA~bdB0fY#>@dXtI1;dkn
zsP7g}8}5+wQm2UZTdv8ore`@<%`(r^{P9_yOe73ajQz4DtH{JLuz)y$m+x?8Mo_?M
zlgN?x3V%!lC-S8?&LaEc4^LX5{!YSxprG&G;}6a~ZpPiL|FY)g@3$)L+$()=Re+WF
zm5z>JxG|X%a4~Rx{HJ!jGfi5oTkR)9FA1h+E~7RGK&rq!+n@~IyBMf_$HB;Gd8TFP
z{d8#KW9iuAtt<e)m7E{;acEV)n?BW-Qg{w=AZc$)&V6?+D7>?eAGNvqVfD>Gb#BEv
zbiCEwWe(d9G-Zpx0Db?5Y@w##N2iJSUlgU_caKsuSP0+fvOp3E>~DjBjp#Pxrnp7E
zln&4EMv_*cEo$xQ>SeVdK>schOy0HpmHV@BDX7rmj<xqWPp&;#`XHkSEn{93*NWqN
zkkV%%o>DZ2#|3xe^EC@6<E=mR*)NyR+YQT=Z-mVbyrVgX=KkhMU{vBA5Pb6YSWLO|
zq!IqCnV~Z-=C<JbX`=q@t=+VBWQCa>3CbstNT=B9_U@@-a)Bc9%E|DlDP3S#{f8?@
zhU;<v^`e?H*@n^uPM(}u(H+F{IE>}7?VVo#cR736h<2=$u^`7{)KwwuUw!O#KC|J4
z<LuPL2+Cb}g6-N2KMV_rF8$>DE%Sj&4aXlZg63sU;o3KaZ&V`Ne0R_t3eJg2%~aWJ
z?}~x(=q7f^2iWyeC&9fLgUI5|{n<#A14eD$Ey^JoiPqhc!hv4zOf^-6d{(!1jn{dU
zEM%%G8rBwN&}=sMXXkH83Y)0tqn@y^!j{QuZ15lYsCxq(ECI`3FOu~e)%5hjU!$VR
z*>l^=;y{p)$ML^hJ;k&uaX!BI1YuGLOEs0fOt+Xb`Q@Midq;Jjmcz}jH+rp(#8VZv
zc}yI^ilwzZ0~#7eQF^<@xW!?^;v~;h?zAz|u^?f){aOB$6++TBO2*G-%E|*IdFVLJ
zA8^<IP{nHMv8wauz@wNOgyLJp1&T*A%}zzr*L|du2O?=dt{UGz0p-HKBxEG<2_=5I
zX-TB{tdSp1UF|K@qaGO>zY}n8!GBJj{GeRMZ?AP4N865bG^wm~fi}FGB8!1>ors7?
z4KF}};bqbj(0o&2(1E&r_VU>cso@F@<4A?MvR=bSOeg>Z64bfuP+XqvMS?vADCn=R
zy*P1@r7)fWyD0G3dBo*wu*~x&_h-f`t)h`u_}Bp&a{~wtKHsZ~@TJJ0d6;&(21}_&
z^jWDiNnh0EVGjGX#d79w8pGK@FJf&F6VUaQZ{ECNR?0pUiDZ_6jP`8iM4E=<SnI}(
zBs`;;cr<8@l$4e2L%S|AW1-#1aUuv&X-Fe-7OrV8gyXrOc{TIHHZjwqTK|cND-)ri
z*aMV67=x$;GaIaT)VqfRj+EZMt-Lkn!;maynnM8{7ol3RC_xhrT4C>_dUxffHFwku
zbj;6)zZTc&Wyss(@sE}}i9Cy65t@5JM~FUQ3b{~K8?BGo={5UcvUlvTV*co&pAqdm
z@=$vofM2OOK?^BkkWpf57nOYqfQ;Lkzpw?0Y9Y`?M0TDY&caCt@wo!kR+fy*AWf{1
zB&6hCG%1XbuWdHS#|%cAhpnF)H9qr^;zpQj;|E{Omk{AkXrqO<y+3&l<so3PX{2p&
z*R$_vCVbM9$C)vcaY4KiSn0dTDJjiVZEaxfKLU{kR}8AD*DpX%z#b445441fB?$%|
z)<K$u{Rin@LRTw(z%9k0T?PreY$I+r`}Z7c$BIAf&Im$kM~XNjYC|-ylKF<f0HN`c
zxhpDF)ZE{_i0$8eV{H)U@AEI>HzULn_=w25QAl*Ew&(id=mYR<W&^4~@aFsXrf#OX
zKI8>^90Y5f2=w8DqWJ1++#@w6B9k7Tb_b~5>kH)kXmFi)d6jipyRbN+rGhYSywn#T
zEw&=BxEM8?C|3QO@PRO!#lu|+!mVOl{hn_Q(C?dyzuVxqv)?V%Ym}xBhY9vs34ciP
zkkV}vo}IU(lBPSaw{y?P;ap_kpq?Qio31i>dI(H;yWr<md&q=f{;C$jz&zMQTHpjW
z9wE#3lNEt;;)`N-vrWWcv3F928FW1Br^X0?$vB5o=<95_Z#bHmd}jbsH{dRn7J5HZ
zCsYmr`%5?Au0X$O?kP4tR&A?AL`<BankF{pezf*!ywotVtc>%Ui2EVKfGrrW8xFnx
zD6K|xI$;Ga9e9Gxt+<EUldUK{J>C7?yB%?Ve}5WIiU=AYoY`~#b=CD|4tb!&&}nZ%
zab=zb@zD)`uf#3T23s`;yn)TWLa)g#Ysw@aA00I#P&?cxxj(CR(yrG3`r`X%7_IvY
zcfG6XrK%OKr~KJEj@!0fc%#*tH)V~wvoz%Nb@E09xYg=84NX(u5<J&_{ZTKblRx}=
z$gNrO@d}yuaxAGTcl{@nr-Q`b&)Ak&(C2oONJNIiph3RF1z9j)m=cQSPI|w4#XVX6
zF63sl=0kiX@uwTi9MNhVIyy-!0=8%*HBxF}`mnuqLAsDAU1J89r%*tfT)sZR0wEth
znpAvX+*_9gS<F1npbjgRVC|m*!{2mt+DtOaw3%(f*+LL)XfSNg4(GjiBONrHa^DFI
zCh3%2_z>dYx1z_cJGoB%VU|4h-r3AN<+SVXSaq<a9PiEFIez?joCUG~&L-+Un2I5S
zK@=Q~qv*xW+5C9Z@sKiivF26;?Kj+*`1r8}#YizAxtb?L{-ATVX==4MC&tdYJzlx~
zOiL9QpDr1JSE?#i$XQ7nl=c$#w`+2N0sB~LO~mfdX7tr4(DsazMP@#bMc8*scspFV
zM5fME^7D)ERLRDbz%&bqM-Hg}mBeQ#<sxUtMxNNib?iI8aeiJ!gqu#LJ?Bzeyg0g!
zgE~rw!U8W;Snsabt`1wr{ysKCHes}RKfkYJuL;{1M9XRZ%*qyqRCpAfHbLTDYY-R(
z^~>HCe+3c{`pLpc<(?<uU28Ar7k9GvOpVQ-GWD5s1ifTpXZMB>S~OL{vJeD{_c1oY
zMr@prhDH?>WSK}RL3(NtH_q<QkFcwCBLF$pVa9C?27vU~3ZNx6mZ6UxAV(s`l1(cs
zD_aHa1~K@{z6bW2*)VZNl{QJfLe4EB7qDTuphwT+hOIdXYro5A@G$~LaKG2EfT>?f
zg%c*el59bPsVBiVnVydl(A!22U26x5Sw{n}>v!hES~X*d3`=`a2j>nBlb~1_Q;bN?
z@#Yeh$bw}5!Mu_g-_(npOUIFag|zrVNG~vMPmu12zI=Lk8ST0zLW^pu*2rgHX<=NZ
z^AQ@&JU3!U6lDKf$cBvqWxIS2f=o8mP^eby2aqrj>r?$JBU*}UJ@#save+4>#vIv1
ze5|s?sCfl7KVVp_=CnivZ0=iM(Dpn}?L4E#l143=$|s89SO|5PT5y*HDlLqJjkOaS
zyZgYVW72*gK1JMf?jcf`kzv8&rxa}nAOnLN9~-~}-r3!K3)G2&=^&kE5hP2Ut{Stk
z&Q@7}naV)Pb7w+|&+6>VD!I9u-rX2g-usuyFrrWJDNE+6a_84$=D{$I7A9l_ov7#B
zM>dx>gdBm)-CVP{DOtD6VQ!if$h`7wp5I@zeV;407c_EGUS3}EckGXIkr)#aBU;3x
z=XOW%mI<QSVq2Oo`6PT{#B6=v-DOZ%s&#Q<`piX&;8331QK02C#7UYe&at+3hxh0L
z_pDE@67(3S@l-!QeLWTOI2=)&oJ*M>|8NjVeis#PO)#IgKBb08ySlj+wEKx?-i9|I
zP`h_|+fBHj6n3}O(WB54RjSm|U_TSkxuYs3W_ve_d^z8EamD`gW|dR@_3PSVyEciV
z?-;)?Pp9qgj&^G2yPq;J9JbT}!Zl*@KC=;YVe}xt2Y4tju(5^pb#%y`uFpS!>d6J>
zQ1GTNR~~7f+uE|<*4SBdat_M7i?b4ip0)J(>=T=g;E=&R;+m`MdzV{&IWZwscbS`i
zCsj#nv3gGS)sS3nM1{8QyBgE`J|aY;9bzsAnvpvEs*bn7-;-wOc70&UV{OgR%N=W9
znAva)8Tm0O_=P1Da(XPiSZZuS=XE^^ZQpz|57}`+bVb#2GSzrroZlO--W^VBV*n2a
zeL#q=Jrk@9HiFjTYh0q>eToZ%!VFWTWu+Rc?ag<d9fjIpB@^Rg=y;tni)XKYGV`=q
zd1LtP`-0<-=aBOD?(GFO_5KDut1SyJ!Mn#4)2(D}EulZGcz#$^W)u`)!F(aUWL%)u
z_wO?C1+jGFM<{vCqc~(Et#CewN48rW3V9-f3`HZO%@95>wI4_&k099pvDD?PsmSKG
z93hm7WVm)a8&y9yYy;5@A*FdaoEG^&D2z^yY}IIwwUcq1O-;>rOfS>75MtMJf=W5N
z*T%_CPHt&d>+31vc8%84udS{(`UnE72_nmvKW%sRR@UixY2ZQtjw^jX4J_w(W$^PN
zloyHIs4Y2X)dU0XwaN_D9e4>g_7@0ou$j_8oT#X%+o?@dRd%C<5%~krU%#HqnwTtU
z?WfMwKS<)YFY!74E3XJbe?SAxc6f9IvW6ZF6IDZ0W>;{mK&jZ|<mq`kzSd2lguUD*
zS*$K`8ROa3Btv(X@o>4Hl_laI{~<w`0B-2hM6MHhx5%%6>xq&W2M;G~D~37L&U2u)
zjpqlT>A#5-$(XD;!f|(#!g%*^6m!akRZi7yX74jTT$O_mKESHRWRTnTMuvy<yVH}c
zVP)}^H0<{}@n!t;Zxtb<-6qStNh>7mtBU&7v}b2q{I4x0ZPAJ@2NZv)BN_N?WK1V6
zzS!RE=1Y9RncS~Jzl_1A_H-}|dnow0!{<kngRy#4hyTz7kr@%9di>vC=aPEcE0-oz
zlyZjthY!8^uGLzJ93EXY%6`k)8x%Nx6e?GnUHe1q#My`y(=Ym<iT=c{nwYEq0w?<A
z5b-~d@RU@cs&jo~;^ifB5Fb)Zkabfcm2v)umoGi~@HShGX{^2*?VPRymJX9>uJg5p
zlU;byd)A7+2Yr~U&BagXRtA__(E*x>j7uN^A))LuB0aS7gOXrKhj_FI2!_D~Uc|ru
z3BH5`62^aCy8j2(e_sNxJ50Y~<Z%WfG9UTKhCVaWsQX{8mOo!J5ozSxxlLN9-@p!G
zhqt<iUYbyy?+-1yRJ8b<c+$2MOna1vZ7CO2ULxW|ZK6O+Xh@Hb5rmG43eYmDCcvbV
zBK<@+s(Uykk*%%>jB+FJt`Dm~9{zJ+;LO9oz<^rRWt$9e6N;@qHx%rV9bf=nR5XC#
zCU_9K;n0^u#n@#P1L;-c8^xw0Et<iLRA7j4n|vH8@_mu@Im_nSP#@6HIoEuNiJ?vC
z!=!PqRmZ#!??XiZEnkeVWU4_aO{4WN!|29vE)oQMtav$DS#}3!7Y(PLO8G}O3#U$d
zSac|0&guMe`1?%o{JiOsO4!BjH5f@s!JfJRDA@Z(6|tDi_f8!olcc_Q@xqG?(W4#%
zLNfMyX+c5^0!QSvsMF71ztkC@KJ8s`tnVIQk4{S396ouO$Q^ig)t;eD>WMl7jA6iC
zQ6hfeF%O=LgZVp;KWetziU0N&JMJSriu4<6fYs9Zy_LQj(2iLA{@T7}P-@T|3hbo|
zDu3S5wBe4ZqJ3n2h=f`+@it`dc~dTrkK3OIX=VkZ{5V;|xvGzOct!*<>Z{OcY{SOp
zOT-aiHcJA5HnpgLW*6E3h7iiwc{1QX`U^~ay*WTM^H9fbs!DM*=Orajy*w03`TSB<
zb-rkLBS%(7<~&w59N!O26YcdWU%!St5_WN$ISsm0LP%w#gPrQ<@84N^CJctXtrZpA
zwVr3Y?2rU~G_8ODnYp=nUS6Jrwl>*)%Ha;c7sa`_${7)?sR1Wj<9LA24*A>?ePR#X
zNX~zB>Ky1SdkgLrJV!^T!PkOC+U4Ifr2pum-qQ2%5HYHJLnu7)o3sNhjj$R>z5}^n
zlZ=8|Tg1H{0Ln#$R>W`5mp}i_lsEJS)YUY|<HbPn8w1ivn4uYO0B9G{6_!+$ZfC?w
ztD)N>zy!weJbfxVtSty9(Q+Aya(%D8gIap|R62JUtXBc{sNcU|Xeo!3Ryz;Z=soM%
zoo!^MTgh3zUFe~KYqSC%%+Ei6x>tI?Bxl{Y?9M2H&=hIr?4P~8uhv&q&a=|L0kQ;$
zD$I~LP0GK5uo6koY<fUjnVFf4AY#;R{qedc5%N+j0{kt%vXRzqwU~%_n3;PMJaIwb
zR5A#h#D?x;B453I8x|gpgMyAO+-HG}0@Kjctbw8)EYPH)IIb9IXnY)Q$&pZ3kNN!}
zjT=tvyPgK0yKo19-;8|DoX;E<(mJpE$*2|q1w|<E1cg(JPH`NTMglwvcFGoUcTZ}A
z`xRLOra=jJcR?-3@$FT8tIb`;6i#D5573nCHt`Q}nRe%4(oIxas<zE~hV_a&FJ3{2
z-`O1XZ(z6hsI<?Y56}AN;O?BQ^FMebl!ZoXTSUkS>_M&lUN!ATb-kNs!Bzq$i6ZXY
zgoK0`5Qx9w@8tz?%qp8@{}gm|5_wozmGw0>8BRt`T!TTtQw;cR0@Cn?K<|A50=T?l
z3Wqm}2nYz4UMBOkFXHBb`||?aOuiHq{%7>`CTBZdEmRwgr{;lDl7deo7<ZZ3*tSPo
z;qc!{yx72)09?1hVBM%O1%NMwCsGa$oK?E)8Z4t9>-BDn_%lFevvaJp3etiI5?ISE
zdYQsohVgN6+3&;Gdr`;Gx|QbU5Mc2<W@JPM1~Lhdj5=8Gh83917giGtT|DMdV7>#S
ze2yy$Y`Rq#%JFR0X)!U}C*?iV(m=rufsC);c9RvWB-!fL2O2n5;KG`kAW)~i^1Y)F
zM}EqJ1snmJAQU)HgQesq8~lrnitmGkF~7&~-RHR|*NfDMptbTFO#G%%r8Y3&%v-4<
zIL=o4>_skrtJqzdd3~uOK7;XT<ZlAFGC~t4Y3Twy1(7y?Hq*qs8`i*Dl>yai#OizJ
z#<v-8NAJz?&iq>^msk8ixrqx64G(vLQV8N87au75T=g4pu!@R$Yk>i)1Lz+Nw!Sbj
zFpPcrRKM49wdsa-UUxIgG&`byx0D*T^%21cW@J-EAe?~iqX9r%D#&H~(|{+HfggZB
zVaEr!7cXFS24SuSh0p3^;9!})UF~uXZKHWA@hkyQypoh#xK^PbhD^$h_7~cLu#}A3
z4CC0N*~vye^RE%`%9J@i{pnqKU2fJJ^8ozskb=h!d%YYiGb11xx?5GAc!|>wT-OAY
zlwtq=S>XUrEpRZ(bVtL%6b=CVG_tr1C>3d672NzIhdC7J71Z*EC2kxxa)<6>CwBhW
zA4-<O1oBJUOcA6R+D4Zh-P)d7`}xoJiVyR|m6R?2y7!FNE>}(tDMwoQ8sJJ)YVX?p
z(f@+DV1`$h6sF!E#_m8ROL1PyR?jbDZicAjBB|Ly8ptb8VSA8<J6%@~2L@<hvizQt
zg9dtDNl8h-cTnBC!vB2~0)Q7hcX*>)Mn)#DIm+%)#Tm)NL88!ga7|m^=GCIK&CFID
zfFrhWG!zKIq-gQm?D#qW?_{pC?rB%94H)P;*D2etZqm>00<lSjn(uctCRSG4D*9i=
zSo?G?GT5|3vq%XWP+C-K>gW6L7k@NdM-Pd*<4N$%4{#NOpx~#O?M~O?0d9C3<N`US
zK8E+4lUIZ2N97Y_j|&ze+?)8wIY!6xePe4In*xuYQFP#A3ZZ}i+Z+g1RLj63DX`>?
zfyUi>Hx>$%I>13hK1vQF!jk349`gKj*~(pKgGf|1Y_P^!;GjfyU}QmhZt*)kjD)?R
zm-rvvh4|%*;XlJ0Czr{7*8+uxz@vIE!;HJuFNSONfkkRf5g|9cVgMP6FoJ^017Tp|
z;&$1VHlsx=tcaw3`-TIBgoLz#{F!q2-EA|N=dYzphO3+P*Y9TO`1op6vb%%E2$K6P
ztg3ZK#>VK`*l@sy08m;$<XKd<gBxm6-eyr*&vHC2s&5JSs7G5Zw;v^Lp!RO5X9>1m
z;j+;@AJcs&pwjy+(R&UV1ke-H(a`~21<1a^z{L$z$?e!2Eo|p(=^_O&ixs9yO1~}u
zGGq++fO}Uwls*f1;*!f@l?Q>anXg?DZ(3qn3mJ_-rgR1P2nvw?^WCpsN)dQBlSOJw
z7LfLqB&LGH#SFOwd?FzWZ9(c9cab9z(*baB6*(9f$Ky(_kD?OTbcU=B*E!t=CAKFE
zyBnJ6RI+LJ^wQ*JP3`R1LPJBNQc@zohh*HJ#OtH2ukp(pV5hc(hwDXmV4v2xG0l`?
z)eblPpB5k@#@y0Uc)%J9l!&|wkF<|MvwLL&*p(pKstsHn60|j53SxklRVo2of&~V<
z7WO@aZB?uAYPfyk8gSzHgMmgU<pF@hT+u#L;Gh9hU^<v|KnVtD7Z{_<Chef8Ekz4&
zM^{n>UHBWw5Y#;D8&A!Ajh53dQ8_-;fW-CHV3Ac&zyP`xqzF0x!9leq5Ir;j<Yxvx
z7v^b12(We4fV}Q{&UaHhUPt}>R2Qz0!|0c%1M-;K6=sUBqr@Qv!9#S!{e1<I3opH?
zr2C;d=TN|B%HBwPdj2d;8KS}+Z0Qpy+rI(O-pN4%Cd|&}(6z|*UDay$OLRc)ci11o
zj}ueKME(VBSq$^fn+)@x4tSmx_;PVWE$qk|Ohh3O5vWFZXd+(coGyDcJw=a1J&3?Q
zdMZir7vhKAQBdZ$f;KB(c&k+`=@)hzGa;Dp)^=uq7wp5v#zrI1z=zy3JRl7JeoYlY
z0cie6;0F#=4@pQ#mk)Yq&RC8#J0XYokD8kC!(m+nkI!Z<Xn`fO&4?3+Ke_)NhzEWc
zS|Y3zYN*)&h>#$V_y|_ed$GIkjEPkBPQwt`%<}e%9Y{&rg0JhTpp!G+9JqsKD`nXH
zFIOCPHnvW1i;O^q2MrDQ;|LHj_98`y80eydBxo0kA;1}bT=^+3E>2_LbbtnZOa)!Q
zDkzIF-dCr*HaM#yND*{*6BF9MPAWm+0MMpHd{R=u?qnq+NMUux#5taR2(0UCu&<C2
zH-fLM2f8kvy=#kj1MT`j_I)e}aTbhymB)9NN)o1QaMfvWcW>M!?Z1LB*MGo*ow5u9
zlMfZ=Kzo&fCE?=22N1rkBCP$@+wmfuOf&@OK<l0kfIc3q7#(E9JYh~y%&kKxTK4^?
z5D)r<e%twbpIq^%O%JtzgOMuOqrmwJxG5@(;UOUsz-v*Z`|bcpLK?tz8m;|KG}s&0
zr-tCB&}QpfrR*3WXa#Fi7p@z$cLc(%JY_Tgida@os=axG3Os!pnjq3qlDYUH8B;<Z
zjT8Q3d+`3BtA|2;Fz*zY!&8rXy^?(KnmQKLml$))jI|?sfusfqxlG>|4ARENbV<Cn
zK`}9eb69O4A4UPxia@YSQvtPY2jF`jK(9b?tQ#R(*(*Td={{WVP5{jTplI-e>6nyX
zzI-DuFAvVOP#5z>oWvrmp)uiDgg-<CWdY6v3ue{uU}j|Ud<ONJO~0Y4{igQIwdL=x
zAC%RD_~h0C!{)AB9m?ztlvR&9Zov-R2O2USaKb|dK*EbMF-91lwr~#*4N;8P)nz?t
zd4gu6un0o)n|`KAo0(-f8Qg&qdk5szcO2^kOwXR}9)hHtUl?>vE3=^@(8=`V>~$@k
zQoaws7{kCGdYdz916r%V=io?_d&PZdD3+R%VBu_Tugm+}*4v8K%MUQG-uV;3d23~N
z!KVw^2?qD_oBKxtOp16Qv<LzEH5vMYQ$5V=*c4t{lH05KJCo6ZH_)IpP`V{hku(~n
z^qNl<^nwUfEPi*0CowUx;=Wl0@q7QuE_0D4u#BD|>YxjL99Kz16A@$><9H5QhKL;6
zJK+z5Uxi&uw!s2>$uew=o1d)CAn!Ia<pKRMlVIyJ0b6%d90F{Z(T#tSO(3!$q`r#t
z@z&eyHRaUQ6<(L8lHhZ@tJ2-61~!B31>2K(8~e96r_SppXR?^I0ZqK%c#m!HxKNXZ
zbuDP3ma&Ba&J1k$&p?a_L}}>X#(Ta8hCR?wICnp^UsePC3Ofr+%&6-Dzhf^A0&VtY
z42ZInp|8e~X-l_W>M*^BcOoYvum22yVbs8|vaU{GsMg-_66BMLHi7(?J;4fnU|REv
zxLkMG7<y`{w8Y?N0s42`6XyQ8W>4>eH;aq==B|@Uce}ibb>JxsNgHQD<S?8Bt;{n2
z>PVUSaCy9u2_7ibFTXzGe6GDV(4W0KG29G_PZ2DM9H=Is**%M&vjy$QpKh5;esdf|
zqu6%u^s;oCIJo2C7NB+VsLje+5d><W<o+P=WSM|IVZ*WBi;f0VW1yB=w;b300%TLk
zHKHKWJ4v7kg&VR_NpwiW+P_EyC{uQZv{b@@x|eV_akhFdh~B}WfnReWwXre}R1SFj
z>E!{;`->!=PiMStUjWvSi^3yw`<@tFLc2s@9W---1n<+jeKfW9;1>4=;E!uRc70B;
z(H~IJf@^AhidEd2h<vADUS9qW>`z}vmaT2v;pmy$16e3;)!)$`P?3>^ApaK)S+GZA
z7)1FWNTLQHlm82nAYlK+P1@4%H6gona@anKaXRLIe{AXr!H-n9LC#<6<7cz7&Ym&r
z?{3OV50fr0{{xon9{TuXPwe@c4>syM6s|t<nS{HS@6EDtu(L-%5S@%oxwZpf;i@O?
zg4CEgyTV8hw6(Ri*_aRqyDFdneZfS5sVVV7;K-2=eQD^f-X*jF$4G-~V2+;#kaQbp
zZ4^PpoWp$ZzyNb0##E5`OLVmH5p8LG$6F)X05z!2VH=*tDi@zs#2O;VX!rbCiOvxT
zFT|9sfk8|E`0=vTf_G!(>a03@w0#Y`VP)&Z7w%e<6Ml7Lv#*!i8_z2m{gUX8C&`n9
z75i+MXxxoH_3iWkhivwAt-V%mtI7QB`*{VhbNY`vO(uA%{lfn)=6v`BsHPe|ZunXB
zCqL#grrKL?0MLLC$9oqS5bTKsxJsWh$`ZBLa&mIZm-;bd2fi>`3C*m#3X=rnzp4}B
zq{V0t2JEk;Q@omYPt0qVPI#p-Mz>BXKn!y}$eW6KV)Mx*MK@E^UZ$))lmI)mGw;*u
z@{=$eyU9v<(f2a~laB@iRj2K0PC*sgMj#<~0-935apfl~umL>;#62BjfE9E0Tn?;2
zpT9_x^~kn;Kvd`tMF1RkXIjX99G#N?QQYlN=KR+)s>5eOL}+{q*5}FfpS=3#_mru<
z414Em-Y4_4ILq^X3Y9Z{i8|%_ub`%k@7uK*?yrWbc-#~>aSqvqGF?ee=k*$ta~IMu
zZ}C@ID##wr=xZF-R3DsBl_-)^ey4E%)o`Tr9~sdI?Lt{84jRaag@s|}T&I5QDXMOf
zyd9Ce%`Ai8`P{c9TdsT5Wnrfq&rx)A5<W1Er<Sc9_r8V@lXurasY1_nNLUun^gvCY
z06XY&aDPG0OKFePi`y)<ljFG@W+I*ryg)x?(z$;c-G5a_*lUJ~un@|^f&~u`e}Dk!
zjLEuJH}PIrXn)+WmTCwPgVEcO*$^wt_IuskCyiLIV=<6flt(S*RTq8)n_-wB3$h*t
zgRm73#Ui-7_rjPp(6{^hfbc6**Lm+VBdMRn=sM3urb{L#xG?|ju}}YIdm%PO|LntO
zw)bCcR{SD4#PFR4erro9@NRRVy^y~7&08K<>oZ~%$b%5dOM~*nu36Algb+C2CTX1H
zL^=?bt1bTz=2T*?>`g!Rtz&4ze`(Z&5}T6Ak5$THb&6LnzeJ`s-GY<YK%Hi)LZ2@@
zm~gOA*x`^3S?Ot6G_A-tqxP&1ax)<r)?Nhx-7!4!*Vv@bWF#e#AfstT0vmRc>ZLSk
zFLe~JS4&jP2BP8#U8fzOox)wWH{6~VZaJy!8)9#5S=4Z2I5uSS+)sQELG8eAKgR}6
zcS=q&CTrS%_HA_Fe55@j<op!{KO1fvNjTNTs}$4WT;#KPyqQS5lf%e1Wz2=2hMDDQ
zATmqC()g(%#_uny1KDOS&8<~DcRyQu@f&fVGH`eaC05(Q$AzERwX2S&yR%_&U)2A;
zdjX^6^bH}yr$eU4_f>~!+M`xaO7!!ITy(y6+dQckn64?lf7oh=A4*_hVJ!)RRIX?L
zmA9&-ihKeI`<*>KwT9I;qtmZ*UbqjTqe_&)2gVJ>xCaMM9jc*W((#2kNt&fZ_t$|m
zY(@WS_Wi4eGtpmaefQ=0SrV`-l#`pC{mS(!xq(&>s%=AFxQrUx(SG~)ret?9v^Ldj
zJ>0E3!A9lD^XFe2trhF<h_O&#Dk&ZI7tDQ76B5fQ)z!0=-ACv6VZ$kX_=7Ou)6+a+
z@{CemdNPz8Z1YXf#_DKmf9;VxU(um;62)#?I7gP7>o6J;fQ?H`jaW;pd5DYTC@OOI
zcwd?qJFN^5h(k<gZ;g1ikRVgiUAeI#6kcfVaG(WFLa*+Y`8Y~FO0!w7rf={v?OHt`
zrgnQ}FTY#lmD#H+!Rw;C$J1;>zxxLYn3?91&mILSnwITWdY=!J@SO0Wb^#L|9i>1;
zvtg*j%W}WZ<dB)SGgYiQkG&J<th7q>HV!V2t68jV)IE9knGt&q|L{5OCL)&YTfLW$
zjt0yNpWhC@?k-CaF<_Lx1)V7xXd+g=s3vWr0<=%%u(Xhf$x1G0-Su<g_rlCu!X9zE
znB=37Wf_w@PNTMdr|sVwDZ{LI5L<FMm?i}y2a@^mfHDvoHXVyFbpE!dlIl=!wN<G*
z`>kjB611d$OO&+`y#AQ55H-lw`Ke9VpT(&z^^a7~Pzi$lwSOZJ?L&gtQBfCYYXfQX
zS^gEZ8k5h=l$o*@<uX6GnVCHSvm$D|`MnyX$e@`5h=AmP8Q=w^I`-JMhVC#Ywr2AO
zRZPv^H>Q%Gf}u+K__vLtp*!w(9ZrhvQW?Gxs5$)F=!=>}wODQZJR`0%?q~sCpVHK^
zCRsD16EksC17WRR&O~I3Ud3*{kG=hk*&)BFsW&0v8g#6z*ezKHR1_mpvpHjEy-T@9
zjU|C6L(Ujo^a1!tQlFp<7#+PV;lBb_2lqWm=ZUN<kp~}l6};zFi=>gDcy{`9l(OKS
z^SSm%S!{g(d$%+<zu*mAP`bs(Qu{b5b{?l!EW2Jqc&sqzS2X%?)N6K&9)#mE2O{)>
zBWk47DE$Vl6WS^OI$!~!4>{&V>P1*;FVvUb)L)Q0d#x0nuQcjdb$>*IL{98famXkl
zs?*ktR`2FCSmiI*g`S|OiNJpg{+k6V*@;^FG%e8YkPpk)7;zv>^XjH>M1_#k;0DOm
z6hM3%^0_7qy!QK+`}9u#X1X*bgz<15q;YA-JI5Rc;Zjn(q%D~~>7{|1qQxOIrnmr@
zI?M_Xt(4p6MSba|Ah(kMR&;H*`jU%-^?7W`EirSp#trbn3b}d#$XmPI1eKecds8#|
zaa6;X1Y=cW*34KNkWbl*Rywe`B-?v^?L<x|(ftdjTKJHV&;CION*OuJ{?)0db|V*M
zn!XS^^b=l*>Ji>RlM{n2aJywpCF)8Mr&Y25V7`}{+O{W~qv}51Ujtq#c@h&5dF@Zx
zmY&=IBU-0LB{?88`;+;D4NBz!WAQyRv%Uc}wdhVw3PYJWqNvVoA(y|E?bEf10lL+R
zNk|}$keq_UY6E#F{4JM}f}NEmM`{3wulmIdEAcMR7(klwa9A-k6f|nWrPpiT6MFxr
zlU&SD!oq@~`pcaV<At)15MIZh#!ad-n|hXU#g3{`qb{khcr?KqXY?bxQ|M$b@n44m
za~g{8r)nwNf-cL(T93GTyXe^l*Ff*&=UPlEDH&f|JMY9;6Z&{d-gCq$b#2K4fbY-L
z6czQ`4+NeMw$vP}$MR8#40vFN5#ZdDrkQ9dlTs>%0<qA+!RHt;8vf?hW!ev<X+wf^
z41K1Bwo>gQ6_M0~uQ}4blZm`SSk5c9HDh`ssr9(G7z5DvIM5X{sd^U=i}u4170A;{
z8+X-NgS{JG<7d3kN|;vW#3M6egqPr_-)M6d^!XEzJ5FZ)?)}0Dj@L5=d;eD<XBHG#
z`%8Gq)y0ol&#i=t6{*eu{B=X=D~xocz#JqU{<+c-jcVaOcW_`L$bu_Y&cpqArIOzX
z(Dac2d}f5uyR~D>@#*!A%g$IoOiaI3C9c@gmeA2ltbcMnf|2lp)=@XpcDv5sa2)$b
zvtbbpP6}@Ok{}M~N(8kGm}m0=*HfrjTreDbba*(Dnv(%yMx}m6-Ot+qFtP%&@4z}$
zu?rcnT9?^|^#E-FoLIyvps`;MA$Tn0`RWOoltMygeey4ry>D=z+rEvRTDD!pymDY(
z5dq?<gnI;emHFA!x}na{nQ!pjqO%a)<H!CErYY+A$CrYLY3bYdqEJcafaSM?F2edn
zo42cD!fK3v(vkS(<~84q>e~3$>0$S}dP)Z1sM(?wkNImC<0F;5BB|zMEhx4?oQMVg
zLcL&rJF?Gdg-2+2jR5oz=K9dOY4N<-4f6SA;;C~@aFYfKLGuG_>p&2g*X-2{#Zd6l
z&tKA%G)Dz(O&NVGqYCcVM1h!YvuEFJl~KBS6{U)*=m4UsQ?@B|(VOwH*r5R5uA985
z3*nul8Q}Jh@8Ng%3+*bqdh~wX6Xa|noQ{1g85U-w(9q8x9%3T0&~!yPKjwL>8q@7>
z<VrXbr<Wqx97|Zq5SQB8T9w?NUj`vSGeru4sMTS!_ZH(~z3ak2G#yyjWsp|qjUcMy
zI@`nggS{XizpVJPD39!$m=7$QfWRimcz?!eU=ak_9$sC_CH;_`r1<UQN^q%~inH3d
z=V$zW|69fW1TNlUi}$@uALxVDo$wa`&X*0cpKTyO$!a~vd919WGFGHpt)#>(>*dw-
z+lr@vQf-^f-QE2LzzToAzpZ^g(c;~hQBk1|+Q6N;2R+w4U?efcplgp+&!prE4-?7x
zH^RX>cdn&W882F~?=<%Cd<Q1k`-V<}{OfNLE9<_YTuV`6c?{<4m+5Z~KUHEbL`wR<
zhQP^a{5yqAqZcn+N~obLB1H3@f{##Sx@mS<;B;}`rPEK`Vq1|9<tRbvMlx@U|B=n$
z(9v^+bivAqG?Q^h`JUtOvA!5Vqh!j%OL=!2L#c!ieYSwM!SVKq#3j8SX}mV&>_5kP
zy^gqNtNwvHr!Iy`M2k<na#_<1f-w+LoBN~N7+a<+J|7-^FBES_YfQdGHYTHP)D8E8
zyUJKK&gHSOcf}ngytnP4;^d+5kavBKk|q&Sj@RNoyd)wfHAh-c30Moph)aTbZ$^2y
z60AN_qydf$GF}^^J#)CeunYZc<M=47_I)+_ZSh<5<A0K%a<{*=ADtjZfkZvz76R8V
z^dDPhgJz8!z^{3xy$lQtd<ySxS-y*T?3;leK#e~OVtZSI10atkwnfG?FLfXoYwS20
z5RU}7K_NJJPSjvIl2K{@*IR5(+k@8qipg+1@$0g7K3(7~)nFmUpc@Lp@YG2AqkYnq
z8<HaS2qb;y$Y&da>Y)wZA$E7|6jAyvEjhVx&2N<m3$?$m?=?uX`~uEe$;YHqxL+4~
z^%d=VlsG~A01Gw&Ob`=5*8gsulxed8*A&<h007r1xhp63nf*)e6R{?1Avw`Q5|_1a
zUG;r1jSX^)0Ev7tvVrC*Ch9iXmYIRB6zDn!8CEAcCO%XDL0~*wgC$Udr3+XfHm_MP
z^U316m8z&VuNn+L&qzyINE{BkhlKV?V*0vix~D7~d{SmZM8HT-h?(+7mUQDD#8p=h
zCPvg*a4$I)BV||f4(h%bEGPM@vp2~pKeuer=JW~st7tVjQ)hZh91;j}-*R<n*@fq>
zx>u8c;=hS6E`KX&$K^L+(!^yD0?@kWhKb34%B@mT7iYwBYZsR$)xQZjP-*?qnmPU4
zxcj^jru#;Yz+@YFgN=?_ht2Ue+y2`F*bh$$kAHJiB3y=_Lz+Zs0~W53PvzSZK*2cP
z)KM*m#4b<-oVs^0-Hu*ver$cM1W3+BZxol~SIPZo07bcf@PW;#3&1h}p0NgqByd<l
zAS$T#DB6mmA`65!_vtt{0de)x*yZ}d##h!;)Hevu{{1wq`1DClVo-_~b#1i&X40&6
zKadBgx?BWB;JAS&E=!zJ@$kk>3*0a^wR^S28=si?si{tlq&@n2{{HyU5(P624GqU~
z2q6Rx@Gvu&djC7`Ri<uiZ0x<ov~H`U@g8{oWul=$G{1o{Mi=>UkJrk0t;FHF#+ys7
z`%Eq`K+-A%w_TE9=4_CN1X0scviY)pWjAu*qXblo7oHmoE+u&&MVJ&+GF0ej+S<ND
z-9px(th3bYiK61^{$kXDr35OD!BzJ{)$IlS6BZ?lcO<Y!)r$cJ!KQJm0tU{HdJ3xq
zGRBv}C4(Jbv)dGD>T&-|Y2Cp5(oMkj_DNfXEKChU0@HuQ8bwv*q3PJj*uS}EcI^=8
z+@<eZp*S<Mq9!~I?;Qhcla<yA_FOIc-yJWm-@7dtLKu0}4Bga!i$-mv0U74S5=u=;
zi5;gD=*;Uu){m2_eMb|k=x59`-@;As5WR`6Z}eGv!`&R`L96?)UtNfnJyR^67fYX-
z#r`k$^6NLW?zh?j>-n@-XI7jKp$NHUEt=h-?Dxm#U%4dQ1n?i>;!qA!5tc)+wIFRp
zhq7^`L}Rjby*n_C6FhwQdVLR^PWa=keRH64!nvpUO#gTzJ$t_^Hrw;(uWP(69BTvm
z$1hz!h|Uw`w!N!lYb83hkZPlNfnU7^>k{6h7385>OwwCF(799Srlh$>5A18{-n!{A
zQj+1{o@*ipu*m!Q*5F~Hf77LD;n+4SMBL*W<gQmD+J-y;m2&j;p7CmB?FA3L?fokF
zwk0kosI#0s>nKD2S0B`p{YfyW0Z0=_6EdB*#(<+t-p#G9w%c^8w-N}$$f;jmDb!r%
z(h0ybu-<i`gzPCgxblY%lCZNt6C(R^>2qyqBbVq+9LPn$dnO4<fkQ}NV{Z#I_!}mb
zs^>p(tfyj$3k|h2AN?SE*pEDT*j}D=ShT~b{W5Qe(qYWRH>6s4la;;Nh#3{N>}FH&
zUoi=^z{N@M+fcnWayl2LJz?}?&$6K0MmkRQY)k1Fl>687*b4<jZhm^t#?6>>BzR7r
zLw}h#S_!@}T5xpyuId@SQC&VXzmh1@U^&~5PCk8U@u-Ux%qBBgotK&D-nwyrN8A?j
zPm|cOLXiuWA;hBhPU68WuRYfT>b)>LK9yj{t=BfIGCnA`onC_UkKdF8u~q2`GW9#w
zu`pLu#JKe)UH{B9JNu(gRMvQF&h58F`XhZ@(Wr>f^oGK(-ibN1uYik9?7?uZ%Cb4}
zv>o5NSF4hFtEScu4pvrhkXquvt~cP!$%E=YX*}nS?TmaPL7`*~B&wv5kiAx2p>3<r
zaSMMf-1}*du0HOoLIn(|q>R1HF9&0FC`~`urzv^J_)OVl*r&h4zY&2=s6)PW{W~~$
zpaL9nvBB_^_GJbnF#_#t=q5RBq*qf<Vh6$ybJ}?d5RSw1pCCjeN=+%{*)4E=<c7_k
zi1gHG9lDZjmj(p~pGAa)ZTWyhl&C<8F(3g!2nEQ}GLMdqUiap@#GrctfN0nISlM?+
zr|YJ&WACeIO^)qse<W^Y)Yay$QbE|c>4HQ`$+?zGLSv{o(5~HnA_pHbXCvWB*Ei+1
zkMq6radtDfx?XVzmSPnP%;-E;auO{YTPO^bPe~HGHhAr;E=|motw%^njr>q{lgID(
z3IF9vZ>2=(t|mshJ<&y@iwj)e0BlGVMMb$I5=d3L#r0WPGIcyizkkeTa+c0Z<`Q>n
z<vXl9=ePDp;~UyO2*V6ABYD+!<0x*)AVJKOM%z{ODXlm5ZK~$_`>c>ik<SE&EfcL*
z0*4>>5C{pbgV%Fs6y*6ZI+QOAFMq73Y56`6-MM=$PiZ+y9wqXk-Q<`ok<GGHSJVQ>
zsAUL~l*O-2$l~qv*7Q=>h|Tt&txs!@JP#Y>KA&?KG+{t>j;o==&mB%S->kQ7;>9XG
zT_i*rP3!1aW5G=Gf=bS>j|R3nVQhviGnRm1G(N`$>3FPN>wk+q@yawGhK!;aACXvz
zxnU&XHlP>HVI{Yt*i<9&kzi~2Ao7QEL3&qRoTWZZ`<Cl$3h7nqmDBR_vN>q#Y~JIL
zahU{6*DOii(gu`4F2~!GPJ^I_wQB*&h<8#_KcvBfT?)4RLvZvC^F3p5lCdKT3H9Jo
zjtRZfr1+yRlI!iIIrUSzaXibgWb6SAw~+6<X|6Q_egovOVeN%q#JErIFrUCKkC-4_
zUDDeqad|#H6$l=Scppkm0cB~_C(&zzLjS|A+Ao_;Hz;uNdrOQVnlSnd`(7gf^1@pN
zKG$cr-8oy%Uam_(ELp>*SEoirPTp(K;zfRRsb3;}+j1S$czQ<pnGJsOMWkLhm;+6e
zcF;^DN|F!msMxUcFL`q&0zzu<M6&-$?G_4$(Ux#bVz&I^Qb5{uvvh8lbtjw>^oMXs
z$G?g>Cs|yMSZC>-m5*rZ7c;=x)F^S(-vvey{Ag1!Th93%6h&A%o){G+vD>iq%%gBl
zys<h>5=0*4*~&B)GPcQop!jp>`ihCC)^wlZxdl$@+}BUF1+1J7$IV7laucP!Qakyc
zbT9%8$xfJ8YB>&j_X9~_+_@VZY5wMX-+58<*?qMG<YdI<4zN-EI@_Ln&4!P`2c-Rn
z?}Cg=Kp63=06RHpBq1HjZfboPql7bXTxA#*8+3%AN|G{&^SMJEoDH6PX`)CHU;WPu
zk<<!DH)FL_t+8WcTanv)ZuSyjgG5;VjE4v2h%Z<kS2h3B0x-vXvZ+=2mCB;A_0mH7
z9p6V9Au_HpW3g!C*Jzmzia>2Hs2bd-0a*vk6obN=r=GvYq2F*k|Lj*683==WO-~q{
zo8B9f@Zv(W_wQ%i`FWzaUmP#*+AW2wsAZPZB2#8CQ@@ILC+2>m?9t5KleAjL0k^%E
zF>#SSb(D$;%{UQTJ+s{aomPW>JV3TRmpJp;jq1vvK(d!X+-q2pRQzKSiGJ_*MIvym
zc;~&jM?0yWDm5nK&z%2G&(kT65H5aR5|#5Ob|P)UkyLn6Q~GLYToYxPBD!|oqVmT$
zS^A|CM8i6-EF2BUA;ZkroU_f*t-ixU$7Vn|j@o3izpeS`p#cK@!8x|WVJnhzd7$c*
zY5FZbMr-<Tuq2xT&VUAZ*>t(7{G&5Fa8@8)w1NbNq?#H&M`q+}!cBO|9x?8M>Kanr
z8ztZQ&abrNw30sZvR{N^AxG@BzwaFDukThIFYb7|PIwn@VsZr5HGjMxMgB~5b@KTs
zuM%H}%TR!l5O0^c?t61e9^=2n5gbk@2C<l}t7=M$ppOG?4;1+egV?&*J<&4D+Dfmz
ziMnzJre@sRx%Gy#pI-<#=3l%JDa1TfgHc2P15%G!wXPHNPbWUxqSAYD0PvC!)Son&
zaO!v^OCQ~H>bc;HE<oO>9WU$VCIGOg5`hmzCUk%&A%Z|!69(OH8m=1j1@ZH&7&M3*
zL;)ihNbcpr`|G~M66}!TL&^_xSZD_&Ok{0o$iBhk|NWUCzQl9t6?=qeNMrsvLe^+<
z-mv5`>VGJ-{c&jp1P2Vm?f)m&Bp|r!$cGIeC+pe6P;u?@-2LeO*WVwX>LV)s2UP8`
z7Pc3(Ms4`MH}D_?aE@W@*cusk#lNFhQzGcC3WyvhMM)>#MiLn<<2b8m<H|j?v};8)
z{qL9X>(l`(aCn9It~fYrl`RAVy-LV04IU@)6XV038>LI(TYr4C0ApI~2jS$pND?8Q
z%gl$^0WK8lNGI(#M3BsgpYh`!qO{u`#@9M;-i7z8Vb|+XKS<|J55BFBzUhZ&i#E8v
zHf+?K&I?e5(<^`wb^RlVXEPOibEASz1?~$^G&-UqskCLG_@xM!Q~Y>Bb^a>v(?e_-
zg%@Ru<MV!WB$#wW7<7cMP%zmLWr6{mCRT>5PnJNu^v*O4Z*IV3z`|z*zIHZTSE%ax
zF$AlpYw3&rk11#A!UufU`!{C*sUoiR^lnnhZV(4LFv{AL*w|x)-m`fUH{Pb@TEjOZ
zx}JJ`JMFtR@$B;E=$V%*<q>&Y)jd%Y(QqBYdwsz@$Q*!gVD5Q=P$n5hSzSZ6%7U#C
z#L@#mo6>7e&yQx@&Q}i?DM1(ZXMJ0joC}eInt&VS-#7!g#-bzIX{PaZX)KWfAt_%B
zpv<eX?w4RP!+%1Uu7%^jgsq7aVLr&M?niS9Y7Isn!KuasU+K!-TS=q_mwzGijz<nZ
z?R<9|9xSD={S&o9K?^5CKZ$39t{s=>VM{b$;^L|;K~M=uKU@%cfr?nS7)WjA1>HQ*
zGMrtn8ic03;Zev7jN;0y84FVK=G=Y6+m(Ad|Me!WO16yT?yC@)expd<`@i%!B!$Gl
zyDdK*gUuxJHozaf>f?Dx@U=$?n5Rd~9a@Ib<e42ZsY)`1(ur!BAMMkew+sSR$*i90
zVofw@93lQ7gO#i9A@0wN$r7r)pD`PGK`VZf<Q_OFm*w)ZyTLR*4)1|*(gdVDQP(2Z
zoviFN47?%O&x5EY;24j0ADss4^K41qYK&{d+*+iWfLNO<sVdvYQjL5jBO@WS1enGT
z(TpA7e!i~QZTQims5uHa1g5a)5My3Q^Pgx8khysd7JJ)LU7e7TG~dXjY`r~PYm6np
z$NBsyoW^DQApelMuVM%U=AHoCB0d#WII#cgn3#O;?rDDkw5`>_k9`vU5IiuNf!`jb
zfx}V<G?5g57NJ16+`kmSJxMV!KdxF@=gQ=!ICAP6l&^FHsxe?40c}=Q-}P)|KHH$i
zRgr}oOUoZ@%G2w$XQA(Ep6yIiCY1hjIA4F9m;d)MTan=R%ti!3h*4$S!n)z<uq5){
zjj|5^z1a0$qg*d)KPLhj7`>Z%^uj?#?gnX5=)uzz3roumedBC#!V=9I^+dYNst-!g
z@aii@_x0BC-^Ju(&%Q}&JUPns_JM2F#WV|Nw-ur<wB1TWgI2OecTR!Sk@Hut@LJKa
zr9uoxPc@SG@G)iojbxyWj?z<!jbQ?a8b*)MHj|yFMmyf7gOHHRnJ`R{B)4ZRWaP@U
z&$2Bin;WZT4<;*;f6_oC>^^}_SEsGkSLclc1asfcPJj+^<8ZZa6l}cC$GAXn6->Qk
z{|+33xa0g3&Tkc$nrd+H1Dj*JW%e}@ZuA{c_lyA1YEvmYgOK{8(Hg8`-JtKL8o~hq
zLFsjMM0}KCc@O$OT%YL`iM?TZ>EjjO(+;#VH^<SRn*Y{2$$vX<CJV;9`)oU2D9MaZ
zK!D?)f##2P0>-wdN_cnSrMIrSLPs>$#Bst@>TL#Ip&ek={d{+|f(p>z?2>23TG&IQ
zPiKjSvF%%L_`tdEuQQzv`c@sKFz)3($6rm;q;+*EoY(2Jn?0&ySs$#Ze0sw~RF$Do
zQgTAY1e_*ABM}EuBMJP+s}$GA29-jcG;L|am!<Q;6uhW|+Oi9CksdsGDCg3*RF000
z_Yxc^BsBDU3lkE|CLn5pmgLj^QTZ4?MxfQRq3LBPiHnK--RH)u3fchL4M|p}KIqBM
zT{mfGe@9$mQU}?${-g%*=62isyb&qaolt2K`=t`qTL`f;UE5(%sYv6#LQsnQO(~n=
zb?Y(5xG@XsR_Eg&&?}R%#Mx}8@DR5}w{py1cyv%~%yKcHpa)A6K9Q?^um3mSR!ifJ
zb^7QSIKG&cTMB0EP}ie(0MTY;Tg??c#gSwEKZKoST-96GuGgYL1f;t~N=iyXLQq6d
z1nCYDK}w`!Eszutl~NiJkuK?O1OW*N>Fy9jdT|EN^S<ZH`Ed5n+Th;GKjs{BjQhUs
zH%xr3nS8O8KACuTqH&Tl^4{VQYIsx=xVvt@xgVcv_N{z}cTnNw(72yz7B>C+)hPbn
zV~7fyQa?#WVLTfwkQ480&Z_3W?D8%wE#>rg2FP3psvz|mgk1qOtB6}Eyl+mCta5Uu
zJwj^9b_N$0JF1`JqP?;p8r1P*elPt)iP3i4VFo*02Y1`{AL#TA|9L+Fy&u=#yfgnA
zTxMK|<+VI<63Bys+}b{U`vx*Chy+pOBvasIrxn8zT2YsD*CBqVfs?KtT4_#c@s0os
ziLHT^Pja{#O2*%fRXLnC!6BClyrvd9$!XKt4|uru%tUpX+YLOYmqAWRuOmf_XQHGv
zy}$k7#ze`J@b#md@mXA_<vI7O=ZA+LQ`#$1cgnPH{J_<-=l?;?S71D%$QjpYRnllt
z)@1v{yzJ5Al>+bBtJJG(gj=DzyQ+`18Pa~y^?zDK5I3ASEU=9FlUVcd=JNKJK6S?l
z3;L;Rcg|}W6r;J8bm9)lxqPRuaX&~nnlL#ko>}@(A-uDn_I`?Ng^|<xU)^4LZXTXT
zfa_}@(gF+1wIi27B<R_9RSWiIwJ$o=0z2yI8b3i_<oe=8$)1OaNlF4)Upx(5Uzh7Q
zlH%g-$d<)c{1E~&Q1ra^D8g(FVhTO0+AYUPlh>;9*ZTf=hZ7Ra40~hK?;=jqF--1p
zewKOXUetVGp@O_+qNz+STr9S^;1V(+#nZ>EP1%ZsToL%pm82g&sQj$YrzLkLgY6mT
zegN68TLk3AION64?>`h?_lo8B-M&8XQ+}Y%kR~uFM6o&Hk!8{8Y_i2U=FI!w_Oxlp
zj`2Ant+tjC1k1JdI(~kB^}m17&;3I-0;kibWZ}8Eykn7kp+rVbS75HLE98bt<>ab=
z%`Q&+(oS4A70^Yr%_pMH#b;}0U!?cLX38ky!K3SB<n-_wZcR}!Nq>{qyF|!c)@1R-
zTx9i}9Q)pdb{pWe%-@p?={pCd*<83UI}}3~$p>?^d@G*5yrzw6Xg`W$Xkb9o3g)Lq
zuibz=BPuOD9(&3b-~Anwa<YDoU<+dnl*~T{its%otAN0RrJUAk$fJ~s+N&Iw(y5hh
zYf2PBA^?wq<y_26&nJkMjsj@G$s)2cn*W>uyY@1cf8+9YByHCx^>x<A+Jsj)zp<<E
zqnF;&QdqHvDziV<4s%LlrM%9GL)^mp$f5l<1vhQ*T(YT8!-H5=Wn4CL8|8d5i>lBY
znUt2FGdxhJpJ@t`9y@8{mTYWnwfOhJ6f!Kl!+P`PSXBdLl^?+*feu_q6^ou=_Ob!9
z6#yP{t@U-<g@`4)8`3?s9&%SX-5ahBQefhwZhUV3$gVo{5>0pdFKvZfu{7B1s)j>%
zItxsm7}q^;UR-niyEVx~CB>wqh^PIFCcV(Ce_25Gcez94+qYymxVZDXv9@FiIHmzt
z1r|m*a}fz%xC*z2r8KTlqXk6~Lhf4=iM2!mgT(Zx0++5B9#{TR(A{41ls#U_P*G7~
z^`XeBEIv*Cy8Y~H6iDdERkH`X`d|`6p_r8E9~~Vn22XrvPmlKhG~#bY6+#bQ0X|q|
z8_ZTxD{~?(3<@*|ChHS<(|j?en>gEh#0Ajsu!m2se5h_lG~QyGd7aHi-1|@MT^QDn
z<EM{))6|>lu9_T^`yDOPU~&--xPNNeu|(UC3+=v-Ts?1XRpO>3D%3*e8xS^<Aq^_X
z)9$*zz8@cGhJ(YNPR5>2(7<$A+3G6+?5!NZV^C_~#APDNj+8MyzulUD(G#7~T@F-2
z)6fXA-y(Tl0y3Mgf<~22gJ%yw$~R*65qioRCMNZX9G-{|V0H(T`KC-3h{oZTjaIwz
zK?}Bh;!Q6^Nne9x9qr}i<=iT>Vh}$zEIB>Ja4epWo$T&>$vHhcnAk9WcAw||SY`ku
zud&);;Zhc{f9vEjwX&wC)itA3US9t3m0JMK!SOBP^(CrjRQ!54M1<j?v9HnmB{5||
z1<wXWy|<3e-c5Z7{#JFbMe4veMMizA?no3cOT8y!y~{QdJ|77U@<RHpUOlkJ3nH;D
zW%8=SeL{67#z@SpGAHAqK9}8n%4EU2@x4qxt6XH@R7m!#+23K3y`Q)I(gG1~PVQyy
z(?!Yx%JqJ!`ei0*e+@J_7F9>)*5}_t)xHL){2p~jp?JAnV1U%-(=8bC;6-%D3oa88
zi}6HhsuHp(<-d7xqW)LPqPN#Am;ieFo>k`z!IW;ES5fuA<H3K7Ps%*xWD){pM^0_>
z^7}tNSHx)y&u2rh=@khG*i_Uua#hvThN^i8_D8Vl+b>;<`j~@#P0;>v79OeX+G`2{
zPaoC=#Kg^=Y{bMHYPk?V^NOvX5Vy#4zNq)&6j~V>M}B;~^%%iPPE3c>X@yqeyxkr5
zB2>xMNm8#U@7%%L@|RfWe9gQMh9;EihR5mRRlkSaVDqi9`cAIx5{Klvc5ONLm+gg$
zwZJkdvv6eHT$ElI*k6c7s9Zw9<kpk#Q4Yr9{u2J&IsOY^pE#dCU;TWY<Vz=MgEBbD
zhn9{T@{_FC<$oRc__N;SAu)r<!14_`IX|MY;!O&#q8Z6x(#>$N2R2)aWtdv91m3wb
zXVHI^GXC*=2+Ko7U52o`EVP~-$7;)cTG(hj)(?d`H3UiftiHi)5A4%Z;tA39CUcQ{
zL$*Xj6>3xg5S5K*f_|FnOC3n|BQa~(X@eB&?`GmkWUbMbhbd=A{HZK>J70r?E;nH?
z>JdvWi>S?8TQCCtZttyW`^SJAFWtyv+AD<B@5M{ygG$Y+jl9&H6e$qpVqEInbTwYF
z=uBnMCAC5dp-9rml!G9qliCSx^$B=#RO9|xUL%vkhN7cV6|*(E7_r@L^`i5$h|DRO
zzY$lE;sXtB9z_LnNya?v&H1zN^`+(ILE8+%>f4?x!zKaKud$;p-5}0jl5}FF1ND2O
z2sEW0!|;B<$pHgK%nkqzT8#pv%^d;<J4d07zYCTz$A|atYfX0b>Tj><R@IT#_TBuR
zoN~(*>#8zMlMoIGevr|X$Ux@0ot4j`Q%rTAlR$_ZXY<2a+UsB~z|G!pZeUS!<xO(S
zc9x*|$W}(Bp4y+~1{tQGGgZc~&x=fzaea&%GG!K%PjKMje#wJ?A8}p}8@uOAct(2Q
z79^G?80LkL4dm5#yz{YK*jlfZC=BRuulqiKo+RiOnG{=^?9%d;<T4cI1MSn>J{c#!
zvanc(kd?k~t2Wx!n-P9IhzghHyJ>Bx3Fj3Wx&=)hX6A>DWC8y7+!#;Pk-?Idm|wq$
zf0tAHvuQHk<O(vv)3etxs{OnZe%hCOD?%aTn&QL@vfg9?^q~QXi3jHD@jq$DsrPsV
zg}Q~Rs;UG0P;AzD?eh+<zJ$_FbM>W^%-)Y136KXe{;9y%C2U%YkXGD^bJ!R2u0(xZ
zJOQjLCOYS?6dN0I&ya8TO|5=XG@J*DJDb1lzA8kU$6cR;f2E=$^<2cTGj8scDK*kK
zRsPjtP|&5s+rvGWdwWaDH9X`^Y@(*0H%OmJRHXP<h~M{?U#is|)Ly>d$P^AMvu?BL
zQVC6=^s*L`z)cpDXgob#*h`9){D$?jn1Y(9f+mV#LGy~0CWFPN#r<eR(+np*k>5MX
zI$W7+AEBZ3dvA(>-|L^L(7pLT>VCr2T$0xhic%{q`ln4kZP$6P$DkJ$tlp=l78;d5
z|JXh$O-8)9=61)oIMsT3{)fJ8$$2BQfr&oJpcu!(E^Vv(7R6gl=d31u5^0qR{cj`%
zR7mC2sa@~A*a`Ov^NrSy(~=3_BjzAR^!R;3n}}0iF9e20e)h-OHDX*`<(HRU%bv8o
zy?^!Xy*3rPhYCF5UumT`NU-8uhaURX_h&^TDZYGeV%-YXF;D;S$40b7oXLd;Dc&Jb
zaf-RAEKe)q?@hHe?A<+7r#z5hQkz0ol7Sr?^7kuEq1>a&B7L0(^b*_tcWs6B7WbMz
zPFXz2TbF0x3bNU7$fFTRES%FQ1@6E6|NS)q(SJTfK*lPsfxx-=3I06*#L55taHaH5
zGpa^lA7S^-{M9j(9^JL>O<vyfcGVs++P<A(STj|4?$P5q(w>9a(3<L{LOuS$P-+&t
z?pw9gK(KHi7A%i4wcPo4!X;bq@2Ku}!uHQ>t!uC+BJbr87R)Eg^;OP-mo`^7aYK;0
zSg-19<!G6ev$j#v`tf=BGnbYVSVkr$jGlmB{*`Ljd`FaSCKNV~ZHJORhfa;V;8Aza
zK(Tz3L)~&%K3df21U+2B6ab9!Ah1pSBZ&1SdSaLB``>xr!A$=43#e^hJjzFSG&@xA
z^;q8sRl!muV02^nOfGCC^0B-sA!O1)7YnV&?+}+)onuE3>9EO;8Qzpef~BLL>}_o_
zUrO@_++3s9{nQC8L}N4$wzI_C+a+nvY_1vj3DFoh^bvu+MC0Ila#r*0u_ygcPDIWi
z+J$t#O%Q>=6YxHXD^JwP&4l3tz!fgPf%B=lk`fL8#O$jWUz3S!0Fv!iCP~PjznOM|
zk5ns&+%zauv)V+~z&mjT2I2W&r#2*}6-twokvZLyUxczD^1`W<0s<a6?9iltt+iE%
zQTWPx@QUaV>rpZeeH3pF6K_n(xZfileqY}nLyoNYh~LO`Z1Ac?z4<KRU0n@_5*IR)
zk_5la@u|SvX}>RTkQ&xI6-qMCkne)r-fnyYr*75ZIlTisW^?!mWh>&foPw&*2A(Jc
z%YE0GA2h`-ZCVBXL!++h`Ne-vQ#G?G(WPo!-BKMDEwfH%es?%$?Uk|R6LoqulXZN>
z_}$<lnYnkZ%lvy-ne|l8q?Hum8xqmZ*5fWP=eSXwIOYcvxo14MXy^3wQ4`&)*-#dQ
z-*oX_^*Z_Zx7mGZJ4L>jAS$_x!+|R=*ClCREvh!0I5{|Malp)NzH^$Sk(d<+VJDv0
zMihkQRcEr=L*WD#?k!B~)Ob0niYu?+kTW>5r;k1G$Cns~`bn-Y7YjquF{O_<wjGgp
zqPo6@M%qok)5>){Wo2BjP(?y4rVnHUgP&y9CshzSa{CVvq{Ivo_uj?EQb}xvdCnpj
z5tVPe9nV}j4yRZoriN_A?4Q><j~vlE+Lk43ofRY4-_eqUFo~7n{rIp;0J$6PiOQoX
zs>&{@;fU#-@=ZZ}lUT&Mn$F@%3|+#%eD*8sG_RiMOX|t<vxmOfc#|?IWwTp>%6c)n
z7K7nM>f~yVWh{HDPj4-=SuoOXrn~WGE6v46z~ic+)Xplx&WJEV)ftae`(8_(LSH<v
zjUNT)&Y2U55d{rX1t$+3{7rwCfiE108(>`nCjf-M&p1h@4X$E&RhnB|xn)vCSfY~l
z7i*_9opy1gcW#eL@aW0@0h0**ANyps_a1@^)9?oCN`lYHsER!1-@KO5e)fQ-lz=E@
zq3k{<Vn$42?tJd=YVgAL-Lhd>ntBa4AH_V+;ue0rQL9e9*U?lpJKv=lw6lFh4*w}Q
zo0v>lLvIO2>K~VXeB{6<!$TVb%lm@JVF6ZP@Rq?G^VzV{L65{VxBJFu`ZI^?-n!H8
zM9#NgjhJYBll*g)vSGVj?v8ShTxsU1>3-a@y)p)RK7kJ;f~}us9r<p9v!=M@rj?ei
zZq|>Uo?qaK^^!%wwDCg72hNCedKr(RLciN3B_+35#2p5P217_g=f}&-A9`Duyz+EE
zaGy?d-=3NTga`8)cnt&)AZTp3r@46J;%4Krp`&<FV9ZM&>Ed-dte_~cv@XSUM7@2c
z(f3h+?4NPO`g;UWt7BW*Z{@5`vEhjjVuR{<^S2nI^b1-Y=}U2$fYWUn4dJp?qpq1g
z*Wlv0Jwh^qxYFc1DR7%hV1Inq{o46Dzl`s7ScKpWRLd~&|I*n_k?Oa9IYo^w)c=O*
z^P!x5yzIwB?^FUqLkR#kq>wdulPVkWy+J)!GB8Zp<L~OopPvzIqsNBA1s{Jt-#uuJ
zeQzh}w}Rh#M_KZ_DL;|wiLB(}IRf#>BFuDw6oE3`XF2u#g)&-bs4F1pi%MRRq2pV0
zolZ6JxqlR|Olp&|a;U5FK`4+NhgivmMuPHTUAczVkQ=U`m}2g)--sDVNf*O<>oU$=
zXjt(Emu#*+zeEQP1OiV*>0>dB%jQR<H4Ugw!Y7I9Ykqa)O0L)3W)=0X7w9lFY0_)3
zJ9&9Yso(GZ0v23STQ*^d-McSe`pJucwqF!*C4ppfns}$Dmq-57a|HGRu{$Xe#N3&}
z^pWZgAHaaSKUCx#%~fA)<u55M&2WA;W9(el(W#69lgI@TAL3h**X?RO-=i$&H`CMi
zO&WJJQg^3L%*w(~yLovZ={yQcFu>*{cOG4HHBFGs_dvSikyB6<dW&TvBpFHQ2eV0~
z${diTJxE39*fn%KO)Y5Y=eWCb+Put4E^Nlc&#q{-GW7IAyOqcvW;0k-#!APP)s;S6
zVL=(-1#1v*oYk~jmmZ0!)V-6td-^4z3y(-KvVJ&A#_?4cg9`5Yw5_~Ts$W~7k0Uhg
zK^cQxXF>{hH`x3F!9KXkN*-1j_VGX#Rp&{OVpxTpc*_IV-k^<*Q<OfQsqN6G?LI+n
zs;H98q9+IH&7qxYZ@RY+-w=Jz+n`QFNXye(=)!;A&o*@!&lm6hU3<Y|%UB<K=glc<
zx|rhPwvYVTbajQLH-vp(u6Vxn(O<?<+^>J@#9W3yKIuB@ix_SV{)Y}5#)=bBxvpI#
zX=`q+ZkB0oBOyb0vq4~AtpD9*263?M-_F+wfz+}_IxMt7{++XBuS;DK@R>td8wkJ7
zg#AB#3GfbCfn=8v8{-vGz?+Gwho~E*eGj96<?z{Z+cnDh-}*}U4~$!eFA<we=-3`*
z4QpsUZ8^tf*UDmW;kb@cy1Q%%<6^(<JF5>4;RR%ya2xOeLL>6YGak8&R@<^UXsXpD
zt_dPy{@5Gd2dgIn5fl_OdNwJs%Xf7|@1jw8{d$ks6r7;SKi!<)+`LKgXS}N0W-{}#
z#?uAg?I%>RMPnQLE@e#OiA?c=CT}H{KYDqQ;y5;M2H_QOhqndzP1e{cQj!<(2ff1e
z8?9hD_t|tUqLg&`$Nz@;hzjcGAQdGi$9NCQGmDUb<s}bIXF77JScFADx2`?<L)ycG
zaBfK*yw`5XNpy|(bmG&-$68}%Vraq2nuEG$zu`%^C^u@Yi)&gODmXa*(<I{MCAyPw
z#nrXf9&Kr939R1L5j;j~CLxXV#yysemJjufZ7q#``^zckW-ORGd0hPUotm>ZEXPgz
zet*$hWFa?33uOKMCdWD0)q)?o?7sV)faWvNK_1#ROi)l(5`B)~(yJ*W5Pp;_?8!a*
z%P*-0<vqz_cx@1shxq*qeY&Xq6IG8V#Pv2HQ;&+~E@oVbHElgcNWFs^JI$TetUtMJ
zIliPwPC4WRlh-_&)shxkP4mK;vXw{d@F+2L_3Yk(g!sKG3_c_o#u%)}+T3Unx}*9`
zH0hoZQm}Ays;&l-REu-qjMf8G?&Q~f|28iGPt{-r`}yxj8TG%9RjBiWICrjZ)?cge
zQ2MCf))iwq`iy$2Jo!XQOP}uzGd#cmp6KT>UlzEu6*>d=uy!W32WFiPGlecfdw>IB
zo7d2ZoWPftv29)e6v-#*AZx|}`~TGf1O;7yZqT3DzZ4abA;6e|kdYK2ykahrcWk9K
z7D0C-4%{MM{tfe+YfBYmQ(A9|9Qw@X4N-TdP4b<$TSq_!q>#`>Uf4eZI0YoM4}>G`
zxM-y2%O6+Z`8ndXmhdZDY3glK5+iA`YL5#?X3hMorLe&={JIia*D*npB%N0+LOD;3
ziri|9JxxdW65<|tp~<ow)DVi?#|JVQN2@kTUDH&^B-d#@6?D}8cDAy_ol}h7IYbJ4
zg+}Gu?^XiwZ1IOQbaaFul!2zo?Pjg1Ye(KY%V8W%A0@Ij9~^*#hyootBBr-f!4|qZ
z?^hTj8BHbq?R9Xkg}<aCj!V@QGum&fv{6hoD3Y&d7{`7F$@3P0&_d)dXL*7aGpDRx
zS}~C~@r-?X=QL4gbf$)W_*=r*a$){L!aF;NR=FR29-F@f=ymL<INca-HN*t5EGt>G
zW<;fV=Q8I^yV;1H4Xm*i4>wIED|_-ZeD3#J?2&;WM<IliYBml6Uh2V(-}FFx9p0L5
zFm(l~l{&}(6crUOsHSMHM~W)zkY-kJHa?AMmuZ-xE2r^}E7r4j)xkeYlzRb;m+S`;
zc+p(?!Y)f{<SW}%?-sUuCLt<?{*zAb>O_@`=b6c?rk{<Q+iw6PVlk_@{6!gxjIEJw
z`YR*U@>yP)LJLhir9X_TU%q?#^yw>(bMR`kmOY!lHC5hxU8(VDZKj+I7XJM%vMCA1
zw(&mX3%V~dvJCxyC_H<6NGMIOm)+;I5MD+i(A_kGqU%-S)KX-W0ft#*9=ym135pO+
zqBtxPa9faJ`RuupFefLyjw{YLqF~*(EPQ@ND>&uA$jx_akgs)-a~)-RMM>@Bw8X;d
z)`8m;%lh=-<o0ImiNU`wX(Q_ZOS%-^h86eZk%`IHi*ts^JAj~RP()m82*0P%37614
zIH%slU5l9WMWLPbUo5P<rDwLPy=+n<l*0Y#l@jUruY2R?UpilvYE^31Gzczz+AIDQ
zw=wH1n46_Z=-12Vze}zp)G@p(^SSbc-{5tIcv@{qgziaI$8jpH2*Hi*_0Y&fxA~R+
zOL~5JWDM;;@NP+==jL|t$`JIoYxVI$%CL0oE+beAjJ;oO_utOcm2?qS%exYhN%C6i
zifW<Bp7PfRQ4wRrrDOc~X1HVy;)xtG@i=%y8U0@;z{~jsfEFLb?Ba4heZm6c?Xv7B
z0UJ;~KeEZlOk6<1av@;F0orZvKc$kgFg46pF2+O#O`jA`5yYc}zE2MxFTbFis6+Tz
zsc@pcF2H->URUdjXT;}2?=3!XOoJ_Nr1hdVS2~%&F$8tf$FDttZWR+zF?%o_zK~An
zF>ks(R~PGfh%()1uYGi{@}E7k?Mtszt3-Ie2Q--jd#vT2myT_25g{O7b3YSJXvlhO
zc*(IC^{`ML8y9U(J472nCXC}&gUz2=RNBiqz|p|m{<VKT$w5Sw%|hv`n1OkPfsfq>
zl8_RYn%soZ75ex%VJou_E~8{v@S^Wa<`zpcs@6+%=pU$G#m2L$6MttkPYTNwG>}O?
zss#ga90;A&@3G(<3xStsnuvkvQ8Y?WhpmJn?d-CL^+!CY=DFlfxC)9!iu{f)kqMtJ
z0=@^0Bn;ggAk4QgRO})fB~<oICagAak>5O+GE5ZCzWY>3sg;$p{Q7fkDaNVet2wy>
zxI<xbe(OAD3L>p;d{V!VPuOKKzWYz*>6;AO1r14ZcxfpF?nSCp-wisk4oT-$%?*o`
z&3h(SNg$?noqq^to`!$HeAb5_bwHS6h|79;xbX~gvW-Ll+vYK7nT$_XGNP*a@7!8o
zVPL4S2Ny{?lz5*2+dNaXoRR^Kc3L%_Nr!L!%rOJ0rxi<|=v`0n6Ub=Qb`Ll`+=HF~
z?B#P>8am$Y9Nf70l?O12EQntgCIK=K;^!!*2d=yrVoCM8*eSI93O>MB4<Q#&1|ITC
zkX9R%UTM^njK|w$cAR!N#&5swM-L5#JNG{llm%Lxtacy%sjz4W^}-~r9?&Gq^40tN
z!Kxe?&^5Ikcu(WxP0_F{>}W%V1?#P(%iPx-t#O-3MfTv9rU1Bs=$HG^u$X7mGo$;T
zw|^g0eyi#$UA$S&`?qGh_Jsd+gMegIVZ+MOKytKKa!V73EGu=}@sl%e4nHmRs|Xyc
zGj9eP*#5B)Q^RsIM$6OHu6BC-)G={!&9hEvPrBp2=H)3t2;Ta5tekngsdTum$w=A~
z)=uxIS)oxTy-I$DZNUdEpB4?-xN!V-<lvo8SMR2NE02XwP>>?`Cj5!m3Oz%lBkCqP
z`r1szzTA^7MU_v;J2-jW(ouzSKFluDU5(8lCv)HXna*q*pdj=Re8Q`79X}MuW83&M
zrj}ItP9MJK-m|x_1b0d>$eEE`VOpyke+9OHM*??8c*ym>5{gCOxN)MTB8s$)+DKW3
z%$6bwDy)7|Q&SIkS+HI#?NYv$4~SWAC0%?cJtDOqFW)=>SBCWpXgFBkselB)AKX^I
zxic4gj(pYgzmv8~lfhm8hDmPqI@?vaRfT~3q^I@AYq@N0(hXD(0KVWrk!6QW!WWwP
zJB#fUb#(5!_1I@R^HQZ#W4VB_A}kqy!sO;Rix(6^tuo94aZC$6=vf@jsQTn2iCyBJ
zvbnA<`{~bYwFTBPQ4DWSC)>;*$-<OAAFt^r)ff>LE8*0<3hLQv6l|cJgOp<bUkc_f
zMQ>lz#jFx@-#W@rP1msTB}*^4I}(o4JMYaVGDW?cNt&l65&|2Ph0}C2JwB-*T4H_L
zmrCB|rCmekbmIPYing?M6K_Lj_f4KPpwqzDZ8R*`T~g41;YFktdJr~HZY${7JsmKu
z)C=6TdwPW}I<0z*NQv10!z_*8Qr`K${#nUKFPYtPsYHq?@m|qQ+mf)}6KfLOUH-lO
zF3Y6l7}Y?^ap~JOebn?DmR7i>ctd`Oq9Qx;@}#lLL!(H~`y2d{$layEi(>BZy&U4l
zO1a)iOD|TV!6oeMpf|#4cb>oMNe}t)Jg{~_Mx6iVs|R6(HtfhEB&Ea0LJ+OLsG3;6
zS+7^)c73?Ocs#F(k(n9u0|foIIoR2Oh(pH26bV8@GR26dBvHw50PLh<^#;nL-ebK|
z$6TDt-yfT-_u45#$cIg}9{;UnPamN9UFJt2R)C)PK012js039IV`TSs^So=CMxHB<
zT|j_jVhw$~mkx`y9N)=ImHYHv`)70(90s$8VfR0j%3Oj4gp;gfseT#b>wYuf+DvaF
zxN3e|!Pg>-*pCh^*Qn7~e)jr{);MioNT-u&q0+=isbDLynb1wARa+{eZ`0Y$ino0*
zucR`r5Hb}uKY#b?#huHzlrL^@LvY9w1hV<|=1Q^?@`PmnHV6nE*QY1vbd}oW746Yy
zQAfRO|IQdD^HJ{MsnTx$4$Vi(d~!Cb_>hR7)n!_A**Q6iN=kv<XWLO&jXcQ4#1E<B
z<c9~hd=7VUJ_~rU=sU_13bVcKI?NxP%{!-v?{a#05_h=Lz;MwuRVv?nU2k90Y<<*n
zCOFF$U5YVHm8S2jttQ#5d23z9^7Jff@~^Plk0cUuIa+inFY65dl^@0@YDSELb1Rmf
z{#JE0YGbZ1^1o<RnEd2J?^TBWzO=|~x`tMuiNY<V`Qyh5sVZDVK>-PBT$TDMkJB~G
zzyj+RbB%}@?AFtskdUqgcbP9LA|mikMiVT!`#QP%O=cLD-nr$t?xRGq4@pUCFRO(`
zX`zR}SiHx^%}j-t4|*%+T0kUcKoE~T$oxgL9_}^(U{A<nXC_Q0rL^+P0^`(S2j8J}
zw|E4@FiXuYsnq2U<;GXW%K7jpsb--R;}y`R?{Etx{61@UCKq3Ydmkf8ZEwhD+=c5N
z<s&2E?}3l=urWE8az_)&cy<}JlW@1vHJ{VEm4W;aF80UBI4rJkDv%O!3m$7zF;l})
z+K0p_$mmVvbkt*Kx*hdu4qCkQ^wa!n4uod#ZWfUwMxU;mbC9QAb(3wno=sP3rj0#7
z6nHuri#TYOgHcdD3!3!mj7x=fvt2x9KZ;ZwyV;}b84J^!$Pm9a$1K0Q?`;*a2M)k2
zDYH9dcUX<$PVxHYt?}E@e1wy~Ym#8MJ$IB^f`IRGgP5e;%@W+XMa<?s;f!&M&GHFG
zqyFUEo{QQsDI~8tulT3?2HzGlbiIGA%<S<=Mhr81U<6y>hR^xg!6Jz72N)vTi~U<q
z6BUKx5IMgdDX^g)@`<T@1qZF|$nW33B|z9g1NpHT1qCF~oCUs|!t>`FpCL^h)vYyr
z4}tyrZpgepK67K?)7SkaE`50On{d4&5VvMP>4eGKcqM!!XTFr1YTg=p1;{LWIX1Yt
z3X)eFQ_CIH*eGH`4euV;sv@!F;h`SZbk#o!|M!i^$$CIjl`Z-^8C_Eio;W9Yn7Af8
z;c<_1f#17Hg3-tVVvje6XU5@eRmXkIauKB+q#WYn)QgLY$SWwT=Z1QooOgHIevI7e
z@b~?l_PxewHo&ezF0svr>FDJ4DWmlP>1BfxBtrjBK=|R!T{%<TtOUj}EYiJi$91#m
zz1cX)>vA}6N9&>5Z`M9Btn(6cE<CLOJXs02dPh#g?1m@)Dm>(wd`Lj|E;_nYqj01!
zEruHB1chTsXeRW16|aesnYkW>r2@~tB%Ohxk%1`9rMp))Qat?TXTRE2<Pbt~jE!qS
zSTY*d)A9$Oog>j7iM##eDwttbh*6+9IuVs`vnU>pm&RDX3g2{Tjj|?}qe(2_0j5j|
zACT1S<Jw3OZusjJ2kAU9+P`p44P~0z{=HH@ZE}zkC~s&pOWV>x$rXRrZ#{3oQC;mr
ze7SVpdHn)AM2tu^&Jm@zr!MuD5&3jmO@;Dw;w*|o+g;+E>GNa4$}m-g;B7u(;YTVP
z|DEDsVLBQK)c<#q^Z%Li@crL85Bq-k<ie)F1+fX)4L!K&%keZDC-!3^!e*XSR1H&W
z%lFr)bf`^U7fytoZCiiO6;x{-s$j#FU+zooBig*ySrfhR#M=7x;NajUVyFKuOTWWp
z^~D3EWFxn|d#Z!j!V|6NYz2*8EMnq*aE`dc#8;}9ZHBKB5)wM1n52hwImxfT|84~w
zJwalKr#8k(A7IWL+O~~wX9t$U!zPz#I%EY2=s>z+Vkqs=)7tRxY?9nj$oBG#f?wL}
zm0GKdCVA6KI$g>!tcLR&z#Rs__CpA#ybH_6Pv-zo=nTGtVc+xK1IRhbflRy%>$Rcm
ztq?IF)m_#joT0oR$QC@#GA+3{Po|z1e&27DcK4erl!<*n<HbkGx;yUJP?s^Xem(@A
zb80Fos;|=y2b-|d9B=;o`STI!t;4i0`sb{OUESQ}6InuQt2{1=hbDuIP7LFJgSHQU
z!=H#(Nd6Y(srz+@w`nN)nP0^^kes*?&!_8UxpCU<ar1QU;`;jfI5-rD2ns%&Cmq8q
z3a-XzE)TCw?d-HrXu}vO0WJW!yc{zmEtMMsnXVPm{%mw~hH2|eQn&jY_dbbQ{3hcW
z+8fdq^eH|ZulUliPvGvb`TGYKY911#xe<ZE;`L<;Kq^O=LB|~_o2nJ^xU)|tVBxP?
zLQ0CjklYNiK=Q43B%(M9xn1TU9_97Bf~bcb$9;FY(wXBU`1D<)*ALEK5aHex-DmJS
zEYz^Nd-BIL+SlaK!H(%s_@0YtVmm?S!$M-v!XD-57Mf@wgkm&7WfKz{n_gW_5B(BA
zc#fYzH!zpkXGftSCK_fkUG_f|37TSfwB9Bq<*^6u#6>68jP2jL`s96IU%i>s&JatF
ztd;hwzLXBi+dhstt@hV8-oQ<^0J8FkEMyNH2JAkUcmn7pyu$Zh0qQk=bAGX+<BGMB
z%W-&dZg=hkzt(&WAk)FKlY<NhHo4W{o%SvvBC&*q4X$)c2|uV(X6+20D2Be*Tw5!I
z*j#%8HXLwI2;!1Sz?+y1?MCy{;?e2Jqk{FbvQ1qD0)^pHHUz=c$NhgC;HSVr_#8c>
zUW!cWxW5Evj-Nn8P5b5zK!@m*l->(Y{NJopKgHG62lC1>jcb1I8?Jr$!nF%eoRzh;
zrXz(7tMqNL5ygY6eLY<yqulUxa*V<E*%$;OXNj9KkPJ}P{+g;2eu>ksi9Y7I)EzP&
z1Qq4y8Vla)IAcSp@>EWa`D_j><v(0|S=|T3t1N`sQg3oNl-7#8v5M&$fWv!526Mi^
zgarDj%@5Jh8IN;+i30Q2p%2FtbtVR|tE}&Ub)9;HJ(8&C#3y41ho%G&t?Z6wXPaF2
zDKk*dN>S7D+#^10hDUDY!if#0di=$M-b9Hg*oQ*H#;AteMlU{hdU`qu7{#jq)J~7%
zIA1c;`o|8eYb@Z-^?y>H;TTLlMVi6<&T!3m_7Pm;3UK_8!|ZI)?wiM({#ZWUxnlgJ
za`WL*A~go~woCIV%f1i6a|bUn4!oN8KnOWP<9^xniJ+`(GH%j%9&AP`L5*uYoabCr
zh&Oq#0UAHKHkp476*l}t0moBw_Y?8gfH4mk5e?xe1m90r0U?O9y@x~-{5?RaJnFgy
zl}#;GJFG?$;9=ztHvd3(!#WLswlIQytHMbZ-Ui>`7m)P>oKKVcpS(WK#6Sx95Sijz
z5Xit5^Y%hY0F45WEmdJMu6%j@<$FW@b?phxEzAb=p&!GgHDE1z{|$b&f)gw!Oetap
z(zq=J>;94h`_Xg%is|7}qGLOw)JyILSdhS9C@Lx%bHS}e^L-a#-8HTExk<nV#&f`+
zVO<*}jcVlxBvS(rqzS51%J=wXoo4pMQZNc)=;7tMnvmuK`vxL1v$Gqh$Jcwk#Bl~g
zx{3~)XgtmZZpF!^+5u_lKA7l@3&HQ+<n#<-CgvYF_U`=nUS;aCNpq*Y3T8EYde_Tj
zVhGL8%liqs=+Gp^J4kWaJiO8AD0)<5_-lgmWlggzr&EQ$=IgmR3!@sh9@igxrKF*L
zK;8ZWi5PH{l7wIc?#x4Y)y>Nc6bStF`0?0qNJ6lop$#fm#TPFI&7**K_6)%)CbnPg
zXL$bcg;G<Nsdx3hukVuOqKgebV`Inu_LJS`Ztr9GmbSk%Iur5J?De^GoXh9AJ|LX$
zw1J69f_w`isTQ^z<GT+27Zt3e=PqYtWTY}s`;5kKnS%BJ$i(MIeJHGBe2x&Q3PDSK
zYShX2G{nHG!Y~5-ATmk2G)A?Jj@TWruG$x%+N~vZJBtuPzQ=!U5!WF{S)O1vU*l%}
z`TBvdb1*hqu#|+Og6rUmXZHmq7%rli<kHt$q&1PaD%TBUY+Bf&dJ2HkkF&I_fKlf~
z>^smj>z^?mc}JcdDGaOY2l&jj)-QObG-yj}swYeRk{wp7OJ0`2?qQ#dY>IqE$JI;P
zx$F46Br+<hVe2<n%00k8ub5DW<3c406n?~i2f1oo6kulBRDD)DW>&1{5ky<L{8O(%
z{lNn+P=#J7TeC!Fzg0V^k)SO)bJjysP8dVkg)CY_m-vv(!soE)W`=K^haTa_aLlI%
zBAvF%zv|@jq%Jp(T+&EAnQ?bOR+L)8C4_^yf=uirG{JG7A8DzYSBx8X0Lv#BUUBn2
zQj*%52-65z2?=*2-;Hw|bR1$rf`J$L6AJ-XO%#65K2M?f#&mdA8b;96vq>H%efLyV
zKPB{8m=|KG0`u`0dy{qO-Z35f5_4(_^S_~%^hg&p(JyELonL6hlV4b;j}bDmNQ?mn
z%6ZWbTMnkXYc1pod!n##z6S*xx_<pg`i6)Iv2B@DUh$rPv+O?>;wO!=|N3<4KHPNS
zQoMcp3N>{w;3<{v+$jP4u^I$1Fr!YLM_l1F3(|=ogZwX%8#+{$Wd@Ice+t=tot-M3
zRwARDZW^kyPLgJ22Ii$>Ffl*v65OFGQB_xO+ayc)6HB%tD0!822D4w-KJKvg{o8SE
zVxyI}!THu}E7tGmlwp+CYaY{GnlL3%c6KZ$uAwW4A&5qSMFqseL@V_-EmircEt>*x
zC10+PVM0&#wg;zCP~*3Rkm94ABwMQPAb^H^I~TG=lr&V0yTnsn=lG^g!=Ak=tiU|Q
zjE7#vf1VceX*$C1gTxDF!k3etX{u;jH?A|kCwD_Hdo^yIj_@P0X}Rl%v1$Y_J6ZYZ
z3jj%x46gnAc@(2h9twT;Y9l-Y@$1vFaJB)Ep(3d00;r>x*#u_}kD*q}Ugm?-`=SnR
zWj+DHH;RzS9wvbsHz=U5>iDxza`)lAdjJU~LYRS!T0JZb_-i84j3i)~fBg8dJY)<&
z6byVb6Ou0+$$+mK(%h)S+hQq)IK!?409Lz!vRs-D7;g4EFFJtK8?%*q)S4t~iAjm`
zb}9K+=j(p4Oo9;jYt;oUrFL21%_&`Q`u<t>;_*{`Y5>fy4Cga|45)s(VR5mI1M+g2
zi%iQ9nUp{eagxob!}nO;WP_)Y9HEwatFF=nS>$uHc&r1Yd&e^Py)t0ewmjAU;$eTH
zO-7dIUW$2I>lkQbaJgQ_tj(oQHsr~4gD>9_)s-w9nZqQeAxgp(<O=f9^)x};awdmY
zKLop#_ouL&y}YXRSy9sq+k@C|KYkoz-P%qeZFJv!QdgtVR<)S8{{Da~%H`yOG4QG^
zko)G%qYBs@O)BQGm+~-XRp&Qzr%ey!LZC3InL6J~J#Pil2^K;Jq50+zX$Et#dP;;A
zQ1&D4aDZ;3tGgS{Sgh3H#?0vIYAMJHgAO4;sLeoWeTz!1x7yKGpU<6%WulW2E#K=M
zV7Rq>87{_8fNIG9s`GZ=%-?8<)IZ<axki&Fye_BFooY_oRl<+lAuX_zW_+W28{QP)
zV*F&>>k8*c|7EN2!UEFcO$a+iN9=?xS_x{4pGTPnWtYPW`3#J>2#tF4+d4Jye3qpJ
zTAbdV*V5F~EI+)FjOZOb|Hk${m|BjTTBZWwY-u=M5}*(G=gXo#2A4YX5cdf;NQmfg
z=O`mi_T31ab`MHu7_`YGN%KBLEy|fSqStqkr_TMJ@7>5c$Fx$G@LtxM9334gM7vjT
zVVr}WNJ=;ZF*(I!ju7$o#YkmpZt6GsmOntPmn-;XTgpU&560H#;)#4)j^c^N_lc`o
z8=+pe_54foJ~>%^y$*5t*d7pG?u@V(*VbxFNaHu&;GbFd6m>Pp*BPYZ)3IUp-VpYI
zR0*W4OW$I}#BwBqgzZ51uMcZ21I!R0DT~6$)SqKc?u?&+O71@%o|9AAXV1n&uiJ~Z
zNAM^<dh~8&W4EiTAMsKnmm#%6a<{@D|1odui;>d|6E=_ixwdd<c3H~D$+eJWHTS+d
ze<XdYUk{0J<R70uU~GyEJK9^mrl~4yJ{QPC`q1YvQU1#ph<SSvK=y(q6AjNOccxyE
z6Vf2ce(&xKhm+HWT7QIU09gB8&WGDy(eY$n{`+TzpATPgp0$8aS;_b+T1OztKWl)M
z6+wzVc_Bxt%hCh8`E(%9!vT_EQulb8!2NTq1VVS3YH32}eNLG^G4k8run)c9E<ape
zT=X@o7>8`5%`O;lL2vJ|uI?*MB2@EzsEZ$MPE=_{1BV^n=ry`MmK)X)rfp~k95wuu
z-Nc=`D?VDP@^|jweUxxyz8rYUz=^1qb+7m=kE%mN@@~-x7&-CS_*}kxps~1r(BoK;
zlbxLo$Ahhf^PDydg?sl1r65Xx><CoVU4B$SOm~ypSEVAU7)bOKc-rb&u%q}Pw1kFK
z_U~I>z-KTjl=AZ-(S?5BW?_(Ud)?Vy<`f&_pSvpo&n}UN>DICi;oF0~&CVfYahQjX
z{bjV|QwEtaa;Db!KVC2BZvC<e%t71et@aJ>9>@qf*nYZ*eVK|=Kcc|eQT(m&Dx@~8
z;QW9ae?tP+$wm(IcM|k22l(`OHa{j=RA?LPYV)ogiMkdP8(s~}O8|_10=(7ZpEY^-
zsV{A~NrU$o0s%nG@pfr>pcHVZ_O`aXV^uEKdcJ>GfXBJA8sxo;Rc04)*Dsp`3Bes;
zSNeTAdSN%2=;K4j38=SG$<DK3kU#CetG@d<H^Zk(EBB}k*ps@e_f>g<`fZfpu-hnn
zj+YWOV#na)KyrivW?s`;>GQ1$!|EzsEMn>e&CcO`!{zw>!UvlMyMLa2>*>6S@4iL%
zCsnQ5d#X-SE2j|-3~8F#tgHmg2!u_<g5%xm>u!eUED=}zP~7a_6;6zyIMqHfoEpIw
z)^HDMH~bX4d^07`E){m#v0}@R-GR*e^q}GjY4JbVs(Ba-r`4T3W`F}gK}{^tf=`)H
z)qfLFe`~K;a=o;Lf&5LXvUR0+b8g@g$EK9G5ES%ZXmS<ksj=7*PD?-Nez)rFkFCH|
zfXgq!mpsA_aRJ<iekHl$Pw=LbDXKu9=cm!`Q|3W`vVfSoNx82H*a{Z?lBCb6{h5Sv
zQ5v|tA8&+cVOrMeyxb%w&-2E`{3f05^j4K`O|(=UL%$--t3@{C>Hlg0;)7Fey4*3_
zGvh<J69p6x%jpIBVpArjVG7I~H(WCEmyc;1M$Vy@Wg`y*RgQy&siC@qqi1APkbbH4
zk>JiRxqrn_C_4x}%c9AhyzaO;DHQ+BVKU)VSSRUwdCyhU@{MP<d}-^&Ui%Lv)HyD8
z?y51DfYiM^+(|c;#U&O8sg?oLr&M(6+hS;g=H%ic!ln4HL>GN7ETl;B|EP7zC@<u_
z|M_ql;(tDiwM8VVhbx4_oT5t=>ZshVED-MEcuG8+dVlpkz3l<<yus2+{ZK^imzDaz
zKMap%Ao~vh?;{6v!Or=WPVpV~KUzzAwM{0hZ#M7k-(`OEx>ZDDm?W;u4*T6*9&IK_
zAW8c0;R9(@jyJMP3j#@SApXa|ymr#_qSb?;`Lo-NdzpSKQUdS&xT;B0Hzi_<_7Kk*
z#qw3AKr;!%LGX{(h?wV;G4n*+s`Iq-dA&itTk<^L0qROb*#mvdI5HxXcjQ~CY5TL^
zbRlb>w674pV!eEM<oFl^ZA{_kqe3))Tmsbzs@@do$GO%CnAEOlPYE`h1|YHV<l(5x
zPkoz{T<q=lcl97it%LUuPK3^VvIi59QK6Ea?|7lia!-Q$JoriZ5)7ki^(~Xg?(jt4
z%}^eyOOU!<+@;~IzgkEf_aqi7j~eI}L;?W}&d_FXdS$Q7uOpRD`LZ&hzcEqFr1_D!
zPqxC0GV?J<#8Ax;gnzJIyVjA_9u1jTE@m%qHt$XNvybiuT(0QyspYzUEAz=wSFSEj
zg0^u|F7FEFeEaZ`O7?CmhAC9?Jfq#_TcdcWKYL2rcxFbWT$1g}MY;Krw_`a(0|oc4
z&H$bsj#RX_d?W$eu-?Xlll056V*H{)Egf?LYQx4<-FU7{Mt>-jkd}})1Nj|rX1#1x
z!hfk|k_5g1bqj=-@YxnKp$Y2a$G&owJ9pU<&^NulzrUK-F#)(z1IP=&`G)X?4_x-^
zTh<TK;5Ja;d~Zu!7Jn88T3N)aCN%7{rfLr!IB4nXhe1$*B)~A=#l#FP(0;t(@YmJe
zWn+lPrsZ~#Q(FVX%}wW?{o;Ev`Yvm7GF!L7s;=HTUOu@(u5zGZYbOtv)xq}tBA2dd
zsw3{v`F<hFewRM^K?vN+_q&g<Bug9$%KSJMsthqbWtd5o4~R6|vfs<?!ZP0zoLYPJ
zPqyM3q<{U{yy1{Sv}W>v7Lk*a6niBjV{iMlzt?P*&xDJ9M%8mG;UnfNTajh2BEP&<
z3fC~?3Hme~$b47l84<-&b_5$!S)}269LT{Ae9YSh6fmRD*Wal$3K4T>LYzm@_$JWa
zDt(SbMCsKt40&%5V*|Dfx^8BNJG0OXxKQ4BCSk$h3r2ZP8>7M>daN6WZagb9$W-AR
z0NE+@UOwgJZDa%Ja-?f<w-1}mK3_*#o0Hskk!$-eSPoI~-HX{yTN<ksS5Le63T@&9
zj17X1nV!b+>j!{wG7aQCk;BFZ${3cu<nTXd$4G>M+?gmPo3qf0pn|E(1Lf@7>xDmV
z`5vd`<q<<7-FBxCc;uynAuVVF_C}rDUr(iV>Z^*HmW6UJ+izOS9GvEE>eik-tlirR
zvFVW9nXT#GyQ`kaR<zEff|+nO@kSy>M$Z53A6c`1klvppbkfC2SVhhd#39mBWsX1U
zD*9OrKA*BO-u`{fgzNdib`2%YEjGj!${Vx)7csFaq^rw)SC7Q5ONnHHg7D>rJlh&a
zQ009ZmFw1eewD=cBWc-nuv{?9^wy`PygD1QjEz;xaDE8?`js1)X|M{ZWNL=CS;YT>
z+U=31W&l)|psau}?k@{B8A%xB{1_or<~B&^7hc?iLojTtP#8nK=Z86Z3e_<Dr@8`Y
zL7zWuG^($f(r!Yf2A_mY*r39p&KBTq7s)=7qN0B(0LcSQ!?{PVns#DCY6CCYRm5~6
z3*FGkeO$k*7pHBIuk%=2``LsH5dsa(JZeGxlF!Drwrku~Mq4AN9ig99`z%Lp9U}6t
zwaq8HPw9?5cSZJO!7Ug${X6*31O5j4?C-ci5@rcO0TBJv+1-5`4%4SQ?qojB|9I<f
zX+=yp%7I+4XlJ!!tUljR<YQmm>oQCih131cX|0?4Unp^EiDq;h9mg~8)5I2z^pp=f
z2G*MCokh+@-<9Kd_&h-!<fMlo1oV2x+S=a*E-|5=BiAa%8+blNy@CG0amDy%7nry|
zio5;TGqQAQm;w)kY@a8y9g%hisy_yNdb~yv0<)BJar~{MGNC`~Q*Za5%XYF;y`@(Z
zqGwuR6|vYpZjZedYz}7*Ai!K~$dDIE3>3dm$a{mx5nwHbQC~N>=#;@pE=Yy*MccnR
ze`&zY!m8v1NWZ|qzzgw$&959P3row3b2zm7!0=wBh!e>}nG%P3_AGk|^jRwtRX5rr
z8A8Al2Zu%rsDUm>_IIsIKe}&P<m=?}UgtaivSNF=d7CaG&>5vz<InR`pLXNNbP&9Z
zYT}7KsM-4%uR3NB5d8wJHVd?Enqadt_;f3!9`r(Ph#AtO8|>L4qIvluQeWb&&w?{P
zoc!tNl=h+Z3?a?fAAE?7cwSyD>mM->R_lbs#Bd(1FGj?qq)$PEMs$gY=mJp>=UP@a
zwkAQ(ZI)ZF+(|LPW!v>HAM=a&I}gom#<JWn-Mp?u$kASRFvVB2VT{G45zr8ns5?P>
z>0}X${zs*6(c+|v@=Ta|Y4%C3a3NZ-u-SECSc7h7L`#8QdTW(x<`t~Jiy#aX1qxLp
zvy0pa<wW6hnO*#s@^YP3zurAPtxzFd_U-p{<GrPoc^ur=@oAkoY00rI;?fIZW>&6J
zcL;oZq;Ge7+va0%6c%gr_lwAdBnUGCZ49sr6oF?5CrL18lZGi_Wk3GCU_zASj@H8B
z&g2Go`pcK1bMx~TQDYFu0;*?dfv98-;PH{xs`E`GLfzj3o!Os|k|%RG^9szYpKRw^
z!*U?W3pUw{%s{0_kNV9JwR40pkg2(!YfCm+CP@B%Ic+)cXhqnZS?bmfci!XH@ALaU
z>n<#!ApV=(($;=>`UCD$(aTj$2z2=y^VCG%k}Pbo>+1@0!tiGBvriUYXdw%qzhQVT
zav0i+@Au;clp)FQuxqdAbT#g}p^#N48AN6`a3GH0%Hdu3j5?xNLcUu;4NY<9Pi*}D
z$&=cHJ)S(z`J<deZ|Q%+^e;P)t!dscpD=khjE5!IWquGc_YuLFC|6Nadp>l$9E%Mp
z6bj&^j`fk7{!Z{E6Sg2^lgqh;ZBTXF(AiZK&}bc!@v-aQlb-p5J0mV8#-_5zm|mKi
zpchs$P_n8+3sGA&Q*(T@_)b{voCt}Ln7N_~!9Qc`{_+Om<m*8{lMngC>wGCUg6L`U
zDBH?NxLb)g#74-*0tdDVa9|ZQs`a=6Qz}JR8q)_?opxpvbor-sYg5SPcCnmxxic@e
zBoMVnLjR_SA0Ry>VM=obR~tL9FTzn^69UT+;?JKyy#MtF5YvmQxWfOV=VB-^vJOYV
zZVc4vW^_EiuX1H5`(V+&!+9O5_mWl=Nkh8y$z%%G^aXcj7le4KJ39+Q*9d*#xrIb+
zH|R*g>vZ)cR2Tn_J#Vmyh>-6Sz0TnI_`;Le!s4XaHd{e?(Oi$ex?eoeoE0qrmR({5
zcb(hi{asF{@xNbqz`HG&4HL!=03clyatJeUc(C<$celVQ(D83|@M)Hu@6orZ&^B+s
zHbaz_<zef>iqvgfalcZ0Iu_qZ`%BAd_s6LC2TgCkd>Qc;$0MY1a&!B-X=XnoqHnam
z5IVyFbvS|=wSMR8yo#OnV^hrc&*&GB9=zC1MwkxWn-})-xVShVYT8A2Bw$0e0j-os
zlR{lj>A3gr2Ubd@HJ>O(#<snCA+4IT87j?vCpGe^^PgttQ%p3KTQPwSwU8mt%NXV7
zl=kn7CgabY=}s<sQJ`HBFsht+aTMNWF|v;d-kY!^a6&n1s1(unbWb(((jK@%!p_&+
zT$cxLEQ(b*$)Cx}+?xZR8)Rh)fvi!$7(9r+f9BfMr)1b31a(^R2c`cj>6#U?LvG;i
zSlioQf8pX{+_eBjtmXdI!g^FDcv-9-eh_L>#sI1kyVP^fnme{D4D<e6I|DarnW@!9
z>l*9+A0DBE{n41*wl31row3oA{>+WnjbGgTMP{;bCSsspSe8)T@zU3q+G(=Y@Ah}O
zpC6>|o~Ddpm<v#v=eu6^mS=6c4Kw4W(AoJ0kZ&z$!HRk2-Mm;#;N(S5R##y;W%fd;
z@ecYn6?M!_#!+pn_V(vD+)TsT^q+AS42?Qf#VIE<3H|1=63+J}zfn;?J?qp6(snK`
zJacpNi^~R`n)S+x0Qr>N%KbC98Ybuy#%O+XoMr|Jjm_Yf%K+$t3O-LKcl~^qkkoDE
zClcDWFps!k2)55UL3c442EF$zg=is87axKKWjfv8to=;KrX7Ag*K+i={snzr3tn_R
zW4zxn$*>gDwL%J(#o*g&Y7xOt^y9N!V1T#)Oy{rH?5X9GDgy4N6pgDFjT37GmIoVM
zxs2vUjzS_P{X7>bq@phpaeLM+!yA4)_B6F0hGWNtsI&EPIOM7&Nxs{|Td8<H762W&
z7-(qvb!7E`M}8G(Ko7Fc_IV<@#$Gk_q(nS5`9NCw3lcX4I5;dh#N}jgy8h*3F*86i
z8THb>Awi!L`YHR2`gPn5I`N(Tqc8f$k*#a8`M&kTD9c?U6TgqtwWlG{(|e_Y50#1*
zs$RJqp>|iEa*`dOV942B;>bVM$K>8HOyjdidPu>n!5jM<+~<0WCQ0q%#qv&Y3Yr0)
zzQfGgfm>exwtEf!q@psxHFTtA(vW^JCJ)z?nY*cPIY+|+i?@d)>4t_;nFej1xVF|p
z+x4DOgM1i&UECBeFjEz-C|g1*vq1BbN{w*y62T;d4ce9kkOjax{0Zi~@q(szw6&=q
z{sRY$EYL(R)-#&^69k!R+F(U{!y@-)yWyM}5Zk|=!=rTo34(B<-f6@pO@lR_Ylq*8
zf`K8CoQ5f^>yzo9lir6;r!~JMkBspIFqL#7!HWx2C+|6^!^@nVopZngb%ExDz>0q8
zie}cZYitvm4Hue5rO0|8pW5r(zigY+r^rsI9KN!Z@UzJ6t%_o7pwO!-yXM@z^rH>B
zh*gJ~n5FfdN%v`mbd5A%60ZzpQ>?Y%yCpw(3X!+ZAo}}*i0#nV>pmwACR6V4=e2~s
zdleCOb~4l7&>Qq_^pS~9kmtjO;3xME(ongLu?vtDFjz6|XQ+YYK%v~o;E-5{aM;fY
zkS7>5CH85_man7`bKkK3?o!d5Ix5Nl#oXjf-HC8LbxqB+ro_AHRi4PL6hvQx&lP6o
z0!ZKcW($}4KQ)0>O^vaf*IyfLk3*L3-C8EQ0jZdv9IuLJVd=sm6D(Ji4R2!8Wxh4s
zSRvyIexrG6T{QnPnQ7CYEp70OgCVv}|7=3D0TM>j9H;AluD<+QP;kf9Rjj$CMc8A<
zOfO$YR~_9>kf_D=T$}-*3Mwk-?^cSi;exFmbjWXDvE=0BgcEknf|!nOqZUtic(|4;
z<VAuKq~rh8bRFPSM*si4*R}V^%-%#c*_-UWWm9&^h;T{vY}i}MmXOVjDA~#0*<1GZ
zKYst;&(rg8y?MCrdCxiD^Z9-T5OC<~=pcbrNG!E54k)Rww0KkQBL;|&dd1TuV_ZH)
zV<J4(Vke|p9yeH>=yObJE3*4*x@%K)yLTHbvU^mFKw*D=vP-DO3G7&r?d|el|Ec;|
zQli!XJQnU4Ki~&8H=xiw;!JRGo1~sGH8ecq|G6~uc;*<U>AD$`z89%A*K)AaM!&KY
zc;<>Fa%nARr*<2oH}u6p9S}=mTL5eeTp4tYjU&Lx>NTJv2mY>kG7L~_wxF9UA#tC`
zA2m-n87rGF?{c}g=;)e;96CMfa7l>oS|fPc$8-ZKpnSk+00j^sf_0wl@0eAvTMYrq
z8)tW0e($=B3s_UJek(z&;by<~3(Z3yUR|QSA2TU_q}?-}^QMJPEwq$F$7`p@@`-2N
zF`6lC-hE~UfDs?6?6Oy>74*jr-hW$wEpxafrM5pxjKCF^rA*4TqkLtH8KTP8H7kJG
zdyj~lG|%NX*3Tx^CmDJW7$a~90w8HDz(o`)$2wd^nnqX6%Z)&+fgRYZ$AQ}sH_JRe
zK}5&<k+}jD!aq&xHUJb~Ogmr!R$OSHn+O`snsLh*>>$jbaKyQ`!2fuwVXE9y`v`D>
ze0!Gn)1cn#nq|No8Fi^O3k3Cu*UXY308L)Lx8S{bS9v$wrUvu_3;{$=03Ly{+iDZ6
zm-4_V`6B>4DFNzt8*9hJ$r*LxQ9Ttm={&Q`Ro#HYlTRXKv#?D}Hw5#p?KGb?J0||9
zt=^R~5bo#3P5?;RDxgaT<fiT53<e@h?RIBd{`wc{@9z46YE2Sobm4*CtbiukS*_jw
zRr=<y-g-enxOJ)$p(?x};&$!@UoO&DJR1bf<xW7`iMxeOfhEg&f93Rx2rl$G4Ol&K
zDNd-|&Rs4p>GmG<IT2I0ft;nb=;#EUy?y%q>8Ocehk=M1Zs`))Z*})EH6QVP`=Nl^
zhRtgSpIK37W`!3SsPOn`p6ysBj%$jUsV7;vM7$&Vu7hKkK_2N$TN+LO;n3!ZxD=En
z?%j?GL9-D^127H4do|0jKGSs&wnPa!{a-!iW<Owp*;D`~BLlFX6KZV6&HUYONMUbE
z4%jVS0BTv#eg>j<|I8;yCh>`tZd<|!H2gfWAyLyIs02E-%t*DNbOXrpAc$3eugJ8J
zEaMCTP6H)C#fg&dTkWK1M0Dhr3zBh{k5a#v50)bx%IB7EpJZYw<MG+zLZ_Ok>68K`
zG}C*vCt$JeN}%_Mi;7D6axVrf!Y~+%y7V53i0N(j<L^=Ol4nafL^*?+=f_^bwqt>(
zoYiXf1V#5fW}DLh1V_nZRwD}_d*G!Hu<pl?IcEJ9@tZ-t7fRy!3ap>wMHI*}0TfNh
z)C)s7{V>wVqq$T`ZS^d#nG2?E>mIKY1j4_Svl58rWUhZ*SfO?BO@1F*R5i?cNcE)d
zu_8r`XTmmDyWL;D55B(NYg~$>HSVr^z0^?yR&q{YYWLnr0IgPl)>Qm%*|7-)OOf5$
zVBVl}ON<c*8K~^TOzwq`IC}>U1g_^^D9hq?<N{~tTSxy7R2<03b7MYhtgzFT7ja-`
z>s;0)0@xqmD1e4LkpKR;_3)a$8{zCWYBpYm@xI%DAnhIw$&>nUoA0N#SH2~tg6u+^
zm8}&rFLql_OaS@~fpv4Q^zw_u`3b$O;>q02;B;_v%IZ6nw6L&%B)%uV?^T&JOB1C5
zLO&_Sky}1ONa<SC5LT~G-0KjW{e9ZPMapD9-R@}<sl>@_hr|8nOxcw01s(#YbX!Ge
z4)~ZT7#O_c?#KZJ3~tT=1Pp7Z<B{M|M`uKUIE8wxS-@vW%F5bq90fACX#x|j_h15I
zzx=YeYv2HqQSm_O1y1l!y2cmCLd^JLDf^$_GwRT%v#fbcTpXPJ&L-8dkC_0o$qjU;
z5m3jMvR5{g=$CkHo<wCAz}#XF{Y`2r2aD5x(dHXF>oB(e(hm{n|22^yV&H)O3rj<C
zu>W11zVrAqjx{jpf;o9sJZd>_w3nC5X3$RbJ?Yjj9XU*T==`z?>|Rt<c+F*U6qDMC
zCtWli^%XD9mQ$hzgG7z9=Wrm=dYUG&MArMhUz%m@XLn9E(e)r=NPgo24L27qXQDu>
z;kiu|8*n`Ov99D)$8Gz@WA|4_dj05$#6v8Y962%ZdoG6PdWIdd_a=#<Nb{j<=KvSc
z{JJrJbAz(yRk-DTwHbBgd3A<U{vO=5p%U+@ElP|!@6>S38_5;_(vnYp&?eJvjb-Zi
zhGD$_LQ)c&{q23h)!xjLt5&amUuR}Q5D^bjlIS68a5|=x@VU2X(7ruHp#Q0xh=L{$
z-JU5;L-}TeMD*Y1_`}2JZxV_A{0(+tLaIopK$MA^<)X-3$B9;t#$tl@?3tUpZUcXg
zCcXM-ul%Y0-WT_>w$vS3SGn{@c$Zd;qB=UTMLpgP+Sn-UgyYl6kf0oRF|_Yq$G%Ip
zQ0%^Qry_;)a6^l+s15;S8j+L-Cj|fYGDt{zAE9l_*@F_tFf3xXYqA#q=K$vH%L8_c
zwjj%e)m2QOAOz{j>ma&!0ZR^e;llJREqUVN<HM_~t9gzQ5O^DMpr0Ls)L63Lq`xEP
zGxdlr7+y3|{IgF}Swn-3ghU{n8Qx4(FEdXHdx~V7&?l1(-aY!%ViebST|7NAcOREv
zXDYa>CTeY@Ku}UDQ`fYxJ#PO|sCwah>8ZM)!pIlTkDb|{ei9zt%93chzrWwPjl<~7
z7l6a(PDyk~r1SFi{QOf^A1*DsA1j?7v{jp*qZl@+wkNqJZFr*@QhJJyNnk*|->H6I
zIM>CPffL)LDxcsM;590Jt;iHoSy^d&0Ys)#b(PNnihFif0{IhE8qYUJHHm3yH3LDQ
zJCqB+x(-rp$q-;4_^ic<AKIGsmWS+rpBuM?uLKa$h0jVuy_pSE4GrgGOG_kt#4u@U
z&)}%J&&@M>FyH5inveRJ<_9#cA;o}aqAhG$M8pENk9~FCNte=Sl0NtGQvSri?|-r{
zODIzpalGX2&%?Wrb`KKep=y5lw8{4JGxg;Gl`O{}T#h*MwI!S|477rdknL#dyAN6{
z`K<>PGw5Eb;KNccq?zG6zIJ{A0d^NY6o(syib2vkrkwJgo_wLNUftF>!0K*kbrrBL
zl!q#<WJVRxWUf!`K7g!dfRh>+eT}u}e6I#r5h)xzJgf;a*J3H>A7BjZ<^-~AgKd-X
zfEyz`CR!c!rdUAa<h9Mz7oO@3G9r>FTnfG~6<R~fUHF$fn=zzW66#qPcu-!^OY_RK
z&2U{;*UvmIE&<_rH%m(vK*B8CCIGaYf0a;yNd5`I3pC2)gHkA#{#@ql=uXyy&rD)s
zV)pimC*;d;7<!cn7DW`6mKGdw^iN(#=d;I98rl>Ob|-0s472>7`DG`VA+zV1xQ;2l
z!3cCSgLBV>;GQ{pY#fC6fWb}>+!YXmK?yvn0I!j(wG~CG9XY=$3I{m)J2n;;9RP^@
zPEDl*BaP3lm5Dl;3$8p}|CGZ-Lqo&NGjVx5<-rWTyrZS1MILMpx;-ExH_27i2N)V6
zkY>CoF}qR70Q*J&1hyN>-j?KN1A1vZ`SEUPtowwQ+oGL^`k%;Jc*zwk^k3~z1S>2h
zbwpQu(&m;`{lK#wc(|quu+vyFa&qNK{{cRc@po0VP8x@<zsf=w16K^Qh<auAPNGgH
zKEQ&knIX6J;v^AC8I{+mR2M5jKYn|VWl7LVxP;fF9cs$`y(e$z%`6|<oK&ksOeW&j
z9PuEakd=ZzAo}`h=L+>{4to0o?P(IqqZ8H51gF4$oo6H4t2qB-Iwq2GQEXr)xzVNI
z!5xurGc!_c6<RWL`%&!Ks9Pd($H2~P3pYOg9ZnKbShRS2bTmfiZX2d4&W(~DS)p~)
z0}YUO+@8LZCFn!|DBO{t=zH_PYo+FK3}Ds11+PTt$8^upzB;T7nwUgNqoeEKB0TdU
z9!*)7=ef0J&!s-ocZTI24CaZD)|Zx+{sqVG-@v77Wy%>%7B^wqAdP1TJ)nE;?$9c=
z65OvwMgs@(dOPRJc-JND=g908T|uowSAF5b*I&m4k7#Mwd802cUtyeHG=vb%qZT$F
z>umU1#!>!_sIau~yi(?|eA%GKK!QCeI*5CH{VjXYW5}6=)!2Yi6z}mLsOcCM-GR8C
z;Xq(O36gk+g!v348+GLLv;>#x6}E<R;fyatb|*L<byNj)`1>y5pqUTWWN~8<(%loj
z*5DxH!oVv+eR1%AaXuSB@pM@&)zqBp{jZW$k4RwqWg_JWz{fuTe@yQVTI`DZZo;6E
z%9m%kQNhy;WKIDW@$%(EvJ6B>tk=0usHxL2%7^7X6%183Tj&ZtFX|hc9vp<AXfXRi
z@;UksBqrq%V!sXsH2ak_9Pu38G2VC`?RvfS%IFO7Gv^;@J|PbGf}8Zg_&_Y-=m=~@
zlGj|4Up@buQHbq&V_aL$Xbhid@gR9Xa%;yW0XlNl-g^gLp0mA+2h~3^LMzn6g|G+?
z<;Qq=#VidN>pj<bSx6W|&;9bhnBhZ?_*VDXvHVqUE)uk$c1#^lax}AYX_EPMf_IP5
zY}p{fqd)X>*?cU4=3TEP#JRY*ChtZ6R^0ES3l4bO2Eai9RX}oZ*j(-M<l<B=P{vo|
z2#qJwfojC5sd@18heH~l!(=mORxM3TumJH$$=kd3Pe(_GBe8Y)R!~wfu<r$y!&;8+
z?wnW<1DhbmU$@TjujL<JutI`1gHux(P8$~**N*72DiN&mHLtC=P5(X~a;K?e%XKt-
zc7^{7?2qpaxla9>m^iCs!0+tum&Zbf6Uh_FJiyY=e<iDn%2H#Ml+1+YD;~URY1HRv
zP-}^N0(_eopofZb27@wKsY1$go0mp-csqoC-WaybuyhPX`T4&NSN~k6l6wNoNo`C>
zKe*wie`F3gTnhmyN}%^(#UFI(SDcYSgMiCPLx2vq-r&_5T{qhZi_X{4B@RtYoUQl!
zm;WGutw+>t@{f45A{KD@?psgCSCUm>3Ra0kC`@lpp#7cWMT)^})7RL)Zq(?I(o)x$
zalE>aSega`S*+-MSEgWy^1(9}<ycBNuok^D;i?Y*7%7L_E^63?-raB#NiWMikdww&
z?`DoY@Ml~0ny?Id>>{_oA<uvy>aB1UBu1545cQVWFJ7S`*H+@*OpSRQ9{&61(}|fw
z-w{^TLd0KB!@*wiLP>Ub^k02Y0XZl&EHJD`%kegNzTHPxJ0yg^42P+&qT#N>>2}UP
z-<an>Jro-WSB0{{&E<$~4(%4^Ww;pN?|^1!7ND}B0iv${;pUjO_><o(pf#%O9}vJz
zK=+49h8_^R#o%!G2hi+8K(9Fiz>z7`tlaTv%B=i2B-jVPJ136Fnj5axc&?T;kf}Qu
zmitx~k(U^nyf&CSlxtM3oYvO%=STd3kGD6vlJ0L}X62<R=U0sWE)FN=2tb_I?bgh0
z;XkACzmc3wxqJchl#y%}d89Xf4?d2K?`ATd_~mcUdufICmsQUf9+%zBnbxZ+V$rYR
zM(5*6J`4rduyASguyRK;zoBx8w#Eafy`115$S9@Iu(r@$d-=s4Gv*G%B#t){JnoxB
zlhuM#4)7!6l2^EIHzN)WE^OBg%rA9gC@CnQ0acx@nOQUdy%+&06zJr>HsU1`F%>>B
zV<a-Mn(x3OtgsG;Zr4_9Qns4SgZJs_YW&|l+^|rS{Na1l;$*&moY%<CbYimRl@)b{
zgi1!7|7iImq&vbVDDQj#++M7VA6NKplq4<10s)G*ytjMFRUw@FPLjdUWf;nbE%*^6
zIscgM#z_V*7nepd==X8C742m$s^zB0<~lMC=lf2MdetKPRmYjxFOxx`Z<Xi{z@WI5
zI_Gpt2725}6-#;G>kR6yrH;x&b=X*Isnt1!uvQz{UdPzc(#?V~k|4{iAM0_YlRHo7
z;G<G#V{?=Lc@Yk?^4bkh{aT;w=z-Qo(nCZT;Mg8+Po)?VAVF_@6__rV$H76$x1Ybi
zT0^$S@H5oPdl+b@vVSE&i@p2cjUg2UvGumts4{x!%cCOQ-v?S+Yle?1Jez#*OQZum
zJI9PSXo+D$_(S8epW_+UjYKrwSCy+TE>gDF89Cy{KFo>28kY$BQ6N075xaseOXI&n
zdnmf|T~hp_;I<^aZfO?bs868ys6h~#@(BT!jZDb^+|Cqk(1U)-u`)Cv1Fv`Qv(8EM
zTMr2Z_TA{hsRG!ie***AP;W|6DH(^^Z3J0E>@1I*H)|&a5vb(LDLVq$7cUzA^z^7a
zy*#CdkTDbzcHbjmYrhL|SxB$}m$MMmBbj<I(Cak!UuZ{vZKL=j_43uLSNzYGRJB;T
z%HVvI7fx)5Nfx*UabEe-<GASuNo^rmYXUFDsG*X);-9m{&c|<LQvB^M%;UfQNWL7w
z{szfh2U{`0R>EMP9FSkNk{28C28{x~PCh?8Gc93P$;y!;rO5i8we&A)AjtUn3d+g+
z*)jV05f-)EX9`r(=g*8Pi=;W07`fSTEwEQ?D}<CnN#ajW1^2JwWBhi9<LfA7Rak-{
zKS1!m4QvAjk^eqop*(xjg%yFRSh`1P-`?KdC7@b6Z;qBHfqV^|JRPhMS*Y9yx5@-h
zR8+JW?dKdL6Y@t6DUfm-_&*c>XElFc$z%A(JJwaM(=%urmv}1v_Ykdz`FQnm9o^Dq
zE$N8Os~<8{B7Tx@`MdCugve)*nowcja%d!f@F&-Y`@^G0gGu{plpP}@!oeU&^iL{(
zd}TdgvAh)HXkZoG@zB^OWz)z7Q%Y65{Ut<4tBo*`h9uAGVB?N31jGf_fBJw0fU^+N
zNnYE|pTOt;|7$-O>ObEDl2vpFTmzrKy`q5r|1)NS45nEbJQc8y`>F*rS)a{s*TzYS
zWQ^B*YH4n6R)wO0?Qz8T6u@LyG=~YQf6N7MJ9>y9HQinYX+bQ5?B%+0ZRxL398vgl
zbj>X?O;SLAP5mGhEv3*P{;RJ{Ql^0>139x-0dDC*Pft%wFUb5A+wjNVE`QWw2Eq&S
zKRX22=pW<AY{!P&A4Smx;C+l6FBS`w0|B?ay)1y(>Qn2aTDP0`$G@Yq6CGG2uyAq~
z7fjPzuC~0{@0%nvl0ly*#2m*>z4_f^_42wqLOZ=`6(Nh;Lp70^J1{-&z0jW0c6Pc*
zm=hW#$WBf0bII}Yu2-`tL7kz34%r=cA}kCnM5t<XzC2W4GO}Tjr?d8O_&GY`k~idg
z*A!FIFST8tm31j2mm%Uvw_AX!+m%_1%rxL9He)iKct34;!Pe6wYuYHV;G1kKQa;nv
z)O-!jW!-pwAWs12Yg_lYUF6NrB<4PO@ZJs^L>VaeL|SJ{wQ1FJ0t(J3zai@$jHs`s
z8)IoAcYQY9I<=n5n|Klf2^Tixc?Ui+xyw{qF&*+Iy{O1zD{MTK>u|5Y^YWBYPrso3
z!^5|ehFHB;^?R&?hf8O;6s?D6Kj_=s>sruptr&!8rGme;r$}4b{mu@5O@$9Re+zwm
zf2hWNKNMUxvzttYM3($NlR9@??1Hw64tU@c#9!<$y$p!OdEIW3q$(uGLL$XWhSP$8
zhnRzgj5TQK4QxCYe|+R;@oAV9IxT#ND9Si*6QReLsj|bgnVJJ_uBVNkfOGc4tutxD
z9~}<MYO=h(sZz^tSbYL>y0Lyfk+2q7k^#L^GBPsH{ZpPKNt%F<Tc19D1YY@MU}y<u
zMui_RzD2Pj(lVGh!2__LTc3Dyn{)~!ia1_NIY6NVT2)#=p?#}{1P7Pr0Q>csu=|<)
z!tx)1S>nx`G?KFEGFwAqx?f}he2S6&tlzk`A9{XJ#dVO9dqtfXPLa2kAFnTzdw3r4
zVZ)KV-j}?ivWceA2e)g4MA)Bj5cN<mq?xC#%Ato`08lS{*7tyGOSN_a9d4V{vv<+k
zV<)U>8pjnDydE__9vQcRZ%+k;MHB2grAVb|upJ+4w(hZa!kkYN`Mkca`4oL!*~SFk
zdt^XE1oULpw);!n<&%6&Orgz3qvilw`#j#tl=S$G$vrv_@)!zmmK_5f<y#1q2<Nq@
zudfPdT2D_;D*`F+f#l26y$}kkmsO(3Qt1221~5)<cwcQh?!muIro<>HIJ|LH=e=oE
zErQpB%?RYqiw1ds^XC)T#`6@2Lw|zh?4=5z;%<`XJ)tHtkeewA9XEv!W)oo{ZsiBU
z<6_UAFjDn*5XxwXc+BE?9Xs}CMuBxh?`t+a^lnaE8*gAB+og^*-I^Dlj~fQ|g$X8M
z;gJn~*T|l`XO%z`2Vhn=UH4KfRl4MdgJ1|{l=Q;sf&mu;9qM%fZ^TAnH2G&6r-1c{
zi&OhyI9=<%!BC##doNDa9ly+R_N$!XtY0J&@%EF^?Nj{qVa1O#ij*)!jCdnD+lG<Q
z-czYpU_tr`=v6UU?ISMqis2ZT3wwR$YovpB&@eIO*S6v!&JFVQisd^sX@lAdLraUu
zUcA^b+O8#Dk*xKrs;_C1$&A3KC?eR(L7V5M+2YGS&HQ9##&T`Bg;|$~C8xO{XTA+X
zWl~VI-V3jmI6uTCwGazvr!$X7^hq+4DakP<slqs7ccW}N!mB{h>iO*1{yS9`FECo$
z)FdRKfLS2VLbC8yTRKDwn1{)|+FMMJx%F`q^IE|RlV5NW&vGwe%>b-px1H6pqgSq2
z#=I%&SC^MS6B$D=2%!E4yYIh^e?7Xu)6J0yp0#Zwrl#gvR$Bqx2xGuh2j>X|=L90L
zr~5=NHnYyw{&W|PI2|3SEnWIiJ1sqPRy)~Q^0&=DYrR4_2inn@#O=KO%NRvTV5w@-
zvp3;OGk<jb9FLEZOHcY-Qo8P0P|xp`Z%r|!t@CjSiC@;JAk>TmzTf>oo+wK3QAgtW
zHAeIpIP%|k`HKx&bU+L+X?$L+32!Gk%nlN`m7TnK|A2&u8#|*aSl`}F<5zMxdha(K
z9nic~<Ojx-<axmr$Jb5ceXgq_PKHu05<;3P;!S!)SdcMAZb`T@GvnHlyqpr+FXhl|
zOZ41YRN<yLu!!NZW|Z1)$fsw*B-pAXiot%ADuE+T`>hX0xMHRVo>|e+SxUTo$C!c0
zcyYRc%g@jB>zI+}@o~`NzqYHsGhymIv-B08&BNj`Hx^SkL_)YLdcE7-_Moz{OkrT6
z*quUcAoYurw~7cbA?l~g_UL`F&$%i%#+7uc_+_eX?qSu@bg%M$?|XCNS@9LBsDuO+
zz?2FyG9rJc=HNvmkR1%#y`>`FK0b8jR#tN|LPBJ~mjEpEemf1Thgl8EuK-cLAU7BK
zFDOG;s7IwS{Jabd`bUkYYgaXPKM0HzyvUR|>%;f(-KO@hJ`Q>Yfu1F3NooY`?Cuhp
zV>bi#Bk;!c!447pbpLM#{uDTbnS|kQ3|TySevAQ{iDC4jHyU3a1>PAWC0!73zx%H3
z()PF3$|)HR#Or3FfMLAVr5{kIKtY1BoWBe~DTX}@fb0>Y-nn*h7#eV761@AM_IZ%*
z(4twE)oiwv=gOgyA|9>F!IfQ4VyI31oSu;E_Ypf^p`pnbu=O{!=45g*uMya@tw~h$
zhAxrY1hxFI(u`$>xpp@KM<?_LQ}Uy(-y(snlXBVetFKEFeAewZD_g|!KexRqa|86(
z+D!R3u?(DLhYdaskr0JkUrh+2_j1ABdiqux{ozL6`**B3GJ|1YXuR<AUq=1Y7}@D!
zm{jOyu4{c<>nq_k+R4b>HVzb!M=<X$@~{J*s;;1w>W<OM!fO(qc@kkNcqOm2K$`0p
z(8TLTmStJ<?YLFUrF7d5J@m3#JB~o18E*>h#YTqyoaq^-L%GAvdu!GO8;SD-OEziv
zJ;y2Qy^r}EN-a@-H)KjSfbPU1Elme3yCPy@)a^kKM=0(YnrB5xiN9IF5SE3dCBIEO
z0_1Gt0BjBXEub@r2CO|jmwpmof~dz^k?2eCQDe5P@L2%y23U%e;lpk@oMrvhJQ2`W
z_nD1EMu?D*@CgVBZJ%~J{@TPNFKebJzf)!rMF`FB*-U3qMT{uOrz;%Wpn*f`7U!Df
z3mP!gLk`^}9HF5_-@tJHdqAvCudM3ILVo`R#f?0%Q9^cD2(vQdsXOOr0D)5R4<5WX
zs*!4iwj-^-A1dtq8U81BzG=GEe}(M<H)(OEZO6bv>1+Qekb8kiLU0^wvwIiPB1U3j
zKWoT*_PxwIe7ZXM5k{CTi}nt_-?6gea473nyPNp%g<Af%*LYIFc6?rFy_y&`4(#o5
zG2&@)SoLEc=A+Z+SKO$PkbA{B(I;i~TxSFr^AW5fVWb*%5zVgBLk(;k(QWRfu3G4D
zV-e#oOS@YkNp#@Y(~47!o!N4QaX#7&L$e}kZyk}r`WN^*qiE(|U3EPtppJf#yw};;
z9+C$erEhleIlga>2-P*IQ?wAwv!i`6s^)vB=nk%)?CW(`&@`^JXD8hEZaQBs4L>$f
zf?3Q=TLrJbS9<g2OF)wnn`F|~vE_=h{#P+6mybKF@dMO0&B0NMOmWfCznqd|LD;gA
zoE+>9J^jFFGPx|U^aC|@vMNg`aQ~bKJekgm-8Mpbte~qS<6EsQApXgL$$Ngh9RsB3
z#v!uvE`6t<2j3fQ@A&vu%9h!FNb8M-(j!CB?an=7)G;+2xttYsqr>>v_rtHij#uXV
zuK$iq{2QhF^Txr!^^h2IiauY}J*{GcH`!7WiyOiW_n62`&Zr+<gDgUftggf^+k367
zT@o}Y3s;8&Pgl0&4mYTjEi8If0`a$B_&)6{cv`Ucc$%YGDH!3ssFx{;4gTE~BT5La
zY>2F{Hz6U~BMJ>|UHGp3g0L<8%_}DEz?0Qrd>G(Ys_N;zc}FEEL=Fq5B@v|a*nA0v
z9|Fs6&MQ77Wg5-y?vX(CbwPf95g?V?@=)8lP2{o4uZrK@J1jlg+hs$MV%ru`!w7wG
z;3eIgm?0&wB4g4&+}In22q74Pe8obh<ul!@@OSN%H<nuyh9OP9hFJ9aufENCBlVdL
z@P)YCiT;e~4?1)DUFbmGbE{uo<I@V**Bi@11nYR;dq}nax;y^@j2#gm{?A$Tl!=I^
z6n*MPaRc3znUqu^uq?cZD7CsL>@e`#XdDgDZ)K+E+SvQE>ZdKFcak_yb6(zA^>RTI
z%8@v@6zG8PZoAda*GW+gkVXL}npiDh0#-34{oLNHZ0iCg(q6CNfHlZF%H_ZTM4S-4
zVnqP{)tK=BX8{#`GKV9W=aTDryfng^6K5W4ch1Ol{4*?AJ^S@Wi84bV&j#ULl~4aV
zGGr=Mtzwv*oOEvd=+K;GqB}NyZT9Ag9k(qT4I=p$ZFNnSUf1S0*j%1g`K=B+_;EWE
zw4x8*6gyQNSKo{5e3UBgCf2%Qy}L*#VxxG;&@A!z4$i0gZ`=z%$bX#It9c4pg&^Dd
zmMsV|38OzhD~!1VJE4e%C=-}7m`^`0nlM+($|zWBU#27;bvvvX!)nOTUBh8_X-5Zo
zdYHp!Wk`wnE<wCDw#JvcUQvwoi89qVs7$GHf+7!w#|E417s4gjiv1_j`ofSJ{<o|q
zM6dx#rr0NRO*Bw?{|2>QtuswIIY(1P*U=lbyOI{z@*J5LamtsZW|2yW;AuF)HR8`7
zA|h%(KN9pPL}Xl6G%#rT()e-fNI<}?V!Kok;htp`XrmOaPe5E_ZA<UuBz9$&H~e0h
zo(FA@#XLZsqR!#K%4*?IpX!NCr8>J4UglN)aD!$J<&+=|EV2H%+1JCkWvvtsqdKwN
z>Hv0);J;L#GH-%9*QY1BoSjPUfg(Fo>?s_q=q^WDVPS~3ny_3VRPjiuG2uVZue58Q
zw+cMElO1?$T4r8XF%e@0>~=~@N_0R1<QPbVm?V=UG8Z4aWm`~2tWoXexSig}QNj7{
zpnKMw42;`LAUxfBDRu7mhO<KgPbjIi$nvEFw_E(dW6-MI7pj=wcAcMZ8xv+}V1Nfj
z#tp|rhAukoZHvx*^ZuhM^teVxAr6}~;;UG8dCR7_aQ50U(;8`<>iHN;B)vo^%m$4}
zgs=YWQjeliPA4((DDdFtjTDJD!RqmR@SM)*N9g7CgGn}G9Ti16xsZ{GC19tLRF*;}
z?kjJ!dxiXp%++RR`E(-Z7$k{q|0W=mVRFR=S}a7aBx9s+-g6Kz6+ENShV11xG|~#O
zka<!n-YdWZBDPt#Rb9@vkdX+c1;4r~&%>@U%l(=xTMnzCZsAB3*Q9T0c)tF|G$5|d
zm#e+~@!j!HXspn6{X@CG@U1EQqW5GRaJ+a=`3Yfa(5RBLu(;dFMrw5IPi1<>^m$2t
zN(svI=5OSc4z)a#BHzG3CBWZxgh%nZc=Km&5sQOe0N$x-S=~}Wf>M$H<~_)#JLLO3
z_QCzhcja0;*`cL%CFzmqp1x1Rn@TB(7ZjAtTUq(HFW1t`yc|bCVfOMs>X+g!IJG?K
zMk`12JOh#xZ@|9U#d#%s1xDIXu-jRP8i3dqjnA<G!JtKRSctn;%xzMrS^=_%JeH&U
z&)9xA8F+n4_59@IJB8Jjl5IQXa~g6CJY2M+_O0Z63RHQ9n(K@Y<;<1T#MFV;x6ccK
z{H}g;Mn9g`irOf1{ALS+H|l6#5AXy{vITVcja-dL?T)q5TgLB;1TbuqK!6Q@BIQEA
zxGbPZap#Uw8bfe<*d1W5;CfEmVF+nZ84t|)!L3QtdjLz749v4KdI5!fQDJsusg#RJ
zgDJYpG01n{PbqZoWG={(MH?)7A{KKrVqmU4Sj0HEfee+WeJ&JI%NhWfgl8VjU+<7I
zzfP4_iEK0ropjD^O_tATMTq00C&`AEGzt9*GPWD)*<y=zs7y&pAcr%;Q0c}<boy~N
zxT?ZcY%m^8<M4f_PZ?wN5kvU0qBw)J;*rgta>|B<{%Eh-CKw581T#9HRt(mCnR$ts
z@H#>8bp;8|uY)%0O&70Cp<fuI$JB<u)}JQC&b@zgoi>GJ?3mx-3U7)LRO`=brzyTa
z!ueqQOXpiBuZE95gMo2gdHW@x|Gr{kWP~}sLGUY9VtAGSVhbzR`;rJ9j(7Eq8!5JK
zv&~e%d^1e1I83cj-p-C09F7gdvv?zjp1tks7Izj#y%IoJQ=(hX)?xk=TpRvDSox9F
z?xeyhsbv|F*_rh(V4{V%Ec+VVxeB@OpRZ5%3hbM6t{<=mw6@Z5h#UX8d@+vX12w<b
z7g2|W=e=Z-QC;ogv5)wO4z00)#^z$>ptPc*Ydk{1bV5+sz>(}oFvwkBy4Dn`K|iam
zq5@+IYWE~I4+?;0eD^fXuNw1EW2lMm&_kL)^;j@b;z5&`vXd+*rGVwEN*Wm>D$usD
zb7Y>rJ&-6oCA`(O<RN)G*k6|hx@H5YT#Aj!`<Y3wWrtC@LG1zCPmM6+;$>BEfuR<j
z(ch(Q-!Z)y@;+uWp4?HQwHhQ6&h!bYH6#m?C=b(Pm9=fh8@0Jv9)Nw5I=aC;f?VSO
zAAg@&Ano4q%Aa~mn7MBwdTan?x&r1uJ9&$&#;+nqyeafck9Tu5*kYt^R%$G-Z+-#y
zF59~s1N7}(!5ZZ*uJeuwRkh;VyG^rar|NY>c3t`PYh;hqg1%JbRm2}O)C%{qUL<wf
zgBm)!&l$@5^l6o|Q18qQK%~2j3gIBz+zc3(k%AOTV6KS&UhQ>wI0l%H#a%r;E|q%4
zm+2qZ{Xh3YKUvUi<+m*4ZwM!ekTzr};%yi89Z26#$cKzBj&|fQ=ZgAkVat=_D2W03
zLBB=<?O+k~-7QPUlLpQlU6T9d6b5reJ27@{Z=uJ819RgSe0X*lxJMHEcN=1_B+@VO
zzsK7!F(@NA)0t>9w@fo|Q6saM^p%D70#w9U$XDp+RY8vJIYHCG80-Ncim7m=&*Rra
z#=$AEM*5=40=dTw{7-RgZEefGs(`iaVIaxgbF^RXXuSQ9CQ^%p!4l&`w;Krz6RfhX
za<<dF3CkW$%lCr|DuyujMZc!B*>CWs1UIiIU+mV2y=}`Y2apc`PF!&7XD>Omk|`&8
zN4}-t$?w&b%eGUKgT!O2ePm}K=r;jiF2JrpnIrlO3u5|@vv-y(!_R}0lU-AD^NYX#
z7JoDWy3V^%=UV)ck&!x({t;LR)Sj%s2Ab25>wQM8**1?nmJ1BUf-Vq=Gyc2vx5ySQ
zt^1Vj;`Q;QF6V0ksoA095-#+ggTILU#tExsYI!xlOFs_OKL5$v%RU?s198<Lz2@qL
z=~=~{(!=SMvF*uN*=ye*-5X4dQd-n5&A8_62;Vdmi?+buRAPHe%r+parWUQqeK&U7
z&Eik7DcLx4dhAqK+Mbh(f$jDx&-Td3n#66gkNe479YLU@Q22)ykFyLKY8RKBuVYP)
zTUUn@<}?QQwO-55&KS+z0?*e!VcH9rZaLAHPwN;PJMB!@)ZaWFDxiKF3=(!&7!lyq
zCMwzWro{zlE7OSd)Q4*<%8hQQiHPR)4GooAuFp4x!Oign=!CAhv9WQbQK`$V7*gw#
z{<8-*nD}T*bv9Wmi`vmaR~Y&pt;r7^rRd^5hXnT085{UfWwcJcy1j5RJPXq7i~cA*
z6WILsxQF22pPuWvJ7G8;mF>}^#+)S&JxFY_+M`ER4lE<mr9^Fa#GV=5Tt&uuP8|Lq
z9)c>|Z0pN<W*M>V0xY`cvZ-!dRcT~(RBBe&yu1cmG+~gEt|DltpV`Te1JD2%9^QML
zj-ffs5N2{ArB*u9NFx7SNK@2VDE&%4FOdWb(GO)lNe|chL<;6sl~L(-#qfGR&C9wz
zQP|%FN@CAK10|o`=}?zD!g~kKkFU2J3%TJhB?^LXu8q1I%eU~U1i~6kM^#5()}VE^
z&AB_=um3~{M?*7B3O4_y7f*KERG6cC3t9?<T-112St6dUiWtkwkYsL-P(P^*A>9ho
ze;Nt@Ai3Wx@W*I>DduO1BCupnKAs3!S%MY=90`6lm;ei^r@9;<Y8yu$u76zg+s(lw
zd<20$#Nz$mpZ<Lqcol(u)cfBi#VL2`GH{KcasQxz=QQ49FJN0U)L&avRJ39k_ffBk
zdU7#Zra)@ZAtwB&dyIaLj&|mezrX(hKUibl;U7bS>&UZ<iAK%qv*qolRX<E2Peo%9
zO#Y^m2WnN6?9BYNG`YoglM0snh_~<Fu{cDAcSDYx?59`X0nd`T&TVQ`BNW{CB#`a8
zaziyzQG6^G{HRUfo{&(D<$xyJ+oa-Q`=8y(8O=_<JK}QBzATgPE@w4qnQS5c+A_Pg
zuHU+P$;<1++>}Q_E=A>~ant9+Mu>29E?L;BcJ|wNZ2FkNpuEhTHej?=+qeVTntGrc
zqmqFQ@lT-v&0pU{eQ}>HWh#^IVw}i0NjVSA;%8#A*co86U~g~F(Ywvlf7j_r`Nw|`
zj@O29Ay4(fP@{>W`(-7t+_?*+x;sK)AM>!Gv!SdOKp={;>(!e;pBHKTCmVtYZf>~%
z%O^RNEjOXP^-`37>uRO$a&l4aC&a|*zyuy@eVtyJvqpqHficu=N{(z8EUmBsc?&5v
zHdP-n%sdSBE&tV0US7*y-pf197A>+a-a1LjojX>+(GyL(P68sHnFdTrCU@Y#*NaIr
z>9r9Z@qM`8<@;OsnfxYWV|a@g%3L8#o$Tx<W{~|bBZ3uxkLvOQe<zEuFfc1AgODr6
z`aevk7|ZTRN-S!u`+CZ0ukGP-U3<Ylsqa{KMSE}i6l6UxkNoxuBa}_nChuCxbGOCj
zLEo1We6P>u^1!05^Q#o_io=EaD%rYo@*&)lR~l^036fuM1x(8nlw>Vj6%~Nz8h2t;
zrmOpR_qBy7_5BsVWC89<g3r8;D!aQ`t(o8!`LM7=)y~%~(G)lQ^c_tEuVW%GBh7Hr
z*BHp6i0|IXyqNloYm$@(GKK`rK)2A@5HZ~v*wlHW-{sq0^tx^SAD&@Mc&5;kH+|dh
zfl<px&5V`L$38VJB5ZF|1BTDDf%D*(s4&-B!PED~k2pcQh!EnVI@c6afMtdT>2pBi
z94S4)i^XliXMzr0Ou4V2TUHx@U?C(5B}?fpf|lEP^HEwfB03sJ34oKEs>pwjPLfqq
zoz-4H(a5(@*a8MBMhV?LJ$6dhpo(;S7!0IAKY#v2=E+*Wq6_q2P<9Xw$`mEFEPBdu
zW=jnJglVfS@m2=u*p7(=y49~7PE2Uw%kjrsJjDFNbStXCSLa9I$7Q$b^Tv;Q9->-E
zb@YAbHa%A>NGoL7e0IbahysS4lTBZWR7<q|*nsilU9q#Tf=aIF?7f`4Jdq3WUgu3K
z>LRB#=3gLlo{MXk(I<4)d<aWUc5#&60c(4bzGsD}qltUYP*PyfU#O?PI^%EKEX%^~
zOjF7@6CBveb@z|?GVaidh1CG^W;Y-OSAjD-0S_E_mfbP6v@8ccjKI*i-g5Q!Mg5q=
z)L~`{JQa7I1z8DGMDrs<&EX?Z+cKOv`kz1J*DI-T84mELQK@SN&B{Xv3=F-HkdQum
z4@$NEU%#CHwf$QK%zuG^(AXl?hYxi>eEit%S8#W+&kMvX^@dw(dLMT=Y&Yl<L#~rG
z-S_^XJ(jx$2Vw_@gOlGbMRWTY)7e*)Qs;;Ab-cVBGkPWL!2|v0j1W8Hsu#$DNTen}
z1Hu!}_}_yFtTn{t#l!itBUxkP`Iqn4_w&`_eOsv*f3P|q01{sYYY=4eK$OnKhd#v0
z+IPCyzo+Dc5OU3jEZR@~39TG|4?A@oH_VQ4-?+5K%ddP34`40oEEQ*@1pK11wz*ta
zRQ-hAor0zWdAmR<#r}Sxs2y*)!p_d|^tWD%6HY6~Yuk5`d88c$L48-k&;IP`W;S;n
zW_eY4%t=cgoAm5Ie9NY5p#&*huU#?vv|fLiVPcSw$ao1nAhEEqzoiSie761;O27`s
zi<;9trZo3aB>e!f!A-QWiVHY?5u(r`<K<@!<iYMl@kcYEmuV;9j+-mNcGT&R09tn3
zx&xl+y`v*HR-)7|;8`|$u~V*zvGm)fKV7(V`$GmSByIm3_@MzNET>Dg*!%kM#`OZ(
zX$qKbWdXqr+I7JR`NL5ru`4(H8nd0KejxchFm-Km238+;_D0QejkV`TefULQ7I#hW
z_NI6>9z@v*8q#PTa}PX%o$z5#pI?(^7)d5DqFoK%zqT~m{<d;$FJXY1ZVF$z4}PQL
z-yBWF;WMdU<ZndLz2!f5?^_h8B8A@>zq5Px+rHlSI5htEUsUTASmYJtZJDl%ico|Z
z!QZ_GdbbzuJq<^SF|skS?S|UMX+E-Za44J^15Sj{7C8)<QQCv!4i>@an3IkUk+>cU
zYUsO1`-Ri&)U$H5^vJ=ed=6vC2I_~c0go(a$e?@qnRL07%5<HgY-?-lZy>WYQh=$%
z-_;dzJ8pjwk8J2hCQGV#!3%j%ekUvKSFSC=(D>EHGnVEXSdH!?1AN}6o-#mf2ZCyJ
zadRJRqLpmUJ$Oqt#Sz0gopvm9&u>MXx8FSUJZA*Nz+3D@Vj+3{T7wzyFPzB-Q~AX;
zFa4cX^qD#oCFsa|O4A(BRX6qOvHNISLB3hC5tfNLZDK}dOlmJ>?=&9E>c-qE+v>A;
z_@83ug~i|KW`<~yNbB!ElWz4p8wG^YiGyL*{cpYIXF6%{y}buFYCL^6@Zx0chL4O4
z4QowkQQq>_-1|<}1z5m*h7I_x0&19j%syC^n53j=!5+WO2A_;RjRWryO!;bIoIUQt
z#Vg^#h--GVdW1C}@-DPFSfl@`a0ek0{`-amj!Gp;m0F#6>HcI?2+h$iB#r22FTQm?
z8kq1nj`g`M;*V6?CrxA)ud1tr?Y12gzf0E(v%xL-2zUj@WX-QJ=O?K0C2l&76L6rs
z#Dm(YFF5U#pRCSg@CY&C6l6@j+f){Q9N4EPB-P8?cVJ+ZM4b{}5ef4muwNxxAF1Rl
zT71Lr%@DdP>gAK)_@#^S<W+GV++`qw)niWgr0Bs#G8@51!0Q5@V)iR5$)ONrD`3Yk
zYZU7?rIv0C=Oe{vX=%|sZWGc}P(ceDZJ$sIWzX?f+aJyF$Oqi3=Y%pcAtkK@;&37}
z%=E8xL)3t$e*~Jii2%<5W(FT$dkR_5q8tomfiaWm)k|UqYz+6H$#du-pOK7J*t?t0
zr2ly!!4~}+++(ht>4xEr10)jC$Pza^XVAo}>Aa|8#{o0&06)8O2hu`I<xS~naCP|g
zwv82L{ci1t8B;EKjyX;m8!KyCES%4NcXN{)kRS~C?7o1lhdc#lwolNYb?s8>fQ<F^
zcp|_+@$QnFN(<avQy=2|4wu}CX2@Wg%k}EQuD<a|fW#;WKXQ`2`ryqy2H$1!Fv~cY
z`<UI+Lz0-~_(*7c<7(B_l)xqd=Ba>HvE8G{qvUz`*IV(<to6jsSo%$lu=;H17Hobs
z$4-;ZY5nXo`G)WJFA6GUM5_HQDwmMii|gL7Z{XHy1kKHK(mISdP)-Dpy^G_LEe<s*
z|MumNfesvtdSg>|Sp2a!qMwQVQuhQi^ZBSTjm+`5U7xqt+8|^5p=fw18elz{TCD=G
zzv$f!vMi_-D=*OO=K8G1`NJhUo@=-NWX%%;aLcIxu@UeA%>o|*8Zj^yQwm55ek-a~
zyFA{;xD^TKOU1id+EvbOr{#bqabi~qAz%=d?C9XYnL5};^^~Cnz-^)2*i(}a#r>&r
z^G-aXPpR@cmS1Y8Ooyy&nb*Izny0A40a(Vv6(&UA4Uy;=4?I&5nHwk|VO5GLANZ-7
z*CPQ7*p?~JY!&G))72PPVu(Ey0j-7{H<{O+3DU6*^p_L~Ehm~y8gveb$NF^8uSZXv
zwTtHT$QT;Bt3}y@6?W&SF9WZtE@XMTj;V3SwA^!_z+pq7A32ERbD5FJY=h3VI!0r5
zKdNYnHos@G7gAT^sG9Q;=wGTQy@+kW_hLeFpV3UJtE)2uLa`#?i0xuuydeR_Y%a6k
zbv!xzV{>poKBPII$byW3nvW?`FEJr`s1ef)q8vEaR#S7P^A#n-4By@UH}AIoleQLb
zF!RKN`=4NHl`U-$VsGt2U-k=mNO~<bs1cF-$MXMnh5dJ}I9yXC{!IG^2kb+ii7i|^
zzk#&X5y&|w;jYEOfFXUUm1T0t#^l6_)=-1X%u4n}rFlRlHNQ%KxPs8MF<I(4{sj~C
z@n_DzOPEO(5l510k(c=ZJ6G58Dhs|po^T1Z4qP@zFDzV3Mb@QuZD}iBVTAqZx+i}=
zbN<10#q=8r$kPgATpsbfE&N~^CX&>a*TSlvoCxf7QNzQefFkp4f4OI9sQo&g2o4HR
z^L$7kt&9e0`$*%!fh2=igNfNK$CA5t)#)HF;t+sYtH-^T2Q8Y=QYi(dH7rga{FdOw
z<zTRX@@&MZk4h^eG=guq6Z?<@77zAs&M4{n$Fam7<h@m#<{fjX@0$A)Kyv^+hGC^o
z8d*C9OsCTdmu%&vO`YEhaDV0$+@>mw6a=%C4w`m#O9)`0Ri}GlpCWgfGj+oAVlR9>
zWCADZt15;)LDz=?MMN+D3rVTX_429fCj7>UNkP&8&AZc`Ew~2Mcd!_VV!jvYiOm1p
zm9e|3qhX+B@K*i%`L?96>A<*W_FW1SB}EK1{hS+|1vI2oNoeh--F3J;DtUJ@LjtwO
zj|^&Q!$EOF@nF-V^-C=cxK&}^Rt?Lr&#72N<@-=-G*&9JKe%DX`Q^zl0b51h6z2Q)
z6L@)egjoch0ACQNT}N<IK+65iiRu{@X{+>z$S5ywc8boIhI>++FUx38KG|70NP0z6
za1gXDx!PCBn9|b;@bj4=fvj51?V-^m$mI-x-#p=n-lR5AON~3u@V_O<R@}Z=fF9iS
zL@X-DDG;8}L7ICJ8w3PdVqqCdqWqlC-~5@FXqcJm&_Rerm!+u!BywS3_8yX8%}xMj
zAByRest(!fK{a;(w5#!^WkJhTS?9B<;XFrW8&5J!q;GF*WqCO&J)D4YKL?~>c5?n2
zs!4m(KD7GSJ$7QKVdp_R6;hQqrOllP9`Nf?#!zLTE?AY>mzI}rZNJfFe;+!D{u9)N
z%r|?fyS1~}T%O)F{_FESQT9LF^GvNvic|HWsY8B;?gpH%2QcOExDV9S)J$V7Z3M7y
zgq+a4{DQ~t(=|j`c*Nv19iZ$N0vgb?vmsKsplTE2nULwtgyV%Tw5NWlp$LoZF~Nmg
zvc=4`XGXP>+?dD%qJ9l2{ul=gKW1<%nL5sK@bGHZ>(a4)Ezl~fP+o|@d?D}iuuC#@
z6#D4c$(JVy+~EK9HhxJ*p->fIFYc$!<J~^`UOwUTClP7*OncEMp|P=XWguNVW4)PQ
z+_grbALOT{Nj6-cb<ZYt2obOaV;^?l6E<UgHcJ8lx6RIf|HphJ+B5tg;qgD{!!6PA
c9|h_LZFuKg)yKrL1Oguqm9!Kq<gG*h55yCl>;M1&

literal 69070
zcmagGWmFt(&@I}7ySux)1eX8-f?IG6!QCAuSa1mr!9uX$!IIz-+}+*XT~5E>J>U6z
zVS0vXX3b*ysi$i1UAu@>Q;|bQAwdBE0R6qZj0OO}fImV2Bn0r`U&4qL_<-<HQBDSU
z{qH-kr8o&ZgX}D?=LP_%xc?mxAoCj$coNb5z4AN6IaquwSemnX-97-I0^ZBK)$(3A
z3h*)1`tbVtxHLcSrDZ7jFW{fpR30Mxb7m2YWrNst_ooG08|_iemy5(DeSY#>h1w~c
zsX9X(cQt8O9X3L|cW`eT%q-KNN5tABEW^XG)8Y9leA?0p-A<S8hyL7tyYvZ4txbTy
zBB*(<hY=e8cNfIUwIa9nzfUN?iKd_fR4Yi(|L?cP-n78~yzIZbS>UV_m9zPO?hyXp
z3(nJk)fdy9p^R?Lw`JNDe=XQP>*VMd^X7q19wrCUl9Hrxad09U#ZQcUidA!OexIWg
zaRDn2X9JI{gKmq!orp9`${TMePe#nr@U~%#FFz7>w}D&E^!e5PWMW2!UeLF1-=5OE
zQ=2?<?X|IEC<$-V9C^R4Iba<&(ICi9nF*k{pDxuqoI6f)8$T)20$$&1P8RA}%^q)#
zT^G-PyidaEji=0Y6A(pHVE=pRxc#A2OCdTc3IN8(#{p+mCTzLQ0b5i4{fs6SugM~1
z4pLi<(qzY#=07jqiwzD$yp~GOE|!)I&$Thow;>4XfS}6;oK5Uu!z-0t50Fs*`{nyb
zVE}MExHk1b80^=_2dL=j;orZ1ubk?nJV8QYKyWy7%J`DAC)Fa4_0*}i*XR@?#Z8O?
zxO^@2mUD$6@0KiV#X8;7SbkVOIywrCi9!4G{3kg%x%<bDAK#ivo$6CDeiNSDdakuJ
z8q)*@OMb*cEzQ^No!Zx0`jT6DXD}4!W(ypFpSa_utx(26lMeL_XQ;^+$tfe9jpZq?
zt;I&CFS8_`7#T{k-wO(C)YY-0qN1v;Msu2GlB%ccl^AGwGL)!N6qFTH*@O@Px7`u)
zi6t*a)f~gu9E)MDOf)W%7%mca&QuF-uM@+@fsd*$v1UW*+(AFF*P_mOt;eW}d3xfb
zX>$^q2a!-DUs6t~-uk5{Mn`d~Y$%!W7x`Du6jt@7{`)JxN6_atn9cIB|IQ1GXJ0S5
z6$fz-?|N7DV5R*%Fa{~0XPzVUhj|MiFeCg~3M5ZVOr##|>-)`ml~NH?kq>(k_UPbH
zZt^Eelmfpii244#vCJq_xGGJAcIj4k1RwA5Le{lFWu}q8r@+$K`mtexKrgz_pi>#7
zI^fasekZ6cZ0eS<9}EUn{fTz_ZcO0Af-MzZdfTa3NhK3iz{v^CuOi{@Tq9XO+O_;I
z6jI=o0x#I<Un|Bm1G32OZW)%OexeK|0{RpM#WXfO*Uk?@Y=fQFeABpXV)v91fn*_w
zn4V>ZrKLgM(8*#|Ic;riSlB%Ng(${r=Z$XUui#GTjU)FPwDP+>`B$Wzbr7FL+UOj8
zz7n+$ElI~<`oL6keP4=1f6nx@dblV0hxgYKRS@aK!~_#iu2)<1&*6=&8%N#jff`G!
z&CTE14STjdKiqw*RY&!J288{FqL`ToxTTXv2llO<od@7ICNy_>Umv(XKR@TM92j>I
z?$NctipdhxD~G;k!#cZXX-UUM@gU=DPvcimVhFrP4@qa7I2=Z()ncKKjU}#;b8t8g
zayUgrLHX$)5I`I&+cj^(>%KP@Z^%wtIK^CpE45R1m2r{n^Sb=kL%Q4q(8qzVW_)FF
z;GcLsH-5HyU3!7Rf+!h(J<z7Li^?;I{!wMph5_u2<x7X$HmrKgP&ryfjIJPYW$2b0
zw>&iXKu!kSse&F)R}=a_b!e1ot@GSxDRGgYa}mXI2_;BuFGY_P78PyWoo`<E4yJL+
zxw^Xkw=*rHW64EAivJyt=G=h^ChjvVqAy)>{RD(wCn|sbhVoAA5*gg0R6JV2tc#Vp
zeG*LVUtzG$48Km3fHAN<V$^f(MJSb4Q+bc{Sq7%XIKHz}N^6hvJL&h#<~JfDBKdzB
zIFtG#Dsn$rSuy^`rD%+gntv#J7V;whTokcLZZtOcY-wSkE`{{<>sNWjli6^q+<?@;
z`|ULLpO;HZOOim+?eXF*W!xs3Ctcs}xpyn@f=@}=Hkk1(m=)eXQjLuONv0Jo7fvmw
z@5|=-9hq4>c5B9kHv)y+6-kcXAuAr1aT<p2c{dWqzmdTbH6|_nid1+2T#lCO8H4N4
zHtX^4ItB|Xy)nd>&Bp=S+A{|;d(ttyr$Os=pY~W;&wWoRsz;Zbj>2>`k#4pmY$krl
zfT@5%IWzgU=frMm-^bf(gxRLxKdh)+UKS8bc9Hnvl~;7lom|IrSY~Esmwv9_np-AX
zT2pk~a&mHApZGq`jpehykQ=1?U+xSi3~pan?Vwc@^>J}?k0(AIqFd<T;SOf9=d^X;
zJb2Ls)y|{Es%*}PEzlsusfP>=DSfiEe8YvX^mp}J_=8$b(&h}WUEI@u3rDY*I+fH0
z<#bjYxpQ&p&J4D>+Kyu*k5U)#A+qi{Wcs6lCj4iYaz&x%aIFy?F*x|7M6RTiC6vRQ
zoT*UI?}kk_o&r5mW&(N_5)zU>xt}+=ucogb)$7i=9=)cMnQSxoS>V>+K38aG(1`wI
z##P&X)q^g`3PZ!~HY+9N9WO60m~lQI9oa8TJO<p%TQTR3_STMyAG+lB4G-hPdUJ?~
zJXYMU2E8It(=FV<jEVE{O<BFZJeRq;xycDI_9_Wc#3RYbrXmob6(RBV)(f~9#$+VK
zt({9DQ@^EZ2I6Q!N&Zl!jBJr&w_l{^+om1JmrehQGk#sh=)pfVF)$8yf!$nUu+GA+
zF};)mN*IF-@XVg>&V}C4=E-=#y10F5viM}}ZVBF!Kai^Fm-b#~`Nl_#&ggwhe9a9j
ziUEKzQuMLIYl^{!#0GXb3JMCx)8Wn!78`rW0{9B<@Aiq65u$gUxH_$E<zE<*kV#?@
zY*QXoD{!MblFcX+YM;$6chKTv0l$kzY>6%|tmuDd*OxZx8D7WY@3VY`9#3-aPpR?F
zO_Pk_fV*v@o{Uc0=#JDY8YL@2;KQ_I3L`sv?7{>jr=9Qv0QESW`L6`){&i=LqYy(0
z>3~K>p=9Z32L)(p;kg6ezaNV0(ux*Z3It9|-;V3*w;TD~Bv!}7#1Jgk#y&yXHEF2?
z1R7&go+evg9uD13n=eObNd+8b8XcDbAY0fYSfdn=UAKCz`{ntuZFqP%)=>)!(yk5@
zho3cUACbY|D3GCS<b!6zxWx-o11;WsM6wHb_F>6M|Mih#G;NdwwlYVQ-k0Xdym*^~
ziK%45n$OVO>;-%?6F!pIikZ}h+tXFsUw6aUx33d9&ms1Tm7CWqV%7GKo{haQbIn1d
z`vPYgJ@KRStpOqcRh<)QBZ^5euXKe){zSFfOijs$T1N?JkL=5$-~G*LmEoV@g@px?
zB0lXZ<Ji4D>p6ty`Q3*?4Q3+{@LUOJ_aZ>GSPJcCE8o4hVTKc>pjoW5k$ic*>y=2z
z%slw&`nCTP9XEH)XY4hierJ#J;BnK?aZ_mjC%D1P!~RuMF3Ga#@0FDpw)Kw)&;XQn
z1XZ!uVd5+Zik4nvxIPIsQXv5?6)kKjGqYncELpz^6_z9&&RaGDX*L2s_f_-<4_s!5
z6>|l1StC>>rehe}1?inAou&k=fi^N6Jk+EGSt7t6X6<~5MNv@`LXz{Y_(ySZ!LMI9
zAjXpdcfk3}<0&l%2ZnI=$hdTE#*|m`oe{mY>Lf&&7$>I>#6qQvfvOL(=36GJZ~Vn|
zQ#}O8*K%`nU-ySHcrkB|7X<)d#qU%M4-XFj!Z9i1DhwJwZuKR$#*5wPnyIL$yovAi
zJJNoK85$bytW$~iOXwn?smU{TIC38^Aa0klbPYQ{92>bVW=_sw>oO*ffr9bPeVJm}
zbKHr97$2LUYni6`6vu9x!(u}*gKExGJ^N9WMk!Ig+T2FNl)hO|F*cBuCh=R5?J6Z@
zELm6Hxo%p-T>!;-yK%6w&++K@gZ&?aFem2wMO=wOJaS=o>$8mhPd|gEXJ(`d#`B7b
zcH)>Z7e!yi{BHOn;O6?;Oxgm+4n3};;ugw@3GpWfMs+$r@#F_+;VD_V6>Ocx(bSMY
z8olWoN~4G0@i=k=F-5)?5}sE?b;9IRw*1Ko^tN_(q~4w<ov8?Ce5aVe^oQw^%1WsZ
z9_T-RmZ=*V#U8Lk%PkaGsZQyxHXT00wzq$VeLZ^!2w30U#SD@NDw#g$POU56(SR9g
zHTcbk9$cCWZriop0EEd@!q0iYkvBE*tf%3>F2xzxCz0mzh!+w%bsTFxlD%tR>w5jI
z?d|mtOmXWgS4v6)xb0tyTgRn34zK>?xn7#R?A$ygim1P78JU?QL4ZmnBt&f96LT)e
zbH1Hsf|Ke{lBAa!)?^OZ*xckS{PE*z^|#CBp7a-tdq#SC^7_QKY4tF9y6>}<Mz}{S
zElqyT&Sy1ucXypVpP21Z4DFQ!uFuxHl18&1pCKu-%i+Hm2+)+uKXVhIA!MU$vy9~F
zq!FamN*piM3$pPwcUn&gd#sXPzTl(4QvxtBFeeLjz-01m+x@DOUir?&FNEAbA_S%r
zKi)^O=03tfE!tPXVB5aYL~V3h<)FMArUjr$ih=+B;|Qly!;4;E1^?>nv?}}HnSxrc
zkKSVJR4j91NSqtA!gJHr{Y%j6giIw{H1g&7LAq*Ix_DB$YI1$isrB=*u#WJ<#rEKM
znH6Wc5`*DicjWT^h>5Qg+5trk=7*W^5pi*z@43PBTWzU0_u7|el0R;vR;>NDR7*<T
z05$A;(Yx?;cAPOB%-yw)5Vf*twXzR0uePCK;os#(bACI&h+>e5?lmZ7-Hz^}u5E6@
zN=QiDJ>GYWjw13$Wy%0TjUrR4cq4e)UGAQcpNXhEfyDApL2BUA<EHte*FYg~{)2<C
z-kB&&*=IshZ<L|hW$)zWk?>I9!5appc+9U~zaF?;p05iFy{UDBxpD_~MAu~eH0mko
zto)oFhde77SN@dkLv;FAHAmZO9+edoXuwscX8&U%N865j(MZk4#`c;hN8!UJCf4$p
z!E3cakAv*A(H$v6hx2(;kSFlz?kUYA@Q+EZc!1~Ap~<W7fc+aC0o==-K#8Dz-Q3n^
z3UCALC6kK;8M;61jlbDN;fUZ&A((KIxHtaV>TgqZlr56xbv$v+*e1Uk0zz8L-?|q+
ze$bJLc-prgOqUUYq1*9z+V;90M=ny7mYTYvw_$CALUm<}ZCjon<QId1*~??-ynI+4
ze#iMu@Jrr_84<Ytb1&VPt_E|fvM+B=SF`mH3?>b%=)|evc1Lr+RMZHE>%qf7;9wvu
ztgPJNM-VZ7-=O|lrc>1eV%U5EqP)q&yhaSiiG6k(C_byU;0FefIdbUzg0rk8W>onW
z3UxwW?CI&*uvN!aP*kk3ne<8*e^x(QY>Z!!gUQsC1bG({G)1A%(3~PcL=)d3C&<{C
zg3n{Y7gniI`)#3yRN>D{K|IIHmkL&h?<XXsT=A9;7bSN-->W*bs3tHfD)nh8;%5H@
zW8cO?<(YzIXg=$*h0D`P`S|=9+&X2OI^8FMXo~AbR{#_WuM%T1vu`!hHbG7%FVDr1
zR>HQ@mc<P8YC#t#VLgPQI(t|vjaV)HpE?Om{6CKuyb=*MobEH_NkyMD;Spi2lrqET
zY$iOW!d@SkoOo9-hAtbftZ0s|YD#Z-u2xMWS)a2(_xARbY31V3B(igJe@^Z{^lv}X
z)6_(aVj(=<p5C5Lm(4za%=T4FTU+>grdTy=;JNOx820%Q^PAl#bW9_T-*pkJET151
z+(eqImCL*|G@V}Ocb!hJk0T#98xLpn-Tal!K>|TZPfrg4z*R}i&L%&b)-hp+ftvTm
zp&u_d-RAgp0@XgduXmp2m&W0wnlKJCPD@McNXLssIakNhuZ(F=2dUc&`feHy7Kih-
zj3YT>i%?xK<Dx>`ZH`28DqEH&T!nL9Z?c^7XAjM|NKE-iYCiSj2+{_T3XY)FbYlu<
zQ|yjr!<tY*`>jLct1#a<EWlC3TV;u?9<_k0|0!OJg@54FFC+sY@)?LTYn>2Cn?XwU
zUw!r<L7!qtNqPF9RyI|lIs4YU_{_-16XcCWAT6!BeId<4*gK$+L`Ft#oC=G*Qq30r
za5~)NI~sz3{=MN{;FJFoRcb`Ob{X!m>zpI=%3?iH!Z1?$w-@|90;(e$Vprq$J$?U3
zfzLqeM(VZ@IXVPL*cC>7vm&!9CeHM#j{2`tVkA?EA%=t>1;D~*>)`x_q5II`;UB0m
zTh8YfPg#u?TFdO&`_|<|CAyZfZBk>jjXQfSvV75}?M7D8uC8sR#V_cmcBvO8F`svd
zej$q4a5*&(&o3SpmY;@&8rh}g<?edSN<;#mVXODYItqNwY2{w166Il#ndFclz3PQ3
z1qmiYoZ3N6junc&D>p;Hprmc@XJ1PHvyPw>WLVSx;4Zt~S#L^@EiasX_iAS7%GY1l
z$BTp@bC$NS2#Bag1+;VwXcSaM&%1N=_2Nb&G!!U<HeAYeYbG*zt+0uR<PD!&(QzW@
z7)CdgZR&1TA#3inkvX8a@rN!&f%Ov)@o1oAo`-(kVARN)TQPC**6G}3Fzb@v!j!x&
zE#m_gJjDI|{rOpM9BixA;*}d1kA<kIKd0;BD%on5t@yd+2YKBhq+fLCw>z%qKCV8P
z8-6WH8Cax(8Ef*{tmSLPD+D%D5zN;k9gz^#^h(}>wGIO0a-j8uNOxjintoPnJ08($
z1Z5r{w?PV#Nr8&|OMR9@l_e*;k9QI4X@KEh`j6x!2Z_z<1z!mA$JO)I_ZBMRMZ&ep
zR;=vUE;bV(&P~Yn;JYF(rY!~dLFR-f5~!uC?PfVzQm%vm@kZK<F@@OBzE8h=M_Yw1
z+OpF{yeb1k>y6D8i?IK09xsjT+Hs07G8X?Ed|{xYO9%}OB}f~bUwEnbocaT9XE^H%
zt4?K|zMi4p%B;~hf9cOj)o5ts*)$!aa(}5OdNJE5+agamzP8ogcr|i-StPMTUQ)dE
zBNTu2tYCAx&t`cfUqwIjd`F}|i9{q3*nCG}2i;PAaacs*FCPZZSmK)y*_DyqPnI&k
z<IjhySdmA-J1T@&m~4pY>_(5X*?C6>gNO_2OBwQiHOQxyc5lkh|0_tM1OHcoJnOUr
z{-2C#4BP&{(&U|DUI!Z#tU<n_JoPm`8^%6fxy^NTeDPc8WP)b|KE*287r*^u`<rwQ
zx|XeeTMlQ6Xtd5$#*65+jTA-xeSFe4$kA!@-sY#N5(D4?YUn~!g});yVElAlV>wK6
zDt(tl&BPS(*}|8>q*Ti_S>tk9OMJ2Qa(;fkj-MdYrXuC0`FFrvjk#QBcO<Uc$@yY+
zMF73aEbyBZ6jPtBC7B(nr)!F_p&!b$g<33+=4z1j^z_iR2}nVyaRc07Vh4K}85ywy
ziYh9ttXs>&RG|qfiHS@soW=F^^$pL&OZp$jR&+&MJ>DTxr_(QHw;2gnt_mbe)my5*
zl>2Cg<8UQcsU7aGm2&=Vp||q%^bB_B*E<Y~Pt5}9u0fO2zN|=Wz^rCQ1$9-S0fHY6
z`ycYHHZXkd!9VxZV{@nh^U*=Mu<dq6F(#KPfjc7X8z?tcO_t7KN*Il^h@h=}1nL;x
zdb11~`GjKi*oN&h6)r7nx6aVa&2Rzs3d^nKp;)kmT2o);A=IHT?I129JtBHzH9{st
z4VSF3QK<m~oII`}>}J^LU6hxzHR7Av4KxvcXG+${oTCqC@Qj22$)xkd4xvxz4WpbT
z2Qn5M_TOND-Uff|c9)31PBOafU#eo37OPCg>h+?(ybuD8EcLI9Ye|$4R}OaeipHkV
z9v9|?R5k%S)t3r0IKFFg)&5`nTOb^zqNVLB^mAqWKJl%2CTeIdNut+9x7HH<js2XY
z)lmA|rE>FpB?h~c>t7%O$W6`3IkEYIQSJMZxj6o1w#x7ys65gJg36;As62}2%5doy
ze#NJq=&Q4Hnp*vBYrpSwW~A<@QOZZwZVL2T@aSzD?d-z=@-SS)?Qf*y-xO+1qqw#e
zB#R#~cdW3R5*6vuhGFsGK@+fW-ZEEMAN<`x!;?Y^0JWp>8uMO*22`U~f1i&oE;Zk<
zq>T7set>lG_B&?|na|-4&(dv&?rSu*YSTV{eUWIPM#kArmeYWyre<Qgwch**D4rvO
z?Ch)8(Hu5e@7v-@YHDf-SR*}HG)t!F+=JX|MOiBYK4$IqYyp752!o-2T1u7(g5<w@
zseDw)cWX7>R=e*6uj88BttX2L)HH53${EoTaq`tZ6woTRF8p4v*rk-KmXW$<;C;T0
zszL+g7aPo;E-q{>+o3&PGh{e50ynbBs%lRG>w}0GDA?r&UP8j6N*dSWta7P@Mx@ph
zx2B8D!HNeP#kog3D>IHu`>;2pTXo&2V378{>_<K|al@F>f3)R=(a_L18Wo^&c#I7Y
z<!7;X<>BGcC!+_YMj^MIHBb$_0+D4$3^DH#zD2S^Axwr+PeX7NTdqXV%huJ^l>>#p
z0E#3!)EX#ub8{1c+>uE}wD<$LJ-xk6&AY*IljpG?5OQ5`84+1bQSgxNXi|)a2vI!P
zINN7UlhfUwE=X;;Rkg|lNMkfg>-t|7H;@48AF$9@2owC-FD;gUI1S%t6`yJqd11VE
zUqApLLpZ~NS|L-bYABQ$Fa?rOe+sYl-_J&?S!F;&bjFrMgQ9%2u+>4&1Xq{=u$Fvr
z+Zjq+l!GnL?FVaI)*2gm0=WBuJcu6eBwqFHN-i05_hhcke<#=2{8tw)fVI9vTGtxg
znC9kYghz5Nw2;Qtz^u9C<&kWW?f+I-AL0=AElINmcxDN^h>~dd2ye#p(BeP`#kRsU
zR{ULK5lkkyP>!Q=gd;72LhpSXMjS3Lkzaja&v9;X=WV0KwgCU$nf(-NoR~Qy=_ZuB
zMiK3JeKVd%{~ZDb*<49;HP`yH6g925|L-G<netb`UjbH{YU$7tt+W8)-n-DS&<GZx
zpFB_QbyB=;Q@N8+@~)SgfJr0TcF)*nK^Uu9p~b)^{_S~E2u}tK6h^~_i-gueXFOTm
zEVi$X>A+0&Ma1hQnHLQ<+>Fb1iiu3vz2t4cAC%hpZ=;*%N+7}p)mVMuoOc>VM$ZA(
z)_YUnBC|UN>L3mVavy+#t2odALhLHiUY8p(c#8O2B<MGgVaiy+pjP5V&`Y`GNm8L$
z-Th$Sjtmy0Q0>M>AY0F3ir4AgjL`4moxMYW51lOx(GcYhes_Kx4fvy(=1%|efwcG9
z&6H;xP@5sbdK0%}0h^E`7-zJ0#$=5!L>f%}!TKnT0c<IMh^U3wY7>0;yS(cPP9Q~u
z!V?!8j~dztuz?DW?2-`?3>BdysZ<|>UAF(G^%$Q;-X{x-{^PFyqM%fwA*jv&{z9hA
zY|K7>bYS4?;+Opl8x+F@i}|ob;#Xxc8@E-&kc?D%uZDb8^9%cdm<)!(lYxR{1~PGf
zuu(PC{vUErVpL`5{`YTN(3qAWdK=U{Jm|G^$8OG?ehbn<0!_ZbGfy&%HHd5bbo(OX
zz&*rWBs2^=S!98!x9Hg}lY2skiOWcw0}bPr@q!1x2xAXQq5c+Y#yHflLK^Wi(%VqR
z^w%RaeMUTdI?u>_BqUp{qVL+|Jnki{uJ|JMIYG{a@}qaII1&ZabZp7z$T*ky{1!AR
zU&ADAsBRpJghFOAZ_`9*M?e}NW3>q(xqJdqs#grKXf>Qz^Xy~Qy~h;qh|&6C^#{w^
z&*q)ZXLf1_xdIqKO6r$E*pt=BH=FluE@Z|*&mR6y=e^fkZMM@ajTT_E6pVW-FyZ~G
zz(Ov8Ko1TM*z@!ABlq|BT?JYP5uwGof%?f=Sy?IB*~^yeonc2Jr_Ga49cgLlnxNMg
zIDi<Wl+44(Ti9=*iG|04BY3o1=fdhzG)TFsccM98vA)BumkLIi+HU!4S>pbMs}{B_
z$+Y8#ZKoC>gU^F4oRYm$M5dN2)Ud%TteYaoOvSngO(~av<HBs;oWW8+fqs<gLrtD=
zTB6#21%4|r8@)%u))Ns`WPbjJbwNeFC6PSwx@%TIgr0}f{tN`V??%VI1Ab`i^8zdI
zYB{N?4G$dAz*R%40~*u?s1)M0&I}e?UrcJ<{0*du{3XAKZ7(!Z<>P`8O|+^S0wHdV
z0E}S=*a!i+3%B)HUbji${X1hVExP#VTKm#L7qW@TNgE?0a*)~<DP?S2wO;%5wiD@1
zVMM9mJ-JE;`W!>teeAx4)d@yDxl>n^UVc$o`@+r3DHIfkR#kanZ=APcY6(M6lPQ`<
z3quDcXd^_E@c60E<ok)MtY?Sueq;T!@j2>cm5{xa<loJj$Cl`nx*qNElwBzESw^z)
z^4F830gPu)aoj%_NOHel_I_0AxlGYP;fKtKZzh)*UaL54!e$Og2y82hT(W>F={4Uc
zUxAMC%f<wOgv4>*5IBRb%i`o<i`TWiL|VBGkd9L%w&62;mNeZFJmKo%Dk30(U^fU%
zPfuTrjj7rA`u;5wvBC$tM+jts&QxL|B2B}yCPBku*HfBLv7`bUEw?MuZ{I?MJq|)I
zE?n7ktJ|MWnob#Dy{W~;UoIKwUG4LTl^8qo8<7pm<0a|vE;4vPO?l&e=m#3?su9y2
z|2u}jh(!MMsvOZmZ%|V{#`f-^9H9X)Vfs9X1XEGhI{58o{I?PGBoNl{fpLs{A9(00
z5_K-joFWpprh>p<s!>GA%vaRv|Mdc74i6S5laO)v;IyBHCRikER4}dw0VaB{O%{M4
zPLUSNGb2=Q#_G>EtdC%~%<dEcUJ7a77TxR_&Qt_25bKymYF|Y!EG)b*>k9vj^_ACt
zj_c{H3)6cmQ4VLJ&W6^C2;p*flu_H_YqiZJ!=Db*c9274YPr)^t|X*k9wK9Xz4ZGb
zRCBwJ^(ROAJ3TybmE}Yy$<H@E5c-_;cYyyz4wo{3B~QKTcXuC$L9ONH;kwyZn!+9;
zBJv|v`Tf;-E7Q7&y?RS)4>AtiY#%@M(uV5hktJCs4pxDKUSolD@he1QJ0(j=XDvUY
z<wDPvuN0;u<jkZ-zUyBOjS!39o%v!g33=@K(XYd!tqWG}>?mhzvJNCxXOk~B&x2h8
z2INKY<`W`h=j{hSd{ANTUO8<15`ff3Z;dYG;o;#5tX<xFUr+0}Jl(lGT?}%v<J$qI
zZ-~(BZES3`wX~A^^*+@QmmFjMEGx4BGX-XGadFf4Ti9#gfW|*=yDHy=+!&4*8#y6r
zsxJVS|DCh_@?U&V+4w}^cf_5UlvMk*cXQw0-#>49MM0TN?iy62GmM&g2zuS4TDvdP
zlFuX5`Xk^JWREn>wl3@P7$A&q-jyhpb%BcXv!|}}mPn3xpCv7zQR>bHMaM8c4g`3?
zMsKU@zYzM+v-0)R_sZMb%!SjT30lA+GWBW`m+Cz?;Ky7zz_7)POzl@O8?es6EDliN
zwc7((NYt2W3b%eZ5UNl*SY4Dn+(IpBBw~!UOf8lVnhLx|v4A{#Q7fxLbf3K=)Q$+U
z##ES$6TRq;4h_ee=y)^Im5l@~=v~D*Z4+mcc*%NTlC(!{ewFBa3JP^9)VOU9O6r%1
zr<A}53JTiV-PHs;dMOHFVE7Dz>2n?HW^jMHOlJcmj@#1VXf~otRy^Yvy`xfll<;o@
z`D6JWr7J#~ikl#YzFA6K5J(>07rc|%$YGz{YCn-pSuQ-BU5z*%gOp6PU;yyK_?}S;
ztbWT9!p&*ilx;?urn~!DPn`pQ0f0&1Af$>^i8-vW&;T*?i-0Y#Bte~WjvaSAXdB3S
zGRIq*b@4#3xxM<!R{7iNaMXqgs}_H&bUW7%*$T{LmFPpN$Cs_^qJ<dH@Nk0-_?=F0
zFFDfgCnw|4(bFgP5D44!Tl=dLs{C0rJv`B{Ib+9$s1~3Q6BAcRy^y}K&qKtdfLkU*
z`}(t8jxqpFfte`01JoVG;@Ft*P^9JM<u^J)5WV6l#C#3Sk9*PK^d9Z>Jv^>6$HvAO
zfvKTfiPv1P7>$teZ-WA*!tK%g<%f?SH+aQ-uOu}zaE3=lDmi;Wahe(@()oCSAJoRP
z>g;CYV&mgqx1a7WV^Lya_qB^A_a`wZM1M2zv1#EGVX2|zkF}Ge3#VF@OkaNZ(28Jk
z9vd~#{_N*jwLjf7s!?EUFw62^Ux{9$bV~c~&CD$1kgw^1i3utcn&4R-;|vFtWp`&S
zZH5~JTFNk7$y}y=mlZ=3;<FOv03}HETx4?<WQaD@fBT33O)LXR>N!S;Y5#K@`WhVd
z4^$|PA88l7PdtqGjKVKrJ3Wt?&FN4qYUpWZl2t`CBQWGX4J0TOmI3~g$)aUL7Qhpz
zq|TYKXA!0PY_vg$WRWt^*9ZZTEEY=B47pXAO3FBM*q#{T%_*Y)JU2AF$MMZA!${RF
zjhMTBY)%UmnlMI*UJq9`?jWP7YJIQ`$kJ;I6dN8K><UH3b^No^+bhRG5S^7w81TSn
zE7I^UQ75-F&Feh20-4)KL5TOQzoK3gY7ACnR_?R=pC6w%78+mi+nrGcx~2zo>e*1W
zoshp~mz8&aXmJtC#o|ZeHsWCJhl3U&KpLV?xCz_821|1iM$#5DDGdHQ9#o8rq(<7;
zcONGEU=&C$l~48E>&K~iz3pTpP$_b02%!^Hd9~|=RlfS94DGpi4MMDQ|Cw|A2!>N#
z;l&%rB}q3|S4kfB@beX~CvMMtk^;H-aFNLulK&!!23Yc14Oq~Y*JP5CmbL<_g^I&L
zjGN67m<F#_^PiW6HeQrR5LDW8=j|DABH=(OzGGD46)kR)EAYwt0nBzupvQ{{EbSAe
zV0Ws>xXLLiaej5wM1Qr|sjb~yE}lc|-|p@HQt4$HB!8Vg*qK|b+AqjC_Pei^mi%24
z=;shwBiwKLY4!NF=jrK5I}$iE%{U>%Tnhj=^&@*{TO~Sp<d1luK?a&Iy;%vP?L2+<
zoB$=^fE!V}E?-ME3@jCyBqPB1txwdfg#$);mw{L})dj7g2%Vw^$LsS4&(GK1v`}!}
zUGe}^cN(Wm{)@3LTe|tQS~MtLJN#k&sz~B33R^9y;d_faU=G$aB<Ud?Wvy-IwfJa&
zv3kY=0Xhn>)dd>QOktiZHwk>f3f|cG_{V_(S}<#3Xvo%Rba;dS`fc36zDD&6q4{%P
zfE;JQGiT3(-RTdIHi^cNOgoqOxx2gnPuj{B@lx3mRB5#yr?JgKkVonO<-jaHmcP5(
z>rG=3-9VF@m{ok3<-W%nC3YTJLYutgp`gUn9!wq;?0C>rT=!09iw8n40buagGwJ|i
z?L$b0v}GW+>^uF5>`;yROpDbvpUWL(!i6afpcS6bmZD0mMyULIIRd`G^x9=vz#$%9
zJqvFv5+TC5kkSnC&?>t>zc|zPUCnxx2!>wbKXrm%vg_tABt)i_G4F0hV5mw_>ST;H
zDIW9QhMbT{{|Kxuh<&=$D^D?a&{gbToq6-0S<hKK*Tm)SY@PG8>9jRfN&P52C#Q9S
z1U}s|8=H$=OzhcDCpZc?0JPr8$=y;4xqjN;e|l;V&W`Kbex$~UZvP*}p0UOEdZOsZ
z5418+*In2x0tNdQP_Q3;xTTz%?<45}1^X*D9j!YwAfjWe)u@RwIs$2Q{XER+={EbH
z$7<!JXu(oC<m~4(NhYu+3be_#HVz)tFv1eq(vQj(d;>m0>|Mu!k_O{ZJ6U5Gs3ONe
z)2Eg|JKl>4KootAjg1$tQn)YGpygFh+sT`JY%2maXWBdnrya1v%dc_$S)N<fKms|;
zOuVh1-gDg!EWLi%$yxm})7N8MrVfiZF9Ew}Q4tMOMm?QBPg(y7iwW>CM}^E+x)g^<
zu%}EEOHA_pa*pqG2)1VT;cU5@V4sbl5EHh#+8c)hD7@Dojmcw`X~r~=IFiC7lekas
zRAGP?3z(0{19P&LCT=yvx`+RiqT3O@JwU5QS+u_<8$pvWX&B&rs&>Pi+jo;qv9pG2
zpkX+|yKiTcg(R`D%Su%q8S;Im4+lAsY1)1^qKG_Lw!icIIroqM>2VJHn1+wC57_AP
zYPIXjeH171yJR=NnCXwbJE_J_p3pAU$wI50H$(?qTwK`ovHE0Rw6#D$xF8U!-Frj_
zT%9b7C{$>SlJZ!e;o7FKB=FZ3_4V~-sjI7}X|YUq4h#&y=nV3kEx{4AM}NVfASae^
z-GYmh!I7054#jdNtC+FDW98f-Obcjobcoi5bLRtwfR}l+&vTpU*A@+}Bq7A9*w><j
zgS3bV$1*FPx(F42f_sgaR!IO8;lxW3HchJa;AW?CY*;I%U%oe$$??0g*_AFdr<5Fh
zweLu0^m1b-|1>0P@OU20!I7>nepwUKL(yeON*o#*g0s{=WLsWbxHy5wOI_mX_S~y>
z+?kkGT^u2XA3|tJUDPx-EcYzsuF#V%Qz@s9ZhLh&8NtW27jdmSx<8Y2q`}3(l3|ua
z;wRFr{093o27#lbPRT09qaX%!Fh$<%L;v$rHf`T8$Ff3JSiPO|9~xE)lo&RDXxJFk
z=o%6b65htoBxHbFgp-f&Y9GwD9*#snIln6kKqUV0?jsOQ&go7@yTu|KOYwlpR;r6A
zlW*53&fdD)g9fx9x?1y6<Ams}m}ncr>PEIs3;TlJw76QI`=Fv`KM246F)uV8SyB*D
z|K}{JKx&#!PJZ%VQ3n?LF^T<~_@2b9*7%)z%E;!UDsg{)IvKwBQQEq4{h*qmzRENt
zqMFdr%?w?YBb9r5p}@s<Ue#O3Z;OLmqrKInf0kroZaO2YHa=bpXD;|deDFxr>4N+5
zka5r~TRuy@+54}42Jhd+%#?sOt!XxC8lnL@Fx>K!@(u$t`R~so^6@z)&#LCO22swF
zKrI~|P2CAY_D<#1emnrf;VzU;>~cX)wP-u&X5*@>C58kCmuBtDXRM0cP?Py$ImypW
zzmh=9o2+bj@8R$&$3?Ra4d9h~ZW@XHjQ&?AdD`rzSL`n-6)~4-`>J_FIVj*m#4*pX
zv7NuYlbhXdUS37zd}(-Se?)3N+c<@tK`W_yGjaR1jnMchyW{^?@DF;&M+D2|wxbj;
z=lG_f!PERA@aZK8IpDz~rO|;hrDVot3vtUQvVYRJ?_6sos;YqwZBIZcu(l4b701Mo
zlUd3CB;!5BpxyDKn4hU-=b2gdHjW9!ohX8gl3I~(hBwRU)^H%QbU1n<;=?&0uIA>8
z?o#hxgW2Qj-<B5G>K@&kFa5=r?R0Ovpm8Ajy4hcjb6LODZ27Mb+o}B94l%~l4$A|t
z^9?j%Cu4=A+}9=f=N|E^yxn7q(b2|+T|_Y_&gj~oHh|9DnxXDd0mWe1->YTzZISC4
z{&@WT_IKHiLbvL=rM(x%6;YkJ`Bg6`7ohyxR+9~X`tQ+W5wJ#iP@d2Qvd#1u^VCF*
zJg28A=Prgf;9xM;-%|I9IBUFI&*oBzGgFkyvYt+x^9f>HteUr~kO@{(a+tItSX3Yc
z$PM+`D6C{UZ6o8sW&ia|RWvb(I8bd|%X$sKkc=_1QfTK&2)bAiVPg6nvA3s!_5SX+
zy2jYn28~Wbph}n&H60Ez3M%S22Mu86FHv_$6l(gO%0H4AtqbaEY5mTh$%#dsd+y%Q
z)nZ-YfK&ZrcLK-R<+e1FS^F*|CL#Vr{k4E$peu!R^ta(UtLGu^_wV1af=vAWs5k+%
zUjYWHHV%%r#nYy`-T%Hx3`QA(D!sCz;-kTERhz+j%$|XF3n!G?flmCDot^!d8Y{Z}
z{>~p597y-@8sueq3h?Tjc0+WWx1(a-4rx;$rC%*K33^M1ryv-IdUbty>F2#6L#eA>
z-DDu=x$u41P!axp;RLk3y<KRz$t#xzCvqVTOc}|ksTBMqvC*G+^zsoef`das2*uCZ
zVK@IPuzQ@XcN;tNwN{vi*AMVK8AnH}3@~GG_m}?fo~Tu0j()`yXa((U46BYheLcZf
zP0Mz>Sx$~L+V4gr=+e?bZO!O#+U3|NEjE5Bc*oUV<#UKN!>uqfU23|8baOhY$TrUZ
zK|Pu&^fQ$>M9`;_$ZF&n*CgQ9?Rl3BQIzi^oSF_sJ7t*Fs5BNq=-qn2R{esdJwYcB
z+5ru8vEF2rY2xCBk&?z@yO66+M})*9Ce6p_r*_r+#8siRz0U~aqr*ZvJAdn~%LD`C
zFG<X+TZv(r4%&x8s^1)s3*8WA2AF=TRj~0$O+<Kj{O+a%*V!eNKW<Hh7fC&4K(HGf
zc|upEKDF`K{JneQE2&ztN!NG6jZA(79s;Z1<#b<jR20zS&_-<Ho=!ut&t@hH@c@FB
zbJ?<|o+o-mCg8_t_F+wPuB%%v4@vAHV5;zuW;604#bL!>k9Ngzfv*rRG~wa3!L8wN
zLL-ym$mdccqU^^B!~N|Ae~rOY2#g;9Rig=4FGegL=MeHgYxlcV&0fHjtl_0b$Vuq@
z<&9!T4?ptr3(54m=TpirsE>_JALMjK$rHSelM;xQFR5>1H<C#jIaHOE|Lr6nSysIt
za{P_|zKUwFLVHhWPgk+Uw*1wiD|l?!WURc|VlZ{P`Fh|GJE=(NX7bSEZmR$@1GIbW
zffjml_%&I(+ZNFIMF$G4?5NI8!=FKTsjsCKdT?M{GHrYJ_(;pghX;-t5OIGDm3vlU
zNr{V#jy8B*u&XjUS!sFv3#xQEAU?Ew1aawas~jK8Vl5UUnxy_#S83yoWM)ks0#0Kx
zTb>NCi@tVvxTsw)u9VGZGtmV~2MtOLkE<>6C!l%O(Rpbu-0_J)z6}=2QO!ndH$yac
z=#$1GPJvB&egWIE&^pVYHlfn`{x5R-yK{HFq^v2T1KY8pLy79MSY}<u#{y0Y!DbSY
z3dm-XaZkXx>gM<qB2{99DPOIcUF?NpSJRtu!Agj%=|Ic}@00r7!%=Z}6PWIg*nxAe
zyq?=TX3q<w`Lo1STj%S$w4p_R>1rC_Vo$_nnc<nNe7MP&3b}~h5nR*3l#HYCVsdq%
z)h5E)Ij%t2MKe_vzi7hUJ<|LPK=ZviMhTKYPWDJ)s$%;h<%7#0_BlQtv$JcH+v7s-
zuZ6*FPuCr3rDkoLguA~a6M<AQerE~36eq!FRb92SyxHlu#UBble&k9WA5T(pcHWCf
zjl;hxm|AIaPzPx_-y$6jtW;wv={nC#NJxN@ipbFzz{J3~VP<1P8wQcmdqqXNT^nfv
zSy`2;S9B_BBI|nV-pm*@VNm&((R>$Xz!NkuoPq%w0LS|vu%<YX)&BRcjt8)qG5N`s
zP1^(5!4{`2Izghl%U(799l@6I*&X9Zy3K+i7$kg1^Yc2^8XCJRKqZ^;w|uvxr^|<%
z6LQl--c}G#vasf9Owl;*apmT=>Su|qX9V4ZTU-Y3w71q-!@r)FVqTgT6bNNm-JM*F
zk{H&Rjzkl5ou<r3s;ZD}dbaq=yj&BwMvxLR{-Iw;Q+2lNsHK9KahV9gcBQPUs}*#t
zE#q?p1l22f?(y%JtEj#lX5_`7ueyLiIn?=2aqV?Q>OXC;FkbW`LN44Iw_Cyz9DMO}
z=mk3o6o&)1Q??$RU|V_{bPOB)b?+!qFTf%qidb0CU;6C=t5aqC4^&Y1z<xLG^YgP&
zC1a_U@cm~*in~wqzbvxAj?rD@@SM$TC3%rbwgSk>o`Eee)ixJ-a(W~S_}v^0>D5|t
zgKjB+8V=OquB*WOi~0qV^5u^fi`Yg~b5q8X!!Frr$STtP7mPUM09VQ41maLENa0ks
zp0RB0`zl->!=_e;Zl_Rq_x-=ebJM3+SwFsXPg+<EmpEM=%#))fg#<6y0=xNaEpVT8
zLytuy!Wsr*h+qBj$q<$Nz2S!ZC5i=f)SM~E5MxeNfjZbRWZw|%e$3b~!HABBSig2I
z$sMmlHQ(*qZaJKfZX7wbh6HkuxXpGKvLQ=eG#C_I?hb1{slx(9L2e@3a6Nf-t10OM
zjW-4j&JwV9{>UJOAFsF5k!c`CI3r3QW^5nR-{WT+`i8JAV2eeeA2ycf%`|n1OR~82
z?z`1n^bb&DI9l^y**>{!8K6}X$+?wEG*~#6AnL-7Ni;D!bK|2k8DjW_s4bsK#Y2~K
zpydwl$n_5o6EB0w{=UBSTQIMPffRTMORCd?XWpyY{$y)1xPeXgkLz|%mVgrtFE4IL
zlh-ahIFqn}@m1W5Lmfa)*0_(tXWas*l$AZ^S-DAK%jEP$lGK>~^IBJ1yuPs6@wHnB
zHQJRefSFj{^9J8{Bb5H5#qH}Y=(uZhUujO3)Daq-?RMN>Z1Mu)&CWVEdGjVotDgor
z*J%?aL91ldWd3VAq(;JNj_a_4m{;7Bz{8Mh_Z<e{R$3C_Lg(Lmvftn0wZ|>YEwZUB
zY`IYzsfBl#NNw6?N4ZRPbk(eh$`TQ8=V3`kgp1KJ$Wvn34W%SoC%8Wa8-1dG9hyjA
zeb?_XoLYqmS!XK61^75BFAqkwADek@J?x3N(Lmq0|3*zOg~6)ShU#2{gF#EzC-ky5
zxIyiGl^U;8V;^sCK`>JLc+k2UWvqmd;9x*gOrCPqo8P|IEH@|1thvG-KNSPsv7{6!
zrE{%!fh8eerp52}LnszT`z}BM=Zw`3qhNzgz2yO*8YVW{-yEIF75zvc7x9FS?n-l{
zZGuMUJ#a*8CFnH(?93yAYK`dYapS77C+F9og=WkbXLo|O`4a50IW{1C)clT3Zdw@E
zF9eI`0{8p@9*J9b;_-z;-XCL+8^s}De~WR$d<6~pjJRNx&OtWAdF|Xj6c5M~gDGH;
zw3;zbv1f0cPmipLJO_XZg0=H30{ZiP41g=^__l}{F#$20u`@|kEP887>#1&1>XUdY
zw5YOt{)+`nRnC)gIWa;C@`66Qt+MQtb*viERLO_gx9a(_$`us+9?G2gfwHaXI8yDK
z*jTb~wHd+F1k##*$c5VqQ%nbWT3PA^V+B8cknM7OldZVm3;&01>+0lA0mxQ-Ik`aB
zdiA83{x_SaF(X-6-cj$y=q$L&y5(RTKQNeP_Qo|etj5QS0X;o6RkqwL$Q)!)qhY9o
ztux?qDT7l!ZJ_8+2|=sV{@aVHf=o-h3$&k!2XKM8Im(=n<5RA%-<y2?0ZOzjc}>m!
zqxo7~h$I&Fda7X(|IjasK>`^WnYH2hT5iyWVxKa28YNmDdj%Rao>2h|GC?f(H8aA0
zXvioSCmrTQPrO3J^$Pe31CEkZYayeJ&0w2M28Yr;GVW#X;vAR5VF!#_q*cfJniq?%
zra_7SIXLbim?yf~0I>WRH~K#F&i>;}9Ow2tvC|5^N8;;sZ;3Yt#;w(d?>bnN%}}iB
zC=|36BZx_B7_5)V&L^W5|3AL5M?uSNFRQb6SA(Nf0j)<}UM7C$g<l9c^pPUlIAzh}
zdus}MTg8+8`ZoPM>0ZIuGVM#CHUfs6`H!4<GO!2<dozYDTQy2UJ4~TqLkGNgRB3~W
zSy|By4vU}xotl$#)JCsRWB+PuYAU{1DFdh4cKRnE6@k?b0TciiAP~-!SM(OLx2d$!
zFl+qyvi|biAHMY|IY&4QQ{pM%albhCW%c@SmUhea-VGf63F-eN<?k;F4u{FDQG99P
z9)li{t40(LvIMml{_$Pz7_2g8`fy?)c@MxdG{>7D21LBFe64A_#aZjPKO=O8r6j=;
z>&oQ#4KH#tizONMUbO`+4i-wHo2vXKU-MQl;+=oG9&E|D)X$ffmy$|#J|A4lpeqsx
z)U7QLIoxKC&iU_ZzCe0AZp7QrRI*I{!p;cn;aT!r-r!BaYBp4G;6yksY{EMDrxN@&
zI=$95e~J3^cf+bM1<h!E=}GhKr)NG>Jq(0`|JE9XgK%>%(*Mbqk8+n2@B5Z7{sEtC
z$srmO>xYe_Q=P;#FBE!<ZRLSF0T10m1p4C9&Bo=&#QGcBqt!YB`mnSPbzDKIgUHqF
zt;|}kHr}&)f8aOrnx(U|b7Wgvo7qaUPp>I4S5NydZO_le7dn-O89Cp+fvOoYW_<Nd
zw@<~qko|g)0bP68Sr87uX3|QQHZZ_tailx<9ddtv518`882*eBI&F=fUG=LHZ+7x?
z5@~4hqJMId2D9<v%wP18#kktqD*wZ%Z&c#1ZN3E%Q3_1LO1uq)eh)IC00h|rWHh8Z
ze{m%0wIRzrKK(7qzWLK&-JYB)%G`%Dc8b@;r2Fc4tltPt&cB%6^uF2S1oJS9DJT6?
zDar35w9dF?HSR<4t)OS_J2QtviJ$2nl%3sZFn7ZOX(u(yi}!bT5B?AT6aqG$Z&AO*
z61A=$Y?m#C4Z;I*)C7@O5=;~#UPs+v7%uU^+#Jm(fzzg?u}`-r%h6!xh!nC0l4#jd
zt%r2h(y;H}X>=PIEWr`ggp`!9rzd}KECKAWkb&cs|Ni~^9r!H#Uy~N(ik92M--Isv
z!DfuRjg(aIDrl#Hsnb7hqr-WR0UiCsGw+|FR8&U-NFz~8DU>1)D>>zYFg;0PD5I8I
zoF=&1ZTDm7c!ar#=NQ;{vjS^n6Hi7tPWxYQ{<Q`i>l_`$1ckFe5c7aaLn=%J+?d71
zS{$c4(sec@31d$jfw7Bm^YgsPTb&Q6#!!i^T+vANmcV!Nfiu<sdDg?{O33lK!Hc$t
zpERsu<``T$+M1gv*GypBF{0vM=0HQ+N%U*Bf6}nW=%OE6&>>V<A@r8I&!$RQ=Qu!L
z6}j=`r%@g^Jhon_nI4xcY@PO?RPSa-+VtDP0xB37umM*=Trx&9uEmqZ?>dI+y;jGj
ztAgy2jVww7{mkDXA8V>CE7|v%8o+i@I~ZcBnvya%CH449{IOC1K)Mf6Rq`cI=I1v>
z!t@u1XQC9{@Yy)ssE_VB$^MIKg#0Lgl!OBlDFXut1G3_|@t_;j^nBwVChTu<r<LZ<
z;MZG)!V7%|hl<5@N3%~`yuetIGU+3R;p4njt_7?-$z0=U>&yXCt<|WC`#<20SwO%H
z^lYosBBBB3x4j$xqW_yC25W3O9ts=+!UmX?4}0N%^9YV{_nz7-NowjI^{kEHGODbB
ze#Glpfs{?Hsi~{8%Uih=Dad^y?HaErkrIQohp;o5j)ZO^Kd~7fkzuJh24JoX>+Fec
z;v^RDl@`PR2c6s7iz?d<v{P?kDD;=)_%@_8*K(}rV>blj%y_g)#nyBmM07S)hV}2N
zb}#BD58jmSn?&5$bm&K3)LeYI%#?hM(qI`J?!P_V5ml*%P6kGLu{QCe38xEbVXES~
zIe#2x<F@9~bw!1)k+-sk{xz^0?0q7XI=V4_1<^9M<q%O;4O6qrCPGfoi%<UXO?Lm!
z%E}%PJ)6GCQU?j*(vsoT!89s(J;AF3i-1N1gqyW<p)G**j<Rrxyps2Sy#ThIny1s?
z>}<ST3{l4*7?@mH!`lW8_UilYfB*4h46Q%|%s?pqugUW`iaInoKa$)5%<}E?k&%bt
z=l4Hc$7$4(kX<R_2PbWFQ~N)y&MlII({vcQW<+2iSQ|)T#SeJ6io6>n1wct@u1~VR
z&*ixw2QvXF{FkLlNAV5-SHGPyeUM+K0V5?oRBxNi6eDRZ$MsEp$uQ#fmqM81TZk!o
z`}Q}dasKrVU&N75eBcPThwmUpJtlqkTO5*U`_GgIiq(f`VUlP_BH~Eq=lQ<9Z>jJ)
z;KZKjQpw+Y9W8{e#_iCJ5Q&u7ICQ&Uk$7;uMG7~Aw7jdyP+}muf;qc`k;GIR`AV~g
zM?U$3ts)0DUe5HR@))UL$yBPR^#)T60>&DwC<N1=ThiUqITRj|d`j3(ashb=Ai~Il
zGbO?ZJp)Gr!)xLSH;A0kU_1ZpP%ZkrN~w}2fc&z2CGakVRfh#6+TW1Y62V?g?D5i{
zTG<M1omw^nRlJk4SMVaWDXFN)y6fsb_wQ9#Q`zBBJ&o>h$rh+PUfz`I#|FJVu5xMV
z%*Oj4+VX3|A;3}u-mOPXL`C&}_xFFZ6!~i&^PqP0RUjPv7XsAGrEbsHu@$fYP~H)t
zZ;pQDD;5j`OHB}E%2S({+-d)&%bE`?*q_aZD`z;pK!h9_8`t0iw^aC@W@nLIBI=kH
zre=J+-ny{EUTov5n*vIF;{flCJ6ij*UP?*CNNBaWKtg)pUfm7e&nq(jd$=Bx!1jNv
zI@u?=#pbbsiC%b=oR3Ji^fBEcucu;9&5u_0y07T6F%%g~)c=R3vjB@KTD$O>p@!~|
z7L_igJ4FPf8ze*!X#}KUNRf~ZX+#<XL<FRjMp9ZzQt57H{>{DreH?j^k~y=_-rru|
zTJQdL=S&*DCGmxrt`&uC5;zqMx)G!3%U1NAfjDlDy8(1|_Hzr1>J|ET`1$t`NXr{x
zL(rDQOHwtxR;Ngv<gKD6XEI1Tg}1h%g=&rGN;r&wG?uB$`DEdn$L878)D$Baxg|R6
z6!>6@R%$%ZXhEYc%}v1AwSg!hZRiRwH}KAZI@lr}<t}$G_#|2HleYOA8JvcOG(9r&
z`BxANrfZku4ZW?|26FEH9h|+t&GH-I_G$a~t7!8OH4wf;|4u@Kan{umsmT9Dy8wN@
zSJ2nF_!b%UW-rz@@|;gPTCO>NKf#@z_4R%Di_>7dyWHsv<vLNpGtc%OwkeRCcXnyW
zKo*!^u+u!+h!1}CNZY*Enrg8kplNYCpk2sm`-t;;Yc{0a%KVELngq!P(`Nf<arO5x
zgiNpxvpDWr<MB~xC&O>2i%w||#BL@suAl;j6wR`vn_O4PW^QF!h<cIzxBW@dzehIU
zVf%#@R2rJagvENd@^mvaP3+Ijbp}2twSQ3R{ZQH!k)ih_H9n8R2I^3gr6EevL~3jH
zg}lGazYr}uaS;)ocT?0@+3D*Xx(xgzg2!vt_;=LPTaxiC<suS3Y~7o1?*&xubvPhm
z{%^KHz#f;(5O0n3oE*&C!catXbkph&u>Y>^<};feGq!?(D#YM4Mr8U)^%;nCx;D%v
zd_U)4D{6m1&1V*kASO1rx~0O*Q6gZaXZsGXwS8Tkun9urXHFC7#lZFS^ol>}$>xvC
zgU3??oEU8^4@aIOah_-&Dba~7-SrNoN59>%aoTKih#;hM-Bkpbrl~NQN9Qi310M*q
z-`_PqyW9ztG2uvk5~WmBTO|AJqTPj=d=e!_(&87aVD-J7lk2{h23F>CC@wQoE!)?d
zmDju}qA61WaYWp4^zs)e1#NKRqu3uB?BSJ_d^1XQKMHq+{|wYE$Um)EZyf9D>}<GZ
z045gp<UUJ+A2br~f001M|KPbhkHE(dG2~WqcNYY)-`Lz-W)PuN2W96#Ut;fbRbqP4
zxY~egpCI`>ukN679i<rB<NcXh`_{<lXj4VRKE@s^(laCe^hCba=U)xCJxaUC_otlM
zLH;P(!GAwltSO3`ZwZ)o4I5uOG9b@S(_ie;jM#I2UoXZ~lng(kHn10V=xY>5AJwMk
ziwiVFmzI$@`@^D^#zk8!*rgwrhwKv9Ak)dlwDyh4R>v_>G~<D+=to!UGMghpxqJaK
ze%QXN>-*^G%Y(DR(xdD3*}IN2@TXIr?Aou5B8P*AF|~`CIcMPCBeH^@xYEmY$UW>N
zOg=YibIs$pWA1{DZR={8crQ*jCB@jql9Zi-J*i;$qshri_5xEc;mgN~8D9{#*+Xn`
zjYk6wAYPSy>ObT=Z$P_1{5F4!AqFp$|M!{s^U=k5FErXeG^@LGq};?@^5XB^t(jB8
zue%pH*Gmpmm{F3kZb`N6T{9K8M9Xi13MPL95z-E2%|jt(IN;ITi>T?Hs=DkSrq`<#
z)}=E9kIPe9s#<X_yJLM@Az@ux?&4u%O)bmzfeahd)|dOm(CjO8<Cpht3kY`1P~=3^
zMNx;ubjyQ7%A>ct%d`5Qw8W+0IG*$!|DuY#@A*D6x^!M$TVu>kI?+&9&z=U`_X&t5
z#X5wCO7-Koo#P)Rn1xh5iaHQ=zD^Ews*z?7dovw_7#Q`H$QMuNN|=Mx@7hGL5nbx&
zj2buJosR+Yomd6Rtl6jC_2<>`&Ro6MK8rdv<*laPCi43bWGgTK{qWPrp=%~Oy8iww
ze5kW%kkY6^KW%{3_EYL|*SLMX_qMo`StHStb3$Ex-L{Xvrk7uUA#TWe_?oyPN<fB^
zckoIVkxL6n`1OR;Wv!4=x6!f1uBr45QkGy7HI9cLz94?g>6}zd`%9*W!jYkWfhlw3
zucr9r?cu}L4+Ew72orBigQC|8TZ6AiwD?0YNgm8o4!1V%!MzXjPxqIC&#S70Grws@
z-_p={6lWN{+cF0?bl|`BWXjwffvvzZs-trV3h`nb`MW?0OnFBqLKI2@w$|&ysVJ_>
zy;yR)>Cg8*nKr<o?;yu<qXvR`SXNOHlO|lw((*P<IP5ki*z3skr|>lQ>9SKWr46i&
z;DtTQ$2XFZvKuS@3A!hb06XI??rj33GsLaQPBGcsbJ=YfWo_&4{fjD~`CrMuz&qq?
z&*l8j?miF@m<GOH!7zE(KLPH$#I%Av=YNE-pv74<QC6T_z5qjzluMa^z<$iuNb_%A
zvTPapFtjf=f(S!R9I0)HxwLtyVR}s_8#0|bQF$pZ?%$<G3H>$1AJk8QSN#d1n!BAW
z9r3kdChtS(%nld7iEFL)8)-(~Qk_&UQ{Dm3ruXu93BPnhTaq^IpBx+N0}k<wm8J~H
z6fxiKEou&JiVTpjMAUxAh8fDYO&PX53wv@G6M?al^_*j?0WP`t_GM*)Gr9&Dj;)1w
z$jgY0Z&838A(&DVCXts7MwAQ7zJS{lpc3m<S8d%!h7H59T<g)>DzKm!>ox>E7Z#)m
z!(x}=Lvo!r{+6y^w(zXfArq!kW4#%vmta`);_$PJh<Ltma@s+ytgKM`9R0Pt9s1>J
zB~jyb>%~TyfFSLYY@F3!(`?kh-RjjIj5XEZ#^yfh9GKcz=M)3Xd>F_`jc2*x38;vf
zFY$ihCg4=z2tV1l$MC=cIg?Qi^S>y@{Shs5yc|0RVPc%6-V>!^NyL@<UDpl#X|8*V
z?FIMm-}k<jczr~hzsO6BY`qVCT0DR{It#80H8le?c~f!33UQU7p7jjO;@@p8m2{uX
z=(>#^n?1m~@y#0}ls`8qY{V9`fFemdQ|6qG+lHKxhIVtC@!LBwQYZ~~6!UekV4nJL
zj#VU5ME&}zcBQX@g%Wb#oS|G8KZJkTd7$Vcg0q~rkedIO)IzhIU^S2~=(Rch_ggVU
z@p71yv^=4qUdND2nwXnSmH<#TRoK-0Fn@n__yJHndnX@6s!f`y;du~)goj#j=|Pjb
z7zfAWEZ|aqy)(;kOT@`E%Mb}Rkc(jaD}~9AWNZ8e1x<KD0@=~_?@4j6Gs-2T6K0l_
zqzC!3Zv%(M+S<WRk~uZ<u3Y<>ro4e`fGFg13M3RFK2A<MCqY^?Eg9KCal6HtVV<U6
zx6b^~rvt|8%kWy_*eo?v38wO!?!ETN$&$h|-E{f9o^~c04+?1iS0s5lx_2ldN8d#!
zy`US-hHmMy9VZOT9S<$mY*&CM-v6ocK0T7wO%63}-`FR3Aql>v%&=i}n|N%)xJ&>g
z{0L9B6R-ZIG;C1cywim5qg<s(-i$>oj9;LgCUHe<U?(F=yLWI~VVkcmrY5sOnO2s6
z``j8qNT?J=QcZy@Jv-BS=@&SJD;GM3Cs54=W5yI#*^WexSI@@slYHhbpZ$!%ry^T$
z8;-4m6&xBZFz`MZi<=5BD*3}iTQCCQz+6>TXL{;{n_}HYLKhK(d@%M8#YRXol=+d`
zJRu>OOT+uiUO+#(qT0V3cs+rPg@j>zQhM}Aqs8Tq{1A|2DdAp{A|j`*lZi4HfA1WZ
zRkm=B+X~JjzI!WxU=Xe3zmgX@Sc@jln0YtN{0TOHJrYmDId}WJP&VmgprK@Av-Tp9
z^~vXKX@6s{{iTQQ_R|kqt!&vVp-zc-oLt5R^P&EJx0rp=HBHPj8-lU0FV3f9CC!%y
zcfNl&*0txdtTmQn*bO@I5i6}V)>Jt+M4zM{>;J@EHYDmHU^-xCRVL4T8x+ZBx>$+%
zH!$9mm)G6+d|}nE1df~-xl@2)#a6OAzo+7C0I$Lec`*N7D5bMaD2!drE-K*nCk18X
z8VlO4=1IEX+bx~ld@Hi<XZ>r=`}3o*RaK>UN!Hb_%Qi{L$x?V083wVXbPplu24^9F
zq?LAj8ym|8=GweRfPq8%;5nk}9Roga>GD4P)&`_Mko`*1J^?aIwDR2pu{*h@yt{Oa
zj4gf}V<jKJ)c%$Ky&54F_Cc~p{c<jcJx)xvO3P1-QbOeUmAbx8c_|Z(*8;L1W6=)G
zKI;?78}g{x6K85P8(*_mjWCm}Z+E{vToXH2@#@R>vM9Hnw(c>u0G{L-TY==weyy^y
zua%cC<o9D^&x_L3(x-BoWY)ECX`1_z@iT<*-wb@fDkh>PwoZKiE1{|Hvn-@($7Y8h
zQDlfjhFoonL9nT_fhQjeTjf5>_-7dN&>|S{fe*UMh$EUR_gfbpK6`mmkfvhQ%G?lb
z)6R6www$s3WM)CfvpN(9q=GBUK!rhxL>N|;lkoA;bZ;^a1~`8``rd$_jWEQ#)F#x}
z>VN}`O0a&}c=($)cZ7vcQh{S03s5UC)(5j{_=v5HdV#Z9kLaFkrvh%($Gi6m-0Aq+
zPBeGt#UC*V<?Tc&f4n=L<0!)TILOR<m68J@*dE{fYE_MaBOJ+$ee~}T>j(c=9T^l2
z(6N7KTtA97^c67=5c&8iDkjDw=IiTER>yL<qGDcKX@5*m*Q;xPcjhkA)s&{V^{cp}
z*5cy<n1&yiqz<Z3u-t>JRP;PHvf=D|7_$=!y*FZhUoO236bWM{ubA1M&Dj4d`Bn7s
z^0mJ~cc+Za)v|WsL%;lNdj(j)&gtQL6_^?^7Fri)0~Q-iRFP%e!mYn0lpcip>0ON9
zS!QM3_S$)Ggu_TLy7-4@!SNw#=usT-L-|`{V5d_*w3rZC@H^afZaHV=1&%7u<u1_l
zvjGa;C3srl0BCcUm6b(O@=6Wt0)D<FXVcWy{vM&o5=|$fzP9Nh4#!A!n)_DU-X_bm
zdVM#wU*<~qw0e?|;YHitGTm14wQBah!F+QuV($bJ#N7Xd$AC0vU~1j_DZp1O@W3qD
zhGSmGV{3*SiTlCgKCgL&()W+=J3PH(OPKyLgb0<jVoyaup;femf2X8PX9~iS(f!U=
zx1SptMv$=BH5VY-@HFYpu)`Zzu6LcuA;YT~dQP&L3V$wp&-Vrsnp5RS*`B4Sp>qzY
zp~4xRJC&#dL9A5rY?$FQ&(k6Ey<&}+^3n?JM_*$c9MI38OHRNtf-(leL4zNNSW^zd
zz^F|`6@`TtCa*U{o_nA#V6lgUH9*4@x6lxCB#98DNJ#JX=x0+vvyZiqQd@r%^`z0g
z>c#E4O)qS}_m`duYvLMZFh6A+zm4kYnhOk)%)b5_nq%xLVY-WsE|uTiM-S_Q{Lh=+
zlGNsouV1gPMYN0z?l!h81OT4R@R@+Y9o%0mj8@&`|9W-SU5=OTQ$kz6kF!c0Q{6^k
zKhR4xWc=2B6ldx4lS-gB&6_n#v|xUJejgSHpp6R{7NEkLYR2-moi4pctCMqwgX3R6
z0J~H!N;SJN2s+Q3f{cttJP=}ic4oyWsHi>^7P1y{*ug}VFVVfLue1UJP*BbERrsc9
zOU?mR?`j}v*y)*Fz<9%)04>+9Q-}%HqEo9m9<ovgm+)I@wx52p|D@4DM~CK2q16jp
zyK?2Uv*-ne+o-(xyQsX$+o`P&gEk`^cokFGCyG)7{+d(IR>OsN{pu5-wpnjJ&6;*N
z)rqxRzl{0Lq;uiG=Sc#?>s_6s0(jHO#<FM4H>0>Ry5G+qv^xk(yp6t7C7UeE$E(aV
zN_>fX_&toHorpNHBK|WwWWO64D(<*5(Zb*iYcGF%y>&N-P-ct|%d{KiL|U{X!cBA?
zo;PwjYGRplAzqb?`J>ItEZ*l+S7h3nUw9AeKRf`!%X>0ibTx=1XJXQ5y7$Z;^JO6D
zx3qf15ZZoh3hY@uIQ~=(J8dLu!+AcOD@Ost99BNsnkEM-b`Tw@ECj=J$wA`I21Ds^
z*a0y!5`rVx!3RlhK0_ia3q$<pLpN{m{`;Yu@0iqL6Z9C&6bpD1`>p>ub==J#Pv@S*
z{#D&PTd(PtizuuWtd;BPmGg4Q1tY9dUXqae2@fCAmwX<<iu64cJM#*lLB0VkuPQ}m
zl4t}GQMg&9%n|7R^T9O{vVnZF7$9v0@CRDgq}|EO-Ld&qRl}R!SXfv`AZXh&ILLZ^
zdFuQ{lITY`VF;TyY_^*bB5L`_wwlP^oz)cH_v0ebYduyv_fX0ckQ_$Ya{ROh3~ajJ
z)uo#8a&eW_WF;hke6G@2Ph+A=8~BMFH{i;sS^NWc@wusi3=yuOOfd`y=tlwEJUotN
ztwWQw3py%UyEt_@z6OZfJ$-#F*-0;2hT6N=$4|lcXOxwd`Fd{8P>MLuhl1h}NeX)0
z`e9*VSt=?jK5%5Wb^-|P9Q87bdhO*>Na{$r^?>JA@bROv^@H~_lk4#y;jMECjPl<v
zuNQ}F%bMX%Po5BhvU)PdtJxX+oU@@o$rr^!@73HpB1r%KDk7e!Ffnj?@cx_N7v83-
zDiRR7T=b}ztTgXVxTl({$qvUj^haLwB6ps%<RU43arU34oF;W?{G9%msFu8u66C)2
z^HykBm>ACO)XVnnnGeTxo5U6>1qo{_D`$>D73QsGH>@1s4ZsFb0e9d;9tE=2r6SeM
z)B5`I7q-BQ!BG7&Yrv|jv#p(Z34nFd)}(hr7eOQ5(+MD!EWxV9Sl67_LI%d-O9uz;
z&own1scF3i2bHCzeY+$1kMJSDbwl9d%6WT>0fGuCBjdY+1K{%W+~HPJQQ5#+OlPwM
zFY+T56}%7m&eqo^-`rnjxl!?&_85IGz4>LXnyzmL5^?F5+y0HK(GO|`+R2aJL^hCI
z0m61Q$WBpEQ!m#}`jv_LHk-wlcQg8`L9!=5h-J3al$GmI9poBc^f;4A5SSHrSXeMy
zdh8I?yrzh_4u2KYtaN29v||8pkj4oqDTPkunU|f(bFP0c>&iiaewC0nZU>kwSyale
zUw<vT*D*Qs&C!H4(Q+tTDv9LPZ`VLDj%A8(mSKQfVG$E+c)YXl>1ksRkmETDD7?MB
zOMy2lhaw4F#2a8OH^d4!4sYMSl>=2FHbe(tpKOH%1>1{vz;nP@N<sn@U|#`j4VBuz
zDtPZ+XR1BnFT2`|&S$Rp(An<=6n6ed1lacitAJ>~4L&AZS5L1Nio;#x%f@`QVy3PA
z>UT?_tcptHm}{1HAZ1XhnNRPz|M|h{tU=*?z&svoUC4VmMudclDjc)|?%ut7_7HV^
zA0(dJvJ3Vrha?XPd_b@4HF!abi;EXkcG8=h@Sn_G-vyl!UB`u%xvW#A2cXG7c^eb(
zL<#GCclpnY_^uF8T=S7$ol4v82M7Qw8-0hr<Xxk#y8irlqX&JA(SzIkOxrJdKQys<
zTxWERA|ZUl4Q_X3HMP4?Tt>$4yN;%<0nHtjBk>>y`B+{39k^tsOJ$uqL?Bsy5B%-C
zINrQ>b16Y1`0}nn*|_nYJ9k2ao#zSOh_nI2+k4>V-ZrjyZTkHAN_OM9pV+A9cK@q}
z%vUP38j`xErnA1FqE8dDrz$Ni)zs30#VcdxX(GTQUO6-_j^w7>m)!RcXvVwqp(#m8
zV_HOFSja=nj;^kYQ6<lbRzWtlN8>a@iTLG&(aBBCFfevx0X2zLJu?El)E@v-qX#5{
z>?@nsj#_Xr;W>1|;EHk^e?b5M%*&jV6yamA2UB|Xj0KWqCi&?w{drYCOx|)|m%#S=
z;<%{^vbMHP6LzGP!6>kL1R!^1U>?cU<!rd*d#s^h;ELxCc~a4zyDf;_Tl74I1O;Qa
zHIR#0`fygYv|(EfB;Vv}zq91=cU}jSgJ0q-*A7-v|Ekma5ipI7*>>h~WbcAbdhSv=
z3fxF#foFekzP$XU6vnEOIoJz=ObTXZ*#@39>O~n<pb4=Jfz1Cc3I>K405938I-4}#
zKK=|u5Klnil!;GCS*w-y255w=v^2oo`uOezGWPdE%;=N3W4@h+dUYJH?|=u8+R@Pg
zK>%@tufn08BfVXI$xMMKhX@+52{Ehe1|=QFd$qONjRdaqqK_Zz^~_9*5La4o5Fn24
zU;R=&k1V8N<DtS2C%6T#HI4yVseI8dv7*-iQr8vBM9gInJS)=A1TO5qxRjLF=ly)G
z?u?tDmzBa}a>CRSI@h5If+d*M)zx4^?*jQ!u>W{eKz|OLwXzlZhi|oRVJ~7qfqLu|
z!o=%OFo#LoMDW6vl#myJ-R}l)T3?V@=&-{;7Rf$|4N3QWvchEj<P3!8s+{J;Te%a1
z5B*6euRkt01rmL7L#Y&yflk=J6B+lvB;uYsvv*a@t;+cZFMzYMux7AHktJTZfEuX)
z8pVQqd>X6UO<=KcUSC6bh%=<{K8*xsHc+i%;@~U;F~bXeeF|n8z@9#@&@W>kzjdqR
zK>o8w&%6m}PO@h|dPiU47N8*a4D^TZfTf~bp9{Ram_f3j3?cxfVTyIuZguCgpx)<8
z^Diqcmk1lKz##p51Xq0YC?A+SM<UtlINRP#krE==J#kD6G5q8KUixO%B4Cu9`Um?n
z`hu8Ik_MPMl>mdtFQFk29RPq$rS`_gGg$Ag7?xjjgWB7yglV|nAkX%1o!^l($UwhS
z2AOU>0NU#WVQ4+b1q9^)$8X=CNCpD|tCHhQ)o?4q1Vsro<hL<p3QBNaE{b{8F?4*p
z9>!0ziw#E|C~%4f>8pjCcHav7=@;7($4|0>J?IkZ^w-(yMZe~#R=SO@S>h1@Jk(gW
zvTJwUXzT=V**az88?2}Bvn8?jVs3?uvbKhXH1mFkPr&6|-ya*(g=C*UzYAcqp%^$s
zTN%K(x;v^qdATi)-X#J9!-G>u_{%#`Lo4KuwAl)R9Rz)QdwZ2}1!#lW)PN%H$Fu4-
zo0<mBBN3_E8c>$L^Dqw-&kaCYSlv$S9h2_*5J4wCEbD+YXaa4dG*MTU8&L*CzLoFZ
z@C?C9D_1uDY#?38f@Wa}|4|I>I0tZxe{b?WtOA}ONz~agH0%TbmXp^F8bo36*|g3W
zy_SU5GByja!5J;lDJq5j^ImBwXD#vdG<RzM3&?O?4p-Uzd>*R}no9kMy(oW0_=osC
zt_uiTjTRyhN0Ta^3~_)DJ!*Tf&i{Omd26od`-Oj=dO_}@--6OpE3hboNd-){QQ!u(
z+McNmFnp@}-M_!5$Cm71y&MfD-j~-_AP|_cwzeid^b!xejwNS4Il$cDTs4GW1I%n4
z=|c7p1X8I0<hQC`1H=qkfXr;++C>6Hm&9tc^ZPYGGE@-GAOy`PP#U>ozuP$W8Jn2+
z@a-Ed*rD;$5P%(j)wBZ?xBJ+}|CJ}TvT>juWX_(f^7z_bpEJ4TByqSffD!OW!xUNM
zY;D=qvn6rC6i`*g-vp?`qArV&neVnx4h2#xU#V7ARkcyjaYoSZ`goH5+!Jz{OT0Jq
z2-ooQ^T#@IGLW+90S@x!T9T2G6~|f?--7DYT|-QHE1B3`CsutqkXEo6&s#WD0lI8d
zxzZ?pIpmWksCUPoV!qDS|3lsqusM5z(rB*2SHNC)HRpi3pmRXYp!|2GDfyM~+Ul&4
zuNvsVP=dDFk>J*B&z3q#s|5=c&^+34UMdpK;$7K0d_>(WTRY|G3tLV;s7M(MkCHmK
z{QUfGYa5%LY{8dgV0MfFb;08G=|UZx1Y9kEDgN%NcB2tV9{v<Cvz~uT0}Un&_V&8^
zREs`a$(CROb1TKa;|o$i`x60)P8S#cQ2D%H7yvt*3&3#?-fQaVbq=hXpWIEn<LN}p
zEG$fQ+)TN%1V4+DNyW%TwR9a34{mr`?VFsx%LBUtQIJ~&onQdY1T{{4VqyrmWY2(f
zPC}7_#ri)l00Og#5}B5krcQrOO+~c?EQHudUQmSAe*?4PXMnO$ipk4l%e}t>nhvTB
z0f4EfML|jV_!pQPK$b5Upf`Dgf&zTuz`|t;k;Cp{*kbq+wB^iP6VDoBE%GAvK9$4I
znuDQTp@YgwOu?>$(=W}QIej_QM=1^Dw2{*O7h_@pXM2`8EBDygBq))fasjp0gc0Rp
z|8eEhMtv*@6q4?$*?@m;0RBw{wcb-Bym$SFf>4D6y!;=*jBz;Q30k-(wu0%^AX7a{
zM@}9BE<6C(;(<y6tZUdYN^bigf%(+x*|VE~Pvzw1f92%k1)eZ@Ij}eZLTZH!&yQ1Y
zfH`UYq+e$KW!eD%Qo})I#>u6W53+LNK|!E|c!_iWAY6?#M2)qqhI@FD12XuK+WUOt
z!YZmvdpLAaD&UpswOPQqH7Hw@3$#Jmnh$!R>^wZH6%YWbq<t(Xc<QtE{zVm-fNw@U
zH0%oU$p-1cS5K3XU52RHGqC&y1H;l1KV|_4cb5Vg1PrV`Hj=7rGJe7~>^EdC2qZmH
zF;CM}0eUhSlp#)+(}>I|P)!xCM>{2;0kddFxo^0ur^$WV7fpn_KVbjwWxy0u&+`W_
zpFR8Fvpe7H4lbAnMbO2^4g(t{C8dyb!qlXW)DBrfj!Zzpp+0wuh>UzSxS1pAeZU6@
zLFhk{aL}sVy6B>FR>r;Ev@-Wr5<1?kX*_pkO45D`I#Nr(H`ruVYpi8t^e-9)A;D~t
z3qZa}+JkndFF$8xpetLqDg!bh^8-)+!P6OSGj-e>j6!^B>YK-jtbag(-4Tq152}dU
zR8h@R2J#%%F9y=X(4ZM<2uQ||`+RF4n(|HOj=_sp@4wnT0BU9X6Gq4b6zuNc%mB{7
z6iM-N)Jy0qEDfKTR~AM1<0%O<A68rHM|u?5Yn^<K9<&*~;M!momz2kbZepLip+ae4
zQZFfE-B(7Wz%7#g&r?m_0?zjqlMT%N%y^p+KtK2`jHqrv$+~{MzY?3eKHXIYF`-JO
z{DzyRM3!F#N@ClwEHH4cVai_%j<~(6o+*0Y6O<Kf!NI|86?ovgNl8hE?P^W&errO)
zE!aW!dkbJeWlrqfh-RDb$^#NV5c63oc9)!25@aC4Z<iH-K2MFo|ASGc)89`UZb}Z!
zyjO>Vy8t(0W?oZYFFIOjE^`5}lv33|OxzXyJXd9j;TLnU?y}lP`9fuhHP{D`u?dek
zj$8aM{Yv%z{Mpm<oK`_^2|cdYgLWcvCOMIXtjFOib6kBtnrB@vPPWT-z%dTsauB@p
zyfS_|hdwsn2v5lpo9Qlc?0B=;oIgoRNm*NVKOXhu7RKTyV&8+4v*C4(!L<AN(;y%%
z0|vGKhy_1bN-cpFK?4xRg=(xOJ#VgHxw*M*=W{|6A9HgTzdCAwN{y9>FNgvesl#eo
z2=@zM)hSea`8RIZx{2T$-EyRSo&_L5ywi}mPJ$Mblh$_wPcsu=PE}c^NqRrn74}M`
zZfh>W6jVexQG%z?E*n-4%^t%7`wdXHb_S%b=)SowcMXKiU2jkWkb!ccMoz#Z3gbWl
z98`ASGpi9Wc3643evKWV2$ZI;KVo{-e!wQArJ#wx_^%qWsDaJuf)D?HX(Si=pIQRJ
zu>M~yxg^nt92SK!7jeJ0@%;DeqPJmJy%N2E=yCO~-ko}U`*C*Nad%6f{l>|E#FFXN
z>!XW@tvD&|OzxdoDV{4r=+({uuf`^TXoN$dByT&PwVxlZ>w#%rK93}o&%Eo`pSh~C
zVnjHO1b|+vbCMurIrK1O0ePPxkkRzgR1WbEKX(9#pkF=z4hN0c3NC^Au!)I`>@!&#
zW%ny>RxYmoH90f4H+8Zah&;&U-&vqR@1x|x3cg4&J_iBbPezASwGexOE`s?17uTlt
zqJLxE>YNr&yz^Hc^P1N4#0Pb+1}4cYb?Y}~-`9-d1ZUjd+7%c(O-LEnls;%9OKpth
zG5M+tVzzmGese9?+bFG@nyzyFvkW>e^tPhM#TW;`Ji7zgWFTGSk@k}4{E!FOLwlG3
zdX{NyEd}7&U+;*R<`tHgmv<dEQp7CdW62^j+0oXWyf`0nY6JO<FzDYeoV`i+t8uz~
zWwL)EAdeXT=ROLu8#f!KI2OCNud_^k6bmpbI(PP94Ot$2ESWm7ruw=wS4J!1lzGJX
z_xlS6VUtU6Z@pe@3z7q^Ls8JO+*HbUeFlCL>rfKHg0bJavN4<C<95~o92X@oii|?`
zV=b?ZskcyGzt*f0a(qvi4)YY|t>1ia!<Hlrd>|5Ed4B2N8?wuF{(HhXwWDt5BMU>m
zmZ{0x6NYak+~tHt(k4*{pDGG|us&HVK+tRTzT9P;O@S7+Y^u?ZB9C6m?lQJr-HW;7
z^hx%yRZU`p4r{uKlNAub)vMExO~3cVlC&-Ew<j%V@4T;_sO!lQ?+FwHO4?0@;&uHS
z2WO|y|B~pT`k)^DU>#eznA?URWN~8NT39s1s`{hjDq9uoIvZaMF|vw?P=ovb&@iGm
zhoUrl{x?BGrp<Ytrpv$YbXk3(7t`N5U#H8%TpBdqZG<+t0NJ%z#8JDMD<fD=Ap4Q#
zZ)MrP$|v30NXj4~Ej2G;h63~j;tdglb_~sZ`95%p2AKoFk1sFBODV_fYF)t9r4e?Z
zaRYT`dn*9p?Bg)`xgc(@q=%H>%0B%xJ$3)>2ovw`@7!uq6D+(h-w8U^zZwhH;FF;}
z9R6u2uS~dgA6re~`lnEJa$UffZI~cZyf_CcmcHV|UJ*wUq>DjrN-b^37ppB7Do9h_
zB2b9|nXvGawW>eMMAMywe<90ya>7)?nxVSkOEWQa_4+ztJM9A&oGl;3n>^mQixS_<
z^(0;#6T?o5w7k>q#WE7yyG&3|sqpJe7dPhK%XepB^ArIVS*YzqhlPfRD*38X!CxEG
zPiu*u!%Rvhwe#c$_&*8Poz1rvBwDtk$`UGCo3?emScwd|{kOu1Vi;ZO9Hv<SroS=L
zlBVejmN`CjHr5^yeI-XGB8kzaA5D8)Dc)VEfy1f>Ql|#BSLTZam@X@o`o95w*Q2zi
zDuEAkt@mJE`$40bxl(xG%EI%Ar`V8T^|MYMEDL2;m!s9j(M<o#6U)^VcXy^l1VW9O
z1zWKPiBQZ<LXI2BISOmm5DrOQN@fSz^A6TJmTipWch4PR#sL@e8Q25hBqt>?^YIab
z#<4sYBA@{LT?r0EY39%=lw1#iGmBQ82BJ?_nEij>5rV6kn?}9C2@IxQdqNq|RQ37t
zd+g+sSVqaGLD-|rjbz_8)3W2^<>t1XH-cSYvoK=hrh;*++f(aU93RD=1^;(h0tZ;;
zrDE~_(YEfb{!iNyDf3ys-Fuc6P|BQ7d7G&fUN%p#->*u-csE?@Idafe7CfueKCpGr
z8{OM;i4EB+ag#m4rb2=?f|68+#epb%Qg#O1LMPZVl7$=`+T9)())j6mL!>egJCUIU
z|0V=kQSZnNjw(_@^9Muz?nErwer0#!9>nQ4KmFQ2a#4Au9h%^|y|P=<B^kf2c`0^P
zj?Vwhld#1TXrQI(C%S7wklJB!O?|n)J9n#e`&Fb^ptp&*t*&n?MbJ#tD{&j<xWjQ=
zO_h<Rfe`fr^M+Ri-6#K|RUZ4O_)_kPA)Q^%_yNYLVtKdObMsP_Z>{t*YEHGUDog5X
z;vIBoC?@E(4M|^?_nNshnC{#~e^Uv{w6XRMSWn}a5#Qi*z4}pDFBU7Re)ohA17}{k
zdr)m$y!ilX`&^PH;+%bWcC({=)``b2^<wTqulsyw1-Iy%bI$n2nk3`40BwxzWG!7=
zdOIeDB0I9S5U(rYu->(SAWKPEHkd`0+eWs{;$J3~^3MP|V8n19m76vxb)f!yFKHB5
zr1)7lIq`rPfZhLDG!P{@QEn6hs_<N}!x4Z<8pM`QhxcS?&y;ex8IHE7YHM20-`9N^
zvY+Fqzr}vWXQqZrig)b5&EMQEj_~{ds*9Gqyq4ub0p=Cet0Zk@a}C+o*(@v!udc4f
z?^}F4tX;x-cXWK=0U@Hh#v>xNS=iWcT0ZX6Q_aecciDz`?H^XnjkWo#vWCjBgp$F&
zM?jYF+aDC4+1hiudMw=5J6m}qN#wqx?2nEuSAan&JS@4GRd2e_=Gz%Qat{FMeHG~3
zLSc(4C=xu)SL4!W$z~!SR88*t6goW|On=PTvg1L@5gwN$C+qZG$>erDq1@CLE(;^V
z=q~!HNYtMUw$w+f!saSXoL`%ABV&Cqa{MLm2hw;U<T`pDALGqKtGRV=!}A4C-AFA|
z0}(E4g^$6L$OmX{{3p8$yUABDi!Q-<yeXVTQO-&cg(2RyQoUNu5@fbi&|lleh`!B%
zExu*sf^I8n^t~4g8r;)C)<$fPooDN-M=+PZJ<S2<lF*%F$fn54u`}OBiUR~s`@5lU
z1Q(H84ji}J`uOzcsSZCsQ2n!E9<QmQm*aQv)~y>fL4rYCm>KjxoG8WMZza5qPAI-=
ztCU<ctY_O-`Rh~jshpJRY0D$alZ`k%SME8?)05y@{4!XoWALqZ(&25Xf5ixCo~h#>
z(M!P!M^#1l`$_2~0<rZbKm7qckSF?v_CVnv3-C`1)lu=Krlj=00w~y%%d_R!5D-xW
z>7{fLXQC|iH{f6+ph3BL;7b~zEkj9Cv}yIc&lh8NugqVLr5=jQ=Htu9#mN;Z-~Tix
zsDRSo!X}C#++6BRi~}=@*u%D3KH(!Nqy+K1t4%JP=sLO3veT#C1MdZYtYZVESx4f$
z(lep;tQ&uL*C%(-wKApbS@T^}9SmV*#9=%+|Fu4RdFLA09?GmjiU$j2=C9VbRa5e-
zevx7DzMpEk!q;G`PRuQA>BuPZT=i<V2Eg&RH%_!Ulbg)kft|g)V&Km|%GB!92&#g~
z81;L(XP;qlj^GfOmDP6?WWKBXS_Ah(!?GS$)njv)1$Dl{gv$y3{1(|bVRRbcW(toJ
zUkN-G?2LO1zq-Cwl+2tWhCDLY=_V@8HOx`ST%%1`E|kDJbi+*ay5{LO{opurwQ(1n
zj^~TJ7KE|AGDHdg!h|pP<RRjNe5Fs)dyw8K(T%)s)nx%J6rh(;=Wlv?7}j_?!DrnY
z7J++vP($Gok&7Mn4Q5m~UwP!7EYa@`Qb5WY8kMTWgguw~d2Rd4-5@`RixfZo`ETe`
z-H^^@Fgq4GEkS>6lxEXD_QYS#yeAQEjOc?_`@NIk>4^7e!Fj2##2H`K<Ikq7K%su(
zjc0N5!Z(<zgB0%5B4TO^iekwp3Z(Lip>cTtCd&mhWu2Qv-!;eo<bD0uuM<Xv)3$;i
zz%I8Fl=c6FUaj=-no-~a3f!?FYVAOvam_ppZESN{5hbx$_uzJ^9hL>Irj|Xn<MfZS
z(M{D0sf!NtCUrJ|EG2a+2Oe&-RvZ`4o`njWw&b((Xn__(mO4|%vN<1|jgDJ_i(P*w
zODj|qco3z-vRB*EB)2hW26BbONy;c$AmP66wlyER?63`Y-HJ`)7Ct{DBn~-YZto&4
z#tRE};q{lExNw}1L86<7TLw>t4OE#wh*;jPhy&!k*h*?y(=z$7Ms#OPs(_0Qc`#85
zdDXNE1W^Y%c}|LN6=vm>+QjONfi9J6yt9R3>+_CBS#5<`yJcPKYcdh#CUx&npi@*_
zOcRyDbNa!k43(P{Y)NAlq+C!S`?%NDi3LV7DW8uKPFS<c!HX@8rY|nRcCVGKAVNfy
zuZ@2VU%MCrt2T7D7(xs|pmcq*X7hSG(GO(<faWf>Q=8;<#BosF8tQ4gH;jJ0SPJ+3
z_<igb>Y0j0&p+POAZJTaXOpd{RnJSM_bjs0#y?ROq}X@a6!zP3EYeIQi`b<D`W5N}
zWkCBU1S|-b^q7EBPWw0@pal;C#0@=yA0XqX1EN!vDVi#zOiX-2Gz6vC6cVa(a_u+O
z=$F6q%@Q}|Kj`_9(Gp-c*8RATzB#~xMqU|FFt(^fu*?$6A$ENjS%;3FD7PM>ze+mf
z4ro@?^m&TV#AdC*qMiA?<y?~;dnYt$gmswnyki=3?=rWY0}1r&-zR!0Fa23142W+|
z8k!I6kTH|p+kY^{vZb$kEw&OqA(Y)@is$cw_)wwmj`uQLQ;Q^`6JAB3pFt=jEN~>u
zr8b65$6idF<%mi!Q9(-aE>ivDGr23f#uA*GYDnk*3$$j_xt{jn;Ja;|`oC29n7Ehq
z$<K$J1(GlAG^n{#p}}?D=@Ib>jiB3d+K3JN<8^WIkm9<A{QJzYoSxCGPfzP#8Az<P
zS&j^geanzuxhqfTzke)2wZ0$!IiP1@C1X{_`v`!vOm49pBpbFMyk6pVg3g3D-{s~+
ziNL>+{7+Q%ju}#W&euM<FEl_f8Zqx*H}Q!X`a8`<#@E_W8Izfuo|zd9MEHs7=YW7i
zdsifoQj1B-YZOfL#kAUB*)s_T^_5x5p4*UA(Gm-K?oUCg*>?a!*8`Av#@}Z@dbOKS
zJMf>zSHw*=!pn&o(l7TI!Jdr(v@t?S9xH@OeRHNRM;*9zsOP-%ocHd|ALVzRm*fUt
z0hr#}mp;3PhlhHmRlrzS1bXwOKxcmiL^;q3EGa4309h8{vs0gD>1Q|RS4zC*j*N;@
z0F4fADtwyoplJss(Ass4YYd9D>VN(Ki(y)lAwS2Dy76G}&y^mm)Pn$1K39!8nA-d)
z1@Yno^PTl2btvE$3^vQK$+R;onrW}Z5--aVzX+(?t^q0mO%a?5l*UAd{&RefcJlHB
zm{I$1MQSctT)E-$Nb&AwGJ`ls7|(P<@52|B5V~<=-CHrk>4f!`4;D+cVjo!X2vU)M
zDaW#z@D={4Mci;}&vXfHqv41h$*j51hm?4Fb}S)be%ku$pvkFY{?3ee$54DAzb|R~
z*25+#vxw1AZ2|N58ACO;S?^at_qgWILBoSgX)pLBukJj6m!t3-;l@wZN$vjP_j2FP
zHsyX5@Id4V4(yK<vlPmOF*}P-;d#3miTvK2+~u7`RTTX*pVQJJLny}|J5$R36cfax
zJiaY(6o90}ku+T5q8K#J25f$SJrok;1pk0kx2W410nj6<xDAm&)oeUh9wRgw1)p0j
z7dLyZjBvHTcH49RNqHH<C6{J%cDkuL?2thQ#6lMyA@1F2CO4}`%zzI9)c&pv=N8-o
z?UGTuTBn6pzW%{QyVe$fRme}Wp2luw$SnG9J``pD5im!alJ2NL5m8ZzJ`J8$;LN+Z
z4`04efb&(lF^DChJk7tlRN&_C@e~jC=(!{1Lu{7TECFxbF^tyQ_a|YsA)&HUP_Dv_
zm6Q&{$}OoZ^U>jL*jyH1AZeS!SpIjLlOl2r{Q8}<4Q{ZuE3+=&sw5LqGL{prTaQ&D
zrTj$QuZ%QdAtJ345*2|hi0vsYJ4Y%!p4vYj)uWd6C`GmW$=OPUL`!}xmYYT4C6d<a
zbA9^jF}QFP+PjQM;UTk_W`VI|=7!2$2nMegVp&d%O@Mok$1nmqd)=E^CUfuJL*u|4
z;!`zazv)js)c((jKm0ycsh{&#s3p;4P>YuOV3a=+3XpVXx)f4CQ3p57ro9J$+AYb(
zKMU;CZ`v$ce63kn3H?mcD~*DW(GAv1f!FV_z&bFi&CYafnqJVelx*_soKAM*syc#Q
zQ~qKIlb;+`YrJj11Wt{0Iyy_cFRO@2!azvCG)2F}48#1%Q@s>NQi<{42mfFL3S64o
ztgMBDfbp@=3CMa;Tn1;p*0TeXjVyP5c;a(QNSJ&BRFJyRfyoO`SE&W6qBh4G?pBHu
z8~L`4CnU9-c<11#G$C#{>4x9>zER-g&fiREI&c!ln>y_1_N1PjsTym1Afe2*1Zq6*
z8L12m<e(nw;duV(m%z@6cU6n6k`neR{IdQ$z#swOYxKH1J0FWp2HM$`&h-2DlfP9Y
z2Ir!XuY=}#?zkN(8Cfv!s{oq?97vq=PK+iR**v16hG^Zc){pi9^pW_fr6a<o$TKrc
z;@3q8`;iZ1$N>yz%nicXq6wKr|63Ln@_7hs64uoIEMtqJP@;gBEnsy9@-%1^(F$@E
zz2i!7W<;jM#^@QWY$50E<ZIPq-Kg*t%jdMrt?vgHP*AkJ+g#79F@})cZHoMXkLRSF
za_}rHLvUNOD%v+<#-*QDa*cpl$itrxS*E>+3yQw1J2~)?DLzOs|HG2Liy4V8rA?s}
zN_dgrlUXfs2S^X_F*V#We=(`m1PB3bPgER4U-uO0-Fg!9D95>Sp0h}_SP}-&j0|Pp
z+GRSVS{{BIaOU;Po&Bp+rMBAAqs5`Y)Z3gY|Ll6?^W%d?>EDzkfIUuFYWWIV4vX*W
z?Ls8zpC^;eHc=2|=@Te;kO-IGOOr@ldge_S-ra3^G4`^l{8`4pTIQ|+=eDEAJ#gZ|
ztEAM_%dL4}5=pX5`>ia*r7Cx&4F6b|H1QV8WgoHkI;`>A$>yV7U$@IigIDE3LL{}3
z!OUN7T}UNIdv@Pj@^G4-U%Xv)E1IO%AqwV7=Ds<`fWF{i0w$bP(4dU1<AB|IB?f(f
zBi98UWUAs+9QT;9Q$R-(@(<w_xfyb=fub9#z2UwO8babvuRg7deQi!?{b3OZUiS|G
z1!5Wtf+~N&T?YDnH#sM>O1{|0$Zv~LBaaZ4AZ^;XzTeH{Y~qqj!u9GT7YkRu@+)g*
z^R4hVzD9!>RW5kx3VC0=eONzPJ+;7FoX5^Ne<lFcaA}zjHp10Tv#y@@cFpB>8sHXB
z*cPN{R+mOvx(*oP8**1^;lUT{W>k{?mC13eCQJeN3HxXf>2v4$aW;)C44=~~dFW|=
z&q8g@<>rCP<Hzx9E0UG)$lMXzpMYEaz2L0{)y}OL?`vYQ3jP+AFo{alYsYt?XU1-Z
zYW#wYq41s5OECc$r`$OvhmG2WeCgDMh#rbH@~oJghGX*$hOc_A?4>jUv63jg?q8v$
zr9vXl?|tyR+*prrko_xKgW*)PXb`z#iARNN^>MVxpL0CzKJwi7g=r}P_GX%+W2JqR
z!Ki&zQ7(15=SF8)4E?@&i{CBi2F_dbVi9x`2ZP3$KrsFLJ$R|in~VZY66tfuv>Ff<
z#H%6DA2^-9sMMfA$#YXJ&vfGdozG`8EW_=v3#szP7i4-sF@P<DssAGEi8H)*2BM1!
z<C5tb`=<kXDsz1`P7y1|jXQ%;*TdHh082j_91N!v!H%XE8{KYRl0z|vRza^%HpcDu
z0My>D#dSFxl%V_jKuoGT^6`HN3WOD~aUDN%*?kCo>mX#B7q`;K9yFJ(^tRFOD*oX+
zVPjS?5>1mH*YkCo;_xF~C2aF0x65i|cmf)e3^pf&CmS*mCbKdWPnb&H#&j>Y(J!19
z;?OD2Ly#({R`8otSa3w8{P|N~Ubd9lJ_z&dzjOjA@07O#Sy8Rk|9lt%C0+t=qzRDi
zXh7?+6Xc^P4=>Cs6i_W!;f<HOBJ@V64L0vro<!yZ0lK+^K7vsW=Ub7_FRMLu&odx+
z@MDaH6zK~|G^VVn`Db#!TB|tt>^?ZPs`2n{xhfTmmiN<r{|&+8qmp0BVJA9oD+-k!
zVj|~h;M!JUaisD?5e3VIKf~k5D!0{usfk!}4{Fxg&6%4SVgZi2F`*B0<K&C^qCzju
z8`&u~8t;3>+!DYJ{GAlzY0r6|{f{NT<DG5C&zim)W)ZTO@^Q>CeQO?tsA>gZU5Q-~
z^5A<hx4yn!1`es@%>qG^{D4caP<{qkGBXMUrpZk(knsn<$kNi%L1s#H)T6f~aL=LH
zPV!typl(-Hf?7KmvpqE-N1d^UKl<bkZVek8;Ykum2-(#dXB}*CI0hvgoHC!)qp!80
zba~4?Md=m-7j17&tsO0usb8I(S-k{h1L2H6!kN3oXW1S&^jT2w{v(Dc*Z;Y^$77C(
zYkUHL1<5L_SD?p;`t`7ZCSQ}?PepNQk3!JsAc3Q`Ky=6I$E3)^k|Wh$fj}JH=pH^>
zw_@`Qez6|wy2i2IRW0=1mvrJ@RH(<}{l_+nQLSafW|)@mRmno;&2X62xOLumhH7vr
zJ-x{3$#WGxZ{h^ao-po5+{nnwc|&j1C+^LWe4Lr)vk&f_J9DK8r!5a7i|?_}clr|e
zaINur5e5&lZyA=g@l_zYgjk$g2W-MB@5>%1L(=*!sh5ht+3FUeoj%>@xr;6<E*{1W
zlQ*o;pZRR9TJ-24IKqaVz31P<17>G;kS;UiYLAG=SZMJ({|uOD%$%H&+hZk(DZau$
zqXZ5|=1^u)(X`Z&ZVuez*2&XIY?mBwXeUW~QRF^r-<WdJoX*HcqI<~MAaC~!fKdws
z?P9dh!^`wNpT|0xZfury8?Z-_*FN3awD&SBCCYwuWMzDKpCaK+oL==eawfIGhp#Vm
z;T3zqT~NJ&1VwnhAD_z8zEj58#%`k)Pls7U(WH6oK<DHWg#*(S`#N&+A-iD7B&5<Z
z$N@bts+f?3#8a$GrX9@B+?KltA=w(6lY-{ifOzGVeU#M2-~7zzIqrTIuyS+viyLH$
z>Q|HGk0`^K<>F3m{m%=)&W;ErSv#fqjj_k%r~McMx+Q3<DNBxj(+aB(w7{~!WOjOX
zXV9dbd7csrqh5x@EA2o2;#2BSD1DzfP-;tV_DLrWH@qK(a$(@OaUe4zWf<i#{77Zn
zF#g|&3|z+)|NRUEKdZ@qrwWeX0QO^-Z(Q?kmHknSWYKYp_9R$(!PeXT-!b9X1f)~w
z7YKx<?AzfMY$|<+IbL`Hg_fG?*;I=KRAE89SQ6ylkc#zAtoCyMKW62d9vs%nT*iT)
zK7?{O`_pDbKxZfS95Z)>?CL0rMqVibciC|&-;Pk8h9o?wUX0(y@E&xV@m&!+H`&a~
zOdQ=eM4AwZ7Jhgvt=s<3N}2S&vY7kA&7=?BbHiozWQm(w<1dc`?@IZ)8_d;PI_Q2c
zx<n)#9l1|RLNVXgz&owKU^w8(K3Rb+R-KgbdE1i@4Q8$$TRYl$KY9C|g*1W8@oaUH
z1oLeu2_EPMvIk>P$xhMB)9{z)P%h<KXhPe+;jvFFsy*>#4rDHW-;x}z!x49nZd;8i
z`W9Zd`A(m~;SANd3tWU;yC)Z31=?b_+1Or4)B!K_L9rU^Z$>YnrsYZVq%k|m+gT@u
z#FYK|xuqd;9vf$@W9c(iwp+zA+;0nj6%pi6aO4q{pPT*K?nS)}esu^F)P@}*RN|ZM
z^g@O*RQHzCdE&}$FKVl{oo7Dfx`RFZW$`oYl}jq!V)g;Vf98ML9_mV^iD0IP;D076
zmoY&QDv#aH0`uwSulMSWw5%pDR(iXC-9iOHFrl_=yx(idSAjg7@^wU6d-ee^q70tl
z`7svuda(-v#<xLty5(wxaG=)NGf(7MH^>}rJ*{`S4Z;NVL^`;OogmujtO{23-shj2
z1M5?l*zOTh*)c!=$xrK8JQ}w6XGF*E8#?1vYr+@A$ReN4n_QF0Ze1SZ&>zogm%3sy
zY)yP{JJ(fQ{^o|iqdBiP9}<#~$oNJ890`l;FsI}n9=bS5i@XIGD24^<Z@?`1dy`{U
z=->kx96p12nw1hj_{!@mSGUCH=i;Te8!TR@5dA0&*wBi<1gZ9{-{80ikbW%c-iCH0
z&l`8#^e`nkAsk}*uAVn<&`vQn{yjMx=_;cOTRPF2P=!*&Yez-fNmfK{Elb2h`Ki!$
zng>XW;Se~#;&Y844!q!q`#}*Q7ULNDe<c&pLH@oY&HncE=v7gw=F`_%Cp_Nk7<~vt
zcn4AYsl@4pu6L}p(PJ&G_ze&wys=>`D@O=|q~Z3m1uGE9r~64;Ro5dR{+$Ih>J*?+
zUU0$g_C0^F+C0?`L_QwCC|vfRL;tSVAC)O=D7E*!^W6k9#8Tdp-%u;>KC?zcaHI)A
z`<`XK_wgOlPnHMy#HFBC2`QWWB6{#kYiweJgmIpJWaMc(LJ>%2`@e>8{w~T9qw~r$
zz@0Fz%GbOyn=RtZn8IiN$#}J$^XP5#jutUe;c-zzLxYQf;lI<+vg8WQ=Z`rYGs)WA
z{reuzhcOAe*@xFgSq$HgY;ew5$f5l7d{>=gZv!Ukwa5<%8k36dJ*)0sCPtSPErej*
z?x?i$Rq>#U2xW2K(Tqx`C4EP~O90H1Fj8ja=MP)6eU3IbAXo^q7Jo1%W;Jm-DP`}o
zYqWRDT#>JdsiZ*w(BIoWbXF!3&tI}RGNGAS?xY_&RkmBi0c?_~2LRQGUxb4*OqXL1
z>x2Ph|D++ImF`R5&!6Rf;8?ZO*=>%<@E$ZcWVjT#YUdrJ-oDfJa4?C{=lL;QVkHq8
z9=5d9`C!U{Tl}@{JMz|5tAT&d9&ZTLND>tSK{Z!HeItbTsra82XKL4#9_M=38tf!^
zeEjX<P5b*^E;8U;)4Z)7jkAr`7k35F-_5lex^Kg_I*Ua84tm*UziOBv!ByVaAbVZQ
z{PgMQll#qk;MnUC&;k?@r)~x3QiPIx1E;aXik*l(fBsz4lQ9^a8lzmlB)gMj2t-~w
zmDLU7p&)I%21$i+8a_pT?;mDmov}>9WeQiY*_?^MYw59K4rCW699-)cAu51MGz6eu
z#K6)FA%SsL+dK)}*s{tF2(q_(zxF3c5Mj2wqtnY!`h9jT`*%2()nL(Fz0bwo58a*G
z@ltpa^6EG_)#Zs!RO*6HS^HOA{g=7Tt^>EDL|iA?0--kWBQ0vC?`lY&f1HG=m*~DL
zF~3ON<k!>lSR%axU@8P)syi`D$6M@KNCihSchx4~Sg9d!-y%gt5x^;+u<kUc`LrTj
zNhd0o8TNstlO$Zx>n9~KBySwPHef98T(xwz|ID;OKdfxh&XWJ_NI^d3k_9YsC}}Z>
zQOaf2PKaQF%FJ3k;+@a$-A#8{g$LL1oknN?CTny=-;87fZlnZRg^cH{uGtMpijvkS
z?gg+^0S7q_pn|)IFtl~+bjHg-Ak<V!6JGMG@aAft(MW-sTU%XS$IDc>nIfE{-^1x`
zs};pEO~IMeJaC|jn<d=%tp}U&>aTYh&ge0Qbs2*S6<w>JR<m<)9X`e-!3!h7RU~<f
zP>RJo5+@(b!4C#!^A58r&bmZ0$0Oh{3{7|p)!BYA33ordek6A`UnWbz(ecMEQ5oZ=
zG;EwGOMcz<E@N-=bx?EC>5Cuvm?`Qk9Pg?N%zpDI+dS`U{DbAPzT|lieRk$GulHBn
z!=db1nrhXIVH%JAY<)=(yD~vyFFa}-yDT|uTuG~>`JbMCoHCB9GMlchZr(Q~;+P2}
z6%Wp{ju7GxdyDGs{3cp@Ps2c+&Mc~ocp9@7`#@iry<o5*(4gF~`g^4z63nmT`>bO!
zT?VkKRG&5O8TM!fiLdH`s|2AyfJ@dcIV$4^Z`~7QL>Pc`-KKKIctIyQC#P}=zOeF2
zjE9|F^Z$rC3#h8QZtEYqL!<;mQc6nc1_>pkLnOsOknTPpAQDodNQZPwcY}(AN_UFV
zAr0qzi}$_veq;DN1`G!LWAC-sn)5dydPySsaz25-JKY4|cY*E41<=>5{WbHVC)3r@
ziD4+~Qby>0Sl=14t!CW5C@)Cc*1r(<cMyceqnCr+T}I^GNbAzTPlw0@^TEeTPELXb
z#YXLo!=L1s6sHBKF_pt^M0AOn-s<VvZOe{E#K+-J){+E?aniyT9US)RM}?n2m;B?f
zS5hCkd|iIfKl%H5J1!JAj&Y`uMT&*^@o1!R^NPndB_1T)`G96ZB6#~00~sDpsGcPB
zxAfr&Sb?|=ZNsMU5S_2dj=siKP5`<BGj$+x&E{&U`PkyOgyj4J!OWV`ph@F9t`bCr
z+|6ZQggzF-c2{on-Fj9EKUJ~@#L=_}rUn&J*R>(c1>UZVVcdv>kguQ4?h><I>IXq(
z<iqA-|AI+#J9s!#sID72#&DwKPFEwDnpt#SJ6*u9E-oe(7Z;cLkOglLe}8|!8+!os
zW8zX$Hg>nc(}JZC_N&mm*}EDW0f&%JrK-j2PO1g_V$nq<R^5%d3{6~D5krOgJmfU%
znH77Obw^+3W@^kCkv?DdT7}!Dn8@*cQH`;kMpZAa!;i)s6k>plN01@I5d22x3gk=c
z8Adpka}x7*VH0;U-GA1zbQN-N7BABM9P)GuJ_TtB3S}AKSDW-q+zuCv`_Y8<2ML~-
z>z|k@D`2}e;i;7vNRA5bFbNBf)VF43b(}~G3sbGEtaz+=f$^q*h=?c_o|?xG4ZaBw
zi}kf;dg*F%HoGcKHiVc_F|Z*gIy$TyBGo?dWc)Ay!FaZUm0U;<GA!TT?5Sz%eW%S+
z4Pa|xB^dK6D&UR?f5<F)^5Y2O`ecoL6ez;6@m|lbRnw8nvzZ66^DU3F6(N$mapdog
zN@#IVBl(9B0$>}MY9i$OMQjr=DgN}^I|=HSV1S8lO7mXh0(&b(%NyNkBh-W8Bcb75
zh~9un%8M1~xfJ3v5BzMqY`nuF1NlfrIsl*qyG?2@_^~H4rZ1PCPVyJ>ffuQXcb=2_
zqfR)uR2HCZ&%Jee!g&?&YF(>8@2Q(+;#s7VI(83Jd9Plm$A@En_ip9fB$6#Ga^?4<
zl0~22LF*$tf{snCFzBo<#;TXs;{qT#XxX`btN>|Hf^89oD0xIMREgJ}z@s35i5Ux)
z8m(aS=n!UZbucF&V>|7j+`#SAK~A2tpr6@EE_w5YY!%Zfu(a_+&|JBJC-N5#jd~xz
zF}~@|p_%sGwp<+wrQ-bj@y=K&1iS|Xz}j?5(=|1Xf~MEYsTvYkMXk1!SEHa6{TqJn
z%h8lcxsi!Uin&YO9dumo>`v>;q0csdNT{t}MP&?iSXX5=Oa|{Idz;i7M`-^nHG6vP
zdx@4a3OB3KL;h$hRZH9HYU~w}e;e1{ij-tClM={3eaicmK{}-G>4^1M!JMBYQVU6e
z$<>=v`f2UOjEoyL(X72p)<EHBn6~_dNsZnC6%yF2P6VM+kcz0IfFIk(YC5Ut!1_Cd
z;fzw=+4(mAQNRpWNVEOdbbip;<Xql`fpr1r<$DE<OC|zoq8%V+2KU7$mS7}#5U{#b
z@kr=CxoeX%tYXg2(mY_iqeS$;>|3I}8{_c16^_)sV<vJeM|4{erX#=cIRlU+M)O-C
zTMaYt;ul9~`#gpSHr|^}Lgc;RE1iM!7IJL(%0&i`@v$YK!Y~^3sBJcLAz6IT>|}Og
zUPXP|^VyGe88S{#uCGBlo#|xaQzSG*xjyvmb`bH49XY-CcXJa4i8u@z5D0VMT^vfn
zkTrX$DH#6<_kGqG*t;R}(kL6VPQq<7BrC|&`WH84X6B*2!|e$zQ>##ATe;P(i=CY?
z?6Scp9l?2DwzkpH)Rbv$`LS4+gkq!b%EXNSm^wN-ohm+2J~iZa5<rVu+ja<w%Ph1U
zd>r^1gM}nyN@V>YNsv;aa!P!6V>0N~2LfcE{crj^%g%&^AMQ~FL2`zK84?oIg2;m+
ziR;6y0>~}q+vK;t^!<H%r0nebwN(a)C4%l7MlY;R1sPlpI?=K|=8Ut7)vf4(C)=uz
zRQt?0^<qloloa1%e`8To%HWLfja|2E+x%>z^y6%QwkV?xVOFour>~v)_z?~fHDO4w
z(y(g5hEYZ_udBwd+=)A@M=BD6BropV?_6sdjOY0JeL4Q)9hZT#iGfwA^YX`Vd|k^u
zl<YoC#!i-O<2FAOz|3*i=dMdjFKUWZl0Q`bpe+9OtC4GWCiya>t^bCLAs%uNqfUhi
z$sA4Ez%F<r;2~;&ERH{aRLh!PNm3QHHESEat;VKvuZu$6J2FU*B~)ECvq2Sk9%M02
zOE2NR!&jR8;e(3JKV0j#%Naf@S021SW~9k|VJvMu#AE}_TbaIl4;~m4gL=NZ;iRY#
zJkrMtuiXHReX;<Z*&Dk0`byFl|9;hjPcK~Z#8IT~l<GmcU%>B;<p<#dY058lpAHG(
zBuB|{6RDUC&U!v}zP*aqTot6PXP8hJsmycwZ!7$8(|GCI$ZhKfCT-hFhUFe}P9}WJ
zo`+@pr^8-b?-ymii(1Ou7z@Br@uHFG1#<}lVH^A(xfmsSef@#iRkOh4p5ph^>zSN|
zN`s7Qdm6Egc^6x-R<^ovM4$P!ob!Gj{az7G!YV1u5`ehJh>p2<^;<NW5Mhotza>BU
z&Cr1m%QFWt-A{0%g&OVD6PrzOulun&on~MzC$VbzV%Pm^*54TS%L+1o@EIeLD3-<v
z1V2%<y%b#9qxxvL9FUn$P8OYnZ@K>3DU<U?2mM3Om6fqCKHIG>Ds*+3X3Z?j%<|Q)
ze|7$W*4YG_LGV`yE7<v|#$NzW+je-vAuqeXA-lz&m@DJQBYAr@KkW2@yO>gpO2!=*
z575TS5OGjt&kI1~*kuPXC4^`E`l#*PO#QB$HSJ=ZLFQ37(OW)@$LaFfe?xF09x06S
z%H*8vccxMjpvjXsbPhwS9vKg|nI^N#vQ(HCEi_zoFQqBLoQ`#Y-)^NybaOu+aoos=
z-YnhT9_b__q$3GIS`%JbprpVxVxl5qy7Gwp3ZES<HYf3ea%Ob?mo46Tu`giyi8Uh&
zw)i@SB6(GZ)zZf!|1xF9ne5aJ@BR6O@ZJKR#{&YeZGHmt?lSBldg4BK=b0um{nng^
zzZPv%gdg1p(Q&$-o_?F-U9tip%<B#R4(=D!jal%&-puQ}HH+UHiCpC0I<EFo-D;c@
zc(xdC_HZlBH`<r9Z6*g>ND0L#jR?RcAFn*+N<t!;nyA`QcNOk+v)t=aV2k2l3YIqt
zrZS+%39S$&_D}mEs{EQjH$L;KyGn9~+;?9VhQE(A#oi$zHX9}VFN#^(Jg&_(6CSNs
z=e(HB(djU2{&?+nr(eSBcjbl-v)bi#N(Qpg?=2_yZ7&Xq=eBz~n{%-}g^){2OD7p5
zupE2t%<pnwng96+hLOv^P$B;F8zk<PA)vx|^`C#nLH^H2odPm`+(N?IaGcWqx3s3F
zbp>S3b4%N6MGj&zc%dqiG7hMh7aG0F+-V1#4ufm5+`psDsz!I~6%J&No&7c1$M$Ur
zw+0;ceyK*cN@ks6K!3f?^)Cel<yD5MTE7JEzNzhr^|53>Gj)Yb-~0F9SbbZZ%;)Ug
zMcYmtzLyOs-2>D03RG!P-0W{}$eP8zd-tj3>cyp%{<#-Sby`PORd|ic5gz-;&K%3o
z*%<_5x#lSd#&cnD+HZXS&Bg4`7jag!zn!d^8BD$n5GKH#S-Et!$YF<PSyUP`Q4=u7
z-W%o}kt#MQVn75dSVlY<F`SdL@T_`uoGsadK-il!FUL1Y7n!&HQL??>buhQ#i)h=w
z|H@HzF>DQwjq~O_{Dx=?eo=`)eBhfoIXu&R_^}CJs~aPnrL86O^rs;L@yejZLuE>%
z#2`K;g@HDzM|le7)7)%q*v|Fmr75IJ+QUP54OQr%@t3DrJfdc-!5j0N8PDE5h=1|K
z($exCByGBSdU_Utrs_RdD+5-FnqYg-2D8s}dRiLl7IG*r?V~Ii!ez1RjW{?$ESh3_
zOT9WM0@O~E*SX)Il75c8)9F~^+ee6H*F4~Gpg)SSQA}sVj|r0l2dlE<-t<!wDSs{I
z_^`{em1UdhFS}RSR(D~%k}1_eE^Ydo8;B>FSMtkR7MM`Kr7%ryjmTG;b*GK+i%IC{
z_6m#k{ydQFehjgiAJs!EjvQdBCl+ALwD?j9OKwW!P$%{GBwb>$0RlN-^I`1ick`hV
z!+-}}WQdE<$c`%`WTcA@Yjsl-{)ioghu1KW6@h_YO3Dl?;1gQ6XI*|d?b=N_OK93z
z<TPdM8NM?S58X<|vntoyI=GXPntE}m`+c}qiz$GKk7%QfQijxdI0KeUr*h1b#s>`F
z-Su<-?cXeu-?B^`dXxWN9;Xc{^OLC=5do-{W8V+w&3~pfaw#{uwFlMZ2pGi}rohX8
zNtFd0i$7EhRA8et+2&7$>&%acCcZBD5W?&k4~FmTzrq+tl#^{?k@S+Rdi%W$(B)3}
zRDkMXTrFtjN>Fv4&-2B{Rv3S2V7=~|D1P9y*N%6iDy-ZzA^iO;4P)AZ{e(Gn3OB|m
z{r5fX`*-xOPX)8cabtH1lnWxY<d~(Z@Vwo&KYi=FkhiQH?rYY^{Qj)6>3La1p}#br
zg4~qe8tW$2<Jd1e*A7NRnTVp~tnUdR#Aau%)659=WQ$r1uF(isj}{%ba^xY9OEWW0
z=>CBt)kbQ3>`O*2C>cS|xVFA-Svdi7Lf?jZc?AraN0n4@S{WM@J4L0~RH6e*MI&Wi
zPY;ghZxddhoVd$&eL5yUT|JVO0f7MP>b}~U6Ibae+_G!*v|+Voo{Wf{_g8lvfXStf
zGSjo233w6Tw0}ooq$u@SXBV472YE`tbj0A?pqBc2^0$L)lmKdYd54yGyv`}x3FKZn
z2zf*zD1nl|rq3fpOALvZh0r9RCUKqfJ4*EhKu+QN(a#=Il8;Z(e&?e+pAGU_LqXPb
zy!xel{zHx7d1L!tQ_&Y$R#q&!e(Si8A2$xF0}dyi@4b)F@bhby0zHAgq2a1K8tnG5
z2?;rC6P0<7VaZENqvwVYzoJYl4o!Y;saqREe3Peecj==V&-{-`0qFY|*cK?GbQ!<T
z81rBW?vLaCfP&m$0#3pmtrZ6_yDuwyu@h>hxxc(ar{TH1B$VpBMVwZ?Z8iN4+sM$6
z<A%g<0{!R*S7O4fAz~hEV)I=U3W+7ew4qEaLI^9y<ow%-#b)SCMZLG<4@40dA$X1E
zA&N%7t5>$wQKAn$tKI6H4k+LS)bPehV&ymV-R<}AlzBmp+wWa{zi9M&*JDArp9%^J
zS|%pMQOZ_^pM2TSHFjC#Y?SkFXy$sX?!30>{Yo({kkP%o9d4T=>bUkLI*gd8BED5?
z{=*@?=m8pmuvCaOTqZ-Hjn2#=bUEPqa{43l=nuW>Roju2E)84!e62j_^*9y1L05lL
z776@7d;|%`q>6Mn&8%@Tw|#9=JYA+i5ieq=o5uVP#=VKB@4(3U1%dBqW&ohZGs+LY
z)(@N=YFx_CU&{zFnWdl17(7MKIt88n@^LC?A|12+XMw-Vbw!MwJ%o+pc^r7k&#Ge*
zub!|<Neyyb19JPNGAlfb^Y!id74d0B)TKWaG()M<*kV41#j0gvqKy^?-rlD~cY7bC
z)%i}aSb`HAb+n7ufg2tB>KrH^74DnHaH!>&(hYE7N9UeSSw)L@V!XnV{&u#r<VL#3
zUskN(^^~g0O(IOOBg2ipRiwdqS89u-tG9RVpN#<q%>3C{a`_);J!-eE2+RV%rs?rs
zM3k8S2CbP{6FDXZNly<Gn_N(0%UylkSAi~gm9VCm&F~i~1pPbSh;SaFY|oHsExJV=
zVVF96{iL$XVaPyOhrFuVjd7)ZUHzrXx4CnB)}XURdixb0D=RC|nFL;%>AN2f36X#q
zK1vxYP_B*idrH~Kl-;8W$A0^l7sn)3c2`4?ZH^|@3G?u_GUr<kkvqOyeS7|JaqPXB
zTr{bjR-UK=1rx?gk?0dd+T?aMiKOG&AI(2A2lCc-X$i{j&jaR~@h<Or@8R^R_wwji
zw$TayhKwIWGp-v>p%j0Aiobo1Z@XHyUTmPWC6gPnfZ?&OuzHOI?KLb~C-O-$HMvm-
z9w`#nVbJP9NP4CoHx{V4EXXkA3iPrTd|u%^?ShXqZB;?YQv$zPlhMHsl^a*Wv-A*-
zJM;3NLF&H;7R%!*A(!&t+2c9G^w=mn2MPumA1q0}AD(W{KmIkhNv)X;Lhmc(D&ILZ
zFh=2%4R#hktZXui`uTAOfH9gCefM3up--^#^yzdYMdd^!fIT*Bx4bZzwuktPQ!euX
zI5|1nT5hz&oAETam&0=oCxEvoci1jRc>g+V_os%%)0DC_*gncI8$6lp<0-PJFrx3V
z;kiZ4Q)<@2X7^Rv?SOG-Hn@=}%0wFm!xujPv~a#CTF_$BW1V~MkfRPpr!4Rtx6Zv7
zWDn`RkGAjvksVm3k{QSORJY$oEWHU?35(#u38pMHt3@af`uUhBquw}^R~`MuOqn^`
zlET8Z)6bqjq|I;4dgQ%Wb?~RjrYUht?%pCU8VN@t5ko?khVeh(JRh6-fbljmQc+(&
z!H~$2R=ADnBQbw~FM0ME#s{K6bNa*P^IiG#=dqX~J-^+~QYH4Xm-h1mrJ0CxV~b>>
zP|^}CZ1;lrKkvn4BqD9?pJ8~~v~K*ut|MiO$||>15oGCTu=tiunRjS4b5VZ~a0>{E
z^>o%{I6#k=hioJ{dbyRdHYm~70{XErALro~NYv7W87Gt8?Dz6@W5517PRMiTAx=*d
zE%w84tQf*hCiS0-W841hWb9JI!%Qp3WJ$U5_=2LGKa`Vl4}xPH$K&gK)6Ax_Rmcv&
zSw{&I=R$DKH7>>{N2E#nWC4RuhIi29`D3%BqiFQYfB*#{jY#8jH<#FMn~GxLiSi(F
zoy~~vU*r30Q_dmlsPxd_fxo|hb_~Hf&U{1Rr~YUAs+M&?lf8t9=cdtcA@MNqRURbj
z=mI~bFe3v2PG4Fh6LsjPA`p;U6XwK9K~BNeJ~>$X9so)%697S=_L`b2b?~8SZ~lb8
z)<S-5TPDIEu-9!}wXsP_s=^=GOG`>#>2YHq!W0$$94NQWK1%zyP26Ng9A-(2eXmR4
z5rH*f2G@LlKr0D7*6`T6<5G{CqLR`pa$Ex*CMp7EawnH|;}V0DR~2J=C7m`H;h)!g
zDCM-VvAk1tFPx=R7d9giqYVz+Y;E1A9wS-FEdCC~0c~jl!;lpKCh6CGF&gJYBqSmC
z*g8PS%)H3Cz29`<>Ar|x{#zq<WDA9d@M0j}t09a)$zWTWnQT|<_<VkxC$cb<s7@Y=
zZ&5siB@|VYDrs@lV(w?tihlH&fhJ&@Xn`c-CLw;t3*xtbgJM~;#J)O39XNRJJ@mCb
zz5eGJw*M7Oc?FA~a;}M8{hm>FH%Ke%=~#+z%uVn2YP#GNJb%;sBU?kW`|FI2K6=?Z
z?E69ap@o)q5ATaAd9OQ{V;X!&OlQHo>~GZ6)$~9*+wi6F4lcPe6*)N)9{KM{!hL!2
z@3Qj$Ksj%Jd^U%E(AxBeJy+BvP2?l*!87`kMp0+5jfW}Up^N887PK9`^=)jwK4E!#
zV5Sui)2an}anNpek}ywwF!p70JF+{1#%lNRS(Xw30l`48S`zsfshs*N9a;hVwU(61
zXaB1OcxeU2O%6O47GGt>#jk1GO-UTpUUwwC;`rBrD?W5-^`|rT5s~u!EgU)S_F<Y;
zrlwBCw^o%T>|=e!EU{W&yb*}`wG}nqhBA#1QqPe20WR!PRmA2%7jrO@85sqjPf8r$
zBRlG}#M>k#tW#pRa*N%@6POJQ%?+k*zS~ohZ3}GlI~Ic2uJvOy%WGR6wR80Ab0ag`
z_O1IShrhKRJ&I^(kVsU&3AF@t)nA{PLn>6>FE1+0@zY&;t#s_F4~Phi<3XK}&WnI5
z^5f0ZXmZa9|H+?3_+%uCik?i2Ve4-eBd9pJ3l#Fgv=YC4b3#p@C|4uus^-W~mS_tT
z152jvWJtsW{?k_zaQjNgP>Z0_UrCu96dy%@k9jS)-ahbUyn(DY+PtIiD$e+AZ_=H=
zmhax_2^HcDQA*IVmw)836tTrXXm3hpsSKut8-J9h>1_KWpS;FgM3b>`N}?HTbM%Ea
zN`Nj(2k{KiuAD8{<))fZHne`Q2WXRgU^TtDoYq1a4v{;3^_AL`!g?&Re;_lm1f)YP
zEv|omx&zID2UWdue9W7t{+t)yw&(+cy7P<ssM1l{<m~wkoOzbJY^QhG&8uw^mR7bT
z=Mxux4L4sAZL&rv*!{(+-EysIrDEi50@3kzN{7>_^4E-Vi`h;_sBN;Hg(QaaR*f@(
zfG3#tzUf#cxudKTxw*MIU+*u$wm`&7T{Q9#1A(M+X!(7|a$hmv`2yeJ_8OJ-Cs?LQ
zN*<75Xtdi@2Qp(D^rR_zZ`3M8G6;`u-DJhaG)77^Uo)uuS{eGH@@r#NYiT&~m_$`1
z^Q)kZnb0hF<u82F3?JHwh>t~Bm7M*K!|?lTmVCc-7Z=WeK(0apK*ZGaItwf7_4|Qv
zgcTMRHseBY_0`VHs!`!bVGMHwelRG6s?Xxv+-$q>Z(NZwZyd~|Myb)$8)5>av8Gl-
zH$Mw^3E}W4X=ytka|izDp7|YbiKuT);4m{^!4G?hr&f&{BH5y>aX^*MxHvfLhhg*%
zKXW89(L2LLD*|nTrXqjs_}<C&Y%pAP63O#enxcVgXFi3A@^yiJY-~v3+gA~pIqMcI
zxPL?iV{ma?D$Y~!Jl(00<L1{r;H^R+!7sxF`mId=#Wx%b)T}gn(UFnU^<eF9gYvFD
zODUop*t8(PUuX}GF=-C@#}<6P*epyl`e|xzELbieu9c@<lIPa?SXtiQ{=RtqA%HR5
z6E9MLJ?B|(Zv_N4QiKLc&=_JEkx`Z~+Xm+P<**Zg&XZpfpx!uqcF8EXvxZTO^s`}F
zMIBy@20Y&QNdtZk&Z_tLS}IqTsZF~zIn<h1)^J>&OX>Ndns(q-wlL?J^(}d*mexC?
zab7w#ovDp~soJ0ZyA+=2zQFzQ9)5BZhLUy$CzH~N6uzZ}Z9ZOxD4kPoKJDX*=NvU7
zI#DPxGgn5X-RZ1|V|QJT*IOw=XPEvnqgNH=KN*g;N-m087a`g>*5^!B`sU905RNq{
zj58@TKrrAnzvMnVtITv;AI&c;R9GJ^p`T2Uv^1O+ix!<VkoO_*4EQSWr&#2c*~d50
z?{8XtExb;yL)kPRV6DcVVYhBTE{{#mY0~OR_@S>lEQ+}INQG?a`wLII3(eG8+AK#T
zHG<xSZ*fY~tf$FCx586LR!X+8(s1(wRR3i0xmdzFND7P_{>T@tj9pvWL~_mhEcxl?
z3r{Yv+8oAMcgp37Qq>X7dg0>*EQw(l#>Ut@i*hf$jkwEzcvzh%eCP13>m;Zyf65UL
zU#{`)bBWghc$ghZLf;c|e#368bfy$s85}#H{e#2{7^}2{nTt0#Cj32&K3w+vc1e%p
z&rM4LBr9g6{9@Gj<eZ)N>Vcj5ENtYPU1+=>ck0;pEeQk-2JtO!DdN>cw99_3mEl;a
zMJI-2qdN&8s(-J}{;TD<dPAA>Dz3ERvHL;9@snN$Pp@gM@1_ZFU+}c-eZ%zNySZ#n
zFALBYMOHGT98-o(X?kx+kv@4icKIZ&QLzYvv@w#u^_<}uePDNw+^tXAr9U#4ziSdg
zFw&u1@LpQQ2Xr}V^Db4(4CV71OV*HHE7Wh{*m{SX9*-X>xjyGbec4blguUt1W1#SQ
zvvrB#^3xlX!b5*u;m0OjhXk44##+KQ!y@y}A8{A>;WZo=I7B%4bxw@T6jy8t%jD&B
z$$w6F3>F{E2?Eh7g1^H?<Sq;4-Ml-CJ|mXUgz{8Ey*!gfbvznBPmj)cj(l5j-EnVt
z&`7EvU2_u;5n*+;{9;;0&KBoWNd*U5DBr`Z3(B}~9?*b%-%=Zq-TI36-EBzQZD>fs
zI)vKjWpxbgLCkxzuJ=z@$*<mc{fq)ZFaP`933q}jbAsy3)>1eyx-H;V@~(Y{1_^(v
zY=Dda^s{b%BwkopfW-=-r0pF*N>|*S4jp@hk3xp%{Xo=BG&qCRA4m<ltqQR+2?z)%
zf%DCArUkUV%I{?nu3OXB03t{)Js~@$>LB#(FktCM1k;u9D^yfC?(TA(C^=ZEEB9KA
zj@wo8d3aQw+@nvC@WXL2%wZK4PS^`6o|qFy&pssGCa4qLnQ~|qengyqpG>ZkDT`0b
zL6<!4Q}_#-z<C4#<Hq%9JfDMCF}SX{^ra?c$}OjON?I1kUfKMy^($j15|KB#@NI|5
z<!%ZGk!Lh0V`|AcW>EPp@-58AqJZ@I`{jk?qw~*0_+eo<<tV|~iQu%s9}}k@HOCWn
ztD002Z&!4l4n8D6Ai)ZITL-3mfa808Hb;+x)W<}6lrwo@@1(yvUOpg5tXXFL)Oscr
zOo>wwJQaC;^i<X_hhavdrY8?Q6_l7r8(b5i)aqVQo``ZpM~HoSQi85sjp|TyuvhFY
z)r**nu158~ydZ9T-j5iu6hQds%e9%YBuXFV<a0jg`Z4y8Fag!B>b3DsLSOx8Ha`J_
z#_5{d2X3v34&2mSEb9J;9Vele9=^D*Pr3kU@^z05ZXc{L`&m-4Xe~p-Bh>z&Y<iVt
zC+-UXSLtz6fn{3PRwTLiWIw<tB0ZIF)lR_zeD*m%B5$IY0uUB&Qi<f9@&&BZF8NQ8
zGPrbbaA3zveI}%9xEHX~jwc8m=Qj*nm0FLyG5XLaxGhsHSFK)?w#_!BZ{n&q8o`g-
z-M08RGFhT=Pc^|`JueJ-t8^6IQMGAw_(9N`hS!6WW<%I{clvno`n)v8QK?Sbeb|X(
z=9vz(4@A1VNy##7kJ1Wb<gU?T(yBkZ<Pc>Yiz+#4F<B=ajypZo;kxY}rB!}yr@w*K
znl3PKx`e}>(89t~h&H+V0g9wtizS-f-L(Bd!L?><JJz3jA?K+Hh}8~Rz|o{RAo1Ae
zdGa21&>Kh{_0mL;$}_CE5|b(S#LhYHZEWAuQnyw-osE%==r#8wnj^*UBGUY~qjtvo
zR--L$gIKF?u4^Fwb%nCW=N~Ap%#tDbwV5Q!JB|GM+usK|g!^&y^h{MAYLjEvkV{Q^
z&{Dckdbn!st5nM>e1WsFvMy!yYId|t9Kgfs4a&x%ciDf>F`NtHXcZ9e6P+{~7x*iz
zKy$-teQoVMoMmotb8*T0`AI`(2y6)vkjVQL@+6MavWxE^aNUW?dRU{Sg60MiGTc6x
zMV(I76;vJ|WPU54Zlxt0b^mEH7g+D-7xX=Lgkws*e%1L1Q!&N7#v{?3m|fMbR93$S
zIY<m9Ha11O!WM4XLOvbDp}MgGK7^Pn+!Y&Z3%$pt^EzD7zg28>gui?Zqi8l3W00b?
z)}_M85PhN>A{J0c4zyKRBX-^#-({U@|IREP$MdZDfQs~n-kHWM%+48#E*`4)B!8Ks
zUwkh3TrOj7k_?eQQYIFb&W?^aI0%OeDDWnGWScbF?W1z0S|`m7imCrJ0!C2a(oqpN
zL`~H>u~q}ft9KRJeRGEoH1Wk1wTE{A!_r+{U0p=Le1bxe1*l{E;}D-=p}mYF?_1gH
z=6&b#2cpuVG5`E*0Nqpf6JqN>4%LV%#DHr!z9+@u6Zrw!i=NOag>zo*D$lsqJ7Lk$
ztBNQ_60J<F{KMt9tuq!@XSa5<L%Ifga;sOyGI(1<;o?(2JV#hm3!3@dNV@A)J-X`R
zghM}dM6-L=criYXa!-9L_UPgwB#ZhAI-MXm#vJ4O{G-JIE6|`6AX=Jqa>gF1E3bM!
zxd(59fM@;b4Yk4ndz8<;f<-6#1jK_-14xccAOD}x&G}ckeT}yNj&XJf5&s?Xw7)V$
zz?=7<PieyZ-;dVu4_Q;U0fNeRfW@tLdU=Mg?EmH}D|_dD%_Wa|&u*1{-m8`L3n;)1
zNeE0{<T+a0_h?)ero5R&KN*8yBBH)!aeTP6GNZN!qx4{qF&H3@|NYXu5AE8^2PoV@
z_ULlzvV~Vw^`#4*&=o|AS|~Tf3k)}vdOindRl1DRqM~e|TseRxA>X$3HsGMi=3lG&
z1e2E)3C>0sm0Mt7^eR2`oE8Ubd>@!Zhh<O(0ClSzyn&NLw=De;{`eG{unXm7FDyE*
z=iC1!et!-npPc{63JtJeEufk_f3?I<*4F$MptW9V{<40ju3pN@p*GOk9Z1%PiP6zR
z0t>3}@88vH^zsZpUmhwypvN|R=cRpQjttTivI&~55|X>^Eq^_-wY5e6ghQ)ALPCPI
zk^ND#L+iz1Go;<e0_IS+`VW~eQ$UV$;Mgk*n>C5G!>_h24EDMaEsmS!;F;iVx*vF2
z>k~rgpp)o-b7I{c2x7M|F3E4L<g|^H<vQ1XAD!%iv2_ooL<yo#&c<4E$rU!#iW)mV
z-M>l&b1>+LvweHL>bVR@=%cr^f|y`x<^aJ{Hhf?EP2!@Ws;p^rETPUVpHCAs)LH{P
zdK#lE&qQ9{vpr;h{+kAZNud014hb~=F%V$DJNS!Ak<OAcn-pZr{RG1`$`%v`UU_$5
ziY+$2w5w;WTc!B$uNGbFE6if?0pOPthAX$oHnzV0l#1}ZH68W&j#=gx;-f|LtI~|x
zvVX<57Mo1Qa=9?~e)8OXQ9bDZjWB5{ga&>f%wzzPY-3|XPDd9Gb5=h{DboR@{Q%Dj
z8$W+^IZ>q+We5ykSOf*N<+UlFi%(2UF{H=G-Sj!%A_(o|KmRd(cU0tbt3gAgYd=eM
z!?|PNlAH*_HK$+A<5e%NE{xmn!TqC}{X~Z^a`HRyOrx-ydeKy>M(A@DIJ~KX$zRSk
zePobu#Ro^v!SPh5#_*Hrq<U<)rre>H0A0n^?Bmv@WakJLOB>s6Mav+wIDxX3O)NJI
zZRVq5^VYP(p2uj5LA<wvqRwTnvN%7Xc@c<^qvx$hp0H(NAj|_|-=47kc8L>roR<S4
z)Cm7(8U*kH4OSrC|C9?Pv*ua`lvsM9yTx1VCyhb&_DqA{zbhIW(>aMEPe0$*Q{#2j
z+)F8bnI6>vdOmJo0Y6SaAj02sQc@~0Lnk7b{M+B@CIh|vzjVD3eeRn0lNAHIi=Suc
z_c(%)rm6kExb3#m?nf!_Kee|0qlfqhAQi~;y#)<qkhKAoPm2-<#K9#7ef8HXKYv~Z
zR5s8D+W)4_L#5OWuvYzt4<GI|RxCB>;%@~%=e=`BHv#%v(q8TjkBH2nnez8}92Imb
z(*y!gzI%Ip{Ml+B`25A^Kx%h2=Qi<`D?S&Kq+pY#Px$bm7BUw7hXL1-_3Uda`#4-@
zaM<H^3INBFpze$7%>V?b##aw<4L!$!+*i!19EsE^cv45lTk7Wu90t$5D~)!EDA8;1
zEcftOng90H0F42yjIS8Hn)zK_inaWQw58w7z<rH1{^21WG6t!dHuC5ms-GKi>md~-
zrP#Lz5|1=zDM~tncJ?!tm9J?XSMI{1qvs#9pv4J72CA3zvzm_ZeQ<JdIc>nhNcTKM
zyJ(~(du;vrFCh(R{app#C%EUJI=@t*!ml@qF<+km?$cf^tKr)GGKfmFwJAeh{K~b2
z#YYdSpv$WTsVY%^{(9$HKcr4Xt8#*_ccpIoIXi#8e6C534dO%u1!Ij{{iPE=ek4!`
zGk;exX68czy{443E1Jh!joZqA`DNq3c@tM6^({6oZX7J+n2u}@PZd#MM#F?N<_kKQ
zd|>eWB8u)>qEuQa$V>Yy^78f|JgEkJAFNR4C*P0e0=9Q2Q}0^BV~Rytev%_wNSz1I
z>K(=ei@$Y-V(BzAed&FIAkSoivGUt70Q6-v-X<5Im&17o!E4vVwx65(4%(@sxYXv{
z8qLQ|Uf<&5y9x5HFW<jopM7-O^!)YJLHI=S(Z~jqYi)-(n`3Jrc@W^oAhoKqqW_=~
z58wavZ{DtxlM~Q9E<ro^%*Vh2wG>H)H#=B?nKL}-ztCjZs$&z!eaEdpO3aM_R`jIC
zpk1d&2L;ZD)ya{P?Z1*VJn2fh3kbf_0MS>^BjP_X2nKNAyw$guNDN53dUE!-q*9eu
zO&Orw`X_X_7AtPsvllm=_i^BT?EHA=`90v}PS!eX8y%kf%u$1H=6E{*z5eS)q~|ag
z5IY4fdx~#CsXPxmV+JQ-d>ksg??WB$d>yQeb|gpR_-Dk|a1lWH233pxg9oIX;fuvu
z6D8>6F~N%0Sje(pM6o6PEq1e?A)oa!lrE}f!iKNI#u8CTTGI2-vFmBYI^dAfPQ+sZ
zD!~dk74o>m|NZ$)52}f2{r4?-KBvc;dnQM71ylt<@7rRqy}5N*nHESLYabf0WYO@3
z$oKPkGTlqa)^q$-(LWt;00*mPjhj~si;A28QE(ai+W(A}7*~LJ$td9`(0!lWb|Mrk
zKgujvy?o5R0pTB>EXD+a#t}DLXT+1cqqB<tHayHJ17TEBYeL}o=45qc<?Hn)XqE4C
zc?{QR*ol#T)k--!_v@zdO3jd=(|BbrMB@q9ftMH!Czx;g6Pq)QwS(_vp|w>sQeg*!
zWC#ObIz(G{;_=jXk5^V!_KI|&G_kBn+Po?<br2;8CJtbX1Hv(SkFFOr<4H(2TmNkz
z@A55%E0cA4n_@I+PEJr5+28V$o3}jckclML2tU4r%D-ip%%S+_JY3axjW0%|n)DDR
z(ipSGD4@G`rEl45?$LEn`0on=SX3K|4w;M511VVM-BfdK=NDYGbci2rlRa${KOEG*
zc1cLb#KO8lNf|spZxI|CdK<cFu5dfk{7+x>I_VTpTJ=N*>J+eP6dO>%L#l0RN&-0g
z|B{cvGe@of(tP0YTUHpsADX`L?@)eD0<QU1=ul){u$)6XH-?O?IoiHqGdKOd{g=jF
zjhdo^?c#f<am0UYE=2PZo!J8d<>X*I3#Z`gI7p*g)PM{GT6s_2`m-pmOsz1b2<ip+
zL62Ft1}{F&Rs$*+8e$l70vih^(g@(H=k%j4&LDi5^l5UR)UNQ2l6Ku!4mGIf7b?-b
zuX&k*Gtl2riL#GnR@R$b%o7mZDMFuZHJ;<URU=1GW5kFGa?bi6glDD1RXKj9%wo>V
z_z5vFOx@`WCdC2ByX<XH6un-b6Tg8ZYH;6F1sLra@6AE^w87m2K&xLJGXy4l=K!H&
z(v|u3y9}<fvW~E97**ToXRn5{qoE#QV`s-e02FF2C2?nQ@o_f1+{)RYH)R*1yUb&S
zU#=3@ZES4;1a2unYjOJ{!+rVwI9erUfH(4lY?}3es)epO#p!V4Vg0@bpWySc#MYvf
z*|=gqk5<#mwK5@LWy}N#`2Yh}G-@azjrh>jzJ*iJhJqdAlFw3Y(T-U*xN?xgddZg+
zn5)8MzT9uzr?atMi?41nOG^6OMqF;@pX4zF{4NfDi$K|GT?wBnbvSO7-TX1vll4e~
zQ)_(V$;IILJ+gLPV_(1VNJxEuyi$6!)m6u0k$`j}Dq#xM%Al6xWy;60=|iT5*u@^Y
zg=DlpVghlm;NJ4~$8%|K1XRIv-506*7<B{9FCA&PjcR?>O!u~yE9}v*Z&gD*$A0r>
z+V{S`bwANri_x{C4`=Dsr_FBYN}#b;F73CX4)`x4;}90OOwT}e1DM>U`xpX%=anxT
z>wGDaot1@2@djHVb7%o0zpU)FS=sCVWG;0N7wAfJCl<TSO;;Hlit*JYh$C7yJa8mu
z2Co~GnUxq<S;t;Z)7B(Uh((`XNOmThAajcY%y|QnatS&GD3Jl5qigz~`P>l@Aipl*
zy7MB^YiZ;P<g8|VW<ekt=kR+HYu5q$=6K7zey*rP57@-h5|6v^5&7ev*_$s=7kH1Z
zgj<|jEkS`ESL1Uh1#viz*1fA3#p_Rg%eW3-+bV0@sJ-~zyLZZTG6h&{&ydWN#Uhvl
z7+FuM_IC|-%J+}H87AwI8<7>qM6AdHY%zHcqsi$<eOwI$tm~((QA>F?@9*uM-`w`s
zIJY9|E4N>SdhZe_jbM5f?KC?kU@aV?3;U%%%+j7uz7zpQcgN!ju|<?}_7B1C7!6{E
zJI^AMI`<WTQyquPFPFV40+r{?TevL`W(%iMvF7QhcU)zYrpolVzpjlG>4O`Gt>xr5
zefn1Y`oBkqK5$~-&QW~xm+{snB&5ed66s^;X=~IR!C(mk0j@5_K@M^8cs7pcjz2%T
zIr;e9lTFR^g$a?ks!x9{QLCYzRepqG>@YDvgcIAr47MOh1U~$_m-pgZX?f*xz;yVa
z{xd||Ucy;3BkQ<Kg++Uirvm;>^%McOpI!IoPHqcn_%H7MqEwQ;htK4xN~C~K&1)9?
zN6-$9?|V%8K9#^&>%IUlZ`6~fNm6-z8mG(}tcH8s$Tm*=^*(YPbDWH*POJGsp`D#}
zta+)K!R`?ih(Kr;w)~b*b>X%+uy-ziPFEpX*ii7e$y}2byxwy2ahL&O4o(@1-7rIs
zE-~PN0-iw}fq=A$z@#KPa)o&f&lixa5)Ns8`S8U+R-<HMg@Pf?VIl2M336eF$n0v1
zWRL^sD>XE7eh;Q=`ZA-H36KwtX1KV99`Vb?ho4;@_X+6??{<podF{Ko&=*x1^AeDd
zxZOmH!e*zcruHL8jVApIRG<{UlLa<p>_s1l7JeUh9w%17Cq*s$JlSmv#PZyz=%s9V
zPxg!;$&&U8!goI&hlqwx@!xn29|~i;&ESL{ibsrT%_EmW>@O!M_uTcsFP>7(@<dGE
zW^o5=l{psln^KM5^6PQ8a5K>vp1M?@n;sD*({sZ69M<?kcQzO?9aA$m&oWrHk2d{=
z;S;sI{KWB|(Q;(&^hHZ3Mw0W<83nE*AOE_lO#i0snhsaEv7}{3@Bw5a)WA)LK0a(E
zFtIZzF_s5e?L=R}bKp_yYC^p@S^1po>$h*0(FNlT2oIMP@c^s27C#V{6O30_sYHC8
zOIY69ApEG}Fb%m7zVS{A;f7{jA&we*dfc5--*ma_yU|Z?tNc|{zz;MlQ+e^CU{DaP
zoEBZXPUq)9a1sE9Ih6M^hykhf@F>Op!!MK<V>ey*gJ<1boVVs*B}<iBe*@zA)-}|e
z&}Rn}mYCtqPAJYHfv2sLj1j_D!<V;}dDrce(c95n{sEjUZ~P_8U}xZI;@w^kqz$W7
zSmOKf&FzLtNA*CGaKvP@PwhE`d~<_j1){xx@1qqP6EnYm!6@x5B<%gq+CBJ)OUR|j
z1tI0P`q)Y2$!pP@4Ezz_%k6?ix#C_gCvUXFIW$fu3wxxFoE!%MYB1LRfBMl;GLSy<
zEuuveMwEz4L^+uJD3vmyRLkHDUxQu1SQYgzo(_(YpL#bd!#Ts9)sL)ZPCW3xw@qN3
za|8RezIgA(@cc++#}?{&%G=$wAl*v7Dwp4kqa*2YaSB{Vg<s&u_7pj)#dIudyWw(i
zp)_7ASFyY9b>d^0{>V;RwCi{V^?KrEs2mfF2<oB+0cW}Oe$3T8QQD{G2y^b->Uso3
zwkW@HSAFwyV$WcX%<4YGARnlhS8z<#ygT1K`c$8TwC`zfYn>K}vOtBM3~w@CZDJ6`
zv>fF6EXI}oR;*PaGsClQ?#^@wZa!GMS}ZXCPqN!Dit#_q93I4_aQCvAV}|j+irxR;
z>RD=$%YKM}4Q@xAe%REK#*C3a`h&;WGBB}<E8I1Iy?ya^K(~L~CVW75a5{mEl#nn;
zkK64$E%!xlB++xPjSh8UtMrv_zW1GT<_^o+&VgE(9Y*Z}2G#s~_{`zJ$|L|S@&3Gy
z+n|cq9{iPAM#ilFsMbd_ZH%xj{YqJD+Fbs^d;S}WGx~db<{XG}-y!F3CzWM;<El=8
z7y@%o|MjsA|L0zgNx8kKo|7ZhoSzlZMbomZ)-KIWi_4b8WJOxlwPs3J{syrgEQH6@
zy=EpQHt;#UfY1~H*FRc#yOqHj+QS;b{Q{9oZYO(BYxmwVN{2%cp>Q)^o|966iCie|
zYg|kJGnXdF6d@!e9D+oLvt4R!cQdxVxd8Nac%*czZAJ)TdSR=5BahRVFE%t=e;ljO
z+w_fsp~;HY`~TGfc<67H5QkbW!^!vz{MhAIy`*rKzV-04A|kK;Nal+!mAP27bfXLN
z`+G3B%!&;rr<&8<)`eD6FqA9Nbc0alNx7@P&oF&6WqAB3t#v`~WAv|#?wqPyhF&D$
zauJ0QmHIfTXmr|kNbncU8<SBn5wZpUyszFO`xWDsF?8|GNs3ZkFDcx7_fZ>z68lKY
zL-u*-qQP0_5=9Il2}|AF*u^6b)y5#?gyFO!T#t>Z+QAa3X0vF3R6-643?XS*V)J9w
zLoF@f)8H2rvI4YPMn?Fl4?GP2=#mUxi;^Y$as2%U4ArendZ>p-MwnSxI`Rnqz(3f!
z%9!WS$lbIB^;z-H5z_<XXa4>&P|@L%G5U%N3Rc+Z>r=UJ&)N}@k*PqDTj}>?Yg}8j
zy8lh(^Gs6Gw#5;2%VdDu_S><t1S^lX-sbAts5jNslg(0YvlkX>Xo=2hYGir6{QK)B
z(tfR1m(kNMgTg+M%GvE;+|j7x#JKgacG$R;YA=Ns{oWY;fK45P2_BiH4nc;mNsr&8
zRv)JF20SlZI{hx@#U17%ZV8J+jiE9z*<d5T#9EH|-q2>Ds+<0xg{mk9V^~!X0S9>q
zk(MEQXz>6tt#`DLaPc?KKaA87jYn~mpc%)iFp7i|vBbScY!rdHFQE8`s|DBW_D9Eq
zHT`_O!kZuTa$nFvNFkV*JIgIQ0dCI}dyiqy2nWtz@_D}&pnnX?1~aN>Iz=PSfpQse
zT)PZJ_wqU+0#al_ylRg5iNd5!wReLY({ayzvmY=Q_5Yxn^UK0K^QW!aag^w+R*6wX
z76S>-z$K>cf6{A`iW|4yoXaMQk}aJb;UN@Tk6E5zXb+8;$(I}k1(7FDKKclqEhXr(
zT_z-b%zcp}=7b3+#>+MtD2IF9i@l#aWpB$rBbs~|WpuokeBCf$hrbEk&S9-NweuCP
zXir&2IR5#VPt5tmX38ig!oC!}`S)xySk`c@k!HRayJ`rljp7y#(iheB!JgpcV~LAc
zyxS|=bmu!3lIYn?CPxB{a`fiu)*43Lm}POnJ2FwK!f!Ytu0%Kz9xUYlsP2we^K{*0
zRhKmjxz7`fywaX{ln~B{7R6z8y+LX*1C7jd6-d0HB*gio!v%v2c(^;)MCqacxZe%u
zANgNG)=A1PdoM-kAEZizz+%7x<3>2WVFn@$il_i74}JaPgE4csRgkH0y&jQP4i518
z2YI@tO`ccagMcyt)Tfybs1Av*-BzTfr9G|}Rc!;OSsILC=jy&hNP6yAOhdX-3n?*i
zN{>G9XPiMy2<emw@hTVypc042fhVpy9Xb{F3iQ@Sj#Y@doX6}$Wl*#~;w2&QL{`V>
z)`3h^-ldf30$OC3c@MTYnDSwI+}-eXGjs|7yZP#HbINC7JEQ#Xxtp&~DfYx%00yW9
z7irR;ohsGl{-SPqLo)kq$w}qQoW8hQ9_6tV(fk8`hbb_Yh2)KG){HuYNCg;OXe{h=
zw0ugNka%6k8sJEFMd<UtqN1zUsU=WGn8UWU0WOL+7}Hkc4`6LrX+@p#ys$}LZ^@na
zZ5pvj08+!uC_|y<b^V0*!&w^T<fg9(f=jO9-?;X=&EH&JWd80wg{S1}#6#<Lf7phW
z+J5IIa3tk2LsSLDn@fuN<+BCey0EY?ImjqChS=-Nx~6Dk5lS&wo8FGMNS2?0ApmX`
zESuyY=z?BPHZ;e8{->y=MGpT6?-c`cP%b5*VP9);vAWwr2M*|Za9~I221h8wzEn8O
z$uIzZPdEF=mwNXKsOsM(82TFennujqzq%rN$ZsvnNkDfsO4`fEX=A*COF4VD%;alp
zO$~K#^bJEe!(4WHyFWkeGtOpCYk_0*A!457<QHazlt6x}lvGx&&HnqP#G{GlU$|~5
zKCooYGWWfLu&5Z`KFYbVy1X0%Mo9Hki34W{qq$B_t`(D>9u1jLnUL@Soh`GkXZbq}
zGRG%uBECD5PMK|pNrTr%qrS=kE*XfND)LKM(%|PK0&8;u6e*vXlkKgIvHdr)ONXfU
z9z0Zm&ua#l2g-7rFw>d{MPnaXJ#BlWi8C_nZdit(fz|gbOizlw4GuauC-1lXp7%Y6
z*gbtWH#g^1ztX9syI~cC;)apqUJy7%67rc4NgW!L%OZD;J)b|@@tpA0Rl~^q!paQI
zI>l}!jF@|Db&d;|kXsf3v~fsrV!m~Y*t?k#o=}Le2{O86@6L-e3hq6OU~(9jg4~(`
zF5P9)6re6)Pl2_Ki8_M5U&>Lmxcmk;H@6;~dF}#KUBG@?Og%+RTM))K-LMWqZ)E3}
zrfg<iou>fe!EP|zV!x*&#=*UZcTE;e{w0+oq&dE;tg56TKjIsCrEEFe-FmeKs*jCo
zZo05^vznLJpqU>C*v}NVej;l^%uGE->RDZ?8UK9lTUi{O#$lSWhL*F>)Bp2dcR1Ch
z#K6#t@4YPG=p`XmEeHb(ruj_Z<=$?C#`FT5hoM=UC}7!fuXOKcKx;TzfONz`pLyxl
zj@)XCcPj4Rxy|m~tF23IWIh?q+MxtjdpLr6O(Twvk8hR)JP=1frJ@HZaw+RaKG#rH
z!|>9z1#F>jmT2WAHq<T;dSj%NxCFH6?q!O?DH*0;I#i8yYPwUtmkAfz`uaIGW2LDI
zd>@LECr8<w^v${#)^XMG@!Q&qh$l&6G9n5PNxudy*L`~1O@1mozsXrpDSz{m<;bj@
z^&Qp5N(!a~RVUcXQ>1;UFVlu#I~<fnZ-lM*gpcV`uIylzLp4_CeZUPPtXI&$5g^7Y
z&?5xoQ6hU=H`Zl13OHeiLH7hVQwutUkgPbr@cM?q`T71}A$Z&}YHAL##TqusOzJU1
zsk8ljS&ZGnuz1PksVUw(Ak%DHNw56Dv>nGG9!&0~p%DdRCu|`2cfbg`5Z>=KSbcS%
zHeiJsv_>Q{*$FJ^)>>LG`@g<ZWhK8dLG~=3Izc}~;G<CXE$SI2#P($wg3xkb!lhe&
zGhg*b!{sufq6$R*R-h<=3>8j<0NgifaD-R@+Sv+HS{i$kpV#LbMCY6ZbT$SUJ|6Gt
z+VM7JzuhtwJ*?T<J<#p)qxziAV02c_(-S)#+cUatVso3%Jm)I|Vr;x6Z~KV#TpDN4
zu<2rGiZDED>)WCG$F(s|vNru|JFEX>OTWoOj7}4*J5NQDlV?UR6V8Um#)_azMYUDK
z&dx6Ewf$C~K12A9n1Q9zizq5>S)w1JOHzF15+QQ|f}PxyZQl{fcLGBN!iZV>DQfor
z$%<IPGDZw1`ku=JEnfi8L&avN9MfD#Fb*%ML$Ga!K5twkM>=WZ!71?c)cb6nlad=7
zGjOsyp6&a<fHD}+n_&U`49HnyaE?!IbnCt|WxoBVFQcfjuzVuY27!lY(ls=E4eQeD
z+Y=>^L@PPGNCpjc3=9l@2NPUnSVk{J%l?D`4CH~O|KU9`A4}eG9T+qc^TW)QmZtKy
z;;ngBRPj6B)mQvCvny|FPvu{~4B|R&jM^Lu*qGP`1Wh&PyrzZ9=XCatgmVWdT5W4u
zBi7SxJnN-v3Rb&+xwId6-B(rB@z|a<y+Tbrx>56<2^JH0;~W(KZPnDjYNy5|!eJ;7
z%A9`IIs2IP_U))~4_=DZ?##N}>Uo>%ue^COYANoqWJy!pk!+oVP&%9HODvbXy!@Z(
z`a58Zuxe}!k}KUCKe>P%9rqP1Nv<2?SKxM7Pu1|k<N(TfC}oxc>Vxql-PW)H8xGPk
zlSX%qr<D_+i&eYaa=C%d4g~@;8`~3xF~LFrHfCJAqe{51<x+wl*^hbG4yW{d59|8@
zoq-uK%}S_}qGB+Bq+jQ`z?uSUM&6LzBr&83;zWZ{kj|p|4--*js2(*bG7hV})Tn}`
z<36Lv%keg9EoYy85UVf4iJT2qisehj&=HvYFN5>eN%Ci4QG&way%5-kZq!vhgc|u|
zt*Gpa?qD-A_Tky?k+|;8PaYx*p>@aI4*gHL&n%`sF~@kkTymKkhY^}=>70CBD3-}p
z3<p~-i?Q;+yzSclpAIYr+cujn)u`mS59rf%HuQn)^hxQQv=_@c`{1?WKJ;Zl;Om6W
z1478Hv)sjt4fj<m>2_TdQgi{M-lP=5+2T6t#iAPRS~4Eh+9wLV&|x)fZM4%swfKm-
zl2I}xV%`d#kL-!;U)4B1b>#AI){4@>(t2985cGDw;f>t$8cwhux!a_{8Mxg-4j#21
z@Ydog@iV-_C2=MfQJd7bBBJ&OYGbIzU}gzWS&*n+u2N6~U%7e}D=8QH>rkIDwC)Cf
z`EpMQHX+BgVJ-+RCW4J#YZKZXb8xO@Cdc3T!Wx|cjc{DYTTdW0@*^b`V|d}>+|F6r
zpwrrGH?jS@+<fRN5{e|tl?2Z?R!YJVh>#42Aq7+n#IQr@{yp%nuVfjTC&+-%zDOXl
zcu9#?-Y2r__X<-Cw5FQ9OGP`($fBK*lJ%#3L$F=gOUv(sLiuQ@LUmsQJmWW@tRE^e
z<cDCo3}#=85o@6akd7Dt&*nY^L{1MJO!R*}!2okKt<0jO-#N0ybFtoQNY_B`ouL&f
z!ol*Xf+(@|Qe#|`-IT~4kcoCx+f1|Y>pD#<soPT1^yi5%d?MugHVK38Xje|ze~^04
za}EXd&i7IAC>cqIC7TLKABt%&O5-G&`3(X`ztwOUT^!_VXH&wJwz;edo=wgCJ%+?U
zuAo=w#P_TAk19tq*|dJ-+1X0bF}L5fd|Va(Glm?q;A{8;c?E0y_WP++N(Tm24p##c
zUn>i7MO2?o6!^oEt^iVbFaT=l>b`=G9(YTwptT^7-2XNS0XMTq9i|n~QmLyGgFzE8
zZ!(&i7^tYIp!2L^V!{9=`du?!Hyo3M&-wYBN)X4$XVw%3at2^`ure_r;8H2V*Y^i2
zUqrhgHsmPRs#L#8xjt1x<x1l(uf3JW`4!D*NkLDc5_S2Bzu{o_lJ7H|A_Xkk5abFF
z1ZhbLq#L04>VX7n4~lQD@o#THzYnJxq>2}@mA0+$D%A)T2UBb)Yr_m{;g>)1h4V3q
zH)hfEvhhY<<}mks<S&%Tm6MmBj}L8t9`Nsde9h>M4<!(2(~KJ3?X;p9rEkhYH2YNZ
z->a=?v*3YLiTQ%OILuj3Kjy-<s{G<Y#cyg33nd)NmU?;l)Ujyr^AEwI=X<`}+eG0=
zzk8`Pe26!HGvvsg+0)?}l{z%__6*tOG#z=nmdM!KZY*yXHRY-vG#LM$eYfGJO~IfP
zXzXk{p!%w^db^Jp@qB#?P=;AalfN6vxP&~U46of{jE&Z#AtER~5wH7%6U2E%0`CWB
zg*N%UU@<NGSFso@?3i6QiC<Uw1T~1`v^}nX0NxBJdT0eK5U_<=3ejEP-|v5Rr=zn|
z5IQC=A>#N7g(Du=a=)x?PgHWyP5*-<>RZ%zZ;DH?JsfcUxHkMgb<VyHlS~-xt;Isk
zF}bQ&m-h_v$j(0L{Jn)xc9?VqihlBljhh{mf1gvA^+_Q%vqX>kBB+QVDR%^7k#qrO
zL=B;NdZ|#h0J25i(XqS`a)fE2^@loYMZ=LHaKHXxiMLzSZ;y~4Mo|WqPK6osZ}Cb0
z2A?*>ZElyIQ{G8a?HUUpa-4c_3zBi8K?nm2{Qv9gD}bs9`+oP(-5t{1(%m2+2uQbp
zfFRu=970MO6(poY1*DOVqad9k-ICJX@jbln{bugWow*D%azI3O_u2hFzl<*ffZvEi
z2LO2@aMkTg>uvzHdNA4OE$Qe~>{fa#aeI1AbJSN}Mj$KTff1SE2upT7uDD-&Lm{`L
zI(QP`R<zf0_Tau6_M!jbN?@DEx^ywgtN`kwK|kj{dPDWsZ`UN{>mds-ze~HO+;MWr
zD&KB}bbGSe8Ky~-|1P_(A-Y&-+ZFY{MIpzBHKD;phx&4gJUel8*b_3p7012`WT>KY
zYfhjqAH)(+W(Xr-pRQFf^7@qD-tK|_{_`9%0qAA~At*n9%o3a~ZZb)X%<sQJOXI;t
zK_a85Xq_=WT$}xV4an(`90#<tHz7E8UV6(%J{$h>gzkQ7+h=Xi1=Hld>c>X}+heC?
za2wWU$tUpCZ*I^S)Lf?dc(kSw9BSZyPgGzgsvM=$hqOVbBIpdi54t~8|2$x)JF%s{
zVpnazP}1@V>jmi>c&-lyhGW!RV4qyP<NV(T4{b46$lj=dWE61ZT@#|C2?TM%!LSI)
zFl)#hb`z*G0wi}7)$jJAEmzUZ_aG4a?&r(v73_dg#Kvg#{jIJFBuCT$WDN)>fLOwc
z0u9JEj9P=lEkbU*EimhU0lA#(Z*0U1s>M>ooK#7!_|Jo1m#*p`O9}@Yccqg-zJPcj
zQqbH&mf;WY13K5$n<=@`8j0XPM#YWu^!VR1^uqdnZP+y=EJm~AfP5mt9aAoaWmUgz
zIxs1K%_G>Kd3P+MBEcTBrWSaWd#2xa`}iG?sOA|ok@KYX5YW-#gMRGlsqORZqd)TN
zAUq;N<?i-IM_YSQLy!RS#^no<TgN_VI-)w+oy#03$fbx(-Z}{Y=sjRLkO8N7>fuh4
zUz@&VC9p+;rijX%!XMr7gENE7dUTDBq}pE7!N5Y%JY*AeJKEx)Aw%@Myn`i&eS=_O
z(zEz&<aMpx9JSLlNhx&wl7`p!q}pS@{yEUvZPwtyvQV@~#F8t1*j9>#Xu%56y7FXM
zdvCIJn=(Q4X6D1>)DSOk;4Q=7=w!9jG2C&k$gBM;KtX^Fo%q9R%1HP6ePetm^SG-F
zgMykGJ2oGb^1jbpDK)M}0~&w?8)qQeU4?@kIcN?=ut?ro=#PWWMgqWzgFQUiF|7gN
zS7c4>XHUAU^=MX;Sv1~j<DR7s3(e)bci7qZ@S4;_BgqNk*c7}lLE~%Z<M!LS-PJ{s
z3XKKw$5g@pqS1-6ln$+!{~u)f{}Lgdp;8SX0cBt45M>q+Ycz3uNJ{JK12V#pL*O0t
z52_+saMe(DbmYVp^&Gwc`a&Md)>-%dt@1XlgB{<%RsT|`BD<+5{MCm;55B%5<+Zus
z78iOn0wns}C4VbO?<c<J*Bi`Q+H3cL-RWa3QaUhzq|(U*8GQ$&FNBCDWa78&CKxP?
z*z0)Z2Y%Wz9kmteTZKa1p6e+r(S!ZC)xNY;wNz{BS7)D4_UqdpKxE9zYpC>J|FxE9
z?z+GodNxCD->>fmn0gHOUY%5RglwMw7y>0{BAkt{UcNPOl6UxuA*#;H5ALHSyJNnS
z^bmOqq2KYBCyx$ZGn&=gc8qPI(9Y;a$0z4Iy`({tI-E5hxtQZ1+BQM<4eJKInt8E_
z3$IVMPP9uxMHgn{!KGK6Ur+#~_c|sf#eTp&vxxutUbmuDGR6st3vgqU{=Si-f;weI
z;9v?RM0#-^oY_)>XzM#YtjD(!;Zt^T!Rk!V1Uf=4+6OQT!g^^igZRVjtG=+qFIcx*
zTMXVb-2R(2U*HDkBQTL8RW;Y<il7GTo!nC!rJj?7;|6QZE!wG^qRxcCL&apVeVZqT
zS~-(^ZALYUEOI;_vmhx6g6JKbtTrXLjcAy7vCa9?OqyC+eM~I+m0y{IZ%H$)ravJF
z^eU1pMA0)eTrNyIj*de~Ne%T~7|W}uAOIsjK=YiZYjnUIhzxcWhCsaewS@*+0TEhC
zdU|gi!5Rdf$4p2LD9oaOzQ-CQ{>)pHP(U6&4+=wtI&WPj@-7G?qN=~+Lr=d1znL|=
z3RLe!t#|;Nr*;dBS@6H2<w6ar3%89Be+$3*a1FyaTd`}-qmZHB&AWA$*EubA!BGV6
zPkF0v6asf`EnJCCf2VI3)D$o<s-mO6>cPlSNZlujJMu|TW@AqcXAE}~j!%p&-;i>d
z*YM~EO;2A=Qw5bykDr+oVeRTUx)qs_*2Nm2&T?|<PpM(_%r4M9<B#ALOr@V5JUd!a
z^bi#P(BQikJS2XW<=Nzyo0>CY6X+q*N=hv&NQ~fdLgKTWEu#|8CA!PPjQ)j&T5N${
z<BqBj7Miz&@X=>U$eJ(PoU<1yM_<s<fZn$bvBU5K_?uf=Dql5WH+tzX@!_*`rGn^Y
z3gFKGgqaEm`UA>KZDZpi5PiV5RTv8P->Ss`4b<aQHa33x<h@C0Cukyx0UC}&AmR1=
z_k;?ns(uTRFt&%>ih-Odn-IZF_76@ro|Y7eJToGhDlmrRdN){jNs0cB%PeBAwN-4S
zwsf}0*Oef)cR6stOf=4#DcspqqfgN1hK*&FUPk8Yfo%BsIlVllAH>fRXcq!4`!HZ5
zj`QwPEiHe1K-LHk4-dpi*qHoe&YTa@gO(Um5j|=Vxh@tMSXie#VxCq_!pa97OG7af
z@BDU9<({IOwc@?ihgRPqLh6t_$za%N$n8uJVNpj+dk*$^J|Tcdn1%-NLd*H~`vr;4
zFK_`hU$6?scs-D<CM6+31@I9B@R#lbfm%s080fki8yg=vJp`iO8StURyVTUwu?2%7
zJ&;mi!%Uqr*A^lR%hl(6_xnm6@#^9I%cWvDTIqnAgCP@Yy21qKOyNWP>mAXtPfx$-
zne&n<m>9<-kcTL)B)1ozetA+N_lP;?Kqlar9YlVr091~;=j`J%+lm)9Ttja+rfQ~;
z6fgTjoP#R%5wi4u?VqBZC!atyp9)n>_OEGHt?gD!FKM0Hbli5m`v3GCs{9s3|4@yx
zO6t8qxDwybQ=B{8$|TL*!^PVe{bCun+;<OM<_e8MlqfnLC726Ei;SSYoBbFcHD47u
z)03CcI(?bjSLW4(f&gjr;_mK8Lv!cox*$-~%nyVez30_HSJ$Jcz+4=G0?$t<sHrhH
zx!RK-pAAVSQ7)Qv!FvksL{)`npzfO%41x$?>FNg5RA$^gTHga+Q6&Z%ts&Pszt{FX
z<!)SESL7o45rgC<1T!y3FCERh3B6%wMsdD6Ti09!<6SW@jP=>~rzdwAqQP0o8X81o
z=1~KC7KldH)BTW8YGnF3q4!}6=L88n3M-s@^5r9kF%)%VdfloY8}{~b%-)_~pr4$c
zc_K3)Lfa>FN<_9BsYZtIcV-$EFXK5I_dPy5VkFE9%q73R37390nLoxITjs!T4QU(V
zZ%?Ct#UnoV%_X3Kqz=S}xuV0AUQU_>If(7^6-MfZP&chiHQN;&P?euhpEWTF;+*F`
zlQcZunK5*^{9wdwaI$M2`x+Z}^IsI5MaMg?JhJC6gs3v#w+WP)HCP{|gIyYUk9TCg
z0+uO)r>M{VeAOxa?aTA*23hV*(pP`_G9X%sk)V=7NVDMMXZfv@;jI^5t^QB-r`lxq
zoPfC;6&eGA6EGOApC`Q6MxuFsvCh0oFTq6hR0O6b9yuYdCLZ4#>SdaTXvQb#6o7rR
zhPa=@_6P7PY~2qkJHBz?29c6DO*mhg*BV3=<|@b>etQ*lL5l^ojM!}>IY*!RqCsYS
zMG+>Y$Pfy8K;A1!@+@9<QuBH*{D&VX<maSx4DwK+H(})q%oqXv`&UmAkbVX}b$gE_
zk^O^s@gE+EC33zhEYVwpW+8*0^_9%lPkc$B+c52a^IPsPo-D*EwN2pn=qSLBuzsC+
zJ{2P+%`daSR_6}=NT3aQ1yG$xP$`w8d;dd%8#N7GfiUO&g99CXJ-u#eDJefLSnc!!
zk_&)o=mOoDZSUvLSTIP*UP-aBlmP4_h3$~|Vd3-h^GHu+tq$wHLQ>lmD$zk0;~z;>
zOFT@)GT|8}ohPE~`1ovZ-#INV@5FXQSPcJrAtw2Tfh<N2Lw>fNK8}tWB^GJ-eG#C`
zP@pqz%<bRF3M2Yq7V?PnXOYJ1bqcwze25Yr0%FWzA$me&az5$=d&yceizA+hXBrI7
zFNTF^r;47kfsTe}V45rj{9*6h>?}P|%pn9U4Shq|NBTS#LC8R^Py<qZjyGa~cE}{f
zzV;RH3=Fh9im;lld688%WrXRM-n~Gm9wxBsy^HeCm0T_h;?TqiEe)WpQA#w)#@k%9
zz!N_MK@i#`zutfbMzB?<5ON^!2G#V|r2}MCQfQhO3ue^h%&W6(!O#GA2&<LbOf6$*
zk!k2PoiS=|At{zBArb@J!Nm9t2kh}$n1drF^%fn(T<1bE*AQG#otRk1C3E?gLIrm(
zEV`9ePFyFR5{7HqwG5WfY@?1BC0x1s;nxxz+4YhUE{uIjh&vs(KO5#(Pd$74Mi!N9
zK$zyrvvtX@6=jEA<K|g0>OEQ1Z5t^wRcV7>X5RGqK6EDtNb!J`HTL-Q)PPp%tD?mN
zeurT>6cm(hAS%OwI6V)+;XnpD_02kOi8-dbZK_mRYGrsSk@lZ?!`+~@xL8&cXC<QO
zUnE{iiD2>Qz4*?40CaSd?(^V2lFP0x<1m~n)%uVkzi#X__Z=KKi#dyaREe^L*lbzK
zZKbs3LQ)vm<*%P&0sD+kY$UHxjiuVs>cgDiyjCNAU-t2vJ;VBLW(@oz)K6L{AO2Sh
zpsb_vo>?CJy@<$DN$lL-6a*so!DQu`klkb0BLRM|hXj+TlS$5A!)9{j=sw%RGz%sb
zYaEWHLI`jlEmBb6wb?O&hL>B;1{YU)O!S?dc|f%gNbHFN^4j}eAs`2;{($xfBY9M)
zlqlvU+c|$Mx*@*?bboIJ$dAd%1*mq(qxf6*9mQ&k!p84pFR{sl=eStPp-{_>iO9i$
ziqwRsxKj$214H%;K;^)p5{f=+Y^%hv$rqilOC)mJo)jo?erc6(P1#2WCm@*YUEyPg
z62+({?xy&VHx#cDXsTar8KQ^u`0feY!ey=Vkt(mgSZ|+??7OwTlcEvQ+}8-k1c?LX
zoh;4!_|VCF6cwB+$?rC!)GN#7I7RRhS^iJA%JKZ4kb<vkL$76Tv4#tH_G00uCTq1)
z7^Uw}??I;98(|8e?)~6Jxv;sWH|__2l|K^@07v^sOQ5fTFw_}OotF0Q-SbiG+|hrF
z|Ne2T2ejh;gU5e>fmSZIpfngz9rPE+zag^P5(BM0`BFPc42MTrS{oimpL;=}j6<V$
zJE^5*gRc_GaD`HPxD~DZ?*ZF%C!3kH&s_o$t|jsKkJWMxFeaNK*mA`uQB<(8<giWF
z@c+5a#s_;$_h!v4v>jXx08qlkf<l%T!{XyZaNBS@oS0#6Hj4x~yNV-Ev}SM?8+k(K
z0y=u|S6mHgd&@h{1rQl5k?L?|!%#j^D((>J>3q{fG4Tbb@AjB*o{Ksa90VA)RxK=K
zz+(=CEtxe>l7*w4r~u;u02<wn)-?SAoc2W*0qpGWEbHCmpKp%{u-pOA4=^X`#4!TK
zkc!jYV>x<076c99A&aW%%3#cO{9CvWGI~B)t|N8EHm-hk+I7P*^~{1tja2PQc|1N^
z#K|4{U(AY66mIIsE7aUw!njH0U|rC@3Ld}g(OI{DvY4M*6aSER>GdAgAkBG@#%Zfu
zo0hy{{3((c5!LjbgV|4PY}lWQ<cX%Cjpq4RDo@$)LbO^J+zIJ|Pxp6F_xV#~At{ij
zDfa48$Zk+-ei23yUG(&-$K2ff=)4yPAAbmlLcY|x%uxXVypZV4FJPhoR6BqJ-8?;0
zCE?e!`6w9Yo{Ye}tFEEWbnAJ&y5V@6p7M$29RdDuV^T#nJFWCVZG@Ce+X=g6dG=R~
z9m&HfFynlP6>x!qpjnh$6~!q--e`(b-`FR~Iq!F)qKe8QILyG$2Lp%-F7?`Zg2tmq
z-QnS}rVqDnKQqe$5t$><{j5BTMkm<c=YWj^yZ0>*RI3lc;8^(h<l`177zFfkaCjR<
zL<{uak0E*3{ih%p5();^fByilwg304un;_<9wZ<F6WROv*z+|Fia!ri;sC2iDF>gZ
zs3;MfQ&4b};qY{Kj#_QBrhNtT%(A2>6V1v7J12)2qQp^l65_Y5CP*i#B<xg7I<rsf
zGKN(s<Gn|)yz3n~e88MS#D(!m*Y>5`Gw)y^GED~ic}`XH^2%nwm3D*iR6nSeT!d|J
z+uoV*RGnozxy$NrZg%k~`7s0sHlmcbZ*3?1PB-?Y|46vj*Voev3Z^o%vdVCusa_eE
zvxQV&7LX3X&f8&!NOo<P(;0j+H|NIKhgr~uRSRP#G0r>cnW5~fX;DzXd*I3ca!sin
z_HOoZj!nW@=hAyBjM#i@Wkwy><VPfGI(qm}nMtXLDmPi+Zy|Ga41a2bx$0>s1Y6rT
z(;>WIW$%9Gsh6T4|Ij3wn5FiCheGuCsDz`4C3b%^9wXKJvU(9V!bmd^VZOMv<y4Dg
z0emyDJFX88DgMfWSm6Rjt3;{GSxJJEV0_Cx;kOBeLoK6zabM2@vn~srSGOWq5xz~h
zRn{t!3_|q~aND6k^_)ngjeCrJ<+HCds7i~AoWj#LJiHD8OMcFvYh3gLBo3MA6Q)c1
z?v~{KbFW?>e0B2XiH!e@i@)bu>tlz2?QL;S%Ny%=#{MVV9e<E>fg|&ZQ*#S6^$MPi
z>90MHK@^OKXAe^?gveg+hdTm);Gz3+=js%b9yeLnBjywxqL`Hzl}6hvL@~2q08(~s
zKIp^-$g>3U$MLO`11Q)<8>t5O$np(e`0iw7ct!S}wT+GV+$eYsGM@%n!k3q-UQ*`j
zNj&}-a2wRrI;4lPQbWs6eMkpz-uwIu<LmK9ALFGw55Y0Jf06(}bd<|h21$<m;%{V1
zY9<b-yZbn|KIskwI<Ejsj#Fa=NF714u$LByzyeNtK)rqq0yYkx9-Hou7j4I{gcyKB
z*Vd?3t-ZKh>Q4{zw<ro>$FPZ<)TKwEc$-vVCOq``d~!dOrP*BN4o(u)E=on*T)AFb
zs*2X^5yX`!n|SS*<Fgrac+}1Q0I6TypVU%Kp8o{>wu3U+5(77<-8!6~?avHJv3{Ye
z7gh~E@ZY%spLW?JbbRUeq-lkN1gj{=va3P17*8Ad>a|IVa-Bk*u#0T^hYv*nYw7~K
ze?2fWIf+DqbTnJgPyqnNI*C@I7~42KPFx_Z^8BP*v;`c$_m2}GyRC0(0$HI1E-o%9
z015PeAQN<s;3{waO^VQmbTwWjy?y(q-$>wNUAj+fKB#7Xc62)fiUE`<J9i=oIyyT&
zHirS*+SIy`BIdoRXA2TIKQh?@YA+MyyhQirm5$17aw9uD0n<A$t%hzoZ8p^C;@o$@
zv1N)lhq3qrz1I)GXK}QyqeG&uIc%Nl_Cw!~4p@yik^9wQRvNc2lT%Wxk0?Ysp2u7R
z(l-_)tqQ$ZFF|3(?WT8_K&F&c(d{I=1GE?iWOWMy(uqWDo#U^mrI1BReL6K=UoK_x
z^6V$u5B$uLeSM?lF0(nIcGlJ5=Kgs<y^X@R*Wu4rN4=?*wvMLuxg>5hL^mPWJuna-
z7aLn8!C}^Ns$=`ejR0?<G2R8XLpUx<U~TUzHC~GI+!0sZ_20pjGp-rSukHcwI*#(!
z{5K7v^GRgB$5BV{P{sie$_)$prHE$}^CaYU%>Va7VX)g4Aw#iLAb7+;>9@VJ6QA6C
zRO>$G<zu&ftWbT=BriCGp{xT?VGoFNG|(CWhkfg&gMhAF>iNT|IB><+p8|*#WV%Kv
zG5!E`Y*;|R2-?}LKnVrF9w`1R&AV=}D9^Fdyyv^A*2PVa=&65#y|{<0tSl)*M={K6
zYn*2=@Hv0gMQ{$oCQy`_W{UzcX~nGP8u%NF!R!J~VfT&>idL4C5?Pxpwexhn(ABrk
zD)HL`U))uSK6UzTKPqEmHu^Y&|BWAKEtGUaj1{jcI&}C9!+BHY%0;^Q{bL2!f<nfV
zRK6u_>h(H)Z?fi@1}ds~<CqnHK^SzlJN~!5W{f%i&TU>DUXVuejT4Id<<h4cVsyVi
z!TH_SrT_NB>K~g9Fc30)pbUo<WmFhniK>o&{`At>7(o<A8VhK%uaS7P(;X*6`tu<R
zZq;H9nwA#rCU}~o$%ADiN{omxRQB>uI;t4c_1eS3@WzB(&p<*4TDO0V4}d?4(}?3q
zVA*0+cSVH-XVKfmRZ7L&3F2AKvA@&t9*BPuX3d*!)yG&$zp=6;4e{{#whm3O2IuGZ
zq;Bfk#M_jSEwFXxTykViM4qIuK=eoZ!RvP)Z!(V#`vSZ^zW?i!cOED1FXC$p7PZ6H
z(#7DheU7J$XDJTm5Oc%L)s1cIy4^^sebHRx-%|UJ$$&WoAp)zwbD>abAez8na{+ob
zE2*B^+pjMHa<~PY9zY8wgA!nJ%b*ed4-*qMbB*5JLqlEv2bEDQH9#K~qP5Xn0|o80
z0kQxb3?KVVqpZVO#v5ca71X-0NHqu=&g4LP@YK-F&CQQAgoe60;6AL=7~R&6m4m8-
zB~=n=5{6~6sb;W)TL6cI_w49%&Lhz5{x?7Y$qblJFV}MhdV457Jcc0(Pf8vw{GRi3
z+4I>5j8KqvC4>;qFBt31xe?UAbiG1?2XBJEHQZ&HNVa{gWXj04-2Is24t|W%G2P(R
z?Naq8tL@#oHQXf7UQMf6bIJ%F{$+b?&)G2~kSGr#W4M@Pi()bttPTtbo<4z0t9W^M
zoD~Lxx-)nv3KjFT2~1CNON~WvD9+kg{38fF)@QdiCKoSV|D>OwQ1NIl3>%a)(KEJh
zSq`lT8Y9^)?ONm&>%0Nm+L*(@@9gF5UCGOJZp$K}HJUsUsD_H>f#`Er;{{HSXj?5)
z69J~GDuXc9`lQXC|G7EqPhLkmwz33*#gRtIVkd|M>z7!e?nMEivE&bjxtZV1<=X6>
ztb=|H?R1RzW~F6O_DUqoyB41hAs^Vw5n?vYT{)0w@wG^C68_B1Y3rGmK?%I_mLv8j
z$jyBOrrBE81w3-{v~Hm0CnY~bUo^9@xD5h9tleW{qyP@N?{HpPSwVTN5DM<sOtP|c
z_mQ3;uqnba<c3rRyh&v53QQUy0oZ`C_B{lILhYMUrXHA90HDS*M%v%sPfC0H_AB=*
zyS@4&9h4Pi<(1v4=jRv@9$jY(N2Sq7xoSb5OpUMW<7|-!=6$=1;9O4+<lyUT6O5g$
z=akB@>0T^v5E93Tu7$uu@*u9r1o_Ea28>q2IPZ@)I@|8luWTRYk2n~`mj^wTl{yQe
zNw_`a@>#!*_Jw^jY9-5S30!ViU)C;Z#im5}|6C!822Vv_)CmLa9W;dB2a^KV!usGw
zv7g+{VMArz4v&nin@;x}C@iUokL_PxWQN7yR*>Ly+q3<|J(@N;#;7-BU5<UfI8I9i
z$8ae_Be!o!0Pv<m4g53S@HjG+aBgYS9*e*i?fQQfY@%hTxf-IP1Z<eQU&pj}ni4!;
zi@NPu2rHm(=oE~|Km8Kb_`b8$3Eqe{S@rx)Y#$nhPXZ>->2Z)fxaNCXMe_;DMW4>?
z@}!@M!0F<<P5Km=lk5FkkN!Gg+cvpuP*Y3Fwjg#k(_E?gY*ta-ygfs%#wON#V%2x|
z$SCg~r_A_La`pH8J^uEgDNRhqDWdWg6pc#(abThvrGCj+F-TJ8<mF8$<)(#OK_IwV
z3~+BsAhfFso39xT$R$t+VHtdZdUd*UZ_~YZ6M?k(f~u<D`piTZ(?s`)5O35URtxb5
zU;AmfTt<0gA~MJk54IL8lyko|Hy?a=-Q<oa9PE6QYQrmg!6>mOn~?9%w@e-qQV#;I
z^>q1D$-Wqrr~wzR`w0~R6(JILAa?ny22{Z?tpZDPhWUD)Usu#*)@sw_Vn<u@UjJy+
z&CIw1U&XKb*LnU*tyJ8%-6r7vY^Y#b2eCat0`KT}9ZL%(yo@3uktirqk-539Vh2xm
zmtFHVayvR_Z+=-S!nD~*n1RWA@Ec_YC#;j0sQST>=mR*z4M6U6BcDSY4@IOVx1Q(U
z0t4SyppdZcqqgSS8K%nfG{^J19iTe*C0P34$06hmkCH?s9J4wJmwSr+#{tvv4~j4q
zQU=7xB``5GR4Shn{A+*98$ZzJ-QRg>+@DeU`Q^UCi+bpqJn_G&QG|s_yd<#ZWk}?t
z_l;_YZ*MMfkFhWi3@yorhyB&{X(>{2dD_PYobT4fW``KURpK5@4$4AZi6Widc`es>
zZr%e(o`>I@U(W@0fJVrh8_DI_n7;TOrjHbfcN}S+GIeBf%MF4<eAPGzD{%G({wDT!
zAn}Jkz*+nQ9<Wgw%tUqNZMRfFxbq97CR7487>GvzgDh8Sz{J9WDv^y>Z8wn55nFWu
zi9O7?eP)SNv4-jvaWX`He|0RRe9q5r#(QKMpMl&pVz+|m9MTvyC_qe6{*kp%n5<!Q
z_nYHA-jVFiZ`Mc~w4RKn$l}@mxj7^#;IZP?d^e@Qosf~>3Of$iMg4XwMXXyy&ia@p
zx?H^bYNa5af@A`n?$|h?dU<Y<w5_41Ql{)7&A?NJMOQ(wv-Th1MBJup){3E5*#6Mt
ziDVwapmz6f$;qzK+M)z^EVjV`l#$%<&+4$u=a6dCiKnM$Oy$XtA4=Q;8!KxV$9tP1
zeiZUU`znaLXY^lahDn%2DZ^yBmIl3h>)nUXWZK~Q+oHO!O8FzkQ({;sDLtLN4IG^6
z%8`HYlr0l8KF;<Z?a%2Wel{#PbVwJ3>nZGaIWI0I$~|X+<%M>2X(#o-)6+5UrBo$O
zy(VAiiS74?hzJ|LzdBki{HHag^d}<bRaW-Wabkm(p+Tt`#-efUVF#}ZwtZX6pMPCM
zzm+VSL<TW3Ph&?L;&U>3t2bat4K>E~i`mLrX|DQ0;<=@P)Q<z~K0iGTY5VKt!n68a
zaDt4GP#!Rmq0Te4!dF_LgkdTVaw9_&fqm!k5!gf6%r08KIw7_2TS5hm8?_^`mX+41
zy?uQ;z%65LYHB*WD4%2^IRPl859y5?lv_EaS9dzbNc`)lZZ#)E-L_3AZZ4Dj+I&yK
z*`SAZkmHjqWzFf$tDE;iq;ol$SReY`ZctHQ8(=o&<`O^z#7^3bhlx2q>K1~~Cm6zY
zOv}T`Oya2K+IkLNu9{Cc9XyUQl*{?5__wW7?(z@eG2Tx6aK&Qhk%qqwX;@gtx4lfZ
z+r5~to?><AcUO^Bq(~sC+TnwO96l4+Nja;euCJ}BRB3T|xrFzZUBS#{<m*Hpsc%Kb
zHH%?&)1Q%sRW_%=9zTWg6r!1AaFb#wGhJk&K@WMoKM!P}BaA*4upR;Jr^<YNgNAb5
z7lsr_i?RL2{0Z@fmz+LnXzhdHG3vKrn8djAnLwvw{MOLd{tKtj+s@Ee0osg<iKZmB
zyolC0xPfLUquc@p+gq~&fq-K_um#b5$@%Pg>C>d=<<ODraybft30<k{I@7fB0&v$r
z*X(lAR`8W7ExG}<2YCfcyF9vczeRhU_>hBaNzATrl1PG7RZXk%2YMWrcR3mZnwmq6
zAYXF(`X+VIVs2TrYDzTMn^-m_W1oM!{P!=_o=#_==<{9@Co%_Ncpu<hzdaE5unnYG
zJq`g*hInREOG|t(mxEs+4~Xl19Wv|+dB7zy@|OrA&woYo9_sgp(Y(0vWC%v1y^*f8
z8?a#Rz*mfd<ssnO;6ytWA0ySj(ugme!7C_eV+-^T29l);Ni>}8`E9YXLlsRtd5}#l
zpCg=f_r_IfNaG{NyjO_lP)ae2jq6{#H_}Ny91w^C$8UC|vsrzpL{3Vo{DC3lXFVw~
zF|q$mf;$;B+BtS8iVMAzvoQte0Vjw-I8n5Fe7k0iRNq_u`gx{M1q+{uh=}X6UIQtC
zKbS)B03KZXqP)yvM~ux)Os@d?yKfHyG7tv67B64EoR@TU{<ZN)fK`*cpfNVL80l+K
z{&1;eXzRx?C1%A7X)2aBCxJa-ADE5t7K!buS*|KnvFU9!sCxYt(lr&lphLdgJMNqR
zw<i48-3uBHMLLecV?4XCFWGW(Vs%eeb#i2Dp%Hd7?EcFwy3pFbwEQ@)B`)mpdT8=;
zJZ>|<o5#uDo9g7#B%8{vy4KZfsc#$1&G+5UxnGpZ>sm|MZw*VvXlxHESEkI$#1AcN
z9CQRl@9<@>bHPqI>NTT0&WIB%3jpr+$tnf^n91He2O289Z@`4{toJPk(5w$T2z>?K
zq|D4rmGTLDVg;8<abwlz$WojdP^Sg7=Iulv8}2f9y>I78<g<5)YHX^7FrFrBOPjU)
zvAMlK?LDoogtPHF(UA2Sc#vkTTwDg^E}F?NujjQW0+GTGwfXagRDR`S?#)31n~f~~
z;aAU%s@JYMkHD~w*zZy_>Je1dQz1Da4tCU$SuKTXP%f&IDZwfIk3ZXq9N=6XVmu>%
zHbuYC3!Sy=!u3$<qhX?$+J>+DS+wANIw{9`qKIGAlnZWkm!-;Ag0=%9QFCvvHEqDT
zwgG$Vl~?Jl83C_$xfxSoLb%8OI9g>Nv~B8?vki}0KmI87;ho3fJbFnHXxSso1~V4%
zhBrJKiLnb=f0ZOyvNY0!NkQS-cHHGonGfklHtt@y1T07zre1g$t&kVpAk5%nh#1dy
zfiXQ$y~zuoq@gn{EiI1K;e3ZK-YfZ4o85Y_P0~H>uB~cL0+%W@<0z_PiH^8<%dw%y
z#<uj)%~jc%?8R^Ajfy39Zn4*fsUJ(rO3T)QTzGIbegy*$RLq+<HmSJur^m-qg$5;U
zJiNTS(;!qwE?bMu-NQq{$48_yffhSnB^*S=n>BhB{qE~?DmN*;&G`I}s^S~eO@eA|
zwrys1mpDxXuOvqhF86)$fs0E~3Zgve#ChRo--b7%H?MT{R&t0=+qaQwC`9JL-k!O`
zSwoS1aZK7Ec804Een-VxAygB&>gxE4qN$Rn;gZ%r!EF4NR`XV+H^H5OUIkNE*iS;N
zr<xQSp+B#h^9{IpPzht;;TMtLgIO1cDt2W*q&Bbi89uGH6aDjvfYO#`4*!qdD7{cp
z690pdkr9zDCa3JMPg2-^jW8Bph}<5|Do0J3^cm89*ZdY9j`f<6RhGdgtt<a*_K>XQ
zsd-oUwdU&TKu$&9D&1b=>UE%i{h{dllU}a!j@F~0G~YorE%&SIWv|HVCz<}I-e$Hl
zCK7)yn?Eq!f!tX_R$?n4S&qnOcZ!8)8kCfh#V9r0-ri<|o+t}(FllxH-g;CbyR0@p
z|L-X<IF|!Bq4X<2<bMIPUaHoYCQXcIr4YYzXk0T=P^aO1m}g%5b4ka!1q*Si?~{35
zk|q}ZA29w&pd#U4J)5?#B~3kiNcaG|BDg=CIphr%ywohD3}0eq8fLZvQZ##i+ew;r
zb1|vCa67U@aT_@vjg4&UTXb*XR81~%Z(}FH`uT?vv{|jaTe9MGZEqHdR}Ym|PyLt9
z4+{xuAu4He;4E+a%@1Q^W_D}3YxUj`eCqmm`iiWjskN+l(?77(No77UhtHzCs5Ap)
z^5Y-8JDIZ2p#@{AKu)<?ZEIuW^zVj$`->yCD#9#xv$M006fnS+%_S&K*ngtNq*RdM
zQ|#v#;M%)kp{GZDX>QI6xZ0`X;^O4o_1XMWR19<yDkWnE;}a7TKx-|WM(i{EP|gDT
z^u>eQPa9L!d?&l6l(w6rHiT5;1ApC7?fGn$eFKN9?JYOud%>_r_wL~nwa+rr<BdOp
znklH;X2OGSE~lE)9xz{I>O(ZnQ+1!dfF^Rz#CLBN&}b;f?&zhM%tUV7BShg_=@ehQ
zr<$0baVBzI%n%<8Mb^Mjq~i{0Ub)~k)^R|<4-ODH{*XBA!0Ypa=$IIo<|xQbiXbp;
zQ~l>9VW<%O@$<jN%gf6f>&kSZ7^Oid>qSPSMLGGFmqd})mo1P1Iz;`d?w2TxXpw?t
zQN1#9d%gj6LY-@AU4Q0$s`Q~D%6Y9a(7?V-@z&_M|6ROGJ|%oJX+VD6w(x?Luf7@|
z<joi-hiLpTi6`Ndk}{io@D$JniJXq{7}+8ZUoxxgh{F631VX$7Z4m6e6a;t$f_)76
z@m!Q)l@7k2H!OIV@C4lQ7kN$K3ncfv!?id)(xTn*M~2`c!hfT<U6|wGJHwFvLsWEU
zu_m=bFoPQVdx8Qm69`LVQxKkCd!QoGA@<V(pbDw+K4r?v%EETS8C<^{xf8i=;|?E>
zlEq&=-H?4I^}xp;Q0wtsp8&@$wE`pSg<+pnJAe3j#MQmbm{^U3Al#Xv>DZoMXOI6?
zLlM(32My4UQcaU8@&gFjBhn!q%WB*)O!g7b8B2SBB^J*t29}dQfOh6{bY_G_AFK~i
zKWqmtO-^RP9pVGOPUtpw;Z&f{dKodZq{fRAi}{AFh%q&K5!SFX%`_02_IEivqq(jS
zWl}-kTYqJou8xskNE;PPEaWgN$mrZH;uvSi>kdeFzD{}L)5&CofkR~S7?xBe?FPW?
ztk;<{+>xQ;M8b0p;XEUUQxsA03O~9v)zstz0vdaN&;RXrANLT}9IAX;#|yz{sBpbD
zB@}J^S)lfLbTdaLid0#vuRMb+6Zc1s@cGxWu50vfZMW7Z;fCFhyTTcQTbGv}6{axU
zO{Qbu<|aM2=kUKnE09Y!gx>mOe=*1m%gSO_Qnd$ar<M^Wgesw!kz10~cpJ8i0dG`V
z3Asb|11jAw(>HyIBY|f(N|ERZNqx2tGh-3JRP`v_KJSAvGdm3Fw)Y-#PCZ*&6AB~&
zemdkepGr?~c3;%t{Io!~vT5KV!2(GuVZdyJB)1&m*)=uI@QqSx=I`SJUpIOCjRQgT
zJ5Qu9Z+5K@e}6CaDagJ!;l4b@MAn2?+vAppUX{nsym)W!Y!*I81#;2YYnKIVI&mO}
zYuESJ99R_|vf%!6*g@QstKA`{hZ!9o^Hoz_-2?SuQueR-$#|ZiK(+al6QHvD{8B+H
zVF|Qn5>g~W<gO3{v#$5E^38W4{hf%@o29=?u>7%5)_`ahT@+Q+^=pwur1y58N+Qp3
z-Zg<6kRB39Wf)z#IZt-xx7{7`lQ18(rSFQPY!7U%s;cS+PHI|_`GofqKb44HxEe12
zFORZF5`m@oD*zFlWCHjQ26g_Zz_iDJKjnXkg$hx>RbO>QIuT_H`8=S9>5vZrM`J3G
zvq5rJR`hYAnXuuNmWCl7pu*4t0c<_f#8!<HEy6^fsnnlkq_7*3-$%R**m!t)g2iiX
zov-}c5`<3z;^x^m`U?4jtatkmgma~)B(L|y#oVpn8&amdro5yhO6+*Q;^HT{?HA7v
z(T5+MLj=Ga^(p%RhoVk$x~fj4qu<Yn@do5~Ge}F*3NT&TOboHX&P3#%pCIqGXE$lp
zBT-I*>tAt2^P8E&$yC4N6+;Pn$K*-Q+qXa~m)m)V1D1mk7tHCl4oySm3Sw$fRj@Qf
z&$d8USAY?O!#j6m)d_yLl9LUZMB~4Il^ej=Un|<@RYkqmHpsoSH`kQ5uY+`dJO}H1
z8BSk`Mbv=!ziwcR1wnq-Q6`xG;Wm_&U*DVjfC9!R+aA2wynQ>cCC-P&kBm@*ERiX&
z7uBE;QC(>FTJ0h$?42{BluDNaEurU;rPb*XE7tu1CZ(X5e017bwgN&hSobt#!45a&
z7qRWzSfEqZ2il*<qP+rhQfvSa&Bq>}wRN2y&!8rSApqsiLnI4lU1<X`P6iJ{_*x?~
zc=ixGub&JTnUZ@stcU&O`Gt0P_R`4+$&JWUW&#9bG#osX1F5I>e7Kr$xCo*x2i3v^
zy~Y=HFfG%SkA2y1-Bf#}-p?5rZ=~OJ;6r_O9nZ#gnf9@_qfHH6XKHR?@OX0g8|nqC
zC9Zyx%l>JZiK~FA5S}xgMB_#GauneUK%Yl?nKEqcO%yu`SWml+4JRmS8$LyjsTO2T
zxq7PY{*0m4&VIq~*;<^Ic{cKJh?n0VKJhjsJW8>M)UothPc&fij{5S^aazW%pCYz|
z2$3Y)7#x@F+GbZrlmudO49d)6Kq89OSg}5+vK>_Xf<i&uR<I&awY|^U4U0poNFdPF
z)Oia+xu7yIEzsW1($icuVO|K93;re-Izp04lDO|K>7V8TKHa6Qt(nL2R?|RqWjxkU
zM~c(^{AZSgw_{(CiwcU};O3JjPoe-U`BK@v*d2E)H4<Jwgq%OGB7BQ}-DSm-((mtf
zIm5Z(HH)1M=!4bDNuROCsC6!@1IJtq`^8fqj`5J9UvYcfb)Jn!F*aQK)aX}p{U%sv
z+LW`6cf{0btr5Y`f;TA7U?m4uo*`A{oL0N$Hiw3s??{NxyWTiV2R}Ms@b?_<M9*{{
z5;#Da{5kMDlOjzFZ`Zjc_luWUg{y3FaS35g5?oeY<DmWXfS)@!s)G;hqoaxQnesjP
zz8V}<QT6rqZnwJF9HLwO_W+Xdm_#gEDTbh-qAoo<L=nq4A27P>caoWyZVJW72JtVb
z1XznSa4oFY`9yLJKv~>7?b(6Mg|f1>#r5Rz<CnE0ZY$k{`t5dnSvDx#sK_SOG&~&a
zJg`n+?%lO_0{Qm4qT~$0J*vaX@o*IQ%#y-3M<X^gtUMrpQ!bM`eU~k$R(Voo)IJw;
z*PiuZ!rgs5=+E`1*ExwNKB|7uIXgO-9t9oR4+`8qeInVtnRRFSf{`R{)0@@yqsh~(
zL^}F?{w?k5Sk-$5D=tZTHV*U=%8~Rc%tyTf&4X&aOWUYl$Mt@671DZTm=F;D$o&ys
z`Mi&8pcjNdk3?8qR*x>t4N`v}8yo)T?dI$FCO}8Je2a&V&ozY>AxvLEc_Fx1gaYzC
z??YXIhNNCC5M(QWFr%c5jA=)8ISs<LB5?l(*2<t3s0~puZ;2Vc6+#2ofG&}`(JIJr
zCB02DwGgB4Zqu}($C#m0o*xI+$MZi^^7ml_8458q!Vet`Ir{w`@=lt~2@$2=gF7$n
znVb$cHR&<u+yaeIrk|mhef}1<yG94MH+{5wi$7zyhHNdc?zEnY`Yd*|{EiMS5;@d!
zknxW*E3edhjO)PGU#H`T(5Ek7Y*unVMpKO-AG}(#`PIwk#(Rfm7f%^&Iwh&2WAHEO
z>c^~ZXz6-;#`nFifqznhoI=Czz1kp1^+Q!rkpcvP1DWK))luuL9RC4&jL5C4tDCw=
z`}|_#1$<aStf_l{+jFRgtnG?d!fQj$_wb1Lg=29Z8<cmF`(oxnDF{b=3g~>~hQKpk
zP(hN(p3pf3GpqW~9W*u#3o_<++p1ne?+&Z{TZqJb7nS{=_00M>ogN<>`{^8rKbl&H
z!C=679(JvRg|lLFGqa4U&H2t>Wynw!`T~2b%lXc%_91EaLI#qR?najZLoREMspkh)
zR@RIYB!1hy`wLV}O-I0~3XE3<qfn`Flv((l2`6q+<!&h|vWNUgTgsx)bJ9O7<P74?
zSSOil@L2PN(vT1=!#WF<>#A~?+LoTr#~jQR?wPRRk`Y8URkMIk>)3xTOOv}PQ!@G4
zBGK7l<cZVgxv`950S6NKgY#D6yAxCkPqK?&Dx5;V$uD4+SbZ8a>2V^-xHC*hiKHfe
z7DFc|*q4JzF<V>Oy?r)kKC7dv6ZXSAO3wTX><`sO&52QZ3X(dCj<cq)g9(22M}+a;
z2-)I0c<Q`Q?ZMM0(qogN!12l0A7qn7d#`yKpAZK~Kj(!kJ(mTi+@rd+wvgK@vYtCk
zRMV=Dz()&$|CE8=D-N^)+2!N_OBqN;E*@vRLvzY<?D-yIGr5Fn#g7-cxF-?%llCiA
zLqgF<2La-g6XfdZ36zCk_l91B;7`sn=6>H4FE6Ux$`jXwb4ul?zKf5%jc+b3$(Kcf
zBQ3W*a`TClDUS$*u54yaB=Ox+p#1To?VwULjDzfs#ui~I2qY|zjpj$r9_O|+{`sj^
z`)^tNJm`v}`Cw%^{a_^I;7`;-jru-&0bJw{EO%R9YsdY>^azPr*y!~0itEdpnXtBU
zSs%LYAN#!ROVgdWLYnl962l~@3K+*I!y_mF7T=7e+7_!t)@^y~sa^cSKyEXOkYdj=
zF3x8AxsfhXeM(zpGmtS>y_|Xo9MK1@)|Pq^0D+aldEZt*3iBLqlLm2}_KZXb8)*I#
z8|4lLr-0uk8$gc>ZUHn#Juw&m4taUv)M!75)kC!qW>R%~K_naAqcLGE2xm)+L+{B#
zcihCv;%&t4oxy(HW=Qodq_SRrS6k!a_Vf?Ts=%#M9}gsWd_mPd(Y0OZ4dK00x?1~5
zqIp%@>We*SzQw;h8!~4i>C{0aPR%#sHpI?<Mt$lJ^(V{PTp(9a60oQCeDyRPV*9GH
z@|^9|AM0I)x;7(1TQ?%o;)&drm&5XQf+8uK`#(2^PL;TU>L$-O7H9}*+=>{Y;RC9{
z1)N3Y+s?!L_&5+Vf(o8yvn_$-Z^(Flwy&M~Mlf3ST&{y9#!f;DoeR&h-@urW*)QKv
z{JVTlax1q9869GLGpbZ@DP{-4r{elvLDsOSypA$(F=X5tf*P<-3-x+CHgDl-8m&lE
zDChm!jC(mxmJW__;i<&a-JeQ5S~|sV*DQ{{A?G5~J5rb?XD_=4n*2#h39);*RlEPo
z-TCH*@jEmK{`COJZCUccnVLkT)IkR?)0u4Do@w=Bd>?YPKC?+aMG{MTip(-$Ma{~=
z^`G@Rm#aOIjW7QO<8~i5x=Nn;4F7Qgb*y@f$_<TVs=;@dTdn5!{;my*SW$&LS@$fd
z&AimEFtp1Bt9WxAzY0`HQANn`DF1;4Bf`Za^FSwb3RyJ%l`AKx8E-LNx9E=|ys)(k
zc-oVaTXT(Rp_12dlVUu$cp{u79~`g>a-Mf+-Rw*tl?&*~yxiR@1(JIJJtbx;nwnOI
z8i#ckXHnmH;H}9u`;zCmG^ijTLP%5m4*B@~>1=5l<JEZlz)j)Kv2R<XZqeJdwKX55
zQIGNF&VoW|SncN3jDiL?rV%6XGVoUn)IMX~lZ>1`YlnG=En=wPP=;#lW<wc^_yguN
z67CpvST4^VcT+S}S9_KuMpY6mvRBzj!4lOGIW77SEq|9S)D4FQEA*i5Z%D(s02C3?
zIPH|I{2=#>wFIGK5Tfx3CZcq{1qOE(Tn%)bi^Q1N*uN{Q4wH}7RyRCrYC5+!OwMSQ
zaOCp!I2S}bLZ$7?`zu{bd%%cN0KN&dOqIasozAN>&nfw!1(|B)Lt<9W44STY^|Y1D
z;EAbT$WlmnCw}YUB^>ftO*bLdSqiZ@{6o*#*?DD}#fgyMIvoq*&AQQiAS&{JVTqx+
z%Latb-+PrZo}+?Xi5YKX@r-YGFGp_iVG$&<f)>!I$T$|9M<c7WaL`xR)-?K;MZSm7
zh`=HE->A8`ly%g%fv2ngjRCT}c+gKjit*L~1g+fnJbGDWm|N)1wS~yCJBz4jS`SwV
z4i3&sItq%7YyRWHmiP5MQwb(S6>7Uhv%5Nmh7-+2#GeIHMI$5eyu1CiK0H*WpOBTE
zqV_au3GcB)YxihpDo2^z?gr5?@=iqm)i~Z-6JVPEKXS)KKKLDak0P4mibb6U1m4t?
LwUo*ftit{Wv>>__

diff --git a/release/scripts/DirectX8Exporter.py b/release/scripts/DirectX8Exporter.py
index 2ec42057039..01212545f77 100644
--- a/release/scripts/DirectX8Exporter.py
+++ b/release/scripts/DirectX8Exporter.py
@@ -6,9 +6,9 @@
 # Group: 'Export'
 # Tooltip: 'Export to DirectX text file format format for XNA Animation Component Library.'
 """
-__author__ = "minahito (original:Arben (Ben) Omari)"
-__url__ = ("blender", "blenderartists.org", "Adjuster's site http://sunday-lab.blogspot.com/, Author's site http://www.omariben.too.it")
-__version__ = "3.0"
+__author__ = "vertex color exporting feature is added by mnemoto (original:minahito (original:Arben (Ben) Omari))"
+__url__ = ("blender", "elysiun", "Adjuster's site http://sunday-lab.blogspot.com/, Author's site http://www.omariben.too.it","Adjuster's site http://ex.homeunix.net/")
+__version__ = "3.1"
 
 __bpydoc__ = """\
 This script exports a Blender mesh with armature to DirectX 8's text file
@@ -444,6 +444,7 @@ class xExport:
 		self.writeMeshMaterialList(obj, mesh, tex)
 		self.writeMeshNormals(obj, mesh)
 		self.writeMeshTextureCoords(obj, mesh)
+		self.writeMeshVertexColors(obj, mesh)
 		self.file.write("  }  // End of the Mesh %s \n" % (obj.name))
 		
 					
@@ -464,6 +465,7 @@ class xExport:
 				self.writeMeshMaterialList(obj, mesh, tex)
 				self.writeMeshNormals(obj, mesh)
 				self.writeMeshTextureCoords(obj, mesh)
+				self.writeMeshVertexColors(obj, mesh)
 				self.file.write(" }\n")
 				self.file.write("}\n")
 				ind = objs.index(obj)
@@ -1047,6 +1049,32 @@ template SkinWeights {\n\
 						self.file.write(",\n")
 
 			self.file.write("}  //End of MeshTextureCoords\n")
+
+	#***********************************************
+	#MESH VORTEX COLORS
+	#***********************************************
+	def writeMeshVertexColors(self, name, mesh):
+		if mesh.hasVertexColours():
+			self.file.write("MeshVertexColors {\n")
+			#VERTICES NUMBER
+			numvert = reduce( lambda i,f: len(f)+i, mesh.faces, 0)
+			self.file.write("%d;\n" % (numvert))
+			#VERTEX COLORS
+			
+			vcounter =0
+			for f in mesh.faces:
+				col = f.col
+				for i,c in enumerate(col):
+					# Note vcol alpha has no meaning
+					self.file.write("%d;%f;%f;%f;%f;" % (vcounter,c.r/255.0, c.g/255.0, c.b/255.0, 1.0)) # c.a/255.0))
+					vcounter+=1
+					if vcounter == numvert :
+						self.file.write(";\n")
+					else :
+						self.file.write(",\n")
+
+			self.file.write("}  //End of MeshVertexColors\n")
+
 #***********************************************#***********************************************#***********************************************
 	#***********************************************
 	#FRAMES
diff --git a/release/scripts/animation_bake_constraints.py b/release/scripts/animation_bake_constraints.py
new file mode 100644
index 00000000000..8a416c3c488
--- /dev/null
+++ b/release/scripts/animation_bake_constraints.py
@@ -0,0 +1,792 @@
+#!BPY
+
+"""
+Name: 'Bake Constraints'
+Blender: 246
+Group: 'Animation'
+Tooltip: 'Bake a Constrained object/rig to IPOs'
+Fillename: 'Bake_Constraint.py'
+"""
+
+__author__ = "Roger Wickes (rogerwickes(at)yahoo.com)"
+__script__ = "Animation Bake Constraints"
+__version__ = "0.7"
+__url__ = ["Communicate problems and errors, http://www.blenderartists.com/forum/private.php?do=newpm to PapaSmurf"]
+__email__= ["Roger Wickes, rogerwickes@yahoo.com", "scripts"]
+__bpydoc__ = """\
+
+bake_constraints
+
+This script bakes the real-world LocRot of an object (the net effect of any constraints - 
+(Copy, Limit, Track, Follow, - that affect Location, Rotation)
+(usually one constrained to match another's location and/or Tracked to another)
+and creates a clone with a set of Ipo Curves named Ipo<objname>
+These curves control a non-constrained object and thus make it mimic the constrained object
+Actions can be then be edited without the need for the drivers/constraining objects
+
+Developed for use with MoCap data, where a bone is constrained to point at an empty
+moving through space and time. This records the actual locrot of the armature
+so that the motion can be edited, reoriented, scaled, and used as NLA Actions
+
+see also wiki Scripts/Manual/ Tutorial/Motion Capture <br>
+
+Usage: <br>
+ - Select the reference Object(s) you want to bake <br>
+ - Set the frame range to bake in the Anim Panel <br>
+ - Set the test code (if you want a self-test) in the RT field in the Anim Panel <br>
+	-- Set RT:1 to create a test armature <br>
+	-- Set RT: up to 100 for more debug messages and status updates <br>
+<br>
+ - Run the script <br>
+ - The clone copy of the object is created and it has an IPO curve assigned to it. <br>
+ - The clone shadows the object by an offset locrot (see usrDelta) <br>
+ - That Object has Ipo Location and Rotation curves that make the clone mimic the movement <br>
+	of the selected object, but without using constraints. <br>
+ - If the object was an Armature, the clone's bones move identically in relation to the <br>
+	original armature, and an Action is created that drives the bone movements. <br>
+
+Version History:
+	0.1: bakes Loc Rot for a constrained object
+	0.2: bakes Loc and Rot for the bones within Armature object
+	0.3: UI for setting options
+	0.3.1 add manual to script library
+	0.4: bake multiple objects
+	0.5: root bone worldspace rotation
+	0.6: re-integration with BPyArmature
+	0.7: bakes parents and leaves clones selected
+    
+License, Copyright, and Attribution:
+  by Roger WICKES  May 2008, released under Blender Artistic Licence to Public Domain
+    feel free to add to any Blender Python Scripts Bundle.
+ Thanks to Jean-Baptiste PERIN, IdeasMan42 (Campbell Barton), Basil_Fawlty/Cage_drei (Andrew Cruse)
+ much lifted/learned from blender.org/documentation/245PytonDoc and wiki
+ some modules based on c3D_Import.py, PoseLib16.py and IPO/Armature code examples e.g. camera jitter
+
+Pseudocode:
+	Initialize
+	If at least one object is selected
+		For each selected object,
+			create a cloned object
+			remove any constraints on the clone
+			create or reset an ipo curve named like the object
+			for each frame
+				 set the clone's locrot key based on the reference object
+			if it's an armature,
+				create an action (which is an Ipo for each bone)
+				for each frame of the animation
+					for each bone in the armature
+						set the key
+	Else you're a smurf
+
+Test Conditions and Regressions:
+	1. (v0.1) Non-armatures (the cube), with ipo curve and constraints at the object level
+	2. armatures, with ipo curve and constraints at the object level
+	3. armatures, with bones that have ipo curves and constraints
+	4. objects without parents, children with unselected parents, select children first.
+  
+Naming conventions:
+	arm = a specific objec type armature
+	bone = bones that make up the skeleton of an armature
+
+	ob = object, an instance of an object type
+	ebone = edit bone, a bone in edit mode
+	pbone = pose bone, a posed bone in an object
+	tst = testing, self-test routines
+	usr = user-entered or designated stuff  
+"""
+########################################
+
+import Blender
+from   Blender import *
+from   Blender.Mathutils import *
+import struct
+import string
+import bpy
+import BPyMessages
+import BPyArmature
+# reload(BPyArmature)
+from   BPyArmature import getBakedPoseData
+
+Vector= Blender.Mathutils.Vector
+Euler= Blender.Mathutils.Euler
+Matrix= Blender.Mathutils.Matrix #invert() function at least
+RotationMatrix = Blender.Mathutils.RotationMatrix
+TranslationMatrix= Blender.Mathutils.TranslationMatrix
+Quaternion = Blender.Mathutils.Quaternion
+Vector = Blender.Mathutils.Vector
+POSE_XFORM= [Blender.Object.Pose.LOC, Blender.Object.Pose.ROT]
+
+#=================
+# Global Variables
+#=================
+
+# set senstitivity for displaying debug/console messages. 0=none, 100=max
+# then call debug(num,string) to conditionally display status/info in console window
+MODE=Blender.Get('rt')  #execution mode: 0=run normal, 1=make test armature
+DEBUG=Blender.Get('rt')   #how much detail on internal processing for user to see. range 0-100
+BATCH=False #called from command line? is someone there? Would you like some cake?
+
+#there are two coordinate systems, the real, or absolute 3D space,
+# and the local relative to a parent.
+COORDINATE_SYSTEMS = ['local','real']
+COORD_LOCAL = 0
+COORD_REAL = 1
+
+# User Settings - Change these options manually or via GUI (future TODO)
+usrCoord = COORD_REAL # what the user wants
+usrParent = False # True=clone keeps original parent, False = clone's parent is the clone of the original parent (if cloned)
+usrFreeze = 2 #2=yes, 0=no. Freezes shadow object in place at current frame as origin
+# delta is amount to offset/change from the reference object. future set in a ui, so technically not a constant
+usrDelta = [10,10,0,0,0,0] #order specific - Loc xyz Rot xyz
+usrACTION = True # Offset baked Action frames to start at frame 1
+
+CURFRAME = 'curframe' #keyword to use when getting the frame number that the scene is presently on
+ARMATURE = 'Armature' #en anglais
+BONE_SPACES = ['ARMATURESPACE','BONESPACE']
+		# 'ARMATURESPACE' - this matrix of the bone in relation to the armature
+		# 'BONESPACE' - the matrix of the bone in relation to itself
+
+#Ipo curves created are prefixed with a name, like Ipo_ or Bake_ followed by the object/bone name
+#bakedArmName = "b." #used for both the armature class and object instance
+usrObjectNamePrefix= ""
+#ipoBoneNamePrefix  = ""
+# for example, if on entry an armature named Man was selected, and the object prefix was "a."
+#  on exit an armature and an IPO curve named a.Man exists for the object as a whole
+# if that armature had bones (spine, neck, arm) and the bone prefix was "a."
+#  the bones and IPO curves will be (a.spine, a.neck, a.arm)
+
+R2D = 18/3.1415  # radian to grad
+BLENDER_VERSION = Blender.Get('version')
+
+# Gets the current scene, there can be many scenes in 1 blend file. 
+scn = Blender.Scene.GetCurrent()
+
+#=================
+# Methods
+#=================
+########################################
+def debug(num,msg): #use log4j or just console here.
+	if DEBUG >= num:
+		if BATCH == False:
+			print 'debug:             '[:num/10+7]+msg
+		#TODO: else write out to file (runs faster if it doesnt have to display details)
+	return
+
+########################################
+def error(str):
+	debug(0,'ERROR: '+str)
+	if BATCH == False:
+		Draw.PupMenu('ERROR%t|'+str)
+	return
+
+########################################
+def getRenderInfo():
+	context=scn.getRenderingContext() 
+	staframe = context.startFrame()
+	endframe = context.endFrame()
+	if endframe<staframe: endframe=staframe
+	curframe = Blender.Get(CURFRAME)
+	debug(90,'Scene is on frame %i and frame range is %i to %i' % (curframe,staframe,endframe))
+	return (staframe,endframe,curframe)
+
+########################################
+def sortObjects(obs): #returns a list of objects sorted based on parent dependency
+	obClones= [] 
+	while len(obClones) < len(obs):
+		for ob in obs:
+			if not ob in obClones:
+				par= ob.getParent()
+				#if no parent, or the parent is not scheduled to be cloned
+				if par==None:
+					obClones.append(ob) # add the independent
+				elif par not in obs: # parent will not be cloned
+					obClones.append(ob) # add the child
+				elif par in obClones: # is it on the list?
+					obClones.append(ob) # add the child
+				# parent may be a child, so it will be caught next time thru
+	debug(100,'clone object order: \n%s' % obClones)
+	return obClones # ordered list of (ob, par) tuples
+
+########################################
+def sortBones(xbones): #returns a sorted list of bones that should be added,sorted based on parent dependency
+#  while there are bones to add,
+#    look thru the list of bones we need to add
+#      if we have not already added this bone
+#         if it does not have a parent
+#           add it
+#          else, it has a parent
+#           if we already added it's parent
+#               add it now.
+#           else #we need to keep cycling and catch its parent
+#         else it is a root bone
+#           add it
+#       else skip it, it's already in there
+#     endfor
+#  endwhile
+	xboneNames=[]
+	for xbone in xbones: xboneNames.append(xbone.name)
+	debug (80,'reference bone order: \n%s' % xboneNames)
+	eboneNames=[]
+	while len(eboneNames) < len(xboneNames):
+		for xbone in xbones:
+			if not xbone.name in eboneNames:
+				if not xbone.parent:
+					eboneNames.append(xbone.name)
+				else:
+					if xbone.parent.name in eboneNames:
+						eboneNames.append(xbone.name)
+					#else skip it
+				#endif
+			#else prego
+		#endfor
+	#endwhile
+	debug (80,'clone bone order: \n%s' % eboneNames)
+	return eboneNames
+
+########################################
+def dupliArmature(ob): #makes a copy in current scn of the armature used by ob and its bones
+	ob_mat = ob.matrixWorld
+	ob_data = ob.getData()
+	debug(49,'Reference object uses %s' % ob_data)
+	arm_ob = Armature.Get(ob_data.name) #the armature used by the passed object
+	
+	arm = Blender.Armature.New()
+	debug(20,'Cloning Armature %s to create %s' % (arm_ob.name, arm.name))
+	arm.drawType = Armature.STICK #set the draw type
+
+	arm.makeEditable() #enter editmode
+
+	# for each bone in the object's armature,
+	xbones=ob.data.bones.values()
+	usrSpace = 0 #0=armature, 1=local
+	space=[BONE_SPACES[usrSpace]][0] 
+
+	#we have to make a list of bones, then figure out our parents, then add to the arm
+	#when creating a child, we cannot link to a parent if it does not yet exist in our armature 
+	ebones = [] #list of the bones I want to create for my arm
+
+	eboneNames = sortBones(xbones)
+
+	i=0
+	# error('bones sorted. continue?')
+	for abone in eboneNames: #set all editable attributes to fully define the bone.
+		for bone in xbones: 
+			if bone.name == abone: break  # get the reference bone
+		ebone = Armature.Editbone() #throw me a bone, bone-man!
+		ebones.append(ebone) #you're on my list, buddy
+
+		ebone.name = bone.name
+		ebone.headRadius = bone.headRadius
+		ebone.tailRadius = bone.tailRadius
+		ebone.weight = bone.weight
+		ebone.options = bone.options
+		
+		ebone.head = bone.head[space] #dictionary lookups
+		ebone.tail = bone.tail[space]
+		ebone.matrix = bone.matrix[space]
+		ebone.roll = bone.roll[space]
+
+		debug(30,'Generating new %s as child of %s' % (bone,bone.parent))
+		if bone.hasParent(): 
+#      parent=bone.parent.name
+#      debug(100,'looking for %s' % parent)
+#      for parbone in xbones: if parbone.name == parent: break # get the parent bone
+#      ebone.parent = arm.bones[ebones[j].name]
+			ebone.parent = arm.bones[bone.parent.name]
+#    else:
+#       ebone.parent = None
+		debug(30,'Generating new editbone %s as child of %s' % (ebone,ebone.parent))
+		arm.bones[ebone.name] = ebone # i would have expected an append or add function, but this works
+
+	debug (100,'arm.bones: \n%s' % arm.bones)
+	debug (20,'Cloned %i bones now in armature %s' %(len(arm.bones),arm.name)) 
+
+	myob = scn.objects.new(arm) #interestingly, object must be created before 
+	arm.update()                #armature can be saved
+	debug(40,'dupArm finished %s instanced as object %s' % (arm.name,myob.getName()))
+	print ob.matrix
+	print myob.matrix
+	
+	return myob
+########################################
+def scrub(): # scrubs to startframe
+	staFrame,endFrame,curFrame = getRenderInfo()
+
+	# eye-candy, go from current to start, fwd or back
+	if not BATCH:
+		debug(100, "Positioning to start...")
+		frameinc=(staFrame-curFrame)/10
+		if abs(frameinc) >= 1:
+			for i in range(10):
+				curFrame+=frameinc
+				Blender.Set(CURFRAME,curFrame) # computes the constrained location of the 'real' objects
+				Blender.Redraw()
+	Blender.Set(CURFRAME, staFrame)
+	return
+
+########################################
+def bakeBones(ref_ob,arm_ob): #copy pose from ref_ob to arm_ob
+	scrub()
+	staFrame,endFrame,curFrame = getRenderInfo()
+	act = getBakedPoseData(ref_ob, staFrame, endFrame, ACTION_BAKE = True, ACTION_BAKE_FIRST_FRAME = usrACTION) # bake the pose positions of the reference ob to the armature ob
+	arm_ob.action = act
+	scrub()  
+	
+	# user comprehension feature - change action name and channel ipo names to match the names of the bone they drive
+	debug (80,'Renaming each action ipo to match the bone they pose')
+	act.name = arm_ob.name
+	arm_channels = act.getAllChannelIpos()
+	pose= arm_ob.getPose()
+	pbones= pose.bones.values() #we want the bones themselves, not the dictionary lookup
+	for pbone in pbones:
+		debug (100,'Channel listing for %s: %s' % (pbone.name,arm_channels[pbone.name] ))
+		ipo=arm_channels[pbone.name]
+		ipo.name = pbone.name # since bone names are unique within an armature, the pose names can be the same since they are within an Action
+
+	return
+
+########################################
+def getOrCreateCurve(ipo, curvename):
+	"""
+	Retrieve or create a Blender Ipo Curve named C{curvename} in the C{ipo} Ipo
+	Either an ipo curve named C{curvename} exists before the call then this curve is returned,
+	Or such a curve doesn't exist before the call .. then it is created into the c{ipo} Ipo and returned 
+	"""
+	try:
+		mycurve = ipo.getCurve(curvename)
+		if mycurve != None:
+			pass
+		else:
+			mycurve = ipo.addCurve(curvename)
+	except:
+		mycurve = ipo.addCurve(curvename)
+	return mycurve
+
+########################################
+def eraseCurve(ipo,numCurves):
+	debug(90,'Erasing %i curves for %' % (numCurves,ipo.GetName()))
+	for i in range(numCurves):
+		nbBezPoints= ipo.getNBezPoints(i)
+		for j in range(nbBezPoints):
+			ipo.delBezPoint(i)
+	return
+
+########################################
+def resetIPO(ipo):
+	debug(60,'Resetting ipo curve named %s' %ipo.name)
+	numCurves = ipo.getNcurves() #like LocX, LocY, etc
+	if numCurves > 0:
+		eraseCurve(ipo, numCurves) #erase data if one exists
+	return
+
+########################################
+def resetIPOs(ob): #resets all IPO curvess assocated with an object and its bones
+	debug(30,'Resetting any ipo curves linked to %s' %ob.getName())
+	ipo = ob.getIpo() #may be None
+	ipoName = ipo.getName() #name of the IPO that guides/controls this object
+	debug(70,'Object IPO is %s' %ipoName)
+	try:
+		ipo = Ipo.Get(ipoName)
+	except:
+		ipo = Ipo.New('Object', ipoName)
+	resetIPO(ipo)
+	if ob.getType() == ARMATURE:
+		arm_data=ob.getData()
+		bones=arm_data.bones.values()
+		for bone in bones:
+			#for each bone: get the name and check for a Pose IPO
+			debug(10,'Processing '+ bone.name)
+	return
+
+########################################
+def parse(string,delim):
+	index = string.find(delim) # -1 if not found, else pointer to delim
+	if index+1:  return string[:index]
+	return string
+
+########################################
+def newIpo(ipoName): #add a new Ipo object to the Blender scene
+	ipo=Blender.Ipo.New('Object',ipoName)
+
+	ipo.addCurve('LocX')
+	ipo.addCurve('LocY')
+	ipo.addCurve('LocZ')
+	ipo.addCurve('RotX')
+	ipo.addCurve('RotY')
+	ipo.addCurve('RotZ')
+	return ipo
+
+########################################
+def makeUpaName(type,name): #i know this exists in Blender somewhere...
+	debug(90,'Making up a new %s name using %s as a basis.' % (type,name))
+	name = (parse(name,'.'))
+	if type == 'Ipo':
+		ipoName = name # maybe we get lucky today
+		ext = 0
+		extlen = 3 # 3 digit extensions, like hello.002
+		success = False
+		while not(success):
+			try:
+				debug(100,'Trying %s' % ipoName)
+				ipo = Ipo.Get(ipoName)
+				#that one exists if we get here. add on extension and keep trying
+				ext +=1
+				if ext>=10**extlen: extlen +=1 # go to more digits if 999 not found
+				ipoName = '%s.%s' % (name, str(ext).zfill(extlen))
+			except: # could not find it
+				success = True
+		name=ipoName 
+	else:
+		debug (0,'FATAL ERROR: I dont know how to make up a new %s name based on %s' % (type,ob))
+		return None
+	return name
+
+########################################
+def createIpo(ob): #create an Ipo and curves and link them to this object
+	#first, we have to create a unique name
+	#try first with just the name of the object to keep things simple.
+	ipoName = makeUpaName('Ipo',ob.getName()) # make up a name for a new Ipo based on the object name
+	debug(20,'Ipo and LocRot curves called %s' % ipoName)
+	ipo=newIpo(ipoName)
+	ob.setIpo(ipo) #link them
+	return ipo
+
+########################################
+def getLocLocal(ob):
+	key = [
+			ob.LocX, 
+			ob.LocY, 
+			ob.LocZ,
+			ob.RotX*R2D, #get the curves in this order
+			ob.RotY*R2D, 
+			ob.RotZ*R2D
+			]
+	return key
+
+########################################
+def getLocReal(ob):
+	obMatrix = ob.matrixWorld #Thank you IdeasMan42
+	loc = obMatrix.translationPart()
+	rot = obMatrix.toEuler()
+	key = [
+			loc.x,
+			loc.y,
+			loc.z,
+			rot.x/10,
+			rot.y/10,
+			rot.z/10
+			]
+	return key
+
+########################################
+def getLocRot(ob,space):
+	if space in xrange(len(COORDINATE_SYSTEMS)):
+		if space == COORD_LOCAL:
+			key = getLocLocal(ob)
+			return key
+		elif space == COORD_REAL:
+			key = getLocReal(ob)
+			return key
+		else: #hey, programmers make mistakes too.
+			debug(0,'Fatal Error: getLoc called with %i' % space)
+	return
+
+########################################
+def getCurves(ipo):
+	ipos = [
+			ipo[Ipo.OB_LOCX],
+			ipo[Ipo.OB_LOCY],
+			ipo[Ipo.OB_LOCZ],
+			ipo[Ipo.OB_ROTX], #get the curves in this order
+			ipo[Ipo.OB_ROTY],
+			ipo[Ipo.OB_ROTZ]
+			]
+	return ipos
+
+########################################
+def addPoint(time,keyLocRot,ipos):
+	if BLENDER_VERSION < 245:
+		debug(0,'WARNING: addPoint uses BezTriple')
+	for i in range(len(ipos)):
+		point = BezTriple.New() #this was new with Blender 2.45 API
+		point.pt = (time, keyLocRot[i])
+		point.handleTypes = [1,1]
+
+		ipos[i].append(point)
+	return ipos
+
+########################################
+def bakeFrames(ob,myipo): #bakes an object in a scene, returning the IPO containing the curves
+	myipoName = myipo.getName()
+	debug(20,'Baking frames for scene %s object %s to ipo %s' % (scn.getName(),ob.getName(),myipoName))
+	ipos = getCurves(myipo)
+	#TODO: Gui setup idea: myOffset
+	# reset action to start at frame 1 or at location
+	myOffset=0 #=1-staframe
+	#loop through frames in the animation. Often, there is rollup and the mocap starts late
+	staframe,endframe,curframe = getRenderInfo()
+	for frame in range(staframe, endframe+1):
+		debug(80,'Baking Frame %i' % frame)
+		#tell Blender to advace to frame
+		Blender.Set(CURFRAME,frame) # computes the constrained location of the 'real' objects
+		if not BATCH: Blender.Redraw() # no secrets, let user see what we are doing
+			
+		#using the constrained Loc Rot of the object, set the location of the unconstrained clone. Yea! Clones are FreeMen
+		key = getLocRot(ob,usrCoord) #a key is a set of specifed exact channel values (LocRotScale) for a certain frame
+		key = [a+b for a,b in zip(key, usrDelta)] #offset to the new location
+
+		myframe= frame+myOffset
+		Blender.Set(CURFRAME,myframe)
+		
+		time = Blender.Get('curtime') #for BezTriple
+		ipos = addPoint(time,key,ipos) #add this data at this time to the ipos
+		debug(100,'%s %i %.3f %.2f %.2f %.2f %.2f %.2f %.2f' % (myipoName, myframe, time, key[0], key[1], key[2], key[3], key[4], key[5]))
+	# eye-candy - smoothly rewind the animation, showing now how the clone match moves
+	if endframe-staframe <400 and not BATCH:
+		for frame in range (endframe,staframe,-1): #rewind
+			Blender.Set(CURFRAME,frame) # computes the constrained location of the 'real' objects
+			Blender.Redraw()
+	Blender.Set(CURFRAME,staframe)
+	Blender.Redraw()
+
+	return ipos
+
+########################################
+def duplicateLinked(ob):
+	obType = ob.type
+	debug(10,'Duplicating %s Object named %s' % (obType,ob.getName()))
+	scn.objects.selected = [ob]
+##      rdw: simplified by just duplicating armature. kept code as reference for creating armatures
+##        disadvantage is that you cant have clone as stick and original as octahedron
+##        since they share the same Armature. User can click Make Single User button.      
+##      if obType == ARMATURE: #build a copy from scratch
+##        myob= dupliArmature(ob)
+##      else:
+	Blender.Object.Duplicate() # Duplicate linked, including pose constraints.
+	myobs = Object.GetSelected() #duplicate is top on the list
+	myob = myobs[0]
+	if usrParent == False:
+		myob.clrParent(usrFreeze)     
+	debug(20,'=myob= was created as %s' % myob.getName())
+	return myob
+
+########################################
+def removeConstraints(ob):
+	for const in ob.constraints:
+		debug(90,'removed %s => %s' % (ob.name, const))
+		ob.constraints.remove(const)
+	return
+    
+########################################
+def removeConstraintsOb(ob): # from object or armature
+	debug(40,'Removing constraints from '+ob.getName())
+	if BLENDER_VERSION > 241: #constraints module not available before 242
+		removeConstraints(ob)
+		if ob.getType() == ARMATURE:
+			pose = ob.getPose()
+			for pbone in pose.bones.values():
+				#bone = pose.bones[bonename]
+				removeConstraints(pbone)
+		#should also check if it is a deflector?
+	return
+
+########################################
+def deLinkOb(type,ob): #remove linkages
+	if type == 'Ipo':
+		success = ob.clearIpo() #true=there was one
+		if success: debug(80,'deLinked Ipo curve to %s' % ob.getName())
+	return
+
+########################################
+def bakeObject(ob): #bakes the core object locrot and assigns the Ipo to a Clone
+	if ob != None:  
+		# Clone the object - duplicate it, clean the clone, and create an ipo curve for the clone
+		myob = duplicateLinked(ob)  #clone it
+		myob.name= usrObjectNamePrefix + ob.getName()
+		removeConstraintsOb(myob)   #my object is a free man
+		deLinkOb('Ipo',myob)        #kids, it's not nice to share. you've been lied to
+		if ob.getType() != ARMATURE: # baking armatures is based on bones, not object
+			myipo = createIpo(myob)     #create own IPO and curves for the clone object
+			ipos = bakeFrames(ob,myipo) #bake the locrot for this obj for the scene frames
+	return myob
+    
+########################################
+def bake(ob,par): #bakes an object of any type, linking it to parent
+	debug(0,'Baking %s object %s' % (ob.getType(), ob))
+	clone = bakeObject(ob) #creates and bakes the object motion
+	if par!= None:
+		par.makeParent([clone])  
+		debug(20,"assigned object to parent %s" % par)
+	if ob.getType() == ARMATURE:
+##              error('Object baked. Continue with bones?')
+		bakeBones(ob,clone) #go into the bones and copy from -> to in frame range
+	#future idea: bakeMesh (net result of Shapekeys, Softbody, Cloth, Fluidsim,...)
+	return clone
+    
+########################################
+def tstCreateArm(): #create a test armature in scene
+	# rip-off from http://www.blender.org/documentation/245PythonDoc/Pose-module.html - thank you!
+
+	debug(0,'Making Test Armature')
+	# New Armature
+	arm_data= Armature.New('myArmature')
+	print arm_data
+	arm_ob = scn.objects.new(arm_data)
+	arm_data.makeEditable()
+
+	# Add 4 bones
+	ebones = [Armature.Editbone(), Armature.Editbone(), Armature.Editbone(), Armature.Editbone()]
+
+	# Name the editbones
+	ebones[0].name = 'Bone.001'
+	ebones[1].name = 'Bone.002'
+	ebones[2].name = 'Bone.003'
+	ebones[3].name = 'Bone.004'
+
+	# Assign the editbones to the armature
+	for eb in ebones:
+		arm_data.bones[eb.name]= eb
+
+	# Set the locations of the bones
+	ebones[0].head= Mathutils.Vector(0,0,0)
+	ebones[0].tail= Mathutils.Vector(0,0,1) #tip
+	ebones[1].head= Mathutils.Vector(0,0,1)
+	ebones[1].tail= Mathutils.Vector(0,0,2)
+	ebones[2].head= Mathutils.Vector(0,0,2)
+	ebones[2].tail= Mathutils.Vector(0,0,3)
+	ebones[3].head= Mathutils.Vector(0,0,3)
+	ebones[3].tail= Mathutils.Vector(0,0,4)
+
+	ebones[1].parent= ebones[0]
+	ebones[2].parent= ebones[1]
+	ebones[3].parent= ebones[2]
+
+	arm_data.update()
+	# Done with editing the armature
+
+	# Assign the pose animation
+	arm_pose = arm_ob.getPose()
+
+	act = arm_ob.getAction()
+	if not act: # Add a pose action if we dont have one
+		act = Armature.NLA.NewAction()
+		act.setActive(arm_ob)
+
+	xbones=arm_ob.data.bones.values()
+	pbones = arm_pose.bones.values()
+
+	frame = 1
+	for pbone in pbones: # set bones to no rotation
+		pbone.quat[:] = 1.000,0.000,0.000,0.0000
+		pbone.insertKey(arm_ob, frame, Object.Pose.ROT)
+
+	# Set a different rotation at frame 25
+	pbones[0].quat[:] = 1.000,0.1000,0.2000,0.20000
+	pbones[1].quat[:] = 1.000,0.6000,0.5000,0.40000
+	pbones[2].quat[:] = 1.000,0.1000,0.3000,0.40000
+	pbones[3].quat[:] = 1.000,-0.2000,-0.3000,0.30000
+
+	frame = 25
+	for i in xrange(4):
+		pbones[i].insertKey(arm_ob, frame, Object.Pose.ROT)
+
+	pbones[0].quat[:] = 1.000,0.000,0.000,0.0000
+	pbones[1].quat[:] = 1.000,0.000,0.000,0.0000
+	pbones[2].quat[:] = 1.000,0.000,0.000,0.0000
+	pbones[3].quat[:] = 1.000,0.000,0.000,0.0000
+
+	frame = 50      
+	for pbone in pbones: # set bones to no rotation
+		pbone.quat[:] = 1.000,0.000,0.000,0.0000
+		pbone.insertKey(arm_ob, frame, Object.Pose.ROT)
+
+	return arm_ob
+
+########################################
+def tstMoveOb(ob): # makes a simple LocRot animation of object in the scene
+	anim = [
+		#Loc      Rot/10
+		#
+		( 0,0,0, 0, 0, 0), #frame 1 origin
+		( 1,0,0, 0, 0, 0), #frame 2
+		( 1,1,0, 0, 0, 0),
+		( 1,1,1, 0, 0, 0),
+		( 1,1,1,4.5,  0,  0),
+		( 1,1,1,4.5,4.5,  0),
+		( 1,1,1,4.5,4.5,4.5)
+		]
+	space = COORD_LOCAL
+	ipo = createIpo(ob) #create an Ipo and curves for this object
+	ipos = getCurves(ipo)
+	
+	# span this motion over the currently set anim range
+	# to set points, i need time but do not know how it is computed, so will have to advance the animation
+	staframe,endframe,curframe = getRenderInfo()
+
+	frame = staframe #x position of new ipo datapoint. set to staframe if you want a match
+	frameDelta=(endframe-staframe)/(len(anim)) #accomplish the animation in frame range
+	for key in anim: #effectively does a getLocRot()
+		#tell Blender to advace to frame
+		Blender.Set('curframe',frame) # computes the constrained location of the 'real' objects
+		time = Blender.Get('curtime')
+
+		ipos = addPoint(time,key,ipos) #add this data at this time to the ipos
+
+		debug(100,'%s %i %.3f %.2f %.2f %.2f %.2f %.2f %.2f' % (ipo.name, frame, time, key[0], key[1], key[2], key[3], key[4], key[5]))
+		frame += frameDelta
+	Blender.Set(CURFRAME,curframe) # reset back to where we started
+	return
+#=================
+# Program Template
+#=================
+########################################
+def main():
+	# return code set via rt button in Blender Buttons Scene Context Anim panel
+	if MODE == 1: #create test armature #1
+		ob = tstCreateArm()      # make test arm and select it
+		tstMoveOb(ob)
+		scn.objects.selected = [ob]
+
+	obs= Blender.Object.GetSelected() #scn.objects.selected
+	obs= sortObjects(obs)
+	debug(0,'Baking %i objects' % len(obs))
+
+	if len(obs) >= 1:   # user might have multiple objects selected
+		i= 0
+		clones=[] # my clone army
+		for ob in obs:
+			par= ob.getParent()
+			if not usrParent:
+				if par in obs:
+					par= clones[obs.index(par)]
+			clones.append(bake(ob,par))
+		scn.objects.selected = clones
+	else:
+		error('Please select at least one object')
+	return
+
+########################################
+def benchmark(): # This lets you benchmark (time) the script's running duration 
+	Window.WaitCursor(1) 
+	t = sys.time() 
+	debug(60,'%s began at %.0f' %(__script__,sys.time()))
+
+	# Run the function on the active scene
+	in_editmode = Window.EditMode()
+	if in_editmode: Window.EditMode(0)
+
+	main() 
+
+	if in_editmode: Window.EditMode(1)
+	
+	# Timing the script is a good way to be aware on any speed hits when scripting 
+	debug(0,'%s Script finished in %.2f seconds' % (__script__,sys.time()-t) )
+	Window.WaitCursor(0) 
+	return
+
+########################################
+# This lets you can import the script without running it 
+if __name__ == '__main__': 
+	debug(0, "------------------------------------")
+	debug(0, "%s %s Script begins with mode=%i debug=%i batch=%s" % (__script__,__version__,MODE,DEBUG,BATCH))
+	benchmark()
diff --git a/release/scripts/bpymodules/BPyArmature.py b/release/scripts/bpymodules/BPyArmature.py
index d0b41dc35c5..63df02d080c 100644
--- a/release/scripts/bpymodules/BPyArmature.py
+++ b/release/scripts/bpymodules/BPyArmature.py
@@ -11,13 +11,19 @@
 # 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
+# Version History:
+#   1.0 original release bakes an armature into a matrix
+#   1.1 optional params (ACTION_BAKE, ACTION_BAKE_FIRST_FRAME, direct function to key and return the Action
 
 import Blender
+from Blender import sys
 import bpy
-def getBakedPoseData(ob_arm, start_frame, end_frame):
+def getBakedPoseData(ob_arm, start_frame, end_frame, ACTION_BAKE = False, ACTION_BAKE_FIRST_FRAME = True):
 	'''
 	If you are currently getting IPO's this function can be used to
-	return a list of frame aligned bone dictionary's
+	ACTION_BAKE==False: return a list of frame aligned bone dictionary's
+	ACTION_BAKE==True: return an action with keys aligned to bone constrained movement
+	if ACTION_BAKE_FIRST_FRAME is not supplied or is true: keys begin at frame 1
 	
 	The data in these can be swaped in for the IPO loc and quat
 	
@@ -77,7 +83,13 @@ def getBakedPoseData(ob_arm, start_frame, end_frame):
 	
 	# --------------------------------- Main loop to collect IPO data
 	frame_index = 0
+	NvideoFrames= end_frame-start_frame
 	for current_frame in xrange(start_frame, end_frame+1):
+		if   frame_index==0: start=sys.time()
+		elif frame_index==15: print NvideoFrames*(sys.time()-start),"seconds estimated..." #slows as it grows *3
+		elif frame_index >15:
+			percom= frame_index*100/NvideoFrames
+			print "Frame %i Overall %i percent complete\r" % (current_frame, percom),
 		ob_arm.action = backup_action
 		#pose.update() # not needed
 		Blender.Set('curframe', current_frame)
@@ -88,9 +100,7 @@ def getBakedPoseData(ob_arm, start_frame, end_frame):
 		
 		for index, parent_index, bone_name, rest_bone, rest_matrix, rest_matrix_inv, pose_bone, ipo in armature_bone_data:
 			matrix= pose_bone.poseMatrix
-			
 			parent_bone= rest_bone.parent
-			
 			if parent_index != -1:
 				parent_pose_matrix =		armature_bone_data[parent_index][6].poseMatrix
 				parent_bone_matrix_inv =	armature_bone_data[parent_index][5]
@@ -98,40 +108,45 @@ def getBakedPoseData(ob_arm, start_frame, end_frame):
 				rest_matrix=				rest_matrix * parent_bone_matrix_inv
 			
 			matrix=matrix * rest_matrix.copy().invert()
-			
 			pose_bone.quat=	matrix.toQuat()
 			pose_bone.loc=	matrix.translationPart()
-			pose_bone.insertKey(ob_arm, 1, POSE_XFORM) # always frame 1
+			if ACTION_BAKE==False:
+				pose_bone.insertKey(ob_arm, 1, POSE_XFORM) # always frame 1
+	 
+				# THIS IS A BAD HACK! IT SUCKS BIGTIME BUT THE RESULT ARE NICE
+				# - use a temp action and bake into that, always at the same frame
+				#   so as not to make big IPO's, then collect the result from the IPOs
 			
-			# THIS IS A BAD HACK! IT SUCKS BIGTIME BUT THE RESULT ARE NICE
-			# - use a temp action and bake into that, always at the same frame
-			#   so as not to make big IPO's, then collect the result from the IPOs
+				# Now get the data from the IPOs
+				if not ipo:	ipo = armature_bone_data[index][7] = new_action.getChannelIpo(bone_name)
 			
-			# Now get the data from the IPOs
-			if not ipo:	ipo = armature_bone_data[index][7] = new_action.getChannelIpo(bone_name)
+				loc = Vector()
+				quat  = Quaternion()
 			
-			loc = Vector()
-			quat  = Quaternion()
+				for curve in ipo:
+					val = curve.evaluate(1)
+					curve_name= curve.name
+					if   curve_name == 'LocX':  loc[0] = val
+					elif curve_name == 'LocY':  loc[1] = val
+					elif curve_name == 'LocZ':  loc[2] = val
+					elif curve_name == 'QuatW': quat[3]  = val
+					elif curve_name == 'QuatX': quat[0]  = val
+					elif curve_name == 'QuatY': quat[1]  = val
+					elif curve_name == 'QuatZ': quat[2]  = val
 			
-			for curve in ipo:
-				val = curve.evaluate(1)
-				curve_name= curve.name
-				if   curve_name == 'LocX':  loc[0] = val
-				elif curve_name == 'LocY':  loc[1] = val
-				elif curve_name == 'LocZ':  loc[2] = val
-				elif curve_name == 'QuatW': quat[3]  = val
-				elif curve_name == 'QuatX': quat[0]  = val
-				elif curve_name == 'QuatY': quat[1]  = val
-				elif curve_name == 'QuatZ': quat[2]  = val
-			
-			bake_data[frame_index][bone_name] = loc, quat
-			
-		
+				bake_data[frame_index][bone_name] = loc, quat
+			else:
+				if ACTION_BAKE_FIRST_FRAME: pose_bone.insertKey(ob_arm, frame_index+1,  POSE_XFORM)
+				else:           pose_bone.insertKey(ob_arm, current_frame , POSE_XFORM)
 		frame_index+=1
-	
+	print "\nBaking Complete."
 	ob_arm.action = backup_action
-	Blender.Set('curframe', backup_frame)
-	return bake_data
+	if ACTION_BAKE==False:
+		Blender.Set('curframe', backup_frame)
+		return bake_data
+	elif ACTION_BAKE==True:
+		return new_action
+	else: print "ERROR: Invalid ACTION_BAKE %i sent to BPyArmature" % ACTION_BAKE
 
 
 
diff --git a/release/scripts/c3d_import.py b/release/scripts/c3d_import.py
new file mode 100644
index 00000000000..ca4f8cd79e9
--- /dev/null
+++ b/release/scripts/c3d_import.py
@@ -0,0 +1,1243 @@
+#!BPY
+
+"""
+Name: 'Motion Capture  (.c3d)...'
+Blender: 246
+Group: 'Import'
+Tooltip: 'Import a C3D Motion Capture file'
+"""
+__script__ = "C3D Motion Capture file import"
+__author__ = " Jean-Baptiste PERIN, Roger D. Wickes (rogerwickes@yahoo.com)"
+__version__ = "0.9"
+__url__ = ["Communicate problems and errors, BlenderArtists.org, Python forum"]
+__email__= ["rogerwickes@yahoo.com", "c3d script"]
+__bpydoc__ = """\
+c3d_import.py v0.8
+
+Script loading Graphics Lab Motion Capture file,  
+Usage:<br>
+	- Run the script <br>
+	- Choose the file to open<br>
+	- Press Import C3D button<br>
+
+Version History:
+ 0.4: PERIN Released under Blender Artistic Licence
+ 0.5: WICKES used marker names, fixed 2.45 depricated call
+ 0.6: WICKES creates armature for each subject
+ 0.7: WICKES constrains armature to follow the empties (markers). Verified for shake hands s
+ 0.8: WICKES resolved DEC support issue
+ 0.9: BARTON removed scene name change, whitespace edits. WICKES added IK layers
+"""
+
+#----------------------------------------------
+# (c) Jean-Baptiste PERIN  december 2005, released under Blender Artistic Licence
+#    for the Blender 2.40 Python Scripts Bundle.
+#----------------------------------------------
+
+######################################################
+# This script imports a C3D file into blender. 
+# Loader is based on MATLAB C3D loader from
+# Alan Morris, Toronto, October 1998
+# Jaap Harlaar, Amsterdam, april 2002
+######################################################
+
+import string
+import Blender
+from Blender import *
+import bpy
+import struct
+import BPyMessages
+Vector= Blender.Mathutils.Vector
+Euler= Blender.Mathutils.Euler
+Matrix= Blender.Mathutils.Matrix
+RotationMatrix = Blender.Mathutils.RotationMatrix
+TranslationMatrix= Blender.Mathutils.TranslationMatrix
+
+#=================
+# Global Variables, Constants, Defaults, and Shorthand References
+#=================
+# set senstitivity for displaying debug/console messages. 0=few, 100=max, including clicks at major steps
+# debug(num,string) to conditionally display status/info in console window
+DEBUG=Blender.Get('rt')
+
+# marker sets known in the world
+HUMAN_CMU= "HumanRTKm.mkr" # The Human Real-Time capture marker set used by CMU
+HUMAN_CMU2="HumanRT.mkr" # found in another file, seems same as others in that series
+MARKER_SETS = [ HUMAN_CMU, HUMAN_CMU2 ] # marker sets that this program supports (can make an armature for)
+XYZ_LIMIT= 10000 #max value for coordinates if in integer format
+
+# what layers to put stuff on in scene. 1 is selected, so everything goes there
+# selecting only layer 2 shows only the armature moving, 12 shows only the empties
+LAYERS_ARMOB= [1,2]
+LAYERS_MARKER=[1,12]
+LAYERS_IK=[1,11]
+IK_PREFIX="ik_" # prefix in empty name: ik_prefix+subject prefix+bone name
+
+CLEAN=True # Should program ignore markers at (0,0,0) and beyond the outer limits?
+
+scn = Blender.Scene.GetCurrent()
+
+BCS=Blender.Constraint.Settings # shorthand dictionary - define with brace, reference with bracket
+trackto={"+x":BCS.TRACKX, "+y":BCS.TRACKY, "+z":BCS.TRACKZ, "-x":BCS.TRACKNEGX, "-y":BCS.TRACKNEGY, "-z":BCS.TRACKNEGZ}
+trackup={"x":BCS.UPX, "y":BCS.UPY, "z":BCS.UPZ}
+
+#=============================#
+# Classes 
+#=============================#
+class Marker:
+	def __init__(self, x, y, z):
+		self.x=0.0
+		self.y=0.0
+		self.z=0.0
+
+	def __repr__(self): #report on self, as in if just printed
+		return str("[x = "+str(self.x) +" y = " + str(self.y)+" z = "+ str(self.z)+"]")
+
+class ParameterGroup:
+	def __init__(self, nom, description, parameter):
+		self.name = nom
+		self.description = description
+		self.parameter = parameter
+
+	def __repr__(self):
+		return self.name, " ", self.description, " ", self.parameter
+
+class Parameter:
+	def __init__(self, name, datatype, dim, data, description):
+		self.name = name
+		self.datatype = datatype
+		self.dim = dim
+		self.data = data
+		self.description = description
+ 
+		def __repr__(self):
+			return self.name, " ", self.description, " ", self.dim
+
+class MyVector:
+	def __init__(self, fx,fy,fz):
+		self.x=fx
+		self.y=fy
+		self.z=fz
+
+class Mybone:
+	"information structure for bone generation and posing"
+	def __init__(self, name,vec,par,head,tail,const):
+		self.name=name      # name of this bone. must be unique within armature
+		self.vec=vec         # edit bone vector it points
+		self.parent=par     # name of parent bone to locate head and form a chain
+		self.headMark=head  # list of 0+ markers where the head of this non-parented bone should be placed
+		self.tailMark=tail  # list of 0+ markers where the tip should be placed
+		self.const=const    # list of 0+ constraint tuples to control posing
+		self.head=MyVector(0,0,0) #T-pose location
+		self.tail=MyVector(0,0,0)
+	def __repr__(self):
+		return '[Mybone "%s"]' % self.name
+
+
+#=============================#
+# functions/modules 
+#=============================#
+def error(str):
+	Draw.PupMenu('ERROR%t|'+str)
+	return
+def status(str):
+	Draw.PupMenu('STATUS%t|'+str+"|Continue?")
+	return
+def debug(num,msg): #use log4j or just console here.
+	if DEBUG >= num:
+					print 'debug:', (' '*num), msg
+	#TODO: if level 0, make a text file in Blender file to record major stuff
+	return
+
+def names(ob): return ob.name
+
+
+#########
+# Cette fonction renvoie la liste des empties
+# in  : 
+# out : emp_list (List of Object) la liste des objets de type "Empty"
+#########
+def getEmpty(name):
+	obs = [ob for ob in scn.objects if ob.type=="Empty" and ob.name==name]
+	if len(obs)==0:
+		return None
+	elif len(obs)==1:
+		return obs[0]
+	else:
+		error("FATAL ERROR: %i empties %s in file" % (len(obs),ob[0]))
+#########
+# Cette fonction renvoie un empty 
+# in  : objname : le nom de l'empty recherche
+# out : myobj : l'empty cree ou retrouve
+#########
+def getOrCreateEmpty(objname):
+	myobj= getEmpty(objname)
+	if myobj==None: 
+		myobj = scn.objects.new("Empty",objname)
+		debug(50,'Marker/Empty created %s' %  myobj)
+	return myobj
+
+def getOrCreateCurve(ipo, curvename):
+	"""
+	Retrieve or create a Blender Ipo Curve named C{curvename} in the C{ipo} Ipo
+
+	>>> import mylib 
+
+	>>> lIpo = GetOrCreateIPO("Une IPO")
+	>>> laCurve = getOrCreateCurve(lIpo, "RotX")
+
+	Either an ipo curve named C{curvename} exists before the call then this curve is returned,
+	Or such a curve doesn't exist before the call .. then it is created into the c{ipo} Ipo and returned 
+
+	@type  ipo: Blender Ipo
+	@param ipo: the Ipo in which the curve must be retrieved or created.
+	@type  curvename: string
+	@param curvename: name of the IPO.
+	@rtype:   Blender Curve
+	@return:  a Blender Curve named C{curvename} in the C{ipo} Ipo 
+	"""
+	try:
+		mycurve = ipo.getCurve(curvename)
+		if mycurve != None:
+			pass
+		else:
+			mycurve = ipo.addCurve(curvename)
+	except:
+		mycurve = ipo.addCurve(curvename)
+	return mycurve
+
+def eraseIPO (objectname):
+	object = Blender.Object.Get(objectname)
+	lIpo = object.getIpo()
+	if lIpo != None:
+		nbCurves = lIpo.getNcurves()
+		for i in range(nbCurves):
+			nbBezPoints = lIpo.getNBezPoints(i)
+			for j in range(nbBezPoints):
+				lIpo.delBezPoint(i)
+
+def comp_loc(emptyNameList):
+	myloc=Vector(0,0,0)
+	for emName in emptyNameList:
+		myobj = Blender.Object.Get(emName)
+		for i in range(3):
+			myloc[i]= myloc[i]+(myobj.loc[i]/len(emptyNameList)) #take the average loc of all marks
+	return myloc
+
+def comp_len(head, tail): # computes the length of a bone
+	headvec=comp_loc(head)
+	tailvec=comp_loc(tail)
+	netvec=headvec-tailvec
+	return netvec.length
+
+def createHumanCMU(): # human bone structure, makes a node set for CMU MoCap Lab
+	# order of bones: "spine","chest","neck","head",...face toward you in front view
+	# pose constraints are tuples of (type,target,influence,other-as-needed)
+	# constraint stack order is important. for proper bone pointing and orinetation:
+	#  IK, then TT +YZ in world space. then LR XZ to 0 in world space, this points the bone, twists it, but then
+	# limits the rotation to the sidebar enpty with the Z facing it, and Y pointing along the bone.
+	nodes=[]        # bonename, vector, parent, head targets, tail targets, constraint list
+	for i in range(23): nodes.append(Mybone("name","vec","par",[],[],[]))
+	nodes[0]= Mybone("root", "-Y","",["RBWT", "LBWT"],["RFWT", "LFWT", "RBWT", "LBWT"],[("LOC","RBWT",1.0),("LOC","LBWT",0.5),("IK","RFWT",1.0),("IK","LFWT",0.5),("TT","RBWT",1,"+YZ"),("LR","XZ",1)])
+	nodes[1]= Mybone("spine","+Z","root",[],["STRN","T10"],[("IK","STRN",1.0),("IK","T10",0.5),("TT","STRN",1,"+YZ"),("LR","XZ",1)])
+	nodes[2]= Mybone("chest","+Z","spine",[],["CLAV","C7"],[("IK","CLAV",1.0),("IK","C7",0.5),("TT","CLAV",1,"+YZ"),("LR","XZ",1)])
+	nodes[3]= Mybone("neck", "+Z","chest",[],["RBHD","LBHD"],[("IK","RBHD",1.0),("IK","LBHD",0.5),("TT","LBHD",1,"+YZ"),("LR","XZ",1)])
+	nodes[4]= Mybone("head" ,"-Y","neck",[],["RFHD","LFHD"],[("IK","RFHD",1.0),("IK","LFHD",0.5),("TT","LFHD",1,"+YZ"),("LR","XZ",1)])
+	
+	nodes[5]= Mybone("shoulder.R","-X","chest",[],["RSHO"],[("IK","RSHO",1.0)])
+	nodes[6]= Mybone("toparm.R",  "-X","shoulder.R",[],["RELB"],[("IK","RELB",1.0),("TT","RUPA",1,"+YZ"),("LR","XZ",1)])
+	nodes[7]= Mybone("lowarm.R",  "-X","toparm.R",[],["RWRA","RWRB"],[("IK","RWRA",1.0),("IK","RWRB",0.5),("TT","RFRM",1,"+YZ"),("LR","XZ",1)])
+	nodes[8]= Mybone("hand.R",    "-X","lowarm.R",[],["RFIN"],[("IK","RFIN",1.0),("TT","RWRA",1,"+YZ"),("LR","XZ",1)])  #missing ,"RTHM"
+
+	nodes[9]= Mybone("hip.R",   "-X","root",[],["RFWT","RBWT"],[("IK","RFWT",1.0),("IK","RBWT",0.5)])
+	nodes[10]=Mybone("topleg.R","-Z","hip.R",[],["RKNE"],[("IK","RKNE",1),("TT","RTHI",1,"+YZ"),("LR","XZ",1)])
+	nodes[11]=Mybone("lowleg.R","-Z","topleg.R",[],["RANK","RHEE"],[("IK","RHEE",1.0),("TT","RSHN",1,"+YZ"),("LR","XZ",1)])
+	nodes[12]=Mybone("foot.R",  "-Y","lowleg.R",[],["RTOE","RMT5"],[("IK","RTOE",1.0),("IK","RMT5",0.2),("TT","RMT5",1,"+YZ")])
+	nodes[13]=Mybone("toes.R",  "-Y","foot.R",[],["RTOE"],[("IK","RTOE",1.0)])
+	
+	nodes[14]=Mybone("shoulder.L","+X","chest",[],["LSHO"],[("IK","LSHO",1.0)])
+	nodes[15]=Mybone("toparm.L",  "+X","shoulder.L",[],["LELB"],[("IK","LELB",1.0),("TT","LUPA",1,"+YZ"),("LR","XZ",1)])
+	nodes[16]=Mybone("lowarm.L",  "+X","toparm.L",[],["LWRA","LWRB"],[("IK","LWRA",1.0),("IK","LWRB",0.5),("TT","LFRM",1,"+YZ"),("LR","XZ",1)])
+	nodes[17]=Mybone("hand.L",    "+X","lowarm.L",[],["LFIN"],[("IK","LFIN",1.0),("TT","RWRA",1,"+YZ"),("LR","XZ",1)]) #missing ,"LTHM"
+	
+	nodes[18]=Mybone("hip.L",   "+X","root",[],["LFWT","LBWT"],[("IK","LFWT",1.0),("IK","LBWT",0.5)])
+	nodes[19]=Mybone("topleg.L","-Z","hip.L",[],["LKNE"],[("IK","LKNE",1),("TT","LTHI",1,"+YZ"),("LR","XZ",1)])
+	nodes[20]=Mybone("lowleg.L","-Z","topleg.L",[],["LANK","LHEE"],[("IK","LHEE",1.0),("TT","LSHN",1,"+YZ"),("LR","XZ",1)])
+	nodes[21]=Mybone("foot.L",  "-Y","lowleg.L",[],["LTOE","LMT5"],[("IK","LTOE",1.0),("IK","LMT5",0.2),("TT","LMT5",1,"+YZ"),("LR","XZ",1)])
+	nodes[22]=Mybone("toes.L",  "-Y","foot.L",[],["LTOE"],[("IK","LTOE",1.0)])
+	return nodes
+
+def createNodes(marker_set): # make a list of bone name, parent, edit head loc, edit tail loc, pose constraints
+	#ultimately, I want to read in an XML file here that specifies the node trees for various marker sets
+	if   marker_set==HUMAN_CMU:  nodes= createHumanCMU() #load up and verify the file has the CMU marker set
+	elif marker_set==HUMAN_CMU2: nodes= createHumanCMU()
+	else: nodes=[]
+	return nodes
+def findEntry(item,list):
+	for i in range(len(list)):
+		if item==list[i]: break
+	debug(100,"findEtnry %s is %i in list of %i items" % (item,i,len(list)))
+	return i
+def makeNodes(prefix, markerList, empties, marker_set): #make sure the file has the nodes selected
+	nodes= createNodes(marker_set)  # list has generic marker names; replace them with the actual object names created
+	#each entry in markerlist has a corresponding entry in empties in the same order
+	errList=[]
+	for i in range(len(nodes)):
+		node= nodes[i]
+		debug(60,"Adapting node %s to prefix %s" % (node,prefix))
+
+		#replace generic head markers with actual empty names
+		for im in range(len(node.headMark)):
+			marker= node.headMark[im]
+			mark= prefix+marker
+			imn= findEntry(mark,markerList)
+			if imn < len(markerList):
+				debug(90,"Adapating head marker %s to %s" % (marker,empties[imn].name))
+				nodes[i].headMark[im]= empties[imn].name
+			else: errList.append([node.name,"head location",mark,node,2])
+ 
+		#replace generic tail markers with actual empty names
+		for im in range(len(node.tailMark)):
+			marker= node.tailMark[im]
+			mark= prefix+marker
+			imn= findEntry(mark,markerList)
+			if imn < len(markerList):
+				debug(90,"Adapating  marker %s to %s" % (marker,empties[imn].name))
+				nodes[i].tailMark[im]= empties[imn].name
+			else: errList.append([node.name,"tail location",mark,node,2])
+			
+		#replace generic constraint markers (if the constraint references a marker) with empty name
+		for im in range(len(node.const)):
+			const=node.const[im]
+			if const[0] in ("LOC","IK","TT"):
+				marker=const[1]
+				mark= prefix+marker
+				imn= findEntry(mark,markerList)
+				if imn < len(markerList):
+					debug(90,"Adapating %s constraint marker %s to %s" % (const[0],marker,empties[imn].name))
+					if const[0] in ("IK","LR","LOC"):
+						nodes[i].const[im]=(const[0], empties[imn].name, const[2])
+					else: nodes[i].const[im]=(const[0], empties[imn].name, const[2], const[3])
+				else: errList.append([node.name,const[0]+" constraint",mark,node,4])
+			
+	if errList!=[]: #we have issues. 
+		for err in errList:
+			debug(0,"Bone "+err[0]+" specifies "+err[2]+" as "+err[1]+"which was not specified in file.")
+			#need a popup here to ignore/cleanup node tree, or add the marker(?) or abort
+			usrOption= 1
+			if usrOption==0: #ignore this marker (remove it)
+				for node in nodes: #find the bone in error
+					if node.name==err[0]:
+						print "Before",node
+						if err[3] in range(2,3):
+							node[err[3]].remove(err[2]) #find the marker in error and remove it
+						elif err[3]==4: #find the constraint and remove it
+							for const in node.const:
+								if const[1]==err[2]: node.const.remove(const)
+						print "After",node
+			elif usrOption==1: #add these markers as static empties, and user will automate them later
+				#and the bones will be keyed to them, so it will all be good.
+				#file may have just mis-named the empty, or the location can be derived based on other markers
+				em= getOrCreateEmpty(err[2])
+				em.layers= LAYERS_MARKER
+			else: abort() #abend
+			if DEBUG==100: status("Nodes Updated")
+	return nodes #nodes may be updated
+
+def makeBones(arm,nodes): 
+	debug(20,"Making %i edit bones" % len(nodes))
+	for node in nodes:
+		bone= Blender.Armature.Editbone()
+		bone.name= node.name
+		arm.bones[bone.name]= bone #add it to the armature
+		debug(50,"Bone added: %s" % bone)
+		if bone.name <> node.name:
+			debug(0,"ERROR: duplicate node % name specified" % node.name)
+			node.name= bone.name #you may not get what you asked for
+		if node.parent!="": #parent
+			debug(60,"Bone parent: %s"%node.parent)
+			bone.parent= arm.bones[node.parent]
+			bone.options = [Armature.CONNECTED]
+		#compute head = average of the reference empties
+		if node.headMark==[]: # no head explicitly stated, must be tail of parent
+			for parnode in nodes:
+				if node.parent==parnode.name: break
+			node.headMark= parnode.tailMark
+			node.head= parnode.tail
+		else: node.head= comp_loc(node.headMark) #node head is specified, probably only for root.
+
+		bone.head= node.head
+		debug(60,"%s bone head: (%0.2f, %0.2f, %0.2f)" % (bone.name,bone.head.x, bone.head.y, bone.head.z))
+		mylen=comp_len(node.headMark,node.tailMark) # length of the bone as it was recorded for that person
+		# for our T position, compute the bone length, add it to the head vector component to get the tail
+		if node.vec[0]=="-": mylen=-mylen
+		debug(80,"Bone vector %s length %0.2f" %(node.vec,mylen))
+		node.tail= Vector(node.head)
+		myvec=node.vec[1].lower()
+		if   myvec=="x": node.tail.x+=mylen
+		elif myvec=="y": node.tail.y+=mylen
+		elif myvec=="z": node.tail.z+=mylen
+		else:
+			debug(0,"%s %s %s %s" % (node.vec,myvec,node.vec[0],node.vec[1]))
+			error("ERROR IN BONE SPEC ")
+		bone.tail= node.tail
+		debug(60,"Bone tail: (%i,%i,%i)" %(bone.tail.x, bone.tail.y, bone.tail.z))
+	#Armature created in the T postion, but with bone lengths to match the marker set and subject
+		#when this is constrained to the markers, the recorded action will be relative to a know Rotation
+		#so that all recorded actions should be interchangeable. wooot!
+		#Only have to adjust starting object loc when matching up actions.
+	return #arm #updated
+
+def makeConstLoc(pbone,const):
+	const_new= pbone.constraints.append(Constraint.Type.COPYLOC)
+	const_new.name = const[0]+"-"+const[1]
+	const_target=Blender.Object.Get(const[1])
+	const_new[BCS.TARGET]= const_target
+	const_new.influence = const[2]
+	return
+				
+def makeConstLimRot(pbone,const):
+	const_new= pbone.constraints.append(Constraint.Type.LIMITROT)
+	const_new.name = const[0]+"-"+const[1]
+	for axis in const[1]:
+		if axis.lower()=="x": const_new[BCS.LIMIT] |= BCS.LIMIT_XROT #set
+		if axis.lower()=="y": const_new[BCS.LIMIT] |= BCS.LIMIT_YROT #set
+		if axis.lower()=="z": const_new[BCS.LIMIT] |= BCS.LIMIT_ZROT #set
+	const_new[BCS.OWNERSPACE]= BCS.SPACE_LOCAL
+	const_new.influence = const[2]
+	# fyi, const[Constraint.Settings.LIMIT] &= ~Constraint.Settings.LIMIT_XROT #reset
+	return
+				
+def makeConstIK(prefix,pbone,const):
+	#Blender 246 only supports one IK Solver per bone, but we might want many,
+	#  so we need to create a reference empty named after the bone
+	#  that floats between the markers, so the bone can point to it as a singularity
+	myob= getOrCreateEmpty(IK_PREFIX+prefix+pbone.name)
+	myob.layers= LAYERS_IK
+	# note that this empty gets all the IK constraints added on as location constraints
+	myconst= myob.constraints.append(Constraint.Type.COPYLOC)
+	myconst.name=const[0]+"-"+const[1]
+	myconst[Constraint.Settings.TARGET]= Blender.Object.Get(const[1])
+	myconst.influence = const[2]
+	
+	#point the bone once to the empty via IK
+	success=False
+	for myconst in pbone.constraints:
+		if myconst.type == Constraint.Type.IKSOLVER: success=True
+	if not(success): #add an IK constraint to the bone to point to the empty
+		#print pbone
+		myconst= pbone.constraints.append(Constraint.Type.IKSOLVER)
+		myconst.name = const[1]
+		myconst[BCS.TARGET]= myob
+		myconst.influence = const[2]
+		#const_new[Constraint.Settings.BONE]= ?
+		myconst[BCS.CHAINLEN]= 1
+		myconst[BCS.USETIP]= True
+		myconst[BCS.STRETCH]= False
+		return
+					
+def makeConstTT(pbone,const):
+	myconst= pbone.constraints.append(Constraint.Type.TRACKTO)
+	myconst.name=const[0]+"-"+const[1]
+	debug(70,"%s %s" % (myconst,const[3]))
+	myob= getEmpty(const[1])
+	if myob!= None:
+		myconst[BCS.TARGET]= myob
+		myconst.influence = const[2]
+		#const[3] is the Track and the thrird char is the Up indicator
+		myconst[BCS.TRACK]= trackto[const[3][0:2].lower()]
+		myconst[BCS.UP]=trackup[const[3][2].lower()]#up direction
+		myconst[BCS.OWNERSPACE]= BCS.SPACE_LOCAL
+		myconst[BCS.TARGETSPACE]= [BCS.SPACE_LOCAL]
+		if const[3][1]==const[3][2]: debug(0,"WARNING: Track To axis and up axis should not be the same. Constraint is INACTIVE")
+	else:   #marker not found. could be missing from this file, or an error in node spec
+		error("TrackTo Constraint for %s |specifies unknown marker %s" % (pbone.name,const[1]))
+	return
+
+def makePoses(prefix,arm_ob,nodes): # pose this armature object based on node requirements
+	#this is constraint-based posing, not hard-keyed posing.
+	#we do constraint-based first so that user can adjust the constraints, possibly smooth/tweak motion
+	#  add additional bones or referneces/constraints, before baking to hard keyframes
+
+	pose= arm_ob.getPose()
+	debug(0,"Posing %s %s" % (arm_ob, pose))
+	for node in nodes:
+		debug(30, "examining %s" %node)
+		if len(node.const)>0: #constraints for this bone are desired
+			pbone = pose.bones[node.name]
+			debug(40,"Posing bone %s" %pbone)
+			for const in node.const:
+				debug(50,"Constraining %s by %s" %(pbone,const))
+				if   const[0]=="LOC":makeConstLoc(pbone,const)
+				elif const[0]=="IK": makeConstIK(prefix,pbone,const)
+				elif const[0]=="LR": makeConstLimRot(pbone,const)  
+				elif const[0]=="TT": makeConstTT(pbone,const)
+				else: 
+					error("FATAL: constraint %s not supported" %const[0])
+					break
+	debug(10, "Posing complete. Cycling pose and edit mode")
+	pose.update()
+	return
+
+def make_arm(subject,prefix,markerList, emptyList,marker_set):
+	debug(10,"**************************")
+	debug(00, "**** Making Armature for %s..." % subject)
+	debug(10, "**************************")
+	# copied from bvh import bvh_node_dict2armature; trying to use similar process for further integtration down the road
+	# Add the new armature,
+	
+	nodes= makeNodes(prefix, markerList, emptyList, marker_set) #assume everyone in file uses the same mocap suit
+	# each person in the file may be different height, so each needs their own new armature to match marker location
+
+##  obs= Blender.Object.Get()
+##  success=False
+##  for ob in obs:
+##    if ob.name==subject:
+##      success=True
+##  if success:
+##    menu="Human Armature already exists for this subject."
+##    menu+="%t|Create another in this scene"
+##    menu+="%l|Start a new scene"
+##    menu+="%l|Use this armature"
+##    menusel= Draw.PupMenu(menu)
+	
+	arm= Blender.Armature.New(subject) #make an armature.
+	debug(10,"Created Armature %s" % arm)
+	# Put us into editmode
+	arm.makeEditable()
+	arm.drawType = Armature.OCTAHEDRON
+	makeBones(arm,nodes)
+	scn = Blender.Scene.GetCurrent() #add it to the current scene. could create new scenes here as yaf
+	arm_ob= scn.objects.new(arm) #instance it in the scene. this is the new way for 2.46 to instance objects
+	arm_ob.name= subject #name it something like the person it represents
+	arm_ob.layers= LAYERS_ARMOB
+	debug(20,"Instanced Armature %s" % arm_ob)
+	arm.update() #exit editmode. Arm must be instanced as an object before you can save changes or pose it
+	Blender.Redraw() # show the world
+	if DEBUG==100: status("T-Bones made.")
+
+	makePoses(prefix,arm_ob,nodes) #constrain arm_ob with these markers
+	
+	scn.update(1) #make everyone behave themselves in the scene, and respect the new constraints
+	return arm_ob
+
+def setupAnim(StartFrame, EndFrame, VideoFrameRate):
+	debug(100, 'VideoFrameRate is %i' %VideoFrameRate)
+	if VideoFrameRate<1: VideoFrameRate=1
+	if VideoFrameRate>120: VideoFrameRate=120
+	# set up anim panel for them
+	context=scn.getRenderingContext() 
+	context.startFrame(StartFrame)
+	context.endFrame(EndFrame)
+	context.framesPerSec(int(VideoFrameRate))
+	Blender.Set("curframe",StartFrame)
+	Blender.Redraw()
+	return
+
+def makeCloud(Nmarkers,markerList,StartFrame,EndFrame,Markers):
+	debug(10, "**************************")
+	debug(00, "*** Making Cloud Formation")
+	debug(10, "**************************")
+	empties=[]
+	ipos=[]
+	curvesX=[]
+	curvesY=[]
+	curvesZ=[]
+	debug(0, "%i Markers (empty cloud) will be put on layers %s" % (Nmarkers,LAYERS_MARKER))
+	# Empty Cloud formation
+	for i in range(Nmarkers):
+		debug(100,"%i marker %s"%(i, markerList[i]))
+		emptyname = markerList[i] # rdw: to use meaningful names from Points parameter
+		em= getOrCreateEmpty(emptyname) #in this scene
+		em.layers= LAYERS_MARKER
+		#make a list of the actual empty
+		empties.append(em)
+		#assign it an ipo with the loc xyz curves
+		lipo = Ipo.New("Object",em.name)
+		ipos.append(lipo)
+		curvesX.append(getOrCreateCurve(ipos[i],'LocX'))
+		curvesY.append(getOrCreateCurve(ipos[i],'LocY'))
+		curvesZ.append(getOrCreateCurve(ipos[i],'LocZ'))
+		empties[i].setIpo(ipos[i])
+	debug(30,"Cloud of %i empties created." % len(empties))
+	NvideoFrames= EndFrame-StartFrame+1
+	debug(10, "**************************")
+	debug(00, "**** Calculating Marker Ipo Curves over %i Frames ..." % NvideoFrames)
+	debug(10, "**************************")
+	err= index=0 #number of errors, logical frame
+	for frame in range(StartFrame,EndFrame+1):
+		if   index==0:   start=sys.time()
+		elif index==100:
+			tmp=(NvideoFrames-100)*(sys.time()-start)/6000
+			debug(0,"%i minutes process time estimated" % tmp)
+		elif index >100: print index*100/(NvideoFrames-1),"% complete\r",
+		for i in range(Nmarkers):
+			if Markers[index][i].z < 0: Markers[index][i].z= -Markers[index][i].z
+			success=True
+			if CLEAN:   #check for good data
+				# C3D marker decoding may have coordinates negative (improper sign bit decoding?)
+				myX= abs(Markers[index][i].x)
+				myY= abs(Markers[index][i].y)
+				myZ= Markers[index][i].z
+				if myX > 10000 or myY > 10000 or myZ > 10000: success=False
+				if myX <.01 and myY <.01 and myZ <.01: success=False # discontinuity in marker tracking (lost marker)
+			
+			if success:
+				curvesX[i].append((frame, Markers[index][i].x)) #2.46 knot method
+				curvesY[i].append((frame, Markers[index][i].y))
+				curvesZ[i].append((frame, Markers[index][i].z))
+				if frame==StartFrame: debug(40, "%s loc frame %i: (%0.2f, %0.2f, %0.2f)" % (markerList[i],frame,Markers[index][i].x,Markers[index][i].y,Markers[index][i].z))
+			else:
+				err+=1 # some files have thousands...
+				#debug(30,"Point ignored for marker:%s frame %i: (%i, %i, %i)" %       (markerList[i],frame,Markers[index][i].x,Markers[index][i].y,Markers[index][i].z))
+		index += 1
+	debug(70, "%i points ignored across all markers and frames. Recalculating..." % err)
+
+	for i in range(Nmarkers):
+		curvesX[i].Recalc()
+		curvesY[i].Recalc()
+		curvesZ[i].Recalc()
+	Blender.Set('curframe', StartFrame)
+	Blender.Redraw()
+	if DEBUG==100: status("Clound formed")
+	return empties
+
+def getNumber(str, length):
+		if length==2: # unsigned short
+			return struct.unpack('H',str[0:2])[0], str[2:]
+		sum = 0
+		for i in range(length):
+				#sum = (sum << 8) + ord(str[i]) for big endian
+				sum = sum + ord(str[i])*(2**(8*i))
+		return sum, str[length:]
+def unpackFloat(chunk,proctype):
+		#print proctype
+		myvar=chunk[0:4]
+		if   proctype==2: #DEC-VAX
+			myvar=chunk[2:4]+chunk[0:2] #swap lo=hi word order pair
+		return struct.unpack('f',myvar[0:4])[0]
+		
+def getFloat(chunk,proctype):
+		return unpackFloat(chunk, proctype), chunk[4:]
+def parseFloat(chunk,ptr,proctype):
+	return unpackFloat(chunk[ptr:ptr+4], proctype), ptr+4
+
+ 
+def load_c3d(FullFileName):
+# Input:        FullFileName - file (including path) to be read
+#
+# Variable:
+# Markers            3D-marker data [Nmarkers x NvideoFrames x Ndim(=3)]
+# VideoFrameRate     Frames/sec
+# AnalogSignals      Analog signals [Nsignals x NanalogSamples ]
+# AnalogFrameRate    Samples/sec
+# Event              Event(Nevents).time ..value  ..name
+# ParameterGroup     ParameterGroup(Ngroups).Parameters(Nparameters).data ..etc.
+# CameraInfo         MarkerRelated CameraInfo [Nmarkers x NvideoFrames]
+# ResidualError      MarkerRelated ErrorInfo  [Nmarkers x NvideoFrames]
+
+	Markers=[];
+	VideoFrameRate=120;
+	AnalogSignals=[];
+	AnalogFrameRate=0;
+	Event=[];
+	ParameterGroups=[];
+	CameraInfo=[];
+	ResidualError=[];
+
+	debug(10, "*********************")
+	debug(10, "**** Opening File ***")
+	debug(10, "*********************")
+
+	#ind=findstr(FullFileName,'\');
+	#if ind>0, FileName=FullFileName(ind(length(ind))+1:length(FullFileName)); else FileName=FullFileName; end
+	debug(0, "FileName = " + FullFileName)
+	fid=open(FullFileName,'rb'); # native format (PC-intel). ideasman says maybe rU
+	content = fid.read();
+	content_memory = content
+	#Header  section
+	NrecordFirstParameterblock, content = getNumber(content,1)     # Reading record number of parameter section
+
+	key, content = getNumber(content,1)
+	if key!=80:
+		error('File: does not comply to the C3D format')
+		fid.close()
+		return
+	#Paramter section
+	content = content[512*(NrecordFirstParameterblock-1)+1:] # first word ignored
+	#file format spec says that  3rd byte=NumberofParmaterRecords... but is ignored here.
+	proctype,content =getNumber(content,1)
+	proctype = proctype-83
+	proctypes= ["unknown","(INTEL-PC)","(DEC-VAX)","(MIPS-SUN/SGI)"]
+	
+	if proctype in (1,2): debug(0, "Processor coding %s"%proctypes[proctype])
+	elif proctype==3: debug(0,"Program untested with %s"%proctypes[proctype])
+	else:
+		debug(0, "INVALID processor type %i"%proctype)
+		proctype=1
+		debug(0,"OVERRIDE processor type %i"%proctype)
+
+	#if proctype==2,
+	#    fclose(fid);
+	#    fid=fopen(FullFileName,'r','d'); % DEC VAX D floating point and VAX ordering
+	#end
+	debug(10, "***********************")
+	debug(00, "**** Reading Header ***")
+	debug(10, "***********************")
+
+	# ###############################################
+	# ##                                           ##
+	# ##    read header                            ##
+	# ##                                           ##
+	# ###############################################
+
+	#%NrecordFirstParameterblock=fread(fid,1,'int8');     % Reading record number of parameter section
+	#%key1=fread(fid,1,'int8');                           % key = 80;
+
+	content = content_memory
+ #fseek(fid,2,'bof');
+	content = content[2:]
+
+	#
+	Nmarkers, content=getNumber(content, 2)
+	NanalogSamplesPerVideoFrame, content = getNumber(content, 2)
+	StartFrame,  content = getNumber(content, 2)
+	EndFrame,  content = getNumber(content, 2)
+	MaxInterpolationGap,  content = getNumber(content, 2)
+
+	Scale, content = getFloat(content,proctype)
+	
+	NrecordDataBlock,  content = getNumber(content, 2)
+	NanalogFramesPerVideoFrame,  content = getNumber(content, 2)
+
+	if NanalogFramesPerVideoFrame > 0:
+		NanalogChannels=NanalogSamplesPerVideoFrame/NanalogFramesPerVideoFrame
+	else:
+		NanalogChannels=0
+
+	VideoFrameRate, content = getFloat(content,proctype)
+
+	AnalogFrameRate=VideoFrameRate*NanalogFramesPerVideoFrame
+	NvideoFrames = EndFrame - StartFrame + 1
+
+	debug(0, "Scale= %0.2f" %Scale)
+	debug(0, "NanalogFramesPerVideoFrame= %i" %NanalogFramesPerVideoFrame)
+	debug(0, "Video Frame Rate= %i" %VideoFrameRate)
+	debug(0, "AnalogFrame Rate= %i"%AnalogFrameRate)
+	debug(0, "# markers= %i" %Nmarkers)
+	debug(0, "StartFrame= %i" %StartFrame)
+	debug(0, "EndFrame= %i" %EndFrame)
+	debug(0, "# Video Frames= %i" %NvideoFrames)
+	
+	if Scale>0:
+		debug(0, "Marker data is in integer format")
+		if Scale>(XYZ_LIMIT/32767):
+			Scale=XYZ_LIMIT/32767.0
+			debug(0, "OVERRIDE: Max coordinate is %i, Scale changed to %0.2f" % (XYZ_LIMIT,Scale))
+	else: debug(0, "Marker data is in floating point format")
+	if VideoFrameRate<1 or VideoFrameRate>120:
+		VideoFrameRate= 120
+		debug(0, "OVERRIDE Video Frame Rate= %i" %VideoFrameRate)
+	if proctype not in (1,2): # Intel, DEC are known good
+		debug(0, "OVERRIDE|Program not tested with this encoding. Set to Intel")
+		proctype= 1
+
+	debug(10, "***********************")
+	debug(10, "**** Reading Events ...")
+	debug(10, "***********************")
+
+	content = content_memory
+	content = content[298:] #bizarre .. ce devrait être 150 selon la doc rdw skips first 299 bytes?
+
+	EventIndicator,  content = getNumber(content, 2)
+	EventTime=[]
+	EventValue=[]
+	EventName=[]
+
+	debug(0, "Event Indicator = %i" %EventIndicator)
+	if EventIndicator==12345: #rdw: somehow, this original code seems fishy, but I cannot deny it.
+		Nevents,  content = getNumber(content, 2)
+		debug(0, "Nevents= %i" %Nevents)
+		content = content[2:]
+		if Nevents>0:
+			for i in range(Nevents):
+				letime, content = getFloat(content,proctype)
+				EventTime.append(letime)
+			content = content_memory
+			content = content[188*2:]
+			for i in range(Nevents):
+				lavalue, content = getNumber(content, 1)
+				EventValue.append(lavalue)
+			content = content_memory
+			content = content[198*2:]
+			for i in range(Nevents):
+				lenom = content[0:4]
+				content = content[4:]
+				EventName.append(lenom)
+
+	debug(00, "***************************")
+	debug(00, "**** Reading Parameters ...")
+	debug(10, "***************************")
+	subjects=[]  # a name would be nice, but human will do
+	prefixes=[] # added on to mocap marker names, one for each subject
+	marker_subjects = [] # hopefully will be specified in the file and known to this program
+	markerList=[]
+	ParameterGroups = []
+	ParameterNumberIndex = []
+	
+	content = content_memory
+	content = content[512*(NrecordFirstParameterblock-1):] 
+
+	dat1, content = getNumber(content, 1)
+	key2, content = getNumber(content, 1)
+
+	NparameterRecords, content = getNumber(content, 1)
+	debug(100, "NparameterRecords=%i"%NparameterRecords)
+	proctype,content =getNumber(content,1)
+	proctype = proctype-83                 # proctype: 1(INTEL-PC); 2(DEC-VAX); 3(MIPS-SUN/SGI)
+
+	for i in range(NparameterRecords):
+		leparam = ParameterGroup(None, None, [])
+		ParameterGroups.append(leparam)
+		ParameterNumberIndex.append(0)
+	#
+	Ncharacters, content = getNumber(content, 1)
+	if Ncharacters>=128:
+		Ncharacters = -(2**8)+(Ncharacters)
+	GroupNumber, content = getNumber(content, 1)
+	if GroupNumber>=128:
+		GroupNumber = -(2**8)+(GroupNumber)
+	debug(80,"GroupNumber = %i, Nchar=%i" %(GroupNumber,Ncharacters))
+
+	while Ncharacters > 0:
+		if GroupNumber<0:
+			GroupNumber=abs(GroupNumber)
+			GroupName = content[0:Ncharacters]
+			content = content[Ncharacters:]
+			#print "Group Number = ", GroupNumber
+			ParameterGroups[GroupNumber].name = GroupName
+			#print "ParameterGroupName =", GroupName
+			offset, content = getNumber(content, 2)
+			deschars, content = getNumber(content, 1)
+			GroupDescription = content[0:deschars]
+			content = content[deschars:]
+			ParameterGroups[GroupNumber].description = GroupDescription
+			#
+			ParameterNumberIndex[GroupNumber]=0
+			content = content[offset-3-deschars:]
+		else:
+			
+			ParameterNumberIndex[GroupNumber]=ParameterNumberIndex[GroupNumber]+1
+			ParameterNumber=ParameterNumberIndex[GroupNumber]
+			#print "ParameterNumber=", ParameterNumber
+			ParameterGroups[GroupNumber].parameter.append(Parameter(None, None, [], [], None))
+			ParameterName = content[0:Ncharacters]
+			content = content[Ncharacters:]
+			#print "ParameterName = ",ParameterName 
+			if len(ParameterName)>0:
+				ParameterGroups[GroupNumber].parameter[ParameterNumber-1].name=ParameterName
+			offset, content = getNumber(content, 2)
+			filepos = len(content_memory)-len(content)
+			nextrec = filepos+offset-2
+
+			type, content=getNumber(content, 1)
+			if type>=128:
+				type = -(2**8)+type
+			ParameterGroups[GroupNumber].parameter[ParameterNumber-1].type=type
+
+			dimnum, content=getNumber(content, 1)
+			if dimnum == 0:
+				datalength = abs(type)
+			else:
+				mult=1
+				dimension=[]
+				for j in range (dimnum):
+					ladim, content = getNumber(content, 1)
+					dimension.append(ladim)
+					mult=mult*dimension[j]
+					ParameterGroups[GroupNumber].parameter[ParameterNumber-1].dim.append(dimension[j])
+				datalength = abs(type)*mult
+
+			#print "ParameterNumber = ", ParameterNumber, " Group Number = ", GroupNumber
+
+			if type==-1:
+				data = ""
+				wordlength=dimension[0]
+				if dimnum==2 and datalength>0:
+					for j in range(dimension[1]):
+						data=string.rstrip(content[0:wordlength])
+						content = content[wordlength:]
+						ParameterGroups[GroupNumber].parameter[ParameterNumber-1].data.append(data)
+				elif dimnum==1 and datalength>0:
+						data=content[0:wordlength]
+						ParameterGroups[GroupNumber].parameter[ParameterNumber-1].data.append(data) # ???
+
+				myParam=string.rstrip(ParameterName)
+				myGroup=string.rstrip(GroupName)
+				msg= "-%s-%s-" % (myGroup,myParam)
+				if myGroup == "POINT":
+					if myParam== "LABELS":
+						# named in form of subject:marker.
+						# the list "empties" is a corresponding list of actual empty object names that make up the cloud
+						markerList= ParameterGroups[GroupNumber].parameter[ParameterNumber-1].data
+						debug(0, "%sLABELS = %i %s" %(msg, len(markerList),markerList)) #list of logical markers from 0 to n corresponding to points
+					elif myParam== "LABELS2": #more labels
+						# named in form of subject:marker.
+						# the list "empties" is a corresponding list of actual empty object names that make up the cloud
+						momarkList= ParameterGroups[GroupNumber].parameter[ParameterNumber-1].data
+						markerList+=momarkList
+						debug(0, "%sLABELS2 = %i %s" %(msg, len(momarkList),momarkList)) #list of logical markers from 0 to n corresponding to points
+					else: debug(70, "%s UNUSED = %s" %(msg,ParameterGroups[GroupNumber].parameter[ParameterNumber-1].data))
+				elif myGroup in ["SUBJECT", "SUBJECTS"]: #info about the actor
+					if myParam in ["NAME", "NAMES"]:
+						subjects= ParameterGroups[GroupNumber].parameter[ParameterNumber-1].data
+						debug(0, "%sNames of Subjects = %s" %(msg, subjects)) # might be useful in naming armatures
+						for i in range(len(subjects)):
+							subjects[i]=subjects[i].rstrip()
+							if subjects[i]=="": subjects[i]="Human"
+					elif myParam == "LABEL_PREFIXES":
+						prefixes = ParameterGroups[GroupNumber].parameter[ParameterNumber-1].data
+						debug(0, "%sMarker Prefixes = %s" %(msg, prefixes)) # to xlate marker name to that in file
+						for i in range(len(prefixes)):
+							prefixes[i]=prefixes[i].rstrip()
+					elif myParam== "MARKER_SETS":
+						marker_subjects= ParameterGroups[GroupNumber].parameter[ParameterNumber-1].data
+						debug(0, "%sMarker Set = %s"%(msg, marker_subjects)) # marker set that each subject was wearing
+					elif myParam== "MODEL_PARAM":
+						action= ParameterGroups[GroupNumber].parameter[ParameterNumber-1].data
+						debug(0, "%sModel Paramter = %s"%(msg,action)) # might be a good name for the blender scene
+					elif myParam== "LABELS":
+						# named in form of subject:marker.
+						# the list "empties" is a corresponding list of actual empty object names that make up the cloud
+						markerList= ParameterGroups[GroupNumber].parameter[ParameterNumber-1].data
+						debug(0, "%sLABELS = %i %s"%(msg, len(markerList),markerList)) #list of logical markers from 0 to n corresponding to points
+					else: debug(70, "%sUNUSED = %s"%(msg, ParameterGroups[GroupNumber].parameter[ParameterNumber-1].data))
+				else:
+					debug(70, "%sUNUSED = %s"%(msg, ParameterGroups[GroupNumber].parameter[ParameterNumber-1].data))
+			elif type == 1:
+				debug(100,"Block type %i is largely unsupported and untested."%type)
+				data = []
+				Nparameters=datalength/abs(type)
+				debug(100, "Nparameters=%i"%Nparameters)
+				for i in range(Nparameters):
+					ladata,content = getNumber(content, 1)
+					data.append(ladata)
+				ParameterGroups[GroupNumber].parameter[ParameterNumber-1].data=data
+				#print ParameterGroups[GroupNumber].parameter[ParameterNumber-1].data
+
+				#print "type boolean"
+			elif type == 2 and datalength>0:
+				debug(100,"Block type %i is largely unsupported and untested."%type)
+				data = []
+				Nparameters=datalength/abs(type)
+				debug(100, "Nparameters=%i"%Nparameters)
+				for i in range(Nparameters):
+					ladata,content = getNumber(content, 2)
+					data.append(ladata)
+				#ParameterGroups[GroupNumber].parameter[ParameterNumber-1].data=data
+				if dimnum>1:
+					#???? print "arg je comprends pas"
+					ParameterGroups[GroupNumber].parameter[ParameterNumber-1].data=data
+					#???ParameterGroups[GroupNumber].parameter[ParameterNumber-1].data=reshape(data,dimension)
+				else:
+					ParameterGroups[GroupNumber].parameter[ParameterNumber-1].data=data
+				#print ParameterGroups[GroupNumber].parameter[ParameterNumber-1].data
+				#pass
+				#print "type integer"
+			elif type == 4 and datalength>0:
+				debug(100,"Block type %i is largely unsupported and untested."%type)
+				data = []
+				Nparameters=datalength/abs(type)
+				debug(100, "Nparameters=%i"%Nparameters)
+				for i in range(Nparameters):
+					ladata,content = getFloat(content,proctype)  
+					data.append(ladata)
+				if dimnum>1:
+					ParameterGroups[GroupNumber].parameter[ParameterNumber-1].data=data
+					#print "arg je comprends pas"
+					#???ParameterGroups[GroupNumber].parameter[ParameterNumber-1].data=reshape(data,dimension)
+				else:
+					ParameterGroups[GroupNumber].parameter[ParameterNumber-1].data=data
+				#print ParameterGroups[GroupNumber].parameter[ParameterNumber-1].data
+			else:
+				debug(100,"Block type %i is largely unsupported and untested."%type)
+				#print "error"
+				pass
+			deschars, content= getNumber(content, 1)
+			if deschars>0:
+				description = content[0:deschars]
+				content = content[deschars:]
+				ParameterGroups[GroupNumber].parameter[ParameterNumber-1].description=description
+			
+			content = content_memory
+			content = content[nextrec:] 
+
+		Ncharacters,content = getNumber(content, 1)
+		if Ncharacters>=128:
+			Ncharacters = -(2**8)+(Ncharacters)
+		GroupNumber,content = getNumber(content, 1)
+		if GroupNumber>=128:
+			GroupNumber = -(2**8)+(GroupNumber)
+		debug(80,"GroupNumber = %i, Nchar=%i" %(GroupNumber,Ncharacters))
+
+	debug(00, "***************************")
+	debug(00, "**** Examining Parameters ...")
+	debug(10, "***************************")
+
+	if len(subjects)==0: subjects=["Test"] #well, somebody got mocapped!
+	for i in range(0, len(subjects)-len(prefixes)): prefixes.append("")
+	for i in range(0, len(subjects)-len(marker_subjects)): marker_subjects.append(subjects[i])
+
+	#make a markerlist if they didn't
+	debug(0, "%i Markers specified, %i marker names supplied" %(Nmarkers,len(markerList)))
+	if len(markerList)==0:
+		debug(0, "File missing any POINT LABELS marker list. Making defaults")
+		#I guess just make cloud of empty.xxx
+	if len(markerList)<Nmarkers:
+		for i in range(len(markerList),Nmarkers): markerList.append("mark."+str(i))
+	#note that they may supply more markers than Nmarkers, extras are usually null or ignored
+	#an idea here to winnow down the marker List is to go through the nodes and see if there are markers
+	# in the list that are not used in constraining the armature, and discard them or set them debug(0,
+	# so that later on in processing we don't bother saving their location, possibly speeding up processing
+	# because we can just skip over their data block.
+	# put this on TODO list since it gets pretty complicated going throuch each marker set and all constraints etc.
+	
+	## ###############################################
+	## ##                                           ##
+	## ##    Initalize Arrays and Allocate Memory
+	## ##                                           ##
+	## ###############################################
+	##  Get the coordinate and analog data
+	#
+
+	content = content_memory
+	content = content[(NrecordDataBlock-1)*512:] 
+	debug(20,"Allocating memory for %i floats" %NvideoFrames*(Nmarkers*3+2))
+	for i in range (NvideoFrames):
+		Markers.append([])
+		ResidualError.append([])
+		CameraInfo.append([])
+		for j in range (Nmarkers):
+			Markers[i].append(Marker(0.0,0.0,0.0))
+			ResidualError[i].append(0)
+			CameraInfo[i].append(0)
+
+	#print Markers
+	#
+	#if Scale < 0
+	#    for i=1:NvideoFrames
+	#        for j=1:Nmarkers
+	#            Markers(i,j,1:3)=fread(fid,3,'float32')'; 
+	#            a=fix(fread(fid,1,'float32'));  
+	#            highbyte=fix(a/256);
+	#            lowbyte=a-highbyte*256; 
+	#            CameraInfo(i,j)=highbyte; 
+	#            ResidualError(i,j)=lowbyte*abs(Scale); 
+	#        end
+	#        waitbar(i/NvideoFrames)
+	#        for j=1:NanalogFramesPerVideoFrame,
+	#            AnalogSignals(j+NanalogFramesPerVideoFrame*(i-1),1:NanalogChannels)=...
+	#                fread(fid,NanalogChannels,'int16')';
+	#        end
+	#    end
+
+	debug(10, "***************************")
+	debug(00, "**** Reading DataBlock of %i Frames...." % NvideoFrames)
+	debug(10, "***************************")
+	residuals= NanalogFramesPerVideoFrame*NanalogChannels*2
+	err=0 #keep track of errors or serious data issues
+	ptr_read = 0
+
+	if Scale < 0.0: # 3D Data - 4-byte Floating-point Format
+		for i in range (NvideoFrames):
+			if i==0: start=sys.time()
+			elif i==10:
+				tmp=(sys.time()-start)*NvideoFrames/600
+				debug(0,"%i minutes remaining..." % tmp)
+			else: print "%i percent complete. On Frame %i Points procesed: %i\r" % (i*100/NvideoFrames,i,i*Nmarkers),
+			for j in range (Nmarkers):
+	
+				x,ptr_read = parseFloat(content, ptr_read, proctype)
+				y,ptr_read = parseFloat(content, ptr_read, proctype)
+				z,ptr_read = parseFloat(content, ptr_read, proctype)
+				myx= x * -Scale
+				myy= y * -Scale
+				myz= z * -Scale
+
+				if abs(myx)>XYZ_LIMIT or abs(myy)>XYZ_LIMIT or abs(myz)>XYZ_LIMIT:
+					err+=1
+					if err>100:
+						debug(0, "Warning: 100 data points for markers seem way out there")
+						debug(0, "data read: (%i, %i, %i)" %(x,y,z))
+						debug(0, "Consider revising Scale %0.2f" % Scale)
+						debug(0, "which now givs coordinates: (%i, %i, %i)" %(x*Scale,y*Scale,z*Scale))
+						err=-0
+					if abs(myx)>XYZ_LIMIT: myx= XYZ_LIMIT*myx/abs(myx) #preserve sign
+					if abs(myy)>XYZ_LIMIT: myy= XYZ_LIMIT*myy/abs(myy) #preserve sign
+					if abs(myz)>XYZ_LIMIT: myz= XYZ_LIMIT*myz/abs(myz) #preserve sign
+				Markers[i][j].x = myx
+				Markers[i][j].y = myy
+				Markers[i][j].z = myz 
+
+				a,ptr_read = parseFloat(content, ptr_read, proctype)
+				a = int(a)
+				highbyte = int(a/256)
+				lowbyte=a-highbyte*256
+				CameraInfo[i][j] = highbyte
+				ResidualError[i][j] = lowbyte*abs(Scale)
+				#Monitor marker location to ensure data block is being parsed properly
+				if j==0: debug(90,"Frame %i loc of %s: (%i, %i, %i)" % (i,markerList[j],myx,myy,myz))
+				if i==0: debug(50, "Initial loc of %s: (%i, %i, %i)" % (markerList[j],myx,myy,myz))
+
+			ptr_read+=residuals #skip over the following  
+			#for j in range (NanalogFramesPerVideoFrame):
+			#  for k in range(NanalogChannels):
+			#    val, content = getNumber(content, 2)
+			#    AnalogSignals[j+NanalogFramesPerVideoFrame*(i)][k]=val #??? i-1
+	#else
+	#    for i=1:NvideoFrames
+	#        for j=1:Nmarkers
+	#            Markers(i,j,1:3)=fread(fid,3,'int16')'.*Scale;
+	#            ResidualError(i,j)=fread(fid,1,'int8');
+	#            CameraInfo(i,j)=fread(fid,1,'int8');
+	#        end
+	#        waitbar(i/NvideoFrames)
+	#        for j=1:NanalogFramesPerVideoFrame,
+	#            AnalogSignals(j+NanalogFramesPerVideoFrame*(i-1),1:NanalogChannels)=...
+	#                fread(fid,NanalogChannels,'int16')';
+	#        end
+	#    end
+	#end
+
+	else: #Scale is positive, but should be <1 to scale down, like 0.05
+		two16= -2**16
+		if len(content) < NvideoFrames*(Nmarkers*(6+2)+residuals):
+			error("%i bytes is not enough data for |%i frames|%i markers|%i residual" %(len(content),NvideoFrames,Nmarkers,residuals))
+		#Note: I really tried to optimize this loop, since it was taking hours to process
+		for i in range(NvideoFrames):
+			if i==0: start=sys.time()
+			elif i==10:
+				tmp=(sys.time()-start)*NvideoFrames/600
+				debug(0,"%i minutes remaining..." % tmp)
+			else: print "%i percent complete. On Frame %i Points procesed: %i\r" % (i*100/NvideoFrames,i,i*Nmarkers),
+				
+			for j in range(Nmarkers):        
+				#x, content = getNumber(content,2)
+				# this is old skool signed int, not but not a short.
+				x = ord(content[ptr_read+0]) + (ord(content[ptr_read+1])<<8)
+				if x>32768: x+=two16
+				y = ord(content[ptr_read+2]) + (ord(content[ptr_read+3])<<8)
+				if y>32768: y+=two16
+				z = ord(content[ptr_read+4]) + (ord(content[ptr_read+5])<<8)
+				if z>32768: z+=two16
+	
+##        
+##        x = ord(content[ptr_read]) + ord(content[ptr_read+1])*(2**8)
+##        ptr_read+=2
+##        if x > 32768:
+##          x=-(2**16)+(x)
+##        #y, content = getNumber(content,2)
+##        y = ord(content[ptr_read]) + ord(content[ptr_read+1])*(2**8)
+##        ptr_read+=2
+##        if y > 32768:
+##          y=-(2**16)+(y)
+##        #z, content = getNumber(content,2)
+##        z = ord(content[ptr_read]) + ord(content[ptr_read+1])*(2**8)
+##        ptr_read+=2
+##        if z > 32768:
+##          z=-(2**16)+(z)
+##
+##        print "(%i=%i, %i=%i, %i=%i)" %(x,myx,y,myy,z,myz)
+
+				# for integers, I changed Scale above to avoid getting impossible numbers       
+				Markers[i][j].x = x*Scale
+				Markers[i][j].y = y*Scale
+				Markers[i][j].z = z*Scale
+
+##        ResidualError[i][j], content = getNumber(content, 1)
+##        CameraInfo[i][j], content = getNumber(content, 1)
+				#try to improve performance by:
+				ResidualError[i][j]= ord(content[ptr_read+6])
+				CameraInfo[i][j]= ord(content[ptr_read+7])
+				
+				content= content[ptr_read+8:]
+				ptr_read=0
+
+				if j==0: debug(100,"Frame %i loc of %s: %s" % (i,markerList[j],Markers[i][j]))
+				if i==0: debug(50, "Initial loc of %s: (%s)" % (markerList[j],Markers[i][j]))
+				
+			#for j in range (NanalogFramesPerVideoFrame):
+			#  for k in range(NanalogChannels):
+			#    val, content = getNumber(content, 2)
+			#AnalogSignals(j+NanalogFramesPerVideoFrame*(i-1),1:NanalogChannels)=val
+			ptr_read= residuals # skip over the above
+	print "\ndone with file."
+	fid.close()
+
+	cloud= makeCloud(Nmarkers,markerList,StartFrame,EndFrame,Markers)
+
+	setupAnim(StartFrame, EndFrame,VideoFrameRate)
+
+	debug(10, "**************************")
+	debug(00, "**** Making %i Armatures" % len(subjects))
+	debug(10, "**************************")
+	for i in range(len(subjects)):
+		marker_set= marker_subjects[i]
+		success=False
+		if len(marker_set)>0:
+				for trymark in MARKER_SETS: 
+					if trymark[0:len(marker_set)]==marker_set:
+						marker_set=trymark
+						success=True
+		if success:
+			debug(0, "Armature for %s will be put on layers %s" % (subjects[i],LAYERS_ARMOB))
+			debug(0, "  based on an markers beginning with %s" % prefixes[i])
+			ob= make_arm(subjects[i],prefixes[i],markerList,cloud,marker_set)
+		else:
+			debug(00, "Presently, this program can automatically create a constrained armature for marker sets %s" % MARKER_SETS)
+			debug(00, "%s uses an unknown marker set %s" % (subjects[i],marker_set))
+			debug(10, "Have a nice day! If you figure out an armature node system for this cloud, please add it to the program.")
+
+	debug(10, "**************************")
+	debug(00, "**** Conclusion")
+	minmax=[0,0,0,0,0,0]
+	for i in range(NvideoFrames):
+			for j in range(Nmarkers):
+				if minmax[0]>Markers[i][j].x: minmax[0]=Markers[i][j].x
+				if minmax[1]>Markers[i][j].y: minmax[1]=Markers[i][j].y
+				if minmax[2]>Markers[i][j].z: minmax[2]=Markers[i][j].z
+				if minmax[3]<Markers[i][j].x: minmax[3]=Markers[i][j].x
+				if minmax[4]<Markers[i][j].y: minmax[4]=Markers[i][j].y
+				if minmax[5]<Markers[i][j].z: minmax[5]=Markers[i][j].z
+	debug(0,"Markers move in 3D space from (%i,%i,%i) to (%i,%i,%i). "%(minmax[0],minmax[1],minmax[2],minmax[3],minmax[4],minmax[5]))
+	debug(0,"Set your 3D View Properties Clip End and zoom out your display.")
+def my_callback(filename):
+	# processing options UI goes here, eventually
+	Window.WaitCursor(1) 
+	t = sys.time() 
+	load_c3d(filename)
+	# Timing the script is a good way to be aware on any speed hits when scripting 
+	debug(0, '%s file processed in %.2f sec.' % (filename,sys.time()-t))
+	Window.WaitCursor(0)
+				
+def processFile():
+	# select file and pass a handle to the processor
+	Blender.Window.FileSelector(my_callback, "Import C3D") # makes a window a file selector and processes it
+	#processing contiues while file is being worked
+	
+def main(): 
+	# Display the GUI
+	
+	# Run the  function 
+	processFile()
+
+	#Close files, display stats, cleanup, advice on next steps
+
+# This lets you import the script without running it 
+if __name__ == '__main__': 
+	debug(00, "------------------------------------")
+	debug(00, '%s %s script began at %.0f' % (__script__,__version__,sys.time()))
+	main() 
+	
+ 
+
diff --git a/release/scripts/ms3d_import.py b/release/scripts/ms3d_import.py
index 78ffbb92847..c1438cbfc97 100644
--- a/release/scripts/ms3d_import.py
+++ b/release/scripts/ms3d_import.py
@@ -50,7 +50,7 @@ def RM(a):
 	cp = cos(a[1])
 	sr = sin(a[0])
 	cr = cos(a[0])
-	return Matrix([cp*cy, sr*sp*cy+cr*-sy, cr*sp*cy+-sr*-sy],[cp*sy, sr*sp*sy+cr*cy, cr*sp*sy+-sr*cy], [-sp, sr*cp, cr*cp])
+	return Matrix([cp*cy, cp*sy, -sp], [sr*sp*cy+cr*-sy, sr*sp*sy+cr*cy, sr*cp],[cr*sp*cy+-sr*-sy, cr*sp*sy+-sr*cy, cr*cp])
 
 
 # Converts ms3d euler angles to a quaternion
@@ -94,7 +94,12 @@ def import_ms3d(path):
 	except IOError:
 		return "Failed to open the file!"
 
-	# read id
+	# get the file size
+	file.seek(0, os.SEEK_END);
+	fileSize = file.tell();
+	file.seek(0, os.SEEK_SET);
+
+	# read id to check if the file is a MilkShape3D file
 	id = file.read(10)
 	if id!="MS3D000000":
 		return "The file is not a MS3D file!"
@@ -123,7 +128,7 @@ def import_ms3d(path):
 		coords.append(struct.unpack("fff", file.read(3*4)))
 
 		# read bone ids 
-		boneIds.append(struct.unpack("B", file.read(1))[0])
+		boneIds.append(struct.unpack("b", file.read(1))[0])
 
 		# skip refcount		
 		file.read(1)
@@ -190,9 +195,10 @@ def import_ms3d(path):
 			triangleIndices = struct.unpack(str(numGroupTriangles) + "H", file.read(2*numGroupTriangles));
 
 		# read material
-		material = struct.unpack("B", file.read(1))[0]
-		for j in xrange(numGroupTriangles):
-			mesh.faces[triangleIndices[j]].mat = material
+		material = struct.unpack("b", file.read(1))[0]
+		if material>=0:
+			for j in xrange(numGroupTriangles):
+				mesh.faces[triangleIndices[j]].mat = material
 
 	# read the number of materials
 	numMaterials = struct.unpack("H", file.read(2))[0]
@@ -224,7 +230,6 @@ def import_ms3d(path):
 
 		# read shininess
 		shininess = struct.unpack("f", file.read(4))[0]
-		print "Shininess: " + str(shininess)
 
 		# read transparency		
 		transparency = struct.unpack("f", file.read(4))[0]
@@ -272,6 +277,7 @@ def import_ms3d(path):
 		armature.makeEditable()
 
 	# read joints
+	joints = []
 	rotKeys = {}
 	posKeys = {}
 	for i in xrange(numJoints):
@@ -280,6 +286,7 @@ def import_ms3d(path):
 
 		# read name
 		name = uku(file.read(32))
+		joints.append(name)
 
 		# create the bone
 		bone = Blender.Armature.Editbone()
@@ -295,11 +302,13 @@ def import_ms3d(path):
 
 		# read position
 		pos = struct.unpack("fff", file.read(3*4))
-
+		
 		# set head
 		if bone.hasParent():
-			bone.head = bone.parent.matrix * Vector(pos) + bone.parent.head
-			bone.matrix = bone.parent.matrix * RM(rot)
+			bone.head =  Vector(pos) * bone.parent.matrix + bone.parent.head
+			tempM = RM(rot) * bone.parent.matrix
+			tempM.transpose;
+			bone.matrix = tempM
 		else:
 			bone.head = Vector(pos)
 			bone.matrix = RM(rot)
@@ -355,13 +364,111 @@ def import_ms3d(path):
 		# create position keys
 		for key in posKeys[name]:
 			pbone.loc = Vector(key[1])
-			pbone.insertKey(armOb, int(key[0]), Blender.Object.Pose.LOC, True)
+			pbone.insertKey(armOb, int(key[0]+0.5), Blender.Object.Pose.LOC, True)
 
 		# create rotation keys
 		for key in rotKeys[name]:
 			pbone.quat = RQ(key[1])
-			pbone.insertKey(armOb, int(key[0]), Blender.Object.Pose.ROT, True)
+			pbone.insertKey(armOb, int(key[0]+0.5), Blender.Object.Pose.ROT, True)
+
+	# The old format ends here. If there is more data then the file is newer version
+
+	# check to see if there are any comments
+	if file.tell()<fileSize:
+
+		# read sub version
+		subVersion = struct.unpack("i", file.read(4))[0]
+
+		# Is the sub version a supported one
+		if subVersion==1:
+
+			# Group comments
+			numComments = struct.unpack("i", file.read(4))[0]
+			for i in range(numComments):
+				file.read(4) # index
+				size = struct.unpack("i", file.read(4))[0] # comment size
+				if size>0:
+					print "Group comment: " + file.read(size)
+
+			# Material comments
+			numComments = struct.unpack("i", file.read(4))[0]
+			for i in range(numComments):
+				file.read(4) # index
+				size = struct.unpack("i", file.read(4))[0] # comment size
+				if size>0:
+					print "Material comment: " + file.read(size)
+
+			# Joint comments
+			numComments = struct.unpack("i", file.read(4))[0]
+			for i in range(numComments):
+				file.read(4) # index
+				size = struct.unpack("i", file.read(4))[0] # comment size
+				if size>0:
+					print "Joint comment: " + file.read(size)
+
+			# Model comments
+			numComments = struct.unpack("i", file.read(4))[0]
+			for i in range(numComments):
+				file.read(4) # index
+				size = struct.unpack("i", file.read(4))[0] # comment size
+				if size>0:
+					print "Model comment: " + file.read(size)
+
+		# Unknown version give a warning
+		else:
+			print "Warning: Unknown version!"
+
+		
+	# check to see if there is any extra vertex data
+	if file.tell()<fileSize:
+		
+		# read the subversion
+		subVersion = struct.unpack("i", file.read(4))[0]
+
+		# is the version supported
+		if subVersion==2:
+			# read the extra data for each vertex
+			for i in xrange(numVertices):
+				# bone ids
+				ids = struct.unpack("bbb", file.read(3))
+				# weights
+				weights = struct.unpack("BBB", file.read(3))
+				# extra
+				extra = struct.unpack("I", file.read(4))
+				# add extra vertices with weights to deform groups
+				if ids[0]>=0 or ids[1]>=0 or ids[2]>=0:
+					mesh.assignVertsToGroup(joints[boneIds[i]], [i], 0.01*weights[0], 1)
+					if ids[0]>=0:
+						mesh.assignVertsToGroup(joints[ids[0]], [i], 0.01*weights[1], 1)
+					if ids[1]>=0:
+						mesh.assignVertsToGroup(joints[ids[1]], [i], 0.01*weights[2], 1)
+					if ids[2]>=0:
+						mesh.assignVertsToGroup(joints[ids[2]], [i], 0.01*(100-(weights[0]+weights[1]+weights[2])), 1)	
+					
+		elif subVersion==1:
+			# read extra data for each vertex
+			for i in xrange(numVertices):
+				# bone ids
+				ids = struct.unpack("bbb", file.read(3))
+				# weights
+				weights = struct.unpack("BBB", file.read(3))
+				# add extra vertices with weights to deform groups
+				if ids[0]>=0 or ids[1]>=0 or ids[2]>=0:
+					mesh.assignVertsToGroup(joints[boneIds[i]], [i], 0.01*weights[0], 1)
+					if ids[0]>=0:
+						mesh.assignVertsToGroup(joints[ids[0]], [i], 0.01*weights[1], 1)
+					if ids[1]>=0:
+						mesh.assignVertsToGroup(joints[ids[1]], [i], 0.01*weights[2], 1)
+					if ids[2]>=0:
+						mesh.assignVertsToGroup(joints[ids[2]], [i], 0.01*(100-(weights[0]+weights[1]+weights[2])), 1)	
+
+		# non supported subversion give a warning
+		else:
+			print "Warning: Unknown subversion!"
 	
+	# rest of the extra data in the file is not imported/used
+	
+	# refresh the view
 	Blender.Redraw()
 	
 	# close the file
@@ -378,4 +485,3 @@ def fileCallback(filename):
 		Blender.Draw.PupMenu("An error occured during import: " + error + "|Not all data might have been imported succesfully.", 2)
 
 Blender.Window.FileSelector(fileCallback, 'Import')
-
diff --git a/release/scripts/vrml97_export.py b/release/scripts/vrml97_export.py
index eb3be80c99c..b28c7f5bbdc 100644
--- a/release/scripts/vrml97_export.py
+++ b/release/scripts/vrml97_export.py
@@ -3,9 +3,6 @@
 Name: 'VRML97 (.wrl)...'
 Blender: 241
 Group: 'Export'
-Submenu: 'All Objects...' all
-Submenu: 'All Objects compressed...' comp
-Submenu: 'Selected Objects...' selected
 Tooltip: 'Export to VRML97 file (.wrl)'
 """
 
@@ -55,7 +52,7 @@ want to export only selected or all relevant objects.
 
 import Blender
 from Blender import Object, Mesh, Lamp, Draw, BGL, \
-	 Image, Text, sys, Mathutils
+	 Image, Text, sys, Mathutils, Registry
 from Blender.Scene import Render
 
 import math
@@ -70,8 +67,9 @@ worldmat = Blender.Texture.Get()
 filename = Blender.Get('filename')
 _safeOverwrite = True
 extension = ''
-ARG=''
 
+# Matrices below are used only when export_rotate_z_to_y.val:
+#
 # Blender is Z up, VRML is Y up, both are right hand coordinate
 # systems, so to go from Blender coords to VRML coords we rotate
 # by 90 degrees around the X axis. In matrix notation, we have a
@@ -456,6 +454,8 @@ class VRML2Export:
 				if mat:
 					if (mat.mode & Blender.Material.Modes['VCOL_PAINT']):
 						self.vcolors = 1
+		else:
+			self.vcolors = 0
 			
 		# check if object is wireframe only
 		if ob.drawType == Blender.Object.DrawTypes.WIRE:
@@ -633,8 +633,9 @@ class VRML2Export:
 		meshVertexList = me.verts
 
 		for vertex in meshVertexList:
-			blenvert = Mathutils.Vector(vertex.co)
-			vrmlvert = M_blen2vrml * blenvert
+			vrmlvert = blenvert = Mathutils.Vector(vertex.co)
+			if export_rotate_z_to_y.val:
+				vrmlvert = M_blen2vrml * vrmlvert
 			self.writeUnindented("%s %s %s\n " % \
 								 (vrmlvert[0], \
 								  vrmlvert[1], \
@@ -730,8 +731,8 @@ class VRML2Export:
 									 round(uv[1], self.tp))
 						j=j+1
 					indexStr += "-1"
-			texIndexList.append(indexStr)
-			texCoordList.append(coordStr)
+					texIndexList.append(indexStr)
+					texCoordList.append(coordStr)
 
 		self.writeIndented("texCoord TextureCoordinate {\n", 1)
 		self.writeIndented("point [\n", 1)
@@ -1016,7 +1017,10 @@ class VRML2Export:
 			return
 
 		ob_matrix = Mathutils.Matrix(ob.getMatrix('worldspace'))
-		matrix = M_blen2vrml * ob_matrix * M_vrml2blen
+		if export_rotate_z_to_y.val:
+			matrix = M_blen2vrml * ob_matrix * M_vrml2blen
+		else:
+			matrix = ob_matrix
 		e      = matrix.rotationPart().toEuler()
 
 		v = matrix.translationPart()
@@ -1089,7 +1093,7 @@ class VRML2Export:
 		self.writeFog()
 		self.proto = 0
 		allObj = []
-		if ARG == 'selected':
+		if export_selection_only.val:
 			allObj = list(scene.objects.context)
 		else:
 			allObj = list(scene.objects)
@@ -1098,7 +1102,7 @@ class VRML2Export:
 		for thisObj in allObj:
 			self.writeObject(thisObj)
 
-		if ARG != 'selected':
+		if not export_selection_only.val:
 			self.writeScript()
 		self.cleanup()
 
@@ -1213,26 +1217,54 @@ def select_file(filename):
 	wrlexport=VRML2Export(filename)
 	wrlexport.export(scene, world, worldmat)
 
+#########################################################
+# UI and Registry utilities
+#########################################################
+
+export_selection_only = Draw.Create(0)
+export_rotate_z_to_y = Draw.Create(1)
+export_compressed = Draw.Create(0)
+
+def save_to_registry():
+	d = {}
+	d['selection_only'] = export_selection_only.val
+	d['rotate_z_to_y'] = export_rotate_z_to_y.val
+	d['compressed'] = export_compressed.val
+	Registry.SetKey('vrml97_export', d, True)
+
+def load_from_registry():
+	d = Registry.GetKey('vrml97_export', True)
+	if d:
+		try:
+			export_selection_only.val = d['selection_only']
+			export_rotate_z_to_y.val = d['rotate_z_to_y']
+			export_compressed.val = d['compressed']
+		except: save_to_registry() # If data is not valid, rewrite it.
+
+def show_popup():
+	pup_block = [
+		('Selection Only', export_selection_only, 'Only export objects in visible selection. Else export whole scene.'),
+		('Rotate +Z to +Y', export_rotate_z_to_y, 'Rotate such that +Z axis (Blender up) becomes +Y (VRML up).'),
+		('Compress', export_compressed, 'Generate a .wrz file (normal VRML compressed by gzip).')
+		]
+	return Draw.PupBlock('Export VRML 97...', pup_block) 
 
 #########################################################
 # main routine
 #########################################################
 
-try:
-	ARG = __script__['arg'] # user selected argument
-except:
-	print "older version"
+load_from_registry()
 
-if Blender.Get('version') < 235:
-	print "Warning: VRML97 export failed, wrong blender version!"
-	print " You aren't running blender version 2.35 or greater"
-	print " download a newer version from http://blender3d.org/"
-else:
-	if ARG == 'comp':
+# Note that show_popup must be done before Blender.Window.FileSelector,
+# because export_compressed affects the suggested extension of resulting
+# file.
+
+if show_popup():
+	save_to_registry()
+	if export_compressed.val:
 		extension=".wrz"
 		from gzip import *
 	else:
 		extension=".wrl"
 	Blender.Window.FileSelector(select_file, "Export VRML97", \
 								sys.makename(ext=extension))
-
diff --git a/release/windows/installer/00.sconsblender.nsi b/release/windows/installer/00.sconsblender.nsi
index 338075c1b18..c96b188fb02 100644
--- a/release/windows/installer/00.sconsblender.nsi
+++ b/release/windows/installer/00.sconsblender.nsi
@@ -353,6 +353,7 @@ Section "Blender-VERSION (required)" SecCopyUI
   SetOutPath $INSTDIR
   ; Write the installation path into the registry
   WriteRegStr HKLM SOFTWARE\BlenderFoundation "Install_Dir" "$INSTDIR"
+  WriteRegStr HKLM SOFTWARE\BlenderFoundation "Home_Dir" "$BLENDERHOME"
   ; Write the uninstall keys for Windows
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "DisplayName" "Blender (remove only)"
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "UninstallString" '"$INSTDIR\uninstall.exe"'
@@ -406,28 +407,32 @@ SectionEnd
 UninstallText "This will uninstall Blender VERSION. Hit next to continue."
 
 Section "Uninstall"
+  Delete $INSTDIR\uninstall.exe
+  
+  ReadRegStr $BLENDERHOME HKLM "SOFTWARE\BlenderFoundation" "Home_Dir"
+  
   ; remove registry keys
   DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender"
   DeleteRegKey HKLM SOFTWARE\BlenderFoundation
   ; remove files
   [DELROOTDIRCONTS]
   
-  Delete $INSTDIR\.blender\.bfont.ttf
-  Delete $INSTDIR\.blender\.Blanguages
+  Delete $BLENDERHOME\.blender\.bfont.ttf
+  Delete $BLENDERHOME\.blender\.Blanguages
   ; remove shortcuts, if any.
   Delete "$SMPROGRAMS\Blender Foundation\Blender\*.*"
   Delete "$DESKTOP\Blender.lnk"
   ; remove directories used.
-  RMDir /r $INSTDIR\.blender\locale
+  RMDir /r $BLENDERHOME\.blender\locale
   MessageBox MB_YESNO "Erase .blender\scripts folder? (ALL contents will be erased!)" IDNO Next
-  RMDir /r $INSTDIR\.blender\scripts
-  RMDir /r $INSTDIR\.blender\scripts\bpymodules
-  RMDir /r $INSTDIR\.blender\scripts\bpydata
-  RMDir /r $INSTDIR\.blender\scripts\bpydata\config
+  RMDir /r $BLENDERHOME\.blender\scripts
+  RMDir /r $BLENDERHOME\.blender\scripts\bpymodules
+  RMDir /r $BLENDERHOME\.blender\scripts\bpydata
+  RMDir /r $BLENDERHOME\.blender\scripts\bpydata\config
 Next:
-  RMDir /r $INSTDIR\plugins\include
-  RMDir /r $INSTDIR\plugins
-  RMDir $INSTDIR\.blender
+  RMDir /r $BLENDERHOME\plugins\include
+  RMDir /r $BLENDERHOME\plugins
+  RMDir $BLENDERHOME\.blender
   RMDir "$SMPROGRAMS\Blender Foundation\Blender"
   RMDir "$SMPROGRAMS\Blender Foundation"
   RMDir "$INSTDIR"
diff --git a/source/Makefile b/source/Makefile
index 5ebff3bbbf5..d06962cbe3f 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -157,6 +157,7 @@ COMLIB += $(NAN_BMFONT)/lib/$(DEBUG_DIR)libbmfont.a
 COMLIB += $(NAN_PNG)/lib/libpng.a
 COMLIB += $(OCGDIR)/blender/yafray/$(DEBUG_DIR)libyafrayexport.a
 COMLIB += $(OCGDIR)/blender/blenlib/$(DEBUG_DIR)libblenlib.a
+COMLIB += $(NAN_GLEW)/lib/libglew.a
 
 ifeq ($(WITH_QUICKTIME), true)
     COMLIB += $(OCGDIR)/blender/blenderqt/$(DEBUG_DIR)libblenderqt.a
diff --git a/source/blender/blenkernel/BKE_action.h b/source/blender/blenkernel/BKE_action.h
index b5e34444d13..716eac81b55 100644
--- a/source/blender/blenkernel/BKE_action.h
+++ b/source/blender/blenkernel/BKE_action.h
@@ -44,6 +44,7 @@ struct bActionChannel;
 struct bPose;
 struct bPoseChannel;
 struct Object;
+struct ID;
 
 /* Kernel prototypes */
 #ifdef __cplusplus
@@ -157,6 +158,10 @@ void rest_pose(struct bPose *pose);
 float get_action_frame(struct Object *ob, float cframe);
 /* map strip time to global time (frame nr)  */
 float get_action_frame_inv(struct Object *ob, float cframe);
+/* builds a list of NlaIpoChannel with ipo values to write in datablock */
+void extract_ipochannels_from_action(ListBase *lb, struct ID *id, struct bAction *act, char *name, float ctime);
+/* write values returned by extract_ipochannels_from_action, returns the number of value written */
+int execute_ipochannels(ListBase *lb);
 
 #ifdef __cplusplus
 };
diff --git a/source/blender/blenkernel/BKE_bmesh.h b/source/blender/blenkernel/BKE_bmesh.h
index 51a5d29dbb7..8ec7144faf6 100644
--- a/source/blender/blenkernel/BKE_bmesh.h
+++ b/source/blender/blenkernel/BKE_bmesh.h
@@ -39,12 +39,12 @@
 
 #include "DNA_listBase.h"
 #include "BLI_ghash.h"
+#include "BLI_mempool.h"
 #include "BLI_memarena.h"
 #include "DNA_image_types.h"
 #include "BLI_editVert.h"
 #include "BKE_DerivedMesh.h"
 #include "transform.h"
-#include "BKE_bmeshCustomData.h"
 
 /*forward declerations*/
 struct BME_Vert;
@@ -53,13 +53,6 @@ struct BME_Poly;
 struct BME_Loop;
 
 
-/*structure for fast memory allocation/frees*/
-typedef struct BME_mempool{
-	struct ListBase chunks;
-	int esize, csize, pchunk;		/*size of elements and chunks in bytes and number of elements per chunk*/
-	struct BME_freenode	*free;		/*free element list. Interleaved into chunk datas.*/
-}BME_mempool;
-
 /*Notes on further structure Cleanup:
 	-Remove the tflags, they belong in custom data layers
 	-Remove the eflags completely, they are mostly not used
@@ -78,10 +71,10 @@ typedef struct BME_Mesh
 {
 	ListBase verts, edges, polys;
 	/*memory pools used for storing mesh elements*/
-	struct BME_mempool *vpool;
-	struct BME_mempool *epool;
-	struct BME_mempool *ppool;
-	struct BME_mempool *lpool;
+	struct BLI_mempool *vpool;
+	struct BLI_mempool *epool;
+	struct BLI_mempool *ppool;
+	struct BLI_mempool *lpool;
 	/*some scratch arrays used by eulers*/
 	struct BME_Vert **vtar;
 	struct BME_Edge **edar;
@@ -90,7 +83,7 @@ typedef struct BME_Mesh
 	int vtarlen, edarlen, lparlen, plarlen;
 	int totvert, totedge, totpoly, totloop;				/*record keeping*/
 	int nextv, nexte, nextp, nextl;						/*Next element ID for verts/edges/faces/loops. Never reused*/
-	struct BME_CustomData vdata, edata, pdata, ldata;	/*Custom Data Layer information*/
+	struct CustomData vdata, edata, pdata, ldata;	/*Custom Data Layer information*/
 } BME_Mesh;
 
 typedef struct BME_Vert
@@ -169,7 +162,7 @@ int BME_radial_find_face(struct BME_Edge *e,struct BME_Poly *f);
 struct BME_Loop *BME_loop_find_loop(struct BME_Poly *f, struct BME_Vert *v);
 
 /*MESH CREATION/DESTRUCTION*/
-struct BME_Mesh *BME_make_mesh(int allocsize[4], struct BME_CustomDataInit init[4]);
+struct BME_Mesh *BME_make_mesh(int allocsize[4]);
 void BME_free_mesh(struct BME_Mesh *bm);
 /*FULL MESH VALIDATION*/
 int BME_validate_mesh(struct BME_Mesh *bm, int halt);
diff --git a/source/blender/blenkernel/BKE_bmeshCustomData.h b/source/blender/blenkernel/BKE_bmeshCustomData.h
index 423f75e532d..4f5f2641f54 100644
--- a/source/blender/blenkernel/BKE_bmeshCustomData.h
+++ b/source/blender/blenkernel/BKE_bmeshCustomData.h
@@ -38,7 +38,7 @@
 #ifndef BKE_BMESHCUSTOMDATA_H
 #define BKE_BMESHCUSTOMDATA_H
 
-struct BME_mempool;
+struct BLI_mempool;
 
 /*Custom Data Types and defines
 	Eventual plan is to move almost everything to custom data and let caller
@@ -62,7 +62,7 @@ typedef struct BME_CustomDataLayer {
 
 typedef struct BME_CustomData {
 	struct BME_CustomDataLayer *layers;	/*Custom Data Layers*/
-	struct BME_mempool *pool;				/*pool for alloc of blocks*/
+	struct BLI_mempool *pool;				/*pool for alloc of blocks*/
 	int totlayer, totsize;         	/*total layers and total size in bytes of each block*/
 } BME_CustomData;
 
diff --git a/source/blender/blenkernel/BKE_cloth.h b/source/blender/blenkernel/BKE_cloth.h
index 2e5da236a89..f3c13d3d820 100644
--- a/source/blender/blenkernel/BKE_cloth.h
+++ b/source/blender/blenkernel/BKE_cloth.h
@@ -208,7 +208,7 @@ typedef enum
 ////////////////////////////////////////////////
 
 // needed for implicit.c
-int cloth_bvh_objcollision ( ClothModifierData * clmd, float step, float dt );
+int cloth_bvh_objcollision ( Object *ob, ClothModifierData * clmd, float step, float dt );
 
 ////////////////////////////////////////////////
 
diff --git a/source/blender/blenkernel/BKE_customdata.h b/source/blender/blenkernel/BKE_customdata.h
index d0535f1752e..e84c7d30956 100644
--- a/source/blender/blenkernel/BKE_customdata.h
+++ b/source/blender/blenkernel/BKE_customdata.h
@@ -40,6 +40,8 @@ extern const CustomDataMask CD_MASK_BAREMESH;
 extern const CustomDataMask CD_MASK_MESH;
 extern const CustomDataMask CD_MASK_EDITMESH;
 extern const CustomDataMask CD_MASK_DERIVEDMESH;
+extern const CustomDataMask CD_MASK_BMESH;
+extern const CustomDataMask CD_MASK_FACECORNERS;
 
 /* for ORIGINDEX layer type, indicates no original index for this element */
 #define ORIGINDEX_NONE -1
@@ -134,6 +136,9 @@ void CustomData_copy_data(const struct CustomData *source,
 void CustomData_em_copy_data(const struct CustomData *source,
                             struct CustomData *dest, void *src_block,
                             void **dest_block);
+void CustomData_bmesh_copy_data(const struct CustomData *source, 
+							struct CustomData *dest,void *src_block, 
+							void **dest_block);
 
 /* frees data in a CustomData object
  * return 1 on success, 0 on failure
@@ -160,6 +165,10 @@ void CustomData_interp(const struct CustomData *source, struct CustomData *dest,
 void CustomData_em_interp(struct CustomData *data,  void **src_blocks,
                           float *weights, float *sub_weights, int count,
                           void *dest_block);
+void CustomData_bmesh_interp(struct CustomData *data, void **src_blocks, 
+							 float *weights, float *sub_weights, int count, 
+							 void *dest_block);
+
 
 /* swaps the data in the element corners, to new corners with indices as
    specified in corner_indices. for edges this is an array of length 2, for
@@ -172,6 +181,8 @@ void CustomData_swap(struct CustomData *data, int index, int *corner_indices);
 void *CustomData_get(const struct CustomData *data, int index, int type);
 void *CustomData_em_get(const struct CustomData *data, void *block, int type);
 void *CustomData_em_get_n(const struct CustomData *data, void *block, int type, int n);
+void *CustomData_bmesh_get(const struct CustomData *data, void *block, int type);
+void *CustomData_bmesh_get_n(const struct CustomData *data, void *block, int type, int n);
 
 /* gets a pointer to the active or first layer of type
  * returns NULL if there is no layer of type
@@ -199,6 +210,12 @@ void CustomData_em_set(struct CustomData *data, void *block, int type,
 void CustomData_em_set_n(struct CustomData *data, void *block, int type, int n,
                          void *source);
 
+void CustomData_bmesh_set(const struct CustomData *data, void *block, int type, 
+						  void *source);
+
+void CustomData_bmesh_set_n(struct CustomData *data, void *block, int type, int n, 
+							void *source);
+
 /* set the pointer of to the first layer of type. the old data is not freed.
  * returns the value of ptr if the layer is found, NULL otherwise
  */
@@ -220,12 +237,20 @@ void CustomData_set_layer_flag(struct CustomData *data, int type, int flag);
 void CustomData_em_set_default(struct CustomData *data, void **block);
 void CustomData_em_free_block(struct CustomData *data, void **block);
 
+void CustomData_bmesh_set_default(struct CustomData *data, void **block);
+void CustomData_bmesh_free_block(struct CustomData *data, void **block);
+
 /* copy custom data to/from layers as in mesh/derivedmesh, to editmesh
    blocks of data. the CustomData's must not be compatible  */
 void CustomData_to_em_block(const struct CustomData *source,
                             struct CustomData *dest, int index, void **block);
 void CustomData_from_em_block(const struct CustomData *source,
                               struct CustomData *dest, void *block, int index);
+void CustomData_to_bmesh_block(const struct CustomData *source, 
+							struct CustomData *dest, int src_index, void **dest_block);
+void CustomData_from_bmesh_block(const struct CustomData *source, 
+							struct CustomData *dest, void *src_block, int dest_index);
+
 
 /* query info over types */
 void CustomData_file_write_info(int type, char **structname, int *structnum);
@@ -241,4 +266,8 @@ void CustomData_set_layer_unique_name(struct CustomData *data, int index);
    only after this test passes, layer->data should be assigned */
 int CustomData_verify_versions(struct CustomData *data, int index);
 
+/*BMesh specific customdata stuff*/
+void CustomData_to_bmeshpoly(struct CustomData *fdata, struct CustomData *pdata, struct CustomData *ldata);
+void CustomData_from_bmeshpoly(struct CustomData *fdata, struct CustomData *pdata, struct CustomData *ldata, int total);
+void CustomData_bmesh_init_pool(struct CustomData *data, int allocsize);
 #endif
diff --git a/source/blender/blenkernel/BKE_ipo.h b/source/blender/blenkernel/BKE_ipo.h
index 922f3201345..5b209cb8f5b 100644
--- a/source/blender/blenkernel/BKE_ipo.h
+++ b/source/blender/blenkernel/BKE_ipo.h
@@ -31,6 +31,10 @@
 #ifndef BKE_IPO_H
 #define BKE_IPO_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct CfraElem {
 	struct CfraElem *next, *prev;
 	float cfra;
@@ -111,5 +115,9 @@ float IPO_GetFloatValue(struct Ipo *ipo,
 						short c,
 						float ctime);
 
+#ifdef __cplusplus
+};
+#endif
+
 #endif
 
diff --git a/source/blender/blenkernel/BKE_key.h b/source/blender/blenkernel/BKE_key.h
index a6871aa837f..faf8692b89a 100644
--- a/source/blender/blenkernel/BKE_key.h
+++ b/source/blender/blenkernel/BKE_key.h
@@ -40,6 +40,11 @@ struct Object;
 struct Lattice;
 struct Mesh;
 
+/* Kernel prototypes */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void free_key(struct Key *sc); 
 struct Key *add_key(struct ID *id);
 struct Key *copy_key(struct Key *key);
@@ -57,6 +62,12 @@ int do_ob_key(struct Object *ob);
 struct Key *ob_get_key(struct Object *ob);
 struct KeyBlock *ob_get_keyblock(struct Object *ob);
 struct KeyBlock *key_get_keyblock(struct Key *key, int index);
+// needed for the GE
+void do_rel_key(int start, int end, int tot, char *basispoin, struct Key *key, int mode);
+
+#ifdef __cplusplus
+};
+#endif
 
 #endif
 
diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h
index a940ac62876..116a59fa97e 100644
--- a/source/blender/blenkernel/BKE_object.h
+++ b/source/blender/blenkernel/BKE_object.h
@@ -108,6 +108,7 @@ void object_boundbox_flag(struct Object *ob, int flag, int set);
 void minmax_object(struct Object *ob, float *min, float *max);
 void minmax_object_duplis(struct Object *ob, float *min, float *max);
 void solve_tracking (struct Object *ob, float targetmat[][4]);
+int ray_hit_boundbox(struct BoundBox *bb, float ray_start[3], float ray_normal[3]);
 
 void object_handle_update(struct Object *ob);
 
diff --git a/source/blender/blenkernel/BKE_scene.h b/source/blender/blenkernel/BKE_scene.h
index c50f5498de9..2bd528ab8c8 100644
--- a/source/blender/blenkernel/BKE_scene.h
+++ b/source/blender/blenkernel/BKE_scene.h
@@ -53,7 +53,7 @@ struct RenderData;
 }
 
 /* note; doesn't work when scene is empty */
-#define SETLOOPER(s, b) sce= s, b= sce->base.first; b; b= (b->next?b->next:sce->set?(sce=sce->set)->base.first:NULL)
+#define SETLOOPER(s, b) sce= s, b= (Base*)sce->base.first; b; b= (Base*)(b->next?b->next:sce->set?(sce=sce->set)->base.first:NULL)
 
 
 void free_avicodecdata(struct AviCodecData *acd);
diff --git a/source/blender/blenkernel/intern/BME_Customdata.c b/source/blender/blenkernel/intern/BME_Customdata.c
index 8b48efbdbd2..1fc8a4071dc 100644
--- a/source/blender/blenkernel/intern/BME_Customdata.c
+++ b/source/blender/blenkernel/intern/BME_Customdata.c
@@ -40,6 +40,7 @@
 #include "bmesh_private.h"
 #include <string.h>
 #include "MEM_guardedalloc.h"
+#include "BLI_mempool.h"
 
 /********************* Layer type information **********************/
 typedef struct BME_LayerTypeInfo {
@@ -83,7 +84,7 @@ void BME_CD_Create(BME_CustomData *data, BME_CustomDataInit *init, int initalloc
 	if(data->totlayer){
 		/*alloc memory*/
 		data->layers = MEM_callocN(sizeof(BME_CustomDataLayer)*data->totlayer, "BMesh Custom Data Layers");
-		data->pool = BME_mempool_create(data->totsize, initalloc, initalloc);
+		data->pool = BLI_mempool_create(data->totsize, initalloc, initalloc);
 		/*initialize layer data*/
 		for(i=0; i < BME_CD_NUMTYPES; i++){
 			if(init->layout[i]){
@@ -102,7 +103,7 @@ void BME_CD_Create(BME_CustomData *data, BME_CustomDataInit *init, int initalloc
 
 void BME_CD_Free(BME_CustomData *data)
 {
-	if(data->pool) BME_mempool_destroy(data->pool);
+	if(data->pool) BLI_mempool_destroy(data->pool);
 }
 
 /*Block level ops*/
@@ -119,7 +120,7 @@ void BME_CD_free_block(BME_CustomData *data, void **block)
 			typeInfo->free((char*)*block + offset, 1, typeInfo->size);
 		}
 	}
-	BME_mempool_free(data->pool, *block);
+	BLI_mempool_free(data->pool, *block);
 	*block = NULL;
 }
 
@@ -130,7 +131,7 @@ static void BME_CD_alloc_block(BME_CustomData *data, void **block)
 	if (*block) BME_CD_free_block(data, block); //if we copy layers that have their own free functions like deformverts
 	
 	if (data->totsize > 0)
-		*block = BME_mempool_alloc(data->pool);	
+		*block = BLI_mempool_alloc(data->pool);	
 	else
 		*block = NULL;
 }
diff --git a/source/blender/blenkernel/intern/BME_conversions.c b/source/blender/blenkernel/intern/BME_conversions.c
index 08483711c45..daf0de5b748 100644
--- a/source/blender/blenkernel/intern/BME_conversions.c
+++ b/source/blender/blenkernel/intern/BME_conversions.c
@@ -33,6 +33,7 @@
  */
 
 #include "MEM_guardedalloc.h"
+#include "BKE_customdata.h" 
 
 #include "DNA_listBase.h"
 #include "DNA_meshdata_types.h"
@@ -55,10 +56,199 @@
 
 #include "BSE_edit.h"
 
+/*merge these functions*/
+static void BME_DMcorners_to_loops(BME_Mesh *bm, CustomData *facedata, int index, BME_Poly *f, int numCol, int numTex){
+	int i, j;
+	BME_Loop *l;
+	MTFace *texface;
+	MTexPoly *texpoly;
+	MCol *mcol;
+	MLoopCol *mloopcol;
+	MLoopUV *mloopuv;
+
+	for(i=0; i< numTex; i++){
+		texface = CustomData_get_layer_n(facedata, CD_MTFACE, i);
+		texpoly = CustomData_bmesh_get_n(&bm->pdata, f->data, CD_MTEXPOLY, i);
+
+		texpoly->tpage = texface[index].tpage;
+		texpoly->flag = texface[index].flag;
+		texpoly->transp = texface[index].transp;
+		texpoly->mode = texface[index].mode;
+		texpoly->tile = texface[index].tile;
+		texpoly->unwrap = texface[index].unwrap;
+
+		j = 0;
+		l = f->loopbase;
+		do{
+			mloopuv = CustomData_bmesh_get_n(&bm->ldata, l->data, CD_MLOOPUV, i);
+			mloopuv->uv[0] = texface[index].uv[j][0];
+			mloopuv->uv[1] = texface[index].uv[j][1];
+			j++;
+			l = l->next;
+		}while(l!=f->loopbase);
+	}
+
+	for(i=0; i < numCol; i++){
+		mcol = CustomData_get_layer_n(facedata, CD_MCOL, i);
+		j = 0;
+		l = f->loopbase;
+		do{
+			mloopcol = CustomData_bmesh_get_n(&bm->ldata, l->data, CD_MLOOPCOL, i);
+			mloopcol->r = mcol[(index*4)+j].r;
+			mloopcol->g = mcol[(index*4)+j].g;
+			mloopcol->b = mcol[(index*4)+j].b;
+			mloopcol->a = mcol[(index*4)+j].a;
+			j++;
+			l = l->next;
+		}while(l!=f->loopbase);
+	}
+}
+
+static void BME_DMloops_to_corners(BME_Mesh *bm, CustomData *facedata, int index, BME_Poly *f,int numCol, int numTex){
+	int i, j;
+	BME_Loop *l;
+	MTFace *texface;
+	MTexPoly *texpoly;
+	MCol *mcol;
+	MLoopCol *mloopcol;
+	MLoopUV *mloopuv;
+
+	for(i=0; i < numTex; i++){
+		texface = CustomData_get_layer_n(facedata, CD_MTFACE, i);
+		texpoly = CustomData_bmesh_get_n(&bm->pdata, f->data, CD_MTEXPOLY, i);
+		
+		texface[index].tpage = texpoly->tpage;
+		texface[index].flag = texpoly->flag;
+		texface[index].transp = texpoly->transp;
+		texface[index].mode = texpoly->mode;
+		texface[index].tile = texpoly->tile;
+		texface[index].unwrap = texpoly->unwrap;
+
+		j = 0;
+		l = f->loopbase;
+		do{
+			mloopuv = CustomData_bmesh_get_n(&bm->ldata, l->data, CD_MLOOPUV, i);
+			texface[index].uv[j][0] = mloopuv->uv[0];
+			texface[index].uv[j][1] = mloopuv->uv[1];
+			j++;
+			l = l->next;
+		}while(l!=f->loopbase);
+
+	}
+	for(i=0; i < numCol; i++){
+		mcol = CustomData_get_layer_n(facedata,CD_MCOL, i);
+		j = 0;
+		l = f->loopbase;
+		do{
+			mloopcol = CustomData_bmesh_get_n(&bm->ldata, l->data, CD_MLOOPCOL, i);
+			mcol[(index*4) + j].r = mloopcol->r;
+			mcol[(index*4) + j].g = mloopcol->g;
+			mcol[(index*4) + j].b = mloopcol->b;
+			mcol[(index*4) + j].a = mloopcol->a;
+			j++;
+			l = l->next;
+		}while(l!=f->loopbase);
+	}
+}
+
+
+static void BME_corners_to_loops(BME_Mesh *bm, CustomData *facedata, void *face_block, BME_Poly *f,int numCol, int numTex){
+	int i, j;
+	BME_Loop *l;
+	MTFace *texface;
+	MTexPoly *texpoly;
+	MCol *mcol;
+	MLoopCol *mloopcol;
+	MLoopUV *mloopuv;
+
+	for(i=0; i < numTex; i++){
+		texface = CustomData_em_get_n(facedata, face_block, CD_MTFACE, i);
+		texpoly = CustomData_bmesh_get_n(&bm->pdata, f->data, CD_MTEXPOLY, i);
+		
+		texpoly->tpage = texface->tpage;
+		texpoly->flag = texface->flag;
+		texpoly->transp = texface->transp;
+		texpoly->mode = texface->mode;
+		texpoly->tile = texface->tile;
+		texpoly->unwrap = texface->unwrap;
+
+		j = 0;
+		l = f->loopbase;
+		do{
+			mloopuv = CustomData_bmesh_get_n(&bm->ldata, l->data, CD_MLOOPUV, i);
+			mloopuv->uv[0] = texface->uv[j][0];
+			mloopuv->uv[1] = texface->uv[j][1];
+			j++;
+			l = l->next;
+		}while(l!=f->loopbase);
+
+	}
+	for(i=0; i < numCol; i++){
+		mcol = CustomData_em_get_n(facedata, face_block, CD_MCOL, i);
+		j = 0;
+		l = f->loopbase;
+		do{
+			mloopcol = CustomData_bmesh_get_n(&bm->ldata, l->data, CD_MLOOPCOL, i);
+			mloopcol->r = mcol[j].r;
+			mloopcol->g = mcol[j].g;
+			mloopcol->b = mcol[j].b;
+			mloopcol->a = mcol[j].a;
+			j++;
+			l = l->next;
+		}while(l!=f->loopbase);
+	}
+}
+
+static void BME_loops_to_corners(BME_Mesh *bm, CustomData *facedata, void *face_block, BME_Poly *f,int numCol, int numTex){
+	int i, j;
+	BME_Loop *l;
+	MTFace *texface;
+	MTexPoly *texpoly;
+	MCol *mcol;
+	MLoopCol *mloopcol;
+	MLoopUV *mloopuv;
+
+	for(i=0; i < numTex; i++){
+		texface = CustomData_em_get_n(facedata, face_block, CD_MTFACE, i);
+		texpoly = CustomData_bmesh_get_n(&bm->pdata, f->data, CD_MTEXPOLY, i);
+		
+		texface->tpage = texpoly->tpage;
+		texface->flag = texpoly->flag;
+		texface->transp = texpoly->transp;
+		texface->mode = texpoly->mode;
+		texface->tile = texpoly->tile;
+		texface->unwrap = texpoly->unwrap;
+
+		j = 0;
+		l = f->loopbase;
+		do{
+			mloopuv = CustomData_bmesh_get_n(&bm->ldata, l->data, CD_MLOOPUV, i);
+			texface->uv[j][0] = mloopuv->uv[0];
+			texface->uv[j][1] = mloopuv->uv[1];
+			j++;
+			l = l->next;
+		}while(l!=f->loopbase);
+
+	}
+	for(i=0; i < numCol; i++){
+		mcol = CustomData_em_get_n(facedata, face_block, CD_MCOL, i);
+		j = 0;
+		l = f->loopbase;
+		do{
+			mloopcol = CustomData_bmesh_get_n(&bm->ldata, l->data, CD_MLOOPCOL, i);
+			mcol[j].r = mloopcol->r;
+			mcol[j].g = mloopcol->g;
+			mcol[j].b = mloopcol->b;
+			mcol[j].a = mloopcol->a;
+			j++;
+			l = l->next;
+		}while(l!=f->loopbase);
+	}
+}
+/*move the EditMesh conversion functions to editmesh_tools.c*/
 BME_Mesh *BME_editmesh_to_bmesh(EditMesh *em) {
 	BME_Mesh *bm;
-	int allocsize[4] = {512,512,2048,512};
-	BME_CustomDataInit *init = MEM_callocN(sizeof(BME_CustomDataInit) * 4, "Bmesh custom data init");
+	int allocsize[4] = {512,512,2048,512}, numTex, numCol;
 	BME_Vert *v1, *v2;
 	BME_Edge *e, *edar[4];
 	BME_Poly *f;
@@ -68,9 +258,25 @@ BME_Mesh *BME_editmesh_to_bmesh(EditMesh *em) {
 	EditFace *efa;
 
 	int len;
-	bm = BME_make_mesh(allocsize,init);
+	bm = BME_make_mesh(allocsize);
+
+	/*copy custom data layout*/
+	CustomData_copy(&em->vdata, &bm->vdata, CD_MASK_BMESH, CD_CALLOC, 0);
+	CustomData_copy(&em->edata, &bm->edata, CD_MASK_BMESH, CD_CALLOC, 0);
+	CustomData_copy(&em->fdata, &bm->pdata, CD_MASK_BMESH, CD_CALLOC, 0);
+
+	/*copy face corner data*/
+	CustomData_to_bmeshpoly(&em->fdata, &bm->pdata, &bm->ldata);
+	/*initialize memory pools*/
+	CustomData_bmesh_init_pool(&bm->vdata, allocsize[0]);
+	CustomData_bmesh_init_pool(&bm->edata, allocsize[1]);
+	CustomData_bmesh_init_pool(&bm->ldata, allocsize[2]);
+	CustomData_bmesh_init_pool(&bm->pdata, allocsize[3]);
+	/*needed later*/
+	numTex = CustomData_number_of_layers(&bm->pdata, CD_MTEXPOLY);
+	numCol = CustomData_number_of_layers(&bm->ldata, CD_MLOOPCOL);
+
 	BME_model_begin(bm);
-	
 	/*add verts*/
 	eve= em->verts.first;
 	while(eve) {
@@ -79,9 +285,8 @@ BME_Mesh *BME_editmesh_to_bmesh(EditMesh *em) {
 		v1->flag = eve->f;
 		v1->h = eve->h;
 		v1->bweight = eve->bweight;
-
-		/* link the verts for edge and face construction;
-		 * kind of a dangerous thing - remember to cast back to BME_Vert before using! */
+		/*Copy Custom Data*/
+		CustomData_bmesh_copy_data(&em->vdata, &bm->vdata, eve->data, &v1->data);
 		eve->tmp.v = (EditVert*)v1;
 		eve = eve->next;
 	}
@@ -99,13 +304,10 @@ BME_Mesh *BME_editmesh_to_bmesh(EditMesh *em) {
 		if(eed->seam) e->flag |= ME_SEAM;
 		if(eed->h & EM_FGON) e->flag |= ME_FGON;
 		if(eed->h & 1) e->flag |= ME_HIDE;
-
-		/* link the edges for face construction;
-		 * kind of a dangerous thing - remember to cast back to BME_Edge before using! */
 		eed->tmp.e = (EditEdge*)e;
+		CustomData_bmesh_copy_data(&em->edata, &bm->edata, eed->data, &e->data);
 		eed = eed->next;
 	}
-
 	/*add faces.*/
 	efa= em->faces.first;
 	while(efa) {
@@ -134,13 +336,13 @@ BME_Mesh *BME_editmesh_to_bmesh(EditMesh *em) {
 			if(efa->f & 1) f->flag |= ME_FACE_SEL;
 			else f->flag &= ~ME_FACE_SEL;
 		}
+		CustomData_bmesh_copy_data(&em->fdata, &bm->pdata, efa->data, &f->data);
+		BME_corners_to_loops(bm, &em->fdata, efa->data, f,numCol,numTex);
 		efa = efa->next;
 	}
 	BME_model_end(bm);
-	MEM_freeN(init);
 	return bm;
 }
-
 /* adds the geometry in the bmesh to G.editMesh (does not free G.editMesh)
  * if td != NULL, the transdata will be mapped to the EditVert's co */
 EditMesh *BME_bmesh_to_editmesh(BME_Mesh *bm, BME_TransData_Head *td) {
@@ -155,12 +357,21 @@ EditMesh *BME_bmesh_to_editmesh(BME_Mesh *bm, BME_TransData_Head *td) {
 	EditEdge *eed;
 	EditFace *efa;
 
-	int totvert, len, i;
+	int totvert, len, i, numTex, numCol;
 
 	em = G.editMesh;
 
 	if (em == NULL) return NULL;
 
+
+	CustomData_copy(&bm->vdata, &em->vdata, CD_MASK_BMESH, CD_CALLOC, 0);
+	CustomData_copy(&bm->edata, &em->edata, CD_MASK_BMESH, CD_CALLOC, 0);
+	CustomData_copy(&bm->pdata, &em->fdata, CD_MASK_BMESH, CD_CALLOC, 0);
+	CustomData_from_bmeshpoly(&em->fdata, &bm->pdata, &bm->ldata,0);
+	numTex = CustomData_number_of_layers(&bm->pdata, CD_MTEXPOLY);
+	numCol = CustomData_number_of_layers(&bm->ldata, CD_MLOOPCOL);
+
+
 	/* convert to EditMesh */
 	/* make editverts */
 	totvert = BLI_countlist(&(bm->verts));
@@ -176,6 +387,7 @@ EditMesh *BME_bmesh_to_editmesh(BME_Mesh *bm, BME_TransData_Head *td) {
 		eve1->f = (unsigned char)v1->flag;
 		eve1->h = (unsigned char)v1->h;
 		eve1->bweight = v1->bweight;
+		CustomData_em_copy_data(&bm->vdata, &em->vdata, v1->data, &eve1->data);
 	}
 	
 	/* make edges */
@@ -191,6 +403,8 @@ EditMesh *BME_bmesh_to_editmesh(BME_Mesh *bm, BME_TransData_Head *td) {
 			if(e->flag & ME_HIDE) eed->h |= 1;
 			if(G.scene->selectmode==SCE_SELECT_EDGE) 
 				EM_select_edge(eed, eed->f & SELECT);
+		
+			CustomData_em_copy_data(&bm->edata, &em->edata, e->data, &eed->data);
 		}
 	}
 
@@ -217,6 +431,8 @@ EditMesh *BME_bmesh_to_editmesh(BME_Mesh *bm, BME_TransData_Head *td) {
 			if(f->flag & ME_HIDE) efa->h= 1;
 			if((G.f & G_FACESELECT) && (efa->f & SELECT))
 				EM_select_face(efa, 1); /* flush down */
+			CustomData_em_copy_data(&bm->pdata, &em->fdata, f->data, &efa->data);
+			BME_loops_to_corners(bm, &em->fdata, efa->data, f,numCol,numTex);
 		}
 	}
 
@@ -234,18 +450,33 @@ BME_Mesh *BME_derivedmesh_to_bmesh(DerivedMesh *dm)
 	
 	BME_Mesh *bm;
 	int allocsize[4] = {512,512,2048,512};
-	BME_CustomDataInit *init = MEM_callocN(sizeof(BME_CustomDataInit) * 4, "Bmesh custom data init");
 	MVert *mvert, *mv;
 	MEdge *medge, *me;
 	MFace *mface, *mf;
-	int totface,totedge,totvert,i,len;
+	int totface,totedge,totvert,i,len, numTex, numCol;
 	BME_Vert *v1=NULL,*v2=NULL, **vert_array;
 	BME_Edge *e=NULL;
 	BME_Poly *f=NULL;
 	
 	EdgeHash *edge_hash = BLI_edgehash_new();
 
-	bm = BME_make_mesh(allocsize,init);
+	bm = BME_make_mesh(allocsize);
+	/*copy custom data layout*/
+	CustomData_copy(&dm->vertData, &bm->vdata, CD_MASK_BMESH, CD_CALLOC, 0);
+	CustomData_copy(&dm->edgeData, &bm->edata, CD_MASK_BMESH, CD_CALLOC, 0);
+	CustomData_copy(&dm->faceData, &bm->pdata, CD_MASK_BMESH, CD_CALLOC, 0);
+
+	/*copy face corner data*/
+	CustomData_to_bmeshpoly(&dm->faceData, &bm->pdata, &bm->ldata);
+	/*initialize memory pools*/
+	CustomData_bmesh_init_pool(&bm->vdata, allocsize[0]);
+	CustomData_bmesh_init_pool(&bm->edata, allocsize[1]);
+	CustomData_bmesh_init_pool(&bm->ldata, allocsize[2]);
+	CustomData_bmesh_init_pool(&bm->pdata, allocsize[3]);
+	/*needed later*/
+	numTex = CustomData_number_of_layers(&bm->pdata, CD_MTEXPOLY);
+	numCol = CustomData_number_of_layers(&bm->ldata, CD_MLOOPCOL);
+
 	totvert = dm->getNumVerts(dm);
 	totedge = dm->getNumEdges(dm);
 	totface = dm->getNumFaces(dm);
@@ -262,6 +493,7 @@ BME_Mesh *BME_derivedmesh_to_bmesh(DerivedMesh *dm)
 		vert_array[i] = v1;
 		v1->flag = mv->flag;
 		v1->bweight = mv->bweight/255.0f;
+		CustomData_to_bmesh_block(&dm->vertData, &bm->vdata, i, &v1->data);
 	}
 	/*add edges*/
 	for(i=0,me = medge; i < totedge;i++,me++){
@@ -272,6 +504,7 @@ BME_Mesh *BME_derivedmesh_to_bmesh(DerivedMesh *dm)
 		e->bweight = me->bweight/255.0f;
 		e->flag = (unsigned char)me->flag;
 		BLI_edgehash_insert(edge_hash,me->v1,me->v2,e);
+		CustomData_to_bmesh_block(&dm->edgeData, &bm->edata, i, &e->data);
 	}
 	/*add faces.*/
 	for(i=0,mf = mface; i < totface;i++,mf++){
@@ -295,12 +528,13 @@ BME_Mesh *BME_derivedmesh_to_bmesh(DerivedMesh *dm)
 		f = BME_MF(bm,v1,v2,edar,len);
 		f->mat_nr = mf->mat_nr;
 		f->flag = mf->flag;
+		CustomData_to_bmesh_block(&dm->faceData,&bm->pdata,i,&f->data);
+		BME_DMcorners_to_loops(bm, &dm->faceData,i,f, numCol,numTex);
 	}
 	
 	BME_model_end(bm);
 	BLI_edgehash_free(edge_hash, NULL);
 	MEM_freeN(vert_array);
-	MEM_freeN(init);
 	return bm;
 }
 
@@ -309,7 +543,7 @@ DerivedMesh *BME_bmesh_to_derivedmesh(BME_Mesh *bm, DerivedMesh *dm)
 	MFace *mface, *mf;
 	MEdge *medge, *me;
 	MVert *mvert, *mv;
-	int totface,totedge,totvert,i,bmeshok,len;
+	int totface,totedge,totvert,i,bmeshok,len, numTex, numCol;
 
 	BME_Vert *v1=NULL;
 	BME_Edge *e=NULL, *oe=NULL;
@@ -345,12 +579,21 @@ DerivedMesh *BME_bmesh_to_derivedmesh(BME_Mesh *bm, DerivedMesh *dm)
 	
 	/*convert back to mesh*/
 	result = CDDM_from_template(dm,totvert,totedge,totface);
+	CustomData_merge(&bm->vdata, &result->vertData, CD_MASK_BMESH, CD_CALLOC, totvert);
+	CustomData_merge(&bm->edata, &result->edgeData, CD_MASK_BMESH, CD_CALLOC, totedge);
+	CustomData_merge(&bm->pdata, &result->faceData, CD_MASK_BMESH, CD_CALLOC, totface);
+	CustomData_from_bmeshpoly(&result->faceData, &bm->pdata, &bm->ldata,totface);
+	numTex = CustomData_number_of_layers(&bm->pdata, CD_MTEXPOLY);
+	numCol = CustomData_number_of_layers(&bm->ldata, CD_MLOOPCOL);
+
+
 	/*Make Verts*/
 	mvert = CDDM_get_verts(result);
 	for(i=0,v1=bm->verts.first,mv=mvert;v1;v1=v1->next,i++,mv++){
 		VECCOPY(mv->co,v1->co);
 		mv->flag = (unsigned char)v1->flag;
 		mv->bweight = (char)(255.0*v1->bweight);
+		CustomData_from_bmesh_block(&bm->vdata, &result->vertData, &v1->data, i);
 	}
 	medge = CDDM_get_edges(result);
 	i=0;
@@ -368,6 +611,7 @@ DerivedMesh *BME_bmesh_to_derivedmesh(BME_Mesh *bm, DerivedMesh *dm)
 			me->crease = (char)(255.0*e->crease);
 			me->bweight = (char)(255.0*e->bweight);
 			me->flag = e->flag;
+			CustomData_from_bmesh_block(&bm->edata, &result->edgeData, &e->data, i);
 			me++;
 			i++;
 		}
@@ -389,9 +633,11 @@ DerivedMesh *BME_bmesh_to_derivedmesh(BME_Mesh *bm, DerivedMesh *dm)
 				if(mf->v3 == 0 || (len == 4 && mf->v4 == 0)){
 					test_index_face(mf, NULL, i, len);
 				}
-				i++;
 				mf->mat_nr = (unsigned char)f->mat_nr;
 				mf->flag = (unsigned char)f->flag;
+				CustomData_from_bmesh_block(&bm->pdata, &result->faceData, &f->data, i);
+				BME_DMloops_to_corners(bm, &result->faceData, i, f,numCol,numTex);
+				i++;
 			}
 		}
 	}
diff --git a/source/blender/blenkernel/intern/BME_eulers.c b/source/blender/blenkernel/intern/BME_eulers.c
index 3403f5829fe..801e0b8bdec 100644
--- a/source/blender/blenkernel/intern/BME_eulers.c
+++ b/source/blender/blenkernel/intern/BME_eulers.c
@@ -39,6 +39,7 @@
 #include "DNA_mesh_types.h"
 
 #include "BKE_utildefines.h"
+#include "BKE_customdata.h"
 #include "BKE_bmesh.h"
 
 #include "BLI_blenlib.h"
@@ -618,8 +619,8 @@ BME_Poly *BME_SFME(BME_Mesh *bm, BME_Poly *f, BME_Vert *v1, BME_Vert *v2, BME_Lo
 	BME_disk_append_edge(e, v2);
 	
 	f2 = BME_addpolylist(bm,f);
-	f1loop = BME_create_loop(bm,v2,e,f,NULL);
-	f2loop = BME_create_loop(bm,v1,e,f2,NULL);
+	f1loop = BME_create_loop(bm,v2,e,f,v2loop);
+	f2loop = BME_create_loop(bm,v1,e,f2,v1loop);
 	
 	f1loop->prev = v2loop->prev;
 	f2loop->prev = v1loop->prev;
@@ -663,16 +664,16 @@ BME_Poly *BME_SFME(BME_Mesh *bm, BME_Poly *f, BME_Vert *v1, BME_Vert *v2, BME_Lo
  *	Takes a an edge and pointer to one of its vertices and collapses
  *	the edge on that vertex.
  *	
- *	Before:		    OE      KE
+ *	Before:    OE      KE
  *             	 ------- -------
  *               |     ||      |
- *				OV     KV      TV
+ *		OV     KV      TV
  *
  *
  *   After:             OE      
  *             	 ---------------
  *               |             |
- *				OV             TV
+ *		OV             TV
  *
  *
  *	Restrictions:
@@ -723,6 +724,8 @@ int BME_JEKV(BME_Mesh *bm, BME_Edge *ke, BME_Vert *kv)
 			/*remove ke from tv's disk cycle*/
 			BME_disk_remove_edge(ke, tv);
 		
+			
+
 			/*deal with radial cycle of ke*/
 			if(ke->loop){
 				/*first step, fix the neighboring loops of all loops in ke's radial cycle*/
@@ -763,6 +766,7 @@ int BME_JEKV(BME_Mesh *bm, BME_Edge *ke, BME_Vert *kv)
 				
 			}
 			
+
 			/*Validate disk cycles*/
 			diskbase = BME_disk_getpointer(ov->edge,ov);
 			edok = BME_cycle_validate(valance1, diskbase);
diff --git a/source/blender/blenkernel/intern/BME_mesh.c b/source/blender/blenkernel/intern/BME_mesh.c
index 184ef2b8a0e..ad46a7c1eb7 100644
--- a/source/blender/blenkernel/intern/BME_mesh.c
+++ b/source/blender/blenkernel/intern/BME_mesh.c
@@ -32,64 +32,33 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+
 #include "MEM_guardedalloc.h"
-
 #include "DNA_listBase.h"
-#include "DNA_meshdata_types.h"
-#include "DNA_mesh_types.h"
-#include "DNA_object_types.h"
-#include "DNA_scene_types.h"
-
-
+#include "BLI_blenlib.h"
 #include "BKE_utildefines.h"
 #include "BKE_bmesh.h"
-#include "BKE_global.h"
-#include "BKE_depsgraph.h"
-#include "BLI_blenlib.h"
-#include "BLI_editVert.h"
-#include "BIF_editmesh.h"
-#include "BIF_space.h"
-#include "editmesh.h"
 #include "bmesh_private.h"
-#include "mydevice.h"
-
-#include "BSE_edit.h"
 
 
 /*	
  *	BME MAKE MESH
  *
  *  Allocates a new BME_Mesh structure.
- *	The arguments are two arrays, one of type int
- *  and another of type BME_CustomDataInit. The first array
- *  contains the allocation size for each element pool in 
- *  the mesh. For instance allocsize[0] contains the number
- *  of vertices to allocate at a time for the vertex pool.
- *
- *  The second array contains structures describing the layout
- *  of custom data for each element type in the mesh. So init[0]
- *  contains the custom data layout information for vertices, init[1]
- *  the layout information for edges and so on.
- *
  *  Returns -
  *  Pointer to a Bmesh
  *
 */
 
-BME_Mesh *BME_make_mesh(int allocsize[4], BME_CustomDataInit init[4])
+BME_Mesh *BME_make_mesh(int allocsize[4])
 {
 	/*allocate the structure*/
 	BME_Mesh *bm = MEM_callocN(sizeof(BME_Mesh),"BMesh");
 	/*allocate the memory pools for the mesh elements*/
-	bm->vpool = BME_mempool_create(sizeof(BME_Vert), allocsize[0], allocsize[0]);
-	bm->epool = BME_mempool_create(sizeof(BME_Edge), allocsize[1], allocsize[1]);
-	bm->lpool = BME_mempool_create(sizeof(BME_Loop), allocsize[2], allocsize[2]);
-	bm->ppool = BME_mempool_create(sizeof(BME_Poly), allocsize[3], allocsize[3]);
-	/*Setup custom data layers*/
-	BME_CD_Create(&bm->vdata, &init[0], allocsize[0]);
-	BME_CD_Create(&bm->edata, &init[1], allocsize[1]);
-	BME_CD_Create(&bm->ldata, &init[2], allocsize[2]);
-	BME_CD_Create(&bm->pdata, &init[3], allocsize[3]);
+	bm->vpool = BLI_mempool_create(sizeof(BME_Vert), allocsize[0], allocsize[0]);
+	bm->epool = BLI_mempool_create(sizeof(BME_Edge), allocsize[1], allocsize[1]);
+	bm->lpool = BLI_mempool_create(sizeof(BME_Loop), allocsize[2], allocsize[2]);
+	bm->ppool = BLI_mempool_create(sizeof(BME_Poly), allocsize[3], allocsize[3]);
 	return bm;
 }
 /*	
@@ -105,26 +74,35 @@ void BME_free_mesh(BME_Mesh *bm)
 	BME_Loop *l;
 	BME_Poly *f;
 
-	for(v=bm->verts.first; v; v=v->next) BME_CD_free_block(&bm->vdata, &v->data);
-	for(e=bm->edges.first; e; e=e->next) BME_CD_free_block(&bm->edata, &e->data);
+	for(v=bm->verts.first; v; v=v->next) CustomData_bmesh_free_block(&bm->vdata, &v->data);
+	for(e=bm->edges.first; e; e=e->next) CustomData_bmesh_free_block(&bm->edata, &e->data);
 	for(f=bm->polys.first; f; f=f->next){
-		BME_CD_free_block(&bm->pdata, &f->data);
+		CustomData_bmesh_free_block(&bm->pdata, &f->data);
 		l = f->loopbase;
 		do{
-			BME_CD_free_block(&bm->ldata, &l->data);
+			CustomData_bmesh_free_block(&bm->ldata, &l->data);
 			l = l->next;
 		}while(l!=f->loopbase);
 	}
+
+	/*Free custom data pools, This should probably go in CustomData_free?*/
+	if(bm->vdata.totlayer) BLI_mempool_destroy(bm->vdata.pool);
+	if(bm->edata.totlayer) BLI_mempool_destroy(bm->edata.pool);
+	if(bm->ldata.totlayer) BLI_mempool_destroy(bm->ldata.pool);
+	if(bm->pdata.totlayer) BLI_mempool_destroy(bm->pdata.pool);
+
+ 	/*free custom data*/
+	CustomData_free(&bm->vdata,0);
+	CustomData_free(&bm->edata,0);
+	CustomData_free(&bm->ldata,0);
+	CustomData_free(&bm->pdata,0);
+
 	/*destroy element pools*/
-	BME_mempool_destroy(bm->vpool);
-	BME_mempool_destroy(bm->epool);
-	BME_mempool_destroy(bm->ppool);
-	BME_mempool_destroy(bm->lpool);
-	/*free custom data pools*/
-	BME_CD_Free(&bm->vdata);
-	BME_CD_Free(&bm->edata);
-	BME_CD_Free(&bm->ldata);
-	BME_CD_Free(&bm->pdata);
+	BLI_mempool_destroy(bm->vpool);
+	BLI_mempool_destroy(bm->epool);
+	BLI_mempool_destroy(bm->ppool);
+	BLI_mempool_destroy(bm->lpool);
+	
 	MEM_freeN(bm);	
 }
 
diff --git a/source/blender/blenkernel/intern/BME_structure.c b/source/blender/blenkernel/intern/BME_structure.c
index cbf780c6467..ca27f5efd10 100644
--- a/source/blender/blenkernel/intern/BME_structure.c
+++ b/source/blender/blenkernel/intern/BME_structure.c
@@ -41,101 +41,6 @@
 #include "BLI_blenlib.h"
 #include "BLI_linklist.h"
 #include "BLI_ghash.h"
-
-#include "BKE_customdata.h"
-
-/*
-	Simple, fast memory allocator for allocating many elements of the same size.
-*/
-typedef struct BME_mempool_chunk{
-	struct BME_mempool_chunk *next, *prev;
-	void *data;
-}BME_mempool_chunk;
-
-/*this is just to make things prettier*/
-typedef struct BME_freenode{
-	struct BME_freenode *next;
-}BME_freenode;
-
-BME_mempool *BME_mempool_create(int esize, int tote, int pchunk)
-{	BME_mempool  *pool = NULL;
-	BME_freenode *lasttail = NULL, *curnode = NULL;
-	int i,j, maxchunks;
-	char *addr;
-
-	/*allocate the pool structure*/
-	pool = MEM_mallocN(sizeof(BME_mempool),"memory pool");
-	pool->esize = esize;
-	pool->pchunk = pchunk;	
-	pool->csize = esize * pchunk;
-	pool->chunks.first = pool->chunks.last = NULL;
-	
-	maxchunks = tote / pchunk;
-	
-	/*allocate the actual chunks*/
-	for(i=0; i < maxchunks; i++){
-		BME_mempool_chunk *mpchunk = MEM_mallocN(sizeof(BME_mempool_chunk), "BME_Mempool Chunk");
-		mpchunk->next = mpchunk->prev = NULL;
-		mpchunk->data = MEM_mallocN(pool->csize, "BME Mempool Chunk Data");
-		BLI_addtail(&(pool->chunks), mpchunk);
-		
-		if(i==0) pool->free = mpchunk->data; /*start of the list*/
-		/*loop through the allocated data, building the pointer structures*/
-		for(addr = mpchunk->data, j=0; j < pool->pchunk; j++){
-			curnode = ((BME_freenode*)addr);
-			addr += pool->esize;
-			curnode->next = (BME_freenode*)addr;
-		}
-		/*final pointer in the previously allocated chunk is wrong.*/
-		if(lasttail) lasttail->next = mpchunk->data;
-		/*set the end of this chunks memory to the new tail for next iteration*/
-		lasttail = curnode;
-	}
-	/*terminate the list*/
-	curnode->next = NULL;
-	return pool;
-}
-
-void *BME_mempool_alloc(BME_mempool *pool){
-	void *retval=NULL;
-	BME_freenode *curnode=NULL;
-	char *addr=NULL;
-	int j;
-
-	if(!(pool->free)){
-		/*need to allocate a new chunk*/
-		BME_mempool_chunk *mpchunk = MEM_mallocN(sizeof(BME_mempool_chunk), "BME_Mempool Chunk");
-		mpchunk->next = mpchunk->prev = NULL;
-		mpchunk->data = MEM_mallocN(pool->csize, "BME_Mempool Chunk Data");
-		BLI_addtail(&(pool->chunks), mpchunk);
-
-		pool->free = mpchunk->data; /*start of the list*/
-		for(addr = mpchunk->data, j=0; j < pool->pchunk; j++){
-			curnode = ((BME_freenode*)addr);
-			addr += pool->esize;
-			curnode->next = (BME_freenode*)addr;
-		}
-		curnode->next = NULL; /*terminate the list*/
-	}
-
-	retval = pool->free;
-	pool->free = pool->free->next;
-	//memset(retval, 0, pool->esize);
-	return retval;
-}
-
-void BME_mempool_free(BME_mempool *pool, void *addr){ //doesnt protect against double frees, dont be stupid!
-	BME_freenode *newhead = addr;
-	newhead->next = pool->free;
-	pool->free = newhead;
-}
-void BME_mempool_destroy(BME_mempool *pool)
-{
-	BME_mempool_chunk *mpchunk=NULL;
-	for(mpchunk = pool->chunks.first; mpchunk; mpchunk = mpchunk->next) MEM_freeN(mpchunk->data);
-	BLI_freelistN(&(pool->chunks));
-	MEM_freeN(pool);
-}
 /**
  *	MISC utility functions.
  *
@@ -179,7 +84,7 @@ int BME_edge_swapverts(BME_Edge *e, BME_Vert *orig, BME_Vert *new){
 
 BME_Vert *BME_addvertlist(BME_Mesh *bm, BME_Vert *example){
 	BME_Vert *v=NULL;
-	v = BME_mempool_alloc(bm->vpool);
+	v = BLI_mempool_alloc(bm->vpool);
 	v->next = v->prev = NULL;
 	v->EID = bm->nextv;
 	v->co[0] = v->co[1] = v->co[2] = 0.0f;
@@ -195,16 +100,16 @@ BME_Vert *BME_addvertlist(BME_Mesh *bm, BME_Vert *example){
 
 	if(example){
 		VECCOPY(v->co,example->co);
-		BME_CD_copy_data(&bm->vdata, &bm->vdata, example->data, &v->data);
+		CustomData_bmesh_copy_data(&bm->vdata, &bm->vdata, example->data, &v->data);
 	}
 	else
-		BME_CD_set_default(&bm->vdata, &v->data);
+		CustomData_bmesh_set_default(&bm->vdata, &v->data);
 
 	return v;
 }
 BME_Edge *BME_addedgelist(BME_Mesh *bm, BME_Vert *v1, BME_Vert *v2, BME_Edge *example){
 	BME_Edge *e=NULL;
-	e = BME_mempool_alloc(bm->epool);
+	e = BLI_mempool_alloc(bm->epool);
 	e->next = e->prev = NULL;
 	e->EID = bm->nexte;
 	e->v1 = v1;
@@ -222,16 +127,16 @@ BME_Edge *BME_addedgelist(BME_Mesh *bm, BME_Vert *v1, BME_Vert *v2, BME_Edge *ex
 	BLI_addtail(&(bm->edges), e);
 	
 	if(example)
-		BME_CD_copy_data(&bm->edata, &bm->edata, example->data, &e->data);
+		CustomData_bmesh_copy_data(&bm->edata, &bm->edata, example->data, &e->data);
 	else
-		BME_CD_set_default(&bm->edata, &e->data);
+		CustomData_bmesh_set_default(&bm->edata, &e->data);
 
 
 	return e;
 }
 BME_Loop *BME_create_loop(BME_Mesh *bm, BME_Vert *v, BME_Edge *e, BME_Poly *f, BME_Loop *example){
 	BME_Loop *l=NULL;
-	l = BME_mempool_alloc(bm->lpool);
+	l = BLI_mempool_alloc(bm->lpool);
 	l->next = l->prev = NULL;
 	l->EID = bm->nextl;
 	l->radial.next = l->radial.prev = NULL;
@@ -246,16 +151,16 @@ BME_Loop *BME_create_loop(BME_Mesh *bm, BME_Vert *v, BME_Edge *e, BME_Poly *f, B
 	bm->totloop++;
 	
 	if(example)
-		BME_CD_copy_data(&bm->ldata, &bm->ldata, example->data, &l->data);
+		CustomData_bmesh_copy_data(&bm->ldata, &bm->ldata, example->data, &l->data);
 	else
-		BME_CD_set_default(&bm->ldata, &l->data);
+		CustomData_bmesh_set_default(&bm->ldata, &l->data);
 
 	return l;
 }
 
 BME_Poly *BME_addpolylist(BME_Mesh *bm, BME_Poly *example){
 	BME_Poly *f = NULL;
-	f = BME_mempool_alloc(bm->ppool);
+	f = BLI_mempool_alloc(bm->ppool);
 	f->next = f->prev = NULL;
 	f->EID = bm->nextp;
 	f->loopbase = NULL;
@@ -268,9 +173,9 @@ BME_Poly *BME_addpolylist(BME_Mesh *bm, BME_Poly *example){
 	bm->totpoly++;
 
 	if(example)
-		BME_CD_copy_data(&bm->pdata, &bm->pdata, example->data, &f->data);
+		CustomData_bmesh_copy_data(&bm->pdata, &bm->pdata, example->data, &f->data);
 	else
-		BME_CD_set_default(&bm->pdata, &f->data);
+		CustomData_bmesh_set_default(&bm->pdata, &f->data);
 
 
 	return f;
@@ -281,23 +186,23 @@ BME_Poly *BME_addpolylist(BME_Mesh *bm, BME_Poly *example){
 */
 void BME_free_vert(BME_Mesh *bm, BME_Vert *v){
 	bm->totvert--;
-	BME_CD_free_block(&bm->vdata, &v->data);
-	BME_mempool_free(bm->vpool, v);
+	CustomData_bmesh_free_block(&bm->vdata, &v->data);
+	BLI_mempool_free(bm->vpool, v);
 }
 void BME_free_edge(BME_Mesh *bm, BME_Edge *e){
 	bm->totedge--;
-	BME_CD_free_block(&bm->edata, &e->data);
-	BME_mempool_free(bm->epool, e);
+	CustomData_bmesh_free_block(&bm->edata, &e->data);
+	BLI_mempool_free(bm->epool, e);
 }
 void BME_free_poly(BME_Mesh *bm, BME_Poly *f){
 	bm->totpoly--;
-	BME_CD_free_block(&bm->pdata, &f->data);
-	BME_mempool_free(bm->ppool, f);
+	CustomData_bmesh_free_block(&bm->pdata, &f->data);
+	BLI_mempool_free(bm->ppool, f);
 }
 void BME_free_loop(BME_Mesh *bm, BME_Loop *l){
 	bm->totloop--;
-	BME_CD_free_block(&bm->ldata, &l->data);
-	BME_mempool_free(bm->lpool, l);
+	CustomData_bmesh_free_block(&bm->ldata, &l->data);
+	BLI_mempool_free(bm->lpool, l);
 }
 /**
  *	BMESH CYCLES
diff --git a/source/blender/blenkernel/intern/BME_tools.c b/source/blender/blenkernel/intern/BME_tools.c
index 7ce967d1d22..90259031e5c 100644
--- a/source/blender/blenkernel/intern/BME_tools.c
+++ b/source/blender/blenkernel/intern/BME_tools.c
@@ -205,7 +205,53 @@ static BME_Poly *BME_split_face(BME_Mesh *bm, BME_Poly *f, BME_Vert *v1, BME_Ver
 	return nf;
 }
 
-/* a wrapper for BME_SEMV that transfers element flags */
+
+static void BME_data_interp_from_verts(BME_Mesh *bm, BME_Vert *v1, BME_Vert *v2, BME_Vert *v, float fac)
+{
+	void *src[2];
+	float w[2];
+	if (v1->data && v2->data) {
+		src[0]= v1->data;
+		src[1]= v2->data;
+		w[0] = 1.0f-fac;
+		w[1] = fac;
+		CustomData_bmesh_interp(&bm->vdata, src, w, NULL, 2, v->data);
+	}
+}
+
+
+static void BME_data_facevert_edgesplit(BME_Mesh *bm, BME_Vert *v1, BME_Vert *v2, BME_Vert *v, BME_Edge *e1, float fac){
+	void *src[2];
+	float w[2];
+	BME_Loop *l=NULL, *v1loop = NULL, *vloop = NULL, *v2loop = NULL;
+	
+	w[0] = 1.0f - fac;
+	w[1] = fac;
+
+	if(!e1->loop) return;
+	l = e1->loop;
+	do{
+		if(l->v == v1){ 
+			v1loop = l;
+			vloop = v1loop->next;
+			v2loop = vloop->next;
+		}else if(l->v == v){
+			v1loop = l->next;
+			vloop = l;
+			v2loop = l->prev;
+			
+		}
+
+		src[0] = v1loop->data;
+		src[1] = v2loop->data;					
+
+		CustomData_bmesh_interp(&bm->ldata, src,w, NULL, 2, vloop->data); 				
+		l = l->radial.next->data;
+	}while(l!=e1->loop);
+}
+
+
+/* a wrapper for BME_SEMV that transfers element flags */ /*add custom data interpolation in here!*/
 static BME_Vert *BME_split_edge(BME_Mesh *bm, BME_Vert *v, BME_Edge *e, BME_Edge **ne, float percent) {
 	BME_Vert *nv, *v2;
 	float len;
@@ -224,10 +270,39 @@ static BME_Vert *BME_split_edge(BME_Mesh *bm, BME_Vert *v, BME_Edge *e, BME_Edge
 		(*ne)->crease = e->crease;
 		(*ne)->bweight = e->bweight;
 	}
-
+	/*v->nv->v2*/
+	BME_data_facevert_edgesplit(bm,v2, v, nv, e, 0.75);	
 	return nv;
 }
 
+static void BME_collapse_vert(BME_Mesh *bm, BME_Edge *ke, BME_Vert *kv, float fac){
+	void *src[2];
+	float w[2];
+	BME_Loop *l=NULL, *kvloop=NULL, *tvloop=NULL;
+	BME_Vert *tv = BME_edge_getothervert(ke,kv);
+
+	w[0] = 1.0f - fac;
+	w[1] = fac;
+
+	if(ke->loop){
+		l = ke->loop;
+		do{
+			if(l->v == tv && l->next->v == kv){
+				tvloop = l;
+				kvloop = l->next;
+
+				src[0] = kvloop->data;
+				src[1] = tvloop->data;
+				CustomData_bmesh_interp(&bm->ldata, src,w, NULL, 2, kvloop->data); 								
+			}
+			l=l->radial.next->data;
+		}while(l!=ke->loop);
+	}
+	BME_JEKV(bm,ke,kv);
+}
+
+
+
 static int BME_bevel_is_split_vert(BME_Loop *l) {
 	/* look for verts that have already been added to the edge when
 	 * beveling other polys; this can be determined by testing the
@@ -315,7 +390,7 @@ static float BME_bevel_project_vec(float *vec1, float *vec2, float *up_vec, int
  * Finally, return the split vert. */
 static BME_Vert *BME_bevel_split_edge(BME_Mesh *bm, BME_Vert *v, BME_Vert *v1, BME_Loop *l, float *up_vec, float value, BME_TransData_Head *td) {
 	BME_TransData *vtd, *vtd1, *vtd2;
-	BME_Vert *sv, *v2, *v3;
+	BME_Vert *sv, *v2, *v3, *ov;
 	BME_Loop *lv1, *lv2;
 	BME_Edge *ne, *e1, *e2;
 	float maxfactor, scale, len, dis, vec1[3], vec2[3], t_up_vec[3];
@@ -349,7 +424,11 @@ static BME_Vert *BME_bevel_split_edge(BME_Mesh *bm, BME_Vert *v, BME_Vert *v1, B
 		else {
 			e1 = e2;
 		}
+		ov = BME_edge_getothervert(e1,v);
 		sv = BME_split_edge(bm,v,e1,&ne,0);
+		//BME_data_interp_from_verts(bm, v, ov, sv, 0.25); /*this is technically wrong...*/
+		//BME_data_interp_from_faceverts(bm, v, ov, sv, 0.25);
+		//BME_data_interp_from_faceverts(bm, ov, v, sv, 0.25);
 		BME_assign_transdata(td, bm, sv, sv->co, sv->co, NULL, sv->co, 0, -1, -1, NULL); /* quick default */
 		sv->tflag1 |= BME_BEVEL_BEVEL;
 		ne->tflag1 = BME_BEVEL_ORIG; /* mark edge as original, even though it isn't */
@@ -388,7 +467,11 @@ static BME_Vert *BME_bevel_split_edge(BME_Mesh *bm, BME_Vert *v, BME_Vert *v1, B
 		}
 		else {
 			is_split_vert = 0;
+			ov = BME_edge_getothervert(l->e,v);
 			sv = BME_split_edge(bm,v,l->e,&ne,0);
+			//BME_data_interp_from_verts(bm, v, ov, sv, 0.25); /*this is technically wrong...*/
+			//BME_data_interp_from_faceverts(bm, v, ov, sv, 0.25);
+			//BME_data_interp_from_faceverts(bm, ov, v, sv, 0.25);
 			BME_assign_transdata(td, bm, sv, sv->co, sv->co, NULL, sv->co, 0, -1, -1, NULL); /* quick default */
 			sv->tflag1 |= BME_BEVEL_BEVEL;
 			ne->tflag1 = BME_BEVEL_ORIG; /* mark edge as original, even though it isn't */
@@ -567,12 +650,15 @@ static BME_Loop *BME_bevel_edge(BME_Mesh *bm, BME_Loop *l, float value, int opti
 		if (kl->v == kv) {
 			BME_split_face(bm,kl->f,kl->prev->v,kl->next->v,&nl,kl->prev->e);
 			BME_JFKE(bm,((BME_Loop*)kl->prev->radial.next->data)->f,kl->f,kl->prev->e);
-			BME_JEKV(bm,kl->e,kv);
+			BME_collapse_vert(bm, kl->e, kv, 1.0);
+			//BME_JEKV(bm,kl->e,kv);
+			
 		}
 		else {
 			BME_split_face(bm,kl->f,kl->next->next->v,kl->v,&nl,kl->next->e);
 			BME_JFKE(bm,((BME_Loop*)kl->next->radial.next->data)->f,kl->f,kl->next->e);
-			BME_JEKV(bm,kl->e,kv);
+			BME_collapse_vert(bm, kl->e, kv, 1.0);
+			//BME_JEKV(bm,kl->e,kv);
 		}
 		l = l->prev;
 	}
@@ -601,12 +687,14 @@ static BME_Loop *BME_bevel_edge(BME_Mesh *bm, BME_Loop *l, float value, int opti
 		if (kl->v == kv) {
 			BME_split_face(bm,kl->f,kl->prev->v,kl->next->v,&nl,kl->prev->e);
 			BME_JFKE(bm,((BME_Loop*)kl->prev->radial.next->data)->f,kl->f,kl->prev->e);
-			BME_JEKV(bm,kl->e,kv);
+			BME_collapse_vert(bm, kl->e, kv, 1.0);
+			//BME_JEKV(bm,kl->e,kv);
 		}
 		else {
 			BME_split_face(bm,kl->f,kl->next->next->v,kl->v,&nl,kl->next->e);
 			BME_JFKE(bm,((BME_Loop*)kl->next->radial.next->data)->f,kl->f,kl->next->e);
-			BME_JEKV(bm,kl->e,kv);
+			BME_collapse_vert(bm, kl->e, kv, 1.0);
+			//BME_JEKV(bm,kl->e,kv);
 		}
 	}
 
@@ -1073,7 +1161,8 @@ static void bmesh_dissolve_disk(BME_Mesh *bm, BME_Vert *v){
 				e = BME_disk_nextedge(e,v);
 			}while(e != v->edge);
 		}
-		BME_JEKV(bm,v->edge,v);
+		BME_collapse_vert(bm, v->edge, v, 1.0);
+		//BME_JEKV(bm,v->edge,v);
 	}
 }
 static BME_Mesh *BME_bevel_mesh(BME_Mesh *bm, float value, int res, int options, int defgrp_index, BME_TransData_Head *td) {
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 654cf0991cc..4d3f9143b85 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -186,10 +186,6 @@ void DM_init_funcs(DerivedMesh *dm)
 void DM_init(DerivedMesh *dm,
              int numVerts, int numEdges, int numFaces)
 {
-	CustomData_add_layer(&dm->vertData, CD_ORIGINDEX, CD_CALLOC, NULL, numVerts);
-	CustomData_add_layer(&dm->edgeData, CD_ORIGINDEX, CD_CALLOC, NULL, numEdges);
-	CustomData_add_layer(&dm->faceData, CD_ORIGINDEX, CD_CALLOC, NULL, numFaces);
-
 	dm->numVertData = numVerts;
 	dm->numEdgeData = numEdges;
 	dm->numFaceData = numFaces;
@@ -1056,7 +1052,7 @@ void emDM_copyEdgeArray(DerivedMesh *dm, MEdge *edge_r)
 
 	/* store vertex indices in tmp union */
 	for(ev = em->verts.first, i = 0; ev; ev = ev->next, ++i)
-		ev->tmp.l = (long) i++;
+		ev->tmp.l = (long) i;
 
 	for( ; ee; ee = ee->next, ++edge_r) {
 		edge_r->crease = (unsigned char) (ee->crease*255.0f);
diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c
index 5fb3d6f869a..5b96bf11056 100644
--- a/source/blender/blenkernel/intern/action.c
+++ b/source/blender/blenkernel/intern/action.c
@@ -290,6 +290,12 @@ void copy_pose(bPose **dst, bPose *src, int copycon)
 		return;
 	}
 	
+	if (*dst==src) {
+		printf("copy_pose source and target are the same\n");
+		*dst=NULL;
+		return;
+	}
+	
 	outPose= MEM_callocN(sizeof(bPose), "pose");
 	
 	duplicatelist(&outPose->chanbase, &src->chanbase);
@@ -344,7 +350,7 @@ static void copy_pose_channel_data(bPoseChannel *pchan, const bPoseChannel *chan
 	pchan->flag= chan->flag;
 	
 	con= chan->constraints.first;
-	for(pcon= pchan->constraints.first; pcon; pcon= pcon->next) {
+	for(pcon= pchan->constraints.first; pcon; pcon= pcon->next, con= con->next) {
 		pcon->enforce= con->enforce;
 		pcon->headtail= con->headtail;
 	}
@@ -740,6 +746,11 @@ void extract_pose_from_pose(bPose *pose, const bPose *src)
 	const bPoseChannel *schan;
 	bPoseChannel *pchan= pose->chanbase.first;
 
+	if (pose==src) {
+		printf("extract_pose_from_pose source and target are the same\n");
+		return;
+	}
+
 	for (schan=src->chanbase.first; schan; schan=schan->next, pchan= pchan->next) {
 		copy_pose_channel_data(pchan, schan);
 	}
@@ -817,6 +828,12 @@ void copy_pose_result(bPose *to, bPose *from)
 		return;
 	}
 
+	if (to==from) {
+		printf("copy_pose_result source and target are the same\n");
+		return;
+	}
+
+
 	for(pchanfrom= from->chanbase.first; pchanfrom; pchanfrom= pchanfrom->next) {
 		pchanto= get_pose_channel(to, pchanfrom->name);
 		if(pchanto) {
@@ -843,7 +860,7 @@ typedef struct NlaIpoChannel {
 	int type;
 } NlaIpoChannel;
 
-static void extract_ipochannels_from_action(ListBase *lb, ID *id, bAction *act, char *name, float ctime)
+void extract_ipochannels_from_action(ListBase *lb, ID *id, bAction *act, char *name, float ctime)
 {
 	bActionChannel *achan= get_action_channel(act, name);
 	IpoCurve *icu;
@@ -936,15 +953,18 @@ static void blend_ipochannels(ListBase *dst, ListBase *src, float srcweight, int
 	}
 }
 
-static void execute_ipochannels(ListBase *lb)
+int execute_ipochannels(ListBase *lb)
 {
 	NlaIpoChannel *nic;
+	int count = 0;
 	
 	for(nic= lb->first; nic; nic= nic->next) {
 		if(nic->poin) {
 			write_ipo_poin(nic->poin, nic->type, nic->val);
+			count++;
 		}
 	}
+	return count;
 }
 
 /* nla timing */
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index eca10e5b079..fb7d59c137a 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -1709,13 +1709,13 @@ static void execute_posetree(Object *ob, PoseTree *tree)
 
 	if (tree->totchannel == 0)
 		return;
-
+	
 	iktree= MEM_mallocN(sizeof(void*)*tree->totchannel, "ik tree");
 
 	for(a=0; a<tree->totchannel; a++) {
 		pchan= tree->pchan[a];
 		bone= pchan->bone;
-
+		
 		/* set DoF flag */
 		flag= 0;
 		if(!(pchan->ikflag & BONE_IK_NO_XDOF) && !(pchan->ikflag & BONE_IK_NO_XDOF_TEMP))
@@ -1724,32 +1724,32 @@ static void execute_posetree(Object *ob, PoseTree *tree)
 			flag |= IK_YDOF;
 		if(!(pchan->ikflag & BONE_IK_NO_ZDOF) && !(pchan->ikflag & BONE_IK_NO_ZDOF_TEMP))
 			flag |= IK_ZDOF;
-
+		
 		if(tree->stretch && (pchan->ikstretch > 0.0)) {
 			flag |= IK_TRANS_YDOF;
 			hasstretch = 1;
 		}
-
+		
 		seg= iktree[a]= IK_CreateSegment(flag);
-
+		
 		/* find parent */
 		if(a == 0)
 			parent= NULL;
 		else
 			parent= iktree[tree->parent[a]];
-
+			
 		IK_SetParent(seg, parent);
-	
+			
 		/* get the matrix that transforms from prevbone into this bone */
 		Mat3CpyMat4(R_bonemat, pchan->pose_mat);
-
+		
 		/* gather transformations for this IK segment */
-
+		
 		if (pchan->parent)
 			Mat3CpyMat4(R_parmat, pchan->parent->pose_mat);
 		else
 			Mat3One(R_parmat);
-
+		
 		/* bone offset */
 		if (pchan->parent && (a > 0))
 			VecSubf(start, pchan->pose_head, pchan->parent->pose_tail);
@@ -1759,37 +1759,37 @@ static void execute_posetree(Object *ob, PoseTree *tree)
 		
 		/* change length based on bone size */
 		length= bone->length*VecLength(R_bonemat[1]);
-
+		
 		/* compute rest basis and its inverse */
 		Mat3CpyMat3(rest_basis, bone->bone_mat);
 		Mat3CpyMat3(irest_basis, bone->bone_mat);
 		Mat3Transp(irest_basis);
-
+		
 		/* compute basis with rest_basis removed */
 		Mat3Inv(iR_parmat, R_parmat);
 		Mat3MulMat3(full_basis, iR_parmat, R_bonemat);
 		Mat3MulMat3(basis, irest_basis, full_basis);
-
+		
 		/* basis must be pure rotation */
 		Mat3Ortho(basis);
-
+		
 		/* transform offset into local bone space */
 		Mat3Ortho(iR_parmat);
 		Mat3MulVecfl(iR_parmat, start);
-
+		
 		IK_SetTransform(seg, start, rest_basis, basis, length);
-
+		
 		if (pchan->ikflag & BONE_IK_XLIMIT)
 			IK_SetLimit(seg, IK_X, pchan->limitmin[0], pchan->limitmax[0]);
 		if (pchan->ikflag & BONE_IK_YLIMIT)
 			IK_SetLimit(seg, IK_Y, pchan->limitmin[1], pchan->limitmax[1]);
 		if (pchan->ikflag & BONE_IK_ZLIMIT)
 			IK_SetLimit(seg, IK_Z, pchan->limitmin[2], pchan->limitmax[2]);
-
+		
 		IK_SetStiffness(seg, IK_X, pchan->stiffness[0]);
 		IK_SetStiffness(seg, IK_Y, pchan->stiffness[1]);
 		IK_SetStiffness(seg, IK_Z, pchan->stiffness[2]);
-
+		
 		if(tree->stretch && (pchan->ikstretch > 0.0)) {
 			float ikstretch = pchan->ikstretch*pchan->ikstretch;
 			IK_SetStiffness(seg, IK_TRANS_Y, MIN2(1.0-ikstretch, 0.99));
@@ -1818,7 +1818,7 @@ static void execute_posetree(Object *ob, PoseTree *tree)
 	for (target=tree->targets.first; target; target=target->next) {
 		float polepos[3];
 		int poleconstrain= 0;
-
+		
 		data= (bKinematicConstraint*)target->con->data;
 		
 		/* 1.0=ctime, we pass on object for auto-ik (owner-type here is object, even though
@@ -1835,7 +1835,7 @@ static void execute_posetree(Object *ob, PoseTree *tree)
 		/* same for pole vector target */
 		if(data->poletar) {
 			get_constraint_target_matrix(target->con, 1, CONSTRAINT_OBTYPE_OBJECT, ob, rootmat, 1.0);
-
+			
 			if(data->flag & CONSTRAINT_IK_SETANGLE) {
 				/* don't solve IK when we are setting the pole angle */
 				break;
@@ -1844,7 +1844,7 @@ static void execute_posetree(Object *ob, PoseTree *tree)
 				Mat4MulMat4(goal, rootmat, goalinv);
 				VECCOPY(polepos, goal[3]);
 				poleconstrain= 1;
-
+				
 				if(data->flag & CONSTRAINT_IK_GETANGLE) {
 					poleangledata= data;
 					data->flag &= ~CONSTRAINT_IK_GETANGLE;
@@ -1903,36 +1903,35 @@ static void execute_posetree(Object *ob, PoseTree *tree)
 	tree->basis_change= MEM_mallocN(sizeof(float[3][3])*tree->totchannel, "ik basis change");
 	if(hasstretch)
 		ikstretch= MEM_mallocN(sizeof(float)*tree->totchannel, "ik stretch");
-
+		
 	for(a=0; a<tree->totchannel; a++) {
 		IK_GetBasisChange(iktree[a], tree->basis_change[a]);
-
+		
 		if(hasstretch) {
 			/* have to compensate for scaling received from parent */
 			float parentstretch, stretch;
-
+			
 			pchan= tree->pchan[a];
 			parentstretch= (tree->parent[a] >= 0)? ikstretch[tree->parent[a]]: 1.0;
-
+			
 			if(tree->stretch && (pchan->ikstretch > 0.0)) {
 				float trans[3], length;
-
+				
 				IK_GetTranslationChange(iktree[a], trans);
 				length= pchan->bone->length*VecLength(pchan->pose_mat[1]);
-
+				
 				ikstretch[a]= (length == 0.0)? 1.0: (trans[1]+length)/length;
 			}
 			else
 				ikstretch[a] = 1.0;
-
+			
 			stretch= (parentstretch == 0.0)? 1.0: ikstretch[a]/parentstretch;
-
+			
 			VecMulf(tree->basis_change[a][0], stretch);
 			VecMulf(tree->basis_change[a][1], stretch);
 			VecMulf(tree->basis_change[a][2], stretch);
-
 		}
-
+		
 		IK_FreeSegment(iktree[a]);
 	}
 	
diff --git a/source/blender/blenkernel/intern/bmesh_private.h b/source/blender/blenkernel/intern/bmesh_private.h
index 4aa2a85b8b1..f34ef0090f3 100644
--- a/source/blender/blenkernel/intern/bmesh_private.h
+++ b/source/blender/blenkernel/intern/bmesh_private.h
@@ -39,11 +39,6 @@
 
 #include "BKE_bmesh.h"
 
-struct BME_mempool *BME_mempool_create(int esize, int tote, int pchunk);
-void BME_mempool_destroy(struct BME_mempool *pool);
-void *BME_mempool_alloc(struct BME_mempool *pool);
-void BME_mempool_free(struct BME_mempool *pool, void *address);
-
 /*ALLOCATION/DEALLOCATION*/
 struct BME_Vert *BME_addvertlist(struct BME_Mesh *bm, struct BME_Vert *example);
 struct BME_Edge *BME_addedgelist(struct BME_Mesh *bm, struct BME_Vert *v1, struct BME_Vert *v2, struct BME_Edge *example);
@@ -54,7 +49,6 @@ void BME_free_vert(struct BME_Mesh *bm, struct BME_Vert *v);
 void BME_free_edge(struct BME_Mesh *bm, struct BME_Edge *e);
 void BME_free_poly(struct BME_Mesh *bm, struct BME_Poly *f);
 void BME_free_loop(struct BME_Mesh *bm, struct BME_Loop *l);
-//void BME_delete_loop(struct BME_Mesh *bm, struct BME_Loop *l);
 
 /*DOUBLE CIRCULAR LINKED LIST FUNCTIONS*/
 void BME_cycle_append(void *h, void *nt);
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index c2946bb666f..472df3d0f26 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -732,6 +732,10 @@ DerivedMesh *CDDM_new(int numVerts, int numEdges, int numFaces)
 
 	DM_init(dm, numVerts, numEdges, numFaces);
 
+	CustomData_add_layer(&dm->vertData, CD_ORIGINDEX, CD_CALLOC, NULL, numVerts);
+	CustomData_add_layer(&dm->edgeData, CD_ORIGINDEX, CD_CALLOC, NULL, numEdges);
+	CustomData_add_layer(&dm->faceData, CD_ORIGINDEX, CD_CALLOC, NULL, numFaces);
+
 	CustomData_add_layer(&dm->vertData, CD_MVERT, CD_CALLOC, NULL, numVerts);
 	CustomData_add_layer(&dm->edgeData, CD_MEDGE, CD_CALLOC, NULL, numEdges);
 	CustomData_add_layer(&dm->faceData, CD_MFACE, CD_CALLOC, NULL, numFaces);
@@ -753,6 +757,11 @@ DerivedMesh *CDDM_from_mesh(Mesh *mesh, Object *ob)
 	 * with an exception for fluidsim */
 
 	DM_init(dm, mesh->totvert, mesh->totedge, mesh->totface);
+
+	CustomData_add_layer(&dm->vertData, CD_ORIGINDEX, CD_CALLOC, NULL, mesh->totvert);
+	CustomData_add_layer(&dm->edgeData, CD_ORIGINDEX, CD_CALLOC, NULL, mesh->totedge);
+	CustomData_add_layer(&dm->faceData, CD_ORIGINDEX, CD_CALLOC, NULL, mesh->totface);
+
 	dm->deformedOnly = 1;
 
 	if(ob && ob->fluidsimSettings && ob->fluidsimSettings->meshSurface)
diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c
index 6034b85e20f..c7817b017ef 100644
--- a/source/blender/blenkernel/intern/cloth.c
+++ b/source/blender/blenkernel/intern/cloth.c
@@ -132,7 +132,7 @@ void cloth_init ( ClothModifierData *clmd )
 	
 	clmd->coll_parms->self_friction = 5.0;
 	clmd->coll_parms->friction = 5.0;
-	clmd->coll_parms->loop_count = 3;
+	clmd->coll_parms->loop_count = 2;
 	clmd->coll_parms->epsilon = 0.015f;
 	clmd->coll_parms->flags = CLOTH_COLLSETTINGS_FLAG_ENABLED;
 	clmd->coll_parms->collision_list = NULL;
@@ -471,7 +471,7 @@ static int do_step_cloth(Object *ob, ClothModifierData *clmd, DerivedMesh *resul
 
 	tend();
 
-	/* printf ( "Cloth simulation time: %f\n", ( float ) tval() ); */
+	// printf ( "%f\n", ( float ) tval() );
 	
 	return ret;
 }
diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c
index 7f41ca033d3..26c5d186d87 100644
--- a/source/blender/blenkernel/intern/collision.c
+++ b/source/blender/blenkernel/intern/collision.c
@@ -541,7 +541,7 @@ int cloth_collision_response_static ( ClothModifierData *clmd, CollisionModifier
 			{
 				Normalize ( vrel_t_pre );
 
-				impulse = 2.0 * magtangent / ( 1.0 + w1*w1 + w2*w2 + w3*w3 );
+				impulse = magtangent / ( 1.0 + w1*w1 + w2*w2 + w3*w3 ); // 2.0 * 
 				VECADDMUL ( cloth1->verts[collpair->ap1].impulse, vrel_t_pre, w1 * impulse );
 				VECADDMUL ( cloth1->verts[collpair->ap2].impulse, vrel_t_pre, w2 * impulse );
 				VECADDMUL ( cloth1->verts[collpair->ap3].impulse, vrel_t_pre, w3 * impulse );
@@ -1291,52 +1291,223 @@ int cloth_collision_moving ( ClothModifierData *clmd, CollisionModifierData *col
 	return 1;
 }
 
-int cloth_bvh_objcollisions_do ( ClothModifierData * clmd, CollisionModifierData *collmd, float step, float dt )
+int cloth_do_selfcollisions(ClothModifierData * clmd)
+{	
+	int ret2 = 0, l;
+	Cloth *cloth = clmd->clothObject;
+	
+	if ( clmd->clothObject->bvhselftree )
+	{
+		for(l = 0; l < clmd->coll_parms->self_loop_count; l++)
+		{
+			BVHTreeOverlap *overlap = NULL;
+			ClothVertex *verts = clmd->clothObject->verts; // needed for openMP
+			int k;
+			int ret = 0, result = 0;
+			
+			// search for overlapping collision pairs 
+			overlap = BLI_bvhtree_overlap ( cloth->bvhselftree, cloth->bvhselftree, &result );
+	
+// #pragma omp parallel for private(k, i, j) schedule(static)
+			for ( k = 0; k < result; k++ )
+			{
+				float temp[3];
+				float length = 0;
+				float mindistance;
+				int i, j;
+	
+				i = overlap[k].indexA;
+				j = overlap[k].indexB;
+	
+				mindistance = clmd->coll_parms->selfepsilon* ( cloth->verts[i].avg_spring_len + cloth->verts[j].avg_spring_len );
+	
+				if ( clmd->sim_parms->flags & CLOTH_SIMSETTINGS_FLAG_GOAL )
+				{
+					if ( ( cloth->verts [i].flags & CLOTH_VERT_FLAG_PINNED )
+					&& ( cloth->verts [j].flags & CLOTH_VERT_FLAG_PINNED ) )
+					{
+						continue;
+					}
+				}
+	
+				VECSUB ( temp, verts[i].tx, verts[j].tx );
+	
+				if ( ( ABS ( temp[0] ) > mindistance ) || ( ABS ( temp[1] ) > mindistance ) || ( ABS ( temp[2] ) > mindistance ) ) continue;
+	
+				// check for adjacent points (i must be smaller j)
+				if ( BLI_edgehash_haskey ( cloth->edgehash, MIN2(i, j), MAX2(i, j) ) )
+				{
+					continue;
+				}
+	
+				length = Normalize ( temp );
+	
+				if ( length < mindistance )
+				{
+					float correction = mindistance - length;
+	
+					if ( cloth->verts [i].flags & CLOTH_VERT_FLAG_PINNED )
+					{
+						VecMulf ( temp, -correction );
+						VECADD ( verts[j].tx, verts[j].tx, temp );
+					}
+					else if ( cloth->verts [j].flags & CLOTH_VERT_FLAG_PINNED )
+					{
+						VecMulf ( temp, correction );
+						VECADD ( verts[i].tx, verts[i].tx, temp );
+					}
+					else
+					{
+						VecMulf ( temp, -correction*0.5 );
+						VECADD ( verts[j].tx, verts[j].tx, temp );
+	
+						VECSUB ( verts[i].tx, verts[i].tx, temp );
+					}
+					ret = 1;
+					ret2 += ret;
+				}
+				else
+				{
+					// check for approximated time collisions
+				}
+			}
+	
+			if ( overlap )
+				MEM_freeN ( overlap );
+		
+			if(!ret)
+				break;
+			
+		}
+		////////////////////////////////////////////////////////////
+	
+		////////////////////////////////////////////////////////////
+		// SELFCOLLISIONS: update velocities
+		////////////////////////////////////////////////////////////
+		if ( ret2 )
+		{
+			int i; 
+			ClothVertex *verts = clmd->clothObject->verts; // needed for openMP
+			
+			for ( i = 0; i < cloth->numverts; i++ )
+			{
+				if ( ! ( verts [i].flags & CLOTH_VERT_FLAG_PINNED ) )
+				{
+					VECSUB ( verts[i].tv, verts[i].tx, verts[i].txold );
+				}
+			}
+		}
+		////////////////////////////////////////////////////////////
+	}
+	return ret2;
+}
+
+// return all collision objects in scene
+// collision object will exclude self 
+CollisionModifierData **get_collisionobjects(Object *self, int *numcollobj)
+{
+	Base *base=NULL;
+	CollisionModifierData **objs = NULL;
+	Object *coll_ob = NULL;
+	CollisionModifierData *collmd = NULL;
+	int numobj = 0, maxobj = 100;
+	
+	objs = MEM_callocN(sizeof(CollisionModifierData *)*maxobj, "CollisionObjectsArray");
+	// check all collision objects
+	for ( base = G.scene->base.first; base; base = base->next )
+	{
+		coll_ob = base->object;
+		collmd = ( CollisionModifierData * ) modifiers_findByType ( coll_ob, eModifierType_Collision );
+	
+		if ( !collmd )
+		{
+			if ( coll_ob->dup_group )
+			{
+				GroupObject *go;
+				Group *group = coll_ob->dup_group;
+
+				for ( go= group->gobject.first; go; go= go->next )
+				{
+					coll_ob = go->ob;
+
+					collmd = ( CollisionModifierData * ) modifiers_findByType ( coll_ob, eModifierType_Collision );
+
+					if ( !collmd )
+						continue;
+
+					if(coll_ob == self)
+						continue;
+
+					if(numobj >= maxobj)
+					{
+						// realloc
+						int oldmax = maxobj;
+						CollisionModifierData **tmp;
+						maxobj *= 2;
+						tmp = MEM_callocN(sizeof(CollisionModifierData *)*maxobj, "CollisionObjectsArray");
+						memcpy(tmp, objs, sizeof(CollisionModifierData *)*oldmax);
+						MEM_freeN(objs);
+						objs = tmp;
+					}
+					
+					objs[numobj] = collmd;
+					numobj++;
+				}
+			}
+		}
+		else
+		{
+			if(coll_ob == self)
+				continue;
+			
+			if(numobj >= maxobj)
+			{
+				// realloc
+				int oldmax = maxobj;
+				CollisionModifierData **tmp;
+				maxobj *= 2;
+				tmp = MEM_callocN(sizeof(CollisionModifierData *)*maxobj, "CollisionObjectsArray");
+				memcpy(tmp, objs, sizeof(CollisionModifierData *)*oldmax);
+				MEM_freeN(objs);
+				objs = tmp;
+				
+			}
+			
+			objs[numobj] = collmd;
+			numobj++;
+		}	
+	}
+	*numcollobj = numobj;
+	return objs;
+}
+
+void cloth_bvh_objcollisions_nearcheck ( ClothModifierData * clmd, CollisionModifierData *collmd, CollPair **collisions, CollPair **collisions_index, int numresult, BVHTreeOverlap *overlap)
+{
+	int i;
+	
+	*collisions = ( CollPair* ) MEM_mallocN ( sizeof ( CollPair ) * numresult * 4, "collision array" ); //*4 since cloth_collision_static can return more than 1 collision
+	*collisions_index = *collisions;
+
+	for ( i = 0; i < numresult; i++ )
+	{
+		*collisions_index = cloth_collision ( ( ModifierData * ) clmd, ( ModifierData * ) collmd, overlap+i, *collisions_index );
+	}
+}
+
+int cloth_bvh_objcollisions_resolve ( ClothModifierData * clmd, CollisionModifierData *collmd, CollPair *collisions, CollPair *collisions_index)
 {
 	Cloth *cloth = clmd->clothObject;
-	BVHTree *cloth_bvh= ( BVHTree * ) cloth->bvhtree;
-	long i=0, j = 0, numfaces = 0, numverts = 0;
+	int i=0, j = 0, numfaces = 0, numverts = 0;
 	ClothVertex *verts = NULL;
-	CollPair *collisions = NULL, *collisions_index = NULL;
 	int ret = 0;
 	int result = 0;
 	float tnull[3] = {0,0,0};
-	BVHTreeOverlap *overlap = NULL;
-
-
+	
 	numfaces = clmd->clothObject->numfaces;
 	numverts = clmd->clothObject->numverts;
-
+ 
 	verts = cloth->verts;
-
-	if ( collmd->bvhtree )
-	{
-		/* get pointer to bounding volume hierarchy */
-		BVHTree *coll_bvh = collmd->bvhtree;
-
-		/* move object to position (step) in time */
-		collision_move_object ( collmd, step + dt, step );
-
-		/* search for overlapping collision pairs */
-		overlap = BLI_bvhtree_overlap ( cloth_bvh, coll_bvh, &result );
-
-		collisions = ( CollPair* ) MEM_mallocN ( sizeof ( CollPair ) * result*4, "collision array" ); //*4 since cloth_collision_static can return more than 1 collision
-		collisions_index = collisions;
-
-		for ( i = 0; i < result; i++ )
-		{
-			collisions_index = cloth_collision ( ( ModifierData * ) clmd, ( ModifierData * ) collmd, overlap+i, collisions_index );
-		}
-
-		if ( overlap )
-			MEM_freeN ( overlap );
-	}
-	else
-	{
-		if ( G.rt > 0 )
-			printf ( "cloth_bvh_objcollision: found a collision object with clothObject or collData NULL.\n" );
-	}
-
+	
 	// process all collisions (calculate impulses, TODO: also repulses if distance too short)
 	result = 1;
 	for ( j = 0; j < 5; j++ ) // 5 is just a value that ensures convergence
@@ -1363,48 +1534,22 @@ int cloth_bvh_objcollisions_do ( ClothModifierData * clmd, CollisionModifierData
 					}
 				}
 			}
-/*
-			result += cloth_collision_moving ( clmd, collmd, collisions, collisions_index );
-
-			// apply impulses in parallel
-			if ( result )
-			{
-				for ( i = 0; i < numverts; i++ )
-				{
-					// calculate "velocities" (just xnew = xold + v; no dt in v)
-					if ( verts[i].impulse_count )
-					{
-						VECADDMUL ( verts[i].tv, verts[i].impulse, 1.0f / verts[i].impulse_count );
-						VECCOPY ( verts[i].impulse, tnull );
-						verts[i].impulse_count = 0;
-
-						ret++;
-					}
-				}
-			}
-*/
 		}
 	}
-
-	if ( collisions ) MEM_freeN ( collisions );
-
 	return ret;
 }
 
 // cloth - object collisions
-int cloth_bvh_objcollision ( ClothModifierData * clmd, float step, float dt )
+int cloth_bvh_objcollision ( Object *ob, ClothModifierData * clmd, float step, float dt )
 {
-	Base *base=NULL;
-	CollisionModifierData *collmd=NULL;
 	Cloth *cloth=NULL;
-	Object *coll_ob=NULL;
 	BVHTree *cloth_bvh=NULL;
-	long i=0, j = 0, k = 0, l = 0, numfaces = 0, numverts = 0;
-	int result = 0, rounds = 0; // result counts applied collisions; ic is for debug output;
+	long i=0, numfaces = 0, numverts = 0;
+	int rounds = 0; // result counts applied collisions; ic is for debug output;
 	ClothVertex *verts = NULL;
 	int ret = 0, ret2 = 0;
-	ClothModifierData *tclmd;
-	int collisions = 0;
+	CollisionModifierData **collobjs = NULL;
+	int numcollobj = 0;
 
 	if ( ( clmd->sim_parms->flags & CLOTH_SIMSETTINGS_FLAG_COLLOBJ ) || ! ( ( ( Cloth * ) clmd->clothObject )->bvhtree ) )
 	{
@@ -1424,54 +1569,61 @@ int cloth_bvh_objcollision ( ClothModifierData * clmd, float step, float dt )
 	// update cloth bvh
 	bvhtree_update_from_cloth ( clmd, 1 ); // 0 means STATIC, 1 means MOVING (see later in this function)
 	bvhselftree_update_from_cloth ( clmd, 0 ); // 0 means STATIC, 1 means MOVING (see later in this function)
+	
+	collobjs = get_collisionobjects(ob, &numcollobj);
+	
+	if(!collobjs)
+		return 0;
 
 	do
 	{
-		result = 0;
+		CollPair **collisions, **collisions_index;
+		
 		ret2 = 0;
 
+		collisions = MEM_callocN(sizeof(CollPair *) *numcollobj , "CollPair");
+		collisions_index = MEM_callocN(sizeof(CollPair *) *numcollobj , "CollPair");
+		
 		// check all collision objects
-		for ( base = G.scene->base.first; base; base = base->next )
+		for(i = 0; i < numcollobj; i++)
 		{
-			coll_ob = base->object;
-			collmd = ( CollisionModifierData * ) modifiers_findByType ( coll_ob, eModifierType_Collision );
-
-			if ( !collmd )
+			CollisionModifierData *collmd = collobjs[i];
+			BVHTreeOverlap *overlap = NULL;
+			int result = 0;
+			
+			/* move object to position (step) in time */
+			collision_move_object ( collmd, step + dt, step );
+			
+			/* search for overlapping collision pairs */
+			overlap = BLI_bvhtree_overlap ( cloth_bvh, collmd->bvhtree, &result );
+				
+			// go to next object if no overlap is there
+			if(!result || !overlap)
 			{
-				if ( coll_ob->dup_group )
-				{
-					GroupObject *go;
-					Group *group = coll_ob->dup_group;
-
-					for ( go= group->gobject.first; go; go= go->next )
-					{
-						coll_ob = go->ob;
-
-						collmd = ( CollisionModifierData * ) modifiers_findByType ( coll_ob, eModifierType_Collision );
-
-						if ( !collmd )
-							continue;
-
-						tclmd = ( ClothModifierData * ) modifiers_findByType ( coll_ob, eModifierType_Cloth );
-						if ( tclmd == clmd )
-							continue;
-
-						ret += cloth_bvh_objcollisions_do ( clmd, collmd, step, dt );
-						ret2 += ret;
-					}
-				}
-			}
-			else
-			{
-				tclmd = ( ClothModifierData * ) modifiers_findByType ( coll_ob, eModifierType_Cloth );
-				if ( tclmd == clmd )
-					continue;
-
-				ret += cloth_bvh_objcollisions_do ( clmd, collmd, step, dt );
-				ret2 += ret;
+				if ( overlap )
+					MEM_freeN ( overlap );
+				continue;
 			}
+			
+			/* check if collisions really happen (costly near check) */
+			cloth_bvh_objcollisions_nearcheck ( clmd, collmd, &collisions[i], &collisions_index[i], result, overlap);
+			
+			// resolve nearby collisions
+			ret += cloth_bvh_objcollisions_resolve ( clmd, collmd, collisions[i],  collisions_index[i]);
+			ret2 += ret;
+			
+			if ( overlap )
+				MEM_freeN ( overlap );
 		}
 		rounds++;
+		
+		for(i = 0; i < numcollobj; i++)
+		{
+			if ( collisions[i] ) MEM_freeN ( collisions[i] );
+		}
+			
+		MEM_freeN(collisions);
+		MEM_freeN(collisions_index);
 
 		////////////////////////////////////////////////////////////
 		// update positions
@@ -1493,117 +1645,20 @@ int cloth_bvh_objcollision ( ClothModifierData * clmd, float step, float dt )
 		}
 		////////////////////////////////////////////////////////////
 
-
+		
 		////////////////////////////////////////////////////////////
 		// Test on *simple* selfcollisions
 		////////////////////////////////////////////////////////////
 		if ( clmd->coll_parms->flags & CLOTH_COLLSETTINGS_FLAG_SELF )
 		{
-			for(l = 0; l < clmd->coll_parms->self_loop_count; l++)
-			{
-				// TODO: add coll quality rounds again
-				BVHTreeOverlap *overlap = NULL;
-	
-				collisions = 1;
-				verts = cloth->verts; // needed for openMP
-	
-				numfaces = clmd->clothObject->numfaces;
-				numverts = clmd->clothObject->numverts;
-	
-				verts = cloth->verts;
-	
-				if ( cloth->bvhselftree )
-				{
-					// search for overlapping collision pairs 
-					overlap = BLI_bvhtree_overlap ( cloth->bvhselftree, cloth->bvhselftree, &result );
-	
-	// #pragma omp parallel for private(k, i, j) schedule(static)
-					for ( k = 0; k < result; k++ )
-					{
-						float temp[3];
-						float length = 0;
-						float mindistance;
-	
-						i = overlap[k].indexA;
-						j = overlap[k].indexB;
-	
-						mindistance = clmd->coll_parms->selfepsilon* ( cloth->verts[i].avg_spring_len + cloth->verts[j].avg_spring_len );
-	
-						if ( clmd->sim_parms->flags & CLOTH_SIMSETTINGS_FLAG_GOAL )
-						{
-							if ( ( cloth->verts [i].flags & CLOTH_VERT_FLAG_PINNED )
-								&& ( cloth->verts [j].flags & CLOTH_VERT_FLAG_PINNED ) )
-							{
-								continue;
-							}
-						}
-	
-						VECSUB ( temp, verts[i].tx, verts[j].tx );
-	
-						if ( ( ABS ( temp[0] ) > mindistance ) || ( ABS ( temp[1] ) > mindistance ) || ( ABS ( temp[2] ) > mindistance ) ) continue;
-	
-						// check for adjacent points (i must be smaller j)
-						if ( BLI_edgehash_haskey ( cloth->edgehash, MIN2(i, j), MAX2(i, j) ) )
-						{
-							continue;
-						}
-	
-						length = Normalize ( temp );
-	
-						if ( length < mindistance )
-						{
-							float correction = mindistance - length;
-	
-							if ( cloth->verts [i].flags & CLOTH_VERT_FLAG_PINNED )
-							{
-								VecMulf ( temp, -correction );
-								VECADD ( verts[j].tx, verts[j].tx, temp );
-							}
-							else if ( cloth->verts [j].flags & CLOTH_VERT_FLAG_PINNED )
-							{
-								VecMulf ( temp, correction );
-								VECADD ( verts[i].tx, verts[i].tx, temp );
-							}
-							else
-							{
-								VecMulf ( temp, -correction*0.5 );
-								VECADD ( verts[j].tx, verts[j].tx, temp );
-	
-								VECSUB ( verts[i].tx, verts[i].tx, temp );
-							}
-							ret = 1;
-							ret2 += ret;
-						}
-						else
-						{
-							// check for approximated time collisions
-						}
-					}
-	
-					if ( overlap )
-						MEM_freeN ( overlap );
-	
-				}
-			}
-			////////////////////////////////////////////////////////////
-
-			////////////////////////////////////////////////////////////
-			// SELFCOLLISIONS: update velocities
-			////////////////////////////////////////////////////////////
-			if ( ret2 )
-			{
-				for ( i = 0; i < cloth->numverts; i++ )
-				{
-					if ( ! ( verts [i].flags & CLOTH_VERT_FLAG_PINNED ) )
-					{
-						VECSUB ( verts[i].tv, verts[i].tx, verts[i].txold );
-					}
-				}
-			}
-			////////////////////////////////////////////////////////////
+			ret2 += cloth_do_selfcollisions(clmd);
 		}
+		////////////////////////////////////////////////////////////
 	}
 	while ( ret2 && ( clmd->coll_parms->loop_count>rounds ) );
+	
+	if(collobjs)
+		+		MEM_freeN(collobjs);
 
 	return MIN2 ( ret, 1 );
 }
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index 77068d8ed66..501293ecd81 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -36,6 +36,7 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_linklist.h"
+#include "BLI_mempool.h"
 
 #include "DNA_customdata_types.h"
 #include "DNA_listBase.h"
@@ -359,8 +360,80 @@ static void layerDefault_origspace_face(void *data, int count)
 }
 /* --------- */
 
+static void layerDefault_mloopcol(void *data, int count)
+{
+	static MLoopCol default_mloopcol = {255,255,255,255};
+	MLoopCol *mlcol = (MLoopCol*)data;
+	int i;
+	for(i = 0; i < count; i++)
+		mlcol[i] = default_mloopcol;
 
+}
 
+static void layerInterp_mloopcol(void **sources, float *weights,
+				float *sub_weights, int count, void *dest)
+{
+	MLoopCol *mc = dest;
+	int i;
+	float *sub_weight;
+	struct {
+		float a;
+		float r;
+		float g;
+		float b;
+	} col;
+	col.a = col.r = col.g = col.b = 0;
+
+	sub_weight = sub_weights;
+	for(i = 0; i < count; ++i){
+		float weight = weights ? weights[i] : 1;
+		MLoopCol *src = sources[i];
+		if(sub_weights){
+			col.a += src->a * (*sub_weight) * weight;
+			col.r += src->r * (*sub_weight) * weight;
+			col.g += src->g * (*sub_weight) * weight;
+			col.b += src->b * (*sub_weight) * weight;
+			sub_weight++;		
+		} else {
+			col.a += src->a * weight;
+			col.r += src->r * weight;
+			col.g += src->g * weight;
+			col.b += src->b * weight;
+		}
+	}
+	mc->a = (int)col.a;
+	mc->r = (int)col.r;
+	mc->g = (int)col.g;
+	mc->b = (int)col.b;
+}
+static void layerInterp_mloopuv(void **sources, float *weights,
+				float *sub_weights, int count, void *dest)
+{
+	MLoopUV *mluv = dest;
+	int i;
+	float *sub_weight;
+	struct {
+		float u;
+		float v;
+	}uv;
+	uv.u = uv.v = 0.0;
+
+	sub_weight = sub_weights;
+	for(i = 0; i < count; ++i){
+		float weight = weights ? weights[i] : 1;
+		MLoopUV *src = sources[i];
+		if(sub_weights){
+			uv.u += src->uv[0] * (*sub_weight) * weight;
+			uv.v += src->uv[1] * (*sub_weight) * weight;
+			sub_weight++;		
+		} else {
+			uv.u += src->uv[0] * weight;
+			uv.v += src->uv[1] * weight;
+		}
+	}
+	mluv->uv[0] = uv.u;
+	mluv->uv[1] = uv.v;
+}
 
 static void layerInterp_mcol(void **sources, float *weights,
                              float *sub_weights, int count, void *dest)
@@ -432,6 +505,8 @@ static void layerDefault_mcol(void *data, int count)
 		mcol[i] = default_mcol;
 }
 
+
+
 const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
 	{sizeof(MVert), "MVert", 1, NULL, NULL, NULL, NULL, NULL, NULL},
 	{sizeof(MSticky), "MSticky", 1, NULL, NULL, NULL, layerInterp_msticky, NULL,
@@ -454,13 +529,16 @@ const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
 	{sizeof(MStringProperty), "MStringProperty",1,"String",NULL,NULL,NULL,NULL},
 	{sizeof(OrigSpaceFace), "OrigSpaceFace", 1, "UVTex", layerCopy_origspace_face, NULL,
 	 layerInterp_origspace_face, layerSwap_origspace_face, layerDefault_origspace_face},
-	{sizeof(float)*3, "", 0, NULL, NULL, NULL, NULL, NULL, NULL}
+	{sizeof(float)*3, "", 0, NULL, NULL, NULL, NULL, NULL, NULL},
+	{sizeof(MTexPoly), "MTexPoly", 1, "Face Texture", NULL, NULL, NULL, NULL, NULL},
+	{sizeof(MLoopUV), "MLoopUV", 1, "UV coord", NULL, NULL, layerInterp_mloopuv, NULL, NULL},
+	{sizeof(MLoopCol), "MLoopCol", 1, "Col", NULL, NULL, layerInterp_mloopcol, NULL, layerDefault_mloopcol} 
 };
 
 const char *LAYERTYPENAMES[CD_NUMTYPES] = {
 	"CDMVert", "CDMSticky", "CDMDeformVert", "CDMEdge", "CDMFace", "CDMTFace",
 	"CDMCol", "CDOrigIndex", "CDNormal", "CDFlags","CDMFloatProperty",
-	"CDMIntProperty","CDMStringProperty", "CDOrigSpace", "CDOrco"};
+	"CDMIntProperty","CDMStringProperty", "CDOrigSpace", "CDOrco", "CDMTexPoly", "CDMLoopUV", "CDMloopCol"};
 
 const CustomDataMask CD_MASK_BAREMESH =
 	CD_MASK_MVERT | CD_MASK_MEDGE | CD_MASK_MFACE;
@@ -475,6 +553,12 @@ const CustomDataMask CD_MASK_DERIVEDMESH =
 	CD_MASK_MSTICKY | CD_MASK_MDEFORMVERT | CD_MASK_MTFACE |
 	CD_MASK_MCOL | CD_MASK_ORIGINDEX | CD_MASK_PROP_FLT | CD_MASK_PROP_INT |
 	CD_MASK_PROP_STR | CD_MASK_ORIGSPACE | CD_MASK_ORCO;
+const CustomDataMask CD_MASK_BMESH = 
+	CD_MASK_MSTICKY | CD_MASK_MDEFORMVERT | CD_MASK_PROP_FLT | CD_MASK_PROP_INT | CD_MASK_PROP_STR;
+const CustomDataMask CD_MASK_FACECORNERS =
+	CD_MASK_MTFACE | CD_MASK_MCOL | CD_MASK_MTEXPOLY | CD_MASK_MLOOPUV |
+	CD_MASK_MLOOPCOL;
+
 
 static const LayerTypeInfo *layerType_getInfo(int type)
 {
@@ -1449,6 +1533,302 @@ void CustomData_from_em_block(const CustomData *source, CustomData *dest,
 
 }
 
+/*Bmesh functions*/
+/*needed to convert to/from different face reps*/
+void CustomData_to_bmeshpoly(CustomData *fdata, CustomData *pdata, CustomData *ldata)
+{
+	int i;
+	for(i=0; i < fdata->totlayer; i++){
+		if(fdata->layers[i].type == CD_MTFACE){
+			CustomData_add_layer(pdata, CD_MTEXPOLY, CD_CALLOC, &(fdata->layers[i].name), 0);
+			CustomData_add_layer(ldata, CD_MLOOPUV, CD_CALLOC, &(fdata->layers[i].name), 0);
+		}
+		else if(fdata->layers[i].type == CD_MCOL)
+			CustomData_add_layer(ldata, CD_MLOOPCOL, CD_CALLOC, &(fdata->layers[i].name), 0);
+	}		
+}
+void CustomData_from_bmeshpoly(CustomData *fdata, CustomData *pdata, CustomData *ldata, int total){
+	int i;
+	for(i=0; i < pdata->totlayer; i++){
+		if(pdata->layers[i].type == CD_MTEXPOLY)
+			CustomData_add_layer(fdata, CD_MTFACE, CD_CALLOC, &(pdata->layers[i].name), total);
+	}
+	for(i=0; i < ldata->totlayer; i++){
+		if(ldata->layers[i].type == CD_MLOOPCOL)
+			CustomData_add_layer(fdata, CD_MCOL, CD_CALLOC, &(ldata->layers[i].name), total);
+	}
+}
+
+
+void CustomData_bmesh_init_pool(CustomData *data, int allocsize){
+	if(data->totlayer)data->pool = BLI_mempool_create(data->totsize, allocsize, allocsize);
+}
+
+void CustomData_bmesh_free_block(CustomData *data, void **block)
+{
+    const LayerTypeInfo *typeInfo;
+    int i;
+
+	if(!*block) return;
+    for(i = 0; i < data->totlayer; ++i) {
+        if(!(data->layers[i].flag & CD_FLAG_NOFREE)) {
+            typeInfo = layerType_getInfo(data->layers[i].type);
+
+            if(typeInfo->free) {
+				int offset = data->layers[i].offset;
+				typeInfo->free((char*)*block + offset, 1, typeInfo->size);
+			}
+        }
+    }
+
+	BLI_mempool_free(data->pool, *block);
+	*block = NULL;
+}
+
+static void CustomData_bmesh_alloc_block(CustomData *data, void **block)
+{
+
+	if (*block)
+		CustomData_bmesh_free_block(data, block);
+
+	if (data->totsize > 0)
+		*block = BLI_mempool_calloc(data->pool);
+	else
+		*block = NULL;
+}
+
+void CustomData_bmesh_copy_data(const CustomData *source, CustomData *dest,
+                            void *src_block, void **dest_block)
+{
+	const LayerTypeInfo *typeInfo;
+	int dest_i, src_i;
+
+	if (!*dest_block)
+		CustomData_bmesh_alloc_block(dest, dest_block);
+	
+	/* copies a layer at a time */
+	dest_i = 0;
+	for(src_i = 0; src_i < source->totlayer; ++src_i) {
+
+		/* find the first dest layer with type >= the source type
+		 * (this should work because layers are ordered by type)
+		 */
+		while(dest_i < dest->totlayer
+		      && dest->layers[dest_i].type < source->layers[src_i].type)
+			++dest_i;
+
+		/* if there are no more dest layers, we're done */
+		if(dest_i >= dest->totlayer) return;
+
+		/* if we found a matching layer, copy the data */
+		if(dest->layers[dest_i].type == source->layers[src_i].type &&
+			strcmp(dest->layers[dest_i].name, source->layers[src_i].name) == 0) {
+			char *src_data = (char*)src_block + source->layers[src_i].offset;
+			char *dest_data = (char*)*dest_block + dest->layers[dest_i].offset;
+
+			typeInfo = layerType_getInfo(source->layers[src_i].type);
+
+			if(typeInfo->copy)
+				typeInfo->copy(src_data, dest_data, 1);
+			else
+				memcpy(dest_data, src_data, typeInfo->size);
+
+			/* if there are multiple source & dest layers of the same type,
+			 * we don't want to copy all source layers to the same dest, so
+			 * increment dest_i
+			 */
+			++dest_i;
+		}
+	}
+}
+
+/*Bmesh Custom Data Functions. Should replace editmesh ones with these as well, due to more effecient memory alloc*/
+void *CustomData_bmesh_get(const CustomData *data, void *block, int type)
+{
+	int layer_index;
+	
+	/* get the layer index of the first layer of type */
+	layer_index = CustomData_get_active_layer_index(data, type);
+	if(layer_index < 0) return NULL;
+
+	return (char *)block + data->layers[layer_index].offset;
+}
+
+void *CustomData_bmesh_get_n(const CustomData *data, void *block, int type, int n)
+{
+	int layer_index;
+	
+	/* get the layer index of the first layer of type */
+	layer_index = CustomData_get_layer_index(data, type);
+	if(layer_index < 0) return NULL;
+
+	return (char *)block + data->layers[layer_index+n].offset;
+}
+
+void CustomData_bmesh_set(const CustomData *data, void *block, int type, void *source)
+{
+	void *dest = CustomData_bmesh_get(data, block, type);
+	const LayerTypeInfo *typeInfo = layerType_getInfo(type);
+
+	if(!dest) return;
+
+	if(typeInfo->copy)
+		typeInfo->copy(source, dest, 1);
+	else
+		memcpy(dest, source, typeInfo->size);
+}
+
+void CustomData_bmesh_set_n(CustomData *data, void *block, int type, int n, void *source)
+{
+	void *dest = CustomData_bmesh_get_n(data, block, type, n);
+	const LayerTypeInfo *typeInfo = layerType_getInfo(type);
+
+	if(!dest) return;
+
+	if(typeInfo->copy)
+		typeInfo->copy(source, dest, 1);
+	else
+		memcpy(dest, source, typeInfo->size);
+}
+
+void CustomData_bmesh_interp(CustomData *data, void **src_blocks, float *weights,
+                          float *sub_weights, int count, void *dest_block)
+{
+	int i, j;
+	void *source_buf[SOURCE_BUF_SIZE];
+	void **sources = source_buf;
+
+	/* slow fallback in case we're interpolating a ridiculous number of
+	 * elements
+	 */
+	if(count > SOURCE_BUF_SIZE)
+		sources = MEM_callocN(sizeof(*sources) * count,
+		                      "CustomData_interp sources");
+
+	/* interpolates a layer at a time */
+	for(i = 0; i < data->totlayer; ++i) {
+		CustomDataLayer *layer = &data->layers[i];
+		const LayerTypeInfo *typeInfo = layerType_getInfo(layer->type);
+		if(typeInfo->interp) {
+			for(j = 0; j < count; ++j)
+				sources[j] = (char *)src_blocks[j] + layer->offset;
+
+			typeInfo->interp(sources, weights, sub_weights, count,
+			                  (char *)dest_block + layer->offset);
+		}
+	}
+
+	if(count > SOURCE_BUF_SIZE) MEM_freeN(sources);
+}
+
+void CustomData_bmesh_set_default(CustomData *data, void **block)
+{
+	const LayerTypeInfo *typeInfo;
+	int i;
+
+	if (!*block)
+		CustomData_bmesh_alloc_block(data, block);
+
+	for(i = 0; i < data->totlayer; ++i) {
+		int offset = data->layers[i].offset;
+
+		typeInfo = layerType_getInfo(data->layers[i].type);
+
+		if(typeInfo->set_default)
+			typeInfo->set_default((char*)*block + offset, 1);
+	}
+}
+
+void CustomData_to_bmesh_block(const CustomData *source, CustomData *dest,
+                            int src_index, void **dest_block)
+{
+	const LayerTypeInfo *typeInfo;
+	int dest_i, src_i, src_offset;
+
+	if (!*dest_block)
+		CustomData_bmesh_alloc_block(dest, dest_block);
+	
+	/* copies a layer at a time */
+	dest_i = 0;
+	for(src_i = 0; src_i < source->totlayer; ++src_i) {
+
+		/* find the first dest layer with type >= the source type
+		 * (this should work because layers are ordered by type)
+		 */
+		while(dest_i < dest->totlayer
+		      && dest->layers[dest_i].type < source->layers[src_i].type)
+			++dest_i;
+
+		/* if there are no more dest layers, we're done */
+		if(dest_i >= dest->totlayer) return;
+
+		/* if we found a matching layer, copy the data */
+		if(dest->layers[dest_i].type == source->layers[src_i].type) {
+			int offset = dest->layers[dest_i].offset;
+			char *src_data = source->layers[src_i].data;
+			char *dest_data = (char*)*dest_block + offset;
+
+			typeInfo = layerType_getInfo(dest->layers[dest_i].type);
+			src_offset = src_index * typeInfo->size;
+
+			if(typeInfo->copy)
+				typeInfo->copy(src_data + src_offset, dest_data, 1);
+			else
+				memcpy(dest_data, src_data + src_offset, typeInfo->size);
+
+			/* if there are multiple source & dest layers of the same type,
+			 * we don't want to copy all source layers to the same dest, so
+			 * increment dest_i
+			 */
+			++dest_i;
+		}
+	}
+}
+
+void CustomData_from_bmesh_block(const CustomData *source, CustomData *dest,
+                              void *src_block, int dest_index)
+{
+	const LayerTypeInfo *typeInfo;
+	int dest_i, src_i, dest_offset;
+
+	/* copies a layer at a time */
+	dest_i = 0;
+	for(src_i = 0; src_i < source->totlayer; ++src_i) {
+
+		/* find the first dest layer with type >= the source type
+		 * (this should work because layers are ordered by type)
+		 */
+		while(dest_i < dest->totlayer
+		      && dest->layers[dest_i].type < source->layers[src_i].type)
+			++dest_i;
+
+		/* if there are no more dest layers, we're done */
+		if(dest_i >= dest->totlayer) return;
+
+		/* if we found a matching layer, copy the data */
+		if(dest->layers[dest_i].type == source->layers[src_i].type) {
+			int offset = source->layers[src_i].offset;
+			char *src_data = (char*)src_block + offset;
+			char *dest_data = dest->layers[dest_i].data;
+
+			typeInfo = layerType_getInfo(dest->layers[dest_i].type);
+			dest_offset = dest_index * typeInfo->size;
+
+			if(typeInfo->copy)
+				typeInfo->copy(src_data, dest_data + dest_offset, 1);
+			else
+				memcpy(dest_data + dest_offset, src_data, typeInfo->size);
+
+			/* if there are multiple source & dest layers of the same type,
+			 * we don't want to copy all source layers to the same dest, so
+			 * increment dest_i
+			 */
+			++dest_i;
+		}
+	}
+
+}
+
 void CustomData_file_write_info(int type, char **structname, int *structnum)
 {
 	const LayerTypeInfo *typeInfo = layerType_getInfo(type);
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index b2557c9c07e..b6c8ad59e08 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -848,17 +848,13 @@ void BKE_add_image_extension(char *string, int imtype)
 		if(!BLI_testextensie(string, ".tga"))
 			extension= ".tga";
 	}
-	else if(ELEM5(imtype, R_MOVIE, R_AVICODEC, R_AVIRAW, R_AVIJPEG, R_JPEG90)) {
-		if(!( BLI_testextensie(string, ".jpg") || BLI_testextensie(string, ".jpeg")))
-			extension= ".jpg";
-	}
 	else if(imtype==R_BMP) {
 		if(!BLI_testextensie(string, ".bmp"))
 			extension= ".bmp";
 	}
 	else if(G.have_libtiff && (imtype==R_TIFF)) {
-		if(!BLI_testextensie(string, ".tif"))
-			extension= ".tif";
+		if(!BLI_testextensie(string, ".tif") && 
+			!BLI_testextensie(string, ".tiff")) extension= ".tif";
 	}
 #ifdef WITH_OPENEXR
 	else if( ELEM(imtype, R_OPENEXR, R_MULTILAYER)) {
@@ -874,10 +870,14 @@ void BKE_add_image_extension(char *string, int imtype)
 		if (!BLI_testextensie(string, ".dpx"))
 			extension= ".dpx";
 	}
-	else {	/* targa default */
+	else if(imtype==R_TARGA) {
 		if(!BLI_testextensie(string, ".tga"))
 			extension= ".tga";
 	}
+	else { //   R_MOVIE, R_AVICODEC, R_AVIRAW, R_AVIJPEG, R_JPEG90, R_QUICKTIME etc
+		if(!( BLI_testextensie(string, ".jpg") || BLI_testextensie(string, ".jpeg")))
+			extension= ".jpg";
+	}
 
 	strcat(string, extension);
 }
@@ -1512,6 +1512,10 @@ static ImBuf *image_load_sequence_file(Image *ima, ImageUser *iuser, int frame)
 		image_initialize_after_load(ima, ibuf);
 		image_assign_ibuf(ima, ibuf, 0, frame);
 #endif
+		
+		if(ima->flag & IMA_DO_PREMUL)
+			converttopremul(ibuf);
+		
 	}
 	else
 		ima->ok= 0;
diff --git a/source/blender/blenkernel/intern/implicit.c b/source/blender/blenkernel/intern/implicit.c
index 808984aaa3c..297ac0b1530 100644
--- a/source/blender/blenkernel/intern/implicit.c
+++ b/source/blender/blenkernel/intern/implicit.c
@@ -1588,10 +1588,17 @@ int implicit_solver (Object *ob, float frame, ClothModifierData *clmd, ListBase
 				VECSUB(verts[i].tv, verts[i].tx, verts[i].txold);
 				VECCOPY(verts[i].v, verts[i].tv);
 			}
-	
+			
 			// call collision function
-			result = cloth_bvh_objcollision(clmd, step + dt, dt);
-	
+			// TODO: check if "step" or "step+dt" is correct - dg
+			result = cloth_bvh_objcollision(ob, clmd, step, dt);
+			
+			// correct velocity again, just to be sure we had to change it due to adaptive collisions
+			for(i = 0; i < numverts; i++)
+			{
+				VECSUB(verts[i].tv, verts[i].tx, id->X[i]);
+			}
+			
 			// copy corrected positions back to simulation
 			for(i = 0; i < numverts; i++)
 			{		
diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c
index 321d4f1d37e..59eb3837aab 100644
--- a/source/blender/blenkernel/intern/ipo.c
+++ b/source/blender/blenkernel/intern/ipo.c
@@ -1859,7 +1859,7 @@ void set_icu_vars(IpoCurve *icu)
 		/* yafray: aperture & focal distance params */
 		switch(icu->adrcode) {
 		case CAM_LENS:
-			icu->ymin= 5.0;
+			icu->ymin= 1.0;
 			icu->ymax= 1000.0;
 			break;
 		case CAM_STA:
diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c
index 3b4e562a87a..dd6c7ddacd2 100644
--- a/source/blender/blenkernel/intern/key.c
+++ b/source/blender/blenkernel/intern/key.c
@@ -630,7 +630,7 @@ void cp_cu_key(Curve *cu, KeyBlock *kb, int start, int end)
 }
 
 
-static void do_rel_key(int start, int end, int tot, char *basispoin, Key *key, int mode)
+void do_rel_key(int start, int end, int tot, char *basispoin, Key *key, int mode)
 {
 	KeyBlock *kb;
 	int *ofsp, ofs[3], elemsize, b;
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index cc3f3f211a4..c3dddf06e7c 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -224,48 +224,50 @@ void flag_all_listbases_ids(short flag, short value)
 /* note: MAX_LIBARRAY define should match this code */
 int set_listbasepointers(Main *main, ListBase **lb)
 {
+	int a = 0;
+
 	/* BACKWARDS! also watch order of free-ing! (mesh<->mat) */
 
-	lb[0]= &(main->ipo);
-	lb[1]= &(main->key);
-	lb[2]= &(main->image);
-	lb[3]= &(main->tex);
-	lb[4]= &(main->mat);
-	lb[5]= &(main->vfont);
+	lb[a++]= &(main->ipo);
+	lb[a++]= &(main->key);
+	lb[a++]= &(main->nodetree);
+	lb[a++]= &(main->image);
+	lb[a++]= &(main->tex);
+	lb[a++]= &(main->mat);
+	lb[a++]= &(main->vfont);
 	
 	/* Important!: When adding a new object type,
 	 * the specific data should be inserted here 
 	 */
 
-	lb[6]= &(main->armature);
-	lb[7]= &(main->action);
+	lb[a++]= &(main->armature);
+	lb[a++]= &(main->action);
 
-	lb[8]= &(main->mesh);
-	lb[9]= &(main->curve);
-	lb[10]= &(main->mball);
+	lb[a++]= &(main->mesh);
+	lb[a++]= &(main->curve);
+	lb[a++]= &(main->mball);
 
-	lb[11]= &(main->wave);
-	lb[12]= &(main->latt);
-	lb[13]= &(main->lamp);
-	lb[14]= &(main->camera);
+	lb[a++]= &(main->wave);
+	lb[a++]= &(main->latt);
+	lb[a++]= &(main->lamp);
+	lb[a++]= &(main->camera);
 	
-	lb[15]= &(main->text);
-	lb[16]= &(main->sound);
-	lb[17]= &(main->group);
-	lb[18]= &(main->nodetree);
-	lb[19]= &(main->brush);
-	lb[20]= &(main->script);
-	lb[21]= &(main->particle);
+	lb[a++]= &(main->text);
+	lb[a++]= &(main->sound);
+	lb[a++]= &(main->group);
+	lb[a++]= &(main->brush);
+	lb[a++]= &(main->script);
+	lb[a++]= &(main->particle);
 	
-	lb[22]= &(main->world);
-	lb[23]= &(main->screen);
-	lb[24]= &(main->object);
-	lb[25]= &(main->scene);
-	lb[26]= &(main->library);
+	lb[a++]= &(main->world);
+	lb[a++]= &(main->screen);
+	lb[a++]= &(main->object);
+	lb[a++]= &(main->scene);
+	lb[a++]= &(main->library);
 	
-	lb[27]= NULL;
+	lb[a]= NULL;
 
-	return 27;
+	return a;
 }
 
 /* *********** ALLOC AND FREE *****************
@@ -934,7 +936,7 @@ int new_id(ListBase *lb, ID *id, const char *tname)
 	}
 
 	/* if result > 21, strncpy don't put the final '\0' to name. */
-	if( result > 21 ) name[21]= 0;
+	if( result >= 21 ) name[21]= 0;
 
 	result = check_for_dupid( lb, id, name );
 	strcpy( id->name+2, name );
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index bd8a2ea219a..f13f8ef0298 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -40,6 +40,7 @@
 #include "stdarg.h"
 #include "math.h"
 #include "float.h"
+#include "ctype.h"
 
 #include "BLI_arithb.h"
 #include "BLI_blenlib.h"
@@ -1269,7 +1270,7 @@ static void mirrorModifier_initData(ModifierData *md)
 {
 	MirrorModifierData *mmd = (MirrorModifierData*) md;
 
-	mmd->flag |= MOD_MIR_AXIS_X;
+	mmd->flag |= (MOD_MIR_AXIS_X | MOD_MIR_VGROUP);
 	mmd->tolerance = 0.001;
 	mmd->mirror_ob = NULL;
 }
@@ -1308,11 +1309,123 @@ static void mirrorModifier_updateDepgraph(ModifierData *md, DagForest *forest,
 	}
 }
 
+/* finds the best possible flipped name. For renaming; check for unique names afterwards */
+/* if strip_number: removes number extensions */
+void vertgroup_flip_name (char *name, int strip_number)
+{
+	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!
+			if(strip_number==0) 
+				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 DerivedMesh *doMirrorOnAxis(MirrorModifierData *mmd,
-				   Object *ob,
-       DerivedMesh *dm,
-       int initFlags,
-       int axis)
+		Object *ob,
+		DerivedMesh *dm,
+		int initFlags,
+		int axis)
 {
 	int i;
 	float tolerance = mmd->tolerance;
@@ -1321,6 +1434,9 @@ static DerivedMesh *doMirrorOnAxis(MirrorModifierData *mmd,
 	int maxVerts = dm->getNumVerts(dm);
 	int maxEdges = dm->getNumEdges(dm);
 	int maxFaces = dm->getNumFaces(dm);
+	int vector_size=0, j, a, b;
+	bDeformGroup *def, *defb;
+	bDeformGroup **vector_def = NULL;
 	int (*indexMap)[2];
 	float mtx[4][4], imtx[4][4];
 
@@ -1330,9 +1446,24 @@ static DerivedMesh *doMirrorOnAxis(MirrorModifierData *mmd,
 
 	result = CDDM_from_template(dm, maxVerts * 2, maxEdges * 2, maxFaces * 2);
 
+
+	if (mmd->flag & MOD_MIR_VGROUP) {
+		/* calculate the number of deformedGroups */
+		for(vector_size = 0, def = ob->defbase.first; def;
+		    def = def->next, vector_size++);
+
+		/* load the deformedGroups for fast access */
+		vector_def =
+		    (bDeformGroup **)MEM_mallocN(sizeof(bDeformGroup*) * vector_size,
+		                                 "group_index");
+		for(a = 0, def = ob->defbase.first; def; def = def->next, a++) {
+			vector_def[a] = def;
+		}
+	}
+
 	if (mmd->mirror_ob) {
 		float obinv[4][4];
-
+		
 		Mat4Invert(obinv, mmd->mirror_ob->obmat);
 		Mat4MulMat4(mtx, ob->obmat, obinv);
 		Mat4Invert(imtx, mtx);
@@ -1343,16 +1474,16 @@ static DerivedMesh *doMirrorOnAxis(MirrorModifierData *mmd,
 		MVert *mv = CDDM_get_vert(result, numVerts);
 		int isShared;
 		float co[3];
-
+		
 		dm->getVert(dm, i, &inMV);
-
+		
 		VecCopyf(co, inMV.co);
-
+		
 		if (mmd->mirror_ob) {
 			VecMat4MulVecfl(co, mtx, co);
 		}
 		isShared = ABS(co[axis])<=tolerance;
-
+		
 		/* Because the topology result (# of vertices) must be the same if
 		* the mesh data is overridden by vertex cos, have to calc sharedness
 		* based on original coordinates. This is why we test before copy.
@@ -1360,10 +1491,10 @@ static DerivedMesh *doMirrorOnAxis(MirrorModifierData *mmd,
 		DM_copy_vert_data(dm, result, i, numVerts, 1);
 		*mv = inMV;
 		numVerts++;
-
+		
 		indexMap[i][0] = numVerts - 1;
 		indexMap[i][1] = !isShared;
-
+		
 		if(isShared) {
 			co[axis] = 0;
 			if (mmd->mirror_ob) {
@@ -1374,41 +1505,73 @@ static DerivedMesh *doMirrorOnAxis(MirrorModifierData *mmd,
 			mv->flag |= ME_VERT_MERGED;
 		} else {
 			MVert *mv2 = CDDM_get_vert(result, numVerts);
-
+			MDeformVert *dvert = NULL;
+			
 			DM_copy_vert_data(dm, result, i, numVerts, 1);
 			*mv2 = *mv;
-			numVerts++;
-
+			
 			co[axis] = -co[axis];
 			if (mmd->mirror_ob) {
 				VecMat4MulVecfl(co, imtx, co);
 			}
 			VecCopyf(mv2->co, co);
+			
+			if (mmd->flag & MOD_MIR_VGROUP){
+				dvert = DM_get_vert_data(result, numVerts, CD_MDEFORMVERT);
+				
+				if (dvert)
+				{
+					for(j = 0; j < dvert[0].totweight; ++j)
+					{
+						char tmpname[32];
+						
+						if(dvert->dw[j].def_nr < 0 ||
+						   dvert->dw[j].def_nr >= vector_size)
+							continue;
+						
+						def = vector_def[dvert->dw[j].def_nr];
+						strcpy(tmpname, def->name);
+						vertgroup_flip_name(tmpname,0);
+						
+						for(b = 0, defb = ob->defbase.first; defb;
+						    defb = defb->next, b++)
+						{
+							if(!strcmp(defb->name, tmpname))
+							{
+								dvert->dw[j].def_nr = b;
+								break;
+							}
+						}
+					}
+				}
+			}
+			
+			numVerts++;
 		}
 	}
 
 	for(i = 0; i < maxEdges; i++) {
 		MEdge inMED;
 		MEdge *med = CDDM_get_edge(result, numEdges);
-
+		
 		dm->getEdge(dm, i, &inMED);
-
+		
 		DM_copy_edge_data(dm, result, i, numEdges, 1);
 		*med = inMED;
 		numEdges++;
-
+		
 		med->v1 = indexMap[inMED.v1][0];
 		med->v2 = indexMap[inMED.v2][0];
 		if(initFlags)
 			med->flag |= ME_EDGEDRAW | ME_EDGERENDER;
-
+		
 		if(indexMap[inMED.v1][1] || indexMap[inMED.v2][1]) {
 			MEdge *med2 = CDDM_get_edge(result, numEdges);
-
+			
 			DM_copy_edge_data(dm, result, i, numEdges, 1);
 			*med2 = *med;
 			numEdges++;
-
+			
 			med2->v1 += indexMap[inMED.v1][1];
 			med2->v2 += indexMap[inMED.v2][1];
 		}
@@ -1417,13 +1580,13 @@ static DerivedMesh *doMirrorOnAxis(MirrorModifierData *mmd,
 	for(i = 0; i < maxFaces; i++) {
 		MFace inMF;
 		MFace *mf = CDDM_get_face(result, numFaces);
-
+		
 		dm->getFace(dm, i, &inMF);
-
+		
 		DM_copy_face_data(dm, result, i, numFaces, 1);
 		*mf = inMF;
 		numFaces++;
-
+		
 		mf->v1 = indexMap[inMF.v1][0];
 		mf->v2 = indexMap[inMF.v2][0];
 		mf->v3 = indexMap[inMF.v3][0];
@@ -1435,15 +1598,15 @@ static DerivedMesh *doMirrorOnAxis(MirrorModifierData *mmd,
 				 || (mf->v4 && indexMap[inMF.v4][1])) {
 			MFace *mf2 = CDDM_get_face(result, numFaces);
 			static int corner_indices[4] = {2, 1, 0, 3};
-
+			
 			DM_copy_face_data(dm, result, i, numFaces, 1);
 			*mf2 = *mf;
-
+			
 			mf2->v1 += indexMap[inMF.v1][1];
 			mf2->v2 += indexMap[inMF.v2][1];
 			mf2->v3 += indexMap[inMF.v3][1];
 			if(inMF.v4) mf2->v4 += indexMap[inMF.v4][1];
-
+			
 			/* mirror UVs if enabled */
 			if(mmd->flag & (MOD_MIR_MIRROR_U | MOD_MIR_MIRROR_V)) {
 				MTFace *tf = result->getFaceData(result, numFaces, CD_MTFACE);
@@ -1457,16 +1620,18 @@ static DerivedMesh *doMirrorOnAxis(MirrorModifierData *mmd,
 					}
 				}
 			}
-
+			
 			/* Flip face normal */
 			SWAP(int, mf2->v1, mf2->v3);
 			DM_swap_face_data(result, numFaces, corner_indices);
-
+			
 			test_index_face(mf2, &result->faceData, numFaces, inMF.v4?4:3);
 			numFaces++;
-				 }
+		}
 	}
 
+	if (vector_def) MEM_freeN(vector_def);
+
 	MEM_freeN(indexMap);
 
 	CDDM_lower_num_verts(result, numVerts);
@@ -1477,8 +1642,8 @@ static DerivedMesh *doMirrorOnAxis(MirrorModifierData *mmd,
 }
 
 static DerivedMesh *mirrorModifier__doMirror(MirrorModifierData *mmd,
-					     Object *ob, DerivedMesh *dm,
-	  int initFlags)
+					    Object *ob, DerivedMesh *dm,
+						int initFlags)
 {
 	DerivedMesh *result = dm;
 
@@ -4360,13 +4525,13 @@ static void castModifier_deformVertsEM(
 
 /* Wave */
 
-static void waveModifier_initData(ModifierData *md) 
+static void waveModifier_initData(ModifierData *md)
 {
 	WaveModifierData *wmd = (WaveModifierData*) md; // whadya know, moved here from Iraq
-		
+
 	wmd->flag |= (MOD_WAVE_X | MOD_WAVE_Y | MOD_WAVE_CYCL
 			| MOD_WAVE_NORM_X | MOD_WAVE_NORM_Y | MOD_WAVE_NORM_Z);
-	
+
 	wmd->objectcenter = NULL;
 	wmd->texture = NULL;
 	wmd->map_object = NULL;
@@ -4376,6 +4541,7 @@ static void waveModifier_initData(ModifierData *md)
 	wmd->narrow= 1.5f;
 	wmd->lifetime= 0.0f;
 	wmd->damp= 10.0f;
+	wmd->falloff= 0.0f;
 	wmd->texmapping = MOD_WAV_MAP_LOCAL;
 	wmd->defgrp_name[0] = 0;
 }
@@ -4395,6 +4561,7 @@ static void waveModifier_copyData(ModifierData *md, ModifierData *target)
 	twmd->starty = wmd->starty;
 	twmd->timeoffs = wmd->timeoffs;
 	twmd->width = wmd->width;
+	twmd->falloff = wmd->falloff;
 	twmd->objectcenter = wmd->objectcenter;
 	twmd->texture = wmd->texture;
 	twmd->map_object = wmd->map_object;
@@ -4605,7 +4772,7 @@ static void waveModifier_do(
 
 		if(x > wmd->lifetime) {
 			lifefac = x - wmd->lifetime;
-			
+
 			if(lifefac > wmd->damp) lifefac = 0.0;
 			else lifefac =
 				(float)(wmd->height * (1.0 - sqrt(lifefac / wmd->damp)));
@@ -4626,6 +4793,8 @@ static void waveModifier_do(
 			float x = co[0] - wmd->startx;
 			float y = co[1] - wmd->starty;
 			float amplit= 0.0f;
+			float dist = 0.0f;
+			float falloff_fac = 0.0f;
 			TexResult texres;
 			MDeformWeight *def_weight = NULL;
 
@@ -4648,14 +4817,29 @@ static void waveModifier_do(
 				get_texture_value(wmd->texture, tex_co[i], &texres);
 			}
 
+			/*get dist*/
+			if(wmd->flag & MOD_WAVE_X) {
+				if(wmd->flag & MOD_WAVE_Y){
+					dist = (float)sqrt(x*x + y*y);
+				}
+				else{
+					dist = fabs(x);
+				}
+			}
+			else if(wmd->flag & MOD_WAVE_Y) {
+				dist = fabs(y);
+			}
+
+			falloff_fac = (1.0-(dist / wmd->falloff));
+			CLAMP(falloff_fac,0,1);
 
 			if(wmd->flag & MOD_WAVE_X) {
 				if(wmd->flag & MOD_WAVE_Y) amplit = (float)sqrt(x*x + y*y);
 				else amplit = x;
 			}
-			else if(wmd->flag & MOD_WAVE_Y) 
+			else if(wmd->flag & MOD_WAVE_Y)
 				amplit= y;
-			
+
 			/* this way it makes nice circles */
 			amplit -= (ctime - wmd->timeoffs) * wmd->speed;
 
@@ -4668,12 +4852,19 @@ static void waveModifier_do(
 			if(amplit > -wmd->width && amplit < wmd->width) {
 				amplit = amplit * wmd->narrow;
 				amplit = (float)(1.0 / exp(amplit * amplit) - minfac);
+
+				/*apply texture*/
 				if(wmd->texture)
 					amplit = amplit * texres.tin;
 
+				/*apply weight*/
 				if(def_weight)
 					amplit = amplit * def_weight->weight;
 
+				/*apply falloff*/
+				if (wmd->falloff > 0)
+					amplit = amplit * falloff_fac;
+
 				if(mvert) {
 					/* move along normals */
 					if(wmd->flag & MOD_WAVE_NORM_X) {
@@ -4729,7 +4920,7 @@ static void waveModifier_deformVertsEM(
 
 	if(!wmd->texture && !wmd->defgrp_name[0] && !(wmd->flag & MOD_WAVE_NORM))
 		dm = derivedData;
-	else if(derivedData) dm = derivedData;
+	else if(derivedData) dm = CDDM_copy(derivedData);
 	else dm = CDDM_from_editmesh(editData, ob->data);
 
 	if(wmd->flag & MOD_WAVE_NORM) {
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 4f901ba7216..7b36e46d45e 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -732,6 +732,17 @@ void *add_lamp(char *name)
 	la->preview=NULL;
 	la->falloff_type = LA_FALLOFF_INVLINEAR;
 	la->curfalloff = curvemapping_add(1, 0.0f, 1.0f, 1.0f, 0.0f);
+	la->sun_effect_type = 0;
+	la->horizon_brightness = 1.0;
+	la->spread = 1.0;
+	la->sun_brightness = 1.0;
+	la->sun_size = 1.0;
+	la->backscattered_light = 1.0;
+	la->atm_turbidity = 2.0;
+	la->atm_inscattering_factor = 1.0;
+	la->atm_extinction_factor = 1.0;
+	la->atm_distance_factor = 1.0;
+	la->sun_intensity = 1.0;
 	curvemapping_initialize(la->curfalloff);
 	return la;
 }
@@ -1100,6 +1111,8 @@ static void copy_object_pose(Object *obn, Object *ob)
 {
 	bPoseChannel *chan;
 	
+	/* note: need to clear obn->pose pointer first, so that copy_pose works (otherwise there's a crash) */
+	obn->pose= NULL;
 	copy_pose(&obn->pose, ob->pose, 1);	/* 1 = copy constraints */
 
 	for (chan = obn->pose->chanbase.first; chan; chan=chan->next){
@@ -2380,3 +2393,31 @@ int give_obdata_texspace(Object *ob, int **texflag, float **loc, float **size, f
 	}
 	return 1;
 }
+
+/*
+ * Test a bounding box for ray intersection
+ * assumes the ray is already local to the boundbox space
+ */
+int ray_hit_boundbox(struct BoundBox *bb, float ray_start[3], float ray_normal[3])
+{
+	static int triangle_indexes[12][3] = {{0, 1, 2}, {0, 2, 3},
+										  {3, 2, 6}, {3, 6, 7},
+										  {1, 2, 6}, {1, 6, 5}, 
+										  {5, 6, 7}, {4, 5, 7},
+										  {0, 3, 7}, {0, 4, 7},
+										  {0, 1, 5}, {0, 4, 5}};
+	int result = 0;
+	int i;
+	
+	for (i = 0; i < 12 && result == 0; i++)
+	{
+		float lambda;
+		int v1, v2, v3;
+		v1 = triangle_indexes[i][0];
+		v2 = triangle_indexes[i][1];
+		v3 = triangle_indexes[i][2];
+		result = RayIntersectsTriangle(ray_start, ray_normal, bb->vec[v1], bb->vec[v2], bb->vec[v3], &lambda, NULL);
+	}
+	
+	return result;
+}
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index 18fca5439ef..24a3d348ae7 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -1371,7 +1371,7 @@ void psys_particle_on_shape(int distr, int index, float *fuv, float *vec, float
 /************************************************/
 void psys_particle_on_emitter(Object *ob, ParticleSystemModifierData *psmd, int from, int index, int index_dmcache, float *fuv, float foffset, float *vec, float *nor, float *utan, float *vtan, float *orco, float *ornor){
 	if(psmd){
-		if(psmd->psys->part->distr==PART_DISTR_GRID){
+		if(psmd->psys->part->distr==PART_DISTR_GRID && psmd->psys->part->from != PART_FROM_VERT){
 			if(vec){
 				VECCOPY(vec,fuv);
 			}
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index 5112fb08fe6..f70648965f4 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -168,7 +168,7 @@ static void realloc_particles(Object *ob, ParticleSystem *psys, int new_totpart)
 	int i, totpart, totsaved = 0;
 
 	if(new_totpart<0) {
-		if(psys->part->distr==PART_DISTR_GRID) {
+		if(psys->part->distr==PART_DISTR_GRID  && psys->part->from != PART_FROM_VERT) {
 			totpart= psys->part->grid_res;
 			totpart*=totpart*totpart;
 		}
@@ -1056,7 +1056,7 @@ int psys_threads_init_distribution(ParticleThread *threads, DerivedMesh *finaldm
 		dm= CDDM_from_mesh((Mesh*)ob->data, ob);
 
 		/* special handling of grid distribution */
-		if(part->distr==PART_DISTR_GRID){
+		if(part->distr==PART_DISTR_GRID && from != PART_FROM_VERT){
 			distribute_particles_in_grid(dm,psys);
 			dm->release(dm);
 			return 0;
@@ -1600,7 +1600,7 @@ void initialize_particle(ParticleData *pa, int p, Object *ob, ParticleSystem *ps
 
 	NormalQuat(pa->r_rot);
 
-	if(part->distr!=PART_DISTR_GRID){
+	if(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]))
 			pa->flag |= PARS_UNEXIST;
@@ -2596,6 +2596,7 @@ static void precalc_effectors(Object *ob, ParticleSystem *psys, ParticleSystemMo
 	
 	for(ec= lb->first; ec; ec= ec->next) {
 		PartDeflect *pd= ec->ob->pd;
+		co = NULL;
 		
 		if(ec->type==PSYS_EC_EFFECTOR && pd->forcefield==PFIELD_GUIDE && ec->ob->type==OB_CURVE 
 			&& part->phystype!=PART_PHYS_BOIDS) {
@@ -4514,7 +4515,7 @@ void psys_changed_type(ParticleSystem *psys)
 	if(part->from == PART_FROM_PARTICLE) {
 		if(part->type != PART_REACTOR)
 			part->from = PART_FROM_FACE;
-		if(part->distr == PART_DISTR_GRID)
+		if(part->distr == PART_DISTR_GRID && part->from != PART_FROM_VERT)
 			part->distr = PART_DISTR_JIT;
 	}
 
@@ -4709,7 +4710,7 @@ static void system_step(Object *ob, ParticleSystem *psys, ParticleSystemModifier
 	oldtotpart = psys->totpart;
 	oldtotchild = psys->totchild;
 
-	if(part->distr == PART_DISTR_GRID)
+	if(part->distr == PART_DISTR_GRID && part->from != PART_FROM_VERT)
 		totpart = part->grid_res*part->grid_res*part->grid_res;
 	else
 		totpart = psys->part->totpart;
@@ -4814,9 +4815,20 @@ static void system_step(Object *ob, ParticleSystem *psys, ParticleSystemModifier
 			pa->flag &= ~PARS_NO_DISP;
 	}
 
-	/* ok now we're all set so let's go */
-	if(psys->totpart)
-		dynamics_step(ob,psys,psmd,cfra,vg_vel,vg_tan,vg_rot,vg_size);
+	if(psys->totpart) {
+		int dframe, totframesback = 0;
+
+		/* handle negative frame start at the first frame by doing
+		 * all the steps before the first frame */
+		if(framenr == startframe && part->sta < startframe)
+			totframesback = (startframe - (int)part->sta);
+
+		for(dframe=-totframesback; dframe<=0; dframe++) {
+			/* ok now we're all set so let's go */
+			dynamics_step(ob,psys,psmd,cfra+dframe,vg_vel,vg_tan,vg_rot,vg_size);
+			psys->cfra = cfra+dframe;
+		}
+	}
 	
 	cache->simframe= framenr;
 	cache->flag |= PTCACHE_SIMULATION_VALID;
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c
index 57ecffbb796..43805959e62 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -459,9 +459,10 @@ int BKE_ptcache_object_reset(Object *ob, int mode)
 	PTCacheID pid;
 	ParticleSystem *psys;
 	ModifierData *md;
-	int reset;
+	int reset, skip;
 
 	reset= 0;
+	skip= 0;
 
 	if(ob->soft) {
 		BKE_ptcache_id_from_softbody(&pid, ob, ob->soft);
@@ -469,11 +470,18 @@ int BKE_ptcache_object_reset(Object *ob, int mode)
 	}
 
 	for(psys=ob->particlesystem.first; psys; psys=psys->next) {
-		BKE_ptcache_id_from_particles(&pid, ob, psys);
-		reset |= BKE_ptcache_id_reset(&pid, mode);
-
+		/* 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);
+			if(mode == PSYS_RESET_ALL || !(psys->part->type == PART_HAIR && (pid.cache->flag & PTCACHE_BAKED))) 
+				reset |= BKE_ptcache_id_reset(&pid, mode);
+			else
+				skip = 1;
+		}
+
+		if(skip == 0) {
+			BKE_ptcache_id_from_particles(&pid, ob, psys);
 			reset |= BKE_ptcache_id_reset(&pid, mode);
 		}
 	}
diff --git a/source/blender/blenkernel/intern/sca.c b/source/blender/blenkernel/intern/sca.c
index 86e395b3770..fcf1c7ce311 100644
--- a/source/blender/blenkernel/intern/sca.c
+++ b/source/blender/blenkernel/intern/sca.c
@@ -150,6 +150,9 @@ void init_sensor(bSensor *sens)
 	case SENS_PROPERTY:
 		sens->data= MEM_callocN(sizeof(bPropertySensor), "propsens");
 		break;
+	case SENS_ACTUATOR:
+		sens->data= MEM_callocN(sizeof(bActuatorSensor), "actsens");
+		break;
 	case SENS_MOUSE:
 		ms=sens->data= MEM_callocN(sizeof(bMouseSensor), "mousesens");
 		ms->type= LEFTMOUSE;
@@ -411,6 +414,7 @@ void init_actuator(bActuator *act)
 	switch(act->type) {
 #ifdef __NLA
 	case ACT_ACTION:
+	case ACT_SHAPEACTION:
 		act->data= MEM_callocN(sizeof(bActionActuator), "actionact");
 		break;
 #endif
@@ -464,6 +468,9 @@ void init_actuator(bActuator *act)
     case ACT_PARENT:
         act->data = MEM_callocN(sizeof( bParentActuator ), "parent act");
         break;
+	case ACT_STATE:
+        act->data = MEM_callocN(sizeof( bStateActuator ), "state act");
+        break;
 	default:
 		; /* this is very severe... I cannot make any memory for this        */
 		/* logic brick...                                                    */
diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c
index 91ea8744dad..6d512575244 100644
--- a/source/blender/blenkernel/intern/text.c
+++ b/source/blender/blenkernel/intern/text.c
@@ -1027,7 +1027,8 @@ char *txt_to_buf (Text *text)
 	if (!text) return NULL;
 	if (!text->curl) return NULL;
 	if (!text->sell) return NULL;
-		
+	if (!text->lines.first) return NULL;
+
 	linef= text->lines.first;
 	charf= 0;
 		
diff --git a/source/blender/blenlib/BLI_arithb.h b/source/blender/blenlib/BLI_arithb.h
index 9ed23bc32b6..c22b6f79e08 100644
--- a/source/blender/blenlib/BLI_arithb.h
+++ b/source/blender/blenlib/BLI_arithb.h
@@ -50,6 +50,9 @@ extern "C" {
 #ifndef M_SQRT1_2
 #define M_SQRT1_2	0.70710678118654752440
 #endif
+#ifndef M_1_PI
+#define M_1_PI		0.318309886183790671538
+#endif
 
 #ifdef WIN32
 	#ifndef FREE_WINDOWS
@@ -258,6 +261,7 @@ void Vec2Addf(float *v, float *v1, float *v2);
 void Vec2Subf(float *v, float *v1, float *v2);
 void Vec2Copyf(float *v1, float *v2);
 
+void AxisAngleToQuat(float *q, float *axis, float angle);
 void vectoquat(float *vec, short axis, short upflag, float *q);
 
 float VecAngle2(float *v1, float *v2);
@@ -269,6 +273,8 @@ 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);
 
 float DistVL2Dfl(float *v1, float *v2, float *v3);
 float PdistVL2Dfl(float *v1, float *v2, float *v3);
@@ -320,6 +326,9 @@ void yuv_to_rgb(float y, float u, float v, float *lr, float *lg, float *lb);
 void ycc_to_rgb(float y, float cb, float cr, float *lr, float *lg, float *lb);
 void rgb_to_ycc(float r, float g, float b, float *ly, float *lcb, float *lcr);
 void rgb_to_hsv(float r, float g, float b, float *lh, float *ls, float *lv);
+void xyz_to_rgb(float x, float y, float z, float *r, float *g, float *b);
+int constrain_rgb(float *r, float *g, float *b);
+void gamma_correct_rgb(float *r, float *g, float *b);
 unsigned int hsv_to_cpack(float h, float s, float v);
 unsigned int rgb_to_cpack(float r, float g, float b);
 void cpack_to_rgb(unsigned int col, float *r, float *g, float *b);
@@ -371,7 +380,9 @@ void LocQuatSizeToMat4(float mat[][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);
 
+int LineIntersectLine(float v1[3], float v2[3], float v3[3], float v4[3], float i1[3], float i2[3]);
 int LineIntersectsTriangle(float p1[3], float p2[3], float v0[3], float v1[3], float v2[3], float *lambda, float *uv);
+int RayIntersectsTriangle(float p1[3], float d[3], float v0[3], float v1[3], float v2[3], float *lambda, float *uv);
 int SweepingSphereIntersectsTriangleUV(float p1[3], float p2[3], float radius, float v0[3], float v1[3], float v2[3], float *lambda, float *ipoint);
 int AxialLineIntersectsTriangle(int axis, float co1[3], float co2[3], float v0[3], float v1[3], float v2[3], float *lambda);
 int AabbIntersectAabb(float min1[3], float max1[3], float min2[3], float max2[3]);
diff --git a/source/blender/blenlib/BLI_mempool.h b/source/blender/blenlib/BLI_mempool.h
new file mode 100644
index 00000000000..8b31459dd38
--- /dev/null
+++ b/source/blender/blenlib/BLI_mempool.h
@@ -0,0 +1,44 @@
+/**
+ * Simple fast memory allocator
+ * 
+ *
+ * ***** 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): Geoffrey Bantle.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+ 
+#ifndef BLI_MEMPOOL_H
+#define BLI_MEMPOOL_H
+
+struct BLI_mempool;
+typedef struct BLI_mempool BLI_mempool;
+
+BLI_mempool *BLI_mempool_create(int esize, int tote, int pchunk);
+void *BLI_mempool_alloc(BLI_mempool *pool);
+void *BLI_mempool_calloc(BLI_mempool *pool);
+void BLI_mempool_free(BLI_mempool *pool, void *addr);
+void BLI_mempool_destroy(BLI_mempool *pool);
+
+
+#endif
diff --git a/source/blender/blenlib/BLI_winstuff.h b/source/blender/blenlib/BLI_winstuff.h
index 9c192ba8b09..11150075bac 100644
--- a/source/blender/blenlib/BLI_winstuff.h
+++ b/source/blender/blenlib/BLI_winstuff.h
@@ -73,6 +73,9 @@
 #ifndef M_SQRT1_2
 #define M_SQRT1_2	0.70710678118654752440
 #endif
+#ifndef M_1_PI
+#define M_1_PI		0.318309886183790671538
+#endif
 
 #define MAXPATHLEN MAX_PATH
 
diff --git a/source/blender/blenlib/intern/BLI_kdopbvh.c b/source/blender/blenlib/intern/BLI_kdopbvh.c
index a85883f6572..a97b9ca6672 100644
--- a/source/blender/blenlib/intern/BLI_kdopbvh.c
+++ b/source/blender/blenlib/intern/BLI_kdopbvh.c
@@ -523,6 +523,7 @@ static void bvh_div_nodes(BVHTree *tree, BVHNode *node, int start, int end, char
 	return;
 }
 
+#if 0
 static void verify_tree(BVHTree *tree)
 {
 	int i, j, check = 0;
@@ -569,6 +570,7 @@ static void verify_tree(BVHTree *tree)
 	
 	printf("branches: %d, leafs: %d, total: %d\n", tree->totbranch, tree->totleaf, tree->totbranch + tree->totleaf);
 }
+#endif
 	
 void BLI_bvhtree_balance(BVHTree *tree)
 {
diff --git a/source/blender/blenlib/intern/BLI_mempool.c b/source/blender/blenlib/intern/BLI_mempool.c
new file mode 100644
index 00000000000..7ac7b8b1791
--- /dev/null
+++ b/source/blender/blenlib/intern/BLI_mempool.c
@@ -0,0 +1,140 @@
+/**
+ *
+ * ***** 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 by Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/*
+	Simple, fast memory allocator for allocating many elements of the same size.
+*/
+
+#include "MEM_guardedalloc.h"
+#include "BLI_blenlib.h"
+#include "DNA_listBase.h"
+#include "BLI_linklist.h"
+#include <string.h> 
+
+typedef struct BLI_freenode{
+	struct BLI_freenode *next;
+}BLI_freenode;
+
+typedef struct BLI_mempool_chunk{
+	struct BLI_mempool_chunk *next, *prev;
+	void *data;
+}BLI_mempool_chunk;
+
+typedef struct BLI_mempool{
+	struct ListBase chunks;
+	int esize, csize, pchunk;		/*size of elements and chunks in bytes and number of elements per chunk*/
+	struct BLI_freenode	*free;		/*free element list. Interleaved into chunk datas.*/
+}BLI_mempool;
+
+BLI_mempool *BLI_mempool_create(int esize, int tote, int pchunk)
+{	BLI_mempool  *pool = NULL;
+	BLI_freenode *lasttail = NULL, *curnode = NULL;
+	int i,j, maxchunks;
+	char *addr;
+
+	/*allocate the pool structure*/
+	pool = MEM_mallocN(sizeof(BLI_mempool),"memory pool");
+	pool->esize = esize;
+	pool->pchunk = pchunk;	
+	pool->csize = esize * pchunk;
+	pool->chunks.first = pool->chunks.last = NULL;
+	
+	maxchunks = tote / pchunk;
+	
+	/*allocate the actual chunks*/
+	for(i=0; i < maxchunks; i++){
+		BLI_mempool_chunk *mpchunk = MEM_mallocN(sizeof(BLI_mempool_chunk), "BLI_Mempool Chunk");
+		mpchunk->next = mpchunk->prev = NULL;
+		mpchunk->data = MEM_mallocN(pool->csize, "BLI Mempool Chunk Data");
+		BLI_addtail(&(pool->chunks), mpchunk);
+		
+		if(i==0) pool->free = mpchunk->data; /*start of the list*/
+		/*loop through the allocated data, building the pointer structures*/
+		for(addr = mpchunk->data, j=0; j < pool->pchunk; j++){
+			curnode = ((BLI_freenode*)addr);
+			addr += pool->esize;
+			curnode->next = (BLI_freenode*)addr;
+		}
+		/*final pointer in the previously allocated chunk is wrong.*/
+		if(lasttail) lasttail->next = mpchunk->data;
+		/*set the end of this chunks memoryy to the new tail for next iteration*/
+		lasttail = curnode;
+	}
+	/*terminate the list*/
+	curnode->next = NULL;
+	return pool;
+}
+void *BLI_mempool_alloc(BLI_mempool *pool){
+	void *retval=NULL;
+	BLI_freenode *curnode=NULL;
+	char *addr=NULL;
+	int j;
+
+	if(!(pool->free)){
+		/*need to allocate a new chunk*/
+		BLI_mempool_chunk *mpchunk = MEM_mallocN(sizeof(BLI_mempool_chunk), "BLI_Mempool Chunk");
+		mpchunk->next = mpchunk->prev = NULL;
+		mpchunk->data = MEM_mallocN(pool->csize, "BLI_Mempool Chunk Data");
+		BLI_addtail(&(pool->chunks), mpchunk);
+
+		pool->free = mpchunk->data; /*start of the list*/
+		for(addr = mpchunk->data, j=0; j < pool->pchunk; j++){
+			curnode = ((BLI_freenode*)addr);
+			addr += pool->esize;
+			curnode->next = (BLI_freenode*)addr;
+		}
+		curnode->next = NULL; /*terminate the list*/
+	}
+
+	retval = pool->free;
+	pool->free = pool->free->next;
+	//memset(retval, 0, pool->esize);
+	return retval;
+}
+
+void *BLI_mempool_calloc(BLI_mempool *pool){
+	void *retval=NULL;
+	retval = BLI_mempool_alloc(pool);
+	memset(retval, 0, pool->esize);
+	return retval;
+}
+
+
+
+void BLI_mempool_free(BLI_mempool *pool, void *addr){ //doesnt protect against double frees, dont be stupid!
+	BLI_freenode *newhead = addr;
+	newhead->next = pool->free;
+	pool->free = newhead;
+}
+void BLI_mempool_destroy(BLI_mempool *pool)
+{
+	BLI_mempool_chunk *mpchunk=NULL;
+	for(mpchunk = pool->chunks.first; mpchunk; mpchunk = mpchunk->next) MEM_freeN(mpchunk->data);
+	BLI_freelistN(&(pool->chunks));
+	MEM_freeN(pool);
+}
diff --git a/source/blender/blenlib/intern/arithb.c b/source/blender/blenlib/intern/arithb.c
index 48a149f4b3a..b7598ec0c4d 100644
--- a/source/blender/blenlib/intern/arithb.c
+++ b/source/blender/blenlib/intern/arithb.c
@@ -60,6 +60,7 @@
 #define SMALL_NUMBER	1.e-8
 #define ABS(x)	((x) < 0 ? -(x) : (x))
 #define SWAP(type, a, b)	{ type sw_ap; sw_ap=(a); (a)=(b); (b)=sw_ap; }
+#define CLAMP(a, b, c)		if((a)<(b)) (a)=(b); else if((a)>(c)) (a)=(c)
 
 
 #if defined(WIN32) || defined(__APPLE__)
@@ -1335,6 +1336,22 @@ void NormalQuat(float *q)
 	}
 }
 
+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;
@@ -2258,6 +2275,20 @@ double Sqrt3d(double d)
 	else return exp(log(d)/3);
 }
 
+void NormalShortToFloat(float *out, short *in)
+{
+	out[0] = in[0] / 32767.0;
+	out[1] = in[1] / 32767.0;
+	out[2] = in[2] / 32767.0;
+}
+
+void NormalFloatToShort(short *out, float *in)
+{
+	out[0] = (short)(in[0] * 32767.0);
+	out[1] = (short)(in[1] * 32767.0);
+	out[2] = (short)(in[2] * 32767.0);
+}
+
 /* distance v1 to line v2-v3 */
 /* using Hesse formula, NO LINE PIECE! */
 float DistVL2Dfl( float *v1, float *v2, float *v3)  {
@@ -3384,6 +3415,66 @@ void rgb_to_hsv(float r, float g, float b, float *lh, float *ls, float *lv)
 	*lv = v;
 }
 
+/*http://brucelindbloom.com/index.html?Eqn_RGB_XYZ_Matrix.html
+ * SMPTE-C XYZ to RGB matrix*/
+void xyz_to_rgb(float xc, float yc, float zc, float *r, float *g, float *b)
+{
+	*r = (3.50570	* xc) + (-1.73964	* yc) + (-0.544011	* zc);
+	*g = (-1.06906	* xc) + (1.97781	* yc) + (0.0351720	* zc);
+	*b = (0.0563117	* xc) + (-0.196994	* yc) + (1.05005	* zc);
+}
+
+/*If the requested RGB shade contains a negative weight for
+  one of the primaries, it lies outside the colour gamut 
+  accessible from the given triple of primaries.  Desaturate
+  it by adding white, equal quantities of R, G, and B, enough
+  to make RGB all positive.  The function returns 1 if the
+  components were modified, zero otherwise.*/
+int constrain_rgb(float *r, float *g, float *b)
+{
+	float w;
+
+    /* Amount of white needed is w = - min(0, *r, *g, *b) */
+    
+    w = (0 < *r) ? 0 : *r;
+    w = (w < *g) ? w : *g;
+    w = (w < *b) ? w : *b;
+    w = -w;
+
+    /* Add just enough white to make r, g, b all positive. */
+    
+    if (w > 0) {
+        *r += w;  *g += w; *b += w;
+        return 1;                     /* Colour modified to fit RGB gamut */
+    }
+
+    return 0;                         /* Colour within RGB gamut */
+}
+
+/*Transform linear RGB values to nonlinear RGB values. Rec.
+  709 is ITU-R Recommendation BT. 709 (1990) ``Basic
+  Parameter Values for the HDTV Standard for the Studio and
+  for International Programme Exchange'', formerly CCIR Rec.
+  709.*/
+void gamma_correct(float *c)
+{
+	/* Rec. 709 gamma correction. */
+	float cc = 0.018;
+	
+	if (*c < cc) {
+	    *c *= ((1.099 * pow(cc, 0.45)) - 0.099) / cc;
+	} else {
+	    *c = (1.099 * pow(*c, 0.45)) - 0.099;
+	}
+}
+
+void gamma_correct_rgb(float *r, float *g, float *b)
+{
+    gamma_correct(r);
+    gamma_correct(g);
+    gamma_correct(b);
+}
+
 
 /* we define a 'cpack' here as a (3 byte color code) number that can be expressed like 0xFFAA66 or so.
    for that reason it is sensitive for endianness... with this function it works correctly
@@ -3671,14 +3762,89 @@ int LineIntersectsTriangle(float p1[3], float p2[3], float v0[3], float v1[3], f
 	return 1;
 }
 
+/* moved from effect.c
+   test if the ray starting at p1 going in d direction intersects the triangle v0..v2
+   return non zero if it does 
+*/
+int RayIntersectsTriangle(float p1[3], float d[3], float v0[3], float v1[3], float v2[3], float *lambda, float *uv)
+{
+	float p[3], s[3], e1[3], e2[3], q[3];
+	float a, f, u, v;
+	
+	VecSubf(e1, v1, v0);
+	VecSubf(e2, v2, v0);
+	
+	Crossf(p, d, e2);
+	a = Inpf(e1, p);
+	if ((a > -0.000001) && (a < 0.000001)) return 0;
+	f = 1.0f/a;
+	
+	VecSubf(s, p1, v0);
+	
+	Crossf(q, s, e1);
+	*lambda = f * Inpf(e2, q);
+	if ((*lambda < 0.0)) return 0;
+	
+	u = f * Inpf(s, p);
+	if ((u < 0.0)||(u > 1.0)) return 0;
+	
+	v = f * Inpf(d, q);
+	if ((v < 0.0)||((u + v) > 1.0)) return 0;
+
+	if(uv) {
+		uv[0]= u;
+		uv[1]= v;
+	}
+	
+	return 1;
+}
+
 /* Adapted from the paper by Kasper Fauerby */
 /* "Improved Collision detection and Response" */
+static int getLowestRoot(float a, float b, float c, float maxR, float* root)
+{
+	// Check if a solution exists
+	float determinant = b*b - 4.0f*a*c;
+
+	// If determinant is negative it means no solutions.
+	if (determinant >= 0.0f)
+	{
+		// calculate the two roots: (if determinant == 0 then
+		// x1==x2 but let’s disregard that slight optimization)
+		float sqrtD = sqrt(determinant);
+		float r1 = (-b - sqrtD) / (2.0f*a);
+		float r2 = (-b + sqrtD) / (2.0f*a);
+		
+		// Sort so x1 <= x2
+		if (r1 > r2)
+			SWAP( float, r1, r2);
+
+		// Get lowest root:
+		if (r1 > 0.0f && r1 < maxR)
+		{
+			*root = r1;
+			return 1;
+		}
+
+		// It is possible that we want x2 - this can happen
+		// if x1 < 0
+		if (r2 > 0.0f && r2 < maxR)
+		{
+			*root = r2;
+			return 1;
+		}
+	}
+	// No (valid) solutions
+	return 0;
+}
+
 int SweepingSphereIntersectsTriangleUV(float p1[3], float p2[3], float radius, float v0[3], float v1[3], float v2[3], float *lambda, float *ipoint)
 {
 	float e1[3], e2[3], e3[3], point[3], vel[3], /*dist[3],*/ nor[3], temp[3], bv[3];
-	float a, b, c, d, e, x, y, z, t, t0, t1, radius2=radius*radius;
+	float a, b, c, d, e, x, y, z, radius2=radius*radius;
 	float elen2,edotv,edotbv,nordotv,vel2;
-	int embedded_in_plane=0, found_by_sweep=0;
+	float newLambda;
+	int found_by_sweep=0;
 
 	VecSubf(e1,v1,v0);
 	VecSubf(e2,v2,v0);
@@ -3687,44 +3853,41 @@ int SweepingSphereIntersectsTriangleUV(float p1[3], float p2[3], float radius, f
 /*---test plane of tri---*/
 	Crossf(nor,e1,e2);
 	Normalize(nor);
+
 	/* flip normal */
 	if(Inpf(nor,vel)>0.0f) VecMulf(nor,-1.0f);
 	
 	a=Inpf(p1,nor)-Inpf(v0,nor);
-
 	nordotv=Inpf(nor,vel);
 
-	if ((nordotv > -0.000001) && (nordotv < 0.000001)) {
-		if(fabs(a)>=1.0f)
+	if (fabs(nordotv) < 0.000001)
+	{
+		if(fabs(a)>=radius)
+		{
 			return 0;
-		else{
-			embedded_in_plane=1;
-			t0=0.0f;
-			t1=1.0f;
 		}
 	}
-	else{
-		t0=(radius-a)/nordotv;
-		t1=(-radius-a)/nordotv;
-		/* make t0<t1 */
-		if(t0>t1){b=t1; t1=t0; t0=b;}
+	else
+	{
+		float t0=(-a+radius)/nordotv;
+		float t1=(-a-radius)/nordotv;
+
+		if(t0>t1)
+			SWAP(float, t0, t1);
 
 		if(t0>1.0f || t1<0.0f) return 0;
 
 		/* clamp to [0,1] */
-		t0=(t0<0.0f)?0.0f:((t0>1.0f)?1.0:t0);
-		t1=(t1<0.0f)?0.0f:((t1>1.0f)?1.0:t1);
-	}
+		CLAMP(t0, 0.0f, 1.0f);
+		CLAMP(t1, 0.0f, 1.0f);
 
-/*---test inside of tri---*/
-	if(embedded_in_plane==0){
+		/*---test inside of tri---*/
 		/* plane intersection point */
-		VecCopyf(point,vel);
-		VecMulf(point,t0);
-		VecAddf(point,point,p1);
-		VecCopyf(temp,nor);
-		VecMulf(temp,radius);
-		VecSubf(point,point,temp);
+
+		point[0] = p1[0] + vel[0]*t0 - nor[0]*radius;
+		point[1] = p1[1] + vel[1]*t0 - nor[1]*radius;
+		point[2] = p1[2] + vel[2]*t0 - nor[2]*radius;
+
 
 		/* is the point in the tri? */
 		a=Inpf(e1,e1);
@@ -3739,14 +3902,19 @@ int SweepingSphereIntersectsTriangleUV(float p1[3], float p2[3], float radius, f
 		y=e*a-d*b;
 		z=x+y-(a*c-b*b);
 
-		if(( ((unsigned int)z)& ~(((unsigned int)x)|((unsigned int)y)) ) & 0x80000000){
+
+		if( z <= 0.0f && (x >= 0.0f && y >= 0.0f))
+		{
+		//( ((unsigned int)z)& ~(((unsigned int)x)|((unsigned int)y)) ) & 0x80000000){
 			*lambda=t0;
 			VecCopyf(ipoint,point);
 			return 1;
 		}
 	}
 
+
 	*lambda=1.0f;
+
 /*---test points---*/
 	a=vel2=Inpf(vel,vel);
 
@@ -3754,73 +3922,42 @@ int SweepingSphereIntersectsTriangleUV(float p1[3], float p2[3], float radius, f
 	VecSubf(temp,p1,v0);
 	b=2.0f*Inpf(vel,temp);
 	c=Inpf(temp,temp)-radius2;
-	d=b*b-4*a*c;
 
-	if(d>=0.0f){
-		if(d==0.0f)
-			t=-b/2*a;
-		else{
-			z=sqrt(d);
-			x=(-b-z)*0.5/a;
-			y=(-b+z)*0.5/a;
-			t=x<y?x:y;
-		}
-
-		if(t>0.0 && t < *lambda){
-			*lambda=t;
-			VecCopyf(ipoint,v0);
-			found_by_sweep=1;
-		}
+	if(getLowestRoot(a, b, c, *lambda, lambda))
+	{
+		VecCopyf(ipoint,v0);
+		found_by_sweep=1;
 	}
 
 	/*v1*/
 	VecSubf(temp,p1,v1);
 	b=2.0f*Inpf(vel,temp);
 	c=Inpf(temp,temp)-radius2;
-	d=b*b-4*a*c;
 
-	if(d>=0.0f){
-		if(d==0.0f)
-			t=-b/2*a;
-		else{
-			z=sqrt(d);
-			x=(-b-z)*0.5/a;
-			y=(-b+z)*0.5/a;
-			t=x<y?x:y;
-		}
-
-		if(t>0.0 && t < *lambda){
-			*lambda=t;
-			VecCopyf(ipoint,v1);
-			found_by_sweep=1;
-		}
+	if(getLowestRoot(a, b, c, *lambda, lambda))
+	{
+		VecCopyf(ipoint,v1);
+		found_by_sweep=1;
 	}
+	
 	/*v2*/
 	VecSubf(temp,p1,v2);
 	b=2.0f*Inpf(vel,temp);
 	c=Inpf(temp,temp)-radius2;
-	d=b*b-4*a*c;
 
-	if(d>=0.0f){
-		if(d==0.0f)
-			t=-b/2*a;
-		else{
-			z=sqrt(d);
-			x=(-b-z)*0.5/a;
-			y=(-b+z)*0.5/a;
-			t=x<y?x:y;
-		}
-
-		if(t>0.0 && t < *lambda){
-			*lambda=t;
-			VecCopyf(ipoint,v2);
-			found_by_sweep=1;
-		}
+	if(getLowestRoot(a, b, c, *lambda, lambda))
+	{
+		VecCopyf(ipoint,v2);
+		found_by_sweep=1;
 	}
 
 /*---test edges---*/
+	VecSubf(e3,v2,v1); //wasnt yet calculated
+
+
 	/*e1*/
 	VecSubf(bv,v0,p1);
+
 	elen2 = Inpf(e1,e1);
 	edotv = Inpf(e1,vel);
 	edotbv = Inpf(e1,bv);
@@ -3828,27 +3965,18 @@ int SweepingSphereIntersectsTriangleUV(float p1[3], float p2[3], float radius, f
 	a=elen2*(-Inpf(vel,vel))+edotv*edotv;
 	b=2.0f*(elen2*Inpf(vel,bv)-edotv*edotbv);
 	c=elen2*(radius2-Inpf(bv,bv))+edotbv*edotbv;
-	d=b*b-4*a*c;
-	if(d>=0.0f){
-		if(d==0.0f)
-			t=-b/2*a;
-		else{
-			z=sqrt(d);
-			x=(-b-z)*0.5/a;
-			y=(-b+z)*0.5/a;
-			t=x<y?x:y;
-		}
 
-		e=(edotv*t-edotbv)/elen2;
+	if(getLowestRoot(a, b, c, *lambda, &newLambda))
+	{
+		e=(edotv*newLambda-edotbv)/elen2;
 
-		if((e>=0.0f) && (e<=1.0f)){
-			if(t>0.0 && t < *lambda){
-				*lambda=t;
-				VecCopyf(ipoint,e1);
-				VecMulf(ipoint,e);
-				VecAddf(ipoint,ipoint,v0);
-				found_by_sweep=1;
-			}
+		if(e >= 0.0f && e <= 1.0f)
+		{
+			*lambda = newLambda;
+			VecCopyf(ipoint,e1);
+			VecMulf(ipoint,e);
+			VecAddf(ipoint,ipoint,v0);
+			found_by_sweep=1;
 		}
 	}
 
@@ -3861,32 +3989,27 @@ int SweepingSphereIntersectsTriangleUV(float p1[3], float p2[3], float radius, f
 	a=elen2*(-Inpf(vel,vel))+edotv*edotv;
 	b=2.0f*(elen2*Inpf(vel,bv)-edotv*edotbv);
 	c=elen2*(radius2-Inpf(bv,bv))+edotbv*edotbv;
-	d=b*b-4*a*c;
-	if(d>=0.0f){
-		if(d==0.0f)
-			t=-b/2*a;
-		else{
-			z=sqrt(d);
-			x=(-b-z)*0.5/a;
-			y=(-b+z)*0.5/a;
-			t=x<y?x:y;
-		}
 
-		e=(edotv*t-edotbv)/elen2;
+	if(getLowestRoot(a, b, c, *lambda, &newLambda))
+	{
+		e=(edotv*newLambda-edotbv)/elen2;
 
-		if((e>=0.0f) && (e<=1.0f)){
-			if(t>0.0 && t < *lambda){
-				*lambda=t;
-				VecCopyf(ipoint,e2);
-				VecMulf(ipoint,e);
-				VecAddf(ipoint,ipoint,v0);
-				found_by_sweep=1;
-			}
+		if(e >= 0.0f && e <= 1.0f)
+		{
+			*lambda = newLambda;
+			VecCopyf(ipoint,e2);
+			VecMulf(ipoint,e);
+			VecAddf(ipoint,ipoint,v0);
+			found_by_sweep=1;
 		}
 	}
 
 	/*e3*/
-	VecSubf(e3,v2,v1);
+	VecSubf(bv,v0,p1);
+	elen2 = Inpf(e1,e1);
+	edotv = Inpf(e1,vel);
+	edotbv = Inpf(e1,bv);
+
 	VecSubf(bv,v1,p1);
 	elen2 = Inpf(e3,e3);
 	edotv = Inpf(e3,vel);
@@ -3895,30 +4018,22 @@ int SweepingSphereIntersectsTriangleUV(float p1[3], float p2[3], float radius, f
 	a=elen2*(-Inpf(vel,vel))+edotv*edotv;
 	b=2.0f*(elen2*Inpf(vel,bv)-edotv*edotbv);
 	c=elen2*(radius2-Inpf(bv,bv))+edotbv*edotbv;
-	d=b*b-4*a*c;
-	if(d>=0.0f){
-		if(d==0.0f)
-			t=-b/2*a;
-		else{
-			z=sqrt(d);
-			x=(-b-z)*0.5/a;
-			y=(-b+z)*0.5/a;
-			t=x<y?x:y;
-		}
 
-		e=(edotv*t-edotbv)/elen2;
+	if(getLowestRoot(a, b, c, *lambda, &newLambda))
+	{
+		e=(edotv*newLambda-edotbv)/elen2;
 
-		if((e>=0.0f) && (e<=1.0f)){
-			if(t>0.0 && t < *lambda){
-				*lambda=t;
-				VecCopyf(ipoint,e3);
-				VecMulf(ipoint,e);
-				VecAddf(ipoint,ipoint,v1);
-				found_by_sweep=1;
-			}
+		if(e >= 0.0f && e <= 1.0f)
+		{
+			*lambda = newLambda;
+			VecCopyf(ipoint,e3);
+			VecMulf(ipoint,e);
+			VecAddf(ipoint,ipoint,v1);
+			found_by_sweep=1;
 		}
 	}
 
+
 	return found_by_sweep;
 }
 int AxialLineIntersectsTriangle(int axis, float p1[3], float p2[3], float v0[3], float v1[3], float v2[3], float *lambda)
@@ -3965,6 +4080,74 @@ int AxialLineIntersectsTriangle(int axis, float p1[3], float p2[3], float v0[3],
 	return 1;
 }
 
+/* Returns the number of point of interests
+ * 0 - lines are colinear
+ * 1 - lines are coplanar, i1 is set to intersection
+ * 2 - i1 and i2 are the nearest points on line 1 (v1, v2) and line 2 (v3, v4) respectively 
+ * */
+int LineIntersectLine(float v1[3], float v2[3], float v3[3], float v4[3], float i1[3], float i2[3])
+{
+	float a[3], b[3], c[3], ab[3], cb[3], dir1[3], dir2[3];
+	float d;
+	
+	VecSubf(c, v3, v1);
+	VecSubf(a, v2, v1);
+	VecSubf(b, v4, v3);
+
+	VecCopyf(dir1, a);
+	Normalize(dir1);
+	VecCopyf(dir2, b);
+	Normalize(dir2);
+	d = Inpf(dir1, dir2);
+	if (d == 1.0f || d == -1.0f) {
+		/* colinear */
+		return 0;
+	}
+
+	Crossf(ab, a, b);
+	d = Inpf(c, ab);
+
+	/* test if the two lines are coplanar */
+	if (d > -0.000001f && d < 0.000001f) {
+		Crossf(cb, c, b);
+
+		VecMulf(a, Inpf(cb, ab) / Inpf(ab, ab));
+		VecAddf(i1, v1, a);
+		VecCopyf(i2, i1);
+		
+		return 1; /* one intersection only */
+	}
+	/* if not */
+	else {
+		float n[3], t[3];
+		float v3t[3], v4t[3];
+		VecSubf(t, v1, v3);
+
+		/* offset between both plane where the lines lies */
+		Crossf(n, a, b);
+		Projf(t, t, n);
+
+		/* for the first line, offset the second line until it is coplanar */
+		VecAddf(v3t, v3, t);
+		VecAddf(v4t, v4, t);
+		
+		VecSubf(c, v3t, v1);
+		VecSubf(a, v2, v1);
+		VecSubf(b, v4t, v3);
+
+		Crossf(ab, a, b);
+		Crossf(cb, c, b);
+
+		VecMulf(a, Inpf(cb, ab) / Inpf(ab, ab));
+		VecAddf(i1, v1, a);
+
+		/* for the second line, just substract the offset from the first intersection point */
+		VecSubf(i2, i1, t);
+		
+		return 2; /* two nearest points */
+	}
+} 
+
 int AabbIntersectAabb(float min1[3], float max1[3], float min2[3], float max2[3])
 {
 	return (min1[0]<max2[0] && min1[1]<max2[1] && min1[2]<max2[2] &&
diff --git a/source/blender/blenlib/intern/util.c b/source/blender/blenlib/intern/util.c
index 848e45ccb1b..48ebf770e1b 100644
--- a/source/blender/blenlib/intern/util.c
+++ b/source/blender/blenlib/intern/util.c
@@ -883,6 +883,15 @@ void BLI_cleanup_file(const char *relabase, char *dir)
 			dir = dir+2; /* skip the first // */
 		}
 	}
+	
+	/* Note
+	 *   memmove( start, eind, strlen(eind)+1 );
+	 * is the same as
+	 *   strcpy( start, eind ); 
+	 * except strcpy should not be used because there is overlap,
+	  * so use memmove's slightly more obscure syntax - Campbell
+	 */
+	
 #ifdef WIN32
 	if(dir[0]=='.') {	/* happens for example in FILE_MAIN */
 	   get_default_root(dir);
@@ -896,17 +905,21 @@ void BLI_cleanup_file(const char *relabase, char *dir)
 			if (dir[a] == '\\') break;
 			a--;
 		}
-		strcpy(dir+a,eind);
+		if (a<0) {
+			break;
+		} else {
+			memmove( dir+a, eind, strlen(eind)+1 );
+		}
 	}
 
 	while ( (start = strstr(dir,"\\.\\")) ){
 		eind = start + strlen("\\.\\") - 1;
-		strcpy(start,eind);
+		memmove( start, eind, strlen(eind)+1 );
 	}
 
 	while ( (start = strstr(dir,"\\\\" )) ){
 		eind = start + strlen("\\\\") - 1;
-		strcpy(start,eind);
+		memmove( start, eind, strlen(eind)+1 );
 	}
 
 	if((a = strlen(dir))){				/* remove the '\\' at the end */
@@ -929,17 +942,21 @@ void BLI_cleanup_file(const char *relabase, char *dir)
 			if (dir[a] == '/') break;
 			a--;
 		}
-		strcpy(dir+a,eind);
+		if (a<0) {
+			break;
+		} else {
+			memmove( dir+a, eind, strlen(eind)+1 );
+		}
 	}
 
 	while ( (start = strstr(dir,"/./")) ){
 		eind = start + strlen("/./") - 1;
-		strcpy(start,eind);
+		memmove( start, eind, strlen(eind)+1 );
 	}
 
 	while ( (start = strstr(dir,"//" )) ){
 		eind = start + strlen("//") - 1;
-		strcpy(start,eind);
+		memmove( start, eind, strlen(eind)+1 );
 	}
 
 	if( (a = strlen(dir)) ){				/* remove all '/' at the end */
@@ -1118,8 +1135,8 @@ int BLI_convertstringcode(char *path, const char *basepath)
 	char vol[3] = {'\0', '\0', '\0'};
 
 	BLI_strncpy(vol, path, 3);
-	wasrelative= (strncmp(vol, "//", 2)==0);
-
+	wasrelative= (vol[0]=='/' && vol[1]=='/');
+	
 #ifdef WIN32
 	/* we are checking here if we have an absolute path that is not in the current
 	   blend file as a lib main - we are basically checking for the case that a 
@@ -1156,7 +1173,7 @@ int BLI_convertstringcode(char *path, const char *basepath)
 
 	/* Paths starting with // will get the blend file as their base,
 	 * this isnt standard in any os but is uesed in blender all over the place */
-	if (tmp[0] == '/' && tmp[1] == '/') {
+	if (wasrelative) {
 		char *lslash= BLI_last_slash(base);
 		if (lslash) {
 			int baselen= (int) (lslash-base) + 1;
@@ -1705,6 +1722,7 @@ void BLI_where_am_i(char *fullname, const char *name)
 	path = br_find_exe( NULL );
 	if (path) {
 		strcpy(fullname, path);
+		free(path);
 		return;
 	}
 #endif
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 7d0dd9e41c1..3c629818b2d 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -2991,6 +2991,10 @@ static void lib_link_object(FileData *fd, Main *main)
 					bActionActuator *aa= act->data;
 					aa->act= newlibadr(fd, ob->id.lib, aa->act);
 				}
+				else if(act->type==ACT_SHAPEACTION) {
+					bActionActuator *aa= act->data;
+					aa->act= newlibadr(fd, ob->id.lib, aa->act);
+				}
 				else if(act->type==ACT_PROPERTY) {
 					bPropertyActuator *pa= act->data;
 					pa->ob= newlibadr(fd, ob->id.lib, pa->ob);
@@ -3007,6 +3011,9 @@ static void lib_link_object(FileData *fd, Main *main)
 					bParentActuator *parenta = act->data; 
 					parenta->ob = newlibadr(fd, ob->id.lib, parenta->ob);
 				}
+				else if(act->type==ACT_STATE) {
+					/* bStateActuator *statea = act->data; */
+				}
 				act= act->next;
 			}
 
@@ -3303,11 +3310,19 @@ static void direct_link_object(FileData *fd, Object *ob)
 	direct_link_constraints(fd, &ob->constraints);
 
 	link_glob_list(fd, &ob->controllers);
+	if (ob->init_state) {
+		/* if a known first state is specified, set it so that the game will start ok */
+		ob->state = ob->init_state;
+	} else if (!ob->state) {
+		ob->state = 1;
+	}
 	cont= ob->controllers.first;
 	while(cont) {
 		cont->data= newdataadr(fd, cont->data);
 		cont->links= newdataadr(fd, cont->links);
 		test_pointer_array(fd, (void **)&cont->links);
+		if (cont->state_mask == 0)
+			cont->state_mask = 1;
 		cont= cont->next;
 	}
 
@@ -7631,6 +7646,24 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 		}
 	}
 
+	/* sun/sky */
+	if ((main->versionfile < 246) ){
+		Lamp *la;
+		for(la=main->lamp.first; la; la= la->id.next) {
+			la->sun_effect_type = 0;
+			la->horizon_brightness = 1.0;
+			la->spread = 1.0;
+			la->sun_brightness = 1.0;
+			la->sun_size = 1.0;
+			la->backscattered_light = 1.0;
+			la->atm_turbidity = 2.0;
+			la->atm_inscattering_factor = 1.0;
+			la->atm_extinction_factor = 1.0;
+			la->atm_distance_factor = 1.0;
+			la->sun_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! */
 
@@ -8399,6 +8432,10 @@ static void expand_object(FileData *fd, Main *mainvar, Object *ob)
 			bActionActuator *aa= act->data;
 			expand_doit(fd, mainvar, aa->act);
 		}
+		else if(act->type==ACT_SHAPEACTION) {
+			bActionActuator *aa= act->data;
+			expand_doit(fd, mainvar, aa->act);
+		}
 		else if(act->type==ACT_PROPERTY) {
 			bPropertyActuator *pa= act->data;
 			expand_doit(fd, mainvar, pa->ob);
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index b4a9f225470..ca91f1dc346 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -603,6 +603,9 @@ static void write_sensors(WriteData *wd, ListBase *lb)
 		case SENS_PROPERTY:
 			writestruct(wd, DATA, "bPropertySensor", 1, sens->data);
 			break;
+		case SENS_ACTUATOR:
+			writestruct(wd, DATA, "bActuatorSensor", 1, sens->data);
+			break;
 		case SENS_COLLISION:
 			writestruct(wd, DATA, "bCollisionSensor", 1, sens->data);
 			break;
@@ -664,6 +667,7 @@ static void write_actuators(WriteData *wd, ListBase *lb)
 
 		switch(act->type) {
 		case ACT_ACTION:
+		case ACT_SHAPEACTION:
 			writestruct(wd, DATA, "bActionActuator", 1, act->data);
 			break;
 		case ACT_SOUND:
@@ -714,6 +718,9 @@ static void write_actuators(WriteData *wd, ListBase *lb)
 		case ACT_PARENT:
 			writestruct(wd, DATA, "bParentActuator", 1, act->data);
 			break;
+		case ACT_STATE:
+			writestruct(wd, DATA, "bStateActuator", 1, act->data);
+			break;
 		default:
 			; /* error: don't know how to write this file */
 		}
diff --git a/source/blender/imbuf/IMB_imbuf_types.h b/source/blender/imbuf/IMB_imbuf_types.h
index 94203bab447..73ef83393b0 100644
--- a/source/blender/imbuf/IMB_imbuf_types.h
+++ b/source/blender/imbuf/IMB_imbuf_types.h
@@ -149,6 +149,7 @@ typedef enum {
 #define IB_zbuffloat	(1 << 16)
 #define IB_multilayer	(1 << 17)
 #define IB_imginfo		(1 << 18)
+#define IB_animdeinterlace      (1 << 19)
 
 /*
  * The bit flag is stored in the ImBuf.ftype variable.
diff --git a/source/blender/imbuf/intern/IMB_anim.h b/source/blender/imbuf/intern/IMB_anim.h
index 71d35949833..7dc1f966b71 100644
--- a/source/blender/imbuf/intern/IMB_anim.h
+++ b/source/blender/imbuf/intern/IMB_anim.h
@@ -183,8 +183,9 @@ struct anim {
 	AVFormatContext *pFormatCtx;
 	AVCodecContext *pCodecCtx;
 	AVCodec *pCodec;
-	AVFrame *pFrameRGB;
 	AVFrame *pFrame;
+	AVFrame *pFrameRGB;
+	AVFrame *pFrameDeinterlaced;
 	struct SwsContext *img_convert_ctx;
 	int videoStream;
 #endif
diff --git a/source/blender/imbuf/intern/anim.c b/source/blender/imbuf/intern/anim.c
index 87d67f5263b..720f5b0f7c8 100644
--- a/source/blender/imbuf/intern/anim.c
+++ b/source/blender/imbuf/intern/anim.c
@@ -600,6 +600,7 @@ static int startffmpeg(struct anim * anim) {
 	anim->videoStream = videoStream;
 
 	anim->pFrame = avcodec_alloc_frame();
+	anim->pFrameDeinterlaced = avcodec_alloc_frame();
 	anim->pFrameRGB = avcodec_alloc_frame();
 
 	if (avpicture_get_size(PIX_FMT_BGR32, anim->x, anim->y)
@@ -609,10 +610,20 @@ static int startffmpeg(struct anim * anim) {
 		avcodec_close(anim->pCodecCtx);
 		av_close_input_file(anim->pFormatCtx);
 		av_free(anim->pFrameRGB);
+		av_free(anim->pFrameDeinterlaced);
 		av_free(anim->pFrame);
 		return -1;
 	}
 
+	if (anim->ib_flags & IB_animdeinterlace) {
+		avpicture_fill((AVPicture*) anim->pFrameDeinterlaced, 
+			       MEM_callocN(avpicture_get_size(
+						   anim->pCodecCtx->pix_fmt,
+						   anim->x, anim->y), 
+					   "ffmpeg deinterlace"), 
+			       anim->pCodecCtx->pix_fmt, anim->x, anim->y);
+	}
+
 	if (pCodecCtx->has_b_frames) {
 		anim->preseek = 25; /* FIXME: detect gopsize ... */
 	} else {
@@ -638,12 +649,13 @@ static ImBuf * ffmpeg_fetchibuf(struct anim * anim, int position) {
 	AVPacket packet;
 	int64_t pts_to_search = 0;
 	int pos_found = 1;
+	int filter_y = 0;
 
 	if (anim == 0) return (0);
 
 	ibuf = IMB_allocImBuf(anim->x, anim->y, 24, IB_rect, 0);
 
-	avpicture_fill((AVPicture *)anim->pFrameRGB, 
+	avpicture_fill((AVPicture*) anim->pFrameRGB, 
 		       (unsigned char*) ibuf->rect, 
 		       PIX_FMT_BGR32, anim->x, anim->y);
 
@@ -722,6 +734,32 @@ static ImBuf * ffmpeg_fetchibuf(struct anim * anim, int position) {
 			} 
 
 			if(frameFinished && pos_found == 1) {
+				AVFrame * input = anim->pFrame;
+
+				/* This means the data wasnt read properly, 
+				   this check stops crashing */
+				if (input->data[0]==0 && input->data[1]==0 
+				    && input->data[2]==0 && input->data[3]==0){
+					av_free_packet(&packet);
+					break;
+				}
+
+				if (anim->ib_flags & IB_animdeinterlace) {
+					if (avpicture_deinterlace(
+						    (AVPicture*) 
+						    anim->pFrameDeinterlaced,
+						    (const AVPicture*)
+						    anim->pFrame,
+						    anim->pCodecCtx->pix_fmt,
+						    anim->pCodecCtx->width,
+						    anim->pCodecCtx->height)
+					    < 0) {
+						filter_y = 1;
+					} else {
+						input = anim->pFrameDeinterlaced;
+					}
+				}
+
 				if (G.order == B_ENDIAN) {
 					int * dstStride 
 						= anim->pFrameRGB->linesize;
@@ -735,8 +773,8 @@ static ImBuf * ffmpeg_fetchibuf(struct anim * anim, int position) {
 					unsigned char* top;
 
 					sws_scale(anim->img_convert_ctx,
-						  anim->pFrame->data,
-						  anim->pFrame->linesize,
+						  input->data,
+						  input->linesize,
 						  0,
 						  anim->pCodecCtx->height,
 						  dst2,
@@ -793,27 +831,25 @@ static ImBuf * ffmpeg_fetchibuf(struct anim * anim, int position) {
 					int i;
 					unsigned char* r;
 					
-					/* This means the data wasnt read properly, this check stops crashing */
-					if (anim->pFrame->data[0]!=0 || anim->pFrame->data[1]!=0 || anim->pFrame->data[2]!=0 || anim->pFrame->data[3]!=0) {
 						
-						sws_scale(anim->img_convert_ctx,
-							  anim->pFrame->data,
-							  anim->pFrame->linesize,
-							  0,
-							  anim->pCodecCtx->height,
-							  dst2,
-							  dstStride2);
+					sws_scale(anim->img_convert_ctx,
+						  input->data,
+						  input->linesize,
+						  0,
+						  anim->pCodecCtx->height,
+						  dst2,
+						  dstStride2);
 					
-						/* workaround: sws_scale 
-						   sets alpha = 0... */
+					/* workaround: sws_scale 
+					   sets alpha = 0... */
 					
-						r = (unsigned char*) ibuf->rect;
-	
-						for (i = 0; i < ibuf->x * ibuf->y;i++){
-							r[3] = 0xff;
-							r+=4;
-						}
+					r = (unsigned char*) ibuf->rect;
+					
+					for (i = 0; i < ibuf->x * ibuf->y;i++){
+						r[3] = 0xff;
+						r+=4;
 					}
+					
 					av_free_packet(&packet);
 					break;
 				}
@@ -823,6 +859,10 @@ static ImBuf * ffmpeg_fetchibuf(struct anim * anim, int position) {
 		av_free_packet(&packet);
 	}
 
+	if (filter_y && ibuf) {
+		IMB_filtery(ibuf);
+	}
+
 	return(ibuf);
 }
 
@@ -834,6 +874,11 @@ static void free_anim_ffmpeg(struct anim * anim) {
 		av_close_input_file(anim->pFormatCtx);
 		av_free(anim->pFrameRGB);
 		av_free(anim->pFrame);
+
+		if (anim->ib_flags & IB_animdeinterlace) {
+			MEM_freeN(anim->pFrameDeinterlaced->data[0]);
+		}
+		av_free(anim->pFrameDeinterlaced);
 		sws_freeContext(anim->img_convert_ctx);
 	}
 	anim->duration = 0;
@@ -983,6 +1028,7 @@ struct ImBuf * IMB_anim_absolute(struct anim * anim, int position) {
 	char head[256], tail[256];
 	unsigned short digits;
 	int pic;
+	int filter_y = (anim->ib_flags & IB_animdeinterlace);
 
 	if (anim == NULL) return(0);
 
@@ -1040,6 +1086,7 @@ struct ImBuf * IMB_anim_absolute(struct anim * anim, int position) {
 	case ANIM_FFMPEG:
 		ibuf = ffmpeg_fetchibuf(anim, position);
 		if (ibuf) anim->curposition = position;
+		filter_y = 0; /* done internally */
 		break;
 #endif
 #ifdef WITH_REDCODE
@@ -1052,6 +1099,7 @@ struct ImBuf * IMB_anim_absolute(struct anim * anim, int position) {
 
 	if (ibuf) {
 		if (anim->ib_flags & IB_ttob) IMB_flipy(ibuf);
+		if (filter_y) IMB_filtery(ibuf);
 		sprintf(ibuf->name, "%s.%04d", anim->name, anim->curposition + 1);
 		
 	}
diff --git a/source/blender/imbuf/intern/cineon/dpxlib.c b/source/blender/imbuf/intern/cineon/dpxlib.c
index a81e632a797..500c09ba265 100644
--- a/source/blender/imbuf/intern/cineon/dpxlib.c
+++ b/source/blender/imbuf/intern/cineon/dpxlib.c
@@ -441,10 +441,15 @@ intern_dpxOpen(int mode, const char* bytestuff, int bufsize) {
 		default: break;
 		}
 	}
-	dpx->bitsPerPixel = 10;
-	/* dpx->bitsPerPixel = header.imageInfo.channel[0].bits_per_pixel; */
-	dpx->imageOffset = ntohl(header.fileInfo.offset);
+	/* dpx->bitsPerPixel = 10; */
+	dpx->bitsPerPixel = header.imageInfo.channel[0].bits_per_pixel;
+	if (dpx->bitsPerPixel != 10) {
+		if (verbose) d_printf("Don't support depth: %d\n", dpx->bitsPerPixel);
+		dpxClose(dpx);
+		return 0;
+	}
 
+	dpx->imageOffset = ntohl(header.fileInfo.offset);
 	dpx->lineBufferLength = pixelsToLongs(dpx->width * dpx->depth);
 	dpx->lineBuffer = malloc(dpx->lineBufferLength * 4);
 	if (dpx->lineBuffer == 0) {
@@ -471,6 +476,26 @@ intern_dpxOpen(int mode, const char* bytestuff, int bufsize) {
 	dpx->fileYPos = 0;
 
 	logImageGetByteConversionDefaults(&dpx->params);
+	/* The SMPTE define this code:
+	 *  2 - Linear
+	 *  3 - Logarithmic
+	 *
+	 * Note that transfer_characteristics is U8, don't need
+	 * check the byte order.
+	 */
+	switch (header.imageInfo.channel[0].transfer_characteristics) {
+		case 2:
+			dpx->params.doLogarithm= 0;
+			break;
+		case 3:
+			dpx->params.doLogarithm= 1;
+			break;
+		default:
+			if (verbose) d_printf("Un-supported Transfer Characteristics: %d\n", header.imageInfo.channel[0].transfer_characteristics);
+			dpxClose(dpx);
+			return 0;
+			break;
+	}
 	setupLut(dpx);
 
 	dpx->getRow = &dpxGetRowBytes;
@@ -563,6 +588,18 @@ dpxCreate(const char* filename, int width, int height, int depth) {
 		++shortFilename;
 	}
 	initDpxMainHeader(dpx, &header, shortFilename);
+	logImageGetByteConversionDefaults(&dpx->params);
+	/* Need set the file type before write the header!
+	 *  2 - Linear
+	 *  3 - Logarithmic
+	 *
+	 * Note that transfer characteristics is U8, don't need
+	 * check the byte order.
+	 */
+	if (dpx->params.doLogarithm == 0)
+		header.imageInfo.channel[0].transfer_characteristics= 2;
+	else
+		header.imageInfo.channel[0].transfer_characteristics= 3;
 
 	if (fwrite(&header, sizeof(header), 1, dpx->file) == 0) {
 		if (verbose) d_printf("Couldn't write image header\n");
@@ -570,8 +607,6 @@ dpxCreate(const char* filename, int width, int height, int depth) {
 		return 0;
 	}
 	dpx->fileYPos = 0;
-
-	logImageGetByteConversionDefaults(&dpx->params);
 	setupLut(dpx);
 
 	dpx->getRow = 0;
diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp
index b59908fef39..3e618a483e3 100644
--- a/source/blender/imbuf/intern/openexr/openexr_api.cpp
+++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp
@@ -451,7 +451,7 @@ void IMB_exr_begin_write(void *handle, char *filename, int width, int height, in
 	openexr_header_compression(&header, compress);
 	/* header.lineOrder() = DECREASING_Y; this crashes in windows for file read! */
 	
-	header.insert ("BlenderMultiChannel", StringAttribute ("Blender V2.43"));
+	header.insert ("BlenderMultiChannel", StringAttribute ("Blender V2.43 and newer"));
 	
 	data->ofile = new OutputFile(filename, header);
 }
@@ -842,7 +842,7 @@ typedef struct RGBA
 } RGBA;
 
 
-#if 0
+/* debug only */
 static void exr_print_filecontents(InputFile *file)
 {
 	const ChannelList &channels = file->header().channels();
@@ -853,7 +853,27 @@ static void exr_print_filecontents(InputFile *file)
 		printf("OpenEXR-load: Found channel %s of type %d\n", i.name(), channel.type);
 	}
 }
-#endif
+
+/* for non-multilayer, map  R G B A channel names to something that's in this file */
+static const char *exr_rgba_channelname(InputFile *file, const char *chan)
+{
+	const ChannelList &channels = file->header().channels();
+	
+	for (ChannelList::ConstIterator i = channels.begin(); i != channels.end(); ++i)
+	{
+		const Channel &channel = i.channel();
+		const char *str= i.name();
+		int len= strlen(str);
+		if(len) {
+			if(BLI_strcasecmp(chan, str+len-1)==0) {
+				return str;
+			}
+		}
+	}
+	return chan;
+}
+
+
 
 static int exr_has_zbuffer(InputFile *file)
 {
@@ -896,7 +916,8 @@ struct ImBuf *imb_load_openexr(unsigned char *mem, int size, int flags)
 		//printf("OpenEXR-load: image data window %d %d %d %d\n", 
 		//	   dw.min.x, dw.min.y, dw.max.x, dw.max.y);
 
-		// exr_print_filecontents(file);
+		if(0) // debug
+			exr_print_filecontents(file);
 		
 		is_multi= exr_is_renderresult(file);
 		
@@ -935,11 +956,15 @@ struct ImBuf *imb_load_openexr(unsigned char *mem, int size, int flags)
 					/* but, since we read y-flipped (negative y stride) we move to last scanline */
 					first+= 4*(height-1)*width;
 					
-					frameBuffer.insert ("R", Slice (FLOAT,  (char *) first, xstride, ystride));
-					frameBuffer.insert ("G", Slice (FLOAT,  (char *) (first+1), xstride, ystride));
-					frameBuffer.insert ("B", Slice (FLOAT,  (char *) (first+2), xstride, ystride));
-																			/* 1.0 is fill value */
-					frameBuffer.insert ("A", Slice (FLOAT,  (char *) (first+3), xstride, ystride, 1, 1, 1.0f));
+					frameBuffer.insert ( exr_rgba_channelname(file, "R"), 
+										Slice (FLOAT,  (char *) first, xstride, ystride));
+					frameBuffer.insert ( exr_rgba_channelname(file, "G"), 
+										Slice (FLOAT,  (char *) (first+1), xstride, ystride));
+					frameBuffer.insert ( exr_rgba_channelname(file, "B"), 
+										Slice (FLOAT,  (char *) (first+2), xstride, ystride));
+																			
+					frameBuffer.insert ( exr_rgba_channelname(file, "A"), 
+										Slice (FLOAT,  (char *) (first+3), xstride, ystride, 1, 1, 1.0f)); /* 1.0 is fill value */
 
 					if(exr_has_zbuffer(file)) 
 					{
diff --git a/source/blender/include/BDR_drawobject.h b/source/blender/include/BDR_drawobject.h
index 3f9a6e438cc..de28db64c3b 100644
--- a/source/blender/include/BDR_drawobject.h
+++ b/source/blender/include/BDR_drawobject.h
@@ -63,6 +63,7 @@ void get_local_bounds(struct Object *ob, float *center, float *size);
 /* drawing flags: */
 #define DRAW_PICKING	1
 #define DRAW_CONSTCOLOR	2
+#define DRAW_SCENESET	4
 void draw_object(struct Base *base, int flag);
 void drawaxes(float size, int flag, char drawtype);
 
diff --git a/source/blender/include/BDR_editcurve.h b/source/blender/include/BDR_editcurve.h
index 4604359fcc9..363a6567f3e 100644
--- a/source/blender/include/BDR_editcurve.h
+++ b/source/blender/include/BDR_editcurve.h
@@ -99,6 +99,7 @@ int bezt_compare (const void *e1, const void *e2);
 void setweightNurb( void );
 void setradiusNurb( void );
 void smoothradiusNurb( void );
+void smoothNurb( void );
 
 extern void undo_push_curve(char *name);
 
diff --git a/source/blender/include/BIF_butspace.h b/source/blender/include/BIF_butspace.h
index cbbd8013c82..f0b37814947 100644
--- a/source/blender/include/BIF_butspace.h
+++ b/source/blender/include/BIF_butspace.h
@@ -99,6 +99,8 @@ extern void validate_editbonebutton_cb(void *bonev, void *namev);
 #define BUTS_ACT_SEL		64
 #define BUTS_ACT_ACT		128
 #define BUTS_ACT_LINK		256
+#define BUTS_SENS_STATE		512
+#define BUTS_ACT_STATE		1024
 
 
 /* buttons grid */
diff --git a/source/blender/include/BIF_editaction.h b/source/blender/include/BIF_editaction.h
index 2d751f56fc5..7e0f703681b 100644
--- a/source/blender/include/BIF_editaction.h
+++ b/source/blender/include/BIF_editaction.h
@@ -141,6 +141,7 @@ void paste_actdata(void);
 /* Group/Channel Operations */
 struct bActionGroup *get_active_actiongroup(struct bAction *act);
 void set_active_actiongroup(struct bAction *act, struct bActionGroup *agrp, short select);
+void actionbone_group_copycolors(struct bActionGroup *grp, short init_new);
 void verify_pchan2achan_grouping(struct bAction *act, struct bPose *pose, char name[]);
 void sync_pchan2achan_grouping(void); 
 void action_groups_group(short add_group);
@@ -166,6 +167,7 @@ void deselect_action_channels(short mode);
 void deselect_actionchannels(struct bAction *act, short mode);
 int select_channel(struct bAction *act, struct bActionChannel *achan, int selectmode);
 void select_actionchannel_by_name(struct bAction *act, char *name, int select);
+void select_action_group_channels(struct bAction *act, struct bActionGroup *agrp);
 void selectkeys_leftright (short leftright, short select_mode);
 
 /* Action Markers */
diff --git a/source/blender/include/BIF_editarmature.h b/source/blender/include/BIF_editarmature.h
index 0e1557ac378..24112c7f11a 100644
--- a/source/blender/include/BIF_editarmature.h
+++ b/source/blender/include/BIF_editarmature.h
@@ -80,7 +80,7 @@ void	clear_armature(struct Object *ob, char mode);
 void	delete_armature(void);
 void	deselectall_armature(int toggle, int doundo);
 void	deselectall_posearmature (struct Object *ob, int test, int doundo);
-int		draw_armature(struct Base *base, int dt);
+int		draw_armature(struct Base *base, int dt, int flag);
 
 void	extrude_armature(int forked);
 void	subdivide_armature(int numcuts);
diff --git a/source/blender/include/BIF_interface.h b/source/blender/include/BIF_interface.h
index fbd4e4ecd91..3da4466d4d3 100644
--- a/source/blender/include/BIF_interface.h
+++ b/source/blender/include/BIF_interface.h
@@ -185,6 +185,7 @@ void uiDrawBlock(struct uiBlock *block);
 void uiGetMouse(int win, short *adr);
 void uiComposeLinks(uiBlock *block);
 void uiSetButLock(int val, char *lockstr);
+uiBut *uiFindInlink(uiBlock *block, void *poin);
 void uiClearButLock(void);
 int uiDoBlocks(struct ListBase *lb, int event, int movemouse_quit);
 void uiSetCurFont(uiBlock *block, int index);
diff --git a/source/blender/include/BIF_oops.h b/source/blender/include/BIF_oops.h
index f6984a23f47..2375a918d0e 100644
--- a/source/blender/include/BIF_oops.h
+++ b/source/blender/include/BIF_oops.h
@@ -39,6 +39,12 @@ struct Mesh;
 struct MetaBall;
 struct Object;
 struct Lamp;
+struct Camera;
+struct Texture;
+struct Lattice;
+struct bArmature;
+struct Tex;
+
 void add_curve_oopslinks(struct Curve *cu, struct Oops *oops, short flag);
 void add_from_link(struct Oops *from, struct Oops *oops);
 void add_material_oopslinks(struct Material *ma, struct Oops *oops, short flag);
@@ -46,6 +52,9 @@ void add_mball_oopslinks(struct MetaBall *mb, struct Oops *oops, short flag);
 void add_mesh_oopslinks(struct Mesh *me, struct Oops *oops, short flag);
 void add_object_oopslinks(struct Object *ob, struct Oops *oops, short flag);
 void add_lamp_oopslinks(struct Lamp *la, struct Oops *oops, short flag);
+void add_camera_oopslinks(struct Camera *ca, struct Oops *oops, short flag);
+void add_texture_oopslinks(struct Tex *tex, struct Oops *oops, short flag);
+void add_lattice_oopslinks(struct Lattice *lt, struct Oops *oops, short flag);
 struct Oops *add_oops(void *id);
 struct OopsLink *add_oopslink(char *name, struct Oops *oops, short type, void *from, float xof, float yof);
 struct Oops *add_test_oops(void *id);	/* incl links */
@@ -66,3 +75,4 @@ void test_oopslinko(struct OopsLink *ol);
 
 #endif
 
+
diff --git a/source/blender/include/BIF_resources.h b/source/blender/include/BIF_resources.h
index adddb0d1347..df514190270 100644
--- a/source/blender/include/BIF_resources.h
+++ b/source/blender/include/BIF_resources.h
@@ -293,7 +293,7 @@ typedef enum {
 	ICON_ARMATURE_DEHLT,
 	ICON_SNAP_GEAR,
 	ICON_SNAP_GEO,
-	ICON_BLANK41,
+	ICON_SNAP_NORMAL,
 	ICON_BLANK42,
 	
 	ICON_SMOOTHCURVE,
@@ -591,6 +591,9 @@ void	BIF_load_ui_colors		(void);
 char 	*BIF_ThemeGetColorPtr(struct bTheme *btheme, int spacetype, int colorid);
 char 	*BIF_ThemeColorsPup(int spacetype);
 
+/* only for Bone Color sets */
+char *BIF_ThemeColorSetsPup(short inc_custom);
+
 
 void	BIF_def_color			(BIFColorID colorid, unsigned char r, unsigned char g, unsigned char b);
 
diff --git a/source/blender/include/BSE_sequence.h b/source/blender/include/BSE_sequence.h
index 15a9218b735..0d96de7be60 100644
--- a/source/blender/include/BSE_sequence.h
+++ b/source/blender/include/BSE_sequence.h
@@ -92,6 +92,8 @@ void update_changed_seq_and_deps(struct Sequence *seq, int len_change, int ibuf_
 struct RenderResult;
 void do_render_seq(struct RenderResult *rr, int cfra);
 
+int seq_can_blend(struct Sequence *seq);
+
 #define SEQ_HAS_PATH(seq) (seq->type==SEQ_MOVIE || seq->type==SEQ_HD_SOUND || seq->type==SEQ_RAM_SOUND || seq->type==SEQ_IMAGE)
 
 #endif
diff --git a/source/blender/include/BSE_view.h b/source/blender/include/BSE_view.h
index 4b334fdd959..f7afce958f5 100644
--- a/source/blender/include/BSE_view.h
+++ b/source/blender/include/BSE_view.h
@@ -66,6 +66,8 @@ void project_int(float *vec, int *adr);
 void project_int_noclip(float *vec, int *adr);
 void project_float(float *vec, float *adr);
 void project_float_noclip(float *vec, float *adr);
+void viewray(short mval[2], float ray_start[3], float ray_normal[3]);
+void viewline(short mval[2], float ray_start[3], float ray_end[3]);
 
 int boundbox_clip(float obmat[][4], struct BoundBox *bb);
 void fdrawline(float x1, float y1, float x2, float y2);
diff --git a/source/blender/include/blendef.h b/source/blender/include/blendef.h
index a798224b35b..6f8b94d7cd1 100644
--- a/source/blender/include/blendef.h
+++ b/source/blender/include/blendef.h
@@ -409,6 +409,12 @@
 #define B_ACTCOPYKEYS		710
 #define B_ACTPASTEKEYS		711
 
+#define B_ACTCUSTCOLORS		712
+#define B_ACTCOLSSELECTOR	713
+#define B_ACTGRP_SELALL		714
+#define B_ACTGRP_ADDTOSELF	715
+#define B_ACTGRP_UNGROUP	716
+
 /* TIME: 751 - 800 */
 #define B_TL_REW		751
 #define B_TL_PLAY		752
diff --git a/source/blender/include/butspace.h b/source/blender/include/butspace.h
index 7571d64be91..c0542e3f34c 100644
--- a/source/blender/include/butspace.h
+++ b/source/blender/include/butspace.h
@@ -52,6 +52,8 @@ struct Image;
 #define BUTS_ACT_SEL		64
 #define BUTS_ACT_ACT		128
 #define BUTS_ACT_LINK		256
+#define BUTS_SENS_STATE		512
+#define BUTS_ACT_STATE		1024
 
 /* internal */
 
@@ -583,6 +585,8 @@ void curvemap_buttons(struct uiBlock *block, struct CurveMapping *cumap, char la
 #define B_SETACTOR		2715
 #define B_SETMAINACTOR		2716
 #define B_SETDYNA		2717
+#define B_SET_STATE_BIT	2718
+#define B_INIT_STATE_BIT	2719
 
 /* *********************** */
 #define B_FPAINTBUTS		2900
diff --git a/source/blender/include/transform.h b/source/blender/include/transform.h
index 82adb1ac12a..4e3b80134f9 100644
--- a/source/blender/include/transform.h
+++ b/source/blender/include/transform.h
@@ -75,6 +75,8 @@ typedef struct TransSnap {
 	int  	status;
 	float	snapPoint[3];
 	float	snapTarget[3];
+	float	snapNormal[3];
+	float	snapTangent[3];
 	float	dist; // Distance from snapPoint to snapTarget
 	double	last;
 	void  (*applySnap)(struct TransInfo *, float *);
@@ -100,9 +102,9 @@ typedef struct TransCon {
                          /* Apply function pointer for linear vectorial transformation                */
                          /* The last three parameters are pointers to the in/out/printable vectors    */
     void  (*applySize)(struct TransInfo *, struct TransData *, float [3][3]);
-                         /* Apply function pointer for rotation transformation (prototype will change */
-    void  (*applyRot)(struct TransInfo *, struct TransData *, float [3]);
-                         /* Apply function pointer for rotation transformation (prototype will change */
+                         /* Apply function pointer for size transformation */
+    void  (*applyRot)(struct TransInfo *, struct TransData *, float [3], float *);
+                         /* Apply function pointer for rotation transformation */
 } TransCon;
 
 typedef struct TransDataIpokey {
@@ -457,6 +459,8 @@ void applySnapping(TransInfo *t, float *vec);
 void resetSnapping(TransInfo *t);
 int  handleSnapping(TransInfo *t, int event);
 void drawSnapping(TransInfo *t);
+int usingSnappingNormal(TransInfo *t);
+int validSnappingNormal(TransInfo *t);
 
 /*********************** Generics ********************************/
 
@@ -487,6 +491,7 @@ void calculateCenterCursor2D(TransInfo *t);
 void calculatePropRatio(TransInfo *t);
 
 void getViewVector(float coord[3], float vec[3]);
+void getViewRay(short mval[2], float p[3], float d[3]);
 
 TransInfo * BIF_GetTransInfo(void);
 
diff --git a/source/blender/makesdna/DNA_actuator_types.h b/source/blender/makesdna/DNA_actuator_types.h
index e34b376737a..ac9761f165d 100644
--- a/source/blender/makesdna/DNA_actuator_types.h
+++ b/source/blender/makesdna/DNA_actuator_types.h
@@ -50,8 +50,10 @@ typedef struct bActionActuator {
 	short	type, flag;		/* Playback type */					
 	int	sta, end;		/* Start & End frames */			
 	char	name[32];		/* For property-driven playback */	
-	int	blendin;		/* Number of frames of blending */	
-	short	priority;		/* Execution priority */			
+	char	frameProp[32];	/* Set this property to the actions current frame */
+	short	blendin;		/* Number of frames of blending */
+	short	priority;		/* Execution priority */
+	short	end_reset;	/* Ending the actuator (negative pulse) wont reset the the action to its starting frame */
 	short	strideaxis;		/* Displacement axis */
 	float	stridelength;	/* Displacement incurred by cycle */
 } bActionActuator;												
@@ -80,7 +82,7 @@ typedef struct bEditObjectActuator {
 	char name[32];
 	float linVelocity[3]; /* initial lin. velocity on creation */
 	short localflag; /* flag for the lin. vel: apply locally   */
-	short pad;
+	short dyn_operation;
 } bEditObjectActuator;
 
 typedef struct bSceneActuator {
@@ -97,7 +99,8 @@ typedef struct bPropertyActuator {
 } bPropertyActuator;
 
 typedef struct bObjectActuator {
-	int flag, type;
+	short flag, type, otype;
+	short damping;
 	float forceloc[3], forcerot[3];
 	float loc[3], rot[3];
 	float dloc[3], drot[3];
@@ -122,10 +125,13 @@ typedef struct bCameraActuator {
 } bCameraActuator ;
 
 typedef struct bConstraintActuator {
+	short type, mode;
 	short flag, damp;
-	float slow;
+	short time, rotdamp;
+	int pad;
 	float minloc[3], maxloc[3];
 	float minrot[3], maxrot[3];
+	char matprop[32];
 } bConstraintActuator;
 
 typedef struct bGroupActuator {
@@ -191,10 +197,10 @@ typedef struct bVisibilityActuator {
 
 typedef struct bTwoDFilterActuator{
 	char pad[4];
-	/* Tells what type of 2D Filter*/
+	/* Tells what type of 2D Filter */
 	short type;
 	/* (flag == 0) means 2D filter is activate and
-	   (flag != 0) means 2D filter is inactive*/
+	   (flag != 0) means 2D filter is inactive */
 	short flag;
 	int   int_arg;
 	/* a float argument */
@@ -208,6 +214,11 @@ typedef struct bParentActuator {
 	struct Object *ob;
 } bParentActuator;
 
+typedef struct bStateActuator {
+	int type;			/* 0=Set, 1=Add, 2=Rem, 3=Chg */
+	unsigned int mask;	/* the bits to change */
+} bStateActuator;
+
 typedef struct bActuator {
 	struct bActuator *next, *prev, *mynew;
 	short type;
@@ -240,19 +251,19 @@ typedef struct FreeCamera {
 /* objectactuator->flag */
 #define ACT_FORCE_LOCAL			1
 #define ACT_TORQUE_LOCAL		2
+#define ACT_SERVO_LIMIT_X		2
 #define ACT_DLOC_LOCAL			4
+#define ACT_SERVO_LIMIT_Y		4
 #define ACT_DROT_LOCAL			8
+#define ACT_SERVO_LIMIT_Z		8
 #define ACT_LIN_VEL_LOCAL		16
 #define ACT_ANG_VEL_LOCAL		32
 //#define ACT_ADD_LIN_VEL_LOCAL	64
 #define ACT_ADD_LIN_VEL			64
 
-#define ACT_OBJECT_FORCE	0
-#define ACT_OBJECT_TORQUE	1
-#define ACT_OBJECT_DLOC		2
-#define ACT_OBJECT_DROT		3
-#define ACT_OBJECT_LINV		4
-#define ACT_OBJECT_ANGV		5
+/* objectactuator->type */
+#define ACT_OBJECT_NORMAL	0
+#define ACT_OBJECT_SERVO	1
 
 /* actuator->type */
 #define ACT_OBJECT		0
@@ -278,11 +289,15 @@ typedef struct FreeCamera {
 #define ACT_VISIBILITY          18
 #define ACT_2DFILTER	19
 #define ACT_PARENT      20
+#define ACT_SHAPEACTION 21
+#define ACT_STATE		22
 
 /* actuator flag */
 #define ACT_SHOW		1
 #define ACT_DEL			2
 #define ACT_NEW			4
+#define ACT_LINKED		8	
+#define ACT_VISIBLE		16	
 
 /* link codes */
 #define LINK_SENSOR		0
@@ -323,8 +338,9 @@ typedef struct FreeCamera {
 /* ipoactuator->flag */
 #define ACT_IPOFORCE        (1 << 0)
 #define ACT_IPOEND          (1 << 1)
-#define ACT_IPOFORCE_LOCAL  (1 << 2)
-#define ACT_IPOCHILD        (1 << 4)			
+#define ACT_IPOLOCAL		(1 << 2)
+#define ACT_IPOCHILD        (1 << 4)	
+#define ACT_IPOADD			(1 << 5)
 
 /* ipoactuator->flag for k2k */
 #define ACT_K2K_PREV		1
@@ -344,14 +360,31 @@ typedef struct FreeCamera {
 #define ACT_CONST_ROTX		8
 #define ACT_CONST_ROTY		16
 #define ACT_CONST_ROTZ		32
+#define ACT_CONST_NORMAL	64
+#define ACT_CONST_MATERIAL	128
+#define ACT_CONST_PERMANENT 256
+#define ACT_CONST_DISTANCE	512
+/* constraint mode */
+#define ACT_CONST_DIRPX		1
+#define ACT_CONST_DIRPY		2
+#define ACT_CONST_DIRPZ		4
+#define ACT_CONST_DIRMX		8
+#define ACT_CONST_DIRMY		16
+#define ACT_CONST_DIRMZ		32
+
+/* constraint type */
+#define ACT_CONST_TYPE_LOC	0
+#define ACT_CONST_TYPE_DIST	1
+#define ACT_CONST_TYPE_ORI	2
 
 /* editObjectActuator->type */
 #define ACT_EDOB_ADD_OBJECT		0
 #define ACT_EDOB_END_OBJECT		1
-#define ACT_EDOB_REPLACE_MESH	2
+#define ACT_EDOB_REPLACE_MESH		2
 #define ACT_EDOB_TRACK_TO		3
-#define ACT_EDOB_MAKE_CHILD		4
-#define ACT_EDOB_END_CHILD		5
+#define ACT_EDOB_DYNAMICS		4
+
+
 
 /* editObjectActuator->flag */
 #define ACT_TRACK_3D			1
diff --git a/source/blender/makesdna/DNA_controller_types.h b/source/blender/makesdna/DNA_controller_types.h
index 95c9b0d0cf7..376f95b0145 100644
--- a/source/blender/makesdna/DNA_controller_types.h
+++ b/source/blender/makesdna/DNA_controller_types.h
@@ -57,7 +57,7 @@ typedef struct bController {
 
 	struct bSensor **slinks;
 	short val, valo;
-	int pad5;
+	unsigned int state_mask;
 	
 } bController;
 
@@ -66,11 +66,16 @@ typedef struct bController {
 #define CONT_LOGIC_OR	1
 #define CONT_EXPRESSION	2
 #define CONT_PYTHON		3
+#define CONT_LOGIC_NAND	4
+#define CONT_LOGIC_NOR	5
+#define CONT_LOGIC_XOR	6
+#define CONT_LOGIC_XNOR	7
 
 /* controller->flag */
 #define CONT_SHOW		1
 #define CONT_DEL		2
 #define CONT_NEW		4
+#define CONT_MASK		8
 
 #endif
 
diff --git a/source/blender/makesdna/DNA_customdata_types.h b/source/blender/makesdna/DNA_customdata_types.h
index 73a39abac55..72557145270 100644
--- a/source/blender/makesdna/DNA_customdata_types.h
+++ b/source/blender/makesdna/DNA_customdata_types.h
@@ -26,6 +26,7 @@
  *
  * ***** END GPL LICENSE BLOCK *****
  */
+
 #ifndef DNA_CUSTOMDATA_TYPES_H
 #define DNA_CUSTOMDATA_TYPES_H
 
@@ -48,6 +49,7 @@ typedef struct CustomData {
 	CustomDataLayer *layers;  /* CustomDataLayers, ordered by type */
 	int totlayer, maxlayer;   /* number of layers, size of layers array */
 	int totsize, pad;         /* in editmode, total size of all data layers */
+	void *pool;		  /* for Bmesh: Memory pool for allocation of blocks*/
 } CustomData;
 
 /* CustomData.type */
@@ -66,7 +68,10 @@ typedef struct CustomData {
 #define CD_PROP_STR		12
 #define CD_ORIGSPACE	13 /* for modifier stack face location mapping */
 #define CD_ORCO			14
-#define CD_NUMTYPES		15
+#define CD_MTEXPOLY		15
+#define CD_MLOOPUV		16
+#define CD_MLOOPCOL		17
+#define CD_NUMTYPES		18
 
 /* Bits for CustomDataMask */
 #define CD_MASK_MVERT		(1 << CD_MVERT)
@@ -84,6 +89,9 @@ typedef struct CustomData {
 #define CD_MASK_PROP_STR	(1 << CD_PROP_STR)
 #define CD_MASK_ORIGSPACE	(1 << CD_ORIGSPACE)
 #define CD_MASK_ORCO		(1 << CD_ORCO)
+#define CD_MASK_MTEXPOLY	(1 << CD_MTEXPOLY)
+#define CD_MASK_MLOOPUV		(1 << CD_MLOOPUV)
+#define CD_MASK_MLOOPCOL	(1 << CD_MLOOPCOL)
 
 
 /* CustomData.flag */
diff --git a/source/blender/makesdna/DNA_lamp_types.h b/source/blender/makesdna/DNA_lamp_types.h
index 2afe78289c1..c00dae08eb4 100644
--- a/source/blender/makesdna/DNA_lamp_types.h
+++ b/source/blender/makesdna/DNA_lamp_types.h
@@ -76,6 +76,21 @@ typedef struct Lamp {
 	/* texact is for buttons */
 	short texact, shadhalostep;
 	
+	/* sun/sky */
+	short sun_effect_type;
+	short atm_pad[3];
+    float horizon_brightness;
+    float spread;
+    float sun_brightness;
+    float sun_size;
+    float backscattered_light;
+    float sun_intensity;
+	float atm_turbidity;
+    float atm_inscattering_factor;
+    float atm_extinction_factor;
+    float atm_distance_factor;
+
+
 	/* yafray: photonlight params */
 	int YF_numphotons, YF_numsearch;
 	short YF_phdepth, YF_useqmc, YF_bufsize, YF_pad;
@@ -123,6 +138,10 @@ typedef struct Lamp {
 /* Since it is used with LOCAL lamp, can't use LA_SHAD */
 #define LA_YF_SOFT		16384
 
+/* sun effect type*/
+#define LA_SUN_EFFECT_SKY			1
+#define LA_SUN_EFFECT_AP			2
+
 /* falloff_type */
 #define LA_FALLOFF_CONSTANT		0
 #define LA_FALLOFF_INVLINEAR		1
diff --git a/source/blender/makesdna/DNA_meshdata_types.h b/source/blender/makesdna/DNA_meshdata_types.h
index 79c1710a897..6d025839ac8 100644
--- a/source/blender/makesdna/DNA_meshdata_types.h
+++ b/source/blender/makesdna/DNA_meshdata_types.h
@@ -69,6 +69,21 @@ typedef struct MCol {
 	char a, r, g, b;	
 } MCol;
 
+/*bmesh custom data stuff*/
+typedef struct MTexPoly{
+	struct Image *tpage;
+	char flag, transp;
+	short mode,tile,unwrap;
+}MTexPoly;
+
+typedef struct MLoopUV{
+	float uv[2];
+}MLoopUV;
+
+typedef struct MLoopCol{
+	char a, r, g, b;
+}MLoopCol;
+
 typedef struct MSticky {
 	float co[2];
 } MSticky;
@@ -229,14 +244,16 @@ typedef struct PartialVisibility {
 #define TF_SHADOW		8192
 #define TF_BMFONT		16384
 
-/* mtface->transp */
+/* mtface->transp, values 1-4 are used as flags in the GL, WARNING, TF_SUB cant work with this */
 #define TF_SOLID	0
 #define TF_ADD		1
 #define TF_ALPHA	2
+#define TF_CLIP		4 /* clipmap alpha/binary alpha all or nothing! */
 
 /* sub is not available in the user interface anymore */
 #define TF_SUB		3
 
+
 /* mtface->unwrap */
 #define TF_DEPRECATED1	1
 #define TF_DEPRECATED2	2
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index fc015775f49..a44d9793062 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -176,6 +176,7 @@ typedef struct MirrorModifierData {
 #define MOD_MIR_AXIS_X		1<<3
 #define MOD_MIR_AXIS_Y		1<<4
 #define MOD_MIR_AXIS_Z		1<<5
+#define MOD_MIR_VGROUP		1<<6
 
 typedef struct EdgeSplitModifierData {
 	ModifierData modifier;
@@ -328,13 +329,14 @@ typedef struct WaveModifierData {
 	short flag, pad;
 
 	float startx, starty, height, width;
-	float narrow, speed, damp;
+	float narrow, speed, damp, falloff;
 
 	int texmapping, uvlayer_tmp;
 
 	char uvlayer_name[32];
-	
+
 	float timeoffs, lifetime;
+	float pad1;
 } WaveModifierData;
 
 typedef struct ArmatureModifierData {
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index 83168248b9a..c4e8cb4925b 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -216,7 +216,9 @@ typedef struct Object {
 
 	struct DerivedMesh *derivedDeform, *derivedFinal;
 	int lastDataMask;			/* the custom data layer mask that was last used to calculate derivedDeform and derivedFinal */
-	int pad;
+	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 pad2;
 
 /*#ifdef WITH_VERSE*/
 	void *vnode;			/* pointer at object VerseNode */
@@ -440,6 +442,8 @@ extern Object workob;
 #define OB_ADDCONT		512
 #define OB_ADDACT		1024
 #define OB_SHOWCONT		2048
+#define OB_SETSTBIT		4096
+#define OB_INITSTBIT	8192
 
 /* ob->restrictflag */
 #define OB_RESTRICT_VIEW	1
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index aae8a697cbe..75affbfa7f5 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -543,8 +543,8 @@ typedef struct Scene {
 	ListBase markers;
 	ListBase transform_spaces;
 	
-	short jumpframe, pad1;
-	short snap_flag, snap_target;
+	short jumpframe;
+	short snap_mode, snap_flag, snap_target;
 	
 	/* none of the dependancy graph  vars is mean to be saved */
 	struct  DagForest *theDag;
@@ -707,11 +707,16 @@ typedef struct Scene {
 
 /* scene->snap_flag */
 #define SCE_SNAP				1
+#define SCE_SNAP_ROTATE			2
 /* scene->snap_target */
 #define SCE_SNAP_TARGET_CLOSEST	0
 #define SCE_SNAP_TARGET_CENTER	1
 #define SCE_SNAP_TARGET_MEDIAN	2
 #define SCE_SNAP_TARGET_ACTIVE	3
+/* scene->snap_mode */
+#define SCE_SNAP_MODE_VERTEX	0
+#define SCE_SNAP_MODE_EDGE		1
+#define SCE_SNAP_MODE_FACE		2
 
 /* sce->selectmode */
 #define SCE_SELECT_VERTEX	1 /* for mesh */
diff --git a/source/blender/makesdna/DNA_sensor_types.h b/source/blender/makesdna/DNA_sensor_types.h
index 90e2b8f9f41..c0306f43730 100644
--- a/source/blender/makesdna/DNA_sensor_types.h
+++ b/source/blender/makesdna/DNA_sensor_types.h
@@ -82,6 +82,12 @@ typedef struct bPropertySensor {
     char maxvalue[32];
 } bPropertySensor;
 
+typedef struct bActuatorSensor {
+    int type;
+    int pad;
+	char name[32];
+} bActuatorSensor;
+
 typedef struct bCollisionSensor {
 	char name[32];          /* property name */
 	char materialName[32];  /* material      */
@@ -144,7 +150,7 @@ typedef struct bSensor {
 
 	/* just add here, to avoid align errors... */
 	short invert; /* Whether or not to invert the output. */
-	short freq2;  /* The negative pulsing frequency? Not used anymore... */
+	short level;  /* Whether the sensor is level base (edge by default) */
 	int pad;
 } bSensor;
 
@@ -197,11 +203,13 @@ typedef struct bJoystickSensor {
 #define SENS_RAY        9
 #define SENS_MESSAGE   10
 #define SENS_JOYSTICK  11
+#define SENS_ACTUATOR  12
 /* sensor->flag */
 #define SENS_SHOW		1
 #define SENS_DEL		2
 #define SENS_NEW		4
 #define SENS_NOT		8
+#define SENS_VISIBLE	16
 
 /* sensor->pulse */
 #define SENS_PULSE_CONT 	0
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index e4544d77634..36265e25996 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -232,8 +232,9 @@ typedef struct SpaceImage {
 	short imanr;
 	short curtile; /* the currently active tile of the image when tile is enabled, is kept in sync with the active faces tile */
 	int flag;
+	short selectmode;
 	short imtypenr, lock;
-	short pin, pad2;
+	short pin;
 	float zoom;
 	char dt_uv; /* UV draw type */
 	char sticky; /* sticky selection type */
@@ -496,6 +497,12 @@ typedef struct SpaceImaSel {
 #define SI_STICKY_DISABLE	1
 #define SI_STICKY_VERTEX	2
 
+/* SpaceImage->selectmode */
+#define SI_SELECT_VERTEX	0
+#define SI_SELECT_EDGE		1 /* not implemented */
+#define SI_SELECT_FACE		2
+#define SI_SELECT_ISLAND	3
+
 /* SpaceImage->flag */
 #define SI_BE_SQUARE	1<<0
 #define SI_EDITTILE		1<<1
@@ -503,7 +510,7 @@ typedef struct SpaceImaSel {
 #define SI_DRAWTOOL		1<<3
 #define SI_DEPRECATED1  1<<4	/* stick UVs to others in the same location */
 #define SI_DRAWSHADOW   1<<5
-#define SI_SELACTFACE   1<<6
+#define SI_SELACTFACE   1<<6	/* deprecated */
 #define SI_DEPRECATED2	1<<7
 #define SI_DEPRECATED3  1<<8	/* stick UV selection to mesh vertex (UVs wont always be touching) */
 #define SI_COORDFLOATS  1<<9
@@ -559,6 +566,7 @@ typedef struct SpaceImaSel {
 #define OOPS_IM		4096
 #define OOPS_AR		8192
 #define OOPS_GR		16384
+#define OOPS_CA		32768
 
 /* SpaceOops->outlinevis */
 #define SO_ALL_SCENES	0
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index acc1651e9fa..cd1c047dac9 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -116,6 +116,7 @@ typedef struct ThemeWireColor {
 
 /* flags for ThemeWireColor */
 #define TH_WIRECOLOR_CONSTCOLS	(1<<0)
+#define TH_WIRECOLOR_TEXTCOLS	(1<<1)
 
 /* A theme */
 typedef struct bTheme {
@@ -310,7 +311,7 @@ extern UserDef U; /* from usiblender.c !!!! */
 #define	USER_DUP_ACT			(1 << 10)
 
 /* gameflags */
-#define USER_VERTEX_ARRAYS		1
+#define USER_DEPRECATED_FLAG	1
 #define USER_DISABLE_SOUND		2
 #define USER_DISABLE_MIPMAP		4
 
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_gamma.c b/source/blender/nodes/intern/CMP_nodes/CMP_gamma.c
index ff9e2b716ce..e77de3726cb 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_gamma.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_gamma.c
@@ -47,7 +47,7 @@ static void do_gamma(bNode *node, float *out, float *in, float *fac)
 	int i=0;
 	for(i=0; i<3; i++) {
 		/* check for negative to avoid nan's */
-		out[i] = (in[0] > 0.0f)? pow(in[i],fac[0]): in[0];
+		out[i] = (in[i] > 0.0f)? pow(in[i],fac[0]): in[i];
 	}
 	out[3] = in[3];
 }
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_math.c b/source/blender/nodes/intern/CMP_nodes/CMP_math.c
index e317998b5fc..421c1343df7 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_math.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_math.c
@@ -57,7 +57,7 @@ static void do_math(bNode *node, float *out, float *in, float *in2)
 		break; 
 	case 3: /* Divide */
 		{
-			if(in[1]==0)	/* We don't want to divide by zero. */
+			if(in2[0]==0)	/* We don't want to divide by zero. */
 				out[0]= 0.0;
 			else
 				out[0]= in[0] / in2[0];
@@ -131,7 +131,23 @@ static void do_math(bNode *node, float *out, float *in, float *in2)
 		{
 				out[0]= (int)(in[0] + 0.5f);
 		}
-		break; 
+		break;
+	case 15: /* Less Than */
+		{
+			if( in[0] < in2[0] )
+				out[0]= 1.0f;
+			else
+				out[0]= 0.0f;
+		}
+		break;
+	case 16: /* Greater Than */
+		{
+			if( in[0] > in2[0] )
+				out[0]= 1.0f;
+			else
+				out[0]= 0.0f;
+		}
+		break;
 	}
 }
 
diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_math.c b/source/blender/nodes/intern/SHD_nodes/SHD_math.c
index 95162e508d5..2e156cf12bf 100644
--- a/source/blender/nodes/intern/SHD_nodes/SHD_math.c
+++ b/source/blender/nodes/intern/SHD_nodes/SHD_math.c
@@ -174,7 +174,23 @@ bNodeStack **out)
 			else
 				out[0]->vec[0]= (int)(in[1]->vec[0] + 0.5f);
 		}
-		break; 
+		break;
+	case 15: /* Less Than */
+		{
+			if( in[0]->vec[0] < in[1]->vec[0] )
+				out[0]->vec[0]= 1.0f;
+			else
+				out[0]->vec[0]= 0.0f;
+		}
+		break;
+	case 16: /* Greater Than */
+		{
+			if( in[0]->vec[0] > in[1]->vec[0] )
+				out[0]->vec[0]= 1.0f;
+			else
+				out[0]->vec[0]= 0.0f;
+		}
+		break;
 	} 
 }
 
diff --git a/source/blender/python/BPY_interface.c b/source/blender/python/BPY_interface.c
index e9600e9369f..2a6d28c8cb3 100644
--- a/source/blender/python/BPY_interface.c
+++ b/source/blender/python/BPY_interface.c
@@ -229,13 +229,6 @@ void BPY_start_python( int argc, char **argv )
 	/* Initialize thread support (also acquires lock) */
 	PyEval_InitThreads();
 
-	/* Don't allow the Python Interpreter to release the GIL on
-	 * its own, to guarantee PyNodes work properly. For Blender this
-	 * is currently the best default behavior.
-	 * The following code in C is equivalent in Python to:
-	 * "import sys; sys.setcheckinterval(sys.maxint)" */
-	_Py_CheckInterval = PyInt_GetMax();
-
 	//Overrides __import__
 	init_ourImport(  );
 	init_ourReload(  );
@@ -1183,13 +1176,17 @@ static void unlink_script( Script * script )
 				if( sl->spacetype == SPACE_SCRIPT ) {
 					SpaceScript *sc = ( SpaceScript * ) sl;
 
-					if( sc->script == script ) {
+					if( sc->script == script ) {					
 						sc->script = NULL;
 
-						if( sc ==
-						    area->spacedata.first ) {
-							scrarea_queue_redraw
-								( area );
+						if( sc == area->spacedata.first ) {
+							scrarea_queue_redraw( area );
+						}
+						
+						if (sc->but_refs) {
+							BPy_Set_DrawButtonsList(sc->but_refs);
+							BPy_Free_DrawButtonsList();
+							sc->but_refs = NULL;
 						}
 					}
 				}
@@ -2213,6 +2210,18 @@ void BPY_do_all_scripts( short event )
 
 	BPY_do_pyscript( &( G.scene->id ), event );
 
+	/* Don't allow the Python Interpreter to release the GIL on
+	 * its own, to guarantee PyNodes work properly. For Blender this
+	 * is currently the best default behavior.
+	 * The following code in C is equivalent in Python to:
+	 * "import sys; sys.setcheckinterval(sys.maxint)" */
+	if (event == SCRIPT_RENDER) {
+		_Py_CheckInterval = PyInt_GetMax();
+	}
+	else if (event == SCRIPT_POSTRENDER) {
+		_Py_CheckInterval = 100; /* Python default */
+	}
+
 	return;
 }
 
@@ -2295,9 +2304,9 @@ void BPY_do_pyscript( ID * id, short event )
 			return;
 		}
 		
-		/* tell we're running a scriptlink.  The sum also tells if this script
-		 * is running nested inside another.  Blender.Load needs this info to
-		 * avoid trouble with invalid slink pointers. */
+		/* tell we're running a scriptlink.  The sum also tells if this
+		 * script is running nested inside another.  Blender.Load needs
+		 * this info to avoid trouble with invalid slink pointers. */
 		during_slink++;
 		disable_where_scriptlink( (short)during_slink );
 
diff --git a/source/blender/python/api2_2x/CurNurb.c b/source/blender/python/api2_2x/CurNurb.c
index 174b5fb08dc..b2120bd63c6 100644
--- a/source/blender/python/api2_2x/CurNurb.c
+++ b/source/blender/python/api2_2x/CurNurb.c
@@ -53,6 +53,8 @@ static int CurNurb_setFlagU( BPy_CurNurb * self, PyObject * args );
 static PyObject *CurNurb_getFlagV( BPy_CurNurb * self );
 static PyObject *CurNurb_oldsetFlagV( BPy_CurNurb * self, PyObject * args );
 static int CurNurb_setFlagV( BPy_CurNurb * self, PyObject * args );
+static PyObject *CurNurb_getOrderU( BPy_CurNurb * self );
+static int CurNurb_setOrderU( BPy_CurNurb * self, PyObject * args );
 static PyObject *CurNurb_getType( BPy_CurNurb * self );
 static PyObject *CurNurb_oldsetType( BPy_CurNurb * self, PyObject * args );
 static int CurNurb_setType( BPy_CurNurb * self, PyObject * args );
@@ -176,6 +178,9 @@ static PyGetSetDef BPy_CurNurb_getseters[] = {
 	 (getter)CurNurb_getFlagV, (setter)CurNurb_setFlagV,
 	 "The knot type in the V direction",
 	 NULL},
+	{"orderU",
+	 (getter)CurNurb_getOrderU, (setter)CurNurb_setOrderU,
+	 "order setting for U direction", NULL},
 	{"type",
 	 (getter)CurNurb_getType, (setter)CurNurb_setType,
 	 "The curve type (poly: bezier, or NURBS)",
@@ -710,6 +715,35 @@ static int CurNurb_setFlagV( BPy_CurNurb * self, PyObject * args )
 	return 0;
 }
 
+static PyObject *CurNurb_getOrderU( BPy_CurNurb * self )
+{
+	return PyInt_FromLong( ( long ) self->nurb->orderu );
+}
+
+static int CurNurb_setOrderU( BPy_CurNurb * self, PyObject * args )
+{
+	int order;
+
+	args = PyNumber_Int( args );
+	if( !args )
+		return EXPP_ReturnIntError( PyExc_TypeError,
+			   "expected integer argument" );
+
+	order = ( int )PyInt_AS_LONG( args );
+	Py_DECREF( args );
+
+	if( order < 2 ) order = 2;
+	else if( order > 6 ) order = 6;
+
+	if( self->nurb->pntsu < order )
+		order = self->nurb->pntsu;
+
+	self->nurb->orderu = (short)order;
+	makeknots( self->nurb, 1, self->nurb->flagu >> 1 );
+
+	return 0;
+}
+
 /*
  * CurNurb_getIter
  *
diff --git a/source/blender/python/api2_2x/Lamp.c b/source/blender/python/api2_2x/Lamp.c
index ef3174ac4ed..53d25a6429d 100644
--- a/source/blender/python/api2_2x/Lamp.c
+++ b/source/blender/python/api2_2x/Lamp.c
@@ -1520,12 +1520,11 @@ static PyObject *Lamp_oldsetType( BPy_Lamp * self, PyObject * value )
 	char *type = PyString_AsString(value);
 	PyObject *arg, *error;
 
-	/* parse string argument */
-
-	if( !value )
-		return ( EXPP_ReturnPyObjError( PyExc_TypeError,
-						"expected string argument" ) );
-
+	/* parse string argument */	
+	if( !type ) 
+		return EXPP_ReturnPyObjError ( PyExc_TypeError,
+					       "expected string argument" );
+	
 	/* check for valid arguments, set type accordingly */
 
 	if( !strcmp( type, "Lamp" ) )
@@ -1546,7 +1545,7 @@ static PyObject *Lamp_oldsetType( BPy_Lamp * self, PyObject * value )
 
 	/* build tuple, call wrapper */
 
-	arg = Py_BuildValue( "(i)", type );
+	arg = Py_BuildValue( "(i)", self->lamp->type );
 	error = EXPP_setterWrapper ( (void *)self, arg, (setter)Lamp_setType );
 	Py_DECREF ( arg );
 	return error;
diff --git a/source/blender/python/api2_2x/Mathutils.c b/source/blender/python/api2_2x/Mathutils.c
index e63fc5ef38f..85c56a61628 100644
--- a/source/blender/python/api2_2x/Mathutils.c
+++ b/source/blender/python/api2_2x/Mathutils.c
@@ -725,28 +725,33 @@ PyObject *M_Mathutils_RotationMatrix(PyObject * self, PyObject * args)
 		vec->vec[0] /= norm;
 		vec->vec[1] /= norm;
 		vec->vec[2] /= norm;
-
-		//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;
+		
+		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;
+		}
 	} else {
 		return EXPP_ReturnPyObjError(PyExc_AttributeError,
 			"Mathutils.RotationMatrix(): unrecognizable axis of rotation type - expected x,y,z or r\n");
@@ -1447,8 +1452,8 @@ PyObject *M_Mathutils_LineIntersect( PyObject * self, PyObject * args )
 						"vectors must be of the same size\n" ) );
 
 	if( vec1->size == 3 || vec1->size == 2) {
-		float a[3], b[3], c[3], ab[3], cb[3], dir1[3], dir2[3];
-		float d;
+		int result;
+		
 		if (vec1->size == 3) {
 			VECCOPY(v1, vec1->vec);
 			VECCOPY(v2, vec2->vec);
@@ -1472,63 +1477,19 @@ PyObject *M_Mathutils_LineIntersect( PyObject * self, PyObject * args )
 			v4[1] = vec4->vec[1];
 			v4[2] = 0.0f;
 		}
+		
+		result = LineIntersectLine(v1, v2, v3, v4, i1, i2);
 
-		VecSubf(c, v3, v1);
-		VecSubf(a, v2, v1);
-		VecSubf(b, v4, v3);
-
-		VECCOPY(dir1, a);
-		Normalize(dir1);
-		VECCOPY(dir2, b);
-		Normalize(dir2);
-		d = Inpf(dir1, dir2);
-		if (d == 1.0f || d == -1.0f) {
+		if (result == 0) {
 			/* colinear */
 			return EXPP_incr_ret( Py_None );
 		}
-
-		Crossf(ab, a, b);
-		d = Inpf(c, ab);
-
-		/* test if the two lines are coplanar */
-		if (d > -0.000001f && d < 0.000001f) {
-			Crossf(cb, c, b);
-
-			VecMulf(a, Inpf(cb, ab) / Inpf(ab, ab));
-			VecAddf(i1, v1, a);
-			VECCOPY(i2, i1);
-		}
-		/* if not */
 		else {
-			float n[3], t[3];
-			VecSubf(t, v1, v3);
-
-			/* offset between both plane where the lines lies */
-			Crossf(n, a, b);
-			Projf(t, t, n);
-
-			/* for the first line, offset the second line until it is coplanar */
-			VecAddf(v3, v3, t);
-			VecAddf(v4, v4, t);
-			
-			VecSubf(c, v3, v1);
-			VecSubf(a, v2, v1);
-			VecSubf(b, v4, v3);
-
-			Crossf(ab, a, b);
-			Crossf(cb, c, b);
-
-			VecMulf(a, Inpf(cb, ab) / Inpf(ab, ab));
-			VecAddf(i1, v1, a);
-
-			/* for the second line, just substract the offset from the first intersection point */
-			VecSubf(i2, i1, t);
+			tuple = PyTuple_New( 2 );
+			PyTuple_SetItem( tuple, 0, newVectorObject(i1, vec1->size, Py_NEW) );
+			PyTuple_SetItem( tuple, 1, newVectorObject(i2, vec1->size, Py_NEW) );
+			return tuple;
 		}
-
-		tuple = PyTuple_New( 2 );
-		PyTuple_SetItem( tuple, 0, newVectorObject(i1, vec1->size, Py_NEW) );
-		PyTuple_SetItem( tuple, 1, newVectorObject(i2, vec1->size, Py_NEW) );
-		return tuple;
 	}
 	else {
 		return ( EXPP_ReturnPyObjError( PyExc_TypeError,
diff --git a/source/blender/python/api2_2x/doc/Curve.py b/source/blender/python/api2_2x/doc/Curve.py
index ba8d6d21970..765921665cd 100644
--- a/source/blender/python/api2_2x/doc/Curve.py
+++ b/source/blender/python/api2_2x/doc/Curve.py
@@ -535,6 +535,8 @@ class CurNurb:
 	@type flagU: int
 	@ivar flagV: The CurNurb knot flag V.  See L{setFlagU} for description.
 	@type flagV: int
+	@ivar orderU: The CurNurb knot order U, for nurbs curves only, this is clamped by the number of points, so the orderU will never be greater.
+	@type orderU: int
 	@ivar type: The type of the curve (Poly: 0, Bezier: 1, NURBS: 4)
 	@type type: int
 	@ivar knotsU: The knot vector in the U direction. The tuple will be empty
diff --git a/source/blender/python/api2_2x/doc/Render.py b/source/blender/python/api2_2x/doc/Render.py
index 475a4fc5b10..d4dc83e84a0 100644
--- a/source/blender/python/api2_2x/doc/Render.py
+++ b/source/blender/python/api2_2x/doc/Render.py
@@ -833,9 +833,7 @@ class RenderData:
 
   def enableCropping(toggle):
     """
-    Enable/disable exclusion of border rendering from total image.
-    @type toggle: int
-    @param toggle: pass 1 for on / 0 for off
+    Deprecated: see the L{crop} attribute.
     """
 
   def setImageType(type):
diff --git a/source/blender/python/api2_2x/matrix.c b/source/blender/python/api2_2x/matrix.c
index d81e56ec3dc..9f5e49e8d88 100644
--- a/source/blender/python/api2_2x/matrix.c
+++ b/source/blender/python/api2_2x/matrix.c
@@ -483,7 +483,7 @@ static char MatrixObject_doc[] = "This is a wrapper for matrix objects.";
   sequence length*/
 static int Matrix_len(MatrixObject * self)
 {
-	return (self->colSize * self->rowSize);
+	return (self->rowSize);
 }
 /*----------------------------object[]---------------------------
   sequence accessor (get)
diff --git a/source/blender/python/api2_2x/sceneRender.c b/source/blender/python/api2_2x/sceneRender.c
index b446af7efd4..d382d450970 100644
--- a/source/blender/python/api2_2x/sceneRender.c
+++ b/source/blender/python/api2_2x/sceneRender.c
@@ -985,7 +985,7 @@ PyObject *RenderData_EnableCropping( void )
 /*	return M_Render_BitToggleInt( args, R_MOVIECROP,
 				      &self->renderContext->mode );
 */
-	printf("cropping option is now default, obsolete\n");
+	printf("obsolete: movie cropping option is now default\n");
 	Py_RETURN_NONE;
 }
 
diff --git a/source/blender/python/api2_2x/sceneSequence.c b/source/blender/python/api2_2x/sceneSequence.c
index 56821980cd2..0d3ad3fcb44 100644
--- a/source/blender/python/api2_2x/sceneSequence.c
+++ b/source/blender/python/api2_2x/sceneSequence.c
@@ -81,6 +81,7 @@ returns None if notfound.\nIf 'name' is not specified, it returns a list of all
 static PyObject *Sequence_copy( BPy_Sequence * self );
 static PyObject *Sequence_new( BPy_Sequence * self, PyObject * args );
 static PyObject *Sequence_remove( BPy_Sequence * self, PyObject * args );
+static PyObject *Sequence_rebuildProxy( BPy_Sequence * self );
 
 static PyObject *SceneSeq_new( BPy_SceneSeq * self, PyObject * args );
 static PyObject *SceneSeq_remove( BPy_SceneSeq * self, PyObject * args );
@@ -96,6 +97,8 @@ static PyMethodDef BPy_Sequence_methods[] = {
 	 "() - Return a copy of the sequence containing the same objects."},
 	{"copy", ( PyCFunction ) Sequence_copy, METH_NOARGS,
 	 "() - Return a copy of the sequence containing the same objects."},
+	{"rebuildProxy", ( PyCFunction ) Sequence_rebuildProxy, METH_VARARGS,
+	 "() - Rebuild the active strip's Proxy."},
 	{NULL, NULL, 0, NULL}
 };
 
@@ -309,6 +312,7 @@ static PyObject *Sequence_copy( BPy_Sequence * self )
 	Py_RETURN_NONE;
 }
 
+
 /*****************************************************************************/
 /* PythonTypeObject callback function prototypes			 */
 /*****************************************************************************/
@@ -383,8 +387,6 @@ static PyObject *SceneSeq_nextIter( BPy_Sequence * self )
 }
 
 
-
-
 static PyObject *Sequence_getName( BPy_Sequence * self )
 {
 	return PyString_FromString( self->seq->name+2 );
@@ -403,11 +405,13 @@ static int Sequence_setName( BPy_Sequence * self, PyObject * value )
 	return 0;
 }
 
+
 static PyObject *Sequence_getProxyDir( BPy_Sequence * self )
 {
 	return PyString_FromString( self->seq->strip->proxy ? self->seq->strip->proxy->dir : "" );
 }
 
+
 static int Sequence_setProxyDir( BPy_Sequence * self, PyObject * value )
 {
 	char *name = NULL;
@@ -430,6 +434,14 @@ static int Sequence_setProxyDir( BPy_Sequence * self, PyObject * value )
 }
 
 
+static PyObject *Sequence_rebuildProxy( BPy_Sequence * self )
+{
+	if (self->seq->strip->proxy)
+		seq_proxy_rebuild(self->seq);
+	Py_RETURN_NONE;
+}
+
+
 static PyObject *Sequence_getSound( BPy_Sequence * self )
 {
 	if (self->seq->type == SEQ_RAM_SOUND && self->seq->sound)
@@ -622,6 +634,54 @@ static int Sequence_setImages( BPy_Sequence * self, PyObject *value )
 	return 0;
 }
 
+static PyObject *M_Sequence_BlendModesDict( void )
+{
+	PyObject *M = PyConstant_New(  );
+
+	if( M ) {
+		BPy_constant *d = ( BPy_constant * ) M;
+		PyConstant_Insert( d, "CROSS", PyInt_FromLong( SEQ_CROSS ) );
+		PyConstant_Insert( d, "ADD", PyInt_FromLong( SEQ_ADD ) );
+		PyConstant_Insert( d, "SUBTRACT", PyInt_FromLong( SEQ_SUB ) );
+		PyConstant_Insert( d, "ALPHAOVER", PyInt_FromLong( SEQ_ALPHAOVER ) );
+		PyConstant_Insert( d, "ALPHAUNDER", PyInt_FromLong( SEQ_ALPHAUNDER ) );
+		PyConstant_Insert( d, "GAMMACROSS", PyInt_FromLong( SEQ_GAMCROSS ) );
+		PyConstant_Insert( d, "MULTIPLY", PyInt_FromLong( SEQ_MUL ) );
+		PyConstant_Insert( d, "OVERDROP", PyInt_FromLong( SEQ_OVERDROP ) );
+		PyConstant_Insert( d, "PLUGIN", PyInt_FromLong( SEQ_PLUGIN ) );
+		PyConstant_Insert( d, "WIPE", PyInt_FromLong( SEQ_WIPE ) );
+		PyConstant_Insert( d, "GLOW", PyInt_FromLong( SEQ_GLOW ) );
+		PyConstant_Insert( d, "TRANSFORM", PyInt_FromLong( SEQ_TRANSFORM ) );
+		PyConstant_Insert( d, "COLOR", PyInt_FromLong( SEQ_COLOR ) );
+		PyConstant_Insert( d, "SPEED", PyInt_FromLong( SEQ_SPEED ) );
+	}
+	return M;
+}
+
+static PyObject *Sequence_getBlendMode( BPy_Sequence * self )
+{
+	return PyInt_FromLong( self->seq->blend_mode );
+}
+
+static int Sequence_setBlendMode( BPy_Sequence * self, PyObject * value )
+{
+	struct Sequence *seq= self->seq;
+	int number = PyInt_AsLong( value );
+	
+	if( number==-1 && PyErr_Occurred() )
+		return EXPP_ReturnIntError( PyExc_TypeError, "expected an int value" );
+	
+	if ( !seq_can_blend(seq) )
+		return EXPP_ReturnIntError( PyExc_AttributeError, "this sequence type dosnt support blending" );	
+	
+	if (number<SEQ_EFFECT || number>SEQ_EFFECT_MAX)
+		return EXPP_ReturnIntError( PyExc_TypeError, "expected an int value" );
+	
+	seq->blend_mode=number;
+	
+	return 0;
+}
+
 /*
  * get floating point attributes
  */
@@ -836,7 +896,11 @@ static PyGetSetDef BPy_Sequence_getseters[] = {
 	 (getter)Sequence_getImages, (setter)Sequence_setImages,
 	 "Sequence scene",
 	  NULL},
-	  
+	{"blendMode",
+	 (getter)Sequence_getBlendMode, (setter)Sequence_setBlendMode,
+	 "Sequence Blend Mode",
+	  NULL},
+
 	{"type",
 	 (getter)getIntAttr, (setter)NULL,
 	 "",
@@ -1131,6 +1195,7 @@ PyObject *M_Sequence_Get( PyObject * self, PyObject * args )
 /*****************************************************************************/
 PyObject *Sequence_Init( void )
 {
+	PyObject *BlendModesDict = M_Sequence_BlendModesDict( );
 	PyObject *submodule;
 	if( PyType_Ready( &Sequence_Type ) < 0 )
 		return NULL;
@@ -1142,6 +1207,9 @@ PyObject *Sequence_Init( void )
 "The Blender Sequence module\n\n\
 This module provides access to **Sequence Data** in Blender.\n" );
 
+	if( BlendModesDict )
+		PyModule_AddObject( submodule, "BlendModes", BlendModesDict );
+
 	/*Add SUBMODULES to the module*/
 	/*PyDict_SetItemString(dict, "Constraint", Constraint_Init()); //creates a *new* module*/
 	return submodule;
diff --git a/source/blender/radiosity/intern/source/radrender.c b/source/blender/radiosity/intern/source/radrender.c
index e5ef1e9a4a2..68b5fa81f43 100644
--- a/source/blender/radiosity/intern/source/radrender.c
+++ b/source/blender/radiosity/intern/source/radrender.c
@@ -369,9 +369,18 @@ printf(" Rad elems: %d emittors %d\n", RG.totelem, RG.totpatch);
 			if(vlr->mat->mode & MA_RADIO) {
 				
 				/* during render, vlr->n gets flipped/corrected, we cannot have that */
-				if(vlr->v4) CalcNormFloat4(vlr->v1->co, vlr->v2->co, vlr->v3->co, vlr->v4->co, rf->norm);
-				else CalcNormFloat(vlr->v1->co, vlr->v2->co, vlr->v3->co, rf->norm);
-				
+				if (obr->ob->transflag & OB_NEG_SCALE){
+					/* The object has negative scale that will cause the normals to flip.
+						 To counter this unwanted normal flip, swap vertex 2 and 4 for a quad
+						 or vertex 2 and 3 (see flip_face) for a triangle in the call to CalcNormFloat4 
+						 in order to flip the normals back to the way they were in the original mesh. */
+					if(vlr->v4) CalcNormFloat4(vlr->v1->co, vlr->v4->co, vlr->v3->co, vlr->v2->co, rf->norm);
+					else CalcNormFloat(vlr->v1->co, vlr->v3->co, vlr->v2->co, rf->norm);
+				}else{
+					if(vlr->v4) CalcNormFloat4(vlr->v1->co, vlr->v2->co, vlr->v3->co, vlr->v4->co, rf->norm);
+					else CalcNormFloat(vlr->v1->co, vlr->v2->co, vlr->v3->co, rf->norm);
+				}
+
 				rf->totrad[0]= vlr->mat->emit*vlr->mat->r;
 				rf->totrad[1]= vlr->mat->emit*vlr->mat->g;
 				rf->totrad[2]= vlr->mat->emit*vlr->mat->b;
diff --git a/source/blender/render/intern/include/pixelshading.h b/source/blender/render/intern/include/pixelshading.h
index ee7199a4295..15d696df89d 100644
--- a/source/blender/render/intern/include/pixelshading.h
+++ b/source/blender/render/intern/include/pixelshading.h
@@ -55,6 +55,7 @@ int shadeHaloFloat(HaloRen *har,
  */
 void shadeSkyPixel(float *collector, float fx, float fy);
 void shadeSkyView(float *colf, float *rco, float *view, float *dxyview);
+void shadeAtmPixel(struct SunSky *sunsky, float *collector, float fx, float fy, float distance);
 
 /* ------------------------------------------------------------------------- */
 
diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h
index 8414b6aefe3..2f97b19f75c 100644
--- a/source/blender/render/intern/include/render_types.h
+++ b/source/blender/render/intern/include/render_types.h
@@ -42,6 +42,7 @@
 
 #include "RE_pipeline.h"
 #include "RE_shader_ext.h"	/* TexResult, ShadeResult, ShadeInput */
+#include "sunsky.h"
 
 struct Object;
 struct MemArena;
@@ -455,6 +456,9 @@ typedef struct LampRen {
 	float area_size, area_sizey, area_sizez;
 	float adapt_thresh;
 
+	/* sun/sky */
+	struct SunSky *sunsky;
+	
 	struct ShadBuf *shb;
 	float *jitter;
 	
diff --git a/source/blender/render/intern/include/sunsky.h b/source/blender/render/intern/include/sunsky.h
new file mode 100644
index 00000000000..c61a637269a
--- /dev/null
+++ b/source/blender/render/intern/include/sunsky.h
@@ -0,0 +1,141 @@
+ /**
+ * ***** 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): zaghaghi
+ * 
+ * ***** END GPL LICENSE BLOCK *****
+ */
+/**
+ * This feature comes from Preetham paper on "A Practical Analytic Model for Daylight" 
+ * and example code from Brian Smits, another author of that paper in 
+ * http://www.cs.utah.edu/vissim/papers/sunsky/code/
+ * */
+#ifndef SUNSKY_H_
+#define SUNSKY_H_
+
+#define SPECTRUM_MAX_COMPONENTS     100
+#define SPECTRUM_START              350.0
+#define SPECTRUM_END                800.0
+
+typedef struct SunSky
+{
+    short effect_type;
+    float turbidity;
+    float theta, phi;
+    
+    float toSun[3];
+
+    /*float sunSpectralRaddata[SPECTRUM_MAX_COMPONENTS];*/
+    float sunSolidAngle;
+
+    float zenith_Y, zenith_x, zenith_y;
+    
+    float perez_Y[5], perez_x[5], perez_y[5];
+
+    /* suggested by glome in 
+     * http://projects.blender.org/tracker/?func=detail&atid=127&aid=8063&group_id=9*/
+    float horizon_brightness;
+    float spread;
+    float sun_brightness;
+    float sun_size;
+    float backscattered_light;
+    
+    float atm_HGg;
+
+    float atm_SunIntensity;
+    float atm_InscatteringMultiplier;
+    float atm_ExtinctionMultiplier;
+    float atm_BetaRayMultiplier;
+    float atm_BetaMieMultiplier;
+    float atm_DistanceMultiplier;
+
+    float atm_BetaRay[3];
+    float atm_BetaDashRay[3];
+    float atm_BetaMie[3];
+    float atm_BetaDashMie[3];
+    float atm_BetaRM[3];
+}SunSky;
+
+/**
+ * InitSunSky:
+ * this function compute some sun,sky parameters according to input parameters and also initiate some other sun, sky parameters
+ * parameters:
+ * sunSky, is a structure that contains informtion about sun, sky and atmosphere, in this function, most of its values initiated
+ * turb, is atmosphere turbidity
+ * toSun, contains sun direction
+ * horizon_brighness, controls the brightness of the horizon colors
+ * spread, controls colors spreed at horizon
+ * sun_brightness, controls sun's brightness
+ * sun_size, controls sun's size
+ * back_scatter, controls back scatter light
+ * */
+void InitSunSky(struct SunSky *sunsky, float turb, float *toSun, float horizon_brightness, 
+				float spread,float sun_brightness, float sun_size, float back_scatter);
+
+/**
+ * GetSkyXYZRadiance:
+ * this function compute sky radiance according to a view parameters `theta' and `phi'and sunSky values
+ * parameters:
+ * sunSky, sontains sun and sky parameters
+ * theta, is sun's theta
+ * phi, is sun's phi
+ * color_out, is computed color that shows sky radiance in XYZ color format
+ * */
+void GetSkyXYZRadiance(struct SunSky* sunsky, float theta, float phi, float color_out[3]);
+
+/**
+ * GetSkyXYZRadiancef:
+ * this function compute sky radiance according to a view direction `varg' and sunSky values
+ * parameters:
+ * sunSky, sontains sun and sky parameters
+ * varg, shows direction
+ * color_out, is computed color that shows sky radiance in XYZ color format
+ * */
+void GetSkyXYZRadiancef(struct SunSky* sunsky, const float varg[3], float color_out[3]);
+
+/**
+ * InitAtmosphere:
+ * this function intiate sunSky structure with user input parameters.
+ * parameters:
+ * sunSky, contains information about sun, and in this function some atmosphere parameters will initiated
+ * sun_intens, shows sun intensity value
+ * mief, Mie scattering factor this factor currently call with 1.0 
+ * rayf, Rayleigh scattering factor, this factor currently call with 1.0
+ * inscattf, inscatter light factor that range from 0.0 to 1.0, 0.0 means no inscatter light and 1.0 means full inscatter light
+ * extincf, extinction light factor that range from 0.0 to 1.0, 0.0 means no extinction and 1.0 means full extinction
+ * disf, is distance factor, multiplyed to pixle's z value to compute each pixle's distance to camera, 
+ * */
+void InitAtmosphere(struct SunSky *sunSky, float sun_intens, float mief, float rayf, float inscattf, float extincf, float disf);
+
+/**
+ * AtmospherePixleShader:
+ * this function apply atmosphere effect on a pixle color `rgb' at distance `s'
+ * parameters:
+ * sunSky, contains information about sun parameters and user values
+ * view, is camera view vector
+ * s, is distance 
+ * rgb, contains rendered color value for a pixle
+ * */
+void AtmospherePixleShader( struct SunSky* sunSky, float view[3], float s, float rgb[3]);
+
+/**
+ * ClipColor:
+ * clip a color to range [0,1];
+ * */
+void ClipColor(float c[3]);
+
+#endif /*SUNSKY_H_*/
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index 89a0a5ba7cb..faa7a68f754 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -114,6 +114,7 @@
 #include "sss.h"
 #include "strand.h"
 #include "zbuf.h"
+#include "sunsky.h"
 
 #ifndef DISABLE_YAFRAY /* disable yafray */
 
@@ -203,6 +204,7 @@ void RE_make_stars(Render *re, void (*initfunc)(void),
 	else stargrid *= 1.0;				/* then it draws fewer */
 	
 	if(re) MTC_Mat4Invert(mat, re->viewmat);
+	else MTC_Mat4One(mat);
 	
 	/* BOUNDING BOX CALCULATION
 		* bbox goes from z = loc_near_var | loc_far_var,
@@ -3494,6 +3496,7 @@ static GroupObject *add_render_lamp(Render *re, Object *ob)
 	LampRen *lar;
 	GroupObject *go;
 	float mat[4][4], angle, xn, yn;
+	float vec[3];
 	int c;
 
 	/* previewrender sets this to zero... prevent accidents */
@@ -3576,8 +3579,9 @@ static GroupObject *add_render_lamp(Render *re, Object *ob)
 	lar->ray_samp_type= la->ray_samp_type;
 	
 	lar->adapt_thresh= la->adapt_thresh;
+	lar->sunsky = NULL;
 	
-	if( ELEM3(lar->type, LA_SPOT, LA_SUN, LA_LOCAL)) {
+	if( ELEM(lar->type, LA_SPOT, LA_LOCAL)) {
 		lar->ray_totsamp= lar->ray_samp*lar->ray_samp;
 		lar->area_shape = LA_AREA_SQUARE;
 		lar->area_sizey= lar->area_size;
@@ -3607,6 +3611,26 @@ static GroupObject *add_render_lamp(Render *re, Object *ob)
 		area_lamp_vectors(lar);
 		init_jitter_plane(lar);	// subsamples
 	}
+	else if(lar->type==LA_SUN){
+		lar->ray_totsamp= lar->ray_samp*lar->ray_samp;
+		lar->area_shape = LA_AREA_SQUARE;
+		lar->area_sizey= lar->area_size;
+
+		if((la->sun_effect_type & LA_SUN_EFFECT_SKY) ||
+				(la->sun_effect_type & LA_SUN_EFFECT_AP)){
+			lar->sunsky = (struct SunSky*)MEM_callocN(sizeof(struct SunSky), "sunskyren");
+			lar->sunsky->effect_type = la->sun_effect_type;
+		
+			VECCOPY(vec,ob->obmat[2]);
+		    Normalize(vec);
+		    
+			InitSunSky(lar->sunsky, la->atm_turbidity, vec, la->horizon_brightness, 
+					la->spread, la->sun_brightness, la->sun_size, la->backscattered_light);
+			
+			InitAtmosphere(lar->sunsky, la->sun_intensity, 1.0, 1.0, la->atm_inscattering_factor, la->atm_extinction_factor,
+					la->atm_distance_factor);
+		}
+	}
 	else lar->ray_totsamp= 0;
 	
 #ifndef DISABLE_YAFRAY
@@ -4434,7 +4458,7 @@ void RE_Database_Free(Render *re)
 	LampRen *lar;
 	
 	/* statistics for debugging render memory usage */
-	if(G.f & G_DEBUG) {
+	if((G.f & G_DEBUG) && (G.rendering)) {
 		if((re->r.scemode & R_PREVIEWBUTS)==0) {
 			BKE_image_print_memlist();
 			MEM_printmemlist_stats();
@@ -4447,6 +4471,7 @@ void RE_Database_Free(Render *re)
 		freeshadowbuf(lar);
 		if(lar->jitter) MEM_freeN(lar->jitter);
 		if(lar->shadsamp) MEM_freeN(lar->shadsamp);
+		if(lar->sunsky) MEM_freeN(lar->sunsky);
 		curvemapping_free(lar->curfalloff);
 	}
 	
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index ebb52c49132..6a0af82b4d7 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -2675,9 +2675,9 @@ void RE_set_max_threads(int threads)
 
 void RE_init_threadcount(Render *re) 
 {
-	if ((re->r.mode & R_FIXED_THREADS)==0 || commandline_threads == 0) { /* Automatic threads */
+        if(commandline_threads >= 1) { /* only set as an arg in background mode */
+		re->r.threads= MIN2(commandline_threads, BLENDER_MAX_THREADS);
+	} else if ((re->r.mode & R_FIXED_THREADS)==0 || commandline_threads == 0) { /* Automatic threads */
 		re->r.threads = BLI_system_thread_count();
-	} else if(commandline_threads >= 1 && commandline_threads<=BLENDER_MAX_THREADS) {
-		re->r.threads= commandline_threads;
 	}
 }
diff --git a/source/blender/render/intern/source/pixelshading.c b/source/blender/render/intern/source/pixelshading.c
index fc5ac68e8c9..2e3509f0471 100644
--- a/source/blender/render/intern/source/pixelshading.c
+++ b/source/blender/render/intern/source/pixelshading.c
@@ -57,6 +57,7 @@
 #include "rendercore.h"
 #include "shadbuf.h"
 #include "pixelshading.h"
+#include "sunsky.h"
 
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 /* defined in pipeline.c, is hardcopy of active dynamic allocated Render */
@@ -567,13 +568,49 @@ void shadeSkyView(float *colf, float *rco, float *view, float *dxyview)
 	}
 }
 
+/* shade sky according to sun lamps, all parameters are like shadeSkyView except sunsky*/
+void shadeSunView(struct SunSky *sunsky, float *colf, float *rco, float *view, float *dxyview)
+{
+	float colorxyz[3];
+	float scale;
+			
+	/**
+	sunAngle = sqrt(sunsky->sunSolidAngle / M_PI);
+
+	sunDir[0] = sunsky->toSun[0];
+	sunDir[1] = sunsky->toSun[1];
+	sunDir[2] = sunsky->toSun[2];
+	*/
+			
+	Normalize(view);
+	MTC_Mat3MulVecfl(R.imat, view);
+	if (view[2] < 0.0)
+		view[2] = 0.0;
+	Normalize(view);
+	GetSkyXYZRadiancef(sunsky, view, colorxyz);
+	scale = MAX3(colorxyz[0], colorxyz[1], colorxyz[2]);
+	colorxyz[0] /= scale;
+	colorxyz[1] /= scale;
+	colorxyz[2] /= scale;
+	
+	xyz_to_rgb(colorxyz[0], colorxyz[1], colorxyz[2], &colf[0], &colf[1], &colf[2]);
+
+	ClipColor(colf);
+}
+
+
 /*
   Stuff the sky color into the collector.
  */
 void shadeSkyPixel(float *collector, float fx, float fy) 
 {
 	float view[3], dxyview[2];
-	
+	float sun_collector[3];
+	float suns_color[3];
+	short num_sun_lamp;
+	GroupObject *go;
+	LampRen *lar;
+
 	/*
 	  The rules for sky:
 	  1. Draw an image, if a background image was provided. Stop
@@ -585,7 +622,6 @@ void shadeSkyPixel(float *collector, float fx, float fy)
 	/* 1. Do a backbuffer image: */ 
 	if(R.r.bufflag & 1) {
 		fillBackgroundImage(collector, fx, fy);
-		return;
 	} 
 	else if((R.wrld.skytype & (WO_SKYBLEND+WO_SKYTEX))==0) {
 		/* 2. solid color */
@@ -620,7 +656,45 @@ void shadeSkyPixel(float *collector, float fx, float fy)
 		shadeSkyView(collector, NULL, view, dxyview);
 		collector[3] = 0.0f;
 	}
+		
+	suns_color[0] = suns_color[1] = suns_color[2] = 0;
+	num_sun_lamp = 0;
+	for(go=R.lights.first; go; go= go->next) {
+		lar= go->lampren;
+		if(lar->type==LA_SUN &&	lar->sunsky && (lar->sunsky->effect_type & LA_SUN_EFFECT_SKY)){
+
+			num_sun_lamp ++;
+			calc_view_vector(view, fx, fy);
+			Normalize(view);
+
+			shadeSunView(lar->sunsky, sun_collector, NULL, view, NULL);
+			suns_color[0] += sun_collector[0];
+			suns_color[1] += sun_collector[1];
+			suns_color[2] += sun_collector[2];
+
+		}
+	}
+	if( num_sun_lamp > 0 ){
+		suns_color[0] /= num_sun_lamp;
+		suns_color[1] /= num_sun_lamp;
+		suns_color[2] /= num_sun_lamp;
+
+		collector[0] += suns_color[0];
+		collector[1] += suns_color[1];
+		collector[2] += suns_color[2];
+		ClipColor(collector);
+	}
 }
 
+/* aerial perspective */
+void shadeAtmPixel(struct SunSky *sunsky, float *collector, float fx, float fy, float distance)
+{
+	float view[3];
+		
+	calc_view_vector(view, fx, fy);
+	Normalize(view);
+	/*MTC_Mat3MulVecfl(R.imat, view);*/
+	AtmospherePixleShader(sunsky, view, distance, collector);
+}
 
 /* eof */
diff --git a/source/blender/render/intern/source/rendercore.c b/source/blender/render/intern/source/rendercore.c
index dae7b0dcd88..4520e4c10bb 100644
--- a/source/blender/render/intern/source/rendercore.c
+++ b/source/blender/render/intern/source/rendercore.c
@@ -47,6 +47,7 @@
 #include "DNA_lamp_types.h"
 #include "DNA_material_types.h"
 #include "DNA_meshdata_types.h"
+#include "DNA_group_types.h"
 
 #include "BKE_global.h"
 #include "BKE_image.h"
@@ -665,6 +666,103 @@ static void sky_tile(RenderPart *pa, RenderLayer *rl)
 	}
 }
 
+static void atm_tile(RenderPart *pa, RenderLayer *rl)
+{
+	RenderPass *zpass;
+	GroupObject *go;
+	LampRen *lar;
+	RenderLayer *rlpp[RE_MAX_OSA];
+
+	int totsample, fullsample, sample;
+	int x, y,od;
+	short first_lamp;
+	float *zrect;
+	float *rgbrect;
+	float rgb[3]={0};
+	float tmp_rgb[3];
+	float fac;
+	float facm;
+	
+	fac = 0.5;
+	facm = 1.0 - fac;
+
+	totsample= get_sample_layers(pa, rl, rlpp);
+	fullsample= (totsample > 1);
+
+	/* check that z pass is enabled */
+	if(pa->rectz==NULL) return;
+	for(zpass= rl->passes.first; zpass; zpass= zpass->next)
+		if(zpass->passtype==SCE_PASS_Z)
+			break;
+	
+	if(zpass==NULL) return;
+
+	/* check for at least one sun lamp that its atmosphere flag is is enabled */
+	first_lamp = 1;
+	for(go=R.lights.first; go; go= go->next) {
+		lar= go->lampren;
+		if(lar->type==LA_SUN && lar->sunsky && 
+				(lar->sunsky->effect_type & LA_SUN_EFFECT_AP)){
+			first_lamp = 0;
+			break;
+		}
+	}
+	/* do nothign and return if there is no sun lamp */
+	if(first_lamp)
+		return;
+	
+	zrect = zpass->rect;
+	rgbrect = rl->rectf;
+	od=0;
+	/* for each x,y and sun lamp*/
+	for(y=pa->disprect.ymin; y<pa->disprect.ymax; y++) {
+		for(x=pa->disprect.xmin; x<pa->disprect.xmax; x++, zrect++, od++) {
+			
+			first_lamp = 1;
+			for(go=R.lights.first; go; go= go->next) {
+				lar= go->lampren;
+				if(lar->type==LA_SUN &&	lar->sunsky)
+					
+				{
+					/* if it's sky continue and don't apply atmosphere effect on it */
+					if(*zrect >= 9.9e10){
+						continue;
+					}
+
+					if(lar->sunsky->effect_type & LA_SUN_EFFECT_AP){	
+						VECCOPY(tmp_rgb, (float*)(rgbrect+4*od));
+
+						shadeAtmPixel(lar->sunsky, tmp_rgb, x, y, *zrect);
+						
+						if(first_lamp){
+							VECCOPY(rgb, tmp_rgb);
+							first_lamp = 0;						
+						}
+						else{
+							rgb[0] = facm*rgb[0] + fac*tmp_rgb[0];
+							rgb[1] = facm*rgb[1] + fac*tmp_rgb[1];
+							rgb[2] = facm*rgb[2] + fac*tmp_rgb[2];
+						}
+					}
+				}
+			}
+
+			/* if at least for one sun lamp aerial perspective was applied*/
+			if(first_lamp==0)
+			{
+				if(fullsample) {
+					for(sample=0; sample<totsample; sample++) {
+						VECCOPY((float*)(rlpp[sample]->rectf + od*4), rgb);
+					}
+				}
+				else {
+					VECCOPY((float*)(rgbrect+4*od), rgb);
+				}
+			}
+		}
+	}
+}
+
 static void shadeDA_tile(RenderPart *pa, RenderLayer *rl)
 {
 	RenderResult *rr= pa->result;
@@ -1122,6 +1220,10 @@ void zbufshadeDA_tile(RenderPart *pa)
 			if(R.r.mode & R_EDGE) 
 				edge_enhance_add(pa, rl->rectf, edgerect);
 		
+		/* sun/sky */
+		if(rl->layflag & SCE_LAY_SKY)
+			atm_tile(pa, rl);
+
 		if(rl->passflag & SCE_PASS_VECTOR)
 			reset_sky_speed(pa, rl);
 		
@@ -1282,6 +1384,10 @@ void zbufshade_tile(RenderPart *pa)
 					edge_enhance_add(pa, rl->rectf, edgerect);
 		}
 		
+		/* sun/sky */
+		if(rl->layflag & SCE_LAY_SKY)
+			atm_tile(pa, rl);
+			
 		if(rl->passflag & SCE_PASS_VECTOR)
 			reset_sky_speed(pa, rl);
 		
diff --git a/source/blender/render/intern/source/shadbuf.c b/source/blender/render/intern/source/shadbuf.c
index 796272eab2e..f3258b601de 100644
--- a/source/blender/render/intern/source/shadbuf.c
+++ b/source/blender/render/intern/source/shadbuf.c
@@ -636,7 +636,7 @@ static float readshadowbuf(ShadBuf *shb, ShadSampleBuf *shsample, int bias, int
 	else {
 		/* got warning on this for 64 bits.... */
 		/* but it's working code! in this case rz is not a pointer but zvalue (ton) */
- 		zsamp= (int) rz;
+ 		zsamp= GET_INT_FROM_POINTER(rz);
 	}
 
 	/* tricky stuff here; we use ints which can overflow easily with bias values */
@@ -816,7 +816,7 @@ static float readshadowbuf_halo(ShadBuf *shb, ShadSampleBuf *shsample, int xs, i
 	else {
 		/* same as before */
 		/* still working code! (ton) */
- 		zsamp= (int) rz;
+ 		zsamp= GET_INT_FROM_POINTER(rz);
 	}
 
 	/* NO schadow when sampled at 'eternal' distance */
diff --git a/source/blender/render/intern/source/sunsky.c b/source/blender/render/intern/source/sunsky.c
new file mode 100644
index 00000000000..191867765a3
--- /dev/null
+++ b/source/blender/render/intern/source/sunsky.c
@@ -0,0 +1,492 @@
+ /**
+ * ***** 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 LICENSE BLOCK *****
+ */
+
+
+#include "sunsky.h"
+#include "math.h"
+#include "BLI_arithb.h"
+
+
+/**
+ * These macros are defined for vector operations
+ * */
+
+/**
+ * compute v1 = v2 op v3
+ * v1, v2 and v3 are vectors contains 3 float
+ * */
+#define vec3opv(v1, v2, op, v3) \
+	v1[0] = (v2[0] op v3[0]); \
+	v1[1] = (v2[1] op v3[1]);\
+	v1[2] = (v2[2] op v3[2]);
+
+/**
+ * compute v1 = v2 op f1
+ * v1, v2 are vectors contains 3 float
+ * and f1 is a float
+ * */
+#define vec3opf(v1, v2, op, f1)\
+	v1[0] = (v2[0] op (f1));\
+	v1[1] = (v2[1] op (f1));\
+	v1[2] = (v2[2] op (f1));
+
+/**
+ * compute v1 = f1 op v2
+ * v1, v2 are vectors contains 3 float
+ * and f1 is a float
+ * */
+#define fopvec3(v1, f1, op, v2)\
+	v1[0] = ((f1) op v2[0]);\
+	v1[1] = ((f1) op v2[1]);\
+	v1[2] = ((f1) op v2[2]);
+
+/**
+ * ClipColor:
+ * clip a color to range [0,1];
+ * */
+void ClipColor(float c[3])
+{
+    if (c[0] > 1.0) c[0] = 1.0;
+    if (c[0] < 0.0) c[0] = 0.0;
+    if (c[1] > 1.0) c[1] = 1.0;
+    if (c[1] < 0.0) c[1] = 0.0;
+    if (c[2] > 1.0) c[2] = 1.0;
+    if (c[2] < 0.0) c[2] = 0.0;
+}
+
+/**
+ * AngleBetween:
+ * compute angle between to direction 
+ * all angles are in radians
+ * */
+static float AngleBetween(float thetav, float phiv, float theta, float phi)
+{
+	float cospsi = sin(thetav) * sin(theta) * cos(phi - phiv) + cos(thetav) * cos(theta);
+
+	if (cospsi > 1.0)
+		return 0;
+	if (cospsi < -1.0)
+		return M_PI;
+
+	return acos(cospsi);
+}
+
+/**
+ * DirectionToThetaPhi:
+ * this function convert a direction to it's theta and phi value
+ * parameters:
+ * toSun: contains direction information
+ * theta, phi, are return values from this conversion
+ * */
+static void DirectionToThetaPhi(float *toSun, float *theta, float *phi)
+{
+    *theta = acos(toSun[2]);
+    if (fabs(*theta) < 1e-5)
+    	*phi = 0;
+    else
+    	*phi = atan2(toSun[1], toSun[0]);
+}
+
+/**
+ * PerezFunction:
+ * compute perez function value based on input paramters
+ * */
+float PerezFunction(struct SunSky *sunsky, const float *lam, float theta, float gamma, float lvz)
+{
+    float den, num;
+
+    den = ((1 + lam[0] * exp(lam[1])) *
+                   (1 + lam[2] * exp(lam[3] * sunsky->theta) + lam[4] * cos(sunsky->theta) * cos(sunsky->theta)));
+
+    num = ((1 + lam[0] * exp(lam[1] / cos(theta))) *
+                   (1 + lam[2] * exp(lam[3] * gamma) + lam[4] * cos(gamma) * cos(gamma)));
+
+    return(lvz * num / den);
+}
+
+/**
+ * InitSunSky:
+ * this function compute some sun,sky parameters according to input parameters and also initiate some other sun, sky parameters
+ * parameters:
+ * sunSky, is a structure that contains informtion about sun, sky and atmosphere, in this function, most of its values initiated
+ * turb, is atmosphere turbidity
+ * toSun, contains sun direction
+ * horizon_brighness, controls the brightness of the horizon colors
+ * spread, controls colors spreed at horizon
+ * sun_brightness, controls sun's brightness
+ * sun_size, controls sun's size
+ * back_scatter, controls back scatter light
+ * */
+void InitSunSky(struct SunSky *sunsky, float turb, float *toSun, float horizon_brightness, 
+				float spread,float sun_brightness, float sun_size, float back_scatter)
+{
+    
+   	float theta2;
+	float theta3;
+	float T;
+	float T2;
+	float chi;
+        
+	sunsky->turbidity = turb;
+
+	sunsky->horizon_brightness = horizon_brightness;
+	sunsky->spread = spread;
+	sunsky->sun_brightness = sun_brightness;
+	sunsky->sun_size = sun_size;
+	sunsky->backscattered_light = back_scatter;
+	
+	sunsky->toSun[0] = toSun[0];
+    sunsky->toSun[1] = toSun[1];
+    sunsky->toSun[2] = toSun[2];
+
+    DirectionToThetaPhi(sunsky->toSun, &sunsky->theta, &sunsky->phi);
+
+	sunsky->sunSolidAngle = 0.25 * M_PI * 1.39 * 1.39 / (150 * 150);   // = 6.7443e-05
+
+	theta2 = sunsky->theta*sunsky->theta;
+	theta3 = theta2 * sunsky->theta;
+	T = turb;
+	T2 = turb*turb;
+
+	chi = (4.0 / 9.0 - T / 120.0) * (M_PI - 2 * sunsky->theta);
+	sunsky->zenith_Y = (4.0453 * T - 4.9710) * tan(chi) - .2155 * T + 2.4192;
+	sunsky->zenith_Y *= 1000;   // conversion from kcd/m^2 to cd/m^2
+
+	if (sunsky->zenith_Y<=0)
+		sunsky->zenith_Y = 1e-6;
+	
+	sunsky->zenith_x =
+	    ( + 0.00165 * theta3 - 0.00374 * theta2 + 0.00208 * sunsky->theta + 0) * T2 +
+	    ( -0.02902 * theta3 + 0.06377 * theta2 - 0.03202 * sunsky->theta + 0.00394) * T +
+	    ( + 0.11693 * theta3 - 0.21196 * theta2 + 0.06052 * sunsky->theta + 0.25885);
+
+	sunsky->zenith_y =
+	    ( + 0.00275 * theta3 - 0.00610 * theta2 + 0.00316 * sunsky->theta + 0) * T2 +
+	    ( -0.04214 * theta3 + 0.08970 * theta2 - 0.04153 * sunsky->theta + 0.00515) * T +
+	    ( + 0.15346 * theta3 - 0.26756 * theta2 + 0.06669 * sunsky->theta + 0.26688);
+
+	
+	sunsky->perez_Y[0] = 0.17872 * T - 1.46303;
+	sunsky->perez_Y[1] = -0.35540 * T + 0.42749;
+	sunsky->perez_Y[2] = -0.02266 * T + 5.32505;
+	sunsky->perez_Y[3] = 0.12064 * T - 2.57705;
+	sunsky->perez_Y[4] = -0.06696 * T + 0.37027;
+
+	sunsky->perez_x[0] = -0.01925 * T - 0.25922;
+	sunsky->perez_x[1] = -0.06651 * T + 0.00081;
+	sunsky->perez_x[2] = -0.00041 * T + 0.21247;
+	sunsky->perez_x[3] = -0.06409 * T - 0.89887;
+	sunsky->perez_x[4] = -0.00325 * T + 0.04517;
+
+	sunsky->perez_y[0] = -0.01669 * T - 0.26078;
+	sunsky->perez_y[1] = -0.09495 * T + 0.00921;
+	sunsky->perez_y[2] = -0.00792 * T + 0.21023;
+	sunsky->perez_y[3] = -0.04405 * T - 1.65369;
+	sunsky->perez_y[4] = -0.01092 * T + 0.05291;
+	
+    /* suggested by glome in 
+     * http://projects.blender.org/tracker/?func=detail&atid=127&aid=8063&group_id=9*/
+	sunsky->perez_Y[0] *= sunsky->horizon_brightness;
+	sunsky->perez_x[0] *= sunsky->horizon_brightness;
+	sunsky->perez_y[0] *= sunsky->horizon_brightness;
+	
+	sunsky->perez_Y[1] *= sunsky->spread;
+	sunsky->perez_x[1] *= sunsky->spread;
+	sunsky->perez_y[1] *= sunsky->spread;
+
+	sunsky->perez_Y[2] *= sunsky->sun_brightness;
+	sunsky->perez_x[2] *= sunsky->sun_brightness;
+	sunsky->perez_y[2] *= sunsky->sun_brightness;
+	
+	sunsky->perez_Y[3] *= sunsky->sun_size;
+	sunsky->perez_x[3] *= sunsky->sun_size;
+	sunsky->perez_y[3] *= sunsky->sun_size;
+	
+	sunsky->perez_Y[4] *= sunsky->backscattered_light;
+	sunsky->perez_x[4] *= sunsky->backscattered_light;
+	sunsky->perez_y[4] *= sunsky->backscattered_light;
+}
+
+/**
+ * GetSkyXYZRadiance:
+ * this function compute sky radiance according to a view parameters `theta' and `phi'and sunSky values
+ * parameters:
+ * sunSky, sontains sun and sky parameters
+ * theta, is sun's theta
+ * phi, is sun's phi
+ * color_out, is computed color that shows sky radiance in XYZ color format
+ * */
+void GetSkyXYZRadiance(struct SunSky* sunsky, float theta, float phi, float color_out[3])
+{
+    float gamma;
+    float x,y,Y,X,Z;
+    float hfade=1, nfade=1;
+    
+    
+    if (theta>(0.5*M_PI)) {
+		hfade = 1.0-(theta*M_1_PI-0.5)*2.0;
+		hfade = hfade*hfade*(3.0-2.0*hfade);
+		theta = 0.5*M_PI;
+	}
+
+	if (sunsky->theta>(0.5*M_PI)) {
+		if (theta<=0.5*M_PI) {
+			nfade = 1.0-(0.5-theta*M_1_PI)*2.0;
+			nfade *= 1.0-(sunsky->theta*M_1_PI-0.5)*2.0;
+			nfade = nfade*nfade*(3.0-2.0*nfade);
+		}
+	}
+
+	gamma = AngleBetween(theta, phi, sunsky->theta, sunsky->phi);
+	
+    // Compute xyY values
+    x = PerezFunction(sunsky, sunsky->perez_x, theta, gamma, sunsky->zenith_x);
+    y = PerezFunction(sunsky, sunsky->perez_y, theta, gamma, sunsky->zenith_y);
+    Y = nfade * hfade * PerezFunction(sunsky, sunsky->perez_Y, theta, gamma, sunsky->zenith_Y);
+
+    X = (x / y) * Y;
+    Z = ((1 - x - y) / y) * Y;
+
+    color_out[0] = X;
+    color_out[1] = Y;
+    color_out[2] = Z;
+}
+
+/**
+ * GetSkyXYZRadiancef:
+ * this function compute sky radiance according to a view direction `varg' and sunSky values
+ * parameters:
+ * sunSky, sontains sun and sky parameters
+ * varg, shows direction
+ * color_out, is computed color that shows sky radiance in XYZ color format
+ * */
+void GetSkyXYZRadiancef(struct SunSky* sunsky, const float varg[3], float color_out[3])
+{
+    float	theta, phi;
+    float	v[3];
+
+	VecCopyf(v, (float*)varg);
+	Normalize(v);
+
+    if (v[2] < 0.001){
+        v[2] = 0.001;
+        Normalize(v);
+    }
+
+    DirectionToThetaPhi(v, &theta, &phi);
+    GetSkyXYZRadiance(sunsky, theta, phi, color_out);
+}
+
+/**
+ * ComputeAttenuatedSunlight:
+ * this function compute attenuated sun light based on sun's theta and atmosphere turbidity
+ * parameters:
+ * theta, is sun's theta
+ * turbidity: is atmosphere turbidity
+ * fTau: contains computed attenuated sun light
+ * */
+void ComputeAttenuatedSunlight(float theta, int turbidity, float fTau[3])
+{
+    float fBeta ;
+    float fTauR, fTauA;
+    float m ;
+    float fAlpha;
+    
+    int i;
+    float fLambda[3]; 
+	fLambda[0] = 0.65f;	
+	fLambda[1] = 0.57f;	
+	fLambda[2] = 0.475f;
+
+	fAlpha = 1.3f;
+	fBeta = 0.04608365822050f * turbidity - 0.04586025928522f;
+	
+	m =  1.0/(cos(theta) + 0.15f*pow(93.885f-theta/M_PI*180.0f,-1.253f));  
+
+    for(i = 0; i < 3; i++)
+	{
+		// Rayleigh Scattering
+		fTauR = exp( -m * 0.008735f * pow(fLambda[i], (float)(-4.08f)));
+
+		// Aerosal (water + dust) attenuation
+		fTauA = exp(-m * fBeta * pow(fLambda[i], -fAlpha));  
+
+		fTau[i] = fTauR * fTauA; 
+    }
+}
+
+/**
+ * InitAtmosphere:
+ * this function intiate sunSky structure with user input parameters.
+ * parameters:
+ * sunSky, contains information about sun, and in this function some atmosphere parameters will initiated
+ * sun_intens, shows sun intensity value
+ * mief, Mie scattering factor this factor currently call with 1.0 
+ * rayf, Rayleigh scattering factor, this factor currently call with 1.0
+ * inscattf, inscatter light factor that range from 0.0 to 1.0, 0.0 means no inscatter light and 1.0 means full inscatter light
+ * extincf, extinction light factor that range from 0.0 to 1.0, 0.0 means no extinction and 1.0 means full extinction
+ * disf, is distance factor, multiplyed to pixle's z value to compute each pixle's distance to camera, 
+ * */
+void InitAtmosphere(struct SunSky *sunSky, float sun_intens, float mief, float rayf,
+							float inscattf, float extincf, float disf)
+{
+	const float pi = 3.14159265358f;
+	const float n = 1.003f; // refractive index
+	const float N = 2.545e25;
+	const float pn = 0.035f;
+	const float T = 2.0f;
+	float fTemp, fTemp2, fTemp3, fBeta, fBetaDash;
+	float c = (6.544*T - 6.51)*1e-17; 
+	float K[3] = {0.685f, 0.679f, 0.670f}; 
+	float vBetaMieTemp[3];
+	
+	float fLambda[3],fLambda2[3], fLambda4[3];
+	float vLambda2[3];
+	float vLambda4[3];
+	
+	int i;
+
+	sunSky->atm_SunIntensity = sun_intens;
+	sunSky->atm_BetaMieMultiplier  = mief;
+	sunSky->atm_BetaRayMultiplier = rayf;
+	sunSky->atm_InscatteringMultiplier = inscattf;
+	sunSky->atm_ExtinctionMultiplier = extincf;
+	sunSky->atm_DistanceMultiplier = disf;
+		
+	sunSky->atm_HGg=0.8;
+
+	fLambda[0]  = 1/650e-9f; 
+	fLambda[1]  = 1/570e-9f;
+	fLambda[2]  = 1/475e-9f;
+	for (i=0; i < 3; i++)
+	{
+		fLambda2[i] = fLambda[i]*fLambda[i];
+		fLambda4[i] = fLambda2[i]*fLambda2[i];
+	}
+
+	vLambda2[0] = fLambda2[0];
+	vLambda2[1] = fLambda2[1];
+	vLambda2[2] = fLambda2[2];
+ 
+	vLambda4[0] = fLambda4[0];
+	vLambda4[1] = fLambda4[1];
+	vLambda4[2] = fLambda4[2];
+
+	// Rayleigh scattering constants.
+	fTemp = pi*pi*(n*n-1)*(n*n-1)*(6+3*pn)/(6-7*pn)/N;
+	fBeta = 8*fTemp*pi/3;
+		
+	vec3opf(sunSky->atm_BetaRay, vLambda4, *, fBeta);
+	fBetaDash = fTemp/2;
+	vec3opf(sunSky->atm_BetaDashRay, vLambda4,*, fBetaDash);
+	
+
+	// Mie scattering constants.
+	fTemp2 = 0.434*c*(2*pi)*(2*pi)*0.5f;
+	vec3opf(sunSky->atm_BetaDashMie, vLambda2, *, fTemp2);
+	
+	fTemp3 = 0.434f*c*pi*(2*pi)*(2*pi);
+	
+	vec3opv(vBetaMieTemp, K, *, fLambda);
+	vec3opf(sunSky->atm_BetaMie, vBetaMieTemp,*, fTemp3);
+	
+}
+
+/**
+ * AtmospherePixleShader:
+ * this function apply atmosphere effect on a pixle color `rgb' at distance `s'
+ * parameters:
+ * sunSky, contains information about sun parameters and user values
+ * view, is camera view vector
+ * s, is distance 
+ * rgb, contains rendered color value for a pixle
+ * */
+void AtmospherePixleShader( struct SunSky* sunSky, float view[3], float s, float rgb[3])
+{
+	float costheta;
+	float Phase_1;
+	float Phase_2;
+	float sunColor[3];
+	
+	float E[3];
+	float E1[3];
+	
+	
+	float I[3];
+	float fTemp;
+	float vTemp1[3], vTemp2[3];
+
+	float sunDirection[3];
+	
+	s *= sunSky->atm_DistanceMultiplier;
+	
+	sunDirection[0] = sunSky->toSun[0];
+	sunDirection[1] = sunSky->toSun[1];
+	sunDirection[2] = sunSky->toSun[2];
+	
+	costheta = Inpf(view, sunDirection); // cos(theta)
+	Phase_1 = 1 + (costheta * costheta); // Phase_1
+	
+	vec3opf(sunSky->atm_BetaRay, sunSky->atm_BetaRay, *, sunSky->atm_BetaRayMultiplier);
+	vec3opf(sunSky->atm_BetaMie, sunSky->atm_BetaMie, *, sunSky->atm_BetaMieMultiplier);
+	vec3opv(sunSky->atm_BetaRM, sunSky->atm_BetaRay, +, sunSky->atm_BetaMie);
+	
+	//e^(-(beta_1 + beta_2) * s) = E1
+	vec3opf(E1, sunSky->atm_BetaRM, *, -s/log(2));
+	E1[0] = exp(E1[0]);
+	E1[1] = exp(E1[1]);
+	E1[2] = exp(E1[2]);
+
+	VecCopyf(E, E1);
+		
+	//Phase2(theta) = (1-g^2)/(1+g-2g*cos(theta))^(3/2)
+	fTemp = 1 + sunSky->atm_HGg - 2 * sunSky->atm_HGg * costheta;
+	fTemp = fTemp * sqrt(fTemp);
+	Phase_2 = (1 - sunSky->atm_HGg * sunSky->atm_HGg)/fTemp;
+	
+	vec3opf(vTemp1, sunSky->atm_BetaDashRay, *, Phase_1);
+	vec3opf(vTemp2, sunSky->atm_BetaDashMie, *, Phase_2);	
+
+	vec3opv(vTemp1, vTemp1, +, vTemp2);
+	fopvec3(vTemp2, 1.0, -, E1);
+	vec3opv(vTemp1, vTemp1, *, vTemp2);
+
+	fopvec3(vTemp2, 1.0, / , sunSky->atm_BetaRM);
+
+	vec3opv(I, vTemp1, *, vTemp2);
+		
+	vec3opf(I, I, *, sunSky->atm_InscatteringMultiplier);
+	vec3opf(E, E, *, sunSky->atm_ExtinctionMultiplier);
+		
+	//scale to color sun
+	ComputeAttenuatedSunlight(sunSky->theta, sunSky->turbidity, sunColor);
+	vec3opv(E, E, *, sunColor);
+
+	vec3opf(I, I, *, sunSky->atm_SunIntensity);
+
+	vec3opv(rgb, rgb, *, E);
+	vec3opv(rgb, rgb, +, I);
+}
+
+#undef vec3opv
+#undef vec3opf
+#undef fopvec3
+
+/* EOF */
diff --git a/source/blender/render/intern/source/zbuf.c b/source/blender/render/intern/source/zbuf.c
index 579905315bb..c91c9e2f799 100644
--- a/source/blender/render/intern/source/zbuf.c
+++ b/source/blender/render/intern/source/zbuf.c
@@ -3545,7 +3545,7 @@ void merge_transp_passes(RenderLayer *rl, ShadeResult *shr)
 	
 	for(rpass= rl->passes.first; rpass; rpass= rpass->next) {
 		float *col= NULL;
-		int pixsize= 0;
+		int pixsize= 3;
 		
 		switch(rpass->passtype) {
 			case SCE_PASS_RGBA:
@@ -3580,6 +3580,10 @@ void merge_transp_passes(RenderLayer *rl, ShadeResult *shr)
 				col= &shr->mist;
 				pixsize= 1;
 				break;
+			case SCE_PASS_Z:
+				col= &shr->z;
+				pixsize= 1;
+				break;
 			case SCE_PASS_VECTOR:
 				
 				{
@@ -3612,14 +3616,18 @@ void merge_transp_passes(RenderLayer *rl, ShadeResult *shr)
 			
 			for(samp= 1; samp<R.osa; samp++, fp+=delta) {
 				col[0]+= fp[0];
-				col[1]+= fp[1];
-				col[2]+= fp[2];
-				if(pixsize) col[3]+= fp[3];
+				if(pixsize>1) {
+					col[1]+= fp[1];
+					col[2]+= fp[2];
+					if(pixsize==4) col[3]+= fp[3];
+				}
 			}
 			col[0]*= weight;
-			col[1]*= weight;
-			col[2]*= weight;
-			if(pixsize) col[3]*= weight;
+			if(pixsize>1) {
+				col[1]*= weight;
+				col[2]*= weight;
+				if(pixsize==4) col[3]*= weight;
+			}
 		}
 	}
 				
@@ -3973,7 +3981,7 @@ unsigned short *zbuffer_transp_shade(RenderPart *pa, RenderLayer *rl, float *pas
 
 	/* general shader info, passes */
 	shade_sample_initialize(&ssamp, pa, rl);
-	addpassflag= rl->passflag & ~(SCE_PASS_Z|SCE_PASS_COMBINED);
+	addpassflag= rl->passflag & ~(SCE_PASS_COMBINED);
 	addzbuf= rl->passflag & SCE_PASS_Z;
 	
 	if(R.osa)
diff --git a/source/blender/src/CMakeLists.txt b/source/blender/src/CMakeLists.txt
index d6874cdd4db..342579fb3b0 100644
--- a/source/blender/src/CMakeLists.txt
+++ b/source/blender/src/CMakeLists.txt
@@ -35,7 +35,7 @@ SET(INC
   ../../kernel/gen_system ../../../intern/SoundSystem ../readstreamglue
   ../quicktime ../../../intern/elbeem/extern
   ../../../intern/ghost ../../../intern/opennl/extern
-  ../nodes
+  ../nodes ../../../extern/glew/include
   ${PYTHON_INC}
   ${SDL_INC}
 )
diff --git a/source/blender/src/Makefile b/source/blender/src/Makefile
index c1c0ef8b1f2..001efc58b5d 100644
--- a/source/blender/src/Makefile
+++ b/source/blender/src/Makefile
@@ -143,4 +143,5 @@ ifeq ($(NAN_TWEAK_MODE), true)
     CPPFLAGS += -DTWEAK_MODE
 endif
 
+CPPFLAGS += -I$(NAN_GLEW)/include
 CPPFLAGS += -I$(OPENGL_HEADERS)
diff --git a/source/blender/src/SConscript b/source/blender/src/SConscript
index f466798c40c..229cc87ef37 100644
--- a/source/blender/src/SConscript
+++ b/source/blender/src/SConscript
@@ -26,7 +26,7 @@ incs += ' #/intern/bsp/extern ../radiosity/extern/include'
 incs += ' #/intern/decimation/extern ../blenloader ../python'
 incs += ' ../../kernel/gen_system #/intern/SoundSystem ../readstreamglue ../nodes'
 incs += ' ../quicktime #/intern/elbeem/extern'
-incs += ' #/intern/ghost #/intern/opennl/extern'
+incs += ' #/intern/ghost #/intern/opennl/extern #/extern/glew/include'
 
 
 incs += ' ' + env['BF_PYTHON_INC']
diff --git a/source/blender/src/blenderbuttons.c b/source/blender/src/blenderbuttons.c
index 6c6afdef68c..e15ef3fd898 100644
--- a/source/blender/src/blenderbuttons.c
+++ b/source/blender/src/blenderbuttons.c
@@ -1,2165 +1,2181 @@
 /* DataToC output of file <blenderbuttons> */
 
-int datatoc_blenderbuttons_size= 69070;
+int datatoc_blenderbuttons_size= 69599;
 char datatoc_blenderbuttons[]= {
-137, 80, 78, 71, 13, 10, 26, 10,  0,  0,  0, 13, 73, 72,
- 68, 82,  0,  0,  2,  0,  0,  0,  1,  0,  8,  6,  0,  0,  0,197,144,206,103,  0,  0,  0,  6, 98, 75, 71, 68,  0,255,  0,255,  0,
-255,160,189,167,147,  0,  0,  0,  9,112, 72, 89,115,  0,  0, 11, 19,  0,  0, 11, 19,  1,  0,154,156, 24,  0,  0,  0,  7,116, 73,
- 77, 69,  7,216,  3, 21, 16,  3, 34,240,181, 88,200,  0,  0, 32,  0, 73, 68, 65, 84,120,218,236,125,121, 92, 84, 85,255,255,251,
-220,217,217,119, 84, 92, 64,197,125,197, 61,212,160,  7, 45,253,154,166,  2,102,182, 61,245,196,100,218,106,105, 86,207, 83,254,
-242,145,220, 90, 53, 29,159, 74,179,212, 18,212,180, 92, 18,116, 80, 67,114, 87, 44, 23, 20, 69,  4, 65,182, 97,102,152,253,206,
- 61,191, 63,102,134,134, 17,152,  5, 52,173,121,191,152, 23,115,239,220,249,204,185,247,156,243,121,127,150,179,144,  1,  3,  6,
- 80,120,225,133, 23, 94,120,225,133, 23,127, 43, 48,222, 71,224,133, 23, 94,120,225,133, 23,127, 31,156, 60,149, 13,  0, 32,222,
-  8,128, 23, 94,120,225,133, 23, 94,120, 35,  0, 94,120,225,133, 23, 94,120,225,133,215,  0,240,194, 11, 47,188,240,194, 11, 47,
-188,  6,128, 23, 94,120,225,133, 23, 94,120,241,151,  0,223,254, 96,230,204,153,196, 83, 65,171, 86,173,186,101, 44,129, 87,158,
- 87, 94, 51,160,171, 86,173,250,211,202,151,147,147, 67, 19, 18, 18,136,183, 62,238, 93,121,167, 79,159,246,184,241, 13, 24, 48,
-  0,222,250,240,202,251, 43,203,115,219,  0,248, 59, 67, 42,149, 54,120,128, 50,153,140,220,205,229, 92,189,122, 53,  8, 33,196,
- 91,115,158,213,241,244,233,211,145,153,153, 89,127,156,156,156,252,151,120,150,187,118,159,108, 86, 17,140, 31, 23,247,151,110,
- 51,146,224,109, 16,235,187, 34,  6, 70,212, 97, 55, 10,116,239,220,181,109,241,110,213, 49, 94,252, 77, 35,  0,119,162,177,238,
-218,181, 43, 97,251,246,237,114,219,241,164, 73,147, 18,199,143, 31,159,115, 55, 60, 12, 74, 45,186,243,110,229, 85,169, 84, 74,
-139,138,138,  0,  0,209,209,209,  0,112, 79, 40, 17, 71,227,202,106, 96, 53,233,153,187, 42,119,211,166, 77, 46, 27,106, 82,169,
-148,110,222,188,185,254,120,219,182,109, 24, 51,102, 76,253,113,102,102, 38,253,179,140,128, 65,131,  6, 81,  0, 56,113,226,  4,
-105,141,235,182,255, 32,107,198,  0,144,181,184,254,162, 98, 58,  0,  0,110,234,245, 96,117,  6,203,201, 90, 21,  0, 32, 37, 37,
-  5, 73, 73, 73, 77,150,111, 77,210, 26, 26, 91, 22,235,214,239, 39,254,158,232, 66,189, 72, 16,252,194, 89,232,183,111,131, 66,
- 49, 25, 10,  0,113,146,165,120, 71,114,  2, 29,196, 64,165,190, 16,239,232, 82,221,250,221,236,236,236,132,140,140, 12,185,253,
-185,148,148,148,196,164,164,164,156,187,169,111,181,150, 14,184, 23,238,247,118,224,189,183, 94, 34,126,130, 64, 98, 16, 11,169,
-161, 86,199,212,233, 84,220,135,159,174,248, 91,204,142,115,106,  0,236,218,181, 43,193,246,191,165, 68,109, 83, 36, 11, 54, 47,
-132, 95,135, 64,212, 93, 87,226,221,212,119,228,219,183,111,135,215, 26,118, 14,153, 76, 70,162,163,163,105, 81, 81, 17,138,138,
-138,176,103,207,158,187,214,147,176,213,181, 76, 38, 35, 50,153, 76, 32,149, 74, 77, 75,150, 44, 57,  6,  0,115,231,206, 29,210,
-220,119, 39, 79,158, 92,255,158,101,205, 48,154, 12, 48, 26,140, 48, 26, 45, 47,150,101, 49,119,238, 92,183,202, 98, 79,254,141,
- 97,204,152, 49,127,170, 17,224,138,241, 51,104,208, 32,167, 50,198,143,139, 35,158,144,188,203,  8, 10, 64,254,149,239, 32, 65,
-123,152,145,139,138, 47, 78,226, 76, 97, 53,166,124,176,214,165,175,199,150,197,186, 72,232, 22,200,123,203,157, 42, 98,201,248,
-119, 16, 50,233, 89,148,190, 18,  7,232, 20,245,231, 79,234,222,192, 73,  0,208,  1,163, 37, 41,216, 23,124,  2, 65,  0,  6, 41,
-  6,185,220,126, 29,145,145,145, 33,207,200,200,184, 43,244,149,173,140,173,161,  3,238,133,251,109,109,172, 95,185,138, 60, 30,
- 21,195,127, 41,249, 73, 94, 68,207, 40,134, 79, 34,136, 86,169,228,196,136, 52, 51,237,218,155,245, 55,174,154, 93,124,118, 55,
-220,208,225,237, 92,144, 55,199, 13,121,203,111,171,  1,176,125,251,118,249,230,127,191,133,212,247, 23,201,199,143, 31, 79, 90,
-210,192,108,196, 15,  0, 85,218,106, 32, 20,152,191,239, 61,168,174, 40, 32,125,238,238, 34,178,166, 58,196,159, 93, 70,123, 35,
-224,161,135, 30, 66, 81, 81, 17,162,163,163,239,186,103, 39,151, 91, 28,137,196,196, 68, 42,147,201, 24,153, 76, 22, 37,149, 74,
- 75,151, 44, 89,114,194, 85, 57, 44,203,194,104, 52,213, 19,191, 61,249, 31, 63,126, 28,131,  7, 15,118,171, 92,169,169,127,120,
-128,211,167, 79, 71, 86, 86, 86,  3,  3,160, 53,218,138, 39,245,112,226,196,  9,146,147,147, 67,199,142, 29,123,203,103,123,247,
-238,197,166, 77,155,234,143,155, 27,183,112,139,241,222,138,233,128,168,152, 14, 40, 85, 40,177,245,249,169,  8, 37,241, 40,252,
-223,235,232, 60,185, 51,178,220, 32,127, 27,210,210,210, 40,  0,172, 89,179,166,197,109, 54,106,115, 46,180,215,234, 80, 42,141,
-105,246,186,179,226,108, 44,232,123, 19,233,103,223,110, 81,125,182,  6,233,182,166,140,214,136,  4,220,238,251,109, 45,228,230,
-230,250,  0,184, 15,128,159,221,233, 90,  0,249,241,241,241, 53,174,202,209,113, 58,198, 88,101, 16,140,155, 56, 89,172,128, 73,
- 44, 16,240,249, 42,189,152, 17, 10,117, 28, 47,192,151, 53, 74, 76, 38,126,249, 13,131,152, 39,210,235,205,  6,179, 84, 42, 37,
-141,141, 25,177, 71,109,109,237,127,109,239, 11, 10, 10,170,124,125,125, 25,141, 70,195,217, 95, 51,116,232,208,143, 92, 45, 35,
-165,212, 41,177, 19, 66,230,180,244,153,242,157,121,255,221,186,117, 67,172, 95,  0, 90, 18,  5,176, 39,255, 42,109, 53,210,255,
-241, 94,253,103,255,220,254,  2, 16,  1, 76, 94,146,234, 86, 35,107,138,160, 91,139,164,175, 95,191, 14,  0,232,208,161, 67,131,
-247,182,223,117,214, 32,110,103,136,207,222,  8, 48,153, 88,172, 94,189,250,182,121,  1,238,202,116, 32,127,251,239,223,144,201,
-100,193, 82,169, 84,225, 50,249,155, 76, 48, 26, 13, 48, 24,141, 48, 57,144, 63,229,220,139,208,165,166,166,226,248,241,227,245,
-199,203,151, 47, 71,114,114,114,253,113,102,102,102,139,141, 29, 59,131,167,197,237,207,158,248,167, 79,159,142,129,  3,  7,122,
- 36,167,181,210,  1, 37, 87,138,161,217,246, 31,248, 61,243,  9,162, 98, 58, 32, 50, 84,130, 43,219,174, 88,200, 63, 40,192,146,
-  2, 16,240, 92,146,213, 26,196, 15,  0,221,206, 93,198,245,119, 23, 66,151,177,174,249,  8,129, 68,  2,189, 94,143,194,194, 66,
- 84,232, 47,162, 27,162,154,188, 54, 59, 59, 59,161,185,182, 47,147,201,136,173,159,100,103,103, 39,184, 19, 30,183,143,138,217,
-250,171,253, 57,119, 29,129,166,136,219, 29, 93,208,216,253,102,101,101, 81, 66,  8,146,146,146, 72, 75,238,215,134,103,159,125,
-150,126,249,229,151, 45,170,243,220,220,220, 64,  0,147,247,237,219,247, 31,142,227, 12,118, 36,200,231,241,120,190,  0,254, 21,
- 31, 31,191,203,153,156,130, 43,  5,124,137, 80, 44, 22,  8, 68,190, 12,159,  4, 80,158,200,135,227,241,248, 28, 97,192, 17,190,
-153,242,120,  6, 30, 71,244, 26,158, 89,235, 43, 20, 16, 94,151, 14,122,241,196,  8, 14,197,206,203,168, 80, 40, 84, 90,173,150,
-  5,  0,141, 70,195,189,245,214, 91,245,132,191,104,209,162, 87, 91,218,222,199,140, 25,243,188,237,125, 86, 86,214,234,214,232,
- 67,140, 51,239,127,225,180,100,232, 43, 43,241,122,239, 30,176,207,221,187,236,133, 88, 83,  8,246,228, 63,105,210,164, 68,153,
- 76, 70, 38, 77,154,148,184,118,210,231,150,200, 98,247,176,  6,215,187,130,185, 43, 11, 48,119,101,  1,102, 45, 59,143,167,222,
-255, 13, 83,230,159,110,241,  3, 41, 41, 41,113,201, 48,184, 83,228, 95, 84, 84,212, 36, 49, 71, 71, 71,195,100, 52, 98,216,208,
-161, 45,254, 29, 91,152,124,243,230,205,144,203,229,245,175,230, 12,173,166,200, 48, 49, 49,209,145,252,235, 13,101, 87, 20, 19,
-203,154, 45,158,191,193, 18,250,119, 36,127,179,217, 12,141, 78,227,214, 61,218, 34,  6,142, 81,131,204,204, 76,100,102,102, 54,
- 48,  6,220,186,223,156,134,250, 80,158,147,227,214, 51,107,142,252,167, 79,159,142, 37, 75,150,212,147,191,128, 47,112, 75,206,
-248,113,113,196,154,130,105,244,229,142, 44, 29,138, 81, 55,121, 24,104,198,235, 40,185, 82, 12, 58,185,231, 31,222, 74,198,235,
-224,183, 13,  7,130,130,238,168, 71,168,169, 42,132, 46, 99, 29, 40,165, 56,123,246, 44, 70,143, 30, 13,137, 68,210,128,248,131,
-131,131,161,211,233,160,211,233, 80, 90, 90,138,199,116, 47,225,139,224, 87,154,148,105,203,129, 55,247,124,108,159, 57,230,203,
- 93, 37,238,214,114, 86,108,223,117, 36,127,103, 14, 82,115,247,155,149,149, 69, 51, 51, 51,145,145,145,129,236,236,108,218,210,
-251,125,246,217,103, 41,159,207,199,179,207, 62,235,113,159,200,205,205, 21,  3,120, 46, 59, 59,251,173,247,223,127,255,  8, 33,
- 36,218,246,  2,208, 62, 52, 52,212,103,255,254,253,171,114,115,115, 71, 55, 39,199, 76, 57, 30,143,  8, 68, 70,150,  6, 24, 12,
-166,  8, 51,199,181, 55,115, 92,140,153,144,142,224,241, 66,  9, 33, 65, 32,188,  0,142, 34,132, 26,185, 32,149,206,228, 27, 17,
-192,242,152,161,106,151,234, 72,171,213,178,142, 94,255,221, 14,198, 21,239, 95, 91, 94,134,113,  3,227,220, 38,104,155, 17,177,
- 96,243, 66,  0,168, 39,127, 91, 20, 97,252,248,241, 57, 54, 35,160, 68,117,  3,113,115,135,187,101,100,104,116,102,104,116,102,
-148, 85, 27, 80, 90,169,199,245,155,122,143,136,207,214, 89,156,145,255,159,133,166,140,  0,  0,208, 27, 13,208,235,245, 30,203,
-182,145,182, 45, 71, 30, 30, 30,110,239,205,194, 85,101,226,232,  9, 55, 21, 74,116, 69,233, 25, 77,  6,139,231,111, 48,194,104,
-106, 72,254, 38,147,  9, 26,141,  6,106,149,250, 79,173, 19,139,193,148, 97, 31,144,179,253, 97,243,230, 12,143,141,  0,123,242,
-183, 17, 63,195, 48, 16,139,197,240,245,243,105, 81,153,119,237, 62, 73,155,122, 57,251,238,158,249,239, 33, 20,241, 96,147, 94,
-  4,  0,248,229, 93,198,153,194,106,139,193,150,244, 34, 76,103, 23,  0, 85,213,110,149, 39, 45, 45,141,218,210,  1,158,192, 23,
- 85,  0,128,117,235,214, 97,251,246,237, 88,186,116, 41,142, 30, 61, 10,131,193,128,138,138, 10,155, 87, 86,127,125, 84, 84, 20,
-116,  0,120,184,250,167,180,151,166,218,189,163, 55,239,169, 65,209, 88, 90,192, 93,121,246,145,176,140,140,140, 22,221,179,141,
-252,  1,192, 83, 35, 32, 55, 55,183,141,149,252,211,190,254,250,235,115,239,188,243,206, 35, 27, 55,110, 68,183,110,221,  0,  0,
-157, 58,117,130, 82,169, 20, 45, 88,176,224,196,254,253,251,191,205,205,205,141,110, 84, 16,  1,192, 81,  2,142, 21,155,205,108,
-136,153, 53,183, 55,153, 77, 93,121, 12,105, 39,228, 51,  2,177,128,167,227,251,  8,107,125,253,121, 42,158,152,178, 98, 30,207,
-151,207, 26,  3,174,158, 60, 37,122, 34,252, 99,167,229, 46, 40, 40,168,210,104, 52, 92, 99, 97,254,254,253,251, 95, 52, 26,141,
-173,214,150,250,247,239,223,106,178,248,205, 17,247,255,210,158,253,131,108, 75,174,227,245,222, 61,176,108,251,118,183,199,  2,
-216,188,127, 27,233, 55,240, 82,198,143,207,217,190,125, 59,  0, 32,180,111, 27,183, 10, 95,167, 51, 67,173,101,161,210,176, 80,
-214,177,168, 85,179,110, 63,128,198, 70,254,219,123,249,246,239,175, 92,185,130,218,218,218, 59,166, 52, 86,175, 94,141,232,232,
-104,216,  6,253,217,231,250,165, 82, 41, 93,189,122, 53,244, 58,157,199,  6,128, 84, 42,165,107,215,174, 69, 73,105, 41,  4, 60,
- 30, 34,219,180,105, 64,254,255,248,199, 63,144,154,154,234,146,114,146,201,100, 36, 49, 49,177,129, 17,224, 24,201,112,117,172,
-130,209, 96,132,209, 96,128,201,100,  4,203,154,235,201,223, 96, 48, 64,171,213,162,174,174, 14,106,181,251,  6,128,125, 10,192,
-  6, 79, 61,255,205, 25,155,  1, 10, 84, 89,137,134, 90, 26, 17,  8,165, 22, 35, 32, 35,  3,169, 41, 41,110,167,  3, 28,201, 95,
- 32, 16, 64, 36, 18, 65, 44, 22, 67, 44, 22,123,116,223, 13,250,117, 19, 41,  1,103, 41,173, 41,171,183,128, 78,140,193,205, 17,
-113,  8, 69, 60, 36, 83, 63,  3, 91, 86,  9,  4,  5,128, 95,189,  9, 63,125,124,  2,224,241,220, 42, 75, 75, 83,  1, 26,158, 69,
-167,164,167,167,163,178,178, 18,171, 86,173, 66,255,254,253,241,254,251,239, 35, 46, 46, 14, 58,157,206,209, 67,179,153,212,119,
-148,248, 93, 37,104, 79,211,  1, 77, 25, 18,158,200, 73, 73, 73,169, 39,126, 79,250, 70, 99,228, 95, 79, 54,124, 62, 88,150,117,
- 55, 29,224,159,159,159,255,233,204,153, 51, 15,246,237,219, 55,  0,  0,222,123,239, 61, 20, 20, 20,  0,  0,134, 15, 31,142,173,
- 91,183, 98,228,200,145,190,143, 61,246, 88, 97, 78, 78, 78, 54,143,199,123,236, 86, 69, 15,132,132,134,112, 87,174, 20,178, 57,
-242,125,187,187,118,141,205,137,233, 20,125,142,231, 47,169,224, 17,161,134, 17,  9,180,140,216, 71,109,228,243,140,160, 38, 30,
- 39, 54,249,171, 75,171,253,142,238, 63, 61, 52, 44, 56,114,171, 83, 99,212, 46,231,191,109,219,182,167, 38, 79,158,252,181, 45,
-236,175, 82,169, 24,161, 80,216,226,182,212, 90, 97,127,167, 17,  0,155,151, 63,184, 75, 44,244,149,149,208,148, 88, 72,112,180,
-213, 59,116, 55, 10,112,229,183,203,183,200,110,236,184,250,108,185, 91,133,111, 41,249,219, 19, 63,165, 20, 29, 58,116,104,240,
-153,201,100,170,127,213,214,214, 66,163,209,160,166,166,230,142, 41, 15,219, 60,255, 61,123,246, 52,136,  4,216,200,191, 95,191,
-126,208,235,117,245,138,142,218,172, 25, 23, 21,211,202,207, 87,194,100, 50,161,125, 84, 20, 76,102,115,163,228,239,142, 34,177,
- 26,  1,183,120, 37,182,169,139,205, 69, 50,110, 49,  0,140,166,122,242, 63,118,244, 24,180, 58, 29,212,106, 53,148, 74, 37,106,
-107,107, 27,120,118,238,194,150,  6,240, 52,239, 15,  0,213, 85,213,168,174,174, 66, 85,117, 13,170,170,171, 81, 93, 93,141,234,
- 42,139, 71,218,163,103, 79,212, 88,223,187,235,253,  3,192,192,129,  3,255,240,250,125,125,225,231,231, 15,127, 63,127,168,213,
-234,196,150,180,167,230, 82,  2,206,190, 91,184, 52, 13,130,169,159, 33, 20,241,224,231,125,  6,211,150, 23,129,160,  0,236,120,
- 33, 25,215,118, 92,197,195, 75,214,  3,252, 59,188,172,136,254, 26, 36, 81, 18,104, 52, 26,232,245,122,104,181, 90,228,229,229,
-225,131, 15, 62,104,244,114, 31, 31, 91,  4,229,178,219,228,237,169, 87,109,255,124, 29,159,119, 83,199, 45, 49, 50, 26, 75, 11,
-184, 35, 39, 41, 41,137,164,164,164, 32, 57, 57, 25, 99,198,140,241, 56, 50,241,229,151, 95, 18,150,109,168,147, 89,150,133,187,
- 99,  1,226,227,227, 47,165,164,164,244,223,184,113,227,232, 67,135, 14,249, 39, 37, 37, 29,181,145,191,213, 81,133, 72, 36,162,
-215,174, 93, 19,236,222,189,187,123,112,112,240,177,248,248,248,194,198,100, 41,107,149, 92,108, 76, 55,245,240,225,195,147,207,
-157,251,253,  1,149, 70,221,134,178, 38, 22, 12, 76,172,129, 49, 24, 12,  6,157, 10,229, 42,206,160, 87,151, 22,151,179, 63,237,
-220,181, 56, 44, 52,188,194,104,212, 58,117,223, 27,243,254, 21, 10,  5, 31,  0,  2,  2,  2,238,218,180,  0,211,148,247,191,249,
-223,111, 89,172,230,242,178,  6,159,185, 59, 22, 96,210,164, 73,137, 43,159,251,  4,128,101,192,223,246,237,219,229,246, 83, 11,
-183,111,223, 46, 31,243,205, 35,  0,128,147, 75,126,197,164, 73,147, 18,239,212,205,219,119,146,146,146,146,122,111,223, 70,250,
-118,149, 11,181, 90, 13,189, 94,111,167, 68,238, 92, 25,159,127,222, 50,246,195,196,178, 56,119,238, 28, 78,157, 60,137,254,253,
-250, 67,175,215, 67,167,211, 67,175,211,225,219,111,190,129,237, 58, 87, 58,250,242,229,203,209,171,103, 47,152, 76, 38, 92,186,
-116,  9,172,201,136,210,146,210, 86,125,166,182, 99,235,154,  5,136,142,142,118, 73, 49, 25, 77,  6,176,102, 75,216,255,200,145,
- 95,161,209,105, 80,167, 86, 65,169, 84, 66, 81, 91, 11,133,162,166, 69,134,152, 45, 18,208, 18, 15,231,224,193,131, 80,171,213,
- 80,171, 85,214,255,106,132,133,134,162, 71,207,158,184,112,254, 60, 14, 28, 60,232,182, 76,155,247,207,231, 11,224,227,227,  3,
- 63, 63, 63,248,251,249,193,207,207,  7, 53,138,154, 68,  0, 57,183, 59,212,223, 20,206, 20, 86,195,116,118,  1,170,145, 11, 50,
-126, 25, 72,252,127, 80,184, 52, 13, 19,151,124, 13,177,128,  1,  4,124,203,203,  3,120,154, 10, 40,157,240, 57, 66, 54, 77,128,
- 86,171, 69, 72, 72,  8, 20, 10,  5, 20, 10,  5, 14, 31, 62,140,178,178,178,250, 48,113,253,245,165,165,120, 33, 88,130, 48,159,
-202,230, 60,224, 68,123, 82,181, 31, 36,103,123,111,251,204,118,173, 39,222,185,171,233,  1, 87,201,223, 83,207,191,177,251, 77,
- 74, 74, 34, 99,198,140, 33, 45,185, 95, 71, 35,192, 19,242,183, 33, 44, 44, 44,255,145, 71, 30,121, 44, 61, 61,189,251,153, 51,
-103,226, 37, 18,  9,111,226,196,137, 68, 36, 18,129,227, 56, 50,126,252,248,252,151, 95,126,185, 95,159, 62,125,118,252,235, 95,
-255,122,202,108, 54, 87, 55, 19,243,230,126, 63,127,233, 88,159,190,253, 30, 63,118,244,232,148, 29, 59,127, 92,116,252,232,209,
- 54,231, 10, 46,136, 47,149, 22,210,111, 63,249, 94,146,190,124,105,175,236,157, 59,151,119,237,210,245, 39,191, 72,223,131,241,
-241,241,102,184, 88,242,164,164, 36, 28, 59,118,108,192,234,213,171, 23,232,245,122,193,251,239,191,255,225,142, 29, 59,166,151,
-150,150,222, 89,226,104,105, 10, 32,244,106, 17,106,172,161,127,123,140, 14, 15,199, 50, 92,112,221,235,176,134,248, 47,156, 56,
-135,160,238, 97, 24,243,205, 35,216,254,196, 15,114, 91,216,223, 70,254, 54,239,223,157, 89,  6, 91,211, 91,103, 36, 62, 33,  4,
-231,207,159,135,173,177, 58,134, 89,  5,  2,  1,  4,  2,  1, 42, 43, 43, 49,126,252,248, 59, 94, 73,182, 81,255,171, 87,175,198,
-208,161, 67,161, 55, 24,160,211,235,160,183, 14,110,210,233, 45,105,128, 21, 43, 86, 56, 85, 38, 82,169,148, 46, 89,178,  4,102,
-179, 25, 39, 78,156,132,128,111,  9,219,198,198,198,226,106, 81, 17, 74, 75, 75,177,105,211,119,152, 62,253, 81,236,219,183,143,
-218, 71,  2,154, 83, 64, 50,153, 76,  8,128,149, 74,165, 92, 99, 30,144, 59, 83, 21,109,158,127, 94, 94, 30, 52,117,218,122,  3,
- 76,165, 86, 65,165, 82, 66,165,170,243, 56, 20,110,243,254,173, 43,  1,122,100,  8, 76,159, 62,189,193,113, 76,116, 52,122,244,
-180, 12,138,187,112,254, 60,174, 90, 35, 30,142,215,185,130, 17,247,141,128, 72, 40,130, 68, 34,129, 88, 44,134, 72, 36, 66,121,
-121,185,203,228,239, 44,212,239,233, 26,  1, 83, 62, 88,139,173,  0, 30, 74,255, 63,208,140,215, 65, 82,151,227, 76, 97, 53, 72,
- 72, 48, 46,151,168, 44,222,191,155, 41,  0,199, 84,128,219,211,  3,117, 58,128, 87,232, 16,222,183, 16,189,201,100,194, 23, 95,
-124,129,209,163,255, 24, 23,182,239,233, 40,160, 66,139,238,187, 20, 24, 16,222,169, 41,  5,158,227,144,251,150,  3,245,234, 95,
-238,120,173, 39,132,221, 92,222,222, 83,207,223, 83, 67,226,118,223,175,213,  8,104,241, 44,128,232,232,232, 77, 35, 71,142, 12,
- 63,157,159,159,170,211,233,250,201,229,251, 37, 34,177,136,207, 16,  6,251,247,239,247,239,213,171,215,250,148,148,148,255, 84,
- 86, 86, 58,245,214,167, 79,155,202,253,180,251,167,  3,253,251, 15,156,107,100, 13, 15, 93, 46,184,180,136, 43, 42,100,  1, 80,
- 49, 24, 83,223,174,221, 51, 34, 34,194,119,241,248,194,111,255,251,206, 98,227,183,235,214, 90,115,124, 77, 99,232,208,161, 31,
- 37, 37, 37,  1,  0, 42, 43, 43,145,157,157, 29,240,213, 87, 95, 45,  2,128, 99,199,142, 13,237,221,187,247,158,123,194,  0,176,
-121,231,255,248,118, 99,243, 94,134, 27, 83,  2,109,214,111,220,220,225,  8,237,219,166,158,244,237, 67,255, 39,151,252,234,150,
-229,218, 90,115, 82,109,101,235,217,179, 39,206,158, 61,219,128, 88,106,107,107, 11,  1,116,105,236, 59,158,174,189,220,210,114,
- 58,158,255,246,155,111,161,215,235, 97, 48, 26, 96, 52, 26,177,100,201, 18, 56, 35,127, 27, 56,206, 12,177,196, 15, 58,157, 30,
-231,207,157,  3, 95, 32,128,201,104,132,143,175, 15, 54,109,218,  4, 30,143,103,155, 59,223,236,189, 46, 89,178,100,143, 84, 42,
- 53,202,100,178,  8, 91, 57, 29,214,  1,112, 43,180, 57,119,238, 92,228,230,230,162,174,174, 14,117, 26, 13,212, 42,149,149,252,
- 85, 80,171,212,168, 83,215, 65, 99,167,240, 93,121,118,131,  7, 15,166,199,143, 31,175,247,254, 27,155,  6,232,234, 34, 64,  9,
-  9,  9,183,212,133,141,244, 79,157, 58, 85,239,205,187,122,207,131,  6, 13,162,182, 69,126,252,124,252, 32,150,136,161, 86,171,
- 19,237,114,216,110, 41,222,219,181, 24,144,205,  8,152,156,254, 21,232, 22, 32,236,105, 25,114, 94, 73,198,200,197, 27,  0,129,
-  0,190,226,150,229, 57, 29, 13,  1,  0,144,231, 58, 11, 54,222, 68,223, 61, 62, 40,255, 81, 11,197,194, 63,206,154, 76, 38,140,
- 26, 53, 10,  0, 16, 21, 44,193, 47,178, 14, 88,250,193,117,124,126, 82,215,172, 52,123,143, 31,176, 12,132,179, 41,118,199, 65,
-113,238, 78,139,179, 31,191,211, 82,207,191, 49,157,224,137,172,219,121,191,246, 70, 64,107,180,191,222,189,123,127,170, 86,169,
-119, 15, 25, 52,120,168, 90,165, 10, 97,205,172, 33, 50, 50,178, 50, 42, 42,170, 92,165, 82,157,169,172,172,116, 89, 41, 76, 24,
- 55,129,  3,176,233,208,193,163,121,241, 35, 71,254, 32,145, 72,  2,  9, 40, 71,  8,  1,199, 81,165, 78,163,144, 95,204, 47, 86,
-127,187,110,173, 75,122,222,246,204,  0,203, 64,106,199,129,122, 31,124,240,193,127,238,  9,  3, 96,252,248,241, 57, 45, 89,240,
-199,149,198,106, 51,  4,108,196,223,154,132,222,146,178,245,237,219, 23,199,142, 29, 67,101,101,125,136,176, 11,  0, 84, 87, 91,
- 34, 74, 79, 60,241,196,159, 90, 89,142,207,136, 82, 74, 31,127,226,113,172, 88,177,210,154, 51,103, 17, 24, 24, 72, 92,253,190,
- 13, 18,137,216, 38,207,226, 77,105,180,246,223,  1,224,116,179,137,158, 75,150, 44,185, 36,149, 74, 43,100, 50, 25,207,126, 64,
-160,117, 90,160,203,138,206, 54,247, 61, 62, 62,190,213,159,221,224,193,131, 29,247,  2,168,255,220,221, 21,  0,101, 50, 25,201,
-201,201,161,155, 54,109,106,176, 80,143, 77,182, 39,237, 57, 33, 33,129,152, 88, 19, 76,106, 83,171,222,123,115,161,127,119,247,
-  6,152,242,193, 90,192,110,225,159,251,223,250, 99, 92,146,166,149,202,219, 32,  2,208,187,121,227,179, 52,190, 20,165,  0,226,
-150,  6, 99,225,137,110,  8,  7, 80, 89,168, 65,215,174, 93,  1,  0,159, 46, 12,198,131, 67,194, 17,243, 96,129, 75,191,237,206,
- 84,183,140,140, 12,121,115,203, 30, 59,211, 55,173,161,243, 90, 42,235, 78,220,111,107, 98,248,136,225,151,  0, 92,186, 37, 98,
- 29, 26,234,145,188, 81,163,135, 22,161,209, 81,161, 81,232,218,173,143, 59,134, 84,171,222,103,107, 44,242,227,145,  1,112,187,
-  9,108,215,174, 93,  9,219,151,220,125,123,  1,216, 58,210,144, 33, 67,176,107,215, 46,189,149,244, 57,  0, 62,183, 35,242,208,
- 74,141,132,200,100,178,122,207,190, 57,242,191,157,152, 59,119,174,125, 60,181, 94, 97,219,166, 17,186,227,237,220,206,231,107,
- 47, 59, 39, 39,167,197,203,254, 38, 36, 36,144,132,132,132, 22,151,203,217,218,254,173,129,150,164,  4,230,205,155,135, 43, 87,
-174,180, 90, 89, 92, 89,222,215, 93,156,124, 67,129,147,176, 12, 12, 29,157, 34,193,207, 71,186, 33,210,199, 15,191, 31,191,137,
-238, 46,146,191,179,246,119,183, 46,135,219, 26,107,  9,220, 75,247,123, 23, 62,255,118,173, 44,111,249,157, 42,251, 29,223, 13,
-240,118, 69, 24, 90,211,  8, 24, 63,126,188,248, 30,107,128,228, 79,254,109,219, 10, 53,172,205,  0,240, 42,143,187,  7, 45, 77,
-  9,116,238,220,153,116,238,220,185, 85,244,141, 59,251,  0,120,138,131, 25, 58, 28,204, 40,240,246, 89, 47,188,112,230, 68, 14,
- 24, 48,128,122, 31,131, 23, 94,120,225,133, 23, 94,252,189,192,120, 31,129, 23, 94,120,225,133, 23, 94,120, 13,  0, 47,188,240,
-194, 11, 47,188,240,194,107,  0,120,225,133, 23, 94,120,225,133, 23, 94,  3,192, 11, 47,188,240,194, 11, 47,188,248, 75,160,193,
- 44,128,153, 51,103,122, 60, 50,181,177,121,226, 94,121,119,159,188,180,180, 52,143,228, 13, 28, 56,240, 22,121,167, 78,157,242,
-184,124,141,201,187, 87,234,195,221,103,184,102,205,154, 59, 82,190,214,174,143, 59, 89,191,206,166,137,186,251,252, 90, 91,158,
- 87,191,120,229, 53, 34,175, 61,  0,  5,  0, 33,128,218,187,173,124,110, 27,  0, 94,252,245,177,102,205, 26,239, 67,248,155, 33,
- 40, 40,136,129,101,122, 38, 95,169, 84,114,148, 82,243,221, 84, 62,219,190,243,217,217,217,180, 53, 22,154,105,173,149,246,188,
-184,125,216,177, 99, 71,194,196,137, 19,115,238,241,219,176,173,125, 37,113,215,  0,184, 43, 35,  0, 94,252,245, 64, 41,109,176,
-213,177,167, 17,128, 85,171, 86, 57,189,102,236,216,177,  9, 89, 89, 89, 13, 86, 22, 27, 51,102, 76,226,222,189,123, 61,234,232,
-153,153,153,141,202, 75, 78, 78,190, 43,228,221,205, 32,132,144, 78,145,145, 40, 42, 47,167,181,181,181,182,253, 25,220, 90, 98,
-208,222, 88, 60,190,117, 69,  9, 33,152, 37,219,157,191, 93, 58,174,223, 55,148, 66,181,102, 79,254,172,121, 83,134, 18, 48,148,
-175, 80,235,233,224,169, 47,186,189, 37,103,118,118,118,130,109,201, 89,235,127,143,150,155,117, 36,127, 91,187,111,233, 70, 59,
-141,125,215, 83,153,173, 33,175,165, 91,  6,123, 18, 45,185, 29,228,191,107,215, 46,249,196,137, 19,239,117,227,204,182, 15,251,
-109, 77,165,191,247,214, 75,140,159, 32,144, 49,136,133,156,161, 86,199,175,211,169,216, 15, 63, 93,209, 42, 59, 12,222, 98,  0,
-180, 38, 65,120, 42,203, 93,121,132, 16,198,106,133,233, 40,165,220,221, 86,190,214, 34,216,214, 48,  0,108, 74,221,190,172,132,
- 16,  3,165, 84,212,146, 72,  1, 33,132,  2,192,242,229,203, 27,236, 24, 54,103,206, 28, 57, 33,  4,148, 82,226,174, 82,  2,  0,
-238,251,224,  6,231,153,105, 89,242,172,172, 44,183, 21, 96,107,202,187, 23,162, 40,148, 82,154,216, 37,134, 38,118,137,  1,  0,
-148, 27,217, 25,109,132,252, 13,182,207, 47,168,234, 68,101, 46,108,156,  2,  0,199,182,124, 86,192,113,136,186,111, 68, 88,192,
-135,175,140,220,219,175, 95,208,181, 89,139,135,254, 23,  0,110, 42,181,255, 39,224,147, 31,  1,114, 46, 45, 45,173,183,187,207,
-198,113, 41,218,150, 44, 55,107, 79,254,173, 97,  4, 52,245, 29, 79,201,178, 53,228,165,164,164, 32, 35, 35,195,165,123,114, 39,
-162,210,156,188,214,138,204,216,147, 63,199,113, 88,179,102, 13, 54,108,216, 64,103,204,152, 65,220,172, 99,161, 76, 38,107,149,
-245,178,231,207,159,159,150,158,158,238,105,135, 14,176,122,254,154,219,209,135,215,175, 92,197, 60, 30, 21, 35,126, 41,249, 73,
- 97, 68,207, 40, 62,159, 68, 48, 90,165,146, 21, 35,210,200,180,107,111,212,223,184,106,108,233,111,240, 93, 81,110, 82,169, 52,
- 28,192, 96,  0,199,101, 50, 89,229, 93,230,233,  4,  0, 72,  2, 48, 25,192, 54, 66, 72, 54,165, 84,213, 10,114,191,163,148, 62,
-234, 41,193,222, 45, 96, 24,166, 89, 35,133, 16, 50, 20,128,144, 16, 18, 65, 41,173,104,234,186,230, 12, 20, 66,  8,125,249,229,
-151,209,177, 99,199, 91,182, 11, 93,190,124,121, 98,113,113,177,156, 16, 66, 93, 53,  2,164, 82, 41, 93,247,162, 47,158, 28,121,
-235,230, 50,220,247,193, 88,255,139, 17, 79,187,233, 53,181,166, 60,165, 82,153,240,230,155,111,202, 83, 83, 83,145,152,104, 89,
-217,238,244,233,211,  9,171, 86,173,146,119,236,216, 17, 28,199, 65,167,211, 33, 33, 33,  1, 99,199,142,117, 42, 83,168,212, 36,
-116,127,115,179, 60, 43,174,125, 98,155,231,198,228,  0,  0, 91,206, 38, 92,124,151,149,155, 59,  6, 64,197,249, 66,161, 11, 64,
- 69,224,177,196,103,231, 69, 56,245,142,187,116,104,211,166,163, 80, 82,246,226,172, 39, 12,145, 18,161, 80, 85,163, 35, 75,190,
-218,184,225,173,231, 31, 71,176, 68, 66,245, 38, 51,253,247,138,175, 12,  0, 72,219,182, 97,252,242,242,106,102,192,128,198,119,
-214, 28, 18,177, 55,246, 70,148, 79, 80,252,125,225,203,  7, 14, 10, 17,172, 91,119, 57, 58, 60, 76, 82,245,209, 43, 71,150, 23,
- 93, 27,104, 30,247, 96,219,188,130, 75,234,226,167,159,236, 50,222,214,110,220,233,  3,246, 27,228,180,196, 11,117, 36,127,199,
-254,233,137,252,187, 49,  2, 96, 37, 98,106, 51,  2, 82, 82, 82,236,207, 55, 32,109,251,141,125, 60, 53, 42,108,114, 50, 50, 50,
- 90, 28, 37,176, 39,255, 57,115,230,224,248,241,227,244,151, 95,126,193,140, 25, 51,220, 21,101,148, 74,165,  2,153, 76,198,182,
-130,138, 44,159, 63,127,254,228,244,244,244,109, 30,124, 55, 10, 64, 13,128,104,  0,167,115,115,115, 59,  1,248, 28, 64,136,189,
-124,  0,159,198,199,199,187,188,231,130,142,211,241,141, 85,  6,159,113, 19, 39,  7, 42, 96, 10, 20,  8,248, 34,149, 94,204, 23,
- 10,117, 44, 47,192,215, 96,148,152,116,252,242, 27,106, 49, 79, 84,171, 55, 27,140, 82,169,180,201,254,219,226,  8,  0, 33,164,
-  3,128,255,  1, 40,  5,240,178, 84, 42,125,142, 82,122,253, 78,121,176, 78, 72, 58, 20,192,122,  0, 55,  0, 28,  6,240, 16,128,
-103,  9, 33, 79, 82, 74,171, 91, 40,126, 26, 33,100,134,179,124,233,157, 12,177,223, 38, 12,  7,112, 17, 64, 12,128, 10, 98,101,
-106, 87, 13,154,177, 99,199, 38,  0,104, 64,254,115,230,204,145,219, 71,  3,172,159,201,199,142, 29,155,224, 44, 29,144,153,153,
-153,  0,160,  1, 89, 51,211, 20,176,247,222,159, 28, 41,196,211,159,105,144,153,153,153,224, 44,124,223,218,242,  0,224,200,145,
- 35,114,177, 88,140,188,188,188,  6,251, 29, 48, 12,131,183,223,126,155,216,148,221,206,157, 59,229, 99,199,142,117, 90,  1,109,
-142,156,147, 83,177,  0,253, 42,133,242,138, 63,182, 98,  5, 97, 40,250,189,109, 36,128, 17,103, 15, 94, 75,184,177,101,130, 28,
- 56,218,172, 18, 78,236, 18, 67, 59, 10, 37,120,237,133, 25,134, 72, 63,161,176,234,108, 46,241,101,248,120,105, 84, 44,218,  5,
- 73,112, 45,239, 16,209, 25, 41,153,147,246,132, 49,177, 75, 12,237,225,227,143, 50, 90, 69,  6, 14, 28,216,168,188,176, 48,225,
-253, 66, 33, 35, 62,124,184,236,101,214,172,255, 56,178,125,103, 83, 80,152,128,168, 84,151,125, 58,199,248,132,133,132,136, 42,
- 57,170, 50,252,116,180, 66, 51,115,212,159,211,128, 29,195,254,246,125,211, 93, 35,192,118,141,253, 56,  2,103,215, 57,219,126,
-187, 53,229,217, 27,  1, 50,153,  2,128,  2, 82,105, 48, 26, 35,109, 87,209,148, 81, 97,141,200,180, 40,234, 97, 79,254, 59,119,
-238,148, 51, 12,  3,134, 97, 48,106,212, 40, 28, 58,116,168, 65,125,185, 10,179,217,156,207,227,241, 76, 82,169,148, 47,147,201,
- 90, 58,158, 69, 82, 93, 93,253,125,104,104,232,212,244,244,244, 45,110,126, 87,  7,203,126, 49,234,220,220,220, 62,  0,182,236,
-219,183,175, 27,199,113,246, 28,  5, 30,143,247,  8,128,156,248,248,248, 68,103,  2, 11,174, 20,136, 37, 66,113,160, 64, 32, 10,
-103,248,164, 45,229,137,130, 56, 30, 79,196, 17,  6, 28,225,155, 40,143, 87,199,227,136, 90,195, 51,215,248, 10,  5,132,215,165,
-131, 82, 60, 49,130, 69,241,237,139,  0,124, 12, 96,159,213,178,121,  1,192,199,107,214,172,153,234, 33, 97,  7,  3,120, 25,192,
- 16,  0,227,  1,236,  2,112, 12,192, 39,148, 82,133,  7, 34, 15, 90,203,181,138, 82,202, 17, 66,124,  1, 60,101, 61,223,187,  5,
-134, 69,160,245,173, 47,  0,149, 59, 30,118, 19, 17, 20, 33,128,183,  0, 44,146,201,100, 70,220, 93, 24,  2, 32, 23, 64, 27, 66,
-200, 38,107,157,124,227,104,208, 52,101,160,100,101,101,201,237,195,254,115,230,204,169, 63,182,127,191,124,249,242, 68,171, 97,
-208,108,143,207,202,202,146,219,135,233,153,105, 10, 92,218,101,217,133,145, 25,255, 77, 61,105,115,223,  7,131,153,150, 37,119,
-182,161, 79, 99,242,108,202,140,153, 38,165,238,202,163,148, 38, 28, 62,124, 24, 51,102,204,192, 23, 95,124,129,147, 39, 79, 38,
-196,197,197,229, 56, 94, 35, 22,139,229,109,219,182,117, 37, 86,159,208,246,240,111,184, 56, 35,  1,126, 95,156,  5, 41,211, 38,
-208,182, 62, 86,121,196,122,  9, 18,  4,250,142,242,144,182,205,111,101,155,216, 37,134,166,253,107,154, 49,210, 87, 40, 48, 93,
- 62, 46, 12, 14,247, 39,242, 50, 21,166, 14,232,128, 30, 81, 65, 16,214, 94,132, 92,173, 67,  7,129,  8, 65,132, 39,152,255,236,
- 12, 90, 39, 20, 21, 36,118,137,161,  8,  8,106, 84,166,162, 86, 29, 50,116,168,223,114, 21, 59,108,158,127,112,165, 72,207,248,
-114, 18, 63,163, 33, 36, 44,148,241,  9, 18,243, 21, 53,101, 34,149,146,133, 64,105, 32,246,109,166, 57,131,214,154,247,151, 59,
- 35,206,148,148,148, 68,103,227,  1, 26,243,252, 29, 13,  1,119,140,  0,219,103,205,145,177,253,121,103,196,232, 40,143,110, 14,
-190, 85,223,164, 42,224,170,188,230,194,253, 45, 33,109, 71,163,  2,  0, 66, 66,178, 91,133,252,103,206,156,105, 73,191,113, 28,
- 94,127,253,117,124,252,241,199,245,228,191,106,213, 42,183,101, 51, 12,  3,163,209,120, 74, 40, 20,178,173, 16,  9,168,  1,128,
-234,234,234, 45,161,161,161,137,233,233,233,114, 55,190,203,  7,128,167,159,126, 90,148,155,155,155,149,157,157,221,102,225,194,
-133,236, 59,239,188,211,128, 87, 67, 67, 67,177,127,255,254,  4,  0, 25,241,241,241, 41,205,  9,228, 17, 65,128,145,165,237, 56,
-206, 20, 35,228,241, 58, 81, 66, 34,  8,159, 79,248, 60,158,146, 16,162,  3,225,169, 56,138, 96,106,228,124, 84,102, 19,186,  4,
-176, 58,102,168,154,107, 53,  3,192, 33, 55, 28,  5,160,  3,165,212, 70,248, 75,  9, 33, 71,165, 82,105, 20,165,180,212, 29, 15,
-150, 16,242,132,149,172, 63,  4, 48, 15,192,227,214, 16, 74, 10,128, 98, 66,200, 11,148,210,111,220, 32,233,255,  0,184, 76, 41,
- 93, 73,  8, 17, 89, 59, 60, 75, 41,253,156, 16,242, 32, 33,228, 63,148,210,255,231, 97,163, 24, 13,160, 18,192,253,  0,126,116,
-231,139,141, 69,  0,164, 82,233, 51,  0,222,  5, 80,158,150,150,182,250, 46,139,  0,244,182,150,109, 12,128,113,  0,174, 57, 51,
-104,154,130, 61,225,219,147,190,227,184,  0,151, 59,186, 29,249,  3,192,165, 93, 79, 52, 48,  2, 60,145,103,175,204,100, 50, 25,
-177, 55,  2, 92,193,129,  3,  7, 96, 52, 26, 49,104,208,160,196, 95,126,249, 69, 94, 84, 84, 36,143,139,179,108,169,203,113, 28,
-210,211,211,105, 93, 93, 29,  4,  2,  1,166, 76,153,226,244,190,245,121,199,192, 24, 89,212, 14,138, 78, 20,252,114, 67,126,121,
-237,  1,116,121,107,156,133,180, 56,138,252,116, 33,173,169,243,135, 78,224,135, 49, 51, 47, 57,127,142, 12,175,174,242,108, 94,
-160,222, 96,102,  2, 37, 34,154, 60,160, 35,  2, 36,  2, 82, 82, 93,  7, 95,134,143,212,129, 29,233,145,223, 43,240,235,143,123,
-208,201,215,143,158, 81,171,174,  1,232,222,148,184,188, 83,237,102, 13, 31, 88,117,192,143, 31,195, 10,217,155, 93, 70,143, 72,
-245,211, 27,125, 39,240,252,142, 49,170,218, 26,159,162,243,199, 98, 76,198,243,149, 87, 10, 53,  1,214, 62,227,148,168, 92,245,
- 78,109,227,  3,154,202, 63, 55,229, 77, 59,243, 42,165, 82, 41,245, 52,100,122, 55,193,209,243,183,144, 55,144,145,209,122,131,
-  4, 91,195,243,167,148,130,101,255,224,232,145, 35, 71,226,208,161, 67, 30,145,191, 21, 38,129, 64, 96,230, 56,238, 48,195, 48,
-166, 22, 26,  1, 17,182, 55,213,213,213,242,208,208, 80,105,122,122,186,171, 59,103, 21,165,166,166,  6, 28, 56,112, 32, 61, 59,
- 59,187,205,215, 95,127,205, 61,245,212, 83,252,141, 27, 55,226,189,247,222, 67, 65, 65,  1, 58,117,234,132,242,242,114, 44, 88,
-176,192,252,238,187,239, 38,  3,120, 33, 62, 62,254,243, 38, 37,114,108,160, 25, 76, 39,194,161,183,  9, 92,172,143, 64, 36, 20,
-242,153, 50,177,128,167,226, 73,132, 85, 34, 17,175,206, 96,230,124,248, 38,126,136,145, 53,152,175,158, 60,165,120, 34,252, 99,
-237, 17,120,198, 31,206, 34,  0, 15,  2,200,117, 24, 56,150, 11,224,193, 53,107,214,124,229,  6, 89, 63,  6,224, 21,  0,209, 14,
-161,121,  5,128,223,  8, 33,159,  2,216, 75,  8, 49, 83, 74, 55,186, 32,207,  7, 64,154,255, 11,176,  0,  0, 32,  0, 73, 68, 65,
- 84,154,205,203,167,148, 26, 28, 46,121, 18,192,239,132,144,101,148, 82,173, 39,225,127,  0, 95, 89,255,187,101,  0, 56, 18,166,
- 84, 42,253, 39,128, 89,214,103,185,156, 16, 98,144,201,100,107,239,  6,  5, 66,  8,233,106, 13, 97,253,  4, 96, 59,  0, 91, 61,
-193,213,  8,192,223, 13,165,165,165,242, 97,195,134,129, 16,146, 51,108,216, 48,252,240,195, 15,120,228,145, 71, 18,218,180,105,
- 35,103, 24,  6,243,231,207, 39, 86,101,146,176,105,211, 38,185,193, 96,192,144, 33, 67,154, 84,116, 35,174,222,144,151, 15,235,
-  9, 16,146,243,123,164, 57,177,247,233, 16,185,158, 67,162, 37,  5,  0,244,155,111, 36, 64, 53, 52,213,202,132,253,155,186,202,
- 53,254, 71, 19, 31,125, 42,160, 81,175,184,196,200, 46, 91,179,102,227,235,225, 97,146, 34,165,198, 24, 24, 29,236, 43, 72,233,
-223,217,103, 96,180,136,232,181,102,104,117, 28, 46, 19,157,121,123, 81,169,182,176,188,206,220, 70, 40, 46, 43, 55,234,199, 94,
- 55,152, 62,244,  7, 94,107, 76,102, 64,112, 84,123, 93,221,165,118,189,146, 30, 96,206, 29, 41, 27, 93,122,225,135,235, 93,  7,
-167, 69,240,122, 14, 40, 57,117,232,123, 37,225,  5, 12,225, 56,174,230,230, 77,157, 83, 43,202,145,176,157, 29,219,188,217,140,
-140,140, 38,  9,219, 62,188,238, 24,  9,112,229,250,123, 21, 73, 73, 73,196,222,235,183,135,125,  8,191, 37,104, 13, 57,117,117,
-117,114,  0,224,243,249,120,245,213, 87,113,252,248,113,252,242,203, 47, 45, 21,107,  0, 96, 54, 24, 12,108,105,105,105, 86, 84,
- 84,148,201, 89,100,177, 25,168,237, 15,170,171,171,101,161,161,161, 15,167,167,167,187,162,247,  3,245,122,125,183,185,115,231,
- 78,156, 57,115, 38,237,219,183, 47,  1, 80, 79,254,  0, 48,124,248,112,108,221,186, 21, 35, 71,142,100, 30,123,236, 49,154,147,
-147,179,146,199,227,233,124,124,124,160,213,222, 74, 77, 28, 71,245, 57,242,125,153, 93,187,198, 22,199,116,138,190,196,243,151,
-148,241,136, 80,201,136,  4, 74, 70,236, 83, 97,228,243,180,160, 38,  1, 39, 54, 69,168, 75,171,195,142,238, 63,253,118, 88,112,
-228, 59,158, 62,200,102, 35,  0, 82,169,116, 44,128, 13, 14, 94,237,126,  0, 51,210,210,210,190,114,197,131, 37,132,240,172,225,
-239, 73, 77,229,229, 41,165,213,132,144, 84,  0,219,  9, 33,223,187, 48, 79,249, 49,  0,123, 41,165,202, 38,228, 41,  9, 33,123,
-173,215,125,225, 38, 41, 62,  0, 32, 20,192,108,  0,155,  8, 33, 15, 80, 74,247,123, 18,  1, 32,132, 36,  3, 88, 10,160, 19,165,
- 84, 67,  8, 25, 14,224,154, 84, 42, 85, 83, 74, 51, 93,141,  0, 72, 45,166,190, 43, 74,139,200,108,110,128,107, 24,  1,224, 40,
-165,148, 18,139,219,116, 13,128,134, 16,210,193, 54,206,195,157,  8,128,163,199,223, 18,239,191, 62, 44, 63,254,155,250, 40, 64,
-108, 11,188,255, 63,194,252,127,132,111,165, 82,247,188,127,147,201, 68,143, 31, 63, 14,127,127,127,228,231,231, 83,179,217, 12,
-149, 74,133,243,231,207,203, 67, 67, 67,225, 16,246,203,233,213,171, 87,226,230,205,155,229, 67,134, 12,105, 60,220,103, 50,209,
- 14,199,207, 66,232, 31,  5, 65,126, 53,141, 52,251, 67,173, 98, 96, 62, 95,  7,132, 54,220,145,218, 55,148,205,233, 56,248, 68,
-226,158, 45,211,228,192,238, 70,149,221,165,235,215,223,136,237,208,  1,168,210,189, 14,  0,  5, 58, 21,118,138, 74, 43,123,221,
- 63, 58,188,151, 49, 31,191, 93, 83, 96,231,233,155,252,194,202,186,  0,  0, 40, 55,234,131,175, 27, 76, 41,133,165,165, 91,  7,
-132,135, 55,106,  0,220, 63, 33,149,241, 17,142,237,203,106,126, 43,238,216, 51,169,155,242,250, 22,227,229,223,178,106, 77,156,
-223,205,138,226, 95, 43, 84, 53,190, 67,192, 48,164, 70,173, 15,148, 78,139,235, 32,251,254,228,245,166,218,140, 76, 38, 35,246,
- 17,  0,123,239,210, 49,220,110, 35,233,148,148, 20, 36, 37, 37,145,198, 22, 58,105,201,104,124, 79, 23, 78,185,219, 96,235,238,
- 82,105,240, 45, 17,  1, 79,163, 10, 25, 25, 25,173, 66,254, 27, 54,108,160,  7, 15, 30,  4,221, 28, 12,146,170,192, 71, 31,125,
-  4, 74, 41, 24,134,193,234,213,171, 61,142, 44, 40, 20, 10, 67, 72, 72, 72,226,193,131,  7,119,143, 30, 61,122, 92, 99,237,199,
- 13,  4, 89,251,107, 90,117,117,245,154,208,208,208, 39,  0,212,204,159, 63,255,159,233,233,233,206, 28, 53,229,142, 29, 59, 74,
-247,236,217,243, 85, 98, 98,226, 51, 61,122,244, 64, 82, 82, 18,205,206,206,174, 47,199,246,237,219, 33, 18,137,112,237,218, 53,
-236,222,189,155,180,107,215,142,141,143,143,255,229,252,249,243,141, 10,140,141,233, 86,166,211,233,211, 14, 30, 60,184, 38, 52,
- 44, 84, 21, 24, 16, 80, 12,161,208,192, 26,152, 58,150,103,168,213,243, 85, 85,190,  6, 95,241,141,138,202,192,253,123,118,175,
-233,213,187,207, 82,163, 94, 91,215, 42,  6,128, 84, 42, 37, 82,169,212, 86,248, 54,214,215,  1,235, 52,187,250, 40, 40,128, 57,
-132,144,118,176,140,112,  4,128, 70, 45,116, 43,169,188,  4,203,  0,189,171, 14,114, 28,113,213,122,221, 75,132,144,143,155,145,
- 71,  0, 76,  1,176,216,137,188,175,  1,204, 35,132,124,229,164,124,246,141, 38, 26,150,241, 14,131, 96,201,253,191, 13,224,  4,
- 33,164, 11,128, 34,123, 27,195,  5,121,143,  2,120,214, 74,178, 58,107, 89,117,214,227,213,132, 16, 33,128,239,154,147,103,173,
-139, 39,  0,204,116,213,  0,144, 74,165,171,  0,124,211,148, 60,171,204,101,  0,252,  1,  4,  2,216, 97, 45,155, 24,150,121,226,
-191,  1, 24, 70,  8,153, 13,224, 23,  0, 59,155, 42, 31, 96,153, 71,223, 68,174, 31,142, 99,  3,198,140, 25,227,212, 24, 24, 51,
-102, 76, 34, 51,237,143,188,189,205,  8,176,189,183, 15,231,123, 44,111,218,173, 83,  2, 93,145,119,250,244,105,116,236,216, 17,
-175,190,250,106,125,155, 89,191,126, 61,205,203,203,195,132,  9, 19,110,185,222,199,199, 71, 46, 22,139,155,148, 23,125,250, 52,
-106, 59,182,197,145, 87,159,169,151,119,241,141,173,  9, 49,121, 74, 57, 51, 65,124, 75, 89,138, 11,140, 16,137,155,159,253,116,
-185,164,100, 46,218,183,255, 21,192,112, 10,202,195,213,202, 87,181, 44, 11, 86,111,  9,146,157,171,172,196, 85,189,113, 61,159,
- 16, 53,  8, 49, 93, 46, 41,201,  4,128,166,  6,  1,182,139,238, 49, 23,192,146,130, 67, 47, 23,137, 35,167, 40, 74,203,197,237,
-203, 75,142,137, 33,  8,233, 90,116,205, 28, 85, 93,126, 29, 66,161, 32,162,119,164,239, 99,181,106,211,183,  0,174, 59,243, 92,
-  1, 36, 56, 78,255,107,194,  3, 77,244,100, 77,128,198,242,255,127,  7,180,116,170,158,237,251, 25, 25, 25,180,165,242, 54,110,
-220, 64,115,114,114, 64, 50, 45,134,241,222,119,252, 49,118,161, 26,163, 71,143,134, 59,211,254, 26, 67, 72, 72, 72, 34,  0,220,
-119,223,125,218, 86, 72, 83, 40, 66, 67, 67,103,  0,176, 57,167,134,244,244,244,157, 46,126,151,  5, 80,177,125,251,118,249, 35,
-143, 60, 50, 56, 61, 61,189,159,217,108, 38, 18,137,  4, 99,198,140,193,207, 63,255, 12,142,227, 48,126,252,120,250,242,203, 47,
-147,  1,  3,  6, 24,166, 76,153,210,169,166,166,230,166, 94,175,111,138,145,217,223,207, 95, 90,223,167,111,191,192, 99, 71,143,
- 46, 61,197,231,247,233,220,169,243,151,  1,161,225, 37,130,112, 49, 61,176,123,127,112,141,162,122, 84, 84, 72,248,187,221,186,
-117, 59,224, 23,233,187,170,103,251, 65,198,252,252,252, 86,137,  0,240, 96,153,238, 23, 15,224,125,  0, 47, 90,137,199,215,190,
- 63,193, 50, 72,236, 50,128,127, 91, 83,  2,199,155,144,207,192, 50,200,108, 47,  0, 31, 23,202,115, 24,192, 88, 52,189,176,  2,
-  3, 32, 28, 64, 39,  0, 39,156,200, 60, 97,189, 46,  2, 77,231, 38, 25, 88,150,113, 12,182,166, 13, 30,177, 18,119,129, 85,118,
-129,245,120, 35,128, 31, 96,153,113,160,  0, 96,116, 34,111,154, 53,242,208,195,106, 36,217,151,179, 12,128, 20,192,  5,235,181,
-223, 59,145,247, 10, 44,179, 27, 92, 73,101,248,  0,216,  3, 96,131,147,250,152, 10,224,191,214,255,167,236,202, 39,176,214,101,
-  6,128,207,  0, 44,180,126, 94,214,212, 15,238,221,187, 55,135, 16,130,226,226, 98,185,109, 38,128,163,215, 95, 92, 92, 44,183,
- 93,235,236,  6,146,147,147,115,178,178,178,176,254, 23, 99,253,200,125, 71, 47,125,253, 47,198,250,107,239,164,188,188,188, 60,
-140, 26,213,112,168,123,116,116,116,226,230,205,155,229,157, 59,119, 78,228, 56, 78,190,104,209, 34,106,155,  6, 72,  8,193,224,
-193,131,155, 52, 42,186,231,229,225,187,208,136,196,  0,187,115, 61,103,143,133,102,233,117,224, 31, 17,160, 28,144,191, 72, 64,
-235, 56, 63,212,232,  2,160, 32,  3,209,127,212,142,196,230,154,189,117,  6,199, 22,  0, 91,186,118,138,234, 14,224, 85,131,153,
- 67,102,126, 17, 70, 69, 90,210,157,132, 82,181,154,101,223,191,121,243,230, 77, 23,218,212, 82,  0,190,  5, 23,106, 30,175, 61,
-177, 57,172,162,172,  6, 21, 55,213,224,243,171,125,235, 20, 20,181, 42, 51,141,  8, 23,  6,241, 57, 76,214, 25,204,223, 45,124,
- 53, 62, 40,162,231, 83,181, 78,136, 38,199, 25,185,180, 56,135,157,180,217,242, 63, 59,213, 77, 15,248,246,206,  2, 32,169, 10,
-180, 68, 94, 83, 30,251,160, 65,131,238, 26, 67,164,126,176,163,141,252,243, 89,172,149, 91,250, 88, 75,201,223,214, 54, 94,120,
-225,133,112, 62,159, 95,113,248,240,225, 47,239,187,239,190,150, 76, 81,236,152,158,158,190,210, 26,  5,152,102,157, 17, 48, 45,
- 61, 61,253,123, 87,130,138,  0,234,  0, 84, 69, 71, 71,247, 31, 57,114,100,233,233,252,252,182, 58,157,142,200,229,251, 33, 18,
-139,192, 16,  6,251,247,239, 39,189,122,245,210,166,164,164, 12,171,172,172,116,218,231,166, 79,155,202,254,180,251,167,207,250,
-247, 31,216,217,200, 26,198, 93, 46,184,244, 44, 87, 84,248, 12,  0,136,193,208,190, 93,187, 31,139,136,  8,207,225,241,133,111,
-252,247,157,197,117,223,174,243, 60,163,220,152,  1,240,170,213, 26,154,  0,224, 60,  0,191, 70,190,183,203,234,177, 39,  3, 24,
-106, 37,207, 70,163,156,  0, 98,  1,108,114,209,  0,168,182, 94,207,107, 70, 94,  2,128, 75, 46,202,187,100,189,126,107, 51,242,
-210,  0, 60, 13,224, 44, 44, 51, 20,174, 58,200,150, 91,189,255, 89, 86,111,120, 29,208,228,136, 11,158,213, 99,127, 18,192,  0,
-107, 20,161,177,114,170,172,159,175,182, 26,  1,235,154,145,247,181,213,232,114,229,126,169,245,250,230,158,223,135,214,200,198,
- 94,171, 81,  3,  7,217, 63,  3,232,101,173,139,  2,171, 33,213,161,217, 31,181,100, 16, 40,  0,121, 99, 11,  1,217,174,113,167,
-131, 63, 45,149,210,167, 63,211, 52,178,112,143,194,109,130,104, 45,121, 47,189,244,210, 45,215,140, 30, 61, 58,103,244,232,209,
-  4,  0, 30,120,224,  1,183,148,208,174,151, 94, 34,  1,142, 26,165,147, 95,142,100, 69, 79,  2,  0,189,101,  2, 98,  9,202,216,
- 70,102, 95,115,177, 25, 88,235,197, 76,139,192,  7,120,117,168, 39,127,171,139,124, 83, 44, 22,187, 58, 27,133,  0,120,239, 80,
-246, 41,159,200,246,157, 30,230,224, 19, 91, 82, 92,206, 51,233,107,105,155,  8, 63,226,231, 43, 32,172,137,131,162,214,200, 18,
-  9,145, 40,213,108,215,136,166, 29,130, 70,201,194,241,253,159,185,124,239,237,158,  5,208, 82,121, 77,121,236,157, 59,119,190,
-107,200,159,251, 62, 24,123,243, 45, 99,242,214,201,141,248,238,176, 17,148,210, 86,169, 87,155, 12,179,217, 92, 13,  0,113,113,
-113, 45, 90, 16,200, 70,254, 86, 84, 89,255,187,218, 55,132, 86,199,236, 36,  0,244,238,221, 59, 74,173, 82,207, 27, 50,104,240,
- 19,106,149, 42,144, 53,179,166,200,200,200,155, 81, 81, 81,151, 84, 42,213,194,202,202,202,  2, 87,203, 53, 97,220,  4, 22,192,
-139,135, 14, 30, 29, 25, 63,114,228,  4,137, 68, 18, 70, 64,205,132, 16,112, 28,173,214,105, 20, 43, 47,230, 23,151,125,187,110,
-109,139, 86,  4,116, 52,  0,204,  0,254,217, 12,129,216,227,152,245,101,182,190, 26,131, 25,150, 17,245, 60, 23,203, 35,  7,144,
-237, 68,222,118, 88,  6,173,185,130,199, 93, 40,223, 26,  0, 95, 58,145,243, 59, 44, 83, 32,225,130,188,111,172, 17,  3,103, 40,
-178,122,246,174,148,143,231, 70,157,174,113, 34,239, 31, 46,200,179, 69, 27,214, 89,159,141,211,185,182,148, 82, 50,118,236,216,
-  4, 27,225,219,135,224, 61, 89, 10, 88, 38,147,145,204,204,204,  4,102, 90,235, 44,221,219,218,242,238,  5, 20,150,220, 48,196,
-118,232,176,110,230,210,213, 79,219,206, 25,  5,204,  6,189,150,219, 83, 94, 92,172,118,169, 49,173, 89, 67,171, 78,172, 37,139,
-191,255,109,238,206, 21, 15,108, 59,114,180,236,249,240, 64,110, 34, 19, 18, 16, 68, 41, 64,  8, 53, 24, 88,174,156,  3,170,140,
-  6, 46,168,180, 76,103,140,117,163,140, 41, 41, 41,137,246,233,128,148,148,148,196,187,229,249,221,141, 43,  1,222, 43,120,112,
-161,250,182,222,163, 76, 38,227,164, 82,105, 91,177, 88, 92, 22, 23, 23,247,143,214,144,153,158,158,190, 47, 52, 52,244,233,244,
-244,244,117,110, 24,  0,172, 53,114, 10,  0, 24, 62, 98,248, 98,  0,139, 29, 47,116, 28, 35,228, 42, 70,141, 30,250, 11, 44,169,
- 88,  7, 68,161,107,183, 62, 45,190,231,198, 12,  0,189,  7,114,104, 51, 33, 18,131, 87,222, 95, 86, 94,  3, 88,137,190,213, 58,
-122,114,114,114,142,179,121,249,127,166,188,123,  1, 53, 90,237, 51,128,143,  9, 64, 56,  7, 90,170,215, 27, 55,150,151, 87,158,
-161,148,186, 60,109, 42,108,208, 63,233,246,143,198,145,155,190,143,230,181, 31,137,188,236,175, 62,124, 53, 36, 68, 52,143,207,
- 35,180,172, 90,127,177,204,200,174,151,  8, 24,177,132,207,227,153, 88, 78,236, 78,249,108, 57,126,219,192, 51, 79,247,  1,184,
-101,234,159, 93,232,223,147,197,102, 28, 61,115, 87,206,223,105,121,119,218,240,113, 21,204, 52,  5,  8, 33,152, 56,233,143,  1,
-209,187,118,159,172,215, 33,227,199,197,181,214, 20,197,242,214,212, 55, 86, 35, 96,157, 27,151,  7, 91, 13,  0,205,189,170, 31,
-248, 14, 15,148,186,170,236, 29,209,216, 40,118,175,188,191,182, 60, 47,238,126, 84, 87, 87, 83, 88,210, 92, 45,194, 77,223,201,
- 20,  0, 14,109,248,132, 36, 61,243,218, 71, 79,166,229,127,246,226,244,195,189,140, 26, 18, 19, 34,224,135,129, 16,173,159,132,
- 95,217,167, 71, 64,129,187,178,147,146,146, 72, 70, 70,134,199,235,205,223, 46,242,188, 87, 34,  0,119,159,241, 96,137, 13,253,
- 13,186, 87,148,213, 97,246,199, 61,186, 27, 32, 25, 48, 96,192,223, 99,136,172, 23, 94,120,  1, 62, 15,240, 17, 17,112,156, 69,
- 71,215,233,188,221,223, 11, 47,254,182,250,192,251,  8,188,240,226,239,  3,214, 12,168,180, 54,210,247,146,191, 23, 94,252,157,
-193,120, 31,129, 23, 94,120,225,133, 23, 94,120, 13,  0, 47,188,240,194, 11, 47,188,240,194,107,  0,120,225,133, 23, 94,120,225,
-133, 23,127, 69, 52, 24,  3, 48,115,230, 76,143, 71,110, 54,182,182,118, 99,242,126,252,254,127,  9,125,250,117,149,183,109, 31,
-149,168,214,105,228,  7,228,121,137,201,211, 94,200,241, 84,222,138,175,182, 36, 12,232, 55, 76,126,179,180, 20,190, 18, 95, 92,
- 47, 41, 76,124,238,153, 73, 30,203,107,237,251, 61,123, 96,102,194,240, 97,157,229, 18, 95, 30,248, 60,  6, 68, 76, 80,166,122,
-153,120, 42,239,228,205,126,  9, 67,134, 13,145,  7,250,241,  0, 62, 80,115,122, 13,113,181,124,177, 15,198,122,124,191,151,126,
-190,116,139,188,161, 67,135,122, 44,239,232,209,163,183,202,139,245,188,124, 71, 47,221, 90,190, 97,221,186,121, 44,239, 72, 65,
-193, 61, 39,239,193,102,234,119,241,226, 12, 58,111, 94, 74,147,159,255,220, 72,253,198, 62,244,160,231,237,101,207,207,183,182,
-231,  7, 61,111, 47,139,179,170,105,  0, 87,216,224, 92, 88,236,163, 30,203,171,186,244,221, 45,229, 59,245,214, 53,143, 21,233,
-192, 69,157,110, 57,247, 81, 88,169,199,242, 94,173,138,194,159,161,175,254,238,242,164, 82, 41,191,177,157,  5,239,197,251,117,
-219,  0,104, 10,250, 77,210, 88,  0,157, 97, 89, 39,160, 80, 60, 93,118,213,213, 31,216,242,205,226,  4,  2, 14,225, 65, 33,200,
- 59,112, 82,254,245,215,159, 32, 62, 41, 30,172, 70, 43,239,213, 99, 52, 56, 14,242,223, 99,190, 78, 28, 56,176, 31, 46, 95,190,
-  6,101,173,  6,125, 71,204,200,105, 74,222,154,111,229,  9, 20,  4,157,186,118,150, 75, 95, 91,136,234, 79,183,224,155,255,125,
- 14, 64,140, 93,103, 74,192, 48,144,127,242,222, 59, 40, 40,184,136,232,232, 78, 16, 73,248,184, 81, 82,208,228,226, 34, 87,182,
-126, 78,133, 66, 33, 36, 18,  9, 10, 11, 11,209, 46, 34,  0, 97,124, 63,180,235, 24,132, 96, 73, 32,124,137, 25, 12,195,128,114,
-102,104, 69,124, 40,111, 42, 81, 49,216,249, 92,114,101,225, 74,234, 47, 81, 98,196,144, 46,240,243,229, 67, 40, 97,192,231,  1,
-140,144,143,238, 81,255,163, 38,202,195,149, 27,207,184, 92,225, 43,118,235, 19,162,162,162, 16,127, 95,123,185, 78,111,  0, 35,
-146,  0, 38, 32,191, 46, 46, 65,167,213, 96, 88,196,197,156, 63,203,138, 92,179,102, 13, 77, 75, 75,251, 91,205,175,191, 91,225,
-140,232, 91,120,189, 47,128, 33,109, 36, 62,255, 45, 45, 45,237, 33, 16,139,192,249,248,124,  0,203,202,152,117,119,203, 51, 40,
-252,125,119,194,213,115,  7,110,217,107, 32, 41,229,131,191, 74, 27, 37,223,172, 95,127, 65, 36, 20, 74, 56,142, 11,244,245,243,
-243,123,120,226, 68, 31, 88, 86,176,187, 91, 71,118,218,162,205, 92, 75,  5, 73,165,210,128,192,192,192, 57,221,187,119,159, 34,
- 18,137,218,151,148,148,148,148,150,150, 30, 53, 26,141,139,100, 50, 89,161,  7,242,130,130,131,131, 23, 62,240,192,  3,227, 94,
-120,225,133,232, 47,190,248,226,230,217,179,103, 15,235,245,250,  5, 50,153,236,236,223, 38,  2,208,  4,249,243,124, 69,252, 33,
- 79,140,236,178,140,163, 84,127,232,226,205, 79,207,111,146,238, 21, 79,151,157,115,246,221,148,137, 93,233,196,  7, 22,195, 84,
- 87, 11,190,153,193,111,231, 46,226,169,167, 94,254,163, 69, 48,192,175,121,235, 16,214, 49, 74,206,213,169, 96,228,  8,246,239,
-207, 75, 44,209, 53, 85, 81,139, 40,132,129, 32, 62,  1, 56,121,174, 24,103,206,253, 19, 95,125,247,115,253,231, 28,  7, 60, 52,
- 98,  4, 80, 87, 14,192, 31,133,103,207, 67, 16, 22,132,248,225,125,228,181,218,102,108, 22,194,  0,132,193,128,126,113,104,227,
- 43, 68,187, 48, 49,  2, 66, 67, 16, 44,242, 71,176,152,  7,  1,143,  7,147,217,140, 90,150,195,177,170, 19, 78, 31,106,249,153,
-133, 52, 36, 16,  8,240,241, 65,120, 88, 40,  2,  2,124, 64, 25, 51, 88,174, 14,102,152,225,231,231,131,176, 54,237,209, 57,246,
- 23,154,125, 96,100,179, 74,105,117,150,145,  6,250,251,162,115, 76,  4,194,195, 66,161,209,104, 32, 20,137, 33,208, 91, 22,231,
-139,137,238, 36,175, 81,212,226,251,188,162,196,226,146, 27, 80,148, 95,195,162, 23,226,154, 53,  6, 50, 22,103,184,172, 36,146,
-158, 78, 74, 12,142, 12,206,105,142,252,239,132, 17,240,214,210,165, 20,  0, 22,189,241, 70,171,252,198,252, 37, 75, 40,  0,164,
-207,157,235,177,188,159,114,115,159, 50, 26,141,235,  0, 96, 74, 98, 34,227,137,242,149,109,222,108, 89, 35,222,110,218, 52,165,
- 20,132,144,250,255,182,115,182,235,210, 82,154, 38,236,121,243, 82,136,171,164,238, 38,249,247,242, 53,177, 91,252,131,  2,123,
-  0,128, 80, 34,134, 81,167,  7,167,209, 46, 57,124,240,192,123,247, 79,157,218, 19, 64,177, 51, 33,  6,158,144,194,178,120, 10,
-107, 37,  5,206,170,135, 26,213, 69,253,239, 31,135, 11,251,183,187, 85, 71, 87,207, 29,144,119,237,147,144, 24,221,243, 33,247,
-141,226,148, 26,183, 46, 79, 77, 77,197,230,148,236,102,175, 73,204,110,184, 21, 73,175, 32,203,173, 86,232, 57,232, 88, 75,189,
-106,172,255,101,195,130,208,205, 95,208,172,188,101,203,150,229,188,245,202,235, 17,147,166, 76,246,211,235,117,248,228,163, 15,
-153, 21, 43, 86,232,103,207,158, 29,  5,224, 70,107,247,189, 61,123,246, 36,109,219,182, 45, 11,112,111,205,129,188,188, 60, 90,
- 84, 84,132,234,234,106,168,213,106,248,251,251, 35, 52, 52, 20,209,209,209, 24, 49, 98,132, 71,253, 78, 42,149,142,142,139,139,
- 91,255,218,107,175, 93,238,222,189,251,186,129,  3,  7,158,191,121,243,102,251,188,188,188,184,103,158,121,102,167, 84, 42, 93,
- 34,147,201,190,114, 67, 94,226,148, 41, 83, 50, 22, 47, 94, 28,106, 50,153, 32,145, 72,224,235,235,219, 86,163,209, 76,157, 52,
-105,210,195, 82,169,116,182, 76, 38,251,223,189, 72,238,167, 79,159,110,112,220,216,134,110,252, 38, 72,191,  3,128, 46,176, 44,
- 25,107,214, 24,216,235,121,151, 42, 62, 30, 17, 27,241,242,  3,189,218,190,215, 38, 80,210, 78,190, 73,186,  9,192, 69,241,116,
- 89,147,155,212, 24,234,106,208,166,235, 63,176,240,141, 41, 88, 39,251,163, 47, 30, 56,188, 26, 26,173,  1,227,147, 94,198,125,
-241, 79,227,209,212,  7, 32,145,136, 96, 52,179, 80,107,141,242,110,195,187, 54,209, 56,174,  1, 70, 96,202,140, 85,120,238,181,
-231,235,207, 62,116, 95,  2,196, 98, 17,126,216,255, 51,118,229,230, 97,253,218,207,161,215, 25, 32,228,241,225,231, 35,132,166,
-186, 36,177,182,  4,141,238, 62, 70, 41,  5, 40,103,121, 49, 28, 40,165, 48, 24, 69, 22,245, 36,  2,168,209, 12, 51, 15, 48,195,
- 12,179,145,  3,107,110,222,128, 45, 60,154, 78,219,135, 83,  4,248,251, 34,170,125, 12,122,244,237, 10,127, 63,  9,148,117,149,
- 40,175, 44,135, 66,121, 19, 38, 61,129,143,143, 15,194,195,227, 49,117,242, 89,186,101, 91,247,198,195,248, 27,174, 83,179,191,
- 63,116,124, 64, 40, 22, 66,167, 21,194,168, 21, 66, 47, 22,129, 79, 88, 80,240,160,215,213, 65,167, 85,163,125,251,118,114, 33,
-143,143, 26,168,240,241,199,  7, 33, 18, 53,223, 56,150,174, 95,234,180,  1,189,241,228, 27,205,126,174, 80, 40,168,195,241,160,
-144,144,144,  2, 66,136,158, 82,202, 15, 14, 14,246, 41, 44, 44, 12,205,200,200,200, 73, 75, 75,107,231,105, 67, 22, 70, 70, 78,
-175,255, 13, 32, 33, 24,104,181,104,199,154,140, 12, 58,107,214,172, 68, 83, 69,133, 91, 50,127,202,205,149, 14, 29, 58,116,209,
-200,  1,  3, 96, 18,137,176,124,249,114,110,234,  3, 15,140,161,148,102,187,229,202, 17,130,101,239,189, 87,127, 60,231,221,119,
-177,124,193,130,102,143,157,193,209,  8, 88,188, 56,131, 14, 26, 52,  8,217,217, 87,104, 82, 82,231,222,  0,174, 44, 94,156,161,
-115,147,252,243,250,246,238, 29, 96,235, 51,190, 98,  9,202, 42, 43,160, 82,212, 34,110,232, 48,159,159,190, 90,155, 61,225,153,
-127,246,134,101,243,130,230,192,190,180,104,  5,255,241,169, 15,243, 99,163,163, 57,155,103,248,238,242,207, 26, 92,180, 96,206,
-139, 22,195,239,149,217,137, 79, 78, 28,227,118,189,122, 68,254,245, 22,114,136, 27, 23, 39,185, 37,218,151, 79,112,102,193,179,
- 32,  1, 97, 48, 95, 57,  3,195,149,223, 81, 80,163,193,224,221, 21, 46,125,127,181, 76,118,232, 53,233,172, 78, 79,254,235,153,
-160,140, 13,223,113,209,209,209,204,194,197, 75,224,255,222, 66,252,240,195, 15,165,143, 60,242,136, 71,134,104, 19,196, 63,102,
-219,182,109,123,109,199,147, 39, 79, 30,235,202,247,212,106,117,194,222,189,123,229, 38,147,  9, 93,186,116,193,168, 81,163, 16,
- 24, 24,136,218,218, 90,220,184,113,  3, 87,175, 94,197,141, 27, 55,232,216,177, 99, 19,253,253,253, 93,174, 39,169, 84, 58,249,
-129,  7, 30,248,100,217,178,101,155,  6, 14, 28,248,137,205,216,105,215,174, 29,166, 78,157, 74,146,147,147,253,  0,228, 73,165,
-210,188,166,118, 47,117,148, 55,123,246,236,204, 89,179,102, 49, 39, 78,156,  0, 33,  4,161,161,161,245,175,221,187,119, 11,135,
- 15, 31,254,185, 84, 42, 61,226,138,188,187,153,252,109,231, 28,239,131,223,  8,249,135, 14,142,  9,125,114, 64,167,144, 25,132,
- 16,  1,165,212,196, 89, 94, 70,179, 73,175, 19, 50, 92,187,190,109,196,111,132,  5,116,233,186,237,216,213,239,244,155,164,135,
-196,211,101,101,205,168,111,244,234,217, 29, 12,147,131,130,218,106,  0,231,161, 44,189,  4,129, 88,132,237, 59, 63,133,182,202,
-140, 25,255,124, 21, 28,  7, 76,124,120,  4,204,124, 63,167, 55, 87, 80,112, 30, 28,  7,140,239, 79,  0,180,  3,208,  9,122,131,
- 17,201, 15,141,133, 56,136,193,250,141,123,192, 48, 64,230,119,235, 80,122,229,247,196, 71, 18, 98,115, 46,158,106, 92, 22, 71,
-  1,142,227,192,113, 28,204,102, 51, 12,  2, 10, 19, 49,193,104, 52, 66,235,163,  7, 56, 49, 24,106,134, 89, 72, 81,103,212, 67,
-163, 82, 54, 91,182,112, 63,  3,248,124,  9, 66, 67, 67,209,181,107, 87, 68,182, 25,  6,240, 24,152,205, 39,192,208, 90,232, 53,
- 44,204,156,  6,229, 55,106, 16, 30, 90,133,208,160,120, 40,212,243, 19, 26,219,228, 69,162,103, 65, 13, 85,128, 94,  4, 35, 99,
-130, 70,200, 71,157, 68,  0,190, 64,  8,112,190, 32, 60,130, 58,141, 22,138,242,107, 40, 60,145,139,154,226, 98,112, 28,  7,134,
-242, 60,106, 52, 95,173,250,195,112,126,102,230, 51,206,245,164,117, 95,119, 91,211,201,200,200,152,247,218,107,175, 61, 95, 92,
- 92,204, 16, 66,194,101, 50,217,119,176,108,238,228,211,130,182, 44, 88,185,114,229,198,155, 55,111, 34, 51, 51, 19,131,187,119,
-231,  5,247,237,219,226, 14,146, 62,119, 46, 81,  0,  9,148, 82,249,138, 21, 43,228,  0, 32, 77, 77,117,217, 43, 49, 26,141,171,
- 71, 90, 59,147, 80, 40, 68,183,110,221,176,101,255,254, 44,107, 52,192,101, 57,183,107,171,218,121,243, 82, 72,118,246, 21,122,
-226,132, 37, 98,101,247,255,247,251,239,191,191,116,222,188,148, 64, 87, 57,203,215,196,110,233,219,187,119,  0,143, 97,240,194,
-227, 51,160,211, 27,176,252,203, 47,225, 35,145, 64,175,215, 67,175,211,161,255,192,  1,177, 63,111,216, 48,235,193, 25, 51, 62,
-118, 22,117, 92, 48,231, 69, 14,  0,115,169,168,136,113, 36,124,199,238,233,201,189,119,232, 49, 58, 49, 59,227, 77, 58,102,226,
-179,137, 84, 20,235,145, 33, 96,191,107, 31,221, 28,236,244,188, 83, 11, 42,136,143,107,117,102, 28, 24, 19, 14,193,203, 50,168,
-102,196,128, 31, 28,225, 22,249,239,219,183,175, 60,186,109,187, 27,255,122,225,249, 14,111,190, 58, 23, 43,214,174, 62, 55, 52,
- 46,174,243,234,207, 86,251,188, 50,247,117,108, 24, 49, 12, 27, 55,110,124,226,177,199, 30, 91,223, 66,226, 79,216,182,109, 91,
-189,195,100, 13,171,191,  4,203, 86,233, 78,177,119,239, 94,121,120,120, 56,  6, 14, 28,200, 50, 12,195,183, 68,103, 57,  8,  4,
-  2,132,132,132,160, 77,155, 54,184,122,245, 42,246,238,221, 43,159, 58,117,170, 75,125, 69, 42,149,166, 76,152, 48,225,195,101,
-203,150,125,214,189,123,247, 85,132, 16, 14,192,231,  0, 30,  4,112, 16,192,  2, 74,105, 17, 33,228,117,  0, 11, 92,145,183,108,
-246,236,239, 71,166,164,144, 29, 59,118,128,207,231, 67, 46,151,227,204,153, 51,232,218,181, 43,222,127,255,125,244,233,211,  7,
-207, 63,255, 60,255,237,183,223, 94,118, 47,146,127,218,188, 15,254,112,116, 22,191,217,168, 17,208,216, 44,  0,134,207, 99,248,
- 44, 71,213, 58, 19,123,131, 16, 34,242, 19,241,250,  5,  8, 49, 88,210,251,254, 46, 72,124, 14,232, 49, 10,109,125,233,228, 39,
-226, 99,222, 12,  9,240, 25,163,223, 36,109, 70,153,112,224,241,108,132, 20,  0,160, 61,  2,163, 38, 64,103,214, 99,149,108, 45,
-190,217,152,137,177,137,241,  0,  0,173, 22,224,241,155, 22, 37,241,233, 14,  0, 48,155,237,247,166, 41,  7,144,  7,134, 39,194,
-147, 79, 61,139,228,212, 84,252,180,211, 66,100, 62,190,128,166,174,172,217,135,101,  2,175,158,252, 77,172, 25,  6,149,  9,218,
- 90, 45,106, 77, 70,212,104,141, 80, 24,212,168, 85,215, 65, 81,161, 70, 77,173, 30, 53,117, 77, 47,161,126, 70,190,152, 18, 66,
-192,227, 17, 16, 70,  4,179,153,130,213, 22, 67, 83,123,  9,165,229, 74,212, 40,234,160, 84,155, 81,163,208,163,164,164, 28,231,
- 46,156, 70,173,242, 52,134,197, 13,106,114,111,116, 30,  0, 70,173,135,238,242, 13, 84,255,118, 30,213,197,215,160, 82,214, 64,
-165,172,193,181,115, 39,112, 56,227, 43,228,109, 94,143,202,203,151, 97, 54,114,150,133,177,121,119, 38, 13,152,150,150, 70,172,
- 97,127, 99,114,114,114,207,133, 11, 23,190,214,182,109, 91, 77,102,102,102,191,140,140,140, 31,  1, 12,180, 86,186,199, 11, 78,
-  9, 35, 35,231,  0,192,240, 62,125, 48,107,214,172,138, 99, 23, 46,100,159, 58,123, 54,161, 53,202, 31, 12,228, 72, 83, 83,201,
-236,217,179, 19,  1, 64, 16, 17,225,150, 92,147, 53,204,178,101,203, 22, 68, 68, 68,224,205,217,179, 49,103,206, 28,108,149,203,
-239,138, 60,172,141,244,101, 50, 89,253, 11,  0, 14, 28, 56, 16,  5,224, 97, 23,197, 12,  9, 10, 14,238,193, 99, 24,252, 51, 57,
- 25,181, 74, 21, 74,202,110, 64, 32,224,131,207,183,188,  4,  2,  1, 68, 18, 31,116,137,142,254,232,242,241, 19, 46,109,230,115,
-169,168,  8,223,110,249,177,254,101,195,187,203, 63,195,187,203, 63,195, 46,249,  1, 15,238, 88,157,  0,  0,221,251,142,207, 73,
-154,248,108, 98,214,142, 47,229,217, 25,111,222, 21,117,145,255,245,199,168,120, 46, 14,247,103, 85,162, 87, 16, 31,188,128, 16,
-176,138, 10, 12,222, 93,  1, 95,190,133,  3,121, 78,230,100, 93,189,124,185,122,141,236,127,221,191,254,223,215,248,244,203,207,
-175,125,190,236,195,119, 95,123,241,165,135, 23, 46, 90,  8,137,191, 47, 70, 13,143,199,177,163,199,190, 62,148,123,200,227,123,
-118, 36,255, 29, 59,118, 96,200,144, 33, 93,  0,204,112, 53,236,111, 50,153, 16, 23, 23,199,153,205,102,190, 82,169,132,193, 96,
-128,193, 96,192,133, 11, 23, 32,151,203,145,155,155,139,182,109,219,194,100, 50, 33, 47, 47,207,105, 89,165, 82,233,244,212,212,
-212,143,167, 76,153, 18,176,106,213,170,  0, 66,136, 16,192,  1,  0, 74,  0,113,  0,126,  4, 96, 51, 60,247,  1,232,227, 76,222,
-182,215, 94,251,254,225,254,253,201,134,228,100,148,158, 58,133, 15, 63,252,144,251,233,167,159,254,223,245,235,215, 35,228,114,
-249,115,243,230,205,131,201,100, 66,124,124, 60,124,125,125, 71,224, 30,135,189, 49,208,128,236, 29, 79,136,167,203, 42,127,189,
- 92,185,122,221,193,203,175, 94, 40, 85,238,101, 64,249,  0,  5, 38,188,143, 95,  7,125,136,255, 42,146,177,191,247, 18,224,193,
-249,240, 23,112,  3, 31, 26, 16, 61,195,154, 46,184,  5, 59,246,215, 16, 64,133, 73, 79,189, 12,142,  3,128, 26, 88,150, 77, 54,
-161, 83,247, 56,136, 69,124,152, 89,  3,168,209, 66,170,254,254,254,168,174, 81, 52,121, 19, 31,127,244, 26,  1,128,115,191,126,
-  9,134,105,232, 36,112,186,223,161, 55,152,192, 19,136, 65,132,150, 28,154, 90,165,194,136, 17,205,215, 29,159, 51,130,227, 56,
-176, 44, 11,131,193,128, 58,142,133,210,104,130,170, 76,  5,229, 13, 37, 84,229, 53,168, 81,213,162, 92,175,133, 74, 83,139, 90,
- 67,211, 99,157,252,253, 52, 96, 89, 14,  6,163, 25,181, 74, 21, 10, 46, 23,227,232,137,124,252,122, 52, 31,231, 47, 20,162,228,
-122, 21,234, 52, 70,168,235, 12, 40, 43, 85,226,236,239, 87,145,151,119, 10, 37,101,229, 77,202,180, 55,117, 88,165,  6, 37,167,
-207,227,183,221,251,145,181,246, 35,236,223,180, 22, 37,133,151,193, 81, 19, 56, 66,234,137,223,157,228,154,179, 48,191, 51,240,
-249,124,  0,184,  9,224,102,112,112,112,137,191,191,191, 97,222,188,121,199, 96, 25, 48,198,192,178, 86,118,129,167,242, 87,174,
- 92,153,158,156,156, 12,  0,136,  9, 15,143,176,230,196,121,173,217, 57,108,225,127, 91, 36,192,133,240,127, 18,  0, 44, 95,190,
- 28,151,202,202, 48,101,236, 88,216,162,  1,249,249,249,  0, 96, 51,  2, 92,170,138, 57,239,190,139,215,223,123,175, 62,188,111,
-123,111, 59,182,189,119, 37,252,111, 67,118,246, 21,219,214,186, 13,206,219,142,179,179,175,124,235,138,156, 32, 62,255,191,122,
-163,  1, 60, 30, 15, 23,174, 20,226, 74,201,117, 28, 57,125,  6, 70,163,  9, 12,  8,248,124, 62,  8, 33,224,204,102,232, 52, 90,
-228, 31,200,217,239,130, 88,198,158,244, 31,159,250,240, 45, 30,255,145,147,249,176,143, 16,184,  6,187,112,178, 40, 54,199, 54,
-232, 47, 59,227, 77, 42, 96, 47, 37,252,169, 26,184,166, 12,194,142,221, 80, 49,235, 62,228,127,253, 49,248, 97,109,235, 63,170,
-152,117, 31,194,196, 12,  2,248,205, 55,151,238,177,221,219,249,248,248,250,124,250,197, 74,125,226,253,247, 11,135,141, 24,190,
-225,234,229,171,220,133,203,  5,  0, 71, 33, 22,137, 16, 63, 40, 30, 59,119,236,196,182,109,219,220, 50,  2,246,236,217,147, 32,
-149, 74,169,141,252,247,238,221,139,213,171, 87, 27,  1,224,232,209,163, 70,169, 84,250,152, 43,169,133,162,162, 34, 88,183, 38,
-102,138,138,138,144,149,149,133,252,252,124,104, 52, 26, 40, 20, 10, 28, 63,126, 28,197,197,197,184,126,253, 58, 58,117,234,132,
-162,162,162,102,229,205,156, 57,243,201, 71, 31,125,116,105, 66, 66,130,223,177, 99,199,  2,180, 90,237,191, 36, 18, 73, 14,128,
-207,100, 50,217,124,153, 76,166,180, 26,  0, 67,  8, 33, 66, 74,169,  9,205, 76,111,159, 61,123,246,147, 63,204,153,179, 33, 62,
- 34,130,176,115,231, 98,132,209,136, 99, 59,118,208,210,210,210,103,101, 50,217,187, 50,153,172, 18,192,186,115,231,206,177, 44,
-203,194,207,207, 15, 81, 81, 81,126, 38,147,  9,127, 69, 52,150,  2,136,  4,208,101,242,224,142, 47,116,  8,245,157,  1,147, 14,
-232, 62,  6, 39,195, 39,227,129,217, 95, 65, 87, 85, 11, 94,128, 63,228,159, 60,137, 81,189,126, 69, 72,126,214,104,  0, 29,155,
-250,129,174,  1,237,241, 91,254, 86, 59,123, 67,  3, 75,154,208,  4,152, 12,224,115, 60, 48,214,126,191,237,  7, 75,186, 41,126,
- 92,106,211, 13,245, 44,197, 67,  3,237, 13, 60, 98,189, 13,  1, 32, 16,131, 37,102, 88,253, 96, 76,155,241, 18,  0,200,175, 29,
- 94,211,100,207, 50,115, 20, 44,199,128, 97, 89, 48, 70,  3,180, 86,203, 66,199,227,193,151,213, 65,165,163, 32,  2,  2,179,217,
- 12,173, 25,168,208, 24,209, 84, 50,155, 53,114,208, 11,120,224,180, 44, 88, 78,  9,117,157,  9, 60, 34,128,129, 53,193, 72,141,
- 96, 77, 70, 64,200,129, 33,  0, 17,113, 80,234,204, 40,175,212, 66, 99, 96, 27,117,146, 25, 98,174, 55,  0,  8,249,131, 79, 76,
-122, 29,148, 53, 53, 96,  8, 15,124, 62,  5, 40, 31, 60,226,121,226,239,226,181,139,198,238,157,186, 11, 93,  9,251, 55,  8,147,
- 18,  2,137, 68,  2,  0, 58,  0, 70, 62,159,143, 43, 87,174, 96,241,226,197, 15,  3,184, 62,111,222,188,129,129,129,129, 65, 74,
-165,242, 90,109,109,173,219,225,110, 97,100,228, 51,  0,208,166, 77, 27,251, 14, 92,251,217,103,159,101,  3, 72, 26,216,183,239,
-190,214,234,  8,179,103,207, 78,116,197,  0,248, 41, 55, 55, 97,232,208,161, 81, 35,  7, 12,  0,241,247,199,226,197,139, 49,119,
-238, 92,  8,  4,  2,152, 20, 10,  4,  6,  6,226,205,217,179,235,199,  5,184, 50, 56,208, 49,199,239,108, 76, 64, 83, 88,236,198,
-224,206, 19, 39, 78,224,196,137, 19,245,215, 55,149,227, 84,212,212,244,240,243,247, 71,149, 66,  1,249,145, 35,224, 51, 60, 24,
- 76, 38,104,117, 58,112, 28, 87, 63, 88,145, 53, 25, 97, 52, 24, 92,169, 99, 14,  0, 99, 77,  3,112,118, 13, 95,111, 61,143,119,
-151,127, 38,  4,128,216,232,232,138,171,231,126,107, 81,189, 38,165,124, 64, 46,156,204, 76,216,189,237, 75,121,107,204,  2,112,
- 39,236,223, 32, 44,187,249,127, 24,240,212,171, 16,197,244,179,232,138,170, 50, 20,212, 88, 54,145, 19,141,152,128, 98, 51, 11,
-159, 21, 71,154,149,161, 82,169,130, 68, 18, 49,186,198,196,136,175,150, 92,111, 91, 93, 89,141,105,143,207,144,239,218,151,133,
- 79, 62, 88,158,185,109,215,142,228,216,152, 88, 60, 57,245,  9,228,157,204,197,182, 45, 91,232,100, 23, 66,236,246, 94,255,222,
-189,123, 49,102,204, 24,155,177, 40,188,113,227,  6,158,127,254,121,161,237,246,157,201,170,174,174,198,168, 81,163, 96, 54,155,
- 81, 84, 84,132,220,220, 92,244,234,213, 11,129,129,129,232,208,161,  3,  6, 12, 24,  0,134, 97,192, 48, 12,218,182,109, 91, 31,
-165,220, 29,174, 51,  0,  0, 32,  0, 73, 68, 65, 84,106,194, 83,239,213,175, 95,191,143, 71,140, 24,193,203,207,207, 15, 48,155,
-205,229, 91,182,108, 81,233,116,186,197, 50,153,204,222,128,125, 97,220,184,113,197,187,118,237,138, 33,132,148,161,137, 29,109,
-165, 82,233,192,217,137,137,235,134,241,249,164,114,209, 34, 80,147,  9,114, 30,143,203,211,106,159,150,201,100,223,216,219, 29,
-239,188,243, 14,159, 97, 24,212,212,212,224,202,149, 43, 21,125,250,244,137,248,203, 27,  0,250, 77,210,216,200, 64,201,200,113,
-253,163,158, 15,144,  8,134,178,102, 78,193,167,230,  0,  4,181,229,149,213,234,161,171, 82,  2, 66, 62,204,181,106,148, 40,140,
- 64,104, 71, 48,156, 81,220, 92,136,247,178, 74,133,110, 65,  1, 96, 13,192,229,156,111,209, 53,225,193,122,  7,206,100, 52, 65,
-  0,  6,117,122,203, 14,181, 15, 37,196, 65, 18, 26,213,108,129, 31,234, 75,176,235, 12,133, 64, 12,  8, 59, 62,  8, 99,241,161,
-122,199, 65, 32, 20,193,  4, 61,252, 36,150, 29, 73,119,236,218,132,223,142,230, 36,206, 24, 59,168,105,109,196,113, 16, 26,117,
- 48, 65,  8,134, 97,  1,189, 69,177,153, 76, 38, 24,244,  2,240,248,  2, 64, 15, 80,206,146, 34,232, 20, 29,211,164, 44,173,158,
-  3,143, 71, 96, 98, 77,208, 27, 56,168,212,150,118,104,226, 40,140,  6, 14,224,  3, 60,  1, 15,124, 49, 64,116,102,112,132,  5,
-  7, 29,212, 58,107, 64,218,  9,204,  0, 24, 14,160,  4, 96, 24, 14,132,240,192, 81,  2,134,177,142,165,226, 24,112, 12,  3,194,
-185,230, 32,219,121,255, 66, 79, 27,144,143,143, 15,172,222,126,248,149, 43, 87, 42, 22, 47, 94,156,  8,224,145,121,243,230,141,
-237,220,185,179, 70,173, 86, 87,179, 44, 91, 79, 20,238,240,255,202,149, 43,191, 76, 78, 78, 70,116, 88, 88,253,201,232,176,176,
- 32,107, 20, 32,252,207,232, 48, 70,163, 81,110,243,246,169, 90,141,127,255,251,223, 48, 84, 87,215,143,124,235,106, 53, 86,  4,
-  6,  3, 30,126,248,225,138,210,138,138,199,162,124,124, 54,220,137,178,217, 15,234,179,207,255, 55,134, 65,131,  6, 33, 41,169,
-115,253,245,141,173,  3,  0,  0,172,193,136, 90, 99, 13,244,122, 61,130,  2,  3, 33, 22,138, 96, 50,179,160,148,194,108, 54,195,
-104, 52,194,100, 50,129, 99,205,174,214, 47,119,169,168,136,137,141,142,182,121,  4,220,165,162, 34,230,219, 45, 63,138,237, 35,
-  2,177,209,209,181,104,165,193,108, 61,226,146,115, 74, 10,143,183,202, 51,246,116, 12,192,253, 89,149,168,136,206,132,176, 99,
- 55,144,152,126,232,180,246, 20,170,244, 28,124,249,  4,198, 95,126,192,197, 43, 87,157,238,159,167, 99,141, 56,145,119, 20, 31,
- 47,251,  8,247, 37,140,196, 59,255,239, 61,252,188,251,103,108, 88,255, 13, 70,140, 30,153,220, 33,186, 35,248, 62,  2,236, 59,
-180, 15, 27,191,254,  6, 91,127,216,130,157, 59,119,210,255,251,191,255, 35,205,144, 44,117, 36,126, 27,106,107,221,223,224, 78,
-173, 86, 35, 48, 48,240,  8,128, 97,209,209,209, 24, 52,104, 16,120, 60, 75,154,181, 83,167, 78, 16,137, 68, 80, 42,149,136,142,
-142,134,191,191,255, 53,181, 90,221,169, 41, 89, 50,153,236,156, 84, 42, 77,223,186,117,235,248,216,216,216, 30, 91,182,108,169,
- 83, 40, 20, 11,100, 50,217, 70,187,242, 79,190,255,254,251, 95, 91,187,118,237,102,  0, 21,  0, 82,  0,252, 10,160,127, 35,242,
- 78, 73,165,210,244,160,227,199,223,122,148,101,241, 17,192,125, 89, 87,247,132,131,188, 71, 94,122,233,165,143,210,210,210,112,
-245,234, 85,236,220,185, 19, 44,203,238,  7,240,232,189, 66,234,  3,  6, 12,192,233,211,167,235,243,254,205,134,226, 28,142, 59,
- 79, 30,220,113, 97,128, 68, 48,180, 82,165,255,249,240,165,202,197,224,137,128,139,135,240,143,104,138,249, 47, 62,140, 65,189,
-163,241,146,116, 28, 38,118, 49,  2,103,247,130, 10, 36, 44,154, 29,172, 83,139,130,218, 98,240, 69,192, 67, 19, 95,197,198, 79,
- 63,  0, 96,  4,180,  6,152,117,192, 15,242,211,200, 62,102,153, 81,216,190, 99, 12, 24,190,115,242, 26,223,159,192,164,  7,118,
-236,220,131,193, 99, 95,180,120,255, 16,128, 39,  1, 82, 39,164, 96,252,232, 73,  0,128,146,107,133, 96,245,198,230, 45,122, 74,
-193, 18, 11,193, 27,140,150,193,127,  6,189, 14, 90,173, 22,117,117,117, 80,171,148, 80,171,213, 80,169,235,160,175,171,131, 78,
-167,107,186,241,215, 17,232,244,102,232,244,102,104,180, 38,168,235, 12, 80,168, 13,168, 85, 25,161, 84,155, 80, 91,107,249, 95,
- 83,205,162, 70,193,162, 70,201,162,170,198,136,155, 85, 77,151,145,161, 20,102,  0,196, 76, 64, 24, 14,148, 80,128, 82, 80,202,
-131,153,251,163,250, 56,171,246,112, 55, 54,222,115, 68, 79,228,238,202,197,207,251,127,174, 55, 10, 46, 94,187,232,210,119,121,
- 60, 30,248,150,250,138,  2,208,101,201,146, 37,103,  0,172,120,243,205, 55, 95,233,220,185, 51,107,  9, 18, 88, 10,230, 38,249,
- 19, 97,100,228, 54,  0,136,140,140,188,229,195, 89,179,102,177,199, 47, 94,220,212, 90, 99,  1,108,225,127, 87,247,141, 55,217,
- 77,177,248,254,251,239,113,185,220,146,194,249, 41, 39,167,193,103, 23, 47, 94,140,  8, 15, 15, 87,252, 25, 74, 32, 41,169, 51,
- 99, 85,104,142, 10,191,193,231, 78, 13,188,  0,255, 11,156,217, 12, 85,141,  2, 85, 85, 85,168,174, 85, 64,163,213, 66,163,213,
- 66, 93, 87,  7,141, 82,  5,117,109, 45,244, 58, 45,140,122, 61, 56,214,236, 84,231,196, 70, 71,219,116,  6,  7,192,104,159, 14,
-  0,128,111,183,252,136,119,151,127, 22,  4, 32,210,221,251, 62,127, 50, 51,193, 49,239, 95,248,251,238,132, 63, 91, 41,151, 77,
-139, 70,167,181,167, 64, 98,250,193,112, 32, 19,215,254, 57, 16,190,124,130, 67, 99,194,193, 42, 43, 49,120, 79,  5,156,100,  0,
-144,156,156, 76,158,123,121, 38, 46, 95,188,136,188,156, 67,  8,244, 15,196,244,105,211, 17, 20, 26,130,147, 71,143,195, 79, 40,
-134,175,175, 47,218, 70,183,195,166,239, 54,225,205,183,223, 66, 93,173,231,187,212,198,197,197,185,253, 29,127,127,127, 40,149,
-202, 97, 12,195, 24, 59,116,232,128,161, 67,135,162,119,239,222,  8, 11, 11,131, 88, 44, 70,116,116, 52,250,247,239,143,160,160,
- 32,168,213,234, 78,254,254,254,205,202,147,201,100, 75, 15, 28, 56,144,181,126,253,122,129, 66,161,120,199,129,172, 83, 70,141,
- 26,245,241,218,181,107,191,138,140,140, 92, 68,  8,241,  3,240, 38,128,119,155,145,247,246, 66,181,122,233,179, 44,107,254, 82,
-167,123,204, 65, 94,242,163,210,255,108,125,241,149, 57,188,139, 23, 47,226,200,145, 35, 88,187,118,109, 29,128,249,247,154,103,
-239, 24,209,107, 42,194,231,168,  4, 68, 60,134,248, 23, 87,107, 54,108,202,187, 58,255,244,181,154,163, 58, 51,185,140,170,171,
- 16,111,125,  1,139,226,213, 56,190, 96, 40, 62, 73,172,131,239, 15,179,128,154, 18,212, 81,241, 89,171,229,213,  4,254, 24,213,
-127, 38,255, 71,252,231, 63,235,209, 53,160, 47,126, 63,124,  6,123,229,231,241,255,217,251,242,248,166,170,244,253,231,220, 36,
-109,218,  2, 93,216,119, 40, 82,118, 89,138,208,130,208,  4, 82,168, 32, 42,218,  2,194,136,157,130, 77,113, 28, 65,196, 65, 69,
-197, 13,149,249, 89,192,113,161, 41, 35, 95,112,  6,  6,104,113, 97,147, 37,144, 84,150,150, 90,112, 97, 17, 40, 20, 40,148,165,
-208,164, 91,246,228,158,223, 31,201, 13,105, 73,147,155,180,  8,104,158,207, 39,144,187,244,205,185,247,158,123,158,247,125,207,
-123,222, 87, 26,223, 15,137,163,236, 29,141, 10,132, 48,219,248, 95,100,210,224,222,120,255,255,125,132,157,199,170,209,172, 91,
- 95, 60,250,232, 36,236,218,247, 13,182,239,250,159,253,226,108, 22,  4,139, 60,143,115,148,181,193,198,218,173, 25, 56,172, 25,
-179,217, 12,163,209,  8,131,193,  0,157,222,  0,131, 94,  7,131, 94,  7,189,201,  8,179,201,216,176,251,203,208, 28, 85,181, 54,
- 84, 27, 88, 84, 27, 88,251,247, 26, 22,181, 58, 43,106,245, 86,104, 53, 54, 84,104, 44,168,208, 90, 80, 81, 97,193,205,155,102,
- 92,191,105,241,168,  0,220,114,255,187,180,153,115,223,  8, 40,  4,132,128,214,139,250,167,196, 59,217,190, 50,243, 21,244,137,
-239,227,220, 86,174, 81, 58, 61,  2,  7,119, 28,196,233,139,167,121, 37,123, 98, 89,251,111,229,230,230, 30,160,148,246, 79, 78,
- 78,158,217,189,123,247,214,  0, 24,150,101,131, 45, 22, 75,164,213,106,109,225, 70,  1, 96, 61,184,254, 23,127,254,249,231, 19,
-146,147,147,209,189,117,107, 94, 83, 87,141,  1, 23,252, 55,180,119,111,175,  1,108, 61,219,181,147,102,102,102,226,196,197,139,
-213, 95,239,222,141, 83,167, 78, 57,173,254, 94,189,122,193,113,204,252,245,238,221,184,120,241, 34, 78, 23, 21, 25,188,201,188,
- 19, 49,  0,  0,104, 66, 66,194,243,174,164,207,253, 31, 27, 27,203,203,157, 11,  0,197,167,206, 21, 89,173, 86,152,205, 38,104,
-174,151,227,198,213,107,184,121,237, 58,110, 94,187, 14, 77,249, 13, 84, 86, 84,192,164,211,217,227,103, 42, 43, 49, 88, 38,243,
-118, 15,173,139, 51, 63, 21, 46,206,252, 84,  8,160, 26,  0, 59,124,200,131,183,157,228, 18, 23,192, 27, 39,143,230, 74,202,206,
- 21,169,  6, 14,187,213,134,243,103, 15, 73, 42,111,148,168, 26,211, 63,200, 20,109, 29,203,223, 31,156,209,232, 80, 58,251, 33,
-208,243,191,162,205,170,163,  8, 91,121,  4, 87,167,118, 67,236,206,114, 16, 81, 48,132,  4, 16, 50,222, 21,208,191,189,240,  2,
-121,243,163,247,241,226,130,249,176,176, 54,156,186, 80,140, 25, 79, 79, 71,144, 88,140,239,190,221,  2, 88,108, 48, 25, 77,216,
- 95,116,  8,  6, 67, 45,210, 83, 83,243,138,138,138,168,  7, 66, 36,147, 39, 79,150,142, 27, 55, 14,132, 16,236,217,179,231, 54,
-151,254, 43,175,240,143, 19,106,217,178, 37,174, 92,185,  2,  0,194,172,172, 44,220,184,113,  3,  3,  6, 12, 64, 68, 68,  4, 24,
-134, 65, 97, 97, 33, 24,134,  1, 33,  4, 87,174, 92, 65,203,150, 45,189,202, 84, 40, 20, 31,152,205,230,209, 10,133, 98,163, 11,
- 89, 63, 61,106,212,168,204,217,179,103, 71,102,101,101,137,  9, 33, 12,128,111,  0, 44, 80, 40, 20,215,189,200,251,199, 97,139,
-101,104,125,121,211, 22,126,189,233,169,233,127, 35, 19,230,100, 65,125,248, 36, 50, 51, 51,217,234,234,234, 52,133, 66,113,225,
-126,116,239, 15, 26, 52,200,249,225, 53,  5,  0,224,220,255, 14,157,127, 65,163, 51, 29,129, 61,112,171,125,126,241,141,236,209,
-189,219, 46, 18,158, 63, 28,133,255,123,  6,  8, 14,  3, 76, 58,128, 82, 88,  4,226,235,251, 79, 92,253, 18, 64,131,217,151,214,
-175,251, 66, 58,125,198, 76, 21,  0,232, 88, 11,206, 86,150,  2,176,225,129, 22,221, 33,149, 62,136,182,173,218,161,162,170,218,
-238, 43, 48, 91,113,181, 82,135, 62, 30, 46,170, 83,151,120, 92, 46,205,119,188,153, 66, 36, 13,180,199,  0,236, 60,102,193,174,
-109,185,184,126,243, 10, 90, 70,216, 87, 18, 68,  4,137,240,224, 80,207,235, 55,205, 16, 34,136,181,194,  6,  1, 88, 66,192,216,
- 88,192, 98,133, 77, 36,  4,  8,  3,238,157,100, 41,236,185,  2, 60,224,137,105,175,146,111,255,179,128,134,  6, 81,  8, 69, 46,
- 30,  6, 11, 96,165,128,209, 12,216, 76, 54, 16, 66, 64,130,  8,172, 54, 64,103,  2,102,165,254,147,184, 75,229,104,115,209,208,
- 88,134,  5,113,184,255,237, 74,  1,129,141,101,192,  8, 28, 43,  5,  0, 80,  1,  5, 40, 63, 47,128, 43,249,187,219, 62,184,227,
- 96,119,175, 83, 18, 54, 27, 76, 38, 19,146,147,147,251,229,230,230, 46,  7, 48, 40, 55, 55,119,103,110,110,238,254,228,228,228,
- 23,122,244,232, 97, 33,132,180,252,228,147, 79,118,191,250,234,171, 51, 52, 26, 77,158,  7,229,211,217, 39, 23, 44, 88,176,120,
-193,130,  5,216,185,115, 39,116,215,111,127,151,187,183,110,141,243,231,207,  3,128,138, 79, 98,160,134,146,254,136,218,180,145,
-124,254,249,231, 42, 74, 41,134,246,234, 37, 29, 50, 96,128,218,155,172,  1,125,250,168,  9,195,140, 63,245,227,143,221,  0,  4,
-  3,248,151, 37, 56, 24, 34,147,  9, 61,219,183,199,252,249,243,113,240,224,193,165, 49, 49, 49,121,253, 59,118,244, 26,163,224,
- 46, 15,128,191, 49,  0,174,224,242,  0,196,197,165,252, 88, 80, 80,126, 80, 46,151,  7, 57,166,  9, 70,  0,200,231,155,  4,168,
-219,192,190,175, 27,174, 94, 27,199, 90,109,189,117, 85, 85,168,186,121,  3,132, 48,160,148,133,209,104,  4,165, 20,148, 82,156,
- 63,249, 27, 44,102, 19, 30, 24, 26,235,237, 30,186,142, 57, 17,  0,152,  9,210,  4,118,130, 52,161, 78,208,159, 99,138,128, 55,
- 78,253,252,181,228,202,185, 34, 21,  0,116,235,218, 21,223,213,243,  2,180,238, 50, 68,122, 55,  7,227,161,223,151,163,232, 17,
- 96, 80,172, 12,229,127, 27,129,118, 95, 28,194, 25,141, 14,145, 65,  4, 21, 26, 45,132,132,120,245,  0,112,152, 57,115,102,157,
- 51,183,110,221, 74, 39, 76,124,  4,219,182,108,195,166, 77,155,240,246,162, 55,177, 91,189, 23,  2,161,  0, 29, 59,117, 76,168,
-170,242,188,116, 57, 41, 41, 73,157,148,148, 68,118,238,220, 41, 25, 55,110, 92,157, 88,128, 61,123,246,224,236,217,179, 70,133,
- 66,209,158, 79,219,186,117,235,134,146,146, 18,244,237,219,215, 58,111,222,188,160, 13, 27, 54, 32, 60, 60, 28,167, 78,157,186,
-205,243, 90, 82, 82,130,110, 60,159,179, 66,113, 43,241,156, 92, 46,127,230,161,135, 30,122,247,233,167,159, 14, 47, 42, 42,106,
-110, 52, 26,255, 26, 18, 18,242,168,193, 96,248, 88,161, 80,124,199, 83,222,207,174,242, 30,253,251,134,181, 15,143,157, 76,254,
-169,  4, 72,135,199,240,193,138,215,169,166,248, 84,154, 66,161,200,193, 31, 24,117, 20,  0,241,211,138, 19,154,255,201,207,136,
-159, 86,112, 83,154,165,199,255, 39,255,190,198,104,213, 13,127,160,213,132,168, 80,193, 67,  2,147, 49,204, 74,153,154,138, 26,
-115, 65,254,217,107,187,202, 52,250, 60,241,211,138,171, 88,185,210,237, 15,212,234, 90,171, 51,254, 54, 71, 10, 64,197, 10,184,
-105, 62,  1,206, 86, 95,197, 91, 47,164, 65,175, 55,161,218, 96,143,  1, 48, 51,193, 24,147,228, 57,205,238,155,139, 82,201,206,
-237, 67,237, 47,183,141,179,156,173, 72, 26, 64, 48,237,249,101,  8, 13, 13, 70,139, 16,177, 20,128,170,248,248, 81,105,124,127,
-207,  9, 65,132,212, 10, 51,177, 43,  1, 32,  4, 54, 74,237,138,128,213,177,220,143, 48, 16,178, 44,172,220,178,  3, 47, 74, 64,
-165, 33,  2,  6, 83,  5,130,132,140, 51,205,153,149,  5, 44, 22, 10,139,149,162,214,192,130,  8,  8,108, 32,176,176,183, 92,247,
-110,  9,150,101,192, 16, 27,136,141,128, 50,212,233,254, 39, 13, 24,207,156,164, 23, 95,146,146,149, 43, 79,121,180,240,126,203,
-255,173,177,125,199, 76, 41,133,193, 96,192,128,  1,  3,174, 70, 71, 71, 79,190,112,225, 66,207, 77,155, 54, 21,  2,120, 60, 55,
- 55,247,113,215,147, 63,250,232, 35,245,171,175,190, 42,213,104, 52,222,  8,194,121, 67, 50, 50, 50, 26, 60,233,169,103,159,  5,
-224, 91, 98, 32, 46,235, 94,125, 12,235,211, 71, 58,152,  7,249,115,232,223,171,215,110, 87, 79, 70,102,102,230,103,147, 38, 77,
-178,158, 62,125, 90,120,241,226, 69,116,107,217, 50,191, 99,104, 40,175,  0,197, 59,145,  7,160, 30,185, 95,207,203,203,115,141,
-241, 56,230, 80,  4,248,102, 12,212,133,180,111,247,212,169,189,251,242, 35,194,194, 90, 84,107, 43, 97,181, 90, 65, 29,239,129,
-246,122, 57,170,181, 90, 80, 74,249, 88,255,246,151,245, 86,204,  9,227, 88, 14,200, 12, 31,242, 32, 38, 72, 19,156,137,129,138,
- 47, 92,224,175,  4,232,127,145, 92, 46, 46,116, 90,249,223,229,124,169,  2,128,214,209, 35,165,  3, 99, 39,169,239,222,240, 74,
-111, 87,  2,176, 10,131, 50,222,194, 53,150,197,192, 53,133, 40, 76,106,139,126,219,174, 67, 72,128,230, 34,255,106,179, 77,154,
- 52,137,236, 83,239,163, 99, 18,199, 98,203,230,111,241,222,210,143,176,176,170, 10,148,101,177,113,227,102,148,149,149, 61, 10,
- 96,155, 87,143,170, 27, 69,  0,  0, 38, 79,158,252, 51,128, 26, 62,109,137,143,143, 39, 87,174, 92,161, 71,143, 30, 13, 26, 50,
-100,  8,198,142, 29, 11,149, 74,133, 46, 93,186,192,100, 50, 33, 33, 33,  1,148, 82,246,232,209,163,140, 72, 36,242, 57, 35,160,
- 92, 46,239, 27, 30, 30,190,124,234,212,169,162,147, 39, 79,182, 48,153, 76, 13,  5,  6,242,149, 55,184,227,160, 41,107,  7,141,
-158, 74,190,204,  3,170, 13,128,249,252, 78, 86, 83,172,170, 31, 24,120,223,128,203,  3,224,106,249,187,219,231,214,149,234, 66,
-254,220,246,111, 23,255, 39, 47,189,120,179, 54, 31, 64,123,199,203,107,  2, 80,  6,160, 68,252,180,194,171,139,115,200,192,199,
-212, 39,126, 45,149,218,104, 51,149,235,203, 81,171,171,182,175,251,103, 66,241,143,143,249,167,152, 76,154,216,159,188, 63,231,
- 81,  9, 24,189,202,149, 11,155, 53, 11,135,205,162,  5,168, 14, 23, 15,101,147,153,211,146,188,202,178, 64,  0, 80,106, 39,106,
-  8, 16, 68, 29,138,128,131,252,237, 57,  0,  1,216,248,205, 77,164,166,191, 65,178, 63,125,155, 90, 45, 26,  8, 29, 11,123, 41,
-165,176, 89, 41,140, 22,160,186,198, 10, 11, 40,172,148,129, 80, 68,176,228,221,207, 26,188,238,217,179,237, 65, 90,107,215,156,
-165,196, 98,183,254, 41,  0, 74,  9, 64, 29, 22,  3, 21,128,  8, 88,176,172, 16, 47, 47, 24,199,235, 30,206,126,111,182,244,194,
-185, 11,158,  8, 88,  4,251, 82, 13, 79,236,196,  2,128,201,100,130, 86,171,213,134,135,135, 35, 54, 54,246,151, 97,195,134,  5,
-223,184,113,  3,231,206,157,179, 47, 15, 99, 89,201,230,205,155, 85, 14, 37, 64,197, 67,  9,176,164, 36, 37,165,116, 27, 48,192,
-246, 80,239,222, 58, 71, 31, 53,161,238,138, 72,164, 36,217,159,109, 55, 30, 73,129, 94,121,229, 21, 41,  0, 12,237,213,235,182,
- 99,177,  3,  7, 54,138, 32,  6,244,233,243,  5,195, 48,182, 83, 63,254, 24,214,182,109,219,155,253, 71,140, 88,123, 55, 95,126,
- 55,164,174,139,141,141,117,141,182,118,174, 99,245, 65,  9, 56, 57,120,236,152,225, 91,254,253,229,230,232,238,221,250,154, 76,
- 70,216, 44, 86,176, 44,139,230,145,145,168,210,104, 48, 88, 38,147,242,176,254,  1,160,242,157,151,255,222,  6,128,185,248,194,
-133, 32,110,254,255,240,209, 95, 49, 65,154,192, 46,206,252,212, 91,114, 32, 39, 98,218,107,233,169,211,167,164,251,118,125, 87,
-199,197, 63,102,252,227, 82,166, 69,124,163,158,107, 67,  1,126,238,247,243,231,176,161,223,151,  3,223,191,224,220,126,224,187,
- 91, 75,128,171, 44, 54,191,219, 59, 70, 50,134,124, 85,250,213, 35,227, 38, 38,237,120,238,153, 89,  7, 30, 28, 56,224,225, 45,
-223,109, 69,254,207, 71,144,158,158,190,125,101,  3,  6,154, 23, 69, 96,214, 55,223,124,243,239,111,190,249, 38, 46, 41, 41,137,
-119,227,198,141, 27, 55,102,247,238,221,251,182,109,219,134,232,232,104, 36, 38, 38, 34, 60, 60,252, 76, 85, 85, 85,204,137, 19,
- 39, 80, 82, 82,194,136, 68, 34,140, 27, 55, 78,230,235,117, 58,  2,  3,151,110,221,186,181,193,192, 64, 31,229,253, 36,151,203,
- 63,252, 54,247,177,215, 13, 29,103,192,240,227, 27,236,149,253, 75,158,241, 87,222,189,168,  8,240,246,  0, 52,  4,241,211, 10,
- 29,128, 95, 29, 31,191,240,204, 51, 47,168, 51, 50, 94,149,102, 41,222, 83,117,236,218, 19,128,  9,162, 96, 49, 46, 95,173, 70,
-194,164,153,196,119,121,143,169, 31,232, 29,131, 53,171,191,  6,216,139,  0,132,176, 26, 13,232,216, 62, 92,218,165,133,149,255,
-203,111, 99, 33,100, 88, 88,136, 16, 34,106,189,165,  8,192, 10, 80, 27,248,  6,134,185, 34,253,239,111, 19,  0, 88,252,218, 28,
- 42, 18,218,173,125, 43,107,119,153, 87,214, 80,216,172,128, 64,200,226,139,207,249, 41, 61,207,166,218, 83, 35,175,254,242, 52,
-  5,151, 19,158,  1, 88, 98,119,247,207, 95,240,168, 79,141,172,170,173, 82, 71,182,141,108,108,255, 98,  0,251, 42, 10,131,193,
-  0,155,205,134,234,234,106,  8,  4,  2,216,108, 54,180,107,215, 14, 22,139,  5, 10,133, 66, 85,207, 19,160,242, 86, 51, 96,240,
-128,  1,185,  0,208, 20, 25,255,  0, 32,138, 16, 53,  0, 68, 13, 28,120, 71,204,188,126,189,122,101, 53, 70,192,203,139, 23,215,
- 89, 37,177,224,237,183,235,120,  6,124,153,251,119, 67,230, 58, 79,171,  1,124, 72,  7,124,234,177,217,179,250,  3, 16,156,202,
-203,179, 24,245,  6,176, 54, 27,250,196,198, 74,219,199,244, 69,183,129,125,249,189,115,148, 76,221,245,253,118,231,230,136,190,
-209,206,239,187,190,223,126,219,182,167,208,248, 51, 87, 35,  9,211, 34, 30, 99,199, 19,233,201, 83,231,112,245,226, 49, 21,  0,
-236,219,245,157,170,109,151,115,210,  1,195,255,226,179, 18, 48,101,202, 20,248,154,222,215, 70, 60,231,221, 46,157,220, 14,223,
- 95, 49,222,241,  1,127,230,204,153,223,  3, 96,138,138,138,216,189,  5,121,104,217,170, 37, 26, 83,159, 35, 41, 41,233,203,164,
-164,164,175,224, 61,189,115, 29, 52,111,222, 92,245,212, 83, 79,145,252,252,124,122,238,220, 57, 20, 22, 22,162,166,166, 38,166,
- 41,106,  1, 56, 72,251,255,201,229,114, 81,126,126,254,  0,179,217,252,134,235, 92,190,159,242, 22,201,229,127, 17,133,247,248,
-106,126,213,185,221, 51, 26, 43,239,110,131, 91,  5,224,110,191, 95, 10,128,175, 83,  9, 13,186,170,158,124, 86,189,125,215, 89,
-242,196,196, 80,218,166, 99,103,104,106,172, 72,152,248,140,223, 29, 33,254,161,222, 36,254,161,215, 33,151,191, 69,129,235,136,
-108, 46, 68,151, 40,214,167,151,126,232, 95, 23,220,177,  2, 54,239,124,184,146,  0,192,220,121, 47, 80,179,193,  2, 22,246,101,
-115,203, 63, 95,238,215,111,166,205,178,215, 12, 88,253,239, 83,148,165,  2,188,246,234,227,119,179,186, 89,144,171, 27,219,100,
- 50,193,108, 54, 59,137,140, 35,176, 64,149, 64, 47, 46, 72, 31,210, 15,251,  9,243,194,133, 41,193, 14, 15,138,173,145,178, 40,
-  0,107,239,132,132, 58,109,238,214,190, 29,111,  1,193,172, 73,253,236, 36,159, 13, 63,212, 47,  5, 92,199,254,110, 17,167,238,
- 55, 44, 14,253,134,161,209,247,210, 91, 97,159,250, 58,176,149,  4,195,192,120, 94,145,122,174,198,138,152,230,124,134,200, 38,
-233, 10,116,232,208,161, 77,217,167,252,206,128, 19, 31, 31, 79,188, 37, 98,107,  4,105,127, 32,151,203,191,117,141, 13,104,164,
-188,127,200,229,242,245,174,177,  1,247,187, 18,192,  7,100,208,160, 65, 20,  1,  4,208, 72,244,236,217, 19,197,197,197,129, 27,
- 17, 64,  0,  1,  4,112,159,128,  9,220,130,  0,154,  2,  1,242, 15, 32,128,  0,  2,  8, 40,  0,  1,  4, 16, 64,  0,  1,  4, 16,
- 64, 64,  1,  8, 32,128,  0,  2,  8, 32,128,  0,  2, 10, 64,  0,  1,  4, 16, 64,  0,  1,  4,112,215, 81, 39, 52,117,206,156, 57,
-126, 71,143,186,203,100, 23,144, 23,144, 23,144,119,111,200,147,203,229, 84,161,104,120,217,105,224,254,  5,228,  5,228,253,177,
-228,249,172,  0,112,  3,133,175, 66, 60, 13, 44, 77, 45, 47,128,123, 19,222,  8, 38,128,123,243, 57,248,120,126, 24,128,135, 14,
- 28, 56,176, 68, 32, 16,140,  8, 14, 14,134, 94,175, 63,244,240,195, 15, 47,  2, 80,  8, 64,127, 47,220,  3,165, 82, 41,201,201,
-201, 81,253, 17,199,149,227,199,143,163,176,176,208,235,121,  5,  5,  5,244,248,241,227,200,206,206, 38,253,251,247,111,180, 60,
- 14,195,134, 13,131, 39,121,  1,220,199, 30,  0, 14,190,164, 39,229,147, 40,199,157,188,134,202,195,250,147,120,231,143, 62,160,
-243, 61,119,252,248,241,210, 39,159,124, 82,205, 87,102,199,142,183,151, 94, 46, 43, 43,171,179,157,146,146,  2,153, 76, 70,248,
-200,187,147, 74,192,248,241,227, 41,  0,236,218,181,139,220, 11,242,116, 58,221,216,205,155, 55, 43,207,156, 57,  3,  0,136,142,
-142,126, 44, 45, 45,109,171,191,207,215,181,223, 83, 74,157,239,  7,183,159,123, 87,  8, 33,200,202,202, 34,158,148,103,190,207,
-193,199,231,213,247,248,241,227,155,171,171,171,123,119,237,218, 21, 55,111,222,132,209,104,  4,128, 17,155, 55,111, 86,133,133,
-133,157, 74, 74, 74,122,  2,128,199, 82,146, 35, 71,142,244,201, 32, 56,120,240,160, 20, 60, 83, 61,115,200,201,201, 81,165,164,
-164, 72,101, 50,153,218,215,231,145,158,158,238, 83,251,166, 76,153,194,251,253,224,208,181,171,189,  2,110, 77, 77, 13, 76, 38,
- 19,215,159,120,189,111,133,133,133,248,207,127, 60,103,168, 53,153, 76,116,196,136, 17,232,211,167, 15,214,173, 91, 87,110, 50,
-153,186, 52,180, 46,188,176,176, 16, 51,102,204,224,117,173,215,175, 95,199,146, 37, 75,160, 80, 40,  2,  3,243,125,128,250,201,
-128,238,100, 34,160,128, 21,123,  7,241, 93,150,247,148,198, 79,204,217,233,147, 76,149,234,150,129,116,230,204, 25,132,133,133,
- 57,  7, 33,151,251,193,199,218,162,245,183,235, 15, 96, 74,165,146,230,228,228,248,109,129,173, 95,191, 94, 50,126,252,248,  6,
-229, 55,  6, 25, 25, 25,116,244,232,209,210,233,211,167,251, 68, 22,155, 55,111, 86,182,105,211,  6, 51,103,206,132, 86,171,101,
- 51, 51, 51,183,104,181,218,105,145,145,145, 62,101, 17, 35,132,224,251,239,191,119,110, 39, 37, 37, 97,231,206,157, 30,183,189,
-161,190, 18, 32,151,203,105,108,108, 44,178,179,179, 41,151,152,201, 87,242,175,170,170,202,239,209,163, 71, 11,  0, 16,139,197,
-  8,  9,  9, 65,121,121, 57, 42, 43, 43, 17, 30, 30,142,242,242,242,222, 59,119,238, 44, 76, 74, 74,234,  5,224,154, 39, 97,253,
-251,247, 71, 74, 74, 10,162,163,111,101,253, 91,186,116,105,157,115, 22, 46, 92,200, 89,178,170,233,211,167,251,252,188,253, 33,
-127, 14, 43, 86,172,104,232,144,179, 86,129,191,  8, 11, 11,195,201,147, 39, 33, 18,137, 96, 54,155,177,115,231, 78, 20, 23, 23,
-227,181,215,124,171, 56,123,189, 94,145,172,199, 30,123, 76,  0, 64,246,195, 15, 63,236, 76, 72, 72,184,254,196, 19, 79,180, 85,
- 42,149, 16,  8,  4,173, 35, 34, 34,  4,190,200,106,  8, 23, 46, 92,  8,144,196,125, 74,254,220, 62,175,181,  0,238, 87,172, 94,
-189, 90,146,150,150,166,110,172,156,251,197,149,221,113,232,251,183,172,246,162, 55,252,146,161,213,106,161,215,235,157, 22, 72,
-118,118,182,171, 37,196,215,218,186,109, 91, 38,147, 97,207,158, 61,148, 16,114,219,113,127,240,195, 15, 63,168, 94,121,229, 21,
-228,230,230, 34, 57, 57,185, 73,238,223,174, 93,187,200,222,189,123, 41,165, 20,121,121,121,170,188,188, 60,159, 20,148, 51,103,
-206, 96,230,204,153, 44,  0, 38, 40, 40,136,137,137,137, 65,102,102,230,  6,  0, 27,162,163,163, 39,166,165,165,237,224, 35,231,
- 78, 20,  3,226,148,128,236,236,108,202,165,  1,230,254,151,203,229, 52, 37, 37,197,151,107, 13,211,106,181,155,197, 98,113, 11,
-  0,248,219,223,254,  6,163,209,136,172,172, 44,132,132,132, 56,203,102, 11,  4,  2, 84, 85, 85,181,  0,144,  9,224, 47,158,  4,
-114,228, 94, 82, 82,114,219,190,166, 64, 74, 74,138,212,113,157, 82,127, 21,129,151, 94,122,201,249,125,249,242,229,220, 87,166,
-222,126,222, 10,  1,231, 53,121,227,141, 55, 16, 22, 22,134,220,220, 92, 36, 36, 36,248, 69,254,245, 49,106,212, 40,192,158,165,
-241,175,207, 60,243, 12,122,246,236,217,118,231,206,157,168,168,168,224, 74,238,154,189,188, 11, 77,221,253, 36, 19, 39, 78, 84,
-109,223,190,221,157,247, 70, 50,102,204, 24, 21, 33,  4,123,247,238, 13,184,123,239, 48,249,167, 47,252,  8,  0,144,189,244, 85,
-183, 74,192,239,162,  0,100,103,103,187,123,208,180,161,253,254,252,198,225,195,135, 85,  0,164,141, 85,  2,102,204,152,241,167,
-153,207,214,235,245,183, 89,253,254, 16, 13, 71, 44,201,201,201, 72, 76, 76, 36,  0,144,155,155,219, 36,109, 92,191,126,189,196,
- 97,209,145,242,242,114, 73, 78, 78,142,170,188,188, 92,226,171,197,238, 14, 99,199,142, 37, 99,199,142,197,250,245,235, 37,121,
-121,121,170,245,235,215,251, 36, 87,171,213, 90, 35, 35, 35,131, 54,111,222, 12,135, 55,192,168,213,106,153,204,204,204,237, 90,
-173,118, 92,100,100,228,158,187,249,124, 57,210,119,237,203,114,185,156,114, 74, 26, 79, 60, 84, 92, 92,220,123,192,128,  1,152,
- 53,107, 22,170,170,170, 80, 81, 81,  1,145, 72,  4,161, 80,  8,161, 80,  8,145, 72,132,144,144, 16,104, 52, 26, 40,149,202,233,
- 50,153,236,239,222,132,150,148,148,212, 81, 14, 57,  5,128,243,  4,196,198,198,250,210, 70,119,214,191, 52, 39, 39, 71,213, 24,
-207,147, 11,172, 13,140,149,188,189,  1, 23, 46, 92, 64, 94, 94, 30, 38, 78,156,136,174, 93,187,162, 85,171, 86,200,203,203,195,
-107,175,189,230,244,190,  9,  4,  2,159, 27, 54,106,212, 40, 44, 90,180,  8, 75,150, 44,105,159,150,150, 54,245,233,167,159, 70,
- 98, 98, 34,  0, 64, 32, 16,204,108,217,178,229, 86,133, 66, 97,241, 84, 12,104,253,250,245,188,188,  0,101,101,101,152, 54,109,
- 26, 63,  3,165, 99, 71,164,167,167,171, 74, 74, 74,160, 84, 42,185,251, 47, 73, 79, 79, 87,113, 10,116,  0,119, 22, 28,249,115,
-223, 57, 37,224,119,247,  0, 52, 52,143,237, 79,128,224,157, 86,  2, 38, 76,152,208,104, 79,128, 47,215,229,203,111, 60,245,194,
- 46,108,254,108,124,147,220, 43,238,  5,148,203,229,110,231,244, 14, 29, 58,212,104,197,160, 41,158,239, 15, 63,252,160,226,172,
-254,233,211,167,171,127,248,225,  7,180,105,211, 70,133, 38, 74,156,206,201,205,203,203, 67, 94, 94,158, 87,119,179, 78,167,155,
-176,121,243,230,237,  0,144,153,153, 25, 20, 29, 29,141,180,180, 52,238,176,248,215, 95,237,245,178, 50, 51, 51,119, 71, 71, 71,
- 63,145,150,150,230,181, 62,121, 82, 82, 82,157,152,152, 71, 30,121,164,142,103,128,143,219,223,141,210, 77,221,245, 47,238,185,
-184, 78,  7,120,194,206,157, 59,151,196,196,196,  0,  0,206,158, 61, 11, 74, 41, 78,159, 62,237,172,251, 32, 20, 10, 65,  8,129,
-205,102,131, 94,175,199, 55,223,124,  3,153, 76,230,181,234,146, 43,249,167,164,164,184, 85, 94, 92,167,  8,252, 81,  2,100, 50,
- 25,145,203,229,180,177,222,128,166, 24, 39, 45, 22, 11,134, 12, 25,  2,181, 90,141,161, 67,135, 66,167,211, 57,167,118,212,106,
- 53,198,143, 31, 15, 43, 87,130,220, 55,203, 31, 75,150, 44,233,144,150,150,118,249,203, 47,191,116, 30,235,208,161,  3,150, 45,
- 91,246, 31,190,132,221,196, 80, 31, 57,114,  4,177,177,177,136,142,142,198,144, 33, 67,232,209,163, 71,165, 28,249,151,148,148,
- 64,173, 86,243,137, 81, 25,  6,224,  5,  0,127, 85, 40, 20, 54, 15,231, 77,  4,208, 17,192, 55, 10,133,226, 70,128,250,127,199,
-142,205,  7,191,103, 16, 96, 83, 40,  1,221,186,117,107,148, 39,128, 27,100,215,173, 91,231,246,248,142, 29, 59,176,110,221, 58,
-191, 44,147,130,243,125, 17,215,253,164,223,110,127, 14,174,115,254, 74,165, 18, 50,153,204,233,246, 63,116,232, 16, 58,119,238,
-220, 36, 74, 95, 99,172, 47,206,250,191,121,243,166,179,206,188, 68, 34,145, 54,165, 23,128, 67, 66, 66,130, 52, 47, 47, 79,229,
-237,188,205,155, 55,111,231,230,254,117, 58, 29,150, 46, 93,138,218,218, 90,136, 68, 34,  4,  7,  7,227,252,249,243,120,255,253,
-247,161,213,106,145,153,153,249,173, 86,171, 29, 19, 25, 25,169,242, 66,178,117,200,222, 91, 76, 64, 83, 40,158, 71,142, 28,169,
-115,126, 67, 65, 98, 81, 81, 81, 35, 76, 38, 19,172, 86, 43, 14, 29, 58,  4,129, 64,  0,179,217, 12,131,193,  0,150,101,157,239,
-177,197, 98,129,201,100,226,222,105,175, 97,226, 13,185,252, 23, 46, 92,232,244,  2, 68, 71, 71,163,188,188,188,209,138, 40,183,
- 42,192,135,216, 17, 13,128, 40,119,  7, 92,166,  3,124, 66,102,102, 38, 94,121,229, 21, 12, 30, 60,216,233,  1,225,210,103, 15,
- 30, 60, 24,167, 79,159, 70,155, 54,109,124,146,185,127,255,126,140, 26, 53,170,107, 90, 90,218,  5,142,252, 29,227,103,199,141,
- 27, 55, 94,169, 31,208,203, 87,161,104,232,183,124,244, 62,145, 35, 71,142, 72,210,211,211, 85, 67,135, 14,197,208,161, 67, 85,
-  0,112,250,244,105,228,229,229,241,125, 14, 63,  3,  8,  1,176, 65, 46,151, 79,115,167,  4,200,229,242, 23,  0,124,234,216, 92,
- 36,151,203,123, 43, 20,222, 75,212,255,145,193, 85,  3,204, 94,250,234,109, 83,  0,127,216, 24,128,123, 81,  9,152, 49, 99,  6,
- 93,180,104,209,109,174, 64,127,200,255,169, 23,154,118,158, 78,167,211,221, 22,228,199, 89,253, 34,145,  8,215,174, 93,187,171,
-228,239,106,253,187, 90,110,211,166, 77, 83,171,213,234, 38,247,  2,248,226, 57,153, 57,115,166, 30, 64,104, 88, 88, 24,222,124,
-243, 77,136, 68, 34,231,241,212,212, 84,  0, 64,100,100, 36, 38, 77,154,132,  3,  7, 14,236,155, 52,105,210,239,210, 78,215,251,
-237, 58,255,239, 14,177,177,177,117, 42, 53, 54,180,142,216,108, 54, 67,163,209,192,104, 52, 34, 60, 60, 28,193,193,193,176, 90,
-173,160,148,194,102,179,193,108, 54,195, 98,177,192,102,179,185, 42,244, 55, 61,181,179,164,164,164,142,117, 95,127, 58,160,126,
-128, 96, 99, 33,147,201,212, 62,198,162,136, 27, 58,208, 64,108,128, 87,188,255,254,251,152, 56,113, 34,186,117,235,134,208,208,
- 80, 72, 36, 18,104, 52, 26,132,133,133, 65,171,213, 98,205,154, 53, 96, 24,223,226, 11, 71,141, 26,213, 41, 45, 45,237,194,188,
-121,243,176,101,203, 22, 60,254,248,227,  0,208,110,255,254,253,215,253,185, 79, 14,133,  2,220,152,197,141, 85,190,146,191,171,
- 39, 96,227,198,141,210,169, 83,167,170,  0, 96,227,198,141,210,170,170, 42,181, 15,253,217, 44,151,203,103,  0, 88,231, 65,  9,
- 72,116,249,222,  5,192,  0,216,151,164,  6,224, 66,252, 13,225, 15,153,  9,112,248,240,225,210,166,  8,  8,244,215, 74,119, 29,
-144,151, 44, 89,210,104,242,231, 48,100,240, 32,236,221,167,194,250,125,161, 78,165,160,224,124,223, 70, 93, 99,108,108, 44, 74,
- 74, 74,144,155,155,139,206,157, 59, 99,237,218,181,126, 88, 93, 84,194,125,203,200,200,104, 18,242,231,172,255,242,242,114,105,
-253, 99,163, 71,143,150,230,230,230, 58,207,105, 10,228,229,229,169,248,122,159,180, 90,237,111,176,207, 11,179, 27, 55,110,196,
-154, 53,107,  0,  0, 27, 54,108,128, 86,171,229, 78,179,158, 62,125, 26,173, 91,183,190, 43,239,128,107,180,191, 59,229,140,111,
-153,230,146,146,146, 67, 54,155, 13, 90,173, 22, 55,111,222,116,  6,142,234,245,122,212,214,214,162,186,186, 26, 85, 85, 85, 48,
- 24, 12, 48,153, 76,176,217,108,  0,144,239, 73,102,125,114,119, 23, 72, 90,127, 85,  0, 95, 40,149, 74, 73,253,107, 86, 42,149,
-190,246,147,208,166,126, 30,107,215,174,133, 68, 34, 65,104,104, 40, 78,158, 60,  9,181, 90,141,176,176, 48,188,245,214, 91, 56,
-112,224,  0, 94,123,237, 53,159, 20,128, 81,163, 70,181, 75, 75, 75,187, 52,109,218, 52,124,253,245,215, 28,249,119,  0,112,221,
-147, 37,207, 71,  9, 88,178,100, 73, 83,144, 63,  0, 72, 56,242,  7,128,169, 83,167,170, 18, 18, 18,168,143, 99,168, 25,  0,183,
- 78,113,131, 92, 46,175, 31, 40,113,214,229,123, 41,128, 99,  1,218,119, 25,  7, 22,126, 84, 39, 22,160, 62,254, 48, 65,128, 77,
- 77,254,142,245,174,141,182,220,184,233,128, 25, 51,102,248, 77,254, 79,189,176, 11, 67,  6,223,114,221,108,254,250, 27,108,254,
-218,254,125,239, 62, 21, 48, 70, 10,192,183,101,128,114,185, 28,177,177,177,  0,236,193,128, 71,142, 28,193,158, 61,246,152,181,
- 99,199,142, 33, 33, 33,193,  7,105, 68, 13,220, 10,252,107,108,164,254,250,245,235, 37,238,172,255,250,104, 42, 47,  0,167, 72,
- 72, 36, 18,169,183,115,163,163,163,199,101,102,102,238,158, 52,105, 18, 78,159, 62,141, 51,103,206,224,253,247,223,183,  2, 16,
-234,245,122,100,102,102,194,113, 76,120,241,226, 69, 60,243,204, 51, 94,101,222,137, 24,  0,206,146,206,201,201,113,122,177, 56,
- 98,228,158, 59, 31,196,196,196, 20,233,245,250, 17,102,179, 25, 55,110,220, 64,112,112, 48,132, 66,161,211,  3,160,211,233,160,
-215,235, 97, 50,153, 80, 85, 85,197,205,231, 95,246, 36,147, 35,119,110, 26, 32, 54, 54, 22,245,189, 21,238,226,  2,248,144, 63,
-151,  3,160,254,190,198,244, 15,206,234,119, 99,241, 91,249,142,161,197,197,197, 56,125,250, 52,244,122, 61,226,227,227,161,215,
-235,145,147,147,131,169, 83,167, 98,203,150, 45, 16, 20,150,  5, 38,  0,  0, 32,  0, 73, 68, 65, 84,  8,  4,188, 21,128,152,152,
-152, 78, 28,249, 23, 22, 22,226,237,183,223,  6,128, 46, 51,102,204,184,186,110,221, 58,178,127,255,254, 70,141,161,156, 39,160,
- 49,228, 31, 27, 27, 75,185,126,118,244,232, 81, 20, 21, 21, 73,211,211,211, 85,189,122,245,130, 72, 36,162, 46,129,129,126,123,
-  2,228,114,249, 92,  0, 19,  1, 36,  3,104,  3,123, 12,192,159,218,253, 15,220, 90,  5,224, 46,  8,240,174,172,  2,248,189,130,
-  0,239, 53,242,175,175,  4, 52,198,242,247,180,189,119,159,202,159, 23,244,150,185, 19, 26,138, 62,125,250,212, 57,126,248,240,
- 97,159,228, 37, 39, 39, 59, 21,128,220,220, 92,228,230,230,214, 89, 21,224,203,245,175, 93,187, 86,  5,  0, 59,119,238,116, 75,
-158,211,167, 79, 87,175, 93,187, 22,  0,191, 37, 76, 13, 37,253,225, 20, 13, 74, 41, 18, 18, 18,164,211,166, 77,243,218,119,210,
-210,210,246,104, 52,154,177,  7, 15, 30,220, 27, 19, 19,131, 51,103,206, 64,171,213, 10, 35, 35, 35,145,150,150,  6,141, 70,115,
-241,224,193,131, 93, 99, 98, 98, 48,115,230, 76,175,215,235, 46, 15,128,191, 49,  0,245,223, 45,133, 66, 65,100, 50, 25,148, 74,
- 37,173, 63, 45,195,247,121,196,197,197,189,174, 86,171, 95,180,217,108,168,174,174,134,197, 98,113, 42, 43, 70,163, 17,148,210,
- 58,129,129, 50,153,236,105,  7, 49,242,134, 76, 38,131, 76, 38,171,179, 44,208,215, 41,  0, 87,162,151,201,100,234,250, 99,139,
-171, 82,208,132,224, 61,126,114, 75,253, 94,126,249,101,168,213,106, 72,165, 82, 20, 23, 23,163, 89,179,102, 40, 45, 45,229,173,
-  0, 28, 62,124,152,164,165,165, 93,122,230,153,103,176,127,255,126,188,245,214, 91,  0,208,113,198,140, 25, 87,154,130,252, 93,
-149,128,198, 88,254,220,248, 82, 82, 82,130,162,162, 34,226, 48,  4,165,233,233,233,170,232,232,104, 72, 36, 18,202, 39, 16,176,
-158, 18, 48, 13,192,  6,135, 18,112,  8,128, 28,128, 68,161, 80, 92, 67,  0, 77,215,129,155, 58, 27,159,187,128,159,165, 75,151,
- 54,184,255,110,146,255,140, 25, 51,238, 72,202,208,198,200,188,116,217,123,255, 14,  9,241,205,107,233,105,126,216, 31,200,100,
- 50,105, 98, 98,162,122,239,222,189,116,211,166, 77,117, 20,129,250,164,196, 87,102, 70, 70, 70,131,154, 13,151,148,196,151,196,
- 64, 13, 41,156, 82,169,148, 23,249,115,136,138,138,114,206,235,159, 60,121,242, 47,153,153,153,255,225, 60,  2, 23, 47, 94,236,
-250,198, 27,111, 72,  9, 33,188,228,221,137, 60,  0,245,239,179,187,249,111, 31,148, 82, 93, 66, 66,194,226, 29, 59,118,188, 99,
-181, 90, 81, 89, 89,233,140,  1,  0,128, 27, 55,110,160,178,178, 18,148, 82,206,106,247,105,178,157,155,255,175,191,236,175,126,
-156,  0, 95,242,119,125,206,247,218, 82, 94, 78,  9,120,245,213, 87,145,151,151,135, 73,147, 38,225,195, 15, 63,196,130,  5, 11,
- 32, 20, 10, 33, 22,139,189, 61, 87, 66, 41,101,103,205,154,133,255,252,231, 63, 88,189,122, 53,  0,116,222,191,127,255, 21,135,
-197,238, 87,103,114,153,182,106, 50,148,149,149,193, 77, 30,  0,117,118,118,182,116,204,152, 49, 42,127,150, 60, 58,172,254,105,
-  0,182,  1,152, 11, 32, 46, 64,254, 13,195, 93, 16, 32, 47,  5,192,151,164, 28,254, 18,118, 83,163, 41,200,255, 94, 28, 52,230,
-206,157, 43, 61,117,234, 84,147,202,116, 88, 67,170,166,148,201, 17, 30,183,182, 30,128, 51, 25, 16,203,178,216,188,121, 51,111,
- 37,224,149, 87, 94,225,218,121, 91, 12,  0,195, 48, 96, 89, 22,255,248,199, 63, 84,124,201,211,147,188,198,174, 36, 72, 75, 75,
-251,175, 70,163,185,113,240,224,193,157,124,173,254, 59,237,109,171,127,127,221,185,216,125, 81,  2,  8, 33,239, 78,156, 56, 49,
-119,221,186,117, 39,130,130,130,192,173, 10, 96, 89, 22, 17, 17, 17,208,106,181, 92, 10,219, 80,  0, 54,190,  6,129,107,240,223,
-145, 35, 71, 32,147,201,234,140, 39,222,198,161,146,146, 18, 90, 82, 82, 34,173,239,226,111,228,146, 63,  0, 13,186,251,173,203,
-151, 47, 23,  3, 48,195, 30, 63,197,125,124, 82,  2, 92, 19,255, 60,255,252,243,206,239,213,213,213, 94, 95,179,184,184, 56,210,
-175, 95, 63,250,213, 87, 95, 61,177, 97,195,134,239, 56,178,221,176, 97,  3,124,141,250,231,112,229,202, 21,103, 74,226, 38,130,
-122,251,246,237, 13,245, 41,245,190,125,251,124,170, 85,225,225,240, 85,119,217, 74,255,236, 53, 73,184, 85,  0,238,136,159,215,
- 42,128,166, 38,245,134,228,221, 43,202,195,189,220,113,250,246,237,171,238,219,183,111,147,202,116, 12,142,119,252, 90, 93,221,
-255,245, 95,234,134,150,157, 57,218,199,167,109,196,135,235,189,163,215, 26, 21, 21,181,171, 49,145,254, 77, 25,  3,224,174, 15,
-123,242,246,248,208,231, 79,206,152, 49,163,217,238,221,187, 63, 40, 45, 45,125,209, 96, 48,192,102,179, 97,208,160, 65, 24, 58,
-116,104,166, 76, 38, 91,200,135,252,  1,160,160,160,192,249,221, 53,214,164,160,160,224,182,109, 79,136,142,142, 38, 14, 47,129,
- 20,128,138, 83, 38, 92,166,  2,124,126, 38, 83,166, 76,105,232,144,208,101,188, 12,186, 27,227,138, 66,161, 96,143, 31, 63,142,
- 79, 63,253,148,  0,224,149,148,231,239,127,247,156,147,105,216,176, 97,152, 60,121, 50,239, 54,120,147, 23,192,189,167,  4, 52,
- 68,254,110, 21,128,166, 38,193, 64,133,184,  0,220,245,  1,127,203, 87,254, 25,238,205, 61,252, 27,186,113,227,198,205,133,221,
-253,234, 23, 14, 30, 60, 72,166, 79,159,126, 71, 20, 90,127, 51,  7,254,158,202, 98, 99,209,191,127,255, 38, 45,198,211,212,242,
-254, 12, 70,217,253,164,  4,120,181,162,  6, 13, 26, 20, 24,136,  3,  8, 32,128,  0,  2,  8,224, 79,  6, 38,112, 11,  2,  8, 32,
-128,  0,  2,  8, 32,160,  0,  4, 16, 64,  0,  1,  4, 16, 64,  0,  1,  5, 32,128,  0,  2,  8, 32,128,251, 16, 86,  0,108,224, 54,
-  4,224,  9,194,192, 45,  8, 32,128,  0,  2,  8,140,237,  1,252,201, 59,201,156, 57,115,252,142,184,116, 23,213,237, 73,158,183,
-245,199,190,202,107,234,246,  5,228,  5,228,253,217,229,253,244,250, 69,191,  7,150,193, 31,116,197,157,150,119,228, 53,255,229,
-197,126,120,187,188,140,140, 12,  2,  0,132, 16,137,197, 98,193,249,243,231, 85,102,179, 25, 66,161, 16,151, 47, 95,198,211,225,
-221,176,171,168,  8,134,  7, 59, 35, 46, 46, 78, 42, 16,  8, 64, 41, 85,  3, 64, 86, 86,214, 29,127, 30, 92,251, 92, 65,  8,233,
- 11,160,205,137, 19, 39,182,119,232,208,129,209,104, 52,226, 14, 29, 58,188, 31, 18, 18,178, 18,192, 21,199,114, 82, 38, 43, 43,
-203,230, 65, 94,115,135,183, 64, 79,  8,161,  0,112,233,248,127, 87,201, 71,149,166,173, 47,138, 57, 47,108, 51, 46,174, 89,243,
- 22,181,  0, 40,165, 84,  8, 32, 50, 43, 43,235, 82,224,125,187,183,229,221, 81, 45,145,111,182, 45, 95,179,191,249,147, 50,183,
-114,205,215, 18, 97, 84,184,234,220,153,179,210,  7,130,155, 33,236,239, 51,212,247,146,150,213, 80, 62,242,192, 18,151,187,143,
- 45, 91,182, 72,118,236,216,161,202,124,221,190,253,237,254, 81,152, 49, 99,  6,175,231,178, 63,255,144,132, 33, 68,117,250,212,
- 41,104,181, 90,116,237,218, 21,205,154, 55, 71, 82,226, 56,222,207,117,207,158, 61,117, 94,220,220,220, 92,143,181, 20,114,115,
-115,253,238, 55, 92,161,166,172,172,172,198,245,187, 20,141,227, 11,  5, 64,128,156, 40,255,101,197, 46,  7,162,159,181,127, 47,
- 89,  3, 28,153,223,248,135,154,124,179,110,251,114, 91,241,250, 51, 66,  8,213,233,116,210,221,187,119,171, 74, 74, 74,144, 34,
-106,137,118,157, 91,195,168, 51, 32, 68,111,197,200,  5,207, 97,244,164,169,216,246,101, 22,182,238,221,171, 26, 55,110,156,244,
- 30,232,194,103,108, 54, 91,251,146,146, 18,118,224,192,129, 65, 49, 49, 49, 56,122,244,232,235, 70,163,113, 98,207,158, 61,101,
-132, 16, 13,165,212,219, 84, 64,141,235,134,213,106,101,126, 41,250,169,103,167, 89,131,241,143, 97,253, 90, 23,236,254,120,211,
-230, 99,146,159,123,246, 31,243,161, 67,222,101,135,194,192,  6, 60, 13,127, 50, 55,145,175,249,251,125,201,131,239, 43,249,219,
-214,111,151,196,183,238,164, 34, 29,163, 81, 92, 91,137,246, 29,186,169, 44,172, 13,167, 62, 91,139,242,174,173,165,195, 38, 77,
-224,165,  8, 28, 81,201,105,239, 30,220,150,  0,223,236,102,177,255, 71,138,244,105, 64,239, 30,192,252, 37,141, 35,110,174, 64,
- 73, 99,179,147,185, 83, 38,154, 74,110, 99,144,158,158, 78,177,152,128,188,219,240, 57,148, 82, 96, 49,193,148,223, 82,238,153,
-181,214,183,200,159, 58,200,127, 52, 14, 28, 56,128, 25, 51,102,120,253,219,  7,  7,238,166,125,251, 14, 69, 78,206, 85, 28,206,
-183, 39,172, 57,115,234, 52,  0, 96,246, 95,191,166,167,207, 38, 75,195,196,252,158, 75, 98, 98, 34,187,103,207, 30, 38, 55, 55,
- 23,251,246,237,243, 88,136,201,159, 20,170,158,222,219, 12,185,156,102,249,161, 80,112,233,194, 27,157,202, 56,250,217,186,197,
-118,154, 66,  1,112,185, 79,142,234,132,188,112,238,220, 57,168, 55,109, 82,189, 43,155,130, 65, 51,158, 71, 80,219, 72, 64,232,
- 72,246,199, 82,128, 21,129, 53, 81, 76,120, 54, 29,165,255,250,  8,135, 14, 29, 82,141, 24, 49, 66,202,121,  1,238, 18,108, 12,
-195,180,105,213,170, 21,212,106,181,112,224,192,129, 24, 54,108, 24,115,237,218,181,193,191,252,242,203,241,  7, 31,124,112,  8,
- 33,228,154,131,172, 25,158,247,174,217,216, 49,137,209, 31, 46,219,194, 44, 76, 61,214, 34, 46,105,142, 52,110,184,114,212,130,
- 79, 47, 63, 26,243,208,204, 88, 66, 72, 13,236, 49,  6, 76, 67,253,204, 53,177,149,183,126,212,104,133, 52,128, 58,168,159,  0,
-168, 62,252, 42,  6,228, 58,128, 12,154, 57,  0,115, 70,190,192,128,103,229,190,250, 74,128, 92, 46,167,177,177,177,200,206,206,
-166,174,101, 75,125, 34,214,188, 35,146,233,131,227, 85, 65, 54, 22, 54, 80,132, 84,134,226,218,141, 27,184, 86, 83,133,238,193,
-205, 96, 42,190,162, 58,188,117,135,116, 56, 15, 37,160,119, 15,224,212, 57,  6,148,138, 97, 35,193,120, 34,209,130,201,227, 12,
-184, 21, 67,211,248, 84,  9,141, 37,105,142,248, 23, 46, 92,136,162,162, 34,  0,192,246, 83, 34, 24, 45, 22,149,252,175, 67,125,
- 82,  4,124, 81,226, 28, 41, 94, 61, 63,151,197,246,195,177,177,177, 13,231,111, 95,236,223, 59,190,237,139,171,146,173,191,188,
-237, 84,120, 38, 14, 88, 44,125,236,133, 14,141, 30,112,183,108,217, 34,217,190,125,187,138, 97, 24,188,252,  1,156,213,207,248,
-212,193,136,140,252, 65, 18, 55, 60,  3,192, 86,140, 26,245,175, 58,199,166, 79,  7, 38, 76,  0, 38, 32, 87,181,252, 95,224,165,
-  4,112,228,175, 86,219, 79,157, 58,117,170,179,176,146, 47,  4,230,201,242,231, 82, 50,187, 94, 95, 70,134,127,228,223,100,136,
- 93,  6,  0, 88,177, 98,197, 45,  5, 96, 72, 38,112,244,229,187,210,156,125,251,246, 97,229,228,116,116, 31,147,  8,  8, 76, 32,
- 34,  6, 68,200,128,  8, 68,160,148,128,213, 89, 65,109, 54, 80,179, 13,207, 61,251, 60,158,127,107, 46,206,181,109,171,234,209,
-163,199,221,244,  4,144,162,162,162,248,206,157, 59,  7,149,148,148, 32, 47, 47, 15,167, 78,157, 66, 98, 98, 34,226,227,227,219,
-175, 94,189,250,189, 41, 83,166, 60,231,131,  2, 32, 56,176,247,127,255,247,228, 32,125,219, 35, 53,  2, 76, 95, 92,139,135,  7,
-127,130, 23,230, 77, 21,126,188,176,178,251,194,143,215, 77,143, 30, 60, 93,129,  6,210, 32,187, 18,186,235,152,158,145,145, 65,
-221,237,111,234,130,112,  1,220,  1, 15,128,235, 67, 90,191,115, 93,101,143,  7,122, 68,200,223,125,142,157, 51,242,  5, 95,170,
- 57,145,236,236,108,202,165, 37,229,254,151,203,229, 52, 37, 37,197, 55,171,122,231, 33,201,248,152,126,170, 32,163, 21, 33, 31,
-191,  2,171,222, 12,241,203, 75, 16, 30, 36,134, 81,100,128,206,104, 64,  8,  8, 76,151,202, 85, 85, 85, 85,210,240,240,112,143,
-131,240,169,115, 64,246,  6, 22,128,222,241,  1, 70, 61,196, 96,242, 56,  2,215, 64,218,244,105, 64,246,  6, 63, 60,166, 41, 41,
- 82,199,117,250,101,173,115,228,207, 17, 63,  0, 40, 14, 88, 96, 48,235,  0,  0, 99, 23,238, 65,206,210, 68, 21,  0,222,242,207,
-125,116, 14, 34, 82,124,171, 35,144, 50,144, 86,189, 93,182,203,209,250,175,252, 82,132,146,119,237,228,239,169,198, 60,145,231,
- 80,251, 57,252,172,255,163,219, 45,146,236, 45,127, 87, 81, 80,124, 56,239, 91, 12,151,196, 96,253, 23,251,241,239,221, 25,170,
-237,114,138, 57,127,121, 91, 58,104, 84,123,191, 20,129,218,139,114, 58,102, 32,144,243,213,  9, 80, 74,209,188,205,131, 78,242,
- 95,185,114,165,199,246,233,140, 74, 73,122, 74,123, 21,240, 57,128,111,113,248, 48, 48,124,248,173,227,239,189,119,235,251, 75,
- 47,230,170,178,254,221, 75,202,176,157, 61,182,147, 35,255,132,132,  4,176, 44,139,207, 62,251,172,201, 94,112,185, 92,238, 36,
-255,186, 74,129,156,102,101,121,126,231,152, 41,218, 58,234, 47,113,252,195,166,184, 57,143, 56, 78, 36,246, 47,  3,  7,222, 62,
-199,206, 76,213, 58,189,242,  0,192,178,169,152, 55,111,158,243,248,188,121,243,176, 98,197, 10, 48, 61,103,221,250, 85,199,249,
-238,228,  9,167,186,111,159,213,234,230, 60, 30,237, 51, 26,141,104,215,181, 27,192,154,193,  4,  3, 68, 40,128,181,166, 10,198,
-146,243,184,113,185, 12,157, 70, 72, 64,130, 34, 64, 44,102, 64,192, 96,233,156,  5, 72,204,126, 27,243,231,207,111,210, 65,217,
- 91,170,108, 23,178, 37,148,210,  8,131,193, 48, 34, 42, 42, 10,167, 79,159,  6,203,178, 56,127,254, 60,214,172, 89,131, 62,125,
-250,160, 99,199,142, 51,  1, 60, 87,143,172,217,134,200,155, 82,218,170, 43,115, 88,210,190, 75, 82, 80,101,222, 49, 84,105,131,
-241,159,109, 86,236, 40,248, 47, 94, 76,  9, 17, 10,245,108, 44, 48,189,193, 58,  8,119,162,184, 85,  0,190,161,161,190,227,206,
- 51, 32,228, 75,252,148, 82, 72, 95, 79, 64,118,158, 34, 34, 29,114,252,252,213, 49, 96,164,243,181,226,  5,142,244,245,250,117,
-  0,  8,140,198,213,136,138, 82, 34, 39, 39,  7,190,164,241, 28, 22,220, 66,213,198,104,131,120,241,243,176,221,212,192,122,229,
- 38,132, 65, 34,132, 18,  1,194,136,  0, 97,  2, 33,162, 68, 98,104,107, 42,113,117,223, 33, 85,248,228, 71, 60, 14,116,238, 72,
-125,255,143,172, 67,  1,  0,150, 45, 34,160,  4,176,135,199,248,222,193, 29,164, 44,205,201,201, 81,229,228,228,248, 53,133,224,
- 74,254, 16, 10, 80,114,213, 62,248,149, 94, 55,162, 75, 91, 49,122,166,110, 69,206,154, 73, 42,190,238,117, 17, 41,134,144,148,
- 65, 64,110,194, 70, 91, 33,184, 13, 65,216,180, 43, 96, 89, 13,140,198, 28,216,138,254,225,155, 39,151, 71,229, 54, 95, 74,188,
- 42,182,188,160,138,143,122,  3,159,125, 59, 11,205,152, 46,  0,128,231,255,222, 11,  3,135, 69, 99,221,231,121, 88,249,223,119,
- 84,138, 81,254,185, 14,  9,  1,228, 47, 29,119, 14,122, 15, 63,252, 48,246,239,223,239,149,252,  1, 96,198, 52,145, 10,216,  7,
-224, 56, 42,175, 55, 67,207, 46,192,170, 85,181, 80,169,128,158, 61,129,232,104,187,136,202,235,205,236, 47,227,128,223, 84,191,
-254,210,153,120, 34,255,125,251,246,129,101, 89, 39, 73,111,220,184,177,209,  4,226,186, 93,159,252,  1,192, 27,249,  3, 64,150,
- 66, 65, 40, 32, 33,128, 58, 61, 61,189,193,142,207,186, 12,250,138,236,108, 41, 33,192,202, 47, 86,222, 22,243,178, 50, 75,225,
-234, 95,145, 80, 74, 85,159,124,242,137,115,199, 39,159,124,130, 21, 43, 86, 32, 43, 43,171,110, 21, 57,  2,137, 59,121, 89,246,
- 20,182, 82, 74,169,250,185,231,158,107,176,125, 86, 23, 47, 74,246,170, 85, 82, 66,128,172,149, 89, 42,119,228, 37,108,222, 28,
- 16,  9, 96,211, 87,226,183, 29,123,177,110, 83, 46,190,184,114, 30,  0, 80,248, 78, 11,244, 28, 61,  1,166,210, 75, 56,241,203,
- 17, 28, 59,127,  6, 85,215,174,225,248,241,227, 77, 86, 88,107,205,154, 53, 18,126,125,152,132, 83, 74,123, 23, 21, 21,125,252,
-230,155,111,246,251,248,227,143,131,204,102, 51,  4,  2,  1,154, 55,111, 14,157, 78,135,194,194, 66, 68, 71, 71,115,117, 11, 60,
- 89,255, 97,132, 16,150, 82, 26, 85,121,249,224,143,239,252, 95,105,212,151,243, 58, 64,163, 11, 66,144,144, 65,167, 72, 49,174,
-221, 52, 67,254, 79, 43,  6, 14,141, 13,235,226,197,147,144,145,145, 65, 57, 69,192,181, 47, 54,244, 61,128, 59, 15,142,252,235,
- 43,  7,140,183, 65,132,171,247, 93,199,205,153, 52,195,231,  6,100,103,103, 83, 59,249,175,119,146,191,248,199, 11,208,239,122,
-160,206,113,175,150,171, 98,189, 36, 92, 83,  3, 54, 72,  8,243,145, 19, 48,253, 86,  2,227,238,253,128,193,132, 32, 74, 17, 10,
-  1,132, 32, 48,177, 86,104, 76, 70,124,177,103,155, 87,153,203, 22,217,173,123, 87,216,183, 57,115,133,226,244, 89,138,249, 75,
-252,239,179, 50,153, 76,237,234,246, 82, 42,149,188, 94,116,165, 82,233,172,173,205,225,233, 21,151,177,247,136, 22,165,215,141,
- 78, 37,160,248,178,  1,144,109,130, 82,169,228,229,142, 20, 18,123,229, 48, 81,205, 49,132,133,157, 69,176,184,  6, 44,171,129,
-197,114,  4,  2, 65, 52,204,186,138,187,214, 89,247,126,115, 92,  2,144, 58,228,127,245, 52,197,144, 73,  2,252,253,253, 68, 60,
-156,216, 15,  0,117,156,231, 27,214,175, 95, 79, 95,254,128,160, 89,235,  1,160,  0,146, 38,207,193,129,  3,  7,120,253, 45,203,
- 92,162,109,218,252,234, 36,255,154, 10,123,  9,230,129,  3,237,228,207, 21,  2,180, 31, 11, 65, 77, 69,  8,162, 66,175,122,148,
-153,156,156, 12,169, 84,138, 49, 99,198, 96,234,212,169, 16,  8,  4,183,125, 92,247,243,133,187,247,214, 47,101,201,133,136,  9,
- 33,206, 79, 67,251,  8,160,  6,133,186,  1, 89,183,222,175,244,116,149, 59,203,121,222,188,121, 72, 79, 79,175, 75,168, 13,200,
-251, 86,161,192,241,227,199, 85,132, 16,  9,128, 58,247,204,233,207,174,183,207, 83,251,130, 40,  5, 19, 26, 12,203,181,139, 80,
-188,241,  6,214,232, 42,161, 77,136,115, 30,255,242,191,107,240,246,130,217,136,153,255, 52,222, 61,182, 15,155,180,231,145,248,
-216, 99,136,142,142,246,121, 10, 96,205,154, 53, 18,185, 92, 78, 87,175, 94, 93,167, 15, 23, 20, 20,168, 60, 77, 67, 17, 66, 68,
-132,144,161,199,142, 29, 43,205,203,203, 83,191,252,242,203,113,159,125,246,153,184,182,182,214, 89,166,217,104, 52,162, 89,179,
-102,197, 83,166, 76,233, 53,114,228,200, 46, 94, 20,  9,134, 16,210,245, 88,254,230,242, 51,187,230, 95,152,255, 90,102,251,173,
-139, 59,224,183, 50, 33,170,106,  5, 96,  9, 80, 81,107,  6,109,217,195,248,210,235, 75,250, 61,250,196, 95,188, 78, 39,100,101,
-101, 17,110,172, 83, 40, 20, 94,191,  7,112,119,200,223,173,  7,192,149,248,249,140, 51,190, 88, 34,183, 92,109,171,221,122,  7,
-234,196, 25, 52,224,198,232,215,170,173, 74, 67, 45,  8,170,208, 64,252,237, 62, 16, 33,  3, 24,205,160, 53, 58, 16,171, 21, 34,
-  0, 54,202,194,104,179,162,198,106,  6, 88,239,115,168, 92,144,223,178, 69, 13, 15,131,246, 32,193,198, 15,168, 10,133,130,112,
- 46,125, 62,214,250,109,214, 63,128,255,189,208,190,206,246,208, 87, 75, 32,162, 55, 97, 33,173,144,147,147,179,143,175, 23, 64,
- 92,171, 66,212,187,255,197,141,151, 51,112, 83, 19,130, 14,150, 19,176,217, 74,  0,  0, 23,127,110,119,215, 58,236,166,157,159,
-170,102,143, 83,212, 33,127, 14,113,145,111, 96, 68,191,100,196, 71,157,192,166,157,239,171,198, 78,230, 63,136,172, 91,183,142,
-254,240,195, 15,168,168, 24,139,150, 45,247,162, 89,171,254,160,148,130, 97, 24, 94,129, 72,165,165, 64, 73,201,113,110, 34,  1,
- 16,215, 66,163,  3,134, 13,179,239, 41, 46,  6, 62,255, 28,168,169,  6,116,181, 64,173, 14,  8,139,172,230,213,182,134,230,250,
-207,157, 59,  7,  0,248,224,131, 15,  0,  0, 49, 49, 49, 77,230,102,118,237,147,124,254,102,238,220,185,112,181,216,235, 19,183,
- 15,144,  0,183,230,254, 93,193,121,  1, 28,231,168, 61,  9,153,213, 49,  6,103, 78,156, 68, 89,100,164,138, 97, 24,188,248,226,
-139,248,215,191,254,229,119,251, 70,153, 34, 64,217, 90,204,254, 96, 17,  6, 36, 39, 67,241,193,  7, 96,152, 91, 60,167, 40, 62,
-126,203, 67,184,127, 63,246,236,217,131,243,231,207,251, 28,  4,184,102,205, 26, 73,126,126,190, 10,  0, 10, 11, 11, 85, 12,195,
- 72, 83, 83, 83,213,171, 87,175,150, 80, 74, 17, 31, 31, 47, 53, 24, 12,170,  6, 20, 59, 75, 65, 65,193,128, 25, 51,102,180,232,
-222,189, 59,118,236,216,161,175,170,170, 18, 26, 12,  6,187,183,195, 49,255, 49,126,252,248, 24, 66, 72,  8,165,212,224, 70, 12,
-227, 34,143, 41, 57,253,243,138,183,255,145,214,172,101,207, 28,252,148,243, 44,126,189, 68, 80,122, 93,  8, 80,  6, 38,179,  5,
- 26,218,178,236,111,179,158,143, 35,132,148,209, 38,208, 42,249,196,217,  4,240,251,160,193, 41,128,188,188,188,219,246, 85,150,
-105,125, 38, 59, 87, 15,128,125, 10,192,222,127,196, 63, 94, 64,240,241, 50,216, 34,236, 86, 84,253, 57,228,134,214, 53,158,188,
- 92, 10,125,112,  8,162,173, 86,116, 10,105,134, 80, 81, 16,136,197,  2,176, 20, 86,155, 13, 53, 54, 51,244, 54, 43, 76,212,  6,
- 27, 40,168, 15,157,109,254,146, 91, 74,128, 61, 46,224, 22,233, 47, 91, 36, 64,230, 34,130,151,151, 88, 27,125,211,101, 50,153,
-154, 43, 93,202,  7, 11,115,236,247,125,105, 74,164,147,240,157,174,124,122, 19, 34,  0, 66,170,197, 87,179, 35,173, 79, 43,249,
-197,117,136,174,255,  8, 27,236,110,234,143,133,225,120,250,250, 69, 20,253,179, 19,194,218,245, 65, 85, 89, 25,174, 93,184,114,
- 87, 59,230,192, 97,209,208, 57,186,155, 62,228, 36, 66, 13,125,241,245, 59, 22,231,241,145,178,126,200,223,228,155,229, 63,121,
-244, 15,248,246, 91, 25, 34,242,149, 88,190,  8,120,105,  9,197,232,209,163,121, 47,251,235,214,169, 51,233,209,163,174, 22,184,
-109,155, 61,240,111,253,122,160,103, 79,138, 21, 43,  8,222,125,183,214,174, 32,  0,232,217, 43, 18, 47,191,196,175,141,156,149,
-154,156,156,140,141, 27, 55,214,177,100,147,146,146, 26, 36, 55,127, 21, 81, 31, 61,120,210, 21, 43, 86,168, 26, 82,  0,150, 45,
- 91,134,236,236,108, 94,150,240,115,207, 61,167,226, 34,255,221,225,165,151, 94,194,242,229,203, 85,217,217,217, 30,219,248,195,
-201, 82,188,254,238,  2,204, 90,252, 15,188,102, 54,227,147, 79, 62,105,240, 30, 45, 91,182, 12, 74,165, 18,132, 16, 73, 67,132,
- 61,186,111, 23,172,254,242,115,196, 78,159,142,119,222,121,199,163,210, 48,111,222, 60, 44, 91,182, 12,171, 86,173, 82,251,122,
-239,243,243,243, 85, 92,176,156, 92, 46,167,  5,  5,  5,170,212,212, 84,114,248,240, 97, 21, 33,  4,169,169,169,234,149, 43, 87,
- 54,248,247,122,189, 62, 98,219,182,109, 24, 59,118, 44,138,139,139, 67,117, 58, 29, 44, 22, 11, 24,134,129,217,108, 70, 74, 74,
- 10,113,144,187,129,143, 99,203,100, 50,  5, 29,217, 60, 29,163,159,124, 23,187,242,206,225,252, 85,  1,170,117, 12,  4, 66,160,
- 76, 23,130, 23, 95, 93, 20, 15,224, 50, 95,238,231,226, 78,  0,126,211,  1,  1,220, 29,235, 31,238,220, 56,156,107, 70, 34,145,
- 64, 34,145,224,151, 95,126,113,126, 74,126,188,136, 42, 67, 21, 90, 14,243,125,221, 47, 71,238,161,161, 51, 32,254,241,  2, 68,
- 23, 43, 64,  9, 65,208,172,138, 58,199,189, 18, 87,144,  0, 54, 10, 92,214, 85,162,180, 74,131, 27,213, 90, 84, 25,141,208,154,
- 13,184, 97, 50,224,170, 81,143, 50, 99, 45, 52, 22, 19,180,172,  5,102,214,123, 54,204, 81, 15,185, 25,240, 92,226,  2,102, 79,
-109,  6,138, 32, 80,223,202,128, 59, 93,248,245, 59, 59, 95,247,191,211,242,188,110,196,222, 35,218, 58,196,207,145,127, 48,123,
- 17,193,236, 69,188, 61, 94,136,210,210, 82, 51, 95,153,155,207,179,104,157,153,229,220, 62,175,179,225,242,185, 50,156, 62,120,
-  2,215, 46, 84,222,245,142,187,254, 11,187,  2, 90, 93, 78, 17,106,232, 11,201, 44, 33,158, 92, 44,114,126, 50, 55, 77,  7,  1,
-225, 61, 32, 61,254,112, 30,158,157, 47, 67,100,193, 94, 16, 66,240,221, 65,251, 35,224, 75,254, 28, 98,122,247,170,167, 88,  0,
-159,125,  6,156, 61,107,247,  4,188,243, 14,117,186,223, 41,165,136,140,140,244, 62,  2, 59,250,168,205,102,131,205,102,195,  7,
- 31,124,128,115,231,206,225,204,153, 51, 56,115,230, 12,148, 74, 37, 22, 44, 88,128,210,210,210,187,249, 72,212, 13, 89,210,115,
-231,206,229,172, 58, 94,100, 72,  8,113,107,253,115,240,116,204, 21,251,131, 43, 65,152,102,248,247,235, 75,208,108,155, 18,233,
-233,233,112, 45, 53, 44,239,217, 31,115, 99, 71, 32, 52, 52, 20,163, 71,143,198,155,111,190,  9,165, 82,169,210,106,181,110,223,
-191, 47,203,206,224,106,191,190,232,216,177,163,148,101,217,  6,189, 29,156,167,194, 95,207,139,107,164,124,124,124,188,148, 35,
- 74,  0,136,139,139,147,122,185,119, 99, 70,143, 30,221,162,180,180, 20,251,247,239,199,  3, 15, 60,  0,161, 80,232, 84, 22, 59,
-118,236,200,119, 58,130,117,200, 35, 61,122, 15, 94,152,189, 59,  2,191,238, 88,140, 81,241,125, 16, 38,102, 16, 22,106, 67, 72,
-176,  9,143, 60, 62,133,  5,160,169,175,171,122, 83, 46,185,235,227, 51, 29, 16,192,221,  3,227,233, 33, 42, 20,138,230,115,231,
-206,197,220,185,115,  1,192,252, 94,198,123,176,148, 91, 17, 18, 34,246, 43, 25, 73, 74,138, 61,124, 56,116,252, 89, 80,  1,131,
- 55,191,214, 59,173,127,190,  8,237,216, 81,106,109, 22, 10, 45,181,225,164, 78,139,227, 85, 21, 56, 81,125, 19, 39,170, 53, 56,
-169,211,224,172, 94,139, 10,147, 17,181, 86, 43,174,232,117,206,223,244,132,201,227,  8,150, 45, 18, 96,217, 34,  1, 40,  4,160,
-132, 65,250, 52,130,231,166,  5, 97,214,212,214,232,209,163, 45, 88,136,  0,248,118,201,156,171, 63, 37, 37, 69, 90,127,159, 15,
-247, 76, 90,124,217,174,200, 23,125,100, 15,162,219,245, 74,184,221,125, 67,181, 16, 80, 29, 76,140, 61,162, 89,163,209,132,166,
-164,164,248, 84, 20, 61, 54, 54, 22, 74,165, 18,235,107,117, 48,152, 25, 60,187,225,223, 40, 23,135,192, 96,190,123,101, 34, 38,
- 13,124, 91,154,175, 89,130,245,255,185,101,226,127,253,142,  5,113,145,111,220, 82, 40, 31,253, 92,154,165,200,226,149, 91, 98,
-249, 27, 64,234,252,177,136, 40, 80, 66,250,207,  4, 48, 19,  1,181, 90,237, 87, 31,238,218,181,110,244,248,152, 49, 64, 68,  4,
- 16, 29, 13, 12, 31,216, 28,226, 32,  1,  4,204, 45,177,226,144, 16,175,  3, 50,195, 48,206,185,254,115,231,206, 33, 38, 38,166,
-206,231,221,119,223,197,187,239,190,139, 43, 87,248,123,101,220,205,215,187, 34, 35,195,119, 11, 44, 59, 59, 91,186,124,249,114,
-183,132,205,215,250,119,113, 61,223, 22,167,192,109,179, 44,191, 20,246,102, 66,192,234, 77, 16,181,235, 10,249,251,239, 35, 53,
- 44,  2, 17,234,124,231,241, 89,127, 73,197,219, 31,255, 27,197,203,254,135,183,  6,140,193,148,200,238,216,179,101, 11, 74, 74,
- 74,220,190,127, 79,100,200,209,175,127,127, 41, 23,212,200, 41,100,174,211, 51,238,246,121,176,190,104, 70, 70,  6,229,  2,251,
-184,249,126, 87,146, 79, 77, 77, 85,199,197,197, 73, 57,215,127,106,106,170,218,203,125,203, 19,137, 68, 15, 60,241,196, 19,231,
-170,170,170,160,213,106, 17, 18, 18,130,214,173, 91, 35, 34, 34,  2, 17, 17, 17,222,110, 30, 91, 79,158, 45, 56, 56, 88,255, 84,
-198,191,164,107,126, 28,138, 11,151,170,209, 54, 92,128,248, 94,  4, 15,118,167,  8,107,209,162, 18,128,205,  3,111,  4,234, 13,
-220,167,214, 63,224,125, 25, 96,173, 66,161,  8,  6, 16, 38,151,203,157, 90, 96,167,132, 14,126,105,190, 10,133,130,200,100, 50,
- 40,149, 74, 26, 52, 43,167,142, 43,146,111, 30,128,150,143,141, 85, 87,228,236,128,222,106, 66,181, 78,143,115, 22, 11, 68,172,
-221, 81, 95,101, 49,130,165, 20, 20,192,142,235,231,161,179, 90,  0,128,199,192, 68, 48,127, 73,221, 62,110,159, 10, 96, 97,131,
-  9,191,157,173,193,234,141,213, 62, 93,175, 43,209,203,100, 50,117,125, 47,128,171, 82,224,  9, 50,153, 76,157, 35,159,  2,209,
-216, 47,  0, 68,163,162,226, 86,112, 94, 16,123, 21,102,166, 61,254, 54,224, 12,174, 94,181, 15,196, 10,133, 98, 47, 31,185, 25,
- 95,103,215, 81,188,114,114,114,192, 77, 74,108, 56,118,200,167, 85, 25, 77,141, 71,159,111,175,222, 42,167, 56,168, 60,  1,  0,
- 24,209,207,158, 25,239, 31,243, 22,227,208,137,126,248,120,211,116, 40,182, 61,175, 82, 76,226, 71,224,207,206,151, 33, 42, 74,
-233,106,200, 66,163,145,129,210, 28,135,171,146, 34, 39, 39,133,151,172,228, 39,159, 34,123,118,237,166,128,221,245, 47,149, 18,
-220,188, 20, 14,157, 86, 12, 67,117, 16, 54,172, 37,152, 59,151,226, 98,121, 13,134,199,199, 97,250,212,105,188,172, 98,155,205,
-230,156,239, 87, 42,237,109,117, 37,252,242,242,114,148,151,151,251,236,222,151,203,229,148, 97,152,219, 72, 53, 43, 75, 65,252,
- 72,  2,164,166,148,214,137,  5,112,241,  8,240,118,133,187,186,246,235, 71,239,123,115,251,215, 87,114,172, 53, 53, 16,181,138,
-130, 32,180, 25,250, 61,149,140,119,199, 37,226,117,110,217,222,224, 33,176, 25,140, 16,181,108,139,  1,113, 18,116,235,212, 29,
-255,250, 45, 31,253,251,247,151,254,248,227,143,183, 41,  1, 25,114, 57,  0,162,  2,128,231, 51, 50,156, 75,  7,173,245,200, 94,
- 40, 20,  0,244,214, 66, 69,  2, 96,160,155, 65,118,208,160, 65,132, 82,234,116,241, 23, 22, 22, 58, 93,252,174,231, 57,182,189,
-146,191,195, 96,127, 35, 34, 34,162, 95, 92, 92, 92,143, 83,167, 78,225,232,209,163,176,217,108,  8, 11, 11,131, 94,175, 47,143,
-138,138,186,224,139,209, 71,  8, 97,218,182,109,187,231,241,199, 31,111, 91,112,160, 16, 43,114,246,160,  5,  9, 66,175,182, 38,
-156,189, 25,134,135,123, 89,206,  3,176,112, 10,154, 67,161,180,121,122, 38,174, 99, 93, 96, 10,224,222,  6,159,249, 98, 51,  0,
-179, 43, 81, 95,206,187,  2, 76,247,157,252, 93,201,198,221,160,197, 87,  9,168,214,104,165,150, 80,177,170,138, 97,113,205, 88,
- 11, 88, 44,176, 81, 10,  2,224,183,218, 74,148,233,171, 65, 41,229,146,216,240, 24,152, 40,210,167, 17,100,111,184,213, 39, 79,
-157,  3,122,247,176, 66,  0, 93,163,200,223,181,179,251,235,242, 74, 73, 73,145,230,228, 60,175,  2,138,160,209,104,204,165,165,
-165,194,165,137, 96, 22,238, 25,141,121,253, 15, 57,173, 48,190, 74,133, 59,175, 75,253,109,142,132,248, 90,115, 88, 76, 48, 52,
-187,132,  2,238,151,251, 57, 51,  1, 42, 65,249,  4, 41,102, 76,250, 66,170,216,250, 55, 85,254, 38,138,248,168, 19, 24, 41,235,
-135,  3,123, 78,160, 64,251, 62,  8,  8,228,147, 62,231,125,173, 81, 81, 74, 16, 66, 48,121,242,100,172, 90, 85, 13,206, 40,182,
-255, 79, 29,247, 56,167,206,128,228, 97, 10, 22,  9, 99,164,210,188,125, 42,213,152, 49,128,249, 90,103, 92,170, 12,  6,235,152,
-109,109,175,107,139, 87,210,107,176,167,160, 23,154,119,234,197,171,141, 28,241, 95,190,124, 25,  0,112,237,218, 53,167,103,224,
-250,245,235,206,129,213, 31, 40, 20, 10,194, 37,  2,170, 63,135,155,165, 80, 16, 62,249,  0, 92,177,106,213,170, 58,177,  0,203,
-151, 47,247,217,250,175, 79, 24,254, 66, 44, 22,227,218,197, 11,232,222,163, 39, 88,171,  9,196,106,131,176,121, 11, 52, 31, 50,
- 20,205,  6, 63,  4, 86,103,133, 77,111,  2,181,218,  0, 27,139,133, 43, 63,198,212,233, 83, 33, 22,139,221,202,179,110,136,228,
-245,187,238,206,139,253,208,253,185,241,241,241,210,130,130,  2, 21, 55,  6,140, 28, 57,210,237,189,226, 65,254, 32,132,176,  0,
-118,246,234,213,107,240,167,159,126,106,190,113,227,134, 49, 49, 49,241,241,162,162,162,183,244,122,125, 69,171, 86,173,228,125,
-251,246,213,248,112,239, 69,  0,186,196, 13, 31,222, 58, 99, 86,  6,206, 95, 62,175,121,102, 86,198,168,195,123,214,102, 94,173,
-209,140, 24,154,144,200,182,237, 20,243,164, 27,175,  1,235,105, 44,112,229,138,134,146,255,  4, 18,  1,221, 63, 10, 64,131,214,
-133, 63,228,207,145, 13,151, 19,192, 31, 37,160,187,124,134, 26,  0, 41, 83,172,161,  8, 17, 67, 75,173, 48, 91,173, 96, 41,139,
-150,225,225,184,172,171,226,151,193,206,  1,119,203,251,110,197,  0,248,150,137,205,157,139,191,177,233,122, 29,127, 59,105,232,
-208,161, 91, 23, 46, 92, 24, 20, 21, 21,197, 94,189,122, 21,243,250, 95,173, 67,254,190,252,134,187,251,239, 55, 28, 89,254,234,
- 39,121,114,119, 14, 95, 12,126, 84,160,206,122, 52,139,108,249,236,138,100,251,177,119, 84,249,155,  0,  2,130, 73,  3,223,150,
- 62,250, 60,255,  4, 64, 92, 95,178, 19,124,181, 99,144,  2,220,241,206,154, 76,187,243, 36,172, 75, 22,  1, 26, 46,174, 49,125,
-234, 52,245,244,169,211, 72,133,246, 83,137,173,166, 70, 69,  4,128,222, 24,  2, 82, 99,133,144, 17, 66,207,136,165,227,166,204,
-134,144, 18,175,237, 76, 76, 76, 36, 15, 60,240,  0,189, 83,239,159,221,218,207, 34, 25, 25, 25,212, 53,162,221,213, 19,224,163,
- 56, 53,103,249,187, 40, 20,234,187, 49,120,141, 25, 51,  6,127,219,148,141,119,107, 42, 49, 40,225, 97, 48,109, 35,237,109,178,
- 80,123,234, 94,136, 64,  4, 66,144, 32,  1, 86,101, 45, 67,139,177, 67,209,163, 71,143,223, 53,117, 47,103,221,231,231,231,171,
-134, 15, 31, 46,157, 57,115,102,163,126,251,220,185,115,178,189,123,247, 94, 20,  8,  4, 91, 70,141, 26,245, 30,195, 48, 55,226,
-226,226,242,156,150,140,139, 71,137, 16,  2,119,207,220,197, 19,160, 60,122,244,232,176,175,214,172,101,130,  4,193,151,146,159,
- 78, 30,200, 48,140,246,225,  9,179, 39,  2,  8,119, 16,127, 13,  0,106,181, 90,157,242,234, 41,109,129,146,242,247, 32,248,184,
-255,253, 82,  0,154, 66, 97,240, 68, 62,190, 12,112, 82,121, 42, 81,238, 81, 74,216,211,197, 42,157,201, 12,171,205,134, 30,195,
-134, 32,198, 58,220, 39, 50,108,202, 96, 20, 46,233, 15,  0, 21,231,233,112,153, 10, 32,141,144,187, 77, 38,147,  9,149, 74,229,
-252,165, 75,151,254,211, 69,185, 24,163, 80, 40,124, 74, 68,226,240, 20, 52, 89,242,146, 41,191,165, 56,238, 99,195,215, 55, 69,
-169,244, 75,211,127,236,133, 14,234,199,208,248,231, 99, 39,119,130,103,231,143,113,230, 41,231,198,177, 53,153,123, 17,214, 37,
-139,132,117, 73,241, 73,102, 68,139,191,171, 15, 94,  4, 97,153, 75, 18,131,222, 94,  7, 32, 76, 44, 83,135,119,132, 79, 43, 70,
- 93,250,159,200,161,113, 54,249,188, 42,167,  4, 52,133, 44, 71, 44,128,138,251,222, 88,121,254,174, 44,235,209,163,  7,218,189,
-248,162,116,197,238,221,170,146,247,190, 69,138,168, 37, 34, 28,197,123, 12,122, 43,230, 46,120, 13,130,208, 40,236, 88,171,192,
- 47,173,  8,198, 53, 34,111,191,205,102,133,175, 49, 64,245,149,  0, 62, 86,190,151,251, 68,206,156, 57,115,131, 82,154,217,187,
-119,239,255,171,168,168,208,  9,133, 66, 88,173, 86,218,178,101, 75,167, 71, 69,167,211, 33, 40, 40,200,233, 69,242, 32,111,116,
- 97, 97, 33, 88, 43,193,136,145,  3,223,190,124,249,178, 86,163,209, 32, 42, 42,138,237,212,169,147,150,123, 54, 85, 85, 85, 16,
-139,197, 32,132, 32, 56, 56,152,151,209,199, 41,  9,245,191,215,247,138,  6,112,159,121,  0,238,148, 82,224, 55, 49, 38,202,212,
- 72,148,221, 83,209,164, 14, 37,128,220,129,121,116,155, 76, 38,251,127, 50,153,236,255, 53, 69,251,154,240,122, 73, 83,156,115,
- 39, 97,183,234,  1, 71,138,253,122,199, 82, 26, 37,155, 97, 59,171,195,196,157,155,162,153,150, 59,121, 15,154,176,232,138,218,
-151,185,122, 47,202,132,223,114, 40,165, 36, 52, 52, 20,147, 39, 79,134,163,124, 47, 74, 93,202,247, 30,220,187,199, 89,190,119,
-108,220, 88, 56,148,222,  6,127,111,149,246, 67,242, 92,228,107,183, 19, 19,207,106,130, 60,148,128, 70,227,161,135, 30, 50, 89,
-173,214, 60,  0, 58,150,101,169,217,108, 95,248,115,227,198, 13,  0, 64,179,102,246,165,189,220,126,145, 72,228,241,254, 61,250,
-232,163,156,140,221, 44,203, 34, 34, 34,  2, 44,203, 58, 87,156, 56, 86,177, 16,163,209, 72,  1, 32, 65,144,246, 25,  0,  0, 32,
-  0, 73, 68, 65, 84, 40, 40,  8,132, 16,230,247, 24,219,  3,240, 31,124, 82, 73,  3,  0, 25, 52,104, 80, 64, 19, 11, 32,128,  0,
-  2,184,127, 96,  5, 96,  4, 32,110, 98, 35,206, 91,193, 32,222, 21,  5,  3,184, 63, 16,120,152,  1,  4, 16, 64,  0,247, 23,132,
-  0,154,241, 32,127, 61,236, 65,220, 77,197,  7, 44,  2,203,254,254,112, 29, 41,128,  0,  2,  8, 32,128, 63, 30, 66,  3,124, 17,
- 64,192,  3, 16, 64,  0,  1,  4, 16, 64,  0,  1,  4, 20,128,  0,  2,  8, 32,128,  0,  2,248,179,163,142, 75,103,206,156, 57,126,
- 71,112,186, 43,222,115,175,203,139, 30, 18,140,144,224,107, 16,  5, 85,130,101,237,203,194,  4,  2,  6, 12, 17,216,255,103,  8,
-  8, 97, 64,137,208,190,  6, 22, 86,108,221, 46,  2,165, 20, 81, 76, 75,248,216,190, 96,  0,173, 96, 15,224,169,129,125,185,151,
-  5,142, 57,181,251,241,254,  5,228,  5,228,  5,228,  5,228,  5,228,221,155,242,124, 86,  0,254,108,248,225,192, 89, 12, 27,106,
- 65,100,  4,160,209, 18,252,244,139, 24, 66, 70,136,  9,227,109,216,163,106, 13, 66, 24, 16,134,129,184, 57, 48,102, 88, 37,  0,
- 33, 30,142,167, 40, 44, 18,218,105,156,  7, 84,135, 14, 80,  0, 16, 81, 11,134,143, 26,115,241,204,175, 63,154,202,171,141, 49,
- 54,189, 17, 50,153, 44,  2, 64, 85, 64, 15,189,191,145,251,245,127, 36, 61,123,116, 87,221,184, 97,108, 84,194,167,251,  8,146,
-244,244,116,215, 60,  0,141,186,230,244,244,116,191,211,  1,  7, 16, 64,  0, 77,228,  1,224,176,246,171, 47,121,107, 19,207,206,
-156,229,245,101,109,106,121, 77,137,194, 34, 17,146, 18,109,248,229,215, 16,  4,137,132, 16, 10,132, 16,137, 40,130,  5, 22, 64,
-216, 28, 66, 24, 48,172,159, 21,226,160, 96, 80,  0,237,219,  2,143, 77, 96,177,119, 11, 63,242, 63,251,219, 25, 60,208,183,  7,
- 58,116,140,192,229,139,167,186,134,183,235,142, 86, 29,108,248,254,187,239,160, 84, 42, 43,239,246,250,120,165, 82, 57, 33, 39,
- 39,103, 59,183,157,146,146,242,168, 76, 38,219, 30,120, 53,188,227,215, 95,148,212,106, 60, 33,157,246, 88, 15, 21,203, 86,160,
-170,131, 65,117,234,248, 38,212,154,218, 99,104,236,168, 63, 44,137,165,167,167,171,230,205,155,  7, 66,  8,175,178,189,124,192,
- 37,139,105,130,114,243,  1, 52, 82,  1,243,  8, 74,145,189,106, 85,131,207,155, 75,240,227,154, 45,144,171, 33,224, 82, 75,192,
-249,156, 93, 43, 35,  6,208,180,224,178,  1,114,112,151, 27,224,158,242,  0, 48,248,125,251,193,132,113, 22, 80,  8, 32, 20,136,
- 48, 98, 56, 65,155,214, 12,132, 66,  6,193, 34,  1,122,199, 48,184,120,201,138, 97,177, 12, 90, 70,137,241,253,190, 22,  0,  0,
-  1, 53,192,158, 10,219,230,149,252,127, 45, 42, 66,183, 14,157,240,107,126,  1, 14,155, 45,208,222,212, 34, 40,184, 57,250, 12,
- 30,137,129, 35,199, 65,181, 53,  7,  0,191,220,248,119,128,248,199,228,228,228,236, 93,184,112, 33,138,138,138,184, 14, 83,  9,
-224,197,217,179,103,111, 75, 73, 73,145,201,100,178,189,127,184,151,226, 39, 37, 13, 22,106, 32,100,204, 48, 26,109,168,210,133,
-224,225,209, 83,124,186,255,155,114,191,146,180,  8,209,224, 47, 83,135,160, 91,215,199, 84, 45, 90,132,195, 98,181,226,198,141,
-155,104, 91,122,  9,197,231, 74,112,232,160,134,142, 24,249,184, 95,207, 53, 59, 59,155,186, 12,206,247,218,224, 40,  1,110,149,
-195,117, 84,  7,148,224, 46,165,  3,254, 29,223, 23,186,121,243,230,219,235, 41,220, 53,242,162, 18,  2,  2,218,  4,247,157,150,
-126, 13,114,120,182, 43,199, 59,178,100, 58,170, 33,185, 96,118,150, 14,195,166,126,234, 81,145,251,254,251,239,157,219, 73, 73,
- 73,216,185,115,167,199,237,  0,238, 60,249,187,238,115, 85,  4, 60, 42,  0,  7, 15, 28,198,200,135,135,255,110,141,102,125,200,
-159,234,154, 74,210,223,236, 83,140, 80,  0,173, 70,136,118,109, 68,104,215, 38,  8,181,181, 34,136, 69, 66,216,132,193, 24, 50,
-128, 96,208,131,  2, 48, 68,100, 79,129, 41, 10,130,136, 49,129,136,131, 96,213,  3, 86,232, 60,146,255,129,125,123,209,189,125,
-107, 28,255,229, 56, 22,189,247,118,157,246, 45,121,231,  3,202,  8,  8,134,196, 14,193,247, 59,247,250, 84,121,143,101, 89, 73,
- 81, 81,145,234,236,217,179,  8,  9,  9, 65, 72, 72,136, 52, 41, 41, 73,237,227, 96, 38,205,201,201,217,203, 17,191, 75,231,136,
-  0, 48,238,223,255,254,247,205,217,179,103, 43,  1, 36,202,100, 50,229,189,216,193, 87,175, 94, 45, 73, 75, 75,227,125,221,255,
-219,184, 86,210, 63,166,185,170,107,123, 35,194, 91,  4,131, 97, 66, 97, 48, 88, 81,161, 49, 32, 79,185,130,138, 91, 12,193,240,
- 97,163,121,245, 35, 17,174, 97,242,163, 15,170,250,245,235,131,171,215,180, 56,242,211, 81,212,214,234, 16, 30,222, 28,209,209,
- 93,193,  8, 68,176,217, 74,241,211,207,  7,232,224, 65, 15,255,161,172,155,244,244,116,213, 75, 47,189,228,220,158, 55,111, 30,
-150, 47, 95,174, 90,229,193, 42,244,137,140,238, 81, 15,128, 67, 73,167,185,185,185,112, 87, 88,233,247,132,171,149,173, 80,100,
- 73, 41,109,156, 18,192,116,125,202, 73,222,133, 31, 54,115,107,134,181,139, 96,208, 49,138,185,111,159,223,159, 21,174,100,239,
- 78, 41,240,234,  1, 56,120,224, 48,  0, 52, 90, 17, 56,240, 98,177,199,227, 15,255,171,167,223,131,  5, 33,196,175,106,123, 74,
-117, 27,136,132, 34,116,238, 80,139,154, 26, 17,142, 28,239, 12,129, 64,  0,  1, 17, 32, 72,100, 69,191,158,122,244,234, 41,  0,
-  1,131, 32, 81, 48,130,  4,  4,177, 15,154, 17, 21,201, 98,253,255,121,150,221,167,123, 91, 92, 60, 87,126, 27,249,  3,192,162,
-197,175,147, 15,222,251, 39,109, 31,255, 32, 34, 35,154,243,110,175,193, 96,144, 44, 95,190, 92,117,241,226,197, 58,250,134,201,
-100,194,227,143,243,183, 54,115,114,114,246,185,146,191, 27,180,202,204,204,172,124,249,229,151,247,220,237, 41,138,134,200,255,
-240,225,195,170,180,180, 52,222,109,139,137,142, 82,117,108, 91,141, 86, 45,195,208,169, 99, 59,132,134,133,226,226,197, 50,216,
-108, 44, 58,118,104,142, 19,191,229, 99,205,233, 98, 73,234, 51,179, 60, 14,166,199,142, 29,160, 79, 78,234,131, 46, 93, 58,225,
-228,111, 23,113,228,200,111,184,113,179,  6,148,  2,145,145, 33,208,235,107, 49,120,112, 63, 84, 86, 86,161,236,200, 79,248,234,
-191,103, 36, 51,255,194, 95, 81,185,199, 33,  1,236,197,167, 56,124,242,201, 39,220,182, 79, 94,128,244,244,116,234,234, 18,118,
-181, 32, 93, 93,210, 77, 49,189,240,222,123,239,209,206,157, 59, 55, 58, 23,191, 76, 38, 35,132, 16,186,105,211, 38,143, 57,246,
- 57,100,100,100, 80,119, 30,130, 53,107,214, 72,184,226, 64,238,148, 88,185, 92, 78, 27, 74,229,234, 90,207,129, 82, 10,185, 60,
- 67,213, 24, 47, 68,125,121,195, 94,171,197,143, 31, 54,171, 67,252,  1,220,159,214,127,253, 62,212,168, 41,128,198, 42,  2, 15,
-255,171,103,131, 74,128, 63,228,207, 33, 47, 47, 15,101,101,101,  0,128,142, 29, 59, 82, 95,148,  0,  1, 53, 64, 72,108,  8, 18,
-137,240,211,241,214, 16,  8,133,104, 46,210,217,227,  0,154, 49, 40, 43,107,142,  7,251,177, 32,132, 32,229, 49, 43, 40,203,  0,
- 36,216,238,120, 67, 77,131,114,245,149,151,112, 77, 83,139,151,223,122,171,193,182, 84, 86,105,160,189,113,205, 33,139, 55,113,
-215, 39,127,  0,192,142, 29, 59, 96,179,217, 36, 79, 62,249,164,215,  1, 78,169, 84,142,169, 95,250,151,235, 48, 85, 85,117,226,
- 17, 35, 22, 47, 94, 12,165, 82, 57,246, 94,154, 10,224,200,223,151,191,249,223,198,181,146,  7, 99, 76,  8,  9,137,128, 56, 56,
-  8,221,187,119, 67,231,110,221, 80, 93,173,134, 70, 83,139,160, 32,  1,162, 34,197, 16,134, 68,120,204, 21, 15,  0, 66, 90,134,
-230,205, 90, 66,111,176,226,248,241, 98, 92,185, 86,133,171,215,106, 97, 48,137,209,165,163, 21,226, 96,  1,138,207,148,224,129,
- 30, 61,112,229,106, 53, 12,214, 22, 94,101, 58,136,142,122,219,239,235,116, 64, 67, 50,253,145,197, 89,255,243,230,205,187,109,
-255, 75, 47,189,228, 87, 44,128, 59, 18,173, 63,119,220, 84, 94,133,252,252,124, 21, 26, 89,144,103,239,222,189, 52, 39, 39,  7,
- 41, 41, 41,112, 55, 29,192,199, 83,197,145, 63,  0, 20, 22, 22,170, 24,134,169,211,166, 53,107,214, 72,248, 24, 61,241,241,241,
- 82, 78, 78, 83,120, 92, 54,189, 20,134, 41,203,117,110,137,191, 99, 20,227, 24,165,248, 61,222,164,164,164, 58, 94,146, 71, 30,
-121,164,206,189, 10,184,253,239, 29,248, 28,  3,208, 84, 30,129,166, 68,113,177, 93,177, 40, 43, 43,243, 73,  9, 16, 10,133, 16,
-  9, 68, 16,137,  8, 70,143,  4,244, 58, 19,206,159, 11,130, 72, 40,130,208, 38, 68,220,112,138, 32,145,  8,  2,  1,  3, 80,  2,
-141, 22,248,241,168, 16, 44,203,  2,184,209,160,220,163, 63,157, 67,109,109,195, 25, 56, 63, 90,188,152,  6,  7,139, 97, 48, 84,
-193,198, 90,121, 95,231,209,163, 71, 27, 86, 58,244,122, 94, 68, 83,223,245,239, 78, 51,220,186,117,171,235,249,202,187,225,  5,
-112,231,226,119, 37,255,248,248,120,222, 85,232, 58,117,108,171, 98,152, 75,176,218, 88,152, 45, 86,220,184,169,129, 40, 72, 12,
-147,201,  2,139,213,  6,171,149,133,213, 70, 81,169,189,233, 85, 86,144, 72,  7,113, 72, 39, 84, 84, 84,161,186, 70, 15,141,214,
-128, 22, 45,  7, 98,196,131, 15,162,240,224, 78,116, 48, 91, 81, 85, 93,133, 94,189,122, 32, 56, 72,  8, 93,141,230,143, 50, 86,
- 72, 40,165,206,185,127, 87,172, 88,177,194,175, 88,128,121,243,230,213,241, 38,212, 63,198, 87,  1,176,151,122,230, 44,218, 40,
-140, 29, 59,182, 78,127,229, 12,132,210,210, 82,149, 82,169,244,171, 48,149, 82,169,116,146, 63, 55, 29,176,121,243,102,175,228,
- 90,223, 83,149,159,159,175,226,  2,223,228,114, 57, 45, 40, 40, 80,165,166,166, 58,143, 23, 20, 20,168,  8,241,220,188,248,248,
-120,169,107,153,225,140,140, 12,234,233, 94,121, 27, 15, 83, 82, 82,144, 28,175,196, 70,  0, 83,151,235,240,208,107,181, 30,239,
-253,176,169,158,239, 85,253, 57,126,111, 49,  1,  1,220,121,111, 64, 67, 30,128,223,213,191,227,206,210,111,140,245, 95,207, 98,
- 69,113,113, 49, 86,172, 88,193,187,212,164, 64, 32, 68,220, 48, 22,  2, 70,136, 31,139,196, 56, 93, 44,198,196,241,192,163,143,
-  0,147,146,  8,218,183, 13,130, 56, 40, 24,226,160, 96,132,136,131,209,177,125, 48,196, 65, 98,136,131, 60,151,196,124,115,209,
- 27,100,233,135,239,146,134,  6,146, 30,221,187, 34, 60, 34, 12, 98,214,140, 90,189,229,119,239, 20,  7, 14, 28,216,123,224,192,
-129, 58,132,239,250,  1,128,138,138, 10, 76,154, 52,233,174, 89,249,133,133,133, 42, 87,107,136,219,  7,  0,195,135, 15,247,201,
-146,179,217,  0,157,222,  2,157,206,140,234,106, 19,174, 95,215,226,202,149,155,168,169, 49,161,182,214,130,218, 90, 51,116, 58,
- 11,170, 42,189,175,200, 52,153,172, 48, 26,109,176, 88,204,104,222, 60,  8,157, 59,182, 64,104, 88, 24,  0, 32,186, 71, 55,116,
-234,208,  2,225, 45,196,160,212,  6,139,149,133,201,164,251, 67, 12, 36,233,233,233,170,249,243,231,123, 36,115,110,105, 32, 79,
-239,132,212,161, 52,184,197,242,229,203,177,106,213, 42,159, 75, 13,219,221,226,114,234,250,225,  8,181,172,172, 12, 57, 57, 57,
- 62,151,162,221,187,119, 47,205,205,205,117, 37,127,200,100, 50,146,156,156,236,241,239,230,204,153,  3, 66,136,211,170, 95,189,
-122,181,  4,  0,226,226,226,164,174, 74,172,235,113, 74,169,243, 56,143,171,173, 99,197,187, 83, 28,188, 41, 19,  0,208,170, 85,
- 43, 16, 23,235,161,177,242,  2,184,247,200,223,221,182, 95, 30,128,123,201,242,191, 53,192,219, 32, 16,  8,124,254,187,145,195,
- 88,180,105, 29,140,234,106, 33,130,133, 86,  4,  7,  9,160, 62, 28,132,137, 82, 17,130, 68, 34, 84, 87,139,112,176, 40, 12, 45,
-196,  4, 12,195, 32, 73,102,198,227, 19, 41, 24,134,226,253,159,125,111,167, 82,169,164,130, 80, 49, 52,162, 86,  8,181, 92,198,
-217, 50,138, 49,146,209,188,255,126,240,224,193, 56,116,232,144,219, 99,161,161,161,188,  7, 75,173, 86, 59,214, 49,240, 32, 53,
- 53,213,185,191,162,162,194,249, 61, 53, 53, 21,229,229,229,119,229,121,166,165,165,169, 11, 11, 11,145,159,159,175, 98, 89, 86,
-202, 48, 12, 56,203,191,161,121, 83, 79, 40,189,116, 69,218,186,133, 94, 21, 28, 36,128,217,194,194,104,186,140, 75,151, 43,160,
-209, 86, 67,163,209,163, 66, 99, 64,133,198,128,136,168,110, 94,101, 93,191, 73,113,237,250, 77,244,233,211,  3,149, 90, 45, 68,
- 66,  6,213, 53,151,161,171,100,209,247,  1, 29,218,182,110,141,208,208, 80,  4,  7,135,224,234,181, 26, 16, 65, 36, 95,130, 37,
- 46,228,216, 36,171,  0,154,122,  5, 65, 67,214, 58, 80, 39, 22,128, 47,212,  0, 48,119,238,220,219,188, 10, 46,211, 12,106,127,
-218, 57,101,202,148, 58, 22,108, 78, 78,142,147,188,158,122,234, 41, 36, 38, 38, 18,190,137, 83,220, 88,254, 78,212,247, 52,212,
-199,160, 65,131,  8,165,212,105,229, 23, 22, 22,170,  8, 33,206,210,192,169,169,169,234,252,252,124,228,231,231,171, 82, 83, 83,
-201,225,195,135,157,199, 87,174, 92,217,160,220,252,252,124, 21,195, 16,105, 65,129,253,157,152, 51,103, 14,126,254,249, 39, 41,
- 71,225,  5,  5,  5, 42,238,250,249, 40, 19, 43, 87,174,196,231,210, 72, 76, 93,161,  7, 96,159, 14,112,197,212, 21,122,231,253,
- 76,147,138,  2,204,122,191, 40,237, 11, 63,170,171,116, 47,125, 21, 63,255,252, 51,255, 85,  0,119,130,248, 93, 99,  1, 26, 99,
-253,215,181,228,235,146,127, 82, 82, 18,228,114,185,215,169,128, 86,173,  4, 96,136,  0,173, 91,  9,208,179,  7,197,149, 43, 66,
- 48,  2,  2,145, 80,  8,145, 80,132, 95,143,133, 33, 42, 76,  4,129, 64,128,145,195,109,  8,  9,  9,  6,203, 82,128,218,252, 34,
-255,102,109, 59,227,122, 45,133,238,172, 26, 66, 34,192, 43,139, 23, 17, 31,  7, 54,233,165, 75,151, 84,151, 46, 93,186,237,122,
- 39, 79,158,204,107,176, 76, 73, 73, 73,172,168,168,216,195,145, 60,  0, 76,154, 52,  9,107,214,172,113,158, 83, 93, 93,141,242,
-242,114,108,219,182, 13, 41, 41, 41, 99,238, 70,231,141,139,139,147,230,231,231,171, 10, 11, 11, 85, 92,176, 88, 92, 92,156, 95,
-115,184, 51,255,146,166,222,240,191,108,208,178,106,232, 13, 22,104,131,141,160,208,194,104,180,162,186,218,132,242,155,122, 92,
-185, 90,139, 81,210,174, 94,101, 25,204,173, 80,114,254,  6,162,187,119, 65,247,238,157, 80, 81,113, 19,145, 17, 54,244,236, 25,
-142, 54,173,163, 33, 14,  9, 65,101,101, 45,142, 28, 61,133,203,101,213,104,215,169,223,125, 59,128, 80,128, 18,  2, 41,199,165,
-174,164,234,105,221, 62,117,  4, 11,222,110, 62,162,206,170,178,236,236,108,233,138, 21, 43, 84,245, 21,128,101,203,150,113,  9,
-134, 60,202,163,148, 82, 66,  8,145,203, 35, 93,218, 68,111, 35,230,156, 28,251, 20, 65,114,114, 50, 47,247,127,221, 41,133,189,
-110,201,159, 47,226,227,227,165,  5,  5,  5, 42,206,235, 48,114,228, 72,169,187,227, 92, 48,158, 55,194,230,230,214, 15, 30, 60,
-164, 34,132,128, 16,130, 65,131,  6, 74,  7, 13, 26,164,118, 81, 16, 28,231,  2,222,222, 23, 78, 30, 51, 69, 11, 78, 94,202,152,
-110,117, 30,212,148,229, 39,157,242,248, 32, 16,  3,112,255,192,171,  2,112, 47, 90,252, 28,166, 77,155,214,168,191,103, 24,  6,
-  2,129,253,211, 39,134,193,224,  1, 54,  4,  7,137,237, 10,128, 72,132, 17,195,129,224, 96, 64, 36,  8, 70,171, 86, 98,  8,  4,
- 58,216,108, 44, 88,214,119,183,189, 94,115, 13,226, 78,189,113, 94,249, 95,180, 22, 50,120,102,209,235, 62, 15, 40, 33, 33, 33,
-234,215, 95,127, 93,218,152,101,128, 50,153, 76, 41,151,203,241,194, 11, 47, 56,247,113,150,126,117,117, 53,244,122, 61,210,210,
-210,  0,  0, 95,124,241,  5, 20, 10,133,234,110, 60,219,212,212, 84, 53,203,178, 82,206,242, 31, 54,108, 88,163,  2,184, 58,117,
-237,133,162,130, 93,104,211, 42, 20,161,161,246,110,111, 50,217, 80, 93, 99,134, 70,107, 64,231,238,253,240,240,136,  4,175,207,
-100,194,132,167,200,238,239,255,143, 22, 20,158,192,168,145,  3,209,181,107, 87, 88,204, 70, 12, 30,244, 32,194,194,195,113,177,
-164, 20,101, 87, 42,113, 48,255, 55,104,107,194, 49, 57, 62,225,190,245,153,206,201,144,  3,128, 10, 32,152, 35,151, 59,  9,156,
-173, 71,250, 12, 67,236,218,130,131,151,  9,128,129,110,230, 27, 51,228,114, 10, 10,151, 72, 21,130,244,244,244, 58, 94,128,185,
-115,231,130, 16,130,140, 12,185,138, 99,127, 16, 96,224,192, 65,238,200,203,233,142,247, 70,114,124,201,191, 62,146,147,147, 49,
-118,236, 88,105, 99,250, 49, 28,115,245,195,255, 63,123, 95, 30,222, 68,181,191,255,206,100,239, 74, 91, 74,203, 94, 40, 84,144,
-173, 64, 69, 68,150,  4,202, 34, 75, 69,160, 40,139,124,145,235,109,192,237,178, 92, 69,209,251,243,222,171,160,184,  0, 94,185,
- 66,203, 85, 81,161, 98, 91,  5, 11, 22, 10,133,132, 69,212, 74,169,236, 88,160,172, 45,116, 77,211,166,217, 51,231,247, 71, 58,
- 49, 13,105, 51, 73,195,234,188,207,147, 39,201,204,228,147,153, 51,115,206,251,217,206,231, 60,252,176, 98,206,156, 57,234,166,
-246, 59,197,246,155,  4,155, 59,192, 42, 95,246, 48,  2,165,118, 85, 42,184,158,159,171,188,140, 69, 65,246, 70,151, 70, 57,142,
-201, 88,116,197,161, 16,228, 30,107,126,236,115, 87,  7,128,207,  1,184, 71, 21,128, 33,143, 14,186, 37, 49, 31,127, 89,254,206,
- 15,146, 47,168,214, 80,104, 27, 69, 59, 74,254,238,222,107,143,239, 75, 36, 82, 72,196, 18, 76,122,140,130, 84, 34,134, 76, 74,
-161,186, 74,128,252,130, 96,216, 24, 27, 58,118,240, 46,174,155,151,151, 71,106,244,  6,104,142,228,160,123, 71, 17, 78,150,248,
- 30, 23,166,105, 90, 61,104,208, 32,106,208,160, 65, 62,203, 72, 78, 78, 86,172, 93,187, 86,197,186,249,171,170,170,158,124,248,
-225,135,117,123,246,236,249,225,241,199, 31, 31, 83, 85, 85, 69, 61,253,244,211,185,201,201,201,138, 59,249,112, 54,184,250, 21,
- 78,159,125,127,230,236,228, 78,138,206,158, 70,105,241,101,208, 52,  5,155,141, 64, 42, 11, 71, 92,207,222,120, 98,114, 50,231,
-  7,189,180,130, 81, 84, 87,149,170,140, 70, 43,250,244,238,138,246,237, 90,227,202,213, 50,104, 78, 92,192,239, 69, 87,176,119,
-223,113, 92, 46, 33,120,246,175, 47,250,212,121,238,150,226, 63,204, 55, 97, 62, 31,215,127,  5, 71,121, 23, 62,199,154, 53,107,
- 28, 10,192,154, 53,107,128,226,141, 55, 29,235, 78, 94, 19, 94,129,155,198,172,150, 22,235,161, 40,170, 69,207, 30, 75,242, 77,
-145,187,167,253,238,188, 10, 46,191,117, 39,143,251,125,190,252, 45,178,214,204,177,143, 13, 35, 59, 53, 34,127,  0, 72, 30,255,
-144,253,131,230, 55,143, 10,  0, 95,  7,224,238, 65,218,202, 87,111, 10,  3,120,165,  0,220,205,  9, 31,190, 22,255,113,198,145,
-163, 18, 72,197, 98, 76, 26, 79,129,166, 40, 12, 74,176,226,196, 73, 25,104,202, 30,243,175,169,161,209, 46, 90,  0,154, 18,227,
-216,  9, 49,164, 18,192,108, 49,227,242, 21,153, 87,228,127,161,168, 16, 15,143,154,  8, 97,235,135,113,161, 40, 31,194, 27, 89,
-120,229,229,215,200,123,239,191,115, 71, 26,184,161, 94,189, 34, 33, 33, 65,181,116,233, 82,244,238,221,187, 92,163,209, 32, 33,
- 33, 65,161,209,104,240,210, 75, 47,169,146,147,147,239,138,186,246, 45, 37,126, 87, 37, 96,232,144, 17,216,248,213,167,242,182,
-209,109, 85,129,129,129,156,172,254,155,  6,216, 57,127, 81,  3,160, 54,111, 74, 37,167,127,255,  5,109,163,130, 32,149,138,160,
-211,153, 81,114,189, 22,148,176, 35,158,253,235, 28, 62, 91,138, 11,142, 46,  1, 98,159, 65,163,233,133,  5,139, 91, 66,214, 45,
- 62,165,249,243,195,157, 20,  9,255, 16,154, 39, 82,246,134,180, 91, 90,207,192, 93,155, 37, 63, 34,177, 95,171,225,186,253,197,
-227,158, 69,124,124,188, 35,225, 47,109,229,171, 55,237,243,168,  0,248,187, 30,255,237,174,239,239,213,195, 15, 10, 26, 13,133,
-128,104, 10, 17,225, 20, 18,  6, 88, 32, 21, 11, 32, 17, 91, 16, 17, 46,109, 24,  4, 40, 12, 78,176, 33,255,168,200,238, 45,224,
- 56,200,228,229,229,145, 94, 15,132, 96,201,223,254, 13,131,184,  3,190,203, 43, 65,108,156,221,114, 15,250,117,  7,150,252,253,
- 53,242,225,  7,119, 78,  9, 72, 76, 76,164,242,242,242,228, 43, 87,174, 84, 57,123,  7,252,161, 92,221,205,104, 40,246,211,226,
-107,156, 53, 91, 73, 29, 58,188,159, 84, 84, 85,192,112, 67, 15,169, 52,  2, 29,186,244,245, 73,169,184,215, 96, 47,135,237,167,
-203, 44,222,  8,199,140,128,226, 47,238,248,181,121, 74,238,187,223, 48,102,226,147, 94, 89,238,158,124,143,124, 14,192,221,165,
-  4, 52, 69,254, 30, 61,  0,127,  6, 16,216,179,250, 41,154,128,128, 32,188, 21,193,254, 67, 66, 72,197, 34, 72,196, 66, 36,141,
- 39, 32,132, 65, 88,132, 21, 86, 27,  5,134,177, 53, 12,126,158,209, 55, 70,135,  9, 83,147,161, 19,118, 71,155,160, 64,204,124,
- 34, 28,233, 91, 79, 56,148,  0,139,237,187, 59,126,253,172, 34,192,119, 25,223,189, 10,247,235,181,165,105,222,165, 82,194, 94,
-189,153, 25, 50,195,125,149,135,148,176, 87,111,222, 81,176,184, 69, 86, 63,143,150, 97,218,243,107,253,246, 12,223,239,198,195,
-189,166,  4,120, 52,128,227,227,227,249,160, 13, 15, 30, 60,120,240,224,241, 39,  3, 95,232,153,  7, 15, 30, 60,120,240,224, 21,
-  0, 30, 60,120,240,224,193,131,  7,175,  0,240,224,193,131,  7, 15, 30, 60,120,  5,128,  7, 15, 30, 60,120,240,224,113,127,160,
-209, 44,128,  5, 11, 22,248,156,193,233,174,182,182,191,229,205,154, 55,223,227,239,234,171,111, 56, 62,  7,134, 71, 59, 62,111,
-254,108,253, 77,199, 70, 42,158,245, 40,111,207,234, 63, 42,230,141, 94,180,214,241,185, 66,245, 63,248,114,126, 77,193,215,243,
-107, 10,238,206,111,242,211, 74,143,191, 59,162,250,  1, 49, 49, 49,184,116,233, 18, 18, 20, 19, 28,219,183,125,149,122,203,219,
-239,217,235,215,155,125, 94, 76, 66,161,124, 73, 73,137, 99,202,226,218,168, 40,199,241,255,107,219,246,150, 63,127,174,242,178,
-179,179,229, 57, 57, 57,141, 42, 37,142, 31, 63, 94,145,148,148,164,190, 19,253,163,176,176,208,103,121,253,251,247,191,213,231,
- 71, 45, 88,176,  0,119,243,248,114, 39,228,165,167,167,207,232,211,167, 79,250,137, 19, 39,166,206,156, 57,243,187,150,202,115,
- 94,232,200, 57, 35,255,126,109, 63, 94, 94,211,242,188, 86,  0, 92, 97,181, 90,229, 70,163, 17,148, 64,  4,138,162, 96,179, 90,
- 32, 22,  9, 33,145, 72,212, 45,213, 60,172, 86,171, 28,  0,132, 66, 97,139,100,213, 87,223, 64, 96,120,180,131,248,163, 59,198,
-  0,  0,110, 92,189,228,147,188, 61,171, 95,192,232, 69,107, 29,196,245,223,236,124,  0,192,243, 73,131,112, 63,226,136,234,  7,
- 36, 40, 38,224,136,234,  7,  0,192,132,105,179,  0,  0,151, 46,221,249,246,251, 79, 89,153,188,  8, 80,197,  1,138, 34,192,190,
-134,250,210, 87,  0,  0,131, 86,190,119, 71,219, 77,173, 86,147,156,156, 28, 24,141,198, 70,219,165, 82,169, 42, 36, 36,  4,114,
-185,252,174,156, 14, 69, 81,212,208,  7,186,180,255,130,216,108,250,162, 43, 55, 94, 35,132,236,224,237,160,102,148, 78,147,105,
-100, 97, 97, 97, 72,105,105,105,116,120,120,120,171,129,  3,  7,150,  4,  7,  7,127,229,171,188,244,244,244, 81, 51,103,206,220,
-159,158,158,254, 44,128,208,167,158,153, 63, 15,  0,115,226,196,137, 57,  0,182,  1, 96,188,145,199,174,121,194, 18,127, 75,250,
-155,235, 42,137,254,154,210,215,148, 82,194,227, 46,243,  0, 56,163,182, 78, 39,111, 27,247,144,106, 68,159, 30,  8,144,136, 64,
-  8,129,205, 70,112,242,220,101, 92, 60,126, 80, 33,147,136, 32, 16,  8,124, 34,239, 32,233, 37,121,175,238,197,170,147, 69, 93,
- 21,245,166, 24,159,137, 31,  0,100,161, 17,168,175,190,225, 32,254,230, 60,  2, 92, 44,213, 65,179, 94,197,158,213, 47, 56, 58,
- 82, 83,199, 53, 55,199,210,245, 63,197, 98, 49,  0,123,153, 76,134,177,247,111,155,205,230, 56,127, 90, 32,226,108, 69,  3, 64,
-219, 54,246, 82,157,230,218, 26,152,172, 86,  0,128,206,106,151,215,101,204, 95,208,173, 87,127, 78,196, 15,  0,253,134,140,194,
- 17,213, 15, 14,226,111,234,184,219,217,126,  0,240, 66, 89, 25,  1,128,177,129,129,200,173,175, 87,177,196, 15,  0,191,239,222,
-115,211,113,241,109,219,114, 58, 79,109, 96,165,188,160,242, 87,148, 92, 57,134,238,157,  7, 99,176, 84,238,245, 51,156,157,157,
-253,248,206,157, 59, 89,242,183,  2, 48,  2,  8,  0,192, 24,141, 70,161, 76, 38, 67,109,109,173,220,157, 39,224, 14,147,127,212,
- 67,241,125,118,230,126,189, 62,168,190,228, 12,134, 38, 47, 72,167, 40,106, 14, 33,100,219,221, 54, 48,229,229,229,145,150,212,
-167,224,178, 24, 88,115,176, 88, 44,242,252,252,124,213,169, 83,167, 28,219, 42, 43, 43, 81, 84, 84,132,182,109,219,126, 41,151,
-203, 21,193,193,193, 92,239, 47,157,158,158,254, 47,  0,143, 12, 29, 59, 89,150,158,158, 30,245,212, 51,243,131,  1,216,  0,176,
- 15,238,  3, 13,199, 13,231,122,125,108,127, 83, 42,149,164,169,254,198, 30,231,169,191, 41,149, 74,114,224,167,124,  8,  4, 66,
-216,108, 86,104,235,116,152, 57,245,113,242,193,  7, 31,180,136,176, 93,149,138,150,222, 23, 30,158,225,110,217, 95, 22,156, 42,
-  1,214, 27,204,242, 81, 73, 51, 85, 29,219,132, 34, 64, 42,  4,195, 48,176, 49,128, 80, 64, 33, 60,180,  7,122,117,239,164,202,
-203,253, 65, 97,179,212,203,189, 85,  2,204,102,179,188,103,175,139,170,126, 61, 46, 66, 64,219, 84,234, 35,237, 21, 98,145,200,
- 43, 25,245,213, 55, 32, 11,141, 64,104, 72, 48,  0, 56,222,221, 29, 23,221, 49,198,163, 55, 96,207,234, 23, 48,104,214,171,248,
-191, 39,167,  0,128,227,221,221,113,255,205,206,247, 74,187, 22,  8,  4,232,208,161,  3,  4,  2,  1,204,102, 51,234,235,235, 97,
-179,217,160,209,104,124,186,185, 65, 66,  1, 62, 91,179, 21,146, 80,160,236, 18,240,171,174,  4, 21, 55,206,227,171,213,175,121,
-101,245,247, 27, 50, 10, 29,218,217, 67, 36, 29,220,144,127, 76, 76,140, 35, 28,  0,  0,215,174, 93,243, 75,251,113, 41,174,250,
- 66, 89, 25, 25, 27, 24,136,183, 94,120, 30,  0,240,150, 19,241,111, 42, 42,106, 76,254, 94, 84,107,221,127,105,147,188,243, 51,
- 66,213,171,157,102,195,196, 36, 66,194, 16,156,169,220,139,207,223,207, 80, 76,235,155,202,245, 25, 20,230,228,228,108, 51, 24,
- 12,216,184,113,163,113,238,220,185, 82,  0, 65,  0,152,141, 27, 55,154,231,206,157, 43, 52, 24, 12,144, 74,165,170,164,164,164,
- 22, 13,116,223,125,247,157,124,247,238,221,170,150,214,178,119, 60, 59, 98,250,255,125,252,214, 43,178, 86,167,191,134,236,247,
-125,248,231,200,176,224,151,182, 87,252,187,193,242,188,171,200, 63, 35, 35,  3, 26,205,104,146,153,153,236,245,181,127,246,217,
-103,242,150,144, 77,125,125,189, 60, 59, 59, 91, 85, 87, 87,231,118,255,245,235,215,145,149,149,165,234,217,179,167, 98,240,224,
-193,158,158, 27, 42, 61, 61,253,171,161, 99, 39, 79, 47, 42, 60, 44,236,208, 46,218,250,212, 51,243, 27,141,187,251,126,248, 14,
-125,250,244,233,145,158,158,254, 88,159, 62,125,178,  1,224,208,161, 67,205,146, 42,151,254,166, 84, 42,  9, 40, 10,240, 80,229,
-111,253,250,245,228, 70,121, 37, 10, 79,158,118,108, 51, 26, 77,120,239,227, 52,157,114,238, 12,158,176,239, 99,220,148,  4, 88,
- 87, 87, 39, 31, 58,230,  9, 85,143, 78, 17,144,136,104, 48, 12,131, 27, 55,110,224,196,177, 66,152,173, 12, 24,134, 32, 34, 52,
-  0, 99, 30,155,168, 50,152,172, 94,255,161, 68, 84,142,216, 78, 55,  0,  1,133,  7,187, 95,133, 68, 88,230,181,229,239, 76,254,
- 55, 89,120,181,117,184,113,245, 18,100,161, 17, 77,122,  5,154, 35, 47, 87,124,241,205,119,120, 62,105, 16,  6,205,122,181, 73,
-171,214, 29,196, 98, 49,  4,  2,  1, 66, 66, 66, 80, 92, 92, 12,141, 70, 99, 87,164,124, 36,255,182,109,162, 16, 36, 20,224,137,
- 23,223,198, 99, 51,135, 96,199,201, 18,220, 48,160,197,228,239,138,107,165, 55,112,234,200,143,136, 12, 11,177,147,191, 80,224,
-151,246, 27, 55,245,255,  0,  0, 97, 66,145, 87,228, 15,  0,255, 88,251, 95,252, 99,237,127, 29,228,159, 91, 95,143,151,199, 76,
-180,239,140, 20,115,186,238, 47, 46,191, 43,255,235,146, 71, 84,207,116,126, 14, 34, 58,  8,129,  8,  0, 13,  1,218, 71, 61,138,
- 23,222, 90,172, 42,110,183,154,147, 26,161, 86,171, 45,  0,240,197, 23, 95,232,  1, 72,217,101,148, 55,110,220,200,  0,  8,112,
- 94, 86, 89,173, 86,251, 20,151,211,235,245,114,111,182,115,176,252,135, 62, 52, 32, 94,159,249,221, 86,101,255,222,113,130,250,
-211,123,113,169,188, 14,215,107,244, 96,  8,241, 41, 17, 56, 37, 37,133, 36, 39,103,146,205,155, 55,251,181,144,152, 19,249, 35,
- 60, 60,207, 39, 25,249,249,249,170,212,212, 84,138,162, 40,135, 50,224,229, 57,220, 68,254, 71,142, 28,193,204,153, 51,157, 61,
-  4, 56,123,246,172, 74,175,215, 55,187, 96, 86,122,122,250, 11, 67,199, 78,158,184,124,217, 34, 97,102,102, 38,254,247,241,  7,
-194,  6,143,145,131,252, 51, 51, 51,177,118,237, 90,244,233,211, 39,219, 83,127,115, 37,255,166,250,219, 99,143, 54,120,  1,131,
-  3, 61,202,251,240,227,117, 14,242, 47,175,172, 66,121,101, 21,180,117, 58,136, 68,194,160,117, 27,191, 54,186, 90,241, 60,238,
- 13,196,199,199,223,244,106, 86,  1,176,217,108, 36, 34,166, 47, 98,162, 91,193,104,177,129,162,128,220,220, 93,248,242,139,141,
- 56,126,236, 24, 94, 94,188, 16,  2,  1, 13,198,198, 32, 36, 64,130,152,190, 67, 85,  6,131,129,115,  7,179, 88, 44,242, 94,221,
- 47,171, 66,130,244,248,236,139,114,208, 20,193,160, 62,191,171, 44, 22,139, 87,157,212, 29,249,179,196,111,208, 86, 53, 82, 16,
-180,181,117, 30,229,185,235, 76,108, 71,202,223,252,110, 35,130,251,226, 27,110,229,123, 99, 99, 99, 17, 17, 17,129,218,218, 90,
-136,197, 98,208, 52, 13,131,193,  0,141, 70,  3,129, 64,192, 14,204,156,175,249,219,109, 91,177,112,205,110,108,253,248, 13,180,
-109, 19,133,128,192,112, 92,181,149,224,171,213,175, 33,168, 97,208, 16,112,148,231,142,252, 89,226,215,150, 94, 64,143, 14,109,
- 80,167, 55, 66, 18, 32,  1,108, 54,143,249,  0,158,218,239,181, 13, 59,112,234,232, 79,232,221,245, 65,104,109,158,149, 70,150,
-252,127,223,189,  7,255, 88,251, 95,199,246,220,250,122,228,214,215,163, 88,249, 47,236, 62,125, 28,189,  6,117,  5,170, 60, 47,
-205,156,126,110,165,124,193, 75,163, 84,145,129, 61, 97, 32,117,128,169, 28, 98, 83, 53, 76,182, 58, 24, 25,  3, 24,113, 16,218,
- 15, 75, 64,214,111, 43, 60, 13,116,212,150, 45, 91, 96, 52, 26,161, 84, 42,  3,148, 74, 37, 96, 15,  1, 64,169, 84,162,225,123,
-131,  5,101,196,150, 45, 91,188,238,180,103,207,158,149, 47, 94,188, 88,245,209, 71, 31, 17,138,162, 84,  0,112,240,224, 65,178,
- 98,197, 10,242,198, 27,111,248,180, 52,115,176,132,222,248,223, 87,159,145,141,109,111, 18, 28, 62,123,  3, 59, 46,209,120,117,
-103,153,233, 95,106,157,182,222,130,255,243, 69,166, 70, 51,250, 86, 90,254,  8, 15,207,195,172, 89,179,188, 94,141,210,153,240,
-215,175, 95, 79,177,203, 73,115,197,225,195,135,229,101,101,220,140, 18,179,217,140, 19, 39, 78,236,107,238,121,  1, 32,239,208,
- 46, 90,156,156,156, 12,  0, 40, 40, 40,192,190, 31,190,147, 94, 43,189,193,176,228, 15,  0,201,201,201,142,254,118,226,196,137,
-213, 45,233,111,239,205,157,136,147, 23,174, 34,186,107, 91,160, 94,207,249,218,203, 43,171, 96,177, 88, 27,198,106, 43, 44, 22,
- 43,174, 94,190, 36,109,201, 61,117,245, 30,240,222,132,187, 11,141, 92, 81, 38,147,  9,253,123,244, 80,  5,200, 68, 96, 24,  2,
- 27,  3,252,120,240, 16,254,245,214,219, 96,  8,112,238,252,121, 28, 63,246, 27,122,247,238,  7,129,128,194,  3, 93, 59,160,248,
-168, 21, 50,142,139,227,137,133,229,136,139, 41,  5,132, 20,174, 94,183,  0, 66, 10,125,123, 92, 70,254,137,114, 16,180,247,233,
-  2,156,221,251,238, 60,  3,  6,109, 85,163,217,  0,158,224,236,222,119,167,105,231,111,126, 23,163, 23,173,117,155,197,238, 12,
-171,213,138,128,128,  0,208, 52,141,176,176, 48,232,245,122,212,215,219,151,  1,142,140,140, 68, 85, 85,149, 87, 11,112, 24, 53,
-192, 32,153, 12, 47,127,124, 16,163,251,  1,151, 11,129, 95, 27,246,189,252,241, 65,252,103,145,  2, 54,198,230,117,251,157, 58,
-242,163,227,243,168,129, 61, 32, 12,166,145,171, 62,141,254, 61, 58, 34, 36, 72,130, 47,178,242,144,160,152,128,107,110,102,  1,
-120,106,191,236,211,  4,184, 14, 36,141,162,176, 97, 71, 49, 34,194,186, 96,202,163, 20,167,246, 99,221,253,185,245,127, 44,157,
- 76,254,185, 26,104,175,  5,245,215, 55, 65,254,245, 22, 64, 27, 64,229,175,192,218,168, 40,234,127,205,  4,  2, 98,167,  6,169,
- 58,183, 26,136, 90,155, 14, 38,205,121,124,117, 37, 29,135,146, 52,120,240, 89,  5,198,188, 24,  4, 89,216,  3,144, 10,195, 32,
- 76,210,226,215,239,126, 37, 15, 37, 60,212,212, 32,229,248, 15,154,166, 65,  8, 49, 55, 40,209, 70,154,166,245,132,144,112,216,
-147,184,124,158, 94,219,163, 71, 15,245,152, 49, 99, 20, 85, 85, 85,170,220,220, 92,187,226,147,155,139,158, 61,123,162, 71,143,
- 30, 62, 45,207, 92,103, 98, 94,154,247,143,255,108,127,127, 66, 52, 77,140, 90,252,117,115,145,197,106,177,172, 53,217,176,130,
- 16, 82,237,139,204,201,147,205,183,156,252,135, 15, 31,174,246, 86, 78,126,126,126,163,144,  9,235,  5,224,186,170,164,205,102,
-243, 74, 97,184,120,241, 34, 30,126,248,225,166,158, 23, 41,128,  7,  1,  8, 71, 78,152, 82, 83, 92, 92,220,170,160,160,  0,153,
-153,153, 24, 88, 92, 76, 23, 20, 20,  0,  0,  6, 14, 28,136,113, 35, 18, 16, 18, 36,193,218,207,183,150,207,156, 57,115,217,186,
-117,235, 22,121,219,223,174,111,123, 23,193,189,164,  8,234,190, 16, 25,239, 62,139,126,189,163,241,192,196,183,145,154,154, 74,
- 53,151, 37,174,173,173,131, 84, 42,  1,  0,136, 68, 66,232,245, 70,191,222, 91,158,244,239, 12,188, 94, 12,136, 97, 24,  4, 72,
-196, 48, 91,  9,104, 10,160, 41,224,205,127,191, 13, 27,  3,212,215,235,112,227,198,117, 68, 69, 69,131, 16,  6, 86, 43, 32, 21,
-  9, 33, 16,113,115,193, 90,173, 86,249,131,177,215, 84,173,195,106,  1,138,178,235,198, 20, 64, 81,  4,  3,122,157, 83,253,114,
- 60, 74,225,237,140,  0,214,186,111, 42, 36,192,197,250,119,213,162,155, 34,126,111,172,127,192,158, 48,212,166, 77, 27, 72, 36,
- 18,135,203,144, 77,252, 11, 13, 13,133, 72, 36,194,213,171, 87, 33,226, 40,239,243,188,253,120,118,226,  8,176,230, 77,145,213,
-238,254,  7,  0,121, 28, 16,242,182, 10,139,254, 62,  4, 97, 94, 92,239,181, 82,123,178, 98,167, 54,225,208,152, 76, 16,134,  8,
- 96,172,208,  3, 52,141,182,157, 59, 96,247,190, 95,125,106,191,255, 91,178, 28, 23,127,220, 11,225, 13,160, 38, 10,  8,160,105,
- 12,142,233,130,145, 35,162, 56,201,113,141,245,111,122,242, 89,124,107,250, 29,232,102,  4,126, 17,  2, 65, 66, 96,210, 64,116,
-152,196,205,120,141,109, 31, 14,179,185, 26, 34,171,  5, 95, 93, 73,199, 79,115, 67, 49,252,137,199,209,163, 77, 79,197,201,221,
-106, 85,255,228,122,136,204,245,176,246, 96, 80, 81,198, 45,105,180, 65,121, 51,206,157, 59, 55,  8,128,134, 16, 34,  2,128,185,
-115,231,182,184,182,198,148, 41, 83,212,135, 14, 29, 82,156, 57,115, 70, 21, 16, 16,128,128,128,  0,204,154, 53,203,167, 65,148,
-162,168,232,137, 19, 39,110,248,251,223,255, 78,191,188,232, 37,166, 55,115,158, 54,153, 45,245,102, 27,249,187, 55,114, 82, 82,
- 82,136, 70, 51, 26,147, 39,155, 49,107,214, 44,202,215,243,185,149,228,239,206,221,191,126,253,122, 74,169, 84,146,121,243,230,
-113, 58, 95,157, 78,215,200,237,239,140,197,139, 23, 99,241, 98,251,162, 69,  9,  9,  9,206,199, 75,154, 16,215, 14, 64, 76,131,
- 82, 24, 48,110,234,190,156,179,102,  0,  0, 32,  0, 73, 68, 65, 84,108, 99,215,174, 93,165,153,153,153, 96,201, 63, 57, 57, 25,
- 81,109,219, 58,247,183, 29,112, 10, 17,112,233,111, 41,147,134,227,231,210,114,  4,247, 11, 70, 73,238,  5, 64, 42,193,212, 23,
-231, 32,188,195, 68,142, 99,179, 13, 37,215,203,172, 34,145, 80,200,122,  0,  0,224,234,229, 75, 45,186,175, 77,133, 14,120,133,
-224,206, 41,  4,174, 74,  0,237,206,196, 33,132,128, 33,128,141,177, 43,  1, 20,  5,124,247,109, 22,158,152, 50, 13,173, 35,219,
- 56,  6, 64,226,197, 90,217,  2,186, 28,189,186, 93,117,124,239,219, 59,192,225, 36, 27,240, 96, 49,  4,116,185,215, 23,228,234,
-238,119,183,223, 27,235,223,213,221,239,110,191,243, 92,246,230, 80, 91, 91,139,186,186, 58,152, 76, 38, 48, 12,131,138,138, 10,
-135,251, 95,175,215, 67,167,211,121, 21,  2,216,250,241, 27, 80,159,  4,180,151,  0,139,  1,248,207, 82,133,195,253,127,180, 16,
-248,237,250,143, 16,120,217,126,218,210, 11,  8, 15, 13, 68, 68,120, 32, 30,136,235,137,226,139, 21, 40, 42,169, 66,167,136, 80,
-152,202,202,113,254,220,249, 70,181,  0,184,180,223, 16,249,227, 24,170,152,129,173,219, 51,160, 58,144,129,244, 85, 75, 48,117,
-201, 10, 28,183,  0, 21, 85,229,156,218,207, 57,214,255,204,144,135, 49,235,193,206,200,216,186, 15,199,143, 95,194,170, 19,  5,
-216, 50,122, 14,240,233, 97,148,148, 84, 52,170,  5,208, 20, 58, 24, 37,176,153, 43, 97, 54,107,  1,  0, 81,237, 59,162, 71,207,
-158,138, 90,153, 61, 23,195,192,232, 65,155,234, 33,171, 23,160,236,250, 13, 79,132,106,247,200, 24,141, 48, 26,141, 82,  0,102,
-  0,193, 70,163, 49,196,117, 74,160,175,208,235,245,242,  3,  7, 14,168,122,246,236,137,217,179,103, 43, 42, 43, 43,145,155,155,
-203,185,179, 81, 20, 53, 84, 34,145,232,130,131,131,173,163, 71,143,190,190,116,233,210,118,203,150, 45, 43,254,181,240,248,248,
- 45,167, 76,103, 45, 12,188, 94,143,245, 86,184,252,253, 73,254,174,214, 63,155,163,224,236,  5,224, 34, 67, 36,250, 67, 37, 95,
-181,106,149,227,229,238, 59,224,152,225,211,212,189, 17, 55,188,104,  0, 66,109,233,  5,183,238,116,182,191, 21, 30, 45,188, 56,
-115,230,204, 20,111,250,219,176,135, 30, 64,226,163,113, 88,254,239, 15,240,225,154, 28,252,191, 77,251, 48,127,100,  2,110,124,
-159,  3,173,166,214, 35,217,166,166,166, 82,201, 73,227, 96,177, 88, 11, 45, 22,171,213, 89,  1,  0,128, 21,111,190,230, 51, 97,
-243, 68,127,103,225, 46,246,239,234, 21,104,164,  0,208, 52, 13,173, 78, 15,  1, 77,193,106,181,129, 33,  4, 86,198,158, 68,122,
-236,183, 66,140, 28, 53,214,238, 38, 35,  4,  2, 90,128, 58,189, 25, 86,179,201,179,134,105,179,201,187,180,191,174,138, 12,215,
- 58,180,140, 33,131,130,236,221,134,162, 64, 81,  4,253,123,158, 87, 89,109, 54, 57,215,139, 99,173,251,230,146,  1,125,178, 94,
-155, 73,174,241,  6, 97, 97, 97,168,168,168,128, 68, 34, 65, 93, 93, 29, 34, 35, 35, 29, 73,129, 70,163, 17, 53, 53, 53, 94, 41,
-  0, 41,203,183,224, 63, 75, 21,  8,141,  1,212, 39,129,151, 86,170, 16, 36, 20, 96,202,223,222,193, 53,230,  6, 54,175,122,  5,
-  2,154,187, 60,214,250, 31, 56, 48, 14,145, 93, 99,208, 38,178, 53,196, 52,  5, 43, 69, 80, 81,111,128,166,206,232, 83,251,125,
-248,238, 54, 76,238,217,  5, 33, 33, 17,  8,136,108,  7, 75,181,  6,133, 59,190, 70, 77,245, 21,159, 30,226,207,222,125,  1, 88,
-148,  8,161,213,140,152,122,160, 92, 80,139,255, 92,255, 21, 16,135,112,150,113,116,251,207,138, 74,218,128, 43, 98, 61, 18,186,
- 41,240,224,156, 32, 20,135,169, 85,145,145,133,170,142,131,139,161,165,235, 96, 34,  6,232, 55, 49,144,  6,  5,115,177,252,157,
-  7,120,118, 22,128,216, 95, 29,119,215,174, 93,  0,128, 89,179,102, 41,122,244,232,161,126,226,137, 39, 28, 22, 35, 23,242,143,
-140,140,220,185, 97,195,134,192,212,212, 84,193,162, 69,139,176,112,225, 66,114,248,240,225,193,132,144, 92,189,133,244, 36,132,
-252,226,189, 53, 23,214,164,219,223,215,132, 64,127,146,191, 43,193, 59, 43, 44,235,215,175,167,242,243,243, 57,185,246,175, 93,
-187,118,152,253,156,158,158,238,120,185,110, 99, 17, 30, 30, 14,  0, 77, 13,130,215,  0,212,  0,160,175,149,222,192, 79, 63,253,
-228,136,249, 15, 28, 56, 16,  0,144,153,153,137,111,178,115,160,169, 51,234,  1,172,128,125,106, 32,231,254,246,253,214,127, 98,
-236,210, 23, 49,126,252, 40,180,150,  8, 80, 71, 17,228, 22, 93,197, 79, 39, 75,188, 34,234,  5,115,103, 60, 84,124,254,188,240,
-234,229, 75, 96, 95, 43,222,124,173, 89, 75,158,199,221, 77,252,174,219,220,161, 81,  8, 64, 34,145,224,220,233,227,138,152,118,
-225, 42,153, 72,  8,155,141,  1, 69, 81,160, 40, 32, 69,249, 60,  8, 97, 96,107,168,  7,160, 55, 26,113,166,168, 24, 98,177,103,
- 39,182,213, 82,141,254, 15, 94,116, 30, 69,241,220,162,139,248,118, 83,119,135,238,156,208,251,  2,126, 62,214, 19, 66, 65,164,
- 87,214,191, 59,226, 55,104,171,  0,192, 39,235,223, 93, 71,203,223,252, 46,  0,112,182,254,  1,251, 60,255,232,232,104,152, 76,
- 38,148,149,149,193,102,179,161,117,235,214,168,170,170, 66,235,214,173, 27,218,149, 59, 97, 87,220, 56,143, 55,222, 86, 65,123,
-  9,120,127,201, 48,232,172, 54, 44, 94,153,137,143,150, 38, 99,201,170, 29, 16, 82, 20,188,224,127,104, 75, 47,160,109,235, 86,
- 16, 65,  4, 27, 40, 92,191,120, 10,151,203,181,136,141, 12,199,247, 71, 15,227,204,105,120,109,253, 79,157,183, 24,162,112,128,
- 22,  0, 27,115, 46,226,219, 79, 94,198,188,119, 83,177,120, 82, 63, 60, 63,170,179, 87,237,151, 91, 95,143, 15,147,166,  3, 53,
- 82,128, 18,  1, 31,126,128,105,191, 30,196,238, 81, 11, 64,189,243, 34,168,159, 95,225,100,253,  3,192,111,215, 35,240,176, 65,
- 11,157, 76,  0,189, 84,138,216,169, 34,152,136,  1, 90, 90,  4, 43,226, 64,108,122, 88, 42,175,227,199,143,181,152, 53, 51,246,
-142,116,218,130,130,  2,210, 64, 12,212,148, 41, 83,212,118,223,152, 29,195,134, 13,163,134, 13, 27,198,133,252, 31,109,215,174,
-221,174,119,222,121, 39,240,220,185,115, 16,137, 68,  8,  9,  9,193,241,227,199, 45,132,144,138,150,156, 95,115,115,242,125,241,
- 14,248,147,252, 93,173,127, 59,177,222, 60,125,144, 75, 46, 64,114,114,242,185,111,190,249,102,136,213,202,109,134,147, 84, 42,
-157,215,204,238, 58,  0, 23,  1, 12, 44, 42, 60, 12,231,152,255,115,243,166, 99, 87,215,174, 96,195,  1, 59,187,118, 13,152, 57,
-115,230,231,222,244,183, 39, 19, 31, 70, 40, 19,  6, 61, 68,248,118,245,139,248,100,199,111,120,121,220, 80,204, 93,149,142,105,
- 43,190,242,202,  2,119, 46, 38,228,110, 27, 63,127,255,254, 68, 35, 15,128, 64, 32,160,106,174,159,199,133,171, 85, 16,138,  4,
-176,218, 24, 88,172, 54, 28, 61, 90,128, 47,191,252, 28,102, 27,129,197,198, 64, 44,164, 81,174,209,161,228,204, 79, 10,153, 76,
-166,246, 64,132,242,158,177,151,255,176,254,237, 67, 21,190,221, 20,103, 31,227,104,  2,208,  4, 52,205, 96,112,191, 51, 42, 27,
-  7, 47,128, 59,235,223,121, 22, 64, 96,120,180, 87,228,239,206,250,119,206,170, 29,189,104,173, 87,228,101, 31, 20, 53,208,233,
-116, 16,137, 68, 14,235,159, 97, 24,199,187,183, 10,192, 87,171, 95,195,209,146,253,  8,138,182, 39,253,  5, 11,  5,168,184,113,
- 30, 33, 18, 17,106,170,175, 65, 64, 83, 16,210,220,194,207,172,245,223, 49, 60, 24,167,139, 47,194,106, 54, 67, 34, 20, 67,167,
- 51,226,123,213, 97, 36, 40, 38,120, 69,254,108,251, 61,254,194, 91,216,252,159,143,160,103,128,142,177, 29,112,242,212,207, 88,
- 60,169,159, 79,237,  7,  0,139, 99, 19,176,253,220, 62, 64,107,  5,164,173,177, 39,255, 52,168,119, 94,196,218,168, 40,138, 43,
-249,  3,192,204,238, 75,213, 63,238,201,  7,204,117,208, 81,117,208,208, 58,104,133, 22, 88,108,181,144, 24,245,144,150, 94,196,
-150,101,231, 16, 19, 31,135,102, 18,  0, 27, 65,230,148,249, 42,149, 74, 33,149, 74,221,238,227,138, 13, 27, 54, 96,195,134, 13,
- 45,234,204,193,193,193, 47,157, 63,127, 62, 48, 36, 36,  4, 50,153, 12,225,225,225,168,168,168,  0, 69, 81,122,127, 14, 26,172,
-197,159,151,151, 71,  0,123, 66,160, 55, 73,129,254, 38,255,207, 62,251, 76, 78, 60,207,117,231, 52, 35, 32, 48, 48, 48, 69, 40,
- 20, 94,112,221,190,106,213,170, 70,150, 63,  0,116,238,220, 25,137,137,137, 27, 61,217, 63,215, 74,111, 52,202,246,127,227, 31,
-139, 32, 17,138, 17, 21, 21,  5,118,118, 64,195,254, 64,111,250,219,179,242,190, 88,248,193, 71,168, 43, 43, 71,100, 72, 27,156,
- 58,125,  5,115, 87,165, 35, 53, 53,149,242,133,172,217,223, 57,255,222, 89, 14,239,  9,184, 55,240,219,111,191, 53, 91, 12,168,
- 73, 15, 64,195, 32,162, 46, 80,111, 83, 16,146,164,138,105, 23,129,224,  0,  9, 30,236, 29,143,  7,123,245,131,144,  6,116,  6,
- 27,174, 92,175, 70,190,250,  7, 69, 80, 96,128,199, 63,168,215,235, 17,215,249, 58,140, 38, 41,  8,107,212, 16, 64, 38, 53,130,
- 16,160,186, 70,  2, 80, 64,112,160, 21,125,226, 46,225,224,145,254,  8, 14, 14,230,108,253, 59, 91,252,178,208,  8,136,136,  5,
-176,254, 49,222,217,132,158,207,209,217,250,119,182,248,217,109,231, 79, 21, 58,142,229, 82,101,207, 89,  9,  0,128,232,104,187,
- 50, 82, 93, 93,141,144,144, 16,135,251,223, 27,  5,128, 85,  2,128,119,176, 32,121,  4,240,159,131,248,228,245,  9,152,182,228,
- 35,164,191,251, 60,132, 20,  5,177,132,219,140, 29,214,250, 63,125,165, 28,221, 58,182,198,167,255,219,130,152,152, 24,132,182,
-139, 69,191,118,177,176,152,254,112,255,139, 56,200,100,173,255,183,231,141,194, 75,111,110, 68,199,174, 84,139,218,143,181,254,
-199,108,253, 12,187,103,205,  0,213, 97, 48,  0,123, 85, 64,192, 94, 34,152, 61,246,165,168, 40, 78,196,209,215,244, 10,149,254,
-193, 74,121,236,148, 58, 85, 76,247,222,168,149,  1, 23,113, 25,117,151, 42, 80,177,194,  6,157,166,  3, 22,205, 89,194,249,134,
-172, 91,183,142,146,201,100,196, 96, 48,192,201,242, 36, 50,153, 12,235,214,173,243,162, 60,145,255, 80, 87, 87,247,254,243,207,
- 63,159,180, 97,195,  6,105,104,104, 40, 84, 42, 21,214,172, 89, 83,107, 54,155,199,249,243,127, 88,139,159,157, 46,231,109, 66,
- 96, 98, 98, 34,165,209,140, 38,254, 32,127,  0, 96,137,157, 11, 65,113,168, 48,104,158, 51,103,206,224,140,140,140,227,245,245,
-245,109, 45, 22,251, 52, 83, 87,242,127,240,193,  7, 49,120,240,224,137, 28,238,179, 80, 91,122,  1,203,255,249,  6,190,219,190,
- 19, 99,135, 14,192,222,188,159,237,  6, 76,187, 88,132,182,139,197,192,226, 98,140,155, 58,187,242, 74,149,126, 76,167,136,128,
- 44,174,214,255,194,180,237, 88,246,151, 49,104, 23, 45,119, 40, 23,236, 53,114,241,220,248,226, 29,224, 61,  1,247,174, 82,192,
- 73,  1,  0,128,144,224, 32,245, 81,245, 54,197,197, 14, 15,160,107,247,158,170,144, 64, 25, 24,  2, 24, 76,102, 20, 23, 23,163,
-162,248, 55, 69,112, 80, 32,104,154,246,216,113,101, 82, 41, 50,118,141, 80,176, 25,240,205,186, 35,104, 26,129,129,220,173, 39,
-118, 10, 96, 96,120, 52, 24,155,197, 78,254, 13,176, 80, 34,143, 37,118, 93,193, 78,169, 25,189,104,109, 35,210,242,133,252,157,
-149,  0,231,194, 63,213,213,213,158,111,128,  7, 37,224, 43,167, 89,194, 27, 86, 60,247,199, 23,139, 14, 65, 28,229,116, 12, 15,
- 70,198,145,223,112,242,236,239, 72, 80, 76,104, 68,250,222,144, 63,139,199, 95,120, 11,223, 14,  8,196, 11, 79,244,240, 75,251,
- 45,142, 77,192,146,236, 12, 80,203,223,196,206,168,135,177, 70,119,178,209,254, 41,161,173,208, 65,234,221,154, 20, 51,187, 47,
- 85,239,204,206,194, 53,205,  5, 84, 84, 93, 71, 89, 81, 16,  4,182, 16, 60,218,119, 24, 20,115, 20,119,116, 80,243, 71,181, 63,
- 66,200, 17,138,162, 70, 83, 20,181,231,163,143, 62,146, 78,158, 60,185, 86,175,215,143,241, 37,230,223, 28,252, 49,  5, 80,169,
- 12,243, 11,249,187, 90,169,126, 66,229,244,233,211, 99,235,234,234,150, 23, 20, 20, 44, 42, 41, 41, 65,125,125, 61,196, 98, 49,
-218,182,109,139,200,200,200,201,  3,  6, 12,248,158,163,172, 51,  0,  6,118, 12, 15,198, 35,143, 60,130,223,206,149,160,117,151,
- 94,141,250,219,184,169,179,245,  0, 62,230, 66,254, 44,158,149,247,197,232,188, 95, 48,235,205, 47, 49,124,248,112, 68, 69, 69,
-185, 85,180,252,213, 32,172, 18,224, 77, 91, 55,165,144,241, 74,196,157, 35,125, 78,165,128,  1, 32, 36, 36, 68,109,170,190, 42,
- 63,170, 46, 82,  0,246, 76, 90, 66,  8, 36, 18,  9, 66, 67, 56,215,192,134, 72, 36, 82,135,138, 68,126,191, 56,214,213, 47,176,
-234,  1,171,222,145,  1,207, 18,191,183,115,177, 88, 87,255,249, 83,133, 56,127,170, 16,145,145,145,168,168,168,240,137,248, 67,
- 35,219,193,204, 33, 57,146, 43,102,189,245, 21, 14, 31, 84,251, 77,222,165, 75,151, 28,171,253, 89, 76,198,155,200,223, 27,226,
-103, 49,103, 64,160,223,218, 15,  0,168,213,175, 56,136,159, 37,255,139,245,245,138, 41,161,173, 48,137,163,213,239, 14,143,117,
-153, 70,161, 75,195, 23, 31, 18,219,215,175, 95, 79,177,213,254,214,173, 91, 71, 57, 87,254,219,184,113, 35,181,110,221, 58,199,
-231,245,235,215,223,246, 78, 79,  8, 57, 68, 81,212,240,172,172,172,197,181,181,181,171,  9, 33,249,254,254, 15,127, 76,  1,244,
- 39, 57,221, 34, 24,130,131,131, 23,203,229,242,197, 45,148,115,232,196,137, 19,143,  2,232,210,186, 75, 47,189,197,100, 12,104,
-232,111,181,  0,180,  0,206,116,138,  8,120, 18,246,100, 65,206, 24,253,198,134,219, 66,252, 45, 81,180,120,146,191, 51,136,143,
-143,231, 68,254, 30, 13, 80,161, 80,168,246,228,142,191,221, 96, 99,251, 44,241,163,133,196,207,198,166,181,229,215,160, 45,191,
-134,200,200,200, 22, 89,252,  0, 96,181, 49, 94,123, 31,154, 67,121,181,214,231,115,113,  5, 27,219,247, 23,241,251,187,253,216,
-216,254,118,157,142, 56, 91,253,253,133,162, 22, 17,255,159,  9,132,144, 95,  1,204,224, 91,226,206, 99,230,204,153,169,  0,190,
-188, 82,165,215, 91, 76, 70,231,120,100, 72,167,136,128, 48,120,185,250, 31, 75,170,206,110,254,123, 72,169,226,113, 27,149,  0,
- 78,134, 86,124,124, 60,159,216,193,131,  7, 15, 30, 60,120,252,201, 64,243, 77,192,131,  7, 15, 30, 60,120,240, 10,  0, 15, 30,
- 60,120,240,224,193,131, 87,  0,120,240,224,193,131,  7, 15, 30,188,  2,192,131,  7, 15, 30, 60,120,240,184, 47,208,104, 22,192,
-130,  5, 11,124,206, 34,117,183,220,228,221, 46,175,176,176,208,103,121,253,251,247,191,229,242,252,125,189,173, 91,199,251, 44,
-175,178,242,183, 59,125,127,169,  6,133,149,129,155,226, 43,247,226,243,119,187,228, 53, 20, 38,162, 27,218,144,  0, 32, 11, 22,
- 44, 96,248,246,227,229,221, 75,242,210,210,210,132, 41, 41, 41, 86,  0,248,244,211, 79, 73,247,238,221, 49,124,248,112,138,111,
- 63,247,242,188, 86,  0,238,  7,180,180,200,196,244,233,211,229,  0,156, 75,134, 42, 50, 50, 50,212,188,174,120,103,160,213,106,
-159, 62,113,226, 68, 63,129, 64,176, 68, 34,145, 64,175,215,191, 50,116,232,208, 15,224,135, 74,123,132, 16,175,171, 49,222,139,
- 88,176, 96,  1,  1,199, 69,102,120,220, 57,100,103,103,203,147,146,146,212, 62,254, 86,145,147,147,179,207, 31,  5,165, 26,228,
- 61,153,147,147,179,101,253,250,245,225,176,175,105, 96,195, 29,168,110,233, 12,150,252, 15, 28, 56, 64,126,249,229, 23, 36, 36,
- 36, 96,248,240,225,252,131,227, 47, 15,192,189,142,188,188, 60,121, 75,126, 63,125,250,116,121, 70, 70,134,106,250,244,233,206,
-155, 85,211,167, 79,247, 89,  9, 96, 21,138,204,204, 76,182, 84,167, 87,178, 82, 82, 82,136,151,255,215,236,124,224, 61,123, 62,
-247, 86,158, 66,163,  9,188, 19, 10, 16,117,242,228,201,247,107,107,107,255,210,185,115,231, 86,149,149,149,104, 88,110,247,189,
-111,191,253,246,189,192,192,192,145,227,198,141, 83,181,232, 15,124, 32,127,165,114,129,215,131, 96,106,234, 58,234,246,201,107,
-190, 28,110, 83,139,190,112,237, 95, 25, 25, 25, 42,188, 73,129,250,183,123,133, 10,111, 82,152,126, 38,217,235,118, 29, 59,118,
- 44,  1,128,220,220, 92,191, 16, 24,187, 20,176, 82, 25,230,247,249,241,217,217,217,242,156,156, 28,149, 55,100,251,215,191,166,
- 16, 66,236, 75,171,187,195,164, 73, 19, 21, 57, 57, 57,170,164,164, 36,202,135,231,120,228,206,157, 59,247,142, 24, 49,  2,243,
-231,207, 39,233,233,233,163,107,107,107,243,188, 57, 55, 55, 74, 35,158, 26, 34,134,114,190,178,250,149, 77, 75,191,127,119,198,
-187,143,179,251, 54,108, 72,107,246, 28,103,207,158, 77,  0, 32, 48,176,233,165, 13,234,235,235,  1,  0,115,231,206,245,233,254,
-156, 61,162, 64, 94,218, 49, 36,166,164,145,148,148, 20,190,254,  1,  7,176,197,129,156,107,  4,  8, 61,116,120,183,117,179, 57,
-212,211,190, 83,104, 17, 33, 56,147,127, 70, 70,  6, 53,125,250,116,226, 36,215,235,235,101, 21, 10,150,104, 26, 22,252,240, 94,
-161,200, 12,247,226, 95, 19, 61, 30, 81, 63,233, 57,238,226,188, 92,215,166, 41,  2,242,210, 43, 67,105,181,218,111,122,247,238,
- 61, 21,  0, 77,  8,129, 76, 38, 67,121,121, 57,106,106,106, 16, 26, 26,138,242,242,242,125,187,118,237, 82,140, 27, 55,206, 43,
-229, 36, 47, 47,143,176, 11,179, 80, 20,133,169, 83,167, 34, 49, 49, 81, 65, 81, 20,103, 57,217,217,219, 28,159,147,146, 38,123,
-252,238,  9,134,195, 47,252,209,220, 67,214, 54,250,238,186, 77, 54,196,243,162, 74,236,114,194,206, 56,112,224,  0, 86,172, 88,
-113,211,189,216,180,105, 19,225,216,110,242,204,204, 76, 21,222,164, 26,  8, 54,249,230,129,251, 77,170,197, 22,226, 93, 60,182,
- 52,178,180, 83, 83, 83, 21,132, 16,108,222,188,153, 28, 58,116,  8,125,251,246,245,248,219,195, 77,212,100,220,154,185,  4, 57,
- 57, 57, 42,134, 97,144,150,150,  6, 79,203, 42, 83, 20, 37, 39,132, 56,158,215,239,191,255, 62,128,162, 40,204,152, 49,163, 12,
- 64,212,204,153, 51,247,172, 95,191,158,246,198, 98,255, 96,207,  7,142,207, 55,114,175,131,162, 40,164,255, 45,  0,  0,133,247,
-103,191,247,120,235,214,173,  1,  0, 95,127,145,142,249, 35,230,115,146, 57,112,224, 64,116,237,218,213, 47,237,158,150,150, 70,
-167,164,164, 48,159,126,250, 41,249,229,151, 95, 80, 86, 20,  3, 84,134,241,172,238, 37,249,187,130,110,110, 32,207,204,204, 68,
- 90, 90, 26,113, 55,128,250,178, 50, 84, 75, 45,116, 79,242,156,172,108,159,141,194,140,140, 12, 42, 35, 35,131, 98,149,  0,  0,
-138,150, 40, 20, 20, 69, 33, 57, 57, 25,132, 16,202,233,220,188, 86, 84,168,233, 26,199,139,203,118, 79,  8,218,177,206,241,226,
-178,221, 27,242, 39,132,128, 93,157,205,211, 42,109,238,158, 73,141, 70,243,101,104,104,232, 84,  0,244,188,121,243, 48,107,214,
- 44,136,197, 98,200,100, 50, 72,165, 82, 80, 20,  5,129, 64,  0,173, 86,203,185, 29,179,178,178,228, 74,165,146,100,101,101,193,
-233,158,224,219,111,191,197,252,249,243, 85, 89, 89, 89,242,187,177,227,186, 83,  8,238,132,103, 45, 51, 51, 83,149,154,154, 74,
- 61,121,118,186, 91, 11, 95,169, 84,146,233,103,146, 21,238, 60,  3,158, 48,127,254,124,242,242,203, 47,163, 75,151, 46,126, 57,
-223,249,243,231, 19,165, 50, 12, 17, 17,123,253,218, 14,219,182,109, 27,149,151,151,183,175, 95,191,126,212, 39,159,124,162,102,
-201,191, 37,216,154,185,  4,171, 87,175,  6,195, 48, 88,178,100,  9,184,200,116, 38,127,  0,216,185,115,231,246,  6, 87,120,216,
-140, 25, 51,172, 35, 70,140,128, 82,169,100,184, 26, 45,174,125,116,205,154, 53,120,242, 17,187,109,152,254, 55, 25,158, 26, 34,
-198, 43, 99, 95,230,124, 77,129,129,129, 24, 62,124, 56, 82, 82, 82,168,196,196, 68,183, 47,246, 24,174,202, 94, 74, 74, 10,  3,
-216,151, 89,  7,128,144,128, 74,158,213, 91, 72,254,205, 42,  0, 44, 89, 21, 20, 20, 56,202, 78, 58, 91, 79,222, 18,173,195,130,
-240,243,160,228, 70, 25, 80,248,179,241, 50, 50, 50, 84,126,144,225, 80, 40,146,147,147, 21,108, 27,222, 79,112, 38,127,  0, 40,
- 41, 41,113,236,187,118,237, 26,103,133, 81,171,213,190,163,215,235,103,211, 52, 77,207,156, 57, 19, 90,173, 22,165,165,165, 16,
-137, 68, 16, 10,133, 16, 10,133, 16,137, 68,144,201,100, 48, 24, 12,110, 75,162,186, 25,224,228,123,246,236, 81, 81, 20,133,105,
-211,166, 97,253,250,245, 84, 98, 98, 34,149,154,154, 74, 77,155, 54,141,125,126, 84,252, 80,209, 60,249, 55,180,165,130, 29,196,
-157,239,125,114,114,178, 34, 49, 49, 81, 13,248, 86,146, 54, 49, 49,145, 90,191,126, 61,149,153,153,  9, 66,136, 95,148,177,215,
- 94,123, 13,153,153,153,156,158, 17, 79,248,238,187,239, 70, 31, 57,114, 36, 47, 38, 38,  6, 58,157,142,  4,  6,  6,146,131,  7,
- 15,  2,112, 36, 89,250, 68,254,171, 86,173,  2, 69, 81,160,105, 26, 71,142, 28,  1, 43,211, 11,143,196,227, 20, 69,225,169,167,
-158,178, 54,108, 50,207,152, 49,163, 86, 46,151, 99,254,252,249,204,247,223,127,239,241,218,157, 67, 97, 55,114,175,  3, 20,176,
-249,165, 63,170, 22,167,255, 45,  0, 51, 30,149, 96,233,184, 87, 56,159, 23, 23,203,159,203, 49,  7, 14, 28, 32,105,105,105,142,
-215,145, 35, 71,160,187, 50, 16, 48, 27, 64,  5, 89,145,247,246, 25, 56,239,103, 95,124,207,109, 76,254, 41, 75,223,117,187, 95,
-216, 92,135, 44, 46, 46, 38,  5,  5,  5,200,204,204,  4,251,153,117,237,120,211,201,111, 53,249, 59, 91,213,236, 32,116,183,194,
- 57, 36,112,191,129, 16,130,146,146, 18,220,184,113,195,177,205,245,187,  7,  8,126,250,233,167,241,113,113,113, 16,  8,  4, 56,
-127,254, 60,  8, 33,248,253,247,223, 97, 54,155, 65, 81, 20,132, 66, 33, 40,138,130,205,102,131, 94,175,199,214,173, 91,145,152,
-216,124,216, 99,239,222,189, 42,  0,152, 54,109,218, 77,207,109,195,119,194, 18,  5,151,231,218,213,173,239,233, 59, 23, 43,159,
- 69, 83,225,  0, 46,174,127, 55,131,103,139,147,164, 28, 49,127, 39,  5,142, 85, 96,217,152,127,158, 19,249,251, 98,173,179, 74,
- 24, 75, 70,123,247,238, 85,249, 26,  6, 96,229,117,239,222,253, 38,114,243,  5,235,214,173,195,153, 51,103, 72,100,100, 36,218,
-183,111,239, 88,246,249,210,165, 75, 16,  8,  4,248,239,127,255,235,211, 31,140,120,212,190,124, 25,195, 48,248,251,223,255,142,
- 53,107,214,224,224,193,131,160, 40, 10,147,146,254,138,203,151,184, 45,224,184,115,231,206,109, 13,247,216,  8,251, 12, 25,  6,
-  0,102,204,152, 81,  3,160, 85, 78, 78, 14, 40,138,226,172, 80,217,173,255,155,215, 49,177,135,  3,128,175,211, 11,145,173,205,
-190,109,222,178,179,103,207,226,200,145, 35,141,182,217,106, 46,194,106, 97,  0,170, 14,173,198, 89,112,196,101,177,235,132,132,
-  4,158,249, 57,144,127,179, 10, 64,131,219,133, 98,173,126,150,252,221,198,254,188, 32,235,230, 44, 65, 46,113, 98, 79,242, 92,
-247,223,169, 21,169,166, 79,159,238, 28,107, 38,238,246,179,158,129, 22,145,110,134,127,227, 96,186,137, 11,124,178,252,155, 26,
-108, 59,116,232,112,211,177,205,220,147, 86,225,225,225,189, 77, 38, 19,170,171,171,113,248,240, 97,  8,  4,  2,152,205,102, 24,
- 12,  6, 48, 12,227, 88,149,210, 98,177,192,100, 50,113, 10, 49,176,247,161,169,231, 54, 49, 49,145,202,202,202, 34,153,153,153,
- 30,149,  9,187,213,117,107,114,  0,100, 67,214,222, 68,244,236,119, 95, 20,129,225,195,135,183, 92,  9,112,137,249,231,229,229,
-201, 29,100,255, 71,204,223,167, 28, 25, 23, 37, 12,128,125,181, 69,165, 82, 73,184,220,  7,174, 94,128,134,220,  7,175,115, 11,
-216,149, 29,219,183,111,143,144,144, 16,202, 85,217,237,221,187,183,207,150, 63, 33,  4, 86,171,213,177,109,232,208,161, 56,120,
-240, 32,246,255,104,195,  7, 43,185,197,216,179,179,179,199, 54,196,254, 79,  3,104, 13,192,121,177,161, 82,  0,173,  0, 32, 39,
- 39, 71,213,175, 95, 63,143,242, 26,199,254,221,120, 10, 26,222,185,202,243,  7, 82, 82, 82,168,132,132,  4,162,250, 50, 18,214,
-154,223, 64, 49, 53,128,205,190,210, 42, 45,176,162,246, 32, 13,145, 88,  8,147,173, 21,126,190,212, 15,111,172,210,224,200,145,
- 35,148,187,105,213, 60,188, 84,  0, 92, 61,  1,222, 90,254,197,197,197,196,159,238,110, 79,242, 26,194, 18,126,243, 52,164,165,
-165, 81, 41, 41, 41, 62,253,214,245, 60, 83, 83, 83,117, 74,165, 50,168,169,253,190,194, 57,246,239, 15,101,192, 57,246,207, 85,
- 25,152, 53,107, 22,  2,  3,  3, 17, 20, 20,132,224,224, 96,132,134,134, 50, 97, 97, 97,116, 78, 78, 14,158,126,250,105,199,113,
- 82,169, 20, 99,198,140,129, 82,169, 36, 77,172, 86, 21, 97, 54,155, 81, 93, 93, 13,163,209,136,208,208, 80, 72, 36, 18, 88,173,
- 86, 16, 66, 96,179,217, 96, 54,155, 97,177, 88, 96,179,217,188,202, 47,240, 20,178,154, 54,109, 26,238,134,208,140,167,132, 64,
-111,193, 42,  1, 62, 63, 95,255,110,186,237,166,159, 73,110,200,187,241, 77,182,171,245,239,172, 72,250,146, 12,232,106,253, 55,
-167,152,114, 37,127,129, 64, 64, 66, 66, 66,  0,123, 66, 29,  5,128, 88, 44, 22,104,181, 90,180,105,211,198,167,235,102,141, 41,
-161, 80,136, 69,139, 22,225,200,145, 35,248, 35,238,207,253,153,222,181,107,215,174, 97,195,134,  1, 64, 48,236,225, 92, 61,  0,
-108,217,178,165,205,254,253,251, 67,  8, 33, 14,101,155,203, 60,241, 53, 31,173,193, 83,131,111,182,254,103,253, 71,143, 45,135,
- 45, 32,132,160,255,204,254,152, 63, 98, 62,229,235,188,115, 95,149,  0,197,156, 52,178,107, 77,103,  8,117,181,128,213,254,215,
- 12,  0,177, 16, 40,185,209, 10,251,174, 12,180,165,125, 93, 33, 56,114,228,  8,149,144,144, 32,197,159, 28, 92,172,127,128, 67,
- 37,192,188,188, 60,135,235,223, 57, 31,128, 11,186,118,237, 74, 37, 39, 39,251, 45, 38,207, 65,158,207,241,245,233,211,167, 19,
-215, 87, 94, 94, 30,195,206, 10,112,154, 17,224,235, 67, 28,116, 63, 63,112,105,105,105, 88,181,106, 85,163,231,138, 37,255,164,
-164, 36, 36, 37, 37,  1,  0,246,239,223,223,156,152,240,226,226, 98,163,205,102,131, 70,163, 65,101,101, 37, 52, 26, 13,244,122,
- 61,244,122, 61,116, 58, 29,106,107,107,161,213,106, 97, 48, 24, 96, 50,153, 28, 73, 65,205,146, 24, 69, 33, 43, 43,203, 43,133,
-237, 94,198,129,  3,  7, 26,189,156,113,246,236, 89,185,243,119, 46, 49,103,215,152,191,171,229,222,146,172,125,119,191, 93,191,
-126, 61,149,149,149,229,215, 92,128,172,172, 44,206, 99, 23, 75,254, 52, 77,147,134,231,203,225,250,103, 24,  6,101,101,101,232,
-222,189, 59,181, 96,193,  2,175,207,229,245,165, 35,176,127,255,126, 48,223,180,  2, 33,  4,171, 87,175,118,220,163,  3,135, 57,
-231,237, 33, 59, 59,123, 50,  0,204,152, 49,163,164, 65,  1, 48,125,253,245,230, 54, 11, 22, 44,104,179,127,255,126, 60,246,216,
- 99,163,189,153,166,120, 35,247, 58, 40, 80,216,236,100,253,207,252, 72, 15,193, 83, 90,124,125,216,140,133, 11, 23, 98,229,174,
-247,238,196,184, 34, 96,149,128,113, 11,173, 32,134, 80,160, 22, 64, 45, 32,168,  3,106,203,128,157,133,109,145,246,117,133,160,
-193, 91, 32, 76, 73, 73, 49,242,228,239,153,252, 61,122,  0,210,210,210, 26,197,253,157,243,  1,184,206,189,108,112, 23, 42, 88,
-183,124, 75, 93,242,238,228,177,110,255,196,196, 68,181,191,166, 16, 37, 38, 38,158,204,203,203,235,125, 55,222, 96,214,234,247,
-151,251,159,181,250,189,117,255,179,216,188,121,179,227,243,191,254,245, 47,124,254,249,231,  0, 96,  6, 32,102,137, 31,  0,198,
-140, 25,227, 73,  1, 48,196,197,197, 65,175,215,195,108, 54,163,162,162,  2, 18,137,  4, 66,161,208,225,  1,168,175,175,135, 94,
-175,135,201,100,130, 86,171,197,212,169, 83, 61, 42,152,172,117,223,220,180, 86,246, 56, 46,184,149, 57,  0,190,236,119,  5, 59,
-221,207, 29, 86,175, 94,173, 90,180,104,145,162, 71,143, 30,234, 59,249, 12, 55,101,253, 59,195,155, 92,128,166,172,127, 95, 45,
-127,154,166,  9,195, 48, 20,128,127,178,143,182,205,102,123, 51, 48, 48, 16, 29, 58,116,240,105,140,121,227,213, 17, 80,171,213,
-160,178, 34,  0,  0,187,223,  8,198,152,183,235, 48,124,248,112, 44, 95,185,223,171,194, 84, 59,119,238,220, 58, 98,196,  8,  0,
-168,216,178, 37,189,253,254,253,  7, 91, 17,138, 96,252, 99,227,147,146,146,146,182,123, 51,156,  0,246,216,255, 83, 67, 68,141,
- 45,126, 16, 44, 90,184,  8, 81, 99,162,239, 88,193,172,148,148,148, 70, 26, 62,169,  3, 36,102,128, 33, 20,172, 54,  2,  9,  1,
-162,100,180,243,241, 86,240,176,243,247,202, 87,155, 84, 16, 88, 15,172,144,139,229, 63,112,224,192,155,242,  1,188,113,209,185,
-146,182, 31,200,217, 85,158,234, 22, 60,120,189,243,242,242,252, 38,239,126, 77,252, 99, 11,203,176,110,226,204,204, 76, 60,243,
-204, 51,  0, 32,102,143,113,222,215, 48,104, 53,133, 83,131,  7, 15,126, 90,173, 86,103,218,108, 54,212,214,214,194, 98,177, 56,
-226,254, 70,163,209, 49,197,144, 77, 12, 28, 51,102,140,154,195,243, 66,101,102,102,146,  6, 47, 64,163,231, 54, 47, 47,143,221,
-142,196,196, 68, 78,222,170,219,157,  3,224, 26, 22,240,116, 63,154,219,175, 84, 42,201,234,213,171, 85, 79, 62,249, 36,190,249,
-230, 27,159,238,185,235,244, 91,246,123, 70, 70,134, 42,165, 68,137,233, 30, 44,237,177, 99,199,146,139, 23, 47, 98,215,174, 93,
- 77,182,247,197,139, 23,  1,  0,185,185,185, 30,207, 39, 57, 57,147, 36, 39,143,194,232,209,197, 40, 46, 46,118,155, 93, 94, 85,
- 53, 10,128,  6, 74,101,211,227, 22, 75,254,102,179,153,136,197, 98,246,152,127, 54, 40,  4,111, 94,190,124, 25,157, 59,119,246,
-201,242,167,105,202,174,176,179,228,127,220,138,207, 85,102,  0,192,242,149,251,189, 30, 35,216, 62,177, 96,193,130,120, 66,  8,
- 38, 76,156, 48,117,210,196, 73,223,249, 50, 52, 77,126,226,241,211, 20, 69, 61, 72,  8, 32,120, 74, 11, 66,  8, 22, 45, 94,132,
-232, 49,109,255,  8,124,248, 14,150,157,  9, 90, 80, 73, 48, 45, 45,141,100,188,218, 14, 65, 85, 23,113,161,182,  3,186, 72, 42,
-128,192, 40,  8,235,203, 16, 82, 95,  5,160,141,195, 99,224,170, 52,240,240,193,  3,224, 60,221,207,197,213, 71, 50, 51, 51,193,
- 53, 97,202,149,180,253,117,226,206,242,252, 48,255,159, 71, 11,225,236, 66,119, 38, 33,182,158,132,235,190, 38, 98,136, 86,  0,
-223,142, 24, 49,226,197,156,156,156,143,173, 86, 43,106,106,106, 28, 57,  0,  0, 80, 81, 81,129,154,154, 26, 16, 66,224, 77,120,
-105,244,232,209,138, 61,123,246,168, 50, 51, 51,145,149,149, 69, 92, 99,254,163, 71,143,246,170, 24,208,173,128,225,240, 11, 94,
- 19,190, 59,130,111, 78,  9, 72, 77, 77,165,230,207,159, 79,124, 33,255, 70,  9,128, 78,247,221, 41, 41,208, 91, 47, 64,147,138,
-251,165, 75,151, 28, 10, 26, 87, 67,195, 57, 84,121,243,117,115, 27,171,180, 90, 45,  9, 13, 13,117, 38,255, 55, 77, 38, 19, 74,
- 75, 75,209,165, 75, 23,159,200, 95,169, 84, 18,230,155, 48,236, 62,110, 55, 78, 55,170,204,216,114,216, 12, 66,  8, 14,254,228,
-123,100,241,192,129,  3,120,236,177,199, 20,190,150, 15,102,  9,154, 97, 24, 17,  0,124,243,147,  5, 11, 23, 46, 68,244,216,182,
- 46,254,  1,239,192, 86,249, 27, 62,124, 56,  1,220, 79,247,115,170,  4,200,249,254,118,166,235,129,200,120, 60,189, 65, 11, 32,
-202,222,  6,207,183, 70, 39,225, 85,188,157, 88,142, 47, 84, 42,190, 42, 32, 26, 87,250,115,181,252, 93,247, 11,155, 27, 40,210,
-210,210,136,187,105, 83,222,132,  0,220,144,182,223,224, 34,207,175,243,255, 93,202,  1,123,141,228,228,100,112, 72, 88,228,140,
-166,220,253,190,134,  1,154,114,247,251, 18,  6,112, 46, 47,235, 74, 62,205,237,107,234, 82, 41,138, 90, 59, 97,194,132,245,155,
- 55,111,182,136,197, 98,152, 76, 38, 88,173, 86, 48, 12,131, 86,173, 90, 65,163,209, 32,217,203,169,103,211,166, 77, 83, 79,155,
- 54,141,218,179,103, 15,201,202,202, 66,102,102, 38,216,186,  0,119,115,229, 57,127, 99,223,190,125,100,194,132,  9,216,177, 99,
- 71,139,201,223,149,228,242,236, 10,153, 71,111,220,203, 47,191,124,147,113,225,138, 87, 94,121,133,112, 77,242, 84, 42,195, 60,
-202, 83, 42,185,197,255,101, 50, 71,233, 75, 66,  8,129, 94,175, 71,105,105,169,207, 49,255, 70,158,143,183,235, 26,125,111,  9,
-249,127,242,201, 39,254,122,102,153,236,239,183,119,119,174,  4,232, 47, 52,167,144,109,220,184,209, 43,235, 95, 57, 45,182,244,
-179, 34,180, 75,205,186,  0,103,238, 25,254,223, 52,178,111,254,  3, 56, 87, 38,195,185,115,231,160, 80, 40,192,195, 15, 30,  0,
-  0,104,138,228,239, 70, 45,235,110,155,255,239,143, 41,126,127, 40, 34,137,126, 59,175,233,211,167, 43,188, 45,239,235,129, 24,
-136,179, 66,227, 46,209,202,117, 31, 71,194,181,206,154, 53,139,218,189,123,183,252,202,149, 43, 42,131,193,  0,155,205,134,  7,
- 31,124, 80,145,144,144,224,243,253, 30, 61,122, 52, 53,122,244,104,118,132,247, 41, 52,115,171,115,  0, 60,125,231, 98,113, 54,
-100,135, 55, 38, 28, 47,139,204,176,109,132, 55, 41,146,135,228,155,236,193,148,148, 20,146, 82,162,  4,213,184, 16, 16,  5,  0,
-231,206,157, 35,205,244, 85,143,141, 62,106,212, 40,202,139,190, 79,249,227, 24,  0,168,174,174,134, 76, 38, 35, 20, 69,161,115,
-231,206,160, 40,138,234,222,189, 59, 90, 74,254,244,147, 26, 80, 20,133,164,199,237,179,138, 40,138,114, 76,247, 99,221,249,119,
-  8,204,192,217,  3,252, 42,112,238,220,185,172,242, 31,212,224,213,179,194,238,254,103,156,142,241,234,130, 83,179, 46,180,115,
-230, 30,214,213,159,146,146, 66, 41,247,170,200,185,115,231,120, 54,247,183,  2,112,175,192, 31,115,253,253, 69,216,183, 64,177,
-241,235,121,249,123, 97,159, 91,109, 61, 55,196,248,221,254,135,217,108,134, 64, 32,128, 64, 32,184,141,207,218, 58,234,238,150,
-215,116, 95,152, 61,123,182,247,  2,223,252, 99, 29,139,204,204,204, 70,131,118, 74,137,210,217,242, 86,223, 15, 99, 73,116,116,
- 52,245, 71, 95,177, 39,219,182,148,252,237,247,164,185,165,128,110,198,186,117,191,220, 54,141, 96,254,136,249,212,237, 30, 19,
-188, 28, 55,  2, 97,207, 41,178, 56, 41,159,142, 56,191, 66,161,160,120,203,223, 51,220,133,  6,168,248,248,120,190, 96,  2, 15,
- 30, 60,120,240,224,241, 39,  3,205, 55,  1, 15, 30, 60,120,240,224,193, 43,  0, 60,120,240,224,193,131,  7, 15, 94,  1,224,193,
-131,  7, 15, 30, 60,120,240, 10,  0, 15, 30, 60,120,240,224,193,227,190, 64,163, 89,  0, 11, 22, 44,240, 57, 27,212, 93, 97, 23,
- 94, 30, 47,143,151,119,251,228, 45, 91,182,172,177,118, 79,211,142,105,142,206, 83,205,216,106,138,206, 83,207,220,149, 15, 14,
- 10, 10,130, 84, 42,117,252,158,166,105,199,140, 11,103,121,236,194, 76, 12, 99,159,229,197, 46,150,195,223, 95,111,228, 81,114,
-129, 80,  2,194, 88,193, 48, 86,181, 47,242,  8, 33,138, 99,199,142,  9,227,227,227,243,224, 82,117,207, 71,121,242, 99,199,142,
- 33, 62, 62, 94,205,247,183,123, 79,158,215, 10,192,159, 17,175,191,158,223,168,225,150, 47, 31, 68,221, 85,242,242, 95, 39,  0,
-176,124,208,114,202,249,179,175,242,216, 74,113, 74,165, 18,169,169,169,205, 29,215,236,126,103,121,112,154,166,199,254,198,249,
-247, 74,165,210,177,143,171,220, 63, 35,104,115,189,188,226,228, 97, 12, 15,171, 80,181,183, 94, 69, 17,233,130, 35,245,225,138,
-144,184,135, 33, 14, 12, 86,123,250,253,161, 67,135, 48,116,232, 80,  7,241,179,132, 77, 81,212, 77,132,205, 48,140,227,117,249,
-242,101,183,242,142, 30, 61,138,129,  3,  7, 66, 38,147, 65, 40, 20, 66, 32, 16, 52,146,201,146,190,205,102,115,188, 76, 38, 19,
- 10, 10, 10,208,173, 91,183,251,241, 22, 81,118, 94, 36,242,223,127,255, 29,231,206,157, 83,181,106,213, 10,195,134, 13,107, 81,
- 31,167, 40, 90, 46,145,134,163, 85,216,  3,170,122, 93,137, 66, 87, 92,229, 80,150,  0,  0, 32,  0, 73, 68, 65, 84,119, 85,238,
-173, 12,134, 97,228, 89, 89, 89,251,138,138,138,176, 99,199, 14,200,100, 50, 44, 89,178, 68,  0,167,185,247, 62,200, 83, 21, 95,
- 56,143, 61,187,115, 33,150, 72,176,112,225,162,145,132, 16, 21,223, 83,239, 83, 15,192,189,132,172,172, 44,143, 26,207,180,105,
-211, 60,118, 76,150,160, 93,137,219, 87,248, 91,158,191,225, 84,153,143,211,160,197,165,180, 44, 87,121, 13,138, 64,139,170,139,
-179, 85,  5,157,255,255,158,239,133,132,200, 79, 31,218,141,144,139, 63,169,244,122, 19, 44, 15,211,144,117,160,208,253,202,113,
- 60, 20, 76, 84,154,138, 95,241, 91,192, 28, 69, 37,213,190, 89, 37,224,244,233,211, 16,  8,  4, 24, 54,108, 24,132, 66,161,227,
-197, 42,  4,172,213,111,181, 90, 97,179,217, 96,177, 88,112,249,242,101,236,219,183,207,173, 60,189, 94,143,194,194, 66, 12, 30,
- 60, 24, 98,177, 24, 34,145,168,145, 76,134, 97, 96,181, 90, 97,181, 90, 97,177, 88, 96, 48, 24, 80, 88, 88,  8,157, 78,119, 87,
-232, 83, 13,207, 25,141, 63, 10,209,248,204,209,203,150, 45, 99, 92,198, 22,212,213,213, 33, 34, 34,194,167,  9,232,203,150, 45,
-107,116, 62, 95,165, 23, 64, 38,107,  3,129, 64,172,210,213, 93,245, 90,102,126,126, 62,116, 58, 29,  6, 15, 30,124, 57, 49, 49,
-177,109, 85, 85, 21,118,239,222,109, 11, 15, 15, 71, 66, 66, 66,179,125,100,238,216, 81, 55,181,205,137,179,103,161, 14, 14,192,
-226,213,255,190,218,127, 64,239,142,215,175,149, 99,119,142,122, 95, 76,239,254,137,181,181,218,189, 60,117,222,253, 96, 75,255,
- 58,195,181, 22,128,176,185, 65,150, 29, 92, 61,125,191, 19,228,255,220,115,207, 53,123,140, 70,163,193,215, 95,127, 77,184, 40,
-  1, 44, 89,183,212, 90,191, 21,242,156, 45,255,150, 90,255, 78, 36, 76,  1, 32, 74,165,210,227,194, 49, 28,201,154, 98,137,157,
-181,246,157, 45,127,103,170,227,250,204, 56,121, 42,136,115, 57, 97,  0,168,174,182, 87, 70, 12, 15,207,187, 47, 58,234,165, 95,
-242,208,237,170, 74,117, 85,207, 96, 74, 55,  1, 30,136,180,130,  9, 39, 16,133, 11, 80, 87, 37,134,172,206,128,158,199,214,170,
- 10,226,230, 43,244,  1,157,213, 77, 91,146, 20,206,156, 57,  3,177, 88,140,145, 35, 71, 58, 72, 91, 36, 18,129,166,105, 16, 66,
- 96,177, 88, 96,181, 90, 97, 50,153,112,245,234, 85,168, 84,170, 38,151, 84,166,105, 26, 22,139,  5,199,142, 29,195,176, 97,195,
- 32,147,201, 32,145, 72, 28,242, 88,  5,192,100, 50, 65,167,211,225,196,137, 19, 48, 26,141, 94, 21,102, 82,171,213,114,129, 64,
-160,170,171,171,131, 88, 44, 70,121,121,249, 11, 83,166, 76,169,147, 74,165, 95,249, 66,218,106,181,122,186, 64, 32,248,198, 73,
- 94,209,148, 41, 83,126,151, 74,165,211, 96, 95,161,210,107, 75,248,141, 55,222, 80,173, 88,177,162, 28, 13, 43,206, 44, 91,182,
- 12,167, 79,159, 70,155, 54,109,154,172,187,238,137,252, 63,155, 55, 15,227,251,247,  7,  0, 68,191,248, 34,100,  1, 81,208,213,
- 94, 65,173,246,130,130, 16,155,218, 91,153,125,251,246, 69,121,121, 57, 14, 29, 58,212,153,166,105,156, 56,113,  2,225,225,225,
- 56,112,224,  0,204,102,179,199,118,172,122,103,113,163,239, 65,102, 11,218, 89,141, 88,248,242,155, 29, 87,127,240, 47,188,255,
-193, 39,104, 79,219,240,201,  7,171,242, 70, 62, 53,147,103,215,123,144,252,217,237,156,214,  2,  0,110,174,255,237,233,251,237,
-132, 63, 87,234,187, 23,224,172,  4,180,208,  3,192, 18, 44,  5,128,124,254,196,151,110,  9,249,153,173,115, 56,147,117,131,107,
-159,114, 51, 96, 59,255,222,161, 32,112,  9,  1,176,255,237,250,238,234,  1,184,215, 97,172,169,148, 15, 55, 21,170,202,  5, 54,
-116, 11,  5, 58,119, 34, 16,244, 21, 67,216,181, 43,196, 38, 35, 76, 63, 94,133, 73, 43,132,128, 17,193,152,247,149,138, 30,255,
- 55,  5, 35,116, 31, 14, 96,221,243,231,207,159, 71, 88, 88, 24, 20, 10,  5,164, 82, 41,196, 98, 49,132, 66,161,195,234, 55, 26,
-141, 40, 45, 45,197,254,253,251, 65,211, 52,104,154, 70,115,242,108, 54, 27, 78,157, 58,133,161, 67,135, 34, 36, 36,  4, 82,169,
- 20,  2,129,  0, 86,171, 21,102,179, 25,181,181,181,248,245,215, 95, 97, 50,153, 32, 20, 10, 29,185,  0,158,176,105,211, 38,185,
- 78,167, 83, 93,188,120, 17,181,181,181, 16,139,197,136,142,142, 94,123,240,224, 65, 12, 25, 50, 68, 24, 24, 24,248,185, 55, 74,
-192,166, 77,155,158,208,233,116,223,184,200,139, 59,120,240, 96,220,144, 33, 67,190, 14, 12, 12,156,198, 85, 30,195, 48,114,179,
-217,140,234,234,106,149,147, 71,  1,  0,176, 98,197,138,146,101,203,150,181,159, 54,109,218, 72,169, 84,234,213,248, 71, 11,196,
-114,215,109, 55, 62,254, 24,209,147, 59,224,253,247, 63, 82, 88, 44,245, 62,141,167,135, 14, 29, 82,253,242,203, 47,120,245,213,
- 87,107,  5,  2, 65,136, 84, 42,197,144, 33, 67,160, 82,169,144,147,147,131,246,237,219,123,225,239,160,176,233,252,117,124,123,
-174,  4,217,223,127,  1,129,128,194,226, 23,159,102,250, 69,183,166,211, 22,190,137, 13,222,202,227,113, 71,200,223, 85, 57,117,
-167, 20,248, 60, 11,224, 78, 47,111,219,181,107, 87,133,167,215,237,182,214,111,133, 60,127, 88,253, 77,225,243, 39,190,164,158,
-217, 58,135,184, 35,127,112, 15, 17, 52,178,244,171,171, 19, 29, 22, 58,254, 88,  2,212,107,183,127,115, 68, 31, 30,158,231,147,
-245,111,181, 90,229,191,254,250, 43,105,106,155,235,190,166,224,124,188,213,106,149,187,238,115,221,214, 28,170, 79, 29, 85,149,
-150,212,162, 77,176, 16, 93,131,  9,132,173, 25,  8, 31, 25,135,192,126, 95, 65, 54,224, 67, 72, 66,101, 16,235, 12,208,235,109,
-232, 36,208,227,192,230,166,149, 39,154,166, 33, 20, 10, 33, 18,137,112,238,220, 57,156, 56,113,  2, 33, 33, 33,136,136,136, 64,
- 68, 68,  4, 90,183,110,141, 86,173, 90, 65,171,213,226,192,129,  3, 16,  8,  4,142,216,190, 59,176,251,197, 98, 49,108, 54, 27,
-138,138,138, 16, 16, 16,128,214,173, 91,163, 77,155, 54,136,140,140, 68, 80, 80, 16,138,138,138, 96,177, 88, 28, 33,130,166, 20,
- 10, 87,203,191,172,172, 76,117,225,194,  5,116,233,210,  5, 99,199,142,197,160, 65,131,160,215,235,177,111,223, 62, 28, 59,118,
-236, 83,163,209,200,185,118,177, 90,173, 86,148,149, 87,124, 87,124, 93,139,224,110,131, 17, 55,246, 47,104, 63, 40,  9, 26, 19,
-141, 61,121,123,113,236,216,177, 41, 70,163,241,175, 92,201,191,182,182, 22,199,143, 31, 87, 29, 58,116,  8,125,251,246,197,178,
-101,203, 90,163, 33,158,190,108,217,178,246,  0,224, 13,249,211,  2,177, 60, 48,168,157, 60, 60,162,183,106,243,150,227,152,247,
-217,103,200, 41, 44, 68, 78, 97, 33,162, 95,124, 17,  0, 96,177,212,239,247,165, 31,231,228,228,144,236,236,108, 76,157, 58,245,
-114,112,112, 48, 29, 16, 16, 80,144,159,159,143, 67,135, 14,161,178,178, 18,113,113,113, 94,201,251,168,240, 28, 62,248,249, 36,
- 54,124,240,218,113,161,192,  0,218, 86,135,247,214,124, 70,127,115,160,  0,165,180, 16, 15, 60,240,  0,207,178,247,  9,104, 95,
-  9,254, 14, 46, 94,113,107, 44,236,215,243,137, 63,227,246,254,150,119, 43, 21,129,103,182,206, 33,206,175,166,188,  2,158,188,
- 10, 55,145, 91, 99,101,192, 91, 79,  5,213,212,118, 87,175,  0, 23,212,213,213,201,247,238,221,171,202,207,207,111,114,155,243,
-190,230,224,124,252,222,189,123, 85,117,117,117,114,231,125,174,219,154, 67,136,177, 10, 57, 87,140,216,121,145,193, 85, 13,133,
-178, 10,128, 22,134,130,166, 34, 64, 25, 37,168, 47,163,112,252, 10,131, 19, 87,140,168,170,179,160, 79,184, 68,197, 69,  1,144,
- 72, 36,184,112,225,  2,206,158, 61,139,240,240,112,132,133,133, 33, 44, 44, 12,122,189, 30,135, 14, 29,130, 72, 36,130, 88, 44,
-110,118, 45,  5,214, 59,192, 42,  1,132, 16, 20, 23, 23, 35, 60, 60, 28, 29, 58,116, 64,100,100, 36,138,139,139, 97,179,217, 32,
-145, 72, 32, 22,139, 27,205, 60,112, 55,172,176, 31, 42, 42, 42, 84,215,174, 93, 67,175, 94,189, 48,110,220, 56, 76,156, 56, 81,
- 49,113,226, 68,197,176, 97,195, 96,179,217,240,211, 79, 63,161,184,184,120, 48,  0, 78,241,132,138,138,138,125,101,213, 90,132,
-199,246, 67, 92,226, 92,244,154,176,  0, 61, 39,204, 71,231, 71,158,128,153,  8, 88,121,156,238,111, 67,238,131,234,220,185,115,
-236,181, 42, 26,136,159, 94,182,108, 25, 86,172, 88,129, 21, 43, 86,156,117,205, 11,104, 10,  2,161, 84, 30, 22,222, 83, 21,221,
-126,168, 42, 44,162, 39, 40, 90,136, 79, 63, 87, 97,222,103,159, 97,222,103,159, 97,197,138, 21,168,168,168,  0, 87,121, 46,150,
- 63,217,190,125, 59,134, 12, 25,130,  1,  3,  6,116,  6, 32,221,187,119,239,192, 75,151, 46,225,212,169, 83, 48, 24, 12,152, 48,
- 97,194, 72,174,242,210,127,191,138, 15,127, 61,139,245,203, 95,174,238,240, 64,231,190,122,157,  6,233,223,237,197,241, 19,191,
-227,192, 15,123,160,189, 81,134,  9, 19,198, 39,130,199, 93,139,248,248,248, 38,173,127, 78, 57,  0,169,169,169, 84, 94, 94,158,
-156,235,247,123, 25,254,180,212,111,133, 60,192,127,238,255, 38,173, 80,167,152,186,183,228,207,122,  1,156,173,115,127,192, 83,
-242,161, 55, 80,171,213,242,210,210, 82, 21,187,184, 75, 83,219,124,193,249,243,231, 81, 85, 85,165,106,215,174,157, 66, 46,151,
-171,155,218,214, 36,113, 85, 94,197,225,235,  6, 76,  8,  8,192,193,171, 12,218, 13,144,160,139,169,  0,154,211,207, 97,235,123,
-199,193, 92,210, 66,103, 38, 40,169,179, 65, 38,164, 97,213,222, 64,104, 51, 74,187,179, 18, 32,149, 74,113,249,242,101,156, 61,
-123, 22,189,122,245,130, 70,163,193,207, 63,255,236,136,229,123,138,215, 83, 20,229,240,  2,176,242,  8, 33,184,122,245, 42,250,
-244,233,131,188,188, 60, 48, 12,  3,169, 84, 10,145, 72,228,152, 37,192,197,  3,112,229,202, 21, 24,141, 70, 12, 28, 56, 16, 29,
- 58,116, 80,  8,  4,  2,132,132,132,224,225,135, 31, 86,252,252,243,207,170, 43, 87,174,160,182,182,246,  4, 56,186,236,175, 92,
-185,  2,134, 22,163,125,124, 34, 90,117,136,  3, 45, 16, 65, 22, 18,137, 78, 15, 79,192,229,159,179,209, 32,239,146, 39, 57,132,
- 16,121, 77, 77,141,170,164,164,  4,157, 58,117,194,163,143, 62,170, 16,  8,  4,234,161, 67,135, 82,203,150, 45, 35,131,  7, 15,
-182, 54,140,155,113,161,161,161,104, 80, 80,108,205,201,148, 74, 35, 16, 17,217, 15,102,147, 22,149, 85,133, 48,153, 52,163, 44,
- 22,221, 32,  0,239, 12, 30, 60, 24,  0, 80,118,227,  6, 26,228,137,224,180,232, 77,115, 56,122,244,232,180,205,155, 55, 99,214,
-172, 89, 24, 58,116, 40,  0, 48,187,119,239, 22,230,228,228, 96,222,188,121, 99,250,246,237,187,199,155,103,185,168, 86,143,165,
-251,127,195,187,127, 87, 98,216,196,196,240,122, 93, 37, 50,190,219,143,212, 79,191,197,206,197,115,209,181,252, 26, 86,214,222,
- 64,120,120,  4,159,  4,120,143,192,217,237,239, 46, 95,165,201, 28,  0,215,216,190,167,239,247, 35,252, 61,  5,207, 87,188,253,
-208,219, 10,138,162,238,202,246,118,153,234,215, 40, 15,192, 85, 25,240,231,244, 63,174,202, 65,118,118,182,188,172,172, 76,101,
- 54,155,155,221,214, 18,104, 52, 26,212,215,215,171,106,107,107, 21,238,182, 37, 37, 37, 53,121,239,142, 85, 27,160, 53, 51, 56,
- 86, 97, 69,105,141, 21, 81, 63, 11,209, 55,227, 60, 46, 95, 58,133,223,127, 49,195, 42, 20,192,204,  0, 70, 51,129,134, 48,136,
- 12, 35,205, 18,182,243,244, 63, 54, 99,191,172,172, 12,157, 59,119,198,165, 75,151, 28, 46,127,161, 80,232, 56,222,219,112,158,
-115, 13,  1,246,253, 22,133,  4,107,208,178,236,253,155,140,113, 79,  7, 48, 12,131,250,250,122,251,224, 40, 20, 42,  4,  2,129,
-218,197,147, 36,204,206,206, 70, 82, 82, 18,189,116,233,210,178,149, 43, 87, 90,151, 46, 93,218,236,197, 83,148, 93, 33, 50,232,
-203,160,171,187,170,176,217,140,106,  0,  7,  0,188, 83, 87, 87,135,236,236,108,135, 50,217,173, 91, 55,179, 39,121, 13,207, 87,
- 82, 86, 86, 86,230,132,  9, 19, 28,228,255,227,143, 63,210,219,182,109,131, 92, 46,159,232, 45,249, 95,215,155,240,116,206,207,
- 88, 56,125,  2,166, 61, 61, 21,122, 99, 45,182,102,171,177,230,147,116,124, 57,230, 33,116, 45,191,198,179,233,125,160, 12,184,
- 42,  1,183,165, 18,160, 82,169, 36,206, 49, 93, 79,223,121,220, 52,176,223, 82,242,247, 53,166,206, 18,191,107,182,191,139,235,
-159,106,120,185, 61,182,169,231,197,211,115,193,245,121, 73, 74, 74, 82,119,239,222, 93, 17, 22, 22,214,236,182,150, 32, 44, 44,
- 12,221,187,119,111, 68,244,238,182,185,131,193, 22,  2, 11,  5, 28,169, 52,161,220,102,195,222, 98, 35, 50, 50,141,216,119, 45,
- 18,231,197,161,184,166,181,224,106, 29,131,122, 43,160,183, 18, 72, 34,162, 61, 18, 51, 59,191,223,102,179,193,106,181, 34, 34,
- 34,  2, 65, 65, 65,232,220,185, 51, 44, 22,139, 99,187,187,130, 64,174,242,216,249,253, 86,171, 21,  6,131,  1,132, 16,116,236,
-216, 17, 37, 37, 37,104,219,182, 45,132, 66, 33, 76, 38, 19,204,102,179,227,127,185,132,  7, 59,117,234,  4,169, 84,138,130,130,
-  2, 92,187,118, 77,101,179,217, 80, 91, 91, 75,253,242,203, 47, 42,157, 78,135, 78,157, 58, 33, 36, 36,100, 28,215, 49,170, 83,
-167, 78,160, 25, 51, 74, 10,243, 80,115,173,  8,140,205,  2, 67,109,  5,174,252,242,  3,204,245, 26, 86, 94, 12, 23,229,134, 69,
- 68, 68,132,138, 97, 24,135,167,115,197,138, 21,212,169, 83,167,208, 64,218, 12,128, 40,119,  5,143, 92, 97,181, 26, 96,181,232,
- 32, 11,140,134, 84, 22, 14,128,146,  3,176,174, 88,177, 34,194, 73, 30, 54,108,216,192, 22, 80,114,123,205, 85, 85, 85,228,203,
- 47,191, 36,169,169,169,228,223,255,254,247,247, 73, 73, 73,152, 56,113, 34,235, 13,168,221,190,125, 59,166, 77,155,150, 52,125,
-250,244, 31,184,180, 89, 85, 85, 21,249,234,171,175,200, 83,207,189,128,145, 89,251,241,247, 57, 83,240,210, 43, 11, 96, 52,235,
-112,241,194, 85,164,166,102, 96,219,164, 33,144,119,108,227,115,223,216,182,109, 27, 63,174,223, 65,184,134,  3, 92, 19,  1,111,
-107, 41, 96,215,176,129,167,239,183,205,210,111, 34, 86,239,106,237,115,181,254,155,146,151,255,250,235, 36,255,245, 63,220,249,
-174,223, 61,121, 34,252, 37,207, 25,172,203,255,243, 39,190,164,124,113,255,167,166,166, 58, 44,251,166,226,253,236,118,231, 99,
- 61,193, 83,254,128, 55,225,  1,185, 92,174,158, 52,105,146,194,185, 56,141,187,109,190,160, 91,183,110,152, 52,105, 82, 35, 87,
-191,187,109, 77,254,190,123, 55,116, 15, 20, 32,152,  2, 44,132,224,140,198,140,205,231, 77,248,250,112, 41,126,189, 80,141, 82,
-  3, 80,101,180,225,130,142,224,186,137, 64,103,182, 40,154, 35, 47,118,106,158,217,108,134,193, 96, 64,219,182,109,209,187,119,
-239,  6, 69, 47, 28,131,  6, 13,114, 16, 54, 75,218, 77, 17, 54, 75,232, 22,139,  5,102,179, 25, 20, 69, 33, 54, 54, 22, 53, 53,
- 53,184,122,245, 42,170,171,171, 17, 19, 19,  3,154,166, 97, 54,155, 97, 50,153, 28,191,241,132,200,200, 72, 69,135, 14, 29,112,
-234,212, 41,236,218,181, 11, 59,118,236, 80,237,216,177, 99,223,193,131,  7, 33, 16,  8,240,200, 35,143,160,107,215,174,  6,112,
- 44,100, 19, 25, 25,153, 20, 21, 30,138,170,226,223,240,251,158,207,113,234,135,117, 56,243, 67, 42, 46,255,180, 13, 18,154, 97,
-229,149,120,146, 35, 20, 10,213, 81, 81, 81,138,144,144, 16, 28, 59,118, 12,215,174, 93, 83,233,245,122,185,179, 34,208,224,  9,
-160, 55,111,222,140, 94,189,122,121, 60, 55,179, 73, 11,109,205,121,136, 68,129,104, 21,222, 67, 21, 24,212, 30, 34, 81,160,156,
-162,232,193,236, 49,193, 53,121, 80,125,249, 18, 70,247,208,177, 74,243, 77,248,225,135, 31, 32,147,201,208,171, 87, 47,196,196,
-196,160, 33,124, 96,213,104, 52,186,172,172,172, 86,241,241,241, 73, 35, 71,142,220,206,245,217,205,201,249,  1, 33, 33, 65, 24,
- 62,226, 97,125,252,128,190,120,226,185,121,208, 83, 86, 84,148, 87, 99,254,139,111, 97,101, 66, 55, 12,104,227,187,146,188,109,
-219, 54,242,222,123,239,241, 74,192, 93,162,  8,184,195, 93,179, 22,192,157,158, 85,224, 11,  1,123,139, 65,203,237, 10,132, 51,
- 81,179,219,110,151, 60,103, 43,252,153,173,115,240,204,214, 57,141, 62, 59,111,227,106,177, 59,123, 18,220,121, 20, 90,154, 23,
-224,236,  9,112,125,231,138,224,224, 96,245,168, 81,163, 20,131,  6, 13,106,114,155,243,190,102,219,221,233,248, 81,163, 70, 41,
-130,131,255,152,150,231,110, 91,179,214,161, 36, 80,209,167,109,107, 60, 26, 33,193, 67, 97, 98,180,147,210,144, 16,  2,169,201,
-138, 78, 65, 66,104,  8,193, 73,157, 21, 69,245, 86,180,111, 19,129,152,135, 70, 52, 41,139,181,250,217,169,126,157, 58,117, 66,
-191,126,253,160,209,104, 80, 83, 83,131,154,154, 26,  4,  7,  7, 99,240,224,193, 48,155,205,142,154,  0, 77, 17, 54,171, 76, 88,
- 44, 22, 80, 20,133,184,184, 56, 24, 12,  6, 84, 84, 84,160,188,188, 28, 21, 21, 21,168,175,175, 71, 92, 92, 28,132, 66,161, 67,
- 94, 83,117,  5, 92,149,178,168,168, 40, 69,108,108, 44, 46, 94,188,136,220,220, 92,228,231,231, 35, 32, 32,  0, 35, 71,142, 68,
-191,126,253,126,144, 74,165,139,193, 49,  4, 32,151,203,183, 71,181,137,156, 29,219,182, 21,116, 23,126, 65, 81,238,167, 40,201,
-255, 30, 97, 18, 27, 18, 71,141, 68,191,126,253,230, 74,165,210,108, 46,178, 66, 66, 66, 48, 96,192,  0, 16, 66,112,248,240, 97,
- 20, 20, 20,168, 74, 74, 74, 84,213,213,213,242,101,203,150, 41,216,202,137,  9,  9,  9, 56,112,224,128, 71,121, 12, 99, 81,107,
- 53,231, 21,213, 21, 39, 32,145,134, 35,186,221, 35,170,200,232, 65,170,224,144,152, 31,222,255,224, 63,147, 88,121, 95,255, 45,
-  0, 91,126, 52,161, 41,165,167,168,168,  8,173, 91,183,198,208,161, 67,153,135, 30,122,  8,122,189, 30,245,245,245, 88,187,118,
-109, 80,143, 30, 61, 38, 63,245,212, 83,219,189,233, 19,191,255, 94,132,206,157, 58,224,169,167,146,  2,222,120,125, 33,170,234,
-180,168,172,170, 68,202, 75,111,225,173, 39, 70, 97, 84,167,168, 22,145,255,154, 53,107,208,187,119,111,124,252,241,199,188, 18,
-112, 27,241,219,111,191, 53, 89,  7,224, 38,133,247,110, 33,120,111,102, 21, 76,155, 54,141,242, 87, 37, 64, 79,112, 45,196,227,
- 15, 37,192, 31,228,239,171,188,166, 74,245,186, 90,230,222,148,236,117, 81, 18, 28, 69,129, 90,114, 93,206, 74,131,179,181,239,
-203, 12,  0,103,235,238,161,135, 30,162,154,218,230,186,175, 41, 52,119, 60, 87, 25, 44, 30,145,143, 84, 23, 11,  9,172,249, 57,
-184,164,  5,130, 40, 17, 58,  7,209, 40,177, 81, 16, 72,132, 56, 80,110,131,145,  1, 34, 37,  2,196, 38, 12,135,180,123,130,186,
- 57,  5,192, 98,177, 64, 32, 16,160, 75,151, 46, 24, 48, 96,  0,106,107,107, 97, 52, 26, 29,243,243,205,102, 51,194,195,195, 49,
-116,232, 80,108,223,190,221, 17, 18,112,  7,155,205,230,200,234,239,217,179, 39, 26,220,244, 48, 26,141,142,254,204,122, 18,122,
-246,236,137,234,234,106,232,116,186,230,250,114,163, 29,179,103,207, 86,171,213,234,145,189,122,245,218,231, 84,184,167,102,216,
-176, 97,251,164, 82,233, 44,  0, 70,111,218,114,246,236,217,155,213,106,117,109,175, 94,189,178,157,228, 85, 14, 27, 54,108,173,
- 84, 42,253,130,171, 28,154,166,213,237,218,181, 83,140, 29, 59, 22, 23, 47, 94, 84,157, 61,123, 22, 87,174, 92, 65,112,112,176,
-170, 85,171, 86, 24, 61,122, 52,254,247,191,255, 33, 33, 33,129,243,185, 89,173,122,117,141,230,119,133,209, 88,141, 86, 97,113,
-170,160,224,142,  8, 14,233,132,250,186,146,237,239,174,252, 20, 51,158, 74,196,215,127, 11,112,219, 78, 44,198,143, 31,143,156,
-156, 28, 92,187,118,141,174,174,174,134,209,104,196,129,  3,  7,132, 13, 74,103,173,183,253, 97,194,132,241,216,186,117, 59,106,
-107,170,112,173,244, 58,254,246,252, 28,243,203,175,174, 16, 63, 49,114,  8,134,154,106,  1,145,111,244,176,109,219, 54,242,207,
-127,254,211, 81, 14, 58, 54, 54, 22,239,189,247, 30, 94,121,229, 21, 50,121,242,228,123,191,114,231, 61,170, 20,220, 49,  5,224,
- 86,204, 42,240,  7,185,179,168,172,252, 20,175,231,127,223,108,181, 61,111,146,255, 42, 43, 63, 69,254,235,127,200,115, 38,102,
- 87,151, 61, 23,210,174,252,180, 18,249,223,191,238, 55,121,254,  4, 23, 15,  1,187,  6,128, 55,207,203,159,169,115,198, 12, 81,
- 40,142,155,172,170,138,125,123, 33,178, 26,112,188,142, 32,175,206, 10, 49, 69, 33,130, 16, 40,218,182, 66, 88,116,164,162,195,
-195,114, 15,150,166,221,  3, 16, 19, 19,131, 65,131,  6,193, 96, 48,192, 98,177, 64, 44, 22, 59,  8,155,181,210, 35, 35, 35,241,
-232,163,143, 34, 55, 55,183, 89, 15,128, 80, 40, 68,191,126,253, 64, 81, 20,244,122,189,195,187,192, 42,237,108,117, 65,134, 97,
-208,167, 79, 31,252,252,243,207,240, 38,185, 82, 46,151,171,240, 71,158, 72, 16,236,213,246,174,128, 99, 38,188, 59, 79,128,147,
-172,112,  0,213,  0,188,174, 77, 76,211,180,186, 85,171, 86,232,211,167,143, 66, 36, 18,177,211, 31, 85,  0, 80, 82, 82,130,199,
- 30,123, 12,171, 86,173,242, 74,166,205,102, 82,215,235, 74,228,102,179, 86, 33,171,189,164, 10,105, 21,139,128,160,118,  8,  8,
-106,135,221,123,203, 64,141,106,222,226, 30, 50,100,  8, 37, 22,139, 73,117,117, 53,198,143, 31,111,142,136,136, 16, 51, 12,131,
- 43, 87,174,  0, 62, 36, 75, 62,242,200, 16, 74, 34,145,144,144,211,  5,120,254,249,191,160, 67, 92,119,241,123, 11,255,194,108,
-252,228, 11,122,173,192,232,211,179,188,109,219, 54,178,116,233, 82,180,106,213, 10,165,165,165,144,201,100, 96, 24,  6,129,129,
-129, 88,190,124, 57, 94,127,253,117, 94,  9,184,197,136,143,143,111,210, 11,192,105, 26,224,173,192,221, 60,171,160, 57,194,241,
-197,250,111, 74,158,171,165,206,186,238, 61,145,182,191,229, 57,123,  2,124,221,223,156, 87,193,117,241, 31,111,229,253,217, 64,
-211,180, 58,126,212, 88,170,186,222, 32, 15,181,154, 84,130,203,197,232,102,185,142,224,136, 40, 12,233,211,  3, 17,237, 91, 43,
- 66,227, 71,120,236, 31,132, 16,116,233,210,  5, 67,135, 14,117,196,227,  5,  2,  1, 76, 38,147,163,116,175,115,152,160, 99,199,
-142,120,244,209, 71,161, 86,187, 23, 45,147,201, 16, 31, 31, 15,161, 80,  8,179,217,236,248,157,243,212, 65,231,133,128,104,154,
- 70,255,254,253, 81, 80, 80,224, 75, 51, 16,  0,117, 13, 47,127, 64,231, 11,241,187,243, 26,245,238,221,155,205,163,160, 24,134,
-145,235,245,122,152, 76, 38,244,232,209,  3,171, 87,175,246,114,113, 28,162,182,152,235, 96, 49,235, 20,  6, 67,  5, 36,146, 48,
-136,196,193, 42,154, 22, 98,211,230, 31, 20,179,103, 77,104, 86, 94, 67, 93,127,234,195, 15, 63,100, 12,  6,  3,  0, 32, 46, 46,
-206,171,242,203,206, 24, 48, 96, 32, 37,120,232,161,199,230,253,243,195, 28,187, 60, 66,199,197, 61,128,184,201,147,103, 11,133,
-194,205,190,200, 92,185,114, 37,223,169,239, 18, 37,160, 57,242,191,173, 10,192,189, 10,127, 78,251,115, 37,230,150, 90,235,254,
-146,215, 18,139,219,153,216,217,207, 46, 46,123,254, 33,226,136,145, 73,147,213, 13,214, 43,134,251,240,251,228,228,100,132,133,
-133, 57, 50,252, 25,134,113,184,240, 89, 15,  0,155,244,199,174,  8, 24, 27, 27, 11,138,162,176,101,203,150,155,228,173, 89,179,
-  6,153,153,153,142, 99,109, 54,155,199,229,128,197, 98, 49, 18, 18, 18,192, 37, 59,254, 94, 85,214,130,130,130, 16, 20, 20,132,
-136,136,136, 22,244, 29, 86, 17,168,  3, 77, 11, 97, 79,199, 98, 84, 28,229,145, 37, 75,150, 80, 13,247,147,208, 52,221,162,113,
-196,102, 99,118, 46, 90,180,136,  2, 64, 51, 12, 99,163,105, 90,  6, 47,195, 47, 44,120,235,254,238, 82,  2, 60,129,138,143,143,
-231,147, 51,120,240,224,193,131,  7,143, 63, 25,104,190,  9,120,240,224,193,131,  7, 15, 94,  1,224,193,131,  7, 15, 30, 60,120,
-240, 10,  0, 15, 30, 60,120,240,224,193,131, 87,  0,120,240,224,193,131,  7, 15, 30,247,  5, 26,205,  2, 88,176, 96,129,207, 25,
-156,235,214,173,187, 41,153,144,151,199,203,227,229,221,127,242,148, 74, 37,121,124,178, 18,223,111, 75, 69,106,106, 42, 13, 55,
-115,208,249,246,227,229, 45, 95,190,220,113,204,235,175,191, 78,241,237,119,123,229,121,173,  0,176,157,187,169,131,125,153,242,
-114, 47,203,243, 69,230,221,126,189,110, 32,  6, 16,  2, 32,160,225,121, 96,  0, 84,194, 15,115,168,253,  9,182, 29,252,113,205,
-238,218,244, 78, 21, 31,170,171,171,147, 31, 62,124, 88,181,127,255,126,  0,192,136, 17, 35, 48,100,200, 16,206,165,132,239,196,
-125,120,124,178, 18,227, 31, 27, 96,  5,148, 66,165, 82,201,252,217, 10, 55,241,240,140,229,203,151,147, 73,147, 98, 27,125,247,
-164,  4,240,184,195, 30,  0, 22, 36,227,230,  5, 32,168,233,190,175,155,238,110,128,104,201,234,127,254,150,231,238,122, 91,114,
-205,119,251,245,178,196,127,234,248,193,207, 79,157, 58, 54, 42,186,125,108,148, 86,107, 65,104,168,  8, 55, 74, 46, 48,189,122,
-245,171,238,213,119,216, 32,  0, 23,189, 17,120,244,167, 79, 72,241,133, 34, 92,184,100,196,213,235,  4, 29,219, 82,136,141,145,
-162,107,108, 28,  6, 60,242,220, 93,209,249,221, 41, 18,236, 90,  3,119,130,200, 78,156, 56,161,138,143,223,133,245,235,245, 80,
-171,129, 55,223,220,141,171, 87,175,170,162,163,163, 33,149, 74, 81, 90, 90,170,120,226,137, 39,224, 15,133,224,224,193,131, 68,
-171,213, 42, 70,143, 30, 13,137, 68,226,139, 60, 26,  0,198, 63, 54,128, 73, 73, 73, 17,  2,105,248,126,155,189,171,192,191,203,
-246,242,184, 15, 96, 54, 47, 69,110,110, 10,198,142, 77,195,164, 73, 43, 29, 30,  1, 94, 17,184, 61,224, 11,  1,121,  1,103,178,
-167, 40,128,249, 38,236,190,189, 86,139,185,254,233,220, 93,223, 44,235,214,173,123,143, 41,147, 71,160, 99,251, 16,180, 10,149,
- 64, 83, 99, 68,201,245,142,244,185, 98, 77,235, 29,217,159,169,198,142,123,242, 67,145, 56,240, 99, 79,242, 78,159,216, 47,191,
- 88,180, 67, 37, 64, 45,158,156,  0, 60, 58, 16,136,237, 12,156,191, 68,112,232,136,  1, 57,170, 99,248,225,219,151, 73,151,184,
-137,138,  7,251,120,174,104,119,171,188, 29, 77,121, 17, 82, 83, 83,169, 59,165,  4, 84, 87, 87,227,165,151,244,136,140,  4,146,
-147,129,119,223,213,161,176,176, 16, 86,171, 21, 82,169, 20,109,218,180, 81,237,216,177,  3,221,187,119, 87, 36, 36, 36,168,189,
- 28,  0,228, 39, 79,158, 68, 84, 84,148,106,244,232,209,212,166, 77,155,  0, 64,149,151,151,135,153, 51,103, 98,208,160, 65,222,
- 94,171, 24,  0,114,118, 30,165,129, 52,198,254,110,215,161,249, 17,132,135,179,181, 15,  0, 83,167,126,139,220, 92,251,123, 74,
-202,  5,176, 30,  1,222, 27,112,123,137,223,121,251, 29, 43,  5,124,183,131,100,132, 57,148,128,251,153,252,  1,  8,247,228,102,
-188,161, 24, 62, 32,238,161,254,109, 65, 81,246,170,110, 12, 67, 16, 18, 36, 65, 96,172, 24, 49,255,191,189, 43,143,107,226,218,
-254,223, 73, 66,  8,  8,178,136,136,168, 84,  1, 23,  4, 21,113,215,170,196,162, 20,  4,220,138,246, 87,219, 87,237, 66,244,245,
- 89, 95,139, 21, 43, 93,180, 45, 85,124,218,218,250,218, 26,124,173,218,214,247, 90,169, 10,238, 84,106,112,169, 90, 21,183,138,
- 86,  5,220, 42, 42, 85,217, 73,  8,201,220,223, 31, 97, 48,132, 44, 51,147, 32,218,206,247,243,225, 67,114, 51, 57,153,185,119,
-230,126,207, 57,247,156,115,187,120,160,147,159,219, 99,123,114, 54,190, 21, 27, 63, 51, 19,192, 45,107,  2, 47, 95,220,174, 26,
- 57,160, 18,255,156,  9,136,197,  6,  5,170, 94,  7,180,113,  5, 66,130,129,161,225,192,118, 85, 37,142,156,222,174,234,221,103,
- 52,175,  7,223, 81, 75,  0,150,190,207, 40,  1, 15,122, 48,188,189,189,177,125,187, 11,186,116, 81, 35, 47, 15, 40, 43,147, 32,
- 56, 56, 24,193,193,193,168,174,174, 70,113,113, 49,242,242,242, 80, 89, 89,169,234,217,179, 39,235,165,129,205,155, 55, 71,170,
-213,106,149, 84, 42, 69, 89, 89, 83, 79,150, 90,173,198,151, 95,126,137,226,226, 98,242,244,211, 79,115,233, 79, 26,  0,178,179,
-148,  0, 20, 34,195,127,254, 56,118,236, 88, 99,127, 51,155, 40,153,107, 99,115, 95, 24,143, 45,219, 54,155, 70,  1, 33,145,184,
-112,  1,131,171,171, 85,237,110,220,192,239,190,190, 56,209,182,173,220,169,119,111, 16,138,202,227,123,205, 92, 55,140, 98, 35,
-131,109, 91, 75,203, 51,118,253, 39, 37,229, 32, 62, 62,168,241, 63,131,248,248, 32, 65,  9,120,  0, 48, 37,123,102,127,  0,227,
-118, 33, 11,192,244,161,255,147, 95, 95,193,153,  3, 75,131,131,131,123, 12,142,232,216,164, 93, 36,162, 32,149,138,225, 34,147,
-192,201, 73,132,160,110, 94,  8, 10, 10,246, 45, 56,115, 96,187, 53, 69,241,196,225,207,137, 24,149,120,237,  5, 64, 83,  7, 92,
-190, 14,148, 85,  0,229,149,192,127,183,  2,115, 22,  1, 11,151,  3,195, 35,  0, 17,169,196,137,195,159, 11,214,162, 17,250,244,
-233, 35,207,206, 14,129,175, 47,240,204, 51, 18,248,249, 13,194,232,209,163,229,241,241,241, 84, 92, 92,156, 60, 58, 58, 26, 29,
- 58,116,192,137, 19, 39,240,253,247,223,171,126,252,241,199,200,186,186,186, 72,107, 50,191,253,246,219,200,186,186, 58,149,147,
-147,147,213,223, 86,169, 84,216,184,113, 99, 36, 27,146,221,191,127, 63,  1,160, 85, 42,149,210,251, 74,192,125, 50,221,191,127,
- 63,225,170, 64, 29, 61,122,180,241,207, 90, 27, 31,165,142,109,155, 53,242, 15,252,237, 55,213,164, 83,167, 84, 93, 46, 22, 66,
- 90, 89,137,142, 23,127, 67,228,145,195,170,246,167, 79,171, 64, 72, 36,159,241, 62,122,244, 40,142, 29, 59, 70,206,158, 61, 27,
-201,247,158, 97,100,176,105, 99, 43,207,148,232,217,180,217,  2, 67,250,204,127,109,124,176,240,192, 63, 32,226,103, 83,  6,248,
-145,245,  0,180,164,165, 70, 90,240,252, 28,229, 98,102,228, 91,250, 29,107,191, 81,112,238,116,204,212,201,242, 70,210, 55,  7,
-153,179,  4,229, 21,117,232, 17,228,141,204, 45,170,160,208,190, 35, 61, 44,201, 43, 46,186,136,105,227, 13,175,119,239,  7, 62,
-251,  6, 24, 55, 18,136,141,  4,126, 43,  4, 78, 22, 16,184,200, 40,244, 15,  5,162, 71,  3,155,115, 46, 34, 98,152,227, 44,119,
- 62,125,215, 66, 49, 21,188,224,238,238,158, 87, 93,109,136,183,124,230,153,103, 48, 98,196,  8,202,248,179,123,247,238,201, 67,
- 66, 36,170,132,  4,128,162,142,163,180,180, 86,245,251,239, 65,214,220,127,145, 20, 69,169,216,110, 14, 83, 90, 90,170,178,165,
-247, 78,159, 62, 29, 27, 54,108,192,134, 13, 27,200,244,233,211,155,140,197,254,253,251,201,134, 13, 27, 26,143,123, 88,230,  3,
-182,109,150, 80,119,246, 44,186,229,231, 67, 43, 18,193,137,  2,116, 52,  1, 93,175,  7,173,211,161,253,129,253, 40, 36,  4,109,
-251,247,231, 77,224,174,174,174,170,227,199,143,203,103,204,152,145,199, 87,  6,128, 38, 22,185,185, 54, 62,222,  5,123,201,223,
- 18,209,231,152,120,  2,  4,180, 62,204, 42,  0,150,130,223,248, 16,142, 45, 66,228, 42,239, 65,175,209,242,137, 24,183, 22, 84,
-200, 71,158,185,239,240, 12, 92,148,248,249,  7,245,246,247,115,  3, 33,192,129,195,215, 81,171, 54,236,186, 26,209,207, 15,237,
-219,185,224,250,141, 42,186,240,114,153, 72, 34, 17,161,123,160, 23,252,253,131, 61, 97,216,162,213, 44,138,174,104, 48, 98,  0,
- 80, 87, 15,236,218,  7,168, 14, 19,248,119,160, 16, 24,  0, 60,241, 56,208, 43,136,130, 68,108,216, 90,124,104, 56,240, 47,165,
-134, 85,127, 27,187,228,217,188,102,163,241, 26,175,245, 27,247,187, 35, 51, 12,248,160, 97, 59, 87,244,237,219, 87,110,250,153,
- 88, 44, 86,245,238, 93,138,133, 11, 13,234,233,135, 31, 94,196,149, 43,161, 22,101,105, 52, 26,155,150,191, 49,174, 92,185, 98,
-243,152, 81,163, 70, 81,163, 70,141,106, 36,251, 13, 27, 54, 16, 83,  5, 97,212,168, 81,173,210,119, 45, 97,253,  3, 64,247, 59,
-119, 85,218,250,122,136, 68, 34, 16,177, 24, 52, 77,163,158,166, 65,235,245,208,235,105,116,190,121, 83, 85,217,191, 63,239,107,
-174,173,173,  5,  0,213,177, 99,199, 64, 81, 20,231,248,142,150, 80,  2, 28,101,249,231, 36,229, 32, 58, 35, 26, 83, 54,  1, 73,
- 57,134,215, 57, 73, 57,141,202,129,116, 91,161,192,188, 15, 16,198, 49,  1,172, 98,  0, 44,101,  1,240,205, 14,176,100,113,241,
-177,196,172, 41, 13,124, 21, 20,107,215,109,250, 93,182, 86,132,165,160, 66, 62,242,172,125,135,249, 29, 10,  0,189,209,102,236,
-  2,109,136,246,119,  6,  0, 92, 47,169,132, 90,173,  3,  0,  4,  7,122,161,125, 59, 23,156, 46, 40, 21, 93,184,116, 15, 50,153,
- 24, 65,221, 60, 81, 86,161,  5,  0,139,130,175,223, 36,  8,122,204,240,251, 79,142,  2,194,123, 83,112,150,  2, 58,157,193, 19,
-224,233, 14, 20, 95,  3,162, 71,  1,143,117, 54, 28,223,154, 48, 38,125, 62,235,194, 15, 59, 74, 75, 75, 91,204,139,210, 64,242,
-141, 22,127,107,147,191, 49,210,211,211, 73, 74, 74, 10,197,247,115, 83, 56, 21, 21,162,174, 94, 11, 74, 44,129,158, 16, 80,  0,
-116,122, 26,245, 58, 26, 68,175,  7,117,233,  2,128, 88,187,207,251,236,217,179,240,241,241, 81, 85, 84, 84,200, 61, 60, 60,120,
- 43,  1,182,218, 30, 20,249,167,166,166, 82,105,105,105,100,202,166,166, 10,  1,  0, 68,103, 68, 67,186,173, 16,219,182, 21, 53,
-102,  2, 48,  1,131,222,222,222,  2, 83, 63, 96,242,183,168,  0, 60,236,176, 70,136,124,  8,214,158, 20, 71,171,114, 91, 56,155,
-128,154, 90,198,245, 55, 40, 15, 15, 39,148,149,107,224,227,237,138,196,132, 94,208,233,105, 56, 59,139, 33, 22,137, 64,  8, 65,
-220,184, 32,140, 31, 27,  4,138,  2,238,150,169,225,225,225,  4,  0,247, 44,  9,236,210,145, 66,209, 85,130, 94, 65,192,152, 97,
-134, 89,231,183, 66,160,111, 47,192,171, 45, 16, 19,  9,208, 52, 32, 17,  3, 23, 47, 27,142,103, 59,182, 92, 94,243, 45,132, 97,
- 75, 33,109,105,208, 52, 29,217,169, 83, 39, 20, 21, 21, 97,255,254,253,170,145, 35, 71,202,221,220,220, 32, 18,137,242,  0, 64,
-175,215,203,207,157,243, 85, 45, 94,124,  3, 20, 69,161,180,180,  7,122,244,232,138,139, 23, 47, 90,146,103,182,125,227,198,141,
-205,189, 72,132, 96,218,180,105,156,174,217, 88,  9,120,152,200,223, 17, 74,130, 49,238,117,238,  4,233,111, 23, 64,156,  0, 41,
- 77, 12,129,173,122, 29,180, 68,143, 90,157, 14,234,224, 94, 14, 57,247,176,176, 48, 80, 20,197,139,252,  1, 96,240,224,193, 24,
- 52,104, 16,117,244,232, 81, 98,173,205, 22, 26, 60,  6, 77,  8,223, 92, 27, 23, 36,229,220, 39,126,  0,205, 44,127, 38, 96,112,
-219,182, 34,129,169, 91,129,252, 31, 89,  5,160,165, 21, 10, 71, 17,  2, 33,128,104, 90, 89,139, 41,  1, 76,230,130,104,106, 25,
- 27,235, 31,  0, 36,183,110, 20,221,185,126,163,179,143,143,183, 43, 62,250,226, 24, 70, 13,239,130,136,190, 29, 64, 57, 81,141,
- 25,  1, 13, 91,199,227,250,141, 42,220,186, 81,116, 25,128, 69,179, 50,168,171, 12, 63,231,171,209, 43,  8,240, 25,  0, 44,152,
- 13,204,157,  1,120,184, 27,220,254,139, 63,  5, 22,205, 53, 28,251,115,190,225,120,190,  4,237, 40, 75,253, 97,170,  5,112,238,
-220, 57,200,100,134, 62,217,177, 99,  7,174, 93,187,166,234,217,179,167,124,204,152, 49,168,170,170,138,244,246,246, 86, 29, 60,
-168, 67, 94, 30, 48,104,208, 64,  4,  4,  4,200, 59,119,238, 12,  0, 42,115,242,218,180,105,  3,173, 86,203,234,183,117, 58,221,
- 35,255,236, 26,147, 63, 27, 69,128,173, 18, 80,212,222, 87,238,124,230,140,138, 38,  4,109, 68, 18,136,197, 20,116, 68,143,218,
-250,122, 84,105,181, 40,241,247,151,251,216,113,222,174,174,174,160, 40, 74, 62,104,208,160, 60,190, 50, 24,162,183,213,246,160,
-149,128,212,212, 84, 42,169,193,178, 55, 37,127, 99,235, 95, 64,235,146,191,160,  0, 60,  8, 11,175,133, 83, 10, 27,149,  0,118,
-138,134, 46, 52,180, 95, 73,225,229, 50,159,126,161,190, 88, 48,119, 40,214,253,239, 87,184,200, 36,  8, 15,243,  5,164, 78,  4,
-153,  0,  0, 32,  0, 73, 68, 65, 84, 69, 81, 70,150, 36, 65,225,229, 50,132,134,246, 59, 11,160,202,146,192,192,160, 30,216,177,
-247, 52,102, 76,  1, 72, 49, 48,116, 50, 16,216,  5,216,144,109,116,208, 92, 64,175,  7,118,236, 53, 28,223, 90,176,230, 41,106,
-173, 52,192,123,247,238,169, 66, 66, 46, 99,237, 90,  0,208,227,189,247,206,224,228,201, 90, 85,109,109, 45,170,170,170, 80, 92,
- 92,140,219,183,111, 35, 34, 34,  2,211,166, 77,179,153,  6, 72,  8,145,211, 52,173, 18,137,108, 39,248, 48,138,  7, 87, 48, 75,
-  0, 27, 54,108,192,168, 81,163, 90,245,249, 74, 73, 73,161, 24,226,183,181,  4, 96,235, 24, 99,120,245,239,143,187, 90, 45,244,
-170, 60,104,165, 78,112, 35, 18,104,104, 26, 21, 90, 45,170,198, 60,  1,159,  1,  3,120,122,  5, 41, 12, 26, 52,136,247,186,191,
-177, 12, 99,162, 55,215,102,143, 18,112,236,216, 49,171,109,108, 96,142,252, 25,203, 31,128, 16, 16,216,202,228, 47, 40,  0,143,
- 56, 26,215,255,217, 47,  3,232, 67,251,142, 28,179,125,235, 87,  7,127,201,119,239, 53,100,128, 63, 98,162,  2,177,251,167, 98,
-236,248,209,240,112,190,149, 60, 28, 52, 77,240, 75,126,  9,138,138, 10,175,198, 37,188,240, 15,  0,245,150,  4, 70, 12,251, 59,
-181, 99,211, 27,228,227,175, 12,169,128,171, 63, 48,164,254, 69,141, 48,164,  2,126,252,182,129,252, 63,254, 10,208,163, 45,239,
-138,128,246, 90,230,182, 60,  8,173,149,  5, 80, 83, 83,131,254,253, 53, 24, 52,200,240,126,224, 64,130,221,187,139,113,241,226,
- 69,166, 16, 16, 34, 35, 35,209,189,123,119, 86, 53,  0,198,141, 27,151,151,149,149,101,211, 11,160,211,233,224,233,233, 41,231,
-122,190, 13,233,128,141,153,  1,251,247,239, 39,124,151,  1,  6, 15, 30,204,170,141,139, 18, 96,235, 56,214, 66, 69,162, 60,237,
-144, 33,242,243, 78, 78,232,114,243,166,202,237,218, 53,104,186,117,195, 21, 95, 95,185,119, 68,  4,208,176, 68,195,131, 96, 29,
- 65,210,205,100,152,107, 99,219,151,166,199, 49,132,111,171,141, 15, 76, 73,159,241,  8,216,187,132, 39,160, 57,216,  4, 70, 11,
- 10, 64, 11, 90,230, 15,233,111,220,141,126,114,218,202,156,221,223,191,241,251,205,170,160,224,110, 94, 24, 63, 46,  8, 94,158,
- 50,148,149,107,112,242,215,219, 40,188, 92,134,162,162,194, 67,209, 79, 78,219, 12,224,186, 45,129,221,122,196,201, 15,228,111,
- 87, 29,202,175,196,248, 49,192,154, 37,134, 74,128, 69, 87,129, 47, 55, 26, 44,127, 61,218,162, 91,143, 56, 57,223,107,181,103,
-  9,128, 45,249,183, 70, 12,192,205,155, 55,229, 94, 94, 62,170,227,199,255,  0,  0, 92,188,216, 22,131,  6,245, 70,187,118,237,
- 32,147,201,112,243,230, 77,121, 92, 92, 28,167, 82,192, 93,187,118,149, 95,184,112, 65,101,236,209, 49, 37,255,224,224, 96, 12,
- 30, 60,152, 19,137, 49, 89,  0, 70,107,255, 76, 64, 32, 47, 37,192, 28, 17,242, 37, 71, 91,228,206,137,252,141,148,128,118,  3,
-  7,162, 22,160,106, 27,154,236, 13, 85,179,151,252,185,244, 27,219,223,114,180, 60,182,228,175,141, 15,  6,132,245,255,  7,226,
-  9,176,164, 24,112, 74,  3,228, 27, 44,199, 53, 13,144,175, 60,190, 50, 29,125,126,214,250,201, 81,231,103, 79,224,162,147,180,
-141, 50, 46,225,133,239, 10,206, 28,248,124, 75,246,190, 64,191, 78, 65, 67,141,246,  2, 56, 18, 26,218,239,104, 92,194, 11, 11,
-  1,212,176,145,215,187,207,232,188,222,125, 70, 83, 39, 14,127, 78,190,223,113, 17, 31,126,246,240,237,  5,240, 48,146, 63,  0,
- 60,253,244,211, 56,125,250, 52,102,206, 60,222,224,  1, 24,136,169, 83,251,201, 93, 93, 93,243,248,202, 12, 15, 15,207, 11, 15,
- 15,167,182,110,221, 26, 89, 85, 85,165, 18,139,197, 16,137, 68,208,233,116,144, 74,165,112,115,115,147, 59,128,252, 29,162,  4,
-  8,248,115, 34, 53, 53,149, 74, 75, 74, 35,254,115,252,229,232,106,254,152,146,164, 28,149, 16, 15,208,186,144,176,157, 40, 29,
- 61,241,182,132, 60, 62,191,245, 40, 95,175,157,168,  8,237, 59,242,217,208,190, 35,153,138, 49,110,  0,124,  0,220,  4,160, 70,
- 67,217, 87, 46,136, 24,246,119,138, 79,145,159,150,238,135,135,169,174,132, 41, 92, 93, 93,243,134, 13, 27, 70, 13, 27,230,248,
-142, 75, 72, 72,200,131,131,138, 91, 50,235,254,166, 36, 63,106,212, 40,106,195,134, 13,228, 97,136,  7, 16,240,240, 41,  1,214,
- 15,128, 64,254, 45,  0,182, 85,  0,  1,128, 10, 15, 15, 23,214, 94,  4,  8, 16, 32, 64,128,128,191, 24,132,189,  0,  4,  8, 16,
- 32, 64,128,  0, 65,  1, 16, 32, 64,128,  0,  1,  2,  4,  8, 10,128,  0,  1,  2,  4,  8, 16, 32, 64, 80,  0,  4,  8, 16, 32, 64,
-128,  0,  1,127, 14, 52,201,  2,152, 61,123, 54,239,168, 76,115,133, 28,  4,121, 45, 35,143,205, 38, 54,173, 41, 47, 55, 55, 55,
- 18,128, 42, 51, 51,211, 33,242,246,238,221, 27, 73,211,180,195,228,  9,247, 95,171,201,155,  6, 96, 99, 11,159,159, 19,  0, 25,
- 12, 69,107, 52, 48,100,179, 16,152, 20,177, 17,198, 67,144,247,103,151,199, 89,  1,176, 69, 14,150,192, 37,149,202,209,242, 30,
- 36,146, 18, 43,  8,164, 82,100,108,112, 97,117,126,185,185,185,145,153,153,153, 42, 71, 93,175,177,188, 21, 43, 86,200,147,147,
-147, 85,124,182, 23, 54, 39,239,236,103,109, 17,246, 74, 37,236,145,199, 96,226,160,157,170,211, 23,244,  0,128,140,140, 12,146,
-148,148,100,215,120,246,232,240, 61,212, 58,111,184,184,184, 32, 51, 51,147, 36, 38, 38, 62, 44,247, 71,251, 89,175, 39,127,179,
-250,163, 21,207,  1,248,195,  1,242,  2,102,191,250,218,154, 47, 62,253,248, 89, 11,242,156,  0,232, 96,189, 34,155, 19, 12,149,
- 27,219,207,157,251,218, 55,159,124,242,241,115, 48,108,230, 68,195,  1,149,220, 76,159, 99,142,247,198,225,150, 26,  8,138,162,
- 98, 69, 34, 81,111,145, 72, 20, 73, 81, 84, 15,  0,174, 90,173, 54, 71, 44, 22,123,210, 52, 93, 74,  8,121, 27,192, 93, 71,246,
-129,  0,  1,230,240, 92, 81, 17,249, 38, 40,200, 97,115, 84,146, 66, 65, 50, 90,136, 19, 37,182, 30,114, 66,136,181,135,142,243,
-132,225, 40,121, 92, 45, 88, 71, 98,207,158, 61, 54, 39, 17,134, 92, 83, 82, 82,224,235,235,107,182,  2, 94,114,114,178,138,237,
-111, 50,242, 24,226, 63,114,228, 72,163, 34, 96,143, 60,250,220, 59, 16,245,126, 15, 95,239, 53,148,142,165,207,189,211,120,140,
-168,247,123,156,250,165,109,229,235,132, 38,192,119,187, 13,178, 98, 70, 59, 33, 52,184,  0, 25, 25, 25,  4,  0,184, 42,  2, 21,
-186,239, 34,203,175,220,133,154, 26,173,170,169,107,131,152,232,114,116,242,163,112,252,248, 33, 82, 89,169,193,152, 49, 99, 90,
- 85, 17,152, 61,119,238,171,160,233,113,179,231,206,125,245,139, 79, 62,121,219,110,121,115,230,190, 76,104,122,236,236, 57,115,
- 95,253, 98,149, 89,121,245, 44,196,212,  3,160,230,204,153,251, 42, 77,235,199,205,153, 51,247,213, 85,230,101,137,192,163,214,
-131,157,208, 26,223,127, 63,252,240,131,106,242,228,201,242,113,227,198,229,217, 35, 84, 44, 22,199, 72, 36,146, 81, 18,137,228,
-105,177, 88,236, 37, 18,137,220,210,211,211, 69,111,188,241,198, 11,122,189, 30, 58,  3,158,214,235,245,241,  0,126,110, 80,  2,
-180, 13,243, 95,139, 47,131,238,216,177,131,176,157,239, 98, 99, 99, 57,221,211, 59,119,238, 36,246,124, 95,128,227,225,178,108,
- 25,160, 84, 58, 76,158,122,254,124,187,190,207, 84,  4,228,180, 29, 48, 27,242, 31, 48, 96,  0,242,243,243, 57, 89,252,214, 72,
-158,141, 60,115,242, 83, 82, 82, 80, 92, 92,140,204,204, 76,135,110,235,154, 20,159, 65,224,210,  3, 25, 27, 35, 41,  0,200,200,
-244,160,184,144,255,138, 21, 43,228,165,165,165, 42, 75,228,159,146,146,130,244,244,116, 78,228, 15,  0,137,137,137, 24, 58,116,
-168,124,232,208,161,118,201, 99,200,158,249,191,244,125, 52, 33,255,249, 83,100, 88,182, 73,195,170,175, 60,212,201, 36,172,135,
- 24, 53,106,130,215,159,147,225, 72,129, 14,234, 26,130, 90, 45, 32, 15, 47, 64,193, 69, 61, 39,111, 64,241,245,143, 73,249,173,
- 54,112,111, 43,133, 95, 71, 55,180,239, 16,140,171, 69, 90,116,237, 93, 15, 39, 89, 41,114,183,220,193,150, 45, 91,200,164, 73,
-147, 90,101,194, 83, 40, 20,206, 62,157, 58,205,253,246,200, 81, 42,166,103,247, 87, 21, 10,197,  7, 74,165,178,206, 30,121,237,
-253, 58,205,253,110,239, 17,106,108,120, 79,187,228, 41, 20, 10,169,159, 95,199,185, 63,170, 14, 80,  3,251,133, 90,146, 69,183,
- 66,183, 53,110, 63,152,153,153,169,138,143,143,199,166, 77,155, 84,227,198,141,107, 54,134, 17, 17, 17,100,241,226,197,136,143,
-143,183, 58,190, 18,137,100,140, 84, 42, 13,147, 74,165,115,164, 82,169,235,245,235,215,209,189,123,119,136,197, 98,184,187,187,
-163,176,176, 16,110,110,110,146, 99,199,142,121, 30, 62,124,248,192, 43,175,188,210, 21,192, 85,  0, 82, 75,125,144,148,148,212,
-204, 88, 49,158,183,152,118,138,162,144,145,145, 97,243,254,219,186,117,171, 69, 25,198,237,132, 16,196,198,198,114,234,208,236,
-236,108,187,190,223,146, 56,117,234, 84,100,120,120,120,158, 35,100,221,190,125,155,208, 52, 13,136,202,161,173,211, 64,234, 44,
-  3,104, 79,136, 68, 34,116,232,208,129,234,107,234,185,180, 82, 12,231,241,199, 31, 39,155, 54,109,130, 37,121, 83,166, 76,193,
-193,131,  7, 41,190,231,  7,  0, 55,111,159, 39,198,231,103,207,181,243,241, 38, 88, 42,  3,204, 74,  1, 96, 75,254,108,145,146,
-146, 98,243, 24, 54,196,101,137,252,151, 46, 93,138,  5, 11, 22, 52,105,231,171,  4, 36, 13,200, 32,104,215,  3, 25, 63, 70, 82,
-198, 22,255,216,177, 99, 41,  0, 96,254, 23, 22, 22, 18, 54,100,109,141,252, 27, 60,  3, 54,173,118,198, 77,111,108,225,155, 46,
- 45,240,145,103,205,194,159, 63,133,253, 78,113, 62,234,215, 73,247,199,196,112,113,166,240,152,191, 24,119,202,104,212,235,196,
-184, 91, 78, 80, 81, 77, 80,248, 59, 13,136,  0, 31,215, 51,200,205,205,141,140,138,138,178, 58, 41, 92,189,246, 81,100, 72,112,
- 16, 14,223,186,141,110,  1,237, 17,214, 55, 16, 98,103,111, 60,214,173, 12,101,106, 13, 74,111,233,241,251,109, 13, 92, 37,197,
-200,205,117,183, 41,175,133, 48,253,185, 55,222,144, 22,119,244,135,243,128,129, 34,205,129,253,211,  1,124,197, 67, 14, 99,137,
- 79,127,254,213,121,210,223,165,126,112,235, 17, 33,170, 60,123,144,175, 60,  0,152,254,202,220,215,164,112,118, 71,183,158,161,
-162, 11,191,158,176, 71,150, 35, 65, 51,207,  8, 69, 81,144,201,100,114,  0, 42,211,123, 98,192,128,  1,172,200, 31,  0,156,156,
-156, 60,101, 50,217,140, 59,119,238,184,246,232,209,  3,253,251,247,135, 68, 34,193,167,159,126, 10,189, 94,143, 62,125,250, 96,
-243,230,205, 56,118,236, 24,206,156, 57,  3,177, 88,252,185, 94,175,159, 96, 77,230,132,  9, 19, 26,231, 57, 91,243, 32, 27,194,
- 85, 42,149,114, 63, 63, 63, 21, 33,196,170,  1,116,235,214, 45,206,123,101, 48,178,249,126,159, 33,234,243,231,207, 91,157, 55,
- 66, 66, 66,228, 92,201,252,252,249,243,170,138,138, 10,120,120,120,200,237, 81,  4, 78,156, 60, 68, 22,191, 63, 27,109,218,184,
- 52,251,172,166, 70,141,236,205,167,113, 70,169,164,198,119,236, 72,174, 39, 36, 88,158,219, 15,172, 48, 12,230,129, 21,232, 56,
- 38, 14,178,136,129,208,247,  8,109,234, 62,251,110, 61,188,150, 76, 66,111,163,165, 34,245,147, 47,225, 11, 27,231,183, 48,117,
- 22,188,219,185, 26, 26,222, 89,137,228,121, 51,  1,  0,247,238,214,226,195,180,213, 36,162,255,112,222, 74,128,163,151, 20,172,
- 42,  0,140,197,110,203, 82,127, 88, 80, 92, 92,140,  5, 11, 22,240, 82, 32,172,193, 96,233, 39, 81,123,246,236, 33,153, 25,131,
-  1,169,154,176, 89,251, 55, 71,214,166,164,108,109, 89,192, 18,140, 21,138, 35, 71,142,168,134, 14, 29,218,196,245,207, 85,222,
-127,223,112,179, 56,185, 77, 95, 94,195, 90, 14, 77,211,145,206,174, 20, 68, 34,192,213,  5, 40,175,164, 81, 71,  8,218,184, 80,
-208,208,128,186,142,160,115,123, 17,104, 29,112,233,186, 30,197,197,197, 42, 88, 41, 79,123,174,224,135,200,176,176, 94, 42,169,
-148,224,229, 25, 67,160,215, 19,220, 42,213,226,218,141,114,192,233, 58, 92,188,234,112,179,244, 10, 68,210, 10,156, 59, 87, 14,
- 15, 47,235,242, 90, 10,206,222,222,239, 60,253,183,191, 57,191, 69,  3, 94, 11, 82,221,110,159, 62,245, 54, 79,146, 37,  0, 32,
-243,240,126,231,255,158,253,155,243,242,203,122,116,158,150,226,118,161,248,140, 57,121, 54,119,100, 83, 40, 20,104,235,225,249,
-206,244,103,159,115, 62,115,173, 12,  9,207, 36,185,253,251,253,100,190,231,102,209,147,103,169,221,134,226,173,103,158,145,184,
-184, 56, 68, 69, 69,229,101,102,102, 66,173, 86, 55,142, 33, 99,249,199,197,197,177, 26, 83,103,103,231,225, 53, 53, 53,189, 66,
- 66, 66, 32,151,203,145,156,156,140, 23, 95,124,209, 48,153,215,215, 99,221,186,117,200,207,207,199,137, 19, 39,240,253,247,223,
- 67,173, 86,  7,211, 52, 29, 99, 77,230,248,241,227, 29,122, 63,237,216,177,131,213,210, 28, 69, 81, 42,174, 46,124, 99,217,124,
-190,223,224, 26,206,171,168,168, 64, 73, 73,137,217,207,253,253,253,193,151,192, 75, 74, 74, 80, 82, 82, 98,151, 34,112,230,244,
- 69,124,179,126, 59, 70,142, 28,142,208, 62,157, 26,219, 11,126,189,129,  3,  7, 14, 97,243,166,159, 72,230,155,111,226,122, 66,
-  2, 92, 70,140,128,250,231,159,205,202,201, 24,153, 76,  1,192,165,245,171, 72,223,210,221,120,110,239,118,232,123,132, 66, 61,
-111, 17,  0,192,101,249, 34,184, 93, 44,192, 27,197, 82,116,127,126,206,253,126,172,185,255,156, 90, 59,191,168,177, 35,154,157,
- 95,238,158,159,113,230,244, 69, 68,244, 31,206,251,254,225,179,164, 96,236,238,183,230, 13,144,112,181,216, 29, 77,180,246, 34,
- 51, 51,211,174,239, 39,101, 40,  8, 58,  2, 25,241,134,137, 43, 35, 63,169,137,155,223, 96,241, 87, 16, 83, 79,  0, 91,178, 46,
- 45, 45,109, 66,206,124,200,154, 45, 24,165, 67,161, 80, 16, 91,245,160,173, 89, 54, 12, 24,247,191, 37,121,132, 16,114,231,220,
-235,232,216,224,250,111,212,152,245,  4, 26, 45, 80,223,208, 86,175, 35, 32, 34,195,235, 95,207,228, 51, 89,  2,102,225,238, 94,
-161,170, 81,139,224,227,237,137,242,123,181, 40,175, 40,199,145,227,183,112,227, 54,129,180, 77, 45, 58,  5, 87, 67, 93,123,  7,
-221,251,214,163,107, 72, 29,190, 95,147,143,221,187,119, 71, 62,192, 91, 78,164, 80, 40,162,166,188,156,212,161,196,195, 11, 69,
- 58,192, 37,106, 28, 68, 94,237,124, 20, 10,197, 56,165, 82,249,163, 17, 89, 59,193,104,221,219,210,188,175, 80, 40,198, 38,206,
-120,185,195, 31, 34, 15, 92,173,174,135,103, 68, 20, 36,238, 94,166,242,  0,118,  1,108,209, 19, 39, 77,238, 64,196,206,168,168,
-169, 67,216,128, 97,112,107,235, 97, 78, 86,171,128,177,254, 41,138,194,182,109,219, 72, 92, 92, 28,182,111,223, 14, 23, 23,151,
-200,148,148, 20, 21, 23,242,  7,224, 92, 94, 94,254,124,125,125,189,200,213,213, 21,163, 70,141,194,242,229,203,225,228,228,  4,
-133, 66,129,245,235,215, 35, 63, 63, 31, 71,142, 28,193, 79, 63,253,132, 95,127,253, 21, 62, 62, 62, 62, 58,157,238, 49,216, 88,
-  2, 73, 74, 74, 34,182,150,  0,214,172, 89,195,234, 60, 91,114,  9, 96,235,214,173, 14, 89,  2,240,240,240,144,151,148,148,168,
- 44,125,102,239,184,243, 81,  4,228, 69, 69,228,238,178,101,248,  8,  0, 14, 31,198,189, 41,177, 88,209,175, 71,163,203, 62,180,
-119,111, 76,157, 54, 30, 93,203,238,224,122, 66,  2,218,205,159, 15, 85, 80, 16,213,247,231,159,173, 62, 39, 82,249,227,232, 17,
- 19,137, 55,230,127,128,127,161,  0, 43,134,142, 65,216,160, 33,  8,190, 87,140,117,158,253, 81,236,113, 27,125,100, 50,162,209,
-104, 88,141,175,124, 76, 63, 60,247,124, 28,142,254,242, 43,118,231,252,136,119,  1,172, 88,190, 22,161,189,123,227,185,231,227,
- 80,171,190, 11, 25,  7,121,166,176, 55,  6,128,147,  7,224, 81,130, 82,169,164, 28, 17,181,206,144,123,230,130,203,128, 88,138,
-164,113, 93,  1,207,174,200,104, 72, 88, 98,187,246,239,104, 24, 95, 27, 19,244,103,108,249,155,130,137, 13,176, 20, 12,200,103,
- 39,194, 13,243,218, 88,244,  8,184, 87, 38,227,138,150,224,214, 29, 26,128,  8,110,174,  6, 23,103,189,142, 64, 83,  7,104,180,
-128,166, 14,208,214,  3, 26, 53,160,173,187,239, 37, 49,167, 80,184,233, 94, 39, 55,174,  5,160, 75, 55, 55, 16, 39,  9,238,168,
-213, 80,237,187,142,115,133, 55,112,239, 94, 53, 66,  7,232, 81,163,209, 65, 83,167,135,186,150,198,173,107,128,186,  6,216,178,
-101,139,138,203,  6, 24,118,142,  9, 45,246,244,124,103,230,155,111,202,190, 55,162, 16,175, 55, 83,221,238, 45,152,247, 54,128,
- 31,141,200, 90,203, 66, 36,145,184,121,190,243,226,107, 11,100,187,110,232, 27, 27, 59, 63,189,192,237,234,151,111, 26,203, 99,
-229,  5,112,117,115,127,251,213,215,231,201,138, 74,238,239, 22, 25,255, 76,146,219,119, 25, 43,204,201,226,244,172,153,187,151,
- 56, 62,107,132,177,254,101, 50,153, 60, 42, 42, 42,143, 73, 25, 85,171,213,170,252,252,124, 42, 46, 46,142,173, 44, 29,128, 96,
-  0,116,120,120, 56, 45,147,201, 68,235,215,175,199, 11, 47,188,128, 37, 75,150,128, 16,130, 95,126,249,  5,251,246,237,195,153,
- 51,103, 80, 81, 81,129,238,221,187,163,178,178,210, 85, 36, 18,249,218, 18, 62,113,226, 68,139, 74, 50,179, 52, 48,126,252,120,
- 78,110,250,135,117,  9,192,154, 23,192, 30,235,223, 94, 69,160,172,188,188,241,181,111,234, 44,132,165,206,198, 72,147, 99, 46,
- 63,249, 34, 58,239, 63,142,162,121, 47,227, 23,127,127,184,  0, 56,163, 84, 82, 48,147, 22,167, 86,171, 73,231,206,109,113,245,
- 26, 16, 26, 17,  2, 44,123, 11,175,125,185,  5, 51,130, 78,163, 95, 93, 33,222,184, 45,197,251, 27, 22, 98, 73,218, 23, 56,243,
-235, 65,116,233, 28, 74, 92, 92, 44,123,125,141,229,121,183,115,197,147,177, 67,240,100,236, 16, 44,166, 87, 66, 91,183,  0, 39,
- 79,  2, 39, 79,  2,  7, 14,196,225,223,171, 46, 34, 54, 54,134,  4,  4, 60,134,160,160,111, 56,241, 83,238,227,111,161,232,160,
-196,198,220,253,197, 95, 67,  1, 80, 40, 20, 36, 49, 49, 81,206,172, 25,154, 42,  1,198, 19, 18,179, 30,207, 55, 30,128, 33,253,
-177, 99,199, 82,134,101,  0, 41, 50, 54, 60,216,235,101,162,254,163,162,162,168,220,220, 92, 98,203, 27, 98, 43,237,208, 26,161,
-115, 93, 14,120,254,205, 26,248,119, 16,225,153,120, 41, 52,117,128,135, 59,  5, 17,213, 96,245,131, 64, 83, 11,212,104,  9,106,
-212,  4, 53, 26,  2,154,  0, 34, 43, 49,215,207,207,173, 65,159,126,197,240,235,117, 15,123,118,149,226,222, 61, 13,194,135, 85,
-162,175,119, 53,224, 84,  7, 77, 45,141,210, 27,  4, 53, 53, 20,116, 58, 10,222, 62, 20, 64, 61,240, 88,182,208,254,253,250, 13,
-244, 10,  8,192, 33,189,145,242,242,204,179,184,151,146, 60, 64,161, 80,244, 86, 42,149,231, 56,220,207, 33,131, 70,140, 30,216,
-206, 63,  0,199,143, 54,198,200,161,189,252,255,112,117,205,  2,115,242,172,109,133,221,123,196,136,145,  3,253,253, 59,227,220,
-137,203,141,237, 35,158, 24,143,255, 41,151,115, 62,183, 22, 64,227,185, 51,207, 47,179, 12,192, 96,251,246,237,205,226,143,204,
-196,  2, 48,131, 30, 12,224,212,252,249,243,135, 75, 36, 18,183,175,191,254, 26,107,215,174,197,204,153, 51,177,116,233, 82, 80,
- 20,133, 43, 87,174, 64,173, 86, 35, 37, 37,  5, 58,157, 14,179,102,205,162, 41,138,178,249,  0, 56, 50,154,254, 97, 95,  2,176,
-230,  5,112,132,245,207, 23,235,215,175,199,223,146,166,162,162,188, 14, 72, 91,141,154,  3,199,209,102,228,192,198,207, 75,211,
- 86,163,192,217, 25,212, 63, 94, 66,216,180, 39,113,120,221, 46,244,237, 59,200,162,188, 75,151,206, 98,216,136, 24,156, 45,240,
-194,234,207, 51, 49,114,228,112,188,255,217, 66, 44,142,154,142,111,  1,244,122,238,  5,172,254, 60, 19, 82,169, 23, 38, 76, 28,
-136,175, 57,200,251,228,163,141, 24, 20,215,  7, 31,244, 89,142,179,227,221,224, 21,191,185,201,177, 62,174, 50, 28,205, 83, 33,
-224,111, 51, 56,247,195,193,131, 18, 44, 91,230, 98, 67,129,251, 11,121,  0, 76,215,145, 45, 17,124,195,113,172,145,145,111,136,
- 80, 55, 16,255, 37,100,126,122, 25,134, 44,128,166, 74,  1,155,101,  0, 71,187,245,115,115,115,137,177,245,207,120,  4,140,223,
- 39, 38, 38,130, 41,150, 99,169, 48,  4, 23,242,103,178,  0, 44,201,211,233,129,154, 90,130, 58,173, 33,216,175, 78, 75, 32,113,
-190,255,153,166, 22, 80,215, 19,220,189, 71,240, 71, 25,193,137,115, 58,208, 52,144,152,152, 40,191,116,233, 82,179,177,209,233,
-128,146,235, 90, 92, 47, 42,195,193,195,101, 32,132,194,185,223,104,196, 61,163,131, 84, 66,240,199,109,224,224,143, 64,101, 37,
-  1,161,129,199,199, 80,144,201,128,152,152,  9,184,122,245, 42,171,107,202, 90,167, 32, 19,103,240,207, 18, 17,185,181,125,243,
-229,165,233, 78,217, 68,212,132,137,125,156,157,225,244,143,185, 78, 87, 86,173, 92,  8,224, 89,182,242,196, 46,110, 11,103,191,
-189,212,233,199, 18,210, 68, 94,187, 54,206,  8,155,246,138,211,185,141,159,154,202,179,232,  1,144,185,180, 89,184,224,157, 69,
- 78,151,111, 85, 52, 57,160,173,123, 27, 76,122,102,166, 83,246,127,191,226,116,110, 45,229,181, 51,215, 22, 17, 17, 65, 78,156,
- 56,129,109,219,182, 53,251, 78,124,124,188,217,161,  0,112, 22,192,169, 21, 43, 86,244,243,244,244,116, 99,220,224, 95,125,245,
- 21, 94,120,225,  5,172, 93,187,182,209,138, 95,177, 98,  5,202,203,203, 81, 89, 89, 89, 93, 91, 91, 91,220,224, 65,144, 90, 59,
-215,151, 95,126,153,152,186,232, 25,235,159,173,251,255, 81, 89,  2, 48,231,  5,112,180,245,207,200,100,187,  4,112,110,216, 48,
- 80, 47, 79,131, 39,  0, 50,102,  0,106, 79,156, 69, 77,218,234,251,253,150, 52, 21,221,159,155, 10,153,204,112,253,  5,  5,133,
- 86,  9,187,160,160, 16,  0, 16, 19,107, 80, 34,242,143,159,193,183,223,124,  7,215, 33,131, 81, 91,175,131, 22, 90,140, 26,221,
-191,201,241,108,229, 93,215,107,241, 76,135, 87, 64,159,168, 67,226,191,198, 64,250,212, 17,244, 14,237,141,208,176,224,198,243,
- 75,121, 99, 21,130,130,196,172,239,155, 39,254,239,137,168,115, 56,183,  7,255,251,134,178, 21,  2,240,197, 23,104,153, 66, 64,
- 15, 35,242,243,243,109, 70,147,231,230,230, 70,178, 78, 41,116,110,131,204,174,251,  1, 93, 62, 65,183, 54, 72, 74,235,134,140,
-188, 56, 10,200, 32,247, 21,130,177,188,151,  1, 76, 83,  1, 45,165,  6, 90,154, 44, 21, 10, 69, 35,249,155,  6,  0, 50, 46,117,
-166,205,154,  7,192, 88,158,163, 38,243,157, 59,119, 70,222,184,185, 75, 69,183,167, 33,146,  0, 78, 34,195,253, 93, 79, 19,232,
-116, 64, 85, 21,129,182, 30,208,213, 27,148,130,  9, 19, 13,222,155, 75,151, 46, 89,148, 87,119,103,167, 42, 52,148,198,129,125,
-122, 80, 34,224,143, 91, 20,100, 46,192,190,221,128, 86, 77,129, 34, 64,223,  8, 39,148, 92,163, 49,122,244,120,196,198,198, 82,
-108, 42, 97,101,173, 83,144,101,175,  0,243, 63,227,175,  4, 16, 90, 31,173,111,231, 35,218, 69,223,103,161, 14,  0,252, 40, 64,
- 61, 96,128,228,178, 78, 31,205, 73, 30,161,163,225,238, 45, 82,221,210, 55,202,107, 47,  3,124,100, 20, 92,251, 12,144, 20,124,
- 71, 71, 91,178,162,205,201,106,227,238, 41,186,122,187,188,129, 88,  0,119, 23,103,184,187, 74, 17, 17,222, 95,178,229, 91, 18,
-221,202,143,174,217, 62,103,162,254,227,226,226, 26,239, 81,198,123, 55,101,202, 20,107, 22,104, 53,128,203, 39, 79,158,172, 30,
- 57,114,100,123, 24,229,244,127,245,213, 87,141, 36, 91, 95, 95, 15,189, 94,143, 75,151, 46,161,125,251,246,119,104,154,102,165,
- 45, 78,156, 56,209,226, 18,  0, 23,162,125, 20,150,  0,204,121,  1, 28,105,253,115, 33,126,  6, 29,253, 61,177,102,205, 94, 36,
-196, 15, 67,135,  1,161,192,128, 80, 80, 47, 79,107,170,244,  2,184,125, 75,141,173,219, 14,163,163,191, 39,123,121,126, 46, 24,
- 48,176, 59,  6, 12,236,222,236, 56,174,242, 70, 77, 14, 65,234,232, 79, 65,159, 53,144,255,139,111, 60,207, 75,158, 41,222,116,
-127,115,207,146,170, 37, 99,111,226,102,139, 61,144,118, 41,  0,249,249,249, 15,188,106, 31, 99,229, 50, 68, 23, 21, 21, 69,153,
- 33,127,194,184, 21, 19, 19, 19,121,253,142,113, 22,  0,211,198,213,242, 55, 13,  0,108, 64, 99, 91,114,114,178, 42, 49, 49,145,
-245, 67,102, 76,254,230, 98,  2,184,202,179,133,101,155, 52,176, 37, 47, 54, 54, 54,111, 97,202, 86, 60, 49,212,  9, 52,128,122,
- 45, 13,103,169,161,155,170,106,  8,234,234,  9,116,122, 32,255,172, 30,122,154,192, 86,202, 94,108,108,108,222, 59,111,109,197,
-232, 72, 49, 38, 77, 23,163,186,138,160,170,  2,168,169,162,208,173, 59,129,190,158,130, 68, 36, 67,249, 61, 26, 37,191,107, 49,
-239, 53,118,  1, 99, 89,235, 20,100,229, 92,160, 71,  0,176,234,117, 96,206, 71,252,148,  0, 82, 91, 51,249, 31,  3,250,239,244,
-203,222,233,230, 53,226,113,116,  0,208,129,  2,244,135, 14, 34,247,249,103,171,235,107,107, 38,113,145, 71,107,106, 39,189, 28,
- 53,112, 87,200,226, 44, 55,223,190,195,225,227, 76,161,189,140,130,250,252,207,216,250,214,140,234,122,117, 45,107,121,117, 26,
-245,164,216, 39, 70,238, 74, 78,251,220,173,119,191,  1,112,119,149,194,221,197, 25, 69,231, 78,225,157,148, 87,171,213, 28,100,
-241,177,228,217, 92,174, 57,242, 95,180,104, 81, 51, 55,255, 15, 63,252,160,138,143,143,135,133, 34, 65, 12,209,107,  1,156,234,
-217,179,103,145, 70,163,233, 36, 22,139,101,174,174,134, 84,172, 77,155, 54, 97,202,148, 41, 80,171,213,208,104, 52,168,171,171,
-131,155,155,155, 70,175,215,103, 19, 66,110,177, 57, 89, 71,101,  3, 60, 42, 75,  0,198, 94,  0,230,117,107, 16, 63,131,110,221,
-252,240,102,106, 18,118,239,250,  5, 89, 91, 78,192, 89,218, 22,191,151,220, 95,193,234,236,223, 27,117,218, 74, 68, 12,232,133,
-143, 87, 38, 97, 73,218, 23,156,228,249,250,122,160,224, 92, 65,227,231,161,189, 67, 81, 90, 90,193, 73,222,248,185,147, 48, 69,
-244, 44,234,206, 86, 99,232,156, 48,208,125,101, 88,179,230,251,198,243,171,168,168,192,240,199, 67, 88,201, 51, 69, 84, 70, 20,
-245, 19,126,106, 81, 62,229,173,  0,180,  4,249,179,145, 25, 21, 21, 69,101,102,102,146,  6,107, 23,153,153,153,196, 56, 45,209,
-212,234, 55,167, 32, 52,247,195, 82,128, 84,  4,184,136,  1, 55,  9, 80, 87,133,204, 37, 78,128,203, 81,146,244, 84, 55,192,197,
- 27, 25,223,112,183,250,173, 69,251, 51,100,205, 54,135,221,148,252, 77, 99,  2,184,202, 99, 75,254,108,228,125,152,190,154,122,
-125,238, 44, 34,147,  1, 52, 13,244,233, 41,190, 63, 30,191,234, 81,175, 39,208,211, 98, 76,158, 60,153,149,114,242,222,  7,171,
-169,121,243,102, 17,157, 14,208,214, 19,232,117,128,136,  2, 34,199,  3, 85,229, 20,126, 59,173,134, 90, 35, 66, 66,252,100,214,
-110,255, 69, 47,  2,193,157, 13,239,131, 58,  1,124, 61,  1, 74,165,242,136, 66,161,136,185, 53, 33,118, 87,192,214,157,110,  1,
- 35, 30, 71,253,161,131,216, 28, 31, 91,173,173,170,138, 81, 42,149,  7, 57,202, 59,168, 80, 40, 98,206,191, 59,113,151,255,191,
-178,221, 58, 13, 26,129,154,243,135,176,225, 31, 19,170,235,106,185,201, 99,100,173, 72,253,251,174,247, 63,249,210,109,232,176,
-225, 40, 44, 56,133, 87,147,158,173,174,173,174,230,124,110, 45, 13, 75,197,126, 20, 10,  5,137,139,139, 99,147, 13, 32,246,244,
-244, 60,165, 86,171,191, 45, 46, 46,238,218,175, 95,191, 64,157, 78, 39,113,114,114, 66,118,118, 54,198,142, 29, 11,141, 70,131,
-218,218, 90, 92,186,116,169,210,203,203,107,175, 90,173,254,154,166,233, 26,176,172,  0,200, 20,  5, 98, 92,236, 92, 92,255,143,
-218, 18,128,177, 23,192, 17,227,203,167,118,128, 57, 60, 25, 51,  4, 79,198, 12,105,120,103,191, 14,219, 84,222, 68,251,148, 59,
-207, 31, 80,119,186, 26,207,127, 62, 30,239,239, 93,104,247,185,169,103,170,137,151,206, 11,154,111, 52, 15,196,176,230,165,  0,
-180,134,229,111,106,125, 24,187,177, 45,185,250, 29,121,142, 92,214,254, 29, 77,254, 70,202,142,113, 33, 32, 70,  9, 82, 53,120,
- 58, 56,201,179, 21, 11,192, 85,222, 71,159,172,166, 20, 10,  5, 17,137,128,131,249,134,181,126, 38,224,207,176,238, 63,153,147,
-188,229,203, 87, 83,179,102, 55,212,164, 16, 25,100, 28,221, 15,212, 84,211, 32, 52,144,144, 48, 30,209,209,209, 54,199, 35,107,
-157,130,164, 60, 11,120,186,  1, 37,119,  0, 23,103,128, 38, 64, 27, 25,144,166,  0, 82,149,188,148,128,131, 10,133, 34, 38, 63,
- 33,118,151,199,162,247,220,242, 22,189, 83, 93,199,131,252, 77,229,229,205,159,176,203,229, 31,239,186,229,252,123, 49,103,242,
- 55,150,245,202, 43,175,196,190,243,207,151,119,206, 73, 78,113,251,252,227,116,134,252, 79,155,121,246,117, 92,100,219, 90, 58,
-226,250,188,153, 35,255, 89,179,102, 17, 38, 19, 96,219,182,109,132,162, 40,107,138,128,155, 86,171,173, 22,137, 68,185,254,254,
-254,157,171,170,170, 94, 57,126,252,120,199,254,253,251,211, 58,157,174,182,162,162,226,246,233,211,167,175,116,235,214,173,168,
- 93,187,118,197,106,181,122,147, 78,167,187, 77,  8, 97,173,  0, 48, 69,129,140,188,  2,124,198, 87,222,130,115,161,195,101, 59,
-106,221,223, 94, 57, 26,181,216,161,199, 59, 90, 94,121,153,  8,233, 58,  5,  2, 15,251, 97,218,103,182, 21,147,242, 50, 17, 30,
- 11,176,126,204,131, 36,127,139, 10,128,173, 92,127,174, 15, 58,219,218,  1, 92,228, 42,149, 74,202,210,102, 59, 92,200, 43, 35,
- 73,105,112,243, 95,  4,112,209,244,211,138,134,191,203,224,113,189, 42, 71,145,171,113,191, 40, 20, 10,194,212, 25, 72, 78, 78,
-230,149,225, 96, 42,111,195,188, 54,141, 74,129, 61, 74,147,233,152, 48,  1,127,124,189, 18,171,191,104, 42,175,186,210, 48,  1,
- 39, 36, 36,112,187,255,190,117,232, 51, 83,111, 76,218,251, 22,189,187,190,174,170,234,121,123,173,107, 70,222,143,159, 47, 94,
-175,169,173,154,161, 84, 42, 15,241,149,245,217,103,159, 29, 80, 40, 20, 49,159,175, 92,182,190,186,186,218,210,185,233,240,224,
-209,100, 70, 53, 37,255,220,220,220, 72, 66,  8,182,111,223,110,124,140, 53,121,215,180, 90,173, 51, 33,164,138,166,105,165, 86,
-171,253, 37, 32, 32,192,167,188,188,156,122,251,237,183, 43, 43, 42, 42,238,118,234,212,169,170,186,186,186, 70,171,213, 86,214,
-215,215,215,233,245,122, 53,151, 19,118,208, 50, 64, 94, 11,246,105, 30,254,164,232,217,179, 47,245,238, 91, 25,100,234,211, 99,
- 17, 26,214,205,226,113,  5,103, 47, 99,227,119,123,208,179,103, 95,234, 65,202,235,215,175, 31,149, 50, 79, 73,166, 62, 61,214,
-186,193,124,188, 24, 27,191,219,131,126,253,250,217,188,151, 30, 36,249,155, 85,  0, 28,109,217,183,164,167, 32, 42, 42, 42,143,
-149,139,223,  6, 28, 25,213,255, 32, 60, 35, 92, 54,253,113,132, 55,128,235,152, 24,167,117,217,187, 36, 97, 42,143, 43,249,219,
- 19,241,207,134,180,  1,  4, 61,140,242, 28,125,110, 14,186,183, 41,  0,160, 40,138,136, 68, 34, 48,127,140, 11,123,252,248,241,
-136,137,137,  1, 77,211,160,105, 26,132, 16, 91,191, 71,233,116, 58, 87, 66,136,158,166,233,186,250,250,250,253, 98,177,152, 18,
-137, 68,206,  0,156,105,154,134, 94,175, 23,235,116, 58,169, 78,167,235,168,215,235,207, 27,125,183,197, 55,  1, 18,224, 24, 37,
-224, 74,177,134,236,222,185,  5,215, 74, 43,225,231, 85,219,248,217,173, 50, 87,  4,248,182, 69,175, 94,189,108,146,117, 75,201,
-235,215,175, 31,117,171,164,142,172, 90,185,  3,133,191,223,105, 38, 47,184,179, 15,  2,  3,  3, 89,145,127, 75,193, 90,141, 20,
- 42, 60, 60, 92,216, 30, 83,128,  0,  1,143, 42,106,141,  8,157, 54, 50,108, 36, 70,237, 55,  1,120,192, 16, 52, 46, 16,191,  0,
-  1,150, 60,  0,  2,  4,  8, 16,240,  8, 65,214,160,  4,208, 70,196, 47,194,253, 37, 14,  9,128,142, 13,175,105,161,187,  4,  8,
- 16, 20,  0,  1,  2,  4,252, 57, 32,  2,224,102,244,158, 33,126,169, 17,233,211, 13,199,  9,214,191,  0,  1,130,  2, 32, 64,128,
-128,191,200,156, 38,144,190,  0,  1, 86,180,103,  1,  2,  4,  8, 16, 32, 64,192, 95, 89, 91,158, 61,123,182,241, 70, 58,196, 56,
-194, 94,161, 80, 16,147,141,118,174, 69, 69, 69, 53,102, 53,154, 43,197,106, 44,143, 43,254,140,242, 76,211, 22,141,251, 83,232,
- 63, 97, 60, 30,118,121,105,105,105,141,199,164,166,166, 82, 60,228,  1, 22,202,  1, 11,247,179,109,153,194,243, 43,200,227, 34,
-143,179,  2,192, 17,237,217, 28,196,236,222,231, 40,141,197,180, 24,137,185,221,  0,205, 29,211, 26,218, 21, 67, 48,137,137,137,
-114,134,104,152, 10, 96,214,106,130, 63, 72,108,223,190, 61,114,219,182,109,141, 36, 56,126,252,120,121, 66, 66, 66,222,159, 81,
-219, 53, 55, 30,231,207, 27, 50,195, 66, 66, 66, 90,245,220, 20, 10,  5,153, 48, 81,129,236, 44,165,217,123,118,231,174, 19, 36,
- 59, 75,105,245, 94,222,185,235,132,213, 73, 32, 54, 38,130,247, 77,151,150,150, 70,226,227,131,154,188,183,165,  4,216, 66, 85,
-117, 85,228,214, 31,183, 34, 48, 52, 80,  5, 10, 56,127,242,156,124, 88,248,112,132,244, 12,225,116,255, 29, 58,116,168,217,117,
- 15, 31, 62,156,130,  0,  1,  2, 90, 76,  1,144,178, 61,112,232,208,161,156,133,155,219, 44,134,129, 57, 18, 53,221,104,131, 45,
-209,242,217, 24,135,141, 66,193,200, 77, 73, 73, 65,122,122,186,202,210,222,226,204,113,214,114, 53, 77,207,177, 83,183, 46,  0,
-128,219, 26, 13,116,234, 58, 67, 99,121, 37,  0,195,222,  7, 92,106, 35, 24,147, 63, 96,168, 45,206, 37,215, 94,161, 80, 16, 17,
-101,168,174,199,252,  7,172,191,254, 98,245,131, 87,200, 76,199,131, 33,126,190,227,225, 72,165,146, 33,255,216,152,  8, 13,160,
-144,101,103, 41,121,255,  6,163, 64,152, 87,  0,148,118,157,167, 86,155,130,156,156, 36, 68, 71,103, 32, 62, 62,189,209, 35,192,
- 71, 17, 56, 88,112,144, 60,214,191, 11, 62, 86, 46,135,151,171, 23,104,157, 30, 26, 82,167,218,253,203,143,209,123,247,253, 68,
-134,  7,142,144,203,100, 50,155,138,192,161, 67,135, 72,131,103,161,153, 69, 36, 40,  1,  2,254,202, 56,117,234, 84,147,247,230,
-230, 52,123, 20,  0, 78,241,  3,230,118,177,115,  4,  8, 16,105,183, 12,194, 94,  7, 96, 99,185, 43, 20, 10,146,146,146,130,165,
- 75,151,  2, 64,227,127,115,199,217,218, 33,172, 25, 60,219,226, 76,241,119,112, 65,103,232,241, 51, 74,255,115,  2,167,139,238,
- 98,242,210,181,173,118,163,157,249,245, 44,250,246,  9,  3, 77,128,179,103, 13,175,129,251,175,141,219,105,150, 93,109, 92,131,
-221, 26, 50, 50, 50, 40,182,227, 49, 99,198, 12,  0,104,252,111,150,252, 41, 10,176,114, 63, 40, 20, 10,242,196, 19,187,160, 80,
-196, 56, 84,  9,136,141,137,168, 77, 74, 74,114,  5, 50,144,157,197,141,216,141, 45,124,123, 73,222,146,245, 15,  0, 83,166,108,
- 66, 78,142,225,127, 82, 82, 17, 24,143,  0, 23,111,  0, 33, 36, 82,117, 97,175,234,149,127,204,198,192,246,253,225,226,225,  1,
-162,213,129, 38,122,136, 37, 82,  4, 71,  5,231,252, 54,224,  2,150,102,164,171,134,248, 12,149,187,186,186,218, 84,  2,238,220,
-185,211,228,253,248,145,109, 48,100,238,207,120, 58, 93,211,100, 32,199,140, 25,195,123,188,178,178,178,200,196,137, 19, 29, 54,
-222,142,150,215,194, 68, 18,105,111, 89,223, 83,167, 78, 69, 54,144, 16, 95, 57,125, 95,127,253,245,155, 53, 53, 53,  1,  0,198,
-193,176,  9,103,  8,128, 83, 48,108, 10,  5,  0, 27,148, 74,229,111,  2,245, 55, 39,127,166,205, 84,  9,104,162,  0, 20, 23, 23,
-147,226,226, 98,  0, 64, 96, 96, 32,140, 55,155,  1,208,228,189,185,207, 45,161,180,180, 84,149,153,153,201,218, 19, 96,186,215,
-189, 53, 18,166, 26, 74, 97,154,146, 40, 87, 23,123, 70, 70,134,205, 99,114,115,115, 89,145,127, 98, 98,162, 69,210, 95,176, 96,
-  1,210,211,211, 97,172, 32,176, 65,241,156,149,240,  0,  0, 12,251, 73, 68, 65, 84,167,110, 93,112,163,172,  2,155,103, 77, 65,
- 59,106,  4,138,214,204, 67,224,164, 64,236,105,101,242,  7,208, 72,248,  0, 16, 22, 22,214,164,157,241, 12, 24,183, 59,218,178,
-183, 70,196,204,120, 88, 34,253,117,235,214, 33, 61, 61, 29, 49, 35,250, 99,215,207, 39,  1,247, 54, 64,101,245,  3,239,195,157,
-187, 78,184,  2, 25,216,185,235,132, 67,228, 77,172, 92,104,245,217,204,106,251, 33,171,  7,196,216,245,159,148,148,131,248,248,
-160,198,255, 12,226,227,131, 88, 43,  1,107,254,183,  6, 75, 62,251,  0, 35,187, 71, 66, 95, 87,  7,157, 94,  7, 74, 66,  1, 16,
-131,128,198,237, 63, 74, 16,210,190, 23, 22,206, 90,136, 15,150,125,160,122, 34,204,182, 55,203,116,178, 27,239,191,206, 44,225,
-239,221,187,151,240, 81,  2,178,178,178,200,206,183,119, 33,246,125, 56,132,180,179,178,178,200,178,101,203, 48,127,254,252,135,
- 90,  9, 56,117,234, 84,100, 69, 69,133,170,164,164,  4,225,225,225,118,157,103, 69, 69,133,234,254,148,205,235, 57, 47,  6, 48,
-  3,192, 73,  0, 95,  3, 24, 11,224, 73,  0,127, 55, 82,  0,238,252, 73,249,156,130,149,109,192,173, 26, 82, 41,  6,142,201, 72,
- 95, 96,246,243, 38, 10, 64, 96, 96, 32, 21, 24, 24,216, 72,246,198,174,228,204,204,204, 38,239, 77, 63,191,116,233,146,197, 19,
-100,148,138,228,228,100, 85, 74, 74, 10, 76, 55,202, 49,221, 60, 39, 51, 51,211,162, 11,214,220,100,111,218,214,154, 27, 21,  1,
-192,198,141, 27, 45, 18, 63,128, 38,228,191, 96,193,  2, 86, 50,127, 47,190,134,154, 45,239,192,237,133, 79,208,169, 91, 23,116,
-104,231,130,226, 45,197,  6,242,247,108,107, 88,  2,112, 18,115, 62,215,248,248,120,185,241, 50, 64,124,124, 60,103, 47, 13, 77,
-128,128, 54,192,191,159,  5, 94, 90,  7,180,119,  5,206,151,155,111, 47, 40,227,120,231, 91, 80,228,184,120,109,222,123,239, 61,
-139,196, 15,  0,203,102,196, 97,213,238, 35,240, 11,236,136, 91, 87,111,219,180,254,  1,128,141, 23,128,139, 27,223, 96,225, 43,
-204, 90,250,204,218, 62,215,251,122,217,127, 45,247, 81,143, 89,224,113,175,  4, 53,249,175,141, 15,134,116, 91, 33,235,239,215,
-170,107, 49, 98,218,112,213,208,142, 67, 80, 87, 83,  3,137,179, 51, 36,146,251, 83, 80,113, 97, 33,182,102,103,223,120, 97,230,
-140, 78, 93,157,  3,208,127,116,120,212, 47, 57,191, 68, 14, 25, 56,132,147,213,152,182,115,  6,246,237,219,135,167,158,106,218,
- 62,102,204, 24,138,171, 18,192,144, 63,186,126,140,157,111,191,102,183, 18,144,149,149, 69, 86,174, 92,137, 30, 61,122, 96,213,
-170, 85,152, 51,103,206, 67,167,  4, 24, 19,191,163,228, 49,178,236,240, 38,200,  1,140,  6,176,142, 16, 82, 77, 81,148, 31,128,
- 11,  0,174, 42,149, 74, 29,254,220, 32, 28,251,187,  9,249, 51,175, 51,210, 23, 52,243,  2, 60,144, 58,  0,153,153,153,204,218,
- 43,138,139,139,225,235,235,219, 76, 65, 96,218, 74, 75, 75, 89,213,185,183, 21, 12,200,101,194,156, 58,117,106,203,169,110, 70,
-  4,102,206,234, 79, 79, 79,135, 82,169,164,108, 69,113,170,113, 13,213,147,134,128,184,207,  3,162,222, 70, 53,254,  7,252,199,
- 96, 45,146,204,121,112,250,219, 42,232,116,220, 11,157,197,197,197,229,177,216,118,213,186,135,231, 43, 96,241,106,160, 75,103,
-224,246,118, 41,214,127,169,197,140,239, 44,183,115,186,243,137, 99, 43, 85, 27,  7,251,221,204, 90, 10,247, 80, 25,220,186,255,
- 19, 27,151,190,132,126, 97,126,232, 25,247,  1,171,241, 96,115,127,178, 93, 42, 96,238, 93, 99,242, 87, 42,149, 20, 19,248,199,
-139,104,218,126, 72,241, 33,121,115,208,198,  7,155,109,207, 49,241,  4,216,194,205,210,155, 24,151, 56, 14,238,109,189,160,167,
-116, 56,176,111, 63,170,170,171, 17,159,144,128, 63, 74, 75,241,195,166,205,120,113,230,140, 78,206, 50,103,136,136, 19,162, 35,
-162,115, 47,168, 86,241,178, 26,203,202,202,236,190,110, 99,242,  7, 96,183, 18,144,149,149, 69, 22, 45, 90,132,224, 96, 67,127,
-  6,  5,  5,225, 97,242,  4, 56,154,248,205, 88,255,204,107, 62,215,218,187,129,  8,157, 40,138,114,  5, 16, 10,224, 28,128, 78,
- 10,133,162, 18, 64,185, 82,169, 20,202,218,115,196,  3, 43,  4,228,235,235, 43, 79, 76, 76,108,182, 20,112,228,200, 17, 85,195,
-102, 47,156, 99,  4, 44,  5,  3, 90,179, 28, 45, 41, 40, 45,  1,198,186,183,228,238,103,107,253,  3,192,238, 55, 23, 33,126,201,
- 71,208, 69,141,128,  4,128,219,225, 66,236, 41,186, 11,  0,208, 69,205, 65,253,175, 62,160,218,255,157, 51, 73,177,245,178, 88,
-195,221,137,255,195,156,153,215,113,113,214,124,212,252,164,133,159,143,245,118, 71,120,  0,248, 40,  7,235,214,173, 51,104,195,
-241,163,112,164,164, 20,238,253,220,113, 35,167,  8,144, 57, 99,202,156,191,193,187,115, 92,171, 61,136,150,162,254, 29,229,213,
-178,150, 33, 96, 43, 59, 32, 39, 41,  7,209, 25,209,152,178,  9, 72,202, 49,188,206, 73,202,225,236,  5,168,214, 84,193,199,165,
- 29,116,154, 90, 16, 17,193,160,193,131,177,101,203, 22,205,202,143, 62,146,209,132, 96,250,179,211,225,221,206, 27,181,213,213,
-208,233,117,112,119,106,139,122, 81, 61,175,235, 45, 47, 47,111,146, 29,192, 53, 32,176, 25,249, 51,224,169,  4,100,101,101,145,
-148,148, 20, 12, 30, 60,184, 73,123, 88, 88, 24,210,210,210,144,154,154,218,106, 74, 64, 75, 17,191,169,245, 15,  0, 37, 37, 37,
-124,189,  0,191,192,176,222, 95,  9,131,235,127, 28,128, 75,  0,250,  2,200,  6,176, 22, 13, 59,117, 90,155, 78,192,211,149,254,
-151, 80,  0, 76,  9,129,217,115,158,205,231,214,162,166, 25, 48,203, 11, 76, 64, 32, 19, 27,192,120,  7,  2,  3,  3, 85,204,114,
- 65,107, 77,188,142,132,173,181,126,198,250,103, 35,107,242,234, 77, 32,  9,221,112,123, 88,  4,218, 97,  4, 92,166,172,130,238,
-230, 31,128,103, 91, 72,238,254, 15,219, 87,230,  3, 98, 49,231,107,231,147,  5, 97,138,211,175,255, 31,  6,134,  3,129,115,206,
- 34,212,109, 38, 46, 60,150,  8,252,123,190,197,246,214,242,  0,164,167,167, 99,228,160,158,136, 26,209,  3,241,125,230, 99,197,
-202, 47,112, 46,255,  6,102,141, 25,136, 91,217, 59, 81, 81, 86,233,144,251,193,220, 82,129,173,231,195,154,181,239,168,123,212,
-146,124,107,129,131,169,169,169, 84, 90, 90, 26,153,178,169,169, 66,  0,  0,209, 25,209,144,110, 43,196,182,109, 69,141,153,  0,
- 76,192,160,183,183,183,217,249,151,166,105,232,105,128,208, 58, 56,187,200,240,236,115,207,201, 22,191,251, 46, 58,116,232, 64,
-119,242,243, 19,105,106,170,161, 39,  0,161,245,160,105,219, 30,173,225,195,135, 83, 63,252,240,  3,185,123,247, 46, 42, 43, 43,
-155, 40,142,198,217,  1, 92,178,  2,178,178,178,200,138,151, 10,  0, 89, 48,112,235,179,230,  7,200,130,177,226,165,  2, 36,255,
-135,157, 18,144,149,149, 69, 38, 76,152, 32, 15, 11, 11, 83,221,189,123,183,217,231,  1,  1,  1,152, 48, 97,130,252, 81, 10, 12,
-228, 99,253,219,227,  5, 80, 42,149,121, 70,207, 87, 71,  0,167,  1, 76, 82, 42,149, 92,182, 50, 21,200,223,154,  2, 96, 82,232,
-199, 86, 33,160, 38,159, 91,115,153, 38, 38, 38,154,245,  2, 48,100,239,235,235, 43, 79, 73, 73, 81, 49,107,178,137,137,137, 86,
-211,  0,173, 89,135, 92,131,255, 90, 42, 13,144,177,238,173,  5,  3,114, 65,209,191,146,224, 52,101, 21,212, 37, 23, 33, 57,188,
- 10,245,155,230,128,138, 93,142,173,127,127, 10, 87,183, 94, 70,252,178,175,  1, 73,235, 84,118,158,159,  9,228, 44,219,130,208,
-171,209,192,157, 26,188, 49,118,190,213,118, 71,120,  0,248, 90,255,217, 91, 22, 65,220,169, 55,220,208,  3,215,246,101,160,138,
- 34, 56,122,241, 58,162,206,222, 96, 57,238,215, 26,223, 79,157,170,108, 66,246,  0,240,211, 79, 49,102,143,179,246,124,216,114,
-245, 59, 34,237,208, 17, 25,  2, 73, 57,247,137, 31, 64, 51,203,159,  9, 24,220,182,173,200,236,247,221, 93,220, 81, 82, 81,130,
-193, 93,135, 64, 93,167,  1,212, 26,232,180,245, 88,152,146,  2, 74,  4, 81,109, 77, 53,104, 90, 15,157,158,192, 89,226,132, 63,
-170,255,128,147,222,118,182,241, 83, 79, 61,213,216, 55,135, 14, 29, 34,204,124, 99,156, 29,112,243,230, 77,214,215, 57,113,226,
- 68, 42,249, 63, 32, 43, 94, 42, 64, 72,183,230,191,127,254,178, 22,201,255,  9,  5, 91,178,158, 56,113, 34,149,149,149, 69,  6,
- 15, 30,140,128,128,128,102,159,159, 61,123, 22,217,217,217,170,214, 34,255,  6,107,156,106,201,181,127, 99,216,225,  5, 96, 48,
- 14,134,224,239, 58,129,194, 29,168,  0,180, 20, 24,203, 31,  0,134, 14, 29, 42,207,204,204, 84, 49,174,127, 11,202,129,252,210,
-165, 75, 42,174, 36,204,119,146,116,116, 26,160,177,245,111,142,248, 25, 69,135,203,249,158, 46,186,139,250, 95, 23,227, 54,126,
-134, 95,236,114,160,162, 18, 69, 25,243, 16, 52,251, 99,220, 90, 59, 15,112,146,  0,162,214,169,236,124,173,  6,  8,241,157,196,
-186,189, 53, 60,  0,233,233,233,213,211,162,134,220,244,160,189,186,212,194, 73,182,233,227, 57,248,124,251, 41,188,241,228,227,
-152,241,209,127,241,212,135,223,180, 74,240, 40,163,128, 54,212,  1,160,236, 85, 78,237,113,245, 91,243,  2, 36, 53, 88,246,166,
-228,111,108,253,219,130,191,175, 63,118, 31,200,193,240, 46,195,225,218,198, 13, 52, 77, 32, 34, 58,208, 20,  5, 66,  8,244,  4,
-208,209,  4, 58,157, 14,234,138, 26,236, 56,182,  3, 82,189,148,115, 80,170,105, 86, 64,234,156, 17, 24,239, 95,140,140, 99,236,
-101, 88, 82,  2,184,146,191,177,188,212,212, 84,178,108,217, 50,116,236,216,241,190, 98, 95, 84,132,244,244,116, 60, 12,150,191,
-163, 21,  1,115,214,191, 61, 94,128,134,103, 34, 18,192, 99,  0,222,250, 11,  4,255,  1,128, 24,128,254,145, 86,  0, 76,163,254,
- 19, 19, 19, 27,215,221,141,149,  3,227,215,246, 88,240,124, 38,114, 71,165,  1, 90,178,254,249, 18, 63,131,201, 75,215, 98, 51,
-128, 39,151,140,  7,201,156,  7,106,234, 10,156, 46,186, 11,202,219, 11,133,191, 87, 26,172,127,177,184, 85,238, 80, 75,249,254,
-246,212,  1, 96,163,112,177, 85, 14,214,173, 91,167,  5, 80,245, 82,100,223,202,127, 46,255, 68,251,230,194, 20, 77,251,182,190,
-119, 11,206, 93,235, 48,227,220,127,221, 90, 59,107,196, 18, 57, 27, 47,209,112,207, 40, 48,247, 27,246,121,  0,204,145, 63, 99,
-249,  3,176, 25, 16, 40,147,201,168,115, 91,207, 39,168, 70,228,101, 39,246,121, 10,149,154, 74, 80, 34,192, 80, 82,132,134, 94,
- 79, 64,235,116,104,227,236,142, 67, 21, 39,113,233,112, 33,198, 70,140,205,179,187,115,139, 94,  6,192, 61, 13,176,137, 18,208,
-241, 26,206,223, 12,224, 69,254,198,242,230,207,159, 79, 86,173, 90,  5, 79, 79, 79,220,189,123, 23,139, 22, 45,194,195,230,246,
-119,132, 34, 96,201,250,231,227,  5, 80, 40, 20, 29,  0,248, 53,220, 40,253,  1, 36,  3, 40,250,139, 24,233,250,150, 20,254, 64,
-234,  0, 88,242,  8,172, 88,177, 66,110,170, 40, 36, 38, 38,170,184,202, 51, 38,130,135,161,196,174,177,245,111,154,254, 87, 92,
- 92,220,164,223,184, 84,237, 99,148,128, 73, 75,190,  2,217,  4,248,204, 80, 34,239,159, 79,225,241,244, 13,128,147, 19,218,200,
-164,173,114,189,198, 57,254,230, 94,243,172,  3,160,  3, 32,106, 24, 91,145,157,227,113,123, 90,212,144,146,127,102,108,235,182,
-240,197,113,109,253,253, 34,181,  0,206, 36, 38, 38,122,  0,112,227, 59, 30,247, 73, 58,134, 60,241,196, 46, 35,247, 63,183,239,
- 91,179,224,141,203,  3,179, 85, 36, 90,162, 24,144, 37,152,146, 62,227, 17,176,180,228,241,252,212,231,183,110,251,239, 54,232,
-167,233,206,140,238, 50,186,111, 59,247,118,208,212,107, 64,  8,129, 84, 34, 69,185,186, 22, 71,126,255,  9,235,190, 93, 15,121,
-111,185, 67, 10,135,165,237,156,129,245,235,215, 99,222, 60,238, 53,  0,238, 43,  1,176,139,252,141,229,205,153, 51,135,169,  3,
-128,135,121,205,223, 88, 17,224,243, 93,123,107,  7, 24, 63,  6, 48,228,251,107,  0,188, 14,224,152, 82,169,212, 67,128,165,190,
-199,169, 83,167,144,145,190,160, 89, 29,  0,171,133,128, 90,170, 14,128, 57,143,128, 37,162,231,227,  5,176, 23, 45,149,  6,200,
- 40, 35, 74,165, 18,185,185,185,116,113,113,177, 49,145,201,163,162,162, 56, 91, 55,147,151,174,  5,140, 10,255,140, 94,184,186,
-241,117, 77, 43,220,108, 45,101, 61, 83, 20,181, 18,192, 61, 24,210,127,158,181, 83,220,173,151, 34,251,214,141,205,253,165,237,
-244,119,191,134, 82,169,148,230,230,230,118, 68,211,114,214,188,198,163,165, 61,  1,182,234,251,219, 66, 75, 44,  9, 88, 34,127,
-109,124, 48,176,205,182, 97, 38,239, 59,134,218,247,195,  1,114, 56,224,  8, 70, 12, 25,129, 78,238,157,  0,154,224, 15,205, 93,
- 28, 58,113,  8,183, 10,110, 97, 76,200, 24,185,179,179,115,171,143,135,177, 18,224, 40,178,102, 60,  1,143, 74,192,159,189, 85,
-  0, 29, 48,199,100,  0,200,128,  0,206,176, 84,  0,200,172,  2,208, 82, 72, 78, 78, 54, 75,246,198, 59,177,153, 64,197, 38,171,
-192, 81, 86,127, 75,164,  1, 54, 68,248,235,114,115,115, 37, 13, 75,  7, 12,249,143,137,138,138,226,228,229,104,216, 76, 73,229,
-232,115,180,180,198,236,232, 90,247, 28,225, 12, 64,162, 84, 42,223, 54,114,129, 61,103,175,204,177,111,173,201, 87, 42,149,163,
-114,115,115,145,155,155,171,  1, 32,107,248,179,155,248, 25, 47,  0,223, 62,179, 69,242, 19, 38, 42,154, 28,199,149,184, 29,177,
- 36,144,154,154, 74,165, 37,165, 17,255, 57,254,114,116, 53,127, 76, 73, 82,142,138,109, 60,192,224,208,193, 84,109,109,109,228,
-218, 37,107, 17, 16,252,152, 10,  0, 46,156,253, 77, 30, 55, 54, 30, 33,225, 33,188,199, 99,248,240,225,212,166, 77,155,154,101,
-  5,212,215,215,219,117,  3, 57,154,172,255,108,209,254, 15,  1,132, 20, 63, 51, 94,  0,211, 54,214, 10,128, 45, 75,156,173,165,
-206,119, 82,100, 91,136,197, 94,162,114, 52,209, 49,242,114,115,115, 73,110,110,174,196,184,191,  2,  3,  3,121,253, 86,  3, 65,
- 57,124,194,120, 24,214,190,205,192, 29, 64,181,161, 32, 63, 69,  1,112,129,237,252, 94, 54,227,113, 37, 55, 55,151,201, 43,171,
- 12, 12, 12,108, 31, 24, 24,232,252, 48,244,165,189,150,184, 45,217,142, 90, 18,176, 73,238,169,220,238, 81, 87, 87,215,188,169,
- 19,166, 49,147, 55,134,134, 14,117,200,121, 78,153, 50, 69, 32,215, 63, 63,217, 27,115, 88,189,131,201, 95,  6,195,114,195, 35,
-175,  4,216,236,200,240,240,112, 65,107, 18, 32, 64,128,  0,  1,  2,254, 98, 16,  9, 93, 32, 64,128,  0,  1,  2,  4,  8, 10,128,
-  0,  1,  2,  4,  8, 16, 32,224, 47,128,255,  7,201, 67,  6,106,228, 94,183, 75,  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,  0,  0,  0,  1,  0,  8,  6,  0,  0,  0,197,144,
+206,103,  0,  0,  0,  1,115, 82, 71, 66,  0,174,206, 28,233,  0,  0,  0,  6, 98, 75, 71, 68,  0,255,  0,255,  0,255,160,189,167,
+147,  0,  0,  0,  9,112, 72, 89,115,  0,  0, 11, 19,  0,  0, 11, 19,  1,  0,154,156, 24,  0,  0,  0,  7,116, 73, 77, 69,  7,216,
+  5, 19, 11,  8,  1, 11,126, 22,156,  0,  0, 32,  0, 73, 68, 65, 84,120,218,236,125,121, 92, 84,229,254,255,251, 57,179,179,239,
+168,184,128,138,251,130,224, 26,106, 80,168,201,215, 52, 21, 48,179,237,214,189, 78,150,173,150,102,117,111,245,203, 43,106,218,
+170,233,216,162, 89,106,  9,106,120,115,  5, 29,212,144,220, 21, 75, 19,  5, 17, 65,144,109, 96,134,217,207,156,231,247,199,204,
+208,128,192, 44,160, 81,205,251,197,188,152,115,230,204,123,158,115,158,229,253,249,124,158,141, 68, 69, 69, 81,184,225,134, 27,
+110,184,225,134, 27,127, 43, 48,238, 71,224,134, 27,110,184,225,134, 27,127, 31,156, 57,155,  5,  0, 32,238,  8,128, 27,110,184,
+225,134, 27,110,184, 35,  0,110,184,225,134, 27,110,184,225,134,219,  0,112,195, 13, 55,220,112,195, 13, 55,220,  6,128, 27,110,
+184,225,134, 27,110,184,241,151,  0,223,246, 96,222,188,121,196, 85,162,181,107,215,222, 54,150,192,205,231,230,107,  5,116,237,
+218,181,127, 88,250,178,179,179,105, 92, 92, 28,113,231,199,159,151,239,220,185,115, 46, 23,190,168,168, 40,184,243,195,205,247,
+ 87,230,115,218,  0,248, 59, 67, 42,149, 54,122,128, 50,153,140,116,228,116,174, 91,183, 14,132, 16,226,206, 57,215,242,120,246,
+236,217, 72, 79, 79,111, 56, 78, 74, 74,250, 75, 60,203, 61,123,207,180,218, 16, 36, 78,142,254, 75,151, 25,137,255, 78,136,117,
+189, 17,  1,  3,234,177, 23,249,218,183, 58,108, 89,236,168,109,140, 27,127,211,  8,192,221, 40,172,123,246,236,137,203,200,200,
+144, 91,143,167, 77,155, 22,159,152,152,152,221, 17, 30,  6,165,230,182,179,163,234,170, 84, 42,165, 69, 69, 69,  0,128,240,240,
+112,  0,248, 83, 52, 34, 77,141, 43,139,129,213,162,103,238, 40,239,214,173, 91, 29, 54,212,164, 82, 41,221,182,109, 91,195,241,
+206,157, 59, 49, 97,194,132,134,227,244,244,116,250, 71, 25,  1, 49, 49, 49, 20,  0, 78,159, 62, 77,218,227,186,140, 31,100,173,
+ 24,  0,178, 54,231, 95, 88, 68, 55,  0,192, 45,157, 14,172, 86,111, 62, 89,171,  4,  0, 36, 39, 39, 35, 33, 33,161,197,244,173,
+ 79, 88, 79, 35,203, 34,157,250,253,248, 95,227, 29,200, 23,  9,252,159,189,  0, 93,198, 78, 40, 20,211,161,  0, 16, 45,121, 31,
+111, 73, 78,163,155, 24,168,212, 21,224, 45,109,138, 83,191,155,149,149, 21,151,150,150, 38,183, 61,151,156,156, 28,159,144,144,
+144,221,145,234, 86,123,181,  1,127,134,251,189, 19,120,231,141, 23,136,151,192,151,232,197, 66,170,175,213, 50,245, 90, 37,247,
+193, 39,171,255, 22,179,227,236, 26,  0,123,246,236,137,179,254,111,171, 80, 91, 27,146,119,183, 45,129, 87, 55, 95,212,223,168,
+195,219, 41,111,201, 51, 50, 50,224,182,134,237, 67, 38,147,145,240,240,112, 90, 84, 84,132,162,162, 34,236,219,183,175,195,122,
+ 18,214,188,150,201,100, 68, 38,147,  9,164, 82,169,113,197,138, 21, 39,  1, 96,225,194,133, 35, 90,251,238,244,233,211, 27,222,
+179,172,  9,  6,163, 30,  6,189,  1,  6,131,249,197,178, 44, 22, 46, 92,232, 84, 90,108,197,191, 57, 76,152, 48,225, 15, 53,  2,
+ 28, 49,126, 98, 98, 98,236,114, 36, 78,142, 38,174,136,188,195,240,243, 65, 94,225,119,144,160, 43, 76,200, 65,197, 23,103,112,
+190,160, 26, 51,150,109,112,232,235,145,101,145, 14, 10,186, 25,242,129,114,187, 13,177, 36,241, 45,  4, 76,123, 26,165, 47, 69,
+  3, 90, 69,195,249, 51,218,215,112,  6,  0,180,192,120, 73, 50, 14,250,159,134, 31,128, 24, 69,140,195,229,183, 41,210,210,210,
+228,105,105,105, 29,162,189,178,166,177, 61,218,128, 63,195,253,182, 55, 54,173, 89, 75, 30, 13,139,224,191,144,244, 56, 47,164,
+127, 24,195, 39, 33, 68, 83, 87,199,137, 17,106, 98,186,116, 53,233,110, 94, 51, 57,248,236,110, 58,209,134,119,113,128,111,129,
+ 19,124,171,238,168,  1,144,145,145, 33,223,246,239, 55,144,242,222, 82,121, 98, 98, 34,105, 75,  1,179, 10, 63,  0, 84,105,170,
+129, 64, 96,241,193,119,160, 44, 84, 64,250,175,142, 37,100, 45, 85,136, 63, 58,141,182, 70,192,  3, 15, 60,128,162,162, 34,132,
+135,135,119,184,103, 39,151,155, 29,137,248,248,120, 42,147,201, 24,153, 76, 22, 38,149, 74, 75, 87,172, 88,113,218, 81, 30,150,
+101, 97, 48, 24, 27,132,223, 86,252, 79,157, 58,133,225,195,135, 59,149,174,148,148,223, 61,192,217,179,103, 35, 51, 51,179,145,
+  1,208, 30,101,197,149,124, 56,125,250, 52,201,206,206,166, 19, 39, 78,188,237,179,  3,  7, 14, 96,235,214,173, 13,199,173,141,
+ 91,184,205,120,111,199,238,128,176,136,110, 40, 85,212, 97,199, 51, 51, 17, 72, 98, 81,240,249,171,232, 57,189, 39, 50,157, 16,
+127, 43,230,206,157, 75,  1, 96,253,250,245,109, 46,179, 97,219,114,160,185, 94,143, 82,105, 68,171,215, 93, 16,103,225,221,193,
+183,144,122,225,205, 54,229,103,123,136,110,123,114,180, 71, 36,224, 78,223,111,123, 33, 39, 39,199,  3,192, 61,  0,188,108, 78,
+215,  2,200,139,141,141,173,113,148, 71,203,105, 25, 67,149, 94, 48,121,234,116,177,  2, 70,177, 64,192,231, 43,117, 98, 70, 40,
+212,114, 60, 31, 79,214, 32, 49, 26,249,229, 55,245, 98,158, 72,167, 51,233, 77, 82,169,148, 52, 55,102,196, 22,181,181,181,255,
+181,190,207,207,207,175,242,244,244,100,212,106, 53,103,123,205,200,145, 35, 63,116, 52,141,148, 82,187,194, 78,  8, 89,208,214,
+103,202,183,231,253,247,233,211,  7,145, 94, 62,104, 75, 20,192, 86,252,171, 52,213, 72,189,255,157,134,207,254,145,241, 44, 16,
+  2, 76, 95,145,226, 84, 33,107, 73,160,219, 75,164,111,220,184,  1,  0,232,214,173, 91,163,247,214,223,181, 87, 32,238,100,136,
+207,214,  8, 48, 26, 89,172, 91,183,238,142,121,  1,206,114, 54, 17,127,219,239,223,148,201,100,254, 82,169, 84,225,176,248, 27,
+141, 48, 24,244,208, 27, 12, 48, 54, 17,127,202, 57, 23,161, 75, 73, 73,193,169, 83,167, 26,142, 87,173, 90,133,164,164,164,134,
+227,244,244,244, 54, 27, 59, 54,  6, 79,155,203,159,173,240,207,158, 61, 27,195,134, 13,115,137,167,189,186,  3, 74, 10,139,161,
+222,249, 31,120, 61,245, 49,194, 34,186, 33, 52, 80,130,194,157,133,102,241,247,243, 49,119,  1,  8,120, 14,113,181,135,240,  3,
+ 64,159,139, 87,113,227,237, 37,208,166,109,108, 61, 66, 32,145, 64,167,211,161,160,160,  0, 21,186,203,232,131,176, 22,175,205,
+202,202,138,107,173,236,203,100, 50, 98,173, 39, 89, 89, 89,113,206,132,199,109,163, 98,214,250,106,123,206, 89, 71,160, 37,225,
+118,166, 45,104,238,126, 51, 51, 51, 41, 33,  4,  9,  9,  9,164, 45,247,107,197,211, 79, 63, 77,191,252,242,203, 54,229,121, 78,
+ 78,142, 47,128,233,  7, 15, 30,252, 15,199,113,122, 27, 17,228,243,120, 60, 79,  0,255,140,141,141,221, 99,143, 39,191, 48,159,
+ 47, 17,138,197,  2,129,200,147,225, 19, 31,202, 19,121,112, 60, 30,159, 35, 12, 56,194, 55, 81, 30, 79,207,227,136, 78,205, 51,
+105, 60,133,  2,194,235,213, 77, 39,158, 26,194,161,216,126, 26, 21, 10,133, 82,163,209,176,  0,160, 86,171,185, 55,222,120,163,
+ 65,240,151, 46, 93,250,114, 91,203,251,132,  9, 19,158,177,190,207,204,204, 92,215, 30,117,136,177,231,253, 47,153,149,  4, 93,
+101, 37, 94, 29,216, 15,182,125,247, 14,123, 33,150, 46,  4, 91,241,159, 54,109, 90,188, 76, 38, 35,211,166, 77,139,223, 48,237,
+ 51,115,100,177,111, 80,163,235, 29,193,194, 53,249, 88,184, 38, 31,207,173,188,132, 39,222,251,  5, 51, 22,159,107,243,  3, 41,
+ 41, 41,113,200, 48,184, 91,226, 95, 84, 84,212,162, 48,135,135,135,195,104, 48, 96,212,200,145,109,254, 29,107,152,124,219,182,
+109,144,203,229, 13,175,214, 12,173,150,196, 48, 62, 62,190,169,248, 55, 24,202,142, 52, 76, 44,107, 50,123,254,122,115,232,191,
+169,248,155, 76, 38,168,181,106,167,238,209, 26, 49,104, 26, 53, 72, 79, 79, 71,122,122,122, 35, 99,192,169,251,205,110,220, 30,
+202,179,179,157,122,102,173,137,255,236,217,179,177, 98,197,138,  6,241, 23,240,  5, 78,241, 36, 78,142, 38,150, 46,152,102, 95,
+206,112,105, 81,140,250,233,163, 64,211, 94, 69, 73, 97, 49,232,244,254,191,123, 43,105,175,130,223, 57, 24,240,243,187,171, 30,
+161,186,170,  0,218,180,141,160,148,226,194,133, 11, 24, 63,126, 60, 36, 18, 73, 35,225,247,247,247,135, 86,171,133, 86,171, 69,
+105,105, 41, 30,209,190,128, 47,252, 95,106,145,211,218,  7,222,218,243,177,126,214,180,191,220, 81,225,110, 47,103,197,250,221,
+166,226,111,207, 65,106,237,126, 51, 51, 51,105,122,122, 58,210,210,210,144,149,149, 69,219,122,191, 79, 63,253, 52,229,243,249,
+120,250,233,167, 93,174, 19, 57, 57, 57, 98,  0,255,202,202,202,122,227,189,247,222, 59, 78,  8,  9,183,190,  0,116, 13, 12, 12,
+244, 56,116,232,208,218,156,156,156,241,173,241,152, 40,199,227, 17,129,200,192, 82, 31,189,222, 24, 98,226,184,174, 38,142,139,
+ 48, 17,210, 29, 60, 94, 32, 33,196, 15,132,231,195, 81,  4, 80,  3,231,167,212, 26, 61, 67,124, 88, 30, 51, 82,229, 80, 30,105,
+ 52, 26,182,169,215,223,209,193, 56,226,253,107,202,203, 48,121, 88,180,211,  2,109, 53, 34,222,221,182,  4,  0, 26,196,223, 26,
+ 69, 72, 76, 76,204,182, 26,  1, 37,202,155,136, 94, 56,218, 41, 35, 67,173, 53, 65,173, 53,161,172, 90,143,210, 74, 29,110,220,
+210,185, 36,124,214,202, 98, 79,252,255, 40,180,100,  4,  0,128,206,160,135, 78,167,115,153,219, 42,218,214, 62,242,224,224, 96,
+ 91,111, 22,142, 54, 38, 77, 61,225,150, 66,137,142, 52,122,  6,163,222,236,249,235, 13, 48, 24, 27,139,191,209,104,132, 90,173,
+134, 74,169,250, 67,243,196,108, 48,165,217,  6,228,172,127,216,182, 45,205,101, 35,192, 86,252,173,194,207, 48, 12,196, 98, 49,
+ 60,189, 60,218,148,230, 61,123,207,208,150, 94,246,190,187,111,241, 59,  8, 68, 44,216,132,231,  1,  0, 94,185, 87,113,190,160,
+218,108,176, 37, 60, 15,227,133,119,129,170,106,167,210, 51,119,238, 92,106,237, 14,112,  5,158,168,  2,  0,108,220,184, 17, 25,
+ 25, 25,120,255,253,247,113,226,196,  9,232,245,122, 84, 84, 84, 88,189,178,134,235,195,194,194,160,  5,192,195,181, 63,164,188,
+180, 84,238,155,122,243,174, 26, 20,205,117, 11, 56,203,103, 27,  9, 75, 75, 75,107,211, 61, 91,197, 31,  0, 92, 53,  2,114,114,
+114, 58, 89,196,127,238,215, 95,127,125,241,173,183,222,122,104,203,150, 45,232,211,167, 15,  0,160, 71,143, 30,168,171,171, 19,
+189,251,238,187,167, 15, 29, 58,244,109, 78, 78, 78,120,179, 68,  4,  0, 71,  9, 56, 86,108, 50,177,  1, 38,214,212,213,104, 50,
+246,230, 49,164,139,144,207,  8,196,  2,158,150,239, 33,172,245,244,230, 41,121, 98,202,138,121, 60, 79, 62,107,240,185,118,230,
+172,232,177,224,143,236,166, 59, 63, 63,191, 74,173, 86,115,205,133,249,135, 14, 29,122,217, 96, 48,180, 91, 89, 26, 58,116,104,
+187,113,241, 91, 19,238,207,231, 62,253,187,216,150,220,192,171,  3,251, 97,101, 70,134,211, 99,  1,172,222,191, 85,244, 27,121,
+ 41,137,137,217, 25, 25, 25,  0,128,192,193,157,156, 74,124,189,214,  4,149,134,133, 82,205,162,174,158, 69,173,138,117,250,  1,
+ 52, 55,242,223,214,203,183,125, 95, 88, 88,136,218,218,218,187,214,104,172, 91,183, 14,225,225,225,176, 14,250,179,237,235,151,
+ 74,165,116,221,186,117,208,105,181, 46, 27,  0, 82,169,148,110,216,176,  1, 37,165,165, 16,240,120,  8,237,212,169,145,248,223,
+127,255,253, 72, 73, 73,113,168,113,146,201,100, 36, 62, 62,190,145, 17,208, 52,146,225,232, 88,  5,131,222,  0,131, 94, 15,163,
+209,  0,150, 53, 53,136,191, 94,175,135, 70,163, 65,125,125, 61, 84, 42,231, 13,  0,219, 46,  0, 43, 92,245,252,183,165,109,  3,
+ 40, 80,101, 17, 26,106, 46, 68, 32,148,154,141,128,180, 52,164, 36, 39, 59,221, 29,208, 84,252,  5,  2,  1, 68, 34, 17,196, 98,
+ 49,196, 98,177, 75,247,221,168, 94,183,208, 37, 96,175, 75,107,198,186,237,160, 83, 35,112,107, 76, 52,  2, 17, 11,201,204, 79,
+193,150, 85,  2,126, 62,224, 87,111,197,143, 31,157,  6,120, 60,167,210,210,214,174,  0, 53,207,220,166,164,166,166,162,178,178,
+ 18,107,215,174,197,208,161, 67,241,222,123,239, 33, 58, 58, 26, 90,173,182,169,135,102, 53,169,239,170,240, 59, 42,208,174,118,
+  7,180,100, 72,184,194,147,156,156,220, 32,252,174,212,141,230,196,191, 65,108,248,124,176, 44,235,108,119,128,119, 94, 94,222,
+ 39,243,230,205, 59, 50,120,240, 96, 31,  0,120,231,157,119,144,159,159, 15,  0, 24, 61,122, 52,118,236,216,129,177, 99,199,122,
+ 62,242,200, 35,  5,217,217,217, 89, 60, 30,239,145,219, 27,122, 32, 32, 48,128, 43, 44, 44, 96,179,229,  7,247,246,238, 29,153,
+ 29,209, 35,252, 34,207, 91, 82,193, 35, 66, 53, 35, 18,104, 24,177,135,202,192,231, 25, 64,141, 60, 78,108,244, 86,149, 86,123,
+157, 56,116,110,100,144,127,232, 14,187,198,168, 77,159,255,206,157, 59,159,152, 62,125,250,215,214,176,191, 82,169,100,132, 66,
+ 97,155,203, 82,123,133,253,237, 70,  0,172, 94,254,240, 94,145,208, 85, 86, 66, 93, 98, 22,193,241, 22,239,208,217, 40, 64,225,
+ 47, 87,111,227,110,238,184,250, 66,185, 83,137,111,171,248,219, 10, 63,165, 20,221,186,117,107,244,153,209,104,108,120,213,214,
+214, 66,173, 86,163,166,166,230,174, 53, 30,214,121,254,251,246,237,107, 20,  9,176,138,255,144, 33, 67,160,211,105, 27, 26, 58,
+106,181,102, 28,108,152,214,124,182,  6, 70,163, 17, 93,195,194, 96, 52,153,154, 21,127,103, 26, 18,139, 17,112,155, 87, 98,157,
+186,216, 90, 36,227, 54,  3,192, 96,108, 16,255,147, 39, 78, 66,163,213, 66,165, 82,161,174,174, 14,181,181,181,141, 60, 59,103,
+ 97,237,  6,112,181,223, 31,  0,170,171,170, 81, 93, 93,133,170,234, 26, 84, 85, 87,163,186,186, 26,213, 85,102,143,180, 95,255,
+254,168,177,188,119,214,251,  7,128, 97,195,134,253,238,245,123,122,194,203,203, 27,222, 94,222, 80,169, 84,241,109, 41, 79,173,
+117,  9,216,251,110,193,251,115, 33,152,249, 41,  2, 17, 11,126,238,167, 48,110,127, 30,240,243,193,174,103,147,112,125,215, 53,
+ 60,184, 98, 19,192,191,203,203,138,232,174, 67, 18, 38,129, 90,173,134, 78,167,131, 70,163, 65,110,110, 46,150, 45, 91,214,236,
+229, 30, 30,214,  8,202, 85,167,197,219, 85,175,218,246,249, 54,125,222, 45, 29,183,197,200,104,174, 91,192, 25,158,132,132,  4,
+146,156,156,140,164,164, 36, 76,152, 48,193,229,200,196,151, 95,126, 73, 88,182,113,155,204,178, 44,156, 29, 11, 16, 27, 27,123,
+ 37, 57, 57,121,232,150, 45, 91,198, 31, 61,122,212, 59, 33, 33,225,132, 85,252, 45,142, 42, 68, 34, 17,189,126,253,186, 96,239,
+222,189,125,253,253,253, 79,198,198,198, 22, 52,199, 85, 87, 91,199, 69, 70,244, 81,141, 30, 61, 58,233,226,197, 95,239, 83,170,
+ 85,157, 40,107,100,193,192,200,234, 25,189, 94,175,215, 42, 81,174,228,244, 58, 85,105,113, 57,251,227,238, 61,203,131,  2,131,
+ 43, 12,  6,141, 93,247,189, 57,239, 95,161, 80,240,  1,192,199,199,167,195,118, 11, 48, 45,121,255,219,254,253,134,217,106, 46,
+ 47,107,244,153,179, 99,  1,166, 77,155, 22,191,230, 95, 31,  3, 48, 15,248,203,200,200,144,219, 78, 45,204,200,200,144, 79,248,
+230, 33,  0,192,153, 21, 63, 99,218,180,105,241,119,235,230,109, 43, 73, 73, 73, 73,131,183,111, 21,125,155,204,133, 74,165,130,
+ 78,167,179,105, 68,238, 94, 26,159,121,198, 60,246,195,200,178,184,120,241, 34,206,158, 57,131,161, 67,134, 66,167,211, 65,171,
+213, 65,167,213,226,219,111,190,129,245, 58, 71, 42,250,170, 85,171, 48,160,255,  0, 24,141, 70, 92,185,114,  5,172,209,128,210,
+146,210,118,125,166,214, 99,203,154,  5,  8, 15, 15,119,168, 97, 50, 24,245, 96, 77,230,176,255,241,227, 63, 67,173, 85,163, 94,
+165, 68, 93, 93, 29, 20,181,181, 80, 40,106,218,100,136, 89, 35,  1,109,241,112,142, 28, 57,  2,149, 74,  5,149, 74,105,249,175,
+ 66, 80, 96, 32,250,245,239,143,223, 46, 93,194,225, 35, 71,156,230,180,122,255,124,190,  0, 30, 30, 30,240,242,242,130,183,151,
+ 23,188,188, 60, 80,163,168,137,  7,144,125,167, 67,253, 45,225,124, 65, 53,140, 23,222, 69, 53,114, 64, 18, 87,130,196,254,  7,
+  5,239,207,197,212, 21, 95, 67, 44, 96,  0,  1,223,252,114,  1,174,118,  5,148, 78,249, 12,  1, 91,167, 64,163,209, 32, 32, 32,
+  0, 10,133,  2, 10,133,  2,199,142, 29, 67, 89, 89, 89, 67,152,184,225,250,210, 82, 60,235, 47, 65,144, 71,101,107, 30,112,188,
+173,168,218, 14,146,179,190,183,126,102,189,214, 21,239,220,209,238,  1, 71,197,223, 85,207,191,185,251, 77, 72, 72, 32, 19, 38,
+ 76, 32,109,185,223,166, 70,128, 43,226,111, 69, 80, 80, 80,222, 67, 15, 61,244, 72,106,106,106,223,243,231,207,199, 74, 36, 18,
+222,212,169, 83,137, 72, 36,  2,199,113, 36, 49, 49, 49,239,197, 23, 95, 28, 50,104,208,160, 93,255,252,231, 63,159, 48,153, 76,
+213,173,196,188,185, 95, 47, 93, 57, 57,104,240,144, 71, 79,158, 56, 49, 99,215,238,255, 45, 61,117,226, 68,167,139,249,191,137,
+175,148, 22,208,111, 63,254, 94,146,186,234,253,  1, 89,187,119,175,234,221,171,247,143, 94,161,158, 71, 98, 99, 99, 77,112, 48,
+229,  9,  9,  9, 56,121,242,100,212,186,117,235,222,213,233,116,130,247,222,123,239,131, 93,187,118,205, 46, 45, 45,189,187,194,
+209,214, 46,128,192,107, 69,168,177,132,254,109, 49, 62, 56, 24, 43,241,155,227, 94,135, 37,196,255,219,233,139,240,235, 27,132,
+  9,223, 60,132,140,199,126,144, 91,195,254, 86,241,183,122,255,206,204, 50,216,145,218, 62, 35,241,  9, 33,184,116,233, 18,172,
+133,181,105,152, 85, 32, 16, 64, 32, 16,160,178,178, 18,137,137,137,119, 61,147,172,163,254,215,173, 91,135,145, 35, 71, 66,167,
+215, 67,171,211, 66,103, 25,220,164,213,153,187,  1, 86,175, 94,109,183, 49,145, 74,165,116,197,138, 21, 48,153, 76, 56,125,250,
+ 12,  4,124,115,216, 54, 50, 50, 18,215,138,138, 80, 90, 90,138,173, 91,191,195,236,217, 15,227,224,193,131,212, 54, 18,208, 90,
+  3, 36,147,201,132,  0, 88,169, 84,202, 53,231,  1, 57, 51, 85,209,234,249,231,230,230, 66, 93,175,105, 48,192,148, 42, 37,148,
+202, 58, 40,149,245, 46,135,194,173,222,191,101, 37, 64,151, 12,129,217,179,103, 55, 58,142,  8, 15, 71,191,254,230, 65,113,191,
+ 93,186,132,107,150,136, 71,211,235, 28,193,152,123,198, 64, 36, 20, 65, 34,145, 64, 44, 22, 67, 36, 18,161,188,188,220, 97,241,
+183, 23,234,119,117,141,128, 25,203, 54, 96,  7,128,  7, 82,255, 15, 52,237, 85,144,148, 85, 56, 95, 80, 13, 18,224,143,171, 37,
+ 74,179,247,239,100, 23, 64,211,174,  0,167,167,  7,106,181,  0,175,160, 73,120,223, 44,244, 70,163, 17, 95,124,241,  5,198,143,
+255,125, 92,216,193, 39,195,128, 10, 13,250,238, 81, 32, 42,184, 71, 75, 13,120,118,147,190,111, 57,208,208,252,203,155, 94,235,
+138, 96,183,214,111,239,170,231,239,170, 33,113,167,239,215, 98,  4,180,121, 22, 64,120,120,248,214,177, 99,199,  6,159,203,203,
+ 75,209,106,181, 67,228,242, 67, 18,145, 88,196,103,  8,131, 67,135, 14,121, 15, 24, 48, 96, 83,114,114,242,127, 42, 43, 43,237,
+122,235,179,103,205,228,126,220,251,227,225,161, 67,135, 45, 52,176,250,  7,174,230, 95, 89,202, 21, 21,176,  0,168, 24,140,113,
+112,239,190,105, 33, 33,193,123,120,124,225,183,255,125,107,185,225,219,141, 27, 44,125,124, 45, 99,228,200,145, 31, 38, 36, 36,
+  0,  0, 42, 43, 43,145,149,149,229,243,213, 87, 95, 45,  5,128,147, 39, 79,142, 28, 56,112,224,190, 63,133,  1, 96,245,206,239,
+255,118, 75,235, 94,134, 19, 83,  2,173,214,111,244,194,209,  8, 28,220,169, 65,244,109, 67,255,103, 86,252,236,148,229,218, 94,
+115, 82,173,105,235,223,191, 63, 46, 92,184,208, 72, 88,106,107,107, 11,  0,244,106,238, 59,174,174,189,220,214,116, 54, 61,255,
+237, 55,223, 66,167,211, 65,111,208,195, 96, 48, 96,197,138, 21,176, 39,254, 86,112,156,  9, 98,137, 23,180, 90, 29, 46, 93,188,
+  8,190, 64,  0,163,193,  0, 15, 79, 15,108,221,186, 21, 60, 30,207, 58,119,190,213,123, 93,177, 98,197, 62,169, 84,106,144,201,
+100, 33,214,116, 54, 89,  7,192,169,208,230,194,133, 11,145,147,147,131,250,250,122,212,171,213, 80, 41,149, 22,241, 87, 66,165,
+ 84,161, 94, 85, 15,181, 77,131,239,200,179, 27, 62,124, 56, 61,117,234, 84,131,247,223,220, 52, 64, 71, 23,  1,138,139,139,187,
+ 45, 47,172,162,127,246,236,217,  6,111,222,209,123,142,137,137,161,214, 69,126,188, 60,188, 32,150,136,161, 82,169,226,109,250,
+176,157,106,120,239,212, 98, 64, 86, 35, 96,122,234, 87,160,219,129,160, 39,101,200,126, 41,  9, 99,151,111,  6,  4,  2,120,138,
+219,214,207,217,212, 16,  0,  0,121,142,189, 96,227, 45, 12,222,231,129,242,255,105,160, 88,242,251, 89,163,209,136,113,227,198,
+  1,  0,194,252, 37,248, 73,214, 13,239, 47,187,129,207,206,104, 91,101,179,245,248,  1,243, 64, 56,107,195,222,116, 80,156,179,
+211,226,108,199,239,180,213,243,111,174, 77,112,133,235, 78,222,175,173, 17,208, 30,229,111,224,192,129,159,168,148,170,189, 35,
+ 98,134,143, 84, 41,149,  1,172,137,213,135,134,134, 86,134,133,133,149, 43,149,202,243,149,149,149, 14, 55, 10, 83, 38, 79,225,
+  0,108, 61,122,228, 68,110,236,216,177, 63, 72, 36, 18, 95,  2,202, 17, 66,192,113,180, 78,171, 86,200, 47,231, 21,171,190,221,
+184,193,161,118,222,250,204,  0,243, 64,234,166,  3,245,150, 45, 91,246,159, 63,133,  1,144,152,152,152,221,150,  5,127, 28, 41,
+172, 86, 67,192, 42,252,237, 41,232,109, 73,219,224,193,131,113,242,228, 73, 84, 86, 54,132,  8,123,  1, 64,117,181, 57,162,244,
+216, 99,143,253,161,153,213,244, 25, 81, 74,233,163,143, 61,138,213,171,215, 88,250,204, 89,248,250,250, 18, 71,191,111,133, 68,
+ 34,182,242,153,189, 41,181,198,246, 59,  0,236,110, 54,209,127,197,138, 21, 87,164, 82,105,133, 76, 38,227,217, 14,  8,180, 76,
+ 11,116,184,161,179,206,125,143,141,141,109,247,103, 55,124,248,240,166,123,  1, 52,124,238,236, 10,128, 50,153,140,100,103,103,
+211,173, 91,183, 54, 90,168,199,202,237, 74,121,142,139,139, 35, 70,214,  8,163,202,216,174,247,222, 90,232,223,217,189,  1,102,
+ 44,219,  0,216, 44,252,115,239, 27,191,143, 75, 82,183, 83,122, 27, 69,  0,  6,182,110,124,150,198,150,162, 20, 64,244,251,254,
+ 88,114,186, 15,130,  1, 84, 22,168,209,187,119,111,  0,192, 39, 75,252, 49,105, 68, 48, 34, 38,229, 59,244,219,206, 76,117, 75,
+ 75, 75,147,183,182,236,177,189,246,166, 61,218,188,182,114,221,141,251,109, 79,140, 30, 51,250, 10,128, 43,183, 69,172,  3,  3,
+ 93,226, 27, 55,126,100, 17,154, 29, 21, 26,134,222,125,  6, 57, 99, 72,181,235,125,182,199, 34, 63, 46, 25,  0,119, 90,192,246,
+236,217, 19,151,177,162,227,237,  5, 96,173, 72, 35, 70,140,192,158, 61,123,116, 22,209,231,  0,120,220,137,200, 67, 59, 21, 18,
+ 34,147,201, 26, 60,251,214,196,255, 78, 98,225,194,133,182,241,212,134,  6,219, 58,141,208, 25,111,231, 78, 62, 95, 91,238,236,
+236,236, 54, 47,251, 27, 23, 23, 71,226,226,226,218,156, 46,123,107,251,183,  7,218,210, 37,176,104,209, 34, 20, 22, 22,182, 91,
+ 90, 28, 89,222,215, 89,156,121, 77,129, 51, 48, 15, 12, 29,159, 44,193,254,227,125, 16,234,225,133, 95, 79,221, 66, 95,  7,197,
+223, 94,249,235,168,203,225,182,199, 90,  2,127,166,251,237,128,207,191, 75, 59,243,173,186, 91,105,191,235,187,  1,222,169,  8,
+ 67,123, 26,  1,137,137,137,226, 63, 89,  1, 36,127,240,111, 91, 87,168, 97,173,  6,128,187,241,232, 56,104,107,151, 64,207,158,
+ 61, 73,207,158, 61,219,165,189,113,102, 31,  0, 87,113, 36, 77,139, 35,105,249,238, 58,235,134, 27,246,156,200,168,168, 40,234,
+126, 12,110,184,225,134, 27,110,184,241,247,  2,227,126,  4,110,184,225,134, 27,110,184,225, 54,  0,220,112,195, 13, 55,220,112,
+195, 13,183,  1,224,134, 27,110,184,225,134, 27,110,184, 13,  0, 55,220,112,195, 13, 55,220,112,227, 47,129, 70,179,  0,230,205,
+155,231,242,200,212,230,230,137,187,249, 58, 30,223,220,185,115, 93,226, 27, 54,108,216,109,124,103,207,158,117, 57,125,205,241,
+253, 89,242,195,217,103,184,126,253,250,187,146,190,246,206,143,187,153,191,246,166,137, 58,251,252,218,155,207,221,190,184,249,
+154,225,235, 10, 64,  1, 64,  8,160,182,163,165,207,105,  3,192,141,191, 62,214,175, 95,239,126,  8,127, 51,248,249,249, 49, 48,
+ 79,207,228,215,213,213,113,148, 82, 83, 71, 74,159,117,223,249,172,172, 44,218, 30, 11,205,180,215, 74,123,110,220, 57,236,218,
+181, 43,110,234,212,169,217,127,242,219,176,174,125, 37,113,214,  0,232,144, 17,  0, 55,254,122,160,148, 54,218,234,216,213,  8,
+192,218,181,107,237, 94, 51,113,226,196,184,204,204,204, 70, 43,139, 77,152, 48, 33,254,192,129,  3, 46, 85,244,244,244,244,102,
+249,146,146,146, 58,  4, 95, 71,  6, 33,132,244,  8, 13, 69, 81,121, 57,173,173,173,181,238,207,224,212, 18,131,182,198,226,169,
+ 29,171, 75,  8,193,115,178,189,121, 25,210,201, 67,190,161, 20,202,245,251,242,158, 91, 52, 99, 36,  1, 67,249, 10,149,142, 14,
+159,249,188,211, 91,114,102,101,101,197, 89,151,156,181,252,119,105,185,217,166,226,111, 45,247,109,221,104,167,185,239,186,202,
+217, 30,124,109,221, 50,216,149,104,201,157, 16,255, 61,123,246,200,167, 78,157,250,103, 55,206,172,251,176,223,209,174,244,119,
+222,120,129,241, 18,248, 50,122,177,144,211,215,106,249,245, 90, 37,251,193, 39,171,219,101,135,193,219, 12,128,246, 20,  8, 87,
+185,156,229, 35,132, 48, 22, 43, 76, 75, 41,229, 58, 90,250,218, 75, 96,219,195,  0,176, 54,234,182,105, 37,132,232, 41,165,162,
+182, 68, 10,  8, 33, 20,  0, 86,173, 90,213,104,199,176,  5, 11, 22,200,  9, 33,160,148, 18,103, 27, 37,  0,224,190,247,111,116,
+158,153,149, 41,207,204,204,116,186,  1,108, 79,190, 63, 67, 20,133, 82, 74,227,123, 69,208,248, 94, 17,  0,128,114,  3, 59,167,
+147,144,191,217,250,249,111,202,122, 81,153,  3, 27,167,  0,192,201,237,159,230,115, 28,194,238, 25, 19,228,243,193, 75, 99, 15,
+ 12, 25,226,119,253,185,229, 35,255, 11,  0,183,234, 52,255, 39,224,147,255,  1,228,226,220,185,115,  7, 58,251,108,154, 46, 69,
+219,150,229,102,109,197,191, 61,140,128,150,190,227,170, 88,182,  7, 95,114,114, 50,210,210,210, 28,186, 39,103, 34, 42,173,241,
+181, 87,100,198, 86,252, 57,142,195,250,245,235,177,121,243,102, 58,103,206, 28,226,100, 30, 11,101, 50, 89,187,172,151,189,120,
+241,226,185,169,169,169,174, 86,104, 31,139,231,175,190, 19,117,120,211,154,181,204,163, 97, 17,226, 23,146, 30, 23,134,244, 15,
+227,243, 73,  8,163,169,171, 99,197,  8, 53, 48, 93,186, 26,116, 55,175, 25,218,250, 27,124, 71, 26, 55,169, 84, 26, 12, 96, 56,
+128, 83, 50,153,172,178,131,121, 58, 62,  0, 18,  0, 76,  7,176,147, 16,146, 69, 41, 85,182,  3,239,119,148,210,135, 93, 21,216,
+142,  2,134, 97, 90, 53, 82,  8, 33, 35,  1,  8,  9, 33, 33,148,210,138,150,174,107,205, 64, 33,132,208, 23, 95,124, 17,221,187,
+119,191,109,187,208, 85,171, 86,197, 23, 23, 23,203,  9, 33,212, 81, 35, 64, 42,149,210,141,207,123,226,241,177,183,111, 46,195,
+125,239,143, 77, 63, 25,240,164,147, 94, 83,123,242,213,213,213,197,189,254,250,235,242,148,148, 20,196,199,155, 87,182, 59,119,
+238, 92,220,218,181,107,229,221,187,119,  7,199,113,208,106,181,136,139,139,195,196,137, 19,237,114, 10,235,212,113,125, 95,223,
+ 38,207,140,238, 26,223,233, 95, 19,178,  1,128, 45,103,227, 46,191,205,202, 77,221,125,160,228, 60,161,208,250,160,194,247,100,
+252,211,139, 66,236,122,199,189,186,117,234,212, 93, 40, 41,123,254,185,199,244,161, 18,161, 80, 89,163, 37, 43,190,218,178,249,
+141,103, 30,133,191, 68, 66,117, 70, 19,253,247,234,175,244,  0, 72,231,206, 65,252,242,242,106, 38, 42,170,249,157, 53, 71,132,
+ 28,136,188, 25,230,225, 23,123, 79,240,170, 97, 49,  1,130,141, 27,175,134,  7,  7, 73,170, 62,124,233,248,170,162,235,195, 76,
+147, 39,117,206,205,191,162, 42,126,242,241, 94,137,214,114,227, 76, 29,176,221, 32,167, 45, 94,104, 83,241,111, 90, 63, 93,225,
+239,136, 17,  0,139, 16, 83,171, 17,144,156,156,108,123,190,145,104,219,110,236,227,170, 81, 97,229, 73, 75, 75,107,115,148,192,
+ 86,252, 23, 44, 88,128, 83,167, 78,209,159,126,250,  9,115,230,204,113,150,202, 32,149, 74,  5, 50,153,140,109,135, 38,178,124,
+241,226,197,211, 83, 83, 83,119,186,240,221, 48,  0, 53,  0,194,  1,156,203,201,201,233,  1,224, 51,  0,  1,182,252,  0, 62,137,
+141,141,117,120,207,  5, 45,167,229, 27,170,244, 30,147,167, 78,247, 85,192,232, 43, 16,240, 69, 74,157,152, 47, 20,106, 89,158,
+143,167,222, 32, 49,106,249,229, 55, 85, 98,158,168, 86,103,210, 27,164, 82,105,139,245,183,205, 17,  0, 66, 72, 55,  0,159,  3,
+ 40,  5,240,162, 84, 42,253, 23,165,244,198,221,242, 96,237,136,116, 32,128, 77,  0,110,  2, 56,  6,224,  1,  0, 79, 19, 66, 30,
+167,148, 86,183,145,126, 22, 33,100,142,189,254,210,187, 25, 98,191, 67, 24, 13,224, 50,128,  8,  0, 21,196,162,212,142, 26, 52,
+ 19, 39, 78,140,  3,208, 72,252, 23, 44, 88, 32,183,141,  6, 88, 62,147, 79,156, 56, 49,206, 94,119, 64,122,122,122, 28,128, 70,
+ 98,205,204, 82,192,214,123,127,124,172, 16, 79,126,170, 70,122,122,122,156,189,240,125,123,243,  1,192,241,227,199,229, 98,177,
+ 24,185,185,185,141,246, 59, 96, 24,  6,111,190,249, 38,177, 54,118,187,119,239,150, 79,156, 56,209,110,  6,116, 58,126, 81, 78,
+197,  2, 12,169, 20,202, 43,126,223,138, 21,132,161, 24,242,166,129,  0,  6, 92, 56,114, 61,238,230,246, 41,114,224, 68,171,141,
+112,124,175,  8,218, 93, 40,193, 43,207,206,209,135,122,  9,133, 85, 23,114,136, 39,195,199, 11,227, 34,209,197, 79,130,235,185,
+ 71,137,214, 64,201,130,185,143, 25,226,123, 69,208,126, 30,222, 40,163, 85,100,216,176, 97,205,242,  5,  5,  9,239, 21, 10, 25,
+241,177, 99,101, 47,178, 38,221, 71,161, 93,123, 26,253,130,  4, 68,169,188,234,209, 51,194, 35, 40, 32, 64, 84,201, 81,165,254,
+199, 19, 21,234,121,227,254,152,  2,220, 52,236,111, 91, 55,157, 53,  2,172,215,216,142, 35,176,119,157,189,237,183,219,147,207,
+214,  8,144,201, 20,  0, 20,144, 74,253,209,156,104, 59,138,150,140, 10, 75, 68,166, 77, 81, 15, 91,241,223,189,123,183,156, 97,
+ 24, 48, 12,131,113,227,198,225,232,209,163,141,242,203, 81,152, 76,166, 60, 30,143,103,148, 74,165,124,153, 76,214,214,241, 44,
+146,234,234,234,239,  3,  3,  3,103,166,166,166,110,119,242,187, 90,152,247,139, 81,229,228,228, 12,  2,176,253,224,193,131,125,
+ 56,142,179,213, 40,240,120,188,135,  0,100,199,198,198,198,219, 35,204, 47,204, 23, 75,132, 98, 95,129, 64, 20,204,240, 73,103,
+202, 19,249,113, 60,158,136, 35, 12, 56,194, 55, 82, 30,175,158,199, 17,149,154,103,170,241, 20, 10,  8,175, 87,183, 58,241,212,
+ 16, 22,197,119, 46,  2,240, 17,128,131, 22,203,230, 89,  0, 31,173, 95,191,126,166,139,130,237, 15,224, 69,  0, 35,  0, 36,  2,
+216,  3,224, 36,128,143, 41,165, 10, 23, 40,143, 88,210,181,150, 82,202, 17, 66, 60,  1, 60, 97, 57, 63,176, 13,134,133,175,229,
+173, 39,  0,165, 51, 30,118, 11, 17, 20, 33,128, 55,  0, 44,149,201,100,  6,116, 44,140,  0,144,  3,160, 19, 33,100,171, 37, 79,
+190,105,106,208,180,100,160,100,102,102,202,109,195,254, 11, 22, 44,104, 56,182,125,191,106,213,170,120,139, 97,208,106,141,207,
+204,204,148,219,134,233,153, 89, 10, 92,217, 99,222,133,145, 73,252,166, 65,180,185,239,253,193,204,202,148,219,219,208,167, 57,
+ 62,107, 99,198,204,146, 82,103,249, 40,165,113,199,142, 29,195,156, 57,115,240,197, 23, 95,224,204,153, 51,113,209,209,209,217,
+ 77,175, 17,139,197,242,206,157, 59, 59, 18,171,143,235,124,236, 23, 92,158, 19,  7,175, 47, 46,128,148,105,226,104,103, 15, 11,
+ 31,177, 92,130, 56,129,174,187, 60,160,115,235, 91,217,198,247,138,160,115,255, 57,203, 16,234, 41, 20, 24,175,158, 18,250,  7,
+123, 19,121,153, 18, 51,163,186,161, 95,152, 31,132,181,151, 33, 87,105,209, 77, 32,130, 31,225,  9, 22, 63, 61,135,214, 11, 69,
+249,241,189, 34, 40,124,252,154,229, 84,212,170,  2, 70,142,244, 90,165,100, 71, 45,242,246,175, 20,233, 24, 79, 78,226,101,208,
+  7,  4,  5, 50, 30,126, 98,190,162,166, 76,164,172, 99, 33,168,211, 19,219, 50,211,154, 65,107,233,247,151,219, 19,206,228,228,
+228,120,123,227,  1,154,243,252,155, 26,  2,206, 24,  1,214,207, 90, 19, 99,219,243,246,132,177, 41, 31,221,230,127,123,123,147,
+162,128,163,124,173,133,251,219, 34,218, 77,141, 10,  0,  8,  8,200,106, 23,241,159, 55,111,158,185,251,141,227,240,234,171,175,
+226,163,143, 62,106, 16,255,181,107,215, 58,205,205, 48, 12, 12,  6,195, 89,161, 80,200,182, 67, 36,160,  6,  0,170,171,171,183,
+  7,  6,  6,198,167,166,166,202,157,248, 46, 31,  0,158,124,242, 73, 81, 78, 78, 78,102, 86, 86, 86,167, 37, 75,150,176,111,189,
+245, 86, 35, 93, 13, 12, 12,196,161, 67,135,226,  0,164,197,198,198, 38,183, 70,200, 35,  2, 31,  3, 75,187,112,156, 49, 66,200,
+227,245,160,132,132, 16, 62,159,240,121,188, 58, 66,136, 22,132,167,228, 40,252,169,129,243, 80,154,140,232,229,195,106,153,145,
+ 42,174,221, 12,128, 38,125,195, 97,  0,186, 81, 74,173,130,255, 62, 33,228,132, 84, 42, 13,163,148,150, 58,227,193, 18, 66, 30,
+179,136,245,  7,  0, 22,  1,120,212, 18, 66, 73,  6, 80, 76,  8,121,150, 82,250,141, 19, 34,253, 31,  0, 87, 41,165,107,  8, 33,
+ 34, 75,133,103, 41,165,159, 17, 66, 38, 17, 66,254, 67, 41,253,127, 46, 22,138,241,  0, 42,  1,220, 11,224,127,206,124,177,185,
+  8,128, 84, 42,125, 10,192,219,  0,202,231,206,157,187,174,131, 69,  0,  6, 90,210, 54,  1,192,100,  0,215,237, 25, 52, 45,193,
+ 86,240,109, 69,191,233,184,  0,135, 43,186,141,248,  3,192,149, 61,143, 53, 50,  2, 92,225,179,109,204,100, 50, 25,177, 53,  2,
+ 28,193,225,195,135, 97, 48, 24, 16, 19, 19, 19,255,211, 79, 63,201,139,138,138,228,209,209,230, 45,117, 57,142, 67,106,106, 42,
+173,175,175,135, 64, 32,192,140, 25, 51,236,222,183, 46,247, 36, 24,  3,139,218,152,240,120,193, 79, 55,229, 87, 55, 28, 70,175,
+ 55, 38,155, 69,139,163,200, 75, 21,210,154,122,111,104,  5, 94,152, 48,239,138,253,231,200,240,234, 43, 47,228,250,234,244, 38,
+198, 87, 34,162, 73, 81,221,225, 35, 17,144,146,234,122,120, 50,124,164, 12,235, 78,143,255, 90,129,159,255,183, 15, 61, 60,189,
+232,121,149,242, 58,128,190, 45,209,229,158,237,242,220,232, 97, 85,135,189,248, 17,172,144,189,213,107,252,152, 20, 47,157,193,
+115, 10,207,235, 36,163,172,173,241, 40,186,116, 50,194,104,184, 84, 89, 88,160,246,177,212, 25,187, 66,229,168,119,106, 29, 31,
+208, 82,255,115, 75,222,180, 61,175, 82, 42,149, 82, 87, 67,166, 29,  9, 77, 61,127,179,120,  3,105,105,237, 55, 72,176, 61, 60,
+127, 74, 41, 88,246,119,141, 30, 59,118, 44,142, 30, 61,234,146,248, 91, 96, 20,  8,  4, 38,142,227,142, 49, 12, 99,108,163, 17,
+ 16, 98,125, 83, 93, 93, 45, 15, 12, 12,148,166,166,166, 58,186,115, 86, 81, 74, 74,138,207,225,195,135, 83,179,178,178, 58,125,
+253,245,215,220, 19, 79, 60,193,223,178,101, 11,222,121,231, 29,228,231,231,163, 71,143, 30, 40, 47, 47,199,187,239,190,107,122,
+251,237,183,147,  0, 60, 27, 27, 27,251, 89,139,140, 28,235,107,  2,211,131,112, 24,104,  4, 23,233, 33, 16,  9,133,124,166, 76,
+ 44,224, 41,121, 18, 97,149, 72,196,171,215,155, 56, 15,190,145, 31, 96, 96,245,166,107,103,206, 42, 30, 11,254, 72,115, 28,174,
+233,135,189,  8,192, 36,  0, 57, 77,  6,142,229,  0,152,180,126,253,250,175,156, 16,235, 71,  0,188,  4, 32,188, 73,104, 94,  1,
+224, 23, 66,200, 39,  0, 14, 16, 66, 76,148,210, 45, 14,240,121,  0, 19, 92,166, 19,  0,  0, 32,  0, 73, 68, 65, 84,152,107,245,
+242, 41,165,250, 38,151, 60, 14,224, 87, 66,200, 74, 74,169,198,149,240, 63,128,175, 44,255,157, 50,  0,154, 10,166, 84, 42,253,
+  7,128,231, 44,207,114, 21, 33, 68, 47,147,201, 54,116,132,  6,132, 16,210,219, 18,194,250, 17, 64,  6,  0,107, 62,193,209,  8,
+192,223, 13,165,165,165,242, 81,163, 70,129, 16,146, 61,106,212, 40,252,240,195, 15,120,232,161,135,226, 58,117,234, 36,103, 24,
+  6,139, 23, 47, 38,150,198, 36,110,235,214,173,114,189, 94,143, 17, 35, 70,180,216,208,141,185,118, 83, 94, 62,170, 63, 64, 72,
+246,175,161,166,248,129,231,  2,228, 58, 14,241,230, 46,  0, 96,200, 98,  3,  1,170,161,174,174,139, 59,180,181,183, 92,237,125,
+ 34,254,225, 39,124,154,245,138, 75, 12,236,202,245,235,183,188, 26, 28, 36, 41,170, 83, 27,124,195,253, 61,  5,201, 67,123,122,
+ 12, 11, 23, 17,157,198,  4,141,150,195, 85,162, 53,101, 20,149,106, 10,202,235, 77,157,132,226,178,114,131,110,226, 13,189,241,
+  3,111,224,149,230, 56,125,252,195,186,106,235,175,116, 25,144,112, 31,115,241,120,217,248,210,223,126,184,209,123,248,220, 16,
+ 94,255,168,146,179, 71,191,175, 35, 60,159, 17, 28,199,213,220,186,165,181,107, 69, 53, 21,108,123,199, 86,111, 54, 45, 45,173,
+ 69,193,182, 13,175, 55,141,  4, 56,114,253,159, 21,  9,  9,  9,196,214,235,183,133,109,  8,191, 45,104, 15,158,250,250,122, 57,
+  0,240,249,124,188,252,242,203, 56,117,234, 20,126,250,233,167,182,210,234,  1,152,244,122, 61, 91, 90, 90,154, 25, 22, 22,102,
+180, 23, 89,108,  5, 42,219,131,234,234,106, 89, 96, 96,224,131,169,169,169,142,180,251,190, 58,157,174,207,194,133, 11,167,206,
+155, 55,143, 14, 30, 60,152,  0,104, 16,127,  0, 24, 61,122, 52,118,236,216,129,177, 99,199, 50,143, 60,242,  8,205,206,206, 94,
+195,227,241,180, 30, 30, 30,208,104,110,151, 38,142,163,186,108,249,193,244,222,189, 35,139, 35,122,132, 95,225,121, 75,202,120,
+ 68, 88,199,136,  4,117,140,216,163,194,192,231,105, 64,141,  2, 78,108, 12, 81,149, 86,  7,157, 56,116,238,205, 32,255,208,183,
+ 92,125,144,173, 70,  0,164, 82,233, 68,  0,155,155,120,181,135,  0,204,153, 59,119,238, 87,142,120,176,132, 16,158, 37,252, 61,
+173,165,126,121, 74,105, 53, 33, 36,  5, 64,  6, 33,228,123,  7,230, 41, 63,  2,224,  0,165,180,174,  5,190, 58, 66,200,  1,203,
+117, 95, 56, 41,138,247,  1,  8,  4, 48, 31,192, 86, 66,200,125,148,210, 67,174, 68,  0,  8, 33, 73,  0,222,  7,208,131, 82,170,
+ 38,132,140,  6,112, 93, 42,149,170, 40,165,233,142, 70,  0,164,102, 83,223,145, 70,139,200,172,110,128, 99, 24,  3,224,  4,165,
+148, 18,179,219,116, 29,128,154, 16,210,205, 58,206,195,153,  8, 64, 83,143,191, 45,222,127, 67, 88, 62,241,155,134, 40, 64,100,
+ 27,188,255,223,195,252,191,135,111,165, 82,231,188,127,163,209, 72, 79,157, 58,  5,111,111,111,228,229,229, 81,147,201,  4,165,
+ 82,137, 75,151, 46,201,  3,  3,  3,209, 36,236,151, 61, 96,192,128,248,109,219,182,201, 71,140, 24,209,124,184,207,104,164,221,
+ 78, 93,128,208, 59, 12,130,188,106, 26,106,242,134, 74,201,192,116,169, 30,  8,108,188, 35,181,103, 32,155,221,125,248,233,248,
+125,219,103,201,129,189,205, 54,118, 87,110,220,120, 45,178, 91, 55,160, 74,251, 42,  0,228,107,149,216, 45, 42,173, 28,112,239,
+248,224,  1,134, 60,252,114, 93,129,221,231,110,241, 11, 42,235,125,  0,160,220,160,243,191,161, 55, 38, 23,148,150,238,136, 10,
+ 14,110,214,  0,184,119, 74, 10,227, 33,156, 56,152, 85,255, 82,220,189,127, 66,159,186, 27,219, 13, 87,127,201,172, 53,114, 94,
+183, 42,138,127,174, 80,214,120,142,  0,195,144, 26,149,206, 87, 58, 43,186,155,236,251, 51, 55, 90, 42, 51, 50,153,140,216, 70,
+  0,108,189,203,166,225,118,171, 72, 39, 39, 39, 35, 33, 33,129, 52,183,208, 73, 91, 70,227,187,186,112, 74, 71,131,181,186, 75,
+165,254,183, 69,  4, 92,141, 42,164,165,165,181,139,248,111,222,188,153, 30, 57,114,  4,116,155, 63, 72,138,  2, 31,126,248, 33,
+ 40,165, 96, 24,  6,235,214,173,115, 57,178,160, 80, 40,244,  1,  1,  1,241, 71,142, 28,217, 59,126,252,248,201,205,149, 31, 39,
+224,103,169,175,115,171,171,171,215,  7,  6,  6, 62,  6,160,102,241,226,197,255, 72, 77, 77,181,231,168,213,237,218,181,171,116,
+223,190,125, 95,197,199,199, 63,213,175, 95, 63, 36, 36, 36,208,172,172,172,134,116,100,100,100, 64, 36, 18,225,250,245,235,216,
+187,119, 47,233,210,165, 11, 27, 27, 27,251,211,165, 75,151,154, 37,140,140,232, 83,166,213,234,230, 30, 57,114,100,125, 96, 80,
+160,210,215,199,167, 24, 66,161,158,213, 51,245, 44, 79, 95,171,227, 43,171, 60,245,158,226,155, 21,149,190,135,246,237, 93, 63,
+ 96,224,160,247, 13, 58, 77,125,187, 24,  0, 82,169,148, 72,165, 82,107,226, 59, 89, 94,135, 45,211,236, 26,162,160,  0, 22, 16,
+ 66,186,192, 60,194, 17,  0,154,181,208, 45,162,242,  2,204,  3,244,174, 53,225,105,138,107,150,235, 94, 32,132,124,212, 10, 31,
+  1, 48,  3,192,114, 59,124, 95,  3, 88, 68,  8,249,202, 78,250,108, 11, 77, 56,204,227, 29, 98, 96,238,251,127, 19,192,105, 66,
+ 72, 47,  0, 69,182, 54,134,  3,124, 15,  3,120,218, 34,178, 90, 75, 90,181,150,227,117,132, 16, 33,128,239, 90,227,179,228,197,
+ 99,  0,230, 57,106,  0, 72,165,210,181,  0,190,105,137,207,194,185, 18,128, 55,  0, 95,  0,187, 44,105, 19,195, 60, 79,252, 23,
+  0,163,  8, 33,243,  1,252,  4, 96,119, 75,233,  3,204,243,232, 91,232,235, 71,211,177,  1, 19, 38, 76,176,107, 12, 76,152, 48,
+ 33,158,153,245,123,191,189,213,  8,176,190,183, 13,231,187,204, 55,235,246, 41,129,142,240,157, 59,119, 14,221,187,119,199,203,
+ 47,191,220, 80,102, 54,109,218, 68,115,115,115, 49,101,202,148,219,174,247,240,240,144,139,197,226, 22,249,194,207,157, 67,109,
+247,206, 56,254,242, 83, 13,124,151, 95,219, 17, 23,145, 91, 39,103,166,136,111, 75, 75,113,190,  1, 34,113,235,179,159,174,150,
+148, 44, 68,215,174, 63,  3, 24, 77, 65,121,184, 86,249,178,134,101,193,234,204, 65,178,139,149,149,184,166, 51,108,226, 19,162,
+  2, 33,198,171, 37, 37,233,  0,208,210, 32,192, 46,225,253, 22,  2, 88,145,127,244,197, 34,113,232, 12, 69,105,185,184,107,121,
+201, 73, 49,  4,  1,189,139,174,155,194,170,203,111, 64, 40, 20,132, 12, 12,245,124,164, 86,101,252, 22,192, 13,123,158, 43,128,
+184,166,211,255, 90,240, 64,227, 93, 89, 19,160,185,254,255,191,  3,218, 58, 85,207,250,253,180,180, 52,218, 86,190, 45, 91, 54,
+211,236,236,108,144,116,179, 97,124,224, 45,111, 76, 92,162,194,248,241,227,225,204,180,191,230, 16, 16, 16, 16, 15,  0,247,220,
+115,143,166, 29,186, 41, 20,129,129,129,115,  0, 88,157, 83,125,106,106,234,110,  7,191,203,  2,168,200,200,200,144, 63,244,208,
+ 67,195, 83, 83, 83,135,152, 76, 38, 34,145, 72, 48, 97,194,  4,236,223,191, 31, 28,199, 33, 49, 49,145,190,248,226,139, 36, 42,
+ 42, 74, 63, 99,198,140, 30, 53, 53, 53,183,116, 58, 93, 75,138,204,254,122,233,202,166, 65,131,135,248,158, 60,113,226,253,179,
+124,254,160,158, 61,122,126,233, 19, 24, 92, 34,  8, 22,211,195,123, 15,249,215, 40,170,199,133,  5,  4,191,221,167, 79,159,195,
+ 94,161,158,107,251,119,141, 49,228,229,229,181, 75,  4,128,  7,243,116,191, 88,  0,239,  1,120,222, 34, 60,158,182,245,  9,230,
+ 65, 98, 87,  1,252,219,210, 37,112,170,  5,126,  6,230, 65,102,  7,  0,120, 56,144,158, 99,  0, 38,162,229,133, 21, 24,  0,193,
+  0,122,  0, 56,109,135,243,180,229,186, 16,180,220, 55,201,192,188,140,163,191,165,219,224, 33,139,112,231, 91,184,243, 45,199,
+ 91,  0,252,  0,243,140,  3,  5,  0,131, 29,190, 89,150,200, 67, 63,139,145,100,155,206, 50,  0, 82,  0,191, 89,174,253,222, 14,
+223, 75, 48,207,110,112,164, 43,195,  3,192, 62,  0,155,237,228,199, 76,  0,255,181,252, 63,107,147, 62,129, 37, 47,211,  0,124,
+ 10, 96,137,229,243,178,150,126,240,192,129,  3,217,132, 16, 20, 23, 23,203,173, 51,  1,154,122,253,197,197,197,114,235,181,246,
+110, 32, 41, 41, 41, 59, 51, 51, 19,155,126, 50, 52,140,220,111,234,165,111,250,201,208,112,237,221,228,203,205,205,197,184,113,
+141,135,186,135,135,135,199,111,219,182, 77,222,179,103,207,120,142,227,228, 75,151, 46,165,214,105,128,132, 16, 12, 31, 62,188,
+ 69,163,162,111,110, 46,190, 11, 12,137,247,177, 57,215,127,254, 68,168,223,191,  1,220, 31,  2,202,  1,121, 75,  5,180,158,243,
+ 66,141,214,  7, 10, 50, 12, 67,199,237,138,111,173,216, 91,102,112,108,  7,176,189,119,143,176,190,  0, 94,214,155, 56,164,231,
+ 21, 97, 92,168,185,187,147, 80,170, 82,177,236,123,183,110,221,186,229, 64,153,122, 31,128,103,254,111, 53,143,214,158,222, 22,
+ 84, 81, 86,131,138, 91, 42,240,249,213,158,245, 10,138, 90,165,137,134,  4, 11,253,248, 28,166,107,245,166,239,150,188, 28,235,
+ 23,210,255,137, 90, 59, 66,147,109, 79, 92,218,220,135,157,176,205,252, 63, 43,197, 73, 15,248,206,206,  2, 32, 41, 10,180,133,
+175, 37,143, 61, 38, 38,166,195, 24, 34, 13,131, 29,173,226,159,199, 98,131,220, 92,199,218, 42,254,214,178,241,236,179,207,  6,
+243,249,252,138, 99,199,142,125,121,207, 61,247,180,101,138, 98,247,212,212,212, 53,150, 40,192, 44,203,140,128, 89,169,169,169,
+223, 59, 18, 84,  4, 80, 15,160, 42, 60, 60,124,232,216,177, 99, 75,207,229,229,117,214,106,181, 68, 46, 63,  4,145, 88,  4,134,
+ 48, 56,116,232, 16, 25, 48, 96,128, 38, 57, 57,121, 84,101,101,165,221, 58, 55,123,214, 76,246,199,189, 63,126, 58,116,232,176,
+158,  6, 86, 63,249,106,254,149,167,185,162,130,167,  0, 64, 12,134, 14,238,221,247,100, 72, 72,112, 54,143, 47,124,237,191,111,
+ 45,175,255,118,163,235, 61,202,205, 25,  0, 47, 91,172,161, 41,  0, 46,  1,240,106,230,123,123, 44, 30,123, 18,128,145, 22,241,
+108, 54,202,  9, 32, 18,192, 86,  7, 13,128,106,203,245,188, 86,248,226,  0, 92,113,144,239,138,229,250, 29,173,240,205,  5,240,
+ 36,128, 11, 48,207, 80,184,214,132, 91,110,241,254,159,179,120,195, 27,129, 22, 71, 92,240, 44, 30,251,227,  0,162, 44, 81,132,
+230,210,169,180,124,190,206, 98,  4,108,108,133,239,107,139,209,229,200,253, 82,203,245,173, 61,191, 15, 44,145,141,  3, 22,163,
+  6, 77,184,247,  3, 24, 96,201,139,124,139, 33,213,173,213, 31, 53,247, 32, 80,  0,242,230, 22,  2,178, 94,227, 76,  5,127, 82,
+ 42,165, 79,126,170,110,102,225, 30,133,211,  2,209, 94,124, 47,188,240,194,109,215,140, 31, 63, 62,123,252,248,241,  4,  0,238,
+187,239, 62,167, 26,161, 61, 47,188, 64,124,154,182, 40, 61,188,178, 37,171,251, 19,  0, 24, 40, 19, 16,115, 80,198, 58, 50,251,
+186,131,197,192,146, 47, 38, 90,  4, 62,192,171, 71,131,248, 91, 92,228, 91, 98,177,216,209,217, 40,  4,192, 59, 71,179,206,122,
+132,118,237,241, 32,  7,143,200,146,226,114,158, 81, 87, 75, 59,133,120, 17, 47, 79,  1, 97,141, 28, 20,181,  6,150, 72,136,164,
+ 78,197,246, 14,105,217, 33,104, 86, 44,154,190,255, 35,151,239,189,211,179,  0,218,202,215,146,199,222,179,103,207, 14, 35,254,
+220,247,254, 56,144,103, 30,147,183, 81,110,192,119,199, 12,160,148,182, 75,190, 90, 57, 76, 38, 83, 53,  0, 68, 71, 71,183,105,
+ 65, 32,171,248, 91, 80,101,249,239,104,221, 16, 90, 28,179, 51,  0, 48,112,224,192, 48,149, 82,181,104, 68,204,240,199, 84, 74,
+165, 47,107, 98,141,161,161,161,183,194,194,194,174, 40,149,202, 37,149,149,149,249,142,166,107,202,228, 41, 44,128,231,143, 30,
+ 57, 49, 54,118,236,216, 41, 18,137, 36,136,128,154,  8, 33,224, 56, 90,173, 85, 43,214, 92,206, 43, 46,251,118,227,134, 54,173,
+  8,216,212,  0, 48,  1,248, 71, 43,  2, 98,139,147,150,151,201,242,106, 14, 38,152, 71,212,243, 28, 76,143, 28, 64,150, 29,190,
+ 12,152,  7,173, 57,130, 71, 29, 72,223,122,  0, 95,218,225,249, 21,230, 41,144,112,128,239, 27, 75,196,192, 30,138, 44,158,189,
+ 35,233,227, 57,145,167,235,237,240,221,239,  0,159, 53,218,176,209,242,108,236,206,181,165,148,146,137, 19, 39,198, 89,  5,223,
+ 54,  4,239,202, 82,192, 50,153,140,164,167,167,199, 49,179,218,103,233,222,246,230,251, 51,160,160,228,166, 62,178, 91,183,141,
+243,222, 95,247,164,245,156, 65,192,108,214,105,184,125,229,197,197, 42,135, 10,211,250,245,180,234,244,  6,178,252,251, 95, 22,
+238, 94,125,223,206,227, 39,202,158,  9,246,229,166, 50,  1, 62,126,148,  2,132, 80,189,158,229,202, 57,160,202,160,231,252, 74,
+203,180,134, 72, 39,210,152,156,156, 28,111,219, 29,144,156,156, 28,223, 81,158, 95, 71, 92,  9,240,207,130, 73, 75, 84,119,244,
+ 30,101, 50, 25, 39,149, 74, 59,139,197,226,178,232,232,232,251,219,131, 51, 53, 53,245, 96, 96, 96,224,147,169,169,169, 27,157,
+ 48,  0, 88, 75,228, 20,  0, 48,122,204,232,229,  0,150, 55,189,176,233, 24, 33, 71, 49,110,252,200,159, 96,238,138,109,130, 48,
+244,238, 51,168,205,247,220,156,  1,160,115,129,135,182, 18, 34,209,187,249,254,178,124,141, 96, 17,250,118,171,232, 73, 73, 73,
+217,246,230,229,255,145,124,127,  6,212,104, 52, 79,  1, 30, 70,  0,193, 28,104,169, 78,103,216, 82, 94, 94,121,158, 82,234,240,
+180,169,160,152,127,208,140, 15, 39,147, 91,158, 15,231,118, 29,139,220,172,175, 62,120, 57, 32, 64,180,136,207, 35,180,172, 90,
+119,185,204,192,110,146,  8, 24,177,132,207,227, 25, 89, 78,236, 76,250,172,125,252,214,129,103,174,238,  3,112,219,212, 63,155,
+208,191, 43,139,205, 52,245,204, 29, 57,127,183,249,238,182,225,227, 40,152, 89, 10, 16, 66, 48,117,218,239,  3,162,247,236, 61,
+211,208,134, 36, 78,142,110,175, 41,138,229,237,217,222, 88,140,128,141, 78, 92,238,111, 49,  0,212,127,214,246,129,223,228,129,
+ 82, 71, 27,251,166,104,110, 20,187,155,239,175,205,231, 70,199, 71,117,117, 53,133,185,155,171, 77,184,229, 57,157,  2,192,209,
+205, 31,147,132,167, 94,249,240,241,185,121,159, 62, 63,251,216,  0,131,154, 68,  4,  8,248, 65, 32, 68,227, 37,225, 87, 14,234,
+231,147,239, 44,119, 66, 66,  2, 73, 75, 75,115,121,189,249, 59, 37,158,127,150,  8, 64,199, 51, 30,204,177,161,191, 65,245, 10,
+179, 56,204,222,248,147,238,  6, 72,162,162,162,254, 30, 67,100,221,112,195, 13,240,121,128,135,136,128,227,204,109,116,189,214,
+ 93,253,221,112,227,111,219, 30,184, 31,129, 27,110,252,125,192,154,  0,165,198, 42,250,110,241,119,195,141,191, 51, 24,247, 35,
+112,195, 13, 55,220,112,195, 13,183,  1,224,134, 27,110,184,225,134, 27,110,184, 13,  0, 55,220,112,195, 13, 55,220,112,227,175,
+136, 70, 99,  0,230,205,155,231,242,200,205,230,214,214,110,142,239,127,223,127, 30, 55,104, 72,111,121,231,174, 97,241, 42,173,
+ 90,126, 88,158, 27,159, 52,235,217,108, 87,249, 86,127,181, 61, 46,106,200, 40,249,173,210, 82,120, 74, 60,113,163,164, 32,254,
+ 95, 79, 77,115,153,175,189,239,247,194,225,121,113,163, 71,245,148, 75, 60,121,224,243, 24, 16, 49, 65,153,242, 69,226, 42,223,
+153, 91, 67,226, 70,140, 26, 33,247,245,226,  1,124,160,230,220,122,226,104,250, 34, 39, 69,186,124,191, 87,246, 95,185,141,111,
+228,200,145, 46,243,157, 56,113,226,118,190, 72,215,211,119,226,202,237,233, 27,213,167,143,203,124,199,243,243,255,116,124,147,
+ 90,201,223,229,203,211,232,162, 69,201, 45,126,190,191,153,252,141,124, 96,146,235,229,101,223,254,219,203,243, 36,215,203,203,
+242,204,106,234,195, 21, 52, 58, 23, 20,249,176,203,124, 85, 87,190,187, 45,125,103,223,184,238,114, 67, 58,108,105,143,219,206,
+125, 24, 84,234, 50,223,203, 85, 97,248, 35,218,171,191, 59,159, 84, 42,229, 55,183,179,160, 35,124,251,247,239,  7,  0, 40, 20,
+138,  8,157, 78,167,120,242,201, 39,107,255,200,251,117,218,  0,104,  9,186,173,210, 72,  0, 61, 97, 94, 39,160, 64, 60, 91,118,
+205,209, 31,216,254,205,242, 56,  2, 14,193,126,  1,200, 61,124, 70,254,245,215, 31, 35, 54, 33, 22,172, 90, 35, 31,208,111, 60,
+ 56, 14,242, 95, 35,190,142, 31, 54,108,  8,174, 94,189,142,186, 90, 53,  6,143,153,147,221, 18,223,250,111,229,113, 20,  4, 61,
+122,247,148, 75, 95, 89,130,234, 79,182,227,155,207, 63,  3, 32,198,158,243, 37, 96, 24,200, 63,126,231, 45,228,231, 95, 70,120,
+120, 15,136, 36,124,220, 44,201,111,113,113,145,194, 29,159, 81,161, 80,  8,137, 68,130,130,130,  2,116,  9,241, 65, 16,223, 11,
+ 93,186,251,193, 95,226, 11, 79, 98,  2,195, 48,160,156,  9, 26, 17, 31,117,183,234, 80, 49,220,254, 92,242,186,130, 53,212, 91,
+ 82,135, 49, 35,122,193,203,147, 15,161,132,  1,159,  7, 48, 66, 62,250,134,125, 78,141,148,135,194,155, 79, 57,156,225,171,247,
+234,226,194,194,194, 16,123, 79, 87,185, 86,167,  7, 35,146,  0, 70, 32,175, 62, 58, 78,171, 81, 99, 84,200,229,236, 63,202,138,
+ 92,191,126, 61,157, 59,119,238,223,106,126,125, 71,133, 61,161,111,227,245,158,  0, 70,116,146,120,252,183,180,180,180,159, 64,
+ 44,  2,231,225,177, 12,230,149, 49,235, 59,202, 51, 40,248,117,111,220,181,139,135,111,219,107, 32, 33,121,217, 95,165,140,146,
+111, 54,109,250, 77, 36, 20, 74, 56,142,243,245,244,242,242,122,112,234, 84, 15,152, 87,176,235,168, 35, 59,173,209,102,174,173,
+ 68, 82,169,212,199,215,215,119, 65,223,190,125,103,136, 68,162,174, 37, 37, 37, 37,165,165,165, 39, 12,  6,195, 82,153, 76, 86,
+224,  2,159,159,191,191,255,146,251,238,187,111,242,179,207, 62, 27,254,197, 23, 95,220,186,112,225,194, 49,157, 78,247,174, 76,
+ 38,187,224,  8,199,254,253,251,241,227,200, 29, 24,179,247,222, 21,225,225,225,175,121,122,122, 98,251,246,237,167,103,206,156,
+ 57,252, 79, 19,  1,104, 65,252,121,158, 34,254,136,199,198,246, 90,201, 81,170, 59,122,249,214, 39,151,182, 74, 15,136,103,203,
+ 46,218,251,110,242,212,222,116,234,125,203, 97,172,175,  5,223,196,224,151,139,151,241,196, 19, 47,254, 94, 34, 24,224,231,220,
+141,  8,234, 30, 38,231,234,149, 48,112,  4,135, 14,229,198,151,104, 91,202,168,165, 20, 66, 95, 16, 15, 31,156,185, 88,140,243,
+ 23,255,129,175,190,219,223,240, 57,199,  1, 15,140, 25,  3,212,151,  3,240, 70,193,133, 75, 16,  4,249, 33,118,244, 32,121,173,
+166, 21,155,133, 48,  0, 97, 16, 53, 36, 26,157, 60,133,232, 18, 36,134, 79, 96,  0,252, 69,222,240, 23,243, 32,224,241, 96, 52,
+153, 80,203,114, 56, 89,117,218,238, 67, 45, 63,191,132,  6,248,  2, 62, 30, 30,  8, 14, 10,132,143,143,  7, 40, 99,  2,203,213,
+195,  4, 19,188,188, 60, 16,212,169, 43,122, 70,254, 68,179, 14,143,109,181, 81, 90,151,105,160,190,222,158,232, 25, 17,130,224,
+160, 64,168,213,106,  8, 69, 98,  8,116,230,197,249, 34,194,123,200,107, 20,181,248, 62,183, 40,190,184,228, 38, 20,229,215,177,
+244,217,232, 86,141,129,180,229,105, 14, 55, 18,  9, 79, 38,196,251,135,250,103,183, 38,254,119,195,  8,120,227,253,247, 41,  0,
+ 44,125,237,181,118,249,141,197, 43, 86, 80,  0, 72, 93,184,208,101,190, 31,115,114,158, 48, 24, 12, 27,  1, 96, 70,124, 60,227,
+ 74,227, 43,219,182,205,188, 70,188,205,180,105, 74, 41,  8, 33, 13,255,173,231,172,215,205, 77,110, 89,176, 23, 45, 74, 38,142,
+138,186,147,226, 63,192,211,200,110,247,246,243,237,  7,  0, 66,137, 24,  6,173, 14,156, 90,179,226,216,145,195,239,220, 59,115,
+102,127,  0,197,246, 72,244, 60, 33,133,121,241, 20,214, 34, 10,156,165, 29,106,182, 45, 26,122,239,100,252,118, 40,195,169, 60,
+186,118,241,176,188,247,160,184,248,240,254, 15, 56,111, 20, 39,215, 56,117,121, 74, 74, 10,182, 37,103,181,122, 77,124, 86,227,
+173, 72,  6,248,153,111,181, 66,199, 65,203,154,243, 85,109,249, 47, 27,229,135, 62,222,130, 86,249, 86,174, 92,153,253,198, 75,
+175,134, 76,155, 49,221, 75,167,211,226,227, 15, 63, 96, 86,175, 94,173,155, 63,127,126, 24,128,155,237, 93,247,246,237,219,151,
+176,115,231,206, 76,192,185, 53,  7,114,115,115,105, 81, 81, 17,170,171,171,161, 82,169,224,237,237,141,192,192, 64,132,135,135,
+ 99,204,152, 49, 46,213, 59,169, 84, 58, 62, 58, 58,122,211, 43,175,188,114,181,111,223,190, 27,135, 13, 27,118,233,214,173, 91,
+ 93,115,115,115,163,159,122,234,169,221, 82,169,116,133, 76, 38,251,202,  9,190,248, 25, 51,102,164, 45, 95,190, 60,208,104, 52,
+ 66, 34,145,192,211,211,179,179, 90,173,158, 57,109,218,180,  7,165, 82,233,124,153, 76,246,121,107, 28,207, 43,164,192, 72, 96,
+202,137, 25,240,236,238,217,101,209,162, 69, 56,117,234, 20, 85,169, 84,126, 54,191,  3,  0,188,153, 51,103,154, 38, 78,156,120,
+ 87,196,253,220,185,115,141,142,155,219,208,141,223,130,232,119,  3,208, 11,230, 37, 99, 77,106, 61,123, 35,247, 74,197, 71, 99,
+ 34, 67, 94,188,111, 64,231,119, 58,249, 74,186,200,183, 74,183,  2,184, 44,158, 45,107,113,147, 26,125,125, 13, 58,245,190, 31,
+ 75, 94,155,129,141,178,223,235,226,225, 99,235,160,214,232,145,152,240, 34,238,137,125, 18, 15,167,220,  7,137, 68,  4,131,137,
+133, 74, 99,144,247, 25,221,187,133,194,113, 29, 48,  0, 51,230,172,197,191, 94,121,166,225,236,  3,247,196, 65, 44, 22,225,135,
+ 67,251,177, 39, 39, 23,155, 54,124,  6,157, 86, 15, 33,143, 15, 47, 15, 33,212,213, 37,241,181, 37,104,118,247, 49, 74, 41, 64,
+ 57,243,139,225, 64, 41,133,222, 32, 50, 55, 79, 34,128, 26, 76, 48,241,  0, 19, 76, 48, 25, 56,176,166,214, 13,216,130, 19,169,
+180,107, 48,133,143,183, 39,194,186, 70,160,223,224,222,240,246,146,160,174,190, 18,229,149,229, 80,212,221,130, 81, 71,224,225,
+225,129,224,224, 88,204,156,126,129,110,223,217,183,249, 48,254,230, 27,212,228,237, 13, 45, 31, 16,138,133,208,106,132, 48,104,
+132,208,137, 69,224, 19, 22, 20, 60,232,180,245,208,106, 84,232,218,181,139, 92,200,227,163,  6, 74,124,244,209, 17,136, 68,173,
+ 23,142,247, 55,189,111,183,  0,189,246,248,107,173,126,174, 80, 40,104,147,227,152,128,128,128,124, 66,136,142, 82,202,247,247,
+247,247, 40, 40, 40,  8, 76, 75, 75,203,158, 59,119,110, 23, 87, 11,178, 48, 52,116,118,195,111,  0,113,254, 64,187, 69, 59,214,
+167,165,209,231,158,123, 46,222, 88, 81,225, 20,231,143, 57, 57,210,145, 35, 71, 46, 29, 27, 21,  5,163, 72,132, 85,171, 86,113,
+ 51,239,187,111,  2,165, 52,203, 41, 87,142, 16,172,124,231,157,134,227,  5,111,191,141, 85,239,190,219,234,177, 61, 52, 53,  2,
+150, 47, 79,163, 49, 49, 49,200,202, 42,164,  9,  9, 61,  7,  2, 40, 92,190, 60, 77,235,164,248,231, 14, 30, 56,208,199, 90,103,
+ 60,197, 18,148, 85, 86, 64,169,168, 69,244,200, 81, 30, 63,126,181, 33,107,202, 83,255, 24,  8,243,230,  5,173,129,125, 97,233,
+106,254,163, 51, 31,228, 71,134,135,115, 86,207,240,237, 85,159, 54,186,232,221,  5,207,155, 13,191,151,230,199, 63, 62,117,130,
+211,249,234,146,248, 55, 88,200,  1, 78, 92,156,224, 20,181, 39,159,224,252,187, 79,131,248,  4,193, 84,120, 30,250,194, 95,145,
+ 95,163,198,240,189, 21, 14,125,127,157, 76,118,244, 21,233,115, 61, 30,255,231, 83,126,105,155,191,227,194,195,195,153, 37,203,
+ 87,192,251,157, 37,248,225,135, 31, 74, 31,122,232, 33,151, 12,209, 22,132,127,194,206,157, 59, 15, 88,143,167, 79,159,238,144,
+114,169, 84,170,184,  3,  7, 14,200,141, 70, 35,122,245,234,133,113,227,198,193,215,215, 23,181,181,181,184,121,243, 38,174, 93,
+187,134,155, 55,111,210,137, 19, 39,198,123,123,123, 59,156, 79, 82,169,116,250,125,247,221,247,241,202,149, 43,183, 14, 27, 54,
+236, 99,171,177,211,165, 75, 23,204,156, 57,147, 36, 37, 37,121,  1,200,149, 74,165,185, 45,237, 94,218,148,111,254,252,249,233,
+207, 61,247, 28,115,250,244,105, 16, 66, 16, 24, 24,216,240,218,187,119,175,112,244,232,209,159, 73,165,210,227, 45,241, 61,175,
+144, 98,202,137, 25,  0, 64,182,167,236,160,247,126, 54,190,123,126,126, 62, 10, 11, 11, 73, 93, 93, 93, 47,169, 84,202,159, 54,
+109,154,  9,  0,157, 54,109,154,137,101, 89,220, 13, 52, 21,127,235,185,166,247,193,111, 70,252,  3,135, 71,  4, 62, 30,213, 35,
+ 96, 14, 33, 68, 64, 41, 53,114,230,151,193,100,212,105,133, 12,215,101,112, 39,241,107, 65, 62,189,122,239, 60,121,237, 59,221,
+ 86,233, 81,241,108, 89, 89, 43,205, 55,  6,244,239, 11,134,201, 70,126,109, 53,128, 75,168, 43,189,  2,129, 88,132,140,221,159,
+ 64, 83,101,194,156,127,188, 12,142,  3,166, 62, 56,  6, 38,190,151,221,155,203,207,191,  4,142,  3, 18,135, 18,  0, 93,  0,244,
+128, 78,111, 64,210,  3, 19, 33,246, 99,176,105,203, 62, 48, 12,144,254,221, 70,148, 22,254, 26,255, 80, 92,100,246,229,179,205,
+115,113, 20,224, 56, 14, 28,199,193,100, 50, 65, 47,160, 48, 18, 35, 12,  6,  3, 52, 30, 58,128, 19,131,161, 38,152,132, 20,245,
+  6, 29,212,202,186, 86,211, 22,236,165,  7,159, 47, 65, 96, 96, 32,122,247,238,141,208, 78,163,  0, 30,  3,147,233, 52, 24, 90,
+ 11,157,154,133,137, 83,163,252,102, 13,130,  3,171, 16,232, 23, 11,133,106,113, 92,115,155,188, 72,116, 44,168,190, 10,208,137,
+ 96, 96,140, 80, 11,249,168,151,  8,192, 23,  8,  1,206, 19,132, 71, 80,175,214, 64, 81,126, 29,  5,167,115, 80, 83, 92, 12,142,
+227,192, 80,158, 75,133,230,171,181,191, 27,206, 79,205,123,202,126, 59,105,217,215,221, 90,116,210,210,210, 22,189,242,202, 43,
+207, 20, 23, 23, 51,132,144, 96,153, 76,246, 29,204,155, 59,121,180,161, 44, 11,214,172, 89,179,229,214,173, 91, 72, 79, 79,199,
+240,190,125,121,254,131,  7,183,185,130,164, 46, 92, 72, 20, 64, 28,165, 84,190,122,245,106, 57,  0, 72, 83, 82, 28,246, 74, 12,
+  6,195,186,177,150,202, 36, 20, 10,209,167, 79, 31,108, 63,116, 40,211, 18, 13,112,152,231, 78,109, 85,187,104, 81, 50,201,202,
+ 42,164,167, 79,155, 35, 86, 54,255,127,189,247,222,123, 75, 23, 45, 74,246,117, 84,179, 60,141,236,246,193,  3,  7,250,240, 24,
+  6,207, 62, 58,  7, 90,157, 30,171,190,252, 18, 30, 18,  9,116, 58, 29,116, 90, 45,134, 14,139,138,220,191,121,243,115,147,230,
+204,249,200, 94,212,241,221,  5,207,115,  0,152, 43, 69, 69, 76, 83,193,111, 90, 61, 93,185,247,110,253,198,199,103,165,189, 78,
+ 39, 76,125, 58,158,138, 34, 93, 50,  4,108,119,237,163,219,252,237,158,183,107, 65,249,241,113,189,222,132,195, 19,130, 33,120,
+ 81,  6,229,156,  8,240,253, 67,156, 18,255,131,  7, 15,150,135,119,238,114,243,159,207, 62,211,237,245,151, 23, 98,245,134,117,
+ 23, 71, 70, 71,247, 92,247,233, 58,143,151, 22,190,138,205, 99, 70, 97,203,150, 45,143, 61,242,200, 35,155,218, 40,252,113, 59,
+119,238,108,112,152, 44, 97,245, 23, 96,222, 42,221, 46, 14, 28, 56, 32, 15, 14, 14,198,176, 97,195, 88,134, 97,248,230,232, 44,
+  7,129, 64,128,128,128,  0,116,234,212,  9,215,174, 93,195,129,  3,  7,228, 51,103,206,116,168,174, 72,165,210,228, 41, 83,166,
+124,176,114,229,202, 79,251,246,237,187,150, 16,194,  1,248, 12,192, 36,  0, 71,  0,188, 75, 41, 45, 34,132,188, 10,224, 93, 71,
+248, 86,206,159,255,253,216,228,100,178,107,215, 46,240,249,124,200,229,114,156, 63,127, 30,189,123,247,198,123,239,189,135, 65,
+131,  6,225,153,103,158,225,191,249,230,155, 43, 91,244,252, 45,216,158,178,131,  2,128,135,135, 71,153,159,159, 31,196, 98, 49,
+132, 66, 97,189,112, 25, 88,122,140,146,105,211,166, 97,217,178,101, 56,127,254, 60,182,110,221,122, 87,196,127,238,162,101,191,
+ 59, 58,203, 95,111,214,  8,104, 46,  2,192,240,121, 12,159,229,168,138,229, 76, 58,137,128,223,213, 75,200,244,  7,199,  2,145,
+247,  2,157,122,  3,183,174,160,243,229,156,233,143,197, 70,132,103,156, 43, 19,215,108,149,102,152, 55,183,107,190, 14,243,120,
+ 86, 65,242,  1,208, 21,190, 97,125,113,253,114, 58,214,202, 54,128,209,123, 96, 98,124, 44,246, 29,204,129, 70,  3,120,  4,180,
+220, 46, 73, 60,250, 66,171,185, 12,147,201,118,111,154,114,  0, 55,193,240,226,240,248, 19, 79,131, 19,169,241,227,238,175, 48,
+245,193,167,224,225,  9,168,235,203, 44, 26,212, 60,140,224, 65, 96, 17,127, 35,107,130, 94,105,132,198,168, 65,173,132, 15,163,
+ 70,  0, 61,223,  8,158,145,128, 53,113, 80,106, 89,212,212,179, 45,170,217,121,249,114,218,179, 19,  1,143, 71, 64, 24, 17, 76,
+ 38, 10, 86, 83, 12,189,201,136,210,242, 58,212, 40,234, 81,167, 50,129,209,233,192,162, 28, 60,193, 57,116,233,174,196,168,232,
+ 24,249,119,223, 94,106,150,147,  7,128,170,116,208,170,110,194,116,171, 14,188, 94, 93,193, 48, 12, 76,172, 30,181,229, 69,184,
+124, 34, 23,149,215,139, 45, 66,194,  7,195,  7,192,187, 59,221,128,214,144,255,250,245,235,245, 73, 73, 73,253,163,162,162, 88,
+145, 72,164,254,224,131, 15, 70,194,188, 41, 81, 31,180,113,166,137, 48, 52,116,  1,  0,140, 30, 52,  8,161,161,161, 21,171, 87,
+175,206,  2, 16, 63,108,240,224, 54, 71,  1,252,129,108,105, 74, 10, 17,132,132,196,173, 94,189, 90, 46,  8,  9,137,115, 38, 18,
+ 96, 20,137, 32,208,235,177,125,251,118,132,132,132, 96,198,196,137,214,104,  0,117,198,  8,184, 83,176,138,190, 76, 38,179,109,
+248,112,248,240,225,176,209,163,147, 31, 68,203,219, 70,219, 98,132,159,191,127, 63, 30,195,224, 31, 73, 73,168,173, 83,162,178,
+166, 26,  2,  1, 31,124,190,249, 37, 16,  8, 32,146,120,160, 87,120,248,135, 87, 79,157, 62,223,123,120,140,220, 30,233,149,162,
+ 34,124,187,253,127,183,121,252,214, 72,192,168,232, 33, 72,140,191,215,201, 59, 86,197,  1,222,217,125,  7, 39,102,247,237, 19,
+ 25,159,185,235, 75, 57,208, 49,250,254,243,190,254,  8,250,125, 27, 16,242,249, 25, 12,240,227,131,231, 19,  0, 86, 81,129,225,
+123, 43,224,201, 39, 80,179, 20, 60, 59, 53,229,218,213,171,213,123,118,237,238,251,245,231, 95,227,147, 47, 63,187,190,238,131,
+143,222, 14,  8, 12,168, 93,178,116,201,193, 77, 91, 54, 99,220,232, 88,124,155,182,245,235,110, 61,186,125, 61, 46,118,156, 75,
+247,220, 84,252,119,237,218,133,174, 93,187,246, 58,121,242,228, 28,152,183, 26,183, 27,246, 55, 26,141,136,142,142,230, 88,150,
+229,171, 84, 42,136,197, 98,112, 28,135,223,126,251, 13,249,249,249,240,242,242, 66, 76, 76, 12,202,203,203,145,155,155, 75,237,
+117,  7, 72,165,210,217, 41, 41, 41, 43, 31,120,224,  1,175,181,107,215,250,124,252,241,199, 66,152,119, 45,205,  4, 16, 13,243,
+  6,103, 31,193,188,157,251, 65,152,119, 60,109,149,111,231, 43,175,108, 30,208,191, 63, 89,157,148,  4,114,255,253,216,126,244,
+ 40, 87, 90, 90,186,  4,192,234, 27, 55,110, 76, 91,180,104,209,231, 63,252,240,  3, 98, 99, 99,225,233,233, 57,166, 37,174, 41,
+ 39,102, 96,199,142, 29, 88, 63,201, 92,199,252,252,228, 85,157, 58,117,130,151,151, 23,245,244,244,188, 97,120, 29, 32,211,  8,
+ 93,182,108, 25,172,134, 70, 99,253,186, 59,152,187,104, 89,131, 17,208, 72,236,155,158, 16,207,150, 85,254,124,181,114,221,198,
+ 35, 87, 95,254,173,180,238,  0,  3,202,  7, 40, 48,229, 61,252, 28,243,  1,254,171, 72,194,161,129, 43,128, 73,139,225, 45,224,
+134, 61, 16, 21, 62,199,210, 93,112, 27,118, 29,170, 33,128, 18,211,158,120, 17, 28,  7,  0, 53, 48, 47,155,108, 68,143,190,209,
+ 16,139,248, 48,177,122, 80,131, 57, 44,226,237,237,141,234, 26, 69,139, 55,241,209,135,175, 16,  0,184,248,243,151, 96,152,198,
+ 78,  2,167,253, 21, 58,189, 17, 60,129, 24, 68,104,238, 67, 83, 41,149, 24, 51,102, 76,235,238,  8,103,  0,199,113, 96, 89, 22,
+122,189, 30,245, 28,139, 58,131, 17,202, 50, 37,234,110,214, 65, 89, 94,131, 26,101, 45,202,117, 26, 40,213,181,168,213,183, 60,
+214,201,219, 75, 13,150,229,160, 55,152, 80, 91,167, 68,254,213, 98,156, 56,157,135,159, 79,228,225,210,111,  5, 40,185, 81,133,
+122,181,  1,170,122, 61,202, 74,235,112,225,215,107,200,205, 61,139,146,178,242, 22, 57,109,139, 10, 91,167, 70,201,185, 75,248,
+101,239, 33,100,110,248, 16,135,182,110, 64, 73,193, 85,112,212,  8,142,144,  6,225,119,166,230,219, 11,243,219,  3,159,207,  7,
+128, 91,  0,110,249,251,251,151,120,123,123,235, 23, 45, 90,116, 18,230,  1, 99, 12,204,107,101,231,187,202,191,102,205,154,212,
+164,164, 36,  0, 64, 68,112,112,136,165, 79,156,215,158,149,195, 42,250,214, 72,128,  3,225,255,  4,  0, 88,181,106, 21,174,148,
+149, 97,198,196,137,176, 70,  3,242,242,242,  0,  0, 59,228,114,234,104, 86, 44,120,251,109,188,250,206, 59, 13,225,125,235,123,
+235,177,245,189, 35,225,127, 43,178,178, 10,105, 83,241,183, 61,206,202, 42,252,214, 17, 30, 63, 62,255,191, 58,131, 30, 60, 30,
+ 15,191, 21, 22,160,176,228,  6,142,159, 59, 15,131,193,  8,  6,  4,124, 62, 31,132, 16,112, 38, 19,180,106, 13,242, 14,103, 31,
+114,128,150,177, 21,255, 71,103, 62,120,155,199,127,252, 76, 30,108, 35,  4,142,193, 38,156, 44,138,204,182, 10,127, 86,218,235,
+ 84,192, 94,137,251, 67, 45,128,154, 50,  8,187,247, 65,197,115,247, 32,239,235,143,192, 15,234,220,240, 81,197,115,247, 32, 72,
+204,192,135,223,122,113,233, 27,217,183,139,135,135,167,199, 39, 95,172,209,197,223,123,175,112,212,152,209,155,175, 93,189,198,
+253,118, 53, 31,224, 40,196, 34, 17, 98, 99, 98,177,123,215,110,236,220,185,211, 41, 47, 96,223,190,125,113, 82,169,148, 90,197,
+255,192,129,  3, 88,183,110,157,  1,  0, 78,156, 56, 97,144, 74,165,143, 56,210,181, 80, 84, 84,  4,203,214,196, 76, 81, 81, 17,
+ 50, 51, 51,145,151,151,  7,181, 90, 13,133, 66,129, 83,167, 78,161,184,184, 24, 55,110,220, 64,143, 30, 61, 80, 84, 84,212, 42,
+223,188,121,243, 30,127,248,225,135,223,143,139,139,243, 58,121,242,164,143, 70,163,249,167, 68, 34,201,  6,240,169, 76, 38, 91,
+ 44,147,201,234,  0,252, 15,192,  8, 66,136,144, 82,106,108,205,233,152, 63,127,254,227, 63, 44, 88,176, 57, 54, 36,132,176, 11,
+ 23, 98,140,193,128,147,187,118,209,210,210,210,167,101, 50,217,219, 50,153,172, 18,192,198,139, 23, 47,178, 44,203,194,203,203,
+ 11, 97, 97, 97, 94, 70,163,177, 89,241,159, 52,105, 18,100, 50, 25,164, 82, 41,164, 82,169, 71,105,105,105,223, 27, 55,110, 64,
+173, 86, 19,133, 66,209,159,207,231, 79,176, 21,127,185, 92,142,  7, 31,124, 16, 29,  5,205,117,  1,132,  2,232, 53,125,120,247,
+103,187,  5,122,206,129, 81, 11,244,157,128, 51,193,211,113,223,252,175,160,173,170,  5,207,199, 27,242,143, 31,199,184,  1, 63,
+ 35, 32, 47,115, 60,128,238, 45,253, 64,111,159,174,248, 37,111,135,141,189,161,182,116, 19, 26,  1,163, 30,124,142,  7,198, 82,
+239,119,254, 96,238,110,138,157,156,210,114, 65,189, 64,241,192, 48,219,109, 16,137,229, 54,  4,128, 64, 12,150,152,192, 89,218,
+221, 89,115, 94,  0,  0,249,245, 99,235, 91,172, 89, 38,142,130,229, 24, 48, 44, 11,198,160,135,198, 98, 89,104,121, 60,120,178,
+ 90, 40,181, 20, 68, 64, 96, 50,153,160, 49,  1, 21,106,  3, 90,234,204,102, 13, 28,116,  2, 30, 56, 13, 11,150,171,131,170,222,
+  8, 30, 17, 64,207, 26, 97,160,  6,176, 70,  3, 32,228,192, 16,128,136, 56,212,105, 77, 40,175,212, 64,173,103,155, 13,198, 48,
+196,212, 96,  0, 16,242,187,158, 24,117, 90,212,213,212,128, 33, 60,240,249, 20,160,124,240,136,235, 29,127,151,175, 95, 54,244,
+237,209, 87,232, 72,216,191, 81,152,148, 16, 72, 36, 18,  0,208,  2, 48,240,249,124, 20, 22, 22, 98,249,242,229, 15,  2,184,177,
+104,209,162, 97,190,190,190,126,117,117,117,215,107,107,107,157, 14,119, 11, 67, 67,159,  2,128, 78,157, 58,217, 86,224,218, 79,
+ 63,253, 52, 11, 64,194,176,193,131, 15,182, 87, 69,152, 63,127,126,188, 35,  6,192,143, 57, 57,113, 35, 71,142, 12,150, 42,201,
+129,  0,  0, 32,  0, 73, 68, 65, 84, 27, 27, 21,  5,226,237,141,229,203,151, 99,225,194,133, 16,  8,  4, 48, 42, 20,240,245,245,
+197,235,243,231, 55,140, 11,112,100,112, 96,211, 62,126,123, 99,  2, 90,194,114, 39,  6,119,158, 62,125, 26,167, 79,159,110,184,
+190,165, 62, 78, 69, 77, 77, 63, 47,111,111, 84, 41, 20,144, 31, 63, 14, 62,195,131,222,104,132, 70,171,  5,199,113, 13,131, 21,
+ 89,163,  1,  6,189,222,145, 60,230,  0, 48,150,110,  0,206,166,224,235, 44,231,241,246,170, 79,133,  0, 16, 25, 30, 94,113,237,
+226, 47,109,202,215,132,228,101,228,183, 51,233,113,123,119,126, 41,111,143, 72,128, 51, 97,255, 70, 97,217,109,159, 35,234,137,
+151, 33,138, 24, 98,110, 43,170,202,144, 95, 99,222, 68, 78, 52,102, 10,138, 77, 44, 60, 86, 31,111,149, 67,169, 84,250,137, 36,
+ 98,244,142,136, 16, 95, 43,185,209,185,186,178, 26,179, 30,157, 35,223,115, 48, 19, 31, 47, 91,149,190,115,207,174,164,200,136,
+ 72, 60, 62,243, 49,228,158,201,193,206,237,219,233,116,  7, 66,236,182, 94,255,129,  3,  7, 48, 97,194,  4,171,177, 40,188,121,
+243, 38,158,121,230, 25,161,245,246,237,113, 85, 87, 87, 99,220,184,113, 48,153, 76, 40, 42, 42, 66, 78, 78, 14,  6, 12, 24,  0,
+ 95, 95, 95,116,235,214, 13, 81, 81, 81, 96, 24,  6, 12,195,160,115,231,206, 13, 81,170, 22, 60,245,  1, 67,134, 12,249,104,204,
+152, 49,188,188,188, 60, 31,147,201, 84,190,125,251,118,165, 86,171, 93, 46,147,201,108, 13,216,103, 39, 79,158, 92,188,103,207,
+158,  8, 66, 72, 25, 90,216,209, 86, 42,149, 14,155, 31, 31,191,113, 20,159, 79, 42,151, 46,  5, 53, 26, 33,231,241,184, 92,141,
+230, 73,153, 76,246,141,173,221,241,214, 91,111,241, 25,134, 65, 77, 77, 13, 10, 11, 11, 43,  6, 13, 26, 20,210,148,111,210,164,
+ 73,183,253, 70, 88, 88, 88,128,137, 82,104, 53, 26, 92,188,120, 17, 44,203,146,142, 42,254,183, 25,  0,186,173,210,200, 80, 95,
+201,216,201, 67,195,158,241,145,  8, 70,178, 38, 78,193,167, 38, 31,248,117,230,149,213,234,160,173,170,  3,132,124,152,106, 85,
+ 40, 81, 24,128,192,238, 96, 56,131, 24,173,204, 38,184,170, 84,162,143,159, 15, 88, 61,112, 53,251, 91,244,142,155,212,224,192,
+ 25, 13, 70,  8,192,160, 94,103,222,161,246,129,184,104, 72,  2,195, 90, 77,240,  3,131,  9,246,156,167, 16,136,  1, 97,247, 73,
+ 48, 20, 31,109,112, 28,  4, 66, 17,140,208,193, 75, 98,222,145,116,215,158,173,248,229, 68,118,252,156,137, 49, 45,183, 70, 28,
+  7,161, 65, 11, 35,132, 96, 24, 22,208,153, 27, 54,163,209,  8,189, 78,  0, 30, 95,  0,232,  0,202,153,187,  8,122,132, 71,180,
+200,165,209,113,224,241,  8,140,172, 17, 58, 61,  7,165,202, 92, 14,141, 28,133, 65,207,  1,124,128, 39,224,129, 47,  6,136,214,
+  4,142,176,224,160,133, 74,107,  9, 72,219,129,  9,  0,195,  1,148,  0, 12,195,129, 16, 30, 56, 74,192, 48,150,177, 84, 28,  3,
+142, 97, 64, 56,199, 28,100, 27,239, 95,232,106,  1,242,240,240,128,197,219, 15, 46, 44, 44,172, 88,190,124,121, 60,128,135, 22,
+ 45, 90, 52,177,103,207,158,106,149, 74, 85,205,178,108,131, 80, 56,163,255,107,214,172,249, 50, 41, 41,  9,225, 65, 65, 13, 39,
+195,131,130,252, 44, 81,128,224, 63,162,194, 24, 12,  6,185,213,219,167, 42, 21,254,253,239,127, 67, 95, 93,221, 48,242,173,183,
+197, 88, 17,232,245,120,240,193,  7, 43, 74, 43, 42, 30,  9,243,240,216,124, 55,210,102, 59,168,207,182,255,191, 57,196,196,196,
+ 32, 33,161,103,195,245,205,173,  3,  0,  0,172,222,128, 90, 67, 13,116, 58, 29,252,124,125, 33, 22,138, 96, 52,177,160,148,194,
+100, 50,193, 96, 48,192,104, 52,130, 99, 77,142,230, 47,119,165,168,136,137, 12, 15,183,122,  4,220,149,162, 34,230,219,237,255,
+ 19,219, 70,  4, 34,195,195,107,209, 78,131,217,250, 69, 39,101,151, 20,156,106,151,103,236,234, 24,128,123, 51, 43, 81, 17,158,
+ 14, 97,247, 62, 32, 17, 67,208, 99,195, 89, 84,233, 56,120,242,  9, 12, 63,253,128,203,133,215,236,238,159,167,101, 13, 56,157,
+123,  2, 31,173,252, 16,247,196,141,197, 91,255,239, 29,236,223,187, 31,155, 55,125,131, 49,227,199, 38,117, 11,239, 14,190,135,
+  0,  7,143, 30,196,150,175,191,193,142, 31,182, 99,247,238,221,244,255,254,239,255, 72, 43, 34, 75,155, 10,191, 21,181,181,206,
+111,112,167, 82,169,224,235,235,123, 28,192,168,240,240,112,196,196,196,128,199,227,129,227, 56,244,232,209,  3, 34,145,  8,117,
+117,117,  8, 15, 15,135,183,183,247,117,149, 74,213,163, 37, 46,153, 76,118, 81, 42,149,166,238,216,177, 35, 49, 50, 50,178,223,
+246,237,219,235, 21, 10,197,187, 50,153,108,139, 77,250,167,223,123,239,189,175,108,216,176, 97, 27,128, 10,  0,201,  0,126,  6,
+ 48,180, 25,190,179, 82,169, 52,213,239,212,169, 55, 30,102, 89,124,  8,112, 95,214,215, 63,214,132,239,161, 23, 94,120,225,195,
+185,115,231,226,218,181,107,216,189,123, 55, 88,150, 61,  4,224,225,214,238,219, 18,  5, 96,252,120,188,106, 47,131,  1,234,179,
+103,105, 48,199,169,174,  2,170,187, 45,254, 81, 81, 81, 56,119,238, 92,179, 33,127,123, 93,  0, 61,167, 15,239,190,196, 71, 34,
+ 24, 89,169,212,237, 63,118,165,114, 57,120, 34,224,242, 81,220, 31, 78,177,248,249,  7, 17, 51, 48, 28, 47, 72, 39, 99,106, 47,
+  3,112,225,  0,168, 64,194,162,213,193, 58,181,200,175, 45,  6, 95,  4, 60, 48,245,101,108,249,100, 25,  0,  3,160,209,195,164,
+  5,126,144,159, 67,214, 73,243,140,194,174,221, 35,192,240,237,139, 87,226, 80,  2,163, 14,216,181,123, 31,134, 79,124,222,236,
+253, 67,  0,158,  4, 72,153,146,140,196,241,211,  0,  0, 37,215, 11,192,234, 12,173, 91,244,148,130, 37,102,129,215, 27,204,131,
+255,244, 58, 45, 52, 26, 13,234,235,235,161, 82,214, 65,165, 82, 65,169,170,135,174,190, 30, 90,173,182,229,194, 95, 79,160,213,
+153,160,213,153,160,214, 24,161,170,215, 67,161,210,163, 86,105, 64,157,202,136,218, 90,243,255,154,106, 22, 53, 10, 22, 53,117,
+ 44,170,106, 12,184, 85,213,114, 26, 25, 74, 97,  2, 64, 76,  4,132,225, 64,  9,  5, 40,  5,165, 60,152,184,223,179,143,179,180,
+ 30,206,198,198,251,143,233,143,156, 61, 57,216,127,104,127,131, 81,112,249,250,101,135,190,203,227,241,192, 55,231, 87, 24,128,
+ 94, 43, 86,172, 56, 15, 96,245,235,175,191,254, 82,207,158, 61, 89,115,144,192,156, 48, 39,197,159,  8, 67, 67,119,  2, 64,104,
+104,232,109, 31, 62,247,220,115,236,169,203,151,183,158,189,112,161,221,194,186,171, 87,175,150, 59,186,111,188,209,102,138,197,
+247,223,127,143,171,229,230, 46,156, 31,179,179, 27,125,118,249,242,229,144,224,224, 96,197, 31, 97,168, 36, 36,244,100, 44, 13,
+ 90,211,  6,191,209,231,118, 13, 60, 31,239,223, 56,147,  9,202, 26,  5,170,170,170, 80, 93,171,128, 90,163,129, 90,163,129,170,
+190, 30,234, 58, 37, 84,181,255,159,189, 43,143,111,162,218,254,223, 59, 89,154,182, 64, 23,118,202, 90,164,236,178, 20,161,  5,
+129,  4, 82,168, 34, 42, 74,  1,225,137,125,  5,155,226,  6, 34, 62, 84, 84,220, 80,121, 63, 11,184,210,212, 39,130,239,129, 64,
+139, 11,155, 44,129,164,178,180,212,130, 11,139, 64,161,208, 66, 89, 10, 77,186, 37,105,182,185,191, 63,146,  9,105, 73,147, 73,
+ 90,  4, 53,223,207,167,144, 89,114, 50,115,231,206,253,158,115,238,185,231, 84,160,214,104,128,185,182, 22,172,213,235,252, 38,
+211,163,107, 87,110,204, 96,  1,152, 93,167,  3,  0,224,127,155,182, 96,113,250,199,225,  0,218,250,122,223,191, 31,201,150,170,
+178, 94,170,211,217,206, 30,255,225,246,186,255,  1, 92,158,218, 21, 93,190,252, 25,164,219,221, 48,229,100,163,248,159,131, 16,
+ 42, 36,216,151,208, 26,214,202,107, 24,178,163, 12, 94,102,  0, 48,121,242,100,242,228,220, 57, 56,115,234, 20,114, 53,251, 16,
+214, 60, 12,143, 77,125, 12,225, 45, 35,113, 36,191,  0,205,196, 18,132,134,134,162,125,215, 14,248,122,253,215,120,105,209, 43,
+168,169,240,191, 74,237,224,193,131,125,254, 78,243,230,205, 81, 89, 89, 57,140, 97, 24,115,167, 78,157, 48,116,232, 80,244,237,
+219, 23,173, 90,181,130, 68, 34, 65,215,174, 93, 49, 96,192,  0,132,135,135,163,186,186,186, 75,243,230,205,225,133, 88,255, 47,
+ 39, 39,103,247, 87, 95,125, 37,210,233,116,175,214, 35,235,164,145, 35, 71,174,248,242,203, 47, 87,181,109,219,246, 93, 66, 72,
+ 51,  0, 47,  1, 88,236, 65,222,162,119,170,171,255,111,150,213,106,251,194,104,156, 94, 79,222,228,105,138,215,191,121,118,222,
+ 11,130, 83,167, 78,225,208,161, 67,248,242,203, 47,107,  0,188,204,243,246,153, 16,147, 73, 66,127,255, 29,157, 84, 42, 18, 85,
+ 90, 42,  0, 64,151, 45, 91,134,173, 91,183,254,161,253,173,190, 71,175, 33, 15, 95,253, 65, 32, 72,192,144,230, 37,229,250,181,
+ 95,231,158,123,249,151, 98,109,190,209, 70,206,224,250, 57, 72,190,121, 10,239,142,168, 70,193,155, 67,241,161,172,  6,161,223,
+ 61, 13,104, 47,162,134, 74,142, 58, 52,175,  6,112, 35,170,255,215,223,182,224,245,215,191,194, 93, 45,250,227,248,193, 95,177,
+ 75,253, 59,100,241,125,145, 48,210,222,209,168, 64,  8,179, 15,241, 17,137,131,122,225,157,255,123, 31, 59,142, 86,161, 89,215,
+ 62,120,224,129,137,216,185,247, 91,108,219,105,143,178,100,108, 22,  4,137, 60,143,115,148,181,193,198,218,173, 25, 56,172, 25,
+179,217,140,218,218, 90, 24,141, 70,232, 13, 70, 24, 13,122, 24, 13,122, 24, 76,181, 48,155,106, 27,118,127, 25,155,163,178,198,
+134, 42, 35,139, 42, 35,107,255, 92,205,162, 70,111, 69,141,193, 10,157,214,134,114,173,  5,229, 58, 11,202,203, 45,184,126,221,
+140,171,215, 45, 30, 21,128, 27,238,127,151,107,230,220, 55,  2, 10,  1, 33,160,245,162,254, 41,241, 78,182, 47,206,124, 17,189,
+227,123, 59,183, 85,171, 85, 78,143,192,129,237,  7,112,170,248, 20,175,100, 79, 44,107,255,173,236,236,236,253,148,210,126,147,
+ 39, 79,158,217,173, 91,183,214,  0, 24,150,101,131, 44, 22, 75,132,213,106,109,225, 70,  1, 96, 61,184,254, 23,127,250,233,167,
+247, 79,158, 60, 25,221, 90,183,230, 53,117,213, 24,136,218,180,145,  2,192,144, 94,189,100,222,206,237,209,174,157, 44, 61, 61,
+ 29,199,139,139,171,190,217,181, 11, 39, 79,158,116, 90,253, 61,123,246,132,227,152,249,155, 93,187, 80, 92, 92,140, 83,  5,  5,
+ 70,111, 50,111, 69, 12,  0,  0, 58,122,244,232,167, 92, 73,159,251, 63, 54, 54,150,151, 59, 23,  0, 10, 79,158, 45,176, 90,173,
+ 48,155, 77,208, 94, 45,195,181,203, 87,112,253,202, 85, 92,191,114, 21,218,178,107,168, 40, 47,135, 73,175,183,199,207, 84, 84,
+ 96,144, 92,238,173, 13,173,139,211, 63, 22, 46, 78,255, 88,  8,160, 10,  0, 59,108,240,221, 55,157,228, 18, 23,192, 27, 39,142,
+100, 75, 75,207, 22,168,  7, 12,189,113, 13,231,206, 28,148, 86, 92, 43, 82, 55,166,127,144, 41,186, 58,150,191, 63, 56,173,213,
+163,100,246, 61,160,231,126, 67,155,207,143, 32,116,229, 97, 92,158,218, 21,177, 59,202, 64, 68, 65, 16, 18, 64,200,120, 87, 64,
+159,126,230, 25,242,218,251,239,224,185,  5,243, 97, 97,109, 56,121,190, 16, 51, 30,155, 14,177, 68,130,239,191,219, 12, 88,108,
+ 48,213,154,176,175,224, 32,140,198, 26,164, 38, 39,231, 20, 20, 20, 80, 15,132, 72, 38, 77,154, 36, 27, 55,110, 28,  8, 33,216,
+189,123,247, 77, 46,253, 23, 95,228, 31, 39,212,178,101, 75, 92,186,116,  9,  0,132, 25, 25, 25,184,118,237, 26,250,247,239,143,
+240,240,112, 48, 12,131,252,252,124, 48, 12,  3, 66,  8, 46, 93,186,132,150, 45, 91,122,149,169, 84, 42,223, 53,155,205,163,148,
+ 74,229,  6, 23,178,126,108,228,200,145,233,179,103,207,142,200,200,200,144, 16, 66, 24,  0,223,  2, 88,160, 84, 42,175,122,145,
+247,175, 67, 22,203,144,250,242,166, 45,252,102,227,163,211,159, 38,247,207,201,128,230,208,  9,164,167,167,179, 85, 85, 85, 41,
+ 74,165,242, 60,143, 41, 68,  0, 96,239,106,222, 60,188,211,149, 43,184,215, 96, 64,123,145, 40, 52, 84, 32, 96, 74, 75, 75,111,
+138,197,249,163,148,  0,238,143,215, 20,  0,128,179, 95, 31, 60,247,140, 86,111, 58, 12,123,224, 86,251,220,194,107,153,163,122,
+181, 93, 36, 60,119, 40, 18, 95, 62, 14,  4,133,  2, 38, 61, 64, 41, 44,  2,201,213,125,199, 47,127,  1,160,193,236, 75,235,214,
+126, 38,155, 62, 99,166, 26,  0,244,172,  5,103, 42, 74,  0,216,112, 87,139,110,144,201,238, 70,219, 86,237, 80, 94, 89,101,247,
+ 21,152,173,184, 92,161, 71,111, 15, 55,213,177,115, 60, 46,150,228, 58,222, 76, 33, 18,  7,216, 99,  0,118, 28,181, 96,231,214,
+108, 92,189,126,  9, 45,195,237, 43,  9,194,197, 34,220, 61,196,243,122, 80, 51,132, 16,179, 86,216, 32,  0, 75,  8, 24, 27, 11,
+ 88,172,176,137,132,  0, 97,192,189,147, 44,133, 61, 87,128,  7, 60, 60,237, 37,242,221,127, 23,208, 16, 49,133, 80,228,226, 97,
+176,  0, 86, 10,212,154,  1,155,201,  6, 66,  8,136,152,192,106,  3,244, 38, 96, 86,242,191,137,187, 84,142, 54, 23, 13,141,101,
+ 88, 16,135,251,223,174, 20, 16,216, 88,  6,140,192,110,245, 51,  0,168,128,  2,148,159, 23,192,149,252,221,109, 31,216,126,160,
+155,215, 41,  9,155, 13, 38,147,  9,147, 39, 79,238,155,157,157,189, 28,192,192,236,236,236, 29,217,217,217,251, 38, 79,158,252,
+ 76,247,238,221, 45,132,144,150, 31,126,248,225,174,151, 94,122,105,134, 86,171,205,241,160,124, 58,251,228,130,  5, 11, 22, 47,
+ 88,176,  0, 59,118,236,128,254,234,205,239,114,183,214,173,113,238,220, 57,  0, 80,243, 73, 12,212, 80,210, 31, 81,155, 54,210,
+ 79, 63,253, 84, 77, 41,197,144,158, 61,101,131,121,172, 44,232,223,187,183,134, 48,204,248,147, 63,253,212, 21, 64, 16,128,143,
+184,213,  0, 61,218,183,199,252,249,243,113,224,192,129,165, 49, 49, 49, 57,253,162,162,188,198, 40,184,203,  3,224,111, 12,128,
+ 43,184, 60,  0,113,113, 73, 63,229,229,149, 29, 80, 40, 20, 98,199, 52,193,112,  0,185,124,147,  0,117, 29,208,231, 21,227,229,
+ 43,227, 88,171,173,151,190,178, 18,149,215,175,129, 16,  6,148,178,168,173,173,  5,165, 20,148, 82,156, 59,241, 59, 44,102, 19,
+238, 26, 18,235,173, 13, 93,199,156,112,  0,204,253,178,209,236,253,178,209,117,130,254, 28, 83,  4,188,113,242,151,111,164,151,
+206, 22,168,  1,160,107,151, 46,248,190,158, 23,160,117,231,193, 50,220, 70, 12,249,161, 12,  5,247,  1,  3, 99,229, 40,123,122,
+ 56,218,125,118, 16,167,181,122, 68,136,  9,202,181, 58,  8,  9,241,234,  1,224, 48,115,230,204, 58,103,110,217,178,133,222, 63,
+225, 62,108,221,188, 21, 27, 55,110,196, 27,139, 94,195, 46,205, 30,  8,132,  2, 68,117,140, 26, 93, 89,233,121,233,114, 98, 98,
+162, 38, 49, 49,145,236,216,177, 67, 58,110,220,184, 58,177,  0,187,119,239,198,153, 51,103,106,149, 74,101,123, 62,215,214,181,
+107, 87, 20, 21, 21,161, 79,159, 62,214,121,243,230,137,215,175, 95,143,176,176, 48,156, 60,121,242, 38,207,107, 81, 81, 17,186,
+242,124,206, 74,229,141,196,115, 10,133,226,241,123,238,185,231,173,199, 30,123, 44,172,160,160,160,121,109,109,237, 63,131,131,
+131, 31, 48, 26,141, 31, 40,149,202,239,121,202,251,197, 85,222,  3,207,174, 95,115,239,216, 73,228,223, 42,128,116,120, 16,239,
+174,120,133,106, 11, 79,166, 40,149,202, 44,111,178, 92,188,108,164,218, 98,169, 16,  7,  5,161,133, 88,140, 96,155,205,164,183,
+217,108,183,131,252,249,162,142,  2, 32,121, 76,121, 92,251,181,226,180,228, 49, 37, 55,165, 89,114,236,107,197, 15,213,181, 86,
+253,176,187, 90,221, 31, 25, 34,184, 71, 96,170, 13,181, 82,166,186,188,218,156,151,123,230,202,206, 82,173, 33, 71,242,152,242,
+ 50, 86,174,116,251,  3, 53,250,214,154,180,167,231,200,  0,168, 89,  1, 55,205, 39,192,153,170,203,120,253,153, 20, 24, 12, 38,
+ 84, 25,237, 49,  0,102, 38,  8, 99, 18, 61,167,217,125,109, 81, 50,217,177,109,136,253,229,182,113,150,179, 21,137,253,  9,166,
+ 61,181, 12, 33, 33, 65,104, 17, 44,145,  1, 80, 23, 30, 59, 34,139,239,231, 57, 33,136,144, 90, 97, 38,118, 37,  0,132,192, 70,
+169, 93, 17,224, 18, 54, 16,  6, 66,150,133,149, 91,118,224, 69,  9,168, 48,134,195,104, 42,135, 88,200, 56,211,156, 89, 89,192,
+ 98,161,176, 88, 41,106,140, 44,136,128,192,  6,  2, 11,123,195,117,239,150, 96, 89,  6, 12,177,129,216,  8, 40, 67,157,238,127,
+210,128,241,204, 73,122,238,121, 25, 89,185,242,164, 71, 11,239,247,220,223, 27,219,119,204,148, 82, 24,141, 70,244,239,223,255,
+114,116,116,244,164,243,231,207,247,216,184,113, 99, 62,128,135,178,179,179, 31,114, 61,249,253,247,223,215,188,244,210, 75, 50,
+173, 86,235,141, 32,156, 13,146,150,150,214,224, 73,143, 62,241,  4,  0,223, 18,  3,113, 89,247,234, 99,104,239,222, 62, 45, 43,
+236,215,179,231, 46, 87, 79, 70,122,122,250, 39, 19, 39, 78,180,158, 58,117, 74, 88, 92, 92,140,174, 45, 91,230, 70,133,132,240,
+ 10, 80,188, 21,121,  0,234,145,251,213,156,156, 28,215, 24,143,163, 14, 69,128,111,198, 64,125,112,251,118,143,158,220,179, 55,
+ 55, 60, 52,180, 69,149,174,  2, 86,171, 21,212,241, 30,232,174,150,161, 74,167,  3,165,148,143,245,111,127, 89,111,196,156, 48,
+142,229,128,140, 99,217,159, 51, 49, 80,225,249,243,252,149,  0,195,175,210,139,133,249, 78, 43,255,251, 44,251,242,191,214,209,
+ 35,100,  3, 98, 39,106,110,223,240, 74,111, 86,  2,240, 57,  6,166,189,142, 43, 44,139,  1,171,243,145,159,216, 22,125,183, 94,
+133,144,  0,205, 69,254,173,152,157, 56,113, 34,217,171,217, 75,199, 36,140,197,230, 77,223,225,237,165,239, 99, 97,101, 37, 40,
+203, 98,195,134, 77, 40, 45, 45,125,  0,128, 87, 31,180, 59, 69,  0,  0, 38, 77,154,244, 11,128,106, 62,215, 18, 31, 31, 79, 46,
+ 93,186, 68,143, 28, 57, 34, 30, 60,120, 48,198,142, 29, 11,181, 90,141,206,157, 59,195,100, 50, 97,244,232,209,160,148,178, 71,
+142, 28, 97, 68, 34,145,207, 25,  1, 21, 10, 69,159,176,176,176,229, 83,167, 78, 21,157, 56,113,162,133,201,100,106, 40, 48,144,
+175,188, 65, 81,  3,167,172, 25, 56,106, 42,249, 34,  7,168, 50,  2,230,115, 59, 88,109,161,186,126, 96,160, 39,101,130, 83,  2,
+132,218,202, 74,171,216, 98,129, 65, 44,134,208,158,245,135,253,163,123, 29,151,  7,192,213,242,119,183,207,173, 43,213,133,252,
+185,237,223,139,191, 86,148, 20, 95,175,201,  5,208,222,241,242,154,  0,148,  2, 40,146, 60,166,244,234,226, 28, 60,224, 65,205,
+241,223, 74,100, 54,218, 76,237,250,114,212,232,171, 32, 16,134,  1, 76,  8,254,245,  1,255, 20,147,137, 19,250,145,119,230, 60,
+ 32,  5, 99, 80,187, 54,111,179,102, 97,176, 89,116,  0,213,163,248, 96, 38,153, 57, 45,209,171, 44, 11,  4,  0,165,118,162,134,
+  0, 98,234, 80,  4, 28,228,111,207,  1,  8,128,231,218,205,228,212, 87, 73,230,199,111, 80,171, 69, 11,161, 99, 97, 47,165, 20,
+ 54, 43, 69,173,  5,168,170,182,194,  2, 10, 43,101, 32, 20, 17, 44,121,235,147,  6,239,123,246,108,123,144,214,154,213,103, 40,
+177,216,173,127, 10,128, 82,  2, 80,135,197, 64,  5, 32,  2, 22, 44, 43,196, 11, 11,198,241,106,195,217,111,207,150,157, 63,123,
+222, 19,  1,139, 96, 95,170,225,137,157, 88,  0, 48,153, 76,208,233,116,186,176,176, 48,196,198,198,254, 58,116,232,208,160,107,
+215,174,225,236,217,179,246,229, 97, 44, 43,221,180,105,147,218,161,  4,168,121, 40,  1,150,164,196,196,164,174,253,251,219,238,
+233,213, 75,239,232,163, 38,212, 93, 17,137,164, 68,251,179,237,202, 35, 41,208,139, 47,190, 40,  3,128, 33, 61,123,222,116, 44,
+118,192,128, 70, 17, 68,255,222,189, 63, 99, 24,198,118,242,167,159, 66,219,182,109,123,189,223,240,225,107,110,167, 70,239,134,
+212,245,177,177,177,174,209,214,206,117,172, 62, 40,  1, 39,  6,141, 29, 51,108,243,127,190,216, 20,221,173,107, 31,147,169, 22,
+ 54,139, 21, 44,203,162,121, 68,  4, 42,181, 90, 12,146,203,101, 60,172,127,  0,168,120,243,133,103,219,  0, 48, 23,158, 63, 47,
+230,230,255, 15, 29,249, 13,247,203, 70,179,139,211, 63,246,150, 28,200,137,152,246, 58,122,242,212, 73,217,222,157,223,215,113,
+241,143, 25,255,144,140,105, 17,223,168,231,218, 80,128,159,251,253,252, 57,108,200, 15,101,192, 15,207, 56,183,239,250,254,198,
+ 18,224, 74,139,255,235,195,199, 72,199,144,175, 74,190,186,111,220,132,196,237, 79, 62, 62,107,255,221,  3,250,223,187,249,251,
+ 45,200,253,229, 48, 82, 83, 83,183,173,108,192, 64,243,162,  8,204,250,246,219,111,255,243,237,183,223,198, 37, 38, 38,242,190,
+184,113,227,198,141,217,181,107,215,222,173, 91,183, 34, 58, 58, 26,  9,  9,  9,  8, 11, 11, 59, 93, 89, 89, 25,115,252,248,113,
+ 20, 21, 21, 49, 34,145,  8,227,198,141,147,251,122,159,142,192,192,165, 91,182,108,105, 48, 48,208, 71,121, 63, 43, 20,138,247,
+190,203,126,240, 21, 99,212, 12, 24,127,122,149,189,180,111,201,227,190,202,115, 40,  1,181,197,101,101,162, 23, 78,159,190,104,
+ 51, 24,152, 95, 25, 70,212, 78, 32,184,162, 80, 40,110,203, 20,128,187,108,128,222,166,  0,220, 66,242,152, 82, 15,224, 55,199,
+159, 95,120,252,241,103, 52,105,105, 47,201, 50,148,111,171,163,186,244,  0, 96,130, 40, 72,130,139,151,171, 48,122,226, 76,226,
+187,188,  7, 53,119,245,138,193,234, 85,223,  0,108, 49,  0, 33,172,181, 70, 68,181, 15,147,117,110, 97,229,255,242,219, 88,  8,
+ 25, 22, 22, 34,132,136, 90,111, 40,  2,176,  2,212,  6,190,129, 97,174, 72,125,246, 13,  2,  0,139, 95,158, 67, 69, 66,187,181,
+111,101,237, 46,243,138,106, 10,155, 21, 16,  8, 89,124,246, 41, 63,165,231,137,100,123,106,228, 85, 95,156,162,224,114,194, 51,
+  0, 75,236,238,254,249, 11, 30,240,233, 34, 43,107, 42, 53, 17,109, 35, 26,219,191, 24,192,190,138,194,104, 52,194,102,179,161,
+170,170, 10,  2,129,  0, 54,155, 13,237,218,181,131,197, 98,129, 82,169, 84,215,243,  4,168,189,213, 12, 24,212,191,127, 54,  0,
+ 52, 69,198, 63,  0,136, 36, 68,  3,  0,145,  3,  6,220, 18, 51,175,111,207,158, 25,141, 17,240,194,226,197,117, 86, 73, 44,120,
+227,141, 58,158,  1, 95,230,254,221,144,185,222,211,106,  0, 31,210,  1,159,124,112,246,172,126,  0,  4, 39,115,114, 44,181,  6,
+ 35, 88,155, 13,189, 99, 99,101,237, 99,250,160,235,128, 62,252,222, 57, 74,166,238,252, 97,155,115,115,120,159,104,231,231,157,
+ 63,108,187,105,219, 83,104,252,233,203, 17,132,105, 17,143,177,227,137,236,196,201,179,184, 92,124, 84, 13,  0,123,119,126,175,
+110,219,249,172,172,255,176,127,248,172,  4, 76,153, 50,  5,190,166,247,181, 17,207,121,183, 75, 38,181,195, 15,151,106,111,249,
+128, 63,115,230,204, 31,  0, 48,  5,  5,  5,236,158,188, 28,180,108,213, 18,141,169,207,145,152,152,248, 69, 98, 98,226, 87,240,
+158,222,185, 14,154, 55,111,174,126,244,209, 71, 73,110,110, 46, 61,123,246, 44,242,243,243, 81, 93, 93, 29,211, 20,181,  0, 28,
+100,251,127, 10,133, 66,148,155,155,219,223,108, 54,191,234, 58,151,239,167,188, 69, 10,197, 63, 68, 97,221,191,154, 95,121,118,
+215,140, 70,200,179,174, 63,116,232,  1,  0,  9,  0,126,  6,203, 86,  3,184, 58,109,225, 55, 72, 13,123,  4,153,149,127,140, 18,
+192,173,  2,112,183,223, 47,  5,192,215,169,132,  6, 93, 85,143, 60,161,217,182,243, 12,121,120, 66,  8,109, 19,213,  9,218,106,
+ 43, 70, 79,120,220,239,142, 16,127, 79, 47, 18,127,207, 43, 80, 40, 94,167,192, 85, 68, 52, 23,162,115, 36,235,211, 75, 63,228,
+159, 11,110, 89,150,176, 55,223, 91, 73,  0, 96,238,188,103,168,217,104,  1, 11,251,178,185,229,159, 46,247,235, 55, 83,102,217,
+107,  6,172,250,207, 73,202, 82,  1, 94,126,233,161,219,153,225, 76,236,234,198, 54,153, 76, 48,155,205, 78, 34,227,  8, 44, 80,
+ 37,208,139, 11,210,135,244,195,126,194,188,112, 97, 82,144,195,131,210,216, 20,100, 20,128,181,215,232,209,117,174,185,107,251,
+118,188,  5,  4,177, 38,205, 19, 19,125, 54,252, 80,191, 20,112, 29,251,187, 69,156,166,239,208, 56,244, 29,138, 70,183,165,183,
+194, 62,245,117, 96, 43,  9,130,145,241,188, 34,245,108,181, 21, 49,205,249, 12,145, 77,210, 21,232,144, 33, 67,154,178, 79, 89,
+252,253, 98,124,124, 60,241,150,136,173, 17,164,253,174, 66,161,248,206, 53, 54,160,145,242,254,165, 80, 40,214,185,198,  6,248,
+ 33,195,  2,160,  2, 64,189,184,129,107,127, 24,249,123, 34,123,183, 61,110,224,192,129,119,106,249,200,  0,254, 68,232,209,163,
+  7, 10, 11, 11,  3, 13, 17, 64,  0,  1,  4,240, 39,  1, 19,104,130,  0,154,  2,  1,242, 15, 32,128,  0,  2,  8, 40,  0,  1,  4,
+ 16, 64,  0,  1,  4, 16, 64, 64,  1,  8, 32,128,  0,  2,  8, 32,128,  0,  2, 10, 64,  0,  1,  4, 16, 64,  0,  1,  4,112,219, 81,
+ 39, 52,117,206,156, 57,126, 71,143,186,203,100, 23,144, 23,144, 23,144,119,103,200, 83, 40, 20, 84,169,108,120,217,105,160,253,
+  2,242,  2,242,254, 90,242,124, 86,  0,184,129,194, 87, 33,158,  6,150,166,150, 23,192,157,  9,111,  4, 19,192,157,249, 28,124,
+ 60, 63, 20,192, 61,251,247,239, 95, 34, 16,  8,134,  7,  5,  5,193, 96, 48, 28,188,247,222,123, 23,  1,200,  7, 96,184, 19,218,
+ 64,165, 82, 73,179,178,178,212,127,197,113,229,216,177, 99,200,207,207,247,122, 94, 94, 94, 30, 61,118,236, 24, 50, 51, 51, 73,
+191,126,253, 26, 45,143,195,208,161, 67,225, 73, 94,  0,127, 98, 15,  0,  7, 95,210,147,242, 73,148,227, 78, 94, 67,229, 97,253,
+ 73,188,243, 87, 31,208,249,158, 59,126,252,120,217, 35,143, 60,162,225, 43, 51, 42,234,230,210,203,165,165,165,117,182,147,146,
+146, 32,151,203,  9, 31,121,183, 82,  9, 24, 63,126, 60,  5,128,157, 59,119,146, 59, 65,158, 94,175, 31,187,105,211, 38,213,233,
+211,167,  1,  0,209,209,209, 15,166,164,164,108,241,247,249,186,246,123, 74,169,243,253,224,246,115,239, 10, 33,  4, 25, 25, 25,
+196,147,242,204,247, 57,248,248,188,250, 28, 59,118,108, 83, 85, 85, 85,175, 46, 93,186,224,250,245,235,168,173,173,  5,128,225,
+155, 54,109, 82,135,134,134,158, 76, 76, 76,124, 24,128,199, 82,146, 35, 70,140,240,201, 32, 56,112,224,128, 12, 60, 83, 61,115,
+200,202,202, 82, 39, 37, 37,201,228,114,185,198,215,231,145,154,154,234,211,245, 77,153, 50,133,247,251,193,161, 75, 23,123,  5,
+220,234,234,106,152, 76, 38,174, 63,241,122,223,242,243,243,241,223,255,122,206, 80,107, 50,153,232,240,225,195,209,187,119,111,
+172, 93,187,182,204,100, 50,117,110,104, 93,120,126,126, 62,102,204,152,193,235, 94,175, 94,189,138, 37, 75,150,224, 78,206,109,
+ 31,192, 13,212, 79,  6,116, 43, 19,  1,  5,172,216, 91,136,239, 51,188,167, 52,126,120,206, 14,159,100,170,213, 55, 12,164,211,
+167, 79, 35, 52, 52,212, 57,  8,185,180,  7, 31,107,139,214,223,174, 63,128,169, 84, 42,154,149,149,229,183,  5,182,110,221, 58,
+233,248,241,227, 27,148,223, 24,164,165,165,209, 81,163, 70,201,166, 79,159,238, 19, 89,108,218,180, 73,213,166, 77, 27,204,156,
+ 57, 19, 58,157,142, 77, 79, 79,223,172,211,233,166, 69, 68, 68,248,148, 69,140, 16,130, 31,126,248,193,185,157,152,152,136, 29,
+ 59,118,120,220,246,134,250, 74,128, 66,161,160,177,177,177,200,204,204,164, 92, 98, 38, 95,201,191,178,178, 50,183,123,247,238,
+ 45,  0, 64, 34,145, 32, 56, 56, 24,101,101,101,168,168,168, 64, 88, 88, 24,202,202,202,122,237,216,177, 35, 63, 49, 49,177, 39,
+128, 43,158,132,245,235,215, 15, 73, 73, 73,136,142,190,145,245,111,233,210,165,117,206, 89,184,112, 33,103,201,170,167, 79,159,
+238,243,243,246,135,252, 57,172, 88,177,162,161, 67,206, 90,  5,254, 34, 52, 52, 20, 39, 78,156,128, 72, 36,130,217,108,198,142,
+ 29, 59, 80, 88, 88,136,151, 95,126,217, 39, 57, 87,235, 21,201,122,240,193,  7,  5,  0,228, 63,254,248,227,142,209,163, 71, 95,
+125,248,225,135,219,170, 84, 42,  8,  4,130,214,225,225,225,  2, 95,100, 53,132,243,231,207,  7, 72,226, 79, 74,254,220, 62,175,
+181,  0,254,172, 88,181,106,149, 52, 37, 37, 69,211, 88, 57,127, 22, 87,118,212,144,119,110, 88,237,  5,175,250, 37, 67,167,211,
+193, 96, 48, 56, 45,144,204,204, 76, 87, 75,136,175,181,117,211,182, 92, 46,199,238,221,187, 41, 33,228,166,227,254,224,199, 31,
+127, 84,191,248,226,139,200,206,206,198,228,201,147,155,164,253,118,238,220, 73,246,236,217, 67, 41,165,200,201,201, 81,231,228,
+228,248,164,160,156, 62,125, 26, 51,103,206,100,  1, 48, 98,177,152,137,137,137, 65,122,122,250,122,  0,235,163,163,163, 39,164,
+164,164,108,231, 35,231, 86, 20,  3,226,148,128,204,204, 76,202,165,  1,230,254, 87, 40, 20, 52, 41, 41,201,151,123, 13,213,233,
+116,155, 36, 18, 73, 11,  0,120,250,233,167, 81, 91, 91,139,140,140, 12,  4,  7,  7, 59,203,102, 11,  4,  2, 84, 86, 86,182,  0,
+144, 14,224, 31,158,  4,114,228, 94, 84, 84,116,211,190,166, 64, 82, 82,146,204,113,159, 50,127, 21,129,231,159,127,222,249,121,
+249,242,229,220, 71,166,222,126,222, 10,  1,231, 53,121,245,213, 87, 17, 26, 26,138,236,236,108,140, 30, 61,218, 47,242,175,143,
+145, 35, 71,  2,246, 44,141,255,124,252,241,199,209,163, 71,143,182, 59,118,236, 64,121,121, 57, 87,114,215,236,229, 93,104,234,
+238, 39,157, 48, 97,130,122,219,182,109,238,188, 55,210, 49, 99,198,168,  9, 33,216,179,103, 79,192,221,123,139,201, 63,117,225,
+251,  0,128,204,165, 47,185, 85,  2,254, 16,  5, 32, 51, 51,211,221,131,166, 13,237,247,231, 55, 14, 29, 58,164,  6, 32,107,172,
+ 18, 48, 99,198,140,191,205,124,182,193, 96,184,201,234,247,135,104, 56, 98,153, 60,121, 50, 18, 18, 18,  8,  0,100,103,103, 55,
+201, 53,174, 91,183, 78,234,176,232, 72, 89, 89,153, 52, 43, 43, 75, 93, 86, 86, 38,245,213, 98,119,135,177, 99,199,146,177, 99,
+199, 98,221,186,117,210,156,156, 28,245,186,117,235,124,146,171,211,233,172, 17, 17, 17,226, 77,155, 54,193,225, 13,168,213,233,
+116, 76,122,122,250, 54,157, 78, 55, 46, 34, 34, 98,247,237,124,190, 28,233,187,246,101,133, 66, 65, 57, 37,141, 39,238, 41, 44,
+ 44,236,213,191,127,127,204,154, 53, 11,149,149,149, 40, 47, 47,135, 72, 36,130, 80, 40,132, 80, 40,132, 72, 36, 66,112,112, 48,
+180, 90, 45, 84, 42,213,116,185, 92,254,172, 55,161, 69, 69, 69,117,148, 67, 78,  1,224, 60,  1,177,177,177,190, 92,163, 59,235,
+ 95,150,149,149,165,110,140,231,201,  5,214,  6,198, 74,222,222,128,243,231,207, 35, 39, 39,  7, 19, 38, 76, 64,151, 46, 93,208,
+170, 85, 43,228,228,228,224,229,151, 95,118,122,223,  4,  2,129,207, 23, 54,114,228, 72, 44, 90,180,  8, 75,150, 44,105,159,146,
+146, 50,245,177,199, 30, 67, 66, 66,  2,  0, 64, 32, 16,204,108,217,178,229, 22,165, 82,105,241, 84, 12,104,221,186,117,188,188,
+  0,165,165,165,152, 54,109, 26, 63,  3, 37, 42, 10,169,169,169,234,162,162, 34,168, 84, 42,174,253,165,169,169,169,106, 78,129,
+ 14,224,214,130, 35,127,238, 51,167,  4,252,225, 30,128,134,230,177,253,  9, 16,188,213, 74,192,253,247,223,223,104, 79,128, 47,
+247,229,203,111, 60,250,204, 78,108,250,100,124,147,180, 21,247,  2, 54, 84,169,234,224,193,131,141, 86, 12,154,226,249,254,248,
+227,143,106,206,234,159, 62,125,186,230,199, 31,127, 68,155, 54,109,212,104,162,196,233,156,220,156,156, 28,228,228,228,120,117,
+ 55,235,245,250,251, 55,109,218,180, 13,  0,210,211,211,197,209,209,209, 72, 73, 73,225, 14, 75,126,251,205, 94, 47, 43, 61, 61,
+125, 87,116,116,244,195, 41, 41, 41, 94,235,147, 39, 38, 38,214,137,137,185,239,190,251,234,120,  6,248,184,253,221, 40,221,212,
+ 93,255,226,158,139,235,116,128, 39,236,216,177, 99, 73, 76, 76, 12,  0,224,204,153, 51,160,148,226,212,169, 83,206,186, 15, 66,
+161, 16,132, 16,216,108, 54, 24, 12,  6,124,251,237,183,144,203,229, 94,171, 46,185,146,127, 82, 82,146, 91,229,197,117,138,192,
+ 31, 37, 64, 46,151, 19,133, 66, 65, 27,235, 13,104,138,113,210, 98,177, 96,240,224,193,208,104, 52, 24, 50,100,  8,244,122,189,
+115,106, 71,163,209, 96,252,248,241,176,114, 37,200,125,179,252,177,100,201,146, 14, 41, 41, 41, 23,191,248,226, 11,231,177, 14,
+ 29, 58, 96,217,178,101,255,229, 75,216, 77, 12,205,225,195,135, 17, 27, 27,139,232,232,104, 12, 30, 60,152, 30, 57,114, 68,198,
+145,127, 81, 81, 17, 52, 26, 13,159, 24,149,161,  0,158,  1,240, 79,165, 82,105,243,112,222,  4,  0, 81,  0,190, 85, 42,149,215,
+  2,212,255,  7,118,108, 62,248, 35,131,  0,155, 66,  9,232,218,181,107,163, 60,  1,220, 32,187,118,237, 90,183,199,183,111,223,
+142,181,107,215,250,101,153,228,157,235,131,184,110, 39,252,118,251,115,112,157,243, 87,169, 84,144,203,229, 78,183,255,193,131,
+  7,209,169, 83,167, 38, 81,250, 26, 99,125,113,214,255,245,235,215,157,117,230,165, 82,169,172, 41,189,  0, 28, 70,143, 30, 45,
+203,201,201, 81,123, 59,111,211,166, 77,219,184,185,127,189, 94,143,165, 75,151,162,166,166,  6, 34,145,  8, 65, 65, 65, 56,119,
+238, 28,222,121,231, 29,232,116, 58,164,167,167,127,167,211,233,198, 68, 68, 68,168,189,144,108, 29,178,247, 22, 19,208, 20,138,
+231,225,195,135,235,156,223, 80,144, 88,100,100,228,112,147,201,  4,171,213,138,131,  7, 15, 66, 32, 16,192,108, 54,195,104, 52,
+130,101, 89,231,123,108,177, 88, 96, 50,153,184,119,218,107,152,120, 67, 46,255,133, 11, 23, 58,189,  0,209,209,209, 40, 43, 43,
+107,180, 34,202,173, 10,240, 33,118, 68, 11, 32,210,221,  1,151,233,  0,159,144,158,158,142, 23, 95,124, 17,131,  6, 13,114,122,
+ 64,184,244,217,131,  6, 13,194,169, 83,167,208,166, 77, 27,159,100,238,219,183, 15, 35, 71,142,236,146,146,146,114,158, 35,127,
+199,248, 25,181, 97,195,134, 75,245,  3,122,249, 42, 20, 13,253,150,143,222, 39,114,248,240, 97,105,106,106,170,122,200,144, 33,
+ 24, 50,100,136, 26,  0, 78,157, 58,133,156,156, 28,190,207,225, 23,  0,193,  0,214, 43, 20,138,105,238,148,  0,133, 66,241, 12,
+128,143, 29,155,139, 20, 10, 69, 47,165,210,123,137,250,191, 50,184,106,128,153, 75, 95,186,105, 10,224, 47, 27,  3,112, 39, 42,
+  1, 51,102,204,160,139, 22, 45,186,201, 21,232, 15,249, 63,250, 76,211,206,211,233,245,250,155,130,252, 56,171, 95, 36, 18,225,
+202,149, 43,183,149,252, 93,173,127, 87,203,109,218,180,105, 26,141, 70,211,228, 94,  0, 95, 60, 39, 51,103,206, 52,  0,  8,  9,
+ 13, 13,197,107,175,189,  6,145, 72,228, 60,158,156,156, 12,  0,136,136,136,192,196,137, 19,177,127,255,254,189, 19, 39, 78,252,
+ 67,174,211,181,189, 93,231,255,221, 33, 54, 54,182, 78,165,198,134,214, 17,155,205,102,104,181, 90,212,214,214, 34, 44, 44, 12,
+ 65, 65, 65,176, 90,173,160,148,194,102,179,193,108, 54,195, 98,177,192,102,179,185, 42,244,215, 61, 93,103, 81, 81, 81, 29,235,
+190,254,116, 64,253,  0,193,198, 66, 46,151,107,124,140, 69,145, 52,116,160,129,216,  0,175,120,231,157,119, 48, 97,194,  4,116,
+237,218, 21, 33, 33, 33,144, 74,165,208,106,181,  8, 13, 13,133, 78,167,195,234,213,171,193, 48,190,197, 23,142, 28, 57,178, 99,
+ 74, 74,202,249,121,243,230, 97,243,230,205,120,232,161,135,  0,160,221,190,125,251,174,250,211, 78, 14,133,  2,220,152,197,141,
+ 85,190,146,191,171, 39, 96,195,134, 13,178,169, 83,167,170,  1, 96,195,134, 13,178,202,202, 74,141, 15,253,217,172, 80, 40,102,
+  0, 88,235, 65,  9, 72,112,249,220, 25, 64,127,216,151,164,  6,224, 66,252, 13,225, 47,153,  9,112,216,176, 97,178,166,  8,  8,
+244,215, 74,119, 29,144,151, 44, 89,210,104,242,231, 48,120,208, 64,236,217,171,198,186,189, 33, 78,165, 32,239, 92,159, 70,221,
+ 99,108,108, 44,138,138,138,144,157,157,141, 78,157, 58, 97,205,154, 53,126, 88, 93, 84,202,125, 74, 75, 75,107, 18,242,231,172,
+255,178,178, 50, 89,253, 99,163, 70, 43, 88,140, 99,  0,  0, 32,  0, 73, 68, 65, 84,141,146,101,103,103, 59,207,105, 10,228,228,
+228,168,249,122,159,116, 58,221,239,176,207, 11,179, 27, 54,108,192,234,213,171,  1,  0,235,215,175,135, 78,167,227, 78,179,158,
+ 58,117, 10,173, 91,183,190, 45,239,128,107,180,191, 59,229,140,111,153,230,162,162,162,131, 54,155, 13, 58,157, 14,215,175, 95,
+119,  6,142, 26, 12,  6,212,212,212,160,170,170, 10,149,149,149, 48, 26,141, 48,153, 76,176,217,108,  0,144,235, 73,102,125,114,
+119, 23, 72, 90,127, 85,  0, 95,168, 84, 42,105,253,123, 86,169, 84,190,246,147,144,166,126, 30,107,214,172,129, 84, 42, 69, 72,
+ 72,  8, 78,156, 56,  1,141, 70,131,208,208, 80,188,254,250,235,216,191,127, 63, 94,126,249,101,159, 20,128,145, 35, 71,182, 75,
+ 73, 73,185, 48,109,218, 52,124,243,205, 55, 28,249,119,  0,112,213,147, 37,207, 71,  9, 88,178,100, 73, 83,144, 63,  0, 72, 57,
+242,  7,128,169, 83,167,170, 71,143, 30, 77,125, 28, 67,205,  0,184,117,138,235, 21, 10, 69,253, 64,137, 51, 46,159, 75,  0, 28,
+ 13,208,190,203, 56,176,240,253, 58,177,  0,245,241,151,  9,  2,108,106,242,119,172,119,109,180,229,198, 77,  7,204,152, 49,195,
+111,242,127,244,153,157, 24, 60,232,134,235,102,211, 55,223, 98,211, 55,246,207,123,246,170,129, 49, 50,  0,190, 45,  3, 84, 40,
+ 20,136,141,141,  5, 96, 15,  6, 60,124,248, 48,118,239,182,199,172, 29, 61,122, 20,163, 71,143,246, 65, 26,209,  0, 55,  2,255,
+ 26, 27,169,191,110,221, 58,169, 59,235,191, 62,154,202, 11,192, 41, 18, 82,169, 84,230,237,220,232,232,232,113,233,233,233,187,
+ 38, 78,156,136, 83,167, 78,225,244,233,211,120,231,157,119,172,  0,132,  6,131,  1,233,233,233,112, 28, 19, 22, 23, 23,227,241,
+199, 31,247, 42,243, 86,196,  0,112,150,116, 86, 86,150,211,139,197, 17, 35,247,220,249, 32, 38, 38,166,192, 96, 48, 12, 55,155,
+205,184,118,237, 26,130,130,130, 32, 20, 10,157, 30,  0,189, 94, 15,131,193,  0,147,201,132,202,202, 74,110, 62,255,162, 39,153,
+ 28,185,115,211,  0,177,177,177,168,239,173,112, 23, 23,192,135,252,185, 28,  0,245,247, 53,166,127,112, 86,191, 27,139,223,202,
+119, 12, 45, 44, 44,196,169, 83,167, 96, 48, 24, 16, 31, 31, 15,131,193,128,172,172, 44, 76,157, 58, 21,155, 55,111,134, 64, 32,
+224,173,  0,196,196,196,116,228,200, 63, 63, 63, 31,111,188,241,  6,  0,116,158, 49, 99,198,229,181,107,215,146,125,251,246, 53,
+106, 12,229, 60,  1,141, 33,255,216,216, 88,202,245,179, 35, 71,142,160,160,160, 64,150,154,154,170,238,217,179, 39, 68, 34, 17,
+117,  9, 12,244,219, 19,160, 80, 40,230,  2,152,  0, 96, 50,128, 54,176,199,  0,252,173,221,255,192,141, 85,  0,238,130,  0,111,
+203, 42,128, 63, 42,  8,240, 78, 35,255,250, 74, 64, 99, 44,127, 79,219,123,246,170,253,121, 65,111,152, 59, 33, 33,232,221,187,
+119,157,227,135, 14, 29,242, 73,222,228,201,147,157, 10, 64,118,118, 54,178,179,179,235,172, 10,240,229,254,215,172, 89,163,  6,
+128, 29, 59,118,184, 37,207,233,211,167,107,214,172, 89,  3,128,223, 18,166,134,146,254,112,138,  6,165, 20,163, 71,143,150, 77,
+155, 54,205,107,223, 73, 73, 73,217,173,213,106,199, 30, 56,112, 96, 79, 76, 76, 12, 78,159, 62, 13,157, 78, 39,140,136,136, 64,
+ 74, 74, 10,180, 90,109,241,129,  3,  7,186,196,196,196, 96,230,204,153, 94,239,215, 93, 30,  0,127, 99,  0,234,191, 91, 74,165,
+146,200,229,114,168, 84, 42, 90,127, 90,134,239,243,136,139,139,123, 69,163,209, 60,103,179,217, 80, 85, 85,  5,139,197,226, 84,
+ 86,106,107,107, 65, 41,173, 19, 24, 40,151,203, 31,115, 16, 35,111,200,229,114,200,229,242, 58,203,  2,125,157,  2,112, 37,122,
+185, 92,174,169, 63,182,184, 42,  5, 77,  8,222,227, 39,183,212,239,133, 23, 94,128, 70,163,129, 76, 38, 67, 97, 97, 33,154, 53,
+107,134,146,146, 18,222, 10,192,161, 67,135, 72, 74, 74,202,133,199, 31,127, 28,251,246,237,195,235,175,191, 14,  0, 81, 51,102,
+204,184,212, 20,228,239,170,  4, 52,198,242,231,198,151,162,162, 34, 20, 20, 20, 16,135, 33, 40, 75, 77, 77, 85, 71, 71, 71, 67,
+ 42,149, 82, 62,129,128,245,148,128,105,  0,214, 59,148,128,131,  0, 20,  0,164, 74,165,242, 10,  2,104,186, 14,220,212,217,248,
+220,  5,252, 44, 93,186,180,193,253,183,147,252,103,204,152,113, 75, 82,134, 54, 70,230,133,139,222,251,119,112,176,111, 94, 75,
+ 79,243,195,254, 64, 46,151,203, 18, 18, 18, 52,123,246,236,161, 27, 55,110,172,163,  8,212, 39, 37,190, 50,211,210,210, 26,212,
+108,184,164, 36,190, 36,  6,106, 72,225,148,201,100,188,200,159, 67,100,100,164,115, 94,255,196,137, 19,255, 72, 79, 79,255, 47,
+231, 17, 40, 46, 46,238,242,234,171,175,202,  8, 33,188,228,221,138, 60,  0,245,219,217,221,252,183, 15, 74,169,126,244,232,209,
+139,183,111,223,254,166,213,106, 69, 69, 69,133, 51,  6,  0,  0,174, 93,187,134,138,138, 10, 80, 74, 57,171,221,167,201,118,110,
+254,191,254,178,191,250,113,  2,124,201,223,245, 57,223,105, 75,121, 57, 37,224,165,151, 94, 66, 78, 78, 14, 38, 78,156,136,247,
+222,123, 15, 11, 22, 44,128, 80, 40,132, 68, 34,241,246, 92,  9,165,148,157, 53,107, 22,254,251,223,255, 98,213,170, 85,  0,208,
+105,223,190,125,151, 28, 22,187, 95,157,201,101,218,170,201, 80, 90, 90, 10, 55,121,  0, 52,153,153,153,178, 49, 99,198,168,253,
+ 89,242,232,176,250,167,  1,216, 10, 96, 46,128,184,  0,249, 55, 12,119, 65,128,188, 20,  0, 95,146,114,248, 75,216, 77,141,166,
+ 32,255, 59,113,208,152, 59,119,174,236,228,201,147, 77, 42,211, 97, 13,169,155, 82, 38, 71,120,220,218,122,  0,206,100, 64, 44,
+203, 98,211,166, 77,188,149,128, 23, 95,124,145,187,206,155, 98,  0, 24,134,  1,203,178,248,215,191,254,165,230, 75,158,158,228,
+ 53,118, 37, 65, 74, 74,202,255,180, 90,237,181,  3,  7, 14,236,224,107,245,223,106,111, 91,253,246,117,231, 98,247, 69,  9, 32,
+132,188, 53, 97,194,132,236,181,107,215, 30, 23,139,197,224, 86,  5,176, 44,139,240,240,112,232,116, 58, 46,133,109,  8,  0, 27,
+ 95,131,192, 53,248,239,240,225,195,144,203,229,117,198, 19,111,227, 80, 81, 81, 17, 45, 42, 42,146,213,119,241, 55,114,201, 31,
+128,  6,221,253,214,229,203,151, 75,  0,152, 97,143,159,226,254,124, 82,  2, 92, 19,255, 60,245,212, 83,206,207, 85, 85, 85, 94,
+ 95,179,184,184, 56,210,183,111, 95,250,213, 87, 95, 61,188,126,253,250,239, 57,178, 93,191,126, 61,124,141,250,231,112,233,210,
+ 37,103, 74,226, 38,130,102,219,182,109, 13,245, 41,205,222,189,123,125,170, 85,225,225,240,101,119,217, 74,255,238, 53, 73,184,
+ 85,  0,238,136,159,215, 42,128,166, 38,245,134,228,221, 41,202,195,157,220,113,250,244,233,163,233,211,167, 79,147,202,116, 12,
+142,183,252, 94, 93,221,255,245, 95,234,134,150,157, 57,174,143,207,181, 17, 31,238,247,150,222,107,100,100,228,206,198, 68,250,
+ 55,101, 12,128,187, 62,236,201,219,227, 67,159, 63, 49, 99,198,140,102,187,118,237,122,183,164,164,228, 57,163,209,  8,155,205,
+134,129,  3,  7, 98,200,144, 33,233,114,185,124, 33, 31,242,  7,128,188,188, 60,231,103,215, 88,147,188,188,188,155,182, 61, 33,
+ 58, 58,154, 56,188,  4, 50,  0,106, 78,153,112,153, 10,240,249,153, 76,153, 50,165,161, 67, 66,151,241, 82,124, 59,198, 21,165,
+ 82,201, 30, 59,118, 12, 31,127,252, 49,  1,192, 43, 41,207,179,207,122,206,201, 52,116,232, 80, 76,154, 52,137,247, 53,120,147,
+ 23,192,157,167,  4, 52, 68,254,110, 21,128,166, 38,193, 64,133,184,  0,220,245,  1,127,203, 87,254, 29,218,230, 14,254, 13,253,
+184,113,227,230,194,238,126,245, 11,  7, 14, 28, 32,211,167, 79,191, 37, 10,173,191,153,  3,255, 72,101,177,177,232,215,175, 95,
+147, 22,227,105,106,121,127,  7,163,236,207,164,  4,120,181,162,  6, 14, 28, 24, 24,136,  3,  8, 32,128,  0,  2,  8,224,111,  6,
+ 38,208,  4,  1,  4, 16, 64,  0,  1,  4, 16, 80,  0,  2,  8, 32,128,  0,  2,  8, 32,128,128,  2, 16, 64,  0,  1,  4, 16,192,159,
+ 16, 86,  0,108,160, 25,  2,240,  4, 97,160,  9,  2,  8, 32,128,  0,  2, 99,123,  0,127,243, 78, 50,103,206, 28,191, 35, 46,221,
+ 69,117,123,146,231,109,253,177,175,242,154,250,250,  2,242,  2,242,254,238,242,126,126,165,216,239,129,101,208,187, 93,112,171,
+229, 29,126,217,127,121,177,239,221, 44, 47, 45, 45,141,  0,  0, 33, 68,106,177, 88,112,238,220, 57,181,217,108,134, 80, 40,196,
+197,139, 23,241, 88, 88, 87,236, 44, 40,128,241,238, 78,136,139,139,147,  9,  4,  2, 80, 74, 53,  0,144,145,145,113,203,159,  7,
+119,125,174, 32,132,244,  1,208,230,248,241,227,219, 58,116,232,192,104,181, 90, 73,135, 14, 29,222,  9, 14, 14, 94,  9,224,146,
+ 99, 57, 41,147,145,145, 97,243, 32,175,185,195, 91, 96, 32,132, 80,  0,184,112,236,127,159, 43, 70,150,164,172, 43,136, 57, 39,
+108, 51, 46,174, 89,243, 22, 53,  0, 40,165, 84,  8, 32, 34, 35, 35,227, 66,224,125,187,179,229,221, 82, 45,145,111,182, 45, 95,
+179,191,249,147, 50,183, 98,245, 55, 82, 97,100,152,250,236,233, 51,178,187,130,154, 33,244,217, 25,154, 59, 73,203,106, 40, 31,
+121, 96,137,203,237,199,230,205,155,165,219,183,111, 87,167,191, 98,223,254,110,223, 72,204,152, 49,131,215,115,217,151,123, 80,
+202, 16,162, 62,117,242, 36,116, 58, 29,186,116,233,130,102,205,155, 35, 49, 97, 28,239,231,186,123,247,238, 58, 47,110,118,118,
+182,199, 90, 10,217,217,217,126,247, 27,174, 80, 83, 70, 70, 70,227,250, 93,146,214,241,129,  2, 32, 64, 86,164,255,178, 98,151,
+  3,209, 79,216, 63, 23,173,  6, 14,207,111,252, 67,157,124,189,238,245,101,183,226,245, 53, 66,  8,213,235,245,178, 93,187,118,
+169,139,138,138,144, 36,106,137,118,157, 90,163, 86,111, 68,176,193,138, 17, 11,158,196,168,137, 83,177,245,139, 12,108,217,179,
+ 71, 61,110,220, 56,217, 29,208,133, 79,219,108,182,246, 69, 69, 69,236,128,  1,  3,196, 49, 49, 49, 56,114,228,200, 43,181,181,
+181, 19,122,244,232, 33, 39,132,104, 41,165,222,166,  2,170, 93, 55,172, 86, 43,243,107,193,207, 61, 58,206, 26,132,127, 13,237,
+219, 58,111,215,  7, 27, 55, 29,149,254,210,163,223,152,247, 28,242, 46, 58, 20,  6, 54,224,105,248,155,185,137,124,205,223,239,
+ 75, 30,124, 95,201,223,182,110,155, 52,190,117, 71, 53,137,138, 70, 97, 77,  5,218,119,232,170,182,176, 54,156,252,100, 13,202,
+186,180,150, 13,157,120, 63, 47, 69,224,176, 90, 65,123,117,231,182,  4,248,118, 23,139,125, 63, 81,164, 78,  3,122,117,  7,230,
+ 47,105, 28,113,115,  5, 74, 26,155,157,204,157, 50,209, 84,114, 27,131,212,212, 84,138,197,  4,228,173,134,207,161,148,  2,139,
+  9,166,252,158,116,199,172,181,190, 65,254,212, 65,254,163,176,127,255,126,204,152, 49,195,235,119,239, 30,176,139,246,233, 51,
+  4, 89, 89,151,113, 40,215,158,176,230,244,201, 83,  0,128,217,255,252,134,158, 58, 51, 89, 22, 42,225,247, 92, 18, 18, 18,216,
+221,187,119, 51,217,217,217,216,187,119,175,199, 66, 76,254,164, 80,245,244,222,166, 41, 20, 52,195, 15,133,130, 75, 23,222,232,
+ 84,198,209, 79,212, 45,182,211, 20, 10,128, 75, 59, 57,170, 19,242,194,217,179,103,161,217,184, 81,253,150,124, 10,  6,206,120,
+ 10,226,182, 17,128,208,145,236,143,165,  0, 43,  2,107,162,184,255,137, 84,148,124,244, 62, 14, 30, 60,168, 30, 62,124,184,140,
+243,  2,220, 38,216, 24,134,105,211,170, 85, 43,104, 52, 26,225,128,  1,  3, 48,116,232, 80,230,202,149, 43,131,126,253,245,215,
+ 99,119,223,125,247, 96, 66,200, 21,  7, 89, 51, 60,219,174,217,216, 49,  9,209,239, 45,219,204, 44, 76, 62,218, 34, 46,113,142,
+ 44,110,152,106,228,130,143, 47, 62, 16,115,207,204, 88, 66, 72, 53,236, 49,  6, 76, 67,253,204, 53,177,149,183,126,212,104,133,
+ 52,128, 58,168,159,  0,168, 62,252, 42,  6,228, 58,128, 12,156,217, 31,115, 70, 60,195,128,103,229,190,250, 74,128, 66,161,160,
+177,177,177,200,204,204,164,174,101, 75,125, 34,214,156,195,210,233,131,226,213, 98, 27, 11, 27, 40,130, 43, 66,112,229,218, 53,
+ 92,169,174, 68,183,160,102, 48, 21, 94, 82, 31,218,178, 93, 54,140,135, 18,208,171, 59,112,242, 44,  3, 74, 37,176,145, 32, 60,
+156, 96,193,164,113, 70,220,136,161,105,124,170,132,198,146, 52, 71,252, 11, 23, 46, 68, 65, 65,  1,  0, 96,219, 73, 17,106, 45,
+ 22,181,226,159, 67,124, 82,  4,124, 81,226, 28, 41, 94, 61, 63,151,197,246,195,177,177,177, 13,231,111, 95,236,223, 59,190,245,
+179,203,210, 45,191,190,225, 84,120, 38,244, 95, 44,123,240,153, 14,141, 30,112, 55,111,222, 44,221,182,109,155,154, 97, 24,188,
+240, 46,156,213,207,248,212,193,136,136,248, 81, 26, 55, 44, 13,192, 22,140, 28,249, 81,157, 99,211,167,  3,247,223, 15,220,143,
+108,245,242,143,192, 75,  9,224,200, 95,163,177,159, 58,117,234, 84,103, 97, 37, 95,  8,204,147,229,207,165,100,118,189,191,180,
+ 52,255,200,191,201, 16,187, 12,  0,176, 98,197,138, 27, 10,192,224,116,224,200, 11,183,229,114,246,238,221,139,149,147, 82,209,
+109, 76,  2, 32, 48,129,136, 24, 16, 33,  3, 34, 16,129, 82,  2, 86,111,  5,181,217, 64,205, 54, 60,249,196, 83,120,234,245,185,
+ 56,219,182,173,186,123,247,238,183,211, 19, 64, 10, 10, 10,226, 59,117,234, 36, 46, 42, 42, 66, 78, 78, 14, 78,158, 60,137,132,
+132,  4,196,199,199,183, 95,181,106,213,219, 83,166, 76,121,210,  7,  5, 64,176,127,207,215, 95, 62, 50,208,208,246,112,181,  0,
+211, 23,215,224,222, 65, 31,226,153,121, 83,133, 31, 44,172,232,182,240,131,181,211,163,  7, 77, 87,162,129, 52,200,174,132,238,
+ 58,166,167,165,165, 81,119,251,155,186, 32, 92,  0,183,192,  3,224,250,144,214,237, 88, 91,209,253,174,238,225,138,183,158,100,
+231,140,120,198,151,106, 78, 36, 51, 51,147,114,105, 73,185,255, 21, 10,  5, 77, 74, 74,242,205,170,222,113, 80, 58, 62,166,175,
+ 90, 92,107, 69,240,  7, 47,194,106, 48, 67,242,194, 18,132,137, 37,168, 21, 25,161,175, 53, 34, 24,  4,166, 11,101,234,202,202,
+ 74, 89, 88, 88,152,199, 65,248,228, 89, 32,115, 61, 11,192,224,248,  3, 70,222,195, 96,210, 56,  2,215, 64,218,212,105, 64,230,
+122, 63, 60,166, 73, 73, 50,199,125,250,101,173,115,228,207, 17, 63,  0, 40,247, 91, 96, 52,235,  1,  0, 99, 23,238, 70,214,210,
+  4, 53,  0,222,242,207,190,127, 22, 34, 82,120,163, 35,144, 82,144, 86,189, 92,182,203,208,250,159,252, 82,132,146,183,236,228,
+239,169,198, 60, 81,100, 81,251, 57,252,172,255, 35,219, 44,210,204,205,207,170, 41, 40,222,155,247, 29,134, 73, 99,176,238,179,
+125,248,207,174, 52,245, 54,  5,197,156,127,188, 33, 27, 56,178,189, 95,138, 64, 77,177,130,142, 25,  0,100,125,117, 28,148, 82,
+ 52,111,115,183,147,252, 87,174, 92,233,241,250,244,181, 42,105,106, 82,123, 53,240, 41,128,239,112,232, 16, 48,108,216,141,227,
+111,191,125,227,243,243,207,101,171, 51,254,211, 83,198,176,157, 60, 94, 39, 71,254,163, 71,143,  6,203,178,248,228,147, 79,154,
+236,  5, 87, 40, 20, 78,242,175,171, 20, 40,104, 70,134,231,119,142,153,162,171,163,254, 18,199, 63,108,146,155,243,136,227, 68,
+ 98,255, 48, 96,192,205,115,236,204, 84,157,211, 43, 15,  0, 44,155,140,121,243,230, 57,143,207,155, 55, 15, 43, 86,172,  0,211,
+ 99,214,141, 95,117,156,239, 78,158,112,170,251,235,179, 90,221,156,199,227,250,106,107,107,209,174, 75, 87,128, 53,131,  9,  2,
+136, 80,  0,107,117, 37,106,139,206,225,218,197, 82,116, 28, 46,  5, 17,135,131, 88,204,128,128,193,210, 57, 11,144,144,249,  6,
+230,207,159,223,164,131,178,183, 84,217, 46,100, 75, 40,165,225, 70,163,113,120,100,100, 36, 78,157, 58,  5,150,101,113,238,220,
+ 57,172, 94,189, 26,189,123,247, 70, 84, 84,212, 76,  0, 79,214, 35,107,182, 33,242,166,148,182,234,194, 28,146,182,239,156, 40,
+174,200, 57,138, 74, 93, 16,254,187,213,138,237,121,255,195,115, 73,193, 66,161,129,141,  5,166, 55, 88,  7,225, 86, 20,183, 10,
+192, 55, 52,212,119,220,121,  6,132,124,137,159, 82, 10,217, 43,163,145,153,163, 12, 79,133,  2,191,124,117, 20, 24,225,124,173,
+120,129, 35,125,131, 97, 45,  0,130,218,218, 85,136,140, 84, 33, 43, 43, 11,190,164,241, 28, 26,212, 66,221,166,214,  6,201,226,
+167, 96,187,174,133,245,210,117,  8,197, 34,132, 16,  1, 66,137,  0,161,  2, 33, 34, 69, 18,232,170, 43,112,121,239, 65,117,216,
+164,251, 60, 14,116,238, 72,125,223, 79,172, 67,  1,  0,150, 45, 34,160,  4,176,135,199,248,222,193, 29,164, 44,203,202,202, 82,
+103,101,101,249, 53,133,224, 74,254, 16, 10, 80,116,217, 62,248,149, 92,173, 69,231,182, 18,244, 72,222,130,172,213, 19,213,124,
+221,235, 34, 82,  8, 33, 41,133,128, 92,135,141,182, 66, 80, 27,130,208,105,151,192,178, 90,212,214,102,193, 86,240, 47,223, 60,
+185, 60, 42,183,249, 82,226, 85,185,249, 25,117,124,228,171,248,228,187, 89,104,198,116,  6,  0, 60,245,108, 79, 12, 24, 26,141,
+181,159,230, 96,229,255,222, 84, 43, 71,250,231, 58, 36,  4, 80, 60,127,204, 57,232,221,123,239,189,216,183,111,159, 87,242,  7,
+128, 25,211, 68,106, 96, 47,128, 99,168,184,218, 12, 61, 58,  3,159,127, 94,  3,181, 26,232,209,  3,136,142,182,139,168,184,218,
+204,254, 50,246,255, 93,253,219,175,157,136, 39,242,223,187,119, 47, 88,150,117,146,244,134, 13, 27, 26, 77, 32,174,219,245,201,
+ 31,  0,188,145, 63,  0,100, 40,149,132,  2, 82,  2,104, 82, 83, 83, 27,236,248,172,203,160,175,204,204,148, 17,  2,172,252,108,
+229, 77, 49, 47, 43, 51,148,174,254, 21, 41,165, 84,253,225,135, 31, 58,119,124,248,225,135, 88,177, 98,  5, 50, 50, 50,234, 86,
+145, 35,144,186,147,151, 97, 79, 97, 43,163,148,106,158,124,242,201,  6,175,207,234,226, 69,201,252,252,115, 25, 33, 64,198,202,
+ 12,181, 59,242, 18, 54,111, 14,136,  4,176, 25, 42,240,251,246, 61, 88,187, 49, 27,159, 93, 58,  7,  0,200,127,179,  5,122,140,
+186, 31,166,146, 11, 56,254,235, 97, 28, 61,119, 26,149, 87,174,224,216,177, 99, 77, 86, 88,107,245,234,213, 82,126,125,152,132,
+ 81, 74,123, 21, 20, 20,124,240,218,107,175,245,253,224,131, 15,196,102,179, 25,  2,129,  0,205,155, 55,135, 94,175, 71,126,126,
+ 62,162,163,163,185,186,  5,158,172,255, 80, 66,  8, 75, 41,141,172,184,120,224,167, 55,191, 44,137,252, 98, 94,  7,104,245, 98,
+136,133, 12, 58, 70, 72,112,229,186, 25,138,127, 91, 49, 96, 72,108,104,103, 47,158,132,180,180, 52,202, 41,  2,174,125,177,161,
+207,  1,220,122,112,228, 95, 95, 57, 96,188, 13, 34, 92,189,239, 58,110,206,196, 25, 62, 95, 64,102,102, 38,181,147,255, 58, 39,
+249, 75,126, 58, 15,195,206,187,234, 28,247,106,185, 42,215, 73,195,180,213, 96,197, 66,152, 15, 31,135,233,247, 34,212,238,218,
+  7, 24, 77, 16, 83,138, 16,  8, 32,  4,129,137,181, 66,107,170,197,103,187,183,122,149,185,108,145,221,186,119,133,125,155, 51,
+ 87, 40, 78,157,161,152,191,196,255, 62, 43,151,203, 53,174,110, 47,149, 74,197,235, 69, 87,169, 84,206,218,218, 28, 30, 91,113,
+ 17,123, 14,235, 80,114,181,214,169,  4, 20, 94, 52,  2,242,141, 80,169, 84,188,220,145, 66, 98,175, 28, 38,170, 62,138,208,208,
+ 51,  8,146, 84,131,101,181,176, 88, 14, 67, 32,136,134, 89, 95,126,219, 58,235,158,111,143, 73,  1, 82,135,252, 47,159,162, 24,
+ 60, 81,128,103,223, 73,192,189,  9,125,  1, 80,199,121,190, 97,221,186,117,244,133,119,  9,154,181,238, 15, 10, 32,113,210, 28,
+236,223,191,159,215,119, 89,230,  2,109,211,230, 55, 39,249, 87,151,219, 75, 48, 15, 24, 96, 39,127,174, 16,160,253, 88, 48,170,
+203,131, 17, 25,114,217,163,204,201,147, 39, 67, 38,147, 97,204,152, 49,152, 58,117, 42,  4,  2,193, 77,127,174,251,249,194,221,
+123,235,151,178,228, 66,196,132, 16,231, 95, 67,251,  8,160,  1,133,166,  1, 89, 55,222,175,212, 84,181, 59,203,121,222,188,121,
+ 72, 77, 77,173, 75,168, 13,200,251, 78,169,196,177, 99,199,212,132, 16, 41,128, 58,109,230,244,103,215,219,231,233,250,196,148,
+130,  9,  9,130,229, 74, 49,148,175,190,138,213,250, 10,232, 70,199, 57,143,127,241,191,213,120, 99,193,108,196,204,127, 12,111,
+ 29,221,139,141,186,115, 72,120,240, 65, 68, 71, 71,251, 60,  5,176,122,245,106,169, 66,161,160,171, 86,173,170,211,135,243,242,
+242,212,158,166,161,  8, 33, 34, 66,200,144,163, 71,143,150,228,228,228,104, 94,120,225,133,184, 79, 62,249, 68, 82, 83, 83,227,
+ 44,211, 92, 91, 91,139,102,205,154, 21, 78,153, 50,165,231,136, 17, 35, 58,123, 81, 36, 24, 66, 72,151,163,185,155,202, 78,239,
+156,127,126,254,203,233,237,183, 44,238,128,223, 75,133,168,172, 17,128, 37, 64,121,141, 25,180,101,247,218,231, 95, 89,210,247,
+129,135,255,225,117, 58, 33, 35, 35,131,112, 99,157, 82,169,244,250, 57,128,219, 67,254,110, 61,  0,174,196,207,103,156,241,197,
+ 18,185,225,106, 91,229,214, 59, 80, 39,206,160,  1, 55, 70,223, 86,109,213, 90,106,129,184, 92, 11,201,119,123, 65,132, 12, 80,
+107,  6,173,214,131, 88,173, 16,  1,176, 81, 22,181, 54, 43,170,173,102,128,245, 62,135,202,  5,249, 45, 91,212,240, 48,104, 15,
+ 18,108,252,128,170, 84, 42,  9,231,210,231, 99,173,223,100,253,  3,248,250,153,246,117,182,135,188, 84,  4, 17,189, 14, 11,105,
+133,172,172,172,189,124,189,  0,146, 26, 53, 34,223,250, 31,174,189,144,134,235,218, 96,116,176, 28,135,205, 86,  4,  0, 40,254,
+165,221,109,235,176, 27,119,124,172,158, 61, 78, 89,135,252, 57,196, 69,188,138,225,125, 39, 35, 62,242, 56, 54,238,120, 71, 61,
+118, 18,255, 65,100,237,218,181,244,199, 31,127, 68,121,249, 88,180,108,185,  7,205, 90,245,  3,165, 20, 12,195,240, 10, 68, 42,
+ 41,  1,138,138,142,113, 19,  9,128,164,  6, 90, 61, 48,116,168,125, 79, 97, 33,240,233,167, 64,117, 21,160,175,  1,106,244, 64,
+104, 68, 21,175,107,107,104,174,255,236,217,179,  0,128,119,223,125, 23,  0, 16, 19, 19,211,100,110,102,215, 62,201,231, 59,115,
+231,206,133,171,197, 94,159,184,125,128, 20,184, 49,247,239, 10,206, 11,224, 56, 71,227, 73,200,172,168, 24,156, 62,126,  2,165,
+ 17, 17,106,134, 97,240,220,115,207,225,163,143, 62,242,251,250, 70,154,194, 65,217, 26,204,126,119, 17,250, 79,158, 12,229,187,
+239,130, 97,110,240,156,178,240,216, 13, 15,225,190,125,216,189,123, 55,206,157, 59,231,115, 16,224,234,213,171,165,185,185,185,
+106,  0,200,207,207, 87, 51, 12, 35, 75, 78, 78,214,172, 90,181, 74, 74, 41, 69,124,124,188,204,104, 52,170, 27, 80,236, 44,121,
+121,121,253,103,204,152,209,162, 91,183,110,216,190,125,187,161,178,178, 82,104, 52, 26,237,222, 14,199,252,199,248,241,227, 99,
+  8, 33,193,148, 82,163, 27, 49,140,139, 60,166,232,212, 47, 43,222,248, 87, 74,179,150, 61,178,240,115,214, 19,248,237,  2, 65,
+201, 85, 33, 64, 25,152,204, 22,104,105,203,210,167,103, 61, 21, 71,  8, 41,165, 77,160, 85,242,137,179,  9,224,143, 65,131, 83,
+  0, 57, 57, 57, 55,237,171, 40,213,249, 76,118,174, 30,  0,251, 20,128,189,255, 72,126, 58,143,160, 99,165,176,133,219,173,168,
+250,115,200, 13,173,107, 60,113,177,  4,134,160, 96, 68, 91,173,232, 24,220, 12, 33, 34, 49,136,197,  2,176, 20, 86,155, 13,213,
+ 54, 51, 12, 54, 43, 76,212,  6, 27, 40,168, 15,157,109,254,146, 27, 74,128, 61, 46,224,  6,233, 47, 91, 36, 64,250, 34,130, 23,
+150, 88, 27,221,232,114,185, 92,195,149, 46,229,131,133, 89,246,118, 95,154, 20,225, 36,124,167, 43,159, 94,135,  8,128,144,234,
+240,213,236,  8,235, 99, 42,126,113, 29,162,171, 63,193,  6,187,155,250,  3, 97, 24, 30,187, 90,140,130,127,119, 68,104,187,222,
+168, 44, 45,197,149,243,151,110,107,199, 28, 48, 52, 26,122, 71,119, 51,  4,159, 64,136,177, 15,190,121,211,226, 60, 62, 66,222,
+ 23,185, 27,125,179,252, 39,141,250, 17,223,125, 39, 71,120,174, 10,203, 23,  1,207, 47,161, 24, 53,106, 20,239,101,127, 93, 59,
+118, 34,221,187,215,213,  2,183,110,181,  7,254,173, 91,  7,244,232, 65,177, 98,  5,193, 91,111,213,216, 21,  4,  0, 61,122, 70,
+224,133,231,249, 93, 35,103,165, 78,158, 60, 25, 27, 54,108,168, 99,201, 38, 38, 38, 54, 72,110,254, 42,162, 62,122,240,100, 43,
+ 86,172, 80, 55,164,  0, 44, 91,182, 12,153,153,153,188, 44,225, 39,159,124, 82,205, 69,254,187,195,243,207, 63,143,229,203,151,
+171, 51, 51, 51, 61, 94,227,143, 39, 74,240,202, 91, 11, 48,107,241,191,240,178,217,140, 15, 63,252,176,193, 54, 90,182,108, 25,
+ 84, 42, 21,  8, 33,210,134,  8,123, 84,159,206, 88,245,197,167,136,157, 62, 29,111,190,249,166, 71,165, 97,222,188,121, 88,182,
+108, 25, 62,255,252,115,141,175,109,159,155,155,171,230,130,229, 20, 10,  5,205,203,203, 83, 39, 39, 39,147, 67,135, 14,169,  9,
+ 33, 72, 78, 78,214,172, 92,185,178,193,239, 27, 12,134,240,173, 91,183, 98,236,216,177, 40, 44, 44, 12,209,235,245,176, 88, 44,
+ 96, 24,  6,102,179, 25, 73, 73, 73,196, 65,238, 70, 62,142, 45,147,201, 36, 62,188,105, 58, 70, 61,242, 22,118,230,156,197,185,
+203,  2, 84,233, 25,  8,132, 64,169, 62, 24,207,189,180, 40, 30,192, 69,190,220,207,197,157,  0,252,166,  3,  2,184, 61,214, 63,
+220,185,113, 56,215,140, 84, 42,133, 84, 42,197,175,191,254,234,252, 43,250,169, 24,149,198, 74,180, 28,234,251,186, 95,142,220,
+ 67, 66,102, 64,242,211,121,136,138,203, 65,  9,129,120, 86,121,157,227, 94,137, 75, 44,128,141,  2, 23,245, 21, 40,169,212,226,
+ 90,149, 14,149,181,181,208,153,141,184,102, 50,226,114,173,  1,165,181, 53,208, 90, 76,208,177, 22,152, 89,239,217, 48, 71,222,
+227,102,192,115,137, 11,152, 61,181, 25, 40,196,160,190,149,  1,119,186,240,235,119,118,190,238,127,167,229,121,181, 22,123, 14,
+235,234, 16, 63, 71,254, 65,108, 49,130,216, 98,188, 49, 94,136,146,146, 18, 51, 95,153,155,206,177,104,157,158,225,220, 62,167,
+183,225,226,217, 82,156, 58,112, 28, 87,206, 87,220,246,142,187,238, 51,187,  2, 90, 85, 70, 17, 98,236,  3,233, 44, 33, 30, 89,
+ 44,114,254,165,111,156, 14,  2,194,123, 64,122,232,222, 28, 60, 49, 95,142,136,188, 61, 32,132,224,251,  3,246, 71,192,151,252,
+ 57,196,244,234, 89, 79,177,  0, 62,249,  4, 56,115,198,238,  9,120,243, 77,234,116,191, 83, 74, 17, 17, 17,225,125,  4,118,244,
+ 81,155,205,  6,155,205,134,119,223,125, 23,103,207,158,197,233,211,167,113,250,244,105,168, 84, 42, 44, 88,176,  0, 37, 37, 37,
+183,243,145,104, 26,178,164,231,206,157,203, 89,117,188,200,144, 16,226,214,250,231,224,233,152, 43,246,  5, 85,128, 48,205,240,
+159, 87,150,160,217, 86, 21, 82, 83, 83,225, 90,106, 88,209,163, 31,230,198, 14, 71, 72, 72,  8, 70,141, 26,133,215, 94,123, 13,
+ 42,149, 74,173,211,233,220,190,127, 95,148,158,198,229,190,125, 16, 21, 21, 37, 99, 89,182, 65,111,  7,231,169,240,215,243,226,
+ 26, 41, 31, 31, 31, 47,227,136, 18,  0,226,226,226,100, 94,218,110,204,168, 81,163, 90,148,148,148, 96,223,190,125,184,235,174,
+187, 32, 20, 10,157,202, 98, 84, 84, 20,223,233,  8,214, 33,143,116,239, 53,104, 97,230,174,112,252,182,125, 49, 70,198,247, 70,
+168,132, 65,104,136, 13,193, 65, 38,220,247,208, 20, 22,128,182,190,174,234, 77,185,228,238,143,207,116, 64,  0,183, 15,140,167,
+135,168, 84, 42,155,207,157, 59, 23,115,231,206,  5,  0,243,219,105,111,195, 82,102, 69,112,176,196,175,100, 36, 73, 73,246,240,
+225,144,241,103, 64,  5, 12, 94,251,198,224,180,254,249, 34, 36, 42, 74,102,109, 22,  2, 29,181,225,132, 94,135, 99,149,229, 56,
+ 94,117, 29,199,171,180, 56,161,215,226,140, 65,135,114, 83, 45,106,172, 86, 92, 50,232,157,191,233,  9,147,198, 17, 44, 91, 36,
+192,178, 69,  2, 80,  8, 64,  9,131,212,105,  4, 79, 78, 19, 99,214,212,214,232,222,189, 45, 88,136,  0,248,118,203,156,171, 63,
+ 41, 41, 73, 86,127,159, 15,109, 38, 43,188,104, 87,228, 11,222,183,  7,209,237,124, 49,204,238,190,161, 58,  8,168, 30, 38,198,
+ 30,209,172,213,106, 67,146,146,146,124, 42,138, 30, 27, 27, 11,149, 74,133,117, 53,122, 24,205, 12,158, 88,255, 31,148, 73,130,
+ 97, 52,223,190, 50, 17, 19,  7,188, 33,203,213, 46,193,186,255,222, 48,241,191,121,211,130,184,136, 87,111, 40,148, 15,124, 42,
+203, 80,102,240,202, 45,177,252, 85, 32,121,254, 88,132,231,169, 32,251,247,104, 48, 19,  0,141, 70,227, 87, 31,238,210,165,110,
+244,248,152, 49, 64,120, 56, 16, 29, 13, 12, 27,208, 28, 18,177,  0,  2,230,134, 88, 73,112,176,215,  1,153, 97, 24,231, 92,255,
+217,179,103, 17, 19, 19, 83,231,239,173,183,222,194, 91,111,189,133, 75,151,248,123,101,220,205,215,187, 34, 45,205,119, 11, 44,
+ 51, 51, 83,182,124,249,114,183,132,205,215,250,119,113, 61,223, 20,167,192,109,179, 44,191, 20,246,102, 66,192, 26, 76, 16,181,
+235,  2,197, 59,239, 32, 57, 52, 28,225,154, 92,231,241, 89,255, 72,198, 27, 31,252,  7,133,203,190,198,235,253,199, 96, 74, 68,
+ 55,236,222,188, 25, 69, 69, 69,110,223,191,135,211, 20,232,219,175,159,140, 11,106,228, 20, 50,215,233, 25,119,251, 60, 88, 95,
+ 52, 45, 45,141,114,129,125,220,124,191, 43,201, 39, 39, 39,107,226,226,226,100,156,235, 63, 57, 57, 89,227,165,221,114, 68, 34,
+209, 93, 15, 63,252,240,217,202,202, 74,232,116, 58,  4,  7,  7,163,117,235,214,  8, 15, 15, 71,120,120,184,183,198, 99,235,201,
+179,  5,  5,  5, 25, 30, 77,251, 72,182,250,167, 33, 56,127,161, 10,109,195,  4,136,239, 73,112,119, 55,138,208, 22, 45, 42,  0,
+216, 60,240, 70,160,222,192,159,212,250,  7,188, 47,  3,172, 81, 42,149, 65,  0, 66, 21, 10,133, 83, 11,236, 56,186,131, 95,154,
+175, 82,169, 36,114,185, 28, 42,149,138,138,103,101,213,113, 69,242,205,  3,208,242,193,177,154,242,172,237, 48, 88, 77,168,210,
+ 27,112,214, 98,129,136,181, 59,234, 43, 45,181, 96, 41,  5,  5,176,253,234, 57,232,173, 22,  0,224, 49, 48, 17,204, 95, 82,183,
+143,219,167,  2, 88,216, 96,194,239,103,170,177,106, 67,149, 79,247,235, 74,244,114,185, 92, 83,223, 11,224,170, 20,120,130, 92,
+ 46,215,100, 41,166, 64, 52,246, 51,  0,209, 40, 47,191, 17,156, 39,102, 47,195,204,180,199,211,253, 79,227,242,101,251, 64,172,
+ 84, 42,247,240,145,155,246, 77,102, 29,197, 43, 43, 43, 11,220,164,196,250,163,  7,125, 90,149,209,212,120,224,169,246,154, 45,
+ 10,138,  3,170,227,  0,128,225,125,237,153,241,254, 53,111, 49, 14, 30,239,139, 15, 54, 78,135,114,235, 83,106,229, 68,126,  4,
+254,196,124, 57, 34, 35, 85,174,134, 44,180, 90, 57, 40,205,114,184, 42, 41,178,178,146,120,201,154,252,200,163,100,247,206, 93,
+ 20,176,187,254,101, 50,130,235, 23,194,160,215, 73, 96,172, 18, 99,253, 26,130,185,115, 41,138,203,170, 49, 44, 62, 14,211,167,
+ 78,227,101, 21,219,108, 54,231,124,191, 74,101,191, 86, 87,194, 47, 43, 43, 67, 89, 89,153,207,238,125,133, 66, 65, 25,134,185,
+137, 84, 51, 50,148,196,143, 36, 64, 26, 74,105,157, 88,  0, 23,143,  0,111, 87,184,171,107,191,126,244,190, 55,183,127,125, 37,
+199, 90, 93, 13, 81,171, 72,  8, 66,154,161,239,163,147,241,214,184,  4,188,194, 45,219, 27, 52, 24, 54, 99, 45, 68, 45,219,162,
+127,156, 20, 93, 59,118,195, 71,191,231,162, 95,191,126,178,159,126,250,233, 38, 37, 32, 77,161,  0, 64,212,  0,240, 84, 90,154,
+115,233,160,181, 30,217, 11,133,  2,128,222, 88,168, 72,  0, 12,112, 51,200, 14, 28, 56,144, 80, 74,157, 46,254,252,252,124,167,
+139,223,245, 60,199,182, 87,242,119, 24,236,175,134,135,135,247,141,139,139,235,126,242,228, 73, 28, 57,114,  4, 54,155, 13,161,
+161,161, 48, 24, 12,101,145,145,145,231,125, 49,250,  8, 33, 76,219,182,109,119, 63,244,208, 67,109,243,246,231, 99, 69,214,110,
+180, 32, 98,244,108,107,194,153,235,161,184,183,167,229, 28,  0, 11,167,160, 57, 20, 74,155,167,103,226, 58,214,  5,166,  0,238,
+108,240,153, 47, 54,  3, 48,187, 18,245,197,156, 75,192,116,223,201,223,149,108,220, 13, 90,124,149,128, 42,173, 78,102,  9,145,
+168, 43, 25, 22, 87,106,107,  0,139,  5, 54, 74, 65,  0,252, 94, 83,129, 82, 67, 21, 40,165, 92, 18, 27, 30,  3, 19, 69,234, 52,
+130,204,245, 55,250,228,201,179, 64,175,238, 86,  8,160,111, 20,249,187,118,118,127, 93, 94, 73, 73, 73,178,172,172,167,212, 64,
+  1,180, 90,173,185,164,164, 68,184, 52,  1,204,194,221,163, 48,175,223, 65,167, 21,198, 87,169,112,231,117,169,191,205,145, 16,
+ 95,107, 14,139,  9,134,100, 22, 81,192,253,114, 63,103, 38, 64, 21, 40,159, 32,197,180,137,159,201,148, 91,158, 86,231,110,164,
+136,143, 60,142, 17,242,190,216,191,251, 56,242,116,239,128,128, 64, 49,241, 83,222,247, 26, 25,169,  2, 33,  4,147, 38, 77,194,
+231,159, 87,129, 51,138,237,255, 83, 71, 27,103,213, 25,144, 60, 76,193, 98,244, 24,153, 44,103,175, 90, 61,102, 12, 96,190,210,
+  9, 23, 42,130,192, 58,102, 91,219,235,219,226,197,212,106,236,206,235,137,230, 29,123,242,186, 70,142,248, 47, 94,188,  8,  0,
+184,114,229,138,211, 51,112,245,234, 85,231,192,234, 15,148, 74, 37,225, 18,  1,213,159,195,205, 80, 42,  9,159,124,  0,174,248,
+252,243,207,235,196,  2, 44, 95,190,220,103,235,191, 62, 97,248, 11,137, 68,130, 43,197,231,209,173,123, 15,176, 86, 19,136,213,
+  6, 97,243, 22,104, 62,120,  8,154, 13,186,  7,172,222, 10,155,193,  4,106,181,  1, 54, 22, 11, 87,126,128,169,211,167, 66, 34,
+145,184,149,103, 93, 31,193,235,119,221,157, 23,251,158,251,115,227,227,227,101,121,121,121,106,110, 12, 24, 49, 98,132,219,182,
+226, 65,254, 32,132,176,  0,118,244,236,217,115,208,199, 31,127,108,190,118,237, 90,109, 66, 66,194, 67,  5,  5,  5,175, 27, 12,
+134,242, 86,173, 90, 41,250,244,233,163,245,161,237, 69,  0, 58,199, 13, 27,214, 58,109, 86, 26,206, 93, 60,167,125,124, 86,218,
+200, 67,187,215,164, 95,174,214, 14, 31, 50, 58,129,109,219, 49,230, 17, 55, 94,  3,214,211, 88,224,202, 21, 13, 37,255,  9, 36,
+  2,250,243, 40,  0, 13, 90, 23,254,144, 63, 71, 54, 92, 78,  0,127,148,128,110,138, 25, 26,  0,164, 84,185,154, 34, 88,  2, 29,
+181,194,108,181,130,165, 44, 90,134,133,225,162,190,146, 95,  6, 59,  7,220, 45,239,187, 17,  3,224, 91, 38, 54,119, 46,254,198,
+166,235,117,124,119,226,144, 33, 67,182, 44, 92,184, 80, 28, 25, 25,201, 94,190,124, 25,243,250, 93,174, 67,254,190,252,134,187,
+246,247, 27,142, 44,127,245,147, 60,185, 59,135, 47,  6, 61, 32,208,100, 60,144, 65, 54,127,114, 73,186,237,232,155,234,220,141,
+  0,  1,193,196,  1,111,200, 30,120,138,127,  2, 32,174, 47,217,  9,190,202, 49, 72,  1,238,120,103,117,186,221,121, 18,218, 57,
+131,  0, 13, 23,215,152, 62,117,154,102,250,212,105,164, 92,247,177,212, 86, 93,173, 38,  2,192, 80, 27, 12, 82,109,133,144, 17,
+194,192, 72,100,227,166,204,134,144, 18,175,215,153,144,144, 64,238,186,235, 46,122,171,222, 63,187,181,159, 65,210,210,210,168,
+107, 68,187,171, 39,192, 71,113, 26,206,242,119, 81, 40, 52,183, 99,240, 26, 51,102, 12,158,222,152,137,183,170, 43, 48,112,244,
+189, 96,218, 70,216,175,201, 66,237,169,123, 33,  2, 17,  8, 65,196,  2,124,158,177, 12, 45,198, 14, 65,247,238,221,255,208,212,
+189,156,117,159,155,155,171, 30, 54,108,152,108,230,204,153,141,250,237,179,103,207,202,247,236,217, 83, 44, 16,  8, 54,143, 28,
+ 57,242,109,134, 97,174,197,197,197,229, 56, 45, 25, 23,143, 18, 33,  4,238,158,185,139, 39, 64,117,228,200,145,161, 95,173, 94,
+195,136,  5, 65, 23, 38, 63, 54,121,  0,195, 48,186,123,239,159, 61,  1, 64,152,131,248,171,  1, 80,171,213,234,148, 87, 79,105,
+ 11,148,148,191,  3,193,199,253,239,151,  2,208, 20, 10,131, 39,242,241,101,128,147, 10,122,251,182,  0,  0, 32,  0, 73, 68, 65,
+ 84, 41,146,137,106,183, 74,202,158, 42, 84,235, 77,102, 88,109, 54,116, 31, 58, 24, 49,214, 97, 62,145, 97, 83,  6,163,112, 73,
+127,  0,168, 57, 79,135,203, 84,  0,105,132,220,173,114,185, 92,168, 82,169,230, 47, 93,186,244,223, 46,202,197, 24,165, 82,233,
+ 83, 34, 18,135,167,160,201,146,151, 76,249, 61,201,209,142, 13,223,223, 20,149,202, 47, 77,255,193,103, 58,104, 30, 68,227,159,
+143,157,220,  9,158,152, 63,198,153,167,156, 27,199, 86,167,239, 65,104,231, 12, 18,218, 57,201, 39,153,225, 45,158,213, 28, 40,
+  6, 97,153, 11, 82,163,193, 94,  7, 32, 84, 34,215,132, 69,193,167, 21,163, 46,253, 79,228,208, 56,155,124, 94,149, 83,  2,154,
+ 66,150, 35, 22, 64,205,125,110,172, 60,127, 87,150,117,239,222, 29,237,158,123, 78,182, 98,215, 46,117,209,219,223, 33, 73,212,
+ 18,225,142,226, 61, 70,131, 21,115, 23,188, 12, 65, 72, 36,182,175, 81,226,215, 86,  4,227, 26,145,183,223,102,179,194,215, 24,
+160,250, 74,  0, 31, 43,223, 75, 59,145,211,167, 79, 95,163,148,166,247,234,213,235,203,242,242,114,189, 80, 40,132,213,106,165,
+ 45, 91,182,116,122, 84,244,122, 61,196, 98,177,211,139,228, 65,222,168,252,252,124,176, 86,130,225, 35,  6,188,113,241,226, 69,
+157, 86,171, 69,100,100, 36,219,177, 99, 71, 29,247,108, 42, 43, 43, 33,145, 72, 64,  8, 65, 80, 80, 16, 47,163,143, 83, 18,234,
+127,174,239, 21, 13,224, 79,230,  1,184, 85, 74,129,223,196,152, 32,215, 32, 65,126, 71, 69,147, 58,148,  0,114, 11,230,209,109,
+114,185,252,255,228,114,249,255, 53,197,245, 53,225,253,146,166, 56,231, 86,194,110,213,  3,142, 20,251,245,142, 37, 53, 74, 54,
+195,118,210,132, 74, 58, 53,197,101, 90,110,101, 27, 52, 97,209, 21,141, 47,115,245, 94,148,  9,191,229, 80, 74, 73, 72, 72,  8,
+ 38, 77,154,  4, 71,249, 94,148,184,148,239, 61,176,103,183,179,124,239,216,184,177,112, 40,189, 13,254,222,231,186,247,200,147,
+ 17, 47,223, 76, 76, 60,171,  9,242, 80,  2, 26,141,123,238,185,199,100,181, 90,115,  0,232, 89,150,165,102,179,125,225,207,181,
+107,215,  0,  0,205,154,217,151,246,114,251, 69, 34,145,199,246,123,224,129,  7, 56, 25,187, 88,150, 69,120,120, 56, 88,150,117,
+174, 56,113,172, 98, 33,181,181,181, 20,  0,196, 98, 49,  8, 33,204, 31, 49,182,  7,224, 63,248,164,146,  6,  0, 50,112,224,192,
+128, 38, 22, 64,  0,  1,  4,240,231,129, 21, 64, 45,  0, 73, 19, 27,113,222, 10,  6,241,174, 40, 24,192,159,  3,129,135, 25, 64,
+  0,  1,  4,240,231,130, 16, 64, 51, 30,228,111,128, 61,136,187,169,248,128, 69, 96,217,223, 95,174, 35,  5, 16, 64,  0,  1,  4,
+240,215, 67, 72,128, 47,  2,  8,120,  0,  2,  8, 32,128,  0,  2,  8, 32,128,128,  2, 16, 64,  0,  1,  4, 16, 64,  0,127,119,212,
+113,233,204,153, 51,199,239,  8, 78,119,197,123,238,116,121,209,131,131, 16, 28,116,  5, 34,113,  5, 88,214,190, 44, 76, 32, 96,
+192, 16,129,253,127,134,128, 16,  6,148,  8,237,107, 96, 97,197,150,109, 34, 80, 74, 17,201,180,132,143,215, 23,  4,160, 21,236,
+  1, 60,213,176, 47,247,178,192, 49,167,246,103,108,191,128,188,128,188,128,188,128,188,128,188, 59, 83,158,207, 10,192,223, 13,
+ 63,238, 63,131,161, 67, 44,136,  8,  7,180, 58,130,159,127,149, 64,200,  8,113,255,120, 27,118,171, 91,131, 16,  6,132, 97, 32,
+105, 14,140, 25, 90,  1, 64,136,123,227, 41,242, 11,132,118, 26,231,  1,245,193,253, 20,  0, 68,212,130, 97, 35,199, 20,159,254,
+237, 39, 83, 89, 85,109,140,205, 80, 11,185, 92, 30, 14,160, 50,160,135,254,185,145,253,205,127,165, 61,186,119, 83, 95,187, 86,
+219,168,132, 79,127, 34, 72, 83, 83, 83, 93,243,  0, 52,234,158, 83, 83, 83,253, 78,  7, 28, 64,  0,  1, 52,145,  7,128,195,154,
+175,190,224,173, 77, 60, 49,115,150,215,151,181,169,229, 53, 37,242, 11, 68, 72, 76,176,225,215,223,130, 33, 22,  9, 33, 20,  8,
+ 33, 18, 81,  4,  9, 44,128,176, 57,132, 48, 98,104, 95, 43, 36,226, 32, 80,  0,237,219,  2, 15,222,207, 98,207,102,126,228,127,
+230,247,211,184,171, 79,119,116,136, 10,199,197,226,147, 93,194,218,117, 67,171, 14, 54,252,240,253,247, 80,169, 84, 21,183,123,
+125,188, 74,165,186, 63, 43, 43,107, 27,183,157,148,148,244,128, 92, 46,223, 22,120, 53,188,227,183, 95, 85,212, 90,123, 92, 54,
+237,193,238,106,150, 45, 71,101,  7,163,250,228,177,141,168, 49,181,199,144,216,145,127, 89, 18, 75, 77, 77, 85,207,155, 55, 15,
+132, 16, 94,101,123,249,128, 75, 22,211,  4,229,230,  3,104,164,  2,230, 17,148, 34,243,243,207, 27,124,222, 92,130, 31,215,108,
+129, 92, 13,  1,151, 90,  2,206,231,236, 90, 25, 49,128,166,  5,151, 13,144,131,187,220,  0,119,148,  7,128,193, 31,219, 15,238,
+ 31,103,  1,133,  0, 66,129,  8,195,135, 17,180,105,205, 64, 40,100, 16, 36, 18,160, 87, 12,131,226, 11, 86, 12,141,101,208, 50,
+ 82,130, 31,246,182,  0,  0,  8,168, 17,246, 84,216, 54,175,228,255, 91, 65,  1,186,118,232,136,223,114,243,112,200,108,129,238,
+186, 14,226,160,230,232, 61,104,  4,  6,140, 24,  7,245,150, 44,  0,252,114,227,223,  2,226, 31,147,149,149,181,103,225,194,133,
+ 40, 40, 40,224, 58, 76,  5,128,231,102,207,158,189, 53, 41, 41, 73, 46,151,203,247,252,229, 94,138,159, 85, 52, 72,168,133,144,
+ 49,163,182,214,134, 74,125, 48,238, 29, 53,197,167,246,223,152,253,149,180, 69,176, 22,255,152, 58, 24, 93,187, 60,168,110,209,
+ 34, 12, 22,171, 21,215,174, 93, 71,219,146, 11, 40, 60, 91,132,131,  7,180,116,248,136,135,252,122,174,153,153,153,212,101,112,
+190,211,  6, 71, 41,112,163, 28,174,163, 58,160, 20,183, 41, 29,240, 31,248,190,208, 77,155, 54,221, 92, 79,225,182,145, 23,149,
+ 18, 16,208, 38,104,119, 90,242, 13,200,161,217,174, 28,239,200,146,233,168,134,228,130,217, 25,122, 12,157,250,177, 71, 69,238,
+135, 31,126,112,110, 39, 38, 38, 98,199,142, 29, 30,183,  3,184,245,228,239,186,207, 85, 17,240,168,  0, 28,216,127,  8, 35,238,
+ 29,246,135, 93, 52,235, 67,254, 84,215, 84,146,254,102,159, 98,132,  2,232,180, 66,180,107, 35, 66,187, 54, 98,212,212,136, 32,
+ 17,  9, 97, 19,  6, 97,112,127,130,129,119, 11,192, 16,145, 61,  5,166, 72, 12, 17, 99,  2,145,136, 97, 53,  0, 86,232, 61,146,
+255,254,189,123,208,173,125,107, 28,251,245, 24, 22,189,253, 70,157,235, 91,242,230,187,148, 17, 16, 12,142, 29,140, 31,118,236,
+241,169,242, 30,203,178,210,130,130,  2,245,153, 51,103, 16, 28, 28,140,224,224, 96, 89, 98, 98,162,198,199,193, 76,150,149,149,
+181,135, 35,126,151,206, 17, 14, 96,220,127,254,243,159,235,179,103,207, 86,  1, 72,144,203,229,170, 59,177,131,175, 90,181, 74,
+154,146,146,194,251,190,191,222,176, 70,218, 47,166,185,186, 75,251, 90,132,181,  8,  2,195,132,192,104,180,162, 92,107, 68,142,
+106,  5,149,180, 24,140, 97, 67, 71,241,234, 71, 34, 92,193,164,  7,238, 86,247,237,219, 27,151,175,232,112,248,231, 35,168,169,
+209, 35, 44,172, 57,162,163,187,128, 17,136, 96,179,149,224,231, 95,246,211, 65,  3,239,253, 75, 89, 55,169,169,169,234,231,159,
+127,222,185, 61,111,222, 60, 44, 95,190, 92,253,185,  7,171,208, 39, 50,186, 67, 61,  0, 14, 37,157,102,103,103,195, 93, 97,165,
+ 63, 18,174, 86,182, 82,153, 33,163,180,113, 74,  0,211,229, 81, 39,121,231,191,215,204,173, 25,214, 46,156, 65, 84, 36,243,167,
+125,126,127, 87,184,146,189, 59,165,192,171,  7,224,192,254, 67,  0,208,104, 69, 96,255,115,133, 30,143,223,251, 81, 15,191,  7,
+ 11, 66,136, 95,213,246, 84,154, 54, 16,  9, 69,232,212,161,  6,213,213, 34, 28, 62,214,  9,  2,129,  0,  2, 34,128, 88,100, 69,
+223, 30,  6,244,236, 33,  0,  1,  3,177, 40,  8, 98,  1, 65,236,221,102, 68, 70,176, 88,247,165,103,217,189,187,181, 69,241,217,
+178,155,200, 31,  0, 22, 45,126,133,188,251,246,191,105,251,248,187, 17, 17,222,156,247,245, 26,141, 70,233,242,229,203,213,197,
+197,197,117,244, 13,147,201,132,135, 30,226,111,109,102,101,101,237,117, 37,127, 55,104,149,158,158, 94,241,194, 11, 47,236,190,
+221, 83, 20, 13,145,255,161, 67,135,212, 41, 41, 41,188,175, 45, 38, 58, 82, 29,213,182, 10,173, 90,134,162, 99, 84, 59,132,132,
+134,160,184,184, 20, 54, 27,139,168, 14,205,113,252,247, 92,172, 62, 85, 40, 77,126,124,150,199,193,244,232,209,253,244,145,137,
+189,209,185,115, 71,156,248,189, 24,135, 15,255,142,107,215,171, 65, 41, 16, 17, 17, 12,131,161,  6,131,  6,245, 69, 69, 69, 37,
+ 74, 15,255,140,175,254,119, 90, 58,243, 31,252, 21,149, 59, 28, 82,192, 94,124,138,195,135, 31,126,200,109,251,228,  5, 72, 77,
+ 77,165,174, 46, 97, 87, 11,210,213, 37,221, 20,211, 11,111,191,253, 54,237,212,169, 83,163,115,241,203,229,114, 66,  8,161, 27,
+ 55,110,244,152, 99,159, 67, 90, 90, 26,117,231, 33, 88,189,122,181,148, 43, 14,228, 78,137, 85, 40, 20,180,161, 84,174,174,245,
+ 28, 40,165, 80, 40,210,212,141,241, 66,212,151, 55,244,229, 26,252,244, 94,179, 58,196, 31,192,159,211,250,175,223,135, 26, 53,
+  5,208, 88, 69,224,222,143,122, 52,168,  4,248, 67,254, 28,114,114,114, 80, 90, 90, 10,  0,136,138,138,162,190, 40,  1,  2,106,
+132,144,216, 32, 22,137,240,243,177,214, 16,  8,133,104, 46,210,219,227,  0,154, 49, 40, 45,109,142,187,251,178, 32,132, 32,233,
+ 65, 43, 40,203,  0, 36,200,238,120, 67,117,131,114, 13, 21, 23,112, 69, 91,131, 23, 94,127,189,193,107,169,168,212, 66,119,237,
+138, 67, 22,111,226,174, 79,254,  0,128,237,219,183,195,102,179, 73, 31,121,228, 17,175,  3,156, 74,165, 26, 83,191,244, 47,215,
+ 97, 42, 43,235,196, 35,134, 47, 94,188, 24, 42,149,106,236,157, 52, 21,192,145,191, 47,223,249,122,195, 26,233,221, 49, 38,  4,
+  7,135, 67, 18, 36, 70,183,110, 93,209,169,107, 87, 84, 85,105,160,213,214, 64, 44, 22, 32, 50, 66,  2, 97,112,184,199, 92,241,
+  0, 32,164,165,104,222,172, 37, 12, 70, 43,142, 29, 43,196,165, 43,149,184,124,165,  6, 70,147,  4,157,163,172,144,  4,  9, 80,
+120,186,  8,119,117,239,142, 75,151,171, 96,180,182,240, 42,211, 65,116,212,219,126, 95,167,  3, 26,146,233,143, 44,206,250,159,
+ 55,111,222, 77,251,159,127,254,121,191, 98,  1,220,145,104,253,185,227,166,242, 42,228,230,230,170,209,200,130, 60,123,246,236,
+161, 89, 89, 89, 72, 74, 74,130,187,233,  0, 62,158, 42,142,252,  1, 32, 63, 63, 95,205, 48, 76,157,107, 90,189,122,181,148,143,
+209, 19, 31, 31, 47,227,228, 52,133,199,101,227,243,161,152,178, 92,239,150,248,163, 34, 25,199, 40,197,239,241, 38, 38, 38,214,
+241,146,220,119,223,125,117,218, 42,224,246,191,115,224,115, 12, 64, 83,121,  4,154, 18,133,133,118,197,162,180,180,212, 39, 37,
+ 64, 40, 20, 66, 36, 16, 65, 36, 34, 24, 53,  2, 48,232, 77, 56,119, 86, 12,145, 80,  4,161, 77,136,184, 97, 20, 98,145,  8,  2,
+  1,  3, 80,  2,173, 14,248,233,136, 16, 44,203,  2,184,214,160,220, 35, 63,159, 69, 77, 77,195, 25, 56,223, 95,188,152,  6,  5,
+ 73, 96, 52, 86,194,198, 90,121,223,231,145, 35, 71, 26, 86, 58, 12,  6, 94, 68, 83,223,245,239, 78, 51,220,178,101,139,235,249,
+170,219,225,  5,112,231,226,119, 37,255,248,248,120,222, 85,232, 58, 70,181, 85, 51,204,  5, 88,109, 44,204, 22, 43,174, 93,215,
+ 66, 36,150,192,100,178,192, 98,181,193,106,101, 97,181, 81, 84,232,174,123,149, 37, 22,233, 33,  9,238,136,242,242, 74, 84, 85,
+ 27,160,213, 25,209,162,229,  0, 12,191,251,110,228, 31,216,129, 14,102, 43, 42,171, 42,209,179,103,119,  4,137,133,208, 87,107,
+255, 42, 99,133,148, 82,234,156,251,119,197,138, 21, 43,252,138,  5,152, 55,111, 94, 29,111, 66,253, 99,124, 21,  0,123,169,103,
+206,162,141,196,216,177, 99,235,244, 87,206, 64, 40, 41, 41, 81,171, 84, 42,191, 10, 83,169, 84, 42, 39,249,115,211,  1,155, 54,
+109,242, 74,174,245, 61, 85,185,185,185,106, 46,240, 77,161, 80,208,188,188, 60,117,114,114,178,243,120, 94, 94,158,154, 16,207,
+151, 23, 31, 31, 47,115, 45, 51,156,150,150, 70, 61,181,149,183,241, 48, 41, 41,  9,147,227, 85,216,  0, 96,234,114, 61,238,121,
+185,198, 99,219, 15,157,234,185,173,234,207,241,123,139,  9,  8,224,214,123,  3, 26,242,  0,252,161,254, 29,119,150,126, 99,172,
+255,122, 22, 43, 10, 11, 11,177, 98,197, 10,222,165, 38,  5,  2, 33,226,134,178, 16, 48, 66,252, 84, 32,193,169, 66,  9, 38,140,
+  7, 30,184, 15,152,152, 72,208,190,173, 24, 18,113, 16, 36,226, 32,  4, 75,130, 16,213, 62,  8, 18,177,  4, 18,177,231,146,152,
+175, 45,122,149, 44,125,239, 45,210,208, 64,210,189, 91, 23,132,133,135, 66,194,154, 81, 99,176,252,225,157, 98,255,254,253,123,
+246,239,223, 95,135,240, 93,255,  0,160,188,188, 28, 19, 39, 78,188,109, 86,126,126,126,190,218,213, 26,226,246,  1,192,176, 97,
+195,124,178,228,108, 54, 64,111,176, 64,175, 55,163,170,202,132,171, 87,117,184,116,233, 58,170,171, 77,168,169,177,160,166,198,
+ 12,189,222,130,202, 10,239, 43, 50, 77, 38, 43,106,107,109,176, 88,204,104,222, 92,140, 78, 81, 45, 16, 18, 26, 10,  0,136,238,
+222, 21, 29, 59,180, 64, 88, 11,  9, 40,181,193, 98,101, 97, 50,233,255, 18,  3, 73,106,106,170,122,254,252,249, 30,201,156, 91,
+ 26,200,211, 59, 33,115, 40, 13,110,177,124,249,114,124,254,249,231, 62,151, 26,182,187,197, 21,212,245,143, 35,212,210,210, 82,
+100,101,101,249, 92,138,118,207,158, 61, 52, 59, 59,219,149,252, 33,151,203,201,228,201,147, 61,126,111,206,156, 57, 32,132, 56,
+173,250, 85,171, 86, 73,  1, 32, 46, 46, 78,230,170,196,186, 30,167,148, 58,143,243,184,219, 58, 86,188, 59,197,193,155, 50,  1,
+  0,173, 90,181,  2,113,177, 30, 26, 43, 47,128, 59,143,252,221,109,251,229,  1,184,147, 44,255, 27,  3,188, 13,  2,129,192,231,
+239,141, 24,202,162, 77,235, 32, 84, 85,  9, 17, 36,180, 34, 72, 44,128,230,144, 24, 19,100, 34,136, 69, 34, 84, 85,137,112,160,
+ 32, 20, 45, 36,  4, 12,195, 32, 81,110,198, 67, 19, 40, 24,134,226,157, 95,124,191, 78,149, 74, 69,  5, 33, 18,104, 69,173, 16,
+ 98,185,136, 51,165, 20, 99,164,163,120,127,127,208,160, 65, 56,120,240,160,219, 99, 33, 33, 33,188,  7, 75,157, 78, 55,214, 49,
+240, 32, 57, 57,217,185,191,188,188,220,249, 57, 57, 57, 25,101,101,101,183,229,121,166,164,164,104,242,243,243,145,155,155,171,
+102, 89, 86,198, 48, 12, 56,203,191,161,121, 83, 79, 40,185,112, 73,214,186,133, 65, 29, 36, 22,192,108, 97, 81,107,186,136, 11,
+ 23,203,161,213, 85, 65,171, 53,160, 92,107, 68,185,214,136,240,200,174, 94,101, 93,189, 78,113,229,234,117,244,238,221, 29, 21,
+ 58, 29, 68, 66,  6, 85,213, 23,161,175, 96,209,231, 46, 61,218,182,110,141,144,144, 16,  4,  5,  5,227,242,149,106, 16, 65,  4,
+ 95,130, 37, 46,228,216, 36,171,  0,154,122,  5, 65, 67,214, 58, 80, 39, 22,128, 47, 52,  0, 48,119,238,220,155,188, 10, 46,211,
+ 12, 26,127,174,115,202,148, 41,117, 44,216,172,172, 44, 39,121, 61,250,232,163, 72, 72, 72, 32,124, 19,167,184,177,252,157,168,
+239,105,168,143,129,  3,  7, 18, 74,169,211,202,207,207,207, 87, 19, 66,156,165,129,147,147,147, 53,185,185,185,200,205,205, 85,
+ 39, 39, 39,147, 67,135, 14, 57,143,175, 92,185,178, 65,185,185,185,185,106,134, 33,178,188, 60,251, 59, 49,103,206, 28,252,242,
+203,207, 50,142,194,243,242,242,212,220,253,243, 81, 38, 86,174, 92,137, 79,101, 17,152,186,194,  0,192, 62, 29,224,138,169, 43,
+ 12,206,246, 76,145,137,  2,204,250,103, 81,218, 23,190, 95, 87,233, 94,250, 18,126,249,229, 23,254,171,  0,110,  5,241,187,198,
+  2, 52,198,250,175,107,201,215, 37,255,196,196, 68, 40, 20, 10,175, 83,  1,173, 90,  9,192, 16,  1, 90,183, 18,160, 71,119,138,
+ 75,151,132, 96,  4,  4, 34,161, 16, 34,161,  8,191, 29, 13, 69,100,168,  8,  2,129,  0, 35,134,217, 16, 28, 28,  4,150,165,  0,
+181,249, 69,254,205,218,118,194,213, 26, 10,253, 25, 13,132, 68,128, 23, 23, 47, 34, 62, 14,108,178, 11, 23, 46,168, 47, 92,184,
+112,211,253, 78,154, 52,137,215, 96,153,148,148,148, 80, 94, 94,190,155, 35,121,  0,152, 56,113, 34, 86,175, 94,237, 60,167,170,
+170, 10,101,101,101,216,186,117, 43,146,146,146,198,220,142,206, 27, 23, 23, 39,203,205,205, 85,231,231,231,171,185, 96,177,184,
+184, 56,191,230,112,103,254, 35,229,255,217,251,242,240,166,170,252,253,247,220,236, 93,105, 75, 41, 75,217,165,130,108,  5, 42,
+ 32,107,  2,  5, 20,176, 34,180,200, 38, 95,100,102, 26, 24, 87, 96, 20, 69,231,231,204,168, 40, 46,128, 35, 35,180,140,138, 11,
+ 21,105, 21, 44, 88,  4, 10,  9,139,136,149,138,128, 44,178,148,181,133,174,105,211, 52,123,238,249,253,145,222,152,134,180,185,
+ 73,195, 58,247,125,158, 60, 77,238,189,249, 52,247,220,115,206,251,217,206,231,104, 55,124,153,  9, 90,172,135,209,100,131, 78,
+102,  6,133, 14,102,179, 29,122,189,  5,101, 21, 70,148, 92, 53, 96,184,170,163, 79, 89, 38,107, 75, 20,157, 47, 71,151,206, 29,
+208,185,115, 60, 42, 43, 43, 16,213,194,129,110,221, 34,209, 42,182, 11,228, 10,  5,170,171, 13, 40,252,229, 20,174, 20,235,209,
+ 58,190,231, 29, 59,129, 80,128, 18,  2, 21,199,165,238,164,218,212,186,125, 90,159, 44,120,189,249,136,  6,171,202, 50, 51, 51,
+ 85, 43, 87,174,212,120, 42,  0,203,151, 47,231, 10, 12, 53, 41,143, 82, 74,  9, 33, 68,173,142,114,251, 77,244, 58, 98,206,206,
+118,134,  8, 82, 83, 83,121,185,255, 27,134, 20,118,121, 37,127,190,120,224,129,  7, 84,  7, 15, 30,212,112, 94,135,161, 67,135,
+170,188,157,231,146,241,124, 17, 54, 23, 91,255,225,135,  3, 26, 66,  8,  8, 33, 72, 76,236,171, 74, 76, 76,212,186, 41,  8,245,
+215,  2,190,198, 11, 39,143,153,170,  3, 39, 47,109, 84,167,  6, 15,106,234,138, 19, 46,121,124, 32,228,  0,220, 57,240,169,  0,
+220,142, 22, 63,135,105,211,166, 53,235,251, 12,195, 64, 36,114,190,122, 36, 48,232,215,219,  1,153, 84,238, 84,  0, 36, 18, 12,
+ 25,  4,200,100,128, 68, 36, 67,203,150,114,136, 68,117,112, 56, 88,176,172,255,110,123, 99,213, 53,200,227,187,227,124,254, 23,
+136, 21, 51,120,252,229, 37,126, 79, 40, 10,133, 66,187,100,201, 18, 85,115,150,  1, 38, 39, 39,231,171,213,106, 60,245,212, 83,
+174, 99,156,165,175,215,235, 97, 52, 26, 49,119,238, 92,  0,192,135, 31,126,136,140,140, 12,205,173,120,182,115,230,204,209,178,
+ 44,171,226, 44,255,129,  3,  7, 54, 43,129, 43,190,227,189, 56,116,112, 59, 90,181, 12, 65, 72,136,179,219, 91, 44, 14,232,107,
+173,168,210,153,208,190,115, 79, 12, 27, 50,210,231, 51, 25, 63,126, 10,217,177,237, 19,122,176,224, 56,134, 15,237,139,142, 29,
+ 59,194,102, 53,163, 95, 98, 31,132, 70, 70,226, 98,209, 37, 20,151, 84,227,135, 31, 79, 66, 87, 27,137, 71, 31, 24,121,199,250,
+ 76,231,207, 83,  3,128,  6, 32,152,175, 86,187,  8,156,245, 32,125,134, 33, 78,109,161,158,151,  9,128,190, 94,226,141,243,212,
+106, 10, 10,183, 76, 21,130,244,244,244,  6, 94,128,103,159,125, 22,132, 16,204,155,167,214,112,236, 15,  2,244,237,155,232,141,
+188, 92,238,120, 95, 36,199,151,252, 61,145,154,154,138,209,163, 71,171,154,211,143, 81, 31,171, 31, 52,104,144,106,246,236,217,
+218,198,206,187,197,246, 27,  5,151, 59,192, 41, 95,206, 48,  2,209,122, 42, 21,124,127,159,167,188,141, 11,194,156,141, 46,143,
+115, 93,179,113,193, 37,151, 66,176,253, 72,211,115,159,183, 58,  0, 66, 14,192, 29,170,  0, 12, 25, 58,240,134,196,124,130,101,
+249,187,119,164, 64, 80,165, 35,104, 19,199,184, 74,254,238,216,229,140,239,203,100,114,200,164, 50, 60,252, 16,129, 92, 38,133,
+ 66, 78, 80, 85, 41, 66, 65, 97, 56, 28,172,  3,237,227,253,139,235,230,231,231,211,106,163,  9,186, 67,121,232,214, 94,130,223,
+138,  3,143, 11, 51, 12,163, 29, 56,112, 32, 25, 56,112, 96,192, 50,210,210,210, 84,171, 86,173,210,112,110,254,202,202,202,199,
+  6, 13, 26,100,216,185,115,231,119,143, 60,242,200,216,202,202, 74,242,248,227,143,111, 79, 75, 75, 83,221,202,206, 89,239,234,
+ 87,185,189, 15,188,207, 57,201,157,158, 62,117,  2, 37, 69, 23,193, 48,  4, 14,  7,133, 92, 17,141,132, 30,189,240,232,164, 52,
+222, 29,189,164,156, 85, 85, 85,150,104,204,102, 59,122,247,234,130,118,109, 91,226,210,229, 82,232,142,157,195,239,167, 47, 97,
+215,238,163,184, 88, 76,241,231,191, 60, 29,208,224,185, 93,138,255,176, 95, 69,  5,124, 93,191,165, 60,229,157,251,  4, 43, 87,
+174,116, 41,  0, 43, 87,174,  4,138,214, 93,119,173, 55,121,141,120,  5,174,155,179,154, 91,172,135, 16,210,172,190,199,145,124,
+ 99,228,238,235,188, 55,175,130,199,119,189,201,227,255,156, 47,126,141,156,149,179,157,115,195,168, 14, 13,200, 31,  0,210,198,
+223,239,124,163,251,213,167,  2, 32,212,  1,184,125,144,185,236,197,235,194,  0,126, 41,  0,183,115,194, 71,160,197,127,220,113,
+232, 23, 25,228, 82, 41, 30, 30, 79,192, 16,130,129, 73,118, 28,251, 77,  1,134, 56, 99,254,213,213, 12,218,182, 22,129, 33, 82,
+ 28, 57, 38,133, 92,  6, 88,109, 86, 92,188,164,240,139,252,207,157, 62,140, 65,163, 39, 66,220,114, 16,206,157, 46,128,248, 90,
+ 14, 94,120,254, 37,250,246, 59,111,222,146,  6,174,175, 87,175, 74, 74, 74,210, 44, 94,188, 24,189,122,245, 42,211,233,116, 72,
+ 74, 74, 82,233,116, 58, 60,243,204, 51,154,180,180,180,219,162,174,125,115,137,223, 83,  9, 24, 54,100, 36,214,125,254,145,178,
+ 77,235, 54,154,208,208, 80, 94, 86,255,117, 19,236,236, 63,105,  1,144,245, 95,100,208, 19,191,255,132, 54,113, 97,144,203, 37,
+ 48, 24,172, 40,190,170,  7, 17,183,199,159,255, 50, 91,200,150,226,131, 95, 22,  1, 93,159, 64,131,229,133,133, 11,155, 67,214,
+205,254, 73,243,230, 69,187, 41, 18,193, 33, 52, 95,164,236, 15,105, 55,183,158,129,183, 54, 75,123, 64,230,188, 87,211, 85,231,
+ 75,192, 29,139,196,196, 68, 87,194, 95,230,178, 23,175, 59,231, 83,  1,  8,118, 61,254,155, 93,223,223,175,206, 15,  2,157,142,
+ 32,164, 53, 65, 76, 52, 65, 82,127, 27,228, 82, 17,100, 82, 27, 98,162,229,245,147,  0,193,224, 36,  7, 10,126,145, 56,189,  5,
+ 60, 39,153,252,252,124,218,243,222,  8, 44,122,246, 95, 48, 73,227,241, 77,126, 49,186, 38, 56, 45,247,176,159,183, 98,209,223,
+ 94,162,239,189,123,235,148,128,228,228,100,146,159,159,175, 92,182,108,153,198,221, 59, 16, 12,229,234,118, 70,125,177,159,102,
+223,227,204, 89,106,178,255,192, 30, 90, 94, 89, 14,211, 53, 35,228,242, 24,196,119,238, 19,144, 82,113,167,193, 89, 14, 59, 72,
+183, 89,180, 14,174, 21,  1, 69,159,222,242,123,243,149,220,119,183, 97,236,196,199,252,178,220,125,249, 30,133, 28,128,219, 75,
+  9,104,140,252,125,122,  0,254, 23, 64,225,204,234, 39, 12,  5,  5, 69,116, 11,138, 61,251,197,144, 75, 37,144, 73,197, 72, 25,
+ 79, 65, 41,139,168, 24, 59,236, 14,  2,150,117,212, 79,126,190,209,167,147,  1, 19,166,164,193, 32,238,134, 86, 97,161,152,241,
+104, 52,178, 54, 29,115, 41,  1, 54,199, 55,183,252,254, 57, 69, 64, 24, 50,129,123, 21,238,214,123,203,212,189, 69,210,163, 94,
+188,158, 25,178,163,  3,149,135,244,168, 23,175, 63, 81,184,176, 89, 86,191,128,230, 33,245,201, 85, 65,235,195,119,187,241,112,
+167, 41,  1, 62, 13,224,196,196, 68, 33,104, 35, 64,128,  0,  1,  2,  4,252,143, 65, 40,244, 44, 64,128,  0,  1,  2,  4,  8, 10,
+128,  0,  1,  2,  4,  8, 16, 32, 64, 80,  0,  4,  8, 16, 32, 64,128,  0,  1,130,  2, 32, 64,128,  0,  1,  2,  4,  8,184, 59,208,
+ 96, 21,192,252,249,243,  3,206,224,244, 86, 91, 59,216,242,102,206,157,231,243,123,117, 85,215, 92,239, 67,163, 91,187,222,175,
+255,120,205,117,215,198,170,254,236, 83,222,206, 21,127, 84,204, 27,179, 96,149,235,125,185,230,191,  8,228,247, 53,134, 64,127,
+ 95, 99,240,246,251, 38, 61,174,246,249,189, 67,154,239,208,169, 83, 39, 92,184,112,  1, 73,170,  9,174,227,155, 63,207,184,225,
+237,247,231,171, 87,155,236, 47, 22,177, 88,185,168,184,216,181,100,113, 85, 92,156,235,250,255,182,105,115,195,251,159,167,188,
+220,220, 92,101, 94, 94, 94,131, 74,137,227,199,143, 87,165,164,164,104,111,197,248, 56,124,248,112,192,242,250,245,235,119,163,
+127, 31,153, 63,127, 62,110,231,249,229, 86,200,203,202,202,154,222,187,119,239,172, 99,199,142, 77,153, 49, 99,198, 55,205,149,
+231,190,209,145,123, 70,254,221,218,126,130,188,198,229,249,173,  0,120,194,110,183, 43,205,102, 51,136, 72,  2, 66,  8, 28,118,
+ 27,164, 18, 49,100, 50,153,182,185,154,135,221,110, 87,  2,128, 88, 44,110,150,172,186,170,107,  8,141,110,237, 34,254,214,237,
+ 59,  1,  0,174, 93,190, 16,144,188,157, 43,158,194,152,  5,171, 92,196,245,159,220,  2,  0,192,147, 41,  3,113, 55,226,144,230,
+ 59, 36,169, 38,224,144,230, 59,  0,192,132,212,153,  0,128, 11, 23,110,125,251,253,187,180, 84,121, 26,208, 36,  0,170,211,128,
+115, 15,245,197, 47,  0,  0,  6, 46,123,251,150,182,155, 86,171,165,121,121,121, 48,155,205, 13,142,203,229,114, 77, 68, 68,  4,
+148, 74,229,109,185, 28,138, 16, 50,236,222,206,237, 62,165, 14,135,241,244,165,107, 47, 81, 74,183, 10,118, 80, 19, 74,167,197,
+ 50,234,240,225,195, 17, 37, 37, 37,173,163,163,163, 91, 12, 24, 48,160, 56, 60, 60,252,243, 64,229,101,101,101,141,158, 49, 99,
+198,158,172,172,172, 63,  3,136,156,246,196,188,185,  0,216, 99,199,142,205,  6,176, 25,  0,235,143, 60,110,207, 19,142,248,155,
+ 51,222, 60,119, 73, 12,214,146,190,198,148, 18,  1,183,153,  7,192, 29,250, 90,131,178, 77,194,253,154,145,189,187, 35, 68, 38,
+  1,165, 20, 14,  7,197,111,103, 46,226,252,209,125, 42,133, 76,  2,145, 72, 20, 16,121,135,201, 47, 40,123,118, 43,210,252,118,
+186,139,170,206,210, 41, 96,226,  7,  0, 69,100, 12,234,170,174,185,136,191, 41,143,  0, 31, 75,117,224,204, 23,177,115,197, 83,
+174,129,212,216,117, 77,173,177,244,252,159, 82,169, 20,128,179, 76, 38,203, 58,199,183,195,225,112,253,126, 70, 36,225,109, 69,
+  3, 64,155, 86,206, 82,157, 86,125, 53, 44,118, 59,  0,192, 96,119,202,235, 60,246, 79,184,167,103, 63, 94,196, 15,  0,125,135,
+140,198, 33,205,119, 46,226,111,236,186,155,217,126,  0,240, 84,105, 41,  5,128,113,161,161,216, 94, 87,167,225,136, 31,  0,126,
+223,177,243,186,235, 18,219,180,225,245, 59,107, 66, 43,148,133, 21, 63,163,248,210, 17,116,235, 56, 24,131,229, 74,191,251,112,
+110,110,238, 35,219,182,109,227,200,223, 14,192, 12, 32,  4,  0,107, 54,155,197, 10,133,  2,122,189, 94,233,205, 19,112,139,201,
+ 63,238,254,196,222,219,182,127,185, 38,172,174,248, 36,134,165,205,207, 34,132,204,166,148,110,190,221, 38,166,252,252,124,218,
+156,250, 20,124, 54,  3,107, 10, 54,155, 77, 89, 80, 80,160, 57,126,252,184,235, 88, 69, 69,  5, 78,159, 62,141, 54,109,218,124,
+166, 84, 42, 85,225,225,225,124,159, 47,147,149,149,245, 79,  0, 15, 12, 27, 55, 73,145,149,149, 21, 55,237,137,121,225,  0, 28,
+  0,184,142,123,111,253,117, 35,248,222, 31, 55,222,212,106, 53,109,108,188,113,215,249, 26,111,106,181,154,238,253,177,  0, 34,
+145, 24, 14,135, 29, 53,181,  6,204,152,242,  8,125,247,221,119,155, 69,216,158, 74, 69,115,159,139,  0,223,240,182,237, 47,  7,
+ 94,149,  0,235, 76, 86,229,232,148, 25,154,246,173, 34, 17, 34, 23,131,101, 89, 56, 88, 64, 44, 34,136,142,236,142,158,221, 58,
+104,242,183,127,167,114,216,234,148,254, 42,  1, 86,171, 85,217,163,231,121, 77,223,238,231, 33, 98, 28, 26,237,161,118, 42,169,
+ 68,226,151,140,186,170,107, 80, 68,198, 32, 50, 34, 28,  0, 92,127,189, 93,215,186,125, 39,159,222,128,157, 43,158,194,192,153,
+ 47,226,255, 30,155, 12,  0,174,191,222,174,251, 79,110,129, 95,218,181, 72, 36, 66,124,124, 60, 68, 34, 17,172, 86, 43,234,234,
+234,224,112, 56,160,211,233,  2,122,184, 97, 98, 17, 62, 94,185,  9,178, 72,160,244,  2,240,179,161, 24,229,215,206,226,243, 21,
+ 47,249,101,245,247, 29, 50, 26,241,109,157, 33,146,120, 47,228,223,169, 83, 39, 87, 56,  0,  0,174, 92,185, 18,148,246,227, 83,
+ 92,245,169,210, 82, 58, 46, 52, 20,175, 61,245, 36,  0,224, 53, 55,226,255,226,244,233,134,228,239, 71,181,214, 61, 23,190, 80,
+118,124, 66,172,121,177,195, 44, 88,216,100,200, 88,138,147, 21,187,240,201, 59, 27, 85,169,125, 50,248,246, 65,113, 94, 94,222,
+102,147,201,132,117,235,214,153,231,204,153, 35,  7, 16,  6,128, 93,183,110,157,117,206,156, 57, 98,147,201,  4,185, 92,174, 73,
+ 73, 73,105,214, 68,247,205, 55,223, 40,119,236,216,161,105,110, 45,123, 87,223,145, 50,255,239,131,215, 94, 80,180, 56,241, 37,
+ 20,191,239,198, 63, 70, 69,133, 63,179,165,252, 95,245,150,231,109, 69,254, 27, 55,110,132, 78, 55,134,102,103,167,249,125,239,
+ 31,127,252,177,178, 57,100, 83, 87, 87,167,204,205,205,213,212,214,214,122, 61,127,245,234, 85,228,228,228,104,122,244,232,161,
+ 26, 60,120,176,175,126, 67,178,178,178, 62, 31, 54,110,210,212,211,135, 15,136,227,219,182,182, 79,123, 98, 94,131,121,119,247,
+119,223,160,119,239,222,221,179,178,178, 30,234,221,187,119, 46,  0,236,223,191,191, 73, 82,229, 51,222,212,106, 53,  5, 33,128,
+143, 42,127,107,214,172,161,215,202, 42,112,248,183, 19,174, 99,102,179,  5,111,127,144,105, 80,207,153, 46, 16,246, 93,140,235,
+146,  0,107,107,107,149,195,198, 62,170,233,222, 33,  6, 50,  9,  3,150,101,113,237,218, 53, 28, 59,114, 24, 86, 59, 11,150,165,
+136,137, 12,193,216,135, 38,106, 76, 22,187,223,255, 80, 38, 41, 67,215, 14,215,  0, 17,193,125,221, 46, 67, 38, 46,245,219,242,
+119, 39,255,235, 44, 60,125, 45,174, 93,190,  0, 69,100, 76,163, 94,129,166,200,203, 19,159,126,245, 13,158, 76, 25,136,129, 51,
+ 95,108,212,170,245,  6,169, 84, 10,145, 72,132,136,136,  8, 20, 21, 21, 65,167,211, 57, 21,169,  0,201,191, 77,171, 56,132,137,
+ 69,120,244,233,215,241,208,140, 33,216,250, 91, 49,174,153,208,108,242,247,196,149,146,107, 56,126,232,  7,196, 70, 69, 56,201,
+ 95, 44, 10, 74,251, 61, 56,229,255,  0,  0, 81, 98,137, 95,228, 15,  0,127, 95,245, 31,252,125,213,127, 92,228,191,189,174, 14,
+207,143,157,232, 60, 25, 43,229,117,223,159, 94,124, 75,249,151, 69, 15,104,158,232,248, 87, 72,152, 48,132, 34,  4, 12, 68,104,
+ 23, 55, 20, 79,189,182, 80, 83,212,118,  5, 47, 53, 66,171,213,218,  0,224,211, 79, 63, 53,  2,144,115,219, 40,175, 91,183,142,
+  5, 16,226,190,173,178, 86,171, 13, 40, 46,103, 52, 26,149,254, 28,231, 97,249, 15,187,191,127,162, 49,251,155, 77,234,126,189,
+ 18, 68,117, 39,118,225, 66, 89, 45,174, 86, 27,193, 82, 26, 80, 34,112,122,122, 58, 77, 75,203,166,235,215,175, 15,106, 33, 49,
+ 55,242, 71,116,116,126, 64, 50, 10, 10, 10, 52, 25, 25, 25,132, 16,226, 82,  6,252,252, 13,215,145,255,161, 67,135, 48, 99,198,
+ 12,119, 15,  1, 78,157, 58,165, 49, 26,141, 77,110,152,149,149,149,245,212,176,113,147, 38,190,177,100,129, 56, 59, 59, 27,255,
+253,224, 93,113,189,199,200, 69,254,217,217,217, 88,181,106, 21,122,247,238,157,235,107,188,121,146,127, 99,227,237,161,161,245,
+ 94,192,240, 80,159,242,222,251, 96,181,139,252,203, 42, 42, 81, 86, 81,137,154, 90,  3, 36, 18,113,216,234,117, 95,154, 61,173,
+120,  1,119,  6, 18, 19, 19,175,123, 53,169,  0, 56, 28, 14, 26,211,169, 15, 58,181,110,  1,179,205,  1, 66,128,237,219,191,199,
+103,159,174,195,209, 35, 71,240,252,194,231, 32, 18, 49, 96, 29, 44, 34, 66,100,232,212,103,152,198,100, 50,241, 30, 96, 54,155,
+ 77,217,179,219, 69, 77, 68,152, 17, 31,127, 90,  6,134, 80, 12,236,253,187,198,102,179,249, 53, 72,189,145, 63, 71,252,166,154,
+202,  6, 10, 66,141,190,214,167, 60,111,131,137, 27, 72,  5,235,223,106, 64,112,159,126,197,175,124,111,215,174, 93, 17, 19, 19,
+  3,189, 94, 15,169, 84, 10,134, 97, 96, 50,153,160,211,233, 32, 18,137,184,137,153,247, 61,127,189,121, 19,158, 91,185,  3,155,
+ 62,120,  5,109, 90,197, 33, 36, 52, 26,151, 29,197,248,124,197, 75,  8,171,159, 52, 68, 60,229,121, 35,127,142,248,107, 74,206,
+161,123,124, 43,212, 26,205,144,133,200,  0,135,195,103, 62,128,175,246,123,105,237, 86, 28,255,229, 71,244,234,114, 31,106, 28,
+190,149, 70,142,252,127,223,177, 19,127, 95,245, 31,215,241,237,117,117,216, 94, 87,135, 34,245, 63,177,227,196, 81,244, 28,216,
+  5,168,244,189, 53,115,214,153,101,202,249,207,140,214,196,134,246,128,137,214,  2,150, 50, 72, 45, 85,176, 56,106, 97,102, 77,
+ 96,165, 97,104, 55, 60,  9, 57,191, 46,245, 53,209,145, 13, 27, 54,192,108, 54, 67,173, 86,135,168,213,106,192, 25,  2,128, 90,
+173, 70,253,231,122, 11,202,140, 13, 27, 54,248, 61,104, 79,157, 58,165, 92,184,112,161,230,253,247,223,167,132, 16, 13,  0,236,
+219,183,143, 46, 93,186,148,190,242,202, 43,  1,109,205, 28, 46, 99,214,253,231,197, 39, 20,227,218, 89, 68,  7, 78, 93,195,214,
+ 11, 12, 94,220, 86,106,249,167,214, 80, 83,103,195,255,  5, 34, 83,167, 27,115, 35, 45,127, 68, 71,231, 99,230,204,153,126,239,
+ 70,233, 78,248,107,214,172, 33,220,118,210,124,113,224,192,  1,101,105, 41, 63,163,196,106,181,226,216,177, 99,187,155,234, 47,
+  0,148,241,109, 91, 75,211,210,210,  0,  0,133,133,133,216,253,221, 55,242, 43, 37,215, 88,142,252,  1, 32, 45, 45,205, 53,222,
+142, 29, 59,182,162, 57,227,237,237, 57, 19,241,219,185,203,104,221,165, 13, 80,103,228,125,239,101, 21,149,176,217,236,245,115,
+181, 29, 54,155, 29,151, 47, 94,144, 55,231,153,122,122, 15,  4,111,194,237,133,  6,174, 40,139,197,130,126,221,187,107, 66, 20,
+ 18,176, 44,133,131,  5,126,216,183, 31,255,124,237,117,176, 20, 56,115,246, 44,142, 30,249, 21,189,122,245,133, 72, 68,112,111,
+151,120, 20,253, 98,135,130,231,230,120, 82,113, 25, 18, 58,149,  0, 98,130,203, 87,109,128,152,160, 79,247,139, 40, 56, 86,  6,
+138,118,  1,221,128,187,123,223,155,103,192, 84, 83,217, 96, 53,128, 47,184,187,247,189,105,218,  5,235,223,194,152,  5,171,188,
+102,177,187,195,110,183, 35, 36, 36,  4, 12,195, 32, 42, 42, 10, 70,163, 17,117,117,206,109,128, 99, 99, 99, 81, 89, 89,233,215,
+  6, 28,102, 29, 48, 80,161,192,243, 31,236,195,152,190,192,197,195,192,207,245,231,158,255, 96, 31,254,189, 64,  5,  7,235,240,
+187,253,142, 31,250,193,245,126,244,128,238, 16,135, 51,216,174, 61,129,126,221,219, 35, 34, 76,134, 79,115,242,145,164,154,128,
+ 43, 94, 86,  1,248,106,191,220, 19, 20,184, 10,164,140, 38, 88,187,181,  8, 49, 81,157, 49,121, 40,225,213,126,156,187,127,123,
+221, 31, 91, 39,211,127,172,  0,218,213,128,252,229, 85,208,127,190,  6, 48, 38,144,130,165, 88, 21, 23, 71,254,219, 68, 32,160,
+235,148, 48, 77,199, 22,  3,160,119, 24, 96,209,157,197,231,151,178,176, 63, 69,135,251,254,172,194,216,167,195,160,136,186, 23,
+114,113, 20,196, 41, 53,248,249,155,159,233,253, 73,247, 55, 54, 73,185,254,  7,195, 48,160,148, 90,235,149,104, 51,195, 48, 70,
+ 74,105, 52,156, 73, 92,  1, 47,175,237,222,189,187,118,236,216,177,170,202,202, 74,205,246,237,219,157,138,207,246,237,232,209,
+163,  7,186,119,239, 30,208,246,204,181, 22,246,153,185,127,255,247,150,119, 38,180,102,168,185,  6,127, 89,127,218,102,183,217,
+ 86, 89, 28, 88, 74, 41,173, 10, 68,230,164, 73,214, 27, 78,254, 35, 70,140,208,250, 43,167,160,160,160, 65,200,132,243,  2,240,
+221, 85,210,225,112,248,165, 48,156, 63,127, 30,131,  6, 13,106,172,191,200,  1,220,  7, 64, 60,106,194,228,234,162,162,162, 22,
+133,102, 28,210,109,  0,  0, 32,  0, 73, 68, 65, 84,133,133,200,206,206,198,128,162, 34,166,176,176, 16,  0, 48, 96,192,  0, 60,
+ 56, 50,  9, 17, 97, 50,172,250,100, 83,217,140, 25, 51,150,172, 94,189,122,129,191,227,237,234,230,183, 16,222, 83,142,176,110,
+207, 97,227, 91,127, 70,223, 94,173,113,239,196,215,145,145,145, 65,154,202, 18,175,209,215, 66, 46,151,  1,  0, 36, 18, 49,140,
+ 70,115, 80,159,173, 64,250,183,  6,126,111,  6,196,178, 44, 66,100, 82, 88,237, 20, 12,  1, 24,  2,188,250,175,215,225, 96,129,
+186, 58,  3,174, 93,187,138,184,184,214,160,148,133,221, 14,200, 37, 98,136, 36,252, 92,176,118,187, 93,121, 95,215, 43,154,150,
+ 81,122,128, 16,167,110, 76,  0, 66, 40,250,247, 60,163,249,233,104,156,202,223, 21,  1,156,117,223, 88, 72,128,143,245,239,169,
+ 69, 55, 70,252,254, 88,255,128, 51, 97,168, 85,171, 86,144,201,100, 46,151, 33,151,248, 23, 25, 25,  9,137, 68,130,203,151, 47,
+ 67,194, 83,222, 39,249,123,240,231,137, 35,193,153, 55,167,237, 78,247, 63,  0, 40, 19,128,136,215, 53, 88,240,183, 33,136,242,
+227,126,175,148, 56,147, 21, 59,180,138,134,206, 98,129, 56, 66,  4,115,185, 17, 96, 24,180,233, 24,143, 29,187,127, 14,168,253,
+254,111,209, 27, 56,255,195, 46,136,175,  1,213,113, 64,  8,195, 96,112,167,206, 24, 53, 50,142,151, 28,207, 88,255, 23,143,253,
+ 25, 95, 91,126,  7,238, 49,  3, 63,137,129, 48, 49,240,240,  0,196, 63,204,207,120,237,218, 46, 26, 86,107, 21, 36,118, 27, 62,
+191,148,133, 31,231, 68, 98,196,163,143,160,123,171, 30,170,223,118,104, 53,253,210,234, 32,177,214,193,222,157, 69,121, 41,191,
+164,209,122,229,205, 60,103,206,156, 48,  0, 58, 74,169,  4,  0,230,204,153,211,236,218, 26,147, 39, 79,214,238,223,191, 95,117,
+242,228, 73, 77, 72, 72,  8, 66, 66, 66, 48,115,230,204,128, 38, 81, 66, 72,235,137, 19, 39,174,253,219,223,254,198, 60,191,224,
+ 25,182, 23,123,150,177, 88,109,117, 86,  7,253,155, 63,114,210,211,211,169, 78, 55,  6,147, 38, 89, 49,115,230, 76, 18,232,239,
+185,145,228,239,205,221,191,102,205, 26,162, 86,171,233,220,185,115,121,253, 94,131,193,208,192,237,239,142,133, 11, 23, 98,225,
+ 66,231,166, 69, 73, 73, 73,238,215,203, 26, 17,215, 22, 64,167,122,165, 48,228,193, 41,179,204, 93,186,116,145,103,103,103,131,
+ 35,255,180,180, 52,196,181,105,227, 62,222,182,194, 45, 68,192,103,188,165, 63, 60,  2,  7, 75,202, 16,222, 55, 28,197,219,207,
+  1,114, 25,166, 60, 61, 27,209,241, 19,121,206,205, 14, 20, 95, 45,181, 75, 36, 98, 49,231,  1,  0,128,203, 23, 47, 52,235,185,
+ 54, 22, 58, 16, 20,130, 91,167, 16,120, 42,  1,140, 55, 19,135, 82, 10,150,  2, 14,214,169,  4, 16,  2,124,243,117, 14, 30,157,
+156,138,150,177,173, 92, 19, 32,245, 99,175,108, 17, 83,134,158,247, 92,118,125,238,211, 43,196,229, 36,235,127, 95, 17, 68, 76,
+153,223, 55,228,233,238,247,118,222, 31,235,223,211,221,239,237,188,251, 90,246,166,160,215,235, 81, 91, 91, 11,139,197,  2,150,
+101, 81, 94, 94,238,114,255, 27,141, 70, 24, 12,  6,191, 66,  0,155, 62,120,  5,218,223,128,154, 11,128,205,  4,252,123,177,202,
+229,254,255,229, 48,240,235,213, 31, 32,242,179,253,106, 74,206, 33, 58, 50, 20, 49,209,161,184, 55,161,  7,138,206,151,227,116,
+113, 37, 58,196, 68,194, 82, 90,134,179,103,206, 54,168,  5,192,167,253,134, 40, 31,193, 48,213,116,108,218,178, 17,154,189, 27,
+145,181,124, 17,166, 44, 90,138,163, 54,160,188,178,140, 87,251,185,199,250,159, 24, 50,  8, 51,239,235,136,141,155,118,227,232,
+209, 11, 88,126,172, 16, 27,198,204,  6, 62, 58,128,226,226,242,  6,181,  0, 26, 67,188, 89,  6,135,181,  2, 86,107, 13,  0, 32,
+174, 93,123,116,239,209, 67,165, 87, 56,115, 49, 76,172, 17,140,165, 14,138, 58, 17, 74,175, 94,243, 69,168, 78,143,140,217, 12,
+179,217, 44,  7, 96,  5, 16,110, 54,155, 35, 60,151,  4,  6, 10,163,209,168,220,187,119,175,166, 71,143, 30,152, 53,107,150,170,
+162,162,  2,219,183,111,231, 61,216,  8, 33,195,100, 50,153, 33, 60, 60,220, 62,102,204,152,171,139, 23, 47,110,187,100,201,146,
+162,159, 15, 31, 29,191,225,184,229,148,141,133,223,251,177,222,  8,151,127, 48,201,223,211,250,231,114, 20,220,189,  0,124,100,
+ 72, 36,127,168,228,203,151, 47,119,189,188,125,  6, 92, 43,124, 26,123, 54,210,250, 23,  3, 64, 92, 83,114,206,171, 59,157, 27,
+111,135,127, 57,124,126,198,140, 25,233,254,140,183,225,247,223,139,228,161,  9,120,227, 95,239,226,189,149,121,248,127, 95,236,
+198,188, 81, 73,184,246,109, 30,106,116,122,159,100,155,145,145, 65,210, 82, 30,132,205,102, 63,108,179,217,237,238, 10,  0,  0,
+ 44,125,245,165,128,  9, 91, 32,250, 91, 11,111,177,127, 79,175, 64,  3,  5,128, 97, 24,212, 24,140, 16, 49,  4,118,187,  3, 44,
+165,176,179,206, 36,210, 35,191, 30,198,168,209,227,156,110, 50, 74, 33, 98, 68,168, 53, 90, 97,183, 90,124,107,152, 14,135,178,
+115,187,171,154,216,232, 26,151,150, 49,100, 96,152,115,216, 16,  2, 66, 40,250,245, 56,171,177, 59, 28, 74,190, 55,199, 89,247,
+ 77, 37,  3,  6,100,189, 54,145, 92,227, 15,162,162,162, 80, 94, 94, 14,153, 76,134,218,218, 90,196,198,198,186,146,  2,205,102,
+ 51,170,171,171,253, 82,  0,210,223,216,128,127, 47, 86, 33,178, 19,160,253, 13,120,102,153,  6, 97, 98, 17, 38, 63,251, 38,174,
+176,215,176,126,249, 11, 16, 49,252,229,113,214,255,128,  1,  9,136,237,210,  9,173, 98, 91, 66,202, 16,216,  9, 69,121,157,  9,
+186, 90,115, 64,237,247,222, 91,155, 49,169, 71,103, 68, 68,196, 32, 36,182, 45,108, 85, 58, 28,222,250, 37,170,171, 46,  5,212,
+137, 63,126,235, 41, 96, 65, 50,196,118, 43, 58,213,  1,101, 34, 61,254,125,245,103, 64, 26,193, 91,198, 47, 91, 14,170, 42, 24,
+ 19, 46, 73,141, 72,186, 71,133,251,102,135,161, 40, 74,171,137,141, 61,172,105, 63,184,  8, 53, 76, 45, 44,212,  4,227, 23, 44,
+228, 97,225,124, 44,127,247,  9,158, 91,  5, 32, 13,214,192,253,254,251,239,  1,  0, 51,103,206, 84,117,239,222, 93,251,232,163,
+143,186, 44, 70, 62,228, 31, 27, 27,187,109,237,218,181,161, 25, 25, 25,162,  5, 11, 22,224,185,231,158,163,  7, 14, 28, 24, 76,
+ 41,221,110,180,209, 30,148,210,159,252,183,230,162, 26,117,251,  7,154, 16, 24, 76,242,247, 36,120,119,133,101,205,154, 53,164,
+160,160,128,151,107,255,202,149, 43,  7,184,247, 89, 89, 89,174,151,231, 49, 14,209,209,209,  0,208,216, 36,120,  5, 64, 53,  0,
+230, 74,201, 53,252,248,227,143,174,152,255,128,  1,  3,  0,  0,217,217,217,248, 42, 55, 15,186, 90,179, 17,192, 82, 56,151,  6,
+242, 30,111,223,110,250,  7,198, 45,126, 26,227,199,143, 70, 75,153,  8,181,132, 98,251,233,203,248,241,183, 98,191,136,122,254,
+156,233,247, 23,157, 61, 43,190,124,241,  2,184,215,210, 87, 95,106,210,146, 23,112,123, 19,191,231, 49,111,104, 16,  2,144,201,
+100, 56,115,226,168,170, 83,219,104,141, 66, 34,134,195,193,130, 16,  2, 66,128,116,245,147,160,148,133,163,190, 30,128,209,108,
+198,201,211, 69,144, 74,125, 59,177,237,182, 42,244,187,239,188,251, 44,138,191, 46, 56,143,175,191,232,230,210,157,147,122,157,
+195,193, 35, 61, 32, 22,197,250,101,253,123, 35,126, 83, 77, 37,  0,  4,100,253,123, 27,104,  5,235,223,  2,  0,222,214, 63,224,
+ 92,231,223,186,117,107, 88, 44, 22,148,150,150,194,225,112,160,101,203,150,168,172,172, 68,203,150, 45,235,219,149, 63, 97,151,
+ 95, 59,139, 87, 94,215,160,230,  2,240,206,162,225, 48,216, 29, 88,184, 44, 27,239, 47, 78,195,162,229, 91, 33, 38,  4,126,240,
+ 63,106, 74,206,161, 77,203, 22,144, 64,  2,  7,  8,174,158, 63,142,139,101, 53,232, 26, 27,141,111,127, 57,128,147, 39,224,183,
+245, 63,101,238, 66, 72,162,  1, 70,  4,172,203, 59,143,175, 63,124, 30,115,223,202,192,194,135,251,226,201,209, 29,253,106,191,
+237,117,117,120, 47,101, 42, 80, 45,  7,136,  4,120,239, 93,164,254,188, 15, 59, 70,207,  7,121,243,105,144,131, 47,240,178,254,
+  1,224,215,171, 49, 24,100,170,129, 65, 33,130, 81, 46, 71,215, 41, 18, 88,168,  9, 53,140,  4,118, 36,128, 58,140,176, 85, 92,
+197, 15, 31,212, 96,230,140,174,183,100,208, 22, 22, 22,210,122, 98, 32,147, 39, 79,214, 58,125, 99, 78, 12, 31, 62,156, 12, 31,
+ 62,156, 15,249, 15,109,219,182,237,247,111,190,249,102,232,153, 51,103, 32,145, 72, 16, 17, 17,129,163, 71,143,218, 40,165,229,
+205,249,125, 77,173,201, 15,196, 59, 16, 76,242,247,180,254,157,196,122,253,242, 65, 62,185,  0,105,105,105,103,190,250,234,171,
+ 33,118, 59,191, 21, 78,114,185,124,110, 19,167,107,  1,156,  7, 48,224,244,225,  3,112,143,249,255,117,238, 84,124,223,165, 11,
+184,112,192,182, 46, 93, 66,102,204,152,241,137, 63,227,237,177,228, 65,136,100,163, 96,132,  4, 95,175,120, 26, 31,110,253, 21,
+207, 63, 56, 12,115,150,103, 33,117,233,231,126, 89,224,238,197,132,188, 29, 19,214,239,223,157,104,224,  1, 16,137, 68,164,250,
+234, 89,156,187, 92,  9,177, 68,  4,187,131,133,205,238,192, 47,191, 20,226,179,207, 62,129,213, 65, 97,115,176,144,138, 25,148,
+233, 12, 40, 62,249,163, 74,161, 80,104,125, 16,161,178, 71,215,139,127, 88,255,206,169, 10, 95,127,145,224,156,227, 24, 10, 48,
+ 20, 12,195, 98,112,223,147, 26,  7, 15, 47,128, 55,235,223,125, 21, 64,104,116,107,191,200,223,155,245,239,158, 85, 59,102,193,
+ 42,191,200,203, 57, 41,234, 96, 48, 24, 32,145, 72, 92,214, 63,203,178,174,191,254, 42,  0,159,175,120,  9,191, 20,239, 65, 88,
+107,103,210, 95,184, 88,132,242,107,103, 17, 33,147,160,186,234, 10, 68, 12,129,152,225, 23,126,230,172,255,246,209,225, 56, 81,
+116, 30,118,171, 21, 50,177, 20,  6,131, 25,223,106, 14, 32, 73, 53,193, 47,242,231,218,239,145,167, 94,195,250,127,191, 15, 35,
+ 11,180,239, 26,143,223,142, 31,196,194,135,251,  6,212,126,  0,176,176,107, 18,182,156,217, 13,212,216,  1,121, 75,236, 44, 56,
+  1,242,230,211, 88, 21, 23, 71,248,146, 63,  0,204,232,182, 88,251,195,206,  2,192, 90, 11,  3,169,133,142, 49,160, 70,108,131,
+205,161,135,204,108,132,188,228, 60, 54, 44, 57,131, 78,137,  9,104, 34,  1,176,  1, 20,110,153,175,114,185, 28,114,185,220,235,
+ 57,190, 88,187,118, 45,214,174, 93,219,172,193, 28, 30, 30,254,204,217,179,103, 67, 35, 34, 34,160, 80, 40, 16, 29, 29,141,242,
+242,114, 16, 66,140,193,156, 52, 56,139, 63, 63, 63,159,  2,206,132, 64,127,146,  2,131, 77,254, 31,127,252,177,146,250, 94,235,
+206,107, 69, 64,104,104,104,186, 88, 44, 62,231,121,124,249,242,229, 13, 44,127,  0,232,216,177, 35,146,147,147,215,249,178,127,
+174,148, 92,107,144,237,255,202,223, 23, 64, 38,150, 34, 46, 46, 14,220,234,128,250,243,161,254,140,183, 63, 43,251,224,185,119,
+223, 71,109,105, 25, 98, 35, 90,225,248,137, 75,152,179, 60, 11, 25, 25, 25, 36, 16,178,230,190,231,254,125,119, 57,130, 39,224,
+206,192,175,191,254,218,100, 49,160, 70, 61,  0,245,147,136,182, 80,187, 89, 69,105,138,166, 83,219, 24,132,135,200,112, 95,175,
+ 68,220,215,179, 47,196, 12, 96, 48, 57,112,233,106, 21, 10,180,223,169,194, 66, 67,124,254,131, 58,163, 17,  9, 29,175,194,108,
+145,131,114, 70, 13,  5, 20,114, 51, 40,  5,170,170,101,  0,  1,194, 67,237,232,157,112,  1,251, 14,245, 67,120,120, 56,111,235,
+223,221,226, 87, 68,198, 64, 66,109,128,253,143,249,206, 33,246,253, 27,221,173,127,119,139,159, 59,118,246,248, 97,215,181,124,
+170,236,185, 43,  1,  0,208,186,181, 83, 25,169,170,170, 66, 68, 68,132,203,253,239,143,  2,192, 41,  1,192,155,152,159, 54, 18,
+248,247, 62,124,248,242,  4,164, 46,122, 31, 89,111, 61,  9, 49, 33,144,202,248,173,216,225,172,255, 19,151,202,112, 79,251,150,
+248,232,191, 27,208,169, 83, 39, 68,182,237,138,190,109,187,194,102,249,195,253, 47,225, 33,147,179,254, 95,159, 59, 26,207,188,
+186, 14,237,187,144,102,181, 31,103,253,143,221,244, 49,118,204,156, 14, 18, 63, 24,128,179, 42, 32,224, 44, 17,204, 93,251, 76,
+ 92, 28, 47,226,232, 99,121,129,100,189,187, 76,217,117,114,173,166, 83,183, 94,208, 43,128,243,184,136,218, 11,229, 40, 95,234,
+128, 65, 23,143,  5,179, 23,241,126, 32,171, 87,175, 38, 10,133,130,154, 76, 38,184, 89,158, 84,161, 80, 96,245,234,213,126,148,
+ 39, 10, 30,106,107,107,223,121,242,201, 39, 83,214,174, 93, 43,143,140,140,132, 70,163,193,202,149, 43,245, 86,171,245,193, 96,
+254, 31,206,226,231,150,203,249,155, 16,152,156,156, 76,116,186, 49, 52, 24,228, 15,  0, 28,177,243, 33, 40, 30, 21,  6,173,179,
+103,207, 30,188,113,227,198,163,117,117,117,109,108, 54,231, 50, 83, 79,242,191,239,190,251, 48,120,240,224,137, 60,158,179,184,
+166,228, 28,222,248,199, 43,248,102,203, 54,140, 27,214, 31,187,242, 15, 58, 13,152,182, 93, 17,217,182, 43,  6, 20, 21,225,193,
+ 41,179, 42, 46, 85, 26,199,118,136,  9,201,225,107,253, 63,151,185,  5, 75,254, 52, 22,109, 91, 43, 93,202,  5,119,143,124, 60,
+ 55,129,120,  7,  4, 79,192,157,171, 20,240, 82,  0,  0, 32, 34, 60, 76,251,139,118,179,234,124,252,189,232,210,173,135, 38, 34,
+ 84,  1,150,  2, 38,139, 21, 69, 69, 69, 40, 47,250, 85, 21, 30, 22, 10,134, 97,124, 14, 92,133, 92,142,141,223,143, 84,113, 25,
+240, 77,186, 35, 24,  6,161,161,252,173, 39,110,  9, 96,104,116,107,176, 14,155,147,252,235, 97, 35, 18,159, 37,118, 61,193, 45,
+169, 25,179, 96, 85,  3,210, 10,132,252,221,149,  0,247,194, 63, 85, 85, 85,190, 31,128, 15, 37,224,115,183, 85,194,107,151,254,
+245,143, 15, 54,  3,194,120,202,105, 31, 29,142,141,135,126,197,111,167,126, 71,146,106, 66,  3,210,247,135,252, 57, 60,242,212,
+107,248,186,127, 40,158,122,180,123, 80,218,111, 97,215, 36, 44,202,221,  8,242,198,171,216, 22, 55,  8, 43, 13,191, 53, 56, 63,
+ 57,178,  5,226,229,254,237, 73, 49,163,219, 98,237,182,220, 28, 92,209,157, 67,121,229, 85,148,158, 14,131,200, 17,129,161,125,
+134, 67, 53, 91,117, 75, 39,181, 96, 84,251,163,148, 30, 34,132,140, 33,132,236,124,255,253,247,229,147, 38, 77,210, 27,141,198,
+177,129,196,252,155, 66, 48,150,  0,170,213, 81, 65, 33,127, 79, 43, 53, 72,168,152, 58,117,106,215,218,218,218, 55, 10, 11, 11,
+ 23, 20, 23, 23,163,174,174, 14, 82,169, 20,109,218,180, 65,108,108,236,164,254,253,251,127,203, 83,214, 73,  0,  3,218, 71,135,
+227,129,  7, 30,192,175,103,138,209,178,115,207,  6,227,237,193, 41,179,140,  0, 62,224, 67,254, 28,254,172,236,131, 49,249, 63,
+ 97,230,171,159, 97,196,136, 17,136,139,139,243,170,104,  5,171, 65, 56, 37,192,159,182,110, 76, 33, 19,148,136, 91, 71,250,188,
+ 74,  1,  3, 64, 68, 68,132,214, 82,117, 89,249,139,246,180, 10,112,102,210, 82, 74, 33,147,201, 16, 25,193,187,  6, 54, 36, 18,
+137, 54, 82, 34,  9,250,205,113,174,126,145,221,  8,216,141,174, 12,120,142,248,253, 93,139,197,185,250,207, 30, 63,140,179,199,
+ 15, 35, 54, 54, 22,229,229,229,  1, 17,127,100,108, 91, 88,121, 36, 71,242,197,204,215, 62,199,129,125,218,160,201,187,112,225,
+130,107,183, 63,155,197,124, 29,249,251, 67,252, 28,102,247, 15, 13, 90,251,  1,  0, 89,241,130,139,248, 57,242, 63, 95, 87,167,
+154, 28,217,  2, 15,243,180,250,189,225,161,206,169,  4,157,235, 63,  4,144,216,190,102,205, 26,194, 85,251, 91,189,122, 53,113,
+175,252,183,110,221, 58,178,122,245,106,215,251, 53,107,214,220,244, 65, 79, 41,221, 79,  8, 25,145,147,147,179, 80,175,215,175,
+160,148, 22,  4,251,127,  4, 99,  9, 96, 48,201,233,  6,193, 20, 30, 30,190, 80,169, 84, 46,108,166,156,253,199,142, 29, 27, 10,
+160,115,203,206, 61,141, 54,139, 57,164,126,188,233,  1,212,  0, 56,217, 33, 38,228, 49, 56,147,  5,121, 99,204, 43,107,111, 10,
+241, 55, 71,209, 18, 72,254,214, 32, 49, 49,145, 23,249,251, 52, 64,197, 98,177,214,151, 59,254,102,131,139,237,115,196,143,102,
+ 18, 63, 23,155,174, 41,187,130,154,178, 43,136,141,141,109,150,197, 15,  0,118,  7,235,183,247,161, 41,148, 85,213,  4,252, 91,
+ 60,193,197,246,131, 69,252,193,110, 63, 46,182,191,197, 96,160,238, 86,127, 63,177,164, 89,196,255,191,  4, 74,233,207,  0,166,
+ 11, 45,113,235, 49, 99,198,140, 12,  0,159, 93,170, 52, 26,109, 22,179,123, 60, 50,162, 67, 76, 72, 20,252,220,253,143, 35, 85,
+119, 55,255, 29,164, 84,  9,184,137, 74,  0, 47, 67, 43, 49, 49, 81, 72,236, 16, 32, 64,128,  0,  1,  2,254,199,192,  8, 77, 32,
+ 64,128,  0,  1,  2,  4,  8, 10,128,  0,  1,  2,  4,  8, 16, 32, 64, 80,  0,  4,  8, 16, 32, 64,128,  0,  1,130,  2, 32, 64,128,
+  0,  1,  2,  4,  8,184, 43,208, 96, 21,192,252,249,243,  3,206, 34,245,182,221,228,237, 46,239,240,225,195,  1,203,235,215,175,
+223, 13,151, 23,236,251,109,217, 50, 49, 96,121, 21, 21,191,222,234,231, 75,234, 21, 86, 22, 94,138,175,220,137,253,239,102,201,
+171, 47, 76,196,212,183, 33,  5, 64,231,207,159,207, 10,237, 39,200,187,147,228,101,102,102,138,211,211,211,237,  0,240,209, 71,
+ 31,209,110,221,186, 97,196,136, 17, 68,104, 63,239,242,252, 86,  0,238,  6, 52,183,200,196,212,169, 83,149,  0,220, 75,134,170,
+ 54,110,220,168, 21,116,197, 91,131,154,154,154,199,143, 29, 59,214, 87, 36, 18, 45,146,201,100, 48, 26,141, 47, 12, 27, 54,236,
+ 93,  4,161,210, 30,165,212,239,106,140,119, 34,230,207,159, 79,193,115,147, 25,  1,183, 14,185,185,185,202,148,148, 20,109,128,
+223, 85,229,229,229,237, 14, 70, 65,169,122,121,143,229,229,229,109, 88,179,102, 77, 52,156,123, 26, 56,112, 11,170, 91,186,131,
+ 35,255,189,123,247,210,159,126,250,  9, 73, 73, 73, 24, 49, 98,132,208,113,130,229,  1,184,211,145,159,159,175,108,206,247,167,
+ 78,157,170,220,184,113,163,102,234,212,169,238,135, 53, 83,167, 78, 13, 88,  9,224, 20,138,236,236,108,174, 84,167, 95,178,210,
+211,211,169,159,255,175,201,245,192, 59,119,126,226,175, 60,149, 78, 23,122, 43, 20, 32,242,219,111,191,189,163,215,235,255,212,
+177, 99,199, 22, 21, 21, 21,168,223,110,247,237,175,191,254,250,237,208,208,208, 81, 15, 62,248,160,166, 89,255, 32,  0,242, 87,
+171,231,251, 61,  9,102,100,172, 38, 55, 79, 94,211,229,112, 27,219,244,133,239,248,218,184,113,163,  6,175, 18,144,127,121, 87,
+168,240, 42,193,212,147,105,126,183,235,184,113,227, 40,  0,108,223,190, 61, 40,  4,198,109,  5,172, 86, 71,  5,125,125,124,110,
+110,174, 50, 47, 47, 79,227, 15,217,254,229, 47,233,148, 82,231,214,234,222,240,240,195, 19, 85,121,121,121,154,148,148, 20, 18,
+ 64, 63, 30,181,109,219,182, 93, 35, 71,142,196,188,121,243,104, 86, 86,214, 24,189, 94,159,239,207,111,243,162, 52, 98,218, 16,
+ 41,212,243,212, 85, 47,124,177,248,219,183,166,191,245,  8,119,110,237,218,204, 38,127,227,172, 89,179, 40,  0,132,134, 54,190,
+181, 65, 93, 93, 29,  0, 96,206,156, 57,  1, 61,159, 83,135, 84,200,207, 60,130,228,244, 76,154,158,158, 46,212, 63,224,  1,174,
+ 56,144,123,141,  0,177,143,  1,239,181,110, 54,143,122,218,183, 10,205, 34,  4,119,242,223,184,113, 35,153, 58,117, 42,117,147,
+235,247,253,114, 10,  5, 71, 52,245, 27,126,248,175, 80,100, 71,251,241, 95,147,125, 94, 81,247,240, 95,249,139,243,115, 95,155,
+198,  8,200, 79,175, 12,169,169,169,249,170, 87,175, 94, 83,  0, 48,148, 82, 40, 20, 10,148,149,149,161,186,186, 26,145,145,145,
+ 40, 43, 43,219,253,253,247,223,171, 30,124,240, 65,191,148,147,252,252,124,202,109,204, 66,  8,193,148, 41, 83,144,156,156,172,
+ 34,132,240,150,147,155,187,217,245, 62, 37,101,146,207,207,190, 96, 58,240,212, 31,205, 61,100, 85,131,207,158,199, 20, 67,124,
+111,170,196,109, 39,236,142,189,123,247, 98,233,210,165,215, 61,139, 47,190,248,130,242,108, 55,101,118,118,182,  6,175,146,122,
+130, 77,187,126,226,126,149, 52,219, 66,188,141,231,150,  6,150,118, 70, 70,134,138, 82,138,245,235,215,211,253,251,247,163, 79,
+159, 62, 62,191,123,160,145,154,140,155,178, 23, 33, 47, 47, 79,195,178, 44, 50, 51, 51,225,107, 91,101, 66,136,146, 82,234,234,
+175,223,126,251,109,  8, 33,  4,211,167, 79, 47,  5, 16, 55, 99,198,140,157,107,214,172, 97,252,177,216,223,221,249,174,235,253,
+181,237, 87, 65,  8, 65,214,179, 33,  0,  8,222,153,245,246, 35, 45, 91,182,  4,  0,124,249,105, 22,230,141,156,199, 75,230,128,
+  1,  3,208,165, 75,151,160,180,123,102,102, 38,147,158,158,206,126,244,209, 71,244,167,159,126, 66,233,233, 78, 64, 69,148,192,
+234,126,146,191, 39,152,166, 38,242,236,236,108,100,102,102, 82,111, 19,104, 32, 59, 67, 53,215, 66,247, 37,207,205,202, 14,216,
+ 40,220,184,113, 35,217,184,113, 35,225,148,  0,  0,170,230, 40, 20,132, 16,164,165,165,129, 82, 74,220,126,155,223,138, 10,153,
+170,115,189,248, 28,247,133,176,173,171, 93, 47, 62,199,253, 33,127, 74, 41,184,221,217,124,237,210,230,173, 79,234,116,186,207,
+ 34, 35, 35,167,  0, 96,230,206,157,139,153, 51,103, 66, 42,149, 66,161, 80, 64, 46,151,131, 16,  2,145, 72,132,154,154, 26,222,
+237,152,147,147,163, 84,171,213, 52, 39, 39,  7,110,207,  4, 95,127,253, 53,230,205,155,167,201,201,201, 81,222,142,  3,215,155,
+ 66,112, 43, 60,107,217,217,217,154,140,140, 12,242,216,169,169, 94, 45,124,181, 90, 77,167,158, 76, 83,121,243, 12,248,194,188,
+121,243,232,243,207, 63,143,206,157, 59,  7,229,247,206,155, 55,143,170,213, 81,136,137,217, 21,212,118,216,188,121,243,232,252,
+252,252,221,125,251,246, 37, 31,126,248,161,150, 35,255,230, 96, 83,246, 34,172, 88,177,  2, 44,203, 98,209,162, 69,224, 35,211,
+157,252,  1, 96,219,182,109, 91,234, 93,225, 81,211,167, 79,183,143, 28, 57, 18,106,181,154,229,107,180,120,142,209,149, 43, 87,
+226,177,  7,156,182, 97,214,179, 10, 76, 27, 34,197, 11,227,158,231,125, 79,161,161,161, 24, 49, 98,  4,210,211,211, 73,114,114,
+178,215, 23,119, 13, 95,101, 47, 61, 61,157,  5,156,219,172,  3, 64, 68, 72,133,192,234,205, 36,255, 38, 21,  0,142,172, 10, 11,
+ 11, 93,101, 39,221,173, 39,127,137,214,101, 65,  4,121, 82,242,162, 12,168,130,217,120, 27, 55,110,212,  4, 65,134, 75,161, 72,
+ 75, 75, 83,113,109,120, 55,193,157,252,  1,160,184,184,216,117,238,202,149, 43,188, 21,198,154,154,154, 55,141, 70,227, 44,134,
+ 97,152, 25, 51,102,160,166,166,  6, 37, 37, 37,144, 72, 36, 16,139,197, 16,139,197,144, 72, 36, 80, 40, 20, 48,153, 76, 94, 75,
+162,122,153,224,148, 59,119,238,212, 16, 66,144,154,154,138, 53,107,214,144,228,228,100,146,145,145, 65, 82, 83, 83,185,254,163,
+ 17,166,138,166,201,191,190, 45, 85,220, 36,238,254,236,211,210,210, 84,201,201,201, 90, 32,176,146,180,201,201,201,100,205,154,
+ 53, 36, 59, 59, 27,148,210,160, 40, 99, 47,189,244, 18,178,179,179,121,245, 17, 95,248,230,155,111,198, 28, 58,116, 40,191, 83,
+167, 78, 48, 24, 12, 52, 52, 52,148,238,219,183, 15,128, 43,201, 50, 32,242, 95,190,124, 57,  8, 33, 96, 24,  6,135, 14, 29,  2,
+ 39,211, 15,143,196, 35,132, 16, 76,155, 54,205, 94,127,200, 58,125,250,116,189, 82,169,196,188,121,243,216,111,191,253,214,231,
+189,187,135,194,174,109,191, 10, 16, 96,253, 51,127, 84, 45,206,122, 54,  4,211,135,202,176,248,193, 23,120,255, 46, 62,150, 63,
+159,107,246,238,221, 75, 51, 51, 51, 93,175, 67,135, 14,193,112,105,  0, 96, 53,129,132,217,145,255,250, 73,184,159,231, 94,194,
+200,109, 72,254,233,139,223,242,122, 94,220,212,128, 44, 42, 42,162,133,133,133,200,206,206,  6,247,158,115,237,248, 51,200,111,
+ 52,249,187, 91,213,220, 36,116,187,194, 61, 36,112,183,129, 82,138,226,226, 98, 92,187,118,205,117,204,243,179, 15,136,126,252,
+241,199,241,  9,  9,  9, 16,137, 68, 56,123,246, 44, 40,165,248,253,247,223, 97,181, 90, 65,  8,129, 88, 44,  6, 33,  4, 14,135,
+  3, 70,163, 17,155, 54,109, 66,114,114,211, 97,143, 93,187,118,105,  0, 32, 53, 53,245,186,126, 91,255,153,114, 68,193,167, 95,
+123,186,245,125,125,230, 99,229,115,104, 44, 28,192,199,245,239,101,242,108,118,146,148, 43,230,239,166,192,113, 10, 44, 23,243,
+207,119, 35,255, 64,172,117, 78,  9,227,200,104,215,174, 93,154, 64,195,  0,156,188,110,221,186, 93, 71,110,129, 96,245,234,213,
+ 56,121,242, 36,141,141,141, 69,187,118,237, 92,219, 62, 95,184,112,  1, 34,145,  8,255,249,207,127,  2,250,  7, 35,135, 58,183,
+ 47, 99, 89, 22,127,251,219,223,176,114,229, 74,236,219,183, 15,132, 16, 60,156,242, 23, 92,188,192,111,  3,199,109,219,182,109,
+174,127,198,102, 56, 87,200,176,  0, 48,125,250,244,106,  0, 45,242,242,242, 64,  8,225,173, 80, 57,173,255,235,247, 49,113,134,
+  3,128, 47,179, 14, 35,183, 38,247,166,121,203, 78,157, 58,133, 67,135, 14, 53, 56,230,168, 62, 15,187,141,  5, 72, 45, 90, 60,
+104,195, 33,143,205,174,147,146,146,  4,230,231, 65,254, 77, 42,  0,245,110, 23,194, 89,253, 28,249,123,141,253,249, 65,214, 77,
+ 89,130,124,226,196,190,228,121,158,191, 85, 59, 82, 77,157, 58,213, 61,214, 76,189,157,231, 60,  3,205, 34,221,141,193,141,131,
+ 25, 38,206, 15,200,242,111,108,178,141,143,143,191,238,218, 38,158, 73,139,232,232,232, 94, 22,139,  5, 85, 85, 85, 56,112,224,
+  0, 68, 34, 17,172, 86, 43, 76, 38, 19, 88,150,117,237, 74,105,179,217, 96,177, 88,120,133, 24,184,231,208, 88,191, 77, 78, 78,
+ 38, 57, 57, 57, 52, 59, 59,219,167, 50,225,180,186,110, 76, 14,128, 98,200,170,235,136,158,251, 28,136, 34, 48, 98,196,136,230,
+ 43,  1, 30, 49,255,252,252,124,165,139,236,255,136,249,  7,148, 35,227,161,132,  1,112,238,182,168, 86,171, 41,159,231,192,215,
+ 11, 80,159,251,224,119,110,  1,183,179, 99,187,118,237, 16, 17, 17, 65, 60,149,221, 94,189,122,  5,108,249, 83, 74, 97,183,219,
+ 93,199,134, 13, 27,134,125,251,246, 97,207, 15, 14,188,187,140, 95,140, 61, 55, 55,119, 92,125,236,255,  4,128,150,  0,220, 55,
+ 27, 42,  1,208,  2,  0,242,242,242, 52,125,251,246,245, 41,175, 97,236,223,139,167,160,254, 47, 95,121,193, 64,122,122, 58, 73,
+ 74, 74,162,154,207, 98, 97,175,254, 21,132,173,  6, 28,206,157, 86, 25,145, 29,250,125, 12, 36, 82, 49, 44,142, 22, 56,120,161,
+ 47, 94, 89,174,195,161, 67,135,136,183,101,213,  2,252, 84,  0, 60, 61,  1,254, 90,254, 69, 69, 69, 52,152,238,110, 95,242,234,
+195, 18, 65,243, 52,100,102,102,146,244,244,244,128,190,235,249, 59, 51, 50, 50, 12,106,181, 58,172,177,243,129,194, 61,246, 31,
+ 12,101,192, 61,246,207, 87, 25,152, 57,115, 38, 66, 67, 67, 17, 22, 22,134,240,240,112, 68, 70, 70,178, 81, 81, 81, 76, 94, 94,
+ 30, 30,127,252,113,215,117,114,185, 28, 99,199,142,133, 90,173,166,141,236, 86, 21, 99,181, 90, 81, 85, 85,  5,179,217,140,200,
+200, 72,200,100, 50,216,237,118, 80, 74,225,112, 56, 96,181, 90, 97,179,217,224,112, 56,252,202, 47,240, 21,178, 74, 77, 77,197,
+237, 16,154,241,149, 16,232, 47, 56, 37, 32,224,254,245,175,198,219,110,234,201,180,250,188,155,192,100,123, 90,255,238,138,100,
+ 32,201,128,158,214,127, 83,138, 41, 95,242, 23,137, 68, 52, 34, 34,  2,112, 38,212, 17,  0,212,102,179,161,166,166,  6,173, 90,
+181, 10,232,190, 57, 99, 74, 44, 22, 99,193,130,  5, 56,116,232, 16,254,136,251,243,239,211,223,127,255,253,247,195,135, 15,  7,
+128,112, 56,195,185, 70,  0,216,176, 97, 67,171, 61,123,246, 68, 80, 74, 93,202, 54,159,117,226, 43,223, 95,137,105,131,175,183,
+254,103,254,219,136, 13,  7,108,160,148,162,223,140,126,152, 55,114, 30,  9,116,221,121,160, 74,128,106,118, 38,253,126,101, 71,
+136, 13,122,192,238,252,215, 44,  0,169, 24, 40,190,214,  2,187, 47, 13,112,100,126, 89, 46, 58,116,232, 16, 73, 74, 74,146,227,
+127, 28,124,172,127,128, 71, 37,192,252,252,124,151,235,223, 61, 31,128, 15,186,116,233, 66,210,210,210,130, 22,147,231, 33, 47,
+224,248,250,212,169, 83,169,231, 43, 63, 63,159,229, 86,  5,184,173,  8,  8,180, 19,135,221,205, 29, 46, 51, 51, 19,203,151, 47,
+111,208,175, 56,242, 79, 73, 73, 65, 74, 74, 10,  0, 96,207,158, 61, 77,137,137, 46, 42, 42, 50, 59, 28, 14,232,116, 58, 84, 84,
+ 84, 64,167,211,193,104, 52,194,104, 52,194, 96, 48, 64,175,215,163,166,166,  6, 38,147,  9, 22,139,197,149, 20,212, 36,137, 17,
+130,156,156, 28,191, 20,182, 59, 25,123,247,238,109,240,114,199,169, 83,167,148,238,159,249,196,156, 61, 99,254,158,150,123,115,
+178,246,189,125,119,205,154, 53, 36, 39, 39, 39,168,185,  0, 57, 57, 57,188,231, 46,142,252, 25,134,161,245,253,203,229,250,103,
+ 89, 22,165,165,165,232,214,173, 27,153, 63,127,190,223,191,229,229,197, 35,177,103,207, 30,176, 95,181,  0,165, 20, 43, 86,172,
+112, 61,163,189,  7,120,231,237, 33, 55, 55,119, 18,  0, 76,159, 62,189,184, 94,  1,176,124,249,229,250, 86,243,231,207,111,181,
+103,207, 30, 60,244,208, 67, 99,252, 89,166,120,109,251, 85, 16, 16,172,119,179,254,103,188,111,132,104, 90, 13,190, 60, 96,197,
+115,207, 61,135,101,223,191,125, 43,230, 21, 17,167,  4, 60,248,156, 29,212, 20,  9,232,  1,232,  1, 81, 45,160, 47,  5,182, 29,
+110,131,204, 47,203, 69,245,222,  2,113,122,122,186, 89, 32,127,223,228,239,211,  3,144,153,153,217, 32,238,239,158, 15,192,119,
+237,101,189,187, 80,197,185,229,155,235,146,247, 38,143,115,251, 39, 39, 39,107,131,181,132, 40, 57, 57,249,183,252,252,252, 94,
+183,227,  3,230,172,254, 96,185,255, 57,171,223, 95,247, 63,135,245,235,215,187,222,255,243,159,255,196, 39,159,124,  2,  0, 86,
+  0, 82,142,248,  1, 96,236,216,177,190, 20,  0, 83, 66, 66,  2,140, 70, 35,172, 86, 43,202,203,203, 33,147,201, 32, 22,139, 93,
+ 30,128,186,186, 58, 24,141, 70, 88, 44, 22,212,212,212, 96,202,148, 41, 62, 21, 76,206,186,111,106, 89, 43,119, 29, 31,220,200,
+ 28,128, 64,206,123,130, 91,238,231, 13, 43, 86,172,208, 44, 88,176, 64,213,189,123,119,237,173,236,195,141, 89,255,238,240, 39,
+ 23,160, 49,235, 63, 80,203,159, 97, 24,202,178, 44,  1,240, 15,174,107, 59, 28,142, 87, 67, 67, 67, 17, 31, 31, 31,208, 28,243,
+202,139, 35,161,213,106, 65,114, 98,  0,  0, 59, 94,  9,199,216,215,107, 49, 98,196,  8,188,177,108,143, 95,133,169,182,109,219,
+182,105,228,200,145,  0, 80,190, 97, 67, 86,187, 61,123,246,181,160,132, 98,252, 67,227, 83, 82, 82, 82,182,248, 51,157,  0,206,
+216,255,180, 33,146,134, 22, 63, 40, 22, 60,183,  0,113, 99, 91,223,178,130, 89,233,233,233, 13, 52,124, 90, 11,200,172,  0, 75,
+  9,236, 14, 10, 25,  5,226, 20,140,251,245,118,  8,112,242,247,178, 23, 27, 85, 16, 56, 15,172,152,143,229, 63, 96,192,128,235,
+242,  1,252,113,209,121,146,118, 16,200,217, 83,158,230,  6,116,188, 94,249,249,249, 65,147,119,183, 38,254,113,133,101, 56, 55,
+113,118,118, 54,158,120,226,  9,  0,144,114,215,184,159,171,159,180, 26,195,241,193,131,  7, 63,174,213,106,179, 29, 14,  7,244,
+122, 61,108, 54,155, 43,238,111, 54,155, 93, 75, 12,185,196,192,177, 99,199,106,121,244, 23,146,157,157, 77,235,189,  0, 13,250,
+109,126,126, 62,119, 28,201,201,201,188,188, 85, 55, 59,  7,192, 51, 44,224,235,121, 52,117, 94,173, 86,211, 21, 43, 86,104, 30,
+123,236, 49,124,245,213, 87,  1, 61,115,207,229,183,220,231,141, 27, 55,106,210,139,213,152,234,195,210, 30, 55,110, 28, 61,127,
+254, 60,190,255,254,251, 70,219,251,252,249,243,  0,128,237,219,183,251,252, 61,105,105,217, 52, 45,109, 52,198,140, 41, 66, 81,
+ 81,145,215,236,242,202,202,209,  0,116, 80,171, 27,159,183, 56,242,183, 90,173, 84, 42,149,114,215,252,163, 94, 33,120,245,226,
+197,139,232,216,177, 99, 64,150, 63,195, 16,167,194,206,145,255, 81, 59, 62,209, 88,  1,  0,111, 44,219,227,247, 28,193,141,137,
+249,243,231, 39, 82, 74, 49, 97,226,132, 41, 15, 79,124,248,155, 64,166,166, 73,143, 62,114,130, 16,114, 31,165,128,104, 90, 13,
+ 40,165, 88,176,112,  1, 90,143,109,243, 71,224, 35,112,112,236, 76,209,140, 74,130,153,153,153,116,227,139,109, 17, 86,121, 30,
+231,244,241,232, 44, 43,  7, 66,227, 32,174, 43, 69, 68, 93, 37,128, 86, 46,143,129,167,210, 32, 32,  0, 15,128,251,114, 63, 15,
+ 87, 31,205,206,206,  6,223,132, 41, 79,210, 14,214, 15,119,151, 23,132,245,255,  2,154,  9,119, 23,186, 59,  9,113,245, 36, 60,
+207, 53, 18, 67,180,  3,248,122,228,200,145, 79,231,229,229,125, 96,183,219, 81, 93, 93,237,202,  1,  0,128,242,242,114, 84, 87,
+ 87,131, 82, 10,127,194, 75, 99,198,140, 81,237,220,185, 83,147,157,157,141,156,156, 28,234, 25,243, 31, 51,102,140, 95,197,128,
+110,  4, 76,  7,158,242,155,240,189, 17,124, 83, 74, 64, 70, 70,  6,153, 55,111, 30, 13,132,252, 27, 36,  0,186, 61,119,183,164,
+ 64,127,189,  0,141, 42,238, 23, 46, 92,112, 41,104,124, 13, 13,247, 80,229,245,247,205,111,174,170,169,169,161,145,145,145,238,
+228,255,170,197, 98, 65, 73, 73,  9, 58,119,238, 28, 16,249,171,213,106,202,126, 21,133, 29, 71,157,198,233, 58,141, 21, 27, 14,
+ 88, 65, 41,197,190, 31,  3,143, 44,238,221,187, 23, 15, 61,244,144, 42,208,242,193, 28, 65,179, 44, 43,  1,128,175,126,180,225,
+185,231,158, 67,235,113,109, 60,252,  3,254,129,171,242, 55, 98,196,  8, 10,120, 95,238,231, 86,  9,144,247,243,237,200,212,  1,
+177,137,120,124,109, 13,128, 56,103, 27, 60,217, 18, 29,196,151,241,122,114, 25, 62,213,104,132,170,128,104, 88,233,207,211,242,
+247, 60, 47,110,106,162,200,204,204,164,222,150, 77,249, 19,  2,240, 66,218, 65,131,135,188,160,174,255,247, 40,  7,236, 55,210,
+210,210,192, 35, 97,145, 55, 26,115,247,  7, 26,  6,104,204,221, 31, 72, 24,192,189,188,172, 39,249, 52,117,174,177, 91, 37,132,
+172,154, 48, 97,194,154,245,235,215,219,164, 82, 41, 44, 22, 11,236,118, 59, 88,150, 69,139, 22, 45,160,211,233,144,230,231,210,
+179,212,212, 84,109,106,106, 42,217,185,115, 39,205,201,201, 65,118,118, 54,184,186,  0,183,115,229,185, 96, 99,247,238,221,116,
+194,132,  9,216,186,117,107,179,201,223,147,228,242,157, 10,153, 79,111,220,243,207, 63,127,157,113,225,137, 23, 94,120,129,242,
+ 77,242, 84,171,163,124,202, 83,171,249,197,255, 21, 10, 87,233, 75, 74, 41,133,209,104, 68, 73, 73, 73,192, 49,255,  6,158,143,
+215,107, 27,124,110, 14,249,127,248,225,135,193,234,179,108,238,183, 91,186,185, 87,  2, 12, 22,154, 82,200,214,173, 91,231,151,
+245,175, 78,237, 90,242,241,105,180,205,200, 57,  7,119,238, 25,241,159, 76,186,123,222,189, 56, 83,170,192,153, 51,103,160, 82,
+169, 32, 32,  8, 30,  0,  0,104,140,228,111, 71, 45,235,118, 91,255, 31,140, 37,126,127, 40, 34,201, 65,251, 93, 83,167, 78, 85,
+249, 91,222,215,  7, 49, 80,119,133,198, 91,162,149,231, 57,158,132,107,159, 57,115, 38,217,177, 99,135,242,210,165, 75, 26,147,
+201,  4,135,195,129,251,238,187, 79,149,148,148, 20,240,243, 30, 51,102, 12, 25, 51,102, 12, 55,195,  7, 20,154,185,209, 57,  0,
+190, 62,243,177, 56,235,179,195, 27, 18,142,159, 69,102,184, 54,194,171,132,230, 35,237, 58,123, 48, 61, 61,157,166, 23,171, 65,
+ 26, 22,  2, 34,  0,112,230,204, 25,218,196, 88,245,217,232,163, 71,143, 38,126,140,125, 18,140,107,  0,160,170,170, 10, 10,133,
+130, 18, 66,208,177, 99, 71, 16, 66, 72,183,110,221,208, 92,242,103, 30,211,129, 16,130,148, 71,156,171,138,  8, 33,174,229,126,
+156, 59,255, 22,129, 29, 48,171,127, 80,  5,206,153, 51,135, 83,254,195,234,189,122,118, 56,221,255,172,219, 53,126,221,112, 70,
+206,185,182,238,220,195,185,250,211,211,211,137,122,195, 61,135,103,  0,  0, 32,  0, 73, 68, 65, 84,151,134,158, 57,115, 70, 96,
+243, 96, 43,  0,119, 10,130,177,214, 63, 88,132,125,  3, 20,155,160,254,174, 96,111,236,115,163,173,231,250, 24,191,215,255, 97,
+181, 90, 33, 18,137, 32, 18,137,110, 98, 95, 91, 77,110,111,121,141,143,133, 89,179,102,249, 47,240,213, 63,246,177,200,206,206,
+110, 48,105,167, 23,171,221, 45,111,237,221, 48,151,180,110,221,154,252, 49, 86,156,201,182,205, 37,127,231, 51,105,106, 43,160,
+235,177,122,245, 79, 55, 77, 35,152, 55,114, 30,185,217,115,130,159,243, 70, 40,156, 57, 69, 54, 55,229,211, 21,231, 87,169, 84,
+ 68,176,252,125,195, 91,104,128, 36, 38, 38, 10,  5, 19,  4,  8, 16, 32, 64,128,128,255, 49, 48, 66, 19,  8, 16, 32, 64,128,  0,
+  1,130,  2, 32, 64,128,  0,  1,  2,  4,  8, 16, 20,  0,  1,  2,  4,  8, 16, 32, 64,128,160,  0,  8, 16, 32, 64,128,  0,  1,  2,
+238, 10, 52, 88,  5, 48,127,254,252,128,179, 65,189, 21,118, 17,228,  9,242,  4,121, 55, 79,222,146, 37, 75, 26,106,247, 12,227,
+ 90,230,232,190,212,140,171,166,232,190,244,204, 91,249,224,176,176, 48,200,229,114,215,247, 25,134,113,173,184,112,151,199,109,
+204,196,178,206, 85, 94,220,102, 57,194,243,245, 71, 30, 81,138,196, 50, 80,214, 14,150,181,107,  3,145, 71, 41, 85, 29, 57,114,
+ 68,156,152,152,152, 15,143,170,123,  1,202, 83, 30, 57,114,  4,137,137,137, 90, 97,188,221,121,242,252, 86,  0,254, 23,241,242,
+203,  5, 13, 26,238,141, 55,  6,146,219, 74, 94,193,203, 20,  0,222, 24,248,  6,113,127, 31,168, 60,174, 82,156, 90,173, 70, 70,
+ 70, 70, 83,215, 53,121,222, 93, 30,220,150,233,113,223,113,255,190, 90,173,118,157,227, 43,247,127, 17,140,181, 78, 89,254,219,
+  1,140,136, 42,215,180,179, 95,198,105,218, 25,135,234,162, 85, 17,  9,131, 32, 13, 13,215,250,250,254,254,253,251, 49,108,216,
+ 48, 23,241,115,132, 77,  8,185,142,176, 89,150,117,189, 46, 94,188,232, 85,222, 47,191,252,130,  1,  3,  6, 64,161, 80, 64, 44,
+ 22, 67, 36, 18, 53,144,201,145,190,195,225,112,189, 44, 22, 11, 10, 11, 11,113,207, 61,247,220,141,143,136, 56,121,145, 42,127,
+255,253,119,156, 57,115, 70,211,162, 69, 11, 12, 31, 62,188, 89, 99,156, 16, 70, 41,147, 71,163, 69,212,189,154, 58, 67,177,202,
+ 80,123, 89,233,175, 12,150,101,149, 57, 57, 57,187, 79,159, 62,141,173, 91,183, 66,161, 80, 96,209,162, 69, 34,184,173,189, 15,
+ 64,158,166,232,220, 89,236,220,177, 29, 82,153, 12,207, 61,183, 96, 20,165, 84, 35,140,212,187,212,  3,112, 39, 33, 39, 39,199,
+167,198,147,154,154,234,115, 96,114,  4,237, 73,220,129, 34,216,242,130, 13,183,202,124,188, 38, 45, 62,165,101,249,202,171, 87,
+  4,154, 85, 93,156,171, 42,232,254,255,239,248, 81, 72,169,242,196,254, 29,136, 56,255,163,198,104,180,192, 54,136,129, 34,158,
+160,219,165,163,184, 63,156,106,116,229, 63,227,215,144,217,170, 10,210,174, 73, 37,224,196,137, 19, 16,137, 68, 24, 62,124, 56,
+196, 98,177,235,197, 41,  4,156,213,111,183,219,225,112, 56, 96,179,217,112,241,226, 69,236,222,189,219,171, 60,163,209,136,195,
+135, 15, 99,240,224,193,144, 74,165,144, 72, 36, 13,100,178, 44, 11,187,221, 14,187,221, 14,155,205,  6,147,201,132,195,135, 15,
+195, 96, 48,220, 22,250, 84,125, 63, 99,240, 71, 33,154,128, 57,122,201,146, 37,172,199,220,130,218,218, 90,196,196,196,  4,180,
+  0,125,201,146, 37, 13,126,207,231, 89,133, 80, 40, 90, 65, 36,146,106, 12,181,151,253,150, 89, 80, 80,  0,131,193,128,193,131,
+  7, 95, 76, 78, 78,110, 83, 89, 89,137, 29, 59,118, 56,162,163,163,145,148,148,212,228, 24,153, 51,110,244,117,109,115,236,212,
+ 41,104,195, 67,176,112,197,191, 46,247,235,223,171,253,213, 43,101,216,145,167,221,221,169, 87,191,100,189,190,102,151, 64,157,
+183, 63,184,210,191,238,240,172,  5, 32,110,106,146,229, 38, 87, 95,159,111,  5,249,255,245,175,127,109,242, 26,157, 78,135, 47,
+191,252,146,242, 81,  2, 56,178,110,174,181,126, 35,228,185, 91,254,205,181,254,221, 72,152,  0,160,106,181,218,231,198, 49, 60,
+201,154,112,196,206, 89,251,238,150,191, 59,213,241,237, 51,110,158, 10,234, 94, 78, 24,  0,170,170,156,149, 17,163,163,243,239,
+138,129,122,225,167,124,220,115, 89,163,185,108,100, 49,249, 30, 17,238,141,181,131,141,166,144, 68,139, 80, 91, 41,133,162,214,
+132, 30, 71, 86,105, 10, 19,230,169,140, 33, 29,181,141, 91,146,  4, 39, 79,158,132, 84, 42,197,168, 81,163, 92,164, 45,145, 72,
+192, 48, 12, 40,165,176,217,108,176,219,237,176, 88, 44,184,124,249, 50, 52, 26, 77,163, 91, 42, 51, 12,  3,155,205,134, 35, 71,
+142, 96,248,240,225, 80, 40, 20,144,201,100, 46,121,156,  2, 96,177, 88, 96, 48, 24,112,236,216, 49,152,205,102,191, 10, 51,105,
+181, 90,165, 72, 36,210,212,214,214, 66, 42,149,162,172,172,236,169,201,147, 39,215,202,229,242,207,  3, 33,109,173, 86, 59, 85,
+ 36, 18,125,229, 38,239,244,228,201,147,127,151,203,229,169,112,238, 80,233,183, 37,252,202, 43,175,104,150, 46, 93, 90,134,250,
+ 29,103,150, 44, 89,130, 19, 39, 78,160, 85,171, 86,141,214, 93,247, 69,254, 31,207,157,139,241,253,250,  1,  0, 90, 63,253, 52,
+ 20, 33,113, 48,232, 47, 65, 95,115, 78, 69,169, 67,235,175,204, 62,125,250,160,172,172, 12,251,247,239,239,200, 48, 12,142, 29,
+ 59,134,232,232,104,236,221,187, 23, 86,171,213,103, 59, 86,190,185,176,193,231, 48,171, 13,109,237,102, 60,247,252,171,237, 87,
+188,251, 79,188,243,238,135,104,199, 56,240,225,187,203,243, 71, 77,155, 33,176,235, 29, 72,254,220,113, 94,123,  1,  0,215,215,
+255,246,245,249,102, 34,152, 59,245,221,  9,112, 87,  2,154,233,  1,224,  8,150,  0,160,159, 60,250,153, 87, 66,126, 98,211,108,
+222,100, 93,239,218, 39, 94, 38,108,247,239,187, 20,  4, 62, 33,  0,238,127,123,254,245,244,  0,220,233, 48, 87, 87, 40, 71, 88,
+ 14,107,202, 68, 14,220, 19,  9,116,236, 64, 33,234, 35,133,184, 75, 23, 72, 45,102, 88,126,184, 12, 75,141, 24, 34, 86,  2,115,
+254,231, 26,102,252,179, 42, 86,236, 61, 28,192,185,231,207,158, 61,139,168,168, 40,168, 84, 42,200,229,114, 72,165, 82,136,197,
+ 98,151,213,111, 54,155, 81, 82, 82,130, 61,123,246,128, 97, 24, 48, 12,131,166,228, 57, 28, 14, 28, 63,126, 28,195,134, 13, 67,
+ 68, 68,  4,228,114, 57, 68, 34, 17,236,118, 59,172, 86, 43,244,122, 61,126,254,249,103, 88, 44, 22,136,197, 98, 87, 46,128, 47,
+124,241,197, 23, 74,131,193,160, 57,127,254, 60,244,122, 61,164, 82, 41, 90,183,110,189,106,223,190,125, 24, 50,100,136, 56, 52,
+ 52,244, 19,127,148,128, 47,190,248,226, 81,131,193,240,149,135,188,132,125,251,246, 37, 12, 25, 50,228,203,208,208,208, 84,190,
+242, 88,150, 85, 90,173, 86, 84, 85, 85,105,220, 60, 10,  0,128,165, 75,151, 22, 47, 89,178,164, 93,106,106,234, 40,185, 92,238,
+215,252,199,136,164, 74,207, 99,215, 62,248,  0,173, 39,197,227,157,119,222, 87,217,108,117,  1,205,167,251,247,239,215,252,244,
+211, 79,120,241,197, 23,245, 34,145, 40, 66, 46,151, 99,200,144, 33,208,104, 52,200,203,203, 67,187,118,237,252,240,119, 16,124,
+113,246, 42,190, 62, 83,140,220,111, 63,133, 72, 68,176,240,233,199,217,190,173, 91, 50,153,207,189,138,181,254,202, 19,112, 75,
+200,223, 83, 57,245,166, 20,  4,188, 10,224, 86,111,111,219,165, 75, 23,149,175,215,205,182,214,111,132,188, 96, 88,253,141,225,
+147, 71, 63, 35, 79,108,154, 77,189,145, 63,248,135,  8, 26, 88,250, 85, 85,201, 46, 11, 29,127,108,  1,234,183,219,191, 41,162,
+143,142,206, 15,200,250,183,219,237,202,159,127,254,153, 54,118,204,243, 92, 99,112,191,222,110,183, 43, 61,207,121, 30,107, 10,
+ 85,199,127,209,148, 20,235,209, 42, 92,140, 46,225, 20,226,150, 44,196, 15, 60,136,208,190,159, 67,209,255, 61,200, 34, 21,144,
+ 26, 76, 48, 26, 29,232, 32, 50, 98,239,250,198,149, 39,134, 97, 32, 22,139, 33,145, 72,112,230,204, 25, 28, 59,118, 12, 17, 17,
+ 17,136,137,137, 65, 76, 76, 12, 90,182,108,137, 22, 45, 90,160,166,166,  6,123,247,238,133, 72, 36,114,197,246,189,129, 59, 47,
+149, 74,225,112, 56,112,250,244,105,132,132,132,160,101,203,150,104,213,170, 21, 98, 99, 99, 17, 22, 22,134,211,167, 79,195,102,
+179,185, 66,  4,141, 41, 20,158,150,127,105,105,169,230,220,185,115,232,220,185, 51,198,141, 27,135,129,  3,  7,194,104, 52, 98,
+247,238,221, 56,114,228,200, 71,102,179,153,119,237, 98,173, 86,171, 42, 45, 43,255,166,232,106, 13,194,239, 25,140,132,113,127,
+ 66,187,129, 41,208, 89, 24,236,204,223,133, 35, 71,142, 76, 54,155,205,127,225, 75,254,122,189, 30, 71,143, 30,213,236,223,191,
+ 31,125,250,244,193,146, 37, 75, 90,162, 62,158,190,100,201,146,118,  0,224, 15,249, 51, 34,169, 50, 52,172,173, 50, 58,166,151,
+102,253,134,163,152,251,241,199,200, 59,124, 24,121,135, 15,163,245,211, 79,  3,  0,108,182,186, 61,129,140,227,188,188, 60,154,
+155,155,139, 41, 83,166, 92, 12, 15, 15,103, 66, 66, 66, 10, 11, 10, 10,176,127,255,126, 84, 84, 84, 32, 33, 33,193, 47,121,239,
+ 31, 62,131,119, 15,254,134,181,239,190,116, 84, 44, 50,129,113,212,226,237,149, 31, 51, 95,237, 45, 68,  9, 35,198,189,247,222,
+ 43,176,236, 93,  2, 38, 80,130,191,133,155, 87,220, 24, 11,251,229,  2, 26,204,184,125,176,229,221, 72, 69,224,137, 77,179,169,
+251,171, 49,175,128, 47,175,194,117,228,214, 80, 25,240,215, 83, 65, 26, 59,238,233, 21,224,131,218,218, 90,229,174, 93,187, 52,
+  5,  5,  5,141, 30,115, 63,215, 20,220,175,223,181,107,151,166,182,182, 86,233,126,206,243, 88, 83,136, 48, 87, 34,239,146, 25,
+219,206,179,184,172, 35, 40, 45,  7, 24,113, 36, 24, 18,  3, 98,150,161,174,148,224,232, 37, 22,199, 46,153, 81, 89,107, 67,239,
+104,153,134,143,  2, 32,147,201,112,238,220, 57,156, 58,117, 10,209,209,209,136,138,138, 66, 84, 84, 20,140, 70, 35,246,239,223,
+ 15,137, 68,  2,169, 84,218,228, 94, 10,156,119,128, 83,  2, 40,165, 40, 42, 42, 66,116,116, 52,226,227,227, 17, 27, 27,139,162,
+162, 34, 56, 28, 14,200,100, 50, 72,165,210,  6, 43, 15,188, 77, 43,220,155,242,242,114,205,149, 43, 87,208,179,103, 79, 60,248,
+224,131,152, 56,113,162,106,226,196,137,170,225,195,135,195,225,112,224,199, 31,127, 68, 81, 81,209, 96,  0,188,226,  9,229,229,
+229,187, 75,171,106, 16,221,181, 47, 18,146,231,160,231,132,249,232, 49, 97, 30, 58, 62,240, 40,172, 84,196,201,227,245,124,235,
+115, 31, 52,103,206,156,225,238, 85, 85, 79,252,204,146, 37, 75,176,116,233, 82, 44, 93,186,244,148,103, 94, 64, 99, 16,137,229,
+202,168,232, 30,154,214,237,134,105,162, 98,122,128, 48, 98,124,244,137,  6,115, 63,254, 24,115, 63,254, 24, 75,151, 46, 69,121,
+121, 57,248,202,243,176,252,233,150, 45, 91, 48,100,200, 16,244,239,223,191, 35,  0,249,174, 93,187,  6, 92,184,112,  1,199,143,
+ 31,135,201,100,194,132,  9, 19, 70,241,149,151,245,251,101,188,247,243, 41,172,121,227,249,170,248,123, 59,246, 49, 26,116,200,
+250,102, 23,142, 30,251, 29,123,191,219,137,154,107,165,152, 48, 97,124, 50,  4,220,182, 72, 76, 76,108,212,250,231,149,  3,144,
+145,145, 65,242,243,243,149,124, 63,223,201,  8,166,165,126, 35,228,  1,193,115,255, 55,106,133,186,197,212,253, 37,127,206, 11,
+224,110,157,  7,  3,190,146, 15,253,129, 86,171, 85,150,148,148,104,184,205, 93, 26, 59, 22,  8,206,158, 61,139,202,202, 74, 77,
+219,182,109, 85, 74,165, 82,219,216,177, 70,137,171,226, 50, 14, 92, 53, 97, 66, 72,  8,246, 93,102,209,182,191, 12,157, 45,133,
+208,157,248, 43, 54,189,125, 20,236,133, 26, 24,172, 20,197,181, 14, 40,196, 12,236, 53,215, 16,217,132,210,238,174,  4,200,229,
+114, 92,188,120, 17,167, 78,157, 66,207,158, 61,161,211,233,112,240,224, 65, 87, 44,223, 87,188,158, 16,226,242,  2,112,242, 40,
+165,184,124,249, 50,122,247,238,141,252,252,124,176, 44, 11,185, 92, 14,137, 68,226, 90, 37,192,199,  3,112,233,210, 37,152,205,
+102, 12, 24, 48,  0,241,241,241, 42,145, 72,132,136,136,  8, 12, 26, 52, 72,117,240,224, 65,205,165, 75,151,160,215,235,143,129,
+167,203,254,210,165, 75, 96, 25, 41,218, 37, 38,163, 69,124,  2, 24,145,  4,138,136, 88,116, 24, 52,  1, 23, 15,230,162, 94,222,
+  5, 95,114, 40,165,202,234,234,106, 77,113,113, 49, 58,116,232,128,161, 67,135,170, 68, 34,145,118,216,176, 97,100,201,146, 37,
+116,240,224,193,246,250,121, 51, 33, 50, 50, 18,245, 10,138,163, 41,153,114,121, 12, 98, 98,251,194,106,169, 65, 69,229, 97, 88,
+ 44,186,209, 54,155, 97, 32,128, 55,  7, 15, 30, 12,  0, 40,189,118, 13,245,242, 36,112,219,244,166, 41,252,242,203, 47,169,235,
+215,175,199,204,153, 51, 49,108,216, 48,  0, 96,119,236,216, 33,206,203,203,195,220,185,115,199,246,233,211,103,167, 63,125,249,
+180,222,136,197,123,126,197, 91,127, 83, 99,248,196,228,232, 58, 67,  5, 54,126,179,  7, 25, 31,125,141,109, 11,231,160, 75,217,
+ 21, 44,211, 95, 67,116,116,140,144,  4,120,135,192,221,237,239, 45, 95,165,209, 28,  0,207,216,190,175,207,119, 35,130,189,  4,
+ 47, 80,188,126,255,235, 42, 66,200,109,217,222, 30, 75,253, 26,228,  1,120, 42,  3,193, 92,254,199, 87, 57,200,205,205, 85,150,
+150,150,106,172, 86,107,147,199,154,  3,157, 78,135,186,186, 58,141, 94,175, 87,121, 59,150,146,146,210,232,179, 59, 82,101, 66,
+141,149,197,145,114, 59, 74,170,237,136, 59, 40, 70,159,141,103,113,241,194,113,252,254,147, 21,118,177,  8, 86, 22, 48, 91, 41,
+116,148, 69,108, 20,109,146,176,221,151,255,113, 25,251,165,165,165,232,216,177, 35, 46, 92,184,224,114,249,139,197, 98,215,245,
+254,134,243,220,107,  8,112,127,111, 80, 72,176, 26,205,203,222,191,206, 24,247,117,  1,203,178,168,171,171,115, 78,142, 98,177,
+ 74, 36, 18,105, 61, 60, 73,226,220,220, 92,164,164,164, 48,139, 23, 47, 46, 93,182,108,153,125,241,226,197, 77,222, 60, 33, 78,
+133,200,100, 44,133,161,246,178,202,225, 48,107,  1,236,  5,240,102,109,109, 45,114,115,115, 93,202,228, 61,247,220, 99,245, 37,
+175,190,127,165,228,228,228,100, 79,152, 48,193, 69,254, 63,252,240,  3,179,121,243,102, 40,149,202,137,254,146,255, 85,163,  5,
+143,231, 29,196,115, 83, 39, 32,245,241, 41, 48,154,245,216,148,171,197,202, 15,179,240,217,216,251,209,165,236,138,192,166,119,
+129, 50,224,169,  4,220,148, 74,128,106,181,154,186,199,116,125,125, 22,112,221,196,126, 67,201, 63,208,152, 58, 71,252,158,217,
+254, 30,174,127, 82,255,242,122,109, 99,253,197, 87,191,224,219, 95, 82, 82, 82,180,221,186,117, 83, 69, 69, 69, 53,121,172, 57,
+136,138,138, 66,183,110,221, 26, 16,189,183, 99,222, 96,114, 68,192, 70,128, 67, 21, 22,148, 57, 28,216, 85,100,198,198,108, 51,
+118, 95,137,197, 89,105, 36,174,212,216,112,185,150, 69,157, 29, 48,218, 41,100, 49,173,125, 18, 51,183,190,223,225,112,192,110,
+183, 35, 38, 38,  6, 97, 97, 97,232,216,177, 35,108, 54,155,235,184,183,130, 64,158,242,184,245,253,118,187, 29, 38,147,  9,148,
+ 82,180,111,223, 30,197,197,197,104,211,166, 13,196, 98, 49, 44, 22, 11,172, 86,171,235,255,242,  9, 15,118,232,208,  1,114,185,
+ 28,133,133,133,184,114,229,138,198,225,112, 64,175,215,147,159,126,250, 73, 99, 48, 24,208,161, 67,  7, 68, 68, 68, 60,200,119,
+142,234,208,161,  3, 24,214,138,226,195,249,168,190,114, 26,172,195,  6,147,190, 28,151,126,250, 14,214, 58, 29, 39,175, 19, 31,
+229,134, 67, 76, 76,140,134,101, 89,151,167,115,233,210,165,228,248,241,227,168, 39,109, 22, 64,156,183,130, 71,158,176,219, 77,
+176,219, 12, 80,132,182,134, 92, 17, 13,128, 40,  1,216,151, 46, 93, 26,227, 38, 15,107,215,174,229, 10, 40,121,189,231,202,202,
+ 74,250,217,103,159,209,140,140, 12,250,175,127,253,235,219,148,148, 20, 76,156, 56,145,243,  6,232,183,108,217,130,212,212,212,
+148,169, 83,167,126,199,167,205, 42, 43, 43,233,231,159,127, 78,167,253,245, 41,140,202,217,131,191,205,158,140,103, 94,152, 15,
+179,213,128,243,231, 46, 35, 35, 99, 35, 54, 63, 60,  4,202,246,173,  2, 30, 27,155, 55,111, 22,230,245, 91,  8,207,112,128,103,
+ 34,224, 77, 45,  5,236, 25, 54,240,245,249,166, 89,250,141,196,234, 61,173,125,190,214,127, 99,242, 10, 94,126,153, 22,188,252,
+135, 59,223,243,179, 47, 79, 68,176,228,185,131,115,249,127,242,232,103, 36, 16,247,127, 70, 70,134,203,178,111, 44,222,207, 29,
+119,191,214, 23,124,229, 15,248, 19, 30, 80, 42,149,218,135, 31,126, 88,229, 94,156,198,219,177, 64,112,207, 61,247,224,225,135,
+ 31,110,224,234,247,118,172,209,239,119,187,  7,221, 66, 69,  8, 39,128,141, 82,156,212, 89,177,254,172,  5, 95, 30, 40,193,207,
+231,170, 80, 98,  2, 42,205, 14,156, 51, 80, 92,181, 80, 24,172, 54, 85, 83,228,197, 45,205,179, 90,173, 48,153, 76,104,211,166,
+ 13,122,245,234, 85,175,232, 69, 99,224,192,129, 46,194,230, 72,187, 49,194,230,  8,221,102,179,193,106,181,130, 16,130,174, 93,
+187,162,186,186, 26,151, 47, 95, 70, 85, 85, 21, 58,117,234,  4,134, 97, 96,181, 90, 97,177, 88, 92,223,241,133,216,216, 88, 85,
+124,124, 60,142, 31, 63,142,239,191,255, 30, 91,183,110,213,108,221,186,117,247,190,125,251, 32, 18,137,240,192,  3, 15,160, 75,
+151, 46, 38,240, 44,100, 19, 27, 27,155, 18, 23, 29,137,202,162, 95,241,251,206, 79,112,252,187,213, 56,249, 93,  6, 46,254,184,
+ 25, 50,134,229,228, 21,251,146, 35, 22,139,181,113,113,113,170,136,136,  8, 28, 57,114,  4, 87,174, 92,209, 24,141, 70,165,187,
+ 34, 80,239,  9, 96,214,175, 95,143,158, 61,123,250,252,109, 86, 75, 13,106,170,207, 66, 34,  9, 69,139,232,238,154,208,176,118,
+144, 72, 66,149,132, 48,131,185,107,194,171,243,161,249,236, 25,140,233,110,224,148,230,235,240,221,119,223, 65,161, 80,160,103,
+207,158,232,212,169, 19,234,195,  7,118,157, 78,103,200,201,201,105,145,152,152,152, 50,106,212,168, 45,124,251,110, 94,222,119,
+136,136,  8,195,136,145,131,140,137,253,251,224,209,191,206,133,145,216, 81, 94, 86,133,121, 79,191,134,101, 73,247,160,127,171,
+192,149,228,205,155, 55,211,183,223,126, 91, 80,  2,110, 19, 69,192, 27,110,155,189,  0,110,245,170,130, 64,  8,216, 95, 12,124,
+195,169, 64,184, 19, 53,119,236,102,201,115,183,194,159,216, 52, 27, 79,108,154,221,224,189,251, 49,190, 22,187,187, 39,193,155,
+ 71,161,185,121,  1,238,158,  0,207,191,124, 17, 30, 30,174, 29, 61,122,180,106,224,192,129,141, 30,115, 63,215,100,187,187, 93,
+ 63,122,244,104, 85,120,248, 31,203,242,188, 29,107,210, 58,148,133,170,122,183,105,137,161, 49, 50,220, 31, 37, 69, 91, 57,  3,
+ 25,165,144, 91,236,232, 16, 38,134,142, 82,252,102,176,227,116,157, 29,237, 90,197,160,211,253, 35, 27,149,197, 89,253,220, 82,
+191, 14, 29, 58,160,111,223,190,208,233,116,168,174,174, 70,117,117, 53,194,195,195, 49,120,240, 96, 88,173, 86, 87, 77,128,198,
+  8,155, 83, 38,108, 54, 27,  8, 33, 72, 72, 72,128,201,100, 66,121,121, 57,202,202,202, 80, 94, 94,142,186,186, 58, 36, 36, 36,
+ 64, 44, 22,187,228, 53, 86, 87,192, 83, 41,139,139,139, 83,117,237,218, 21,231,207,159,199,246,237,219, 81, 80, 80,128,144,144,
+ 16,140, 26, 53, 10,125,251,246,253, 78, 46,151, 47,  4,207, 16,128, 82,169,220, 18,215, 42,118, 86,215, 54, 45, 96, 56,247, 19,
+ 78,111,255,  8,197,  5,223, 34, 74,230, 64,242,232, 81,232,219,183,239, 28,185, 92,158,203, 71, 86, 68, 68,  4,250,247,239, 15,
+ 74, 41, 14, 28, 56,128,194,194, 66, 77,113,113,177,166,170,170, 74,185,100,201, 18, 21, 87, 57, 49, 41, 41,  9,123,247,238,245,
+ 41,143,101,109,218, 26,221, 89, 85, 85,249, 49,200,228,209,104,221,246,  1, 77,108,235,129,154,240,136, 78,223,189,243,238,191,
+ 31,230,228,125,249,108,  8, 54,252, 96, 65, 99, 74,207,233,211,167,209,178,101, 75, 12, 27, 54,140,189,255,254,251, 97, 52, 26,
+ 81, 87, 87,135, 85,171, 86,133,117,239,222,125,210,180,105,211,182,248, 51, 38,126,255,253, 52, 58,118,136,199,180,105, 41, 33,
+175,188,252, 28, 42,107,107, 80, 81, 89,129,244,103, 94,195,107,143,142,198,232, 14,113,205, 34,255,149, 43, 87,162, 87,175, 94,
+248,224,131, 15,  4, 37,224, 38,226,215, 95,127,109,180, 14,192,117, 10,239,237, 66,240,254,172, 42, 72, 77, 77, 37,193,170,  4,
+232, 11,158,133,120,130,161,  4,  4,131,252,  3,149,215, 88,169, 94, 79,203,220,159,146,189, 30, 74,130,171, 40, 80,115,238,203,
+ 93,105,112,183,246,  3, 89,  1,224,110,221,221,127,255,253,164,177, 99,158,231, 26, 67, 83,215,243,149,193,225,  1,229, 40,109,
+145,152,194, 94,144,135, 11, 53, 64, 24,145,160, 99, 24,131, 98,  7,129, 72, 38,198,222, 50,  7,204, 44, 16, 43, 19,161,107,210,
+  8,200,187, 37,105,155, 82,  0,108, 54, 27, 68, 34, 17, 58,119,238,140,254,253,251, 67,175,215,195,108, 54,187,214,231, 91,173,
+ 86, 68, 71, 71, 99,216,176, 97,216,178,101,139, 43, 36,224, 13, 14,135,195,149,213,223,163, 71, 15,212,187,233, 97, 54,155, 93,
+227,153,243, 36,244,232,209,  3, 85, 85, 85, 48, 24, 12, 77,141,229,  6, 39,102,205,154,165,213,106,181,163,122,246,236,185,219,
+173,112, 79,245,240,225,195,119,203,229,242,153,  0,204,254,180,229,172, 89,179,214,107,181, 90,125,207,158, 61,115,221,228, 85,
+ 12, 31, 62,124,149, 92, 46,255,148,175, 28,134, 97,180,109,219,182, 85,141, 27, 55, 14,231,207,159,215,156, 58,117, 10,151, 46,
+ 93, 66,120,120,184,166, 69,139, 22, 24, 51,102, 12,254,251,223,255, 34, 41, 41,137,247,111,179,219,141,218,106,221,239, 42,179,
+185, 10, 45,162, 18, 52, 97,225,237, 17, 30,209,  1,117,181,197, 91,222, 90,246, 17,166, 79, 75,198,151,207,134,120,109, 39, 14,
+227,199,143, 71, 94, 94, 30,174, 92,185,194, 84, 85, 85,193,108, 54, 99,239,222,189,226,122,165, 83,239,239,120,152, 48, 97, 60,
+ 54,109,218,  2,125,117, 37,174,148, 92,197,179, 79,206,182, 62,255,226, 82,233,163,163,134, 96,152, 69, 15, 72,  2,163,135,205,
+155, 55,211,127,252,227, 31,174,114,208, 93,187,118,197,219,111,191,141, 23, 94,120,129, 78,154, 52,233,206,175,220,121,135, 42,
+  5,183, 76,  1,184, 17,171, 10,130, 65,238, 28, 42, 42, 62,194,203,  5,223, 54, 89,109,207,159,228,191,138,138,143, 80,240,242,
+ 31,242,220,137,217,211,101,207,135,180, 43, 62,170, 64,193,183, 47,  7, 77, 94, 48,193,199, 67,192,237,  1,224, 79,127,249, 95,
+ 26,156,157,134,168, 84, 71, 45,118, 77,249,238, 93,144,216, 77, 56, 90, 75,145, 95,107,135,148, 16,196, 80, 10, 85,155, 22,136,
+106, 29,171,138, 31,164,244, 97,105, 58, 61,  0,157, 58,117,194,192,129,  3, 97, 50,153, 96,179,217, 32,149, 74, 93,132,205, 89,
+233,177,177,177, 24, 58,116, 40,182,111,223,222,164,  7, 64, 44, 22,163,111,223,190, 32,132,192,104, 52,186,188, 11,156,210,206,
+ 85, 23,100, 89, 22,189,123,247,198,193,131,  7,225, 79,114,165, 82,169,212,224,143, 60,145, 48, 56,171,237, 93,  2,207, 76,120,
+111,158,  0, 55, 89,209,  0,170,  0,248, 93,155,152, 97, 24,109,139, 22, 45,208,187,119,111,149, 68, 34,225,150, 63,106,  0,160,
+184,184, 24, 15, 61,244, 16,150, 47, 95,238,151, 76,135,195,162,173, 51, 20, 43,173,214, 26,149, 66,127, 65, 19,209,162, 43, 66,
+194,218, 34, 36,172, 45,118,236, 42,  5, 25,221,180,197, 61,100,200, 16, 34,149, 74,105, 85, 85, 21,198,143, 31,111,141,137,137,
+145,178, 44,139, 75,151, 46,  1,  1, 36, 75, 62,240,192, 16, 34,147,201,104,196,137, 66, 60,249,228,159, 16,159,208, 77,250,246,
+115,127, 98,215,125,248, 41,179, 74,100, 14,168, 47,111,222,188,153, 46, 94,188, 24, 45, 90,180, 64, 73, 73,  9, 20, 10,  5, 88,
+150, 69,104,104, 40,222,120,227, 13,188,252,242,203,130, 18,112,131,145,152,152,216,168, 23,128,215, 50,192, 27,129,219,121, 85,
+ 65, 83,132, 19,136,245,223,152, 60, 79, 75,157,115,221,251, 34,237, 96,203,115,247,  4,  4,122,190, 41,175,130,231,230, 63,254,
+202,251, 95,  3,195, 48,218,196,209,227, 72, 85,157, 73, 25,105,183,104, 68, 23,139,112,143,237, 42,194, 99,226, 48,164,119,119,
+196,180,107,169,138, 76, 28,233,115,124, 80, 74,209,185,115,103, 12, 27, 54,204, 21,143, 23,137, 68,176, 88, 44,174,210,189,238,
+ 97,130,246,237,219, 99,232,208,161,208,106,189,139, 86, 40, 20, 72, 76, 76,132, 88, 44,134,213,106,117,125,207,125,233,160,251,
+ 70, 64, 12,195,160, 95,191,126, 40, 44, 44, 12,164, 25, 40,128,218,250, 87, 48, 96,  8,132,248,189,121,141,122,245,234,197,229,
+ 81, 16,150,101,149, 70,163, 17, 22,139,  5,221,187,119,199,138, 21, 43,252,220, 28,135,106,109,214, 90,216,172,  6,149,201, 84,
+ 14,153, 44, 10, 18,105,184,134, 97,196,248, 98,253,119,170, 89, 51, 39, 52, 41,175,190,174, 63,121,239,189,247, 88,147,201,  4,
+  0, 72, 72, 72,240,171,252,178, 59,250,247, 31, 64, 68,247,223,255,208,220,127,188,151,231,148, 71,153,132,132,123,145, 48,105,
+210, 44,177, 88,188, 62, 16,153,203,150, 45, 19,  6,245,109,162,  4, 52, 69,254, 55, 85,  1,184, 83, 17,204,101,127,158,196,220,
+ 92,107, 61, 88,242,154, 99,113,187, 19, 59,247,222,195,101, 47,116, 34,158, 24,149, 50, 73, 91,111,189, 98, 68,  0,223, 79, 75,
+ 75, 67, 84, 84,148, 43,195,159,101, 89,151, 11,159,243,  0,112, 73,127,220,142,128, 93,187,118,  5, 33,  4, 27, 54,108,184, 78,
+222,202,149, 43,145,157,157,237,186,214,225,112,248,220, 14, 88, 42,149, 34, 41, 41,  9,124,178,227,239, 84,101, 45, 44, 44, 12,
+ 97, 97, 97,136,137,137,105,198,216,225, 20,129, 90, 48,140, 24,206,116, 44, 86,195, 83, 30, 93,180,104, 17,169,127,158,148, 97,
+152,102,205, 35, 14,  7,187,109,193,130,  5,  4,  0,195,178,172,131, 97, 24,  5,252, 12,191,112, 16,172,251,219, 75,  9,240,  5,
+146,152,152, 40, 36,103,  8, 16, 32, 64,128,  0,  1,255, 99, 96,132, 38, 16, 32, 64,128,  0,  1,  2,  4,  5, 64,128,  0,  1,  2,
+  4,  8, 16, 32, 40,  0,  2,  4,  8, 16, 32, 64,128,  0, 65,  1, 16, 32, 64,128,  0,  1,  2,  4,220, 21,104,176, 10, 96,254,252,
+249,  1,103,112,174, 94,189,250,186,100, 66, 65,158, 32, 79,144,119,247,201, 83,171,213,244,145, 73,106,124,187, 57,  3, 25, 25,
+ 25, 12,188,172, 65, 23,218, 79,144,247,198, 27,111,184,174,121,249,229,151,137,208,126, 55, 87,158,223, 10,  0, 55,184, 27,187,
+ 56,144, 37, 47,119,178,188, 64,100,222,238,247,235,  5, 82,  0, 17,  0, 66,234,251,  3, 11,160,  2, 65, 88, 67, 29, 76,112,237,
+ 16,140,123,246,214,166,183,170,248, 80,109,237,255,111,239,202,195,154,184,214,247, 59, 73,  8,  1, 65, 22, 17, 17,149, 42, 32,
+138,184, 32,238, 90,149, 88,144,130,128, 91,209,254,106,123,107, 55,162,183,215,122, 91, 84,172,116,177, 11,173,120,181,155,183,
+173,161,183, 85,219,122,111, 43,181,130, 59,149, 26, 92,170, 86,197, 21,180, 42,224, 86, 65,169,202, 78, 66,150, 57,191, 63,194,
+ 96,  8, 89,102,146, 32,216,206,251, 60, 60,  9, 39,147, 47, 51,231,204,156,247,253,190,115,206,119,106, 35, 15, 29, 58,164,216,
+183,111, 31,  0, 96,226,196,137, 24, 59,118, 44,235, 84,194,237,209, 14, 83,167,201, 16, 23, 27,161,  5,100, 34,153, 76, 70,255,
+213, 18, 55,241,176,142,244,244,116,146,144, 16,212,226,127,107, 34,128, 71, 59, 71,  0, 24,144, 77,173, 55,128,160,102,217,190,
+111,186,169, 14,194,158,221,255, 28,109,207,212,245,218,115,205, 29,253,122, 25,226, 47, 58,115, 96, 93, 81,209,233, 71,252,122,
+  4,117,171,174,214,192,195,195,  9, 55,111,148,208, 97, 97, 67,238,134, 13, 30, 63, 18,192,101, 46,  6, 79, 28,254,140,148,150,
+ 92, 68,201, 21, 21,174,151, 19,244,234, 78, 33,168,183,  4,129, 65, 33,136, 24,243,247, 14,241,240,155, 18, 18,204, 94,  3,237,
+ 65,100,103,207,158, 85,132,135,239,198,218,181, 13,200,207,  7,222,124,243, 39, 92,191,126, 93,225,231,231,  7,137, 68,130,178,
+178, 50,233,244,233,211,225,  8, 65,112,224,192,  1, 82, 93, 93, 45,141,142,142,134,179,179,179, 45,246,  4,  0, 16, 23, 27, 65,
+ 39, 39, 39,139,128, 76,228,100,235, 31, 21, 56,118,219, 94, 30,127,  2,168,213,169,200,205, 77, 70, 76, 76, 38, 18, 18, 50,154,
+ 35,  2,188, 16,184, 63,224, 19,  1,113,128, 33,217, 83, 20, 64,127,239,245,167,189, 86,141,186,254,169,220,221,223, 47, 11, 14,
+238,219,127,198,180,137,232,213,163, 51, 60, 61,156, 81, 89,165,194,141,242, 94,130, 75,165,149, 62,219,183,126,165,136,121,116,
+246,106, 39,113,167, 53,214,236,157, 59,187, 47,242,242,197,237, 10, 33,106, 48,123, 10, 48,110, 24, 16,244, 16, 80,124,133,224,
+224,113, 37,118, 42, 78, 99,199,230,197,164, 79, 72,188,116,192, 32,235, 25,237,218, 42,218, 97, 46,138, 32,151,203,169,246, 18,
+  1,119,239,222,197, 75, 47, 53,160,107, 87, 32, 41,  9, 88,177,162, 14, 39, 79,158,132, 86,171,133, 68, 34,129,175,175,175, 98,
+251,246,237,232,219,183,175,116,248,240,225,249, 28, 59,128,200,194,194, 66,116,235,214, 77, 17, 29, 29, 77,125,251,237,183,  0,
+160,200,203,203,195, 19, 79, 60,129,145, 35, 71,114,189, 86, 49,  0,236,220,117, 66,  0,100,210,250, 87,189,134,230,123, 16, 30,
+134,222, 62,  0,204,156,185, 25,185,185,250,215,228,228, 18, 48, 17,  1, 62, 26,112,127,137,223,176,188,221, 82,  1,119,116,144,
+ 77, 94,205, 34,224,207, 76,254,  0, 68,123,114, 55,189, 38,157, 16, 17, 50, 98,104,119, 80,148, 62,171, 27, 77, 19,116,118,115,
+ 70,167, 32, 49,122,247,242, 64, 15, 63,183,135,246,228,110,122, 45, 46,225,153, 44,  0, 55, 45, 25,188,124,113,187, 98,252,176,
+ 26,252,243, 25, 64, 40,212, 11, 40,141, 22,232,228, 10,132,  6,  3,163,195,129,237,138, 26, 28, 57,189, 93, 49, 96,208, 68,155,
+ 30,124, 71, 13,  1,152,251, 62, 35,  2,238,119, 99,120,123,123, 99,251,118, 23,244,234,165, 68,126, 62, 80, 89, 41, 66,112,112,
+ 48,130,131,131, 81, 87, 87,135,210,210, 82,228,231,231,163,166,166, 70,209,175, 95, 63,214, 67,  3, 63,254,248, 99,164, 82,169,
+ 84,136,197, 98, 84, 86,182,140,100, 41,149, 74,124,249,229,151, 40, 45, 45, 37,143, 63,254, 56,151,250,164,  1, 32, 39, 91, 14,
+ 64, 38,208,191,218,142, 99,199,142, 53,215, 55,179,137,146,169, 50, 54,247,133, 97,219,178, 45,179,234, 20, 16, 18,137, 11, 23,
+ 48,178,174, 78,209,229,198, 13,252,238,235,139, 19,157, 59, 75,157,  6, 12,  0,161,168,124, 91,175,153,235,134, 81,108,108,176,
+ 45,107,107,123,134,161,255,228,228, 92, 36, 36,  4, 53,191, 50, 72, 72,  8,226, 69,192,125,128, 49,217, 51,251,  3, 24,150,243,
+171,  0,140, 31,250, 63,249,245, 21,157, 57,176, 34, 56, 56, 56,100,100, 68,247, 22,229,  2,  1,  5,177, 88,  8, 23,137,  8, 78,
+ 78,  2,  4,245,241, 66, 80, 80,176,111,209,153,  3,219, 45,  9,197, 19,135, 63, 35, 66,212,224,229,103,  1, 85, 35,112,249, 58,
+ 80, 89, 13, 84,213,  0,255,221, 10, 44, 88, 14, 44, 91,  5,140,141,  0,  4,164,  6, 39, 14,127,198,123,139,  6, 24, 52,104,144,
+ 52, 39, 39, 20,190,190,192, 19, 79,136,224,231, 55,  2, 19, 39, 78,148, 38, 36, 36, 80,241,241,241,210,152,152, 24,116,235,214,
+ 13, 39, 78,156,192,247,223,127,175,248,233,167,159, 34, 27, 27, 27, 35, 45,217,252,246,219,111, 35, 27, 27, 27, 21, 78, 78, 78,
+ 22,127, 91,161, 80, 96,211,166, 77,145,108, 72,118,255,254,253,  4,128, 90, 46,151,139,239,137,128,123,100,186,127,255,126,194,
+ 85, 64, 29, 61,122,180,249,207, 82,153, 45,162,142,109,153, 37,242, 15,252,237, 55,197,244, 83,167, 20,189, 46, 22, 67, 92, 83,
+131,238, 23,127, 67,228,145,195,138,174,167, 79, 43, 64, 72,164, 45,237,125,244,232, 81, 28, 59,118,140, 20, 22, 22, 70,218,122,
+207, 48, 54,216,148,177,181,103, 76,244,108,202,172,129, 33,125,230, 85,157, 16,204, 63,240,247,137,248,217,164,  1,126, 96, 35,
+  0,109,233,169,145, 54, 60, 63, 71,133,152, 25,251,230,126,199,210,111, 20,157, 59, 29, 59,107,134,180,153,244, 77, 65,226, 44,
+ 66, 85,117, 35, 66,130,188,145,181, 69, 17, 20, 54,120,188,135, 57,123,165, 37, 23, 49,123,138,254,253,238,253,192,167,223,  0,
+147,199,  3,113,145,192,111,197,192,201, 34,  2, 23,  9,133,161, 97, 64,204, 68,224,199,220,139,136, 24,227, 56,207,221,150,186,
+107,163, 57, 21, 54,193,221,221, 61,191,174, 78, 63,223,242,137, 39,158,192,184,113,227, 40,195,207,238,222,189, 43, 13, 13, 21,
+ 41, 18, 19,  1,138, 58,142,138,138,  6,197,239,191,  7, 89, 10,255, 69, 82, 20,165, 96,187, 57, 76, 69, 69,133,194,154,238,157,
+ 51,103, 14, 54,110,220,136,141, 27, 55,146, 57,115,230,180,104,139,253,251,247,147,141, 27, 55, 54, 31,215, 81,250,  3,182,101,
+230,208, 88, 88,136, 62,  5,  5, 80, 11,  4,112,162,  0, 45, 77, 64,107,116,160,181, 90,116, 61,176, 31,197,132,160,243,208,161,
+ 54, 19,184,171,171,171,226,248,241,227,210,185,115,231,230,219,106,  3, 64, 11,143,220, 84,153, 45,209,  5,123,201,223, 28,209,
+231, 26, 69,  2,120,180, 63, 76, 10,  0,115,147,223,108, 33, 28,107,132,200,213,222,253, 30,163,181,101,198,184,165, 73,133,182,
+216, 51,245, 29, 27, 39, 46,138,252,252,131,  6,248,251,185,129, 16,224,192,225,235,104, 80,234,119, 93,141, 24,226,135,174, 93,
+ 92,112,253, 70, 45, 93,124,185, 82, 32, 18,  9,208, 55,208, 11,254,254,193,158,208,111,209,106, 18, 37, 87, 84, 24, 55, 12,104,
+212,  0,187,246,  1,138,195,  4,254,221, 40,  4,  6,  0,143, 60, 12,244, 15,162, 32, 18,234,183, 22, 31, 29, 14,252, 75,174, 98,
+ 85,223,134, 33,121, 54,239,217, 40, 94,195,177,126,195,122,119,228, 10,  3, 91,208,180,157, 43,  6, 15, 30, 44, 53,254, 76, 40,
+ 20, 42,  6, 12,168,192,178,101,122,121,250,222,123, 23,113,229, 74,152, 89, 91, 42,149,202,170,231,111,136, 43, 87,174, 88, 61,
+102,194,132,  9,212,132,  9, 19,154,201,126,227,198,141,196, 88, 32, 76,152, 48,161, 93,234,174, 45,188,127,  0,232,123,251,142,
+ 66,173,209, 64, 32, 16,128,  8,133,160,105, 26, 26,154,  6,173,211, 65,167,163,209,179,188, 92, 81, 51,116,168,205,215,220,208,
+208,  0,  0,138, 99,199,142,129,162, 40,206,243, 59,218, 66,  4, 56,202,243,207, 77,206, 69, 76,102, 12,102,110,  6,146,115,245,
+239,115,147,115,155,197,129,120, 91, 49,207,188,247, 17,134,115,  2, 88,205,  1, 48,183, 10,192,214,213,  1,230, 60, 46, 91, 60,
+ 49, 75,162,193, 86,129, 98,233,186,141,191,203,214,139, 48, 55,169,208, 22,123,150,190,195,252, 14,  5,128,222,100,117,238,  2,
+173,159,237,239, 12,  0,184, 94, 86,  3,165, 82, 11,  0,  8, 14,244, 66,215, 46, 46, 56, 93, 84, 33,184,112,233, 46, 36, 18, 33,
+130,250,120,162,178, 90, 13,  0,102, 13, 95, 47, 39,  8,122, 72,255,251,143, 78,  0,194,  7, 80,112, 22,  3, 90,173, 62, 18,224,
+233, 14,148, 94,  3, 98, 38,  0, 15,245,212, 31,223,158, 48, 36,125, 91,198,133, 59, 58, 42, 42, 42,218, 44,138,210, 68,242,205,
+ 30,127,123,147,191, 33, 50, 50, 50, 72,106,106, 42,101,235,231,198,112, 42, 41, 70,163, 70, 13, 74, 40,130,142, 16, 80,  0,180,
+ 58, 26, 26, 45, 13,162,211,129,186,116,  1, 64,156,221,231, 93, 88, 88,  8, 31, 31, 31, 69,117,117,181,212,195,195,195,102, 17,
+ 96,173,236,126,145,127, 90, 90, 26,149,158,158, 78,102,110,110, 41,  8,  0, 32, 38, 51,  6,226,109,197,216,182,173,164,121, 37,
+  0, 51, 97,208,219,219,155,103,234,251, 76,254,102,  5, 64, 71,135, 37, 66,180,133, 96,237, 89,226,104,209,110, 27,175, 38,160,
+102, 85,114,253, 13,202,195,195,  9,149, 85, 42,248,120,187, 34, 41,177, 63,180, 58, 26,206,206, 66,  8,  5,  2, 16, 66, 16, 63,
+ 57,  8, 83,162,131, 64, 81,192,157, 74, 37, 60, 60,156,  0,224,174, 57,131,189,186, 83, 40,185, 74,189,136,105, 47,  0,  0, 32,
+  0, 73, 68, 65, 84,208, 63,  8,152, 52, 70,223,235,252, 86, 12, 12,238, 15,120,117,  6, 98, 35,  1,154,  6, 68, 66,224,226,101,
+253,241,108,219,150,203,123, 91, 19, 97, 88, 19,164,109, 13,154,166, 35,123,244,232,129,146,146, 18,236,223,191, 95, 49,126,252,
+120,169,155,155, 27,  4,  2, 65, 62,  0,232,116, 58,233,185,115,190,138,183,222,186,  1,138,162, 80, 81, 17,130,144,144,222,184,
+120,241,162, 57,123, 38,203, 55,109,218,212, 58,138, 68,  8,102,207,158,205,233,154, 13, 69, 64, 71, 34,127, 71,136,  4, 67,220,
+237,217,  3,226,223, 46,128, 56,  1, 98,154,232, 39,182,234,180, 80, 19, 29, 26,180, 90, 40,131,251, 59,228,220,  7, 14, 28,  8,
+138,162,108, 34,127,  0, 24, 57,114, 36, 70,140, 24, 65, 29, 61,122,148, 88, 42,179,134,166,136, 65, 11,194, 55, 85,198,  5,201,
+185,247,136, 31, 64, 43,207,159,153, 48,184,109, 91,  9,207,212,237, 64,254, 15,172,  0,104,107, 65,225, 40, 66, 32,  4, 16,204,
+174,108, 51, 17,192,172, 92, 16,204,170,100,227,253,  3,128,232,230,141,146,219,215,111,244,244,241,241,118,197,  7,159, 31,195,
+132,177,189, 16, 49,184, 27, 40, 39,170,121, 69, 64,211,214,241,184,126,163, 22, 55,111,148, 92,  6, 96,214,173, 12,234, 45,193,
+ 47,  5, 74,244, 15,  2,124,134,  1, 75,231,  3, 11,231,  2, 30,238,250,176,255, 91,159,  0,203, 23,234,143,253,165, 64,127,188,
+173,  4,237, 40, 79,189, 35,229,  2, 56,119,238, 28, 36, 18,125,157,236,216,177,  3,215,174, 93, 83,244,235,215, 79, 58,105,210,
+ 36,212,214,214, 70,122,123,123, 43, 14, 30,212, 34, 63, 31, 24, 49, 98, 56,  2,  2,  2,164, 61,123,246,  4,  0,133, 41,123,157,
+ 58,117,130, 90,173,102,245,219, 90,173,246,129,127,118, 13,201,159,141, 16, 96, 43,  2, 74,186,250, 74,157,207,156, 81,208,132,
+160,147, 64,  4,161,144,130,150,232,208,160,209,160, 86,173, 70,153,191,191,212,199,142,243,118,117,117,  5, 69, 81,210, 17, 35,
+ 70,228,219,106,131, 33,122,107,101,247, 91,  4,164,165,165, 81,201, 77,158,189, 49,249, 27,122,255, 60,218,151,252,121,  1,112,
+ 63, 60,188, 54, 94, 82,216, 44,  2,216,  9, 13,109, 88,216,144,178,226,203,149, 62, 67,194,124,177,116,225,104,172,255,223, 89,
+184, 72, 68,  8, 31,232, 11,138,162, 12, 60, 73,130,226,203,149,  8, 11, 27, 82,  8,160,214,156,193,192,160, 16,236,216,123, 26,
+115,103,  2,164, 20, 24, 61,  3,  8,236,  5,108,204, 49, 56,104, 33,160,211,  1, 59,246,234,143,111, 47, 88,138, 20,181,215, 50,
+192,187,119,239, 42, 66, 67, 47, 99,221, 58,  0,208,225,237,183,207,224,228,201,  6, 69, 67, 67,  3,106,107,107, 81, 90, 90,138,
+ 91,183,110, 33, 34, 34,  2,179,103,207,182,186, 12,144, 16, 34,165,105, 90, 33, 16, 88, 95,224,195,  8, 15,174, 96,134,  0, 54,
+110,220,136,  9, 19, 38,180,235,243,149,154,154, 74, 49,196,111,109,  8,192,218, 49,134,240, 26, 58, 20,119,212,106,232, 20,249,
+ 80,139,157,224, 70, 68, 80,209, 52,170,213,106,212, 78,122,  4, 62,195,134,217, 24, 21,164, 48, 98,196,  8,155,199,253, 13,109,
+ 24, 18,189,169, 50,123, 68,192,177, 99,199, 44,150,177,129, 41,242,103, 60,127,  0,252,132,192,118, 38,127, 94,  0, 60,224,104,
+ 30,255,103, 63, 12,160, 11, 27, 60,126,210,246,173, 95, 29,252,181,192,189,255,168, 97,254,136,141, 10,196,238,159, 75,177,227,
+ 39,253,195,249, 90,202, 88,208, 52,193,175,  5,101, 40, 41, 41,190, 26,159,248,236, 63,  0,104,204, 25,140, 24,243,119,106,199,
+230,197,228,195,175,244, 75,  1,215,190,171, 95,250, 23, 53, 78,191, 20,240,195,215,245,228,255,225, 87,128, 14,157,109,206,  8,
+104,175,103,110, 45,130,208, 94,171,  0,234,235,235, 49,116,168, 10, 35, 70,232,255, 31, 62,156, 96,247,238, 82, 92,188,120,145,
+ 73,  4,132,200,200, 72,244,237,219,151, 85, 14,128,201,147, 39,231,103,103,103, 91,141,  2,104,181, 90,120,122,122, 74,185,158,
+111,211,114,192,230,149,  1,251,247,239, 39,182, 14,  3,140, 28, 57,146, 85, 25, 23, 17, 96,237, 56,214, 70,  5,130,124,245,168,
+ 81,210,243, 78, 78,232, 85, 94,174,112,187,118, 13,170, 62,125,112,197,215, 87,234, 29, 17,  1, 52, 13,209,216, 64,176,142, 32,
+233, 86, 54, 76,149,177,173, 75,227,227, 24,194,183, 86,102, 11,140, 73,159,137,  8,216, 59,132,199,163, 53,216, 76,140,230,  5,
+ 64, 27,122,230, 29,244, 55,238,196, 60, 58,251,163,220,221,223, 47,254,189,188, 54, 40,184,143, 23,166, 76, 14,130,151,167,  4,
+149, 85, 42,156, 60,123, 11,197,151, 43, 81, 82, 82,124, 40,230,209,217, 63,  2,184,110,205, 96,159,144,120,233,129,130,237,138,
+ 67,  5, 53,152, 50,  9,248,226,125,125, 38,192,146,171,192,151,155,244,158,191, 14,157,209, 39, 36, 94,106,235,181,218, 51,  4,
+192,150,252,219, 99, 14, 64,121,121,185,212,203,203, 71,113,252,248, 31,  0,128,139, 23, 59, 99,196,136,  1,232,210,165, 11, 36,
+ 18,  9,202,203,203,165,241,241,241,156, 82,  1,247,238,221, 91,122,225,194,  5,133, 97, 68,199,152,252,131,131,131, 49,114,228,
+ 72, 78, 36,198,172,  2, 48, 24,251,103, 38,  4,218, 36,  2, 76, 17,161,173,228,104,141,220, 57,145,191,129,  8,232, 50,124, 56,
+ 26,  0,170,161,169,200,222,169,106,246,146, 63,151,122, 99,251, 91,142,182,199,150,252,213,  9,193,  0, 63,254,127, 95, 34,  1,
+230,132,  1,167,101,128,182, 78,150,227,186, 12,208, 86,123,182,218,116,244,249, 89,170, 39, 71,157,159, 61, 19, 23,157,196,157,
+228,241,137,207,126, 87,116,230,192,103, 91,114,246,  5,250,245,  8, 26,109,176, 23,192,145,176,176, 33, 71,227, 19,159, 93,  6,
+160,158,141,189,  1,131, 38,230, 15, 24, 52,145, 58,113,248, 51,242,253,142,139,120,239,211,142,183, 23, 64, 71, 36,127,  0,120,
+252,241,199,113,250,244,105, 60,243,204,241,166,  8,192,112,204,154, 53, 68,234,234,234,154,111,171,205,240,240,240,252,240,240,
+112,106,235,214,173,145,181,181,181, 10,161, 80,  8,129, 64,  0,173, 86, 11,177, 88, 12, 55, 55, 55,169,  3,200,223, 33, 34,128,
+199,159, 19,105,105,105, 84,122,114, 58,241, 95,224, 47, 69,111,211,199,148, 37,231, 42,248,249,  0,237, 11, 17,219,142,210,209,
+ 29,111, 91,216,179,229,183, 30,228,235,181, 19,213, 97,131,199, 63, 25, 54,120, 60,147, 49,198, 13,128, 15,128,114,  0, 74, 52,
+165,125,229,130,136, 49,127,167,108, 73,242,211,214,245,208,145,242, 74, 24,195,213,213, 53,127,204,152, 49,212,152, 49,142,175,
+184,196,196,196,124, 56, 40,185, 37, 51,238,111, 76,242, 19, 38, 76,160, 54,110,220, 72, 58,194,124,  0, 30, 29, 79,  4, 88, 62,
+  0, 60,249,183,  1,216,102,  1,  4,  0, 42, 60, 60,156, 31,123,225,193,131,  7, 15, 30, 60,254, 98,224,247,  2,224,193,131,  7,
+ 15, 30, 60,120,  1,192,131,  7, 15, 30, 60,120,240,224,  5,  0, 15, 30, 60,120,240,224,193,131, 23,  0, 60,120,240,224,193,131,
+  7,143, 63,  7, 90,172,  2,152, 63,127,190,205,179, 50, 77, 37,114,224,237,181,141, 61, 54,155,216,180,167,189,188,188,188, 72,
+  0,138,172,172, 44,135,216,219,187,119,111, 36, 77,211, 14,179,199,223,127,237,102,111, 54,128, 77,109,124,126, 78,  0, 36,208,
+ 39,173, 81, 65,191,154,133,192, 40,137, 13,223, 30,188,189, 63,187, 61,206,  2,192, 26, 57,152,  3,151,165, 84,142,182,119, 63,
+145,156, 84, 77, 32, 22, 35,115,163, 11,171,243,203,203,203,139,204,202,202, 82, 56,234,122, 13,237,173, 94,189, 90,154,146,146,
+162,176,101,123, 97, 83,246, 10, 63,237,140,129, 47,214,192, 30,123, 12,166,141,216,169, 56,125, 65,  7,  0,200,204,204, 36,201,
+201,201,118,181,103, 72,183,239,161,212,122,195,197,197,  5, 89, 89, 89, 36, 41, 41,169,163,220, 31, 93,231,189,146,242,205,218,
+ 15, 86, 63,  5,224, 15,  7,216, 11,152,255,210,203, 95,124,254,201,135, 79,154,177,231,  4, 64, 11,203, 25,217,156,160,207,220,
+216,117,225,194,151,191,249,248,227, 15,159,130,126, 51, 39, 26, 14,200,228,102,252, 28,115,188, 55, 14,183, 85, 67, 80, 20, 21,
+ 39, 16,  8,  6,  8,  4,130, 72,138,162, 66,  0,184,170,213,234, 92,161, 80,232, 73,211,116,  5, 33,228,117,  0,119, 28, 89,  7,
+ 60,120,152,194, 83, 37, 37,228,155,160, 32,135,245, 81,201, 50, 25,201,108, 35, 78, 20, 89,123,200,  9, 33,150, 30, 58,206, 29,
+134,163,236,113,245, 96, 29,137, 61,123,246, 88,237, 68, 24,114, 77, 77, 77,133,175,175,175,201, 12,120, 41, 41, 41, 10,182,191,
+201,216, 99,136,255,200,145, 35,205, 66,192, 30,123,244,185, 55, 32, 24,240, 54,190,222,171, 79, 29, 75,159,123,163,249, 24,193,
+128,183, 57,213, 75,231,154, 87,  8, 77,128,239,118,235,109,197, 78,116, 66, 88,112, 17, 50, 51, 51,  9,  0,112, 21,  2,213,218,
+239, 34,171,174,220,129,146,154,168,168,111,236,132,216,152, 42,244,240,163,112,252,248, 33, 82, 83,163,194,164, 73,147,218, 85,
+  8,204, 95,184,240, 37,208,244,228,249, 11, 23,190,244,249,199, 31,191,110,183,189,  5, 11, 95, 32, 52, 29, 61,127,193,194,151,
+ 62, 95, 99,210,158,134,133, 25, 13,  0,106,193,130,133, 47,209,180,110,242,130,  5, 11, 95, 90, 99,218,150,  0, 54,228,122,176,
+ 19,106,195,251,239,135, 31,126, 80,204,152, 49, 67, 58,121,242,228,124,123,140, 10,133,194, 88,145, 72, 52, 65, 36, 18, 61, 46,
+ 20, 10,189,  4,  2,129, 91, 70, 70,134, 96,241,226,197,207,234,116, 58,104,245,120, 92,167,211, 37,  0,248,165, 73,  4,168,155,
+250,191, 54, 31,  6,221,177, 99,  7, 97,219,223,197,197,197,113,186,167,119,238,220, 73,236,249, 62, 15,199,195,101,229, 74, 64,
+ 46,119,152, 61,229,146, 37,118,125,159,201,  8,200,105, 59, 96, 54,228, 63,108,216, 48, 20, 20, 20,112,242,248, 45,145, 60, 27,
+123,166,236,167,166,166,162,180,180, 20, 89, 89, 89, 14,221,214, 53, 57, 33,147,192, 37,  4,153,155, 34, 41,  0,200,204,242,160,
+184,144,255,234,213,171,165, 21, 21, 21, 10,115,228,159,154,154,138,140,140, 12, 78,228, 15,  0, 73, 73, 73, 24, 61,122,180,116,
+244,232,209,118,217, 99,200,158,121, 93,241, 14, 90,144,255,146,153, 18,172,220,172, 98, 85, 87, 30,202, 20, 50, 48, 68,136,122,
+ 37,193, 43, 79, 73,112,164, 72, 11,101, 61, 65,131, 26,144,134, 23,161,232,162,142, 83, 52,160,244,250,135,164,234,102, 39,184,
+119, 22,195,175,187, 27,186,118, 11,198,213, 18, 53,122, 15,208,192, 73, 82,129,188, 45,183,177,101,203, 22, 50,125,250,244,118,
+233,240,100, 50,153,179, 79,143, 30, 11,191, 61,114,148,138,237,215,247, 37,153, 76,246,174, 92, 46,111,180,199, 94, 87,191, 30,
+ 11,191,219,123,132,138, 14,239,103,151, 61,153, 76, 38,246,243,235,190,240, 39,197,  1,106,248,144, 48,115,182,232,118,168,182,
+230,237,  7,179,178,178, 20,  9,  9,  9,216,188,121,179, 98,242,228,201,173,218, 48, 34, 34,130,188,245,214, 91, 72, 72, 72,176,
+216,190, 34,145,104,146, 88, 44, 30, 40, 22,139, 23,136,197, 98,215,235,215,175,163,111,223,190, 16, 10,133,112,119,119, 71,113,
+113, 49,220,220,220, 68,199,142, 29,243, 60,124,248,240,129, 23, 95,124,177, 55,128,171,  0,196,230,234, 32, 57, 57,185,149,179,
+ 98,216,111, 49,229, 20, 69, 33, 51, 51,211,234,253,183,117,235, 86,179, 54, 12,203,  9, 33,136,139,139,227, 84,161, 57, 57, 57,
+118,125,191, 45,113,234,212,169,200,240,240,240,124, 71,216,186,117,235, 22,161,105, 26, 16, 84, 65,221,168,130,216, 89,  2,208,
+158, 16,  8,  4,232,214,173, 27, 53,216, 56,114,105, 33, 25,206,195, 15, 63, 76, 54,111,222, 12,115,246,102,206,156,137,131,  7,
+ 15, 82,182,158, 31,  0,148,223, 58, 79, 12,207,207,158,107,183, 37,154, 96, 46, 13, 48, 43,  1,192,150,252,217, 34, 53, 53,213,
+234, 49,108,136,203, 28,249,175, 88,177,  2, 75,151, 46,109, 81,110,171,  8, 72, 30,150, 73,208, 37,  4,153, 63, 69, 82,134, 30,
+127,116,116, 52,  5,  0,204,107,113,113, 49, 97, 67,214,150,200,191, 41, 50, 96,213,107,103,194,244,134, 30,190,241,208,130, 45,
+246, 44,121,248, 75,102,178,223, 41,206, 71,249, 10,233,251,144, 16, 46,206, 20, 30,242, 23,226,118, 37, 13,141, 86,136, 59, 85,
+  4,213,117,  4,197,191,211,128,  0,240,113, 61,131,188,188,188,200,168,168, 40,139,157,194,213,107, 31, 68,134,  6,  7,225,240,
+205, 91,232, 19,208, 21,  3,  7,  7, 66,232,236,141,135,250, 84,162, 82,169, 66,197, 77, 29,126,191,165,130,171,168, 20,121,121,
+238, 86,237,181, 17,230, 60,181,120,177,184,180,187, 63,156,135, 13, 23,168, 14,236,159,  3,224, 43, 27,236, 48,158,248,156,167,
+ 95, 90, 36,254, 93,236,  7,183,144,  8, 65, 77,225, 65, 91,237,  1,192,156, 23, 23,190, 44,134,179, 59,250,244, 11, 19, 92, 56,
+123,194, 30, 91,142,  4,205, 60, 35, 20, 69, 65, 34,145, 72,  1, 40,140,239,137, 97,195,134,177, 34,127,  0,112,114,114,242,148,
+ 72, 36,115,111,223,190,237, 26, 18, 18,130,161, 67,135, 66, 36, 18,225,147, 79, 62,129, 78,167,195,160, 65,131,240,227,143, 63,
+226,216,177, 99, 56,115,230, 12,132, 66,225,103, 58,157,110,170, 37,155, 83,167, 78,109,238,231,172,245,131,108,  8, 87, 46,151,
+ 75,253,252,252, 20,132, 16,139, 14,208,205,155, 55, 57,239,149,193,216,182,245,251, 12, 81,159, 63,127,222, 98,191, 17, 26, 26,
+ 42,229, 74,230,231,207,159, 87, 84, 87, 87,195,195,195, 67,106,143, 16, 56,113,242, 16,121,235,157,249,232,212,201,165,213,103,
+245,245, 74,228,252,120, 26,103,228,114,106, 74,247,238,228,122, 98,162,249,190,253,192,106,125, 99, 30, 88,141,238,147,226, 33,
+137, 24, 14, 93, 72, 88,203,240,217,119, 27,224,245,254,116, 12, 48, 24, 42, 82, 62,250, 60, 62,183,114,126,203,210,230,193,187,
+139,171,190,224,141,143,144,178,232, 25,  0,192,221, 59, 13,120, 47,125, 45,137, 24, 58,214,102, 17,224,232, 33,  5,139,  2,128,
+241,216,173,121,234, 29,  5,165,165,165, 88,186,116,169, 77,  2,194, 18,244,158,126, 50,181,103,207, 30,146,149, 57, 18, 16, 43,
+  9,155,177,127, 83,100,109, 76,202,150,134,  5,204,193, 80, 80, 28, 57,114, 68, 49,122,244,232, 22,161,127,174,246,254,187,216,
+205,108,231, 54,103, 85, 61,107, 59, 52, 77, 71, 58,187, 82, 16,  8,  0, 87, 23,160,170,134, 70, 35, 33,232,228, 66, 65, 69,  3,
+202, 70,130,158, 93,  5,160,181,192,165,235, 58,148,150,150, 42, 96, 33, 61,237,185,162, 31, 34,  7, 14,236,175, 16,139,  9, 94,
+152, 59, 10, 58, 29,193,205, 10, 53,174,221,168,  2,156,174,195,197,171, 17,229, 21, 87, 32, 16, 87,227,220,185, 42,120,120, 89,
+182,215, 86,112,246,246,126,227,241,191,253,205,249, 53, 26,240, 90,154,230,118,235,244,169,215,109, 36, 89,  2,  0, 18, 15,239,
+ 55,254,239,201,191, 57,175,186,172, 67,207,217,169,110, 23, 74,207,152,178,103,117, 71, 54,153, 76,134,206, 30,158,111,204,121,
+242, 41,231, 51,215, 42,145,248, 68,178,219,191,223, 73,177,245,220,204, 70,242,204,149, 91, 17,222, 58,230, 25,137,143,143, 71,
+ 84, 84, 84,126, 86, 86, 22,148, 74,101,115, 27, 50,158,127,124,124, 60,171, 54,117,118,118, 30, 91, 95, 95,223, 63, 52, 52, 20,
+ 82,169, 20, 41, 41, 41,120,238,185,231,244,157,185, 70,131,245,235,215,163,160,160,  0, 39, 78,156,192,247,223,127, 15,165, 82,
+ 25, 76,211,116,172, 37,155, 83,166, 76,113,232,253,180, 99,199, 14, 86, 67,115, 20, 69, 41,184,134,240, 13,109,219,242,253,166,
+208,112,126,117,117, 53,202,202,202, 76,126,238,239,239, 15, 91,  9,188,172,172, 12,101,101,101,118,  9,129, 51,167, 47,226,155,
+ 13,219, 49,126,252, 88,132, 13,234,209, 92, 94,116,246,  6, 14, 28, 56,132, 31, 55,255, 76,178, 94,125, 21,215, 19, 19,225, 50,
+110, 28,148,191,252, 98,210, 78,230,248, 20, 10,  0, 46,109, 88, 67,  6, 87,236,198, 83,123,183, 67, 23, 18,  6,229,162,229,  0,
+  0,151, 85,203,225,118,177,  8,139, 75,197,232,251,244,130,123,245, 88,127,239, 57,181,116,126, 81,209,227, 90,157, 95,222,158,
+ 95,112,230,244, 69, 68, 12, 29,107,243,253, 99,203,144,130, 97,184,223, 82, 52, 64,196,213, 99,119, 52,209,218,139,172,172, 44,
+187,190,159,156, 41, 35,232, 14,100, 38,232, 59,174,204,130,228, 22, 97,126,189,199, 95, 77,140, 35,  1,108,201,186,162,162,162,
+  5, 57,219, 66,214,108,193,136, 14,153, 76, 70,172,229,131,182,228,217, 48, 96,194,255,230,236, 17, 66,200,237,115,175,160,123,
+ 83,232,191, 89, 49,235,  8, 84,106, 64,211, 84,166,209, 18, 16,129,254,253,217, 51,  5,204, 42,  1,147,112,119,175, 86,212, 43,
+  5,240,241,246, 68,213,221,  6, 84, 85, 87,225,200,241,155,184,113,139, 64,220,169,  1, 61,130,235,160,108,184,141,190,131, 53,
+232, 29,218,136,239,191, 40,192,238,221,187, 35,239,227, 45, 39,144,201,100, 81, 51, 95, 72,238, 86,230,225,133, 18, 45,224, 18,
+ 53, 25,  2,175, 46, 62, 50,153,108,178, 92, 46,255,201,128,172,157, 96, 48,238,109,174,223,151,201,100,209, 73,115, 95,232,246,
+135,192,  3, 87,235, 52,240,140,136,130,200,221,203,216, 30,192,110,  2, 91,204,180,233, 51,186, 17,161, 51,170,235, 27, 49,112,
+216, 24,184,117,246, 48,101,171, 93,192,120,255, 20, 69, 97,219,182,109, 36, 62, 62, 30,219,183,111,135,139,139, 75,100,106,106,
+170,130, 11,249,  3,112,174,170,170,122, 90,163,209,  8, 92, 93, 93, 49, 97,194,  4,172, 90,181, 10, 78, 78, 78,144,201,100,216,
+176, 97,  3, 10, 10, 10,112,228,200, 17,252,252,243,207, 56,123,246, 44,124,124,124,124,180, 90,237, 67,176, 50,  4,146,156,156,
+ 76,172, 13,  1,124,241,197, 23,172,206,179, 45,135,  0,182,110,221,234,144, 33,  0, 15, 15, 15,105, 89, 89,153,194,220,103,246,
+182,187, 45, 66, 64, 90, 82, 66,238,172, 92,137, 15,  0,224,240, 97,220,157, 25,135,213, 67, 66,154, 67,246, 97,  3,  6, 96,214,
+236, 41,232, 93,121, 27,215, 19, 19,209,101,201, 18, 40,130,130,168,193,191,252, 98,241, 57, 17, 75, 31, 70, 72,108, 36, 22, 47,
+121, 23,255, 66, 17, 86,143,158,132,129, 35, 70, 33,248,110, 41,214,123, 14, 69,169,199, 45, 12,146, 72,136, 74,165, 98,213,190,
+210, 73, 67,240,212,211,241, 56,250,235, 89,236,206,253,  9,111,  2, 88,189,106, 29,194,  6, 12,192, 83, 79,199,163, 65,121,  7,
+ 18, 14,246,140, 97,239, 28,  0, 78, 17,128,  7,  9,114,185,156,114,196,172,117,134,220,179,150, 94,  6,132, 98, 36, 79,238, 13,
+120,246, 70,102,211,130, 37,182, 99,255,142,134,225,181, 49,147,254, 12, 61,127, 99, 48,115,  3,204, 77,  6,180,101, 39,194,141,
+139, 58,153,141,  8,184,215,164,224,138,154,224,230,109, 26,128,  0,110,174,250, 16,167, 70, 75,160,106,  4, 84,106, 64,213,  8,
+168, 53,128, 74,  9,168, 27,239, 69, 73, 76,  9, 10, 55,237, 43,228,198,181,  0,244,234,227,  6,226, 36,194,109,165, 18,138,125,
+215,113,174,248,  6,238,222,173, 67,216, 48, 29,234, 85, 90,168, 26,117, 80, 54,208,184,121, 13, 80,214,  3, 91,182,108, 81,112,
+217,  0,195,206, 54,161,133,158,158,111, 60,243,234,171,146,239, 13, 40,196,235,213, 52,183,187, 75, 23,189, 14,224, 39,  3,178,
+ 86,179, 48, 73, 68,110,158,111, 60,247,242, 82,201,174, 27,186,230,194,158,143, 47,117,187,250,229,171,134,246, 88, 69,  1, 92,
+221,220, 95,127,233,149, 69,146,146,178,123,187, 69, 38, 60,145,236,246, 93,230,106, 83,182, 56, 61,107,166,238, 37,142,207, 26,
+ 97,188,127,137, 68, 34,141,138,138,202,103,150,140, 42,149, 74, 69, 65, 65,  1, 21, 31, 31,207,214,150, 22, 64, 48,  0, 58, 60,
+ 60,156,150, 72, 36,130, 13, 27, 54,224,217,103,159,197,251,239,191, 15, 66,  8,126,253,245, 87,236,219,183, 15,103,206,156, 65,
+117,117, 53,250,246,237,139,154,154, 26, 87,129, 64,224,107,205,248,180,105,211,204,138,100,102,104, 96,202,148, 41,156,194,244,
+ 29,117,  8,192, 82, 20,192, 30,239,223, 94, 33, 80, 89, 85,213,252,222, 55,109, 30,  6,166,205,199,120,163, 99, 46, 63,250, 28,
+122,238, 63,142,146, 69, 47,224, 87,127,127,184,  0, 56, 35,151, 83, 48,177, 44, 78,169, 84,146,158, 61, 59,227,234, 53, 32, 44,
+ 34, 20, 88,249, 26, 94,254,114, 11,230,  6,157,198,144,198, 98, 44,190, 37,198, 59, 27,151,225,253,244,207,113,230,236, 65,244,
+234, 25, 70, 92, 92,204, 71,125, 13,237,121,119,113,197,163,113,163,240,104,220, 40,188, 69,127,  4,117,227, 82,156, 60,  9,156,
+ 60,  9, 28, 56, 16,143,127,175,185,136,184,184, 88, 18, 16,240, 16,130,130,190,225,196, 79,121, 15,191,134,146,131, 34, 43,125,
+247,231,127, 13,  1, 32,147,201, 72, 82, 82,146,148, 25, 51, 52, 22,  1,134, 29, 18, 51, 30,111,235,124,  0,134,244,163,163,163,
+ 41,253, 48,128, 24,153, 27,239,239,245, 50,179,254,163,162,162,168,188,188, 60, 98, 45, 26, 98,109,217,161, 37, 66,231, 58, 28,
+240,244,171,245,240,239, 38,192, 19,  9, 98,168, 26,  1, 15,119, 10,  2,170,201,235,  7,129,170,  1,168, 87, 19,212, 43,  9,234,
+ 85,  4, 52,  1,  4, 22,230, 92, 63,189,176, 30,131,134,148,194,175,255, 93,236,217, 85,129,187,119, 85,  8, 31, 83,131,193,222,
+117,128, 83, 35, 84, 13, 52, 42,110, 16,212,215, 83,208,106, 41,120,251, 80,  0,117,223,231,178,133, 13, 29, 50,100,184, 87, 64,
+  0, 14,233, 12,196,203, 19, 79,226,110,106,202, 48,153, 76, 54, 64, 46,151,159,227,112, 63,135,142, 24, 55,113,120, 23,255,  0,
+ 28, 63,218, 60, 71, 14, 93,165,255,135,171, 95, 44, 53,101,207,210, 86,216,  3,198,141, 27, 63,220,223,191, 39,206,157,184,220,
+ 92, 62,238,145, 41,248,159,124, 21,231,115,107,  3, 52,159, 59,243,252, 50,195,  0, 12,182,111,223,222,106,254,145,137,185,  0,
+ 76,163,  7,  3, 56,181,100,201,146,177, 34,145,200,237,235,175,191,198,186,117,235,240,204, 51,207, 96,197,138, 21,160, 40, 10,
+ 87,174, 92,129, 82,169, 68,106,106, 42,180, 90, 45,230,205,155, 71, 83, 20,101,245,  1,112,228,108,250,142, 62,  4, 96, 41, 10,
+224,  8,239,223, 86,108,216,176,  1,127, 75,158,133,234,170, 70, 32,125, 45,234, 15, 28, 71,167,241,195,155, 63,175, 72, 95,139,
+ 34,103,103, 80,255,120, 30,  3,103, 63,138,195,235,119, 97,240,224, 17,102,237, 93,186, 84,136, 49,227, 98, 81, 88,228,133,181,
+159,101, 97,252,248,177,120,231,211,101,120, 43,106, 14,190,  5,208,255,169,103,177,246,179, 44,136,197, 94,152, 58,109, 56,190,
+230, 96,239,227, 15, 54, 97, 68,252, 32,188, 59,104, 21, 10,167,184,193, 43,225,199, 22,199,250,184, 74,112, 52, 95,129,128,191,
+205,229, 92, 15,  7, 15,138,176,114,165,139, 21,  1,247, 23,138,  0, 24,143, 35,155, 35,248,166,227, 88, 35,179, 64, 63, 67, 93,
+ 79,252,151,144,245,201,101,232, 87,  1,180, 20,  5,108,134,  1, 28, 29,214,207,203,203, 35,134,222, 63, 19, 17, 48,252, 63, 41,
+ 41,  9, 76,178, 28,115,137, 33,184,144, 63,179, 10,192,156, 61,173, 14,168,111, 32,104, 84,235, 39,251, 53,170,  9, 68,206,247,
+ 62, 83, 53,  0, 74, 13,193,157,187,  4,127, 84, 18,156, 56,167,  5, 77,  3, 73, 73, 73,210, 75,151, 46,181,106, 27,173, 22, 40,
+187,174,198,245,146, 74, 28, 60, 92,  9, 66, 40,156,251,141, 70,252, 19, 90,136, 69,  4,127,220,  2, 14,254,  4,212,212, 16, 16,
+ 26,120,120, 18,  5,137,  4,136,141,157,138,171, 87,175,178,186,166,236,245, 50, 50,109,174,237,171, 68,  4,110,157, 95,125, 97,
+ 69,134, 83, 14, 17,180, 96, 98, 31,103,103, 56,253, 99,161,211,149, 53, 31, 45,  3,240, 36, 91,123, 66, 23,183,101,243, 95, 95,
+225,244, 83, 25,105, 97,175, 75, 39,103, 12,156,253,162,211,185, 77,159, 24,219, 51, 27,  1,144,184,116, 90,182,244,141,229, 78,
+151,111, 86,183, 56,160,179,123, 39, 76,127,226, 25,167,156,255,126,197,233,220,218, 42,106,103,170, 44, 34, 34,130,156, 56,113,
+  2,219,182,109,107,245,157,132,132,  4,147, 77,  1,160, 16,192,169,213,171, 87, 15,241,244,244,116, 99,194,224, 95,125,245, 21,
+158,125,246, 89,172, 91,183,174,217,139, 95,189,122, 53,170,170,170, 80, 83, 83, 83,215,208,208, 80,218, 20, 65, 16, 91, 58,215,
+ 23, 94,120,129, 24,135,232, 25,239,159,109,248,255, 65, 25,  2, 48, 21,  5,112,180,247,207,216,100, 59,  4,112,110,204, 24, 80,
+ 47,204,134, 39,  0, 50,105, 24, 26, 78, 20,162, 62,125,237,189,122, 75,158,133,190, 79,205,130, 68,162,191,254,162,162, 98,139,
+132, 93, 84, 84, 12,  0,136,141,211,139,136,130,227,103,240,237, 55,223,193,117,212, 72, 52,104,180, 80, 67,141,  9, 19,135,182,
+ 56,158,173,189,235, 58, 53,158,232,246, 34,232, 19,141, 72,250,215, 36,136, 31, 59,130,  1, 97,  3, 16, 54, 48,184,249,252, 82,
+ 23,175, 65, 80,144,144,245,125,243,200,255, 61, 18,117, 14,231,246,224,127,223, 80,214,166,  0,124,254, 57,218, 38, 17, 80, 71,
+ 68, 65, 65,129,213,217,228,121,121,121,145,172,151, 20, 58,119, 66, 86,239,253,128,182,128,160, 79, 39, 36,167,247, 65,102,126,
+ 60,  5,100,146,123,130, 32,218,230, 97,  0,227,165,128,230,150,  6,154,235, 44,101, 50, 89, 51,249, 27, 79,  0,100, 66,234, 76,
+153,165,  8,128,161, 61, 71,117,230, 59,119,238,140,188, 81,190, 75, 65,119,165, 33, 16,  1, 78,  2,253,253,173,161,  9,180, 90,
+160,182,150, 64,173,  1,180, 26,189, 40,152, 58, 77, 31,189,185,116,233,146, 89,123,141,183,119, 42,194,194,104, 28,216,167,  3,
+ 37,  0,254,184, 73, 65,226,  2,236,219, 13,168,149, 20, 40,  2, 12,142,112, 66,217, 53, 26, 19, 39, 78, 65, 92, 92, 28,197, 38,
+ 19, 86,246,122, 25, 89,249, 34,176,228, 83,219, 69,  0,161,117, 49,186, 46, 62,130, 93,244, 61, 22,234,  6,192,143,  2,148,195,
+134,137, 46,107,117, 49,156,236, 17, 58,  6,238,222,  2,197, 77, 93,179,189,174, 18,192, 71, 66,193,117,208, 48, 81,209,119,116,
+140, 57, 47,218,148,173, 78,238,158,130,171,183,170,154,136,  5,112,119,113,134,187,171, 24, 17,225, 67, 69, 91,190, 37, 49,237,
+252,232,154,172,115,102,214,127,124,124,124,243, 61,202, 68,239,102,206,156,105,201,  3,173,  3,112,249,228,201,147,117,227,199,
+143,239, 10,131, 53,253, 95,125,245, 85, 51,201,106, 52, 26,232,116, 58, 92,186,116,  9, 93,187,118,189, 77,211, 52, 43,181, 56,
+109,218, 52,179, 67,  0, 92,136,246, 65, 24,  2, 48, 21,  5,112,164,247,207,133,248, 25,116,247,247,196, 23, 95,236, 69, 98,194,
+ 24,116, 27, 22,  6, 12, 11,  3,245,194,236,150,162, 23,192,173,155, 74,108,221,118, 24,221,253, 61,217,219,243,115,193,176,225,
+125, 49,108,120,223, 86,199,113,181, 55, 97, 70, 40,210, 38,126,  2,186, 80, 79,254,207, 45,126,218, 38,123,198,120,213,253,213,
+ 61,239,215,190, 31, 93,142,242, 54,123, 32,237, 18,  0,  5,  5,  5,247, 61,107, 31,227,229, 50, 68, 23, 21, 21, 69,153, 32,127,
+194,132, 21,147,146,146,108,250, 29,195, 85,  0, 76, 25, 87,207,223,120,  2, 96, 19,154,203, 82, 82, 82, 20, 73, 73, 73,172, 31,
+ 50, 67,242, 55, 53, 39,128,171, 61,107, 88,185, 89,  5,107,246,226,226,226,242,151,165,110,197, 35,163,157, 64,  3,208,168,105,
+ 56,139,245,213, 84, 91, 79,208,168, 33,208,234,128,130, 66, 29,116, 52,129,181, 37,123,113,113,113,249,111,188,182, 21, 19, 35,
+133,152, 62, 71,136,186, 90,130,218,106,160,190,150, 66,159,190,  4, 58, 13,  5,145, 64,130,170,187, 52,202,126, 87, 99,209,203,
+236, 38,140,101,175,151,145,143, 22,  2, 33,  1,192,154, 87,128,  5, 31,216, 38,  2, 72, 67,253,140,127, 12, 27,186,211, 47,103,
+167,155,215,184,135,209, 13, 64, 55, 10,208, 29, 58,136,188,167,159,172,211, 52,212, 79,231, 98,143, 86, 53, 76,127, 33,106,248,
+174,208,183,178,221,124,  7,143,133,143, 51,133,174, 18, 10,202,243,191, 96,235,107,115,235, 52,202,  6,214,246, 26, 85,202,233,
+113,143,140,223,149,146,254,153,219,128, 33,195,224,238, 42,134,187,139, 51, 74,206,157,194, 27,169, 47,213, 41, 57,216,178,197,
+147,103,115,185,166,200,127,249,242,229,173,194,252, 63,252,240,131, 34, 33, 33,  1,102,146,  4, 49, 68,175,  6,112,170, 95,191,
+126, 37, 42,149,170,135, 80, 40,148,184,186,234,151, 98,109,222,188, 25, 51,103,206,132, 82,169,132, 74,165, 66, 99, 99, 35,220,
+220,220, 84, 58,157, 46,135, 16,114,147,205,201, 58,106, 53,192,131, 50,  4, 96, 24,  5, 96,222,183,  7,241, 51,232,211,199, 15,
+175,166, 37, 99,247,174, 95,145,189,229,  4,156,197,157,241,123,217,189, 17,172,158,254,  3,208,168,174, 65,196,176,254,248,240,
+163,100,188,159,254, 57, 39,123,190,190, 30, 40, 58, 87,212,252,121,216,128, 48, 84, 84, 84,115,178, 55,101,225,116,204, 20, 60,
+137,198,194, 58,140, 94, 48, 16,244, 96,  9,190,248,226,251,230,243,171,174,174,198,216,135, 67, 89,217, 51, 70, 84,102, 20,245,
+ 51,126,110, 83, 62,181, 89,  0,180,  5,249,179,177, 25, 21, 21, 69,101,101,101,145, 38,111, 23, 89, 89, 89,196,112, 89,162,177,
+215,111, 74, 32,180,142,195, 82,128, 88,  0,184,  8,  1, 55, 17,208, 88,139,172,247,157,  0,151,163, 36,249,177, 62,128,139, 55,
+ 50,191,225,238,245, 91,154,237,207,144, 53,219, 53,236,198,228,111, 60, 39,128,171, 61,182,228,207,198,222,123, 25,107,169, 87,
+ 22,206, 35, 18,  9, 64,211,192,160,126,194,123,237,113, 86,  7,141,142, 64, 71, 11, 49, 99,198, 12, 86,226,228,237,119,215, 82,
+139, 22,205, 35, 90, 45,160,214, 16,232,180,128,128,  2, 34,167,  0,181, 85, 20,126, 59,173,132, 82, 37, 64, 98,194, 12,214, 97,
+255,229,207,  1,193, 61,245,255,  7,245,  0,108,141,  4,200,229,242, 35, 50,153, 44,246,230,212,184, 93,  1, 91,119,186,  5,140,
+123, 24,154, 67,  7,241, 99, 66, 92,157,186,182, 54, 86, 46,151, 31,228,104,239,160, 76, 38,139, 61,255,230,180, 93,254,255,202,
+113,235, 49, 98, 28,234,207, 31,194,198,127, 76,173,107,108,224,102,143,177,181, 58,237,239,187,222,249,248, 75,183,209, 99,198,
+162,184,232, 20, 94, 74,126,178,174,161,174,142,243,185,181, 53,204, 37,251,145,201,100, 36, 62, 62,158,205,106,  0,161,167,167,
+231, 41,165, 82,249,109,105,105,105,239, 33, 67,134,  4,106,181, 90,145,147,147, 19,114,114,114, 16, 29, 29, 13,149, 74,133,134,
+134,  6, 92,186,116,169,198,203,203,107,175, 82,169,252,154,166,233,122,176,204,  0,200, 36,  5, 98, 66,236, 92, 66,255, 15,218,
+ 16,128, 97, 20,192, 17,237,107, 75,238,  0, 83,120, 52,118, 20, 30,141, 29,213,244,159,253, 26,182,165,189,105,246,137, 59,207,
+ 31,208,120,186, 14, 79,127, 54,  5,239,236, 93,102,247,185, 41,159, 81, 18, 47,173, 23, 84,223,168,238,139, 99,109,147,  0,104,
+ 15,207,223,216,251, 48, 12, 99,155, 11,245, 59,242, 28,185,140,253, 59,154,252, 13,196,142, 97, 34, 32, 70,  4, 41,154, 34, 29,
+156,236, 89,155, 11,192,213,222,  7, 31,175,165,100, 50, 25, 17,  8,128,131,  5,250,177,126,102,194,159,126,220,127,  6, 39,123,
+171, 86,173,165,230,205,111,202, 73, 33,208,219, 56,186, 31,168,175,163, 65,104, 32, 49,113, 10, 98, 98, 98,172,182, 71,246,122,
+ 25, 73,125, 18,240,116,  3,202,110,  3, 46,206,  0, 77,128, 78, 18, 32, 93,  6,164,201,109, 18,  1,  7,101, 50, 89,108, 65, 98,
+220, 46,143,229,111,187,229, 47,127,163,174,209,  6,242, 55,182,151,191,100,234, 46,151,127,188,233,150,251,239,183, 56,147,191,
+161,173, 23, 95,124, 49,238,141,127,190,176,115, 65, 74,170,219,103, 31,102, 48,228,127,218,196,179,175,229, 98,219,218,208, 17,
+215,231,205, 20,249,207,155, 55,143, 48, 43,  1,182,109,219, 70, 40,138,178, 36,  4,220,212,106,117,157, 64, 32,200,243,247,247,
+239, 89, 91, 91,251,226,241,227,199,187, 15, 29, 58,148,214,106,181, 13,213,213,213,183, 78,159, 62,125,165, 79,159, 62, 37, 93,
+186,116, 41, 85, 42,149,155,181, 90,237, 45, 66,  8,107,  1,192, 36,  5, 50,136, 10,216,210,190,210, 54,236, 11, 29,110,219, 81,
+227,254,246,218, 81, 41,133, 14, 61,222,209,246,170, 42,  5,200,208,202, 16,120,216, 15,179, 63,181, 46, 76,170, 42,  5,120, 40,
+192,242, 49,247,147,252,205, 10,  0,107,107,253,185, 62,232,108,115,  7,112,177, 43,151,203, 41,115,155,237,112, 33,175,204,100,
+185, 62,204,127, 17,192, 69,227, 79,171,155,254, 46,195,134,235, 85, 56,138, 92, 13,235, 69, 38,147, 17, 38,207, 64, 74, 74,138,
+ 77, 43, 28,140,237,109, 92,212,169, 89, 20,216, 35,154,140,219,132,153,240,103,107, 84, 98,237,231, 45,237,213,213,232, 59,224,
+196,196, 68,110,247,223,183, 14,125,102, 52,134,164,189,111,249,155, 27, 26,107,107,159,182,215,187,102,236,253,244,217, 91, 27,
+ 84, 13,181,115,229,114,249, 33, 91,109,125,250,233,167,  7,100, 50, 89,236,103, 31,173,220, 80, 87, 87,103,238,220,180,184,255,
+104,209,163, 26,147,127, 94, 94, 94, 36, 33,  4,219,183,111, 55, 60,198,146,189,107,106,181,218,153, 16, 82, 75,211,180, 92,173,
+ 86,255, 26, 16, 16,224, 83, 85, 85, 69,189,254,250,235, 53,213,213,213,119,122,244,232, 81, 91, 87, 87, 87,175, 86,171,107, 52,
+ 26, 77,163, 78,167, 83,114, 57, 97,  7, 13,  3,228,183, 97,157,230,227, 79,138,126,253,  6, 83,111,190,150, 73,102, 61, 30,141,
+176,129,125,204, 30, 87, 84,120, 25,155,190,219,131,126,253,  6, 83,247,211,222,144, 33, 67,168,212, 69,114, 50,235,241,104,203,
+ 14,243,241, 82,108,250,110, 15,134, 12, 25, 98,245, 94,186,159,228,111, 82,  0, 56,218,179,111,203, 72, 65, 84, 84, 84, 62,171,
+ 16,191, 21, 56,114, 86,255,253,136,140,112,217,244,199, 17,209,  0,174,109, 98,184,172,203,222, 33,  9, 99,123, 92,201,223,158,
+ 25,255,108, 72, 27, 64, 80, 71,180,231,232,115,115,208,189, 77,  1,  0, 69, 81, 68, 32, 16,128,249, 99, 66,216, 83,166, 76, 65,
+108,108, 44,104,154,  6, 77,211, 32,132, 88,251, 61, 74,171,213,186, 18, 66,116, 52, 77, 55,106, 52,154,253, 66,161,144, 18,  8,
+  4,206,  0,156,105,154,134, 78,167, 19,106,181, 90,177, 86,171,237,174,211,233,206, 27,124,183,205, 55,  1,226,225, 24, 17,112,
+165, 84, 69,118,239,220,130,107, 21, 53,240,243,106,104,254,236,102,165, 43,  2,124, 59,163,127,255,254, 86,201,186,173,236, 13,
+ 25, 50,132,186, 89,214, 72,214,124,180,  3,197,191,223,110,101, 47,184,167, 15,  2,  3,  3, 89,145,127, 91,193, 82,142, 20, 42,
+ 60, 60,156,223, 30,147,  7, 15, 30, 15, 42, 26, 12,  8,157, 54,112,108, 68,  6,229,229,  0, 60,160,159, 52,206, 19, 63, 15, 30,
+230, 34,  0, 60,120,240,224,241,  0, 65,210, 36,  2,104,  3,226, 23,224,222, 16,135,  8, 64,247,166,247, 52, 95, 93, 60,120,240,
+  2,128,  7, 15, 30,127, 14,  8,  0,184, 25,252,207, 16,191,216,128,244,233,166,227,120,239,159,  7, 15, 94,  0,240,224,193,227,
+ 47,210,167,241,164,207,131,135,  5,245,204,131,  7, 15, 30, 60,120,240,248, 43,171,229,249,243,231, 27,110,164, 67, 12,103,216,
+203,100, 50, 98,180,209,206,181,168,168,168,230, 85,141,166, 82,177, 26,218,227,138, 63,163, 61,227,101,139,134,245,201,215, 31,
+223, 30, 29,221, 94,122,122,122,243, 49,105,105,105,148, 13,246,  0, 51,233,128,249,251,217,186, 77,254,249,229,237,113,177,199,
+ 89,  0,112, 68, 87, 54,  7, 49,187,247, 57, 74,177, 24, 39, 35, 49,181, 27,160,169, 99,218, 67, 93, 49,  4,147,148,148, 36,101,
+136,134,201,  0,102, 41, 39,248,253,196,246,237,219, 35,183,109,219,214, 76,130, 83,166, 76,145, 38, 38, 38,230,255, 25,213,174,
+169,246, 56,127, 94,191, 50, 44, 52, 52,180, 93,207, 77, 38,147,145,169,211,100,200,201,150,155,188,103,119,238, 58, 65,114,178,
+229, 22,239,229,157,187, 78, 88,236,  4,226, 98, 35,108,190,233,210,211,211, 73, 66, 66, 80,139,255,173,137,  0,107,168,173,171,
+141,220,250,211, 86,  4,134,  5, 42, 64,  1,231, 79,158,147,142,  9, 31,139,208,126,161,156,238,191, 67,135, 14,181,186,238,177,
+ 99,199, 82,224,193,131, 71,155,  9,  0, 49,219,  3, 71,143, 30,205,217,184,169,205, 98, 24,152, 34, 81,227,141, 54,216, 18,173,
+ 45, 27,227,176, 17, 20,140,221,212,212, 84,100,100,100, 40,204,237, 45,206, 28,103,105,173,166,241, 57,246,232,211, 11,  0,112,
+ 75,165,130, 86,217,168, 47,172,170,  1,160,223,251,128, 75,110,  4, 67,242,  7,244,185,197,185,172,181,151,201,100, 68, 64,233,
+179,235, 49,175,128,136, 87,212,158,  0,  0, 14,255, 73, 68, 65, 84,229,247,159,175,189,255,130,204,184, 61, 24,226,183,181, 61,
+ 28, 41, 42, 25,242,143,139,141, 80,  1, 50, 73, 78,182,220,230,223, 96,  4,132,105,  1, 32,183,235, 60,213,234, 84,228,230, 38,
+ 35, 38, 38, 19,  9,  9, 25,205, 17,  1, 91,132,192,193,162,131,228,161,161,189,240,161,124, 21,188, 92,189, 64,107,117, 80,145,
+ 70,197,238, 95,127,138,217,187,239,103, 50, 54,112,156, 84, 34,145, 88, 21,  2,135, 14, 29, 34, 77,145,133, 86, 30, 17, 47,  2,
+120,252,149,113,234,212,169, 22,255,155,234,211,236, 17,  0,156,230, 15,152,218,197,206, 17, 32, 64,164,221, 54,  8,123, 13,192,
+198,115,151,201,100, 36, 53, 53, 21, 43, 86,172,  0,128,230, 87, 83,199, 89,219, 33,172, 21, 60, 59,227, 76,233,119,112, 65, 79,
+232,240, 11, 42,254,115,  2,167, 75,238, 96,198,138,117,237,118,163,157, 57, 91,136,193,131,  6,130, 38, 64, 97,161,254, 61,112,
+239,189, 97, 57,205,178,170, 13,115,176, 91, 66,102,102, 38,197,182, 61,230,206,157, 11,  0,205,175, 38,201,159,162,  0, 11,247,
+131, 76, 38, 35,143, 60,178, 11, 50, 89,172, 67, 69, 64, 92,108, 68, 67,114,114,178, 43,144,137,156,108,110,196,110,232,225,219,
+ 75,242,230,188,127,  0,152, 57,115, 51,114,115,245,175,201,201, 37, 96, 34,  2, 92,162,  1,132,144, 72,197,133,189,138, 23,255,
+ 49, 31,195,187, 14,133,139,135,  7,136, 90, 11,154,232, 32, 20,137, 17, 28, 21,156,251,219,176, 11, 88,145,153,161, 24,229, 51,
+ 90,234,234,234,106, 85,  4,220,190,125,187,197,255, 83,198,119,194,168,133,191,224,241, 12, 85,139,134,156, 52,105,146,205,237,
+149,157,157, 77,166, 77,155,230,176,246,118,180,189, 54, 38,146, 72,123,211,250,158, 58,117, 42,178,137,132,108,181, 51,248,149,
+ 87, 94, 41,175,175,175, 15,  0, 48, 25,250, 77, 56, 67,  1,156,130,126, 83, 40,  0,216, 40,151,203,127,227,169,191, 53,249, 51,
+101,198, 34,160,133,  0, 40, 45, 45, 37,165,165,165,  0,128,192,192, 64, 24,110, 54,  3,160,197,255,166, 62, 55,135,138,138, 10,
+ 69, 86, 86, 22,235, 72,128,241, 94,247,150, 72,152,106, 74,133,105, 76,162, 92, 67,236,153,153,153, 86,143,201,203,203, 99, 69,
+254, 73, 73, 73,102, 73,127,233,210,165,200,200,200,128,161, 64, 96,131, 30,125,122,225, 70,101, 53,126,156, 55, 19, 93,168,113,
+ 40,249, 98, 17,  2,167,  7, 98, 79, 59,147, 63,128,102,194,  7,128,129,  3,  7,182, 40,103, 34,  3,134,229,142,246,236, 45, 17,
+ 49,211, 30,230, 72,127,253,250,245,200,200,200, 64,236,184,161,216,245,203, 73,192,189, 19, 80, 83,119,223,235,112,231,174, 19,
+174, 64, 38,118,238, 58,225, 16,123,211,106,150, 89,124, 54,179, 59,191,199,234,  1, 49, 12,253, 39, 39,231, 34, 33, 33,168,249,
+149, 65, 66, 66, 16,107, 17,240,197,255,190,192,251,159,190,139,241,125, 35,161,107,108,132, 86,167,  5, 37,162,  0,  8, 65, 64,
+227,214, 31,101,  8,237,218, 31,203,230, 45,195,187, 43,223, 85, 60, 50,208,122, 52,203,184,179,155,226,191,222, 36,225,239,221,
+187,151,216, 34,  2,178,179,179,201,206,215,119, 33,238, 29, 56,132,180,179,179,179,201,202,149, 43,177,100,201,146, 14, 45,  2,
+ 78,157, 58, 21, 89, 93, 93,173, 40, 43, 43, 67,120,120,184, 93,231, 89, 93, 93,173,184,215,101,219,244,156,151,  2,152, 11,224,
+ 36,128,175,  1, 68,  3,120, 20,192,223, 13,  4,192,237, 63, 41,159, 83,176,176, 13,184, 69, 71, 42, 85,207, 49,153, 25, 75, 77,
+126,222, 66,  0,  4,  6,  6, 82,129,129,129,205,100,111, 24, 74,206,202,202,106,241,191,241,231,151, 46, 93, 50,123,130,140,168,
+ 72, 73, 73, 81,164,166,166,194,120,163, 28,227,205,115,178,178,178,204,134, 96, 77,117,246,198,101,237,185, 81, 17,  0,108,218,
+180,201, 44,241,  3,104, 65,254, 75,151, 46,101,101,243,247,210,107,168,223,242,  6,220,158,253, 24, 61,250,244, 66,183, 46, 46,
+ 40,221, 82,170, 39,127,207,206,250, 33,  0, 39, 33,231,115, 77, 72, 72,144, 26, 14,  3, 36, 36, 36,112,142,210,208,  4,  8,232,
+  4,252,251, 73,224,249,245, 64, 87, 87,224,124,149,233,242,162, 74,142,119,190, 25, 33,199, 37,106,243,246,219,111,155, 37,126,
+  0, 88, 57, 55, 30,107,118, 31,129, 95, 96,119,220,188,122,203,170,247, 15,  0,108,162,  0, 92,194,248,122, 15, 95,102,210,211,
+103,198,246,185,222,215, 43,255,107,190,142, 66,230,193,134,123, 37,168,197,171, 58, 33, 24,226,109,197,172,191,223,160,108,192,
+184,217, 99, 21,163,187,143, 66, 99,125, 61, 68,206,206, 16,137,238,117, 65,165,197,197,216,154,147,115,227,217,103,230,246,232,
+237, 28,128,161, 19,195,163,126,205,253, 53,114,212,240, 81,156,188,198,244,157,115,177,111,223, 62, 60,246, 88,203,242, 73,147,
+ 38, 81, 92, 69,  0, 67,254,232,253, 33,118,190,254,178,221, 34, 32, 59, 59,155,124,244,209, 71,  8,  9,  9,193,154, 53,107,176,
+ 96,193,130, 14, 39,  2, 12,137,223, 81,246, 24, 91,118, 68, 19,164,  0, 38,  2, 88, 79,  8,169,163, 40,202, 15,192,  5,  0, 87,
+229,114,185, 22,127,110, 16,142,245,221,130,252,153,247,153, 25, 75, 91, 69,  1,238, 75, 30,128,172,172, 44,102,236, 21,165,165,
+165,240,245,245,109, 37, 16,152,178,138,138, 10, 86,121,238,173, 77,  6,228,210, 97,206,154, 53,171,237,164,155,  1,129,153,242,
+250, 51, 50, 50, 32,151,203, 41,107,179, 56,149,184,134,186,233,163, 64,220, 23,  1, 81,175,163, 14,255,  3,254,163,247, 22, 73,
+214, 34, 56,253,109, 13,180, 90,238,137,206,226,227,227,243, 89,108,187,106, 57,194,243, 21,240,214, 90,160, 87, 79,224,214,118,
+ 49, 54,124,169,198,220,239,204,151,115,186,243,137, 99, 51, 85, 27, 78,246, 43,207, 94,  1,247, 48,  9,220,250,254, 19,155, 86,
+ 60,143, 33,  3,253,208, 47,254, 93, 86,237,193,230,254,100, 59, 84,192,220,187,134,228, 47,151,203, 41,102,226,159, 77, 68,211,
+249, 61,202, 22,146, 55,  5,117, 66,176,201,242, 92,163, 72,128, 53,148, 87,148, 99,114,210,100,184,119,246,130,142,210,226,192,
+190,253,168,173,171, 67, 66, 98, 34,254,168,168,192, 15,155,127,196,115,207,204,237,225, 44,113,134,128, 56, 33, 38, 34, 38,239,
+130, 98,141, 77, 94, 99,101,101,165,221,215,109, 72,254,  0,236, 22,  1,217,217,217,100,249,242,229,  8, 14,214,215,103, 80, 80,
+ 16, 58, 82, 36,192,209,196,111,194,251,103,222,219,114,173,  3,154,136,208,137,162, 40, 87,  0, 97,  0,206,  1,232, 33,147,201,
+106,  0, 84,201,229,114, 62,173, 61, 71,220,183, 68, 64,190,190,190,210,164,164,164, 86, 67,  1, 71,142, 28, 81, 52,109,246,194,
+121,142,128,185,201,128,150, 60, 71,115,  2,165, 45,192,120,247,230,194,253,108,189,127,  0,216,253,234,114, 36,188,255,  1,180,
+ 81,227, 32,  2,224,118,184, 24,123, 74,238,  0,  0,180, 81, 11,160, 57,235,  3,170,235,223, 57,147, 20,219, 40,139, 37,220,153,
+246, 63, 44,120,230, 58, 46,206, 91,130,250,159,213,240,243,177, 92,238,136,  8,128, 45,226, 96,253,250,245,122, 53,156, 48,  1,
+ 71,202, 42,224, 62,196, 29, 55,114, 75,  0,137, 51,102, 46,248, 27,188,123,198,183,219,131,104,110,214,191,163,162, 90,150, 86,
+  8, 88, 91, 29,144,155,156,139,152,204, 24,204,220, 12, 36,231,234,223,231, 38,231,114,142,  2,212,169,106,225,227,210,  5, 90,
+ 85,  3,136,128, 96,196,200,145,216,178,101,139,234,163, 15, 62,144,208,132, 96,206,147,115,224,221,197, 27, 13,117,117,208,234,
+180,112,119,234, 12,141, 64, 99,211,245, 86, 85, 85,181, 88, 29,192,117, 66, 96, 43,242,103, 96,163,  8,200,206,206, 38,169,169,
+169, 24, 57,114,100,139,242,129,  3,  7, 34, 61, 61, 29,105,105,105,237, 38,  2,218,138,248,141,189,127,  0, 40, 43, 43,179, 53,
+ 10,240, 43,244,227,253, 53,208,135,254, 39,  3,184,  4, 96, 48,128, 28,  0,235,208,180, 83,167,165,238,  4, 54,134,210,255, 18,
+  2,192,152, 16,152, 61,231,217,124,110,105,214, 52,  3,102,120,129,153, 16,200,204, 13, 96,162,  3,129,129,129, 10,102,184,160,
+189, 58, 94, 71,194,218, 88, 63,227,253,179,177, 53, 99,237,102,144,196, 62,184, 53, 38,  2, 93, 48, 14, 46, 51,215, 64, 91,254,
+  7,224,217, 25,162, 59,255,195,246,143, 10,  0,161,144,243,181,219,178, 10,194, 24,167, 95,249, 63, 12, 15,  7,  2, 23, 20, 34,
+204,237, 25, 92,120, 40,  9,248,247, 18,179,229,237, 21,  1,200,200,200,192,248, 17,253, 16, 53, 46,  4,  9,131,150, 96,245, 71,
+159,227, 92,193, 13,204,155, 52, 28, 55,115,118,162,186,178,198, 33,247,131,169,161,  2,107,207,135, 37,111,223, 81,247,168, 57,
+251,150, 38, 14,166,165,165, 81,233,233,233,100,230,230,150,130,  0,  0, 98, 50, 99, 32,222, 86,140,109,219, 74,154, 87,  2, 48,
+ 19,  6,189,189,189, 77,246,191, 52, 77, 67, 71,  3,132,214,194,217, 69,130, 39,159,122, 74,242,214,155,111,162, 91,183,110,116,
+ 15, 63, 63,129,170,190, 14, 58,  2, 16, 90,  7,154,182, 30,209, 26, 59,118, 44,245,195, 15, 63,144, 59,119,238,160,166,166,166,
+133,112, 52, 92, 29,192,101, 85, 64,118,118, 54, 89,253,124, 17, 32,  9,  6,110,126,218,250,  0, 73, 48, 86, 63, 95,132,148,255,
+176, 19,  1,217,217,217,100,234,212,169,210,129,  3,  7, 42,238,220,185,211,234,243,128,128,  0, 76,157, 58, 85,250, 32, 77, 12,
+180,197,251,183, 39, 10, 32,151,203,243, 13,158,175,238,  0, 78,  3,152, 46,151,203,185,108,101,202,147,191, 37,  1, 96,148,232,
+199, 90, 34,160, 22,159, 91, 10,153, 38, 37, 37,153,140,  2, 48,100,239,235,235, 43, 77, 77, 77, 85, 48, 99,178, 73, 73, 73, 22,
+151,  1, 90,242, 14,185, 78,254,107,171,101,128,140,119,111,105, 50, 32, 23,148,252, 43, 25, 78, 51,215, 64, 89,118, 17,162,195,
+107,160,217,188,  0, 84,220, 42,108,253,251, 99,184,186,245, 50, 18, 86,126, 13,136,218, 39,179,243,146, 44, 32,119,229, 22,132,
+ 93,141,  1,110,215, 99,113,244, 18,139,229,142,136,  0,216,234,253,231,108, 89, 14, 97,143,  1,112, 67,  8,174,237,203, 68, 45,
+ 69,112,244,226,117, 68, 21,222, 96,217,238,215,154,255,159, 53, 75,222,130,236,  1,224,231,159, 99, 77, 30,103,233,249,176, 22,
+234,119,196,178, 67, 71,172, 16, 72,206,189, 71,252,  0, 90,121,254,204,132,193,109,219, 74, 76,126,223,221,197, 29,101,213,101,
+ 24,217,123, 20,148,141, 42, 64,169,130, 86,173,193,178,212, 84, 80,  2,  8, 26,234,235, 64,211, 58,104,117,  4,206, 34, 39,252,
+ 81,247,  7,156,116,214, 87, 27, 63,246,216, 99,205,117,115,232,208, 33,194,244, 55,134,171,  3,202,203,203, 89, 95,231,180,105,
+211,168,148,255,128,172,126,190,  8,161,125, 90,255,254,249,203,106,164,252, 39, 12,108,201,122,218,180,105, 84,118,118, 54, 25,
+ 57,114, 36,  2,  2,  2, 90,125, 94, 88, 88,136,156,156, 28, 69,123,145,127,147, 55, 78,181,229,216,191, 33,236,136,  2, 48,152,
+ 12,253,228,239, 70,158,194, 29, 40,  0,218, 10,140,231, 15,  0,163, 71,143,150,102,101,101, 41,152,208,191, 25,113, 32,189,116,
+233,146,130, 43,  9,219,218, 73, 58,122, 25,160,161,247,111,138,248, 25,161,195,229,124, 79,151,220,129,230,236, 91,184,133, 95,
+224, 23,183, 10,168,174, 65, 73,230, 34,  4,205,255, 16, 55,215, 45,  2,156, 68,128,160,125, 50, 59, 95,171,  7, 66,125,167,179,
+ 46,111,143,  8, 64, 70, 70, 70,221,236,168, 81,229, 30,180, 87,175,  6, 56, 73, 54,127,184,  0,159,109, 63,133,197,143, 62,140,
+185, 31,252, 23,143,189,247, 77,187, 76, 30,101,  4,104, 83, 30,  0,202, 94,113,106, 79,168,223, 82, 20, 32,185,201,179, 55, 38,
+127, 67,239,223, 26,252,125,253,177,251, 64, 46,198,246, 26, 11,215, 78,110,160,105,  2,  1,209,130,166, 40, 16, 66,160, 35,128,
+150, 38,208,106,181, 80, 86,215, 99,199,177, 29, 16,235,196,156, 39,165, 26,175, 10, 72, 91, 48, 14, 83,252, 75,145,121,140,189,
+ 13,115, 34,128, 43,249, 27,218, 75, 75, 75, 35, 43, 87,174, 68,247,238,221,239,  9,251,146, 18,100,100,100,160, 35,120,254,142,
+ 22,  2,166,188,127,123,162,  0, 77,207, 68, 36,128,135,  0,188,246, 23,152,252,  7,  0, 66,  0,186,  7, 90,  0, 24,207,250, 79,
+ 74, 74,106, 30,119, 55, 20,  7,134,239,237,241,224,109,233,200, 29,181, 12,208,156,247,111, 43,241, 51,152,177, 98, 29,126,  4,
+240,232,251, 83, 64,178, 22,129,154,181, 26,167, 75,238,128,242,246, 66,241,239, 53,122,239, 95, 40,108,151, 59,212,220,122,127,
+123,242,  0,176, 17, 92,108,197,193,250,245,235,213,  0,106,159,143, 28, 92,243,207, 85, 31,171, 95, 93,150,170,234,218,217,247,
+ 78,209,185,107,221,230,158,251,175, 91,123,175, 26, 49, 71,206,134, 67, 52,220, 87, 20,152,250, 13,251, 34,  0,166,200,159,241,
+252,  1, 88,157, 16, 40,145, 72,168,115, 91,207, 39, 42,198,229,231, 36, 13,122, 12, 53,170, 26, 80,  2, 64,159, 82,132,134, 78,
+ 71, 64,107,181,232,228,236,142, 67,213, 39,113,233,112, 49,162, 35,162,243,237,174,220,146, 23,  0,112, 95,  6,216, 66,  4,116,
+191,134,243,229,  1, 54,145,191,161,189, 37, 75,150,144, 53,107,214,192,211,211, 19,119,238,220,193,242,229,203,209,209,194,254,
+142, 16,  2,230,188,127, 91,162,  0, 50,153,172, 27,  0,191,166, 27,101, 40,128, 20,  0, 37,127, 17, 39, 93,215,150,198,239, 75,
+ 30,  0,115, 17,129,213,171, 87, 75,141,133, 66, 82, 82,146,130,171, 61, 67, 34,232,  8, 41,118, 13,189,127,227,229,127,165,165,
+165, 45,234,141, 75,214, 62, 70,  4, 76,127,255, 43,144,205,128,207, 92, 57,242,255,249, 24, 30,206,216,  8, 56, 57,161,147, 68,
+220, 46,215,107,184,198,223,212,123, 27,243,  0,104,  1,  8,154,218, 86, 96,103,123,220,154, 29, 53,170,236,159,153,219,250, 44,
+123,110,114,103,127,191, 72, 53,128, 51, 73, 73, 73, 30,  0,220,108,109,143,123, 36, 29, 75, 30,121,100,151, 65,248,159,219,247,
+ 45,121,240,134,233,129,217, 10,137,182, 72,  6,100, 14,198,164,207, 68,  4,204, 13,121, 60, 61,235,233,173,219,254,187, 13,186,
+217,218, 51, 19,123, 77, 28,220,197,189, 11, 84, 26, 21,  8, 33, 16,139,196,168, 82, 54,224,200,239, 63, 99,253,183, 27, 32, 29,
+ 32,117, 72,226,176,244,157,115,177, 97,195,  6, 44, 90,196, 61,  7,192, 61, 17,  0,187,200,223,208,222,130,  5, 11,152, 60,  0,
+232,200, 99,254,134, 66,192,150,239,218,155, 59,192,240, 49,128,126,189,191, 10,192, 43,  0,142,201,229,114, 29,120,152,171,123,
+156, 58,117, 10,153, 25, 75, 91,229,  1,176,152,  8,168,173,242,  0,152,138,  8,152, 35,122, 91,162,  0,246,162,173,150,  1, 50,
+ 98, 68, 46,151, 35, 47, 47,143, 46, 45, 45, 53, 36, 50,105, 84, 84, 20,103,239,102,198,138,117,128, 65,226,159,137,203,214, 54,
+191,175,111,135,155,173,173,188,103,138,162, 62,  2,112, 23,250,229, 63, 79,218,105,238,230,243,145,131, 27,163,243,126,237, 60,
+231,205,175, 33,151,203,197,121,121,121,221,209, 50,157,181, 77,237,209,214,145,  0,107,249,253,173,161, 45,134,  4,204,145,191,
+ 58, 33, 24,216,102,221, 49,147, 14,158, 68,237,251,225,  0, 57, 28,112,  4,227, 70,141, 67, 15,247, 30,  0, 77,240,135,234, 14,
+ 14,157, 56,132,155, 69, 55, 49, 41,116,146,212,217,217,185,221,219,195, 80,  4, 56,138,172,153, 72,192,131, 50,225,207,222, 44,
+128, 14,232, 99, 50,  1,100,130,  7,103,152, 75,  0,100, 82,  0,180, 21, 82, 82, 82, 76,146,189,225, 78,108, 70, 80,176, 89, 85,
+224, 40,175,191, 45,150,  1, 54,205,240,215,230,229,229,137,154,134, 14, 24,242,159, 20, 21, 21,197, 41,202,209,180,153,146,194,
+209,231,104,110,140,217,209,185,238, 57,194, 25,128, 72, 46,151,191,110, 16,  2,123,202, 94,155,209,175,125, 81, 32,151,203, 39,
+228,229,229, 33, 47, 47, 79,  5, 64,210,244,103, 55,241, 51, 81,  0, 91,235,204, 26,201, 79,157, 38,107,113, 28, 87,226,118,196,
+144, 64, 90, 90, 26,149,158,156, 78,252, 23,248, 75,209,219,244, 49,101,201,185, 10,182,243,  1, 70,134,141,164, 26, 26, 26, 34,
+215,189,191, 14,  1,193, 15, 41,  0,224, 66,225,111,210,248,232,  4,132,134,135,218,220, 30, 99,199,142,165, 54,111,222,220,106,
+ 85,128, 70,163,177,235,  6,114, 52, 89,255,217,102,251,119,  0,240, 75,252, 76, 68,  1,140,203, 88, 11,  0,107,158, 56, 91, 79,
+221,214, 78,145,109, 34, 22,123,137,202,209, 68,199,216,203,203,203, 35,121,121,121, 34,195,250, 10, 12, 12,180,233,183,154,  8,
+202,225, 29, 70, 71, 24,251, 54,  1,119,  0,117,250,132,252, 20,  5,192,  5,214,215,247,178,105,143, 43,121,121,121,204,186,178,
+154,192,192,192,174,129,129,129,206, 29,161, 46,237,245,196,173,217,118,212,144,128, 85,114, 79,227,118,143,186,186,186,230,207,
+154, 58,155,233,188, 49, 58,108,180, 67,206,115,230,204,153, 60,185,254,249,201,222,144,195, 52, 14, 38,127,  9,244,195, 13, 15,
+188,  8,176, 90,145,225,225,225,188,106,226,193,131,  7, 15, 30, 60,254, 98, 16,240, 85,192,131,  7, 15, 30, 60,120,240,  2,128,
+  7, 15, 30, 60,120,240,224,241, 23,192,255,  3,211,238,250, 72,118, 88, 93,170,  0,  0,  0,  0, 73, 69, 78, 68,174, 66, 96,130,
+  0};
 
diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c
index 6250b69345b..529a795a101 100644
--- a/source/blender/src/buttons_editing.c
+++ b/source/blender/src/buttons_editing.c
@@ -513,7 +513,6 @@ void do_common_editbuts(unsigned short event) // old name, is a mix of object an
 				} else {
 					editmesh_deselect_by_material(G.obedit->actcol-1);
 				}
-				allqueue(REDRAWVIEW3D, 0);
 			}
 			else if ELEM(G.obedit->type, OB_CURVE, OB_SURF) {
 				nu= editNurb.first;
@@ -553,8 +552,9 @@ void do_common_editbuts(unsigned short event) // old name, is a mix of object an
 					nu= nu->next;
 				}
 				BIF_undo_push("Select material index");
-				allqueue(REDRAWVIEW3D, 0);
 			}
+			allqueue(REDRAWIMAGE, 0);
+			allqueue(REDRAWVIEW3D, 0);
 		}
 		countall();
 		break;
@@ -1767,7 +1767,7 @@ static void draw_modifier(uiBlock *block, Object *ob, ModifierData *md, int *xco
 		} else if (md->type==eModifierType_Build) {
 			height = 86;
 		} else if (md->type==eModifierType_Mirror) {
-			height = 86;
+			height = 105;
 		} else if (md->type==eModifierType_Bevel) {
 			BevelModifierData *bmd = (BevelModifierData*) md;
 			height = 105; /* height = 124; */
@@ -1792,7 +1792,7 @@ static void draw_modifier(uiBlock *block, Object *ob, ModifierData *md, int *xco
 			height = 143;
 		} else if (md->type==eModifierType_Wave) {
 			WaveModifierData *wmd = (WaveModifierData *)md;
-			height = 294;
+			height = 315;
 			if(wmd->texmapping == MOD_WAV_MAP_OBJECT ||
 			   wmd->texmapping == MOD_WAV_MAP_UV)
 				height += 19;
@@ -1899,6 +1899,7 @@ static void draw_modifier(uiBlock *block, Object *ob, ModifierData *md, int *xco
 			uiDefButBitS(block, TOG, MOD_MIR_AXIS_Y, B_MODIFIER_RECALC, "Y",	lx+20,cy,20,19,    &mmd->flag, 0, 0, 0, 0, "Enable Y axis mirror");
 			uiDefButBitS(block, TOG, MOD_MIR_AXIS_Z, B_MODIFIER_RECALC, "Z",	lx+40,cy,20,19,    &mmd->flag, 0, 0, 0, 0, "Enable Z axis mirror");
 			uiDefButBitS(block, TOG, MOD_MIR_CLIPPING, B_MODIFIER_RECALC, "Do Clipping",	lx+60, cy, buttonWidth-60,19, &mmd->flag, 1, 2, 0, 0, "Prevents during Transform vertices to go through Mirror");
+			uiDefButBitS(block, TOG, MOD_MIR_VGROUP, B_MODIFIER_RECALC, "Mirror Vgroups",	lx, (cy-=19), buttonWidth,19, &mmd->flag, 1, 2, 0, 0, "Mirror vertex groups (e.g. .R->.L)");
 			uiDefButBitS(block, TOG, MOD_MIR_MIRROR_U, B_MODIFIER_RECALC,
 			             "Mirror U",
 			             lx, (cy-=19), buttonWidth/2, 19,
@@ -2153,6 +2154,8 @@ static void draw_modifier(uiBlock *block, Object *ob, ModifierData *md, int *xco
 				uiDefButF(block, NUM, B_MODIFIER_RECALC, "Time end:",	lx,(cy-=19),buttonWidth,19, &wmd->timeoffs, -MAXFRAMEF, MAXFRAMEF, 100, 0, "Specify ending frame of the wave");
 			uiDefButF(block, NUM, B_MODIFIER_RECALC, "Lifetime:",	lx,(cy-=19),buttonWidth,19, &wmd->lifetime,  -MAXFRAMEF, MAXFRAMEF, 100, 0, "Specify the lifespan of the wave");
 			uiDefButF(block, NUM, B_MODIFIER_RECALC, "Damptime:",	lx,(cy-=19),buttonWidth,19, &wmd->damp,  -MAXFRAMEF, MAXFRAMEF, 100, 0, "Specify the dampingtime of the wave");
+			uiDefButF(block, NUM, B_MODIFIER_RECALC, "Falloff:",	lx,(cy-=19),buttonWidth,19, &wmd->falloff,  0, 100, 100, 0, "Specify the falloff radius of the waves");
+
 			cy -= 9;
 			uiBlockBeginAlign(block);
 			uiDefButF(block, NUM, B_MODIFIER_RECALC, "Sta x:",		lx,(cy-=19),113,19, &wmd->startx, -100.0, 100.0, 100, 0, "Starting position for the X axis");
@@ -2189,7 +2192,7 @@ static void draw_modifier(uiBlock *block, Object *ob, ModifierData *md, int *xco
 				               &wmd->map_object,
 				               "Object to get texture coordinates from");
 			}
-            cy -= 9;
+			cy -= 9;
 			uiBlockBeginAlign(block);
 			uiDefButF(block, NUMSLI, B_MODIFIER_RECALC, "Speed:",	lx,(cy-=19),220,19, &wmd->speed, -2.0, 2.0, 0, 0, "Specify the wave speed");
 			uiDefButF(block, NUMSLI, B_MODIFIER_RECALC, "Height:",	lx,(cy-=19),220,19, &wmd->height, -2.0, 2.0, 0, 0, "Specify the amplitude of the wave");
@@ -2402,7 +2405,7 @@ static void draw_modifier(uiBlock *block, Object *ob, ModifierData *md, int *xco
 				but= uiDefBut(block, BUT, B_MODIFIER_RECALC, "Bind", lx,(cy-=24), buttonWidth,19, 0, 0, 0, 0, 0, "Bind mesh to cage");
 				uiButSetFunc(but,modifiers_bindMeshDeform,ob,md);
 				uiDefButS(block, NUM, B_NOP, "Precision:", lx,(cy-19), buttonWidth/2 + 20,19, &mmd->gridsize, 2, 10, 0.5, 0, "The grid size for binding");
-				uiDefButBitS(block, TOG, MOD_MDEF_DYNAMIC_BIND, B_MODIFIER_RECALC, "Dynamic", lx+(buttonWidth+1)/2 + 20, (cy-=19), buttonWidth/2 - 20,19, &mmd->flag, 0.0, 31.0, 0, 0, "Invert vertex group influence");
+				uiDefButBitS(block, TOG, MOD_MDEF_DYNAMIC_BIND, B_MODIFIER_RECALC, "Dynamic", lx+(buttonWidth+1)/2 + 20, (cy-=19), buttonWidth/2 - 20,19, &mmd->flag, 0.0, 31.0, 0, 0, "Recompute binding dynamically on top of other deformers like Shape Keys (slower and more memory consuming!)");
 			}
 			uiBlockEndAlign(block);
 		} else if (md->type==eModifierType_ParticleSystem) {
@@ -5150,32 +5153,6 @@ static void verify_posegroup_groupname(void *arg1, void *arg2)
 	BLI_uniquename(&pose->agroups, grp, "Group", offsetof(bActionGroup, name), 32);
 }
 
-static char *build_colorsets_menustr ()
-{
-	DynStr *pupds= BLI_dynstr_new();
-	char *str;
-	char buf[48];
-	int i;
-	
-	/* add title first (and the "default" entry) */
-	BLI_dynstr_append(pupds, "Bone Color Set%t|Default Colors%x0|");
-	
-	/* loop through set indices, adding them */
-	for (i=1; i<21; i++) {
-		sprintf(buf, "%d - Theme Color Set%%x%d|", i, i);
-		BLI_dynstr_append(pupds, buf);
-	}
-	
-	/* add the 'custom' entry */
-	BLI_dynstr_append(pupds, "Custom Set %x-1");
-	
-	/* convert to normal MEM_malloc'd string */
-	str= BLI_dynstr_get_cstring(pupds);
-	BLI_dynstr_free(pupds);
-	
-	return str;
-}
-
 static void editing_panel_links(Object *ob)
 {
 	uiBlock *block;
@@ -5335,32 +5312,14 @@ static void editing_panel_links(Object *ob)
 			/* color set for 'active' group */
 			if (pose->active_group && grp) {
 				uiBlockBeginAlign(block);
-					menustr= build_colorsets_menustr();
+					menustr= BIF_ThemeColorSetsPup(1);
 					uiDefButI(block, MENU,B_POSEGRP_RECALC, menustr, xco,85,140,19, &grp->customCol, -1, 20, 0.0, 0.0, "Index of set of Custom Colors to shade Group's bones with. 0 = Use Default Color Scheme, -1 = Use Custom Color Scheme");						
 					MEM_freeN(menustr);
 					
 					/* show color-selection/preview */
 					if (grp->customCol) {
-						if (grp->customCol > 0) {
-							/* copy theme colors on-to group's custom color in case user tries to edit color */
-							bTheme *btheme= U.themes.first;
-							ThemeWireColor *col_set= &btheme->tarm[(grp->customCol - 1)];
-							
-							memcpy(&grp->cs, col_set, sizeof(ThemeWireColor));
-						}
-						else {
-							/* init custom colors with a generic multi-color rgb set, if not initialised already */
-							if (grp->cs.solid[0] == 0) {
-								/* define for setting colors in theme below */
-								#define SETCOL(col, r, g, b, a)  col[0]=r; col[1]=g; col[2]= b; col[3]= a;
-								
-								SETCOL(grp->cs.solid, 0xff, 0x00, 0x00, 255);
-								SETCOL(grp->cs.select, 0x81, 0xe6, 0x14, 255);
-								SETCOL(grp->cs.active, 0x18, 0xb6, 0xe0, 255);
-								
-								#undef SETCOL
-							}
-						}
+						/* do color copying/init (to stay up to date) */
+						actionbone_group_copycolors(grp, 1);
 						
 						/* color changing */
 						uiDefButC(block, COL, B_POSEGRP_MCUSTOM, "",		xco, 65, 30, 19, grp->cs.solid, 0, 0, 0, 0, "Color to use for surface of bones");
@@ -6216,7 +6175,7 @@ static void editing_panel_mesh_texface(void)
 		uiDefButBitS(block, TOG, TF_TILES, B_REDR_3D_IMA, "Tiles",	660,160,60,19, &tf->mode, 0, 0, 0, 0, "Use tilemode for face");
 		uiDefButBitS(block, TOG, TF_LIGHT, REDRAWVIEW3D, "Light",	720,160,60,19, &tf->mode, 0, 0, 0, 0, "Use light for face");
 		uiDefButBitS(block, TOG, TF_INVISIBLE, REDRAWVIEW3D, "Invisible",780,160,60,19, &tf->mode, 0, 0, 0, 0, "Make face invisible");
-		uiDefButBitS(block, TOG, TF_DYNAMIC, REDRAWVIEW3D, "Collision", 840,160,60,19, &tf->mode, 0, 0, 0, 0, "Use face for collision detection");
+		uiDefButBitS(block, TOG, TF_DYNAMIC, REDRAWVIEW3D, "Collision", 840,160,60,19, &tf->mode, 0, 0, 0, 0, "Use face for collision and ray-sensor detection");
 
 		uiBlockBeginAlign(block);
 		uiDefButBitS(block, TOG, TF_SHAREDCOL, REDRAWVIEW3D, "Shared",	600,135,60,19, &tf->mode, 0, 0, 0, 0, "Blend vertex colors across face when vertices are shared");
@@ -6235,6 +6194,7 @@ static void editing_panel_mesh_texface(void)
 		uiDefButC(block, ROW, REDRAWVIEW3D, "Opaque",	600,80,60,19, &tf->transp, 2.0, (float)TF_SOLID,0, 0, "Render color of textured face as color");
 		uiDefButC(block, ROW, REDRAWVIEW3D, "Add",		660,80,60,19, &tf->transp, 2.0, (float)TF_ADD,	0, 0, "Render face transparent and add color of face");
 		uiDefButC(block, ROW, REDRAWVIEW3D, "Alpha",	720,80,60,19, &tf->transp, 2.0, (float)TF_ALPHA,0, 0, "Render polygon transparent, depending on alpha channel of the texture");
+		uiDefButC(block, ROW, REDRAWVIEW3D, "Clip Alpha",	780,80,80,19, &tf->transp, 2.0, (float)TF_CLIP,0, 0, "Use the images alpha values clipped with no blending (binary alpha)");
 	}
 	else
 		uiDefBut(block,LABEL,B_NOP, "(No Active Face)", 10,200,150,19,0,0,0,0,0,"");
diff --git a/source/blender/src/buttons_logic.c b/source/blender/src/buttons_logic.c
index 27caedf0cdd..441d00ffc30 100644
--- a/source/blender/src/buttons_logic.c
+++ b/source/blender/src/buttons_logic.c
@@ -88,6 +88,7 @@
 #include "mydevice.h"
 #include "nla.h"	/* For __NLA : Important, do not remove */
 #include "butspace.h" // own module
+#include "interface.h"
 
 /* internals */
 void buttons_enji(uiBlock *, Object *);
@@ -228,7 +229,7 @@ static void sca_move_sensor(void *datav, void *data2_unused)
 	bSensor *sens_to_delete= datav;
 	int val;
 	Base *base;
-	bSensor *sens;
+	bSensor *sens, *tmp;
 	
 	val= pupmenu("Move up%x1|Move down %x2");
 	
@@ -245,12 +246,24 @@ static void sca_move_sensor(void *datav, void *data2_unused)
 			
 			if(sens) {
 				if( val==1 && sens->prev) {
-					BLI_remlink(&base->object->sensors, sens);
-					BLI_insertlinkbefore(&base->object->sensors, sens->prev, sens);
+					for (tmp=sens->prev; tmp; tmp=tmp->prev) {
+						if (tmp->flag & SENS_VISIBLE)
+							break;
+					}
+					if (tmp) {
+						BLI_remlink(&base->object->sensors, sens);
+						BLI_insertlinkbefore(&base->object->sensors, tmp, sens);
+					}
 				}
 				else if( val==2 && sens->next) {
-					BLI_remlink(&base->object->sensors, sens);
-					BLI_insertlink(&base->object->sensors, sens->next, sens);
+					for (tmp=sens->next; tmp; tmp=tmp->next) {
+						if (tmp->flag & SENS_VISIBLE)
+							break;
+					}
+					if (tmp) {
+						BLI_remlink(&base->object->sensors, sens);
+						BLI_insertlink(&base->object->sensors, tmp, sens);
+					}
 				}
 				BIF_undo_push("Move sensor");
 				allqueue(REDRAWBUTSLOGIC, 0);
@@ -267,7 +280,7 @@ static void sca_move_controller(void *datav, void *data2_unused)
 	bController *controller_to_del= datav;
 	int val;
 	Base *base;
-	bController *cont;
+	bController *cont, *tmp;
 	
 	val= pupmenu("Move up%x1|Move down %x2");
 	
@@ -284,12 +297,27 @@ static void sca_move_controller(void *datav, void *data2_unused)
 			
 			if(cont) {
 				if( val==1 && cont->prev) {
-					BLI_remlink(&base->object->controllers, cont);
-					BLI_insertlinkbefore(&base->object->controllers, cont->prev, cont);
+					/* locate the controller that has the same state mask but is earlier in the list */
+					tmp = cont->prev;
+					while(tmp) {
+						if(tmp->state_mask & cont->state_mask) 
+							break;
+						tmp = tmp->prev;
+					}
+					if (tmp) {
+						BLI_remlink(&base->object->controllers, cont);
+						BLI_insertlinkbefore(&base->object->controllers, tmp, cont);
+					}
 				}
 				else if( val==2 && cont->next) {
+					tmp = cont->next;
+					while(tmp) {
+						if(tmp->state_mask & cont->state_mask) 
+							break;
+						tmp = tmp->next;
+					}
 					BLI_remlink(&base->object->controllers, cont);
-					BLI_insertlink(&base->object->controllers, cont->next, cont);
+					BLI_insertlink(&base->object->controllers, tmp, cont);
 				}
 				BIF_undo_push("Move controller");
 				allqueue(REDRAWBUTSLOGIC, 0);
@@ -306,7 +334,7 @@ static void sca_move_actuator(void *datav, void *data2_unused)
 	bActuator *actuator_to_move= datav;
 	int val;
 	Base *base;
-	bActuator *act;
+	bActuator *act, *tmp;
 	
 	val= pupmenu("Move up%x1|Move down %x2");
 	
@@ -323,12 +351,25 @@ static void sca_move_actuator(void *datav, void *data2_unused)
 			
 			if(act) {
 				if( val==1 && act->prev) {
-					BLI_remlink(&base->object->actuators, act);
-					BLI_insertlinkbefore(&base->object->actuators, act->prev, act);
+					/* locate the first visible actuators before this one */
+					for (tmp = act->prev; tmp; tmp=tmp->prev) {
+						if (tmp->flag & ACT_VISIBLE)
+							break;
+					}
+					if (tmp) {
+						BLI_remlink(&base->object->actuators, act);
+						BLI_insertlinkbefore(&base->object->actuators, tmp, act);
+					}
 				}
 				else if( val==2 && act->next) {
-					BLI_remlink(&base->object->actuators, act);
-					BLI_insertlink(&base->object->actuators, act->next, act);
+					for (tmp=act->next; tmp; tmp=tmp->next) {
+						if (tmp->flag & ACT_VISIBLE)
+							break;
+					}
+					if (tmp) {
+						BLI_remlink(&base->object->actuators, act);
+						BLI_insertlink(&base->object->actuators, tmp, act);
+					}
 				}
 				BIF_undo_push("Move actuator");
 				allqueue(REDRAWBUTSLOGIC, 0);
@@ -346,9 +387,8 @@ void do_logic_buts(unsigned short event)
 	bSensor *sens;
 	bController *cont;
 	bActuator *act;
-	Base *base;
 	Object *ob;
-	int didit;
+	int didit, bit;
 	
 	ob= OBACT;
 	if(ob==0) return;
@@ -402,16 +442,14 @@ void do_logic_buts(unsigned short event)
 		break;
 	
 	case B_ADD_SENS:
-		base= FIRSTBASE;
-		while(base) {
-			if(base->object->scaflag & OB_ADDSENS) {
-				base->object->scaflag &= ~OB_ADDSENS;
+		for(ob=G.main->object.first; ob; ob=ob->id.next) {
+			if(ob->scaflag & OB_ADDSENS) {
+				ob->scaflag &= ~OB_ADDSENS;
 				sens= new_sensor(SENS_ALWAYS);
-				BLI_addtail(&(base->object->sensors), sens);
+				BLI_addtail(&(ob->sensors), sens);
 				make_unique_prop_names(sens->name);
-				base->object->scaflag |= OB_SHOWSENS;
+				ob->scaflag |= OB_SHOWSENS;
 			}
-			base= base->next;
 		}
 		
 		BIF_undo_push("Add sensor");
@@ -419,9 +457,8 @@ void do_logic_buts(unsigned short event)
 		break;
 
 	case B_CHANGE_SENS:
-		base= FIRSTBASE;
-		while(base) {
-			sens= base->object->sensors.first;
+		for(ob=G.main->object.first; ob; ob=ob->id.next) {
+			sens= ob->sensors.first;
 			while(sens) {
 				if(sens->type != sens->otype) {
 					init_sensor(sens);
@@ -430,49 +467,77 @@ void do_logic_buts(unsigned short event)
 				}
 				sens= sens->next;
 			}
-			base= base->next;
 		}
 		allqueue(REDRAWBUTSLOGIC, 0);
 		break;
 	
 	case B_DEL_SENS:
-		base= FIRSTBASE;
-		while(base) {
-			sens= base->object->sensors.first;
+		for(ob=G.main->object.first; ob; ob=ob->id.next) {
+			sens= ob->sensors.first;
 			while(sens) {
 				if(sens->flag & SENS_DEL) {
-					BLI_remlink(&(base->object->sensors), sens);
+					BLI_remlink(&(ob->sensors), sens);
 					free_sensor(sens);
 					break;
 				}
 				sens= sens->next;
 			}
-			base= base->next;
 		}
 		BIF_undo_push("Delete sensor");
 		allqueue(REDRAWBUTSLOGIC, 0);
 		break;
 	
 	case B_ADD_CONT:
-		base= FIRSTBASE;
-		while(base) {
-			if(base->object->scaflag & OB_ADDCONT) {
-				base->object->scaflag &= ~OB_ADDCONT;
+		for(ob=G.main->object.first; ob; ob=ob->id.next) {
+			if(ob->scaflag & OB_ADDCONT) {
+				ob->scaflag &= ~OB_ADDCONT;
 				cont= new_controller(CONT_LOGIC_AND);
 				make_unique_prop_names(cont->name);
-				base->object->scaflag |= OB_SHOWCONT;
-				BLI_addtail(&(base->object->controllers), cont);
+				ob->scaflag |= OB_SHOWCONT;
+				BLI_addtail(&(ob->controllers), cont);
+				/* set the controller state mask from the current object state.
+				   A controller is always in a single state, so select the lowest bit set
+				   from the object state */
+				for (bit=0; bit<32; bit++) {
+					if (ob->state & (1<<bit))
+						break;
+				}
+				cont->state_mask = (1<<bit);
+				if (cont->state_mask == 0) {
+					/* shouldn't happen, object state is never 0 */
+					cont->state_mask = 1;
+				}
 			}
-			base= base->next;
 		}
 		BIF_undo_push("Add controller");
 		allqueue(REDRAWBUTSLOGIC, 0);
 		break;
 
+	case B_SET_STATE_BIT:
+		for(ob=G.main->object.first; ob; ob=ob->id.next) {
+			if(ob->scaflag & OB_SETSTBIT) {
+				ob->scaflag &= ~OB_SETSTBIT;
+				ob->state = 0x3FFFFFFF;
+			}
+		}
+		allqueue(REDRAWBUTSLOGIC, 0);
+		break;
+
+	case B_INIT_STATE_BIT:
+		for(ob=G.main->object.first; ob; ob=ob->id.next) {
+			if(ob->scaflag & OB_INITSTBIT) {
+				ob->scaflag &= ~OB_INITSTBIT;
+				ob->state = ob->init_state;
+				if (!ob->state)
+					ob->state = 1;
+			}
+		}
+		allqueue(REDRAWBUTSLOGIC, 0);
+		break;
+
 	case B_CHANGE_CONT:
-		base= FIRSTBASE;
-		while(base) {
-			cont= base->object->controllers.first;
+		for(ob=G.main->object.first; ob; ob=ob->id.next) {
+			cont= ob->controllers.first;
 			while(cont) {
 				if(cont->type != cont->otype) {
 					init_controller(cont);
@@ -481,51 +546,45 @@ void do_logic_buts(unsigned short event)
 				}
 				cont= cont->next;
 			}
-			base= base->next;
 		}
 		allqueue(REDRAWBUTSLOGIC, 0);
 		break;
 	
 
 	case B_DEL_CONT:
-		base= FIRSTBASE;
-		while(base) {
-			cont= base->object->controllers.first;
+		for(ob=G.main->object.first; ob; ob=ob->id.next) {
+			cont= ob->controllers.first;
 			while(cont) {
 				if(cont->flag & CONT_DEL) {
-					BLI_remlink(&(base->object->controllers), cont);
+					BLI_remlink(&(ob->controllers), cont);
 					unlink_controller(cont);
 					free_controller(cont);
 					break;
 				}
 				cont= cont->next;
 			}
-			base= base->next;
 		}
 		BIF_undo_push("Delete controller");
 		allqueue(REDRAWBUTSLOGIC, 0);
 		break;
-	
+
 	case B_ADD_ACT:
-		base= FIRSTBASE;
-		while(base) {
-			if(base->object->scaflag & OB_ADDACT) {
-				base->object->scaflag &= ~OB_ADDACT;
+		for(ob=G.main->object.first; ob; ob=ob->id.next) {
+			if(ob->scaflag & OB_ADDACT) {
+				ob->scaflag &= ~OB_ADDACT;
 				act= new_actuator(ACT_OBJECT);
 				make_unique_prop_names(act->name);
-				BLI_addtail(&(base->object->actuators), act);
-				base->object->scaflag |= OB_SHOWACT;
+				BLI_addtail(&(ob->actuators), act);
+				ob->scaflag |= OB_SHOWACT;
 			}
-			base= base->next;
 		}
 		BIF_undo_push("Add actuator");
 		allqueue(REDRAWBUTSLOGIC, 0);
 		break;
 
 	case B_CHANGE_ACT:
-		base= FIRSTBASE;
-		while(base) {
-			act= base->object->actuators.first;
+		for(ob=G.main->object.first; ob; ob=ob->id.next) {
+			act= ob->actuators.first;
 			while(act) {
 				if(act->type != act->otype) {
 					init_actuator(act);
@@ -534,25 +593,22 @@ void do_logic_buts(unsigned short event)
 				}
 				act= act->next;
 			}
-			base= base->next;
 		}
 		allqueue(REDRAWBUTSLOGIC, 0);
 		break;
 
 	case B_DEL_ACT:
-		base= FIRSTBASE;
-		while(base) {
-			act= base->object->actuators.first;
+		for(ob=G.main->object.first; ob; ob=ob->id.next) {
+			act= ob->actuators.first;
 			while(act) {
 				if(act->flag & ACT_DEL) {
-					BLI_remlink(&(base->object->actuators), act);
+					BLI_remlink(&(ob->actuators), act);
 					unlink_actuator(act);
 					free_actuator(act);
 					break;
 				}
 				act= act->next;
 			}
-			base= base->next;
 		}
 		BIF_undo_push("Delete actuator");
 		allqueue(REDRAWBUTSLOGIC, 0);
@@ -561,10 +617,8 @@ void do_logic_buts(unsigned short event)
 	case B_SOUNDACT_BROWSE:
 		/* since we don't know which... */
 		didit= 0;
-		base= FIRSTBASE;
-		while(base)
-		{
-			act= base->object->actuators.first;
+		for(ob=G.main->object.first; ob; ob=ob->id.next) {
+			act= ob->actuators.first;
 			while(act)
 			{
 				if(act->type==ACT_SOUND)
@@ -605,7 +659,6 @@ void do_logic_buts(unsigned short event)
 			}
 			if(didit)
 				break;
-			base= base->next;
 		}
 		allqueue(REDRAWBUTSLOGIC, 0);
 		allqueue(REDRAWSOUND, 0);
@@ -628,6 +681,8 @@ static char *sensor_name(int type)
 		return "Keyboard";
 	case SENS_PROPERTY:
 		return "Property";
+	case SENS_ACTUATOR:
+		return "Actuator";
 	case SENS_MOUSE:
 		return "Mouse";
 	case SENS_COLLISION:
@@ -651,7 +706,7 @@ static char *sensor_pup(void)
 	/* the number needs to match defines in game.h */
 	return "Sensors %t|Always %x0|Keyboard %x3|Mouse %x5|"
 		"Touch %x1|Collision %x6|Near %x2|Radar %x7|"
-		"Property %x4|Random %x8|Ray %x9|Message %x10|Joystick %x11";
+		"Property %x4|Random %x8|Ray %x9|Message %x10|Joystick %x11|Actuator %x12";
 }
 
 static char *controller_name(int type)
@@ -661,6 +716,14 @@ static char *controller_name(int type)
 		return "AND";
 	case CONT_LOGIC_OR:
 		return "OR";
+	case CONT_LOGIC_NAND:
+		return "NAND";
+	case CONT_LOGIC_NOR:
+		return "NOR";
+	case CONT_LOGIC_XOR:
+		return "XOR";
+	case CONT_LOGIC_XNOR:
+		return "XNOR";
 	case CONT_EXPRESSION:
 		return "Expression";
 	case CONT_PYTHON:
@@ -671,12 +734,14 @@ static char *controller_name(int type)
 
 static char *controller_pup(void)
 {
-	return "Controllers   %t|AND %x0|OR %x1|Expression %x2|Python %x3";
+	return "Controllers   %t|AND %x0|OR %x1|XOR %x6|NAND %x4|NOR %x5|XNOR %x7|Expression %x2|Python %x3";
 }
 
 static char *actuator_name(int type)
 {
 	switch (type) {
+	case ACT_SHAPEACTION:
+		return "Shape Action";
 	case ACT_ACTION:
 		return "Action";
 	case ACT_OBJECT:
@@ -715,6 +780,8 @@ static char *actuator_name(int type)
 		return "2D Filter";
 	case ACT_PARENT:
 		return "Parent";
+	case ACT_STATE:
+		return "State";
 	}
 	return "unknown";
 }
@@ -730,13 +797,21 @@ static char *actuator_pup(Object *owner)
 		return "Actuators  %t|Action %x15|Motion %x0|Constraint %x9|Ipo %x1"
 			"|Camera %x3|Sound %x5|Property %x6|Edit Object %x10"
 			"|Scene %x11|Random %x13|Message %x14|CD %x16|Game %x17"
-			"|Visibility %x18|2D Filter %x19|Parent %x20";
+			"|Visibility %x18|2D Filter %x19|Parent %x20|State %x22";
 		break;
+
+	case OB_MESH:
+		return "Actuators  %t|Shape Action %x21|Motion %x0|Constraint %x9|Ipo %x1"
+			"|Camera %x3|Sound %x5|Property %x6|Edit Object %x10"
+			"|Scene %x11|Random %x13|Message %x14|CD %x16|Game %x17"
+			"|Visibility %x18|2D Filter %x19|Parent %x20|State %x22";
+		break;
+
 	default:
 		return "Actuators  %t|Motion %x0|Constraint %x9|Ipo %x1"
 			"|Camera %x3|Sound %x5|Property %x6|Edit Object %x10"
 			"|Scene %x11|Random %x13|Message %x14|CD %x16|Game %x17"
-			"|Visibility %x18|2D Filter %x19|Parent %x20";
+			"|Visibility %x18|2D Filter %x19|Parent %x20|State %x22";
 	}
 }
 
@@ -805,7 +880,8 @@ static ID **get_selected_and_linked_obs(short *count, short scavisflag)
 		if(scavisflag & BUTS_ACT_ACT) OBACT->scavisflag |= OB_VIS_ACT;
 	}
 	
-	if(scavisflag & (BUTS_SENS_LINK|BUTS_CONT_LINK|BUTS_ACT_LINK)) {
+	/* BUTS_XXX_STATE are similar to BUTS_XXX_LINK for selecting the object */
+	if(scavisflag & (BUTS_SENS_LINK|BUTS_CONT_LINK|BUTS_ACT_LINK|BUTS_SENS_STATE|BUTS_ACT_STATE)) {
 		doit= 1;
 		while(doit) {
 			doit= 0;
@@ -814,7 +890,7 @@ static ID **get_selected_and_linked_obs(short *count, short scavisflag)
 			while(ob) {
 			
 				/* 1st case: select sensor when controller selected */
-				if((scavisflag & BUTS_SENS_LINK) && (ob->scavisflag & OB_VIS_SENS)==0) {
+				if((scavisflag & (BUTS_SENS_LINK|BUTS_SENS_STATE)) && (ob->scavisflag & OB_VIS_SENS)==0) {
 					sens= ob->sensors.first;
 					while(sens) {
 						for(a=0; a<sens->totlinks; a++) {
@@ -869,7 +945,7 @@ static ID **get_selected_and_linked_obs(short *count, short scavisflag)
 				}
 				
 				/* 4th case: select actuator when controller selected */
-				if( (scavisflag & BUTS_ACT_LINK)  && (ob->scavisflag & OB_VIS_CONT)) {
+				if( (scavisflag & (BUTS_ACT_LINK|BUTS_ACT_STATE))  && (ob->scavisflag & OB_VIS_CONT)) {
 					cont= ob->controllers.first;
 					while(cont) {
 						for(a=0; a<cont->totlinks; a++) {
@@ -929,6 +1005,7 @@ static int get_col_sensor(int type)
 	case SENS_NEAR:			return TH_BUT_SETTING1; 
 	case SENS_KEYBOARD:		return TH_BUT_SETTING2;
 	case SENS_PROPERTY:		return TH_BUT_NUM;
+	case SENS_ACTUATOR:		return TH_BUT_NUM;
 	case SENS_MOUSE:		return TH_BUT_TEXTFIELD;
 	case SENS_RADAR:		return TH_BUT_POPUP;
 	case SENS_RANDOM:		return TH_BUT_NEUTRAL;
@@ -974,6 +1051,10 @@ static void draw_default_sensor_header(bSensor *sens,
 			 (short)(x + 10 + 0.85 * (w-20)), (short)(y - 19), (short)(0.15 * (w-20)), 19,
 			 &sens->invert, 0.0, 0.0, 0, 0,
 			 "Invert the level (output) of this sensor");
+	uiDefButS(block, TOG, 1, "Lvl",
+			 (short)(x + 10 + 0.70 * (w-20)), (short)(y - 19), (short)(0.15 * (w-20)), 19,
+			 &sens->level, 0.0, 0.0, 0, 0,
+			 "Level detector versus edge detector (only applicable in case of logic state transition)");
 }
 
 static short draw_sensorbuttons(bSensor *sens, uiBlock *block, short xco, short yco, short width,char* objectname)
@@ -989,6 +1070,7 @@ static short draw_sensorbuttons(bSensor *sens, uiBlock *block, short xco, short
 	bRaySensor       *raySens      = NULL;
 	bMessageSensor   *mes          = NULL;
 	bJoystickSensor	 *joy		   = NULL;
+	bActuatorSensor  *as          = NULL;
 
 	short ysize;
 	char *str;
@@ -1199,6 +1281,22 @@ static short draw_sensorbuttons(bSensor *sens, uiBlock *block, short xco, short
 			yco-= ysize;
 			break;
 		}
+	case SENS_ACTUATOR:
+		{
+			ysize= 48;
+			
+			glRects(xco, yco-ysize, xco+width, yco);
+			uiEmboss((float)xco, (float)yco-ysize,
+				(float)xco+width, (float)yco, 1);
+			
+			draw_default_sensor_header(sens, block, xco, yco, width);
+			as= sens->data;
+			
+			uiDefBut(block, TEX, 1, "Act: ",			xco+30,yco-44,width-60, 19,
+					as->name, 0, 31, 0, 0,  "Actuator name, actuator active state modifications will be detected");
+			yco-= ysize;
+			break;
+		}
 	case SENS_MOUSE:
 		{
 			ms= sens->data;
@@ -1433,6 +1531,7 @@ static int get_col_actuator(int type)
 {
 	switch(type) {
 	case ACT_ACTION:		return TH_BUT_ACTION;
+	case ACT_SHAPEACTION:	return TH_BUT_ACTION;
 	case ACT_OBJECT:		return TH_BUT_NEUTRAL;
 	case ACT_IPO:			return TH_BUT_SETTING;
 	case ACT_PROPERTY:		return TH_BUT_SETTING1;
@@ -1447,6 +1546,7 @@ static int get_col_actuator(int type)
 	case ACT_GAME:			return TH_BUT_SETTING2;
 	case ACT_VISIBILITY:		return TH_BUT_NUM;
 	case ACT_CONSTRAINT:		return TH_BUT_ACTION;
+	case ACT_STATE:			return TH_BUT_SETTING2;
 	default:				return TH_BUT_NEUTRAL;
 	}
 }
@@ -1457,7 +1557,65 @@ static void set_col_actuator(int item, int medium)
 	
 }
 
-static short draw_actuatorbuttons(bActuator *act, uiBlock *block, short xco, short yco, short width)
+static void change_object_actuator(void *act, void *arg)
+{
+	bObjectActuator *oa = act;
+
+	if (oa->type != oa->otype) {
+		switch (oa->type) {
+		case ACT_OBJECT_NORMAL:
+			memset(oa, 0, sizeof(bObjectActuator));
+			oa->flag = ACT_FORCE_LOCAL|ACT_TORQUE_LOCAL|ACT_DLOC_LOCAL|ACT_DROT_LOCAL;
+			oa->type = ACT_OBJECT_NORMAL;
+			break;
+
+		case ACT_OBJECT_SERVO:
+			memset(oa, 0, sizeof(bObjectActuator));
+			oa->flag = ACT_LIN_VEL_LOCAL;
+			oa->type = ACT_OBJECT_SERVO;
+			oa->forcerot[0] = 30.0f;
+			oa->forcerot[1] = 0.5f;
+			oa->forcerot[2] = 0.0f;
+			break;
+		}
+	}
+}
+
+static void change_ipo_actuator(void *arg1_but, void *arg2_ia)
+{
+	bIpoActuator *ia = arg2_ia;
+	uiBut *but = arg1_but;
+
+	if (but->retval & ACT_IPOFORCE)
+		ia->flag &= ~ACT_IPOADD;
+	else if (but->retval & ACT_IPOADD)
+		ia->flag &= ~ACT_IPOFORCE;
+	but->retval = B_REDR;
+}
+
+void update_object_actuator_PID(void *act, void *arg)
+{
+	bObjectActuator *oa = act;
+	oa->forcerot[0] = 60.0f*oa->forcerot[1];
+}
+
+char *get_state_name(Object *ob, short bit)
+{
+	bController *cont;
+	unsigned int mask;
+
+	mask = (1<<bit);
+	cont = ob->controllers.first;
+	while (cont) {
+		if (cont->state_mask & mask) {
+			return cont->name;
+		}
+		cont = cont->next;
+	}
+	return (char*)"";
+}
+
+static short draw_actuatorbuttons(Object *ob, bActuator *act, uiBlock *block, short xco, short yco, short width)
 {
 	bSoundActuator      *sa      = NULL;
 	bCDActuator			*cda	 = NULL;
@@ -1476,11 +1634,13 @@ static short draw_actuatorbuttons(bActuator *act, uiBlock *block, short xco, sho
 	bVisibilityActuator *visAct  = NULL;
 	bTwoDFilterActuator	*tdfa	 = NULL;
 	bParentActuator     *parAct  = NULL;
+	bStateActuator		*staAct  = NULL;
 	
 	float *fp;
 	short ysize = 0, wval;
 	char *str;
-	int myline;
+	int myline, stbit;
+	uiBut *but;
 
 	/* yco is at the top of the rect, draw downwards */
 	uiBlockSetEmboss(block, UI_EMBOSSM);
@@ -1490,57 +1650,105 @@ static short draw_actuatorbuttons(bActuator *act, uiBlock *block, short xco, sho
 	{
 	case ACT_OBJECT:
 		{
-			ysize= 129;
-			
-			glRects(xco, yco-ysize, xco+width, yco);
-			uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
-			
 			oa = act->data;
 			wval = (width-100)/3;
-			
-			uiDefBut(block, LABEL, 0, "Force",	xco, yco-22, 55, 19, NULL, 0, 0, 0, 0, "Sets the force");
-			uiDefButF(block, NUM, 0, "",		xco+45, yco-22, wval, 19, oa->forceloc, -10000.0, 10000.0, 10, 0, "");
-			uiDefButF(block, NUM, 0, "",		xco+45+wval, yco-22, wval, 19, oa->forceloc+1, -10000.0, 10000.0, 10, 0, "");
-			uiDefButF(block, NUM, 0, "",		xco+45+2*wval, yco-22, wval, 19, oa->forceloc+2, -10000.0, 10000.0, 10, 0, "");
-			
-			uiDefBut(block, LABEL, 0, "Torque", xco, yco-41, 55, 19, NULL, 0, 0, 0, 0, "Sets the torque");
-			uiDefButF(block, NUM, 0, "",		xco+45, yco-41, wval, 19, oa->forcerot, -10000.0, 10000.0, 10, 0, "");
-			uiDefButF(block, NUM, 0, "",		xco+45+wval, yco-41, wval, 19, oa->forcerot+1, -10000.0, 10000.0, 10, 0, "");
-			uiDefButF(block, NUM, 0, "",		xco+45+2*wval, yco-41, wval, 19, oa->forcerot+2, -10000.0, 10000.0, 10, 0, "");
-			
-			uiDefBut(block, LABEL, 0, "dLoc",	xco, yco-64, 45, 19, NULL, 0, 0, 0, 0, "Sets the dLoc");
-			uiDefButF(block, NUM, 0, "",		xco+45, yco-64, wval, 19, oa->dloc, -10000.0, 10000.0, 10, 0, "");
-			uiDefButF(block, NUM, 0, "",		xco+45+wval, yco-64, wval, 19, oa->dloc+1, -10000.0, 10000.0, 10, 0, "");
-			uiDefButF(block, NUM, 0, "",		xco+45+2*wval, yco-64, wval, 19, oa->dloc+2, -10000.0, 10000.0, 10, 0, "");
-			
-			uiDefBut(block, LABEL, 0, "dRot",	xco, yco-83, 45, 19, NULL, 0, 0, 0, 0, "Sets the dRot");
-			uiDefButF(block, NUM, 0, "",		xco+45, yco-83, wval, 19, oa->drot, -10000.0, 10000.0, 10, 0, "");
-			uiDefButF(block, NUM, 0, "",		xco+45+wval, yco-83, wval, 19, oa->drot+1, -10000.0, 10000.0, 10, 0, "");
-			uiDefButF(block, NUM, 0, "",		xco+45+2*wval, yco-83, wval, 19, oa->drot+2, -10000.0, 10000.0, 10, 0, "");
-			
-			uiDefBut(block, LABEL, 0, "linV",	xco, yco-106, 45, 19, NULL, 0, 0, 0, 0, "Sets the linear velocity");
-			uiDefButF(block, NUM, 0, "",		xco+45, yco-106, wval, 19, oa->linearvelocity, -10000.0, 10000.0, 10, 0, "");
-			uiDefButF(block, NUM, 0, "",		xco+45+wval, yco-106, wval, 19, oa->linearvelocity+1, -10000.0, 10000.0, 10, 0, "");
-			uiDefButF(block, NUM, 0, "",		xco+45+2*wval, yco-106, wval, 19, oa->linearvelocity+2, -10000.0, 10000.0, 10, 0, "");
-			
-			uiDefBut(block, LABEL, 0, "angV",	xco, yco-125, 45, 19, NULL, 0, 0, 0, 0, "Sets the angular velocity");
-			uiDefButF(block, NUM, 0, "",		xco+45, yco-125, wval, 19, oa->angularvelocity, -10000.0, 10000.0, 10, 0, "");
-			uiDefButF(block, NUM, 0, "",		xco+45+wval, yco-125, wval, 19, oa->angularvelocity+1, -10000.0, 10000.0, 10, 0, "");
-			uiDefButF(block, NUM, 0, "",		xco+45+2*wval, yco-125, wval, 19, oa->angularvelocity+2, -10000.0, 10000.0, 10, 0, "");
-			
-			uiDefButBitI(block, TOG, ACT_FORCE_LOCAL, 0, "L",		xco+45+3*wval, yco-22, 15, 19, &oa->flag, 0.0, 0.0, 0, 0, "Local transformation");
-			uiDefButBitI(block, TOG, ACT_TORQUE_LOCAL, 0, "L",		xco+45+3*wval, yco-41, 15, 19, &oa->flag, 0.0, 0.0, 0, 0, "Local transformation");
-			uiDefButBitI(block, TOG, ACT_DLOC_LOCAL, 0, "L",		xco+45+3*wval, yco-64, 15, 19, &oa->flag, 0.0, 0.0, 0, 0, "Local transformation");
-			uiDefButBitI(block, TOG, ACT_DROT_LOCAL, 0, "L",		xco+45+3*wval, yco-83, 15, 19, &oa->flag, 0.0, 0.0, 0, 0, "Local transformation");
-			uiDefButBitI(block, TOG, ACT_LIN_VEL_LOCAL, 0, "L",		xco+45+3*wval, yco-106, 15, 19, &oa->flag, 0.0, 0.0, 0, 0, "Local transformation");
-			uiDefButBitI(block, TOG, ACT_ANG_VEL_LOCAL, 0, "L",		xco+45+3*wval, yco-125, 15, 19, &oa->flag, 0.0, 0.0, 0, 0, "Local transformation");
-			
-			uiDefButBitI(block, TOG, ACT_ADD_LIN_VEL, 0, "add",xco+45+3*wval+15, yco-106, 35, 19, &oa->flag, 0.0, 0.0, 0, 0, "Toggles between ADD and SET linV");
-			
+			if (oa->type == ACT_OBJECT_NORMAL)
+			{
+				ysize= 175;
+				
+				glRects(xco, yco-ysize, xco+width, yco);
+				uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
+				
+				uiDefBut(block, LABEL, 0, "Force",	xco, yco-45, 55, 19, NULL, 0, 0, 0, 0, "Sets the force");
+				uiDefButF(block, NUM, 0, "",		xco+45, yco-45, wval, 19, oa->forceloc, -10000.0, 10000.0, 10, 0, "");
+				uiDefButF(block, NUM, 0, "",		xco+45+wval, yco-45, wval, 19, oa->forceloc+1, -10000.0, 10000.0, 10, 0, "");
+				uiDefButF(block, NUM, 0, "",		xco+45+2*wval, yco-45, wval, 19, oa->forceloc+2, -10000.0, 10000.0, 10, 0, "");
+				
+				uiDefBut(block, LABEL, 0, "Torque", xco, yco-64, 55, 19, NULL, 0, 0, 0, 0, "Sets the torque");
+				uiDefButF(block, NUM, 0, "",		xco+45, yco-64, wval, 19, oa->forcerot, -10000.0, 10000.0, 10, 0, "");
+				uiDefButF(block, NUM, 0, "",		xco+45+wval, yco-64, wval, 19, oa->forcerot+1, -10000.0, 10000.0, 10, 0, "");
+				uiDefButF(block, NUM, 0, "",		xco+45+2*wval, yco-64, wval, 19, oa->forcerot+2, -10000.0, 10000.0, 10, 0, "");
+				
+				uiDefBut(block, LABEL, 0, "dLoc",	xco, yco-87, 45, 19, NULL, 0, 0, 0, 0, "Sets the dLoc");
+				uiDefButF(block, NUM, 0, "",		xco+45, yco-87, wval, 19, oa->dloc, -10000.0, 10000.0, 10, 0, "");
+				uiDefButF(block, NUM, 0, "",		xco+45+wval, yco-87, wval, 19, oa->dloc+1, -10000.0, 10000.0, 10, 0, "");
+				uiDefButF(block, NUM, 0, "",		xco+45+2*wval, yco-87, wval, 19, oa->dloc+2, -10000.0, 10000.0, 10, 0, "");
+				
+				uiDefBut(block, LABEL, 0, "dRot",	xco, yco-106, 45, 19, NULL, 0, 0, 0, 0, "Sets the dRot");
+				uiDefButF(block, NUM, 0, "",		xco+45, yco-106, wval, 19, oa->drot, -10000.0, 10000.0, 10, 0, "");
+				uiDefButF(block, NUM, 0, "",		xco+45+wval, yco-106, wval, 19, oa->drot+1, -10000.0, 10000.0, 10, 0, "");
+				uiDefButF(block, NUM, 0, "",		xco+45+2*wval, yco-106, wval, 19, oa->drot+2, -10000.0, 10000.0, 10, 0, "");
+				
+				uiDefBut(block, LABEL, 0, "linV",	xco, yco-129, 45, 19, NULL, 0, 0, 0, 0, "Sets the linear velocity");
+				uiDefButF(block, NUM, 0, "",		xco+45, yco-129, wval, 19, oa->linearvelocity, -10000.0, 10000.0, 10, 0, "");
+				uiDefButF(block, NUM, 0, "",		xco+45+wval, yco-129, wval, 19, oa->linearvelocity+1, -10000.0, 10000.0, 10, 0, "");
+				uiDefButF(block, NUM, 0, "",		xco+45+2*wval, yco-129, wval, 19, oa->linearvelocity+2, -10000.0, 10000.0, 10, 0, "");
+				
+				uiDefBut(block, LABEL, 0, "angV",	xco, yco-148, 45, 19, NULL, 0, 0, 0, 0, "Sets the angular velocity");
+				uiDefButF(block, NUM, 0, "",		xco+45, yco-148, wval, 19, oa->angularvelocity, -10000.0, 10000.0, 10, 0, "");
+				uiDefButF(block, NUM, 0, "",		xco+45+wval, yco-148, wval, 19, oa->angularvelocity+1, -10000.0, 10000.0, 10, 0, "");
+				uiDefButF(block, NUM, 0, "",		xco+45+2*wval, yco-148, wval, 19, oa->angularvelocity+2, -10000.0, 10000.0, 10, 0, "");
+				
+				uiDefBut(block, LABEL, 0, "damp",	xco, yco-171, 45, 19, NULL, 0, 0, 0, 0, "Number of frames to reach the target velocity");
+				uiDefButS(block, NUM, 0, "",		xco+45, yco-171, wval, 19, &oa->damping, 0.0, 1000.0, 100, 0, "");
+
+				uiDefButBitS(block, TOG, ACT_FORCE_LOCAL, 0, "L",		xco+45+3*wval, yco-45, 15, 19, &oa->flag, 0.0, 0.0, 0, 0, "Local transformation");
+				uiDefButBitS(block, TOG, ACT_TORQUE_LOCAL, 0, "L",		xco+45+3*wval, yco-64, 15, 19, &oa->flag, 0.0, 0.0, 0, 0, "Local transformation");
+				uiDefButBitS(block, TOG, ACT_DLOC_LOCAL, 0, "L",		xco+45+3*wval, yco-87, 15, 19, &oa->flag, 0.0, 0.0, 0, 0, "Local transformation");
+				uiDefButBitS(block, TOG, ACT_DROT_LOCAL, 0, "L",		xco+45+3*wval, yco-106, 15, 19, &oa->flag, 0.0, 0.0, 0, 0, "Local transformation");
+				uiDefButBitS(block, TOG, ACT_LIN_VEL_LOCAL, 0, "L",		xco+45+3*wval, yco-129, 15, 19, &oa->flag, 0.0, 0.0, 0, 0, "Local transformation");
+				uiDefButBitS(block, TOG, ACT_ANG_VEL_LOCAL, 0, "L",		xco+45+3*wval, yco-148, 15, 19, &oa->flag, 0.0, 0.0, 0, 0, "Local transformation");
+				
+				uiDefButBitS(block, TOG, ACT_ADD_LIN_VEL, 0, "add",xco+45+3*wval+15, yco-129, 35, 19, &oa->flag, 0.0, 0.0, 0, 0, "Toggles between ADD and SET linV");
+				
+			} else if (oa->type == ACT_OBJECT_SERVO)
+			{
+				ysize= 172;
+				
+				glRects(xco, yco-ysize, xco+width, yco);
+				uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
+				
+				uiDefBut(block, LABEL, 0, "linV",	xco, yco-45, 45, 19, NULL, 0, 0, 0, 0, "Sets the target linear velocity, it will be achieve by automatic application of force. Null velocity is a valid target");
+				uiDefButF(block, NUM, 0, "",		xco+45, yco-45, wval, 19, oa->linearvelocity, -10000.0, 10000.0, 10, 0, "");
+				uiDefButF(block, NUM, 0, "",		xco+45+wval, yco-45, wval, 19, oa->linearvelocity+1, -10000.0, 10000.0, 10, 0, "");
+				uiDefButF(block, NUM, 0, "",		xco+45+2*wval, yco-45, wval, 19, oa->linearvelocity+2, -10000.0, 10000.0, 10, 0, "");
+				uiDefButBitS(block, TOG, ACT_LIN_VEL_LOCAL, 0, "L",		xco+45+3*wval, yco-45, 15, 19, &oa->flag, 0.0, 0.0, 0, 0, "Velocity is defined in local coordinates");
+
+				uiDefBut(block, LABEL, 0, "Limit",	xco, yco-68, 45, 19, NULL, 0, 0, 0, 0, "Select if the force need to be limited along certain axis (local or global depending on LinV Local flag)");
+				uiDefButBitS(block, TOG, ACT_SERVO_LIMIT_X, B_REDR, "X",		xco+45, yco-68, wval, 19, &oa->flag, 0.0, 0.0, 0, 0, "Set limit to force along the X axis");
+				uiDefButBitS(block, TOG, ACT_SERVO_LIMIT_Y, B_REDR, "Y",		xco+45+wval, yco-68, wval, 19, &oa->flag, 0.0, 0.0, 0, 0, "Set limit to force along the Y axis");
+				uiDefButBitS(block, TOG, ACT_SERVO_LIMIT_Z, B_REDR, "Z",		xco+45+2*wval, yco-68, wval, 19, &oa->flag, 0.0, 0.0, 0, 0, "Set limit to force along the Z axis");
+				uiDefBut(block, LABEL, 0, "Max",	xco, yco-87, 45, 19, NULL, 0, 0, 0, 0, "Set the upper limit for force");
+				uiDefBut(block, LABEL, 0, "Min",	xco, yco-106, 45, 19, NULL, 0, 0, 0, 0, "Set the lower limit for force");
+				if (oa->flag & ACT_SERVO_LIMIT_X) {
+					uiDefButF(block, NUM, 0, "",		xco+45, yco-87, wval, 19, oa->dloc, -10000.0, 10000.0, 10, 0, "");
+					uiDefButF(block, NUM, 0, "",		xco+45, yco-106, wval, 19, oa->drot, -10000.0, 10000.0, 10, 0, "");
+				}
+				if (oa->flag & ACT_SERVO_LIMIT_Y) {
+					uiDefButF(block, NUM, 0, "",		xco+45+wval, yco-87, wval, 19, oa->dloc+1, -10000.0, 10000.0, 10, 0, "");
+					uiDefButF(block, NUM, 0, "",		xco+45+wval, yco-106, wval, 19, oa->drot+1, -10000.0, 10000.0, 10, 0, "");
+				}
+				if (oa->flag & ACT_SERVO_LIMIT_Z) {
+					uiDefButF(block, NUM, 0, "",		xco+45+2*wval, yco-87, wval, 19, oa->dloc+2, -10000.0, 10000.0, 10, 0, "");
+					uiDefButF(block, NUM, 0, "",		xco+45+2*wval, yco-106, wval, 19, oa->drot+2, -10000.0, 10000.0, 10, 0, "");
+				}
+				uiDefBut(block, LABEL, 0, "Servo",	xco, yco-129, 45, 19, NULL, 0, 0, 0, 0, "Coefficients of the PID servo controller");
+				uiDefButF(block, NUMSLI, B_REDR, "P: ",		xco+45, yco-129, wval*3, 19, oa->forcerot, 0.00, 200.0, 100, 0, "Proportional coefficient, typical value is 60x Integral coefficient");
+				uiDefBut(block, LABEL, 0, "Slow",	xco, yco-148, 45, 19, NULL, 0, 0, 0, 0, "Low value of I coefficient correspond to slow response");
+				but = uiDefButF(block, NUMSLI, B_REDR, " I : ",		xco+45, yco-148, wval*3, 19, oa->forcerot+1, 0.0, 3.0, 1, 0, "Integral coefficient, low value (0.01) for slow response, high value (0.5) for fast response");
+				uiButSetFunc(but, update_object_actuator_PID, oa, NULL);
+				uiDefBut(block, LABEL, 0, "Fast",	xco+45+3*wval, yco-148, 45, 19, NULL, 0, 0, 0, 0, "High value of I coefficient correspond to fast response");
+				uiDefButF(block, NUMSLI, B_REDR, "D: ",		xco+45, yco-167, wval*3, 19, oa->forcerot+2, -100.0, 100.0, 100, 0, "Derivate coefficient, not required, high values can cause instability");
+			}
+			str= "Motion Type %t|Simple motion %x0|Servo Control %x1";
+			but = uiDefButS(block, MENU, B_REDR, str,		xco+40, yco-23, (width-80), 19, &oa->type, 0.0, 0.0, 0, 0, "");
+			oa->otype = oa->type;
+			uiButSetFunc(but, change_object_actuator, oa, NULL);
 			yco-= ysize;
 			break;
 		}
 	case ACT_ACTION:
+	case ACT_SHAPEACTION:
 		{
 			/* DrawAct */
 #ifdef __NLA_ACTION_BY_MOTION_ACTUATOR
@@ -1561,31 +1769,38 @@ static short draw_actuatorbuttons(bActuator *act, uiBlock *block, short xco, sho
 #else
 			str= "Action types   %t|Play %x0|Flipper %x2|Loop Stop %x3|Loop End %x4|Property %x6";
 #endif
-			uiDefButS(block, MENU, B_REDR, str, xco+30, yco-24, width-60, 19, &aa->type, 0.0, 0.0, 0.0, 0.0, "Action playback type");
-			uiDefIDPoinBut(block, test_actionpoin_but, ID_AC, 1, "AC: ", xco+30, yco-44, width-60, 19, &aa->act, "Action name");
+			uiDefButS(block, MENU, B_REDR, str, xco+10, yco-24, width/3, 19, &aa->type, 0.0, 0.0, 0.0, 0.0, "Action playback type");
+			uiDefIDPoinBut(block, test_actionpoin_but, ID_AC, 1, "AC: ", xco+10+ (width/3), yco-24, ((width/3)*2) - (20 + 60), 19, &aa->act, "Action name");
+			
+			uiDefButBitS(block, TOGN, 1, 0, "Continue", xco+((width/3)*2)+20, yco-24, 60, 19,
+					 &aa->end_reset, 0.0, 0.0, 0, 0, "Restore last frame when switching on/off, otherwise play from the start each time");
+			
 			
 			if(aa->type == ACT_ACTION_FROM_PROP)
 			{
-				uiDefBut(block, TEX, 0, "Prop: ",xco+30, yco-64, width-60, 19, aa->name, 0.0, 31.0, 0, 0, "Use this property to define the Action position");
+				uiDefBut(block, TEX, 0, "Prop: ",xco+10, yco-44, width-20, 19, aa->name, 0.0, 31.0, 0, 0, "Use this property to define the Action position");
 			}
 			else
 			{
-				uiDefButI(block, NUM, 0, "Sta: ",xco+30, yco-64, (width-60)/2, 19, &aa->sta, 0.0, MAXFRAMEF, 0, 0, "Start frame");
-				uiDefButI(block, NUM, 0, "End: ",xco+30+(width-60)/2, yco-64, (width-60)/2, 19, &aa->end, 0.0, MAXFRAMEF, 0, 0, "End frame");
+				uiDefButI(block, NUM, 0, "Sta: ",xco+10, yco-44, (width-20)/2, 19, &aa->sta, 0.0, MAXFRAMEF, 0, 0, "Start frame");
+				uiDefButI(block, NUM, 0, "End: ",xco+10+(width-20)/2, yco-44, (width-20)/2, 19, &aa->end, 0.0, MAXFRAMEF, 0, 0, "End frame");
 			}
+						
+			uiDefButS(block, NUM, 0, "Blendin: ", xco+10, yco-64, (width-20)/2, 19, &aa->blendin, 0.0, 32767, 0.0, 0.0, "Number of frames of motion blending");
+			uiDefButS(block, NUM, 0, "Priority: ", xco+10+(width-20)/2, yco-64, (width-20)/2, 19, &aa->priority, 0.0, 100.0, 0.0, 0.0, "Execution priority - lower numbers will override actions with higher numbers, With 2 or more actions at once, the overriding channels must be lower in the stack");
 			
-			
-			
-			uiDefButI(block, NUM, 0, "Blendin: ", xco+30, yco-84, (width-60)/2, 19, &aa->blendin, 0.0, MAXFRAMEF, 0.0, 0.0, "Number of frames of motion blending");
-			uiDefButS(block, NUM, 0, "Priority: ", xco+30+(width-60)/2, yco-84, (width-60)/2, 19, &aa->priority, 0.0, 100.0, 0.0, 0.0, "Execution priority - lower numbers will override actions with higher numbers");
+			uiDefBut(block, TEX, 0, "FrameProp: ",xco+10, yco-84, width-20, 19, aa->frameProp, 0.0, 31.0, 0, 0, "Assign this property this actions current frame number");			
+
 			
 #ifdef __NLA_ACTION_BY_MOTION_ACTUATOR
 			if(aa->type == ACT_ACTION_MOTION)
 			{
-				uiDefButF(block, NUM, 0, "Cycle: ",xco+30, yco-104, (width-60)/2, 19, &aa->stridelength, 0.0, 2500.0, 0, 0, "Distance covered by a single cycle of the action");
+				uiDefButF(block, NUM, 0, "Cycle: ",xco+30, yco-84, (width-60)/2, 19, &aa->stridelength, 0.0, 2500.0, 0, 0, "Distance covered by a single cycle of the action");
 			}
 #endif
 			
+			
+			
 			yco-=ysize;
 			break;
 		}
@@ -1600,42 +1815,49 @@ static short draw_actuatorbuttons(bActuator *act, uiBlock *block, short xco, sho
 			
 			str = "Ipo types   %t|Play %x0|Ping Pong %x1|Flipper %x2|Loop Stop %x3|Loop End %x4|Property %x6";
 			
-			uiDefButS(block, MENU, B_REDR, str,		xco+20, yco-24, width-40 - (width-40)/3, 19, &ia->type, 0, 0, 0, 0, "");
-			uiDefButBitS(block, TOG, ACT_IPOCHILD,  B_REDR, 
-				"Child",	xco+20+0.666*(width-40), yco-24, (width-40)/3, 19, 
+			uiDefButS(block, MENU, B_REDR, str,		xco+10, yco-24, (width-20)/2, 19, &ia->type, 0, 0, 0, 0, "");
+
+			but = uiDefButBitS(block, TOG, ACT_IPOFORCE, ACT_IPOFORCE, 
+				"Force", xco+10+(width-20)/2, yco-24, (width-20)/4-10, 19, 
 				&ia->flag, 0, 0, 0, 0, 
-				"Add all children Objects as well");
+				"Convert Ipo to force. Force is applied in global or local coordinate according to Local flag"); 
+			uiButSetFunc(but, change_ipo_actuator, but, ia);
+
+			but = uiDefButBitS(block, TOG, ACT_IPOADD, ACT_IPOADD, 
+				"Add", xco+3*(width-20)/4, yco-24, (width-20)/4-10, 19, 
+				&ia->flag, 0, 0, 0, 0, 
+				"Ipo is added to the current loc/rot/scale in global or local coordinate according to Local flag"); 
+			uiButSetFunc(but, change_ipo_actuator, but, ia);
+			
+			/* Only show the do-force-local toggle if force is requested */
+			if (ia->flag & (ACT_IPOFORCE|ACT_IPOADD)) {
+				uiDefButBitS(block, TOG, ACT_IPOLOCAL, 0, 
+					"L", xco+width-30, yco-24, 20, 19, 
+					&ia->flag, 0, 0, 0, 0, 
+					"Let the ipo acts in local coordinates, used in Force and Add mode."); 
+			}
 
 			if(ia->type==ACT_IPO_FROM_PROP) {
 				uiDefBut(block, TEX, 0, 
-					"Prop: ",		xco+20, yco-44, width-40, 19, 
+					"Prop: ",		xco+10, yco-44, width-80, 19, 
 					ia->name, 0.0, 31.0, 0, 0, 
 					"Use this property to define the Ipo position");
 			}
 			else {
 				uiDefButI(block, NUM, 0, 
-					"Sta",		xco+20, yco-44, (width-100)/2, 19, 
+					"Sta",		xco+10, yco-44, (width-80)/2, 19, 
 					&ia->sta, 0.0, MAXFRAMEF, 0, 0, 
-					"Start frame");
+					"Start frame, (subtract 1 to match blenders frame numbers)");
 				uiDefButI(block, NUM, 0, 
-					"End",		xco+18+(width-90)/2, yco-44, (width-100)/2, 19, 
+					"End",		xco+10+(width-80)/2, yco-44, (width-80)/2, 19, 
 					&ia->end, 0.0, MAXFRAMEF, 0, 0, 
-					"End frame");
-				
-				uiDefButBitS(block, TOG, ACT_IPOFORCE, B_REDR, 
-					"Force", xco+width-78, yco-44, 43, 19, 
-					&ia->flag, 0, 0, 0, 0, 
-					"Convert Ipo to force"); 
-				
-				/* Only show the do-force-local toggle if force is requested */
-				if (ia->flag & ACT_IPOFORCE) {
-					uiDefButBitS(block, TOG, ACT_IPOFORCE_LOCAL, 0, 
-						"L", xco+width-35, yco-44, 15, 19, 
-						&ia->flag, 0, 0, 0, 0, 
-						"Let the force-ipo act in local coordinates."); 
-				}
-				
+					"End frame, (subtract 1 to match blenders frame numbers)");
 			}
+			uiDefButBitS(block, TOG, ACT_IPOCHILD,  B_REDR, 
+				"Child",	xco+10+(width-80), yco-44, 60, 19, 
+				&ia->flag, 0, 0, 0, 0, 
+				"Update IPO on all children Objects as well");
+
 			yco-= ysize;
 			break;
 		}
@@ -1767,7 +1989,7 @@ static short draw_actuatorbuttons(bActuator *act, uiBlock *block, short xco, sho
 			glRects(xco, yco-ysize, xco+width, yco);
 			uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
 	 
-			uiDefIDPoinBut(block, test_obpoin_but, ID_OB, 1, "OB:",		xco+10, yco-44, (width-20)/2, 19, &(eoa->ob), "Add this Object (cant be on an visible layer)");
+			uiDefIDPoinBut(block, test_obpoin_but, ID_OB, 1, "OB:",		xco+10, yco-44, (width-20)/2, 19, &(eoa->ob), "Add this Object and all its children (cant be on an visible layer)");
 			uiDefButI(block, NUM, 0, "Time:",	xco+10+(width-20)/2, yco-44, (width-20)/2, 19, &eoa->time, 0.0, 2000.0, 0, 0, "Duration the new Object lives");
 
 			wval= (width-60)/3;
@@ -1809,8 +2031,15 @@ static short draw_actuatorbuttons(bActuator *act, uiBlock *block, short xco, sho
 			uiDefButI(block, NUM, 0, "Time:",	xco+10+(width-20)/2, yco-44, (width-20)/2-40, 19, &eoa->time, 0.0, 2000.0, 0, 0, "Duration the tracking takes");
 			uiDefButS(block, TOG, 0, "3D",	xco+width-50, yco-44, 40, 19, &eoa->flag, 0.0, 0.0, 0, 0, "Enable 3D tracking");
 		}
-		
-		str= "Edit Object %t|Add Object %x0|End Object %x1|Replace Mesh %x2|Track to %x3";
+		else if(eoa->type==ACT_EDOB_DYNAMICS) {
+			ysize= 48;
+			glRects(xco, yco-ysize, xco+width, yco);
+			uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
+			
+			str= "Dynamic Operation %t|Restore Dynamics %x0|Suspend Dynamics %x1|Enable Rigid Body %x2|Disable Rigid Body %x3";
+			uiDefButS(block, MENU, B_REDR, str,		xco+40, yco-44, (width-80), 19,  &(eoa->dyn_operation), 0.0, 0.0, 0, 0, "");
+		}
+		str= "Edit Object %t|Add Object %x0|End Object %x1|Replace Mesh %x2|Track to %x3|Dynamics %x4";
 		uiDefButS(block, MENU, B_REDR, str,		xco+40, yco-24, (width-80), 19, &eoa->type, 0.0, 0.0, 0, 0, "");
 
  		yco-= ysize;
@@ -1818,34 +2047,97 @@ static short draw_actuatorbuttons(bActuator *act, uiBlock *block, short xco, sho
         break;
  
  	case ACT_CONSTRAINT:
-	
-		ysize= 44;
-        
-		glRects(xco, yco-ysize, xco+width, yco);
-		uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
-		
 		coa= act->data;
-		
-/*  		str= "Limit %t|None %x0|Loc X %x1|Loc Y %x2|Loc Z %x4|Rot X %x8|Rot Y %x16|Rot Z %x32"; */
-		str= "Limit %t|None %x0|Loc X %x1|Loc Y %x2|Loc Z %x4";
-		uiDefButS(block, MENU, 1, str,		xco+10, yco-40, 70, 19, &coa->flag, 0.0, 0.0, 0, 0, "");
 	
-		uiDefButS(block, NUM,		0, "Damp:",	xco+10, yco-20, 70, 19, &coa->damp, 0.0, 100.0, 0, 0, "");
-		uiDefBut(block, LABEL,			0, "Min",	xco+80, yco-20, (width-90)/2, 19, NULL, 0.0, 0.0, 0, 0, "");
-		uiDefBut(block, LABEL,			0, "Max",	xco+80+(width-90)/2, yco-20, (width-90)/2, 19, NULL, 0.0, 0.0, 0, 0, "");
-
-		if(coa->flag & ACT_CONST_LOCX) fp= coa->minloc;
-		else if(coa->flag & ACT_CONST_LOCY) fp= coa->minloc+1;
-		else if(coa->flag & ACT_CONST_LOCZ) fp= coa->minloc+2;
-		else if(coa->flag & ACT_CONST_ROTX) fp= coa->minrot;
-		else if(coa->flag & ACT_CONST_ROTY) fp= coa->minrot+1;
-		else fp= coa->minrot+2;
-		
-		uiDefButF(block, NUM, 0, "",		xco+80, yco-40, (width-90)/2, 19, fp, -2000.0, 2000.0, 10, 0, "");
-		uiDefButF(block, NUM, 0, "",		xco+80+(width-90)/2, yco-40, (width-90)/2, 19, fp+3, -2000.0, 2000.0, 10, 0, "");
-
- 		yco-= ysize;
+		if (coa->type == ACT_CONST_TYPE_LOC) {
+			ysize= 69;
         
+			glRects(xco, yco-ysize, xco+width, yco);
+			uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
+			
+	/*  		str= "Limit %t|None %x0|Loc X %x1|Loc Y %x2|Loc Z %x4|Rot X %x8|Rot Y %x16|Rot Z %x32"; */
+	/*			coa->flag &= ~(63); */
+			str= "Limit %t|None %x0|Loc X %x1|Loc Y %x2|Loc Z %x4";
+			coa->flag &= ~(7);
+			coa->time = 0;
+			uiDefButS(block, MENU, 1, str,		xco+10, yco-65, 70, 19, &coa->flag, 0.0, 0.0, 0, 0, "");
+		
+			uiDefButS(block, NUM,		0, "Damp:",	xco+10, yco-45, 70, 19, &coa->damp, 0.0, 100.0, 0, 0, "");
+			uiDefBut(block, LABEL,			0, "Min",	xco+80, yco-45, (width-90)/2, 19, NULL, 0.0, 0.0, 0, 0, "");
+			uiDefBut(block, LABEL,			0, "Max",	xco+80+(width-90)/2, yco-45, (width-90)/2, 19, NULL, 0.0, 0.0, 0, 0, "");
+
+			if(coa->flag & ACT_CONST_LOCX) fp= coa->minloc;
+			else if(coa->flag & ACT_CONST_LOCY) fp= coa->minloc+1;
+			else if(coa->flag & ACT_CONST_LOCZ) fp= coa->minloc+2;
+			else if(coa->flag & ACT_CONST_ROTX) fp= coa->minrot;
+			else if(coa->flag & ACT_CONST_ROTY) fp= coa->minrot+1;
+			else fp= coa->minrot+2;
+			
+			uiDefButF(block, NUM, 0, "",		xco+80, yco-65, (width-90)/2, 19, fp, -2000.0, 2000.0, 10, 0, "");
+			uiDefButF(block, NUM, 0, "",		xco+80+(width-90)/2, yco-65, (width-90)/2, 19, fp+3, -2000.0, 2000.0, 10, 0, "");
+		} else if (coa->type == ACT_CONST_TYPE_DIST) {
+			ysize= 106;
+
+			glRects(xco, yco-ysize, xco+width, yco);
+			uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
+			
+			str= "Direction %t|None %x0|X axis %x1|Y axis %x2|Z axis %x4|-X axis %x8|-Y axis %x16|-Z axis %x32";
+			uiDefButS(block, MENU, B_REDR, str,		xco+10, yco-65, 70, 19, &coa->mode, 0.0, 0.0, 0, 0, "Set the direction of the ray");
+		
+			uiDefButS(block, NUM,		0, "Damp:",	xco+10, yco-45, 70, 19, &coa->damp, 0.0, 100.0, 0, 0, "");
+			uiDefBut(block, LABEL,			0, "Range",	xco+80, yco-45, (width-115)/2, 19, NULL, 0.0, 0.0, 0, 0, "Set the maximum length of ray");
+			uiDefButBitS(block, TOG, ACT_CONST_DISTANCE, B_REDR, "Dist",	xco+80+(width-115)/2, yco-45, (width-115)/2, 19, &coa->flag, 0.0, 0.0, 0, 0, "Force distance of object to point of impact of ray");
+
+			if(coa->mode & (ACT_CONST_DIRPX|ACT_CONST_DIRMX)) fp= coa->minloc;
+			else if(coa->mode & (ACT_CONST_DIRPY|ACT_CONST_DIRMY)) fp= coa->minloc+1;
+			else fp= coa->minloc+2;
+
+			uiDefButF(block, NUM, 0, "",		xco+80, yco-65, (width-115)/2, 19, fp+3, 0.0, 2000.0, 10, 0, "Maximum length of ray");
+			if (coa->flag & ACT_CONST_DISTANCE)
+				uiDefButF(block, NUM, 0, "",		xco+80+(width-115)/2, yco-65, (width-115)/2, 19, fp, -2000.0, 2000.0, 10, 0, "Keep this distance to target");
+			uiDefButBitS(block, TOG, ACT_CONST_NORMAL, 0, "N", xco+80+(width-115), yco-65, 25, 19,
+					 &coa->flag, 0.0, 0.0, 0, 0, "Set object axis along the normal at hit position");
+			uiDefButBitS(block, TOG, ACT_CONST_MATERIAL, B_REDR, "M/P", xco+10, yco-84, 40, 19,
+					 &coa->flag, 0.0, 0.0, 0, 0, "Detect material instead of property");
+			if (coa->flag & ACT_CONST_MATERIAL)
+			{
+				uiDefBut(block, TEX, 1, "Material:", xco + 50, yco-84, (width-60), 19,
+					coa->matprop, 0, 31, 0, 0,
+					"Ray detects only Objects with this material");
+			}
+			else
+			{
+				uiDefBut(block, TEX, 1, "Property:", xco + 50, yco-84, (width-60), 19,
+					coa->matprop, 0, 31, 0, 0,
+					"Ray detect only Objects with this property");
+			}
+			uiDefButBitS(block, TOG, ACT_CONST_PERMANENT, 0, "PER", xco+10, yco-103, 40, 19,
+				&coa->flag, 0.0, 0.0, 0, 0, "Persistent actuator: stays active even if ray does not reach target");
+			uiDefButS(block, NUM, 0, "time", xco+50, yco-103, (width-60)/2, 19, &(coa->time), 0.0, 1000.0, 0, 0, "Maximum activation time in frame, 0 for unlimited");
+			uiDefButS(block, NUM, 0, "rotDamp", xco+50+(width-60)/2, yco-103, (width-60)/2, 19, &(coa->rotdamp), 0.0, 100.0, 0, 0, "Use a different damping for orientation");
+		} else if (coa->type == ACT_CONST_TYPE_ORI) {
+			ysize= 87;
+
+			glRects(xco, yco-ysize, xco+width, yco);
+			uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
+			
+			str= "Direction %t|None %x0|X axis %x1|Y axis %x2|Z axis %x4";
+			uiDefButS(block, MENU, B_REDR, str,		xco+10, yco-65, 70, 19, &coa->mode, 0.0, 0.0, 0, 0, "Select the axis to be aligned along the reference direction");
+		
+			uiDefButS(block, NUM,		0, "Damp:",	xco+10, yco-45, 70, 19, &coa->damp, 0.0, 100.0, 0, 0, "");
+			uiDefBut(block, LABEL,			0, "X",	xco+80, yco-45, (width-115)/3, 19, NULL, 0.0, 0.0, 0, 0, "");
+			uiDefBut(block, LABEL,			0, "Y",	xco+80+(width-115)/3, yco-45, (width-115)/3, 19, NULL, 0.0, 0.0, 0, 0, "");
+			uiDefBut(block, LABEL,			0, "Z",	xco+80+2*(width-115)/3, yco-45, (width-115)/3, 19, NULL, 0.0, 0.0, 0, 0, "");
+
+			uiDefButF(block, NUM, 0, "",		xco+80, yco-65, (width-115)/3, 19, &coa->maxrot[0], -2000.0, 2000.0, 10, 0, "X component of reference direction");
+			uiDefButF(block, NUM, 0, "",		xco+80+(width-115)/3, yco-65, (width-115)/3, 19, &coa->maxrot[1], -2000.0, 2000.0, 10, 0, "Y component of reference direction");
+			uiDefButF(block, NUM, 0, "",		xco+80+2*(width-115)/3, yco-65, (width-115)/3, 19, &coa->maxrot[2], -2000.0, 2000.0, 10, 0, "Z component of reference direction");
+
+			uiDefButS(block, NUM, 0, "time", xco+10, yco-84, 70+(width-115)/3, 19, &(coa->time), 0.0, 1000.0, 0, 0, "Maximum activation time in frame, 0 for unlimited");
+		}
+		str= "Constraint Type %t|Location %x0|Distance %x1|Orientation %x2";
+		but = uiDefButS(block, MENU, B_REDR, str,		xco+40, yco-23, (width-80), 19, &coa->type, 0.0, 0.0, 0, 0, "");
+ 		yco-= ysize;
         break;
  
 	case ACT_SCENE:
@@ -1978,7 +2270,7 @@ static short draw_actuatorbuttons(bActuator *act, uiBlock *block, short xco, sho
 			uiDefBut(block, TEX, 0, "Prop: ",		xco+20, yco-44, width-40, 19, ga->name, 0.0, 31.0, 0, 0, "Use this property to define the Group position");
 		}
 		else {
-			uiDefButI(block, NUM, 0, "Sta",		xco+20, yco-44, (width-40)/2, 19, &ga->sta, 0.0, 2500.0, 0, 0, "Start frame");
+			uiDefButI(block, NUM, 0, "State",		xco+20, yco-44, (width-40)/2, 19, &ga->sta, 0.0, 2500.0, 0, 0, "Start frame");
 			uiDefButI(block, NUM, 0, "End",		xco+20+(width-40)/2, yco-44, (width-40)/2, 19, &ga->end, 0.0, 2500.0, 0, 0, "End frame");
 		}
 		yco-= ysize;
@@ -2010,6 +2302,37 @@ static short draw_actuatorbuttons(bActuator *act, uiBlock *block, short xco, sho
 
 		break;
 		
+	case ACT_STATE:
+		ysize = 34;
+
+		glRects(xco, yco-ysize, xco+width, yco);
+		uiEmboss((float)xco,
+			 (float)yco-ysize, (float)xco+width, (float)yco, 1);
+		
+		staAct = act->data;
+
+		str= "Operation %t|Cpy %x0|Add %x1|Sub %x2|Inv %x3";
+
+		uiDefButI(block, MENU, B_REDR, str,
+			  xco + 10, yco - 24, 65, 19, &staAct->type,
+			  0.0, 0.0, 0, 0,
+			  "Select the bit operation on object state mask");
+
+		for (wval=0; wval<15; wval+=5) {
+			uiBlockBeginAlign(block);
+			for (stbit=0; stbit<5; stbit++) {
+				uiDefButBitI(block, TOG, (1<<(stbit+wval)), 0, "",	(short)(xco+85+12*stbit+13*wval), yco-17, 12, 12, (int *)&(staAct->mask), 0, 0, 0, 0, get_state_name(ob, (short)(wval+stbit)));
+			}
+			for (stbit=0; stbit<5; stbit++) {
+				uiDefButBitI(block, TOG, (1<<(stbit+wval+15)), 0, "",	(short)(xco+85+12*stbit+13*wval), yco-29, 12, 12, (int *)&(staAct->mask), 0, 0, 0, 0, get_state_name(ob, (short)(wval+stbit+15)));
+			}
+		}
+		uiBlockEndAlign(block);
+
+		yco-= ysize;
+
+		break;
+
 	case ACT_RANDOM:
 		ysize  = 69;
 
@@ -2137,7 +2460,7 @@ static short draw_actuatorbuttons(bActuator *act, uiBlock *block, short xco, sho
 		uiDefBut(block, TEX, 1, "To: ",
 			(xco+10), (yco-(myline++*24)), (width-20), 19,
 			&ma->toPropName, 0, 31, 0, 0,
-			"Optional send message to objects with this name only"
+			"Optional send message to objects with this name only (Prefix name with OB)"
 			", or empty to broadcast");
 
 #endif
@@ -2584,6 +2907,118 @@ void buttons_bullet(uiBlock *block, Object *ob)
 	uiBlockEndAlign(block);
 }
 
+static void check_object_state(void *arg1_but, void *arg2_mask)
+{
+	unsigned int *cont_mask = arg2_mask;
+	uiBut *but = arg1_but;
+
+	if (*cont_mask == 0 || !(G.qual & LR_SHIFTKEY))
+		*cont_mask = (1<<but->retval);
+	but->retval = B_REDR;
+}
+
+static void check_controller_state_mask(void *arg1_but, void *arg2_mask)
+{
+	unsigned int *cont_mask = arg2_mask;
+	uiBut *but = arg1_but;
+	
+	/* a controller is always in a single state */
+	*cont_mask = (1<<but->retval);
+	but->retval = B_REDR;
+}
+
+static int first_bit(unsigned int mask)
+{
+	int bit;
+
+	for (bit=0; bit<32; bit++) {
+		if (mask & (1<<bit))
+			return bit;
+	}
+	return -1;
+}
+
+static uiBlock *controller_state_mask_menu(void *arg_cont)
+{
+	uiBlock *block;
+	uiBut *but;
+	bController *cont = arg_cont;
+
+	short yco = 12, xco = 0, stbit, offset;
+
+	block= uiNewBlock(&curarea->uiblocks, "Controller state mask", UI_EMBOSS, UI_HELV, curarea->win);
+
+	/* use this for a fake extra empy space around the buttons */
+	uiDefBut(block, LABEL, 0, "",			-5, -5, 200, 34, NULL, 0, 0, 0, 0, "");
+	
+	for (offset=0; offset<15; offset+=5) {
+		uiBlockBeginAlign(block);
+		for (stbit=0; stbit<5; stbit++) {
+			but = uiDefButBitI(block, TOG, (1<<(stbit+offset)), (stbit+offset), "",	(short)(xco+12*stbit+13*offset), yco, 12, 12, (int *)&(cont->state_mask), 0, 0, 0, 0, "");
+			uiButSetFunc(but, check_controller_state_mask, but, &(cont->state_mask));
+		}
+		for (stbit=0; stbit<5; stbit++) {
+			but = uiDefButBitI(block, TOG, (1<<(stbit+offset+15)), (stbit+offset+15), "",	(short)(xco+12*stbit+13*offset), yco-12, 12, 12, (int *)&(cont->state_mask), 0, 0, 0, 0, "");
+			uiButSetFunc(but, check_controller_state_mask, but, &(cont->state_mask));
+		}
+	}
+	uiBlockEndAlign(block);
+
+	uiBlockSetDirection(block, UI_TOP);
+
+	return block;
+}
+
+static void do_object_state_menu(void *arg, int event)
+{	
+	Object *ob = arg;
+
+	switch (event) {
+	case 0:
+		ob->state = 0x3FFFFFFF;
+		break;
+	case 1:
+		ob->state = ob->init_state;
+		if (!ob->state)
+			ob->state = 1;
+		break;
+	case 2:
+		ob->init_state = ob->state;
+		break;
+	}
+	allqueue(REDRAWBUTSLOGIC, 0);
+}
+
+static uiBlock *object_state_mask_menu(void *arg_obj)
+{
+	uiBlock *block;
+	short xco = 0;
+
+	block= uiNewBlock(&curarea->uiblocks, "obstatemenu", UI_EMBOSSP, UI_HELV, curarea->win);
+	uiBlockSetButmFunc(block, do_object_state_menu, arg_obj);
+	
+	uiDefBut(block, BUTM, 1, "Set all bits",		0, (short)(xco-=20), 160, 19, NULL, 0.0, 0.0, 1, 0, "");
+	uiDefBut(block, BUTM, 1, "Recall init state",	0, (short)(xco-=20), 160, 19, NULL, 0.0, 0.0, 1, 1, "");
+	uiDefBut(block, SEPR, 0, "",					0, (short)(xco-=6),	 160, 6,  NULL, 0.0, 0.0, 0, 0, "");
+	uiDefBut(block, BUTM, 1, "Store init state",	0, (short)(xco-=20), 160, 19, NULL, 0.0, 0.0, 1, 2, "");
+
+	uiBlockSetDirection(block, UI_TOP);
+	return block;
+}
+
+static int is_sensor_linked(uiBlock *block, bSensor *sens)
+{
+	bController *cont;
+	int i, count;
+
+	for (count=0, i=0; i<sens->totlinks; i++) {
+		cont = sens->links[i];
+		if (uiFindInlink(block, cont) != NULL)
+			return 1;
+	}
+	return 0;
+}
+
 /* never used, see CVS 1.134 for the code */
 /*  static FreeCamera *new_freecamera(void) */
 
@@ -2602,7 +3037,7 @@ void logic_buts(void)
 	uiBlock *block;
 	uiBut *but;
 	World *wrld;
-	int a;
+	int a, iact, stbit, offset;
 	short xco, yco, count, width, ycoo;
 	char *pupstr, name[32];
 
@@ -2674,18 +3109,171 @@ void logic_buts(void)
 	uiClearButLock();
 
 	idar= get_selected_and_linked_obs(&count, G.buts->scaflag);
-	
+
+	/* clean ACT_LINKED and ACT_VISIBLE of all potentially visible actuators so that 
+	   we can determine which is actually linked/visible */
+	for(a=0; a<count; a++) {
+		ob= (Object *)idar[a];
+		act= ob->actuators.first;
+		while(act) {
+			act->flag &= ~(ACT_LINKED|ACT_VISIBLE);
+			act = act->next;
+		}
+		/* same for sensors */
+		sens= ob->sensors.first;
+		while(sens) {
+			sens->flag &= ~(SENS_VISIBLE);
+			sens = sens->next;
+		}
+	}
+		
+	/* start with the controller because we need to know which one is visible */
 	/* ******************************* */
-	xco= 375; yco= 170; width= 230;
+	xco= 695; yco= 170; width= 275;
 
 	uiBlockSetEmboss(block, UI_EMBOSSP);
-	uiDefBlockBut(block, sensor_menu, NULL, "Sensors", xco-10, yco+35, 80, 19, "");
+	uiDefBlockBut(block, controller_menu, NULL, "Controllers", xco-10, yco+35, 100, 19, "");
 	uiBlockSetEmboss(block, UI_EMBOSS);
 	
 	uiBlockBeginAlign(block);
-	uiDefButBitS(block, TOG, BUTS_SENS_SEL, B_REDR, "Sel", xco+110, yco+35, (width-100)/3, 19, &G.buts->scaflag, 0, 0, 0, 0, "Show all selected Objects");
-	uiDefButBitS(block, TOG, BUTS_SENS_ACT, B_REDR, "Act", xco+110+(width-100)/3, yco+35, (width-100)/3, 19, &G.buts->scaflag, 0, 0, 0, 0, "Show active Object");
-	uiDefButBitS(block, TOG, BUTS_SENS_LINK, B_REDR, "Link", xco+110+2*(width-100)/3, yco+35, (width-100)/3, 19, &G.buts->scaflag, 0, 0, 0, 0, "Show linked Objects to Controller");
+	uiDefButBitS(block, TOG, BUTS_CONT_SEL,  B_REDR, "Sel", xco+110, yco+35, (width-100)/3, 19, &G.buts->scaflag, 0, 0, 0, 0, "Show all selected Objects");
+	uiDefButBitS(block, TOG, BUTS_CONT_ACT, B_REDR, "Act", xco+110+(width-100)/3, yco+35, (width-100)/3, 19, &G.buts->scaflag, 0, 0, 0, 0, "Show active Object");
+	uiDefButBitS(block, TOG, BUTS_CONT_LINK, B_REDR, "Link", xco+110+2*(width-100)/3, yco+35, (width-100)/3, 19, &G.buts->scaflag, 0, 0, 0, 0, "Show linked Objects to Sensor/Actuator");
+	uiBlockEndAlign(block);
+	
+	ob= OBACT;
+	
+	for(a=0; a<count; a++) {
+		unsigned int controller_state_mask = 0; /* store a bitmask for states that are used */
+		
+		ob= (Object *)idar[a];
+		uiClearButLock();
+		uiSetButLock(object_is_libdata(ob), ERROR_LIBDATA_MESSAGE);
+		if( (ob->scavisflag & OB_VIS_CONT) == 0) continue;
+
+		/* presume it is only objects for now */
+		uiBlockSetEmboss(block, UI_EMBOSS);
+		uiBlockBeginAlign(block);
+		if(ob->controllers.first) uiSetCurFont(block, UI_HELVB);
+		uiDefButBitS(block, TOG, OB_SHOWCONT, B_REDR, ob->id.name+2,(short)(xco-10), yco, (short)(width-30), 19, &ob->scaflag, 0, 0, 0, 0, "Active Object name");
+		if(ob->controllers.first) uiSetCurFont(block, UI_HELV);
+		uiDefButBitS(block, TOG, OB_ADDCONT, B_ADD_CONT, "Add",(short)(xco+width-40), yco, 50, 19, &ob->scaflag, 0, 0, 0, 0, "Add a new Controller");
+		uiBlockEndAlign(block);
+		yco-=17;
+		
+		/* mark all actuators linked to these controllers */
+		/* note that some of these actuators could be from objects that are not in the display list.
+		   It's ok because those actuators will not be displayed here */
+		cont= ob->controllers.first;
+		while(cont) {
+			for (iact=0; iact<cont->totlinks; iact++) {
+				act = cont->links[iact];
+				act->flag |= ACT_LINKED;
+			}
+			controller_state_mask |= cont->state_mask;
+			cont = cont->next;
+		}
+
+		if(ob->scaflag & OB_SHOWCONT) {
+
+			/* first show the state */
+			uiBlockSetEmboss(block, UI_EMBOSSP);
+			uiDefBlockBut(block, object_state_mask_menu, ob, "State", (short)(xco-10), (short)(yco-10), 40, 19, "Object state menu: store and retrieve initial state");
+			uiBlockSetEmboss(block, UI_EMBOSS);
+			if (!ob->state)
+				ob->state = 1;
+			for (offset=0; offset<15; offset+=5) {
+				uiBlockBeginAlign(block);
+				for (stbit=0; stbit<5; stbit++) {
+					but = uiDefButBitI(block, controller_state_mask&(1<<(stbit+offset)) ? BUT_TOGDUAL:TOG, 1<<(stbit+offset), stbit+offset, "",	(short)(xco+35+12*stbit+13*offset), yco, 12, 12, (int *)&(ob->state), 0, 0, 0, 0, get_state_name(ob, (short)(stbit+offset)));
+					uiButSetFunc(but, check_object_state, but, &(ob->state));
+				}
+				for (stbit=0; stbit<5; stbit++) {
+					but = uiDefButBitI(block, controller_state_mask&(1<<(stbit+offset+15)) ? BUT_TOGDUAL:TOG, 1<<(stbit+offset+15), stbit+offset+15, "",	(short)(xco+35+12*stbit+13*offset), yco-12, 12, 12, (int *)&(ob->state), 0, 0, 0, 0, get_state_name(ob, (short)(stbit+offset+15)));
+					uiButSetFunc(but, check_object_state, but, &(ob->state));
+				}
+			}
+			uiBlockBeginAlign(block);
+			uiDefButBitS(block, TOG, OB_SETSTBIT, B_SET_STATE_BIT, "All",(short)(xco+235), yco-10, 25, 19, &ob->scaflag, 0, 0, 0, 0, "Set all state bits");
+			uiDefButBitS(block, TOG, OB_INITSTBIT, B_INIT_STATE_BIT, "Ini",(short)(xco+260), yco-10, 25, 19, &ob->scaflag, 0, 0, 0, 0, "Set the initial state");
+			uiBlockEndAlign(block);
+
+			yco-=35;
+		
+			/* display only the controllers that match the current state */
+			offset = 0;
+			for (stbit=0; stbit<32; stbit++) {
+				if (!(ob->state & (1<<stbit)))
+					continue;
+				/* add a separation between controllers of different states */
+				if (offset) {
+					offset = 0;
+					yco -= 6;
+				}
+				cont= ob->controllers.first;
+				while(cont) {
+					if (cont->state_mask & (1<<stbit)) {
+						/* this controller is visible, mark all its actuator */
+						for (iact=0; iact<cont->totlinks; iact++) {
+							act = cont->links[iact];
+							act->flag |= ACT_VISIBLE;
+						}
+						uiBlockSetEmboss(block, UI_EMBOSSM);
+						uiDefIconButBitS(block, TOG, CONT_DEL, B_DEL_CONT, ICON_X,	xco, yco, 22, 19, &cont->flag, 0, 0, 0, 0, "Delete Controller");
+						uiDefIconButBitS(block, ICONTOG, CONT_SHOW, B_REDR, ICON_RIGHTARROW, (short)(xco+width-22), yco, 22, 19, &cont->flag, 0, 0, 0, 0, "Controller settings");
+						uiBlockSetEmboss(block, UI_EMBOSSP);
+						sprintf(name, "%d", first_bit(cont->state_mask)+1);
+						uiDefBlockBut(block, controller_state_mask_menu, cont, name, (short)(xco+width-44), yco, 22, 19, "Set controller state mask");
+						uiBlockSetEmboss(block, UI_EMBOSSM);
+				
+						if(cont->flag & CONT_SHOW) {
+							cont->otype= cont->type;
+							uiDefButS(block, MENU, B_CHANGE_CONT, controller_pup(),(short)(xco+22), yco, 100, 19, &cont->type, 0, 0, 0, 0, "Controller type");
+							but= uiDefBut(block, TEX, 1, "", (short)(xco+122), yco, (short)(width-166), 19, cont->name, 0, 31, 0, 0, "Controller name");
+							uiButSetFunc(but, make_unique_prop_names_cb, cont->name, (void*) 0);
+				
+							ycoo= yco;
+							yco= draw_controllerbuttons(cont, block, xco, yco, width);
+							if(yco-6 < ycoo) ycoo= (yco+ycoo-20)/2;
+						}
+						else {
+							cpack(0x999999);
+							glRecti(xco+22, yco, xco+width-22,yco+19);
+							but= uiDefBut(block, LABEL, 0, controller_name(cont->type), (short)(xco+22), yco, 100, 19, cont, 0, 0, 0, 0, "Controller type");
+							uiButSetFunc(but, sca_move_controller, cont, NULL);
+							but= uiDefBut(block, LABEL, 0, cont->name,(short)(xco+122), yco,(short)(width-166), 19, cont, 0, 0, 0, 0, "Controller name");
+							uiButSetFunc(but, sca_move_controller, cont, NULL);
+							ycoo= yco;
+						}
+				
+						but= uiDefIconBut(block, LINK, 0, ICON_LINK,	(short)(xco+width), ycoo, 19, 19, NULL, 0, 0, 0, 0, "");
+						uiSetButLink(but, NULL, (void ***)&(cont->links), &cont->totlinks, LINK_CONTROLLER, LINK_ACTUATOR);
+				
+						uiDefIconBut(block, INLINK, 0, ICON_INLINK,(short)(xco-19), ycoo, 19, 19, cont, LINK_CONTROLLER, 0, 0, 0, "");
+						/* offset is >0 if at least one controller was displayed */
+						offset++;
+						yco-=20;
+					}
+					cont= cont->next;
+				}
+
+			}
+			yco-= 6;
+		}
+	}
+	
+	/* ******************************* */
+	xco= 375; yco= 170; width= 250;
+
+	uiBlockSetEmboss(block, UI_EMBOSSP);
+	uiDefBlockBut(block, sensor_menu, NULL, "Sensors", xco-10, yco+35, 70, 19, "");
+	uiBlockSetEmboss(block, UI_EMBOSS);
+	
+	uiBlockBeginAlign(block);
+	uiDefButBitS(block, TOG, BUTS_SENS_SEL, B_REDR, "Sel", xco+80, yco+35, (width-70)/4, 19, &G.buts->scaflag, 0, 0, 0, 0, "Show all selected Objects");
+	uiDefButBitS(block, TOG, BUTS_SENS_ACT, B_REDR, "Act", xco+80+(width-70)/4, yco+35, (width-70)/4, 19, &G.buts->scaflag, 0, 0, 0, 0, "Show active Object");
+	uiDefButBitS(block, TOG, BUTS_SENS_LINK, B_REDR, "Link", xco+80+2*(width-70)/4, yco+35, (width-70)/4, 19, &G.buts->scaflag, 0, 0, 0, 0, "Show linked Objects to Controller");
+	uiDefButBitS(block, TOG, BUTS_SENS_STATE, B_REDR, "State", xco+80+3*(width-70)/4, yco+35, (width-70)/4, 19, &G.buts->scaflag, 0, 0, 0, 0, "Show only sensors connected to active states");
 	uiBlockEndAlign(block);
 	
 	for(a=0; a<count; a++) {
@@ -2709,35 +3297,39 @@ void logic_buts(void)
 			
 			sens= ob->sensors.first;
 			while(sens) {
-				uiBlockSetEmboss(block, UI_EMBOSSM);
-				uiDefIconButBitS(block, TOG, SENS_DEL, B_DEL_SENS, ICON_X,	xco, yco, 22, 19, &sens->flag, 0, 0, 0, 0, "Delete Sensor");
-				uiDefIconButBitS(block, ICONTOG, SENS_SHOW, B_REDR, ICON_RIGHTARROW, (short)(xco+width-22), yco, 22, 19, &sens->flag, 0, 0, 0, 0, "Sensor settings");
+				if (!(G.buts->scaflag & BUTS_SENS_STATE) ||
+					sens->totlinks == 0 ||		/* always display sensor without links so that is can be edited */
+					is_sensor_linked(block, sens)) {
+					sens->flag |= SENS_VISIBLE;
+					uiBlockSetEmboss(block, UI_EMBOSSM);
+					uiDefIconButBitS(block, TOG, SENS_DEL, B_DEL_SENS, ICON_X,	xco, yco, 22, 19, &sens->flag, 0, 0, 0, 0, "Delete Sensor");
+					uiDefIconButBitS(block, ICONTOG, SENS_SHOW, B_REDR, ICON_RIGHTARROW, (short)(xco+width-22), yco, 22, 19, &sens->flag, 0, 0, 0, 0, "Sensor settings");
 
-				ycoo= yco;
-				if(sens->flag & SENS_SHOW)
-				{
-					uiDefButS(block, MENU, B_CHANGE_SENS, sensor_pup(),	(short)(xco+22), yco, 100, 19, &sens->type, 0, 0, 0, 0, "Sensor type");
-					but= uiDefBut(block, TEX, 1, "", (short)(xco+122), yco, (short)(width-144), 19, sens->name, 0, 31, 0, 0, "Sensor name");
-					uiButSetFunc(but, make_unique_prop_names_cb, sens->name, (void*) 0);
+					ycoo= yco;
+					if(sens->flag & SENS_SHOW)
+					{
+						uiDefButS(block, MENU, B_CHANGE_SENS, sensor_pup(),	(short)(xco+22), yco, 100, 19, &sens->type, 0, 0, 0, 0, "Sensor type");
+						but= uiDefBut(block, TEX, 1, "", (short)(xco+122), yco, (short)(width-144), 19, sens->name, 0, 31, 0, 0, "Sensor name");
+						uiButSetFunc(but, make_unique_prop_names_cb, sens->name, (void*) 0);
 
-					sens->otype= sens->type;
-					yco= draw_sensorbuttons(sens, block, xco, yco, width,ob->id.name);
-					if(yco-6 < ycoo) ycoo= (yco+ycoo-20)/2;
+						sens->otype= sens->type;
+						yco= draw_sensorbuttons(sens, block, xco, yco, width,ob->id.name);
+						if(yco-6 < ycoo) ycoo= (yco+ycoo-20)/2;
+					}
+					else {
+						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, 100, 19, sens, 0, 0, 0, 0, "");
+						uiButSetFunc(but, sca_move_sensor, sens, NULL);
+						but= uiDefBut(block, LABEL, 0, sens->name, (short)(xco+122), yco, (short)(width-144), 19, sens, 0, 31, 0, 0, "");
+						uiButSetFunc(but, sca_move_sensor, sens, NULL);
+					}
+
+					but= uiDefIconBut(block, LINK, 0, ICON_LINK,	(short)(xco+width), ycoo, 19, 19, NULL, 0, 0, 0, 0, "");
+					uiSetButLink(but, NULL, (void ***)&(sens->links), &sens->totlinks, LINK_SENSOR, LINK_CONTROLLER);
+
+					yco-=20;
 				}
-				else {
-					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, 100, 19, sens, 0, 0, 0, 0, "");
-					uiButSetFunc(but, sca_move_sensor, sens, NULL);
-					but= uiDefBut(block, LABEL, 0, sens->name, (short)(xco+122), yco, (short)(width-144), 19, sens, 0, 31, 0, 0, "");
-					uiButSetFunc(but, sca_move_sensor, sens, NULL);
-				}
-
-				but= uiDefIconBut(block, LINK, 0, ICON_LINK,	(short)(xco+width), ycoo, 19, 19, NULL, 0, 0, 0, 0, "");
-				uiSetButLink(but, NULL, (void ***)&(sens->links), &sens->totlinks, LINK_SENSOR, LINK_CONTROLLER);
-
-				yco-=20;
-
 				sens= sens->next;
 			}
 			yco-= 6;
@@ -2745,87 +3337,16 @@ void logic_buts(void)
 	}
 
 	/* ******************************* */
-	xco= 675; yco= 170; width= 230;
-
-	uiBlockSetEmboss(block, UI_EMBOSSP);
-	uiDefBlockBut(block, controller_menu, NULL, "Controllers", xco-10, yco+35, 100, 19, "");
-	uiBlockSetEmboss(block, UI_EMBOSS);
-	
-	uiBlockBeginAlign(block);
-	uiDefButBitS(block, TOG, BUTS_CONT_SEL,  B_REDR, "Sel", xco+110, yco+35, (width-100)/3, 19, &G.buts->scaflag, 0, 0, 0, 0, "Show all selected Objects");
-	uiDefButBitS(block, TOG, BUTS_CONT_ACT, B_REDR, "Act", xco+110+(width-100)/3, yco+35, (width-100)/3, 19, &G.buts->scaflag, 0, 0, 0, 0, "Show active Object");
-	uiDefButBitS(block, TOG, BUTS_CONT_LINK, B_REDR, "Link", xco+110+2*(width-100)/3, yco+35, (width-100)/3, 19, &G.buts->scaflag, 0, 0, 0, 0, "Show linked Objects to Sensor/Actuator");
-	uiBlockEndAlign(block);
-	
-	ob= OBACT;
-	
-	for(a=0; a<count; a++) {
-		ob= (Object *)idar[a];
-		uiClearButLock();
-		uiSetButLock(object_is_libdata(ob), ERROR_LIBDATA_MESSAGE);
-		if( (ob->scavisflag & OB_VIS_CONT) == 0) continue;
-
-		/* presume it is only objects for now */
-		uiBlockSetEmboss(block, UI_EMBOSS);
-		uiBlockBeginAlign(block);
-		if(ob->controllers.first) uiSetCurFont(block, UI_HELVB);
-		uiDefButBitS(block, TOG, OB_SHOWCONT, B_REDR, ob->id.name+2,(short)(xco-10), yco, (short)(width-30), 19, &ob->scaflag, 0, 0, 0, 0, "Active Object name");
-		if(ob->controllers.first) uiSetCurFont(block, UI_HELV);
-		uiDefButBitS(block, TOG, OB_ADDCONT, B_ADD_CONT, "Add",(short)(xco+width-40), yco, 50, 19, &ob->scaflag, 0, 0, 0, 0, "Add a new Controller");
-		uiBlockEndAlign(block);
-		yco-=20;
-		
-		if(ob->scaflag & OB_SHOWCONT) {
-		
-			cont= ob->controllers.first;
-			while(cont) {
-				uiBlockSetEmboss(block, UI_EMBOSSM);
-				uiDefIconButBitS(block, TOG, CONT_DEL, B_DEL_CONT, ICON_X,	xco, yco, 22, 19, &cont->flag, 0, 0, 0, 0, "Delete Controller");
-				uiDefIconButBitS(block, ICONTOG, CONT_SHOW, B_REDR, ICON_RIGHTARROW, (short)(xco+width-22), yco, 22, 19, &cont->flag, 0, 0, 0, 0, "Controller settings");
-		
-				if(cont->flag & CONT_SHOW) {
-					cont->otype= cont->type;
-					uiDefButS(block, MENU, B_CHANGE_CONT, controller_pup(),(short)(xco+22), yco, 100, 19, &cont->type, 0, 0, 0, 0, "Controller type");
-					but= uiDefBut(block, TEX, 1, "", (short)(xco+122), yco, (short)(width-144), 19, cont->name, 0, 31, 0, 0, "Controller name");
-					uiButSetFunc(but, make_unique_prop_names_cb, cont->name, (void*) 0);
-		
-					ycoo= yco;
-					yco= draw_controllerbuttons(cont, block, xco, yco, width);
-					if(yco-6 < ycoo) ycoo= (yco+ycoo-20)/2;
-				}
-				else {
-					cpack(0x999999);
-					glRecti(xco+22, yco, xco+width-22,yco+19);
-					but= uiDefBut(block, LABEL, 0, controller_name(cont->type), (short)(xco+22), yco, 100, 19, cont, 0, 0, 0, 0, "Controller type");
-					uiButSetFunc(but, sca_move_controller, cont, NULL);
-					but= uiDefBut(block, LABEL, 0, cont->name,(short)(xco+122), yco,(short)(width-144), 19, cont, 0, 0, 0, 0, "Controller name");
-					uiButSetFunc(but, sca_move_controller, cont, NULL);
-					ycoo= yco;
-				}
-		
-				but= uiDefIconBut(block, LINK, 0, ICON_LINK,	(short)(xco+width), ycoo, 19, 19, NULL, 0, 0, 0, 0, "");
-				uiSetButLink(but, NULL, (void ***)&(cont->links), &cont->totlinks, LINK_CONTROLLER, LINK_ACTUATOR);
-		
-				uiDefIconBut(block, INLINK, 0, ICON_INLINK,(short)(xco-19), ycoo, 19, 19, cont, LINK_CONTROLLER, 0, 0, 0, "");
-		
-				yco-=20;
-				
-				cont= cont->next;
-			}
-			yco-= 6;
-		}
-	}
-	
-	/* ******************************* */
-	xco= 985; yco= 170; width= 280;
+	xco= 1040; yco= 170; width= 280;
 	
 	uiBlockSetEmboss(block, UI_EMBOSSP);
-	uiDefBlockBut(block, actuator_menu, NULL, "Actuators", xco-10, yco+35, 100, 19, "");
+	uiDefBlockBut(block, actuator_menu, NULL, "Actuators", xco-10, yco+35, 90, 19, "");
 	uiBlockSetEmboss(block, UI_EMBOSS);
 	uiBlockBeginAlign(block);
-	uiDefButBitS(block, TOG, BUTS_ACT_SEL, B_REDR, "Sel", xco+110, yco+35, (width-110)/3, 19, &G.buts->scaflag, 0, 0, 0, 0, "Show all selected Objects");
-	uiDefButBitS(block, TOG, BUTS_ACT_ACT, B_REDR, "Act", xco+110+(width-110)/3, yco+35, (width-110)/3, 19, &G.buts->scaflag, 0, 0, 0, 0, "Show active Object");
-	uiDefButBitS(block, TOG, BUTS_ACT_LINK, B_REDR, "Link", xco+110+2*(width-110)/3, yco+35, (width-110)/3, 19, &G.buts->scaflag, 0, 0, 0, 0, "Show linked Objects to Controller");
+	uiDefButBitS(block, TOG, BUTS_ACT_SEL, B_REDR, "Sel", xco+110, yco+35, (width-100)/4, 19, &G.buts->scaflag, 0, 0, 0, 0, "Show all selected Objects");
+	uiDefButBitS(block, TOG, BUTS_ACT_ACT, B_REDR, "Act", xco+110+(width-100)/4, yco+35, (width-100)/4, 19, &G.buts->scaflag, 0, 0, 0, 0, "Show active Object");
+	uiDefButBitS(block, TOG, BUTS_ACT_LINK, B_REDR, "Link", xco+110+2*(width-100)/4, yco+35, (width-100)/4, 19, &G.buts->scaflag, 0, 0, 0, 0, "Show linked Objects to Controller");
+	uiDefButBitS(block, TOG, BUTS_ACT_STATE, B_REDR, "State", xco+110+3*(width-100)/4, yco+35, (width-100)/4, 19, &G.buts->scaflag, 0, 0, 0, 0, "Show only actuators connected to active states");
 	uiBlockEndAlign(block);
 	for(a=0; a<count; a++) {
 		ob= (Object *)idar[a];
@@ -2847,34 +3368,38 @@ void logic_buts(void)
 			
 			act= ob->actuators.first;
 			while(act) {
-				uiBlockSetEmboss(block, UI_EMBOSSM);
-				uiDefIconButBitS(block, TOG, ACT_DEL, B_DEL_ACT, ICON_X,	xco, yco, 22, 19, &act->flag, 0, 0, 0, 0, "Delete Actuator");
-				uiDefIconButBitS(block, ICONTOG, ACT_SHOW, B_REDR, ICON_RIGHTARROW, (short)(xco+width-22), yco, 22, 19, &act->flag, 0, 0, 0, 0, "Actuator settings");
+				if (!(G.buts->scaflag & BUTS_ACT_STATE) ||
+					!(act->flag & ACT_LINKED) ||		/* always display actuators without links so that is can be edited */
+					(act->flag & ACT_VISIBLE)) {		/* this actuator has visible connection, display it */
+					act->flag |= ACT_VISIBLE;	/* mark the actuator as visible to help implementing the up/down action */
+					uiBlockSetEmboss(block, UI_EMBOSSM);
+					uiDefIconButBitS(block, TOG, ACT_DEL, B_DEL_ACT, ICON_X,	xco, yco, 22, 19, &act->flag, 0, 0, 0, 0, "Delete Actuator");
+					uiDefIconButBitS(block, ICONTOG, ACT_SHOW, B_REDR, ICON_RIGHTARROW, (short)(xco+width-22), yco, 22, 19, &act->flag, 0, 0, 0, 0, "Actuator settings");
 
-				if(act->flag & ACT_SHOW) {
-					act->otype= act->type;
-					uiDefButS(block, MENU, B_CHANGE_ACT, actuator_pup(ob),	(short)(xco+22), yco, 100, 19, &act->type, 0, 0, 0, 0, "Actuator type");
-					but= uiDefBut(block, TEX, 1, "", (short)(xco+122), yco, (short)(width-144), 19, act->name, 0, 31, 0, 0, "Actuator name");
-					uiButSetFunc(but, make_unique_prop_names_cb, act->name, (void*) 0);
+					if(act->flag & ACT_SHOW) {
+						act->otype= act->type;
+						uiDefButS(block, MENU, B_CHANGE_ACT, actuator_pup(ob),	(short)(xco+22), yco, 100, 19, &act->type, 0, 0, 0, 0, "Actuator type");
+						but= uiDefBut(block, TEX, 1, "", (short)(xco+122), yco, (short)(width-144), 19, act->name, 0, 31, 0, 0, "Actuator name");
+						uiButSetFunc(but, make_unique_prop_names_cb, act->name, (void*) 0);
 
-					ycoo= yco;
-					yco= draw_actuatorbuttons(act, block, xco, yco, width);
-					if(yco-6 < ycoo) ycoo= (yco+ycoo-20)/2;
+						ycoo= yco;
+						yco= draw_actuatorbuttons(ob, act, block, xco, yco, width);
+						if(yco-6 < ycoo) ycoo= (yco+ycoo-20)/2;
+					}
+					else {
+						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, 100, 19, act, 0, 0, 0, 0, "Actuator type");
+						uiButSetFunc(but, sca_move_actuator, act, NULL);
+						but= uiDefBut(block, LABEL, 0, act->name, (short)(xco+122), yco, (short)(width-144), 19, act, 0, 0, 0, 0, "Actuator name");
+						uiButSetFunc(but, sca_move_actuator, act, NULL);
+						ycoo= yco;
+					}
+
+					uiDefIconBut(block, INLINK, 0, ICON_INLINK,(short)(xco-19), ycoo, 19, 19, act, LINK_ACTUATOR, 0, 0, 0, "");
+
+					yco-=20;
 				}
-				else {
-					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, 100, 19, act, 0, 0, 0, 0, "Actuator type");
-					uiButSetFunc(but, sca_move_actuator, act, NULL);
-					but= uiDefBut(block, LABEL, 0, act->name, (short)(xco+122), yco, (short)(width-144), 19, act, 0, 0, 0, 0, "Actuator name");
-					uiButSetFunc(but, sca_move_actuator, act, NULL);
-					ycoo= yco;
-				}
-
-				uiDefIconBut(block, INLINK, 0, ICON_INLINK,(short)(xco-19), ycoo, 19, 19, act, LINK_ACTUATOR, 0, 0, 0, "");
-
-				yco-=20;
-
 				act= act->next;
 			}
 			yco-= 6;
diff --git a/source/blender/src/buttons_object.c b/source/blender/src/buttons_object.c
index 52261f7d3fb..ebe770c89e7 100644
--- a/source/blender/src/buttons_object.c
+++ b/source/blender/src/buttons_object.c
@@ -4812,7 +4812,7 @@ static void object_panel_particle_system(Object *ob)
 	uiDefBut(block, LABEL, 0, "Basic:",					butx,(buty-=buth),butw,buth, NULL, 0.0, 0, 0, 0, "");
 	uiBlockBeginAlign(block);
 
-	if(part->distr==PART_DISTR_GRID)
+	if(part->distr==PART_DISTR_GRID && part->from != PART_FROM_VERT)
 		uiDefButI(block, NUM, B_PART_ALLOC, "Resol:",		butx,(buty-=buth),butw,buth, &part->grid_res, 1.0, 100.0, 0, 0, "The resolution of the particle grid");
 	else
 		uiDefButI(block, NUM, B_PART_ALLOC, "Amount:",		butx,(buty-=buth),butw,buth, &part->totpart, 0.0, 100000.0, 0, 0, "The total number of particles");
@@ -4832,7 +4832,7 @@ static void object_panel_particle_system(Object *ob)
 		uiDefButS(block, NUM, B_PART_RECALC, "Segments:",	butx,(buty-=buth),butw,buth, &part->hair_step, 2.0, 50.0, 0, 0, "Amount of hair segments");
 	}
 	else {
-		uiDefButF(block, NUM, B_PART_INIT, "Sta:",		butx,(buty-=buth),butw,buth, &part->sta, 1.0, part->end, 100, 1, "Frame # to start emitting particles");
+		uiDefButF(block, NUM, B_PART_INIT, "Sta:",		butx,(buty-=buth),butw,buth, &part->sta, -MAXFRAMEF, part->end, 100, 1, "Frame # to start emitting particles");
 		uiDefButF(block, NUM, B_PART_INIT, "End:",		butx,(buty-=buth),butw,buth, &part->end, part->sta, MAXFRAMEF, 100, 1, "Frame # to stop emitting particles");
 	}
 
diff --git a/source/blender/src/buttons_scene.c b/source/blender/src/buttons_scene.c
index 3797a92f16f..3b0167d673c 100644
--- a/source/blender/src/buttons_scene.c
+++ b/source/blender/src/buttons_scene.c
@@ -137,36 +137,42 @@ static void load_new_sample(char *str)	/* called from fileselect */
 	bSample *sample, *newsample;
 
 	sound = G.buts->lockpoin;
-
-	if (sound) {
-		// save values
-		sample = sound->sample;
-		strcpy(name, sound->sample->name);
-
-		strcpy(sound->name, str);
-		sound_set_sample(sound, NULL);
-		sound_initialize_sample(sound);
-
-		if (sound->sample->type == SAMPLE_INVALID) {
-			error("Not a valid sample: %s", str);
-
-			newsample = sound->sample;
-
-			// restore values
-			strcpy(sound->name, name);
-			sound_set_sample(sound, sample);
-
-			// remove invalid sample
-
-			sound_free_sample(newsample);
-			BLI_remlink(samples, newsample);
-			MEM_freeN(newsample);
-		}
+	
+	/* No Sound or Selected the same sample as we alredy have, just ignore */
+	if (sound==NULL || str==sound->name)
+		return;
+		
+	if (sizeof(sound->sample->name) < strlen(str)) {
+		error("Path too long: %s", str);
+		return;
 	}
+		
+	// save values
+	sample = sound->sample;
+	strcpy(name, sound->sample->name);	
+	strcpy(sound->name, str);
+	sound_set_sample(sound, NULL);
+	sound_initialize_sample(sound);
 
+	if (sound->sample->type == SAMPLE_INVALID) {
+		error("Not a valid sample: %s", str);
+
+		newsample = sound->sample;
+
+		// restore values
+		strcpy(sound->name, name);
+		sound_set_sample(sound, sample);
+
+		// remove invalid sample
+
+		sound_free_sample(newsample);
+		BLI_remlink(samples, newsample);
+		MEM_freeN(newsample);
+		return;
+	}
+	
 	BIF_undo_push("Load new audio file");
 	allqueue(REDRAWBUTSSCENE, 0);
-
 }
 
 
@@ -403,7 +409,7 @@ static void sound_panel_sound(bSound *sound)
 		sample = sound->sample;
 
 		/* info string */
-		if (sound->sample && sound->sample->len) {
+		if (sound->sample && sound->sample->len && sound->sample->channels && sound->sample->bits) {
 			char *tmp;
 			if (sound->sample->channels == 1) tmp= "Mono";
 			else if (sound->sample->channels == 2) tmp= "Stereo";
@@ -499,7 +505,7 @@ static char* seq_panel_blend_modes()
 	  so that would collide also.
 	*/
 
-	if (!(last_seq->type & SEQ_EFFECT)) {
+	if ( seq_can_blend(last_seq) ) {
 		int i;
 
 		for (i = SEQ_EFFECT; i <= SEQ_EFFECT_MAX; i++) {
@@ -900,7 +906,7 @@ static void seq_panel_filter_video()
 		     "Convert input to float data");
 
 	uiDefButBitI(block, TOG, SEQ_FILTERY, 
-		     B_SEQ_BUT_RELOAD, "FilterY",	
+		     B_SEQ_BUT_RELOAD_FILE, "De-Inter",	
 		     170,110,80,19, &last_seq->flag, 
 		     0.0, 21.0, 100, 0, 
 		     "For video movies to remove fields");
@@ -1174,18 +1180,18 @@ static void seq_panel_proxy()
 			     130,140,120,19, &last_seq->flag, 
 			     0.0, 21.0, 100, 0, 
 			     "Use a custom directory to store data");
-	}
 
-	if (last_seq->flag & SEQ_USE_PROXY_CUSTOM_DIR) {
-		uiDefIconBut(block, BUT, B_SEQ_SEL_PROXY_DIR, 
-			     ICON_FILESEL, 10, 120, 20, 20, 0, 0, 0, 0, 0, 
-			     "Select the directory/name for "
-			     "the proxy storage");
+		if (last_seq->flag & SEQ_USE_PROXY_CUSTOM_DIR) {
+			uiDefIconBut(block, BUT, B_SEQ_SEL_PROXY_DIR, 
+				     ICON_FILESEL, 10, 120, 20, 20, 0, 0, 0, 0, 0, 
+				     "Select the directory/name for "
+				     "the proxy storage");
 
-		uiDefBut(block, TEX, 
-			 B_SEQ_BUT_RELOAD, "Dir: ", 
-			 30,120,220,20, last_seq->strip->proxy->dir, 
-			 0.0, 160.0, 100, 0, "");
+			uiDefBut(block, TEX, 
+				 B_SEQ_BUT_RELOAD, "Dir: ", 
+				 30,120,220,20, last_seq->strip->proxy->dir, 
+				 0.0, 160.0, 100, 0, "");
+		}
 	}
 
 	if (last_seq->flag & SEQ_USE_PROXY) {
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index 04a497ffdea..1b580381ca5 100644
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -2803,6 +2803,42 @@ static void lamp_panel_yafray(Object *ob, Lamp *la)
 
 }
 
+static void lamp_panel_atmosphere(Object *ob, Lamp *la)
+{
+	uiBlock *block;
+	int y;
+	block= uiNewBlock(&curarea->uiblocks, "lamp_panel_atm", UI_EMBOSS, UI_HELV, curarea->win);
+	uiNewPanelTabbed("Shadow and Spot", "Lamp");
+	if(uiNewPanel(curarea, block, "Sky/Atmosphere", "Lamp", 3*PANELX, PANELY, PANELW, PANELH)==0) return;
+
+	uiSetButLock(la->id.lib!=0, ERROR_LIBDATA_MESSAGE);
+	
+	uiDefButBitS(block, TOG, LA_SUN_EFFECT_SKY, REDRAWVIEW3D, "Sky", 10,205,BUTW2,20,&(la->sun_effect_type), 0, 0, 0, 0, "Apply sun light effect on sky.");
+	uiDefButBitS(block, TOG, LA_SUN_EFFECT_AP, REDRAWVIEW3D, "Atmosphere", 20+BUTW2,205,BUTW2,20,&(la->sun_effect_type), 0, 0, 0, 0, "Apply sun light effect on atmosphere.");
+
+	if(la->sun_effect_type & (LA_SUN_EFFECT_SKY|LA_SUN_EFFECT_AP)){
+		uiDefButF(block, NUM, B_LAMPREDRAW, "Turbidity:",10,180,BUTW1,19, &(la->atm_turbidity), 1.000f, 30.0f, 1, 0, "Sky Turbidity");
+	}
+
+	y = 180;
+	if(la->sun_effect_type & LA_SUN_EFFECT_SKY)
+	{
+		uiDefButF(block, NUM, B_LAMPREDRAW, "Hor.Bright:",10,y-25,BUTW2,19, &(la->horizon_brightness), 0.00f, 20.00f, 10, 0, "Sets horizon brightness.");
+		uiDefButF(block, NUM, B_LAMPREDRAW, "Hor.Spread:",10,y-50,BUTW2,19, &(la->spread), 0.00f, 10.00f, 10, 0, "Sets horizon spread.");
+		uiDefButF(block, NUM, B_LAMPREDRAW, "Sun Bright:",10,y-75,BUTW2,19, &(la->sun_brightness), 0.00f, 10.0f, 10, 0, "Sets sun brightness.");
+		uiDefButF(block, NUM, B_LAMPREDRAW, "Sun Size:",10,y-100,BUTW2,19, &(la->sun_size), 0.00f, 10.00f, 10, 0, "Sets sun size.");
+		uiDefButF(block, NUM, B_LAMPREDRAW, "Back Light:",10,y-125,BUTW2,19, &(la->backscattered_light), -1.00f, 1.00f, 10, 0, "Sets backscatter light.");
+	}
+
+	if(la->sun_effect_type & LA_SUN_EFFECT_AP)
+	{
+		uiDefButF(block, NUM, B_LAMPREDRAW, "Sun Intens.:",20+BUTW2,y-25,BUTW2,19, &(la->sun_intensity), 0.00f, 10.00f, 10, 0, "Sets sun intensity.");
+		uiDefButF(block, NUM, B_LAMPREDRAW, "Inscattering:",20+BUTW2,y-50,BUTW2,19, &(la->atm_inscattering_factor), 0.00f, 1.00f, 10, 0, "In Scattering Contribution Factor.");
+		uiDefButF(block, NUM, B_LAMPREDRAW, "Extinction:",20+BUTW2,y-75,BUTW2,19, &(la->atm_extinction_factor), 0.00f, 1.00f, 10, 0, "Extinction Scattering Contribution Factor.");
+		uiDefButF(block, NUM, B_LAMPREDRAW, "Distance:",20+BUTW2,y-100,BUTW2,19, &(la->atm_distance_factor), 0.000f, 500.0f, 10, 0, "Scale blender distance to real distance.");
+	}
+}
+
 static void lamp_panel_falloff(Object *ob, Lamp *la)
 {
 	uiBlock *block;
@@ -2864,15 +2900,15 @@ static void lamp_panel_lamp(Object *ob, Lamp *la)
 		uiBlockSetCol(block, TH_BUT_SETTING1);
 		uiDefButS(block, MENU, B_LAMPREDRAW,  "Falloff %t|Constant %x0|Inverse Linear %x1|Inverse Square %x2|Custom Curve %x3|Lin/Quad Weighted %x4|",
 			10,150,100,19, &la->falloff_type, 0,0,0,0, "Lamp falloff - intensity decay with distance");	
-		uiDefButBitS(block, TOG, LA_SPHERE, REDRAWVIEW3D,"Sphere",	10,130,100,19,&la->mode, 0, 0, 0, 0, "Sets light intensity to zero for objects beyond the distance value");
+		uiDefButBitS(block, TOG, LA_SPHERE, B_LAMPPRV,"Sphere",	10,130,100,19,&la->mode, 0, 0, 0, 0, "Sets light intensity to zero for objects beyond the distance value");
 	}
 
 	uiBlockBeginAlign(block);
 	uiBlockSetCol(block, TH_BUT_SETTING1);
 	uiDefButBitS(block, TOG, LA_LAYER, 0,"Layer",				10,70,100,19,&la->mode, 0, 0, 0, 0, "Illuminates objects in the same layer as the lamp only");
 	uiDefButBitS(block, TOG, LA_NEG, B_LAMPPRV,"Negative",	10,50,100,19,&la->mode, 0, 0, 0, 0, "Sets lamp to cast negative light");
-	uiDefButBitS(block, TOG, LA_NO_DIFF, 0,"No Diffuse",		10,30,100,19,&la->mode, 0, 0, 0, 0, "Disables diffuse shading of material illuminated by this lamp");
-	uiDefButBitS(block, TOG, LA_NO_SPEC, 0,"No Specular",		10,10,100,19,&la->mode, 0, 0, 0, 0, "Disables specular shading of material illuminated by this lamp");
+	uiDefButBitS(block, TOG, LA_NO_DIFF, B_LAMPPRV,"No Diffuse",		10,30,100,19,&la->mode, 0, 0, 0, 0, "Disables diffuse shading of material illuminated by this lamp");
+	uiDefButBitS(block, TOG, LA_NO_SPEC, B_LAMPPRV,"No Specular",		10,10,100,19,&la->mode, 0, 0, 0, 0, "Disables specular shading of material illuminated by this lamp");
 	uiBlockEndAlign(block);
 
 	uiBlockSetCol(block, TH_AUTO);
@@ -4354,6 +4390,11 @@ void lamp_panels()
 		/* spherelight radius default is zero, so nothing to do */
 		lamp_panel_yafray(ob, la);
 	}
+	
+	if(la->type == LA_SUN){
+		lamp_panel_atmosphere(ob, ob->data);
+	}
+
 	lamp_panel_texture(ob, ob->data);
 	lamp_panel_mapto(ob, ob->data);
 
diff --git a/source/blender/src/drawaction.c b/source/blender/src/drawaction.c
index 65221dceaf9..6fe37c1c6e5 100644
--- a/source/blender/src/drawaction.c
+++ b/source/blender/src/drawaction.c
@@ -32,6 +32,7 @@
 
 #include <math.h>
 #include <stdlib.h>
+#include <string.h>
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -56,6 +57,7 @@
 #include "DNA_space_types.h"
 #include "DNA_constraint_types.h"
 #include "DNA_key_types.h"
+#include "DNA_userdef_types.h"
 
 #include "BKE_action.h"
 #include "BKE_depsgraph.h"
@@ -474,10 +476,13 @@ static void draw_channel_names(void)
 					indent= 0;
 					special= -1;
 					
-					if (EXPANDED_AGRP(agrp))
-						expand = ICON_TRIA_DOWN;
-					else
-						expand = ICON_TRIA_RIGHT;
+					/* only show expand if there are any channels */
+					if (agrp->channels.first) {
+						if (EXPANDED_AGRP(agrp))
+							expand = ICON_TRIA_DOWN;
+						else
+							expand = ICON_TRIA_RIGHT;
+					}
 						
 					if (EDITABLE_AGRP(agrp))
 						protect = ICON_UNLOCKED;
@@ -730,7 +735,7 @@ void check_action_context(SpaceAction *saction)
 		
 		for (achan=saction->action->chanbase.first; achan; achan=achan->next) {
 			pchan= get_pose_channel(ob->pose, achan->name);
-			if (pchan) {
+			if (pchan && pchan->bone) {
 				if ((pchan->bone->layer & arm->layer)==0)
 					achan->flag |= ACHAN_HIDDEN;
 				else if (pchan->bone->flag & BONE_HIDDEN_P)
@@ -925,12 +930,55 @@ static void draw_channel_strips(void)
 void do_actionbuts(unsigned short event)
 {
 	switch(event) {
+		/* general */
 	case REDRAWVIEW3D:
 		allqueue(REDRAWVIEW3D, 0);
 		break;
 	case B_REDR:
 		allqueue(REDRAWACTION, 0);
 		break;
+		
+		/* action-groups */
+	case B_ACTCUSTCOLORS:	/* only when of the color wells is edited */
+	{
+		bActionGroup *agrp= get_active_actiongroup(G.saction->action);
+		
+		if (agrp)
+			agrp->customCol= -1;
+			
+		allqueue(REDRAWACTION, 0);
+	}
+		break;
+	case B_ACTCOLSSELECTOR: /* sync color set after using selector */
+	{
+		bActionGroup *agrp= get_active_actiongroup(G.saction->action);
+		
+		if (agrp) 
+			actionbone_group_copycolors(agrp, 1);
+			
+		allqueue(REDRAWACTION, 0);
+	}
+		break;
+	case B_ACTGRP_SELALL: /* select all grouped channels */
+	{
+		bAction *act= G.saction->action;
+		bActionGroup *agrp= get_active_actiongroup(act);
+		
+		/* select all in group, then reselect/activate group as the previous operation clears that */
+		select_action_group_channels(act, agrp);
+		agrp->flag |= (AGRP_ACTIVE|AGRP_SELECTED);
+		
+		allqueue(REDRAWACTION, 0);
+	}
+		break;
+	case B_ACTGRP_ADDTOSELF: /* add all selected action channels to self */
+		action_groups_group(0);
+		break;
+	case B_ACTGRP_UNGROUP: /* remove channels from active group */
+		// FIXME: todo...
+		printf("FIXME: remove achans from active Action-Group not implemented yet! \n");
+		break;
+	
 	}
 }
 
@@ -938,14 +986,68 @@ void do_actionbuts(unsigned short event)
 static void action_panel_properties(short cntrl)	// ACTION_HANDLER_PROPERTIES
 {
 	uiBlock *block;
-
+	void *data;
+	short datatype;
+	
 	block= uiNewBlock(&curarea->uiblocks, "action_panel_properties", UI_EMBOSS, UI_HELV, curarea->win);
 	uiPanelControl(UI_PNL_SOLID | UI_PNL_CLOSE | cntrl);
 	uiSetPanelHandler(ACTION_HANDLER_PROPERTIES);  // for close and esc
-	if (uiNewPanel(curarea, block, "Transform Properties", "Action", 10, 230, 318, 204)==0) 
+	
+	/* get datatype */
+	data= get_action_context(&datatype);
+	//if (data == NULL) return;
+	
+	if (uiNewPanel(curarea, block, "Active Channel Properties", "Action", 10, 230, 318, 204)==0) 
 		return;
-
-	uiDefBut(block, LABEL, 0, "test text",		10,180,300,19, 0, 0, 0, 0, 0, "");
+	
+	/* currently, only show data for actions */
+	if (datatype == ACTCONT_ACTION) {
+		bActionGroup *agrp= get_active_actiongroup(data);
+		//bActionChannel *achan= get_hilighted_action_channel(data);
+		char *menustr;
+		
+		/* only for action-groups */
+		if (agrp) {
+			/* general stuff */
+			uiDefBut(block, LABEL, 1, "Action Group:",					10, 180, 150, 19, NULL, 0.0, 0.0, 0, 0, "");
+			
+			uiDefBut(block, TEX, B_REDR, "Name: ",	10,160,150,20, agrp->name, 0.0, 31.0, 0, 0, "");
+			uiBlockBeginAlign(block);
+				uiDefButBitI(block, TOG, AGRP_EXPANDED, B_REDR, "Expanded", 170, 160, 75, 20, &agrp->flag, 0, 0, 0, 0, "Action Group is expanded");
+				uiDefButBitI(block, TOG, AGRP_PROTECTED, B_REDR, "Protected", 245, 160, 75, 20, &agrp->flag, 0, 0, 0, 0, "Action Group is protected");
+			uiBlockEndAlign(block);
+			
+			/* color stuff */
+			uiDefBut(block, LABEL, 1, "Group Colors:",	10, 107, 150, 19, NULL, 0.0, 0.0, 0, 0, "");
+			uiBlockBeginAlign(block);
+				menustr= BIF_ThemeColorSetsPup(1);
+				uiDefButI(block, MENU,B_ACTCOLSSELECTOR, menustr, 10,85,150,19, &agrp->customCol, -1, 20, 0.0, 0.0, "Index of set of Custom Colors to shade Group's bones with. 0 = Use Default Color Scheme, -1 = Use Custom Color Scheme");						
+				MEM_freeN(menustr);
+				
+				/* show color-selection/preview */
+				if (agrp->customCol) {
+					/* do color copying/init (to stay up to date) */
+					actionbone_group_copycolors(agrp, 1);
+					
+					/* color changing */
+					uiDefButC(block, COL, B_ACTCUSTCOLORS, "",		10, 65, 50, 19, agrp->cs.active, 0, 0, 0, 0, "Color to use for 'top-level' channels");
+					uiDefButC(block, COL, B_ACTCUSTCOLORS, "",		60, 65, 50, 19, agrp->cs.select, 0, 0, 0, 0, "Color to use for '2nd-level' channels");
+					uiDefButC(block, COL, B_ACTCUSTCOLORS, "",		110, 65, 50, 19, agrp->cs.solid, 0, 0, 0, 0, "Color to use for '3rd-level' channels");
+				}
+			uiBlockEndAlign(block);
+			
+			/* commands for active group */
+			uiDefBut(block, BUT, B_ACTGRP_SELALL, "Select Grouped",	170,85,150,20, 0, 21, 0, 0, 0, "Select all action-channels belonging to this group (same as doing Ctrl-Shift-LMB)");
+			
+			uiBlockBeginAlign(block);
+				uiDefBut(block, BUT, B_ACTGRP_ADDTOSELF, "Add to Group",	170,60,150,20, 0, 21, 0, 0, 0, "Add selected action-channels to this group");
+				uiDefBut(block, BUT, B_ACTGRP_UNGROUP, "Un-Group",	170,40,150,20, 0, 21, 0, 0, 0, "Remove selected action-channels from this group (unimplemented)");
+			uiBlockEndAlign(block);
+		}
+	}
+	else {
+		/* Currently, there isn't anything to display for these types ... */
+	}
 }
 
 static void action_blockhandlers(ScrArea *sa)
diff --git a/source/blender/src/drawarmature.c b/source/blender/src/drawarmature.c
index 73915a69139..6d78b21dfbb 100644
--- a/source/blender/src/drawarmature.c
+++ b/source/blender/src/drawarmature.c
@@ -2500,7 +2500,7 @@ static void draw_ghost_poses(Base *base)
 /* ********************************** Armature Drawing - Main ************************* */
 
 /* called from drawobject.c, return 1 if nothing was drawn */
-int draw_armature(Base *base, int dt)
+int draw_armature(Base *base, int dt, int flag)
 {
 	Object *ob= base->object;
 	bArmature *arm= ob->data;
@@ -2544,15 +2544,16 @@ int draw_armature(Base *base, int dt)
 						if (arm->ghostep)
 							draw_ghost_poses(base);
 					}
+					if ((flag & DRAW_SCENESET)==0) {
+						if(ob==OBACT) 
+							arm->flag |= ARM_POSEMODE;
+						else if(G.f & G_WEIGHTPAINT)
+							arm->flag |= ARM_POSEMODE;
 					
-					if(ob==OBACT) 
-						arm->flag |= ARM_POSEMODE;
-					else if(G.f & G_WEIGHTPAINT)
-						arm->flag |= ARM_POSEMODE;
-					
-					draw_pose_paths(ob);
+						draw_pose_paths(ob);
+					}
 				}	
-			}			
+			}
 			draw_pose_channels(base, dt);
 			arm->flag &= ~ARM_POSEMODE; 
 			
diff --git a/source/blender/src/drawimage.c b/source/blender/src/drawimage.c
index 547de85e856..14849cdd450 100644
--- a/source/blender/src/drawimage.c
+++ b/source/blender/src/drawimage.c
@@ -422,7 +422,7 @@ int draw_uvs_face_check(void)
 			return 1;
 		} 
 	} else {
-		if (G.sima->flag & SI_SELACTFACE) {
+		if (G.sima->selectmode == SI_SELECT_FACE) {
 			return 1;
 		}
 	}
diff --git a/source/blender/src/drawmesh.c b/source/blender/src/drawmesh.c
index b72cd3f56f8..dd512595ebc 100644
--- a/source/blender/src/drawmesh.c
+++ b/source/blender/src/drawmesh.c
@@ -228,13 +228,14 @@ int set_tpage(MTFace *tface)
 		alphamode= tface->transp;
 
 		if(alphamode) {
-			glEnable(GL_BLEND);
-			
 			if(alphamode==TF_ADD) {
+				glEnable(GL_BLEND);
 				glBlendFunc(GL_ONE, GL_ONE);
+				glDisable ( GL_ALPHA_TEST );
 			/* 	glBlendEquationEXT(GL_FUNC_ADD_EXT); */
 			}
 			else if(alphamode==TF_ALPHA) {
+				glEnable(GL_BLEND);
 				glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 				
 				/* added after 2.45 to clip alpha */
@@ -245,9 +246,12 @@ int set_tpage(MTFace *tface)
 					glEnable ( GL_ALPHA_TEST );
 					glAlphaFunc ( GL_GREATER, U.glalphaclip );
 				}
-				
-			/* 	glBlendEquationEXT(GL_FUNC_ADD_EXT); */
+			} else if (alphamode==TF_CLIP){		
+				glDisable(GL_BLEND); 
+				glEnable ( GL_ALPHA_TEST );
+				glAlphaFunc(GL_GREATER, 0.5f);
 			}
+			/* 	glBlendEquationEXT(GL_FUNC_ADD_EXT); */
 			/* else { */
 			/* 	glBlendFunc(GL_ONE, GL_ONE); */
 			/* 	glBlendEquationEXT(GL_FUNC_REVERSE_SUBTRACT_EXT); */
diff --git a/source/blender/src/drawnode.c b/source/blender/src/drawnode.c
index cea33685744..1169062fdd0 100644
--- a/source/blender/src/drawnode.c
+++ b/source/blender/src/drawnode.c
@@ -517,7 +517,7 @@ static int node_buts_math(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *b
 	if(block) { 
 		uiBut *bt; 
 
-		bt=uiDefButS(block, MENU, B_NODE_EXEC,  "Add %x0|Subtract %x1|Multiply %x2|Divide %x3|Sine %x4|Cosine %x5|Tangent %x6|Arcsine %x7|Arccosine %x8|Arctangent %x9|Power %x10|Logarithm %x11|Minimum %x12|Maximum %x13|Round %x14", butr->xmin, butr->ymin, butr->xmax-butr->xmin, 20, &node->custom1, 0, 0, 0, 0, ""); 
+		bt=uiDefButS(block, MENU, B_NODE_EXEC,  "Add %x0|Subtract %x1|Multiply %x2|Divide %x3|Sine %x4|Cosine %x5|Tangent %x6|Arcsine %x7|Arccosine %x8|Arctangent %x9|Power %x10|Logarithm %x11|Minimum %x12|Maximum %x13|Round %x14|Less Than %x15|Greater Than %x16", butr->xmin, butr->ymin, butr->xmax-butr->xmin, 20, &node->custom1, 0, 0, 0, 0, ""); 
 		uiButSetFunc(bt, node_but_title_cb, node, bt); 
 	} 
 	return 20; 
diff --git a/source/blender/src/drawobject.c b/source/blender/src/drawobject.c
index 96ba8c71755..045bf292446 100644
--- a/source/blender/src/drawobject.c
+++ b/source/blender/src/drawobject.c
@@ -4620,7 +4620,7 @@ static void drawSolidSelect(Base *base)
 	}
 	else if(ob->type==OB_ARMATURE) {
 		if(!(ob->flag & OB_POSEMODE)) {
-			draw_armature(base, OB_WIRE);
+			draw_armature(base, OB_WIRE, 0);
 		}
 	}
 
@@ -4741,7 +4741,7 @@ void drawRBpivot(bRigidBodyJointConstraint *data){
 	setlinestyle(0);
 }
 
-/* flag can be DRAW_PICKING	and/or DRAW_CONSTCOLOR */
+/* flag can be DRAW_PICKING	and/or DRAW_CONSTCOLOR, DRAW_SCENESET */
 void draw_object(Base *base, int flag)
 {
 	static int warning_recursive= 0;
@@ -4943,7 +4943,7 @@ void draw_object(Base *base, int flag)
 
 	/* draw outline for selected solid objects, mesh does itself */
 	if((G.vd->flag & V3D_SELECT_OUTLINE) && ob->type!=OB_MESH) {
-		if(dt>OB_WIRE && dt<OB_TEXTURE && ob!=G.obedit) {
+		if(dt>OB_WIRE && dt<OB_TEXTURE && ob!=G.obedit && (flag && DRAW_SCENESET)==0) {
 			if (!(ob->dtx&OB_DRAWWIRE) && (ob->flag&SELECT) && !(flag&DRAW_PICKING)) {
 				drawSolidSelect(base);
 			}
@@ -5090,7 +5090,7 @@ void draw_object(Base *base, int flag)
 			break;
 		case OB_ARMATURE:
 			if(dt>OB_WIRE) set_gl_material(0);	// we use defmaterial
-			empty_object= draw_armature(base, dt);
+			empty_object= draw_armature(base, dt, flag);
 			break;
 		default:
 			drawaxes(1.0, flag, OB_ARROWS);
diff --git a/source/blender/src/drawoops.c b/source/blender/src/drawoops.c
index 5da38135be3..75bea40a8b4 100644
--- a/source/blender/src/drawoops.c
+++ b/source/blender/src/drawoops.c
@@ -229,6 +229,8 @@ void draw_icon_oops(float *co, short type)
 	case ID_LI:	icon= ICON_LIBRARY_HLT; break;
 	case ID_IM:	icon= ICON_IMAGE_HLT; break;
 	case ID_GR:	icon= ICON_CIRCLE_DEHLT; break;
+	case ID_CA:	icon= ICON_CAMERA_DEHLT; break;
+	case ID_AR:	icon= ICON_ARMATURE; break;
 	}
 
 	glEnable(GL_BLEND);
@@ -282,6 +284,12 @@ unsigned int give_oops_color(short type, short sel, unsigned int *border)
 		body= 0x35659F; break;
 	case ID_GR:
 		body= 0x507050; break;
+	case ID_CA:
+		body= 0x7570A0; break;
+	case ID_LT:
+		body= 0xA08090; break;
+	case ID_AR:
+		body= 0x70B0C0; break;
 	default:
 		body= 0x606070; break;
 	}
@@ -516,3 +524,4 @@ void drawoopsspace(ScrArea *sa, void *spacedata)
 
 
 
+
diff --git a/source/blender/src/drawview.c b/source/blender/src/drawview.c
index deb7ddc068d..f595a101f63 100644
--- a/source/blender/src/drawview.c
+++ b/source/blender/src/drawview.c
@@ -246,7 +246,8 @@ void default_gl_light(void)
 	glDisable(GL_COLOR_MATERIAL);
 }
 
-/* also called when render 'ogl' */
+/* also called when render 'ogl'
+   keep synced with Myinit_gl_stuff in the game engine! */
 void init_gl_stuff(void)	
 {
 	float mat_ambient[] = { 0.0, 0.0, 0.0, 0.0 };
@@ -3096,7 +3097,7 @@ void drawview3dspace(ScrArea *sa, void *spacedata)
 			if(v3d->lay & base->lay) {
 				
 				BIF_ThemeColorBlend(TH_WIRE, TH_BACK, 0.6f);
-				draw_object(base, DRAW_CONSTCOLOR);
+				draw_object(base, DRAW_CONSTCOLOR|DRAW_SCENESET);
 
 				if(base->object->transflag & OB_DUPLI) {
 					draw_dupli_objects_color(v3d, base, TH_WIRE);
@@ -3318,7 +3319,7 @@ void drawview3d_render(struct View3D *v3d, int winx, int winy, float winmat[][4]
 					where_is_object(base->object);
 	
 					BIF_ThemeColorBlend(TH_WIRE, TH_BACK, 0.6f);
-					draw_object(base, DRAW_CONSTCOLOR);
+					draw_object(base, DRAW_CONSTCOLOR|DRAW_SCENESET);
 	
 					if(base->object->transflag & OB_DUPLI) {
 						draw_dupli_objects(v3d, base);
diff --git a/source/blender/src/editaction.c b/source/blender/src/editaction.c
index 40b6b7ba6fe..4cc0e52ce3f 100644
--- a/source/blender/src/editaction.c
+++ b/source/blender/src/editaction.c
@@ -390,7 +390,7 @@ static void actdata_filter_actionchannel (ListBase *act_data, bActionChannel *ac
 
 static void actdata_filter_action (ListBase *act_data, bAction *act, int filter_mode)
 {
-	bActListElem *ale;
+	bActListElem *ale=NULL;
 	bActionGroup *agrp;
 	bActionChannel *achan, *lastchan=NULL;
 	
@@ -429,6 +429,15 @@ static void actdata_filter_action (ListBase *act_data, bAction *act, int filter_
 					for (achan= agrp->channels.first; achan && achan->grp==agrp; achan= achan->next) {
 						actdata_filter_actionchannel(act_data, achan, filter_mode);
 					}
+					
+					/* remove group from filtered list if last element is group 
+					 * (i.e. only if group had channels, which were all hidden)
+					 */
+					if ( (ale) && (act_data->last == ale) && 
+						 (ale->data == agrp) && (agrp->channels.first) ) 
+					{
+						BLI_freelinkN(act_data, ale);
+					}
 				}
 			}
 		}
@@ -1105,6 +1114,38 @@ void action_groups_ungroup (void)
 	allqueue(REDRAWACTION, 0);
 }
 
+/* Copy colors from a specified theme's color set to an Action/Bone Group */
+void actionbone_group_copycolors (bActionGroup *grp, short init_new)
+{
+	/* error checking */
+	if (grp == NULL)
+		return;
+	
+	/* only do color copying if using a custom color */
+	if (grp->customCol) {
+		if (grp->customCol > 0) {
+			/* copy theme colors on-to group's custom color in case user tries to edit color */
+			bTheme *btheme= U.themes.first;
+			ThemeWireColor *col_set= &btheme->tarm[(grp->customCol - 1)];
+			
+			memcpy(&grp->cs, col_set, sizeof(ThemeWireColor));
+		}
+		else if (init_new) {
+			/* init custom colors with a generic multi-color rgb set, if not initialised already (and allowed to do so) */
+			if (grp->cs.solid[0] == 0) {
+				/* define for setting colors in theme below */
+				#define SETCOL(col, r, g, b, a)  col[0]=r; col[1]=g; col[2]= b; col[3]= a;
+				
+				SETCOL(grp->cs.solid, 0xff, 0x00, 0x00, 255);
+				SETCOL(grp->cs.select, 0x81, 0xe6, 0x14, 255);
+				SETCOL(grp->cs.active, 0x18, 0xb6, 0xe0, 255);
+				
+				#undef SETCOL
+			}
+		}
+	}
+}
+
 /* This function is used when inserting keyframes for pose-channels. It assigns the
  * action-channel with the nominated name to a group with the same name as that of 
  * the pose-channel with the nominated name.
@@ -1151,34 +1192,9 @@ void verify_pchan2achan_grouping (bAction *act, bPose *pose, char name[])
 			/* copy name */
 			sprintf(grp->name, agrp->name);
 			
-			/* deal with group-color copying */
-			if (agrp->customCol) {
-				if (agrp->customCol > 0) {
-					/* copy theme colors on-to group's custom color in case user tries to edit color */
-					bTheme *btheme= U.themes.first;
-					ThemeWireColor *col_set= &btheme->tarm[(agrp->customCol - 1)];
-					
-					memcpy(&grp->cs, col_set, sizeof(ThemeWireColor));
-				}
-				else {
-					/* init custom colors with a generic multi-color rgb set, if not initialised already */
-					if (agrp->cs.solid[0] == 0) {
-						/* define for setting colors in theme below */
-						#define SETCOL(col, r, g, b, a)  col[0]=r; col[1]=g; col[2]= b; col[3]= a;
-						
-						SETCOL(grp->cs.solid, 0xff, 0x00, 0x00, 255);
-						SETCOL(grp->cs.select, 0x81, 0xe6, 0x14, 255);
-						SETCOL(grp->cs.active, 0x18, 0xb6, 0xe0, 255);
-						
-						#undef SETCOL
-					}
-					else {
-						/* just copy color set specified */
-						memcpy(&grp->cs, &agrp->cs, sizeof(ThemeWireColor));
-					}
-				}
-			}
-			grp->customCol= agrp->customCol;
+			/* deal with group-color copying (grp is destination, agrp is source) */
+			memcpy(grp, agrp, sizeof(bActionGroup));
+			actionbone_group_copycolors(grp, 1);
 			
 			BLI_addtail(&act->groups, grp);
 		}
@@ -2688,6 +2704,28 @@ int select_icu_channel(bAction *act, IpoCurve *icu, int selectmode)
 	return flag;
 }
 
+
+/* select only the active action-group's action channels */
+void select_action_group_channels (bAction *act, bActionGroup *agrp)
+{
+	bActionChannel *achan;
+	
+	/* error checking */
+	if (ELEM(NULL, act, agrp))
+		return;
+	
+	/* deselect all other channels */
+	deselect_actionchannels(act, 0);
+	
+	/* only select channels in group */
+	for (achan= agrp->channels.first; achan && achan->grp==agrp; achan= achan->next) {
+		select_channel(act, achan, SELECT_ADD);
+		
+		/* messy... set active bone */
+		select_poseelement_by_name(achan->name, 1);
+	}
+}
+
 /* ----------------------------------------- */
 
 /* De-selects or inverts the selection of Channels in a given Action 
@@ -3648,7 +3686,7 @@ static void mouse_actionchannels (short mval[])
 			{
 				bActionGroup *agrp= (bActionGroup *)act_channel;
 				
-				if (mval[0] < 16) {
+				if ((mval[0] < 16) && (agrp->channels.first)) {
 					/* toggle expand */
 					agrp->flag ^= AGRP_EXPANDED;
 				}
@@ -3663,17 +3701,8 @@ static void mouse_actionchannels (short mval[])
 						select_action_group(act, agrp, SELECT_INVERT);
 					}
 					else if (G.qual == (LR_CTRLKEY|LR_SHIFTKEY)) {
-						bActionChannel *achan;
-						
 						/* select all in group (and deselect everthing else) */	
-						deselect_actionchannels(act, 0);
-						
-						for (achan= agrp->channels.first; achan && achan->grp==agrp; achan= achan->next) {
-							select_channel(act, achan, SELECT_ADD);
-							
-							/* messy... set active bone */
-							select_poseelement_by_name(achan->name, 1);
-						}
+						select_action_group_channels(act, agrp);
 						select_action_group(act, agrp, SELECT_ADD);
 					}
 					else {
@@ -4673,11 +4702,13 @@ void winqreadactionspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			
 		case NKEY:
 			if (G.qual==0) {
-				numbuts_action();
-				
-				/* no panel (yet). current numbuts are not easy to put in panel... */
-				//add_blockhandler(curarea, ACTION_HANDLER_PROPERTIES, UI_PNL_TO_MOUSE);
-				//scrarea_queue_winredraw(curarea);
+				/* panel will not always show useful info! */
+				if (mval[0] > ACTWIDTH) {
+					add_blockhandler(curarea, ACTION_HANDLER_PROPERTIES, UI_PNL_TO_MOUSE);
+					scrarea_queue_winredraw(curarea);
+				}
+				else 
+					numbuts_action();
 			}
 			break;
 			
diff --git a/source/blender/src/editarmature.c b/source/blender/src/editarmature.c
index 39f93510358..6310dd0a262 100644
--- a/source/blender/src/editarmature.c
+++ b/source/blender/src/editarmature.c
@@ -1646,8 +1646,9 @@ void load_editArmature(void)
 }
 
 /* toggle==0: deselect
-   toggle==1: swap 
+   toggle==1: swap (based on test)
    toggle==2: only active tag
+   toggle==3: swap (no test)
 */
 void deselectall_armature(int toggle, int doundo)
 {
@@ -1670,18 +1671,30 @@ void deselectall_armature(int toggle, int doundo)
 	else sel= toggle;
 	
 	/*	Set the flags */
-	for (eBone=G.edbo.first;eBone;eBone=eBone->next){
-		if (sel==1) {
+	for (eBone=G.edbo.first;eBone;eBone=eBone->next) {
+		if (sel==3) {
+			/* invert selection of bone */
+			if ((arm->layer & eBone->layer) && (eBone->flag & BONE_HIDDEN_A)==0) {
+				eBone->flag ^= (BONE_SELECTED | BONE_TIPSEL | BONE_ROOTSEL);
+				eBone->flag &= ~BONE_ACTIVE;
+			}
+		}
+		else if (sel==1) {
+			/* select bone */
 			if(arm->layer & eBone->layer && (eBone->flag & BONE_HIDDEN_A)==0) {
 				eBone->flag |= (BONE_SELECTED | BONE_TIPSEL | BONE_ROOTSEL);
 				if(eBone->parent)
 					eBone->parent->flag |= (BONE_TIPSEL);
 			}
 		}
-		else if (sel==2)
+		else if (sel==2) {
+			/* clear active flag */
 			eBone->flag &= ~(BONE_ACTIVE);
-		else
+		}
+		else {
+			/* deselect bone */
 			eBone->flag &= ~(BONE_SELECTED | BONE_TIPSEL | BONE_ROOTSEL | BONE_ACTIVE);
+		}
 	}
 	
 	allqueue(REDRAWVIEW3D, 0);
@@ -3276,8 +3289,9 @@ int do_pose_selectbuffer(Base *base, unsigned int *buffer, short hits)
 }
 
 /* test==0: deselect all
-   test==1: swap select
-   test==2: only clear active tag 
+   test==1: swap select (apply to all the opposite of current situation) 
+   test==2: only clear active tag
+   test==3: swap select (no test / inverse selection status of all independently)
 */
 void deselectall_posearmature (Object *ob, int test, int doundo)
 {
@@ -3307,16 +3321,27 @@ void deselectall_posearmature (Object *ob, int test, int doundo)
 	/*	Set the flags accordingly	*/
 	for (pchan= ob->pose->chanbase.first; pchan; pchan= pchan->next) {
 		if ((pchan->bone->layer & arm->layer) && !(pchan->bone->flag & BONE_HIDDEN_P)) {
-			if (selectmode==0) pchan->bone->flag &= ~(BONE_SELECTED|BONE_TIPSEL|BONE_ROOTSEL|BONE_ACTIVE);
-			else if (selectmode==1) pchan->bone->flag |= BONE_SELECTED;
-			else pchan->bone->flag &= ~BONE_ACTIVE;
+			if (test==3) {
+				pchan->bone->flag ^= (BONE_SELECTED|BONE_TIPSEL|BONE_ROOTSEL);
+				pchan->bone->flag &= ~BONE_ACTIVE;
+			}
+			else {
+				if (selectmode==0) pchan->bone->flag &= ~(BONE_SELECTED|BONE_TIPSEL|BONE_ROOTSEL|BONE_ACTIVE);
+				else if (selectmode==1) pchan->bone->flag |= BONE_SELECTED;
+				else pchan->bone->flag &= ~BONE_ACTIVE;
+			}
 		}
 	}
 	
 	/* action editor */
-	deselect_actionchannels(ob->action, 0);	/* deselects for sure */
-	if (selectmode == 1)
-		deselect_actionchannels(ob->action, 1);	/* swaps */
+	if (test == 3) {
+		deselect_actionchannels(ob->action, 2); /* inverts selection */
+	}
+	else {
+		deselect_actionchannels(ob->action, 0);	/* deselects for sure */
+		if (selectmode == 1)
+			deselect_actionchannels(ob->action, 1);	/* swaps */
+	}
 	
 	allqueue(REDRAWBUTSEDIT, 0);
 	allqueue(REDRAWBUTSOBJECT, 0);
diff --git a/source/blender/src/editcurve.c b/source/blender/src/editcurve.c
index bd0abe83ee4..261bb26b0c4 100644
--- a/source/blender/src/editcurve.c
+++ b/source/blender/src/editcurve.c
@@ -1158,6 +1158,62 @@ void setradiusNurb( void )
 	allqueue(REDRAWINFO, 1); 	/* 1, because header->win==0! */
 }
 
+void smoothNurb( void )
+{
+
+	extern ListBase editNurb;
+	Nurb *nu;
+	BezTriple *bezt, *beztOrig;
+	BPoint *bp, *bpOrig;
+	int a, i, change = 0;
+	
+	/* floats for smoothing */
+	float val, newval, offset;
+	
+	for(nu= editNurb.first; nu; nu= nu->next) {
+		if(nu->bezt) {
+			change = 0;
+			beztOrig = MEM_dupallocN( nu->bezt );
+			for(bezt=nu->bezt+1, a=1; a<nu->pntsu-1; a++, bezt++) {
+				if(bezt->f2 & SELECT) {
+					for(i=0; i<3; i++) {
+						val = bezt->vec[1][i];
+						newval = ((beztOrig+(a-1))->vec[1][i] * 0.5) + ((beztOrig+(a+1))->vec[1][i] * 0.5);
+						offset = (val*((1.0/6.0)*5)) + (newval*(1.0/6.0)) - val;
+						/* offset handles */
+						bezt->vec[1][i] += offset;
+						bezt->vec[0][i] += offset;
+						bezt->vec[2][i] += offset;
+					}
+					change = 1;
+				}
+			}
+			MEM_freeN(beztOrig);
+			if (change)
+				calchandlesNurb(nu);
+		} else if (nu->bp) {
+			bpOrig = MEM_dupallocN( nu->bp );
+			/* Same as above, keep these the same! */
+			for(bp=nu->bp+1, a=1; a<nu->pntsu-1; a++, bp++) {
+				if(bp->f1 & SELECT) {
+					for(i=0; i<3; i++) {
+						val = bp->vec[i];
+						newval = ((bpOrig+(a-1))->vec[i] * 0.5) + ((bpOrig+(a+1))->vec[i] * 0.5);
+						offset = (val*((1.0/6.0)*5)) + (newval*(1.0/6.0)) - val;
+					
+						bp->vec[i] += offset;
+					}
+				}
+			}
+			MEM_freeN(bpOrig);
+		}
+	}
+	BIF_undo_push("Smooth Curve");
+	DAG_object_flush_update(G.scene, OBACT, OB_RECALC_DATA);
+	allqueue(REDRAWVIEW3D, 0);
+	allqueue(REDRAWBUTSALL, 0);
+	allqueue(REDRAWINFO, 1); 	/* 1, because header->win==0! */
+}
 
 /* TODO, make smoothing distance based */
 void smoothradiusNurb( void )
diff --git a/source/blender/src/editfont.c b/source/blender/src/editfont.c
index cb245867c89..a3b05a008c8 100644
--- a/source/blender/src/editfont.c
+++ b/source/blender/src/editfont.c
@@ -354,7 +354,7 @@ void txt_export_to_object(struct Text *text)
 //	char sdir[FILE_MAXDIR];
 //	char sfile[FILE_MAXFILE];
 
-	if(!text) return;
+	if(!text || !text->lines.first) return;
 
 	id = (ID *)text;
 
@@ -429,7 +429,7 @@ void txt_export_to_objects(struct Text *text)
 	int linenum = 0;
 	float offset[3] = {0.0,0.0,0.0};
 
-	if(!text) return;
+	if(!text || !text->lines.first) return;
 
 	id = (ID *)text;
 
diff --git a/source/blender/src/editmesh.c b/source/blender/src/editmesh.c
index 9eef61e11f9..188f7476728 100644
--- a/source/blender/src/editmesh.c
+++ b/source/blender/src/editmesh.c
@@ -340,8 +340,9 @@ void free_editface(EditFace *efa)
 #endif
 	EM_remove_selection(efa, EDITFACE);
 	
-	if (G.editMesh->act_face==efa)
-		EM_set_actFace(NULL);
+	if (G.editMesh->act_face==efa) {
+		EM_set_actFace( G.editMesh->faces.first == efa ? NULL : G.editMesh->faces.first);
+	}
 		
 	CustomData_em_free_block(&G.editMesh->fdata, &efa->data);
 	if(efa->fast==0)
@@ -1059,7 +1060,11 @@ void make_editMesh()
 	EM_hide_reset();
 	/* sets helper flags which arent saved */
 	EM_fgon_flags();
-
+	
+	if (EM_get_actFace(0)==NULL) {
+		EM_set_actFace( G.editMesh->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();
diff --git a/source/blender/src/editmesh_add.c b/source/blender/src/editmesh_add.c
index 952ae957f34..9516f39b05c 100644
--- a/source/blender/src/editmesh_add.c
+++ b/source/blender/src/editmesh_add.c
@@ -379,7 +379,7 @@ static EditFace *addface_from_edges(void)
 	
 	/* find the 4 edges */
 	for(eed= em->edges.first; eed; eed= eed->next) {
-		if(eed->f & SELECT) {
+		if( (eed->f & SELECT) || (eed->v1->f & eed->v2->f & SELECT) ) {
 			if(eedar[0]==NULL) eedar[0]= eed;
 			else if(eedar[1]==NULL) eedar[1]= eed;
 			else if(eedar[2]==NULL) eedar[2]= eed;
@@ -765,6 +765,7 @@ void addedgeface_mesh(void)
 				/* if 4 edges exist, we just create the face, convex or not */
 					efa= addface_from_edges();
 					if(efa==NULL) {
+						
 						/* the order of vertices can be anything, 6 cases to check */
 						if( convex(neweve[0]->co, neweve[1]->co, neweve[2]->co, neweve[3]->co) ) {
 							efa= addfacelist(neweve[0], neweve[1], neweve[2], neweve[3], NULL, NULL);
@@ -775,17 +776,16 @@ void addedgeface_mesh(void)
 						else if( convex(neweve[0]->co, neweve[2]->co, neweve[1]->co, neweve[3]->co) ) {
 							efa= addfacelist(neweve[0], neweve[2], neweve[1], neweve[3], NULL, NULL);
 						}
-						
-						else if( convex(neweve[1]->co, neweve[2]->co, neweve[3]->co, neweve[0]->co) ) {
-							efa= addfacelist(neweve[1], neweve[2], neweve[3], neweve[0], NULL, NULL);
+						else if( convex(neweve[0]->co, neweve[1]->co, neweve[3]->co, neweve[2]->co) ) {
+							efa= addfacelist(neweve[0], neweve[1], neweve[3], neweve[2], NULL, NULL);
 						}
-						else if( convex(neweve[1]->co, neweve[3]->co, neweve[0]->co, neweve[2]->co) ) {
-							efa= addfacelist(neweve[1], neweve[3], neweve[0], neweve[2], NULL, NULL);
+						else if( convex(neweve[0]->co, neweve[3]->co, neweve[2]->co, neweve[1]->co) ) {
+							efa= addfacelist(neweve[0], neweve[3], neweve[2], neweve[1], NULL, NULL);
 						}
-						else if( convex(neweve[1]->co, neweve[3]->co, neweve[2]->co, neweve[0]->co) ) {
-							efa= addfacelist(neweve[1], neweve[3], neweve[2], neweve[0], NULL, NULL);
+						else if( convex(neweve[0]->co, neweve[3]->co, neweve[1]->co, neweve[2]->co) ) {
+							efa= addfacelist(neweve[0], neweve[3], neweve[1], neweve[2], NULL, NULL);
 						}
-						else error("The selected vertices form a concave quad");
+						else printf("cannot find nice quad from concave set of vertices\n");
 					}
 				}
 			}
diff --git a/source/blender/src/editmesh_lib.c b/source/blender/src/editmesh_lib.c
index 6251ba1a650..4d9679b6b8a 100644
--- a/source/blender/src/editmesh_lib.c
+++ b/source/blender/src/editmesh_lib.c
@@ -2199,18 +2199,25 @@ UvVertMap *make_uv_vert_map_EM(int selected, int do_face_idx_array, float *limit
 		if(!selected || ((!efa->h) && (efa->f & SELECT)))
 			totuv += (efa->v4)? 4: 3;
 		
-	if(totuv==0)
+	if(totuv==0) {
+		if (do_face_idx_array)
+			EM_free_index_arrays();
 		return NULL;
-	
+	}
 	vmap= (UvVertMap*)MEM_callocN(sizeof(*vmap), "UvVertMap");
-	if (!vmap)
+	if (!vmap) {
+		if (do_face_idx_array)
+			EM_free_index_arrays();
 		return NULL;
+	}
 
 	vmap->vert= (UvMapVert**)MEM_callocN(sizeof(*vmap->vert)*totverts, "UvMapVert*");
 	buf= vmap->buf= (UvMapVert*)MEM_callocN(sizeof(*vmap->buf)*totuv, "UvMapVert");
 
 	if (!vmap->vert || !vmap->buf) {
 		free_uv_vert_map(vmap);
+		if (do_face_idx_array)
+			EM_free_index_arrays();
 		return NULL;
 	}
 
diff --git a/source/blender/src/editmesh_mods.c b/source/blender/src/editmesh_mods.c
index d5e34779173..c7a75b32df1 100644
--- a/source/blender/src/editmesh_mods.c
+++ b/source/blender/src/editmesh_mods.c
@@ -2307,7 +2307,7 @@ void selectconnected_mesh(void)
 	if(em->edges.first==0) return;
 	
 	if( unified_findnearest(&eve, &eed, &efa)==0 ) {
-		error("Nothing indicated ");
+		/* error("Nothing indicated "); */ /* this is mostly annoying, eps with occluded geometry */
 		return;
 	}
 	
@@ -2407,7 +2407,7 @@ static void selectconnected_delimit_mesh__internal(short all, short sel)
 		EditFace *efa_mouse = findnearestface(&dist);
 		
 		if( !efa_mouse ) {
-			error("Nothing indicated ");
+			/* error("Nothing indicated "); */ /* this is mostly annoying, eps with occluded geometry */
 			return;
 		}
 		
diff --git a/source/blender/src/editnla.c b/source/blender/src/editnla.c
index d758f34949a..dbc0deecb2c 100644
--- a/source/blender/src/editnla.c
+++ b/source/blender/src/editnla.c
@@ -501,26 +501,47 @@ static void set_active_strip(Object *ob, bActionStrip *act)
 {
 	bActionStrip *strip;
 	
+	/* make sure all other strips are not active */
 	for (strip = ob->nlastrips.first; strip; strip=strip->next)
 		strip->flag &= ~ACTSTRIP_ACTIVE;
 	
-	if(act) {
+	/* act is new active strip */
+	if (act) {
+		/* set active flag for this strip */
 		act->flag |= ACTSTRIP_ACTIVE;
-	
-		if(ob->action!=act->act) {
-			if(ob->action) ob->action->id.us--;
-			if(act->act->id.lib) {
+		
+		/* check if active action will still be the same one */
+		if (ob->action != act->act) {
+			/* clear object's links with its current action (if present) */
+			if (ob->action) {
+				ob->action->id.us--;
+			}
+			
+			/* only set object's action to active strip's action if possible */
+			if (act->act->id.lib) {
 				ob->action= NULL;
 			}
 			else {
 				ob->action= act->act;
 				id_us_plus(&ob->action->id);
-			}			
+			}	
+			
+			/* request redrawing in relevant spaces */
 			allqueue(REDRAWIPO, 0);
 			allqueue(REDRAWVIEW3D, 0);
 			allqueue(REDRAWACTION, 0);
 			allqueue(REDRAWNLA, 0);
-			ob->ctime= -1234567.0f;	// eveil! 
+			
+			/* when only showing action (i.e. nla-override off), 
+			 * reset pose to restpose for armatures 
+			 */
+			if ((ob->nlaflag & OB_NLA_OVERRIDE)==0) {
+				if (ob->type == OB_ARMATURE)
+					rest_pose(ob->pose);
+			}
+			
+			/* flush depsgraph */
+			ob->ctime= -1234567.0f;	// evil! 
 			DAG_object_flush_update(G.scene, ob, OB_RECALC_OB|OB_RECALC_DATA);
 		}
 	}	
diff --git a/source/blender/src/editobject.c b/source/blender/src/editobject.c
index 4029e031b63..6af4f47ed11 100644
--- a/source/blender/src/editobject.c
+++ b/source/blender/src/editobject.c
@@ -2735,7 +2735,7 @@ void special_editmenu(void)
 	}
 	else if ELEM(G.obedit->type, OB_CURVE, OB_SURF) {
 
-		nr= pupmenu("Specials%t|Subdivide%x1|Switch Direction%x2|Set Goal Weight %x3|Set Radius %x4|Smooth Radius %x5");
+		nr= pupmenu("Specials%t|Subdivide%x1|Switch Direction%x2|Set Goal Weight%x3|Set Radius%x4|Smooth%x5|Smooth Radius%x6");
 		
 		switch(nr) {
 		case 1:
@@ -2751,6 +2751,9 @@ void special_editmenu(void)
 			setradiusNurb();
 			break;
 		case 5:
+			smoothNurb();
+			break;
+		case 6:
 			smoothradiusNurb();
 			break;
 		}
@@ -5502,6 +5505,7 @@ void selectlinks(int nr)
 		allqueue(REDRAWDATASELECT, 0);
 		allqueue(REDRAWOOPS, 0);
 		BIF_undo_push("Select linked");
+		countall();
 	}
 }
 
@@ -5939,7 +5943,7 @@ void hide_objects(int select)
 	Base *base;
 	short changed = 0, changed_act = 0;
 	for(base = FIRSTBASE; base; base=base->next){
-		if(TESTBASELIB(base)==select){
+		if ((base->lay & G.vd->lay) && (TESTBASELIB(base)==select)) {
 			base->flag &= ~SELECT;
 			base->object->flag = base->flag;
 			base->object->restrictflag |= OB_RESTRICT_VIEW;
diff --git a/source/blender/src/editparticle.c b/source/blender/src/editparticle.c
index 95a4abe1f9d..f420d46c827 100644
--- a/source/blender/src/editparticle.c
+++ b/source/blender/src/editparticle.c
@@ -2273,9 +2273,9 @@ static void brush_add(Object *ob, ParticleSystem *psys, short *mval, short numbe
 	ParticleEditSettings *pset= PE_settings();
 	ParticleEdit *edit = psys->edit;
 	int i, k, n = 0, totpart = psys->totpart;
+	short mco[2];
 	short dmx = 0, dmy = 0;
-	short mx = mval[0] - curarea->winx / 2, my = mval[1] - curarea->winy / 2;
-	float co1[3], co2[3], vec[4], min_d, imat[4][4];
+	float co1[3], co2[3], min_d, imat[4][4];
 	float framestep, timestep = psys_get_timestep(psys->part);
 	short size = pset->brush[PE_BRUSH_ADD].size;
 	short size2 = size*size;
@@ -2302,35 +2302,9 @@ static void brush_add(Object *ob, ParticleSystem *psys, short *mval, short numbe
 			}
 		}
 
-		/* create intersection coordinates in view Z direction at mouse coordinates */
-		/* Thanks to who ever wrote the "Mouse Location 3D Space" tutorial in "Blender 3D: Blending Into Python/Cookbook". */
-		if(G.vd->persp != V3D_ORTHO){
-			vec[0]= (2.0f*(mx+dmx)/curarea->winx);
-			vec[1]= (2.0f*(my+dmy)/curarea->winy);
-			vec[2]= -1.0f;
-			vec[3]= 1.0f;
-
-			Mat4MulVec4fl(G.vd->persinv, vec);
-			VecMulf(vec, 1.0f/vec[3]);
-
-			VECCOPY(co1, G.vd->viewinv[3]);
-			VECSUB(vec, vec, co1);
-			Normalize(vec);
-
-			VECADDFAC(co1, G.vd->viewinv[3], vec, G.vd->near);
-			VECADDFAC(co2, G.vd->viewinv[3], vec, G.vd->far);
-		}
-		else {
-			vec[0] = 2.0f*(mx+dmx)/curarea->winx;
-			vec[1] = 2.0f*(my+dmy)/curarea->winy;
-			vec[2] = 0.0f;
-			vec[3] = 1.0f;
-
-			Mat4MulVec4fl(G.vd->persinv,vec);
-
-			VECADDFAC(co1,vec,G.vd->viewinv[2],1000.0f);
-			VECADDFAC(co2,vec,G.vd->viewinv[2],-1000.0f);
-		}
+		mco[0] = mval[0] + dmx;
+		mco[1] = mval[1] + dmy;
+		viewline(mco, co1, co2);
 
 		Mat4MulVecfl(imat,co1);
 		Mat4MulVecfl(imat,co2);
diff --git a/source/blender/src/editseq.c b/source/blender/src/editseq.c
index fb0fac4489d..f9432f8e69a 100644
--- a/source/blender/src/editseq.c
+++ b/source/blender/src/editseq.c
@@ -2135,12 +2135,25 @@ void del_seq(void)
 	Sequence *seq;
 	MetaStack *ms;
 	Editing *ed;
-
-	if(okee("Erase selected")==0) return;
+	int nothingSelected = TRUE;
 
 	ed= G.scene->ed;
 	if(ed==0) return;
 
+	seq=get_last_seq();
+	if (seq && seq->flag & SELECT) { /* avoid a loop since this is likely to be selected */
+		nothingSelected = FALSE;
+	} else {
+		for (seq = ed->seqbasep->first; seq; seq = seq->next) {
+			if (seq->flag & SELECT) {
+				nothingSelected = FALSE;
+				break;
+			}
+		}
+	}
+	
+	if(nothingSelected || okee("Erase selected")==0) return;
+
 	/* free imbufs of all dependent strips */
 	for(seq=ed->seqbasep->first; seq; seq=seq->next)
 		if(seq->flag & SELECT)
@@ -2634,12 +2647,13 @@ void set_filter_seq(void)
 	ed= G.scene->ed;
 	if(ed==0) return;
 
-	if(okee("Set FilterY")==0) return;
+	if(okee("Set Deinterlace")==0) return;
 
 	WHILE_SEQ(ed->seqbasep) {
 		if(seq->flag & SELECT) {
 			if(seq->type==SEQ_MOVIE) {
 				seq->flag |= SEQ_FILTERY;
+				reload_sequence_new_file(seq);
 			}
 
 		}
diff --git a/source/blender/src/editsima.c b/source/blender/src/editsima.c
index 5f8485267bc..69070d61bf0 100644
--- a/source/blender/src/editsima.c
+++ b/source/blender/src/editsima.c
@@ -694,7 +694,7 @@ void mouse_select_sima(void)
 	EditFace *efa;
 	MTFace *tf, *nearesttf;
 	EditFace *nearestefa=NULL;
-	int a, selectsticky, edgeloop, actface, nearestuv, nearestedge, i, shift;
+	int a, selectsticky, edgeloop, actface, nearestuv, nearestedge, i, shift, island=0;
 	char sticky= 0;
 	int flush = 0; /* 0 == dont flush, 1 == sel, -1 == desel;  only use when selection sync is enabled */
 	unsigned int hitv[4], nearestv;
@@ -706,7 +706,7 @@ void mouse_select_sima(void)
 	
 	edgeloop= G.qual & LR_ALTKEY;
 	shift= G.qual & LR_SHIFTKEY;
-
+	
 	if (G.sima->flag & SI_SYNC_UVSEL) {
 		/* copy from mesh */
 		if (G.scene->selectmode == SCE_SELECT_FACE) {
@@ -718,7 +718,8 @@ void mouse_select_sima(void)
 		}
 	} else {
 		/* normal operation */
-		actface= G.sima->flag & SI_SELACTFACE;
+		actface= G.sima->selectmode == SI_SELECT_FACE;
+		island= G.sima->selectmode == SI_SELECT_ISLAND;
 		
 		switch(G.sima->sticky) {
 		case SI_STICKY_LOC:
@@ -760,6 +761,9 @@ void mouse_select_sima(void)
 		
 		if (nearestefa->v4)	hitv[3]= nearestefa->v4->tmp.l;
 		else				hitv[3]= 0xFFFFFFFF;
+	}
+	else if (island) {
+
 	}
 	else {
 		find_nearest_uv(&nearesttf, &nearestefa, &nearestv, &nearestuv);
@@ -774,7 +778,11 @@ void mouse_select_sima(void)
 		}
 	}
 
-	if(!edgeloop && shift) {
+	if (island) {
+		if(shift) select_linked_tface_uv(1);
+		else select_linked_tface_uv(0);
+	}
+	else if(!edgeloop && shift) {
 		/* (de)select face */
 		if(actface) {
 			if(simaFaceSel_Check(nearestefa, nearesttf)) {
@@ -2690,15 +2698,17 @@ void image_changed(SpaceImage *sima, Image *image)
 					
 					if(image->id.us==0) id_us_plus(&image->id);
 					else id_lib_extern(&image->id);
-					
+#if 0				/* GE People dont like us messing with their face modes */
 					if (tface->transp==TF_ADD) {} /* they obviously know what they are doing! - leave as is */
 					else if (ibuf && ibuf->depth == 32)	tface->transp = TF_ALPHA;
 					else								tface->transp = TF_SOLID;
-					
+#endif
 				} else {
 					tface->tpage= NULL;
 					tface->mode &= ~TF_TEX;
+#if 0
 					tface->transp = TF_SOLID;
+#endif
 				}
 				change = 1;
 			}
diff --git a/source/blender/src/editsound.c b/source/blender/src/editsound.c
index 1cb7ec276cb..05eb094a7c2 100644
--- a/source/blender/src/editsound.c
+++ b/source/blender/src/editsound.c
@@ -148,7 +148,7 @@ void winqreadsoundspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 					first= 0;
 					CFRA= cfra;
 					update_for_newframe();
-					force_draw_plus(SPACE_VIEW3D, 1);
+					force_draw_all(0);
 				}
 				else PIL_sleep_ms(30);
 			
diff --git a/source/blender/src/edittime.c b/source/blender/src/edittime.c
index 5a10ea65738..2c37a0eb20f 100644
--- a/source/blender/src/edittime.c
+++ b/source/blender/src/edittime.c
@@ -803,11 +803,11 @@ static void timeline_force_draw(short val)
 		if(sa->spacetype==SPACE_VIEW3D) {
 			if(sa==samin || (val & TIME_ALL_3D_WIN)) dodraw= 1;
 		}
-		else if(ELEM6(sa->spacetype, SPACE_NLA, SPACE_IPO, SPACE_SEQ, SPACE_BUTS, SPACE_ACTION, SPACE_SOUND)) {
+		else if(ELEM5(sa->spacetype, SPACE_NLA, SPACE_IPO, SPACE_SEQ, SPACE_ACTION, SPACE_SOUND)) {
 			if(val & TIME_ALL_ANIM_WIN) dodraw= 1;
 		}
 		else if(sa->spacetype==SPACE_BUTS) {
-			if(val & TIME_ALL_BUTS_WIN) dodraw= 1;
+			if(val & TIME_ALL_BUTS_WIN) dodraw= 2;
 		}
 		else if(sa->spacetype==SPACE_IMAGE) {
 			if (val & TIME_ALL_IMAGE_WIN) dodraw = 1;
diff --git a/source/blender/src/header_image.c b/source/blender/src/header_image.c
index 7ac57cb839b..fac9e3af1af 100644
--- a/source/blender/src/header_image.c
+++ b/source/blender/src/header_image.c
@@ -1214,28 +1214,31 @@ void image_buttons(void)
 			uiBlockBeginAlign(block);
 			
 			/* B_SEL_VERT & B_SEL_FACE are not defined here which is a bit bad, BUT it works even if image editor is fullscreen */
-			uiDefIconButBitS(block, TOG, SCE_SELECT_VERTEX, B_SEL_VERT, ICON_VERTEXSEL, xco,0,XIC,YIC, &G.scene->selectmode, 1.0, 0.0, 0, 0, "Vertex select mode (Ctrl Tab 1)");
-			xco+= XIC;
+			uiDefIconButBitS(block, TOG, SCE_SELECT_VERTEX, B_SEL_VERT, ICON_VERTEXSEL,
+				xco,0,XIC,YIC, &G.scene->selectmode, 1.0, 0.0, 0, 0, "Vertex select mode (Ctrl Tab 1)");
 			/* no edge */
 			/*uiDefIconButBitS(block, TOG, SCE_SELECT_EDGE, B_SEL_EDGE, ICON_EDGESEL, xco,0,XIC,YIC, &G.scene->selectmode, 1.0, 0.0, 0, 0, "Edge select mode (Ctrl Tab 2)");
 			xco+= XIC; */
-			uiDefIconButBitS(block, TOG, SCE_SELECT_FACE, B_SEL_FACE, ICON_FACESEL, xco,0,XIC,YIC, &G.scene->selectmode, 1.0, 0.0, 0, 0, "Face select mode (Ctrl Tab 3)");
-			xco+= XIC+8;
+			uiDefIconButBitS(block, TOG, SCE_SELECT_FACE, B_SEL_FACE, ICON_FACESEL,
+				xco+=XIC,0,XIC,YIC, &G.scene->selectmode, 1.0, 0.0, 0, 0, "Face select mode (Ctrl Tab 3)");
 			uiBlockEndAlign(block);
 			
 		} else {
 			uiBlockBeginAlign(block);
-			uiDefIconButBitI(block, TOGN, SI_SELACTFACE, B_REDR, ICON_VERTEXSEL, xco,0,XIC,YIC, &G.sima->flag, 1.0, 0.0, 0, 0, "UV Vertex select mode");
-			xco+= XIC;
-			uiDefIconButBitI(block, TOG, SI_SELACTFACE, B_REDR, ICON_FACESEL, xco,0,XIC,YIC, &G.sima->flag, 0, 0, 0, 0, "UV Face select mode");
-			xco+= XIC+8;
-			uiBlockEndAlign(block);
 			
+			uiDefIconButS(block,  ROW, B_REDR, ICON_VERTEXSEL,
+				xco,0,XIC,YIC, &G.sima->selectmode, 0.0, SI_SELECT_VERTEX, 0, 0, "UV vertex select mode");
+			uiDefIconButS(block,  ROW, B_REDR, ICON_FACESEL,
+				xco+=XIC,0,XIC,YIC, &G.sima->selectmode, 0.0, SI_SELECT_FACE, 0, 0, "UV Face select mode");
+			uiDefIconButS(block,  ROW, B_REDR, ICON_MESH,
+				xco+=XIC,0,XIC,YIC, &G.sima->selectmode, 0.0, SI_SELECT_ISLAND, 0, 0, "UV Island select mode");
+			uiBlockEndAlign(block);
+
 			/* would use these if const's could go in strings 
 			 * SI_STICKY_LOC SI_STICKY_DISABLE SI_STICKY_VERTEX */
 			ubut = uiDefIconTextButC(block, ICONTEXTROW, B_REDR, ICON_STICKY_UVS_LOC,
 					"Sticky UV Selection: %t|Disable%x1|Shared Location%x0|Shared Vertex%x2",
-					xco,0,XIC+10,YIC, &(G.sima->sticky), 0, 3.0, 0, 0,
+					xco+=XIC+10,0,XIC+10,YIC, &(G.sima->sticky), 0, 3.0, 0, 0,
 					"Sticky UV Selection (Hotkeys: Shift C, Alt C, Ctrl C)");
 			
 		}
diff --git a/source/blender/src/header_oops.c b/source/blender/src/header_oops.c
index 7bfbf0ee667..ad65705b79d 100644
--- a/source/blender/src/header_oops.c
+++ b/source/blender/src/header_oops.c
@@ -509,8 +509,9 @@ void oops_buttons(void)
 		uiDefIconButBitS(block, TOG, OOPS_IM, B_NEWOOPS, ICON_IMAGE_HLT,	(short)(xco+=XIC),0,XIC,YIC, &soops->visiflag, 0, 0, 0, 0, "Displays Image datablocks");
 		uiDefIconButBitS(block, TOG, OOPS_GR, B_NEWOOPS, ICON_CIRCLE_DEHLT,	(short)(xco+=XIC),0,XIC,YIC, &soops->visiflag, 0, 0, 0, 0, "Displays Group datablocks");
 		uiDefIconButBitS(block, TOG, OOPS_LI, B_NEWOOPS, ICON_LIBRARY_HLT,	(short)(xco+=XIC),0,XIC,YIC, &soops->visiflag, 0, 0, 0, 0, "Displays Library datablocks");
+		uiDefIconButBitS(block, TOG, OOPS_CA, B_NEWOOPS, ICON_CAMERA_DEHLT,	(short)(xco+=XIC),0,XIC,YIC, &soops->visiflag, 0, 0, 0, 0, "Displays Camera datablocks");
+		uiDefIconButBitS(block, TOG, OOPS_AR, B_NEWOOPS, ICON_ARMATURE,	(short)(xco+=XIC),0,XIC,YIC, &soops->visiflag, 0, 0, 0, 0, "Displays Armature datablocks");
 		
-
 		uiBlockEndAlign(block);
 	  
 		/* name */
@@ -576,3 +577,4 @@ void oops_buttons(void)
 	uiDrawBlock(block);
 }
 
+
diff --git a/source/blender/src/header_view3d.c b/source/blender/src/header_view3d.c
index 82fcdd23c1f..0f3a46c8a8c 100644
--- a/source/blender/src/header_view3d.c
+++ b/source/blender/src/header_view3d.c
@@ -1313,6 +1313,9 @@ static void do_view3d_select_armaturemenu(void *arg, int event)
 		case 3: /* Select Parent(s) */	
 			select_bone_parent();
 			break;
+		case 4: /* Swap Select All */
+			deselectall_armature(3, 1);
+			break;
 	}
 	allqueue(REDRAWVIEW3D, 0);
 }
@@ -1331,6 +1334,8 @@ static uiBlock *view3d_select_armaturemenu(void *arg_unused)
 	
 	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, "Swap Select All|Ctrl I",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 4, "");
+	
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Select Parent(s)|P",					0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 3, "");
 
 	if(curarea->headertype==HEADERTOP) {
@@ -1356,12 +1361,15 @@ static void do_view3d_select_pose_armaturemenu(void *arg, int event)
 	case 2: /* Select/Deselect all */
 		deselectall_posearmature(OBACT, 1, 1);
 		break;
-	case 3:
+	case 3: /* Select Target(s) of Constraint(s) */
 		pose_select_constraint_target();
 		break;
-	case 4:
+	case 4: /* Select Bone's Parent */
 		select_bone_parent();
 		break;
+	case 5: /* Swap Select All */
+		deselectall_posearmature(OBACT, 3, 1);
+		break;
 	}
 	allqueue(REDRAWVIEW3D, 0);
 }
@@ -1379,6 +1387,7 @@ static uiBlock *view3d_select_pose_armaturemenu(void *arg_unused)
 	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, "Swap Select All|Ctrl I",				0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 5, "");
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Select Constraint Target|W",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 3, "");
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Select Parent(s)|P",					0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 4, "");
 
@@ -4106,7 +4115,7 @@ static uiBlock *view3d_pose_armature_ikmenu(void *arg_unused)
 	block= uiNewBlock(&curarea->uiblocks, "view3d_pose_armature_ikmenu", UI_EMBOSSP, UI_HELV, G.curscreen->mainwin);
 	uiBlockSetButmFunc(block, do_view3d_pose_armature_ikmenu, NULL);
 	
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Add IK to Bone...|Ctrl I",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Add IK to Bone...|Shift I",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Clear IK...|Alt I",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 2, "");
 	
 	uiBlockSetDirection(block, UI_RIGHT);
@@ -5071,6 +5080,18 @@ static char *ndof_pup(void)
 }
 
 
+static char *snapmode_pup(void)
+{
+	static char string[512];
+	char *str = string;
+	
+	str += sprintf(str, "%s", "Snap Mode: %t"); 
+	str += sprintf(str, "%s", "|Vertex%x0");
+	str += sprintf(str, "%s", "|Edge%x1");
+	str += sprintf(str, "%s", "|Face%x2"); 
+	return string;
+}
+
 static char *propfalloff_pup(void)
 {
 	static char string[512];
@@ -5698,6 +5719,10 @@ void view3d_buttons(void)
 			if (G.scene->snap_flag & SCE_SNAP) {
 				uiDefIconButBitS(block, TOG, SCE_SNAP, B_REDR, ICON_SNAP_GEO,xco,0,XIC,YIC, &G.scene->snap_flag, 0, 0, 0, 0, "Use Snap or Grid (Shift Tab)");	
 				xco+= XIC;
+				uiDefIconButBitS(block, TOG, SCE_SNAP_ROTATE, B_REDR, ICON_SNAP_NORMAL,xco,0,XIC,YIC, &G.scene->snap_flag, 0, 0, 0, 0, "Align rotation with the snapping target");	
+				xco+= XIC;
+				uiDefIconTextButS(block, ICONTEXTROW,B_REDR, ICON_VERTEXSEL, snapmode_pup(), xco,0,XIC+10,YIC, &(G.scene->snap_mode), 0.0, 0.0, 0, 0, "Snapping mode");
+				xco+= XIC;
 				uiDefButS(block, MENU, B_NOP, "Mode%t|Closest%x0|Center%x1|Median%x2|Active%x3",xco,0,70,YIC, &G.scene->snap_target, 0, 0, 0, 0, "Snap Target Mode");
 				xco+= 70;
 			} else {
diff --git a/source/blender/src/headerbuttons.c b/source/blender/src/headerbuttons.c
index 81ad135f514..1a91ada1562 100644
--- a/source/blender/src/headerbuttons.c
+++ b/source/blender/src/headerbuttons.c
@@ -1628,6 +1628,7 @@ void do_global_buttons(unsigned short event)
 		allqueue(REDRAWOOPS, 1);
 		allqueue(REDRAWACTION, 1);
 		allqueue(REDRAWNLA, 1);
+		allqueue(REDRAWVIEW3D, 1);
 		/* name scene also in set PUPmenu */
 		allqueue(REDRAWBUTSALL, 0);
 		allqueue(REDRAWIMAGE, 0);
diff --git a/source/blender/src/interface.c b/source/blender/src/interface.c
index 6582866d9a1..19e2e4b6245 100644
--- a/source/blender/src/interface.c
+++ b/source/blender/src/interface.c
@@ -2797,6 +2797,10 @@ static void ui_add_link_line(ListBase *listb, uiBut *but, uiBut *bt)
 	line->to= bt;
 }
 
+uiBut *uiFindInlink(uiBlock *block, void *poin)
+{
+	return ui_find_inlink(block, poin);
+}
 
 void uiComposeLinks(uiBlock *block)
 {
@@ -5401,7 +5405,9 @@ uiBlock *uiNewBlock(ListBase *lb, char *name, short dt, short font, short win)
 		int getsizex, getsizey;
 
 		bwin_getsize(win, &getsizex, &getsizey);
-		block->aspect= 2.0/( (getsizex)*block->winmat[0][0]);
+		/* TODO - investigate why block->winmat[0][0] is negative
+		 * in the image view when viewRedrawForce is called */
+		block->aspect= 2.0/fabs( (getsizex)*block->winmat[0][0]);
 	}
 
 	uiSetCurFont(block, font);
diff --git a/source/blender/src/interface_draw.c b/source/blender/src/interface_draw.c
index 83f1221b1fb..e7041e60003 100644
--- a/source/blender/src/interface_draw.c
+++ b/source/blender/src/interface_draw.c
@@ -180,8 +180,12 @@ static void ui_draw_icon(uiBut *but, BIFIconID icon, int blend)
 		height= ICON_HEIGHT;
 	
 	if(but->flag & UI_ICON_LEFT) {
-		if (but->type==BUT_TOGDUAL && but->drawstr[0]) {
-			xs= but->x1-1.0;
+		if (but->type==BUT_TOGDUAL) {
+			if (but->drawstr[0]) {
+				xs= but->x1-1.0;
+			} else {
+				xs= (but->x1+but->x2- height)/2.0;
+			}
 		}
 		else if (but->type==BUTM ) {
 			xs= but->x1+1.0;
diff --git a/source/blender/src/oops.c b/source/blender/src/oops.c
index 1f851d2fa6c..51d83eff3e6 100644
--- a/source/blender/src/oops.c
+++ b/source/blender/src/oops.c
@@ -48,6 +48,9 @@
 #include "DNA_texture_types.h"
 #include "DNA_key_types.h"
 #include "DNA_group_types.h"
+#include "DNA_camera_types.h"
+#include "DNA_lattice_types.h"
+#include "DNA_armature_types.h"
 
 #include "BKE_utildefines.h"
 #include "BKE_global.h"
@@ -661,7 +664,6 @@ void add_material_oopslinks(Material *ma, Oops *oops, short flag)
 		add_oopslink("group", oops, ID_GR, &(ma->group), OOPSX, (float)(0.5*OOPSY));
 }
 
-
 void add_group_oopslinks(Group *gp, Oops *oops, short flag)
 {
 	GroupObject *gob;
@@ -672,7 +674,6 @@ void add_group_oopslinks(Group *gp, Oops *oops, short flag)
 	}
 }
 
-
 void add_object_oopslinks(Object *ob, Oops *oops, short flag)
 {
 	ID *id;
@@ -698,6 +699,12 @@ void add_object_oopslinks(Object *ob, Oops *oops, short flag)
 		case ID_LA:
 			if(flag & OOPS_LA) add_oopslink("data", oops, ID_LA, &ob->data, (float)(.5*OOPSX), (float)OOPSY);
 			break;
+ 		case ID_CA:
+			if(flag & OOPS_CA) add_oopslink("data", oops, ID_CA, &ob->data, (float)(.5*OOPSX), (float)OOPSY);
+			break;
+ 		case ID_AR:
+			if(flag & OOPS_AR) add_oopslink("data", oops, ID_AR, &ob->data, (float)(.5*OOPSX), (float)OOPSY);
+			break;
 		}
 	}
 	
@@ -748,7 +755,6 @@ void add_curve_oopslinks(Curve *cu, Oops *oops, short flag)
 		add_oopslink("speed", oops, ID_IP, &cu->ipo, OOPSX, (float)(0.5*OOPSY));
 		if(cu->key) add_oopslink("ipo", oops, ID_IP, &cu->key->ipo, OOPSX, (float)(0.5*OOPSY));
 	}
-	
 }
 
 void add_mball_oopslinks(MetaBall *mb, Oops *oops, short flag)
@@ -775,15 +781,36 @@ void add_lamp_oopslinks(Lamp *la, Oops *oops, short flag)
 			}
 		}
 	}
+	if(flag & OOPS_IP) {
+		add_oopslink("ipo", oops, ID_IP, &la->ipo, OOPSX, (float)(0.5*OOPSY));
+	}
 }
 
+void add_camera_oopslinks(Camera *ca, Oops *oops, short flag)
+{
+	if(flag & OOPS_IP) {
+		add_oopslink("ipo", oops, ID_IP, &ca->ipo, OOPSX, (float)(0.5*OOPSY));
+	}
+}
+
+void add_texture_oopslinks(Tex *tex, Oops *oops, short flag)
+{
+	if(flag & OOPS_IM)  {
+		add_oopslink("image", oops, ID_IM, &tex->ima, OOPSX, (float)(0.5*OOPSY));
+	}
+}
+
+void add_lattice_oopslinks(Lattice *lt, Oops *oops, short flag)
+{
+	if(flag & OOPS_IP) {
+		if(lt->key) add_oopslink("ipo", oops, ID_IP, &lt->key->ipo, OOPSX, (float)(0.5*OOPSY));
+	}
+}
 
 Oops *add_test_oops(void *id)	/* incl links */
 {
 	Oops *oops;
 	Object *ob;
-	Lamp *la;
-	Tex *tex;
 	
 	if(id==0) return NULL;
 	
@@ -821,9 +848,10 @@ Oops *add_test_oops(void *id)	/* incl links */
 		add_mball_oopslinks((MetaBall *)id, oops, G.soops->visiflag);
 		break;
 	case ID_LA:
-		la= (Lamp *)id;
-		add_lamp_oopslinks(la, oops, G.soops->visiflag);
-		if(la->ipo) if(G.soops->visiflag & OOPS_IP) add_oopslink("ipo", oops, ID_IP, &la->ipo, OOPSX, (float)(0.3*OOPSY));
+		add_lamp_oopslinks((Lamp *)id, oops, G.soops->visiflag);
+		break;	 
+	case ID_CA:
+		add_camera_oopslinks((Camera *)id, oops, G.soops->visiflag);
 		break;	 
 	case ID_IP:
 
@@ -835,8 +863,14 @@ Oops *add_test_oops(void *id)	/* incl links */
 		add_group_oopslinks((Group *)id, oops, G.soops->visiflag);
 		break;
 	case ID_TE:
-		tex= (Tex *)id;
-		if(tex->ima) if(G.soops->visiflag & OOPS_IM) add_oopslink("image", oops, ID_IM, &tex->ima, OOPSX, (float)(0.3*OOPSY));
+		add_texture_oopslinks((Tex *)id, oops, G.soops->visiflag);
+		break;
+	case ID_LT:
+		add_lattice_oopslinks((Lattice *)id, oops, G.soops->visiflag);
+		break;
+	case ID_AR:
+	
+		break;
 	}
 	
 	return oops;
@@ -897,7 +931,7 @@ void build_oops()
 		while(sce) {
 		
 			oops= add_test_oops(sce);
-
+		
 			if(G.soops->visiflag & OOPS_OB) {
 				base= sce->base.first;
 				while(base) {
@@ -912,12 +946,13 @@ void build_oops()
 		
 		if(G.soops->visiflag & OOPS_OB) {
 			Object *ob= G.main->object.first;
-
+		
 			while(ob) {
 				oops= add_test_oops(ob);
 				ob= ob->id.next;
 			}
 		}
+		
 		if(G.soops->visiflag & OOPS_ME) {
 			Mesh *me= G.main->mesh.first;
 			while(me) {
@@ -925,7 +960,7 @@ void build_oops()
 				me= me->id.next;
 			}
 		}
-	
+		
 		if(G.soops->visiflag & OOPS_CU) {
 			Curve *cu= G.main->curve.first;
 			while(cu) {
@@ -933,7 +968,7 @@ void build_oops()
 				cu= cu->id.next;
 			}
 		}
-
+		
 		if(G.soops->visiflag & OOPS_MB) {
 			MetaBall *mb= G.main->mball.first;
 			while(mb) {
@@ -941,7 +976,7 @@ void build_oops()
 				mb= mb->id.next;
 			}
 		}
-	
+		
 		if(G.soops->visiflag & OOPS_LA) {
 			Lamp *la= G.main->lamp.first;
 			while(la) {
@@ -950,6 +985,14 @@ void build_oops()
 			}
 		}
 		
+		if(G.soops->visiflag & OOPS_CA) {
+			Camera *ca= G.main->camera.first;
+			while(ca) {
+				oops= add_test_oops(ca);
+				ca= ca->id.next;
+			}
+		}
+		
 		if(G.soops->visiflag & OOPS_IP) {
 			Ipo *ipo= G.main->ipo.first;
 			while(ipo) {
@@ -972,6 +1015,7 @@ void build_oops()
 				tex= tex->id.next;
 			}
 		}
+		
 		if(G.soops->visiflag & OOPS_IM) {
 			Image *ima= G.main->image.first;
 			while(ima) {
@@ -979,6 +1023,7 @@ void build_oops()
 				ima= ima->id.next;
 			}
 		}
+		
 		if(G.soops->visiflag & OOPS_GR) {
 			Group *gp= G.main->group.first;
 			while(gp) {
@@ -986,6 +1031,23 @@ void build_oops()
 				gp= gp->id.next;
 			}
 		}
+		
+		if(G.soops->visiflag & OOPS_LT) {
+			Lattice *lt= G.main->latt.first;
+			while(lt) {
+				oops= add_test_oops(lt);
+				lt= lt->id.next;
+			}
+		}
+		
+		if(G.soops->visiflag & OOPS_AR) {
+			bArmature *ar= G.main->armature.first;
+			while(ar) {
+				oops= add_test_oops(ar);
+				ar= ar->id.next;
+			}
+		}
+		
 	}
 	else {
 		
@@ -1068,6 +1130,7 @@ void build_oops()
 					else if(type==ID_LA && G.soops->visiflag & OOPS_LA) {
 						Lamp *la= ob->data;
 						oops= add_test_oops(ob->data);
+						
 						if(G.soops->visiflag & OOPS_IP) add_test_oops(la->ipo);
 						if(G.soops->visiflag & OOPS_TE) {
 							for(a=0; a<MAX_MTEX; a++) {
@@ -1075,14 +1138,28 @@ void build_oops()
 							}
 						}
 					}
+					else if(type==ID_CA && G.soops->visiflag & OOPS_CA) {
+						Camera *ca= ob->data;
+						oops= add_test_oops(ob->data);
+						
+						if(G.soops->visiflag & OOPS_IP) add_test_oops(ca->ipo);
+					}
+					else if(type==ID_LT && G.soops->visiflag & OOPS_LT) {
+						Lattice *lt= ob->data;
+						oops= add_test_oops(ob->data);
+						
+						if(G.soops->visiflag & OOPS_IP) {
+							if(lt->key) oops= add_test_oops(lt->key->ipo);
+						}
+					}
+					else if(type==ID_AR && G.soops->visiflag & OOPS_AR) {
+						oops= add_test_oops(ob->data);
+					}
 				}
 			}
 			base= base->next;
 		}
 	}
-	
-	
-
 
 	/* test links */
 	oops= G.soops->oops.first;
diff --git a/source/blender/src/poselib.c b/source/blender/src/poselib.c
index 2d8b0c81175..fb2bfe5b605 100644
--- a/source/blender/src/poselib.c
+++ b/source/blender/src/poselib.c
@@ -756,6 +756,13 @@ static void poselib_keytag_pose (tPoseLib_PreviewData *pld)
  */
 static void poselib_preview_get_next (tPoseLib_PreviewData *pld, int step)
 {
+	/* check if we no longer have search-string, but don't have any marker */
+	if (pld->marker == NULL) {
+		if ((step) && (pld->searchstr[0] == 0))
+			pld->marker= pld->act->markers.first;
+	}	
+	
+	/* the following operations assume that there is a starting point and direction */
 	if ((pld->marker) && (step)) {
 		/* search-string dictates a special approach */
 		if (pld->searchstr[0]) {
@@ -1262,9 +1269,14 @@ void poselib_preview_poses (Object *ob, short apply_active)
 					/* get search-string */
 					index= pld.search_cursor;
 					
-					memcpy(&tempstr[0], &pld.searchstr[0], index);
-					tempstr[index]= '|';
-					memcpy(&tempstr[index+1], &pld.searchstr[index], 64-index);
+					if (IN_RANGE(index, 0, 64)) {
+						memcpy(&tempstr[0], &pld.searchstr[0], index);
+						tempstr[index]= '|';
+						memcpy(&tempstr[index+1], &pld.searchstr[index], 64-index);
+					}
+					else {
+						strncpy(tempstr, pld.searchstr, 64);
+					}
 					
 					/* get marker name */
 					if (pld.marker)
diff --git a/source/blender/src/poseobject.c b/source/blender/src/poseobject.c
index dcceea971f7..cc08bf53a72 100644
--- a/source/blender/src/poseobject.c
+++ b/source/blender/src/poseobject.c
@@ -1627,6 +1627,8 @@ void pose_flipquats(void)
 			pchan->quat[3]= -pchan->quat[3];
 		}
 	}
-			
+	
+	/* do autokey */
+	autokeyframe_pose_cb_func(ob, TFM_ROTATION, 0);
 }
 
diff --git a/source/blender/src/resources.c b/source/blender/src/resources.c
index 046d14c990d..f47f14a605c 100644
--- a/source/blender/src/resources.c
+++ b/source/blender/src/resources.c
@@ -52,6 +52,7 @@
 #include "BIF_interface_icons.h"
 
 #include "BLI_blenlib.h"
+#include "BLI_dynstr.h"
 #include "blendef.h"	// CLAMP
 #include "datatoc.h"
 
@@ -784,6 +785,33 @@ char *BIF_ThemeColorsPup(int spacetype)
 	return cp;
 }
 
+char *BIF_ThemeColorSetsPup (short inc_custom)
+{
+	DynStr *pupds= BLI_dynstr_new();
+	char *str;
+	char buf[48];
+	int i;
+	
+	/* add title first (and the "default" entry) */
+	BLI_dynstr_append(pupds, "Bone Color Set%t|Default Colors%x0|");
+	
+	/* loop through set indices, adding them */
+	for (i=1; i<21; i++) {
+		sprintf(buf, "%d - Theme Color Set%%x%d|", i, i);
+		BLI_dynstr_append(pupds, buf);
+	}
+	
+	/* add the 'custom' entry */
+	if (inc_custom)
+		BLI_dynstr_append(pupds, "Custom Set %x-1");
+	
+	/* convert to normal MEM_malloc'd string */
+	str= BLI_dynstr_get_cstring(pupds);
+	BLI_dynstr_free(pupds);
+	
+	return str;
+}
+
 void BIF_SetTheme(ScrArea *sa)
 {
 	if(sa==NULL) {	// called for safety, when delete themes
diff --git a/source/blender/src/sequence.c b/source/blender/src/sequence.c
index bf519dd6e9c..9426548dc38 100644
--- a/source/blender/src/sequence.c
+++ b/source/blender/src/sequence.c
@@ -445,7 +445,10 @@ void reload_sequence_new_file(Sequence * seq)
 		seq->strip->len = seq->len;
 	} else if (seq->type == SEQ_MOVIE) {
 		if(seq->anim) IMB_free_anim(seq->anim);
-		seq->anim = openanim(str, IB_rect);
+		seq->anim = openanim(
+			str, IB_rect | 
+			((seq->flag & SEQ_FILTERY) 
+			 ? IB_animdeinterlace : 0));
 
 		if (!seq->anim) {
 			return;
@@ -1445,7 +1448,7 @@ static void input_preprocess(Sequence * seq, TStripElem* se, int cfra)
 	seq->strip->orx= se->ibuf->x;
 	seq->strip->ory= se->ibuf->y;
 
-	if(seq->flag & SEQ_FILTERY) {
+	if((seq->flag & SEQ_FILTERY) && seq->type != SEQ_MOVIE) {
 		IMB_filtery(se->ibuf);
 	}
 
@@ -1772,8 +1775,11 @@ static void do_build_seq_ibuf(Sequence * seq, TStripElem *se, int cfra,
 					BLI_join_dirfile(name, seq->strip->dir, seq->strip->stripdata->name);
 					BLI_convertstringcode(name, G.sce);
 					BLI_convertstringframe(name, G.scene->r.cfra);
-				
-					seq->anim = openanim(name, IB_rect);
+					
+					seq->anim = openanim(
+						name, IB_rect | 
+						((seq->flag & SEQ_FILTERY) 
+						 ? IB_animdeinterlace : 0));
 				}
 				if(seq->anim) {
 					IMB_anim_set_preseek(seq->anim, seq->anim_preseek);
@@ -2374,6 +2380,16 @@ ImBuf *give_ibuf_seq(int rectx, int recty, int cfra, int chanshown)
 	return i;
 }
 
+/* check used when we need to change seq->blend_mode but not to effect or audio strips */
+int seq_can_blend(Sequence *seq)
+{
+	if (ELEM4(seq->type, SEQ_IMAGE, SEQ_META, SEQ_SCENE, SEQ_MOVIE)) {
+		return 1;
+	} else {
+		return 0;
+	}
+}
+
 /* threading api */
 
 static ListBase running_threads;
diff --git a/source/blender/src/space.c b/source/blender/src/space.c
index e38a8b040ff..4bacf76075e 100644
--- a/source/blender/src/space.c
+++ b/source/blender/src/space.c
@@ -378,9 +378,6 @@ void space_set_commmandline_options(void) {
 		
 	if ( (syshandle = SYS_GetSystem()) ) {
 		/* User defined settings */
-		a= (U.gameflags & USER_VERTEX_ARRAYS);
-		SYS_WriteCommandLineInt(syshandle, "vertexarrays", a);
-
 		a= (U.gameflags & USER_DISABLE_SOUND);
 		SYS_WriteCommandLineInt(syshandle, "noaudio", a);
 
@@ -437,9 +434,6 @@ static void SaveState(void)
 	if(G.f & G_TEXTUREPAINT)
 		texpaint_enable_mipmap();
 
-	if(G.scene->camera==0 || G.scene->camera->type!=OB_CAMERA)
-		error("no (correct) camera");
-
 	waitcursor(1);
 }
 
@@ -2077,15 +2071,16 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 							vgroup_operation_with_menu();
 					}
 				}
-				else if((G.qual==LR_SHIFTKEY))
+				else if((G.qual==LR_SHIFTKEY)) {
 					if(G.obedit) {
 						if(G.obedit->type==OB_MESH)
 							select_mesh_group_menu();
 					} 
 					else if(ob && (ob->flag & OB_POSEMODE))
 						pose_select_grouped_menu();
-					else
+					else if (ob)
 						select_object_grouped_menu();
+				}
 				else if((G.obedit==0) && G.qual==LR_ALTKEY) {
 					if(okee("Clear location")) {
 						clear_object('g');
@@ -2194,10 +2189,14 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 				break;
 			case IKEY:
 				if(G.qual==LR_CTRLKEY) {
-					if(ob && (ob->flag & OB_POSEMODE) && ob->type==OB_ARMATURE)
-						pose_add_IK();
-					else if(ob && G.obedit)
-						selectswap_mesh();
+					if((ob) && (ob->flag & OB_POSEMODE) && (ob->type==OB_ARMATURE))
+						deselectall_posearmature(ob, 3, 1);
+					else if(ob && G.obedit) {
+						if(G.obedit->type == OB_ARMATURE)
+							deselectall_armature(3, 1);
+						else
+							selectswap_mesh();
+					}
 					else
 						selectswap();
 				}
@@ -2205,6 +2204,10 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 					if(ob && (ob->flag & OB_POSEMODE) && ob->type==OB_ARMATURE)
 						pose_clear_IK();
 				}
+				else if(G.qual==LR_SHIFTKEY) {
+					if(ob && (ob->flag & OB_POSEMODE) && ob->type==OB_ARMATURE)
+						pose_add_IK();
+				}
 				break;
 				
 			case JKEY:
@@ -3216,7 +3219,7 @@ void initipo(ScrArea *sa)
 	sipo->v2d.min[0]= 0.01f;
 	sipo->v2d.min[1]= 0.01f;
 
-	sipo->v2d.max[0]= 15000.0f;
+	sipo->v2d.max[0]= MAXFRAMEF;
 	sipo->v2d.max[1]= 10000.0f;
 	
 	sipo->v2d.scroll= L_SCROLL+B_SCROLL;
@@ -4257,15 +4260,11 @@ void drawinfospace(ScrArea *sa, void *spacedata)
 		uiDefButS(block, MENU, B_GLRESLIMITCHANGED, "GL Texture Clamp Off%x0|%l|GL Texture Clamp 8192%x8192|GL Texture Clamp 4096%x4096|GL Texture Clamp 2048%x2048|GL Texture Clamp 1024%x1024|GL Texture Clamp 512%x512|GL Texture Clamp 256%x256|GL Texture Clamp 128%x128",
 													(xpos+edgsp+(5*mpref)+(5*midsp)),y4,mpref,buth, &(U.glreslimit), 0, 0, 0, 0, "Limit the texture size to save graphics memory");
 		
-		uiDefButBitI(block, TOG, USER_VERTEX_ARRAYS, 0, "Vertex Arrays",
-			(xpos+edgsp+(5*mpref)+(5*midsp)),y3,mpref,buth,
-			&(U.gameflags), 0, 0, 0, 0, "Toggles between vertex arrays on (less reliable) and off (more reliable)");
-
 		uiDefButI(block, NUM, 0, "Time Out ",
-			(xpos+edgsp+(5*mpref)+(5*midsp)), y2, mpref, buth, 
+			(xpos+edgsp+(5*mpref)+(5*midsp)), y3, mpref, buth, 
 			&U.textimeout, 0.0, 3600.0, 30, 2, "Time since last access of a GL texture in seconds after which it is freed. (Set to 0 to keep textures allocated)");
 		uiDefButI(block, NUM, 0, "Collect Rate ",
-			(xpos+edgsp+(5*mpref)+(5*midsp)), y1, mpref, buth, 
+			(xpos+edgsp+(5*mpref)+(5*midsp)), y2, mpref, buth, 
 			&U.texcollectrate, 1.0, 3600.0, 30, 2, "Number of seconds between each run of the GL texture garbage collector.");
 
 		/* *** */
@@ -4441,7 +4440,10 @@ static void winqreadinfospace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 
 		switch(event) {
 		case UI_BUT_EVENT:
-			if(val==REDRAWTIME) allqueue(REDRAWTIME, 0);
+			if(val==REDRAWTIME) {
+				allqueue(REDRAWTIME, 0);
+				addqueue(sa->win, REDRAW, 1);
+			}
 			else if(val==B_ADD_THEME) {
 				bTheme *btheme, *new;
 				
@@ -4842,9 +4844,9 @@ static void winqreadseqspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 					
 					if( cfra!=CFRA || first ) {
 						first= 0;
-				
+						
 						CFRA= cfra;
-						force_draw(0);
+						force_draw_all(0);
 						update_for_newframe();	/* for audio scrubbing */						
 					}
 					else PIL_sleep_ms(30);
@@ -4975,11 +4977,13 @@ static void winqreadseqspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			}
 			break;
 		case DKEY:
-			if (G.qual == (LR_CTRLKEY|LR_SHIFTKEY))
+			if (G.qual == (LR_CTRLKEY|LR_SHIFTKEY)) {
 				duplicate_marker();
-			else if ((G.qual==LR_SHIFTKEY)) {
+			} else if ((G.qual==LR_SHIFTKEY)) {
 				if(sseq->mainb) break;
 				add_duplicate_seq();
+			} else if (G.qual == 0) {
+				set_filter_seq();
 			}
 			break;
 		case EKEY:
@@ -4987,10 +4991,6 @@ static void winqreadseqspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			if((G.qual==0))
 				transform_seq('e', 0);
 			break;
-		case FKEY:
-			if((G.qual==0))
-				set_filter_seq();
-			break;
 		case GKEY:
 			if (G.qual & LR_CTRLKEY)
 				transform_markers('g', 0);
@@ -5175,7 +5175,7 @@ static void init_actionspace(ScrArea *sa)
 	saction->v2d.min[0]= 0.0;
 	saction->v2d.min[1]= 0.0;
 
-	saction->v2d.max[0]= 32000.0;
+	saction->v2d.max[0]= MAXFRAMEF;
 	saction->v2d.max[1]= 1000.0;
 	
 	saction->v2d.minzoom= 0.01;
@@ -5247,7 +5247,7 @@ static void init_soundspace(ScrArea *sa)
 	ssound->v2d.min[0]= 1.0;
 	ssound->v2d.min[1]= 259.0;
 
-	ssound->v2d.max[0]= 32000.0;
+	ssound->v2d.max[0]= MAXFRAMEF;
 	ssound->v2d.max[1]= 259;
 	
 	ssound->v2d.minzoom= 0.1f;
@@ -5977,7 +5977,7 @@ static void init_nlaspace(ScrArea *sa)
 	snla->v2d.min[0]= 0.0;
 	snla->v2d.min[1]= 0.0;
 	
-	snla->v2d.max[0]= 1000.0;
+	snla->v2d.max[0]= MAXFRAMEF;
 	snla->v2d.max[1]= 1000.0;
 	
 	snla->v2d.minzoom= 0.1F;
@@ -6067,7 +6067,7 @@ static void init_timespace(ScrArea *sa)
 	stime->v2d.min[0]= 1.0;
 	stime->v2d.min[1]= (float)sa->winy;
 	
-	stime->v2d.max[0]= 32000.0;
+	stime->v2d.max[0]= MAXFRAMEF;
 	stime->v2d.max[1]= (float)sa->winy;
 	
 	stime->v2d.minzoom= 0.1f;
@@ -6336,7 +6336,10 @@ void duplicatespacelist(ScrArea *newarea, ListBase *lb1, ListBase *lb2)
 			SpaceNode *snode= (SpaceNode *)sl;
 			snode->nodetree= NULL;
 		}
-
+		else if(sl->spacetype==SPACE_SCRIPT) {
+			SpaceScript *sc = ( SpaceScript * ) sl;
+			sc->but_refs = NULL;
+		}
 		sl= sl->next;
 	}
 	
diff --git a/source/blender/src/transform.c b/source/blender/src/transform.c
index 4f6c33b0a64..705a5f868e7 100644
--- a/source/blender/src/transform.c
+++ b/source/blender/src/transform.c
@@ -2412,18 +2412,32 @@ void initRotation(TransInfo *t)
 		t->flag |= T_NO_CONSTRAINT;
 }
 
-static void ElementRotation(TransInfo *t, TransData *td, float mat[3][3]) {
+static void ElementRotation(TransInfo *t, TransData *td, float mat[3][3], short around) {
 	float vec[3], totmat[3][3], smat[3][3];
 	float eul[3], fmat[3][3], quat[4];
-
+	float *center = t->center;
+	
+	/* local constraint shouldn't alter center */
+	if (around == V3D_LOCAL) {
+		if (t->flag & (T_OBJECT|T_POSE)) {
+			center = td->center;
+		}
+		else {
+			/* !TODO! Make this if not rely on G */
+			if(around==V3D_LOCAL && (G.scene->selectmode & SCE_SELECT_FACE)) {
+				center = td->center;
+			}
+		}
+	}
+		
 	if (t->flag & T_POINTS) {
 		Mat3MulMat3(totmat, mat, td->mtx);
 		Mat3MulMat3(smat, td->smtx, totmat);
 		
-		VecSubf(vec, td->iloc, t->center);
+		VecSubf(vec, td->iloc, center);
 		Mat3MulVecfl(smat, vec);
 		
-		VecAddf(td->loc, vec, t->center);
+		VecAddf(td->loc, vec, center);
 
 		VecSubf(vec,td->loc,td->iloc);
 		protectedTransBits(td->protectflag, vec);
@@ -2460,13 +2474,13 @@ static void ElementRotation(TransInfo *t, TransData *td, float mat[3][3]) {
 		Mat3CpyMat4(pmtx, t->poseobj->obmat);
 		Mat3Inv(imtx, pmtx);
 		
-		VecSubf(vec, td->center, t->center);
+		VecSubf(vec, td->center, center);
 		
 		Mat3MulVecfl(pmtx, vec);	// To Global space
 		Mat3MulVecfl(mat, vec);		// Applying rotation
 		Mat3MulVecfl(imtx, vec);	// To Local space
 
-		VecAddf(vec, vec, t->center);
+		VecAddf(vec, vec, center);
 		/* vec now is the location where the object has to be */
 		
 		VecSubf(vec, vec, td->center); // Translation needed from the initial location
@@ -2495,9 +2509,9 @@ static void ElementRotation(TransInfo *t, TransData *td, float mat[3][3]) {
 	}
 	else {
 		/* translation */
-		VecSubf(vec, td->center, t->center);
+		VecSubf(vec, td->center, center);
 		Mat3MulVecfl(mat, vec);
-		VecAddf(vec, vec, t->center);
+		VecAddf(vec, vec, center);
 		/* vec now is the location where the object has to be */
 		VecSubf(vec, vec, td->center);
 		Mat3MulVecfl(td->smtx, vec);
@@ -2530,15 +2544,22 @@ static void ElementRotation(TransInfo *t, TransData *td, float mat[3][3]) {
 				/* are there ipo keys? */
 				if(td->tdi) {
 					TransDataIpokey *tdi= td->tdi;
+					float current_rot[3];
 					float rot[3];
 					
+					/* current IPO value for compatible euler */
+					current_rot[0] = tdi->rotx[0];
+					current_rot[1] = tdi->roty[0];
+					current_rot[2] = tdi->rotz[0];
+					VecMulf(current_rot, (float)(M_PI_2 / 9.0));
+					
 					/* calculate the total rotatation in eulers */
 					VecAddf(eul, td->ext->irot, td->ext->drot);
 					EulToMat3(eul, obmat);
 					/* mat = transform, obmat = object rotation */
 					Mat3MulMat3(fmat, mat, obmat);
 					
-					Mat3ToCompatibleEul(fmat, eul, td->ext->irot);
+					Mat3ToCompatibleEul(fmat, eul, current_rot);
 					
 					/* correct back for delta rot */
 					if(tdi->flag & TOB_IPODROT) {
@@ -2567,7 +2588,7 @@ static void ElementRotation(TransInfo *t, TransData *td, float mat[3][3]) {
 					/* mat = transform, obmat = object rotation */
 					Mat3MulMat3(fmat, smat, obmat);
 					
-					Mat3ToCompatibleEul(fmat, eul, td->ext->irot);
+					Mat3ToCompatibleEul(fmat, eul, td->ext->rot);
 					
 					/* correct back for delta rot */
 					VecSubf(eul, eul, td->ext->drot);
@@ -2586,17 +2607,9 @@ static void ElementRotation(TransInfo *t, TransData *td, float mat[3][3]) {
 static void applyRotation(TransInfo *t, float angle, float axis[3]) 
 {
 	TransData *td = t->data;
-	float mat[3][3], center[3];
+	float mat[3][3];
 	int i;
 
-	/* saving original center */
-	if (t->around == V3D_LOCAL) {
-		VECCOPY(center, t->center);
-	}
-	else {
-		center[0] = center[1] = center[2] = 0.0f;
-	}
-
 	VecRotToMat3(axis, angle, mat);
 	
 	for(i = 0 ; i < t->total; i++, td++) {
@@ -2607,32 +2620,15 @@ static void applyRotation(TransInfo *t, float angle, float axis[3])
 		if (td->flag & TD_SKIP)
 			continue;
 		
-		/* local constraint shouldn't alter center */
-		if (t->around == V3D_LOCAL) {
-			if (t->flag & (T_OBJECT|T_POSE)) {
-				VECCOPY(t->center, td->center);
-			}
-			else {
-				if(G.vd->around==V3D_LOCAL && (G.scene->selectmode & SCE_SELECT_FACE)) {
-					VECCOPY(t->center, td->center);
-				}
-			}
-		}
-		
 		if (t->con.applyRot) {
-			t->con.applyRot(t, td, axis);
+			t->con.applyRot(t, td, axis, NULL);
 			VecRotToMat3(axis, angle * td->factor, mat);
 		}
 		else if (t->flag & T_PROP_EDIT) {
 			VecRotToMat3(axis, angle * td->factor, mat);
 		}
 
-		ElementRotation(t, td, mat);
-	}
-
-	/* restoring original center */
-	if (t->around == V3D_LOCAL) {
-		VECCOPY(t->center, center);
+		ElementRotation(t, td, mat, t->around);
 	}
 }
 
@@ -2658,7 +2654,7 @@ int Rotation(TransInfo *t, short mval[2])
 	snapGrid(t, &final);
 
 	if (t->con.applyRot) {
-		t->con.applyRot(t, NULL, axis);
+		t->con.applyRot(t, NULL, axis, &final);
 	}
 	
 	applySnapping(t, &final);
@@ -2730,7 +2726,6 @@ static void applyTrackball(TransInfo *t, float axis1[3], float axis2[3], float a
 {
 	TransData *td = t->data;
 	float mat[3][3], smat[3][3], totmat[3][3];
-	float center[3];
 	int i;
 
 	VecRotToMat3(axis1, angles[0], smat);
@@ -2745,20 +2740,6 @@ static void applyTrackball(TransInfo *t, float axis1[3], float axis2[3], float a
 		if (td->flag & TD_SKIP)
 			continue;
 		
-		VECCOPY(center, t->center);
-		
-		if (t->around == V3D_LOCAL) {
-			/* local-mode shouldn't change center */
-			if (t->flag & (T_OBJECT|T_POSE)) {
-				VECCOPY(t->center, td->center);
-			}
-			else {
-				if(G.vd->around==V3D_LOCAL && (G.scene->selectmode & SCE_SELECT_FACE)) {
-					VECCOPY(t->center, td->center);
-				}
-			}
-		}
-		
 		if (t->flag & T_PROP_EDIT) {
 			VecRotToMat3(axis1, td->factor * angles[0], smat);
 			VecRotToMat3(axis2, td->factor * angles[1], totmat);
@@ -2766,9 +2747,7 @@ static void applyTrackball(TransInfo *t, float axis1[3], float axis2[3], float a
 			Mat3MulMat3(mat, smat, totmat);
 		}
 		
-		ElementRotation(t, td, mat);
-		
-		VECCOPY(t->center, center);
+		ElementRotation(t, td, mat, t->around);
 	}
 }
 
@@ -2943,6 +2922,36 @@ static void applyTranslation(TransInfo *t, float vec[3]) {
 		if (td->flag & TD_SKIP)
 			continue;
 		
+		/* handle snapping rotation before doing the translation */
+		if (usingSnappingNormal(t))
+		{
+			if (validSnappingNormal(t))
+			{
+				float *original_normal = td->axismtx[2];
+				float axis[3];
+				float quat[4];
+				float mat[3][3];
+				float angle;
+				
+				Crossf(axis, original_normal, t->tsnap.snapNormal);
+				angle = saacos(Inpf(original_normal, t->tsnap.snapNormal));
+				
+				AxisAngleToQuat(quat, axis, angle);
+	
+				QuatToMat3(quat, mat);
+				
+				ElementRotation(t, td, mat, V3D_LOCAL);
+			}
+			else
+			{
+				float mat[3][3];
+				
+				Mat3One(mat);
+				
+				ElementRotation(t, td, mat, V3D_LOCAL);
+			}
+		}
+
 		if (t->con.applyVec) {
 			float pvec[3];
 			t->con.applyVec(t, td, vec, tvec, pvec);
@@ -3305,7 +3314,7 @@ int PushPull(TransInfo *t, short mval[2])
 	}
 	
 	if (t->con.applyRot && t->con.mode & CON_APPLY) {
-		t->con.applyRot(t, NULL, axis);
+		t->con.applyRot(t, NULL, axis, NULL);
 	}
 	
 	for(i = 0 ; i < t->total; i++, td++) {
@@ -3317,7 +3326,7 @@ int PushPull(TransInfo *t, short mval[2])
 
 		VecSubf(vec, t->center, td->center);
 		if (t->con.applyRot && t->con.mode & CON_APPLY) {
-			t->con.applyRot(t, td, axis);
+			t->con.applyRot(t, td, axis, NULL);
 			if (isLockConstraint(t)) {
 				float dvec[3];
 				Projf(dvec, vec, axis);
@@ -4157,7 +4166,7 @@ int Align(TransInfo *t, short mval[2])
 		
 		Mat3MulMat3(mat, t->spacemtx, invmat);	
 
-		ElementRotation(t, td, mat);
+		ElementRotation(t, td, mat, t->around);
 	}
 
 	/* restoring original center */
diff --git a/source/blender/src/transform_constraints.c b/source/blender/src/transform_constraints.c
index 769ebd2ea97..796b013cb88 100644
--- a/source/blender/src/transform_constraints.c
+++ b/source/blender/src/transform_constraints.c
@@ -393,7 +393,7 @@ static void applyObjectConstraintSize(TransInfo *t, TransData *td, float smat[3]
  * (ie: not doing counterclockwise rotations when the mouse moves clockwise).
  */
 
-static void applyAxisConstraintRot(TransInfo *t, TransData *td, float vec[3])
+static void applyAxisConstraintRot(TransInfo *t, TransData *td, float vec[3], float *angle)
 {
 	if (!td && t->con.mode & CON_APPLY) {
 		int mode = t->con.mode & (CON_AXIS0|CON_AXIS1|CON_AXIS2);
@@ -413,9 +413,9 @@ static void applyAxisConstraintRot(TransInfo *t, TransData *td, float vec[3])
 			break;
 		}
 		/* don't flip axis if asked to or if num input */
-		if (!(mode & CON_NOFLIP) && hasNumInput(&t->num) == 0) {
+		if (angle && (mode & CON_NOFLIP) == 0 && hasNumInput(&t->num) == 0) {
 			if (Inpf(vec, t->viewinv[2]) > 0.0f) {
-				VecMulf(vec, -1.0f);
+				*angle = -(*angle);
 			}
 		}
 	}
@@ -435,10 +435,15 @@ static void applyAxisConstraintRot(TransInfo *t, TransData *td, float vec[3])
  * (ie: not doing counterclockwise rotations when the mouse moves clockwise).
  */
 
-static void applyObjectConstraintRot(TransInfo *t, TransData *td, float vec[3])
+static void applyObjectConstraintRot(TransInfo *t, TransData *td, float vec[3], float *angle)
 {
-	if (td && t->con.mode & CON_APPLY) {
+	if (t->con.mode & CON_APPLY) {
 		int mode = t->con.mode & (CON_AXIS0|CON_AXIS1|CON_AXIS2);
+		
+		/* on setup call, use first object */
+		if (td == NULL) {
+			td= t->data;
+		}
 
 		switch(mode) {
 		case CON_AXIS0:
@@ -454,9 +459,9 @@ static void applyObjectConstraintRot(TransInfo *t, TransData *td, float vec[3])
 			VECCOPY(vec, td->axismtx[2]);
 			break;
 		}
-		if (!(mode & CON_NOFLIP)) {
+		if (angle && (mode & CON_NOFLIP) == 0 && hasNumInput(&t->num) == 0) {
 			if (Inpf(vec, t->viewinv[2]) > 0.0f) {
-				VecMulf(vec, -1.0f);
+				*angle = -(*angle);
 			}
 		}
 	}
@@ -550,6 +555,10 @@ void setUserConstraint(TransInfo *t, int mode, const char ftext[]) {
 void BIF_setLocalLockConstraint(char axis, char *text) {
 	TransInfo *t = BIF_GetTransInfo();
 
+	if (t->total == 0) {
+		return;
+	}
+	
 	switch (axis) {
 	case 'x':
 		setLocalConstraint(t, (CON_AXIS1|CON_AXIS2), text);
@@ -566,6 +575,10 @@ void BIF_setLocalLockConstraint(char axis, char *text) {
 void BIF_setLocalAxisConstraint(char axis, char *text) {
 	TransInfo *t = BIF_GetTransInfo();
 
+	if (t->total == 0) {
+		return;
+	}
+	
 	switch (axis) {
 	case 'X':
 		setLocalConstraint(t, CON_AXIS0, text);
@@ -584,6 +597,10 @@ void BIF_setSingleAxisConstraint(float vec[3], char *text) {
 	TransInfo *t = BIF_GetTransInfo();
 	float space[3][3], v[3];
 	
+	if (t->total == 0) {
+		return;
+	}
+	
 	VECCOPY(space[0], vec);
 
 	v[0] = vec[2];
@@ -622,6 +639,10 @@ void BIF_setDualAxisConstraint(float vec1[3], float vec2[3], char *text) {
 	TransInfo *t = BIF_GetTransInfo();
 	float space[3][3];
 	
+	if (t->total == 0) {
+		return;
+	}
+
 	VECCOPY(space[0], vec1);
 	VECCOPY(space[1], vec2);
 	Crossf(space[2], space[0], space[1]);
diff --git a/source/blender/src/transform_conversions.c b/source/blender/src/transform_conversions.c
index dcebf6b7557..562d9a4934d 100644
--- a/source/blender/src/transform_conversions.c
+++ b/source/blender/src/transform_conversions.c
@@ -3610,6 +3610,7 @@ void special_aftertrans_update(TransInfo *t)
 	Base *base;
 	short redrawipo=0, resetslowpar=1;
 	int cancelled= (t->state == TRANS_CANCEL);
+	short duplicate= (t->undostr && strstr(t->undostr, "Duplicate")) ? 1 : 0;
 	
 	if (t->spacetype==SPACE_VIEW3D) {
 		if (G.obedit) {
@@ -3644,7 +3645,7 @@ void special_aftertrans_update(TransInfo *t)
 			
 			/* Do curve cleanups? */
 			if ( (G.saction->flag & SACTION_NOTRANSKEYCULL)==0 && 
-			     (cancelled == 0) )
+			     ((cancelled == 0) || (duplicate)) )
 			{
 				posttrans_action_clean((bAction *)data);
 			}
@@ -3659,7 +3660,7 @@ void special_aftertrans_update(TransInfo *t)
 				IpoCurve *icu;
 				
 				if ( (G.saction->flag & SACTION_NOTRANSKEYCULL)==0 && 
-				     (cancelled == 0) )
+				     ((cancelled == 0) || (duplicate)) )
 				{
 					posttrans_ipo_clean(key->ipo);
 				}
@@ -3685,7 +3686,7 @@ void special_aftertrans_update(TransInfo *t)
 		
 		/* after transform, remove duplicate keyframes on a frame that resulted from transform */
 		if ( (G.snla->flag & SNLA_NOTRANSKEYCULL)==0 && 
-			 (cancelled == 0) )
+			 ((cancelled == 0) || (duplicate)) )
 		{
 			posttrans_nla_clean(t);
 		}
diff --git a/source/blender/src/transform_generics.c b/source/blender/src/transform_generics.c
index 8154929eb17..6cb7a34d1bc 100644
--- a/source/blender/src/transform_generics.c
+++ b/source/blender/src/transform_generics.c
@@ -113,7 +113,6 @@ extern TransInfo Trans;	/* From transform.c */
 
 /* ************************** Functions *************************** */
 
-
 void getViewVector(float coord[3], float vec[3])
 {
 	TransInfo *t = BIF_GetTransInfo();
@@ -326,7 +325,7 @@ void recalcData(TransInfo *t)
 		else {
 			for (base=G.scene->base.first; base; base=base->next) {
 				/* recalculate scale of selected nla-strips */
-				if (base->object->nlastrips.first) {
+				if (base->object && base->object->nlastrips.first) {
 					Object *bob= base->object;
 					bActionStrip *strip;
 					
@@ -399,8 +398,15 @@ void recalcData(TransInfo *t)
 				}
 			}
 			else if(G.sipo->blocktype==ID_OB) {
+				Object *ob= OBACT;
 				Base *base= FIRSTBASE;
 				
+				/* only if this if active object has this ipo in an action (assumes that current ipo is in action) */
+				if ((ob) && (ob->ipoflag & OB_ACTION_OB) && (G.sipo->pin==0)) {
+					ob->ctime= -1234567.0f;
+					DAG_object_flush_update(G.scene, ob, OB_RECALC_OB);
+				}
+				
 				while(base) {
 					if(base->object->ipo==G.sipo->ipo) {
 						do_ob_ipo(base->object);
diff --git a/source/blender/src/transform_snap.c b/source/blender/src/transform_snap.c
index 0e69e823d92..3c17d0c1da8 100644
--- a/source/blender/src/transform_snap.c
+++ b/source/blender/src/transform_snap.c
@@ -55,11 +55,13 @@
 #include "BIF_screen.h"
 #include "BIF_editsima.h"
 #include "BIF_drawimage.h"
+#include "BIF_editmesh.h"
 
 #include "BKE_global.h"
 #include "BKE_utildefines.h"
 #include "BKE_DerivedMesh.h"
 #include "BKE_object.h"
+#include "BKE_anim.h" /* for duplis */
 
 #include "BSE_view.h"
 
@@ -92,7 +94,8 @@ float ResizeBetween(TransInfo *t, float p1[3], float p2[3]);
 /* Modes */
 #define NOT_SELECTED 0
 #define NOT_ACTIVE 1
-int findNearestVertFromObjects(int *dist, float *loc, int mode);
+int snapObjects(int *dist, float *loc, float *no, int mode);
+
 
 /****************** IMPLEMENTATIONS *********************/
 
@@ -131,6 +134,15 @@ void drawSnapping(TransInfo *t)
 			
 			glTranslatef(t->tsnap.snapPoint[0], t->tsnap.snapPoint[1], t->tsnap.snapPoint[2]);
 			
+			/* draw normal if needed */
+			if (usingSnappingNormal(t) && validSnappingNormal(t))
+			{
+				glBegin(GL_LINES);
+					glVertex3f(0, 0, 0);
+					glVertex3f(t->tsnap.snapNormal[0], t->tsnap.snapNormal[1], t->tsnap.snapNormal[2]);
+				glEnd();
+			}
+			
 			/* sets view screen aligned */
 			glRotatef( -360.0f*saacos(G.vd->viewquat[0])/(float)M_PI, G.vd->viewquat[1], G.vd->viewquat[2], G.vd->viewquat[3]);
 			
@@ -201,7 +213,8 @@ void applySnapping(TransInfo *t, float *vec)
 		double current = PIL_check_seconds_timer();
 		
 		// Time base quirky code to go around findnearest slowness
-		if (current - t->tsnap.last  >= 0.25)
+		/* !TODO! add exception for object mode, no need to slow it down then */
+		if (current - t->tsnap.last  >= 0.1)
 		{
 			t->tsnap.calcSnap(t, vec);
 			t->tsnap.targetSnap(t);
@@ -222,6 +235,35 @@ void resetSnapping(TransInfo *t)
 	t->tsnap.modeTarget = 0;
 	t->tsnap.last = 0;
 	t->tsnap.applySnap = NULL;
+
+	t->tsnap.snapNormal[0] = 0;
+	t->tsnap.snapNormal[1] = 0;
+	t->tsnap.snapNormal[2] = 0;
+}
+
+int usingSnappingNormal(TransInfo *t)
+{
+	if (G.scene->snap_flag & SCE_SNAP_ROTATE)
+	{
+		return 1;
+	}
+	else
+	{
+		return 0;
+	}
+}
+
+int validSnappingNormal(TransInfo *t)
+{
+	if ((t->tsnap.status & (POINT_INIT|TARGET_INIT)) == (POINT_INIT|TARGET_INIT))
+	{
+		if (Inpf(t->tsnap.snapNormal, t->tsnap.snapNormal) > 0)
+		{
+			return 1;
+		}
+	}
+	
+	return 0;
 }
 
 void initSnapping(TransInfo *t)
@@ -370,7 +412,7 @@ float RotationBetween(TransInfo *t, float p1[3], float p2[3])
 	if (t->con.applyRot != NULL && (t->con.mode & CON_APPLY)) {
 		float axis[3], tmp[3];
 		
-		t->con.applyRot(t, NULL, axis);
+		t->con.applyRot(t, NULL, axis, NULL);
 
 		Projf(tmp, end, axis);
 		VecSubf(end, end, tmp);
@@ -445,14 +487,26 @@ void CalcSnapGeometry(TransInfo *t, float *vec)
 		if (t->spacetype == SPACE_VIEW3D)
 		{
 			float vec[3];
+			float no[3];
 			int found = 0;
 			int dist = 40; // Use a user defined value here
 			
-			found = findNearestVertFromObjects(&dist, vec, NOT_SELECTED);
+			found = snapObjects(&dist, vec, no, NOT_SELECTED);
 			if (found == 1)
 			{
-				VECCOPY(t->tsnap.snapPoint, vec);
+				float tangent[3];
 				
+				VecSubf(tangent, vec, t->tsnap.snapPoint);
+				tangent[2] = 0; 
+				
+				if (Inpf(tangent, tangent) > 0)
+				{
+					VECCOPY(t->tsnap.snapTangent, tangent);
+				}
+				
+				VECCOPY(t->tsnap.snapPoint, vec);
+				VECCOPY(t->tsnap.snapNormal, no);
+
 				t->tsnap.status |=  POINT_INIT;
 			}
 			else
@@ -464,31 +518,18 @@ void CalcSnapGeometry(TransInfo *t, float *vec)
 	/* Mesh edit mode */
 	else if (G.obedit != NULL && G.obedit->type==OB_MESH)
 	{
-		/*if (G.scene->selectmode & B_SEL_VERT)*/
-		
 		if (t->spacetype == SPACE_VIEW3D)
 		{
-			EditVert *nearest=NULL;
 			float vec[3];
+			float no[3];
 			int found = 0;
 			int dist = 40; // Use a user defined value here
-			
-			// use findnearestverts in vert mode, others in other modes
-			nearest = findnearestvert(&dist, SELECT, 1);
-			
-			found = findNearestVertFromObjects(&dist, vec, NOT_ACTIVE);
+
+			found = snapObjects(&dist, vec, no, NOT_ACTIVE);
 			if (found == 1)
 			{
 				VECCOPY(t->tsnap.snapPoint, vec);
-				
-				t->tsnap.status |=  POINT_INIT;
-			}
-			/* If there's no outside vertex nearer, but there's one in this mesh
-			 */
-			else if (nearest != NULL)
-			{
-				VECCOPY(t->tsnap.snapPoint, nearest->co);
-				Mat4MulVecfl(G.obedit->obmat, t->tsnap.snapPoint);
+				VECCOPY(t->tsnap.snapNormal, no);
 				
 				t->tsnap.status |=  POINT_INIT;
 			}
@@ -522,33 +563,6 @@ void CalcSnapGeometry(TransInfo *t, float *vec)
 				t->tsnap.status &= ~POINT_INIT;
 			}
 		}
-		
-		
-		/*
-		if (G.scene->selectmode & B_SEL_EDGE)
-		{
-			EditEdge *nearest=NULL;
-			int dist = 50; // Use a user defined value here
-			
-			// use findnearestverts in vert mode, others in other modes
-			nearest = findnearestedge(&dist);
-			
-			if (nearest != NULL)
-			{
-				VecAddf(t->tsnap.snapPoint, nearest->v1->co, nearest->v2->co);
-				
-				VecMulf(t->tsnap.snapPoint, 0.5f); 
-				
-				Mat4MulVecfl(G.obedit->obmat, t->tsnap.snapPoint);
-				
-				t->tsnap.status |=  POINT_INIT;
-			}
-			else
-			{
-				t->tsnap.status &= ~POINT_INIT;
-			}
-		}
-		*/
 	}
 }
 
@@ -723,101 +737,478 @@ void TargetSnapClosest(TransInfo *t)
 }
 /*================================================================*/
 
-int findNearestVertFromObjects(int *dist, float *loc, int mode) {
+int snapDerivedMesh(Object *ob, DerivedMesh *dm, float obmat[][4], float ray_start[3], float ray_normal[3], short mval[2], float *loc, float *no, int *dist, float *depth, short EditMesh)
+{
+	int retval = 0;
+	int totvert = dm->getNumVerts(dm);
+	int totface = dm->getNumFaces(dm);
+	
+	if (totvert > 0) {
+		float imat[4][4];
+		float timat[3][3]; /* transpose inverse matrix for normals */
+		float ray_start_local[3], ray_normal_local[3];
+		int test = 1;
+
+		Mat4Invert(imat, obmat);
+
+		Mat3CpyMat4(timat, imat);
+		Mat3Transp(timat);
+		
+		VECCOPY(ray_start_local, ray_start);
+		VECCOPY(ray_normal_local, ray_normal);
+		
+		Mat4MulVecfl(imat, ray_start_local);
+		Mat4Mul3Vecfl(imat, ray_normal_local);
+		
+		
+		/* If number of vert is more than an arbitrary limit, 
+		 * test against boundbox first
+		 * */
+		if (totface > 16) {
+			struct BoundBox *bb = object_get_boundbox(ob);
+			test = ray_hit_boundbox(bb, ray_start_local, ray_normal_local);
+		}
+		
+		if (test == 1) {
+			
+			switch (G.scene->snap_mode)
+			{
+				case SCE_SNAP_MODE_FACE:
+				{ 
+					MVert *verts = dm->getVertArray(dm);
+					MFace *faces = dm->getFaceArray(dm);
+					int *index_array = NULL;
+					int index = 0;
+					int i;
+					
+					if (EditMesh)
+					{
+						index_array = dm->getFaceDataArray(dm, CD_ORIGINDEX);
+						EM_init_index_arrays(0, 0, 1);
+					}
+					
+					for( i = 0; i < totface; i++) {
+						EditFace *efa = NULL;
+						MFace *f = faces + i;
+						float lambda;
+						int result;
+						
+						test = 1; /* reset for every face */
+					
+						if (EditMesh)
+						{
+							if (index_array)
+							{
+								index = index_array[i];
+							}
+							else
+							{
+								index = i;
+							}
+							
+							if (index == ORIGINDEX_NONE)
+							{
+								test = 0;
+							}
+							else
+							{
+								efa = EM_get_face_for_index(index);
+								
+								if (efa && ((efa->v1->f & SELECT) || (efa->v2->f & SELECT) || (efa->v3->f & SELECT) || (efa->v4 && efa->v4->f & SELECT)))
+								{
+									test = 0;
+								}
+							}
+						}
+						
+						
+						if (test)
+						{
+							result = RayIntersectsTriangle(ray_start_local, ray_normal_local, verts[f->v1].co, verts[f->v2].co, verts[f->v3].co, &lambda, NULL);
+							
+							if (result) {
+								float location[3], normal[3];
+								float intersect[3];
+								float new_depth;
+								int screen_loc[2];
+								int new_dist;
+								
+								VECCOPY(intersect, ray_normal_local);
+								VecMulf(intersect, lambda);
+								VecAddf(intersect, intersect, ray_start_local);
+								
+								VECCOPY(location, intersect);
+								
+								if (f->v4)
+									CalcNormFloat4(verts[f->v1].co, verts[f->v2].co, verts[f->v3].co, verts[f->v4].co, normal);
+								else
+									CalcNormFloat(verts[f->v1].co, verts[f->v2].co, verts[f->v3].co, normal);
+
+								Mat4MulVecfl(obmat, location);
+								
+								new_depth = VecLenf(location, ray_start);					
+								
+								project_int(location, screen_loc);
+								new_dist = abs(screen_loc[0] - mval[0]) + abs(screen_loc[1] - mval[1]);
+								
+								if (new_dist <= *dist && new_depth < *depth)
+								{
+									*depth = new_depth;
+									retval = 1;
+									
+									VECCOPY(loc, location);
+									VECCOPY(no, normal);
+									
+									Mat3MulVecfl(timat, no);
+									Normalize(no);
+					
+									*dist = new_dist;
+								} 
+							}
+					
+							if (f->v4 && result == 0)
+							{
+								result = RayIntersectsTriangle(ray_start_local, ray_normal_local, verts[f->v3].co, verts[f->v4].co, verts[f->v1].co, &lambda, NULL);
+								
+								if (result) {
+									float location[3], normal[3];
+									float intersect[3];
+									float new_depth;
+									int screen_loc[2];
+									int new_dist;
+									
+									VECCOPY(intersect, ray_normal_local);
+									VecMulf(intersect, lambda);
+									VecAddf(intersect, intersect, ray_start_local);
+									
+									VECCOPY(location, intersect);
+									
+									if (f->v4)
+										CalcNormFloat4(verts[f->v1].co, verts[f->v2].co, verts[f->v3].co, verts[f->v4].co, normal);
+									else
+										CalcNormFloat(verts[f->v1].co, verts[f->v2].co, verts[f->v3].co, normal);
+	
+									Mat4MulVecfl(obmat, location);
+									
+									new_depth = VecLenf(location, ray_start);					
+									
+									project_int(location, screen_loc);
+									new_dist = abs(screen_loc[0] - mval[0]) + abs(screen_loc[1] - mval[1]);
+									
+									if (new_dist <= *dist && new_depth < *depth)
+									{
+										*depth = new_depth;
+										retval = 1;
+										
+										VECCOPY(loc, location);
+										VECCOPY(no, normal);
+										
+										Mat3MulVecfl(timat, no);
+										Normalize(no);
+						
+										*dist = new_dist;
+									}
+								} 
+							}
+						}
+					}
+					
+					if (EditMesh)
+					{
+						EM_free_index_arrays();
+					}
+					break;
+				}
+				case SCE_SNAP_MODE_VERTEX:
+				{
+					MVert *verts = dm->getVertArray(dm);
+					int *index_array = NULL;
+					int index = 0;
+					int i;
+					
+					if (EditMesh)
+					{
+						index_array = dm->getVertDataArray(dm, CD_ORIGINDEX);
+						EM_init_index_arrays(1, 0, 0);
+					}
+					
+					for( i = 0; i < totvert; i++) {
+						EditVert *eve = NULL;
+						MVert *v = verts + i;
+						
+						test = 1; /* reset for every vert */
+					
+						if (EditMesh)
+						{
+							if (index_array)
+							{
+								index = index_array[i];
+							}
+							else
+							{
+								index = i;
+							}
+							
+							if (index == ORIGINDEX_NONE)
+							{
+								test = 0;
+							}
+							else
+							{
+								eve = EM_get_vert_for_index(index);
+								
+								if (eve && eve->f & SELECT)
+								{
+									test = 0;
+								}
+							}
+						}
+						
+						
+						if (test)
+						{
+							float dvec[3];
+							
+							VecSubf(dvec, v->co, ray_start_local);
+							
+							if (Inpf(ray_normal_local, dvec) > 0)
+							{
+								float location[3];
+								float new_depth;
+								int screen_loc[2];
+								int new_dist;
+								
+								VECCOPY(location, v->co);
+								
+								Mat4MulVecfl(obmat, location);
+								
+								new_depth = VecLenf(location, ray_start);					
+								
+								project_int(location, screen_loc);
+								new_dist = abs(screen_loc[0] - mval[0]) + abs(screen_loc[1] - mval[1]);
+								
+								if (new_dist <= *dist && new_depth < *depth)
+								{
+									*depth = new_depth;
+									retval = 1;
+									
+									VECCOPY(loc, location);
+									
+									NormalShortToFloat(no, v->no);
+									Mat3MulVecfl(timat, no);
+									Normalize(no);
+					
+									*dist = new_dist;
+								} 
+							}
+						}
+					}
+
+					if (EditMesh)
+					{
+						EM_free_index_arrays();
+					}
+					break;
+				}
+				case SCE_SNAP_MODE_EDGE:
+				{
+					MVert *verts = dm->getVertArray(dm);
+					MEdge *edges = dm->getEdgeArray(dm);
+					int totedge = dm->getNumEdges(dm);
+					int *index_array = NULL;
+					int index = 0;
+					int i;
+					
+					if (EditMesh)
+					{
+						index_array = dm->getEdgeDataArray(dm, CD_ORIGINDEX);
+						EM_init_index_arrays(0, 1, 0);
+					}
+					
+					for( i = 0; i < totedge; i++) {
+						EditEdge *eed = NULL;
+						MEdge *e = edges + i;
+						
+						test = 1; /* reset for every vert */
+					
+						if (EditMesh)
+						{
+							if (index_array)
+							{
+								index = index_array[i];
+							}
+							else
+							{
+								index = i;
+							}
+							
+							if (index == ORIGINDEX_NONE)
+							{
+								test = 0;
+							}
+							else
+							{
+								eed = EM_get_edge_for_index(index);
+								
+								if (eed && ((eed->v1->f & SELECT) || (eed->v2->f & SELECT)))
+								{
+									test = 0;
+								}
+							}
+						}
+						
+						
+						if (test)
+						{
+							float intersect[3] = {0, 0, 0}, ray_end[3], dvec[3];
+							int result;
+							
+							VECCOPY(ray_end, ray_normal_local);
+							VecMulf(ray_end, 2000);
+							VecAddf(ray_end, ray_start_local, ray_end);
+							
+							result = LineIntersectLine(verts[e->v1].co, verts[e->v2].co, ray_start_local, ray_end, intersect, dvec); /* dvec used but we don't care about result */
+							
+							if (result)
+							{
+								float edge_loc[3], vec[3];
+								float mul;
+							
+								/* check for behind ray_start */
+								VecSubf(dvec, intersect, ray_start_local);
+								
+								VecSubf(edge_loc, verts[e->v1].co, verts[e->v2].co);
+								VecSubf(vec, intersect, verts[e->v2].co);
+								
+								mul = Inpf(vec, edge_loc) / Inpf(edge_loc, edge_loc);
+								
+								if (mul > 1) {
+									mul = 1;
+									VECCOPY(intersect, verts[e->v1].co);
+								}
+								else if (mul < 0) {
+									mul = 0;
+									VECCOPY(intersect, verts[e->v2].co);
+								}
+	
+								if (Inpf(ray_normal_local, dvec) > 0)
+								{
+									float location[3];
+									float new_depth;
+									int screen_loc[2];
+									int new_dist;
+									
+									VECCOPY(location, intersect);
+									
+									Mat4MulVecfl(obmat, location);
+									
+									new_depth = VecLenf(location, ray_start);					
+									
+									project_int(location, screen_loc);
+									new_dist = abs(screen_loc[0] - mval[0]) + abs(screen_loc[1] - mval[1]);
+									
+									if (new_dist <= *dist && new_depth < *depth)
+									{
+										float n1[3], n2[3];
+										
+										*depth = new_depth;
+										retval = 1;
+										
+										VecSubf(edge_loc, verts[e->v1].co, verts[e->v2].co);
+										VecSubf(vec, intersect, verts[e->v2].co);
+										
+										mul = Inpf(vec, edge_loc) / Inpf(edge_loc, edge_loc);
+										
+										NormalShortToFloat(n1, verts[e->v1].no);						
+										NormalShortToFloat(n2, verts[e->v2].no);
+										VecLerpf(no, n2, n1, mul);
+										Normalize(no);			
+	
+										VECCOPY(loc, location);
+										
+										Mat3MulVecfl(timat, no);
+										Normalize(no);
+										
+										*dist = new_dist;
+									} 
+								}
+							}
+						}
+					}
+
+					if (EditMesh)
+					{
+						EM_free_index_arrays();
+					}
+					break;
+				}
+			}
+		}
+	}
+
+	return retval;
+} 
+
+int snapObjects(int *dist, float *loc, float *no, int mode) {
 	Base *base;
+	float depth = FLT_MAX;
 	int retval = 0;
 	short mval[2];
+	float ray_start[3], ray_normal[3];
 	
 	getmouseco_areawin(mval);
+	viewray(mval, ray_start, ray_normal);
+
+	if (mode == NOT_ACTIVE)
+	{
+		DerivedMesh *dm;
+		Object *ob = G.obedit;
+		
+		dm = editmesh_get_derived_cage(CD_MASK_BAREMESH);
+		
+		retval = snapDerivedMesh(ob, dm, ob->obmat, ray_start, ray_normal, mval, loc, no, dist, &depth, 1);
+		
+		dm->release(dm);
+	}
 	
 	base= FIRSTBASE;
 	for ( base = FIRSTBASE; base != NULL; base = base->next ) {
 		if ( BASE_SELECTABLE(base) && ((mode == NOT_SELECTED && (base->flag & SELECT) == 0) || (mode == NOT_ACTIVE && base != BASACT)) ) {
 			Object *ob = base->object;
 			
-			if (ob->type == OB_MESH) {
-				Mesh *me = ob->data;
+			if (ob->transflag & OB_DUPLI)
+			{
+				DupliObject *dupli_ob;
+				ListBase *lb = object_duplilist(G.scene, ob);
 				
-				if (me->totvert > 0) {
-					int test = 1;
-					int i;
+				for(dupli_ob = lb->first; dupli_ob; dupli_ob = dupli_ob->next)
+				{
+					Object *ob = dupli_ob->ob;
 					
-					/* If number of vert is more than an arbitrary limit,
-					 * test against boundbox first
-					 * */
-					if (me->totvert > 16) {
-						struct BoundBox *bb = object_get_boundbox(ob);
+					if (ob->type == OB_MESH) {
+						DerivedMesh *dm = mesh_get_derived_final(ob, CD_MASK_BAREMESH);
+						int val;
 						
-						int minx = 0, miny = 0, maxx = 0, maxy = 0;
-						int i;
-						
-						for (i = 0; i < 8; i++) {
-							float gloc[3];
-							int sloc[2];
-							
-							VECCOPY(gloc, bb->vec[i]);
-							Mat4MulVecfl(ob->obmat, gloc);
-							project_int(gloc, sloc);
-							
-							if (i == 0) {
-								minx = maxx = sloc[0];
-								miny = maxy = sloc[1];
-							}
-							else {
-								if (minx > sloc[0]) minx = sloc[0];
-								else if (maxx < sloc[0]) maxx = sloc[0];
-								
-								if (miny > sloc[1]) miny = sloc[1];
-								else if (maxy < sloc[1]) maxy = sloc[1];
-							}
-						}
-						
-						/* Pad with distance */
+						val = snapDerivedMesh(ob, dm, dupli_ob->mat, ray_start, ray_normal, mval, loc, no, dist, &depth, 0);
 	
-						minx -= *dist;
-						miny -= *dist;
-						maxx += *dist;
-						maxy += *dist;
-						
-						if (mval[0] > maxx || mval[0] < minx ||
-							mval[1] > maxy || mval[1] < miny) {
-							
-							test = 0;
-						}
-					}
-					
-					if (test == 1) {
-						float *verts = mesh_get_mapped_verts_nors(ob);
-						
-						if (verts != NULL) {
-							float *fp;
-							
-							fp = verts;
-							for( i = 0; i < me->totvert; i++, fp += 6) {
-								float gloc[3];
-								int sloc[2];
-								int curdist;
-								
-								VECCOPY(gloc, fp);
-								Mat4MulVecfl(ob->obmat, gloc);
-								project_int(gloc, sloc);
-								
-								sloc[0] -= mval[0];
-								sloc[1] -= mval[1];
-								
-								curdist = abs(sloc[0]) + abs(sloc[1]);
-								
-								if (curdist < *dist) {
-									*dist = curdist;
-									retval = 1;
-									VECCOPY(loc, gloc);
-								}
-							}
-						}
-
-						MEM_freeN(verts);
+						retval = retval || val;
+	
+						dm->release(dm);
 					}
 				}
+				
+				free_object_duplilist(lb);
+			}
+			
+			if (ob->type == OB_MESH) {
+				DerivedMesh *dm = mesh_get_derived_final(ob, CD_MASK_BAREMESH);
+				int val;
+				
+				val = snapDerivedMesh(ob, dm, ob->obmat, ray_start, ray_normal, mval, loc, no, dist, &depth, 0);
+				
+				retval = retval || val;
+				
+				dm->release(dm);
 			}
 		}
 	}
diff --git a/source/blender/src/usiblender.c b/source/blender/src/usiblender.c
index 2e55f8cdbc2..a45ddc73972 100644
--- a/source/blender/src/usiblender.c
+++ b/source/blender/src/usiblender.c
@@ -34,6 +34,8 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "GL/glew.h"
+
 #ifdef WIN32
 #include <windows.h> /* need to include windows.h so _WIN32_IE is defined  */
 #ifndef _WIN32_IE
@@ -927,7 +929,7 @@ void BIF_write_file(char *target)
 
 		writeBlog();
 	} else {
-		error("%s", err);
+		error("failed to write blend file: %s", err);
 	}
 
 	waitcursor(0);
@@ -942,7 +944,10 @@ void BIF_write_homefile(void)
 		
 	/*  force save as regular blend file */
 	write_flags = G.fileflags & ~(G_FILE_COMPRESS | G_FILE_LOCK | G_FILE_SIGN);
-	BLO_write_file(tstr, write_flags, &err);
+	
+	if (!BLO_write_file(tstr, write_flags, &err)) {
+		error("failed writing defaults: %s", err);
+	}
 }
 
 void BIF_write_autosave(void)
@@ -954,7 +959,9 @@ void BIF_write_autosave(void)
 
 		/*  force save as regular blend file */
 	write_flags = G.fileflags & ~(G_FILE_COMPRESS | G_FILE_LOCK | G_FILE_SIGN);
-	BLO_write_file(tstr, write_flags, &err);
+	if (!BLO_write_file(tstr, write_flags, &err)) {
+		fprintf(stderr, "failed to write autosave: %s\n", err); /* using error(...) is too annoying here */
+	}
 }
 
 /* remove temp files assosiated with this blend file when quitting, loading or saving in a new path */
@@ -1035,6 +1042,7 @@ void BIF_init(void)
 	BIF_filelist_init_icons();
 
 	init_gl_stuff();	/* drawview.c, after homefile */
+	glewInit();
 	readBlog();
 	BLI_strncpy(G.lib, G.sce, FILE_MAX);
 }
diff --git a/source/blender/src/view.c b/source/blender/src/view.c
index f53bcb3a9f7..12450bee9de 100644
--- a/source/blender/src/view.c
+++ b/source/blender/src/view.c
@@ -144,6 +144,48 @@ void persp(int a)
 	}
 }
 
+/* create intersection ray in view Z direction at mouse coordinates */
+void viewray(short mval[2], float ray_start[3], float ray_normal[3])
+{
+	float ray_end[3];
+	viewline(mval, ray_start, ray_end);
+	VecSubf(ray_normal, ray_end, ray_start);
+	Normalize(ray_normal);
+}
+
+/* create intersection coordinates in view Z direction at mouse coordinates */
+void viewline(short mval[2], float ray_start[3], float ray_end[3])
+{
+	float vec[4];
+	
+	if(G.vd->persp != V3D_ORTHO){
+		vec[0]= 2.0f * mval[0] / curarea->winx - 1;
+		vec[1]= 2.0f * mval[1] / curarea->winy - 1;
+		vec[2]= -1.0f;
+		vec[3]= 1.0f;
+
+		Mat4MulVec4fl(G.vd->persinv, vec);
+		VecMulf(vec, 1.0f / vec[3]);
+
+		VECCOPY(ray_start, G.vd->viewinv[3]);
+		VECSUB(vec, vec, ray_start);
+		Normalize(vec);
+
+		VECADDFAC(ray_start, G.vd->viewinv[3], vec, G.vd->near);
+		VECADDFAC(ray_end, G.vd->viewinv[3], vec, G.vd->far);
+	}
+	else {
+		vec[0] = 2.0f * mval[0] / curarea->winx - 1;
+		vec[1] = 2.0f * mval[1] / curarea->winy - 1;
+		vec[2] = 0.0f;
+		vec[3] = 1.0f;
+
+		Mat4MulVec4fl(G.vd->persinv, vec);
+
+		VECADDFAC(ray_start, vec, G.vd->viewinv[2],  1000.0f);
+		VECADDFAC(ray_end, vec, G.vd->viewinv[2], -1000.0f);
+	}
+}
 
 void initgrabz(float x, float y, float z)
 {
@@ -647,10 +689,6 @@ void viewmoveNDOFfly(int mode)
 	if (G.vd->ndoffilter)
 		filterNDOFvalues(fval);
 
-//	for(i=0;i<7;i++) printf("%f ",dval[i]);
-//		printf("\n");
-
-
 	// Scale input values
 
 //	if(dval[6] == 0) return; // guard against divide by zero
@@ -659,12 +697,6 @@ void viewmoveNDOFfly(int mode)
 
 		// user scaling
 		dval[i] = dval[i] * ndof_axis_scale[i];
-
-		// non-linear scaling
-		if(dval[i]<0.0f)
-			dval[i] = -1.0f * dval[i] * dval[i];
-		else
-			dval[i] = dval[i] * dval[i];
 	}
 
 
@@ -711,10 +743,11 @@ void viewmoveNDOFfly(int mode)
 
 
 	// Apply rotation
-
-	rvec[0] = -dval[3];
-	rvec[1] = -dval[4];
-	rvec[2] = dval[5];
+	// Rotations feel relatively faster than translations only in fly mode, so
+	// we have no choice but to fix that here (not in the plugins)
+	rvec[0] = -0.5 * dval[3];
+	rvec[1] = -0.5 * dval[4];
+	rvec[2] = -0.5 * dval[5];
 
 	// rotate device x and y by view z
 
@@ -782,8 +815,7 @@ void viewmove(int mode)
 		return;
 	}
 	
-		// dist correction from other movement devices
-		
+	// dist correction from other movement devices	
 	if((dz_flag)||G.vd->dist==0) {
 		dz_flag = 0;
 		G.vd->dist = m_dist;
@@ -1122,8 +1154,10 @@ void viewmoveNDOF(int mode)
     float q1[4];
     float obofs[3];
     float reverse;
-    float diff[4];
+    //float diff[4];
     float d, curareaX, curareaY;
+    float mat[3][3];
+    float upvec[3];
 
     /* Sensitivity will control how fast the view rotates.  The value was
      * obtained experimentally by tweaking until the author didn't get dizzy watching.
@@ -1144,6 +1178,16 @@ void viewmoveNDOF(int mode)
 		use_sel = 1;
 	}
 
+    if((dz_flag)||G.vd->dist==0) {
+		dz_flag = 0;
+		G.vd->dist = m_dist;
+		upvec[0] = upvec[1] = 0;
+		upvec[2] = G.vd->dist;
+		Mat3CpyMat4(mat, G.vd->viewinv);
+		Mat3MulVecfl(mat, upvec);
+		VecAddf(G.vd->ofs, G.vd->ofs, upvec);
+	}
+
     /*----------------------------------------------------
 	 * sometimes this routine is called from headerbuttons
      * viewmove needs to refresh the screen
@@ -1162,33 +1206,31 @@ void viewmoveNDOF(int mode)
 //    prevTime = now;
  //   sbadjust *= 60 * frametime;             /* normalize ndof device adjustments to 100Hz for framerate independence */
 
-    /* fetch the current state of the ndof device */
+    /* fetch the current state of the ndof device & enforce dominant mode if selected */
     getndof(fval);
- //           printf(" motion command %f %f %f %f %f %f %f \n", fval[0], fval[1], fval[2],
- //           							 fval[3], fval[4], fval[5], fval[6]);
-			if (G.vd->ndoffilter)
-				filterNDOFvalues(fval);
+	if (G.vd->ndoffilter)
+		filterNDOFvalues(fval);
 	
 	
-	// put scaling back here, was previously in ghostwinlay
-            fval[0] = fval[0]  * (1.0f/800.0f);
-            fval[1] = fval[1]  * (1.0f/800.0f);
-            fval[2] = fval[2] * (1.0f/800.0f);
-            fval[3] = fval[3]  * 0.00005f;
-            fval[4] = fval[4]  * 0.00005f;
-            fval[5] = fval[5] * 0.00005f;
-            fval[6] = fval[6]  / 1000000.0f;
+    // put scaling back here, was previously in ghostwinlay
+    fval[0] = fval[0] * (1.0f/600.0f);
+    fval[1] = fval[1] * (1.0f/600.0f);
+    fval[2] = fval[2] * (1.0f/1100.0f);
+    fval[3] = fval[3] * 0.00005f;
+    fval[4] =-fval[4] * 0.00005f;
+    fval[5] = fval[5] * 0.00005f;
+    fval[6] = fval[6] / 1000000.0f;
 			
-	// scale more if not in perspective mode
-			if (G.vd->persp == V3D_ORTHO) {
-				fval[0] = fval[0] * 0.05f;
-				fval[1] = fval[1] * 0.05f;
-				fval[2] = fval[2] * 0.05f;
-				fval[3] = fval[3] * 0.9f;
-				fval[4] = fval[4] * 0.9f;
-				fval[5] = fval[5] * 0.9f;
-				zsens *= 8;
-			}
+    // scale more if not in perspective mode
+    if (G.vd->persp == V3D_ORTHO) {
+        fval[0] = fval[0] * 0.05f;
+        fval[1] = fval[1] * 0.05f;
+        fval[2] = fval[2] * 0.05f;
+        fval[3] = fval[3] * 0.9f;
+        fval[4] = fval[4] * 0.9f;
+        fval[5] = fval[5] * 0.9f;
+        zsens *= 8;
+    }
 			
 	
     /* set object offset */
@@ -1201,14 +1243,16 @@ void viewmoveNDOF(int mode)
 		VECCOPY(obofs, G.vd->ofs);
 	}
 
-    /* calc an adjustment based on distance from camera */
-    if (ob) {
+    /* calc an adjustment based on distance from camera
+       disabled per patch 14402 */
+     d = 1.0f;
+
+/*    if (ob) {
         VecSubf(diff, obofs, G.vd->ofs);
         d = VecLength(diff);
     }
-    else {
-        d = 1.0f;
-    }
+*/
+
     reverse = (G.vd->persmat[2][1] < 0.0f) ? -1.0f : 1.0f;
 
     /*----------------------------------------------------
diff --git a/source/blender/src/vpaint.c b/source/blender/src/vpaint.c
index 4e883caba55..935c546a235 100644
--- a/source/blender/src/vpaint.c
+++ b/source/blender/src/vpaint.c
@@ -566,9 +566,9 @@ static unsigned int mcol_blend(unsigned int col1, unsigned int col2, int fac)
 	cp=  (char *)&col;
 	
 	cp[0]= 255;
-	cp[1]= (mfac*cp1[1]+fac*cp2[1])>>8;
-	cp[2]= (mfac*cp1[2]+fac*cp2[2])>>8;
-	cp[3]= (mfac*cp1[3]+fac*cp2[3])>>8;
+	cp[1]= (mfac*cp1[1]+fac*cp2[1])/255;
+	cp[2]= (mfac*cp1[2]+fac*cp2[2])/255;
+	cp[3]= (mfac*cp1[3]+fac*cp2[3])/255;
 	
 	return col;
 }
@@ -586,11 +586,11 @@ static unsigned int mcol_add(unsigned int col1, unsigned int col2, int fac)
 	cp=  (char *)&col;
 	
 	cp[0]= 255;
-	temp= cp1[1] + ((fac*cp2[1])>>8);
+	temp= cp1[1] + ((fac*cp2[1])/255);
 	if(temp>254) cp[1]= 255; else cp[1]= temp;
-	temp= cp1[2] + ((fac*cp2[2])>>8);
+	temp= cp1[2] + ((fac*cp2[2])/255);
 	if(temp>254) cp[2]= 255; else cp[2]= temp;
-	temp= cp1[3] + ((fac*cp2[3])>>8);
+	temp= cp1[3] + ((fac*cp2[3])/255);
 	if(temp>254) cp[3]= 255; else cp[3]= temp;
 	
 	return col;
@@ -609,11 +609,11 @@ static unsigned int mcol_sub(unsigned int col1, unsigned int col2, int fac)
 	cp=  (char *)&col;
 	
 	cp[0]= 255;
-	temp= cp1[1] - ((fac*cp2[1])>>8);
+	temp= cp1[1] - ((fac*cp2[1])/255);
 	if(temp<0) cp[1]= 0; else cp[1]= temp;
-	temp= cp1[2] - ((fac*cp2[2])>>8);
+	temp= cp1[2] - ((fac*cp2[2])/255);
 	if(temp<0) cp[2]= 0; else cp[2]= temp;
-	temp= cp1[3] - ((fac*cp2[3])>>8);
+	temp= cp1[3] - ((fac*cp2[3])/255);
 	if(temp<0) cp[3]= 0; else cp[3]= temp;
 	
 	return col;
@@ -635,9 +635,9 @@ static unsigned int mcol_mul(unsigned int col1, unsigned int col2, int fac)
 	
 	/* first mul, then blend the fac */
 	cp[0]= 255;
-	cp[1]= (mfac*cp1[1] + fac*((cp2[1]*cp1[1])>>8)  )>>8;
-	cp[2]= (mfac*cp1[2] + fac*((cp2[2]*cp1[2])>>8)  )>>8;
-	cp[3]= (mfac*cp1[3] + fac*((cp2[3]*cp1[3])>>8)  )>>8;
+	cp[1]= (mfac*cp1[1] + fac*((cp2[1]*cp1[1])/255)  )/255;
+	cp[2]= (mfac*cp1[2] + fac*((cp2[2]*cp1[2])/255)  )/255;
+	cp[3]= (mfac*cp1[3] + fac*((cp2[3]*cp1[3])/255)  )/255;
 
 	
 	return col;
@@ -664,9 +664,9 @@ static unsigned int mcol_lighten(unsigned int col1, unsigned int col2, int fac)
 		return col1;
 	
 	cp[0]= 255;
-	cp[1]= (mfac*cp1[1]+fac*cp2[1])>>8;
-	cp[2]= (mfac*cp1[2]+fac*cp2[2])>>8;
-	cp[3]= (mfac*cp1[3]+fac*cp2[3])>>8;
+	cp[1]= (mfac*cp1[1]+fac*cp2[1])/255;
+	cp[2]= (mfac*cp1[2]+fac*cp2[2])/255;
+	cp[3]= (mfac*cp1[3]+fac*cp2[3])/255;
 	
 	return col;
 }
@@ -692,9 +692,9 @@ static unsigned int mcol_darken(unsigned int col1, unsigned int col2, int fac)
 		return col1;
 	
 	cp[0]= 255;
-	cp[1]= (mfac*cp1[1]+fac*cp2[1])>>8;
-	cp[2]= (mfac*cp1[2]+fac*cp2[2])>>8;
-	cp[3]= (mfac*cp1[3]+fac*cp2[3])>>8;
+	cp[1]= (mfac*cp1[1]+fac*cp2[1])/255;
+	cp[2]= (mfac*cp1[2]+fac*cp2[2])/255;
+	cp[3]= (mfac*cp1[3]+fac*cp2[3])/255;
 	return col;
 }
 
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 05c58a258ec..d17b94c631d 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -259,6 +259,7 @@ IF(UNIX)
     blender_python
     bf_quicktime
     extern_binreloc
+	extern_glew
   )
 
   FOREACH(SORTLIB ${BLENDER_SORTED_LIBS})
diff --git a/source/creator/creator.c b/source/creator/creator.c
index 2e6b5d7353e..9589f1e3e94 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -195,7 +195,7 @@ static void print_help(void)
 	printf ("    (formats that can be compiled into blender, not available on all systems)\n");
 	printf ("    \tHDR TIFF EXR MULTILAYER MPEG AVICODEC QUICKTIME CINEON DPX DDS\n");
 	printf ("    -x <bool>\tSet option to add the file extension to the end of the file.\n");
-	printf ("    -t <threads>\tUse amount of <threads> for rendering.\n");
+	printf ("    -t <threads>\tUse amount of <threads> for rendering (background mode only).\n");
 	printf ("      [1-8], 0 for systems processor count.\n");
 	printf ("\nAnimation playback options:\n");
 	printf ("  -a <file(s)>\tPlayback <file(s)>, only operates this way when -b is not used.\n");
@@ -723,6 +723,8 @@ int main(int argc, char **argv)
 				a++;
 				if(G.background) {
 					RE_set_max_threads(atoi(argv[a]));
+				} else {
+					printf("Warning: threads can only be set in background mode\n");
 				}
 				break;
 			case 'x': /* extension */
diff --git a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
index fa8409b123e..b3a3a47152a 100644
--- a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
+++ b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
@@ -40,9 +40,7 @@
 #pragma warning (disable:4786)
 #endif
 
-#ifdef __APPLE__
-#define GL_GLEXT_LEGACY 1
-#endif 
+#include "GL/glew.h"
 
 #include "KX_BlenderGL.h"
 #include "KX_BlenderCanvas.h"
@@ -57,10 +55,10 @@
 #include "KX_PythonInit.h"
 #include "KX_PyConstraintBinding.h"
 
+#include "RAS_GLExtensionManager.h"
 #include "RAS_OpenGLRasterizer.h"
 #include "RAS_VAOpenGLRasterizer.h"
 #include "RAS_ListRasterizer.h"
-#include "RAS_GLExtensionManager.h"
 
 #include "NG_LoopBackNetworkDeviceInterface.h"
 #include "SND_DeviceManager.h"
@@ -142,12 +140,12 @@ extern "C" void StartKetsjiShell(struct ScrArea *area,
 	// so we can safely run Python code and API calls
 	PyGILState_STATE gilstate = PyGILState_Ensure();
 
-	bgl::InitExtensions(1);
-	
+	bgl::InitExtensions(true);
+
 	do
 	{
 		View3D *v3d= (View3D*) area->spacedata.first;
-		
+
 		// get some preferences
 		SYS_SystemHandle syshandle = SYS_GetSystem();
 		bool properties	= (SYS_GetCommandLineInt(syshandle, "show_properties", 0) != 0);
@@ -156,22 +154,10 @@ extern "C" void StartKetsjiShell(struct ScrArea *area,
 		bool frameRate = (SYS_GetCommandLineInt(syshandle, "show_framerate", 0) != 0);
 		bool game2ipo = (SYS_GetCommandLineInt(syshandle, "game2ipo", 0) != 0);
 		bool displaylists = (SYS_GetCommandLineInt(syshandle, "displaylists", 0) != 0);
-		bool usemat = false;
-		
-		#if defined(GL_ARB_multitexture) && defined(WITH_GLEXT)
-		if (!getenv("WITHOUT_GLEXT")) {
-			if(bgl::RAS_EXT_support._ARB_multitexture && bgl::QueryVersion(1, 1)) {
-				usemat = (SYS_GetCommandLineInt(syshandle, "blender_material", 0) != 0);
-				int unitmax=0;
-				glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, (GLint*)&unitmax);
-				bgl::max_texture_units = MAXTEX>unitmax?unitmax:MAXTEX;
-				//std::cout << "using(" << bgl::max_texture_units << ") of(" << unitmax << ") texture units." << std::endl;
-			} else {
-				bgl::max_texture_units = 0;
-			}
-		}
-		#endif
+		bool usemat = false, useglslmat = false;
 
+		if(GLEW_ARB_multitexture && GLEW_VERSION_1_1)
+			usemat = (SYS_GetCommandLineInt(syshandle, "blender_material", 0) != 0);
 
 		// create the canvas, rasterizer and rendertools
 		RAS_ICanvas* canvas = new KX_BlenderCanvas(area);
@@ -179,20 +165,14 @@ extern "C" void StartKetsjiShell(struct ScrArea *area,
 		RAS_IRenderTools* rendertools = new KX_BlenderRenderTools();
 		RAS_IRasterizer* rasterizer = NULL;
 		
-		// let's see if we want to use vertexarrays or not
-		int usevta = SYS_GetCommandLineInt(syshandle,"vertexarrays",1);
-		bool useVertexArrays = (usevta > 0);
-		
-		bool lock_arrays = (displaylists && useVertexArrays);
-
-		if(displaylists){
-			if (useVertexArrays) {
-				rasterizer = new RAS_ListRasterizer(canvas, true, lock_arrays);
-			} else {
+		if(displaylists) {
+			if (GLEW_VERSION_1_1)
+				rasterizer = new RAS_ListRasterizer(canvas, true, true);
+			else
 				rasterizer = new RAS_ListRasterizer(canvas);
-			}
-		} else if (useVertexArrays && bgl::QueryVersion(1, 1))
-			rasterizer = new RAS_VAOpenGLRasterizer(canvas, lock_arrays);
+		}
+		else if (GLEW_VERSION_1_1)
+			rasterizer = new RAS_VAOpenGLRasterizer(canvas, false);
 		else
 			rasterizer = new RAS_OpenGLRasterizer(canvas);
 		
@@ -338,6 +318,8 @@ extern "C" void StartKetsjiShell(struct ScrArea *area,
 			
 			if(usemat)
 				sceneconverter->SetMaterials(true);
+			if(useglslmat)
+				sceneconverter->SetGLSLMaterials(true);
 					
 			KX_Scene* startscene = new KX_Scene(keyboarddevice,
 				mousedevice,
@@ -350,6 +332,7 @@ extern "C" void StartKetsjiShell(struct ScrArea *area,
 			ketsjiengine->SetPythonDictionary(dictionaryobject);
 			initRasterizer(rasterizer, canvas);
 			PyObject *gameLogic = initGameLogic(startscene);
+			PyDict_SetItemString(dictionaryobject, "GameLogic", gameLogic); // Same as importing the module.
 			initGameKeys();
 			initPythonConstraintBinding();
 
@@ -372,6 +355,12 @@ extern "C" void StartKetsjiShell(struct ScrArea *area,
 				// start the engine
 				ketsjiengine->StartEngine(true);
 				
+
+				// Set the animation playback rate for ipo's and actions
+				// the framerate below should patch with FPS macro defined in blendef.h
+				// Could be in StartEngine set the framerate, we need the scene to do this
+				ketsjiengine->SetAnimFrameRate( (((double) blscene->r.frs_sec) / blscene->r.frs_sec_base) );
+				
 				// the mainloop
 				while (!exitrequested)
 				{
@@ -411,7 +400,14 @@ extern "C" void StartKetsjiShell(struct ScrArea *area,
 				exitstring = ketsjiengine->GetExitString();
 				
 				// when exiting the mainloop
-				dictionaryClearByHand(gameLogic);
+				
+				// Clears the dictionary by hand:
+				// This prevents, extra references to global variables
+				// inside the GameLogic dictionary when the python interpreter is finalized.
+				// which allows the scene to safely delete them :)
+				// see: (space.c)->start_game
+				PyDict_Clear(PyModule_GetDict(gameLogic));
+				
 				ketsjiengine->StopEngine();
 				exitGamePythonScripting();
 				networkdevice->Disconnect();
@@ -498,7 +494,7 @@ extern "C" void StartKetsjiShellSimulation(struct ScrArea *area,
 	// so we can safely run Python code and API calls
 	PyGILState_STATE gilstate = PyGILState_Ensure();
 
-	bgl::InitExtensions(1);
+	bgl::InitExtensions(true);
 
 	do
 	{
@@ -519,16 +515,14 @@ extern "C" void StartKetsjiShellSimulation(struct ScrArea *area,
 		RAS_IRenderTools* rendertools = new KX_BlenderRenderTools();
 		RAS_IRasterizer* rasterizer = NULL;
 
-		// let's see if we want to use vertexarrays or not
-		int usevta = SYS_GetCommandLineInt(syshandle,"vertexarrays",1);
-		bool useVertexArrays = (usevta > 0);
-
-		bool lock_arrays = (displaylists && useVertexArrays);
-
-		if(displaylists && !useVertexArrays)
-			rasterizer = new RAS_ListRasterizer(canvas);
-		else if (useVertexArrays && bgl::QueryVersion(1, 1))
-			rasterizer = new RAS_VAOpenGLRasterizer(canvas, lock_arrays);
+		if(displaylists) {
+			if (GLEW_VERSION_1_1)
+				rasterizer = new RAS_ListRasterizer(canvas, true, true);
+			else
+				rasterizer = new RAS_ListRasterizer(canvas);
+		}
+		else if (GLEW_VERSION_1_1)
+			rasterizer = new RAS_VAOpenGLRasterizer(canvas, false);
 		else
 			rasterizer = new RAS_OpenGLRasterizer(canvas);
 
@@ -605,6 +599,7 @@ extern "C" void StartKetsjiShellSimulation(struct ScrArea *area,
 			ketsjiengine->SetPythonDictionary(dictionaryobject);
 			initRasterizer(rasterizer, canvas);
 			PyObject *gameLogic = initGameLogic(startscene);
+			PyDict_SetItemString(dictionaryobject, "GameLogic", gameLogic); // Same as importing the module
 			initGameKeys();
 			initPythonConstraintBinding();
 
diff --git a/source/gameengine/BlenderRoutines/CMakeLists.txt b/source/gameengine/BlenderRoutines/CMakeLists.txt
index 764be732343..1d72fb9cde1 100644
--- a/source/gameengine/BlenderRoutines/CMakeLists.txt
+++ b/source/gameengine/BlenderRoutines/CMakeLists.txt
@@ -33,6 +33,7 @@ SET(INC
   ../../../source/blender/blenloader
   ../../../extern/bullet2/src
   ../../../extern/solid
+  ../../../extern/glew/include
   ${PYTHON_INC}
 )
 
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h b/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
index f9ff8f61b97..b155d39e149 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
+++ b/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
@@ -32,12 +32,8 @@
 #ifdef WIN32
 #include <windows.h>
 #endif 
-#ifdef __APPLE__
-#  define GL_GLEXT_LEGACY 1
-#include <OpenGL/gl.h>
-#else
-#include <GL/gl.h>
-#endif
+
+#include "GL/glew.h"
 
 #include "RAS_ICanvas.h"
 #include "RAS_Rect.h"
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp b/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
index 7c9dbcdaab2..ed6ea7c5f6a 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
+++ b/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
@@ -26,6 +26,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#include "GL/glew.h"
 #include "KX_BlenderGL.h"
 
 #ifdef HAVE_CONFIG_H
@@ -44,21 +45,8 @@
 
 #include "BMF_Api.h"
 
+#include "BIF_gl.h"
 
-#ifdef __APPLE__
-#define GL_GLEXT_LEGACY 1
-#include <OpenGL/gl.h>
-#include <OpenGL/glu.h>
-#else
-#include <GL/gl.h>
-#if defined(__sun__) && !defined(__sparc__)
-#include <mesa/glu.h>
-#else
-#include <GL/glu.h>
-#endif
-#endif
-#include "RAS_OpenGLRasterizer/RAS_GLExtensionManager.h"
-#include "RAS_OpenGLRasterizer/ARB_multitexture.h"
 #include "BL_Material.h" // MAXTEX
 
 /* Data types encoding the game world: */
@@ -77,7 +65,6 @@
 #include "BKE_bmfont.h"
 #include "BKE_image.h"
 
-#include "BIF_gl.h"
 extern "C" {
 #include "BDR_drawmesh.h"
 #include "BIF_mywindow.h"
@@ -88,12 +75,6 @@ extern "C" {
 
 /* end of blender block */
 
-#ifdef __APPLE__
-#include <OpenGL/gl.h>
-#else
-#include <GL/gl.h>
-#endif
-
 /* was in drawmesh.c */
 void spack(unsigned int ucol)
 {
@@ -133,7 +114,12 @@ void BL_RenderText(int mode,const char* textstr,int textlen,struct MTFace* tface
 				characters = 0;
 			}
 
-			if(!col) glColor3f(1.0f, 1.0f, 1.0f);
+			/* When OBCOL flag is on the color is set in IndexPrimitives_3DText */			
+			if (tface->mode & TF_OBCOL) { /* Color has been set */
+				col= NULL;
+			} else {
+				if(!col) glColor3f(1.0f, 1.0f, 1.0f);			
+			}
 
 			glPushMatrix();
 			for (index = 0; index < characters; index++) {
@@ -189,28 +175,19 @@ void DisableForText()
 		glDisable(GL_LIGHTING);
 		glDisable(GL_COLOR_MATERIAL);
 	}
-#if defined(GL_ARB_multitexture) && defined(WITH_GLEXT)
-	if (!getenv("WITHOUT_GLEXT")) {
-		for(int i=0; i<MAXTEX; i++) {
-			if(bgl::RAS_EXT_support._ARB_multitexture)
-				bgl::blActiveTextureARB(GL_TEXTURE0_ARB+i);
-#ifdef GL_ARB_texture_cube_map
-		if(bgl::RAS_EXT_support._ARB_texture_cube_map)
-			if(glIsEnabled(GL_TEXTURE_CUBE_MAP_ARB))
-				glDisable(GL_TEXTURE_CUBE_MAP_ARB);
-#endif
-			if(glIsEnabled(GL_TEXTURE_2D)) glDisable(GL_TEXTURE_2D);
-		}
-	} else {
-		if(glIsEnabled(GL_TEXTURE_2D)) glDisable(GL_TEXTURE_2D);
-	}
 
-#else//GL_ARB_multitexture
-	if(glIsEnabled(GL_TEXTURE_2D)) glDisable(GL_TEXTURE_2D);
-#endif
+	if(GLEW_ARB_multitexture)
+		for(int i=0; i<MAXTEX; i++)
+			glActiveTextureARB(GL_TEXTURE0_ARB+i);
+
+	if(GLEW_ARB_texture_cube_map)
+		if(glIsEnabled(GL_TEXTURE_CUBE_MAP_ARB))
+			glDisable(GL_TEXTURE_CUBE_MAP_ARB);
+
+	if(glIsEnabled(GL_TEXTURE_2D))
+		glDisable(GL_TEXTURE_2D);
 }
 
-
 void BL_print_gamedebug_line(char* text, int xco, int yco, int width, int height)
 {	
 	/* gl prepping */
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
index ffd66655069..220d174d464 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
+++ b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
@@ -28,16 +28,7 @@
 
 #include "KX_BlenderRenderTools.h"
 
-#ifdef WIN32
-// OpenGL gl.h needs 'windows.h' on windows platforms 
-#include <windows.h>
-#endif //WIN32
-#ifdef __APPLE__
-#define GL_GLEXT_LEGACY 1
-#include <OpenGL/gl.h>
-#else
-#include <GL/gl.h>
-#endif
+#include "GL/glew.h"
 
 #include "RAS_IRenderTools.h"
 #include "RAS_IRasterizer.h"
@@ -317,7 +308,7 @@ void KX_BlenderRenderTools::EnableOpenGLLights()
 	glEnable(GL_COLOR_MATERIAL);
 	glColorMaterial(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE);
 	glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, true);
-	if (bgl::QueryExtension(bgl::_GL_EXT_separate_specular_color) || bgl::QueryVersion(1, 2))
+	if (GLEW_EXT_separate_specular_color || GLEW_VERSION_1_2)
 		glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL, GL_SEPARATE_SPECULAR_COLOR);
 
 }
@@ -492,9 +483,9 @@ void KX_BlenderRenderTools::MotionBlur(RAS_IRasterizer* rasterizer)
 	}
 }
 
-void KX_BlenderRenderTools::Update2DFilter(RAS_2DFilterManager::RAS_2DFILTER_MODE filtermode, int pass, STR_String& text)
+void KX_BlenderRenderTools::Update2DFilter(vector<STR_String>& propNames, void* gameObj, RAS_2DFilterManager::RAS_2DFILTER_MODE filtermode, int pass, STR_String& text)
 {
-	m_filtermanager.EnableFilter(filtermode, pass, text);
+	m_filtermanager.EnableFilter(propNames, gameObj, filtermode, pass, text);
 }
 
 void KX_BlenderRenderTools::Render2DFilters(RAS_ICanvas* canvas)
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
index 31eaa14d66b..8abce1b8c3e 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
+++ b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
@@ -101,7 +101,7 @@ public:
 
 	virtual void MotionBlur(RAS_IRasterizer* rasterizer);
 
-	virtual void Update2DFilter(RAS_2DFilterManager::RAS_2DFILTER_MODE filtermode, int pass, STR_String& text);
+	virtual void Update2DFilter(vector<STR_String>& propNames, void* gameObj, RAS_2DFilterManager::RAS_2DFILTER_MODE filtermode, int pass, STR_String& text);
 
 	virtual	void Render2DFilters(RAS_ICanvas* canvas);
 
diff --git a/source/gameengine/BlenderRoutines/Makefile b/source/gameengine/BlenderRoutines/Makefile
index 64a17f44a84..a7394158a20 100644
--- a/source/gameengine/BlenderRoutines/Makefile
+++ b/source/gameengine/BlenderRoutines/Makefile
@@ -35,7 +35,6 @@ include nan_compile.mk
 
 CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
 
-CPPFLAGS += -I$(OPENGL_HEADERS)
 CPPFLAGS += -I$(NAN_SUMO)/include -I$(NAN_SOLID)/include
 CPPFLAGS += -I$(NAN_SOLID)
 CPPFLAGS += -I$(NAN_STRING)/include    
@@ -43,6 +42,8 @@ CPPFLAGS += -I$(NAN_MOTO)/include
 CPPFLAGS += -I$(NAN_BMFONT)/include
 CPPFLAGS += -I$(NAN_FUZZICS)/include
 CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include
+CPPFLAGS += -I$(NAN_GLEW)/include
+CPPFLAGS += -I$(OPENGL_HEADERS)
 # because of kernel dependency on makesdna
 CPPFLAGS += -I../../blender/makesdna
 CPPFLAGS += -I../../blender/include
diff --git a/source/gameengine/BlenderRoutines/SConscript b/source/gameengine/BlenderRoutines/SConscript
index 95e1da2d470..327f4798e04 100644
--- a/source/gameengine/BlenderRoutines/SConscript
+++ b/source/gameengine/BlenderRoutines/SConscript
@@ -15,6 +15,7 @@ incs += ' #source/gameengine/SceneGraph #source/gameengine/Physics/common'
 incs += ' #source/gameengine/Physics/Bullet #source/gameengine/Physics/Sumo'
 incs += ' #source/gameengine/Physics/Sumo/Fuzzics/include #source/gameengine/Network/LoopBackNetwork'
 incs += ' #intern/SoundSystem #source/blender/misc #source/blender/blenloader'
+incs += ' #extern/glew/include'
 
 incs += ' ' + env['BF_PYTHON_INC']
 incs += ' ' + env['BF_SOLID_INC']
diff --git a/source/gameengine/BlenderRoutines/mac_compat_glext.h b/source/gameengine/BlenderRoutines/mac_compat_glext.h
deleted file mode 100644
index 0ec676963b1..00000000000
--- a/source/gameengine/BlenderRoutines/mac_compat_glext.h
+++ /dev/null
@@ -1,132 +0,0 @@
-#ifndef __mac_compat_glext_h_
-#define __mac_compat_glext_h_
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define APIENTRYP *
-#  define GL_GLEXT_LEGACY 1
-#  include <OpenGL/gl.h>
-
-//#if GL_ARB_shader_objects
-typedef char GLcharARB;
-typedef void *GLhandleARB;
-//#endif
-
-//#if GL_ARB_vertex_buffer_object
-typedef long GLintptrARB;
-typedef long GLsizeiptrARB;
-//#endif
-
-
-// GL_ARB_multitexture
-typedef void (APIENTRYP PFNGLACTIVETEXTUREARBPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IARBPROC) (GLenum target, GLint s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SARBPROC) (GLenum target, GLshort s);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DARBPROC) (GLenum target, GLdouble s, GLdouble t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IARBPROC) (GLenum target, GLint s, GLint t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SARBPROC) (GLenum target, GLshort s, GLshort t);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IARBPROC) (GLenum target, GLint s, GLint t, GLint r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVARBPROC) (GLenum target, const GLshort *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVARBPROC) (GLenum target, const GLdouble *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
-typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v);
-
-//GL_ARB_shader_objects
-typedef void (APIENTRYP PFNGLDELETEOBJECTARBPROC) (unsigned int obj);
-typedef unsigned int (APIENTRYP PFNGLGETHANDLEARBPROC) (GLenum pname);
-typedef void (APIENTRYP PFNGLDETACHOBJECTARBPROC) (unsigned int containerObj, unsigned int attachedObj);
-typedef unsigned int (APIENTRYP PFNGLCREATESHADEROBJECTARBPROC) (GLenum shaderType);
-typedef void (APIENTRYP PFNGLSHADERSOURCEARBPROC) (unsigned int shaderObj, GLsizei count, const GLcharARB* *string, const GLint *length);
-typedef void (APIENTRYP PFNGLCOMPILESHADERARBPROC) (unsigned int shaderObj);
-typedef unsigned int (APIENTRYP PFNGLCREATEPROGRAMOBJECTARBPROC) (void);
-typedef void (APIENTRYP PFNGLATTACHOBJECTARBPROC) (unsigned int containerObj, unsigned int obj);
-typedef void (APIENTRYP PFNGLLINKPROGRAMARBPROC) (unsigned int programObj);
-typedef void (APIENTRYP PFNGLUSEPROGRAMOBJECTARBPROC) (unsigned int programObj);
-typedef void (APIENTRYP PFNGLVALIDATEPROGRAMARBPROC) (unsigned int programObj);
-typedef void (APIENTRYP PFNGLUNIFORM1FARBPROC) (GLint location, GLfloat v0);
-typedef void (APIENTRYP PFNGLUNIFORM2FARBPROC) (GLint location, GLfloat v0, GLfloat v1);
-typedef void (APIENTRYP PFNGLUNIFORM3FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-typedef void (APIENTRYP PFNGLUNIFORM4FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-typedef void (APIENTRYP PFNGLUNIFORM1IARBPROC) (GLint location, GLint v0);
-typedef void (APIENTRYP PFNGLUNIFORM2IARBPROC) (GLint location, GLint v0, GLint v1);
-typedef void (APIENTRYP PFNGLUNIFORM3IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2);
-typedef void (APIENTRYP PFNGLUNIFORM4IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-typedef void (APIENTRYP PFNGLUNIFORM1FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM2FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM3FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM4FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORM1IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM2IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM3IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORM4IVARBPROC) (GLint location, GLsizei count, const GLint *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERFVARBPROC) (unsigned int obj, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERIVARBPROC) (unsigned int obj, GLenum pname, GLint *params);
-typedef void (APIENTRYP PFNGLGETINFOLOGARBPROC) (unsigned int obj, GLsizei maxLength, GLsizei *length, void *infoLog);
-typedef void (APIENTRYP PFNGLGETATTACHEDOBJECTSARBPROC) (unsigned int containerObj, GLsizei maxCount, GLsizei *count, unsigned int *obj);
-typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONARBPROC) (unsigned int programObj, const void *name);
-typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMARBPROC) (unsigned int programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
-typedef void (APIENTRYP PFNGLGETUNIFORMFVARBPROC) (unsigned int programObj, GLint location, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETUNIFORMIVARBPROC) (unsigned int programObj, GLint location, GLint *params);
-typedef void (APIENTRYP PFNGLGETSHADERSOURCEARBPROC) (unsigned int obj, GLsizei maxLength, GLsizei *length, void *source);
-
-
-//GL_ARB_vertex_shader
-typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONARBPROC) (unsigned int  programObj, GLuint index, const GLcharARB *name);
-typedef void (APIENTRYP PFNGLGETACTIVEATTRIBARBPROC) (unsigned int  programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
-typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONARBPROC) (unsigned int  programObj, const GLcharARB *name);
-
-
-//GL_ARB_vertex_program
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FARBPROC) (GLuint index, GLfloat x);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FARBPROC) (GLuint index, GLfloat x, GLfloat y);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVARBPROC) (GLuint index, const GLfloat *v);
-typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGARBPROC) (GLenum target, GLenum pname, GLvoid *string);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVARBPROC) (GLuint index, GLenum pname, GLdouble *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVARBPROC) (GLuint index, GLenum pname, GLfloat *params);
-typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVARBPROC) (GLuint index, GLenum pname, GLint *params);
-
-#define GL_FRAGMENT_SHADER                0x8B30
-#define GL_COMPILE_STATUS                 0x8B81
-#define GL_LINK_STATUS                    0x8B82
-#define GL_VALIDATE_STATUS                0x8B83
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/source/gameengine/Converter/BL_ActionActuator.cpp b/source/gameengine/Converter/BL_ActionActuator.cpp
index 1055c8771ef..5d6dd694765 100644
--- a/source/gameengine/Converter/BL_ActionActuator.cpp
+++ b/source/gameengine/Converter/BL_ActionActuator.cpp
@@ -49,6 +49,7 @@
 #include "BLI_arithb.h"
 #include "MT_Matrix4x4.h"
 #include "BKE_utildefines.h"
+#include "FloatValue.h"
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -134,14 +135,14 @@ void BL_ActionActuator::SetStartTime(float curtime)
 	float direction = m_startframe < m_endframe ? 1.0 : -1.0;
 	
 	if (!(m_flag & ACT_FLAG_REVERSE))
-		m_starttime = curtime - direction*(m_localtime - m_startframe)/KX_FIXED_FRAME_PER_SEC;
+		m_starttime = curtime - direction*(m_localtime - m_startframe)/KX_KetsjiEngine::GetAnimFrameRate();
 	else
-		m_starttime = curtime - direction*(m_endframe - m_localtime)/KX_FIXED_FRAME_PER_SEC;
+		m_starttime = curtime - direction*(m_endframe - m_localtime)/KX_KetsjiEngine::GetAnimFrameRate();
 }
 
 void BL_ActionActuator::SetLocalTime(float curtime)
 {
-	float delta_time = (curtime - m_starttime)*KX_FIXED_FRAME_PER_SEC;
+	float delta_time = (curtime - m_starttime)*KX_KetsjiEngine::GetAnimFrameRate();
 	
 	if (m_endframe < m_startframe)
 		delta_time = -delta_time;
@@ -183,6 +184,11 @@ bool BL_ActionActuator::Update(double curtime, bool frame)
 		
 		if (bNegativeEvent)
 		{
+			// dont continue where we left off when restarting
+			if (m_end_reset) {
+				m_flag &= ~ACT_FLAG_LOCKINPUT;
+			}
+			
 			if (!(m_flag & ACT_FLAG_ACTIVE))
 				return false;
 			m_flag &= ~ACT_FLAG_ACTIVE;
@@ -348,6 +354,18 @@ bool BL_ActionActuator::Update(double curtime, bool frame)
 		break;
 	}
 	
+	/* Set the property if its defined */
+	if (m_framepropname[0] != '\0') {
+		CValue* propowner = GetParent();
+		CValue* oldprop = propowner->GetProperty(m_framepropname);
+		CValue* newval = new CFloatValue(m_localtime);
+		if (oldprop) {
+			oldprop->SetValue(newval);
+		} else {
+			propowner->SetProperty(m_framepropname, newval);
+		}
+		newval->Release();
+	}
 	
 	if (bNegativeEvent)
 		m_blendframe=0.0;
@@ -385,7 +403,7 @@ bool BL_ActionActuator::Update(double curtime, bool frame)
 				blend_poses(m_pose, m_blendpose, 1.0 - newweight, ACTSTRIPMODE_BLEND);
 
 				/* Increment current blending percentage */
-				m_blendframe = (curtime - m_blendstart)*KX_FIXED_FRAME_PER_SEC;
+				m_blendframe = (curtime - m_blendstart)*KX_KetsjiEngine::GetAnimFrameRate();
 				if (m_blendframe>m_blendin)
 					m_blendframe = m_blendin;
 				
@@ -446,6 +464,7 @@ PyMethodDef BL_ActionActuator::Methods[] = {
 	{"setPriority", (PyCFunction) BL_ActionActuator::sPySetPriority, METH_VARARGS, SetPriority_doc},
 	{"setFrame", (PyCFunction) BL_ActionActuator::sPySetFrame, METH_VARARGS, SetFrame_doc},
 	{"setProperty", (PyCFunction) BL_ActionActuator::sPySetProperty, METH_VARARGS, SetProperty_doc},
+	{"setFrameProperty", (PyCFunction) BL_ActionActuator::sPySetFrameProperty, METH_VARARGS, SetFrameProperty_doc},
 	{"setBlendtime", (PyCFunction) BL_ActionActuator::sPySetBlendtime, METH_VARARGS, SetBlendtime_doc},
 
 	{"getAction", (PyCFunction) BL_ActionActuator::sPyGetAction, METH_VARARGS, GetAction_doc},
@@ -455,10 +474,13 @@ PyMethodDef BL_ActionActuator::Methods[] = {
 	{"getPriority", (PyCFunction) BL_ActionActuator::sPyGetPriority, METH_VARARGS, GetPriority_doc},
 	{"getFrame", (PyCFunction) BL_ActionActuator::sPyGetFrame, METH_VARARGS, GetFrame_doc},
 	{"getProperty", (PyCFunction) BL_ActionActuator::sPyGetProperty, METH_VARARGS, GetProperty_doc},
+	{"getFrameProperty", (PyCFunction) BL_ActionActuator::sPyGetFrameProperty, METH_VARARGS, GetFrameProperty_doc},
 	{"setChannel", (PyCFunction) BL_ActionActuator::sPySetChannel, METH_VARARGS, SetChannel_doc},
 //	{"getChannel", (PyCFunction) BL_ActionActuator::sPyGetChannel, METH_VARARGS},
-	{"getType", (PyCFunction) BL_ActionActuator::sPyGetType, METH_VARARGS, GetType_doc},	
+	{"getType", (PyCFunction) BL_ActionActuator::sPyGetType, METH_VARARGS, GetType_doc},
 	{"setType", (PyCFunction) BL_ActionActuator::sPySetType, METH_VARARGS, SetType_doc},
+	{"getContinue", (PyCFunction) BL_ActionActuator::sPyGetContinue, METH_NOARGS, 0},	
+	{"setContinue", (PyCFunction) BL_ActionActuator::sPySetContinue, METH_O, 0},
 	{NULL,NULL} //Sentinel
 };
 
@@ -502,6 +524,21 @@ PyObject* BL_ActionActuator::PyGetProperty(PyObject* self,
 	return result;
 }
 
+/*     getProperty                                                             */
+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* self, 
+										   PyObject* args, 
+										   PyObject* kwds) {
+	PyObject *result;
+	
+	result = Py_BuildValue("s", (const char *)m_framepropname);
+	
+	return result;
+}
+
 /*     getFrame                                                              */
 char BL_ActionActuator::GetFrame_doc[] = 
 "getFrame()\n"
@@ -611,6 +648,9 @@ PyObject* BL_ActionActuator::PySetAction(PyObject* self,
 				m_blendframe = 0;
 		}
 	}
+	else {
+		return NULL;
+	}
 	
 	Py_INCREF(Py_None);
 	return Py_None;
@@ -630,6 +670,9 @@ PyObject* BL_ActionActuator::PySetStart(PyObject* self,
 	{
 		m_startframe = start;
 	}
+	else {
+		return NULL;
+	}
 	
 	Py_INCREF(Py_None);
 	return Py_None;
@@ -649,6 +692,9 @@ PyObject* BL_ActionActuator::PySetEnd(PyObject* self,
 	{
 		m_endframe = end;
 	}
+	else {
+		return NULL;
+	}
 	
 	Py_INCREF(Py_None);
 	return Py_None;
@@ -669,6 +715,9 @@ PyObject* BL_ActionActuator::PySetBlendin(PyObject* self,
 	{
 		m_blendin = blendin;
 	}
+	else {
+		return NULL;
+	}
 	
 	Py_INCREF(Py_None);
 	return Py_None;
@@ -694,6 +743,9 @@ PyObject* BL_ActionActuator::PySetBlendtime(PyObject* self,
 		if (m_blendframe>m_blendin)
 			m_blendframe = m_blendin;
 	}
+	else {
+		return NULL;
+	}
 	
 	Py_INCREF(Py_None);
 	return Py_None;
@@ -715,6 +767,9 @@ PyObject* BL_ActionActuator::PySetPriority(PyObject* self,
 	{
 		m_priority = priority;
 	}
+	else {
+		return NULL;
+	}
 	
 	Py_INCREF(Py_None);
 	return Py_None;
@@ -738,6 +793,9 @@ PyObject* BL_ActionActuator::PySetFrame(PyObject* self,
 		else if (m_localtime>m_endframe)
 			m_localtime=m_endframe;
 	}
+	else {
+		return NULL;
+	}
 	
 	Py_INCREF(Py_None);
 	return Py_None;
@@ -758,6 +816,31 @@ PyObject* BL_ActionActuator::PySetProperty(PyObject* self,
 	{
 		m_propname = string;
 	}
+	else {
+		return NULL;
+	}
+	
+	Py_INCREF(Py_None);
+	return Py_None;
+}
+
+/*     setFrameProperty                                                          */
+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* self, 
+										   PyObject* args, 
+										   PyObject* kwds) {
+	char *string;
+	
+	if (PyArg_ParseTuple(args,"s",&string))
+	{
+		m_framepropname = string;
+	}
+	else {
+		return NULL;
+	}
 	
 	Py_INCREF(Py_None);
 	return Py_None;
@@ -773,6 +856,9 @@ PyObject* BL_ActionActuator::PyGetChannel(PyObject* self,
 	{
 		m_propname = string;
 	}
+	else {
+		return NULL;
+	}
 	
 	Py_INCREF(Py_None);
 	return Py_None;
@@ -797,7 +883,8 @@ PyObject* BL_ActionActuator::PySetChannel(PyObject* self,
 	int row,col;
 	int	mode = 0;	/* 0 for bone space, 1 for armature/world space */
 	
-	PyArg_ParseTuple(args,"sO|i", &string, &pylist, &mode);
+	if (!PyArg_ParseTuple(args,"sO|i", &string, &pylist, &mode))
+		return NULL;
 	
 	if (pylist->ob_type == &CListValue::Type)
 	{
@@ -898,7 +985,26 @@ PyObject* BL_ActionActuator::PySetType(PyObject* self,
 	default:
 		printf("Invalid type for action actuator: %d\n", typeArg); /* error */
     }
-	
-    Py_Return;
+	Py_RETURN_NONE;
+}
+
+PyObject* BL_ActionActuator::PyGetContinue(PyObject* self) {
+    return PyInt_FromLong((long)(m_end_reset==0));
+}
+
+PyObject* BL_ActionActuator::PySetContinue(PyObject* self, PyObject* value) {
+	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;
 }
 
diff --git a/source/gameengine/Converter/BL_ActionActuator.h b/source/gameengine/Converter/BL_ActionActuator.h
index 62edcc7fad7..a67b6d29b74 100644
--- a/source/gameengine/Converter/BL_ActionActuator.h
+++ b/source/gameengine/Converter/BL_ActionActuator.h
@@ -40,12 +40,14 @@ public:
 	Py_Header;
 	BL_ActionActuator(SCA_IObject* gameobj,
 						const STR_String& propname,
+						const STR_String& framepropname,
 						float starttime,
 						float endtime,
 						struct bAction *action,
 						short	playtype,
 						short	blendin,
 						short	priority,
+						short	end_reset,
 						float	stride,
 						PyTypeObject* T=&Type) 
 		: SCA_IActuator(gameobj,T),
@@ -63,11 +65,13 @@ public:
 		m_stridelength(stride),
 		m_playtype(playtype),
 		m_priority(priority),
+		m_end_reset(end_reset),
 		m_pose(NULL),
 		m_blendpose(NULL),
 		m_userpose(NULL),
 		m_action(action),
-		m_propname(propname)
+		m_propname(propname),
+		m_framepropname(framepropname)		
 	{
 	};
 	virtual ~BL_ActionActuator();
@@ -84,6 +88,7 @@ public:
 	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,SetChannel);
 
@@ -94,9 +99,12 @@ public:
 	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(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);
 
 	virtual PyObject* _getattr(const STR_String& attr);
 
@@ -133,11 +141,13 @@ protected:
 	float	m_stridelength;
 	short	m_playtype;
 	short	m_priority;
+	short	m_end_reset;
 	struct bPose* m_pose;
 	struct bPose* m_blendpose;
 	struct bPose* m_userpose;
 	struct bAction *m_action;
 	STR_String	m_propname;
+	STR_String	m_framepropname;
 };
 
 enum {
diff --git a/source/gameengine/Converter/BL_ArmatureObject.cpp b/source/gameengine/Converter/BL_ArmatureObject.cpp
index 08567dde840..f73d5b42a01 100644
--- a/source/gameengine/Converter/BL_ArmatureObject.cpp
+++ b/source/gameengine/Converter/BL_ArmatureObject.cpp
@@ -92,9 +92,10 @@ BL_ArmatureObject::~BL_ArmatureObject()
 /* there is only 1 unique Pose per Armature */
 void BL_ArmatureObject::ApplyPose()
 {
-	if (m_pose){
+	if (m_pose) {
 		// copy to armature object
-		extract_pose_from_pose(m_objArma->pose, m_pose);
+		if (m_objArma->pose != m_pose)/* This should never happen but it does - Campbell */
+			extract_pose_from_pose(m_objArma->pose, m_pose);
 		
 		// is this needed anymore?
 		//if (!m_mrdPose)
@@ -143,7 +144,7 @@ void BL_ArmatureObject::GetPose(bPose **pose)
 {
 	/* If the caller supplies a null pose, create a new one. */
 	/* Otherwise, copy the armature's pose channels into the caller-supplied pose */
-
+		
 	if (!*pose) {
 		/*	probably not to good of an idea to
 			duplicate everying, but it clears up 
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
index 82d16ffa181..1f1ac6da119 100644
--- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp
+++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
@@ -88,7 +88,9 @@
 #include "BKE_main.h"
 #include "BKE_global.h"
 #include "BKE_object.h"
+#include "BKE_scene.h"
 #include "BL_SkinMeshObject.h"
+#include "BL_ShapeDeformer.h"
 #include "BL_SkinDeformer.h"
 #include "BL_MeshDeformer.h"
 //#include "BL_ArmatureController.h"
@@ -222,15 +224,16 @@ static unsigned int KX_Mcol2uint_new(MCol col)
 static void SetDefaultFaceType(Scene* scene)
 {
 	default_face_mode = TF_DYNAMIC;
-	Base *base = static_cast<Base*>(scene->base.first);
-	while(base)
+	Scene *sce;
+	Base *base;
+
+	for(SETLOOPER(scene,base))
 	{
 		if (base->object->type == OB_LAMP)
 		{
 			default_face_mode = TF_DYNAMIC|TF_LIGHT;
 			return;
 		}
-		base = base->next;
 	}
 }
 
@@ -309,11 +312,13 @@ BL_Material* ConvertMaterial(
 	Mesh* mesh, 
 	Material *mat, 
 	MTFace* tface,  
+	const char *tfaceName,
 	MFace* mface, 
 	MCol* mmcol, 
 	int lightlayer, 
 	Object* blenderobj,
-	MTF_localLayer *layers)
+	MTF_localLayer *layers,
+	bool glslmat)
 {
 	//this needs some type of manager
 	BL_Material *material = new BL_Material();
@@ -332,7 +337,7 @@ BL_Material* ConvertMaterial(
 	if(validmat) {
 
 		// use vertex colors by explicitly setting
-		if(mat->mode &MA_VERTEXCOLP)
+		if(mat->mode &MA_VERTEXCOLP || glslmat)
 			type = 0;
 
 		// use lighting?
@@ -509,6 +514,7 @@ BL_Material* ConvertMaterial(
 				}
 			}
 		}
+
 		// above one tex the switches here
 		// are not used
 		switch(valid_index) {
@@ -541,7 +547,7 @@ BL_Material* ConvertMaterial(
 		material->amb			= mat->amb;
 
 		// set alpha testing without z-sorting
-		if( ( validface && (!tface->transp)) && mat->mode & MA_ZTRA) {
+		if( ( validface && (!(tface->transp &~ TF_CLIP))) && mat->mode & MA_ZTRA) {
 			// sets the RAS_IPolyMaterial::m_flag |RAS_FORCEALPHA
 			// this is so we don't have the overhead of the z-sorting code
 			material->ras_mode|=ALPHA_TEST;
@@ -554,6 +560,7 @@ BL_Material* ConvertMaterial(
 	}
 	else {
 		int valid = 0;
+
 		// check for tface tex to fallback on
 		if( validface ){
 
@@ -586,6 +593,10 @@ BL_Material* ConvertMaterial(
 	}
 	MT_Point2 uv[4];
 	MT_Point2 uv2[4];
+	const char *uvName = "", *uv2Name = "";
+
+	uv[0]= uv[1]= uv[2]= uv[3]= MT_Point2(0.0f, 0.0f);
+	uv2[0]= uv2[1]= uv2[2]= uv2[3]= MT_Point2(0.0f, 0.0f);
 
 	if( validface ) {
 
@@ -597,7 +608,7 @@ BL_Material* ConvertMaterial(
 		material->ras_mode |= ( (tface->mode & TF_DYNAMIC)!= 0 )?COLLIDER:0;
 		material->transp = tface->transp;
 		
-		if(tface->transp)
+		if(tface->transp&~TF_CLIP)
 			material->ras_mode |= TRANSP;
 
 		material->tile	= tface->tile;
@@ -609,6 +620,8 @@ BL_Material* ConvertMaterial(
 
 		if (mface->v4) 
 			uv[3]	= MT_Point2(tface->uv[3]);
+
+		uvName = tfaceName;
 	} 
 	else {
 		// nothing at all
@@ -634,39 +647,38 @@ BL_Material* ConvertMaterial(
 				isFirstSet = false;
 			else
 			{
-				MT_Point2 uvSet[4];
 				for (int lay=0; lay<MAX_MTFACE; lay++)
 				{
 					MTF_localLayer& layer = layers[lay];
 					if (layer.face == 0) break;
 
-
-					bool processed = false;
 					if (strcmp(map.uvCoName.ReadPtr(), layer.name)==0)
 					{
+						MT_Point2 uvSet[4];
+
 						uvSet[0]	= MT_Point2(layer.face->uv[0]);
 						uvSet[1]	= MT_Point2(layer.face->uv[1]);
 						uvSet[2]	= MT_Point2(layer.face->uv[2]);
 
 						if (mface->v4) 
 							uvSet[3]	= MT_Point2(layer.face->uv[3]);
+						else
+							uvSet[3]	= MT_Point2(0.0f, 0.0f);
 
-						processed = true;
-					}
-
-					if (!processed) continue;
-
-					if (isFirstSet)
-					{
-						uv[0] = uvSet[0]; uv[1] = uvSet[1];
-						uv[2] = uvSet[2]; uv[3] = uvSet[3];
-						isFirstSet = false;
-					}
-					else
-					{
-						uv2[0] = uvSet[0]; uv2[1] = uvSet[1];
-						uv2[2] = uvSet[2]; uv2[3] = uvSet[3];
-						map.mapping |= USECUSTOMUV;
+						if (isFirstSet)
+						{
+							uv[0] = uvSet[0]; uv[1] = uvSet[1];
+							uv[2] = uvSet[2]; uv[3] = uvSet[3];
+							isFirstSet = false;
+							uvName = layer.name;
+						}
+						else
+						{
+							uv2[0] = uvSet[0]; uv2[1] = uvSet[1];
+							uv2[2] = uvSet[2]; uv2[3] = uvSet[3];
+							map.mapping |= USECUSTOMUV;
+							uv2Name = layer.name;
+						}
 					}
 				}
 			}
@@ -686,9 +698,8 @@ BL_Material* ConvertMaterial(
 	}
 
 	material->SetConversionRGB(rgb);
-	material->SetConversionUV(uv);
-	material->SetConversionUV2(uv2);
-
+	material->SetConversionUV(uvName, uv);
+	material->SetConversionUV2(uv2Name, uv2);
 
 	material->ras_mode |= (mface->v4==0)?TRIANGLE:0;
 	if(validmat)
@@ -730,14 +741,14 @@ static MT_Vector4*  BL_ComputeMeshTangentSpace(Mesh* mesh)
 	MT_Vector3 *tan1 = new MT_Vector3[mesh->totvert];
 	MT_Vector3 *tan2 = new MT_Vector3[mesh->totvert];
 	
-	unsigned int v;
+	int v;
 	for (v = 0; v < mesh->totvert; v++)
 	{
 		tan1[v] = MT_Vector3(0.0, 0.0, 0.0);
 		tan2[v] = MT_Vector3(0.0, 0.0, 0.0);
 	}
 	
-	for (unsigned int p = 0; p < mesh->totface; p++, mface++, tface++)
+	for (int p = 0; p < mesh->totface; p++, mface++, tface++)
 	{
 		MT_Vector3 	v1(mesh->mvert[mface->v1].co),
 				v2(mesh->mvert[mface->v2].co),
@@ -790,17 +801,18 @@ RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, RAS_IRenderTools*
 	
 	MFace* mface = static_cast<MFace*>(mesh->mface);
 	MTFace* tface = static_cast<MTFace*>(mesh->mtface);
+	const char *tfaceName = "";
 	MCol* mmcol = mesh->mcol;
 	MT_assert(mface || mesh->totface == 0);
 
 
 	// Determine if we need to make a skinned mesh
-	if (mesh->dvert){
-		meshobj = new BL_SkinMeshObject(lightlayer);
+	if (mesh->dvert || mesh->key){
+		meshobj = new BL_SkinMeshObject(mesh, lightlayer);
 		skinMesh = true;
 	}
 	else {
-		meshobj = new RAS_MeshObject(lightlayer);
+		meshobj = new RAS_MeshObject(mesh, lightlayer);
 	}
 	MT_Vector4 *tangent = 0;
 	if (tface)
@@ -825,11 +837,12 @@ RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, RAS_IRenderTools*
 
 			layers[validLayers].face = (MTFace*)mesh->fdata.layers[i].data;;
 			layers[validLayers].name = mesh->fdata.layers[i].name;
+			if(tface == layers[validLayers].face)
+				tfaceName = layers[validLayers].name;
 			validLayers++;
 		}
 	}
 
-
 	meshobj->SetName(mesh->id.name);
 	meshobj->m_xyz_index_to_vertex_index_mapping.resize(mesh->totvert);
 	for (int f=0;f<mesh->totface;f++,mface++)
@@ -881,7 +894,7 @@ RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, RAS_IRenderTools*
 				Material* ma = 0;
 				bool polyvisible = true;
 				RAS_IPolyMaterial* polymat = NULL;
-				BL_Material *bl_mat;
+				BL_Material *bl_mat = NULL;
 
 				if(converter->GetMaterials()) 
 				{	
@@ -890,7 +903,7 @@ RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, RAS_IRenderTools*
 					else 
 						ma = give_current_material(blenderobj, 1);
 
-					bl_mat = ConvertMaterial(mesh, ma, tface, mface, mmcol, lightlayer, blenderobj, layers);
+					bl_mat = ConvertMaterial(mesh, ma, tface, tfaceName, mface, mmcol, lightlayer, blenderobj, layers, converter->GetGLSLMaterials());
 					// set the index were dealing with
 					bl_mat->material_index =  (int)mface->mat_nr;
 
@@ -946,7 +959,7 @@ RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, RAS_IRenderTools*
 						// Use texface colors if available
 						//TF_DYNAMIC means the polygon is a collision face
 						collider = ((tface->mode & TF_DYNAMIC) != 0);
-						transp = tface->transp;
+						transp = tface->transp &~ TF_CLIP;
 						tile = tface->tile;
 						mode = tface->mode;
 						
@@ -1050,35 +1063,25 @@ RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, RAS_IRenderTools*
 				int nverts = mface->v4?4:3;
 				int vtxarray = meshobj->FindVertexArray(nverts,polymat);
 				RAS_Polygon* poly = new RAS_Polygon(bucket,polyvisible,nverts,vtxarray);
-				if (skinMesh) {
-					int d1, d2, d3, d4=0;
-					bool flat;
 
+				bool flat;
+
+				if (skinMesh) {
 					/* If the face is set to solid, all fnors are the same */
 					if (mface->flag & ME_SMOOTH)
 						flat = false;
 					else
 						flat = true;
-					
-					d1=((BL_SkinMeshObject*)meshobj)->FindOrAddDeform(vtxarray, mface->v1, &mesh->dvert[mface->v1], polymat);
-					d2=((BL_SkinMeshObject*)meshobj)->FindOrAddDeform(vtxarray, mface->v2, &mesh->dvert[mface->v2], polymat);
-					d3=((BL_SkinMeshObject*)meshobj)->FindOrAddDeform(vtxarray, mface->v3, &mesh->dvert[mface->v3], polymat);
-					if (nverts==4)
-						d4=((BL_SkinMeshObject*)meshobj)->FindOrAddDeform(vtxarray, mface->v4, &mesh->dvert[mface->v4], polymat);
-					poly->SetVertex(0,((BL_SkinMeshObject*)meshobj)->FindOrAddVertex(vtxarray,pt0,uv0,uv20,tan0,rgb0,no0,d1,flat, polymat));
-					poly->SetVertex(1,((BL_SkinMeshObject*)meshobj)->FindOrAddVertex(vtxarray,pt1,uv1,uv21,tan1,rgb1,no1,d2,flat, polymat));
-					poly->SetVertex(2,((BL_SkinMeshObject*)meshobj)->FindOrAddVertex(vtxarray,pt2,uv2,uv22,tan2,rgb2,no2,d3,flat, polymat));
-					if (nverts==4)
-						poly->SetVertex(3,((BL_SkinMeshObject*)meshobj)->FindOrAddVertex(vtxarray,pt3,uv3,uv23,tan3,rgb3,no3,d4, flat,polymat));
 				}
 				else
-				{
-					poly->SetVertex(0,meshobj->FindOrAddVertex(vtxarray,pt0,uv0,uv20,tan0,rgb0,no0,polymat,mface->v1));
-					poly->SetVertex(1,meshobj->FindOrAddVertex(vtxarray,pt1,uv1,uv21,tan1,rgb1,no1,polymat,mface->v2));
-					poly->SetVertex(2,meshobj->FindOrAddVertex(vtxarray,pt2,uv2,uv22,tan2,rgb2,no2,polymat,mface->v3));
-					if (nverts==4)
-						poly->SetVertex(3,meshobj->FindOrAddVertex(vtxarray,pt3,uv3,uv23,tan3,rgb3,no3,polymat,mface->v4));
-				}
+					flat = false;
+
+				poly->SetVertex(0,meshobj->FindOrAddVertex(vtxarray,pt0,uv0,uv20,tan0,rgb0,no0,flat,polymat,mface->v1));
+				poly->SetVertex(1,meshobj->FindOrAddVertex(vtxarray,pt1,uv1,uv21,tan1,rgb1,no1,flat,polymat,mface->v2));
+				poly->SetVertex(2,meshobj->FindOrAddVertex(vtxarray,pt2,uv2,uv22,tan2,rgb2,no2,flat,polymat,mface->v3));
+				if (nverts==4)
+					poly->SetVertex(3,meshobj->FindOrAddVertex(vtxarray,pt3,uv3,uv23,tan3,rgb3,no3,flat,polymat,mface->v4));
+
 				meshobj->AddPolygon(poly);
 				if (poly->IsCollider())
 				{
@@ -1115,6 +1118,7 @@ RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, RAS_IRenderTools*
 			layer.face++;
 		}
 	}
+	meshobj->m_xyz_index_to_vertex_index_mapping.clear();
 	meshobj->UpdateMaterialList();
 
 	// pre calculate texture generation
@@ -1533,7 +1537,7 @@ void BL_CreatePhysicsObjectNew(KX_GameObject* gameobj,
 
 
 
-static KX_LightObject *gamelight_from_blamp(Lamp *la, unsigned int layerflag, KX_Scene *kxscene, RAS_IRenderTools *rendertools, KX_BlenderSceneConverter *converter) {
+static KX_LightObject *gamelight_from_blamp(Object *ob, Lamp *la, unsigned int layerflag, KX_Scene *kxscene, RAS_IRenderTools *rendertools, KX_BlenderSceneConverter *converter) {
 	RAS_LightObject lightobj;
 	KX_LightObject *gamelight;
 	
@@ -1565,8 +1569,15 @@ static KX_LightObject *gamelight_from_blamp(Lamp *la, unsigned int layerflag, KX
 	} else {
 		lightobj.m_type = RAS_LightObject::LIGHT_NORMAL;
 	}
+
+#ifdef BLENDER_GLSL
+	if(converter->GetGLSLMaterials())
+		GPU_lamp_from_blender(ob, la);
 	
-	gamelight = new KX_LightObject(kxscene, KX_Scene::m_callbacks, rendertools, lightobj);
+	gamelight = new KX_LightObject(kxscene, KX_Scene::m_callbacks, rendertools, lightobj, ob->gpulamp);
+#else
+	gamelight = new KX_LightObject(kxscene, KX_Scene::m_callbacks, rendertools, lightobj, NULL);
+#endif
 	BL_ConvertLampIpos(la, gamelight, converter);
 	
 	return gamelight;
@@ -1598,7 +1609,7 @@ static KX_GameObject *gameobject_from_blenderobject(
 	{
 	case OB_LAMP:
 	{
-		KX_LightObject* gamelight= gamelight_from_blamp(static_cast<Lamp*>(ob->data), ob->lay, kxscene, rendertools, converter);
+		KX_LightObject* gamelight= gamelight_from_blamp(ob, static_cast<Lamp*>(ob->data), ob->lay, kxscene, rendertools, converter);
 		gameobj = gamelight;
 		
 		gamelight->AddRef();
@@ -1634,7 +1645,7 @@ static KX_GameObject *gameobject_from_blenderobject(
 		// needed for python scripting
 		kxscene->GetLogicManager()->RegisterMeshName(meshobj->GetName(),meshobj);
 	
-		gameobj = new BL_DeformableGameObject(kxscene,KX_Scene::m_callbacks);
+		gameobj = new BL_DeformableGameObject(ob,kxscene,KX_Scene::m_callbacks);
 	
 		// set transformation
 		gameobj->AddMesh(meshobj);
@@ -1645,13 +1656,29 @@ static KX_GameObject *gameobject_from_blenderobject(
 			((ob->gameflag2 & OB_NEVER_DO_ACTIVITY_CULLING)!=0);
 		gameobj->SetIgnoreActivityCulling(ignoreActivityCulling);
 	
-		//	If this is a skin object, make Skin Controller
-		if (ob->parent && ob->parent->type == OB_ARMATURE && ob->partype==PARSKEL && ((Mesh*)ob->data)->dvert){
-			BL_SkinDeformer *dcont = new BL_SkinDeformer(ob, (BL_SkinMeshObject*)meshobj );				
+		// two options exists for deform: shape keys and armature
+		// only support relative shape key
+		bool bHasShapeKey = mesh->key != NULL && mesh->key->type==KEY_RELATIVE;
+		bool bHasDvert = mesh->dvert != NULL && ob->defbase.first;
+		bool bHasArmature = (ob->parent && ob->parent->type == OB_ARMATURE && ob->partype==PARSKEL && bHasDvert);
+
+		if (bHasShapeKey) {
+			// not that we can have shape keys without dvert! 
+			BL_ShapeDeformer *dcont = new BL_ShapeDeformer((BL_DeformableGameObject*)gameobj, 
+															ob, (BL_SkinMeshObject*)meshobj);
 			((BL_DeformableGameObject*)gameobj)->m_pDeformer = dcont;
-		}
-		else if (((Mesh*)ob->data)->dvert){
-			BL_MeshDeformer *dcont = new BL_MeshDeformer(ob, (BL_SkinMeshObject*)meshobj );
+			if (bHasArmature)
+				dcont->LoadShapeDrivers(ob->parent);
+		} else if (bHasArmature) {
+			BL_SkinDeformer *dcont = new BL_SkinDeformer((BL_DeformableGameObject*)gameobj,
+															ob, (BL_SkinMeshObject*)meshobj);
+			((BL_DeformableGameObject*)gameobj)->m_pDeformer = dcont;
+		} else if (bHasDvert) {
+			// this case correspond to a mesh that can potentially deform but not with the
+			// object to which it is attached for the moment. A skin mesh was created in
+			// BL_ConvertMesh() so must create a deformer too!
+			BL_MeshDeformer *dcont = new BL_MeshDeformer((BL_DeformableGameObject*)gameobj,
+														  ob, (BL_SkinMeshObject*)meshobj);
 			((BL_DeformableGameObject*)gameobj)->m_pDeformer = dcont;
 		}
 		
@@ -1686,6 +1713,7 @@ static KX_GameObject *gameobject_from_blenderobject(
 	{
 		gameobj->SetPhysicsEnvironment(kxscene->GetPhysicsEnvironment());
 		gameobj->SetLayer(ob->lay);
+		gameobj->SetBlenderObject(ob);
 	}
 	return gameobj;
 }
@@ -1808,6 +1836,9 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
 {	
 
 	Scene *blenderscene = GetSceneForName(maggie, scenename);
+	// for SETLOOPER
+	Scene *sce;
+	Base *base;
 
 	// Get the frame settings of the canvas.
 	// Get the aspect ratio of the canvas as designed by the user.
@@ -1816,7 +1847,10 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
 	int aspect_width;
 	int aspect_height;
 	vector<MT_Vector3> inivel,iniang;
-	
+	set<Group*> grouplist;	// list of groups to be converted
+	set<Object*> allblobj;	// all objects converted
+	set<Object*> groupobj;	// objects from groups (never in active layer)
+
 	if (alwaysUseExpandFraming) {
 		frame_type = RAS_FrameSettings::e_frame_extend;
 		aspect_width = canvas->GetWidth();
@@ -1881,11 +1915,15 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
 	}
 
 	SetDefaultFaceType(blenderscene);
-	
-	Base *base = static_cast<Base*>(blenderscene->base.first);
-	while(base)
+	// Let's support scene set.
+	// Beware of name conflict in linked data, it will not crash but will create confusion
+	// in Python scripting and in certain actuators (replace mesh). Linked scene *should* have
+	// no conflicting name for Object, Object data and Action.
+	for (SETLOOPER(blenderscene, base))
 	{
 		Object* blenderobject = base->object;
+		allblobj.insert(blenderobject);
+
 		KX_GameObject* gameobj = gameobject_from_blenderobject(
 										base->object, 
 										kxscene, 
@@ -2013,7 +2051,9 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
 				
 				gameobj->NodeUpdateGS(0,true);
 				gameobj->Bucketize();
-				
+		
+				if (gameobj->IsDupliGroup())
+					grouplist.insert(blenderobject->dup_group);
 			}
 			else
 			{
@@ -2038,25 +2078,210 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
 		if (gameobj)
 			gameobj->Release();
 
-		base = base->next;
+	}
+
+	if (!grouplist.empty())
+	{
+		// now convert the group referenced by dupli group object
+		// keep track of all groups already converted
+		set<Group*> allgrouplist = grouplist;
+		set<Group*> tempglist;
+		// recurse
+		while (!grouplist.empty())
+		{
+			set<Group*>::iterator git;
+			tempglist.clear();
+			tempglist.swap(grouplist);
+			for (git=tempglist.begin(); git!=tempglist.end(); git++)
+			{
+				Group* group = *git;
+				GroupObject* go;
+				for(go=(GroupObject*)group->gobject.first; go; go=(GroupObject*)go->next) 
+				{
+					Object* blenderobject = go->ob;
+					if (converter->FindGameObject(blenderobject) == NULL)
+					{
+						allblobj.insert(blenderobject);
+						groupobj.insert(blenderobject);
+						KX_GameObject* gameobj = gameobject_from_blenderobject(
+														blenderobject, 
+														kxscene, 
+														rendertools, 
+														converter,
+														blenderscene);
+										
+						// this code is copied from above except that
+						// object from groups are never is active layer
+						bool isInActiveLayer = false;
+						bool addobj=true;
+						
+						if (converter->addInitFromFrame)
+							if (!isInActiveLayer)
+								addobj=false;
+														
+						if (gameobj&&addobj)
+						{
+							MT_Point3 posPrev;			
+							MT_Matrix3x3 angor;			
+							if (converter->addInitFromFrame) 
+								blenderscene->r.cfra=blenderscene->r.sfra;
+							
+							MT_Point3 pos = MT_Point3(
+								blenderobject->loc[0]+blenderobject->dloc[0],
+								blenderobject->loc[1]+blenderobject->dloc[1],
+								blenderobject->loc[2]+blenderobject->dloc[2]
+							);
+							MT_Vector3 eulxyz = MT_Vector3(
+								blenderobject->rot[0],
+								blenderobject->rot[1],
+								blenderobject->rot[2]
+							);
+							MT_Vector3 scale = MT_Vector3(
+								blenderobject->size[0],
+								blenderobject->size[1],
+								blenderobject->size[2]
+							);
+							if (converter->addInitFromFrame){//rcruiz
+								float eulxyzPrev[3];
+								blenderscene->r.cfra=blenderscene->r.sfra-1;
+								update_for_newframe();
+								MT_Vector3 tmp=pos-MT_Point3(blenderobject->loc[0]+blenderobject->dloc[0],
+															blenderobject->loc[1]+blenderobject->dloc[1],
+															blenderobject->loc[2]+blenderobject->dloc[2]
+													);
+								eulxyzPrev[0]=blenderobject->rot[0];
+								eulxyzPrev[1]=blenderobject->rot[1];
+								eulxyzPrev[2]=blenderobject->rot[2];
+
+								double fps = (double) blenderscene->r.frs_sec/
+									(double) blenderscene->r.frs_sec_base;
+
+								tmp.scale(fps, fps, fps);
+								inivel.push_back(tmp);
+								tmp=eulxyz-eulxyzPrev;
+								tmp.scale(fps, fps, fps);
+								iniang.push_back(tmp);
+								blenderscene->r.cfra=blenderscene->r.sfra;
+								update_for_newframe();
+							}		
+										
+							gameobj->NodeSetLocalPosition(pos);
+							gameobj->NodeSetLocalOrientation(MT_Matrix3x3(eulxyz));
+							gameobj->NodeSetLocalScale(scale);
+							gameobj->NodeUpdateGS(0,true);
+							
+							BL_ConvertIpos(blenderobject,gameobj,converter);
+							// TODO: expand to multiple ipos per mesh
+							Material *mat = give_current_material(blenderobject, 1);
+							if(mat) BL_ConvertMaterialIpos(mat, gameobj, converter);	
+					
+							sumolist->Add(gameobj->AddRef());
+							
+							BL_ConvertProperties(blenderobject,gameobj,timemgr,kxscene,isInActiveLayer);
+							
+					
+							gameobj->SetName(blenderobject->id.name);
+					
+							// templist to find Root Parents (object with no parents)
+							templist->Add(gameobj->AddRef());
+							
+							// update children/parent hierarchy
+							if ((blenderobject->parent != 0)&&(!converter->addInitFromFrame))
+							{
+								// blender has an additional 'parentinverse' offset in each object
+								SG_Node* parentinversenode = new SG_Node(NULL,NULL,SG_Callbacks());
+							
+								// define a normal parent relationship for this node.
+								KX_NormalParentRelation * parent_relation = KX_NormalParentRelation::New();
+								parentinversenode->SetParentRelation(parent_relation);
+					
+								parentChildLink pclink;
+								pclink.m_blenderchild = blenderobject;
+								pclink.m_gamechildnode = parentinversenode;
+								vec_parent_child.push_back(pclink);
+
+								float* fl = (float*) blenderobject->parentinv;
+								MT_Transform parinvtrans(fl);
+								parentinversenode->SetLocalPosition(parinvtrans.getOrigin());
+								parentinversenode->SetLocalOrientation(parinvtrans.getBasis());
+								
+								parentinversenode->AddChild(gameobj->GetSGNode());
+							}
+							
+							// needed for python scripting
+							logicmgr->RegisterGameObjectName(gameobj->GetName(),gameobj);
+
+							// needed for dynamic object morphing
+							logicmgr->RegisterGameObj(gameobj, blenderobject);
+							for (int i = 0; i < gameobj->GetMeshCount(); i++)
+								logicmgr->RegisterGameMeshName(gameobj->GetMesh(i)->GetName(), blenderobject);
+					
+							converter->RegisterGameObject(gameobj, blenderobject);	
+							// this was put in rapidly, needs to be looked at more closely
+							// only draw/use objects in active 'blender' layers
+					
+							logicbrick_conversionlist->Add(gameobj->AddRef());
+							
+							if (converter->addInitFromFrame){
+								posPrev=gameobj->NodeGetWorldPosition();
+								angor=gameobj->NodeGetWorldOrientation();
+							}
+							if (isInActiveLayer)
+							{
+								objectlist->Add(gameobj->AddRef());
+								//tf.Add(gameobj->GetSGNode());
+								
+								gameobj->NodeUpdateGS(0,true);
+								gameobj->Bucketize();
+						
+							}
+							else
+							{
+								//we must store this object otherwise it will be deleted 
+								//at the end of this function if it is not a root object
+								inactivelist->Add(gameobj->AddRef());
+
+							}
+							if (gameobj->IsDupliGroup())
+							{
+								// check that the group is not already converted
+								if (allgrouplist.insert(blenderobject->dup_group).second)
+									grouplist.insert(blenderobject->dup_group);
+							}
+							if (converter->addInitFromFrame){
+								gameobj->NodeSetLocalPosition(posPrev);
+								gameobj->NodeSetLocalOrientation(angor);
+							}
+										
+						}
+						if (gameobj)
+							gameobj->Release();
+					}
+				}
+			}
+		}
 	}
 
 	if (blenderscene->camera) {
 		KX_Camera *gamecamera= (KX_Camera*) converter->FindGameObject(blenderscene->camera);
 		
-		kxscene->SetActiveCamera(gamecamera);
+		if(gamecamera)
+			kxscene->SetActiveCamera(gamecamera);
 	}
 
 	//	Set up armatures
-	for (base = static_cast<Base*>(blenderscene->base.first); base; base=base->next){
-		if (base->object->type==OB_MESH){
-			Mesh *me = (Mesh*)base->object->data;
+	set<Object*>::iterator oit;
+	for(oit=allblobj.begin(); oit!=allblobj.end(); oit++)
+	{
+		Object* blenderobj = *oit;
+		if (blenderobj->type==OB_MESH){
+			Mesh *me = (Mesh*)blenderobj->data;
 	
 			if (me->dvert){
-				KX_GameObject *obj = converter->FindGameObject(base->object);
+				KX_GameObject *obj = converter->FindGameObject(blenderobj);
 	
-				if (base->object->parent && base->object->parent->type==OB_ARMATURE && base->object->partype==PARSKEL){
-					KX_GameObject *par = converter->FindGameObject(base->object->parent);
+				if (obj && blenderobj->parent && blenderobj->parent->type==OB_ARMATURE && blenderobj->partype==PARSKEL){
+					KX_GameObject *par = converter->FindGameObject(blenderobj->parent);
 					if (par)
 						((BL_SkinDeformer*)(((BL_DeformableGameObject*)obj)->m_pDeformer))->SetArmature((BL_ArmatureObject*) par);
 				}
@@ -2141,7 +2366,8 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
 		{
 			meshobj = gameobj->GetMesh(0);
 		}
-		BL_CreatePhysicsObjectNew(gameobj,blenderobject,meshobj,kxscene,activeLayerBitInfo,physics_engine,converter,processCompoundChildren);
+		int layerMask = (groupobj.find(blenderobject) == groupobj.end()) ? activeLayerBitInfo : 0;
+		BL_CreatePhysicsObjectNew(gameobj,blenderobject,meshobj,kxscene,layerMask,physics_engine,converter,processCompoundChildren);
 	}
 
 	processCompoundChildren = true;
@@ -2156,7 +2382,8 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
 		{
 			meshobj = gameobj->GetMesh(0);
 		}
-		BL_CreatePhysicsObjectNew(gameobj,blenderobject,meshobj,kxscene,activeLayerBitInfo,physics_engine,converter,processCompoundChildren);
+		int layerMask = (groupobj.find(blenderobject) == groupobj.end()) ? activeLayerBitInfo : 0;
+		BL_CreatePhysicsObjectNew(gameobj,blenderobject,meshobj,kxscene,layerMask,physics_engine,converter,processCompoundChildren);
 	}
 	
 	
@@ -2278,23 +2505,35 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
 	{
 		KX_GameObject* gameobj = static_cast<KX_GameObject*>(logicbrick_conversionlist->GetValue(i));
 		struct Object* blenderobj = converter->FindBlenderObject(gameobj);
-		bool isInActiveLayer = (blenderobj->lay & activeLayerBitInfo)!=0;
-		BL_ConvertActuators(maggie->name, blenderobj,gameobj,logicmgr,kxscene,ketsjiEngine,executePriority, activeLayerBitInfo,isInActiveLayer,rendertools,converter);
+		int layerMask = (groupobj.find(blenderobj) == groupobj.end()) ? activeLayerBitInfo : 0;
+		bool isInActiveLayer = (blenderobj->lay & layerMask)!=0;
+		BL_ConvertActuators(maggie->name, blenderobj,gameobj,logicmgr,kxscene,ketsjiEngine,executePriority, layerMask,isInActiveLayer,rendertools,converter);
 	}
 	for ( i=0;i<logicbrick_conversionlist->GetCount();i++)
 	{
 		KX_GameObject* gameobj = static_cast<KX_GameObject*>(logicbrick_conversionlist->GetValue(i));
 		struct Object* blenderobj = converter->FindBlenderObject(gameobj);
-		bool isInActiveLayer = (blenderobj->lay & activeLayerBitInfo)!=0;
-		BL_ConvertControllers(blenderobj,gameobj,logicmgr,pythondictionary,executePriority,activeLayerBitInfo,isInActiveLayer,converter);
+		int layerMask = (groupobj.find(blenderobj) == groupobj.end()) ? activeLayerBitInfo : 0;
+		bool isInActiveLayer = (blenderobj->lay & layerMask)!=0;
+		BL_ConvertControllers(blenderobj,gameobj,logicmgr,pythondictionary,executePriority,layerMask,isInActiveLayer,converter);
 	}
 	for ( i=0;i<logicbrick_conversionlist->GetCount();i++)
 	{
 		KX_GameObject* gameobj = static_cast<KX_GameObject*>(logicbrick_conversionlist->GetValue(i));
 		struct Object* blenderobj = converter->FindBlenderObject(gameobj);
-		bool isInActiveLayer = (blenderobj->lay & activeLayerBitInfo)!=0;
-		BL_ConvertSensors(blenderobj,gameobj,logicmgr,kxscene,keydev,executePriority,activeLayerBitInfo,isInActiveLayer,canvas,converter);
+		int layerMask = (groupobj.find(blenderobj) == groupobj.end()) ? activeLayerBitInfo : 0;
+		bool isInActiveLayer = (blenderobj->lay & layerMask)!=0;
+		BL_ConvertSensors(blenderobj,gameobj,logicmgr,kxscene,keydev,executePriority,layerMask,isInActiveLayer,canvas,converter);
 	}
+	// apply the initial state to controllers
+	for ( i=0;i<logicbrick_conversionlist->GetCount();i++)
+	{
+		KX_GameObject* gameobj = static_cast<KX_GameObject*>(logicbrick_conversionlist->GetValue(i));
+		struct Object* blenderobj = converter->FindBlenderObject(gameobj);
+		gameobj->SetInitState((blenderobj->init_state)?blenderobj->init_state:blenderobj->state);
+		gameobj->ResetState();
+	}
+
 #endif //CONVERT_LOGIC
 
 	logicbrick_conversionlist->Release();
@@ -2302,5 +2541,19 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
 	// Calculate the scene btree -
 	// too slow - commented out.
 	//kxscene->SetNodeTree(tf.MakeTree());
+
+	// instantiate dupli group, we will loop trough the object
+	// that are in active layers. Note that duplicating group
+	// has the effect of adding objects at the end of objectlist.
+	// Only loop through the first part of the list.
+	int objcount = objectlist->GetCount();
+	for (i=0;i<objcount;i++)
+	{
+		KX_GameObject* gameobj = (KX_GameObject*) objectlist->GetValue(i);
+		if (gameobj->IsDupliGroup())
+		{
+			kxscene->DupliGroupRecurse(gameobj, 0);
+		}
+	}
 }
 
diff --git a/source/gameengine/Converter/BL_DeformableGameObject.cpp b/source/gameengine/Converter/BL_DeformableGameObject.cpp
index 68a2e41ca47..d23274324ee 100644
--- a/source/gameengine/Converter/BL_DeformableGameObject.cpp
+++ b/source/gameengine/Converter/BL_DeformableGameObject.cpp
@@ -28,6 +28,8 @@
  */
 
 #include "BL_DeformableGameObject.h"
+#include "BL_ShapeDeformer.h"
+#include "BL_ShapeActionActuator.h"
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -60,3 +62,48 @@ CValue*		BL_DeformableGameObject::GetReplica()
 	ProcessReplica(replica);
 	return replica;
 }
+
+bool BL_DeformableGameObject::SetActiveAction(BL_ShapeActionActuator *act, short priority, double curtime)
+{
+	if (curtime != m_lastframe){
+		m_activePriority = 9999;
+		m_lastframe= curtime;
+		m_activeAct = NULL;
+	}
+
+	if (priority<=m_activePriority)
+	{
+		if (m_activeAct && (m_activeAct!=act))
+			m_activeAct->SetBlendTime(0.0f);	/* Reset the blend timer */
+		m_activeAct = act;
+		m_activePriority = priority;
+		m_lastframe = curtime;
+	
+		return true;
+	}
+	else{
+		act->SetBlendTime(0.0f);
+		return false;
+	}
+}
+
+bool BL_DeformableGameObject::GetShape(vector<float> &shape)
+{
+	shape.clear();
+	if (m_pDeformer)
+	{
+		Mesh* mesh = ((BL_MeshDeformer*)m_pDeformer)->GetMesh();
+		// this check is normally superfluous: a shape deformer can only be created if the mesh
+		// has relative keys
+		if (mesh && mesh->key && mesh->key->type==KEY_RELATIVE) 
+		{
+			KeyBlock *kb;
+			for (kb = (KeyBlock*)mesh->key->block.first; kb; kb = (KeyBlock*)kb->next)
+			{
+				shape.push_back(kb->curval);
+			}
+		}
+	}
+	return !shape.empty();
+}
+
diff --git a/source/gameengine/Converter/BL_DeformableGameObject.h b/source/gameengine/Converter/BL_DeformableGameObject.h
index d943cc7388a..57a404ad72b 100644
--- a/source/gameengine/Converter/BL_DeformableGameObject.h
+++ b/source/gameengine/Converter/BL_DeformableGameObject.h
@@ -34,15 +34,28 @@
 #pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
 #endif //WIN32
 
+#include "DNA_mesh_types.h"
 #include "KX_GameObject.h"
-#include "RAS_Deformer.h"
+#include "BL_MeshDeformer.h"
+#include <vector>
+
+class BL_ShapeActionActuator;
+struct Key;
 
 class BL_DeformableGameObject : public KX_GameObject  
 {
 public:
 
-	RAS_Deformer		*m_pDeformer;	
 	CValue*		GetReplica();
+
+	double GetLastFrame ()
+	{
+		return m_lastframe;
+	}
+	Object* GetBlendObject()
+	{
+		return m_blendobj;
+	}
 	virtual void Relink(GEN_Map<GEN_HashedPtr, void*>*map)
 	{
 		if (m_pDeformer)
@@ -50,13 +63,32 @@ public:
 	};
 	void ProcessReplica(KX_GameObject* replica);
 
-	BL_DeformableGameObject(void* sgReplicationInfo, SG_Callbacks callbacks) :
+	BL_DeformableGameObject(Object* blendobj, void* sgReplicationInfo, SG_Callbacks callbacks) :
 		KX_GameObject(sgReplicationInfo,callbacks),
-		m_pDeformer(NULL)
+		m_pDeformer(NULL),
+		m_activeAct(NULL),
+		m_lastframe(0.),
+		m_blendobj(blendobj),
+		m_activePriority(9999)
 	{
 		m_isDeformable = true;
 	};
 	virtual ~BL_DeformableGameObject();
+	bool SetActiveAction(class BL_ShapeActionActuator *act, short priority, double curtime);
+
+	bool GetShape(vector<float> &shape);
+	Key* GetKey()
+	{
+		return (m_pDeformer) ? ((BL_MeshDeformer*)m_pDeformer)->GetMesh()->key : NULL;
+	}
+	
+public:
+	RAS_Deformer		*m_pDeformer;	
+protected:	
+	class BL_ShapeActionActuator *m_activeAct;
+	double		m_lastframe;
+	Object*		m_blendobj;
+	short		m_activePriority;
 
 };
 
diff --git a/source/gameengine/Converter/BL_MeshDeformer.cpp b/source/gameengine/Converter/BL_MeshDeformer.cpp
index ab31179b047..39d66a90e92 100644
--- a/source/gameengine/Converter/BL_MeshDeformer.cpp
+++ b/source/gameengine/Converter/BL_MeshDeformer.cpp
@@ -39,51 +39,57 @@
 #endif
 
 #include "RAS_IPolygonMaterial.h"
+#include "BL_DeformableGameObject.h"
 #include "BL_MeshDeformer.h"
 #include "BL_SkinMeshObject.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
-#include "BLI_arithb.h"
 
 #include "GEN_Map.h"
 #include "STR_HashedString.h"
 
-
-bool BL_MeshDeformer::Apply(RAS_IPolyMaterial *mat)
+bool BL_MeshDeformer::Apply(RAS_IPolyMaterial*)
 {
-	size_t			i, j, index;
-	vecVertexArray	array;
-	vecIndexArrays	mvarray;
-	vecIndexArrays	diarray;
-	
-	RAS_TexVert *tv;
-	MVert	*mvert;
-	
-	// For each material
-	array = m_pMeshObject->GetVertexCache(mat);
-	mvarray = m_pMeshObject->GetMVertCache(mat);
-	diarray = m_pMeshObject->GetDIndexCache(mat);
-	
-	// For each array
-	for (i=0; i<array.size(); i++){
-		//	For each vertex
-		for (j=0; j<array[i]->size(); j++){
-			tv = &((*array[i])[j]);
-			index = ((*diarray[i])[j]);
+	size_t i, j;
+	float *co;
 
-			mvert = &(m_bmesh->mvert[((*mvarray[i])[index])]);
-			tv->SetXYZ(MT_Point3(mvert->co));
+	// only apply once per frame if the mesh is actually modified
+	if(m_pMeshObject->MeshModified() &&
+	   m_lastDeformUpdate != m_gameobj->GetLastFrame()) {
+		// For each material
+		for(RAS_MaterialBucket::Set::iterator mit = m_pMeshObject->GetFirstMaterial();
+			mit != m_pMeshObject->GetLastMaterial(); ++ mit) {
+			RAS_IPolyMaterial *mat = (*mit)->GetPolyMaterial();
+
+			vecVertexArray& vertexarrays = m_pMeshObject->GetVertexCache(mat);
+
+			// For each array
+			for (i=0; i<vertexarrays.size(); i++){
+				KX_VertexArray& vertexarray = (*vertexarrays[i]);
+
+				//	For each vertex
+				for (j=0; j<vertexarray.size(); j++){
+					RAS_TexVert& v = vertexarray[j];
+					co = m_bmesh->mvert[v.getOrigIndex()].co;
+					v.SetXYZ(MT_Point3(co));
+				}
+			}
 		}
+
+		m_lastDeformUpdate = m_gameobj->GetLastFrame();
+
+		return true;
 	}
-	return true;
+
+	return false;
 }
 
 BL_MeshDeformer::~BL_MeshDeformer()
 {	
 	if (m_transverts)
-		delete []m_transverts;
+		delete [] m_transverts;
 	if (m_transnors)
-		delete []m_transnors;
+		delete [] m_transnors;
 };
 
 /**
@@ -91,65 +97,125 @@ BL_MeshDeformer::~BL_MeshDeformer()
  */
 void BL_MeshDeformer::RecalcNormals()
 {
-	int v, f;
-	float fnor[3], co1[3], co2[3], co3[3], co4[3];
+	/* We don't normalize for performance, not doing it for faces normals
+	 * gives area-weight normals which often look better anyway, and use
+	 * GL_NORMALIZE so we don't have to do per vertex normalization either
+	 * since the GPU can do it faster */
+	size_t i, j;
 
-	/* Clear all vertex normal accumulators */
-	for (v =0; v<m_bmesh->totvert; v++){
-		m_transnors[v]=MT_Point3(0,0,0);
-	}
-	
-	/* Find the face normals */
-	for (f = 0; f<m_bmesh->totface; f++){
-		// Make new face normal based on the transverts
-		MFace *mf= &((MFace*)m_bmesh->mface)[f];
-		
-		if (mf->v3) {
-			for (int vl=0; vl<3; vl++){
-				co1[vl]=m_transverts[mf->v1][vl];
-				co2[vl]=m_transverts[mf->v2][vl];
-				co3[vl]=m_transverts[mf->v3][vl];
-				if (mf->v4)
-					co4[vl]=m_transverts[mf->v4][vl];
+	/* set vertex normals to zero */
+	memset(m_transnors, 0, sizeof(float)*3*m_bmesh->totvert);
+
+	/* add face normals to vertices. */
+	for(RAS_MaterialBucket::Set::iterator mit = m_pMeshObject->GetFirstMaterial();
+		mit != m_pMeshObject->GetLastMaterial(); ++ mit) {
+		RAS_IPolyMaterial *mat = (*mit)->GetPolyMaterial();
+
+		const vecIndexArrays& indexarrays = m_pMeshObject->GetIndexCache(mat);
+		vecVertexArray& vertexarrays = m_pMeshObject->GetVertexCache(mat);
+
+		for (i=0; i<indexarrays.size(); i++) {
+			KX_VertexArray& vertexarray = (*vertexarrays[i]);
+			const KX_IndexArray& indexarray = (*indexarrays[i]);
+			int nvert = mat->UsesTriangles()? 3: 4;
+
+			for(j=0; j<indexarray.size(); j+=nvert) {
+				RAS_TexVert& v1 = vertexarray[indexarray[j]];
+				RAS_TexVert& v2 = vertexarray[indexarray[j+1]];
+				RAS_TexVert& v3 = vertexarray[indexarray[j+2]];
+				RAS_TexVert *v4 = NULL;
+
+				const float *co1 = v1.getLocalXYZ();
+				const float *co2 = v2.getLocalXYZ();
+				const float *co3 = v3.getLocalXYZ();
+				const float *co4 = NULL;
+				
+				/* compute face normal */
+				float fnor[3], n1[3], n2[3];
+
+				if(nvert == 4) {
+					v4 = &vertexarray[indexarray[j+3]];
+					co4 = v4->getLocalXYZ();
+
+					n1[0]= co1[0]-co3[0];
+					n1[1]= co1[1]-co3[1];
+					n1[2]= co1[2]-co3[2];
+
+					n2[0]= co2[0]-co4[0];
+					n2[1]= co2[1]-co4[1];
+					n2[2]= co2[2]-co4[2];
+				}
+				else {
+					n1[0]= co1[0]-co2[0];
+					n2[0]= co2[0]-co3[0];
+					n1[1]= co1[1]-co2[1];
+
+					n2[1]= co2[1]-co3[1];
+					n1[2]= co1[2]-co2[2];
+					n2[2]= co2[2]-co3[2];
+				}
+
+				fnor[0]= n1[1]*n2[2] - n1[2]*n2[1];
+				fnor[1]= n1[2]*n2[0] - n1[0]*n2[2];
+				fnor[2]= n1[0]*n2[1] - n1[1]*n2[0];
+
+				/* add to vertices for smooth normals */
+				float *vn1 = m_transnors[v1.getOrigIndex()];
+				float *vn2 = m_transnors[v2.getOrigIndex()];
+				float *vn3 = m_transnors[v3.getOrigIndex()];
+
+				vn1[0] += fnor[0]; vn1[1] += fnor[1]; vn1[2] += fnor[2];
+				vn2[0] += fnor[0]; vn2[1] += fnor[1]; vn2[2] += fnor[2];
+				vn3[0] += fnor[0]; vn3[1] += fnor[1]; vn3[2] += fnor[2];
+
+				if(v4) {
+					float *vn4 = m_transnors[v4->getOrigIndex()];
+					vn4[0] += fnor[0]; vn4[1] += fnor[1]; vn4[2] += fnor[2];
+				}
+
+				/* in case of flat - just assign, the vertices are split */
+				if(v1.getFlag() & TV_CALCFACENORMAL) {
+					v1.SetNormal(fnor);
+					v2.SetNormal(fnor);
+					v3.SetNormal(fnor);
+					if(v4)
+						v4->SetNormal(fnor);
+				}
 			}
-
-			/* FIXME: Use moto */
-			if (mf->v4)
-				CalcNormFloat4(co1, co2, co3, co4, fnor);
-			else
-				CalcNormFloat(co1, co2, co3, fnor);
-	
-			/* Decide which normals are affected by this face's normal */
-			m_transnors[mf->v1]+=MT_Point3(fnor);
-			m_transnors[mf->v2]+=MT_Point3(fnor);
-			m_transnors[mf->v3]+=MT_Point3(fnor);
-			if (mf->v4)
-				m_transnors[mf->v4]+=MT_Point3(fnor);
 		}
 	}
-	
-	for (v =0; v<m_bmesh->totvert; v++){
-//		float nor[3];
 
-		m_transnors[v]=m_transnors[v].safe_normalized();
-//		nor[0]=m_transnors[v][0];
-//		nor[1]=m_transnors[v][1];
-//		nor[2]=m_transnors[v][2];
-		
-	};
+	/* assign smooth vertex normals */
+	for(RAS_MaterialBucket::Set::iterator mit = m_pMeshObject->GetFirstMaterial();
+		mit != m_pMeshObject->GetLastMaterial(); ++ mit) {
+		RAS_IPolyMaterial *mat = (*mit)->GetPolyMaterial();
+
+		vecVertexArray& vertexarrays = m_pMeshObject->GetVertexCache(mat);
+
+		for (i=0; i<vertexarrays.size(); i++) {
+			KX_VertexArray& vertexarray = (*vertexarrays[i]);
+			
+			for(j=0; j<vertexarray.size(); j++) {
+				RAS_TexVert& v = vertexarray[j];
+
+				if(!(v.getFlag() & TV_CALCFACENORMAL))
+					v.SetNormal(m_transnors[v.getOrigIndex()]); //.safe_normalized()
+			}
+		}
+	}
 }
 
 void BL_MeshDeformer::VerifyStorage()
 {
 	/* Ensure that we have the right number of verts assigned */
-	if (m_tvtot!=m_bmesh->totvert+m_bmesh->totface){
+	if (m_tvtot!=m_bmesh->totvert){
 		if (m_transverts)
-			delete []m_transverts;
+			delete [] m_transverts;
 		if (m_transnors)
-			delete []m_transnors;
+			delete [] m_transnors;
 		
-		m_transnors =new MT_Point3[m_bmesh->totvert+m_bmesh->totface];
-		m_transverts=new float[(sizeof(*m_transverts)*m_bmesh->totvert)][3];
+		m_transverts=new float[m_bmesh->totvert][3];
+		m_transnors=new float[m_bmesh->totvert][3];
 		m_tvtot = m_bmesh->totvert;
 	}
 }
diff --git a/source/gameengine/Converter/BL_MeshDeformer.h b/source/gameengine/Converter/BL_MeshDeformer.h
index a6be11d786e..e9f7f0b192f 100644
--- a/source/gameengine/Converter/BL_MeshDeformer.h
+++ b/source/gameengine/Converter/BL_MeshDeformer.h
@@ -32,6 +32,7 @@
 
 #include "RAS_Deformer.h"
 #include "DNA_object_types.h"
+#include "DNA_key_types.h"
 #include "MT_Point3.h"
 #include <stdlib.h>
 
@@ -39,38 +40,46 @@
 #pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
 #endif //WIN32
 
+class BL_DeformableGameObject;
+
 class BL_MeshDeformer : public RAS_Deformer
 {
 public:
 	void VerifyStorage();
 	void RecalcNormals();
 	virtual void Relink(GEN_Map<class GEN_HashedPtr, void*>*map){};
-	BL_MeshDeformer(struct Object* obj, class BL_SkinMeshObject *meshobj ):
+	BL_MeshDeformer(BL_DeformableGameObject *gameobj,
+					struct Object* obj,
+					class BL_SkinMeshObject *meshobj ):
 		m_pMeshObject(meshobj),
 		m_bmesh((struct Mesh*)(obj->data)),
+		m_transverts(0),
+		m_transnors(0),
 		m_objMesh(obj),
-		m_transnors(NULL),
-		m_transverts(NULL),
-		m_tvtot(0)
+		m_tvtot(0),
+		m_gameobj(gameobj),
+		m_lastDeformUpdate(-1)
 	{};
 	virtual ~BL_MeshDeformer();
 	virtual void SetSimulatedTime(double time){};
 	virtual bool Apply(class RAS_IPolyMaterial *mat);
-	virtual void Update(void){};
+	virtual bool Update(void){ return false; };
 	virtual	RAS_Deformer*	GetReplica(){return NULL;};
+	struct Mesh* GetMesh() { return m_bmesh; };
 	//	virtual void InitDeform(double time){};
 protected:
 	class BL_SkinMeshObject*	m_pMeshObject;
 	struct Mesh*				m_bmesh;
-	MT_Point3*					m_transnors;
 	
-	//MT_Point3*				m_transverts;
 	// this is so m_transverts doesn't need to be converted
 	// before deformation
 	float						(*m_transverts)[3];
+	float 						(*m_transnors)[3];
 	struct Object*				m_objMesh; 
 	// --
 	int							m_tvtot;
+	BL_DeformableGameObject*	m_gameobj;
+	double					 	m_lastDeformUpdate;
 };
 
 #endif
diff --git a/source/gameengine/Converter/BL_ShapeActionActuator.cpp b/source/gameengine/Converter/BL_ShapeActionActuator.cpp
new file mode 100644
index 00000000000..7196b393ed4
--- /dev/null
+++ b/source/gameengine/Converter/BL_ShapeActionActuator.cpp
@@ -0,0 +1,821 @@
+/**
+* $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 *****
+*/
+
+#if defined (__sgi)
+#include <math.h>
+#else
+#include <cmath>
+#endif
+
+#include "SCA_LogicManager.h"
+#include "BL_ShapeActionActuator.h"
+#include "BL_ActionActuator.h"
+#include "BL_ShapeDeformer.h"
+#include "KX_GameObject.h"
+#include "STR_HashedString.h"
+#include "DNA_action_types.h"
+#include "DNA_nla_types.h"
+#include "DNA_actuator_types.h"
+#include "BKE_action.h"
+#include "DNA_armature_types.h"
+#include "MEM_guardedalloc.h"
+#include "BLI_blenlib.h"
+#include "BLI_arithb.h"
+#include "MT_Matrix4x4.h"
+#include "BKE_utildefines.h"
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+BL_ShapeActionActuator::~BL_ShapeActionActuator()
+{
+}
+
+void BL_ShapeActionActuator::ProcessReplica()
+{
+	m_localtime=m_startframe;
+	m_lastUpdate=-1;
+}
+
+void BL_ShapeActionActuator::SetBlendTime (float newtime)
+{
+	m_blendframe = newtime;
+}
+
+CValue* BL_ShapeActionActuator::GetReplica() 
+{
+	BL_ShapeActionActuator* replica = new BL_ShapeActionActuator(*this);//m_float,GetName());
+	replica->ProcessReplica();
+	
+	// this will copy properties and so on...
+	CValue::AddDataToReplica(replica);
+	return replica;
+}
+
+bool BL_ShapeActionActuator::ClampLocalTime()
+{
+	if (m_startframe < m_endframe)	{
+		if (m_localtime < m_startframe)
+		{
+			m_localtime = m_startframe;
+			return true;
+		} 
+		else if (m_localtime > m_endframe)
+		{
+			m_localtime = m_endframe;
+			return true;
+		}
+	} else {
+		if (m_localtime > m_startframe)
+		{
+			m_localtime = m_startframe;
+			return true;
+		}
+		else if (m_localtime < m_endframe)
+		{
+			m_localtime = m_endframe;
+			return true;
+		}
+	}
+	return false;
+}
+
+void BL_ShapeActionActuator::SetStartTime(float curtime)
+{
+	float direction = m_startframe < m_endframe ? 1.0 : -1.0;
+	
+	if (!(m_flag & ACT_FLAG_REVERSE))
+		m_starttime = curtime - direction*(m_localtime - m_startframe)/KX_KetsjiEngine::GetAnimFrameRate();
+	else
+		m_starttime = curtime - direction*(m_endframe - m_localtime)/KX_KetsjiEngine::GetAnimFrameRate();
+}
+
+void BL_ShapeActionActuator::SetLocalTime(float curtime)
+{
+	float delta_time = (curtime - m_starttime)*KX_KetsjiEngine::GetAnimFrameRate();
+	
+	if (m_endframe < m_startframe)
+		delta_time = -delta_time;
+
+	if (!(m_flag & ACT_FLAG_REVERSE))
+		m_localtime = m_startframe + delta_time;
+	else
+		m_localtime = m_endframe - delta_time;
+}
+
+void BL_ShapeActionActuator::BlendShape(Key* key, float srcweight)
+{
+	vector<float>::const_iterator it;
+	float dstweight;
+	int i;
+	KeyBlock *kb;
+	
+	dstweight = 1.0F - srcweight;
+
+	for (it=m_blendshape.begin(), kb = (KeyBlock*)key->block.first; 
+		 kb && it != m_blendshape.end(); 
+		 kb = (KeyBlock*)kb->next, it++) {
+		kb->curval = kb->curval * dstweight + (*it) * srcweight;
+	}
+}
+
+bool BL_ShapeActionActuator::Update(double curtime, bool frame)
+{
+	bool bNegativeEvent = false;
+	bool bPositiveEvent = false;
+	bool keepgoing = true;
+	bool wrap = false;
+	bool apply=true;
+	int	priority;
+	float newweight;
+	
+	// result = true if animation has to be continued, false if animation stops
+	// maybe there are events for us in the queue !
+	if (frame)
+	{
+		for (vector<CValue*>::iterator i=m_events.begin(); !(i==m_events.end());i++)
+		{
+			if ((*i)->GetNumber() == 0.0f)
+				bNegativeEvent = true;
+			else
+				bPositiveEvent= true;
+			(*i)->Release();
+		
+		}
+		m_events.clear();
+		
+		if (bPositiveEvent)
+			m_flag |= ACT_FLAG_ACTIVE;
+		
+		if (bNegativeEvent)
+		{
+			if (!(m_flag & ACT_FLAG_ACTIVE))
+				return false;
+			m_flag &= ~ACT_FLAG_ACTIVE;
+		}
+	}
+	
+	/*	This action can only be attached to a deform object */
+	BL_DeformableGameObject *obj = (BL_DeformableGameObject*)GetParent();
+	float length = m_endframe - m_startframe;
+	
+	priority = m_priority;
+	
+	/* Determine pre-incrementation behaviour and set appropriate flags */
+	switch (m_playtype){
+	case ACT_ACTION_MOTION:
+		if (bNegativeEvent){
+			keepgoing=false;
+			apply=false;
+		};
+		break;
+	case ACT_ACTION_FROM_PROP:
+		if (bNegativeEvent){
+			apply=false;
+			keepgoing=false;
+		}
+		break;
+	case ACT_ACTION_LOOP_END:
+		if (bPositiveEvent){
+			if (!(m_flag & ACT_FLAG_LOCKINPUT)){
+				m_flag &= ~ACT_FLAG_KEYUP;
+				m_flag &= ~ACT_FLAG_REVERSE;
+				m_flag |= ACT_FLAG_LOCKINPUT;
+				m_localtime = m_startframe;
+				m_starttime = curtime;
+			}
+		}
+		if (bNegativeEvent){
+			m_flag |= ACT_FLAG_KEYUP;
+		}
+		break;
+	case ACT_ACTION_LOOP_STOP:
+		if (bPositiveEvent){
+			if (!(m_flag & ACT_FLAG_LOCKINPUT)){
+				m_flag &= ~ACT_FLAG_REVERSE;
+				m_flag &= ~ACT_FLAG_KEYUP;
+				m_flag |= ACT_FLAG_LOCKINPUT;
+				SetStartTime(curtime);
+			}
+		}
+		if (bNegativeEvent){
+			m_flag |= ACT_FLAG_KEYUP;
+			m_flag &= ~ACT_FLAG_LOCKINPUT;
+			keepgoing=false;
+			apply=false;
+		}
+		break;
+	case ACT_ACTION_FLIPPER:
+		if (bPositiveEvent){
+			if (!(m_flag & ACT_FLAG_LOCKINPUT)){
+				m_flag &= ~ACT_FLAG_REVERSE;
+				m_flag |= ACT_FLAG_LOCKINPUT;
+				SetStartTime(curtime);
+			}
+		}
+		else if (bNegativeEvent){
+			m_flag |= ACT_FLAG_REVERSE;
+			m_flag &= ~ACT_FLAG_LOCKINPUT;
+			SetStartTime(curtime);
+		}
+		break;
+	case ACT_ACTION_PLAY:
+		if (bPositiveEvent){
+			if (!(m_flag & ACT_FLAG_LOCKINPUT)){
+				m_flag &= ~ACT_FLAG_REVERSE;
+				m_localtime = m_starttime;
+				m_starttime = curtime;
+				m_flag |= ACT_FLAG_LOCKINPUT;
+			}
+		}
+		break;
+	default:
+		break;
+	}
+	
+	/* Perform increment */
+	if (keepgoing){
+		if (m_playtype == ACT_ACTION_MOTION){
+			MT_Point3	newpos;
+			MT_Point3	deltapos;
+			
+			newpos = obj->NodeGetWorldPosition();
+			
+			/* Find displacement */
+			deltapos = newpos-m_lastpos;
+			m_localtime += (length/m_stridelength) * deltapos.length();
+			m_lastpos = newpos;
+		}
+		else{
+			SetLocalTime(curtime);
+		}
+	}
+	
+	/* Check if a wrapping response is needed */
+	if (length){
+		if (m_localtime < m_startframe || m_localtime > m_endframe)
+		{
+			m_localtime = m_startframe + fmod(m_localtime, length);
+			wrap = true;
+		}
+	}
+	else
+		m_localtime = m_startframe;
+	
+	/* Perform post-increment tasks */
+	switch (m_playtype){
+	case ACT_ACTION_FROM_PROP:
+		{
+			CValue* propval = GetParent()->GetProperty(m_propname);
+			if (propval)
+				m_localtime = propval->GetNumber();
+			
+			if (bNegativeEvent){
+				keepgoing=false;
+			}
+		}
+		break;
+	case ACT_ACTION_MOTION:
+		break;
+	case ACT_ACTION_LOOP_STOP:
+		break;
+	case ACT_ACTION_FLIPPER:
+		if (wrap){
+			if (!(m_flag & ACT_FLAG_REVERSE)){
+				m_localtime=m_endframe;
+				//keepgoing = false;
+			}
+			else {
+				m_localtime=m_startframe;
+				keepgoing = false;
+			}
+		}
+		break;
+	case ACT_ACTION_LOOP_END:
+		if (wrap){
+			if (m_flag & ACT_FLAG_KEYUP){
+				keepgoing = false;
+				m_localtime = m_endframe;
+				m_flag &= ~ACT_FLAG_LOCKINPUT;
+			}
+			SetStartTime(curtime);
+		}
+		break;
+	case ACT_ACTION_PLAY:
+		if (wrap){
+			m_localtime = m_endframe;
+			keepgoing = false;
+			m_flag &= ~ACT_FLAG_LOCKINPUT;
+		}
+		break;
+	default:
+		keepgoing = false;
+		break;
+	}
+	
+	
+	if (bNegativeEvent)
+		m_blendframe=0.0f;
+	
+	/* Apply the pose if necessary*/
+	if (apply) {
+
+		/* Priority test */
+		if (obj->SetActiveAction(this, priority, curtime)){
+			Key *key = obj->GetKey();
+
+			if (!key) {
+				// this could happen if the mesh was changed in the middle of an action
+				// and the new mesh has no key, stop the action
+				keepgoing = false;
+			}
+			else {
+				ListBase tchanbase= {NULL, NULL};
+			
+				if (m_blendin && m_blendframe==0.0f){
+					// this is the start of the blending, remember the startup shape
+					obj->GetShape(m_blendshape);
+					m_blendstart = curtime;
+				}
+				// only interested in shape channel
+				extract_ipochannels_from_action(&tchanbase, &key->id, m_action, "Shape", m_localtime);
+		
+				if (!execute_ipochannels(&tchanbase)) {
+					// no update, this is possible if action does not match the keys, stop the action
+					keepgoing = false;
+				} 
+				else {
+					// the key have changed, apply blending if needed
+					if (m_blendin && (m_blendframe<m_blendin)){
+						newweight = (m_blendframe/(float)m_blendin);
+
+						BlendShape(key, 1.0f - newweight);
+
+						/* Increment current blending percentage */
+						m_blendframe = (curtime - m_blendstart)*KX_KetsjiEngine::GetAnimFrameRate();
+						if (m_blendframe>m_blendin)
+							m_blendframe = m_blendin;
+					}
+					m_lastUpdate = m_localtime;
+				}
+				BLI_freelistN(&tchanbase);
+			}
+		}
+		else{
+			m_blendframe = 0.0f;
+		}
+	}
+	
+	if (!keepgoing){
+		m_blendframe = 0.0f;
+	}
+	return keepgoing;
+};
+
+/* ------------------------------------------------------------------------- */
+/* Python functions                                                          */
+/* ------------------------------------------------------------------------- */
+
+/* Integration hooks ------------------------------------------------------- */
+
+PyTypeObject BL_ShapeActionActuator::Type = {
+	PyObject_HEAD_INIT(&PyType_Type)
+		0,
+		"BL_ShapeActionActuator",
+		sizeof(BL_ShapeActionActuator),
+		0,
+		PyDestructor,
+		0,
+		__getattr,
+		__setattr,
+		0, //&MyPyCompare,
+		__repr,
+		0, //&cvalue_as_number,
+		0,
+		0,
+		0,
+		0
+};
+
+PyParentObject BL_ShapeActionActuator::Parents[] = {
+	&BL_ShapeActionActuator::Type,
+		&SCA_IActuator::Type,
+		&SCA_ILogicBrick::Type,
+		&CValue::Type,
+		NULL
+};
+
+PyMethodDef BL_ShapeActionActuator::Methods[] = {
+	{"setAction", (PyCFunction) BL_ShapeActionActuator::sPySetAction, METH_VARARGS, SetAction_doc},
+	{"setStart", (PyCFunction) BL_ShapeActionActuator::sPySetStart, METH_VARARGS, SetStart_doc},
+	{"setEnd", (PyCFunction) BL_ShapeActionActuator::sPySetEnd, METH_VARARGS, SetEnd_doc},
+	{"setBlendin", (PyCFunction) BL_ShapeActionActuator::sPySetBlendin, METH_VARARGS, SetBlendin_doc},
+	{"setPriority", (PyCFunction) BL_ShapeActionActuator::sPySetPriority, METH_VARARGS, SetPriority_doc},
+	{"setFrame", (PyCFunction) BL_ShapeActionActuator::sPySetFrame, METH_VARARGS, SetFrame_doc},
+	{"setProperty", (PyCFunction) BL_ShapeActionActuator::sPySetProperty, METH_VARARGS, SetProperty_doc},
+	{"setBlendtime", (PyCFunction) BL_ShapeActionActuator::sPySetBlendtime, METH_VARARGS, SetBlendtime_doc},
+
+	{"getAction", (PyCFunction) BL_ShapeActionActuator::sPyGetAction, METH_VARARGS, GetAction_doc},
+	{"getStart", (PyCFunction) BL_ShapeActionActuator::sPyGetStart, METH_VARARGS, GetStart_doc},
+	{"getEnd", (PyCFunction) BL_ShapeActionActuator::sPyGetEnd, METH_VARARGS, GetEnd_doc},
+	{"getBlendin", (PyCFunction) BL_ShapeActionActuator::sPyGetBlendin, METH_VARARGS, GetBlendin_doc},
+	{"getPriority", (PyCFunction) BL_ShapeActionActuator::sPyGetPriority, METH_VARARGS, GetPriority_doc},
+	{"getFrame", (PyCFunction) BL_ShapeActionActuator::sPyGetFrame, METH_VARARGS, GetFrame_doc},
+	{"getProperty", (PyCFunction) BL_ShapeActionActuator::sPyGetProperty, METH_VARARGS, GetProperty_doc},
+	{"getType", (PyCFunction) BL_ShapeActionActuator::sPyGetType, METH_VARARGS, GetType_doc},	
+	{"setType", (PyCFunction) BL_ShapeActionActuator::sPySetType, METH_VARARGS, SetType_doc},
+	{NULL,NULL} //Sentinel
+};
+
+PyObject* BL_ShapeActionActuator::_getattr(const STR_String& attr) {
+	_getattr_up(SCA_IActuator);
+}
+
+/*     setStart                                                              */
+char BL_ShapeActionActuator::GetAction_doc[] = 
+"getAction()\n"
+"\tReturns a string containing the name of the current action.\n";
+
+PyObject* BL_ShapeActionActuator::PyGetAction(PyObject* self, 
+											  PyObject* args, 
+											  PyObject* kwds) {
+	PyObject *result;
+	
+	if (m_action){
+		result = Py_BuildValue("s", m_action->id.name+2);
+	}
+	else{
+		Py_INCREF(Py_None);
+		result = Py_None;
+	}
+	
+	return result;
+}
+
+/*     getProperty                                                             */
+char BL_ShapeActionActuator::GetProperty_doc[] = 
+"getProperty()\n"
+"\tReturns the name of the property to be used in FromProp mode.\n";
+
+PyObject* BL_ShapeActionActuator::PyGetProperty(PyObject* self, 
+												PyObject* args, 
+												PyObject* kwds) {
+	PyObject *result;
+	
+	result = Py_BuildValue("s", (const char *)m_propname);
+	
+	return result;
+}
+
+/*     getFrame                                                              */
+char BL_ShapeActionActuator::GetFrame_doc[] = 
+"getFrame()\n"
+"\tReturns the current frame number.\n";
+
+PyObject* BL_ShapeActionActuator::PyGetFrame(PyObject* self, 
+											 PyObject* args, 
+											 PyObject* kwds) {
+	PyObject *result;
+	
+	result = Py_BuildValue("f", m_localtime);
+	
+	return result;
+}
+
+/*     getEnd                                                                */
+char BL_ShapeActionActuator::GetEnd_doc[] = 
+"getEnd()\n"
+"\tReturns the last frame of the action.\n";
+
+PyObject* BL_ShapeActionActuator::PyGetEnd(PyObject* self, 
+										   PyObject* args, 
+										   PyObject* kwds) {
+	PyObject *result;
+	
+	result = Py_BuildValue("f", m_endframe);
+	
+	return result;
+}
+
+/*     getStart                                                              */
+char BL_ShapeActionActuator::GetStart_doc[] = 
+"getStart()\n"
+"\tReturns the starting frame of the action.\n";
+
+PyObject* BL_ShapeActionActuator::PyGetStart(PyObject* self, 
+											 PyObject* args, 
+											 PyObject* kwds) {
+	PyObject *result;
+	
+	result = Py_BuildValue("f", m_startframe);
+	
+	return result;
+}
+
+/*     getBlendin                                                            */
+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(PyObject* self, 
+											   PyObject* args, 
+											   PyObject* kwds) {
+	PyObject *result;
+	
+	result = Py_BuildValue("f", m_blendin);
+	
+	return result;
+}
+
+/*     getPriority                                                           */
+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(PyObject* self, 
+											    PyObject* args, 
+												PyObject* kwds) {
+	PyObject *result;
+	
+	result = Py_BuildValue("i", m_priority);
+	
+	return result;
+}
+
+/*     setAction                                                             */
+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* self, 
+											  PyObject* args, 
+											  PyObject* kwds) {
+	char *string;
+	int	reset = 1;
+
+	if (PyArg_ParseTuple(args,"s|i",&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_INCREF(Py_None);
+	return Py_None;
+}
+
+/*     setStart                                                              */
+char BL_ShapeActionActuator::SetStart_doc[] = 
+"setStart(start)\n"
+"\t - start     : Specifies the starting frame of the animation.\n";
+
+PyObject* BL_ShapeActionActuator::PySetStart(PyObject* self, 
+											 PyObject* args, 
+											 PyObject* kwds) {
+	float start;
+	
+	if (PyArg_ParseTuple(args,"f",&start))
+	{
+		m_startframe = start;
+	}
+	else {
+		return NULL;
+	}
+	
+	Py_INCREF(Py_None);
+	return Py_None;
+}
+
+/*     setEnd                                                                */
+char BL_ShapeActionActuator::SetEnd_doc[] = 
+"setEnd(end)\n"
+"\t - end       : Specifies the ending frame of the animation.\n";
+
+PyObject* BL_ShapeActionActuator::PySetEnd(PyObject* self, 
+										   PyObject* args, 
+										   PyObject* kwds) {
+	float end;
+	
+	if (PyArg_ParseTuple(args,"f",&end))
+	{
+		m_endframe = end;
+	}
+	else {
+		return NULL;
+	}
+	
+	Py_INCREF(Py_None);
+	return Py_None;
+}
+
+/*     setBlendin                                                            */
+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* self, 
+											   PyObject* args, 
+											   PyObject* kwds) {
+	float blendin;
+	
+	if (PyArg_ParseTuple(args,"f",&blendin))
+	{
+		m_blendin = blendin;
+	}
+	else {
+		return NULL;
+	}
+	
+	Py_INCREF(Py_None);
+	return Py_None;
+}
+
+/*     setBlendtime                                                          */
+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* self, 
+												 PyObject* args, 
+												   PyObject* kwds) {
+	float blendframe;
+	
+	if (PyArg_ParseTuple(args,"f",&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_INCREF(Py_None);
+	return Py_None;
+}
+
+/*     setPriority                                                           */
+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* self, 
+												PyObject* args, 
+												PyObject* kwds) {
+	int priority;
+	
+	if (PyArg_ParseTuple(args,"i",&priority))
+	{
+		m_priority = priority;
+	}
+	else {
+		return NULL;
+	}
+	
+	Py_INCREF(Py_None);
+	return Py_None;
+}
+
+/*     setFrame                                                              */
+char BL_ShapeActionActuator::SetFrame_doc[] = 
+"setFrame(frame)\n"
+"\t - frame     : Specifies the new current frame for the animation\n";
+
+PyObject* BL_ShapeActionActuator::PySetFrame(PyObject* self, 
+											 PyObject* args, 
+											 PyObject* kwds) {
+	float frame;
+	
+	if (PyArg_ParseTuple(args,"f",&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_INCREF(Py_None);
+	return Py_None;
+}
+
+/*     setProperty                                                           */
+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* self, 
+												PyObject* args, 
+												PyObject* kwds) {
+	char *string;
+	
+	if (PyArg_ParseTuple(args,"s",&string))
+	{
+		m_propname = string;
+	}
+	else {
+		return NULL;
+	}
+	
+	Py_INCREF(Py_None);
+	return Py_None;
+}
+
+/* getType */
+char BL_ShapeActionActuator::GetType_doc[] =
+"getType()\n"
+"\tReturns the operation mode of the actuator.\n";
+PyObject* BL_ShapeActionActuator::PyGetType(PyObject* self,
+											PyObject* args, 
+											PyObject* kwds) {
+    return Py_BuildValue("h", m_playtype);
+}
+
+/* setType */
+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* self,
+                                            PyObject* args,
+                                            PyObject* kwds) {
+	short typeArg;
+                                                                                                             
+    if (!PyArg_ParseTuple(args, "h", &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;
+}
+
diff --git a/source/gameengine/Converter/BL_ShapeActionActuator.h b/source/gameengine/Converter/BL_ShapeActionActuator.h
new file mode 100644
index 00000000000..434a62a1233
--- /dev/null
+++ b/source/gameengine/Converter/BL_ShapeActionActuator.h
@@ -0,0 +1,133 @@
+/**
+ * $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 BL_SHAPEACTIONACTUATOR
+#define BL_SHAPEACTIONACTUATOR
+
+#include "GEN_HashedPtr.h"
+#include "SCA_IActuator.h"
+#include "MT_Point3.h"
+#include <vector>
+
+struct Key;
+class BL_ShapeActionActuator : public SCA_IActuator  
+{
+public:
+	Py_Header;
+	BL_ShapeActionActuator(SCA_IObject* gameobj,
+						const STR_String& propname,
+						float starttime,
+						float endtime,
+						struct bAction *action,
+						short	playtype,
+						short	blendin,
+						short	priority,
+						float	stride,
+						PyTypeObject* T=&Type) 
+		: SCA_IActuator(gameobj,T),
+		
+		m_lastpos(0, 0, 0),
+		m_blendframe(0),
+		m_flag(0),
+		m_startframe (starttime),
+		m_endframe(endtime) ,
+		m_starttime(0),
+		m_localtime(starttime),
+		m_lastUpdate(-1),
+		m_blendin(blendin),
+		m_blendstart(0),
+		m_stridelength(stride),
+		m_playtype(playtype),
+		m_priority(priority),
+		m_action(action),
+		m_propname(propname)
+	{
+	};
+	virtual ~BL_ShapeActionActuator();
+	virtual	bool Update(double curtime, bool frame);
+	virtual CValue* GetReplica();
+	virtual void ProcessReplica();
+	
+	void SetBlendTime (float newtime);
+	void BlendShape(struct Key* key, float weigth);
+
+	KX_PYMETHOD_DOC(BL_ShapeActionActuator,SetAction);
+	KX_PYMETHOD_DOC(BL_ShapeActionActuator,SetBlendin);
+	KX_PYMETHOD_DOC(BL_ShapeActionActuator,SetPriority);
+	KX_PYMETHOD_DOC(BL_ShapeActionActuator,SetStart);
+	KX_PYMETHOD_DOC(BL_ShapeActionActuator,SetEnd);
+	KX_PYMETHOD_DOC(BL_ShapeActionActuator,SetFrame);
+	KX_PYMETHOD_DOC(BL_ShapeActionActuator,SetProperty);
+	KX_PYMETHOD_DOC(BL_ShapeActionActuator,SetBlendtime);
+	KX_PYMETHOD_DOC(BL_ShapeActionActuator,SetChannel);
+
+	KX_PYMETHOD_DOC(BL_ShapeActionActuator,GetAction);
+	KX_PYMETHOD_DOC(BL_ShapeActionActuator,GetBlendin);
+	KX_PYMETHOD_DOC(BL_ShapeActionActuator,GetPriority);
+	KX_PYMETHOD_DOC(BL_ShapeActionActuator,GetStart);
+	KX_PYMETHOD_DOC(BL_ShapeActionActuator,GetEnd);
+	KX_PYMETHOD_DOC(BL_ShapeActionActuator,GetFrame);
+	KX_PYMETHOD_DOC(BL_ShapeActionActuator,GetProperty);
+//	KX_PYMETHOD(BL_ActionActuator,GetChannel);
+	KX_PYMETHOD_DOC(BL_ShapeActionActuator,GetType);
+	KX_PYMETHOD_DOC(BL_ShapeActionActuator,SetType);
+
+	virtual PyObject* _getattr(const STR_String& attr);
+
+protected:
+
+	void SetStartTime(float curtime);
+	void SetLocalTime(float curtime);
+	bool ClampLocalTime();
+
+	MT_Point3	m_lastpos;
+	float	m_blendframe;
+	int		m_flag;
+	/** The frame this action starts */
+	float	m_startframe;
+	/** The frame this action ends */
+	float	m_endframe;
+	/** The time this action started */
+	float	m_starttime;
+	/** The current time of the action */
+	float	m_localtime;
+	
+	float	m_lastUpdate;
+	float	m_blendin;
+	float	m_blendstart;
+	float	m_stridelength;
+	short	m_playtype;
+	short	m_priority;
+	struct bAction *m_action;
+	STR_String	m_propname;
+	vector<float> m_blendshape;
+};
+
+#endif
+
diff --git a/source/gameengine/Converter/BL_ShapeDeformer.cpp b/source/gameengine/Converter/BL_ShapeDeformer.cpp
new file mode 100644
index 00000000000..b2e54539b19
--- /dev/null
+++ b/source/gameengine/Converter/BL_ShapeDeformer.cpp
@@ -0,0 +1,181 @@
+/**
+ * $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 *****
+ */
+
+#ifdef WIN32
+#pragma warning (disable : 4786)
+#endif //WIN32
+
+#include "MEM_guardedalloc.h"
+#include "BL_ShapeDeformer.h"
+#include "GEN_Map.h"
+#include "STR_HashedString.h"
+#include "RAS_IPolygonMaterial.h"
+#include "BL_SkinMeshObject.h"
+
+//#include "BL_ArmatureController.h"
+#include "DNA_armature_types.h"
+#include "DNA_action_types.h"
+#include "DNA_key_types.h"
+#include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
+#include "DNA_ipo_types.h"
+#include "DNA_curve_types.h"
+#include "BKE_armature.h"
+#include "BKE_action.h"
+#include "BKE_key.h"
+#include "BKE_ipo.h"
+#include "MT_Point3.h"
+
+extern "C"{
+	#include "BKE_lattice.h"
+}
+ #include "BKE_utildefines.h"
+
+#include "BLI_blenlib.h"
+#include "BLI_arithb.h"
+
+#define __NLA_DEFNORMALS
+//#undef __NLA_DEFNORMALS
+
+
+BL_ShapeDeformer::~BL_ShapeDeformer()
+{
+};
+
+RAS_Deformer *BL_ShapeDeformer::GetReplica()
+{
+	BL_ShapeDeformer *result;
+
+	result = new BL_ShapeDeformer(*this);
+	result->ProcessReplica();
+	return result;
+}
+
+void BL_ShapeDeformer::ProcessReplica()
+{
+}
+
+bool BL_ShapeDeformer::LoadShapeDrivers(Object* arma)
+{
+	IpoCurve *icu;
+
+	m_shapeDrivers.clear();
+	// check if this mesh has armature driven shape keys
+	if (m_bmesh->key->ipo) {
+		for(icu= (IpoCurve*)m_bmesh->key->ipo->curve.first; icu; icu= (IpoCurve*)icu->next) {
+			if(icu->driver && 
+				(icu->flag & IPO_MUTE) == 0 &&
+				icu->driver->type == IPO_DRIVER_TYPE_NORMAL &&
+				icu->driver->ob == arma &&
+				icu->driver->blocktype == ID_AR) {
+				// this shape key ipo curve has a driver on the parent armature
+				// record this curve in the shape deformer so that the corresponding
+				m_shapeDrivers.push_back(icu);
+			}
+		}
+	}
+	return !m_shapeDrivers.empty();
+}
+
+bool BL_ShapeDeformer::ExecuteShapeDrivers(void)
+{
+	if (!m_shapeDrivers.empty() && PoseUpdated()) {
+		vector<IpoCurve*>::iterator it;
+		void *poin;
+		int type;
+		// the shape drivers use the bone matrix as input. Must 
+		// update the matrix now
+		Object* par_arma = m_armobj->GetArmatureObject();
+		m_armobj->ApplyPose();
+		where_is_pose( par_arma ); 
+		PoseApplied(true);
+
+		for (it=m_shapeDrivers.begin(); it!=m_shapeDrivers.end(); it++) {
+			// no need to set a specific time: this curve has a driver
+			IpoCurve *icu = *it;
+			calc_icu(icu, 1.0f);
+			poin = get_ipo_poin((ID*)m_bmesh->key, icu, &type);
+			if (poin) 
+				write_ipo_poin(poin, type, icu->curval);
+		}
+		ForceUpdate();
+		return true;
+	}
+	return false;
+}
+
+bool BL_ShapeDeformer::Update(void)
+{
+	bool bShapeUpdate = false;
+	bool bSkinUpdate = false;
+
+	ExecuteShapeDrivers();
+
+	/* See if the object shape has changed */
+	if (m_lastShapeUpdate != m_gameobj->GetLastFrame()) {
+		/* the key coefficient have been set already, we just need to blend the keys */
+		Object* blendobj = m_gameobj->GetBlendObject();
+		
+		// make sure the vertex weight cache is in line with this object
+		m_pMeshObject->CheckWeightCache(blendobj);
+
+		/* we will blend the key directly in mvert array: it is used by armature as the start position */
+		do_rel_key(0, m_bmesh->totvert, m_bmesh->totvert, (char *)m_bmesh->mvert->co, m_bmesh->key, 0);
+
+		// Don't release the weight array as in Blender, it will most likely be reusable on next frame 
+		// The weight array are ultimately deleted when the skin mesh is destroyed
+		   
+		/* Update the current frame */
+		m_lastShapeUpdate=m_gameobj->GetLastFrame();
+
+		// As we have changed, the mesh, the skin deformer must update as well.
+		// This will force the update
+		BL_SkinDeformer::ForceUpdate();
+		bShapeUpdate = true;
+	}
+	// check for armature deform
+	bSkinUpdate = BL_SkinDeformer::Update();
+
+	if (!bSkinUpdate && bShapeUpdate) {
+		// this means that there is no armature, we still need to copy the vertex to m_transverts
+		// and update the normal (was not done after shape key calculation)
+
+		/* store verts locally */
+		VerifyStorage();
+
+		for (int v =0; v<m_bmesh->totvert; v++)
+			VECCOPY(m_transverts[v], m_bmesh->mvert[v].co);
+
+#ifdef __NLA_DEFNORMALS
+		RecalcNormals();
+#endif
+		bSkinUpdate = true;
+	}
+	return bSkinUpdate;
+}
diff --git a/source/gameengine/Converter/BL_ShapeDeformer.h b/source/gameengine/Converter/BL_ShapeDeformer.h
new file mode 100644
index 00000000000..5f0188e3a42
--- /dev/null
+++ b/source/gameengine/Converter/BL_ShapeDeformer.h
@@ -0,0 +1,99 @@
+/**
+ * $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 BL_SHAPEDEFORMER
+#define BL_SHAPEDEFORMER
+
+#ifdef WIN32
+#pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
+#endif //WIN32
+
+#include "BL_SkinDeformer.h"
+#include "BL_DeformableGameObject.h"
+#include <vector>
+
+struct IpoCurve;
+
+class BL_ShapeDeformer : public BL_SkinDeformer  
+{
+public:
+	virtual void Relink(GEN_Map<class GEN_HashedPtr, void*>*map)
+	{
+		void **h_obj = (*map)[m_gameobj];
+		if (h_obj){
+			m_gameobj = (BL_DeformableGameObject*)(*h_obj);
+		}
+		else
+			m_gameobj=NULL;
+		// relink the underlying skin deformer
+		BL_SkinDeformer::Relink(map);
+	};
+	BL_ShapeDeformer(BL_DeformableGameObject *gameobj,
+                     Object *bmeshobj,
+                     BL_SkinMeshObject *mesh)
+					:	
+						BL_SkinDeformer(gameobj,bmeshobj, mesh),
+						m_lastShapeUpdate(-1)
+	{
+	};
+
+	/* this second constructor is needed for making a mesh deformable on the fly. */
+	BL_ShapeDeformer(BL_DeformableGameObject *gameobj,
+					struct Object *bmeshobj_old,
+					struct Object *bmeshobj_new,
+					class BL_SkinMeshObject *mesh,
+					bool release_object,
+					BL_ArmatureObject* arma = NULL)
+					:
+						BL_SkinDeformer(gameobj, bmeshobj_old, bmeshobj_new, mesh, release_object, arma),
+						m_lastShapeUpdate(-1)
+	{
+	};
+
+	virtual void ProcessReplica();
+	virtual RAS_Deformer *GetReplica();
+	virtual ~BL_ShapeDeformer();
+
+	bool Update (void);
+	bool LoadShapeDrivers(Object* arma);
+	bool ExecuteShapeDrivers(void);
+
+	void ForceUpdate()
+	{
+		m_lastShapeUpdate = -1.0;
+	};
+
+protected:
+	vector<IpoCurve*>		 m_shapeDrivers;
+	double					 m_lastShapeUpdate;
+
+};
+
+#endif
+
diff --git a/source/gameengine/Converter/BL_SkinDeformer.cpp b/source/gameengine/Converter/BL_SkinDeformer.cpp
index 14faa3317d0..f96c40c098f 100644
--- a/source/gameengine/Converter/BL_SkinDeformer.cpp
+++ b/source/gameengine/Converter/BL_SkinDeformer.cpp
@@ -57,106 +57,73 @@ extern "C"{
 #define __NLA_DEFNORMALS
 //#undef __NLA_DEFNORMALS
 
+BL_SkinDeformer::BL_SkinDeformer(BL_DeformableGameObject *gameobj,
+								struct Object *bmeshobj, 
+								class BL_SkinMeshObject *mesh,
+								BL_ArmatureObject* arma)
+							:	//
+							BL_MeshDeformer(gameobj, bmeshobj, mesh),
+							m_armobj(arma),
+							m_lastArmaUpdate(-1),
+							m_defbase(&bmeshobj->defbase),
+							m_releaseobject(false),
+							m_poseApplied(false)
+{
+	Mat4CpyMat4(m_obmat, bmeshobj->obmat);
+};
 
 BL_SkinDeformer::BL_SkinDeformer(
+	BL_DeformableGameObject *gameobj,
 	struct Object *bmeshobj_old,	// Blender object that owns the new mesh
 	struct Object *bmeshobj_new,	// Blender object that owns the original mesh
 	class BL_SkinMeshObject *mesh,
 	bool release_object,
 	BL_ArmatureObject* arma)	:	
-		BL_MeshDeformer(bmeshobj_old, mesh),
+		BL_MeshDeformer(gameobj, bmeshobj_old, mesh),
 		m_armobj(arma),
-		m_lastUpdate(-1),
+		m_lastArmaUpdate(-1),
 		m_defbase(&bmeshobj_old->defbase),
 		m_releaseobject(release_object)
 	{
-		Mat4CpyMat4(m_obmat, bmeshobj_old->obmat);
-		m_restoremat = true;
 		// this is needed to ensure correct deformation of mesh:
 		// the deformation is done with Blender's armature_deform_verts() function
 		// that takes an object as parameter and not a mesh. The object matrice is used
-		// in the calculation, so we must force the same matrice to simulate a pure replacement of mesh
-		Mat4CpyMat4(bmeshobj_old->obmat, bmeshobj_new->obmat);
+		// in the calculation, so we must use the matrix of the original object to
+		// simulate a pure replacement of the mesh.
+		Mat4CpyMat4(m_obmat, bmeshobj_new->obmat);
 	}
 
 BL_SkinDeformer::~BL_SkinDeformer()
 {
 	if(m_releaseobject && m_armobj)
 		m_armobj->Release();
-	if (m_restoremat)
-		Mat4CpyMat4(m_objMesh->obmat, m_obmat);
 }
 
-/* XXX note, this __NLA_OLDDEFORM define seems to be obsolete */
-
 bool BL_SkinDeformer::Apply(RAS_IPolyMaterial *mat)
 {
-	size_t			i, j, index;
-	vecVertexArray	array;
-#ifdef __NLA_OLDDEFORM
-	vecMVertArray	mvarray;
-#else
-	vecIndexArrays	mvarray;
-#endif
-	vecMDVertArray	dvarray;
-	vecIndexArrays	diarray;
-
-	RAS_TexVert *tv;
-#ifdef __NLA_OLDDEFORM
-	MVert	*mvert;
-	MDeformVert	*dvert;
-#endif
-	MT_Point3 pt;
-//	float co[3];
-
-	if (!m_armobj)
-		return false;
+	size_t i, j;
 
+	// update the vertex in m_transverts
 	Update();
 
-	array = m_pMeshObject->GetVertexCache(mat);
-#ifdef __NLA_OLDDEFORM
-	dvarray = m_pMeshObject->GetDVertCache(mat);
-#endif
-	mvarray = m_pMeshObject->GetMVertCache(mat);
-	diarray = m_pMeshObject->GetDIndexCache(mat);
-	
+	// The vertex cache can only be updated for this deformer:
+	// Duplicated objects with more than one ploymaterial (=multiple mesh slot per object)
+	// share the same mesh (=the same cache). As the rendering is done per polymaterial
+	// cycling through the objects, the entire mesh cache cannot be updated in one shot.
+	vecVertexArray& vertexarrays = m_pMeshObject->GetVertexCache(mat);
 
 	// For each array
-	for (i=0; i<array.size(); i++){
-		//	For each vertex
-		for (j=0; j<array[i]->size(); j++){
+	for (i=0; i<vertexarrays.size(); i++) {
+		KX_VertexArray& vertexarray = (*vertexarrays[i]);
 
-			tv = &((*array[i])[j]);
-			
-			index = ((*diarray[i])[j]);
-#ifdef __NLA_OLDDEFORM
-			pt = tv->xyz();
-			mvert = ((*mvarray[i])[index]);
-			dvert = ((*dvarray[i])[index]);
-#endif
-			
-			//	Copy the untransformed data from the original mvert
-#ifdef __NLA_OLDDEFORM
-			co[0]=mvert->co[0];
-			co[1]=mvert->co[1];
-			co[2]=mvert->co[2];
-
-			//	Do the deformation
-/* XXX note, doesnt exist anymore */
-//			GB_calc_armature_deform(co, dvert);
-			tv->SetXYZ(co);
-#else
-			//	Set the data
-			tv->SetXYZ(m_transverts[((*mvarray[i])[index])]);
-#ifdef __NLA_DEFNORMALS
-
-			tv->SetNormal(m_transnors[((*mvarray[i])[index])]);
-#endif
-#endif
+		// For each vertex
+		// copy the untransformed data from the original mvert
+		for (j=0; j<vertexarray.size(); j++) {
+			RAS_TexVert& v = vertexarray[j];
+			v.SetXYZ(m_transverts[v.getOrigIndex()]);
 		}
 	}
-	
+
 	return true;
 }
 
@@ -175,19 +142,19 @@ void BL_SkinDeformer::ProcessReplica()
 
 //void where_is_pose (Object *ob);
 //void armature_deform_verts(Object *armOb, Object *target, float (*vertexCos)[3], int numVerts, int deformflag); 
-void BL_SkinDeformer::Update(void)
+bool BL_SkinDeformer::Update(void)
 {
 	/* See if the armature has been updated for this frame */
-	if (m_lastUpdate!=m_armobj->GetLastFrame()){	
-		
-		/* Do all of the posing necessary */
-		m_armobj->ApplyPose();
+	if (PoseUpdated()){	
+		float obmat[4][4];	// the original object matrice 
 		
 		/* XXX note: where_is_pose() (from BKE_armature.h) calculates all matrices needed to start deforming */
 		/* but it requires the blender object pointer... */
-
 		Object* par_arma = m_armobj->GetArmatureObject();
-		where_is_pose( par_arma ); 
+		if (!PoseApplied()){
+			m_armobj->ApplyPose();
+			where_is_pose( par_arma ); 
+		}
 
 		/* store verts locally */
 		VerifyStorage();
@@ -196,12 +163,28 @@ void BL_SkinDeformer::Update(void)
 		for (int v =0; v<m_bmesh->totvert; v++)
 			VECCOPY(m_transverts[v], m_bmesh->mvert[v].co);
 
+		// save matrix first
+		Mat4CpyMat4(obmat, m_objMesh->obmat);
+		// set reference matrix
+		Mat4CpyMat4(m_objMesh->obmat, m_obmat);
+
 		armature_deform_verts( par_arma, m_objMesh, NULL, m_transverts, NULL, m_bmesh->totvert, ARM_DEF_VGROUP, NULL, NULL );
+		
+		// restore matrix 
+		Mat4CpyMat4(m_objMesh->obmat, obmat);
+
+#ifdef __NLA_DEFNORMALS
 		RecalcNormals();
+#endif
 
 		/* Update the current frame */
-		m_lastUpdate=m_armobj->GetLastFrame();
+		m_lastArmaUpdate=m_armobj->GetLastFrame();
+		/* reset for next frame */
+		PoseApplied(false);
+		/* indicate that the m_transverts and normals are up to date */
+		return true;
 	}
+	return false;
 }
 
 /* XXX note: I propose to drop this function */
diff --git a/source/gameengine/Converter/BL_SkinDeformer.h b/source/gameengine/Converter/BL_SkinDeformer.h
index e130dc15dbf..d3fc5ae2a81 100644
--- a/source/gameengine/Converter/BL_SkinDeformer.h
+++ b/source/gameengine/Converter/BL_SkinDeformer.h
@@ -52,30 +52,25 @@ public:
 //	void SetArmatureController (BL_ArmatureController *cont);
 	virtual void Relink(GEN_Map<class GEN_HashedPtr, void*>*map)
 	{
-		void **h_obj = (*map)[m_armobj];
-		if (h_obj){
-			SetArmature( (BL_ArmatureObject*)(*h_obj) );
+		if (m_armobj){
+			void **h_obj = (*map)[m_armobj];
+			if (h_obj){
+				SetArmature( (BL_ArmatureObject*)(*h_obj) );
+			}
+			else
+				m_armobj=NULL;
 		}
-		else
-			m_armobj=NULL;
 	}
 	void SetArmature (class BL_ArmatureObject *armobj);
 
-	BL_SkinDeformer(struct Object *bmeshobj, 
+	BL_SkinDeformer(BL_DeformableGameObject *gameobj,
+					struct Object *bmeshobj, 
 					class BL_SkinMeshObject *mesh,
-					BL_ArmatureObject* arma = NULL)
-					:	//
-						BL_MeshDeformer(bmeshobj, mesh),
-						m_armobj(arma),
-						m_lastUpdate(-1),
-						m_defbase(&bmeshobj->defbase),
-						m_releaseobject(false),
-						m_restoremat(false)
-	{
-	};
+					BL_ArmatureObject* arma = NULL);
 
 	/* this second constructor is needed for making a mesh deformable on the fly. */
-	BL_SkinDeformer(struct Object *bmeshobj_old,
+	BL_SkinDeformer(BL_DeformableGameObject *gameobj,
+					struct Object *bmeshobj_old,
 					struct Object *bmeshobj_new,
 					class BL_SkinMeshObject *mesh,
 					bool release_object,
@@ -84,17 +79,33 @@ public:
 	virtual void ProcessReplica();
 	virtual RAS_Deformer *GetReplica();
 	virtual ~BL_SkinDeformer();
-	void Update (void);
+	bool Update (void);
 	bool Apply (class RAS_IPolyMaterial *polymat);
+	bool PoseApplied()
+		{ return m_poseApplied; }
+	void PoseApplied(bool applied)
+		{ m_poseApplied = applied; }
+	bool PoseUpdated(void)
+		{ 
+			if (m_armobj && m_lastArmaUpdate!=m_armobj->GetLastFrame()) {
+				return true;
+			}
+			return false;
+		}
+
+	void ForceUpdate()
+	{
+		m_lastArmaUpdate = -1.0;
+	};
 
 protected:
 	BL_ArmatureObject*		m_armobj;	//	Our parent object
 	float					m_time;
-	double					m_lastUpdate;
+	double					m_lastArmaUpdate;
 	ListBase*				m_defbase;
-	float					m_obmat[4][4];	// the original object matrice in case of dynamic mesh replacement
-	bool					m_restoremat;		
+	float					m_obmat[4][4];	// the reference matrix for skeleton deform
 	bool					m_releaseobject;
+	bool					m_poseApplied;
 
 };
 
diff --git a/source/gameengine/Converter/BL_SkinMeshObject.cpp b/source/gameengine/Converter/BL_SkinMeshObject.cpp
index 8bc78c7f757..fa215df1e1c 100644
--- a/source/gameengine/Converter/BL_SkinMeshObject.cpp
+++ b/source/gameengine/Converter/BL_SkinMeshObject.cpp
@@ -43,90 +43,6 @@
 #include "KX_GameObject.h"
 #include "RAS_BucketManager.h"
 
-void BL_SkinMeshObject::AddPolygon(RAS_Polygon* poly)
-{
-	/* We're overriding this so that we can eventually associate faces with verts somehow */
-
-	//	For vertIndex in poly:
-	//		find the appropriate normal
-
-	RAS_MeshObject::AddPolygon(poly);
-}
-
-#ifdef __NLA_OLDDEFORM
-int BL_SkinMeshObject::FindOrAddDeform(int vtxarray, struct MVert *mv, struct MDeformVert *dv, RAS_IPolyMaterial* mat)
-#else
-int BL_SkinMeshObject::FindOrAddDeform(unsigned int vtxarray, unsigned int mv, struct MDeformVert *dv, RAS_IPolyMaterial* mat)
-#endif
-{
-	BL_SkinArrayOptimizer* ao = (BL_SkinArrayOptimizer*)GetArrayOptimizer(mat);//*(m_matVertexArrays[*mat]);
-	int numvert = ao->m_MvertArrayCache1[vtxarray]->size();
-	
-	/* Check to see if this has already been pushed */
-	for (unsigned int i=0; i<ao->m_MvertArrayCache1[vtxarray]->size(); i++){
-		if (mv == (*ao->m_MvertArrayCache1[vtxarray])[i])
-			return i;
-	}
-
-	ao->m_MvertArrayCache1[vtxarray]->push_back(mv);
-	ao->m_DvertArrayCache1[vtxarray]->push_back(dv);
-	
-	return numvert;
-};
-
-int	BL_SkinMeshObject::FindVertexArray(int numverts,RAS_IPolyMaterial* polymat)
-{
-	int array=-1;
-	
-	BL_SkinArrayOptimizer* ao = (BL_SkinArrayOptimizer*)GetArrayOptimizer(polymat);
-
-
-	for (size_t i=0;i<ao->m_VertexArrayCache1.size();i++)
-	{
-		if ( (ao->m_TriangleArrayCount[i] + (numverts-2)) < BUCKET_MAX_TRIANGLES) 
-		{
-			 if((ao->m_VertexArrayCache1[i]->size()+numverts < BUCKET_MAX_INDICES))
-				{
-					array = i;
-					ao->m_TriangleArrayCount[array]+=numverts-2;
-					break;
-				}
-		}
-	}
-	
-
-	if (array == -1)
-	{
-		array = ao->m_VertexArrayCache1.size();
-		
-		vector<RAS_TexVert>* va = new vector<RAS_TexVert>;
-		ao->m_VertexArrayCache1.push_back(va);
-		
-		KX_IndexArray *ia = new KX_IndexArray();
-		ao->m_IndexArrayCache1.push_back(ia);
-
-#ifdef __NLA_OLDDEFORM
-		BL_MVertArray *bva = new BL_MVertArray();
-#else
-		KX_IndexArray *bva = new KX_IndexArray();
-#endif
-		ao->m_MvertArrayCache1.push_back(bva);
-
-		BL_DeformVertArray *dva = new BL_DeformVertArray();
-		ao->m_DvertArrayCache1.push_back(dva);
-
-		KX_IndexArray *da = new KX_IndexArray();
-		ao->m_DIndexArrayCache1.push_back(da);
-
-		ao->m_TriangleArrayCount.push_back(numverts-2);
-
-	}
-
-		
-	return array;
-}
-
-
 //void BL_SkinMeshObject::Bucketize(double* oglmatrix,void* clientobj,bool useObjectColor,const MT_Vector4& rgbavec,RAS_BucketManager* bucketmgr)
 void BL_SkinMeshObject::Bucketize(double* oglmatrix,void* clientobj,bool useObjectColor,const MT_Vector4& rgbavec)
 {
@@ -150,5 +66,63 @@ void BL_SkinMeshObject::Bucketize(double* oglmatrix,void* clientobj,bool useObje
 
 }
 
+static int get_def_index(Object* ob, const char* vgroup)
+{
+	bDeformGroup *curdef;
+	int index = 0;
+
+	for (curdef = (bDeformGroup*)ob->defbase.first; curdef; curdef=(bDeformGroup*)curdef->next, index++)
+		if (!strcmp(curdef->name, vgroup))
+			return index;
+	return -1;
+}
+
+void BL_SkinMeshObject::CheckWeightCache(Object* obj)
+{
+	KeyBlock *kb;
+	int kbindex, defindex;
+	MDeformVert *dvert= NULL;
+	int totvert, i, j;
+	float *weights;
+
+	if (!m_mesh->key)
+		return;
+
+	for(kbindex=0, kb= (KeyBlock*)m_mesh->key->block.first; kb; kb= (KeyBlock*)kb->next, kbindex++)
+	{
+		// first check the cases where the weight must be cleared
+		if (kb->vgroup[0] == 0 ||
+			m_mesh->dvert == NULL ||
+			(defindex = get_def_index(obj, kb->vgroup)) == -1) {
+			if (kb->weights) {
+				MEM_freeN(kb->weights);
+				kb->weights = NULL;
+			}
+			m_cacheWeightIndex[kbindex] = -1;
+		} else if (m_cacheWeightIndex[kbindex] != defindex) {
+			// a weight array is required but the cache is not matching
+			if (kb->weights) {
+				MEM_freeN(kb->weights);
+				kb->weights = NULL;
+			}
+
+			dvert= m_mesh->dvert;
+			totvert= m_mesh->totvert;
+		
+			weights= (float*)MEM_callocN(totvert*sizeof(float), "weights");
+		
+			for (i=0; i < totvert; i++, dvert++) {
+				for(j=0; j<dvert->totweight; j++) {
+					if (dvert->dw[j].def_nr == defindex) {
+						weights[i]= dvert->dw[j].weight;
+						break;
+					}
+				}
+			}
+			kb->weights = weights;
+			m_cacheWeightIndex[kbindex] = defindex;
+		}
+	}
+}
 
 
diff --git a/source/gameengine/Converter/BL_SkinMeshObject.h b/source/gameengine/Converter/BL_SkinMeshObject.h
index 0ca7428c0f0..c21fb64204b 100644
--- a/source/gameengine/Converter/BL_SkinMeshObject.h
+++ b/source/gameengine/Converter/BL_SkinMeshObject.h
@@ -33,7 +33,7 @@
 #ifdef WIN32
 #pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
 #endif //WIN32
-
+#include "MEM_guardedalloc.h"
 #include "RAS_MeshObject.h"
 #include "RAS_Deformer.h"
 #include "RAS_IPolygonMaterial.h"
@@ -41,136 +41,53 @@
 #include "BL_MeshDeformer.h"
 
 #include "DNA_mesh_types.h"
+#include "DNA_key_types.h"
 #include "DNA_meshdata_types.h"
 
-typedef vector<struct MVert*> BL_MVertArray;
-typedef vector<struct MDeformVert*> BL_DeformVertArray;
-typedef vector<class BL_TexVert> BL_VertexArray;
-
-
-typedef vector<vector<struct MDeformVert*>*> vecMDVertArray;
-typedef vector<vector<class BL_TexVert>*> vecBVertexArray;
-
-class BL_SkinArrayOptimizer : public KX_ArrayOptimizer  
-{
-public:
-	BL_SkinArrayOptimizer(int index)
-		:KX_ArrayOptimizer (index) {};
-	virtual ~BL_SkinArrayOptimizer(){
-
-		for (vector<KX_IndexArray*>::iterator itv = m_MvertArrayCache1.begin();
-		!(itv == m_MvertArrayCache1.end());itv++)
-		{
-			delete (*itv);
-		}
-		for (vector<BL_DeformVertArray*>::iterator itd = m_DvertArrayCache1.begin();
-		!(itd == m_DvertArrayCache1.end());itd++)
-		{
-			delete (*itd);
-		}
-		for (vector<KX_IndexArray*>::iterator iti = m_DIndexArrayCache1.begin();
-		!(iti == m_DIndexArrayCache1.end());iti++)
-		{
-			delete (*iti);
-		}
-		
-		m_MvertArrayCache1.clear();
-		m_DvertArrayCache1.clear();
-		m_DIndexArrayCache1.clear();
-	};
-
-	vector<KX_IndexArray*>		m_MvertArrayCache1;
-	vector<BL_DeformVertArray*>	m_DvertArrayCache1;
-	vector<KX_IndexArray*>		m_DIndexArrayCache1;
-
-};
-
 class BL_SkinMeshObject : public RAS_MeshObject
 {
 
 //	enum	{	BUCKET_MAX_INDICES = 16384};//2048};//8192};
 //	enum	{	BUCKET_MAX_TRIANGLES = 4096};
 
-	KX_ArrayOptimizer*		GetArrayOptimizer(RAS_IPolyMaterial* polymat)
-	{
-		KX_ArrayOptimizer** aop = (m_matVertexArrayS[*polymat]);
-		if (aop)
-			return *aop;
-		int numelements = m_matVertexArrayS.size();
-		m_sortedMaterials.push_back(polymat);
-		
-		BL_SkinArrayOptimizer* ao = new BL_SkinArrayOptimizer(numelements);
-		m_matVertexArrayS.insert(*polymat,ao);
-		return ao;
-	}
-
 protected:
+	vector<int>				 m_cacheWeightIndex;
+
 public:
 	void Bucketize(double* oglmatrix,void* clientobj,bool useObjectColor,const MT_Vector4& rgbavec);
 //	void Bucketize(double* oglmatrix,void* clientobj,bool useObjectColor,const MT_Vector4& rgbavec,class RAS_BucketManager* bucketmgr);
 
-	int FindVertexArray(int numverts,RAS_IPolyMaterial* polymat);
-	BL_SkinMeshObject(int lightlayer) : RAS_MeshObject (lightlayer)
-	{ m_class = 1;};
-
-	virtual ~BL_SkinMeshObject(){
+	BL_SkinMeshObject(Mesh* mesh, int lightlayer) : RAS_MeshObject (mesh, lightlayer)
+	{ 
+		m_class = 1;
+		if (m_mesh && m_mesh->key)
+		{
+			KeyBlock *kb;
+			int count=0;
+			// initialize weight cache for shape objects
+			// count how many keys in this mesh
+			for(kb= (KeyBlock*)m_mesh->key->block.first; kb; kb= (KeyBlock*)kb->next)
+				count++;
+			m_cacheWeightIndex.resize(count,-1);
+		}
 	};
 
-	const vecIndexArrays& GetDIndexCache (RAS_IPolyMaterial* mat)
+	virtual ~BL_SkinMeshObject()
 	{
-		BL_SkinArrayOptimizer* ao = (BL_SkinArrayOptimizer*)GetArrayOptimizer(mat);//*(m_matVertexArrays[*mat]);
-		return ao->m_DIndexArrayCache1;
-	}
-	const vecMDVertArray&	GetDVertCache (RAS_IPolyMaterial* mat)
-	{
-		BL_SkinArrayOptimizer* ao = (BL_SkinArrayOptimizer*)GetArrayOptimizer(mat);//*(m_matVertexArrays[*mat]);
-		return ao->m_DvertArrayCache1;
-	}
-	const vecIndexArrays&	GetMVertCache (RAS_IPolyMaterial* mat)
-	{
-		BL_SkinArrayOptimizer* ao = (BL_SkinArrayOptimizer*)GetArrayOptimizer(mat);//*(m_matVertexArrays[*mat]);
-		return ao->m_MvertArrayCache1;
-	}
-	
-	void AddPolygon(RAS_Polygon* poly);
-	int FindOrAddDeform(unsigned int vtxarray, unsigned int mv, struct MDeformVert *dv, RAS_IPolyMaterial* mat);
-	int FindOrAddVertex(int vtxarray,const MT_Point3& xyz,
-		const MT_Point2& uv,
-		const MT_Point2& uv2,
-		const MT_Vector4& tangent,
-		const unsigned int rgbacolor,
-		const MT_Vector3& normal, int defnr, bool flat, RAS_IPolyMaterial* mat)
-	{
-		RAS_TexVert tempvert(xyz,uv,uv2, tangent,rgbacolor,normal,flat ? TV_CALCFACENORMAL : 0);
-		
-		//		KX_ArrayOptimizer* ao = GetArrayOptimizer(mat);//*(m_matVertexArrays[*mat]);
-		BL_SkinArrayOptimizer* ao = (BL_SkinArrayOptimizer*)GetArrayOptimizer(mat);//*(m_matVertexArrays[*mat]);
-		
-		int numverts = ao->m_VertexArrayCache1[vtxarray]->size();//m_VertexArrayCount[vtxarray];
-		
-		int index=-1;
-		
-		for (int i=0;i<numverts;i++)
+		if (m_mesh && m_mesh->key) 
 		{
-			const RAS_TexVert&  vtx = (*ao->m_VertexArrayCache1[vtxarray])[i];
-			if (tempvert.closeTo(&vtx))
-			{
-				index = i;
-				break;
+			KeyBlock *kb;
+			// remove the weight cache to avoid memory leak 
+			for(kb= (KeyBlock*)m_mesh->key->block.first; kb; kb= (KeyBlock*)kb->next) {
+				if(kb->weights) 
+					MEM_freeN(kb->weights);
+				kb->weights= NULL;
 			}
-			
 		}
-		if (index >= 0)
-			return index;
-		
-		// no vertex found, add one
-		ao->m_VertexArrayCache1[vtxarray]->push_back(tempvert);
-		ao->m_DIndexArrayCache1[vtxarray]->push_back(defnr);
-		
-		return numverts;
-		
-		
-	}
+	};
+	
+	// for shape keys, 
+	void CheckWeightCache(struct Object* obj);
 
 };
 
diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
index 8640e69102b..de91bce2ab1 100644
--- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
+++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
@@ -100,7 +100,8 @@ KX_BlenderSceneConverter::KX_BlenderSceneConverter(
 							m_sipo(sipo),
 							m_ketsjiEngine(engine),
 							m_alwaysUseExpandFraming(false),
-							m_usemat(false)
+							m_usemat(false),
+							m_useglslmat(false)
 {
 	m_newfilename = "";
 }
@@ -449,6 +450,13 @@ void KX_BlenderSceneConverter::RemoveScene(KX_Scene *scene)
 void KX_BlenderSceneConverter::SetMaterials(bool val)
 {
 	m_usemat = val;
+	m_useglslmat = false;
+}
+
+void KX_BlenderSceneConverter::SetGLSLMaterials(bool val)
+{
+	m_usemat = val;
+	m_useglslmat = val;
 }
 
 bool KX_BlenderSceneConverter::GetMaterials()
@@ -456,6 +464,10 @@ bool KX_BlenderSceneConverter::GetMaterials()
 	return m_usemat;
 }
 
+bool KX_BlenderSceneConverter::GetGLSLMaterials()
+{
+	return m_useglslmat;
+}
 
 void KX_BlenderSceneConverter::RegisterBlenderMaterial(BL_Material *mat)
 {
diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.h b/source/gameengine/Converter/KX_BlenderSceneConverter.h
index a45d7396875..e5d6ccc5caf 100644
--- a/source/gameengine/Converter/KX_BlenderSceneConverter.h
+++ b/source/gameengine/Converter/KX_BlenderSceneConverter.h
@@ -75,6 +75,7 @@ class KX_BlenderSceneConverter : public KX_ISceneConverter
 	class KX_Scene*			m_currentScene;	// Scene being converted
 	bool					m_alwaysUseExpandFraming;
 	bool					m_usemat;
+	bool					m_useglslmat;
 
 	void localDel_ipoCurve ( IpoCurve * icu ,struct SpaceIpo*	sipo);
 //	struct Ipo* findIpoForName(char* objName);
@@ -146,6 +147,10 @@ public:
 	virtual void SetMaterials(bool val);
 	virtual bool GetMaterials();
 
+	// use blender glsl materials
+	virtual void SetGLSLMaterials(bool val);
+	virtual bool GetGLSLMaterials();
+
 };
 
 #endif //__KX_BLENDERSCENECONVERTER_H
diff --git a/source/gameengine/Converter/KX_ConvertActuators.cpp b/source/gameengine/Converter/KX_ConvertActuators.cpp
index 6b594e2e70b..1cc1b2e27a3 100644
--- a/source/gameengine/Converter/KX_ConvertActuators.cpp
+++ b/source/gameengine/Converter/KX_ConvertActuators.cpp
@@ -56,11 +56,13 @@
 #include "KX_ConstraintActuator.h"
 #include "KX_CameraActuator.h"
 #include "KX_GameActuator.h"
+#include "KX_StateActuator.h"
 #include "KX_VisibilityActuator.h"
 #include "KX_SCA_AddObjectActuator.h"
 #include "KX_SCA_EndObjectActuator.h"
 #include "KX_SCA_ReplaceMeshActuator.h"
 #include "KX_ParentActuator.h"
+#include "KX_SCA_DynamicActuator.h"
 
 #include "KX_Scene.h"
 #include "KX_KetsjiEngine.h"
@@ -84,6 +86,7 @@
 #include "DNA_actuator_types.h"
 #include "DNA_packedFile_types.h"
 #include "BL_ActionActuator.h"
+#include "BL_ShapeActionActuator.h"
 /* end of blender include block */
 
 #include "BL_BlenderDataConversion.h"
@@ -135,6 +138,7 @@ void BL_ConvertActuators(char* maggiename,
 				MT_Vector3 angvelvec ( KX_BLENDERTRUNC(obact->angularvelocity[0]),
 					KX_BLENDERTRUNC(obact->angularvelocity[1]),
 					KX_BLENDERTRUNC(obact->angularvelocity[2]));
+				short damping = obact->damping;
 				
 				drotvec /=		BLENDER_HACK_DTIME;
 				//drotvec /=		BLENDER_HACK_DTIME;
@@ -155,7 +159,7 @@ void BL_ConvertActuators(char* maggiename,
 				bitLocalFlag.DRot = bool((obact->flag & ACT_DROT_LOCAL)!=0);
 				bitLocalFlag.LinearVelocity = bool((obact->flag & ACT_LIN_VEL_LOCAL)!=0);
 				bitLocalFlag.AngularVelocity = bool((obact->flag & ACT_ANG_VEL_LOCAL)!=0);
-				
+				bitLocalFlag.ServoControl = bool(obact->type == ACT_OBJECT_SERVO);
 				bitLocalFlag.AddOrSetLinV = bool((obact->flag & ACT_ADD_LIN_VEL)!=0);
 				
 				
@@ -166,6 +170,7 @@ void BL_ConvertActuators(char* maggiename,
 					drotvec.getValue(),
 					linvelvec.getValue(),
 					angvelvec.getValue(),
+					damping,
 					bitLocalFlag
 					);
 				baseact = tmpbaseact;
@@ -176,8 +181,35 @@ void BL_ConvertActuators(char* maggiename,
 				if (blenderobject->type==OB_ARMATURE){
 					bActionActuator* actact = (bActionActuator*) bact->data;
 					STR_String propname = (actact->name ? actact->name : "");
+					STR_String propframe = (actact->frameProp ? actact->frameProp : "");
 					
 					BL_ActionActuator* tmpbaseact = new BL_ActionActuator(
+						gameobj,
+						propname,
+						propframe,
+						actact->sta,
+						actact->end,
+						actact->act,
+						actact->type, // + 1, because Blender starts to count at zero,
+						actact->blendin,
+						actact->priority,
+						actact->end_reset,
+						actact->stridelength
+						// Ketsji at 1, because zero is reserved for "NoDef"
+						);
+					baseact= tmpbaseact;
+					break;
+				}
+				else
+					printf ("Discarded action actuator from non-armature object [%s]\n", blenderobject->id.name+2);
+			}
+		case ACT_SHAPEACTION:
+			{
+				if (blenderobject->type==OB_MESH){
+					bActionActuator* actact = (bActionActuator*) bact->data;
+					STR_String propname = (actact->name ? actact->name : "");
+					
+					BL_ShapeActionActuator* tmpbaseact = new BL_ShapeActionActuator(
 						gameobj,
 						propname,
 						actact->sta,
@@ -193,7 +225,7 @@ void BL_ConvertActuators(char* maggiename,
 					break;
 				}
 				else
-					printf ("Discarded action actuator from non-armature object [%s]\n", blenderobject->id.name+2);
+					printf ("Discarded shape action actuator from non-mesh object [%s]\n", blenderobject->id.name+2);
 			}
 		case ACT_IPO:
 			{
@@ -202,7 +234,8 @@ void BL_ConvertActuators(char* maggiename,
 				STR_String propname = ( ipoact->name ? ipoact->name : "");
 				// first bit?
 				bool ipo_as_force = (ipoact->flag & ACT_IPOFORCE);
-				bool force_local = (ipoact->flag & ACT_IPOFORCE_LOCAL);
+				bool local = (ipoact->flag & ACT_IPOLOCAL);
+				bool ipo_add = (ipoact->flag & ACT_IPOADD);
 				
 				KX_IpoActuator* tmpbaseact = new KX_IpoActuator(
 					gameobj,
@@ -213,8 +246,8 @@ void BL_ConvertActuators(char* maggiename,
 					ipoact->type + 1, // + 1, because Blender starts to count at zero,
 					// Ketsji at 1, because zero is reserved for "NoDef"
 					ipo_as_force,
-					force_local
-					);
+					ipo_add,
+					local);
 				baseact = tmpbaseact;
 				break;
 			}
@@ -506,7 +539,7 @@ void BL_ConvertActuators(char* maggiename,
 						
 						// does the 'original' for replication exists, and 
 						// is it in a non-active layer ?
-						CValue* originalval = NULL;
+						SCA_IObject* originalval = NULL;
 						if (editobact->ob && !(editobact->ob->lay & activeLayerBitInfo))
 							originalval = converter->FindGameObject(editobact->ob);
 						
@@ -572,6 +605,15 @@ void BL_ConvertActuators(char* maggiename,
 								blenderobject->upflag
 								);
 							baseact = tmptrackact;
+						break;
+					}
+				case ACT_EDOB_DYNAMICS:
+					{
+						KX_SCA_DynamicActuator* tmpdynact 
+							= new KX_SCA_DynamicActuator(gameobj, 
+								editobact->dyn_operation
+								);
+							baseact = tmpdynact;
 					}
 				}
 				break;
@@ -579,51 +621,105 @@ void BL_ConvertActuators(char* maggiename,
 		case ACT_CONSTRAINT:
 			{
 				float min = 0.0, max = 0.0;
+				char *prop = NULL;
 				KX_ConstraintActuator::KX_CONSTRAINTTYPE locrot = KX_ConstraintActuator::KX_ACT_CONSTRAINT_NODEF;
 				bConstraintActuator *conact 
 					= (bConstraintActuator*) bact->data;
 				/* convert settings... degrees in the ui become radians  */ 
 				/* internally                                            */ 
-				switch (conact->flag) {
-				case ACT_CONST_LOCX:
-					locrot = KX_ConstraintActuator::KX_ACT_CONSTRAINT_LOCX; 
-					min = conact->minloc[0];
-					max = conact->maxloc[0];
-					break;
-				case ACT_CONST_LOCY:
-					locrot = KX_ConstraintActuator::KX_ACT_CONSTRAINT_LOCY; 
-					min = conact->minloc[1];
-					max = conact->maxloc[1];
-					break;
-				case ACT_CONST_LOCZ:
-					locrot = KX_ConstraintActuator::KX_ACT_CONSTRAINT_LOCZ;
-					min = conact->minloc[2];
-					max = conact->maxloc[2];
-					break;
-				case ACT_CONST_ROTX:
-					locrot = KX_ConstraintActuator::KX_ACT_CONSTRAINT_ROTX;
-					min = MT_2_PI * conact->minrot[0] / 360.0;
-					max = MT_2_PI * conact->maxrot[0] / 360.0;
-					break;
-				case ACT_CONST_ROTY:
-					locrot = KX_ConstraintActuator::KX_ACT_CONSTRAINT_ROTY;
-					min = MT_2_PI * conact->minrot[1] / 360.0;
-					max = MT_2_PI * conact->maxrot[1] / 360.0;
-					break;
-				case ACT_CONST_ROTZ:
-					locrot = KX_ConstraintActuator::KX_ACT_CONSTRAINT_ROTZ;
-					min = MT_2_PI * conact->minrot[2] / 360.0;
-					max = MT_2_PI * conact->maxrot[2] / 360.0;
-					break;
-				default:
-					; /* error */ 
+				if (conact->type == ACT_CONST_TYPE_ORI) {
+					switch (conact->mode) {
+					case ACT_CONST_DIRPX:
+						locrot = KX_ConstraintActuator::KX_ACT_CONSTRAINT_ORIX;
+						break;
+					case ACT_CONST_DIRPY:
+						locrot = KX_ConstraintActuator::KX_ACT_CONSTRAINT_ORIY;
+						break;
+					case ACT_CONST_DIRPZ:
+						locrot = KX_ConstraintActuator::KX_ACT_CONSTRAINT_ORIZ;
+						break;
+					}
+				} else if (conact->type == ACT_CONST_TYPE_DIST) {
+					switch (conact->mode) {
+					case ACT_CONST_DIRPX:
+						locrot = KX_ConstraintActuator::KX_ACT_CONSTRAINT_DIRPX;
+						min = conact->minloc[0];
+						max = conact->maxloc[0];
+						break;
+					case ACT_CONST_DIRPY:
+						locrot = KX_ConstraintActuator::KX_ACT_CONSTRAINT_DIRPY;
+						min = conact->minloc[1];
+						max = conact->maxloc[1];
+						break;
+					case ACT_CONST_DIRPZ:
+						locrot = KX_ConstraintActuator::KX_ACT_CONSTRAINT_DIRPZ;
+						min = conact->minloc[2];
+						max = conact->maxloc[2];
+						break;
+					case ACT_CONST_DIRMX:
+						locrot = KX_ConstraintActuator::KX_ACT_CONSTRAINT_DIRMX;
+						min = conact->minloc[0];
+						max = conact->maxloc[0];
+						break;
+					case ACT_CONST_DIRMY:
+						locrot = KX_ConstraintActuator::KX_ACT_CONSTRAINT_DIRMY;
+						min = conact->minloc[1];
+						max = conact->maxloc[1];
+						break;
+					case ACT_CONST_DIRMZ:
+						locrot = KX_ConstraintActuator::KX_ACT_CONSTRAINT_DIRMZ;
+						min = conact->minloc[2];
+						max = conact->maxloc[2];
+						break;
+					}
+					prop = conact->matprop;
+				} else {
+					switch (conact->flag) {
+					case ACT_CONST_LOCX:
+						locrot = KX_ConstraintActuator::KX_ACT_CONSTRAINT_LOCX; 
+						min = conact->minloc[0];
+						max = conact->maxloc[0];
+						break;
+					case ACT_CONST_LOCY:
+						locrot = KX_ConstraintActuator::KX_ACT_CONSTRAINT_LOCY; 
+						min = conact->minloc[1];
+						max = conact->maxloc[1];
+						break;
+					case ACT_CONST_LOCZ:
+						locrot = KX_ConstraintActuator::KX_ACT_CONSTRAINT_LOCZ;
+						min = conact->minloc[2];
+						max = conact->maxloc[2];
+						break;
+					case ACT_CONST_ROTX:
+						locrot = KX_ConstraintActuator::KX_ACT_CONSTRAINT_ROTX;
+						min = MT_2_PI * conact->minrot[0] / 360.0;
+						max = MT_2_PI * conact->maxrot[0] / 360.0;
+						break;
+					case ACT_CONST_ROTY:
+						locrot = KX_ConstraintActuator::KX_ACT_CONSTRAINT_ROTY;
+						min = MT_2_PI * conact->minrot[1] / 360.0;
+						max = MT_2_PI * conact->maxrot[1] / 360.0;
+						break;
+					case ACT_CONST_ROTZ:
+						locrot = KX_ConstraintActuator::KX_ACT_CONSTRAINT_ROTZ;
+						min = MT_2_PI * conact->minrot[2] / 360.0;
+						max = MT_2_PI * conact->maxrot[2] / 360.0;
+						break;
+					default:
+						; /* error */ 
+					}
 				}
 				KX_ConstraintActuator *tmpconact 
 					= new KX_ConstraintActuator(gameobj,
-					conact->damp,
-					min,
-					max,
-					locrot);
+						conact->damp,
+						conact->rotdamp,
+						min,
+						max,
+						conact->maxrot,
+						locrot,
+						conact->time,
+						conact->flag,
+						prop);
 				baseact = tmpconact;
 				break;
 			}
@@ -832,7 +928,19 @@ void BL_ConvertActuators(char* maggiename,
 			baseact = tmp_vis_act;
 		}
 		break;
-		
+
+		case ACT_STATE:
+		{
+			bStateActuator *sta_act = (bStateActuator *) bact->data;
+			KX_StateActuator * tmp_sta_act = NULL;
+
+			tmp_sta_act = 
+				new KX_StateActuator(gameobj, sta_act->type, sta_act->mask);
+			
+			baseact = tmp_sta_act;
+		}
+		break;
+
 		case ACT_2DFILTER:
 		{
 			bTwoDFilterActuator *_2dfilter = (bTwoDFilterActuator*) bact->data;
diff --git a/source/gameengine/Converter/KX_ConvertControllers.cpp b/source/gameengine/Converter/KX_ConvertControllers.cpp
index a26cfa95b6d..da490b4ee85 100644
--- a/source/gameengine/Converter/KX_ConvertControllers.cpp
+++ b/source/gameengine/Converter/KX_ConvertControllers.cpp
@@ -35,6 +35,10 @@
 // Controller
 #include "SCA_ANDController.h"
 #include "SCA_ORController.h"
+#include "SCA_NANDController.h"
+#include "SCA_NORController.h"
+#include "SCA_XORController.h"
+#include "SCA_XNORController.h"
 #include "SCA_PythonController.h"
 #include "SCA_ExpressionController.h"
 
@@ -112,6 +116,30 @@ void BL_ConvertControllers(
 				LinkControllerToActuators(gamecontroller,bcontr,logicmgr,converter);
 				break;
 			}
+			case CONT_LOGIC_NAND:
+			{
+				gamecontroller = new SCA_NANDController(gameobj);
+				LinkControllerToActuators(gamecontroller,bcontr,logicmgr,converter);
+				break;
+			}
+			case CONT_LOGIC_NOR:
+			{
+				gamecontroller = new SCA_NORController(gameobj);
+				LinkControllerToActuators(gamecontroller,bcontr,logicmgr,converter);
+				break;
+			}
+			case CONT_LOGIC_XOR:
+			{
+				gamecontroller = new SCA_XORController(gameobj);
+				LinkControllerToActuators(gamecontroller,bcontr,logicmgr,converter);
+				break;
+			}
+			case CONT_LOGIC_XNOR:
+			{
+				gamecontroller = new SCA_XNORController(gameobj);
+				LinkControllerToActuators(gamecontroller,bcontr,logicmgr,converter);
+				break;
+			}
 			case CONT_EXPRESSION:
 			{
 				bExpressionCont* bexpcont = (bExpressionCont*) bcontr->data;
@@ -161,6 +189,7 @@ void BL_ConvertControllers(
 		if (gamecontroller)
 		{
 			gamecontroller->SetExecutePriority(executePriority++);
+			gamecontroller->SetState(bcontr->state_mask);
 			STR_String uniquename = bcontr->name;
 			uniquename += "#CONTR#";
 			uniqueint++;
diff --git a/source/gameengine/Converter/KX_ConvertSensors.cpp b/source/gameengine/Converter/KX_ConvertSensors.cpp
index 80fa3838d60..7c9df688d45 100644
--- a/source/gameengine/Converter/KX_ConvertSensors.cpp
+++ b/source/gameengine/Converter/KX_ConvertSensors.cpp
@@ -64,6 +64,7 @@ probably misplaced */
 #include "KX_MouseFocusSensor.h"
 #include "SCA_JoystickSensor.h"
 #include "KX_NetworkMessageSensor.h"
+#include "SCA_ActuatorSensor.h"
 
 
 #include "SCA_PropertySensor.h"
@@ -251,6 +252,7 @@ void BL_ConvertSensors(struct Object* blenderobject,
 	bool neg_pulsemode = false;
 	int frequency = 0;
 	bool invert = false;
+	bool level = false;
 	
 	while(sens)
 	{
@@ -263,7 +265,8 @@ void BL_ConvertSensors(struct Object* blenderobject,
 		
 		frequency = sens->freq;
 		invert    = !(sens->invert == 0);
-		
+		level     = !(sens->level == 0);
+
 		switch (sens->type)
 		{
 		case  SENS_ALWAYS:
@@ -536,6 +539,19 @@ void BL_ConvertSensors(struct Object* blenderobject,
 				
 				break;
 			}
+		case SENS_ACTUATOR:
+			{
+				bActuatorSensor* blenderactsensor = (bActuatorSensor*) sens->data;
+				// we will reuse the property event manager, there is nothing special with this sensor
+				SCA_EventManager* eventmgr 
+					= logicmgr->FindEventManager(SCA_EventManager::ACTUATOR_EVENTMGR);
+				if (eventmgr)
+				{
+					STR_String propname=blenderactsensor->name;
+					gamesensor = new SCA_ActuatorSensor(eventmgr,gameobj,propname);
+				}
+				break;
+			}
 			
 		case SENS_RADAR:
 			{
@@ -711,6 +727,7 @@ void BL_ConvertSensors(struct Object* blenderobject,
 									 neg_pulsemode, 
 									 frequency);
 			gamesensor->SetInvert(invert);
+			gamesensor->SetLevel(level);
 			gamesensor->SetName(STR_String(sens->name));			
 			
 			gameobj->AddSensor(gamesensor);
diff --git a/source/gameengine/Expressions/PyObjectPlus.h b/source/gameengine/Expressions/PyObjectPlus.h
index de89ed9b5c8..2bcb604dd23 100644
--- a/source/gameengine/Expressions/PyObjectPlus.h
+++ b/source/gameengine/Expressions/PyObjectPlus.h
@@ -76,18 +76,36 @@ static inline void Py_Fatal(char *M) {
   virtual PyTypeObject *GetType(void) {return &Type;}; \
   virtual PyParentObject *GetParents(void) {return Parents;}
 
+
 								// This defines the _getattr_up macro
 								// which allows attribute and method calls
 								// to be properly passed up the hierarchy.
 #define _getattr_up(Parent) \
-  PyObject *rvalue = Py_FindMethod(Methods, this, const_cast<char*>(attr.ReadPtr())); \
-  if (rvalue == NULL) \
-    { \
-      PyErr_Clear(); \
-      return Parent::_getattr(attr); \
+  PyObject *rvalue = NULL; \
+  if (attr=="__methods__") { \
+    PyObject *_attr_string = NULL; \
+    PyMethodDef *meth = Methods; \
+    rvalue = Parent::_getattr(attr); \
+    if (rvalue==NULL) { \
+    	PyErr_Clear(); \
+    	rvalue = PyList_New(0); \
     } \
-  else \
-    return rvalue 
+    if (meth) { \
+      for (; meth->ml_name != NULL; meth++) { \
+        _attr_string = PyString_FromString(meth->ml_name); \
+		PyList_Append(rvalue, _attr_string); \
+		Py_DECREF(_attr_string); \
+	  } \
+	} \
+  } else { \
+    rvalue = Py_FindMethod(Methods, this, const_cast<char*>(attr.ReadPtr())); \
+    if (rvalue == NULL) { \
+      PyErr_Clear(); \
+      rvalue = Parent::_getattr(attr); \
+    } \
+  } \
+  return rvalue; \
+
 
 /**
  * These macros are helpfull when embedding Python routines. The second
@@ -99,6 +117,18 @@ static inline void Py_Fatal(char *M) {
 		return ((class_name*) self)->Py##method_name(self, args, kwds);		\
 	}; \
 
+#define KX_PYMETHOD_NOARGS(class_name, method_name)			\
+	PyObject* Py##method_name(PyObject* self); \
+	static PyObject* sPy##method_name( PyObject* self) { \
+		return ((class_name*) self)->Py##method_name(self);		\
+	}; \
+	
+#define KX_PYMETHOD_O(class_name, method_name)			\
+	PyObject* Py##method_name(PyObject* self, PyObject* value); \
+	static PyObject* sPy##method_name( PyObject* self, PyObject* value) { \
+		return ((class_name*) self)->Py##method_name(self, value);		\
+	}; \
+
 #define KX_PYMETHOD_DOC(class_name, method_name)			\
 	PyObject* Py##method_name(PyObject* self, PyObject* args, PyObject* kwds); \
 	static PyObject* sPy##method_name( PyObject* self, PyObject* args, PyObject* kwds) { \
@@ -106,6 +136,21 @@ static inline void Py_Fatal(char *M) {
 	}; \
     static char method_name##_doc[]; \
 
+#define KX_PYMETHOD_DOC_O(class_name, method_name)			\
+	PyObject* Py##method_name(PyObject* self, PyObject* value); \
+	static PyObject* sPy##method_name( PyObject* self, PyObject* value) { \
+		return ((class_name*) self)->Py##method_name(self, value);		\
+	}; \
+    static char method_name##_doc[]; \
+
+#define KX_PYMETHOD_DOC_NOARGS(class_name, method_name)			\
+	PyObject* Py##method_name(PyObject* self); \
+	static PyObject* sPy##method_name( PyObject* self) { \
+		return ((class_name*) self)->Py##method_name(self);		\
+	}; \
+    static char method_name##_doc[]; \
+
+
 /* The line above should remain empty */
 /**
  * Method table macro (with doc)
diff --git a/source/gameengine/Expressions/Value.cpp b/source/gameengine/Expressions/Value.cpp
index 56208ab4ad5..48136eb9dc3 100644
--- a/source/gameengine/Expressions/Value.cpp
+++ b/source/gameengine/Expressions/Value.cpp
@@ -405,7 +405,20 @@ bool CValue::RemoveProperty(const STR_String & inName)
 	return false;
 }
 
-
+//
+// Get Property Names
+//
+vector<STR_String> CValue::GetPropertyNames()
+{
+	vector<STR_String> result;
+	if(!m_pNamedPropertyArray) return result;
+	for ( std::map<STR_String,CValue*>::iterator it = m_pNamedPropertyArray->begin();
+	!(it == m_pNamedPropertyArray->end());it++)
+	{
+		result.push_back((*it).first);
+	}
+	return result;
+}
 
 //
 // Clear all properties
@@ -520,11 +533,6 @@ void CValue::CloneProperties(CValue *replica)
 	
 }
 
-
-
-
-
-
 double*		CValue::GetVector3(bool bGetTransformedVec)
 {
 	assertd(false); // don;t get vector from me
@@ -775,6 +783,25 @@ int	CValue::_setattr(const STR_String& attr,PyObject* pyobj)
 	//PyObjectPlus::_setattr(attr,value);
 	return 0;
 };
+
+PyObject*	CValue::ConvertKeysToPython( void )
+{
+	PyObject *pylist = PyList_New( 0 );
+	PyObject *pystr;
+	
+	if (m_pNamedPropertyArray)
+	{
+		for ( std::map<STR_String,CValue*>::iterator it = m_pNamedPropertyArray->begin();
+		!(it == m_pNamedPropertyArray->end());it++)
+		{
+			pystr = PyString_FromString( (*it).first );
+			PyList_Append(pylist, pystr);
+			Py_DECREF( pystr );
+		}
+	}
+	return pylist;
+}
+
 /*
 PyObject*	CValue::PyMake(PyObject* ignored,PyObject* args)
 {
diff --git a/source/gameengine/Expressions/Value.h b/source/gameengine/Expressions/Value.h
index ccb9c34749d..bcf231cf4f0 100644
--- a/source/gameengine/Expressions/Value.h
+++ b/source/gameengine/Expressions/Value.h
@@ -253,6 +253,8 @@ public:
 	virtual int				_delattr(const STR_String& attr);
 	virtual int				_setattr(const STR_String& attr,PyObject* value);
 	
+	virtual PyObject* ConvertKeysToPython( void );
+	
 	KX_PYMETHOD(CValue,GetName);
 
 #else
@@ -284,6 +286,7 @@ public:
 	STR_String			GetPropertyText(const STR_String & inName,const STR_String& deftext="");						// Get text description of property with name <inName>, returns an empty string if there is no property named <inName>
 	float				GetPropertyNumber(const STR_String& inName,float defnumber);
 	virtual bool		RemoveProperty(const STR_String & inName);						// Remove the property named <inName>, returns true if the property was succesfully removed, false if property was not found or could not be removed
+	virtual vector<STR_String>	GetPropertyNames();
 	virtual void		ClearProperties();										// Clear all properties
 
 	virtual void		SetPropertiesModified(bool inModified);					// Set all properties' modified flag to <inModified>
diff --git a/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp b/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
index f3b5b1fdda2..96a770a553f 100644
--- a/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
+++ b/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
@@ -7,7 +7,6 @@
 #endif
 #include <iostream>
 
-
 SCA_2DFilterActuator::~SCA_2DFilterActuator()
 {
 }
@@ -29,6 +28,11 @@ SCA_2DFilterActuator::SCA_2DFilterActuator(
 	 m_rasterizer(rasterizer),
 	 m_rendertools(rendertools)
 {
+	m_gameObj = NULL;
+	if(gameobj){
+		m_propNames = gameobj->GetPropertyNames();
+		m_gameObj = gameobj;
+	}
 }
 
 void SCA_2DFilterActuator::SetShaderText(STR_String text)
@@ -50,8 +54,6 @@ CValue* SCA_2DFilterActuator::GetReplica()
 
 bool SCA_2DFilterActuator::Update()
 {
-	bool result = false;
-
 	bool bNegativeEvent = IsNegativeEvent();
 	RemoveAllEvents();
 
@@ -72,7 +74,7 @@ bool SCA_2DFilterActuator::Update()
 	}
 	else if(m_type < RAS_2DFilterManager::RAS_2DFILTER_NUMBER_OF_FILTERS)
 	{
-		m_rendertools->Update2DFilter(m_type, m_int_arg, m_shaderText);
+		m_rendertools->Update2DFilter(m_propNames, m_gameObj, m_type, m_int_arg, m_shaderText);
 	}
     return true;
 }
diff --git a/source/gameengine/GameLogic/SCA_2DFilterActuator.h b/source/gameengine/GameLogic/SCA_2DFilterActuator.h
index 7b0cfff951e..7ec07cf5b19 100644
--- a/source/gameengine/GameLogic/SCA_2DFilterActuator.h
+++ b/source/gameengine/GameLogic/SCA_2DFilterActuator.h
@@ -5,13 +5,13 @@
 #include "RAS_IRenderTools.h"
 #include "SCA_IActuator.h"
 
-
 class SCA_2DFilterActuator : public SCA_IActuator
 {
     Py_Header;
 
 private:
-	
+	vector<STR_String> m_propNames;
+	void * m_gameObj;
 	RAS_2DFilterManager::RAS_2DFILTER_MODE m_type;
 	short m_flag;
 	float m_float_arg;
diff --git a/source/gameengine/GameLogic/SCA_ActuatorEventManager.cpp b/source/gameengine/GameLogic/SCA_ActuatorEventManager.cpp
new file mode 100644
index 00000000000..28ca1fd673f
--- /dev/null
+++ b/source/gameengine/GameLogic/SCA_ActuatorEventManager.cpp
@@ -0,0 +1,76 @@
+/**
+ * $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 "SCA_ISensor.h"
+#include "SCA_ActuatorEventManager.h"
+#include "SCA_ActuatorSensor.h"
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+
+SCA_ActuatorEventManager::SCA_ActuatorEventManager(class SCA_LogicManager* logicmgr)
+	: SCA_EventManager(ACTUATOR_EVENTMGR),
+	m_logicmgr(logicmgr)
+{
+}
+
+
+
+SCA_ActuatorEventManager::~SCA_ActuatorEventManager()
+{
+
+}
+
+
+
+void SCA_ActuatorEventManager::RegisterSensor(SCA_ISensor* sensor)
+{
+	m_sensors.push_back(sensor);
+}
+
+
+
+void SCA_ActuatorEventManager::NextFrame()
+{
+	// check for changed actuator
+	for (vector<SCA_ISensor*>::const_iterator it = m_sensors.begin();!(it==m_sensors.end());it++)
+	{
+		(*it)->Activate(m_logicmgr,NULL);
+	}
+}
+
+void SCA_ActuatorEventManager::UpdateFrame()
+{
+	// update the state of actuator before executing them
+	for (vector<SCA_ISensor*>::const_iterator it = m_sensors.begin();!(it==m_sensors.end());it++)
+	{
+		((SCA_ActuatorSensor*)(*it))->Update();
+	}
+}
\ No newline at end of file
diff --git a/source/gameengine/GameLogic/SCA_ActuatorEventManager.h b/source/gameengine/GameLogic/SCA_ActuatorEventManager.h
new file mode 100644
index 00000000000..b5108764197
--- /dev/null
+++ b/source/gameengine/GameLogic/SCA_ActuatorEventManager.h
@@ -0,0 +1,52 @@
+/**
+ * $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_ACTUATOREVENTMANAGER
+#define __KX_ACTUATOREVENTMANAGER
+
+#include "SCA_EventManager.h"
+
+#include <vector>
+
+using namespace std;
+
+class SCA_ActuatorEventManager : public SCA_EventManager
+{
+	class SCA_LogicManager*	m_logicmgr;
+
+public:
+	SCA_ActuatorEventManager(class SCA_LogicManager* logicmgr);
+	virtual ~SCA_ActuatorEventManager();
+	virtual void NextFrame();
+	virtual void UpdateFrame();
+	virtual void	RegisterSensor(SCA_ISensor* sensor);
+	//SCA_LogicManager* GetLogicManager() { return m_logicmgr;}
+};
+
+#endif //__KX_ACTUATOREVENTMANAGER
+
diff --git a/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp b/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
new file mode 100644
index 00000000000..e1c8ef87dd1
--- /dev/null
+++ b/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
@@ -0,0 +1,196 @@
+/**
+ * Actuator sensor
+ *
+ * $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 <iostream>
+#include "SCA_ActuatorSensor.h"
+#include "SCA_EventManager.h"
+#include "SCA_LogicManager.h"
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+SCA_ActuatorSensor::SCA_ActuatorSensor(SCA_EventManager* eventmgr,
+									 SCA_IObject* gameobj,
+									 const STR_String& actname,
+									 PyTypeObject* T )
+	: SCA_ISensor(gameobj,eventmgr,T),
+	  m_checkactname(actname)
+{
+	m_actuator = GetParent()->FindActuator(m_checkactname);
+	Init();
+}
+
+void SCA_ActuatorSensor::Init()
+{
+	m_lastresult = m_invert?true:false;
+	m_midresult = m_lastresult;
+	m_reset = true;
+}
+
+CValue* SCA_ActuatorSensor::GetReplica()
+{
+	SCA_ActuatorSensor* replica = new SCA_ActuatorSensor(*this);
+	// m_range_expr must be recalculated on replica!
+	CValue::AddDataToReplica(replica);
+	replica->Init();
+
+	return replica;
+}
+
+void SCA_ActuatorSensor::ReParent(SCA_IObject* parent)
+{
+	m_actuator = parent->FindActuator(m_checkactname);
+	SCA_ISensor::ReParent(parent);
+}
+
+bool SCA_ActuatorSensor::IsPositiveTrigger()
+{
+	bool result = m_lastresult;
+	if (m_invert)
+		result = !result;
+
+	return result;
+}
+
+
+
+SCA_ActuatorSensor::~SCA_ActuatorSensor()
+{
+}
+
+
+
+bool SCA_ActuatorSensor::Evaluate(CValue* event)
+{
+	if (m_actuator)
+	{
+		bool result = m_actuator->IsActive();
+		bool reset = m_reset && m_level;
+		
+		m_reset = false;
+		if (m_lastresult != result || m_midresult != result)
+		{
+			m_lastresult = m_midresult = result;
+			return true;
+		}
+		return (reset) ? true : false;
+	}
+	return false;
+}
+
+void SCA_ActuatorSensor::Update()
+{
+	if (m_actuator)
+	{
+		m_midresult = m_actuator->IsActive() && !m_actuator->IsNegativeEvent();
+	}
+}
+
+
+/* ------------------------------------------------------------------------- */
+/* Python functions                                                          */
+/* ------------------------------------------------------------------------- */
+
+/* Integration hooks ------------------------------------------------------- */
+PyTypeObject SCA_ActuatorSensor::Type = {
+	PyObject_HEAD_INIT(&PyType_Type)
+	0,
+	"SCA_ActuatorSensor",
+	sizeof(SCA_ActuatorSensor),
+	0,
+	PyDestructor,
+	0,
+	__getattr,
+	__setattr,
+	0, //&MyPyCompare,
+	__repr,
+	0, //&cvalue_as_number,
+	0,
+	0,
+	0,
+	0
+};
+
+PyParentObject SCA_ActuatorSensor::Parents[] = {
+	&SCA_ActuatorSensor::Type,
+	&SCA_ISensor::Type,
+	&SCA_ILogicBrick::Type,
+	&CValue::Type,
+	NULL
+};
+
+PyMethodDef SCA_ActuatorSensor::Methods[] = {
+	{"getActuator", (PyCFunction) SCA_ActuatorSensor::sPyGetActuator, METH_VARARGS, GetActuator_doc},
+	{"setActuator", (PyCFunction) SCA_ActuatorSensor::sPySetActuator, METH_VARARGS, SetActuator_doc},
+	{NULL,NULL} //Sentinel
+};
+
+PyObject* SCA_ActuatorSensor::_getattr(const STR_String& attr) {
+	_getattr_up(SCA_ISensor); /* implicit return! */
+}
+
+/* 3. getActuator */
+char SCA_ActuatorSensor::GetActuator_doc[] = 
+"getActuator()\n"
+"\tReturn the Actuator with which the sensor operates.\n";
+PyObject* SCA_ActuatorSensor::PyGetActuator(PyObject* self, PyObject* args, PyObject* kwds) 
+{
+	return PyString_FromString(m_checkactname);
+}
+
+/* 4. setActuator */
+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* self, PyObject* args, PyObject* kwds) 
+{
+	/* We should query whether the name exists. Or should we create a prop   */
+	/* on the fly?                                                           */
+	char *actNameArg = NULL;
+
+	if (!PyArg_ParseTuple(args, "s", &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;
+}
+
+/* eof */
diff --git a/source/gameengine/GameLogic/SCA_ActuatorSensor.h b/source/gameengine/GameLogic/SCA_ActuatorSensor.h
new file mode 100644
index 00000000000..6086c5bfce0
--- /dev/null
+++ b/source/gameengine/GameLogic/SCA_ActuatorSensor.h
@@ -0,0 +1,74 @@
+/**
+ * Actuator sensor
+ *
+ * $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_ACTUATORSENSOR
+#define __KX_ACTUATORSENSOR
+
+#include "SCA_ISensor.h"
+#include "SCA_IActuator.h"
+
+class SCA_ActuatorSensor : public SCA_ISensor
+{
+	Py_Header;
+	STR_String		m_checkactname;
+	bool			m_lastresult;
+	bool			m_midresult;
+ protected:
+	SCA_IActuator*	m_actuator;
+public:
+	SCA_ActuatorSensor(class SCA_EventManager* eventmgr,
+					  SCA_IObject* gameobj,
+					  const STR_String& actname,
+					  PyTypeObject* T=&Type );
+	
+	virtual ~SCA_ActuatorSensor();
+	virtual CValue* GetReplica();
+	virtual void Init();
+	virtual bool Evaluate(CValue* event);
+	virtual bool	IsPositiveTrigger();
+	virtual void	ReParent(SCA_IObject* parent);
+	void Update();
+
+	/* --------------------------------------------------------------------- */
+	/* Python interface ---------------------------------------------------- */
+	/* --------------------------------------------------------------------- */
+
+	virtual PyObject* _getattr(const STR_String& attr);
+
+	/* 3. setProperty */
+	KX_PYMETHOD_DOC(SCA_ActuatorSensor,SetActuator);
+	/* 4. getProperty */
+	KX_PYMETHOD_DOC(SCA_ActuatorSensor,GetActuator);
+	
+};
+
+#endif
+
diff --git a/source/gameengine/GameLogic/SCA_AlwaysSensor.cpp b/source/gameengine/GameLogic/SCA_AlwaysSensor.cpp
index 67df5d091ab..f9fbf2387c4 100644
--- a/source/gameengine/GameLogic/SCA_AlwaysSensor.cpp
+++ b/source/gameengine/GameLogic/SCA_AlwaysSensor.cpp
@@ -53,10 +53,13 @@ SCA_AlwaysSensor::SCA_AlwaysSensor(class SCA_EventManager* eventmgr,
 	: SCA_ISensor(gameobj,eventmgr, T)
 {
 	//SetDrawColor(255,0,0);
-	m_alwaysresult = true;
+	Init();
 }
 
-
+void SCA_AlwaysSensor::Init()
+{
+	m_alwaysresult = true;
+}
 
 SCA_AlwaysSensor::~SCA_AlwaysSensor()
 {
diff --git a/source/gameengine/GameLogic/SCA_AlwaysSensor.h b/source/gameengine/GameLogic/SCA_AlwaysSensor.h
index 474ed025432..8bf2a8aa98e 100644
--- a/source/gameengine/GameLogic/SCA_AlwaysSensor.h
+++ b/source/gameengine/GameLogic/SCA_AlwaysSensor.h
@@ -45,6 +45,8 @@ public:
 	virtual CValue* GetReplica();
 	virtual bool Evaluate(CValue* event);
 	virtual bool IsPositiveTrigger();
+	virtual void Init();
+
 
 	/* --------------------------------------------------------------------- */
 	/* Python interface ---------------------------------------------------- */
diff --git a/source/gameengine/GameLogic/SCA_EventManager.cpp b/source/gameengine/GameLogic/SCA_EventManager.cpp
index 1ca88182ddc..0169864a133 100644
--- a/source/gameengine/GameLogic/SCA_EventManager.cpp
+++ b/source/gameengine/GameLogic/SCA_EventManager.cpp
@@ -72,7 +72,9 @@ void SCA_EventManager::EndFrame()
 {
 }
 
-
+void SCA_EventManager::UpdateFrame()
+{
+}
 
 int SCA_EventManager::GetType()
 {
diff --git a/source/gameengine/GameLogic/SCA_EventManager.h b/source/gameengine/GameLogic/SCA_EventManager.h
index 89731497f6f..9cc1718cd1e 100644
--- a/source/gameengine/GameLogic/SCA_EventManager.h
+++ b/source/gameengine/GameLogic/SCA_EventManager.h
@@ -49,7 +49,8 @@ public:
 		RAY_EVENTMGR,
 		RADAR_EVENTMGR,
 		NETWORK_EVENTMGR,
-		JOY_EVENTMGR
+		JOY_EVENTMGR,
+		ACTUATOR_EVENTMGR
 	};
 
 	SCA_EventManager(EVENT_MANAGER_TYPE mgrtype);
@@ -58,6 +59,7 @@ public:
 	virtual void	RemoveSensor(class SCA_ISensor* sensor);
 	virtual void	NextFrame(double curtime, double fixedtime);
 	virtual void	NextFrame();
+	virtual void    UpdateFrame();
 	virtual void	EndFrame();
 	virtual void	RegisterSensor(class SCA_ISensor* sensor)=0;
 	int		GetType();
diff --git a/source/gameengine/GameLogic/SCA_IActuator.cpp b/source/gameengine/GameLogic/SCA_IActuator.cpp
index 568d0eb4a89..eeca2d7b44c 100644
--- a/source/gameengine/GameLogic/SCA_IActuator.cpp
+++ b/source/gameengine/GameLogic/SCA_IActuator.cpp
@@ -36,6 +36,7 @@ using namespace std;
 
 SCA_IActuator::SCA_IActuator(SCA_IObject* gameobj,
 							 PyTypeObject* T) :
+	m_links(0),
 	SCA_ILogicBrick(gameobj,T) 
 {
 	// nothing to do
@@ -109,3 +110,12 @@ SCA_IActuator::~SCA_IActuator()
 	RemoveAllEvents();
 }
 
+void SCA_IActuator::DecLink()
+{
+	m_links--;
+	if (m_links < 0) 
+	{
+		printf("Warning: actuator %s has negative m_links: %d\n", m_name.Ptr(), m_links);
+		m_links = 0;
+	}
+}
diff --git a/source/gameengine/GameLogic/SCA_IActuator.h b/source/gameengine/GameLogic/SCA_IActuator.h
index b802aa4b298..7ffb21b5490 100644
--- a/source/gameengine/GameLogic/SCA_IActuator.h
+++ b/source/gameengine/GameLogic/SCA_IActuator.h
@@ -34,8 +34,11 @@
 
 class SCA_IActuator : public SCA_ILogicBrick
 {
+	friend class SCA_LogicManager;
 protected:
 	std::vector<CValue*> m_events;
+	int					 m_links;	// number of active links to controllers
+									// when 0, the actuator is automatically stopped
 	void RemoveAllEvents();
 
 public:
@@ -83,6 +86,11 @@ public:
 	 */
 	bool IsNegativeEvent() const;
 	virtual ~SCA_IActuator();
+
+	void ClrLink() { m_links=0; }
+	void IncLink() { m_links++; }
+	void DecLink();
+	bool IsNoLink() const { return !m_links; }
 };
 
 #endif //__KX_IACTUATOR
diff --git a/source/gameengine/GameLogic/SCA_IController.cpp b/source/gameengine/GameLogic/SCA_IController.cpp
index 5cb62678c6b..8f156cc63e7 100644
--- a/source/gameengine/GameLogic/SCA_IController.cpp
+++ b/source/gameengine/GameLogic/SCA_IController.cpp
@@ -29,6 +29,7 @@
 #include "SCA_IController.h"
 #include "SCA_LogicManager.h"
 #include "SCA_IActuator.h"
+#include "SCA_ISensor.h"
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -37,6 +38,7 @@
 SCA_IController::SCA_IController(SCA_IObject* gameobj,
 								 PyTypeObject* T)
 	:
+	m_statemask(0),
 	SCA_ILogicBrick(gameobj,T)
 {
 }
@@ -45,6 +47,7 @@ SCA_IController::SCA_IController(SCA_IObject* gameobj,
 	
 SCA_IController::~SCA_IController()
 {
+	UnlinkAllActuators();
 }
 
 
@@ -65,6 +68,14 @@ const std::vector<class SCA_IActuator*>& SCA_IController::GetLinkedActuators()
 
 void SCA_IController::UnlinkAllSensors()
 {
+	if (IsActive()) 
+	{
+		std::vector<class SCA_ISensor*>::iterator sensit;
+		for (sensit = m_linkedsensors.begin();!(sensit==m_linkedsensors.end());++sensit)
+		{
+			(*sensit)->DecLink();
+		}
+	}
 	m_linkedsensors.clear();
 }
 
@@ -72,6 +83,14 @@ void SCA_IController::UnlinkAllSensors()
 
 void SCA_IController::UnlinkAllActuators()
 {
+	if (IsActive()) 
+	{
+		std::vector<class SCA_IActuator*>::iterator actit;
+		for (actit = m_linkedactuators.begin();!(actit==m_linkedactuators.end());++actit)
+		{
+			(*actit)->DecLink();
+		}
+	}
 	m_linkedactuators.clear();
 }
 
@@ -95,26 +114,94 @@ void SCA_IController::Trigger(SCA_LogicManager* logicmgr)
 void SCA_IController::LinkToActuator(SCA_IActuator* actua)
 {
 	m_linkedactuators.push_back(actua);
+	if (IsActive())
+	{
+		actua->IncLink();
+	}
 }
 
 void	SCA_IController::UnlinkActuator(class SCA_IActuator* actua)
 {
 	std::vector<class SCA_IActuator*>::iterator actit;
-	std::vector<class SCA_IActuator*>::iterator actfound = m_linkedactuators.end();
 	for (actit = m_linkedactuators.begin();!(actit==m_linkedactuators.end());++actit)
 	{
 		if ((*actit) == actua)
-			actfound = actit;
+		{
+			break;
+		}
 		
 	}
-	if (!(actfound==m_linkedactuators.end()))
+	if (!(actit==m_linkedactuators.end()))
 	{
-		m_linkedactuators.erase(actfound);
+		if (IsActive())
+		{
+			(*actit)->DecLink();
+		}
+		m_linkedactuators.erase(actit);
 	}
-	
 }
 
 void SCA_IController::LinkToSensor(SCA_ISensor* sensor)
 {
 	m_linkedsensors.push_back(sensor);
+	if (IsActive())
+	{
+		sensor->IncLink();
+	}
 }
+
+void SCA_IController::UnlinkSensor(class SCA_ISensor* sensor)
+{
+	std::vector<class SCA_ISensor*>::iterator sensit;
+	for (sensit = m_linkedsensors.begin();!(sensit==m_linkedsensors.end());++sensit)
+	{
+		if ((*sensit) == sensor)
+		{
+			break;
+		}
+		
+	}
+	if (!(sensit==m_linkedsensors.end()))
+	{
+		if (IsActive())
+		{
+			(*sensit)->DecLink();
+		}
+		m_linkedsensors.erase(sensit);
+	}
+}
+
+void SCA_IController::ApplyState(unsigned int state)
+{
+	std::vector<class SCA_IActuator*>::iterator actit;
+	std::vector<class SCA_ISensor*>::iterator sensit;
+
+	if (m_statemask & state) 
+	{
+		if (!IsActive()) 
+		{
+			// reactive the controller, all the links to actuator are valid again
+			for (actit = m_linkedactuators.begin();!(actit==m_linkedactuators.end());++actit)
+			{
+				(*actit)->IncLink();
+			}
+			for (sensit = m_linkedsensors.begin();!(sensit==m_linkedsensors.end());++sensit)
+			{
+				(*sensit)->IncLink();
+			}
+			SetActive(true);
+		}
+	} else if (IsActive())
+	{
+		for (actit = m_linkedactuators.begin();!(actit==m_linkedactuators.end());++actit)
+		{
+			(*actit)->DecLink();
+		}
+		for (sensit = m_linkedsensors.begin();!(sensit==m_linkedsensors.end());++sensit)
+		{
+			(*sensit)->DecLink();
+		}
+		SetActive(false);
+	}
+}
+
diff --git a/source/gameengine/GameLogic/SCA_IController.h b/source/gameengine/GameLogic/SCA_IController.h
index 79e956dec4e..f67c0942eb4 100644
--- a/source/gameengine/GameLogic/SCA_IController.h
+++ b/source/gameengine/GameLogic/SCA_IController.h
@@ -36,6 +36,7 @@ class SCA_IController : public SCA_ILogicBrick
 protected:
 	std::vector<class SCA_ISensor*>		m_linkedsensors;
 	std::vector<class SCA_IActuator*>	m_linkedactuators;
+	unsigned int						m_statemask;
 public:
 	SCA_IController(SCA_IObject* gameobj,PyTypeObject* T);
 	virtual ~SCA_IController();
@@ -47,6 +48,9 @@ public:
 	void	UnlinkAllSensors();
 	void	UnlinkAllActuators();
 	void	UnlinkActuator(class SCA_IActuator* actua);
+	void	UnlinkSensor(class SCA_ISensor* sensor);
+	void    SetState(unsigned int state) { m_statemask = state; }
+	void    ApplyState(unsigned int state);
 
 
 };
diff --git a/source/gameengine/GameLogic/SCA_ILogicBrick.cpp b/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
index 8423d06dfcd..f6efd485adb 100644
--- a/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
+++ b/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
@@ -242,8 +242,8 @@ PyParentObject SCA_ILogicBrick::Parents[] = {
 
 
 PyMethodDef SCA_ILogicBrick::Methods[] = {
-  {"getOwner", (PyCFunction) SCA_ILogicBrick::sPyGetOwner, METH_VARARGS},
-  {"getExecutePriority", (PyCFunction) SCA_ILogicBrick::sPySetExecutePriority, METH_VARARGS},
+  {"getOwner", (PyCFunction) SCA_ILogicBrick::sPyGetOwner, METH_NOARGS},
+  {"getExecutePriority", (PyCFunction) SCA_ILogicBrick::sPySetExecutePriority, METH_NOARGS},
   {"setExecutePriority", (PyCFunction) SCA_ILogicBrick::sPySetExecutePriority, METH_VARARGS},
   {NULL,NULL} //Sentinel
 };
@@ -258,9 +258,7 @@ SCA_ILogicBrick::_getattr(const STR_String& attr)
 
 
 
-PyObject* SCA_ILogicBrick::PyGetOwner(PyObject* self, 
-			       PyObject* args, 
-			       PyObject* kwds)
+PyObject* SCA_ILogicBrick::PyGetOwner(PyObject* self)
 {
 	CValue* parent = GetParent();
 	if (parent)
@@ -294,9 +292,7 @@ PyObject* SCA_ILogicBrick::PySetExecutePriority(PyObject* self,
 
 
 
-PyObject* SCA_ILogicBrick::PyGetExecutePriority(PyObject* self, 
-			       PyObject* args, 
-			       PyObject* kwds)
+PyObject* SCA_ILogicBrick::PyGetExecutePriority(PyObject* self)
 {
 	return PyInt_FromLong(m_Execute_Ueber_Priority);
 }
diff --git a/source/gameengine/GameLogic/SCA_ILogicBrick.h b/source/gameengine/GameLogic/SCA_ILogicBrick.h
index f359ee0911b..80bc6ae3b86 100644
--- a/source/gameengine/GameLogic/SCA_ILogicBrick.h
+++ b/source/gameengine/GameLogic/SCA_ILogicBrick.h
@@ -82,9 +82,9 @@ public:
 
 	// python methods
 
-	KX_PYMETHOD(SCA_ILogicBrick,GetOwner);
+	KX_PYMETHOD_NOARGS(SCA_ILogicBrick,GetOwner);
 	KX_PYMETHOD(SCA_ILogicBrick,SetExecutePriority);
-	KX_PYMETHOD(SCA_ILogicBrick,GetExecutePriority);
+	KX_PYMETHOD_NOARGS(SCA_ILogicBrick,GetExecutePriority);
 
 	enum KX_BOOL_TYPE {
 		KX_BOOL_NODEF = 0,
diff --git a/source/gameengine/GameLogic/SCA_IObject.cpp b/source/gameengine/GameLogic/SCA_IObject.cpp
index 6df9e23f3fa..25b4af696ea 100644
--- a/source/gameengine/GameLogic/SCA_IObject.cpp
+++ b/source/gameengine/GameLogic/SCA_IObject.cpp
@@ -40,7 +40,7 @@
 
 MT_Point3 SCA_IObject::m_sDummy=MT_Point3(0,0,0);
 
-SCA_IObject::SCA_IObject(PyTypeObject* T): CValue(T)
+SCA_IObject::SCA_IObject(PyTypeObject* T): m_initState(0), m_state(0), CValue(T)
 {
 	m_suspended = false;
 }
@@ -157,15 +157,17 @@ bool SCA_IObject::GetIgnoreActivityCulling()
 
 void SCA_IObject::ReParentLogic()
 {
-	SCA_SensorList& oldsensors = GetSensors();
-	
-	int sen = 0;
-	SCA_SensorList::iterator its;
-	for (its = oldsensors.begin(); !(its==oldsensors.end()); ++its)
+	SCA_ActuatorList& oldactuators  = GetActuators();
+	int act = 0;
+	SCA_ActuatorList::iterator ita;
+	for (ita = oldactuators.begin(); !(ita==oldactuators.end()); ++ita)
 	{
-		SCA_ISensor* newsensor = (SCA_ISensor*)(*its)->GetReplica();
-		newsensor->ReParent(this);
-		oldsensors[sen++] = newsensor;
+		SCA_IActuator* newactuator = (SCA_IActuator*) (*ita)->GetReplica();
+		newactuator->ReParent(this);
+		// actuators are initially not connected to any controller
+		newactuator->SetActive(false);
+		newactuator->ClrLink();
+		oldactuators[act++] = newactuator;
 	}
 
 	SCA_ControllerList& oldcontrollers = GetControllers();
@@ -175,20 +177,24 @@ void SCA_IObject::ReParentLogic()
 	{
 		SCA_IController* newcontroller = (SCA_IController*)(*itc)->GetReplica();
 		newcontroller->ReParent(this);
+		newcontroller->SetActive(false);
 		oldcontrollers[con++]=newcontroller;
 
 	}
-	SCA_ActuatorList& oldactuators  = GetActuators();
-	
-	int act = 0;
-	SCA_ActuatorList::iterator ita;
-	for (ita = oldactuators.begin(); !(ita==oldactuators.end()); ++ita)
+	// convert sensors last so that actuators are already available for Actuator sensor
+	SCA_SensorList& oldsensors = GetSensors();
+	int sen = 0;
+	SCA_SensorList::iterator its;
+	for (its = oldsensors.begin(); !(its==oldsensors.end()); ++its)
 	{
-		SCA_IActuator* newactuator = (SCA_IActuator*) (*ita)->GetReplica();
-		newactuator->ReParent(this);
-		newactuator->SetActive(false);
-		oldactuators[act++] = newactuator;
+		SCA_ISensor* newsensor = (SCA_ISensor*)(*its)->GetReplica();
+		newsensor->ReParent(this);
+		newsensor->SetActive(false);
+		// sensors are initially not connected to any controller
+		newsensor->ClrLink();
+		oldsensors[sen++] = newsensor;
 	}
+
 	// a new object cannot be client of any actuator
 	m_registeredActuators.clear();
 		
@@ -300,7 +306,7 @@ const MT_Point3& SCA_IObject::ConvertPythonPylist(PyObject* pylist)
 }
 #endif
 
-void SCA_IObject::Suspend(void)
+void SCA_IObject::Suspend()
 {
 	if ((!m_ignore_activity_culling) 
 		&& (!m_suspended))  {
@@ -329,6 +335,17 @@ void SCA_IObject::Resume(void)
 	}
 }
 
+void SCA_IObject::SetState(unsigned int state)
+{
+	m_state = state;
+	// update the status of the controllers
+	SCA_ControllerList::iterator contit;
+	for (contit = m_controllers.begin(); contit != m_controllers.end(); contit++)
+	{
+		(*contit)->ApplyState(m_state);
+	}
+}
+
 
 
 /* ------------------------------------------------------------------------- */
diff --git a/source/gameengine/GameLogic/SCA_IObject.h b/source/gameengine/GameLogic/SCA_IObject.h
index 4b0fc741b8f..38a7ed29dca 100644
--- a/source/gameengine/GameLogic/SCA_IObject.h
+++ b/source/gameengine/GameLogic/SCA_IObject.h
@@ -67,7 +67,17 @@ protected:
 	 * Ignore updates?
 	 */
 	bool m_suspended;
-	
+
+	/**
+	 * init state of object (used when object is created)
+	 */
+	unsigned int			m_initState;
+
+	/**
+	 * current state = bit mask of state that are active
+	 */
+	unsigned int			m_state;
+
 public:
 	
 	SCA_IObject(PyTypeObject* T=&Type);
@@ -111,7 +121,27 @@ public:
 	 * Resume progress
 	 */
 	void Resume(void);
-	
+
+	/**
+	 * Set init state
+	 */
+	void SetInitState(unsigned int initState) { m_initState = initState; }
+
+	/**
+	 * initialize the state when object is created
+	 */
+	void ResetState(void) { SetState(m_initState); }
+
+	/**
+	 * Set the object state
+	 */
+	void SetState(unsigned int state);
+
+	/**
+	 * Get the object state
+	 */
+	unsigned int GetState(void)	{ return m_state; }
+
 //	const class MT_Point3&	ConvertPythonPylist(PyObject* pylist);
 	
 	// here come the python forwarded methods
@@ -120,7 +150,7 @@ public:
 	virtual int GetGameObjectType() {return -1;}
 	
 	typedef enum ObjectTypes {
-		OBJ_ARMATURE=0
+		OBJ_ARMATURE=0,
 	}ObjectTypes;
 
 };
diff --git a/source/gameengine/GameLogic/SCA_ISensor.cpp b/source/gameengine/GameLogic/SCA_ISensor.cpp
index 9fdee0c19da..68341b57435 100644
--- a/source/gameengine/GameLogic/SCA_ISensor.cpp
+++ b/source/gameengine/GameLogic/SCA_ISensor.cpp
@@ -52,8 +52,11 @@ SCA_ISensor::SCA_ISensor(SCA_IObject* gameobj,
 	SCA_ILogicBrick(gameobj,T),
 	m_triggered(false)
 {
+	m_links = 0;
 	m_suspended = false;
 	m_invert = false;
+	m_level = false;
+	m_reset = false;
 	m_pos_ticks = 0;
 	m_neg_ticks = 0;
 	m_pos_pulsemode = false;
@@ -94,6 +97,10 @@ void SCA_ISensor::SetInvert(bool inv) {
 	m_invert = inv;
 }
 
+void SCA_ISensor::SetLevel(bool lvl) {
+	m_level = lvl;
+}
+
 
 float SCA_ISensor::GetNumber() {
 	return IsPositiveTrigger();
@@ -111,6 +118,25 @@ void SCA_ISensor::Resume() {
 	m_suspended = false;
 }
 
+void SCA_ISensor::Init() {
+	printf("Sensor %s has no init function, please report this bug to Blender.org\n", m_name.Ptr());
+}
+
+void SCA_ISensor::DecLink() {
+	m_links--;
+	if (m_links < 0) 
+	{
+		printf("Warning: sensor %s has negative m_links: %d\n", m_name.Ptr(), m_links);
+		m_links = 0;
+	}
+	if (!m_links)
+	{
+		// sensor is detached from all controllers, initialize it so that it
+		// is fresh as at startup when it is reattached again.
+		Init();
+	}
+}
+
 /* python integration */
 
 PyTypeObject SCA_ISensor::Type = {
@@ -157,6 +183,10 @@ PyMethodDef SCA_ISensor::Methods[] = {
 	 METH_VARARGS, GetInvert_doc},
 	{"setInvert", (PyCFunction) SCA_ISensor::sPySetInvert, 
 	 METH_VARARGS, SetInvert_doc},
+	{"getLevel", (PyCFunction) SCA_ISensor::sPyGetLevel, 
+	 METH_VARARGS, GetLevel_doc},
+	{"setLevel", (PyCFunction) SCA_ISensor::sPySetLevel, 
+	 METH_VARARGS, SetLevel_doc},
 	{NULL,NULL} //Sentinel
 };
 
@@ -177,7 +207,8 @@ void SCA_ISensor::Activate(class SCA_LogicManager* logicmgr,	  CValue* event)
 {
 	
 	// calculate if a __triggering__ is wanted
-	if (!m_suspended) {
+	// don't evaluate a sensor that is not connected to any controller
+	if (m_links && !m_suspended) {
 		bool result = this->Evaluate(event);
 		if (result) {
 			logicmgr->AddActivatedSensor(this);	
@@ -307,6 +338,31 @@ PyObject* SCA_ISensor::PySetInvert(PyObject* self, PyObject* args, PyObject* kwd
 	Py_Return;
 }
 
+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 if the condition for the\n"
+"\tdetector is met when entering the state. A edge detector will wait for an off-on\n"
+"\ttransition to occur.\n"
+"\tOnly some sensors implement this feature: keyboard.\n";
+PyObject* SCA_ISensor::PyGetLevel(PyObject* self, PyObject* args, PyObject* kwds)
+{
+	return BoolToPyArg(m_level);
+}
+
+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* self, PyObject* args, PyObject* kwds)
+{
+	int pyarg = 0;
+	if(!PyArg_ParseTuple(args, "i", &pyarg)) { return NULL; }
+	m_level = PyArgToBool(pyarg);
+	Py_Return;
+}
+
 char SCA_ISensor::GetUseNegPulseMode_doc[] = 
 "getUseNegPulseMode()\n"
 "\tReturns whether negative pulse mode is active.\n";
diff --git a/source/gameengine/GameLogic/SCA_ISensor.h b/source/gameengine/GameLogic/SCA_ISensor.h
index e14fb34241a..4ce49e71507 100644
--- a/source/gameengine/GameLogic/SCA_ISensor.h
+++ b/source/gameengine/GameLogic/SCA_ISensor.h
@@ -61,9 +61,18 @@ class SCA_ISensor : public SCA_ILogicBrick
 	/** invert the output signal*/
 	bool m_invert;
 
+	/** detect level instead of edge*/
+	bool m_level;
+
+	/** sensor has been reset */
+	bool m_reset;
+
 	/** Sensor must ignore updates? */
 	bool m_suspended;
 
+	/** number of connections to controller */
+	int m_links;
+
 	/** Pass the activation on to the logic manager.*/
 	void SignalActivation(class SCA_LogicManager* logicmgr);
 	
@@ -81,6 +90,7 @@ public:
 	void Activate(class SCA_LogicManager* logicmgr,CValue* event);
 	virtual bool Evaluate(CValue* event) = 0;
 	virtual bool IsPositiveTrigger();
+	virtual void Init();
 	
 	virtual PyObject* _getattr(const STR_String& attr);
 	virtual CValue* GetReplica()=0;
@@ -101,6 +111,8 @@ public:
 	virtual void Delete() { Release(); }
 	/** Set inversion of pulses on or off. */
 	void SetInvert(bool inv);
+	/** set the level detection on or off */
+	void SetLevel(bool lvl);
 
 	void RegisterToManager();
 	virtual float GetNumber();
@@ -114,6 +126,14 @@ public:
 	/** Resume sensing. */
 	void Resume();
 
+	void ClrLink()
+		{ m_links = 0; }
+	void IncLink()
+		{ m_links++; }
+	void DecLink();
+	bool IsNoLink() const 
+		{ return !m_links; }
+
 	/* Python functions: */
 	KX_PYMETHOD_DOC(SCA_ISensor,IsPositive);
 	KX_PYMETHOD_DOC(SCA_ISensor,GetUsePosPulseMode);
@@ -124,6 +144,8 @@ public:
 	KX_PYMETHOD_DOC(SCA_ISensor,SetUseNegPulseMode);
 	KX_PYMETHOD_DOC(SCA_ISensor,GetInvert);
 	KX_PYMETHOD_DOC(SCA_ISensor,SetInvert);
+	KX_PYMETHOD_DOC(SCA_ISensor,GetLevel);
+	KX_PYMETHOD_DOC(SCA_ISensor,SetLevel);
 
 };
 
diff --git a/source/gameengine/GameLogic/SCA_JoystickSensor.cpp b/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
index b0e7fee130d..3fb439eb25b 100644
--- a/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
+++ b/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
@@ -64,9 +64,14 @@ std::cout << " button flag "<< m_buttonf	<< std::endl;
 std::cout << " hat "		<< m_hat		<< std::endl;
 std::cout << " hat flag "	<< m_hatf		<< std::endl;
 */
-	m_istrig=0;
+	Init();
 }
 
+void SCA_JoystickSensor::Init()
+{
+	m_istrig=(m_invert)?1:0;
+	m_reset = true;
+}
 
 SCA_JoystickSensor::~SCA_JoystickSensor()
 {
@@ -75,9 +80,10 @@ SCA_JoystickSensor::~SCA_JoystickSensor()
 
 CValue* SCA_JoystickSensor::GetReplica()
 {
-	CValue* replica = new SCA_JoystickSensor(*this);
+	SCA_JoystickSensor* replica = new SCA_JoystickSensor(*this);
 	// this will copy properties and so on...
 	CValue::AddDataToReplica(replica);
+	replica->Init();
 	return replica;
 }
 
@@ -95,7 +101,9 @@ bool SCA_JoystickSensor::Evaluate(CValue* event)
 {
 	SCA_Joystick *js = m_pJoystickMgr->GetJoystickDevice();
 	bool result = false;
+	bool reset = m_reset && m_level;
 	
+	m_reset = false;
 	switch(m_joymode)
 	{
 	case KX_JOYSENSORMODE_AXIS:
@@ -236,6 +244,8 @@ bool SCA_JoystickSensor::Evaluate(CValue* event)
 	if(!js->IsTrig()){
 		m_istrig = 0;
 	}
+	if (reset)
+		result = true;
 	return result;
 }
 
diff --git a/source/gameengine/GameLogic/SCA_JoystickSensor.h b/source/gameengine/GameLogic/SCA_JoystickSensor.h
index 2fbe1edf1e7..69068da6494 100644
--- a/source/gameengine/GameLogic/SCA_JoystickSensor.h
+++ b/source/gameengine/GameLogic/SCA_JoystickSensor.h
@@ -95,6 +95,7 @@ public:
 	
 	virtual bool Evaluate(CValue* event);
 	virtual bool IsPositiveTrigger();
+	virtual void Init();
 	
 	/* --------------------------------------------------------------------- */
 	/* Python interface ---------------------------------------------------- */
diff --git a/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp b/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
index f13b1bcf4c9..a7a6fa93db4 100644
--- a/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
+++ b/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
@@ -62,7 +62,7 @@ SCA_KeyboardSensor::SCA_KeyboardSensor(SCA_KeyboardManager* keybdmgr,
 	if (hotkey == SCA_IInputDevice::KX_ESCKEY)
 		keybdmgr->GetInputDevice()->HookEscape();
 //	SetDrawColor(0xff0000ff);
-	m_val=0;
+	Init();
 }
 
 
@@ -71,14 +71,22 @@ SCA_KeyboardSensor::~SCA_KeyboardSensor()
 {
 }
 
-
+void SCA_KeyboardSensor::Init()
+{
+	// this function is used when the sensor is disconnected from all controllers
+	// by the state engine. It reinitializes the sensor as if it was just created.
+	// However, if the target key is pressed when the sensor is reactivated, it
+	// will not generated an event (see remark in Evaluate()).
+	m_val = (m_invert)?1:0;
+	m_reset = true;
+}
 
 CValue* SCA_KeyboardSensor::GetReplica()
 {
-	CValue* replica = new SCA_KeyboardSensor(*this);
+	SCA_KeyboardSensor* replica = new SCA_KeyboardSensor(*this);
 	// this will copy properties and so on...
 	CValue::AddDataToReplica(replica);
-
+	replica->Init();
 	return replica;
 }
 
@@ -113,8 +121,8 @@ bool SCA_KeyboardSensor::TriggerOnAllKeys()
 bool SCA_KeyboardSensor::Evaluate(CValue* eventval)
 {
 	bool result    = false;
+	bool reset     = m_reset && m_level;
 	SCA_IInputDevice* inputdev = m_pKeyboardMgr->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
@@ -127,7 +135,7 @@ bool SCA_KeyboardSensor::Evaluate(CValue* eventval)
 		LogKeystrokes();
 	}
 
-
+	m_reset = false;
 
 	/* Now see whether events must be bounced. */
 	if (m_bAllKeys)
@@ -169,10 +177,10 @@ bool SCA_KeyboardSensor::Evaluate(CValue* eventval)
 				{
 					if (m_val == 0)
 					{
-						//see comment below
-						//m_val = 1;
-						//result = true;
-						;
+						m_val = 1;
+						if (m_level) {
+							result = true;
+						}
 					}
 				} else
 				{
@@ -222,22 +230,20 @@ bool SCA_KeyboardSensor::Evaluate(CValue* eventval)
 					{
 						if (m_val == 0)
 						{
-							//hmm, this abnormal situation may occur in the following cases:
-							//- the key was pressed while the scene was suspended
-							//- this is a new scene and the key is active from the start
-							//In the second case, it's dangerous to activate the sensor
-							//(think of a key to go to next scene)
-							//What we really need is a edge/level flag in the key sensor
-							//m_val = 1;
-							//result = true;
-							;
+							m_val = 1;
+							if (m_level) 
+							{
+								result = true;
+							}
 						}
 					}
 				}
 			}
 		}
 	}
-
+	if (reset)
+		// force an event
+		result = true;
 	return result;
 
 }
diff --git a/source/gameengine/GameLogic/SCA_KeyboardSensor.h b/source/gameengine/GameLogic/SCA_KeyboardSensor.h
index e87eddecd32..b86f6931d27 100644
--- a/source/gameengine/GameLogic/SCA_KeyboardSensor.h
+++ b/source/gameengine/GameLogic/SCA_KeyboardSensor.h
@@ -114,6 +114,8 @@ public:
 					   PyTypeObject* T=&Type );
 	virtual ~SCA_KeyboardSensor();
 	virtual CValue* GetReplica();
+	virtual void Init();
+
 
 	short int GetHotkey();
 	virtual bool Evaluate(CValue* event);
diff --git a/source/gameengine/GameLogic/SCA_LogicManager.cpp b/source/gameengine/GameLogic/SCA_LogicManager.cpp
index 49f01d643e5..f50161cbecb 100644
--- a/source/gameengine/GameLogic/SCA_LogicManager.cpp
+++ b/source/gameengine/GameLogic/SCA_LogicManager.cpp
@@ -165,6 +165,11 @@ void* SCA_LogicManager::FindBlendObjByGameMeshName(const STR_String& gamemeshnam
 
 void SCA_LogicManager::RemoveSensor(SCA_ISensor* sensor)
 {
+	controllerlist contlist = m_sensorcontrollermapje[sensor];
+	for (controllerlist::const_iterator c= contlist.begin();!(c==contlist.end());c++)
+	{
+		(*c)->UnlinkSensor(sensor);
+	}
     m_sensorcontrollermapje.erase(sensor);
 	
 	for (vector<SCA_EventManager*>::const_iterator ie=m_eventmanagers.begin();
@@ -176,6 +181,8 @@ void SCA_LogicManager::RemoveSensor(SCA_ISensor* sensor)
 
 void SCA_LogicManager::RemoveController(SCA_IController* controller)
 {
+	controller->UnlinkAllSensors();
+	controller->UnlinkAllActuators();
 	std::map<SCA_ISensor*,controllerlist>::iterator sit;
 	for (sit = m_sensorcontrollermapje.begin();!(sit==m_sensorcontrollermapje.end());++sit)
 	{
@@ -236,7 +243,8 @@ void SCA_LogicManager::BeginFrame(double curtime, double fixedtime)
 			!(c==contlist.end());c++)
 		{
 				SCA_IController* contr = *c;//controllerarray->at(c);
-				triggeredControllerSet.insert(SmartControllerPtr(contr,0));
+				if (contr->IsActive())
+					triggeredControllerSet.insert(SmartControllerPtr(contr,0));
 		}
 		//sensor->SetActive(false);
 	}
@@ -263,6 +271,10 @@ void SCA_LogicManager::UpdateFrame(double curtime, bool frame)
 	}
 	m_removedActuators.clear();
 	
+	// About to run actuators, but before update the sensors for those which depends on actuators
+	for (vector<SCA_EventManager*>::const_iterator ie=m_eventmanagers.begin(); !(ie==m_eventmanagers.end()); ie++)
+		(*ie)->UpdateFrame();
+
 	for (set<SmartActuatorPtr>::iterator ia = m_activeActuators.begin();!(ia==m_activeActuators.end());ia++)
 	{
 		//SCA_IActuator* actua = *ia;
@@ -273,6 +285,16 @@ void SCA_LogicManager::UpdateFrame(double curtime, bool frame)
 			
 			(*ia)->SetActive(false);
 			//m_activeactuators.pop_back();
+		} else if ((*ia)->IsNoLink())
+		{
+			// This actuator has no more links but it still active
+			// make sure it will get a negative event on next frame to stop it
+			// Do this check after Update() rather than before to make sure
+			// that all the actuators that are activated at same time than a state
+			// actuator have a chance to execute. 
+			CValue* event = new CBoolValue(false);
+			(*ia)->RemoveAllEvents();
+			(*ia)->AddEvent(event);
 		}
 	}
 	
diff --git a/source/gameengine/GameLogic/SCA_MouseSensor.cpp b/source/gameengine/GameLogic/SCA_MouseSensor.cpp
index 8810b7470ed..2298ddb0743 100644
--- a/source/gameengine/GameLogic/SCA_MouseSensor.cpp
+++ b/source/gameengine/GameLogic/SCA_MouseSensor.cpp
@@ -58,7 +58,6 @@ SCA_MouseSensor::SCA_MouseSensor(SCA_MouseManager* eventmgr,
 {
 	m_mousemode   = mousemode;
 	m_triggermode = true;
-	m_val         = 0; /* stores the latest attribute */
 
 	switch (m_mousemode) {
 	case KX_MOUSESENSORMODE_LEFTBUTTON:
@@ -79,7 +78,13 @@ SCA_MouseSensor::SCA_MouseSensor(SCA_MouseManager* eventmgr,
 	default:
 		; /* ignore, no hotkey */
 	}
+	Init();
+}
 
+void SCA_MouseSensor::Init()
+{
+	m_val = (m_invert)?1:0; /* stores the latest attribute */
+	m_reset = true;
 }
 
 SCA_MouseSensor::~SCA_MouseSensor() 
@@ -91,9 +96,10 @@ SCA_MouseSensor::~SCA_MouseSensor()
 
 CValue* SCA_MouseSensor::GetReplica()
 {
-	CValue* replica = new SCA_MouseSensor(*this);
+	SCA_MouseSensor* replica = new SCA_MouseSensor(*this);
 	// this will copy properties and so on...
 	CValue::AddDataToReplica(replica);
+	replica->Init();
 
 	return replica;
 }
@@ -128,6 +134,7 @@ SCA_IInputDevice::KX_EnumInputs SCA_MouseSensor::GetHotKey()
 bool SCA_MouseSensor::Evaluate(CValue* event)
 {
 	bool result = false;
+	bool reset = m_reset && m_level;
 	SCA_IInputDevice* mousedev = m_pMouseMgr->GetInputDevice();
 
 
@@ -139,7 +146,7 @@ bool SCA_MouseSensor::Evaluate(CValue* event)
 	/* both MOUSEX and MOUSEY. Treat all of these as key-presses.            */
 	/* So, treat KX_MOUSESENSORMODE_POSITION as                              */
 	/* KX_MOUSESENSORMODE_POSITIONX || KX_MOUSESENSORMODE_POSITIONY          */
-
+	m_reset = false;
 	switch (m_mousemode) {
 	case KX_MOUSESENSORMODE_LEFTBUTTON:
 	case KX_MOUSESENSORMODE_MIDDLEBUTTON:
@@ -164,10 +171,11 @@ bool SCA_MouseSensor::Evaluate(CValue* event)
 					{
 						if (m_val == 0)
 						{
-							//dangerous
-							//m_val = 1;
-							//result = true;
-							;
+							m_val = 1;
+							if (m_level)
+							{
+								result = true;
+							}
 						}
 					} else
 					{
@@ -217,6 +225,9 @@ bool SCA_MouseSensor::Evaluate(CValue* event)
 		; /* error */
 	}
 
+	if (reset)
+		// force an event
+		result = true;
 	return result;
 }
 
diff --git a/source/gameengine/GameLogic/SCA_MouseSensor.h b/source/gameengine/GameLogic/SCA_MouseSensor.h
index 86c9d96a800..26a1c5e3fd2 100644
--- a/source/gameengine/GameLogic/SCA_MouseSensor.h
+++ b/source/gameengine/GameLogic/SCA_MouseSensor.h
@@ -96,7 +96,7 @@ class SCA_MouseSensor : public SCA_ISensor
 	virtual ~SCA_MouseSensor();
 	virtual CValue* GetReplica();
 	virtual bool Evaluate(CValue* event);
-
+	virtual void Init();
 	virtual bool IsPositiveTrigger();
 	short int GetModeKey();
 	SCA_IInputDevice::KX_EnumInputs GetHotKey();
diff --git a/source/gameengine/GameLogic/SCA_NANDController.cpp b/source/gameengine/GameLogic/SCA_NANDController.cpp
new file mode 100644
index 00000000000..5b869ee8298
--- /dev/null
+++ b/source/gameengine/GameLogic/SCA_NANDController.cpp
@@ -0,0 +1,144 @@
+/**
+ * 'Nand' together all inputs
+ *
+ * $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 "SCA_NANDController.h"
+#include "SCA_ISensor.h"
+#include "SCA_LogicManager.h"
+#include "BoolValue.h"
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+/* ------------------------------------------------------------------------- */
+/* Native functions                                                          */
+/* ------------------------------------------------------------------------- */
+
+SCA_NANDController::SCA_NANDController(SCA_IObject* gameobj,
+									 PyTypeObject* T)
+	:
+	SCA_IController(gameobj,T)
+{
+}
+
+
+
+SCA_NANDController::~SCA_NANDController()
+{
+}
+
+
+
+void SCA_NANDController::Trigger(SCA_LogicManager* logicmgr)
+{
+
+	bool sensorresult = false;
+
+	for (vector<SCA_ISensor*>::const_iterator is=m_linkedsensors.begin();
+	!(is==m_linkedsensors.end());is++)
+	{
+		SCA_ISensor* sensor = *is;
+		if (!sensor->IsPositiveTrigger())
+		{
+			sensorresult = true;
+			break;
+		}
+	}
+	
+	CValue* newevent = new CBoolValue(sensorresult);
+
+	for (vector<SCA_IActuator*>::const_iterator i=m_linkedactuators.begin();
+	!(i==m_linkedactuators.end());i++)
+	{
+		SCA_IActuator* actua = *i;//m_linkedactuators.at(i);
+		logicmgr->AddActiveActuator(actua,newevent);
+	}
+
+	// every actuator that needs the event, has a it's own reference to it now so
+	// release it (so to be clear: if there is no actuator, it's deleted right now)
+	newevent->Release();
+
+}
+
+
+
+CValue* SCA_NANDController::GetReplica()
+{
+	CValue* replica = new SCA_NANDController(*this);
+	// this will copy properties and so on...
+	CValue::AddDataToReplica(replica);
+
+	return replica;
+}
+
+
+
+/* ------------------------------------------------------------------------- */
+/* Python functions                                                          */
+/* ------------------------------------------------------------------------- */
+
+/* Integration hooks ------------------------------------------------------- */
+PyTypeObject SCA_NANDController::Type = {
+	PyObject_HEAD_INIT(&PyType_Type)
+	0,
+	"SCA_NANDController",
+	sizeof(SCA_NANDController),
+	0,
+	PyDestructor,
+	0,
+	__getattr,
+	__setattr,
+	0, //&MyPyCompare,
+	__repr,
+	0, //&cvalue_as_number,
+	0,
+	0,
+	0,
+	0
+};
+
+PyParentObject SCA_NANDController::Parents[] = {
+	&SCA_NANDController::Type,
+	&SCA_IController::Type,
+	&SCA_ILogicBrick::Type,
+	&CValue::Type,
+	NULL
+};
+
+PyMethodDef SCA_NANDController::Methods[] = {
+	{NULL,NULL} //Sentinel
+};
+
+PyObject* SCA_NANDController::_getattr(const STR_String& attr) {
+	_getattr_up(SCA_IController);
+}
+
+/* eof */
diff --git a/source/gameengine/GameLogic/SCA_NANDController.h b/source/gameengine/GameLogic/SCA_NANDController.h
new file mode 100644
index 00000000000..1193ff64f07
--- /dev/null
+++ b/source/gameengine/GameLogic/SCA_NANDController.h
@@ -0,0 +1,56 @@
+/**
+ * SCA_NANDController.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 __KX_NANDCONTROLLER
+#define __KX_NANDCONTROLLER
+
+#include "SCA_IController.h"
+
+class SCA_NANDController : public SCA_IController
+{
+	Py_Header;
+	//virtual void Trigger(class SCA_LogicManager* logicmgr);
+public:
+	SCA_NANDController(SCA_IObject* gameobj,PyTypeObject* T=&Type);
+	virtual ~SCA_NANDController();
+	virtual CValue* GetReplica();
+	virtual void Trigger(SCA_LogicManager* logicmgr);
+
+	/* --------------------------------------------------------------------- */
+	/* Python interface ---------------------------------------------------- */
+	/* --------------------------------------------------------------------- */
+
+	virtual PyObject* _getattr(const STR_String& attr);
+
+};
+
+#endif //__KX_NANDCONTROLLER
+
diff --git a/source/gameengine/GameLogic/SCA_NORController.cpp b/source/gameengine/GameLogic/SCA_NORController.cpp
new file mode 100644
index 00000000000..2866dec0b74
--- /dev/null
+++ b/source/gameengine/GameLogic/SCA_NORController.cpp
@@ -0,0 +1,144 @@
+/**
+ * 'Nor' together all inputs
+ *
+ * $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 "SCA_NORController.h"
+#include "SCA_ISensor.h"
+#include "SCA_LogicManager.h"
+#include "BoolValue.h"
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+/* ------------------------------------------------------------------------- */
+/* Native functions                                                          */
+/* ------------------------------------------------------------------------- */
+
+SCA_NORController::SCA_NORController(SCA_IObject* gameobj,
+									 PyTypeObject* T)
+	:
+	SCA_IController(gameobj,T)
+{
+}
+
+
+
+SCA_NORController::~SCA_NORController()
+{
+}
+
+
+
+void SCA_NORController::Trigger(SCA_LogicManager* logicmgr)
+{
+
+	bool sensorresult = true;
+
+	for (vector<SCA_ISensor*>::const_iterator is=m_linkedsensors.begin();
+	!(is==m_linkedsensors.end());is++)
+	{
+		SCA_ISensor* sensor = *is;
+		if (sensor->IsPositiveTrigger())
+		{
+			sensorresult = false;
+			break;
+		}
+	}
+	
+	CValue* newevent = new CBoolValue(sensorresult);
+
+	for (vector<SCA_IActuator*>::const_iterator i=m_linkedactuators.begin();
+	!(i==m_linkedactuators.end());i++)
+	{
+		SCA_IActuator* actua = *i;//m_linkedactuators.at(i);
+		logicmgr->AddActiveActuator(actua,newevent);
+	}
+
+	// every actuator that needs the event, has a it's own reference to it now so
+	// release it (so to be clear: if there is no actuator, it's deleted right now)
+	newevent->Release();
+
+}
+
+
+
+CValue* SCA_NORController::GetReplica()
+{
+	CValue* replica = new SCA_NORController(*this);
+	// this will copy properties and so on...
+	CValue::AddDataToReplica(replica);
+
+	return replica;
+}
+
+
+
+/* ------------------------------------------------------------------------- */
+/* Python functions                                                          */
+/* ------------------------------------------------------------------------- */
+
+/* Integration hooks ------------------------------------------------------- */
+PyTypeObject SCA_NORController::Type = {
+	PyObject_HEAD_INIT(&PyType_Type)
+	0,
+	"SCA_NORController",
+	sizeof(SCA_NORController),
+	0,
+	PyDestructor,
+	0,
+	__getattr,
+	__setattr,
+	0, //&MyPyCompare,
+	__repr,
+	0, //&cvalue_as_number,
+	0,
+	0,
+	0,
+	0
+};
+
+PyParentObject SCA_NORController::Parents[] = {
+	&SCA_NORController::Type,
+	&SCA_IController::Type,
+	&SCA_ILogicBrick::Type,
+	&CValue::Type,
+	NULL
+};
+
+PyMethodDef SCA_NORController::Methods[] = {
+	{NULL,NULL} //Sentinel
+};
+
+PyObject* SCA_NORController::_getattr(const STR_String& attr) {
+	_getattr_up(SCA_IController);
+}
+
+/* eof */
diff --git a/source/gameengine/GameLogic/SCA_NORController.h b/source/gameengine/GameLogic/SCA_NORController.h
new file mode 100644
index 00000000000..aab59e3d46c
--- /dev/null
+++ b/source/gameengine/GameLogic/SCA_NORController.h
@@ -0,0 +1,56 @@
+/**
+ * SCA_NORController.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 __KX_NORCONTROLLER
+#define __KX_NORCONTROLLER
+
+#include "SCA_IController.h"
+
+class SCA_NORController : public SCA_IController
+{
+	Py_Header;
+	//virtual void Trigger(class SCA_LogicManager* logicmgr);
+public:
+	SCA_NORController(SCA_IObject* gameobj,PyTypeObject* T=&Type);
+	virtual ~SCA_NORController();
+	virtual CValue* GetReplica();
+	virtual void Trigger(SCA_LogicManager* logicmgr);
+
+	/* --------------------------------------------------------------------- */
+	/* Python interface ---------------------------------------------------- */
+	/* --------------------------------------------------------------------- */
+
+	virtual PyObject* _getattr(const STR_String& attr);
+
+};
+
+#endif //__KX_NORCONTROLLER
+
diff --git a/source/gameengine/GameLogic/SCA_PropertySensor.cpp b/source/gameengine/GameLogic/SCA_PropertySensor.cpp
index f1fcb18d32e..c50c011cc63 100644
--- a/source/gameengine/GameLogic/SCA_PropertySensor.cpp
+++ b/source/gameengine/GameLogic/SCA_PropertySensor.cpp
@@ -54,10 +54,8 @@ SCA_PropertySensor::SCA_PropertySensor(SCA_EventManager* eventmgr,
 	  m_checkpropval(propval),
 	  m_checkpropmaxval(propmaxval),
 	  m_checkpropname(propname),
-	  m_lastresult(false),
 	  m_range_expr(NULL)
 {
-	m_recentresult=false;
 	//CParser pars;
 	//pars.SetContext(this->AddRef());
 	//CValue* resultval = m_rightexpr->Calculate();
@@ -73,7 +71,14 @@ SCA_PropertySensor::SCA_PropertySensor(SCA_EventManager* eventmgr,
 	{
 		PrecalculateRangeExpression();
 	}
+	Init();
+}
 
+void SCA_PropertySensor::Init()
+{
+	m_recentresult = false;
+	m_lastresult = m_invert?true:false;
+	m_reset = true;
 }
 
 void SCA_PropertySensor::PrecalculateRangeExpression()
@@ -107,6 +112,7 @@ CValue* SCA_PropertySensor::GetReplica()
 	SCA_PropertySensor* replica = new SCA_PropertySensor(*this);
 	// m_range_expr must be recalculated on replica!
 	CValue::AddDataToReplica(replica);
+	replica->Init();
 
 	replica->m_range_expr = NULL;
 	if (replica->m_checktype==KX_PROPSENSOR_INTERVAL)
@@ -149,14 +155,15 @@ SCA_PropertySensor::~SCA_PropertySensor()
 bool SCA_PropertySensor::Evaluate(CValue* event)
 {
 	bool result = CheckPropertyCondition();
+	bool reset = m_reset && m_level;
 	
+	m_reset = false;
 	if (m_lastresult!=result)
 	{
 		m_lastresult = result;
 		return true;
 	}
-
-	return false;
+	return (reset) ? true : false;
 }
 
 
diff --git a/source/gameengine/GameLogic/SCA_PropertySensor.h b/source/gameengine/GameLogic/SCA_PropertySensor.h
index 81c9b958f25..6871cb3afdc 100644
--- a/source/gameengine/GameLogic/SCA_PropertySensor.h
+++ b/source/gameengine/GameLogic/SCA_PropertySensor.h
@@ -77,6 +77,7 @@ public:
 	virtual void Delete();
 	virtual ~SCA_PropertySensor();
 	virtual CValue* GetReplica();
+	virtual void Init();
 	void	PrecalculateRangeExpression();
 	bool	CheckPropertyCondition();
 
diff --git a/source/gameengine/GameLogic/SCA_PythonController.cpp b/source/gameengine/GameLogic/SCA_PythonController.cpp
index 44cdc0a7de5..01ae4072335 100644
--- a/source/gameengine/GameLogic/SCA_PythonController.cpp
+++ b/source/gameengine/GameLogic/SCA_PythonController.cpp
@@ -116,7 +116,7 @@ CValue* SCA_PythonController::GetReplica()
 
 void SCA_PythonController::SetScriptText(const STR_String& text)
 { 
-	m_scriptText = "import GameLogic\n" + text;
+	m_scriptText = text;
 	m_bModified = true;
 }
 
@@ -144,9 +144,7 @@ static char* sPyGetCurrentController__doc__;
 #endif
 
 
-PyObject* SCA_PythonController::sPyGetCurrentController(PyObject* self, 
-											 PyObject* args, 
-											 PyObject* kwds)
+PyObject* SCA_PythonController::sPyGetCurrentController(PyObject* self)
 {
 	m_sCurrentController->AddRef();
 	return m_sCurrentController;
@@ -159,8 +157,7 @@ static char* sPyAddActiveActuator__doc__;
 PyObject* SCA_PythonController::sPyAddActiveActuator(
 	  
 		PyObject* self, 
-		PyObject* args, 
-		PyObject* kwds)
+		PyObject* args)
 {
 	
 	PyObject* ob1;
@@ -187,8 +184,7 @@ PyObject* SCA_PythonController::sPyAddActiveActuator(
 		m_sCurrentLogicManager->AddActiveActuator((SCA_IActuator*)act,boolval);
 		boolval->Release();
 	}
-	Py_INCREF(Py_None);
-	return Py_None;
+	Py_RETURN_NONE;
 }
 
 
@@ -222,16 +218,13 @@ PyParentObject SCA_PythonController::Parents[] = {
 	NULL
 };
 PyMethodDef SCA_PythonController::Methods[] = {
-	{"getActuators", (PyCFunction) SCA_PythonController::sPyGetActuators, 
-		METH_VARARGS, SCA_PythonController::GetActuators_doc},
-	{"getActuator", (PyCFunction) SCA_PythonController::sPyGetActuator, 
-	METH_VARARGS, SCA_PythonController::GetActuator_doc},
-	{"getSensors", (PyCFunction) SCA_PythonController::sPyGetSensors, 
-	METH_VARARGS, SCA_PythonController::GetSensors_doc},
-	{"getSensor", (PyCFunction) SCA_PythonController::sPyGetSensor, 
-	METH_VARARGS, SCA_PythonController::GetSensor_doc},
-	{"getScript", (PyCFunction) SCA_PythonController::sPyGetScript, METH_VARARGS},
-	{"setScript", (PyCFunction) SCA_PythonController::sPySetScript, METH_VARARGS},
+	{"getActuators", (PyCFunction) SCA_PythonController::sPyGetActuators, METH_NOARGS, SCA_PythonController::GetActuators_doc},
+	{"getActuator", (PyCFunction) SCA_PythonController::sPyGetActuator, METH_O, SCA_PythonController::GetActuator_doc},
+	{"getSensors", (PyCFunction) SCA_PythonController::sPyGetSensors, METH_NOARGS, SCA_PythonController::GetSensors_doc},
+	{"getSensor", (PyCFunction) SCA_PythonController::sPyGetSensor, METH_O, SCA_PythonController::GetSensor_doc},
+	{"getScript", (PyCFunction) SCA_PythonController::sPyGetScript, METH_NOARGS},
+	{"setScript", (PyCFunction) SCA_PythonController::sPySetScript, METH_O},
+	{"getState", (PyCFunction) SCA_PythonController::sPyGetState, METH_NOARGS},
 	{NULL,NULL} //Sentinel
 };
 
@@ -329,14 +322,12 @@ PyObject* SCA_PythonController::_getattr(const STR_String& attr)
 
 
 
-PyObject* SCA_PythonController::PyGetActuators(PyObject* self, 
-								   PyObject* args, 
-								   PyObject* kwds)
+PyObject* SCA_PythonController::PyGetActuators(PyObject* self)
 {
 	PyObject* resultlist = PyList_New(m_linkedactuators.size());
 	for (unsigned int index=0;index<m_linkedactuators.size();index++)
 	{
-		PyList_SetItem(resultlist,index,m_linkedactuators[index]->AddRef());
+		PyList_SET_ITEM(resultlist,index,m_linkedactuators[index]->AddRef());
 	}
 
 	return resultlist;
@@ -345,14 +336,12 @@ PyObject* SCA_PythonController::PyGetActuators(PyObject* self,
 char SCA_PythonController::GetSensor_doc[] = 
 "GetSensor (char sensorname) return linked sensor that is named [sensorname]\n";
 PyObject*
-SCA_PythonController::PyGetSensor(PyObject* self, 
-								 PyObject* args, 
-								 PyObject* kwds)
+SCA_PythonController::PyGetSensor(PyObject* self, PyObject* value)
 {
 
-	char *scriptArg;
-
-	if (!PyArg_ParseTuple(args, "s", &scriptArg)) {
+	char *scriptArg = PyString_AsString(value);
+	if (scriptArg==NULL) {
+		PyErr_SetString(PyExc_TypeError, "expected a string (sensor name)");
 		return NULL;
 	}
 	
@@ -365,8 +354,10 @@ SCA_PythonController::PyGetSensor(PyObject* self,
 			return sensor->AddRef();
 		}
 	}
-		
-	PyErr_SetString(PyExc_AttributeError, "Unable to find requested sensor");
+	
+	char emsg[96];
+	PyOS_snprintf( emsg, sizeof( emsg ), "Unable to find requested sensor \"%s\"", scriptArg );
+	PyErr_SetString(PyExc_AttributeError, emsg);
 	return NULL;
 }
 
@@ -375,14 +366,12 @@ SCA_PythonController::PyGetSensor(PyObject* self,
 char SCA_PythonController::GetActuator_doc[] = 
 "GetActuator (char sensorname) return linked actuator that is named [actuatorname]\n";
 PyObject*
-SCA_PythonController::PyGetActuator(PyObject* self, 
-								 PyObject* args, 
-								 PyObject* kwds)
+SCA_PythonController::PyGetActuator(PyObject* self, PyObject* value)
 {
 
-	char *scriptArg;
-
-	if (!PyArg_ParseTuple(args, "s", &scriptArg)) {
+	char *scriptArg = PyString_AsString(value);
+	if (scriptArg==NULL) {
+		PyErr_SetString(PyExc_TypeError, "expected a string (actuator name)");
 		return NULL;
 	}
 	
@@ -395,42 +384,39 @@ SCA_PythonController::PyGetActuator(PyObject* self,
 			return actua->AddRef();
 		}
 	}
-		
-	PyErr_SetString(PyExc_AttributeError, "Unable to find requested actuator");
+	
+	char emsg[96];
+	PyOS_snprintf( emsg, sizeof( emsg ), "Unable to find requested actuator \"%s\"", scriptArg );
+	PyErr_SetString(PyExc_AttributeError, emsg);
 	return NULL;
 }
 
 
 char SCA_PythonController::GetSensors_doc[]   = "getSensors returns a list of all attached sensors";
 PyObject*
-SCA_PythonController::PyGetSensors(PyObject* self, 
-								 PyObject* args, 
-								 PyObject* kwds)
+SCA_PythonController::PyGetSensors(PyObject* self)
 {
 	PyObject* resultlist = PyList_New(m_linkedsensors.size());
 	for (unsigned int index=0;index<m_linkedsensors.size();index++)
 	{
-		PyList_SetItem(resultlist,index,m_linkedsensors[index]->AddRef());
+		PyList_SET_ITEM(resultlist,index,m_linkedsensors[index]->AddRef());
 	}
 	
 	return resultlist;
 }
 
 /* 1. getScript */
-PyObject* SCA_PythonController::PyGetScript(PyObject* self, 
-										   PyObject* args, 
-										   PyObject* kwds)
+PyObject* SCA_PythonController::PyGetScript(PyObject* self)
 {
 	return PyString_FromString(m_scriptText);
 }
 
 /* 2. setScript */
-PyObject* SCA_PythonController::PySetScript(PyObject* self, 
-										   PyObject* args, 
-										   PyObject* kwds)
+PyObject* SCA_PythonController::PySetScript(PyObject* self, PyObject* value)
 {
-	char *scriptArg;
-	if (!PyArg_ParseTuple(args, "s", &scriptArg)) {
+	char *scriptArg = PyString_AsString(value);
+	if (scriptArg==NULL) {
+		PyErr_SetString(PyExc_TypeError, "expected a string (script name)");
 		return NULL;
 	}
 	
@@ -439,7 +425,13 @@ PyObject* SCA_PythonController::PySetScript(PyObject* self,
 
 	this->SetScriptText(scriptArg);
 	
-	Py_Return;
+	Py_RETURN_NONE;
+}
+
+/* 1. getScript */
+PyObject* SCA_PythonController::PyGetState(PyObject* self)
+{
+	return PyInt_FromLong(m_statemask);
 }
 
 /* eof */
diff --git a/source/gameengine/GameLogic/SCA_PythonController.h b/source/gameengine/GameLogic/SCA_PythonController.h
index 63975234da9..39b6c68c359 100644
--- a/source/gameengine/GameLogic/SCA_PythonController.h
+++ b/source/gameengine/GameLogic/SCA_PythonController.h
@@ -66,21 +66,19 @@ class SCA_PythonController : public SCA_IController
 	void	SetDictionary(PyObject*	pythondictionary);
 
 	static char* sPyGetCurrentController__doc__;
-	static PyObject* sPyGetCurrentController(PyObject* self, 
-											 PyObject* args, 
-											 PyObject* kwds);
+	static PyObject* sPyGetCurrentController(PyObject* self);
 	static char* sPyAddActiveActuator__doc__;
 	static PyObject* sPyAddActiveActuator(PyObject* self, 
-										  PyObject* args, 
-										  PyObject* kwds);
+										  PyObject* args);
 	virtual PyObject* _getattr(const STR_String& attr);
 
-	KX_PYMETHOD_DOC(SCA_PythonController,GetSensors);
-	KX_PYMETHOD_DOC(SCA_PythonController,GetSensor);
-	KX_PYMETHOD_DOC(SCA_PythonController,GetActuator);
-	KX_PYMETHOD_DOC(SCA_PythonController,GetActuators);
-	KX_PYMETHOD(SCA_PythonController,SetScript);
-	KX_PYMETHOD(SCA_PythonController,GetScript);
+	KX_PYMETHOD_DOC_NOARGS(SCA_PythonController,GetSensors);
+	KX_PYMETHOD_DOC_NOARGS(SCA_PythonController,GetActuators);
+	KX_PYMETHOD_DOC_O(SCA_PythonController,GetSensor);
+	KX_PYMETHOD_DOC_O(SCA_PythonController,GetActuator);
+	KX_PYMETHOD_O(SCA_PythonController,SetScript);
+	KX_PYMETHOD_NOARGS(SCA_PythonController,GetScript);
+	KX_PYMETHOD_NOARGS(SCA_PythonController,GetState);
 	
 
 };
diff --git a/source/gameengine/GameLogic/SCA_RandomSensor.cpp b/source/gameengine/GameLogic/SCA_RandomSensor.cpp
index 0e856e0d6bb..3626522e49a 100644
--- a/source/gameengine/GameLogic/SCA_RandomSensor.cpp
+++ b/source/gameengine/GameLogic/SCA_RandomSensor.cpp
@@ -50,16 +50,9 @@ SCA_RandomSensor::SCA_RandomSensor(SCA_EventManager* eventmgr,
   				 PyTypeObject* T)
     : SCA_ISensor(gameobj,eventmgr, T)
 {
-    m_iteration  = 0;
-	m_interval = 0;
-	m_lastdraw   = false;
-	
 	// m_basegenerator is never deleted => memory leak
 	m_basegenerator = new SCA_RandomNumberGenerator(startseed);
-    m_currentDraw = m_basegenerator->Draw();
-	//registration is done globally, don't do it here
-	//Note: it was probably done to work around a bug in Evaluate(). It is now fixed
-	//RegisterToManager();
+	Init();
 }
 
 
@@ -69,6 +62,13 @@ SCA_RandomSensor::~SCA_RandomSensor()
     /* Nothing to be done here. */
 }
 
+void SCA_RandomSensor::Init()
+{
+    m_iteration  = 0;
+	m_interval = 0;
+	m_lastdraw   = false;
+    m_currentDraw = m_basegenerator->Draw();
+}
 
 
 CValue* SCA_RandomSensor::GetReplica()
diff --git a/source/gameengine/GameLogic/SCA_RandomSensor.h b/source/gameengine/GameLogic/SCA_RandomSensor.h
index cc54179aa4e..d29bfb6837a 100644
--- a/source/gameengine/GameLogic/SCA_RandomSensor.h
+++ b/source/gameengine/GameLogic/SCA_RandomSensor.h
@@ -54,6 +54,7 @@ public:
 	virtual CValue* GetReplica();
 	virtual bool Evaluate(CValue* event);
 	virtual bool IsPositiveTrigger();
+	virtual void Init();
 
 	/* --------------------------------------------------------------------- */
 	/* Python interface ---------------------------------------------------- */
diff --git a/source/gameengine/GameLogic/SCA_XNORController.cpp b/source/gameengine/GameLogic/SCA_XNORController.cpp
new file mode 100644
index 00000000000..3ef7c07fe0a
--- /dev/null
+++ b/source/gameengine/GameLogic/SCA_XNORController.cpp
@@ -0,0 +1,148 @@
+/**
+ * 'Xnor' together all inputs
+ *
+ * $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 "SCA_XNORController.h"
+#include "SCA_ISensor.h"
+#include "SCA_LogicManager.h"
+#include "BoolValue.h"
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+/* ------------------------------------------------------------------------- */
+/* Native functions                                                          */
+/* ------------------------------------------------------------------------- */
+
+SCA_XNORController::SCA_XNORController(SCA_IObject* gameobj,
+									 PyTypeObject* T)
+	:
+	SCA_IController(gameobj,T)
+{
+}
+
+
+
+SCA_XNORController::~SCA_XNORController()
+{
+}
+
+
+
+void SCA_XNORController::Trigger(SCA_LogicManager* logicmgr)
+{
+
+	bool sensorresult = true;
+
+	for (vector<SCA_ISensor*>::const_iterator is=m_linkedsensors.begin();
+	!(is==m_linkedsensors.end());is++)
+	{
+		SCA_ISensor* sensor = *is;
+		if (sensor->IsPositiveTrigger())
+		{
+			if (sensorresult == false)
+			{
+				sensorresult = true;
+				break;
+			}
+			sensorresult = false;
+		}
+	}
+
+	CValue* newevent = new CBoolValue(sensorresult);
+
+	for (vector<SCA_IActuator*>::const_iterator i=m_linkedactuators.begin();
+	!(i==m_linkedactuators.end());i++)
+	{
+		SCA_IActuator* actua = *i;//m_linkedactuators.at(i);
+		logicmgr->AddActiveActuator(actua,newevent);
+	}
+
+	// every actuator that needs the event, has a it's own reference to it now so
+	// release it (so to be clear: if there is no actuator, it's deleted right now)
+	newevent->Release();
+
+}
+
+
+
+CValue* SCA_XNORController::GetReplica()
+{
+	CValue* replica = new SCA_XNORController(*this);
+	// this will copy properties and so on...
+	CValue::AddDataToReplica(replica);
+
+	return replica;
+}
+
+
+
+/* ------------------------------------------------------------------------- */
+/* Python functions                                                          */
+/* ------------------------------------------------------------------------- */
+
+/* Integration hooks ------------------------------------------------------- */
+PyTypeObject SCA_XNORController::Type = {
+	PyObject_HEAD_INIT(&PyType_Type)
+	0,
+	"SCA_XNORController",
+	sizeof(SCA_XNORController),
+	0,
+	PyDestructor,
+	0,
+	__getattr,
+	__setattr,
+	0, //&MyPyCompare,
+	__repr,
+	0, //&cvalue_as_number,
+	0,
+	0,
+	0,
+	0
+};
+
+PyParentObject SCA_XNORController::Parents[] = {
+	&SCA_XNORController::Type,
+	&SCA_IController::Type,
+	&SCA_ILogicBrick::Type,
+	&CValue::Type,
+	NULL
+};
+
+PyMethodDef SCA_XNORController::Methods[] = {
+	{NULL,NULL} //Sentinel
+};
+
+PyObject* SCA_XNORController::_getattr(const STR_String& attr) {
+	_getattr_up(SCA_IController);
+}
+
+/* eof */
diff --git a/source/gameengine/GameLogic/SCA_XNORController.h b/source/gameengine/GameLogic/SCA_XNORController.h
new file mode 100644
index 00000000000..4b1eaee95d8
--- /dev/null
+++ b/source/gameengine/GameLogic/SCA_XNORController.h
@@ -0,0 +1,56 @@
+/**
+ * SCA_XNORController.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 __KX_XNORCONTROLLER
+#define __KX_XNORCONTROLLER
+
+#include "SCA_IController.h"
+
+class SCA_XNORController : public SCA_IController
+{
+	Py_Header;
+	//virtual void Trigger(class SCA_LogicManager* logicmgr);
+public:
+	SCA_XNORController(SCA_IObject* gameobj,PyTypeObject* T=&Type);
+	virtual ~SCA_XNORController();
+	virtual CValue* GetReplica();
+	virtual void Trigger(SCA_LogicManager* logicmgr);
+
+	/* --------------------------------------------------------------------- */
+	/* Python interface ---------------------------------------------------- */
+	/* --------------------------------------------------------------------- */
+
+	virtual PyObject* _getattr(const STR_String& attr);
+
+};
+
+#endif //__KX_XNORCONTROLLER
+
diff --git a/source/gameengine/GameLogic/SCA_XORController.cpp b/source/gameengine/GameLogic/SCA_XORController.cpp
new file mode 100644
index 00000000000..6499c62f5f2
--- /dev/null
+++ b/source/gameengine/GameLogic/SCA_XORController.cpp
@@ -0,0 +1,148 @@
+/**
+ * 'Xor' together all inputs
+ *
+ * $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 "SCA_XORController.h"
+#include "SCA_ISensor.h"
+#include "SCA_LogicManager.h"
+#include "BoolValue.h"
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+/* ------------------------------------------------------------------------- */
+/* Native functions                                                          */
+/* ------------------------------------------------------------------------- */
+
+SCA_XORController::SCA_XORController(SCA_IObject* gameobj,
+									 PyTypeObject* T)
+	:
+	SCA_IController(gameobj,T)
+{
+}
+
+
+
+SCA_XORController::~SCA_XORController()
+{
+}
+
+
+
+void SCA_XORController::Trigger(SCA_LogicManager* logicmgr)
+{
+
+	bool sensorresult = false;
+
+	for (vector<SCA_ISensor*>::const_iterator is=m_linkedsensors.begin();
+	!(is==m_linkedsensors.end());is++)
+	{
+		SCA_ISensor* sensor = *is;
+		if (sensor->IsPositiveTrigger())
+		{
+			if (sensorresult == true)
+			{
+                sensorresult = false;
+				break;
+			}
+            sensorresult = true;
+		}
+	}
+	
+	CValue* newevent = new CBoolValue(sensorresult);
+
+	for (vector<SCA_IActuator*>::const_iterator i=m_linkedactuators.begin();
+	!(i==m_linkedactuators.end());i++)
+	{
+		SCA_IActuator* actua = *i;//m_linkedactuators.at(i);
+		logicmgr->AddActiveActuator(actua,newevent);
+	}
+
+	// every actuator that needs the event, has a it's own reference to it now so
+	// release it (so to be clear: if there is no actuator, it's deleted right now)
+	newevent->Release();
+
+}
+
+
+
+CValue* SCA_XORController::GetReplica()
+{
+	CValue* replica = new SCA_XORController(*this);
+	// this will copy properties and so on...
+	CValue::AddDataToReplica(replica);
+
+	return replica;
+}
+
+
+
+/* ------------------------------------------------------------------------- */
+/* Python functions                                                          */
+/* ------------------------------------------------------------------------- */
+
+/* Integration hooks ------------------------------------------------------- */
+PyTypeObject SCA_XORController::Type = {
+	PyObject_HEAD_INIT(&PyType_Type)
+	0,
+	"SCA_XORController",
+	sizeof(SCA_XORController),
+	0,
+	PyDestructor,
+	0,
+	__getattr,
+	__setattr,
+	0, //&MyPyCompare,
+	__repr,
+	0, //&cvalue_as_number,
+	0,
+	0,
+	0,
+	0
+};
+
+PyParentObject SCA_XORController::Parents[] = {
+	&SCA_XORController::Type,
+	&SCA_IController::Type,
+	&SCA_ILogicBrick::Type,
+	&CValue::Type,
+	NULL
+};
+
+PyMethodDef SCA_XORController::Methods[] = {
+	{NULL,NULL} //Sentinel
+};
+
+PyObject* SCA_XORController::_getattr(const STR_String& attr) {
+	_getattr_up(SCA_IController);
+}
+
+/* eof */
diff --git a/source/gameengine/GameLogic/SCA_XORController.h b/source/gameengine/GameLogic/SCA_XORController.h
new file mode 100644
index 00000000000..f50cd33c125
--- /dev/null
+++ b/source/gameengine/GameLogic/SCA_XORController.h
@@ -0,0 +1,56 @@
+/**
+ * SCA_XORController.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 __KX_XORCONTROLLER
+#define __KX_XORCONTROLLER
+
+#include "SCA_IController.h"
+
+class SCA_XORController : public SCA_IController
+{
+	Py_Header;
+	//virtual void Trigger(class SCA_LogicManager* logicmgr);
+public:
+	SCA_XORController(SCA_IObject* gameobj,PyTypeObject* T=&Type);
+	virtual ~SCA_XORController();
+	virtual CValue* GetReplica();
+	virtual void Trigger(SCA_LogicManager* logicmgr);
+
+	/* --------------------------------------------------------------------- */
+	/* Python interface ---------------------------------------------------- */
+	/* --------------------------------------------------------------------- */
+
+	virtual PyObject* _getattr(const STR_String& attr);
+
+};
+
+#endif //__KX_XORCONTROLLER
+
diff --git a/source/gameengine/GamePlayer/common/CMakeLists.txt b/source/gameengine/GamePlayer/common/CMakeLists.txt
index 29cdcd640f5..e26f8b9d69a 100644
--- a/source/gameengine/GamePlayer/common/CMakeLists.txt
+++ b/source/gameengine/GamePlayer/common/CMakeLists.txt
@@ -69,6 +69,7 @@ SET(INC
   ../../../../source/gameengine/GamePlayer/ghost
   ../../../../source/blender/misc
   ../../../../source/blender/blenloader
+  ../../../../extern/glew/include
   ${PYTHON_INC}
   ${SOLID_INC}
   ${PNG_INC}
diff --git a/source/gameengine/GamePlayer/common/GPC_Canvas.h b/source/gameengine/GamePlayer/common/GPC_Canvas.h
index bd66c865988..f82166dfa88 100644
--- a/source/gameengine/GamePlayer/common/GPC_Canvas.h
+++ b/source/gameengine/GamePlayer/common/GPC_Canvas.h
@@ -33,18 +33,12 @@
 #include "RAS_ICanvas.h"
 #include "RAS_Rect.h"
 
-#if defined(WIN32) || defined(__APPLE__)
-	#ifdef WIN32
-		#pragma warning (disable:4786) // suppress stl-MSVC debug info warning
-		#include <windows.h>
-		#include <GL/gl.h>
-	#else // WIN32
-		// __APPLE__ is defined
-		#include <AGL/gl.h>
-	#endif // WIN32
-#else //defined(WIN32) || defined(__APPLE__)
-	#include <GL/gl.h>
-#endif //defined(WIN32) || defined(__APPLE__)
+#ifdef WIN32
+	#pragma warning (disable:4786) // suppress stl-MSVC debug info warning
+	#include <windows.h>
+#endif // WIN32
+
+#include "GL/glew.h"
 
 #include <map>
 
diff --git a/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp b/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp
index 46fe24d8b87..b1e2b5af0e6 100644
--- a/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp
+++ b/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp
@@ -31,23 +31,7 @@
 #include <config.h>
 #endif
 
-#ifdef WIN32
-#include <windows.h>
-#endif // WIN32
-#ifdef __APPLE__
-#define GL_GLEXT_LEGACY 1
-#include <OpenGL/gl.h>
-#include <OpenGL/glu.h>
-#else
-#include <GL/gl.h>
-#if defined(__sun__) && !defined(__sparc__)
-#include <mesa/glu.h>
-#else
-#include <GL/glu.h>
-#endif
-#endif
-
-
+#include "GL/glew.h"
 
 #include "GPC_PolygonMaterial.h"
 #include "MT_Vector3.h"
@@ -88,7 +72,6 @@ static int fDoMipMap = 1;
 static int fLinearMipMap=1;
 static int fAlphamode= -1;
 
-using namespace bgl;
 	/* (n&(n-1)) zeros the least significant bit of n */
 static int is_pow2(int num) {
 	return ((num)&(num-1))==0;
@@ -154,16 +137,23 @@ int set_tpage(MTFace *tface)
 		fAlphamode= tface->transp;
 
 		if(fAlphamode) {
-			glEnable(GL_BLEND);
-			
 			if(fAlphamode==TF_ADD) {
+				glEnable(GL_BLEND);
 				glBlendFunc(GL_ONE, GL_ONE);
+				glDisable ( GL_ALPHA_TEST );
 			/* 	glBlendEquationEXT(GL_FUNC_ADD_EXT); */
 			}
 			else if(fAlphamode==TF_ALPHA) {
+				glEnable(GL_BLEND);
 				glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+				glDisable ( GL_ALPHA_TEST );
 			/* 	glBlendEquationEXT(GL_FUNC_ADD_EXT); */
 			}
+			else if (fAlphamode==TF_CLIP){		
+				glDisable(GL_BLEND); 
+				glEnable ( GL_ALPHA_TEST );
+				glAlphaFunc(GL_GREATER, 0.5f);
+			}
 			/* else { */
 			/* 	glBlendFunc(GL_ONE, GL_ONE); */
 			/* 	glBlendEquationEXT(GL_FUNC_REVERSE_SUBTRACT_EXT); */
diff --git a/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp b/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
index 885981a2898..8b828393c67 100644
--- a/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
+++ b/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
@@ -34,12 +34,8 @@
 #include <windows.h>
 #endif 
 
-#ifdef __APPLE__
-#define GL_GLEXT_LEGACY 1
-#include <OpenGL/gl.h>
-#else
-#include <GL/gl.h>
-#endif
+#include "GL/glew.h"
+
 #include <iostream>
 
 #include "GPC_RenderTools.h"
@@ -137,10 +133,6 @@ int GPC_RenderTools::ProcessLighting(int layer)
 	{
 		if (m_clientobject)
 		{	
-			if (layer == RAS_LIGHT_OBJECT_LAYER)
-			{
-				layer = static_cast<KX_GameObject*>(m_clientobject)->GetLayer();
-			}
 			if (applyLights(layer))
 			{
 				EnableOpenGLLights();
@@ -160,7 +152,7 @@ void GPC_RenderTools::EnableOpenGLLights()
 	glEnable(GL_LIGHTING);
 	glEnable(GL_COLOR_MATERIAL);
 	glColorMaterial(GL_FRONT_AND_BACK,GL_DIFFUSE);
-	if (bgl::QueryExtension(bgl::_GL_EXT_separate_specular_color) || bgl::QueryVersion(1, 2))
+	if (GLEW_EXT_separate_specular_color || GLEW_VERSION_1_2)
 		glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL, GL_SEPARATE_SPECULAR_COLOR);
 }
 
@@ -610,9 +602,9 @@ void GPC_RenderTools::MotionBlur(RAS_IRasterizer* rasterizer)
 	}
 }
 
-void GPC_RenderTools::Update2DFilter(RAS_2DFilterManager::RAS_2DFILTER_MODE filtermode, int pass, STR_String& text)
+void GPC_RenderTools::Update2DFilter(vector<STR_String>& propNames, void* gameObj, RAS_2DFilterManager::RAS_2DFILTER_MODE filtermode, int pass, STR_String& text)
 {
-	m_filtermanager.EnableFilter(filtermode, pass, text);
+	m_filtermanager.EnableFilter(propNames, gameObj, filtermode, pass, text);
 }
 
 void GPC_RenderTools::Render2DFilters(RAS_ICanvas* canvas)
diff --git a/source/gameengine/GamePlayer/common/GPC_RenderTools.h b/source/gameengine/GamePlayer/common/GPC_RenderTools.h
index ee0212da643..8fae3d2b305 100644
--- a/source/gameengine/GamePlayer/common/GPC_RenderTools.h
+++ b/source/gameengine/GamePlayer/common/GPC_RenderTools.h
@@ -30,18 +30,11 @@
 #ifndef __GPC_RENDERTOOLS_H
 #define __GPC_RENDERTOOLS_H
 
-#if defined(WIN32) || defined(__APPLE__)
-	#ifdef WIN32
-		#include <windows.h>
-		#include <GL/gl.h>
-	#else // WIN32
-		// __APPLE__ is defined
-		#include <AGL/gl.h>
-	#endif // WIN32
-#else //defined(WIN32) || defined(__APPLE__)
-	#include <GL/gl.h>
-#endif //defined(WIN32) || defined(__APPLE__)
+#ifdef WIN32
+	#include <windows.h>
+#endif // WIN32
 
+#include "GL/glew.h"
 
 #include "RAS_IRenderTools.h"
 
@@ -149,7 +142,7 @@ public:
 
 	virtual void MotionBlur(RAS_IRasterizer* rasterizer);
 
-	virtual void Update2DFilter(RAS_2DFilterManager::RAS_2DFILTER_MODE filtermode, int pass, STR_String& text);
+	virtual void Update2DFilter(vector<STR_String>& propNames, void* gameObj, RAS_2DFilterManager::RAS_2DFILTER_MODE filtermode, int pass, STR_String& text);
 
 	virtual	void Render2DFilters(RAS_ICanvas* canvas);
 
diff --git a/source/gameengine/GamePlayer/common/Makefile b/source/gameengine/GamePlayer/common/Makefile
index 508dee18755..19d792ddbdb 100644
--- a/source/gameengine/GamePlayer/common/Makefile
+++ b/source/gameengine/GamePlayer/common/Makefile
@@ -35,6 +35,7 @@ include nan_compile.mk
 
 CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
 
+CPPFLAGS += -I$(NAN_GLEW)/include
 CPPFLAGS += -I$(OPENGL_HEADERS)
 
 CPPFLAGS += -I../../../blender/blenkernel
diff --git a/source/gameengine/GamePlayer/common/SConscript b/source/gameengine/GamePlayer/common/SConscript
index 6ff3ae10735..3b2367d2592 100644
--- a/source/gameengine/GamePlayer/common/SConscript
+++ b/source/gameengine/GamePlayer/common/SConscript
@@ -45,7 +45,8 @@ incs = ['.',
         '#source/gameengine/Network/LoopBackNetwork',
         '#source/gameengine/GamePlayer/ghost',
         '#source/blender/misc',
-        '#source/blender/blenloader']
+        '#source/blender/blenloader',
+		'#extern/glew/include']
                                 
 #This is all plugin stuff!
 #if sys.platform=='win32':
diff --git a/source/gameengine/GamePlayer/ghost/CMakeLists.txt b/source/gameengine/GamePlayer/ghost/CMakeLists.txt
index 3d17cd2cfdd..d9f0675001f 100644
--- a/source/gameengine/GamePlayer/ghost/CMakeLists.txt
+++ b/source/gameengine/GamePlayer/ghost/CMakeLists.txt
@@ -65,6 +65,7 @@ SET(INC
   ../../../../source/blender/misc
   ../../../../source/blender/blenloader
   ../../../../extern/solid
+  ../../../../extern/glew/include
   ${PYTHON_INC}
 )
 
diff --git a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
index dfd15227501..b5ebffb9378 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
+++ b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
@@ -37,18 +37,7 @@
 	#include <windows.h>
 #endif
 
-#ifdef __APPLE__
-#define GL_GLEXT_LEGACY 1
-#include <OpenGL/gl.h>
-#include <OpenGL/glu.h>
-#else
-#include <GL/gl.h>
-#if defined(__sun__) && !defined(__sparc__)
-#include <mesa/glu.h>
-#else
-#include <GL/glu.h>
-#endif
-#endif
+#include "GL/glew.h"
 
 #include "GPG_Application.h"
 
@@ -134,7 +123,8 @@ GPG_Application::GPG_Application(GHOST_ISystem* system, struct Main* maggie, STR
 	  m_sceneconverter(0),
 	  m_networkdevice(0), 
 	  m_audiodevice(0),
-	  m_blendermat(0)
+	  m_blendermat(0),
+	  m_blenderglslmat(0)
 {
 	fSystem = system;
 }
@@ -487,7 +477,8 @@ bool GPG_Application::initEngine(GHOST_IWindow* window, const int stereoMode)
 {
 	if (!m_engineInitialized)
 	{
-		bgl::InitExtensions(1);
+		glewInit();
+		bgl::InitExtensions(true);
 
 		// get and set the preferences
 		SYS_SystemHandle syshandle = SYS_GetSystem();
@@ -505,29 +496,12 @@ bool GPG_Application::initEngine(GHOST_IWindow* window, const int stereoMode)
 
 		bool fixed_framerate= (SYS_GetCommandLineInt(syshandle, "fixed_framerate", fixedFr) != 0);
 		bool frameRate = (SYS_GetCommandLineInt(syshandle, "show_framerate", 0) != 0);
-		bool useVertexArrays = SYS_GetCommandLineInt(syshandle,"vertexarrays",1) != 0;
 		bool useLists = (SYS_GetCommandLineInt(syshandle, "displaylists", G.fileflags & G_FILE_DIAPLAY_LISTS) != 0);
 
-#if defined(GL_ARB_multitexture) && defined(WITH_GLEXT)
-		if (!getenv("WITHOUT_GLEXT")) {
+		if(GLEW_ARB_multitexture && GLEW_VERSION_1_1) {
 			int gameflag =(G.fileflags & G_FILE_GAME_MAT);
-
-			if(bgl::RAS_EXT_support._ARB_multitexture && bgl::QueryVersion(1, 1)) {
-				m_blendermat = (SYS_GetCommandLineInt(syshandle, "blender_material", gameflag) != 0);
-				int unitmax=0;
-				glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, (GLint*)&unitmax);
-				bgl::max_texture_units = MAXTEX>unitmax?unitmax:MAXTEX;
-				//std::cout << "using(" << bgl::max_texture_units << ") of(" << unitmax << ") texture units." << std::endl;
-			} else {
-				bgl::max_texture_units = 0;
-			}
-		} else {
-			m_blendermat=0;
+			m_blendermat = (SYS_GetCommandLineInt(syshandle, "blender_material", gameflag) != 0);
 		}
-#else
-			m_blendermat=0;
-#endif//GL_ARB_multitexture
-		// ----------------------------------
 	
 		// create the canvas, rasterizer and rendertools
 		m_canvas = new GPG_Canvas(window);
@@ -539,16 +513,17 @@ bool GPG_Application::initEngine(GHOST_IWindow* window, const int stereoMode)
 		if (!m_rendertools)
 			goto initFailed;
 		
-		if(useLists)
-			if (useVertexArrays) {
+		if(useLists) {
+			if(GLEW_VERSION_1_1)
 				m_rasterizer = new RAS_ListRasterizer(m_canvas, true);
-			} else {
+			else
 				m_rasterizer = new RAS_ListRasterizer(m_canvas);
-			}
-		else if (useVertexArrays && bgl::QueryVersion(1, 1))
+		}
+		else if (GLEW_VERSION_1_1)
 			m_rasterizer = new RAS_VAOpenGLRasterizer(m_canvas);
 		else
 			m_rasterizer = new RAS_OpenGLRasterizer(m_canvas);
+
 		m_rasterizer->SetStereoMode((RAS_IRasterizer::StereoMode) stereoMode);
 		if (!m_rasterizer)
 			goto initFailed;
@@ -655,6 +630,8 @@ bool GPG_Application::startEngine(void)
 		//		sceneconverter->SetAlwaysUseExpandFraming(true);
 		if(m_blendermat)
 			m_sceneconverter->SetMaterials(true);
+		if(m_blenderglslmat)
+			m_sceneconverter->SetGLSLMaterials(true);
 
 		KX_Scene* startscene = new KX_Scene(m_keyboard,
 			m_mouse,
@@ -667,7 +644,7 @@ bool GPG_Application::startEngine(void)
 		PyObject* dictionaryobject = initGamePlayerPythonScripting("Ketsji", psl_Lowest);
 		m_ketsjiengine->SetPythonDictionary(dictionaryobject);
 		initRasterizer(m_rasterizer, m_canvas);
-		PyObject *gameLogic = initGameLogic(startscene);
+		PyDict_SetItemString(dictionaryobject, "GameLogic", initGameLogic(startscene)); // Same as importing the module
 		initGameKeys();
 		initPythonConstraintBinding();
 
diff --git a/source/gameengine/GamePlayer/ghost/GPG_Application.h b/source/gameengine/GamePlayer/ghost/GPG_Application.h
index 024ca1dbf32..17f5add8b19 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_Application.h
+++ b/source/gameengine/GamePlayer/ghost/GPG_Application.h
@@ -141,6 +141,7 @@ protected:
 	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 bc80c0a7612..8222e5c8bac 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
+++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
@@ -187,11 +187,10 @@ void usage(char* program)
 	printf("       show_framerate     0         Show the frame rate\n");
 	printf("       show_properties    0         Show debug properties\n");
 	printf("       show_profile       0         Show profiling information\n");
-	printf("       vertexarrays       1         Enable vertex arrays\n");
 	printf("       blender_material   0         Enable material settings\n");
 	printf("\n");
 	printf("example: %s -p 10 10 320 200 -g noaudio c:\\loadtest.blend\n", program);
-	printf("example: %s -g vertexarrays = 0 c:\\loadtest.blend\n", program);
+	printf("example: %s -g show_framerate = 0 c:\\loadtest.blend\n", program);
 }
 
 char *get_filename(int argc, char **argv) {
diff --git a/source/gameengine/GamePlayer/ghost/Makefile b/source/gameengine/GamePlayer/ghost/Makefile
index d5aae181396..13940ac3fc8 100644
--- a/source/gameengine/GamePlayer/ghost/Makefile
+++ b/source/gameengine/GamePlayer/ghost/Makefile
@@ -36,6 +36,7 @@ include nan_compile.mk
 CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
 
 # OpenGL header files
+CPPFLAGS += -I$(NAN_GLEW)/include
 CPPFLAGS += -I$(OPENGL_HEADERS)
 CPPFLAGS += -I$(NAN_STRING)/include    
 CPPFLAGS += -I$(NAN_BMFONT)/include
diff --git a/source/gameengine/GamePlayer/ghost/SConscript b/source/gameengine/GamePlayer/ghost/SConscript
index bd37777031e..f3cce6c7443 100644
--- a/source/gameengine/GamePlayer/ghost/SConscript
+++ b/source/gameengine/GamePlayer/ghost/SConscript
@@ -39,7 +39,8 @@ incs = ['.',
         '#source/gameengine/Network/LoopBackNetwork',
         '#source/gameengine/GamePlayer/common',
         '#source/blender/misc',
-        '#source/blender/blenloader']
+        '#source/blender/blenloader',
+        '#extern/glew/include']
 
 incs += Split(env['BF_PYTHON_INC'])
 incs += Split(env['BF_SOLID_INC'])
diff --git a/source/gameengine/Ketsji/BL_BlenderShader.cpp b/source/gameengine/Ketsji/BL_BlenderShader.cpp
new file mode 100644
index 00000000000..dd45d522b9f
--- /dev/null
+++ b/source/gameengine/Ketsji/BL_BlenderShader.cpp
@@ -0,0 +1,175 @@
+
+#include "DNA_customdata_types.h"
+#include "DNA_material_types.h"
+
+#include "BL_BlenderShader.h"
+#include "BL_Material.h"
+
+#ifdef BLENDER_GLSL
+#include "GPU_extensions.h"
+#include "GPU_material.h"
+#endif
+
+#include "RAS_MeshObject.h"
+#include "RAS_IRasterizer.h"
+
+const bool BL_BlenderShader::Ok()const
+{
+#ifdef BLENDER_GLSL
+	return (mGPUMat != 0);
+#else
+	return 0;
+#endif
+}
+
+BL_BlenderShader::BL_BlenderShader(struct Material *ma, int lightlayer)
+:
+#ifdef BLENDER_GLSL
+	mGPUMat(0),
+#endif
+	mBound(false),
+	mLightLayer(lightlayer)
+{
+#ifdef BLENDER_GLSL
+	if(ma) {
+		GPU_material_from_blender(ma);
+		mGPUMat = ma->gpumaterial;
+	}
+#endif
+}
+
+BL_BlenderShader::~BL_BlenderShader()
+{
+#ifdef BLENDER_GLSL
+	if(mGPUMat) {
+		GPU_material_unbind(mGPUMat);
+		mGPUMat = 0;
+	}
+#endif
+}
+
+void BL_BlenderShader::SetProg(bool enable)
+{
+#ifdef BLENDER_GLSL
+	if(mGPUMat) {
+		if(enable) {
+			GPU_material_bind(mGPUMat, mLightLayer);
+			mBound = true;
+		}
+		else {
+			GPU_material_unbind(mGPUMat);
+			mBound = false;
+		}
+	}
+#endif
+}
+
+int BL_BlenderShader::GetAttribNum()
+{
+#ifdef BLENDER_GLSL
+	GPUVertexAttribs attribs;
+	int i, enabled = 0;
+
+	if(!mGPUMat)
+		return enabled;
+
+	GPU_material_vertex_attributes(mGPUMat, &attribs);
+
+    for(i = 0; i < attribs.totlayer; i++)
+		if(attribs.layer[i].glindex+1 > enabled)
+			enabled= attribs.layer[i].glindex+1;
+	
+	if(enabled > BL_MAX_ATTRIB)
+		enabled = BL_MAX_ATTRIB;
+
+	return enabled;
+#else
+	return 0;
+#endif
+}
+
+void BL_BlenderShader::SetAttribs(RAS_IRasterizer* ras, const BL_Material *mat)
+{
+#ifdef BLENDER_GLSL
+	GPUVertexAttribs attribs;
+	int i, attrib_num;
+
+	ras->SetAttribNum(0);
+
+	if(!mGPUMat)
+		return;
+
+	if(ras->GetDrawingMode() == RAS_IRasterizer::KX_TEXTURED) {
+		GPU_material_vertex_attributes(mGPUMat, &attribs);
+		attrib_num = GetAttribNum();
+
+		ras->SetTexCoordNum(0);
+		ras->SetAttribNum(attrib_num);
+		for(i=0; i<attrib_num; i++)
+			ras->SetAttrib(RAS_IRasterizer::RAS_TEXCO_DISABLE, i);
+
+		for(i = 0; i < attribs.totlayer; i++) {
+			if(attribs.layer[i].glindex > attrib_num)
+				continue;
+
+			if(attribs.layer[i].type == CD_MTFACE) {
+				if(!mat->uvName.IsEmpty() && strcmp(mat->uvName.ReadPtr(), attribs.layer[i].name) == 0)
+					ras->SetAttrib(RAS_IRasterizer::RAS_TEXCO_UV1, attribs.layer[i].glindex);
+				else if(!mat->uv2Name.IsEmpty() && strcmp(mat->uv2Name.ReadPtr(), attribs.layer[i].name) == 0)
+					ras->SetAttrib(RAS_IRasterizer::RAS_TEXCO_UV2, attribs.layer[i].glindex);
+				else
+					ras->SetAttrib(RAS_IRasterizer::RAS_TEXCO_UV1, attribs.layer[i].glindex);
+			}
+			else if(attribs.layer[i].type == CD_TANGENT)
+				ras->SetAttrib(RAS_IRasterizer::RAS_TEXTANGENT, attribs.layer[i].glindex);
+			else if(attribs.layer[i].type == CD_ORCO)
+				ras->SetAttrib(RAS_IRasterizer::RAS_TEXCO_ORCO, attribs.layer[i].glindex);
+			else if(attribs.layer[i].type == CD_NORMAL)
+				ras->SetAttrib(RAS_IRasterizer::RAS_TEXCO_NORM, attribs.layer[i].glindex);
+			else if(attribs.layer[i].type == CD_MCOL)
+				ras->SetAttrib(RAS_IRasterizer::RAS_TEXCO_VCOL, attribs.layer[i].glindex);
+			else
+				ras->SetAttrib(RAS_IRasterizer::RAS_TEXCO_DISABLE, attribs.layer[i].glindex);
+		}
+
+		ras->EnableTextures(true);
+	}
+	else
+		ras->EnableTextures(false);
+#endif
+}
+
+void BL_BlenderShader::Update( const KX_MeshSlot & ms, RAS_IRasterizer* rasty )
+{
+#ifdef BLENDER_GLSL
+	float obmat[4][4], viewmat[4][4], viewinvmat[4][4];
+
+	if(!mGPUMat || !mBound)
+		return;
+
+	MT_Matrix4x4 model;
+	model.setValue(ms.m_OpenGLMatrix);
+	MT_Matrix4x4 view;
+	rasty->GetViewMatrix(view);
+
+	model.getValue((float*)obmat);
+	view.getValue((float*)viewmat);
+
+	view.invert();
+	view.getValue((float*)viewinvmat);
+
+	GPU_material_bind_uniforms(mGPUMat, obmat, viewmat, viewinvmat);
+#endif
+}
+
+bool BL_BlenderShader::Equals(BL_BlenderShader *blshader)
+{
+#ifdef BLENDER_GLSL
+	/* to avoid unneeded state switches */
+	return (blshader && mGPUMat == blshader->mGPUMat && mLightLayer == blshader->mLightLayer);
+#else
+	return true;
+#endif
+}
+
+// eof
diff --git a/source/gameengine/Ketsji/BL_BlenderShader.h b/source/gameengine/Ketsji/BL_BlenderShader.h
new file mode 100644
index 00000000000..b758d1a9cba
--- /dev/null
+++ b/source/gameengine/Ketsji/BL_BlenderShader.h
@@ -0,0 +1,49 @@
+
+#ifndef __BL_GPUSHADER_H__
+#define __BL_GPUSHADER_H__
+
+#ifdef BLENDER_GLSL
+#include "GPU_material.h"
+#endif
+
+#include "MT_Matrix4x4.h"
+#include "MT_Matrix3x3.h"
+#include "MT_Tuple2.h"
+#include "MT_Tuple3.h"
+#include "MT_Tuple4.h"
+
+#include "RAS_IPolygonMaterial.h"
+
+struct Material;
+class BL_Material;
+
+#define BL_MAX_ATTRIB	16
+
+/**
+ * BL_BlenderShader
+ *  Blender GPU shader material
+ */
+class BL_BlenderShader
+{
+private:
+#ifdef BLENDER_GLSL
+	GPUMaterial		*mGPUMat;
+#endif
+	bool			mBound;
+	int				mLightLayer;
+
+public:
+	BL_BlenderShader(struct Material *ma, int lightlayer);
+	virtual ~BL_BlenderShader();
+
+	const bool			Ok()const;
+	void				SetProg(bool enable);
+
+	int GetAttribNum();
+	void SetAttribs(class RAS_IRasterizer* ras, const BL_Material *mat);
+	void Update(const class KX_MeshSlot & ms, class RAS_IRasterizer* rasty);
+
+	bool Equals(BL_BlenderShader *blshader);
+};
+
+#endif//__BL_GPUSHADER_H__
diff --git a/source/gameengine/Ketsji/BL_Material.cpp b/source/gameengine/Ketsji/BL_Material.cpp
index 7ed2da590a9..7e3d6984f19 100644
--- a/source/gameengine/Ketsji/BL_Material.cpp
+++ b/source/gameengine/Ketsji/BL_Material.cpp
@@ -34,6 +34,7 @@ BL_Material::BL_Material()
 	rgb[3] = 0;
 	IdMode = 0;
 	ras_mode = 0;
+	glslmat = 0;
 	tile = 0;
 	matname = "NoMaterial";
 	matcolor[0] = 0.5f;
@@ -104,7 +105,8 @@ void BL_Material::GetConversionRGB(unsigned int *nrgb) {
 	*nrgb   = rgb[3];
 }
 
-void BL_Material::SetConversionUV(MT_Point2 *nuv) {
+void BL_Material::SetConversionUV(const STR_String& name, MT_Point2 *nuv) {
+	uvName = name;
 	uv[0] = *nuv++;
 	uv[1] = *nuv++;
 	uv[2] = *nuv++;
@@ -117,7 +119,8 @@ void BL_Material::GetConversionUV(MT_Point2 *nuv){
 	*nuv++ = uv[2];
 	*nuv   = uv[3];
 }
-void BL_Material::SetConversionUV2(MT_Point2 *nuv) {
+void BL_Material::SetConversionUV2(const STR_String& name, MT_Point2 *nuv) {
+	uv2Name = name;
 	uv2[0] = *nuv++;
 	uv2[1] = *nuv++;
 	uv2[2] = *nuv++;
diff --git a/source/gameengine/Ketsji/BL_Material.h b/source/gameengine/Ketsji/BL_Material.h
index 8be91316237..568f7e171de 100644
--- a/source/gameengine/Ketsji/BL_Material.h
+++ b/source/gameengine/Ketsji/BL_Material.h
@@ -20,7 +20,7 @@ struct EnvMap;
 	although the more you add the slower the search time will be.
 	we will go for three, which should be enough
 */
-#define MAXTEX			3//match in RAS_TexVert & RAS_OpenGLRasterizer
+#define MAXTEX			3	//match in RAS_TexVert & RAS_OpenGLRasterizer
 
 // different mapping modes
 class BL_Mapping
@@ -47,6 +47,7 @@ public:
 
 	int IdMode;
 	unsigned int ras_mode;
+	bool glslmat;
 
 	STR_String texname[MAXTEX];
 	unsigned int flag[MAXTEX];
@@ -82,13 +83,16 @@ public:
 	MT_Point2 uv[4];
 	MT_Point2 uv2[4];
 
+	STR_String uvName;
+	STR_String uv2Name;
+
 	void SetConversionRGB(unsigned int *rgb);
 	void GetConversionRGB(unsigned int *rgb);
 
-	void SetConversionUV(MT_Point2 *uv);
+	void SetConversionUV(const STR_String& name, MT_Point2 *uv);
 	void GetConversionUV(MT_Point2 *uv);
 
-	void SetConversionUV2(MT_Point2 *uv);
+	void SetConversionUV2(const STR_String& name, MT_Point2 *uv);
 	void GetConversionUV2(MT_Point2 *uv);
 
 	void SetSharedMaterial(bool v);
diff --git a/source/gameengine/Ketsji/BL_Shader.cpp b/source/gameengine/Ketsji/BL_Shader.cpp
index 105a87e767b..f6f9a29b0e2 100644
--- a/source/gameengine/Ketsji/BL_Shader.cpp
+++ b/source/gameengine/Ketsji/BL_Shader.cpp
@@ -1,21 +1,5 @@
 
-
-#ifdef WIN32
-#include <windows.h>
-#endif // WIN32
-#ifdef __APPLE__
-#define GL_GLEXT_LEGACY 1
-#include <OpenGL/gl.h>
-#include <OpenGL/glu.h>
-#else
-#include <GL/gl.h>
-/* #if defined(__sun__) && !defined(__sparc__)
-#include <mesa/glu.h>
-#else
-*/
-#include <GL/glu.h>
-/* #endif */
-#endif
+#include "GL/glew.h"
 
 #include <iostream>
 #include "BL_Shader.h"
@@ -31,7 +15,6 @@
 #include "RAS_MeshObject.h"
 #include "RAS_IRasterizer.h"
 
-//using namespace bgl;
 #define spit(x) std::cout << x << std::endl;
 
 #define SORT_UNIFORMS 1
@@ -46,7 +29,7 @@ BL_Uniform::BL_Uniform(int data_size)
 	mDataLen(data_size)
 {
 #ifdef SORT_UNIFORMS
-	MT_assert(mDataLen <= UNIFORM_MAX_LEN);
+	MT_assert((int)mDataLen <= UNIFORM_MAX_LEN);
 	mData = (void*)MEM_mallocN(mDataLen, "shader-uniform-alloc");
 #endif
 }
@@ -63,7 +46,6 @@ BL_Uniform::~BL_Uniform()
 
 void BL_Uniform::Apply(class BL_Shader *shader)
 {
-#ifdef GL_ARB_shader_objects
 #ifdef SORT_UNIFORMS
 	MT_assert(mType > UNI_NONE && mType < UNI_MAX && mData);
 
@@ -74,48 +56,47 @@ void BL_Uniform::Apply(class BL_Shader *shader)
 	{
 	case UNI_FLOAT: {
 			float *f = (float*)mData;
-			bgl::blUniform1fARB(mLoc,(GLfloat)*f);
+			glUniform1fARB(mLoc,(GLfloat)*f);
 		}break;
 	case UNI_INT: {
 			int *f = (int*)mData;
-			bgl::blUniform1iARB(mLoc, (GLint)*f);
+			glUniform1iARB(mLoc, (GLint)*f);
 		}break;
 	case UNI_FLOAT2: {
 			float *f = (float*)mData;
-			bgl::blUniform2fvARB(mLoc,1, (GLfloat*)f);
+			glUniform2fvARB(mLoc,1, (GLfloat*)f);
 		}break;
 	case UNI_FLOAT3: {
 			float *f = (float*)mData;
-			bgl::blUniform3fvARB(mLoc,1,(GLfloat*)f);
+			glUniform3fvARB(mLoc,1,(GLfloat*)f);
 		}break;
 	case UNI_FLOAT4: {
 			float *f = (float*)mData;
-			bgl::blUniform4fvARB(mLoc,1,(GLfloat*)f);
+			glUniform4fvARB(mLoc,1,(GLfloat*)f);
 		}break;
 	case UNI_INT2: {
 			int *f = (int*)mData;
-			bgl::blUniform2ivARB(mLoc,1,(GLint*)f);
+			glUniform2ivARB(mLoc,1,(GLint*)f);
 		}break; 
 	case UNI_INT3: {
 			int *f = (int*)mData;
-			bgl::blUniform3ivARB(mLoc,1,(GLint*)f);
+			glUniform3ivARB(mLoc,1,(GLint*)f);
 		}break; 
 	case UNI_INT4: {
 			int *f = (int*)mData;
-			bgl::blUniform4ivARB(mLoc,1,(GLint*)f);
+			glUniform4ivARB(mLoc,1,(GLint*)f);
 		}break;
 	case UNI_MAT4: {
 			float *f = (float*)mData;
-			bgl::blUniformMatrix4fvARB(mLoc, 1, mTranspose?GL_TRUE:GL_FALSE,(GLfloat*)f);
+			glUniformMatrix4fvARB(mLoc, 1, mTranspose?GL_TRUE:GL_FALSE,(GLfloat*)f);
 		}break;
 	case UNI_MAT3: {
 			float *f = (float*)mData;
-			bgl::blUniformMatrix3fvARB(mLoc, 1, mTranspose?GL_TRUE:GL_FALSE,(GLfloat*)f);
+			glUniformMatrix3fvARB(mLoc, 1, mTranspose?GL_TRUE:GL_FALSE,(GLfloat*)f);
 		}break;
 	}
 	mDirty = false;
 #endif
-#endif
 }
 
 void BL_Uniform::SetData(int location, int type,bool transpose)
@@ -144,17 +125,14 @@ BL_Shader::BL_Shader(PyTypeObject *T)
 	mError(0),
 	mDirty(true)
 {
-	// if !RAS_EXT_support._ARB_shader_objects this class will not be used
+	// if !GLEW_ARB_shader_objects this class will not be used
 	//for (int i=0; i<MAXTEX; i++) {
 	//	mSampler[i] = BL_Sampler();
 	//}
 }
 
-using namespace bgl;
-
 BL_Shader::~BL_Shader()
 {
-#ifdef GL_ARB_shader_objects
 	//for (int i=0; i<MAXTEX; i++){
 	//	if(mSampler[i].mOwn) {
 	//		if(mSampler[i].mTexture)
@@ -164,14 +142,13 @@ BL_Shader::~BL_Shader()
 	ClearUniforms();
 
 	if( mShader ) {
-		bgl::blDeleteObjectARB(mShader);
+		glDeleteObjectARB(mShader);
 		mShader = 0;
 	}
 	vertProg	= 0;
 	fragProg	= 0;
 	mOk			= 0;
-	bgl::blUseProgramObjectARB(0);
-#endif//GL_ARB_shader_objects
+	glUseProgramObjectARB(0);
 }
 
 void BL_Shader::ClearUniforms()
@@ -266,8 +243,6 @@ void BL_Shader::UnloadShader()
 
 bool BL_Shader::LinkProgram()
 {
-#ifdef GL_ARB_shader_objects
-
 	int vertlen = 0, fraglen=0, proglen=0;
 	int vertstatus=0, fragstatus=0, progstatus=0;
 	unsigned int tmpVert=0, tmpFrag=0, tmpProg=0;
@@ -281,25 +256,25 @@ bool BL_Shader::LinkProgram()
 		spit("Invalid GLSL sources");
 		return false;
 	}
-	if( !RAS_EXT_support._ARB_fragment_shader) {
+	if( !GLEW_ARB_fragment_shader) {
 		spit("Fragment shaders not supported");
 		return false;
 	}
-	if( !RAS_EXT_support._ARB_vertex_shader) {
+	if( !GLEW_ARB_vertex_shader) {
 		spit("Vertex shaders not supported");
 		return false;
 	}
 	
 	// -- vertex shader ------------------
-	tmpVert = bgl::blCreateShaderObjectARB(GL_VERTEX_SHADER_ARB);
-	bgl::blShaderSourceARB(tmpVert, 1, (const char**)&vertProg, 0);
-	bgl::blCompileShaderARB(tmpVert);
-	bgl::blGetObjectParameterivARB(tmpVert, GL_OBJECT_INFO_LOG_LENGTH_ARB,(GLint*) &vertlen);
+	tmpVert = glCreateShaderObjectARB(GL_VERTEX_SHADER_ARB);
+	glShaderSourceARB(tmpVert, 1, (const char**)&vertProg, 0);
+	glCompileShaderARB(tmpVert);
+	glGetObjectParameterivARB(tmpVert, GL_OBJECT_INFO_LOG_LENGTH_ARB,(GLint*) &vertlen);
 	
 	// print info if any
 	if( vertlen > 0 && vertlen < MAX_LOG_LEN){
 		logInf = (char*)MEM_mallocN(vertlen, "vert-log");
-		bgl::blGetInfoLogARB(tmpVert, vertlen, (GLsizei*)&char_len, logInf);
+		glGetInfoLogARB(tmpVert, vertlen, (GLsizei*)&char_len, logInf);
 		if(char_len >0) {
 			spit("---- Vertex Shader Error ----");
 			spit(logInf);
@@ -308,20 +283,20 @@ bool BL_Shader::LinkProgram()
 		logInf=0;
 	}
 	// check for compile errors
-	bgl::blGetObjectParameterivARB(tmpVert, GL_OBJECT_COMPILE_STATUS_ARB,(GLint*)&vertstatus);
+	glGetObjectParameterivARB(tmpVert, GL_OBJECT_COMPILE_STATUS_ARB,(GLint*)&vertstatus);
 	if(!vertstatus) {
 		spit("---- Vertex shader failed to compile ----");
 		goto programError;
 	}
 
 	// -- fragment shader ----------------
-	tmpFrag = bgl::blCreateShaderObjectARB(GL_FRAGMENT_SHADER_ARB);
-	bgl::blShaderSourceARB(tmpFrag, 1,(const char**)&fragProg, 0);
-	bgl::blCompileShaderARB(tmpFrag);
-	bgl::blGetObjectParameterivARB(tmpFrag, GL_OBJECT_INFO_LOG_LENGTH_ARB, (GLint*) &fraglen);
+	tmpFrag = glCreateShaderObjectARB(GL_FRAGMENT_SHADER_ARB);
+	glShaderSourceARB(tmpFrag, 1,(const char**)&fragProg, 0);
+	glCompileShaderARB(tmpFrag);
+	glGetObjectParameterivARB(tmpFrag, GL_OBJECT_INFO_LOG_LENGTH_ARB, (GLint*) &fraglen);
 	if(fraglen >0 && fraglen < MAX_LOG_LEN){
 		logInf = (char*)MEM_mallocN(fraglen, "frag-log");
-		bgl::blGetInfoLogARB(tmpFrag, fraglen,(GLsizei*) &char_len, logInf);
+		glGetInfoLogARB(tmpFrag, fraglen,(GLsizei*) &char_len, logInf);
 		if(char_len >0) {
 			spit("---- Fragment Shader Error ----");
 			spit(logInf);
@@ -330,7 +305,7 @@ bool BL_Shader::LinkProgram()
 		logInf=0;
 	}
 
-	bgl::blGetObjectParameterivARB(tmpFrag, GL_OBJECT_COMPILE_STATUS_ARB, (GLint*) &fragstatus);
+	glGetObjectParameterivARB(tmpFrag, GL_OBJECT_COMPILE_STATUS_ARB, (GLint*) &fragstatus);
 	if(!fragstatus){
 		spit("---- Fragment shader failed to compile ----");
 		goto programError;
@@ -339,17 +314,17 @@ bool BL_Shader::LinkProgram()
 	
 	// -- program ------------------------
 	//  set compiled vert/frag shader & link
-	tmpProg = bgl::blCreateProgramObjectARB();
-	bgl::blAttachObjectARB(tmpProg, tmpVert);
-	bgl::blAttachObjectARB(tmpProg, tmpFrag);
-	bgl::blLinkProgramARB(tmpProg);
-	bgl::blGetObjectParameterivARB(tmpProg, GL_OBJECT_INFO_LOG_LENGTH_ARB, (GLint*) &proglen);
-	bgl::blGetObjectParameterivARB(tmpProg, GL_OBJECT_LINK_STATUS_ARB, (GLint*) &progstatus);
+	tmpProg = glCreateProgramObjectARB();
+	glAttachObjectARB(tmpProg, tmpVert);
+	glAttachObjectARB(tmpProg, tmpFrag);
+	glLinkProgramARB(tmpProg);
+	glGetObjectParameterivARB(tmpProg, GL_OBJECT_INFO_LOG_LENGTH_ARB, (GLint*) &proglen);
+	glGetObjectParameterivARB(tmpProg, GL_OBJECT_LINK_STATUS_ARB, (GLint*) &progstatus);
 	
 
 	if(proglen > 0 && proglen < MAX_LOG_LEN) {
 		logInf = (char*)MEM_mallocN(proglen, "prog-log");
-		bgl::blGetInfoLogARB(tmpProg, proglen, (GLsizei*)&char_len, logInf);
+		glGetInfoLogARB(tmpProg, proglen, (GLsizei*)&char_len, logInf);
 		if(char_len >0) {
 			spit("---- GLSL Program ----");
 			spit(logInf);
@@ -365,24 +340,24 @@ bool BL_Shader::LinkProgram()
 
 	// set
 	mShader = tmpProg;
-	bgl::blDeleteObjectARB(tmpVert);
-	bgl::blDeleteObjectARB(tmpFrag);
+	glDeleteObjectARB(tmpVert);
+	glDeleteObjectARB(tmpFrag);
 	mOk		= 1;
 	mError = 0;
 	return true;
 
 programError:
 	if(tmpVert) {
-		bgl::blDeleteObjectARB(tmpVert);
+		glDeleteObjectARB(tmpVert);
 		tmpVert=0;
 	}
 	if(tmpFrag) {
-		bgl::blDeleteObjectARB(tmpFrag);
+		glDeleteObjectARB(tmpFrag);
 		tmpFrag=0;
 	}
 
 	if(tmpProg) {
-		bgl::blDeleteObjectARB(tmpProg);
+		glDeleteObjectARB(tmpProg);
 		tmpProg=0;
 	}
 
@@ -390,9 +365,6 @@ programError:
 	mUse	= 0;
 	mError	= 1;
 	return false;
-#else
-	return false;
-#endif//GL_ARB_shader_objects
 }
 
 const char *BL_Shader::GetVertPtr()
@@ -428,15 +400,13 @@ unsigned int BL_Shader::GetProg()
 
 void BL_Shader::SetSampler(int loc, int unit)
 {
-#ifdef GL_ARB_shader_objects
-	if( RAS_EXT_support._ARB_fragment_shader &&
-		RAS_EXT_support._ARB_vertex_shader &&
-		RAS_EXT_support._ARB_shader_objects 
+	if( GLEW_ARB_fragment_shader &&
+		GLEW_ARB_vertex_shader &&
+		GLEW_ARB_shader_objects 
 		)
 	{
-		bgl::blUniform1iARB(loc, unit);
+		glUniform1iARB(loc, unit);
 	}
-#endif
 }
 //
 //void BL_Shader::InitializeSampler(int unit, BL_Texture* texture)
@@ -449,31 +419,28 @@ void BL_Shader::SetSampler(int loc, int unit)
 
 void BL_Shader::SetProg(bool enable)
 {
-#ifdef GL_ARB_shader_objects
-	if( RAS_EXT_support._ARB_fragment_shader &&
-		RAS_EXT_support._ARB_vertex_shader &&
-		RAS_EXT_support._ARB_shader_objects 
+	if( GLEW_ARB_fragment_shader &&
+		GLEW_ARB_vertex_shader &&
+		GLEW_ARB_shader_objects 
 		)
 	{
 		if(	mShader != 0 && mOk && enable) {
-			bgl::blUseProgramObjectARB(mShader);
+			glUseProgramObjectARB(mShader);
 		}
 		else {
-			bgl::blUseProgramObjectARB(0);	
+			glUseProgramObjectARB(0);	
 		}
 	}
-#endif
 }
 
 void BL_Shader::Update( const KX_MeshSlot & ms, RAS_IRasterizer* rasty )
 {
-#ifdef GL_ARB_shader_objects
 	if(!Ok() || !mPreDef.size()) 
 		return;
 
-	if( RAS_EXT_support._ARB_fragment_shader &&
-		RAS_EXT_support._ARB_vertex_shader &&
-		RAS_EXT_support._ARB_shader_objects 
+	if( GLEW_ARB_fragment_shader &&
+		GLEW_ARB_vertex_shader &&
+		GLEW_ARB_shader_objects 
 		)
 	{
 		MT_Matrix4x4 model;
@@ -578,210 +545,185 @@ void BL_Shader::Update( const KX_MeshSlot & ms, RAS_IRasterizer* rasty )
 			}
 		}
 	}
-#endif
 }
 
 
 int BL_Shader::GetAttribLocation(const STR_String& name)
 {
-#ifdef GL_ARB_shader_objects
-	if( RAS_EXT_support._ARB_fragment_shader &&
-		RAS_EXT_support._ARB_vertex_shader &&
-		RAS_EXT_support._ARB_shader_objects 
+	if( GLEW_ARB_fragment_shader &&
+		GLEW_ARB_vertex_shader &&
+		GLEW_ARB_shader_objects 
 		)
 	{
-		return bgl::blGetAttribLocationARB(mShader, name.ReadPtr());
+		return glGetAttribLocationARB(mShader, name.ReadPtr());
 	}
-#endif
+
 	return -1;
 }
 
 void BL_Shader::BindAttribute(const STR_String& attr, int loc)
 {
-#ifdef GL_ARB_shader_objects
-	if( RAS_EXT_support._ARB_fragment_shader &&
-		RAS_EXT_support._ARB_vertex_shader &&
-		RAS_EXT_support._ARB_shader_objects 
+	if( GLEW_ARB_fragment_shader &&
+		GLEW_ARB_vertex_shader &&
+		GLEW_ARB_shader_objects 
 		)
 	{
-		bgl::blBindAttribLocationARB(mShader, loc, attr.ReadPtr());
+		glBindAttribLocationARB(mShader, loc, attr.ReadPtr());
 	}
-#endif
 }
 
 int BL_Shader::GetUniformLocation(const STR_String& name)
 {
-#ifdef GL_ARB_shader_objects
-	if( RAS_EXT_support._ARB_fragment_shader &&
-		RAS_EXT_support._ARB_vertex_shader &&
-		RAS_EXT_support._ARB_shader_objects 
+	if( GLEW_ARB_fragment_shader &&
+		GLEW_ARB_vertex_shader &&
+		GLEW_ARB_shader_objects 
 		)
 	{
 		MT_assert(mShader!=0);
-		int location = bgl::blGetUniformLocationARB(mShader, name.ReadPtr());
+		int location = glGetUniformLocationARB(mShader, name.ReadPtr());
 		if(location == -1)
 			spit("Invalid uniform value: " << name.ReadPtr() << ".");
 		return location;
 	}
-#endif
+
 	return -1;
 }
 
 void BL_Shader::SetUniform(int uniform, const MT_Tuple2& vec)
 {
-#ifdef GL_ARB_shader_objects
-	if( RAS_EXT_support._ARB_fragment_shader &&
-		RAS_EXT_support._ARB_vertex_shader &&
-		RAS_EXT_support._ARB_shader_objects 
+	if( GLEW_ARB_fragment_shader &&
+		GLEW_ARB_vertex_shader &&
+		GLEW_ARB_shader_objects 
 		)
 	{
 		float value[2];
 		vec.getValue(value);
-		bgl::blUniform2fvARB(uniform, 1, value);
+		glUniform2fvARB(uniform, 1, value);
 	}
-#endif
 
 }
 
 void BL_Shader::SetUniform(int uniform, const MT_Tuple3& vec)
 {
-#ifdef GL_ARB_shader_objects
-	if( RAS_EXT_support._ARB_fragment_shader &&
-		RAS_EXT_support._ARB_vertex_shader &&
-		RAS_EXT_support._ARB_shader_objects 
+	if( GLEW_ARB_fragment_shader &&
+		GLEW_ARB_vertex_shader &&
+		GLEW_ARB_shader_objects 
 		)
 	{	
 		float value[3];
 		vec.getValue(value);
-		bgl::blUniform3fvARB(uniform, 1, value);
+		glUniform3fvARB(uniform, 1, value);
 	}
-#endif
 }
 
 void BL_Shader::SetUniform(int uniform, const MT_Tuple4& vec)
 {
-#ifdef GL_ARB_shader_objects
-	if( RAS_EXT_support._ARB_fragment_shader &&
-		RAS_EXT_support._ARB_vertex_shader &&
-		RAS_EXT_support._ARB_shader_objects 
+	if( GLEW_ARB_fragment_shader &&
+		GLEW_ARB_vertex_shader &&
+		GLEW_ARB_shader_objects 
 		)
 	{
 		float value[4];
 		vec.getValue(value);
-		bgl::blUniform4fvARB(uniform, 1, value);
+		glUniform4fvARB(uniform, 1, value);
 	}
-#endif
 }
 
 void BL_Shader::SetUniform(int uniform, const unsigned int& val)
 {
-#ifdef GL_ARB_shader_objects
-	if( RAS_EXT_support._ARB_fragment_shader &&
-		RAS_EXT_support._ARB_vertex_shader &&
-		RAS_EXT_support._ARB_shader_objects 
+	if( GLEW_ARB_fragment_shader &&
+		GLEW_ARB_vertex_shader &&
+		GLEW_ARB_shader_objects 
 		)
 	{
-		bgl::blUniform1iARB(uniform, val);
+		glUniform1iARB(uniform, val);
 	}
-#endif
 }
 
 void BL_Shader::SetUniform(int uniform, const int val)
 {
-#ifdef GL_ARB_shader_objects
-	if( RAS_EXT_support._ARB_fragment_shader &&
-		RAS_EXT_support._ARB_vertex_shader &&
-		RAS_EXT_support._ARB_shader_objects 
+	if( GLEW_ARB_fragment_shader &&
+		GLEW_ARB_vertex_shader &&
+		GLEW_ARB_shader_objects 
 		)
 	{
-		bgl::blUniform1iARB(uniform, val);
+		glUniform1iARB(uniform, val);
 	}
-#endif
 }
 
 void BL_Shader::SetUniform(int uniform, const float& val)
 {
-#ifdef GL_ARB_shader_objects
-	if( RAS_EXT_support._ARB_fragment_shader &&
-		RAS_EXT_support._ARB_vertex_shader &&
-		RAS_EXT_support._ARB_shader_objects 
+	if( GLEW_ARB_fragment_shader &&
+		GLEW_ARB_vertex_shader &&
+		GLEW_ARB_shader_objects 
 		)
 	{
-		bgl::blUniform1fARB(uniform, val);
+		glUniform1fARB(uniform, val);
 	}
-#endif
 }
 
 void BL_Shader::SetUniform(int uniform, const MT_Matrix4x4& vec, bool transpose)
 {
-#ifdef GL_ARB_shader_objects
-	if( RAS_EXT_support._ARB_fragment_shader &&
-		RAS_EXT_support._ARB_vertex_shader &&
-		RAS_EXT_support._ARB_shader_objects 
+	if( GLEW_ARB_fragment_shader &&
+		GLEW_ARB_vertex_shader &&
+		GLEW_ARB_shader_objects 
 		)
 	{
 		float value[16];
 		vec.getValue(value);
-		bgl::blUniformMatrix4fvARB(uniform, 1, transpose?GL_TRUE:GL_FALSE, value);
+		glUniformMatrix4fvARB(uniform, 1, transpose?GL_TRUE:GL_FALSE, value);
 	}
-#endif
 }
 
 void BL_Shader::SetUniform(int uniform, const MT_Matrix3x3& vec, bool transpose)
 {
-#ifdef GL_ARB_shader_objects
-	if( RAS_EXT_support._ARB_fragment_shader &&
-		RAS_EXT_support._ARB_vertex_shader &&
-		RAS_EXT_support._ARB_shader_objects 
+	if( GLEW_ARB_fragment_shader &&
+		GLEW_ARB_vertex_shader &&
+		GLEW_ARB_shader_objects 
 		)
 	{
 		float value[9];
 		value[0] = (float)vec[0][0]; value[1] = (float)vec[1][0]; value[2] = (float)vec[2][0]; 
 		value[3] = (float)vec[0][1]; value[4] = (float)vec[1][1]; value[5] = (float)vec[2][1]; 
 		value[6] = (float)vec[0][2]; value[7] = (float)vec[1][2]; value[7] = (float)vec[2][2]; 
-		bgl::blUniformMatrix3fvARB(uniform, 1, transpose?GL_TRUE:GL_FALSE, value);
+		glUniformMatrix3fvARB(uniform, 1, transpose?GL_TRUE:GL_FALSE, value);
 	}
-#endif
 }
 
 void BL_Shader::SetUniform(int uniform, const float* val, int len)
 {
-#ifdef GL_ARB_shader_objects
-	if( RAS_EXT_support._ARB_fragment_shader &&
-		RAS_EXT_support._ARB_vertex_shader &&
-		RAS_EXT_support._ARB_shader_objects 
+	if( GLEW_ARB_fragment_shader &&
+		GLEW_ARB_vertex_shader &&
+		GLEW_ARB_shader_objects 
 		)
 	{
 		if(len == 2) 
-			bgl::blUniform2fvARB(uniform, 1,(GLfloat*)val);
+			glUniform2fvARB(uniform, 1,(GLfloat*)val);
 		else if (len == 3)
-			bgl::blUniform3fvARB(uniform, 1,(GLfloat*)val);
+			glUniform3fvARB(uniform, 1,(GLfloat*)val);
 		else if (len == 4)
-			bgl::blUniform4fvARB(uniform, 1,(GLfloat*)val);
+			glUniform4fvARB(uniform, 1,(GLfloat*)val);
 		else
 			MT_assert(0);
 	}
-#endif
 }
 
 void BL_Shader::SetUniform(int uniform, const int* val, int len)
 {
-#ifdef GL_ARB_shader_objects
-	if( RAS_EXT_support._ARB_fragment_shader &&
-		RAS_EXT_support._ARB_vertex_shader &&
-		RAS_EXT_support._ARB_shader_objects 
+	if( GLEW_ARB_fragment_shader &&
+		GLEW_ARB_vertex_shader &&
+		GLEW_ARB_shader_objects 
 		)
 	{
 		if(len == 2) 
-			bgl::blUniform2ivARB(uniform, 1, (GLint*)val);
+			glUniform2ivARB(uniform, 1, (GLint*)val);
 		else if (len == 3)
-			bgl::blUniform3ivARB(uniform, 1, (GLint*)val);
+			glUniform3ivARB(uniform, 1, (GLint*)val);
 		else if (len == 4)
-			bgl::blUniform4ivARB(uniform, 1, (GLint*)val);
+			glUniform4ivARB(uniform, 1, (GLint*)val);
 		else
 			MT_assert(0);
 	}
-#endif
 }
 
 
@@ -849,7 +791,6 @@ PyParentObject BL_Shader::Parents[] = {
 
 KX_PYMETHODDEF_DOC( BL_Shader, setSource," setSource(vertexProgram, fragmentProgram)" )
 {
-#ifdef GL_ARB_shader_objects
 	if(mShader !=0 && mOk  )
 	{
 		// already set...
@@ -862,7 +803,7 @@ KX_PYMETHODDEF_DOC( BL_Shader, setSource," setSource(vertexProgram, fragmentProg
 		vertProg = v;
 		fragProg = f;
 		if( LinkProgram() ) {
-			bgl::blUseProgramObjectARB( mShader );
+			glUseProgramObjectARB( mShader );
 			mUse = apply!=0;
 			Py_Return;
 		}
@@ -872,23 +813,18 @@ KX_PYMETHODDEF_DOC( BL_Shader, setSource," setSource(vertexProgram, fragmentProg
 		Py_Return;
 	}
 	return NULL;
-#else
-	Py_Return;
-#endif
 }
 
 
 KX_PYMETHODDEF_DOC( BL_Shader, delSource, "delSource( )" )
 {
-#ifdef GL_ARB_shader_objects
 	ClearUniforms();
-	bgl::blUseProgramObjectARB(0);
+	glUseProgramObjectARB(0);
 
-	bgl::blDeleteObjectARB(mShader);
+	glDeleteObjectARB(mShader);
 	mShader		= 0;
 	mOk			= 0;
 	mUse		= 0;
-#endif
 	Py_Return;
 }
 
@@ -909,7 +845,6 @@ KX_PYMETHODDEF_DOC( BL_Shader, getFragmentProg ,"getFragmentProg( )" )
 
 KX_PYMETHODDEF_DOC( BL_Shader, validate, "validate()")
 {
-#ifdef GL_ARB_shader_objects
 	if(mError) {
 		Py_INCREF(Py_None);
 		return Py_None;
@@ -919,15 +854,15 @@ KX_PYMETHODDEF_DOC( BL_Shader, validate, "validate()")
 		return NULL;
 	}
 	int stat = 0;
-	bgl::blValidateProgramARB(mShader);
-	bgl::blGetObjectParameterivARB(mShader, GL_OBJECT_VALIDATE_STATUS_ARB,(GLint*) &stat);
+	glValidateProgramARB(mShader);
+	glGetObjectParameterivARB(mShader, GL_OBJECT_VALIDATE_STATUS_ARB,(GLint*) &stat);
 
 
 	if(stat > 0 && stat < MAX_LOG_LEN) {
 		int char_len=0;
 		char *logInf = (char*)MEM_mallocN(stat, "validate-log");
 
-		bgl::blGetInfoLogARB(mShader, stat,(GLsizei*) &char_len, logInf);
+		glGetInfoLogARB(mShader, stat,(GLsizei*) &char_len, logInf);
 		if(char_len >0) {
 			spit("---- GLSL Validation ----");
 			spit(logInf);
@@ -935,7 +870,6 @@ KX_PYMETHODDEF_DOC( BL_Shader, validate, "validate()")
 		MEM_freeN(logInf);
 		logInf=0;
 	}
-#endif//GL_ARB_shader_objects
 	Py_Return;
 }
 
@@ -1412,7 +1346,6 @@ KX_PYMETHODDEF_DOC( BL_Shader, setUniformMatrix3,
 
 KX_PYMETHODDEF_DOC( BL_Shader, setAttrib, "setAttrib(enum)" )
 {
-#ifdef GL_ARB_shader_objects
 	if(mError) {
 		Py_INCREF(Py_None);
 		return Py_None;
@@ -1424,11 +1357,10 @@ KX_PYMETHODDEF_DOC( BL_Shader, setAttrib, "setAttrib(enum)" )
 			return NULL;
 		}
 		mAttr=SHD_TANGENT;
-		bgl::blUseProgramObjectARB(mShader);
-		bgl::blBindAttribLocationARB(mShader, mAttr, "Tangent");
+		glUseProgramObjectARB(mShader);
+		glBindAttribLocationARB(mShader, mAttr, "Tangent");
 		Py_Return;
 	}
-#endif
 	return NULL;
 }
 
diff --git a/source/gameengine/Ketsji/BL_Texture.cpp b/source/gameengine/Ketsji/BL_Texture.cpp
index 687b1af957d..f24ef4322f0 100644
--- a/source/gameengine/Ketsji/BL_Texture.cpp
+++ b/source/gameengine/Ketsji/BL_Texture.cpp
@@ -1,19 +1,6 @@
 // ------------------------------------
-#ifdef WIN32
-#include <windows.h>
-#endif // WIN32
-#ifdef __APPLE__
-#define GL_GLEXT_LEGACY 1
-#include <OpenGL/gl.h>
-#include <OpenGL/glu.h>
-#else
-#include <GL/gl.h>
-/* #if defined(__sun__) && !defined(__sparc__)
-#include <mesa/glu.h>
-#else */
-#include <GL/glu.h>
-/* #endif */
-#endif
+
+#include "GL/glew.h"
 
 #include <iostream>
 #include <map>
@@ -30,15 +17,11 @@
 #include "BLI_blenlib.h"
 
 #include "RAS_OpenGLRasterizer/RAS_GLExtensionManager.h"
-#include "RAS_OpenGLRasterizer/ARB_multitexture.h"
 #include "RAS_ICanvas.h"
 #include "RAS_Rect.h"
 
 #include "KX_GameObject.h"
 
-
-using namespace bgl;
-
 #define spit(x) std::cout << x << std::endl;
 
 #include "MEM_guardedalloc.h"
@@ -220,9 +203,7 @@ void BL_Texture::InitNonPow2Tex(unsigned int *pix,int x,int y,bool mipmap)
 
 bool BL_Texture::InitCubeMap(int unit,  EnvMap *cubemap)
 {
-#ifdef GL_ARB_texture_cube_map
-
-	if (!RAS_EXT_support._ARB_texture_cube_map)
+	if (!GLEW_ARB_texture_cube_map)
 	{
 		spit("cubemaps not supported");
 		mOk = false;
@@ -312,9 +293,8 @@ bool BL_Texture::InitCubeMap(int unit,  EnvMap *cubemap)
 	glTexParameteri( GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
 	glTexParameteri( GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_WRAP_S,	 GL_CLAMP_TO_EDGE );
 	glTexParameteri( GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_WRAP_T,	 GL_CLAMP_TO_EDGE );
-	#ifdef GL_VERSION_1_2
-	glTexParameteri( GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_WRAP_R,	 GL_CLAMP_TO_EDGE );
-	#endif
+	if(GLEW_VERSION_1_2)
+		glTexParameteri( GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_WRAP_R,	 GL_CLAMP_TO_EDGE );
 
 	if (needs_split)
 		my_free_envmapdata(cubemap);
@@ -326,13 +306,6 @@ bool BL_Texture::InitCubeMap(int unit,  EnvMap *cubemap)
 
 	mOk = IsValid();
 	return mOk;
-
-#else
-
-	mOk = false;
-	return mOk;
-
-#endif//GL_ARB_texture_cube_map
 }
 
 bool BL_Texture::IsValid()
@@ -362,58 +335,40 @@ int BL_Texture::GetMaxUnits()
 {
 	GLint unit=0;
 
-#if defined(GL_ARB_multitexture) && defined(WITH_GLEXT)
-	if (!getenv("WITHOUT_GLEXT")) {
-		if(RAS_EXT_support._ARB_multitexture) {
-			glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &unit);
-			return (MAXTEX>=unit?unit:MAXTEX);
-		}
+	if(GLEW_ARB_multitexture) {
+		glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &unit);
+		return (MAXTEX>=unit?unit:MAXTEX);
 	}
-#endif
+
 	return 0;
 }
 
 void BL_Texture::ActivateFirst()
 {
-#if defined(GL_ARB_multitexture) && defined(WITH_GLEXT)
-	if (!getenv("WITHOUT_GLEXT")) {
-		if(RAS_EXT_support._ARB_multitexture)
-			bgl::blActiveTextureARB(GL_TEXTURE0_ARB);
-	}
-#endif
+	if(GLEW_ARB_multitexture)
+		glActiveTextureARB(GL_TEXTURE0_ARB);
 }
 
 void BL_Texture::ActivateUnit(int unit)
 {
-#if defined(GL_ARB_multitexture) && defined(WITH_GLEXT)
-	if (!getenv("WITHOUT_GLEXT")) {
-		if(RAS_EXT_support._ARB_multitexture)
-			if(unit <= MAXTEX)
-				bgl::blActiveTextureARB(GL_TEXTURE0_ARB+unit);
-	}
-#endif
+	if(GLEW_ARB_multitexture)
+		if(unit <= MAXTEX)
+			glActiveTextureARB(GL_TEXTURE0_ARB+unit);
 }
 
 
 void BL_Texture::DisableUnit()
 {
-#if defined(GL_ARB_multitexture) && defined(WITH_GLEXT)
-	if (!getenv("WITHOUT_GLEXT")) {
-		if(RAS_EXT_support._ARB_multitexture)
-			bgl::blActiveTextureARB(GL_TEXTURE0_ARB+mUnit);
-	}
-#endif
-
+	if(GLEW_ARB_multitexture)
+		glActiveTextureARB(GL_TEXTURE0_ARB+mUnit);
 
 	glMatrixMode(GL_TEXTURE);
 	glLoadIdentity();
 	glMatrixMode(GL_MODELVIEW);
 
-	#ifdef GL_ARB_texture_cube_map
-	if(RAS_EXT_support._ARB_texture_cube_map && glIsEnabled(GL_TEXTURE_CUBE_MAP_ARB))
+	if(GLEW_ARB_texture_cube_map && glIsEnabled(GL_TEXTURE_CUBE_MAP_ARB))
 		glDisable(GL_TEXTURE_CUBE_MAP_ARB);
 	else
-	#endif
 	{
 		if (glIsEnabled(GL_TEXTURE_2D))
 			glDisable(GL_TEXTURE_2D);
@@ -429,56 +384,45 @@ void BL_Texture::DisableUnit()
 
 void BL_Texture::DisableAllTextures()
 {
-#if defined(GL_ARB_multitexture) && defined(WITH_GLEXT)
-	if (!getenv("WITHOUT_GLEXT")) {
-		glDisable(GL_BLEND);
-		for(int i=0; i<MAXTEX; i++) {
-			if(RAS_EXT_support._ARB_multitexture)
-				bgl::blActiveTextureARB(GL_TEXTURE0_ARB+i);
+	glDisable(GL_BLEND);
 
-			glMatrixMode(GL_TEXTURE);
-			glLoadIdentity();
-			glMatrixMode(GL_MODELVIEW);
-			glDisable(GL_TEXTURE_2D);	
-			glDisable(GL_TEXTURE_GEN_S);
-			glDisable(GL_TEXTURE_GEN_T);
-			glDisable(GL_TEXTURE_GEN_R);
-			glDisable(GL_TEXTURE_GEN_Q);
-			glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
-		}
-		if(RAS_EXT_support._ARB_multitexture)
-			bgl::blActiveTextureARB(GL_TEXTURE0_ARB);
+	for(int i=0; i<MAXTEX; i++) {
+		if(GLEW_ARB_multitexture)
+			glActiveTextureARB(GL_TEXTURE0_ARB+i);
+
+		glMatrixMode(GL_TEXTURE);
+		glLoadIdentity();
+		glMatrixMode(GL_MODELVIEW);
+		glDisable(GL_TEXTURE_2D);	
+		glDisable(GL_TEXTURE_GEN_S);
+		glDisable(GL_TEXTURE_GEN_T);
+		glDisable(GL_TEXTURE_GEN_R);
+		glDisable(GL_TEXTURE_GEN_Q);
+		glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
 	}
-#endif
+
+	if(GLEW_ARB_multitexture)
+		glActiveTextureARB(GL_TEXTURE0_ARB);
 }
 
 
 void BL_Texture::ActivateTexture()
 {
-#if defined(GL_ARB_multitexture) && defined(WITH_GLEXT)
-	if (!getenv("WITHOUT_GLEXT")) {
-		if(RAS_EXT_support._ARB_multitexture)
-			bgl::blActiveTextureARB(GL_TEXTURE0_ARB+mUnit);
+	if(GLEW_ARB_multitexture)
+		glActiveTextureARB(GL_TEXTURE0_ARB+mUnit);
 
-#ifdef GL_ARB_texture_cube_map
-		if (mType == GL_TEXTURE_CUBE_MAP_ARB && RAS_EXT_support._ARB_texture_cube_map)
-		{
-			glBindTexture( GL_TEXTURE_CUBE_MAP_ARB, mTexture );	
-			glEnable(GL_TEXTURE_CUBE_MAP_ARB);
-		} else
-#endif
-		{
-
-			#ifdef GL_ARB_texture_cube_map
-			if(RAS_EXT_support._ARB_texture_cube_map )
-				glDisable(GL_TEXTURE_CUBE_MAP_ARB);
-			#endif
-
-			glBindTexture( GL_TEXTURE_2D, mTexture );	
-			glEnable(GL_TEXTURE_2D);
-		}
+	if (mType == GL_TEXTURE_CUBE_MAP_ARB && GLEW_ARB_texture_cube_map)
+	{
+		glBindTexture( GL_TEXTURE_CUBE_MAP_ARB, mTexture );	
+		glEnable(GL_TEXTURE_CUBE_MAP_ARB);
+	}
+	else {
+		if(GLEW_ARB_texture_cube_map )
+			glDisable(GL_TEXTURE_CUBE_MAP_ARB);
+
+		glBindTexture( GL_TEXTURE_2D, mTexture );	
+		glEnable(GL_TEXTURE_2D);
 	}
-#endif
 }
 
 void BL_Texture::SetMapping(int mode)
@@ -492,9 +436,8 @@ void BL_Texture::SetMapping(int mode)
 		return;
 	}
 
-#ifdef GL_ARB_texture_cube_map
 	if( mType == GL_TEXTURE_CUBE_MAP_ARB && 
-		RAS_EXT_support._ARB_texture_cube_map &&
+		GLEW_ARB_texture_cube_map &&
 		mode &USEREFL) 
 	{
 		glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_REFLECTION_MAP_ARB );
@@ -508,7 +451,6 @@ void BL_Texture::SetMapping(int mode)
 		return;
 	}
 	else
-#endif
 	{
 		glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP );
 		glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP );
@@ -523,11 +465,7 @@ void BL_Texture::SetMapping(int mode)
 
 void BL_Texture::setTexEnv(BL_Material *mat, bool modulate)
 {
-#ifndef GL_ARB_texture_env_combine
-	glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
-	return;
-#else
-	if(modulate || !RAS_EXT_support._ARB_texture_env_combine){
+	if(modulate || !GLEW_ARB_texture_env_combine){
 		glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
 		return;
 	}
@@ -661,7 +599,6 @@ void BL_Texture::setTexEnv(BL_Material *mat, bool modulate)
 	glTexEnvf(	GL_TEXTURE_ENV, GL_RGB_SCALE_ARB,	1.0);
 
 	glEndList();
-#endif //!GL_ARB_texture_env_combine
 }
 
 int BL_Texture::GetPow2(int n)
diff --git a/source/gameengine/Ketsji/CMakeLists.txt b/source/gameengine/Ketsji/CMakeLists.txt
index a10b07ff491..3b907d8d530 100644
--- a/source/gameengine/Ketsji/CMakeLists.txt
+++ b/source/gameengine/Ketsji/CMakeLists.txt
@@ -59,6 +59,7 @@ SET(INC
   ../../../source/blender/blenloader
   ../../../extern/bullet2/src
   ../../../extern/solid
+  ../../../extern/glew/include
   ${PYTHON_INC}
   ${SDL_INC}
 )
diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
index 3ade810c394..85921ae75ca 100644
--- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
+++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
@@ -158,6 +158,9 @@ PyObject* KX_NetworkMessageActuator::PySetToPropName(
 	if (PyArg_ParseTuple(args, "s", &ToPropName)) {
 	     m_toPropName = ToPropName;
 	}
+	else {
+		return NULL;
+	}
 
 	Py_Return;
 }
@@ -173,7 +176,10 @@ PyObject* KX_NetworkMessageActuator::PySetSubject(
 	if (PyArg_ParseTuple(args, "s", &Subject)) {
 	     m_subject = Subject;
 	}
-
+	else {
+		return NULL;
+	}
+	
 	Py_Return;
 }
 
@@ -188,6 +194,9 @@ PyObject* KX_NetworkMessageActuator::PySetBodyType(
 	if (PyArg_ParseTuple(args, "i", &BodyType)) {
 	     m_bodyType = BodyType;
 	}
+	else {
+		return NULL;
+	}
 
 	Py_Return;
 }
@@ -203,6 +212,9 @@ PyObject* KX_NetworkMessageActuator::PySetBody(
 	if (PyArg_ParseTuple(args, "s", &Body)) {
 	     m_body = Body;
 	}
+	else {
+		return NULL;
+	}
 
 	Py_Return;
 }
diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
index e320453b7aa..0c66ac1fde3 100644
--- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
+++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
@@ -58,10 +58,15 @@ KX_NetworkMessageSensor::KX_NetworkMessageSensor(
     m_NetworkScene(NetworkScene),
     m_subject(subject),
     m_frame_message_count (0),
-    m_IsUp(false),
     m_BodyList(NULL),
     m_SubjectList(NULL)
 {
+	Init();
+}
+
+void KX_NetworkMessageSensor::Init()
+{
+    m_IsUp = false;
 }
 
 KX_NetworkMessageSensor::~KX_NetworkMessageSensor()
@@ -228,6 +233,9 @@ PyObject* KX_NetworkMessageSensor::PySetSubjectFilterText(
 	{
 	     m_subject = Subject;
 	}
+	else {
+		return NULL;
+	}
 
 	Py_Return;
 }
diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
index d051b715aab..6fd92d17be3 100644
--- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
+++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
@@ -65,6 +65,7 @@ public:
 	virtual CValue* GetReplica();
 	virtual bool Evaluate(CValue* event);
 	virtual bool IsPositiveTrigger();
+	virtual void Init();
 	void EndFrame();
 	
 	/* ------------------------------------------------------------- */
diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
index 44727588106..0f445a9f32e 100644
--- a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
+++ b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
@@ -6,22 +6,7 @@
 #include <config.h>
 #endif
 
-#ifdef WIN32
-#include <windows.h>
-#endif // WIN32
-#ifdef __APPLE__
-#define GL_GLEXT_LEGACY 1
-#include <OpenGL/gl.h>
-#include <OpenGL/glu.h>
-#else
-#include <GL/gl.h>
-/* #if defined(__sun__) && !defined(__sparc__)
-#include <mesa/glu.h>
-#else
-*/
-#include <GL/glu.h>
-/* #endif */
-#endif
+#include "GL/glew.h"
 
 #include "KX_BlenderMaterial.h"
 #include "BL_Material.h"
@@ -37,7 +22,6 @@
 #include "RAS_MeshObject.h"
 #include "RAS_IRasterizer.h"
 #include "RAS_OpenGLRasterizer/RAS_GLExtensionManager.h"
-#include "RAS_OpenGLRasterizer/ARB_multitexture.h"
 
 extern "C" {
 #include "BDR_drawmesh.h"
@@ -52,9 +36,10 @@ extern "C" {
 #include "DNA_meshdata_types.h"
 #include "BKE_mesh.h"
 // ------------------------------------
-using namespace bgl;
 #define spit(x) std::cout << x << std::endl;
 
+BL_BlenderShader *KX_BlenderMaterial::mLastBlenderShader = NULL;
+
 //static PyObject *gTextureDict = 0;
 
 KX_BlenderMaterial::KX_BlenderMaterial(
@@ -81,6 +66,7 @@ KX_BlenderMaterial::KX_BlenderMaterial(
 	),
 	mMaterial(data),
 	mShader(0),
+	mBlenderShader(0),
 	mScene(scene),
 	mUserDefBlend(0),
 	mModified(0),
@@ -100,9 +86,6 @@ KX_BlenderMaterial::KX_BlenderMaterial(
 	int max = BL_Texture::GetMaxUnits();
 	mMaterial->num_enabled = enabled>=max?max:enabled;
 
-	// base class
-	m_enabled = mMaterial->num_enabled;
-
 	// test the sum of the various modes for equality
 	// so we can ether accept or reject this material 
 	// as being equal, this is rather important to 
@@ -144,12 +127,15 @@ void KX_BlenderMaterial::OnConstruction()
 	if (mConstructed)
 		// when material are reused between objects
 		return;
+	
+	if(mMaterial->glslmat)
+		SetBlenderGLSLShader();
 
 	// for each unique material...
 	int i;
 	for(i=0; i<mMaterial->num_enabled; i++) {
 		if( mMaterial->mapping[i].mapping & USEENV ) {
-			if(!RAS_EXT_support._ARB_texture_cube_map) {
+			if(!GLEW_ARB_texture_cube_map) {
 				spit("CubeMap textures not supported");
 				continue;
 			}
@@ -166,6 +152,7 @@ void KX_BlenderMaterial::OnConstruction()
 			}
 		}
 	}
+
 	mBlendFunc[0] =0;
 	mBlendFunc[1] =0;
 	mConstructed = true;
@@ -176,11 +163,21 @@ void KX_BlenderMaterial::OnExit()
 	if( mShader ) {
 		 //note, the shader here is allocated, per unique material
 		 //and this function is called per face
-		mShader->SetProg(0);
+		mShader->SetProg(false);
 		delete mShader;
 		mShader = 0;
 	}
 
+	if( mBlenderShader ) {
+		if(mBlenderShader == mLastBlenderShader) {
+			mBlenderShader->SetProg(false);
+			mLastBlenderShader = NULL;
+		}
+
+		delete mBlenderShader;
+		mBlenderShader = 0;
+	}
+
 	BL_Texture::ActivateFirst();
 	for(int i=0; i<mMaterial->num_enabled; i++) {
 		BL_Texture::ActivateUnit(i);
@@ -195,7 +192,7 @@ void KX_BlenderMaterial::OnExit()
 
 void KX_BlenderMaterial::setShaderData( bool enable, RAS_IRasterizer *ras)
 {
-	MT_assert(RAS_EXT_support._ARB_shader_objects && mShader);
+	MT_assert(GLEW_ARB_shader_objects && mShader);
 
 	int i;
 	if( !enable || !mShader->Ok() ) {
@@ -229,10 +226,32 @@ void KX_BlenderMaterial::setShaderData( bool enable, RAS_IRasterizer *ras)
 	}
 }
 
+void KX_BlenderMaterial::setBlenderShaderData( bool enable, RAS_IRasterizer *ras)
+{
+	if( !enable || !mBlenderShader->Ok() ) {
+		// frame cleanup.
+		if(mLastBlenderShader) {
+			mLastBlenderShader->SetProg(false);
+			mLastBlenderShader= NULL;
+		}
+		BL_Texture::DisableAllTextures();
+		return;
+	}
+
+	if(!mBlenderShader->Equals(mLastBlenderShader)) {
+		BL_Texture::DisableAllTextures();
+
+		if(mLastBlenderShader)
+			mLastBlenderShader->SetProg(false);
+
+		mBlenderShader->SetProg(true);
+		mLastBlenderShader= mBlenderShader;
+	}
+}
 
 void KX_BlenderMaterial::setTexData( bool enable, RAS_IRasterizer *ras)
 {
-	if(RAS_EXT_support._ARB_shader_objects && mShader) 
+	if(GLEW_ARB_shader_objects && mShader) 
 		mShader->SetProg(false);
 
 	BL_Texture::DisableAllTextures();
@@ -293,7 +312,12 @@ KX_BlenderMaterial::ActivatShaders(
 	// reset... 
 	if(tmp->mMaterial->IsShared()) 
 		cachingInfo =0;
-	
+
+	if(mLastBlenderShader) {
+		mLastBlenderShader->SetProg(false);
+		mLastBlenderShader= NULL;
+	}
+
 	if (GetCachingInfo() != cachingInfo) {
 
 		if (!cachingInfo)
@@ -301,14 +325,10 @@ KX_BlenderMaterial::ActivatShaders(
 		
 		cachingInfo = GetCachingInfo();
 	
-		if (rasty->GetDrawingMode() == RAS_IRasterizer::KX_TEXTURED ) {
+		if(rasty->GetDrawingMode() == RAS_IRasterizer::KX_TEXTURED)
 			tmp->setShaderData( true, rasty);
-			rasty->EnableTextures(true);
-		}
-		else {
+		else
 			tmp->setShaderData( false, rasty);
-			rasty->EnableTextures(false);
-		}
 
 		if(mMaterial->mode & RAS_IRasterizer::KX_TWOSIDE)
 			rasty->SetCullFace(false);
@@ -330,24 +350,28 @@ KX_BlenderMaterial::ActivatShaders(
 }
 
 void
-KX_BlenderMaterial::ActivateMat( 
-	RAS_IRasterizer* rasty,  
-	TCachingInfo& cachingInfo
-	)const
+KX_BlenderMaterial::ActivateBlenderShaders(
+	RAS_IRasterizer* rasty, 
+	TCachingInfo& cachingInfo)const
 {
 	KX_BlenderMaterial *tmp = const_cast<KX_BlenderMaterial*>(this);
+
+	// reset... 
+	if(tmp->mMaterial->IsShared()) 
+		cachingInfo =0;
+	
 	if (GetCachingInfo() != cachingInfo) {
-		if (!cachingInfo) 
-			tmp->setTexData( false,rasty );
+		if (!cachingInfo)
+			tmp->setBlenderShaderData(false, rasty);
 		
 		cachingInfo = GetCachingInfo();
-
-		if (rasty->GetDrawingMode() == RAS_IRasterizer::KX_TEXTURED) {
-			tmp->setTexData( true,rasty  );
+	
+		if(rasty->GetDrawingMode() == RAS_IRasterizer::KX_TEXTURED) {
+			tmp->setBlenderShaderData(true, rasty);
 			rasty->EnableTextures(true);
 		}
-		else{
-			tmp->setTexData( false,rasty);
+		else {
+			tmp->setBlenderShaderData(false, rasty);
 			rasty->EnableTextures(false);
 		}
 
@@ -365,11 +389,54 @@ KX_BlenderMaterial::ActivateMat(
 		else
 			rasty->SetLines(false);
 	}
+
+	ActivatGLMaterials(rasty);
+	mBlenderShader->SetAttribs(rasty, mMaterial);
+}
+
+void
+KX_BlenderMaterial::ActivateMat( 
+	RAS_IRasterizer* rasty,  
+	TCachingInfo& cachingInfo
+	)const
+{
+	KX_BlenderMaterial *tmp = const_cast<KX_BlenderMaterial*>(this);
+
+	if(mLastBlenderShader) {
+		mLastBlenderShader->SetProg(false);
+		mLastBlenderShader= NULL;
+	}
+
+	if (GetCachingInfo() != cachingInfo) {
+		if (!cachingInfo) 
+			tmp->setTexData( false,rasty );
+		
+		cachingInfo = GetCachingInfo();
+
+		if (rasty->GetDrawingMode() == RAS_IRasterizer::KX_TEXTURED)
+			tmp->setTexData( true,rasty  );
+		else
+			tmp->setTexData( false,rasty);
+
+		if(mMaterial->mode & RAS_IRasterizer::KX_TWOSIDE)
+			rasty->SetCullFace(false);
+		else
+			rasty->SetCullFace(true);
+
+		if (((mMaterial->ras_mode &WIRE)!=0) || mMaterial->mode & RAS_IRasterizer::KX_LINES)
+		{		
+			if((mMaterial->ras_mode &WIRE)!=0) 
+				rasty->SetCullFace(false);
+			rasty->SetLines(true);
+		}
+		else
+			rasty->SetLines(false);
+	}
+
 	ActivatGLMaterials(rasty);
 	ActivateTexGen(rasty);
 }
 
-
 bool 
 KX_BlenderMaterial::Activate( 
 	RAS_IRasterizer* rasty,  
@@ -377,7 +444,7 @@ KX_BlenderMaterial::Activate(
 	)const
 {
 	bool dopass = false;
-	if( RAS_EXT_support._ARB_shader_objects && ( mShader && mShader->Ok() ) ) {
+	if( GLEW_ARB_shader_objects && ( mShader && mShader->Ok() ) ) {
 		if( (mPass++) < mShader->getNumPass() ) {
 			ActivatShaders(rasty, cachingInfo);
 			dopass = true;
@@ -390,6 +457,18 @@ KX_BlenderMaterial::Activate(
 			return dopass;
 		}
 	}
+	else if( GLEW_ARB_shader_objects && ( mBlenderShader && mBlenderShader->Ok() ) ) {
+		if( (mPass++) == 0 ) {
+			ActivateBlenderShaders(rasty, cachingInfo);
+			dopass = true;
+			return dopass;
+		}
+		else {
+			mPass = 0;
+			dopass = false;
+			return dopass;
+		}
+	}
 	else {
 		switch (mPass++)
 		{
@@ -406,36 +485,53 @@ KX_BlenderMaterial::Activate(
 	return dopass;
 }
 
+bool KX_BlenderMaterial::UsesLighting(RAS_IRasterizer *rasty) const
+{
+	if(!RAS_IPolyMaterial::UsesLighting(rasty))
+		return false;
+
+	if(mShader && mShader->Ok());
+	else if(mBlenderShader && mBlenderShader->Ok())
+		return false;
+	
+	return true;
+}
+
 void KX_BlenderMaterial::ActivateMeshSlot(const KX_MeshSlot & ms, RAS_IRasterizer* rasty) const
 {
-	if(mShader && RAS_EXT_support._ARB_shader_objects)
+	if(mShader && GLEW_ARB_shader_objects)
 		mShader->Update(ms, rasty);
+	else if(mBlenderShader && GLEW_ARB_shader_objects)
+		mBlenderShader->Update(ms, rasty);
 }
 
 void KX_BlenderMaterial::ActivatGLMaterials( RAS_IRasterizer* rasty )const
 {
-	rasty->SetSpecularity(
-		mMaterial->speccolor[0]*mMaterial->spec_f,
-		mMaterial->speccolor[1]*mMaterial->spec_f,
-		mMaterial->speccolor[2]*mMaterial->spec_f,
-		mMaterial->spec_f
-	);
+	if(mShader || !mBlenderShader) {
+		rasty->SetSpecularity(
+			mMaterial->speccolor[0]*mMaterial->spec_f,
+			mMaterial->speccolor[1]*mMaterial->spec_f,
+			mMaterial->speccolor[2]*mMaterial->spec_f,
+			mMaterial->spec_f
+		);
 
-	rasty->SetShinyness( mMaterial->hard );
+		rasty->SetShinyness( mMaterial->hard );
 
-	rasty->SetDiffuse(
-		mMaterial->matcolor[0]*mMaterial->ref+mMaterial->emit, 
-		mMaterial->matcolor[1]*mMaterial->ref+mMaterial->emit,
-		mMaterial->matcolor[2]*mMaterial->ref+mMaterial->emit,
-		1.0f);
+		rasty->SetDiffuse(
+			mMaterial->matcolor[0]*mMaterial->ref+mMaterial->emit, 
+			mMaterial->matcolor[1]*mMaterial->ref+mMaterial->emit,
+			mMaterial->matcolor[2]*mMaterial->ref+mMaterial->emit,
+			1.0f);
 
-	rasty->SetEmissive(	
-		mMaterial->matcolor[0]*mMaterial->emit,
-		mMaterial->matcolor[1]*mMaterial->emit,
-		mMaterial->matcolor[2]*mMaterial->emit,
-		1.0 );
+		rasty->SetEmissive(	
+			mMaterial->matcolor[0]*mMaterial->emit,
+			mMaterial->matcolor[1]*mMaterial->emit,
+			mMaterial->matcolor[2]*mMaterial->emit,
+			1.0 );
+
+		rasty->SetAmbient(mMaterial->amb);
+	}
 
-	rasty->SetAmbient(mMaterial->amb);
 	if (mMaterial->material)
 		rasty->SetPolygonOffset(-mMaterial->material->zoffs, 0.0);
 }
@@ -443,34 +539,47 @@ void KX_BlenderMaterial::ActivatGLMaterials( RAS_IRasterizer* rasty )const
 
 void KX_BlenderMaterial::ActivateTexGen(RAS_IRasterizer *ras) const
 {
-	if(mShader && RAS_EXT_support._ARB_shader_objects)
-		if(mShader->GetAttribute() == BL_Shader::SHD_TANGENT)
-			ras->SetAttrib(RAS_IRasterizer::RAS_TEXTANGENT);
-
-	for(int i=0; i<mMaterial->num_enabled; i++) {
-		int mode = mMaterial->mapping[i].mapping;
-
-		if (mode &USECUSTOMUV)
-		{
-			STR_String str = mMaterial->mapping[i].uvCoName;
-			if (!str.IsEmpty())
-				ras->SetTexCoords(RAS_IRasterizer::RAS_TEXCO_UV2, i);
-			continue;
+	if(ras->GetDrawingMode() == RAS_IRasterizer::KX_TEXTURED) {
+		ras->SetAttribNum(0);
+		if(mShader && GLEW_ARB_shader_objects) {
+			if(mShader->GetAttribute() == BL_Shader::SHD_TANGENT) {
+				ras->SetAttrib(RAS_IRasterizer::RAS_TEXCO_DISABLE, 0);
+				ras->SetAttrib(RAS_IRasterizer::RAS_TEXTANGENT, 1);
+				ras->SetAttribNum(2);
+			}
 		}
 
-		if( mode &(USEREFL|USEOBJ))
-			ras->SetTexCoords(RAS_IRasterizer::RAS_TEXCO_GEN, i);
-		else if(mode &USEORCO)
-			ras->SetTexCoords(RAS_IRasterizer::RAS_TEXCO_ORCO, i);
-		else if(mode &USENORM)
-			ras->SetTexCoords(RAS_IRasterizer::RAS_TEXCO_NORM, i);
-		else if(mode &USEUV)
-			ras->SetTexCoords(RAS_IRasterizer::RAS_TEXCO_UV1, i);
-		else if(mode &USETANG)
-			ras->SetTexCoords(RAS_IRasterizer::RAS_TEXTANGENT, i);
-		else 
-			ras->SetTexCoords(RAS_IRasterizer::RAS_TEXCO_DISABLE, i);
+		ras->SetTexCoordNum(mMaterial->num_enabled);
+
+		for(int i=0; i<mMaterial->num_enabled; i++) {
+			int mode = mMaterial->mapping[i].mapping;
+
+			if (mode &USECUSTOMUV)
+			{
+				STR_String str = mMaterial->mapping[i].uvCoName;
+				if (!str.IsEmpty())
+					ras->SetTexCoord(RAS_IRasterizer::RAS_TEXCO_UV2, i);
+				continue;
+			}
+
+			if( mode &(USEREFL|USEOBJ))
+				ras->SetTexCoord(RAS_IRasterizer::RAS_TEXCO_GEN, i);
+			else if(mode &USEORCO)
+				ras->SetTexCoord(RAS_IRasterizer::RAS_TEXCO_ORCO, i);
+			else if(mode &USENORM)
+				ras->SetTexCoord(RAS_IRasterizer::RAS_TEXCO_NORM, i);
+			else if(mode &USEUV)
+				ras->SetTexCoord(RAS_IRasterizer::RAS_TEXCO_UV1, i);
+			else if(mode &USETANG)
+				ras->SetTexCoord(RAS_IRasterizer::RAS_TEXTANGENT, i);
+			else 
+				ras->SetTexCoord(RAS_IRasterizer::RAS_TEXCO_DISABLE, i);
+		}
+
+		ras->EnableTextures(true);
 	}
+	else
+		ras->EnableTextures(false);
 }
 
 bool KX_BlenderMaterial::setDefaultBlending()
@@ -478,16 +587,23 @@ bool KX_BlenderMaterial::setDefaultBlending()
 	if( mMaterial->transp &TF_ADD) {
 		glEnable(GL_BLEND);
 		glBlendFunc(GL_ONE, GL_ONE);
+		glDisable ( GL_ALPHA_TEST );
 		return true;
 	}
 	
 	if( mMaterial->transp & TF_ALPHA ) {
 		glEnable(GL_BLEND);
 		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		glDisable ( GL_ALPHA_TEST );
 		return true;
 	}
 	
-	glDisable(GL_BLEND);
+	if( mMaterial->transp & TF_CLIP ) {
+		glDisable(GL_BLEND); 
+		glEnable ( GL_ALPHA_TEST );
+		glAlphaFunc(GL_GREATER, 0.5f);
+		return false;
+	}
 	return false;
 }
 
@@ -496,8 +612,7 @@ void KX_BlenderMaterial::setTexMatrixData(int i)
 	glMatrixMode(GL_TEXTURE);
 	glLoadIdentity();
 
-#ifdef GL_ARB_texture_cube_map
-	if( RAS_EXT_support._ARB_texture_cube_map && 
+	if( GLEW_ARB_texture_cube_map && 
 		mTextures[i].GetTextureType() == GL_TEXTURE_CUBE_MAP_ARB && 
 		mMaterial->mapping[i].mapping & USEREFL) {
 		glScalef( 
@@ -507,7 +622,6 @@ void KX_BlenderMaterial::setTexMatrixData(int i)
 		);
 	}
 	else
-#endif
 	{
 		glScalef( 
 			mMaterial->mapping[i].scale[0], 
@@ -656,28 +770,23 @@ int KX_BlenderMaterial::_setattr(const STR_String& attr, PyObject *pyvalue)
 
 KX_PYMETHODDEF_DOC( KX_BlenderMaterial, getShader , "getShader()")
 {
-#ifdef GL_ARB_fragment_shader
-	if( !RAS_EXT_support._ARB_fragment_shader) {
+	if( !GLEW_ARB_fragment_shader) {
 		if(!mModified)
 			spit("Fragment shaders not supported");
 	
 		mModified = true;
 		Py_Return;
 	}
-#endif
 
-#ifdef GL_ARB_vertex_shader
-	if( !RAS_EXT_support._ARB_vertex_shader) {
+	if( !GLEW_ARB_vertex_shader) {
 		if(!mModified)
 			spit("Vertex shaders not supported");
 
 		mModified = true;
 		Py_Return;
 	}
-#endif
 
-#ifdef GL_ARB_shader_objects
-	if(!RAS_EXT_support._ARB_shader_objects)  {
+	if(!GLEW_ARB_shader_objects)  {
 		if(!mModified)
 			spit("GLSL not supported");
 		mModified = true;
@@ -716,13 +825,20 @@ KX_PYMETHODDEF_DOC( KX_BlenderMaterial, getShader , "getShader()")
 	}
 	PyErr_Format(PyExc_ValueError, "GLSL Error");
 	return NULL;
-
-#else
-	Py_Return;
-#endif//GL_ARB_shader_objects
 }
 
 
+void KX_BlenderMaterial::SetBlenderGLSLShader(void)
+{
+	if(!mBlenderShader)
+		mBlenderShader = new BL_BlenderShader(mMaterial->material, m_lightlayer);
+
+	if(!mBlenderShader->Ok()) {
+		delete mBlenderShader;
+		mBlenderShader = 0;
+	}
+}
+
 KX_PYMETHODDEF_DOC( KX_BlenderMaterial, getMaterialIndex, "getMaterialIndex()")
 {
 	return PyInt_FromLong( mMaterial->material_index );
diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.h b/source/gameengine/Ketsji/KX_BlenderMaterial.h
index b9d48199520..bf6d2095e7c 100644
--- a/source/gameengine/Ketsji/KX_BlenderMaterial.h
+++ b/source/gameengine/Ketsji/KX_BlenderMaterial.h
@@ -8,6 +8,7 @@
 #include "BL_Material.h"
 #include "BL_Texture.h"
 #include "BL_Shader.h"
+#include "BL_BlenderShader.h"
 
 #include "PyObjectPlus.h"
 
@@ -60,6 +61,10 @@ public:
 		TCachingInfo& cachingInfo
 	)const;
 
+	void ActivateBlenderShaders(
+		RAS_IRasterizer* rasty, 
+		TCachingInfo& cachingInfo
+	)const;
 
 	MTFace* GetMTFace(void) const;
 	unsigned int* GetMCol(void) const;
@@ -86,8 +91,10 @@ public:
 	// pre calculate to avoid pops/lag at startup
 	virtual void OnConstruction( );
 private:
-	BL_Material*	mMaterial;
-	BL_Shader*		mShader;
+	BL_Material*		mMaterial;
+	BL_Shader*			mShader;
+	BL_BlenderShader*	mBlenderShader;
+	static BL_BlenderShader *mLastBlenderShader;
 	KX_Scene*		mScene;
 	BL_Texture		mTextures[MAXTEX];		// texture array
 	bool			mUserDefBlend;
@@ -95,12 +102,16 @@ private:
 	bool			mModified;
 	bool			mConstructed;			// if false, don't clean on exit
 
+	void SetBlenderGLSLShader();
+
 	void ActivatGLMaterials( RAS_IRasterizer* rasty )const;
 	void ActivateTexGen( RAS_IRasterizer *ras ) const;
 
+	bool UsesLighting(RAS_IRasterizer *rasty) const;
 
 	// message centers
 	void	setTexData( bool enable,RAS_IRasterizer *ras);
+	void	setBlenderShaderData( bool enable, RAS_IRasterizer *ras);
 	void	setShaderData( bool enable, RAS_IRasterizer *ras);
 
 	bool	setDefaultBlending();
diff --git a/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp b/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
index aa7c75e9633..dba11efef72 100644
--- a/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
+++ b/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
@@ -17,7 +17,8 @@
 
 KX_BulletPhysicsController::KX_BulletPhysicsController (const CcdConstructionInfo& ci, bool dyna)
 : KX_IPhysicsController(dyna,(PHY_IPhysicsController*)this),
-CcdPhysicsController(ci)
+CcdPhysicsController(ci),
+m_savedCollisionFlags(0)
 {
 
 }
@@ -102,6 +103,13 @@ MT_Vector3 KX_BulletPhysicsController::GetLinearVelocity()
 	CcdPhysicsController::GetLinearVelocity(angVel[0],angVel[1],angVel[2]);//rcruiz
 	return MT_Vector3(angVel[0],angVel[1],angVel[2]);
 }
+MT_Vector3 KX_BulletPhysicsController::GetAngularVelocity()
+{
+	float angVel[3];
+	//CcdPhysicsController::GetAngularVelocity(angVel[0],angVel[1],angVel[2]);
+	CcdPhysicsController::GetAngularVelocity(angVel[0],angVel[1],angVel[2]);//rcruiz
+	return MT_Vector3(angVel[0],angVel[1],angVel[2]);
+}
 MT_Vector3 KX_BulletPhysicsController::GetVelocity(const MT_Point3& pos)
 {
 	float linVel[3];
@@ -154,14 +162,26 @@ void	KX_BulletPhysicsController::setRigidBody(bool rigid)
 {
 }
 
-void	KX_BulletPhysicsController::SuspendDynamics()
+void	KX_BulletPhysicsController::SuspendDynamics(bool ghost)
 {
-	GetRigidBody()->setActivationState(DISABLE_SIMULATION);
-
+	btRigidBody *body = GetRigidBody();
+	if (body->getActivationState() != DISABLE_SIMULATION)
+	{
+		m_savedCollisionFlags = body->getCollisionFlags();
+		body->setActivationState(DISABLE_SIMULATION);
+		body->setCollisionFlags((btCollisionObject::CF_STATIC_OBJECT)|
+			((ghost)?btCollisionObject::CF_NO_CONTACT_RESPONSE:0));
+	}
 }
+
 void	KX_BulletPhysicsController::RestoreDynamics()
 {
-	GetRigidBody()->forceActivationState(ACTIVE_TAG);
+	btRigidBody *body = GetRigidBody();
+	if (body->getActivationState() == DISABLE_SIMULATION)
+	{
+		GetRigidBody()->forceActivationState(ACTIVE_TAG);
+		body->setCollisionFlags(m_savedCollisionFlags);
+	}
 }
 
 SG_Controller*	KX_BulletPhysicsController::GetReplica(class SG_Node* destnode)
diff --git a/source/gameengine/Ketsji/KX_BulletPhysicsController.h b/source/gameengine/Ketsji/KX_BulletPhysicsController.h
index 619ac42503f..6f048deb16b 100644
--- a/source/gameengine/Ketsji/KX_BulletPhysicsController.h
+++ b/source/gameengine/Ketsji/KX_BulletPhysicsController.h
@@ -7,7 +7,8 @@
 
 class KX_BulletPhysicsController : public KX_IPhysicsController ,public CcdPhysicsController
 {
-
+private:
+	int m_savedCollisionFlags;
 public:
 
 	KX_BulletPhysicsController (const CcdConstructionInfo& ci, bool dyna);
@@ -25,6 +26,7 @@ public:
 	virtual void	ApplyTorque(const MT_Vector3& torque,bool local);
 	virtual void	ApplyForce(const MT_Vector3& force,bool local);
 	virtual MT_Vector3 GetLinearVelocity();
+	virtual MT_Vector3 GetAngularVelocity();
 	virtual MT_Vector3 GetVelocity(const MT_Point3& pos);
 	virtual void	SetAngularVelocity(const MT_Vector3& ang_vel,bool local);
 	virtual void	SetLinearVelocity(const MT_Vector3& lin_vel,bool local);
@@ -38,7 +40,7 @@ public:
 
 	virtual void	resolveCombinedVelocities(float linvelX,float linvelY,float linvelZ,float angVelX,float angVelY,float angVelZ);
 
-	virtual void	SuspendDynamics();
+	virtual void	SuspendDynamics(bool ghost);
 	virtual void	RestoreDynamics();
 
 	virtual	SG_Controller*	GetReplica(class SG_Node* destnode);
diff --git a/source/gameengine/Ketsji/KX_Camera.cpp b/source/gameengine/Ketsji/KX_Camera.cpp
index 27e47d72bbe..3830d422138 100644
--- a/source/gameengine/Ketsji/KX_Camera.cpp
+++ b/source/gameengine/Ketsji/KX_Camera.cpp
@@ -588,7 +588,7 @@ KX_PYMETHODDEF_DOC(KX_Camera, sphereInsideFrustum,
 
 	PyErr_SetString(PyExc_TypeError, "sphereInsideFrustum: Expected arguments: (center, radius)");
 	
-	Py_Return;
+	return NULL;
 }
 
 KX_PYMETHODDEF_DOC(KX_Camera, boxInsideFrustum,
@@ -766,6 +766,10 @@ KX_PYMETHODDEF_DOC(KX_Camera, enableViewport,
 		else
 			EnableViewport(false);
 	}
+	else {
+		return NULL;
+	}
+	
 	Py_Return;
 }
 
@@ -777,6 +781,8 @@ KX_PYMETHODDEF_DOC(KX_Camera, setViewport,
 	if (PyArg_ParseTuple(args,"iiii",&left, &bottom, &right, &top))
 	{
 		SetViewport(left, bottom, right, top);
+	} else {
+		return NULL;
 	}
 	Py_Return;
 }
diff --git a/source/gameengine/Ketsji/KX_ConstraintActuator.cpp b/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
index bd843d97199..80288a72485 100644
--- a/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
+++ b/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
@@ -35,6 +35,7 @@
 #include "MT_Point3.h"
 #include "MT_Matrix3x3.h"
 #include "KX_GameObject.h"
+#include "KX_RayCast.h"
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -45,35 +46,54 @@
 /* ------------------------------------------------------------------------- */
 
 KX_ConstraintActuator::KX_ConstraintActuator(SCA_IObject *gameobj, 
-											 int dampTime,
+											 int posDampTime,
+											 int rotDampTime,
 											 float minBound,
 											 float maxBound,
+											 float refDir[3],
 											 int locrotxyz,
-											 PyTypeObject* T)
-	: SCA_IActuator(gameobj, T)
+											 int time,
+											 int option,
+											 char *property,
+											 PyTypeObject* T) : 
+	m_refDirection(refDir),
+	m_currentTime(0),
+	SCA_IActuator(gameobj, T)
 {
-	m_dampTime = dampTime;
+	m_posDampTime = posDampTime;
+	m_rotDampTime = rotDampTime;
 	m_locrot   = locrotxyz;
+	m_option = option;
+	m_activeTime = time;
+	if (property) {
+		strncpy(m_property, property, sizeof(m_property));
+		m_property[sizeof(m_property)-1] = 0;
+	} else {
+		m_property[0] = 0;
+	}
 	/* The units of bounds are determined by the type of constraint. To      */
 	/* make the constraint application easier and more transparent later on, */
 	/* I think converting the bounds to the applicable domain makes more     */
 	/* sense.                                                                */
 	switch (m_locrot) {
-	case KX_ACT_CONSTRAINT_LOCX:
-	case KX_ACT_CONSTRAINT_LOCY:
-	case KX_ACT_CONSTRAINT_LOCZ:
+	case KX_ACT_CONSTRAINT_ORIX:
+	case KX_ACT_CONSTRAINT_ORIY:
+	case KX_ACT_CONSTRAINT_ORIZ:
+		{
+			MT_Scalar len = m_refDirection.length();
+			if (MT_fuzzyZero(len)) {
+				// missing a valid direction
+				std::cout << "WARNING: Constraint actuator " << GetName() << ":  There is no valid reference direction!" << std::endl;
+				m_locrot = KX_ACT_CONSTRAINT_NODEF;
+			} else {
+				m_refDirection /= len;
+			}
+		}
+		break;
+	default:
 		m_minimumBound = minBound;
 		m_maximumBound = maxBound;
 		break;
-	case KX_ACT_CONSTRAINT_ROTX:
-	case KX_ACT_CONSTRAINT_ROTY:
-	case KX_ACT_CONSTRAINT_ROTZ:
-		/* The user interface asks for degrees, we are radian.               */ 
-		m_minimumBound = MT_radians(minBound);
-		m_maximumBound = MT_radians(maxBound);
-		break;
-	default:
-		; /* error */
 	}
 
 } /* End of constructor */
@@ -83,6 +103,40 @@ KX_ConstraintActuator::~KX_ConstraintActuator()
 	// there's nothing to be done here, really....
 } /* end of destructor */
 
+bool KX_ConstraintActuator::RayHit(KX_ClientObjectInfo* client, MT_Point3& hit_point, MT_Vector3& hit_normal, void * const data)
+{
+
+	KX_GameObject* hitKXObj = client->m_gameobject;
+	
+	if (client->m_type > KX_ClientObjectInfo::ACTOR)
+	{
+		// false hit
+		return false;
+	}
+	bool bFound = false;
+
+	if (m_property[0] == 0)
+	{
+		bFound = true;
+	}
+	else
+	{
+		if (m_option & KX_ACT_CONSTRAINT_MATERIAL)
+		{
+			if (client->m_auxilary_info)
+			{
+				bFound = !strcmp(m_property, ((char*)client->m_auxilary_info));
+			}
+		}
+		else
+		{
+			bFound = hitKXObj->GetProperty(m_property) != NULL;
+		}
+	}
+
+	return bFound;
+}
+
 bool KX_ConstraintActuator::Update(double curtime, bool frame)
 {
 
@@ -90,70 +144,198 @@ bool KX_ConstraintActuator::Update(double curtime, bool frame)
 	bool bNegativeEvent = IsNegativeEvent();
 	RemoveAllEvents();
 
-	if (bNegativeEvent)
-		return false; // do nothing on negative events
+	if (!bNegativeEvent) {
+		/* Constraint clamps the values to the specified range, with a sort of    */
+		/* low-pass filtered time response, if the damp time is unequal to 0.     */
 
-	/* Constraint clamps the values to the specified range, with a sort of    */
-	/* low-pass filtered time response, if the damp time is unequal to 0.     */
+		/* Having to retrieve location/rotation and setting it afterwards may not */
+		/* be efficient enough... Somthing to look at later.                      */
+		KX_GameObject  *obj = (KX_GameObject*) GetParent();
+		MT_Point3    position = obj->NodeGetWorldPosition();
+		MT_Point3    newposition;
+		MT_Vector3   direction;
+		MT_Matrix3x3 rotation = obj->NodeGetWorldOrientation();
+		MT_Scalar    filter, newdistance;
+		int axis, sign;
 
-	/* Having to retrieve location/rotation and setting it afterwards may not */
-	/* be efficient enough... Somthing to look at later.                      */
-	KX_GameObject  *parent = (KX_GameObject*) GetParent();
-	MT_Point3    position = parent->NodeGetWorldPosition();
-	MT_Matrix3x3 rotation = parent->NodeGetWorldOrientation();
-//	MT_Vector3	eulerrot = rotation.getEuler();
-	
-	switch (m_locrot) {
-	case KX_ACT_CONSTRAINT_LOCX:
-		Clamp(position[0], m_minimumBound, m_maximumBound);
-		result = true;
-		break;
-	case KX_ACT_CONSTRAINT_LOCY:
-		Clamp(position[1], m_minimumBound, m_maximumBound);
-		result = true;
-		break;
-	case KX_ACT_CONSTRAINT_LOCZ:
-		Clamp(position[2], m_minimumBound, m_maximumBound);
-		result = true;
-		break;
-	
-//	case KX_ACT_CONSTRAINT_ROTX:
-//		/* The angles are Euler angles (I think that's what they are called) */
-//		/* but we need to convert from/to the MT_Matrix3x3.                  */
-//		Clamp(eulerrot[0], m_minimumBound, m_maximumBound);
-//		break;
-//	case KX_ACT_CONSTRAINT_ROTY:
-//		Clamp(eulerrot[1], m_minimumBound, m_maximumBound);
-//		break;
-//	case KX_ACT_CONSTRAINT_ROTZ:
-//		Clamp(eulerrot[2], m_minimumBound, m_maximumBound);
-//		break;
-//	default:
-//		; /* error */
+		if (m_posDampTime) {
+			filter = m_posDampTime/(1.0+m_posDampTime);
+		}
+		switch (m_locrot) {
+		case KX_ACT_CONSTRAINT_ORIX:
+		case KX_ACT_CONSTRAINT_ORIY:
+		case KX_ACT_CONSTRAINT_ORIZ:
+			switch (m_locrot) {
+			case KX_ACT_CONSTRAINT_ORIX:
+				direction[0] = rotation[0][0];
+				direction[1] = rotation[1][0];
+				direction[2] = rotation[2][0];
+				axis = 0;
+				break;
+			case KX_ACT_CONSTRAINT_ORIY:
+				direction[0] = rotation[0][1];
+				direction[1] = rotation[1][1];
+				direction[2] = rotation[2][1];
+				axis = 1;
+				break;
+			case KX_ACT_CONSTRAINT_ORIZ:
+				direction[0] = rotation[0][2];
+				direction[1] = rotation[1][2];
+				direction[2] = rotation[2][2];
+				axis = 2;
+				break;
+			}
+			// apply damping on the direction
+			if (m_posDampTime) {
+				direction = filter*direction + (1.0-filter)*m_refDirection;
+			}
+			obj->AlignAxisToVect(direction, axis);
+			result = true;
+			goto CHECK_TIME;
+		case KX_ACT_CONSTRAINT_DIRPX:
+		case KX_ACT_CONSTRAINT_DIRPY:
+		case KX_ACT_CONSTRAINT_DIRPZ:
+		case KX_ACT_CONSTRAINT_DIRMX:
+		case KX_ACT_CONSTRAINT_DIRMY:
+		case KX_ACT_CONSTRAINT_DIRMZ:
+			switch (m_locrot) {
+			case KX_ACT_CONSTRAINT_DIRPX:
+				direction[0] = rotation[0][0];
+				direction[1] = rotation[1][0];
+				direction[2] = rotation[2][0];
+				axis = 0;		// axis according to KX_GameObject::AlignAxisToVect()
+				sign = 1;		// X axis will be anti parrallel to normal
+				break;
+			case KX_ACT_CONSTRAINT_DIRPY:
+				direction[0] = rotation[0][1];
+				direction[1] = rotation[1][1];
+				direction[2] = rotation[2][1];
+				axis = 1;
+				sign = 1;
+				break;
+			case KX_ACT_CONSTRAINT_DIRPZ:
+				direction[0] = rotation[0][2];
+				direction[1] = rotation[1][2];
+				direction[2] = rotation[2][2];
+				axis = 2;
+				sign = 1;
+				break;
+			case KX_ACT_CONSTRAINT_DIRMX:
+				direction[0] = -rotation[0][0];
+				direction[1] = -rotation[1][0];
+				direction[2] = -rotation[2][0];
+				axis = 0;
+				sign = 0;
+				break;
+			case KX_ACT_CONSTRAINT_DIRMY:
+				direction[0] = -rotation[0][1];
+				direction[1] = -rotation[1][1];
+				direction[2] = -rotation[2][1];
+				axis = 1;
+				sign = 0;
+				break;
+			case KX_ACT_CONSTRAINT_DIRMZ:
+				direction[0] = -rotation[0][2];
+				direction[1] = -rotation[1][2];
+				direction[2] = -rotation[2][2];
+				axis = 2;
+				sign = 0;
+				break;
+			}
+			direction.normalize();
+			{
+				MT_Point3 topoint = position + (m_maximumBound) * direction;
+				MT_Point3 resultpoint;
+				MT_Vector3 resultnormal;
+				PHY_IPhysicsEnvironment* pe = obj->GetPhysicsEnvironment();
+				KX_IPhysicsController *spc = obj->GetPhysicsController();
+
+				if (!pe) {
+					std::cout << "WARNING: Constraint actuator " << GetName() << ":  There is no physics environment!" << std::endl;
+					goto CHECK_TIME;
+				}	 
+				if (!spc) {
+					// the object is not physical, we probably want to avoid hitting its own parent
+					KX_GameObject *parent = obj->GetParent();
+					if (parent) {
+						spc = parent->GetPhysicsController();
+						parent->Release();
+					}
+				}
+				result = KX_RayCast::RayTest(spc, pe, position, topoint, resultpoint, resultnormal, KX_RayCast::Callback<KX_ConstraintActuator>(this));
+
+				if (result)	{
+					// compute new position & orientation
+					if ((m_option & (KX_ACT_CONSTRAINT_NORMAL|KX_ACT_CONSTRAINT_DISTANCE)) == 0) {
+						// if none option is set, the actuator does nothing but detect ray 
+						// (works like a sensor)
+						goto CHECK_TIME;
+					}
+					if (m_option & KX_ACT_CONSTRAINT_NORMAL) {
+						// the new orientation must be so that the axis is parallel to normal
+						if (sign)
+							resultnormal = -resultnormal;
+						// apply damping on the direction
+						if (m_rotDampTime) {
+							MT_Scalar rotFilter = 1.0/(1.0+m_rotDampTime);
+							resultnormal = (-m_rotDampTime*rotFilter)*direction + rotFilter*resultnormal;
+						} else if (m_posDampTime) {
+							resultnormal = -filter*direction + (1.0-filter)*resultnormal;
+						}
+						obj->AlignAxisToVect(resultnormal, axis);
+						direction = -resultnormal;
+					}
+					if (m_option & KX_ACT_CONSTRAINT_DISTANCE) {
+						if (m_posDampTime) {
+							newdistance = filter*(position-resultpoint).length()+(1.0-filter)*m_minimumBound;
+						} else {
+							newdistance = m_minimumBound;
+						}
+					} else {
+						newdistance = (position-resultpoint).length();
+					}
+					newposition = resultpoint-newdistance*direction;
+				} else if (m_option & KX_ACT_CONSTRAINT_PERMANENT) {
+					// no contact but still keep running
+					result = true;
+					goto CHECK_TIME;
+				}
+			}
+			break; 
+		case KX_ACT_CONSTRAINT_LOCX:
+		case KX_ACT_CONSTRAINT_LOCY:
+		case KX_ACT_CONSTRAINT_LOCZ:
+			newposition = position;
+			switch (m_locrot) {
+			case KX_ACT_CONSTRAINT_LOCX:
+				Clamp(newposition[0], m_minimumBound, m_maximumBound);
+				break;
+			case KX_ACT_CONSTRAINT_LOCY:
+				Clamp(newposition[1], m_minimumBound, m_maximumBound);
+				break;
+			case KX_ACT_CONSTRAINT_LOCZ:
+				Clamp(newposition[2], m_minimumBound, m_maximumBound);
+				break;
+			}
+			result = true;
+			if (m_posDampTime) {
+				newposition = filter*position + (1.0-filter)*newposition;
+			}
+			break;
+		}
+		if (result) {
+			// set the new position but take into account parent if any
+			obj->NodeSetWorldPosition(newposition);
+		}
+	CHECK_TIME:
+		if (result && m_activeTime > 0 ) {
+			if (++m_currentTime >= m_activeTime)
+				result = false;
+		}
 	}
-
-	/* Will be replaced by a filtered clamp. */
-	
-
-	switch (m_locrot) {
-	case KX_ACT_CONSTRAINT_LOCX:
-	case KX_ACT_CONSTRAINT_LOCY:
-	case KX_ACT_CONSTRAINT_LOCZ:
-		parent->NodeSetLocalPosition(position);
-		break;
-
-
-//	case KX_ACT_CONSTRAINT_ROTX:
-//	case KX_ACT_CONSTRAINT_ROTY:
-//	case KX_ACT_CONSTRAINT_ROTZ:
-//		rotation.setEuler(eulerrot);
-//		parent->NodeSetLocalOrientation(rotation);
-		break;
-
-	default:
-		; /* error */
+	if (!result) {
+		m_currentTime = 0;
 	}
-
 	return result;
 } /* end of KX_ConstraintActuator::Update(double curtime,double deltatime)   */
 
@@ -214,10 +396,24 @@ PyParentObject KX_ConstraintActuator::Parents[] = {
 PyMethodDef KX_ConstraintActuator::Methods[] = {
 	{"setDamp", (PyCFunction) KX_ConstraintActuator::sPySetDamp, METH_VARARGS, SetDamp_doc},
 	{"getDamp", (PyCFunction) KX_ConstraintActuator::sPyGetDamp, METH_VARARGS, GetDamp_doc},
+	{"setRotDamp", (PyCFunction) KX_ConstraintActuator::sPySetRotDamp, METH_VARARGS, SetRotDamp_doc},
+	{"getRotDamp", (PyCFunction) KX_ConstraintActuator::sPyGetRotDamp, METH_VARARGS, GetRotDamp_doc},
+	{"setDirection", (PyCFunction) KX_ConstraintActuator::sPySetDirection, METH_VARARGS, SetDirection_doc},
+	{"getDirection", (PyCFunction) KX_ConstraintActuator::sPyGetDirection, METH_VARARGS, GetDirection_doc},
+	{"setOption", (PyCFunction) KX_ConstraintActuator::sPySetOption, METH_VARARGS, SetOption_doc},
+	{"getOption", (PyCFunction) KX_ConstraintActuator::sPyGetOption, METH_VARARGS, GetOption_doc},
+	{"setTime", (PyCFunction) KX_ConstraintActuator::sPySetTime, METH_VARARGS, SetTime_doc},
+	{"getTime", (PyCFunction) KX_ConstraintActuator::sPyGetTime, METH_VARARGS, GetTime_doc},
+	{"setProperty", (PyCFunction) KX_ConstraintActuator::sPySetProperty, METH_VARARGS, SetProperty_doc},
+	{"getProperty", (PyCFunction) KX_ConstraintActuator::sPyGetProperty, METH_VARARGS, GetProperty_doc},
 	{"setMin", (PyCFunction) KX_ConstraintActuator::sPySetMin, METH_VARARGS, SetMin_doc},
 	{"getMin", (PyCFunction) KX_ConstraintActuator::sPyGetMin, METH_VARARGS, GetMin_doc},
+	{"setDistance", (PyCFunction) KX_ConstraintActuator::sPySetMin, METH_VARARGS, SetDistance_doc},
+	{"getDistance", (PyCFunction) KX_ConstraintActuator::sPyGetMin, METH_VARARGS, GetDistance_doc},
 	{"setMax", (PyCFunction) KX_ConstraintActuator::sPySetMax, METH_VARARGS, SetMax_doc},
 	{"getMax", (PyCFunction) KX_ConstraintActuator::sPyGetMax, METH_VARARGS, GetMax_doc},
+	{"setRayLength", (PyCFunction) KX_ConstraintActuator::sPySetMax, METH_VARARGS, SetRayLength_doc},
+	{"getRayLength", (PyCFunction) KX_ConstraintActuator::sPyGetMax, METH_VARARGS, GetRayLength_doc},
 	{"setLimit", (PyCFunction) KX_ConstraintActuator::sPySetLimit, METH_VARARGS, SetLimit_doc},
 	{"getLimit", (PyCFunction) KX_ConstraintActuator::sPyGetLimit, METH_VARARGS, GetLimit_doc},
 	{NULL,NULL} //Sentinel
@@ -231,7 +427,7 @@ PyObject* KX_ConstraintActuator::_getattr(const STR_String& attr) {
 char KX_ConstraintActuator::SetDamp_doc[] = 
 "setDamp(duration)\n"
 "\t- duration: integer\n"
-"\tSets the time with which the constraint application is delayed.\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* self, 
 										   PyObject* args, 
@@ -241,21 +437,192 @@ PyObject* KX_ConstraintActuator::PySetDamp(PyObject* self,
 		return NULL;		
 	}
 	
-	m_dampTime = dampArg;
-	if (m_dampTime < 0) m_dampTime = 0;
+	m_posDampTime = dampArg;
+	if (m_posDampTime < 0) m_posDampTime = 0;
 
 	Py_Return;
 }
 /* 3. getDamp                                                                */
 char KX_ConstraintActuator::GetDamp_doc[] = 
-"GetDamp()\n"
-"\tReturns the damping time for application of the constraint.\n";
+"getDamp()\n"
+"\tReturns the damping parameter.\n";
 PyObject* KX_ConstraintActuator::PyGetDamp(PyObject* self, 
 										   PyObject* args, 
 										   PyObject* kwds){
-	return PyInt_FromLong(m_dampTime);
+	return PyInt_FromLong(m_posDampTime);
 }
 
+/* 2. setRotDamp                                                                */
+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* self, 
+										      PyObject* args, 
+										      PyObject* kwds) {
+	int dampArg;
+	if(!PyArg_ParseTuple(args, "i", &dampArg)) {
+		return NULL;		
+	}
+	
+	m_rotDampTime = dampArg;
+	if (m_rotDampTime < 0) m_rotDampTime = 0;
+
+	Py_Return;
+}
+/* 3. getRotDamp                                                                */
+char KX_ConstraintActuator::GetRotDamp_doc[] = 
+"getRotDamp()\n"
+"\tReturns the damping time for application of the constraint.\n";
+PyObject* KX_ConstraintActuator::PyGetRotDamp(PyObject* self, 
+										      PyObject* args, 
+										      PyObject* kwds){
+	return PyInt_FromLong(m_rotDampTime);
+}
+
+/* 2. setDirection                                                                */
+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* self, 
+										        PyObject* args, 
+										        PyObject* kwds) {
+	float x, y, z;
+	MT_Scalar len;
+	MT_Vector3 dir;
+
+	if(!PyArg_ParseTuple(args, "(fff)", &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_refDirection = dir/len;
+
+	Py_Return;
+}
+/* 3. getDirection                                                                */
+char KX_ConstraintActuator::GetDirection_doc[] = 
+"getDirection()\n"
+"\tReturns the reference direction of the orientation constraint as a 3-tuple.\n";
+PyObject* KX_ConstraintActuator::PyGetDirection(PyObject* self, 
+										        PyObject* args, 
+										        PyObject* kwds){
+	PyObject *retVal = PyList_New(3);
+
+	PyList_SetItem(retVal, 0, PyFloat_FromDouble(m_refDirection[0]));
+	PyList_SetItem(retVal, 1, PyFloat_FromDouble(m_refDirection[1]));
+	PyList_SetItem(retVal, 2, PyFloat_FromDouble(m_refDirection[2]));
+	return retVal;
+}
+
+/* 2. setOption                                                                */
+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* self, 
+										     PyObject* args, 
+										     PyObject* kwds) {
+	int option;
+	if(!PyArg_ParseTuple(args, "i", &option)) {
+		return NULL;		
+	}
+	
+	m_option = option;
+
+	Py_Return;
+}
+/* 3. getOption                                                              */
+char KX_ConstraintActuator::GetOption_doc[] = 
+"getOption()\n"
+"\tReturns the option parameter.\n";
+PyObject* KX_ConstraintActuator::PyGetOption(PyObject* self, 
+										     PyObject* args, 
+										     PyObject* kwds){
+	return PyInt_FromLong(m_option);
+}
+
+/* 2. setTime                                                                */
+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* self, 
+										   PyObject* args, 
+										   PyObject* kwds) {
+	int t;
+	if(!PyArg_ParseTuple(args, "i", &t)) {
+		return NULL;		
+	}
+	
+	if (t < 0)
+		t = 0;
+	m_activeTime = t;
+
+	Py_Return;
+}
+/* 3. getTime                                                                */
+char KX_ConstraintActuator::GetTime_doc[] = 
+"getTime()\n"
+"\tReturns the time parameter.\n";
+PyObject* KX_ConstraintActuator::PyGetTime(PyObject* self, 
+										   PyObject* args, 
+										   PyObject* kwds){
+	return PyInt_FromLong(m_activeTime);
+}
+
+/* 2. setProperty                                                                */
+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* self, 
+										       PyObject* args, 
+										       PyObject* kwds) {
+	char *property;
+	if (!PyArg_ParseTuple(args, "s", &property)) {
+		return NULL;
+	}
+	if (property == NULL) {
+		m_property[0] = 0;
+	} else {
+		strncpy(m_property, property, sizeof(m_property));
+		m_property[sizeof(m_property)-1] = 0;
+	}
+
+	Py_Return;
+}
+/* 3. getProperty                                                                */
+char KX_ConstraintActuator::GetProperty_doc[] = 
+"getProperty()\n"
+"\tReturns the property parameter.\n";
+PyObject* KX_ConstraintActuator::PyGetProperty(PyObject* self, 
+										       PyObject* args, 
+										       PyObject* kwds){
+	return PyString_FromString(m_property);
+}
+
+/* 4. setDistance                                                                 */
+char KX_ConstraintActuator::SetDistance_doc[] = 
+"setDistance(distance)\n"
+"\t- distance: float\n"
+"\tSets the target distance in distance constraint\n";
 /* 4. setMin                                                                 */
 char KX_ConstraintActuator::SetMin_doc[] = 
 "setMin(lower_bound)\n"
@@ -271,9 +638,7 @@ PyObject* KX_ConstraintActuator::PySetMin(PyObject* self,
 	}
 
 	switch (m_locrot) {
-	case KX_ACT_CONSTRAINT_LOCX:
-	case KX_ACT_CONSTRAINT_LOCY:
-	case KX_ACT_CONSTRAINT_LOCZ:
+	default:
 		m_minimumBound = minArg;
 		break;
 	case KX_ACT_CONSTRAINT_ROTX:
@@ -281,12 +646,14 @@ PyObject* KX_ConstraintActuator::PySetMin(PyObject* self,
 	case KX_ACT_CONSTRAINT_ROTZ:
 		m_minimumBound = MT_radians(minArg);
 		break;
-	default:
-		; /* error */
 	}
 
 	Py_Return;
 }
+/* 5. getDistance                                                                 */
+char KX_ConstraintActuator::GetDistance_doc[] = 
+"getDistance()\n"
+"\tReturns the distance parameter \n";
 /* 5. getMin                                                                 */
 char KX_ConstraintActuator::GetMin_doc[] = 
 "getMin()\n"
@@ -298,6 +665,11 @@ PyObject* KX_ConstraintActuator::PyGetMin(PyObject* self,
 	return PyFloat_FromDouble(m_minimumBound);
 }
 
+/* 6. setRayLength                                                                 */
+char KX_ConstraintActuator::SetRayLength_doc[] = 
+"setRayLength(length)\n"
+"\t- length: float\n"
+"\tSets the maximum ray length of the distance constraint\n";
 /* 6. setMax                                                                 */
 char KX_ConstraintActuator::SetMax_doc[] = 
 "setMax(upper_bound)\n"
@@ -313,9 +685,7 @@ PyObject* KX_ConstraintActuator::PySetMax(PyObject* self,
 	}
 
 	switch (m_locrot) {
-	case KX_ACT_CONSTRAINT_LOCX:
-	case KX_ACT_CONSTRAINT_LOCY:
-	case KX_ACT_CONSTRAINT_LOCZ:
+	default:
 		m_maximumBound = maxArg;
 		break;
 	case KX_ACT_CONSTRAINT_ROTX:
@@ -323,12 +693,14 @@ PyObject* KX_ConstraintActuator::PySetMax(PyObject* self,
 	case KX_ACT_CONSTRAINT_ROTZ:
 		m_maximumBound = MT_radians(maxArg);
 		break;
-	default:
-		; /* error */
 	}
 
 	Py_Return;
 }
+/* 7. getRayLength                                                                 */
+char KX_ConstraintActuator::GetRayLength_doc[] = 
+"getRayLength()\n"
+"\tReturns the length of the ray\n";
 /* 7. getMax                                                                 */
 char KX_ConstraintActuator::GetMax_doc[] = 
 "getMax()\n"
@@ -345,9 +717,19 @@ PyObject* KX_ConstraintActuator::PyGetMax(PyObject* self,
 /* 8. setLimit                                                               */
 char KX_ConstraintActuator::SetLimit_doc[] = 
 "setLimit(type)\n"
-"\t- type: KX_CONSTRAINTACT_LOCX, KX_CONSTRAINTACT_LOCY,\n"
-"\t        KX_CONSTRAINTACT_LOCZ, KX_CONSTRAINTACT_ROTX,\n"
-"\t        KX_CONSTRAINTACT_ROTY, or KX_CONSTRAINTACT_ROTZ.\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* self, 
 											PyObject* args, 
@@ -363,7 +745,7 @@ PyObject* KX_ConstraintActuator::PySetLimit(PyObject* self,
 }
 /* 9. getLimit                                                               */
 char KX_ConstraintActuator::GetLimit_doc[] = 
-"getLimit(type)\n"
+"getLimit()\n"
 "\tReturns the type of constraint.\n";
 PyObject* KX_ConstraintActuator::PyGetLimit(PyObject* self, 
 											PyObject* args, 
diff --git a/source/gameengine/Ketsji/KX_ConstraintActuator.h b/source/gameengine/Ketsji/KX_ConstraintActuator.h
index a21a5f30de6..5a1d4d23217 100644
--- a/source/gameengine/Ketsji/KX_ConstraintActuator.h
+++ b/source/gameengine/Ketsji/KX_ConstraintActuator.h
@@ -34,19 +34,31 @@
 
 #include "SCA_IActuator.h"
 #include "MT_Scalar.h"
+#include "MT_Vector3.h"
+#include "KX_ClientObjectInfo.h"
 
 class KX_ConstraintActuator : public SCA_IActuator
 {
 	Py_Header;
 protected:	
 	// Damp time (int),
-	int m_dampTime;
-	// min (float),
+	int m_posDampTime;
+	int m_rotDampTime;
+	// min (float) 
 	float m_minimumBound;
-	// max (float),
+	// max (float)
 	float m_maximumBound;
+	// reference direction
+	MT_Vector3 m_refDirection;
 	// locrotxyz choice (pick one): only one choice allowed at a time!
 	int m_locrot;
+	// active time of actuator
+	int m_activeTime;
+	int m_currentTime;
+	// option
+	int m_option;
+	// property to check
+	char m_property[32];
 
 	/**
 	 * Clamp <var> to <min>, <max>. Borders are included (in as far as
@@ -56,6 +68,7 @@ protected:
 
 	
  public:
+	 //  m_locrot
 	enum KX_CONSTRAINTTYPE {
 		KX_ACT_CONSTRAINT_NODEF = 0,
 		KX_ACT_CONSTRAINT_LOCX,
@@ -64,16 +77,37 @@ protected:
 		KX_ACT_CONSTRAINT_ROTX,
 		KX_ACT_CONSTRAINT_ROTY,
 		KX_ACT_CONSTRAINT_ROTZ,
+		KX_ACT_CONSTRAINT_DIRPX,
+		KX_ACT_CONSTRAINT_DIRPY,
+		KX_ACT_CONSTRAINT_DIRPZ,
+		KX_ACT_CONSTRAINT_DIRMX,
+		KX_ACT_CONSTRAINT_DIRMY,
+		KX_ACT_CONSTRAINT_DIRMZ,
+		KX_ACT_CONSTRAINT_ORIX,
+		KX_ACT_CONSTRAINT_ORIY,
+		KX_ACT_CONSTRAINT_ORIZ,
 		KX_ACT_CONSTRAINT_MAX
 	};
-
+	// match ACT_CONST_... values from BIF_interface.h
+	enum KX_CONSTRAINTOPT {
+		KX_ACT_CONSTRAINT_NORMAL = 64,
+		KX_ACT_CONSTRAINT_MATERIAL = 128,
+		KX_ACT_CONSTRAINT_PERMANENT = 256,
+		KX_ACT_CONSTRAINT_DISTANCE = 512
+	};
 	bool IsValidMode(KX_CONSTRAINTTYPE m); 
+	bool RayHit(KX_ClientObjectInfo* client, MT_Point3& hit_point, MT_Vector3& hit_normal, void * const data);
 
 	KX_ConstraintActuator(SCA_IObject* gameobj,
-						  int damptime,
+						  int posDamptime,
+						  int rotDampTime,
 						  float min,
 						  float max,
+						  float refDir[3],
 						  int locrot,
+						  int time,
+						  int option,
+						  char *property,
 						  PyTypeObject* T=&Type);
 	virtual ~KX_ConstraintActuator();
 	virtual CValue* GetReplica() {
@@ -94,13 +128,26 @@ protected:
 
 	KX_PYMETHOD_DOC(KX_ConstraintActuator,SetDamp);
 	KX_PYMETHOD_DOC(KX_ConstraintActuator,GetDamp);
+	KX_PYMETHOD_DOC(KX_ConstraintActuator,SetRotDamp);
+	KX_PYMETHOD_DOC(KX_ConstraintActuator,GetRotDamp);
+	KX_PYMETHOD_DOC(KX_ConstraintActuator,SetDirection);
+	KX_PYMETHOD_DOC(KX_ConstraintActuator,GetDirection);
+	KX_PYMETHOD_DOC(KX_ConstraintActuator,SetOption);
+	KX_PYMETHOD_DOC(KX_ConstraintActuator,GetOption);
+	KX_PYMETHOD_DOC(KX_ConstraintActuator,SetTime);
+	KX_PYMETHOD_DOC(KX_ConstraintActuator,GetTime);
+	KX_PYMETHOD_DOC(KX_ConstraintActuator,SetProperty);
+	KX_PYMETHOD_DOC(KX_ConstraintActuator,GetProperty);
 	KX_PYMETHOD_DOC(KX_ConstraintActuator,SetMin);
 	KX_PYMETHOD_DOC(KX_ConstraintActuator,GetMin);
+	static char SetDistance_doc[];
+	static char GetDistance_doc[];
 	KX_PYMETHOD_DOC(KX_ConstraintActuator,SetMax);
 	KX_PYMETHOD_DOC(KX_ConstraintActuator,GetMax);
+	static char SetRayLength_doc[];
+	static char GetRayLength_doc[];
 	KX_PYMETHOD_DOC(KX_ConstraintActuator,SetLimit);
 	KX_PYMETHOD_DOC(KX_ConstraintActuator,GetLimit);
-
 };
 
 #endif //__KX_CONSTRAINTACTUATOR
diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp
index c192cd01261..576ff3ec68f 100644
--- a/source/gameengine/Ketsji/KX_GameObject.cpp
+++ b/source/gameengine/Ketsji/KX_GameObject.cpp
@@ -78,11 +78,12 @@ KX_GameObject::KX_GameObject(
 	m_bSuspendDynamics(false),
 	m_bUseObjectColor(false),
 	m_bIsNegativeScaling(false),
+	m_pBlenderObject(NULL),
 	m_bVisible(true),
 	m_pPhysicsController1(NULL),
 	m_pPhysicsEnvironment(NULL),
-	m_isDeformable(false),
-	m_pHitObject(NULL)
+	m_pHitObject(NULL),
+	m_isDeformable(false)
 {
 	m_ignore_activity_culling = false;
 	m_pClient_info = new KX_ClientObjectInfo(this, KX_ClientObjectInfo::ACTOR);
@@ -237,6 +238,10 @@ void KX_GameObject::SetParent(KX_Scene *scene, KX_GameObject* obj)
 		if (rootlist->RemoveValue(this))
 			// the object was in parent list, decrement ref count as it's now removed
 			Release();
+		if (m_pPhysicsController1) 
+		{
+			m_pPhysicsController1->SuspendDynamics(true);
+		}
 	}
 }
 
@@ -257,6 +262,10 @@ void KX_GameObject::RemoveParent(KX_Scene *scene)
 		if (!rootlist->SearchValue(this))
 			// object was not in root list, add it now and increment ref count
 			rootlist->Add(AddRef());
+		if (m_pPhysicsController1) 
+		{
+			m_pPhysicsController1->RestoreDynamics();
+		}
 	}
 }
 
@@ -404,34 +413,25 @@ void KX_GameObject::ResetDebugColor()
 	SetDebugColor(0xff000000);
 }
 
+void KX_GameObject::InitIPO(bool ipo_as_force,
+							bool ipo_add,
+							bool ipo_local)
+{
+	SGControllerList::iterator it = GetSGNode()->GetSGControllerList().begin();
 
+	while (it != GetSGNode()->GetSGControllerList().end()) {
+		(*it)->SetOption(SG_Controller::SG_CONTR_IPO_RESET, true);
+		(*it)->SetOption(SG_Controller::SG_CONTR_IPO_IPO_AS_FORCE, ipo_as_force);
+		(*it)->SetOption(SG_Controller::SG_CONTR_IPO_IPO_ADD, ipo_add);
+		(*it)->SetOption(SG_Controller::SG_CONTR_IPO_LOCAL, ipo_local);
+		it++;
+	}
+} 
 
 void KX_GameObject::UpdateIPO(float curframetime,
-							  bool recurse,
-							  bool ipo_as_force,
-							  bool force_local) 
+							  bool recurse) 
 {
-
-	// The ipo-actuator needs a sumo reference... this is retrieved (unfortunately)
-	// by the iposgcontr itself...
-//		ipocontr->SetSumoReference(gameobj->GetSumoScene(), 
-//								   gameobj->GetSumoObject());
-
-
-	// The ipo has to be treated as a force, and not a displacement!
-	// For this case, we send some settings to the controller. This
-	// may need some caching...
-	if (ipo_as_force) {
-		SGControllerList::iterator it = GetSGNode()->GetSGControllerList().begin();
-
-		while (it != GetSGNode()->GetSGControllerList().end()) {
-			(*it)->SetOption(SG_Controller::SG_CONTR_IPO_IPO_AS_FORCE, ipo_as_force);
-			(*it)->SetOption(SG_Controller::SG_CONTR_IPO_FORCES_ACT_LOCAL, force_local);
-			it++;
-		}
-	} 
-
-	// The rest is the 'normal' update procedure.
+	// just the 'normal' update procedure.
 	GetSGNode()->SetSimulatedTime(curframetime,recurse);
 	GetSGNode()->UpdateWorldData(curframetime);
 	UpdateTransform();
@@ -580,7 +580,7 @@ void KX_GameObject::SetObjectColor(const MT_Vector4& rgbavec)
 	m_objectColor = rgbavec;
 }
 
-void KX_GameObject::AlignAxisToVect(const MT_Vector3& dir, int axis)
+void KX_GameObject::AlignAxisToVect(const MT_Vector3& dir, int axis, float fac)
 {
 	MT_Matrix3x3 orimat;
 	MT_Vector3 vect,ori,z,x,y;
@@ -593,6 +593,11 @@ void KX_GameObject::AlignAxisToVect(const MT_Vector3& dir, int axis)
 		cout << "alignAxisToVect() Error: Null vector!\n";
 		return;
 	}
+	
+	if (fac<=0.0) {
+		return;
+	}
+	
 	// normalize
 	vect /= len;
 	orimat = GetSGNode()->GetWorldOrientation();
@@ -602,7 +607,14 @@ void KX_GameObject::AlignAxisToVect(const MT_Vector3& dir, int axis)
 			ori = MT_Vector3(orimat[0][2], orimat[1][2], orimat[2][2]); //pivot axis
 			if (MT_abs(vect.dot(ori)) > 1.0-3.0*MT_EPSILON) //is the vector paralell to the pivot?
 				ori = MT_Vector3(orimat[0][1], orimat[1][1], orimat[2][1]); //change the pivot!
-			x = vect; 
+			if (fac == 1.0) {
+				x = vect;
+			} else {
+				x = (vect * fac) + ((orimat * MT_Vector3(1.0, 0.0, 0.0)) * (1-fac));
+				len = x.length();
+				if (MT_fuzzyZero(len)) x = vect;
+				else x /= len;
+			}
 			y = ori.cross(x);
 			z = x.cross(y);
 			break;
@@ -610,7 +622,14 @@ void KX_GameObject::AlignAxisToVect(const MT_Vector3& dir, int axis)
 			ori = MT_Vector3(orimat[0][0], orimat[1][0], orimat[2][0]);
 			if (MT_abs(vect.dot(ori)) > 1.0-3.0*MT_EPSILON)
 				ori = MT_Vector3(orimat[0][2], orimat[1][2], orimat[2][2]);
-			y = vect;
+			if (fac == 1.0) {
+				y = vect;
+			} else {
+				y = (vect * fac) + ((orimat * MT_Vector3(0.0, 1.0, 0.0)) * (1-fac));
+				len = y.length();
+				if (MT_fuzzyZero(len)) y = vect;
+				else y /= len;
+			}
 			z = ori.cross(y);
 			x = y.cross(z);
 			break;
@@ -618,7 +637,14 @@ void KX_GameObject::AlignAxisToVect(const MT_Vector3& dir, int axis)
 			ori = MT_Vector3(orimat[0][1], orimat[1][1], orimat[2][1]);
 			if (MT_abs(vect.dot(ori)) > 1.0-3.0*MT_EPSILON)
 				ori = MT_Vector3(orimat[0][0], orimat[1][0], orimat[2][0]);
-			z = vect;
+			if (fac == 1.0) {
+				z = vect;
+			} else {
+				z = (vect * fac) + ((orimat * MT_Vector3(0.0, 0.0, 1.0)) * (1-fac));
+				len = z.length();
+				if (MT_fuzzyZero(len)) z = vect;
+				else z /= len;
+			}
 			x = ori.cross(z);
 			y = z.cross(x);
 			break;
@@ -643,11 +669,19 @@ void KX_GameObject::AlignAxisToVect(const MT_Vector3& dir, int axis)
 		NodeSetLocalOrientation(orimat);
 }
 
+MT_Scalar KX_GameObject::GetMass()
+{
+	if (m_pPhysicsController1)
+	{
+		return m_pPhysicsController1->GetMass();
+	}
+	return 0.0;
+}
+
 MT_Vector3 KX_GameObject::GetLinearVelocity(bool local)
 {
-	MT_Vector3 velocity(0.0,0.0,0.0);
-	MT_Matrix3x3 ori, locvel;
-	int i, j; 
+	MT_Vector3 velocity(0.0,0.0,0.0), locvel;
+	MT_Matrix3x3 ori;
 	if (m_pPhysicsController1)
 	{
 		velocity = m_pPhysicsController1->GetLinearVelocity();
@@ -656,16 +690,33 @@ MT_Vector3 KX_GameObject::GetLinearVelocity(bool local)
 		{
 			ori = GetSGNode()->GetWorldOrientation();
 			
-			for(i=0; i < 3; i++)
-				for(j=0; j < 3; j++)
-					locvel[i][j]= velocity[i]*ori[i][j];
-			for(i=0; i < 3; i++)
-				velocity[i] = locvel[0][i] + locvel[1][i] + locvel[2][i];
+			locvel = velocity * ori;
+			return locvel;
 		}
 	}
 	return velocity;	
 }
 
+MT_Vector3 KX_GameObject::GetAngularVelocity(bool local)
+{
+	MT_Vector3 velocity(0.0,0.0,0.0), locvel;
+	MT_Matrix3x3 ori;
+	if (m_pPhysicsController1)
+	{
+		velocity = m_pPhysicsController1->GetAngularVelocity();
+		
+		if (local)
+		{
+			ori = GetSGNode()->GetWorldOrientation();
+			
+			locvel = velocity * ori;
+			return locvel;
+		}
+	}
+	return velocity;	
+}
+
+
 
 // scenegraph node stuff
 
@@ -718,6 +769,31 @@ void KX_GameObject::NodeSetRelativeScale(const MT_Vector3& scale)
 		GetSGNode()->RelativeScale(scale);
 }
 
+void KX_GameObject::NodeSetWorldPosition(const MT_Point3& trans)
+{
+	SG_Node* parent = m_pSGNode->GetSGParent();
+	if (parent != NULL)
+	{
+		// Make sure the objects have some scale
+		MT_Vector3 scale = parent->GetWorldScaling();
+		if (fabs(scale[0]) < FLT_EPSILON || 
+			fabs(scale[1]) < FLT_EPSILON || 
+			fabs(scale[2]) < FLT_EPSILON)
+		{ 
+			return; 
+		}
+		scale[0] = 1.0/scale[0];
+		scale[1] = 1.0/scale[1];
+		scale[2] = 1.0/scale[2];
+		MT_Matrix3x3 invori = parent->GetWorldOrientation().inverse();
+		MT_Vector3 newpos = invori*(trans-parent->GetWorldPosition())*scale;
+		NodeSetLocalPosition(MT_Point3(newpos[0],newpos[1],newpos[2]));
+	}
+	else 
+	{
+		NodeSetLocalPosition(trans);
+	}
+}
 
 
 void KX_GameObject::NodeUpdateGS(double time,bool bInitiator)
@@ -764,7 +840,7 @@ void KX_GameObject::Resume(void)
 	}
 }
 
-void KX_GameObject::Suspend(void)
+void KX_GameObject::Suspend()
 {
 	if ((!m_ignore_activity_culling) 
 		&& (!m_suspended))  {
@@ -783,30 +859,37 @@ void KX_GameObject::Suspend(void)
 
 
 PyMethodDef KX_GameObject::Methods[] = {
-	{"setVisible",(PyCFunction) KX_GameObject::sPySetVisible, METH_VARARGS},  
-	{"alignAxisToVect",(PyCFunction) KX_GameObject::sPyAlignAxisToVect, METH_VARARGS},
-	{"setPosition", (PyCFunction) KX_GameObject::sPySetPosition, METH_VARARGS},
-	{"getPosition", (PyCFunction) KX_GameObject::sPyGetPosition, METH_VARARGS},
-	{"getOrientation", (PyCFunction) KX_GameObject::sPyGetOrientation, METH_VARARGS},
-	{"setOrientation", (PyCFunction) KX_GameObject::sPySetOrientation, METH_VARARGS},
+	{"getPosition", (PyCFunction) KX_GameObject::sPyGetPosition, METH_NOARGS},
+	{"setPosition", (PyCFunction) KX_GameObject::sPySetPosition, METH_O},
 	{"getLinearVelocity", (PyCFunction) KX_GameObject::sPyGetLinearVelocity, METH_VARARGS},
+	{"setLinearVelocity", (PyCFunction) KX_GameObject::sPySetLinearVelocity, METH_VARARGS},
 	{"getVelocity", (PyCFunction) KX_GameObject::sPyGetVelocity, METH_VARARGS},
-	{"getMass", (PyCFunction) KX_GameObject::sPyGetMass, METH_VARARGS},
-	{"getReactionForce", (PyCFunction) KX_GameObject::sPyGetReactionForce, METH_VARARGS},
+	{"getMass", (PyCFunction) KX_GameObject::sPyGetMass, METH_NOARGS},
+	{"getReactionForce", (PyCFunction) KX_GameObject::sPyGetReactionForce, METH_NOARGS},
+	{"getOrientation", (PyCFunction) KX_GameObject::sPyGetOrientation, METH_NOARGS},
+	{"setOrientation", (PyCFunction) KX_GameObject::sPySetOrientation, METH_O},
+	{"getVisible",(PyCFunction) KX_GameObject::sPyGetVisible, METH_NOARGS},
+	{"setVisible",(PyCFunction) KX_GameObject::sPySetVisible, METH_O},
+	{"getState",(PyCFunction) KX_GameObject::sPyGetState, METH_NOARGS},
+	{"setState",(PyCFunction) KX_GameObject::sPySetState, METH_O},
+	{"alignAxisToVect",(PyCFunction) KX_GameObject::sPyAlignAxisToVect, METH_VARARGS},
+	{"getAxisVect",(PyCFunction) KX_GameObject::sPyGetAxisVect, METH_O},
+	{"suspendDynamics", (PyCFunction)KX_GameObject::sPySuspendDynamics,METH_NOARGS},
+	{"restoreDynamics", (PyCFunction)KX_GameObject::sPyRestoreDynamics,METH_NOARGS},
+	{"enableRigidBody", (PyCFunction)KX_GameObject::sPyEnableRigidBody,METH_NOARGS},
+	{"disableRigidBody", (PyCFunction)KX_GameObject::sPyDisableRigidBody,METH_NOARGS},
 	{"applyImpulse", (PyCFunction) KX_GameObject::sPyApplyImpulse, METH_VARARGS},
-	{"setCollisionMargin", (PyCFunction) KX_GameObject::sPySetCollisionMargin, METH_VARARGS},
-	{"suspendDynamics", (PyCFunction)KX_GameObject::sPySuspendDynamics,METH_VARARGS},
-	{"restoreDynamics", (PyCFunction)KX_GameObject::sPyRestoreDynamics,METH_VARARGS},
-	{"enableRigidBody", (PyCFunction)KX_GameObject::sPyEnableRigidBody,METH_VARARGS},
-	{"disableRigidBody", (PyCFunction)KX_GameObject::sPyDisableRigidBody,METH_VARARGS},
-	{"getParent", (PyCFunction)KX_GameObject::sPyGetParent,METH_VARARGS},
-	{"setParent", (PyCFunction)KX_GameObject::sPySetParent,METH_VARARGS},
-	{"removeParent", (PyCFunction)KX_GameObject::sPyRemoveParent,METH_VARARGS},
+	{"setCollisionMargin", (PyCFunction) KX_GameObject::sPySetCollisionMargin, METH_O},
+	{"getParent", (PyCFunction)KX_GameObject::sPyGetParent,METH_NOARGS},
+	{"setParent", (PyCFunction)KX_GameObject::sPySetParent,METH_O},
+	{"removeParent", (PyCFunction)KX_GameObject::sPyRemoveParent,METH_NOARGS},
 	{"getMesh", (PyCFunction)KX_GameObject::sPyGetMesh,METH_VARARGS},
-	{"getPhysicsId", (PyCFunction)KX_GameObject::sPyGetPhysicsId,METH_VARARGS},
-	KX_PYMETHODTABLE(KX_GameObject, getDistanceTo),
+	{"getPhysicsId", (PyCFunction)KX_GameObject::sPyGetPhysicsId,METH_NOARGS},
+	{"getPropertyNames", (PyCFunction)KX_GameObject::sPyGetPropertyNames,METH_NOARGS},
+	{"endObject",(PyCFunction) KX_GameObject::sPyEndObject, METH_NOARGS},
 	KX_PYMETHODTABLE(KX_GameObject, rayCastTo),
 	KX_PYMETHODTABLE(KX_GameObject, rayCast),
+	KX_PYMETHODTABLE(KX_GameObject, getDistanceTo),
 	{NULL,NULL} //Sentinel
 };
 
@@ -828,19 +911,18 @@ bool KX_GameObject::ConvertPythonVectorArgs(PyObject* args,
 }
 */
 
-
-PyObject* KX_GameObject::sPySetPosition(PyObject* self,
-										PyObject* args,
-										PyObject* kwds)
+PyObject* KX_GameObject::PyEndObject(PyObject* self)
 {
-	return ((KX_GameObject*) self)->PySetPosition(self, args, kwds);
-}
+
+	KX_Scene *scene = PHY_GetActiveScene();
+	scene->DelayedRemoveObject(this);
 	
+	return Py_None;
+
+}
 
 
-PyObject* KX_GameObject::PyGetPosition(PyObject* self,
-									   PyObject* args, 
-									   PyObject* kwds)
+PyObject* KX_GameObject::PyGetPosition(PyObject* self)
 {
 	return PyObjectFrom(NodeGetWorldPosition());
 }
@@ -894,7 +976,7 @@ PyObject* KX_GameObject::_getattr(const STR_String& attr)
 			parent->AddRef();
 			return parent;
 		}
-		Py_Return;
+		Py_RETURN_NONE;
 	}
 
 	if (attr == "visible")
@@ -911,6 +993,14 @@ PyObject* KX_GameObject::_getattr(const STR_String& attr)
 		
 	if (attr == "name")
 		return PyString_FromString(m_name.ReadPtr());
+	if (attr == "timeOffset") {
+		if (m_pSGNode->GetSGParent()->IsSlowParent()) {
+			return PyFloat_FromDouble(static_cast<KX_SlowParentRelation *>(m_pSGNode->GetSGParent()->GetParentRelation())->GetTimeOffset());
+		} else {
+			return PyFloat_FromDouble(0.0);
+		}
+	}
+	
 	
 	_getattr_up(SCA_IObject);
 }
@@ -932,6 +1022,19 @@ int KX_GameObject::_setattr(const STR_String& attr, PyObject *value)	// _setattr
 			return 0;
 		}
 	}
+
+	if (PyFloat_Check(value))
+	{
+		MT_Scalar val = PyFloat_AsDouble(value);
+		if (attr == "timeOffset") {
+			if (m_pSGNode->GetSGParent() && m_pSGNode->GetSGParent()->IsSlowParent()) {
+				static_cast<KX_SlowParentRelation *>(m_pSGNode->GetSGParent()->GetParentRelation())->SetTimeOffset(val);
+				return 0;
+			} else {
+				return 0;
+			}		
+		}
+	}
 	
 	if (PySequence_Check(value))
 	{
@@ -1034,25 +1137,68 @@ PyObject* KX_GameObject::PyGetLinearVelocity(PyObject* self,
 	}
 }
 
-
-
-PyObject* KX_GameObject::PySetVisible(PyObject* self,
-									  PyObject* args,
-									  PyObject* kwds)
+PyObject* KX_GameObject::PySetLinearVelocity(PyObject* self, 
+											 PyObject* args, 
+											 PyObject* kwds)
 {
-	int visible = 1;
+	int local = 0;
+	PyObject* pyvect;
 	
-	if (PyArg_ParseTuple(args,"i",&visible))
-	{
-		MarkVisible(visible!=0);
-		m_bVisible = (visible!=0);
+	if (PyArg_ParseTuple(args,"O|i",&pyvect,&local)) {
+		MT_Vector3 velocity;
+		if (PyVecTo(pyvect, velocity)) {
+			setLinearVelocity(velocity, (local!=0));
+			Py_RETURN_NONE;
+		}
 	}
-	else
-	{
-		return NULL;	     
-	}
-	Py_Return;
+	return NULL;
+}
+
+PyObject* KX_GameObject::PySetVisible(PyObject* self, PyObject* value)
+{
+	int visible = PyInt_AsLong(value);
 	
+	if (visible==-1 && PyErr_Occurred()) {
+		PyErr_SetString(PyExc_TypeError, "expected 0 or 1");
+		return NULL;
+	}
+	
+	MarkVisible(visible!=0);
+	m_bVisible = (visible!=0);
+	Py_RETURN_NONE;
+	
+}
+
+PyObject* KX_GameObject::PyGetVisible(PyObject* self)
+{
+	return PyInt_FromLong(m_bVisible);	
+}
+
+PyObject* KX_GameObject::PyGetState(PyObject* self)
+{
+	int state = 0;
+	state |= GetState();
+	return PyInt_FromLong(state);
+}
+
+PyObject* KX_GameObject::PySetState(PyObject* self, PyObject* value)
+{
+	int state_i = PyInt_AsLong(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;
 }
 
 
@@ -1072,6 +1218,9 @@ PyObject* KX_GameObject::PyGetVelocity(PyObject* self,
 		if (pypos)
 			PyVecTo(pypos, point);
 	}
+	else {
+		return NULL;
+	}
 	
 	if (m_pPhysicsController1)
 	{
@@ -1083,26 +1232,14 @@ PyObject* KX_GameObject::PyGetVelocity(PyObject* self,
 
 
 
-PyObject* KX_GameObject::PyGetMass(PyObject* self, 
-								   PyObject* args, 
-								   PyObject* kwds)
+PyObject* KX_GameObject::PyGetMass(PyObject* self)
 {
-	PyObject* pymass = NULL;
-	
-	float mass = GetPhysicsController()->GetMass();
-	pymass = PyFloat_FromDouble(mass);
-
-	if (pymass)
-		return pymass;
-	
-	Py_Return;
+	return PyFloat_FromDouble(GetPhysicsController()->GetMass());
 }
 
 
 
-PyObject* KX_GameObject::PyGetReactionForce(PyObject* self, 
-											PyObject* args, 
-											PyObject* kwds)
+PyObject* KX_GameObject::PyGetReactionForce(PyObject* self)
 {
 	// only can get the velocity if we have a physics object connected to us...
 	return PyObjectFrom(GetPhysicsController()->getReactionForce());
@@ -1110,32 +1247,25 @@ PyObject* KX_GameObject::PyGetReactionForce(PyObject* self,
 
 
 
-PyObject* KX_GameObject::PyEnableRigidBody(PyObject* self, 
-										   PyObject* args, 
-										   PyObject* kwds)
+PyObject* KX_GameObject::PyEnableRigidBody(PyObject* self)
 {
-	
 	GetPhysicsController()->setRigidBody(true);
 
-	Py_Return;
+	Py_RETURN_NONE;
 }
 
 
 
-PyObject* KX_GameObject::PyDisableRigidBody(PyObject* self, 
-											PyObject* args, 
-											PyObject* kwds)
+PyObject* KX_GameObject::PyDisableRigidBody(PyObject* self)
 {
 	GetPhysicsController()->setRigidBody(false);
 
-	Py_Return;
+	Py_RETURN_NONE;
 }
 
 
 
-PyObject* KX_GameObject::PyGetParent(PyObject* self, 
-									 PyObject* args, 
-									 PyObject* kwds)
+PyObject* KX_GameObject::PyGetParent(PyObject* self)
 {
 	KX_GameObject* parent = this->GetParent();
 	if (parent)
@@ -1143,33 +1273,31 @@ PyObject* KX_GameObject::PyGetParent(PyObject* self,
 		parent->AddRef();
 		return parent;
 	}
-	Py_Return;
+	Py_RETURN_NONE;
 }
 
-PyObject* KX_GameObject::PySetParent(PyObject* self, 
-									 PyObject* args, 
-									 PyObject* kwds)
+PyObject* KX_GameObject::PySetParent(PyObject* self, PyObject* value)
 {
-	PyObject* gameobj;
-	if (PyArg_ParseTuple(args, "O!", &KX_GameObject::Type, &gameobj))
-	{
-		// The object we want to set as parent
-		CValue *m_ob = (CValue*)gameobj;
-		KX_GameObject *obj = ((KX_GameObject*)m_ob);
-		KX_Scene *scene = PHY_GetActiveScene();
-		
-		this->SetParent(scene, obj);
+	if (!PyObject_TypeCheck(value, &KX_GameObject::Type)) {
+		PyErr_SetString(PyExc_TypeError, "expected a KX_GameObject type");
+		return NULL;
 	}
-	Py_Return;
+	
+	// The object we want to set as parent
+	CValue *m_ob = (CValue*)value;
+	KX_GameObject *obj = ((KX_GameObject*)m_ob);
+	KX_Scene *scene = PHY_GetActiveScene();
+	
+	this->SetParent(scene, obj);
+		
+	Py_RETURN_NONE;
 }
 
-PyObject* KX_GameObject::PyRemoveParent(PyObject* self, 
-									 PyObject* args, 
-									 PyObject* kwds)
+PyObject* KX_GameObject::PyRemoveParent(PyObject* self)
 {
 	KX_Scene *scene = PHY_GetActiveScene();
 	this->RemoveParent(scene);
-	Py_Return;
+	Py_RETURN_NONE;
 }
 
 PyObject* KX_GameObject::PyGetMesh(PyObject* self, 
@@ -1186,28 +1314,28 @@ PyObject* KX_GameObject::PyGetMesh(PyObject* self,
 			return meshproxy;
 		}
 	}
-	Py_Return;
+	Py_RETURN_NONE;
 }
 
 
 
 
 
-PyObject* KX_GameObject::PySetCollisionMargin(PyObject* self, 
-										PyObject* args, 
-										PyObject* kwds)
+PyObject* KX_GameObject::PySetCollisionMargin(PyObject* self, PyObject* value)
 {
-	float collisionMargin;
-	if (PyArg_ParseTuple(args, "f", &collisionMargin))
-	{
-		if (m_pPhysicsController1)
-		{
-			m_pPhysicsController1->setMargin(collisionMargin);
-			Py_Return;
-		}
-
+	float collisionMargin = PyFloat_AsDouble(value);
+	
+	if (collisionMargin==-1 && PyErr_Occurred()) {
+		PyErr_SetString(PyExc_TypeError, "expected a float");
+		return NULL;
 	}
 	
+	if (m_pPhysicsController1)
+	{
+		m_pPhysicsController1->setMargin(collisionMargin);
+		Py_RETURN_NONE;
+	}
+	PyErr_SetString(PyExc_RuntimeError, "This object has no physics controller");
 	return NULL;
 }
 
@@ -1219,17 +1347,20 @@ PyObject* KX_GameObject::PyApplyImpulse(PyObject* self,
 {
 	PyObject* pyattach;
 	PyObject* pyimpulse;
+	
+	if (!m_pPhysicsController1)	{
+		PyErr_SetString(PyExc_RuntimeError, "This object has no physics controller");
+		return NULL;
+	}
+	
 	if (PyArg_ParseTuple(args, "OO", &pyattach, &pyimpulse))
 	{
 		MT_Point3  attach;
 		MT_Vector3 impulse;
-		if (m_pPhysicsController1)
+		if (PyVecTo(pyattach, attach) && PyVecTo(pyimpulse, impulse))
 		{
-			if (PyVecTo(pyattach, attach) && PyVecTo(pyimpulse, impulse))
-			{
-				m_pPhysicsController1->applyImpulse(attach, impulse);
-				Py_Return;
-			}
+			m_pPhysicsController1->applyImpulse(attach, impulse);
+			Py_RETURN_NONE;
 		}
 
 	}
@@ -1239,80 +1370,46 @@ PyObject* KX_GameObject::PyApplyImpulse(PyObject* self,
 
 
 
-PyObject* KX_GameObject::PySuspendDynamics(PyObject* self, 
-										   PyObject* args, 
-										   PyObject* kwds)
+PyObject* KX_GameObject::PySuspendDynamics(PyObject* self)
 {
-	if (m_bSuspendDynamics)
-	{
-		Py_Return;
-	}
-	
-	if (m_pPhysicsController1)
-	{
-		m_pPhysicsController1->SuspendDynamics();
-	}
-	m_bSuspendDynamics = true;
-	
-	Py_Return;
+	SuspendDynamics();
+	Py_RETURN_NONE;
 }
 
 
 
-PyObject* KX_GameObject::PyRestoreDynamics(PyObject* self, 
-										   PyObject* args, 
-										   PyObject* kwds)
+PyObject* KX_GameObject::PyRestoreDynamics(PyObject* self)
 {
-	
-	if (!m_bSuspendDynamics)
-	{
-		Py_Return;
-	}
-	
-	if (m_pPhysicsController1)
-	{
-		m_pPhysicsController1->RestoreDynamics();
-	}
-	m_bSuspendDynamics = false;
-	
-	Py_Return;
+	RestoreDynamics();
+	Py_RETURN_NONE;
 }
 
 
 
-PyObject* KX_GameObject::PyGetOrientation(PyObject* self,
-										  PyObject* args,
-										  PyObject* kwds) //keywords
+PyObject* KX_GameObject::PyGetOrientation(PyObject* self) //keywords
 {
 	return PyObjectFrom(NodeGetWorldOrientation());
 }
 
 
 
-PyObject* KX_GameObject::PySetOrientation(PyObject* self, 
-										  PyObject* args, 
-										  PyObject* kwds)
+PyObject* KX_GameObject::PySetOrientation(PyObject* self, PyObject* value)
 {
-	PyObject* pylist;
-	
-	if (PyArg_ParseTuple(args,"O",&pylist))
+	MT_Matrix3x3 matrix;
+	if (PyObject_IsMT_Matrix(value, 3) && PyMatTo(value, matrix))
 	{
-		MT_Matrix3x3 matrix;
-		if (PyObject_IsMT_Matrix(pylist, 3) && PyMatTo(pylist, matrix))
-		{
-			NodeSetLocalOrientation(matrix);
-			NodeUpdateGS(0.f,true);
-			Py_Return;
-		}
-	
-		MT_Quaternion quat;
-		if (PyVecTo(pylist, quat))
-		{
-			matrix.setRotation(quat);
-			NodeSetLocalOrientation(matrix);
-			NodeUpdateGS(0.f,true);
-			Py_Return;
-		}
+		NodeSetLocalOrientation(matrix);
+		NodeUpdateGS(0.f,true);
+		Py_RETURN_NONE;
+	}
+
+	MT_Quaternion quat;
+	if (PyVecTo(value, quat))
+	{
+		matrix.setRotation(quat);
+		NodeSetLocalOrientation(matrix);
+		NodeUpdateGS(0.f,true);
+		Py_RETURN_NONE;
 	}
 	return NULL;
 }
@@ -1323,37 +1420,44 @@ PyObject* KX_GameObject::PyAlignAxisToVect(PyObject* self,
 {
 	PyObject* pyvect;
 	int axis = 2; //z axis is the default
+	float fac = 1.0;
 	
-	if (PyArg_ParseTuple(args,"O|i",&pyvect,&axis))
+	if (PyArg_ParseTuple(args,"O|if",&pyvect,&axis, &fac))
 	{
 		MT_Vector3 vect;
 		if (PyVecTo(pyvect, vect))
 		{
-			AlignAxisToVect(vect,axis);				
-			Py_Return;
+			AlignAxisToVect(vect,axis,fac);
+			Py_RETURN_NONE;
 		}
 	}
 	return NULL;
 }
 
-PyObject* KX_GameObject::PySetPosition(PyObject* self, 
-									   PyObject* args, 
-									   PyObject* kwds)
+PyObject* KX_GameObject::PyGetAxisVect(PyObject* self, PyObject* value)
 {
-	MT_Point3 pos;
-	if (PyVecArgTo(args, pos))
+	MT_Vector3 vect;
+	if (PyVecTo(value, vect))
 	{
-		NodeSetLocalPosition(pos);
-		NodeUpdateGS(0.f,true);
-		Py_Return;
+		return PyObjectFrom(NodeGetWorldOrientation() * vect);
 	}
-	
 	return NULL;
 }
 
-PyObject* KX_GameObject::PyGetPhysicsId(PyObject* self,
-											   PyObject* args,
-											   PyObject* kwds)
+PyObject* KX_GameObject::PySetPosition(PyObject* self, PyObject* value)
+{
+	MT_Point3 pos;
+	if (PyVecTo(value, pos))
+	{
+		NodeSetLocalPosition(pos);
+		NodeUpdateGS(0.f,true);
+		Py_RETURN_NONE;
+	}
+
+	return NULL;
+}
+
+PyObject* KX_GameObject::PyGetPhysicsId(PyObject* self)
 {
 	KX_IPhysicsController* ctrl = GetPhysicsController();
 	uint_ptr physid=0;
@@ -1364,6 +1468,11 @@ PyObject* KX_GameObject::PyGetPhysicsId(PyObject* self,
 	return PyInt_FromLong((long)physid);
 }
 
+PyObject* KX_GameObject::PyGetPropertyNames(PyObject* self)
+{
+	return ConvertKeysToPython();
+}
+
 KX_PYMETHODDEF_DOC(KX_GameObject, getDistanceTo,
 "getDistanceTo(other): get distance to another point/KX_GameObject")
 {
@@ -1423,8 +1532,10 @@ KX_PYMETHODDEF_DOC(KX_GameObject, rayCastTo,
 	{
 		KX_GameObject *other;
 		PyErr_Clear();
-		if (!PyType_IsSubtype(pyarg->ob_type, &KX_GameObject::Type))
+		if (!PyType_IsSubtype(pyarg->ob_type, &KX_GameObject::Type)) {
+			PyErr_SetString(PyExc_TypeError, "the first argument to rayCastTo must be a vector or a KX_GameObject");
 			return NULL;
+		}
 		other = static_cast<KX_GameObject*>(pyarg);
 		toPoint = other->NodeGetWorldPosition();
 	}
@@ -1458,7 +1569,7 @@ KX_PYMETHODDEF_DOC(KX_GameObject, rayCastTo,
 		m_pHitObject->AddRef();
 		return m_pHitObject;
 	}
-	Py_Return;
+	Py_RETURN_NONE;
 }
 
 KX_PYMETHODDEF_DOC(KX_GameObject, rayCast,
@@ -1484,8 +1595,10 @@ KX_PYMETHODDEF_DOC(KX_GameObject, rayCast,
 	if (!PyVecTo(pyto, toPoint))
 	{
 		PyErr_Clear();
-		if (!PyType_IsSubtype(pyto->ob_type, &KX_GameObject::Type))
+		if (!PyType_IsSubtype(pyto->ob_type, &KX_GameObject::Type)) {
+			PyErr_SetString(PyExc_TypeError, "the first argument to rayCast must be a vector or a KX_GameObject");
 			return NULL;
+		}
 		other = static_cast<KX_GameObject*>(pyto);
 		toPoint = other->NodeGetWorldPosition();
 	}
@@ -1496,19 +1609,25 @@ KX_PYMETHODDEF_DOC(KX_GameObject, rayCast,
 	else if (!PyVecTo(pyfrom, fromPoint))
 	{
 		PyErr_Clear();
-		if (!PyType_IsSubtype(pyfrom->ob_type, &KX_GameObject::Type))
+		if (!PyType_IsSubtype(pyfrom->ob_type, &KX_GameObject::Type)) {
+			PyErr_SetString(PyExc_TypeError, "the second optional argument to rayCast must be a vector or a KX_GameObject");
 			return NULL;
+		}
 		other = static_cast<KX_GameObject*>(pyfrom);
 		fromPoint = other->NodeGetWorldPosition();
 	}
-
-	if (dist != 0.0f)
-	{
+	
+	if (dist != 0.0f) {
 		MT_Vector3 toDir = toPoint-fromPoint;
+		if (MT_fuzzyZero(toDir.length2())) {
+			return Py_BuildValue("OOO", Py_None, Py_None, Py_None);
+		}
 		toDir.normalize();
 		toPoint = fromPoint + (dist) * toDir;
+	} else if (MT_fuzzyZero((toPoint-fromPoint).length2())) {
+		return Py_BuildValue("OOO", Py_None, Py_None, Py_None);
 	}
-
+	
 	MT_Point3 resultPoint;
 	MT_Vector3 resultNormal;
 	PHY_IPhysicsEnvironment* pe = GetPhysicsEnvironment();
@@ -1541,7 +1660,7 @@ KX_PYMETHODDEF_DOC(KX_GameObject, rayCast,
 		//	resultNormal[0], resultNormal[1], resultNormal[2]);
 	}
 	return Py_BuildValue("OOO", Py_None, Py_None, Py_None);
-	//Py_Return;
+	//Py_RETURN_NONE;
 }
 
 /* --------------------------------------------------------------------- 
diff --git a/source/gameengine/Ketsji/KX_GameObject.h b/source/gameengine/Ketsji/KX_GameObject.h
index 56b9f3f6375..eba154e1094 100644
--- a/source/gameengine/Ketsji/KX_GameObject.h
+++ b/source/gameengine/Ketsji/KX_GameObject.h
@@ -45,9 +45,9 @@
 #include "GEN_Map.h"
 #include "GEN_HashedPtr.h"
 #include "KX_Scene.h"
-
-#define KX_FIXED_FRAME_PER_SEC 25.0f
-#define KX_FIXED_SEC_PER_FRAME (1.0f / KX_FIXED_FRAME_PER_SEC)
+#include "KX_KetsjiEngine.h" /* for m_anim_framerate */
+#include "KX_IPhysicsController.h" /* for suspend/resume */
+#include "DNA_object_types.h"
 #define KX_OB_DYNAMIC 1
 
 
@@ -56,7 +56,7 @@ struct KX_ClientObjectInfo;
 class RAS_MeshObject;
 class KX_IPhysicsController;
 class PHY_IPhysicsEnvironment;
-
+struct Object;
 
 /**
  * KX_GameObject is the main class for dynamic objects.
@@ -72,6 +72,7 @@ protected:
 	STR_String							m_text;
 	int									m_layer;
 	std::vector<RAS_MeshObject*>		m_meshes;
+	struct Object*						m_pBlenderObject;
 	
 	bool								m_bSuspendDynamics;
 	bool								m_bUseObjectColor;
@@ -258,13 +259,28 @@ public:
 		bool local=false
 	);
 
+	/**
+	 * Return the mass of the object
+	 */
+		MT_Scalar	
+	GetMass();
+
+	/** 
+	 * Return the angular velocity of the game object.
+	 */
+		MT_Vector3 
+	GetAngularVelocity(
+		bool local=false
+	);
+
 	/** 
 	 * Align the object to a given normal.
 	 */
 		void 
 	AlignAxisToVect(
 		const MT_Vector3& vect,
-		int axis = 2 
+		int axis = 2,
+		float fac = 1.0
 	);
 
 	/** 
@@ -324,6 +340,9 @@ public:
 
 	void	NodeSetRelativeScale(	const MT_Vector3& scale	);
 
+	// adapt local position so that world position is set to desired position
+	void	NodeSetWorldPosition(const MT_Point3& trans);
+
 		void						
 	NodeUpdateGS(
 		double time,
@@ -360,6 +379,27 @@ public:
 		return m_pSGNode;
 	}
 
+	/**
+	 * @section blender object accessor functions.
+	 */
+
+	struct Object* GetBlenderObject( )
+	{
+		return m_pBlenderObject;
+	}
+
+	void SetBlenderObject( struct Object* obj)
+	{
+		m_pBlenderObject = obj;
+	}
+	
+	bool IsDupliGroup()
+	{ 
+		return (m_pBlenderObject &&
+				(m_pBlenderObject->transflag & OB_DUPLIGROUP) &&
+				m_pBlenderObject->dup_group != NULL) ? true : false;
+	}
+
 	/**
 	 * Set the Scene graph node for this game object.
 	 * warning - it is your responsibility to make sure
@@ -458,15 +498,23 @@ public:
 	UpdateNonDynas(
 	);
 
+	/**
+	 * Function to set IPO option at start of IPO
+	 */ 
+		void	
+	InitIPO(
+		bool ipo_as_force,
+		bool ipo_add,
+		bool ipo_local
+	);
+
 	/**
 	 * Odd function to update an ipo. ???
 	 */ 
 		void	
 	UpdateIPO(
 		float curframetime,
-		bool recurse, 
-		bool ipo_as_force,
-		bool force_ipo_local
+		bool recurse
 	);
 	/**
 	 * Updates Material Ipo data 
@@ -630,6 +678,32 @@ public:
 	 */
 	void Resume(void);
 	
+	void SuspendDynamics(void) {
+		if (m_bSuspendDynamics)
+		{
+			return;
+		}
+	
+		if (m_pPhysicsController1)
+		{
+			m_pPhysicsController1->SuspendDynamics();
+		}
+		m_bSuspendDynamics = true;
+	}
+	
+	void RestoreDynamics(void) {	
+		if (!m_bSuspendDynamics)
+		{
+			return;
+		}
+	
+		if (m_pPhysicsController1)
+		{
+			m_pPhysicsController1->RestoreDynamics();
+		}
+		m_bSuspendDynamics = false;
+	}
+	
 	KX_ClientObjectInfo* getClientInfo() { return m_pClient_info; }
 	/**
 	 * @section Python interface functions.
@@ -648,44 +722,38 @@ public:
 		PyObject *value
 	);		// _setattr method
 
-		PyObject*					
-	PySetPosition(
-		PyObject* self,
-		PyObject* args,
-		PyObject* kwds
-	);
-
-	static 
-		PyObject*			
-	sPySetPosition(
-		PyObject* self,
-		PyObject* args,
-		PyObject* kwds
-	);
-	
-	KX_PYMETHOD(KX_GameObject,GetPosition);
+	KX_PYMETHOD_NOARGS(KX_GameObject,GetPosition);
+	KX_PYMETHOD_O(KX_GameObject,SetPosition);
 	KX_PYMETHOD(KX_GameObject,GetLinearVelocity);
+	KX_PYMETHOD(KX_GameObject,SetLinearVelocity);
 	KX_PYMETHOD(KX_GameObject,GetVelocity);
-	KX_PYMETHOD(KX_GameObject,GetMass);
-	KX_PYMETHOD(KX_GameObject,GetReactionForce);
-	KX_PYMETHOD(KX_GameObject,GetOrientation);
-	KX_PYMETHOD(KX_GameObject,SetOrientation);
-	KX_PYMETHOD(KX_GameObject,SetVisible);
+	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_O(KX_GameObject,SetVisible);
+	KX_PYMETHOD_NOARGS(KX_GameObject,GetState);
+	KX_PYMETHOD_O(KX_GameObject,SetState);
 	KX_PYMETHOD(KX_GameObject,AlignAxisToVect);
-	KX_PYMETHOD(KX_GameObject,SuspendDynamics);
-	KX_PYMETHOD(KX_GameObject,RestoreDynamics);
-	KX_PYMETHOD(KX_GameObject,EnableRigidBody);
-	KX_PYMETHOD(KX_GameObject,DisableRigidBody);
+	KX_PYMETHOD_O(KX_GameObject,GetAxisVect);
+	KX_PYMETHOD_NOARGS(KX_GameObject,SuspendDynamics);
+	KX_PYMETHOD_NOARGS(KX_GameObject,RestoreDynamics);
+	KX_PYMETHOD_NOARGS(KX_GameObject,EnableRigidBody);
+	KX_PYMETHOD_NOARGS(KX_GameObject,DisableRigidBody);
 	KX_PYMETHOD(KX_GameObject,ApplyImpulse);
-	KX_PYMETHOD(KX_GameObject,SetCollisionMargin);
+	KX_PYMETHOD_O(KX_GameObject,SetCollisionMargin);
+	KX_PYMETHOD_NOARGS(KX_GameObject,GetParent);
+	KX_PYMETHOD_O(KX_GameObject,SetParent);
+	KX_PYMETHOD_NOARGS(KX_GameObject,RemoveParent);
 	KX_PYMETHOD(KX_GameObject,GetMesh);
-	KX_PYMETHOD(KX_GameObject,GetParent);
-	KX_PYMETHOD(KX_GameObject,SetParent);
-	KX_PYMETHOD(KX_GameObject,RemoveParent);
-	KX_PYMETHOD(KX_GameObject,GetPhysicsId);
+	KX_PYMETHOD_NOARGS(KX_GameObject,GetPhysicsId);
+	KX_PYMETHOD_NOARGS(KX_GameObject,GetPropertyNames);
+	KX_PYMETHOD_NOARGS(KX_GameObject,EndObject);
 	KX_PYMETHOD_DOC(KX_GameObject,rayCastTo);
 	KX_PYMETHOD_DOC(KX_GameObject,rayCast);
 	KX_PYMETHOD_DOC(KX_GameObject,getDistanceTo);
+	
 private :
 
 	/**	
diff --git a/source/gameengine/Ketsji/KX_IPO_SGController.cpp b/source/gameengine/Ketsji/KX_IPO_SGController.cpp
index 5303e9a9e85..d3aa924665e 100644
--- a/source/gameengine/Ketsji/KX_IPO_SGController.cpp
+++ b/source/gameengine/Ketsji/KX_IPO_SGController.cpp
@@ -55,7 +55,8 @@ typedef unsigned long uint_ptr;
 // start on another frame, the 1.0 should change.
 KX_IpoSGController::KX_IpoSGController() 
 : m_ipo_as_force(false),
-  m_force_ipo_acts_local(false),
+  m_ipo_add(false),
+  m_ipo_local(false),
   m_modified(true),
   m_ipo_start_initialized(false),
   m_ipotime(1.0)
@@ -75,8 +76,23 @@ void KX_IpoSGController::SetOption(
 		m_ipo_as_force = (value != 0);
 		m_modified = true;
 		break;
-	case SG_CONTR_IPO_FORCES_ACT_LOCAL:
-		m_force_ipo_acts_local = (value != 0);
+	case SG_CONTR_IPO_IPO_ADD:
+		m_ipo_add = (value != 0);
+		m_modified = true;
+		break;
+	case SG_CONTR_IPO_RESET:
+		if (m_ipo_start_initialized && value) {
+			m_ipo_start_initialized = false;
+			m_modified = true;
+		}
+		break;
+	case SG_CONTR_IPO_LOCAL:
+		if (value/* && ((SG_Node*)m_pObject)->GetSGParent() == NULL*/) {
+			// only accept local Ipo if the object has no parent
+			m_ipo_local = true;
+		} else {
+			m_ipo_local = false;
+		}
 		m_modified = true;
 		break;
 	default:
@@ -129,15 +145,19 @@ bool KX_IpoSGController::Update(double currentTime)
 			{
 				if (m_game_object && ob) 
 				{
-					m_game_object->GetPhysicsController()->ApplyForce(m_force_ipo_acts_local ?
+					m_game_object->GetPhysicsController()->ApplyForce(m_ipo_local ?
 						ob->GetWorldOrientation() * m_ipo_xform.GetPosition() :
 						m_ipo_xform.GetPosition(), false);
 				}
 			} 
 			else
 			{
-				//by default, leave object as it stands
-				MT_Point3 newPosition = ob->GetLocalPosition();
+				// Local ipo should be defined with the object position at (0,0,0)
+				// Local transform is applied to the object based on initial position
+				MT_Point3 newPosition(0.0,0.0,0.0);
+				
+				if (!m_ipo_add)
+					newPosition = ob->GetLocalPosition();
 				//apply separate IPO channels if there is any data in them
 				//Loc and dLoc act by themselves or are additive
 				//LocX and dLocX
@@ -145,23 +165,28 @@ bool KX_IpoSGController::Update(double currentTime)
 					newPosition[0] = (m_ipo_channels_active[OB_DLOC_X] ? m_ipo_xform.GetPosition()[0] + m_ipo_xform.GetDeltaPosition()[0] : m_ipo_xform.GetPosition()[0]);
 				}
 				else if (m_ipo_channels_active[OB_DLOC_X] && m_ipo_start_initialized) {
-					newPosition[0] = (m_ipo_start_point[0] + m_ipo_xform.GetDeltaPosition()[0]);
+					newPosition[0] = (((!m_ipo_add)?m_ipo_start_point[0]:0.0) + m_ipo_xform.GetDeltaPosition()[0]);
 				}
 				//LocY and dLocY
 				if (m_ipo_channels_active[OB_LOC_Y]) {
 					newPosition[1] = (m_ipo_channels_active[OB_DLOC_Y] ? m_ipo_xform.GetPosition()[1] + m_ipo_xform.GetDeltaPosition()[1] : m_ipo_xform.GetPosition()[1]);
 				}
 				else if (m_ipo_channels_active[OB_DLOC_Y] && m_ipo_start_initialized) {
-					newPosition[1] = (m_ipo_start_point[1] + m_ipo_xform.GetDeltaPosition()[1]);
+					newPosition[1] = (((!m_ipo_add)?m_ipo_start_point[1]:0.0) + m_ipo_xform.GetDeltaPosition()[1]);
 				}
 				//LocZ and dLocZ
 				if (m_ipo_channels_active[OB_LOC_Z]) {
 					newPosition[2] = (m_ipo_channels_active[OB_DLOC_Z] ? m_ipo_xform.GetPosition()[2] + m_ipo_xform.GetDeltaPosition()[2] : m_ipo_xform.GetPosition()[2]);
 				}
 				else if (m_ipo_channels_active[OB_DLOC_Z] && m_ipo_start_initialized) {
-					newPosition[2] = (m_ipo_start_point[2] + m_ipo_xform.GetDeltaPosition()[2]);
+					newPosition[2] = (((!m_ipo_add)?m_ipo_start_point[2]:0.0) + m_ipo_xform.GetDeltaPosition()[2]);
+				}
+				if (m_ipo_add) {
+					if (m_ipo_local)
+						newPosition = m_ipo_start_point + m_ipo_start_scale*(m_ipo_start_orient*newPosition);
+					else
+						newPosition = m_ipo_start_point + newPosition;
 				}
-				
 				ob->SetLocalPosition(newPosition);
 			}
 		}
@@ -170,21 +195,23 @@ bool KX_IpoSGController::Update(double currentTime)
 			if (m_ipo_as_force) {
 				
 				if (m_game_object && ob) {
-					m_game_object->ApplyTorque(m_force_ipo_acts_local ?
+					m_game_object->ApplyTorque(m_ipo_local ?
 						ob->GetWorldOrientation() * m_ipo_xform.GetEulerAngles() :
 						m_ipo_xform.GetEulerAngles(), false);
 				}
 			} else {
-				double yaw, pitch,  roll;	//final Euler angles
+				double yaw=0, pitch=0,  roll=0;	//final Euler angles
 				double tempYaw=0, tempPitch=0, tempRoll=0;	//temp holders
-				ob->GetLocalOrientation().getEuler(yaw, pitch, roll);
+				if (!m_ipo_add)
+					ob->GetLocalOrientation().getEuler(yaw, pitch, roll);
 
 				//RotX and dRotX
 				if (m_ipo_channels_active[OB_ROT_X]) {
 					yaw = (m_ipo_channels_active[OB_DROT_X] ? (m_ipo_xform.GetEulerAngles()[0] + m_ipo_xform.GetDeltaEulerAngles()[0]) : m_ipo_xform.GetEulerAngles()[0] );
 				}
 				else if (m_ipo_channels_active[OB_DROT_X] && m_ipo_start_initialized) {
-					m_ipo_start_orient.getEuler(tempYaw, tempPitch, tempRoll);
+					if (!m_ipo_add)
+						m_ipo_start_orient.getEuler(tempYaw, tempPitch, tempRoll);
 					yaw = tempYaw + m_ipo_xform.GetDeltaEulerAngles()[0];
 				}
 
@@ -193,7 +220,8 @@ bool KX_IpoSGController::Update(double currentTime)
 					pitch = (m_ipo_channels_active[OB_DROT_Y] ? (m_ipo_xform.GetEulerAngles()[1] + m_ipo_xform.GetDeltaEulerAngles()[1]) : m_ipo_xform.GetEulerAngles()[1] );
 				}
 				else if (m_ipo_channels_active[OB_DROT_Y] && m_ipo_start_initialized) {
-					m_ipo_start_orient.getEuler(tempYaw, tempPitch, tempRoll);
+					if (!m_ipo_add)
+						m_ipo_start_orient.getEuler(tempYaw, tempPitch, tempRoll);
 					pitch = tempPitch + m_ipo_xform.GetDeltaEulerAngles()[1];
 				}
 				
@@ -202,23 +230,34 @@ bool KX_IpoSGController::Update(double currentTime)
 					roll = (m_ipo_channels_active[OB_DROT_Z] ? (m_ipo_xform.GetEulerAngles()[2] + m_ipo_xform.GetDeltaEulerAngles()[2]) : m_ipo_xform.GetEulerAngles()[2] );
 				}
 				else if (m_ipo_channels_active[OB_DROT_Z] && m_ipo_start_initialized) {
-					m_ipo_start_orient.getEuler(tempYaw, tempPitch, tempRoll);
+					if (!m_ipo_add)
+						m_ipo_start_orient.getEuler(tempYaw, tempPitch, tempRoll);
 					roll = tempRoll + m_ipo_xform.GetDeltaEulerAngles()[2];
 				}
-
-				ob->SetLocalOrientation(MT_Vector3(yaw, pitch, roll));
+				if (m_ipo_add) {
+					MT_Matrix3x3 rotation(MT_Vector3(yaw, pitch, roll));
+					if (m_ipo_local)
+						rotation = m_ipo_start_orient * rotation;
+					else
+						rotation = rotation * m_ipo_start_orient;
+					ob->SetLocalOrientation(rotation);
+				} else {
+					ob->SetLocalOrientation(MT_Vector3(yaw, pitch, roll));
+				}
 			}
 		}
 		//modifies scale?
 		if (m_ipo_channels_active[OB_SIZE_X] || m_ipo_channels_active[OB_SIZE_Y] || m_ipo_channels_active[OB_SIZE_Z] || m_ipo_channels_active[OB_DSIZE_X] || m_ipo_channels_active[OB_DSIZE_Y] || m_ipo_channels_active[OB_DSIZE_Z]) {
 			//default is no scale change
-			MT_Vector3 newScale = ob->GetLocalScale();
+			MT_Vector3 newScale(1.0,1.0,1.0);
+			if (!m_ipo_add)
+				newScale = ob->GetLocalScale();
 
 			if (m_ipo_channels_active[OB_SIZE_X]) {
 				newScale[0] = (m_ipo_channels_active[OB_DSIZE_X] ? (m_ipo_xform.GetScaling()[0] + m_ipo_xform.GetDeltaScaling()[0]) : m_ipo_xform.GetScaling()[0]);
 			}
 			else if (m_ipo_channels_active[OB_DSIZE_X] && m_ipo_start_initialized) {
-				newScale[0] = (m_ipo_xform.GetDeltaScaling()[0] + m_ipo_start_scale[0]);
+				newScale[0] = (m_ipo_xform.GetDeltaScaling()[0] + ((!m_ipo_add)?m_ipo_start_scale[0]:0.0));
 			}
 
 			//RotY dRotY
@@ -226,7 +265,7 @@ bool KX_IpoSGController::Update(double currentTime)
 				newScale[1] = (m_ipo_channels_active[OB_DSIZE_Y] ? (m_ipo_xform.GetScaling()[1] + m_ipo_xform.GetDeltaScaling()[1]): m_ipo_xform.GetScaling()[1]);
 			}
 			else if (m_ipo_channels_active[OB_DSIZE_Y] && m_ipo_start_initialized) {
-				newScale[1] = (m_ipo_xform.GetDeltaScaling()[1] + m_ipo_start_scale[1]);
+				newScale[1] = (m_ipo_xform.GetDeltaScaling()[1] + ((!m_ipo_add)?m_ipo_start_scale[1]:0.0));
 			}
 			
 			//RotZ and dRotZ
@@ -234,7 +273,11 @@ bool KX_IpoSGController::Update(double currentTime)
 				newScale[2] = (m_ipo_channels_active[OB_DSIZE_Z] ? (m_ipo_xform.GetScaling()[2] + m_ipo_xform.GetDeltaScaling()[2]) : m_ipo_xform.GetScaling()[2]);
 			}
 			else if (m_ipo_channels_active[OB_DSIZE_Z] && m_ipo_start_initialized) {
-				newScale[2] = (m_ipo_xform.GetDeltaScaling()[2] + m_ipo_start_scale[2]);
+				newScale[2] = (m_ipo_xform.GetDeltaScaling()[2] + ((!m_ipo_add)?m_ipo_start_scale[2]:1.0));
+			}
+
+			if (m_ipo_add) {
+				newScale = m_ipo_start_scale * newScale;
 			}
 
 			ob->SetLocalScale(newScale);
diff --git a/source/gameengine/Ketsji/KX_IPO_SGController.h b/source/gameengine/Ketsji/KX_IPO_SGController.h
index 7b5a151b41c..0bd8980f11c 100644
--- a/source/gameengine/Ketsji/KX_IPO_SGController.h
+++ b/source/gameengine/Ketsji/KX_IPO_SGController.h
@@ -48,8 +48,11 @@ class KX_IpoSGController : public SG_Controller
 	/** Interpret the ipo as a force rather than a displacement? */
 	bool                m_ipo_as_force;
 
-	/** Ipo-as-force acts in local rather than in global coordinates? */
-	bool                m_force_ipo_acts_local;
+	/** Add Ipo curve to current loc/rot/scale */
+	bool                m_ipo_add;
+
+	/** Ipo must be applied in local coordinate rather than in global coordinates (used for force and Add mode)*/
+	bool                m_ipo_local;
 	
 	/** Were settings altered since the last update? */
 	bool				m_modified;
diff --git a/source/gameengine/Ketsji/KX_IPhysicsController.h b/source/gameengine/Ketsji/KX_IPhysicsController.h
index 009db40d3e8..bc4cc185a04 100644
--- a/source/gameengine/Ketsji/KX_IPhysicsController.h
+++ b/source/gameengine/Ketsji/KX_IPhysicsController.h
@@ -64,6 +64,7 @@ public:
 	virtual void	ApplyTorque(const MT_Vector3& torque,bool local)=0;
 	virtual void	ApplyForce(const MT_Vector3& force,bool local)=0;
 	virtual MT_Vector3 GetLinearVelocity()=0;
+	virtual MT_Vector3 GetAngularVelocity()=0;
 	virtual MT_Vector3 GetVelocity(const MT_Point3& pos)=0;
 	virtual void	SetAngularVelocity(const MT_Vector3& ang_vel,bool local)=0;
 	virtual void	SetLinearVelocity(const MT_Vector3& lin_vel,bool local)=0;
@@ -77,7 +78,7 @@ public:
 	virtual	MT_Vector3	getReactionForce()=0;
 	virtual void	setRigidBody(bool rigid)=0;
 
-	virtual void	SuspendDynamics()=0;
+	virtual void	SuspendDynamics(bool ghost=false)=0;
 	virtual void	RestoreDynamics()=0;
 
 	virtual	SG_Controller*	GetReplica(class SG_Node* destnode)=0;
diff --git a/source/gameengine/Ketsji/KX_ISceneConverter.h b/source/gameengine/Ketsji/KX_ISceneConverter.h
index bba289bf891..f069048cd3d 100644
--- a/source/gameengine/Ketsji/KX_ISceneConverter.h
+++ b/source/gameengine/Ketsji/KX_ISceneConverter.h
@@ -74,6 +74,9 @@ public:
 	virtual void SetMaterials(bool val) =0;
 	virtual bool GetMaterials()=0;
 
+	// use blender glsl materials
+	virtual void SetGLSLMaterials(bool val) =0;
+	virtual bool GetGLSLMaterials()=0;
 };
 
 #endif //__KX_ISCENECONVERTER_H
diff --git a/source/gameengine/Ketsji/KX_IpoActuator.cpp b/source/gameengine/Ketsji/KX_IpoActuator.cpp
index 0f9caa456d9..b7103f49aee 100644
--- a/source/gameengine/Ketsji/KX_IpoActuator.cpp
+++ b/source/gameengine/Ketsji/KX_IpoActuator.cpp
@@ -59,40 +59,6 @@ STR_String KX_IpoActuator::S_KX_ACT_IPO_FROM_PROP_STRING = "FromProp";
 /* ------------------------------------------------------------------------- */
 /* Native functions                                                          */
 /* ------------------------------------------------------------------------- */
-/** Another poltergeist? This seems to be a very transient class... */
-class CIpoAction : public CAction
-{
-	float		m_curtime;
-	bool		m_recurse;
-	KX_GameObject* m_gameobj;
-	bool        m_ipo_as_force;
-	bool        m_force_ipo_local;
-
-public:
-	CIpoAction(KX_GameObject* gameobj,
-		float curtime,
-		bool recurse, 
-		bool ipo_as_force,
-		bool force_ipo_local) :
-	  m_curtime(curtime) ,
-	  m_recurse(recurse),
-	  m_gameobj(gameobj),
-	  m_ipo_as_force(ipo_as_force),
-	  m_force_ipo_local(force_ipo_local) 
-	  {
-		  /* intentionally empty */
-	  };
-
-	virtual void Execute() const
-	{
-		m_gameobj->UpdateIPO(
-			m_curtime, 
-			m_recurse, 
-			m_ipo_as_force, 
-			m_force_ipo_local);
-	};
-
-};
 
 KX_IpoActuator::KX_IpoActuator(SCA_IObject* gameobj,
 							   const STR_String& propname,
@@ -101,7 +67,8 @@ KX_IpoActuator::KX_IpoActuator(SCA_IObject* gameobj,
 							   bool recurse,
 							   int acttype,
 							   bool ipo_as_force,
-							   bool force_ipo_local,
+							   bool ipo_add,
+							   bool ipo_local,
 							   PyTypeObject* T) 
 	: SCA_IActuator(gameobj,T),
 	m_bNegativeEvent(false),
@@ -112,7 +79,8 @@ KX_IpoActuator::KX_IpoActuator(SCA_IObject* gameobj,
 	m_direction(1),
 	m_propname(propname),
 	m_ipo_as_force(ipo_as_force),
-	m_force_ipo_local(force_ipo_local),
+	m_ipo_add(ipo_add),
+	m_ipo_local(ipo_local),
 	m_type((IpoActType)acttype)
 {
 	m_starttime = -2.0*fabs(m_endframe - m_startframe) - 1.0;
@@ -160,18 +128,18 @@ bool KX_IpoActuator::ClampLocalTime()
 
 void KX_IpoActuator::SetStartTime(float curtime)
 {
-	float direction = m_startframe < m_endframe ? 1.0 : -1.0;
+	float direction = m_startframe < m_endframe ? 1.0f : -1.0f;
 
 	curtime = curtime - KX_KetsjiEngine::GetSuspendedDelta();	
 	if (m_direction > 0)
-		m_starttime = curtime - direction*(m_localtime - m_startframe)/KX_FIXED_FRAME_PER_SEC;
+		m_starttime = curtime - direction*(m_localtime - m_startframe)/KX_KetsjiEngine::GetAnimFrameRate();
 	else
-		m_starttime = curtime - direction*(m_endframe - m_localtime)/KX_FIXED_FRAME_PER_SEC;
+		m_starttime = curtime - direction*(m_endframe - m_localtime)/KX_KetsjiEngine::GetAnimFrameRate();
 }
 
 void KX_IpoActuator::SetLocalTime(float curtime)
 {
-	float delta_time = ((curtime - m_starttime) - KX_KetsjiEngine::GetSuspendedDelta())*KX_FIXED_FRAME_PER_SEC;
+	float delta_time = ((curtime - m_starttime) - KX_KetsjiEngine::GetSuspendedDelta())*KX_KetsjiEngine::GetAnimFrameRate();
 	
 	// negative delta_time is caused by floating point inaccuracy
 	// perhaps the inaccuracy could be reduced a bit
@@ -195,31 +163,26 @@ bool KX_IpoActuator::Update(double curtime, bool frame)
 	// maybe there are events for us in the queue !
 	bool bNegativeEvent = false;
 	int numevents = 0;
+	bool bIpoStart = false;
 
 	if (frame)
 	{
 		numevents = m_events.size();
-		for (vector<CValue*>::iterator i=m_events.end(); !(i==m_events.begin());)
-		{
-			--i;
-			if ((*i)->GetNumber() == 0.0f)
-				bNegativeEvent = true;
-			
-			(*i)->Release();
-		}
-		m_events.clear();
+		bNegativeEvent = IsNegativeEvent();
+		RemoveAllEvents();
 	}
 	
-	double  start_smaller_then_end = ( m_startframe < m_endframe ? 1.0 : -1.0);
+	float  start_smaller_then_end = ( m_startframe < m_endframe ? 1.0f : -1.0f);
 
 	bool result=true;
 	if (!bNegativeEvent)
 	{
-		if (m_starttime < -2.0*start_smaller_then_end*(m_endframe - m_startframe))
+		if (m_starttime < -2.0f*start_smaller_then_end*(m_endframe - m_startframe))
 		{
 			// start for all Ipo, initial start for LOOP_STOP
 			m_starttime = curtime - KX_KetsjiEngine::GetSuspendedDelta();
 			m_bIpoPlaying = true;
+			bIpoStart = true;
 		}
 	}	
 
@@ -230,7 +193,7 @@ bool KX_IpoActuator::Update(double curtime, bool frame)
 	{
 		// Check if playing forwards.  result = ! finished
 		
-		if (start_smaller_then_end > 0.0)
+		if (start_smaller_then_end > 0.f)
 			result = (m_localtime < m_endframe && m_bIpoPlaying);
 		else
 			result = (m_localtime > m_endframe && m_bIpoPlaying);
@@ -241,14 +204,10 @@ bool KX_IpoActuator::Update(double curtime, bool frame)
 		
 			/* Perform clamping */
 			ClampLocalTime();
-			
-			CIpoAction ipoaction(
-				(KX_GameObject*)GetParent(), 
-				m_localtime, 
-				m_recurse, 
-				m_ipo_as_force,
-				m_force_ipo_local);
-			GetParent()->Execute(ipoaction);
+	
+			if (bIpoStart)
+				((KX_GameObject*)GetParent())->InitIPO(m_ipo_as_force, m_ipo_add, m_ipo_local);
+			((KX_GameObject*)GetParent())->UpdateIPO(m_localtime,m_recurse);
 		} else
 		{
 			m_localtime=m_startframe;
@@ -270,13 +229,9 @@ bool KX_IpoActuator::Update(double curtime, bool frame)
 			m_direction = -m_direction;
 		}
 		
-		CIpoAction ipoaction(
-			(KX_GameObject*) GetParent(),
-			m_localtime,
-			m_recurse, 
-			m_ipo_as_force,
-			m_force_ipo_local);
-		GetParent()->Execute(ipoaction);
+		if (bIpoStart && m_direction > 0)
+			((KX_GameObject*)GetParent())->InitIPO(m_ipo_as_force, m_ipo_add, m_ipo_local);
+		((KX_GameObject*)GetParent())->UpdateIPO(m_localtime,m_recurse);
 		break;
 	}
 	case KX_ACT_IPO_FLIPPER:
@@ -299,14 +254,10 @@ bool KX_IpoActuator::Update(double curtime, bool frame)
 		
 		if (ClampLocalTime() && m_localtime == m_startframe)
 			result = false;
-			
-		CIpoAction ipoaction(
-			(KX_GameObject*) GetParent(),
-			m_localtime,
-			m_recurse,
-			m_ipo_as_force,
-			m_force_ipo_local);
-		GetParent()->Execute(ipoaction);
+
+		if (bIpoStart)
+			((KX_GameObject*)GetParent())->InitIPO(m_ipo_as_force, m_ipo_add, m_ipo_local);			
+		((KX_GameObject*)GetParent())->UpdateIPO(m_localtime,m_recurse);
 		break;
 	}
 
@@ -352,8 +303,12 @@ bool KX_IpoActuator::Update(double curtime, bool frame)
 				if (!m_bNegativeEvent){
 					/* Perform wraparound */
 					SetLocalTime(curtime);
-					m_localtime = m_startframe + fmod(m_localtime, m_startframe - m_endframe);
+					if (start_smaller_then_end > 0.f)
+						m_localtime = m_startframe + fmod(m_localtime - m_startframe, m_endframe - m_startframe);
+					else
+						m_localtime = m_startframe - fmod(m_startframe - m_localtime, m_startframe - m_endframe);
 					SetStartTime(curtime);
+					bIpoStart = true;
 				}
 				else
 				{	
@@ -365,13 +320,9 @@ bool KX_IpoActuator::Update(double curtime, bool frame)
 			}
 		}
 		
-		CIpoAction ipoaction(
-			(KX_GameObject*) GetParent(),
-			m_localtime,
-			m_recurse,
-			m_ipo_as_force,
-			m_force_ipo_local);
-		GetParent()->Execute(ipoaction);
+		if (m_bIpoPlaying && bIpoStart)
+			((KX_GameObject*)GetParent())->InitIPO(m_ipo_as_force, m_ipo_add, m_ipo_local);
+		((KX_GameObject*)GetParent())->UpdateIPO(m_localtime,m_recurse);
 		break;
 	}
 	
@@ -391,14 +342,9 @@ bool KX_IpoActuator::Update(double curtime, bool frame)
 		{
 			m_localtime = propval->GetNumber(); 
 	
-			CIpoAction ipoaction(
-				(KX_GameObject*) GetParent(),
-				m_localtime,
-				m_recurse,
-				m_ipo_as_force,
-				m_force_ipo_local);
-			GetParent()->Execute(ipoaction);
-
+			if (bIpoStart)
+				((KX_GameObject*)GetParent())->InitIPO(m_ipo_as_force, m_ipo_add, m_ipo_local);
+			((KX_GameObject*)GetParent())->UpdateIPO(m_localtime,m_recurse);
 		} else
 		{
 			result = false;
@@ -493,6 +439,10 @@ PyMethodDef KX_IpoActuator::Methods[] = {
 		METH_VARARGS, SetIpoAsForce_doc},
 	{"getIpoAsForce", (PyCFunction) KX_IpoActuator::sPyGetIpoAsForce, 
 		METH_VARARGS, GetIpoAsForce_doc},
+	{"setIpoAdd", (PyCFunction) KX_IpoActuator::sPySetIpoAdd, 
+		METH_VARARGS, SetIpoAdd_doc},
+	{"getIpoAdd", (PyCFunction) KX_IpoActuator::sPyGetIpoAdd, 
+		METH_VARARGS, GetIpoAdd_doc},
 	{"setType", (PyCFunction) KX_IpoActuator::sPySetType, 
 		METH_VARARGS, SetType_doc},
 	{"getType", (PyCFunction) KX_IpoActuator::sPyGetType, 
@@ -512,11 +462,11 @@ PyObject* KX_IpoActuator::_getattr(const STR_String& attr) {
 
 /* set --------------------------------------------------------------------- */
 char KX_IpoActuator::Set_doc[] = 
-"set(mode, startframe, endframe, force?)\n"
-"\t - mode:       Play, PingPong, Flipper, LoopStop, LoopEnd or FromProp (string)\n"
+"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 - force?    : interpret this ipo as a force? (KX_TRUE, KX_FALSE)"
+"\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* self, 
 								PyObject* args, 
@@ -543,7 +493,8 @@ PyObject* KX_IpoActuator::PySet(PyObject* self,
 		m_type         = modenum;
 		m_startframe    = startFrame;
 		m_endframe      = stopFrame;
-		m_ipo_as_force = PyArgToBool(forceToggle);
+		m_ipo_as_force = forceToggle == 1;
+		m_ipo_add = forceToggle == 2;
 		break;
 	default:
 		; /* error */
@@ -641,6 +592,8 @@ PyObject* KX_IpoActuator::PySetIpoAsForce(PyObject* self,
 	}
 
 	m_ipo_as_force = PyArgToBool(boolArg);
+	if (m_ipo_as_force)
+		m_ipo_add = false;
 	
 	Py_Return;	
 }
@@ -654,6 +607,36 @@ PyObject* KX_IpoActuator::PyGetIpoAsForce(PyObject* self,
 	return BoolToPyArg(m_ipo_as_force);
 }
 
+/* 6. setIpoAsForce:                                                           */
+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* self, 
+									  PyObject* args, 
+									  PyObject* kwds) { 
+	int boolArg;
+	
+	if (!PyArg_ParseTuple(args, "i", &boolArg)) {
+		return NULL;
+	}
+
+	m_ipo_add = PyArgToBool(boolArg);
+	if (m_ipo_add)
+		m_ipo_as_force = false;
+	
+	Py_Return;	
+}
+/* 7. getIpoAsForce:                                                         */
+char KX_IpoActuator::GetIpoAdd_doc[] = 
+"getIpoAsAdd()\n"
+"\tReturns whether to interpret the ipo as additive rather than absolute.\n";
+PyObject* KX_IpoActuator::PyGetIpoAdd(PyObject* self, 
+									  PyObject* args, 
+									  PyObject* kwds) {
+	return BoolToPyArg(m_ipo_add);
+}
+
 /* 8. setType:                                                               */
 char KX_IpoActuator::SetType_doc[] = 
 "setType(mode)\n"
@@ -701,7 +684,7 @@ PyObject* KX_IpoActuator::PySetForceIpoActsLocal(PyObject* self,
 		return NULL;
 	}
 
-	m_force_ipo_local = PyArgToBool(boolArg);
+	m_ipo_local = PyArgToBool(boolArg);
 	
 	Py_Return;	
 }
@@ -713,7 +696,7 @@ char KX_IpoActuator::GetForceIpoActsLocal_doc[] =
 PyObject* KX_IpoActuator::PyGetForceIpoActsLocal(PyObject* self, 
 									   	         PyObject* args, 
 										         PyObject* kwds) {
-	return BoolToPyArg(m_force_ipo_local);
+	return BoolToPyArg(m_ipo_local);
 }
 
 
diff --git a/source/gameengine/Ketsji/KX_IpoActuator.h b/source/gameengine/Ketsji/KX_IpoActuator.h
index 79e8daa3f87..ae554fb0fce 100644
--- a/source/gameengine/Ketsji/KX_IpoActuator.h
+++ b/source/gameengine/Ketsji/KX_IpoActuator.h
@@ -75,8 +75,11 @@ protected:
 	/** Interpret the ipo as a force? */
 	bool    m_ipo_as_force;
 	
-	/** Apply a force-ipo locally? */
-	bool    m_force_ipo_local;
+	/** Add Ipo curve to current loc/rot/scale */
+	bool    m_ipo_add;
+	
+	/** The Ipo curve is applied in local coordinates */
+	bool    m_ipo_local;
 
 	bool	m_bIpoPlaying;
 
@@ -113,7 +116,8 @@ public:
 				   bool recurse,
 				   int acttype,
 				   bool ipo_as_force, 
-				   bool force_ipo_local, 
+				   bool ipo_add,
+				   bool ipo_local,
 				   PyTypeObject* T=&Type);
 	virtual ~KX_IpoActuator() {};
 
@@ -144,6 +148,8 @@ public:
 	KX_PYMETHOD_DOC(KX_IpoActuator,GetEnd);
 	KX_PYMETHOD_DOC(KX_IpoActuator,SetIpoAsForce);
 	KX_PYMETHOD_DOC(KX_IpoActuator,GetIpoAsForce);
+	KX_PYMETHOD_DOC(KX_IpoActuator,SetIpoAdd);
+	KX_PYMETHOD_DOC(KX_IpoActuator,GetIpoAdd);
 	KX_PYMETHOD_DOC(KX_IpoActuator,SetType);
 	KX_PYMETHOD_DOC(KX_IpoActuator,GetType);
 	KX_PYMETHOD_DOC(KX_IpoActuator,SetForceIpoActsLocal);
diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
index 1e3393d59a8..db099d56b55 100644
--- a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
+++ b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
@@ -55,6 +55,7 @@
 #include "KX_Scene.h"
 #include "MT_CmMatrix4x4.h"
 #include "KX_Camera.h"
+#include "KX_Light.h"
 #include "KX_PythonInit.h"
 #include "KX_PyConstraintBinding.h"
 #include "PHY_IPhysicsEnvironment.h"
@@ -71,6 +72,7 @@
 #include "KX_TimeCategoryLogger.h"
 
 #include "RAS_FramingManager.h"
+#include "stdio.h"
 
 // If define: little test for Nzc: guarded drawing. If the canvas is
 // not valid, skip rendering this frame.
@@ -91,7 +93,7 @@ const char KX_KetsjiEngine::m_profileLabels[tc_numCategories][15] = {
 };
 
 double KX_KetsjiEngine::m_ticrate = DEFAULT_LOGIC_TIC_RATE;
-
+double KX_KetsjiEngine::m_anim_framerate = 25.0;
 double KX_KetsjiEngine::m_suspendedtime = 0.0;
 double KX_KetsjiEngine::m_suspendeddelta = 0.0;
 
@@ -229,7 +231,10 @@ void KX_KetsjiEngine::SetRasterizer(RAS_IRasterizer* rasterizer)
 }
 
 
-
+/*
+ * At the moment the GameLogic module is imported into 'pythondictionary' after this function is called.
+ * if this function ever changes to assign a copy, make sure the game logic module is imported into this dictionary before hand.
+ */
 void KX_KetsjiEngine::SetPythonDictionary(PyObject* pythondictionary)
 {
 	MT_assert(pythondictionary);
@@ -613,6 +618,9 @@ void KX_KetsjiEngine::Render()
 		// pass the scene's worldsettings to the rasterizer
 		SetWorldSettings(scene->GetWorldInfo());
 
+		// shadow buffers
+		RenderShadowBuffers(scene);
+
 		// Avoid drawing the scene with the active camera twice when it's viewport is enabled
 		if(cam && !cam->GetViewport())
 		{
@@ -884,8 +892,48 @@ void KX_KetsjiEngine::SetupRenderFrame(KX_Scene *scene, KX_Camera* cam)
 		viewport.GetTop()
 	);	
 
-}		
+}
 
+void KX_KetsjiEngine::RenderShadowBuffers(KX_Scene *scene)
+{
+	CListValue *lightlist = scene->GetLightList();
+	int i, drawmode;
+
+	for(i=0; i<lightlist->GetCount(); i++) {
+		KX_LightObject *light = (KX_LightObject*)lightlist->GetValue(i);
+
+		light->Update();
+
+		if(m_drawingmode == RAS_IRasterizer::KX_TEXTURED && light->HasShadowBuffer()) {
+			/* make temporary camera */
+			RAS_CameraData camdata = RAS_CameraData();
+			KX_Camera *cam = new KX_Camera(scene, scene->m_callbacks, camdata, false);
+			cam->SetName("__shadow__cam__");
+
+			MT_Transform camtrans;
+
+			/* switch drawmode for speed */
+			drawmode = m_rasterizer->GetDrawingMode();
+			m_rasterizer->SetDrawingMode(RAS_IRasterizer::KX_SHADOW);
+
+			/* binds framebuffer object, sets up camera .. */
+			light->BindShadowBuffer(m_rasterizer, cam, camtrans);
+
+			/* update scene */
+			scene->UpdateMeshTransformations();
+			scene->CalculateVisibleMeshes(m_rasterizer, cam, light->GetShadowLayer());
+
+			/* render */
+			m_rasterizer->ClearDepthBuffer();
+			scene->RenderBuckets(camtrans, m_rasterizer, m_rendertools);
+
+			/* unbind framebuffer object, restore drawmode, free camera */
+			light->UnbindShadowBuffer(m_rasterizer);
+			m_rasterizer->SetDrawingMode(drawmode);
+			cam->Release();
+		}
+	}
+}
 	
 // update graphics
 void KX_KetsjiEngine::RenderFrame(KX_Scene* scene, KX_Camera* cam)
@@ -1383,6 +1431,16 @@ void KX_KetsjiEngine::SetTicRate(double ticrate)
 	m_ticrate = ticrate;
 }
 
+double KX_KetsjiEngine::GetAnimFrameRate()
+{
+	return m_anim_framerate;
+}
+
+void KX_KetsjiEngine::SetAnimFrameRate(double framerate)
+{
+	m_anim_framerate = framerate;
+}
+
 void KX_KetsjiEngine::SetTimingDisplay(bool frameRate, bool profile, bool properties)
 {
 	m_show_framerate = frameRate;
diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.h b/source/gameengine/Ketsji/KX_KetsjiEngine.h
index bc2e3864be8..77b69ec2d9e 100644
--- a/source/gameengine/Ketsji/KX_KetsjiEngine.h
+++ b/source/gameengine/Ketsji/KX_KetsjiEngine.h
@@ -103,6 +103,7 @@ private:
 	double				m_remainingTime;
 
 	static double			m_ticrate;
+	static double			m_anim_framerate; /* for animation playback only - ipo and action */
 
 	static double			m_suspendedtime;
 	static double			m_suspendeddelta;
@@ -178,6 +179,7 @@ private:
 	void					RenderFrame(KX_Scene* scene, KX_Camera* cam);
 	void					PostRenderFrame();
 	void					RenderDebugProperties();
+	void					RenderShadowBuffers(KX_Scene *scene);
 	void					SetBackGround(KX_WorldInfo* worldinfo);
 	void					SetWorldSettings(KX_WorldInfo* worldinfo);
 	void					DoSound(KX_Scene* scene);
@@ -260,6 +262,15 @@ public:
 	 */
 	static void SetTicRate(double ticrate);
 
+	/**
+	 * Gets the framerate for playing animations. (actions and ipos)
+	 */
+	static double GetAnimFrameRate();
+	/**
+	 * Sets the framerate for playing animations. (actions and ipos)
+	 */
+	static void SetAnimFrameRate(double framerate);
+
 	/**
 	 * Activates or deactivates timing information display.
 	 * @param frameRate		Display for frame rate on or off.
diff --git a/source/gameengine/Ketsji/KX_Light.cpp b/source/gameengine/Ketsji/KX_Light.cpp
index 7decc5bc769..4e3d6180d22 100644
--- a/source/gameengine/Ketsji/KX_Light.cpp
+++ b/source/gameengine/Ketsji/KX_Light.cpp
@@ -36,14 +36,20 @@
 #endif
 
 #include "KX_Light.h"
+#include "KX_Camera.h"
+#include "RAS_IRasterizer.h"
 #include "RAS_IRenderTools.h"
 
 #include "KX_PyMath.h"
 
+#ifdef BLENDER_GLSL
+#include "GPU_material.h"
+#endif
  
 KX_LightObject::KX_LightObject(void* sgReplicationInfo,SG_Callbacks callbacks,
 							   class RAS_IRenderTools* rendertools,
 							   const RAS_LightObject&	lightobj,
+							   struct GPULamp *gpulamp,
 							   PyTypeObject* T
 							   )
  :
@@ -53,12 +59,12 @@ KX_LightObject::KX_LightObject(void* sgReplicationInfo,SG_Callbacks callbacks,
 	m_lightobj = lightobj;
 	m_lightobj.m_worldmatrix = GetOpenGLMatrixPtr();
 	m_rendertools->AddLight(&m_lightobj);
+	m_gpulamp = gpulamp;
 };
 
 
 KX_LightObject::~KX_LightObject()
 {
-
 	m_rendertools->RemoveLight(&m_lightobj);
 }
 
@@ -78,6 +84,78 @@ CValue*		KX_LightObject::GetReplica()
 	return replica;
 }
 
+void KX_LightObject::Update()
+{
+#ifdef BLENDER_GLSL
+	if(m_gpulamp) {
+		float obmat[4][4];
+		double *dobmat = GetOpenGLMatrixPtr()->getPointer();
+
+		for(int i=0; i<4; i++)
+			for(int j=0; j<4; j++, dobmat++)
+				obmat[i][j] = (float)*dobmat;
+
+		GPU_lamp_update(m_gpulamp, obmat);
+	}
+#endif
+}
+
+bool KX_LightObject::HasShadowBuffer()
+{
+#ifdef BLENDER_GLSL
+	return (m_gpulamp && GPU_lamp_has_shadow_buffer(m_gpulamp));
+#else
+	return false;
+#endif
+}
+
+int KX_LightObject::GetShadowLayer()
+{
+#ifdef BLENDER_GLSL
+	if(m_gpulamp)
+		return GPU_lamp_shadow_layer(m_gpulamp);
+	else
+#endif
+		return 0;
+}
+
+void KX_LightObject::BindShadowBuffer(RAS_IRasterizer *ras, KX_Camera *cam, MT_Transform& camtrans)
+{
+#ifdef BLENDER_GLSL
+	float viewmat[4][4], winmat[4][4];
+	int winsize;
+
+	/* bind framebuffer */
+	GPU_lamp_shadow_buffer_bind(m_gpulamp, viewmat, &winsize, winmat);
+
+	/* setup camera transformation */
+	MT_Matrix4x4 modelviewmat((float*)viewmat);
+	MT_Matrix4x4 projectionmat((float*)winmat);
+
+	MT_Transform trans = MT_Transform((float*)viewmat);
+	camtrans.invert(trans);
+
+	cam->SetModelviewMatrix(modelviewmat);
+	cam->SetProjectionMatrix(projectionmat);
+	
+	cam->NodeSetLocalPosition(camtrans.getOrigin());
+	cam->NodeSetLocalOrientation(camtrans.getBasis());
+	cam->NodeUpdateGS(0,true);
+
+	/* setup rasterizer transformations */
+	ras->SetProjectionMatrix(projectionmat);
+	ras->SetViewMatrix(modelviewmat, cam->NodeGetWorldPosition(),
+		cam->GetCameraLocation(), cam->GetCameraOrientation());
+#endif
+}
+
+void KX_LightObject::UnbindShadowBuffer(RAS_IRasterizer *ras)
+{
+#ifdef BLENDER_GLSL
+	GPU_lamp_shadow_buffer_unbind(m_gpulamp);
+#endif
+}
+
 PyObject* KX_LightObject::_getattr(const STR_String& attr)
 {
 	if (attr == "layer")
diff --git a/source/gameengine/Ketsji/KX_Light.h b/source/gameengine/Ketsji/KX_Light.h
index 236d3e4e12e..62eb26c61a8 100644
--- a/source/gameengine/Ketsji/KX_Light.h
+++ b/source/gameengine/Ketsji/KX_Light.h
@@ -32,19 +32,33 @@
 #include "RAS_LightObject.h"
 #include "KX_GameObject.h"
 
+struct GPULamp;
+class KX_Camera;
+class RAS_IRasterizer;
+class RAS_IRenderTools;
+class MT_Transform;
+
 class KX_LightObject : public KX_GameObject
 {
 	Py_Header;
 protected:
 	RAS_LightObject		m_lightobj;
 	class RAS_IRenderTools*	m_rendertools;	//needed for registering and replication of lightobj
+	struct GPULamp		*m_gpulamp;
 	static char		doc[];
 
 public:
-	KX_LightObject(void* sgReplicationInfo,SG_Callbacks callbacks,class RAS_IRenderTools* rendertools,const struct RAS_LightObject&	lightobj, PyTypeObject *T = &Type);
+	KX_LightObject(void* sgReplicationInfo,SG_Callbacks callbacks,class RAS_IRenderTools* rendertools,const struct RAS_LightObject&	lightobj, struct GPULamp *gpulamp, PyTypeObject *T = &Type);
 	virtual ~KX_LightObject();
 	virtual CValue*		GetReplica();
 	RAS_LightObject*	GetLightData() { return &m_lightobj;}
+
+	/* GLSL shadow */
+	bool HasShadowBuffer();
+	int GetShadowLayer();
+	void BindShadowBuffer(class RAS_IRasterizer *ras, class KX_Camera *cam, class MT_Transform& camtrans);
+	void UnbindShadowBuffer(class RAS_IRasterizer *ras);
+	void Update();
 	
 	virtual PyObject* _getattr(const STR_String& attr); /* lens, near, far, projection_matrix */
 	virtual int       _setattr(const STR_String& attr, PyObject *pyvalue);
diff --git a/source/gameengine/Ketsji/KX_MeshProxy.cpp b/source/gameengine/Ketsji/KX_MeshProxy.cpp
index 5c8fef1fca0..c7a251751cd 100644
--- a/source/gameengine/Ketsji/KX_MeshProxy.cpp
+++ b/source/gameengine/Ketsji/KX_MeshProxy.cpp
@@ -157,6 +157,9 @@ PyObject* KX_MeshProxy::PyGetMaterialName(PyObject* self,
 	{
 		matname = m_meshobj->GetMaterialName(matid);
 	}
+	else {
+		return NULL;
+	}
 
 	return PyString_FromString(matname.Ptr());
 		
@@ -174,6 +177,9 @@ PyObject* KX_MeshProxy::PyGetTextureName(PyObject* self,
 	{
 		matname = m_meshobj->GetTextureName(matid);
 	}
+	else {
+		return NULL;
+	}
 
 	return PyString_FromString(matname.Ptr());
 		
@@ -195,6 +201,9 @@ PyObject* KX_MeshProxy::PyGetVertexArrayLength(PyObject* self,
 			length = m_meshobj->GetVertexArrayLength(mat);
 		}
 	}
+	else {
+		return NULL;
+	}
 
 	return PyInt_FromLong(length);
 		
@@ -217,6 +226,9 @@ PyObject* KX_MeshProxy::PyGetVertex(PyObject* self,
 			vertexob = new KX_VertexProxy(this, vertex);
 		}
 	}
+	else {
+		return NULL;
+	}
 
 	return vertexob;
 		
diff --git a/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp b/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
index 60b90138abe..db0bef8b7e1 100644
--- a/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
+++ b/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
@@ -69,36 +69,45 @@ KX_MouseFocusSensor::KX_MouseFocusSensor(SCA_MouseManager* eventmgr,
 	  m_gp_canvas(canvas),
 	  m_kxscene(kxscene)
 {
+	Init();
+}
 
-	m_mouse_over_in_previous_frame = false;
+void KX_MouseFocusSensor::Init()
+{
+	m_mouse_over_in_previous_frame = (m_invert)?true:false;
 	m_positive_event = false;
 	m_hitObject = 0;
-
+	m_reset = true;
 }
 
 bool KX_MouseFocusSensor::Evaluate(CValue* event)
 {
 	bool result = false;
 	bool obHasFocus = false;
+	bool reset = m_reset && m_level;
 
 //  	cout << "evaluate focus mouse sensor "<<endl;
-
+	m_reset = false;
 	if (m_focusmode) {
 		/* Focus behaviour required. Test mouse-on. The rest is
 		 * equivalent to handling a key. */
 		obHasFocus = ParentObjectHasFocus();
 		
 		if (!obHasFocus) {
+			m_positive_event = false;
 			if (m_mouse_over_in_previous_frame) {
-					m_positive_event = false;
-					result = true;
+				result = true;
 			} 
 		} else {
+			m_positive_event = true;
 			if (!m_mouse_over_in_previous_frame) {
-				m_positive_event = true;
 				result = true;
 			} 
 		} 
+		if (reset) {
+			// force an event 
+			result = true;
+		}
 	} else {
 		/* No focus behaviour required: revert to the basic mode. This
          * mode is never used, because the converter never makes this
diff --git a/source/gameengine/Ketsji/KX_MouseFocusSensor.h b/source/gameengine/Ketsji/KX_MouseFocusSensor.h
index 86f32fbf4be..b011ebe1288 100644
--- a/source/gameengine/Ketsji/KX_MouseFocusSensor.h
+++ b/source/gameengine/Ketsji/KX_MouseFocusSensor.h
@@ -68,6 +68,7 @@ class KX_MouseFocusSensor : public SCA_MouseSensor
 	 * @attention Overrides default evaluate. 
 	 */
 	virtual bool Evaluate(CValue* event);
+	virtual void Init();
 
 	virtual bool IsPositiveTrigger() {
 		bool result = m_positive_event;
diff --git a/source/gameengine/Ketsji/KX_NearSensor.cpp b/source/gameengine/Ketsji/KX_NearSensor.cpp
index 4086ac53f2a..89699d80031 100644
--- a/source/gameengine/Ketsji/KX_NearSensor.cpp
+++ b/source/gameengine/Ketsji/KX_NearSensor.cpp
@@ -102,10 +102,7 @@ CValue* KX_NearSensor::GetReplica()
 {
 	KX_NearSensor* replica = new KX_NearSensor(*this);
 	replica->m_colliders = new CListValue();
-	replica->m_bCollision = false;
-	replica->m_bTriggered= false;
-	replica->m_hitObject = NULL;
-	replica->m_bLastTriggered = false;
+	replica->Init();
 	// this will copy properties and so on...
 	CValue::AddDataToReplica(replica);
 	
@@ -138,9 +135,6 @@ CValue* KX_NearSensor::GetReplica()
 
 void KX_NearSensor::ReParent(SCA_IObject* parent)
 {
-
-	SCA_ISensor::ReParent(parent);
-	
 	m_client_info->m_gameobject = static_cast<KX_GameObject*>(parent); 
 	m_client_info->m_sensors.push_back(this);
 	
@@ -154,6 +148,7 @@ void KX_NearSensor::ReParent(SCA_IObject* parent)
 */
 	((KX_GameObject*)GetParent())->GetSGNode()->ComputeWorldTransforms(NULL);
 	SynchronizeTransform();
+	SCA_ISensor::ReParent(parent);
 }
 
 
diff --git a/source/gameengine/Ketsji/KX_ObjectActuator.cpp b/source/gameengine/Ketsji/KX_ObjectActuator.cpp
index 22a406792f9..9ac0b4d4703 100644
--- a/source/gameengine/Ketsji/KX_ObjectActuator.cpp
+++ b/source/gameengine/Ketsji/KX_ObjectActuator.cpp
@@ -50,6 +50,7 @@ KX_ObjectActuator(
 	const MT_Vector3& drot,
 	const MT_Vector3& linV,
 	const MT_Vector3& angV,
+	const short damping,
 	const KX_LocalFlags& flag,
 	PyTypeObject* T
 ) : 
@@ -60,9 +61,23 @@ KX_ObjectActuator(
 	m_drot(drot),
 	m_linear_velocity(linV),
 	m_angular_velocity(angV),
+	m_linear_length2(0.0),
+	m_current_linear_factor(0.0),
+	m_current_angular_factor(0.0),
+	m_damping(damping),
 	m_bitLocalFlag (flag),
-	m_active_combined_velocity (false)
+	m_active_combined_velocity (false),
+	m_linear_damping_active(false),
+	m_angular_damping_active(false),
+	m_error_accumulator(0.0,0.0,0.0),
+	m_previous_error(0.0,0.0,0.0)
 {
+	if (m_bitLocalFlag.ServoControl)
+	{
+		// in servo motion, the force is local if the target velocity is local
+		m_bitLocalFlag.Force = m_bitLocalFlag.LinearVelocity;
+	}
+	UpdateFuzzyFlags();
 }
 
 bool KX_ObjectActuator::Update()
@@ -79,50 +94,152 @@ bool KX_ObjectActuator::Update()
 		// it should reconcile the externally set velocity with it's 
 		// own velocity.
 		if (m_active_combined_velocity) {
-			parent->ResolveCombinedVelocities(
-					m_linear_velocity,
-					m_angular_velocity,
-					(m_bitLocalFlag.LinearVelocity) != 0,
-					(m_bitLocalFlag.AngularVelocity) != 0
-				);
+			if (parent)
+				parent->ResolveCombinedVelocities(
+						m_linear_velocity,
+						m_angular_velocity,
+						(m_bitLocalFlag.LinearVelocity) != 0,
+						(m_bitLocalFlag.AngularVelocity) != 0
+					);
 			m_active_combined_velocity = false;
 		} 
+		m_linear_damping_active = false;
+		m_angular_damping_active = false;
+		m_error_accumulator.setValue(0.0,0.0,0.0);
+		m_previous_error.setValue(0.0,0.0,0.0);
 		return false; 
 
-	} else 
-	if (parent)
+	} else if (parent)
 	{
-		/* Probably better to use some flags, so these MT_zero tests can be  */
-		/* skipped.                                                          */
-		if (!MT_fuzzyZero(m_force))
+		if (m_bitLocalFlag.ServoControl) 
 		{
-			parent->ApplyForce(m_force,(m_bitLocalFlag.Force) != 0);
-		}
-		if (!MT_fuzzyZero(m_torque))
-		{
-			parent->ApplyTorque(m_torque,(m_bitLocalFlag.Torque) != 0);
-		}
-		if (!MT_fuzzyZero(m_dloc))
-		{
-			parent->ApplyMovement(m_dloc,(m_bitLocalFlag.DLoc) != 0);
-		}
-		if (!MT_fuzzyZero(m_drot))
-		{
-			parent->ApplyRotation(m_drot,(m_bitLocalFlag.DRot) != 0);
-		}
-		if (!MT_fuzzyZero(m_linear_velocity))
-		{
-			if (m_bitLocalFlag.AddOrSetLinV) {
-				parent->addLinearVelocity(m_linear_velocity,(m_bitLocalFlag.LinearVelocity) != 0);
-			} else {
-				m_active_combined_velocity = true;
- 				parent->setLinearVelocity(m_linear_velocity,(m_bitLocalFlag.LinearVelocity) != 0);
+			// In this mode, we try to reach a target speed using force
+			// As we don't know the friction, we must implement a generic 
+			// servo control to achieve the speed in a configurable
+			// v = current velocity
+			// V = target velocity
+			// e = V-v = speed error
+			// dt = time interval since previous update
+			// I = sum(e(t)*dt)
+			// dv = e(t) - e(t-1)
+			// KP, KD, KI : coefficient
+			// F = KP*e+KI*I+KD*dv
+			MT_Scalar mass = parent->GetMass();
+			if (mass < MT_EPSILON)
+				return false;
+			MT_Vector3 v = parent->GetLinearVelocity(m_bitLocalFlag.LinearVelocity);
+			MT_Vector3 e = m_linear_velocity - v;
+			MT_Vector3 dv = e - m_previous_error;
+			MT_Vector3 I = m_error_accumulator + e;
+
+			m_force = m_torque.x()*e+m_torque.y()*I+m_torque.z()*dv;
+			// to automatically adapt the PID coefficient to mass;
+			m_force *= mass;
+			if (m_bitLocalFlag.Torque) 
+			{
+				if (m_force[0] > m_dloc[0])
+				{
+					m_force[0] = m_dloc[0];
+					I[0] = m_error_accumulator[0];
+				} else if (m_force[0] < m_drot[0])
+				{
+					m_force[0] = m_drot[0];
+					I[0] = m_error_accumulator[0];
+				}
 			}
-		}
-		if (!MT_fuzzyZero(m_angular_velocity))
+			if (m_bitLocalFlag.DLoc) 
+			{
+				if (m_force[1] > m_dloc[1])
+				{
+					m_force[1] = m_dloc[1];
+					I[1] = m_error_accumulator[1];
+				} else if (m_force[1] < m_drot[1])
+				{
+					m_force[1] = m_drot[1];
+					I[1] = m_error_accumulator[1];
+				}
+			}
+			if (m_bitLocalFlag.DRot) 
+			{
+				if (m_force[2] > m_dloc[2])
+				{
+					m_force[2] = m_dloc[2];
+					I[2] = m_error_accumulator[2];
+				} else if (m_force[2] < m_drot[2])
+				{
+					m_force[2] = m_drot[2];
+					I[2] = m_error_accumulator[2];
+				}
+			}
+			m_previous_error = e;
+			m_error_accumulator = I;
+			parent->ApplyForce(m_force,(m_bitLocalFlag.LinearVelocity) != 0);
+		} else
 		{
-			parent->setAngularVelocity(m_angular_velocity,(m_bitLocalFlag.AngularVelocity) != 0);
-			m_active_combined_velocity = true;
+			if (!m_bitLocalFlag.ZeroForce)
+			{
+				parent->ApplyForce(m_force,(m_bitLocalFlag.Force) != 0);
+			}
+			if (!m_bitLocalFlag.ZeroTorque)
+			{
+				parent->ApplyTorque(m_torque,(m_bitLocalFlag.Torque) != 0);
+			}
+			if (!m_bitLocalFlag.ZeroDLoc)
+			{
+				parent->ApplyMovement(m_dloc,(m_bitLocalFlag.DLoc) != 0);
+			}
+			if (!m_bitLocalFlag.ZeroDRot)
+			{
+				parent->ApplyRotation(m_drot,(m_bitLocalFlag.DRot) != 0);
+			}
+			if (!m_bitLocalFlag.ZeroLinearVelocity)
+			{
+				if (m_bitLocalFlag.AddOrSetLinV) {
+					parent->addLinearVelocity(m_linear_velocity,(m_bitLocalFlag.LinearVelocity) != 0);
+				} else {
+					m_active_combined_velocity = true;
+					if (m_damping > 0) {
+						MT_Vector3 linV;
+						if (!m_linear_damping_active) {
+							// delta and the start speed (depends on the existing speed in that direction)
+							linV = parent->GetLinearVelocity(m_bitLocalFlag.LinearVelocity);
+							// keep only the projection along the desired direction
+							m_current_linear_factor = linV.dot(m_linear_velocity)/m_linear_length2;
+							m_linear_damping_active = true;
+						}
+						if (m_current_linear_factor < 1.0)
+							m_current_linear_factor += 1.0/m_damping;
+						if (m_current_linear_factor > 1.0)
+							m_current_linear_factor = 1.0;
+						linV = m_current_linear_factor * m_linear_velocity;
+	 					parent->setLinearVelocity(linV,(m_bitLocalFlag.LinearVelocity) != 0);
+					} else {
+	 					parent->setLinearVelocity(m_linear_velocity,(m_bitLocalFlag.LinearVelocity) != 0);
+					}
+				}
+			}
+			if (!m_bitLocalFlag.ZeroAngularVelocity)
+			{
+				m_active_combined_velocity = true;
+				if (m_damping > 0) {
+					MT_Vector3 angV;
+					if (!m_angular_damping_active) {
+						// delta and the start speed (depends on the existing speed in that direction)
+						angV = parent->GetAngularVelocity(m_bitLocalFlag.AngularVelocity);
+						// keep only the projection along the desired direction
+						m_current_angular_factor = angV.dot(m_angular_velocity)/m_angular_length2;
+						m_angular_damping_active = true;
+					}
+					if (m_current_angular_factor < 1.0)
+						m_current_angular_factor += 1.0/m_damping;
+					if (m_current_angular_factor > 1.0)
+						m_current_angular_factor = 1.0;
+					angV = m_current_angular_factor * m_angular_velocity;
+	 				parent->setAngularVelocity(angV,(m_bitLocalFlag.AngularVelocity) != 0);
+				} else {
+					parent->setAngularVelocity(m_angular_velocity,(m_bitLocalFlag.AngularVelocity) != 0);
+				}
+			}
 		}
 		
 	}
@@ -199,6 +316,17 @@ PyMethodDef KX_ObjectActuator::Methods[] = {
 	{"setLinearVelocity", (PyCFunction) KX_ObjectActuator::sPySetLinearVelocity, METH_VARARGS},
 	{"getAngularVelocity", (PyCFunction) KX_ObjectActuator::sPyGetAngularVelocity, METH_VARARGS},
 	{"setAngularVelocity", (PyCFunction) KX_ObjectActuator::sPySetAngularVelocity, METH_VARARGS},
+	{"setDamping", (PyCFunction) KX_ObjectActuator::sPySetDamping, METH_VARARGS},
+	{"getDamping", (PyCFunction) KX_ObjectActuator::sPyGetDamping, METH_VARARGS},
+	{"setForceLimitX", (PyCFunction) KX_ObjectActuator::sPySetForceLimitX, METH_VARARGS},
+	{"getForceLimitX", (PyCFunction) KX_ObjectActuator::sPyGetForceLimitX, METH_VARARGS},
+	{"setForceLimitY", (PyCFunction) KX_ObjectActuator::sPySetForceLimitY, METH_VARARGS},
+	{"getForceLimitY", (PyCFunction) KX_ObjectActuator::sPyGetForceLimitY, METH_VARARGS},
+	{"setForceLimitZ", (PyCFunction) KX_ObjectActuator::sPySetForceLimitZ, METH_VARARGS},
+	{"getForceLimitZ", (PyCFunction) KX_ObjectActuator::sPyGetForceLimitZ, METH_VARARGS},
+	{"setPID", (PyCFunction) KX_ObjectActuator::sPyGetPID, METH_VARARGS},
+	{"getPID", (PyCFunction) KX_ObjectActuator::sPySetPID, METH_VARARGS},
+
 
 
 	{NULL,NULL} //Sentinel
@@ -238,6 +366,7 @@ PyObject* KX_ObjectActuator::PySetForce(PyObject* self,
 	}
 	m_force.setValue(vecArg);
 	m_bitLocalFlag.Force = PyArgToBool(bToggle);
+	UpdateFuzzyFlags();
 	Py_Return;
 }
 
@@ -268,6 +397,7 @@ PyObject* KX_ObjectActuator::PySetTorque(PyObject* self,
 	}
 	m_torque.setValue(vecArg);
 	m_bitLocalFlag.Torque = PyArgToBool(bToggle);
+	UpdateFuzzyFlags();
 	Py_Return;
 }
 
@@ -298,6 +428,7 @@ PyObject* KX_ObjectActuator::PySetDLoc(PyObject* self,
 	}
 	m_dloc.setValue(vecArg);
 	m_bitLocalFlag.DLoc = PyArgToBool(bToggle);
+	UpdateFuzzyFlags();
 	Py_Return;
 }
 
@@ -328,6 +459,7 @@ PyObject* KX_ObjectActuator::PySetDRot(PyObject* self,
 	}
 	m_drot.setValue(vecArg);
 	m_bitLocalFlag.DRot = PyArgToBool(bToggle);
+	UpdateFuzzyFlags();
 	Py_Return;
 }
 
@@ -357,6 +489,7 @@ PyObject* KX_ObjectActuator::PySetLinearVelocity(PyObject* self,
 	}
 	m_linear_velocity.setValue(vecArg);
 	m_bitLocalFlag.LinearVelocity = PyArgToBool(bToggle);
+	UpdateFuzzyFlags();
 	Py_Return;
 }
 
@@ -386,10 +519,143 @@ PyObject* KX_ObjectActuator::PySetAngularVelocity(PyObject* self,
 	}
 	m_angular_velocity.setValue(vecArg);
 	m_bitLocalFlag.AngularVelocity = PyArgToBool(bToggle);
+	UpdateFuzzyFlags();
+	Py_Return;
+}
+
+/* 13. setDamping                                                */
+PyObject* KX_ObjectActuator::PySetDamping(PyObject* self, 
+										  PyObject* args, 
+										  PyObject* kwds) {
+	int damping = 0;
+	if (!PyArg_ParseTuple(args, "i", &damping) || damping < 0 || damping > 1000) {
+		return NULL;
+	}
+	m_damping = damping;
+	Py_Return;
+}
+
+/* 13. getVelocityDamping                                                */
+PyObject* KX_ObjectActuator::PyGetDamping(PyObject* self, 
+										  PyObject* args, 
+										  PyObject* kwds) {
+	return Py_BuildValue("i",m_damping);
+}
+/* 6. getForceLimitX                                                                */
+PyObject* KX_ObjectActuator::PyGetForceLimitX(PyObject* self, 
+											  PyObject* args, 
+											  PyObject* kwds)
+{
+	PyObject *retVal = PyList_New(3);
+
+	PyList_SetItem(retVal, 0, PyFloat_FromDouble(m_drot[0]));
+	PyList_SetItem(retVal, 1, PyFloat_FromDouble(m_dloc[0]));
+	PyList_SetItem(retVal, 2, BoolToPyArg(m_bitLocalFlag.Torque));
+	
+	return retVal;
+}
+/* 7. setForceLimitX                                                         */
+PyObject* KX_ObjectActuator::PySetForceLimitX(PyObject* self, 
+											  PyObject* args, 
+											  PyObject* kwds)
+{
+	float vecArg[2];
+	int bToggle = 0;
+	if(!PyArg_ParseTuple(args, "ffi", &vecArg[0], &vecArg[1], &bToggle)) {
+		return NULL;
+	}
+	m_drot[0] = vecArg[0];
+	m_dloc[0] = vecArg[1];
+	m_bitLocalFlag.Torque = PyArgToBool(bToggle);
+	Py_Return;
+}
+
+/* 6. getForceLimitY                                                                */
+PyObject* KX_ObjectActuator::PyGetForceLimitY(PyObject* self, 
+											  PyObject* args, 
+											  PyObject* kwds)
+{
+	PyObject *retVal = PyList_New(3);
+
+	PyList_SetItem(retVal, 0, PyFloat_FromDouble(m_drot[1]));
+	PyList_SetItem(retVal, 1, PyFloat_FromDouble(m_dloc[1]));
+	PyList_SetItem(retVal, 2, BoolToPyArg(m_bitLocalFlag.DLoc));
+	
+	return retVal;
+}
+/* 7. setForceLimitY                                                                */
+PyObject* KX_ObjectActuator::PySetForceLimitY(PyObject* self, 
+											  PyObject* args, 
+											  PyObject* kwds)
+{
+	float vecArg[2];
+	int bToggle = 0;
+	if(!PyArg_ParseTuple(args, "ffi", &vecArg[0], &vecArg[1], &bToggle)) {
+		return NULL;
+	}
+	m_drot[1] = vecArg[0];
+	m_dloc[1] = vecArg[1];
+	m_bitLocalFlag.DLoc = PyArgToBool(bToggle);
+	Py_Return;
+}
+
+/* 6. getForceLimitZ                                                                */
+PyObject* KX_ObjectActuator::PyGetForceLimitZ(PyObject* self, 
+											  PyObject* args, 
+											  PyObject* kwds)
+{
+	PyObject *retVal = PyList_New(3);
+
+	PyList_SetItem(retVal, 0, PyFloat_FromDouble(m_drot[2]));
+	PyList_SetItem(retVal, 1, PyFloat_FromDouble(m_dloc[2]));
+	PyList_SetItem(retVal, 2, BoolToPyArg(m_bitLocalFlag.DRot));
+	
+	return retVal;
+}
+/* 7. setForceLimitZ                                                                */
+PyObject* KX_ObjectActuator::PySetForceLimitZ(PyObject* self, 
+											  PyObject* args, 
+											  PyObject* kwds)
+{
+	float vecArg[2];
+	int bToggle = 0;
+	if(!PyArg_ParseTuple(args, "ffi", &vecArg[0], &vecArg[1], &bToggle)) {
+		return NULL;
+	}
+	m_drot[2] = vecArg[0];
+	m_dloc[2] = vecArg[1];
+	m_bitLocalFlag.DRot = PyArgToBool(bToggle);
+	Py_Return;
+}
+
+/* 4. getPID                                                              */
+PyObject* KX_ObjectActuator::PyGetPID(PyObject* self, 
+									  PyObject* args, 
+									  PyObject* kwds)
+{
+	PyObject *retVal = PyList_New(3);
+
+	PyList_SetItem(retVal, 0, PyFloat_FromDouble(m_torque[0]));
+	PyList_SetItem(retVal, 1, PyFloat_FromDouble(m_torque[1]));
+	PyList_SetItem(retVal, 2, PyFloat_FromDouble(m_torque[2]));
+	
+	return retVal;
+}
+/* 5. setPID                                                              */
+PyObject* KX_ObjectActuator::PySetPID(PyObject* self, 
+									  PyObject* args, 
+									  PyObject* kwds)
+{
+	float vecArg[3];
+	if (!PyArg_ParseTuple(args, "fff", &vecArg[0], &vecArg[1], &vecArg[2])) {
+		return NULL;
+	}
+	m_torque.setValue(vecArg);
 	Py_Return;
 }
 
 
 
 
+
 /* eof */
diff --git a/source/gameengine/Ketsji/KX_ObjectActuator.h b/source/gameengine/Ketsji/KX_ObjectActuator.h
index edbae154b8b..bb74756551f 100644
--- a/source/gameengine/Ketsji/KX_ObjectActuator.h
+++ b/source/gameengine/Ketsji/KX_ObjectActuator.h
@@ -46,7 +46,12 @@ struct KX_LocalFlags {
 		DLoc(false),
 		LinearVelocity(false),
 		AngularVelocity(false),
-		AddOrSetLinV(false)
+		AddOrSetLinV(false),
+		ZeroForce(false),
+		ZeroDRot(false),
+		ZeroDLoc(false),
+		ZeroLinearVelocity(false),
+		ZeroAngularVelocity(false)
 	{
 	}
 
@@ -57,6 +62,13 @@ struct KX_LocalFlags {
 	unsigned short LinearVelocity : 1;
 	unsigned short AngularVelocity : 1;
 	unsigned short AddOrSetLinV : 1;
+	unsigned short ServoControl : 1;
+	unsigned short ZeroForce : 1;
+	unsigned short ZeroTorque : 1;
+	unsigned short ZeroDRot : 1;
+	unsigned short ZeroDLoc : 1;
+	unsigned short ZeroLinearVelocity : 1;
+	unsigned short ZeroAngularVelocity : 1;
 };
 
 class KX_ObjectActuator : public SCA_IActuator
@@ -69,6 +81,15 @@ class KX_ObjectActuator : public SCA_IActuator
 	MT_Vector3		m_drot;
 	MT_Vector3		m_linear_velocity;
 	MT_Vector3		m_angular_velocity;	
+	MT_Scalar		m_linear_length2;
+	MT_Scalar		m_angular_length2;
+	// used in damping
+	MT_Scalar		m_current_linear_factor;
+	MT_Scalar		m_current_angular_factor;
+	short			m_damping;
+	// used in servo control
+	MT_Vector3		m_previous_error;
+	MT_Vector3		m_error_accumulator;
   	KX_LocalFlags	m_bitLocalFlag;
 
 	// A hack bool -- oh no sorry everyone
@@ -77,6 +98,8 @@ class KX_ObjectActuator : public SCA_IActuator
 	// setting linear velocity.
 
 	bool m_active_combined_velocity;
+	bool m_linear_damping_active;
+	bool m_angular_damping_active;
 	
 public:
 	enum KX_OBJECT_ACT_VEC_TYPE {
@@ -103,6 +126,7 @@ public:
 		const MT_Vector3& drot,
 		const MT_Vector3& linV,
 		const MT_Vector3& angV,
+		const short damping,
 		const KX_LocalFlags& flag,
 		PyTypeObject* T=&Type
 	);
@@ -110,6 +134,17 @@ public:
 	CValue* GetReplica();
 
 	void SetForceLoc(const double force[3])	{ /*m_force=force;*/ }
+	void UpdateFuzzyFlags()
+		{ 
+			m_bitLocalFlag.ZeroForce = MT_fuzzyZero(m_force);
+			m_bitLocalFlag.ZeroTorque = MT_fuzzyZero(m_torque);
+			m_bitLocalFlag.ZeroDLoc = MT_fuzzyZero(m_dloc);
+			m_bitLocalFlag.ZeroDRot = MT_fuzzyZero(m_drot);
+			m_bitLocalFlag.ZeroLinearVelocity = MT_fuzzyZero(m_linear_velocity);
+			m_linear_length2 = (m_bitLocalFlag.ZeroLinearVelocity) ? 0.0 : m_linear_velocity.length2();
+			m_bitLocalFlag.ZeroAngularVelocity = MT_fuzzyZero(m_angular_velocity);
+			m_angular_length2 = (m_bitLocalFlag.ZeroAngularVelocity) ? 0.0 : m_angular_velocity.length2();
+		}
 	virtual bool Update();
 
 
@@ -132,6 +167,16 @@ public:
 	KX_PYMETHOD(KX_ObjectActuator,SetLinearVelocity);
 	KX_PYMETHOD(KX_ObjectActuator,GetAngularVelocity);
 	KX_PYMETHOD(KX_ObjectActuator,SetAngularVelocity);
+	KX_PYMETHOD(KX_ObjectActuator,SetDamping);
+	KX_PYMETHOD(KX_ObjectActuator,GetDamping);
+	KX_PYMETHOD(KX_ObjectActuator,GetForceLimitX);
+	KX_PYMETHOD(KX_ObjectActuator,SetForceLimitX);
+	KX_PYMETHOD(KX_ObjectActuator,GetForceLimitY);
+	KX_PYMETHOD(KX_ObjectActuator,SetForceLimitY);
+	KX_PYMETHOD(KX_ObjectActuator,GetForceLimitZ);
+	KX_PYMETHOD(KX_ObjectActuator,SetForceLimitZ);
+	KX_PYMETHOD(KX_ObjectActuator,GetPID);
+	KX_PYMETHOD(KX_ObjectActuator,SetPID);
 };
 
 #endif //__KX_OBJECTACTUATOR
diff --git a/source/gameengine/Ketsji/KX_OdePhysicsController.cpp b/source/gameengine/Ketsji/KX_OdePhysicsController.cpp
index 4e45ce484e3..8b0a6dafc22 100644
--- a/source/gameengine/Ketsji/KX_OdePhysicsController.cpp
+++ b/source/gameengine/Ketsji/KX_OdePhysicsController.cpp
@@ -177,7 +177,7 @@ void	KX_OdePhysicsController::setRigidBody(bool rigid)
 
 }
 
-void	KX_OdePhysicsController::SuspendDynamics()
+void	KX_OdePhysicsController::SuspendDynamics(bool)
 {
 	ODEPhysicsController::SuspendDynamics();
 }
diff --git a/source/gameengine/Ketsji/KX_OdePhysicsController.h b/source/gameengine/Ketsji/KX_OdePhysicsController.h
index 07a0bee9775..c96c71c81f9 100644
--- a/source/gameengine/Ketsji/KX_OdePhysicsController.h
+++ b/source/gameengine/Ketsji/KX_OdePhysicsController.h
@@ -74,7 +74,7 @@ public:
 	virtual	MT_Vector3	getReactionForce();
 	virtual void	setRigidBody(bool rigid);
 
-	virtual void	SuspendDynamics();
+	virtual void	SuspendDynamics(bool);
 	virtual void	RestoreDynamics();
 	
 
diff --git a/source/gameengine/Ketsji/KX_ParentActuator.cpp b/source/gameengine/Ketsji/KX_ParentActuator.cpp
index 5c433cb68b1..8b379bcd44f 100644
--- a/source/gameengine/Ketsji/KX_ParentActuator.cpp
+++ b/source/gameengine/Ketsji/KX_ParentActuator.cpp
@@ -77,6 +77,12 @@ CValue* KX_ParentActuator::GetReplica()
 
 bool KX_ParentActuator::Update()
 {
+	bool bNegativeEvent = IsNegativeEvent();
+	RemoveAllEvents();
+
+	if (bNegativeEvent)
+		return false; // do nothing on negative events
+
 	KX_GameObject *obj = (KX_GameObject*) GetParent();
 	KX_Scene *scene = PHY_GetActiveScene();
 	switch (m_mode) {
diff --git a/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp b/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
index 27cfaefc076..2df4c6a9980 100644
--- a/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
+++ b/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
@@ -58,6 +58,9 @@ PyObject* KX_PhysicsObjectWrapper::PySetPosition(PyObject* self,
 	{
 		m_ctrl->setPosition(x,y,z);
 	}
+	else {
+		return NULL;
+	}
 	Py_INCREF(Py_None); return Py_None;
 }
 
@@ -72,6 +75,9 @@ PyObject* KX_PhysicsObjectWrapper::PySetLinearVelocity(PyObject* self,
 	{
 		m_ctrl->SetLinearVelocity(x,y,z,local != 0);
 	}
+	else {
+		return NULL;
+	}
 	Py_INCREF(Py_None); return Py_None;
 }
 
@@ -85,6 +91,9 @@ PyObject* KX_PhysicsObjectWrapper::PySetAngularVelocity(PyObject* self,
 	{
 		m_ctrl->SetAngularVelocity(x,y,z,local != 0);
 	}
+	else {
+		return NULL;
+	}
 	Py_INCREF(Py_None); return Py_None;
 }
 
@@ -97,6 +106,9 @@ PyObject*	KX_PhysicsObjectWrapper::PySetActive(PyObject* self,
 	{
 		m_ctrl->SetActive(active!=0);
 	}
+	else {
+		return NULL;
+	}
 	Py_INCREF(Py_None); return Py_None;
 }
 
diff --git a/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp b/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
index 172882ff18d..c01d6a632a3 100644
--- a/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
+++ b/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
@@ -82,12 +82,15 @@ static PyObject* gPySetGravity(PyObject* self,
 										 PyObject* kwds)
 {
 	float x,y,z;
-	int len = PyTuple_Size(args);
-	if ((len == 3) && PyArg_ParseTuple(args,"fff",&x,&y,&z))
+	if (PyArg_ParseTuple(args,"fff",&x,&y,&z))
 	{
 		if (PHY_GetActiveEnvironment())
 			PHY_GetActiveEnvironment()->setGravity(x,y,z);
 	}
+	else {
+		return NULL;
+	}
+	
 	Py_INCREF(Py_None); return Py_None;
 }
 
@@ -105,6 +108,10 @@ static PyObject* gPySetDebugMode(PyObject* self,
 		}
 		
 	}
+	else {
+		return NULL;
+	}
+	
 	Py_INCREF(Py_None); return Py_None;
 }
 
@@ -122,6 +129,9 @@ static PyObject* gPySetNumTimeSubSteps(PyObject* self,
 			PHY_GetActiveEnvironment()->setNumTimeSubSteps(substep);
 		}
 	}
+	else {
+		return NULL;
+	}
 	Py_INCREF(Py_None); return Py_None;
 }
 
@@ -138,6 +148,9 @@ static PyObject* gPySetNumIterations(PyObject* self,
 			PHY_GetActiveEnvironment()->setNumIterations(iter);
 		}
 	}
+	else {
+		return NULL;
+	}
 	Py_INCREF(Py_None); return Py_None;
 }
 
@@ -155,6 +168,9 @@ static PyObject* gPySetDeactivationTime(PyObject* self,
 			PHY_GetActiveEnvironment()->setDeactivationTime(deactive_time);
 		}
 	}
+	else {
+		return NULL;
+	}
 	Py_INCREF(Py_None); return Py_None;
 }
 
@@ -171,6 +187,9 @@ static PyObject* gPySetDeactivationLinearTreshold(PyObject* self,
 			PHY_GetActiveEnvironment()->setDeactivationLinearTreshold( linearDeactivationTreshold);
 		}
 	}
+	else {
+		return NULL;
+	}
 	Py_INCREF(Py_None); return Py_None;
 }
 
@@ -187,6 +206,9 @@ static PyObject* gPySetDeactivationAngularTreshold(PyObject* self,
 			PHY_GetActiveEnvironment()->setDeactivationAngularTreshold( angularDeactivationTreshold);
 		}
 	}
+	else {
+		return NULL;
+	}
 	Py_INCREF(Py_None); return Py_None;
 }
 
@@ -202,6 +224,9 @@ static PyObject* gPySetContactBreakingTreshold(PyObject* self,
 			PHY_GetActiveEnvironment()->setContactBreakingTreshold( contactBreakingTreshold);
 		}
 	}
+	else {
+		return NULL;
+	}
 	Py_INCREF(Py_None); return Py_None;
 }
 
@@ -218,6 +243,9 @@ static PyObject* gPySetCcdMode(PyObject* self,
 			PHY_GetActiveEnvironment()->setCcdMode( ccdMode);
 		}
 	}
+	else {
+		return NULL;
+	}
 	Py_INCREF(Py_None); return Py_None;
 }
 
@@ -233,6 +261,9 @@ static PyObject* gPySetSorConstant(PyObject* self,
 			PHY_GetActiveEnvironment()->setSolverSorConstant( sor);
 		}
 	}
+	else {
+		return NULL;
+	}
 	Py_INCREF(Py_None); return Py_None;
 }
 
@@ -248,6 +279,9 @@ static PyObject* gPySetSolverTau(PyObject* self,
 			PHY_GetActiveEnvironment()->setSolverTau( tau);
 		}
 	}
+	else {
+		return NULL;
+	}
 	Py_INCREF(Py_None); return Py_None;
 }
 
@@ -264,6 +298,9 @@ static PyObject* gPySetSolverDamping(PyObject* self,
 			PHY_GetActiveEnvironment()->setSolverDamping( damping);
 		}
 	}
+	else {
+		return NULL;
+	}
 	Py_INCREF(Py_None); return Py_None;
 }
 
@@ -279,6 +316,9 @@ static PyObject* gPySetLinearAirDamping(PyObject* self,
 			PHY_GetActiveEnvironment()->setLinearAirDamping( damping);
 		}
 	}
+	else {
+		return NULL;
+	}
 	Py_INCREF(Py_None); return Py_None;
 }
 
@@ -295,6 +335,9 @@ static PyObject* gPySetUseEpa(PyObject* self,
 			PHY_GetActiveEnvironment()->setUseEpa(epa);
 		}
 	}
+	else {
+		return NULL;
+	}
 	Py_INCREF(Py_None); return Py_None;
 }
 static PyObject* gPySetSolverType(PyObject* self,
@@ -309,6 +352,9 @@ static PyObject* gPySetSolverType(PyObject* self,
 			PHY_GetActiveEnvironment()->setSolverType(solverType);
 		}
 	}
+	else {
+		return NULL;
+	}
 	Py_INCREF(Py_None); return Py_None;
 }
 
@@ -338,6 +384,9 @@ static PyObject* gPyGetVehicleConstraint(PyObject* self,
 
 		}
 	}
+	else {
+		return NULL;
+	}
 
 	Py_INCREF(Py_None); return Py_None;
 }
@@ -395,6 +444,9 @@ static PyObject* gPyCreateConstraint(PyObject* self,
 			
 		}
 	}
+	else {
+		return NULL;
+	}
 
 	Py_INCREF(Py_None); return Py_None;
 }
@@ -421,6 +473,9 @@ static PyObject* gPyGetAppliedImpulse(PyObject* self,
 			appliedImpulse = PHY_GetActiveEnvironment()->getAppliedImpulse(constraintid);
 		}
 	}
+	else {
+		return NULL;
+	}
 
 	return PyFloat_FromDouble(appliedImpulse);
 }
@@ -443,6 +498,10 @@ static PyObject* gPyRemoveConstraint(PyObject* self,
 			PHY_GetActiveEnvironment()->removeConstraint(constraintid);
 		}
 	}
+	else {
+		return NULL;
+	}
+	
 	Py_INCREF(Py_None); return Py_None;
 }
 
diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp
index a80a7f04e8f..61ed8b6a8e4 100644
--- a/source/gameengine/Ketsji/KX_PythonInit.cpp
+++ b/source/gameengine/Ketsji/KX_PythonInit.cpp
@@ -28,25 +28,7 @@
  * Initialize Python thingies.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifdef WIN32
-#include <windows.h>
-#endif // WIN32
-#ifdef __APPLE__
-#define GL_GLEXT_LEGACY 1
-#include <OpenGL/gl.h>
-#include <OpenGL/glu.h>
-#else
-#include <GL/gl.h>
-/* #if defined(__sun__) && !defined(__sparc__)
-#include <mesa/glu.h>
-#else */
-#include <GL/glu.h>
-/* #endif */
-#endif
+#include "GL/glew.h"
 
 #include <stdlib.h>
 
@@ -121,9 +103,7 @@ void	KX_RasterizerDrawDebugLine(const MT_Vector3& from,const MT_Vector3& to,cons
 static PyObject* ErrorObject;
 STR_String gPyGetRandomFloat_doc="getRandomFloat returns a random floating point value in the range [0..1)";
 
-static PyObject* gPyGetRandomFloat(PyObject*,
-					PyObject*, 
-					PyObject*)
+static PyObject* gPyGetRandomFloat(PyObject*)
 {
 	return PyFloat_FromDouble(MT_random());
 }
@@ -174,9 +154,7 @@ static PyObject* gPyExpandPath(PyObject*,
 static bool usedsp = false;
 
 // this gets a pointer to an array filled with floats
-static PyObject* gPyGetSpectrum(PyObject*,
-								PyObject* args, 
-								PyObject*)
+static PyObject* gPyGetSpectrum(PyObject*)
 {
 	SND_IAudioDevice* audiodevice = SND_DeviceManager::Instance();
 
@@ -255,7 +233,7 @@ static PyObject* gPySetLogicTicRate(PyObject*,
 	return NULL;
 }
 
-static PyObject* gPyGetLogicTicRate(PyObject*, PyObject*, PyObject*)
+static PyObject* gPyGetLogicTicRate(PyObject*)
 {
 	return PyFloat_FromDouble(KX_KetsjiEngine::GetTicRate());
 }
@@ -291,7 +269,7 @@ static PyObject* gPySetPhysicsDebug(PyObject*,
 
 
 
-static PyObject* gPyGetPhysicsTicRate(PyObject*, PyObject*, PyObject*)
+static PyObject* gPyGetPhysicsTicRate(PyObject*)
 {
 	return PyFloat_FromDouble(PHY_GetActiveEnvironment()->getFixedTimeStep());
 }
@@ -299,9 +277,7 @@ static PyObject* gPyGetPhysicsTicRate(PyObject*, PyObject*, PyObject*)
 static STR_String gPyGetCurrentScene_doc =  
 "getCurrentScene()\n"
 "Gets a reference to the current scene.\n";
-static PyObject* gPyGetCurrentScene(PyObject* self,
-					   PyObject* args, 
-					   PyObject* kwds)
+static PyObject* gPyGetCurrentScene(PyObject* self)
 {
 	Py_INCREF(gp_KetsjiScene);
 	return (PyObject*) gp_KetsjiScene;
@@ -310,17 +286,13 @@ static PyObject* gPyGetCurrentScene(PyObject* self,
 static PyObject *pyPrintExt(PyObject *,PyObject *,PyObject *)
 {
 #define pprint(x) std::cout << x << std::endl;
-	bgl::BL_EXTInfo ext = bgl::RAS_EXT_support;
 	bool count=0;
 	bool support=0;
 	pprint("Supported Extensions...");
-#ifdef GL_ARB_shader_objects
-	pprint(" GL_ARB_shader_objects supported?       "<< (ext._ARB_shader_objects?"yes.":"no."));
+	pprint(" GL_ARB_shader_objects supported?       "<< (GLEW_ARB_shader_objects?"yes.":"no."));
 	count = 1;
-#endif
 
-#ifdef GL_ARB_vertex_shader
-	support= ext._ARB_vertex_shader;
+	support= GLEW_ARB_vertex_shader;
 	pprint(" GL_ARB_vertex_shader supported?        "<< (support?"yes.":"no."));
 	count = 1;
 	if(support){
@@ -339,9 +311,8 @@ static PyObject *pyPrintExt(PyObject *,PyObject *,PyObject *)
 		pprint("  Max combined texture units." << max);
 		pprint("");
 	}
-#endif
-#ifdef GL_ARB_fragment_shader
-	support=ext._ARB_fragment_shader;
+
+	support=GLEW_ARB_fragment_shader;
 	pprint(" GL_ARB_fragment_shader supported?      "<< (support?"yes.":"no."));
 	count = 1;
 	if(support){
@@ -351,9 +322,8 @@ static PyObject *pyPrintExt(PyObject *,PyObject *,PyObject *)
 		pprint("  Max uniform components." << max);
 		pprint("");
 	}
-#endif
-#ifdef GL_ARB_texture_cube_map
-	support = ext._ARB_texture_cube_map;
+
+	support = GLEW_ARB_texture_cube_map;
 	pprint(" GL_ARB_texture_cube_map supported?     "<< (support?"yes.":"no."));
 	count = 1;
 	if(support){
@@ -363,25 +333,21 @@ static PyObject *pyPrintExt(PyObject *,PyObject *,PyObject *)
 		pprint("  Max cubemap size." << size);
 		pprint("");
 	}
-#endif
-#if defined(GL_ARB_multitexture) && defined(WITH_GLEXT)
-	if (!getenv("WITHOUT_GLEXT")) {
-		support = ext._ARB_multitexture;
-		count = 1;
-		pprint(" GL_ARB_multitexture supported?         "<< (support?"yes.":"no."));
-		if(support){
-			pprint(" ----------Details----------");
-			int units=0;
-			glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, (GLint*)&units);
-			pprint("  Max texture units available.  " << units);
-			pprint("");
-		}
-	}
-#endif
-#ifdef GL_ARB_texture_env_combine
-	pprint(" GL_ARB_texture_env_combine supported?  "<< (ext._ARB_texture_env_combine?"yes.":"no."));
+
+	support = GLEW_ARB_multitexture;
 	count = 1;
-#endif
+	pprint(" GL_ARB_multitexture supported?         "<< (support?"yes.":"no."));
+	if(support){
+		pprint(" ----------Details----------");
+		int units=0;
+		glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, (GLint*)&units);
+		pprint("  Max texture units available.  " << units);
+		pprint("");
+	}
+
+	pprint(" GL_ARB_texture_env_combine supported?  "<< (GLEW_ARB_texture_env_combine?"yes.":"no."));
+	count = 1;
+
 	if(!count)
 		pprint("No extenstions are used in this build");
 
@@ -394,19 +360,19 @@ static struct PyMethodDef game_methods[] = {
 	{"expandPath", (PyCFunction)gPyExpandPath, METH_VARARGS, gPyExpandPath_doc},
 	{"getCurrentController",
 	(PyCFunction) SCA_PythonController::sPyGetCurrentController,
-	METH_VARARGS, SCA_PythonController::sPyGetCurrentController__doc__},
+	METH_NOARGS, SCA_PythonController::sPyGetCurrentController__doc__},
 	{"getCurrentScene", (PyCFunction) gPyGetCurrentScene,
-	METH_VARARGS, gPyGetCurrentScene_doc.Ptr()},
+	METH_NOARGS, gPyGetCurrentScene_doc.Ptr()},
 	{"addActiveActuator",(PyCFunction) SCA_PythonController::sPyAddActiveActuator,
 	METH_VARARGS, SCA_PythonController::sPyAddActiveActuator__doc__},
 	{"getRandomFloat",(PyCFunction) gPyGetRandomFloat,
-	METH_VARARGS,gPyGetRandomFloat_doc.Ptr()},
+	METH_NOARGS,gPyGetRandomFloat_doc.Ptr()},
 	{"setGravity",(PyCFunction) gPySetGravity, METH_VARARGS,"set Gravitation"},
-	{"getSpectrum",(PyCFunction) gPyGetSpectrum, METH_VARARGS,"get audio spectrum"},
+	{"getSpectrum",(PyCFunction) gPyGetSpectrum, METH_NOARGS,"get audio spectrum"},
 	{"stopDSP",(PyCFunction) gPyStopDSP, METH_VARARGS,"stop using the audio dsp (for performance reasons)"},
-	{"getLogicTicRate", (PyCFunction) gPyGetLogicTicRate, METH_VARARGS, "Gets the logic tic rate"},
+	{"getLogicTicRate", (PyCFunction) gPyGetLogicTicRate, METH_NOARGS, "Gets the logic tic rate"},
 	{"setLogicTicRate", (PyCFunction) gPySetLogicTicRate, METH_VARARGS, "Sets the logic tic rate"},
-	{"getPhysicsTicRate", (PyCFunction) gPyGetPhysicsTicRate, METH_VARARGS, "Gets the physics tic rate"},
+	{"getPhysicsTicRate", (PyCFunction) gPyGetPhysicsTicRate, METH_NOARGS, "Gets the physics tic rate"},
 	{"setPhysicsTicRate", (PyCFunction) gPySetPhysicsTicRate, METH_VARARGS, "Sets the physics tic rate"},
 	{"PrintGLInfo", (PyCFunction)pyPrintExt, METH_NOARGS, "Prints GL Extension Info"},
 	{NULL, (PyCFunction) NULL, 0, NULL }
@@ -453,7 +419,7 @@ static PyObject* gPyEnableVisibility(PyObject*,
 	}
 	else
 	{
-	  Py_Return;	     
+		return NULL;
 	}
    Py_Return;
 }
@@ -477,6 +443,9 @@ static PyObject* gPyShowMouse(PyObject*,
 				gp_Canvas->SetMouseState(RAS_ICanvas::MOUSE_INVISIBLE);
 		}
 	}
+	else {
+		return NULL;
+	}
 	
    Py_Return;
 }
@@ -493,6 +462,9 @@ static PyObject* gPySetMousePosition(PyObject*,
 	    if (gp_Canvas)
 			gp_Canvas->SetMousePosition(x,y);
 	}
+	else {
+		return NULL;
+	}
 	
    Py_Return;
 }
@@ -596,6 +568,9 @@ static PyObject* gPySetMistStart(PyObject*,
 			gp_Rasterizer->SetFogStart(miststart);
 		}
 	}
+	else {
+		return NULL;
+	}
    Py_Return;
 }
 
@@ -614,6 +589,9 @@ static PyObject* gPySetMistEnd(PyObject*,
 			gp_Rasterizer->SetFogEnd(mistend);
 		}
 	}
+	else {
+		return NULL;
+	}
    Py_Return;
 }
 
@@ -651,6 +629,9 @@ static PyObject* gPyMakeScreenshot(PyObject*,
 			gp_Canvas->MakeScreenShot(filename);
 		}
 	}
+	else {
+		return NULL;
+	}
 	Py_Return;
 }
 
@@ -666,6 +647,9 @@ static PyObject* gPyEnableMotionBlur(PyObject*,
 			gp_Rasterizer->EnableMotionBlur(motionblurvalue);
 		}
 	}
+	else {
+		return NULL;
+	}
 	Py_Return;
 }
 
@@ -844,20 +828,9 @@ PyObject* initGameLogic(KX_Scene* scene) // quick hack to get gravity hook
 		Py_FatalError("can't initialize module GameLogic");
     }
 
-	return d;
+	return m;
 }
 
-void dictionaryClearByHand(PyObject *dict)
-{
-	// Clears the dictionary by hand:
-	// This prevents, extra references to global variables
-	// inside the GameLogic dictionary when the python interpreter is finalized.
-	// which allows the scene to safely delete them :)
-	// see: (space.c)->start_game
-  	if(dict) PyDict_Clear(dict);
-}
-
-
 // Python Sandbox code
 // override builtin functions import() and open()
 
diff --git a/source/gameengine/Ketsji/KX_PythonInit.h b/source/gameengine/Ketsji/KX_PythonInit.h
index c7d8f1b78bc..41cf7fd67b3 100644
--- a/source/gameengine/Ketsji/KX_PythonInit.h
+++ b/source/gameengine/Ketsji/KX_PythonInit.h
@@ -47,7 +47,6 @@ PyObject*	initGamePlayerPythonScripting(const STR_String& progname, TPythonSecur
 void		exitGamePlayerPythonScripting();
 PyObject*	initGamePythonScripting(const STR_String& progname, TPythonSecurityLevel level);
 void		exitGamePythonScripting();
-void		dictionaryClearByHand(PyObject *dict);
 
 void PHY_SetActiveScene(class KX_Scene* scene);
 class KX_Scene* PHY_GetActiveScene();
diff --git a/source/gameengine/Ketsji/KX_RadarSensor.cpp b/source/gameengine/Ketsji/KX_RadarSensor.cpp
index 31fffffa3c1..bf2ba18f490 100644
--- a/source/gameengine/Ketsji/KX_RadarSensor.cpp
+++ b/source/gameengine/Ketsji/KX_RadarSensor.cpp
@@ -71,7 +71,6 @@ KX_RadarSensor::KX_RadarSensor(SCA_EventManager* eventmgr,
 	//sumoObj->setClientObject(&m_client_info);
 }
 			
-
 KX_RadarSensor::~KX_RadarSensor()
 {
 	
@@ -81,10 +80,7 @@ CValue* KX_RadarSensor::GetReplica()
 {
 	KX_RadarSensor* replica = new KX_RadarSensor(*this);
 	replica->m_colliders = new CListValue();
-	replica->m_bCollision = false;
-	replica->m_bTriggered= false;
-	replica->m_hitObject = NULL;
-	replica->m_bLastTriggered = false;
+	replica->Init();
 	// this will copy properties and so on...
 	CValue::AddDataToReplica(replica);
 	
@@ -93,6 +89,10 @@ CValue* KX_RadarSensor::GetReplica()
 	if (replica->m_physCtrl)
 	{
 		replica->m_physCtrl = replica->m_physCtrl->GetReplica();
+		if (replica->m_physCtrl)
+		{
+			replica->m_physCtrl->setNewClientInfo(replica->m_client_info);
+		}
 	}
 
 	//todo: make sure replication works fine!
diff --git a/source/gameengine/Ketsji/KX_RayCast.cpp b/source/gameengine/Ketsji/KX_RayCast.cpp
index b88741625b6..89e2d645d54 100644
--- a/source/gameengine/Ketsji/KX_RayCast.cpp
+++ b/source/gameengine/Ketsji/KX_RayCast.cpp
@@ -49,7 +49,7 @@ bool KX_RayCast::RayTest(KX_IPhysicsController* ignore_controller, PHY_IPhysicsE
 	//
 	// returns true if an object was found, false if not.
 	MT_Point3 frompoint(_frompoint);
-	const MT_Vector3 todir( (topoint - frompoint).normalized() );
+	const MT_Vector3 todir( (topoint - frompoint).safe_normalized() );
 	
 	PHY_IPhysicsController* hit_controller;
 	PHY__Vector3 phy_pos;
diff --git a/source/gameengine/Ketsji/KX_RaySensor.cpp b/source/gameengine/Ketsji/KX_RaySensor.cpp
index a85dc61cac8..a416c8c9f89 100644
--- a/source/gameengine/Ketsji/KX_RaySensor.cpp
+++ b/source/gameengine/Ketsji/KX_RaySensor.cpp
@@ -60,17 +60,20 @@ KX_RaySensor::KX_RaySensor(class SCA_EventManager* eventmgr,
 					m_bFindMaterial(bFindMaterial),
 					m_distance(distance),
 					m_scene(ketsjiScene),
-					m_bTriggered(false),
-					m_axis(axis),
-					m_rayHit(false),
-					m_hitObject(NULL)
+					m_axis(axis)
 
 				
 {
-
+	Init();
 }
 
-
+void KX_RaySensor::Init()
+{
+	m_bTriggered = (m_invert)?true:false;
+	m_rayHit = false;
+	m_hitObject = NULL;
+	m_reset = true;
+}
 
 KX_RaySensor::~KX_RaySensor() 
 {
@@ -81,9 +84,10 @@ KX_RaySensor::~KX_RaySensor()
 
 CValue* KX_RaySensor::GetReplica()
 {
-	CValue* replica = new KX_RaySensor(*this);
+	KX_RaySensor* replica = new KX_RaySensor(*this);
 	// this will copy properties and so on...
 	CValue::AddDataToReplica(replica);
+	replica->Init();
 
 	return replica;
 }
@@ -149,6 +153,7 @@ bool KX_RaySensor::RayHit(KX_ClientObjectInfo* client, MT_Point3& hit_point, MT_
 bool KX_RaySensor::Evaluate(CValue* event)
 {
 	bool result = false;
+	bool reset = m_reset && m_level;
 	m_rayHit = false; 
 	m_hitObject = NULL;
 	m_hitPosition = MT_Vector3(0,0,0);
@@ -160,6 +165,7 @@ bool KX_RaySensor::Evaluate(CValue* event)
 	MT_Matrix3x3 invmat = matje.inverse();
 	
 	MT_Vector3 todir;
+	m_reset = false;
 	switch (m_axis)
 	{
 	case 1: // X
@@ -261,7 +267,9 @@ bool KX_RaySensor::Evaluate(CValue* event)
 		}
 	
       }
-    
+    if (reset)
+		// force an event
+		result = true;
 
 	return result;
 }
diff --git a/source/gameengine/Ketsji/KX_RaySensor.h b/source/gameengine/Ketsji/KX_RaySensor.h
index 8a317ffaa07..f4305b053d1 100644
--- a/source/gameengine/Ketsji/KX_RaySensor.h
+++ b/source/gameengine/Ketsji/KX_RaySensor.h
@@ -66,6 +66,7 @@ public:
 
 	virtual bool Evaluate(CValue* event);
 	virtual bool IsPositiveTrigger();
+	virtual void Init();
 
 	bool RayHit(KX_ClientObjectInfo* client, MT_Point3& hit_point, MT_Vector3& hit_normal, void * const data);
 	
diff --git a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
index 76ce086ab97..e5ee4cbddf1 100644
--- a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
+++ b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
@@ -48,7 +48,7 @@
 /* ------------------------------------------------------------------------- */
 
 KX_SCA_AddObjectActuator::KX_SCA_AddObjectActuator(SCA_IObject *gameobj,
-												   CValue* original,
+												   SCA_IObject *original,
 												   int time,
 												   SCA_IScene* scene,
 												   const MT_Vector3& linvel,
@@ -61,6 +61,9 @@ KX_SCA_AddObjectActuator::KX_SCA_AddObjectActuator(SCA_IObject *gameobj,
 	m_linear_velocity(linvel),
 	m_localFlag(local)
 {
+	if (m_OriginalObject)
+		m_OriginalObject->RegisterActuator(this);
+
 	m_lastCreatedObject = NULL;
 	m_timeProp = time;
 } 
@@ -69,6 +72,8 @@ KX_SCA_AddObjectActuator::KX_SCA_AddObjectActuator(SCA_IObject *gameobj,
 
 KX_SCA_AddObjectActuator::~KX_SCA_AddObjectActuator()
 { 
+	if (m_OriginalObject)
+		m_OriginalObject->UnregisterActuator(this);
 	if (m_lastCreatedObject)
 		m_lastCreatedObject->Release();
 } 
@@ -108,12 +113,29 @@ CValue* KX_SCA_AddObjectActuator::GetReplica()
 
 	// this will copy properties and so on...
 	replica->ProcessReplica();
-	replica->m_lastCreatedObject=NULL;
 	CValue::AddDataToReplica(replica);
 
 	return replica;
 }
 
+void KX_SCA_AddObjectActuator::ProcessReplica()
+{
+	if (m_OriginalObject)
+		m_OriginalObject->RegisterActuator(this);
+	m_lastCreatedObject=NULL;
+	SCA_IActuator::ProcessReplica();
+}
+
+bool KX_SCA_AddObjectActuator::UnlinkObject(SCA_IObject* clientobj)
+{
+	if (clientobj == m_OriginalObject)
+	{
+		// this object is being deleted, we cannot continue to track it.
+		m_OriginalObject = NULL;
+		return true;
+	}
+	return false;
+}
 
 
 /* ------------------------------------------------------------------------- */
@@ -181,7 +203,11 @@ PyObject* KX_SCA_AddObjectActuator::PySetObject(PyObject* self,
 	PyObject* gameobj;
 	if (PyArg_ParseTuple(args, "O!", &KX_GameObject::Type, &gameobj))
 	{
-		m_OriginalObject = (CValue*)gameobj;
+		if (m_OriginalObject != NULL)
+			m_OriginalObject->UnregisterActuator(this);
+		m_OriginalObject = (SCA_IObject*)gameobj;
+		if (m_OriginalObject)
+			m_OriginalObject->RegisterActuator(this);
 		Py_Return;
 	}
 	PyErr_Clear();
@@ -189,8 +215,11 @@ PyObject* KX_SCA_AddObjectActuator::PySetObject(PyObject* self,
 	char* objectname;
 	if (PyArg_ParseTuple(args, "s", &objectname))
 	{
-		m_OriginalObject= (CValue*)SCA_ILogicBrick::m_sCurrentLogicManager->GetGameObjectByName(STR_String(objectname));;
-		
+		if (m_OriginalObject != NULL)
+			m_OriginalObject->UnregisterActuator(this);
+		m_OriginalObject = (SCA_IObject*)SCA_ILogicBrick::m_sCurrentLogicManager->GetGameObjectByName(STR_String(objectname));;
+		if (m_OriginalObject)
+			m_OriginalObject->RegisterActuator(this);
 		Py_Return;
 	}
 	
diff --git a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
index 2126a646303..42123b94a68 100644
--- a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
+++ b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
@@ -53,7 +53,7 @@ class KX_SCA_AddObjectActuator : public SCA_IActuator
 	int	m_timeProp;
 
 	/// Original object reference (object to replicate)  	
-	CValue*	m_OriginalObject;
+	SCA_IObject*	m_OriginalObject;
 
 	/// Object will be added to the following scene
 	SCA_IScene*	m_scene;
@@ -75,7 +75,7 @@ public:
 
 	KX_SCA_AddObjectActuator(
 		SCA_IObject *gameobj,
-		CValue* original,
+		SCA_IObject *original,
 		int time,
 		SCA_IScene* scene,
 		const MT_Vector3& linvel,
@@ -89,6 +89,12 @@ public:
 	GetReplica(
 	) ;
 
+	virtual void 
+	ProcessReplica();
+
+	virtual bool 
+	UnlinkObject(SCA_IObject* clientobj);
+
 	virtual bool 
 	Update();
 
diff --git a/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp b/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
new file mode 100644
index 00000000000..d44ab477749
--- /dev/null
+++ b/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
@@ -0,0 +1,206 @@
+//
+// Adjust dynamics settins for this object
+//
+// $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 *****
+
+//
+// Previously existed as:
+
+// \source\gameengine\GameLogic\SCA_DynamicActuator.cpp
+
+// Please look here for revision history.
+
+#include "KX_SCA_DynamicActuator.h"
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+/* ------------------------------------------------------------------------- */
+/* Python functions                                                          */
+/* ------------------------------------------------------------------------- */
+
+/* Integration hooks ------------------------------------------------------- */
+
+	PyTypeObject 
+
+KX_SCA_DynamicActuator::
+
+Type = {
+	PyObject_HEAD_INIT(&PyType_Type)
+	0,
+	"KX_SCA_DynamicActuator",
+	sizeof(KX_SCA_DynamicActuator),
+	0,
+	PyDestructor,
+	0,
+	__getattr,
+	__setattr,
+	0, 
+	__repr,
+	0, 
+	0,
+	0,
+	0,
+	0
+};
+
+PyParentObject KX_SCA_DynamicActuator::Parents[] = {
+	&KX_SCA_DynamicActuator::Type,
+	&SCA_IActuator::Type,
+	&SCA_ILogicBrick::Type,
+	&CValue::Type,
+	NULL
+};
+
+
+PyMethodDef KX_SCA_DynamicActuator::Methods[] = {
+	KX_PYMETHODTABLE(KX_SCA_DynamicActuator, setOperation),
+   	KX_PYMETHODTABLE(KX_SCA_DynamicActuator, getOperation),
+	{NULL,NULL} //Sentinel
+};
+
+
+
+PyObject* KX_SCA_DynamicActuator::_getattr(const STR_String& attr)
+{
+  _getattr_up(SCA_IActuator);
+}
+
+
+
+/* 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")
+{
+	int dyn_operation;
+	
+	if (!PyArg_ParseTuple(args, "i", &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;
+}
+
+KX_PYMETHODDEF_DOC(KX_SCA_DynamicActuator, getOperation,
+"getOperation() -> integer\n"
+"Returns the operation type of this actuator.\n"
+)
+{
+	return PyInt_FromLong((long)m_dyn_operation);
+}
+
+
+/* ------------------------------------------------------------------------- */
+/* Native functions                                                          */
+/* ------------------------------------------------------------------------- */
+
+KX_SCA_DynamicActuator::KX_SCA_DynamicActuator(SCA_IObject *gameobj,
+													   short dyn_operation,
+													   PyTypeObject* T) : 
+
+	SCA_IActuator(gameobj, T),
+	m_dyn_operation(dyn_operation)
+{
+} /* End of constructor */
+
+
+KX_SCA_DynamicActuator::~KX_SCA_DynamicActuator()
+{ 
+	// there's nothing to be done here, really....
+} /* end of destructor */
+
+
+
+bool KX_SCA_DynamicActuator::Update()
+{
+	// bool result = false;	/*unused*/
+	KX_GameObject *obj = (KX_GameObject*) GetParent();
+	bool bNegativeEvent = IsNegativeEvent();
+	KX_IPhysicsController* controller;
+	RemoveAllEvents();
+
+	if (bNegativeEvent)
+		return false; // do nothing on negative events
+	
+	if (!obj)
+		return false; // object not accessible, shouldnt happen
+	controller = obj->GetPhysicsController();
+	if (!controller)
+		return false;	// no physic object
+
+	switch (m_dyn_operation)
+	{
+		case 0:			
+			obj->RestoreDynamics();	
+			break;
+		case 1:
+			obj->SuspendDynamics();
+			break;
+		case 2:
+			controller->setRigidBody(true);	
+			break;
+		case 3:
+			controller->setRigidBody(false);
+			break;
+	}
+
+	return false;
+}
+
+
+
+CValue* KX_SCA_DynamicActuator::GetReplica()
+{
+	KX_SCA_DynamicActuator* replica = 
+		new KX_SCA_DynamicActuator(*this);
+
+	if (replica == NULL)
+		return NULL;
+
+	replica->ProcessReplica();
+
+	// this will copy properties and so on...
+	CValue::AddDataToReplica(replica);
+
+	return replica;
+};
+
+
+/* eof */
diff --git a/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h b/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
new file mode 100644
index 00000000000..b47c3a511d9
--- /dev/null
+++ b/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
@@ -0,0 +1,76 @@
+//
+// Add object to the game world on action of this actuator
+//
+// $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): Campbell Barton
+//
+// ***** END GPL LICENSE BLOCK *****
+//
+
+#ifndef __KX_SCA_DYNAMICACTUATOR
+#define __KX_SCA_DYNAMICACTUATOR
+
+#include "SCA_IActuator.h"
+#include "SCA_PropertyActuator.h"
+#include "SCA_LogicManager.h"
+
+#include "KX_GameObject.h"
+#include "KX_IPhysicsController.h"
+
+class KX_SCA_DynamicActuator : public SCA_IActuator
+{
+	Py_Header;
+
+	// dynamics operation to apply to the game object
+	short m_dyn_operation;
+ public:
+	KX_SCA_DynamicActuator(
+		SCA_IObject* gameobj, 
+		short dyn_operation,
+		PyTypeObject* T=&Type
+	);
+
+	~KX_SCA_DynamicActuator(
+	);
+
+		CValue* 
+	GetReplica(
+	);
+
+	virtual bool 
+	Update();
+
+	virtual PyObject*  
+	_getattr(
+		const STR_String& attr
+	);
+
+	/* 1. setOperation */
+	KX_PYMETHOD_DOC(KX_SCA_DynamicActuator,setOperation);
+	KX_PYMETHOD_DOC(KX_SCA_DynamicActuator,getOperation);
+
+}; 
+
+#endif
diff --git a/source/gameengine/Ketsji/KX_SG_NodeRelationships.h b/source/gameengine/Ketsji/KX_SG_NodeRelationships.h
index e53af22408e..faa650106c8 100644
--- a/source/gameengine/Ketsji/KX_SG_NodeRelationships.h
+++ b/source/gameengine/Ketsji/KX_SG_NodeRelationships.h
@@ -177,8 +177,23 @@ public :
 	NewCopy(
 	);
 
+		MT_Scalar
+	GetTimeOffset(
+	) { return m_relax; }
+	
+		void
+	SetTimeOffset(
+		MT_Scalar relaxation
+	) { m_relax = relaxation; }
+
 	~KX_SlowParentRelation(
 	);
+	
+		bool
+	IsSlowRelation(
+	) { 
+		return true;
+	}
 
 private :
 
diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp
index e4054e07475..200883a094c 100644
--- a/source/gameengine/Ketsji/KX_Scene.cpp
+++ b/source/gameengine/Ketsji/KX_Scene.cpp
@@ -48,6 +48,7 @@
 #include "SCA_KeyboardManager.h"
 #include "SCA_MouseManager.h"
 #include "SCA_PropertyEventManager.h"
+#include "SCA_ActuatorEventManager.h"
 #include "KX_Camera.h"
 #include "SCA_JoystickManager.h"
 
@@ -65,6 +66,8 @@
 #include "SG_Controller.h"
 #include "SG_IObject.h"
 #include "SG_Tree.h"
+#include "DNA_group_types.h"
+#include "BKE_anim.h"
 
 #include "KX_SG_NodeRelationships.h"
 
@@ -74,7 +77,7 @@
 #include "KX_IPhysicsController.h"
 #include "KX_BlenderSceneConverter.h"
 
-#include "BL_SkinDeformer.h"
+#include "BL_ShapeDeformer.h"
 #include "BL_DeformableGameObject.h"
 
 // to get USE_BULLET!
@@ -143,6 +146,7 @@ KX_Scene::KX_Scene(class SCA_IInputDevice* keyboarddevice,
 	
 	SCA_AlwaysEventManager* alwaysmgr = new SCA_AlwaysEventManager(m_logicmgr);
 	SCA_PropertyEventManager* propmgr = new SCA_PropertyEventManager(m_logicmgr);
+	SCA_ActuatorEventManager* actmgr = new SCA_ActuatorEventManager(m_logicmgr);
 	SCA_RandomEventManager* rndmgr = new SCA_RandomEventManager(m_logicmgr);
 	KX_RayEventManager* raymgr = new KX_RayEventManager(m_logicmgr);
 
@@ -152,6 +156,7 @@ KX_Scene::KX_Scene(class SCA_IInputDevice* keyboarddevice,
 
 	m_logicmgr->RegisterEventManager(alwaysmgr);
 	m_logicmgr->RegisterEventManager(propmgr);
+	m_logicmgr->RegisterEventManager(actmgr);
 	m_logicmgr->RegisterEventManager(m_keyboardmgr);
 	m_logicmgr->RegisterEventManager(m_mousemgr);
 	m_logicmgr->RegisterEventManager(m_timemgr);
@@ -426,6 +431,11 @@ void KX_Scene::RemoveNodeDestructObject(class SG_IObject* node,class CValue* gam
 
 KX_GameObject* KX_Scene::AddNodeReplicaObject(class SG_IObject* node, class CValue* gameobj)
 {
+	// for group duplication, limit the duplication of the hierarchy to the
+	// objects that are part of the group. 
+	if (!IsObjectInGroup(gameobj))
+		return NULL;
+	
 	KX_GameObject* orgobj = (KX_GameObject*)gameobj;
 	KX_GameObject* newobj = (KX_GameObject*)orgobj->GetReplica();
 	m_map_gameobject_to_replica.insert(orgobj, newobj);
@@ -503,6 +513,11 @@ KX_GameObject* KX_Scene::AddNodeReplicaObject(class SG_IObject* node, class CVal
 // hierarchy that's because first ALL bricks must exist in the new
 // replica of the hierarchy in order to make cross-links work properly
 // !
+// It is VERY important that the order of sensors and actuators in
+// the replicated object is preserved: it is is used to reconnect the logic.
+// This method is more robust then using the bricks name in case of complex 
+// group replication. The replication of logic bricks is done in 
+// SCA_IObject::ReParentLogic(), make sure it preserves the order of the bricks.
 void KX_Scene::ReplicateLogic(KX_GameObject* newobj)
 {
 	// also relink the controller to sensors/actuators
@@ -525,37 +540,38 @@ void KX_Scene::ReplicateLogic(KX_GameObject* newobj)
 		for (vector<SCA_ISensor*>::iterator its = linkedsensors.begin();!(its==linkedsensors.end());its++)
 		{
 			SCA_ISensor* oldsensor = (*its);
-			STR_String name = oldsensor->GetName();
-			//find this name in the list
-			SCA_ISensor* newsensor = newobj->FindSensor(name);
+			SCA_IObject* oldsensorobj = oldsensor->GetParent();
+			SCA_IObject* newsensorobj = NULL;
 		
-			if (newsensor)
+			// the original owner of the sensor has been replicated?
+			void **h_obj = m_map_gameobject_to_replica[oldsensorobj];
+			if (h_obj)
+				newsensorobj = (SCA_IObject*)(*h_obj);
+			if (!newsensorobj)
 			{
-				// relink this newsensor to the controller
-				m_logicmgr->RegisterToSensor(cont,newsensor);
+				// no, then the sensor points outside the hierachy, keep it the same
+				if (m_objectlist->SearchValue(oldsensorobj))
+					// only replicate links that points to active objects
+					m_logicmgr->RegisterToSensor(cont,oldsensor);
 			}
 			else
 			{
-				// it can be linked somewhere in the hierarchy or...
-				for (vector<KX_GameObject*>::iterator git = m_logicHierarchicalGameObjects.begin();
-				!(git==m_logicHierarchicalGameObjects.end());++git)
-				{
-					newsensor = (*git)->FindSensor(name);
-					if (newsensor)
-						break;
-				} 
+				// yes, then the new sensor has the same position
+				SCA_SensorList& sensorlist = oldsensorobj->GetSensors();
+				SCA_SensorList::iterator sit;
+				SCA_ISensor* newsensor = NULL;
+				int sensorpos;
 
-				if (newsensor)
+				for (sensorpos=0, sit=sensorlist.begin(); sit!=sensorlist.end(); sit++, sensorpos++)
 				{
-					// relink this newsensor to the controller somewhere else within this
-					// hierarchy
-					m_logicmgr->RegisterToSensor(cont,newsensor);
-				}
-				else
-				{
-					// must be an external sensor, so...
-					m_logicmgr->RegisterToSensor(cont,oldsensor);
+					if ((*sit) == oldsensor) 
+					{
+						newsensor = newsensorobj->GetSensors().at(sensorpos);
+						break;
+					}
 				}
+				assert(newsensor != NULL);
+				m_logicmgr->RegisterToSensor(cont,newsensor);
 			}
 		}
 		
@@ -563,43 +579,185 @@ void KX_Scene::ReplicateLogic(KX_GameObject* newobj)
 		for (vector<SCA_IActuator*>::iterator ita = linkedactuators.begin();!(ita==linkedactuators.end());ita++)
 		{
 			SCA_IActuator* oldactuator = (*ita);
-			STR_String name = oldactuator->GetName();
-			//find this name in the list
-			SCA_IActuator* newactuator = newobj->FindActuator(name);
-			if (newactuator)
+			SCA_IObject* oldactuatorobj = oldactuator->GetParent();
+			SCA_IObject* newactuatorobj = NULL;
+
+			// the original owner of the sensor has been replicated?
+			void **h_obj = m_map_gameobject_to_replica[oldactuatorobj];
+			if (h_obj)
+				newactuatorobj = (SCA_IObject*)(*h_obj);
+
+			if (!newactuatorobj)
 			{
-				// relink this newsensor to the controller
-				m_logicmgr->RegisterToActuator(cont,newactuator);
-				newactuator->SetUeberExecutePriority(m_ueberExecutionPriority);
+				// no, then the sensor points outside the hierachy, keep it the same
+				if (m_objectlist->SearchValue(oldactuatorobj))
+					// only replicate links that points to active objects
+					m_logicmgr->RegisterToActuator(cont,oldactuator);
 			}
 			else
 			{
-				// it can be linked somewhere in the hierarchy or...
-				for (vector<KX_GameObject*>::iterator git = m_logicHierarchicalGameObjects.begin();
-				!(git==m_logicHierarchicalGameObjects.end());++git)
-				{
-					newactuator= (*git)->FindActuator(name);
-					if (newactuator)
-						break;
-				} 
+				// yes, then the new sensor has the same position
+				SCA_ActuatorList& actuatorlist = oldactuatorobj->GetActuators();
+				SCA_ActuatorList::iterator ait;
+				SCA_IActuator* newactuator = NULL;
+				int actuatorpos;
 
-				if (newactuator)
+				for (actuatorpos=0, ait=actuatorlist.begin(); ait!=actuatorlist.end(); ait++, actuatorpos++)
 				{
-					// relink this actuator to the controller somewhere else within this
-					// hierarchy
-					m_logicmgr->RegisterToActuator(cont,newactuator);
-					newactuator->SetUeberExecutePriority(m_ueberExecutionPriority);
-				}
-				else
-				{
-					// must be an external actuator, so...
-					m_logicmgr->RegisterToActuator(cont,oldactuator);
+					if ((*ait) == oldactuator) 
+					{
+						newactuator = newactuatorobj->GetActuators().at(actuatorpos);
+						break;
+					}
 				}
+				assert(newactuator != NULL);
+				m_logicmgr->RegisterToActuator(cont,newactuator);
+				newactuator->SetUeberExecutePriority(m_ueberExecutionPriority);
 			}
 		}
 	}
+	// ready to set initial state
+	newobj->ResetState();
 }
 
+void KX_Scene::DupliGroupRecurse(CValue* obj, int level)
+{
+	KX_GameObject* groupobj = (KX_GameObject*) obj;
+	KX_GameObject* replica;
+	KX_GameObject* gameobj;
+	Object* blgroupobj = groupobj->GetBlenderObject();
+	Group* group;
+	GroupObject *go;
+	vector<KX_GameObject*> duplilist;
+
+	if (!groupobj->IsDupliGroup() ||
+		level>MAX_DUPLI_RECUR)
+		return;
+
+	// we will add one group at a time
+	m_logicHierarchicalGameObjects.clear();
+	m_map_gameobject_to_replica.clear();
+	m_ueberExecutionPriority++;
+	// for groups will do something special: 
+	// we will force the creation of objects to those in the group only
+	// Again, this is match what Blender is doing (it doesn't care of parent relationship)
+	m_groupGameObjects.clear();
+
+	group = blgroupobj->dup_group;
+	for(go=(GroupObject*)group->gobject.first; go; go=(GroupObject*)go->next) 
+	{
+		Object* blenderobj = go->ob;
+		if (blgroupobj == blenderobj)
+			// this check is also in group_duplilist()
+			continue;
+		gameobj = m_sceneConverter->FindGameObject(blenderobj);
+		if (gameobj == NULL) 
+		{
+			// this object has not been converted!!!
+			// Should not happen as dupli group are created automatically 
+			continue;
+		}
+		if (blenderobj->lay & group->layer==0)
+		{
+			// object is not visible in the 3D view, will not be instantiated
+			continue;
+		}
+		m_groupGameObjects.insert(gameobj);
+	}
+
+	set<CValue*>::iterator oit;
+	for (oit=m_groupGameObjects.begin(); oit != m_groupGameObjects.end(); oit++)
+	{
+		gameobj = (KX_GameObject*)(*oit);
+		if (gameobj->GetParent() != NULL)
+		{
+			// this object is not a top parent. Either it is the child of another
+			// object in the group and it will be added automatically when the parent
+			// is added. Or it is the child of an object outside the group and the group
+			// is inconsistent, skip it anyway
+			continue;
+		}
+		replica = (KX_GameObject*) AddNodeReplicaObject(NULL,gameobj);
+		// add to 'rootparent' list (this is the list of top hierarchy objects, updated each frame)
+		m_parentlist->Add(replica->AddRef());
+
+		// recurse replication into children nodes
+		NodeList& children = gameobj->GetSGNode()->GetSGChildren();
+
+		replica->GetSGNode()->ClearSGChildren();
+		for (NodeList::iterator childit = children.begin();!(childit==children.end());++childit)
+		{
+			SG_Node* orgnode = (*childit);
+			SG_Node* childreplicanode = orgnode->GetSGReplica();
+			if (childreplicanode)
+				replica->GetSGNode()->AddChild(childreplicanode);
+		}
+		// don't replicate logic now: we assume that the objects in the group can have
+		// logic relationship, even outside parent relationship
+		// In order to match 3D view, the position of groupobj is used as a 
+		// transformation matrix instead of the new position. This means that 
+		// the group reference point is 0,0,0
+
+		// get the rootnode's scale
+		MT_Vector3 newscale = groupobj->NodeGetWorldScaling();
+		// set the replica's relative scale with the rootnode's scale
+		replica->NodeSetRelativeScale(newscale);
+
+		MT_Matrix3x3 newori = groupobj->NodeGetWorldOrientation() * gameobj->NodeGetWorldOrientation();
+		replica->NodeSetLocalOrientation(newori);
+
+		MT_Point3 newpos = groupobj->NodeGetWorldPosition() + 
+			newscale*(groupobj->NodeGetWorldOrientation() * gameobj->NodeGetWorldPosition());
+		replica->NodeSetLocalPosition(newpos);
+
+		if (replica->GetPhysicsController())
+		{
+			replica->GetPhysicsController()->setPosition(newpos);
+			replica->GetPhysicsController()->setOrientation(newori.getRotation());
+			replica->GetPhysicsController()->setScaling(newscale);
+		}
+
+		replica->GetSGNode()->UpdateWorldData(0);
+		replica->GetSGNode()->SetBBox(gameobj->GetSGNode()->BBox());
+		replica->GetSGNode()->SetRadius(gameobj->GetSGNode()->Radius());
+		// done with replica
+		replica->Release();
+	}
+
+	//	relink any pointers as necessary, sort of a temporary solution
+	vector<KX_GameObject*>::iterator git;
+	for (git = m_logicHierarchicalGameObjects.begin();!(git==m_logicHierarchicalGameObjects.end());++git)
+	{
+		(*git)->Relink(&m_map_gameobject_to_replica);
+		// add the object in the layer of the parent
+		(*git)->SetLayer(groupobj->GetLayer());
+	}
+
+	// now replicate logic
+	for (git = m_logicHierarchicalGameObjects.begin();!(git==m_logicHierarchicalGameObjects.end());++git)
+	{
+		(*git)->ReParentLogic();
+	}
+	
+	// replicate crosslinks etc. between logic bricks
+	for (git = m_logicHierarchicalGameObjects.begin();!(git==m_logicHierarchicalGameObjects.end());++git)
+	{
+		ReplicateLogic((*git));
+	}
+	
+	// now look if object in the hierarchy have dupli group and recurse
+	for (git = m_logicHierarchicalGameObjects.begin();!(git==m_logicHierarchicalGameObjects.end());++git)
+	{
+		if ((*git) != groupobj && (*git)->IsDupliGroup())
+			// can't instantiate group immediately as it destroys m_logicHierarchicalGameObjects
+			duplilist.push_back((*git));
+	}
+
+	for (git = duplilist.begin(); !(git == duplilist.end()); ++git)
+	{
+		DupliGroupRecurse((*git), level+1);
+	}
+}
 
 
 SCA_IObject* KX_Scene::AddReplicaObject(class CValue* originalobject,
@@ -609,6 +767,7 @@ SCA_IObject* KX_Scene::AddReplicaObject(class CValue* originalobject,
 
 	m_logicHierarchicalGameObjects.clear();
 	m_map_gameobject_to_replica.clear();
+	m_groupGameObjects.clear();
 
 	// todo: place a timebomb in the object, for temporarily objects :)
 	// lifespan of zero means 'this object lives forever'
@@ -642,7 +801,8 @@ SCA_IObject* KX_Scene::AddReplicaObject(class CValue* originalobject,
 	{
 		SG_Node* orgnode = (*childit);
 		SG_Node* childreplicanode = orgnode->GetSGReplica();
-		replica->GetSGNode()->AddChild(childreplicanode);
+		if (childreplicanode)
+			replica->GetSGNode()->AddChild(childreplicanode);
 	}
 
 	//	relink any pointers as necessary, sort of a temporary solution
@@ -754,8 +914,6 @@ int KX_Scene::NewRemoveObject(class CValue* gameobj)
 	for (SCA_ControllerList::iterator itc = controllers.begin();
 		 !(itc==controllers.end());itc++)
 	{
-		(*itc)->UnlinkAllSensors();
-		(*itc)->UnlinkAllActuators();
 		m_logicmgr->RemoveController(*itc);
 	}
 
@@ -809,95 +967,105 @@ int KX_Scene::NewRemoveObject(class CValue* gameobj)
 
 
 
-void KX_Scene::ReplaceMesh(class CValue* gameobj,void* meshobj)
+void KX_Scene::ReplaceMesh(class CValue* obj,void* meshobj)
 {
-	KX_GameObject* newobj = static_cast<KX_GameObject*>(gameobj);
+	KX_GameObject* gameobj = static_cast<KX_GameObject*>(obj);
 	RAS_MeshObject* mesh = static_cast<RAS_MeshObject*>(meshobj);
 
-	const STR_String origMeshName = newobj->GetMesh(0)->GetName();
-
-	if( !newobj || !mesh ) 
+	if(!gameobj || !mesh)
 	{
 		std::cout << "warning: invalid object, mesh will not be replaced" << std::endl;
 		return;
 	}
 
-	newobj->RemoveMeshes();
-	newobj->AddMesh(mesh);
-
-	bool isDeformer = (newobj->m_isDeformable && mesh->m_class == 1);
-	if(isDeformer)
-	{
-		/* FindBlendObjByGameObj() can return 0... 
-			In the case of 0 here,
-			the replicated object that is calling this function
-			is some how not in the map. (which is strange because it's added)
-			So we will search the map by the first mesh name
-			to try to locate it there. If its still not found 
-			spit some message rather than crash 
-		*/
-		Object* blendobj = static_cast<struct Object*>(m_logicmgr->FindBlendObjByGameObj(newobj));
-		Object* oldblendobj = static_cast<struct Object*>(m_logicmgr->FindBlendObjByGameMeshName(mesh->GetName()));
+	gameobj->RemoveMeshes();
+	gameobj->AddMesh(mesh);
 	
-		bool parSkin = blendobj && blendobj->parent && blendobj->parent->type == OB_ARMATURE && blendobj->partype==PARSKEL;
-		bool releaseParent = true;
-		KX_GameObject* parentobj = newobj->GetParent();
-
-
-		// lookup by mesh name if blendobj is 0 
-		if( !blendobj &&  parentobj )
+	if (gameobj->m_isDeformable)
+	{
+		BL_DeformableGameObject* newobj = static_cast<BL_DeformableGameObject*>( gameobj );
+		
+		if (newobj->m_pDeformer)
 		{
-			blendobj = static_cast<struct Object*>(m_logicmgr->FindBlendObjByGameMeshName(origMeshName));
-
-			// replace the mesh on the parent armature 
-			if( blendobj )
-				parSkin = parentobj->GetGameObjectType() == SCA_IObject::OBJ_ARMATURE;
-
-			// can't do it 
-			else 
-				std::cout << "warning: child object for " << parentobj->GetName().ReadPtr() 
-					<< " not found, and can't create!" << std::endl;
+			delete newobj->m_pDeformer;
+			newobj->m_pDeformer = NULL;
 		}
 
-		if( blendobj && oldblendobj )
+		if (mesh->m_class == 1) 
 		{
-			isDeformer = (static_cast<Mesh*>(blendobj->data)->dvert != 0);
-			BL_DeformableGameObject* deformIter =0;
+			// we must create a new deformer but which one?
+			KX_GameObject* parentobj = newobj->GetParent();
+			// this always return the original game object (also for replicate)
+			Object* blendobj = newobj->GetBlenderObject();
+			// object that owns the new mesh
+			Object* oldblendobj = static_cast<struct Object*>(m_logicmgr->FindBlendObjByGameMeshName(mesh->GetName()));
+			Mesh* blendmesh = mesh->GetMesh();
 
-			// armature parent
-			if( parSkin && isDeformer )
+			bool bHasShapeKey = blendmesh->key != NULL && blendmesh->key->type==KEY_RELATIVE;
+			bool bHasDvert = blendmesh->dvert != NULL;
+			bool bHasArmature = 
+				parentobj &&								// current parent is armature
+				parentobj->GetGameObjectType() == SCA_IObject::OBJ_ARMATURE &&
+				oldblendobj &&								// needed for mesh deform
+				blendobj->parent &&							// original object had armature (not sure this test is needed)
+				blendobj->parent->type == OB_ARMATURE && 
+				blendobj->partype==PARSKEL && 
+				blendmesh->dvert!=NULL;						// mesh has vertex group
+			bool releaseParent = true;
+
+			if (bHasShapeKey)
+			{
+				BL_ShapeDeformer* shapeDeformer;
+				if (bHasArmature) 
+				{
+					shapeDeformer = new BL_ShapeDeformer(
+						newobj,
+						oldblendobj, blendobj,
+						static_cast<BL_SkinMeshObject*>(mesh),
+						true,
+						static_cast<BL_ArmatureObject*>( parentobj )
+					);
+					releaseParent= false;
+					shapeDeformer->LoadShapeDrivers(blendobj->parent);
+				}
+				else
+				{
+					shapeDeformer = new BL_ShapeDeformer(
+						newobj,
+						oldblendobj, blendobj,
+						static_cast<BL_SkinMeshObject*>(mesh),
+						false,
+						NULL
+					);
+				}
+				newobj->m_pDeformer = shapeDeformer;
+			}
+			else if (bHasArmature) 
 			{
-				deformIter = static_cast<BL_DeformableGameObject*>( newobj );
-				delete deformIter->m_pDeformer;
-
 				BL_SkinDeformer* skinDeformer = new BL_SkinDeformer(
+					newobj,
 					oldblendobj, blendobj,
 					static_cast<BL_SkinMeshObject*>(mesh),
 					true,
 					static_cast<BL_ArmatureObject*>( parentobj )
 				);
 				releaseParent= false;
-				deformIter->m_pDeformer = skinDeformer;
+				newobj->m_pDeformer = skinDeformer;
 			}
-
-			// normal deformer
-			if( !parSkin && isDeformer)
+			else if (bHasDvert)
 			{
-				deformIter = static_cast<BL_DeformableGameObject*>( newobj );
-				delete deformIter->m_pDeformer;
-
 				BL_MeshDeformer* meshdeformer = new BL_MeshDeformer(
-					oldblendobj, static_cast<BL_SkinMeshObject*>(mesh)
+					newobj, oldblendobj, static_cast<BL_SkinMeshObject*>(mesh)
 				);
-
-				deformIter->m_pDeformer = meshdeformer;
+				newobj->m_pDeformer = meshdeformer;
 			}
+
+			// release parent reference if its not being used 
+			if( releaseParent && parentobj)
+				parentobj->Release();
 		}
-		// release parent reference if its not being used 
-		if( releaseParent && parentobj)
-			parentobj->Release();
 	}
-	newobj->Bucketize();
+	gameobj->Bucketize();
 }
 
 
@@ -992,12 +1160,13 @@ void KX_Scene::UpdateMeshTransformations()
 	}
 }
 
-void KX_Scene::MarkVisible(SG_Tree *node, RAS_IRasterizer* rasty, KX_Camera* cam)
+void KX_Scene::MarkVisible(SG_Tree *node, RAS_IRasterizer* rasty, KX_Camera* cam, int layer)
 {
 	int intersect = KX_Camera::INTERSECT;
 	KX_GameObject *gameobj = node->Client()?(KX_GameObject*) node->Client()->GetSGClientObject():NULL;
-	bool dotest = (gameobj && gameobj->GetVisible()) || node->Left() || node->Right();
-	
+	bool visible = (gameobj && gameobj->GetVisible() && (!layer || (gameobj->GetLayer() & layer)));
+	bool dotest = visible || node->Left() || node->Right();
+
 	/* If the camera is inside the box, assume intersect. */
 	if (dotest && !node->inside( cam->NodeGetWorldPosition()))
 	{
@@ -1021,19 +1190,19 @@ void KX_Scene::MarkVisible(SG_Tree *node, RAS_IRasterizer* rasty, KX_Camera* cam
 			break;
 		case KX_Camera::INTERSECT:
 			if (gameobj)
-				MarkVisible(rasty, gameobj,cam);
+				MarkVisible(rasty, gameobj, cam, layer);
 			if (node->Left())
-				MarkVisible(node->Left(), rasty,cam);
+				MarkVisible(node->Left(), rasty, cam, layer);
 			if (node->Right())
-				MarkVisible(node->Right(), rasty,cam);
+				MarkVisible(node->Right(), rasty, cam, layer);
 			break;
 		case KX_Camera::INSIDE:
-			MarkSubTreeVisible(node, rasty, true,cam);
+			MarkSubTreeVisible(node, rasty, true, cam, layer);
 			break;
 	}
 }
 
-void KX_Scene::MarkSubTreeVisible(SG_Tree *node, RAS_IRasterizer* rasty, bool visible,KX_Camera* cam)
+void KX_Scene::MarkSubTreeVisible(SG_Tree *node, RAS_IRasterizer* rasty, bool visible, KX_Camera* cam, int layer)
 {
 	if (node->Client())
 	{
@@ -1056,16 +1225,23 @@ void KX_Scene::MarkSubTreeVisible(SG_Tree *node, RAS_IRasterizer* rasty, bool vi
 		}
 	}
 	if (node->Left())
-		MarkSubTreeVisible(node->Left(), rasty, visible,cam);
+		MarkSubTreeVisible(node->Left(), rasty, visible, cam, layer);
 	if (node->Right())
-		MarkSubTreeVisible(node->Right(), rasty, visible,cam);
+		MarkSubTreeVisible(node->Right(), rasty, visible, cam, layer);
 }
 
-void KX_Scene::MarkVisible(RAS_IRasterizer* rasty, KX_GameObject* gameobj,KX_Camera*  cam)
+void KX_Scene::MarkVisible(RAS_IRasterizer* rasty, KX_GameObject* gameobj,KX_Camera*  cam,int layer)
 {
 	// User (Python/Actuator) has forced object invisible...
 	if (!gameobj->GetVisible())
 		return;
+	
+	// Shadow lamp layers
+	if(layer && !(gameobj->GetLayer() & layer)) {
+		gameobj->MarkVisible(false);
+		return;
+	}
+
 	// If Frustum culling is off, the object is always visible.
 	bool vis = !cam->GetFrustumCulling();
 	
@@ -1115,20 +1291,20 @@ void KX_Scene::MarkVisible(RAS_IRasterizer* rasty, KX_GameObject* gameobj,KX_Cam
 	}
 }
 
-void KX_Scene::CalculateVisibleMeshes(RAS_IRasterizer* rasty,KX_Camera* cam)
+void KX_Scene::CalculateVisibleMeshes(RAS_IRasterizer* rasty,KX_Camera* cam, int layer)
 {
 // FIXME: When tree is operational
 #if 1
 	// do this incrementally in the future
 	for (int i = 0; i < m_objectlist->GetCount(); i++)
 	{
-		MarkVisible(rasty, static_cast<KX_GameObject*>(m_objectlist->GetValue(i)), cam);
+		MarkVisible(rasty, static_cast<KX_GameObject*>(m_objectlist->GetValue(i)), cam, layer);
 	}
 #else
 	if (cam->GetFrustumCulling())
-		MarkVisible(m_objecttree, rasty, cam);
+		MarkVisible(m_objecttree, rasty, cam, layer);
 	else
-		MarkSubTreeVisible(m_objecttree, rasty, true, cam);
+		MarkSubTreeVisible(m_objecttree, rasty, true, cam, layer);
 #endif
 }
 
diff --git a/source/gameengine/Ketsji/KX_Scene.h b/source/gameengine/Ketsji/KX_Scene.h
index 733df2f69a1..80a2abe287a 100644
--- a/source/gameengine/Ketsji/KX_Scene.h
+++ b/source/gameengine/Ketsji/KX_Scene.h
@@ -216,6 +216,16 @@ protected:
 	 */
 	std::vector<KX_GameObject*>	m_logicHierarchicalGameObjects;
 	
+	/**
+	 * This temporary variable will contain the list of 
+	 * object that can be added during group instantiation.
+	 * objects outside this list will not be added (can 
+	 * happen with children that are outside the group).
+	 * Used in AddReplicaObject. If the list is empty, it
+	 * means don't care.
+	 */
+	std::set<CValue*>	m_groupGameObjects;
+	
 	/** 
 	 * Pointer to system variable passed in in constructor
 	 * only used in constructor so we do not need to keep it
@@ -260,9 +270,9 @@ protected:
 	/**
 	 * Visibility testing functions.
 	 */
-	void MarkVisible(SG_Tree *node, RAS_IRasterizer* rasty, KX_Camera*cam);
-	void MarkSubTreeVisible(SG_Tree *node, RAS_IRasterizer* rasty, bool visible, KX_Camera*cam);
-	void MarkVisible(RAS_IRasterizer* rasty, KX_GameObject* gameobj, KX_Camera*cam);
+	void MarkVisible(SG_Tree *node, RAS_IRasterizer* rasty, KX_Camera*cam,int layer=0);
+	void MarkSubTreeVisible(SG_Tree *node, RAS_IRasterizer* rasty, bool visible, KX_Camera*cam,int layer=0);
+	void MarkVisible(RAS_IRasterizer* rasty, KX_GameObject* gameobj, KX_Camera*cam, int layer=0);
 
 	double				m_suspendedtime;
 	double				m_suspendeddelta;
@@ -291,6 +301,12 @@ public:
 	 * Update all transforms according to the scenegraph.
 	 */
 	void UpdateParents(double curtime);
+	void DupliGroupRecurse(CValue* gameobj, int level);
+	bool IsObjectInGroup(CValue* gameobj)
+	{ 
+		return (m_groupGameObjects.empty() || 
+				m_groupGameObjects.find(gameobj) != m_groupGameObjects.end());
+	}
 	SCA_IObject* AddReplicaObject(CValue* gameobj,
 								  CValue* locationobj,
 								  int lifespan=0);
@@ -483,7 +499,7 @@ public:
 	void SetNetworkScene(NG_NetworkScene *newScene);
 	void SetWorldInfo(class KX_WorldInfo* wi);
 	KX_WorldInfo* GetWorldInfo();
-	void CalculateVisibleMeshes(RAS_IRasterizer* rasty, KX_Camera *cam);
+	void CalculateVisibleMeshes(RAS_IRasterizer* rasty, KX_Camera *cam, int layer=0);
 	void UpdateMeshTransformations();
 	KX_Camera* GetpCamera();
 	SND_Scene* GetSoundScene();
diff --git a/source/gameengine/Ketsji/KX_SoundActuator.cpp b/source/gameengine/Ketsji/KX_SoundActuator.cpp
index 949156571a7..34a3baec093 100644
--- a/source/gameengine/Ketsji/KX_SoundActuator.cpp
+++ b/source/gameengine/Ketsji/KX_SoundActuator.cpp
@@ -291,7 +291,8 @@ PyObject* KX_SoundActuator::PyGetFilename(PyObject* self, PyObject* args, PyObje
 	char* name = objectname.Ptr();
 	
 	if (!name) {
-		Py_Return;					/* internal error */
+		PyErr_SetString(PyExc_RuntimeError, "Unable to get sound filename");
+		return NULL;
 	} else
 		return PyString_FromString(name);
 }
diff --git a/source/gameengine/Ketsji/KX_StateActuator.cpp b/source/gameengine/Ketsji/KX_StateActuator.cpp
new file mode 100644
index 00000000000..95a79f0c480
--- /dev/null
+++ b/source/gameengine/Ketsji/KX_StateActuator.cpp
@@ -0,0 +1,207 @@
+/*
+ * $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 *****
+ * Actuator to toggle visibility/invisibility of objects
+ */
+
+#include "KX_StateActuator.h"
+#include "KX_GameObject.h"
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+KX_StateActuator::KX_StateActuator(
+	SCA_IObject* gameobj,
+	int operation,
+	unsigned int mask,
+	PyTypeObject* T
+	) 
+	: SCA_IActuator(gameobj,T),
+	  m_operation(operation),
+	  m_mask(mask)
+{
+	// intentionally empty
+}
+
+KX_StateActuator::~KX_StateActuator(
+	void
+	)
+{
+	// intentionally empty
+}
+
+CValue*
+KX_StateActuator::GetReplica(
+	void
+	)
+{
+	KX_StateActuator* replica = new KX_StateActuator(*this);
+	replica->ProcessReplica();
+	// this will copy properties and so on...
+	CValue::AddDataToReplica(replica);
+	return replica;
+}
+
+bool
+KX_StateActuator::Update()
+{
+	bool bNegativeEvent = IsNegativeEvent();
+	unsigned int objMask;
+	
+	RemoveAllEvents();
+	if (bNegativeEvent) return false;
+
+	KX_GameObject *obj = (KX_GameObject*) GetParent();
+	
+	objMask = obj->GetState();
+	switch (m_operation) 
+	{
+	case OP_CPY:
+		objMask = m_mask;
+		break;
+	case OP_SET:
+		objMask |= m_mask;
+		break;
+	case OP_CLR:
+		objMask &= ~m_mask;
+		break;
+	case OP_NEG:
+		objMask ^= m_mask;
+		break;
+	default:
+		// unsupported operation, no  nothing
+		return false;
+	}
+	obj->SetState(objMask);
+	return false;
+}
+
+/* ------------------------------------------------------------------------- */
+/* Python functions                                                          */
+/* ------------------------------------------------------------------------- */
+
+
+
+/* Integration hooks ------------------------------------------------------- */
+PyTypeObject 
+KX_StateActuator::Type = {
+	PyObject_HEAD_INIT(&PyType_Type)
+	0,
+	"KX_StateActuator",
+	sizeof(KX_StateActuator),
+	0,
+	PyDestructor,
+	0,
+	__getattr,
+	__setattr,
+	0, //&MyPyCompare,
+	__repr,
+	0, //&cvalue_as_number,
+	0,
+	0,
+	0,
+	0
+};
+
+PyParentObject 
+KX_StateActuator::Parents[] = {
+	&KX_StateActuator::Type,
+	&SCA_IActuator::Type,
+	&SCA_ILogicBrick::Type,
+	&CValue::Type,
+	NULL
+};
+
+PyMethodDef 
+KX_StateActuator::Methods[] = {
+	{"setOperation", (PyCFunction) KX_StateActuator::sPySetOperation, 
+	 METH_VARARGS, SetOperation_doc},
+	{"setMask", (PyCFunction) KX_StateActuator::sPySetMask, 
+	 METH_VARARGS, SetMask_doc},
+	{NULL,NULL} //Sentinel
+};
+
+PyObject* 
+KX_StateActuator::_getattr(
+	const STR_String& attr
+	) 
+{
+	_getattr_up(SCA_IActuator);
+};
+
+
+
+/* set operation ---------------------------------------------------------- */
+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* self, 
+				    PyObject* args, 
+				    PyObject* kwds) {
+	int oper;
+
+	if(!PyArg_ParseTuple(args, "i", &oper)) {
+		return NULL;
+	}
+
+	m_operation = oper;
+
+	Py_Return;
+}
+
+/* set mask ---------------------------------------------------------- */
+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* self, 
+				    PyObject* args, 
+				    PyObject* kwds) {
+	int mask;
+
+	if(!PyArg_ParseTuple(args, "i", &mask)) {
+		return NULL;
+	}
+
+	m_mask = mask;
+
+	Py_Return;
+}
+
+
diff --git a/source/gameengine/Ketsji/KX_StateActuator.h b/source/gameengine/Ketsji/KX_StateActuator.h
new file mode 100644
index 00000000000..8698e51b2c1
--- /dev/null
+++ b/source/gameengine/Ketsji/KX_StateActuator.h
@@ -0,0 +1,83 @@
+/*
+ * $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 *****
+ * Actuator to toggle visibility/invisibility of objects
+ */
+
+#ifndef __KX_STATEACTUATOR
+#define __KX_STATEACTUATOR
+
+#include "SCA_IActuator.h"
+
+class KX_StateActuator : public SCA_IActuator
+{
+	Py_Header;
+
+	/** Make visible? */
+	enum {
+		OP_CPY = 0,
+		OP_SET,
+		OP_CLR,
+		OP_NEG
+	};
+	int				m_operation;
+	unsigned int	m_mask;
+
+ public:
+	
+	KX_StateActuator(
+		SCA_IObject* gameobj,
+		int operation,
+		unsigned int mask,
+		PyTypeObject* T=&Type
+		);
+
+	virtual
+		~KX_StateActuator(
+			void
+			);
+
+	virtual CValue*
+		GetReplica(
+			void
+			);
+
+	virtual bool
+		Update();
+
+	/* --------------------------------------------------------------------- */
+	/* Python interface ---------------------------------------------------- */
+	/* --------------------------------------------------------------------- */
+
+	virtual PyObject* _getattr(const STR_String& attr);
+	//KX_PYMETHOD_DOC
+	KX_PYMETHOD_DOC(KX_StateActuator,SetOperation);
+	KX_PYMETHOD_DOC(KX_StateActuator,SetMask);
+};
+
+#endif
+
diff --git a/source/gameengine/Ketsji/KX_SumoPhysicsController.cpp b/source/gameengine/Ketsji/KX_SumoPhysicsController.cpp
index 6ea5461dbaa..ffb078b346e 100644
--- a/source/gameengine/Ketsji/KX_SumoPhysicsController.cpp
+++ b/source/gameengine/Ketsji/KX_SumoPhysicsController.cpp
@@ -101,7 +101,7 @@ void	KX_SumoPhysicsController::SetSumoTransform(bool nondynaonly)
 
 }
 
-void	KX_SumoPhysicsController::SuspendDynamics()
+void	KX_SumoPhysicsController::SuspendDynamics(bool)
 {
 	SumoPhysicsController::SuspendDynamics();
 }
diff --git a/source/gameengine/Ketsji/KX_SumoPhysicsController.h b/source/gameengine/Ketsji/KX_SumoPhysicsController.h
index 868465c8f10..33666036c0d 100644
--- a/source/gameengine/Ketsji/KX_SumoPhysicsController.h
+++ b/source/gameengine/Ketsji/KX_SumoPhysicsController.h
@@ -68,13 +68,15 @@ public:
 	void	ApplyTorque(const MT_Vector3& torque,bool local);
 	void	ApplyForce(const MT_Vector3& force,bool local);
 	MT_Vector3 GetLinearVelocity();
+	MT_Vector3 GetAngularVelocity()		// to keep compiler happy
+		{ return MT_Vector3(0.0,0.0,0.0); }
 	MT_Vector3 GetVelocity(const MT_Point3& pos);
 	void	SetAngularVelocity(const MT_Vector3& ang_vel,bool local);
 	void	SetLinearVelocity(const MT_Vector3& lin_vel,bool local);
 	void	resolveCombinedVelocities(float linvelX,float linvelY,float linvelZ,float angVelX,float angVelY,float angVelZ);
 
 
-	void	SuspendDynamics();
+	void	SuspendDynamics(bool);
 	void	RestoreDynamics();
 	virtual	void	getOrientation(MT_Quaternion& orn);
 	virtual	void setOrientation(const MT_Quaternion& orn);
diff --git a/source/gameengine/Ketsji/KX_TouchEventManager.cpp b/source/gameengine/Ketsji/KX_TouchEventManager.cpp
index 80ee15a9475..423543eef5c 100644
--- a/source/gameengine/Ketsji/KX_TouchEventManager.cpp
+++ b/source/gameengine/Ketsji/KX_TouchEventManager.cpp
@@ -137,14 +137,18 @@ void KX_TouchEventManager::NextFrame()
 //			KX_GameObject* gameOb1 = ctrl1->getClientInfo();
 
 			KX_ClientObjectInfo *client_info = static_cast<KX_ClientObjectInfo *>(ctrl1->getNewClientInfo());
-	
 			list<SCA_ISensor*>::iterator sit;
-			for ( sit = client_info->m_sensors.begin(); sit != client_info->m_sensors.end(); ++sit)
-				static_cast<KX_TouchSensor*>(*sit)->NewHandleCollision((*cit).first, (*cit).second, NULL);
-		
+			if (client_info) {
+				for ( sit = client_info->m_sensors.begin(); sit != client_info->m_sensors.end(); ++sit) {
+					static_cast<KX_TouchSensor*>(*sit)->NewHandleCollision((*cit).first, (*cit).second, NULL);
+				}
+			}
 			client_info = static_cast<KX_ClientObjectInfo *>((*cit).second->getNewClientInfo());
-			for ( sit = client_info->m_sensors.begin(); sit != client_info->m_sensors.end(); ++sit)
-				static_cast<KX_TouchSensor*>(*sit)->NewHandleCollision((*cit).second, (*cit).first, NULL);
+			if (client_info) {
+				for ( sit = client_info->m_sensors.begin(); sit != client_info->m_sensors.end(); ++sit) {
+					static_cast<KX_TouchSensor*>(*sit)->NewHandleCollision((*cit).second, (*cit).first, NULL);
+				}
+			}
 		}
 			
 		m_newCollisions.clear();
diff --git a/source/gameengine/Ketsji/KX_TouchSensor.cpp b/source/gameengine/Ketsji/KX_TouchSensor.cpp
index 3f185359de0..ce3aa1de2ef 100644
--- a/source/gameengine/Ketsji/KX_TouchSensor.cpp
+++ b/source/gameengine/Ketsji/KX_TouchSensor.cpp
@@ -61,7 +61,9 @@ void KX_TouchSensor::EndFrame() {
 bool KX_TouchSensor::Evaluate(CValue* event)
 {
 	bool result = false;
+	bool reset = m_reset && m_level;
 
+	m_reset = false;
 	if (m_bTriggered != m_bLastTriggered)
 	{
 		m_bLastTriggered = m_bTriggered;
@@ -69,7 +71,9 @@ bool KX_TouchSensor::Evaluate(CValue* event)
 			m_hitObject = NULL;
 		result = true;
 	}
-	
+	if (reset)
+		// force an event
+		result = true;
 	return result;
 }
 
@@ -77,18 +81,14 @@ KX_TouchSensor::KX_TouchSensor(SCA_EventManager* eventmgr,KX_GameObject* gameobj
 :SCA_ISensor(gameobj,eventmgr,T),
 m_touchedpropname(touchedpropname),
 m_bFindMaterial(bFindMaterial),
-m_eventmgr(eventmgr),
+m_eventmgr(eventmgr)
 /*m_sumoObj(sumoObj),*/
-m_bCollision(false),
-m_bTriggered(false),
-m_bLastTriggered(false)
 {
 //	KX_TouchEventManager* touchmgr = (KX_TouchEventManager*) eventmgr;
 //	m_resptable = touchmgr->GetResponseTable();
 	
 //	m_solidHandle = m_sumoObj->getObjectHandle();
 
-	m_hitObject =  NULL;
 	m_colliders = new CListValue();
 	
 	KX_ClientObjectInfo *client_info = gameobj->getClientInfo();
@@ -98,8 +98,17 @@ m_bLastTriggered(false)
 	
 	m_physCtrl = dynamic_cast<PHY_IPhysicsController*>(gameobj->GetPhysicsController());
 	MT_assert( !gameobj->GetPhysicsController() || m_physCtrl );
+	Init();
 }
 
+void KX_TouchSensor::Init()
+{
+	m_bCollision = false;
+	m_bTriggered = false;
+	m_bLastTriggered = (m_invert)?true:false;
+	m_hitObject =  NULL;
+	m_reset = true;
+}
 
 KX_TouchSensor::~KX_TouchSensor()
 {
@@ -111,10 +120,7 @@ CValue* KX_TouchSensor::GetReplica()
 {
 	KX_TouchSensor* replica = new KX_TouchSensor(*this);
 	replica->m_colliders = new CListValue();
-	replica->m_bCollision = false;
-	replica->m_bTriggered= false;
-	replica->m_hitObject = NULL;
-	replica->m_bLastTriggered = false;
+	replica->Init();
 	// this will copy properties and so on...
 	CValue::AddDataToReplica(replica);
 	return replica;
diff --git a/source/gameengine/Ketsji/KX_TouchSensor.h b/source/gameengine/Ketsji/KX_TouchSensor.h
index f594196628a..056440ccd6c 100644
--- a/source/gameengine/Ketsji/KX_TouchSensor.h
+++ b/source/gameengine/Ketsji/KX_TouchSensor.h
@@ -72,6 +72,7 @@ public:
 	virtual CValue* GetReplica();
 	virtual void SynchronizeTransform();
 	virtual bool Evaluate(CValue* event);
+	virtual void Init();
 	virtual void ReParent(SCA_IObject* parent);
 	
 	virtual void RegisterSumo(KX_TouchEventManager* touchman);
diff --git a/source/gameengine/Ketsji/KX_TrackToActuator.cpp b/source/gameengine/Ketsji/KX_TrackToActuator.cpp
index b9792303565..731a610c2eb 100644
--- a/source/gameengine/Ketsji/KX_TrackToActuator.cpp
+++ b/source/gameengine/Ketsji/KX_TrackToActuator.cpp
@@ -224,7 +224,8 @@ bool KX_TrackToActuator::Update(double curtime, bool frame)
 	{
 		KX_GameObject* curobj = (KX_GameObject*) GetParent();
 		MT_Vector3 dir = ((KX_GameObject*)m_object)->NodeGetWorldPosition() - curobj->NodeGetWorldPosition();
-		dir.normalize();
+		if (dir.length2())
+			dir.normalize();
 		MT_Vector3 up(0,0,1);
 		
 		
@@ -250,12 +251,12 @@ bool KX_TrackToActuator::Update(double curtime, bool frame)
 #endif 
 		if (m_allow3D)
 		{
-			up = (up - up.dot(dir) * dir).normalized();
+			up = (up - up.dot(dir) * dir).safe_normalized();
 			
 		}
 		else
 		{
-			dir = (dir - up.dot(dir)*up).normalized();
+			dir = (dir - up.dot(dir)*up).safe_normalized();
 		}
 		
 		MT_Vector3 left;
@@ -266,8 +267,8 @@ bool KX_TrackToActuator::Update(double curtime, bool frame)
 		case 0: // TRACK X
 			{
 				// (1.0 , 0.0 , 0.0 ) x direction is forward, z (0.0 , 0.0 , 1.0 ) up
-				left  = dir.normalized();
-				dir = (left.cross(up)).normalized();
+				left  = dir.safe_normalized();
+				dir = (left.cross(up)).safe_normalized();
 				mat.setValue (
 					left[0], dir[0],up[0], 
 					left[1], dir[1],up[1],
@@ -279,7 +280,7 @@ bool KX_TrackToActuator::Update(double curtime, bool frame)
 		case 1:	// TRACK Y
 			{
 				// (0.0 , 1.0 , 0.0 ) y direction is forward, z (0.0 , 0.0 , 1.0 ) up
-				left  = (dir.cross(up)).normalized();
+				left  = (dir.cross(up)).safe_normalized();
 				mat.setValue (
 					left[0], dir[0],up[0], 
 					left[1], dir[1],up[1],
@@ -291,10 +292,10 @@ bool KX_TrackToActuator::Update(double curtime, bool frame)
 			
 		case 2: // track Z
 			{
-				left = up.normalized();
-				up = dir.normalized();
+				left = up.safe_normalized();
+				up = dir.safe_normalized();
 				dir = left;
-				left  = (dir.cross(up)).normalized();
+				left  = (dir.cross(up)).safe_normalized();
 				mat.setValue (
 					left[0], dir[0],up[0], 
 					left[1], dir[1],up[1],
@@ -306,8 +307,8 @@ bool KX_TrackToActuator::Update(double curtime, bool frame)
 		case 3: // TRACK -X
 			{
 				// (1.0 , 0.0 , 0.0 ) x direction is forward, z (0.0 , 0.0 , 1.0 ) up
-				left  = -dir.normalized();
-				dir = -(left.cross(up)).normalized();
+				left  = -dir.safe_normalized();
+				dir = -(left.cross(up)).safe_normalized();
 				mat.setValue (
 					left[0], dir[0],up[0], 
 					left[1], dir[1],up[1],
@@ -319,7 +320,7 @@ bool KX_TrackToActuator::Update(double curtime, bool frame)
 		case 4: // TRACK -Y
 			{
 				// (0.0 , -1.0 , 0.0 ) -y direction is forward, z (0.0 , 0.0 , 1.0 ) up
-				left  = (-dir.cross(up)).normalized();
+				left  = (-dir.cross(up)).safe_normalized();
 				mat.setValue (
 					left[0], -dir[0],up[0], 
 					left[1], -dir[1],up[1],
@@ -329,10 +330,10 @@ bool KX_TrackToActuator::Update(double curtime, bool frame)
 			}
 		case 5: // track -Z
 			{
-				left = up.normalized();
-				up = -dir.normalized();
+				left = up.safe_normalized();
+				up = -dir.safe_normalized();
 				dir = left;
-				left  = (dir.cross(up)).normalized();
+				left  = (dir.cross(up)).safe_normalized();
 				mat.setValue (
 					left[0], dir[0],up[0], 
 					left[1], dir[1],up[1],
@@ -345,8 +346,8 @@ bool KX_TrackToActuator::Update(double curtime, bool frame)
 		default:
 			{
 				// (1.0 , 0.0 , 0.0 ) -x direction is forward, z (0.0 , 0.0 , 1.0 ) up
-				left  = -dir.normalized();
-				dir = -(left.cross(up)).normalized();
+				left  = -dir.safe_normalized();
+				dir = -(left.cross(up)).safe_normalized();
 				mat.setValue (
 					left[0], dir[0],up[0], 
 					left[1], dir[1],up[1],
diff --git a/source/gameengine/Ketsji/KX_VehicleWrapper.cpp b/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
index fba2ecc223b..7e8160a4d67 100644
--- a/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
+++ b/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
@@ -68,6 +68,8 @@ PyObject* KX_VehicleWrapper::PyAddWheel(PyObject* self,
 		printf("attempt for addWheel: suspensionRestLength%f wheelRadius %f, hasSteering:%d\n",suspensionRestLength,wheelRadius,hasSteering);
 		m_vehicle->AddWheel(motionState,aPos,aDir,aAxle,suspensionRestLength,wheelRadius,hasSteering);
 		
+	} else {
+		return NULL;
 	}
 	Py_INCREF(Py_None);
 	return Py_None;
@@ -90,8 +92,7 @@ PyObject* KX_VehicleWrapper::PyGetWheelPosition(PyObject* self,
 		MT_Vector3 pos(position[0],position[1],position[2]);
 		return PyObjectFrom(pos);
 	}
-	Py_INCREF(Py_None);
-	return Py_None;
+	return NULL;
 }
 
 PyObject* KX_VehicleWrapper::PyGetWheelRotation(PyObject* self, 
@@ -103,8 +104,7 @@ PyObject* KX_VehicleWrapper::PyGetWheelRotation(PyObject* self,
 	{
 		return PyFloat_FromDouble(m_vehicle->GetWheelRotation(wheelIndex));
 	}
-	Py_INCREF(Py_None);
-	return Py_None;
+	return NULL;
 }
 
 PyObject* KX_VehicleWrapper::PyGetWheelOrientationQuaternion(PyObject* self, 
@@ -120,8 +120,7 @@ PyObject* KX_VehicleWrapper::PyGetWheelOrientationQuaternion(PyObject* self,
 		MT_Matrix3x3 ornmat(quatorn);
 		return PyObjectFrom(ornmat);
 	}
-	Py_INCREF(Py_None);
-	return Py_None;
+	return NULL;
 
 }
 
@@ -155,6 +154,9 @@ PyObject* KX_VehicleWrapper::PyApplyEngineForce(PyObject* self,
 		force *= -1.f;//someone reverse some conventions inside Bullet (axle winding)
 		m_vehicle->ApplyEngineForce(force,wheelIndex);
 	}
+	else {
+		return NULL;
+	}
 	Py_INCREF(Py_None);
 	return Py_None;
 }
@@ -170,6 +172,9 @@ PyObject* KX_VehicleWrapper::PySetTyreFriction(PyObject* self,
 	{
 		m_vehicle->SetWheelFriction(wheelFriction,wheelIndex);
 	}
+	else {
+		return NULL;
+	}
 	Py_INCREF(Py_None);
 	return Py_None;
 }
@@ -185,6 +190,9 @@ PyObject* KX_VehicleWrapper::PySetSuspensionStiffness(PyObject* self,
 	{
 		m_vehicle->SetSuspensionStiffness(suspensionStiffness,wheelIndex);
 	}
+	else {
+		return NULL;
+	}
 	Py_INCREF(Py_None);
 	return Py_None;
 }
@@ -199,6 +207,8 @@ PyObject* KX_VehicleWrapper::PySetSuspensionDamping(PyObject* self,
 	if (PyArg_ParseTuple(args,"fi",&suspensionDamping,&wheelIndex))
 	{
 		m_vehicle->SetSuspensionDamping(suspensionDamping,wheelIndex);
+	} else {
+		return NULL;
 	}
 	Py_INCREF(Py_None);
 	return Py_None;
@@ -214,6 +224,8 @@ PyObject* KX_VehicleWrapper::PySetSuspensionCompression(PyObject* self,
 	if (PyArg_ParseTuple(args,"fi",&suspensionCompression,&wheelIndex))
 	{
 		m_vehicle->SetSuspensionCompression(suspensionCompression,wheelIndex);
+	} else {
+		return NULL;
 	}
 	Py_INCREF(Py_None);
 	return Py_None;
@@ -230,6 +242,9 @@ PyObject* KX_VehicleWrapper::PySetRollInfluence(PyObject* self,
 	{
 		m_vehicle->SetRollInfluence(rollInfluence,wheelIndex);
 	}
+	else {
+		return NULL;
+	}
 	Py_INCREF(Py_None);
 	return Py_None;
 }
@@ -246,6 +261,9 @@ PyObject* KX_VehicleWrapper::PyApplyBraking(PyObject* self,
 	{
 		m_vehicle->ApplyBraking(braking,wheelIndex);
 	}
+	else {
+		return NULL;
+	}
 	Py_INCREF(Py_None);
 	return Py_None;
 }
@@ -264,6 +282,9 @@ PyObject* KX_VehicleWrapper::PySetSteeringValue(PyObject* self,
 	{
 		m_vehicle->SetSteeringValue(steeringValue,wheelIndex);
 	}
+	else {
+		return NULL;
+	}
 	Py_INCREF(Py_None);
 	return Py_None;
 }
diff --git a/source/gameengine/Ketsji/Makefile b/source/gameengine/Ketsji/Makefile
index e6e541d0931..47a4855b00c 100644
--- a/source/gameengine/Ketsji/Makefile
+++ b/source/gameengine/Ketsji/Makefile
@@ -36,6 +36,7 @@ include nan_compile.mk
 CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
 
 CPPFLAGS += $(OGL_CPPFLAGS)
+CPPFLAGS += -I$(NAN_GLEW)/include
 CPPFLAGS += -I$(OPENGL_HEADERS)
 CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) -I../../blender/python
 CPPFLAGS += -I$(NAN_STRING)/include    
diff --git a/source/gameengine/Ketsji/SConscript b/source/gameengine/Ketsji/SConscript
index c7c80345796..fdac5a71071 100644
--- a/source/gameengine/Ketsji/SConscript
+++ b/source/gameengine/Ketsji/SConscript
@@ -18,7 +18,7 @@ incs += ' #source/gameengine/SceneGraph #source/gameengine/Physics/common #sourc
 incs += ' #source/gameengine/Physics/BlOde #source/gameengine/Physics/Dummy'
 incs += ' #source/gameengine/Physics/Sumo #source/gameengine/Physics/Sumo/include'
 incs += ' #source/gameengine/Physics/Sumo/Fuzzics/include #source/gameengine/Network/LoopBackNetwork'
-incs += ' #source/blender/misc #source/blender/blenloader'
+incs += ' #source/blender/misc #source/blender/blenloader #extern/glew/include'
 
 cflags = []
 if env['OURPLATFORM'] == 'win32-vc':
diff --git a/source/gameengine/PyDoc/BL_ActionActuator.py b/source/gameengine/PyDoc/BL_ActionActuator.py
index 41f41080c31..d56888cde80 100644
--- a/source/gameengine/PyDoc/BL_ActionActuator.py
+++ b/source/gameengine/PyDoc/BL_ActionActuator.py
@@ -86,6 +86,14 @@ class BL_ActionActuator(SCA_IActuator):
 		@param mode: KX_ACTIONACT_PLAY, KX_ACTIONACT_PROPERTY, KX_ACTIONACT_FLIPPER, KX_ACTIONACT_LOOPSTOP, KX_ACTIONACT_LOOPEND
 		@type mode: integer
 		"""
+	
+	def setContinue(cont):
+		"""
+		Set the actions continue option True or False. see getContinue.
+
+		@param cont: The continue option.
+		@type cont: bool
+		"""
 
 	def getType():
 		"""
@@ -94,6 +102,13 @@ class BL_ActionActuator(SCA_IActuator):
 		@rtype: integer
 		@return: KX_ACTIONACT_PLAY, KX_ACTIONACT_PROPERTY, KX_ACTIONACT_FLIPPER, KX_ACTIONACT_LOOPSTOP, KX_ACTIONACT_LOOPEND
 		"""
+
+	def getContinue():
+		"""
+		When True, the action will always play from where last left off, otherwise negative events to this actuator will reset it to its start frame.
+	    
+		@rtype: bool
+		"""
 	
 	def getAction():
 		"""
diff --git a/source/gameengine/PyDoc/KX_GameObject.py b/source/gameengine/PyDoc/KX_GameObject.py
index 8d29a704380..37c188b7f22 100644
--- a/source/gameengine/PyDoc/KX_GameObject.py
+++ b/source/gameengine/PyDoc/KX_GameObject.py
@@ -22,12 +22,38 @@ class KX_GameObject:
 	@type orientation: 3x3 Matrix [[float]]
 	@ivar scaling: The object's scaling factor. list [sx, sy, sz]
 	@type scaling: list [sx, sy, sz]
+	@ivar timeOffset: adjust the slowparent delay at runtime.
+	@type timeOffset: float
 	"""
-	
+	def endObject(visible):
+		"""
+		Delete this object, can be used inpace of the EndObject Actuator.
+		The actual removal of the object from the scene is delayed.
+		"""	
+	def getVisible(visible):
+		"""
+		Gets the game object's visible flag.
+		
+		@type visible: boolean
+		"""	
 	def setVisible(visible):
 		"""
 		Sets the game object's visible flag.
 		
+		@type visible: boolean
+		"""
+	def getState():
+		"""
+		Gets the game object's state bitmask.
+		
+		@rtype: int
+		@return: the objects state.
+		"""	
+	def setState():
+		"""
+		Sets the game object's visible flag.
+		The bitmasks for states from 1 to 30 can be set with (1<<0, 1<<1, 1<<2 ... 1<<29)
+		
 		@type visible: boolean
 		"""
 	def setPosition(pos):
@@ -50,6 +76,7 @@ class KX_GameObject:
 		
 		@type orn: 3x3 rotation matrix, or Quaternion.
 		@param orn: a rotation matrix specifying the new rotation.
+		@note: When using this matrix with Blender.Mathutils.Matrix() types, it will need to be transposed.
 		"""
 	def alignAxisToVect(vect, axis):
 		"""
@@ -63,14 +90,26 @@ class KX_GameObject:
 					- 1: Y axis
 					- 2: Z axis (default) 
 		"""
+	def getAxisVect(vect):
+		"""
+		Returns the axis vector rotates by the objects worldspace orientation.
+		This is the equivalent if multiplying the vector by the orientation matrix.
+		
+		@type vect: 3d vector.
+		@param vect: a vector to align the axis.
+		@rtype: 3d vector.
+		@return: The vector in relation to the objects rotation.
+
+		"""
 	def getOrientation():
 		"""
 		Gets the game object's orientation.
 		
 		@rtype: 3x3 rotation matrix
 		@return: The game object's rotation matrix
+		@note: When using this matrix with Blender.Mathutils.Matrix() types, it will need to be transposed.
 		"""
-	def getLinearVelocity(local):
+	def getLinearVelocity(local = 0):
 		"""
 		Gets the game object's linear velocity.
 		
@@ -78,11 +117,24 @@ class KX_GameObject:
 		ie no angular velocity component.
 		
 		@type local: boolean
-		@param local: - False: you get the "global" velocity ie: relative to world orientation.
+		@param local: - False: you get the "global" velocity ie: relative to world orientation (default).
 		              - True: you get the "local" velocity ie: relative to object orientation.
 		@rtype: list [vx, vy, vz]
 		@return: the object's linear velocity.
 		"""
+	def setLinearVelocity(velocity, local = 0):
+		"""
+		Sets the game object's linear velocity.
+		
+		This method sets game object's velocity through it's centre of mass,
+		ie no angular velocity component.
+		
+		@type velocity: 3d vector.
+		@param velocity: linear velocity vector.
+		@type local: boolean
+		@param local: - False: you get the "global" velocity ie: relative to world orientation (default).
+		              - True: you get the "local" velocity ie: relative to object orientation.
+		"""
 	def getVelocity(point):
 		"""
 		Gets the game object's velocity at the specified point.
@@ -130,16 +182,19 @@ class KX_GameObject:
 	def restoreDynamics():
 		"""
 		Resumes physics for this object.
+		@Note: The objects linear velocity will be applied from when the dynamics were suspended.
 		"""
 	def enableRigidBody():
 		"""
 		Enables rigid body physics for this object.
 		
 		Rigid body physics allows the object to roll on collisions.
+		@Note: This is not working with bullet physics yet.
 		"""
 	def disableRigidBody():
 		"""
 		Disables rigid body physics for this object.
+		@Note: This is not working with bullet physics yet. The angular is removed but rigid body physics can still rotate it later.
 		"""
 	def getParent():
 		"""
@@ -172,6 +227,12 @@ class KX_GameObject:
 		"""
 		Returns the user data object associated with this game object's physics controller.
 		"""
+	def getPropertyNames():
+		"""
+		Gets a list of all property names.
+		@rtype: list
+		@return: All property names for this object.
+		"""
 	def getDistanceTo(other):
 		"""
 		Returns the distance to another object or point.
@@ -212,7 +273,7 @@ class KX_GameObject:
 		If is casted from/to object center or explicit [x,y,z] points.
 		The ray does not have X-Ray capability: the first object hit (other than self object) stops the ray
 		If a property was specified and the first object hit does not have that property, there is no hit
-		The	ray ignores collision-free objects
+		The	ray ignores collision-free objects and faces that dont have the collision flag enabled, you can however use ghost objects.
 
 		@param to: [x,y,z] or object to which the ray is casted
 		@type to: L{KX_GameObject} or 3-tuple
diff --git a/source/gameengine/PyDoc/SCA_PythonController.py b/source/gameengine/PyDoc/SCA_PythonController.py
index eb9e57c0819..6d91736d636 100644
--- a/source/gameengine/PyDoc/SCA_PythonController.py
+++ b/source/gameengine/PyDoc/SCA_PythonController.py
@@ -46,4 +46,12 @@ class SCA_PythonController(SCA_IController):
 		
 		@type script: string.
 		"""
+	def getState():
+		"""
+		Get the controllers state bitmask, this can be used with the GameObject's state to test if the the controller is active.
+		This for instance will always be true however you could compare with a previous state to see when the state was activated.
+		GameLogic.getCurrentController().getState() & GameLogic.getCurrentController().getOwner().getState()
+		
+		@rtype: int
+		"""
 
diff --git a/source/gameengine/Rasterizer/CMakeLists.txt b/source/gameengine/Rasterizer/CMakeLists.txt
index e604fe0e133..6d53ee53471 100644
--- a/source/gameengine/Rasterizer/CMakeLists.txt
+++ b/source/gameengine/Rasterizer/CMakeLists.txt
@@ -31,6 +31,9 @@ SET(INC
   ../../../source/kernel/gen_system
   ../../../intern/string
   ../../../intern/moto/include
+  ../../../extern/glew/include
+  ../Expressions
+  ${PYTHON_INC}
 )
 
 BLENDERLIB(bf_rasterizer "${SRC}" "${INC}")
diff --git a/source/gameengine/Rasterizer/Makefile b/source/gameengine/Rasterizer/Makefile
index d544056e8ae..e3b1f274ee5 100644
--- a/source/gameengine/Rasterizer/Makefile
+++ b/source/gameengine/Rasterizer/Makefile
@@ -35,11 +35,15 @@ include nan_compile.mk
 
 CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
 
+CPPFLAGS += -I$(NAN_GLEW)/include
 CPPFLAGS += -I$(OPENGL_HEADERS)
 CPPFLAGS += -I$(NAN_STRING)/include    
 CPPFLAGS += -I$(NAN_MOTO)/include
 CPPFLAGS += -I../../kernel/gen_system
 CPPFLAGS += -I../BlenderRoutines
+CPPFLAGS += -I../Expressions
+
+CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
 
 ifeq ($(OS),darwin)
 	CPPFLAGS += -fpascal-strings
diff --git a/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp b/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
index 80d6d55df25..958fead33ce 100644
--- a/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
+++ b/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
@@ -46,30 +46,22 @@
 #include "RAS_2DFilterManager.h"
 #include <iostream>
 
-#ifdef WIN32
-// OpenGL gl.h needs 'windows.h' on windows platforms 
-#include <windows.h>
-#endif //WIN32
-#ifdef __APPLE__
-#define GL_GLEXT_LEGACY 1
-#include <OpenGL/gl.h>
-#else
-#include <GL/gl.h>
-#endif
-
-#include "RAS_OpenGLRasterizer/RAS_GLExtensionManager.h"
+#include "GL/glew.h"
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 
+#include "Value.h"
 
 RAS_2DFilterManager::RAS_2DFilterManager():
 texturewidth(-1), textureheight(-1),
 canvaswidth(-1), canvasheight(-1),
-numberoffilters(0),texname(-1)
+numberoffilters(0)
 {
-	isshadersupported = bgl::QueryVersion(2,0);
+	isshadersupported = GLEW_ARB_shader_objects &&
+		GLEW_ARB_fragment_shader && GLEW_ARB_multitexture;
+
 	if(!isshadersupported)
 	{
 		std::cout<<"shaders not supported!" << std::endl;
@@ -81,26 +73,28 @@ numberoffilters(0),texname(-1)
 	{
 		m_filters[passindex] = 0;
 		m_enabled[passindex] = 0;
+		texflag[passindex] = 0;
+		m_gameObjects[passindex] = NULL;
 	}
-
+	texname[0] = texname[1] = texname[2] = -1;
 }
 
 RAS_2DFilterManager::~RAS_2DFilterManager()
 {
+	FreeTextures();
 }
 
 unsigned int RAS_2DFilterManager::CreateShaderProgram(char* shadersource)
 {
 		GLuint program = 0;	
-#if defined(GL_ARB_shader_objects) && defined(WITH_GLEXT)
-		GLuint fShader = bgl::blCreateShaderObjectARB(GL_FRAGMENT_SHADER);
+		GLuint fShader = glCreateShaderObjectARB(GL_FRAGMENT_SHADER);
         GLint success;
 
-		bgl::blShaderSourceARB(fShader, 1, (const char**)&shadersource, NULL);
+		glShaderSourceARB(fShader, 1, (const char**)&shadersource, NULL);
 
-		bgl::blCompileShaderARB(fShader);
+		glCompileShaderARB(fShader);
 
-		bgl::blGetObjectParameterivARB(fShader, GL_COMPILE_STATUS, &success);
+		glGetObjectParameterivARB(fShader, GL_COMPILE_STATUS, &success);
 		if(!success)
 		{
 			/*Shader Comile Error*/
@@ -108,11 +102,11 @@ unsigned int RAS_2DFilterManager::CreateShaderProgram(char* shadersource)
 			return 0;
 		}
 		    
-		program = bgl::blCreateProgramObjectARB();
-		bgl::blAttachObjectARB(program, fShader);
+		program = glCreateProgramObjectARB();
+		glAttachObjectARB(program, fShader);
 
-		bgl::blLinkProgramARB(program);
-		bgl::blGetObjectParameterivARB(program, GL_LINK_STATUS, &success);
+		glLinkProgramARB(program);
+		glGetObjectParameterivARB(program, GL_LINK_STATUS, &success);
 		if (!success)
 		{
 			/*Program Link Error*/
@@ -120,15 +114,15 @@ unsigned int RAS_2DFilterManager::CreateShaderProgram(char* shadersource)
 			return 0;
 		}
    		
-		bgl::blValidateProgramARB(program);
-		bgl::blGetObjectParameterivARB(program, GL_VALIDATE_STATUS, &success);
+		glValidateProgramARB(program);
+		glGetObjectParameterivARB(program, GL_VALIDATE_STATUS, &success);
         if (!success)
 		{
 			/*Program Validation Error*/
 			std::cout << "2dFilters - Shader program validation error" << std::endl;
 			return 0;
 		}
-#endif
+
 		return program;
 }
 
@@ -159,60 +153,144 @@ unsigned int RAS_2DFilterManager::CreateShaderProgram(int filtermode)
 		}
 		return 0;
 }
-
-void RAS_2DFilterManager::StartShaderProgram(unsigned int shaderprogram)
+void	RAS_2DFilterManager::AnalyseShader(int passindex, vector<STR_String>& propNames)
+{
+	texflag[passindex] = 0;
+	if(glGetUniformLocationARB(m_filters[passindex], "bgl_DepthTexture") != -1)
+	{
+		texflag[passindex] |= 0x1;
+	}
+	if(glGetUniformLocationARB(m_filters[passindex], "bgl_LuminanceTexture") != -1)
+	{
+		texflag[passindex] |= 0x2;
+	}
+
+	if(m_gameObjects[passindex])
+	{
+		int objProperties = propNames.size();
+		int i;
+		for(i=0; i<objProperties; i++)
+			if(glGetUniformLocationARB(m_filters[passindex], propNames[i]) != -1)
+				m_properties[passindex].push_back(propNames[i]);
+	}
+}
+
+void RAS_2DFilterManager::StartShaderProgram(int passindex)
 {
-#if defined(GL_ARB_shader_objects) && defined(WITH_GLEXT)
 	GLint uniformLoc;
-	bgl::blUseProgramObjectARB(shaderprogram);
-	uniformLoc = bgl::blGetUniformLocationARB(shaderprogram, "bgl_RenderedTexture");
-	bgl::blActiveTextureARB(GL_TEXTURE0);
-	//glActiveTexture(GL_TEXTURE0);
-	glBindTexture(GL_TEXTURE_2D, texname);
+	glUseProgramObjectARB(m_filters[passindex]);
+	uniformLoc = glGetUniformLocationARB(m_filters[passindex], "bgl_RenderedTexture");
+	glActiveTextureARB(GL_TEXTURE0);
+	glBindTexture(GL_TEXTURE_2D, texname[0]);
 
     if (uniformLoc != -1)
     {
-		bgl::blUniform1iARB(uniformLoc, 0);
+		glUniform1iARB(uniformLoc, 0);
     }
-	uniformLoc = bgl::blGetUniformLocationARB(shaderprogram, "bgl_TextureCoordinateOffset");
+
+    /* send depth texture to glsl program if it needs */
+	if(texflag[passindex] & 0x1){
+    	uniformLoc = glGetUniformLocationARB(m_filters[passindex], "bgl_DepthTexture");
+    	glActiveTextureARB(GL_TEXTURE1);
+    	glBindTexture(GL_TEXTURE_2D, texname[1]);
+
+    	if (uniformLoc != -1)
+    	{
+    		glUniform1iARB(uniformLoc, 1);
+    	}
+    }
+
+    /* send luminance texture to glsl program if it needs */
+	if(texflag[passindex] & 0x2){
+    	uniformLoc = glGetUniformLocationARB(m_filters[passindex], "bgl_LuminanceTexture");
+    	glActiveTextureARB(GL_TEXTURE2);
+    	glBindTexture(GL_TEXTURE_2D, texname[2]);
+
+    	if (uniformLoc != -1)
+    	{
+    		glUniform1iARB(uniformLoc, 2);
+    	}
+	}
+	
+	uniformLoc = glGetUniformLocationARB(m_filters[passindex], "bgl_TextureCoordinateOffset");
     if (uniformLoc != -1)
     {
-        bgl::blUniform2fvARB(uniformLoc, 9, textureoffsets);
+        glUniform2fvARB(uniformLoc, 9, textureoffsets);
     }
-	uniformLoc = bgl::blGetUniformLocationARB(shaderprogram, "bgl_RenderedTextureWidth");
+	uniformLoc = glGetUniformLocationARB(m_filters[passindex], "bgl_RenderedTextureWidth");
     if (uniformLoc != -1)
     {
-		bgl::blUniform1fARB(uniformLoc,texturewidth);
+		glUniform1fARB(uniformLoc,texturewidth);
     }
-	uniformLoc = bgl::blGetUniformLocationARB(shaderprogram, "bgl_RenderedTextureHeight");
+	uniformLoc = glGetUniformLocationARB(m_filters[passindex], "bgl_RenderedTextureHeight");
     if (uniformLoc != -1)
     {
-		bgl::blUniform1fARB(uniformLoc,textureheight);
+		glUniform1fARB(uniformLoc,textureheight);
     }
-#endif
+
+	int i, objProperties = m_properties[passindex].size();
+	for(i=0; i<objProperties; i++)
+	{
+		uniformLoc = glGetUniformLocationARB(m_filters[passindex], m_properties[passindex][i]);
+		if(uniformLoc != -1)
+		{
+			float value = ((CValue*)m_gameObjects[passindex])->GetPropertyNumber(m_properties[passindex][i], 0.0);
+			glUniform1fARB(uniformLoc,value);
+		}
+	}
 }
 
 void RAS_2DFilterManager::EndShaderProgram()
 {
-#if defined(GL_ARB_shader_objects) && defined(WITH_GLEXT)
-	bgl::blUseProgramObjectARB(0);
-#endif
+	glUseProgramObjectARB(0);
 }
 
-void RAS_2DFilterManager::SetupTexture()
+void RAS_2DFilterManager::FreeTextures()
 {
-	if(texname!=-1)
-	{
-		glDeleteTextures(1,(const GLuint *)&texname);
-	}
-	glGenTextures(1, (GLuint *)&texname);
-	glBindTexture(GL_TEXTURE_2D, texname);
+	if(texname[0]!=-1)
+		glDeleteTextures(1, (GLuint*)&texname[0]);
+	if(texname[1]!=-1)
+		glDeleteTextures(1, (GLuint*)&texname[1]);
+	if(texname[2]!=-1)
+		glDeleteTextures(1, (GLuint*)&texname[2]);
+}
+
+void RAS_2DFilterManager::SetupTextures(bool depth, bool luminance)
+{
+	FreeTextures();
+	
+	glGenTextures(1, (GLuint*)&texname[0]);
+	glBindTexture(GL_TEXTURE_2D, texname[0]);
 	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, texturewidth, textureheight, 0, GL_RGB,
-		GL_UNSIGNED_BYTE, 0);
+			GL_UNSIGNED_BYTE, 0);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
+
+	if(depth){
+		glGenTextures(1, (GLuint*)&texname[1]);
+		glBindTexture(GL_TEXTURE_2D, texname[1]);
+		glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT32, texturewidth,textureheight, 
+			0, GL_DEPTH_COMPONENT, GL_UNSIGNED_BYTE,NULL);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_COMPARE_MODE,
+		                GL_NONE);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
+	}
+
+	if(luminance){
+		glGenTextures(1, (GLuint*)&texname[2]);
+		glBindTexture(GL_TEXTURE_2D, texname[2]);
+		glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE16, texturewidth, textureheight,
+			 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, 0);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
+	}
 }
 
 void RAS_2DFilterManager::UpdateOffsetMatrix(int width, int height)
@@ -243,45 +321,72 @@ void RAS_2DFilterManager::UpdateOffsetMatrix(int width, int height)
 			textureoffsets[(((i*3)+j)*2)+1] = (-1.0f * yInc) + ((GLfloat)j * yInc);
 		}
 	}
-
-	SetupTexture();
 }
 
 void RAS_2DFilterManager::RenderFilters(RAS_ICanvas* canvas)
 {
+	bool need_depth=false;
+	bool need_luminance=false;
+	int num_filters = 0;
+
+	int passindex;
+
 	if(!isshadersupported)
 		return;
 
+	for(passindex =0; passindex<MAX_RENDER_PASS; passindex++)
+	{
+		if(m_filters[passindex] && m_enabled[passindex]){
+			num_filters ++;
+			if(texflag[passindex] & 0x1)
+				need_depth = true;
+			if(texflag[passindex] & 0x2)
+				need_luminance = true;
+			if(need_depth && need_luminance)
+				break;
+		}
+	}
+
+	if(num_filters <= 0)
+		return;
+
 	if(canvaswidth != canvas->GetWidth() || canvasheight != canvas->GetHeight())
 	{
 		UpdateOffsetMatrix(canvas->GetWidth(), canvas->GetHeight());
+		SetupTextures(need_depth, need_luminance);
 	}
 	GLuint	viewport[4]={0};
 
-	int passindex;
-	bool first = true;
+	if(need_depth){
+		glActiveTextureARB(GL_TEXTURE1);
+		glBindTexture(GL_TEXTURE_2D, texname[1]);
+		glCopyTexImage2D(GL_TEXTURE_2D,0,GL_DEPTH_COMPONENT, 0,0, texturewidth,textureheight, 0);
+	}
+	
+	if(need_luminance){
+		glActiveTextureARB(GL_TEXTURE2);
+		glBindTexture(GL_TEXTURE_2D, texname[2]);
+		glCopyTexImage2D(GL_TEXTURE_2D,0,GL_LUMINANCE16, 0,0, texturewidth,textureheight, 0);
+	}
+
+	glGetIntegerv(GL_VIEWPORT,(GLint *)viewport);
+	glViewport(0, 0, texturewidth, textureheight);
+
+	glDisable(GL_DEPTH_TEST);
+	glMatrixMode(GL_PROJECTION);
+	glLoadIdentity();
+	glMatrixMode(GL_MODELVIEW);
+	glLoadIdentity();
+
 	for(passindex =0; passindex<MAX_RENDER_PASS; passindex++)
 	{
 		if(m_filters[passindex] && m_enabled[passindex])
 		{
-			if(first)
-			{
-				glGetIntegerv(GL_VIEWPORT,(GLint *)viewport);
-				glViewport(0, 0, texturewidth, textureheight);
+			StartShaderProgram(passindex);
 
-				glDisable(GL_DEPTH_TEST);
-				glMatrixMode(GL_PROJECTION);
-				glLoadIdentity();
-				glMatrixMode(GL_MODELVIEW);
-				glLoadIdentity();
-				first = false;
-			}
-			
-			StartShaderProgram(m_filters[passindex]);
-
-			glBindTexture(GL_TEXTURE_2D, texname);
+			glActiveTextureARB(GL_TEXTURE0);
+			glBindTexture(GL_TEXTURE_2D, texname[0]);
 			glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 0, 0, texturewidth, textureheight, 0);
-
 			glClear(GL_COLOR_BUFFER_BIT);
 
 			glBegin(GL_QUADS);
@@ -294,19 +399,15 @@ void RAS_2DFilterManager::RenderFilters(RAS_ICanvas* canvas)
 		}
 	}
 
-	if(!first)
-	{
-		glEnable(GL_DEPTH_TEST);
-		glViewport(viewport[0],viewport[1],viewport[2],viewport[3]);
-		EndShaderProgram();	
-	}
+	glEnable(GL_DEPTH_TEST);
+	glViewport(viewport[0],viewport[1],viewport[2],viewport[3]);
+	EndShaderProgram();	
 }
 
-void RAS_2DFilterManager::EnableFilter(RAS_2DFILTER_MODE mode, int pass, STR_String& text)
+void RAS_2DFilterManager::EnableFilter(vector<STR_String>& propNames, void* gameObj, RAS_2DFILTER_MODE mode, int pass, STR_String& text)
 {
 	if(!isshadersupported)
 		return;
-#if defined(GL_ARB_shader_objects) && defined(WITH_GLEXT)
 	if(pass<0 || pass>=MAX_RENDER_PASS)
 		return;
 
@@ -325,17 +426,22 @@ void RAS_2DFilterManager::EnableFilter(RAS_2DFILTER_MODE mode, int pass, STR_Str
 	if(mode == RAS_2DFILTER_NOFILTER)
 	{
 		if(m_filters[pass])
-			bgl::blDeleteObjectARB(m_filters[pass]);
+			glDeleteObjectARB(m_filters[pass]);
 		m_enabled[pass] = 0;
 		m_filters[pass] = 0;
+		m_gameObjects[pass] = NULL;
+		m_properties[pass].clear();
+		texflag[pass] = 0;
 		return;
 	}
 	
 	if(mode == RAS_2DFILTER_CUSTOMFILTER)
 	{
 		if(m_filters[pass])
-			bgl::blDeleteObjectARB(m_filters[pass]);
+			glDeleteObjectARB(m_filters[pass]);
 		m_filters[pass] = CreateShaderProgram(text.Ptr());
+		m_gameObjects[pass] = gameObj;
+		AnalyseShader(pass, propNames);
 		m_enabled[pass] = 1;
 		return;
 	}
@@ -343,9 +449,8 @@ void RAS_2DFilterManager::EnableFilter(RAS_2DFILTER_MODE mode, int pass, STR_Str
 	if(mode>=RAS_2DFILTER_MOTIONBLUR && mode<=RAS_2DFILTER_INVERT)
 	{
 		if(m_filters[pass])
-			bgl::blDeleteObjectARB(m_filters[pass]);
+			glDeleteObjectARB(m_filters[pass]);
 		m_filters[pass] = CreateShaderProgram(mode);
 		m_enabled[pass] = 1;
 	}
-#endif
 }
diff --git a/source/gameengine/Rasterizer/RAS_2DFilterManager.h b/source/gameengine/Rasterizer/RAS_2DFilterManager.h
index cff868556e0..9d8326b96de 100644
--- a/source/gameengine/Rasterizer/RAS_2DFilterManager.h
+++ b/source/gameengine/Rasterizer/RAS_2DFilterManager.h
@@ -28,8 +28,6 @@
 #ifndef __RAS_I2DFILTER
 #define __RAS_I2DFILTER
 
-
-
 #define MAX_RENDER_PASS	100
 
 class RAS_2DFilterManager
@@ -37,19 +35,36 @@ class RAS_2DFilterManager
 private:
 	unsigned int	CreateShaderProgram(char* shadersource);
 	unsigned int	CreateShaderProgram(int filtermode);
-	void			StartShaderProgram(unsigned int shaderprogram);
+	void		AnalyseShader(int passindex, vector<STR_String>& propNames);
+	void			StartShaderProgram(int passindex);
 	void			EndShaderProgram();
 
+	void SetupTextures(bool depth, bool luminance);
+	void FreeTextures();
+
+	void UpdateOffsetMatrix(int width, int height);
+
 	float			textureoffsets[18];
 	float			view[4];
-	unsigned int	texname;
+	/* texname[0] contains render to texture, texname[1] contains depth texture,  texname[2] contains luminance texture*/
+	unsigned int	texname[3]; 
 	int				texturewidth;
 	int				textureheight;
 	int				canvaswidth;
 	int				canvasheight;
 	int				numberoffilters;
+	/* bit 0: enable/disable depth texture
+	 * bit 1: enable/disable luminance texture*/
+	short			texflag[MAX_RENDER_PASS];
 
 	bool			isshadersupported;
+
+	unsigned int	m_filters[MAX_RENDER_PASS];
+	short		m_enabled[MAX_RENDER_PASS];
+
+	// stores object properties to send to shaders in each pass
+	vector<STR_String>	m_properties[MAX_RENDER_PASS];
+	void* m_gameObjects[MAX_RENDER_PASS];
 public:
 	enum RAS_2DFILTER_MODE {
 		RAS_2DFILTER_ENABLED = -2,
@@ -70,19 +85,12 @@ public:
 		RAS_2DFILTER_NUMBER_OF_FILTERS
 	};
 
-	unsigned int	m_filters[MAX_RENDER_PASS];
-	short			m_enabled[MAX_RENDER_PASS];
-
 	RAS_2DFilterManager();
 
 	~RAS_2DFilterManager();
 
-	void SetupTexture();
-
-	void UpdateOffsetMatrix(int width, int height);
-
 	void RenderFilters(RAS_ICanvas* canvas);
 
-	void EnableFilter(RAS_2DFILTER_MODE mode, int pass, STR_String& text);
+	void EnableFilter(vector<STR_String>& propNames, void* gameObj, RAS_2DFILTER_MODE mode, int pass, STR_String& text);
 };
 #endif
diff --git a/source/gameengine/Rasterizer/RAS_BucketManager.cpp b/source/gameengine/Rasterizer/RAS_BucketManager.cpp
index 50df1a1e2ea..b4492ca03a9 100644
--- a/source/gameengine/Rasterizer/RAS_BucketManager.cpp
+++ b/source/gameengine/Rasterizer/RAS_BucketManager.cpp
@@ -109,7 +109,7 @@ void RAS_BucketManager::RenderAlphaBuckets(
 	// it is needed for compatibility.
 	rasty->SetDepthMask(RAS_IRasterizer::KX_DEPTHMASK_DISABLED);
 
-	int drawingmode;
+	RAS_IRasterizer::DrawMode drawingmode;
 	std::multiset< alphamesh, backtofront>::iterator msit = alphameshset.begin();
 	for (; msit != alphameshset.end(); ++msit)
 	{
diff --git a/source/gameengine/Rasterizer/RAS_CameraData.h b/source/gameengine/Rasterizer/RAS_CameraData.h
index 6aa9b34962b..0327a3f4763 100644
--- a/source/gameengine/Rasterizer/RAS_CameraData.h
+++ b/source/gameengine/Rasterizer/RAS_CameraData.h
@@ -49,12 +49,12 @@ struct RAS_CameraData
 		m_clipstart(clipstart),
 		m_clipend(clipend),
 		m_perspective(perspective),
-		m_focallength(focallength),
 		m_viewport(viewport),
 		m_viewportleft(viewportleft),
 		m_viewportbottom(viewportbottom),
 		m_viewportright(viewportright),
-		m_viewporttop(viewporttop)
+		m_viewporttop(viewporttop),
+		m_focallength(focallength)
 	{
 	}
 };
diff --git a/source/gameengine/Rasterizer/RAS_Deformer.h b/source/gameengine/Rasterizer/RAS_Deformer.h
index bea68e203a9..4e8484ab880 100644
--- a/source/gameengine/Rasterizer/RAS_Deformer.h
+++ b/source/gameengine/Rasterizer/RAS_Deformer.h
@@ -43,7 +43,7 @@ public:
 	virtual ~RAS_Deformer(){};
 	virtual void Relink(GEN_Map<class GEN_HashedPtr, void*>*map)=0;
 	virtual bool Apply(class RAS_IPolyMaterial *polymat)=0;
-	virtual void Update(void)=0;
+	virtual bool Update(void)=0;
 	virtual RAS_Deformer *GetReplica()=0;
 protected:
 	class RAS_MeshObject	*m_pMesh;
diff --git a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
index 61860c4c405..cb10ba6bf37 100644
--- a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
+++ b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
@@ -27,6 +27,7 @@
  */
 
 #include "RAS_IPolygonMaterial.h"
+#include "RAS_IRasterizer.h"
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -56,7 +57,6 @@ RAS_IPolyMaterial::RAS_IPolyMaterial(const STR_String& texname,
 		m_bIsTriangle(bIsTriangle),
 		m_polymatid(m_newpolymatid++),
 		m_flag(0),
-		m_enabled(0),
 		m_multimode(0)
 {
 	m_shininess = 35.0;
@@ -148,10 +148,20 @@ const unsigned int	RAS_IPolyMaterial::GetFlag() const
 {
 	return m_flag;
 }
-const unsigned int	RAS_IPolyMaterial::GetEnabled() const
+
+bool RAS_IPolyMaterial::UsesLighting(RAS_IRasterizer *rasty) const
 {
-	return m_enabled;
+	bool dolights = false;
+
+	if(m_flag & RAS_BLENDERMAT)
+		dolights = (m_flag &RAS_MULTILIGHT)!=0;
+	else if(rasty->GetDrawingMode() < RAS_IRasterizer::KX_SOLID);
+	else if(rasty->GetDrawingMode() == RAS_IRasterizer::KX_SHADOW);
+	else
+		dolights = (m_drawingmode & 16)!=0;
+	
+	return dolights;
 }
 
-
 unsigned int RAS_IPolyMaterial::m_newpolymatid = 0;
+
diff --git a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
index 3284ddb7ddd..d2d1dba99d9 100644
--- a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
+++ b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
@@ -77,7 +77,6 @@ protected:
 
 	// will move...
 	unsigned int			m_flag;//MaterialProps
-	unsigned int			m_enabled;// enabled for this mat 
 	int						m_multimode; // sum of values
 public:
 
@@ -141,7 +140,8 @@ public:
 	const STR_String&	GetMaterialName() const;
 	const STR_String&	GetTextureName() const;
 	const unsigned int	GetFlag() const;
-	const unsigned int	GetEnabled() const;
+
+	virtual bool		UsesLighting(RAS_IRasterizer *rasty) const;
 	
 	/*
 	 * PreCalculate texture gen
diff --git a/source/gameengine/Rasterizer/RAS_IRasterizer.h b/source/gameengine/Rasterizer/RAS_IRasterizer.h
index 18a7f261c94..d4a9177a85d 100644
--- a/source/gameengine/Rasterizer/RAS_IRasterizer.h
+++ b/source/gameengine/Rasterizer/RAS_IRasterizer.h
@@ -33,12 +33,23 @@
 #pragma warning (disable:4786)
 #endif
 
+#include "STR_HashedString.h"
+
 #include "MT_CmMatrix4x4.h"
 #include "MT_Matrix4x4.h"
 
+#include "RAS_TexVert.h"
+
+#include <vector>
+using namespace std;
+
 class RAS_ICanvas;
 class RAS_IPolyMaterial;
-#include "RAS_MaterialBucket.h"
+
+typedef vector<unsigned short> KX_IndexArray;
+typedef vector<RAS_TexVert> KX_VertexArray;
+typedef vector< KX_VertexArray* >  vecVertexArray;
+typedef vector< KX_IndexArray* > vecIndexArrays;
 
 /**
  * 3D rendering device context interface. 
@@ -62,7 +73,18 @@ public:
 			KX_WIREFRAME,
 			KX_SOLID,
 			KX_SHADED,
-			KX_TEXTURED 
+			KX_TEXTURED,
+			KX_SHADOW
+	};
+
+	/**
+	 * Drawing modes
+	 */
+
+	enum DrawMode {
+		KX_MODE_LINES = 1,
+		KX_MODE_TRIANGLES,
+		KX_MODE_QUADS
 	};
 
 	/**
@@ -111,6 +133,7 @@ public:
 		RAS_TEXCO_NORM,		//< Normal coordinates 
 		RAS_TEXTANGENT,		//<
 		RAS_TEXCO_UV2,		//<
+		RAS_TEXCO_VCOL,		//< Vertex Color
 		RAS_TEXCO_DISABLE	//< Disable this texture unit (cached)
 	};
 
@@ -197,65 +220,37 @@ public:
 	 * IndexPrimitives: Renders primitives.
 	 * @param vertexarrays is an array of vertex arrays
 	 * @param indexarrays is an array of index arrays
-	 * @param mode determines the type of primitive stored in the vertex/index arrays:
-	 *              0 triangles
-	 *              1 lines (default)
-	 *              2 quads
-	 * @param polymat (reserved)
+	 * @param mode determines the type of primitive stored in the vertex/index arrays
 	 * @param useObjectColor will render the object using @param rgbacolor instead of 
 	 *  vertex colors.
 	 */
-	virtual void	IndexPrimitives( const vecVertexArray& vertexarrays,
+	virtual void IndexPrimitives( const vecVertexArray& vertexarrays,
 							const vecIndexArrays & indexarrays,
-							int mode,
-							class RAS_IPolyMaterial* polymat,
-							class RAS_IRenderTools* rendertools,
+							DrawMode mode,
 							bool useObjectColor,
 							const MT_Vector4& rgbacolor,
 							class KX_ListSlot** slot)=0;
-	/**
-	 * @copydoc IndexPrimitives
-	 * IndexPrimitivesEx will renormalize faces if @param vertexarrays[i].getFlag() & TV_CALCFACENORMAL
-	 */
-	virtual void	IndexPrimitives_Ex( const vecVertexArray& vertexarrays,
-							const vecIndexArrays & indexarrays,
-							int mode,
-							class RAS_IPolyMaterial* polymat,
-							class RAS_IRenderTools* rendertools,
-							bool useObjectColor,
-							const MT_Vector4& rgbacolor)=0;
+
+	virtual void IndexPrimitivesMulti( 
+						const vecVertexArray& vertexarrays,
+						const vecIndexArrays & indexarrays,
+						DrawMode mode,
+						bool useObjectColor,
+						const MT_Vector4& rgbacolor,
+						class KX_ListSlot** slot)=0;
+
 	/**
 	 * IndexPrimitives_3DText will render text into the polygons.
 	 * The text to be rendered is from @param rendertools client object's text property.
 	 */
 	virtual void	IndexPrimitives_3DText( const vecVertexArray& vertexarrays,
 							const vecIndexArrays & indexarrays,
-							int mode,
+							DrawMode mode,
 							class RAS_IPolyMaterial* polymat,
 							class RAS_IRenderTools* rendertools,
 							bool useObjectColor,
 							const MT_Vector4& rgbacolor)=0;
 
-	virtual void IndexPrimitivesMulti( 
-						const vecVertexArray& vertexarrays,
-						const vecIndexArrays & indexarrays,
-						int mode,
-						class RAS_IPolyMaterial* polymat,
-						class RAS_IRenderTools* rendertools,
-						bool useObjectColor,
-						const MT_Vector4& rgbacolor,
-						class KX_ListSlot** slot)=0;
-
-	virtual void IndexPrimitivesMulti_Ex( 
-						const vecVertexArray& vertexarrays,
-						const vecIndexArrays & indexarrays,
-						int mode,
-						class RAS_IPolyMaterial* polymat,
-						class RAS_IRenderTools* rendertools,
-						bool useObjectColor,
-						const MT_Vector4& rgbacolor)=0;
-
-
 	virtual void	SetProjectionMatrix(MT_CmMatrix4x4 & mat)=0;
 	/* This one should become our final version, methinks. */
 	/**
@@ -389,8 +384,11 @@ public:
 	
 	virtual	void	DrawDebugLine(const MT_Vector3& from,const MT_Vector3& to,const MT_Vector3& color)=0;
 
-	virtual void	SetTexCoords(TexCoGen coords, int unit) = 0;
-	virtual void	SetAttrib(int type) = 0;
+
+	virtual void	SetTexCoordNum(int num) = 0;
+	virtual void	SetAttribNum(int num) = 0;
+	virtual void	SetTexCoord(TexCoGen coords, int unit) = 0;
+	virtual void	SetAttrib(TexCoGen coords, int unit) = 0;
 	virtual void	GetViewMatrix(MT_Matrix4x4 &mat) const = 0;
 
 	virtual bool	QueryLists(){return false;}
diff --git a/source/gameengine/Rasterizer/RAS_IRenderTools.h b/source/gameengine/Rasterizer/RAS_IRenderTools.h
index bcbf907741b..54a663ba111 100644
--- a/source/gameengine/Rasterizer/RAS_IRenderTools.h
+++ b/source/gameengine/Rasterizer/RAS_IRenderTools.h
@@ -185,7 +185,7 @@ public:
 
 	virtual
 		void
-		Update2DFilter(RAS_2DFilterManager::RAS_2DFILTER_MODE filtermode, int pass, STR_String& text)=0;
+		Update2DFilter(vector<STR_String>& propNames, void* gameObj, RAS_2DFilterManager::RAS_2DFILTER_MODE filtermode, int pass, STR_String& text)=0;
 
 	virtual
 		void
diff --git a/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp b/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
index 96ce220ae4d..e295d69e48e 100644
--- a/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
+++ b/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
@@ -167,39 +167,30 @@ RAS_MaterialBucket::T_MeshSlotList::iterator RAS_MaterialBucket::msEnd()
 }
 
 bool RAS_MaterialBucket::ActivateMaterial(const MT_Transform& cameratrans, RAS_IRasterizer* rasty,
-	RAS_IRenderTools *rendertools, int &drawmode)
+	RAS_IRenderTools *rendertools, RAS_IRasterizer::DrawMode &drawmode)
 {
 	rendertools->SetViewMat(cameratrans);
 
 	if (!rasty->SetMaterial(*m_material))
 		return false;
 	
-	bool dolights = false;
-	const unsigned int flag = m_material->GetFlag();
-
-
-	if( flag & RAS_BLENDERMAT)
-		dolights = (flag &RAS_MULTILIGHT)!=0;
-	else
-		dolights = (m_material->GetDrawingMode()&16)!=0;
-
-	if ((rasty->GetDrawingMode() < RAS_IRasterizer::KX_SOLID) || !dolights)
-	{
-		rendertools->ProcessLighting(-1);
-	}
-	else
-	{
+	if (m_material->UsesLighting(rasty))
 		rendertools->ProcessLighting(RAS_IRenderTools::RAS_LIGHT_OBJECT_LAYER/*m_material->GetLightLayer()*/);
-	}
+	else
+		rendertools->ProcessLighting(-1);
 
-	drawmode = (rasty->GetDrawingMode()  < RAS_IRasterizer::KX_SOLID ? 	
-		1:	(m_material->UsesTriangles() ? 0 : 2));
+	if(rasty->GetDrawingMode() < RAS_IRasterizer::KX_SOLID)
+		drawmode = RAS_IRasterizer::KX_MODE_LINES;
+	else if(m_material->UsesTriangles())
+		drawmode = RAS_IRasterizer::KX_MODE_TRIANGLES;
+	else
+		drawmode = RAS_IRasterizer::KX_MODE_QUADS;
 	
 	return true;
 }
 
 void RAS_MaterialBucket::RenderMeshSlot(const MT_Transform& cameratrans, RAS_IRasterizer* rasty,
-	RAS_IRenderTools* rendertools, const KX_MeshSlot &ms, int drawmode)
+	RAS_IRenderTools* rendertools, const KX_MeshSlot &ms, RAS_IRasterizer::DrawMode drawmode)
 {
 	if (!ms.m_bVisible)
 		return;
@@ -226,6 +217,17 @@ void RAS_MaterialBucket::RenderMeshSlot(const MT_Transform& cameratrans, RAS_IRa
 			ms.m_DisplayList->SetModified(ms.m_mesh->MeshModified());
 	}
 
+	// verify if we can use display list, not for deformed object, and
+	// also don't create a new display list when drawing shadow buffers,
+	// then it won't have texture coordinates for actual drawing
+	KX_ListSlot **displaylist;
+	if(ms.m_pDeformer)
+		displaylist = 0;
+	else if(!ms.m_DisplayList && rasty->GetDrawingMode() == RAS_IRasterizer::KX_SHADOW)
+		displaylist = 0;
+	else
+		displaylist = &ms.m_DisplayList;
+
 	// Use the text-specific IndexPrimitives for text faces
 	if (m_material->GetDrawingMode() & RAS_IRasterizer::RAS_RENDER_3DPOLYGON_TEXT)
 	{
@@ -237,51 +239,20 @@ void RAS_MaterialBucket::RenderMeshSlot(const MT_Transform& cameratrans, RAS_IRa
 				rendertools, // needed for textprinting on polys
 				ms.m_bObjectColor,
 				ms.m_RGBAcolor);
-
 	}
 
 	// for using glMultiTexCoord
-	else if(m_material->GetFlag() & RAS_MULTITEX )
+	else if((m_material->GetFlag() & RAS_MULTITEX))
 	{
 		rasty->IndexPrimitivesMulti(
 				ms.m_mesh->GetVertexCache(m_material), 
 				ms.m_mesh->GetIndexCache(m_material), 
 				drawmode,
-				m_material,
-				rendertools,
 				ms.m_bObjectColor,
 				ms.m_RGBAcolor,
-				&ms.m_DisplayList
-				);
+				displaylist);
 	}
 
-	// for using glMultiTexCoord on deformer
-	else if(m_material->GetFlag() & RAS_DEFMULTI )
-	{
-		rasty->IndexPrimitivesMulti_Ex(
-				ms.m_mesh->GetVertexCache(m_material), 
-				ms.m_mesh->GetIndexCache(m_material), 
-				drawmode,
-				m_material,
-				rendertools,
-				ms.m_bObjectColor,
-				ms.m_RGBAcolor
-				);
-	}
-
-	// Use the (slower) IndexPrimitives_Ex which can recalc face normals & such
-	//	for deformed objects - eventually should be extended to recalc ALL normals
-	else if (ms.m_pDeformer){
-		rasty->IndexPrimitives_Ex(
-				ms.m_mesh->GetVertexCache(m_material), 
-				ms.m_mesh->GetIndexCache(m_material), 
-				drawmode,
-				m_material,
-				rendertools, // needed for textprinting on polys
-				ms.m_bObjectColor,
-				ms.m_RGBAcolor
-				);
-	}
 	// Use the normal IndexPrimitives
 	else
 	{
@@ -289,12 +260,9 @@ void RAS_MaterialBucket::RenderMeshSlot(const MT_Transform& cameratrans, RAS_IRa
 				ms.m_mesh->GetVertexCache(m_material), 
 				ms.m_mesh->GetIndexCache(m_material), 
 				drawmode,
-				m_material,
-				rendertools, // needed for textprinting on polys
 				ms.m_bObjectColor,
 				ms.m_RGBAcolor,
-				&ms.m_DisplayList
-				);
+				displaylist);
 	}
 
 	if(rasty->QueryLists()) {
@@ -316,14 +284,14 @@ void RAS_MaterialBucket::Render(const MT_Transform& cameratrans,
 
 	//rasty->SetMaterial(*m_material);
 	
-	
-	int drawmode;
+	RAS_IRasterizer::DrawMode drawmode;
 	for (T_MeshSlotList::const_iterator it = m_meshSlots.begin();
 	! (it == m_meshSlots.end()); ++it)
 	{
 		rendertools->SetClientObject((*it).m_clientObj);
-		while (ActivateMaterial(cameratrans, rasty, rendertools, drawmode))
+		while (ActivateMaterial(cameratrans, rasty, rendertools, drawmode)) {
 			RenderMeshSlot(cameratrans, rasty, rendertools, *it, drawmode);
+		}
 	}
 	// to reset the eventual GL_CW mode
 	rendertools->SetClientObject(NULL);
diff --git a/source/gameengine/Rasterizer/RAS_MaterialBucket.h b/source/gameengine/Rasterizer/RAS_MaterialBucket.h
index 5ad0c173a56..13d8a53714a 100644
--- a/source/gameengine/Rasterizer/RAS_MaterialBucket.h
+++ b/source/gameengine/Rasterizer/RAS_MaterialBucket.h
@@ -35,17 +35,13 @@
 
 #include "MT_Transform.h"
 #include "RAS_IPolygonMaterial.h"
+#include "RAS_IRasterizer.h"
 #include "RAS_Deformer.h"	// __NLA
 #include <vector>
 #include <map>
 #include <set>
 using namespace std;
 
-typedef vector<unsigned short> KX_IndexArray;
-typedef vector<RAS_TexVert> KX_VertexArray;
-typedef vector< KX_VertexArray* >  vecVertexArray;
-typedef vector< KX_IndexArray* > vecIndexArrays;
-
 /**
  * KX_VertexIndex
  */
@@ -146,9 +142,9 @@ public:
 								const MT_Vector4& rgbavec);
 
 	void RenderMeshSlot(const MT_Transform& cameratrans, RAS_IRasterizer* rasty,
-		RAS_IRenderTools* rendertools, const KX_MeshSlot &ms, int drawmode);
+		RAS_IRenderTools* rendertools, const KX_MeshSlot &ms, RAS_IRasterizer::DrawMode drawmode);
 	bool ActivateMaterial(const MT_Transform& cameratrans, RAS_IRasterizer* rasty,
-		RAS_IRenderTools *rendertools, int &drawmode);
+		RAS_IRenderTools *rendertools, RAS_IRasterizer::DrawMode& drawmode);
 	
 	unsigned int NumMeshSlots();
 	T_MeshSlotList::iterator msBegin();
diff --git a/source/gameengine/Rasterizer/RAS_MeshObject.cpp b/source/gameengine/Rasterizer/RAS_MeshObject.cpp
index e4b654343e7..4420f16c56d 100644
--- a/source/gameengine/Rasterizer/RAS_MeshObject.cpp
+++ b/source/gameengine/Rasterizer/RAS_MeshObject.cpp
@@ -63,11 +63,12 @@ KX_ArrayOptimizer::~KX_ArrayOptimizer()
 
 
 
-RAS_MeshObject::RAS_MeshObject(int lightlayer)
+RAS_MeshObject::RAS_MeshObject(Mesh* mesh, int lightlayer)
 	: m_bModified(true),
 	m_lightlayer(lightlayer),
 	m_zsort(false),
 	m_MeshMod(true),
+	m_mesh(mesh),
 	m_class(0)
 {
 }
@@ -256,27 +257,30 @@ int RAS_MeshObject::FindOrAddVertex(int vtxarray,
 									const MT_Vector4& tangent,
 									const unsigned int rgbacolor,
 									const MT_Vector3& normal,
+									bool flat,
 									RAS_IPolyMaterial* mat,
-									int orgindex)
+									int origindex)
 {
-	KX_ArrayOptimizer* ao = GetArrayOptimizer(mat);//*(m_matVertexArrays[*mat]);
+	KX_ArrayOptimizer* ao = GetArrayOptimizer(mat);
 	
 	int numverts = ao->m_VertexArrayCache1[vtxarray]->size();//m_VertexArrayCount[vtxarray];
-	RAS_TexVert newvert(xyz,uv,uv2,tangent,rgbacolor,normal, 0);
+	RAS_TexVert newvert(xyz,uv,uv2,tangent,rgbacolor,normal, flat? TV_CALCFACENORMAL: 0,origindex);
+
 #define KX_FIND_SHARED_VERTICES
 #ifdef KX_FIND_SHARED_VERTICES
-	
-	for (std::vector<RAS_MatArrayIndex>::iterator it = m_xyz_index_to_vertex_index_mapping[orgindex].begin();
-	     it != m_xyz_index_to_vertex_index_mapping[orgindex].end();
-	     it++)
-	{
-		if ((*it).m_arrayindex1 == ao->m_index1 &&
-			(*it).m_array == vtxarray && 
-			*(*it).m_matid == *mat &&
-			(*ao->m_VertexArrayCache1[vtxarray])[(*it).m_index].closeTo(&newvert)
-			)
+	if(!flat) {
+		for (std::vector<RAS_MatArrayIndex>::iterator it = m_xyz_index_to_vertex_index_mapping[origindex].begin();
+			 it != m_xyz_index_to_vertex_index_mapping[origindex].end();
+			 it++)
 		{
-			return (*it).m_index;
+			if ((*it).m_arrayindex1 == ao->m_index1 &&
+				(*it).m_array == vtxarray && 
+				*(*it).m_matid == *mat &&
+				(*ao->m_VertexArrayCache1[vtxarray])[(*it).m_index].closeTo(&newvert)
+				)
+			{
+				return (*it).m_index;
+			}
 		}
 	}
 #endif // KX_FIND_SHARED_VERTICES
@@ -289,22 +293,18 @@ int RAS_MeshObject::FindOrAddVertex(int vtxarray,
 	idx.m_array = vtxarray;
 	idx.m_index = numverts;
 	idx.m_matid = mat;
-	m_xyz_index_to_vertex_index_mapping[orgindex].push_back(idx); 
+	m_xyz_index_to_vertex_index_mapping[origindex].push_back(idx); 
 	
 	return numverts;
 }
 
-
-
-const vecVertexArray& RAS_MeshObject::GetVertexCache (RAS_IPolyMaterial* mat)
+vecVertexArray& RAS_MeshObject::GetVertexCache (RAS_IPolyMaterial* mat)
 {
-	KX_ArrayOptimizer* ao = GetArrayOptimizer(mat);//*(m_matVertexArrays[*mat]);
+	KX_ArrayOptimizer* ao = GetArrayOptimizer(mat);
 
 	return ao->m_VertexArrayCache1;
 }
 
-
-
 int RAS_MeshObject::GetVertexArrayLength(RAS_IPolyMaterial* mat)
 {
 	int len = 0;
@@ -358,7 +358,7 @@ RAS_TexVert* RAS_MeshObject::GetVertex(unsigned int matid,
 
 const vecIndexArrays& RAS_MeshObject::GetIndexCache (RAS_IPolyMaterial* mat)
 {
-	KX_ArrayOptimizer* ao = GetArrayOptimizer(mat);//*(m_matVertexArrays[*mat]);
+	KX_ArrayOptimizer* ao = GetArrayOptimizer(mat);
 
 	return ao->m_IndexArrayCache1;
 }
@@ -367,16 +367,27 @@ const vecIndexArrays& RAS_MeshObject::GetIndexCache (RAS_IPolyMaterial* mat)
 
 KX_ArrayOptimizer* RAS_MeshObject::GetArrayOptimizer(RAS_IPolyMaterial* polymat)
 {
-	KX_ArrayOptimizer** aop = (m_matVertexArrayS[*polymat]);
+	KX_ArrayOptimizer** aop = m_matVertexArrayS[polymat];
 
-	if (aop)
+	if(aop)
 		return *aop;
 	
+	// didn't find array, but an array might already exist
+	// for a material equal to this one
+	for(int i=0;i<m_matVertexArrayS.size();i++) {
+		RAS_IPolyMaterial *mat = (RAS_IPolyMaterial*)(m_matVertexArrayS.getKey(i)->getValue());
+		if(*mat == *polymat) {
+			m_matVertexArrayS.insert(polymat, *m_matVertexArrayS.at(i));
+			return *m_matVertexArrayS.at(i);
+		}
+	}
+
+	// create new array
 	int numelements = m_matVertexArrayS.size();
 	m_sortedMaterials.push_back(polymat);
-		
+
 	KX_ArrayOptimizer* ao = new KX_ArrayOptimizer(numelements);
-	m_matVertexArrayS.insert(*polymat,ao);
+	m_matVertexArrayS.insert(polymat, ao);
 	
 	return ao;
 }
@@ -459,7 +470,7 @@ RAS_TexVert* RAS_MeshObject::GetVertex(short array,
 									   unsigned int index,
 									   RAS_IPolyMaterial* polymat)
 {
-	 KX_ArrayOptimizer* ao = GetArrayOptimizer(polymat);//*(m_matVertexArrays[*polymat]);
+	 KX_ArrayOptimizer* ao = GetArrayOptimizer(polymat);
 	return &((*(ao->m_VertexArrayCache1)[array])[index]);
 }
 
@@ -467,13 +478,19 @@ RAS_TexVert* RAS_MeshObject::GetVertex(short array,
 
 void RAS_MeshObject::ClearArrayData()
 {
-	for (int i=0;i<m_matVertexArrayS.size();i++)
-	{
+	for (int i=0;i<m_matVertexArrayS.size();i++) {
 		KX_ArrayOptimizer** ao = m_matVertexArrayS.at(i);
-		if (ao)
-		{
-			delete *ao;
+
+		// we have duplicate entries, only free once
+		for(int j=i+1;j<m_matVertexArrayS.size();j++) {
+			if(ao == m_matVertexArrayS.at(j)) {
+				ao = NULL;
+				break;
+			}
 		}
+
+		if (ao)
+			delete *ao;
 	}
 }
 
diff --git a/source/gameengine/Rasterizer/RAS_MeshObject.h b/source/gameengine/Rasterizer/RAS_MeshObject.h
index 89c472cd0d4..0d06748f91f 100644
--- a/source/gameengine/Rasterizer/RAS_MeshObject.h
+++ b/source/gameengine/Rasterizer/RAS_MeshObject.h
@@ -43,6 +43,7 @@
 
 #include "GEN_HashedPtr.h"
 
+struct Mesh;
 /**
  * This class holds an array of vertices and indicies.
  */
@@ -141,12 +142,13 @@ protected:
 	enum { BUCKET_MAX_INDICES = 65535 };//2048};//8192};
 	enum { BUCKET_MAX_TRIANGLES = 65535 };
 	
-	GEN_Map<class RAS_IPolyMaterial,KX_ArrayOptimizer*> m_matVertexArrayS;
+	GEN_Map<GEN_HashedPtr,KX_ArrayOptimizer*> m_matVertexArrayS;
 	
 	RAS_MaterialBucket::Set			m_materials;
+	Mesh*							m_mesh;
 public:
 	// for now, meshes need to be in a certain layer (to avoid sorting on lights in realtime)
-	RAS_MeshObject(int lightlayer);
+	RAS_MeshObject(Mesh* mesh, int lightlayer);
 	virtual ~RAS_MeshObject();
 
 	vector<RAS_IPolyMaterial*>				m_sortedMaterials;
@@ -238,11 +240,12 @@ public:
 							const MT_Vector4& tangent,
 							const unsigned int rgbacolor,
 							const MT_Vector3& normal,
+							bool flat,
 							RAS_IPolyMaterial* mat,
-							int orgindex
+							int origindex
 						);
 	
-	const vecVertexArray&	GetVertexCache (RAS_IPolyMaterial* mat);
+	vecVertexArray&		GetVertexCache (RAS_IPolyMaterial* mat);
 	
 	int					GetVertexArrayLength(RAS_IPolyMaterial* mat);
 
@@ -257,6 +260,7 @@ public:
 
 	bool				MeshModified();
 	void				SetMeshModified(bool v){m_MeshMod = v;}
+	Mesh*				GetMesh() { return m_mesh; }
 
 };
 
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/ARB_multitexture.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/ARB_multitexture.h
deleted file mode 100644
index a2f27ce3361..00000000000
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/ARB_multitexture.h
+++ /dev/null
@@ -1,150 +0,0 @@
-#ifndef __ARB_MULTITEXTURE_H__
-#define __ARB_MULTITEXTURE_H__
-
-/* 
-*/
-
-/* ----------------------------------------------------------------------------
-	GL_ARB_multitexture
----------------------------------------------------------------------------- */
-#ifdef GL_ARB_multitexture
-	#define GL_TEXTURE0_ARB                   0x84C0
-	#define GL_TEXTURE1_ARB                   0x84C1
-	#define GL_TEXTURE2_ARB                   0x84C2
-	#define GL_TEXTURE3_ARB                   0x84C3
-	#define GL_TEXTURE4_ARB                   0x84C4
-	#define GL_TEXTURE5_ARB                   0x84C5
-	#define GL_TEXTURE6_ARB                   0x84C6
-	#define GL_TEXTURE7_ARB                   0x84C7
-	#define GL_TEXTURE8_ARB                   0x84C8
-	#define GL_TEXTURE9_ARB                   0x84C9
-	#define GL_TEXTURE10_ARB                  0x84CA
-	#define GL_ACTIVE_TEXTURE_ARB             0x84E0
-	#define GL_CLIENT_ACTIVE_TEXTURE_ARB      0x84E1
-	#define GL_MAX_TEXTURE_UNITS_ARB          0x84E2
-#endif
-
-
-/* ----------------------------------------------------------------------------
-	GL_ARB_texture_env_combine
----------------------------------------------------------------------------- */
-#ifdef GL_ARB_texture_env_combine
-	#define GL_COMBINE_ARB                    0x8570
-	#define GL_COMBINE_RGB_ARB                0x8571
-	#define GL_COMBINE_ALPHA_ARB              0x8572
-	#define GL_SOURCE0_RGB_ARB                0x8580
-	#define GL_SOURCE1_RGB_ARB                0x8581
-	#define GL_SOURCE2_RGB_ARB                0x8582
-	#define GL_SOURCE0_ALPHA_ARB              0x8588
-	#define GL_SOURCE1_ALPHA_ARB              0x8589
-	#define GL_SOURCE2_ALPHA_ARB              0x858A
-	#define GL_OPERAND0_RGB_ARB               0x8590
-	#define GL_OPERAND1_RGB_ARB               0x8591
-	#define GL_OPERAND2_RGB_ARB               0x8592
-	#define GL_OPERAND0_ALPHA_ARB             0x8598
-	#define GL_OPERAND1_ALPHA_ARB             0x8599
-	#define GL_OPERAND2_ALPHA_ARB             0x859A
-	#define GL_RGB_SCALE_ARB                  0x8573
-	#define GL_ADD_SIGNED_ARB                 0x8574
-	#define GL_INTERPOLATE_ARB                0x8575
-	#define GL_SUBTRACT_ARB                   0x84E7
-	#define GL_CONSTANT_ARB                   0x8576
-	#define GL_PRIMARY_COLOR_ARB              0x8577
-	#define GL_PREVIOUS_ARB                   0x8578
-#endif
-
-/* ----------------------------------------------------------------------------
-	GL_ARB_texture_cube_map
----------------------------------------------------------------------------- */
-#ifdef GL_ARB_texture_cube_map
-	#define GL_NORMAL_MAP_ARB                 0x8511
-	#define GL_REFLECTION_MAP_ARB             0x8512
-	#define GL_TEXTURE_CUBE_MAP_ARB           0x8513
-	#define GL_TEXTURE_BINDING_CUBE_MAP_ARB   0x8514
-	#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x8515
-	#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x8516
-	#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x8517
-	#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x8518
-	#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x8519
-	#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x851A
-	#define GL_PROXY_TEXTURE_CUBE_MAP_ARB     0x851B
-	#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB  0x851C
-#endif
-
-/* ----------------------------------------------------------------------------
-	GL_ARB_shader_objects
----------------------------------------------------------------------------- */
-#ifdef GL_ARB_shader_objects
-	#define GL_PROGRAM_OBJECT_ARB             0x8B40
-	#define GL_SHADER_OBJECT_ARB              0x8B48
-	#define GL_OBJECT_TYPE_ARB                0x8B4E
-	#define GL_OBJECT_SUBTYPE_ARB             0x8B4F
-	#define GL_FLOAT_VEC2_ARB                 0x8B50
-	#define GL_FLOAT_VEC3_ARB                 0x8B51
-	#define GL_FLOAT_VEC4_ARB                 0x8B52
-	#define GL_INT_VEC2_ARB                   0x8B53
-	#define GL_INT_VEC3_ARB                   0x8B54
-	#define GL_INT_VEC4_ARB                   0x8B55
-	#define GL_BOOL_ARB                       0x8B56
-	#define GL_BOOL_VEC2_ARB                  0x8B57
-	#define GL_BOOL_VEC3_ARB                  0x8B58
-	#define GL_BOOL_VEC4_ARB                  0x8B59
-	#define GL_FLOAT_MAT2_ARB                 0x8B5A
-	#define GL_FLOAT_MAT3_ARB                 0x8B5B
-	#define GL_FLOAT_MAT4_ARB                 0x8B5C
-	#define GL_SAMPLER_1D_ARB                 0x8B5D
-	#define GL_SAMPLER_2D_ARB                 0x8B5E
-	#define GL_SAMPLER_3D_ARB                 0x8B5F
-	#define GL_SAMPLER_CUBE_ARB               0x8B60
-	#define GL_SAMPLER_1D_SHADOW_ARB          0x8B61
-	#define GL_SAMPLER_2D_SHADOW_ARB          0x8B62
-	#define GL_SAMPLER_2D_RECT_ARB            0x8B63
-	#define GL_SAMPLER_2D_RECT_SHADOW_ARB     0x8B64
-	#define GL_OBJECT_DELETE_STATUS_ARB       0x8B80
-	#define GL_OBJECT_COMPILE_STATUS_ARB      0x8B81
-	#define GL_OBJECT_LINK_STATUS_ARB         0x8B82
-	#define GL_OBJECT_VALIDATE_STATUS_ARB     0x8B83
-	#define GL_OBJECT_INFO_LOG_LENGTH_ARB     0x8B84
-	#define GL_OBJECT_ATTACHED_OBJECTS_ARB    0x8B85
-	#define GL_OBJECT_ACTIVE_UNIFORMS_ARB     0x8B86
-	#define GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB 0x8B87
-	#define GL_OBJECT_SHADER_SOURCE_LENGTH_ARB 0x8B88
-#endif
-
-/* ----------------------------------------------------------------------------
-	GL_ARB_vertex_shader
----------------------------------------------------------------------------- */
-#ifdef GL_ARB_vertex_shader
-	#define GL_VERTEX_SHADER_ARB              0x8B31
-	#define GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB 0x8B4A
-	#define GL_MAX_VARYING_FLOATS_ARB         0x8B4B
-	#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB 0x8B4C
-	#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB 0x8B4D
-	#define GL_OBJECT_ACTIVE_ATTRIBUTES_ARB   0x8B89
-	#define GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB 0x8B8A
-#endif
-
-
-/* ----------------------------------------------------------------------------
-	GL_ARB_fragment_shader
----------------------------------------------------------------------------- */
-#ifdef GL_ARB_fragment_shader
-	#define GL_FRAGMENT_SHADER_ARB            0x8B30
-	#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB 0x8B49
-	#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB 0x8B8B
-#endif
-
-
-/* ----------------------------------------------------------------------------
-	GL_ARB_depth_texture
----------------------------------------------------------------------------- */
-#ifndef GL_ARB_depth_texture
-	#define GL_DEPTH_COMPONENT16_ARB          0x81A5
-	#define GL_DEPTH_COMPONENT24_ARB          0x81A6
-	#define GL_DEPTH_COMPONENT32_ARB          0x81A7
-	#define GL_TEXTURE_DEPTH_SIZE_ARB         0x884A
-	#define GL_DEPTH_TEXTURE_MODE_ARB         0x884B
-#endif
-
-
-#endif//__ARB_MULTITEXTURE_H__
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
index 5153834899b..2a6d64ecc73 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
@@ -31,6 +31,7 @@ SET(INC
   ../../../../intern/string
   ../../../../intern/moto/include
   ../../../../source/gameengine/Rasterizer
+  ../../../../extern/glew/include
 )
 
 BLENDERLIB(bf_oglrasterizer "${SRC}" "${INC}")
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/EXT_separate_specular_color.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/EXT_separate_specular_color.h
deleted file mode 100644
index 5a9d8f32a87..00000000000
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/EXT_separate_specular_color.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef GL_EXT_separate_specular_color
-#define GL_EXT_separate_specular_color 1
-#define GL_LIGHT_MODEL_COLOR_CONTROL_EXT  0x81F8
-#define GL_SINGLE_COLOR_EXT               0x81F9
-#define GL_SEPARATE_SPECULAR_COLOR_EXT    0x81FA
-#endif
-
-#ifndef GL_VERSION_1_2
-#define GL_LIGHT_MODEL_COLOR_CONTROL      0x81F8
-#define GL_SINGLE_COLOR                   0x81F9
-#define GL_SEPARATE_SPECULAR_COLOR        0x81FA
-#endif
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile
index 1a88c51dc25..f01978b8eb1 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile
@@ -36,6 +36,7 @@ include nan_compile.mk
 
 CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
 
+CPPFLAGS += -I$(NAN_GLEW)/include
 CPPFLAGS += -I$(OPENGL_HEADERS)
 CPPFLAGS += -I$(NAN_STRING)/include    
 CPPFLAGS += -I$(NAN_MOTO)/include
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp
index 81a7ccb7a5d..d241bd1ee31 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp
@@ -25,665 +25,43 @@
  *
  * ***** END GPL LICENSE BLOCK *****
  */
-/*
-  The extension manager's job is to link at runtime OpenGL extension 
-  functions.
 
-  Since the various platform have different methods of finding a fn
-  pointer, this file attempts to encapsulate all that, so it gets a
-  little messy.  Hopefully we can 
-*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifdef WIN32
-#  include <windows.h>
-
-#  include <GL/gl.h>
-
-#elif defined(__APPLE__)
-#  include <Carbon/Carbon.h>
-#  define GL_GLEXT_LEGACY 1
-#  include <OpenGL/gl.h>
-
-#else /* UNIX */
-#  include <GL/gl.h>
-#  include <GL/glx.h>
-
-#  include <dlfcn.h>
-#endif
-
-#include <vector>
 #include <iostream>
-#include <algorithm>
-#include <bitset>
-#include <stdlib.h>
-
-#include "STR_String.h"
 
 #include "RAS_GLExtensionManager.h"
 
-/* -----------------------------------------------------------------------------
-
-   Platform specific functions section.
-   
-   Required Functions:
-   static void bglInitEntryPoints (void)                -- Loads the GL library
-   static void bglDeallocEntryPoints (void)             -- Frees the GL library
-   static void *bglGetProcAddress(const GLubyte* entry) -- Finds the address of
-       the GL function entry
-
-*/
-#if defined(BGL_NO_EXTENSIONS)
-static void bglInitEntryPoints (void) {}
-static void bglDeallocEntryPoints (void) {}
-
-static void *bglGetProcAddress(const GLubyte* entry)
-{
-	/* No Extensions! */
-	return NULL;
-}
-#elif defined(__APPLE__)
-/* http://developer.apple.com/qa/qa2001/qa1188.html */
-CFBundleRef gBundleRefOpenGL = NULL;
-
-// -------------------------
-
-static OSStatus bglInitEntryPoints (void)
-{
-    OSStatus err = noErr;
-    const Str255 frameworkName = "\pOpenGL.framework";
-    FSRefParam fileRefParam;
-    FSRef fileRef;
-    CFURLRef bundleURLOpenGL;
-
-    memset(&fileRefParam, 0, sizeof(fileRefParam));
-    memset(&fileRef, 0, sizeof(fileRef));
-
-    fileRefParam.ioNamePtr  = frameworkName;
-    fileRefParam.newRef = &fileRef;
-
-    // Frameworks directory/folder
-    err = FindFolder (kSystemDomain, kFrameworksFolderType, false,
-                      &fileRefParam.ioVRefNum, (SInt32*)&fileRefParam.ioDirID);
-    if (noErr != err) {
-        DebugStr ((unsigned char *)"\pCould not find frameworks folder");
-        return err;
-    }
-    err = PBMakeFSRefSync (&fileRefParam); // make FSRef for folder
-    if (noErr != err) {
-        DebugStr ((unsigned char *)"\pCould make FSref to frameworks folder");
-        return err;
-    }
-    // create URL to folder
-    bundleURLOpenGL = CFURLCreateFromFSRef (kCFAllocatorDefault,
-                                            &fileRef);
-    if (!bundleURLOpenGL) {
-        DebugStr ((unsigned char *)"\pCould create OpenGL Framework bundle URL");
-        return paramErr;
-    }
-    // create ref to GL's bundle
-    gBundleRefOpenGL = CFBundleCreate (kCFAllocatorDefault,
-                                       bundleURLOpenGL);
-    if (!gBundleRefOpenGL) {
-        DebugStr ((unsigned char *)"\pCould not create OpenGL Framework bundle");
-        return paramErr;
-    }
-    CFRelease (bundleURLOpenGL); // release created bundle
-    // if the code was successfully loaded, look for our function.
-    if (!CFBundleLoadExecutable (gBundleRefOpenGL)) {
-        DebugStr ((unsigned char *)"\pCould not load MachO executable");
-        return paramErr;
-    }
-    return err;
-}
-
-// -------------------------
-
-static void bglDeallocEntryPoints (void)
-{
-    if (gBundleRefOpenGL != NULL) {
-        // unload the bundle's code.
-        CFBundleUnloadExecutable (gBundleRefOpenGL);
-        CFRelease (gBundleRefOpenGL);
-        gBundleRefOpenGL = NULL;
-    }
-}
-
-// -------------------------
-
-/*unused*/
-static void * bglGetProcAddress (const GLubyte * pszProc)
-{
-    if (!gBundleRefOpenGL)
-    	return NULL;
-
-    return CFBundleGetFunctionPointerForName (gBundleRefOpenGL,
-                CFStringCreateWithCStringNoCopy (NULL,
-                     (const char *) pszProc, CFStringGetSystemEncoding (), NULL));
-}
-#elif defined(GLX_ARB_get_proc_address)
-/* Not all glx.h define PFNGLXGETPROCADDRESSARBPROC !
-   We define our own if needed.                         */
-#ifdef HAVE_PFNGLXGETPROCADDRESSARBPROC
-#define PFNBGLXGETPROCADDRESSARBPROC PFNGLXGETPROCADDRESSARBPROC
-#else
-typedef void (*(*PFNBGLXGETPROCADDRESSARBPROC)(const GLubyte *procname))();
-#endif
-
-void *_getProcAddress(const GLubyte *procName) { return NULL; }
-PFNBGLXGETPROCADDRESSARBPROC bglGetProcAddress;
-
-
-//weird bug related to combination of pthreads,libGL and dlopen
-//cannot call dlclose in such environment, causes crashes
-//so try to keep a global handle to libGL
-void* libGL = 0;
-
-static void bglInitEntryPoints (void)
-{
-	Display *dpy = glXGetCurrentDisplay();
-	std::vector<STR_String> Xextensions = STR_String(glXQueryExtensionsString(dpy, DefaultScreen(dpy))).Explode(' ');
-	if (std::find(Xextensions.begin(), Xextensions.end(), "GLX_ARB_get_proc_address") != Xextensions.end()) 
-	{
-		if (!libGL)
-		{
-			libGL = dlopen("libGL.so", RTLD_LAZY|RTLD_GLOBAL);
-			if (libGL)
-				bglGetProcAddress = (PFNBGLXGETPROCADDRESSARBPROC) (dlsym(libGL, "glXGetProcAddressARB"));
-			else
-				std::cout << "Error: " << dlerror() << std::endl;
-
-			// dlclose(libGL);
-			if (!bglGetProcAddress)
-				bglGetProcAddress = (PFNBGLXGETPROCADDRESSARBPROC) _getProcAddress;
-			
-			// --
-			if(!bglGetProcAddress)
-				std::cout << "Error: unable to find _getProcAddress in libGL" << std::endl;
-		}
-	}
-}
-
-static void bglDeallocEntryPoints (void) {}
-
-#elif defined(WIN32)
-static void bglInitEntryPoints (void) {}
-static void bglDeallocEntryPoints (void) {}
-
-#define bglGetProcAddress(entry) wglGetProcAddress((LPCSTR) entry)
-
-#else /* Unknown Platform - disable extensions */
-static void bglInitEntryPoints (void) {}
-static void bglDeallocEntryPoints (void) {}
-
-static void *bglGetProcAddress(const GLubyte* entry)
-{
-	/* No Extensions! */
-	return NULL;
-}
-
-#endif /* End Platform Specific */
-
-/* -----------------------------------------------------------------------------
-
-   GL Extension Manager.
-*/
-	/* Bit array of available extensions */
-static std::bitset<bgl::NUM_EXTENSIONS> enabled_extensions;
-static std::vector<STR_String> extensions;
-static int m_debug;
-	
-static void LinkExtensions();
-
-static void EnableExtension(bgl::ExtensionName name)
-{
-	unsigned int num = (unsigned int) name;
-	if (num < bgl::NUM_EXTENSIONS)
-		enabled_extensions.set(num);
-}
-
-
-static bool QueryExtension(STR_String extension_name)
-{
-	return std::find(extensions.begin(), extensions.end(), extension_name) != extensions.end();
-}
-
 namespace bgl
 {
-
-void InitExtensions(int debug)
-{
-	m_debug = debug;
-	bglInitEntryPoints (); //init bundle
-	EnableExtension(_BGL_TEST);
-	LinkExtensions();
-	bglDeallocEntryPoints();
-}
-
-bool QueryExtension(ExtensionName name)
-{
-	unsigned int num = (unsigned int) name;
-	if (num < NUM_EXTENSIONS)
-		return enabled_extensions[num];
-		 
-	return false;
-}
-
-bool QueryVersion(int major, int minor)
-{
-	static int gl_major = 0;
-	static int gl_minor = 0;
-	
-	if (gl_major == 0)
+	void InitExtensions(bool debug)
 	{
-		const char *gl_version_str = (const char *) glGetString(GL_VERSION);
-		if (!gl_version_str)
-			return false;
-		STR_String gl_version = STR_String(gl_version_str);
-		int i = gl_version.Find('.');
-		gl_major = gl_version.Left(i).ToInt();
-		gl_minor = gl_version.Mid(i+1, gl_version.FindOneOf(". ", i+1) - i - 1).ToInt();
-	
-		static bool doQueryVersion = m_debug;
-		if (doQueryVersion)
-		{
-			doQueryVersion = false;
-			std::cout << "GL_VERSION: " << gl_major << "." << gl_minor << " (" << gl_version << ")" << std::endl;
-		}
-	}
-	
-	if (gl_major > major)
-		return true;
-	
-	if (gl_major == major && gl_minor >= minor)
-		return true;
+		static bool firsttime = true;
 		
-	return false;
-}
+		if(firsttime) {
+			firsttime = false;
 
-
-/*******************************************************************************
-1. Extension function entry points go here
-
-Need to #ifdef (compile time test for extension)
-Add null functions if appropriate
-
-Some extensions have been incorporated into the core GL, eg Multitexture was 
-added in GL v1.1.  If Blender calls one of these functions before they are 
-linked, it will crash.  Even worse, if Blender *indirectly* calls one of these 
-functions, (ie the GL implementation calls them itself) Blender will crash.
-
-We fix this by adding them to the bgl namespace - the functions are now 
-private to the gameengine.  Code can transparently use extensions by adding:
-
-using namespace bgl;
-
-to their source.  Cunning like a weasel.
-
- ******************************************************************************/
-
-#if defined(PFNGLPNTRIANGLESIATIPROC)
-PFNGLPNTRIANGLESIATIPROC glPNTrianglesiATI;
-PFNGLPNTRIANGLESFATIPROC glPNTrianglesfATI;
-#endif
-
-BL_EXTInfo RAS_EXT_support;
-
-#ifdef GL_ARB_multitexture
-int max_texture_units = 2;
-PFNGLACTIVETEXTUREARBPROC blActiveTextureARB;
-PFNGLCLIENTACTIVETEXTUREARBPROC blClientActiveTextureARB;
-PFNGLMULTITEXCOORD1DARBPROC blMultiTexCoord1dARB;
-PFNGLMULTITEXCOORD1DVARBPROC blMultiTexCoord1dvARB;
-PFNGLMULTITEXCOORD1FARBPROC blMultiTexCoord1fARB;
-PFNGLMULTITEXCOORD1FVARBPROC blMultiTexCoord1fvARB;
-PFNGLMULTITEXCOORD1IARBPROC blMultiTexCoord1iARB;
-PFNGLMULTITEXCOORD1IVARBPROC blMultiTexCoord1ivARB;
-PFNGLMULTITEXCOORD1SARBPROC blMultiTexCoord1sARB;
-PFNGLMULTITEXCOORD1SVARBPROC blMultiTexCoord1svARB;
-PFNGLMULTITEXCOORD2DARBPROC blMultiTexCoord2dARB;
-PFNGLMULTITEXCOORD2DVARBPROC blMultiTexCoord2dvARB;
-PFNGLMULTITEXCOORD2FARBPROC blMultiTexCoord2fARB;
-PFNGLMULTITEXCOORD2FVARBPROC blMultiTexCoord2fvARB;
-PFNGLMULTITEXCOORD2IARBPROC blMultiTexCoord2iARB;
-PFNGLMULTITEXCOORD2IVARBPROC blMultiTexCoord2ivARB;
-PFNGLMULTITEXCOORD2SARBPROC blMultiTexCoord2sARB;
-PFNGLMULTITEXCOORD2SVARBPROC blMultiTexCoord2svARB;
-PFNGLMULTITEXCOORD3DARBPROC blMultiTexCoord3dARB;
-PFNGLMULTITEXCOORD3DVARBPROC blMultiTexCoord3dvARB;
-PFNGLMULTITEXCOORD3FARBPROC blMultiTexCoord3fARB;
-PFNGLMULTITEXCOORD3FVARBPROC blMultiTexCoord3fvARB;
-PFNGLMULTITEXCOORD3IARBPROC blMultiTexCoord3iARB;
-PFNGLMULTITEXCOORD3IVARBPROC blMultiTexCoord3ivARB;
-PFNGLMULTITEXCOORD3SARBPROC blMultiTexCoord3sARB;
-PFNGLMULTITEXCOORD3SVARBPROC blMultiTexCoord3svARB;
-PFNGLMULTITEXCOORD4DARBPROC blMultiTexCoord4dARB;
-PFNGLMULTITEXCOORD4DVARBPROC blMultiTexCoord4dvARB;
-PFNGLMULTITEXCOORD4FARBPROC blMultiTexCoord4fARB;
-PFNGLMULTITEXCOORD4FVARBPROC blMultiTexCoord4fvARB;
-PFNGLMULTITEXCOORD4IARBPROC blMultiTexCoord4iARB;
-PFNGLMULTITEXCOORD4IVARBPROC blMultiTexCoord4ivARB;
-PFNGLMULTITEXCOORD4SARBPROC blMultiTexCoord4sARB;
-PFNGLMULTITEXCOORD4SVARBPROC blMultiTexCoord4svARB;
-#endif
-
-#ifdef GL_ARB_shader_objects
- PFNGLDELETEOBJECTARBPROC blDeleteObjectARB;
- PFNGLGETHANDLEARBPROC blGetHandleARB;
- PFNGLDETACHOBJECTARBPROC blDetachObjectARB;
- PFNGLCREATESHADEROBJECTARBPROC blCreateShaderObjectARB;
- PFNGLSHADERSOURCEARBPROC blShaderSourceARB;
- PFNGLCOMPILESHADERARBPROC blCompileShaderARB;
- PFNGLCREATEPROGRAMOBJECTARBPROC blCreateProgramObjectARB;
- PFNGLATTACHOBJECTARBPROC blAttachObjectARB;
- PFNGLLINKPROGRAMARBPROC blLinkProgramARB;
- PFNGLUSEPROGRAMOBJECTARBPROC blUseProgramObjectARB;
- PFNGLVALIDATEPROGRAMARBPROC blValidateProgramARB;
- PFNGLUNIFORM1FARBPROC blUniform1fARB;
- PFNGLUNIFORM2FARBPROC blUniform2fARB;
- PFNGLUNIFORM3FARBPROC blUniform3fARB;
- PFNGLUNIFORM4FARBPROC blUniform4fARB;
- PFNGLUNIFORM1IARBPROC blUniform1iARB;
- PFNGLUNIFORM2IARBPROC blUniform2iARB;
- PFNGLUNIFORM3IARBPROC blUniform3iARB;
- PFNGLUNIFORM4IARBPROC blUniform4iARB;
- PFNGLUNIFORM1FVARBPROC blUniform1fvARB;
- PFNGLUNIFORM2FVARBPROC blUniform2fvARB;
- PFNGLUNIFORM3FVARBPROC blUniform3fvARB;
- PFNGLUNIFORM4FVARBPROC blUniform4fvARB;
- PFNGLUNIFORM1IVARBPROC blUniform1ivARB;
- PFNGLUNIFORM2IVARBPROC blUniform2ivARB;
- PFNGLUNIFORM3IVARBPROC blUniform3ivARB;
- PFNGLUNIFORM4IVARBPROC blUniform4ivARB;
- PFNGLUNIFORMMATRIX2FVARBPROC blUniformMatrix2fvARB;
- PFNGLUNIFORMMATRIX3FVARBPROC blUniformMatrix3fvARB;
- PFNGLUNIFORMMATRIX4FVARBPROC blUniformMatrix4fvARB;
- PFNGLGETOBJECTPARAMETERFVARBPROC blGetObjectParameterfvARB;
- PFNGLGETOBJECTPARAMETERIVARBPROC blGetObjectParameterivARB;
- PFNGLGETINFOLOGARBPROC blGetInfoLogARB;
- PFNGLGETATTACHEDOBJECTSARBPROC blGetAttachedObjectsARB;
- PFNGLGETUNIFORMLOCATIONARBPROC blGetUniformLocationARB;
- PFNGLGETACTIVEUNIFORMARBPROC blGetActiveUniformARB;
- PFNGLGETUNIFORMFVARBPROC blGetUniformfvARB;
- PFNGLGETUNIFORMIVARBPROC blGetUniformivARB;
- PFNGLGETSHADERSOURCEARBPROC blGetShaderSourceARB;
-#endif
-
-#ifdef GL_ARB_vertex_shader
-PFNGLBINDATTRIBLOCATIONARBPROC blBindAttribLocationARB;
-PFNGLGETACTIVEATTRIBARBPROC blGetActiveAttribARB;
-PFNGLGETATTRIBLOCATIONARBPROC blGetAttribLocationARB;
-#endif
-
-#ifdef GL_ARB_vertex_program
- PFNGLVERTEXATTRIB1FARBPROC blVertexAttrib1fARB;
- PFNGLVERTEXATTRIB1FVARBPROC blVertexAttrib1fvARB;
- PFNGLVERTEXATTRIB2FARBPROC blVertexAttrib2fARB;
- PFNGLVERTEXATTRIB2FVARBPROC blVertexAttrib2fvARB;
- PFNGLVERTEXATTRIB3FARBPROC blVertexAttrib3fARB;
- PFNGLVERTEXATTRIB3FVARBPROC blVertexAttrib3fvARB;
- PFNGLVERTEXATTRIB4FARBPROC blVertexAttrib4fARB;
- PFNGLVERTEXATTRIB4FVARBPROC blVertexAttrib4fvARB;
- PFNGLGETPROGRAMSTRINGARBPROC blGetProgramStringARB;
- PFNGLGETVERTEXATTRIBDVARBPROC blGetVertexAttribdvARB;
- PFNGLGETVERTEXATTRIBFVARBPROC blGetVertexAttribfvARB;
- PFNGLGETVERTEXATTRIBIVARBPROC blGetVertexAttribivARB;
-#endif
-
- /*
-#ifdef GL_EXT_compiled_vertex_array
- PFNGLLOCKARRAYSEXTPROC blLockArraysEXT;
- PFNGLUNLOCKARRAYSEXTPROC blUnlockArraysEXT;
-#endif
-*/
-
-} // namespace bgl
-
-using namespace bgl;
-/*******************************************************************************
-2. Query extension functions here
-
-Need to #ifdef (compile time test for extension)
-Use QueryExtension("GL_EXT_name") to test at runtime.
-Use bglGetProcAddress to find entry point
-Use EnableExtension(_GL_EXT_...) to allow Blender to use the extension.
-
- ******************************************************************************/
-static void LinkExtensions()
-{
-	static bool doDebugMessages = m_debug;
-	extensions = STR_String((const char *) glGetString(GL_EXTENSIONS)).Explode(' ');
-	RAS_EXT_support = BL_EXTInfo();
-
-#if defined(PFNGLPNTRIANGLESIATIPROC)
-	if (QueryExtension("GL_ATI_pn_triangles"))
-	{
-		glPNTrianglesiATI = reinterpret_cast<PFNGLPNTRIANGLESIATIPROC>(bglGetProcAddress((const GLubyte *) "glPNTrianglesiATI"));
-		glPNTrianglesfATI = reinterpret_cast<PFNGLPNTRIANGLESFATIPROC>(bglGetProcAddress((const GLubyte *) "glPNTrianglesfATI"));
-		if (glPNTrianglesiATI && glPNTrianglesfATI) {
-			EnableExtension(_GL_ATI_pn_triangles);
-			if (doDebugMessages)
-				std::cout << "Enabled GL_ATI_pn_triangles" << std::endl;
-		} else {
-			std::cout << "ERROR: GL_ATI_pn_triangles implementation is broken!" << std::endl;
-		}
-	}
-#endif
-
-#ifdef GL_ARB_texture_env_combine
-	if (QueryExtension("GL_ARB_texture_env_combine"))
-	{
-		EnableExtension(_GL_ARB_texture_env_combine);
-		RAS_EXT_support._ARB_texture_env_combine = 1;
-		if (doDebugMessages)
-		{
-			std::cout << "Detected GL_ARB_texture_env_combine" << std::endl;
-		}
-	}
-#endif
-
-#ifdef GL_ARB_texture_cube_map
-	if (QueryExtension("GL_ARB_texture_cube_map"))
-	{
-		EnableExtension(_GL_ARB_texture_cube_map);
-		RAS_EXT_support._ARB_texture_cube_map = 1;
-		if (doDebugMessages)
-			std::cout << "Detected GL_ARB_texture_cube_map" << std::endl;
-	}
-#endif
-
-#if defined(GL_ARB_multitexture) && defined(WITH_GLEXT)
-	if (!getenv("WITHOUT_GLEXT")) {
-		if (QueryExtension("GL_ARB_multitexture")) {
-			bgl::blActiveTextureARB = reinterpret_cast<PFNGLACTIVETEXTUREARBPROC>(bglGetProcAddress((const GLubyte *) "glActiveTextureARB"));
-			bgl::blClientActiveTextureARB = reinterpret_cast<PFNGLCLIENTACTIVETEXTUREARBPROC>(bglGetProcAddress((const GLubyte *) "glClientActiveTextureARB"));
-			bgl::blMultiTexCoord1dARB = reinterpret_cast<PFNGLMULTITEXCOORD1DARBPROC>(bglGetProcAddress((const GLubyte *) "glMultiTexCoord1dARB"));
-			bgl::blMultiTexCoord1dvARB = reinterpret_cast<PFNGLMULTITEXCOORD1DVARBPROC>(bglGetProcAddress((const GLubyte *) "glMultiTexCoord1dvARB"));
-			bgl::blMultiTexCoord1fARB = reinterpret_cast<PFNGLMULTITEXCOORD1FARBPROC>(bglGetProcAddress((const GLubyte *) "glMultiTexCoord1fARB"));
-			bgl::blMultiTexCoord1fvARB = reinterpret_cast<PFNGLMULTITEXCOORD1FVARBPROC>(bglGetProcAddress((const GLubyte *) "glMultiTexCoord1fvARB"));
-			bgl::blMultiTexCoord1iARB = reinterpret_cast<PFNGLMULTITEXCOORD1IARBPROC>(bglGetProcAddress((const GLubyte *) "glMultiTexCoord1iARB"));
-			bgl::blMultiTexCoord1ivARB = reinterpret_cast<PFNGLMULTITEXCOORD1IVARBPROC>(bglGetProcAddress((const GLubyte *) "glMultiTexCoord1ivARB"));
-			bgl::blMultiTexCoord1sARB = reinterpret_cast<PFNGLMULTITEXCOORD1SARBPROC>(bglGetProcAddress((const GLubyte *) "glMultiTexCoord1sARB"));
-			bgl::blMultiTexCoord1svARB = reinterpret_cast<PFNGLMULTITEXCOORD1SVARBPROC>(bglGetProcAddress((const GLubyte *) "glMultiTexCoord1svARB"));
-			bgl::blMultiTexCoord2dARB = reinterpret_cast<PFNGLMULTITEXCOORD2DARBPROC>(bglGetProcAddress((const GLubyte *) "glMultiTexCoord2dARB"));
-			bgl::blMultiTexCoord2dvARB = reinterpret_cast<PFNGLMULTITEXCOORD2DVARBPROC>(bglGetProcAddress((const GLubyte *) "glMultiTexCoord2dvARB"));
-			bgl::blMultiTexCoord2fARB = reinterpret_cast<PFNGLMULTITEXCOORD2FARBPROC>(bglGetProcAddress((const GLubyte *) "glMultiTexCoord2fARB"));
-			bgl::blMultiTexCoord2fvARB = reinterpret_cast<PFNGLMULTITEXCOORD2FVARBPROC>(bglGetProcAddress((const GLubyte *) "glMultiTexCoord2fvARB"));
-			bgl::blMultiTexCoord2iARB = reinterpret_cast<PFNGLMULTITEXCOORD2IARBPROC>(bglGetProcAddress((const GLubyte *) "glMultiTexCoord2iARB"));
-			bgl::blMultiTexCoord2ivARB = reinterpret_cast<PFNGLMULTITEXCOORD2IVARBPROC>(bglGetProcAddress((const GLubyte *) "glMultiTexCoord2ivARB"));
-			bgl::blMultiTexCoord2sARB = reinterpret_cast<PFNGLMULTITEXCOORD2SARBPROC>(bglGetProcAddress((const GLubyte *) "glMultiTexCoord2sARB"));
-			bgl::blMultiTexCoord2svARB = reinterpret_cast<PFNGLMULTITEXCOORD2SVARBPROC>(bglGetProcAddress((const GLubyte *) "glMultiTexCoord2svARB"));
-			bgl::blMultiTexCoord3dARB = reinterpret_cast<PFNGLMULTITEXCOORD3DARBPROC>(bglGetProcAddress((const GLubyte *) "glMultiTexCoord3dARB"));
-			bgl::blMultiTexCoord3dvARB = reinterpret_cast<PFNGLMULTITEXCOORD3DVARBPROC>(bglGetProcAddress((const GLubyte *) "glMultiTexCoord3dvARB"));
-			bgl::blMultiTexCoord3fARB = reinterpret_cast<PFNGLMULTITEXCOORD3FARBPROC>(bglGetProcAddress((const GLubyte *) "glMultiTexCoord3fARB"));
-			bgl::blMultiTexCoord3fvARB = reinterpret_cast<PFNGLMULTITEXCOORD3FVARBPROC>(bglGetProcAddress((const GLubyte *) "glMultiTexCoord3fvARB"));
-			bgl::blMultiTexCoord3iARB = reinterpret_cast<PFNGLMULTITEXCOORD3IARBPROC>(bglGetProcAddress((const GLubyte *) "glMultiTexCoord3iARB"));
-			bgl::blMultiTexCoord3ivARB = reinterpret_cast<PFNGLMULTITEXCOORD3IVARBPROC>(bglGetProcAddress((const GLubyte *) "glMultiTexCoord3ivARB"));
-			bgl::blMultiTexCoord3sARB = reinterpret_cast<PFNGLMULTITEXCOORD3SARBPROC>(bglGetProcAddress((const GLubyte *) "glMultiTexCoord3sARB"));
-			bgl::blMultiTexCoord3svARB = reinterpret_cast<PFNGLMULTITEXCOORD3SVARBPROC>(bglGetProcAddress((const GLubyte *) "glMultiTexCoord3svARB"));
-			bgl::blMultiTexCoord4dARB = reinterpret_cast<PFNGLMULTITEXCOORD4DARBPROC>(bglGetProcAddress((const GLubyte *) "glMultiTexCoord4dARB"));
-			bgl::blMultiTexCoord4dvARB = reinterpret_cast<PFNGLMULTITEXCOORD4DVARBPROC>(bglGetProcAddress((const GLubyte *) "glMultiTexCoord4dvARB"));
-			bgl::blMultiTexCoord4fARB = reinterpret_cast<PFNGLMULTITEXCOORD4FARBPROC>(bglGetProcAddress((const GLubyte *) "glMultiTexCoord4fARB"));
-			bgl::blMultiTexCoord4fvARB = reinterpret_cast<PFNGLMULTITEXCOORD4FVARBPROC>(bglGetProcAddress((const GLubyte *) "glMultiTexCoord4fvARB"));
-			bgl::blMultiTexCoord4iARB = reinterpret_cast<PFNGLMULTITEXCOORD4IARBPROC>(bglGetProcAddress((const GLubyte *) "glMultiTexCoord4iARB"));
-			bgl::blMultiTexCoord4ivARB = reinterpret_cast<PFNGLMULTITEXCOORD4IVARBPROC>(bglGetProcAddress((const GLubyte *) "glMultiTexCoord4ivARB"));
-			bgl::blMultiTexCoord4sARB = reinterpret_cast<PFNGLMULTITEXCOORD4SARBPROC>(bglGetProcAddress((const GLubyte *) "glMultiTexCoord4sARB"));
-			bgl::blMultiTexCoord4svARB = reinterpret_cast<PFNGLMULTITEXCOORD4SVARBPROC>(bglGetProcAddress((const GLubyte *) "glMultiTexCoord4svARB"));
-			if (bgl::blActiveTextureARB && bgl::blClientActiveTextureARB && bgl::blMultiTexCoord1dARB && bgl::blMultiTexCoord1dvARB && bgl::blMultiTexCoord1fARB && bgl::blMultiTexCoord1fvARB && bgl::blMultiTexCoord1iARB && bgl::blMultiTexCoord1ivARB && bgl::blMultiTexCoord1sARB && bgl::blMultiTexCoord1svARB && bgl::blMultiTexCoord2dARB && bgl::blMultiTexCoord2dvARB && bgl::blMultiTexCoord2fARB && bgl::blMultiTexCoord2fvARB && bgl::blMultiTexCoord2iARB && bgl::blMultiTexCoord2ivARB && bgl::blMultiTexCoord2sARB && bgl::blMultiTexCoord2svARB && bgl::blMultiTexCoord3dARB && bgl::blMultiTexCoord3dvARB && bgl::blMultiTexCoord3fARB && bgl::blMultiTexCoord3fvARB && bgl::blMultiTexCoord3iARB && bgl::blMultiTexCoord3ivARB && bgl::blMultiTexCoord3sARB && bgl::blMultiTexCoord3svARB && bgl::blMultiTexCoord4dARB && bgl::blMultiTexCoord4dvARB && bgl::blMultiTexCoord4fARB && bgl::blMultiTexCoord4fvARB && bgl::blMultiTexCoord4iARB && bgl::blMultiTexCoord4ivARB && bgl::blMultiTexCoord4sARB && bgl::blMultiTexCoord4svARB) {
-				EnableExtension(_GL_ARB_multitexture);
-				RAS_EXT_support._ARB_multitexture = 1;
-				if (doDebugMessages)
-					std::cout << "Enabled GL_ARB_multitexture" << std::endl;
-			} else {
-				std::cout << "ERROR: GL_ARB_multitexture implementation is broken!" << std::endl;
+			if(debug) {
+				if(GLEW_ATI_pn_triangles)
+					std::cout << "Enabled GL_ATI_pn_triangles" << std::endl;
+				if(GLEW_ARB_texture_env_combine)
+					std::cout << "Detected GL_ARB_texture_env_combine" << std::endl;
+				if(GLEW_ARB_texture_cube_map)
+					std::cout << "Detected GL_ARB_texture_cube_map" << std::endl;
+				if(GLEW_ARB_multitexture)
+					std::cout << "Detected GL_ARB_multitexture" << std::endl;
+				if(GLEW_ARB_shader_objects)
+					std::cout << "Detected GL_ARB_shader_objects" << std::endl;
+				if(GLEW_ARB_vertex_shader)
+					std::cout << "Detected GL_ARB_vertex_shader" << std::endl;
+				if(GLEW_ARB_fragment_shader)
+					std::cout << "Detected GL_ARB_fragment_shader" << std::endl;
+				if(GLEW_ARB_vertex_program)
+					std::cout << "Detected GL_ARB_vertex_program" << std::endl;
+				if(GLEW_ARB_depth_texture)
+					std::cout << "Detected GL_ARB_depth_texture" << std::endl;
+				if(GLEW_EXT_separate_specular_color)
+					std::cout << "Detected GL_EXT_separate_specular_color" << std::endl;
 			}
 		}
 	}
-#endif
-
-#if GL_ARB_shader_objects
-	if (QueryExtension("GL_ARB_shader_objects"))
-	{
-		bgl::blDeleteObjectARB = reinterpret_cast<PFNGLDELETEOBJECTARBPROC>(bglGetProcAddress((const GLubyte *) "glDeleteObjectARB"));
-		bgl::blGetHandleARB = reinterpret_cast<PFNGLGETHANDLEARBPROC>(bglGetProcAddress((const GLubyte *) "glGetHandleARB"));
-		bgl::blDetachObjectARB = reinterpret_cast<PFNGLDETACHOBJECTARBPROC>(bglGetProcAddress((const GLubyte *) "glDetachObjectARB"));
-		bgl::blCreateShaderObjectARB = reinterpret_cast<PFNGLCREATESHADEROBJECTARBPROC>(bglGetProcAddress((const GLubyte *) "glCreateShaderObjectARB"));
-		bgl::blShaderSourceARB = reinterpret_cast<PFNGLSHADERSOURCEARBPROC>(bglGetProcAddress((const GLubyte *) "glShaderSourceARB"));
-		bgl::blCompileShaderARB = reinterpret_cast<PFNGLCOMPILESHADERARBPROC>(bglGetProcAddress((const GLubyte *) "glCompileShaderARB"));
-		bgl::blCreateProgramObjectARB = reinterpret_cast<PFNGLCREATEPROGRAMOBJECTARBPROC>(bglGetProcAddress((const GLubyte *) "glCreateProgramObjectARB"));
-		bgl::blAttachObjectARB = reinterpret_cast<PFNGLATTACHOBJECTARBPROC>(bglGetProcAddress((const GLubyte *) "glAttachObjectARB"));
-		bgl::blLinkProgramARB = reinterpret_cast<PFNGLLINKPROGRAMARBPROC>(bglGetProcAddress((const GLubyte *) "glLinkProgramARB"));
-		bgl::blUseProgramObjectARB = reinterpret_cast<PFNGLUSEPROGRAMOBJECTARBPROC>(bglGetProcAddress((const GLubyte *) "glUseProgramObjectARB"));
-		bgl::blValidateProgramARB = reinterpret_cast<PFNGLVALIDATEPROGRAMARBPROC>(bglGetProcAddress((const GLubyte *) "glValidateProgramARB"));
-		bgl::blUniform1fARB = reinterpret_cast<PFNGLUNIFORM1FARBPROC>(bglGetProcAddress((const GLubyte *) "glUniform1fARB"));
-		bgl::blUniform2fARB = reinterpret_cast<PFNGLUNIFORM2FARBPROC>(bglGetProcAddress((const GLubyte *) "glUniform2fARB"));
-		bgl::blUniform3fARB = reinterpret_cast<PFNGLUNIFORM3FARBPROC>(bglGetProcAddress((const GLubyte *) "glUniform3fARB"));
-		bgl::blUniform4fARB = reinterpret_cast<PFNGLUNIFORM4FARBPROC>(bglGetProcAddress((const GLubyte *) "glUniform4fARB"));
-		bgl::blUniform1iARB = reinterpret_cast<PFNGLUNIFORM1IARBPROC>(bglGetProcAddress((const GLubyte *) "glUniform1iARB"));
-		bgl::blUniform2iARB = reinterpret_cast<PFNGLUNIFORM2IARBPROC>(bglGetProcAddress((const GLubyte *) "glUniform2iARB"));
-		bgl::blUniform3iARB = reinterpret_cast<PFNGLUNIFORM3IARBPROC>(bglGetProcAddress((const GLubyte *) "glUniform3iARB"));
-		bgl::blUniform4iARB = reinterpret_cast<PFNGLUNIFORM4IARBPROC>(bglGetProcAddress((const GLubyte *) "glUniform4iARB"));
-		bgl::blUniform1fvARB = reinterpret_cast<PFNGLUNIFORM1FVARBPROC>(bglGetProcAddress((const GLubyte *) "glUniform1fvARB"));
-		bgl::blUniform2fvARB = reinterpret_cast<PFNGLUNIFORM2FVARBPROC>(bglGetProcAddress((const GLubyte *) "glUniform2fvARB"));
-		bgl::blUniform3fvARB = reinterpret_cast<PFNGLUNIFORM3FVARBPROC>(bglGetProcAddress((const GLubyte *) "glUniform3fvARB"));
-		bgl::blUniform4fvARB = reinterpret_cast<PFNGLUNIFORM4FVARBPROC>(bglGetProcAddress((const GLubyte *) "glUniform4fvARB"));
-		bgl::blUniform1ivARB = reinterpret_cast<PFNGLUNIFORM1IVARBPROC>(bglGetProcAddress((const GLubyte *) "glUniform1ivARB"));
-		bgl::blUniform2ivARB = reinterpret_cast<PFNGLUNIFORM2IVARBPROC>(bglGetProcAddress((const GLubyte *) "glUniform2ivARB"));
-		bgl::blUniform3ivARB = reinterpret_cast<PFNGLUNIFORM3IVARBPROC>(bglGetProcAddress((const GLubyte *) "glUniform3ivARB"));
-		bgl::blUniform4ivARB = reinterpret_cast<PFNGLUNIFORM4IVARBPROC>(bglGetProcAddress((const GLubyte *) "glUniform4ivARB"));
-		bgl::blUniformMatrix2fvARB = reinterpret_cast<PFNGLUNIFORMMATRIX2FVARBPROC>(bglGetProcAddress((const GLubyte *) "glUniformMatrix2fvARB"));
-		bgl::blUniformMatrix3fvARB = reinterpret_cast<PFNGLUNIFORMMATRIX3FVARBPROC>(bglGetProcAddress((const GLubyte *) "glUniformMatrix3fvARB"));
-		bgl::blUniformMatrix4fvARB = reinterpret_cast<PFNGLUNIFORMMATRIX4FVARBPROC>(bglGetProcAddress((const GLubyte *) "glUniformMatrix4fvARB"));
-		bgl::blGetObjectParameterfvARB = reinterpret_cast<PFNGLGETOBJECTPARAMETERFVARBPROC>(bglGetProcAddress((const GLubyte *) "glGetObjectParameterfvARB"));
-		bgl::blGetObjectParameterivARB = reinterpret_cast<PFNGLGETOBJECTPARAMETERIVARBPROC>(bglGetProcAddress((const GLubyte *) "glGetObjectParameterivARB"));
-		bgl::blGetInfoLogARB = reinterpret_cast<PFNGLGETINFOLOGARBPROC>(bglGetProcAddress((const GLubyte *) "glGetInfoLogARB"));
-		bgl::blGetAttachedObjectsARB = reinterpret_cast<PFNGLGETATTACHEDOBJECTSARBPROC>(bglGetProcAddress((const GLubyte *) "glGetAttachedObjectsARB"));
-		bgl::blGetUniformLocationARB = reinterpret_cast<PFNGLGETUNIFORMLOCATIONARBPROC>(bglGetProcAddress((const GLubyte *) "glGetUniformLocationARB"));
-		bgl::blGetActiveUniformARB = reinterpret_cast<PFNGLGETACTIVEUNIFORMARBPROC>(bglGetProcAddress((const GLubyte *) "glGetActiveUniformARB"));
-		bgl::blGetUniformfvARB = reinterpret_cast<PFNGLGETUNIFORMFVARBPROC>(bglGetProcAddress((const GLubyte *) "glGetUniformfvARB"));
-		bgl::blGetUniformivARB = reinterpret_cast<PFNGLGETUNIFORMIVARBPROC>(bglGetProcAddress((const GLubyte *) "glGetUniformivARB"));
-		bgl::blGetShaderSourceARB = reinterpret_cast<PFNGLGETSHADERSOURCEARBPROC>(bglGetProcAddress((const GLubyte *) "glGetShaderSourceARB"));
-		if (bgl::blDeleteObjectARB && bgl::blGetHandleARB && bgl::blDetachObjectARB && bgl::blCreateShaderObjectARB && bgl::blShaderSourceARB && bgl::blCompileShaderARB && bgl::blCreateProgramObjectARB && bgl::blAttachObjectARB && bgl::blLinkProgramARB && bgl::blUseProgramObjectARB && bgl::blValidateProgramARB && bgl::blUniform1fARB && bgl::blUniform2fARB && bgl::blUniform3fARB && bgl::blUniform4fARB && bgl::blUniform1iARB && bgl::blUniform2iARB && bgl::blUniform3iARB && bgl::blUniform4iARB && bgl::blUniform1fvARB && bgl::blUniform2fvARB && bgl::blUniform3fvARB && bgl::blUniform4fvARB && bgl::blUniform1ivARB && bgl::blUniform2ivARB && bgl::blUniform3ivARB && bgl::blUniform4ivARB && bgl::blUniformMatrix2fvARB && bgl::blUniformMatrix3fvARB && bgl::blUniformMatrix4fvARB && bgl::blGetObjectParameterfvARB && bgl::blGetObjectParameterivARB && bgl::blGetInfoLogARB && bgl::blGetAttachedObjectsARB && bgl::blGetUniformLocationARB && bgl::blGetActiveUniformARB && bgl::blGetUniformfvARB && bgl::blGetUniformivARB && bgl::blGetShaderSourceARB) {
-			EnableExtension(_GL_ARB_shader_objects);
-			RAS_EXT_support._ARB_shader_objects =1;
-			if (doDebugMessages)
-				std::cout << "Enabled GL_ARB_shader_objects" << std::endl;
-		} else {
-			std::cout << "ERROR: GL_ARB_shader_objects implementation is broken!" << std::endl;
-		}
-	}
-#endif
-
-#if GL_ARB_vertex_shader
-	if (QueryExtension("GL_ARB_vertex_shader"))
-	{
-		bgl::blBindAttribLocationARB = reinterpret_cast<PFNGLBINDATTRIBLOCATIONARBPROC>(bglGetProcAddress((const GLubyte *) "glBindAttribLocationARB"));
-		bgl::blGetActiveAttribARB = reinterpret_cast<PFNGLGETACTIVEATTRIBARBPROC>(bglGetProcAddress((const GLubyte *) "glGetActiveAttribARB"));
-		bgl::blGetAttribLocationARB = reinterpret_cast<PFNGLGETATTRIBLOCATIONARBPROC>(bglGetProcAddress((const GLubyte *) "glGetAttribLocationARB"));
-		if (bgl::blBindAttribLocationARB && bgl::blGetActiveAttribARB && bgl::blGetAttribLocationARB) {
-			EnableExtension(_GL_ARB_vertex_shader);
-			RAS_EXT_support._ARB_vertex_shader = 1;
-			if (doDebugMessages)
-				std::cout << "Enabled GL_ARB_vertex_shader" << std::endl;
-		} else {
-			std::cout << "ERROR: GL_ARB_vertex_shader implementation is broken!" << std::endl;
-		}
-	}
-#endif
-
-#ifdef GL_ARB_fragment_shader
-	if (QueryExtension("GL_ARB_fragment_shader"))
-	{
-		EnableExtension(_GL_ARB_fragment_shader);
-		RAS_EXT_support._ARB_fragment_shader = 1;
-		if (doDebugMessages)
-			std::cout << "Detected GL_ARB_fragment_shader" << std::endl;
-	}
-#endif
-
-#if defined(GL_ARB_vertex_program)
-	if (QueryExtension("GL_ARB_vertex_program"))
-	{
-		bgl::blVertexAttrib1fARB = reinterpret_cast<PFNGLVERTEXATTRIB1FARBPROC>(bglGetProcAddress((const GLubyte *) "glVertexAttrib1fARB"));
-		bgl::blVertexAttrib1fvARB = reinterpret_cast<PFNGLVERTEXATTRIB1FVARBPROC>(bglGetProcAddress((const GLubyte *) "glVertexAttrib1fvARB"));
-		bgl::blVertexAttrib2fARB = reinterpret_cast<PFNGLVERTEXATTRIB2FARBPROC>(bglGetProcAddress((const GLubyte *) "glVertexAttrib2fARB"));
-		bgl::blVertexAttrib2fvARB = reinterpret_cast<PFNGLVERTEXATTRIB2FVARBPROC>(bglGetProcAddress((const GLubyte *) "glVertexAttrib2fvARB"));
-		bgl::blVertexAttrib3fARB = reinterpret_cast<PFNGLVERTEXATTRIB3FARBPROC>(bglGetProcAddress((const GLubyte *) "glVertexAttrib3fARB"));
-		bgl::blVertexAttrib3fvARB = reinterpret_cast<PFNGLVERTEXATTRIB3FVARBPROC>(bglGetProcAddress((const GLubyte *) "glVertexAttrib3fvARB"));
-		bgl::blVertexAttrib4fARB = reinterpret_cast<PFNGLVERTEXATTRIB4FARBPROC>(bglGetProcAddress((const GLubyte *) "glVertexAttrib4fARB"));
-		bgl::blVertexAttrib4fvARB = reinterpret_cast<PFNGLVERTEXATTRIB4FVARBPROC>(bglGetProcAddress((const GLubyte *) "glVertexAttrib4fvARB"));
-		bgl::blGetVertexAttribdvARB = reinterpret_cast<PFNGLGETVERTEXATTRIBDVARBPROC>(bglGetProcAddress((const GLubyte *) "glGetVertexAttribdvARB"));
-		bgl::blGetVertexAttribfvARB = reinterpret_cast<PFNGLGETVERTEXATTRIBFVARBPROC>(bglGetProcAddress((const GLubyte *) "glGetVertexAttribfvARB"));
-		bgl::blGetVertexAttribivARB = reinterpret_cast<PFNGLGETVERTEXATTRIBIVARBPROC>(bglGetProcAddress((const GLubyte *) "glGetVertexAttribivARB"));
-		if (bgl::blVertexAttrib1fARB && bgl::blVertexAttrib1fvARB && bgl::blVertexAttrib2fARB && bgl::blVertexAttrib2fvARB && bgl::blVertexAttrib3fARB && bgl::blVertexAttrib3fvARB && bgl::blGetVertexAttribdvARB) {
-			EnableExtension(_GL_ARB_vertex_program);
-			RAS_EXT_support._ARB_vertex_program = 1;
-			if (doDebugMessages)
-				std::cout << "Enabled GL_ARB_vertex_program" << std::endl;
-		} else {
-			std::cout << "ERROR: GL_ARB_vertex_program implementation is broken!" << std::endl;
-		}
-	}
-#endif
-
-
-#ifdef GL_ARB_depth_texture
-	if (QueryExtension("GL_ARB_depth_texture"))
-	{
-		EnableExtension(_GL_ARB_depth_texture);
-		RAS_EXT_support._ARB_depth_texture = 1;
-		if (doDebugMessages)
-		{
-			std::cout << "Detected GL_ARB_depth_texture" << std::endl;
-		}
-	}
-#endif
-/*
-#ifdef GL_EXT_compiled_vertex_array
-	if (QueryExtension("GL_EXT_compiled_vertex_array"))
-	{
-		blLockArraysEXT = reinterpret_cast<PFNGLLOCKARRAYSEXTPROC>(bglGetProcAddress((const GLubyte *) "glLockArraysEXT"));
-		blUnlockArraysEXT = reinterpret_cast<PFNGLUNLOCKARRAYSEXTPROC>(bglGetProcAddress((const GLubyte *) "glUnlockArraysEXT"));
-		if (blLockArraysEXT && blUnlockArraysEXT) {
-			EnableExtension(_GL_EXT_compiled_vertex_array);
-			RAS_EXT_support._EXT_compiled_vertex_array = 1;
-			if (doDebugMessages)
-				std::cout << "Enabled GL_EXT_compiled_vertex_array" << std::endl;
-		} else {
-			std::cout << "ERROR: GL_EXT_compiled_vertex_array implementation is broken!" << std::endl;
-		}
-	}
-#endif
-*/
-	if (QueryExtension("GL_EXT_separate_specular_color"))
-	{
-			EnableExtension(_GL_EXT_separate_specular_color);
-			if (doDebugMessages)
-					std::cout << "Detected GL_EXT_separate_specular_color" << std::endl;
-	}
-
-	doDebugMessages = false;
-}
+} // namespace bgl
 
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h
index 3e24ee204a1..2265becbdad 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h
@@ -29,513 +29,14 @@
 #ifndef __RAS_GLEXTENSIONMANAGER_H__
 #define __RAS_GLEXTENSIONMANAGER_H__
 
+#include "GL/glew.h"
 
-#ifdef WIN32
-#  include <windows.h>
-#  include <GL/gl.h>
+/* Note: this used to have a lot more code, but now extension handling
+ * is done by GLEW, so it does mostly debug stuff */
 
-#elif defined(__APPLE__)
-#  define GL_GLEXT_LEGACY 1
-#  include <OpenGL/gl.h>
-#  include <OpenGL/glu.h>
-
-#else /* UNIX */
-#  define __glext_h_
-#  include <GL/gl.h>
-#  include <GL/glx.h>
-#  undef GL_ARB_multitexture // (ubuntu)
-#  undef __glext_h_
-#endif
-
-#ifdef WITH_GLEXT
-#ifdef WIN32
-#  include <GL/glext.h>
-#elif defined(__APPLE__)
-#  include "mac_compat_glext.h"
-#  include <OpenGL/glext.h>
-#else
-#  include <GL/glext.h>
-#endif
-#endif
-
-#ifdef __sgi
-#  undef GL_ARB_vertex_program
-#endif
-
-#include "EXT_separate_specular_color.h"
-#include "ARB_multitexture.h"
 namespace bgl
 {
-	/**
-	 *  This is a list of all registered OpenGL extensions.
-	 *  It is available from:
-	 *  http://oss.sgi.com/projects/ogl-sample/registry/ 
-	 */
-	typedef enum {
-		/* ARB Extensions */
-		_GL_ARB_imaging,
-		_GL_ARB_multitexture ,
-		_GLX_ARB_get_proc_address ,
-		_GL_ARB_transpose_matrix ,
-		_WGL_ARB_buffer_region ,
-		_GL_ARB_multisample ,
-		_GL_ARB_texture_env_add ,
-		_GL_ARB_texture_cube_map ,
-		_WGL_ARB_extensions_string ,
-		_WGL_ARB_pixel_format ,
-		_WGL_ARB_make_current_read ,
-		_WGL_ARB_pbuffer ,
-		_GL_ARB_texture_compression ,
-		_GL_ARB_texture_border_clamp ,
-		_GL_ARB_point_parameters ,
-		_GL_ARB_vertex_blend ,
-		_GL_ARB_matrix_palette ,
-		_GL_ARB_texture_env_combine ,
-		_GL_ARB_texture_env_crossbar ,
-		_GL_ARB_texture_env_dot3 ,
-		_WGL_ARB_render_texture ,
-		_GL_ARB_texture_mirrored_repeat ,
-		_GL_ARB_depth_texture ,
-		_GL_ARB_shadow ,
-		_GL_ARB_shadow_ambient ,
-		_GL_ARB_window_pos ,
-		_GL_ARB_vertex_program ,
-		_GL_ARB_fragment_program ,
-		_GL_ARB_vertex_buffer_object ,
-		_GL_ARB_occlusion_query ,
-		_GL_ARB_shader_objects ,
-		_GL_ARB_vertex_shader ,
-		_GL_ARB_fragment_shader ,
-		_GL_ARB_shading_language_100 ,
-		_GL_ARB_texture_non_power_of_two ,
-		_GL_ARB_point_sprite ,
-		_GL_ARB_fragment_program_shadow ,
-		
-		/* Non ARB Extensions */
-		_GL_EXT_abgr ,
-		_GL_EXT_blend_color ,
-		_GL_EXT_polygon_offset ,
-		_GL_EXT_texture ,
-		_GL_EXT_texture3D ,
-		_GL_SGIS_texture_filter4 ,
-		_GL_EXT_subtexture ,
-		_GL_EXT_copy_texture ,
-		_GL_EXT_histogram ,
-		_GL_EXT_convolution ,
-		_GL_SGI_color_matrix ,
-		_GL_SGI_color_table ,
-		_GL_SGIS_pixel_texture ,
-		_GL_SGIS_texture4D ,
-		_GL_SGI_texture_color_table ,
-		_GL_EXT_cmyka ,
-		_GL_EXT_texture_object ,
-		_GL_SGIS_detail_texture ,
-		_GL_SGIS_sharpen_texture ,
-		_GL_EXT_packed_pixels ,
-		_GL_SGIS_texture_lod ,
-		_GL_SGIS_multisample ,
-		_GL_EXT_rescale_normal ,
-		_GLX_EXT_visual_info ,
-		_GL_EXT_vertex_array ,
-		_GL_EXT_misc_attribute ,
-		_GL_SGIS_generate_mipmap ,
-		_GL_SGIX_clipmap ,
-		_GL_SGIX_shadow ,
-		_GL_SGIS_texture_edge_clamp ,
-		_GL_SGIS_texture_border_clamp ,
-		_GL_EXT_blend_minmax ,
-		_GL_EXT_blend_subtract ,
-		_GL_EXT_blend_logic_op ,
-		_GLX_SGI_swap_control ,
-		_GLX_SGI_video_sync ,
-		_GLX_SGI_make_current_read ,
-		_GLX_SGIX_video_source ,
-		_GLX_EXT_visual_rating ,
-		_GL_SGIX_interlace ,
-		_GLX_EXT_import_context ,
-		_GLX_SGIX_fbconfig ,
-		_GLX_SGIX_pbuffer ,
-		_GL_SGIS_texture_select ,
-		_GL_SGIX_sprite ,
-		_GL_SGIX_texture_multi_buffer ,
-		_GL_EXT_point_parameters ,
-		_GL_SGIX_instruments ,
-		_GL_SGIX_texture_scale_bias ,
-		_GL_SGIX_framezoom ,
-		_GL_SGIX_tag_sample_buffer ,
-		_GL_SGIX_reference_plane ,
-		_GL_SGIX_flush_raster ,
-		_GLX_SGI_cushion ,
-		_GL_SGIX_depth_texture ,
-		_GL_SGIS_fog_function ,
-		_GL_SGIX_fog_offset ,
-		_GL_HP_image_transform ,
-		_GL_HP_convolution_border_modes ,
-		_GL_SGIX_texture_add_env ,
-		_GL_EXT_color_subtable ,
-		_GLU_EXT_object_space_tess ,
-		_GL_PGI_vertex_hints ,
-		_GL_PGI_misc_hints ,
-		_GL_EXT_paletted_texture ,
-		_GL_EXT_clip_volume_hint ,
-		_GL_SGIX_list_priority ,
-		_GL_SGIX_ir_instrument1 ,
-		_GLX_SGIX_video_resize ,
-		_GL_SGIX_texture_lod_bias ,
-		_GLU_SGI_filter4_parameters ,
-		_GLX_SGIX_dm_buffer ,
-		_GL_SGIX_shadow_ambient ,
-		_GLX_SGIX_swap_group ,
-		_GLX_SGIX_swap_barrier ,
-		_GL_EXT_index_texture ,
-		_GL_EXT_index_material ,
-		_GL_EXT_index_func ,
-		_GL_EXT_index_array_formats ,
-		_GL_EXT_compiled_vertex_array ,
-		_GL_EXT_cull_vertex ,
-		_GLU_EXT_nurbs_tessellator ,
-		_GL_SGIX_ycrcb ,
-		_GL_EXT_fragment_lighting ,
-		_GL_IBM_rasterpos_clip ,
-		_GL_HP_texture_lighting ,
-		_GL_EXT_draw_range_elements ,
-		_GL_WIN_phong_shading ,
-		_GL_WIN_specular_fog ,
-		_GLX_SGIS_color_range ,
-		_GL_EXT_light_texture ,
-		_GL_SGIX_blend_alpha_minmax ,
-		_GL_EXT_scene_marker ,
-		_GL_SGIX_pixel_texture_bits ,
-		_GL_EXT_bgra ,
-		_GL_SGIX_async ,
-		_GL_SGIX_async_pixel ,
-		_GL_SGIX_async_histogram ,
-		_GL_INTEL_texture_scissor ,
-		_GL_INTEL_parallel_arrays ,
-		_GL_HP_occlusion_test ,
-		_GL_EXT_pixel_transform ,
-		_GL_EXT_pixel_transform_color_table ,
-		_GL_EXT_shared_texture_palette ,
-		_GLX_SGIS_blended_overlay ,
-		_GL_EXT_separate_specular_color ,
-		_GL_EXT_secondary_color ,
-		_GL_EXT_texture_env ,
-		_GL_EXT_texture_perturb_normal ,
-		_GL_EXT_multi_draw_arrays ,
-		_GL_EXT_fog_coord ,
-		_GL_REND_screen_coordinates ,
-		_GL_EXT_coordinate_frame ,
-		_GL_EXT_texture_env_combine ,
-		_GL_APPLE_specular_vector ,
-		_GL_SGIX_pixel_texture ,
-		_GL_APPLE_transform_hint ,
-		_GL_SUNX_constant_data ,
-		_GL_SUN_global_alpha ,
-		_GL_SUN_triangle_list ,
-		_GL_SUN_vertex ,
-		_WGL_EXT_display_color_table ,
-		_WGL_EXT_extensions_string ,
-		_WGL_EXT_make_current_read ,
-		_WGL_EXT_pixel_format ,
-		_WGL_EXT_pbuffer ,
-		_WGL_EXT_swap_control ,
-		_GL_EXT_blend_func_separate ,
-		_GL_INGR_color_clamp ,
-		_GL_INGR_interlace_read ,
-		_GL_EXT_stencil_wrap ,
-		_WGL_EXT_depth_float ,
-		_GL_EXT_422_pixels ,
-		_GL_NV_texgen_reflection ,
-		_GL_SGIX_texture_range ,
-		_GL_SUN_convolution_border_modes ,
-		_GLX_SUN_get_transparent_index ,
-		_GL_EXT_texture_env_add ,
-		_GL_EXT_texture_lod_bias ,
-		_GL_EXT_texture_filter_anisotropic ,
-		_GL_EXT_vertex_weighting ,
-		_GL_NV_light_max_exponent ,
-		_GL_NV_vertex_array_range ,
-		_GL_NV_register_combiners ,
-		_GL_NV_fog_distance ,
-		_GL_NV_texgen_emboss ,
-		_GL_NV_blend_square ,
-		_GL_NV_texture_env_combine4 ,
-		_GL_MESA_resize_buffers ,
-		_GL_MESA_window_pos ,
-		_GL_EXT_texture_compression_s3tc ,
-		_GL_IBM_cull_vertex ,
-		_GL_IBM_multimode_draw_arrays ,
-		_GL_IBM_vertex_array_lists ,
-		_GL_3DFX_texture_compression_FXT1 ,
-		_GL_3DFX_multisample ,
-		_GL_3DFX_tbuffer ,
-		_WGL_EXT_multisample ,
-		_GL_SGIX_vertex_preclip ,
-		_GL_SGIX_resample ,
-		_GL_SGIS_texture_color_mask ,
-		_GLX_MESA_copy_sub_buffer ,
-		_GLX_MESA_pixmap_colormap ,
-		_GLX_MESA_release_buffers ,
-		_GLX_MESA_set_3dfx_mode ,
-		_GL_EXT_texture_env_dot3 ,
-		_GL_ATI_texture_mirror_once ,
-		_GL_NV_fence ,
-		_GL_IBM_static_data ,
-		_GL_IBM_texture_mirrored_repeat ,
-		_GL_NV_evaluators ,
-		_GL_NV_packed_depth_stencil ,
-		_GL_NV_register_combiners2 ,
-		_GL_NV_texture_compression_vtc ,
-		_GL_NV_texture_rectangle ,
-		_GL_NV_texture_shader ,
-		_GL_NV_texture_shader2 ,
-		_GL_NV_vertex_array_range2 ,
-		_GL_NV_vertex_program ,
-		_GLX_SGIX_visual_select_group ,
-		_GL_SGIX_texture_coordinate_clamp ,
-		_GLX_OML_swap_method ,
-		_GLX_OML_sync_control ,
-		_GL_OML_interlace ,
-		_GL_OML_subsample ,
-		_GL_OML_resample ,
-		_WGL_OML_sync_control ,
-		_GL_NV_copy_depth_to_color ,
-		_GL_ATI_envmap_bumpmap ,
-		_GL_ATI_fragment_shader ,
-		_GL_ATI_pn_triangles ,
-		_GL_ATI_vertex_array_object ,
-		_GL_EXT_vertex_shader ,
-		_GL_ATI_vertex_streams ,
-		_WGL_I3D_digital_video_control ,
-		_WGL_I3D_gamma ,
-		_WGL_I3D_genlock ,
-		_WGL_I3D_image_buffer ,
-		_WGL_I3D_swap_frame_lock ,
-		_WGL_I3D_swap_frame_usage ,
-		_GL_ATI_element_array ,
-		_GL_SUN_mesh_array ,
-		_GL_SUN_slice_accum ,
-		_GL_NV_multisample_filter_hint ,
-		_GL_NV_depth_clamp ,
-		_GL_NV_occlusion_query ,
-		_GL_NV_point_sprite ,
-		_WGL_NV_render_depth_texture ,
-		_WGL_NV_render_texture_rectangle ,
-		_GL_NV_texture_shader3 ,
-		_GL_NV_vertex_program1_1 ,
-		_GL_EXT_shadow_funcs ,
-		_GL_EXT_stencil_two_side ,
-		_GL_ATI_text_fragment_shader ,
-		_GL_APPLE_client_storage ,
-		_GL_APPLE_element_array ,
-		_GL_APPLE_fence ,
-		_GL_APPLE_vertex_array_object ,
-		_GL_APPLE_vertex_array_range ,
-		_GL_APPLE_ycbcr_422 ,
-		_GL_S3_s3tc ,
-		_GL_ATI_draw_buffers ,
-		_WGL_ATI_pixel_format_float ,
-		_GL_ATI_texture_env_combine3 ,
-		_GL_ATI_texture_float ,
-		_GL_NV_float_buffer ,
-		_GL_NV_fragment_program ,
-		_GL_NV_half_float ,
-		_GL_NV_pixel_data_range ,
-		_GL_NV_primitive_restart ,
-		_GL_NV_texture_expand_normal ,
-		_GL_NV_vertex_program2 ,
-		_GL_ATI_map_object_buffer ,
-		_GL_ATI_separate_stencil ,
-		_GL_ATI_vertex_attrib_array_object ,
-		_GL_OES_byte_coordinates ,
-		_GL_OES_fixed_point ,
-		_GL_OES_single_precision ,
-		_GL_OES_compressed_paletted_texture ,
-		_GL_OES_read_format ,
-		_GL_OES_query_matrix ,
-		_GL_EXT_depth_bounds_test ,
-		_GL_EXT_texture_mirror_clamp ,
-		_GL_EXT_blend_equation_separate ,
-		_GL_MESA_pack_invert ,
-		_GL_MESA_ycbcr_texture,
-		
-		/* Finished */
-		_BGL_TEST,
-		NUM_EXTENSIONS
-	} ExtensionName;
-	
-	/**
-	 * Checks at runtime whether OpenGL supports the named extension.
-	 * Returns true if OpenGL supports the given extension.
-	 * 
-	 * @param name	The extension name to check.
-	 */
-	bool QueryExtension(ExtensionName name);
-	/**
-	 * Checks the OpenGL version.
-	 * Returns true if OpenGL is at least the given version.
-	 *
-	 * @param major	The major version required
-	 * @param minor	The minor version required
-	 */
-	bool QueryVersion(int major, int minor);
-	/**
-	 * This will dynamically link all runtime supported extensions into
-	 * the binary.
-	 *
-	 * @param debug	Enable debug printing.  This will print debugging info
-	 *   when extensions are loaded.
-	 */
-	void InitExtensions(int debug);
-
-#if defined(PFNGLPNTRIANGLESIATIPROC)
-extern PFNGLPNTRIANGLESIATIPROC blPNTrianglesiATI;
-extern PFNGLPNTRIANGLESFATIPROC blPNTrianglesfATI;
-#endif
-
-
-// quick runtime checks
-typedef struct BL_EXTInfo
-{
-	BL_EXTInfo():
-		_ARB_multitexture(0),
-		_ARB_texture_env_combine(0),
-		_EXT_blend_color(0),
-		_ARB_texture_cube_map(0),
-		_ARB_shader_objects(0),
-		_ARB_vertex_shader(0),
-		_ARB_fragment_shader(0),
-		_EXT_texture3D(0),
-		_ARB_vertex_program(0),
-		_ARB_depth_texture(0),
-		_EXT_compiled_vertex_array(0)
-	{
-		//
-	}
-	bool _ARB_multitexture;
-	bool _ARB_texture_env_combine;
-	bool _EXT_blend_color;
-	bool _ARB_texture_cube_map;
-	bool _ARB_shader_objects;
-	bool _ARB_vertex_shader;
-	bool _ARB_fragment_shader;
-	bool _EXT_texture3D;
-	bool _ARB_vertex_program;
-	bool _ARB_depth_texture;
-	bool _EXT_compiled_vertex_array;
-}BL_EXTInfo;
-
-extern BL_EXTInfo RAS_EXT_support;
-
-#ifdef GL_ARB_multitexture // defined in glext.h now...
-extern int max_texture_units;
-extern PFNGLACTIVETEXTUREARBPROC blActiveTextureARB;
-extern PFNGLCLIENTACTIVETEXTUREARBPROC blClientActiveTextureARB;
-extern PFNGLMULTITEXCOORD1DARBPROC blMultiTexCoord1dARB;
-extern PFNGLMULTITEXCOORD1DVARBPROC blMultiTexCoord1dvARB;
-extern PFNGLMULTITEXCOORD1FARBPROC blMultiTexCoord1fARB;
-extern PFNGLMULTITEXCOORD1FVARBPROC blMultiTexCoord1fvARB;
-extern PFNGLMULTITEXCOORD1IARBPROC blMultiTexCoord1iARB;
-extern PFNGLMULTITEXCOORD1IVARBPROC blMultiTexCoord1ivARB;
-extern PFNGLMULTITEXCOORD1SARBPROC blMultiTexCoord1sARB;
-extern PFNGLMULTITEXCOORD1SVARBPROC blMultiTexCoord1svARB;
-extern PFNGLMULTITEXCOORD2DARBPROC blMultiTexCoord2dARB;
-extern PFNGLMULTITEXCOORD2DVARBPROC blMultiTexCoord2dvARB;
-extern PFNGLMULTITEXCOORD2FARBPROC blMultiTexCoord2fARB;
-extern PFNGLMULTITEXCOORD2FVARBPROC blMultiTexCoord2fvARB;
-extern PFNGLMULTITEXCOORD2IARBPROC blMultiTexCoord2iARB;
-extern PFNGLMULTITEXCOORD2IVARBPROC blMultiTexCoord2ivARB;
-extern PFNGLMULTITEXCOORD2SARBPROC blMultiTexCoord2sARB;
-extern PFNGLMULTITEXCOORD2SVARBPROC blMultiTexCoord2svARB;
-extern PFNGLMULTITEXCOORD3DARBPROC blMultiTexCoord3dARB;
-extern PFNGLMULTITEXCOORD3DVARBPROC blMultiTexCoord3dvARB;
-extern PFNGLMULTITEXCOORD3FARBPROC blMultiTexCoord3fARB;
-extern PFNGLMULTITEXCOORD3FVARBPROC blMultiTexCoord3fvARB;
-extern PFNGLMULTITEXCOORD3IARBPROC blMultiTexCoord3iARB;
-extern PFNGLMULTITEXCOORD3IVARBPROC blMultiTexCoord3ivARB;
-extern PFNGLMULTITEXCOORD3SARBPROC blMultiTexCoord3sARB;
-extern PFNGLMULTITEXCOORD3SVARBPROC blMultiTexCoord3svARB;
-extern PFNGLMULTITEXCOORD4DARBPROC blMultiTexCoord4dARB;
-extern PFNGLMULTITEXCOORD4DVARBPROC blMultiTexCoord4dvARB;
-extern PFNGLMULTITEXCOORD4FARBPROC blMultiTexCoord4fARB;
-extern PFNGLMULTITEXCOORD4FVARBPROC blMultiTexCoord4fvARB;
-extern PFNGLMULTITEXCOORD4IARBPROC blMultiTexCoord4iARB;
-extern PFNGLMULTITEXCOORD4IVARBPROC blMultiTexCoord4ivARB;
-extern PFNGLMULTITEXCOORD4SARBPROC blMultiTexCoord4sARB;
-extern PFNGLMULTITEXCOORD4SVARBPROC blMultiTexCoord4svARB;
-#endif
-
-
-#ifdef GL_ARB_shader_objects
-extern PFNGLDELETEOBJECTARBPROC blDeleteObjectARB;
-extern PFNGLGETHANDLEARBPROC blGetHandleARB;
-extern PFNGLDETACHOBJECTARBPROC blDetachObjectARB;
-extern PFNGLCREATESHADEROBJECTARBPROC blCreateShaderObjectARB;
-extern PFNGLSHADERSOURCEARBPROC blShaderSourceARB;
-extern PFNGLCOMPILESHADERARBPROC blCompileShaderARB;
-extern PFNGLCREATEPROGRAMOBJECTARBPROC blCreateProgramObjectARB;
-extern PFNGLATTACHOBJECTARBPROC blAttachObjectARB;
-extern PFNGLLINKPROGRAMARBPROC blLinkProgramARB;
-extern PFNGLUSEPROGRAMOBJECTARBPROC blUseProgramObjectARB;
-extern PFNGLVALIDATEPROGRAMARBPROC blValidateProgramARB;
-extern PFNGLUNIFORM1FARBPROC blUniform1fARB;
-extern PFNGLUNIFORM2FARBPROC blUniform2fARB;
-extern PFNGLUNIFORM3FARBPROC blUniform3fARB;
-extern PFNGLUNIFORM4FARBPROC blUniform4fARB;
-extern PFNGLUNIFORM1IARBPROC blUniform1iARB;
-extern PFNGLUNIFORM2IARBPROC blUniform2iARB;
-extern PFNGLUNIFORM3IARBPROC blUniform3iARB;
-extern PFNGLUNIFORM4IARBPROC blUniform4iARB;
-extern PFNGLUNIFORM1FVARBPROC blUniform1fvARB;
-extern PFNGLUNIFORM2FVARBPROC blUniform2fvARB;
-extern PFNGLUNIFORM3FVARBPROC blUniform3fvARB;
-extern PFNGLUNIFORM4FVARBPROC blUniform4fvARB;
-extern PFNGLUNIFORM1IVARBPROC blUniform1ivARB;
-extern PFNGLUNIFORM2IVARBPROC blUniform2ivARB;
-extern PFNGLUNIFORM3IVARBPROC blUniform3ivARB;
-extern PFNGLUNIFORM4IVARBPROC blUniform4ivARB;
-extern PFNGLUNIFORMMATRIX2FVARBPROC blUniformMatrix2fvARB;
-extern PFNGLUNIFORMMATRIX3FVARBPROC blUniformMatrix3fvARB;
-extern PFNGLUNIFORMMATRIX4FVARBPROC blUniformMatrix4fvARB;
-extern PFNGLGETOBJECTPARAMETERFVARBPROC blGetObjectParameterfvARB;
-extern PFNGLGETOBJECTPARAMETERIVARBPROC blGetObjectParameterivARB;
-extern PFNGLGETINFOLOGARBPROC blGetInfoLogARB;
-extern PFNGLGETATTACHEDOBJECTSARBPROC blGetAttachedObjectsARB;
-extern PFNGLGETUNIFORMLOCATIONARBPROC blGetUniformLocationARB;
-extern PFNGLGETACTIVEUNIFORMARBPROC blGetActiveUniformARB;
-extern PFNGLGETUNIFORMFVARBPROC blGetUniformfvARB;
-extern PFNGLGETUNIFORMIVARBPROC blGetUniformivARB;
-extern PFNGLGETSHADERSOURCEARBPROC blGetShaderSourceARB;
-#endif
-
-#ifdef GL_ARB_vertex_shader
-extern PFNGLBINDATTRIBLOCATIONARBPROC blBindAttribLocationARB;
-extern PFNGLGETACTIVEATTRIBARBPROC blGetActiveAttribARB;
-extern PFNGLGETATTRIBLOCATIONARBPROC blGetAttribLocationARB;
-#endif
-
-#ifdef GL_ARB_vertex_program
-extern PFNGLVERTEXATTRIB1FARBPROC blVertexAttrib1fARB;
-extern PFNGLVERTEXATTRIB1FVARBPROC blVertexAttrib1fvARB;
-extern PFNGLVERTEXATTRIB2FARBPROC blVertexAttrib2fARB;
-extern PFNGLVERTEXATTRIB2FVARBPROC blVertexAttrib2fvARB;
-extern PFNGLVERTEXATTRIB3FARBPROC blVertexAttrib3fARB;
-extern PFNGLVERTEXATTRIB3FVARBPROC blVertexAttrib3fvARB;
-extern PFNGLVERTEXATTRIB4FARBPROC blVertexAttrib4fARB;
-extern PFNGLVERTEXATTRIB4FVARBPROC blVertexAttrib4fvARB;
-extern PFNGLGETPROGRAMSTRINGARBPROC blGetProgramStringARB;
-extern PFNGLGETVERTEXATTRIBDVARBPROC blGetVertexAttribdvARB;
-extern PFNGLGETVERTEXATTRIBFVARBPROC blGetVertexAttribfvARB;
-extern PFNGLGETVERTEXATTRIBIVARBPROC blGetVertexAttribivARB;
-#endif
-
-/*
-#ifdef GL_EXT_compiled_vertex_array
-extern PFNGLLOCKARRAYSEXTPROC blLockArraysEXT;
-extern PFNGLUNLOCKARRAYSEXTPROC blUnlockArraysEXT;
-#endif
-*/
+	void InitExtensions(bool debug);
 } /* namespace bgl */
 
-
 #endif /* __RAS_GLEXTENSIONMANAGER_H__ */
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
index afa98fdb274..c2687319717 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
@@ -6,15 +6,10 @@
 #ifdef WIN32
 #include <windows.h>
 #endif // WIN32
-#ifdef __APPLE__
-#define GL_GLEXT_LEGACY 1
-#include <OpenGL/gl.h>
-#else
-#include <GL/gl.h>
-#endif
+
+#include "GL/glew.h"
 
 #include "RAS_TexVert.h"
-#include "RAS_GLExtensionManager.h"
 #include "MT_assert.h"
 
 //#ifndef NDEBUG
@@ -27,8 +22,8 @@
 
 RAS_ListSlot::RAS_ListSlot(RAS_ListRasterizer* rasty)
 :	KX_ListSlot(),
-	m_flag(LIST_MODIFY|LIST_CREATE),
 	m_list(0),
+	m_flag(LIST_MODIFY|LIST_CREATE),
 	m_rasty(rasty)
 {
 }
@@ -166,9 +161,7 @@ void RAS_ListRasterizer::ReleaseAlloc()
 void RAS_ListRasterizer::IndexPrimitives(
 	const vecVertexArray & vertexarrays,
 	const vecIndexArrays & indexarrays,
-	int mode,
-	class RAS_IPolyMaterial* polymat,
-	class RAS_IRenderTools* rendertools,
+	DrawMode mode,
 	bool useObjectColor,
 	const MT_Vector4& rgbacolor,
 	class KX_ListSlot** slot)
@@ -176,7 +169,7 @@ void RAS_ListRasterizer::IndexPrimitives(
 	RAS_ListSlot* localSlot =0;
 
 	// useObjectColor(are we updating every frame?)
-	if(!useObjectColor) {
+	if(!useObjectColor && slot) {
 		localSlot = FindOrAdd(vertexarrays, slot);
 		localSlot->DrawList();
 		if(localSlot->End()) {
@@ -190,20 +183,18 @@ void RAS_ListRasterizer::IndexPrimitives(
 	if (mUseVertexArrays) {
 		RAS_VAOpenGLRasterizer::IndexPrimitives(
 				vertexarrays, indexarrays,
-				mode, polymat,
-				rendertools, useObjectColor,
+				mode, useObjectColor,
 				rgbacolor,slot
 		);
 	} else {
 		RAS_OpenGLRasterizer::IndexPrimitives(
 				vertexarrays, indexarrays,
-				mode, polymat,
-				rendertools, useObjectColor,
+				mode, useObjectColor,
 				rgbacolor,slot
 		);
 	}
 
-	if(!useObjectColor) {
+	if(!useObjectColor && slot) {
 		localSlot->EndList();
 		*slot = localSlot;
 	}
@@ -213,9 +204,7 @@ void RAS_ListRasterizer::IndexPrimitives(
 void RAS_ListRasterizer::IndexPrimitivesMulti(
 		const vecVertexArray& vertexarrays,
 		const vecIndexArrays & indexarrays,
-		int mode,
-		class RAS_IPolyMaterial* polymat,
-		class RAS_IRenderTools* rendertools,
+		DrawMode mode,
 		bool useObjectColor,
 		const MT_Vector4& rgbacolor,
 		class KX_ListSlot** slot)
@@ -223,7 +212,7 @@ void RAS_ListRasterizer::IndexPrimitivesMulti(
 	RAS_ListSlot* localSlot =0;
 
 	// useObjectColor(are we updating every frame?)
-	if(!useObjectColor) {
+	if(!useObjectColor && slot) {
 		localSlot = FindOrAdd(vertexarrays, slot);
 		localSlot->DrawList();
 
@@ -235,23 +224,24 @@ void RAS_ListRasterizer::IndexPrimitivesMulti(
 		}
 	}
 
-	if (mUseVertexArrays) {
+	// workaround: note how we do not use vertex arrays for making display
+	// lists, since glVertexAttribPointerARB doesn't seem to work correct
+	// in display lists on ATI? either a bug in the driver or in Blender ..
+	if (mUseVertexArrays && !localSlot) {
 		RAS_VAOpenGLRasterizer::IndexPrimitivesMulti(
 				vertexarrays, indexarrays,
-				mode, polymat,
-				rendertools, useObjectColor,
+				mode, useObjectColor,
 				rgbacolor,slot
 		);
 	} else {
 		RAS_OpenGLRasterizer::IndexPrimitivesMulti(
 				vertexarrays, indexarrays,
-				mode, polymat,
-				rendertools, useObjectColor,
+				mode, useObjectColor,
 				rgbacolor,slot
 		);
 	}
 
-	if(!useObjectColor) {
+	if(!useObjectColor && slot) {
 		localSlot->EndList();
 		*slot = localSlot;
 	}
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
index 4b3304d7396..b1b19144c12 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
@@ -52,9 +52,7 @@ public:
 	virtual void IndexPrimitives(
 			const vecVertexArray& vertexarrays,
 			const vecIndexArrays & indexarrays,
-			int mode,
-			class RAS_IPolyMaterial* polymat,
-			class RAS_IRenderTools* rendertools,
+			DrawMode mode,
 			bool useObjectColor,
 			const MT_Vector4& rgbacolor,
 			class KX_ListSlot** slot
@@ -63,9 +61,7 @@ public:
 	virtual void IndexPrimitivesMulti(
 			const vecVertexArray& vertexarrays,
 			const vecIndexArrays & indexarrays,
-			int mode,
-			class RAS_IPolyMaterial* polymat,
-			class RAS_IRenderTools* rendertools,
+			DrawMode mode,
 			bool useObjectColor,
 			const MT_Vector4& rgbacolor,
 			class KX_ListSlot** slot
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
index f99121e5b7c..dcc36bf5a39 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
@@ -31,33 +31,13 @@
  
 #include "RAS_OpenGLRasterizer.h"
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifdef WIN32
-#include <windows.h>
-#endif // WIN32
-#ifdef __APPLE__
-#define GL_GLEXT_LEGACY 1
-#include <OpenGL/gl.h>
-#include <OpenGL/glu.h>
-#else
-#include <GL/gl.h>
-#if defined(__sun__) && !defined(__sparc__)
-#include <mesa/glu.h>
-#else
-#include <GL/glu.h>
-#endif
-#endif
+#include "GL/glew.h"
 
 #include "RAS_Rect.h"
 #include "RAS_TexVert.h"
 #include "MT_CmMatrix4x4.h"
 #include "RAS_IRenderTools.h" // rendering text
 
-#include "RAS_GLExtensionManager.h"
-
 /**
  *  32x32 bit masks for vinterlace stereo mode
  */
@@ -83,10 +63,11 @@ RAS_OpenGLRasterizer::RAS_OpenGLRasterizer(RAS_ICanvas* canvas)
 	m_focallength(0.0),
 	m_setfocallength(false),
 	m_noOfScanlines(32),
-	m_useTang(false),
-	m_materialCachingInfo(0),
 	m_motionblur(0),
-	m_motionblurvalue(-1.0)
+	m_motionblurvalue(-1.0),
+	m_texco_num(0),
+	m_attrib_num(0),
+	m_materialCachingInfo(0)
 {
 	m_viewmatrix.Identity();
 	
@@ -144,6 +125,9 @@ static void Myinit_gl_stuff(void)
 	glDisable(GL_TEXTURE_1D);
 	glDisable(GL_TEXTURE_2D);
 
+	glEnableClientState(GL_VERTEX_ARRAY);
+	glEnableClientState(GL_NORMAL_ARRAY);
+
 	glPixelTransferi(GL_MAP_COLOR, GL_FALSE);
 	glPixelTransferi(GL_RED_SCALE, 1);
 	glPixelTransferi(GL_RED_BIAS, 0);
@@ -335,7 +319,7 @@ void RAS_OpenGLRasterizer::Exit()
 	glDisable(GL_POLYGON_STIPPLE);
 	
 	glDisable(GL_LIGHTING);
-	if (bgl::QueryExtension(bgl::_GL_EXT_separate_specular_color) || bgl::QueryVersion(1, 2))
+	if (GLEW_EXT_separate_specular_color || GLEW_VERSION_1_2)
 		glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL, GL_SINGLE_COLOR);
 	
 	EndFrame();
@@ -384,23 +368,11 @@ void RAS_OpenGLRasterizer::SetDrawingMode(int drawingmode)
 
 	switch (m_drawingmode)
 	{
-	case KX_BOUNDINGBOX:
-		{
-		}
 	case KX_WIREFRAME:
 		{
 			glDisable (GL_CULL_FACE);
 			break;
 		}
-	case KX_TEXTURED:
-		{
-		}
-	case KX_SHADED:
-		{
-		}
-	case KX_SOLID:
-		{
-		}
 	default:
 		{
 		}
@@ -619,33 +591,14 @@ void RAS_OpenGLRasterizer::GetViewMatrix(MT_Matrix4x4 &mat) const
 
 void RAS_OpenGLRasterizer::IndexPrimitives(const vecVertexArray & vertexarrays,
 									const vecIndexArrays & indexarrays,
-									int mode,
-									class RAS_IPolyMaterial* polymat,
-									class RAS_IRenderTools* rendertools,
+									DrawMode mode,
 									bool useObjectColor,
 									const MT_Vector4& rgbacolor,
 									class KX_ListSlot** slot
 									)
 { 
-	GLenum drawmode;
-	switch (mode)
-	{
-	case 0:
-		drawmode = GL_TRIANGLES;
-		break;
-	case 1:
-		drawmode = GL_LINES;
-		break;
-	case 2:
-		drawmode = GL_QUADS;
-		break;
-	default:
-		drawmode = GL_LINES;
-		break;
-	}
-	
-	const RAS_TexVert* vertexarray ;
-	unsigned int numindices,vt;
+	const RAS_TexVert* vertexarray;
+	unsigned int numindices, vt;
 
 	for (vt=0;vt<vertexarrays.size();vt++)
 	{
@@ -659,7 +612,7 @@ void RAS_OpenGLRasterizer::IndexPrimitives(const vecVertexArray & vertexarrays,
 		int vindex=0;
 		switch (mode)
 		{
-		case 1:
+		case KX_MODE_LINES:
 			{
 				glBegin(GL_LINES);
 				vindex=0;
@@ -671,7 +624,7 @@ void RAS_OpenGLRasterizer::IndexPrimitives(const vecVertexArray & vertexarrays,
 				glEnd();
 			}
 			break;
-		case 2:
+		case KX_MODE_QUADS:
 			{
 				glBegin(GL_QUADS);
 				vindex=0;
@@ -739,7 +692,7 @@ void RAS_OpenGLRasterizer::IndexPrimitives(const vecVertexArray & vertexarrays,
 				glEnd();	
 				break;
 			}
-		case 0:
+		case KX_MODE_TRIANGLES:
 			{
 				glBegin(GL_TRIANGLES);
 				vindex=0;
@@ -802,305 +755,16 @@ void RAS_OpenGLRasterizer::IndexPrimitives(const vecVertexArray & vertexarrays,
 
 }
 
-void RAS_OpenGLRasterizer::IndexPrimitives_Ex(const vecVertexArray & vertexarrays,
-									const vecIndexArrays & indexarrays,
-									int mode,
-									class RAS_IPolyMaterial* polymat,
-									class RAS_IRenderTools* rendertools,
-									bool useObjectColor,
-									const MT_Vector4& rgbacolor
-									)
-{ 
-	bool	recalc;
-	GLenum drawmode;
-	switch (mode)
-	{
-	case 0:
-		drawmode = GL_TRIANGLES;
-		break;
-	case 1:
-		drawmode = GL_LINES;
-		break;
-	case 2:
-		drawmode = GL_QUADS;
-		break;
-	default:
-		drawmode = GL_LINES;
-		break;
-	}
-	
-	const RAS_TexVert* vertexarray ;
-	unsigned int numindices,vt;
-
-	for (vt=0;vt<vertexarrays.size();vt++)
-	{
-		vertexarray = &((*vertexarrays[vt]) [0]);
-		const KX_IndexArray & indexarray = (*indexarrays[vt]);
-		numindices = indexarray.size();
-		
-		if (!numindices)
-			continue;
-		
-		int vindex=0;
-		switch (mode)
-		{
-		case 1:
-			{
-				glBegin(GL_LINES);
-				vindex=0;
-				for (unsigned int i=0;i<numindices;i+=2)
-				{
-					glVertex3fv(vertexarray[(indexarray[vindex++])].getLocalXYZ());
-					glVertex3fv(vertexarray[(indexarray[vindex++])].getLocalXYZ());
-				}
-				glEnd();
-			}
-			break;
-		case 2:
-			{
-				glBegin(GL_QUADS);
-				vindex=0;
-				if (useObjectColor)
-				{
-					for (unsigned int i=0;i<numindices;i+=4)
-					{
-						MT_Point3 mv1, mv2, mv3, mv4, fnor;
-						/* Calc a new face normal */
-
-						if (vertexarray[(indexarray[vindex])].getFlag() & TV_CALCFACENORMAL)
-							recalc= true;
-						else
-							recalc=false;
-
-						if (recalc){
-							mv1 = MT_Point3(vertexarray[(indexarray[vindex])].getLocalXYZ());
-							mv2 = MT_Point3(vertexarray[(indexarray[vindex+1])].getLocalXYZ());
-							mv3 = MT_Point3(vertexarray[(indexarray[vindex+2])].getLocalXYZ());
-							mv4 = MT_Point3(vertexarray[(indexarray[vindex+2])].getLocalXYZ());
-							
-							fnor = (((mv2-mv1).cross(mv3-mv2))+((mv4-mv3).cross(mv1-mv4))).safe_normalized();
-
-							glNormal3f(fnor[0], fnor[1], fnor[2]);
-						}
-
-						glColor4d(rgbacolor[0], rgbacolor[1], rgbacolor[2], rgbacolor[3]);
-
-						if (!recalc)
-							glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-						glTexCoord2fv(vertexarray[(indexarray[vindex])].getUV1());
-						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-						vindex++;
-						
-						if (!recalc)
-							glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-						glTexCoord2fv(vertexarray[(indexarray[vindex])].getUV1());
-						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-						vindex++;
-						
-						if (!recalc)
-							glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());						
-						glTexCoord2fv(vertexarray[(indexarray[vindex])].getUV1());
-						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-						vindex++;
-						
-						if (!recalc)
-							glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-						glTexCoord2fv(vertexarray[(indexarray[vindex])].getUV1());
-						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-						vindex++;
-					}
-				}
-				else
-				{
-					for (unsigned int i=0;i<numindices;i+=4)
-					{
-						// This looks curiously endian unsafe to me.
-						// However it depends on the way the colors are packed into 
-						// the m_rgba field of RAS_TexVert
-						MT_Point3 mv1, mv2, mv3, mv4, fnor;
-						/* Calc a new face normal */
-
-						if (vertexarray[(indexarray[vindex])].getFlag() & TV_CALCFACENORMAL)
-							recalc= true;
-						else
-							recalc=false;
-
-
-						if (recalc){
-							mv1 = MT_Point3(vertexarray[(indexarray[vindex])].getLocalXYZ());
-							mv2 = MT_Point3(vertexarray[(indexarray[vindex+1])].getLocalXYZ());
-							mv3 = MT_Point3(vertexarray[(indexarray[vindex+2])].getLocalXYZ());
-							mv4 = MT_Point3(vertexarray[(indexarray[vindex+3])].getLocalXYZ());
-							
-							fnor = (((mv2-mv1).cross(mv3-mv2))+((mv4-mv3).cross(mv1-mv4))).safe_normalized();
-
-							glNormal3f(fnor[0], fnor[1], fnor[2]);
-						}
-
-						glColor4ubv((const GLubyte *)(vertexarray[(indexarray[vindex])].getRGBA()));
-						if (!recalc)
-							glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-						glTexCoord2fv(vertexarray[(indexarray[vindex])].getUV1());
-						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-						vindex++;
-						
-						glColor4ubv((const GLubyte *)(vertexarray[(indexarray[vindex])].getRGBA()));
-						if (!recalc)
-							glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-						glTexCoord2fv(vertexarray[(indexarray[vindex])].getUV1());
-						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-						vindex++;
-						
-						glColor4ubv((const GLubyte *)(vertexarray[(indexarray[vindex])].getRGBA()));
-						if (!recalc)
-							glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-						glTexCoord2fv(vertexarray[(indexarray[vindex])].getUV1());
-						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-						vindex++;
-						
-						glColor4ubv((const GLubyte *)(vertexarray[(indexarray[vindex])].getRGBA()));
-						if (!recalc)
-							glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-						glTexCoord2fv(vertexarray[(indexarray[vindex])].getUV1());
-						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-						vindex++;
-					}
-				}
-				glEnd();	
-				break;
-			}
-		case 0:
-			{
-				glBegin(GL_TRIANGLES);
-				vindex=0;
-				if (useObjectColor)
-				{
-					for (unsigned int i=0;i<numindices;i+=3)
-					{
-						MT_Point3 mv1, mv2, mv3, fnor;
-						/* Calc a new face normal */
-
-						if (vertexarray[(indexarray[vindex])].getFlag() & TV_CALCFACENORMAL)
-							recalc= true;
-						else
-							recalc=false;
-
-						if (recalc){
-							mv1 = MT_Point3(vertexarray[(indexarray[vindex])].getLocalXYZ());
-							mv2 = MT_Point3(vertexarray[(indexarray[vindex+1])].getLocalXYZ());
-							mv3 = MT_Point3(vertexarray[(indexarray[vindex+2])].getLocalXYZ());
-							
-							fnor = ((mv2-mv1).cross(mv3-mv2)).safe_normalized();
-							glNormal3f(fnor[0], fnor[1], fnor[2]);
-						}
-
-						glColor4d(rgbacolor[0], rgbacolor[1], rgbacolor[2], rgbacolor[3]);
-
-						if (!recalc)
-							glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-						glTexCoord2fv(vertexarray[(indexarray[vindex])].getUV1());
-						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-						vindex++;
-						
-						if (!recalc)
-							glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-						glTexCoord2fv(vertexarray[(indexarray[vindex])].getUV1());
-						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-						vindex++;
-						
-						if (!recalc)
-							glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-						glTexCoord2fv(vertexarray[(indexarray[vindex])].getUV1());
-						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-						vindex++;
-					}
-				}
-				else 
-				{
-					for (unsigned int i=0;i<numindices;i+=3)
-					{
-						MT_Point3 mv1, mv2, mv3, fnor;
-						/* Calc a new face normal */
-
-						if (vertexarray[(indexarray[vindex])].getFlag() & TV_CALCFACENORMAL)
-							recalc= true;
-						else
-							recalc=false;
-
-
-						if (recalc){
-							mv1 = MT_Point3(vertexarray[(indexarray[vindex])].getLocalXYZ());
-							mv2 = MT_Point3(vertexarray[(indexarray[vindex+1])].getLocalXYZ());
-							mv3 = MT_Point3(vertexarray[(indexarray[vindex+2])].getLocalXYZ());
-							
-							fnor = ((mv2-mv1).cross(mv3-mv2)).safe_normalized();
-							glNormal3f(fnor[0], fnor[1], fnor[2]);
-						}
-
-						glColor4ubv((const GLubyte *)(vertexarray[(indexarray[vindex])].getRGBA()));
-						if (!recalc)
-							glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-						glTexCoord2fv(vertexarray[(indexarray[vindex])].getUV1());
-						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-						vindex++;
-						
-						glColor4ubv((const GLubyte *)(vertexarray[(indexarray[vindex])].getRGBA()));
-						if (!recalc)
-							glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-						glTexCoord2fv(vertexarray[(indexarray[vindex])].getUV1());
-						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-						vindex++;
-						
-						glColor4ubv((const GLubyte *)(vertexarray[(indexarray[vindex])].getRGBA()));
-						if (!recalc)
-							glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-						glTexCoord2fv(vertexarray[(indexarray[vindex])].getUV1());
-						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-						vindex++;
-					}
-				}
-				glEnd();	
-				break;
-			}
-		default:
-			{
-			}
-			
-		} // switch
-	} // for each vertexarray
-
-}
-
-
-
 void RAS_OpenGLRasterizer::IndexPrimitives_3DText(const vecVertexArray & vertexarrays,
 									const vecIndexArrays & indexarrays,
-									int mode,
+									DrawMode mode,
 									class RAS_IPolyMaterial* polymat,
 									class RAS_IRenderTools* rendertools,
 									bool useObjectColor,
 									const MT_Vector4& rgbacolor
 									)
 { 
-	GLenum drawmode;
-	switch (mode)
-	{
-	case 0:
-		drawmode = GL_TRIANGLES;
-		break;
-	case 1:
-		drawmode = GL_LINES;
-		break;
-	case 2:
-		drawmode = GL_QUADS;
-		break;
-	default:
-		drawmode = GL_LINES;
-		break;
-	}
-	
-	const RAS_TexVert* vertexarray ;
-	
+	const RAS_TexVert* vertexarray;
 	unsigned int numindices, vt;
 	
 	if (useObjectColor)
@@ -1125,7 +789,7 @@ void RAS_OpenGLRasterizer::IndexPrimitives_3DText(const vecVertexArray & vertexa
 		int vindex=0;
 		switch (mode)
 		{
-		case 1:
+		case KX_MODE_LINES:
 			{
 				glBegin(GL_LINES);
 				vindex=0;
@@ -1137,7 +801,7 @@ void RAS_OpenGLRasterizer::IndexPrimitives_3DText(const vecVertexArray & vertexa
 				glEnd();
 			}
 			break;
-		case 2:
+		case KX_MODE_QUADS:
 			{
 				vindex=0;
 				for (unsigned int i=0;i<numindices;i+=4)
@@ -1170,7 +834,7 @@ void RAS_OpenGLRasterizer::IndexPrimitives_3DText(const vecVertexArray & vertexa
 				}
 				break;
 			}
-		case 0:
+		case KX_MODE_TRIANGLES:
 			{
 				glBegin(GL_TRIANGLES);
 				vindex=0;
@@ -1206,59 +870,94 @@ void RAS_OpenGLRasterizer::IndexPrimitives_3DText(const vecVertexArray & vertexa
 	}	//for each vertexarray
 }
 
-void RAS_OpenGLRasterizer::SetTexCoords(TexCoGen coords,int unit)
+void RAS_OpenGLRasterizer::SetTexCoordNum(int num)
+{
+	m_texco_num = num;
+	if(m_texco_num > RAS_MAX_TEXCO)
+		m_texco_num = RAS_MAX_TEXCO;
+}
+
+void RAS_OpenGLRasterizer::SetAttribNum(int num)
+{
+	m_attrib_num = num;
+	if(m_attrib_num > RAS_MAX_ATTRIB)
+		m_attrib_num = RAS_MAX_ATTRIB;
+}
+
+void RAS_OpenGLRasterizer::SetTexCoord(TexCoGen coords, int unit)
 {
 	// this changes from material to material
-	if(unit < RAS_MAX)
+	if(unit < RAS_MAX_TEXCO)
 		m_texco[unit] = coords;
 }
 
-void RAS_OpenGLRasterizer::SetAttrib(int type)
+void RAS_OpenGLRasterizer::SetAttrib(TexCoGen coords, int unit)
 {
-	if(type == RAS_TEXTANGENT) m_useTang=true;
+	// this changes from material to material
+	if(unit < RAS_MAX_ATTRIB)
+		m_attrib[unit] = coords;
 }
 
-void RAS_OpenGLRasterizer::TexCoord(const RAS_TexVert &tv, int enabled)
+void RAS_OpenGLRasterizer::TexCoord(const RAS_TexVert &tv)
 {
-#if defined(GL_ARB_multitexture) && defined(WITH_GLEXT)
-	if (!getenv("WITHOUT_GLEXT")) {
-		if(bgl::RAS_EXT_support._ARB_multitexture) {
-			for(int unit=0; unit<enabled; unit++) {
-				if( tv.getFlag() & TV_2NDUV && tv.getUnit() == unit ) {
-					bgl::blMultiTexCoord2fvARB(GL_TEXTURE0_ARB+unit, tv.getUV2());
-					continue;
-				}
-				switch(m_texco[unit]) {
-				case RAS_TEXCO_DISABLE:
-				case RAS_TEXCO_OBJECT:
-				case RAS_TEXCO_GEN:
-					break;
-				case RAS_TEXCO_ORCO:
-				case RAS_TEXCO_GLOB:
-					bgl::blMultiTexCoord3fvARB(GL_TEXTURE0_ARB+unit, tv.getLocalXYZ());
-					break;
-				case RAS_TEXCO_UV1:
-					bgl::blMultiTexCoord2fvARB(GL_TEXTURE0_ARB+unit, tv.getUV1());
-					break;
-				case RAS_TEXCO_NORM:
-					bgl::blMultiTexCoord3fvARB(GL_TEXTURE0_ARB+unit, tv.getNormal());
-					break;
-				case RAS_TEXTANGENT:
-					bgl::blMultiTexCoord4fvARB(GL_TEXTURE0_ARB+unit, tv.getTangent());
-					break;
-				case RAS_TEXCO_UV2:
-					bgl::blMultiTexCoord2fvARB(GL_TEXTURE0_ARB+unit, tv.getUV2());
-					break;
-				}
+	int unit;
+
+	if(GLEW_ARB_multitexture) {
+		for(unit=0; unit<m_texco_num; unit++) {
+			if(tv.getFlag() & TV_2NDUV && (int)tv.getUnit() == unit) {
+				glMultiTexCoord2fvARB(GL_TEXTURE0_ARB+unit, tv.getUV2());
+				continue;
+			}
+			switch(m_texco[unit]) {
+			case RAS_TEXCO_ORCO:
+			case RAS_TEXCO_GLOB:
+				glMultiTexCoord3fvARB(GL_TEXTURE0_ARB+unit, tv.getLocalXYZ());
+				break;
+			case RAS_TEXCO_UV1:
+				glMultiTexCoord2fvARB(GL_TEXTURE0_ARB+unit, tv.getUV1());
+				break;
+			case RAS_TEXCO_NORM:
+				glMultiTexCoord3fvARB(GL_TEXTURE0_ARB+unit, tv.getNormal());
+				break;
+			case RAS_TEXTANGENT:
+				glMultiTexCoord4fvARB(GL_TEXTURE0_ARB+unit, tv.getTangent());
+				break;
+			case RAS_TEXCO_UV2:
+				glMultiTexCoord2fvARB(GL_TEXTURE0_ARB+unit, tv.getUV2());
+				break;
+			default:
+				break;
 			}
 		}
 	}
-#endif
 
-#ifdef GL_ARB_vertex_program
-	if(m_useTang && bgl::RAS_EXT_support._ARB_vertex_program)
-		bgl::blVertexAttrib4fvARB(1/*tangent*/, tv.getTangent());
-#endif
+	if(GLEW_ARB_vertex_program) {
+		for(unit=0; unit<m_attrib_num; unit++) {
+			switch(m_attrib[unit]) {
+			case RAS_TEXCO_ORCO:
+			case RAS_TEXCO_GLOB:
+				glVertexAttrib3fvARB(unit, tv.getLocalXYZ());
+				break;
+			case RAS_TEXCO_UV1:
+				glVertexAttrib2fvARB(unit, tv.getUV1());
+				break;
+			case RAS_TEXCO_NORM:
+				glVertexAttrib3fvARB(unit, tv.getNormal());
+				break;
+			case RAS_TEXTANGENT:
+				glVertexAttrib4fvARB(unit, tv.getTangent());
+				break;
+			case RAS_TEXCO_UV2:
+				glVertexAttrib2fvARB(unit, tv.getUV2());
+				break;
+			case RAS_TEXCO_VCOL:
+				glVertexAttrib4ubvARB(unit, tv.getRGBA());
+				break;
+			default:
+				break;
+			}
+		}
+	}
 
 }
 void RAS_OpenGLRasterizer::Tangent(	const RAS_TexVert& v1,
@@ -1266,517 +965,208 @@ void RAS_OpenGLRasterizer::Tangent(	const RAS_TexVert& v1,
 									const RAS_TexVert& v3,
 									const MT_Vector3 &no)
 {
-#if defined(GL_ARB_multitexture) && defined(WITH_GLEXT)
-	if (!getenv("WITHOUT_GLEXT")) {
-		// TODO: set for deformer... 
-		MT_Vector3 x1(v1.getLocalXYZ()), x2(v2.getLocalXYZ()), x3(v3.getLocalXYZ());
-		MT_Vector2 uv1(v1.getUV1()), uv2(v2.getUV1()), uv3(v3.getUV1());
-		MT_Vector3 dx1(x2 - x1), dx2(x3 - x1);
-		MT_Vector2 duv1(uv2 - uv1), duv2(uv3 - uv1);
+	// TODO: set for deformer... 
+	MT_Vector3 x1(v1.getLocalXYZ()), x2(v2.getLocalXYZ()), x3(v3.getLocalXYZ());
+	MT_Vector2 uv1(v1.getUV1()), uv2(v2.getUV1()), uv3(v3.getUV1());
+	MT_Vector3 dx1(x2 - x1), dx2(x3 - x1);
+	MT_Vector2 duv1(uv2 - uv1), duv2(uv3 - uv1);
 
-		MT_Scalar r = 1.0 / (duv1.x() * duv2.y() - duv2.x() * duv1.y());
-		duv1 *= r;
-		duv2 *= r;
-		MT_Vector3 sdir(duv2.y() * dx1 - duv1.y() * dx2);
-		MT_Vector3 tdir(duv1.x() * dx2 - duv2.x() * dx1);
+	MT_Scalar r = 1.0 / (duv1.x() * duv2.y() - duv2.x() * duv1.y());
+	duv1 *= r;
+	duv2 *= r;
+	MT_Vector3 sdir(duv2.y() * dx1 - duv1.y() * dx2);
+	MT_Vector3 tdir(duv1.x() * dx2 - duv2.x() * dx1);
 
-		// Gram-Schmidt orthogonalize
-		MT_Vector3 t(sdir - no.cross(no.cross(sdir)));
-		if (!MT_fuzzyZero(t)) t /= t.length();
+	// Gram-Schmidt orthogonalize
+	MT_Vector3 t(sdir - no.cross(no.cross(sdir)));
+	if (!MT_fuzzyZero(t)) t /= t.length();
 
-		float tangent[4];
-		t.getValue(tangent);
-		// Calculate handedness
-		tangent[3] = no.dot(sdir.cross(tdir)) < 0.0 ? -1.0 : 1.0;
-	}
-#endif
+	float tangent[4];
+	t.getValue(tangent);
+	// Calculate handedness
+	tangent[3] = no.dot(sdir.cross(tdir)) < 0.0 ? -1.0 : 1.0;
 }
 
 
 void RAS_OpenGLRasterizer::IndexPrimitivesMulti(
 		const vecVertexArray& vertexarrays,
 		const vecIndexArrays & indexarrays,
-		int mode,
-		class RAS_IPolyMaterial* polymat,
-		class RAS_IRenderTools* rendertools,
+		DrawMode mode,
 		bool useObjectColor,
 		const MT_Vector4& rgbacolor,
 		class KX_ListSlot** slot
 		)
 { 
-#if defined(GL_ARB_multitexture) && defined(WITH_GLEXT)
-	if (!getenv("WITHOUT_GLEXT")) {
-		GLenum drawmode;
+
+	const RAS_TexVert* vertexarray;
+	unsigned int numindices,vt;
+
+	for (vt=0;vt<vertexarrays.size();vt++)
+	{
+		vertexarray = &((*vertexarrays[vt]) [0]);
+		const KX_IndexArray & indexarray = (*indexarrays[vt]);
+		numindices = indexarray.size();
+
+		if (!numindices)
+			break;
+
+		int vindex=0;
 		switch (mode)
 		{
-		case 0:
-			drawmode = GL_TRIANGLES;
-			break;
-		case 1:
-			drawmode = GL_LINES;
-			break;
-		case 2:
-			drawmode = GL_QUADS;
-			break;
-		default:
-			drawmode = GL_LINES;
-			break;
-		}
-	
-		const RAS_TexVert* vertexarray ;
-		unsigned int numindices,vt;
-
-		for (vt=0;vt<vertexarrays.size();vt++)
-		{
-			vertexarray = &((*vertexarrays[vt]) [0]);
-			const KX_IndexArray & indexarray = (*indexarrays[vt]);
-			numindices = indexarray.size();
-			const unsigned int enabled = polymat->GetEnabled();
-
-			if (!numindices)
-				break;
-
-			int vindex=0;
-			switch (mode)
+		case KX_MODE_LINES:
 			{
-			case 1:
+				glBegin(GL_LINES);
+				vindex=0;
+				for (unsigned int i=0;i<numindices;i+=2)
 				{
-					glBegin(GL_LINES);
-					vindex=0;
-					for (unsigned int i=0;i<numindices;i+=2)
-					{
-						glVertex3fv(vertexarray[(indexarray[vindex++])].getLocalXYZ());
-						glVertex3fv(vertexarray[(indexarray[vindex++])].getLocalXYZ());
-					}
-					glEnd();
+					glVertex3fv(vertexarray[(indexarray[vindex++])].getLocalXYZ());
+					glVertex3fv(vertexarray[(indexarray[vindex++])].getLocalXYZ());
 				}
-				break;
-			case 2:
-				{
-					glBegin(GL_QUADS);
-					vindex=0;
-					if (useObjectColor)
-					{
-						for (unsigned int i=0;i<numindices;i+=4)
-						{
-
-							glColor4d(rgbacolor[0], rgbacolor[1], rgbacolor[2], rgbacolor[3]);
-
-							//
-							glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-							TexCoord(vertexarray[(indexarray[vindex])],enabled );
-							glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-							vindex++;
-
-							//
-							glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-							TexCoord(vertexarray[(indexarray[vindex])],enabled );
-							glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-							vindex++;
-
-							//
-							glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-							TexCoord(vertexarray[(indexarray[vindex])],enabled );
-							glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-							vindex++;
-
-							//
-							glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-							TexCoord(vertexarray[(indexarray[vindex])],enabled );
-							glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-							vindex++;
-						}
-					}
-					else
-					{
-						for (unsigned int i=0;i<numindices;i+=4)
-						{
-							// This looks curiously endian unsafe to me.
-							// However it depends on the way the colors are packed into 
-							// the m_rgba field of RAS_TexVert
-					
-							//
-							glColor4ubv((const GLubyte *)(vertexarray[(indexarray[vindex])].getRGBA()));
-					
-							glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-							TexCoord(vertexarray[(indexarray[vindex])],enabled );
-							glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-							vindex++;
-						
-							//
-							glColor4ubv((const GLubyte *)(vertexarray[(indexarray[vindex])].getRGBA()));
-							glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-							TexCoord(vertexarray[(indexarray[vindex])],enabled );
-							glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-							vindex++;
-
-							//
-							glColor4ubv((const GLubyte *)(vertexarray[(indexarray[vindex])].getRGBA()));
-							glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-							TexCoord(vertexarray[(indexarray[vindex])],enabled );
-							glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-							vindex++;
-
-							//
-							glColor4ubv((const GLubyte *)(vertexarray[(indexarray[vindex])].getRGBA()));
-							glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-							TexCoord(vertexarray[(indexarray[vindex])],enabled );
-							glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-							vindex++;
-						}
-					}
-					glEnd();	
-					break;
-				}
-			case 0:
-				{
-					glBegin(GL_TRIANGLES);
-					vindex=0;
-					if (useObjectColor)
-					{
-						for (unsigned int i=0;i<numindices;i+=3)
-						{
-
-							glColor4d(rgbacolor[0], rgbacolor[1], rgbacolor[2], rgbacolor[3]);
-							//
-							glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-							TexCoord(vertexarray[(indexarray[vindex])],enabled );
-							glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-							vindex++;
-
-							//
-							glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-							TexCoord(vertexarray[(indexarray[vindex])],enabled );
-							glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-							vindex++;
-
-							//
-							glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-							TexCoord(vertexarray[(indexarray[vindex])],enabled );
-							glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-							vindex++;
-						}
-					}
-					else 
-					{
-						for (unsigned int i=0;i<numindices;i+=3)
-						{
-							//
-							glColor4ubv((const GLubyte *)(vertexarray[(indexarray[vindex])].getRGBA()));
-							glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-							TexCoord(vertexarray[(indexarray[vindex])],enabled );
-							glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-							vindex++;
-					
-							//
-							glColor4ubv((const GLubyte *)(vertexarray[(indexarray[vindex])].getRGBA()));
-							glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-							TexCoord(vertexarray[(indexarray[vindex])],enabled );
-							glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-							vindex++;
-
-							//
-							glColor4ubv((const GLubyte *)(vertexarray[(indexarray[vindex])].getRGBA()));
-							glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-							TexCoord(vertexarray[(indexarray[vindex])],enabled );
-							glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-							vindex++;
-						}
-					}
-					glEnd();	
-					break;
-				}
-			default:
-				{
-				}
-			} // switch
-		} // for each vertexarray
-	}
-#endif// GL_ARB_multitexture
-}
-
-void RAS_OpenGLRasterizer::IndexPrimitivesMulti_Ex(
-									const vecVertexArray & vertexarrays,
-									const vecIndexArrays & indexarrays,
-									int mode,
-									class RAS_IPolyMaterial* polymat,
-									class RAS_IRenderTools* rendertools,
-									bool useObjectColor,
-									const MT_Vector4& rgbacolor)
-{ 
-#if defined(GL_ARB_multitexture) && defined(WITH_GLEXT)
-	if (!getenv("WITHOUT_GLEXT")) {
-		bool	recalc;
-		GLenum drawmode;
-		switch (mode)
-		{
-		case 0:
-			drawmode = GL_TRIANGLES;
+				glEnd();
+			}
 			break;
-		case 1:
-			drawmode = GL_LINES;
-			break;
-		case 2:
-			drawmode = GL_QUADS;
-			break;
-		default:
-			drawmode = GL_LINES;
-			break;
-		}
-	
-		const RAS_TexVert* vertexarray ;
-		unsigned int numindices,vt;
-
-		for (vt=0;vt<vertexarrays.size();vt++)
-		{
-			vertexarray = &((*vertexarrays[vt]) [0]);
-			const KX_IndexArray & indexarray = (*indexarrays[vt]);
-			numindices = indexarray.size();
-			const unsigned int enabled = polymat->GetEnabled();
-		
-			if (!numindices)
-				continue;
-		
-			int vindex=0;
-			switch (mode)
+		case KX_MODE_QUADS:
 			{
-			case 1:
+				glBegin(GL_QUADS);
+				vindex=0;
+				if (useObjectColor)
 				{
-					glBegin(GL_LINES);
-					vindex=0;
-					for (unsigned int i=0;i<numindices;i+=2)
+					for (unsigned int i=0;i<numindices;i+=4)
 					{
-						glVertex3fv(vertexarray[(indexarray[vindex++])].getLocalXYZ());
-						glVertex3fv(vertexarray[(indexarray[vindex++])].getLocalXYZ());
+
+						glColor4d(rgbacolor[0], rgbacolor[1], rgbacolor[2], rgbacolor[3]);
+
+						//
+						glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
+						TexCoord(vertexarray[(indexarray[vindex])]);
+						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
+						vindex++;
+
+						//
+						glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
+						TexCoord(vertexarray[(indexarray[vindex])]);
+						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
+						vindex++;
+
+						//
+						glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
+						TexCoord(vertexarray[(indexarray[vindex])]);
+						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
+						vindex++;
+
+						//
+						glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
+						TexCoord(vertexarray[(indexarray[vindex])]);
+						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
+						vindex++;
 					}
-					glEnd();
 				}
+				else
+				{
+					for (unsigned int i=0;i<numindices;i+=4)
+					{
+						// This looks curiously endian unsafe to me.
+						// However it depends on the way the colors are packed into 
+						// the m_rgba field of RAS_TexVert
+				
+						//
+						glColor4ubv((const GLubyte *)(vertexarray[(indexarray[vindex])].getRGBA()));
+				
+						glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
+						TexCoord(vertexarray[(indexarray[vindex])]);
+						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
+						vindex++;
+					
+						//
+						glColor4ubv((const GLubyte *)(vertexarray[(indexarray[vindex])].getRGBA()));
+						glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
+						TexCoord(vertexarray[(indexarray[vindex])]);
+						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
+						vindex++;
+
+						//
+						glColor4ubv((const GLubyte *)(vertexarray[(indexarray[vindex])].getRGBA()));
+						glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
+						TexCoord(vertexarray[(indexarray[vindex])]);
+						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
+						vindex++;
+
+						//
+						glColor4ubv((const GLubyte *)(vertexarray[(indexarray[vindex])].getRGBA()));
+						glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
+						TexCoord(vertexarray[(indexarray[vindex])]);
+						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
+						vindex++;
+					}
+				}
+				glEnd();	
 				break;
-			case 2:
+			}
+		case KX_MODE_TRIANGLES:
+			{
+				glBegin(GL_TRIANGLES);
+				vindex=0;
+				if (useObjectColor)
 				{
-					glBegin(GL_QUADS);
-					vindex=0;
-					if (useObjectColor)
+					for (unsigned int i=0;i<numindices;i+=3)
 					{
-						for (unsigned int i=0;i<numindices;i+=4)
-						{
-							MT_Point3 mv1, mv2, mv3, mv4, fnor;
-							/* Calc a new face normal */
 
-							if (vertexarray[(indexarray[vindex])].getFlag() & TV_CALCFACENORMAL)
-								recalc= true;
-							else
-								recalc=false;
+						glColor4d(rgbacolor[0], rgbacolor[1], rgbacolor[2], rgbacolor[3]);
+						//
+						glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
+						TexCoord(vertexarray[(indexarray[vindex])]);
+						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
+						vindex++;
 
-							if (recalc){
-								mv1 = MT_Point3(vertexarray[(indexarray[vindex])].getLocalXYZ());
-								mv2 = MT_Point3(vertexarray[(indexarray[vindex+1])].getLocalXYZ());
-								mv3 = MT_Point3(vertexarray[(indexarray[vindex+2])].getLocalXYZ());
-								mv4 = MT_Point3(vertexarray[(indexarray[vindex+2])].getLocalXYZ());
-						
-								fnor = (((mv2-mv1).cross(mv3-mv2))+((mv4-mv3).cross(mv1-mv4))).safe_normalized();
+						//
+						glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
+						TexCoord(vertexarray[(indexarray[vindex])]);
+						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
+						vindex++;
 
-								glNormal3f(fnor[0], fnor[1], fnor[2]);
-							}
-
-							glColor4d(rgbacolor[0], rgbacolor[1], rgbacolor[2], rgbacolor[3]);
-
-							if (!recalc)
-								glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-
-							TexCoord(vertexarray[(indexarray[vindex])],enabled );
-							glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-							vindex++;
-					
-							if (!recalc)
-								glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-
-							TexCoord(vertexarray[(indexarray[vindex])],enabled );
-							glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-							vindex++;
-						
-							if (!recalc)
-								glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());						
-						
-							TexCoord(vertexarray[(indexarray[vindex])],enabled );
-							glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-							vindex++;
-					
-							if (!recalc)
-								glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-							TexCoord(vertexarray[(indexarray[vindex])],enabled );
-							glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-							vindex++;
-						}
+						//
+						glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
+						TexCoord(vertexarray[(indexarray[vindex])]);
+						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
+						vindex++;
 					}
-					else
-					{
-						for (unsigned int i=0;i<numindices;i+=4)
-						{
-							// This looks curiously endian unsafe to me.
-							// However it depends on the way the colors are packed into 
-							// the m_rgba field of RAS_TexVert
-							MT_Point3 mv1, mv2, mv3, mv4, fnor;
-							/* Calc a new face normal */
-
-							if (vertexarray[(indexarray[vindex])].getFlag() & TV_CALCFACENORMAL)
-								recalc= true;
-							else
-								recalc=false;
-
-
-							if (recalc){
-								mv1 = MT_Point3(vertexarray[(indexarray[vindex])].getLocalXYZ());
-								mv2 = MT_Point3(vertexarray[(indexarray[vindex+1])].getLocalXYZ());
-								mv3 = MT_Point3(vertexarray[(indexarray[vindex+2])].getLocalXYZ());
-								mv4 = MT_Point3(vertexarray[(indexarray[vindex+3])].getLocalXYZ());
-							
-								fnor = (((mv2-mv1).cross(mv3-mv2))+((mv4-mv3).cross(mv1-mv4))).safe_normalized();
-
-								glNormal3f(fnor[0], fnor[1], fnor[2]);
-							}
-
-							glColor4ubv((const GLubyte *)(vertexarray[(indexarray[vindex])].getRGBA()));
-							if (!recalc)
-								glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-
-							TexCoord(vertexarray[(indexarray[vindex])],enabled );
-							glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-							vindex++;
-						
-							glColor4ubv((const GLubyte *)(vertexarray[(indexarray[vindex])].getRGBA()));
-							if (!recalc)
-								glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-					
-							TexCoord(vertexarray[(indexarray[vindex])],enabled );
-							glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-							vindex++;
-						
-							glColor4ubv((const GLubyte *)(vertexarray[(indexarray[vindex])].getRGBA()));
-							if (!recalc)
-								glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-					
-							TexCoord(vertexarray[(indexarray[vindex])],enabled );
-							glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-							vindex++;
-						
-							glColor4ubv((const GLubyte *)(vertexarray[(indexarray[vindex])].getRGBA()));
-							if (!recalc)
-								glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-
-							TexCoord(vertexarray[(indexarray[vindex])],enabled );
-							glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-							vindex++;
-						}
-					}
-					glEnd();	
-					break;
 				}
-			case 0:
+				else 
 				{
-					glBegin(GL_TRIANGLES);
-					vindex=0;
-					if (useObjectColor)
+					for (unsigned int i=0;i<numindices;i+=3)
 					{
-						for (unsigned int i=0;i<numindices;i+=3)
-						{
-							MT_Point3 mv1, mv2, mv3, fnor;
-							/* Calc a new face normal */
+						//
+						glColor4ubv((const GLubyte *)(vertexarray[(indexarray[vindex])].getRGBA()));
+						glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
+						TexCoord(vertexarray[(indexarray[vindex])]);
+						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
+						vindex++;
+				
+						//
+						glColor4ubv((const GLubyte *)(vertexarray[(indexarray[vindex])].getRGBA()));
+						glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
+						TexCoord(vertexarray[(indexarray[vindex])]);
+						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
+						vindex++;
 
-							if (vertexarray[(indexarray[vindex])].getFlag() & TV_CALCFACENORMAL)
-								recalc= true;
-							else
-								recalc=false;
-
-							if (recalc){
-								mv1 = MT_Point3(vertexarray[(indexarray[vindex])].getLocalXYZ());
-								mv2 = MT_Point3(vertexarray[(indexarray[vindex+1])].getLocalXYZ());
-								mv3 = MT_Point3(vertexarray[(indexarray[vindex+2])].getLocalXYZ());
-							
-								fnor = ((mv2-mv1).cross(mv3-mv2)).safe_normalized();
-								glNormal3f(fnor[0], fnor[1], fnor[2]);
-							}
-
-							glColor4d(rgbacolor[0], rgbacolor[1], rgbacolor[2], rgbacolor[3]);
-
-							if (!recalc)
-								glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-							TexCoord(vertexarray[(indexarray[vindex])],enabled );
-							glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-							vindex++;
-							
-							if (!recalc)
-								glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-							TexCoord(vertexarray[(indexarray[vindex])],enabled );
-							glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-							vindex++;
-						
-							if (!recalc)
-								glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-							TexCoord(vertexarray[(indexarray[vindex])],enabled );
-							glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-							vindex++;
-						}
+						//
+						glColor4ubv((const GLubyte *)(vertexarray[(indexarray[vindex])].getRGBA()));
+						glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
+						TexCoord(vertexarray[(indexarray[vindex])]);
+						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
+						vindex++;
 					}
-					else 
-					{
-						for (unsigned int i=0;i<numindices;i+=3)
-						{
-							MT_Point3 mv1, mv2, mv3, fnor;
-							/* Calc a new face normal */
-
-							if (vertexarray[(indexarray[vindex])].getFlag() & TV_CALCFACENORMAL)
-								recalc= true;
-							else
-								recalc=false;
-
-
-							if (recalc){
-								mv1 = MT_Point3(vertexarray[(indexarray[vindex])].getLocalXYZ());
-								mv2 = MT_Point3(vertexarray[(indexarray[vindex+1])].getLocalXYZ());
-								mv3 = MT_Point3(vertexarray[(indexarray[vindex+2])].getLocalXYZ());
-							
-								fnor = ((mv2-mv1).cross(mv3-mv2)).safe_normalized();
-								glNormal3f(fnor[0], fnor[1], fnor[2]);
-							}
-
-							glColor4ubv((const GLubyte *)(vertexarray[(indexarray[vindex])].getRGBA()));
-							if (!recalc)
-								glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-							TexCoord(vertexarray[(indexarray[vindex])],enabled );
-							glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-							vindex++;
-						
-							glColor4ubv((const GLubyte *)(vertexarray[(indexarray[vindex])].getRGBA()));
-							if (!recalc)
-								glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-							TexCoord(vertexarray[(indexarray[vindex])],enabled );
-							glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-							vindex++;
-						
-							glColor4ubv((const GLubyte *)(vertexarray[(indexarray[vindex])].getRGBA()));
-							if (!recalc)
-								glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-							TexCoord(vertexarray[(indexarray[vindex])],enabled );
-							glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-							vindex++;
-						}
-					}
-					glEnd();	
-					break;
 				}
-			default:
-				{
-				}
-
-			} // switch
-		} // for each vertexarray
-	}
-#endif
+				glEnd();	
+				break;
+			}
+		default:
+			{
+			}
+		} // switch
+	} // for each vertexarray
 }
 
-
-
 void RAS_OpenGLRasterizer::SetProjectionMatrix(MT_CmMatrix4x4 &mat)
 {
 	glMatrixMode(GL_PROJECTION);
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
index 23714a12151..0d54552db05 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
@@ -41,7 +41,8 @@ using namespace std;
 #include "RAS_MaterialBucket.h"
 #include "RAS_ICanvas.h"
 
-#define RAS_MAX 3// match in BL_Material
+#define RAS_MAX_TEXCO	3	// match in BL_Material
+#define RAS_MAX_ATTRIB	16	// match in BL_BlenderShader
 
 struct	OglDebugLine
 {
@@ -94,8 +95,10 @@ class RAS_OpenGLRasterizer : public RAS_IRasterizer
 
 protected:
 	int				m_drawingmode;
-	TexCoGen		m_texco[RAS_MAX];
-	bool			m_useTang;
+	TexCoGen		m_texco[RAS_MAX_TEXCO];
+	TexCoGen		m_attrib[RAS_MAX_ATTRIB];
+	int				m_texco_num;
+	int				m_attrib_num;
 
 	/** Stores the caching information for the last material activated. */
 	RAS_IPolyMaterial::TCachingInfo m_materialCachingInfo;
@@ -145,28 +148,16 @@ public:
 	virtual void	IndexPrimitives(
 						const vecVertexArray& vertexarrays,
 						const vecIndexArrays & indexarrays,
-						int mode,
-						class RAS_IPolyMaterial* polymat,
-						class RAS_IRenderTools* rendertools,
+						DrawMode mode,
 						bool useObjectColor,
 						const MT_Vector4& rgbacolor,
 						class KX_ListSlot** slot
 					);
 
-	virtual void	IndexPrimitives_Ex(
-						const vecVertexArray& vertexarrays,
-						const vecIndexArrays & indexarrays,
-						int mode,
-						class RAS_IPolyMaterial* polymat,
-						class RAS_IRenderTools* rendertools,
-						bool useObjectColor,
-						const MT_Vector4& rgbacolor
-					);
-
 	virtual void	IndexPrimitives_3DText(
 						const vecVertexArray& vertexarrays,
 						const vecIndexArrays & indexarrays,
-						int mode,
+						DrawMode mode,
 						class RAS_IPolyMaterial* polymat,
 						class RAS_IRenderTools* rendertools,
 						bool useObjectColor,
@@ -176,22 +167,11 @@ public:
 	virtual void IndexPrimitivesMulti( 
 						const vecVertexArray& vertexarrays,
 						const vecIndexArrays & indexarrays,
-						int mode,
-						class RAS_IPolyMaterial* polymat,
-						class RAS_IRenderTools* rendertools,
+						DrawMode mode,
 						bool useObjectColor,
 						const MT_Vector4& rgbacolor,
 						class KX_ListSlot** slot);
 
-	virtual void IndexPrimitivesMulti_Ex( 
-						const vecVertexArray& vertexarrays,
-						const vecIndexArrays & indexarrays,
-						int mode,
-						class RAS_IPolyMaterial* polymat,
-						class RAS_IRenderTools* rendertools,
-						bool useObjectColor,
-						const MT_Vector4& rgbacolor);
-
 
 	virtual void	SetProjectionMatrix(MT_CmMatrix4x4 & mat);
 	virtual void	SetProjectionMatrix(const MT_Matrix4x4 & mat);
@@ -286,9 +266,12 @@ public:
 
 	std::vector <OglDebugLine>	m_debugLines;
 
-	virtual void	SetTexCoords(TexCoGen coords,int enabled);
-	virtual void	SetAttrib(int type);
-	void			TexCoord(const RAS_TexVert &tv, int unit);
+	virtual void SetTexCoordNum(int num);
+	virtual void SetAttribNum(int num);
+	virtual void SetTexCoord(TexCoGen coords, int unit);
+	virtual void SetAttrib(TexCoGen coords, int unit);
+
+	void			TexCoord(const RAS_TexVert &tv);
 	virtual void	GetViewMatrix(MT_Matrix4x4 &mat) const;
 
 	void	Tangent(const RAS_TexVert& v1,
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
index ddfcc3f3f9d..c78a97ad7be 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
@@ -32,34 +32,21 @@
 #include "RAS_VAOpenGLRasterizer.h"
 #include <stdlib.h>
 
-#ifdef WIN32
-#include <windows.h>
-#endif // WIN32
-#ifdef __APPLE__
-#define GL_GLEXT_LEGACY 1
-#include <OpenGL/gl.h>
-#else
-#include <GL/gl.h>
-#endif
+#include "GL/glew.h"
 
 #include "STR_String.h"
 #include "RAS_TexVert.h"
 #include "MT_CmMatrix4x4.h"
 #include "RAS_IRenderTools.h" // rendering text
-
-#include "RAS_GLExtensionManager.h"
 	
-
-using namespace bgl;
-
 RAS_VAOpenGLRasterizer::RAS_VAOpenGLRasterizer(RAS_ICanvas* canvas, bool lock)
 :	RAS_OpenGLRasterizer(canvas),
-	m_Lock(lock && RAS_EXT_support._EXT_compiled_vertex_array)	
+	m_Lock(lock && GLEW_EXT_compiled_vertex_array),
+	m_last_texco_num(0),
+	m_last_attrib_num(0)
 {
 }
 
-
-
 RAS_VAOpenGLRasterizer::~RAS_VAOpenGLRasterizer()
 {
 }
@@ -72,9 +59,9 @@ bool RAS_VAOpenGLRasterizer::Init(void)
 	if (result)
 	{
 		glEnableClientState(GL_VERTEX_ARRAY);
-		glDisableClientState(GL_TEXTURE_COORD_ARRAY);
 		glEnableClientState(GL_NORMAL_ARRAY);
 		glDisableClientState(GL_COLOR_ARRAY);
+		glDisableClientState(GL_TEXTURE_COORD_ARRAY);
 
 		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 	}
@@ -82,87 +69,59 @@ bool RAS_VAOpenGLRasterizer::Init(void)
 	return result;
 }
 
-
-
 void RAS_VAOpenGLRasterizer::SetDrawingMode(int drawingmode)
 {
 	m_drawingmode = drawingmode;
 
-		switch (m_drawingmode)
+	switch (m_drawingmode)
 	{
-	case KX_BOUNDINGBOX:
-		{
-		}
-	case KX_WIREFRAME:
-		{
-			glDisable (GL_CULL_FACE);
+		case KX_BOUNDINGBOX:
+		case KX_WIREFRAME:
+			glDisableClientState(GL_COLOR_ARRAY);
+			glDisable(GL_CULL_FACE);
 			break;
-		}
-	case KX_TEXTURED:
-		{
-		}
-	case KX_SHADED:
-		{
+		case KX_SOLID:
+			glDisableClientState(GL_COLOR_ARRAY);
+			break;
+		case KX_TEXTURED:
+		case KX_SHADED:
+		case KX_SHADOW:
 			glEnableClientState(GL_COLOR_ARRAY);
-		}
-	case KX_SOLID:
-		{
+		default:
 			break;
-		}
-	default:
-		{
-		}
 	}
 }
 
-
-
 void RAS_VAOpenGLRasterizer::Exit()
 {
-	glDisableClientState(GL_VERTEX_ARRAY);
+	glEnableClientState(GL_VERTEX_ARRAY);
+	glEnableClientState(GL_NORMAL_ARRAY);
 	glDisableClientState(GL_TEXTURE_COORD_ARRAY);
 	glDisableClientState(GL_COLOR_ARRAY);
-	glDisableClientState(GL_NORMAL_ARRAY);
+	EnableTextures(false);
 
 	RAS_OpenGLRasterizer::Exit();
 }
 
-
-
 void RAS_VAOpenGLRasterizer::IndexPrimitives( const vecVertexArray& vertexarrays,
 							const vecIndexArrays & indexarrays,
-							int mode,
-							class RAS_IPolyMaterial* polymat,
-							class RAS_IRenderTools* rendertools,
+							DrawMode mode,
 							bool useObjectColor,
 							const MT_Vector4& rgbacolor,
 							class KX_ListSlot** slot)
 {
 	static const GLsizei vtxstride = sizeof(RAS_TexVert);
 	GLenum drawmode;
-	switch (mode)
-	{
-	case 0:
-		{
+	if(mode == KX_MODE_TRIANGLES)
 		drawmode = GL_TRIANGLES;
-		break;
-		}
-	case 2:
-		{
+	else if(mode == KX_MODE_QUADS)
 		drawmode = GL_QUADS;
-		break;
-		}
-	case 1:	//lines
-		{
-		}
-	default:
-		{
+	else
 		drawmode = GL_LINES;
-		break;
-		}
-	}
+
 	const RAS_TexVert* vertexarray;
 	unsigned int numindices, vt;
+
 	if (drawmode != GL_LINES)
 	{
 		if (useObjectColor)
@@ -180,6 +139,9 @@ void RAS_VAOpenGLRasterizer::IndexPrimitives( const vecVertexArray& vertexarrays
 		glColor3d(0,0,0);
 	}
 
+	EnableTextures(false);
+	glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+
 	// use glDrawElements to draw each vertexarray
 	for (vt=0;vt<vertexarrays.size();vt++)
 	{
@@ -191,9 +153,10 @@ void RAS_VAOpenGLRasterizer::IndexPrimitives( const vecVertexArray& vertexarrays
 			continue;
 		
 		glVertexPointer(3,GL_FLOAT,vtxstride,vertexarray->getLocalXYZ());
-		glTexCoordPointer(2,GL_FLOAT,vtxstride,vertexarray->getUV1());
-		glColorPointer(4,GL_UNSIGNED_BYTE,vtxstride,vertexarray->getRGBA());
 		glNormalPointer(GL_FLOAT,vtxstride,vertexarray->getNormal());
+		glTexCoordPointer(2,GL_FLOAT,vtxstride,vertexarray->getUV1());
+		if(glIsEnabled(GL_COLOR_ARRAY))
+			glColorPointer(4,GL_UNSIGNED_BYTE,vtxstride,vertexarray->getRGBA());
 
 		//if(m_Lock)
 		//	local->Begin(vertexarrays[vt]->size());
@@ -203,47 +166,30 @@ void RAS_VAOpenGLRasterizer::IndexPrimitives( const vecVertexArray& vertexarrays
 
 		//if(m_Lock)
 		//	local->End();
-
-
 	}
-}
 
+	glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+}
 
 void RAS_VAOpenGLRasterizer::IndexPrimitivesMulti( const vecVertexArray& vertexarrays,
 							const vecIndexArrays & indexarrays,
-							int mode,
-							class RAS_IPolyMaterial* polymat,
-							class RAS_IRenderTools* rendertools,
+							DrawMode mode,
 							bool useObjectColor,
 							const MT_Vector4& rgbacolor,
 							class KX_ListSlot** slot)
 {
 	static const GLsizei vtxstride = sizeof(RAS_TexVert);
+
 	GLenum drawmode;
-	switch (mode)
-	{
-	case 0:
-		{
+	if(mode == KX_MODE_TRIANGLES)
 		drawmode = GL_TRIANGLES;
-		break;
-		}
-	case 2:
-		{
+	else if(mode == KX_MODE_QUADS)
 		drawmode = GL_QUADS;
-		break;
-		}
-	case 1:	//lines
-		{
-		}
-	default:
-		{
+	else
 		drawmode = GL_LINES;
-		break;
-		}
-	}
+
 	const RAS_TexVert* vertexarray;
 	unsigned int numindices, vt;
-	const unsigned int enabled = polymat->GetEnabled();
 
 	if (drawmode != GL_LINES)
 	{
@@ -251,7 +197,8 @@ void RAS_VAOpenGLRasterizer::IndexPrimitivesMulti( const vecVertexArray& vertexa
 		{
 			glDisableClientState(GL_COLOR_ARRAY);
 			glColor4d(rgbacolor[0], rgbacolor[1], rgbacolor[2], rgbacolor[3]);
-		} else
+		}
+		else
 		{
 			glColor4d(0,0,0,1.0);
 			glEnableClientState(GL_COLOR_ARRAY);
@@ -271,13 +218,12 @@ void RAS_VAOpenGLRasterizer::IndexPrimitivesMulti( const vecVertexArray& vertexa
 
 		if (!numindices)
 			continue;
-		
-		glVertexPointer(3,GL_FLOAT,vtxstride,vertexarray->getLocalXYZ());
-		TexCoordPtr(vertexarray, enabled);
 
-		//glTexCoordPointer(2,GL_FLOAT,vtxstride,vertexarray->getUV1());
-		glColorPointer(4,GL_UNSIGNED_BYTE,vtxstride,vertexarray->getRGBA());
+		glVertexPointer(3,GL_FLOAT,vtxstride,vertexarray->getLocalXYZ());
 		glNormalPointer(GL_FLOAT,vtxstride,vertexarray->getNormal());
+		TexCoordPtr(vertexarray);
+		if(glIsEnabled(GL_COLOR_ARRAY))
+			glColorPointer(4,GL_UNSIGNED_BYTE,vtxstride,vertexarray->getRGBA());
 
 		//if(m_Lock)
 		//	local->Begin(vertexarrays[vt]->size());
@@ -290,62 +236,161 @@ void RAS_VAOpenGLRasterizer::IndexPrimitivesMulti( const vecVertexArray& vertexa
 	}
 }
 
-void RAS_VAOpenGLRasterizer::TexCoordPtr(const RAS_TexVert *tv, int enabled)
+void RAS_VAOpenGLRasterizer::TexCoordPtr(const RAS_TexVert *tv)
 {
-#if defined(GL_ARB_multitexture) && defined(WITH_GLEXT)
-	if (!getenv("WITHOUT_GLEXT")) {
-		if(bgl::RAS_EXT_support._ARB_multitexture)
-		{
-			for(int unit=0; unit<enabled; unit++)
-			{
-				bgl::blClientActiveTextureARB(GL_TEXTURE0_ARB+unit);
+	/* note: this function must closely match EnableTextures to enable/disable
+	 * the right arrays, otherwise coordinate and attribute pointers from other
+	 * materials can still be used and cause crashes */
+	int unit;
 
+	if(GLEW_ARB_multitexture)
+	{
+		for(unit=0; unit<m_texco_num; unit++)
+		{
+			glClientActiveTextureARB(GL_TEXTURE0_ARB+unit);
+			if(tv->getFlag() & TV_2NDUV && (int)tv->getUnit() == unit) {
 				glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-				if( tv->getFlag() & TV_2NDUV && tv->getUnit() == unit ) {
-					glTexCoordPointer(2, GL_FLOAT, sizeof(RAS_TexVert), tv->getUV2());
-					continue;
-				}
-				switch(m_texco[unit])
-				{
-				case RAS_TEXCO_DISABLE:
-				case RAS_TEXCO_OBJECT:
-				case RAS_TEXCO_GEN:
-					glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-					break;
-				case RAS_TEXCO_ORCO:
-				case RAS_TEXCO_GLOB:
-					glTexCoordPointer(3, GL_FLOAT, sizeof(RAS_TexVert),tv->getLocalXYZ());
-					break;
-				case RAS_TEXCO_UV1:
-					glTexCoordPointer(2, GL_FLOAT, sizeof(RAS_TexVert),tv->getUV1());
-					break;
-				case RAS_TEXCO_NORM:
-					glTexCoordPointer(3, GL_FLOAT, sizeof(RAS_TexVert),tv->getNormal());
-					break;
-				case RAS_TEXTANGENT:
-					glTexCoordPointer(4, GL_FLOAT, sizeof(RAS_TexVert),tv->getTangent());
-					break;
-				case RAS_TEXCO_UV2:
-					glTexCoordPointer(2, GL_FLOAT, sizeof(RAS_TexVert),tv->getUV2());
-					break;
-				}
+				glTexCoordPointer(2, GL_FLOAT, sizeof(RAS_TexVert), tv->getUV2());
+				continue;
+			}
+			switch(m_texco[unit])
+			{
+			case RAS_TEXCO_ORCO:
+			case RAS_TEXCO_GLOB:
+				glTexCoordPointer(3, GL_FLOAT, sizeof(RAS_TexVert),tv->getLocalXYZ());
+				break;
+			case RAS_TEXCO_UV1:
+				glTexCoordPointer(2, GL_FLOAT, sizeof(RAS_TexVert),tv->getUV1());
+				break;
+			case RAS_TEXCO_NORM:
+				glTexCoordPointer(3, GL_FLOAT, sizeof(RAS_TexVert),tv->getNormal());
+				break;
+			case RAS_TEXTANGENT:
+				glTexCoordPointer(4, GL_FLOAT, sizeof(RAS_TexVert),tv->getTangent());
+				break;
+			case RAS_TEXCO_UV2:
+				glTexCoordPointer(2, GL_FLOAT, sizeof(RAS_TexVert),tv->getUV2());
+				break;
+			default:
+				break;
 			}
 		}
 
-#ifdef GL_ARB_vertex_program
-		if(m_useTang && bgl::RAS_EXT_support._ARB_vertex_program)
-			bgl::blVertexAttrib4fvARB(1/*tangent*/, tv->getTangent());
-#endif
+		glClientActiveTextureARB(GL_TEXTURE0_ARB);
 	}
-#endif
-}
 
+	if(GLEW_ARB_vertex_program) {
+		for(unit=0; unit<m_attrib_num; unit++) {
+			switch(m_attrib[unit]) {
+			case RAS_TEXCO_ORCO:
+			case RAS_TEXCO_GLOB:
+				glVertexAttribPointerARB(unit, 3, GL_FLOAT, GL_FALSE, sizeof(RAS_TexVert), tv->getLocalXYZ());
+				break;
+			case RAS_TEXCO_UV1:
+				glVertexAttribPointerARB(unit, 2, GL_FLOAT, GL_FALSE, sizeof(RAS_TexVert), tv->getUV1());
+				break;
+			case RAS_TEXCO_NORM:
+				glVertexAttribPointerARB(unit, 3, GL_FLOAT, GL_FALSE, sizeof(RAS_TexVert), tv->getNormal());
+				break;
+			case RAS_TEXTANGENT:
+				glVertexAttribPointerARB(unit, 4, GL_FLOAT, GL_FALSE, sizeof(RAS_TexVert), tv->getTangent());
+				break;
+			case RAS_TEXCO_UV2:
+				glVertexAttribPointerARB(unit, 2, GL_FLOAT, GL_FALSE, sizeof(RAS_TexVert), tv->getUV2());
+				break;
+			case RAS_TEXCO_VCOL:
+				glVertexAttribPointerARB(unit, 4, GL_UNSIGNED_BYTE, GL_FALSE, sizeof(RAS_TexVert), tv->getRGBA());
+				break;
+			default:
+				break;
+			}
+		}
+	}
+}
 
 void RAS_VAOpenGLRasterizer::EnableTextures(bool enable)
 {
-	if (enable)
-		glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-	else
-		glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+	TexCoGen *texco, *attrib;
+	int unit, texco_num, attrib_num;
+
+	/* disable previously enabled texture coordinates and attributes. ideally
+	 * this shouldn't be necessary .. */
+	if(enable)
+		EnableTextures(false);
+
+	/* we cache last texcoords and attribs to ensure we disable the ones that
+	 * were actually last set */
+	if(enable) {
+		texco = m_texco;
+		texco_num = m_texco_num;
+		attrib = m_attrib;
+		attrib_num = m_attrib_num;
+		
+		memcpy(m_last_texco, m_texco, sizeof(TexCoGen)*m_texco_num);
+		m_last_texco_num = m_texco_num;
+		memcpy(m_last_attrib, m_attrib, sizeof(TexCoGen)*m_attrib_num);
+		m_last_attrib_num = m_attrib_num;
+	}
+	else {
+		texco = m_last_texco;
+		texco_num = m_last_texco_num;
+		attrib = m_last_attrib;
+		attrib_num = m_last_attrib_num;
+	}
+
+	if(GLEW_ARB_multitexture) {
+		for(unit=0; unit<texco_num; unit++) {
+			glClientActiveTextureARB(GL_TEXTURE0_ARB+unit);
+
+			switch(texco[unit])
+			{
+			case RAS_TEXCO_ORCO:
+			case RAS_TEXCO_GLOB:
+			case RAS_TEXCO_UV1:
+			case RAS_TEXCO_NORM:
+			case RAS_TEXTANGENT:
+			case RAS_TEXCO_UV2:
+				if(enable) glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+				else glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+				break;
+			default:
+				glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+				break;
+			}
+		}
+
+		glClientActiveTextureARB(GL_TEXTURE0_ARB);
+	}
+	else {
+		if(texco_num) {
+			if(enable) glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+			else glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+		}
+	}
+
+	if(GLEW_ARB_vertex_program) {
+		for(unit=0; unit<attrib_num; unit++) {
+			switch(attrib[unit]) {
+			case RAS_TEXCO_ORCO:
+			case RAS_TEXCO_GLOB:
+			case RAS_TEXCO_UV1:
+			case RAS_TEXCO_NORM:
+			case RAS_TEXTANGENT:
+			case RAS_TEXCO_UV2:
+			case RAS_TEXCO_VCOL:
+				if(enable) glEnableVertexAttribArrayARB(unit);
+				else glDisableVertexAttribArrayARB(unit);
+				break;
+			default:
+				glDisableVertexAttribArrayARB(unit);
+				break;
+			}
+		}
+	}
+
+	if(!enable) {
+		m_last_texco_num = 0;
+		m_last_attrib_num = 0;
+	}
 }
 
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
index 4d478b0171f..e4cc4ace0e8 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
@@ -33,9 +33,14 @@
 
 class RAS_VAOpenGLRasterizer : public RAS_OpenGLRasterizer
 {
-	void TexCoordPtr(const RAS_TexVert *tv, int unit);
+	void TexCoordPtr(const RAS_TexVert *tv);
 	bool m_Lock;
 
+	TexCoGen		m_last_texco[RAS_MAX_TEXCO];
+	TexCoGen		m_last_attrib[RAS_MAX_ATTRIB];
+	int				m_last_texco_num;
+	int				m_last_attrib_num;
+
 public:
 	RAS_VAOpenGLRasterizer(RAS_ICanvas* canvas, bool lock=false);
 	virtual ~RAS_VAOpenGLRasterizer();
@@ -47,9 +52,7 @@ public:
 
 	virtual void	IndexPrimitives( const vecVertexArray& vertexarrays,
 		const vecIndexArrays & indexarrays,
-		int mode,
-		class RAS_IPolyMaterial* polymat,
-		class RAS_IRenderTools* rendertools,
+		DrawMode mode,
 		bool useObjectColor,
 		const MT_Vector4& rgbacolor,
 		class KX_ListSlot** slot);
@@ -57,9 +60,7 @@ public:
 	virtual void IndexPrimitivesMulti( 
 		const vecVertexArray& vertexarrays,
 		const vecIndexArrays & indexarrays,
-		int mode,
-		class RAS_IPolyMaterial* polymat,
-		class RAS_IRenderTools* rendertools,
+		DrawMode mode,
 		bool useObjectColor,
 		const MT_Vector4& rgbacolor,
 		class KX_ListSlot** slot);
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
index f2d2e977668..0cf9c326370 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
@@ -4,9 +4,9 @@ Import ('env')
 if env['WITH_BF_GLEXT'] == 1:
         env['CPPFLAGS'].append('-DWITH_GLEXT')
 
-sources = env.Glob('*.cpp') #'RAS_GLExtensionManager.cpp RAS_ListRasterizer.cpp RAS_OpenGLRasterizer.cpp RAS_VAOpenGLRasterizer.cpp'
+sources = env.Glob('*.cpp')
 
-incs = '. #source/kernel/gen_system #intern/string #intern/moto/include #source/gameengine/Rasterizer #source/gameengine/BlenderRoutines'
-incs += ' ' + env['BF_OPENGL_INC']
+incs = '. #source/kernel/gen_system #intern/string #intern/moto/include #source/gameengine/Rasterizer #source/gameengine/BlenderRoutines '
+incs += ' #extern/glew/include ' + env['BF_OPENGL_INC']
 
 env.BlenderLib ( 'bf_oglrasterizer', Split(sources), Split(incs), [], libtype=['game','player'], priority=[40, 120] )
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/mkglext.py b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/mkglext.py
deleted file mode 100644
index 8f4065b3d6a..00000000000
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/mkglext.py
+++ /dev/null
@@ -1,627 +0,0 @@
-#!/usr/bin/python
-#
-# $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 *****
-
-#
-# mkglext.py generates code for linking extensions.
-#
-# It reads the glext.h header from stdin and writes code to stdout.
-#
-# Usage: mkglext.py < glext.h > tmp
-# Code can be copied & pasted from tmp to GL_ExtensionManager.cpp.
-#
-# glext.h is available here: http://oss.sgi.com/projects/ogl-sample/ABI/glext.h
-#
-
-from sys import stdin
-import string, re
-
-glext_h = string.split(stdin.read(), '\n')
-
-# These extensions have been incorporated into the core GL or been superceded.
-# Code will not be generated for these extensions
-blacklist = [
-	"GL_EXT_multisample", 
-	"GL_INGR_blend_func_separate", 
-	"GL_SGIX_fragment_lighting", 
-	"GL_SGIX_polynomial_ffd", 
-	"GL_SGIS_point_parameters", 
-	"GL_EXT_texture_object", 
-	"GL_EXT_subtexture",
-	"GL_EXT_copy_texture", 
-	"GL_EXT_vertex_array",
-	"GL_EXT_point_parameters",
-	"GL_EXT_blend_color",
-	"GL_EXT_polygon_offset",
-	"GL_EXT_texture"]
-
-# Only code for these extensions will be generated.  Extensions on both the 
-# blacklist & whitelist will not have code generated.
-# This list is from http://oss.sgi.com/projects/ogl-sample/registry/ at 14-Mar-04
-whitelist = [
-	# ARB Extensions 
-	"GL_ARB_multitexture",
-	"GLX_ARB_get_proc_address",
-	"GL_ARB_transpose_matrix",
-	"WGL_ARB_buffer_region",
-	"GL_ARB_multisample",
-	"GL_ARB_texture_env_add",
-	"GL_ARB_texture_cube_map",
-	"WGL_ARB_extensions_string",
-	"WGL_ARB_pixel_format",
-	"WGL_ARB_make_current_read",
-	"WGL_ARB_pbuffer",
-	"GL_ARB_texture_compression",
-	"GL_ARB_texture_border_clamp",
-	"GL_ARB_point_parameters",
-	"GL_ARB_vertex_blend",
-	"GL_ARB_matrix_palette",
-	"GL_ARB_texture_env_combine",
-	"GL_ARB_texture_env_crossbar",
-	"GL_ARB_texture_env_dot3",
-	"WGL_ARB_render_texture",
-	"GL_ARB_texture_mirrored_repeat",
-	"GL_ARB_depth_texture",
-	"GL_ARB_shadow",
-	"GL_ARB_shadow_ambient",
-	"GL_ARB_window_pos",
-	"GL_ARB_vertex_program",
-	"GL_ARB_fragment_program",
-	"GL_ARB_vertex_buffer_object",
-	"GL_ARB_occlusion_query",
-	"GL_ARB_shader_objects",
-	"GL_ARB_vertex_shader",
-	"GL_ARB_fragment_shader",
-	"GL_ARB_shading_language_100",
-	"GL_ARB_texture_non_power_of_two",
-	"GL_ARB_point_sprite",
-	"GL_ARB_fragment_program_shadow",
-	
-	# Non ARB Extensions
-	"GL_EXT_abgr",
-	"GL_EXT_blend_color",
-	"GL_EXT_polygon_offset",
-	"GL_EXT_texture",
-	"GL_EXT_texture3D",
-	"GL_SGIS_texture_filter4",
-	"GL_EXT_subtexture",
-	"GL_EXT_copy_texture",
-	"GL_EXT_histogram",
-	"GL_EXT_convolution",
-	"GL_SGI_color_matrix",
-	"GL_SGI_color_table",
-	"GL_SGIS_pixel_texture",
-	"GL_SGIS_texture4D",
-	"GL_SGI_texture_color_table",
-	"GL_EXT_cmyka",
-	"GL_EXT_texture_object",
-	"GL_SGIS_detail_texture",
-	"GL_SGIS_sharpen_texture",
-	"GL_EXT_packed_pixels",
-	"GL_SGIS_texture_lod",
-	"GL_SGIS_multisample",
-	"GL_EXT_rescale_normal",
-	"GLX_EXT_visual_info",
-	"GL_EXT_vertex_array",
-	"GL_EXT_misc_attribute",
-	"GL_SGIS_generate_mipmap",
-	"GL_SGIX_clipmap",
-	"GL_SGIX_shadow",
-	"GL_SGIS_texture_edge_clamp",
-	"GL_SGIS_texture_border_clamp",
-	"GL_EXT_blend_minmax",
-	"GL_EXT_blend_subtract",
-	"GL_EXT_blend_logic_op",
-	"GLX_SGI_swap_control",
-	"GLX_SGI_video_sync",
-	"GLX_SGI_make_current_read",
-	"GLX_SGIX_video_source",
-	"GLX_EXT_visual_rating",
-	"GL_SGIX_interlace",
-	"GLX_EXT_import_context",
-	"GLX_SGIX_fbconfig",
-	"GLX_SGIX_pbuffer",
-	"GL_SGIS_texture_select",
-	"GL_SGIX_sprite",
-	"GL_SGIX_texture_multi_buffer",
-	"GL_EXT_point_parameters",
-	"GL_SGIX_instruments",
-	"GL_SGIX_texture_scale_bias",
-	"GL_SGIX_framezoom",
-	"GL_SGIX_tag_sample_buffer",
-	"GL_SGIX_reference_plane",
-	"GL_SGIX_flush_raster",
-	"GLX_SGI_cushion",
-	"GL_SGIX_depth_texture",
-	"GL_SGIS_fog_function",
-	"GL_SGIX_fog_offset",
-	"GL_HP_image_transform",
-	"GL_HP_convolution_border_modes",
-	"GL_SGIX_texture_add_env",
-	"GL_EXT_color_subtable",
-	"GLU_EXT_object_space_tess",
-	"GL_PGI_vertex_hints",
-	"GL_PGI_misc_hints",
-	"GL_EXT_paletted_texture",
-	"GL_EXT_clip_volume_hint",
-	"GL_SGIX_list_priority",
-	"GL_SGIX_ir_instrument1",
-	"GLX_SGIX_video_resize",
-	"GL_SGIX_texture_lod_bias",
-	"GLU_SGI_filter4_parameters",
-	"GLX_SGIX_dm_buffer",
-	"GL_SGIX_shadow_ambient",
-	"GLX_SGIX_swap_group",
-	"GLX_SGIX_swap_barrier",
-	"GL_EXT_index_texture",
-	"GL_EXT_index_material",
-	"GL_EXT_index_func",
-	"GL_EXT_index_array_formats",
-	"GL_EXT_compiled_vertex_array",
-	"GL_EXT_cull_vertex",
-	"GLU_EXT_nurbs_tessellator",
-	"GL_SGIX_ycrcb",
-	"GL_EXT_fragment_lighting",
-	"GL_IBM_rasterpos_clip",
-	"GL_HP_texture_lighting",
-	"GL_EXT_draw_range_elements",
-	"GL_WIN_phong_shading",
-	"GL_WIN_specular_fog",
-	"GLX_SGIS_color_range",
-	"GL_EXT_light_texture",
-	"GL_SGIX_blend_alpha_minmax",
-	"GL_EXT_scene_marker",
-	"GL_SGIX_pixel_texture_bits",
-	"GL_EXT_bgra",
-	"GL_SGIX_async",
-	"GL_SGIX_async_pixel",
-	"GL_SGIX_async_histogram",
-	"GL_INTEL_texture_scissor",
-	"GL_INTEL_parallel_arrays",
-	"GL_HP_occlusion_test",
-	"GL_EXT_pixel_transform",
-	"GL_EXT_pixel_transform_color_table",
-	"GL_EXT_shared_texture_palette",
-	"GLX_SGIS_blended_overlay",
-	"GL_EXT_separate_specular_color",
-	"GL_EXT_secondary_color",
-	"GL_EXT_texture_env",
-	"GL_EXT_texture_perturb_normal",
-	"GL_EXT_multi_draw_arrays",
-	"GL_EXT_fog_coord",
-	"GL_REND_screen_coordinates",
-	"GL_EXT_coordinate_frame",
-	"GL_EXT_texture_env_combine",
-	"GL_APPLE_specular_vector",
-	"GL_SGIX_pixel_texture",
-	"GL_APPLE_transform_hint",
-	"GL_SUNX_constant_data",
-	"GL_SUN_global_alpha",
-	"GL_SUN_triangle_list",
-	"GL_SUN_vertex",
-	"WGL_EXT_display_color_table",
-	"WGL_EXT_extensions_string",
-	"WGL_EXT_make_current_read",
-	"WGL_EXT_pixel_format",
-	"WGL_EXT_pbuffer",
-	"WGL_EXT_swap_control",
-	"GL_EXT_blend_func_separate",
-	"GL_INGR_color_clamp",
-	"GL_INGR_interlace_read",
-	"GL_EXT_stencil_wrap",
-	"WGL_EXT_depth_float",
-	"GL_EXT_422_pixels",
-	"GL_NV_texgen_reflection",
-	"GL_SGIX_texture_range",
-	"GL_SUN_convolution_border_modes",
-	"GLX_SUN_get_transparent_index",
-	"GL_EXT_texture_env_add",
-	"GL_EXT_texture_lod_bias",
-	"GL_EXT_texture_filter_anisotropic",
-	"GL_EXT_vertex_weighting",
-	"GL_NV_light_max_exponent",
-	"GL_NV_vertex_array_range",
-	"GL_NV_register_combiners",
-	"GL_NV_fog_distance",
-	"GL_NV_texgen_emboss",
-	"GL_NV_blend_square",
-	"GL_NV_texture_env_combine4",
-	"GL_MESA_resize_buffers",
-	"GL_MESA_window_pos",
-	"GL_EXT_texture_compression_s3tc",
-	"GL_IBM_cull_vertex",
-	"GL_IBM_multimode_draw_arrays",
-	"GL_IBM_vertex_array_lists",
-	"GL_3DFX_texture_compression_FXT1",
-	"GL_3DFX_multisample",
-	"GL_3DFX_tbuffer",
-	"WGL_EXT_multisample",
-	"GL_SGIX_vertex_preclip",
-	"GL_SGIX_resample",
-	"GL_SGIS_texture_color_mask",
-	"GLX_MESA_copy_sub_buffer",
-	"GLX_MESA_pixmap_colormap",
-	"GLX_MESA_release_buffers",
-	"GLX_MESA_set_3dfx_mode",
-	"GL_EXT_texture_env_dot3",
-	"GL_ATI_texture_mirror_once",
-	"GL_NV_fence",
-	"GL_IBM_static_data",
-	"GL_IBM_texture_mirrored_repeat",
-	"GL_NV_evaluators",
-	"GL_NV_packed_depth_stencil",
-	"GL_NV_register_combiners2",
-	"GL_NV_texture_compression_vtc",
-	"GL_NV_texture_rectangle",
-	"GL_NV_texture_shader",
-	"GL_NV_texture_shader2",
-	"GL_NV_vertex_array_range2",
-	"GL_NV_vertex_program",
-	"GLX_SGIX_visual_select_group",
-	"GL_SGIX_texture_coordinate_clamp",
-	"GLX_OML_swap_method",
-	"GLX_OML_sync_control",
-	"GL_OML_interlace",
-	"GL_OML_subsample",
-	"GL_OML_resample",
-	"WGL_OML_sync_control",
-	"GL_NV_copy_depth_to_color",
-	"GL_ATI_envmap_bumpmap",
-	"GL_ATI_fragment_shader",
-	"GL_ATI_pn_triangles",
-	"GL_ATI_vertex_array_object",
-	"GL_EXT_vertex_shader",
-	"GL_ATI_vertex_streams",
-	"WGL_I3D_digital_video_control",
-	"WGL_I3D_gamma",
-	"WGL_I3D_genlock",
-	"WGL_I3D_image_buffer",
-	"WGL_I3D_swap_frame_lock",
-	"WGL_I3D_swap_frame_usage",
-	"GL_ATI_element_array",
-	"GL_SUN_mesh_array",
-	"GL_SUN_slice_accum",
-	"GL_NV_multisample_filter_hint",
-	"GL_NV_depth_clamp",
-	"GL_NV_occlusion_query",
-	"GL_NV_point_sprite",
-	"WGL_NV_render_depth_texture",
-	"WGL_NV_render_texture_rectangle",
-	"GL_NV_texture_shader3",
-	"GL_NV_vertex_program1_1",
-	"GL_EXT_shadow_funcs",
-	"GL_EXT_stencil_two_side",
-	"GL_ATI_text_fragment_shader",
-	"GL_APPLE_client_storage",
-	"GL_APPLE_element_array",
-	"GL_APPLE_fence",
-	"GL_APPLE_vertex_array_object",
-	"GL_APPLE_vertex_array_range",
-	"GL_APPLE_ycbcr_422",
-	"GL_S3_s3tc",
-	"GL_ATI_draw_buffers",
-	"WGL_ATI_pixel_format_float",
-	"GL_ATI_texture_env_combine3",
-	"GL_ATI_texture_float",
-	"GL_NV_float_buffer",
-	"GL_NV_fragment_program",
-	"GL_NV_half_float",
-	"GL_NV_pixel_data_range",
-	"GL_NV_primitive_restart",
-	"GL_NV_texture_expand_normal",
-	"GL_NV_vertex_program2",
-	"GL_ATI_map_object_buffer",
-	"GL_ATI_separate_stencil",
-	"GL_ATI_vertex_attrib_array_object",
-	"GL_OES_byte_coordinates",
-	"GL_OES_fixed_point",
-	"GL_OES_single_precision",
-	"GL_OES_compressed_paletted_texture",
-	"GL_OES_read_format",
-	"GL_OES_query_matrix",
-	"GL_EXT_depth_bounds_test",
-	"GL_EXT_texture_mirror_clamp",
-	"GL_EXT_blend_equation_separate",
-	"GL_MESA_pack_invert",
-	"GL_MESA_ycbcr_texture"]
-
-"""
-Example code output:
-#ifdef GL_EXT_compiled_vertex_array
-	if (QueryExtension("GL_EXT_compiled_vertex_array"))
-	{
-		glUnlockArraysEXT = reinterpret_cast<PFNGLUNLOCKARRAYSEXTPROC>(bglGetProcAddress((const GLubyte *) "glUnlockArraysEXT"));
-		glLockArraysEXT = reinterpret_cast<PFNGLLOCKARRAYSEXTPROC>(bglGetProcAddress((const GLubyte *) "glLockArraysEXT"));
-		if (glUnlockArraysEXT && glLockArraysEXT)
-		{
-			EnableExtension(_GL_EXT_compiled_vertex_array);
-			if (doDebugMessages)
-				std::cout << "Detected GL_EXT_compiled_vertex_array" << std::endl;
-		} else {
-			std::cout << "ERROR: GL_EXT_compiled_vertex_array implementation is broken!" << std::endl;
-		}
-	}
-#endif
-"""
-def writeext(ext, fnlist):
-	if (find(blacklist, ext)):
-		return
-	if (len(fnlist) == 0):
-		# This extension has no functions to detect - don't need to wrap in
-		# #ifdef GL_extension names
-		print "\tif (QueryExtension(\"" + ext + "\"))"
-		print "\t{"
-		print "\t\tEnableExtension(_" + ext + ");"
-		print "\t\tif (doDebugMessages)"
-		print "\t\t\tstd::cout << \"Detected " + ext + "\" << std::endl;"
-		print "\t}"
-		print
-		return
-	print "#if defined(" + ext + ")"
-	print "\tif (QueryExtension(\"" + ext + "\"))"
-	print "\t{"
-	for fn in fnlist:
-		print "\t\t" + fn[0] + " = reinterpret_cast<" + fn[1] + ">(bglGetProcAddress((const GLubyte *) \"" + fn[0] + "\"));"
-	errcheck = ""
-	for fn in fnlist:
-		if (errcheck == ""):
-			errcheck = fn[0]
-		else:
-			errcheck = errcheck + " && " + fn[0]
-	print "\t\tif (" + errcheck + ") {"
-	print "\t\t\tEnableExtension(_" + ext + ");"
-	print "\t\t\tif (doDebugMessages)"
-	print "\t\t\t\tstd::cout << \"Enabled " + ext + "\" << std::endl;"
-	print "\t\t} else {"
-	print "\t\t\tstd::cout << \"ERROR: " + ext + " implementation is broken!\" << std::endl;"
-	print "\t\t}"
-	print "\t}"
-	print "#endif"
-	print
-	
-"""
-Example Output:
-#if defined(GL_EXT_compiled_vertex_array)
-PFNGLLOCKARRAYSEXTPROC glLockArraysEXT;
-PFNGLUNLOCKARRAYSEXTPROC glUnlockArraysEXT;
-#endif
-"""
-def writeproto(ext, fnlist):
-	if (find(blacklist, ext) or not find(whitelist, ext)):
-		return
-	print "#if defined(" + ext + ")"
-	for fn in fnlist:
-		print fn[1] + " " + fn[0] + ";"
-	print "#endif"
-	print
-
-"""
-#ifdef GL_EXT_compiled_vertex_array
-extern PFNGLLOCKARRAYSEXTPROC glLockArraysEXT;
-extern PFNGLUNLOCKARRAYSEXTPROC glUnlockArraysEXT;
-#endif
-"""
-def writeheader(ext, fnlisti):
-	if (find(blacklist, ext) or not find(whitelist, ext)):
-		return
-	print "#if defined(" + ext + ")"
-	for fn in fnlist:
-		print "extern " + fn[1] + " " + fn[0] + ";"
-	print "#endif"
-	print
-
-def find(l, x):
-	for i in l:
-		if (i == x):
-			return 1
-	return 0
-
-
-# Write Prototypes
-ext = ""
-fns = []
-fnlist = []
-ifdef = 0
-for i in glext_h:
-	line = re.search('^#ifn?def', i)
-	if (line):
-		ifdef = ifdef + 1
-	
-	line = re.search('^#ifndef (GL_.*)', i)
-	if (line):
-		if (not re.search('GL_VERSION.*', line.group(1)) and find(whitelist, line.group(1))):
-			ext = line.group(1)
-	
-	line = re.search('^#endif', i)
-	if (line):
-		ifdef = ifdef - 1
-		if (ifdef == 0 and ext != ""):
-			writeproto(ext, fnlist)
-			ext = ""
-			fns = []
-			fnlist = []
-	if (ext != ""):
-		line = re.search('.* (gl.*) \(.*\);', i)
-		if (line):
-			fns += [line.group(1)]
-		line = re.search('.*PFN(.*)PROC.*', i)
-		if (line):
-			for j in fns:
-				if (string.lower(line.group(1)) == string.lower(j)):
-					fnlist += [(j, "PFN" + line.group(1) + "PROC")]
-
-# Write link code
-ext = ""
-fns = []
-fnlist = []
-ifdef = 0
-for i in glext_h:
-	line = re.search('^#ifn?def', i)
-	if (line):
-		ifdef = ifdef + 1
-	
-	line = re.search('^#ifndef (GL_.*)', i)
-	if (line):
-		if (not re.search('GL_VERSION.*', line.group(1)) and find(whitelist, line.group(1))):
-			ext = line.group(1)
-	
-	line = re.search('^#endif', i)
-	if (line):
-		ifdef = ifdef - 1
-		if (ifdef == 0 and ext != ""):
-			writeext(ext, fnlist)
-			ext = ""
-			fns = []
-			fnlist = []
-	if (ext != ""):
-		line = re.search('.* (gl.*) \(.*\);', i)
-		if (line):
-			fns += [line.group(1)]
-		line = re.search('.*PFN(.*)PROC.*', i)
-		if (line):
-			for j in fns:
-				if (string.lower(line.group(1)) == string.lower(j)):
-					fnlist += [(j, "PFN" + line.group(1) + "PROC")]
-
-# Write header code
-ext = ""
-fns = []
-fnlist = []
-ifdef = 0
-for i in glext_h:
-	line = re.search('^#ifn?def', i)
-	if (line):
-		ifdef = ifdef + 1
-	
-	line = re.search('^#ifndef (GL_.*)', i)
-	if (line):
-		if (not re.search('GL_VERSION.*', line.group(1)) and find(whitelist, line.group(1))):
-			ext = line.group(1)
-	
-	line = re.search('^#endif', i)
-	if (line):
-		ifdef = ifdef - 1
-		if (ifdef == 0 and ext != ""):
-			writeheader(ext, fnlist)
-			ext = ""
-			fns = []
-			fnlist = []
-	if (ext != ""):
-		line = re.search('.* (gl.*) \(.*\);', i)
-		if (line):
-			fns += [line.group(1)]
-		line = re.search('.*PFN(.*)PROC.*', i)
-		if (line):
-			for j in fns:
-				if (string.lower(line.group(1)) == string.lower(j)):
-					fnlist += [(j, "PFN" + line.group(1) + "PROC")]
-
-# Write Python link code
-ext = ""
-extensions = []
-fns = []
-defines = []
-ifdef = 0
-for i in glext_h:
-	line = re.search('^#ifn?def', i)
-	if (line):
-		ifdef = ifdef + 1
-	
-	line = re.search('^#ifndef (GL_.*)', i)
-	if (line):
-		if (not re.search('GL_VERSION.*', line.group(1)) and find(whitelist, line.group(1))):
-			ext = line.group(1)
-	
-	line = re.search('^#endif', i)
-	if (line):
-		ifdef = ifdef - 1
-		if (ifdef == 0 and ext != ""):
-			done = 0
-			for e in range(len(extensions)):
-				if extensions[e][0] == ext:
-					extensions[e] = (ext, defines + extensions[e][1], fns + extensions[e][2])
-					done = 1
-			if not done:
-				extensions = extensions + [(ext, defines, fns)]
-			ext = ""
-			fns = []
-			defines = []
-	if (ext != ""):
-		line = re.search('#define +(GL.*) +(0x.*)', i) # #define GL_ONE_MINUS_CONSTANT_COLOR       0x8002
-		if (line):
-			defines += [(line.group(1), line.group(2))]
-		
-		line = re.search('(.* )(gl.*)(\(.*\));', i) # GLAPI void APIENTRY glMultiTexCoord2f (GLenum, GLfloat, GLfloat);
-		if (line):
-			fns += [(line.group(1), line.group(2), line.group(3))] 
-
-for ext in extensions:
-	if (find(blacklist, ext[0]) or not find(whitelist, ext[0])):
-		continue
-	print "#if defined(" + ext[0] + ")"
-	for fn in ext[2]:
-		line = re.search('gl(.*)', fn[1])
-		# BGL_Wrap(2, RasterPos2f,      void,     (GLfloat, GLfloat))
-		rtype = ""
-		for r in string.split(fn[0]):
-			if r != "GLAPI" and r != "APIENTRY":
-				rtype = rtype + " " + r
-		params = ""
-		for p in string.split(fn[2], ','):
-			pline = re.search('(.*) \*', p)
-			if (pline):
-				p = pline.group(1) + "P"
-			if params == "":
-				params = p
-			else:
-				params = params + "," + p
-		if not params[-1] == ")":
-			params = params + ")"
-		print "BGL_Wrap(" + str(len(string.split(fn[2], ','))) + ", " + line.group(1) + ",\t" + rtype + ",\t" + params + ")"
-	print "#endif"
-	print
-
-for ext in extensions:
-	if (find(blacklist, ext[0]) or not find(whitelist, ext[0])):
-		continue
-	print 'PyDict_SetItemString(dict, "' + ext[0] + '", PyInt_FromLong(_' + ext[0] + '))'
-	print "#if defined(" + ext[0] + ")"
-	print "if (bglQueryExtension(_" + ext[0] + ")) {"
-	if len(ext[2]) > 0:
-		for fn in ext[2]:
-			line = re.search('gl(.*)', fn[1])
-			# MethodDef(Vertex3iv),
-			print "  BGL_AddMethod(" + line.group(1) + ");"
-		print
-	
-	for define in ext[1]:
-		print "  BGL_AddConst(" + define[0] + ");"
-	print
-	
-	print "}"
-	print "#endif"
-	print
diff --git a/source/gameengine/Rasterizer/RAS_TexVert.cpp b/source/gameengine/Rasterizer/RAS_TexVert.cpp
index 61ac456b2bc..935633dc636 100644
--- a/source/gameengine/Rasterizer/RAS_TexVert.cpp
+++ b/source/gameengine/Rasterizer/RAS_TexVert.cpp
@@ -40,7 +40,8 @@ RAS_TexVert::RAS_TexVert(const MT_Point3& xyz,
 						 const MT_Vector4& tangent,
 						 const unsigned int rgba,
 						 const MT_Vector3& normal,
-						 const short flag) 
+						 const short flag,
+						 const unsigned int origindex)
 {
 	xyz.getValue(m_localxyz);
 	uv.getValue(m_uv1);
@@ -49,6 +50,7 @@ RAS_TexVert::RAS_TexVert(const MT_Point3& xyz,
 	SetNormal(normal);
 	tangent.getValue(m_tangent);
 	m_flag = flag;
+	m_origindex = origindex;
 	m_unit = 2;
 }
 
@@ -107,44 +109,6 @@ void RAS_TexVert::SetNormal(const MT_Vector3& normal)
 	normal.getValue(m_normal);
 }
 
-#ifndef RAS_TexVert_INLINE
-
-// leave multiline for debugging
-const float* RAS_TexVert::getUV1 () const
-{
-	return m_uv1;
-}
-
-const float* RAS_TexVert::getUV2 () const
-{
-	return m_uv2;
-}
-
-
-
-const float* RAS_TexVert::getNormal() const
-{
-	return m_normal;
-}
-
-const float* RAS_TexVert::getTangent() const
-{
-	return m_tangent;
-}
-
-
-const float* RAS_TexVert::getLocalXYZ() const
-{ 
-	return m_localxyz;
-}
-
-const unsigned char* RAS_TexVert::getRGBA() const
-{
-	return (unsigned char*) &m_rgba;
-}
-
-#endif
-
 // compare two vertices, and return TRUE if both are almost identical (they can be shared)
 bool RAS_TexVert::closeTo(const RAS_TexVert* other)
 {
diff --git a/source/gameengine/Rasterizer/RAS_TexVert.h b/source/gameengine/Rasterizer/RAS_TexVert.h
index 84135db918f..bf092b4b230 100644
--- a/source/gameengine/Rasterizer/RAS_TexVert.h
+++ b/source/gameengine/Rasterizer/RAS_TexVert.h
@@ -42,8 +42,6 @@ static MT_Point2 g_pt2;
 
 #define TV_MAX				3//match Def in BL_Material.h
 
-#define RAS_TexVert_INLINE 1
-
 class RAS_TexVert
 {
 	
@@ -55,9 +53,10 @@ class RAS_TexVert
 	float			m_normal[3];	// 3*2 =  6 
 	short			m_flag;			//        2
 	unsigned int	m_unit;			//		  4
+	unsigned int	m_origindex;		//        4
 									//---------
-									//       52
-	//32 bytes total size, fits nice = 52 = not fit nice.
+									//       56
+	// 32 bytes total size, fits nice = 56 = not fit nice.
 	// We'll go for 64 bytes total size - 24 bytes left.
 public:
 	short getFlag() const;
@@ -71,11 +70,10 @@ public:
 				const MT_Vector4& tangent,
 				const unsigned int rgba,
 				const MT_Vector3& normal,
-				const short flag);
+				const short flag,
+				const unsigned int origindex);
 	~RAS_TexVert() {};
 
-	// leave multiline for debugging
-#ifdef RAS_TexVert_INLINE
 	const float* getUV1 () const { 
 		return m_uv1;
 	};
@@ -99,13 +97,11 @@ public:
 	const unsigned char* getRGBA() const {
 		return (unsigned char *) &m_rgba;
 	}
-#else
-	const float* getUV1 () const;
-	const float* getUV2 () const;
-	const float*		getNormal() const;
-	const float*		getLocalXYZ() const;
-	const unsigned char*	getRGBA() const;
-#endif
+
+	const unsigned int getOrigIndex() const {
+		return m_origindex;
+	}
+
 	void				SetXYZ(const MT_Point3& xyz);
 	void				SetUV(const MT_Point2& uv);
 	void				SetUV2(const MT_Point2& uv);
diff --git a/source/gameengine/Rasterizer/SConscript b/source/gameengine/Rasterizer/SConscript
index ff79a5d97b8..e6bc657ed6d 100644
--- a/source/gameengine/Rasterizer/SConscript
+++ b/source/gameengine/Rasterizer/SConscript
@@ -7,7 +7,8 @@ if env['WITH_BF_GLEXT'] == 1:
         env['CPPFLAGS'].append('-DWITH_GLEXT')
 
 
-incs = '. #source/kernel/gen_system #intern/string #intern/moto/include #source/gameengine/BlenderRoutines'
+incs = '. #source/kernel/gen_system #intern/string #intern/moto/include #source/gameengine/BlenderRoutines #extern/glew/include #source/gameengine/Expressions'
+incs += ' ' + env['BF_PYTHON_INC']
 
 if env['OURPLATFORM']=='win32-vc':
 	cflags = []
diff --git a/source/gameengine/SceneGraph/SG_Controller.h b/source/gameengine/SceneGraph/SG_Controller.h
index d65a2f0c256..c32885b915f 100644
--- a/source/gameengine/SceneGraph/SG_Controller.h
+++ b/source/gameengine/SceneGraph/SG_Controller.h
@@ -101,7 +101,9 @@ public:
 	enum SG_Controller_option {
 		SG_CONTR_NODEF = 0,
 		SG_CONTR_IPO_IPO_AS_FORCE,
-		SG_CONTR_IPO_FORCES_ACT_LOCAL,
+		SG_CONTR_IPO_IPO_ADD,
+		SG_CONTR_IPO_LOCAL,
+		SG_CONTR_IPO_RESET,
 		SG_CONTR_CAMIPO_LENS,
 		SG_CONTR_CAMIPO_CLIPEND,
 		SG_CONTR_CAMIPO_CLIPSTART,
diff --git a/source/gameengine/SceneGraph/SG_IObject.cpp b/source/gameengine/SceneGraph/SG_IObject.cpp
index c347bbc6d9a..d0bdac5c8f0 100644
--- a/source/gameengine/SceneGraph/SG_IObject.cpp
+++ b/source/gameengine/SceneGraph/SG_IObject.cpp
@@ -104,7 +104,7 @@ SetSGClientObject(
 }
 
 
-	void
+	bool
 SG_IObject::
 ActivateReplicationCallback(
 	SG_IObject *replica
@@ -112,8 +112,10 @@ ActivateReplicationCallback(
 	if (m_callbacks.m_replicafunc)
 	{
 		// Call client provided replication func
-		m_callbacks.m_replicafunc(replica,m_SGclientObject,m_SGclientInfo);
+		if (m_callbacks.m_replicafunc(replica,m_SGclientObject,m_SGclientInfo) == NULL)
+			return false;
 	}
+	return true;
 };	
 
 	void
diff --git a/source/gameengine/SceneGraph/SG_IObject.h b/source/gameengine/SceneGraph/SG_IObject.h
index 438ab48c556..7f6bdfbbb1c 100644
--- a/source/gameengine/SceneGraph/SG_IObject.h
+++ b/source/gameengine/SceneGraph/SG_IObject.h
@@ -202,7 +202,7 @@ public:
 
 protected :
 
-		void
+		bool
 	ActivateReplicationCallback(
 		SG_IObject *replica
 	);
diff --git a/source/gameengine/SceneGraph/SG_Node.cpp b/source/gameengine/SceneGraph/SG_Node.cpp
index ff9a9f7f371..8de7ac83477 100644
--- a/source/gameengine/SceneGraph/SG_Node.cpp
+++ b/source/gameengine/SceneGraph/SG_Node.cpp
@@ -68,7 +68,7 @@ SG_Node* SG_Node::GetSGReplica()
 	SG_Node* replica = new SG_Node(*this);
 	if (replica == NULL) return NULL;
 
-	ProcessSGReplica(replica);
+	ProcessSGReplica(&replica);
 	
 	return replica;
 }
@@ -76,25 +76,42 @@ SG_Node* SG_Node::GetSGReplica()
 	void 
 SG_Node::
 ProcessSGReplica(
-	SG_Node* replica
+	SG_Node** replica
 ){
 	// Apply the replication call back function.
-	ActivateReplicationCallback(replica);
+	if (!ActivateReplicationCallback(*replica)) 
+	{
+		delete (*replica);
+		*replica = NULL;
+		return;
+	}
 
 	// clear the replica node of it's parent.
-	static_cast<SG_Node*>(replica)->m_SGparent = NULL;
+	static_cast<SG_Node*>(*replica)->m_SGparent = NULL;
 
 	if (m_children.begin() != m_children.end())
 	{
 		// if this node has children, the replica has too, so clear and clone children
-		replica->ClearSGChildren();
+		(*replica)->ClearSGChildren();
 	
 		NodeList::iterator childit;
 		for (childit = m_children.begin();childit!=m_children.end();++childit)
 		{
-			replica->AddChild((*childit)->GetSGReplica());
+			SG_Node* childnode = (*childit)->GetSGReplica();
+			if (childnode)
+				(*replica)->AddChild(childnode);
 		}
 	}
+	// Nodes without children and without client object are
+	// not worth to keep, they will just take up CPU
+	// This can happen in partial replication of hierarchy
+	// during group duplication.
+	if ((*replica)->m_children.empty() && 
+		(*replica)->GetSGClientObject() == NULL)
+	{
+		delete (*replica);
+		*replica = NULL;
+	}
 }
 
 
@@ -159,6 +176,17 @@ IsVertexParent()
 	return false;
 }
 
+	bool
+SG_Node::
+IsSlowParent()
+{
+	if (m_parent_relation)
+	{
+		return m_parent_relation->IsSlowRelation();
+	}
+	return false;
+}
+
 	void 
 SG_Node::
 DisconnectFromParent(
diff --git a/source/gameengine/SceneGraph/SG_Node.h b/source/gameengine/SceneGraph/SG_Node.h
index 5cf24de68f3..ffaaad861e2 100644
--- a/source/gameengine/SceneGraph/SG_Node.h
+++ b/source/gameengine/SceneGraph/SG_Node.h
@@ -159,6 +159,14 @@ public:
 		bool	
 	IsVertexParent(
 	) ;
+	
+	/**
+	 * Return slow parent status.
+	 */
+
+		bool	
+	IsSlowParent(
+	) ;
 
 	/**		
 	 * Update the spatial data of this node. Iterate through
@@ -197,7 +205,7 @@ private:
 
 		void		
 	ProcessSGReplica(
-		SG_Node* replica
+		SG_Node** replica
 	);
 
 	/**
diff --git a/source/gameengine/SceneGraph/SG_ParentRelation.h b/source/gameengine/SceneGraph/SG_ParentRelation.h
index 9d360d1c274..6507cb98519 100644
--- a/source/gameengine/SceneGraph/SG_ParentRelation.h
+++ b/source/gameengine/SceneGraph/SG_ParentRelation.h
@@ -99,6 +99,16 @@ public :
 	) { 
 		return false;
 	}
+	
+	/**
+	 * Need this to see if we are able to adjust time-offset from the python api
+	 */
+	virtual
+		bool
+	IsSlowRelation(
+	) { 
+		return false;
+	}
 protected :
 
 	/** 
diff --git a/source/gameengine/SceneGraph/SG_Spatial.cpp b/source/gameengine/SceneGraph/SG_Spatial.cpp
index 18049592977..5ba116e59db 100644
--- a/source/gameengine/SceneGraph/SG_Spatial.cpp
+++ b/source/gameengine/SceneGraph/SG_Spatial.cpp
@@ -87,6 +87,13 @@ SG_Spatial::
 	delete (m_parent_relation);
 }
 
+	SG_ParentRelation *
+SG_Spatial::
+GetParentRelation(
+){
+	return m_parent_relation;
+}
+
 	void
 SG_Spatial::
 SetParentRelation(
diff --git a/source/gameengine/SceneGraph/SG_Spatial.h b/source/gameengine/SceneGraph/SG_Spatial.h
index a70784472a7..28848b0f933 100644
--- a/source/gameengine/SceneGraph/SG_Spatial.h
+++ b/source/gameengine/SceneGraph/SG_Spatial.h
@@ -83,6 +83,10 @@ public:
 	SetParentRelation(
 		SG_ParentRelation *relation
 	);
+	
+		SG_ParentRelation *
+	GetParentRelation(
+	);
 
 
 	/**
diff --git a/source/kernel/gen_system/GEN_HashedPtr.h b/source/kernel/gen_system/GEN_HashedPtr.h
index 777ec76e067..13faa5f227b 100644
--- a/source/kernel/gen_system/GEN_HashedPtr.h
+++ b/source/kernel/gen_system/GEN_HashedPtr.h
@@ -39,6 +39,7 @@ public:
 	GEN_HashedPtr(void* val) : m_valptr(val) {};
 	unsigned int hash() const { return GEN_Hash(m_valptr);};
 	inline friend bool operator ==(const GEN_HashedPtr & rhs, const GEN_HashedPtr & lhs) { return rhs.m_valptr == lhs.m_valptr;};
+	void *getValue() const { return m_valptr; }
 };
 
 #endif //__GEN_HASHEDPTR
diff --git a/source/kernel/gen_system/GEN_Map.h b/source/kernel/gen_system/GEN_Map.h
index f9c14800499..37c75d8293a 100644
--- a/source/kernel/gen_system/GEN_Map.h
+++ b/source/kernel/gen_system/GEN_Map.h
@@ -82,6 +82,24 @@ public:
         }
         return 0;
     }
+
+    Key* getKey(int index) {
+        int count=0;
+        for (int i=0;i<m_num_buckets;i++)
+        {
+            Entry* bucket = m_buckets[i];
+            while(bucket)
+            {
+                if (count==index)
+                {
+                    return &bucket->m_key;
+                }
+                bucket = bucket->m_next;
+                count++;
+            }
+        }
+        return 0;
+    }
     
     void clear() {
         for (int i = 0; i < m_num_buckets; ++i) {
diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk
index e19d10dba64..9c1a28de999 100644
--- a/source/nan_definitions.mk
+++ b/source/nan_definitions.mk
@@ -98,6 +98,7 @@ endif
     export NAN_OPENNL ?= $(LCGDIR)/opennl
     export NAN_ELBEEM ?= $(LCGDIR)/elbeem
     export NAN_SUPERLU ?= $(LCGDIR)/superlu
+    export NAN_GLEW ?= $(LCGDIR)/glew
     ifeq ($(FREE_WINDOWS), true)
       export NAN_FTGL ?= $(LCGDIR)/gcc/ftgl
       export NAN_FFMPEG ?= $(LCGDIR)/gcc/ffmpeg
diff --git a/tools/Blender.py b/tools/Blender.py
index 30e9979cf9a..2c982a0a46f 100644
--- a/tools/Blender.py
+++ b/tools/Blender.py
@@ -69,10 +69,10 @@ def internal_lib_to_dict(dict = None, libtype = None, libname = None, priority =
         dict[libtype][priority] = libname
 
 # libtype and priority can both be lists, for defining lib in multiple places
-def add_lib_to_dict(dict = None, libtype = None, libname = None, priority = 100):
+def add_lib_to_dict(env, dict = None, libtype = None, libname = None, priority = 100):
     if not dict or not libtype or not libname:
         print "Passed wrong arg"
-        Exit()
+        env.Exit()
 
     if type(libtype) is str and type(priority) is int:
         internal_lib_to_dict(dict, libtype, libname, priority)
@@ -82,10 +82,10 @@ def add_lib_to_dict(dict = None, libtype = None, libname = None, priority = 100)
                 internal_lib_to_dict(dict, lt, libname, p)
         else:
             print "libtype and priority lists are unequal in length"
-            Exit()
+            env.Exit()
     else:
         print "Wrong type combinations for libtype and priority. Only str and int or list and list"
-        Exit()
+        env.Exit()
 
 def create_blender_liblist(lenv = None, libtype = None):
     if not lenv or not libtype:
@@ -93,11 +93,9 @@ def create_blender_liblist(lenv = None, libtype = None):
 
     lst = []
     if libtype in possible_types:
-        sortlist = []
-        for k,v in libs[libtype].iteritems():
-            sortlist.append(k)
-        sortlist.sort()
         curlib = libs[libtype]
+        sortlist = curlib.keys()
+        sortlist.sort()
         for sk in sortlist:
             v = curlib[sk]
             lst.append('#' + root_build_dir + 'lib/'+lenv['LIBPREFIX'] + v + lenv['LIBSUFFIX'])
@@ -175,11 +173,10 @@ def propose_priorities():
     for t in possible_types:
         print bc.OKGREEN+"\t"+t+bc.ENDC
         new_priority = 0
-        sortlist = []
-        for k,v in libs[t].iteritems():
-            sortlist.append(k)
-        sortlist.sort()
         curlib = libs[t]
+        sortlist = curlib.keys()
+        sortlist.sort()
+
         for sk in sortlist:
             v = curlib[sk]
             #for p,v in sorted(libs[t].iteritems()):
@@ -368,7 +365,7 @@ class BlenderEnvironment(SConsEnvironment):
         global libs
         if not self or not libname or not source:
             print bc.FAIL+'Cannot continue.  Missing argument for BlenderRes '+libname+bc.ENDC
-            Exit()
+            self.Exit()
         if self['OURPLATFORM'] not in ('win32-vc','win32-mingw','linuxcross'):
             print bc.FAIL+'BlenderRes is for windows only!'+bc.END
             self.Exit()
@@ -383,7 +380,7 @@ class BlenderEnvironment(SConsEnvironment):
     def BlenderLib(self=None, libname=None, sources=None, includes=[], defines=[], libtype='common', priority = 100, compileflags=None):
         if not self or not libname or not sources:
             print bc.FAIL+'Cannot continue. Missing argument for BuildBlenderLib '+libname+bc.ENDC
-            Exit()
+            self.Exit()
         if libname in quickie or len(quickie)==0:
             if libname in quickdebug: 
                 print bc.HEADER+'Configuring library '+bc.ENDC+bc.OKGREEN+libname +bc.ENDC+bc.OKBLUE+ " (debug mode)" + bc.ENDC
@@ -419,7 +416,7 @@ class BlenderEnvironment(SConsEnvironment):
         else:
             print bc.WARNING+'Not building '+bc.ENDC+bc.OKGREEN+libname+bc.ENDC+' for '+bc.OKBLUE+'BF_QUICK'+bc.ENDC
         # note: libs is a global
-        add_lib_to_dict(libs, libtype, libname, priority)
+        add_lib_to_dict(self, libs, libtype, libname, priority)
 
     def BlenderProg(self=None, builddir=None, progname=None, sources=None, includes=None, libs=None, libpath=None, binarykind=''):
         print bc.HEADER+'Configuring program '+bc.ENDC+bc.OKGREEN+progname+bc.ENDC

From ab722884d3684808b17f76ae742ef59dccf4f8e2 Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Sun, 20 Jul 2008 05:01:29 +0000
Subject: [PATCH 110/252] soc-2008-mxcurioni: updated support for Nature class.

---
 source/blender/freestyle/SConscript           |  3 +-
 .../freestyle/intern/python/Convert.cpp       | 26 +++++++++----
 .../blender/freestyle/intern/python/Convert.h |  2 +
 .../freestyle/intern/python/Interface0D.cpp   | 10 ++++-
 .../intern/python/Interface0D/ViewVertex.cpp  | 37 +++++++++++--------
 .../intern/python/Interface0D/ViewVertex.h    |  1 -
 .../freestyle/intern/python/Interface1D.cpp   |  3 +-
 .../intern/python/Interface1D/FEdge.cpp       | 16 ++++++++
 .../freestyle/intern/python/Nature.cpp        | 14 +++----
 .../freestyle/intern/view_map/ViewMap.h       | 13 ++++---
 10 files changed, 84 insertions(+), 41 deletions(-)

diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript
index 8e50d0ba5da..bcbd018c011 100644
--- a/source/blender/freestyle/SConscript
+++ b/source/blender/freestyle/SConscript
@@ -69,13 +69,14 @@ python_sources = [
 					prefix + '/Interface0D.cpp',
 					prefix + '/Interface0D/CurvePoint.cpp',
 					prefix + '/Interface0D/SVertex.cpp',
+					prefix + '/Interface0D/ViewVertex.cpp',
 					prefix + '/Interface1D.cpp',
 					prefix + '/Interface1D/FEdge.cpp',
 					prefix + '/Nature.cpp',
 					prefix + '/UnaryFunction0D.cpp',
 					prefix + '/UnaryFunction1D.cpp',
 					prefix + '/UnaryPredicate0D.cpp',
-					prefix + '/UnaryPredicate1D.cpp'
+					prefix + '/UnaryPredicate1D.cpp',
 				]
 
 sources = 	system_sources + image_sources + geometry_sources + scene_graph_sources \
diff --git a/source/blender/freestyle/intern/python/Convert.cpp b/source/blender/freestyle/intern/python/Convert.cpp
index 42250fbe97b..9cd2a098253 100644
--- a/source/blender/freestyle/intern/python/Convert.cpp
+++ b/source/blender/freestyle/intern/python/Convert.cpp
@@ -8,47 +8,47 @@ extern "C" {
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 
-PyObject *PyBool_from_bool( bool b ){
+PyObject * PyBool_from_bool( bool b ){
 	return PyBool_FromLong( b ? 1 : 0);
 }
 
 
-PyObject *Vector_from_Vec2f( Vec2f& vec ) {
+PyObject * Vector_from_Vec2f( Vec2f& vec ) {
 	float vec_data[2]; // because vec->_coord is protected
 
 	vec_data[0] = vec.x();		vec_data[1] = vec.y();
 	return newVectorObject( vec_data, 2, Py_NEW);
 }
 
-PyObject *Vector_from_Vec3f( Vec3f& vec ) {
+PyObject * Vector_from_Vec3f( Vec3f& vec ) {
 	float vec_data[3]; // because vec->_coord is protected
 	
 	vec_data[0] = vec.x();		vec_data[1] = vec.y(); 		vec_data[2] = vec.z(); 
 	return newVectorObject( vec_data, 3, Py_NEW);
 }
 
-PyObject *Vector_from_Vec3r( Vec3r& vec ) {
+PyObject * Vector_from_Vec3r( Vec3r& vec ) {
 	float vec_data[3]; // because vec->_coord is protected
 	
 	vec_data[0] = vec.x();		vec_data[1] = vec.y(); 		vec_data[2] = vec.z(); 
 	return newVectorObject( vec_data, 3, Py_NEW);
 }
 
-PyObject *BPy_Id_from_Id( Id& id ) {
+PyObject * BPy_Id_from_Id( Id& id ) {
 	PyObject *py_id = Id_Type.tp_new( &Id_Type, 0, 0 );
 	((BPy_Id *) py_id)->id = new Id( id.getFirst(), id.getSecond() );
 
 	return py_id;
 }
 
-PyObject *BPy_Interface0D_from_Interface0D( Interface0D& if0D ) {
+PyObject * BPy_Interface0D_from_Interface0D( Interface0D& if0D ) {
 	PyObject *py_if0D =  Interface0D_Type.tp_new( &Interface0D_Type, 0, 0 );
 	((BPy_Interface0D *) py_if0D)->if0D = &if0D;
 
 	return py_if0D;
 }
 
-PyObject *BPy_SVertex_from_SVertex( SVertex& sv ) {
+PyObject * BPy_SVertex_from_SVertex( SVertex& sv ) {
 	PyObject *py_sv = SVertex_Type.tp_new( &SVertex_Type, 0, 0 );
 	((BPy_SVertex *) py_sv)->sv = new SVertex( sv );
 	((BPy_SVertex *) py_sv)->py_if0D.if0D = ((BPy_SVertex *) py_sv)->sv;
@@ -56,7 +56,7 @@ PyObject *BPy_SVertex_from_SVertex( SVertex& sv ) {
 	return py_sv;
 }
 
-PyObject *BPy_FEdge_from_FEdge( FEdge& fe ) {
+PyObject * BPy_FEdge_from_FEdge( FEdge& fe ) {
 	PyObject *py_fe = FEdge_Type.tp_new( &FEdge_Type, 0, 0 );
 	((BPy_FEdge *) py_fe)->fe = new FEdge( fe );
 	((BPy_FEdge *) py_fe)->py_if1D.if1D = ((BPy_FEdge *) py_fe)->fe;
@@ -64,6 +64,16 @@ PyObject *BPy_FEdge_from_FEdge( FEdge& fe ) {
 	return py_fe;
 }
 
+PyObject * BPy_Nature_from_Nature( unsigned short n ) {
+	PyObject *py_n =  Nature_Type.tp_new( &Nature_Type, 0, 0 );
+
+	PyObject *args = PyTuple_New(1);
+	PyTuple_SetItem( args, 0, PyInt_FromLong(n) );
+	Nature_Type.tp_init( py_n, args, 0 );
+	Py_DECREF(args);
+
+	return py_n;
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/source/blender/freestyle/intern/python/Convert.h b/source/blender/freestyle/intern/python/Convert.h
index ce38f8cbc22..2346d420813 100644
--- a/source/blender/freestyle/intern/python/Convert.h
+++ b/source/blender/freestyle/intern/python/Convert.h
@@ -9,6 +9,7 @@ using namespace Geometry;
 #include "Interface0D.h"
 #include "Interface0D/SVertex.h"
 #include "Interface1D/FEdge.h"
+#include "Nature.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -30,6 +31,7 @@ PyObject * BPy_Id_from_Id( Id& id );
 PyObject * BPy_SVertex_from_SVertex( SVertex& sv );
 PyObject * BPy_FEdge_from_FEdge( FEdge& fe );
 PyObject * BPy_Interface0D_from_Interface0D( Interface0D& if0D );
+PyObject * BPy_Nature_from_Nature( unsigned short n );
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/source/blender/freestyle/intern/python/Interface0D.cpp b/source/blender/freestyle/intern/python/Interface0D.cpp
index 39c2146e015..469e2bc4c79 100644
--- a/source/blender/freestyle/intern/python/Interface0D.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D.cpp
@@ -3,7 +3,9 @@
 #include "Convert.h"
 #include "Interface0D/CurvePoint.h"
 #include "Interface0D/SVertex.h"
+#include "Interface0D/ViewVertex.h"
 #include "Interface1D/FEdge.h"
+#include "Nature.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -152,6 +154,11 @@ PyMODINIT_FUNC Interface0D_Init( PyObject *module )
 	Py_INCREF( &SVertex_Type );
 	PyModule_AddObject(module, "SVertex", (PyObject *)&SVertex_Type);	
 	
+	if( PyType_Ready( &ViewVertex_Type ) < 0 )
+		return;
+	Py_INCREF( &ViewVertex_Type );
+	PyModule_AddObject(module, "ViewVertex", (PyObject *)&ViewVertex_Type);
+	
 }
 
 //------------------------INSTANCE METHODS ----------------------------------
@@ -243,8 +250,7 @@ PyObject *Interface0D_getId( BPy_Interface0D *self ) {
 
 
 PyObject *Interface0D_getNature( BPy_Interface0D *self ) {
-	// VertexNature
-	Py_RETURN_NONE;
+	return BPy_Nature_from_Nature( self->if0D->getNature() );
 }
 
 
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/ViewVertex.cpp
index 66583d21605..6168d1fb711 100644
--- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex.cpp
@@ -1,7 +1,6 @@
-#include "SVertex.h"
+#include "ViewVertex.h"
 
 #include "../Convert.h"
-#include "../Id.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -11,12 +10,12 @@ extern "C" {
 
 /*---------------  Python API function prototypes for ViewVertex instance  -----------*/
 static int ViewVertex___init__(BPy_ViewVertex *self);
-//static PyObject * ViewVertex___copy__( BPy_ViewVertex *self );
+static PyObject * ViewVertex_setNature( BPy_ViewVertex *self, PyObject *args );
 
 
 /*----------------------ViewVertex instance definitions ----------------------------*/
 static PyMethodDef BPy_ViewVertex_methods[] = {
-//	{"__copy__", ( PyCFunction ) ViewVertex___copy__, METH_NOARGS, "（ ）Cloning method."},
+	{"setNature", ( PyCFunction ) ViewVertex_setNature, METH_VARARGS, "（Nature n ）Sets the nature of the vertex."},
 	{NULL, NULL, 0, NULL}
 };
 
@@ -111,13 +110,8 @@ PyTypeObject ViewVertex_Type = {
 //------------------------INSTANCE METHODS ----------------------------------
 
 int ViewVertex___init__(BPy_ViewVertex *self )
-{
-	PyObject *py_point = 0;
-	BPy_Id *py_id = 0;
-
-	self->vv = new ViewVertex();
-	self->py_if0D.if0D = self->vv;
-	
+{	
+	self->py_if0D.if0D = new Interface0D();
 	return 0;
 }
 
@@ -127,11 +121,26 @@ int ViewVertex___init__(BPy_ViewVertex *self )
 // 	py_vv = (BPy_ViewVertex *) ViewVertex_Type.tp_new( &ViewVertex_Type, 0, 0 );
 // 	
 // 	py_vv->vv = self->vv->duplicate();
-// 	py_svertex->py_if0D.if0D = py_svertex->sv;
+// 	py_svertex->py_if0D.if->sv;
 // 
 // 	return (PyObject *) py_svertex;
 // }
 
+PyObject * ViewVertex_setNature( BPy_ViewVertex *self, PyObject *args ) {
+	PyObject *py_n;
+
+	if(!( PyArg_ParseTuple(args, "O", &py_n) && BPy_Nature_Check(py_n) )) {
+		cout << "ERROR: ViewVertex_setNature" << endl;
+		Py_RETURN_NONE;
+	}
+	
+	PyObject *i = (PyObject *) &( ((BPy_Nature *) py_n)->i );
+	((ViewVertex *) self->py_if0D.if0D)->setNature( PyInt_AsLong(i) );
+
+	Py_RETURN_NONE;
+}
+
+
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
@@ -141,9 +150,7 @@ int ViewVertex___init__(BPy_ViewVertex *self )
 
 
 // virtual string 	getExactTypeName () const
-//  	ViewVertex ()
-// virtual 	~ViewVertex ()
-// virtual Nature::VertexNature 	getNature () const
+
 // void 	setNature (Nature::VertexNature iNature)
 // virtual ViewVertexInternal::orientedViewEdgeIterator 	edgesBegin ()=0
 // virtual ViewVertexInternal::orientedViewEdgeIterator 	edgesEnd ()=0
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex.h b/source/blender/freestyle/intern/python/Interface0D/ViewVertex.h
index b869df377fc..98eeb504a3d 100644
--- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex.h
+++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex.h
@@ -21,7 +21,6 @@ extern PyTypeObject ViewVertex_Type;
 /*---------------------------Python BPy_ViewVertex structure definition----------*/
 typedef struct {
 	BPy_Interface0D py_if0D;
-	ViewVertex *vv;
 } BPy_ViewVertex;
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/Interface1D.cpp b/source/blender/freestyle/intern/python/Interface1D.cpp
index 971403b3354..30dd5b349bd 100644
--- a/source/blender/freestyle/intern/python/Interface1D.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D.cpp
@@ -180,8 +180,7 @@ PyObject *Interface1D_getId( BPy_Interface1D *self ) {
 }
 
 PyObject *Interface1D_getNature( BPy_Interface1D *self ) {
-	// EdgeNature
-	Py_RETURN_NONE;
+	return BPy_Nature_from_Nature( self->if1D->getNature() );
 }
 
 PyObject *Interface1D_getTimeStamp( BPy_Interface1D *self ) {
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge.cpp
index e8e5c6787e3..6a00ad66123 100644
--- a/source/blender/freestyle/intern/python/Interface1D/FEdge.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/FEdge.cpp
@@ -26,6 +26,7 @@ static PyObject * FEdge_SetId( BPy_FEdge *self , PyObject *args);
 static PyObject * FEdge_SetNextEdge( BPy_FEdge *self , PyObject *args);
 static PyObject * FEdge_SetPreviousEdge( BPy_FEdge *self , PyObject *args);
 static PyObject * FEdge_SetSmooth( BPy_FEdge *self , PyObject *args); 
+static PyObject * FEdge_SetNature( BPy_FEdge *self, PyObject *args );
 
 /*----------------------FEdge instance definitions ----------------------------*/
 static PyMethodDef BPy_FEdge_methods[] = {	
@@ -44,6 +45,7 @@ static PyMethodDef BPy_FEdge_methods[] = {
 	{"SetNextEdge", ( PyCFunction ) FEdge_SetNextEdge, METH_VARARGS, "(FEdge e) Sets the pointer to the next FEdge. "},
 	{"SetPreviousEdge", ( PyCFunction ) FEdge_SetPreviousEdge, METH_VARARGS, "(FEdge e) Sets the pointer to the previous FEdge. "},
 	{"SetSmooth", ( PyCFunction ) FEdge_SetSmooth, METH_VARARGS, "(bool b) Sets the flag telling whether this FEdge is smooth or sharp. true for Smooth, false for Sharp. "},
+	{"SetNature", ( PyCFunction ) FEdge_SetNature, METH_VARARGS, "(Nature n) Sets the nature of this FEdge. "},
 	{NULL, NULL, 0, NULL}
 };
 
@@ -298,6 +300,20 @@ PyObject *FEdge_SetSmooth( BPy_FEdge *self , PyObject *args) {
 	Py_RETURN_NONE;
 }
 
+PyObject * FEdge_SetNature( BPy_FEdge *self, PyObject *args ) {
+	PyObject *py_n;
+
+	if(!( PyArg_ParseTuple(args, "O", &py_n) && BPy_Nature_Check(py_n) )) {
+		cout << "ERROR: FEdge_setNature" << endl;
+		Py_RETURN_NONE;
+	}
+	
+	PyObject *i = (PyObject *) &( ((BPy_Nature *) py_n)->i );
+	((FEdge *) self->py_if1D.if1D)->SetNature( PyInt_AsLong(i) );
+
+	Py_RETURN_NONE;
+}
+
 PyObject *FEdge_getVertices( BPy_FEdge *self ) {
 	PyObject *py_vertices = PyList_New(NULL);
 		
diff --git a/source/blender/freestyle/intern/python/Nature.cpp b/source/blender/freestyle/intern/python/Nature.cpp
index fb4ba6bae37..14357949022 100644
--- a/source/blender/freestyle/intern/python/Nature.cpp
+++ b/source/blender/freestyle/intern/python/Nature.cpp
@@ -123,13 +123,13 @@ PyMODINIT_FUNC Nature_Init( PyObject *module )
 	tmp = PyInt_FromLong( Nature::CUSP ); PyDict_SetItemString( Nature_Type.tp_dict, "CUSP", tmp); Py_DECREF(tmp);
 	
 	// EdgeNature
-	tmp = PyInt_FromLong( Nature::NO_FEATURE ); PyDict_SetItemString( Nature_Type.tp_dict, "NO_FEATURE", tmp); Py_DECREF(tmp);
-	tmp = PyInt_FromLong( Nature::SILHOUETTE ); PyDict_SetItemString( Nature_Type.tp_dict, "SILHOUETTE", tmp); Py_DECREF(tmp);
-	tmp = PyInt_FromLong( Nature::BORDER ); PyDict_SetItemString( Nature_Type.tp_dict, "BORDER", tmp); Py_DECREF(tmp);
-	tmp = PyInt_FromLong( Nature::CREASE ); PyDict_SetItemString( Nature_Type.tp_dict, "CREASE", tmp); Py_DECREF(tmp);
-	tmp = PyInt_FromLong( Nature::RIDGE ); PyDict_SetItemString( Nature_Type.tp_dict, "RIDGE", tmp); Py_DECREF(tmp);
-	tmp = PyInt_FromLong( Nature::VALLEY ); PyDict_SetItemString( Nature_Type.tp_dict, "VALLEY", tmp); Py_DECREF(tmp);
-	tmp = PyInt_FromLong( Nature::SUGGESTIVE_CONTOUR ); PyDict_SetItemString( Nature_Type.tp_dict, "SUGGESTIVE_CONTOUR", tmp); Py_DECREF(tmp);
+	tmp = BPy_Nature_from_Nature( Nature::NO_FEATURE ); PyDict_SetItemString( Nature_Type.tp_dict, "NO_FEATURE", tmp); Py_DECREF(tmp);
+	tmp = BPy_Nature_from_Nature( Nature::SILHOUETTE ); PyDict_SetItemString( Nature_Type.tp_dict, "SILHOUETTE", tmp); Py_DECREF(tmp);
+	tmp = BPy_Nature_from_Nature( Nature::BORDER ); PyDict_SetItemString( Nature_Type.tp_dict, "BORDER", tmp); Py_DECREF(tmp);
+	tmp = BPy_Nature_from_Nature( Nature::CREASE ); PyDict_SetItemString( Nature_Type.tp_dict, "CREASE", tmp); Py_DECREF(tmp);
+	tmp = BPy_Nature_from_Nature( Nature::RIDGE ); PyDict_SetItemString( Nature_Type.tp_dict, "RIDGE", tmp); Py_DECREF(tmp);
+	tmp = BPy_Nature_from_Nature( Nature::VALLEY ); PyDict_SetItemString( Nature_Type.tp_dict, "VALLEY", tmp); Py_DECREF(tmp);
+	tmp = BPy_Nature_from_Nature( Nature::SUGGESTIVE_CONTOUR ); PyDict_SetItemString( Nature_Type.tp_dict, "SUGGESTIVE_CONTOUR", tmp); Py_DECREF(tmp);
 	
 }
 
diff --git a/source/blender/freestyle/intern/view_map/ViewMap.h b/source/blender/freestyle/intern/view_map/ViewMap.h
index 7528d27cac6..416b7e8f23f 100755
--- a/source/blender/freestyle/intern/view_map/ViewMap.h
+++ b/source/blender/freestyle/intern/view_map/ViewMap.h
@@ -280,10 +280,11 @@ public:
   // this vertex in CCW order (order defined in 2D in the image plan)
   virtual edge_iterator edges_begin() = 0;
   virtual const_edge_iterator edges_begin() const = 0;
-  virtual edge_iterator edges_end()   = 0;
-  virtual const_edge_iterator edges_end() const   = 0;
+  virtual edge_iterator edges_end() = 0;
+  virtual const_edge_iterator edges_end() const = 0;
   virtual edge_iterator edges_iterator(ViewEdge *iEdge) = 0;
-  virtual const_edge_iterator edges_iterator(ViewEdge *iEdge) const = 0;
+  virtual const_edge_iterator edges_iterator(ViewEdge *iEdge) const  = 0;
+
 
   // Iterator access
   /*! Returns an iterator over the ViewEdges that goes to or comes from
@@ -292,14 +293,16 @@ public:
    *  and to get the orientation for each ViewEdge (incoming/outgoing).
    */
   virtual ViewVertexInternal::orientedViewEdgeIterator edgesBegin() = 0;
+
   /*! Returns an orientedViewEdgeIterator over the ViewEdges around this ViewVertex,
    *  pointing after the last ViewEdge.
    */
-  virtual ViewVertexInternal::orientedViewEdgeIterator edgesEnd() = 0;
+	virtual ViewVertexInternal::orientedViewEdgeIterator edgesEnd() = 0;
+
   /*! Returns an orientedViewEdgeIterator pointing to the ViewEdge
    *  given as argument.
    */
-  virtual ViewVertexInternal::orientedViewEdgeIterator edgesIterator(ViewEdge *iEdge) = 0;
+	virtual ViewVertexInternal::orientedViewEdgeIterator edgesIterator(ViewEdge *iEdge) = 0;
   
 };
 

From 6352cd509e6e6f834684ec1e24c42e274a2ed31b Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Mon, 21 Jul 2008 00:38:42 +0000
Subject: [PATCH 111/252] BPyTextPlugin now has descriptors for variables,
 functions and classes (and their variables/functions). Each descriptor also
 holds the line number of the definition allowing a simple outliner to be
 written.

Text.setCursorPos(row, col) now pops the text into view if it is in the active window space. The outliner uses this to jump to any definition in a script; it is invoked with Ctrl+T.
---
 release/scripts/bpymodules/BPyTextPlugin.py | 240 ++++++++++++--------
 release/scripts/textplugin_functiondocs.py  |   2 +-
 release/scripts/textplugin_imports.py       |   2 +-
 release/scripts/textplugin_membersuggest.py |   8 +-
 release/scripts/textplugin_outliner.py      |  81 +++++++
 release/scripts/textplugin_suggest.py       |   6 +-
 source/blender/python/api2_2x/Text.c        |   4 +
 7 files changed, 247 insertions(+), 96 deletions(-)
 create mode 100644 release/scripts/textplugin_outliner.py

diff --git a/release/scripts/bpymodules/BPyTextPlugin.py b/release/scripts/bpymodules/BPyTextPlugin.py
index 8b67937bb9e..1df095b8b35 100644
--- a/release/scripts/bpymodules/BPyTextPlugin.py
+++ b/release/scripts/bpymodules/BPyTextPlugin.py
@@ -1,16 +1,8 @@
 import bpy, sys
 import __builtin__, tokenize
 from Blender.sys import time
-from tokenize import generate_tokens, TokenError
-
-# TODO: Remove the dependency for a full Python installation.
-
-class ClassDesc():
-	
-	def __init__(self, name, defs, vars):
-		self.name = name
-		self.defs = defs
-		self.vars = vars
+from tokenize import generate_tokens, TokenError, \
+		COMMENT, DEDENT, INDENT, NAME, NEWLINE, NL
 
 class ScriptDesc():
 	
@@ -26,12 +18,34 @@ class ScriptDesc():
 	def set_time(self):
 		self.time = time()
 
+class ClassDesc():
+	
+	def __init__(self, name, defs, vars, lineno):
+		self.name = name
+		self.defs = defs
+		self.vars = vars
+		self.lineno = lineno
+
+class FunctionDesc():
+	
+	def __init__(self, name, params, lineno):
+		self.name = name
+		self.params = params
+		self.lineno = lineno
+
+class VarDesc():
+	
+	def __init__(self, name, type, lineno):
+		self.name = name
+		self.type = type # None for unknown (supports: dict/list/str)
+		self.lineno = lineno
+
 # Context types
-UNSET = -1
-NORMAL = 0
-SINGLE_QUOTE = 1
-DOUBLE_QUOTE = 2
-COMMENT = 3
+CTX_UNSET = -1
+CTX_NORMAL = 0
+CTX_SINGLE_QUOTE = 1
+CTX_DOUBLE_QUOTE = 2
+CTX_COMMENT = 3
 
 # Special period constants
 AUTO = -1
@@ -91,13 +105,12 @@ def parse_text(txt):
 	"""Parses an entire script's text and returns a ScriptDesc instance
 	containing information about the script.
 	
-	If the text is not a valid Python script a TokenError will be thrown.
-	Currently this means leaving brackets open will result in the script failing
-	to complete.
+	If the text is not a valid Python script (for example if brackets are left
+	open), parsing may fail to complete. However, if this occurs, no exception
+	is thrown. Instead the returned ScriptDesc instance will have its incomplete
+	flag set and information processed up to this point will still be accessible.
 	"""
 	
-	global NORMAL, SINGLE_QUOTE, DOUBLE_QUOTE, COMMENT
-	
 	txt.reset()
 	tokens = generate_tokens(txt.readline) # Throws TokenError
 	
@@ -114,7 +127,9 @@ def parse_text(txt):
 	def_step = 0
 	
 	vars = dict()
-	var_step = 0
+	var1_step = 0
+	var2_step = 0
+	var3_step = 0
 	var_accum = dict()
 	var_forflag = False
 	
@@ -126,13 +141,17 @@ def parse_text(txt):
 	try:
 	 for type, string, start, end, line in tokens:
 		
+		# Skip all comments and line joining characters
+		if type == COMMENT or type == NL:
+			continue
+		
 		#################
 		## Indentation ##
 		#################
 		
-		if type == tokenize.INDENT:
+		if type == INDENT:
 			indent += 1
-		elif type == tokenize.DEDENT:
+		elif type == DEDENT:
 			indent -= 1
 		
 		#########################
@@ -157,7 +176,7 @@ def parse_text(txt):
 				imp_from = '.'.join(imp_tmp)
 				imp_tmp = []
 				imp_step = 2
-			elif type == tokenize.NAME:
+			elif type == NAME:
 				imp_tmp.append(string)
 			elif string != '.':
 				imp_step = 0 # Invalid syntax
@@ -167,7 +186,7 @@ def parse_text(txt):
 			if string == 'as':
 				imp_name = '.'.join(imp_tmp)
 				imp_step = 3
-			elif type == tokenize.NAME or string == '*':
+			elif type == NAME or string == '*':
 				imp_tmp.append(string)
 			elif string != '.':
 				imp_name = '.'.join(imp_tmp)
@@ -176,7 +195,7 @@ def parse_text(txt):
 		
 		# Found 'as', change imp_symb to this value and go back to step 2
 		elif imp_step == 3:
-			if type == tokenize.NAME:
+			if type == NAME:
 				imp_symb = string
 			else:
 				imp_store = True
@@ -223,13 +242,14 @@ def parse_text(txt):
 		if cls_step == 0:
 			if string == 'class':
 				cls_name = None
+				cls_lineno = start[0]
 				cls_indent = indent
 				cls_step = 1
 		
 		# Found 'class', look for cls_name followed by '('
 		elif cls_step == 1:
 			if not cls_name:
-				if type == tokenize.NAME:
+				if type == NAME:
 					cls_name = string
 					cls_sline = False
 					cls_defs = dict()
@@ -239,21 +259,21 @@ def parse_text(txt):
 		
 		# Found 'class' name ... ':', now check if it's a single line statement
 		elif cls_step == 2:
-			if type == tokenize.NEWLINE:
+			if type == NEWLINE:
 				cls_sline = False
 				cls_step = 3
-			elif type != tokenize.COMMENT and type != tokenize.NL:
+			else:
 				cls_sline = True
 				cls_step = 3
 		
 		elif cls_step == 3:
 			if cls_sline:
-				if type == tokenize.NEWLINE:
-					classes[cls_name] = ClassDesc(cls_name, cls_defs, cls_vars)
+				if type == NEWLINE:
+					classes[cls_name] = ClassDesc(cls_name, cls_defs, cls_vars, cls_lineno)
 					cls_step = 0
 			else:
-				if type == tokenize.DEDENT and indent <= cls_indent:
-					classes[cls_name] = ClassDesc(cls_name, cls_defs, cls_vars)
+				if type == DEDENT and indent <= cls_indent:
+					classes[cls_name] = ClassDesc(cls_name, cls_defs, cls_vars, cls_lineno)
 					cls_step = 0
 		
 		#################
@@ -264,11 +284,12 @@ def parse_text(txt):
 		if def_step == 0:
 			if string == 'def':
 				def_name = None
+				def_lineno = start[0]
 				def_step = 1
 		
 		# Found 'def', look for def_name followed by '('
 		elif def_step == 1:
-			if type == tokenize.NAME:
+			if type == NAME:
 				def_name = string
 				def_params = []
 			elif def_name and string == '(':
@@ -277,13 +298,13 @@ def parse_text(txt):
 		# Found 'def' name '(', now identify the parameters upto ')'
 		# TODO: Handle ellipsis '...'
 		elif def_step == 2:
-			if type == tokenize.NAME:
+			if type == NAME:
 				def_params.append(string)
 			elif string == ')':
 				if cls_step > 0: # Parsing a class
-					cls_defs[def_name] = def_params
+					cls_defs[def_name] = FunctionDesc(def_name, def_params, def_lineno)
 				else:
-					defs[def_name] = def_params
+					defs[def_name] = FunctionDesc(def_name, def_params, def_lineno)
 				def_step = 0
 		
 		##########################
@@ -292,49 +313,87 @@ def parse_text(txt):
 		
 		if cls_step > 0: # Parsing a class
 			# Look for 'self.???'
-			if var_step == 0:
+			if var1_step == 0:
 				if string == 'self':
-					var_step = 1
-			elif var_step == 1:
+					var1_step = 1
+			elif var1_step == 1:
 				if string == '.':
 					var_name = None
-					var_step = 2
+					var1_step = 2
 				else:
-					var_step = 0
-			elif var_step == 2:
-				if type == tokenize.NAME:
+					var1_step = 0
+			elif var1_step == 2:
+				if type == NAME:
 					var_name = string
-					var_step = 3
-			elif var_step == 3:
+					if cls_vars.has_key(var_name):
+						var_step = 0
+					else:
+						var1_step = 3
+			elif var1_step == 3:
 				if string == '=':
-					cls_vars[var_name] = True
-					var_step = 0
+					var1_step = 4
+			elif var1_step == 4:
+				var_type = None
+				if string == '[':
+					close = line.find(']', end[1])
+					var_type = list
+				elif string == '"' or string == '"':
+					close = line.find(string, end[1])
+					var_type = str
+				elif string == '(':
+					close = line.find(')', end[1])
+					var_type = tuple
+				elif string == '{':
+					close = line.find('}', end[1])
+					var_type = dict
+				elif string == 'dict':
+					close = line.find(')', end[1])
+					var_type = dict
+				if var_type and close+1 < len(line):
+					if line[close]+1 != ' ' and line[close+1] != '\t':
+						var_type = None
+				cls_vars[var_name] = VarDesc(var_name, var_type, start[0])
+				var1_step = 0
 		
 		elif def_step > 0: # Parsing a def
 			# Look for 'global ???[,???]'
-			if var_step == 0:
+			if var2_step == 0:
 				if string == 'global':
-					var_step = 1
-			elif var_step == 1:
-				if type == tokenize.NAME:
+					var2_step = 1
+			elif var2_step == 1:
+				if type == NAME:
 					vars[string] = True
-				elif string != ',' and type != tokenize.NL:
-					var_step == 0
+				elif string != ',' and type != NL:
+					var2_step == 0
 		
 		else: # In global scope
-			# Look for names
-			if string == 'for':
-				var_accum = dict()
-				var_forflag = True
-			elif string == '=' or (var_forflag and string == 'in'):
-				vars.update(var_accum)
-				var_accum = dict()
-				var_forflag = False
-			elif type == tokenize.NAME:
-				var_accum[string] = True
-			elif not string in [',', '(', ')', '[', ']']:
-				var_accum = dict()
-				var_forflag = False
+			if var3_step == 0:
+				# Look for names
+				if string == 'for':
+					var_accum = dict()
+					var_forflag = True
+				elif string == '=' or (var_forflag and string == 'in'):
+					var_forflag = False
+					var3_step = 1
+				elif type == NAME:
+					if prev_string != '.' and not vars.has_key(string):
+						var_accum[string] = VarDesc(string, None, start[0])
+				elif not string in [',', '(', ')', '[', ']']:
+					var_accum = dict()
+					var_forflag = False
+			elif var3_step == 1:
+				if len(var_accum) != 1:
+					var_type = None
+					vars.update(var_accum)
+				else:
+					var_name = var_accum.keys()[0]
+					var_type = None
+					if string == '[': var_type = list
+					elif string == '"' or string == '"': var_type = string
+					elif string == '(': var_type = tuple
+					elif string == 'dict': var_type = dict
+					vars[var_name] = VarDesc(var_name, var_type, start[0])
+				var3_step = 0
 		
 		#######################
 		## General utilities ##
@@ -408,18 +467,19 @@ def get_context(txt):
 	"""Establishes the context of the cursor in the given Blender Text object
 	
 	Returns one of:
-	  NORMAL - Cursor is in a normal context
-	  SINGLE_QUOTE - Cursor is inside a single quoted string
-	  DOUBLE_QUOTE - Cursor is inside a double quoted string
-	  COMMENT - Cursor is inside a comment
+	  CTX_NORMAL - Cursor is in a normal context
+	  CTX_SINGLE_QUOTE - Cursor is inside a single quoted string
+	  CTX_DOUBLE_QUOTE - Cursor is inside a double quoted string
+	  CTX_COMMENT - Cursor is inside a comment
 	
 	"""
 	
+	global CTX_NORMAL, CTX_SINGLE_QUOTE, CTX_DOUBLE_QUOTE, CTX_COMMENT
 	l, cursor = txt.getCursorPos()
 	lines = txt.asLines()[:l+1]
 	
 	# Detect context (in string or comment)
-	in_str = 0			# 1-single quotes, 2-double quotes
+	in_str = CTX_NORMAL
 	for line in lines:
 		if l == 0:
 			end = cursor
@@ -428,25 +488,25 @@ def get_context(txt):
 			l -= 1
 		
 		# Comments end at new lines
-		if in_str == 3:
-			in_str = 0
+		if in_str == CTX_COMMENT:
+			in_str = CTX_NORMAL
 		
 		for i in range(end):
 			if in_str == 0:
-				if line[i] == "'": in_str = 1
-				elif line[i] == '"': in_str = 2
-				elif line[i] == '#': in_str = 3
+				if line[i] == "'": in_str = CTX_SINGLE_QUOTE
+				elif line[i] == '"': in_str = CTX_DOUBLE_QUOTE
+				elif line[i] == '#': in_str = CTX_COMMENT
 			else:
-				if in_str == 1:
+				if in_str == CTX_SINGLE_QUOTE:
 					if line[i] == "'":
-						in_str = 0
+						in_str = CTX_NORMAL
 						# In again if ' escaped, out again if \ escaped, and so on
 						for a in range(i-1, -1, -1):
 							if line[a] == '\\': in_str = 1-in_str
 							else: break
-				elif in_str == 2:
+				elif in_str == CTX_DOUBLE_QUOTE:
 					if line[i] == '"':
-						in_str = 0
+						in_str = CTX_NORMAL
 						# In again if " escaped, out again if \ escaped, and so on
 						for a in range(i-1, -1, -1):
 							if line[i-a] == '\\': in_str = 2-in_str
@@ -460,7 +520,7 @@ def current_line(txt):
 	cursor).
 	"""
 	
-	(lineindex, cursor) = txt.getCursorPos()
+	lineindex, cursor = txt.getCursorPos()
 	lines = txt.asLines()
 	line = lines[lineindex]
 	
@@ -548,12 +608,12 @@ def print_cache_for(txt, period=sys.maxint):
 	print 'Name:', desc.name, '('+str(hash(txt))+')'
 	print '------------------------------------------------'
 	print 'Defs:'
-	for name, params in desc.defs.items():
-		print ' ', name, params
+	for name, ddesc in desc.defs.items():
+		print ' ', name, ddesc.params, ddesc.lineno
 	print '------------------------------------------------'
 	print 'Vars:'
-	for name in desc.vars.keys():
-		print ' ', name
+	for name, vdesc in desc.vars.items():
+		print ' ', name, vdesc.type, vdesc.lineno
 	print '------------------------------------------------'
 	print 'Imports:'
 	for name, item in desc.imports.items():
@@ -565,11 +625,11 @@ def print_cache_for(txt, period=sys.maxint):
 		print '  Name:', clsnme
 		print '  ---------------------------------'
 		print '  Defs:'
-		for name, params in clsdsc.defs.items():
-			print '   ', name, params
+		for name, ddesc in clsdsc.defs.items():
+			print '   ', name, ddesc.params, ddesc.lineno
 		print '  ---------------------------------'
 		print '  Vars:'
-		for name in clsdsc.vars.keys():
-			print '   ', name
+		for name, vdesc in clsdsc.vars.items():
+			print '   ', name, vdesc.type, vdesc.lineno
 		print '  *********************************'
 	print '================================================'
diff --git a/release/scripts/textplugin_functiondocs.py b/release/scripts/textplugin_functiondocs.py
index 2277b7e68b5..acb1fdd6141 100644
--- a/release/scripts/textplugin_functiondocs.py
+++ b/release/scripts/textplugin_functiondocs.py
@@ -23,7 +23,7 @@ def main():
 	(line, c) = current_line(txt)
 	
 	# Check we are in a normal context
-	if get_context(txt) != NORMAL:
+	if get_context(txt) != CTX_NORMAL:
 		return
 	
 	# Look backwards for first '(' without ')'
diff --git a/release/scripts/textplugin_imports.py b/release/scripts/textplugin_imports.py
index 8596827ee35..dd98ab7a26e 100644
--- a/release/scripts/textplugin_imports.py
+++ b/release/scripts/textplugin_imports.py
@@ -24,7 +24,7 @@ def main():
 	line, c = current_line(txt)
 	
 	# Check we are in a normal context
-	if get_context(txt) != NORMAL:
+	if get_context(txt) != CTX_NORMAL:
 		return
 	
 	pos = line.rfind('from ', 0, c)
diff --git a/release/scripts/textplugin_membersuggest.py b/release/scripts/textplugin_membersuggest.py
index daa361e3163..a1cb510826f 100644
--- a/release/scripts/textplugin_membersuggest.py
+++ b/release/scripts/textplugin_membersuggest.py
@@ -23,7 +23,7 @@ def main():
 	(line, c) = current_line(txt)
 	
 	# Check we are in a normal context
-	if get_context(txt) != NORMAL:
+	if get_context(txt) != CTX_NORMAL:
 		return
 	
 	pre = get_targets(line, c)
@@ -35,11 +35,17 @@ def main():
 	builtins = get_builtins()
 	
 	# Identify the root (root.sub.sub.)
+	obj = None
 	if imports.has_key(pre[0]):
 		obj = imports[pre[0]]
 	elif builtins.has_key(pre[0]):
 		obj = builtins[pre[0]]
 	else:
+		desc = get_cached_descriptor(txt)
+		if desc.vars.has_key(pre[0]):
+			obj = desc.vars[pre[0]].type
+	
+	if not obj:
 		return
 	
 	# Step through sub-attributes
diff --git a/release/scripts/textplugin_outliner.py b/release/scripts/textplugin_outliner.py
new file mode 100644
index 00000000000..64750b6ba13
--- /dev/null
+++ b/release/scripts/textplugin_outliner.py
@@ -0,0 +1,81 @@
+#!BPY
+"""
+Name: 'Outline'
+Blender: 246
+Group: 'TextPlugin'
+Shortcut: 'Ctrl+T'
+Tooltip: 'Provides a menu for jumping to class and functions definitions.'
+"""
+
+# Only run if we have the required modules
+try:
+	import bpy
+	from BPyTextPlugin import *
+	from Blender import Draw
+	OK = True
+except ImportError:
+	OK = False
+
+def do_long_menu(title, items):
+	n = len(items)
+	if n < 20:
+		return Draw.PupMenu(title+'%t|'+'|'.join(items))
+	
+	letters = []
+	check = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_' # Cannot start 0-9 so just letters
+	for c in check:
+		for item in items:
+			if item[0].upper() == c:
+				letters.append(c)
+				break
+	
+	i = Draw.PupMenu(title+'%t|'+'|'.join(letters))
+	if i < 1:
+		return i
+	
+	c = letters[i-1]
+	newitems = []
+	
+	i = 0
+	for item in items:
+		i += 1
+		if item[0].upper() == c:
+			newitems.append(item+'%x'+str(i))
+	
+	return Draw.PupMenu(title+'%t|'+'|'.join(newitems))
+
+def main():
+	txt = bpy.data.texts.active
+	if not txt:
+		return
+	
+	items = []
+	i = Draw.PupMenu('Outliner%t|Classes|Defs|Variables')
+	if i < 1: return
+	
+	script = get_cached_descriptor(txt)
+	if i == 1:
+		type = script.classes
+	elif i == 2:
+		type = script.defs
+	elif i == 3:
+		type = script.vars
+	else:
+		return
+	items.extend(type.keys())
+	items.sort(cmp = suggest_cmp)
+	i = do_long_menu('Outliner', items)
+	if i < 1:
+		return
+	
+	try:
+		desc = type[items[i-1]]
+	except:
+		desc = None
+	
+	if desc:
+		txt.setCursorPos(desc.lineno-1, 0)
+
+# Check we are running as a script and not imported as a module
+if __name__ == "__main__" and OK:
+	main()
diff --git a/release/scripts/textplugin_suggest.py b/release/scripts/textplugin_suggest.py
index 20e248017af..f39e2db1f7f 100644
--- a/release/scripts/textplugin_suggest.py
+++ b/release/scripts/textplugin_suggest.py
@@ -25,9 +25,9 @@ def check_membersuggest(line, c):
 	return True
 
 def check_imports(line, c):
-	if line.rfind('import ', 0, c) == c-7:
+	if c >= 7 and line.rfind('import ', 0, c) == c-7:
 		return True
-	if line.rfind('from ', 0, c) == c-5:
+	if c >= 5 and line.rfind('from ', 0, c) == c-5:
 		return True
 	return False
 
@@ -39,7 +39,7 @@ def main():
 	(line, c) = current_line(txt)
 	
 	# Check we are in a normal context
-	if get_context(txt) != NORMAL:
+	if get_context(txt) != CTX_NORMAL:
 		return
 	
 	# Check the character preceding the cursor and execute the corresponding script
diff --git a/source/blender/python/api2_2x/Text.c b/source/blender/python/api2_2x/Text.c
index ecfb6ba1018..fc139b2b091 100644
--- a/source/blender/python/api2_2x/Text.c
+++ b/source/blender/python/api2_2x/Text.c
@@ -550,6 +550,7 @@ static PyObject *Text_setCursorPos( BPy_Text * self, PyObject * args )
 {
 	int row, col;
 	int oldstate;
+	SpaceText *st;
 
 	if (!self->text)
 		return EXPP_ReturnPyObjError(PyExc_RuntimeError,
@@ -565,6 +566,9 @@ static PyObject *Text_setCursorPos( BPy_Text * self, PyObject * args )
 	txt_move_to(self->text, row, col, 0);
 	txt_set_undostate(oldstate);
 
+	if (curarea->spacetype == SPACE_TEXT && (st=curarea->spacedata.first))
+		pop_space_text(st);
+
 	Py_RETURN_NONE;
 }
 

From fab7270e4022ffa89fab3dc27e7f6cb6f92c357b Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Mon, 21 Jul 2008 10:07:03 +0000
Subject: [PATCH 112/252] Script template added for text plug-ins

---
 release/scripts/scripttemplate_text_plugin.py | 69 +++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 release/scripts/scripttemplate_text_plugin.py

diff --git a/release/scripts/scripttemplate_text_plugin.py b/release/scripts/scripttemplate_text_plugin.py
new file mode 100644
index 00000000000..4ae562736d3
--- /dev/null
+++ b/release/scripts/scripttemplate_text_plugin.py
@@ -0,0 +1,69 @@
+#!BPY
+"""
+Name: 'Text Plugin'
+Blender: 246
+Group: 'ScriptTemplate'
+Tooltip: 'Add a new text for writing a text plugin'
+"""
+
+from Blender import Window
+import bpy
+
+script_data = \
+'''#!BPY
+"""
+Name: 'My Plugin Script'
+Blender: 246
+Group: 'TextPlugin'
+Shortcut: 'Ctrl+Alt+U'
+Tooltip: 'Put some useful info here'
+"""
+
+# Add a licence here if you wish to re-distribute, we recommend the GPL
+
+from Blender import Window, sys
+import BPyTextPlugin, bpy
+
+def my_script_util(txt):
+	# This function prints out statistical information about a script
+	
+	desc = BPyTextPlugin.get_cached_descriptor(txt)
+	print '---------------------------------------'
+	print 'Script Name:', desc.name
+	print 'Classes:', len(desc.classes)
+	print '  ', desc.classes.keys()
+	print 'Functions:', len(desc.defs)
+	print '  ', desc.defs.keys()
+	print 'Variables:', len(desc.vars)
+	print '  ', desc.vars.keys()
+
+def main():
+	
+	# Gets the active text object, there can be many in one blend file.
+	txt = bpy.data.texts.active
+	
+	# Silently return if the script has been run with no active text
+	if not txt:
+		return 
+	
+	# Text plug-ins should run quickly so we time it here
+	Window.WaitCursor(1)
+	t = sys.time()
+	
+	# Run our utility function
+	my_script_util(txt)
+	
+	# Timing the script is a good way to be aware on any speed hits when scripting
+	print 'Plugin script finished in %.2f seconds' % (sys.time()-t)
+	Window.WaitCursor(0)
+	
+
+# This lets you import the script without running it
+if __name__ == '__main__':
+	main()
+'''
+
+new_text = bpy.data.texts.new('textplugin_template.py')
+new_text.write(script_data)
+bpy.data.texts.active = new_text
+Window.RedrawAll()

From 434f2172f65cc547c26fc6d7c5a2d5400eff162f Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Mon, 21 Jul 2008 16:40:32 +0000
Subject: [PATCH 113/252] Removed requirement for suggestions to be pre-sorted.
 Allowed lists of strings to be suggested without having to specify their
 type. Specifying a prefix when suggesting is now also optional.

---
 source/blender/blenkernel/BKE_suggestions.h   |  7 +-
 .../blender/blenkernel/intern/suggestions.c   | 91 ++++++++++++++-----
 source/blender/python/api2_2x/Text.c          | 41 ++++++---
 source/blender/python/api2_2x/doc/Text.py     | 27 +++++-
 source/blender/src/drawtext.c                 |  1 +
 5 files changed, 122 insertions(+), 45 deletions(-)

diff --git a/source/blender/blenkernel/BKE_suggestions.h b/source/blender/blenkernel/BKE_suggestions.h
index cbddbcfc8ad..b150e279574 100644
--- a/source/blender/blenkernel/BKE_suggestions.h
+++ b/source/blender/blenkernel/BKE_suggestions.h
@@ -34,8 +34,10 @@ extern "C" {
 #endif
 
 /* ****************************************************************************
-Suggestions must be added in sorted order (no attempt is made to sort the list)
-The list is then divided up based on the prefix provided by update_suggestions:
+Suggestions should be added in sorted order although a linear sorting method is
+implemented. The list is then divided up based on the prefix provided by
+update_suggestions:
+
 Example:
   Prefix: ab
   aaa <-- first
@@ -70,6 +72,7 @@ short suggest_is_active(Text *text);
 
 void suggest_add(const char *name, char type);
 void suggest_prefix(const char *prefix);
+void suggest_clear_list();
 SuggItem *suggest_first();
 SuggItem *suggest_last();
 
diff --git a/source/blender/blenkernel/intern/suggestions.c b/source/blender/blenkernel/intern/suggestions.c
index e2c951f2284..41265c35170 100644
--- a/source/blender/blenkernel/intern/suggestions.c
+++ b/source/blender/blenkernel/intern/suggestions.c
@@ -37,6 +37,10 @@
 #include "BKE_text.h"
 #include "BKE_suggestions.h"
 
+/**********************/
+/* Static definitions */
+/**********************/
+
 static SuggList suggestions = {NULL, NULL, NULL, NULL, NULL};
 static Text *suggText = NULL;
 static SuggItem *lastInsert = NULL;
@@ -71,13 +75,37 @@ static void docs_free() {
 	}
 }
 
+/**************************/
+/* General tool functions */
+/**************************/
+
 void free_suggestions() {
 	sugg_free();
 	docs_free();
 }
 
+void suggest_set_active(Text *text) {
+	if (suggText == text) return;
+	suggest_clear_active();
+	suggText = text;
+}
+
+void suggest_clear_active() {
+	free_suggestions();
+	suggText = NULL;
+}
+
+short suggest_is_active(Text *text) {
+	return suggText==text ? 1 : 0;
+}
+
+/***************************/
+/* Suggestion list methods */
+/***************************/
+
 void suggest_add(const char *name, char type) {
-	SuggItem *newitem;
+	SuggItem *newitem, *item;
+	int len, cmp;
 
 	newitem = MEM_mallocN(sizeof(SuggItem) + strlen(name) + 1, "SuggestionItem");
 	if (!newitem) {
@@ -86,18 +114,42 @@ void suggest_add(const char *name, char type) {
 	}
 
 	newitem->name = (char *) (newitem + 1);
-	strcpy(newitem->name, name);
+	len = strlen(name);
+	strncpy(newitem->name, name, len);
+	newitem->name[len] = '\0';
 	newitem->type = type;
 	newitem->prev = newitem->next = NULL;
 
-	if (!suggestions.first) {
+	/* Perform simple linear search for ordered storage */
+	if (!suggestions.first || !suggestions.last) {
 		suggestions.first = suggestions.last = newitem;
 	} else {
-		newitem->prev = suggestions.last;
-		suggestions.last->next = newitem;
-		suggestions.last = newitem;
+		cmp = -1;
+		for (item=suggestions.last; item; item=item->prev) {
+			cmp = suggest_cmp(name, item->name, len);
+
+			/* Newitem comes after this item, insert here */
+			if (cmp >= 0) {
+				newitem->prev = item;
+				if (item->next)
+					item->next->prev = newitem;
+				newitem->next = item->next;
+				item->next = newitem;
+
+				/* At last item, set last pointer here */
+				if (item == suggestions.last)
+					suggestions.last = newitem;
+				break;
+			}
+		}
+		/* Reached beginning of list, insert before first */
+		if (cmp < 0) {
+			newitem->next = suggestions.first;
+			suggestions.first->prev = newitem;
+			suggestions.first = newitem;
+		}
 	}
-	suggestions.selected = NULL;
+	suggestions.firstmatch = suggestions.lastmatch = suggestions.selected = NULL;
 }
 
 void suggest_prefix(const char *prefix) {
@@ -136,6 +188,10 @@ void suggest_prefix(const char *prefix) {
 	}
 }
 
+void suggest_clear_list() {
+	sugg_free();
+}
+
 SuggItem *suggest_first() {
 	return suggestions.firstmatch;
 }
@@ -144,30 +200,17 @@ SuggItem *suggest_last() {
 	return suggestions.lastmatch;
 }
 
-void suggest_set_active(Text *text) {
-	if (suggText == text) return;
-	suggest_clear_active();
-	suggText = text;
-}
-
-void suggest_clear_active() {
-	free_suggestions();
-	suggText = NULL;
-}
-
-short suggest_is_active(Text *text) {
-	return suggText==text ? 1 : 0;
+SuggItem *suggest_get_selected() {
+	return suggestions.selected;
 }
 
 void suggest_set_selected(SuggItem *sel) {
 	suggestions.selected = sel;
 }
 
-SuggItem *suggest_get_selected() {
-	return suggestions.selected;
-}
-
+/*************************/
 /* Documentation methods */
+/*************************/
 
 void suggest_documentation(const char *docs) {
 	int len;
diff --git a/source/blender/python/api2_2x/Text.c b/source/blender/python/api2_2x/Text.c
index fc139b2b091..170f808da0d 100644
--- a/source/blender/python/api2_2x/Text.c
+++ b/source/blender/python/api2_2x/Text.c
@@ -137,7 +137,7 @@ static PyMethodDef BPy_Text_methods[] = {
 	{"setCursorPos", ( PyCFunction ) Text_setCursorPos, METH_VARARGS,
 	 "(row, col) - Set the cursor position to (row, col)"},
 	{"suggest", ( PyCFunction ) Text_suggest, METH_VARARGS,
-	 "(list, prefix) - List of tuples of the form (name, type) where type is one of 'm', 'v', 'f', 'k' for module, variable, function and keyword respectively"},
+	 "(list, prefix='') - Presents a list of suggestions. List is of strings, or tuples. Tuples must be of the form (name, type) where type is one of 'm', 'v', 'f', 'k' for module, variable, function and keyword respectively or '?' for other types"},
 	{"showDocs", ( PyCFunction ) Text_showDocs, METH_VARARGS,
 	 "(docs) - Documentation string"},
 	{NULL, NULL, 0, NULL}
@@ -574,20 +574,20 @@ static PyObject *Text_setCursorPos( BPy_Text * self, PyObject * args )
 
 static PyObject *Text_suggest( BPy_Text * self, PyObject * args )
 {
-	PyObject *item = NULL;
+	PyObject *item = NULL, *tup1 = NULL, *tup2 = NULL;
 	PyObject *list = NULL, *resl = NULL;
 	int list_len, i;
-	char *prefix, *name, type;
+	char *prefix = NULL, *name, type;
 	SpaceText *st;
 
 	if (!self->text)
 		return EXPP_ReturnPyObjError(PyExc_RuntimeError,
 				"This object isn't linked to a Blender Text Object");
 
-	/* Parse args for a list of tuples */
-	if (!PyArg_ParseTuple(args, "O!s", &PyList_Type, &list, &prefix))
+	/* Parse args for a list of strings/tuples */
+	if (!PyArg_ParseTuple(args, "O!|s", &PyList_Type, &list, &prefix))
 		return EXPP_ReturnPyObjError(PyExc_TypeError,
-				"expected list of tuples followed by a string");
+				"expected list of strings or tuples followed by an optional string");
 
 	if (curarea->spacetype != SPACE_TEXT)
 		return EXPP_ReturnPyObjError(PyExc_RuntimeError,
@@ -598,24 +598,37 @@ static PyObject *Text_suggest( BPy_Text * self, PyObject * args )
 		return EXPP_ReturnPyObjError(PyExc_RuntimeError,
 				"Active text area has no Text object");
 	
+	suggest_clear_list();
 	suggest_set_active(st->text);
 	list_len = PyList_Size(list);
 	
 	for (i = 0; i < list_len; i++) {
 		item = PyList_GetItem(list, i);
-		if (!PyTuple_Check(item) || PyTuple_GET_SIZE(item) != 2)
-			return EXPP_ReturnPyObjError(PyExc_AttributeError,
-					"list must contain only tuples of size 2" );
 
-		name = PyString_AsString(PyTuple_GetItem(item, 0));
-		type = PyString_AsString(PyTuple_GetItem(item, 1))[0];
-
-		if (!strlen(name) || (type!='m' && type!='v' && type!='f' && type!='k'))
+		if (PyString_Check(item)) {
+			name = PyString_AsString(item);
+			type = '?';
+		} else if (PyTuple_Check(item) && PyTuple_GET_SIZE(item) == 2) {
+			tup1 = PyTuple_GetItem(item, 0);
+			tup2 = PyTuple_GetItem(item, 1);
+			if (PyString_Check(tup1) && PyString_Check(tup2)) {
+				name = PyString_AsString(tup1);
+				type = PyString_AsString(tup2)[0];
+			} else
+				return EXPP_ReturnPyObjError(PyExc_AttributeError,
+						"list must contain tuples of two strings only: (name, type)" );
+		} else
 			return EXPP_ReturnPyObjError(PyExc_AttributeError,
-					"names must be non-empty and types in ['m', 'v', 'f', 'k']" );
+					"list must contain only individual strings or tuples of size 2" );
+
+		if (!strlen(name) || (type!='m' && type!='v' && type!='f' && type!='k' && type!='?'))
+			return EXPP_ReturnPyObjError(PyExc_AttributeError,
+					"names must be non-empty and types in ['m', 'v', 'f', 'k', '?']" );
 
 		suggest_add(name, type);
 	}
+	if (!prefix)
+		prefix = "";
 	suggest_prefix(prefix);
 	scrarea_queue_redraw(curarea);
 
diff --git a/source/blender/python/api2_2x/doc/Text.py b/source/blender/python/api2_2x/doc/Text.py
index 1f38aadfa66..c4a25899343 100644
--- a/source/blender/python/api2_2x/doc/Text.py
+++ b/source/blender/python/api2_2x/doc/Text.py
@@ -162,14 +162,31 @@ class Text:
 			cursor.
 		"""
 
-	def suggest(list):
+	def suggest(list, prefix=''):
 		"""
-		Set the suggestion list to the given list of tuples. This list *must* be
-		sorted by its first element, name.
-		@type list: list of tuples
+		Suggest a list of names. If list is a list of tuples (name, type) the
+		list will be formatted to syntax-highlight each entry type. Types must
+		be strings in the list ['m', 'f', 'v', 'k', '?']. It is recommended that
+		the list be sorted, case-insensitively by name.
+		
+		@type list: list of tuples or strings
 		@param list:  List of pair-tuples of the form (name, type) where name is
 			the suggested name and type is one of 'm' (module or class), 'f'
-			(function or method), 'v' (variable).
+			(function or method), 'v' (variable), 'k' (keyword), '?' (other).
+			Lists of plain strings are also accepted where the type is always
+			'?'.
+		@type prefix: string
+		@param prefix: The optional prefix used to limit what is suggested from
+			the list. This is usually whatever precedes the cursor so that
+			backspace will update it.
+		"""
+	
+	def showDocs(docs):
+		"""
+		Displays a word-wrapped message box containing the specified
+		documentation when this Text object is visible.
+		@type docs: string
+		@param docs: The documentation string to display.
 		"""
 
 import id_generics
diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index 4ae87f64c47..ce8128de790 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -1203,6 +1203,7 @@ void draw_suggestion_list(SpaceText *st)
 			case 'm': BIF_ThemeColor(TH_TEXT); break;
 			case 'f': BIF_ThemeColor(TH_SYNTAX_L); break;
 			case 'v': BIF_ThemeColor(TH_SYNTAX_N); break;
+			case '?': BIF_ThemeColor(TH_TEXT); b=0; break;
 		}
 		if (b) {
 			glRecti(x+8, y+2, x+11, y+5);

From 07b8c7e88765be111c0355ab8206cc3f2661a60d Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Mon, 21 Jul 2008 19:11:38 +0000
Subject: [PATCH 114/252] Updated the textplugin_outliner.py plug-in to use the
 new Draw.PupTreeMenu and updated this menu to support titles.

---
 release/scripts/textplugin_outliner.py    | 122 ++++++++++++++++------
 source/blender/python/api2_2x/doc/Draw.py |   8 +-
 source/blender/src/toolbox.c              |  13 ++-
 3 files changed, 104 insertions(+), 39 deletions(-)

diff --git a/release/scripts/textplugin_outliner.py b/release/scripts/textplugin_outliner.py
index 64750b6ba13..6dbb86e3b67 100644
--- a/release/scripts/textplugin_outliner.py
+++ b/release/scripts/textplugin_outliner.py
@@ -16,62 +16,118 @@ try:
 except ImportError:
 	OK = False
 
-def do_long_menu(title, items):
+def make_menu(items, eventoffs):
 	n = len(items)
 	if n < 20:
-		return Draw.PupMenu(title+'%t|'+'|'.join(items))
+		return [(items[i], i+1+eventoffs) for i in range(len(items))]
 	
 	letters = []
-	check = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_' # Cannot start 0-9 so just letters
+	check = 'abcdefghijklmnopqrstuvwxyz_' # Names cannot start 0-9
 	for c in check:
 		for item in items:
-			if item[0].upper() == c:
+			if item[0].lower() == c:
 				letters.append(c)
 				break
 	
-	i = Draw.PupMenu(title+'%t|'+'|'.join(letters))
-	if i < 1:
-		return i
-	
-	c = letters[i-1]
-	newitems = []
-	
+	dict = {}
 	i = 0
 	for item in items:
 		i += 1
-		if item[0].upper() == c:
-			newitems.append(item+'%x'+str(i))
+		c = item[0].lower()
+		if not dict.has_key(c): dict[c] = []
+		dict[c].append((item, i+eventoffs))
 	
-	return Draw.PupMenu(title+'%t|'+'|'.join(newitems))
+	subs = []
+	for c in letters:
+		subs.append((c, dict[c]))
+	
+	return subs
+
+def find_word(txt, word):
+	i = 0
+	for line in txt.asLines():
+		c = line.find(word)
+		if c != -1:
+			txt.setCursorPos(i, c)
+			break
+		i += 1
 
 def main():
 	txt = bpy.data.texts.active
 	if not txt:
 		return
 	
-	items = []
-	i = Draw.PupMenu('Outliner%t|Classes|Defs|Variables')
-	if i < 1: return
+	# Identify word under cursor
+	if get_context(txt) == CTX_NORMAL:
+		line, c = current_line(txt)
+		start = c-1
+		end = c
+		while start >= 0:
+			if not line[start].lower() in 'abcdefghijklmnopqrstuvwxyz0123456789_':
+				break
+			start -= 1
+		while end < len(line):
+			if not line[end].lower() in 'abcdefghijklmnopqrstuvwxyz0123456789_':
+				break
+			end += 1
+		word = line[start+1:end]
+		if word in KEYWORDS:
+			word = None
+	else:
+		word = None
 	
 	script = get_cached_descriptor(txt)
-	if i == 1:
-		type = script.classes
-	elif i == 2:
-		type = script.defs
-	elif i == 3:
-		type = script.vars
-	else:
-		return
-	items.extend(type.keys())
-	items.sort(cmp = suggest_cmp)
-	i = do_long_menu('Outliner', items)
-	if i < 1:
+	items = []
+	desc = None
+	
+	tmp = script.classes.keys()
+	tmp.sort(cmp = suggest_cmp)
+	class_menu = make_menu(tmp, len(items))
+	class_menu_length = len(tmp)
+	items.extend(tmp)
+	
+	tmp = script.defs.keys()
+	tmp.sort(cmp = suggest_cmp)
+	defs_menu = make_menu(tmp, len(items))
+	defs_menu_length = len(tmp)
+	items.extend(tmp)
+	
+	tmp = script.vars.keys()
+	tmp.sort(cmp = suggest_cmp)
+	vars_menu = make_menu(tmp, len(items))
+	vars_menu_length = len(tmp)
+	items.extend(tmp)
+	
+	menu = [('Outliner%t', 0),
+			('Classes', class_menu),
+			('Functions', defs_menu),
+			('Variables', vars_menu)]
+	if word:
+		menu.extend([None, ('Locate', [(word, -10)])])
+	
+	i = Draw.PupTreeMenu(menu)
+	if i == -1:
 		return
 	
-	try:
-		desc = type[items[i-1]]
-	except:
-		desc = None
+	# Chosen to search for word under cursor
+	if i == -10:
+		if script.classes.has_key(word):
+			desc = script.classes[word]
+		elif script.defs.has_key(word):
+			desc = script.defs[word]
+		elif script.vars.has_key(word):
+			desc = script.vars[word]
+		else:
+			find_word(txt, word)
+			return
+	else:
+		i -= 1
+		if i < class_menu_length:
+			desc = script.classes[items[i]]
+		elif i < class_menu_length + defs_menu_length:
+			desc = script.defs[items[i]]
+		elif i < class_menu_length + defs_menu_length + vars_menu_length:
+			desc = script.vars[items[i]]
 	
 	if desc:
 		txt.setCursorPos(desc.lineno-1, 0)
diff --git a/source/blender/python/api2_2x/doc/Draw.py b/source/blender/python/api2_2x/doc/Draw.py
index 18234754315..97e22797902 100644
--- a/source/blender/python/api2_2x/doc/Draw.py
+++ b/source/blender/python/api2_2x/doc/Draw.py
@@ -357,12 +357,14 @@ def PupTreeMenu( menu ):
 	"""
 	Create a popup menu tree.
 	
-	Each item in the list is a menu item - (str, event), separator - None or submenu - (str, [...]).
+	Each item in the list is: a menu item - (str, event); a separator - None;
+	or submenu - (str, [...]).
 	
-	Submenus list uses the same syntax as the menu list.
+	Submenus list uses the same syntax as the menu list. To add a title to the
+	main menu, end the first entry str with '%t' - the event is ignored.
 
 	Example::
-		result = Draw.PupTreeMenu( [ ("Menu Item 1", 10), ("Menu Item 2", 12), ("SubMenu", [("Menu Item 3", 100), ("MenuItem4", 101) ]  ) ] )
+		result = Draw.PupTreeMenu( [ ("Title%t", 0), ("Menu Item 1", 10), ("Menu Item 2", 12), ("SubMenu", [("Menu Item 3", 100), ("MenuItem4", 101) ]  ) ] )
 	
 	@type menu: string
 	@param menu: A menu list
diff --git a/source/blender/src/toolbox.c b/source/blender/src/toolbox.c
index 94d38ee1635..94ab289f716 100644
--- a/source/blender/src/toolbox.c
+++ b/source/blender/src/toolbox.c
@@ -2277,7 +2277,7 @@ void toolbox_generic( TBitem *generic_menu )
 	uiBlock *block;
 	uiBut *but;
 	TBitem *menu;
-	int dx=96;
+	int dx=96, first=1, len;
 	short event, mval[2];
 	long ypos = -5;
 	
@@ -2298,11 +2298,17 @@ void toolbox_generic( TBitem *generic_menu )
 	
 	/* Add the menu */
 	for (menu = generic_menu; menu->icon != -1; menu++) {
-		if(strcmp(menu->name, "SEPR")==0) {
+		if (first && (len=strlen(menu->name)) > 2 && menu->name[len-2]=='%' && menu->name[len-1]=='t') {
+			menu->name[len-2] = '\0';
+			uiSetCurFont(block, UI_HELVB);
+			uiDefIconTextBut(block, LABEL, 0, ICON_BLANK1, menu->name, mval[0]+tb_mainx,mval[1]+tb_mainy+ypos+5, dx, 19, NULL, 0.0, 0.0, 0, 0, "");
+			uiSetCurFont(block, UI_HELV);
+			ypos-=20;
+		} else if(strcmp(menu->name, "SEPR")==0) {
 			uiDefBut(block, SEPR, 0, "", mval[0]+tb_mainx,mval[1]+tb_mainy+ypos+5, dx, 6, NULL, 0.0, 0.0, 0, 0, "");
 			ypos-=6;
 		} else {
-			 if (menu->poin) {
+			if (menu->poin) {
 				but=uiDefIconTextBlockBut(block, tb_makemenu, menu->poin, ICON_RIGHTARROW_THIN, menu->name, mval[0]+tb_mainx,mval[1]+tb_mainy+ypos+5, dx, 19, "");
 				uiButSetFlag(but, UI_MAKE_RIGHT);
 			
@@ -2313,6 +2319,7 @@ void toolbox_generic( TBitem *generic_menu )
 			}
 			ypos-=20;
 		}
+		first= 0;
 	}
 	
 	uiBlockSetButmFunc(block, menu->poin, NULL);

From 7426a3e35bb6ebc5c08eb307c0f9d30ef51ae570 Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Mon, 21 Jul 2008 21:24:37 +0000
Subject: [PATCH 115/252] Added StrokeAttribute class. Beginning of
 StrokeVertex.

IMPORTANT: The setters functions' names were normalized due to constant confusion regarding capitalization. All the function names start with set... instead of Set.... This convention was changed all throughout Freestyle. To use Freestyle as an external renderer, the SWIG library MUST be regenerated.
---
 source/blender/freestyle/SConscript           |     2 +
 .../freestyle/intern/app/AppCanvas.cpp        |     8 +-
 .../blender/freestyle/intern/app/AppCanvas.h  |     2 +-
 .../intern/app/AppDensityCurvesWindow.cpp     |     8 +-
 .../intern/app/AppDensityCurvesWindow.h       |     4 +-
 .../intern/app/AppGL2DCurvesViewer.cpp        |    12 +-
 .../intern/app/AppGL2DCurvesViewer.h          |     4 +-
 .../freestyle/intern/app/AppGLWidget.cpp      |    74 +-
 .../freestyle/intern/app/AppGLWidget.h        |     2 +-
 .../freestyle/intern/app/AppMainWindow.cpp    |     2 +-
 .../freestyle/intern/app/Controller.cpp       |    78 +-
 source/blender/freestyle/intern/app/Main.cpp  |     4 +-
 .../freestyle/intern/app/QGLBasicWidget.cpp   |     8 +-
 .../intern/app_blender/AppCanvas.cpp          |     8 +-
 .../freestyle/intern/app_blender/AppCanvas.h  |     2 +-
 .../intern/app_blender/AppGLWidget.cpp        |    50 +-
 .../intern/app_blender/AppGLWidget.h          |    12 +-
 .../intern/app_blender/Controller.cpp         |    56 +-
 .../freestyle/intern/app_blender/Controller.h |     2 +-
 .../freestyle/intern/app_blender/api.cpp      |     2 +-
 .../freestyle/intern/geometry/GeomCleaner.h   |     4 +-
 .../freestyle/intern/image/GaussianFilter.cpp |     2 +-
 .../freestyle/intern/image/GaussianFilter.h   |     2 +-
 .../intern/python/BinaryPredicate0D.h         |     3 +-
 .../intern/python/BinaryPredicate1D.h         |     3 +-
 .../freestyle/intern/python/Freestyle.cpp     |     2 +
 .../freestyle/intern/python/Freestyle.h       |     3 +-
 source/blender/freestyle/intern/python/Id.h   |     3 +-
 .../freestyle/intern/python/IntegrationType.h |     3 +-
 .../freestyle/intern/python/Interface0D.h     |     3 +-
 .../intern/python/Interface0D/CurvePoint.cpp  |    30 +-
 .../intern/python/Interface0D/CurvePoint.h    |     3 +-
 .../Interface0D/CurvePoint/StrokeVertex.cpp   |   344 +-
 .../Interface0D/CurvePoint/StrokeVertex.h     |    31 +
 .../intern/python/Interface0D/SVertex.cpp     |    30 +-
 .../intern/python/Interface0D/SVertex.h       |     3 +-
 .../intern/python/Interface0D/ViewVertex.h    |     3 +-
 .../freestyle/intern/python/Interface1D.h     |     3 +-
 .../intern/python/Interface1D/FEdge.cpp       |    68 +-
 .../intern/python/Interface1D/FEdge.h         |     3 +-
 .../blender/freestyle/intern/python/Nature.h  |     3 +-
 .../intern/python/StrokeAttribute.cpp         |   526 +-
 .../freestyle/intern/python/StrokeAttribute.h |    34 +
 .../freestyle/intern/python/UnaryFunction0D.h |     3 +-
 .../freestyle/intern/python/UnaryFunction1D.h |     3 +-
 .../intern/python/UnaryPredicate0D.h          |     3 +-
 .../intern/python/UnaryPredicate1D.h          |     3 +-
 .../intern/rendering/GLDebugRenderer.h        |    10 +-
 .../freestyle/intern/rendering/GLRenderer.cpp |     2 +-
 .../intern/scene_graph/DrawingStyle.h         |     8 +-
 .../intern/scene_graph/IndexedFaceSet.cpp     |     2 +-
 .../intern/scene_graph/IndexedFaceSet.h       |     2 +-
 .../freestyle/intern/scene_graph/LineRep.cpp  |     2 +-
 .../freestyle/intern/scene_graph/LineRep.h    |    12 +-
 .../freestyle/intern/scene_graph/Material.h   |    20 +-
 .../intern/scene_graph/MaxFileLoader.cpp      |    16 +-
 .../intern/scene_graph/MaxFileLoader.h        |     2 +-
 .../freestyle/intern/scene_graph/Node.h       |     2 +-
 .../intern/scene_graph/NodeDrawingStyle.h     |    10 +-
 .../freestyle/intern/scene_graph/NodeShape.h  |     2 +-
 .../intern/scene_graph/NodeTransform.cpp      |     2 +-
 .../intern/scene_graph/NodeTransform.h        |     2 +-
 .../freestyle/intern/scene_graph/Rep.h        |     6 +-
 .../intern/scene_graph/TriangleRep.cpp        |     2 +-
 .../intern/scene_graph/TriangleRep.h          |    10 +-
 .../intern/scene_graph/VertexRep.cpp          |     2 +-
 .../freestyle/intern/scene_graph/VertexRep.h  |     6 +-
 .../intern/stroke/AdvancedFunctions0D.h       |     4 +-
 .../intern/stroke/AdvancedStrokeShaders.cpp   |     4 +-
 .../intern/stroke/BasicStrokeShaders.cpp      |    42 +-
 .../freestyle/intern/stroke/Canvas.cpp        |     2 +-
 .../blender/freestyle/intern/stroke/Canvas.h  |     8 +-
 .../blender/freestyle/intern/stroke/Curve.h   |     6 +-
 .../freestyle/intern/stroke/Modifiers.h       |     2 +-
 .../freestyle/intern/stroke/Operators.cpp     |     8 +-
 .../freestyle/intern/stroke/QInformationMap.h |     2 +-
 .../freestyle/intern/stroke/Stroke.cpp        |    14 +-
 .../blender/freestyle/intern/stroke/Stroke.h  |    70 +-
 .../freestyle/intern/stroke/StrokeLayer.h     |     2 +-
 .../freestyle/intern/stroke/StrokeRep.h       |     2 +-
 .../intern/stroke/StrokeTesselator.cpp        |    12 +-
 .../intern/stroke/StrokeTesselator.h          |     4 +-
 .../freestyle/intern/swig/ModuleWrapper.cpp   | 17983 ++++++++--------
 .../freestyle/intern/swig/ModuleWrapper.h     |    36 +-
 .../intern/view_map/FEdgeXDetector.cpp        |    10 +-
 .../intern/view_map/FEdgeXDetector.h          |     4 +-
 .../freestyle/intern/view_map/Silhouette.h    |   130 +-
 .../intern/view_map/SilhouetteGeomEngine.cpp  |    10 +-
 .../intern/view_map/SilhouetteGeomEngine.h    |     6 +-
 .../intern/view_map/ViewEdgeXBuilder.cpp      |    74 +-
 .../intern/view_map/ViewEdgeXBuilder.h        |     6 +-
 .../freestyle/intern/view_map/ViewMap.cpp     |    46 +-
 .../freestyle/intern/view_map/ViewMap.h       |   106 +-
 .../intern/view_map/ViewMapBuilder.cpp        |    42 +-
 .../intern/view_map/ViewMapBuilder.h          |    16 +-
 .../freestyle/intern/view_map/ViewMapIO.cpp   |   102 +-
 .../intern/view_map/ViewMapTesselator.h       |    18 +-
 .../freestyle/intern/winged_edge/WEdge.cpp    |    64 +-
 .../freestyle/intern/winged_edge/WEdge.h      |    60 +-
 .../freestyle/intern/winged_edge/WXEdge.cpp   |    26 +-
 .../freestyle/intern/winged_edge/WXEdge.h     |    30 +-
 .../intern/winged_edge/WXEdgeBuilder.cpp      |     6 +-
 .../intern/winged_edge/WingedEdgeBuilder.cpp  |    14 +-
 source/blender/freestyle/python/Freestyle.py  |   251 +-
 .../style_modules/anisotropic_diffusion.py    |     2 +-
 .../freestyle/style_modules/shaders.py        |    48 +-
 .../style_modules/sketchy_topology_broken.py  |     4 +-
 107 files changed, 11286 insertions(+), 9571 deletions(-)
 create mode 100644 source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.h
 create mode 100644 source/blender/freestyle/intern/python/StrokeAttribute.h

diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript
index bcbd018c011..81749b60b2a 100644
--- a/source/blender/freestyle/SConscript
+++ b/source/blender/freestyle/SConscript
@@ -68,11 +68,13 @@ python_sources = [
 					prefix + '/IntegrationType.cpp',
 					prefix + '/Interface0D.cpp',
 					prefix + '/Interface0D/CurvePoint.cpp',
+					# prefix + '/Interface0D/CurvePoint/StrokeVertex.cpp',
 					prefix + '/Interface0D/SVertex.cpp',
 					prefix + '/Interface0D/ViewVertex.cpp',
 					prefix + '/Interface1D.cpp',
 					prefix + '/Interface1D/FEdge.cpp',
 					prefix + '/Nature.cpp',
+					prefix + '/StrokeAttribute.cpp',
 					prefix + '/UnaryFunction0D.cpp',
 					prefix + '/UnaryFunction1D.cpp',
 					prefix + '/UnaryPredicate0D.cpp',
diff --git a/source/blender/freestyle/intern/app/AppCanvas.cpp b/source/blender/freestyle/intern/app/AppCanvas.cpp
index 60d36880c12..3ca06fddfe7 100755
--- a/source/blender/freestyle/intern/app/AppCanvas.cpp
+++ b/source/blender/freestyle/intern/app/AppCanvas.cpp
@@ -68,7 +68,7 @@ AppCanvas::~AppCanvas()
   _pViewer = 0;
 }
 
-void AppCanvas::SetViewer(AppGLWidget *iViewer)
+void AppCanvas::setViewer(AppGLWidget *iViewer)
 {
   _pViewer = iViewer;
 }  
@@ -181,7 +181,7 @@ void AppCanvas::readColorPixels(int x,int y,int w, int h, RGBImage& oImage) cons
   //    qtmp.save("densityQuery"+QString::number(number)+".png", "PNG");
   //    
   //    GaussianFilter filter;
-  //    filter.SetSigma(4.0);
+  //    filter.setSigma(4.0);
   //    int bound = filter.getBound();
   //    QImage qtmp2(width(), height(), 32);
   //    for(int py2=0;py2<height();++py2){
@@ -246,7 +246,7 @@ void AppCanvas::Render(const StrokeRenderer *iRenderer)
     
     glEnable(GL_LIGHTING);
     glEnable(GL_DEPTH_TEST);
-    _pViewer->Set3DContext();
+    _pViewer->set3DContext();
     _pViewer->DrawScene(_pViewer->glRenderer());
     glDisable(GL_DEPTH_TEST);
     glDisable(GL_LIGHTING);
@@ -347,7 +347,7 @@ void AppCanvas::RenderBasic(const StrokeRenderer *iRenderer)
     
     glEnable(GL_LIGHTING);
     glEnable(GL_DEPTH_TEST);
-    _pViewer->Set3DContext();
+    _pViewer->set3DContext();
     _pViewer->DrawScene(_pViewer->glRenderer());
     glDisable(GL_DEPTH_TEST);
     glDisable(GL_LIGHTING);
diff --git a/source/blender/freestyle/intern/app/AppCanvas.h b/source/blender/freestyle/intern/app/AppCanvas.h
index 703970c0fb1..be02c02eab7 100755
--- a/source/blender/freestyle/intern/app/AppCanvas.h
+++ b/source/blender/freestyle/intern/app/AppCanvas.h
@@ -77,7 +77,7 @@ public:
   inline const AppGLWidget * viewer() const {return _pViewer;}
 
   /*! modifiers */
-  void SetViewer(AppGLWidget *iViewer) ;
+  void setViewer(AppGLWidget *iViewer) ;
 };
 
 
diff --git a/source/blender/freestyle/intern/app/AppDensityCurvesWindow.cpp b/source/blender/freestyle/intern/app/AppDensityCurvesWindow.cpp
index fe2ae994f77..ec7ee004bf3 100755
--- a/source/blender/freestyle/intern/app/AppDensityCurvesWindow.cpp
+++ b/source/blender/freestyle/intern/app/AppDensityCurvesWindow.cpp
@@ -33,7 +33,7 @@ AppDensityCurvesWindow::AppDensityCurvesWindow(QWidget *parent, const char *name
 AppDensityCurvesWindow::~AppDensityCurvesWindow(){ 
 }
 
-void AppDensityCurvesWindow::SetOrientationCurve(int i, const Vec2d& vmin, const Vec2d& vmax, const vector<Vec3r>& iCurve, const char *xlabel, const char *ylabel){
+void AppDensityCurvesWindow::setOrientationCurve(int i, const Vec2d& vmin, const Vec2d& vmax, const vector<Vec3r>& iCurve, const char *xlabel, const char *ylabel){
   AppGL2DCurvesViewer * viewer = 0;
   switch(i){
   case 0:viewer = CurvesViewer0; break;
@@ -44,10 +44,10 @@ void AppDensityCurvesWindow::SetOrientationCurve(int i, const Vec2d& vmin, const
   default:return;
   }
   
-  viewer->SetCurve(vmin, vmax, iCurve, xlabel, ylabel);
+  viewer->setCurve(vmin, vmax, iCurve, xlabel, ylabel);
 }
 
-void AppDensityCurvesWindow::SetLevelCurve(int i, const Vec2d& vmin, const Vec2d& vmax, const vector<Vec3r>& iCurve, const char *xlabel, const char *ylabel){
+void AppDensityCurvesWindow::setLevelCurve(int i, const Vec2d& vmin, const Vec2d& vmax, const vector<Vec3r>& iCurve, const char *xlabel, const char *ylabel){
   AppGL2DCurvesViewer * viewer = 0;
   switch(i){
   case 1:viewer = LevelCurveViewer1; break;
@@ -61,5 +61,5 @@ void AppDensityCurvesWindow::SetLevelCurve(int i, const Vec2d& vmin, const Vec2d
   default:return;
   }
   
-  viewer->SetCurve(vmin, vmax, iCurve, xlabel, ylabel);
+  viewer->setCurve(vmin, vmax, iCurve, xlabel, ylabel);
 }
diff --git a/source/blender/freestyle/intern/app/AppDensityCurvesWindow.h b/source/blender/freestyle/intern/app/AppDensityCurvesWindow.h
index d7091440e06..2fda4da49d9 100755
--- a/source/blender/freestyle/intern/app/AppDensityCurvesWindow.h
+++ b/source/blender/freestyle/intern/app/AppDensityCurvesWindow.h
@@ -60,7 +60,7 @@ public:
    *  \param ylabel
    *    The label of the y-axis
    */
-  void SetOrientationCurve(int i, const Vec2d& vmin, const Vec2d& vmax, const vector<Vec3r>& iCurve, const char *xlabel, const char *ylabel);
+  void setOrientationCurve(int i, const Vec2d& vmin, const Vec2d& vmax, const vector<Vec3r>& iCurve, const char *xlabel, const char *ylabel);
 
   /*! Sets the node that contains the level curve i in 
    *  viewer i (i in [1,8]).
@@ -77,7 +77,7 @@ public:
    *  \param ylabel
    *    The label of the y-axis
    */
-  void SetLevelCurve(int i, const Vec2d& vmin, const Vec2d& vmax, const vector<Vec3r>& iCurve, const char *xlabel, const char *ylabel);
+  void setLevelCurve(int i, const Vec2d& vmin, const Vec2d& vmax, const vector<Vec3r>& iCurve, const char *xlabel, const char *ylabel);
 };
 
 #endif // APPDENSITYCURVESWINDOW_H
diff --git a/source/blender/freestyle/intern/app/AppGL2DCurvesViewer.cpp b/source/blender/freestyle/intern/app/AppGL2DCurvesViewer.cpp
index 0915a4c3cbd..c5ff7ef6a71 100755
--- a/source/blender/freestyle/intern/app/AppGL2DCurvesViewer.cpp
+++ b/source/blender/freestyle/intern/app/AppGL2DCurvesViewer.cpp
@@ -28,8 +28,8 @@
 AppGL2DCurvesViewer::AppGL2DCurvesViewer(QWidget *iParent, const char *iName)
 : QGLViewer(iParent)
 {
-  _RootNode.SetLightingEnabled(false);
-  _RootNode.SetLineWidth(1.0);
+  _RootNode.setLightingEnabled(false);
+  _RootNode.setLineWidth(1.0);
   _pGLRenderer = new GLRenderer;
 }
 AppGL2DCurvesViewer::~AppGL2DCurvesViewer(){
@@ -39,7 +39,7 @@ AppGL2DCurvesViewer::~AppGL2DCurvesViewer(){
     delete _pGLRenderer;
 }
   
-void AppGL2DCurvesViewer::SetRange(const Vec2d& vmin, const Vec2d& vmax, const char * xlabel, const char *ylabel){
+void AppGL2DCurvesViewer::setRange(const Vec2d& vmin, const Vec2d& vmax, const char * xlabel, const char *ylabel){
   _vmin = vmin;
   _vmax = vmax;
   _xmargin = (vmax.x()-vmin.x())/20.0;
@@ -53,8 +53,8 @@ void AppGL2DCurvesViewer::SetRange(const Vec2d& vmin, const Vec2d& vmax, const c
   if(ylabel)
     _ylabel = ylabel;
 }
-void AppGL2DCurvesViewer::SetCurve(const Vec2d& vmin, const Vec2d& vmax, const vector<Vec3r>& iPoints, const char *xlabel, const char *ylabel){
-  SetRange(vmin, vmax, xlabel, ylabel);
+void AppGL2DCurvesViewer::setCurve(const Vec2d& vmin, const Vec2d& vmax, const vector<Vec3r>& iPoints, const char *xlabel, const char *ylabel){
+  setRange(vmin, vmax, xlabel, ylabel);
   vector<Node*> nodes;
   _RootNode.RetrieveChildren(nodes);
   _RootNode.DetachChildren();
@@ -67,7 +67,7 @@ void AppGL2DCurvesViewer::SetCurve(const Vec2d& vmin, const Vec2d& vmax, const v
   _curve = iPoints;
   NodeGroup * curveNode = new NodeGroup;
   NodeShape * shape = new NodeShape;
-  shape->material().SetDiffuse(0,0,0,1);
+  shape->material().setDiffuse(0,0,0,1);
   curveNode->AddChild(shape);
   shape->AddRep(new LineRep(iPoints));
   for(vector<Vec3r>::const_iterator v=iPoints.begin(), vend=iPoints.end();
diff --git a/source/blender/freestyle/intern/app/AppGL2DCurvesViewer.h b/source/blender/freestyle/intern/app/AppGL2DCurvesViewer.h
index c0bb8b4109c..2bdefba2a90 100755
--- a/source/blender/freestyle/intern/app/AppGL2DCurvesViewer.h
+++ b/source/blender/freestyle/intern/app/AppGL2DCurvesViewer.h
@@ -46,8 +46,8 @@ public:
   
   /*! Sets the ranges.
    */
-  void SetRange(const Vec2d& vmin, const Vec2d& vmax, const char * xlabel, const char *ylabel);
-  void SetCurve(const Vec2d& vmin, const Vec2d& vmax, const vector<Vec3r>& iPoints, const char *xlabel, const char *ylabel);
+  void setRange(const Vec2d& vmin, const Vec2d& vmax, const char * xlabel, const char *ylabel);
+  void setCurve(const Vec2d& vmin, const Vec2d& vmax, const vector<Vec3r>& iPoints, const char *xlabel, const char *ylabel);
   void AddNode(Node* iNode);
   void DetachNode(Node* iNode);
   void RetrieveNodes(vector<Node*>& oNodes);
diff --git a/source/blender/freestyle/intern/app/AppGLWidget.cpp b/source/blender/freestyle/intern/app/AppGLWidget.cpp
index d59ad716c18..46e1f409cb2 100755
--- a/source/blender/freestyle/intern/app/AppGLWidget.cpp
+++ b/source/blender/freestyle/intern/app/AppGLWidget.cpp
@@ -58,22 +58,22 @@ AppGLWidget::AppGLWidget(QWidget *iParent, const char *iName)
   _Fovy        = 30.f;
   //_SceneDepth = 2.f;
   _RenderStyle = LINE;
-  //_ModelRootNode->SetBBox(BBox<Vec3f>(Vec3f(-10.f, -10.f, -10.f), Vec3f(10.f, 10.f, 10.f)));
+  //_ModelRootNode->setBBox(BBox<Vec3f>(Vec3f(-10.f, -10.f, -10.f), Vec3f(10.f, 10.f, 10.f)));
   _ModelRootNode = new NodeDrawingStyle;
   _SilhouetteRootNode = new NodeDrawingStyle;
   _DebugRootNode = new NodeDrawingStyle;
   
   _RootNode.AddChild(_ModelRootNode);
-  _SilhouetteRootNode->SetStyle(DrawingStyle::LINES);
-  _SilhouetteRootNode->SetLightingEnabled(false);
-  _SilhouetteRootNode->SetLineWidth(2.f);
-  _SilhouetteRootNode->SetPointSize(3.f);
+  _SilhouetteRootNode->setStyle(DrawingStyle::LINES);
+  _SilhouetteRootNode->setLightingEnabled(false);
+  _SilhouetteRootNode->setLineWidth(2.f);
+  _SilhouetteRootNode->setPointSize(3.f);
 
   _RootNode.AddChild(_SilhouetteRootNode);
 
-  _DebugRootNode->SetStyle(DrawingStyle::LINES);
-  _DebugRootNode->SetLightingEnabled(false);
-  _DebugRootNode->SetLineWidth(1.f);
+  _DebugRootNode->setStyle(DrawingStyle::LINES);
+  _DebugRootNode->setLightingEnabled(false);
+  _DebugRootNode->setLineWidth(1.f);
   
   _RootNode.AddChild(_DebugRootNode);
 
@@ -91,23 +91,23 @@ AppGLWidget::AppGLWidget(QWidget *iParent, const char *iName)
 
   // 2D Scene
   //  _pFENode = new NodeDrawingStyle;
-  //  _pFENode->SetStyle(DrawingStyle::LINES);
-  //  _pFENode->SetLightingEnabled(false);
-  //  _pFENode->SetLineWidth(1.f);
+  //  _pFENode->setStyle(DrawingStyle::LINES);
+  //  _pFENode->setLightingEnabled(false);
+  //  _pFENode->setLineWidth(1.f);
   //
   //  _p2DNode.AddChild(_pFENode);
   //  
   //  _pVisibleSilhouetteNode = new NodeDrawingStyle;
-  //  _pVisibleSilhouetteNode->SetStyle(DrawingStyle::LINES);
-  //  _pVisibleSilhouetteNode->SetLightingEnabled(false);
-  //  _pVisibleSilhouetteNode->SetLineWidth(3.f);
+  //  _pVisibleSilhouetteNode->setStyle(DrawingStyle::LINES);
+  //  _pVisibleSilhouetteNode->setLightingEnabled(false);
+  //  _pVisibleSilhouetteNode->setLineWidth(3.f);
   //
   //  _p2DNode.AddChild(_pVisibleSilhouetteNode);
   //  
   _p2DSelectionNode = new NodeDrawingStyle;
-  _p2DSelectionNode->SetLightingEnabled(false);
-  _p2DSelectionNode->SetStyle(DrawingStyle::LINES);
-  _p2DSelectionNode->SetLineWidth(5.f);
+  _p2DSelectionNode->setLightingEnabled(false);
+  _p2DSelectionNode->setStyle(DrawingStyle::LINES);
+  _p2DSelectionNode->setLineWidth(5.f);
   
   _p2DNode.AddChild(_p2DSelectionNode);
 
@@ -188,7 +188,7 @@ AppGLWidget::~AppGLWidget()
   //saveToFile(filename);
 }
 
-void AppGLWidget::SetMainWindow(QMainWindow *iMainWindow) {
+void AppGLWidget::setMainWindow(QMainWindow *iMainWindow) {
 	_pMainWindow = iMainWindow;
 }
 void AppGLWidget::captureMovie()
@@ -315,18 +315,18 @@ AppGLWidget::select(const QMouseEvent *e) {
     _p2DSelectionNode->AddChild(g_pController->BuildRep(vedges.begin(), vedges.end()));
     // FEdge
     LineRep * fedgeRep = new LineRep(fe->vertexA()->point2d(), fe->vertexB()->point2d());
-    fedgeRep->SetWidth(3.f);
+    fedgeRep->setWidth(3.f);
     NodeShape * fedgeNode = new NodeShape;
     fedgeNode->AddRep(fedgeRep);
-    fedgeNode->material().SetDiffuse(0.2, 1, 0.2, 1.0);
+    fedgeNode->material().setDiffuse(0.2, 1, 0.2, 1.0);
     _p2DSelectionNode->AddChild(fedgeNode);
     //SVertex A
     Vec3r A(fe->vertexA()->point2d());
     VertexRep * aVertexRep = new VertexRep(A.x(), A.y(), A.z());
-    aVertexRep->SetPointSize(3.f);
+    aVertexRep->setPointSize(3.f);
     NodeShape * aVertexNode = new NodeShape;
     aVertexNode->AddRep(aVertexRep);
-    aVertexNode->material().SetDiffuse(1, 0, 0, 1.0);
+    aVertexNode->material().setDiffuse(1, 0, 0, 1.0);
     _p2DSelectionNode->AddChild(aVertexNode);
     // and its fedges
     const vector<FEdge*>& afedges = fe->vertexA()->fedges();
@@ -336,16 +336,16 @@ AppGLWidget::select(const QMouseEvent *e) {
     ++f)
     {
       LineRep * lrep = new LineRep((*f)->vertexA()->point2d(), (*f)->vertexB()->point2d());
-      lrep->SetWidth(1.f);
+      lrep->setWidth(1.f);
       aVertexNode->AddRep(lrep);
     }
     //SVertex B
     Vec3r B(fe->vertexB()->point2d());
     VertexRep * bVertexRep = new VertexRep(B.x(), B.y(), B.z());
-    bVertexRep->SetPointSize(3.f);
+    bVertexRep->setPointSize(3.f);
     NodeShape * bVertexNode = new NodeShape;
     bVertexNode->AddRep(bVertexRep);
-    bVertexNode->material().SetDiffuse(0, 0, 1, 1.0);
+    bVertexNode->material().setDiffuse(0, 0, 1, 1.0);
     _p2DSelectionNode->AddChild(bVertexNode);
     // and its fedges
     const vector<FEdge*>& bfedges = fe->vertexB()->fedges();
@@ -356,7 +356,7 @@ AppGLWidget::select(const QMouseEvent *e) {
     ++f)
     {
       LineRep * lrep = new LineRep((*f)->vertexA()->point2d(), (*f)->vertexB()->point2d());
-      lrep->SetWidth(1.f);
+      lrep->setWidth(1.f);
       bVertexNode->AddRep(lrep);
     }
 
@@ -458,9 +458,9 @@ AppGLWidget::keyPressEvent(QKeyEvent* e)
     }
     updateGL();
     break;
-  case Qt::Key_1: _ModelRootNode->SetStyle(DrawingStyle::FILLED); updateGL(); break;
-  case Qt::Key_2: _ModelRootNode->SetStyle(DrawingStyle::LINES); _ModelRootNode->SetLineWidth(1.0); updateGL(); break;
-  case Qt::Key_3: _ModelRootNode->SetStyle(DrawingStyle::INVISIBLE); updateGL(); break;
+  case Qt::Key_1: _ModelRootNode->setStyle(DrawingStyle::FILLED); updateGL(); break;
+  case Qt::Key_2: _ModelRootNode->setStyle(DrawingStyle::LINES); _ModelRootNode->setLineWidth(1.0); updateGL(); break;
+  case Qt::Key_3: _ModelRootNode->setStyle(DrawingStyle::INVISIBLE); updateGL(); break;
   case Qt::Key_B:
     {
 //       if(e->state() == ShiftButton)
@@ -737,7 +737,7 @@ void AppGLWidget::draw()
 
   if (true == _Draw2DScene) {
     Draw2DScene(_pGLRenderer);
-    Set3DContext();
+    set3DContext();
   }
   if(_record){
     saveSnapshot(true);
@@ -759,7 +759,7 @@ void AppGLWidget::DrawScene(SceneVisitor *iRenderer)
 
   if(_drawEnvMap)
   {
-    _ModelRootNode->SetLightingEnabled(false);
+    _ModelRootNode->setLightingEnabled(false);
     glEnable(GL_COLOR_MATERIAL);
 
     glEnable(GL_TEXTURE_2D);
@@ -800,15 +800,15 @@ void AppGLWidget::DrawScene(SceneVisitor *iRenderer)
   }
 
   // FIXME
-  //  //_ModelRootNode->SetLightingEnabled(true);
+  //  //_ModelRootNode->setLightingEnabled(true);
   //  if(_ModelRootNode->style() == DrawingStyle::LINES){
   //    glPushAttrib(GL_ALL_ATTRIB_BITS);
   //    //glDisable(GL_COLOR_MATERIAL);
-  //    _ModelRootNode->SetStyle(DrawingStyle::FILLED);
-  //    _ModelRootNode->SetLightingEnabled(true);
+  //    _ModelRootNode->setStyle(DrawingStyle::FILLED);
+  //    _ModelRootNode->setLightingEnabled(true);
   //    _ModelRootNode->accept(*iRenderer);  
-  //    _ModelRootNode->SetStyle(DrawingStyle::LINES);
-  //    _ModelRootNode->SetLightingEnabled(false);
+  //    _ModelRootNode->setStyle(DrawingStyle::LINES);
+  //    _ModelRootNode->setLightingEnabled(false);
   //    _ModelRootNode->accept(*iRenderer);  
   //    glPopAttrib();
   //  }
@@ -819,7 +819,7 @@ void AppGLWidget::DrawScene(SceneVisitor *iRenderer)
   glDisable(GL_TEXTURE_GEN_T);
   glDisable(GL_TEXTURE_2D);
   glDisable(GL_COLOR_MATERIAL);
-  _ModelRootNode->SetLightingEnabled(true);
+  _ModelRootNode->setLightingEnabled(true);
 
   if(_fedges == true)
     _SilhouetteRootNode->accept(*iRenderer);
diff --git a/source/blender/freestyle/intern/app/AppGLWidget.h b/source/blender/freestyle/intern/app/AppGLWidget.h
index 24bb2c7229b..844af9f4037 100755
--- a/source/blender/freestyle/intern/app/AppGLWidget.h
+++ b/source/blender/freestyle/intern/app/AppGLWidget.h
@@ -297,7 +297,7 @@ public:
   // when a model is added to the scene.
   void ReInitRenderers();
 
-  inline void SetSelectedFEdge(FEdge* iFEdge) { _pDebugRenderer->SetSelectedFEdge(iFEdge); }
+  inline void SetSelectedFEdge(FEdge* iFEdge) { _pDebugRenderer->setSelectedFEdge(iFEdge); }
 
   inline GLDebugRenderer* debugRenderer() { return _pDebugRenderer; }
   inline void toggle3D() { _Draw3DScene == true ? _Draw3DScene = false : _Draw3DScene = true; updateGL();}
diff --git a/source/blender/freestyle/intern/app/AppMainWindow.cpp b/source/blender/freestyle/intern/app/AppMainWindow.cpp
index 03b4f3a28ea..f869eb8e637 100755
--- a/source/blender/freestyle/intern/app/AppMainWindow.cpp
+++ b/source/blender/freestyle/intern/app/AppMainWindow.cpp
@@ -40,7 +40,7 @@ AppMainWindow::AppMainWindow(QWidget *parent, const char *name, Qt::WindowFlags
 
   // setCaption(Config::APPLICATION_NAME + " " + Config::APPLICATION_VERSION);
   setGeometry(20,20,700,700);
-  pQGLWidget->SetMainWindow(this);
+  pQGLWidget->setMainWindow(this);
 
   _ProgressBar = new QProgressDialog(Config::APPLICATION_NAME + " Progress Dialog", "Cancel", 
 				     0, 100, this);
diff --git a/source/blender/freestyle/intern/app/Controller.cpp b/source/blender/freestyle/intern/app/Controller.cpp
index ac41b31ac78..fc4912af5e6 100755
--- a/source/blender/freestyle/intern/app/Controller.cpp
+++ b/source/blender/freestyle/intern/app/Controller.cpp
@@ -194,7 +194,7 @@ void Controller::SetView(AppGLWidget *iView)
   
   _pView = iView;
   //_pView2D->setGeometry(_pView->rect());
-  _Canvas->SetViewer(_pView);
+  _Canvas->setViewer(_pView);
 }
 
 void Controller::SetMainWindow(AppMainWindow *iMainWindow)
@@ -257,7 +257,7 @@ int Controller::Load3DSFile(const char *iFileName)
   _RootNode->AddChild(maxScene);
   _RootNode->UpdateBBox(); // FIXME: Correct that by making a Renderer to compute the bbox
 
-  _pView->SetModel(_RootNode);
+  _pView->setModel(_RootNode);
   _pView->FitBBox();
   
   _pMainWindow->DisplayMessage("Building Winged Edge structure");
@@ -299,7 +299,7 @@ int Controller::Load3DSFile(const char *iFileName)
 
   _ProgressBar->setProgress(3);
    
-  _pView->SetDebug(_DebugNode);
+  _pView->setDebug(_DebugNode);
 
   //delete stuff
   //  if(0 != ws_builder)
@@ -571,8 +571,8 @@ void Controller::LoadViewMapFile(const char *iFileName, bool only_camera)
   _pMainWindow->DisplayMessage("Updating display");
   ViewMapTesselator3D sTesselator3d;
   //ViewMapTesselator2D sTesselator2d;
-  //sTesselator2d.SetNature(_edgeTesselationNature);
-  sTesselator3d.SetNature(_edgeTesselationNature);
+  //sTesselator2d.setNature(_edgeTesselationNature);
+  sTesselator3d.setNature(_edgeTesselationNature);
   
   // Tesselate the 3D edges:
   _SilhouetteNode = sTesselator3d.Tesselate(_ViewMap);
@@ -653,7 +653,7 @@ void Controller::ComputeViewMap()
   // Restore the context of view:
   // we need to perform all these operations while the 
   // 3D context is on.
-  _pView->Set3DContext();
+  _pView->set3DContext();
   float src[3] = { 0, 0, 0 };
   float vp_tmp[3];
   _pView->camera()->getWorldCoordinatesOf(src, vp_tmp);
@@ -673,9 +673,9 @@ void Controller::ComputeViewMap()
 
   _Chrono.start();
   if (_SceneNumFaces > 2000)
-    edgeDetector.SetProgressBar(_ProgressBar);
+    edgeDetector.setProgressBar(_ProgressBar);
  
-  edgeDetector.SetViewpoint(Vec3r(vp));
+  edgeDetector.setViewpoint(Vec3r(vp));
   edgeDetector.enableRidgesAndValleysFlag(_ComputeRidges);
   edgeDetector.enableSuggestiveContours(_ComputeSuggestive);
   edgeDetector.setSphereRadius(_sphereRadius);
@@ -758,7 +758,7 @@ void Controller::ComputeViewMap()
     //        if((res == GeomUtils::DO_INTERSECT) && (t>=0.0) && (t<=1.0)){
     //          Vec3r inter(oppositeEdge->GetaVertex()->GetVertex() + t*v1v2);
     //          VertexRep * irep = new VertexRep(inter.x(), inter.y(), inter.z());
-    //          irep->SetPointSize(5.0);
+    //          irep->setPointSize(5.0);
     //          silhouetteDebugShape->AddRep(irep);
     //        }     
 // 	 }  
@@ -789,9 +789,9 @@ void Controller::ComputeViewMap()
 //        silhouetteDebugShape->AddRep(line);
 //      }
 //      Material redmat;
-//      redmat.SetDiffuse(1,0,0,1);
+//      redmat.setDiffuse(1,0,0,1);
 //      Material greenmat;
-//      greenmat.SetDiffuse(0,1,0,1);
+//      greenmat.setDiffuse(0,1,0,1);
 //      real vecSize = _bboxDiag/70.0;
 //      vector<WXFaceLayer*> flayers;
 //      wxf->retrieveSmoothLayers(Nature::RIDGE, flayers);
@@ -831,17 +831,17 @@ void Controller::ComputeViewMap()
         //          Curvature_info * ci = fci->vec_curvature_info[i];
         //          Vec3r v(wxf->GetVertex(i)->GetVertex());
         //          //          VertexRep *vrep = new VertexRep(v[0], v[1], v[2]);
-        //          //          vrep->SetMaterial(redmat);
-        //          //          vrep->SetPointSize(5.0);
+        //          //          vrep->setMaterial(redmat);
+        //          //          vrep->setPointSize(5.0);
         //          //          silhouetteDebugShape->AddRep(vrep);
         //          //          LineRep * maxc = new LineRep(v-vecSize*ci->e1/2.0, v+vecSize*ci->e1/2.0);
         //          //          LineRep * maxc = new LineRep(v, v+vecSize*ci->e1);
-        //          //          maxc->SetMaterial(redmat);
-        //          //          maxc->SetWidth(2.0);
+        //          //          maxc->setMaterial(redmat);
+        //          //          maxc->setWidth(2.0);
         //          //          silhouetteDebugShape->AddRep(maxc);
         //          LineRep * minc = new LineRep(v, v+vecSize*ci->e2);
-        //          minc->SetMaterial(greenmat);
-        //          minc->SetWidth(2.0);
+        //          minc->setMaterial(greenmat);
+        //          minc->setWidth(2.0);
         //          silhouetteDebugShape->AddRep(minc);
         //        }
 //      }
@@ -888,21 +888,21 @@ void Controller::ComputeViewMap()
   // Builds the view map structure from the flagged WSEdge structure:
   //----------------------------------------------------------
   ViewMapBuilder vmBuilder;
-  vmBuilder.SetProgressBar(_ProgressBar);
-  vmBuilder.SetEnableQI(_EnableQI);
-  vmBuilder.SetViewpoint(Vec3r(vp));
+  vmBuilder.setProgressBar(_ProgressBar);
+  vmBuilder.setEnableQI(_EnableQI);
+  vmBuilder.setViewpoint(Vec3r(vp));
   
-  vmBuilder.SetTransform(mv, proj, viewport, focalLength, _pView->GetAspect(), _pView->GetFovyRadian());
-  vmBuilder.SetFrustum(_pView->znear(), _pView->zfar());
+  vmBuilder.setTransform(mv, proj, viewport, focalLength, _pView->GetAspect(), _pView->GetFovyRadian());
+  vmBuilder.setFrustum(_pView->znear(), _pView->zfar());
   
-  vmBuilder.SetGrid(&_Grid);
+  vmBuilder.setGrid(&_Grid);
   
   // Builds a tesselated form of the silhouette for display purpose:
   //---------------------------------------------------------------
   ViewMapTesselator3D sTesselator3d;
   //ViewMapTesselator2D sTesselator2d;
-  //sTesselator2d.SetNature(_edgeTesselationNature);
-  sTesselator3d.SetNature(_edgeTesselationNature);
+  //sTesselator2d.setNature(_edgeTesselationNature);
+  sTesselator3d.setNature(_edgeTesselationNature);
     
   _Chrono.start();
   // Build View Map
@@ -1016,10 +1016,10 @@ void Controller::ComputeViewMap()
   //          positive = true;
   //      }
   //      if(positive)
-  //        mat.SetDiffuse(1,1,0,1);
+  //        mat.setDiffuse(1,1,0,1);
   //      else
-  //        mat.SetDiffuse(1,0,0,1);
-  //      lrep->SetMaterial(mat);
+  //        mat.setDiffuse(1,0,0,1);
+  //      lrep->setMaterial(mat);
   //      fe = fe->nextEdge();
   //    }while((fe!=0) && (fe!=fefirst));
   //  }
@@ -1060,7 +1060,7 @@ void Controller::ComputeSteerableViewMap(){
     ng[i] = new NodeGroup;
   }
   NodeShape *completeNS = new NodeShape;
-  completeNS->material().SetDiffuse(c,c,c,1);
+  completeNS->material().setDiffuse(c,c,c,1);
   ng[Canvas::NB_STEERABLE_VIEWMAP-1]->AddChild(completeNS);
   SteerableViewMap * svm = _Canvas->getSteerableViewMap();
   svm->Reset();
@@ -1082,7 +1082,7 @@ void Controller::ComputeSteerableViewMap(){
       double wc = oweights[i]*c;
       if(oweights[i] == 0)
         continue;
-      ns->material().SetDiffuse(wc, wc, wc, 1);
+      ns->material().setDiffuse(wc, wc, wc, 1);
       ns->AddRep(fRep);
       ng[i]->AddChild(ns);
     }
@@ -1318,7 +1318,7 @@ void Controller::SwapStyleModules(unsigned i1, unsigned i2)
 
 void Controller::toggleLayer(unsigned index, bool iDisplay)
 {
-  _Canvas->SetVisible(index, iDisplay);
+  _Canvas->setVisible(index, iDisplay);
   _pView->updateGL();
 }
 
@@ -1371,8 +1371,8 @@ FEdge* Controller::SelectFEdge(real x, real y)
 
   FEdge *fedge = (FEdge*)_ViewMap->GetClosestFEdge(x,y);
   ViewEdge *selection = fedge->viewedge();
-  _pView->SetSelectedFEdge(fedge);
-  _Canvas->SetSelectedFEdge(fedge);
+  _pView->setSelectedFEdge(fedge);
+  _Canvas->setSelectedFEdge(fedge);
   return fedge;
 }
 
@@ -1383,8 +1383,8 @@ ViewEdge* Controller::SelectViewEdge(real x, real y)
 
   FEdge *fedge = (FEdge*)_ViewMap->GetClosestFEdge(x,y);
   ViewEdge *selection = fedge->viewedge();
-  _pView->SetSelectedFEdge(fedge);
-  _Canvas->SetSelectedFEdge(fedge);
+  _pView->setSelectedFEdge(fedge);
+  _Canvas->setSelectedFEdge(fedge);
   return selection;
 }
 
@@ -1393,8 +1393,8 @@ NodeGroup * Controller::BuildRep(vector<ViewEdge*>::iterator vedges_begin,
 {
   ViewMapTesselator2D tesselator2D;
   Material mat;
-  mat.SetDiffuse(1,1,0.3,1);
-  tesselator2D.SetMaterial(mat);
+  mat.setDiffuse(1,1,0.3,1);
+  tesselator2D.setMaterial(mat);
 
   return (tesselator2D.Tesselate(vedges_begin, vedges_end));
 }
@@ -1491,8 +1491,8 @@ void Controller::displayDensityCurves(int x, int y){
 
   // display the curves
   for(i=0; i<nbCurves; ++i)
-    _pDensityCurvesWindow->SetOrientationCurve(i, Vec2d(0,0), Vec2d(nbPoints, 1), curves[i], "scale", "density");
+    _pDensityCurvesWindow->setOrientationCurve(i, Vec2d(0,0), Vec2d(nbPoints, 1), curves[i], "scale", "density");
   for(i=1; i<=8; ++i)
-    _pDensityCurvesWindow->SetLevelCurve(i, Vec2d(0,0), Vec2d(nbCurves, 1), curvesDirection[i], "orientation", "density");
+    _pDensityCurvesWindow->setLevelCurve(i, Vec2d(0,0), Vec2d(nbCurves, 1), curvesDirection[i], "orientation", "density");
   _pDensityCurvesWindow->show();
 }
diff --git a/source/blender/freestyle/intern/app/Main.cpp b/source/blender/freestyle/intern/app/Main.cpp
index ae4d28017c5..4f2556ed740 100755
--- a/source/blender/freestyle/intern/app/Main.cpp
+++ b/source/blender/freestyle/intern/app/Main.cpp
@@ -44,8 +44,8 @@ int main(int argc, char** argv)
   //app->setMainWidget(mainWindow); // QT3
 
   g_pController = new Controller;
-  g_pController->SetMainWindow(&mainWindow);
-  g_pController->SetView(mainWindow.pQGLWidget);
+  g_pController->setMainWindow(&mainWindow);
+  g_pController->setView(mainWindow.pQGLWidget);
   
   mainWindow.show();
 
diff --git a/source/blender/freestyle/intern/app/QGLBasicWidget.cpp b/source/blender/freestyle/intern/app/QGLBasicWidget.cpp
index 44b5e0de224..0f690b67431 100755
--- a/source/blender/freestyle/intern/app/QGLBasicWidget.cpp
+++ b/source/blender/freestyle/intern/app/QGLBasicWidget.cpp
@@ -37,8 +37,8 @@ QGLBasicWidget::QGLBasicWidget( QWidget* parent, const char* name, int w, int h,
 //   _Pbuffer->create(false);
 // #endif 
   resizeGL(w,h);
-  _RootNode.SetLightingEnabled(false);
-  _RootNode.SetLineWidth(1.0);
+  _RootNode.setLightingEnabled(false);
+  _RootNode.setLineWidth(1.0);
 }
 
 QGLBasicWidget::QGLBasicWidget( const QGLFormat& format, QWidget* parent, const char* name, 
@@ -54,8 +54,8 @@ QGLBasicWidget::QGLBasicWidget( const QGLFormat& format, QWidget* parent, const
 //   _Pbuffer->create(false);
 // #endif 
   resizeGL(w,h);
-  _RootNode.SetLightingEnabled(false);
-  _RootNode.SetLineWidth(1.0);
+  _RootNode.setLightingEnabled(false);
+  _RootNode.setLineWidth(1.0);
 }
 
 QGLBasicWidget::~QGLBasicWidget()
diff --git a/source/blender/freestyle/intern/app_blender/AppCanvas.cpp b/source/blender/freestyle/intern/app_blender/AppCanvas.cpp
index f82d136b525..312a276f13d 100755
--- a/source/blender/freestyle/intern/app_blender/AppCanvas.cpp
+++ b/source/blender/freestyle/intern/app_blender/AppCanvas.cpp
@@ -69,7 +69,7 @@ AppCanvas::~AppCanvas()
   _pViewer = 0;
 }
 
-void AppCanvas::SetViewer(AppGLWidget *iViewer)
+void AppCanvas::setViewer(AppGLWidget *iViewer)
 {
   _pViewer = iViewer;
 }  
@@ -182,7 +182,7 @@ void AppCanvas::readColorPixels(int x,int y,int w, int h, RGBImage& oImage) cons
   //    qtmp.save("densityQuery"+QString::number(number)+".png", "PNG");
   //    
   //    GaussianFilter filter;
-  //    filter.SetSigma(4.0);
+  //    filter.setSigma(4.0);
   //    int bound = filter.getBound();
   //    QImage qtmp2(width(), height(), 32);
   //    for(int py2=0;py2<height();++py2){
@@ -247,7 +247,7 @@ void AppCanvas::Render(const StrokeRenderer *iRenderer)
     
     glEnable(GL_LIGHTING);
     glEnable(GL_DEPTH_TEST);
-    _pViewer->Set3DContext();
+    _pViewer->set3DContext();
     _pViewer->DrawScene(_pViewer->glRenderer());
     glDisable(GL_DEPTH_TEST);
     glDisable(GL_LIGHTING);
@@ -349,7 +349,7 @@ void AppCanvas::RenderBasic(const StrokeRenderer *iRenderer)
     
     glEnable(GL_LIGHTING);
     glEnable(GL_DEPTH_TEST);
-    _pViewer->Set3DContext();
+    _pViewer->set3DContext();
     _pViewer->DrawScene(_pViewer->glRenderer());
     glDisable(GL_DEPTH_TEST);
     glDisable(GL_LIGHTING);
diff --git a/source/blender/freestyle/intern/app_blender/AppCanvas.h b/source/blender/freestyle/intern/app_blender/AppCanvas.h
index 773bfc7f539..0eb1faa2549 100755
--- a/source/blender/freestyle/intern/app_blender/AppCanvas.h
+++ b/source/blender/freestyle/intern/app_blender/AppCanvas.h
@@ -48,7 +48,7 @@ public:
   inline const AppGLWidget * viewer() const {return _pViewer;}
 
   /*! modifiers */
-  void SetViewer(AppGLWidget *iViewer) ;
+  void setViewer(AppGLWidget *iViewer) ;
 };
 
 
diff --git a/source/blender/freestyle/intern/app_blender/AppGLWidget.cpp b/source/blender/freestyle/intern/app_blender/AppGLWidget.cpp
index 16fb5eae57e..fba019f8372 100755
--- a/source/blender/freestyle/intern/app_blender/AppGLWidget.cpp
+++ b/source/blender/freestyle/intern/app_blender/AppGLWidget.cpp
@@ -63,22 +63,22 @@ AppGLWidget::AppGLWidget(const char *iName)
   _Fovy        = 30.f;
   //_SceneDepth = 2.f;
   _RenderStyle = LINE;
-  //_ModelRootNode->SetBBox(BBox<Vec3f>(Vec3f(-10.f, -10.f, -10.f), Vec3f(10.f, 10.f, 10.f)));
+  //_ModelRootNode->setBBox(BBox<Vec3f>(Vec3f(-10.f, -10.f, -10.f), Vec3f(10.f, 10.f, 10.f)));
   _ModelRootNode = new NodeDrawingStyle;
   _SilhouetteRootNode = new NodeDrawingStyle;
   _DebugRootNode = new NodeDrawingStyle;
   
   _RootNode.AddChild(_ModelRootNode);
-  _SilhouetteRootNode->SetStyle(DrawingStyle::LINES);
-  _SilhouetteRootNode->SetLightingEnabled(false);
-  _SilhouetteRootNode->SetLineWidth(2.f);
-  _SilhouetteRootNode->SetPointSize(3.f);
+  _SilhouetteRootNode->setStyle(DrawingStyle::LINES);
+  _SilhouetteRootNode->setLightingEnabled(false);
+  _SilhouetteRootNode->setLineWidth(2.f);
+  _SilhouetteRootNode->setPointSize(3.f);
 
   _RootNode.AddChild(_SilhouetteRootNode);
 
-  _DebugRootNode->SetStyle(DrawingStyle::LINES);
-  _DebugRootNode->SetLightingEnabled(false);
-  _DebugRootNode->SetLineWidth(1.f);
+  _DebugRootNode->setStyle(DrawingStyle::LINES);
+  _DebugRootNode->setLightingEnabled(false);
+  _DebugRootNode->setLineWidth(1.f);
   
   _RootNode.AddChild(_DebugRootNode);
 
@@ -96,23 +96,23 @@ AppGLWidget::AppGLWidget(const char *iName)
 
   // 2D Scene
   //  _pFENode = new NodeDrawingStyle;
-  //  _pFENode->SetStyle(DrawingStyle::LINES);
-  //  _pFENode->SetLightingEnabled(false);
-  //  _pFENode->SetLineWidth(1.f);
+  //  _pFENode->setStyle(DrawingStyle::LINES);
+  //  _pFENode->setLightingEnabled(false);
+  //  _pFENode->setLineWidth(1.f);
   //
   //  _p2DNode.AddChild(_pFENode);
   //  
   //  _pVisibleSilhouetteNode = new NodeDrawingStyle;
-  //  _pVisibleSilhouetteNode->SetStyle(DrawingStyle::LINES);
-  //  _pVisibleSilhouetteNode->SetLightingEnabled(false);
-  //  _pVisibleSilhouetteNode->SetLineWidth(3.f);
+  //  _pVisibleSilhouetteNode->setStyle(DrawingStyle::LINES);
+  //  _pVisibleSilhouetteNode->setLightingEnabled(false);
+  //  _pVisibleSilhouetteNode->setLineWidth(3.f);
   //
   //  _p2DNode.AddChild(_pVisibleSilhouetteNode);
   //  
   _p2DSelectionNode = new NodeDrawingStyle;
-  _p2DSelectionNode->SetLightingEnabled(false);
-  _p2DSelectionNode->SetStyle(DrawingStyle::LINES);
-  _p2DSelectionNode->SetLineWidth(5.f);
+  _p2DSelectionNode->setLightingEnabled(false);
+  _p2DSelectionNode->setStyle(DrawingStyle::LINES);
+  _p2DSelectionNode->setLineWidth(5.f);
   
   _p2DNode.AddChild(_p2DSelectionNode);
 
@@ -315,7 +315,7 @@ void AppGLWidget::draw()
 
   if (true == _Draw2DScene) {
     Draw2DScene(_pGLRenderer);
-    Set3DContext();
+    set3DContext();
   }
   if(_record){
     saveSnapshot(true);
@@ -328,7 +328,7 @@ void AppGLWidget::DrawScene(SceneVisitor *iRenderer)
 
   if(_drawEnvMap)
   {
-    _ModelRootNode->SetLightingEnabled(false);
+    _ModelRootNode->setLightingEnabled(false);
     glEnable(GL_COLOR_MATERIAL);
 
     glEnable(GL_TEXTURE_2D);
@@ -369,15 +369,15 @@ void AppGLWidget::DrawScene(SceneVisitor *iRenderer)
   }
 
   // FIXME
-  //  //_ModelRootNode->SetLightingEnabled(true);
+  //  //_ModelRootNode->setLightingEnabled(true);
   //  if(_ModelRootNode->style() == DrawingStyle::LINES){
   //    glPushAttrib(GL_ALL_ATTRIB_BITS);
   //    //glDisable(GL_COLOR_MATERIAL);
-  //    _ModelRootNode->SetStyle(DrawingStyle::FILLED);
-  //    _ModelRootNode->SetLightingEnabled(true);
+  //    _ModelRootNode->setStyle(DrawingStyle::FILLED);
+  //    _ModelRootNode->setLightingEnabled(true);
   //    _ModelRootNode->accept(*iRenderer);  
-  //    _ModelRootNode->SetStyle(DrawingStyle::LINES);
-  //    _ModelRootNode->SetLightingEnabled(false);
+  //    _ModelRootNode->setStyle(DrawingStyle::LINES);
+  //    _ModelRootNode->setLightingEnabled(false);
   //    _ModelRootNode->accept(*iRenderer);  
   //    glPopAttrib();
   //  }
@@ -388,7 +388,7 @@ void AppGLWidget::DrawScene(SceneVisitor *iRenderer)
   glDisable(GL_TEXTURE_GEN_T);
   glDisable(GL_TEXTURE_2D);
   glDisable(GL_COLOR_MATERIAL);
-  _ModelRootNode->SetLightingEnabled(true);
+  _ModelRootNode->setLightingEnabled(true);
 
   if(_fedges == true)
     _SilhouetteRootNode->accept(*iRenderer);
diff --git a/source/blender/freestyle/intern/app_blender/AppGLWidget.h b/source/blender/freestyle/intern/app_blender/AppGLWidget.h
index 447eece30c9..97e7cbcebbe 100755
--- a/source/blender/freestyle/intern/app_blender/AppGLWidget.h
+++ b/source/blender/freestyle/intern/app_blender/AppGLWidget.h
@@ -110,7 +110,7 @@ public:
           LINES       : line rendering
           DEPTHBUFFER : grey-levels rendering of the depth buffer
           */
-  inline void SetRenderStyle(RenderStyle iStyle)
+  inline void setRenderStyle(RenderStyle iStyle)
   {
     _RenderStyle = iStyle;
   }
@@ -119,7 +119,7 @@ public:
    *  iModel
    *    The Root Node of the model 
    */
-  inline void SetModel(NodeGroup *iModel)
+  inline void setModel(NodeGroup *iModel)
   {
     if(0 != _ModelRootNode->numberOfChildren())
     {
@@ -173,7 +173,7 @@ public:
     updateGL();
   }
 
-  inline void SetDebug(NodeGroup* iDebug)
+  inline void setDebug(NodeGroup* iDebug)
   {
     if(0 != _DebugRootNode->numberOfChildren())
     {
@@ -240,9 +240,9 @@ public:
     updateGL();
   }
 
-  void SetMainWindow(QMainWindow *iMainWindow) ;
+  void setMainWindow(QMainWindow *iMainWindow) ;
 
-  inline void Set3DContext()
+  inline void set3DContext()
   {
     // GL_PROJECTION matrix
     _camera->loadProjectionMatrix();
@@ -323,7 +323,7 @@ public:
   // when a model is added to the scene.
   void ReInitRenderers();
 
-  inline void SetSelectedFEdge(FEdge* iFEdge) { _pDebugRenderer->SetSelectedFEdge(iFEdge); }
+  inline void setSelectedFEdge(FEdge* iFEdge) { _pDebugRenderer->setSelectedFEdge(iFEdge); }
 
   inline GLDebugRenderer* debugRenderer() { return _pDebugRenderer; }
   inline void toggle3D() { _Draw3DScene == true ? _Draw3DScene = false : _Draw3DScene = true; updateGL();}
diff --git a/source/blender/freestyle/intern/app_blender/Controller.cpp b/source/blender/freestyle/intern/app_blender/Controller.cpp
index 9a820b835ca..e2cc25c4b10 100755
--- a/source/blender/freestyle/intern/app_blender/Controller.cpp
+++ b/source/blender/freestyle/intern/app_blender/Controller.cpp
@@ -159,13 +159,13 @@ Controller::~Controller()
   //delete _current_dirs;
 }
 
-void Controller::SetView(AppGLWidget *iView)
+void Controller::setView(AppGLWidget *iView)
 {
   if(NULL == iView)
     return;
   
   _pView = iView;
-  _Canvas->SetViewer(_pView);
+  _Canvas->setViewer(_pView);
 }
 
 
@@ -208,7 +208,7 @@ int Controller::Load3DSFile(const char *iFileName)
   _RootNode->AddChild(maxScene);
   _RootNode->UpdateBBox(); // FIXME: Correct that by making a Renderer to compute the bbox
 
-  _pView->SetModel(_RootNode);
+  _pView->setModel(_RootNode);
   //_pView->FitBBox();
 
 
@@ -245,7 +245,7 @@ int Controller::Load3DSFile(const char *iFileName)
   // DEBUG
 //   _Grid.displayDebug();
    
-  _pView->SetDebug(_DebugNode);
+  _pView->setDebug(_DebugNode);
 
   //delete stuff
   //  if(0 != ws_builder)
@@ -273,7 +273,7 @@ int Controller::Load3DSFile(const char *iFileName)
 
 void Controller::CloseFile()
 {
-  WShape::SetCurrentId(0);
+  WShape::setCurrentId(0);
   _pView->DetachModel();
   _ListOfModels.clear();
   if(NULL != _RootNode)
@@ -460,7 +460,7 @@ void Controller::SaveViewMapFile(const char *oFileName)
 //       }
 //   }
 // 
-//   // Set the camera position
+//   // set the camera position
 //   float position[3];
 //   float orientation[4];
 //   ifs.read((char*)position, 3 * sizeof(*position));
@@ -514,8 +514,8 @@ void Controller::SaveViewMapFile(const char *oFileName)
 //   // Update display
 //   ViewMapTesselator3D sTesselator3d;
 //   //ViewMapTesselator2D sTesselator2d;
-//   //sTesselator2d.SetNature(_edgeTesselationNature);
-//   sTesselator3d.SetNature(_edgeTesselationNature);
+//   //sTesselator2d.setNature(_edgeTesselationNature);
+//   sTesselator3d.setNature(_edgeTesselationNature);
 //   
 //   // Tesselate the 3D edges:
 //   _SilhouetteNode = sTesselator3d.Tesselate(_ViewMap);
@@ -596,7 +596,7 @@ void Controller::ComputeViewMap()
   // Restore the context of view:
   // we need to perform all these operations while the 
   // 3D context is on.
-  _pView->Set3DContext();
+  _pView->set3DContext();
   float src[3] = { 0, 0, 0 };
   float vp_tmp[3] = { 0, 0, 0 };
   _pView->_camera->getWorldCoordinatesOf(src, vp_tmp);
@@ -616,7 +616,7 @@ void Controller::ComputeViewMap()
 
   _Chrono.start();
  
-  edgeDetector.SetViewpoint(Vec3r(vp));
+  edgeDetector.setViewpoint(Vec3r(vp));
   edgeDetector.enableRidgesAndValleysFlag(_ComputeRidges);
   edgeDetector.enableSuggestiveContours(_ComputeSuggestive);
   edgeDetector.setSphereRadius(_sphereRadius);
@@ -629,20 +629,20 @@ void Controller::ComputeViewMap()
   // Builds the view map structure from the flagged WSEdge structure:
   //----------------------------------------------------------
   ViewMapBuilder vmBuilder;
-  vmBuilder.SetEnableQI(_EnableQI);
-  vmBuilder.SetViewpoint(Vec3r(vp));
+  vmBuilder.setEnableQI(_EnableQI);
+  vmBuilder.setViewpoint(Vec3r(vp));
   
-  vmBuilder.SetTransform(mv, proj, viewport, focalLength, _pView->GetAspect(), _pView->GetFovyRadian());
-  vmBuilder.SetFrustum(_pView->znear(), _pView->zfar());
+  vmBuilder.setTransform(mv, proj, viewport, focalLength, _pView->GetAspect(), _pView->GetFovyRadian());
+  vmBuilder.setFrustum(_pView->znear(), _pView->zfar());
   
-  vmBuilder.SetGrid(&_Grid);
+  vmBuilder.setGrid(&_Grid);
   
   // Builds a tesselated form of the silhouette for display purpose:
   //---------------------------------------------------------------
   ViewMapTesselator3D sTesselator3d;
   //ViewMapTesselator2D sTesselator2d;
-  //sTesselator2d.SetNature(_edgeTesselationNature);
-  sTesselator3d.SetNature(_edgeTesselationNature);
+  //sTesselator2d.setNature(_edgeTesselationNature);
+  sTesselator3d.setNature(_edgeTesselationNature);
     
   _Chrono.start();
   // Build View Map
@@ -689,7 +689,7 @@ void Controller::ComputeSteerableViewMap(){
   //   ng[i] = new NodeGroup;
   // }
   // NodeShape *completeNS = new NodeShape;
-  // completeNS->material().SetDiffuse(c,c,c,1);
+  // completeNS->material().setDiffuse(c,c,c,1);
   // ng[Canvas::NB_STEERABLE_VIEWMAP-1]->AddChild(completeNS);
   // SteerableViewMap * svm = _Canvas->getSteerableViewMap();
   // svm->Reset();
@@ -710,7 +710,7 @@ void Controller::ComputeSteerableViewMap(){
   //     double wc = oweights[i]*c;
   //     if(oweights[i] == 0)
   //       continue;
-  //     ns->material().SetDiffuse(wc, wc, wc, 1);
+  //     ns->material().setDiffuse(wc, wc, wc, 1);
   //     ns->AddRep(fRep);
   //     ng[i]->AddChild(ns);
   //   }
@@ -895,7 +895,7 @@ void Controller::SwapStyleModules(unsigned i1, unsigned i2)
 
 void Controller::toggleLayer(unsigned index, bool iDisplay)
 {
-  _Canvas->SetVisible(index, iDisplay);
+  _Canvas->setVisible(index, iDisplay);
   _pView->updateGL();
 }
 
@@ -932,8 +932,8 @@ FEdge* Controller::SelectFEdge(real x, real y)
 
   FEdge *fedge = (FEdge*)_ViewMap->GetClosestFEdge(x,y);
   //ViewEdge *selection = fedge->viewedge();
-  _pView->SetSelectedFEdge(fedge);
-  _Canvas->SetSelectedFEdge(fedge);
+  _pView->setSelectedFEdge(fedge);
+  _Canvas->setSelectedFEdge(fedge);
   return fedge;
 }
 
@@ -944,8 +944,8 @@ ViewEdge* Controller::SelectViewEdge(real x, real y)
 
   FEdge *fedge = (FEdge*)_ViewMap->GetClosestFEdge(x,y);
   ViewEdge *selection = fedge->viewedge();
-  _pView->SetSelectedFEdge(fedge);
-  _Canvas->SetSelectedFEdge(fedge);
+  _pView->setSelectedFEdge(fedge);
+  _Canvas->setSelectedFEdge(fedge);
   return selection;
 }
 
@@ -954,8 +954,8 @@ NodeGroup * Controller::BuildRep(vector<ViewEdge*>::iterator vedges_begin,
 {
   ViewMapTesselator2D tesselator2D;
   Material mat;
-  mat.SetDiffuse(1,1,0.3,1);
-  tesselator2D.SetMaterial(mat);
+  mat.setDiffuse(1,1,0.3,1);
+  tesselator2D.setMaterial(mat);
 
   return (tesselator2D.Tesselate(vedges_begin, vedges_end));
 }
@@ -1049,9 +1049,9 @@ void Controller::displayDensityCurves(int x, int y){
 
   // display the curves
   // for(i=0; i<nbCurves; ++i)
-  //     _pDensityCurvesWindow->SetOrientationCurve(i, Vec2d(0,0), Vec2d(nbPoints, 1), curves[i], "scale", "density");
+  //     _pDensityCurvesWindow->setOrientationCurve(i, Vec2d(0,0), Vec2d(nbPoints, 1), curves[i], "scale", "density");
   //   for(i=1; i<=8; ++i)
-  //     _pDensityCurvesWindow->SetLevelCurve(i, Vec2d(0,0), Vec2d(nbCurves, 1), curvesDirection[i], "orientation", "density");
+  //     _pDensityCurvesWindow->setLevelCurve(i, Vec2d(0,0), Vec2d(nbCurves, 1), curvesDirection[i], "orientation", "density");
   //   _pDensityCurvesWindow->show();
 }
 
diff --git a/source/blender/freestyle/intern/app_blender/Controller.h b/source/blender/freestyle/intern/app_blender/Controller.h
index 77f28071791..032e21a1ce5 100755
--- a/source/blender/freestyle/intern/app_blender/Controller.h
+++ b/source/blender/freestyle/intern/app_blender/Controller.h
@@ -57,7 +57,7 @@ public:
   Controller() ;
   ~Controller() ;
   
-  void SetView(AppGLWidget *iView);
+  void setView(AppGLWidget *iView);
 
   //soc
 	void init_options();
diff --git a/source/blender/freestyle/intern/app_blender/api.cpp b/source/blender/freestyle/intern/app_blender/api.cpp
index 2468839bdc7..27b8d578e2f 100644
--- a/source/blender/freestyle/intern/app_blender/api.cpp
+++ b/source/blender/freestyle/intern/app_blender/api.cpp
@@ -42,7 +42,7 @@ extern "C" {
 		if( view == NULL )
 			view = new AppGLWidget;
 		
-		controller->SetView(view);
+		controller->setView(view);
 	}
 
 
diff --git a/source/blender/freestyle/intern/geometry/GeomCleaner.h b/source/blender/freestyle/intern/geometry/GeomCleaner.h
index d78d90ccb4a..5fdfda0162a 100755
--- a/source/blender/freestyle/intern/geometry/GeomCleaner.h
+++ b/source/blender/freestyle/intern/geometry/GeomCleaner.h
@@ -189,8 +189,8 @@ public:
   inline real z() {return _Vector[2];}
   
   /*! modifiers */
-  inline void SetVector(const Vec3r& iVector) {_Vector = iVector;}
-  inline void SetIndex(unsigned iIndex) {_index = iIndex;}
+  inline void setVector(const Vec3r& iVector) {_Vector = iVector;}
+  inline void setIndex(unsigned iIndex) {_index = iIndex;}
 
   /*! operators */
   IndexedVertex& operator=(const IndexedVertex& iv)
diff --git a/source/blender/freestyle/intern/image/GaussianFilter.cpp b/source/blender/freestyle/intern/image/GaussianFilter.cpp
index 97c2aedc62e..3a79f5f9949 100755
--- a/source/blender/freestyle/intern/image/GaussianFilter.cpp
+++ b/source/blender/freestyle/intern/image/GaussianFilter.cpp
@@ -69,7 +69,7 @@ int GaussianFilter::computeMaskSize(float sigma)
   return maskSize;
 }
 
-void GaussianFilter::SetSigma(float sigma)
+void GaussianFilter::setSigma(float sigma)
 {
   _sigma = sigma;
   computeMask();
diff --git a/source/blender/freestyle/intern/image/GaussianFilter.h b/source/blender/freestyle/intern/image/GaussianFilter.h
index c9ad04d4b80..f31b500140f 100755
--- a/source/blender/freestyle/intern/image/GaussianFilter.h
+++ b/source/blender/freestyle/intern/image/GaussianFilter.h
@@ -82,7 +82,7 @@ public:
   inline int getBound() {return _bound;}
 
   /*! modifiers */
-  void SetSigma(float sigma) ;
+  void setSigma(float sigma) ;
   // void SetMaskSize(int size) {_maskSize = size;_storedMaskSize=(_maskSize+1)>>1;}
   
     
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate0D.h b/source/blender/freestyle/intern/python/BinaryPredicate0D.h
index 6ad25ab2816..dd192877675 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate0D.h
+++ b/source/blender/freestyle/intern/python/BinaryPredicate0D.h
@@ -13,8 +13,7 @@ extern "C" {
 
 extern PyTypeObject BinaryPredicate0D_Type;
 
-#define BPy_BinaryPredicate0D_Check(v) \
-    ((v)->ob_type == &BinaryPredicate0D_Type)
+#define BPy_BinaryPredicate0D_Check(v)	(( (PyObject *) v)->ob_type == &BinaryPredicate0D_Type)
 
 /*---------------------------Python BPy_BinaryPredicate0D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D.h b/source/blender/freestyle/intern/python/BinaryPredicate1D.h
index 2745ca6fc3f..035e2b6cb17 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D.h
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D.h
@@ -13,8 +13,7 @@ extern "C" {
 
 extern PyTypeObject BinaryPredicate1D_Type;
 
-#define BPy_BinaryPredicate1D_Check(v) \
-    ((v)->ob_type == &BinaryPredicate1D_Type)
+#define BPy_BinaryPredicate1D_Check(v)	(( (PyObject *) v)->ob_type == &BinaryPredicate1D_Type)
 
 /*---------------------------Python BPy_BinaryPredicate1D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/Freestyle.cpp b/source/blender/freestyle/intern/python/Freestyle.cpp
index 5f98f0f2a89..a5aada0c470 100644
--- a/source/blender/freestyle/intern/python/Freestyle.cpp
+++ b/source/blender/freestyle/intern/python/Freestyle.cpp
@@ -8,6 +8,7 @@
 #include "Interface0D/CurvePoint.h"
 #include "Interface1D.h"
 #include "Nature.h"
+#include "StrokeAttribute.h"
 #include "UnaryFunction0D.h"
 #include "UnaryFunction1D.h"
 #include "UnaryPredicate0D.h"
@@ -134,6 +135,7 @@ PyObject *Freestyle_Init( void )
 	Interface0D_Init( module );
 	Interface1D_Init( module );
 	Nature_Init( module );
+	StrokeAttribute_Init( module );
 	UnaryFunction0D_Init( module );
 	UnaryFunction1D_Init( module );
 	UnaryPredicate0D_Init( module );
diff --git a/source/blender/freestyle/intern/python/Freestyle.h b/source/blender/freestyle/intern/python/Freestyle.h
index 7e7ed56f5f2..9cdef4df2d2 100644
--- a/source/blender/freestyle/intern/python/Freestyle.h
+++ b/source/blender/freestyle/intern/python/Freestyle.h
@@ -11,8 +11,7 @@ extern "C" {
 
 extern PyTypeObject Freestyle_Type;
 
-#define BPy_Freestyle_Check(v) \
-    ((v)->ob_type == &Freestyle_Type)
+#define BPy_Freestyle_Check(v)	(( (PyObject *) v)->ob_type == &Freestyle_Type)
 
 /*---------------------------Python BPy_Freestyle structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/Id.h b/source/blender/freestyle/intern/python/Id.h
index 608ff3eef99..d5e90a0a3e5 100644
--- a/source/blender/freestyle/intern/python/Id.h
+++ b/source/blender/freestyle/intern/python/Id.h
@@ -16,8 +16,7 @@ extern "C" {
 
 extern PyTypeObject Id_Type;
 
-#define BPy_Id_Check(v) \
-    ((v)->ob_type == &Id_Type)
+#define BPy_Id_Check(v)	(( (PyObject *) v)->ob_type == &Id_Type)
 
 /*---------------------------Python BPy_Id structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/IntegrationType.h b/source/blender/freestyle/intern/python/IntegrationType.h
index 2ac81fdddfb..ab212ac6560 100644
--- a/source/blender/freestyle/intern/python/IntegrationType.h
+++ b/source/blender/freestyle/intern/python/IntegrationType.h
@@ -13,8 +13,7 @@ extern "C" {
 
 extern PyTypeObject IntegrationType_Type;
 
-#define BPy_IntegrationType_Check(v) \
-    ((v)->ob_type == &IntegrationType_Type)
+#define BPy_IntegrationType_Check(v)	(( (PyObject *) v)->ob_type == &IntegrationType_Type)
 
 /*---------------------------Python BPy_IntegrationType structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/Interface0D.h b/source/blender/freestyle/intern/python/Interface0D.h
index 10df1463da8..aaecc6dad94 100644
--- a/source/blender/freestyle/intern/python/Interface0D.h
+++ b/source/blender/freestyle/intern/python/Interface0D.h
@@ -13,8 +13,7 @@ extern "C" {
 
 extern PyTypeObject Interface0D_Type;
 
-#define BPy_Interface0D_Check(v) \
-    ((v)->ob_type == &Interface0D_Type)
+#define BPy_Interface0D_Check(v)	(( (PyObject *) v)->ob_type == &Interface0D_Type)
 
 /*---------------------------Python BPy_Interface0D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp b/source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp
index f76fc9c9931..e1cf63727e5 100644
--- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp
@@ -14,9 +14,9 @@ static PyObject * CurvePoint___copy__( BPy_CurvePoint *self );
 static PyObject * CurvePoint_A( BPy_CurvePoint *self );
 static PyObject * CurvePoint_B( BPy_CurvePoint *self );
 static PyObject * CurvePoint_t2d( BPy_CurvePoint *self );
-static PyObject *CurvePoint_SetA( BPy_CurvePoint *self , PyObject *args);
-static PyObject *CurvePoint_SetB( BPy_CurvePoint *self , PyObject *args);
-static PyObject *CurvePoint_SetT2d( BPy_CurvePoint *self , PyObject *args);
+static PyObject *CurvePoint_setA( BPy_CurvePoint *self , PyObject *args);
+static PyObject *CurvePoint_setB( BPy_CurvePoint *self , PyObject *args);
+static PyObject *CurvePoint_setT2d( BPy_CurvePoint *self , PyObject *args);
 static PyObject *CurvePoint_curvatureFredo( BPy_CurvePoint *self , PyObject *args);
 
 /*----------------------CurvePoint instance definitions ----------------------------*/
@@ -25,9 +25,9 @@ static PyMethodDef BPy_CurvePoint_methods[] = {
 	{"A", ( PyCFunction ) CurvePoint_A, METH_NOARGS, "（ ）Returns the first SVertex upon which the CurvePoint is built."},
 	{"B", ( PyCFunction ) CurvePoint_B, METH_NOARGS, "（ ）Returns the second SVertex upon which the CurvePoint is built."},
 	{"t2d", ( PyCFunction ) CurvePoint_t2d, METH_NOARGS, "（ ）Returns the interpolation parameter."},
-	{"SetA", ( PyCFunction ) CurvePoint_SetA, METH_VARARGS, "（SVertex sv ）Sets the first SVertex upon which to build the CurvePoint."},
-	{"SetB", ( PyCFunction ) CurvePoint_SetB, METH_VARARGS, "（SVertex sv ）Sets the second SVertex upon which to build the CurvePoint."},
-	{"SetT2d", ( PyCFunction ) CurvePoint_SetT2d, METH_VARARGS, "（ ）Sets the 2D interpolation parameter to use."},
+	{"setA", ( PyCFunction ) CurvePoint_setA, METH_VARARGS, "（SVertex sv ）Sets the first SVertex upon which to build the CurvePoint."},
+	{"setB", ( PyCFunction ) CurvePoint_setB, METH_VARARGS, "（SVertex sv ）Sets the second SVertex upon which to build the CurvePoint."},
+	{"setT2d", ( PyCFunction ) CurvePoint_setT2d, METH_VARARGS, "（ ）Sets the 2D interpolation parameter to use."},
 	{"curvatureFredo", ( PyCFunction ) CurvePoint_curvatureFredo, METH_NOARGS, "（ ）angle in radians."},
 	{NULL, NULL, 0, NULL}
 };
@@ -182,41 +182,41 @@ PyObject * CurvePoint_t2d( BPy_CurvePoint *self ) {
 	return PyFloat_FromDouble( self->cp->t2d() );
 }
 
-PyObject *CurvePoint_SetA( BPy_CurvePoint *self , PyObject *args) {
+PyObject *CurvePoint_setA( BPy_CurvePoint *self , PyObject *args) {
 	PyObject *py_sv;
 
 	if(!( PyArg_ParseTuple(args, "O", &py_sv) && BPy_SVertex_Check(py_sv)  )) {
-		cout << "ERROR: CurvePoint_SetA" << endl;
+		cout << "ERROR: CurvePoint_setA" << endl;
 		Py_RETURN_NONE;
 	}
 
-	self->cp->SetA( ((BPy_SVertex *) py_sv)->sv );
+	self->cp->setA( ((BPy_SVertex *) py_sv)->sv );
 
 	Py_RETURN_NONE;
 }
 
-PyObject *CurvePoint_SetB( BPy_CurvePoint *self , PyObject *args) {
+PyObject *CurvePoint_setB( BPy_CurvePoint *self , PyObject *args) {
 	PyObject *py_sv;
 
 	if(!( PyArg_ParseTuple(args, "O", &py_sv) && BPy_SVertex_Check(py_sv)  )) {
-		cout << "ERROR: CurvePoint_SetB" << endl;
+		cout << "ERROR: CurvePoint_setB" << endl;
 		Py_RETURN_NONE;
 	}
 
-	self->cp->SetB( ((BPy_SVertex *) py_sv)->sv );
+	self->cp->setB( ((BPy_SVertex *) py_sv)->sv );
 
 	Py_RETURN_NONE;
 }
 
-PyObject *CurvePoint_SetT2d( BPy_CurvePoint *self , PyObject *args) {
+PyObject *CurvePoint_setT2d( BPy_CurvePoint *self , PyObject *args) {
 	float t;
 
 	if( !PyArg_ParseTuple(args, "f", &t) ) {
-		cout << "ERROR: CurvePoint_SetT2d" << endl;
+		cout << "ERROR: CurvePoint_setT2d" << endl;
 		Py_RETURN_NONE;
 	}
 
-	self->cp->SetT2d( t );
+	self->cp->setT2d( t );
 
 	Py_RETURN_NONE;
 }
diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint.h b/source/blender/freestyle/intern/python/Interface0D/CurvePoint.h
index ac30f74c4dd..e40f261504f 100644
--- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint.h
+++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint.h
@@ -14,8 +14,7 @@ extern "C" {
 
 extern PyTypeObject CurvePoint_Type;
 
-#define BPy_CurvePoint_Check(v) \
-    ((v)->ob_type == &CurvePoint_Type)
+#define BPy_CurvePoint_Check(v)	(( (PyObject *) v)->ob_type == &CurvePoint_Type)
 
 /*---------------------------Python BPy_CurvePoint structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.cpp
index 7f2e364d0b4..69069a68f33 100644
--- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.cpp
@@ -1,104 +1,254 @@
- PyObject *_wrap_StrokeVertex_getExactTypeName(PyObject *self , PyObject *args) {
+#include "StrokeVertex.h"
+
+#include "../../Convert.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for StrokeVertex instance  -----------*/
+static int StrokeVertex___init__(BPy_StrokeVertex *self, PyObject *args, PyObject *kwds);
+
+
+/*----------------------StrokeVertex instance definitions ----------------------------*/
+static PyMethodDef BPy_StrokeVertex_methods[] = {	
+//	{"__copy__", ( PyCFunction ) StrokeVertex___copy__, METH_NOARGS, "（ ）Cloning method."},
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_StrokeVertex type definition ------------------------------*/
+
+PyTypeObject StrokeVertex_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"StrokeVertex",				/* tp_name */
+	sizeof( BPy_StrokeVertex ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_StrokeVertex_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&Interface0D_Type,				/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)StrokeVertex___init__,                       	/* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int StrokeVertex___init__(BPy_StrokeVertex *self, PyObject *args, PyObject *kwds)
+{
+
+	PyObject *obj1 = 0, *obj2 = 0 , *obj3 = 0;
+
+    if (! PyArg_ParseTuple(args, "|OOO", &obj1, &obj2, &obj3) )
+        return -1;
+
+	if( !obj1 && !obj2 && !obj3 ){
+		self->cp = new CurvePoint();
+	} else if( PyFloat_Check(obj3) ) {
+		if( BPy_SVertex_Check(obj1) && BPy_SVertex_Check(obj2) ) {
+			self->cp = new CurvePoint(  ((BPy_SVertex *) obj1)->sv,
+										((BPy_SVertex *) obj2)->sv,
+										PyFloat_AsDouble( obj3 ) );
+		} else if( BPy_CurvePoint_Check(obj1) && BPy_CurvePoint_Check(obj2) ) {
+			self->cp = new CurvePoint(  ((BPy_CurvePoint *) obj1)->cp,
+										((BPy_CurvePoint *) obj2)->cp,
+										PyFloat_AsDouble( obj3 ) );
+		} else {
+			return -1;	
+		}		
+	} else {
+		return -1;
+	}
+
+	self->py_if0D.if0D = self->cp;
+
+	return 0;
 }
 
 
- PyObject *_wrap_new_StrokeVertex__SWIG_0(PyObject *self , PyObject *args) {
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
 }
+#endif
 
 
- PyObject *_wrap_new_StrokeVertex__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_StrokeVertex__SWIG_2(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_StrokeVertex__SWIG_3(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_StrokeVertex__SWIG_4(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_StrokeVertex__SWIG_5(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_StrokeVertex(PyObject *self, PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_StrokeVertex(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertex_x(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertex_y(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertex_getPoint(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertex_attribute__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertex_attribute__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertex_attribute(PyObject *self, PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertex_curvilinearAbscissa(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertex_strokeLength(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertex_u(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertex_SetX(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertex_SetY(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertex_SetPoint__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertex_SetPoint__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertex_SetPoint(PyObject *self, PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertex_SetAttribute(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertex_SetCurvilinearAbscissa(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertex_SetStrokeLength(PyObject *self , PyObject *args) {
-}
-
+//  PyObject *_wrap_StrokeVertex_getExactTypeName(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_new_StrokeVertex__SWIG_0(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_new_StrokeVertex__SWIG_1(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_new_StrokeVertex__SWIG_2(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_new_StrokeVertex__SWIG_3(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_new_StrokeVertex__SWIG_4(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_new_StrokeVertex__SWIG_5(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_new_StrokeVertex(PyObject *self, PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_delete_StrokeVertex(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_StrokeVertex_x(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_StrokeVertex_y(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_StrokeVertex_getPoint(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_StrokeVertex_attribute__SWIG_0(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_StrokeVertex_attribute__SWIG_1(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_StrokeVertex_attribute(PyObject *self, PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_StrokeVertex_curvilinearAbscissa(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_StrokeVertex_strokeLength(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_StrokeVertex_u(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_StrokeVertex_SetX(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_StrokeVertex_SetY(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_StrokeVertex_SetPoint__SWIG_0(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_StrokeVertex_SetPoint__SWIG_1(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_StrokeVertex_SetPoint(PyObject *self, PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_StrokeVertex_SetAttribute(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_StrokeVertex_SetCurvilinearAbscissa(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_StrokeVertex_SetStrokeLength(PyObject *self , PyObject *args) {
+// }
+// 
 
diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.h b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.h
new file mode 100644
index 00000000000..dccecb093f5
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.h
@@ -0,0 +1,31 @@
+#ifndef FREESTYLE_PYTHON_STROKEVERTEX_H
+#define FREESTYLE_PYTHON_STROKEVERTEX_H
+
+#include "../CurvePoint.h"
+#include "../../stroke/Stroke.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject StrokeVertex_Type;
+
+#define BPy_StrokeVertex_Check(v)	(( (PyObject *) v)->ob_type == &StrokeVertex_Type)
+
+/*---------------------------Python BPy_StrokeVertex structure definition----------*/
+typedef struct {
+	BPy_CurvePoint py_cp;
+	StrokeVertex *sv;
+} BPy_StrokeVertex;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_STROKEVERTEX_H */
diff --git a/source/blender/freestyle/intern/python/Interface0D/SVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/SVertex.cpp
index eb91d7daf10..d0c622d1df2 100644
--- a/source/blender/freestyle/intern/python/Interface0D/SVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/SVertex.cpp
@@ -14,10 +14,10 @@ static int SVertex___init__(BPy_SVertex *self, PyObject *args, PyObject *kwds);
 static PyObject * SVertex___copy__( BPy_SVertex *self );
 static PyObject * SVertex_normals( BPy_SVertex *self );
 static PyObject * SVertex_normalsSize( BPy_SVertex *self );
-static PyObject * SVertex_SetPoint3D( BPy_SVertex *self , PyObject *args);
-static PyObject * SVertex_SetPoint2D( BPy_SVertex *self , PyObject *args);
+static PyObject * SVertex_setPoint3D( BPy_SVertex *self , PyObject *args);
+static PyObject * SVertex_setPoint2D( BPy_SVertex *self , PyObject *args);
 static PyObject * SVertex_AddNormal( BPy_SVertex *self , PyObject *args);
-static PyObject * SVertex_SetId( BPy_SVertex *self , PyObject *args);
+static PyObject * SVertex_setId( BPy_SVertex *self , PyObject *args);
 static PyObject *SVertex_AddFEdge( BPy_SVertex *self , PyObject *args);
 
 /*----------------------SVertex instance definitions ----------------------------*/
@@ -25,10 +25,10 @@ static PyMethodDef BPy_SVertex_methods[] = {
 	{"__copy__", ( PyCFunction ) SVertex___copy__, METH_NOARGS, "（ ）Cloning method."},
 	{"normals", ( PyCFunction ) SVertex_normals, METH_NOARGS, "Returns the normals for this Vertex as a list. In a smooth surface, a vertex has exactly one normal. In a sharp surface, a vertex can have any number of normals."},
 	{"normalsSize", ( PyCFunction ) SVertex_normalsSize, METH_NOARGS, "Returns the number of different normals for this vertex." },
-	{"SetPoint3D", ( PyCFunction ) SVertex_SetPoint3D, METH_VARARGS, "Sets the 3D coordinates of the SVertex." },
-	{"SetPoint2D", ( PyCFunction ) SVertex_SetPoint2D, METH_VARARGS, "Sets the 3D projected coordinates of the SVertex." },
+	{"setPoint3D", ( PyCFunction ) SVertex_setPoint3D, METH_VARARGS, "Sets the 3D coordinates of the SVertex." },
+	{"setPoint2D", ( PyCFunction ) SVertex_setPoint2D, METH_VARARGS, "Sets the 3D projected coordinates of the SVertex." },
 	{"AddNormal", ( PyCFunction ) SVertex_AddNormal, METH_VARARGS, "Adds a normal to the Svertex's set of normals. If the same normal is already in the set, nothing changes." },
-	{"SetId", ( PyCFunction ) SVertex_SetId, METH_VARARGS, "Sets the Id." },
+	{"setId", ( PyCFunction ) SVertex_setId, METH_VARARGS, "Sets the Id." },
 	{"AddFEdge", ( PyCFunction ) SVertex_AddFEdge, METH_VARARGS, "Add an FEdge to the list of edges emanating from this SVertex." },	
 	{NULL, NULL, 0, NULL}
 };
@@ -177,36 +177,36 @@ PyObject * SVertex_normalsSize( BPy_SVertex *self ) {
 	return PyInt_FromLong( self->sv->normalsSize() );
 }
 
-PyObject *SVertex_SetPoint3D( BPy_SVertex *self , PyObject *args) {
+PyObject *SVertex_setPoint3D( BPy_SVertex *self , PyObject *args) {
 	PyObject *py_point;
 
 	if(!( PyArg_ParseTuple(args, "O", &py_point) 
 			&& PyList_Check(py_point) && PyList_Size(py_point) == 3 )) {
-		cout << "ERROR: SVertex_SetPoint3D" << endl;
+		cout << "ERROR: SVertex_setPoint3D" << endl;
 		Py_RETURN_NONE;
 	}
 
 	Vec3r v( 	PyFloat_AsDouble( PyList_GetItem(py_point, 0) ),
 				PyFloat_AsDouble( PyList_GetItem(py_point, 1) ),
 				PyFloat_AsDouble( PyList_GetItem(py_point, 2) )  );
-	self->sv->SetPoint3D( v );
+	self->sv->setPoint3D( v );
 
 	Py_RETURN_NONE;
 }
 
-PyObject *SVertex_SetPoint2D( BPy_SVertex *self , PyObject *args) {
+PyObject *SVertex_setPoint2D( BPy_SVertex *self , PyObject *args) {
 	PyObject *py_point;
 
 	if(!( PyArg_ParseTuple(args, "O", &py_point) 
 			&& PyList_Check(py_point) && PyList_Size(py_point) == 3 )) {
-		cout << "ERROR: SVertex_SetPoint2D" << endl;
+		cout << "ERROR: SVertex_setPoint2D" << endl;
 		Py_RETURN_NONE;
 	}
 
 	Vec3r v( 	PyFloat_AsDouble( PyList_GetItem(py_point, 0) ),
 				PyFloat_AsDouble( PyList_GetItem(py_point, 1) ),
 				PyFloat_AsDouble( PyList_GetItem(py_point, 2) )  );
-	self->sv->SetPoint2D( v );
+	self->sv->setPoint2D( v );
 
 	Py_RETURN_NONE;
 }
@@ -228,15 +228,15 @@ PyObject *SVertex_AddNormal( BPy_SVertex *self , PyObject *args) {
 	Py_RETURN_NONE;
 }
 
-PyObject *SVertex_SetId( BPy_SVertex *self , PyObject *args) {
+PyObject *SVertex_setId( BPy_SVertex *self , PyObject *args) {
 	BPy_Id *py_id;
 
 	if( !PyArg_ParseTuple(args, "O", &py_id) ) {
-		cout << "ERROR: SVertex_SetId" << endl;
+		cout << "ERROR: SVertex_setId" << endl;
 		Py_RETURN_NONE;
 	}
 
-	self->sv->SetId( *(py_id->id) );
+	self->sv->setId( *(py_id->id) );
 
 	Py_RETURN_NONE;
 }
diff --git a/source/blender/freestyle/intern/python/Interface0D/SVertex.h b/source/blender/freestyle/intern/python/Interface0D/SVertex.h
index ac89133ab55..099417b5139 100644
--- a/source/blender/freestyle/intern/python/Interface0D/SVertex.h
+++ b/source/blender/freestyle/intern/python/Interface0D/SVertex.h
@@ -15,8 +15,7 @@ extern "C" {
 
 extern PyTypeObject SVertex_Type;
 
-#define BPy_SVertex_Check(v) \
-    ((v)->ob_type == &SVertex_Type)
+#define BPy_SVertex_Check(v)	(( (PyObject *) v)->ob_type == &SVertex_Type)
 
 /*---------------------------Python BPy_SVertex structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex.h b/source/blender/freestyle/intern/python/Interface0D/ViewVertex.h
index 98eeb504a3d..98bcb9bac90 100644
--- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex.h
+++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex.h
@@ -15,8 +15,7 @@ extern "C" {
 
 extern PyTypeObject ViewVertex_Type;
 
-#define BPy_ViewVertex_Check(v) \
-    ((v)->ob_type == &ViewVertex_Type)
+#define BPy_ViewVertex_Check(v)	(( (PyObject *) v)->ob_type == &ViewVertex_Type)
 
 /*---------------------------Python BPy_ViewVertex structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/Interface1D.h b/source/blender/freestyle/intern/python/Interface1D.h
index f39203744e4..c49a8c130b0 100644
--- a/source/blender/freestyle/intern/python/Interface1D.h
+++ b/source/blender/freestyle/intern/python/Interface1D.h
@@ -13,8 +13,7 @@ extern "C" {
 
 extern PyTypeObject Interface1D_Type;
 
-#define BPy_Interface1D_Check(v) \
-    ((v)->ob_type == &Interface1D_Type)
+#define BPy_Interface1D_Check(v)	(( (PyObject *) v)->ob_type == &Interface1D_Type)
 
 /*---------------------------Python BPy_Interface1D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge.cpp
index 6a00ad66123..0cdfb9f1e0d 100644
--- a/source/blender/freestyle/intern/python/Interface1D/FEdge.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/FEdge.cpp
@@ -20,13 +20,13 @@ static PyObject * FEdge_previousEdge( BPy_FEdge *self );
 static PyObject * FEdge_getVertices( BPy_FEdge *self );
 static PyObject * FEdge_getPoints( BPy_FEdge *self );
 static PyObject * FEdge_isSmooth( BPy_FEdge *self );
-static PyObject * FEdge_SetVertexA( BPy_FEdge *self , PyObject *args);
-static PyObject * FEdge_SetVertexB( BPy_FEdge *self , PyObject *args);
-static PyObject * FEdge_SetId( BPy_FEdge *self , PyObject *args);
-static PyObject * FEdge_SetNextEdge( BPy_FEdge *self , PyObject *args);
-static PyObject * FEdge_SetPreviousEdge( BPy_FEdge *self , PyObject *args);
-static PyObject * FEdge_SetSmooth( BPy_FEdge *self , PyObject *args); 
-static PyObject * FEdge_SetNature( BPy_FEdge *self, PyObject *args );
+static PyObject * FEdge_setVertexA( BPy_FEdge *self , PyObject *args);
+static PyObject * FEdge_setVertexB( BPy_FEdge *self , PyObject *args);
+static PyObject * FEdge_setId( BPy_FEdge *self , PyObject *args);
+static PyObject * FEdge_setNextEdge( BPy_FEdge *self , PyObject *args);
+static PyObject * FEdge_setPreviousEdge( BPy_FEdge *self , PyObject *args);
+static PyObject * FEdge_setSmooth( BPy_FEdge *self , PyObject *args); 
+static PyObject * FEdge_setNature( BPy_FEdge *self, PyObject *args );
 
 /*----------------------FEdge instance definitions ----------------------------*/
 static PyMethodDef BPy_FEdge_methods[] = {	
@@ -39,13 +39,13 @@ static PyMethodDef BPy_FEdge_methods[] = {
 	{"getVertices", ( PyCFunction ) FEdge_getVertices, METH_NOARGS, "Returns the vertices"},
 	{"getPoints", ( PyCFunction ) FEdge_getPoints, METH_NOARGS, "Returns the points. The difference with getVertices() is that here we can iterate over points of the 1D element at any given sampling. At each call, a virtual point is created."}, 
 	{"isSmooth", ( PyCFunction ) FEdge_isSmooth, METH_NOARGS, "() Returns true if this FEdge is a smooth FEdge."},
-	{"SetVertexA", ( PyCFunction ) FEdge_SetVertexA, METH_VARARGS, "(SVertex v) Sets the first SVertex. ."},
-	{"SetVertexB", ( PyCFunction ) FEdge_SetVertexB, METH_VARARGS, "(SVertex v) Sets the second SVertex. "},
-	{"SetId", ( PyCFunction ) FEdge_SetId, METH_VARARGS, "(Id id) Sets the FEdge Id ."},
-	{"SetNextEdge", ( PyCFunction ) FEdge_SetNextEdge, METH_VARARGS, "(FEdge e) Sets the pointer to the next FEdge. "},
-	{"SetPreviousEdge", ( PyCFunction ) FEdge_SetPreviousEdge, METH_VARARGS, "(FEdge e) Sets the pointer to the previous FEdge. "},
-	{"SetSmooth", ( PyCFunction ) FEdge_SetSmooth, METH_VARARGS, "(bool b) Sets the flag telling whether this FEdge is smooth or sharp. true for Smooth, false for Sharp. "},
-	{"SetNature", ( PyCFunction ) FEdge_SetNature, METH_VARARGS, "(Nature n) Sets the nature of this FEdge. "},
+	{"setVertexA", ( PyCFunction ) FEdge_setVertexA, METH_VARARGS, "(SVertex v) Sets the first SVertex. ."},
+	{"setVertexB", ( PyCFunction ) FEdge_setVertexB, METH_VARARGS, "(SVertex v) Sets the second SVertex. "},
+	{"setId", ( PyCFunction ) FEdge_setId, METH_VARARGS, "(Id id) Sets the FEdge Id ."},
+	{"setNextEdge", ( PyCFunction ) FEdge_setNextEdge, METH_VARARGS, "(FEdge e) Sets the pointer to the next FEdge. "},
+	{"setPreviousEdge", ( PyCFunction ) FEdge_setPreviousEdge, METH_VARARGS, "(FEdge e) Sets the pointer to the previous FEdge. "},
+	{"setSmooth", ( PyCFunction ) FEdge_setSmooth, METH_VARARGS, "(bool b) Sets the flag telling whether this FEdge is smooth or sharp. true for Smooth, false for Sharp. "},
+	{"setNature", ( PyCFunction ) FEdge_setNature, METH_VARARGS, "(Nature n) Sets the nature of this FEdge. "},
 	{NULL, NULL, 0, NULL}
 };
 
@@ -221,86 +221,86 @@ PyObject * FEdge_isSmooth( BPy_FEdge *self ) {
 	return PyBool_from_bool( self->fe->isSmooth() );
 }
 	
-PyObject *FEdge_SetVertexA( BPy_FEdge *self , PyObject *args) {
+PyObject *FEdge_setVertexA( BPy_FEdge *self , PyObject *args) {
 	PyObject *py_sv;
 
 	if(!( PyArg_ParseTuple(args, "O", &py_sv) && BPy_SVertex_Check(py_sv) )) {
-		cout << "ERROR: FEdge_SetVertexA" << endl;
+		cout << "ERROR: FEdge_setVertexA" << endl;
 		Py_RETURN_NONE;
 	}
 
-	self->fe->SetVertexA( ((BPy_SVertex *) py_sv)->sv );
+	self->fe->setVertexA( ((BPy_SVertex *) py_sv)->sv );
 
 	Py_RETURN_NONE;
 }
 
-PyObject *FEdge_SetVertexB( BPy_FEdge *self , PyObject *args) {
+PyObject *FEdge_setVertexB( BPy_FEdge *self , PyObject *args) {
 	PyObject *py_sv;
 
 	if(!( PyArg_ParseTuple(args, "O", &py_sv) && BPy_SVertex_Check(py_sv) )) {
-		cout << "ERROR: FEdge_SetVertexB" << endl;
+		cout << "ERROR: FEdge_setVertexB" << endl;
 		Py_RETURN_NONE;
 	}
 
-	self->fe->SetVertexB( ((BPy_SVertex *) py_sv)->sv );
+	self->fe->setVertexB( ((BPy_SVertex *) py_sv)->sv );
 
 	Py_RETURN_NONE;
 }
 
-PyObject *FEdge_SetId( BPy_FEdge *self , PyObject *args) {
+PyObject *FEdge_setId( BPy_FEdge *self , PyObject *args) {
 	PyObject *py_id;
 
 	if(!( PyArg_ParseTuple(args, "O", &py_id) && BPy_Id_Check(py_id) )) {
-		cout << "ERROR: FEdge_SetId" << endl;
+		cout << "ERROR: FEdge_setId" << endl;
 		Py_RETURN_NONE;
 	}
 
-	self->fe->SetId(*( ((BPy_Id *) py_id)->id ));
+	self->fe->setId(*( ((BPy_Id *) py_id)->id ));
 
 	Py_RETURN_NONE;
 }
 
 
-PyObject *FEdge_SetNextEdge( BPy_FEdge *self , PyObject *args) {
+PyObject *FEdge_setNextEdge( BPy_FEdge *self , PyObject *args) {
 	PyObject *py_fe;
 
 	if(!( PyArg_ParseTuple(args, "O", &py_fe) && BPy_FEdge_Check(py_fe) )) {
-		cout << "ERROR: FEdge_SetNextEdge" << endl;
+		cout << "ERROR: FEdge_setNextEdge" << endl;
 		Py_RETURN_NONE;
 	}
 
-	self->fe->SetNextEdge( ((BPy_FEdge *) py_fe)->fe );
+	self->fe->setNextEdge( ((BPy_FEdge *) py_fe)->fe );
 
 	Py_RETURN_NONE;
 }
 
-PyObject *FEdge_SetPreviousEdge( BPy_FEdge *self , PyObject *args) {
+PyObject *FEdge_setPreviousEdge( BPy_FEdge *self , PyObject *args) {
 	PyObject *py_fe;
 
 	if(!( PyArg_ParseTuple(args, "O", &py_fe) && BPy_FEdge_Check(py_fe) )) {
-		cout << "ERROR: FEdge_SetPreviousEdge" << endl;
+		cout << "ERROR: FEdge_setPreviousEdge" << endl;
 		Py_RETURN_NONE;
 	}
 
-	self->fe->SetPreviousEdge( ((BPy_FEdge *) py_fe)->fe );
+	self->fe->setPreviousEdge( ((BPy_FEdge *) py_fe)->fe );
 
 	Py_RETURN_NONE;
 }
 
-PyObject *FEdge_SetSmooth( BPy_FEdge *self , PyObject *args) {
+PyObject *FEdge_setSmooth( BPy_FEdge *self , PyObject *args) {
 	int b;
 
 	if(!( PyArg_ParseTuple(args, "i", &b) )) {
-		cout << "ERROR: FEdge_SetSmooth" << endl;
+		cout << "ERROR: FEdge_setSmooth" << endl;
 		Py_RETURN_NONE;
 	}
 
-	self->fe->SetSmooth( (bool) b );
+	self->fe->setSmooth( (bool) b );
 
 	Py_RETURN_NONE;
 }
 
-PyObject * FEdge_SetNature( BPy_FEdge *self, PyObject *args ) {
+PyObject * FEdge_setNature( BPy_FEdge *self, PyObject *args ) {
 	PyObject *py_n;
 
 	if(!( PyArg_ParseTuple(args, "O", &py_n) && BPy_Nature_Check(py_n) )) {
@@ -309,7 +309,7 @@ PyObject * FEdge_SetNature( BPy_FEdge *self, PyObject *args ) {
 	}
 	
 	PyObject *i = (PyObject *) &( ((BPy_Nature *) py_n)->i );
-	((FEdge *) self->py_if1D.if1D)->SetNature( PyInt_AsLong(i) );
+	((FEdge *) self->py_if1D.if1D)->setNature( PyInt_AsLong(i) );
 
 	Py_RETURN_NONE;
 }
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge.h b/source/blender/freestyle/intern/python/Interface1D/FEdge.h
index 39c9c56e391..230a5f36954 100644
--- a/source/blender/freestyle/intern/python/Interface1D/FEdge.h
+++ b/source/blender/freestyle/intern/python/Interface1D/FEdge.h
@@ -14,8 +14,7 @@ extern "C" {
 
 extern PyTypeObject FEdge_Type;
 
-#define BPy_FEdge_Check(v) \
-    ((v)->ob_type == &FEdge_Type)
+#define BPy_FEdge_Check(v)	(( (PyObject *) v)->ob_type == &FEdge_Type)
 
 /*---------------------------Python BPy_FEdge structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/Nature.h b/source/blender/freestyle/intern/python/Nature.h
index d0bc4de6fc0..7473869158f 100644
--- a/source/blender/freestyle/intern/python/Nature.h
+++ b/source/blender/freestyle/intern/python/Nature.h
@@ -13,8 +13,7 @@ extern "C" {
 
 extern PyTypeObject Nature_Type;
 
-#define BPy_Nature_Check(v) \
-    ((v)->ob_type == &Nature_Type)
+#define BPy_Nature_Check(v)	(( (PyObject *) v)->ob_type == &Nature_Type)
 
 /*---------------------------Python BPy_Nature structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/StrokeAttribute.cpp b/source/blender/freestyle/intern/python/StrokeAttribute.cpp
index c54eca16e11..5f7814ff4dd 100644
--- a/source/blender/freestyle/intern/python/StrokeAttribute.cpp
+++ b/source/blender/freestyle/intern/python/StrokeAttribute.cpp
@@ -1,112 +1,484 @@
- PyObject *_wrap_StrokeAttribute_getColor(PyObject *self , PyObject *args) {
+#include "StrokeAttribute.h"
+
+#include "Convert.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for StrokeAttribute instance  -----------*/
+static int StrokeAttribute___init__(BPy_StrokeAttribute *self, PyObject *args, PyObject *kwds);
+static void StrokeAttribute___dealloc__(BPy_StrokeAttribute *self);
+static PyObject * StrokeAttribute___repr__(BPy_StrokeAttribute *self);
+
+static PyObject * StrokeAttribute_getColorR( BPy_StrokeAttribute *self );
+static PyObject * StrokeAttribute_getColorG( BPy_StrokeAttribute *self );
+static PyObject * StrokeAttribute_getColorB( BPy_StrokeAttribute *self );
+static PyObject * StrokeAttribute_getColorRGB( BPy_StrokeAttribute *self );
+static PyObject * StrokeAttribute_getAlpha( BPy_StrokeAttribute *self );
+static PyObject * StrokeAttribute_getThicknessR( BPy_StrokeAttribute *self );
+static PyObject * StrokeAttribute_getThicknessL( BPy_StrokeAttribute *self );
+static PyObject * StrokeAttribute_getThicknessRL( BPy_StrokeAttribute *self );
+static PyObject * StrokeAttribute_isVisible( BPy_StrokeAttribute *self );
+static PyObject * StrokeAttribute_getAttributeReal( BPy_StrokeAttribute *self, PyObject *args );
+static PyObject * StrokeAttribute_getAttributeVec2f( BPy_StrokeAttribute *self, PyObject *args );
+static PyObject * StrokeAttribute_getAttributeVec3f( BPy_StrokeAttribute *self, PyObject *args );
+static PyObject * StrokeAttribute_isAttributeAvailableReal( BPy_StrokeAttribute *self, PyObject *args );
+static PyObject * StrokeAttribute_isAttributeAvailableVec2f( BPy_StrokeAttribute *self, PyObject *args );
+static PyObject * StrokeAttribute_isAttributeAvailableVec3f( BPy_StrokeAttribute *self, PyObject *args );
+static int StrokeAttribute_setColor( BPy_StrokeAttribute *self, PyObject *args );
+static int StrokeAttribute_setAlpha( BPy_StrokeAttribute *self, PyObject *args );
+static int StrokeAttribute_setThickness( BPy_StrokeAttribute *self, PyObject *args );
+static int StrokeAttribute_setVisible( BPy_StrokeAttribute *self, PyObject *args );
+static int StrokeAttribute_setAttributeReal( BPy_StrokeAttribute *self, PyObject *args );
+static int StrokeAttribute_setAttributeVec2f( BPy_StrokeAttribute *self, PyObject *args );
+static int StrokeAttribute_setAttributeVec3f( BPy_StrokeAttribute *self, PyObject *args );
+
+
+/*----------------------StrokeAttribute instance definitions ----------------------------*/
+static PyMethodDef BPy_StrokeAttribute_methods[] = {
+	{"getColorR", ( PyCFunction ) StrokeAttribute_getColorR, METH_NOARGS, "Returns the R color component. "},
+	{"getColorG", ( PyCFunction ) StrokeAttribute_getColorG, METH_NOARGS, "Returns the G color component. "},
+	{"getColorB", ( PyCFunction ) StrokeAttribute_getColorB, METH_NOARGS, "Returns the B color component. "},
+	{"getColorRGB", ( PyCFunction ) StrokeAttribute_getColorRGB, METH_NOARGS, "Returns the RGB color components."},
+	{"getAlpha", ( PyCFunction ) StrokeAttribute_getAlpha, METH_NOARGS, "Returns the alpha color component."},
+	{"getThicknessR", ( PyCFunction ) StrokeAttribute_getThicknessR, METH_NOARGS, "Returns the thickness on the right of the vertex when following the stroke. "},
+	{"getThicknessL", ( PyCFunction ) StrokeAttribute_getThicknessL, METH_NOARGS, "Returns the thickness on the left of the vertex when following the stroke."},
+	{"getThicknessRL", ( PyCFunction ) StrokeAttribute_getThicknessRL, METH_NOARGS, "Returns the thickness on the right and on the left of the vertex when following the stroke. "},
+	{"isVisible", ( PyCFunction ) StrokeAttribute_isVisible, METH_NOARGS, "Returns true if the strokevertex is visible, false otherwise"},
+	{"getAttributeReal", ( PyCFunction ) StrokeAttribute_getAttributeReal, METH_VARARGS, "(name) Returns an attribute of type real specified by name."},
+	{"getAttributeVec2f", ( PyCFunction ) StrokeAttribute_getAttributeVec2f, METH_VARARGS, "(name) Returns an attribute of type Vec2f specified by name."},
+	{"getAttributeVec3f", ( PyCFunction ) StrokeAttribute_getAttributeVec3f, METH_VARARGS, "(name) Returns an attribute of type Vec3f specified by name."},
+	{"isAttributeAvailableReal", ( PyCFunction ) StrokeAttribute_isAttributeAvailableReal, METH_VARARGS, "(name) Checks whether the real attribute specified by name is available"},
+	{"isAttributeAvailableVec2f", ( PyCFunction ) StrokeAttribute_isAttributeAvailableVec2f, METH_VARARGS, "(name) Checks whether the Vec2f attribute specified by name is available"},
+	{"isAttributeAvailableVec3f", ( PyCFunction ) StrokeAttribute_isAttributeAvailableVec3f, METH_VARARGS, "(name) Checks whether the Vec3f attribute specified by name is available"},
+	{"setColor", ( PyCFunction ) StrokeAttribute_setColor, METH_VARARGS, "(float a)Sets the attribute's alpha value. "},
+	{"setAlpha", ( PyCFunction ) StrokeAttribute_setAlpha, METH_VARARGS, "(float a) Sets the attribute's alpha value."},
+	{"setThickness", ( PyCFunction ) StrokeAttribute_setThickness, METH_VARARGS, ""},
+	{"setVisible", ( PyCFunction ) StrokeAttribute_setVisible, METH_VARARGS, ""},
+	{"setAttributeReal", ( PyCFunction ) StrokeAttribute_setAttributeReal, METH_VARARGS, "(name, float att) Adds a user defined attribute of type real. If there is no attribute of specified by name, it is added. Otherwise, the new value replaces the old one."},
+	{"setAttributeVec2f", ( PyCFunction ) StrokeAttribute_setAttributeVec2f, METH_VARARGS, "(name, float att) Adds a user defined attribute of type Vec2f. If there is no attribute of specified by name, it is added. Otherwise, the new value replaces the old one."},
+	{"setAttributeVec3f", ( PyCFunction ) StrokeAttribute_setAttributeVec3f, METH_VARARGS, "(name, float att) Adds a user defined attribute of type Vec4f. If there is no attribute of specified by name, it is added. Otherwise, the new value replaces the old one."},
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_StrokeAttribute type definition ------------------------------*/
+
+PyTypeObject StrokeAttribute_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"StrokeAttribute",				/* tp_name */
+	sizeof( BPy_StrokeAttribute ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	(destructor)StrokeAttribute___dealloc__,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	(reprfunc)StrokeAttribute___repr__,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_StrokeAttribute_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	NULL,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)StrokeAttribute___init__,                       	/* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	PyType_GenericNew,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+PyMODINIT_FUNC StrokeAttribute_Init( PyObject *module )
+{
+	if( module == NULL )
+		return;
+
+	if( PyType_Ready( &StrokeAttribute_Type ) < 0 )
+		return;
+	Py_INCREF( &StrokeAttribute_Type );
+	PyModule_AddObject(module, "StrokeAttribute", (PyObject *)&StrokeAttribute_Type);
+	
+}
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int StrokeAttribute___init__(BPy_StrokeAttribute *self, PyObject *args, PyObject *kwds)
+{
+
+	PyObject *obj1 = 0, *obj2 = 0 , *obj3 = 0, *obj4 = 0, *obj5 = 0 , *obj6 = 0;
+
+    if (! PyArg_ParseTuple(args, "|OOOOOO", &obj1, &obj2, &obj3, &obj4, &obj5, &obj6) )
+        return -1;
+
+	if( !obj1 || !obj2 || !obj3 ){
+		
+		self->sa = new StrokeAttribute();
+		
+	} else if( 	BPy_StrokeAttribute_Check(obj1) && 
+				BPy_StrokeAttribute_Check(obj2) &&
+				PyFloat_Check(obj3) ) {	
+		
+			self->sa = new StrokeAttribute(	*( ((BPy_StrokeAttribute *) obj1)->sa ),
+											*( ((BPy_StrokeAttribute *) obj2)->sa ),
+											PyFloat_AsDouble( obj3 ) );	
+										
+	} else if( 	obj4 && obj5 && obj6 &&
+				PyFloat_Check(obj1) && PyFloat_Check(obj2) && PyFloat_Check(obj2) &&
+				PyFloat_Check(obj4) && PyFloat_Check(obj5) && PyFloat_Check(obj6) ) {
+	
+			self->sa = new StrokeAttribute(	PyFloat_AsDouble( obj1 ),
+											PyFloat_AsDouble( obj2 ),
+											PyFloat_AsDouble( obj3 ),
+											PyFloat_AsDouble( obj4 ),
+											PyFloat_AsDouble( obj5 ),
+											PyFloat_AsDouble( obj6 ) );
+
+	} else {
+		return -1;
+	}
+
+
+	return 0;
+
+}
+
+void StrokeAttribute___dealloc__(BPy_StrokeAttribute* self)
+{
+	delete self->sa;
+    self->ob_type->tp_free((PyObject*)self);
+}
+
+PyObject * StrokeAttribute___repr__(BPy_StrokeAttribute* self)
+{
+    return PyString_FromFormat("StrokeAttribute: r:%f g:%f b:%f a:%f - R:%f L:%f", 
+		self->sa->getColorR(), self->sa->getColorG(), self->sa->getColorB(), self->sa->getAlpha(),
+		self->sa->getThicknessR(), self->sa->getThicknessL() );
 }
 
 
- PyObject *_wrap_StrokeAttribute_getColorR(PyObject *self , PyObject *args) {
+// PyObject *StrokeAttribute_getColor( BPy_StrokeAttribute *self ) {
+// 	float *c = self->sa->getColor();
+// 	Vec3f v( c[0], c[1], c[2]);
+// 	return Vector_from_Vec3f( v );
+// }
+
+PyObject *StrokeAttribute_getColorR( BPy_StrokeAttribute *self ) {
+	return PyFloat_FromDouble( self->sa->getColorR() );	
+}
+
+PyObject *StrokeAttribute_getColorG( BPy_StrokeAttribute *self ) {
+	return PyFloat_FromDouble( self->sa->getColorG() );	
+}
+
+PyObject *StrokeAttribute_getColorB( BPy_StrokeAttribute *self ) {
+	return PyFloat_FromDouble( self->sa->getColorB() );	
+}
+
+PyObject *StrokeAttribute_getColorRGB( BPy_StrokeAttribute *self ) {
+	Vec3f v( self->sa->getColorRGB() );
+	return Vector_from_Vec3f( v );	
+}
+
+PyObject *StrokeAttribute_getAlpha( BPy_StrokeAttribute *self ) {
+	return PyFloat_FromDouble( self->sa->getAlpha() );	
+}
+
+// PyObject *StrokeAttribute_getThickness( BPy_StrokeAttribute *self ) {
+// 	// vector
+// 	return PyString_FromString( self->sa->getExactTypeName() );	
+// }
+
+PyObject *StrokeAttribute_getThicknessR( BPy_StrokeAttribute *self ) {
+	return PyFloat_FromDouble( self->sa->getThicknessR() );	
+}
+PyObject *StrokeAttribute_getThicknessL( BPy_StrokeAttribute *self ) {
+	return PyFloat_FromDouble( self->sa->getThicknessL() );	
+}
+PyObject *StrokeAttribute_getThicknessRL( BPy_StrokeAttribute *self ) {
+	Vec2f v( self->sa->getThicknessRL() );
+	return Vector_from_Vec2f( v );
+}
+
+PyObject *StrokeAttribute_isVisible( BPy_StrokeAttribute *self ) {
+	return PyBool_from_bool( self->sa->isVisible() );	
 }
 
 
- PyObject *_wrap_StrokeAttribute_getColorG(PyObject *self , PyObject *args) {
+PyObject *StrokeAttribute_getAttributeReal( BPy_StrokeAttribute *self, PyObject *args ) {
+	char *attr;
+
+	if(!( PyArg_ParseTuple(args, "s", &attr) )) {
+		cout << "ERROR: StrokeAttribute_getAttributeReal" << endl;
+		Py_RETURN_NONE;
+	}
+
+	double a = self->sa->getAttributeReal( attr );
+	return PyFloat_FromDouble( a );
+}
+
+PyObject *StrokeAttribute_getAttributeVec2f( BPy_StrokeAttribute *self, PyObject *args ) {
+	char *attr;
+
+	if(!( PyArg_ParseTuple(args, "s", &attr) )) {
+		cout << "ERROR: StrokeAttribute_getAttributeVec2f" << endl;
+		Py_RETURN_NONE;
+	}
+
+	Vec2f a = self->sa->getAttributeVec2f( attr );
+	return Vector_from_Vec2f( a );
 }
 
 
- PyObject *_wrap_StrokeAttribute_getColorB(PyObject *self , PyObject *args) {
+PyObject *StrokeAttribute_getAttributeVec3f( BPy_StrokeAttribute *self, PyObject *args ) {
+	char *attr;
+
+	if(!( PyArg_ParseTuple(args, "s", &attr) )) {
+		cout << "ERROR: StrokeAttribute_getAttributeVec3f" << endl;
+		Py_RETURN_NONE;
+	}
+
+	Vec3f a = self->sa->getAttributeVec3f( attr );
+	return Vector_from_Vec3f( a );
+}
+
+PyObject *StrokeAttribute_isAttributeAvailableReal( BPy_StrokeAttribute *self, PyObject *args ) {
+	char *attr;
+
+	if(!( PyArg_ParseTuple(args, "s", &attr) )) {
+		cout << "ERROR: StrokeAttribute_isAttributeAvailableReal" << endl;
+		Py_RETURN_NONE;
+	}
+
+	return PyBool_from_bool( self->sa->isAttributeAvailableReal( attr ) );
+}
+
+PyObject *StrokeAttribute_isAttributeAvailableVec2f( BPy_StrokeAttribute *self, PyObject *args ) {
+	char *attr;
+
+	if(!( PyArg_ParseTuple(args, "s", &attr) )) {
+		cout << "ERROR: StrokeAttribute_isAttributeAvailableVec2f" << endl;
+		Py_RETURN_NONE;
+	}
+
+	return PyBool_from_bool( self->sa->isAttributeAvailableVec2f( attr ) );
+}
+
+PyObject *StrokeAttribute_isAttributeAvailableVec3f( BPy_StrokeAttribute *self, PyObject *args ) {
+	char *attr;
+
+	if(!( PyArg_ParseTuple(args, "s", &attr) )) {
+		cout << "ERROR: StrokeAttribute_isAttributeAvailableVec3f" << endl;
+		Py_RETURN_NONE;
+	}
+
+	return PyBool_from_bool( self->sa->isAttributeAvailableVec3f( attr ) );
 }
 
 
- PyObject *_wrap_StrokeAttribute_getColorRGB(PyObject *self , PyObject *args) {
+int StrokeAttribute_setColor( BPy_StrokeAttribute *self, PyObject *args ) {
+	PyObject *obj1 = 0, *obj2 = 0, *obj3 = 0 ;
+
+	if(!( PyArg_ParseTuple(args, "O|OO", &obj1, &obj2, &obj3) )) {
+		cout << "ERROR: StrokeAttribute_setColor" << endl;
+		return -1;
+	}
+
+	if( PyList_Check(obj1) && !obj2 && !obj3 ){
+		
+		Vec3f v( 	PyFloat_AsDouble( PyList_GetItem(obj1, 0) ),
+					PyFloat_AsDouble( PyList_GetItem(obj1, 1) ),
+					PyFloat_AsDouble( PyList_GetItem(obj1, 2) )  );
+		
+		self->sa->setColor( v );
+		return 0;
+		
+	} else if( 	obj1 && PyFloat_Check(obj1) &&
+				obj2 && PyFloat_Check(obj2) &&
+				obj3 && PyFloat_Check(obj3)	   ){
+					
+		self->sa->setColor(	PyFloat_AsDouble(obj1),
+							PyFloat_AsDouble(obj2),
+							PyFloat_AsDouble(obj3) );
+		return 0;
+	}
+	
+	return -1;
 }
 
+int StrokeAttribute_setAlpha( BPy_StrokeAttribute *self, PyObject *args ){
+	float f = 0;
 
- PyObject *_wrap_StrokeAttribute_getAlpha(PyObject *self , PyObject *args) {
+	if(!( PyArg_ParseTuple(args, "f", &f) )) {
+		cout << "ERROR: StrokeAttribute_setAlpha" << endl;
+		return -1;
+	}
+	
+	self->sa->setAlpha( f );
+	return 0;
 }
 
+int StrokeAttribute_setThickness( BPy_StrokeAttribute *self, PyObject *args )  {
+	PyObject *obj1 = 0, *obj2 = 0;
 
- PyObject *_wrap_StrokeAttribute_getThickness(PyObject *self , PyObject *args) {
+	if(!( PyArg_ParseTuple(args, "O|O", &obj1, &obj2) )) {
+		cout << "ERROR: StrokeAttribute_setThickness" << endl;
+		return -1;
+	}
+
+	if( PyList_Check(obj1) && !obj2 ){
+		
+		Vec2f v( 	PyFloat_AsDouble( PyList_GetItem(obj1, 0) ),
+					PyFloat_AsDouble( PyList_GetItem(obj1, 1) )  );
+		
+		self->sa->setThickness( v );
+		return 0;
+		
+	} else if( 	obj1 && PyFloat_Check(obj1) &&
+				obj2 && PyFloat_Check(obj2)	   ){
+					
+		self->sa->setThickness(	PyFloat_AsDouble(obj1),
+								PyFloat_AsDouble(obj2) );
+		return 0;
+	}
+	
+	return -1;
 }
 
+int StrokeAttribute_setVisible( BPy_StrokeAttribute *self, PyObject *args ) {
+	int i = 0;
 
- PyObject *_wrap_StrokeAttribute_getThicknessR(PyObject *self , PyObject *args) {
+	if(!( PyArg_ParseTuple(args, "i", &i) )) {
+		cout << "ERROR: StrokeAttribute_setVisible" << endl;
+		return -1;
+	}
+
+	self->sa->setVisible( i );
+	return 0;
 }
 
+int StrokeAttribute_setAttributeReal( BPy_StrokeAttribute *self, PyObject *args ) {
+	char *s = 0;
+	double d = 0;
 
- PyObject *_wrap_StrokeAttribute_getThicknessL(PyObject *self , PyObject *args) {
+	if(!( PyArg_ParseTuple(args, "sd", &s, &d) )) {
+		cout << "ERROR: StrokeAttribute_setAttributeReal" << endl;
+		return -1;
+	}
+
+	self->sa->setAttributeReal( s, d );
+	return 0;
 }
 
+int StrokeAttribute_setAttributeVec2f( BPy_StrokeAttribute *self, PyObject *args ) {
+	char *s;
+	PyObject *obj = 0;
 
- PyObject *_wrap_StrokeAttribute_getThicknessRL(PyObject *self , PyObject *args) {
+	if(!( PyArg_ParseTuple(args, "sO", &s, &obj) )) {
+		cout << "ERROR: StrokeAttribute_setAttributeVec2f" << endl;
+		return -1;
+	}
+
+	if( PyList_Check(obj) && PyList_Size(obj) > 1) {
+
+		Vec2f v( 	PyFloat_AsDouble( PyList_GetItem(obj, 0) ),
+					PyFloat_AsDouble( PyList_GetItem(obj, 1) )  );
+
+		self->sa->setAttributeVec2f( s, v );
+		return 0;
+		
+	}
+	
+	return -1;
 }
 
+int StrokeAttribute_setAttributeVec3f( BPy_StrokeAttribute *self, PyObject *args ) {
+	char *s;
+	PyObject *obj = 0;
 
- PyObject *_wrap_StrokeAttribute_isVisible(PyObject *self , PyObject *args) {
+	if(!( PyArg_ParseTuple(args, "sO", &s, &obj) )) {
+		cout << "ERROR: StrokeAttribute_setAttributeVec3f" << endl;
+		return -1;
+	}
+
+	if( PyList_Check(obj)  && PyList_Size(obj) > 2 ) {
+
+		Vec3f v( 	PyFloat_AsDouble( PyList_GetItem(obj, 0) ),
+					PyFloat_AsDouble( PyList_GetItem(obj, 1) ),
+					PyFloat_AsDouble( PyList_GetItem(obj, 2) )  );
+
+		self->sa->setAttributeVec3f( s, v );
+		return 0;
+
+	}
+
+	return -1;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_StrokeAttribute_getAttributeReal(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_StrokeAttribute_getAttributeVec2f(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeAttribute_getAttributeVec3f(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeAttribute_isAttributeAvailableReal(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeAttribute_isAttributeAvailableVec2f(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeAttribute_isAttributeAvailableVec3f(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeAttribute_setColor__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeAttribute_setColor__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeAttribute_setColor(PyObject *self, PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeAttribute_setAlpha(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeAttribute_setThickness__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeAttribute_setThickness__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeAttribute_setThickness(PyObject *self, PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeAttribute_SetVisible(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeAttribute_setAttributeReal(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeAttribute_setAttributeVec2f(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeAttribute_setAttributeVec3f(PyObject *self , PyObject *args) {
-}
-
+#endif
 
diff --git a/source/blender/freestyle/intern/python/StrokeAttribute.h b/source/blender/freestyle/intern/python/StrokeAttribute.h
new file mode 100644
index 00000000000..a0828e4f668
--- /dev/null
+++ b/source/blender/freestyle/intern/python/StrokeAttribute.h
@@ -0,0 +1,34 @@
+#ifndef FREESTYLE_PYTHON_STROKEATTRIBUTE_H
+#define FREESTYLE_PYTHON_STROKEATTRIBUTE_H
+
+#include "../stroke/Stroke.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject StrokeAttribute_Type;
+
+#define BPy_StrokeAttribute_Check(v)	(( (PyObject *) v)->ob_type == &StrokeAttribute_Type)
+
+/*---------------------------Python BPy_StrokeAttribute structure definition----------*/
+typedef struct {
+	PyObject_HEAD
+	StrokeAttribute *sa;
+} BPy_StrokeAttribute;
+
+/*---------------------------Python BPy_StrokeAttribute visible prototypes-----------*/
+
+PyMODINIT_FUNC StrokeAttribute_Init( PyObject *module );
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_STROKEATTRIBUTE_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D.h
index 365b340d96c..8f1935871ca 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D.h
@@ -13,8 +13,7 @@ extern "C" {
 
 extern PyTypeObject UnaryFunction0D_Type;
 
-#define BPy_UnaryFunction0D_Check(v) \
-    ((v)->ob_type == &UnaryFunction0D_Type)
+#define BPy_UnaryFunction0D_Check(v)	(( (PyObject *) v)->ob_type == &UnaryFunction0D_Type)
 
 /*---------------------------Python BPy_UnaryFunction0D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D.h
index 2ad187ca81d..4c509f50b85 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D.h
@@ -13,8 +13,7 @@ extern "C" {
 
 extern PyTypeObject UnaryFunction1D_Type;
 
-#define BPy_UnaryFunction1D_Check(v) \
-    ((v)->ob_type == &UnaryFunction1D_Type)
+#define BPy_UnaryFunction1D_Check(v)	(( (PyObject *) v)->ob_type == &UnaryFunction1D_Type)
 
 /*---------------------------Python BPy_UnaryFunction1D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate0D.h b/source/blender/freestyle/intern/python/UnaryPredicate0D.h
index c8b9008380a..1f72ba5e86b 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate0D.h
+++ b/source/blender/freestyle/intern/python/UnaryPredicate0D.h
@@ -13,8 +13,7 @@ extern "C" {
 
 extern PyTypeObject UnaryPredicate0D_Type;
 
-#define BPy_UnaryPredicate0D_Check(v) \
-    ((v)->ob_type == &UnaryPredicate0D_Type)
+#define BPy_UnaryPredicate0D_Check(v)	(( (PyObject *) v)->ob_type == &UnaryPredicate0D_Type)
 
 /*---------------------------Python BPy_UnaryPredicate0D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D.h
index 8bb33782133..509d81f6937 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D.h
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D.h
@@ -13,8 +13,7 @@ extern "C" {
 
 extern PyTypeObject UnaryPredicate1D_Type;
 
-#define BPy_UnaryPredicate1D_Check(v) \
-    ((v)->ob_type == &UnaryPredicate1D_Type)
+#define BPy_UnaryPredicate1D_Check(v)	(( (PyObject *) v)->ob_type == &UnaryPredicate1D_Type)
 
 /*---------------------------Python BPy_UnaryPredicate1D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/rendering/GLDebugRenderer.h b/source/blender/freestyle/intern/rendering/GLDebugRenderer.h
index abf76d079da..e0f97249645 100755
--- a/source/blender/freestyle/intern/rendering/GLDebugRenderer.h
+++ b/source/blender/freestyle/intern/rendering/GLDebugRenderer.h
@@ -46,7 +46,7 @@ public:
 
   inline GLDebugRenderer() : GLRenderer() {
     _bboxSize = 2.0;
-    SetMaxValue(&_minEdgeSize);
+    setMaxValue(&_minEdgeSize);
     _SelectedFEdge = 0;
   }
 
@@ -84,9 +84,9 @@ public:
    *  iBBoxSize
    *    The size of the scene bounding box.
    */
-  inline void ReInit(real iBBoxSize) {_bboxSize = iBBoxSize; SetMaxValue(&_minEdgeSize);}
+  inline void ReInit(real iBBoxSize) {_bboxSize = iBBoxSize; setMaxValue(&_minEdgeSize);}
 
-  inline void SetSelectedFEdge(FEdge *iFEdge) {_SelectedFEdge = iFEdge;}
+  inline void setSelectedFEdge(FEdge *iFEdge) {_SelectedFEdge = iFEdge;}
   inline FEdge * selectedFEdge() {return _SelectedFEdge;}
 
 protected:
@@ -170,8 +170,8 @@ protected:
 
 private:
 
-  inline void SetMaxValue(float *oValue) {*oValue = FLT_MAX;}
-  inline void SetMaxValue(real *oValue) {*oValue = DBL_MAX;}
+  inline void setMaxValue(float *oValue) {*oValue = FLT_MAX;}
+  inline void setMaxValue(real *oValue) {*oValue = DBL_MAX;}
 
   mutable real _bboxSize; 
   mutable real _minEdgeSize;
diff --git a/source/blender/freestyle/intern/rendering/GLRenderer.cpp b/source/blender/freestyle/intern/rendering/GLRenderer.cpp
index 016b159da5c..45693413ace 100755
--- a/source/blender/freestyle/intern/rendering/GLRenderer.cpp
+++ b/source/blender/freestyle/intern/rendering/GLRenderer.cpp
@@ -93,7 +93,7 @@ void GLRenderer::visitIndexedFaceSet(IndexedFaceSet& ifs)
         pti += numVertexPerFace[fIndex];
   }
   //glEndList();
-  //ifs.SetDisplayList(dl);
+  //ifs.setDisplayList(dl);
 }
 
 void GLRenderer::visitNodeTransform(NodeTransform& tn) {
diff --git a/source/blender/freestyle/intern/scene_graph/DrawingStyle.h b/source/blender/freestyle/intern/scene_graph/DrawingStyle.h
index e2be6fa8264..58dcf4fede9 100755
--- a/source/blender/freestyle/intern/scene_graph/DrawingStyle.h
+++ b/source/blender/freestyle/intern/scene_graph/DrawingStyle.h
@@ -44,10 +44,10 @@ public:
   /*! operators */
   inline DrawingStyle& operator=(const DrawingStyle& ds);
   
-  inline void SetStyle(const STYLE iStyle) {Style = iStyle;}
-  inline void SetLineWidth(const float iLineWidth) {LineWidth = iLineWidth;}
-  inline void SetPointSize(const float iPointSize) {PointSize = iPointSize;}
-  inline void SetLightingEnabled(const bool on) {LightingEnabled = on;}
+  inline void setStyle(const STYLE iStyle) {Style = iStyle;}
+  inline void setLineWidth(const float iLineWidth) {LineWidth = iLineWidth;}
+  inline void setPointSize(const float iPointSize) {PointSize = iPointSize;}
+  inline void setLightingEnabled(const bool on) {LightingEnabled = on;}
 
   inline STYLE style() const {return Style;}
   inline float lineWidth() const {return LineWidth;}
diff --git a/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.cpp b/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.cpp
index ec3d3ad748c..2604484ecd7 100755
--- a/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.cpp
+++ b/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.cpp
@@ -317,5 +317,5 @@ void IndexedFaceSet::ComputeBBox()
     v++;
   }
 
-  SetBBox(BBox<Vec3r>(Vec3r(XMin, YMin, ZMin), Vec3r(XMax, YMax, ZMax)));
+  setBBox(BBox<Vec3r>(Vec3r(XMin, YMin, ZMin), Vec3r(XMax, YMax, ZMax)));
 }
diff --git a/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h b/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h
index c6951942dbb..ce0afcd2fd6 100755
--- a/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h
+++ b/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h
@@ -166,7 +166,7 @@ public:
   virtual void ComputeBBox();
 
   /*! modifiers */
-  inline void SetDisplayList(unsigned int index) {_displayList = index;}
+  inline void setDisplayList(unsigned int index) {_displayList = index;}
 
   /*! Accessors */
   virtual const real * vertices() const {return _Vertices;}
diff --git a/source/blender/freestyle/intern/scene_graph/LineRep.cpp b/source/blender/freestyle/intern/scene_graph/LineRep.cpp
index 9dec2ec803f..504db06acf4 100755
--- a/source/blender/freestyle/intern/scene_graph/LineRep.cpp
+++ b/source/blender/freestyle/intern/scene_graph/LineRep.cpp
@@ -54,5 +54,5 @@ void LineRep::ComputeBBox()
       ZMin = (*v)[2];
   }
 
-  SetBBox(BBox<Vec3r>(Vec3r(XMin, YMin, ZMin), Vec3r(XMax, YMax, ZMax)));
+  setBBox(BBox<Vec3r>(Vec3r(XMin, YMin, ZMin), Vec3r(XMax, YMax, ZMax)));
 }
diff --git a/source/blender/freestyle/intern/scene_graph/LineRep.h b/source/blender/freestyle/intern/scene_graph/LineRep.h
index 1bbba130ba3..232557af857 100755
--- a/source/blender/freestyle/intern/scene_graph/LineRep.h
+++ b/source/blender/freestyle/intern/scene_graph/LineRep.h
@@ -55,7 +55,7 @@ public:
   inline LineRep(const Vec3r& v1, const Vec3r& v2)
     : Rep()
   {
-    SetStyle(LINES);
+    setStyle(LINES);
     AddVertex(v1);
     AddVertex(v2);
     _width = 0.f;
@@ -66,7 +66,7 @@ public:
     : Rep()
   {
     _vertices = vertices;
-    SetStyle(LINE_STRIP);
+    setStyle(LINE_STRIP);
     _width = 0.f;
   }
 
@@ -80,7 +80,7 @@ public:
     {
       _vertices.push_back(*v);
     }
-    SetStyle(LINE_STRIP);
+    setStyle(LINE_STRIP);
     _width = 0.f;
   }
 
@@ -95,9 +95,9 @@ public:
   inline float width() const {return _width;}
 
   /*! modifiers */
-  inline void SetStyle(const LINES_STYLE iStyle) {_Style = iStyle;}
+  inline void setStyle(const LINES_STYLE iStyle) {_Style = iStyle;}
   inline void AddVertex(const Vec3r& iVertex) {_vertices.push_back(iVertex);}
-  inline void SetVertices(const vector<Vec3r>& iVertices)
+  inline void setVertices(const vector<Vec3r>& iVertices)
   {
     if(0 != _vertices.size())
     {
@@ -110,7 +110,7 @@ public:
           _vertices.push_back(*v);
         }
   }
-  inline void SetWidth(float iWidth) {_width=iWidth;}
+  inline void setWidth(float iWidth) {_width=iWidth;}
 
   /*! Accept the corresponding visitor */
   virtual void accept(SceneVisitor& v) {
diff --git a/source/blender/freestyle/intern/scene_graph/Material.h b/source/blender/freestyle/intern/scene_graph/Material.h
index 09557ad3473..64ae526ccb0 100755
--- a/source/blender/freestyle/intern/scene_graph/Material.h
+++ b/source/blender/freestyle/intern/scene_graph/Material.h
@@ -120,7 +120,7 @@ public:
    *    \param a
    *      Alpha component
    */
-  inline void SetDiffuse(const float r, const float g, const float b, const float a);
+  inline void setDiffuse(const float r, const float g, const float b, const float a);
   /*! Sets the specular color.
    *    \param r
    *      Red component
@@ -131,7 +131,7 @@ public:
    *    \param a
    *      Alpha component
    */
-  inline void SetSpecular(const float r, const float g, const float b, const float a);
+  inline void setSpecular(const float r, const float g, const float b, const float a);
   /*! Sets the ambiant color.
    *    \param r
    *      Red component
@@ -142,7 +142,7 @@ public:
    *    \param a
    *      Alpha component
    */
-  inline void SetAmbient(const float r, const float g, const float b, const float a);
+  inline void setAmbient(const float r, const float g, const float b, const float a);
 
   /*! Sets the emissive color.
    *    \param r
@@ -154,13 +154,13 @@ public:
    *    \param a
    *      Alpha component
    */
-  inline void SetEmission(const float r, const float g, const float b, const float a);
+  inline void setEmission(const float r, const float g, const float b, const float a);
 
   /*! Sets the shininess.
    *    \param s
    *      Shininess
    */
-  inline void SetShininess(const float s);
+  inline void setShininess(const float s);
 
   /* operators */
   inline Material& operator=(const Material& m);
@@ -225,7 +225,7 @@ Material::Material(const Material& m)
   Shininess = m.shininess();
 }
 
-void Material::SetDiffuse(const float r, const float g, const float b, const float a)
+void Material::setDiffuse(const float r, const float g, const float b, const float a)
 {
   Diffuse[0] = r;
   Diffuse[1] = g;
@@ -233,7 +233,7 @@ void Material::SetDiffuse(const float r, const float g, const float b, const flo
   Diffuse[3] = a;
 }
 
-void Material::SetSpecular(const float r, const float g, const float b, const float a)
+void Material::setSpecular(const float r, const float g, const float b, const float a)
 {
   Specular[0] = r;
   Specular[1] = g;
@@ -241,7 +241,7 @@ void Material::SetSpecular(const float r, const float g, const float b, const fl
   Specular[3] = a;
 }
   
-void Material::SetAmbient(const float r, const float g, const float b, const float a)
+void Material::setAmbient(const float r, const float g, const float b, const float a)
 {
   Ambient[0] = r;
   Ambient[1] = g;
@@ -249,7 +249,7 @@ void Material::SetAmbient(const float r, const float g, const float b, const flo
   Ambient[3] = a;
 }
 
-void Material::SetEmission(const float r, const float g, const float b, const float a)
+void Material::setEmission(const float r, const float g, const float b, const float a)
 {
   Emission[0] = r;
   Emission[1] = g;
@@ -257,7 +257,7 @@ void Material::SetEmission(const float r, const float g, const float b, const fl
   Emission[3] = a;
 }
 
-void Material::SetShininess(const float s)
+void Material::setShininess(const float s)
 {
   Shininess = s;
 }
diff --git a/source/blender/freestyle/intern/scene_graph/MaxFileLoader.cpp b/source/blender/freestyle/intern/scene_graph/MaxFileLoader.cpp
index 515874c4021..a6d3b8f8721 100755
--- a/source/blender/freestyle/intern/scene_graph/MaxFileLoader.cpp
+++ b/source/blender/freestyle/intern/scene_graph/MaxFileLoader.cpp
@@ -58,7 +58,7 @@ MaxFileLoader::~MaxFileLoader()
   _Scene = NULL;
 }
 
-void MaxFileLoader::SetFileName(const char *iFileName)
+void MaxFileLoader::setFileName(const char *iFileName)
 {
   if(NULL != _FileName)
     delete [] _FileName;
@@ -224,17 +224,17 @@ void MaxFileLoader::RenderNode(Lib3dsNode *iNode)
 
         if (mat) 
         {
-          tmpMat.SetDiffuse(mat->diffuse[0], mat->diffuse[1], mat->diffuse[2], mat->diffuse[3]);
-          tmpMat.SetSpecular(mat->specular[0], mat->specular[1], mat->specular[2], mat->specular[3]);
+          tmpMat.setDiffuse(mat->diffuse[0], mat->diffuse[1], mat->diffuse[2], mat->diffuse[3]);
+          tmpMat.setSpecular(mat->specular[0], mat->specular[1], mat->specular[2], mat->specular[3]);
           float s = (float)pow(2.0, 10.0*mat->shininess);
           if(s > 128.f)
             s = 128.f;
-          tmpMat.SetShininess(s);
+          tmpMat.setShininess(s);
         }
         
         if(meshMaterials.empty()){
           meshMaterials.push_back(tmpMat);
-          shape->SetMaterial(tmpMat);
+          shape->setMaterial(tmpMat);
         }else{
           // find if the material is aleady in the list
           unsigned i=0;
@@ -357,12 +357,12 @@ void MaxFileLoader::RenderNode(Lib3dsNode *iNode)
                                0,0,
                                0);
 	  // sets the id of the rep
-	  rep->SetId(Id(iNode->node_id, 0));
+	  rep->setId(Id(iNode->node_id, 0));
 
 
       const BBox<Vec3r> bbox = BBox<Vec3r>(Vec3r(minBBox[0], minBBox[1], minBBox[2]), 
                                            Vec3r(maxBBox[0], maxBBox[1], maxBBox[2]));
-      rep->SetBBox(bbox);
+      rep->setBBox(bbox);
       shape->AddRep(rep);
     }
 
@@ -376,7 +376,7 @@ void MaxFileLoader::RenderNode(Lib3dsNode *iNode)
           for(unsigned j=0; j<4; j++)
             M44f(i,j) = iNode->matrix[j][i];
           
-          currentMesh->SetMatrix(Matrix44r(M44f));
+          currentMesh->setMatrix(Matrix44r(M44f));
           currentMesh->Translate(-d->pivot[0], -d->pivot[1], -d->pivot[2]);
       }
       shape = (NodeShape*)iNode->user.d;
diff --git a/source/blender/freestyle/intern/scene_graph/MaxFileLoader.h b/source/blender/freestyle/intern/scene_graph/MaxFileLoader.h
index 179f9a016df..ce71ab4be3b 100755
--- a/source/blender/freestyle/intern/scene_graph/MaxFileLoader.h
+++ b/source/blender/freestyle/intern/scene_graph/MaxFileLoader.h
@@ -70,7 +70,7 @@ public:
   virtual ~MaxFileLoader();
 
   /*! Sets the name of the 3dsMax file to load */
-  void SetFileName(const char *iFileName);
+  void setFileName(const char *iFileName);
 
   /*! Loads the 3D scene and returns 
    *  a pointer to the scene root node
diff --git a/source/blender/freestyle/intern/scene_graph/Node.h b/source/blender/freestyle/intern/scene_graph/Node.h
index 1726dd3c853..41afaa353be 100755
--- a/source/blender/freestyle/intern/scene_graph/Node.h
+++ b/source/blender/freestyle/intern/scene_graph/Node.h
@@ -68,7 +68,7 @@ public:
   virtual const BBox<Vec3r>& bbox() const {return _BBox;}
 
   /*! Sets the Node bounding box */
-  virtual void SetBBox(const BBox<Vec3r>& iBox) {_BBox = iBox;}
+  virtual void setBBox(const BBox<Vec3r>& iBox) {_BBox = iBox;}
 
   /*! Makes the union of _BBox and iBox */
   virtual void AddBBox(const BBox<Vec3r>& iBox) 
diff --git a/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h b/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h
index 18442ae10f9..012f963ea8c 100755
--- a/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h
+++ b/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h
@@ -43,16 +43,16 @@ public:
   virtual ~NodeDrawingStyle() {}
 
   inline const DrawingStyle& drawingStyle() const { return _DrawingStyle; }
-  inline void SetDrawingStyle(const DrawingStyle& iDrawingStyle) { _DrawingStyle = iDrawingStyle; }
+  inline void setDrawingStyle(const DrawingStyle& iDrawingStyle) { _DrawingStyle = iDrawingStyle; }
 
   /*! Sets the style. Must be one of FILLED, LINES, POINTS, INVISIBLE. */
-  inline void SetStyle(const DrawingStyle::STYLE iStyle) { _DrawingStyle.SetStyle(iStyle); }
+  inline void setStyle(const DrawingStyle::STYLE iStyle) { _DrawingStyle.setStyle(iStyle); }
   /*! Sets the line width in the LINES style case */
-  inline void SetLineWidth(const float iLineWidth) { _DrawingStyle.SetLineWidth(iLineWidth); }
+  inline void setLineWidth(const float iLineWidth) { _DrawingStyle.setLineWidth(iLineWidth); }
   /*! Sets the Point size in the POINTS style case */
-  inline void SetPointSize(const float iPointSize) { _DrawingStyle.SetPointSize(iPointSize); }
+  inline void setPointSize(const float iPointSize) { _DrawingStyle.setPointSize(iPointSize); }
   /*! Enables or disables the lighting. TRUE = enable */
-  inline void SetLightingEnabled(const bool iEnableLighting) { _DrawingStyle.SetLightingEnabled(iEnableLighting); }
+  inline void setLightingEnabled(const bool iEnableLighting) { _DrawingStyle.setLightingEnabled(iEnableLighting); }
 
   /*! Accept the corresponding visitor */
   virtual void accept(SceneVisitor& v);
diff --git a/source/blender/freestyle/intern/scene_graph/NodeShape.h b/source/blender/freestyle/intern/scene_graph/NodeShape.h
index 3e963beec38..34b049bfeb5 100755
--- a/source/blender/freestyle/intern/scene_graph/NodeShape.h
+++ b/source/blender/freestyle/intern/scene_graph/NodeShape.h
@@ -71,7 +71,7 @@ public:
   virtual void accept(SceneVisitor& v);
 
   /*! Sets the shape material */
-  inline void SetMaterial(const Material& iMaterial) { _Material = iMaterial; }
+  inline void setMaterial(const Material& iMaterial) { _Material = iMaterial; }
 
   /*! accessors */
   /*! returns the shape's material */
diff --git a/source/blender/freestyle/intern/scene_graph/NodeTransform.cpp b/source/blender/freestyle/intern/scene_graph/NodeTransform.cpp
index 64e9b7a4dd6..8f706c78259 100755
--- a/source/blender/freestyle/intern/scene_graph/NodeTransform.cpp
+++ b/source/blender/freestyle/intern/scene_graph/NodeTransform.cpp
@@ -91,7 +91,7 @@ void NodeTransform::MultiplyMatrix(const Matrix44r &iMatrix)
   _Matrix = mat_tmp * iMatrix;
 }
 
-void NodeTransform::SetMatrix(const Matrix44r &iMatrix)
+void NodeTransform::setMatrix(const Matrix44r &iMatrix)
 {
   _Matrix = iMatrix;
   if(isScaled(iMatrix))
diff --git a/source/blender/freestyle/intern/scene_graph/NodeTransform.h b/source/blender/freestyle/intern/scene_graph/NodeTransform.h
index 3929c60996b..e75132466f0 100755
--- a/source/blender/freestyle/intern/scene_graph/NodeTransform.h
+++ b/source/blender/freestyle/intern/scene_graph/NodeTransform.h
@@ -77,7 +77,7 @@ public:
   void MultiplyMatrix(const Matrix44r &iMatrix);
 
   /*! Sets the current matrix to iMatrix */
-  void SetMatrix(const Matrix44r &iMatrix);
+  void setMatrix(const Matrix44r &iMatrix);
 
   /*! Accept the corresponding visitor */
   virtual void accept(SceneVisitor& v);
diff --git a/source/blender/freestyle/intern/scene_graph/Rep.h b/source/blender/freestyle/intern/scene_graph/Rep.h
index 6ccc2152c48..ee5f2942abf 100755
--- a/source/blender/freestyle/intern/scene_graph/Rep.h
+++ b/source/blender/freestyle/intern/scene_graph/Rep.h
@@ -111,9 +111,9 @@ public:
   inline const Material * material() const {return _Material;}
 
   /*! Sets the Rep bounding box */
-  virtual void SetBBox(const BBox<Vec3r>& iBox) {_BBox = iBox;}
-  inline void SetId(const Id& id) {_Id = id;}
-  inline void SetMaterial(const Material& iMaterial) 
+  virtual void setBBox(const BBox<Vec3r>& iBox) {_BBox = iBox;}
+  inline void setId(const Id& id) {_Id = id;}
+  inline void setMaterial(const Material& iMaterial) 
   {
     _Material = new Material(iMaterial);
   }
diff --git a/source/blender/freestyle/intern/scene_graph/TriangleRep.cpp b/source/blender/freestyle/intern/scene_graph/TriangleRep.cpp
index 215124b0676..f73a8498714 100755
--- a/source/blender/freestyle/intern/scene_graph/TriangleRep.cpp
+++ b/source/blender/freestyle/intern/scene_graph/TriangleRep.cpp
@@ -55,5 +55,5 @@ void TriangleRep::ComputeBBox()
 
   }
 
-  SetBBox(BBox<Vec3r>(Vec3r(XMin, YMin, ZMin), Vec3r(XMax, YMax, ZMax)));
+  setBBox(BBox<Vec3r>(Vec3r(XMin, YMin, ZMin), Vec3r(XMax, YMax, ZMax)));
 }
diff --git a/source/blender/freestyle/intern/scene_graph/TriangleRep.h b/source/blender/freestyle/intern/scene_graph/TriangleRep.h
index 20df12cfd8f..9d986857060 100755
--- a/source/blender/freestyle/intern/scene_graph/TriangleRep.h
+++ b/source/blender/freestyle/intern/scene_graph/TriangleRep.h
@@ -85,11 +85,11 @@ public:
   inline const Vec3r& vertex(int index) const {return _vertices[index];}
   inline const Vec3r& color(int index) const {return _colors[index];}
   /*! modifiers */
-  inline void SetStyle(const TRIANGLE_STYLE iStyle) {_Style = iStyle;}
-  inline void SetVertex(int index, const Vec3r& iVertex) {_vertices[index] = iVertex;}
-  inline void SetColor(int index, const Vec3r& iColor) {_colors[index] = iColor;}
-  inline void SetVertices(const Vec3r& v0, const Vec3r& v1, const Vec3r& v2) {_vertices[0] = v0; _vertices[1] = v1; _vertices[2] = v2;}
-  inline void SetColors(const Vec3r& c0, const Vec3r& c1, const Vec3r& c2) {_colors[0] = c0; _colors[1] = c1; _colors[2] = c2;}
+  inline void setStyle(const TRIANGLE_STYLE iStyle) {_Style = iStyle;}
+  inline void setVertex(int index, const Vec3r& iVertex) {_vertices[index] = iVertex;}
+  inline void setColor(int index, const Vec3r& iColor) {_colors[index] = iColor;}
+  inline void setVertices(const Vec3r& v0, const Vec3r& v1, const Vec3r& v2) {_vertices[0] = v0; _vertices[1] = v1; _vertices[2] = v2;}
+  inline void setColors(const Vec3r& c0, const Vec3r& c1, const Vec3r& c2) {_colors[0] = c0; _colors[1] = c1; _colors[2] = c2;}
 
   /*! Accept the corresponding visitor */
   virtual void accept(SceneVisitor& v) {
diff --git a/source/blender/freestyle/intern/scene_graph/VertexRep.cpp b/source/blender/freestyle/intern/scene_graph/VertexRep.cpp
index 1ecb5f141e1..e4f774bfb84 100755
--- a/source/blender/freestyle/intern/scene_graph/VertexRep.cpp
+++ b/source/blender/freestyle/intern/scene_graph/VertexRep.cpp
@@ -24,6 +24,6 @@
 void VertexRep::ComputeBBox()
 {
 
-  SetBBox(BBox<Vec3r>(Vec3r(_coordinates[0], _coordinates[1], _coordinates[2]), 
+  setBBox(BBox<Vec3r>(Vec3r(_coordinates[0], _coordinates[1], _coordinates[2]), 
                       Vec3r(_coordinates[0], _coordinates[1], _coordinates[2])));
 }
diff --git a/source/blender/freestyle/intern/scene_graph/VertexRep.h b/source/blender/freestyle/intern/scene_graph/VertexRep.h
index 9dce7fbbe9c..9e31b4b8ef9 100755
--- a/source/blender/freestyle/intern/scene_graph/VertexRep.h
+++ b/source/blender/freestyle/intern/scene_graph/VertexRep.h
@@ -71,12 +71,12 @@ public:
   inline float pointSize() const {return _PointSize;}
 
   /*! modifiers */
-  inline void SetVid(int id) {_vid = id;}
+  inline void setVid(int id) {_vid = id;}
   inline void setX(real x) {_coordinates[0] = x;}
   inline void setY(real y) {_coordinates[1] = y;}
   inline void setZ(real z) {_coordinates[2] = z;}
-  inline void SetCoordinates(real x, real y, real z) {_coordinates[0] = x;_coordinates[1] = y; _coordinates[2] = z;}
-  inline void SetPointSize(float iPointSize) {_PointSize = iPointSize;}
+  inline void setCoordinates(real x, real y, real z) {_coordinates[0] = x;_coordinates[1] = y; _coordinates[2] = z;}
+  inline void setPointSize(float iPointSize) {_PointSize = iPointSize;}
 
 private:
   int _vid; // vertex id
diff --git a/source/blender/freestyle/intern/stroke/AdvancedFunctions0D.h b/source/blender/freestyle/intern/stroke/AdvancedFunctions0D.h
index d92575cf110..9eee6714b09 100755
--- a/source/blender/freestyle/intern/stroke/AdvancedFunctions0D.h
+++ b/source/blender/freestyle/intern/stroke/AdvancedFunctions0D.h
@@ -59,7 +59,7 @@ namespace Functions0D {
      *    value. (the larger, the smoother)
      */
     DensityF0D(double sigma = 2) : UnaryFunction0D<double>() {
-      _filter.SetSigma((float)sigma);
+      _filter.setSigma((float)sigma);
     }
     /*! Returns the string "DensityF0D"*/
     string getName() const {
@@ -87,7 +87,7 @@ namespace Functions0D {
      *   will be used.
      */
     LocalAverageDepthF0D(real maskSize=5.f) : UnaryFunction0D<double>() {
-      _filter.SetSigma((float)maskSize/2.f);
+      _filter.setSigma((float)maskSize/2.f);
     }
     /*! Returns the string "LocalAverageDepthF0D"*/
     string getName() const {
diff --git a/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp b/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp
index b1c5317c5f1..653e0158538 100755
--- a/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp
+++ b/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp
@@ -153,7 +153,7 @@ SpatialNoiseShader::shade(Stroke &ioStroke) const
       Vec2r noise(-ori2d[1]*_amount*bruit,
 		  ori2d[0]*_amount*bruit);
 
-      sv->SetPoint(p[0]+noise[0], p[1]+noise[1]);
+      sv->setPoint(p[0]+noise[0], p[1]+noise[1]);
       p0=p;
 
       ++v;
@@ -351,7 +351,7 @@ Smoother::copyVertices ()
       const Vec2r p1(_vertex[i]);
       Vec2r p(p0 + _carricatureFactor * (p1 - p0));
 
-      (v)->SetPoint(p[0], p[1]);
+      (v)->setPoint(p[0], p[1]);
       i++;
     }
 
diff --git a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp
index 0022a36aee2..05cc13fd96c 100755
--- a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp
+++ b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp
@@ -520,9 +520,9 @@ namespace StrokeShaders {
       break;
     }
     unsigned int texId = instance->getBrushTextureIndex(pathname, mediumType);
-    stroke.SetMediumType(mediumType);
-    stroke.SetTips(hasTips);
-    stroke.SetTextureId(texId);
+    stroke.setMediumType(mediumType);
+    stroke.setTips(hasTips);
+    stroke.setTextureId(texId);
   }
 
   // FIXME
@@ -533,9 +533,9 @@ namespace StrokeShaders {
       return;
     string pathname = TextureManager::Options::getBrushesPath() + "/" + _texturePath;
     unsigned int texId = instance->getBrushTextureIndex(pathname, _mediumType);
-    stroke.SetMediumType(_mediumType);
-    stroke.SetTips(_tips);
-    stroke.SetTextureId(texId);
+    stroke.setMediumType(_mediumType);
+    stroke.setTips(_tips);
+    stroke.setTextureId(texId);
   }
 
   //
@@ -564,9 +564,9 @@ namespace StrokeShaders {
     dn.normalize();
 
     Vec2d newFirst(first+_amount*d1);
-    (v0)->SetPoint(newFirst[0], newFirst[1]);
+    (v0)->setPoint(newFirst[0], newFirst[1]);
     Vec2d newLast(last+_amount*dn);
-    (vn)->SetPoint(newLast[0], newLast[1]);
+    (vn)->setPoint(newLast[0], newLast[1]);
   }
 
   void SamplingShader::shade(Stroke& stroke) const
@@ -585,7 +585,7 @@ namespace StrokeShaders {
 	Vec2f n(fun(it));
 	sv = dynamic_cast<StrokeVertex*>(&(*it));
 	Vec2d newPoint(sv->x()+_amount*n.x(), sv->y()+_amount*n.y());
-	sv->SetPoint(newPoint[0], newPoint[1]);
+	sv->setPoint(newPoint[0], newPoint[1]);
 	++it;
       }
   }
@@ -686,8 +686,8 @@ namespace StrokeShaders {
 	((it!=itend) && (p!=pend));
 	++it)
       {
-	it->SetX(p->x());
-	it->SetY(p->y());
+	it->setX(p->x());
+	it->setY(p->y());
 	last = p;
 	++p;
 	++n;
@@ -695,8 +695,8 @@ namespace StrokeShaders {
     // nExtraVertex should stay unassigned
     for(int i=0; i< nExtraVertex; ++i)
       {
-	it->SetX(last->x());
-	it->SetY(last->y());
+	it->setX(last->x());
+	it->setY(last->y());
 	if(it.isEnd())
 	  cerr << "Warning: Problem encountered while creating B-spline" << endl;
 	++it;
@@ -810,8 +810,8 @@ namespace StrokeShaders {
 	((it!=itend) && (p!=pend));
 	++it)
       {
-	it->SetX(p->x());
-	it->SetY(p->y());
+	it->setX(p->x());
+	it->setY(p->y());
 	//      double x = p->x();
 	//      double y = p->y();
 	//      cout << "x = " << x << "-" << "y = " << y << endl;
@@ -859,7 +859,7 @@ namespace StrokeShaders {
     (it!=itend) && (a!=aend);
     ++it)
     {
-      (it)->SetAttribute(*a);
+      (it)->setAttribute(*a);
       if((index <= index1)||(index>index2))
         ++a;
       ++index;
@@ -894,7 +894,7 @@ namespace StrokeShaders {
 	float t = 4.f*(0.25f - (u-0.5)*(u-0.5));
 	float curvature_coeff = (M_PI-curv_fun(it))/M_PI;
 	Vec2d newPoint(sv->x()+curvature_coeff*t*_amount*n.x(), sv->y()+curvature_coeff*t*_amount*n.y());
-	sv->SetPoint(newPoint[0], newPoint[1]);
+	sv->setPoint(newPoint[0], newPoint[1]);
 	++it;
       }
   }
@@ -998,10 +998,10 @@ namespace StrokeShaders {
 	    v!=b;
 	    ++v)
 	  {
-	    v->SetPoint((*cp)->A.x()+v->u()*u.x()+n.x()*offset, (*cp)->A.y()+v->u()*u.y()+n.y()*offset);
+	    v->setPoint((*cp)->A.x()+v->u()*u.x()+n.x()*offset, (*cp)->A.y()+v->u()*u.y()+n.y()*offset);
 	  }
 	//    u.normalize();
-	//    (*a)->SetPoint((*a)->x()-u.x()*10, (*a)->y()-u.y()*10);
+	//    (*a)->setPoint((*a)->x()-u.x()*10, (*a)->y()-u.y()*10);
       }
 
     // delete stuff
@@ -1036,7 +1036,7 @@ namespace StrokeShaders {
 	v!=vend;
 	++v)
       {
-	v->SetPoint(piece.A.x()+v->u()*u.x()+n.x()*offset, piece.A.y()+v->u()*u.y()+n.y()*offset);
+	v->setPoint(piece.A.x()+v->u()*u.x()+n.x()*offset, piece.A.y()+v->u()*u.y()+n.y()*offset);
       }
   }
 
@@ -1101,7 +1101,7 @@ namespace StrokeShaders {
     //cout << "-----------------------------------------------" << endl;
     for(;(v!=vend)&&(a!=aend);++v,++a)
       {
-	v->SetAttribute(*a);
+	v->setAttribute(*a);
 	//cout << "thickness = " << (*a).getThickness()[0] << "-" << (*a).getThickness()[1] << endl;
       }
     // we're done!
diff --git a/source/blender/freestyle/intern/stroke/Canvas.cpp b/source/blender/freestyle/intern/stroke/Canvas.cpp
index b185bba92a0..bdca8f968fe 100755
--- a/source/blender/freestyle/intern/stroke/Canvas.cpp
+++ b/source/blender/freestyle/intern/stroke/Canvas.cpp
@@ -258,7 +258,7 @@ void Canvas::ReplaceStyleModule(unsigned index, StyleModule *iStyleModule)
     }
 }
 
-void Canvas::SetVisible(unsigned index, bool iVisible) {
+void Canvas::setVisible(unsigned index, bool iVisible) {
   _StyleModules[index]->setDisplayed(iVisible);
 }
  
diff --git a/source/blender/freestyle/intern/stroke/Canvas.h b/source/blender/freestyle/intern/stroke/Canvas.h
index cae50162933..549c6a97d55 100755
--- a/source/blender/freestyle/intern/stroke/Canvas.h
+++ b/source/blender/freestyle/intern/stroke/Canvas.h
@@ -177,16 +177,16 @@ public:
   virtual bool getRecordFlag() const {return false;}
 
   /*! modifiers */
-  inline void SetSelectedFEdge(FEdge *iFEdge) {_SelectedFEdge = iFEdge;}
+  inline void setSelectedFEdge(FEdge *iFEdge) {_SelectedFEdge = iFEdge;}
   /*! inserts a shader at pos index+1 */
   void InsertStyleModule(unsigned index, StyleModule *iStyleModule);
   void RemoveStyleModule(unsigned index);
   void SwapStyleModules(unsigned i1, unsigned i2);
   void ReplaceStyleModule(unsigned index, StyleModule *iStyleModule);
-  void SetVisible(unsigned index, bool iVisible) ;
-  //inline void SetDensityMap(InformationMap<RGBImage>* iMap) {_DensityMap = iMap;}
+  void setVisible(unsigned index, bool iVisible) ;
+  //inline void setDensityMap(InformationMap<RGBImage>* iMap) {_DensityMap = iMap;}
   inline void AddLayer(StrokeLayer *iLayer) {_Layers.push_back(iLayer);}
-  inline void SetCurrentPaperTextureIndex(int i) {_paperTextureIndex = i;}
+  inline void setCurrentPaperTextureIndex(int i) {_paperTextureIndex = i;}
   void changePaperTexture(bool increment=true) ;
   /*! enables/disables paper texture */
   inline void togglePaperTexture() {_drawPaper = !_drawPaper;}
diff --git a/source/blender/freestyle/intern/stroke/Curve.h b/source/blender/freestyle/intern/stroke/Curve.h
index 400f27e5d5a..7fbe7e701e9 100755
--- a/source/blender/freestyle/intern/stroke/Curve.h
+++ b/source/blender/freestyle/intern/stroke/Curve.h
@@ -218,14 +218,14 @@ public:
   /*! Sets the first SVertex upon which to build
    *  the CurvePoint.
    */
-  inline void SetA(SVertex *iA) {__A = iA;}
+  inline void setA(SVertex *iA) {__A = iA;}
   /*! Sets the second SVertex upon which to build
    *  the CurvePoint.
    */
-  inline void SetB(SVertex *iB) {__B = iB;}
+  inline void setB(SVertex *iB) {__B = iB;}
   /*! Sets the 2D interpolation parameter to use.
    */
-  inline void SetT2d(float t) {_t2d = t;}
+  inline void setT2d(float t) {_t2d = t;}
   //inline void SetT3d(float t) {_t3d = t;}
 
   /* Information access interface */
diff --git a/source/blender/freestyle/intern/stroke/Modifiers.h b/source/blender/freestyle/intern/stroke/Modifiers.h
index c3be65ffc89..21bebebc6f8 100755
--- a/source/blender/freestyle/intern/stroke/Modifiers.h
+++ b/source/blender/freestyle/intern/stroke/Modifiers.h
@@ -64,7 +64,7 @@ struct TimestampModifier : public EdgeModifier<Edge>
   virtual void operator()(Edge& iEdge) 
   {
     TimeStamp *timestamp = TimeStamp::instance();
-    iEdge.SetTimeStamp(timestamp->getTimeStamp());
+    iEdge.setTimeStamp(timestamp->getTimeStamp());
   }
 };
 
diff --git a/source/blender/freestyle/intern/stroke/Operators.cpp b/source/blender/freestyle/intern/stroke/Operators.cpp
index 8e34d9c5197..cfdd72ac839 100755
--- a/source/blender/freestyle/intern/stroke/Operators.cpp
+++ b/source/blender/freestyle/intern/stroke/Operators.cpp
@@ -756,7 +756,7 @@ void Operators::sort(BinaryPredicate1D& pred) {
 
 Stroke* createStroke(Interface1D& inter) {
   Stroke* stroke = new Stroke;
-  stroke->SetId(inter.getId());
+  stroke->setId(inter.getId());
 
   float currentCurvilignAbscissa = 0.f;
 
@@ -784,7 +784,7 @@ Stroke* createStroke(Interface1D& inter) {
     current = stroke_vertex->point2d();
     Vec3r vec_tmp(current - previous);
     currentCurvilignAbscissa += vec_tmp.norm();
-    stroke_vertex->SetCurvilinearAbscissa(currentCurvilignAbscissa);
+    stroke_vertex->setCurvilinearAbscissa(currentCurvilignAbscissa);
     stroke->push_back(stroke_vertex);
     previous = current;
     ++it;
@@ -805,10 +805,10 @@ Stroke* createStroke(Interface1D& inter) {
     current = stroke_vertex->point2d();
     Vec3r vec_tmp(current - previous);
     currentCurvilignAbscissa += vec_tmp.norm();
-    stroke_vertex->SetCurvilinearAbscissa(currentCurvilignAbscissa);
+    stroke_vertex->setCurvilinearAbscissa(currentCurvilignAbscissa);
     stroke->push_back(stroke_vertex);
   }
-  stroke->SetLength(currentCurvilignAbscissa);
+  stroke->setLength(currentCurvilignAbscissa);
   return stroke;
 }
 
diff --git a/source/blender/freestyle/intern/stroke/QInformationMap.h b/source/blender/freestyle/intern/stroke/QInformationMap.h
index 2542bdba147..ef068f15061 100755
--- a/source/blender/freestyle/intern/stroke/QInformationMap.h
+++ b/source/blender/freestyle/intern/stroke/QInformationMap.h
@@ -49,7 +49,7 @@ public:
   virtual void retrieveMeanAndVariance(int x, int y, float &oMean, float &oVariance) ;
 
   inline const QImage& map() const {return _map;}
-  inline void SetMap(const QImage& iMap, float iw, float ih) {_map = iMap.copy();_w=iw;_h=ih;}
+  inline void setMap(const QImage& iMap, float iw, float ih) {_map = iMap.copy();_w=iw;_h=ih;}
 
 protected:
   virtual float computeGaussian(int x, int y);
diff --git a/source/blender/freestyle/intern/stroke/Stroke.cpp b/source/blender/freestyle/intern/stroke/Stroke.cpp
index 7e7eb5ff3f0..c6b52358264 100755
--- a/source/blender/freestyle/intern/stroke/Stroke.cpp
+++ b/source/blender/freestyle/intern/stroke/Stroke.cpp
@@ -450,14 +450,14 @@ Stroke& Stroke::operator=(const Stroke& iBrother)
 }
 
 
-void Stroke::SetLength(float iLength)
+void Stroke::setLength(float iLength)
 {
   _Length = iLength;
   for(vertex_container::iterator v=_Vertices.begin(), vend=_Vertices.end();
   v!=vend;
   ++v)
   {
-    (*v)->SetStrokeLength(iLength);
+    (*v)->setStrokeLength(iLength);
   }
 }
 
@@ -635,7 +635,7 @@ void Stroke::Resample(float iSampling)
     while(t<limit)
     {
       newVertex = new StrokeVertex(&(*it),&(*next),t);
-      //newVertex->SetCurvilinearAbscissa(curvilinearLength);
+      //newVertex->setCurvilinearAbscissa(curvilinearLength);
       newVertices.push_back(newVertex);
       t = t + _sampling/norm_var;
     }
@@ -681,7 +681,7 @@ void Stroke::RemoveVertex(StrokeVertex *iVertex)
   {
     if(it != previous)
       curvabsc += ((*it)->point2d()-(*previous)->point2d()).norm();
-    (*it)->SetCurvilinearAbscissa(curvabsc);
+    (*it)->setCurvilinearAbscissa(curvabsc);
     previous = it;
   }
   _Length = curvabsc;
@@ -690,7 +690,7 @@ void Stroke::RemoveVertex(StrokeVertex *iVertex)
   (it!=itend);
   ++it)
   {
-    (*it)->SetStrokeLength(_Length);
+    (*it)->setStrokeLength(_Length);
   }
 }
 
@@ -710,7 +710,7 @@ void Stroke::InsertVertex(StrokeVertex *iVertex, StrokeInternal::StrokeVertexIte
   ++it)
   {
     curvabsc += ((*it)->point2d()-(*previous)->point2d()).norm();
-    (*it)->SetCurvilinearAbscissa(curvabsc);
+    (*it)->setCurvilinearAbscissa(curvabsc);
     previous = it;
   }
   _Length = curvabsc;
@@ -718,7 +718,7 @@ void Stroke::InsertVertex(StrokeVertex *iVertex, StrokeInternal::StrokeVertexIte
   (it!=itend);
   ++it)
   {
-    (*it)->SetStrokeLength(_Length);
+    (*it)->setStrokeLength(_Length);
   }
 }
 
diff --git a/source/blender/freestyle/intern/stroke/Stroke.h b/source/blender/freestyle/intern/stroke/Stroke.h
index a5cf51f8224..8e4e5e24a2c 100755
--- a/source/blender/freestyle/intern/stroke/Stroke.h
+++ b/source/blender/freestyle/intern/stroke/Stroke.h
@@ -152,7 +152,7 @@ public:
   bool isAttributeAvailableVec3f(const char *iName) const ;
   
   /* modifiers */
-  /*! Sets the attribute's color.
+  /*! sets the attribute's color.
    *    \param r
    *      The new R value.
    *    \param g
@@ -161,31 +161,31 @@ public:
    *      The new B value.
    */
   inline void setColor(float r, float g, float b) { _color[0]=r; _color[1]=g; _color[2]=b; }
-  /*! Sets the attribute's color.
+  /*! sets the attribute's color.
    *    \param iRGB
    *      The new RGB values.
    */
   inline void setColor(const Vec3f& iRGB) { _color[0]=iRGB[0]; _color[1]=iRGB[1]; _color[2]=iRGB[2]; }
-  /*! Sets the attribute's alpha value.
+  /*! sets the attribute's alpha value.
    *  \param alpha
    *    The new alpha value.
    */
   inline void setAlpha(float alpha) { _alpha = alpha; }
-  /*! Sets the attribute's thickness.
+  /*! sets the attribute's thickness.
    *  \param tr
    *    The thickness on the right of the vertex when following the stroke.
    *  \param tl
    *    The thickness on the left of the vertex when following the stroke.
    */
   inline void setThickness(float tr, float tl) { _thickness[0]=tr; _thickness[1]=tl; }
-  /*! Sets the attribute's thickness.
+  /*! sets the attribute's thickness.
    *  \param tRL
    *    The thickness on the right and on the left of the vertex when following the stroke.
    */
   inline void setThickness(const Vec2f& tRL) { _thickness[0]=tRL[0]; _thickness[1]=tRL[1]; }
 
-  /*! Sets the visible flag. True means visible. */
-  inline void SetVisible(bool iVisible){ _visible = iVisible; }
+  /*! sets the visible flag. True means visible. */
+  inline void setVisible(bool iVisible){ _visible = iVisible; }
 
   /*! Adds a user defined attribute of type real
    *  If there is no attribute of name iName, it is added.
@@ -295,24 +295,24 @@ public:
   inline float u() const {return _CurvilignAbscissa/_StrokeLength;}
 
   /* modifiers */
-  /*! Sets the 2D x value */
-  inline void SetX(real x) { _Point2d[0]=x; }
-  /*! Sets the 2D y value */
-  inline void SetY(real y) { _Point2d[1]=y; }
-  /*! Sets the 2D x and y values */
-  inline void SetPoint(real x, real y) { _Point2d[0]=x; _Point2d[1]=y;}
-  /*! Sets the 2D x and y values */
-  inline void SetPoint(const Vec2f& p) { _Point2d[0] = p[0];_Point2d[1] = p[1];}
+  /*! sets the 2D x value */
+  inline void setX(real x) { _Point2d[0]=x; }
+  /*! sets the 2D y value */
+  inline void setY(real y) { _Point2d[1]=y; }
+  /*! sets the 2D x and y values */
+  inline void setPoint(real x, real y) { _Point2d[0]=x; _Point2d[1]=y;}
+  /*! sets the 2D x and y values */
+  inline void setPoint(const Vec2f& p) { _Point2d[0] = p[0];_Point2d[1] = p[1];}
   /*! Returns a reference to the ith 2D point coordinate (i=0 or 1) */
   inline real& operator[](const int i) { return _Point2d[i]; }
-  /*! Sets the attribute. */
-  inline void SetAttribute(const StrokeAttribute& iAttribute) { _Attribute = iAttribute; }
-  /*! Sets the curvilinear abscissa of this StrokeVertex in the Stroke */
-  inline void SetCurvilinearAbscissa(float iAbscissa) {_CurvilignAbscissa = iAbscissa;}
-  /*! Sets the Stroke's length (it's only a value stored by the Stroke Vertex, it won't
+  /*! sets the attribute. */
+  inline void setAttribute(const StrokeAttribute& iAttribute) { _Attribute = iAttribute; }
+  /*! sets the curvilinear abscissa of this StrokeVertex in the Stroke */
+  inline void setCurvilinearAbscissa(float iAbscissa) {_CurvilignAbscissa = iAbscissa;}
+  /*! sets the Stroke's length (it's only a value stored by the Stroke Vertex, it won't
    *  change the real Stroke's length.)
    */
-  inline void SetStrokeLength(float iLength) {_StrokeLength = iLength;}
+  inline void setStrokeLength(float iLength) {_StrokeLength = iLength;}
   
   /* interface definition */
   /* inherited */  
@@ -502,26 +502,26 @@ public:
 
 
   /* modifiers */
-  /*! Sets the Id of the Stroke. */
-  inline void SetId(const Id& id) {_id = id;}
-  /*! Sets the 2D length of the Stroke. */
-  void SetLength(float iLength);
-  /*! Sets the medium type that must be used for this Stroke. */
-  inline void SetMediumType(MediumType iType) {_mediumType = iType;}
-  /*! Sets the texture id to be used to simulate the marks system for this Stroke. */
-  inline void SetTextureId(unsigned int id) {_textureId = id;}
-  /*! Sets the flag telling whether this stroke is using a texture with
+  /*! sets the Id of the Stroke. */
+  inline void setId(const Id& id) {_id = id;}
+  /*! sets the 2D length of the Stroke. */
+  void setLength(float iLength);
+  /*! sets the medium type that must be used for this Stroke. */
+  inline void setMediumType(MediumType iType) {_mediumType = iType;}
+  /*! sets the texture id to be used to simulate the marks system for this Stroke. */
+  inline void setTextureId(unsigned int id) {_textureId = id;}
+  /*! sets the flag telling whether this stroke is using a texture with
    *  tips or not.
    */
-  inline void SetTips(bool iTips) {_tips = iTips;}
+  inline void setTips(bool iTips) {_tips = iTips;}
   
   inline void push_back(StrokeVertex* iVertex) { _Vertices.push_back(iVertex); }
   inline void push_front(StrokeVertex* iVertex) { _Vertices.push_front(iVertex); }
   inline void AddViewEdge(ViewEdge *iViewEdge) {_ViewEdges.push_back(iViewEdge);}
-  inline void SetBeginningOrientation(const Vec2r& iOrientation) {_extremityOrientations[0] = iOrientation;}
-  inline void SetBeginningOrientation(real x, real y) {_extremityOrientations[0] = Vec2r(x,y);}
-  inline void SetEndingOrientation(const Vec2r& iOrientation) {_extremityOrientations[1] = iOrientation;}
-  inline void SetEndingOrientation(real x, real y) {_extremityOrientations[1] = Vec2r(x,y);}
+  inline void setBeginningOrientation(const Vec2r& iOrientation) {_extremityOrientations[0] = iOrientation;}
+  inline void setBeginningOrientation(real x, real y) {_extremityOrientations[0] = Vec2r(x,y);}
+  inline void setEndingOrientation(const Vec2r& iOrientation) {_extremityOrientations[1] = iOrientation;}
+  inline void setEndingOrientation(real x, real y) {_extremityOrientations[1] = Vec2r(x,y);}
 
   /* Information access interface */
   
diff --git a/source/blender/freestyle/intern/stroke/StrokeLayer.h b/source/blender/freestyle/intern/stroke/StrokeLayer.h
index b89b77a85a7..dbe9ea5a75c 100755
--- a/source/blender/freestyle/intern/stroke/StrokeLayer.h
+++ b/source/blender/freestyle/intern/stroke/StrokeLayer.h
@@ -67,7 +67,7 @@ public:
   inline bool empty() const {return _strokes.empty();}
 
   /*! modifiers */
-  inline void SetStrokes(stroke_container& iStrokes) {_strokes = iStrokes;}
+  inline void setStrokes(stroke_container& iStrokes) {_strokes = iStrokes;}
   inline void AddStroke(Stroke *iStroke) {_strokes.push_back(iStroke);}
   
 };
diff --git a/source/blender/freestyle/intern/stroke/StrokeRep.h b/source/blender/freestyle/intern/stroke/StrokeRep.h
index 129769e5489..d8a8dc2d609 100755
--- a/source/blender/freestyle/intern/stroke/StrokeRep.h
+++ b/source/blender/freestyle/intern/stroke/StrokeRep.h
@@ -130,7 +130,7 @@ public:
  
   /*! modifiers */
   inline void setMediumType(Stroke::MediumType itype) {_strokeType=itype;}
-  inline void SetTextureId(unsigned textureId) {_textureId = textureId;}
+  inline void setTextureId(unsigned textureId) {_textureId = textureId;}
 
   
 };
diff --git a/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp b/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp
index 6d0f5aa847c..279655c22b7 100755
--- a/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp
+++ b/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp
@@ -36,7 +36,7 @@ LineRep* StrokeTesselator::Tesselate(Stroke *iStroke)
   Stroke::vertex_iterator v,vend;
   if(2 == iStroke->vertices_size())
   {
-    line->SetStyle(LineRep::LINES);
+    line->setStyle(LineRep::LINES);
     v = iStroke->vertices_begin();
     StrokeVertex *svA= (*v);
     v++;
@@ -49,9 +49,9 @@ LineRep* StrokeTesselator::Tesselate(Stroke *iStroke)
   else
   {
     if(_overloadMaterial)
-      line->SetMaterial(_Material);
+      line->setMaterial(_Material);
 
-    line->SetStyle(LineRep::LINE_STRIP);
+    line->setStyle(LineRep::LINE_STRIP);
 
     for(v=iStroke->vertices_begin(), vend=iStroke->vertices_end();
     v!=vend;
@@ -62,7 +62,7 @@ LineRep* StrokeTesselator::Tesselate(Stroke *iStroke)
       line->AddVertex(V);         
     } 
   }
-  line->SetId(iStroke->getId());
+  line->setId(iStroke->getId());
   line->ComputeBBox();
 
   return line;
@@ -74,8 +74,8 @@ NodeGroup* StrokeTesselator::Tesselate(StrokeVertexIterator begin, StrokeVertexI
   NodeGroup *group = new NodeGroup;
   NodeShape *tshape = new NodeShape;
   group->AddChild(tshape);
-  //tshape->material().SetDiffuse(0.f, 0.f, 0.f, 1.f);
-  tshape->SetMaterial(_Material);
+  //tshape->material().setDiffuse(0.f, 0.f, 0.f, 1.f);
+  tshape->setMaterial(_Material);
 
   for(StrokeVertexIterator c=begin, cend=end;
   c!=cend;
diff --git a/source/blender/freestyle/intern/stroke/StrokeTesselator.h b/source/blender/freestyle/intern/stroke/StrokeTesselator.h
index 767d82d3d98..eaeb73504c9 100755
--- a/source/blender/freestyle/intern/stroke/StrokeTesselator.h
+++ b/source/blender/freestyle/intern/stroke/StrokeTesselator.h
@@ -38,7 +38,7 @@ class StrokeTesselator
 {
 public:
 
-  inline StrokeTesselator() {_Material.SetDiffuse(0,0,0,1);_overloadMaterial=false;}
+  inline StrokeTesselator() {_Material.setDiffuse(0,0,0,1);_overloadMaterial=false;}
   virtual ~StrokeTesselator() {}
 
   /*! Builds a line rep contained from a Stroke
@@ -54,7 +54,7 @@ public:
 
   
   
-  inline void SetMaterial(const Material& iMaterial) {_Material=iMaterial;_overloadMaterial=true;}
+  inline void setMaterial(const Material& iMaterial) {_Material=iMaterial;_overloadMaterial=true;}
   inline const Material& material() const {return _Material;}
 
 private:
diff --git a/source/blender/freestyle/intern/swig/ModuleWrapper.cpp b/source/blender/freestyle/intern/swig/ModuleWrapper.cpp
index df94340e88a..792388b52cb 100755
--- a/source/blender/freestyle/intern/swig/ModuleWrapper.cpp
+++ b/source/blender/freestyle/intern/swig/ModuleWrapper.cpp
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 1.3.31
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -13,7 +13,7 @@
 #define SWIG_PYTHON_DIRECTOR_NO_VTABLE
 
 #ifdef __cplusplus
-template<typename T> class SwigValueWrapper {
+template<class T> class SwigValueWrapper {
     T *tt;
 public:
     SwigValueWrapper() : tt(0) { }
@@ -26,10 +26,6 @@ public:
 private:
     SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs);
 };
-
-template <typename T> T SwigValueInit() {
-  return T();
-}
 #endif
 
 /* -----------------------------------------------------------------------------
@@ -39,14 +35,14 @@ template <typename T> T SwigValueInit() {
 
 /* template workaround for compilers that cannot correctly implement the C++ standard */
 #ifndef SWIGTEMPLATEDISAMBIGUATOR
-# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560)
-#  define SWIGTEMPLATEDISAMBIGUATOR template
-# elif defined(__HP_aCC)
-/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */
-/* If we find a maximum version that requires this, the test would be __HP_aCC <= 35500 for A.03.55 */
-#  define SWIGTEMPLATEDISAMBIGUATOR template
+# if defined(__SUNPRO_CC)
+#   if (__SUNPRO_CC <= 0x560)
+#     define SWIGTEMPLATEDISAMBIGUATOR template
+#   else
+#     define SWIGTEMPLATEDISAMBIGUATOR 
+#   endif
 # else
-#  define SWIGTEMPLATEDISAMBIGUATOR
+#   define SWIGTEMPLATEDISAMBIGUATOR 
 # endif
 #endif
 
@@ -129,12 +125,6 @@ template <typename T> T SwigValueInit() {
 # define _CRT_SECURE_NO_DEPRECATE
 #endif
 
-/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */
-#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE)
-# define _SCL_SECURE_NO_DEPRECATE
-#endif
-
-
 
 /* Python.h has to appear first */
 #include <Python.h>
@@ -148,7 +138,7 @@ template <typename T> T SwigValueInit() {
 
 /* This should only be incremented when either the layout of swig_type_info changes,
    or for whatever reason, the runtime changes incompatibly */
-#define SWIG_RUNTIME_VERSION "4"
+#define SWIG_RUNTIME_VERSION "3"
 
 /* define SWIG_TYPE_TABLE_NAME as "SWIG_TYPE_TABLE" */
 #ifdef SWIG_TYPE_TABLE
@@ -183,7 +173,6 @@ template <typename T> T SwigValueInit() {
 
 /* Flags for pointer conversions */
 #define SWIG_POINTER_DISOWN        0x1
-#define SWIG_CAST_NEW_MEMORY       0x2
 
 /* Flags for new pointer objects */
 #define SWIG_POINTER_OWN           0x1
@@ -324,10 +313,10 @@ SWIGINTERNINLINE int SWIG_CheckState(int r) {
 extern "C" {
 #endif
 
-typedef void *(*swig_converter_func)(void *, int *);
+typedef void *(*swig_converter_func)(void *);
 typedef struct swig_type_info *(*swig_dycast_func)(void **);
 
-/* Structure to store information on one type */
+/* Structure to store inforomation on one type */
 typedef struct swig_type_info {
   const char             *name;			/* mangled name of this type */
   const char             *str;			/* human readable name of this type */
@@ -372,7 +361,7 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
     while ((*f2 == ' ') && (f2 != l2)) ++f2;
     if (*f1 != *f2) return (*f1 > *f2) ? 1 : -1;
   }
-  return (int)((l1 - f1) - (l2 - f2));
+  return (l1 - f1) - (l2 - f2);
 }
 
 /*
@@ -454,8 +443,8 @@ SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *into) {
   Cast a pointer up an inheritance hierarchy
 */
 SWIGRUNTIMEINLINE void *
-SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
-  return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
+SWIG_TypeCast(swig_cast_info *ty, void *ptr) {
+  return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr);
 }
 
 /* 
@@ -879,7 +868,7 @@ SWIG_Python_AddErrorMsg(const char* mesg)
     Py_DECREF(old_str);
     Py_DECREF(value);
   } else {
-    PyErr_SetString(PyExc_RuntimeError, mesg);
+    PyErr_Format(PyExc_RuntimeError, mesg);
   }
 }
 
@@ -1119,14 +1108,14 @@ SWIG_Python_AppendOutput(PyObject* result, PyObject* obj) {
 /* Unpack the argument tuple */
 
 SWIGINTERN int
-SWIG_Python_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssize_t max, PyObject **objs)
+SWIG_Python_UnpackTuple(PyObject *args, const char *name, int min, int max, PyObject **objs)
 {
   if (!args) {
     if (!min && !max) {
       return 1;
     } else {
       PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got none", 
-		   name, (min == max ? "" : "at least "), (int)min);
+		   name, (min == max ? "" : "at least "), min);
       return 0;
     }
   }  
@@ -1134,14 +1123,14 @@ SWIG_Python_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssi
     PyErr_SetString(PyExc_SystemError, "UnpackTuple() argument list is not a tuple");
     return 0;
   } else {
-    register Py_ssize_t l = PyTuple_GET_SIZE(args);
+    register int l = PyTuple_GET_SIZE(args);
     if (l < min) {
       PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got %d", 
-		   name, (min == max ? "" : "at least "), (int)min, (int)l);
+		   name, (min == max ? "" : "at least "), min, l);
       return 0;
     } else if (l > max) {
       PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got %d", 
-		   name, (min == max ? "" : "at most "), (int)max, (int)l);
+		   name, (min == max ? "" : "at most "), max, l);
       return 0;
     } else {
       register int i;
@@ -1439,7 +1428,7 @@ PySwigObject_dealloc(PyObject *v)
 {
   PySwigObject *sobj = (PySwigObject *) v;
   PyObject *next = sobj->next;
-  if (sobj->own == SWIG_POINTER_OWN) {
+  if (sobj->own) {
     swig_type_info *ty = sobj->ty;
     PySwigClientData *data = ty ? (PySwigClientData *) ty->clientdata : 0;
     PyObject *destroy = data ? data->destroy : 0;
@@ -1457,13 +1446,12 @@ PySwigObject_dealloc(PyObject *v)
 	res = ((*meth)(mself, v));
       }
       Py_XDECREF(res);
-    } 
-#if !defined(SWIG_PYTHON_SILENT_MEMLEAK)
-    else {
+    } else {
       const char *name = SWIG_TypePrettyName(ty);
-      printf("swig/python detected a memory leak of type '%s', no destructor found.\n", (name ? name : "unknown"));
-    }
+#if !defined(SWIG_PYTHON_SILENT_MEMLEAK)
+      printf("swig/python detected a memory leak of type '%s', no destructor found.\n", name);
 #endif
+    }
   } 
   Py_XDECREF(next);
   PyObject_DEL(v);
@@ -1621,11 +1609,9 @@ _PySwigObject_type(void) {
     (unaryfunc)0,                 /*nb_float*/
     (unaryfunc)PySwigObject_oct,  /*nb_oct*/
     (unaryfunc)PySwigObject_hex,  /*nb_hex*/
-#if PY_VERSION_HEX >= 0x02050000 /* 2.5.0 */
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_index */
-#elif PY_VERSION_HEX >= 0x02020000 /* 2.2.0 */
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_true_divide */
-#elif PY_VERSION_HEX >= 0x02000000 /* 2.0.0 */
+#if PY_VERSION_HEX >= 0x02020000
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_true_divide */ 
+#elif PY_VERSION_HEX >= 0x02000000
     0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_or */
 #endif
   };
@@ -1968,7 +1954,7 @@ SWIG_Python_GetSwigThis(PyObject *pyobj)
 
 SWIGRUNTIME int
 SWIG_Python_AcquirePtr(PyObject *obj, int own) {
-  if (own == SWIG_POINTER_OWN) {
+  if (own) {
     PySwigObject *sobj = SWIG_Python_GetSwigThis(obj);
     if (sobj) {
       int oldown = sobj->own;
@@ -1989,8 +1975,6 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
     return SWIG_OK;
   } else {
     PySwigObject *sobj = SWIG_Python_GetSwigThis(obj);
-    if (own)
-      *own = 0;
     while (sobj) {
       void *vptr = sobj->ptr;
       if (ty) {
@@ -2004,15 +1988,7 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
 	  if (!tc) {
 	    sobj = (PySwigObject *)sobj->next;
 	  } else {
-	    if (ptr) {
-              int newmemory = 0;
-              *ptr = SWIG_TypeCast(tc,vptr,&newmemory);
-              if (newmemory == SWIG_CAST_NEW_MEMORY) {
-                assert(own);
-                if (own)
-                  *own = *own | SWIG_CAST_NEW_MEMORY;
-              }
-            }
+	    if (ptr) *ptr = SWIG_TypeCast(tc,vptr);
 	    break;
 	  }
 	}
@@ -2022,8 +1998,7 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
       }
     }
     if (sobj) {
-      if (own)
-        *own = *own | sobj->own;
+      if (own) *own = sobj->own;
       if (flags & SWIG_POINTER_DISOWN) {
 	sobj->own = 0;
       }
@@ -2088,13 +2063,8 @@ SWIG_Python_ConvertFunctionPtr(PyObject *obj, void **ptr, swig_type_info *ty) {
     }
     if (ty) {
       swig_cast_info *tc = SWIG_TypeCheck(desc,ty);
-      if (tc) {
-        int newmemory = 0;
-        *ptr = SWIG_TypeCast(tc,vptr,&newmemory);
-        assert(!newmemory); /* newmemory handling not yet implemented */
-      } else {
-        return SWIG_ERROR;
-      }
+      if (!tc) return SWIG_ERROR;
+      *ptr = SWIG_TypeCast(tc,vptr);
     } else {
       *ptr = vptr;
     }
@@ -2710,7 +2680,6 @@ namespace Swig {
         swig_msg += msg;
       }
       if (!PyErr_Occurred()) {
-        swig_msg.insert(0, ": ");
         PyErr_SetString(error, getMessage());
       } else {
         SWIG_Python_AddErrorMsg(getMessage());
@@ -2805,7 +2774,7 @@ namespace Swig {
   class DirectorMethodException : public Swig::DirectorException {
   public:
     DirectorMethodException(const char* msg = "") 
-      : DirectorException(PyExc_RuntimeError, "Swig director method error.", msg)
+      : DirectorException(PyExc_RuntimeError, "Swig director method error", msg)
     {
     }    
 
@@ -2838,21 +2807,33 @@ namespace Swig {
 # endif
 #endif
 
+/* simple thread abstraction for pthreads on win32 */
 #ifdef __THREAD__
-# include "pythread.h"
-  class Guard
+# define __PTHREAD__
+# if defined(_WIN32) || defined(__WIN32__)
+#  define pthread_mutex_lock EnterCriticalSection
+#  define pthread_mutex_unlock LeaveCriticalSection
+#  define pthread_mutex_t CRITICAL_SECTION
+#  define SWIG_MUTEX_INIT(var) var
+# else
+#  include <pthread.h>
+#  define SWIG_MUTEX_INIT(var) var = PTHREAD_MUTEX_INITIALIZER 
+# endif
+#endif
+
+#ifdef  __PTHREAD__
+  struct Guard
   {
-    PyThread_type_lock & mutex_;
+    pthread_mutex_t *_mutex;
     
-  public:
-    Guard(PyThread_type_lock & mutex) : mutex_(mutex)
+    Guard(pthread_mutex_t &mutex) : _mutex(&mutex)
     {
-      PyThread_acquire_lock(mutex_, WAIT_LOCK);
+      pthread_mutex_lock(_mutex);
     }
     
     ~Guard()
     {
-      PyThread_release_lock(mutex_);
+      pthread_mutex_unlock(_mutex);
     }
   };
 # define SWIG_GUARD(mutex) Guard _guard(mutex)
@@ -2923,8 +2904,8 @@ namespace Swig {
   private:
     typedef std::map<void*, GCItem_var> ownership_map;
     mutable ownership_map owner;
-#ifdef __THREAD__
-    static PyThread_type_lock swig_mutex_own;
+#ifdef __PTHREAD__
+    static pthread_mutex_t swig_mutex_own;
 #endif
 
   public:
@@ -2969,8 +2950,8 @@ namespace Swig {
     }
   };
 
-#ifdef __THREAD__
-  PyThread_type_lock Director::swig_mutex_own = PyThread_allocate_lock();
+#ifdef __PTHREAD__
+  pthread_mutex_t SWIG_MUTEX_INIT(Director::swig_mutex_own);
 #endif
 }
 
@@ -2982,7 +2963,7 @@ namespace Swig {
 /* -------- TYPES TABLE (BEGIN) -------- */
 
 #define SWIGTYPE_p_AdjacencyIterator swig_types[0]
-#define SWIGTYPE_p_BBoxT_VecMat__Vec3T_double_t_t swig_types[1]
+#define SWIGTYPE_p_BBoxTVecMat__Vec3Tdouble_t_t swig_types[1]
 #define SWIGTYPE_p_BinaryPredicate0D swig_types[2]
 #define SWIGTYPE_p_BinaryPredicate1D swig_types[3]
 #define SWIGTYPE_p_CalligraphicShader swig_types[4]
@@ -3133,56 +3114,56 @@ namespace Swig {
 #define SWIGTYPE_p_StrokesContainer swig_types[149]
 #define SWIGTYPE_p_StyleModule swig_types[150]
 #define SWIGTYPE_p_TVertex swig_types[151]
-#define SWIGTYPE_p_UnaryFunction0DT_Id_t swig_types[152]
-#define SWIGTYPE_p_UnaryFunction0DT_VecMat__Vec2T_float_t_t swig_types[153]
-#define SWIGTYPE_p_UnaryFunction0DT_VecMat__Vec3T_float_t_t swig_types[154]
-#define SWIGTYPE_p_UnaryFunction0DT_ViewShape_p_t swig_types[155]
-#define SWIGTYPE_p_UnaryFunction0DT_double_t swig_types[156]
-#define SWIGTYPE_p_UnaryFunction0DT_float_t swig_types[157]
-#define SWIGTYPE_p_UnaryFunction0DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t swig_types[158]
-#define SWIGTYPE_p_UnaryFunction0DT_unsigned_int_t swig_types[159]
-#define SWIGTYPE_p_UnaryFunction0DT_void_t swig_types[160]
-#define SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec2T_float_t_t swig_types[161]
-#define SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec3T_float_t_t swig_types[162]
-#define SWIGTYPE_p_UnaryFunction1DT_double_t swig_types[163]
-#define SWIGTYPE_p_UnaryFunction1DT_float_t swig_types[164]
-#define SWIGTYPE_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t swig_types[165]
-#define SWIGTYPE_p_UnaryFunction1DT_unsigned_int_t swig_types[166]
-#define SWIGTYPE_p_UnaryFunction1DT_void_t swig_types[167]
+#define SWIGTYPE_p_UnaryFunction0DTId_t swig_types[152]
+#define SWIGTYPE_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t swig_types[153]
+#define SWIGTYPE_p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t swig_types[154]
+#define SWIGTYPE_p_UnaryFunction0DTViewShape_p_t swig_types[155]
+#define SWIGTYPE_p_UnaryFunction0DTdouble_t swig_types[156]
+#define SWIGTYPE_p_UnaryFunction0DTfloat_t swig_types[157]
+#define SWIGTYPE_p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t swig_types[158]
+#define SWIGTYPE_p_UnaryFunction0DTunsigned_int_t swig_types[159]
+#define SWIGTYPE_p_UnaryFunction0DTvoid_t swig_types[160]
+#define SWIGTYPE_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t swig_types[161]
+#define SWIGTYPE_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t swig_types[162]
+#define SWIGTYPE_p_UnaryFunction1DTdouble_t swig_types[163]
+#define SWIGTYPE_p_UnaryFunction1DTfloat_t swig_types[164]
+#define SWIGTYPE_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t swig_types[165]
+#define SWIGTYPE_p_UnaryFunction1DTunsigned_int_t swig_types[166]
+#define SWIGTYPE_p_UnaryFunction1DTvoid_t swig_types[167]
 #define SWIGTYPE_p_UnaryPredicate0D swig_types[168]
 #define SWIGTYPE_p_UnaryPredicate1D swig_types[169]
-#define SWIGTYPE_p_VecMat__HVec3T_double_t swig_types[170]
-#define SWIGTYPE_p_VecMat__HVec3T_float_t swig_types[171]
-#define SWIGTYPE_p_VecMat__HVec3T_int_t swig_types[172]
-#define SWIGTYPE_p_VecMat__HVec3T_unsigned_int_t swig_types[173]
-#define SWIGTYPE_p_VecMat__SquareMatrixT_double_2_t swig_types[174]
-#define SWIGTYPE_p_VecMat__SquareMatrixT_double_3_t swig_types[175]
-#define SWIGTYPE_p_VecMat__SquareMatrixT_double_4_t swig_types[176]
-#define SWIGTYPE_p_VecMat__SquareMatrixT_float_2_t swig_types[177]
-#define SWIGTYPE_p_VecMat__SquareMatrixT_float_3_t swig_types[178]
-#define SWIGTYPE_p_VecMat__SquareMatrixT_float_4_t swig_types[179]
-#define SWIGTYPE_p_VecMat__SquareMatrixT_int_2_t swig_types[180]
-#define SWIGTYPE_p_VecMat__SquareMatrixT_int_3_t swig_types[181]
-#define SWIGTYPE_p_VecMat__SquareMatrixT_int_4_t swig_types[182]
-#define SWIGTYPE_p_VecMat__SquareMatrixT_unsigned_int_2_t swig_types[183]
-#define SWIGTYPE_p_VecMat__SquareMatrixT_unsigned_int_3_t swig_types[184]
-#define SWIGTYPE_p_VecMat__SquareMatrixT_unsigned_int_4_t swig_types[185]
-#define SWIGTYPE_p_VecMat__Vec2T_double_t swig_types[186]
-#define SWIGTYPE_p_VecMat__Vec2T_float_t swig_types[187]
-#define SWIGTYPE_p_VecMat__Vec2T_int_t swig_types[188]
-#define SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t swig_types[189]
-#define SWIGTYPE_p_VecMat__Vec3T_double_t swig_types[190]
-#define SWIGTYPE_p_VecMat__Vec3T_float_t swig_types[191]
-#define SWIGTYPE_p_VecMat__Vec3T_int_t swig_types[192]
-#define SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t swig_types[193]
-#define SWIGTYPE_p_VecMat__VecT_double_2_t swig_types[194]
-#define SWIGTYPE_p_VecMat__VecT_double_3_t swig_types[195]
-#define SWIGTYPE_p_VecMat__VecT_float_2_t swig_types[196]
-#define SWIGTYPE_p_VecMat__VecT_float_3_t swig_types[197]
-#define SWIGTYPE_p_VecMat__VecT_int_2_t swig_types[198]
-#define SWIGTYPE_p_VecMat__VecT_int_3_t swig_types[199]
-#define SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t swig_types[200]
-#define SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t swig_types[201]
+#define SWIGTYPE_p_VecMat__HVec3Tdouble_t swig_types[170]
+#define SWIGTYPE_p_VecMat__HVec3Tfloat_t swig_types[171]
+#define SWIGTYPE_p_VecMat__HVec3Tint_t swig_types[172]
+#define SWIGTYPE_p_VecMat__HVec3Tunsigned_int_t swig_types[173]
+#define SWIGTYPE_p_VecMat__SquareMatrixTdouble_2_t swig_types[174]
+#define SWIGTYPE_p_VecMat__SquareMatrixTdouble_3_t swig_types[175]
+#define SWIGTYPE_p_VecMat__SquareMatrixTdouble_4_t swig_types[176]
+#define SWIGTYPE_p_VecMat__SquareMatrixTfloat_2_t swig_types[177]
+#define SWIGTYPE_p_VecMat__SquareMatrixTfloat_3_t swig_types[178]
+#define SWIGTYPE_p_VecMat__SquareMatrixTfloat_4_t swig_types[179]
+#define SWIGTYPE_p_VecMat__SquareMatrixTint_2_t swig_types[180]
+#define SWIGTYPE_p_VecMat__SquareMatrixTint_3_t swig_types[181]
+#define SWIGTYPE_p_VecMat__SquareMatrixTint_4_t swig_types[182]
+#define SWIGTYPE_p_VecMat__SquareMatrixTunsigned_int_2_t swig_types[183]
+#define SWIGTYPE_p_VecMat__SquareMatrixTunsigned_int_3_t swig_types[184]
+#define SWIGTYPE_p_VecMat__SquareMatrixTunsigned_int_4_t swig_types[185]
+#define SWIGTYPE_p_VecMat__Vec2Tdouble_t swig_types[186]
+#define SWIGTYPE_p_VecMat__Vec2Tfloat_t swig_types[187]
+#define SWIGTYPE_p_VecMat__Vec2Tint_t swig_types[188]
+#define SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t swig_types[189]
+#define SWIGTYPE_p_VecMat__Vec3Tdouble_t swig_types[190]
+#define SWIGTYPE_p_VecMat__Vec3Tfloat_t swig_types[191]
+#define SWIGTYPE_p_VecMat__Vec3Tint_t swig_types[192]
+#define SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t swig_types[193]
+#define SWIGTYPE_p_VecMat__VecTdouble_2_t swig_types[194]
+#define SWIGTYPE_p_VecMat__VecTdouble_3_t swig_types[195]
+#define SWIGTYPE_p_VecMat__VecTfloat_2_t swig_types[196]
+#define SWIGTYPE_p_VecMat__VecTfloat_3_t swig_types[197]
+#define SWIGTYPE_p_VecMat__VecTint_2_t swig_types[198]
+#define SWIGTYPE_p_VecMat__VecTint_3_t swig_types[199]
+#define SWIGTYPE_p_VecMat__VecTunsigned_int_2_t swig_types[200]
+#define SWIGTYPE_p_VecMat__VecTunsigned_int_3_t swig_types[201]
 #define SWIGTYPE_p_Vertex swig_types[202]
 #define SWIGTYPE_p_ViewEdge swig_types[203]
 #define SWIGTYPE_p_ViewEdgeInternal__SVertexIterator swig_types[204]
@@ -3190,8 +3171,8 @@ namespace Swig {
 #define SWIGTYPE_p_ViewMap swig_types[206]
 #define SWIGTYPE_p_ViewShape swig_types[207]
 #define SWIGTYPE_p_ViewVertex swig_types[208]
-#define SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_const_traits_t swig_types[209]
-#define SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_nonconst_traits_t swig_types[210]
+#define SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t swig_types[209]
+#define SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t swig_types[210]
 #define SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator swig_types[211]
 #define SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator__edge_pointers_container__iterator swig_types[212]
 #define SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator__edges_container__iterator swig_types[213]
@@ -3221,30 +3202,30 @@ namespace Swig {
 #define SWIGTYPE_p_point_iterator swig_types[237]
 #define SWIGTYPE_p_point_type swig_types[238]
 #define SWIGTYPE_p_reference swig_types[239]
-#define SWIGTYPE_p_setT_VecMat__Vec3T_double_t_t swig_types[240]
+#define SWIGTYPE_p_setTVecMat__Vec3Tdouble_t_t swig_types[240]
 #define SWIGTYPE_p_size_type swig_types[241]
 #define SWIGTYPE_p_std__invalid_argument swig_types[242]
-#define SWIGTYPE_p_std__mapT_int_int_std__lessT_int_t_std__allocatorT_std__pairT_int_const_int_t_t_t swig_types[243]
-#define SWIGTYPE_p_std__pairT_ViewEdge_p_bool_t swig_types[244]
-#define SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t swig_types[245]
-#define SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__allocator_type swig_types[246]
-#define SWIGTYPE_p_std__vectorT_Material_std__allocatorT_Material_t_t swig_types[247]
-#define SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t swig_types[248]
-#define SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__allocator_type swig_types[249]
-#define SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t swig_types[250]
-#define SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__allocator_type swig_types[251]
-#define SWIGTYPE_p_std__vectorT_TVertex_p_std__allocatorT_TVertex_p_t_t swig_types[252]
-#define SWIGTYPE_p_std__vectorT_VecMat__Vec2T_double_t_std__allocatorT_VecMat__Vec2T_double_t_t_t swig_types[253]
-#define SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t swig_types[254]
-#define SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__allocator_type swig_types[255]
-#define SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t swig_types[256]
-#define SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__allocator_type swig_types[257]
-#define SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t swig_types[258]
-#define SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__allocator_type swig_types[259]
-#define SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t swig_types[260]
-#define SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t__allocator_type swig_types[261]
-#define SWIGTYPE_p_std__vectorT_std__pairT_ViewEdge_p_bool_t_std__allocatorT_std__pairT_ViewEdge_p_bool_t_t_t swig_types[262]
-#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t swig_types[263]
+#define SWIGTYPE_p_std__mapTint_int_std__lessTint_t_std__allocatorTstd__pairTint_const_int_t_t_t swig_types[243]
+#define SWIGTYPE_p_std__pairTViewEdge_p_bool_t swig_types[244]
+#define SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t swig_types[245]
+#define SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__allocator_type swig_types[246]
+#define SWIGTYPE_p_std__vectorTMaterial_std__allocatorTMaterial_t_t swig_types[247]
+#define SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t swig_types[248]
+#define SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__allocator_type swig_types[249]
+#define SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t swig_types[250]
+#define SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__allocator_type swig_types[251]
+#define SWIGTYPE_p_std__vectorTTVertex_p_std__allocatorTTVertex_p_t_t swig_types[252]
+#define SWIGTYPE_p_std__vectorTVecMat__Vec2Tdouble_t_std__allocatorTVecMat__Vec2Tdouble_t_t_t swig_types[253]
+#define SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t swig_types[254]
+#define SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__allocator_type swig_types[255]
+#define SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t swig_types[256]
+#define SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__allocator_type swig_types[257]
+#define SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t swig_types[258]
+#define SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__allocator_type swig_types[259]
+#define SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t swig_types[260]
+#define SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t__allocator_type swig_types[261]
+#define SWIGTYPE_p_std__vectorTstd__pairTViewEdge_p_bool_t_std__allocatorTstd__pairTViewEdge_p_bool_t_t_t swig_types[262]
+#define SWIGTYPE_p_std__vectorTunsigned_int_std__allocatorTunsigned_int_t_t swig_types[263]
 #define SWIGTYPE_p_svertices_container swig_types[264]
 #define SWIGTYPE_p_swig__PySwigIterator swig_types[265]
 #define SWIGTYPE_p_unsigned_int swig_types[266]
@@ -3258,12 +3239,12 @@ namespace Swig {
 #define SWIGTYPE_p_viewshapes_container swig_types[274]
 #define SWIGTYPE_p_viewvertices_container swig_types[275]
 #define SWIGTYPE_p_void swig_types[276]
-#define SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type swig_types[277]
-#define SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type swig_types[278]
-#define SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type swig_types[279]
-#define SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type swig_types[280]
-#define SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type swig_types[281]
-#define SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type swig_types[282]
+#define SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type swig_types[277]
+#define SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type swig_types[278]
+#define SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type swig_types[279]
+#define SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type swig_types[280]
+#define SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type swig_types[281]
+#define SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type swig_types[282]
 static swig_type_info *swig_types[284];
 static swig_module_info swig_module = {swig_types, 283, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
@@ -3284,7 +3265,7 @@ static swig_module_info swig_module = {swig_types, 283, 0, 0, 0, 0};
 
 #define SWIG_name    "_Freestyle"
 
-#define SWIGVERSION 0x010335 
+#define SWIGVERSION 0x010331 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -3312,9 +3293,7 @@ namespace swig {
     
     PyObject_ptr(PyObject *obj, bool initial_ref = true) :_obj(obj)
     {
-      if (initial_ref) {
-        Py_XINCREF(_obj);
-      }
+      if (initial_ref) Py_XINCREF(_obj);
     }
     
     PyObject_ptr & operator=(const PyObject_ptr& item) 
@@ -3462,22 +3441,17 @@ namespace swig {
     // C++ common/needed methods
     virtual PySwigIterator *copy() const = 0;
 
-    PyObject *next()     
+    PyObject *next()
     {
-      SWIG_PYTHON_THREAD_BEGIN_BLOCK; // disable threads       
       PyObject *obj = value();
-      incr();       
-      SWIG_PYTHON_THREAD_END_BLOCK; // re-enable threads
-      return obj;     
+      incr();
+      return obj;
     }
 
     PyObject *previous()
     {
-      SWIG_PYTHON_THREAD_BEGIN_BLOCK; // disable threads       
       decr();
-      PyObject *obj = value();
-      SWIG_PYTHON_THREAD_END_BLOCK; // re-enable threads       
-      return obj;
+      return value();
     }
 
     PySwigIterator *advance(ptrdiff_t n)
@@ -4560,12 +4534,12 @@ namespace swig
 
     ~PySequence_Cont()
     {
-      Py_XDECREF(_seq);
+      if (_seq) Py_DECREF(_seq);
     }
 
     size_type size() const
     {
-      return static_cast<size_type>(PySequence_Size(_seq));
+      return PySequence_Size(_seq);
     }
 
     bool empty() const
@@ -4628,12 +4602,14 @@ namespace swig
 
 
 #include <limits.h>
-#if !defined(SWIG_NO_LLONG_MAX)
-# if !defined(LLONG_MAX) && defined(__GNUC__) && defined (__LONG_LONG_MAX__)
-#   define LLONG_MAX __LONG_LONG_MAX__
-#   define LLONG_MIN (-LLONG_MAX - 1LL)
-#   define ULLONG_MAX (LLONG_MAX * 2ULL + 1ULL)
-# endif
+#ifndef LLONG_MIN
+# define LLONG_MIN	LONG_LONG_MIN
+#endif
+#ifndef LLONG_MAX
+# define LLONG_MAX	LONG_LONG_MAX
+#endif
+#ifndef ULLONG_MAX
+# define ULLONG_MAX	ULONG_LONG_MAX
 #endif
 
 
@@ -4701,14 +4677,7 @@ namespace swig {
     typedef T value_type;
 
     static int asptr(PyObject *obj, sequence **seq) {
-      if (obj == Py_None || SWIG_Python_GetSwigThis(obj)) {
-	sequence *p;
-	if (SWIG_ConvertPtr(obj,(void**)&p,
-			    swig::type_info<sequence>(),0) == SWIG_OK) {
-	  if (seq) *seq = p;
-	  return SWIG_OLDOBJ;
-	}
-      } else if (PySequence_Check(obj)) {
+      if (PySequence_Check(obj)) {
 	try {
 	  PySequence_Cont<value_type> pyseq(obj);
 	  if (seq) {
@@ -4727,6 +4696,13 @@ namespace swig {
 	  }
 	  return SWIG_ERROR;
 	}
+      } else {
+	sequence *p;
+	if (SWIG_ConvertPtr(obj,(void**)&p,
+			    swig::type_info<sequence>(),0) == SWIG_OK) {
+	  if (seq) *seq = p;
+	  return SWIG_OLDOBJ;
+	}
       }
       return SWIG_ERROR;
     }
@@ -4782,21 +4758,21 @@ namespace swig {
 
 
       namespace swig {
-	template <>  struct traits<std::vector<int, std::allocator< int > > > {
+	template <>  struct traits<std::vector<int, std::allocator<int > > > {
 	  typedef pointer_category category;
 	  static const char* type_name() {
-	    return "std::vector<" "int" "," "std::allocator< int >" " >";
+	    return "std::vector<" "int" "," "std::allocator<int >" " >";
 	  }
 	};
       }
     
-SWIGINTERN swig::PySwigIterator *std_vector_Sl_int_Sg__iterator(std::vector< int > *self,PyObject **PYTHON_SELF){
+SWIGINTERN swig::PySwigIterator *std_vector_Sl_int_Sg__iterator(std::vector<int > *self,PyObject **PYTHON_SELF){
       return swig::make_output_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
     }
-SWIGINTERN bool std_vector_Sl_int_Sg____nonzero__(std::vector< int > const *self){
+SWIGINTERN bool std_vector_Sl_int_Sg____nonzero__(std::vector<int > const *self){
       return !(self->empty());
     }
-SWIGINTERN std::vector< int >::size_type std_vector_Sl_int_Sg____len__(std::vector< int > const *self){
+SWIGINTERN std::vector<int >::size_type std_vector_Sl_int_Sg____len__(std::vector<int > const *self){
       return self->size();
     }
 
@@ -4814,32 +4790,32 @@ SWIG_From_size_t  (size_t value)
   return SWIG_From_unsigned_SS_long  (static_cast< unsigned long >(value));
 }
 
-SWIGINTERN std::vector< int >::value_type std_vector_Sl_int_Sg__pop(std::vector< int > *self){
+SWIGINTERN std::vector<int >::value_type std_vector_Sl_int_Sg__pop(std::vector<int > *self){
       if (self->size() == 0)
 	throw std::out_of_range("pop from empty container");
-      std::vector<int,std::allocator< int > >::value_type x = self->back();
+      std::vector<int,std::allocator<int > >::value_type x = self->back();
       self->pop_back();
       return x;
     }
-SWIGINTERN std::vector< int,std::allocator< int > > *std_vector_Sl_int_Sg____getslice__(std::vector< int > *self,std::vector< int >::difference_type i,std::vector< int >::difference_type j){
+SWIGINTERN std::vector<int,std::allocator<int > > *std_vector_Sl_int_Sg____getslice__(std::vector<int > *self,std::vector<int >::difference_type i,std::vector<int >::difference_type j){
       return swig::getslice(self, i, j);
     }
-SWIGINTERN void std_vector_Sl_int_Sg____setslice__(std::vector< int > *self,std::vector< int >::difference_type i,std::vector< int >::difference_type j,std::vector< int,std::allocator< int > > const &v){
+SWIGINTERN void std_vector_Sl_int_Sg____setslice__(std::vector<int > *self,std::vector<int >::difference_type i,std::vector<int >::difference_type j,std::vector<int,std::allocator<int > > const &v){
       swig::setslice(self, i, j, v);
     }
-SWIGINTERN void std_vector_Sl_int_Sg____delslice__(std::vector< int > *self,std::vector< int >::difference_type i,std::vector< int >::difference_type j){
+SWIGINTERN void std_vector_Sl_int_Sg____delslice__(std::vector<int > *self,std::vector<int >::difference_type i,std::vector<int >::difference_type j){
       swig::delslice(self, i, j);
     }
-SWIGINTERN void std_vector_Sl_int_Sg____delitem__(std::vector< int > *self,std::vector< int >::difference_type i){
+SWIGINTERN void std_vector_Sl_int_Sg____delitem__(std::vector<int > *self,std::vector<int >::difference_type i){
       self->erase(swig::getpos(self,i));
     }
-SWIGINTERN std::vector< int >::value_type const &std_vector_Sl_int_Sg____getitem__(std::vector< int > const *self,std::vector< int >::difference_type i){
+SWIGINTERN std::vector<int >::value_type const &std_vector_Sl_int_Sg____getitem__(std::vector<int > const *self,std::vector<int >::difference_type i){
       return *(swig::cgetpos(self, i));
     }
-SWIGINTERN void std_vector_Sl_int_Sg____setitem__(std::vector< int > *self,std::vector< int >::difference_type i,std::vector< int >::value_type const &x){
+SWIGINTERN void std_vector_Sl_int_Sg____setitem__(std::vector<int > *self,std::vector<int >::difference_type i,std::vector<int >::value_type const &x){
       *(swig::getpos(self,i)) = x;
     }
-SWIGINTERN void std_vector_Sl_int_Sg__append(std::vector< int > *self,std::vector< int >::value_type const &x){
+SWIGINTERN void std_vector_Sl_int_Sg__append(std::vector<int > *self,std::vector<int >::value_type const &x){
       self->push_back(x);
     }
 
@@ -4959,11 +4935,18 @@ SWIG_AsVal_unsigned_SS_short (PyObject * obj, unsigned short *val)
 SWIGINTERN int
 SWIG_AsVal_bool (PyObject *obj, bool *val)
 {
-  int r = PyObject_IsTrue(obj);
-  if (r == -1)
-    return SWIG_ERROR;
-  if (val) *val = r ? true : false;
-  return SWIG_OK;
+  if (obj == Py_True) {
+    if (val) *val = true;
+    return SWIG_OK;
+  } else if (obj == Py_False) {
+    if (val) *val = false;
+    return SWIG_OK;
+  } else {
+    long v = 0;
+    int res = SWIG_AddCast(SWIG_AsVal_long (obj, val ? &v : 0));
+    if (SWIG_IsOK(res) && val) *val = v ? true : false;
+    return res;
+  }
 }
 
 
@@ -4976,49 +4959,49 @@ SWIG_AsVal_bool (PyObject *obj, bool *val)
 
 
       namespace swig {
-	template <>  struct traits<std::vector<ViewShape*, std::allocator< ViewShape * > > > {
+	template <>  struct traits<std::vector<ViewShape*, std::allocator<ViewShape * > > > {
 	  typedef value_category category;
 	  static const char* type_name() {
-	    return "std::vector<" "ViewShape" " *," "std::allocator< ViewShape * >" " >";
+	    return "std::vector<" "ViewShape" " *," "std::allocator<ViewShape * >" " >";
 	  }
 	};
       }
     
-SWIGINTERN swig::PySwigIterator *std_vector_Sl_ViewShape_Sm__Sg__iterator(std::vector< ViewShape * > *self,PyObject **PYTHON_SELF){
+SWIGINTERN swig::PySwigIterator *std_vector_Sl_ViewShape_Sm__Sg__iterator(std::vector<ViewShape * > *self,PyObject **PYTHON_SELF){
       return swig::make_output_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
     }
-SWIGINTERN bool std_vector_Sl_ViewShape_Sm__Sg____nonzero__(std::vector< ViewShape * > const *self){
+SWIGINTERN bool std_vector_Sl_ViewShape_Sm__Sg____nonzero__(std::vector<ViewShape * > const *self){
       return !(self->empty());
     }
-SWIGINTERN std::vector< ViewShape * >::size_type std_vector_Sl_ViewShape_Sm__Sg____len__(std::vector< ViewShape * > const *self){
+SWIGINTERN std::vector<ViewShape * >::size_type std_vector_Sl_ViewShape_Sm__Sg____len__(std::vector<ViewShape * > const *self){
       return self->size();
     }
-SWIGINTERN std::vector< ViewShape * >::value_type std_vector_Sl_ViewShape_Sm__Sg__pop(std::vector< ViewShape * > *self){
+SWIGINTERN std::vector<ViewShape * >::value_type std_vector_Sl_ViewShape_Sm__Sg__pop(std::vector<ViewShape * > *self){
       if (self->size() == 0)
 	throw std::out_of_range("pop from empty container");
-      std::vector<ViewShape*,std::allocator< ViewShape * > >::value_type x = self->back();
+      std::vector<ViewShape*,std::allocator<ViewShape * > >::value_type x = self->back();
       self->pop_back();
       return x;
     }
-SWIGINTERN std::vector< ViewShape *,std::allocator< ViewShape * > > *std_vector_Sl_ViewShape_Sm__Sg____getslice__(std::vector< ViewShape * > *self,std::vector< ViewShape * >::difference_type i,std::vector< ViewShape * >::difference_type j){
+SWIGINTERN std::vector<ViewShape *,std::allocator<ViewShape * > > *std_vector_Sl_ViewShape_Sm__Sg____getslice__(std::vector<ViewShape * > *self,std::vector<ViewShape * >::difference_type i,std::vector<ViewShape * >::difference_type j){
       return swig::getslice(self, i, j);
     }
-SWIGINTERN void std_vector_Sl_ViewShape_Sm__Sg____setslice__(std::vector< ViewShape * > *self,std::vector< ViewShape * >::difference_type i,std::vector< ViewShape * >::difference_type j,std::vector< ViewShape *,std::allocator< ViewShape * > > const &v){
+SWIGINTERN void std_vector_Sl_ViewShape_Sm__Sg____setslice__(std::vector<ViewShape * > *self,std::vector<ViewShape * >::difference_type i,std::vector<ViewShape * >::difference_type j,std::vector<ViewShape *,std::allocator<ViewShape * > > const &v){
       swig::setslice(self, i, j, v);
     }
-SWIGINTERN void std_vector_Sl_ViewShape_Sm__Sg____delslice__(std::vector< ViewShape * > *self,std::vector< ViewShape * >::difference_type i,std::vector< ViewShape * >::difference_type j){
+SWIGINTERN void std_vector_Sl_ViewShape_Sm__Sg____delslice__(std::vector<ViewShape * > *self,std::vector<ViewShape * >::difference_type i,std::vector<ViewShape * >::difference_type j){
       swig::delslice(self, i, j);
     }
-SWIGINTERN void std_vector_Sl_ViewShape_Sm__Sg____delitem__(std::vector< ViewShape * > *self,std::vector< ViewShape * >::difference_type i){
+SWIGINTERN void std_vector_Sl_ViewShape_Sm__Sg____delitem__(std::vector<ViewShape * > *self,std::vector<ViewShape * >::difference_type i){
       self->erase(swig::getpos(self,i));
     }
-SWIGINTERN std::vector< ViewShape * >::value_type std_vector_Sl_ViewShape_Sm__Sg____getitem__(std::vector< ViewShape * > *self,std::vector< ViewShape * >::difference_type i){
+SWIGINTERN std::vector<ViewShape * >::value_type std_vector_Sl_ViewShape_Sm__Sg____getitem__(std::vector<ViewShape * > *self,std::vector<ViewShape * >::difference_type i){
       return *(swig::cgetpos(self, i));
     }
-SWIGINTERN void std_vector_Sl_ViewShape_Sm__Sg____setitem__(std::vector< ViewShape * > *self,std::vector< ViewShape * >::difference_type i,std::vector< ViewShape * >::value_type x){
+SWIGINTERN void std_vector_Sl_ViewShape_Sm__Sg____setitem__(std::vector<ViewShape * > *self,std::vector<ViewShape * >::difference_type i,std::vector<ViewShape * >::value_type x){
       *(swig::getpos(self,i)) = x;
     }
-SWIGINTERN void std_vector_Sl_ViewShape_Sm__Sg__append(std::vector< ViewShape * > *self,std::vector< ViewShape * >::value_type x){
+SWIGINTERN void std_vector_Sl_ViewShape_Sm__Sg__append(std::vector<ViewShape * > *self,std::vector<ViewShape * >::value_type x){
       self->push_back(x);
     }
 
@@ -5031,49 +5014,49 @@ SWIGINTERN void std_vector_Sl_ViewShape_Sm__Sg__append(std::vector< ViewShape *
 
 
       namespace swig {
-	template <>  struct traits<std::vector<ViewEdge*, std::allocator< ViewEdge * > > > {
+	template <>  struct traits<std::vector<ViewEdge*, std::allocator<ViewEdge * > > > {
 	  typedef value_category category;
 	  static const char* type_name() {
-	    return "std::vector<" "ViewEdge" " *," "std::allocator< ViewEdge * >" " >";
+	    return "std::vector<" "ViewEdge" " *," "std::allocator<ViewEdge * >" " >";
 	  }
 	};
       }
     
-SWIGINTERN swig::PySwigIterator *std_vector_Sl_ViewEdge_Sm__Sg__iterator(std::vector< ViewEdge * > *self,PyObject **PYTHON_SELF){
+SWIGINTERN swig::PySwigIterator *std_vector_Sl_ViewEdge_Sm__Sg__iterator(std::vector<ViewEdge * > *self,PyObject **PYTHON_SELF){
       return swig::make_output_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
     }
-SWIGINTERN bool std_vector_Sl_ViewEdge_Sm__Sg____nonzero__(std::vector< ViewEdge * > const *self){
+SWIGINTERN bool std_vector_Sl_ViewEdge_Sm__Sg____nonzero__(std::vector<ViewEdge * > const *self){
       return !(self->empty());
     }
-SWIGINTERN std::vector< ViewEdge * >::size_type std_vector_Sl_ViewEdge_Sm__Sg____len__(std::vector< ViewEdge * > const *self){
+SWIGINTERN std::vector<ViewEdge * >::size_type std_vector_Sl_ViewEdge_Sm__Sg____len__(std::vector<ViewEdge * > const *self){
       return self->size();
     }
-SWIGINTERN std::vector< ViewEdge * >::value_type std_vector_Sl_ViewEdge_Sm__Sg__pop(std::vector< ViewEdge * > *self){
+SWIGINTERN std::vector<ViewEdge * >::value_type std_vector_Sl_ViewEdge_Sm__Sg__pop(std::vector<ViewEdge * > *self){
       if (self->size() == 0)
 	throw std::out_of_range("pop from empty container");
-      std::vector<ViewEdge*,std::allocator< ViewEdge * > >::value_type x = self->back();
+      std::vector<ViewEdge*,std::allocator<ViewEdge * > >::value_type x = self->back();
       self->pop_back();
       return x;
     }
-SWIGINTERN std::vector< ViewEdge *,std::allocator< ViewEdge * > > *std_vector_Sl_ViewEdge_Sm__Sg____getslice__(std::vector< ViewEdge * > *self,std::vector< ViewEdge * >::difference_type i,std::vector< ViewEdge * >::difference_type j){
+SWIGINTERN std::vector<ViewEdge *,std::allocator<ViewEdge * > > *std_vector_Sl_ViewEdge_Sm__Sg____getslice__(std::vector<ViewEdge * > *self,std::vector<ViewEdge * >::difference_type i,std::vector<ViewEdge * >::difference_type j){
       return swig::getslice(self, i, j);
     }
-SWIGINTERN void std_vector_Sl_ViewEdge_Sm__Sg____setslice__(std::vector< ViewEdge * > *self,std::vector< ViewEdge * >::difference_type i,std::vector< ViewEdge * >::difference_type j,std::vector< ViewEdge *,std::allocator< ViewEdge * > > const &v){
+SWIGINTERN void std_vector_Sl_ViewEdge_Sm__Sg____setslice__(std::vector<ViewEdge * > *self,std::vector<ViewEdge * >::difference_type i,std::vector<ViewEdge * >::difference_type j,std::vector<ViewEdge *,std::allocator<ViewEdge * > > const &v){
       swig::setslice(self, i, j, v);
     }
-SWIGINTERN void std_vector_Sl_ViewEdge_Sm__Sg____delslice__(std::vector< ViewEdge * > *self,std::vector< ViewEdge * >::difference_type i,std::vector< ViewEdge * >::difference_type j){
+SWIGINTERN void std_vector_Sl_ViewEdge_Sm__Sg____delslice__(std::vector<ViewEdge * > *self,std::vector<ViewEdge * >::difference_type i,std::vector<ViewEdge * >::difference_type j){
       swig::delslice(self, i, j);
     }
-SWIGINTERN void std_vector_Sl_ViewEdge_Sm__Sg____delitem__(std::vector< ViewEdge * > *self,std::vector< ViewEdge * >::difference_type i){
+SWIGINTERN void std_vector_Sl_ViewEdge_Sm__Sg____delitem__(std::vector<ViewEdge * > *self,std::vector<ViewEdge * >::difference_type i){
       self->erase(swig::getpos(self,i));
     }
-SWIGINTERN std::vector< ViewEdge * >::value_type std_vector_Sl_ViewEdge_Sm__Sg____getitem__(std::vector< ViewEdge * > *self,std::vector< ViewEdge * >::difference_type i){
+SWIGINTERN std::vector<ViewEdge * >::value_type std_vector_Sl_ViewEdge_Sm__Sg____getitem__(std::vector<ViewEdge * > *self,std::vector<ViewEdge * >::difference_type i){
       return *(swig::cgetpos(self, i));
     }
-SWIGINTERN void std_vector_Sl_ViewEdge_Sm__Sg____setitem__(std::vector< ViewEdge * > *self,std::vector< ViewEdge * >::difference_type i,std::vector< ViewEdge * >::value_type x){
+SWIGINTERN void std_vector_Sl_ViewEdge_Sm__Sg____setitem__(std::vector<ViewEdge * > *self,std::vector<ViewEdge * >::difference_type i,std::vector<ViewEdge * >::value_type x){
       *(swig::getpos(self,i)) = x;
     }
-SWIGINTERN void std_vector_Sl_ViewEdge_Sm__Sg__append(std::vector< ViewEdge * > *self,std::vector< ViewEdge * >::value_type x){
+SWIGINTERN void std_vector_Sl_ViewEdge_Sm__Sg__append(std::vector<ViewEdge * > *self,std::vector<ViewEdge * >::value_type x){
       self->push_back(x);
     }
 
@@ -5086,49 +5069,49 @@ SWIGINTERN void std_vector_Sl_ViewEdge_Sm__Sg__append(std::vector< ViewEdge * >
 
 
       namespace swig {
-	template <>  struct traits<std::vector<FEdge*, std::allocator< FEdge * > > > {
+	template <>  struct traits<std::vector<FEdge*, std::allocator<FEdge * > > > {
 	  typedef value_category category;
 	  static const char* type_name() {
-	    return "std::vector<" "FEdge" " *," "std::allocator< FEdge * >" " >";
+	    return "std::vector<" "FEdge" " *," "std::allocator<FEdge * >" " >";
 	  }
 	};
       }
     
-SWIGINTERN swig::PySwigIterator *std_vector_Sl_FEdge_Sm__Sg__iterator(std::vector< FEdge * > *self,PyObject **PYTHON_SELF){
+SWIGINTERN swig::PySwigIterator *std_vector_Sl_FEdge_Sm__Sg__iterator(std::vector<FEdge * > *self,PyObject **PYTHON_SELF){
       return swig::make_output_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
     }
-SWIGINTERN bool std_vector_Sl_FEdge_Sm__Sg____nonzero__(std::vector< FEdge * > const *self){
+SWIGINTERN bool std_vector_Sl_FEdge_Sm__Sg____nonzero__(std::vector<FEdge * > const *self){
       return !(self->empty());
     }
-SWIGINTERN std::vector< FEdge * >::size_type std_vector_Sl_FEdge_Sm__Sg____len__(std::vector< FEdge * > const *self){
+SWIGINTERN std::vector<FEdge * >::size_type std_vector_Sl_FEdge_Sm__Sg____len__(std::vector<FEdge * > const *self){
       return self->size();
     }
-SWIGINTERN std::vector< FEdge * >::value_type std_vector_Sl_FEdge_Sm__Sg__pop(std::vector< FEdge * > *self){
+SWIGINTERN std::vector<FEdge * >::value_type std_vector_Sl_FEdge_Sm__Sg__pop(std::vector<FEdge * > *self){
       if (self->size() == 0)
 	throw std::out_of_range("pop from empty container");
-      std::vector<FEdge*,std::allocator< FEdge * > >::value_type x = self->back();
+      std::vector<FEdge*,std::allocator<FEdge * > >::value_type x = self->back();
       self->pop_back();
       return x;
     }
-SWIGINTERN std::vector< FEdge *,std::allocator< FEdge * > > *std_vector_Sl_FEdge_Sm__Sg____getslice__(std::vector< FEdge * > *self,std::vector< FEdge * >::difference_type i,std::vector< FEdge * >::difference_type j){
+SWIGINTERN std::vector<FEdge *,std::allocator<FEdge * > > *std_vector_Sl_FEdge_Sm__Sg____getslice__(std::vector<FEdge * > *self,std::vector<FEdge * >::difference_type i,std::vector<FEdge * >::difference_type j){
       return swig::getslice(self, i, j);
     }
-SWIGINTERN void std_vector_Sl_FEdge_Sm__Sg____setslice__(std::vector< FEdge * > *self,std::vector< FEdge * >::difference_type i,std::vector< FEdge * >::difference_type j,std::vector< FEdge *,std::allocator< FEdge * > > const &v){
+SWIGINTERN void std_vector_Sl_FEdge_Sm__Sg____setslice__(std::vector<FEdge * > *self,std::vector<FEdge * >::difference_type i,std::vector<FEdge * >::difference_type j,std::vector<FEdge *,std::allocator<FEdge * > > const &v){
       swig::setslice(self, i, j, v);
     }
-SWIGINTERN void std_vector_Sl_FEdge_Sm__Sg____delslice__(std::vector< FEdge * > *self,std::vector< FEdge * >::difference_type i,std::vector< FEdge * >::difference_type j){
+SWIGINTERN void std_vector_Sl_FEdge_Sm__Sg____delslice__(std::vector<FEdge * > *self,std::vector<FEdge * >::difference_type i,std::vector<FEdge * >::difference_type j){
       swig::delslice(self, i, j);
     }
-SWIGINTERN void std_vector_Sl_FEdge_Sm__Sg____delitem__(std::vector< FEdge * > *self,std::vector< FEdge * >::difference_type i){
+SWIGINTERN void std_vector_Sl_FEdge_Sm__Sg____delitem__(std::vector<FEdge * > *self,std::vector<FEdge * >::difference_type i){
       self->erase(swig::getpos(self,i));
     }
-SWIGINTERN std::vector< FEdge * >::value_type std_vector_Sl_FEdge_Sm__Sg____getitem__(std::vector< FEdge * > *self,std::vector< FEdge * >::difference_type i){
+SWIGINTERN std::vector<FEdge * >::value_type std_vector_Sl_FEdge_Sm__Sg____getitem__(std::vector<FEdge * > *self,std::vector<FEdge * >::difference_type i){
       return *(swig::cgetpos(self, i));
     }
-SWIGINTERN void std_vector_Sl_FEdge_Sm__Sg____setitem__(std::vector< FEdge * > *self,std::vector< FEdge * >::difference_type i,std::vector< FEdge * >::value_type x){
+SWIGINTERN void std_vector_Sl_FEdge_Sm__Sg____setitem__(std::vector<FEdge * > *self,std::vector<FEdge * >::difference_type i,std::vector<FEdge * >::value_type x){
       *(swig::getpos(self,i)) = x;
     }
-SWIGINTERN void std_vector_Sl_FEdge_Sm__Sg__append(std::vector< FEdge * > *self,std::vector< FEdge * >::value_type x){
+SWIGINTERN void std_vector_Sl_FEdge_Sm__Sg__append(std::vector<FEdge * > *self,std::vector<FEdge * >::value_type x){
       self->push_back(x);
     }
 
@@ -5141,49 +5124,49 @@ SWIGINTERN void std_vector_Sl_FEdge_Sm__Sg__append(std::vector< FEdge * > *self,
 
 
       namespace swig {
-	template <>  struct traits<std::vector<ViewVertex*, std::allocator< ViewVertex * > > > {
+	template <>  struct traits<std::vector<ViewVertex*, std::allocator<ViewVertex * > > > {
 	  typedef value_category category;
 	  static const char* type_name() {
-	    return "std::vector<" "ViewVertex" " *," "std::allocator< ViewVertex * >" " >";
+	    return "std::vector<" "ViewVertex" " *," "std::allocator<ViewVertex * >" " >";
 	  }
 	};
       }
     
-SWIGINTERN swig::PySwigIterator *std_vector_Sl_ViewVertex_Sm__Sg__iterator(std::vector< ViewVertex * > *self,PyObject **PYTHON_SELF){
+SWIGINTERN swig::PySwigIterator *std_vector_Sl_ViewVertex_Sm__Sg__iterator(std::vector<ViewVertex * > *self,PyObject **PYTHON_SELF){
       return swig::make_output_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
     }
-SWIGINTERN bool std_vector_Sl_ViewVertex_Sm__Sg____nonzero__(std::vector< ViewVertex * > const *self){
+SWIGINTERN bool std_vector_Sl_ViewVertex_Sm__Sg____nonzero__(std::vector<ViewVertex * > const *self){
       return !(self->empty());
     }
-SWIGINTERN std::vector< ViewVertex * >::size_type std_vector_Sl_ViewVertex_Sm__Sg____len__(std::vector< ViewVertex * > const *self){
+SWIGINTERN std::vector<ViewVertex * >::size_type std_vector_Sl_ViewVertex_Sm__Sg____len__(std::vector<ViewVertex * > const *self){
       return self->size();
     }
-SWIGINTERN std::vector< ViewVertex * >::value_type std_vector_Sl_ViewVertex_Sm__Sg__pop(std::vector< ViewVertex * > *self){
+SWIGINTERN std::vector<ViewVertex * >::value_type std_vector_Sl_ViewVertex_Sm__Sg__pop(std::vector<ViewVertex * > *self){
       if (self->size() == 0)
 	throw std::out_of_range("pop from empty container");
-      std::vector<ViewVertex*,std::allocator< ViewVertex * > >::value_type x = self->back();
+      std::vector<ViewVertex*,std::allocator<ViewVertex * > >::value_type x = self->back();
       self->pop_back();
       return x;
     }
-SWIGINTERN std::vector< ViewVertex *,std::allocator< ViewVertex * > > *std_vector_Sl_ViewVertex_Sm__Sg____getslice__(std::vector< ViewVertex * > *self,std::vector< ViewVertex * >::difference_type i,std::vector< ViewVertex * >::difference_type j){
+SWIGINTERN std::vector<ViewVertex *,std::allocator<ViewVertex * > > *std_vector_Sl_ViewVertex_Sm__Sg____getslice__(std::vector<ViewVertex * > *self,std::vector<ViewVertex * >::difference_type i,std::vector<ViewVertex * >::difference_type j){
       return swig::getslice(self, i, j);
     }
-SWIGINTERN void std_vector_Sl_ViewVertex_Sm__Sg____setslice__(std::vector< ViewVertex * > *self,std::vector< ViewVertex * >::difference_type i,std::vector< ViewVertex * >::difference_type j,std::vector< ViewVertex *,std::allocator< ViewVertex * > > const &v){
+SWIGINTERN void std_vector_Sl_ViewVertex_Sm__Sg____setslice__(std::vector<ViewVertex * > *self,std::vector<ViewVertex * >::difference_type i,std::vector<ViewVertex * >::difference_type j,std::vector<ViewVertex *,std::allocator<ViewVertex * > > const &v){
       swig::setslice(self, i, j, v);
     }
-SWIGINTERN void std_vector_Sl_ViewVertex_Sm__Sg____delslice__(std::vector< ViewVertex * > *self,std::vector< ViewVertex * >::difference_type i,std::vector< ViewVertex * >::difference_type j){
+SWIGINTERN void std_vector_Sl_ViewVertex_Sm__Sg____delslice__(std::vector<ViewVertex * > *self,std::vector<ViewVertex * >::difference_type i,std::vector<ViewVertex * >::difference_type j){
       swig::delslice(self, i, j);
     }
-SWIGINTERN void std_vector_Sl_ViewVertex_Sm__Sg____delitem__(std::vector< ViewVertex * > *self,std::vector< ViewVertex * >::difference_type i){
+SWIGINTERN void std_vector_Sl_ViewVertex_Sm__Sg____delitem__(std::vector<ViewVertex * > *self,std::vector<ViewVertex * >::difference_type i){
       self->erase(swig::getpos(self,i));
     }
-SWIGINTERN std::vector< ViewVertex * >::value_type std_vector_Sl_ViewVertex_Sm__Sg____getitem__(std::vector< ViewVertex * > *self,std::vector< ViewVertex * >::difference_type i){
+SWIGINTERN std::vector<ViewVertex * >::value_type std_vector_Sl_ViewVertex_Sm__Sg____getitem__(std::vector<ViewVertex * > *self,std::vector<ViewVertex * >::difference_type i){
       return *(swig::cgetpos(self, i));
     }
-SWIGINTERN void std_vector_Sl_ViewVertex_Sm__Sg____setitem__(std::vector< ViewVertex * > *self,std::vector< ViewVertex * >::difference_type i,std::vector< ViewVertex * >::value_type x){
+SWIGINTERN void std_vector_Sl_ViewVertex_Sm__Sg____setitem__(std::vector<ViewVertex * > *self,std::vector<ViewVertex * >::difference_type i,std::vector<ViewVertex * >::value_type x){
       *(swig::getpos(self,i)) = x;
     }
-SWIGINTERN void std_vector_Sl_ViewVertex_Sm__Sg__append(std::vector< ViewVertex * > *self,std::vector< ViewVertex * >::value_type x){
+SWIGINTERN void std_vector_Sl_ViewVertex_Sm__Sg__append(std::vector<ViewVertex * > *self,std::vector<ViewVertex * >::value_type x){
       self->push_back(x);
     }
 
@@ -5196,49 +5179,49 @@ SWIGINTERN void std_vector_Sl_ViewVertex_Sm__Sg__append(std::vector< ViewVertex
 
 
       namespace swig {
-	template <>  struct traits<std::vector<SVertex*, std::allocator< SVertex * > > > {
+	template <>  struct traits<std::vector<SVertex*, std::allocator<SVertex * > > > {
 	  typedef value_category category;
 	  static const char* type_name() {
-	    return "std::vector<" "SVertex" " *," "std::allocator< SVertex * >" " >";
+	    return "std::vector<" "SVertex" " *," "std::allocator<SVertex * >" " >";
 	  }
 	};
       }
     
-SWIGINTERN swig::PySwigIterator *std_vector_Sl_SVertex_Sm__Sg__iterator(std::vector< SVertex * > *self,PyObject **PYTHON_SELF){
+SWIGINTERN swig::PySwigIterator *std_vector_Sl_SVertex_Sm__Sg__iterator(std::vector<SVertex * > *self,PyObject **PYTHON_SELF){
       return swig::make_output_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
     }
-SWIGINTERN bool std_vector_Sl_SVertex_Sm__Sg____nonzero__(std::vector< SVertex * > const *self){
+SWIGINTERN bool std_vector_Sl_SVertex_Sm__Sg____nonzero__(std::vector<SVertex * > const *self){
       return !(self->empty());
     }
-SWIGINTERN std::vector< SVertex * >::size_type std_vector_Sl_SVertex_Sm__Sg____len__(std::vector< SVertex * > const *self){
+SWIGINTERN std::vector<SVertex * >::size_type std_vector_Sl_SVertex_Sm__Sg____len__(std::vector<SVertex * > const *self){
       return self->size();
     }
-SWIGINTERN std::vector< SVertex * >::value_type std_vector_Sl_SVertex_Sm__Sg__pop(std::vector< SVertex * > *self){
+SWIGINTERN std::vector<SVertex * >::value_type std_vector_Sl_SVertex_Sm__Sg__pop(std::vector<SVertex * > *self){
       if (self->size() == 0)
 	throw std::out_of_range("pop from empty container");
-      std::vector<SVertex*,std::allocator< SVertex * > >::value_type x = self->back();
+      std::vector<SVertex*,std::allocator<SVertex * > >::value_type x = self->back();
       self->pop_back();
       return x;
     }
-SWIGINTERN std::vector< SVertex *,std::allocator< SVertex * > > *std_vector_Sl_SVertex_Sm__Sg____getslice__(std::vector< SVertex * > *self,std::vector< SVertex * >::difference_type i,std::vector< SVertex * >::difference_type j){
+SWIGINTERN std::vector<SVertex *,std::allocator<SVertex * > > *std_vector_Sl_SVertex_Sm__Sg____getslice__(std::vector<SVertex * > *self,std::vector<SVertex * >::difference_type i,std::vector<SVertex * >::difference_type j){
       return swig::getslice(self, i, j);
     }
-SWIGINTERN void std_vector_Sl_SVertex_Sm__Sg____setslice__(std::vector< SVertex * > *self,std::vector< SVertex * >::difference_type i,std::vector< SVertex * >::difference_type j,std::vector< SVertex *,std::allocator< SVertex * > > const &v){
+SWIGINTERN void std_vector_Sl_SVertex_Sm__Sg____setslice__(std::vector<SVertex * > *self,std::vector<SVertex * >::difference_type i,std::vector<SVertex * >::difference_type j,std::vector<SVertex *,std::allocator<SVertex * > > const &v){
       swig::setslice(self, i, j, v);
     }
-SWIGINTERN void std_vector_Sl_SVertex_Sm__Sg____delslice__(std::vector< SVertex * > *self,std::vector< SVertex * >::difference_type i,std::vector< SVertex * >::difference_type j){
+SWIGINTERN void std_vector_Sl_SVertex_Sm__Sg____delslice__(std::vector<SVertex * > *self,std::vector<SVertex * >::difference_type i,std::vector<SVertex * >::difference_type j){
       swig::delslice(self, i, j);
     }
-SWIGINTERN void std_vector_Sl_SVertex_Sm__Sg____delitem__(std::vector< SVertex * > *self,std::vector< SVertex * >::difference_type i){
+SWIGINTERN void std_vector_Sl_SVertex_Sm__Sg____delitem__(std::vector<SVertex * > *self,std::vector<SVertex * >::difference_type i){
       self->erase(swig::getpos(self,i));
     }
-SWIGINTERN std::vector< SVertex * >::value_type std_vector_Sl_SVertex_Sm__Sg____getitem__(std::vector< SVertex * > *self,std::vector< SVertex * >::difference_type i){
+SWIGINTERN std::vector<SVertex * >::value_type std_vector_Sl_SVertex_Sm__Sg____getitem__(std::vector<SVertex * > *self,std::vector<SVertex * >::difference_type i){
       return *(swig::cgetpos(self, i));
     }
-SWIGINTERN void std_vector_Sl_SVertex_Sm__Sg____setitem__(std::vector< SVertex * > *self,std::vector< SVertex * >::difference_type i,std::vector< SVertex * >::value_type x){
+SWIGINTERN void std_vector_Sl_SVertex_Sm__Sg____setitem__(std::vector<SVertex * > *self,std::vector<SVertex * >::difference_type i,std::vector<SVertex * >::value_type x){
       *(swig::getpos(self,i)) = x;
     }
-SWIGINTERN void std_vector_Sl_SVertex_Sm__Sg__append(std::vector< SVertex * > *self,std::vector< SVertex * >::value_type x){
+SWIGINTERN void std_vector_Sl_SVertex_Sm__Sg__append(std::vector<SVertex * > *self,std::vector<SVertex * >::value_type x){
       self->push_back(x);
     }
 
@@ -5337,49 +5320,49 @@ SWIG_AsPtr_std_string (PyObject * obj, std::string **val)
 
 
       namespace swig {
-	template <>  struct traits<std::vector<StrokeShader*, std::allocator< StrokeShader * > > > {
+	template <>  struct traits<std::vector<StrokeShader*, std::allocator<StrokeShader * > > > {
 	  typedef value_category category;
 	  static const char* type_name() {
-	    return "std::vector<" "StrokeShader" " *," "std::allocator< StrokeShader * >" " >";
+	    return "std::vector<" "StrokeShader" " *," "std::allocator<StrokeShader * >" " >";
 	  }
 	};
       }
     
-SWIGINTERN swig::PySwigIterator *std_vector_Sl_StrokeShader_Sm__Sg__iterator(std::vector< StrokeShader * > *self,PyObject **PYTHON_SELF){
+SWIGINTERN swig::PySwigIterator *std_vector_Sl_StrokeShader_Sm__Sg__iterator(std::vector<StrokeShader * > *self,PyObject **PYTHON_SELF){
       return swig::make_output_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
     }
-SWIGINTERN bool std_vector_Sl_StrokeShader_Sm__Sg____nonzero__(std::vector< StrokeShader * > const *self){
+SWIGINTERN bool std_vector_Sl_StrokeShader_Sm__Sg____nonzero__(std::vector<StrokeShader * > const *self){
       return !(self->empty());
     }
-SWIGINTERN std::vector< StrokeShader * >::size_type std_vector_Sl_StrokeShader_Sm__Sg____len__(std::vector< StrokeShader * > const *self){
+SWIGINTERN std::vector<StrokeShader * >::size_type std_vector_Sl_StrokeShader_Sm__Sg____len__(std::vector<StrokeShader * > const *self){
       return self->size();
     }
-SWIGINTERN std::vector< StrokeShader * >::value_type std_vector_Sl_StrokeShader_Sm__Sg__pop(std::vector< StrokeShader * > *self){
+SWIGINTERN std::vector<StrokeShader * >::value_type std_vector_Sl_StrokeShader_Sm__Sg__pop(std::vector<StrokeShader * > *self){
       if (self->size() == 0)
 	throw std::out_of_range("pop from empty container");
-      std::vector<StrokeShader*,std::allocator< StrokeShader * > >::value_type x = self->back();
+      std::vector<StrokeShader*,std::allocator<StrokeShader * > >::value_type x = self->back();
       self->pop_back();
       return x;
     }
-SWIGINTERN std::vector< StrokeShader *,std::allocator< StrokeShader * > > *std_vector_Sl_StrokeShader_Sm__Sg____getslice__(std::vector< StrokeShader * > *self,std::vector< StrokeShader * >::difference_type i,std::vector< StrokeShader * >::difference_type j){
+SWIGINTERN std::vector<StrokeShader *,std::allocator<StrokeShader * > > *std_vector_Sl_StrokeShader_Sm__Sg____getslice__(std::vector<StrokeShader * > *self,std::vector<StrokeShader * >::difference_type i,std::vector<StrokeShader * >::difference_type j){
       return swig::getslice(self, i, j);
     }
-SWIGINTERN void std_vector_Sl_StrokeShader_Sm__Sg____setslice__(std::vector< StrokeShader * > *self,std::vector< StrokeShader * >::difference_type i,std::vector< StrokeShader * >::difference_type j,std::vector< StrokeShader *,std::allocator< StrokeShader * > > const &v){
+SWIGINTERN void std_vector_Sl_StrokeShader_Sm__Sg____setslice__(std::vector<StrokeShader * > *self,std::vector<StrokeShader * >::difference_type i,std::vector<StrokeShader * >::difference_type j,std::vector<StrokeShader *,std::allocator<StrokeShader * > > const &v){
       swig::setslice(self, i, j, v);
     }
-SWIGINTERN void std_vector_Sl_StrokeShader_Sm__Sg____delslice__(std::vector< StrokeShader * > *self,std::vector< StrokeShader * >::difference_type i,std::vector< StrokeShader * >::difference_type j){
+SWIGINTERN void std_vector_Sl_StrokeShader_Sm__Sg____delslice__(std::vector<StrokeShader * > *self,std::vector<StrokeShader * >::difference_type i,std::vector<StrokeShader * >::difference_type j){
       swig::delslice(self, i, j);
     }
-SWIGINTERN void std_vector_Sl_StrokeShader_Sm__Sg____delitem__(std::vector< StrokeShader * > *self,std::vector< StrokeShader * >::difference_type i){
+SWIGINTERN void std_vector_Sl_StrokeShader_Sm__Sg____delitem__(std::vector<StrokeShader * > *self,std::vector<StrokeShader * >::difference_type i){
       self->erase(swig::getpos(self,i));
     }
-SWIGINTERN std::vector< StrokeShader * >::value_type std_vector_Sl_StrokeShader_Sm__Sg____getitem__(std::vector< StrokeShader * > *self,std::vector< StrokeShader * >::difference_type i){
+SWIGINTERN std::vector<StrokeShader * >::value_type std_vector_Sl_StrokeShader_Sm__Sg____getitem__(std::vector<StrokeShader * > *self,std::vector<StrokeShader * >::difference_type i){
       return *(swig::cgetpos(self, i));
     }
-SWIGINTERN void std_vector_Sl_StrokeShader_Sm__Sg____setitem__(std::vector< StrokeShader * > *self,std::vector< StrokeShader * >::difference_type i,std::vector< StrokeShader * >::value_type x){
+SWIGINTERN void std_vector_Sl_StrokeShader_Sm__Sg____setitem__(std::vector<StrokeShader * > *self,std::vector<StrokeShader * >::difference_type i,std::vector<StrokeShader * >::value_type x){
       *(swig::getpos(self,i)) = x;
     }
-SWIGINTERN void std_vector_Sl_StrokeShader_Sm__Sg__append(std::vector< StrokeShader * > *self,std::vector< StrokeShader * >::value_type x){
+SWIGINTERN void std_vector_Sl_StrokeShader_Sm__Sg__append(std::vector<StrokeShader * > *self,std::vector<StrokeShader * >::value_type x){
       self->push_back(x);
     }
 
@@ -5465,7 +5448,7 @@ ViewEdge *SwigDirector_ViewEdgeViewEdgeIterator::operator *() {
     Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""ViewEdge *""'");
   }
   c_result = reinterpret_cast< ViewEdge * >(swig_argp);
-  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own /* & TODO: SWIG_POINTER_OWN */);
+  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own);
   return (ViewEdge *) c_result;
 }
 
@@ -5498,7 +5481,7 @@ ViewEdge *SwigDirector_ViewEdgeViewEdgeIterator::operator ->() {
     Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""ViewEdge *""'");
   }
   c_result = reinterpret_cast< ViewEdge * >(swig_argp);
-  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own /* & TODO: SWIG_POINTER_OWN */);
+  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own);
   return (ViewEdge *) c_result;
 }
 
@@ -5685,8 +5668,8 @@ bool SwigDirector_ViewEdgeViewEdgeIterator::operator !=(ViewEdgeInternal::ViewEd
 }
 
 
-SwigDirector_UnaryFunction0DVoid::SwigDirector_UnaryFunction0DVoid(PyObject *self): UnaryFunction0D< void >(), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction0D< void > *)this, this); 
+SwigDirector_UnaryFunction0DVoid::SwigDirector_UnaryFunction0DVoid(PyObject *self): UnaryFunction0D<void >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction0D<void > *)this, this); 
 }
 
 
@@ -5748,8 +5731,8 @@ void SwigDirector_UnaryFunction0DVoid::operator ()(Interface0DIterator &iter) {
 }
 
 
-SwigDirector_UnaryFunction0DUnsigned::SwigDirector_UnaryFunction0DUnsigned(PyObject *self): UnaryFunction0D< unsigned int >(), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction0D< unsigned int > *)this, this); 
+SwigDirector_UnaryFunction0DUnsigned::SwigDirector_UnaryFunction0DUnsigned(PyObject *self): UnaryFunction0D<unsigned int >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction0D<unsigned int > *)this, this); 
 }
 
 
@@ -5819,8 +5802,8 @@ unsigned int SwigDirector_UnaryFunction0DUnsigned::operator ()(Interface0DIterat
 }
 
 
-SwigDirector_UnaryFunction0DFloat::SwigDirector_UnaryFunction0DFloat(PyObject *self): UnaryFunction0D< float >(), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction0D< float > *)this, this); 
+SwigDirector_UnaryFunction0DFloat::SwigDirector_UnaryFunction0DFloat(PyObject *self): UnaryFunction0D<float >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction0D<float > *)this, this); 
 }
 
 
@@ -5890,8 +5873,8 @@ float SwigDirector_UnaryFunction0DFloat::operator ()(Interface0DIterator &iter)
 }
 
 
-SwigDirector_UnaryFunction0DDouble::SwigDirector_UnaryFunction0DDouble(PyObject *self): UnaryFunction0D< double >(), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction0D< double > *)this, this); 
+SwigDirector_UnaryFunction0DDouble::SwigDirector_UnaryFunction0DDouble(PyObject *self): UnaryFunction0D<double >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction0D<double > *)this, this); 
 }
 
 
@@ -5961,8 +5944,8 @@ double SwigDirector_UnaryFunction0DDouble::operator ()(Interface0DIterator &iter
 }
 
 
-SwigDirector_UnaryFunction0DVec2f::SwigDirector_UnaryFunction0DVec2f(PyObject *self): UnaryFunction0D< Geometry::Vec2f >(), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction0D< Geometry::Vec2f > *)this, this); 
+SwigDirector_UnaryFunction0DVec2f::SwigDirector_UnaryFunction0DVec2f(PyObject *self): UnaryFunction0D<Geometry::Vec2f >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction0D<Geometry::Vec2f > *)this, this); 
 }
 
 
@@ -6001,11 +5984,11 @@ std::string SwigDirector_UnaryFunction0DVec2f::getName() const {
 }
 
 
-VecMat::Vec2< float > SwigDirector_UnaryFunction0DVec2f::operator ()(Interface0DIterator &iter) {
+VecMat::Vec2<float > SwigDirector_UnaryFunction0DVec2f::operator ()(Interface0DIterator &iter) {
   void *swig_argp ;
   int swig_res = 0 ;
   
-  VecMat::Vec2< float > c_result;
+  VecMat::Vec2<float > c_result;
   swig::PyObject_var obj0;
   obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&iter), SWIGTYPE_p_Interface0DIterator,  0 );
   if (!swig_get_self()) {
@@ -6025,18 +6008,18 @@ VecMat::Vec2< float > SwigDirector_UnaryFunction0DVec2f::operator ()(Interface0D
       Swig::DirectorMethodException::raise("Error detected when calling 'UnaryFunction0DVec2f.__call__'");
     }
   }
-  swig_res = SWIG_ConvertPtr(result,&swig_argp,SWIGTYPE_p_VecMat__Vec2T_float_t,  0  | 0);
+  swig_res = SWIG_ConvertPtr(result,&swig_argp,SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0  | 0);
   if (!SWIG_IsOK(swig_res)) {
-    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""VecMat::Vec2< float >""'");
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""VecMat::Vec2<float >""'");
   }
-  c_result = *(reinterpret_cast< VecMat::Vec2< float > * >(swig_argp));
-  if (SWIG_IsNewObj(swig_res)) delete reinterpret_cast< VecMat::Vec2< float > * >(swig_argp);
-  return (VecMat::Vec2< float >) c_result;
+  c_result = *(reinterpret_cast< VecMat::Vec2<float > * >(swig_argp));
+  if (SWIG_IsNewObj(swig_res)) delete reinterpret_cast< VecMat::Vec2<float > * >(swig_argp);
+  return (VecMat::Vec2<float >) c_result;
 }
 
 
-SwigDirector_UnaryFunction0DVec3f::SwigDirector_UnaryFunction0DVec3f(PyObject *self): UnaryFunction0D< Geometry::Vec3f >(), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction0D< Geometry::Vec3f > *)this, this); 
+SwigDirector_UnaryFunction0DVec3f::SwigDirector_UnaryFunction0DVec3f(PyObject *self): UnaryFunction0D<Geometry::Vec3f >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction0D<Geometry::Vec3f > *)this, this); 
 }
 
 
@@ -6075,11 +6058,11 @@ std::string SwigDirector_UnaryFunction0DVec3f::getName() const {
 }
 
 
-VecMat::Vec3< float > SwigDirector_UnaryFunction0DVec3f::operator ()(Interface0DIterator &iter) {
+VecMat::Vec3<float > SwigDirector_UnaryFunction0DVec3f::operator ()(Interface0DIterator &iter) {
   void *swig_argp ;
   int swig_res = 0 ;
   
-  VecMat::Vec3< float > c_result;
+  VecMat::Vec3<float > c_result;
   swig::PyObject_var obj0;
   obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&iter), SWIGTYPE_p_Interface0DIterator,  0 );
   if (!swig_get_self()) {
@@ -6099,18 +6082,18 @@ VecMat::Vec3< float > SwigDirector_UnaryFunction0DVec3f::operator ()(Interface0D
       Swig::DirectorMethodException::raise("Error detected when calling 'UnaryFunction0DVec3f.__call__'");
     }
   }
-  swig_res = SWIG_ConvertPtr(result,&swig_argp,SWIGTYPE_p_VecMat__Vec3T_float_t,  0  | 0);
+  swig_res = SWIG_ConvertPtr(result,&swig_argp,SWIGTYPE_p_VecMat__Vec3Tfloat_t,  0  | 0);
   if (!SWIG_IsOK(swig_res)) {
-    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""VecMat::Vec3< float >""'");
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""VecMat::Vec3<float >""'");
   }
-  c_result = *(reinterpret_cast< VecMat::Vec3< float > * >(swig_argp));
-  if (SWIG_IsNewObj(swig_res)) delete reinterpret_cast< VecMat::Vec3< float > * >(swig_argp);
-  return (VecMat::Vec3< float >) c_result;
+  c_result = *(reinterpret_cast< VecMat::Vec3<float > * >(swig_argp));
+  if (SWIG_IsNewObj(swig_res)) delete reinterpret_cast< VecMat::Vec3<float > * >(swig_argp);
+  return (VecMat::Vec3<float >) c_result;
 }
 
 
-SwigDirector_UnaryFunction0DId::SwigDirector_UnaryFunction0DId(PyObject *self): UnaryFunction0D< Id >(), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction0D< Id > *)this, this); 
+SwigDirector_UnaryFunction0DId::SwigDirector_UnaryFunction0DId(PyObject *self): UnaryFunction0D<Id >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction0D<Id > *)this, this); 
 }
 
 
@@ -6183,15 +6166,15 @@ Id SwigDirector_UnaryFunction0DId::operator ()(Interface0DIterator &iter) {
 }
 
 
-SwigDirector_UnaryFunction1DVoid::SwigDirector_UnaryFunction1DVoid(PyObject *self): UnaryFunction1D< void >(), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction1D< void > *)this, this); 
+SwigDirector_UnaryFunction1DVoid::SwigDirector_UnaryFunction1DVoid(PyObject *self): UnaryFunction1D<void >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D<void > *)this, this); 
 }
 
 
 
 
-SwigDirector_UnaryFunction1DVoid::SwigDirector_UnaryFunction1DVoid(PyObject *self, IntegrationType iType): UnaryFunction1D< void >(iType), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction1D< void > *)this, this); 
+SwigDirector_UnaryFunction1DVoid::SwigDirector_UnaryFunction1DVoid(PyObject *self, IntegrationType iType): UnaryFunction1D<void >(iType), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D<void > *)this, this); 
 }
 
 
@@ -6253,15 +6236,15 @@ void SwigDirector_UnaryFunction1DVoid::operator ()(Interface1D &inter) {
 }
 
 
-SwigDirector_UnaryFunction1DUnsigned::SwigDirector_UnaryFunction1DUnsigned(PyObject *self): UnaryFunction1D< unsigned int >(), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction1D< unsigned int > *)this, this); 
+SwigDirector_UnaryFunction1DUnsigned::SwigDirector_UnaryFunction1DUnsigned(PyObject *self): UnaryFunction1D<unsigned int >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D<unsigned int > *)this, this); 
 }
 
 
 
 
-SwigDirector_UnaryFunction1DUnsigned::SwigDirector_UnaryFunction1DUnsigned(PyObject *self, IntegrationType iType): UnaryFunction1D< unsigned int >(iType), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction1D< unsigned int > *)this, this); 
+SwigDirector_UnaryFunction1DUnsigned::SwigDirector_UnaryFunction1DUnsigned(PyObject *self, IntegrationType iType): UnaryFunction1D<unsigned int >(iType), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D<unsigned int > *)this, this); 
 }
 
 
@@ -6331,15 +6314,15 @@ unsigned int SwigDirector_UnaryFunction1DUnsigned::operator ()(Interface1D &inte
 }
 
 
-SwigDirector_UnaryFunction1DFloat::SwigDirector_UnaryFunction1DFloat(PyObject *self): UnaryFunction1D< float >(), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction1D< float > *)this, this); 
+SwigDirector_UnaryFunction1DFloat::SwigDirector_UnaryFunction1DFloat(PyObject *self): UnaryFunction1D<float >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D<float > *)this, this); 
 }
 
 
 
 
-SwigDirector_UnaryFunction1DFloat::SwigDirector_UnaryFunction1DFloat(PyObject *self, IntegrationType iType): UnaryFunction1D< float >(iType), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction1D< float > *)this, this); 
+SwigDirector_UnaryFunction1DFloat::SwigDirector_UnaryFunction1DFloat(PyObject *self, IntegrationType iType): UnaryFunction1D<float >(iType), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D<float > *)this, this); 
 }
 
 
@@ -6409,15 +6392,15 @@ float SwigDirector_UnaryFunction1DFloat::operator ()(Interface1D &inter) {
 }
 
 
-SwigDirector_UnaryFunction1DDouble::SwigDirector_UnaryFunction1DDouble(PyObject *self): UnaryFunction1D< double >(), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction1D< double > *)this, this); 
+SwigDirector_UnaryFunction1DDouble::SwigDirector_UnaryFunction1DDouble(PyObject *self): UnaryFunction1D<double >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D<double > *)this, this); 
 }
 
 
 
 
-SwigDirector_UnaryFunction1DDouble::SwigDirector_UnaryFunction1DDouble(PyObject *self, IntegrationType iType): UnaryFunction1D< double >(iType), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction1D< double > *)this, this); 
+SwigDirector_UnaryFunction1DDouble::SwigDirector_UnaryFunction1DDouble(PyObject *self, IntegrationType iType): UnaryFunction1D<double >(iType), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D<double > *)this, this); 
 }
 
 
@@ -6487,15 +6470,15 @@ double SwigDirector_UnaryFunction1DDouble::operator ()(Interface1D &inter) {
 }
 
 
-SwigDirector_UnaryFunction1DVec2f::SwigDirector_UnaryFunction1DVec2f(PyObject *self): UnaryFunction1D< Geometry::Vec2f >(), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction1D< Geometry::Vec2f > *)this, this); 
+SwigDirector_UnaryFunction1DVec2f::SwigDirector_UnaryFunction1DVec2f(PyObject *self): UnaryFunction1D<Geometry::Vec2f >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D<Geometry::Vec2f > *)this, this); 
 }
 
 
 
 
-SwigDirector_UnaryFunction1DVec2f::SwigDirector_UnaryFunction1DVec2f(PyObject *self, IntegrationType iType): UnaryFunction1D< Geometry::Vec2f >(iType), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction1D< Geometry::Vec2f > *)this, this); 
+SwigDirector_UnaryFunction1DVec2f::SwigDirector_UnaryFunction1DVec2f(PyObject *self, IntegrationType iType): UnaryFunction1D<Geometry::Vec2f >(iType), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D<Geometry::Vec2f > *)this, this); 
 }
 
 
@@ -6534,11 +6517,11 @@ std::string SwigDirector_UnaryFunction1DVec2f::getName() const {
 }
 
 
-VecMat::Vec2< float > SwigDirector_UnaryFunction1DVec2f::operator ()(Interface1D &inter) {
+VecMat::Vec2<float > SwigDirector_UnaryFunction1DVec2f::operator ()(Interface1D &inter) {
   void *swig_argp ;
   int swig_res = 0 ;
   
-  VecMat::Vec2< float > c_result;
+  VecMat::Vec2<float > c_result;
   swig::PyObject_var obj0;
   obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&inter), SWIGTYPE_p_Interface1D,  0 );
   if (!swig_get_self()) {
@@ -6558,25 +6541,25 @@ VecMat::Vec2< float > SwigDirector_UnaryFunction1DVec2f::operator ()(Interface1D
       Swig::DirectorMethodException::raise("Error detected when calling 'UnaryFunction1DVec2f.__call__'");
     }
   }
-  swig_res = SWIG_ConvertPtr(result,&swig_argp,SWIGTYPE_p_VecMat__Vec2T_float_t,  0  | 0);
+  swig_res = SWIG_ConvertPtr(result,&swig_argp,SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0  | 0);
   if (!SWIG_IsOK(swig_res)) {
-    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""VecMat::Vec2< float >""'");
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""VecMat::Vec2<float >""'");
   }
-  c_result = *(reinterpret_cast< VecMat::Vec2< float > * >(swig_argp));
-  if (SWIG_IsNewObj(swig_res)) delete reinterpret_cast< VecMat::Vec2< float > * >(swig_argp);
-  return (VecMat::Vec2< float >) c_result;
+  c_result = *(reinterpret_cast< VecMat::Vec2<float > * >(swig_argp));
+  if (SWIG_IsNewObj(swig_res)) delete reinterpret_cast< VecMat::Vec2<float > * >(swig_argp);
+  return (VecMat::Vec2<float >) c_result;
 }
 
 
-SwigDirector_UnaryFunction1DVec3f::SwigDirector_UnaryFunction1DVec3f(PyObject *self): UnaryFunction1D< Geometry::Vec3f >(), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction1D< Geometry::Vec3f > *)this, this); 
+SwigDirector_UnaryFunction1DVec3f::SwigDirector_UnaryFunction1DVec3f(PyObject *self): UnaryFunction1D<Geometry::Vec3f >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D<Geometry::Vec3f > *)this, this); 
 }
 
 
 
 
-SwigDirector_UnaryFunction1DVec3f::SwigDirector_UnaryFunction1DVec3f(PyObject *self, IntegrationType iType): UnaryFunction1D< Geometry::Vec3f >(iType), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction1D< Geometry::Vec3f > *)this, this); 
+SwigDirector_UnaryFunction1DVec3f::SwigDirector_UnaryFunction1DVec3f(PyObject *self, IntegrationType iType): UnaryFunction1D<Geometry::Vec3f >(iType), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D<Geometry::Vec3f > *)this, this); 
 }
 
 
@@ -6615,11 +6598,11 @@ std::string SwigDirector_UnaryFunction1DVec3f::getName() const {
 }
 
 
-VecMat::Vec3< float > SwigDirector_UnaryFunction1DVec3f::operator ()(Interface1D &inter) {
+VecMat::Vec3<float > SwigDirector_UnaryFunction1DVec3f::operator ()(Interface1D &inter) {
   void *swig_argp ;
   int swig_res = 0 ;
   
-  VecMat::Vec3< float > c_result;
+  VecMat::Vec3<float > c_result;
   swig::PyObject_var obj0;
   obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&inter), SWIGTYPE_p_Interface1D,  0 );
   if (!swig_get_self()) {
@@ -6639,13 +6622,13 @@ VecMat::Vec3< float > SwigDirector_UnaryFunction1DVec3f::operator ()(Interface1D
       Swig::DirectorMethodException::raise("Error detected when calling 'UnaryFunction1DVec3f.__call__'");
     }
   }
-  swig_res = SWIG_ConvertPtr(result,&swig_argp,SWIGTYPE_p_VecMat__Vec3T_float_t,  0  | 0);
+  swig_res = SWIG_ConvertPtr(result,&swig_argp,SWIGTYPE_p_VecMat__Vec3Tfloat_t,  0  | 0);
   if (!SWIG_IsOK(swig_res)) {
-    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""VecMat::Vec3< float >""'");
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""VecMat::Vec3<float >""'");
   }
-  c_result = *(reinterpret_cast< VecMat::Vec3< float > * >(swig_argp));
-  if (SWIG_IsNewObj(swig_res)) delete reinterpret_cast< VecMat::Vec3< float > * >(swig_argp);
-  return (VecMat::Vec3< float >) c_result;
+  c_result = *(reinterpret_cast< VecMat::Vec3<float > * >(swig_argp));
+  if (SWIG_IsNewObj(swig_res)) delete reinterpret_cast< VecMat::Vec3<float > * >(swig_argp);
+  return (VecMat::Vec3<float >) c_result;
 }
 
 
@@ -6724,7 +6707,7 @@ ViewEdge *SwigDirector_ChainingIterator::operator *() {
     Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""ViewEdge *""'");
   }
   c_result = reinterpret_cast< ViewEdge * >(swig_argp);
-  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own /* & TODO: SWIG_POINTER_OWN */);
+  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own);
   return (ViewEdge *) c_result;
 }
 
@@ -6757,7 +6740,7 @@ ViewEdge *SwigDirector_ChainingIterator::operator ->() {
     Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""ViewEdge *""'");
   }
   c_result = reinterpret_cast< ViewEdge * >(swig_argp);
-  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own /* & TODO: SWIG_POINTER_OWN */);
+  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own);
   return (ViewEdge *) c_result;
 }
 
@@ -6995,7 +6978,7 @@ ViewEdge *SwigDirector_ChainingIterator::traverse(AdjacencyIterator const &it) {
     Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""ViewEdge *""'");
   }
   c_result = reinterpret_cast< ViewEdge * >(swig_argp);
-  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own /* & TODO: SWIG_POINTER_OWN */);
+  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own);
   return (ViewEdge *) c_result;
 }
 
@@ -7075,7 +7058,7 @@ ViewEdge *SwigDirector_ChainSilhouetteIterator::operator *() {
     Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""ViewEdge *""'");
   }
   c_result = reinterpret_cast< ViewEdge * >(swig_argp);
-  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own /* & TODO: SWIG_POINTER_OWN */);
+  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own);
   return (ViewEdge *) c_result;
 }
 
@@ -7108,7 +7091,7 @@ ViewEdge *SwigDirector_ChainSilhouetteIterator::operator ->() {
     Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""ViewEdge *""'");
   }
   c_result = reinterpret_cast< ViewEdge * >(swig_argp);
-  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own /* & TODO: SWIG_POINTER_OWN */);
+  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own);
   return (ViewEdge *) c_result;
 }
 
@@ -7346,7 +7329,7 @@ ViewEdge *SwigDirector_ChainSilhouetteIterator::traverse(AdjacencyIterator const
     Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""ViewEdge *""'");
   }
   c_result = reinterpret_cast< ViewEdge * >(swig_argp);
-  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own /* & TODO: SWIG_POINTER_OWN */);
+  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own);
   return (ViewEdge *) c_result;
 }
 
@@ -7433,7 +7416,7 @@ ViewEdge *SwigDirector_ChainPredicateIterator::operator *() {
     Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""ViewEdge *""'");
   }
   c_result = reinterpret_cast< ViewEdge * >(swig_argp);
-  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own /* & TODO: SWIG_POINTER_OWN */);
+  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own);
   return (ViewEdge *) c_result;
 }
 
@@ -7466,7 +7449,7 @@ ViewEdge *SwigDirector_ChainPredicateIterator::operator ->() {
     Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""ViewEdge *""'");
   }
   c_result = reinterpret_cast< ViewEdge * >(swig_argp);
-  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own /* & TODO: SWIG_POINTER_OWN */);
+  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own);
   return (ViewEdge *) c_result;
 }
 
@@ -7704,7 +7687,7 @@ ViewEdge *SwigDirector_ChainPredicateIterator::traverse(AdjacencyIterator const
     Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""ViewEdge *""'");
   }
   c_result = reinterpret_cast< ViewEdge * >(swig_argp);
-  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own /* & TODO: SWIG_POINTER_OWN */);
+  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own);
   return (ViewEdge *) c_result;
 }
 
@@ -8123,7 +8106,7 @@ SWIGINTERN PyObject *_wrap_PySwigIterator_incr(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -8153,10 +8136,7 @@ SWIGINTERN PyObject *_wrap_PySwigIterator_incr(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'PySwigIterator_incr'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    incr(swig::PySwigIterator *,size_t)\n"
-    "    incr(swig::PySwigIterator *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'PySwigIterator_incr'.\n  Possible C/C++ prototypes are:\n    incr(size_t)\n    incr()\n");
   return NULL;
 }
 
@@ -8240,7 +8220,7 @@ SWIGINTERN PyObject *_wrap_PySwigIterator_decr(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -8270,10 +8250,7 @@ SWIGINTERN PyObject *_wrap_PySwigIterator_decr(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'PySwigIterator_decr'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    decr(swig::PySwigIterator *,size_t)\n"
-    "    decr(swig::PySwigIterator *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'PySwigIterator_decr'.\n  Possible C/C++ prototypes are:\n    decr(size_t)\n    decr()\n");
   return NULL;
 }
 
@@ -8763,7 +8740,7 @@ SWIGINTERN PyObject *_wrap_PySwigIterator___sub__(PyObject *self, PyObject *args
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -8804,14 +8781,14 @@ fail:
 
 SWIGINTERN PyObject *PySwigIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_swig__PySwigIterator, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_vectorInt_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
   PyObject **arg2 = (PyObject **) 0 ;
   swig::PySwigIterator *result = 0 ;
   void *argp1 = 0 ;
@@ -8820,11 +8797,11 @@ SWIGINTERN PyObject *_wrap_vectorInt_iterator(PyObject *SWIGUNUSEDPARM(self), Py
   
   arg2 = &obj0;
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_iterator" "', argument " "1"" of type '" "std::vector< int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_iterator" "', argument " "1"" of type '" "std::vector<int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
   result = (swig::PySwigIterator *)std_vector_Sl_int_Sg__iterator(arg1,arg2);
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__PySwigIterator, SWIG_POINTER_OWN |  0 );
   return resultobj;
@@ -8835,19 +8812,19 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt___nonzero__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt___nonzero__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___nonzero__" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___nonzero__" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  result = (bool)std_vector_Sl_int_Sg____nonzero__((std::vector< int > const *)arg1);
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  result = (bool)std_vector_Sl_int_Sg____nonzero__((std::vector<int > const *)arg1);
   resultobj = SWIG_From_bool(static_cast< bool >(result));
   return resultobj;
 fail:
@@ -8857,19 +8834,19 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt___len__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
-  std::vector< int >::size_type result;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt___len__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___len__" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___len__" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  result = std_vector_Sl_int_Sg____len__((std::vector< int > const *)arg1);
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  result = std_vector_Sl_int_Sg____len__((std::vector<int > const *)arg1);
   resultobj = SWIG_From_size_t(static_cast< size_t >(result));
   return resultobj;
 fail:
@@ -8879,20 +8856,20 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
-  std::vector< int >::value_type result;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_pop" "', argument " "1"" of type '" "std::vector< int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_pop" "', argument " "1"" of type '" "std::vector<int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
   try {
-    result = (std::vector< int >::value_type)std_vector_Sl_int_Sg__pop(arg1);
+    result = (std::vector<int >::value_type)std_vector_Sl_int_Sg__pop(arg1);
   }
   catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -8907,10 +8884,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
-  std::vector< int >::difference_type arg2 ;
-  std::vector< int >::difference_type arg3 ;
-  std::vector< int,std::allocator< int > > *result = 0 ;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::difference_type arg2 ;
+  std::vector<int >::difference_type arg3 ;
+  std::vector<int,std::allocator<int > > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -8922,29 +8899,29 @@ SWIGINTERN PyObject *_wrap_vectorInt___getslice__(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:vectorInt___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___getslice__" "', argument " "1"" of type '" "std::vector< int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___getslice__" "', argument " "1"" of type '" "std::vector<int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt___getslice__" "', argument " "2"" of type '" "std::vector< int >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt___getslice__" "', argument " "2"" of type '" "std::vector<int >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector< int >::difference_type >(val2);
+  arg2 = static_cast< std::vector<int >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt___getslice__" "', argument " "3"" of type '" "std::vector< int >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt___getslice__" "', argument " "3"" of type '" "std::vector<int >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector< int >::difference_type >(val3);
+  arg3 = static_cast< std::vector<int >::difference_type >(val3);
   try {
-    result = (std::vector< int,std::allocator< int > > *)std_vector_Sl_int_Sg____getslice__(arg1,arg2,arg3);
+    result = (std::vector<int,std::allocator<int > > *)std_vector_Sl_int_Sg____getslice__(arg1,arg2,arg3);
   }
   catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
   
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -8953,10 +8930,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt___setslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
-  std::vector< int >::difference_type arg2 ;
-  std::vector< int >::difference_type arg3 ;
-  std::vector< int,std::allocator< int > > *arg4 = 0 ;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::difference_type arg2 ;
+  std::vector<int >::difference_type arg3 ;
+  std::vector<int,std::allocator<int > > *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -8970,34 +8947,34 @@ SWIGINTERN PyObject *_wrap_vectorInt___setslice__(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:vectorInt___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___setslice__" "', argument " "1"" of type '" "std::vector< int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___setslice__" "', argument " "1"" of type '" "std::vector<int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt___setslice__" "', argument " "2"" of type '" "std::vector< int >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt___setslice__" "', argument " "2"" of type '" "std::vector<int >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector< int >::difference_type >(val2);
+  arg2 = static_cast< std::vector<int >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt___setslice__" "', argument " "3"" of type '" "std::vector< int >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt___setslice__" "', argument " "3"" of type '" "std::vector<int >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector< int >::difference_type >(val3);
+  arg3 = static_cast< std::vector<int >::difference_type >(val3);
   {
-    std::vector<int,std::allocator< int > > *ptr = (std::vector<int,std::allocator< int > > *)0;
+    std::vector<int,std::allocator<int > > *ptr = (std::vector<int,std::allocator<int > > *)0;
     res4 = swig::asptr(obj3, &ptr);
     if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vectorInt___setslice__" "', argument " "4"" of type '" "std::vector< int,std::allocator< int > > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vectorInt___setslice__" "', argument " "4"" of type '" "std::vector<int,std::allocator<int > > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vectorInt___setslice__" "', argument " "4"" of type '" "std::vector< int,std::allocator< int > > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vectorInt___setslice__" "', argument " "4"" of type '" "std::vector<int,std::allocator<int > > const &""'"); 
     }
     arg4 = ptr;
   }
   try {
-    std_vector_Sl_int_Sg____setslice__(arg1,arg2,arg3,(std::vector< int,std::allocator< int > > const &)*arg4);
+    std_vector_Sl_int_Sg____setslice__(arg1,arg2,arg3,(std::vector<int,std::allocator<int > > const &)*arg4);
   }
   catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -9017,9 +8994,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt___delslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
-  std::vector< int >::difference_type arg2 ;
-  std::vector< int >::difference_type arg3 ;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::difference_type arg2 ;
+  std::vector<int >::difference_type arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -9031,21 +9008,21 @@ SWIGINTERN PyObject *_wrap_vectorInt___delslice__(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:vectorInt___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___delslice__" "', argument " "1"" of type '" "std::vector< int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___delslice__" "', argument " "1"" of type '" "std::vector<int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt___delslice__" "', argument " "2"" of type '" "std::vector< int >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt___delslice__" "', argument " "2"" of type '" "std::vector<int >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector< int >::difference_type >(val2);
+  arg2 = static_cast< std::vector<int >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt___delslice__" "', argument " "3"" of type '" "std::vector< int >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt___delslice__" "', argument " "3"" of type '" "std::vector<int >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector< int >::difference_type >(val3);
+  arg3 = static_cast< std::vector<int >::difference_type >(val3);
   try {
     std_vector_Sl_int_Sg____delslice__(arg1,arg2,arg3);
   }
@@ -9062,8 +9039,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt___delitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
-  std::vector< int >::difference_type arg2 ;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::difference_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -9072,16 +9049,16 @@ SWIGINTERN PyObject *_wrap_vectorInt___delitem__(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:vectorInt___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___delitem__" "', argument " "1"" of type '" "std::vector< int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___delitem__" "', argument " "1"" of type '" "std::vector<int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt___delitem__" "', argument " "2"" of type '" "std::vector< int >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt___delitem__" "', argument " "2"" of type '" "std::vector<int >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector< int >::difference_type >(val2);
+  arg2 = static_cast< std::vector<int >::difference_type >(val2);
   try {
     std_vector_Sl_int_Sg____delitem__(arg1,arg2);
   }
@@ -9098,9 +9075,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt___getitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
-  std::vector< int >::difference_type arg2 ;
-  std::vector< int >::value_type *result = 0 ;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::difference_type arg2 ;
+  std::vector<int >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -9109,20 +9086,20 @@ SWIGINTERN PyObject *_wrap_vectorInt___getitem__(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:vectorInt___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___getitem__" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___getitem__" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt___getitem__" "', argument " "2"" of type '" "std::vector< int >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt___getitem__" "', argument " "2"" of type '" "std::vector<int >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector< int >::difference_type >(val2);
+  arg2 = static_cast< std::vector<int >::difference_type >(val2);
   try {
     {
-      std::vector< int >::value_type const &_result_ref = std_vector_Sl_int_Sg____getitem__((std::vector< int > const *)arg1,arg2);
-      result = (std::vector< int >::value_type *) &_result_ref;
+      std::vector<int >::value_type const &_result_ref = std_vector_Sl_int_Sg____getitem__((std::vector<int > const *)arg1,arg2);
+      result = (std::vector<int >::value_type *) &_result_ref;
     }
   }
   catch(std::out_of_range &_e) {
@@ -9138,14 +9115,14 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt___setitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
-  std::vector< int >::difference_type arg2 ;
-  std::vector< int >::value_type *arg3 = 0 ;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::difference_type arg2 ;
+  std::vector<int >::value_type *arg3 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  std::vector< int >::value_type temp3 ;
+  std::vector<int >::value_type temp3 ;
   int val3 ;
   int ecode3 = 0 ;
   PyObject * obj0 = 0 ;
@@ -9153,21 +9130,21 @@ SWIGINTERN PyObject *_wrap_vectorInt___setitem__(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:vectorInt___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___setitem__" "', argument " "1"" of type '" "std::vector< int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___setitem__" "', argument " "1"" of type '" "std::vector<int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt___setitem__" "', argument " "2"" of type '" "std::vector< int >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt___setitem__" "', argument " "2"" of type '" "std::vector<int >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector< int >::difference_type >(val2);
+  arg2 = static_cast< std::vector<int >::difference_type >(val2);
   ecode3 = SWIG_AsVal_int(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt___setitem__" "', argument " "3"" of type '" "std::vector< int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt___setitem__" "', argument " "3"" of type '" "std::vector<int >::value_type""'");
   } 
-  temp3 = static_cast< std::vector< int >::value_type >(val3);
+  temp3 = static_cast< std::vector<int >::value_type >(val3);
   arg3 = &temp3;
   try {
     std_vector_Sl_int_Sg____setitem__(arg1,arg2,(int const &)*arg3);
@@ -9185,27 +9162,27 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
-  std::vector< int >::value_type *arg2 = 0 ;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::value_type *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  std::vector< int >::value_type temp2 ;
+  std::vector<int >::value_type temp2 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:vectorInt_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_append" "', argument " "1"" of type '" "std::vector< int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_append" "', argument " "1"" of type '" "std::vector<int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt_append" "', argument " "2"" of type '" "std::vector< int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt_append" "', argument " "2"" of type '" "std::vector<int >::value_type""'");
   } 
-  temp2 = static_cast< std::vector< int >::value_type >(val2);
+  temp2 = static_cast< std::vector<int >::value_type >(val2);
   arg2 = &temp2;
   std_vector_Sl_int_Sg__append(arg1,(int const &)*arg2);
   resultobj = SWIG_Py_Void();
@@ -9217,11 +9194,11 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_vectorInt__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< int > *result = 0 ;
+  std::vector<int > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_vectorInt")) SWIG_fail;
-  result = (std::vector< int > *)new std::vector< int >();
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, SWIG_POINTER_NEW |  0 );
+  result = (std::vector<int > *)new std::vector<int >();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -9230,25 +9207,25 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_vectorInt__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< int > *arg1 = 0 ;
-  std::vector< int > *result = 0 ;
+  std::vector<int > *arg1 = 0 ;
+  std::vector<int > *result = 0 ;
   int res1 = SWIG_OLDOBJ ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_vectorInt",&obj0)) SWIG_fail;
   {
-    std::vector<int,std::allocator< int > > *ptr = (std::vector<int,std::allocator< int > > *)0;
+    std::vector<int,std::allocator<int > > *ptr = (std::vector<int,std::allocator<int > > *)0;
     res1 = swig::asptr(obj0, &ptr);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_vectorInt" "', argument " "1"" of type '" "std::vector< int > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_vectorInt" "', argument " "1"" of type '" "std::vector<int > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_vectorInt" "', argument " "1"" of type '" "std::vector< int > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_vectorInt" "', argument " "1"" of type '" "std::vector<int > const &""'"); 
     }
     arg1 = ptr;
   }
-  result = (std::vector< int > *)new std::vector< int >((std::vector< int > const &)*arg1);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, SWIG_POINTER_NEW |  0 );
+  result = (std::vector<int > *)new std::vector<int >((std::vector<int > const &)*arg1);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, SWIG_POINTER_NEW |  0 );
   if (SWIG_IsNewObj(res1)) delete arg1;
   return resultobj;
 fail:
@@ -9259,19 +9236,19 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_empty",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_empty" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_empty" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  result = (bool)((std::vector< int > const *)arg1)->empty();
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  result = (bool)((std::vector<int > const *)arg1)->empty();
   resultobj = SWIG_From_bool(static_cast< bool >(result));
   return resultobj;
 fail:
@@ -9281,19 +9258,19 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
-  std::vector< int >::size_type result;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_size" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_size" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  result = ((std::vector< int > const *)arg1)->size();
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  result = ((std::vector<int > const *)arg1)->size();
   resultobj = SWIG_From_size_t(static_cast< size_t >(result));
   return resultobj;
 fail:
@@ -9303,17 +9280,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_clear" "', argument " "1"" of type '" "std::vector< int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_clear" "', argument " "1"" of type '" "std::vector<int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
   (arg1)->clear();
   resultobj = SWIG_Py_Void();
   return resultobj;
@@ -9324,8 +9301,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
-  std::vector< int > *arg2 = 0 ;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -9334,19 +9311,19 @@ SWIGINTERN PyObject *_wrap_vectorInt_swap(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:vectorInt_swap",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_swap" "', argument " "1"" of type '" "std::vector< int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_swap" "', argument " "1"" of type '" "std::vector<int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t,  0 );
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vectorInt_swap" "', argument " "2"" of type '" "std::vector< int > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vectorInt_swap" "', argument " "2"" of type '" "std::vector<int > &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vectorInt_swap" "', argument " "2"" of type '" "std::vector< int > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vectorInt_swap" "', argument " "2"" of type '" "std::vector<int > &""'"); 
   }
-  arg2 = reinterpret_cast< std::vector< int > * >(argp2);
+  arg2 = reinterpret_cast< std::vector<int > * >(argp2);
   (arg1)->swap(*arg2);
   resultobj = SWIG_Py_Void();
   return resultobj;
@@ -9357,42 +9334,42 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
-  SwigValueWrapper< std::allocator< int > > result;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  SwigValueWrapper<std::allocator<int > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_get_allocator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_get_allocator" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_get_allocator" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  result = ((std::vector< int > const *)arg1)->get_allocator();
-  resultobj = SWIG_NewPointerObj((new std::vector< int >::allocator_type(static_cast< const std::vector< int >::allocator_type& >(result))), SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  result = ((std::vector<int > const *)arg1)->get_allocator();
+  resultobj = SWIG_NewPointerObj((new std::vector<int >::allocator_type(static_cast< const std::vector<int >::allocator_type& >(result))), SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorInt_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vectorInt_begin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
-  std::vector< int >::const_iterator result;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_begin" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_begin" "', argument " "1"" of type '" "std::vector<int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  result = ((std::vector< int > const *)arg1)->begin();
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< int >::const_iterator & >(result)),
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  result = (arg1)->begin();
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<int >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -9400,22 +9377,78 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorInt_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vectorInt_begin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
-  std::vector< int >::const_iterator result;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_begin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_begin" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  result = ((std::vector<int > const *)arg1)->begin();
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<int >::const_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt_begin(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_vectorInt_begin__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_vectorInt_begin__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'vectorInt_begin'.\n  Possible C/C++ prototypes are:\n    begin()\n    begin()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_end" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_end" "', argument " "1"" of type '" "std::vector<int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  result = ((std::vector< int > const *)arg1)->end();
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< int >::const_iterator & >(result)),
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  result = (arg1)->end();
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<int >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -9423,22 +9456,78 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorInt_rbegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vectorInt_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
-  std::vector< int >::const_reverse_iterator result;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_end",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_end" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  result = ((std::vector<int > const *)arg1)->end();
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<int >::const_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt_end(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_vectorInt_end__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_vectorInt_end__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'vectorInt_end'.\n  Possible C/C++ prototypes are:\n    end()\n    end()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt_rbegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::reverse_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_rbegin" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_rbegin" "', argument " "1"" of type '" "std::vector<int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  result = ((std::vector< int > const *)arg1)->rbegin();
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< int >::const_reverse_iterator & >(result)),
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  result = (arg1)->rbegin();
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<int >::reverse_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -9446,22 +9535,78 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorInt_rend(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vectorInt_rbegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
-  std::vector< int >::const_reverse_iterator result;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::const_reverse_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_rbegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_rbegin" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  result = ((std::vector<int > const *)arg1)->rbegin();
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<int >::const_reverse_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt_rbegin(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_vectorInt_rbegin__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_vectorInt_rbegin__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'vectorInt_rbegin'.\n  Possible C/C++ prototypes are:\n    rbegin()\n    rbegin()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt_rend__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::reverse_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_rend" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_rend" "', argument " "1"" of type '" "std::vector<int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  result = ((std::vector< int > const *)arg1)->rend();
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< int >::const_reverse_iterator & >(result)),
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  result = (arg1)->rend();
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<int >::reverse_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -9469,10 +9614,66 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_vectorInt_rend__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::const_reverse_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_rend",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_rend" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  result = ((std::vector<int > const *)arg1)->rend();
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<int >::const_reverse_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_vectorInt_rend(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_vectorInt_rend__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_vectorInt_rend__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'vectorInt_rend'.\n  Possible C/C++ prototypes are:\n    rend()\n    rend()\n");
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_new_vectorInt__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< int >::size_type arg1 ;
-  std::vector< int > *result = 0 ;
+  std::vector<int >::size_type arg1 ;
+  std::vector<int > *result = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -9480,11 +9681,11 @@ SWIGINTERN PyObject *_wrap_new_vectorInt__SWIG_2(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"O:new_vectorInt",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vectorInt" "', argument " "1"" of type '" "std::vector< int >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vectorInt" "', argument " "1"" of type '" "std::vector<int >::size_type""'");
   } 
-  arg1 = static_cast< std::vector< int >::size_type >(val1);
-  result = (std::vector< int > *)new std::vector< int >(arg1);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, SWIG_POINTER_NEW |  0 );
+  arg1 = static_cast< std::vector<int >::size_type >(val1);
+  result = (std::vector<int > *)new std::vector<int >(arg1);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -9493,17 +9694,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_pop_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_pop_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_pop_back" "', argument " "1"" of type '" "std::vector< int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_pop_back" "', argument " "1"" of type '" "std::vector<int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
   (arg1)->pop_back();
   resultobj = SWIG_Py_Void();
   return resultobj;
@@ -9514,8 +9715,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
-  std::vector< int >::size_type arg2 ;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::size_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -9524,16 +9725,16 @@ SWIGINTERN PyObject *_wrap_vectorInt_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:vectorInt_resize",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_resize" "', argument " "1"" of type '" "std::vector< int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_resize" "', argument " "1"" of type '" "std::vector<int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt_resize" "', argument " "2"" of type '" "std::vector< int >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt_resize" "', argument " "2"" of type '" "std::vector<int >::size_type""'");
   } 
-  arg2 = static_cast< std::vector< int >::size_type >(val2);
+  arg2 = static_cast< std::vector<int >::size_type >(val2);
   (arg1)->resize(arg2);
   resultobj = SWIG_Py_Void();
   return resultobj;
@@ -9544,9 +9745,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
-  std::vector< int >::iterator arg2 ;
-  std::vector< int >::iterator result;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::iterator arg2 ;
+  std::vector<int >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -9555,24 +9756,24 @@ SWIGINTERN PyObject *_wrap_vectorInt_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:vectorInt_erase",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_erase" "', argument " "1"" of type '" "std::vector< int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_erase" "', argument " "1"" of type '" "std::vector<int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_erase" "', argument " "2"" of type '" "std::vector< int >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_erase" "', argument " "2"" of type '" "std::vector<int >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector< int >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< int >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector<int >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<int >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_erase" "', argument " "2"" of type '" "std::vector< int >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_erase" "', argument " "2"" of type '" "std::vector<int >::iterator""'");
     }
   }
   result = (arg1)->erase(arg2);
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< int >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<int >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -9582,10 +9783,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
-  std::vector< int >::iterator arg2 ;
-  std::vector< int >::iterator arg3 ;
-  std::vector< int >::iterator result;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::iterator arg2 ;
+  std::vector<int >::iterator arg3 ;
+  std::vector<int >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -9597,35 +9798,35 @@ SWIGINTERN PyObject *_wrap_vectorInt_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:vectorInt_erase",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_erase" "', argument " "1"" of type '" "std::vector< int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_erase" "', argument " "1"" of type '" "std::vector<int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_erase" "', argument " "2"" of type '" "std::vector< int >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_erase" "', argument " "2"" of type '" "std::vector<int >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector< int >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< int >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector<int >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<int >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_erase" "', argument " "2"" of type '" "std::vector< int >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_erase" "', argument " "2"" of type '" "std::vector<int >::iterator""'");
     }
   }
   res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res3) || !iter3) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_erase" "', argument " "3"" of type '" "std::vector< int >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_erase" "', argument " "3"" of type '" "std::vector<int >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector< int >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< int >::iterator > *>(iter3);
+    swig::PySwigIterator_T<std::vector<int >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<int >::iterator > *>(iter3);
     if (iter_t) {
       arg3 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_erase" "', argument " "3"" of type '" "std::vector< int >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_erase" "', argument " "3"" of type '" "std::vector<int >::iterator""'");
     }
   }
   result = (arg1)->erase(arg2,arg3);
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< int >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<int >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -9639,18 +9840,18 @@ SWIGINTERN PyObject *_wrap_vectorInt_erase(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< int >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<int >::iterator > *>(iter) != 0));
       if (_v) {
         return _wrap_vectorInt_erase__SWIG_0(self, args);
       }
@@ -9658,16 +9859,16 @@ SWIGINTERN PyObject *_wrap_vectorInt_erase(PyObject *self, PyObject *args) {
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< int >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<int >::iterator > *>(iter) != 0));
       if (_v) {
         swig::PySwigIterator *iter = 0;
         int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< int >::iterator > *>(iter) != 0));
+        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<int >::iterator > *>(iter) != 0));
         if (_v) {
           return _wrap_vectorInt_erase__SWIG_1(self, args);
         }
@@ -9676,22 +9877,19 @@ SWIGINTERN PyObject *_wrap_vectorInt_erase(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'vectorInt_erase'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    erase(std::vector< int > *,std::vector< int >::iterator)\n"
-    "    erase(std::vector< int > *,std::vector< int >::iterator,std::vector< int >::iterator)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'vectorInt_erase'.\n  Possible C/C++ prototypes are:\n    erase(std::vector<int >::iterator)\n    erase(std::vector<int >::iterator,std::vector<int >::iterator)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_new_vectorInt__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< int >::size_type arg1 ;
-  std::vector< int >::value_type *arg2 = 0 ;
-  std::vector< int > *result = 0 ;
+  std::vector<int >::size_type arg1 ;
+  std::vector<int >::value_type *arg2 = 0 ;
+  std::vector<int > *result = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
-  std::vector< int >::value_type temp2 ;
+  std::vector<int >::value_type temp2 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
@@ -9700,17 +9898,17 @@ SWIGINTERN PyObject *_wrap_new_vectorInt__SWIG_3(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"OO:new_vectorInt",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vectorInt" "', argument " "1"" of type '" "std::vector< int >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vectorInt" "', argument " "1"" of type '" "std::vector<int >::size_type""'");
   } 
-  arg1 = static_cast< std::vector< int >::size_type >(val1);
+  arg1 = static_cast< std::vector<int >::size_type >(val1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_vectorInt" "', argument " "2"" of type '" "std::vector< int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_vectorInt" "', argument " "2"" of type '" "std::vector<int >::value_type""'");
   } 
-  temp2 = static_cast< std::vector< int >::value_type >(val2);
+  temp2 = static_cast< std::vector<int >::value_type >(val2);
   arg2 = &temp2;
-  result = (std::vector< int > *)new std::vector< int >(arg1,(std::vector< int >::value_type const &)*arg2);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, SWIG_POINTER_NEW |  0 );
+  result = (std::vector<int > *)new std::vector<int >(arg1,(std::vector<int >::value_type const &)*arg2);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -9723,7 +9921,7 @@ SWIGINTERN PyObject *_wrap_new_vectorInt(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -9742,7 +9940,7 @@ SWIGINTERN PyObject *_wrap_new_vectorInt(PyObject *self, PyObject *args) {
   }
   if (argc == 1) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_new_vectorInt__SWIG_1(self, args);
@@ -9766,41 +9964,36 @@ SWIGINTERN PyObject *_wrap_new_vectorInt(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_vectorInt'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    std::vector< int >()\n"
-    "    std::vector< int >(std::vector< int > const &)\n"
-    "    std::vector< int >(std::vector< int >::size_type)\n"
-    "    std::vector< int >(std::vector< int >::size_type,std::vector< int >::value_type const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_vectorInt'.\n  Possible C/C++ prototypes are:\n    std::vector<(int)>()\n    std::vector<(int)>(std::vector<int > const &)\n    std::vector<(int)>(std::vector<int >::size_type)\n    std::vector<(int)>(std::vector<int >::size_type,std::vector<int >::value_type const &)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_vectorInt_push_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
-  std::vector< int >::value_type *arg2 = 0 ;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::value_type *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  std::vector< int >::value_type temp2 ;
+  std::vector<int >::value_type temp2 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:vectorInt_push_back",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_push_back" "', argument " "1"" of type '" "std::vector< int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_push_back" "', argument " "1"" of type '" "std::vector<int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt_push_back" "', argument " "2"" of type '" "std::vector< int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt_push_back" "', argument " "2"" of type '" "std::vector<int >::value_type""'");
   } 
-  temp2 = static_cast< std::vector< int >::value_type >(val2);
+  temp2 = static_cast< std::vector<int >::value_type >(val2);
   arg2 = &temp2;
-  (arg1)->push_back((std::vector< int >::value_type const &)*arg2);
+  (arg1)->push_back((std::vector<int >::value_type const &)*arg2);
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -9810,21 +10003,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_front(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
-  std::vector< int >::value_type *result = 0 ;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_front",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_front" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_front" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
   {
-    std::vector< int >::value_type const &_result_ref = ((std::vector< int > const *)arg1)->front();
-    result = (std::vector< int >::value_type *) &_result_ref;
+    std::vector<int >::value_type const &_result_ref = ((std::vector<int > const *)arg1)->front();
+    result = (std::vector<int >::value_type *) &_result_ref;
   }
   resultobj = SWIG_From_int(static_cast< int >(*result));
   return resultobj;
@@ -9835,21 +10028,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
-  std::vector< int >::value_type *result = 0 ;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_back" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_back" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
   {
-    std::vector< int >::value_type const &_result_ref = ((std::vector< int > const *)arg1)->back();
-    result = (std::vector< int >::value_type *) &_result_ref;
+    std::vector<int >::value_type const &_result_ref = ((std::vector<int > const *)arg1)->back();
+    result = (std::vector<int >::value_type *) &_result_ref;
   }
   resultobj = SWIG_From_int(static_cast< int >(*result));
   return resultobj;
@@ -9860,14 +10053,14 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_assign(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
-  std::vector< int >::size_type arg2 ;
-  std::vector< int >::value_type *arg3 = 0 ;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::size_type arg2 ;
+  std::vector<int >::value_type *arg3 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  std::vector< int >::value_type temp3 ;
+  std::vector<int >::value_type temp3 ;
   int val3 ;
   int ecode3 = 0 ;
   PyObject * obj0 = 0 ;
@@ -9875,23 +10068,23 @@ SWIGINTERN PyObject *_wrap_vectorInt_assign(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:vectorInt_assign",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_assign" "', argument " "1"" of type '" "std::vector< int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_assign" "', argument " "1"" of type '" "std::vector<int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt_assign" "', argument " "2"" of type '" "std::vector< int >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt_assign" "', argument " "2"" of type '" "std::vector<int >::size_type""'");
   } 
-  arg2 = static_cast< std::vector< int >::size_type >(val2);
+  arg2 = static_cast< std::vector<int >::size_type >(val2);
   ecode3 = SWIG_AsVal_int(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt_assign" "', argument " "3"" of type '" "std::vector< int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt_assign" "', argument " "3"" of type '" "std::vector<int >::value_type""'");
   } 
-  temp3 = static_cast< std::vector< int >::value_type >(val3);
+  temp3 = static_cast< std::vector<int >::value_type >(val3);
   arg3 = &temp3;
-  (arg1)->assign(arg2,(std::vector< int >::value_type const &)*arg3);
+  (arg1)->assign(arg2,(std::vector<int >::value_type const &)*arg3);
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -9901,14 +10094,14 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
-  std::vector< int >::size_type arg2 ;
-  std::vector< int >::value_type *arg3 = 0 ;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::size_type arg2 ;
+  std::vector<int >::value_type *arg3 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  std::vector< int >::value_type temp3 ;
+  std::vector<int >::value_type temp3 ;
   int val3 ;
   int ecode3 = 0 ;
   PyObject * obj0 = 0 ;
@@ -9916,23 +10109,23 @@ SWIGINTERN PyObject *_wrap_vectorInt_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:vectorInt_resize",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_resize" "', argument " "1"" of type '" "std::vector< int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_resize" "', argument " "1"" of type '" "std::vector<int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt_resize" "', argument " "2"" of type '" "std::vector< int >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt_resize" "', argument " "2"" of type '" "std::vector<int >::size_type""'");
   } 
-  arg2 = static_cast< std::vector< int >::size_type >(val2);
+  arg2 = static_cast< std::vector<int >::size_type >(val2);
   ecode3 = SWIG_AsVal_int(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt_resize" "', argument " "3"" of type '" "std::vector< int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt_resize" "', argument " "3"" of type '" "std::vector<int >::value_type""'");
   } 
-  temp3 = static_cast< std::vector< int >::value_type >(val3);
+  temp3 = static_cast< std::vector<int >::value_type >(val3);
   arg3 = &temp3;
-  (arg1)->resize(arg2,(std::vector< int >::value_type const &)*arg3);
+  (arg1)->resize(arg2,(std::vector<int >::value_type const &)*arg3);
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -9946,13 +10139,13 @@ SWIGINTERN PyObject *_wrap_vectorInt_resize(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -9966,7 +10159,7 @@ SWIGINTERN PyObject *_wrap_vectorInt_resize(PyObject *self, PyObject *args) {
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -9986,25 +10179,22 @@ SWIGINTERN PyObject *_wrap_vectorInt_resize(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'vectorInt_resize'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    resize(std::vector< int > *,std::vector< int >::size_type)\n"
-    "    resize(std::vector< int > *,std::vector< int >::size_type,std::vector< int >::value_type const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'vectorInt_resize'.\n  Possible C/C++ prototypes are:\n    resize(std::vector<int >::size_type)\n    resize(std::vector<int >::size_type,std::vector<int >::value_type const &)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_vectorInt_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
-  std::vector< int >::iterator arg2 ;
-  std::vector< int >::value_type *arg3 = 0 ;
-  std::vector< int >::iterator result;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::iterator arg2 ;
+  std::vector<int >::value_type *arg3 = 0 ;
+  std::vector<int >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
   int res2 ;
-  std::vector< int >::value_type temp3 ;
+  std::vector<int >::value_type temp3 ;
   int val3 ;
   int ecode3 = 0 ;
   PyObject * obj0 = 0 ;
@@ -10012,30 +10202,30 @@ SWIGINTERN PyObject *_wrap_vectorInt_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:vectorInt_insert",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_insert" "', argument " "1"" of type '" "std::vector< int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_insert" "', argument " "1"" of type '" "std::vector<int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_insert" "', argument " "2"" of type '" "std::vector< int >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_insert" "', argument " "2"" of type '" "std::vector<int >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector< int >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< int >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector<int >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<int >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_insert" "', argument " "2"" of type '" "std::vector< int >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_insert" "', argument " "2"" of type '" "std::vector<int >::iterator""'");
     }
   }
   ecode3 = SWIG_AsVal_int(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt_insert" "', argument " "3"" of type '" "std::vector< int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt_insert" "', argument " "3"" of type '" "std::vector<int >::value_type""'");
   } 
-  temp3 = static_cast< std::vector< int >::value_type >(val3);
+  temp3 = static_cast< std::vector<int >::value_type >(val3);
   arg3 = &temp3;
-  result = (arg1)->insert(arg2,(std::vector< int >::value_type const &)*arg3);
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< int >::iterator & >(result)),
+  result = (arg1)->insert(arg2,(std::vector<int >::value_type const &)*arg3);
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<int >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -10045,17 +10235,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
-  std::vector< int >::iterator arg2 ;
-  std::vector< int >::size_type arg3 ;
-  std::vector< int >::value_type *arg4 = 0 ;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::iterator arg2 ;
+  std::vector<int >::size_type arg3 ;
+  std::vector<int >::value_type *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
   int res2 ;
   size_t val3 ;
   int ecode3 = 0 ;
-  std::vector< int >::value_type temp4 ;
+  std::vector<int >::value_type temp4 ;
   int val4 ;
   int ecode4 = 0 ;
   PyObject * obj0 = 0 ;
@@ -10064,34 +10254,34 @@ SWIGINTERN PyObject *_wrap_vectorInt_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:vectorInt_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_insert" "', argument " "1"" of type '" "std::vector< int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_insert" "', argument " "1"" of type '" "std::vector<int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_insert" "', argument " "2"" of type '" "std::vector< int >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_insert" "', argument " "2"" of type '" "std::vector<int >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector< int >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< int >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector<int >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<int >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_insert" "', argument " "2"" of type '" "std::vector< int >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_insert" "', argument " "2"" of type '" "std::vector<int >::iterator""'");
     }
   }
   ecode3 = SWIG_AsVal_size_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt_insert" "', argument " "3"" of type '" "std::vector< int >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt_insert" "', argument " "3"" of type '" "std::vector<int >::size_type""'");
   } 
-  arg3 = static_cast< std::vector< int >::size_type >(val3);
+  arg3 = static_cast< std::vector<int >::size_type >(val3);
   ecode4 = SWIG_AsVal_int(obj3, &val4);
   if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "vectorInt_insert" "', argument " "4"" of type '" "std::vector< int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "vectorInt_insert" "', argument " "4"" of type '" "std::vector<int >::value_type""'");
   } 
-  temp4 = static_cast< std::vector< int >::value_type >(val4);
+  temp4 = static_cast< std::vector<int >::value_type >(val4);
   arg4 = &temp4;
-  (arg1)->insert(arg2,arg3,(std::vector< int >::value_type const &)*arg4);
+  (arg1)->insert(arg2,arg3,(std::vector<int >::value_type const &)*arg4);
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -10105,18 +10295,18 @@ SWIGINTERN PyObject *_wrap_vectorInt_insert(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< int >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<int >::iterator > *>(iter) != 0));
       if (_v) {
         {
           int res = SWIG_AsVal_int(argv[2], NULL);
@@ -10130,12 +10320,12 @@ SWIGINTERN PyObject *_wrap_vectorInt_insert(PyObject *self, PyObject *args) {
   }
   if (argc == 4) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< int >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<int >::iterator > *>(iter) != 0));
       if (_v) {
         {
           int res = SWIG_AsVal_size_t(argv[2], NULL);
@@ -10155,18 +10345,15 @@ SWIGINTERN PyObject *_wrap_vectorInt_insert(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'vectorInt_insert'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    insert(std::vector< int > *,std::vector< int >::iterator,std::vector< int >::value_type const &)\n"
-    "    insert(std::vector< int > *,std::vector< int >::iterator,std::vector< int >::size_type,std::vector< int >::value_type const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'vectorInt_insert'.\n  Possible C/C++ prototypes are:\n    insert(std::vector<int >::iterator,std::vector<int >::value_type const &)\n    insert(std::vector<int >::iterator,std::vector<int >::size_type,std::vector<int >::value_type const &)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_vectorInt_reserve(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
-  std::vector< int >::size_type arg2 ;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::size_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -10175,16 +10362,16 @@ SWIGINTERN PyObject *_wrap_vectorInt_reserve(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:vectorInt_reserve",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_reserve" "', argument " "1"" of type '" "std::vector< int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_reserve" "', argument " "1"" of type '" "std::vector<int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt_reserve" "', argument " "2"" of type '" "std::vector< int >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt_reserve" "', argument " "2"" of type '" "std::vector<int >::size_type""'");
   } 
-  arg2 = static_cast< std::vector< int >::size_type >(val2);
+  arg2 = static_cast< std::vector<int >::size_type >(val2);
   (arg1)->reserve(arg2);
   resultobj = SWIG_Py_Void();
   return resultobj;
@@ -10195,19 +10382,19 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_capacity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
-  std::vector< int >::size_type result;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector<int >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_capacity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_capacity" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_capacity" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
-  result = ((std::vector< int > const *)arg1)->capacity();
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  result = ((std::vector<int > const *)arg1)->capacity();
   resultobj = SWIG_From_size_t(static_cast< size_t >(result));
   return resultobj;
 fail:
@@ -10217,17 +10404,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_vectorInt(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_vectorInt",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_vectorInt" "', argument " "1"" of type '" "std::vector< int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_vectorInt" "', argument " "1"" of type '" "std::vector<int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
   {
     try {
       delete arg1;
@@ -10249,8 +10436,8 @@ fail:
 
 SWIGINTERN PyObject *vectorInt_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
@@ -10391,7 +10578,7 @@ SWIGINTERN PyObject *_wrap_new_Id(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -10434,12 +10621,7 @@ SWIGINTERN PyObject *_wrap_new_Id(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Id'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    Id()\n"
-    "    Id(Id::id_type)\n"
-    "    Id(Id::id_type,Id::id_type)\n"
-    "    Id(Id const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Id'.\n  Possible C/C++ prototypes are:\n    Id()\n    Id(Id::id_type)\n    Id(Id::id_type,Id::id_type)\n    Id(Id const &)\n");
   return NULL;
 }
 
@@ -10754,19 +10936,19 @@ fail:
 
 SWIGINTERN PyObject *Id_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Id, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec_2u(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< unsigned int,2 > *result = 0 ;
+  VecMat::Vec<unsigned int,2 > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec_2u")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec< unsigned int,2 > *)new VecMat::Vec< unsigned int,2 >();
+      result = (VecMat::Vec<unsigned int,2 > *)new VecMat::Vec<unsigned int,2 >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -10775,7 +10957,7 @@ SWIGINTERN PyObject *_wrap_new_Vec_2u(PyObject *SWIGUNUSEDPARM(self), PyObject *
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -10784,17 +10966,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec_2u(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< unsigned int,2 > *arg1 = (VecMat::Vec< unsigned int,2 > *) 0 ;
+  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec_2u",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_2u" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_2u" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
   {
     try {
       delete arg1;
@@ -10821,7 +11003,7 @@ SWIGINTERN PyObject *_wrap_Vec_2u_dim(PyObject *SWIGUNUSEDPARM(self), PyObject *
   if (!PyArg_ParseTuple(args,(char *)":Vec_2u_dim")) SWIG_fail;
   {
     try {
-      result = (unsigned int)VecMat::Vec< unsigned int,2 >::SWIGTEMPLATEDISAMBIGUATOR dim();
+      result = (unsigned int)VecMat::Vec<unsigned int,2 >::SWIGTEMPLATEDISAMBIGUATOR dim();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -10839,21 +11021,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2u_norm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< unsigned int,2 > *arg1 = (VecMat::Vec< unsigned int,2 > *) 0 ;
-  VecMat::Vec< unsigned int,2 >::value_type result;
+  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
+  VecMat::Vec<unsigned int,2 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2u_norm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u_norm" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u_norm" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec< unsigned int,2 >::value_type)((VecMat::Vec< unsigned int,2 > const *)arg1)->norm();
+      result = (VecMat::Vec<unsigned int,2 >::value_type)((VecMat::Vec<unsigned int,2 > const *)arg1)->norm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -10871,21 +11053,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2u_squareNorm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< unsigned int,2 > *arg1 = (VecMat::Vec< unsigned int,2 > *) 0 ;
-  VecMat::Vec< unsigned int,2 >::value_type result;
+  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
+  VecMat::Vec<unsigned int,2 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2u_squareNorm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u_squareNorm" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u_squareNorm" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec< unsigned int,2 >::value_type)((VecMat::Vec< unsigned int,2 > const *)arg1)->squareNorm();
+      result = (VecMat::Vec<unsigned int,2 >::value_type)((VecMat::Vec<unsigned int,2 > const *)arg1)->squareNorm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -10903,23 +11085,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2u_normalize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< unsigned int,2 > *arg1 = (VecMat::Vec< unsigned int,2 > *) 0 ;
-  VecMat::Vec< unsigned int,2 > *result = 0 ;
+  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
+  VecMat::Vec<unsigned int,2 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2u_normalize",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u_normalize" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u_normalize" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec< unsigned int,2 > &_result_ref = (arg1)->normalize();
-        result = (VecMat::Vec< unsigned int,2 > *) &_result_ref;
+        VecMat::Vec<unsigned int,2 > &_result_ref = (arg1)->normalize();
+        result = (VecMat::Vec<unsigned int,2 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -10929,7 +11111,7 @@ SWIGINTERN PyObject *_wrap_Vec_2u_normalize(PyObject *SWIGUNUSEDPARM(self), PyOb
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -10938,23 +11120,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2u_normalizeSafe(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< unsigned int,2 > *arg1 = (VecMat::Vec< unsigned int,2 > *) 0 ;
-  VecMat::Vec< unsigned int,2 > *result = 0 ;
+  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
+  VecMat::Vec<unsigned int,2 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2u_normalizeSafe",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec< unsigned int,2 > &_result_ref = (arg1)->normalizeSafe();
-        result = (VecMat::Vec< unsigned int,2 > *) &_result_ref;
+        VecMat::Vec<unsigned int,2 > &_result_ref = (arg1)->normalizeSafe();
+        result = (VecMat::Vec<unsigned int,2 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -10964,7 +11146,7 @@ SWIGINTERN PyObject *_wrap_Vec_2u_normalizeSafe(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -10973,9 +11155,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2u___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< unsigned int,2 > *arg1 = (VecMat::Vec< unsigned int,2 > *) 0 ;
-  VecMat::Vec< unsigned int,2 > *arg2 = 0 ;
-  VecMat::Vec< unsigned int,2 > result;
+  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
+  VecMat::Vec<unsigned int,2 > *arg2 = 0 ;
+  VecMat::Vec<unsigned int,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -10984,22 +11166,22 @@ SWIGINTERN PyObject *_wrap_Vec_2u___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2u___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___add__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___add__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___add__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___add__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___add__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___add__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec< unsigned int,2 > const *)arg1)->operator +((VecMat::Vec< unsigned int,2 > const &)*arg2);
+      result = ((VecMat::Vec<unsigned int,2 > const *)arg1)->operator +((VecMat::Vec<unsigned int,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11008,7 +11190,7 @@ SWIGINTERN PyObject *_wrap_Vec_2u___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec< unsigned int,2 >(static_cast< const VecMat::Vec< unsigned int,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<unsigned int,2 >(static_cast< const VecMat::Vec<unsigned int,2 >& >(result))), SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -11017,9 +11199,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2u___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< unsigned int,2 > *arg1 = (VecMat::Vec< unsigned int,2 > *) 0 ;
-  VecMat::Vec< unsigned int,2 > *arg2 = 0 ;
-  VecMat::Vec< unsigned int,2 > result;
+  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
+  VecMat::Vec<unsigned int,2 > *arg2 = 0 ;
+  VecMat::Vec<unsigned int,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -11028,22 +11210,22 @@ SWIGINTERN PyObject *_wrap_Vec_2u___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2u___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___sub__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___sub__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___sub__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___sub__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___sub__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___sub__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec< unsigned int,2 > const *)arg1)->operator -((VecMat::Vec< unsigned int,2 > const &)*arg2);
+      result = ((VecMat::Vec<unsigned int,2 > const *)arg1)->operator -((VecMat::Vec<unsigned int,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11052,7 +11234,7 @@ SWIGINTERN PyObject *_wrap_Vec_2u___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec< unsigned int,2 >(static_cast< const VecMat::Vec< unsigned int,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<unsigned int,2 >(static_cast< const VecMat::Vec<unsigned int,2 >& >(result))), SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -11061,9 +11243,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2u___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< unsigned int,2 > *arg1 = (VecMat::Vec< unsigned int,2 > *) 0 ;
-  VecMat::Vec< unsigned int,2 >::value_type arg2 ;
-  VecMat::Vec< unsigned int,2 > result;
+  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
+  VecMat::Vec<unsigned int,2 >::value_type arg2 ;
+  VecMat::Vec<unsigned int,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned int val2 ;
@@ -11072,19 +11254,19 @@ SWIGINTERN PyObject *_wrap_Vec_2u___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2u___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___mul__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___mul__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2u___mul__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2u___mul__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec< unsigned int,2 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec<unsigned int,2 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec< unsigned int,2 > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec<unsigned int,2 > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11093,7 +11275,7 @@ SWIGINTERN PyObject *_wrap_Vec_2u___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec< unsigned int,2 >(static_cast< const VecMat::Vec< unsigned int,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<unsigned int,2 >(static_cast< const VecMat::Vec<unsigned int,2 >& >(result))), SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -11102,9 +11284,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2u___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< unsigned int,2 > *arg1 = (VecMat::Vec< unsigned int,2 > *) 0 ;
-  VecMat::Vec< unsigned int,2 >::value_type arg2 ;
-  VecMat::Vec< unsigned int,2 > result;
+  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
+  VecMat::Vec<unsigned int,2 >::value_type arg2 ;
+  VecMat::Vec<unsigned int,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned int val2 ;
@@ -11113,19 +11295,19 @@ SWIGINTERN PyObject *_wrap_Vec_2u___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2u___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___div__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___div__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2u___div__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2u___div__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec< unsigned int,2 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec<unsigned int,2 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec< unsigned int,2 > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec<unsigned int,2 > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11134,7 +11316,7 @@ SWIGINTERN PyObject *_wrap_Vec_2u___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec< unsigned int,2 >(static_cast< const VecMat::Vec< unsigned int,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<unsigned int,2 >(static_cast< const VecMat::Vec<unsigned int,2 >& >(result))), SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -11143,9 +11325,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2u___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< unsigned int,2 > *arg1 = (VecMat::Vec< unsigned int,2 > *) 0 ;
-  VecMat::Vec< unsigned int,2 > *arg2 = 0 ;
-  VecMat::Vec< unsigned int,2 >::value_type result;
+  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
+  VecMat::Vec<unsigned int,2 > *arg2 = 0 ;
+  VecMat::Vec<unsigned int,2 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -11154,22 +11336,22 @@ SWIGINTERN PyObject *_wrap_Vec_2u___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2u___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___mul__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___mul__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___mul__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___mul__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___mul__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___mul__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp2);
   {
     try {
-      result = (VecMat::Vec< unsigned int,2 >::value_type)((VecMat::Vec< unsigned int,2 > const *)arg1)->operator *((VecMat::Vec< unsigned int,2 > const &)*arg2);
+      result = (VecMat::Vec<unsigned int,2 >::value_type)((VecMat::Vec<unsigned int,2 > const *)arg1)->operator *((VecMat::Vec<unsigned int,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11191,17 +11373,17 @@ SWIGINTERN PyObject *_wrap_Vec_2u___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec_2u___mul____SWIG_1(self, args);
@@ -11211,7 +11393,7 @@ SWIGINTERN PyObject *_wrap_Vec_2u___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -11232,8 +11414,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2u___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< unsigned int,2 > *arg1 = (VecMat::Vec< unsigned int,2 > *) 0 ;
-  VecMat::Vec< unsigned int,2 > *arg2 = 0 ;
+  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
+  VecMat::Vec<unsigned int,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -11243,22 +11425,22 @@ SWIGINTERN PyObject *_wrap_Vec_2u___eq__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2u___eq__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___eq__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___eq__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___eq__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___eq__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___eq__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___eq__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec< unsigned int,2 > const *)arg1)->operator ==((VecMat::Vec< unsigned int,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec<unsigned int,2 > const *)arg1)->operator ==((VecMat::Vec<unsigned int,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11276,8 +11458,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2u___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< unsigned int,2 > *arg1 = (VecMat::Vec< unsigned int,2 > *) 0 ;
-  VecMat::Vec< unsigned int,2 > *arg2 = 0 ;
+  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
+  VecMat::Vec<unsigned int,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -11287,22 +11469,22 @@ SWIGINTERN PyObject *_wrap_Vec_2u___ne__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2u___ne__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___ne__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___ne__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___ne__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___ne__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___ne__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___ne__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec< unsigned int,2 > const *)arg1)->operator !=((VecMat::Vec< unsigned int,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec<unsigned int,2 > const *)arg1)->operator !=((VecMat::Vec<unsigned int,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11320,8 +11502,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2u___lt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< unsigned int,2 > *arg1 = (VecMat::Vec< unsigned int,2 > *) 0 ;
-  VecMat::Vec< unsigned int,2 > *arg2 = 0 ;
+  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
+  VecMat::Vec<unsigned int,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -11331,22 +11513,22 @@ SWIGINTERN PyObject *_wrap_Vec_2u___lt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2u___lt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___lt__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___lt__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___lt__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___lt__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___lt__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___lt__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec< unsigned int,2 > const *)arg1)->operator <((VecMat::Vec< unsigned int,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec<unsigned int,2 > const *)arg1)->operator <((VecMat::Vec<unsigned int,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11364,8 +11546,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2u___gt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< unsigned int,2 > *arg1 = (VecMat::Vec< unsigned int,2 > *) 0 ;
-  VecMat::Vec< unsigned int,2 > *arg2 = 0 ;
+  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
+  VecMat::Vec<unsigned int,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -11375,22 +11557,22 @@ SWIGINTERN PyObject *_wrap_Vec_2u___gt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2u___gt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___gt__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___gt__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___gt__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___gt__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___gt__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___gt__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec< unsigned int,2 > const *)arg1)->operator >((VecMat::Vec< unsigned int,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec<unsigned int,2 > const *)arg1)->operator >((VecMat::Vec<unsigned int,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11408,19 +11590,19 @@ fail:
 
 SWIGINTERN PyObject *Vec_2u_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec_2i(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< int,2 > *result = 0 ;
+  VecMat::Vec<int,2 > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec_2i")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec< int,2 > *)new VecMat::Vec< int,2 >();
+      result = (VecMat::Vec<int,2 > *)new VecMat::Vec<int,2 >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11429,7 +11611,7 @@ SWIGINTERN PyObject *_wrap_new_Vec_2i(PyObject *SWIGUNUSEDPARM(self), PyObject *
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_int_2_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTint_2_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -11438,17 +11620,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec_2i(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< int,2 > *arg1 = (VecMat::Vec< int,2 > *) 0 ;
+  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec_2i",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_2_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_2i" "', argument " "1"" of type '" "VecMat::Vec< int,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_2i" "', argument " "1"" of type '" "VecMat::Vec<int,2 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
   {
     try {
       delete arg1;
@@ -11475,7 +11657,7 @@ SWIGINTERN PyObject *_wrap_Vec_2i_dim(PyObject *SWIGUNUSEDPARM(self), PyObject *
   if (!PyArg_ParseTuple(args,(char *)":Vec_2i_dim")) SWIG_fail;
   {
     try {
-      result = (unsigned int)VecMat::Vec< int,2 >::SWIGTEMPLATEDISAMBIGUATOR dim();
+      result = (unsigned int)VecMat::Vec<int,2 >::SWIGTEMPLATEDISAMBIGUATOR dim();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11493,21 +11675,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2i_norm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< int,2 > *arg1 = (VecMat::Vec< int,2 > *) 0 ;
-  VecMat::Vec< int,2 >::value_type result;
+  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
+  VecMat::Vec<int,2 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2i_norm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i_norm" "', argument " "1"" of type '" "VecMat::Vec< int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i_norm" "', argument " "1"" of type '" "VecMat::Vec<int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec< int,2 >::value_type)((VecMat::Vec< int,2 > const *)arg1)->norm();
+      result = (VecMat::Vec<int,2 >::value_type)((VecMat::Vec<int,2 > const *)arg1)->norm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11525,21 +11707,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2i_squareNorm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< int,2 > *arg1 = (VecMat::Vec< int,2 > *) 0 ;
-  VecMat::Vec< int,2 >::value_type result;
+  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
+  VecMat::Vec<int,2 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2i_squareNorm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i_squareNorm" "', argument " "1"" of type '" "VecMat::Vec< int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i_squareNorm" "', argument " "1"" of type '" "VecMat::Vec<int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec< int,2 >::value_type)((VecMat::Vec< int,2 > const *)arg1)->squareNorm();
+      result = (VecMat::Vec<int,2 >::value_type)((VecMat::Vec<int,2 > const *)arg1)->squareNorm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11557,23 +11739,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2i_normalize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< int,2 > *arg1 = (VecMat::Vec< int,2 > *) 0 ;
-  VecMat::Vec< int,2 > *result = 0 ;
+  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
+  VecMat::Vec<int,2 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2i_normalize",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i_normalize" "', argument " "1"" of type '" "VecMat::Vec< int,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i_normalize" "', argument " "1"" of type '" "VecMat::Vec<int,2 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec< int,2 > &_result_ref = (arg1)->normalize();
-        result = (VecMat::Vec< int,2 > *) &_result_ref;
+        VecMat::Vec<int,2 > &_result_ref = (arg1)->normalize();
+        result = (VecMat::Vec<int,2 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -11583,7 +11765,7 @@ SWIGINTERN PyObject *_wrap_Vec_2i_normalize(PyObject *SWIGUNUSEDPARM(self), PyOb
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_int_2_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -11592,23 +11774,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2i_normalizeSafe(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< int,2 > *arg1 = (VecMat::Vec< int,2 > *) 0 ;
-  VecMat::Vec< int,2 > *result = 0 ;
+  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
+  VecMat::Vec<int,2 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2i_normalizeSafe",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec< int,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec<int,2 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec< int,2 > &_result_ref = (arg1)->normalizeSafe();
-        result = (VecMat::Vec< int,2 > *) &_result_ref;
+        VecMat::Vec<int,2 > &_result_ref = (arg1)->normalizeSafe();
+        result = (VecMat::Vec<int,2 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -11618,7 +11800,7 @@ SWIGINTERN PyObject *_wrap_Vec_2i_normalizeSafe(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_int_2_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -11627,9 +11809,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2i___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< int,2 > *arg1 = (VecMat::Vec< int,2 > *) 0 ;
-  VecMat::Vec< int,2 > *arg2 = 0 ;
-  VecMat::Vec< int,2 > result;
+  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
+  VecMat::Vec<int,2 > *arg2 = 0 ;
+  VecMat::Vec<int,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -11638,22 +11820,22 @@ SWIGINTERN PyObject *_wrap_Vec_2i___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2i___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___add__" "', argument " "1"" of type '" "VecMat::Vec< int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___add__" "', argument " "1"" of type '" "VecMat::Vec<int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_int_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___add__" "', argument " "2"" of type '" "VecMat::Vec< int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___add__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___add__" "', argument " "2"" of type '" "VecMat::Vec< int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___add__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec< int,2 > const *)arg1)->operator +((VecMat::Vec< int,2 > const &)*arg2);
+      result = ((VecMat::Vec<int,2 > const *)arg1)->operator +((VecMat::Vec<int,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11662,7 +11844,7 @@ SWIGINTERN PyObject *_wrap_Vec_2i___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec< int,2 >(static_cast< const VecMat::Vec< int,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_int_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<int,2 >(static_cast< const VecMat::Vec<int,2 >& >(result))), SWIGTYPE_p_VecMat__VecTint_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -11671,9 +11853,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2i___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< int,2 > *arg1 = (VecMat::Vec< int,2 > *) 0 ;
-  VecMat::Vec< int,2 > *arg2 = 0 ;
-  VecMat::Vec< int,2 > result;
+  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
+  VecMat::Vec<int,2 > *arg2 = 0 ;
+  VecMat::Vec<int,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -11682,22 +11864,22 @@ SWIGINTERN PyObject *_wrap_Vec_2i___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2i___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___sub__" "', argument " "1"" of type '" "VecMat::Vec< int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___sub__" "', argument " "1"" of type '" "VecMat::Vec<int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_int_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___sub__" "', argument " "2"" of type '" "VecMat::Vec< int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___sub__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___sub__" "', argument " "2"" of type '" "VecMat::Vec< int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___sub__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec< int,2 > const *)arg1)->operator -((VecMat::Vec< int,2 > const &)*arg2);
+      result = ((VecMat::Vec<int,2 > const *)arg1)->operator -((VecMat::Vec<int,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11706,7 +11888,7 @@ SWIGINTERN PyObject *_wrap_Vec_2i___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec< int,2 >(static_cast< const VecMat::Vec< int,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_int_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<int,2 >(static_cast< const VecMat::Vec<int,2 >& >(result))), SWIGTYPE_p_VecMat__VecTint_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -11715,9 +11897,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2i___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< int,2 > *arg1 = (VecMat::Vec< int,2 > *) 0 ;
-  VecMat::Vec< int,2 >::value_type arg2 ;
-  VecMat::Vec< int,2 > result;
+  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
+  VecMat::Vec<int,2 >::value_type arg2 ;
+  VecMat::Vec<int,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -11726,19 +11908,19 @@ SWIGINTERN PyObject *_wrap_Vec_2i___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2i___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___mul__" "', argument " "1"" of type '" "VecMat::Vec< int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___mul__" "', argument " "1"" of type '" "VecMat::Vec<int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2i___mul__" "', argument " "2"" of type '" "VecMat::Vec< int,2 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2i___mul__" "', argument " "2"" of type '" "VecMat::Vec<int,2 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec< int,2 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec<int,2 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec< int,2 > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec<int,2 > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11747,7 +11929,7 @@ SWIGINTERN PyObject *_wrap_Vec_2i___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec< int,2 >(static_cast< const VecMat::Vec< int,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_int_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<int,2 >(static_cast< const VecMat::Vec<int,2 >& >(result))), SWIGTYPE_p_VecMat__VecTint_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -11756,9 +11938,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2i___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< int,2 > *arg1 = (VecMat::Vec< int,2 > *) 0 ;
-  VecMat::Vec< int,2 >::value_type arg2 ;
-  VecMat::Vec< int,2 > result;
+  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
+  VecMat::Vec<int,2 >::value_type arg2 ;
+  VecMat::Vec<int,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -11767,19 +11949,19 @@ SWIGINTERN PyObject *_wrap_Vec_2i___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2i___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___div__" "', argument " "1"" of type '" "VecMat::Vec< int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___div__" "', argument " "1"" of type '" "VecMat::Vec<int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2i___div__" "', argument " "2"" of type '" "VecMat::Vec< int,2 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2i___div__" "', argument " "2"" of type '" "VecMat::Vec<int,2 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec< int,2 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec<int,2 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec< int,2 > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec<int,2 > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11788,7 +11970,7 @@ SWIGINTERN PyObject *_wrap_Vec_2i___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec< int,2 >(static_cast< const VecMat::Vec< int,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_int_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<int,2 >(static_cast< const VecMat::Vec<int,2 >& >(result))), SWIGTYPE_p_VecMat__VecTint_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -11797,9 +11979,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2i___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< int,2 > *arg1 = (VecMat::Vec< int,2 > *) 0 ;
-  VecMat::Vec< int,2 > *arg2 = 0 ;
-  VecMat::Vec< int,2 >::value_type result;
+  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
+  VecMat::Vec<int,2 > *arg2 = 0 ;
+  VecMat::Vec<int,2 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -11808,22 +11990,22 @@ SWIGINTERN PyObject *_wrap_Vec_2i___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2i___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___mul__" "', argument " "1"" of type '" "VecMat::Vec< int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___mul__" "', argument " "1"" of type '" "VecMat::Vec<int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_int_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___mul__" "', argument " "2"" of type '" "VecMat::Vec< int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___mul__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___mul__" "', argument " "2"" of type '" "VecMat::Vec< int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___mul__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp2);
   {
     try {
-      result = (VecMat::Vec< int,2 >::value_type)((VecMat::Vec< int,2 > const *)arg1)->operator *((VecMat::Vec< int,2 > const &)*arg2);
+      result = (VecMat::Vec<int,2 >::value_type)((VecMat::Vec<int,2 > const *)arg1)->operator *((VecMat::Vec<int,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11845,17 +12027,17 @@ SWIGINTERN PyObject *_wrap_Vec_2i___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_int_2_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTint_2_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecT_int_2_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecTint_2_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec_2i___mul____SWIG_1(self, args);
@@ -11865,7 +12047,7 @@ SWIGINTERN PyObject *_wrap_Vec_2i___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_int_2_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTint_2_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -11886,8 +12068,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2i___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< int,2 > *arg1 = (VecMat::Vec< int,2 > *) 0 ;
-  VecMat::Vec< int,2 > *arg2 = 0 ;
+  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
+  VecMat::Vec<int,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -11897,22 +12079,22 @@ SWIGINTERN PyObject *_wrap_Vec_2i___eq__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2i___eq__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___eq__" "', argument " "1"" of type '" "VecMat::Vec< int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___eq__" "', argument " "1"" of type '" "VecMat::Vec<int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_int_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___eq__" "', argument " "2"" of type '" "VecMat::Vec< int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___eq__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___eq__" "', argument " "2"" of type '" "VecMat::Vec< int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___eq__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec< int,2 > const *)arg1)->operator ==((VecMat::Vec< int,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec<int,2 > const *)arg1)->operator ==((VecMat::Vec<int,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11930,8 +12112,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2i___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< int,2 > *arg1 = (VecMat::Vec< int,2 > *) 0 ;
-  VecMat::Vec< int,2 > *arg2 = 0 ;
+  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
+  VecMat::Vec<int,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -11941,22 +12123,22 @@ SWIGINTERN PyObject *_wrap_Vec_2i___ne__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2i___ne__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___ne__" "', argument " "1"" of type '" "VecMat::Vec< int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___ne__" "', argument " "1"" of type '" "VecMat::Vec<int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_int_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___ne__" "', argument " "2"" of type '" "VecMat::Vec< int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___ne__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___ne__" "', argument " "2"" of type '" "VecMat::Vec< int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___ne__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec< int,2 > const *)arg1)->operator !=((VecMat::Vec< int,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec<int,2 > const *)arg1)->operator !=((VecMat::Vec<int,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11974,8 +12156,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2i___lt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< int,2 > *arg1 = (VecMat::Vec< int,2 > *) 0 ;
-  VecMat::Vec< int,2 > *arg2 = 0 ;
+  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
+  VecMat::Vec<int,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -11985,22 +12167,22 @@ SWIGINTERN PyObject *_wrap_Vec_2i___lt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2i___lt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___lt__" "', argument " "1"" of type '" "VecMat::Vec< int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___lt__" "', argument " "1"" of type '" "VecMat::Vec<int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_int_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___lt__" "', argument " "2"" of type '" "VecMat::Vec< int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___lt__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___lt__" "', argument " "2"" of type '" "VecMat::Vec< int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___lt__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec< int,2 > const *)arg1)->operator <((VecMat::Vec< int,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec<int,2 > const *)arg1)->operator <((VecMat::Vec<int,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12018,8 +12200,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2i___gt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< int,2 > *arg1 = (VecMat::Vec< int,2 > *) 0 ;
-  VecMat::Vec< int,2 > *arg2 = 0 ;
+  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
+  VecMat::Vec<int,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -12029,22 +12211,22 @@ SWIGINTERN PyObject *_wrap_Vec_2i___gt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2i___gt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___gt__" "', argument " "1"" of type '" "VecMat::Vec< int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___gt__" "', argument " "1"" of type '" "VecMat::Vec<int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_int_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___gt__" "', argument " "2"" of type '" "VecMat::Vec< int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___gt__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___gt__" "', argument " "2"" of type '" "VecMat::Vec< int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___gt__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec< int,2 > const *)arg1)->operator >((VecMat::Vec< int,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec<int,2 > const *)arg1)->operator >((VecMat::Vec<int,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12062,19 +12244,19 @@ fail:
 
 SWIGINTERN PyObject *Vec_2i_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecT_int_2_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecTint_2_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec_2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< double,2 > *result = 0 ;
+  VecMat::Vec<double,2 > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec_2d")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec< double,2 > *)new VecMat::Vec< double,2 >();
+      result = (VecMat::Vec<double,2 > *)new VecMat::Vec<double,2 >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12083,7 +12265,7 @@ SWIGINTERN PyObject *_wrap_new_Vec_2d(PyObject *SWIGUNUSEDPARM(self), PyObject *
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_double_2_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTdouble_2_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -12092,17 +12274,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec_2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< double,2 > *arg1 = (VecMat::Vec< double,2 > *) 0 ;
+  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec_2d",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_2_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_2d" "', argument " "1"" of type '" "VecMat::Vec< double,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_2d" "', argument " "1"" of type '" "VecMat::Vec<double,2 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
   {
     try {
       delete arg1;
@@ -12129,7 +12311,7 @@ SWIGINTERN PyObject *_wrap_Vec_2d_dim(PyObject *SWIGUNUSEDPARM(self), PyObject *
   if (!PyArg_ParseTuple(args,(char *)":Vec_2d_dim")) SWIG_fail;
   {
     try {
-      result = (unsigned int)VecMat::Vec< double,2 >::SWIGTEMPLATEDISAMBIGUATOR dim();
+      result = (unsigned int)VecMat::Vec<double,2 >::SWIGTEMPLATEDISAMBIGUATOR dim();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12147,21 +12329,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2d_norm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< double,2 > *arg1 = (VecMat::Vec< double,2 > *) 0 ;
-  VecMat::Vec< double,2 >::value_type result;
+  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
+  VecMat::Vec<double,2 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2d_norm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d_norm" "', argument " "1"" of type '" "VecMat::Vec< double,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d_norm" "', argument " "1"" of type '" "VecMat::Vec<double,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec< double,2 >::value_type)((VecMat::Vec< double,2 > const *)arg1)->norm();
+      result = (VecMat::Vec<double,2 >::value_type)((VecMat::Vec<double,2 > const *)arg1)->norm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12179,21 +12361,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2d_squareNorm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< double,2 > *arg1 = (VecMat::Vec< double,2 > *) 0 ;
-  VecMat::Vec< double,2 >::value_type result;
+  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
+  VecMat::Vec<double,2 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2d_squareNorm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d_squareNorm" "', argument " "1"" of type '" "VecMat::Vec< double,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d_squareNorm" "', argument " "1"" of type '" "VecMat::Vec<double,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec< double,2 >::value_type)((VecMat::Vec< double,2 > const *)arg1)->squareNorm();
+      result = (VecMat::Vec<double,2 >::value_type)((VecMat::Vec<double,2 > const *)arg1)->squareNorm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12211,23 +12393,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2d_normalize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< double,2 > *arg1 = (VecMat::Vec< double,2 > *) 0 ;
-  VecMat::Vec< double,2 > *result = 0 ;
+  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
+  VecMat::Vec<double,2 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2d_normalize",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d_normalize" "', argument " "1"" of type '" "VecMat::Vec< double,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d_normalize" "', argument " "1"" of type '" "VecMat::Vec<double,2 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec< double,2 > &_result_ref = (arg1)->normalize();
-        result = (VecMat::Vec< double,2 > *) &_result_ref;
+        VecMat::Vec<double,2 > &_result_ref = (arg1)->normalize();
+        result = (VecMat::Vec<double,2 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -12237,7 +12419,7 @@ SWIGINTERN PyObject *_wrap_Vec_2d_normalize(PyObject *SWIGUNUSEDPARM(self), PyOb
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_double_2_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -12246,23 +12428,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2d_normalizeSafe(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< double,2 > *arg1 = (VecMat::Vec< double,2 > *) 0 ;
-  VecMat::Vec< double,2 > *result = 0 ;
+  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
+  VecMat::Vec<double,2 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2d_normalizeSafe",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec< double,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec<double,2 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec< double,2 > &_result_ref = (arg1)->normalizeSafe();
-        result = (VecMat::Vec< double,2 > *) &_result_ref;
+        VecMat::Vec<double,2 > &_result_ref = (arg1)->normalizeSafe();
+        result = (VecMat::Vec<double,2 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -12272,7 +12454,7 @@ SWIGINTERN PyObject *_wrap_Vec_2d_normalizeSafe(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_double_2_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -12281,9 +12463,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2d___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< double,2 > *arg1 = (VecMat::Vec< double,2 > *) 0 ;
-  VecMat::Vec< double,2 > *arg2 = 0 ;
-  VecMat::Vec< double,2 > result;
+  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
+  VecMat::Vec<double,2 > *arg2 = 0 ;
+  VecMat::Vec<double,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -12292,22 +12474,22 @@ SWIGINTERN PyObject *_wrap_Vec_2d___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2d___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___add__" "', argument " "1"" of type '" "VecMat::Vec< double,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___add__" "', argument " "1"" of type '" "VecMat::Vec<double,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_double_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___add__" "', argument " "2"" of type '" "VecMat::Vec< double,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___add__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___add__" "', argument " "2"" of type '" "VecMat::Vec< double,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___add__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec< double,2 > const *)arg1)->operator +((VecMat::Vec< double,2 > const &)*arg2);
+      result = ((VecMat::Vec<double,2 > const *)arg1)->operator +((VecMat::Vec<double,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12316,7 +12498,7 @@ SWIGINTERN PyObject *_wrap_Vec_2d___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec< double,2 >(static_cast< const VecMat::Vec< double,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_double_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<double,2 >(static_cast< const VecMat::Vec<double,2 >& >(result))), SWIGTYPE_p_VecMat__VecTdouble_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -12325,9 +12507,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2d___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< double,2 > *arg1 = (VecMat::Vec< double,2 > *) 0 ;
-  VecMat::Vec< double,2 > *arg2 = 0 ;
-  VecMat::Vec< double,2 > result;
+  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
+  VecMat::Vec<double,2 > *arg2 = 0 ;
+  VecMat::Vec<double,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -12336,22 +12518,22 @@ SWIGINTERN PyObject *_wrap_Vec_2d___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2d___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___sub__" "', argument " "1"" of type '" "VecMat::Vec< double,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___sub__" "', argument " "1"" of type '" "VecMat::Vec<double,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_double_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___sub__" "', argument " "2"" of type '" "VecMat::Vec< double,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___sub__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___sub__" "', argument " "2"" of type '" "VecMat::Vec< double,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___sub__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec< double,2 > const *)arg1)->operator -((VecMat::Vec< double,2 > const &)*arg2);
+      result = ((VecMat::Vec<double,2 > const *)arg1)->operator -((VecMat::Vec<double,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12360,7 +12542,7 @@ SWIGINTERN PyObject *_wrap_Vec_2d___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec< double,2 >(static_cast< const VecMat::Vec< double,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_double_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<double,2 >(static_cast< const VecMat::Vec<double,2 >& >(result))), SWIGTYPE_p_VecMat__VecTdouble_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -12369,9 +12551,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2d___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< double,2 > *arg1 = (VecMat::Vec< double,2 > *) 0 ;
-  VecMat::Vec< double,2 >::value_type arg2 ;
-  VecMat::Vec< double,2 > result;
+  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
+  VecMat::Vec<double,2 >::value_type arg2 ;
+  VecMat::Vec<double,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
@@ -12380,19 +12562,19 @@ SWIGINTERN PyObject *_wrap_Vec_2d___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2d___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___mul__" "', argument " "1"" of type '" "VecMat::Vec< double,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___mul__" "', argument " "1"" of type '" "VecMat::Vec<double,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2d___mul__" "', argument " "2"" of type '" "VecMat::Vec< double,2 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2d___mul__" "', argument " "2"" of type '" "VecMat::Vec<double,2 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec< double,2 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec<double,2 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec< double,2 > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec<double,2 > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12401,7 +12583,7 @@ SWIGINTERN PyObject *_wrap_Vec_2d___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec< double,2 >(static_cast< const VecMat::Vec< double,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_double_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<double,2 >(static_cast< const VecMat::Vec<double,2 >& >(result))), SWIGTYPE_p_VecMat__VecTdouble_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -12410,9 +12592,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2d___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< double,2 > *arg1 = (VecMat::Vec< double,2 > *) 0 ;
-  VecMat::Vec< double,2 >::value_type arg2 ;
-  VecMat::Vec< double,2 > result;
+  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
+  VecMat::Vec<double,2 >::value_type arg2 ;
+  VecMat::Vec<double,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
@@ -12421,19 +12603,19 @@ SWIGINTERN PyObject *_wrap_Vec_2d___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2d___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___div__" "', argument " "1"" of type '" "VecMat::Vec< double,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___div__" "', argument " "1"" of type '" "VecMat::Vec<double,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2d___div__" "', argument " "2"" of type '" "VecMat::Vec< double,2 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2d___div__" "', argument " "2"" of type '" "VecMat::Vec<double,2 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec< double,2 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec<double,2 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec< double,2 > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec<double,2 > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12442,7 +12624,7 @@ SWIGINTERN PyObject *_wrap_Vec_2d___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec< double,2 >(static_cast< const VecMat::Vec< double,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_double_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<double,2 >(static_cast< const VecMat::Vec<double,2 >& >(result))), SWIGTYPE_p_VecMat__VecTdouble_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -12451,9 +12633,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2d___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< double,2 > *arg1 = (VecMat::Vec< double,2 > *) 0 ;
-  VecMat::Vec< double,2 > *arg2 = 0 ;
-  VecMat::Vec< double,2 >::value_type result;
+  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
+  VecMat::Vec<double,2 > *arg2 = 0 ;
+  VecMat::Vec<double,2 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -12462,22 +12644,22 @@ SWIGINTERN PyObject *_wrap_Vec_2d___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2d___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___mul__" "', argument " "1"" of type '" "VecMat::Vec< double,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___mul__" "', argument " "1"" of type '" "VecMat::Vec<double,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_double_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___mul__" "', argument " "2"" of type '" "VecMat::Vec< double,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___mul__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___mul__" "', argument " "2"" of type '" "VecMat::Vec< double,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___mul__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp2);
   {
     try {
-      result = (VecMat::Vec< double,2 >::value_type)((VecMat::Vec< double,2 > const *)arg1)->operator *((VecMat::Vec< double,2 > const &)*arg2);
+      result = (VecMat::Vec<double,2 >::value_type)((VecMat::Vec<double,2 > const *)arg1)->operator *((VecMat::Vec<double,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12499,17 +12681,17 @@ SWIGINTERN PyObject *_wrap_Vec_2d___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_double_2_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTdouble_2_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecT_double_2_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecTdouble_2_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec_2d___mul____SWIG_1(self, args);
@@ -12519,7 +12701,7 @@ SWIGINTERN PyObject *_wrap_Vec_2d___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_double_2_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTdouble_2_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -12540,8 +12722,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2d___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< double,2 > *arg1 = (VecMat::Vec< double,2 > *) 0 ;
-  VecMat::Vec< double,2 > *arg2 = 0 ;
+  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
+  VecMat::Vec<double,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -12551,22 +12733,22 @@ SWIGINTERN PyObject *_wrap_Vec_2d___eq__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2d___eq__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___eq__" "', argument " "1"" of type '" "VecMat::Vec< double,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___eq__" "', argument " "1"" of type '" "VecMat::Vec<double,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_double_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___eq__" "', argument " "2"" of type '" "VecMat::Vec< double,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___eq__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___eq__" "', argument " "2"" of type '" "VecMat::Vec< double,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___eq__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec< double,2 > const *)arg1)->operator ==((VecMat::Vec< double,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec<double,2 > const *)arg1)->operator ==((VecMat::Vec<double,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12584,8 +12766,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2d___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< double,2 > *arg1 = (VecMat::Vec< double,2 > *) 0 ;
-  VecMat::Vec< double,2 > *arg2 = 0 ;
+  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
+  VecMat::Vec<double,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -12595,22 +12777,22 @@ SWIGINTERN PyObject *_wrap_Vec_2d___ne__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2d___ne__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___ne__" "', argument " "1"" of type '" "VecMat::Vec< double,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___ne__" "', argument " "1"" of type '" "VecMat::Vec<double,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_double_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___ne__" "', argument " "2"" of type '" "VecMat::Vec< double,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___ne__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___ne__" "', argument " "2"" of type '" "VecMat::Vec< double,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___ne__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec< double,2 > const *)arg1)->operator !=((VecMat::Vec< double,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec<double,2 > const *)arg1)->operator !=((VecMat::Vec<double,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12628,8 +12810,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2d___lt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< double,2 > *arg1 = (VecMat::Vec< double,2 > *) 0 ;
-  VecMat::Vec< double,2 > *arg2 = 0 ;
+  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
+  VecMat::Vec<double,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -12639,22 +12821,22 @@ SWIGINTERN PyObject *_wrap_Vec_2d___lt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2d___lt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___lt__" "', argument " "1"" of type '" "VecMat::Vec< double,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___lt__" "', argument " "1"" of type '" "VecMat::Vec<double,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_double_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___lt__" "', argument " "2"" of type '" "VecMat::Vec< double,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___lt__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___lt__" "', argument " "2"" of type '" "VecMat::Vec< double,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___lt__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec< double,2 > const *)arg1)->operator <((VecMat::Vec< double,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec<double,2 > const *)arg1)->operator <((VecMat::Vec<double,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12672,8 +12854,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2d___gt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< double,2 > *arg1 = (VecMat::Vec< double,2 > *) 0 ;
-  VecMat::Vec< double,2 > *arg2 = 0 ;
+  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
+  VecMat::Vec<double,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -12683,22 +12865,22 @@ SWIGINTERN PyObject *_wrap_Vec_2d___gt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2d___gt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___gt__" "', argument " "1"" of type '" "VecMat::Vec< double,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___gt__" "', argument " "1"" of type '" "VecMat::Vec<double,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_double_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___gt__" "', argument " "2"" of type '" "VecMat::Vec< double,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___gt__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___gt__" "', argument " "2"" of type '" "VecMat::Vec< double,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___gt__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec< double,2 > const *)arg1)->operator >((VecMat::Vec< double,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec<double,2 > const *)arg1)->operator >((VecMat::Vec<double,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12716,19 +12898,19 @@ fail:
 
 SWIGINTERN PyObject *Vec_2d_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecT_double_2_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecTdouble_2_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec_2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< float,2 > *result = 0 ;
+  VecMat::Vec<float,2 > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec_2f")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec< float,2 > *)new VecMat::Vec< float,2 >();
+      result = (VecMat::Vec<float,2 > *)new VecMat::Vec<float,2 >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12737,7 +12919,7 @@ SWIGINTERN PyObject *_wrap_new_Vec_2f(PyObject *SWIGUNUSEDPARM(self), PyObject *
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_float_2_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTfloat_2_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -12746,17 +12928,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec_2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< float,2 > *arg1 = (VecMat::Vec< float,2 > *) 0 ;
+  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec_2f",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_2_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_2f" "', argument " "1"" of type '" "VecMat::Vec< float,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_2f" "', argument " "1"" of type '" "VecMat::Vec<float,2 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
   {
     try {
       delete arg1;
@@ -12783,7 +12965,7 @@ SWIGINTERN PyObject *_wrap_Vec_2f_dim(PyObject *SWIGUNUSEDPARM(self), PyObject *
   if (!PyArg_ParseTuple(args,(char *)":Vec_2f_dim")) SWIG_fail;
   {
     try {
-      result = (unsigned int)VecMat::Vec< float,2 >::SWIGTEMPLATEDISAMBIGUATOR dim();
+      result = (unsigned int)VecMat::Vec<float,2 >::SWIGTEMPLATEDISAMBIGUATOR dim();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12801,21 +12983,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2f_norm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< float,2 > *arg1 = (VecMat::Vec< float,2 > *) 0 ;
-  VecMat::Vec< float,2 >::value_type result;
+  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
+  VecMat::Vec<float,2 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2f_norm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f_norm" "', argument " "1"" of type '" "VecMat::Vec< float,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f_norm" "', argument " "1"" of type '" "VecMat::Vec<float,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec< float,2 >::value_type)((VecMat::Vec< float,2 > const *)arg1)->norm();
+      result = (VecMat::Vec<float,2 >::value_type)((VecMat::Vec<float,2 > const *)arg1)->norm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12833,21 +13015,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2f_squareNorm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< float,2 > *arg1 = (VecMat::Vec< float,2 > *) 0 ;
-  VecMat::Vec< float,2 >::value_type result;
+  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
+  VecMat::Vec<float,2 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2f_squareNorm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f_squareNorm" "', argument " "1"" of type '" "VecMat::Vec< float,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f_squareNorm" "', argument " "1"" of type '" "VecMat::Vec<float,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec< float,2 >::value_type)((VecMat::Vec< float,2 > const *)arg1)->squareNorm();
+      result = (VecMat::Vec<float,2 >::value_type)((VecMat::Vec<float,2 > const *)arg1)->squareNorm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12865,23 +13047,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2f_normalize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< float,2 > *arg1 = (VecMat::Vec< float,2 > *) 0 ;
-  VecMat::Vec< float,2 > *result = 0 ;
+  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
+  VecMat::Vec<float,2 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2f_normalize",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f_normalize" "', argument " "1"" of type '" "VecMat::Vec< float,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f_normalize" "', argument " "1"" of type '" "VecMat::Vec<float,2 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec< float,2 > &_result_ref = (arg1)->normalize();
-        result = (VecMat::Vec< float,2 > *) &_result_ref;
+        VecMat::Vec<float,2 > &_result_ref = (arg1)->normalize();
+        result = (VecMat::Vec<float,2 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -12891,7 +13073,7 @@ SWIGINTERN PyObject *_wrap_Vec_2f_normalize(PyObject *SWIGUNUSEDPARM(self), PyOb
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_float_2_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -12900,23 +13082,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2f_normalizeSafe(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< float,2 > *arg1 = (VecMat::Vec< float,2 > *) 0 ;
-  VecMat::Vec< float,2 > *result = 0 ;
+  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
+  VecMat::Vec<float,2 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2f_normalizeSafe",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec< float,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec<float,2 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec< float,2 > &_result_ref = (arg1)->normalizeSafe();
-        result = (VecMat::Vec< float,2 > *) &_result_ref;
+        VecMat::Vec<float,2 > &_result_ref = (arg1)->normalizeSafe();
+        result = (VecMat::Vec<float,2 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -12926,7 +13108,7 @@ SWIGINTERN PyObject *_wrap_Vec_2f_normalizeSafe(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_float_2_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -12935,9 +13117,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2f___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< float,2 > *arg1 = (VecMat::Vec< float,2 > *) 0 ;
-  VecMat::Vec< float,2 > *arg2 = 0 ;
-  VecMat::Vec< float,2 > result;
+  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
+  VecMat::Vec<float,2 > *arg2 = 0 ;
+  VecMat::Vec<float,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -12946,22 +13128,22 @@ SWIGINTERN PyObject *_wrap_Vec_2f___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2f___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___add__" "', argument " "1"" of type '" "VecMat::Vec< float,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___add__" "', argument " "1"" of type '" "VecMat::Vec<float,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_float_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___add__" "', argument " "2"" of type '" "VecMat::Vec< float,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___add__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___add__" "', argument " "2"" of type '" "VecMat::Vec< float,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___add__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec< float,2 > const *)arg1)->operator +((VecMat::Vec< float,2 > const &)*arg2);
+      result = ((VecMat::Vec<float,2 > const *)arg1)->operator +((VecMat::Vec<float,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12970,7 +13152,7 @@ SWIGINTERN PyObject *_wrap_Vec_2f___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec< float,2 >(static_cast< const VecMat::Vec< float,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_float_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<float,2 >(static_cast< const VecMat::Vec<float,2 >& >(result))), SWIGTYPE_p_VecMat__VecTfloat_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -12979,9 +13161,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2f___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< float,2 > *arg1 = (VecMat::Vec< float,2 > *) 0 ;
-  VecMat::Vec< float,2 > *arg2 = 0 ;
-  VecMat::Vec< float,2 > result;
+  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
+  VecMat::Vec<float,2 > *arg2 = 0 ;
+  VecMat::Vec<float,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -12990,22 +13172,22 @@ SWIGINTERN PyObject *_wrap_Vec_2f___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2f___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___sub__" "', argument " "1"" of type '" "VecMat::Vec< float,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___sub__" "', argument " "1"" of type '" "VecMat::Vec<float,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_float_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___sub__" "', argument " "2"" of type '" "VecMat::Vec< float,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___sub__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___sub__" "', argument " "2"" of type '" "VecMat::Vec< float,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___sub__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec< float,2 > const *)arg1)->operator -((VecMat::Vec< float,2 > const &)*arg2);
+      result = ((VecMat::Vec<float,2 > const *)arg1)->operator -((VecMat::Vec<float,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13014,7 +13196,7 @@ SWIGINTERN PyObject *_wrap_Vec_2f___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec< float,2 >(static_cast< const VecMat::Vec< float,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_float_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<float,2 >(static_cast< const VecMat::Vec<float,2 >& >(result))), SWIGTYPE_p_VecMat__VecTfloat_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -13023,9 +13205,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2f___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< float,2 > *arg1 = (VecMat::Vec< float,2 > *) 0 ;
-  VecMat::Vec< float,2 >::value_type arg2 ;
-  VecMat::Vec< float,2 > result;
+  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
+  VecMat::Vec<float,2 >::value_type arg2 ;
+  VecMat::Vec<float,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   float val2 ;
@@ -13034,19 +13216,19 @@ SWIGINTERN PyObject *_wrap_Vec_2f___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2f___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___mul__" "', argument " "1"" of type '" "VecMat::Vec< float,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___mul__" "', argument " "1"" of type '" "VecMat::Vec<float,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2f___mul__" "', argument " "2"" of type '" "VecMat::Vec< float,2 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2f___mul__" "', argument " "2"" of type '" "VecMat::Vec<float,2 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec< float,2 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec<float,2 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec< float,2 > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec<float,2 > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13055,7 +13237,7 @@ SWIGINTERN PyObject *_wrap_Vec_2f___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec< float,2 >(static_cast< const VecMat::Vec< float,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_float_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<float,2 >(static_cast< const VecMat::Vec<float,2 >& >(result))), SWIGTYPE_p_VecMat__VecTfloat_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -13064,9 +13246,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2f___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< float,2 > *arg1 = (VecMat::Vec< float,2 > *) 0 ;
-  VecMat::Vec< float,2 >::value_type arg2 ;
-  VecMat::Vec< float,2 > result;
+  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
+  VecMat::Vec<float,2 >::value_type arg2 ;
+  VecMat::Vec<float,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   float val2 ;
@@ -13075,19 +13257,19 @@ SWIGINTERN PyObject *_wrap_Vec_2f___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2f___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___div__" "', argument " "1"" of type '" "VecMat::Vec< float,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___div__" "', argument " "1"" of type '" "VecMat::Vec<float,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2f___div__" "', argument " "2"" of type '" "VecMat::Vec< float,2 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2f___div__" "', argument " "2"" of type '" "VecMat::Vec<float,2 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec< float,2 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec<float,2 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec< float,2 > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec<float,2 > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13096,7 +13278,7 @@ SWIGINTERN PyObject *_wrap_Vec_2f___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec< float,2 >(static_cast< const VecMat::Vec< float,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_float_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<float,2 >(static_cast< const VecMat::Vec<float,2 >& >(result))), SWIGTYPE_p_VecMat__VecTfloat_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -13105,9 +13287,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2f___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< float,2 > *arg1 = (VecMat::Vec< float,2 > *) 0 ;
-  VecMat::Vec< float,2 > *arg2 = 0 ;
-  VecMat::Vec< float,2 >::value_type result;
+  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
+  VecMat::Vec<float,2 > *arg2 = 0 ;
+  VecMat::Vec<float,2 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -13116,22 +13298,22 @@ SWIGINTERN PyObject *_wrap_Vec_2f___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2f___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___mul__" "', argument " "1"" of type '" "VecMat::Vec< float,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___mul__" "', argument " "1"" of type '" "VecMat::Vec<float,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_float_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___mul__" "', argument " "2"" of type '" "VecMat::Vec< float,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___mul__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___mul__" "', argument " "2"" of type '" "VecMat::Vec< float,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___mul__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp2);
   {
     try {
-      result = (VecMat::Vec< float,2 >::value_type)((VecMat::Vec< float,2 > const *)arg1)->operator *((VecMat::Vec< float,2 > const &)*arg2);
+      result = (VecMat::Vec<float,2 >::value_type)((VecMat::Vec<float,2 > const *)arg1)->operator *((VecMat::Vec<float,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13153,17 +13335,17 @@ SWIGINTERN PyObject *_wrap_Vec_2f___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_float_2_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTfloat_2_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecT_float_2_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecTfloat_2_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec_2f___mul____SWIG_1(self, args);
@@ -13173,7 +13355,7 @@ SWIGINTERN PyObject *_wrap_Vec_2f___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_float_2_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTfloat_2_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -13194,8 +13376,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2f___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< float,2 > *arg1 = (VecMat::Vec< float,2 > *) 0 ;
-  VecMat::Vec< float,2 > *arg2 = 0 ;
+  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
+  VecMat::Vec<float,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -13205,22 +13387,22 @@ SWIGINTERN PyObject *_wrap_Vec_2f___eq__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2f___eq__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___eq__" "', argument " "1"" of type '" "VecMat::Vec< float,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___eq__" "', argument " "1"" of type '" "VecMat::Vec<float,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_float_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___eq__" "', argument " "2"" of type '" "VecMat::Vec< float,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___eq__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___eq__" "', argument " "2"" of type '" "VecMat::Vec< float,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___eq__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec< float,2 > const *)arg1)->operator ==((VecMat::Vec< float,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec<float,2 > const *)arg1)->operator ==((VecMat::Vec<float,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13238,8 +13420,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2f___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< float,2 > *arg1 = (VecMat::Vec< float,2 > *) 0 ;
-  VecMat::Vec< float,2 > *arg2 = 0 ;
+  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
+  VecMat::Vec<float,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -13249,22 +13431,22 @@ SWIGINTERN PyObject *_wrap_Vec_2f___ne__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2f___ne__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___ne__" "', argument " "1"" of type '" "VecMat::Vec< float,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___ne__" "', argument " "1"" of type '" "VecMat::Vec<float,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_float_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___ne__" "', argument " "2"" of type '" "VecMat::Vec< float,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___ne__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___ne__" "', argument " "2"" of type '" "VecMat::Vec< float,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___ne__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec< float,2 > const *)arg1)->operator !=((VecMat::Vec< float,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec<float,2 > const *)arg1)->operator !=((VecMat::Vec<float,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13282,8 +13464,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2f___lt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< float,2 > *arg1 = (VecMat::Vec< float,2 > *) 0 ;
-  VecMat::Vec< float,2 > *arg2 = 0 ;
+  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
+  VecMat::Vec<float,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -13293,22 +13475,22 @@ SWIGINTERN PyObject *_wrap_Vec_2f___lt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2f___lt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___lt__" "', argument " "1"" of type '" "VecMat::Vec< float,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___lt__" "', argument " "1"" of type '" "VecMat::Vec<float,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_float_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___lt__" "', argument " "2"" of type '" "VecMat::Vec< float,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___lt__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___lt__" "', argument " "2"" of type '" "VecMat::Vec< float,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___lt__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec< float,2 > const *)arg1)->operator <((VecMat::Vec< float,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec<float,2 > const *)arg1)->operator <((VecMat::Vec<float,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13326,8 +13508,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2f___gt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< float,2 > *arg1 = (VecMat::Vec< float,2 > *) 0 ;
-  VecMat::Vec< float,2 > *arg2 = 0 ;
+  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
+  VecMat::Vec<float,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -13337,22 +13519,22 @@ SWIGINTERN PyObject *_wrap_Vec_2f___gt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2f___gt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___gt__" "', argument " "1"" of type '" "VecMat::Vec< float,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___gt__" "', argument " "1"" of type '" "VecMat::Vec<float,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_float_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___gt__" "', argument " "2"" of type '" "VecMat::Vec< float,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___gt__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___gt__" "', argument " "2"" of type '" "VecMat::Vec< float,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___gt__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec< float,2 > const *)arg1)->operator >((VecMat::Vec< float,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec<float,2 > const *)arg1)->operator >((VecMat::Vec<float,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13370,19 +13552,19 @@ fail:
 
 SWIGINTERN PyObject *Vec_2f_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecT_float_2_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecTfloat_2_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec2u__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< unsigned int > *result = 0 ;
+  VecMat::Vec2<unsigned int > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec2u")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec2< unsigned int > *)new VecMat::Vec2< unsigned int >();
+      result = (VecMat::Vec2<unsigned int > *)new VecMat::Vec2<unsigned int >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13391,7 +13573,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2u__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -13400,9 +13582,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec2u__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< unsigned int >::value_type arg1 ;
-  VecMat::Vec2< unsigned int >::value_type arg2 ;
-  VecMat::Vec2< unsigned int > *result = 0 ;
+  VecMat::Vec2<unsigned int >::value_type arg1 ;
+  VecMat::Vec2<unsigned int >::value_type arg2 ;
+  VecMat::Vec2<unsigned int > *result = 0 ;
   unsigned int val1 ;
   int ecode1 = 0 ;
   unsigned int val2 ;
@@ -13413,17 +13595,17 @@ SWIGINTERN PyObject *_wrap_new_Vec2u__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OO:new_Vec2u",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_unsigned_SS_int(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2u" "', argument " "1"" of type '" "VecMat::Vec2< unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2u" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec2< unsigned int >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec2<unsigned int >::value_type >(val1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec2u" "', argument " "2"" of type '" "VecMat::Vec2< unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec2u" "', argument " "2"" of type '" "VecMat::Vec2<unsigned int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2< unsigned int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2<unsigned int >::value_type >(val2);
   {
     try {
-      result = (VecMat::Vec2< unsigned int > *)new VecMat::Vec2< unsigned int >(arg1,arg2);
+      result = (VecMat::Vec2<unsigned int > *)new VecMat::Vec2<unsigned int >(arg1,arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13432,7 +13614,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2u__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -13441,8 +13623,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec2u__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< unsigned int >::value_type arg1 ;
-  VecMat::Vec2< unsigned int > *result = 0 ;
+  VecMat::Vec2<unsigned int >::value_type arg1 ;
+  VecMat::Vec2<unsigned int > *result = 0 ;
   unsigned int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -13450,12 +13632,12 @@ SWIGINTERN PyObject *_wrap_new_Vec2u__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"O:new_Vec2u",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_unsigned_SS_int(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2u" "', argument " "1"" of type '" "VecMat::Vec2< unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2u" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec2< unsigned int >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec2<unsigned int >::value_type >(val1);
   {
     try {
-      result = (VecMat::Vec2< unsigned int > *)new VecMat::Vec2< unsigned int >(arg1);
+      result = (VecMat::Vec2<unsigned int > *)new VecMat::Vec2<unsigned int >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13464,7 +13646,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2u__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -13477,7 +13659,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2u(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -13512,32 +13694,28 @@ SWIGINTERN PyObject *_wrap_new_Vec2u(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec2u'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    VecMat::Vec2< unsigned int >()\n"
-    "    VecMat::Vec2< unsigned int >(VecMat::Vec2< unsigned int >::value_type const,VecMat::Vec2< unsigned int >::value_type const)\n"
-    "    VecMat::Vec2< unsigned int >(VecMat::Vec2< unsigned int >::value_type const)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec2u'.\n  Possible C/C++ prototypes are:\n    VecMat::Vec2<(unsigned int)>()\n    VecMat::Vec2<(unsigned int)>(VecMat::Vec2<unsigned int >::value_type const,VecMat::Vec2<unsigned int >::value_type const)\n    VecMat::Vec2<(unsigned int)>(VecMat::Vec2<unsigned int >::value_type const)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec2u_x__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< unsigned int > *arg1 = (VecMat::Vec2< unsigned int > *) 0 ;
-  VecMat::Vec2< unsigned int >::value_type result;
+  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
+  VecMat::Vec2<unsigned int >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2u_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u_x" "', argument " "1"" of type '" "VecMat::Vec2< unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u_x" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
   {
     try {
-      result = (VecMat::Vec2< unsigned int >::value_type)((VecMat::Vec2< unsigned int > const *)arg1)->x();
+      result = (VecMat::Vec2<unsigned int >::value_type)((VecMat::Vec2<unsigned int > const *)arg1)->x();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13555,23 +13733,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2u_x__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< unsigned int > *arg1 = (VecMat::Vec2< unsigned int > *) 0 ;
-  VecMat::Vec2< unsigned int >::value_type *result = 0 ;
+  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
+  VecMat::Vec2<unsigned int >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2u_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u_x" "', argument " "1"" of type '" "VecMat::Vec2< unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u_x" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
   {
     try {
       {
-        VecMat::Vec2< unsigned int >::value_type &_result_ref = (arg1)->x();
-        result = (VecMat::Vec2< unsigned int >::value_type *) &_result_ref;
+        VecMat::Vec2<unsigned int >::value_type &_result_ref = (arg1)->x();
+        result = (VecMat::Vec2<unsigned int >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -13594,14 +13772,14 @@ SWIGINTERN PyObject *_wrap_Vec2u_x(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2u_x__SWIG_0(self, args);
@@ -13610,7 +13788,7 @@ SWIGINTERN PyObject *_wrap_Vec2u_x(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2u_x__SWIG_1(self, args);
@@ -13618,31 +13796,28 @@ SWIGINTERN PyObject *_wrap_Vec2u_x(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2u_x'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    x(VecMat::Vec2< unsigned int > const *)\n"
-    "    x(VecMat::Vec2< unsigned int > *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2u_x'.\n  Possible C/C++ prototypes are:\n    x()\n    x()\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec2u_y__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< unsigned int > *arg1 = (VecMat::Vec2< unsigned int > *) 0 ;
-  VecMat::Vec2< unsigned int >::value_type result;
+  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
+  VecMat::Vec2<unsigned int >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2u_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u_y" "', argument " "1"" of type '" "VecMat::Vec2< unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u_y" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
   {
     try {
-      result = (VecMat::Vec2< unsigned int >::value_type)((VecMat::Vec2< unsigned int > const *)arg1)->y();
+      result = (VecMat::Vec2<unsigned int >::value_type)((VecMat::Vec2<unsigned int > const *)arg1)->y();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13660,23 +13835,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2u_y__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< unsigned int > *arg1 = (VecMat::Vec2< unsigned int > *) 0 ;
-  VecMat::Vec2< unsigned int >::value_type *result = 0 ;
+  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
+  VecMat::Vec2<unsigned int >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2u_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u_y" "', argument " "1"" of type '" "VecMat::Vec2< unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u_y" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
   {
     try {
       {
-        VecMat::Vec2< unsigned int >::value_type &_result_ref = (arg1)->y();
-        result = (VecMat::Vec2< unsigned int >::value_type *) &_result_ref;
+        VecMat::Vec2<unsigned int >::value_type &_result_ref = (arg1)->y();
+        result = (VecMat::Vec2<unsigned int >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -13699,14 +13874,14 @@ SWIGINTERN PyObject *_wrap_Vec2u_y(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2u_y__SWIG_0(self, args);
@@ -13715,7 +13890,7 @@ SWIGINTERN PyObject *_wrap_Vec2u_y(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2u_y__SWIG_1(self, args);
@@ -13723,18 +13898,15 @@ SWIGINTERN PyObject *_wrap_Vec2u_y(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2u_y'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    y(VecMat::Vec2< unsigned int > const *)\n"
-    "    y(VecMat::Vec2< unsigned int > *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2u_y'.\n  Possible C/C++ prototypes are:\n    y()\n    y()\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec2u_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< unsigned int > *arg1 = (VecMat::Vec2< unsigned int > *) 0 ;
-  VecMat::Vec2< unsigned int >::value_type arg2 ;
+  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
+  VecMat::Vec2<unsigned int >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned int val2 ;
@@ -13743,16 +13915,16 @@ SWIGINTERN PyObject *_wrap_Vec2u_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2u_setX",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u_setX" "', argument " "1"" of type '" "VecMat::Vec2< unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u_setX" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2u_setX" "', argument " "2"" of type '" "VecMat::Vec2< unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2u_setX" "', argument " "2"" of type '" "VecMat::Vec2<unsigned int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2< unsigned int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2<unsigned int >::value_type >(val2);
   {
     try {
       (arg1)->setX(arg2);
@@ -13773,8 +13945,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2u_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< unsigned int > *arg1 = (VecMat::Vec2< unsigned int > *) 0 ;
-  VecMat::Vec2< unsigned int >::value_type arg2 ;
+  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
+  VecMat::Vec2<unsigned int >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned int val2 ;
@@ -13783,16 +13955,16 @@ SWIGINTERN PyObject *_wrap_Vec2u_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2u_setY",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u_setY" "', argument " "1"" of type '" "VecMat::Vec2< unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u_setY" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2u_setY" "', argument " "2"" of type '" "VecMat::Vec2< unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2u_setY" "', argument " "2"" of type '" "VecMat::Vec2<unsigned int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2< unsigned int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2<unsigned int >::value_type >(val2);
   {
     try {
       (arg1)->setY(arg2);
@@ -13813,9 +13985,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2u___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< unsigned int > *arg1 = (VecMat::Vec2< unsigned int > *) 0 ;
-  VecMat::Vec2< unsigned int > *arg2 = 0 ;
-  VecMat::Vec2< unsigned int > result;
+  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
+  VecMat::Vec2<unsigned int > *arg2 = 0 ;
+  VecMat::Vec2<unsigned int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -13824,22 +13996,22 @@ SWIGINTERN PyObject *_wrap_Vec2u___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2u___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u___add__" "', argument " "1"" of type '" "VecMat::Vec2< unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u___add__" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< unsigned int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2u___add__" "', argument " "2"" of type '" "VecMat::Vec2< unsigned int > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2u___add__" "', argument " "2"" of type '" "VecMat::Vec2<unsigned int > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2u___add__" "', argument " "2"" of type '" "VecMat::Vec2< unsigned int > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2u___add__" "', argument " "2"" of type '" "VecMat::Vec2<unsigned int > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec2< unsigned int > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec2< unsigned int > const *)arg1)->operator +((VecMat::Vec2< unsigned int > const &)*arg2);
+      result = ((VecMat::Vec2<unsigned int > const *)arg1)->operator +((VecMat::Vec2<unsigned int > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13848,7 +14020,7 @@ SWIGINTERN PyObject *_wrap_Vec2u___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< unsigned int >(static_cast< const VecMat::Vec2< unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<unsigned int >(static_cast< const VecMat::Vec2<unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -13857,9 +14029,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2u___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< unsigned int > *arg1 = (VecMat::Vec2< unsigned int > *) 0 ;
-  VecMat::Vec2< unsigned int > *arg2 = 0 ;
-  VecMat::Vec2< unsigned int > result;
+  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
+  VecMat::Vec2<unsigned int > *arg2 = 0 ;
+  VecMat::Vec2<unsigned int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -13868,22 +14040,22 @@ SWIGINTERN PyObject *_wrap_Vec2u___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2u___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u___sub__" "', argument " "1"" of type '" "VecMat::Vec2< unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u___sub__" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< unsigned int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2u___sub__" "', argument " "2"" of type '" "VecMat::Vec2< unsigned int > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2u___sub__" "', argument " "2"" of type '" "VecMat::Vec2<unsigned int > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2u___sub__" "', argument " "2"" of type '" "VecMat::Vec2< unsigned int > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2u___sub__" "', argument " "2"" of type '" "VecMat::Vec2<unsigned int > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec2< unsigned int > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec2< unsigned int > const *)arg1)->operator -((VecMat::Vec2< unsigned int > const &)*arg2);
+      result = ((VecMat::Vec2<unsigned int > const *)arg1)->operator -((VecMat::Vec2<unsigned int > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13892,7 +14064,7 @@ SWIGINTERN PyObject *_wrap_Vec2u___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< unsigned int >(static_cast< const VecMat::Vec2< unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<unsigned int >(static_cast< const VecMat::Vec2<unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -13901,9 +14073,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2u___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< unsigned int > *arg1 = (VecMat::Vec2< unsigned int > *) 0 ;
-  VecMat::Vec2< unsigned int >::value_type arg2 ;
-  VecMat::Vec2< unsigned int > result;
+  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
+  VecMat::Vec2<unsigned int >::value_type arg2 ;
+  VecMat::Vec2<unsigned int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned int val2 ;
@@ -13912,19 +14084,19 @@ SWIGINTERN PyObject *_wrap_Vec2u___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2u___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u___mul__" "', argument " "1"" of type '" "VecMat::Vec2< unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u___mul__" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2u___mul__" "', argument " "2"" of type '" "VecMat::Vec2< unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2u___mul__" "', argument " "2"" of type '" "VecMat::Vec2<unsigned int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2< unsigned int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2<unsigned int >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec2< unsigned int > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec2<unsigned int > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13933,7 +14105,7 @@ SWIGINTERN PyObject *_wrap_Vec2u___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< unsigned int >(static_cast< const VecMat::Vec2< unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<unsigned int >(static_cast< const VecMat::Vec2<unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -13942,9 +14114,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2u___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< unsigned int > *arg1 = (VecMat::Vec2< unsigned int > *) 0 ;
-  VecMat::Vec2< unsigned int >::value_type arg2 ;
-  VecMat::Vec2< unsigned int > result;
+  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
+  VecMat::Vec2<unsigned int >::value_type arg2 ;
+  VecMat::Vec2<unsigned int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned int val2 ;
@@ -13953,19 +14125,19 @@ SWIGINTERN PyObject *_wrap_Vec2u___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2u___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u___div__" "', argument " "1"" of type '" "VecMat::Vec2< unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u___div__" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2u___div__" "', argument " "2"" of type '" "VecMat::Vec2< unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2u___div__" "', argument " "2"" of type '" "VecMat::Vec2<unsigned int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2< unsigned int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2<unsigned int >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec2< unsigned int > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec2<unsigned int > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13974,7 +14146,7 @@ SWIGINTERN PyObject *_wrap_Vec2u___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< unsigned int >(static_cast< const VecMat::Vec2< unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<unsigned int >(static_cast< const VecMat::Vec2<unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -13983,9 +14155,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2u___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< unsigned int > *arg1 = (VecMat::Vec2< unsigned int > *) 0 ;
-  VecMat::Vec2< unsigned int > *arg2 = 0 ;
-  VecMat::Vec2< unsigned int >::value_type result;
+  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
+  VecMat::Vec2<unsigned int > *arg2 = 0 ;
+  VecMat::Vec2<unsigned int >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -13994,22 +14166,22 @@ SWIGINTERN PyObject *_wrap_Vec2u___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2u___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u___mul__" "', argument " "1"" of type '" "VecMat::Vec2< unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u___mul__" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< unsigned int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2u___mul__" "', argument " "2"" of type '" "VecMat::Vec2< unsigned int > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2u___mul__" "', argument " "2"" of type '" "VecMat::Vec2<unsigned int > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2u___mul__" "', argument " "2"" of type '" "VecMat::Vec2< unsigned int > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2u___mul__" "', argument " "2"" of type '" "VecMat::Vec2<unsigned int > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec2< unsigned int > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp2);
   {
     try {
-      result = (VecMat::Vec2< unsigned int >::value_type)((VecMat::Vec2< unsigned int > const *)arg1)->operator *((VecMat::Vec2< unsigned int > const &)*arg2);
+      result = (VecMat::Vec2<unsigned int >::value_type)((VecMat::Vec2<unsigned int > const *)arg1)->operator *((VecMat::Vec2<unsigned int > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -14031,17 +14203,17 @@ SWIGINTERN PyObject *_wrap_Vec2u___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec2u___mul____SWIG_1(self, args);
@@ -14051,7 +14223,7 @@ SWIGINTERN PyObject *_wrap_Vec2u___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -14072,17 +14244,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec2u(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< unsigned int > *arg1 = (VecMat::Vec2< unsigned int > *) 0 ;
+  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec2u",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec2u" "', argument " "1"" of type '" "VecMat::Vec2< unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec2u" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
   {
     try {
       delete arg1;
@@ -14104,19 +14276,19 @@ fail:
 
 SWIGINTERN PyObject *Vec2u_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec2i__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< int > *result = 0 ;
+  VecMat::Vec2<int > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec2i")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec2< int > *)new VecMat::Vec2< int >();
+      result = (VecMat::Vec2<int > *)new VecMat::Vec2<int >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -14125,7 +14297,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2i__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2T_int_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tint_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -14134,9 +14306,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec2i__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< int >::value_type arg1 ;
-  VecMat::Vec2< int >::value_type arg2 ;
-  VecMat::Vec2< int > *result = 0 ;
+  VecMat::Vec2<int >::value_type arg1 ;
+  VecMat::Vec2<int >::value_type arg2 ;
+  VecMat::Vec2<int > *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -14147,17 +14319,17 @@ SWIGINTERN PyObject *_wrap_new_Vec2i__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OO:new_Vec2i",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2i" "', argument " "1"" of type '" "VecMat::Vec2< int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2i" "', argument " "1"" of type '" "VecMat::Vec2<int >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec2< int >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec2<int >::value_type >(val1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec2i" "', argument " "2"" of type '" "VecMat::Vec2< int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec2i" "', argument " "2"" of type '" "VecMat::Vec2<int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2< int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2<int >::value_type >(val2);
   {
     try {
-      result = (VecMat::Vec2< int > *)new VecMat::Vec2< int >(arg1,arg2);
+      result = (VecMat::Vec2<int > *)new VecMat::Vec2<int >(arg1,arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -14166,7 +14338,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2i__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2T_int_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tint_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -14175,8 +14347,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec2i__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< int >::value_type arg1 ;
-  VecMat::Vec2< int > *result = 0 ;
+  VecMat::Vec2<int >::value_type arg1 ;
+  VecMat::Vec2<int > *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -14184,12 +14356,12 @@ SWIGINTERN PyObject *_wrap_new_Vec2i__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"O:new_Vec2i",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2i" "', argument " "1"" of type '" "VecMat::Vec2< int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2i" "', argument " "1"" of type '" "VecMat::Vec2<int >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec2< int >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec2<int >::value_type >(val1);
   {
     try {
-      result = (VecMat::Vec2< int > *)new VecMat::Vec2< int >(arg1);
+      result = (VecMat::Vec2<int > *)new VecMat::Vec2<int >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -14198,7 +14370,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2i__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2T_int_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tint_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -14211,7 +14383,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2i(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -14246,32 +14418,28 @@ SWIGINTERN PyObject *_wrap_new_Vec2i(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec2i'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    VecMat::Vec2< int >()\n"
-    "    VecMat::Vec2< int >(VecMat::Vec2< int >::value_type const,VecMat::Vec2< int >::value_type const)\n"
-    "    VecMat::Vec2< int >(VecMat::Vec2< int >::value_type const)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec2i'.\n  Possible C/C++ prototypes are:\n    VecMat::Vec2<(int)>()\n    VecMat::Vec2<(int)>(VecMat::Vec2<int >::value_type const,VecMat::Vec2<int >::value_type const)\n    VecMat::Vec2<(int)>(VecMat::Vec2<int >::value_type const)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec2i_x__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< int > *arg1 = (VecMat::Vec2< int > *) 0 ;
-  VecMat::Vec2< int >::value_type result;
+  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
+  VecMat::Vec2<int >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2i_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i_x" "', argument " "1"" of type '" "VecMat::Vec2< int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i_x" "', argument " "1"" of type '" "VecMat::Vec2<int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
   {
     try {
-      result = (VecMat::Vec2< int >::value_type)((VecMat::Vec2< int > const *)arg1)->x();
+      result = (VecMat::Vec2<int >::value_type)((VecMat::Vec2<int > const *)arg1)->x();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -14289,23 +14457,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2i_x__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< int > *arg1 = (VecMat::Vec2< int > *) 0 ;
-  VecMat::Vec2< int >::value_type *result = 0 ;
+  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
+  VecMat::Vec2<int >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2i_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i_x" "', argument " "1"" of type '" "VecMat::Vec2< int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i_x" "', argument " "1"" of type '" "VecMat::Vec2<int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
   {
     try {
       {
-        VecMat::Vec2< int >::value_type &_result_ref = (arg1)->x();
-        result = (VecMat::Vec2< int >::value_type *) &_result_ref;
+        VecMat::Vec2<int >::value_type &_result_ref = (arg1)->x();
+        result = (VecMat::Vec2<int >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -14328,14 +14496,14 @@ SWIGINTERN PyObject *_wrap_Vec2i_x(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tint_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2i_x__SWIG_0(self, args);
@@ -14344,7 +14512,7 @@ SWIGINTERN PyObject *_wrap_Vec2i_x(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tint_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2i_x__SWIG_1(self, args);
@@ -14352,31 +14520,28 @@ SWIGINTERN PyObject *_wrap_Vec2i_x(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2i_x'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    x(VecMat::Vec2< int > const *)\n"
-    "    x(VecMat::Vec2< int > *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2i_x'.\n  Possible C/C++ prototypes are:\n    x()\n    x()\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec2i_y__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< int > *arg1 = (VecMat::Vec2< int > *) 0 ;
-  VecMat::Vec2< int >::value_type result;
+  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
+  VecMat::Vec2<int >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2i_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i_y" "', argument " "1"" of type '" "VecMat::Vec2< int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i_y" "', argument " "1"" of type '" "VecMat::Vec2<int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
   {
     try {
-      result = (VecMat::Vec2< int >::value_type)((VecMat::Vec2< int > const *)arg1)->y();
+      result = (VecMat::Vec2<int >::value_type)((VecMat::Vec2<int > const *)arg1)->y();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -14394,23 +14559,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2i_y__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< int > *arg1 = (VecMat::Vec2< int > *) 0 ;
-  VecMat::Vec2< int >::value_type *result = 0 ;
+  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
+  VecMat::Vec2<int >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2i_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i_y" "', argument " "1"" of type '" "VecMat::Vec2< int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i_y" "', argument " "1"" of type '" "VecMat::Vec2<int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
   {
     try {
       {
-        VecMat::Vec2< int >::value_type &_result_ref = (arg1)->y();
-        result = (VecMat::Vec2< int >::value_type *) &_result_ref;
+        VecMat::Vec2<int >::value_type &_result_ref = (arg1)->y();
+        result = (VecMat::Vec2<int >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -14433,14 +14598,14 @@ SWIGINTERN PyObject *_wrap_Vec2i_y(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tint_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2i_y__SWIG_0(self, args);
@@ -14449,7 +14614,7 @@ SWIGINTERN PyObject *_wrap_Vec2i_y(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tint_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2i_y__SWIG_1(self, args);
@@ -14457,18 +14622,15 @@ SWIGINTERN PyObject *_wrap_Vec2i_y(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2i_y'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    y(VecMat::Vec2< int > const *)\n"
-    "    y(VecMat::Vec2< int > *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2i_y'.\n  Possible C/C++ prototypes are:\n    y()\n    y()\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec2i_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< int > *arg1 = (VecMat::Vec2< int > *) 0 ;
-  VecMat::Vec2< int >::value_type arg2 ;
+  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
+  VecMat::Vec2<int >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -14477,16 +14639,16 @@ SWIGINTERN PyObject *_wrap_Vec2i_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2i_setX",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i_setX" "', argument " "1"" of type '" "VecMat::Vec2< int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i_setX" "', argument " "1"" of type '" "VecMat::Vec2<int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2i_setX" "', argument " "2"" of type '" "VecMat::Vec2< int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2i_setX" "', argument " "2"" of type '" "VecMat::Vec2<int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2< int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2<int >::value_type >(val2);
   {
     try {
       (arg1)->setX(arg2);
@@ -14507,8 +14669,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2i_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< int > *arg1 = (VecMat::Vec2< int > *) 0 ;
-  VecMat::Vec2< int >::value_type arg2 ;
+  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
+  VecMat::Vec2<int >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -14517,16 +14679,16 @@ SWIGINTERN PyObject *_wrap_Vec2i_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2i_setY",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i_setY" "', argument " "1"" of type '" "VecMat::Vec2< int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i_setY" "', argument " "1"" of type '" "VecMat::Vec2<int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2i_setY" "', argument " "2"" of type '" "VecMat::Vec2< int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2i_setY" "', argument " "2"" of type '" "VecMat::Vec2<int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2< int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2<int >::value_type >(val2);
   {
     try {
       (arg1)->setY(arg2);
@@ -14547,9 +14709,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2i___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< int > *arg1 = (VecMat::Vec2< int > *) 0 ;
-  VecMat::Vec2< int > *arg2 = 0 ;
-  VecMat::Vec2< int > result;
+  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
+  VecMat::Vec2<int > *arg2 = 0 ;
+  VecMat::Vec2<int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -14558,22 +14720,22 @@ SWIGINTERN PyObject *_wrap_Vec2i___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2i___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i___add__" "', argument " "1"" of type '" "VecMat::Vec2< int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i___add__" "', argument " "1"" of type '" "VecMat::Vec2<int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_int_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tint_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2i___add__" "', argument " "2"" of type '" "VecMat::Vec2< int > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2i___add__" "', argument " "2"" of type '" "VecMat::Vec2<int > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2i___add__" "', argument " "2"" of type '" "VecMat::Vec2< int > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2i___add__" "', argument " "2"" of type '" "VecMat::Vec2<int > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec2< int > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec2<int > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec2< int > const *)arg1)->operator +((VecMat::Vec2< int > const &)*arg2);
+      result = ((VecMat::Vec2<int > const *)arg1)->operator +((VecMat::Vec2<int > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -14582,7 +14744,7 @@ SWIGINTERN PyObject *_wrap_Vec2i___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< int >(static_cast< const VecMat::Vec2< int >& >(result))), SWIGTYPE_p_VecMat__Vec2T_int_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<int >(static_cast< const VecMat::Vec2<int >& >(result))), SWIGTYPE_p_VecMat__Vec2Tint_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -14591,9 +14753,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2i___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< int > *arg1 = (VecMat::Vec2< int > *) 0 ;
-  VecMat::Vec2< int > *arg2 = 0 ;
-  VecMat::Vec2< int > result;
+  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
+  VecMat::Vec2<int > *arg2 = 0 ;
+  VecMat::Vec2<int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -14602,22 +14764,22 @@ SWIGINTERN PyObject *_wrap_Vec2i___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2i___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i___sub__" "', argument " "1"" of type '" "VecMat::Vec2< int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i___sub__" "', argument " "1"" of type '" "VecMat::Vec2<int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_int_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tint_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2i___sub__" "', argument " "2"" of type '" "VecMat::Vec2< int > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2i___sub__" "', argument " "2"" of type '" "VecMat::Vec2<int > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2i___sub__" "', argument " "2"" of type '" "VecMat::Vec2< int > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2i___sub__" "', argument " "2"" of type '" "VecMat::Vec2<int > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec2< int > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec2<int > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec2< int > const *)arg1)->operator -((VecMat::Vec2< int > const &)*arg2);
+      result = ((VecMat::Vec2<int > const *)arg1)->operator -((VecMat::Vec2<int > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -14626,7 +14788,7 @@ SWIGINTERN PyObject *_wrap_Vec2i___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< int >(static_cast< const VecMat::Vec2< int >& >(result))), SWIGTYPE_p_VecMat__Vec2T_int_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<int >(static_cast< const VecMat::Vec2<int >& >(result))), SWIGTYPE_p_VecMat__Vec2Tint_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -14635,9 +14797,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2i___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< int > *arg1 = (VecMat::Vec2< int > *) 0 ;
-  VecMat::Vec2< int >::value_type arg2 ;
-  VecMat::Vec2< int > result;
+  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
+  VecMat::Vec2<int >::value_type arg2 ;
+  VecMat::Vec2<int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -14646,19 +14808,19 @@ SWIGINTERN PyObject *_wrap_Vec2i___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2i___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i___mul__" "', argument " "1"" of type '" "VecMat::Vec2< int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i___mul__" "', argument " "1"" of type '" "VecMat::Vec2<int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2i___mul__" "', argument " "2"" of type '" "VecMat::Vec2< int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2i___mul__" "', argument " "2"" of type '" "VecMat::Vec2<int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2< int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2<int >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec2< int > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec2<int > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -14667,7 +14829,7 @@ SWIGINTERN PyObject *_wrap_Vec2i___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< int >(static_cast< const VecMat::Vec2< int >& >(result))), SWIGTYPE_p_VecMat__Vec2T_int_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<int >(static_cast< const VecMat::Vec2<int >& >(result))), SWIGTYPE_p_VecMat__Vec2Tint_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -14676,9 +14838,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2i___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< int > *arg1 = (VecMat::Vec2< int > *) 0 ;
-  VecMat::Vec2< int >::value_type arg2 ;
-  VecMat::Vec2< int > result;
+  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
+  VecMat::Vec2<int >::value_type arg2 ;
+  VecMat::Vec2<int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -14687,19 +14849,19 @@ SWIGINTERN PyObject *_wrap_Vec2i___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2i___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i___div__" "', argument " "1"" of type '" "VecMat::Vec2< int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i___div__" "', argument " "1"" of type '" "VecMat::Vec2<int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2i___div__" "', argument " "2"" of type '" "VecMat::Vec2< int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2i___div__" "', argument " "2"" of type '" "VecMat::Vec2<int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2< int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2<int >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec2< int > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec2<int > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -14708,7 +14870,7 @@ SWIGINTERN PyObject *_wrap_Vec2i___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< int >(static_cast< const VecMat::Vec2< int >& >(result))), SWIGTYPE_p_VecMat__Vec2T_int_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<int >(static_cast< const VecMat::Vec2<int >& >(result))), SWIGTYPE_p_VecMat__Vec2Tint_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -14717,9 +14879,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2i___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< int > *arg1 = (VecMat::Vec2< int > *) 0 ;
-  VecMat::Vec2< int > *arg2 = 0 ;
-  VecMat::Vec2< int >::value_type result;
+  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
+  VecMat::Vec2<int > *arg2 = 0 ;
+  VecMat::Vec2<int >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -14728,22 +14890,22 @@ SWIGINTERN PyObject *_wrap_Vec2i___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2i___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i___mul__" "', argument " "1"" of type '" "VecMat::Vec2< int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i___mul__" "', argument " "1"" of type '" "VecMat::Vec2<int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_int_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tint_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2i___mul__" "', argument " "2"" of type '" "VecMat::Vec2< int > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2i___mul__" "', argument " "2"" of type '" "VecMat::Vec2<int > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2i___mul__" "', argument " "2"" of type '" "VecMat::Vec2< int > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2i___mul__" "', argument " "2"" of type '" "VecMat::Vec2<int > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec2< int > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec2<int > * >(argp2);
   {
     try {
-      result = (VecMat::Vec2< int >::value_type)((VecMat::Vec2< int > const *)arg1)->operator *((VecMat::Vec2< int > const &)*arg2);
+      result = (VecMat::Vec2<int >::value_type)((VecMat::Vec2<int > const *)arg1)->operator *((VecMat::Vec2<int > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -14765,17 +14927,17 @@ SWIGINTERN PyObject *_wrap_Vec2i___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tint_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2T_int_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2Tint_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec2i___mul____SWIG_1(self, args);
@@ -14785,7 +14947,7 @@ SWIGINTERN PyObject *_wrap_Vec2i___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tint_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -14806,17 +14968,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec2i(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< int > *arg1 = (VecMat::Vec2< int > *) 0 ;
+  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec2i",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_int_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec2i" "', argument " "1"" of type '" "VecMat::Vec2< int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec2i" "', argument " "1"" of type '" "VecMat::Vec2<int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
   {
     try {
       delete arg1;
@@ -14838,19 +15000,19 @@ fail:
 
 SWIGINTERN PyObject *Vec2i_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec2T_int_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec2Tint_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec2f__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< float > *result = 0 ;
+  VecMat::Vec2<float > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec2f")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec2< float > *)new VecMat::Vec2< float >();
+      result = (VecMat::Vec2<float > *)new VecMat::Vec2<float >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -14859,7 +15021,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2f__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -14868,9 +15030,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec2f__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< float >::value_type arg1 ;
-  VecMat::Vec2< float >::value_type arg2 ;
-  VecMat::Vec2< float > *result = 0 ;
+  VecMat::Vec2<float >::value_type arg1 ;
+  VecMat::Vec2<float >::value_type arg2 ;
+  VecMat::Vec2<float > *result = 0 ;
   float val1 ;
   int ecode1 = 0 ;
   float val2 ;
@@ -14881,17 +15043,17 @@ SWIGINTERN PyObject *_wrap_new_Vec2f__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OO:new_Vec2f",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_float(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2f" "', argument " "1"" of type '" "VecMat::Vec2< float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2f" "', argument " "1"" of type '" "VecMat::Vec2<float >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec2< float >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec2<float >::value_type >(val1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec2f" "', argument " "2"" of type '" "VecMat::Vec2< float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec2f" "', argument " "2"" of type '" "VecMat::Vec2<float >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2< float >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2<float >::value_type >(val2);
   {
     try {
-      result = (VecMat::Vec2< float > *)new VecMat::Vec2< float >(arg1,arg2);
+      result = (VecMat::Vec2<float > *)new VecMat::Vec2<float >(arg1,arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -14900,7 +15062,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2f__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -14909,8 +15071,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec2f__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< float >::value_type arg1 ;
-  VecMat::Vec2< float > *result = 0 ;
+  VecMat::Vec2<float >::value_type arg1 ;
+  VecMat::Vec2<float > *result = 0 ;
   float val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -14918,12 +15080,12 @@ SWIGINTERN PyObject *_wrap_new_Vec2f__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"O:new_Vec2f",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_float(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2f" "', argument " "1"" of type '" "VecMat::Vec2< float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2f" "', argument " "1"" of type '" "VecMat::Vec2<float >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec2< float >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec2<float >::value_type >(val1);
   {
     try {
-      result = (VecMat::Vec2< float > *)new VecMat::Vec2< float >(arg1);
+      result = (VecMat::Vec2<float > *)new VecMat::Vec2<float >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -14932,7 +15094,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2f__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -14945,7 +15107,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2f(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -14980,32 +15142,28 @@ SWIGINTERN PyObject *_wrap_new_Vec2f(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec2f'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    VecMat::Vec2< float >()\n"
-    "    VecMat::Vec2< float >(VecMat::Vec2< float >::value_type const,VecMat::Vec2< float >::value_type const)\n"
-    "    VecMat::Vec2< float >(VecMat::Vec2< float >::value_type const)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec2f'.\n  Possible C/C++ prototypes are:\n    VecMat::Vec2<(float)>()\n    VecMat::Vec2<(float)>(VecMat::Vec2<float >::value_type const,VecMat::Vec2<float >::value_type const)\n    VecMat::Vec2<(float)>(VecMat::Vec2<float >::value_type const)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec2f_x__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< float > *arg1 = (VecMat::Vec2< float > *) 0 ;
-  VecMat::Vec2< float >::value_type result;
+  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
+  VecMat::Vec2<float >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2f_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_float_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f_x" "', argument " "1"" of type '" "VecMat::Vec2< float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f_x" "', argument " "1"" of type '" "VecMat::Vec2<float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
   {
     try {
-      result = (VecMat::Vec2< float >::value_type)((VecMat::Vec2< float > const *)arg1)->x();
+      result = (VecMat::Vec2<float >::value_type)((VecMat::Vec2<float > const *)arg1)->x();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -15023,23 +15181,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2f_x__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< float > *arg1 = (VecMat::Vec2< float > *) 0 ;
-  VecMat::Vec2< float >::value_type *result = 0 ;
+  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
+  VecMat::Vec2<float >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2f_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_float_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f_x" "', argument " "1"" of type '" "VecMat::Vec2< float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f_x" "', argument " "1"" of type '" "VecMat::Vec2<float > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
   {
     try {
       {
-        VecMat::Vec2< float >::value_type &_result_ref = (arg1)->x();
-        result = (VecMat::Vec2< float >::value_type *) &_result_ref;
+        VecMat::Vec2<float >::value_type &_result_ref = (arg1)->x();
+        result = (VecMat::Vec2<float >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -15062,14 +15220,14 @@ SWIGINTERN PyObject *_wrap_Vec2f_x(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_float_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2f_x__SWIG_0(self, args);
@@ -15078,7 +15236,7 @@ SWIGINTERN PyObject *_wrap_Vec2f_x(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_float_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2f_x__SWIG_1(self, args);
@@ -15086,31 +15244,28 @@ SWIGINTERN PyObject *_wrap_Vec2f_x(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2f_x'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    x(VecMat::Vec2< float > const *)\n"
-    "    x(VecMat::Vec2< float > *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2f_x'.\n  Possible C/C++ prototypes are:\n    x()\n    x()\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec2f_y__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< float > *arg1 = (VecMat::Vec2< float > *) 0 ;
-  VecMat::Vec2< float >::value_type result;
+  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
+  VecMat::Vec2<float >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2f_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_float_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f_y" "', argument " "1"" of type '" "VecMat::Vec2< float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f_y" "', argument " "1"" of type '" "VecMat::Vec2<float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
   {
     try {
-      result = (VecMat::Vec2< float >::value_type)((VecMat::Vec2< float > const *)arg1)->y();
+      result = (VecMat::Vec2<float >::value_type)((VecMat::Vec2<float > const *)arg1)->y();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -15128,23 +15283,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2f_y__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< float > *arg1 = (VecMat::Vec2< float > *) 0 ;
-  VecMat::Vec2< float >::value_type *result = 0 ;
+  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
+  VecMat::Vec2<float >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2f_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_float_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f_y" "', argument " "1"" of type '" "VecMat::Vec2< float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f_y" "', argument " "1"" of type '" "VecMat::Vec2<float > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
   {
     try {
       {
-        VecMat::Vec2< float >::value_type &_result_ref = (arg1)->y();
-        result = (VecMat::Vec2< float >::value_type *) &_result_ref;
+        VecMat::Vec2<float >::value_type &_result_ref = (arg1)->y();
+        result = (VecMat::Vec2<float >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -15167,14 +15322,14 @@ SWIGINTERN PyObject *_wrap_Vec2f_y(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_float_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2f_y__SWIG_0(self, args);
@@ -15183,7 +15338,7 @@ SWIGINTERN PyObject *_wrap_Vec2f_y(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_float_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2f_y__SWIG_1(self, args);
@@ -15191,18 +15346,15 @@ SWIGINTERN PyObject *_wrap_Vec2f_y(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2f_y'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    y(VecMat::Vec2< float > const *)\n"
-    "    y(VecMat::Vec2< float > *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2f_y'.\n  Possible C/C++ prototypes are:\n    y()\n    y()\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec2f_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< float > *arg1 = (VecMat::Vec2< float > *) 0 ;
-  VecMat::Vec2< float >::value_type arg2 ;
+  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
+  VecMat::Vec2<float >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   float val2 ;
@@ -15211,16 +15363,16 @@ SWIGINTERN PyObject *_wrap_Vec2f_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2f_setX",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_float_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f_setX" "', argument " "1"" of type '" "VecMat::Vec2< float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f_setX" "', argument " "1"" of type '" "VecMat::Vec2<float > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2f_setX" "', argument " "2"" of type '" "VecMat::Vec2< float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2f_setX" "', argument " "2"" of type '" "VecMat::Vec2<float >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2< float >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2<float >::value_type >(val2);
   {
     try {
       (arg1)->setX(arg2);
@@ -15241,8 +15393,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2f_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< float > *arg1 = (VecMat::Vec2< float > *) 0 ;
-  VecMat::Vec2< float >::value_type arg2 ;
+  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
+  VecMat::Vec2<float >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   float val2 ;
@@ -15251,16 +15403,16 @@ SWIGINTERN PyObject *_wrap_Vec2f_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2f_setY",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_float_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f_setY" "', argument " "1"" of type '" "VecMat::Vec2< float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f_setY" "', argument " "1"" of type '" "VecMat::Vec2<float > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2f_setY" "', argument " "2"" of type '" "VecMat::Vec2< float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2f_setY" "', argument " "2"" of type '" "VecMat::Vec2<float >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2< float >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2<float >::value_type >(val2);
   {
     try {
       (arg1)->setY(arg2);
@@ -15281,9 +15433,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2f___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< float > *arg1 = (VecMat::Vec2< float > *) 0 ;
-  VecMat::Vec2< float > *arg2 = 0 ;
-  VecMat::Vec2< float > result;
+  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
+  VecMat::Vec2<float > *arg2 = 0 ;
+  VecMat::Vec2<float > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -15292,22 +15444,22 @@ SWIGINTERN PyObject *_wrap_Vec2f___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2f___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_float_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f___add__" "', argument " "1"" of type '" "VecMat::Vec2< float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f___add__" "', argument " "1"" of type '" "VecMat::Vec2<float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< float > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_float_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2f___add__" "', argument " "2"" of type '" "VecMat::Vec2< float > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2f___add__" "', argument " "2"" of type '" "VecMat::Vec2<float > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2f___add__" "', argument " "2"" of type '" "VecMat::Vec2< float > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2f___add__" "', argument " "2"" of type '" "VecMat::Vec2<float > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec2< float > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec2<float > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec2< float > const *)arg1)->operator +((VecMat::Vec2< float > const &)*arg2);
+      result = ((VecMat::Vec2<float > const *)arg1)->operator +((VecMat::Vec2<float > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -15316,7 +15468,7 @@ SWIGINTERN PyObject *_wrap_Vec2f___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< float >(static_cast< const VecMat::Vec2< float >& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<float >(static_cast< const VecMat::Vec2<float >& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -15325,9 +15477,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2f___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< float > *arg1 = (VecMat::Vec2< float > *) 0 ;
-  VecMat::Vec2< float > *arg2 = 0 ;
-  VecMat::Vec2< float > result;
+  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
+  VecMat::Vec2<float > *arg2 = 0 ;
+  VecMat::Vec2<float > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -15336,22 +15488,22 @@ SWIGINTERN PyObject *_wrap_Vec2f___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2f___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_float_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f___sub__" "', argument " "1"" of type '" "VecMat::Vec2< float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f___sub__" "', argument " "1"" of type '" "VecMat::Vec2<float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< float > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_float_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2f___sub__" "', argument " "2"" of type '" "VecMat::Vec2< float > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2f___sub__" "', argument " "2"" of type '" "VecMat::Vec2<float > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2f___sub__" "', argument " "2"" of type '" "VecMat::Vec2< float > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2f___sub__" "', argument " "2"" of type '" "VecMat::Vec2<float > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec2< float > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec2<float > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec2< float > const *)arg1)->operator -((VecMat::Vec2< float > const &)*arg2);
+      result = ((VecMat::Vec2<float > const *)arg1)->operator -((VecMat::Vec2<float > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -15360,7 +15512,7 @@ SWIGINTERN PyObject *_wrap_Vec2f___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< float >(static_cast< const VecMat::Vec2< float >& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<float >(static_cast< const VecMat::Vec2<float >& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -15369,9 +15521,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2f___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< float > *arg1 = (VecMat::Vec2< float > *) 0 ;
-  VecMat::Vec2< float >::value_type arg2 ;
-  VecMat::Vec2< float > result;
+  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
+  VecMat::Vec2<float >::value_type arg2 ;
+  VecMat::Vec2<float > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   float val2 ;
@@ -15380,19 +15532,19 @@ SWIGINTERN PyObject *_wrap_Vec2f___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2f___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_float_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f___mul__" "', argument " "1"" of type '" "VecMat::Vec2< float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f___mul__" "', argument " "1"" of type '" "VecMat::Vec2<float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2f___mul__" "', argument " "2"" of type '" "VecMat::Vec2< float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2f___mul__" "', argument " "2"" of type '" "VecMat::Vec2<float >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2< float >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2<float >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec2< float > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec2<float > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -15401,7 +15553,7 @@ SWIGINTERN PyObject *_wrap_Vec2f___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< float >(static_cast< const VecMat::Vec2< float >& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<float >(static_cast< const VecMat::Vec2<float >& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -15410,9 +15562,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2f___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< float > *arg1 = (VecMat::Vec2< float > *) 0 ;
-  VecMat::Vec2< float >::value_type arg2 ;
-  VecMat::Vec2< float > result;
+  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
+  VecMat::Vec2<float >::value_type arg2 ;
+  VecMat::Vec2<float > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   float val2 ;
@@ -15421,19 +15573,19 @@ SWIGINTERN PyObject *_wrap_Vec2f___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2f___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_float_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f___div__" "', argument " "1"" of type '" "VecMat::Vec2< float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f___div__" "', argument " "1"" of type '" "VecMat::Vec2<float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2f___div__" "', argument " "2"" of type '" "VecMat::Vec2< float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2f___div__" "', argument " "2"" of type '" "VecMat::Vec2<float >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2< float >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2<float >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec2< float > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec2<float > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -15442,7 +15594,7 @@ SWIGINTERN PyObject *_wrap_Vec2f___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< float >(static_cast< const VecMat::Vec2< float >& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<float >(static_cast< const VecMat::Vec2<float >& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -15451,9 +15603,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2f___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< float > *arg1 = (VecMat::Vec2< float > *) 0 ;
-  VecMat::Vec2< float > *arg2 = 0 ;
-  VecMat::Vec2< float >::value_type result;
+  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
+  VecMat::Vec2<float > *arg2 = 0 ;
+  VecMat::Vec2<float >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -15462,22 +15614,22 @@ SWIGINTERN PyObject *_wrap_Vec2f___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2f___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_float_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f___mul__" "', argument " "1"" of type '" "VecMat::Vec2< float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f___mul__" "', argument " "1"" of type '" "VecMat::Vec2<float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< float > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_float_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2f___mul__" "', argument " "2"" of type '" "VecMat::Vec2< float > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2f___mul__" "', argument " "2"" of type '" "VecMat::Vec2<float > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2f___mul__" "', argument " "2"" of type '" "VecMat::Vec2< float > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2f___mul__" "', argument " "2"" of type '" "VecMat::Vec2<float > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec2< float > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec2<float > * >(argp2);
   {
     try {
-      result = (VecMat::Vec2< float >::value_type)((VecMat::Vec2< float > const *)arg1)->operator *((VecMat::Vec2< float > const &)*arg2);
+      result = (VecMat::Vec2<float >::value_type)((VecMat::Vec2<float > const *)arg1)->operator *((VecMat::Vec2<float > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -15499,17 +15651,17 @@ SWIGINTERN PyObject *_wrap_Vec2f___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_float_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2T_float_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec2f___mul____SWIG_1(self, args);
@@ -15519,7 +15671,7 @@ SWIGINTERN PyObject *_wrap_Vec2f___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_float_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -15540,17 +15692,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< float > *arg1 = (VecMat::Vec2< float > *) 0 ;
+  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec2f",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec2f" "', argument " "1"" of type '" "VecMat::Vec2< float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec2f" "', argument " "1"" of type '" "VecMat::Vec2<float > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
   {
     try {
       delete arg1;
@@ -15572,19 +15724,19 @@ fail:
 
 SWIGINTERN PyObject *Vec2f_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec2d__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< double > *result = 0 ;
+  VecMat::Vec2<double > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec2d")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec2< double > *)new VecMat::Vec2< double >();
+      result = (VecMat::Vec2<double > *)new VecMat::Vec2<double >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -15593,7 +15745,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2d__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -15602,9 +15754,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec2d__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< double >::value_type arg1 ;
-  VecMat::Vec2< double >::value_type arg2 ;
-  VecMat::Vec2< double > *result = 0 ;
+  VecMat::Vec2<double >::value_type arg1 ;
+  VecMat::Vec2<double >::value_type arg2 ;
+  VecMat::Vec2<double > *result = 0 ;
   double val1 ;
   int ecode1 = 0 ;
   double val2 ;
@@ -15615,17 +15767,17 @@ SWIGINTERN PyObject *_wrap_new_Vec2d__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OO:new_Vec2d",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_double(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2d" "', argument " "1"" of type '" "VecMat::Vec2< double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2d" "', argument " "1"" of type '" "VecMat::Vec2<double >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec2< double >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec2<double >::value_type >(val1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec2d" "', argument " "2"" of type '" "VecMat::Vec2< double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec2d" "', argument " "2"" of type '" "VecMat::Vec2<double >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2< double >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2<double >::value_type >(val2);
   {
     try {
-      result = (VecMat::Vec2< double > *)new VecMat::Vec2< double >(arg1,arg2);
+      result = (VecMat::Vec2<double > *)new VecMat::Vec2<double >(arg1,arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -15634,7 +15786,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2d__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -15643,8 +15795,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec2d__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< double >::value_type arg1 ;
-  VecMat::Vec2< double > *result = 0 ;
+  VecMat::Vec2<double >::value_type arg1 ;
+  VecMat::Vec2<double > *result = 0 ;
   double val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -15652,12 +15804,12 @@ SWIGINTERN PyObject *_wrap_new_Vec2d__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"O:new_Vec2d",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_double(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2d" "', argument " "1"" of type '" "VecMat::Vec2< double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2d" "', argument " "1"" of type '" "VecMat::Vec2<double >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec2< double >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec2<double >::value_type >(val1);
   {
     try {
-      result = (VecMat::Vec2< double > *)new VecMat::Vec2< double >(arg1);
+      result = (VecMat::Vec2<double > *)new VecMat::Vec2<double >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -15666,7 +15818,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2d__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -15679,7 +15831,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2d(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -15714,32 +15866,28 @@ SWIGINTERN PyObject *_wrap_new_Vec2d(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec2d'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    VecMat::Vec2< double >()\n"
-    "    VecMat::Vec2< double >(VecMat::Vec2< double >::value_type const,VecMat::Vec2< double >::value_type const)\n"
-    "    VecMat::Vec2< double >(VecMat::Vec2< double >::value_type const)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec2d'.\n  Possible C/C++ prototypes are:\n    VecMat::Vec2<(double)>()\n    VecMat::Vec2<(double)>(VecMat::Vec2<double >::value_type const,VecMat::Vec2<double >::value_type const)\n    VecMat::Vec2<(double)>(VecMat::Vec2<double >::value_type const)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec2d_x__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< double > *arg1 = (VecMat::Vec2< double > *) 0 ;
-  VecMat::Vec2< double >::value_type result;
+  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
+  VecMat::Vec2<double >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2d_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_double_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d_x" "', argument " "1"" of type '" "VecMat::Vec2< double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d_x" "', argument " "1"" of type '" "VecMat::Vec2<double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
   {
     try {
-      result = (VecMat::Vec2< double >::value_type)((VecMat::Vec2< double > const *)arg1)->x();
+      result = (VecMat::Vec2<double >::value_type)((VecMat::Vec2<double > const *)arg1)->x();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -15757,23 +15905,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2d_x__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< double > *arg1 = (VecMat::Vec2< double > *) 0 ;
-  VecMat::Vec2< double >::value_type *result = 0 ;
+  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
+  VecMat::Vec2<double >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2d_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_double_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d_x" "', argument " "1"" of type '" "VecMat::Vec2< double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d_x" "', argument " "1"" of type '" "VecMat::Vec2<double > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
   {
     try {
       {
-        VecMat::Vec2< double >::value_type &_result_ref = (arg1)->x();
-        result = (VecMat::Vec2< double >::value_type *) &_result_ref;
+        VecMat::Vec2<double >::value_type &_result_ref = (arg1)->x();
+        result = (VecMat::Vec2<double >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -15796,14 +15944,14 @@ SWIGINTERN PyObject *_wrap_Vec2d_x(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_double_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2d_x__SWIG_0(self, args);
@@ -15812,7 +15960,7 @@ SWIGINTERN PyObject *_wrap_Vec2d_x(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_double_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2d_x__SWIG_1(self, args);
@@ -15820,31 +15968,28 @@ SWIGINTERN PyObject *_wrap_Vec2d_x(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2d_x'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    x(VecMat::Vec2< double > const *)\n"
-    "    x(VecMat::Vec2< double > *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2d_x'.\n  Possible C/C++ prototypes are:\n    x()\n    x()\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec2d_y__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< double > *arg1 = (VecMat::Vec2< double > *) 0 ;
-  VecMat::Vec2< double >::value_type result;
+  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
+  VecMat::Vec2<double >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2d_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_double_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d_y" "', argument " "1"" of type '" "VecMat::Vec2< double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d_y" "', argument " "1"" of type '" "VecMat::Vec2<double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
   {
     try {
-      result = (VecMat::Vec2< double >::value_type)((VecMat::Vec2< double > const *)arg1)->y();
+      result = (VecMat::Vec2<double >::value_type)((VecMat::Vec2<double > const *)arg1)->y();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -15862,23 +16007,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2d_y__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< double > *arg1 = (VecMat::Vec2< double > *) 0 ;
-  VecMat::Vec2< double >::value_type *result = 0 ;
+  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
+  VecMat::Vec2<double >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2d_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_double_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d_y" "', argument " "1"" of type '" "VecMat::Vec2< double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d_y" "', argument " "1"" of type '" "VecMat::Vec2<double > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
   {
     try {
       {
-        VecMat::Vec2< double >::value_type &_result_ref = (arg1)->y();
-        result = (VecMat::Vec2< double >::value_type *) &_result_ref;
+        VecMat::Vec2<double >::value_type &_result_ref = (arg1)->y();
+        result = (VecMat::Vec2<double >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -15901,14 +16046,14 @@ SWIGINTERN PyObject *_wrap_Vec2d_y(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_double_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2d_y__SWIG_0(self, args);
@@ -15917,7 +16062,7 @@ SWIGINTERN PyObject *_wrap_Vec2d_y(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_double_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2d_y__SWIG_1(self, args);
@@ -15925,18 +16070,15 @@ SWIGINTERN PyObject *_wrap_Vec2d_y(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2d_y'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    y(VecMat::Vec2< double > const *)\n"
-    "    y(VecMat::Vec2< double > *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2d_y'.\n  Possible C/C++ prototypes are:\n    y()\n    y()\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec2d_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< double > *arg1 = (VecMat::Vec2< double > *) 0 ;
-  VecMat::Vec2< double >::value_type arg2 ;
+  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
+  VecMat::Vec2<double >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
@@ -15945,16 +16087,16 @@ SWIGINTERN PyObject *_wrap_Vec2d_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2d_setX",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_double_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d_setX" "', argument " "1"" of type '" "VecMat::Vec2< double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d_setX" "', argument " "1"" of type '" "VecMat::Vec2<double > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2d_setX" "', argument " "2"" of type '" "VecMat::Vec2< double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2d_setX" "', argument " "2"" of type '" "VecMat::Vec2<double >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2< double >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2<double >::value_type >(val2);
   {
     try {
       (arg1)->setX(arg2);
@@ -15975,8 +16117,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2d_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< double > *arg1 = (VecMat::Vec2< double > *) 0 ;
-  VecMat::Vec2< double >::value_type arg2 ;
+  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
+  VecMat::Vec2<double >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
@@ -15985,16 +16127,16 @@ SWIGINTERN PyObject *_wrap_Vec2d_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2d_setY",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_double_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d_setY" "', argument " "1"" of type '" "VecMat::Vec2< double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d_setY" "', argument " "1"" of type '" "VecMat::Vec2<double > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2d_setY" "', argument " "2"" of type '" "VecMat::Vec2< double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2d_setY" "', argument " "2"" of type '" "VecMat::Vec2<double >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2< double >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2<double >::value_type >(val2);
   {
     try {
       (arg1)->setY(arg2);
@@ -16015,9 +16157,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2d___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< double > *arg1 = (VecMat::Vec2< double > *) 0 ;
-  VecMat::Vec2< double > *arg2 = 0 ;
-  VecMat::Vec2< double > result;
+  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
+  VecMat::Vec2<double > *arg2 = 0 ;
+  VecMat::Vec2<double > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -16026,22 +16168,22 @@ SWIGINTERN PyObject *_wrap_Vec2d___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2d___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_double_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d___add__" "', argument " "1"" of type '" "VecMat::Vec2< double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d___add__" "', argument " "1"" of type '" "VecMat::Vec2<double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2d___add__" "', argument " "2"" of type '" "VecMat::Vec2< double > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2d___add__" "', argument " "2"" of type '" "VecMat::Vec2<double > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2d___add__" "', argument " "2"" of type '" "VecMat::Vec2< double > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2d___add__" "', argument " "2"" of type '" "VecMat::Vec2<double > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec2< double > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec2<double > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec2< double > const *)arg1)->operator +((VecMat::Vec2< double > const &)*arg2);
+      result = ((VecMat::Vec2<double > const *)arg1)->operator +((VecMat::Vec2<double > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16050,7 +16192,7 @@ SWIGINTERN PyObject *_wrap_Vec2d___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< double >(static_cast< const VecMat::Vec2< double >& >(result))), SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<double >(static_cast< const VecMat::Vec2<double >& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -16059,9 +16201,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2d___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< double > *arg1 = (VecMat::Vec2< double > *) 0 ;
-  VecMat::Vec2< double > *arg2 = 0 ;
-  VecMat::Vec2< double > result;
+  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
+  VecMat::Vec2<double > *arg2 = 0 ;
+  VecMat::Vec2<double > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -16070,22 +16212,22 @@ SWIGINTERN PyObject *_wrap_Vec2d___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2d___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_double_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d___sub__" "', argument " "1"" of type '" "VecMat::Vec2< double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d___sub__" "', argument " "1"" of type '" "VecMat::Vec2<double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2d___sub__" "', argument " "2"" of type '" "VecMat::Vec2< double > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2d___sub__" "', argument " "2"" of type '" "VecMat::Vec2<double > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2d___sub__" "', argument " "2"" of type '" "VecMat::Vec2< double > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2d___sub__" "', argument " "2"" of type '" "VecMat::Vec2<double > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec2< double > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec2<double > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec2< double > const *)arg1)->operator -((VecMat::Vec2< double > const &)*arg2);
+      result = ((VecMat::Vec2<double > const *)arg1)->operator -((VecMat::Vec2<double > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16094,7 +16236,7 @@ SWIGINTERN PyObject *_wrap_Vec2d___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< double >(static_cast< const VecMat::Vec2< double >& >(result))), SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<double >(static_cast< const VecMat::Vec2<double >& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -16103,9 +16245,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2d___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< double > *arg1 = (VecMat::Vec2< double > *) 0 ;
-  VecMat::Vec2< double >::value_type arg2 ;
-  VecMat::Vec2< double > result;
+  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
+  VecMat::Vec2<double >::value_type arg2 ;
+  VecMat::Vec2<double > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
@@ -16114,19 +16256,19 @@ SWIGINTERN PyObject *_wrap_Vec2d___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2d___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_double_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d___mul__" "', argument " "1"" of type '" "VecMat::Vec2< double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d___mul__" "', argument " "1"" of type '" "VecMat::Vec2<double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2d___mul__" "', argument " "2"" of type '" "VecMat::Vec2< double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2d___mul__" "', argument " "2"" of type '" "VecMat::Vec2<double >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2< double >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2<double >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec2< double > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec2<double > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16135,7 +16277,7 @@ SWIGINTERN PyObject *_wrap_Vec2d___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< double >(static_cast< const VecMat::Vec2< double >& >(result))), SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<double >(static_cast< const VecMat::Vec2<double >& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -16144,9 +16286,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2d___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< double > *arg1 = (VecMat::Vec2< double > *) 0 ;
-  VecMat::Vec2< double >::value_type arg2 ;
-  VecMat::Vec2< double > result;
+  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
+  VecMat::Vec2<double >::value_type arg2 ;
+  VecMat::Vec2<double > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
@@ -16155,19 +16297,19 @@ SWIGINTERN PyObject *_wrap_Vec2d___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2d___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_double_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d___div__" "', argument " "1"" of type '" "VecMat::Vec2< double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d___div__" "', argument " "1"" of type '" "VecMat::Vec2<double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2d___div__" "', argument " "2"" of type '" "VecMat::Vec2< double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2d___div__" "', argument " "2"" of type '" "VecMat::Vec2<double >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2< double >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2<double >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec2< double > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec2<double > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16176,7 +16318,7 @@ SWIGINTERN PyObject *_wrap_Vec2d___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< double >(static_cast< const VecMat::Vec2< double >& >(result))), SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<double >(static_cast< const VecMat::Vec2<double >& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -16185,9 +16327,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2d___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< double > *arg1 = (VecMat::Vec2< double > *) 0 ;
-  VecMat::Vec2< double > *arg2 = 0 ;
-  VecMat::Vec2< double >::value_type result;
+  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
+  VecMat::Vec2<double > *arg2 = 0 ;
+  VecMat::Vec2<double >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -16196,22 +16338,22 @@ SWIGINTERN PyObject *_wrap_Vec2d___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2d___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_double_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d___mul__" "', argument " "1"" of type '" "VecMat::Vec2< double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d___mul__" "', argument " "1"" of type '" "VecMat::Vec2<double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2d___mul__" "', argument " "2"" of type '" "VecMat::Vec2< double > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2d___mul__" "', argument " "2"" of type '" "VecMat::Vec2<double > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2d___mul__" "', argument " "2"" of type '" "VecMat::Vec2< double > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2d___mul__" "', argument " "2"" of type '" "VecMat::Vec2<double > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec2< double > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec2<double > * >(argp2);
   {
     try {
-      result = (VecMat::Vec2< double >::value_type)((VecMat::Vec2< double > const *)arg1)->operator *((VecMat::Vec2< double > const &)*arg2);
+      result = (VecMat::Vec2<double >::value_type)((VecMat::Vec2<double > const *)arg1)->operator *((VecMat::Vec2<double > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16233,17 +16375,17 @@ SWIGINTERN PyObject *_wrap_Vec2d___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_double_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2T_double_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec2d___mul____SWIG_1(self, args);
@@ -16253,7 +16395,7 @@ SWIGINTERN PyObject *_wrap_Vec2d___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_double_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -16274,17 +16416,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2< double > *arg1 = (VecMat::Vec2< double > *) 0 ;
+  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec2d",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec2d" "', argument " "1"" of type '" "VecMat::Vec2< double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec2d" "', argument " "1"" of type '" "VecMat::Vec2<double > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2< double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
   {
     try {
       delete arg1;
@@ -16306,19 +16448,19 @@ fail:
 
 SWIGINTERN PyObject *Vec2d_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec_3u(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< unsigned int,3 > *result = 0 ;
+  VecMat::Vec<unsigned int,3 > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec_3u")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec< unsigned int,3 > *)new VecMat::Vec< unsigned int,3 >();
+      result = (VecMat::Vec<unsigned int,3 > *)new VecMat::Vec<unsigned int,3 >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16327,7 +16469,7 @@ SWIGINTERN PyObject *_wrap_new_Vec_3u(PyObject *SWIGUNUSEDPARM(self), PyObject *
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -16336,17 +16478,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec_3u(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< unsigned int,3 > *arg1 = (VecMat::Vec< unsigned int,3 > *) 0 ;
+  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec_3u",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_3u" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,3 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_3u" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
   {
     try {
       delete arg1;
@@ -16373,7 +16515,7 @@ SWIGINTERN PyObject *_wrap_Vec_3u_dim(PyObject *SWIGUNUSEDPARM(self), PyObject *
   if (!PyArg_ParseTuple(args,(char *)":Vec_3u_dim")) SWIG_fail;
   {
     try {
-      result = (unsigned int)VecMat::Vec< unsigned int,3 >::SWIGTEMPLATEDISAMBIGUATOR dim();
+      result = (unsigned int)VecMat::Vec<unsigned int,3 >::SWIGTEMPLATEDISAMBIGUATOR dim();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16391,21 +16533,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3u_norm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< unsigned int,3 > *arg1 = (VecMat::Vec< unsigned int,3 > *) 0 ;
-  VecMat::Vec< unsigned int,3 >::value_type result;
+  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
+  VecMat::Vec<unsigned int,3 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3u_norm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u_norm" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u_norm" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec< unsigned int,3 >::value_type)((VecMat::Vec< unsigned int,3 > const *)arg1)->norm();
+      result = (VecMat::Vec<unsigned int,3 >::value_type)((VecMat::Vec<unsigned int,3 > const *)arg1)->norm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16423,21 +16565,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3u_squareNorm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< unsigned int,3 > *arg1 = (VecMat::Vec< unsigned int,3 > *) 0 ;
-  VecMat::Vec< unsigned int,3 >::value_type result;
+  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
+  VecMat::Vec<unsigned int,3 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3u_squareNorm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u_squareNorm" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u_squareNorm" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec< unsigned int,3 >::value_type)((VecMat::Vec< unsigned int,3 > const *)arg1)->squareNorm();
+      result = (VecMat::Vec<unsigned int,3 >::value_type)((VecMat::Vec<unsigned int,3 > const *)arg1)->squareNorm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16455,23 +16597,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3u_normalize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< unsigned int,3 > *arg1 = (VecMat::Vec< unsigned int,3 > *) 0 ;
-  VecMat::Vec< unsigned int,3 > *result = 0 ;
+  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
+  VecMat::Vec<unsigned int,3 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3u_normalize",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u_normalize" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,3 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u_normalize" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec< unsigned int,3 > &_result_ref = (arg1)->normalize();
-        result = (VecMat::Vec< unsigned int,3 > *) &_result_ref;
+        VecMat::Vec<unsigned int,3 > &_result_ref = (arg1)->normalize();
+        result = (VecMat::Vec<unsigned int,3 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -16481,7 +16623,7 @@ SWIGINTERN PyObject *_wrap_Vec_3u_normalize(PyObject *SWIGUNUSEDPARM(self), PyOb
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -16490,23 +16632,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3u_normalizeSafe(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< unsigned int,3 > *arg1 = (VecMat::Vec< unsigned int,3 > *) 0 ;
-  VecMat::Vec< unsigned int,3 > *result = 0 ;
+  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
+  VecMat::Vec<unsigned int,3 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3u_normalizeSafe",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,3 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec< unsigned int,3 > &_result_ref = (arg1)->normalizeSafe();
-        result = (VecMat::Vec< unsigned int,3 > *) &_result_ref;
+        VecMat::Vec<unsigned int,3 > &_result_ref = (arg1)->normalizeSafe();
+        result = (VecMat::Vec<unsigned int,3 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -16516,7 +16658,7 @@ SWIGINTERN PyObject *_wrap_Vec_3u_normalizeSafe(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -16525,9 +16667,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3u___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< unsigned int,3 > *arg1 = (VecMat::Vec< unsigned int,3 > *) 0 ;
-  VecMat::Vec< unsigned int,3 > *arg2 = 0 ;
-  VecMat::Vec< unsigned int,3 > result;
+  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
+  VecMat::Vec<unsigned int,3 > *arg2 = 0 ;
+  VecMat::Vec<unsigned int,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -16536,22 +16678,22 @@ SWIGINTERN PyObject *_wrap_Vec_3u___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3u___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___add__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___add__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___add__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___add__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___add__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___add__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec< unsigned int,3 > const *)arg1)->operator +((VecMat::Vec< unsigned int,3 > const &)*arg2);
+      result = ((VecMat::Vec<unsigned int,3 > const *)arg1)->operator +((VecMat::Vec<unsigned int,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16560,7 +16702,7 @@ SWIGINTERN PyObject *_wrap_Vec_3u___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec< unsigned int,3 >(static_cast< const VecMat::Vec< unsigned int,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<unsigned int,3 >(static_cast< const VecMat::Vec<unsigned int,3 >& >(result))), SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -16569,9 +16711,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3u___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< unsigned int,3 > *arg1 = (VecMat::Vec< unsigned int,3 > *) 0 ;
-  VecMat::Vec< unsigned int,3 > *arg2 = 0 ;
-  VecMat::Vec< unsigned int,3 > result;
+  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
+  VecMat::Vec<unsigned int,3 > *arg2 = 0 ;
+  VecMat::Vec<unsigned int,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -16580,22 +16722,22 @@ SWIGINTERN PyObject *_wrap_Vec_3u___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3u___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___sub__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___sub__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___sub__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___sub__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___sub__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___sub__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec< unsigned int,3 > const *)arg1)->operator -((VecMat::Vec< unsigned int,3 > const &)*arg2);
+      result = ((VecMat::Vec<unsigned int,3 > const *)arg1)->operator -((VecMat::Vec<unsigned int,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16604,7 +16746,7 @@ SWIGINTERN PyObject *_wrap_Vec_3u___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec< unsigned int,3 >(static_cast< const VecMat::Vec< unsigned int,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<unsigned int,3 >(static_cast< const VecMat::Vec<unsigned int,3 >& >(result))), SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -16613,9 +16755,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3u___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< unsigned int,3 > *arg1 = (VecMat::Vec< unsigned int,3 > *) 0 ;
-  VecMat::Vec< unsigned int,3 >::value_type arg2 ;
-  VecMat::Vec< unsigned int,3 > result;
+  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
+  VecMat::Vec<unsigned int,3 >::value_type arg2 ;
+  VecMat::Vec<unsigned int,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned int val2 ;
@@ -16624,19 +16766,19 @@ SWIGINTERN PyObject *_wrap_Vec_3u___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3u___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___mul__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___mul__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3u___mul__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3u___mul__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec< unsigned int,3 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec<unsigned int,3 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec< unsigned int,3 > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec<unsigned int,3 > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16645,7 +16787,7 @@ SWIGINTERN PyObject *_wrap_Vec_3u___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec< unsigned int,3 >(static_cast< const VecMat::Vec< unsigned int,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<unsigned int,3 >(static_cast< const VecMat::Vec<unsigned int,3 >& >(result))), SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -16654,9 +16796,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3u___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< unsigned int,3 > *arg1 = (VecMat::Vec< unsigned int,3 > *) 0 ;
-  VecMat::Vec< unsigned int,3 >::value_type arg2 ;
-  VecMat::Vec< unsigned int,3 > result;
+  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
+  VecMat::Vec<unsigned int,3 >::value_type arg2 ;
+  VecMat::Vec<unsigned int,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned int val2 ;
@@ -16665,19 +16807,19 @@ SWIGINTERN PyObject *_wrap_Vec_3u___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3u___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___div__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___div__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3u___div__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3u___div__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec< unsigned int,3 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec<unsigned int,3 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec< unsigned int,3 > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec<unsigned int,3 > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16686,7 +16828,7 @@ SWIGINTERN PyObject *_wrap_Vec_3u___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec< unsigned int,3 >(static_cast< const VecMat::Vec< unsigned int,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<unsigned int,3 >(static_cast< const VecMat::Vec<unsigned int,3 >& >(result))), SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -16695,9 +16837,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3u___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< unsigned int,3 > *arg1 = (VecMat::Vec< unsigned int,3 > *) 0 ;
-  VecMat::Vec< unsigned int,3 > *arg2 = 0 ;
-  VecMat::Vec< unsigned int,3 >::value_type result;
+  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
+  VecMat::Vec<unsigned int,3 > *arg2 = 0 ;
+  VecMat::Vec<unsigned int,3 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -16706,22 +16848,22 @@ SWIGINTERN PyObject *_wrap_Vec_3u___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3u___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___mul__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___mul__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___mul__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___mul__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___mul__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___mul__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp2);
   {
     try {
-      result = (VecMat::Vec< unsigned int,3 >::value_type)((VecMat::Vec< unsigned int,3 > const *)arg1)->operator *((VecMat::Vec< unsigned int,3 > const &)*arg2);
+      result = (VecMat::Vec<unsigned int,3 >::value_type)((VecMat::Vec<unsigned int,3 > const *)arg1)->operator *((VecMat::Vec<unsigned int,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16743,17 +16885,17 @@ SWIGINTERN PyObject *_wrap_Vec_3u___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec_3u___mul____SWIG_1(self, args);
@@ -16763,7 +16905,7 @@ SWIGINTERN PyObject *_wrap_Vec_3u___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -16784,8 +16926,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3u___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< unsigned int,3 > *arg1 = (VecMat::Vec< unsigned int,3 > *) 0 ;
-  VecMat::Vec< unsigned int,3 > *arg2 = 0 ;
+  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
+  VecMat::Vec<unsigned int,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -16795,22 +16937,22 @@ SWIGINTERN PyObject *_wrap_Vec_3u___eq__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3u___eq__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___eq__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___eq__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___eq__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___eq__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___eq__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___eq__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec< unsigned int,3 > const *)arg1)->operator ==((VecMat::Vec< unsigned int,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec<unsigned int,3 > const *)arg1)->operator ==((VecMat::Vec<unsigned int,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16828,8 +16970,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3u___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< unsigned int,3 > *arg1 = (VecMat::Vec< unsigned int,3 > *) 0 ;
-  VecMat::Vec< unsigned int,3 > *arg2 = 0 ;
+  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
+  VecMat::Vec<unsigned int,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -16839,22 +16981,22 @@ SWIGINTERN PyObject *_wrap_Vec_3u___ne__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3u___ne__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___ne__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___ne__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___ne__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___ne__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___ne__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___ne__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec< unsigned int,3 > const *)arg1)->operator !=((VecMat::Vec< unsigned int,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec<unsigned int,3 > const *)arg1)->operator !=((VecMat::Vec<unsigned int,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16872,8 +17014,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3u___lt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< unsigned int,3 > *arg1 = (VecMat::Vec< unsigned int,3 > *) 0 ;
-  VecMat::Vec< unsigned int,3 > *arg2 = 0 ;
+  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
+  VecMat::Vec<unsigned int,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -16883,22 +17025,22 @@ SWIGINTERN PyObject *_wrap_Vec_3u___lt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3u___lt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___lt__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___lt__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___lt__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___lt__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___lt__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___lt__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec< unsigned int,3 > const *)arg1)->operator <((VecMat::Vec< unsigned int,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec<unsigned int,3 > const *)arg1)->operator <((VecMat::Vec<unsigned int,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16916,8 +17058,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3u___gt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< unsigned int,3 > *arg1 = (VecMat::Vec< unsigned int,3 > *) 0 ;
-  VecMat::Vec< unsigned int,3 > *arg2 = 0 ;
+  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
+  VecMat::Vec<unsigned int,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -16927,22 +17069,22 @@ SWIGINTERN PyObject *_wrap_Vec_3u___gt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3u___gt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___gt__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___gt__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___gt__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___gt__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___gt__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___gt__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec< unsigned int,3 > const *)arg1)->operator >((VecMat::Vec< unsigned int,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec<unsigned int,3 > const *)arg1)->operator >((VecMat::Vec<unsigned int,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16960,19 +17102,19 @@ fail:
 
 SWIGINTERN PyObject *Vec_3u_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec_3i(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< int,3 > *result = 0 ;
+  VecMat::Vec<int,3 > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec_3i")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec< int,3 > *)new VecMat::Vec< int,3 >();
+      result = (VecMat::Vec<int,3 > *)new VecMat::Vec<int,3 >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16981,7 +17123,7 @@ SWIGINTERN PyObject *_wrap_new_Vec_3i(PyObject *SWIGUNUSEDPARM(self), PyObject *
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_int_3_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTint_3_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -16990,17 +17132,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec_3i(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< int,3 > *arg1 = (VecMat::Vec< int,3 > *) 0 ;
+  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec_3i",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_3_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_3i" "', argument " "1"" of type '" "VecMat::Vec< int,3 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_3i" "', argument " "1"" of type '" "VecMat::Vec<int,3 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
   {
     try {
       delete arg1;
@@ -17027,7 +17169,7 @@ SWIGINTERN PyObject *_wrap_Vec_3i_dim(PyObject *SWIGUNUSEDPARM(self), PyObject *
   if (!PyArg_ParseTuple(args,(char *)":Vec_3i_dim")) SWIG_fail;
   {
     try {
-      result = (unsigned int)VecMat::Vec< int,3 >::SWIGTEMPLATEDISAMBIGUATOR dim();
+      result = (unsigned int)VecMat::Vec<int,3 >::SWIGTEMPLATEDISAMBIGUATOR dim();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17045,21 +17187,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3i_norm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< int,3 > *arg1 = (VecMat::Vec< int,3 > *) 0 ;
-  VecMat::Vec< int,3 >::value_type result;
+  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
+  VecMat::Vec<int,3 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3i_norm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i_norm" "', argument " "1"" of type '" "VecMat::Vec< int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i_norm" "', argument " "1"" of type '" "VecMat::Vec<int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec< int,3 >::value_type)((VecMat::Vec< int,3 > const *)arg1)->norm();
+      result = (VecMat::Vec<int,3 >::value_type)((VecMat::Vec<int,3 > const *)arg1)->norm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17077,21 +17219,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3i_squareNorm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< int,3 > *arg1 = (VecMat::Vec< int,3 > *) 0 ;
-  VecMat::Vec< int,3 >::value_type result;
+  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
+  VecMat::Vec<int,3 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3i_squareNorm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i_squareNorm" "', argument " "1"" of type '" "VecMat::Vec< int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i_squareNorm" "', argument " "1"" of type '" "VecMat::Vec<int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec< int,3 >::value_type)((VecMat::Vec< int,3 > const *)arg1)->squareNorm();
+      result = (VecMat::Vec<int,3 >::value_type)((VecMat::Vec<int,3 > const *)arg1)->squareNorm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17109,23 +17251,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3i_normalize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< int,3 > *arg1 = (VecMat::Vec< int,3 > *) 0 ;
-  VecMat::Vec< int,3 > *result = 0 ;
+  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
+  VecMat::Vec<int,3 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3i_normalize",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i_normalize" "', argument " "1"" of type '" "VecMat::Vec< int,3 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i_normalize" "', argument " "1"" of type '" "VecMat::Vec<int,3 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec< int,3 > &_result_ref = (arg1)->normalize();
-        result = (VecMat::Vec< int,3 > *) &_result_ref;
+        VecMat::Vec<int,3 > &_result_ref = (arg1)->normalize();
+        result = (VecMat::Vec<int,3 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -17135,7 +17277,7 @@ SWIGINTERN PyObject *_wrap_Vec_3i_normalize(PyObject *SWIGUNUSEDPARM(self), PyOb
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_int_3_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -17144,23 +17286,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3i_normalizeSafe(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< int,3 > *arg1 = (VecMat::Vec< int,3 > *) 0 ;
-  VecMat::Vec< int,3 > *result = 0 ;
+  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
+  VecMat::Vec<int,3 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3i_normalizeSafe",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec< int,3 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec<int,3 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec< int,3 > &_result_ref = (arg1)->normalizeSafe();
-        result = (VecMat::Vec< int,3 > *) &_result_ref;
+        VecMat::Vec<int,3 > &_result_ref = (arg1)->normalizeSafe();
+        result = (VecMat::Vec<int,3 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -17170,7 +17312,7 @@ SWIGINTERN PyObject *_wrap_Vec_3i_normalizeSafe(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_int_3_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -17179,9 +17321,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3i___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< int,3 > *arg1 = (VecMat::Vec< int,3 > *) 0 ;
-  VecMat::Vec< int,3 > *arg2 = 0 ;
-  VecMat::Vec< int,3 > result;
+  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
+  VecMat::Vec<int,3 > *arg2 = 0 ;
+  VecMat::Vec<int,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -17190,22 +17332,22 @@ SWIGINTERN PyObject *_wrap_Vec_3i___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3i___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___add__" "', argument " "1"" of type '" "VecMat::Vec< int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___add__" "', argument " "1"" of type '" "VecMat::Vec<int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_int_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___add__" "', argument " "2"" of type '" "VecMat::Vec< int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___add__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___add__" "', argument " "2"" of type '" "VecMat::Vec< int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___add__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec< int,3 > const *)arg1)->operator +((VecMat::Vec< int,3 > const &)*arg2);
+      result = ((VecMat::Vec<int,3 > const *)arg1)->operator +((VecMat::Vec<int,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17214,7 +17356,7 @@ SWIGINTERN PyObject *_wrap_Vec_3i___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec< int,3 >(static_cast< const VecMat::Vec< int,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_int_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<int,3 >(static_cast< const VecMat::Vec<int,3 >& >(result))), SWIGTYPE_p_VecMat__VecTint_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -17223,9 +17365,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3i___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< int,3 > *arg1 = (VecMat::Vec< int,3 > *) 0 ;
-  VecMat::Vec< int,3 > *arg2 = 0 ;
-  VecMat::Vec< int,3 > result;
+  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
+  VecMat::Vec<int,3 > *arg2 = 0 ;
+  VecMat::Vec<int,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -17234,22 +17376,22 @@ SWIGINTERN PyObject *_wrap_Vec_3i___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3i___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___sub__" "', argument " "1"" of type '" "VecMat::Vec< int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___sub__" "', argument " "1"" of type '" "VecMat::Vec<int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_int_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___sub__" "', argument " "2"" of type '" "VecMat::Vec< int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___sub__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___sub__" "', argument " "2"" of type '" "VecMat::Vec< int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___sub__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec< int,3 > const *)arg1)->operator -((VecMat::Vec< int,3 > const &)*arg2);
+      result = ((VecMat::Vec<int,3 > const *)arg1)->operator -((VecMat::Vec<int,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17258,7 +17400,7 @@ SWIGINTERN PyObject *_wrap_Vec_3i___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec< int,3 >(static_cast< const VecMat::Vec< int,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_int_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<int,3 >(static_cast< const VecMat::Vec<int,3 >& >(result))), SWIGTYPE_p_VecMat__VecTint_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -17267,9 +17409,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3i___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< int,3 > *arg1 = (VecMat::Vec< int,3 > *) 0 ;
-  VecMat::Vec< int,3 >::value_type arg2 ;
-  VecMat::Vec< int,3 > result;
+  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
+  VecMat::Vec<int,3 >::value_type arg2 ;
+  VecMat::Vec<int,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -17278,19 +17420,19 @@ SWIGINTERN PyObject *_wrap_Vec_3i___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3i___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___mul__" "', argument " "1"" of type '" "VecMat::Vec< int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___mul__" "', argument " "1"" of type '" "VecMat::Vec<int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3i___mul__" "', argument " "2"" of type '" "VecMat::Vec< int,3 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3i___mul__" "', argument " "2"" of type '" "VecMat::Vec<int,3 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec< int,3 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec<int,3 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec< int,3 > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec<int,3 > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17299,7 +17441,7 @@ SWIGINTERN PyObject *_wrap_Vec_3i___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec< int,3 >(static_cast< const VecMat::Vec< int,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_int_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<int,3 >(static_cast< const VecMat::Vec<int,3 >& >(result))), SWIGTYPE_p_VecMat__VecTint_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -17308,9 +17450,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3i___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< int,3 > *arg1 = (VecMat::Vec< int,3 > *) 0 ;
-  VecMat::Vec< int,3 >::value_type arg2 ;
-  VecMat::Vec< int,3 > result;
+  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
+  VecMat::Vec<int,3 >::value_type arg2 ;
+  VecMat::Vec<int,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -17319,19 +17461,19 @@ SWIGINTERN PyObject *_wrap_Vec_3i___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3i___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___div__" "', argument " "1"" of type '" "VecMat::Vec< int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___div__" "', argument " "1"" of type '" "VecMat::Vec<int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3i___div__" "', argument " "2"" of type '" "VecMat::Vec< int,3 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3i___div__" "', argument " "2"" of type '" "VecMat::Vec<int,3 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec< int,3 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec<int,3 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec< int,3 > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec<int,3 > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17340,7 +17482,7 @@ SWIGINTERN PyObject *_wrap_Vec_3i___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec< int,3 >(static_cast< const VecMat::Vec< int,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_int_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<int,3 >(static_cast< const VecMat::Vec<int,3 >& >(result))), SWIGTYPE_p_VecMat__VecTint_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -17349,9 +17491,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3i___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< int,3 > *arg1 = (VecMat::Vec< int,3 > *) 0 ;
-  VecMat::Vec< int,3 > *arg2 = 0 ;
-  VecMat::Vec< int,3 >::value_type result;
+  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
+  VecMat::Vec<int,3 > *arg2 = 0 ;
+  VecMat::Vec<int,3 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -17360,22 +17502,22 @@ SWIGINTERN PyObject *_wrap_Vec_3i___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3i___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___mul__" "', argument " "1"" of type '" "VecMat::Vec< int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___mul__" "', argument " "1"" of type '" "VecMat::Vec<int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_int_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___mul__" "', argument " "2"" of type '" "VecMat::Vec< int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___mul__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___mul__" "', argument " "2"" of type '" "VecMat::Vec< int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___mul__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp2);
   {
     try {
-      result = (VecMat::Vec< int,3 >::value_type)((VecMat::Vec< int,3 > const *)arg1)->operator *((VecMat::Vec< int,3 > const &)*arg2);
+      result = (VecMat::Vec<int,3 >::value_type)((VecMat::Vec<int,3 > const *)arg1)->operator *((VecMat::Vec<int,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17397,17 +17539,17 @@ SWIGINTERN PyObject *_wrap_Vec_3i___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_int_3_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTint_3_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecT_int_3_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecTint_3_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec_3i___mul____SWIG_1(self, args);
@@ -17417,7 +17559,7 @@ SWIGINTERN PyObject *_wrap_Vec_3i___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_int_3_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTint_3_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -17438,8 +17580,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3i___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< int,3 > *arg1 = (VecMat::Vec< int,3 > *) 0 ;
-  VecMat::Vec< int,3 > *arg2 = 0 ;
+  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
+  VecMat::Vec<int,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -17449,22 +17591,22 @@ SWIGINTERN PyObject *_wrap_Vec_3i___eq__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3i___eq__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___eq__" "', argument " "1"" of type '" "VecMat::Vec< int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___eq__" "', argument " "1"" of type '" "VecMat::Vec<int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_int_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___eq__" "', argument " "2"" of type '" "VecMat::Vec< int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___eq__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___eq__" "', argument " "2"" of type '" "VecMat::Vec< int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___eq__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec< int,3 > const *)arg1)->operator ==((VecMat::Vec< int,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec<int,3 > const *)arg1)->operator ==((VecMat::Vec<int,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17482,8 +17624,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3i___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< int,3 > *arg1 = (VecMat::Vec< int,3 > *) 0 ;
-  VecMat::Vec< int,3 > *arg2 = 0 ;
+  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
+  VecMat::Vec<int,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -17493,22 +17635,22 @@ SWIGINTERN PyObject *_wrap_Vec_3i___ne__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3i___ne__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___ne__" "', argument " "1"" of type '" "VecMat::Vec< int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___ne__" "', argument " "1"" of type '" "VecMat::Vec<int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_int_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___ne__" "', argument " "2"" of type '" "VecMat::Vec< int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___ne__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___ne__" "', argument " "2"" of type '" "VecMat::Vec< int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___ne__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec< int,3 > const *)arg1)->operator !=((VecMat::Vec< int,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec<int,3 > const *)arg1)->operator !=((VecMat::Vec<int,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17526,8 +17668,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3i___lt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< int,3 > *arg1 = (VecMat::Vec< int,3 > *) 0 ;
-  VecMat::Vec< int,3 > *arg2 = 0 ;
+  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
+  VecMat::Vec<int,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -17537,22 +17679,22 @@ SWIGINTERN PyObject *_wrap_Vec_3i___lt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3i___lt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___lt__" "', argument " "1"" of type '" "VecMat::Vec< int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___lt__" "', argument " "1"" of type '" "VecMat::Vec<int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_int_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___lt__" "', argument " "2"" of type '" "VecMat::Vec< int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___lt__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___lt__" "', argument " "2"" of type '" "VecMat::Vec< int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___lt__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec< int,3 > const *)arg1)->operator <((VecMat::Vec< int,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec<int,3 > const *)arg1)->operator <((VecMat::Vec<int,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17570,8 +17712,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3i___gt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< int,3 > *arg1 = (VecMat::Vec< int,3 > *) 0 ;
-  VecMat::Vec< int,3 > *arg2 = 0 ;
+  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
+  VecMat::Vec<int,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -17581,22 +17723,22 @@ SWIGINTERN PyObject *_wrap_Vec_3i___gt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3i___gt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___gt__" "', argument " "1"" of type '" "VecMat::Vec< int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___gt__" "', argument " "1"" of type '" "VecMat::Vec<int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_int_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___gt__" "', argument " "2"" of type '" "VecMat::Vec< int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___gt__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___gt__" "', argument " "2"" of type '" "VecMat::Vec< int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___gt__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec< int,3 > const *)arg1)->operator >((VecMat::Vec< int,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec<int,3 > const *)arg1)->operator >((VecMat::Vec<int,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17614,19 +17756,19 @@ fail:
 
 SWIGINTERN PyObject *Vec_3i_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecT_int_3_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecTint_3_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec_3d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< double,3 > *result = 0 ;
+  VecMat::Vec<double,3 > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec_3d")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec< double,3 > *)new VecMat::Vec< double,3 >();
+      result = (VecMat::Vec<double,3 > *)new VecMat::Vec<double,3 >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17635,7 +17777,7 @@ SWIGINTERN PyObject *_wrap_new_Vec_3d(PyObject *SWIGUNUSEDPARM(self), PyObject *
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_double_3_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTdouble_3_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -17644,17 +17786,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec_3d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< double,3 > *arg1 = (VecMat::Vec< double,3 > *) 0 ;
+  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec_3d",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_3_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_3d" "', argument " "1"" of type '" "VecMat::Vec< double,3 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_3d" "', argument " "1"" of type '" "VecMat::Vec<double,3 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
   {
     try {
       delete arg1;
@@ -17681,7 +17823,7 @@ SWIGINTERN PyObject *_wrap_Vec_3d_dim(PyObject *SWIGUNUSEDPARM(self), PyObject *
   if (!PyArg_ParseTuple(args,(char *)":Vec_3d_dim")) SWIG_fail;
   {
     try {
-      result = (unsigned int)VecMat::Vec< double,3 >::SWIGTEMPLATEDISAMBIGUATOR dim();
+      result = (unsigned int)VecMat::Vec<double,3 >::SWIGTEMPLATEDISAMBIGUATOR dim();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17699,21 +17841,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3d_norm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< double,3 > *arg1 = (VecMat::Vec< double,3 > *) 0 ;
-  VecMat::Vec< double,3 >::value_type result;
+  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
+  VecMat::Vec<double,3 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3d_norm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d_norm" "', argument " "1"" of type '" "VecMat::Vec< double,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d_norm" "', argument " "1"" of type '" "VecMat::Vec<double,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec< double,3 >::value_type)((VecMat::Vec< double,3 > const *)arg1)->norm();
+      result = (VecMat::Vec<double,3 >::value_type)((VecMat::Vec<double,3 > const *)arg1)->norm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17731,21 +17873,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3d_squareNorm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< double,3 > *arg1 = (VecMat::Vec< double,3 > *) 0 ;
-  VecMat::Vec< double,3 >::value_type result;
+  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
+  VecMat::Vec<double,3 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3d_squareNorm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d_squareNorm" "', argument " "1"" of type '" "VecMat::Vec< double,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d_squareNorm" "', argument " "1"" of type '" "VecMat::Vec<double,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec< double,3 >::value_type)((VecMat::Vec< double,3 > const *)arg1)->squareNorm();
+      result = (VecMat::Vec<double,3 >::value_type)((VecMat::Vec<double,3 > const *)arg1)->squareNorm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17763,23 +17905,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3d_normalize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< double,3 > *arg1 = (VecMat::Vec< double,3 > *) 0 ;
-  VecMat::Vec< double,3 > *result = 0 ;
+  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
+  VecMat::Vec<double,3 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3d_normalize",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d_normalize" "', argument " "1"" of type '" "VecMat::Vec< double,3 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d_normalize" "', argument " "1"" of type '" "VecMat::Vec<double,3 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec< double,3 > &_result_ref = (arg1)->normalize();
-        result = (VecMat::Vec< double,3 > *) &_result_ref;
+        VecMat::Vec<double,3 > &_result_ref = (arg1)->normalize();
+        result = (VecMat::Vec<double,3 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -17789,7 +17931,7 @@ SWIGINTERN PyObject *_wrap_Vec_3d_normalize(PyObject *SWIGUNUSEDPARM(self), PyOb
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_double_3_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -17798,23 +17940,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3d_normalizeSafe(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< double,3 > *arg1 = (VecMat::Vec< double,3 > *) 0 ;
-  VecMat::Vec< double,3 > *result = 0 ;
+  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
+  VecMat::Vec<double,3 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3d_normalizeSafe",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec< double,3 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec<double,3 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec< double,3 > &_result_ref = (arg1)->normalizeSafe();
-        result = (VecMat::Vec< double,3 > *) &_result_ref;
+        VecMat::Vec<double,3 > &_result_ref = (arg1)->normalizeSafe();
+        result = (VecMat::Vec<double,3 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -17824,7 +17966,7 @@ SWIGINTERN PyObject *_wrap_Vec_3d_normalizeSafe(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_double_3_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -17833,9 +17975,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3d___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< double,3 > *arg1 = (VecMat::Vec< double,3 > *) 0 ;
-  VecMat::Vec< double,3 > *arg2 = 0 ;
-  VecMat::Vec< double,3 > result;
+  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
+  VecMat::Vec<double,3 > *arg2 = 0 ;
+  VecMat::Vec<double,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -17844,22 +17986,22 @@ SWIGINTERN PyObject *_wrap_Vec_3d___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3d___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___add__" "', argument " "1"" of type '" "VecMat::Vec< double,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___add__" "', argument " "1"" of type '" "VecMat::Vec<double,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_double_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___add__" "', argument " "2"" of type '" "VecMat::Vec< double,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___add__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___add__" "', argument " "2"" of type '" "VecMat::Vec< double,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___add__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec< double,3 > const *)arg1)->operator +((VecMat::Vec< double,3 > const &)*arg2);
+      result = ((VecMat::Vec<double,3 > const *)arg1)->operator +((VecMat::Vec<double,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17868,7 +18010,7 @@ SWIGINTERN PyObject *_wrap_Vec_3d___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec< double,3 >(static_cast< const VecMat::Vec< double,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_double_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<double,3 >(static_cast< const VecMat::Vec<double,3 >& >(result))), SWIGTYPE_p_VecMat__VecTdouble_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -17877,9 +18019,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3d___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< double,3 > *arg1 = (VecMat::Vec< double,3 > *) 0 ;
-  VecMat::Vec< double,3 > *arg2 = 0 ;
-  VecMat::Vec< double,3 > result;
+  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
+  VecMat::Vec<double,3 > *arg2 = 0 ;
+  VecMat::Vec<double,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -17888,22 +18030,22 @@ SWIGINTERN PyObject *_wrap_Vec_3d___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3d___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___sub__" "', argument " "1"" of type '" "VecMat::Vec< double,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___sub__" "', argument " "1"" of type '" "VecMat::Vec<double,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_double_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___sub__" "', argument " "2"" of type '" "VecMat::Vec< double,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___sub__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___sub__" "', argument " "2"" of type '" "VecMat::Vec< double,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___sub__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec< double,3 > const *)arg1)->operator -((VecMat::Vec< double,3 > const &)*arg2);
+      result = ((VecMat::Vec<double,3 > const *)arg1)->operator -((VecMat::Vec<double,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17912,7 +18054,7 @@ SWIGINTERN PyObject *_wrap_Vec_3d___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec< double,3 >(static_cast< const VecMat::Vec< double,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_double_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<double,3 >(static_cast< const VecMat::Vec<double,3 >& >(result))), SWIGTYPE_p_VecMat__VecTdouble_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -17921,9 +18063,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3d___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< double,3 > *arg1 = (VecMat::Vec< double,3 > *) 0 ;
-  VecMat::Vec< double,3 >::value_type arg2 ;
-  VecMat::Vec< double,3 > result;
+  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
+  VecMat::Vec<double,3 >::value_type arg2 ;
+  VecMat::Vec<double,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
@@ -17932,19 +18074,19 @@ SWIGINTERN PyObject *_wrap_Vec_3d___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3d___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___mul__" "', argument " "1"" of type '" "VecMat::Vec< double,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___mul__" "', argument " "1"" of type '" "VecMat::Vec<double,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3d___mul__" "', argument " "2"" of type '" "VecMat::Vec< double,3 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3d___mul__" "', argument " "2"" of type '" "VecMat::Vec<double,3 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec< double,3 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec<double,3 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec< double,3 > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec<double,3 > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17953,7 +18095,7 @@ SWIGINTERN PyObject *_wrap_Vec_3d___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec< double,3 >(static_cast< const VecMat::Vec< double,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_double_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<double,3 >(static_cast< const VecMat::Vec<double,3 >& >(result))), SWIGTYPE_p_VecMat__VecTdouble_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -17962,9 +18104,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3d___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< double,3 > *arg1 = (VecMat::Vec< double,3 > *) 0 ;
-  VecMat::Vec< double,3 >::value_type arg2 ;
-  VecMat::Vec< double,3 > result;
+  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
+  VecMat::Vec<double,3 >::value_type arg2 ;
+  VecMat::Vec<double,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
@@ -17973,19 +18115,19 @@ SWIGINTERN PyObject *_wrap_Vec_3d___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3d___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___div__" "', argument " "1"" of type '" "VecMat::Vec< double,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___div__" "', argument " "1"" of type '" "VecMat::Vec<double,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3d___div__" "', argument " "2"" of type '" "VecMat::Vec< double,3 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3d___div__" "', argument " "2"" of type '" "VecMat::Vec<double,3 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec< double,3 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec<double,3 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec< double,3 > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec<double,3 > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17994,7 +18136,7 @@ SWIGINTERN PyObject *_wrap_Vec_3d___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec< double,3 >(static_cast< const VecMat::Vec< double,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_double_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<double,3 >(static_cast< const VecMat::Vec<double,3 >& >(result))), SWIGTYPE_p_VecMat__VecTdouble_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -18003,9 +18145,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3d___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< double,3 > *arg1 = (VecMat::Vec< double,3 > *) 0 ;
-  VecMat::Vec< double,3 > *arg2 = 0 ;
-  VecMat::Vec< double,3 >::value_type result;
+  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
+  VecMat::Vec<double,3 > *arg2 = 0 ;
+  VecMat::Vec<double,3 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -18014,22 +18156,22 @@ SWIGINTERN PyObject *_wrap_Vec_3d___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3d___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___mul__" "', argument " "1"" of type '" "VecMat::Vec< double,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___mul__" "', argument " "1"" of type '" "VecMat::Vec<double,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_double_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___mul__" "', argument " "2"" of type '" "VecMat::Vec< double,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___mul__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___mul__" "', argument " "2"" of type '" "VecMat::Vec< double,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___mul__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp2);
   {
     try {
-      result = (VecMat::Vec< double,3 >::value_type)((VecMat::Vec< double,3 > const *)arg1)->operator *((VecMat::Vec< double,3 > const &)*arg2);
+      result = (VecMat::Vec<double,3 >::value_type)((VecMat::Vec<double,3 > const *)arg1)->operator *((VecMat::Vec<double,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18051,17 +18193,17 @@ SWIGINTERN PyObject *_wrap_Vec_3d___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_double_3_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTdouble_3_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecT_double_3_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecTdouble_3_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec_3d___mul____SWIG_1(self, args);
@@ -18071,7 +18213,7 @@ SWIGINTERN PyObject *_wrap_Vec_3d___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_double_3_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTdouble_3_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -18092,8 +18234,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3d___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< double,3 > *arg1 = (VecMat::Vec< double,3 > *) 0 ;
-  VecMat::Vec< double,3 > *arg2 = 0 ;
+  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
+  VecMat::Vec<double,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -18103,22 +18245,22 @@ SWIGINTERN PyObject *_wrap_Vec_3d___eq__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3d___eq__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___eq__" "', argument " "1"" of type '" "VecMat::Vec< double,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___eq__" "', argument " "1"" of type '" "VecMat::Vec<double,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_double_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___eq__" "', argument " "2"" of type '" "VecMat::Vec< double,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___eq__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___eq__" "', argument " "2"" of type '" "VecMat::Vec< double,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___eq__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec< double,3 > const *)arg1)->operator ==((VecMat::Vec< double,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec<double,3 > const *)arg1)->operator ==((VecMat::Vec<double,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18136,8 +18278,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3d___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< double,3 > *arg1 = (VecMat::Vec< double,3 > *) 0 ;
-  VecMat::Vec< double,3 > *arg2 = 0 ;
+  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
+  VecMat::Vec<double,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -18147,22 +18289,22 @@ SWIGINTERN PyObject *_wrap_Vec_3d___ne__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3d___ne__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___ne__" "', argument " "1"" of type '" "VecMat::Vec< double,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___ne__" "', argument " "1"" of type '" "VecMat::Vec<double,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_double_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___ne__" "', argument " "2"" of type '" "VecMat::Vec< double,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___ne__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___ne__" "', argument " "2"" of type '" "VecMat::Vec< double,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___ne__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec< double,3 > const *)arg1)->operator !=((VecMat::Vec< double,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec<double,3 > const *)arg1)->operator !=((VecMat::Vec<double,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18180,8 +18322,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3d___lt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< double,3 > *arg1 = (VecMat::Vec< double,3 > *) 0 ;
-  VecMat::Vec< double,3 > *arg2 = 0 ;
+  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
+  VecMat::Vec<double,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -18191,22 +18333,22 @@ SWIGINTERN PyObject *_wrap_Vec_3d___lt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3d___lt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___lt__" "', argument " "1"" of type '" "VecMat::Vec< double,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___lt__" "', argument " "1"" of type '" "VecMat::Vec<double,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_double_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___lt__" "', argument " "2"" of type '" "VecMat::Vec< double,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___lt__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___lt__" "', argument " "2"" of type '" "VecMat::Vec< double,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___lt__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec< double,3 > const *)arg1)->operator <((VecMat::Vec< double,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec<double,3 > const *)arg1)->operator <((VecMat::Vec<double,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18224,8 +18366,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3d___gt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< double,3 > *arg1 = (VecMat::Vec< double,3 > *) 0 ;
-  VecMat::Vec< double,3 > *arg2 = 0 ;
+  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
+  VecMat::Vec<double,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -18235,22 +18377,22 @@ SWIGINTERN PyObject *_wrap_Vec_3d___gt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3d___gt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___gt__" "', argument " "1"" of type '" "VecMat::Vec< double,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___gt__" "', argument " "1"" of type '" "VecMat::Vec<double,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_double_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___gt__" "', argument " "2"" of type '" "VecMat::Vec< double,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___gt__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___gt__" "', argument " "2"" of type '" "VecMat::Vec< double,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___gt__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec< double,3 > const *)arg1)->operator >((VecMat::Vec< double,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec<double,3 > const *)arg1)->operator >((VecMat::Vec<double,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18268,19 +18410,19 @@ fail:
 
 SWIGINTERN PyObject *Vec_3d_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecT_double_3_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecTdouble_3_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec_3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< float,3 > *result = 0 ;
+  VecMat::Vec<float,3 > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec_3f")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec< float,3 > *)new VecMat::Vec< float,3 >();
+      result = (VecMat::Vec<float,3 > *)new VecMat::Vec<float,3 >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18289,7 +18431,7 @@ SWIGINTERN PyObject *_wrap_new_Vec_3f(PyObject *SWIGUNUSEDPARM(self), PyObject *
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_float_3_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTfloat_3_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -18298,17 +18440,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec_3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< float,3 > *arg1 = (VecMat::Vec< float,3 > *) 0 ;
+  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec_3f",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_3_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_3f" "', argument " "1"" of type '" "VecMat::Vec< float,3 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_3f" "', argument " "1"" of type '" "VecMat::Vec<float,3 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
   {
     try {
       delete arg1;
@@ -18335,7 +18477,7 @@ SWIGINTERN PyObject *_wrap_Vec_3f_dim(PyObject *SWIGUNUSEDPARM(self), PyObject *
   if (!PyArg_ParseTuple(args,(char *)":Vec_3f_dim")) SWIG_fail;
   {
     try {
-      result = (unsigned int)VecMat::Vec< float,3 >::SWIGTEMPLATEDISAMBIGUATOR dim();
+      result = (unsigned int)VecMat::Vec<float,3 >::SWIGTEMPLATEDISAMBIGUATOR dim();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18353,21 +18495,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3f_norm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< float,3 > *arg1 = (VecMat::Vec< float,3 > *) 0 ;
-  VecMat::Vec< float,3 >::value_type result;
+  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
+  VecMat::Vec<float,3 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3f_norm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f_norm" "', argument " "1"" of type '" "VecMat::Vec< float,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f_norm" "', argument " "1"" of type '" "VecMat::Vec<float,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec< float,3 >::value_type)((VecMat::Vec< float,3 > const *)arg1)->norm();
+      result = (VecMat::Vec<float,3 >::value_type)((VecMat::Vec<float,3 > const *)arg1)->norm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18385,21 +18527,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3f_squareNorm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< float,3 > *arg1 = (VecMat::Vec< float,3 > *) 0 ;
-  VecMat::Vec< float,3 >::value_type result;
+  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
+  VecMat::Vec<float,3 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3f_squareNorm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f_squareNorm" "', argument " "1"" of type '" "VecMat::Vec< float,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f_squareNorm" "', argument " "1"" of type '" "VecMat::Vec<float,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec< float,3 >::value_type)((VecMat::Vec< float,3 > const *)arg1)->squareNorm();
+      result = (VecMat::Vec<float,3 >::value_type)((VecMat::Vec<float,3 > const *)arg1)->squareNorm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18417,23 +18559,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3f_normalize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< float,3 > *arg1 = (VecMat::Vec< float,3 > *) 0 ;
-  VecMat::Vec< float,3 > *result = 0 ;
+  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
+  VecMat::Vec<float,3 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3f_normalize",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f_normalize" "', argument " "1"" of type '" "VecMat::Vec< float,3 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f_normalize" "', argument " "1"" of type '" "VecMat::Vec<float,3 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec< float,3 > &_result_ref = (arg1)->normalize();
-        result = (VecMat::Vec< float,3 > *) &_result_ref;
+        VecMat::Vec<float,3 > &_result_ref = (arg1)->normalize();
+        result = (VecMat::Vec<float,3 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -18443,7 +18585,7 @@ SWIGINTERN PyObject *_wrap_Vec_3f_normalize(PyObject *SWIGUNUSEDPARM(self), PyOb
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_float_3_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -18452,23 +18594,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3f_normalizeSafe(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< float,3 > *arg1 = (VecMat::Vec< float,3 > *) 0 ;
-  VecMat::Vec< float,3 > *result = 0 ;
+  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
+  VecMat::Vec<float,3 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3f_normalizeSafe",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec< float,3 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec<float,3 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec< float,3 > &_result_ref = (arg1)->normalizeSafe();
-        result = (VecMat::Vec< float,3 > *) &_result_ref;
+        VecMat::Vec<float,3 > &_result_ref = (arg1)->normalizeSafe();
+        result = (VecMat::Vec<float,3 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -18478,7 +18620,7 @@ SWIGINTERN PyObject *_wrap_Vec_3f_normalizeSafe(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_float_3_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -18487,9 +18629,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3f___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< float,3 > *arg1 = (VecMat::Vec< float,3 > *) 0 ;
-  VecMat::Vec< float,3 > *arg2 = 0 ;
-  VecMat::Vec< float,3 > result;
+  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
+  VecMat::Vec<float,3 > *arg2 = 0 ;
+  VecMat::Vec<float,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -18498,22 +18640,22 @@ SWIGINTERN PyObject *_wrap_Vec_3f___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3f___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___add__" "', argument " "1"" of type '" "VecMat::Vec< float,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___add__" "', argument " "1"" of type '" "VecMat::Vec<float,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_float_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___add__" "', argument " "2"" of type '" "VecMat::Vec< float,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___add__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___add__" "', argument " "2"" of type '" "VecMat::Vec< float,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___add__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec< float,3 > const *)arg1)->operator +((VecMat::Vec< float,3 > const &)*arg2);
+      result = ((VecMat::Vec<float,3 > const *)arg1)->operator +((VecMat::Vec<float,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18522,7 +18664,7 @@ SWIGINTERN PyObject *_wrap_Vec_3f___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec< float,3 >(static_cast< const VecMat::Vec< float,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_float_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<float,3 >(static_cast< const VecMat::Vec<float,3 >& >(result))), SWIGTYPE_p_VecMat__VecTfloat_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -18531,9 +18673,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3f___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< float,3 > *arg1 = (VecMat::Vec< float,3 > *) 0 ;
-  VecMat::Vec< float,3 > *arg2 = 0 ;
-  VecMat::Vec< float,3 > result;
+  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
+  VecMat::Vec<float,3 > *arg2 = 0 ;
+  VecMat::Vec<float,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -18542,22 +18684,22 @@ SWIGINTERN PyObject *_wrap_Vec_3f___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3f___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___sub__" "', argument " "1"" of type '" "VecMat::Vec< float,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___sub__" "', argument " "1"" of type '" "VecMat::Vec<float,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_float_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___sub__" "', argument " "2"" of type '" "VecMat::Vec< float,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___sub__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___sub__" "', argument " "2"" of type '" "VecMat::Vec< float,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___sub__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec< float,3 > const *)arg1)->operator -((VecMat::Vec< float,3 > const &)*arg2);
+      result = ((VecMat::Vec<float,3 > const *)arg1)->operator -((VecMat::Vec<float,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18566,7 +18708,7 @@ SWIGINTERN PyObject *_wrap_Vec_3f___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec< float,3 >(static_cast< const VecMat::Vec< float,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_float_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<float,3 >(static_cast< const VecMat::Vec<float,3 >& >(result))), SWIGTYPE_p_VecMat__VecTfloat_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -18575,9 +18717,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3f___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< float,3 > *arg1 = (VecMat::Vec< float,3 > *) 0 ;
-  VecMat::Vec< float,3 >::value_type arg2 ;
-  VecMat::Vec< float,3 > result;
+  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
+  VecMat::Vec<float,3 >::value_type arg2 ;
+  VecMat::Vec<float,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   float val2 ;
@@ -18586,19 +18728,19 @@ SWIGINTERN PyObject *_wrap_Vec_3f___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3f___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___mul__" "', argument " "1"" of type '" "VecMat::Vec< float,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___mul__" "', argument " "1"" of type '" "VecMat::Vec<float,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3f___mul__" "', argument " "2"" of type '" "VecMat::Vec< float,3 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3f___mul__" "', argument " "2"" of type '" "VecMat::Vec<float,3 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec< float,3 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec<float,3 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec< float,3 > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec<float,3 > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18607,7 +18749,7 @@ SWIGINTERN PyObject *_wrap_Vec_3f___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec< float,3 >(static_cast< const VecMat::Vec< float,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_float_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<float,3 >(static_cast< const VecMat::Vec<float,3 >& >(result))), SWIGTYPE_p_VecMat__VecTfloat_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -18616,9 +18758,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3f___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< float,3 > *arg1 = (VecMat::Vec< float,3 > *) 0 ;
-  VecMat::Vec< float,3 >::value_type arg2 ;
-  VecMat::Vec< float,3 > result;
+  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
+  VecMat::Vec<float,3 >::value_type arg2 ;
+  VecMat::Vec<float,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   float val2 ;
@@ -18627,19 +18769,19 @@ SWIGINTERN PyObject *_wrap_Vec_3f___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3f___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___div__" "', argument " "1"" of type '" "VecMat::Vec< float,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___div__" "', argument " "1"" of type '" "VecMat::Vec<float,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3f___div__" "', argument " "2"" of type '" "VecMat::Vec< float,3 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3f___div__" "', argument " "2"" of type '" "VecMat::Vec<float,3 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec< float,3 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec<float,3 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec< float,3 > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec<float,3 > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18648,7 +18790,7 @@ SWIGINTERN PyObject *_wrap_Vec_3f___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec< float,3 >(static_cast< const VecMat::Vec< float,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_float_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec<float,3 >(static_cast< const VecMat::Vec<float,3 >& >(result))), SWIGTYPE_p_VecMat__VecTfloat_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -18657,9 +18799,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3f___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< float,3 > *arg1 = (VecMat::Vec< float,3 > *) 0 ;
-  VecMat::Vec< float,3 > *arg2 = 0 ;
-  VecMat::Vec< float,3 >::value_type result;
+  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
+  VecMat::Vec<float,3 > *arg2 = 0 ;
+  VecMat::Vec<float,3 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -18668,22 +18810,22 @@ SWIGINTERN PyObject *_wrap_Vec_3f___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3f___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___mul__" "', argument " "1"" of type '" "VecMat::Vec< float,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___mul__" "', argument " "1"" of type '" "VecMat::Vec<float,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_float_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___mul__" "', argument " "2"" of type '" "VecMat::Vec< float,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___mul__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___mul__" "', argument " "2"" of type '" "VecMat::Vec< float,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___mul__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp2);
   {
     try {
-      result = (VecMat::Vec< float,3 >::value_type)((VecMat::Vec< float,3 > const *)arg1)->operator *((VecMat::Vec< float,3 > const &)*arg2);
+      result = (VecMat::Vec<float,3 >::value_type)((VecMat::Vec<float,3 > const *)arg1)->operator *((VecMat::Vec<float,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18705,17 +18847,17 @@ SWIGINTERN PyObject *_wrap_Vec_3f___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_float_3_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTfloat_3_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecT_float_3_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecTfloat_3_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec_3f___mul____SWIG_1(self, args);
@@ -18725,7 +18867,7 @@ SWIGINTERN PyObject *_wrap_Vec_3f___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_float_3_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTfloat_3_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -18746,8 +18888,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3f___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< float,3 > *arg1 = (VecMat::Vec< float,3 > *) 0 ;
-  VecMat::Vec< float,3 > *arg2 = 0 ;
+  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
+  VecMat::Vec<float,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -18757,22 +18899,22 @@ SWIGINTERN PyObject *_wrap_Vec_3f___eq__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3f___eq__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___eq__" "', argument " "1"" of type '" "VecMat::Vec< float,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___eq__" "', argument " "1"" of type '" "VecMat::Vec<float,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_float_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___eq__" "', argument " "2"" of type '" "VecMat::Vec< float,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___eq__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___eq__" "', argument " "2"" of type '" "VecMat::Vec< float,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___eq__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec< float,3 > const *)arg1)->operator ==((VecMat::Vec< float,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec<float,3 > const *)arg1)->operator ==((VecMat::Vec<float,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18790,8 +18932,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3f___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< float,3 > *arg1 = (VecMat::Vec< float,3 > *) 0 ;
-  VecMat::Vec< float,3 > *arg2 = 0 ;
+  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
+  VecMat::Vec<float,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -18801,22 +18943,22 @@ SWIGINTERN PyObject *_wrap_Vec_3f___ne__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3f___ne__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___ne__" "', argument " "1"" of type '" "VecMat::Vec< float,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___ne__" "', argument " "1"" of type '" "VecMat::Vec<float,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_float_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___ne__" "', argument " "2"" of type '" "VecMat::Vec< float,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___ne__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___ne__" "', argument " "2"" of type '" "VecMat::Vec< float,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___ne__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec< float,3 > const *)arg1)->operator !=((VecMat::Vec< float,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec<float,3 > const *)arg1)->operator !=((VecMat::Vec<float,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18834,8 +18976,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3f___lt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< float,3 > *arg1 = (VecMat::Vec< float,3 > *) 0 ;
-  VecMat::Vec< float,3 > *arg2 = 0 ;
+  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
+  VecMat::Vec<float,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -18845,22 +18987,22 @@ SWIGINTERN PyObject *_wrap_Vec_3f___lt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3f___lt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___lt__" "', argument " "1"" of type '" "VecMat::Vec< float,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___lt__" "', argument " "1"" of type '" "VecMat::Vec<float,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_float_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___lt__" "', argument " "2"" of type '" "VecMat::Vec< float,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___lt__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___lt__" "', argument " "2"" of type '" "VecMat::Vec< float,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___lt__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec< float,3 > const *)arg1)->operator <((VecMat::Vec< float,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec<float,3 > const *)arg1)->operator <((VecMat::Vec<float,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18878,8 +19020,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3f___gt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec< float,3 > *arg1 = (VecMat::Vec< float,3 > *) 0 ;
-  VecMat::Vec< float,3 > *arg2 = 0 ;
+  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
+  VecMat::Vec<float,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -18889,22 +19031,22 @@ SWIGINTERN PyObject *_wrap_Vec_3f___gt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3f___gt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___gt__" "', argument " "1"" of type '" "VecMat::Vec< float,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___gt__" "', argument " "1"" of type '" "VecMat::Vec<float,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_float_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___gt__" "', argument " "2"" of type '" "VecMat::Vec< float,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___gt__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___gt__" "', argument " "2"" of type '" "VecMat::Vec< float,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___gt__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec< float,3 > const *)arg1)->operator >((VecMat::Vec< float,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec<float,3 > const *)arg1)->operator >((VecMat::Vec<float,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18922,19 +19064,19 @@ fail:
 
 SWIGINTERN PyObject *Vec_3f_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecT_float_3_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecTfloat_3_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec3u__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< unsigned int > *result = 0 ;
+  VecMat::Vec3<unsigned int > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec3u")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec3< unsigned int > *)new VecMat::Vec3< unsigned int >();
+      result = (VecMat::Vec3<unsigned int > *)new VecMat::Vec3<unsigned int >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18943,7 +19085,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3u__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -18952,10 +19094,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec3u__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< unsigned int >::value_type arg1 ;
-  VecMat::Vec3< unsigned int >::value_type arg2 ;
-  VecMat::Vec3< unsigned int >::value_type arg3 ;
-  VecMat::Vec3< unsigned int > *result = 0 ;
+  VecMat::Vec3<unsigned int >::value_type arg1 ;
+  VecMat::Vec3<unsigned int >::value_type arg2 ;
+  VecMat::Vec3<unsigned int >::value_type arg3 ;
+  VecMat::Vec3<unsigned int > *result = 0 ;
   unsigned int val1 ;
   int ecode1 = 0 ;
   unsigned int val2 ;
@@ -18969,22 +19111,22 @@ SWIGINTERN PyObject *_wrap_new_Vec3u__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OOO:new_Vec3u",&obj0,&obj1,&obj2)) SWIG_fail;
   ecode1 = SWIG_AsVal_unsigned_SS_int(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3u" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3u" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec3< unsigned int >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec3<unsigned int >::value_type >(val1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3u" "', argument " "2"" of type '" "VecMat::Vec3< unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3u" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3< unsigned int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3<unsigned int >::value_type >(val2);
   ecode3 = SWIG_AsVal_unsigned_SS_int(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_Vec3u" "', argument " "3"" of type '" "VecMat::Vec3< unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_Vec3u" "', argument " "3"" of type '" "VecMat::Vec3<unsigned int >::value_type""'");
   } 
-  arg3 = static_cast< VecMat::Vec3< unsigned int >::value_type >(val3);
+  arg3 = static_cast< VecMat::Vec3<unsigned int >::value_type >(val3);
   {
     try {
-      result = (VecMat::Vec3< unsigned int > *)new VecMat::Vec3< unsigned int >(arg1,arg2,arg3);
+      result = (VecMat::Vec3<unsigned int > *)new VecMat::Vec3<unsigned int >(arg1,arg2,arg3);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18993,7 +19135,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3u__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -19002,9 +19144,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec3u__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< unsigned int >::value_type arg1 ;
-  VecMat::Vec3< unsigned int >::value_type arg2 ;
-  VecMat::Vec3< unsigned int > *result = 0 ;
+  VecMat::Vec3<unsigned int >::value_type arg1 ;
+  VecMat::Vec3<unsigned int >::value_type arg2 ;
+  VecMat::Vec3<unsigned int > *result = 0 ;
   unsigned int val1 ;
   int ecode1 = 0 ;
   unsigned int val2 ;
@@ -19015,17 +19157,17 @@ SWIGINTERN PyObject *_wrap_new_Vec3u__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OO:new_Vec3u",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_unsigned_SS_int(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3u" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3u" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec3< unsigned int >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec3<unsigned int >::value_type >(val1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3u" "', argument " "2"" of type '" "VecMat::Vec3< unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3u" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3< unsigned int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3<unsigned int >::value_type >(val2);
   {
     try {
-      result = (VecMat::Vec3< unsigned int > *)new VecMat::Vec3< unsigned int >(arg1,arg2);
+      result = (VecMat::Vec3<unsigned int > *)new VecMat::Vec3<unsigned int >(arg1,arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -19034,7 +19176,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3u__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -19043,8 +19185,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec3u__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< unsigned int >::value_type arg1 ;
-  VecMat::Vec3< unsigned int > *result = 0 ;
+  VecMat::Vec3<unsigned int >::value_type arg1 ;
+  VecMat::Vec3<unsigned int > *result = 0 ;
   unsigned int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -19052,12 +19194,12 @@ SWIGINTERN PyObject *_wrap_new_Vec3u__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"O:new_Vec3u",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_unsigned_SS_int(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3u" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3u" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec3< unsigned int >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec3<unsigned int >::value_type >(val1);
   {
     try {
-      result = (VecMat::Vec3< unsigned int > *)new VecMat::Vec3< unsigned int >(arg1);
+      result = (VecMat::Vec3<unsigned int > *)new VecMat::Vec3<unsigned int >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -19066,7 +19208,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3u__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -19079,7 +19221,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3u(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -19136,33 +19278,28 @@ SWIGINTERN PyObject *_wrap_new_Vec3u(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec3u'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    VecMat::Vec3< unsigned int >()\n"
-    "    VecMat::Vec3< unsigned int >(VecMat::Vec3< unsigned int >::value_type const,VecMat::Vec3< unsigned int >::value_type const,VecMat::Vec3< unsigned int >::value_type const)\n"
-    "    VecMat::Vec3< unsigned int >(VecMat::Vec3< unsigned int >::value_type const,VecMat::Vec3< unsigned int >::value_type const)\n"
-    "    VecMat::Vec3< unsigned int >(VecMat::Vec3< unsigned int >::value_type const)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec3u'.\n  Possible C/C++ prototypes are:\n    VecMat::Vec3<(unsigned int)>()\n    VecMat::Vec3<(unsigned int)>(VecMat::Vec3<unsigned int >::value_type const,VecMat::Vec3<unsigned int >::value_type const,VecMat::Vec3<unsigned int >::value_type const)\n    VecMat::Vec3<(unsigned int)>(VecMat::Vec3<unsigned int >::value_type const,VecMat::Vec3<unsigned int >::value_type const)\n    VecMat::Vec3<(unsigned int)>(VecMat::Vec3<unsigned int >::value_type const)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3u_x__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
-  VecMat::Vec3< unsigned int >::value_type result;
+  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
+  VecMat::Vec3<unsigned int >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3u_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_x" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_x" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
   {
     try {
-      result = (VecMat::Vec3< unsigned int >::value_type)((VecMat::Vec3< unsigned int > const *)arg1)->x();
+      result = (VecMat::Vec3<unsigned int >::value_type)((VecMat::Vec3<unsigned int > const *)arg1)->x();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -19180,23 +19317,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3u_x__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
-  VecMat::Vec3< unsigned int >::value_type *result = 0 ;
+  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
+  VecMat::Vec3<unsigned int >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3u_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_x" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_x" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
   {
     try {
       {
-        VecMat::Vec3< unsigned int >::value_type &_result_ref = (arg1)->x();
-        result = (VecMat::Vec3< unsigned int >::value_type *) &_result_ref;
+        VecMat::Vec3<unsigned int >::value_type &_result_ref = (arg1)->x();
+        result = (VecMat::Vec3<unsigned int >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -19219,14 +19356,14 @@ SWIGINTERN PyObject *_wrap_Vec3u_x(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3u_x__SWIG_0(self, args);
@@ -19235,7 +19372,7 @@ SWIGINTERN PyObject *_wrap_Vec3u_x(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3u_x__SWIG_1(self, args);
@@ -19243,31 +19380,28 @@ SWIGINTERN PyObject *_wrap_Vec3u_x(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3u_x'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    x(VecMat::Vec3< unsigned int > const *)\n"
-    "    x(VecMat::Vec3< unsigned int > *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3u_x'.\n  Possible C/C++ prototypes are:\n    x()\n    x()\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3u_y__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
-  VecMat::Vec3< unsigned int >::value_type result;
+  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
+  VecMat::Vec3<unsigned int >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3u_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_y" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_y" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
   {
     try {
-      result = (VecMat::Vec3< unsigned int >::value_type)((VecMat::Vec3< unsigned int > const *)arg1)->y();
+      result = (VecMat::Vec3<unsigned int >::value_type)((VecMat::Vec3<unsigned int > const *)arg1)->y();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -19285,23 +19419,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3u_y__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
-  VecMat::Vec3< unsigned int >::value_type *result = 0 ;
+  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
+  VecMat::Vec3<unsigned int >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3u_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_y" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_y" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
   {
     try {
       {
-        VecMat::Vec3< unsigned int >::value_type &_result_ref = (arg1)->y();
-        result = (VecMat::Vec3< unsigned int >::value_type *) &_result_ref;
+        VecMat::Vec3<unsigned int >::value_type &_result_ref = (arg1)->y();
+        result = (VecMat::Vec3<unsigned int >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -19324,14 +19458,14 @@ SWIGINTERN PyObject *_wrap_Vec3u_y(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3u_y__SWIG_0(self, args);
@@ -19340,7 +19474,7 @@ SWIGINTERN PyObject *_wrap_Vec3u_y(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3u_y__SWIG_1(self, args);
@@ -19348,31 +19482,28 @@ SWIGINTERN PyObject *_wrap_Vec3u_y(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3u_y'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    y(VecMat::Vec3< unsigned int > const *)\n"
-    "    y(VecMat::Vec3< unsigned int > *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3u_y'.\n  Possible C/C++ prototypes are:\n    y()\n    y()\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3u_z__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
-  VecMat::Vec3< unsigned int >::value_type result;
+  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
+  VecMat::Vec3<unsigned int >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3u_z",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_z" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_z" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
   {
     try {
-      result = (VecMat::Vec3< unsigned int >::value_type)((VecMat::Vec3< unsigned int > const *)arg1)->z();
+      result = (VecMat::Vec3<unsigned int >::value_type)((VecMat::Vec3<unsigned int > const *)arg1)->z();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -19390,23 +19521,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3u_z__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
-  VecMat::Vec3< unsigned int >::value_type *result = 0 ;
+  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
+  VecMat::Vec3<unsigned int >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3u_z",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_z" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_z" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
   {
     try {
       {
-        VecMat::Vec3< unsigned int >::value_type &_result_ref = (arg1)->z();
-        result = (VecMat::Vec3< unsigned int >::value_type *) &_result_ref;
+        VecMat::Vec3<unsigned int >::value_type &_result_ref = (arg1)->z();
+        result = (VecMat::Vec3<unsigned int >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -19429,14 +19560,14 @@ SWIGINTERN PyObject *_wrap_Vec3u_z(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3u_z__SWIG_0(self, args);
@@ -19445,7 +19576,7 @@ SWIGINTERN PyObject *_wrap_Vec3u_z(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3u_z__SWIG_1(self, args);
@@ -19453,18 +19584,15 @@ SWIGINTERN PyObject *_wrap_Vec3u_z(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3u_z'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    z(VecMat::Vec3< unsigned int > const *)\n"
-    "    z(VecMat::Vec3< unsigned int > *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3u_z'.\n  Possible C/C++ prototypes are:\n    z()\n    z()\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3u_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
-  VecMat::Vec3< unsigned int >::value_type arg2 ;
+  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
+  VecMat::Vec3<unsigned int >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned int val2 ;
@@ -19473,16 +19601,16 @@ SWIGINTERN PyObject *_wrap_Vec3u_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3u_setX",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_setX" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_setX" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3u_setX" "', argument " "2"" of type '" "VecMat::Vec3< unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3u_setX" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3< unsigned int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3<unsigned int >::value_type >(val2);
   {
     try {
       (arg1)->setX(arg2);
@@ -19503,8 +19631,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3u_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
-  VecMat::Vec3< unsigned int >::value_type arg2 ;
+  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
+  VecMat::Vec3<unsigned int >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned int val2 ;
@@ -19513,16 +19641,16 @@ SWIGINTERN PyObject *_wrap_Vec3u_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3u_setY",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_setY" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_setY" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3u_setY" "', argument " "2"" of type '" "VecMat::Vec3< unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3u_setY" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3< unsigned int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3<unsigned int >::value_type >(val2);
   {
     try {
       (arg1)->setY(arg2);
@@ -19543,8 +19671,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3u_setZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
-  VecMat::Vec3< unsigned int >::value_type arg2 ;
+  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
+  VecMat::Vec3<unsigned int >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned int val2 ;
@@ -19553,16 +19681,16 @@ SWIGINTERN PyObject *_wrap_Vec3u_setZ(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3u_setZ",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_setZ" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_setZ" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3u_setZ" "', argument " "2"" of type '" "VecMat::Vec3< unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3u_setZ" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3< unsigned int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3<unsigned int >::value_type >(val2);
   {
     try {
       (arg1)->setZ(arg2);
@@ -19583,9 +19711,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3u___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
-  VecMat::Vec3< unsigned int > *arg2 = 0 ;
-  VecMat::Vec3< unsigned int > result;
+  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
+  VecMat::Vec3<unsigned int > *arg2 = 0 ;
+  VecMat::Vec3<unsigned int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -19594,22 +19722,22 @@ SWIGINTERN PyObject *_wrap_Vec3u___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3u___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u___add__" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u___add__" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3u___add__" "', argument " "2"" of type '" "VecMat::Vec3< unsigned int > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3u___add__" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3u___add__" "', argument " "2"" of type '" "VecMat::Vec3< unsigned int > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3u___add__" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec3< unsigned int > const *)arg1)->operator +((VecMat::Vec3< unsigned int > const &)*arg2);
+      result = ((VecMat::Vec3<unsigned int > const *)arg1)->operator +((VecMat::Vec3<unsigned int > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -19618,7 +19746,7 @@ SWIGINTERN PyObject *_wrap_Vec3u___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< unsigned int >(static_cast< const VecMat::Vec3< unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<unsigned int >(static_cast< const VecMat::Vec3<unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -19627,9 +19755,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3u___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
-  VecMat::Vec3< unsigned int > *arg2 = 0 ;
-  VecMat::Vec3< unsigned int > result;
+  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
+  VecMat::Vec3<unsigned int > *arg2 = 0 ;
+  VecMat::Vec3<unsigned int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -19638,22 +19766,22 @@ SWIGINTERN PyObject *_wrap_Vec3u___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3u___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u___sub__" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u___sub__" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3u___sub__" "', argument " "2"" of type '" "VecMat::Vec3< unsigned int > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3u___sub__" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3u___sub__" "', argument " "2"" of type '" "VecMat::Vec3< unsigned int > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3u___sub__" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec3< unsigned int > const *)arg1)->operator -((VecMat::Vec3< unsigned int > const &)*arg2);
+      result = ((VecMat::Vec3<unsigned int > const *)arg1)->operator -((VecMat::Vec3<unsigned int > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -19662,7 +19790,7 @@ SWIGINTERN PyObject *_wrap_Vec3u___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< unsigned int >(static_cast< const VecMat::Vec3< unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<unsigned int >(static_cast< const VecMat::Vec3<unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -19671,9 +19799,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3u___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
-  VecMat::Vec3< unsigned int >::value_type arg2 ;
-  VecMat::Vec3< unsigned int > result;
+  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
+  VecMat::Vec3<unsigned int >::value_type arg2 ;
+  VecMat::Vec3<unsigned int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned int val2 ;
@@ -19682,19 +19810,19 @@ SWIGINTERN PyObject *_wrap_Vec3u___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3u___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u___mul__" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u___mul__" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3u___mul__" "', argument " "2"" of type '" "VecMat::Vec3< unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3u___mul__" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3< unsigned int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3<unsigned int >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec3< unsigned int > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec3<unsigned int > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -19703,7 +19831,7 @@ SWIGINTERN PyObject *_wrap_Vec3u___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< unsigned int >(static_cast< const VecMat::Vec3< unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<unsigned int >(static_cast< const VecMat::Vec3<unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -19712,9 +19840,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3u___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
-  VecMat::Vec3< unsigned int >::value_type arg2 ;
-  VecMat::Vec3< unsigned int > result;
+  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
+  VecMat::Vec3<unsigned int >::value_type arg2 ;
+  VecMat::Vec3<unsigned int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned int val2 ;
@@ -19723,19 +19851,19 @@ SWIGINTERN PyObject *_wrap_Vec3u___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3u___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u___div__" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u___div__" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3u___div__" "', argument " "2"" of type '" "VecMat::Vec3< unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3u___div__" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3< unsigned int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3<unsigned int >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec3< unsigned int > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec3<unsigned int > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -19744,7 +19872,7 @@ SWIGINTERN PyObject *_wrap_Vec3u___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< unsigned int >(static_cast< const VecMat::Vec3< unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<unsigned int >(static_cast< const VecMat::Vec3<unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -19753,9 +19881,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3u___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
-  VecMat::Vec3< unsigned int > *arg2 = 0 ;
-  VecMat::Vec3< unsigned int >::value_type result;
+  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
+  VecMat::Vec3<unsigned int > *arg2 = 0 ;
+  VecMat::Vec3<unsigned int >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -19764,22 +19892,22 @@ SWIGINTERN PyObject *_wrap_Vec3u___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3u___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u___mul__" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u___mul__" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3u___mul__" "', argument " "2"" of type '" "VecMat::Vec3< unsigned int > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3u___mul__" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3u___mul__" "', argument " "2"" of type '" "VecMat::Vec3< unsigned int > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3u___mul__" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp2);
   {
     try {
-      result = (VecMat::Vec3< unsigned int >::value_type)((VecMat::Vec3< unsigned int > const *)arg1)->operator *((VecMat::Vec3< unsigned int > const &)*arg2);
+      result = (VecMat::Vec3<unsigned int >::value_type)((VecMat::Vec3<unsigned int > const *)arg1)->operator *((VecMat::Vec3<unsigned int > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -19801,17 +19929,17 @@ SWIGINTERN PyObject *_wrap_Vec3u___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec3u___mul____SWIG_1(self, args);
@@ -19821,7 +19949,7 @@ SWIGINTERN PyObject *_wrap_Vec3u___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -19842,9 +19970,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3u___xor__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
-  VecMat::Vec3< unsigned int > *arg2 = 0 ;
-  VecMat::Vec3< unsigned int > result;
+  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
+  VecMat::Vec3<unsigned int > *arg2 = 0 ;
+  VecMat::Vec3<unsigned int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -19853,22 +19981,22 @@ SWIGINTERN PyObject *_wrap_Vec3u___xor__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3u___xor__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u___xor__" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u___xor__" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3u___xor__" "', argument " "2"" of type '" "VecMat::Vec3< unsigned int > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3u___xor__" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3u___xor__" "', argument " "2"" of type '" "VecMat::Vec3< unsigned int > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3u___xor__" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec3< unsigned int > const *)arg1)->operator ^((VecMat::Vec3< unsigned int > const &)*arg2);
+      result = ((VecMat::Vec3<unsigned int > const *)arg1)->operator ^((VecMat::Vec3<unsigned int > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -19877,7 +20005,7 @@ SWIGINTERN PyObject *_wrap_Vec3u___xor__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< unsigned int >(static_cast< const VecMat::Vec3< unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<unsigned int >(static_cast< const VecMat::Vec3<unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -19886,17 +20014,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec3u(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
+  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec3u",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec3u" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec3u" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
   {
     try {
       delete arg1;
@@ -19918,19 +20046,19 @@ fail:
 
 SWIGINTERN PyObject *Vec3u_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec3i__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< int > *result = 0 ;
+  VecMat::Vec3<int > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec3i")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec3< int > *)new VecMat::Vec3< int >();
+      result = (VecMat::Vec3<int > *)new VecMat::Vec3<int >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -19939,7 +20067,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3i__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_int_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tint_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -19948,10 +20076,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec3i__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< int >::value_type arg1 ;
-  VecMat::Vec3< int >::value_type arg2 ;
-  VecMat::Vec3< int >::value_type arg3 ;
-  VecMat::Vec3< int > *result = 0 ;
+  VecMat::Vec3<int >::value_type arg1 ;
+  VecMat::Vec3<int >::value_type arg2 ;
+  VecMat::Vec3<int >::value_type arg3 ;
+  VecMat::Vec3<int > *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -19965,22 +20093,22 @@ SWIGINTERN PyObject *_wrap_new_Vec3i__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OOO:new_Vec3i",&obj0,&obj1,&obj2)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3i" "', argument " "1"" of type '" "VecMat::Vec3< int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3i" "', argument " "1"" of type '" "VecMat::Vec3<int >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec3< int >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec3<int >::value_type >(val1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3i" "', argument " "2"" of type '" "VecMat::Vec3< int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3i" "', argument " "2"" of type '" "VecMat::Vec3<int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3< int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3<int >::value_type >(val2);
   ecode3 = SWIG_AsVal_int(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_Vec3i" "', argument " "3"" of type '" "VecMat::Vec3< int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_Vec3i" "', argument " "3"" of type '" "VecMat::Vec3<int >::value_type""'");
   } 
-  arg3 = static_cast< VecMat::Vec3< int >::value_type >(val3);
+  arg3 = static_cast< VecMat::Vec3<int >::value_type >(val3);
   {
     try {
-      result = (VecMat::Vec3< int > *)new VecMat::Vec3< int >(arg1,arg2,arg3);
+      result = (VecMat::Vec3<int > *)new VecMat::Vec3<int >(arg1,arg2,arg3);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -19989,7 +20117,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3i__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_int_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tint_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -19998,9 +20126,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec3i__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< int >::value_type arg1 ;
-  VecMat::Vec3< int >::value_type arg2 ;
-  VecMat::Vec3< int > *result = 0 ;
+  VecMat::Vec3<int >::value_type arg1 ;
+  VecMat::Vec3<int >::value_type arg2 ;
+  VecMat::Vec3<int > *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -20011,17 +20139,17 @@ SWIGINTERN PyObject *_wrap_new_Vec3i__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OO:new_Vec3i",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3i" "', argument " "1"" of type '" "VecMat::Vec3< int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3i" "', argument " "1"" of type '" "VecMat::Vec3<int >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec3< int >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec3<int >::value_type >(val1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3i" "', argument " "2"" of type '" "VecMat::Vec3< int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3i" "', argument " "2"" of type '" "VecMat::Vec3<int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3< int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3<int >::value_type >(val2);
   {
     try {
-      result = (VecMat::Vec3< int > *)new VecMat::Vec3< int >(arg1,arg2);
+      result = (VecMat::Vec3<int > *)new VecMat::Vec3<int >(arg1,arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -20030,7 +20158,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3i__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_int_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tint_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -20039,8 +20167,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec3i__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< int >::value_type arg1 ;
-  VecMat::Vec3< int > *result = 0 ;
+  VecMat::Vec3<int >::value_type arg1 ;
+  VecMat::Vec3<int > *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -20048,12 +20176,12 @@ SWIGINTERN PyObject *_wrap_new_Vec3i__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"O:new_Vec3i",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3i" "', argument " "1"" of type '" "VecMat::Vec3< int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3i" "', argument " "1"" of type '" "VecMat::Vec3<int >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec3< int >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec3<int >::value_type >(val1);
   {
     try {
-      result = (VecMat::Vec3< int > *)new VecMat::Vec3< int >(arg1);
+      result = (VecMat::Vec3<int > *)new VecMat::Vec3<int >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -20062,7 +20190,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3i__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_int_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tint_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -20075,7 +20203,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3i(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -20132,33 +20260,28 @@ SWIGINTERN PyObject *_wrap_new_Vec3i(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec3i'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    VecMat::Vec3< int >()\n"
-    "    VecMat::Vec3< int >(VecMat::Vec3< int >::value_type const,VecMat::Vec3< int >::value_type const,VecMat::Vec3< int >::value_type const)\n"
-    "    VecMat::Vec3< int >(VecMat::Vec3< int >::value_type const,VecMat::Vec3< int >::value_type const)\n"
-    "    VecMat::Vec3< int >(VecMat::Vec3< int >::value_type const)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec3i'.\n  Possible C/C++ prototypes are:\n    VecMat::Vec3<(int)>()\n    VecMat::Vec3<(int)>(VecMat::Vec3<int >::value_type const,VecMat::Vec3<int >::value_type const,VecMat::Vec3<int >::value_type const)\n    VecMat::Vec3<(int)>(VecMat::Vec3<int >::value_type const,VecMat::Vec3<int >::value_type const)\n    VecMat::Vec3<(int)>(VecMat::Vec3<int >::value_type const)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3i_x__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
-  VecMat::Vec3< int >::value_type result;
+  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
+  VecMat::Vec3<int >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3i_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_x" "', argument " "1"" of type '" "VecMat::Vec3< int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_x" "', argument " "1"" of type '" "VecMat::Vec3<int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
   {
     try {
-      result = (VecMat::Vec3< int >::value_type)((VecMat::Vec3< int > const *)arg1)->x();
+      result = (VecMat::Vec3<int >::value_type)((VecMat::Vec3<int > const *)arg1)->x();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -20176,23 +20299,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3i_x__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
-  VecMat::Vec3< int >::value_type *result = 0 ;
+  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
+  VecMat::Vec3<int >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3i_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_x" "', argument " "1"" of type '" "VecMat::Vec3< int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_x" "', argument " "1"" of type '" "VecMat::Vec3<int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
   {
     try {
       {
-        VecMat::Vec3< int >::value_type &_result_ref = (arg1)->x();
-        result = (VecMat::Vec3< int >::value_type *) &_result_ref;
+        VecMat::Vec3<int >::value_type &_result_ref = (arg1)->x();
+        result = (VecMat::Vec3<int >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -20215,14 +20338,14 @@ SWIGINTERN PyObject *_wrap_Vec3i_x(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tint_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3i_x__SWIG_0(self, args);
@@ -20231,7 +20354,7 @@ SWIGINTERN PyObject *_wrap_Vec3i_x(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tint_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3i_x__SWIG_1(self, args);
@@ -20239,31 +20362,28 @@ SWIGINTERN PyObject *_wrap_Vec3i_x(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3i_x'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    x(VecMat::Vec3< int > const *)\n"
-    "    x(VecMat::Vec3< int > *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3i_x'.\n  Possible C/C++ prototypes are:\n    x()\n    x()\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3i_y__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
-  VecMat::Vec3< int >::value_type result;
+  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
+  VecMat::Vec3<int >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3i_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_y" "', argument " "1"" of type '" "VecMat::Vec3< int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_y" "', argument " "1"" of type '" "VecMat::Vec3<int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
   {
     try {
-      result = (VecMat::Vec3< int >::value_type)((VecMat::Vec3< int > const *)arg1)->y();
+      result = (VecMat::Vec3<int >::value_type)((VecMat::Vec3<int > const *)arg1)->y();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -20281,23 +20401,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3i_y__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
-  VecMat::Vec3< int >::value_type *result = 0 ;
+  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
+  VecMat::Vec3<int >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3i_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_y" "', argument " "1"" of type '" "VecMat::Vec3< int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_y" "', argument " "1"" of type '" "VecMat::Vec3<int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
   {
     try {
       {
-        VecMat::Vec3< int >::value_type &_result_ref = (arg1)->y();
-        result = (VecMat::Vec3< int >::value_type *) &_result_ref;
+        VecMat::Vec3<int >::value_type &_result_ref = (arg1)->y();
+        result = (VecMat::Vec3<int >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -20320,14 +20440,14 @@ SWIGINTERN PyObject *_wrap_Vec3i_y(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tint_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3i_y__SWIG_0(self, args);
@@ -20336,7 +20456,7 @@ SWIGINTERN PyObject *_wrap_Vec3i_y(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tint_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3i_y__SWIG_1(self, args);
@@ -20344,31 +20464,28 @@ SWIGINTERN PyObject *_wrap_Vec3i_y(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3i_y'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    y(VecMat::Vec3< int > const *)\n"
-    "    y(VecMat::Vec3< int > *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3i_y'.\n  Possible C/C++ prototypes are:\n    y()\n    y()\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3i_z__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
-  VecMat::Vec3< int >::value_type result;
+  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
+  VecMat::Vec3<int >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3i_z",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_z" "', argument " "1"" of type '" "VecMat::Vec3< int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_z" "', argument " "1"" of type '" "VecMat::Vec3<int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
   {
     try {
-      result = (VecMat::Vec3< int >::value_type)((VecMat::Vec3< int > const *)arg1)->z();
+      result = (VecMat::Vec3<int >::value_type)((VecMat::Vec3<int > const *)arg1)->z();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -20386,23 +20503,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3i_z__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
-  VecMat::Vec3< int >::value_type *result = 0 ;
+  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
+  VecMat::Vec3<int >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3i_z",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_z" "', argument " "1"" of type '" "VecMat::Vec3< int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_z" "', argument " "1"" of type '" "VecMat::Vec3<int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
   {
     try {
       {
-        VecMat::Vec3< int >::value_type &_result_ref = (arg1)->z();
-        result = (VecMat::Vec3< int >::value_type *) &_result_ref;
+        VecMat::Vec3<int >::value_type &_result_ref = (arg1)->z();
+        result = (VecMat::Vec3<int >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -20425,14 +20542,14 @@ SWIGINTERN PyObject *_wrap_Vec3i_z(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tint_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3i_z__SWIG_0(self, args);
@@ -20441,7 +20558,7 @@ SWIGINTERN PyObject *_wrap_Vec3i_z(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tint_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3i_z__SWIG_1(self, args);
@@ -20449,18 +20566,15 @@ SWIGINTERN PyObject *_wrap_Vec3i_z(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3i_z'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    z(VecMat::Vec3< int > const *)\n"
-    "    z(VecMat::Vec3< int > *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3i_z'.\n  Possible C/C++ prototypes are:\n    z()\n    z()\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3i_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
-  VecMat::Vec3< int >::value_type arg2 ;
+  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
+  VecMat::Vec3<int >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -20469,16 +20583,16 @@ SWIGINTERN PyObject *_wrap_Vec3i_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3i_setX",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_setX" "', argument " "1"" of type '" "VecMat::Vec3< int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_setX" "', argument " "1"" of type '" "VecMat::Vec3<int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3i_setX" "', argument " "2"" of type '" "VecMat::Vec3< int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3i_setX" "', argument " "2"" of type '" "VecMat::Vec3<int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3< int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3<int >::value_type >(val2);
   {
     try {
       (arg1)->setX(arg2);
@@ -20499,8 +20613,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3i_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
-  VecMat::Vec3< int >::value_type arg2 ;
+  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
+  VecMat::Vec3<int >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -20509,16 +20623,16 @@ SWIGINTERN PyObject *_wrap_Vec3i_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3i_setY",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_setY" "', argument " "1"" of type '" "VecMat::Vec3< int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_setY" "', argument " "1"" of type '" "VecMat::Vec3<int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3i_setY" "', argument " "2"" of type '" "VecMat::Vec3< int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3i_setY" "', argument " "2"" of type '" "VecMat::Vec3<int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3< int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3<int >::value_type >(val2);
   {
     try {
       (arg1)->setY(arg2);
@@ -20539,8 +20653,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3i_setZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
-  VecMat::Vec3< int >::value_type arg2 ;
+  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
+  VecMat::Vec3<int >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -20549,16 +20663,16 @@ SWIGINTERN PyObject *_wrap_Vec3i_setZ(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3i_setZ",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_setZ" "', argument " "1"" of type '" "VecMat::Vec3< int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_setZ" "', argument " "1"" of type '" "VecMat::Vec3<int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3i_setZ" "', argument " "2"" of type '" "VecMat::Vec3< int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3i_setZ" "', argument " "2"" of type '" "VecMat::Vec3<int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3< int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3<int >::value_type >(val2);
   {
     try {
       (arg1)->setZ(arg2);
@@ -20579,9 +20693,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3i___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
-  VecMat::Vec3< int > *arg2 = 0 ;
-  VecMat::Vec3< int > result;
+  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
+  VecMat::Vec3<int > *arg2 = 0 ;
+  VecMat::Vec3<int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -20590,22 +20704,22 @@ SWIGINTERN PyObject *_wrap_Vec3i___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3i___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i___add__" "', argument " "1"" of type '" "VecMat::Vec3< int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i___add__" "', argument " "1"" of type '" "VecMat::Vec3<int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_int_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tint_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3i___add__" "', argument " "2"" of type '" "VecMat::Vec3< int > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3i___add__" "', argument " "2"" of type '" "VecMat::Vec3<int > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3i___add__" "', argument " "2"" of type '" "VecMat::Vec3< int > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3i___add__" "', argument " "2"" of type '" "VecMat::Vec3<int > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3< int > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3<int > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec3< int > const *)arg1)->operator +((VecMat::Vec3< int > const &)*arg2);
+      result = ((VecMat::Vec3<int > const *)arg1)->operator +((VecMat::Vec3<int > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -20614,7 +20728,7 @@ SWIGINTERN PyObject *_wrap_Vec3i___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< int >(static_cast< const VecMat::Vec3< int >& >(result))), SWIGTYPE_p_VecMat__Vec3T_int_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<int >(static_cast< const VecMat::Vec3<int >& >(result))), SWIGTYPE_p_VecMat__Vec3Tint_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -20623,9 +20737,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3i___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
-  VecMat::Vec3< int > *arg2 = 0 ;
-  VecMat::Vec3< int > result;
+  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
+  VecMat::Vec3<int > *arg2 = 0 ;
+  VecMat::Vec3<int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -20634,22 +20748,22 @@ SWIGINTERN PyObject *_wrap_Vec3i___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3i___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i___sub__" "', argument " "1"" of type '" "VecMat::Vec3< int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i___sub__" "', argument " "1"" of type '" "VecMat::Vec3<int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_int_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tint_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3i___sub__" "', argument " "2"" of type '" "VecMat::Vec3< int > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3i___sub__" "', argument " "2"" of type '" "VecMat::Vec3<int > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3i___sub__" "', argument " "2"" of type '" "VecMat::Vec3< int > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3i___sub__" "', argument " "2"" of type '" "VecMat::Vec3<int > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3< int > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3<int > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec3< int > const *)arg1)->operator -((VecMat::Vec3< int > const &)*arg2);
+      result = ((VecMat::Vec3<int > const *)arg1)->operator -((VecMat::Vec3<int > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -20658,7 +20772,7 @@ SWIGINTERN PyObject *_wrap_Vec3i___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< int >(static_cast< const VecMat::Vec3< int >& >(result))), SWIGTYPE_p_VecMat__Vec3T_int_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<int >(static_cast< const VecMat::Vec3<int >& >(result))), SWIGTYPE_p_VecMat__Vec3Tint_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -20667,9 +20781,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3i___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
-  VecMat::Vec3< int >::value_type arg2 ;
-  VecMat::Vec3< int > result;
+  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
+  VecMat::Vec3<int >::value_type arg2 ;
+  VecMat::Vec3<int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -20678,19 +20792,19 @@ SWIGINTERN PyObject *_wrap_Vec3i___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3i___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i___mul__" "', argument " "1"" of type '" "VecMat::Vec3< int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i___mul__" "', argument " "1"" of type '" "VecMat::Vec3<int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3i___mul__" "', argument " "2"" of type '" "VecMat::Vec3< int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3i___mul__" "', argument " "2"" of type '" "VecMat::Vec3<int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3< int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3<int >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec3< int > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec3<int > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -20699,7 +20813,7 @@ SWIGINTERN PyObject *_wrap_Vec3i___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< int >(static_cast< const VecMat::Vec3< int >& >(result))), SWIGTYPE_p_VecMat__Vec3T_int_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<int >(static_cast< const VecMat::Vec3<int >& >(result))), SWIGTYPE_p_VecMat__Vec3Tint_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -20708,9 +20822,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3i___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
-  VecMat::Vec3< int >::value_type arg2 ;
-  VecMat::Vec3< int > result;
+  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
+  VecMat::Vec3<int >::value_type arg2 ;
+  VecMat::Vec3<int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -20719,19 +20833,19 @@ SWIGINTERN PyObject *_wrap_Vec3i___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3i___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i___div__" "', argument " "1"" of type '" "VecMat::Vec3< int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i___div__" "', argument " "1"" of type '" "VecMat::Vec3<int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3i___div__" "', argument " "2"" of type '" "VecMat::Vec3< int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3i___div__" "', argument " "2"" of type '" "VecMat::Vec3<int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3< int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3<int >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec3< int > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec3<int > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -20740,7 +20854,7 @@ SWIGINTERN PyObject *_wrap_Vec3i___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< int >(static_cast< const VecMat::Vec3< int >& >(result))), SWIGTYPE_p_VecMat__Vec3T_int_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<int >(static_cast< const VecMat::Vec3<int >& >(result))), SWIGTYPE_p_VecMat__Vec3Tint_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -20749,9 +20863,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3i___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
-  VecMat::Vec3< int > *arg2 = 0 ;
-  VecMat::Vec3< int >::value_type result;
+  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
+  VecMat::Vec3<int > *arg2 = 0 ;
+  VecMat::Vec3<int >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -20760,22 +20874,22 @@ SWIGINTERN PyObject *_wrap_Vec3i___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3i___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i___mul__" "', argument " "1"" of type '" "VecMat::Vec3< int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i___mul__" "', argument " "1"" of type '" "VecMat::Vec3<int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_int_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tint_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3i___mul__" "', argument " "2"" of type '" "VecMat::Vec3< int > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3i___mul__" "', argument " "2"" of type '" "VecMat::Vec3<int > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3i___mul__" "', argument " "2"" of type '" "VecMat::Vec3< int > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3i___mul__" "', argument " "2"" of type '" "VecMat::Vec3<int > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3< int > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3<int > * >(argp2);
   {
     try {
-      result = (VecMat::Vec3< int >::value_type)((VecMat::Vec3< int > const *)arg1)->operator *((VecMat::Vec3< int > const &)*arg2);
+      result = (VecMat::Vec3<int >::value_type)((VecMat::Vec3<int > const *)arg1)->operator *((VecMat::Vec3<int > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -20797,17 +20911,17 @@ SWIGINTERN PyObject *_wrap_Vec3i___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tint_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec3T_int_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec3Tint_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec3i___mul____SWIG_1(self, args);
@@ -20817,7 +20931,7 @@ SWIGINTERN PyObject *_wrap_Vec3i___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tint_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -20838,9 +20952,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3i___xor__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
-  VecMat::Vec3< int > *arg2 = 0 ;
-  VecMat::Vec3< int > result;
+  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
+  VecMat::Vec3<int > *arg2 = 0 ;
+  VecMat::Vec3<int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -20849,22 +20963,22 @@ SWIGINTERN PyObject *_wrap_Vec3i___xor__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3i___xor__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i___xor__" "', argument " "1"" of type '" "VecMat::Vec3< int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i___xor__" "', argument " "1"" of type '" "VecMat::Vec3<int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_int_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tint_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3i___xor__" "', argument " "2"" of type '" "VecMat::Vec3< int > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3i___xor__" "', argument " "2"" of type '" "VecMat::Vec3<int > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3i___xor__" "', argument " "2"" of type '" "VecMat::Vec3< int > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3i___xor__" "', argument " "2"" of type '" "VecMat::Vec3<int > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3< int > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3<int > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec3< int > const *)arg1)->operator ^((VecMat::Vec3< int > const &)*arg2);
+      result = ((VecMat::Vec3<int > const *)arg1)->operator ^((VecMat::Vec3<int > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -20873,7 +20987,7 @@ SWIGINTERN PyObject *_wrap_Vec3i___xor__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< int >(static_cast< const VecMat::Vec3< int >& >(result))), SWIGTYPE_p_VecMat__Vec3T_int_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<int >(static_cast< const VecMat::Vec3<int >& >(result))), SWIGTYPE_p_VecMat__Vec3Tint_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -20882,17 +20996,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec3i(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
+  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec3i",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec3i" "', argument " "1"" of type '" "VecMat::Vec3< int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec3i" "', argument " "1"" of type '" "VecMat::Vec3<int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
   {
     try {
       delete arg1;
@@ -20914,19 +21028,19 @@ fail:
 
 SWIGINTERN PyObject *Vec3i_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec3T_int_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec3Tint_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec3f__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< float > *result = 0 ;
+  VecMat::Vec3<float > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec3f")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec3< float > *)new VecMat::Vec3< float >();
+      result = (VecMat::Vec3<float > *)new VecMat::Vec3<float >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -20935,7 +21049,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3f__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -20944,10 +21058,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec3f__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< float >::value_type arg1 ;
-  VecMat::Vec3< float >::value_type arg2 ;
-  VecMat::Vec3< float >::value_type arg3 ;
-  VecMat::Vec3< float > *result = 0 ;
+  VecMat::Vec3<float >::value_type arg1 ;
+  VecMat::Vec3<float >::value_type arg2 ;
+  VecMat::Vec3<float >::value_type arg3 ;
+  VecMat::Vec3<float > *result = 0 ;
   float val1 ;
   int ecode1 = 0 ;
   float val2 ;
@@ -20961,22 +21075,22 @@ SWIGINTERN PyObject *_wrap_new_Vec3f__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OOO:new_Vec3f",&obj0,&obj1,&obj2)) SWIG_fail;
   ecode1 = SWIG_AsVal_float(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3f" "', argument " "1"" of type '" "VecMat::Vec3< float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3f" "', argument " "1"" of type '" "VecMat::Vec3<float >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec3< float >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec3<float >::value_type >(val1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3f" "', argument " "2"" of type '" "VecMat::Vec3< float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3f" "', argument " "2"" of type '" "VecMat::Vec3<float >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3< float >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3<float >::value_type >(val2);
   ecode3 = SWIG_AsVal_float(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_Vec3f" "', argument " "3"" of type '" "VecMat::Vec3< float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_Vec3f" "', argument " "3"" of type '" "VecMat::Vec3<float >::value_type""'");
   } 
-  arg3 = static_cast< VecMat::Vec3< float >::value_type >(val3);
+  arg3 = static_cast< VecMat::Vec3<float >::value_type >(val3);
   {
     try {
-      result = (VecMat::Vec3< float > *)new VecMat::Vec3< float >(arg1,arg2,arg3);
+      result = (VecMat::Vec3<float > *)new VecMat::Vec3<float >(arg1,arg2,arg3);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -20985,7 +21099,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3f__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -20994,9 +21108,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec3f__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< float >::value_type arg1 ;
-  VecMat::Vec3< float >::value_type arg2 ;
-  VecMat::Vec3< float > *result = 0 ;
+  VecMat::Vec3<float >::value_type arg1 ;
+  VecMat::Vec3<float >::value_type arg2 ;
+  VecMat::Vec3<float > *result = 0 ;
   float val1 ;
   int ecode1 = 0 ;
   float val2 ;
@@ -21007,17 +21121,17 @@ SWIGINTERN PyObject *_wrap_new_Vec3f__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OO:new_Vec3f",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_float(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3f" "', argument " "1"" of type '" "VecMat::Vec3< float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3f" "', argument " "1"" of type '" "VecMat::Vec3<float >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec3< float >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec3<float >::value_type >(val1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3f" "', argument " "2"" of type '" "VecMat::Vec3< float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3f" "', argument " "2"" of type '" "VecMat::Vec3<float >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3< float >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3<float >::value_type >(val2);
   {
     try {
-      result = (VecMat::Vec3< float > *)new VecMat::Vec3< float >(arg1,arg2);
+      result = (VecMat::Vec3<float > *)new VecMat::Vec3<float >(arg1,arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -21026,7 +21140,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3f__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -21035,8 +21149,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec3f__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< float >::value_type arg1 ;
-  VecMat::Vec3< float > *result = 0 ;
+  VecMat::Vec3<float >::value_type arg1 ;
+  VecMat::Vec3<float > *result = 0 ;
   float val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -21044,12 +21158,12 @@ SWIGINTERN PyObject *_wrap_new_Vec3f__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"O:new_Vec3f",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_float(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3f" "', argument " "1"" of type '" "VecMat::Vec3< float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3f" "', argument " "1"" of type '" "VecMat::Vec3<float >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec3< float >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec3<float >::value_type >(val1);
   {
     try {
-      result = (VecMat::Vec3< float > *)new VecMat::Vec3< float >(arg1);
+      result = (VecMat::Vec3<float > *)new VecMat::Vec3<float >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -21058,7 +21172,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3f__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -21071,7 +21185,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3f(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -21128,33 +21242,28 @@ SWIGINTERN PyObject *_wrap_new_Vec3f(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec3f'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    VecMat::Vec3< float >()\n"
-    "    VecMat::Vec3< float >(VecMat::Vec3< float >::value_type const,VecMat::Vec3< float >::value_type const,VecMat::Vec3< float >::value_type const)\n"
-    "    VecMat::Vec3< float >(VecMat::Vec3< float >::value_type const,VecMat::Vec3< float >::value_type const)\n"
-    "    VecMat::Vec3< float >(VecMat::Vec3< float >::value_type const)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec3f'.\n  Possible C/C++ prototypes are:\n    VecMat::Vec3<(float)>()\n    VecMat::Vec3<(float)>(VecMat::Vec3<float >::value_type const,VecMat::Vec3<float >::value_type const,VecMat::Vec3<float >::value_type const)\n    VecMat::Vec3<(float)>(VecMat::Vec3<float >::value_type const,VecMat::Vec3<float >::value_type const)\n    VecMat::Vec3<(float)>(VecMat::Vec3<float >::value_type const)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3f_x__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
-  VecMat::Vec3< float >::value_type result;
+  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
+  VecMat::Vec3<float >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3f_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_x" "', argument " "1"" of type '" "VecMat::Vec3< float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_x" "', argument " "1"" of type '" "VecMat::Vec3<float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
   {
     try {
-      result = (VecMat::Vec3< float >::value_type)((VecMat::Vec3< float > const *)arg1)->x();
+      result = (VecMat::Vec3<float >::value_type)((VecMat::Vec3<float > const *)arg1)->x();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -21172,23 +21281,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3f_x__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
-  VecMat::Vec3< float >::value_type *result = 0 ;
+  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
+  VecMat::Vec3<float >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3f_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_x" "', argument " "1"" of type '" "VecMat::Vec3< float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_x" "', argument " "1"" of type '" "VecMat::Vec3<float > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
   {
     try {
       {
-        VecMat::Vec3< float >::value_type &_result_ref = (arg1)->x();
-        result = (VecMat::Vec3< float >::value_type *) &_result_ref;
+        VecMat::Vec3<float >::value_type &_result_ref = (arg1)->x();
+        result = (VecMat::Vec3<float >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -21211,14 +21320,14 @@ SWIGINTERN PyObject *_wrap_Vec3f_x(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_float_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3f_x__SWIG_0(self, args);
@@ -21227,7 +21336,7 @@ SWIGINTERN PyObject *_wrap_Vec3f_x(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_float_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3f_x__SWIG_1(self, args);
@@ -21235,31 +21344,28 @@ SWIGINTERN PyObject *_wrap_Vec3f_x(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3f_x'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    x(VecMat::Vec3< float > const *)\n"
-    "    x(VecMat::Vec3< float > *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3f_x'.\n  Possible C/C++ prototypes are:\n    x()\n    x()\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3f_y__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
-  VecMat::Vec3< float >::value_type result;
+  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
+  VecMat::Vec3<float >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3f_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_y" "', argument " "1"" of type '" "VecMat::Vec3< float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_y" "', argument " "1"" of type '" "VecMat::Vec3<float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
   {
     try {
-      result = (VecMat::Vec3< float >::value_type)((VecMat::Vec3< float > const *)arg1)->y();
+      result = (VecMat::Vec3<float >::value_type)((VecMat::Vec3<float > const *)arg1)->y();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -21277,23 +21383,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3f_y__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
-  VecMat::Vec3< float >::value_type *result = 0 ;
+  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
+  VecMat::Vec3<float >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3f_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_y" "', argument " "1"" of type '" "VecMat::Vec3< float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_y" "', argument " "1"" of type '" "VecMat::Vec3<float > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
   {
     try {
       {
-        VecMat::Vec3< float >::value_type &_result_ref = (arg1)->y();
-        result = (VecMat::Vec3< float >::value_type *) &_result_ref;
+        VecMat::Vec3<float >::value_type &_result_ref = (arg1)->y();
+        result = (VecMat::Vec3<float >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -21316,14 +21422,14 @@ SWIGINTERN PyObject *_wrap_Vec3f_y(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_float_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3f_y__SWIG_0(self, args);
@@ -21332,7 +21438,7 @@ SWIGINTERN PyObject *_wrap_Vec3f_y(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_float_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3f_y__SWIG_1(self, args);
@@ -21340,31 +21446,28 @@ SWIGINTERN PyObject *_wrap_Vec3f_y(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3f_y'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    y(VecMat::Vec3< float > const *)\n"
-    "    y(VecMat::Vec3< float > *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3f_y'.\n  Possible C/C++ prototypes are:\n    y()\n    y()\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3f_z__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
-  VecMat::Vec3< float >::value_type result;
+  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
+  VecMat::Vec3<float >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3f_z",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_z" "', argument " "1"" of type '" "VecMat::Vec3< float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_z" "', argument " "1"" of type '" "VecMat::Vec3<float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
   {
     try {
-      result = (VecMat::Vec3< float >::value_type)((VecMat::Vec3< float > const *)arg1)->z();
+      result = (VecMat::Vec3<float >::value_type)((VecMat::Vec3<float > const *)arg1)->z();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -21382,23 +21485,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3f_z__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
-  VecMat::Vec3< float >::value_type *result = 0 ;
+  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
+  VecMat::Vec3<float >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3f_z",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_z" "', argument " "1"" of type '" "VecMat::Vec3< float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_z" "', argument " "1"" of type '" "VecMat::Vec3<float > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
   {
     try {
       {
-        VecMat::Vec3< float >::value_type &_result_ref = (arg1)->z();
-        result = (VecMat::Vec3< float >::value_type *) &_result_ref;
+        VecMat::Vec3<float >::value_type &_result_ref = (arg1)->z();
+        result = (VecMat::Vec3<float >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -21421,14 +21524,14 @@ SWIGINTERN PyObject *_wrap_Vec3f_z(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_float_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3f_z__SWIG_0(self, args);
@@ -21437,7 +21540,7 @@ SWIGINTERN PyObject *_wrap_Vec3f_z(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_float_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3f_z__SWIG_1(self, args);
@@ -21445,18 +21548,15 @@ SWIGINTERN PyObject *_wrap_Vec3f_z(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3f_z'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    z(VecMat::Vec3< float > const *)\n"
-    "    z(VecMat::Vec3< float > *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3f_z'.\n  Possible C/C++ prototypes are:\n    z()\n    z()\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3f_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
-  VecMat::Vec3< float >::value_type arg2 ;
+  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
+  VecMat::Vec3<float >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   float val2 ;
@@ -21465,16 +21565,16 @@ SWIGINTERN PyObject *_wrap_Vec3f_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3f_setX",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_setX" "', argument " "1"" of type '" "VecMat::Vec3< float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_setX" "', argument " "1"" of type '" "VecMat::Vec3<float > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3f_setX" "', argument " "2"" of type '" "VecMat::Vec3< float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3f_setX" "', argument " "2"" of type '" "VecMat::Vec3<float >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3< float >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3<float >::value_type >(val2);
   {
     try {
       (arg1)->setX(arg2);
@@ -21495,8 +21595,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3f_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
-  VecMat::Vec3< float >::value_type arg2 ;
+  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
+  VecMat::Vec3<float >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   float val2 ;
@@ -21505,16 +21605,16 @@ SWIGINTERN PyObject *_wrap_Vec3f_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3f_setY",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_setY" "', argument " "1"" of type '" "VecMat::Vec3< float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_setY" "', argument " "1"" of type '" "VecMat::Vec3<float > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3f_setY" "', argument " "2"" of type '" "VecMat::Vec3< float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3f_setY" "', argument " "2"" of type '" "VecMat::Vec3<float >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3< float >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3<float >::value_type >(val2);
   {
     try {
       (arg1)->setY(arg2);
@@ -21535,8 +21635,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3f_setZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
-  VecMat::Vec3< float >::value_type arg2 ;
+  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
+  VecMat::Vec3<float >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   float val2 ;
@@ -21545,16 +21645,16 @@ SWIGINTERN PyObject *_wrap_Vec3f_setZ(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3f_setZ",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_setZ" "', argument " "1"" of type '" "VecMat::Vec3< float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_setZ" "', argument " "1"" of type '" "VecMat::Vec3<float > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3f_setZ" "', argument " "2"" of type '" "VecMat::Vec3< float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3f_setZ" "', argument " "2"" of type '" "VecMat::Vec3<float >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3< float >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3<float >::value_type >(val2);
   {
     try {
       (arg1)->setZ(arg2);
@@ -21575,9 +21675,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3f___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
-  VecMat::Vec3< float > *arg2 = 0 ;
-  VecMat::Vec3< float > result;
+  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
+  VecMat::Vec3<float > *arg2 = 0 ;
+  VecMat::Vec3<float > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -21586,22 +21686,22 @@ SWIGINTERN PyObject *_wrap_Vec3f___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3f___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f___add__" "', argument " "1"" of type '" "VecMat::Vec3< float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f___add__" "', argument " "1"" of type '" "VecMat::Vec3<float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_float_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tfloat_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3f___add__" "', argument " "2"" of type '" "VecMat::Vec3< float > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3f___add__" "', argument " "2"" of type '" "VecMat::Vec3<float > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3f___add__" "', argument " "2"" of type '" "VecMat::Vec3< float > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3f___add__" "', argument " "2"" of type '" "VecMat::Vec3<float > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3< float > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3<float > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec3< float > const *)arg1)->operator +((VecMat::Vec3< float > const &)*arg2);
+      result = ((VecMat::Vec3<float > const *)arg1)->operator +((VecMat::Vec3<float > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -21610,7 +21710,7 @@ SWIGINTERN PyObject *_wrap_Vec3f___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< float >(static_cast< const VecMat::Vec3< float >& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<float >(static_cast< const VecMat::Vec3<float >& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -21619,9 +21719,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3f___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
-  VecMat::Vec3< float > *arg2 = 0 ;
-  VecMat::Vec3< float > result;
+  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
+  VecMat::Vec3<float > *arg2 = 0 ;
+  VecMat::Vec3<float > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -21630,22 +21730,22 @@ SWIGINTERN PyObject *_wrap_Vec3f___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3f___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f___sub__" "', argument " "1"" of type '" "VecMat::Vec3< float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f___sub__" "', argument " "1"" of type '" "VecMat::Vec3<float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_float_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tfloat_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3f___sub__" "', argument " "2"" of type '" "VecMat::Vec3< float > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3f___sub__" "', argument " "2"" of type '" "VecMat::Vec3<float > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3f___sub__" "', argument " "2"" of type '" "VecMat::Vec3< float > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3f___sub__" "', argument " "2"" of type '" "VecMat::Vec3<float > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3< float > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3<float > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec3< float > const *)arg1)->operator -((VecMat::Vec3< float > const &)*arg2);
+      result = ((VecMat::Vec3<float > const *)arg1)->operator -((VecMat::Vec3<float > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -21654,7 +21754,7 @@ SWIGINTERN PyObject *_wrap_Vec3f___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< float >(static_cast< const VecMat::Vec3< float >& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<float >(static_cast< const VecMat::Vec3<float >& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -21663,9 +21763,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3f___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
-  VecMat::Vec3< float >::value_type arg2 ;
-  VecMat::Vec3< float > result;
+  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
+  VecMat::Vec3<float >::value_type arg2 ;
+  VecMat::Vec3<float > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   float val2 ;
@@ -21674,19 +21774,19 @@ SWIGINTERN PyObject *_wrap_Vec3f___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3f___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f___mul__" "', argument " "1"" of type '" "VecMat::Vec3< float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f___mul__" "', argument " "1"" of type '" "VecMat::Vec3<float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3f___mul__" "', argument " "2"" of type '" "VecMat::Vec3< float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3f___mul__" "', argument " "2"" of type '" "VecMat::Vec3<float >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3< float >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3<float >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec3< float > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec3<float > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -21695,7 +21795,7 @@ SWIGINTERN PyObject *_wrap_Vec3f___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< float >(static_cast< const VecMat::Vec3< float >& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<float >(static_cast< const VecMat::Vec3<float >& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -21704,9 +21804,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3f___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
-  VecMat::Vec3< float >::value_type arg2 ;
-  VecMat::Vec3< float > result;
+  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
+  VecMat::Vec3<float >::value_type arg2 ;
+  VecMat::Vec3<float > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   float val2 ;
@@ -21715,19 +21815,19 @@ SWIGINTERN PyObject *_wrap_Vec3f___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3f___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f___div__" "', argument " "1"" of type '" "VecMat::Vec3< float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f___div__" "', argument " "1"" of type '" "VecMat::Vec3<float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3f___div__" "', argument " "2"" of type '" "VecMat::Vec3< float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3f___div__" "', argument " "2"" of type '" "VecMat::Vec3<float >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3< float >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3<float >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec3< float > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec3<float > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -21736,7 +21836,7 @@ SWIGINTERN PyObject *_wrap_Vec3f___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< float >(static_cast< const VecMat::Vec3< float >& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<float >(static_cast< const VecMat::Vec3<float >& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -21745,9 +21845,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3f___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
-  VecMat::Vec3< float > *arg2 = 0 ;
-  VecMat::Vec3< float >::value_type result;
+  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
+  VecMat::Vec3<float > *arg2 = 0 ;
+  VecMat::Vec3<float >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -21756,22 +21856,22 @@ SWIGINTERN PyObject *_wrap_Vec3f___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3f___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f___mul__" "', argument " "1"" of type '" "VecMat::Vec3< float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f___mul__" "', argument " "1"" of type '" "VecMat::Vec3<float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_float_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tfloat_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3f___mul__" "', argument " "2"" of type '" "VecMat::Vec3< float > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3f___mul__" "', argument " "2"" of type '" "VecMat::Vec3<float > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3f___mul__" "', argument " "2"" of type '" "VecMat::Vec3< float > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3f___mul__" "', argument " "2"" of type '" "VecMat::Vec3<float > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3< float > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3<float > * >(argp2);
   {
     try {
-      result = (VecMat::Vec3< float >::value_type)((VecMat::Vec3< float > const *)arg1)->operator *((VecMat::Vec3< float > const &)*arg2);
+      result = (VecMat::Vec3<float >::value_type)((VecMat::Vec3<float > const *)arg1)->operator *((VecMat::Vec3<float > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -21793,17 +21893,17 @@ SWIGINTERN PyObject *_wrap_Vec3f___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_float_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec3T_float_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec3f___mul____SWIG_1(self, args);
@@ -21813,7 +21913,7 @@ SWIGINTERN PyObject *_wrap_Vec3f___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_float_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -21834,9 +21934,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3f___xor__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
-  VecMat::Vec3< float > *arg2 = 0 ;
-  VecMat::Vec3< float > result;
+  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
+  VecMat::Vec3<float > *arg2 = 0 ;
+  VecMat::Vec3<float > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -21845,22 +21945,22 @@ SWIGINTERN PyObject *_wrap_Vec3f___xor__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3f___xor__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f___xor__" "', argument " "1"" of type '" "VecMat::Vec3< float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f___xor__" "', argument " "1"" of type '" "VecMat::Vec3<float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_float_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tfloat_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3f___xor__" "', argument " "2"" of type '" "VecMat::Vec3< float > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3f___xor__" "', argument " "2"" of type '" "VecMat::Vec3<float > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3f___xor__" "', argument " "2"" of type '" "VecMat::Vec3< float > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3f___xor__" "', argument " "2"" of type '" "VecMat::Vec3<float > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3< float > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3<float > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec3< float > const *)arg1)->operator ^((VecMat::Vec3< float > const &)*arg2);
+      result = ((VecMat::Vec3<float > const *)arg1)->operator ^((VecMat::Vec3<float > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -21869,7 +21969,7 @@ SWIGINTERN PyObject *_wrap_Vec3f___xor__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< float >(static_cast< const VecMat::Vec3< float >& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<float >(static_cast< const VecMat::Vec3<float >& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -21878,17 +21978,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
+  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec3f",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec3f" "', argument " "1"" of type '" "VecMat::Vec3< float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec3f" "', argument " "1"" of type '" "VecMat::Vec3<float > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
   {
     try {
       delete arg1;
@@ -21910,19 +22010,19 @@ fail:
 
 SWIGINTERN PyObject *Vec3f_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec3d__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< double > *result = 0 ;
+  VecMat::Vec3<double > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec3d")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec3< double > *)new VecMat::Vec3< double >();
+      result = (VecMat::Vec3<double > *)new VecMat::Vec3<double >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -21931,7 +22031,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3d__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -21940,10 +22040,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec3d__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< double >::value_type arg1 ;
-  VecMat::Vec3< double >::value_type arg2 ;
-  VecMat::Vec3< double >::value_type arg3 ;
-  VecMat::Vec3< double > *result = 0 ;
+  VecMat::Vec3<double >::value_type arg1 ;
+  VecMat::Vec3<double >::value_type arg2 ;
+  VecMat::Vec3<double >::value_type arg3 ;
+  VecMat::Vec3<double > *result = 0 ;
   double val1 ;
   int ecode1 = 0 ;
   double val2 ;
@@ -21957,22 +22057,22 @@ SWIGINTERN PyObject *_wrap_new_Vec3d__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OOO:new_Vec3d",&obj0,&obj1,&obj2)) SWIG_fail;
   ecode1 = SWIG_AsVal_double(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3d" "', argument " "1"" of type '" "VecMat::Vec3< double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3d" "', argument " "1"" of type '" "VecMat::Vec3<double >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec3< double >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec3<double >::value_type >(val1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3d" "', argument " "2"" of type '" "VecMat::Vec3< double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3d" "', argument " "2"" of type '" "VecMat::Vec3<double >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3< double >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3<double >::value_type >(val2);
   ecode3 = SWIG_AsVal_double(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_Vec3d" "', argument " "3"" of type '" "VecMat::Vec3< double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_Vec3d" "', argument " "3"" of type '" "VecMat::Vec3<double >::value_type""'");
   } 
-  arg3 = static_cast< VecMat::Vec3< double >::value_type >(val3);
+  arg3 = static_cast< VecMat::Vec3<double >::value_type >(val3);
   {
     try {
-      result = (VecMat::Vec3< double > *)new VecMat::Vec3< double >(arg1,arg2,arg3);
+      result = (VecMat::Vec3<double > *)new VecMat::Vec3<double >(arg1,arg2,arg3);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -21981,7 +22081,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3d__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -21990,9 +22090,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec3d__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< double >::value_type arg1 ;
-  VecMat::Vec3< double >::value_type arg2 ;
-  VecMat::Vec3< double > *result = 0 ;
+  VecMat::Vec3<double >::value_type arg1 ;
+  VecMat::Vec3<double >::value_type arg2 ;
+  VecMat::Vec3<double > *result = 0 ;
   double val1 ;
   int ecode1 = 0 ;
   double val2 ;
@@ -22003,17 +22103,17 @@ SWIGINTERN PyObject *_wrap_new_Vec3d__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OO:new_Vec3d",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_double(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3d" "', argument " "1"" of type '" "VecMat::Vec3< double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3d" "', argument " "1"" of type '" "VecMat::Vec3<double >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec3< double >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec3<double >::value_type >(val1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3d" "', argument " "2"" of type '" "VecMat::Vec3< double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3d" "', argument " "2"" of type '" "VecMat::Vec3<double >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3< double >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3<double >::value_type >(val2);
   {
     try {
-      result = (VecMat::Vec3< double > *)new VecMat::Vec3< double >(arg1,arg2);
+      result = (VecMat::Vec3<double > *)new VecMat::Vec3<double >(arg1,arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -22022,7 +22122,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3d__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -22031,8 +22131,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec3d__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< double >::value_type arg1 ;
-  VecMat::Vec3< double > *result = 0 ;
+  VecMat::Vec3<double >::value_type arg1 ;
+  VecMat::Vec3<double > *result = 0 ;
   double val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -22040,12 +22140,12 @@ SWIGINTERN PyObject *_wrap_new_Vec3d__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"O:new_Vec3d",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_double(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3d" "', argument " "1"" of type '" "VecMat::Vec3< double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3d" "', argument " "1"" of type '" "VecMat::Vec3<double >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec3< double >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec3<double >::value_type >(val1);
   {
     try {
-      result = (VecMat::Vec3< double > *)new VecMat::Vec3< double >(arg1);
+      result = (VecMat::Vec3<double > *)new VecMat::Vec3<double >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -22054,7 +22154,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3d__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -22067,7 +22167,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3d(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -22124,33 +22224,28 @@ SWIGINTERN PyObject *_wrap_new_Vec3d(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec3d'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    VecMat::Vec3< double >()\n"
-    "    VecMat::Vec3< double >(VecMat::Vec3< double >::value_type const,VecMat::Vec3< double >::value_type const,VecMat::Vec3< double >::value_type const)\n"
-    "    VecMat::Vec3< double >(VecMat::Vec3< double >::value_type const,VecMat::Vec3< double >::value_type const)\n"
-    "    VecMat::Vec3< double >(VecMat::Vec3< double >::value_type const)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec3d'.\n  Possible C/C++ prototypes are:\n    VecMat::Vec3<(double)>()\n    VecMat::Vec3<(double)>(VecMat::Vec3<double >::value_type const,VecMat::Vec3<double >::value_type const,VecMat::Vec3<double >::value_type const)\n    VecMat::Vec3<(double)>(VecMat::Vec3<double >::value_type const,VecMat::Vec3<double >::value_type const)\n    VecMat::Vec3<(double)>(VecMat::Vec3<double >::value_type const)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3d_x__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
-  VecMat::Vec3< double >::value_type result;
+  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
+  VecMat::Vec3<double >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3d_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_x" "', argument " "1"" of type '" "VecMat::Vec3< double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_x" "', argument " "1"" of type '" "VecMat::Vec3<double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
   {
     try {
-      result = (VecMat::Vec3< double >::value_type)((VecMat::Vec3< double > const *)arg1)->x();
+      result = (VecMat::Vec3<double >::value_type)((VecMat::Vec3<double > const *)arg1)->x();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -22168,23 +22263,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3d_x__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
-  VecMat::Vec3< double >::value_type *result = 0 ;
+  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
+  VecMat::Vec3<double >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3d_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_x" "', argument " "1"" of type '" "VecMat::Vec3< double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_x" "', argument " "1"" of type '" "VecMat::Vec3<double > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
   {
     try {
       {
-        VecMat::Vec3< double >::value_type &_result_ref = (arg1)->x();
-        result = (VecMat::Vec3< double >::value_type *) &_result_ref;
+        VecMat::Vec3<double >::value_type &_result_ref = (arg1)->x();
+        result = (VecMat::Vec3<double >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -22207,14 +22302,14 @@ SWIGINTERN PyObject *_wrap_Vec3d_x(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_double_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3d_x__SWIG_0(self, args);
@@ -22223,7 +22318,7 @@ SWIGINTERN PyObject *_wrap_Vec3d_x(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_double_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3d_x__SWIG_1(self, args);
@@ -22231,31 +22326,28 @@ SWIGINTERN PyObject *_wrap_Vec3d_x(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3d_x'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    x(VecMat::Vec3< double > const *)\n"
-    "    x(VecMat::Vec3< double > *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3d_x'.\n  Possible C/C++ prototypes are:\n    x()\n    x()\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3d_y__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
-  VecMat::Vec3< double >::value_type result;
+  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
+  VecMat::Vec3<double >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3d_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_y" "', argument " "1"" of type '" "VecMat::Vec3< double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_y" "', argument " "1"" of type '" "VecMat::Vec3<double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
   {
     try {
-      result = (VecMat::Vec3< double >::value_type)((VecMat::Vec3< double > const *)arg1)->y();
+      result = (VecMat::Vec3<double >::value_type)((VecMat::Vec3<double > const *)arg1)->y();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -22273,23 +22365,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3d_y__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
-  VecMat::Vec3< double >::value_type *result = 0 ;
+  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
+  VecMat::Vec3<double >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3d_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_y" "', argument " "1"" of type '" "VecMat::Vec3< double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_y" "', argument " "1"" of type '" "VecMat::Vec3<double > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
   {
     try {
       {
-        VecMat::Vec3< double >::value_type &_result_ref = (arg1)->y();
-        result = (VecMat::Vec3< double >::value_type *) &_result_ref;
+        VecMat::Vec3<double >::value_type &_result_ref = (arg1)->y();
+        result = (VecMat::Vec3<double >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -22312,14 +22404,14 @@ SWIGINTERN PyObject *_wrap_Vec3d_y(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_double_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3d_y__SWIG_0(self, args);
@@ -22328,7 +22420,7 @@ SWIGINTERN PyObject *_wrap_Vec3d_y(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_double_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3d_y__SWIG_1(self, args);
@@ -22336,31 +22428,28 @@ SWIGINTERN PyObject *_wrap_Vec3d_y(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3d_y'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    y(VecMat::Vec3< double > const *)\n"
-    "    y(VecMat::Vec3< double > *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3d_y'.\n  Possible C/C++ prototypes are:\n    y()\n    y()\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3d_z__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
-  VecMat::Vec3< double >::value_type result;
+  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
+  VecMat::Vec3<double >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3d_z",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_z" "', argument " "1"" of type '" "VecMat::Vec3< double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_z" "', argument " "1"" of type '" "VecMat::Vec3<double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
   {
     try {
-      result = (VecMat::Vec3< double >::value_type)((VecMat::Vec3< double > const *)arg1)->z();
+      result = (VecMat::Vec3<double >::value_type)((VecMat::Vec3<double > const *)arg1)->z();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -22378,23 +22467,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3d_z__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
-  VecMat::Vec3< double >::value_type *result = 0 ;
+  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
+  VecMat::Vec3<double >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3d_z",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_z" "', argument " "1"" of type '" "VecMat::Vec3< double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_z" "', argument " "1"" of type '" "VecMat::Vec3<double > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
   {
     try {
       {
-        VecMat::Vec3< double >::value_type &_result_ref = (arg1)->z();
-        result = (VecMat::Vec3< double >::value_type *) &_result_ref;
+        VecMat::Vec3<double >::value_type &_result_ref = (arg1)->z();
+        result = (VecMat::Vec3<double >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -22417,14 +22506,14 @@ SWIGINTERN PyObject *_wrap_Vec3d_z(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_double_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3d_z__SWIG_0(self, args);
@@ -22433,7 +22522,7 @@ SWIGINTERN PyObject *_wrap_Vec3d_z(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_double_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3d_z__SWIG_1(self, args);
@@ -22441,18 +22530,15 @@ SWIGINTERN PyObject *_wrap_Vec3d_z(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3d_z'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    z(VecMat::Vec3< double > const *)\n"
-    "    z(VecMat::Vec3< double > *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3d_z'.\n  Possible C/C++ prototypes are:\n    z()\n    z()\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3d_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
-  VecMat::Vec3< double >::value_type arg2 ;
+  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
+  VecMat::Vec3<double >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
@@ -22461,16 +22547,16 @@ SWIGINTERN PyObject *_wrap_Vec3d_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3d_setX",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_setX" "', argument " "1"" of type '" "VecMat::Vec3< double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_setX" "', argument " "1"" of type '" "VecMat::Vec3<double > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3d_setX" "', argument " "2"" of type '" "VecMat::Vec3< double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3d_setX" "', argument " "2"" of type '" "VecMat::Vec3<double >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3< double >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3<double >::value_type >(val2);
   {
     try {
       (arg1)->setX(arg2);
@@ -22491,8 +22577,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3d_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
-  VecMat::Vec3< double >::value_type arg2 ;
+  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
+  VecMat::Vec3<double >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
@@ -22501,16 +22587,16 @@ SWIGINTERN PyObject *_wrap_Vec3d_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3d_setY",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_setY" "', argument " "1"" of type '" "VecMat::Vec3< double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_setY" "', argument " "1"" of type '" "VecMat::Vec3<double > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3d_setY" "', argument " "2"" of type '" "VecMat::Vec3< double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3d_setY" "', argument " "2"" of type '" "VecMat::Vec3<double >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3< double >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3<double >::value_type >(val2);
   {
     try {
       (arg1)->setY(arg2);
@@ -22531,8 +22617,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3d_setZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
-  VecMat::Vec3< double >::value_type arg2 ;
+  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
+  VecMat::Vec3<double >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
@@ -22541,16 +22627,16 @@ SWIGINTERN PyObject *_wrap_Vec3d_setZ(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3d_setZ",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_setZ" "', argument " "1"" of type '" "VecMat::Vec3< double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_setZ" "', argument " "1"" of type '" "VecMat::Vec3<double > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3d_setZ" "', argument " "2"" of type '" "VecMat::Vec3< double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3d_setZ" "', argument " "2"" of type '" "VecMat::Vec3<double >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3< double >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3<double >::value_type >(val2);
   {
     try {
       (arg1)->setZ(arg2);
@@ -22571,9 +22657,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3d___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
-  VecMat::Vec3< double > *arg2 = 0 ;
-  VecMat::Vec3< double > result;
+  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
+  VecMat::Vec3<double > *arg2 = 0 ;
+  VecMat::Vec3<double > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -22582,22 +22668,22 @@ SWIGINTERN PyObject *_wrap_Vec3d___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3d___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d___add__" "', argument " "1"" of type '" "VecMat::Vec3< double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d___add__" "', argument " "1"" of type '" "VecMat::Vec3<double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3d___add__" "', argument " "2"" of type '" "VecMat::Vec3< double > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3d___add__" "', argument " "2"" of type '" "VecMat::Vec3<double > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3d___add__" "', argument " "2"" of type '" "VecMat::Vec3< double > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3d___add__" "', argument " "2"" of type '" "VecMat::Vec3<double > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3< double > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3<double > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec3< double > const *)arg1)->operator +((VecMat::Vec3< double > const &)*arg2);
+      result = ((VecMat::Vec3<double > const *)arg1)->operator +((VecMat::Vec3<double > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -22606,7 +22692,7 @@ SWIGINTERN PyObject *_wrap_Vec3d___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< double >(static_cast< const VecMat::Vec3< double >& >(result))), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<double >(static_cast< const VecMat::Vec3<double >& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -22615,9 +22701,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3d___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
-  VecMat::Vec3< double > *arg2 = 0 ;
-  VecMat::Vec3< double > result;
+  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
+  VecMat::Vec3<double > *arg2 = 0 ;
+  VecMat::Vec3<double > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -22626,22 +22712,22 @@ SWIGINTERN PyObject *_wrap_Vec3d___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3d___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d___sub__" "', argument " "1"" of type '" "VecMat::Vec3< double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d___sub__" "', argument " "1"" of type '" "VecMat::Vec3<double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3d___sub__" "', argument " "2"" of type '" "VecMat::Vec3< double > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3d___sub__" "', argument " "2"" of type '" "VecMat::Vec3<double > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3d___sub__" "', argument " "2"" of type '" "VecMat::Vec3< double > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3d___sub__" "', argument " "2"" of type '" "VecMat::Vec3<double > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3< double > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3<double > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec3< double > const *)arg1)->operator -((VecMat::Vec3< double > const &)*arg2);
+      result = ((VecMat::Vec3<double > const *)arg1)->operator -((VecMat::Vec3<double > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -22650,7 +22736,7 @@ SWIGINTERN PyObject *_wrap_Vec3d___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< double >(static_cast< const VecMat::Vec3< double >& >(result))), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<double >(static_cast< const VecMat::Vec3<double >& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -22659,9 +22745,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3d___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
-  VecMat::Vec3< double >::value_type arg2 ;
-  VecMat::Vec3< double > result;
+  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
+  VecMat::Vec3<double >::value_type arg2 ;
+  VecMat::Vec3<double > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
@@ -22670,19 +22756,19 @@ SWIGINTERN PyObject *_wrap_Vec3d___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3d___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d___mul__" "', argument " "1"" of type '" "VecMat::Vec3< double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d___mul__" "', argument " "1"" of type '" "VecMat::Vec3<double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3d___mul__" "', argument " "2"" of type '" "VecMat::Vec3< double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3d___mul__" "', argument " "2"" of type '" "VecMat::Vec3<double >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3< double >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3<double >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec3< double > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec3<double > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -22691,7 +22777,7 @@ SWIGINTERN PyObject *_wrap_Vec3d___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< double >(static_cast< const VecMat::Vec3< double >& >(result))), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<double >(static_cast< const VecMat::Vec3<double >& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -22700,9 +22786,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3d___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
-  VecMat::Vec3< double >::value_type arg2 ;
-  VecMat::Vec3< double > result;
+  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
+  VecMat::Vec3<double >::value_type arg2 ;
+  VecMat::Vec3<double > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
@@ -22711,19 +22797,19 @@ SWIGINTERN PyObject *_wrap_Vec3d___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3d___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d___div__" "', argument " "1"" of type '" "VecMat::Vec3< double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d___div__" "', argument " "1"" of type '" "VecMat::Vec3<double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3d___div__" "', argument " "2"" of type '" "VecMat::Vec3< double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3d___div__" "', argument " "2"" of type '" "VecMat::Vec3<double >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3< double >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3<double >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec3< double > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec3<double > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -22732,7 +22818,7 @@ SWIGINTERN PyObject *_wrap_Vec3d___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< double >(static_cast< const VecMat::Vec3< double >& >(result))), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<double >(static_cast< const VecMat::Vec3<double >& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -22741,9 +22827,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3d___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
-  VecMat::Vec3< double > *arg2 = 0 ;
-  VecMat::Vec3< double >::value_type result;
+  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
+  VecMat::Vec3<double > *arg2 = 0 ;
+  VecMat::Vec3<double >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -22752,22 +22838,22 @@ SWIGINTERN PyObject *_wrap_Vec3d___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3d___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d___mul__" "', argument " "1"" of type '" "VecMat::Vec3< double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d___mul__" "', argument " "1"" of type '" "VecMat::Vec3<double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3d___mul__" "', argument " "2"" of type '" "VecMat::Vec3< double > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3d___mul__" "', argument " "2"" of type '" "VecMat::Vec3<double > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3d___mul__" "', argument " "2"" of type '" "VecMat::Vec3< double > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3d___mul__" "', argument " "2"" of type '" "VecMat::Vec3<double > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3< double > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3<double > * >(argp2);
   {
     try {
-      result = (VecMat::Vec3< double >::value_type)((VecMat::Vec3< double > const *)arg1)->operator *((VecMat::Vec3< double > const &)*arg2);
+      result = (VecMat::Vec3<double >::value_type)((VecMat::Vec3<double > const *)arg1)->operator *((VecMat::Vec3<double > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -22789,17 +22875,17 @@ SWIGINTERN PyObject *_wrap_Vec3d___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_double_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec3T_double_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec3d___mul____SWIG_1(self, args);
@@ -22809,7 +22895,7 @@ SWIGINTERN PyObject *_wrap_Vec3d___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_double_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -22830,9 +22916,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3d___xor__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
-  VecMat::Vec3< double > *arg2 = 0 ;
-  VecMat::Vec3< double > result;
+  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
+  VecMat::Vec3<double > *arg2 = 0 ;
+  VecMat::Vec3<double > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -22841,22 +22927,22 @@ SWIGINTERN PyObject *_wrap_Vec3d___xor__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3d___xor__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d___xor__" "', argument " "1"" of type '" "VecMat::Vec3< double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d___xor__" "', argument " "1"" of type '" "VecMat::Vec3<double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3d___xor__" "', argument " "2"" of type '" "VecMat::Vec3< double > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3d___xor__" "', argument " "2"" of type '" "VecMat::Vec3<double > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3d___xor__" "', argument " "2"" of type '" "VecMat::Vec3< double > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3d___xor__" "', argument " "2"" of type '" "VecMat::Vec3<double > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3< double > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3<double > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec3< double > const *)arg1)->operator ^((VecMat::Vec3< double > const &)*arg2);
+      result = ((VecMat::Vec3<double > const *)arg1)->operator ^((VecMat::Vec3<double > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -22865,7 +22951,7 @@ SWIGINTERN PyObject *_wrap_Vec3d___xor__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< double >(static_cast< const VecMat::Vec3< double >& >(result))), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<double >(static_cast< const VecMat::Vec3<double >& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -22874,17 +22960,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec3d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
+  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec3d",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec3d" "', argument " "1"" of type '" "VecMat::Vec3< double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec3d" "', argument " "1"" of type '" "VecMat::Vec3<double > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
   {
     try {
       delete arg1;
@@ -22906,8 +22992,8 @@ fail:
 
 SWIGINTERN PyObject *Vec3d_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
@@ -23099,7 +23185,7 @@ SWIGINTERN PyObject *_wrap_Noise_turbulence1(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 5); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -23165,10 +23251,7 @@ SWIGINTERN PyObject *_wrap_Noise_turbulence1(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Noise_turbulence1'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    turbulence1(Noise *,float,float,float,unsigned int)\n"
-    "    turbulence1(Noise *,float,float,float)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Noise_turbulence1'.\n  Possible C/C++ prototypes are:\n    turbulence1(float,float,float,unsigned int)\n    turbulence1(float,float,float)\n");
   return NULL;
 }
 
@@ -23203,7 +23286,7 @@ SWIGINTERN PyObject *_wrap_Noise_turbulence2__SWIG_0(PyObject *SWIGUNUSEDPARM(se
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Noise_turbulence2" "', argument " "1"" of type '" "Noise *""'"); 
   }
   arg1 = reinterpret_cast< Noise * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_float_t,  0 );
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Noise_turbulence2" "', argument " "2"" of type '" "Geometry::Vec2f &""'"); 
   }
@@ -23270,7 +23353,7 @@ SWIGINTERN PyObject *_wrap_Noise_turbulence2__SWIG_1(PyObject *SWIGUNUSEDPARM(se
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Noise_turbulence2" "', argument " "1"" of type '" "Noise *""'"); 
   }
   arg1 = reinterpret_cast< Noise * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_float_t,  0 );
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Noise_turbulence2" "', argument " "2"" of type '" "Geometry::Vec2f &""'"); 
   }
@@ -23312,7 +23395,7 @@ SWIGINTERN PyObject *_wrap_Noise_turbulence2(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 5); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -23323,7 +23406,7 @@ SWIGINTERN PyObject *_wrap_Noise_turbulence2(PyObject *self, PyObject *args) {
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_VecMat__Vec2T_float_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         {
@@ -23349,7 +23432,7 @@ SWIGINTERN PyObject *_wrap_Noise_turbulence2(PyObject *self, PyObject *args) {
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_VecMat__Vec2T_float_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         {
@@ -23376,10 +23459,7 @@ SWIGINTERN PyObject *_wrap_Noise_turbulence2(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Noise_turbulence2'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    turbulence2(Noise *,Geometry::Vec2f &,float,float,unsigned int)\n"
-    "    turbulence2(Noise *,Geometry::Vec2f &,float,float)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Noise_turbulence2'.\n  Possible C/C++ prototypes are:\n    turbulence2(Geometry::Vec2f &,float,float,unsigned int)\n    turbulence2(Geometry::Vec2f &,float,float)\n");
   return NULL;
 }
 
@@ -23414,7 +23494,7 @@ SWIGINTERN PyObject *_wrap_Noise_turbulence3__SWIG_0(PyObject *SWIGUNUSEDPARM(se
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Noise_turbulence3" "', argument " "1"" of type '" "Noise *""'"); 
   }
   arg1 = reinterpret_cast< Noise * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_float_t,  0 );
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tfloat_t,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Noise_turbulence3" "', argument " "2"" of type '" "Geometry::Vec3f &""'"); 
   }
@@ -23481,7 +23561,7 @@ SWIGINTERN PyObject *_wrap_Noise_turbulence3__SWIG_1(PyObject *SWIGUNUSEDPARM(se
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Noise_turbulence3" "', argument " "1"" of type '" "Noise *""'"); 
   }
   arg1 = reinterpret_cast< Noise * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_float_t,  0 );
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tfloat_t,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Noise_turbulence3" "', argument " "2"" of type '" "Geometry::Vec3f &""'"); 
   }
@@ -23523,7 +23603,7 @@ SWIGINTERN PyObject *_wrap_Noise_turbulence3(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 5); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -23534,7 +23614,7 @@ SWIGINTERN PyObject *_wrap_Noise_turbulence3(PyObject *self, PyObject *args) {
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_VecMat__Vec3T_float_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         {
@@ -23560,7 +23640,7 @@ SWIGINTERN PyObject *_wrap_Noise_turbulence3(PyObject *self, PyObject *args) {
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_VecMat__Vec3T_float_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         {
@@ -23587,10 +23667,7 @@ SWIGINTERN PyObject *_wrap_Noise_turbulence3(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Noise_turbulence3'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    turbulence3(Noise *,Geometry::Vec3f &,float,float,unsigned int)\n"
-    "    turbulence3(Noise *,Geometry::Vec3f &,float,float)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Noise_turbulence3'.\n  Possible C/C++ prototypes are:\n    turbulence3(Geometry::Vec3f &,float,float,unsigned int)\n    turbulence3(Geometry::Vec3f &,float,float)\n");
   return NULL;
 }
 
@@ -23654,7 +23731,7 @@ SWIGINTERN PyObject *_wrap_Noise_smoothNoise2(PyObject *SWIGUNUSEDPARM(self), Py
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Noise_smoothNoise2" "', argument " "1"" of type '" "Noise *""'"); 
   }
   arg1 = reinterpret_cast< Noise * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_float_t,  0 );
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Noise_smoothNoise2" "', argument " "2"" of type '" "Geometry::Vec2f &""'"); 
   }
@@ -23698,7 +23775,7 @@ SWIGINTERN PyObject *_wrap_Noise_smoothNoise3(PyObject *SWIGUNUSEDPARM(self), Py
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Noise_smoothNoise3" "', argument " "1"" of type '" "Noise *""'"); 
   }
   arg1 = reinterpret_cast< Noise * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_float_t,  0 );
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tfloat_t,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Noise_smoothNoise3" "', argument " "2"" of type '" "Geometry::Vec3f &""'"); 
   }
@@ -23726,7 +23803,7 @@ fail:
 
 SWIGINTERN PyObject *Noise_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Noise, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -23863,7 +23940,7 @@ SWIGINTERN PyObject *_wrap_new_Material(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 5); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -23910,11 +23987,7 @@ SWIGINTERN PyObject *_wrap_new_Material(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Material'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    Material()\n"
-    "    Material(float const *,float const *,float const *,float const *,float const)\n"
-    "    Material(Material const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Material'.\n  Possible C/C++ prototypes are:\n    Material()\n    Material(float const *,float const *,float const *,float const *,float const)\n    Material(Material const &)\n");
   return NULL;
 }
 
@@ -24623,7 +24696,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_SetDiffuse(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Material_setDiffuse(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   Material *arg1 = (Material *) 0 ;
   float arg2 ;
@@ -24646,35 +24719,35 @@ SWIGINTERN PyObject *_wrap_Material_SetDiffuse(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOOO:Material_SetDiffuse",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OOOOO:Material_setDiffuse",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_SetDiffuse" "', argument " "1"" of type '" "Material *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_setDiffuse" "', argument " "1"" of type '" "Material *""'"); 
   }
   arg1 = reinterpret_cast< Material * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Material_SetDiffuse" "', argument " "2"" of type '" "float""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Material_setDiffuse" "', argument " "2"" of type '" "float""'");
   } 
   arg2 = static_cast< float >(val2);
   ecode3 = SWIG_AsVal_float(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Material_SetDiffuse" "', argument " "3"" of type '" "float""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Material_setDiffuse" "', argument " "3"" of type '" "float""'");
   } 
   arg3 = static_cast< float >(val3);
   ecode4 = SWIG_AsVal_float(obj3, &val4);
   if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Material_SetDiffuse" "', argument " "4"" of type '" "float""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Material_setDiffuse" "', argument " "4"" of type '" "float""'");
   } 
   arg4 = static_cast< float >(val4);
   ecode5 = SWIG_AsVal_float(obj4, &val5);
   if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "Material_SetDiffuse" "', argument " "5"" of type '" "float""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "Material_setDiffuse" "', argument " "5"" of type '" "float""'");
   } 
   arg5 = static_cast< float >(val5);
   {
     try {
-      (arg1)->SetDiffuse(arg2,arg3,arg4,arg5);
+      (arg1)->setDiffuse(arg2,arg3,arg4,arg5);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -24690,7 +24763,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_SetSpecular(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Material_setSpecular(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   Material *arg1 = (Material *) 0 ;
   float arg2 ;
@@ -24713,35 +24786,35 @@ SWIGINTERN PyObject *_wrap_Material_SetSpecular(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOOO:Material_SetSpecular",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OOOOO:Material_setSpecular",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_SetSpecular" "', argument " "1"" of type '" "Material *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_setSpecular" "', argument " "1"" of type '" "Material *""'"); 
   }
   arg1 = reinterpret_cast< Material * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Material_SetSpecular" "', argument " "2"" of type '" "float""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Material_setSpecular" "', argument " "2"" of type '" "float""'");
   } 
   arg2 = static_cast< float >(val2);
   ecode3 = SWIG_AsVal_float(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Material_SetSpecular" "', argument " "3"" of type '" "float""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Material_setSpecular" "', argument " "3"" of type '" "float""'");
   } 
   arg3 = static_cast< float >(val3);
   ecode4 = SWIG_AsVal_float(obj3, &val4);
   if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Material_SetSpecular" "', argument " "4"" of type '" "float""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Material_setSpecular" "', argument " "4"" of type '" "float""'");
   } 
   arg4 = static_cast< float >(val4);
   ecode5 = SWIG_AsVal_float(obj4, &val5);
   if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "Material_SetSpecular" "', argument " "5"" of type '" "float""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "Material_setSpecular" "', argument " "5"" of type '" "float""'");
   } 
   arg5 = static_cast< float >(val5);
   {
     try {
-      (arg1)->SetSpecular(arg2,arg3,arg4,arg5);
+      (arg1)->setSpecular(arg2,arg3,arg4,arg5);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -24757,7 +24830,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_SetAmbient(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Material_setAmbient(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   Material *arg1 = (Material *) 0 ;
   float arg2 ;
@@ -24780,35 +24853,35 @@ SWIGINTERN PyObject *_wrap_Material_SetAmbient(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOOO:Material_SetAmbient",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OOOOO:Material_setAmbient",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_SetAmbient" "', argument " "1"" of type '" "Material *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_setAmbient" "', argument " "1"" of type '" "Material *""'"); 
   }
   arg1 = reinterpret_cast< Material * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Material_SetAmbient" "', argument " "2"" of type '" "float""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Material_setAmbient" "', argument " "2"" of type '" "float""'");
   } 
   arg2 = static_cast< float >(val2);
   ecode3 = SWIG_AsVal_float(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Material_SetAmbient" "', argument " "3"" of type '" "float""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Material_setAmbient" "', argument " "3"" of type '" "float""'");
   } 
   arg3 = static_cast< float >(val3);
   ecode4 = SWIG_AsVal_float(obj3, &val4);
   if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Material_SetAmbient" "', argument " "4"" of type '" "float""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Material_setAmbient" "', argument " "4"" of type '" "float""'");
   } 
   arg4 = static_cast< float >(val4);
   ecode5 = SWIG_AsVal_float(obj4, &val5);
   if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "Material_SetAmbient" "', argument " "5"" of type '" "float""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "Material_setAmbient" "', argument " "5"" of type '" "float""'");
   } 
   arg5 = static_cast< float >(val5);
   {
     try {
-      (arg1)->SetAmbient(arg2,arg3,arg4,arg5);
+      (arg1)->setAmbient(arg2,arg3,arg4,arg5);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -24824,7 +24897,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_SetEmission(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Material_setEmission(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   Material *arg1 = (Material *) 0 ;
   float arg2 ;
@@ -24847,35 +24920,35 @@ SWIGINTERN PyObject *_wrap_Material_SetEmission(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj3 = 0 ;
   PyObject * obj4 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOOOO:Material_SetEmission",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OOOOO:Material_setEmission",&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_SetEmission" "', argument " "1"" of type '" "Material *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_setEmission" "', argument " "1"" of type '" "Material *""'"); 
   }
   arg1 = reinterpret_cast< Material * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Material_SetEmission" "', argument " "2"" of type '" "float""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Material_setEmission" "', argument " "2"" of type '" "float""'");
   } 
   arg2 = static_cast< float >(val2);
   ecode3 = SWIG_AsVal_float(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Material_SetEmission" "', argument " "3"" of type '" "float""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Material_setEmission" "', argument " "3"" of type '" "float""'");
   } 
   arg3 = static_cast< float >(val3);
   ecode4 = SWIG_AsVal_float(obj3, &val4);
   if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Material_SetEmission" "', argument " "4"" of type '" "float""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Material_setEmission" "', argument " "4"" of type '" "float""'");
   } 
   arg4 = static_cast< float >(val4);
   ecode5 = SWIG_AsVal_float(obj4, &val5);
   if (!SWIG_IsOK(ecode5)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "Material_SetEmission" "', argument " "5"" of type '" "float""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "Material_setEmission" "', argument " "5"" of type '" "float""'");
   } 
   arg5 = static_cast< float >(val5);
   {
     try {
-      (arg1)->SetEmission(arg2,arg3,arg4,arg5);
+      (arg1)->setEmission(arg2,arg3,arg4,arg5);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -24891,7 +24964,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_SetShininess(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Material_setShininess(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   Material *arg1 = (Material *) 0 ;
   float arg2 ;
@@ -24902,20 +24975,20 @@ SWIGINTERN PyObject *_wrap_Material_SetShininess(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Material_SetShininess",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:Material_setShininess",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Material, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_SetShininess" "', argument " "1"" of type '" "Material *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Material_setShininess" "', argument " "1"" of type '" "Material *""'"); 
   }
   arg1 = reinterpret_cast< Material * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Material_SetShininess" "', argument " "2"" of type '" "float""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Material_setShininess" "', argument " "2"" of type '" "float""'");
   } 
   arg2 = static_cast< float >(val2);
   {
     try {
-      (arg1)->SetShininess(arg2);
+      (arg1)->setShininess(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -25021,18 +25094,18 @@ fail:
 
 SWIGINTERN PyObject *Material_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Material, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN int Swig_var_POINT_set(PyObject *) {
+SWIGINTERN int POINT_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable POINT is read-only.");
   return 1;
 }
 
 
-SWIGINTERN PyObject *Swig_var_POINT_get(void) {
+SWIGINTERN PyObject *POINT_get(void) {
   PyObject *pyobj = 0;
   
   pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::POINT));
@@ -25040,13 +25113,13 @@ SWIGINTERN PyObject *Swig_var_POINT_get(void) {
 }
 
 
-SWIGINTERN int Swig_var_S_VERTEX_set(PyObject *) {
+SWIGINTERN int S_VERTEX_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable S_VERTEX is read-only.");
   return 1;
 }
 
 
-SWIGINTERN PyObject *Swig_var_S_VERTEX_get(void) {
+SWIGINTERN PyObject *S_VERTEX_get(void) {
   PyObject *pyobj = 0;
   
   pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::S_VERTEX));
@@ -25054,13 +25127,13 @@ SWIGINTERN PyObject *Swig_var_S_VERTEX_get(void) {
 }
 
 
-SWIGINTERN int Swig_var_VIEW_VERTEX_set(PyObject *) {
+SWIGINTERN int VIEW_VERTEX_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable VIEW_VERTEX is read-only.");
   return 1;
 }
 
 
-SWIGINTERN PyObject *Swig_var_VIEW_VERTEX_get(void) {
+SWIGINTERN PyObject *VIEW_VERTEX_get(void) {
   PyObject *pyobj = 0;
   
   pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::VIEW_VERTEX));
@@ -25068,13 +25141,13 @@ SWIGINTERN PyObject *Swig_var_VIEW_VERTEX_get(void) {
 }
 
 
-SWIGINTERN int Swig_var_NON_T_VERTEX_set(PyObject *) {
+SWIGINTERN int NON_T_VERTEX_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable NON_T_VERTEX is read-only.");
   return 1;
 }
 
 
-SWIGINTERN PyObject *Swig_var_NON_T_VERTEX_get(void) {
+SWIGINTERN PyObject *NON_T_VERTEX_get(void) {
   PyObject *pyobj = 0;
   
   pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::NON_T_VERTEX));
@@ -25082,13 +25155,13 @@ SWIGINTERN PyObject *Swig_var_NON_T_VERTEX_get(void) {
 }
 
 
-SWIGINTERN int Swig_var_T_VERTEX_set(PyObject *) {
+SWIGINTERN int T_VERTEX_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable T_VERTEX is read-only.");
   return 1;
 }
 
 
-SWIGINTERN PyObject *Swig_var_T_VERTEX_get(void) {
+SWIGINTERN PyObject *T_VERTEX_get(void) {
   PyObject *pyobj = 0;
   
   pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::T_VERTEX));
@@ -25096,13 +25169,13 @@ SWIGINTERN PyObject *Swig_var_T_VERTEX_get(void) {
 }
 
 
-SWIGINTERN int Swig_var_CUSP_set(PyObject *) {
+SWIGINTERN int CUSP_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable CUSP is read-only.");
   return 1;
 }
 
 
-SWIGINTERN PyObject *Swig_var_CUSP_get(void) {
+SWIGINTERN PyObject *CUSP_get(void) {
   PyObject *pyobj = 0;
   
   pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::CUSP));
@@ -25110,13 +25183,13 @@ SWIGINTERN PyObject *Swig_var_CUSP_get(void) {
 }
 
 
-SWIGINTERN int Swig_var_NO_FEATURE_set(PyObject *) {
+SWIGINTERN int NO_FEATURE_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable NO_FEATURE is read-only.");
   return 1;
 }
 
 
-SWIGINTERN PyObject *Swig_var_NO_FEATURE_get(void) {
+SWIGINTERN PyObject *NO_FEATURE_get(void) {
   PyObject *pyobj = 0;
   
   pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::NO_FEATURE));
@@ -25124,13 +25197,13 @@ SWIGINTERN PyObject *Swig_var_NO_FEATURE_get(void) {
 }
 
 
-SWIGINTERN int Swig_var_SILHOUETTE_set(PyObject *) {
+SWIGINTERN int SILHOUETTE_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable SILHOUETTE is read-only.");
   return 1;
 }
 
 
-SWIGINTERN PyObject *Swig_var_SILHOUETTE_get(void) {
+SWIGINTERN PyObject *SILHOUETTE_get(void) {
   PyObject *pyobj = 0;
   
   pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::SILHOUETTE));
@@ -25138,13 +25211,13 @@ SWIGINTERN PyObject *Swig_var_SILHOUETTE_get(void) {
 }
 
 
-SWIGINTERN int Swig_var_BORDER_set(PyObject *) {
+SWIGINTERN int BORDER_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable BORDER is read-only.");
   return 1;
 }
 
 
-SWIGINTERN PyObject *Swig_var_BORDER_get(void) {
+SWIGINTERN PyObject *BORDER_get(void) {
   PyObject *pyobj = 0;
   
   pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::BORDER));
@@ -25152,13 +25225,13 @@ SWIGINTERN PyObject *Swig_var_BORDER_get(void) {
 }
 
 
-SWIGINTERN int Swig_var_CREASE_set(PyObject *) {
+SWIGINTERN int CREASE_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable CREASE is read-only.");
   return 1;
 }
 
 
-SWIGINTERN PyObject *Swig_var_CREASE_get(void) {
+SWIGINTERN PyObject *CREASE_get(void) {
   PyObject *pyobj = 0;
   
   pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::CREASE));
@@ -25166,13 +25239,13 @@ SWIGINTERN PyObject *Swig_var_CREASE_get(void) {
 }
 
 
-SWIGINTERN int Swig_var_RIDGE_set(PyObject *) {
+SWIGINTERN int RIDGE_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable RIDGE is read-only.");
   return 1;
 }
 
 
-SWIGINTERN PyObject *Swig_var_RIDGE_get(void) {
+SWIGINTERN PyObject *RIDGE_get(void) {
   PyObject *pyobj = 0;
   
   pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::RIDGE));
@@ -25180,13 +25253,13 @@ SWIGINTERN PyObject *Swig_var_RIDGE_get(void) {
 }
 
 
-SWIGINTERN int Swig_var_VALLEY_set(PyObject *) {
+SWIGINTERN int VALLEY_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable VALLEY is read-only.");
   return 1;
 }
 
 
-SWIGINTERN PyObject *Swig_var_VALLEY_get(void) {
+SWIGINTERN PyObject *VALLEY_get(void) {
   PyObject *pyobj = 0;
   
   pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::VALLEY));
@@ -25194,13 +25267,13 @@ SWIGINTERN PyObject *Swig_var_VALLEY_get(void) {
 }
 
 
-SWIGINTERN int Swig_var_SUGGESTIVE_CONTOUR_set(PyObject *) {
+SWIGINTERN int SUGGESTIVE_CONTOUR_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable SUGGESTIVE_CONTOUR is read-only.");
   return 1;
 }
 
 
-SWIGINTERN PyObject *Swig_var_SUGGESTIVE_CONTOUR_get(void) {
+SWIGINTERN PyObject *SUGGESTIVE_CONTOUR_get(void) {
   PyObject *pyobj = 0;
   
   pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::SUGGESTIVE_CONTOUR));
@@ -25393,7 +25466,7 @@ SWIGINTERN PyObject *_wrap_Interface0D_getPoint3D(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -25521,7 +25594,7 @@ SWIGINTERN PyObject *_wrap_Interface0D_getPoint2D(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -25789,7 +25862,7 @@ fail:
 
 SWIGINTERN PyObject *Interface0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Interface0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -26356,7 +26429,7 @@ SWIGINTERN PyObject *_wrap_Interface0DIteratorNested_getPoint3D(PyObject *SWIGUN
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -26484,7 +26557,7 @@ SWIGINTERN PyObject *_wrap_Interface0DIteratorNested_getPoint2D(PyObject *SWIGUN
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -26729,7 +26802,7 @@ fail:
 
 SWIGINTERN PyObject *Interface0DIteratorNested_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Interface0DIteratorNested, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -26830,7 +26903,7 @@ SWIGINTERN PyObject *_wrap_new_Interface0DIterator(PyObject *self, PyObject *arg
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -26856,11 +26929,7 @@ SWIGINTERN PyObject *_wrap_new_Interface0DIterator(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Interface0DIterator'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    Interface0DIterator(Interface0DIteratorNested *)\n"
-    "    Interface0DIterator()\n"
-    "    Interface0DIterator(Interface0DIterator const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Interface0DIterator'.\n  Possible C/C++ prototypes are:\n    Interface0DIterator(Interface0DIteratorNested *)\n    Interface0DIterator()\n    Interface0DIterator(Interface0DIterator const &)\n");
   return NULL;
 }
 
@@ -27395,7 +27464,7 @@ SWIGINTERN PyObject *_wrap_Interface0DIterator_getPoint3D(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -27523,7 +27592,7 @@ SWIGINTERN PyObject *_wrap_Interface0DIterator_getPoint2D(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -27768,11 +27837,34 @@ fail:
 
 SWIGINTERN PyObject *Interface0DIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Interface0DIterator, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
+SWIGINTERN PyObject *_wrap_new_Interface1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  Interface1D *result = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)":new_Interface1D")) SWIG_fail;
+  {
+    try {
+      result = (Interface1D *)new Interface1D();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Interface1D, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_delete_Interface1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   Interface1D *arg1 = (Interface1D *) 0 ;
@@ -27980,7 +28072,7 @@ SWIGINTERN PyObject *_wrap_Interface1D_pointsBegin(PyObject *self, PyObject *arg
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -28010,10 +28102,7 @@ SWIGINTERN PyObject *_wrap_Interface1D_pointsBegin(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Interface1D_pointsBegin'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    pointsBegin(Interface1D *,float)\n"
-    "    pointsBegin(Interface1D *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Interface1D_pointsBegin'.\n  Possible C/C++ prototypes are:\n    pointsBegin(float)\n    pointsBegin()\n");
   return NULL;
 }
 
@@ -28097,7 +28186,7 @@ SWIGINTERN PyObject *_wrap_Interface1D_pointsEnd(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -28127,10 +28216,7 @@ SWIGINTERN PyObject *_wrap_Interface1D_pointsEnd(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Interface1D_pointsEnd'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    pointsEnd(Interface1D *,float)\n"
-    "    pointsEnd(Interface1D *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Interface1D_pointsEnd'.\n  Possible C/C++ prototypes are:\n    pointsEnd(float)\n    pointsEnd()\n");
   return NULL;
 }
 
@@ -28305,14 +28391,14 @@ fail:
 
 SWIGINTERN PyObject *Interface1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Interface1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_integrateUnsigned__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D< unsigned int > *arg1 = 0 ;
+  UnaryFunction0D<unsigned int > *arg1 = 0 ;
   Interface0DIterator arg2 ;
   Interface0DIterator arg3 ;
   IntegrationType arg4 ;
@@ -28331,14 +28417,14 @@ SWIGINTERN PyObject *_wrap_integrateUnsigned__SWIG_0(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:integrateUnsigned",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DT_unsigned_int_t,  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DTunsigned_int_t,  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "integrateUnsigned" "', argument " "1"" of type '" "UnaryFunction0D< unsigned int > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "integrateUnsigned" "', argument " "1"" of type '" "UnaryFunction0D<unsigned int > &""'"); 
   }
   if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateUnsigned" "', argument " "1"" of type '" "UnaryFunction0D< unsigned int > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateUnsigned" "', argument " "1"" of type '" "UnaryFunction0D<unsigned int > &""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D< unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D<unsigned int > * >(argp1);
   {
     res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0  | 0);
     if (!SWIG_IsOK(res2)) {
@@ -28372,7 +28458,7 @@ SWIGINTERN PyObject *_wrap_integrateUnsigned__SWIG_0(PyObject *SWIGUNUSEDPARM(se
   arg4 = static_cast< IntegrationType >(val4);
   {
     try {
-      result = (unsigned int)integrate< unsigned int >(*arg1,arg2,arg3,arg4);
+      result = (unsigned int)integrate<unsigned int >(*arg1,arg2,arg3,arg4);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -28390,7 +28476,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_integrateUnsigned__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D< unsigned int > *arg1 = 0 ;
+  UnaryFunction0D<unsigned int > *arg1 = 0 ;
   Interface0DIterator arg2 ;
   Interface0DIterator arg3 ;
   unsigned int result;
@@ -28405,14 +28491,14 @@ SWIGINTERN PyObject *_wrap_integrateUnsigned__SWIG_1(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:integrateUnsigned",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DT_unsigned_int_t,  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DTunsigned_int_t,  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "integrateUnsigned" "', argument " "1"" of type '" "UnaryFunction0D< unsigned int > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "integrateUnsigned" "', argument " "1"" of type '" "UnaryFunction0D<unsigned int > &""'"); 
   }
   if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateUnsigned" "', argument " "1"" of type '" "UnaryFunction0D< unsigned int > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateUnsigned" "', argument " "1"" of type '" "UnaryFunction0D<unsigned int > &""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D< unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D<unsigned int > * >(argp1);
   {
     res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0  | 0);
     if (!SWIG_IsOK(res2)) {
@@ -28441,7 +28527,7 @@ SWIGINTERN PyObject *_wrap_integrateUnsigned__SWIG_1(PyObject *SWIGUNUSEDPARM(se
   }
   {
     try {
-      result = (unsigned int)integrate< unsigned int >(*arg1,arg2,arg3);
+      result = (unsigned int)integrate<unsigned int >(*arg1,arg2,arg3);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -28463,14 +28549,14 @@ SWIGINTERN PyObject *_wrap_integrateUnsigned(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 3) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DT_unsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DTunsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Interface0DIterator, 0);
@@ -28487,7 +28573,7 @@ SWIGINTERN PyObject *_wrap_integrateUnsigned(PyObject *self, PyObject *args) {
   if (argc == 4) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DT_unsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DTunsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Interface0DIterator, 0);
@@ -28509,17 +28595,14 @@ SWIGINTERN PyObject *_wrap_integrateUnsigned(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'integrateUnsigned'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    integrate< unsigned int >(UnaryFunction0D< unsigned int > &,Interface0DIterator,Interface0DIterator,IntegrationType)\n"
-    "    integrate< unsigned int >(UnaryFunction0D< unsigned int > &,Interface0DIterator,Interface0DIterator)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'integrateUnsigned'.\n  Possible C/C++ prototypes are:\n    integrate<(unsigned int)>(UnaryFunction0D<unsigned int > &,Interface0DIterator,Interface0DIterator,IntegrationType)\n    integrate<(unsigned int)>(UnaryFunction0D<unsigned int > &,Interface0DIterator,Interface0DIterator)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_integrateFloat__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D< float > *arg1 = 0 ;
+  UnaryFunction0D<float > *arg1 = 0 ;
   Interface0DIterator arg2 ;
   Interface0DIterator arg3 ;
   IntegrationType arg4 ;
@@ -28538,14 +28621,14 @@ SWIGINTERN PyObject *_wrap_integrateFloat__SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:integrateFloat",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DT_float_t,  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DTfloat_t,  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "integrateFloat" "', argument " "1"" of type '" "UnaryFunction0D< float > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "integrateFloat" "', argument " "1"" of type '" "UnaryFunction0D<float > &""'"); 
   }
   if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateFloat" "', argument " "1"" of type '" "UnaryFunction0D< float > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateFloat" "', argument " "1"" of type '" "UnaryFunction0D<float > &""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D< float > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D<float > * >(argp1);
   {
     res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0  | 0);
     if (!SWIG_IsOK(res2)) {
@@ -28579,7 +28662,7 @@ SWIGINTERN PyObject *_wrap_integrateFloat__SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   arg4 = static_cast< IntegrationType >(val4);
   {
     try {
-      result = (float)integrate< float >(*arg1,arg2,arg3,arg4);
+      result = (float)integrate<float >(*arg1,arg2,arg3,arg4);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -28597,7 +28680,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_integrateFloat__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D< float > *arg1 = 0 ;
+  UnaryFunction0D<float > *arg1 = 0 ;
   Interface0DIterator arg2 ;
   Interface0DIterator arg3 ;
   float result;
@@ -28612,14 +28695,14 @@ SWIGINTERN PyObject *_wrap_integrateFloat__SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:integrateFloat",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DT_float_t,  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DTfloat_t,  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "integrateFloat" "', argument " "1"" of type '" "UnaryFunction0D< float > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "integrateFloat" "', argument " "1"" of type '" "UnaryFunction0D<float > &""'"); 
   }
   if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateFloat" "', argument " "1"" of type '" "UnaryFunction0D< float > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateFloat" "', argument " "1"" of type '" "UnaryFunction0D<float > &""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D< float > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D<float > * >(argp1);
   {
     res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0  | 0);
     if (!SWIG_IsOK(res2)) {
@@ -28648,7 +28731,7 @@ SWIGINTERN PyObject *_wrap_integrateFloat__SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   }
   {
     try {
-      result = (float)integrate< float >(*arg1,arg2,arg3);
+      result = (float)integrate<float >(*arg1,arg2,arg3);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -28670,14 +28753,14 @@ SWIGINTERN PyObject *_wrap_integrateFloat(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 3) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DT_float_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DTfloat_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Interface0DIterator, 0);
@@ -28694,7 +28777,7 @@ SWIGINTERN PyObject *_wrap_integrateFloat(PyObject *self, PyObject *args) {
   if (argc == 4) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DT_float_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DTfloat_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Interface0DIterator, 0);
@@ -28716,17 +28799,14 @@ SWIGINTERN PyObject *_wrap_integrateFloat(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'integrateFloat'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    integrate< float >(UnaryFunction0D< float > &,Interface0DIterator,Interface0DIterator,IntegrationType)\n"
-    "    integrate< float >(UnaryFunction0D< float > &,Interface0DIterator,Interface0DIterator)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'integrateFloat'.\n  Possible C/C++ prototypes are:\n    integrate<(float)>(UnaryFunction0D<float > &,Interface0DIterator,Interface0DIterator,IntegrationType)\n    integrate<(float)>(UnaryFunction0D<float > &,Interface0DIterator,Interface0DIterator)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_integrateDouble__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D< double > *arg1 = 0 ;
+  UnaryFunction0D<double > *arg1 = 0 ;
   Interface0DIterator arg2 ;
   Interface0DIterator arg3 ;
   IntegrationType arg4 ;
@@ -28745,14 +28825,14 @@ SWIGINTERN PyObject *_wrap_integrateDouble__SWIG_0(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:integrateDouble",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DT_double_t,  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DTdouble_t,  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "integrateDouble" "', argument " "1"" of type '" "UnaryFunction0D< double > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "integrateDouble" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
   }
   if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateDouble" "', argument " "1"" of type '" "UnaryFunction0D< double > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateDouble" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D< double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D<double > * >(argp1);
   {
     res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0  | 0);
     if (!SWIG_IsOK(res2)) {
@@ -28786,7 +28866,7 @@ SWIGINTERN PyObject *_wrap_integrateDouble__SWIG_0(PyObject *SWIGUNUSEDPARM(self
   arg4 = static_cast< IntegrationType >(val4);
   {
     try {
-      result = (double)integrate< double >(*arg1,arg2,arg3,arg4);
+      result = (double)integrate<double >(*arg1,arg2,arg3,arg4);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -28804,7 +28884,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_integrateDouble__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D< double > *arg1 = 0 ;
+  UnaryFunction0D<double > *arg1 = 0 ;
   Interface0DIterator arg2 ;
   Interface0DIterator arg3 ;
   double result;
@@ -28819,14 +28899,14 @@ SWIGINTERN PyObject *_wrap_integrateDouble__SWIG_1(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:integrateDouble",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DT_double_t,  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DTdouble_t,  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "integrateDouble" "', argument " "1"" of type '" "UnaryFunction0D< double > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "integrateDouble" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
   }
   if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateDouble" "', argument " "1"" of type '" "UnaryFunction0D< double > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateDouble" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D< double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D<double > * >(argp1);
   {
     res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0  | 0);
     if (!SWIG_IsOK(res2)) {
@@ -28855,7 +28935,7 @@ SWIGINTERN PyObject *_wrap_integrateDouble__SWIG_1(PyObject *SWIGUNUSEDPARM(self
   }
   {
     try {
-      result = (double)integrate< double >(*arg1,arg2,arg3);
+      result = (double)integrate<double >(*arg1,arg2,arg3);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -28877,14 +28957,14 @@ SWIGINTERN PyObject *_wrap_integrateDouble(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 3) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DT_double_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DTdouble_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Interface0DIterator, 0);
@@ -28901,7 +28981,7 @@ SWIGINTERN PyObject *_wrap_integrateDouble(PyObject *self, PyObject *args) {
   if (argc == 4) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DT_double_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DTdouble_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Interface0DIterator, 0);
@@ -28923,10 +29003,7 @@ SWIGINTERN PyObject *_wrap_integrateDouble(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'integrateDouble'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    integrate< double >(UnaryFunction0D< double > &,Interface0DIterator,Interface0DIterator,IntegrationType)\n"
-    "    integrate< double >(UnaryFunction0D< double > &,Interface0DIterator,Interface0DIterator)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'integrateDouble'.\n  Possible C/C++ prototypes are:\n    integrate<(double)>(UnaryFunction0D<double > &,Interface0DIterator,Interface0DIterator,IntegrationType)\n    integrate<(double)>(UnaryFunction0D<double > &,Interface0DIterator,Interface0DIterator)\n");
   return NULL;
 }
 
@@ -29084,7 +29161,7 @@ SWIGINTERN PyObject *_wrap_SVertex_getPoint3D(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -29212,7 +29289,7 @@ SWIGINTERN PyObject *_wrap_SVertex_getPoint2D(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -29542,7 +29619,7 @@ SWIGINTERN PyObject *_wrap_new_SVertex__SWIG_1(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:new_SVertex",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_SVertex" "', argument " "1"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -29617,7 +29694,7 @@ SWIGINTERN PyObject *_wrap_new_SVertex(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -29635,7 +29712,7 @@ SWIGINTERN PyObject *_wrap_new_SVertex(PyObject *self, PyObject *args) {
   }
   if (argc == 2) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_VecMat__Vec3T_double_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Id, 0);
@@ -29647,11 +29724,7 @@ SWIGINTERN PyObject *_wrap_new_SVertex(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_SVertex'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    SVertex()\n"
-    "    SVertex(Geometry::Vec3r const &,Id const &)\n"
-    "    SVertex(SVertex &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_SVertex'.\n  Possible C/C++ prototypes are:\n    SVertex()\n    SVertex(Geometry::Vec3r const &,Id const &)\n    SVertex(SVertex &)\n");
   return NULL;
 }
 
@@ -29792,7 +29865,7 @@ SWIGINTERN PyObject *_wrap_SVertex_point3D(PyObject *SWIGUNUSEDPARM(self), PyObj
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -29827,7 +29900,7 @@ SWIGINTERN PyObject *_wrap_SVertex_point2D(PyObject *SWIGUNUSEDPARM(self), PyObj
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -29837,7 +29910,7 @@ fail:
 SWIGINTERN PyObject *_wrap_SVertex_normals(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SVertex *arg1 = (SVertex *) 0 ;
-  SwigValueWrapper< set< VecMat::Vec3< double > > > result;
+  SwigValueWrapper<set<VecMat::Vec3<double > > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -29859,7 +29932,7 @@ SWIGINTERN PyObject *_wrap_SVertex_normals(PyObject *SWIGUNUSEDPARM(self), PyObj
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new set< Geometry::Vec3r >(static_cast< const set< Geometry::Vec3r >& >(result))), SWIGTYPE_p_setT_VecMat__Vec3T_double_t_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new set<Geometry::Vec3r >(static_cast< const set<Geometry::Vec3r >& >(result))), SWIGTYPE_p_setTVecMat__Vec3Tdouble_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -29901,7 +29974,7 @@ fail:
 SWIGINTERN PyObject *_wrap_SVertex_fedges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SVertex *arg1 = (SVertex *) 0 ;
-  std::vector< FEdge * > *result = 0 ;
+  std::vector<FEdge * > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -29915,8 +29988,8 @@ SWIGINTERN PyObject *_wrap_SVertex_fedges(PyObject *SWIGUNUSEDPARM(self), PyObje
   {
     try {
       {
-        std::vector< FEdge * > const &_result_ref = (arg1)->fedges();
-        result = (std::vector< FEdge * > *) &_result_ref;
+        std::vector<FEdge * > const &_result_ref = (arg1)->fedges();
+        result = (std::vector<FEdge * > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -29926,7 +29999,7 @@ SWIGINTERN PyObject *_wrap_SVertex_fedges(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -30093,7 +30166,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_SetPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SVertex_setPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SVertex *arg1 = (SVertex *) 0 ;
   Geometry::Vec3r *arg2 = 0 ;
@@ -30104,23 +30177,23 @@ SWIGINTERN PyObject *_wrap_SVertex_SetPoint3D(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SVertex_SetPoint3D",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:SVertex_setPoint3D",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_SetPoint3D" "', argument " "1"" of type '" "SVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_setPoint3D" "', argument " "1"" of type '" "SVertex *""'"); 
   }
   arg1 = reinterpret_cast< SVertex * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVertex_SetPoint3D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVertex_setPoint3D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SVertex_SetPoint3D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SVertex_setPoint3D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
   arg2 = reinterpret_cast< Geometry::Vec3r * >(argp2);
   {
     try {
-      (arg1)->SetPoint3D((Geometry::Vec3r const &)*arg2);
+      (arg1)->setPoint3D((Geometry::Vec3r const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -30136,7 +30209,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_SetPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SVertex_setPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SVertex *arg1 = (SVertex *) 0 ;
   Geometry::Vec3r *arg2 = 0 ;
@@ -30147,23 +30220,23 @@ SWIGINTERN PyObject *_wrap_SVertex_SetPoint2D(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SVertex_SetPoint2D",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:SVertex_setPoint2D",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_SetPoint2D" "', argument " "1"" of type '" "SVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_setPoint2D" "', argument " "1"" of type '" "SVertex *""'"); 
   }
   arg1 = reinterpret_cast< SVertex * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVertex_SetPoint2D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVertex_setPoint2D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SVertex_SetPoint2D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SVertex_setPoint2D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
   arg2 = reinterpret_cast< Geometry::Vec3r * >(argp2);
   {
     try {
-      (arg1)->SetPoint2D((Geometry::Vec3r const &)*arg2);
+      (arg1)->setPoint2D((Geometry::Vec3r const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -30196,7 +30269,7 @@ SWIGINTERN PyObject *_wrap_SVertex_AddNormal(PyObject *SWIGUNUSEDPARM(self), PyO
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_AddNormal" "', argument " "1"" of type '" "SVertex *""'"); 
   }
   arg1 = reinterpret_cast< SVertex * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVertex_AddNormal" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -30352,7 +30425,7 @@ SWIGINTERN PyObject *_wrap_SVertex_setDirectionFredo(PyObject *SWIGUNUSEDPARM(se
   }
   arg1 = reinterpret_cast< SVertex * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVertex_setDirectionFredo" "', argument " "2"" of type '" "Geometry::Vec2r""'"); 
     }  
@@ -30439,14 +30512,14 @@ SWIGINTERN PyObject *_wrap_SVertex_directionFredo(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2r(static_cast< const Geometry::Vec2r& >(result))), SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2r(static_cast< const Geometry::Vec2r& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_SetId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SVertex_setId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SVertex *arg1 = (SVertex *) 0 ;
   Id *arg2 = 0 ;
@@ -30457,23 +30530,23 @@ SWIGINTERN PyObject *_wrap_SVertex_SetId(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SVertex_SetId",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:SVertex_setId",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_SetId" "', argument " "1"" of type '" "SVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_setId" "', argument " "1"" of type '" "SVertex *""'"); 
   }
   arg1 = reinterpret_cast< SVertex * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Id,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVertex_SetId" "', argument " "2"" of type '" "Id const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVertex_setId" "', argument " "2"" of type '" "Id const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SVertex_SetId" "', argument " "2"" of type '" "Id const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SVertex_setId" "', argument " "2"" of type '" "Id const &""'"); 
   }
   arg2 = reinterpret_cast< Id * >(argp2);
   {
     try {
-      (arg1)->SetId((Id const &)*arg2);
+      (arg1)->setId((Id const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -30489,10 +30562,10 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_SetFEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SVertex_setFEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SVertex *arg1 = (SVertex *) 0 ;
-  std::vector< FEdge * > *arg2 = 0 ;
+  std::vector<FEdge * > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -30500,23 +30573,23 @@ SWIGINTERN PyObject *_wrap_SVertex_SetFEdges(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SVertex_SetFEdges",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:SVertex_setFEdges",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_SetFEdges" "', argument " "1"" of type '" "SVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_setFEdges" "', argument " "1"" of type '" "SVertex *""'"); 
   }
   arg1 = reinterpret_cast< SVertex * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVertex_SetFEdges" "', argument " "2"" of type '" "std::vector< FEdge * > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVertex_setFEdges" "', argument " "2"" of type '" "std::vector<FEdge * > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SVertex_SetFEdges" "', argument " "2"" of type '" "std::vector< FEdge * > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SVertex_setFEdges" "', argument " "2"" of type '" "std::vector<FEdge * > const &""'"); 
   }
-  arg2 = reinterpret_cast< std::vector< FEdge * > * >(argp2);
+  arg2 = reinterpret_cast< std::vector<FEdge * > * >(argp2);
   {
     try {
-      (arg1)->SetFEdges((std::vector< FEdge * > const &)*arg2);
+      (arg1)->setFEdges((std::vector<FEdge * > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -30532,7 +30605,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_SetShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SVertex_setShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SVertex *arg1 = (SVertex *) 0 ;
   SShape *arg2 = (SShape *) 0 ;
@@ -30543,20 +30616,20 @@ SWIGINTERN PyObject *_wrap_SVertex_SetShape(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SVertex_SetShape",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:SVertex_setShape",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_SetShape" "', argument " "1"" of type '" "SVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_setShape" "', argument " "1"" of type '" "SVertex *""'"); 
   }
   arg1 = reinterpret_cast< SVertex * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SShape, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVertex_SetShape" "', argument " "2"" of type '" "SShape *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVertex_setShape" "', argument " "2"" of type '" "SShape *""'"); 
   }
   arg2 = reinterpret_cast< SShape * >(argp2);
   {
     try {
-      (arg1)->SetShape(arg2);
+      (arg1)->setShape(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -30572,7 +30645,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_SetViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SVertex_setViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SVertex *arg1 = (SVertex *) 0 ;
   ViewVertex *arg2 = (ViewVertex *) 0 ;
@@ -30583,20 +30656,20 @@ SWIGINTERN PyObject *_wrap_SVertex_SetViewVertex(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SVertex_SetViewVertex",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:SVertex_setViewVertex",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SVertex, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_SetViewVertex" "', argument " "1"" of type '" "SVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_setViewVertex" "', argument " "1"" of type '" "SVertex *""'"); 
   }
   arg1 = reinterpret_cast< SVertex * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewVertex, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVertex_SetViewVertex" "', argument " "2"" of type '" "ViewVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVertex_setViewVertex" "', argument " "2"" of type '" "ViewVertex *""'"); 
   }
   arg2 = reinterpret_cast< ViewVertex * >(argp2);
   {
     try {
-      (arg1)->SetViewVertex(arg2);
+      (arg1)->setViewVertex(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -30761,7 +30834,7 @@ SWIGINTERN PyObject *_wrap_SVertex_point2d(PyObject *SWIGUNUSEDPARM(self), PyObj
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -30796,7 +30869,7 @@ SWIGINTERN PyObject *_wrap_SVertex_point3d(PyObject *SWIGUNUSEDPARM(self), PyObj
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -30828,7 +30901,7 @@ SWIGINTERN PyObject *_wrap_SVertex_normal(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -30905,7 +30978,7 @@ SWIGINTERN PyObject *_wrap_SVertex_shape(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -30929,10 +31002,7 @@ SWIGINTERN PyObject *_wrap_SVertex_shape(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SVertex_shape'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    shape(SVertex *)\n"
-    "    shape(SVertex const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SVertex_shape'.\n  Possible C/C++ prototypes are:\n    shape()\n    shape()\n");
   return NULL;
 }
 
@@ -31262,7 +31332,7 @@ fail:
 
 SWIGINTERN PyObject *SVertex_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_SVertex, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -31519,7 +31589,7 @@ SWIGINTERN PyObject *_wrap_new_FEdge(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -31551,11 +31621,7 @@ SWIGINTERN PyObject *_wrap_new_FEdge(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_FEdge'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    FEdge()\n"
-    "    FEdge(SVertex *,SVertex *)\n"
-    "    FEdge(FEdge &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_FEdge'.\n  Possible C/C++ prototypes are:\n    FEdge()\n    FEdge(SVertex *,SVertex *)\n    FEdge(FEdge &)\n");
   return NULL;
 }
 
@@ -31905,7 +31971,7 @@ SWIGINTERN PyObject *_wrap_FEdge_center3d(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -31937,7 +32003,7 @@ SWIGINTERN PyObject *_wrap_FEdge_center2d(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -32007,7 +32073,7 @@ SWIGINTERN PyObject *_wrap_FEdge_getOccludeeIntersection(PyObject *SWIGUNUSEDPAR
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -32078,7 +32144,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_SetVertexA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FEdge_setVertexA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FEdge *arg1 = (FEdge *) 0 ;
   SVertex *arg2 = (SVertex *) 0 ;
@@ -32089,20 +32155,20 @@ SWIGINTERN PyObject *_wrap_FEdge_SetVertexA(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FEdge_SetVertexA",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdge_setVertexA",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_SetVertexA" "', argument " "1"" of type '" "FEdge *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_setVertexA" "', argument " "1"" of type '" "FEdge *""'"); 
   }
   arg1 = reinterpret_cast< FEdge * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SVertex, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdge_SetVertexA" "', argument " "2"" of type '" "SVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdge_setVertexA" "', argument " "2"" of type '" "SVertex *""'"); 
   }
   arg2 = reinterpret_cast< SVertex * >(argp2);
   {
     try {
-      (arg1)->SetVertexA(arg2);
+      (arg1)->setVertexA(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -32118,7 +32184,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_SetVertexB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FEdge_setVertexB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FEdge *arg1 = (FEdge *) 0 ;
   SVertex *arg2 = (SVertex *) 0 ;
@@ -32129,20 +32195,20 @@ SWIGINTERN PyObject *_wrap_FEdge_SetVertexB(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FEdge_SetVertexB",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdge_setVertexB",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_SetVertexB" "', argument " "1"" of type '" "FEdge *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_setVertexB" "', argument " "1"" of type '" "FEdge *""'"); 
   }
   arg1 = reinterpret_cast< FEdge * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SVertex, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdge_SetVertexB" "', argument " "2"" of type '" "SVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdge_setVertexB" "', argument " "2"" of type '" "SVertex *""'"); 
   }
   arg2 = reinterpret_cast< SVertex * >(argp2);
   {
     try {
-      (arg1)->SetVertexB(arg2);
+      (arg1)->setVertexB(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -32158,7 +32224,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_SetId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FEdge_setId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FEdge *arg1 = (FEdge *) 0 ;
   Id *arg2 = 0 ;
@@ -32169,23 +32235,23 @@ SWIGINTERN PyObject *_wrap_FEdge_SetId(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FEdge_SetId",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdge_setId",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_SetId" "', argument " "1"" of type '" "FEdge *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_setId" "', argument " "1"" of type '" "FEdge *""'"); 
   }
   arg1 = reinterpret_cast< FEdge * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Id,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdge_SetId" "', argument " "2"" of type '" "Id const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdge_setId" "', argument " "2"" of type '" "Id const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdge_SetId" "', argument " "2"" of type '" "Id const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdge_setId" "', argument " "2"" of type '" "Id const &""'"); 
   }
   arg2 = reinterpret_cast< Id * >(argp2);
   {
     try {
-      (arg1)->SetId((Id const &)*arg2);
+      (arg1)->setId((Id const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -32201,7 +32267,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_SetNextEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FEdge_setNextEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FEdge *arg1 = (FEdge *) 0 ;
   FEdge *arg2 = (FEdge *) 0 ;
@@ -32212,20 +32278,20 @@ SWIGINTERN PyObject *_wrap_FEdge_SetNextEdge(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FEdge_SetNextEdge",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdge_setNextEdge",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_SetNextEdge" "', argument " "1"" of type '" "FEdge *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_setNextEdge" "', argument " "1"" of type '" "FEdge *""'"); 
   }
   arg1 = reinterpret_cast< FEdge * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FEdge, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdge_SetNextEdge" "', argument " "2"" of type '" "FEdge *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdge_setNextEdge" "', argument " "2"" of type '" "FEdge *""'"); 
   }
   arg2 = reinterpret_cast< FEdge * >(argp2);
   {
     try {
-      (arg1)->SetNextEdge(arg2);
+      (arg1)->setNextEdge(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -32241,7 +32307,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_SetPreviousEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FEdge_setPreviousEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FEdge *arg1 = (FEdge *) 0 ;
   FEdge *arg2 = (FEdge *) 0 ;
@@ -32252,20 +32318,20 @@ SWIGINTERN PyObject *_wrap_FEdge_SetPreviousEdge(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FEdge_SetPreviousEdge",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdge_setPreviousEdge",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_SetPreviousEdge" "', argument " "1"" of type '" "FEdge *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_setPreviousEdge" "', argument " "1"" of type '" "FEdge *""'"); 
   }
   arg1 = reinterpret_cast< FEdge * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FEdge, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdge_SetPreviousEdge" "', argument " "2"" of type '" "FEdge *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdge_setPreviousEdge" "', argument " "2"" of type '" "FEdge *""'"); 
   }
   arg2 = reinterpret_cast< FEdge * >(argp2);
   {
     try {
-      (arg1)->SetPreviousEdge(arg2);
+      (arg1)->setPreviousEdge(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -32281,7 +32347,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_SetNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FEdge_setNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FEdge *arg1 = (FEdge *) 0 ;
   Nature::EdgeNature arg2 ;
@@ -32292,20 +32358,20 @@ SWIGINTERN PyObject *_wrap_FEdge_SetNature(PyObject *SWIGUNUSEDPARM(self), PyObj
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FEdge_SetNature",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdge_setNature",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_SetNature" "', argument " "1"" of type '" "FEdge *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_setNature" "', argument " "1"" of type '" "FEdge *""'"); 
   }
   arg1 = reinterpret_cast< FEdge * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_short(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdge_SetNature" "', argument " "2"" of type '" "Nature::EdgeNature""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdge_setNature" "', argument " "2"" of type '" "Nature::EdgeNature""'");
   } 
   arg2 = static_cast< Nature::EdgeNature >(val2);
   {
     try {
-      (arg1)->SetNature(arg2);
+      (arg1)->setNature(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -32321,7 +32387,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_SetViewEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FEdge_setViewEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FEdge *arg1 = (FEdge *) 0 ;
   ViewEdge *arg2 = (ViewEdge *) 0 ;
@@ -32332,20 +32398,20 @@ SWIGINTERN PyObject *_wrap_FEdge_SetViewEdge(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FEdge_SetViewEdge",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdge_setViewEdge",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_SetViewEdge" "', argument " "1"" of type '" "FEdge *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_setViewEdge" "', argument " "1"" of type '" "FEdge *""'"); 
   }
   arg1 = reinterpret_cast< FEdge * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewEdge, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdge_SetViewEdge" "', argument " "2"" of type '" "ViewEdge *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdge_setViewEdge" "', argument " "2"" of type '" "ViewEdge *""'"); 
   }
   arg2 = reinterpret_cast< ViewEdge * >(argp2);
   {
     try {
-      (arg1)->SetViewEdge(arg2);
+      (arg1)->setViewEdge(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -32361,7 +32427,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_SetaFace(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FEdge_setaFace(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FEdge *arg1 = (FEdge *) 0 ;
   Polygon3r *arg2 = 0 ;
@@ -32372,23 +32438,23 @@ SWIGINTERN PyObject *_wrap_FEdge_SetaFace(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FEdge_SetaFace",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdge_setaFace",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_SetaFace" "', argument " "1"" of type '" "FEdge *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_setaFace" "', argument " "1"" of type '" "FEdge *""'"); 
   }
   arg1 = reinterpret_cast< FEdge * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Polygon3r,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdge_SetaFace" "', argument " "2"" of type '" "Polygon3r &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdge_setaFace" "', argument " "2"" of type '" "Polygon3r &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdge_SetaFace" "', argument " "2"" of type '" "Polygon3r &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdge_setaFace" "', argument " "2"" of type '" "Polygon3r &""'"); 
   }
   arg2 = reinterpret_cast< Polygon3r * >(argp2);
   {
     try {
-      (arg1)->SetaFace(*arg2);
+      (arg1)->setaFace(*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -32404,7 +32470,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_SetOccludeeIntersection(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FEdge_setOccludeeIntersection(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FEdge *arg1 = (FEdge *) 0 ;
   Geometry::Vec3r *arg2 = 0 ;
@@ -32415,23 +32481,23 @@ SWIGINTERN PyObject *_wrap_FEdge_SetOccludeeIntersection(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FEdge_SetOccludeeIntersection",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdge_setOccludeeIntersection",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_SetOccludeeIntersection" "', argument " "1"" of type '" "FEdge *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_setOccludeeIntersection" "', argument " "1"" of type '" "FEdge *""'"); 
   }
   arg1 = reinterpret_cast< FEdge * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdge_SetOccludeeIntersection" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdge_setOccludeeIntersection" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdge_SetOccludeeIntersection" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdge_setOccludeeIntersection" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
   arg2 = reinterpret_cast< Geometry::Vec3r * >(argp2);
   {
     try {
-      (arg1)->SetOccludeeIntersection((Geometry::Vec3r const &)*arg2);
+      (arg1)->setOccludeeIntersection((Geometry::Vec3r const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -32447,7 +32513,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_SetOccludeeEmpty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FEdge_setOccludeeEmpty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FEdge *arg1 = (FEdge *) 0 ;
   bool arg2 ;
@@ -32458,20 +32524,20 @@ SWIGINTERN PyObject *_wrap_FEdge_SetOccludeeEmpty(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FEdge_SetOccludeeEmpty",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdge_setOccludeeEmpty",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_SetOccludeeEmpty" "', argument " "1"" of type '" "FEdge *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_setOccludeeEmpty" "', argument " "1"" of type '" "FEdge *""'"); 
   }
   arg1 = reinterpret_cast< FEdge * >(argp1);
   ecode2 = SWIG_AsVal_bool(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdge_SetOccludeeEmpty" "', argument " "2"" of type '" "bool""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdge_setOccludeeEmpty" "', argument " "2"" of type '" "bool""'");
   } 
   arg2 = static_cast< bool >(val2);
   {
     try {
-      (arg1)->SetOccludeeEmpty(arg2);
+      (arg1)->setOccludeeEmpty(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -32487,7 +32553,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_SetSmooth(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FEdge_setSmooth(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FEdge *arg1 = (FEdge *) 0 ;
   bool arg2 ;
@@ -32498,20 +32564,20 @@ SWIGINTERN PyObject *_wrap_FEdge_SetSmooth(PyObject *SWIGUNUSEDPARM(self), PyObj
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FEdge_SetSmooth",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdge_setSmooth",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdge, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_SetSmooth" "', argument " "1"" of type '" "FEdge *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_setSmooth" "', argument " "1"" of type '" "FEdge *""'"); 
   }
   arg1 = reinterpret_cast< FEdge * >(argp1);
   ecode2 = SWIG_AsVal_bool(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdge_SetSmooth" "', argument " "2"" of type '" "bool""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdge_setSmooth" "', argument " "2"" of type '" "bool""'");
   } 
   arg2 = static_cast< bool >(val2);
   {
     try {
-      (arg1)->SetSmooth(arg2);
+      (arg1)->setSmooth(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -32702,7 +32768,7 @@ SWIGINTERN PyObject *_wrap_FEdge_shape(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -32726,10 +32792,7 @@ SWIGINTERN PyObject *_wrap_FEdge_shape(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdge_shape'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    shape(FEdge *)\n"
-    "    shape(FEdge const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdge_shape'.\n  Possible C/C++ prototypes are:\n    shape()\n    shape()\n");
   return NULL;
 }
 
@@ -33114,7 +33177,7 @@ SWIGINTERN PyObject *_wrap_FEdge_orientation2d(PyObject *SWIGUNUSEDPARM(self), P
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -33146,7 +33209,7 @@ SWIGINTERN PyObject *_wrap_FEdge_orientation3d(PyObject *SWIGUNUSEDPARM(self), P
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -33296,7 +33359,7 @@ SWIGINTERN PyObject *_wrap_FEdge_pointsBegin(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -33326,10 +33389,7 @@ SWIGINTERN PyObject *_wrap_FEdge_pointsBegin(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdge_pointsBegin'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    pointsBegin(FEdge *,float)\n"
-    "    pointsBegin(FEdge *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdge_pointsBegin'.\n  Possible C/C++ prototypes are:\n    pointsBegin(float)\n    pointsBegin()\n");
   return NULL;
 }
 
@@ -33413,7 +33473,7 @@ SWIGINTERN PyObject *_wrap_FEdge_pointsEnd(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -33443,17 +33503,14 @@ SWIGINTERN PyObject *_wrap_FEdge_pointsEnd(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdge_pointsEnd'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    pointsEnd(FEdge *,float)\n"
-    "    pointsEnd(FEdge *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdge_pointsEnd'.\n  Possible C/C++ prototypes are:\n    pointsEnd(float)\n    pointsEnd()\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *FEdge_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FEdge, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -33563,7 +33620,7 @@ SWIGINTERN PyObject *_wrap_new_FEdgeSVertexIterator(PyObject *self, PyObject *ar
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -33594,11 +33651,7 @@ SWIGINTERN PyObject *_wrap_new_FEdgeSVertexIterator(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_FEdgeSVertexIterator'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    FEdgeInternal::SVertexIterator()\n"
-    "    FEdgeInternal::SVertexIterator(FEdgeInternal::SVertexIterator const &)\n"
-    "    FEdgeInternal::SVertexIterator(SVertex *,FEdge *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_FEdgeSVertexIterator'.\n  Possible C/C++ prototypes are:\n    FEdgeInternal::SVertexIterator()\n    FEdgeInternal::SVertexIterator(FEdgeInternal::SVertexIterator const &)\n    FEdgeInternal::SVertexIterator(SVertex *,FEdge *)\n");
   return NULL;
 }
 
@@ -34121,7 +34174,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_getPoint3D(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -34249,7 +34302,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_getPoint2D(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -34603,7 +34656,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_point3D(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -34638,7 +34691,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_point2D(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -34648,7 +34701,7 @@ fail:
 SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_normals(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
-  SwigValueWrapper< set< VecMat::Vec3< double > > > result;
+  SwigValueWrapper<set<VecMat::Vec3<double > > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -34670,7 +34723,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_normals(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new set< Geometry::Vec3r >(static_cast< const set< Geometry::Vec3r >& >(result))), SWIGTYPE_p_setT_VecMat__Vec3T_double_t_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new set<Geometry::Vec3r >(static_cast< const set<Geometry::Vec3r >& >(result))), SWIGTYPE_p_setTVecMat__Vec3Tdouble_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -34712,7 +34765,7 @@ fail:
 SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_fedges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
-  std::vector< FEdge * > *result = 0 ;
+  std::vector<FEdge * > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -34726,8 +34779,8 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_fedges(PyObject *SWIGUNUSEDPARM(
   {
     try {
       {
-        std::vector< FEdge * > const &_result_ref = (*arg1)->fedges();
-        result = (std::vector< FEdge * > *) &_result_ref;
+        std::vector<FEdge * > const &_result_ref = (*arg1)->fedges();
+        result = (std::vector<FEdge * > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -34737,7 +34790,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_fedges(PyObject *SWIGUNUSEDPARM(
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -34878,7 +34931,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_shape(PyObject *self, PyObject *
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -34902,10 +34955,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_shape(PyObject *self, PyObject *
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdgeSVertexIterator_shape'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    shape(FEdgeInternal::SVertexIterator *)\n"
-    "    shape(FEdgeInternal::SVertexIterator const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdgeSVertexIterator_shape'.\n  Possible C/C++ prototypes are:\n    shape()\n    shape()\n");
   return NULL;
 }
 
@@ -34974,7 +35024,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_SetPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_setPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
   Geometry::Vec3r *arg2 = 0 ;
@@ -34985,23 +35035,23 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_SetPoint3D(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSVertexIterator_SetPoint3D",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSVertexIterator_setPoint3D",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_SetPoint3D" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_setPoint3D" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
   }
   arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSVertexIterator_SetPoint3D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSVertexIterator_setPoint3D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdgeSVertexIterator_SetPoint3D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdgeSVertexIterator_setPoint3D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
   arg2 = reinterpret_cast< Geometry::Vec3r * >(argp2);
   {
     try {
-      (*arg1)->SetPoint3D((Geometry::Vec3r const &)*arg2);
+      (*arg1)->setPoint3D((Geometry::Vec3r const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -35017,7 +35067,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_SetPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_setPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
   Geometry::Vec3r *arg2 = 0 ;
@@ -35028,23 +35078,23 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_SetPoint2D(PyObject *SWIGUNUSEDP
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSVertexIterator_SetPoint2D",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSVertexIterator_setPoint2D",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_SetPoint2D" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_setPoint2D" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
   }
   arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSVertexIterator_SetPoint2D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSVertexIterator_setPoint2D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdgeSVertexIterator_SetPoint2D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdgeSVertexIterator_setPoint2D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
   arg2 = reinterpret_cast< Geometry::Vec3r * >(argp2);
   {
     try {
-      (*arg1)->SetPoint2D((Geometry::Vec3r const &)*arg2);
+      (*arg1)->setPoint2D((Geometry::Vec3r const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -35077,7 +35127,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_AddNormal(PyObject *SWIGUNUSEDPA
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_AddNormal" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
   }
   arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSVertexIterator_AddNormal" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -35233,7 +35283,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_setDirectionFredo(PyObject *SWIG
   }
   arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSVertexIterator_setDirectionFredo" "', argument " "2"" of type '" "Geometry::Vec2r""'"); 
     }  
@@ -35320,14 +35370,14 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_directionFredo(PyObject *SWIGUNU
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2r(static_cast< const Geometry::Vec2r& >(result))), SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2r(static_cast< const Geometry::Vec2r& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_SetId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_setId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
   Id *arg2 = 0 ;
@@ -35338,23 +35388,23 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_SetId(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSVertexIterator_SetId",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSVertexIterator_setId",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_SetId" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_setId" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
   }
   arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Id,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSVertexIterator_SetId" "', argument " "2"" of type '" "Id const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSVertexIterator_setId" "', argument " "2"" of type '" "Id const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdgeSVertexIterator_SetId" "', argument " "2"" of type '" "Id const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdgeSVertexIterator_setId" "', argument " "2"" of type '" "Id const &""'"); 
   }
   arg2 = reinterpret_cast< Id * >(argp2);
   {
     try {
-      (*arg1)->SetId((Id const &)*arg2);
+      (*arg1)->setId((Id const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -35370,10 +35420,10 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_SetFEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_setFEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
-  std::vector< FEdge * > *arg2 = 0 ;
+  std::vector<FEdge * > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -35381,23 +35431,23 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_SetFEdges(PyObject *SWIGUNUSEDPA
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSVertexIterator_SetFEdges",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSVertexIterator_setFEdges",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_SetFEdges" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_setFEdges" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
   }
   arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSVertexIterator_SetFEdges" "', argument " "2"" of type '" "std::vector< FEdge * > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSVertexIterator_setFEdges" "', argument " "2"" of type '" "std::vector<FEdge * > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdgeSVertexIterator_SetFEdges" "', argument " "2"" of type '" "std::vector< FEdge * > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdgeSVertexIterator_setFEdges" "', argument " "2"" of type '" "std::vector<FEdge * > const &""'"); 
   }
-  arg2 = reinterpret_cast< std::vector< FEdge * > * >(argp2);
+  arg2 = reinterpret_cast< std::vector<FEdge * > * >(argp2);
   {
     try {
-      (*arg1)->SetFEdges((std::vector< FEdge * > const &)*arg2);
+      (*arg1)->setFEdges((std::vector<FEdge * > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -35413,7 +35463,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_SetShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_setShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
   SShape *arg2 = (SShape *) 0 ;
@@ -35424,20 +35474,20 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_SetShape(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSVertexIterator_SetShape",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSVertexIterator_setShape",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_SetShape" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_setShape" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
   }
   arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SShape, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSVertexIterator_SetShape" "', argument " "2"" of type '" "SShape *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSVertexIterator_setShape" "', argument " "2"" of type '" "SShape *""'"); 
   }
   arg2 = reinterpret_cast< SShape * >(argp2);
   {
     try {
-      (*arg1)->SetShape(arg2);
+      (*arg1)->setShape(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -35453,7 +35503,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_SetViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_setViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
   ViewVertex *arg2 = (ViewVertex *) 0 ;
@@ -35464,20 +35514,20 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_SetViewVertex(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSVertexIterator_SetViewVertex",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSVertexIterator_setViewVertex",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeInternal__SVertexIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_SetViewVertex" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_setViewVertex" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
   }
   arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewVertex, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSVertexIterator_SetViewVertex" "', argument " "2"" of type '" "ViewVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSVertexIterator_setViewVertex" "', argument " "2"" of type '" "ViewVertex *""'"); 
   }
   arg2 = reinterpret_cast< ViewVertex * >(argp2);
   {
     try {
-      (*arg1)->SetViewVertex(arg2);
+      (*arg1)->setViewVertex(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -35642,7 +35692,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_point2d(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -35677,7 +35727,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_point3d(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -35709,7 +35759,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_normal(PyObject *SWIGUNUSEDPARM(
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -36073,7 +36123,7 @@ fail:
 
 SWIGINTERN PyObject *FEdgeSVertexIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FEdgeInternal__SVertexIterator, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -36183,7 +36233,7 @@ SWIGINTERN PyObject *_wrap_new_FEdgeSharp(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -36215,11 +36265,7 @@ SWIGINTERN PyObject *_wrap_new_FEdgeSharp(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_FEdgeSharp'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    FEdgeSharp()\n"
-    "    FEdgeSharp(SVertex *,SVertex *)\n"
-    "    FEdgeSharp(FEdgeSharp &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_FEdgeSharp'.\n  Possible C/C++ prototypes are:\n    FEdgeSharp()\n    FEdgeSharp(SVertex *,SVertex *)\n    FEdgeSharp(FEdgeSharp &)\n");
   return NULL;
 }
 
@@ -36316,7 +36362,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSharp_normalA(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -36351,7 +36397,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSharp_normalB(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -36492,7 +36538,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSharp_SetNormalA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FEdgeSharp_setNormalA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FEdgeSharp *arg1 = (FEdgeSharp *) 0 ;
   Geometry::Vec3r *arg2 = 0 ;
@@ -36503,23 +36549,23 @@ SWIGINTERN PyObject *_wrap_FEdgeSharp_SetNormalA(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSharp_SetNormalA",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSharp_setNormalA",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeSharp, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSharp_SetNormalA" "', argument " "1"" of type '" "FEdgeSharp *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSharp_setNormalA" "', argument " "1"" of type '" "FEdgeSharp *""'"); 
   }
   arg1 = reinterpret_cast< FEdgeSharp * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSharp_SetNormalA" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSharp_setNormalA" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdgeSharp_SetNormalA" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdgeSharp_setNormalA" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
   arg2 = reinterpret_cast< Geometry::Vec3r * >(argp2);
   {
     try {
-      (arg1)->SetNormalA((Geometry::Vec3r const &)*arg2);
+      (arg1)->setNormalA((Geometry::Vec3r const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -36535,7 +36581,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSharp_SetNormalB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FEdgeSharp_setNormalB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FEdgeSharp *arg1 = (FEdgeSharp *) 0 ;
   Geometry::Vec3r *arg2 = 0 ;
@@ -36546,23 +36592,23 @@ SWIGINTERN PyObject *_wrap_FEdgeSharp_SetNormalB(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSharp_SetNormalB",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSharp_setNormalB",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeSharp, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSharp_SetNormalB" "', argument " "1"" of type '" "FEdgeSharp *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSharp_setNormalB" "', argument " "1"" of type '" "FEdgeSharp *""'"); 
   }
   arg1 = reinterpret_cast< FEdgeSharp * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSharp_SetNormalB" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSharp_setNormalB" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdgeSharp_SetNormalB" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdgeSharp_setNormalB" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
   arg2 = reinterpret_cast< Geometry::Vec3r * >(argp2);
   {
     try {
-      (arg1)->SetNormalB((Geometry::Vec3r const &)*arg2);
+      (arg1)->setNormalB((Geometry::Vec3r const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -36578,7 +36624,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSharp_SetaMaterialIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FEdgeSharp_setaMaterialIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FEdgeSharp *arg1 = (FEdgeSharp *) 0 ;
   unsigned int arg2 ;
@@ -36589,20 +36635,20 @@ SWIGINTERN PyObject *_wrap_FEdgeSharp_SetaMaterialIndex(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSharp_SetaMaterialIndex",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSharp_setaMaterialIndex",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeSharp, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSharp_SetaMaterialIndex" "', argument " "1"" of type '" "FEdgeSharp *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSharp_setaMaterialIndex" "', argument " "1"" of type '" "FEdgeSharp *""'"); 
   }
   arg1 = reinterpret_cast< FEdgeSharp * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgeSharp_SetaMaterialIndex" "', argument " "2"" of type '" "unsigned int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgeSharp_setaMaterialIndex" "', argument " "2"" of type '" "unsigned int""'");
   } 
   arg2 = static_cast< unsigned int >(val2);
   {
     try {
-      (arg1)->SetaMaterialIndex(arg2);
+      (arg1)->setaMaterialIndex(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -36618,7 +36664,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSharp_SetbMaterialIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FEdgeSharp_setbMaterialIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FEdgeSharp *arg1 = (FEdgeSharp *) 0 ;
   unsigned int arg2 ;
@@ -36629,20 +36675,20 @@ SWIGINTERN PyObject *_wrap_FEdgeSharp_SetbMaterialIndex(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSharp_SetbMaterialIndex",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSharp_setbMaterialIndex",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeSharp, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSharp_SetbMaterialIndex" "', argument " "1"" of type '" "FEdgeSharp *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSharp_setbMaterialIndex" "', argument " "1"" of type '" "FEdgeSharp *""'"); 
   }
   arg1 = reinterpret_cast< FEdgeSharp * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgeSharp_SetbMaterialIndex" "', argument " "2"" of type '" "unsigned int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgeSharp_setbMaterialIndex" "', argument " "2"" of type '" "unsigned int""'");
   } 
   arg2 = static_cast< unsigned int >(val2);
   {
     try {
-      (arg1)->SetbMaterialIndex(arg2);
+      (arg1)->setbMaterialIndex(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -36660,7 +36706,7 @@ fail:
 
 SWIGINTERN PyObject *FEdgeSharp_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FEdgeSharp, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -36770,7 +36816,7 @@ SWIGINTERN PyObject *_wrap_new_FEdgeSmooth(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -36802,11 +36848,7 @@ SWIGINTERN PyObject *_wrap_new_FEdgeSmooth(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_FEdgeSmooth'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    FEdgeSmooth()\n"
-    "    FEdgeSmooth(SVertex *,SVertex *)\n"
-    "    FEdgeSmooth(FEdgeSmooth &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_FEdgeSmooth'.\n  Possible C/C++ prototypes are:\n    FEdgeSmooth()\n    FEdgeSmooth(SVertex *,SVertex *)\n    FEdgeSmooth(FEdgeSmooth &)\n");
   return NULL;
 }
 
@@ -36935,7 +36977,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSmooth_normal(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -37009,7 +37051,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSmooth_SetFace(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FEdgeSmooth_setFace(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FEdgeSmooth *arg1 = (FEdgeSmooth *) 0 ;
   void *arg2 = (void *) 0 ;
@@ -37019,19 +37061,19 @@ SWIGINTERN PyObject *_wrap_FEdgeSmooth_SetFace(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSmooth_SetFace",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSmooth_setFace",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeSmooth, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSmooth_SetFace" "', argument " "1"" of type '" "FEdgeSmooth *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSmooth_setFace" "', argument " "1"" of type '" "FEdgeSmooth *""'"); 
   }
   arg1 = reinterpret_cast< FEdgeSmooth * >(argp1);
   res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2), 0, 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSmooth_SetFace" "', argument " "2"" of type '" "void *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSmooth_setFace" "', argument " "2"" of type '" "void *""'"); 
   }
   {
     try {
-      (arg1)->SetFace(arg2);
+      (arg1)->setFace(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -37047,7 +37089,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSmooth_SetNormal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FEdgeSmooth_setNormal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FEdgeSmooth *arg1 = (FEdgeSmooth *) 0 ;
   Geometry::Vec3r *arg2 = 0 ;
@@ -37058,23 +37100,23 @@ SWIGINTERN PyObject *_wrap_FEdgeSmooth_SetNormal(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSmooth_SetNormal",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSmooth_setNormal",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeSmooth, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSmooth_SetNormal" "', argument " "1"" of type '" "FEdgeSmooth *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSmooth_setNormal" "', argument " "1"" of type '" "FEdgeSmooth *""'"); 
   }
   arg1 = reinterpret_cast< FEdgeSmooth * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSmooth_SetNormal" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSmooth_setNormal" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdgeSmooth_SetNormal" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdgeSmooth_setNormal" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
   arg2 = reinterpret_cast< Geometry::Vec3r * >(argp2);
   {
     try {
-      (arg1)->SetNormal((Geometry::Vec3r const &)*arg2);
+      (arg1)->setNormal((Geometry::Vec3r const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -37090,7 +37132,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSmooth_SetMaterialIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FEdgeSmooth_setMaterialIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FEdgeSmooth *arg1 = (FEdgeSmooth *) 0 ;
   unsigned int arg2 ;
@@ -37101,20 +37143,20 @@ SWIGINTERN PyObject *_wrap_FEdgeSmooth_SetMaterialIndex(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSmooth_SetMaterialIndex",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:FEdgeSmooth_setMaterialIndex",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_FEdgeSmooth, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSmooth_SetMaterialIndex" "', argument " "1"" of type '" "FEdgeSmooth *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSmooth_setMaterialIndex" "', argument " "1"" of type '" "FEdgeSmooth *""'"); 
   }
   arg1 = reinterpret_cast< FEdgeSmooth * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgeSmooth_SetMaterialIndex" "', argument " "2"" of type '" "unsigned int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgeSmooth_setMaterialIndex" "', argument " "2"" of type '" "unsigned int""'");
   } 
   arg2 = static_cast< unsigned int >(val2);
   {
     try {
-      (arg1)->SetMaterialIndex(arg2);
+      (arg1)->setMaterialIndex(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -37132,7 +37174,7 @@ fail:
 
 SWIGINTERN PyObject *FEdgeSmooth_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FEdgeSmooth, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -37252,7 +37294,7 @@ SWIGINTERN PyObject *_wrap_new_SShape(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -37270,10 +37312,7 @@ SWIGINTERN PyObject *_wrap_new_SShape(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_SShape'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    SShape()\n"
-    "    SShape(SShape &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_SShape'.\n  Possible C/C++ prototypes are:\n    SShape()\n    SShape(SShape &)\n");
   return NULL;
 }
 
@@ -37488,7 +37527,7 @@ SWIGINTERN PyObject *_wrap_SShape_CreateSVertex(PyObject *SWIGUNUSEDPARM(self),
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_CreateSVertex" "', argument " "1"" of type '" "SShape *""'"); 
   }
   arg1 = reinterpret_cast< SShape * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SShape_CreateSVertex" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -37496,7 +37535,7 @@ SWIGINTERN PyObject *_wrap_SShape_CreateSVertex(PyObject *SWIGUNUSEDPARM(self),
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SShape_CreateSVertex" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
   arg2 = reinterpret_cast< Geometry::Vec3r * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SShape_CreateSVertex" "', argument " "3"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -37534,8 +37573,8 @@ SWIGINTERN PyObject *_wrap_SShape_SplitEdge(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject *resultobj = 0;
   SShape *arg1 = (SShape *) 0 ;
   FEdge *arg2 = (FEdge *) 0 ;
-  std::vector< Geometry::Vec2r > *arg3 = 0 ;
-  std::vector< FEdge * > *arg4 = 0 ;
+  std::vector<Geometry::Vec2r > *arg3 = 0 ;
+  std::vector<FEdge * > *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -37560,25 +37599,25 @@ SWIGINTERN PyObject *_wrap_SShape_SplitEdge(PyObject *SWIGUNUSEDPARM(self), PyOb
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SShape_SplitEdge" "', argument " "2"" of type '" "FEdge *""'"); 
   }
   arg2 = reinterpret_cast< FEdge * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_std__vectorT_VecMat__Vec2T_double_t_std__allocatorT_VecMat__Vec2T_double_t_t_t,  0  | 0);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_std__vectorTVecMat__Vec2Tdouble_t_std__allocatorTVecMat__Vec2Tdouble_t_t_t,  0  | 0);
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SShape_SplitEdge" "', argument " "3"" of type '" "std::vector< Geometry::Vec2r > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SShape_SplitEdge" "', argument " "3"" of type '" "std::vector<Geometry::Vec2r > const &""'"); 
   }
   if (!argp3) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SShape_SplitEdge" "', argument " "3"" of type '" "std::vector< Geometry::Vec2r > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SShape_SplitEdge" "', argument " "3"" of type '" "std::vector<Geometry::Vec2r > const &""'"); 
   }
-  arg3 = reinterpret_cast< std::vector< Geometry::Vec2r > * >(argp3);
-  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t,  0 );
+  arg3 = reinterpret_cast< std::vector<Geometry::Vec2r > * >(argp3);
+  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t,  0 );
   if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "SShape_SplitEdge" "', argument " "4"" of type '" "std::vector< FEdge * > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "SShape_SplitEdge" "', argument " "4"" of type '" "std::vector<FEdge * > &""'"); 
   }
   if (!argp4) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SShape_SplitEdge" "', argument " "4"" of type '" "std::vector< FEdge * > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SShape_SplitEdge" "', argument " "4"" of type '" "std::vector<FEdge * > &""'"); 
   }
-  arg4 = reinterpret_cast< std::vector< FEdge * > * >(argp4);
+  arg4 = reinterpret_cast< std::vector<FEdge * > * >(argp4);
   {
     try {
-      (arg1)->SplitEdge(arg2,(std::vector< Geometry::Vec2r > const &)*arg3,*arg4);
+      (arg1)->SplitEdge(arg2,(std::vector<Geometry::Vec2r > const &)*arg3,*arg4);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -37644,10 +37683,10 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_SetBBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SShape_setBBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SShape *arg1 = (SShape *) 0 ;
-  BBox< Geometry::Vec3r > *arg2 = 0 ;
+  BBox<Geometry::Vec3r > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -37655,23 +37694,23 @@ SWIGINTERN PyObject *_wrap_SShape_SetBBox(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SShape_SetBBox",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:SShape_setBBox",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SShape, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_SetBBox" "', argument " "1"" of type '" "SShape *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_setBBox" "', argument " "1"" of type '" "SShape *""'"); 
   }
   arg1 = reinterpret_cast< SShape * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BBoxT_VecMat__Vec3T_double_t_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BBoxTVecMat__Vec3Tdouble_t_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SShape_SetBBox" "', argument " "2"" of type '" "BBox< Geometry::Vec3r > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SShape_setBBox" "', argument " "2"" of type '" "BBox<Geometry::Vec3r > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SShape_SetBBox" "', argument " "2"" of type '" "BBox< Geometry::Vec3r > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SShape_setBBox" "', argument " "2"" of type '" "BBox<Geometry::Vec3r > const &""'"); 
   }
-  arg2 = reinterpret_cast< BBox< Geometry::Vec3r > * >(argp2);
+  arg2 = reinterpret_cast< BBox<Geometry::Vec3r > * >(argp2);
   {
     try {
-      (arg1)->SetBBox((BBox< Geometry::Vec3r > const &)*arg2);
+      (arg1)->setBBox((BBox<Geometry::Vec3r > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -37801,7 +37840,7 @@ fail:
 SWIGINTERN PyObject *_wrap_SShape_GetVertexList(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SShape *arg1 = (SShape *) 0 ;
-  std::vector< SVertex * > *result = 0 ;
+  std::vector<SVertex * > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -37815,8 +37854,8 @@ SWIGINTERN PyObject *_wrap_SShape_GetVertexList(PyObject *SWIGUNUSEDPARM(self),
   {
     try {
       {
-        std::vector< SVertex * > &_result_ref = (arg1)->GetVertexList();
-        result = (std::vector< SVertex * > *) &_result_ref;
+        std::vector<SVertex * > &_result_ref = (arg1)->GetVertexList();
+        result = (std::vector<SVertex * > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -37826,7 +37865,7 @@ SWIGINTERN PyObject *_wrap_SShape_GetVertexList(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -37836,7 +37875,7 @@ fail:
 SWIGINTERN PyObject *_wrap_SShape_GetEdgeList(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SShape *arg1 = (SShape *) 0 ;
-  std::vector< FEdge * > *result = 0 ;
+  std::vector<FEdge * > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -37850,8 +37889,8 @@ SWIGINTERN PyObject *_wrap_SShape_GetEdgeList(PyObject *SWIGUNUSEDPARM(self), Py
   {
     try {
       {
-        std::vector< FEdge * > &_result_ref = (arg1)->GetEdgeList();
-        result = (std::vector< FEdge * > *) &_result_ref;
+        std::vector<FEdge * > &_result_ref = (arg1)->GetEdgeList();
+        result = (std::vector<FEdge * > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -37861,7 +37900,7 @@ SWIGINTERN PyObject *_wrap_SShape_GetEdgeList(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -37871,7 +37910,7 @@ fail:
 SWIGINTERN PyObject *_wrap_SShape_GetChains(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SShape *arg1 = (SShape *) 0 ;
-  std::vector< FEdge * > *result = 0 ;
+  std::vector<FEdge * > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -37885,8 +37924,8 @@ SWIGINTERN PyObject *_wrap_SShape_GetChains(PyObject *SWIGUNUSEDPARM(self), PyOb
   {
     try {
       {
-        std::vector< FEdge * > &_result_ref = (arg1)->GetChains();
-        result = (std::vector< FEdge * > *) &_result_ref;
+        std::vector<FEdge * > &_result_ref = (arg1)->GetChains();
+        result = (std::vector<FEdge * > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -37896,7 +37935,7 @@ SWIGINTERN PyObject *_wrap_SShape_GetChains(PyObject *SWIGUNUSEDPARM(self), PyOb
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -37906,7 +37945,7 @@ fail:
 SWIGINTERN PyObject *_wrap_SShape_bbox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SShape *arg1 = (SShape *) 0 ;
-  BBox< Geometry::Vec3r > *result = 0 ;
+  BBox<Geometry::Vec3r > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -37920,8 +37959,8 @@ SWIGINTERN PyObject *_wrap_SShape_bbox(PyObject *SWIGUNUSEDPARM(self), PyObject
   {
     try {
       {
-        BBox< Geometry::Vec3r > const &_result_ref = (arg1)->bbox();
-        result = (BBox< Geometry::Vec3r > *) &_result_ref;
+        BBox<Geometry::Vec3r > const &_result_ref = (arg1)->bbox();
+        result = (BBox<Geometry::Vec3r > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -37931,7 +37970,7 @@ SWIGINTERN PyObject *_wrap_SShape_bbox(PyObject *SWIGUNUSEDPARM(self), PyObject
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_BBoxT_VecMat__Vec3T_double_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_BBoxTVecMat__Vec3Tdouble_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -37985,7 +38024,7 @@ fail:
 SWIGINTERN PyObject *_wrap_SShape_materials(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SShape *arg1 = (SShape *) 0 ;
-  std::vector< Material > *result = 0 ;
+  std::vector<Material > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -37999,8 +38038,8 @@ SWIGINTERN PyObject *_wrap_SShape_materials(PyObject *SWIGUNUSEDPARM(self), PyOb
   {
     try {
       {
-        std::vector< Material > const &_result_ref = ((SShape const *)arg1)->materials();
-        result = (std::vector< Material > *) &_result_ref;
+        std::vector<Material > const &_result_ref = ((SShape const *)arg1)->materials();
+        result = (std::vector<Material > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -38010,7 +38049,7 @@ SWIGINTERN PyObject *_wrap_SShape_materials(PyObject *SWIGUNUSEDPARM(self), PyOb
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_Material_std__allocatorT_Material_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTMaterial_std__allocatorTMaterial_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -38113,7 +38152,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_SetId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SShape_setId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SShape *arg1 = (SShape *) 0 ;
   Id arg2 ;
@@ -38124,19 +38163,19 @@ SWIGINTERN PyObject *_wrap_SShape_SetId(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SShape_SetId",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:SShape_setId",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SShape, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_SetId" "', argument " "1"" of type '" "SShape *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_setId" "', argument " "1"" of type '" "SShape *""'"); 
   }
   arg1 = reinterpret_cast< SShape * >(argp1);
   {
     res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Id,  0  | 0);
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SShape_SetId" "', argument " "2"" of type '" "Id""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SShape_setId" "', argument " "2"" of type '" "Id""'"); 
     }  
     if (!argp2) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SShape_SetId" "', argument " "2"" of type '" "Id""'");
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SShape_setId" "', argument " "2"" of type '" "Id""'");
     } else {
       Id * temp = reinterpret_cast< Id * >(argp2);
       arg2 = *temp;
@@ -38145,7 +38184,7 @@ SWIGINTERN PyObject *_wrap_SShape_SetId(PyObject *SWIGUNUSEDPARM(self), PyObject
   }
   {
     try {
-      (arg1)->SetId(arg2);
+      (arg1)->setId(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -38161,10 +38200,10 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_SetMaterials(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SShape_setMaterials(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SShape *arg1 = (SShape *) 0 ;
-  std::vector< Material > *arg2 = 0 ;
+  std::vector<Material > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -38172,23 +38211,23 @@ SWIGINTERN PyObject *_wrap_SShape_SetMaterials(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SShape_SetMaterials",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:SShape_setMaterials",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SShape, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_SetMaterials" "', argument " "1"" of type '" "SShape *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_setMaterials" "', argument " "1"" of type '" "SShape *""'"); 
   }
   arg1 = reinterpret_cast< SShape * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_Material_std__allocatorT_Material_t_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTMaterial_std__allocatorTMaterial_t_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SShape_SetMaterials" "', argument " "2"" of type '" "std::vector< Material > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SShape_setMaterials" "', argument " "2"" of type '" "std::vector<Material > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SShape_SetMaterials" "', argument " "2"" of type '" "std::vector< Material > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SShape_setMaterials" "', argument " "2"" of type '" "std::vector<Material > const &""'"); 
   }
-  arg2 = reinterpret_cast< std::vector< Material > * >(argp2);
+  arg2 = reinterpret_cast< std::vector<Material > * >(argp2);
   {
     try {
-      (arg1)->SetMaterials((std::vector< Material > const &)*arg2);
+      (arg1)->setMaterials((std::vector<Material > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -38204,7 +38243,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_SetViewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SShape_setViewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SShape *arg1 = (SShape *) 0 ;
   ViewShape *arg2 = (ViewShape *) 0 ;
@@ -38215,20 +38254,20 @@ SWIGINTERN PyObject *_wrap_SShape_SetViewShape(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SShape_SetViewShape",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:SShape_setViewShape",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SShape, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_SetViewShape" "', argument " "1"" of type '" "SShape *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_setViewShape" "', argument " "1"" of type '" "SShape *""'"); 
   }
   arg1 = reinterpret_cast< SShape * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewShape, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SShape_SetViewShape" "', argument " "2"" of type '" "ViewShape *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SShape_setViewShape" "', argument " "2"" of type '" "ViewShape *""'"); 
   }
   arg2 = reinterpret_cast< ViewShape * >(argp2);
   {
     try {
-      (arg1)->SetViewShape(arg2);
+      (arg1)->setViewShape(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -38244,7 +38283,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_SetImportance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SShape_setImportance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SShape *arg1 = (SShape *) 0 ;
   float arg2 ;
@@ -38255,20 +38294,20 @@ SWIGINTERN PyObject *_wrap_SShape_SetImportance(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:SShape_SetImportance",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:SShape_setImportance",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SShape, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_SetImportance" "', argument " "1"" of type '" "SShape *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_setImportance" "', argument " "1"" of type '" "SShape *""'"); 
   }
   arg1 = reinterpret_cast< SShape * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SShape_SetImportance" "', argument " "2"" of type '" "float""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SShape_setImportance" "', argument " "2"" of type '" "float""'");
   } 
   arg2 = static_cast< float >(val2);
   {
     try {
-      (arg1)->SetImportance(arg2);
+      (arg1)->setImportance(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -38286,14 +38325,14 @@ fail:
 
 SWIGINTERN PyObject *SShape_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_SShape, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
   PyObject **arg2 = (PyObject **) 0 ;
   swig::PySwigIterator *result = 0 ;
   void *argp1 = 0 ;
@@ -38302,11 +38341,11 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_iterator(PyObject *SWIGUNUSEDPARM
   
   arg2 = &obj0;
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_iterator" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_iterator" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
   {
     try {
       result = (swig::PySwigIterator *)std_vector_Sl_ViewShape_Sm__Sg__iterator(arg1,arg2);
@@ -38327,21 +38366,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer___nonzero__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer___nonzero__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___nonzero__" "', argument " "1"" of type '" "std::vector< ViewShape * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___nonzero__" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
   {
     try {
-      result = (bool)std_vector_Sl_ViewShape_Sm__Sg____nonzero__((std::vector< ViewShape * > const *)arg1);
+      result = (bool)std_vector_Sl_ViewShape_Sm__Sg____nonzero__((std::vector<ViewShape * > const *)arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -38359,21 +38398,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer___len__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
-  std::vector< ViewShape * >::size_type result;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer___len__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___len__" "', argument " "1"" of type '" "std::vector< ViewShape * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___len__" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
   {
     try {
-      result = std_vector_Sl_ViewShape_Sm__Sg____len__((std::vector< ViewShape * > const *)arg1);
+      result = std_vector_Sl_ViewShape_Sm__Sg____len__((std::vector<ViewShape * > const *)arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -38391,22 +38430,22 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
-  std::vector< ViewShape * >::value_type result;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_pop" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_pop" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
   {
     try {
       try {
-        result = (std::vector< ViewShape * >::value_type)std_vector_Sl_ViewShape_Sm__Sg__pop(arg1);
+        result = (std::vector<ViewShape * >::value_type)std_vector_Sl_ViewShape_Sm__Sg__pop(arg1);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -38420,7 +38459,7 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_pop(PyObject *SWIGUNUSEDPARM(self
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -38429,10 +38468,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
-  std::vector< ViewShape * >::difference_type arg2 ;
-  std::vector< ViewShape * >::difference_type arg3 ;
-  std::vector< ViewShape *,std::allocator< ViewShape * > > *result = 0 ;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::difference_type arg2 ;
+  std::vector<ViewShape * >::difference_type arg3 ;
+  std::vector<ViewShape *,std::allocator<ViewShape * > > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -38444,25 +38483,25 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer___getslice__(PyObject *SWIGUNUSED
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewShapesContainer___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___getslice__" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___getslice__" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer___getslice__" "', argument " "2"" of type '" "std::vector< ViewShape * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer___getslice__" "', argument " "2"" of type '" "std::vector<ViewShape * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector< ViewShape * >::difference_type >(val2);
+  arg2 = static_cast< std::vector<ViewShape * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewShapesContainer___getslice__" "', argument " "3"" of type '" "std::vector< ViewShape * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewShapesContainer___getslice__" "', argument " "3"" of type '" "std::vector<ViewShape * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector< ViewShape * >::difference_type >(val3);
+  arg3 = static_cast< std::vector<ViewShape * >::difference_type >(val3);
   {
     try {
       try {
-        result = (std::vector< ViewShape *,std::allocator< ViewShape * > > *)std_vector_Sl_ViewShape_Sm__Sg____getslice__(arg1,arg2,arg3);
+        result = (std::vector<ViewShape *,std::allocator<ViewShape * > > *)std_vector_Sl_ViewShape_Sm__Sg____getslice__(arg1,arg2,arg3);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -38476,7 +38515,7 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer___getslice__(PyObject *SWIGUNUSED
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -38485,10 +38524,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer___setslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
-  std::vector< ViewShape * >::difference_type arg2 ;
-  std::vector< ViewShape * >::difference_type arg3 ;
-  std::vector< ViewShape *,std::allocator< ViewShape * > > *arg4 = 0 ;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::difference_type arg2 ;
+  std::vector<ViewShape * >::difference_type arg3 ;
+  std::vector<ViewShape *,std::allocator<ViewShape * > > *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -38502,36 +38541,36 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer___setslice__(PyObject *SWIGUNUSED
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:ViewShapesContainer___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___setslice__" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___setslice__" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer___setslice__" "', argument " "2"" of type '" "std::vector< ViewShape * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer___setslice__" "', argument " "2"" of type '" "std::vector<ViewShape * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector< ViewShape * >::difference_type >(val2);
+  arg2 = static_cast< std::vector<ViewShape * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewShapesContainer___setslice__" "', argument " "3"" of type '" "std::vector< ViewShape * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewShapesContainer___setslice__" "', argument " "3"" of type '" "std::vector<ViewShape * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector< ViewShape * >::difference_type >(val3);
+  arg3 = static_cast< std::vector<ViewShape * >::difference_type >(val3);
   {
-    std::vector<ViewShape*,std::allocator< ViewShape * > > *ptr = (std::vector<ViewShape*,std::allocator< ViewShape * > > *)0;
+    std::vector<ViewShape*,std::allocator<ViewShape * > > *ptr = (std::vector<ViewShape*,std::allocator<ViewShape * > > *)0;
     res4 = swig::asptr(obj3, &ptr);
     if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewShapesContainer___setslice__" "', argument " "4"" of type '" "std::vector< ViewShape *,std::allocator< ViewShape * > > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewShapesContainer___setslice__" "', argument " "4"" of type '" "std::vector<ViewShape *,std::allocator<ViewShape * > > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShapesContainer___setslice__" "', argument " "4"" of type '" "std::vector< ViewShape *,std::allocator< ViewShape * > > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShapesContainer___setslice__" "', argument " "4"" of type '" "std::vector<ViewShape *,std::allocator<ViewShape * > > const &""'"); 
     }
     arg4 = ptr;
   }
   {
     try {
       try {
-        std_vector_Sl_ViewShape_Sm__Sg____setslice__(arg1,arg2,arg3,(std::vector< ViewShape *,std::allocator< ViewShape * > > const &)*arg4);
+        std_vector_Sl_ViewShape_Sm__Sg____setslice__(arg1,arg2,arg3,(std::vector<ViewShape *,std::allocator<ViewShape * > > const &)*arg4);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -38559,9 +38598,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer___delslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
-  std::vector< ViewShape * >::difference_type arg2 ;
-  std::vector< ViewShape * >::difference_type arg3 ;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::difference_type arg2 ;
+  std::vector<ViewShape * >::difference_type arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -38573,21 +38612,21 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer___delslice__(PyObject *SWIGUNUSED
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewShapesContainer___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___delslice__" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___delslice__" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer___delslice__" "', argument " "2"" of type '" "std::vector< ViewShape * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer___delslice__" "', argument " "2"" of type '" "std::vector<ViewShape * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector< ViewShape * >::difference_type >(val2);
+  arg2 = static_cast< std::vector<ViewShape * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewShapesContainer___delslice__" "', argument " "3"" of type '" "std::vector< ViewShape * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewShapesContainer___delslice__" "', argument " "3"" of type '" "std::vector<ViewShape * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector< ViewShape * >::difference_type >(val3);
+  arg3 = static_cast< std::vector<ViewShape * >::difference_type >(val3);
   {
     try {
       try {
@@ -38614,8 +38653,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer___delitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
-  std::vector< ViewShape * >::difference_type arg2 ;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::difference_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -38624,16 +38663,16 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer___delitem__(PyObject *SWIGUNUSEDP
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewShapesContainer___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___delitem__" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___delitem__" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer___delitem__" "', argument " "2"" of type '" "std::vector< ViewShape * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer___delitem__" "', argument " "2"" of type '" "std::vector<ViewShape * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector< ViewShape * >::difference_type >(val2);
+  arg2 = static_cast< std::vector<ViewShape * >::difference_type >(val2);
   {
     try {
       try {
@@ -38660,9 +38699,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer___getitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
-  std::vector< ViewShape * >::difference_type arg2 ;
-  std::vector< ViewShape * >::value_type result;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::difference_type arg2 ;
+  std::vector<ViewShape * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -38671,20 +38710,20 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer___getitem__(PyObject *SWIGUNUSEDP
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewShapesContainer___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___getitem__" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___getitem__" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer___getitem__" "', argument " "2"" of type '" "std::vector< ViewShape * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer___getitem__" "', argument " "2"" of type '" "std::vector<ViewShape * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector< ViewShape * >::difference_type >(val2);
+  arg2 = static_cast< std::vector<ViewShape * >::difference_type >(val2);
   {
     try {
       try {
-        result = (std::vector< ViewShape * >::value_type)std_vector_Sl_ViewShape_Sm__Sg____getitem__(arg1,arg2);
+        result = (std::vector<ViewShape * >::value_type)std_vector_Sl_ViewShape_Sm__Sg____getitem__(arg1,arg2);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -38698,7 +38737,7 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer___getitem__(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -38707,9 +38746,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer___setitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
-  std::vector< ViewShape * >::difference_type arg2 ;
-  std::vector< ViewShape * >::value_type arg3 = (std::vector< ViewShape * >::value_type) 0 ;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::difference_type arg2 ;
+  std::vector<ViewShape * >::value_type arg3 = (std::vector<ViewShape * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -38721,21 +38760,21 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer___setitem__(PyObject *SWIGUNUSEDP
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewShapesContainer___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___setitem__" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___setitem__" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer___setitem__" "', argument " "2"" of type '" "std::vector< ViewShape * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer___setitem__" "', argument " "2"" of type '" "std::vector<ViewShape * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector< ViewShape * >::difference_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector<ViewShape * >::difference_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewShapesContainer___setitem__" "', argument " "3"" of type '" "std::vector< ViewShape * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewShapesContainer___setitem__" "', argument " "3"" of type '" "std::vector<ViewShape * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector< ViewShape * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector<ViewShape * >::value_type >(argp3);
   {
     try {
       try {
@@ -38762,8 +38801,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
-  std::vector< ViewShape * >::value_type arg2 = (std::vector< ViewShape * >::value_type) 0 ;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::value_type arg2 = (std::vector<ViewShape * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -38772,16 +38811,16 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_append(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewShapesContainer_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_append" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_append" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0 |  0 );
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShapesContainer_append" "', argument " "2"" of type '" "std::vector< ViewShape * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShapesContainer_append" "', argument " "2"" of type '" "std::vector<ViewShape * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector< ViewShape * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector<ViewShape * >::value_type >(argp2);
   {
     try {
       std_vector_Sl_ViewShape_Sm__Sg__append(arg1,arg2);
@@ -38802,12 +38841,12 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_ViewShapesContainer__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewShape * > *result = 0 ;
+  std::vector<ViewShape * > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_ViewShapesContainer")) SWIG_fail;
   {
     try {
-      result = (std::vector< ViewShape * > *)new std::vector< ViewShape * >();
+      result = (std::vector<ViewShape * > *)new std::vector<ViewShape * >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -38816,7 +38855,7 @@ SWIGINTERN PyObject *_wrap_new_ViewShapesContainer__SWIG_0(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -38825,26 +38864,26 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_ViewShapesContainer__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewShape * > *arg1 = 0 ;
-  std::vector< ViewShape * > *result = 0 ;
+  std::vector<ViewShape * > *arg1 = 0 ;
+  std::vector<ViewShape * > *result = 0 ;
   int res1 = SWIG_OLDOBJ ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_ViewShapesContainer",&obj0)) SWIG_fail;
   {
-    std::vector<ViewShape*,std::allocator< ViewShape * > > *ptr = (std::vector<ViewShape*,std::allocator< ViewShape * > > *)0;
+    std::vector<ViewShape*,std::allocator<ViewShape * > > *ptr = (std::vector<ViewShape*,std::allocator<ViewShape * > > *)0;
     res1 = swig::asptr(obj0, &ptr);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ViewShapesContainer" "', argument " "1"" of type '" "std::vector< ViewShape * > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ViewShapesContainer" "', argument " "1"" of type '" "std::vector<ViewShape * > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ViewShapesContainer" "', argument " "1"" of type '" "std::vector< ViewShape * > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ViewShapesContainer" "', argument " "1"" of type '" "std::vector<ViewShape * > const &""'"); 
     }
     arg1 = ptr;
   }
   {
     try {
-      result = (std::vector< ViewShape * > *)new std::vector< ViewShape * >((std::vector< ViewShape * > const &)*arg1);
+      result = (std::vector<ViewShape * > *)new std::vector<ViewShape * >((std::vector<ViewShape * > const &)*arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -38853,7 +38892,7 @@ SWIGINTERN PyObject *_wrap_new_ViewShapesContainer__SWIG_1(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, SWIG_POINTER_NEW |  0 );
   if (SWIG_IsNewObj(res1)) delete arg1;
   return resultobj;
 fail:
@@ -38864,21 +38903,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_empty",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_empty" "', argument " "1"" of type '" "std::vector< ViewShape * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_empty" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
   {
     try {
-      result = (bool)((std::vector< ViewShape * > const *)arg1)->empty();
+      result = (bool)((std::vector<ViewShape * > const *)arg1)->empty();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -38896,21 +38935,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
-  std::vector< ViewShape * >::size_type result;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_size" "', argument " "1"" of type '" "std::vector< ViewShape * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_size" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
   {
     try {
-      result = ((std::vector< ViewShape * > const *)arg1)->size();
+      result = ((std::vector<ViewShape * > const *)arg1)->size();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -38928,17 +38967,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_clear" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_clear" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
   {
     try {
       (arg1)->clear();
@@ -38959,8 +38998,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
-  std::vector< ViewShape * > *arg2 = 0 ;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -38969,19 +39008,19 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_swap(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewShapesContainer_swap",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_swap" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_swap" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t,  0 );
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShapesContainer_swap" "', argument " "2"" of type '" "std::vector< ViewShape * > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShapesContainer_swap" "', argument " "2"" of type '" "std::vector<ViewShape * > &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShapesContainer_swap" "', argument " "2"" of type '" "std::vector< ViewShape * > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShapesContainer_swap" "', argument " "2"" of type '" "std::vector<ViewShape * > &""'"); 
   }
-  arg2 = reinterpret_cast< std::vector< ViewShape * > * >(argp2);
+  arg2 = reinterpret_cast< std::vector<ViewShape * > * >(argp2);
   {
     try {
       (arg1)->swap(*arg2);
@@ -39002,21 +39041,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
-  SwigValueWrapper< std::allocator< ViewShape * > > result;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  SwigValueWrapper<std::allocator<ViewShape * > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_get_allocator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_get_allocator" "', argument " "1"" of type '" "std::vector< ViewShape * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_get_allocator" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
   {
     try {
-      result = ((std::vector< ViewShape * > const *)arg1)->get_allocator();
+      result = ((std::vector<ViewShape * > const *)arg1)->get_allocator();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -39025,30 +39064,30 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_get_allocator(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new std::vector< ViewShape * >::allocator_type(static_cast< const std::vector< ViewShape * >::allocator_type& >(result))), SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new std::vector<ViewShape * >::allocator_type(static_cast< const std::vector<ViewShape * >::allocator_type& >(result))), SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShapesContainer_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_begin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
-  std::vector< ViewShape * >::const_iterator result;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_begin" "', argument " "1"" of type '" "std::vector< ViewShape * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_begin" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
   {
     try {
-      result = ((std::vector< ViewShape * > const *)arg1)->begin();
+      result = (arg1)->begin();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -39057,7 +39096,7 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_begin(PyObject *SWIGUNUSEDPARM(se
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewShape * >::const_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewShape * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -39065,23 +39104,89 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShapesContainer_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_begin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
-  std::vector< ViewShape * >::const_iterator result;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_begin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_begin" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<ViewShape * > const *)arg1)->begin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewShape * >::const_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_begin(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewShapesContainer_begin__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewShapesContainer_begin__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewShapesContainer_begin'.\n  Possible C/C++ prototypes are:\n    begin()\n    begin()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_end" "', argument " "1"" of type '" "std::vector< ViewShape * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_end" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
   {
     try {
-      result = ((std::vector< ViewShape * > const *)arg1)->end();
+      result = (arg1)->end();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -39090,7 +39195,7 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_end(PyObject *SWIGUNUSEDPARM(self
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewShape * >::const_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewShape * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -39098,23 +39203,89 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShapesContainer_rbegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
-  std::vector< ViewShape * >::const_reverse_iterator result;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_end",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_end" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<ViewShape * > const *)arg1)->end();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewShape * >::const_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_end(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewShapesContainer_end__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewShapesContainer_end__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewShapesContainer_end'.\n  Possible C/C++ prototypes are:\n    end()\n    end()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_rbegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::reverse_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_rbegin" "', argument " "1"" of type '" "std::vector< ViewShape * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_rbegin" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
   {
     try {
-      result = ((std::vector< ViewShape * > const *)arg1)->rbegin();
+      result = (arg1)->rbegin();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -39123,7 +39294,7 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_rbegin(PyObject *SWIGUNUSEDPARM(s
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewShape * >::const_reverse_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewShape * >::reverse_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -39131,23 +39302,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShapesContainer_rend(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_rbegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
-  std::vector< ViewShape * >::const_reverse_iterator result;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::const_reverse_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_rbegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_rend" "', argument " "1"" of type '" "std::vector< ViewShape * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_rbegin" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
   {
     try {
-      result = ((std::vector< ViewShape * > const *)arg1)->rend();
+      result = ((std::vector<ViewShape * > const *)arg1)->rbegin();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -39156,7 +39327,7 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_rend(PyObject *SWIGUNUSEDPARM(sel
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewShape * >::const_reverse_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewShape * >::const_reverse_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -39164,10 +39335,142 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_rbegin(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewShapesContainer_rbegin__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewShapesContainer_rbegin__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewShapesContainer_rbegin'.\n  Possible C/C++ prototypes are:\n    rbegin()\n    rbegin()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_rend__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::reverse_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_rend",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_rend" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  {
+    try {
+      result = (arg1)->rend();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewShape * >::reverse_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_rend__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::const_reverse_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_rend",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_rend" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<ViewShape * > const *)arg1)->rend();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewShape * >::const_reverse_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_rend(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewShapesContainer_rend__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewShapesContainer_rend__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewShapesContainer_rend'.\n  Possible C/C++ prototypes are:\n    rend()\n    rend()\n");
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_new_ViewShapesContainer__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewShape * >::size_type arg1 ;
-  std::vector< ViewShape * > *result = 0 ;
+  std::vector<ViewShape * >::size_type arg1 ;
+  std::vector<ViewShape * > *result = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -39175,12 +39478,12 @@ SWIGINTERN PyObject *_wrap_new_ViewShapesContainer__SWIG_2(PyObject *SWIGUNUSEDP
   if (!PyArg_ParseTuple(args,(char *)"O:new_ViewShapesContainer",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ViewShapesContainer" "', argument " "1"" of type '" "std::vector< ViewShape * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ViewShapesContainer" "', argument " "1"" of type '" "std::vector<ViewShape * >::size_type""'");
   } 
-  arg1 = static_cast< std::vector< ViewShape * >::size_type >(val1);
+  arg1 = static_cast< std::vector<ViewShape * >::size_type >(val1);
   {
     try {
-      result = (std::vector< ViewShape * > *)new std::vector< ViewShape * >(arg1);
+      result = (std::vector<ViewShape * > *)new std::vector<ViewShape * >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -39189,7 +39492,7 @@ SWIGINTERN PyObject *_wrap_new_ViewShapesContainer__SWIG_2(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -39198,17 +39501,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_pop_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_pop_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_pop_back" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_pop_back" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
   {
     try {
       (arg1)->pop_back();
@@ -39229,8 +39532,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
-  std::vector< ViewShape * >::size_type arg2 ;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::size_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -39239,16 +39542,16 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_resize__SWIG_0(PyObject *SWIGUNUS
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewShapesContainer_resize",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_resize" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_resize" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer_resize" "', argument " "2"" of type '" "std::vector< ViewShape * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer_resize" "', argument " "2"" of type '" "std::vector<ViewShape * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector< ViewShape * >::size_type >(val2);
+  arg2 = static_cast< std::vector<ViewShape * >::size_type >(val2);
   {
     try {
       (arg1)->resize(arg2);
@@ -39269,9 +39572,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
-  std::vector< ViewShape * >::iterator arg2 ;
-  std::vector< ViewShape * >::iterator result;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::iterator arg2 ;
+  std::vector<ViewShape * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -39280,20 +39583,20 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_erase__SWIG_0(PyObject *SWIGUNUSE
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewShapesContainer_erase",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_erase" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_erase" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_erase" "', argument " "2"" of type '" "std::vector< ViewShape * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewShape * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector< ViewShape * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< ViewShape * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_erase" "', argument " "2"" of type '" "std::vector< ViewShape * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewShape * >::iterator""'");
     }
   }
   {
@@ -39307,7 +39610,7 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_erase__SWIG_0(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewShape * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewShape * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -39317,10 +39620,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
-  std::vector< ViewShape * >::iterator arg2 ;
-  std::vector< ViewShape * >::iterator arg3 ;
-  std::vector< ViewShape * >::iterator result;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::iterator arg2 ;
+  std::vector<ViewShape * >::iterator arg3 ;
+  std::vector<ViewShape * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -39332,31 +39635,31 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_erase__SWIG_1(PyObject *SWIGUNUSE
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewShapesContainer_erase",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_erase" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_erase" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_erase" "', argument " "2"" of type '" "std::vector< ViewShape * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewShape * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector< ViewShape * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< ViewShape * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_erase" "', argument " "2"" of type '" "std::vector< ViewShape * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewShape * >::iterator""'");
     }
   }
   res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res3) || !iter3) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_erase" "', argument " "3"" of type '" "std::vector< ViewShape * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_erase" "', argument " "3"" of type '" "std::vector<ViewShape * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector< ViewShape * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< ViewShape * >::iterator > *>(iter3);
+    swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *>(iter3);
     if (iter_t) {
       arg3 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_erase" "', argument " "3"" of type '" "std::vector< ViewShape * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_erase" "', argument " "3"" of type '" "std::vector<ViewShape * >::iterator""'");
     }
   }
   {
@@ -39370,7 +39673,7 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_erase__SWIG_1(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewShape * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewShape * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -39384,18 +39687,18 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_erase(PyObject *self, PyObject *a
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator< ViewShape * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< ViewShape * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *>(iter) != 0));
       if (_v) {
         return _wrap_ViewShapesContainer_erase__SWIG_0(self, args);
       }
@@ -39403,16 +39706,16 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_erase(PyObject *self, PyObject *a
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator< ViewShape * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< ViewShape * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *>(iter) != 0));
       if (_v) {
         swig::PySwigIterator *iter = 0;
         int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< ViewShape * >::iterator > *>(iter) != 0));
+        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *>(iter) != 0));
         if (_v) {
           return _wrap_ViewShapesContainer_erase__SWIG_1(self, args);
         }
@@ -39421,19 +39724,16 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_erase(PyObject *self, PyObject *a
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewShapesContainer_erase'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    erase(std::vector< ViewShape * > *,std::vector< ViewShape * >::iterator)\n"
-    "    erase(std::vector< ViewShape * > *,std::vector< ViewShape * >::iterator,std::vector< ViewShape * >::iterator)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewShapesContainer_erase'.\n  Possible C/C++ prototypes are:\n    erase(std::vector<ViewShape * >::iterator)\n    erase(std::vector<ViewShape * >::iterator,std::vector<ViewShape * >::iterator)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_new_ViewShapesContainer__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewShape * >::size_type arg1 ;
-  std::vector< ViewShape * >::value_type arg2 = (std::vector< ViewShape * >::value_type) 0 ;
-  std::vector< ViewShape * > *result = 0 ;
+  std::vector<ViewShape * >::size_type arg1 ;
+  std::vector<ViewShape * >::value_type arg2 = (std::vector<ViewShape * >::value_type) 0 ;
+  std::vector<ViewShape * > *result = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   void *argp2 = 0 ;
@@ -39444,17 +39744,17 @@ SWIGINTERN PyObject *_wrap_new_ViewShapesContainer__SWIG_3(PyObject *SWIGUNUSEDP
   if (!PyArg_ParseTuple(args,(char *)"OO:new_ViewShapesContainer",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ViewShapesContainer" "', argument " "1"" of type '" "std::vector< ViewShape * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ViewShapesContainer" "', argument " "1"" of type '" "std::vector<ViewShape * >::size_type""'");
   } 
-  arg1 = static_cast< std::vector< ViewShape * >::size_type >(val1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0 |  0 );
+  arg1 = static_cast< std::vector<ViewShape * >::size_type >(val1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ViewShapesContainer" "', argument " "2"" of type '" "std::vector< ViewShape * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ViewShapesContainer" "', argument " "2"" of type '" "std::vector<ViewShape * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector< ViewShape * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector<ViewShape * >::value_type >(argp2);
   {
     try {
-      result = (std::vector< ViewShape * > *)new std::vector< ViewShape * >(arg1,arg2);
+      result = (std::vector<ViewShape * > *)new std::vector<ViewShape * >(arg1,arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -39463,7 +39763,7 @@ SWIGINTERN PyObject *_wrap_new_ViewShapesContainer__SWIG_3(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -39476,7 +39776,7 @@ SWIGINTERN PyObject *_wrap_new_ViewShapesContainer(PyObject *self, PyObject *arg
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -39495,7 +39795,7 @@ SWIGINTERN PyObject *_wrap_new_ViewShapesContainer(PyObject *self, PyObject *arg
   }
   if (argc == 1) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator< ViewShape * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_new_ViewShapesContainer__SWIG_1(self, args);
@@ -39509,7 +39809,7 @@ SWIGINTERN PyObject *_wrap_new_ViewShapesContainer(PyObject *self, PyObject *arg
     }
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_new_ViewShapesContainer__SWIG_3(self, args);
@@ -39518,20 +39818,15 @@ SWIGINTERN PyObject *_wrap_new_ViewShapesContainer(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewShapesContainer'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    std::vector< ViewShape * >()\n"
-    "    std::vector< ViewShape * >(std::vector< ViewShape * > const &)\n"
-    "    std::vector< ViewShape * >(std::vector< ViewShape * >::size_type)\n"
-    "    std::vector< ViewShape * >(std::vector< ViewShape * >::size_type,std::vector< ViewShape * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewShapesContainer'.\n  Possible C/C++ prototypes are:\n    std::vector<(p.ViewShape)>()\n    std::vector<(p.ViewShape)>(std::vector<ViewShape * > const &)\n    std::vector<(p.ViewShape)>(std::vector<ViewShape * >::size_type)\n    std::vector<(p.ViewShape)>(std::vector<ViewShape * >::size_type,std::vector<ViewShape * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_push_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
-  std::vector< ViewShape * >::value_type arg2 = (std::vector< ViewShape * >::value_type) 0 ;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::value_type arg2 = (std::vector<ViewShape * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -39540,16 +39835,16 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_push_back(PyObject *SWIGUNUSEDPAR
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewShapesContainer_push_back",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_push_back" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_push_back" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0 |  0 );
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShapesContainer_push_back" "', argument " "2"" of type '" "std::vector< ViewShape * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShapesContainer_push_back" "', argument " "2"" of type '" "std::vector<ViewShape * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector< ViewShape * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector<ViewShape * >::value_type >(argp2);
   {
     try {
       (arg1)->push_back(arg2);
@@ -39570,21 +39865,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_front(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
-  std::vector< ViewShape * >::value_type result;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_front",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_front" "', argument " "1"" of type '" "std::vector< ViewShape * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_front" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
   {
     try {
-      result = (std::vector< ViewShape * >::value_type)((std::vector< ViewShape * > const *)arg1)->front();
+      result = (std::vector<ViewShape * >::value_type)((std::vector<ViewShape * > const *)arg1)->front();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -39593,7 +39888,7 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_front(PyObject *SWIGUNUSEDPARM(se
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -39602,21 +39897,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
-  std::vector< ViewShape * >::value_type result;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_back" "', argument " "1"" of type '" "std::vector< ViewShape * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_back" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
   {
     try {
-      result = (std::vector< ViewShape * >::value_type)((std::vector< ViewShape * > const *)arg1)->back();
+      result = (std::vector<ViewShape * >::value_type)((std::vector<ViewShape * > const *)arg1)->back();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -39625,7 +39920,7 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_back(PyObject *SWIGUNUSEDPARM(sel
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -39634,9 +39929,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_assign(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
-  std::vector< ViewShape * >::size_type arg2 ;
-  std::vector< ViewShape * >::value_type arg3 = (std::vector< ViewShape * >::value_type) 0 ;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::size_type arg2 ;
+  std::vector<ViewShape * >::value_type arg3 = (std::vector<ViewShape * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -39648,21 +39943,21 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_assign(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewShapesContainer_assign",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_assign" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_assign" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer_assign" "', argument " "2"" of type '" "std::vector< ViewShape * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer_assign" "', argument " "2"" of type '" "std::vector<ViewShape * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector< ViewShape * >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector<ViewShape * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewShapesContainer_assign" "', argument " "3"" of type '" "std::vector< ViewShape * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewShapesContainer_assign" "', argument " "3"" of type '" "std::vector<ViewShape * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector< ViewShape * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector<ViewShape * >::value_type >(argp3);
   {
     try {
       (arg1)->assign(arg2,arg3);
@@ -39683,9 +39978,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
-  std::vector< ViewShape * >::size_type arg2 ;
-  std::vector< ViewShape * >::value_type arg3 = (std::vector< ViewShape * >::value_type) 0 ;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::size_type arg2 ;
+  std::vector<ViewShape * >::value_type arg3 = (std::vector<ViewShape * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -39697,21 +39992,21 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_resize__SWIG_1(PyObject *SWIGUNUS
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewShapesContainer_resize",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_resize" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_resize" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer_resize" "', argument " "2"" of type '" "std::vector< ViewShape * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer_resize" "', argument " "2"" of type '" "std::vector<ViewShape * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector< ViewShape * >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector<ViewShape * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewShapesContainer_resize" "', argument " "3"" of type '" "std::vector< ViewShape * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewShapesContainer_resize" "', argument " "3"" of type '" "std::vector<ViewShape * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector< ViewShape * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector<ViewShape * >::value_type >(argp3);
   {
     try {
       (arg1)->resize(arg2,arg3);
@@ -39736,13 +40031,13 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_resize(PyObject *self, PyObject *
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator< ViewShape * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -39756,7 +40051,7 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_resize(PyObject *self, PyObject *
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator< ViewShape * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -39765,7 +40060,7 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_resize(PyObject *self, PyObject *
       }
       if (_v) {
         void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0);
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           return _wrap_ViewShapesContainer_resize__SWIG_1(self, args);
@@ -39775,20 +40070,17 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_resize(PyObject *self, PyObject *
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewShapesContainer_resize'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    resize(std::vector< ViewShape * > *,std::vector< ViewShape * >::size_type)\n"
-    "    resize(std::vector< ViewShape * > *,std::vector< ViewShape * >::size_type,std::vector< ViewShape * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewShapesContainer_resize'.\n  Possible C/C++ prototypes are:\n    resize(std::vector<ViewShape * >::size_type)\n    resize(std::vector<ViewShape * >::size_type,std::vector<ViewShape * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
-  std::vector< ViewShape * >::iterator arg2 ;
-  std::vector< ViewShape * >::value_type arg3 = (std::vector< ViewShape * >::value_type) 0 ;
-  std::vector< ViewShape * >::iterator result;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::iterator arg2 ;
+  std::vector<ViewShape * >::value_type arg3 = (std::vector<ViewShape * >::value_type) 0 ;
+  std::vector<ViewShape * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -39800,27 +40092,27 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_insert__SWIG_0(PyObject *SWIGUNUS
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewShapesContainer_insert",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_insert" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_insert" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_insert" "', argument " "2"" of type '" "std::vector< ViewShape * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewShape * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector< ViewShape * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< ViewShape * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_insert" "', argument " "2"" of type '" "std::vector< ViewShape * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewShape * >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0 |  0 );
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewShapesContainer_insert" "', argument " "3"" of type '" "std::vector< ViewShape * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewShapesContainer_insert" "', argument " "3"" of type '" "std::vector<ViewShape * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector< ViewShape * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector<ViewShape * >::value_type >(argp3);
   {
     try {
       result = (arg1)->insert(arg2,arg3);
@@ -39832,7 +40124,7 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_insert__SWIG_0(PyObject *SWIGUNUS
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewShape * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewShape * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -39842,10 +40134,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
-  std::vector< ViewShape * >::iterator arg2 ;
-  std::vector< ViewShape * >::size_type arg3 ;
-  std::vector< ViewShape * >::value_type arg4 = (std::vector< ViewShape * >::value_type) 0 ;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::iterator arg2 ;
+  std::vector<ViewShape * >::size_type arg3 ;
+  std::vector<ViewShape * >::value_type arg4 = (std::vector<ViewShape * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -39860,32 +40152,32 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_insert__SWIG_1(PyObject *SWIGUNUS
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:ViewShapesContainer_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_insert" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_insert" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_insert" "', argument " "2"" of type '" "std::vector< ViewShape * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewShape * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector< ViewShape * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< ViewShape * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_insert" "', argument " "2"" of type '" "std::vector< ViewShape * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewShape * >::iterator""'");
     }
   }
   ecode3 = SWIG_AsVal_size_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewShapesContainer_insert" "', argument " "3"" of type '" "std::vector< ViewShape * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewShapesContainer_insert" "', argument " "3"" of type '" "std::vector<ViewShape * >::size_type""'");
   } 
-  arg3 = static_cast< std::vector< ViewShape * >::size_type >(val3);
-  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0 |  0 );
+  arg3 = static_cast< std::vector<ViewShape * >::size_type >(val3);
+  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewShapesContainer_insert" "', argument " "4"" of type '" "std::vector< ViewShape * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewShapesContainer_insert" "', argument " "4"" of type '" "std::vector<ViewShape * >::value_type""'"); 
   }
-  arg4 = reinterpret_cast< std::vector< ViewShape * >::value_type >(argp4);
+  arg4 = reinterpret_cast< std::vector<ViewShape * >::value_type >(argp4);
   {
     try {
       (arg1)->insert(arg2,arg3,arg4);
@@ -39910,21 +40202,21 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_insert(PyObject *self, PyObject *
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator< ViewShape * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< ViewShape * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *>(iter) != 0));
       if (_v) {
         void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0);
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           return _wrap_ViewShapesContainer_insert__SWIG_0(self, args);
@@ -39934,12 +40226,12 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_insert(PyObject *self, PyObject *
   }
   if (argc == 4) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator< ViewShape * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< ViewShape * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *>(iter) != 0));
       if (_v) {
         {
           int res = SWIG_AsVal_size_t(argv[2], NULL);
@@ -39947,7 +40239,7 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_insert(PyObject *self, PyObject *
         }
         if (_v) {
           void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0);
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0);
           _v = SWIG_CheckState(res);
           if (_v) {
             return _wrap_ViewShapesContainer_insert__SWIG_1(self, args);
@@ -39958,18 +40250,15 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_insert(PyObject *self, PyObject *
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewShapesContainer_insert'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    insert(std::vector< ViewShape * > *,std::vector< ViewShape * >::iterator,std::vector< ViewShape * >::value_type)\n"
-    "    insert(std::vector< ViewShape * > *,std::vector< ViewShape * >::iterator,std::vector< ViewShape * >::size_type,std::vector< ViewShape * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewShapesContainer_insert'.\n  Possible C/C++ prototypes are:\n    insert(std::vector<ViewShape * >::iterator,std::vector<ViewShape * >::value_type)\n    insert(std::vector<ViewShape * >::iterator,std::vector<ViewShape * >::size_type,std::vector<ViewShape * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_reserve(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
-  std::vector< ViewShape * >::size_type arg2 ;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::size_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -39978,16 +40267,16 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_reserve(PyObject *SWIGUNUSEDPARM(
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewShapesContainer_reserve",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_reserve" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_reserve" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer_reserve" "', argument " "2"" of type '" "std::vector< ViewShape * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer_reserve" "', argument " "2"" of type '" "std::vector<ViewShape * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector< ViewShape * >::size_type >(val2);
+  arg2 = static_cast< std::vector<ViewShape * >::size_type >(val2);
   {
     try {
       (arg1)->reserve(arg2);
@@ -40008,21 +40297,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_capacity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
-  std::vector< ViewShape * >::size_type result;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector<ViewShape * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_capacity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_capacity" "', argument " "1"" of type '" "std::vector< ViewShape * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_capacity" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
   {
     try {
-      result = ((std::vector< ViewShape * > const *)arg1)->capacity();
+      result = ((std::vector<ViewShape * > const *)arg1)->capacity();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -40040,17 +40329,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_ViewShapesContainer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_ViewShapesContainer",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ViewShapesContainer" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ViewShapesContainer" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
   {
     try {
       delete arg1;
@@ -40072,14 +40361,14 @@ fail:
 
 SWIGINTERN PyObject *ViewShapesContainer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
   PyObject **arg2 = (PyObject **) 0 ;
   swig::PySwigIterator *result = 0 ;
   void *argp1 = 0 ;
@@ -40088,11 +40377,11 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_iterator(PyObject *SWIGUNUSEDPARM(
   
   arg2 = &obj0;
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_iterator" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_iterator" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
   {
     try {
       result = (swig::PySwigIterator *)std_vector_Sl_ViewEdge_Sm__Sg__iterator(arg1,arg2);
@@ -40113,21 +40402,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer___nonzero__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer___nonzero__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___nonzero__" "', argument " "1"" of type '" "std::vector< ViewEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___nonzero__" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
   {
     try {
-      result = (bool)std_vector_Sl_ViewEdge_Sm__Sg____nonzero__((std::vector< ViewEdge * > const *)arg1);
+      result = (bool)std_vector_Sl_ViewEdge_Sm__Sg____nonzero__((std::vector<ViewEdge * > const *)arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -40145,21 +40434,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer___len__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
-  std::vector< ViewEdge * >::size_type result;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer___len__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___len__" "', argument " "1"" of type '" "std::vector< ViewEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___len__" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
   {
     try {
-      result = std_vector_Sl_ViewEdge_Sm__Sg____len__((std::vector< ViewEdge * > const *)arg1);
+      result = std_vector_Sl_ViewEdge_Sm__Sg____len__((std::vector<ViewEdge * > const *)arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -40177,22 +40466,22 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
-  std::vector< ViewEdge * >::value_type result;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_pop" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_pop" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
   {
     try {
       try {
-        result = (std::vector< ViewEdge * >::value_type)std_vector_Sl_ViewEdge_Sm__Sg__pop(arg1);
+        result = (std::vector<ViewEdge * >::value_type)std_vector_Sl_ViewEdge_Sm__Sg__pop(arg1);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -40206,7 +40495,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_pop(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -40215,10 +40504,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
-  std::vector< ViewEdge * >::difference_type arg2 ;
-  std::vector< ViewEdge * >::difference_type arg3 ;
-  std::vector< ViewEdge *,std::allocator< ViewEdge * > > *result = 0 ;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::difference_type arg2 ;
+  std::vector<ViewEdge * >::difference_type arg3 ;
+  std::vector<ViewEdge *,std::allocator<ViewEdge * > > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -40230,25 +40519,25 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer___getslice__(PyObject *SWIGUNUSEDP
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewEdgesContainer___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___getslice__" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___getslice__" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer___getslice__" "', argument " "2"" of type '" "std::vector< ViewEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer___getslice__" "', argument " "2"" of type '" "std::vector<ViewEdge * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector< ViewEdge * >::difference_type >(val2);
+  arg2 = static_cast< std::vector<ViewEdge * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewEdgesContainer___getslice__" "', argument " "3"" of type '" "std::vector< ViewEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewEdgesContainer___getslice__" "', argument " "3"" of type '" "std::vector<ViewEdge * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector< ViewEdge * >::difference_type >(val3);
+  arg3 = static_cast< std::vector<ViewEdge * >::difference_type >(val3);
   {
     try {
       try {
-        result = (std::vector< ViewEdge *,std::allocator< ViewEdge * > > *)std_vector_Sl_ViewEdge_Sm__Sg____getslice__(arg1,arg2,arg3);
+        result = (std::vector<ViewEdge *,std::allocator<ViewEdge * > > *)std_vector_Sl_ViewEdge_Sm__Sg____getslice__(arg1,arg2,arg3);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -40262,7 +40551,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer___getslice__(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -40271,10 +40560,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer___setslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
-  std::vector< ViewEdge * >::difference_type arg2 ;
-  std::vector< ViewEdge * >::difference_type arg3 ;
-  std::vector< ViewEdge *,std::allocator< ViewEdge * > > *arg4 = 0 ;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::difference_type arg2 ;
+  std::vector<ViewEdge * >::difference_type arg3 ;
+  std::vector<ViewEdge *,std::allocator<ViewEdge * > > *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -40288,36 +40577,36 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer___setslice__(PyObject *SWIGUNUSEDP
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:ViewEdgesContainer___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___setslice__" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___setslice__" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer___setslice__" "', argument " "2"" of type '" "std::vector< ViewEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer___setslice__" "', argument " "2"" of type '" "std::vector<ViewEdge * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector< ViewEdge * >::difference_type >(val2);
+  arg2 = static_cast< std::vector<ViewEdge * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewEdgesContainer___setslice__" "', argument " "3"" of type '" "std::vector< ViewEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewEdgesContainer___setslice__" "', argument " "3"" of type '" "std::vector<ViewEdge * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector< ViewEdge * >::difference_type >(val3);
+  arg3 = static_cast< std::vector<ViewEdge * >::difference_type >(val3);
   {
-    std::vector<ViewEdge*,std::allocator< ViewEdge * > > *ptr = (std::vector<ViewEdge*,std::allocator< ViewEdge * > > *)0;
+    std::vector<ViewEdge*,std::allocator<ViewEdge * > > *ptr = (std::vector<ViewEdge*,std::allocator<ViewEdge * > > *)0;
     res4 = swig::asptr(obj3, &ptr);
     if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewEdgesContainer___setslice__" "', argument " "4"" of type '" "std::vector< ViewEdge *,std::allocator< ViewEdge * > > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewEdgesContainer___setslice__" "', argument " "4"" of type '" "std::vector<ViewEdge *,std::allocator<ViewEdge * > > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgesContainer___setslice__" "', argument " "4"" of type '" "std::vector< ViewEdge *,std::allocator< ViewEdge * > > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgesContainer___setslice__" "', argument " "4"" of type '" "std::vector<ViewEdge *,std::allocator<ViewEdge * > > const &""'"); 
     }
     arg4 = ptr;
   }
   {
     try {
       try {
-        std_vector_Sl_ViewEdge_Sm__Sg____setslice__(arg1,arg2,arg3,(std::vector< ViewEdge *,std::allocator< ViewEdge * > > const &)*arg4);
+        std_vector_Sl_ViewEdge_Sm__Sg____setslice__(arg1,arg2,arg3,(std::vector<ViewEdge *,std::allocator<ViewEdge * > > const &)*arg4);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -40345,9 +40634,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer___delslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
-  std::vector< ViewEdge * >::difference_type arg2 ;
-  std::vector< ViewEdge * >::difference_type arg3 ;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::difference_type arg2 ;
+  std::vector<ViewEdge * >::difference_type arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -40359,21 +40648,21 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer___delslice__(PyObject *SWIGUNUSEDP
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewEdgesContainer___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___delslice__" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___delslice__" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer___delslice__" "', argument " "2"" of type '" "std::vector< ViewEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer___delslice__" "', argument " "2"" of type '" "std::vector<ViewEdge * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector< ViewEdge * >::difference_type >(val2);
+  arg2 = static_cast< std::vector<ViewEdge * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewEdgesContainer___delslice__" "', argument " "3"" of type '" "std::vector< ViewEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewEdgesContainer___delslice__" "', argument " "3"" of type '" "std::vector<ViewEdge * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector< ViewEdge * >::difference_type >(val3);
+  arg3 = static_cast< std::vector<ViewEdge * >::difference_type >(val3);
   {
     try {
       try {
@@ -40400,8 +40689,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer___delitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
-  std::vector< ViewEdge * >::difference_type arg2 ;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::difference_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -40410,16 +40699,16 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer___delitem__(PyObject *SWIGUNUSEDPA
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgesContainer___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___delitem__" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___delitem__" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer___delitem__" "', argument " "2"" of type '" "std::vector< ViewEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer___delitem__" "', argument " "2"" of type '" "std::vector<ViewEdge * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector< ViewEdge * >::difference_type >(val2);
+  arg2 = static_cast< std::vector<ViewEdge * >::difference_type >(val2);
   {
     try {
       try {
@@ -40446,9 +40735,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer___getitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
-  std::vector< ViewEdge * >::difference_type arg2 ;
-  std::vector< ViewEdge * >::value_type result;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::difference_type arg2 ;
+  std::vector<ViewEdge * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -40457,20 +40746,20 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer___getitem__(PyObject *SWIGUNUSEDPA
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgesContainer___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___getitem__" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___getitem__" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer___getitem__" "', argument " "2"" of type '" "std::vector< ViewEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer___getitem__" "', argument " "2"" of type '" "std::vector<ViewEdge * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector< ViewEdge * >::difference_type >(val2);
+  arg2 = static_cast< std::vector<ViewEdge * >::difference_type >(val2);
   {
     try {
       try {
-        result = (std::vector< ViewEdge * >::value_type)std_vector_Sl_ViewEdge_Sm__Sg____getitem__(arg1,arg2);
+        result = (std::vector<ViewEdge * >::value_type)std_vector_Sl_ViewEdge_Sm__Sg____getitem__(arg1,arg2);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -40484,7 +40773,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer___getitem__(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -40493,9 +40782,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer___setitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
-  std::vector< ViewEdge * >::difference_type arg2 ;
-  std::vector< ViewEdge * >::value_type arg3 = (std::vector< ViewEdge * >::value_type) 0 ;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::difference_type arg2 ;
+  std::vector<ViewEdge * >::value_type arg3 = (std::vector<ViewEdge * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -40507,21 +40796,21 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer___setitem__(PyObject *SWIGUNUSEDPA
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewEdgesContainer___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___setitem__" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___setitem__" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer___setitem__" "', argument " "2"" of type '" "std::vector< ViewEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer___setitem__" "', argument " "2"" of type '" "std::vector<ViewEdge * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector< ViewEdge * >::difference_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector<ViewEdge * >::difference_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewEdgesContainer___setitem__" "', argument " "3"" of type '" "std::vector< ViewEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewEdgesContainer___setitem__" "', argument " "3"" of type '" "std::vector<ViewEdge * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector< ViewEdge * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector<ViewEdge * >::value_type >(argp3);
   {
     try {
       try {
@@ -40548,8 +40837,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
-  std::vector< ViewEdge * >::value_type arg2 = (std::vector< ViewEdge * >::value_type) 0 ;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::value_type arg2 = (std::vector<ViewEdge * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -40558,16 +40847,16 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_append(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgesContainer_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_append" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_append" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0 |  0 );
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgesContainer_append" "', argument " "2"" of type '" "std::vector< ViewEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgesContainer_append" "', argument " "2"" of type '" "std::vector<ViewEdge * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector< ViewEdge * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector<ViewEdge * >::value_type >(argp2);
   {
     try {
       std_vector_Sl_ViewEdge_Sm__Sg__append(arg1,arg2);
@@ -40588,12 +40877,12 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewEdge * > *result = 0 ;
+  std::vector<ViewEdge * > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_ViewEdgesContainer")) SWIG_fail;
   {
     try {
-      result = (std::vector< ViewEdge * > *)new std::vector< ViewEdge * >();
+      result = (std::vector<ViewEdge * > *)new std::vector<ViewEdge * >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -40602,7 +40891,7 @@ SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer__SWIG_0(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -40611,26 +40900,26 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewEdge * > *arg1 = 0 ;
-  std::vector< ViewEdge * > *result = 0 ;
+  std::vector<ViewEdge * > *arg1 = 0 ;
+  std::vector<ViewEdge * > *result = 0 ;
   int res1 = SWIG_OLDOBJ ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_ViewEdgesContainer",&obj0)) SWIG_fail;
   {
-    std::vector<ViewEdge*,std::allocator< ViewEdge * > > *ptr = (std::vector<ViewEdge*,std::allocator< ViewEdge * > > *)0;
+    std::vector<ViewEdge*,std::allocator<ViewEdge * > > *ptr = (std::vector<ViewEdge*,std::allocator<ViewEdge * > > *)0;
     res1 = swig::asptr(obj0, &ptr);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ViewEdgesContainer" "', argument " "1"" of type '" "std::vector< ViewEdge * > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ViewEdgesContainer" "', argument " "1"" of type '" "std::vector<ViewEdge * > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ViewEdgesContainer" "', argument " "1"" of type '" "std::vector< ViewEdge * > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ViewEdgesContainer" "', argument " "1"" of type '" "std::vector<ViewEdge * > const &""'"); 
     }
     arg1 = ptr;
   }
   {
     try {
-      result = (std::vector< ViewEdge * > *)new std::vector< ViewEdge * >((std::vector< ViewEdge * > const &)*arg1);
+      result = (std::vector<ViewEdge * > *)new std::vector<ViewEdge * >((std::vector<ViewEdge * > const &)*arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -40639,7 +40928,7 @@ SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer__SWIG_1(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, SWIG_POINTER_NEW |  0 );
   if (SWIG_IsNewObj(res1)) delete arg1;
   return resultobj;
 fail:
@@ -40650,21 +40939,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_empty",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_empty" "', argument " "1"" of type '" "std::vector< ViewEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_empty" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
   {
     try {
-      result = (bool)((std::vector< ViewEdge * > const *)arg1)->empty();
+      result = (bool)((std::vector<ViewEdge * > const *)arg1)->empty();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -40682,21 +40971,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
-  std::vector< ViewEdge * >::size_type result;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_size" "', argument " "1"" of type '" "std::vector< ViewEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_size" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
   {
     try {
-      result = ((std::vector< ViewEdge * > const *)arg1)->size();
+      result = ((std::vector<ViewEdge * > const *)arg1)->size();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -40714,17 +41003,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_clear" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_clear" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
   {
     try {
       (arg1)->clear();
@@ -40745,8 +41034,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
-  std::vector< ViewEdge * > *arg2 = 0 ;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -40755,19 +41044,19 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_swap(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgesContainer_swap",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_swap" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_swap" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t,  0 );
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgesContainer_swap" "', argument " "2"" of type '" "std::vector< ViewEdge * > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgesContainer_swap" "', argument " "2"" of type '" "std::vector<ViewEdge * > &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgesContainer_swap" "', argument " "2"" of type '" "std::vector< ViewEdge * > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgesContainer_swap" "', argument " "2"" of type '" "std::vector<ViewEdge * > &""'"); 
   }
-  arg2 = reinterpret_cast< std::vector< ViewEdge * > * >(argp2);
+  arg2 = reinterpret_cast< std::vector<ViewEdge * > * >(argp2);
   {
     try {
       (arg1)->swap(*arg2);
@@ -40788,21 +41077,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
-  SwigValueWrapper< std::allocator< ViewEdge * > > result;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  SwigValueWrapper<std::allocator<ViewEdge * > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_get_allocator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_get_allocator" "', argument " "1"" of type '" "std::vector< ViewEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_get_allocator" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
   {
     try {
-      result = ((std::vector< ViewEdge * > const *)arg1)->get_allocator();
+      result = ((std::vector<ViewEdge * > const *)arg1)->get_allocator();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -40811,30 +41100,30 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_get_allocator(PyObject *SWIGUNUSED
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new std::vector< ViewEdge * >::allocator_type(static_cast< const std::vector< ViewEdge * >::allocator_type& >(result))), SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new std::vector<ViewEdge * >::allocator_type(static_cast< const std::vector<ViewEdge * >::allocator_type& >(result))), SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdgesContainer_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_begin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
-  std::vector< ViewEdge * >::const_iterator result;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_begin" "', argument " "1"" of type '" "std::vector< ViewEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_begin" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
   {
     try {
-      result = ((std::vector< ViewEdge * > const *)arg1)->begin();
+      result = (arg1)->begin();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -40843,7 +41132,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_begin(PyObject *SWIGUNUSEDPARM(sel
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewEdge * >::const_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewEdge * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -40851,23 +41140,89 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdgesContainer_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_begin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
-  std::vector< ViewEdge * >::const_iterator result;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_begin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_begin" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<ViewEdge * > const *)arg1)->begin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewEdge * >::const_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_begin(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewEdgesContainer_begin__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewEdgesContainer_begin__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgesContainer_begin'.\n  Possible C/C++ prototypes are:\n    begin()\n    begin()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_end" "', argument " "1"" of type '" "std::vector< ViewEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_end" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
   {
     try {
-      result = ((std::vector< ViewEdge * > const *)arg1)->end();
+      result = (arg1)->end();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -40876,7 +41231,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_end(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewEdge * >::const_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewEdge * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -40884,23 +41239,89 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdgesContainer_rbegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
-  std::vector< ViewEdge * >::const_reverse_iterator result;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_end",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_end" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<ViewEdge * > const *)arg1)->end();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewEdge * >::const_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_end(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewEdgesContainer_end__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewEdgesContainer_end__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgesContainer_end'.\n  Possible C/C++ prototypes are:\n    end()\n    end()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_rbegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::reverse_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_rbegin" "', argument " "1"" of type '" "std::vector< ViewEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_rbegin" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
   {
     try {
-      result = ((std::vector< ViewEdge * > const *)arg1)->rbegin();
+      result = (arg1)->rbegin();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -40909,7 +41330,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_rbegin(PyObject *SWIGUNUSEDPARM(se
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewEdge * >::const_reverse_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewEdge * >::reverse_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -40917,23 +41338,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdgesContainer_rend(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_rbegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
-  std::vector< ViewEdge * >::const_reverse_iterator result;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::const_reverse_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_rbegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_rend" "', argument " "1"" of type '" "std::vector< ViewEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_rbegin" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
   {
     try {
-      result = ((std::vector< ViewEdge * > const *)arg1)->rend();
+      result = ((std::vector<ViewEdge * > const *)arg1)->rbegin();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -40942,7 +41363,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_rend(PyObject *SWIGUNUSEDPARM(self
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewEdge * >::const_reverse_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewEdge * >::const_reverse_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -40950,10 +41371,142 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_rbegin(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewEdgesContainer_rbegin__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewEdgesContainer_rbegin__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgesContainer_rbegin'.\n  Possible C/C++ prototypes are:\n    rbegin()\n    rbegin()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_rend__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::reverse_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_rend",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_rend" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  {
+    try {
+      result = (arg1)->rend();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewEdge * >::reverse_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_rend__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::const_reverse_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_rend",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_rend" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<ViewEdge * > const *)arg1)->rend();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewEdge * >::const_reverse_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_rend(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewEdgesContainer_rend__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewEdgesContainer_rend__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgesContainer_rend'.\n  Possible C/C++ prototypes are:\n    rend()\n    rend()\n");
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewEdge * >::size_type arg1 ;
-  std::vector< ViewEdge * > *result = 0 ;
+  std::vector<ViewEdge * >::size_type arg1 ;
+  std::vector<ViewEdge * > *result = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -40961,12 +41514,12 @@ SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer__SWIG_2(PyObject *SWIGUNUSEDPA
   if (!PyArg_ParseTuple(args,(char *)"O:new_ViewEdgesContainer",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ViewEdgesContainer" "', argument " "1"" of type '" "std::vector< ViewEdge * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ViewEdgesContainer" "', argument " "1"" of type '" "std::vector<ViewEdge * >::size_type""'");
   } 
-  arg1 = static_cast< std::vector< ViewEdge * >::size_type >(val1);
+  arg1 = static_cast< std::vector<ViewEdge * >::size_type >(val1);
   {
     try {
-      result = (std::vector< ViewEdge * > *)new std::vector< ViewEdge * >(arg1);
+      result = (std::vector<ViewEdge * > *)new std::vector<ViewEdge * >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -40975,7 +41528,7 @@ SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer__SWIG_2(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -40984,17 +41537,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_pop_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_pop_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_pop_back" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_pop_back" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
   {
     try {
       (arg1)->pop_back();
@@ -41015,8 +41568,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
-  std::vector< ViewEdge * >::size_type arg2 ;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::size_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -41025,16 +41578,16 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_resize__SWIG_0(PyObject *SWIGUNUSE
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgesContainer_resize",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_resize" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_resize" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer_resize" "', argument " "2"" of type '" "std::vector< ViewEdge * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer_resize" "', argument " "2"" of type '" "std::vector<ViewEdge * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector< ViewEdge * >::size_type >(val2);
+  arg2 = static_cast< std::vector<ViewEdge * >::size_type >(val2);
   {
     try {
       (arg1)->resize(arg2);
@@ -41055,9 +41608,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
-  std::vector< ViewEdge * >::iterator arg2 ;
-  std::vector< ViewEdge * >::iterator result;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::iterator arg2 ;
+  std::vector<ViewEdge * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -41066,20 +41619,20 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_erase__SWIG_0(PyObject *SWIGUNUSED
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgesContainer_erase",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_erase" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_erase" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_erase" "', argument " "2"" of type '" "std::vector< ViewEdge * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewEdge * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector< ViewEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< ViewEdge * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_erase" "', argument " "2"" of type '" "std::vector< ViewEdge * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewEdge * >::iterator""'");
     }
   }
   {
@@ -41093,7 +41646,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_erase__SWIG_0(PyObject *SWIGUNUSED
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewEdge * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewEdge * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -41103,10 +41656,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
-  std::vector< ViewEdge * >::iterator arg2 ;
-  std::vector< ViewEdge * >::iterator arg3 ;
-  std::vector< ViewEdge * >::iterator result;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::iterator arg2 ;
+  std::vector<ViewEdge * >::iterator arg3 ;
+  std::vector<ViewEdge * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -41118,31 +41671,31 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_erase__SWIG_1(PyObject *SWIGUNUSED
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewEdgesContainer_erase",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_erase" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_erase" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_erase" "', argument " "2"" of type '" "std::vector< ViewEdge * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewEdge * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector< ViewEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< ViewEdge * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_erase" "', argument " "2"" of type '" "std::vector< ViewEdge * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewEdge * >::iterator""'");
     }
   }
   res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res3) || !iter3) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_erase" "', argument " "3"" of type '" "std::vector< ViewEdge * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_erase" "', argument " "3"" of type '" "std::vector<ViewEdge * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector< ViewEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< ViewEdge * >::iterator > *>(iter3);
+    swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *>(iter3);
     if (iter_t) {
       arg3 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_erase" "', argument " "3"" of type '" "std::vector< ViewEdge * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_erase" "', argument " "3"" of type '" "std::vector<ViewEdge * >::iterator""'");
     }
   }
   {
@@ -41156,7 +41709,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_erase__SWIG_1(PyObject *SWIGUNUSED
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewEdge * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewEdge * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -41170,18 +41723,18 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_erase(PyObject *self, PyObject *ar
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator< ViewEdge * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< ViewEdge * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *>(iter) != 0));
       if (_v) {
         return _wrap_ViewEdgesContainer_erase__SWIG_0(self, args);
       }
@@ -41189,16 +41742,16 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_erase(PyObject *self, PyObject *ar
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator< ViewEdge * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< ViewEdge * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *>(iter) != 0));
       if (_v) {
         swig::PySwigIterator *iter = 0;
         int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< ViewEdge * >::iterator > *>(iter) != 0));
+        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *>(iter) != 0));
         if (_v) {
           return _wrap_ViewEdgesContainer_erase__SWIG_1(self, args);
         }
@@ -41207,19 +41760,16 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_erase(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgesContainer_erase'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    erase(std::vector< ViewEdge * > *,std::vector< ViewEdge * >::iterator)\n"
-    "    erase(std::vector< ViewEdge * > *,std::vector< ViewEdge * >::iterator,std::vector< ViewEdge * >::iterator)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgesContainer_erase'.\n  Possible C/C++ prototypes are:\n    erase(std::vector<ViewEdge * >::iterator)\n    erase(std::vector<ViewEdge * >::iterator,std::vector<ViewEdge * >::iterator)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewEdge * >::size_type arg1 ;
-  std::vector< ViewEdge * >::value_type arg2 = (std::vector< ViewEdge * >::value_type) 0 ;
-  std::vector< ViewEdge * > *result = 0 ;
+  std::vector<ViewEdge * >::size_type arg1 ;
+  std::vector<ViewEdge * >::value_type arg2 = (std::vector<ViewEdge * >::value_type) 0 ;
+  std::vector<ViewEdge * > *result = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   void *argp2 = 0 ;
@@ -41230,17 +41780,17 @@ SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer__SWIG_3(PyObject *SWIGUNUSEDPA
   if (!PyArg_ParseTuple(args,(char *)"OO:new_ViewEdgesContainer",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ViewEdgesContainer" "', argument " "1"" of type '" "std::vector< ViewEdge * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ViewEdgesContainer" "', argument " "1"" of type '" "std::vector<ViewEdge * >::size_type""'");
   } 
-  arg1 = static_cast< std::vector< ViewEdge * >::size_type >(val1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0 |  0 );
+  arg1 = static_cast< std::vector<ViewEdge * >::size_type >(val1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ViewEdgesContainer" "', argument " "2"" of type '" "std::vector< ViewEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ViewEdgesContainer" "', argument " "2"" of type '" "std::vector<ViewEdge * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector< ViewEdge * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector<ViewEdge * >::value_type >(argp2);
   {
     try {
-      result = (std::vector< ViewEdge * > *)new std::vector< ViewEdge * >(arg1,arg2);
+      result = (std::vector<ViewEdge * > *)new std::vector<ViewEdge * >(arg1,arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -41249,7 +41799,7 @@ SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer__SWIG_3(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -41262,7 +41812,7 @@ SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer(PyObject *self, PyObject *args
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -41281,7 +41831,7 @@ SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer(PyObject *self, PyObject *args
   }
   if (argc == 1) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator< ViewEdge * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_new_ViewEdgesContainer__SWIG_1(self, args);
@@ -41295,7 +41845,7 @@ SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer(PyObject *self, PyObject *args
     }
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_new_ViewEdgesContainer__SWIG_3(self, args);
@@ -41304,20 +41854,15 @@ SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer(PyObject *self, PyObject *args
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewEdgesContainer'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    std::vector< ViewEdge * >()\n"
-    "    std::vector< ViewEdge * >(std::vector< ViewEdge * > const &)\n"
-    "    std::vector< ViewEdge * >(std::vector< ViewEdge * >::size_type)\n"
-    "    std::vector< ViewEdge * >(std::vector< ViewEdge * >::size_type,std::vector< ViewEdge * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewEdgesContainer'.\n  Possible C/C++ prototypes are:\n    std::vector<(p.ViewEdge)>()\n    std::vector<(p.ViewEdge)>(std::vector<ViewEdge * > const &)\n    std::vector<(p.ViewEdge)>(std::vector<ViewEdge * >::size_type)\n    std::vector<(p.ViewEdge)>(std::vector<ViewEdge * >::size_type,std::vector<ViewEdge * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_push_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
-  std::vector< ViewEdge * >::value_type arg2 = (std::vector< ViewEdge * >::value_type) 0 ;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::value_type arg2 = (std::vector<ViewEdge * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -41326,16 +41871,16 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_push_back(PyObject *SWIGUNUSEDPARM
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgesContainer_push_back",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_push_back" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_push_back" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0 |  0 );
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgesContainer_push_back" "', argument " "2"" of type '" "std::vector< ViewEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgesContainer_push_back" "', argument " "2"" of type '" "std::vector<ViewEdge * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector< ViewEdge * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector<ViewEdge * >::value_type >(argp2);
   {
     try {
       (arg1)->push_back(arg2);
@@ -41356,21 +41901,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_front(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
-  std::vector< ViewEdge * >::value_type result;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_front",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_front" "', argument " "1"" of type '" "std::vector< ViewEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_front" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
   {
     try {
-      result = (std::vector< ViewEdge * >::value_type)((std::vector< ViewEdge * > const *)arg1)->front();
+      result = (std::vector<ViewEdge * >::value_type)((std::vector<ViewEdge * > const *)arg1)->front();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -41379,7 +41924,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_front(PyObject *SWIGUNUSEDPARM(sel
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -41388,21 +41933,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
-  std::vector< ViewEdge * >::value_type result;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_back" "', argument " "1"" of type '" "std::vector< ViewEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_back" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
   {
     try {
-      result = (std::vector< ViewEdge * >::value_type)((std::vector< ViewEdge * > const *)arg1)->back();
+      result = (std::vector<ViewEdge * >::value_type)((std::vector<ViewEdge * > const *)arg1)->back();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -41411,7 +41956,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_back(PyObject *SWIGUNUSEDPARM(self
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -41420,9 +41965,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_assign(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
-  std::vector< ViewEdge * >::size_type arg2 ;
-  std::vector< ViewEdge * >::value_type arg3 = (std::vector< ViewEdge * >::value_type) 0 ;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::size_type arg2 ;
+  std::vector<ViewEdge * >::value_type arg3 = (std::vector<ViewEdge * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -41434,21 +41979,21 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_assign(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewEdgesContainer_assign",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_assign" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_assign" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer_assign" "', argument " "2"" of type '" "std::vector< ViewEdge * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer_assign" "', argument " "2"" of type '" "std::vector<ViewEdge * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector< ViewEdge * >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector<ViewEdge * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewEdgesContainer_assign" "', argument " "3"" of type '" "std::vector< ViewEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewEdgesContainer_assign" "', argument " "3"" of type '" "std::vector<ViewEdge * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector< ViewEdge * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector<ViewEdge * >::value_type >(argp3);
   {
     try {
       (arg1)->assign(arg2,arg3);
@@ -41469,9 +42014,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
-  std::vector< ViewEdge * >::size_type arg2 ;
-  std::vector< ViewEdge * >::value_type arg3 = (std::vector< ViewEdge * >::value_type) 0 ;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::size_type arg2 ;
+  std::vector<ViewEdge * >::value_type arg3 = (std::vector<ViewEdge * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -41483,21 +42028,21 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_resize__SWIG_1(PyObject *SWIGUNUSE
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewEdgesContainer_resize",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_resize" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_resize" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer_resize" "', argument " "2"" of type '" "std::vector< ViewEdge * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer_resize" "', argument " "2"" of type '" "std::vector<ViewEdge * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector< ViewEdge * >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector<ViewEdge * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewEdgesContainer_resize" "', argument " "3"" of type '" "std::vector< ViewEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewEdgesContainer_resize" "', argument " "3"" of type '" "std::vector<ViewEdge * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector< ViewEdge * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector<ViewEdge * >::value_type >(argp3);
   {
     try {
       (arg1)->resize(arg2,arg3);
@@ -41522,13 +42067,13 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_resize(PyObject *self, PyObject *a
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator< ViewEdge * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -41542,7 +42087,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_resize(PyObject *self, PyObject *a
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator< ViewEdge * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -41551,7 +42096,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_resize(PyObject *self, PyObject *a
       }
       if (_v) {
         void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0);
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           return _wrap_ViewEdgesContainer_resize__SWIG_1(self, args);
@@ -41561,20 +42106,17 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_resize(PyObject *self, PyObject *a
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgesContainer_resize'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    resize(std::vector< ViewEdge * > *,std::vector< ViewEdge * >::size_type)\n"
-    "    resize(std::vector< ViewEdge * > *,std::vector< ViewEdge * >::size_type,std::vector< ViewEdge * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgesContainer_resize'.\n  Possible C/C++ prototypes are:\n    resize(std::vector<ViewEdge * >::size_type)\n    resize(std::vector<ViewEdge * >::size_type,std::vector<ViewEdge * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
-  std::vector< ViewEdge * >::iterator arg2 ;
-  std::vector< ViewEdge * >::value_type arg3 = (std::vector< ViewEdge * >::value_type) 0 ;
-  std::vector< ViewEdge * >::iterator result;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::iterator arg2 ;
+  std::vector<ViewEdge * >::value_type arg3 = (std::vector<ViewEdge * >::value_type) 0 ;
+  std::vector<ViewEdge * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -41586,27 +42128,27 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_insert__SWIG_0(PyObject *SWIGUNUSE
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewEdgesContainer_insert",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_insert" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_insert" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_insert" "', argument " "2"" of type '" "std::vector< ViewEdge * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewEdge * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector< ViewEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< ViewEdge * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_insert" "', argument " "2"" of type '" "std::vector< ViewEdge * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewEdge * >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0 |  0 );
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewEdgesContainer_insert" "', argument " "3"" of type '" "std::vector< ViewEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewEdgesContainer_insert" "', argument " "3"" of type '" "std::vector<ViewEdge * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector< ViewEdge * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector<ViewEdge * >::value_type >(argp3);
   {
     try {
       result = (arg1)->insert(arg2,arg3);
@@ -41618,7 +42160,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_insert__SWIG_0(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewEdge * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewEdge * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -41628,10 +42170,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
-  std::vector< ViewEdge * >::iterator arg2 ;
-  std::vector< ViewEdge * >::size_type arg3 ;
-  std::vector< ViewEdge * >::value_type arg4 = (std::vector< ViewEdge * >::value_type) 0 ;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::iterator arg2 ;
+  std::vector<ViewEdge * >::size_type arg3 ;
+  std::vector<ViewEdge * >::value_type arg4 = (std::vector<ViewEdge * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -41646,32 +42188,32 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_insert__SWIG_1(PyObject *SWIGUNUSE
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:ViewEdgesContainer_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_insert" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_insert" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_insert" "', argument " "2"" of type '" "std::vector< ViewEdge * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewEdge * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector< ViewEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< ViewEdge * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_insert" "', argument " "2"" of type '" "std::vector< ViewEdge * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewEdge * >::iterator""'");
     }
   }
   ecode3 = SWIG_AsVal_size_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewEdgesContainer_insert" "', argument " "3"" of type '" "std::vector< ViewEdge * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewEdgesContainer_insert" "', argument " "3"" of type '" "std::vector<ViewEdge * >::size_type""'");
   } 
-  arg3 = static_cast< std::vector< ViewEdge * >::size_type >(val3);
-  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0 |  0 );
+  arg3 = static_cast< std::vector<ViewEdge * >::size_type >(val3);
+  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewEdgesContainer_insert" "', argument " "4"" of type '" "std::vector< ViewEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewEdgesContainer_insert" "', argument " "4"" of type '" "std::vector<ViewEdge * >::value_type""'"); 
   }
-  arg4 = reinterpret_cast< std::vector< ViewEdge * >::value_type >(argp4);
+  arg4 = reinterpret_cast< std::vector<ViewEdge * >::value_type >(argp4);
   {
     try {
       (arg1)->insert(arg2,arg3,arg4);
@@ -41696,21 +42238,21 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_insert(PyObject *self, PyObject *a
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator< ViewEdge * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< ViewEdge * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *>(iter) != 0));
       if (_v) {
         void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0);
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           return _wrap_ViewEdgesContainer_insert__SWIG_0(self, args);
@@ -41720,12 +42262,12 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_insert(PyObject *self, PyObject *a
   }
   if (argc == 4) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator< ViewEdge * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< ViewEdge * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *>(iter) != 0));
       if (_v) {
         {
           int res = SWIG_AsVal_size_t(argv[2], NULL);
@@ -41733,7 +42275,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_insert(PyObject *self, PyObject *a
         }
         if (_v) {
           void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0);
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0);
           _v = SWIG_CheckState(res);
           if (_v) {
             return _wrap_ViewEdgesContainer_insert__SWIG_1(self, args);
@@ -41744,18 +42286,15 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_insert(PyObject *self, PyObject *a
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgesContainer_insert'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    insert(std::vector< ViewEdge * > *,std::vector< ViewEdge * >::iterator,std::vector< ViewEdge * >::value_type)\n"
-    "    insert(std::vector< ViewEdge * > *,std::vector< ViewEdge * >::iterator,std::vector< ViewEdge * >::size_type,std::vector< ViewEdge * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgesContainer_insert'.\n  Possible C/C++ prototypes are:\n    insert(std::vector<ViewEdge * >::iterator,std::vector<ViewEdge * >::value_type)\n    insert(std::vector<ViewEdge * >::iterator,std::vector<ViewEdge * >::size_type,std::vector<ViewEdge * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_reserve(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
-  std::vector< ViewEdge * >::size_type arg2 ;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::size_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -41764,16 +42303,16 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_reserve(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgesContainer_reserve",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_reserve" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_reserve" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer_reserve" "', argument " "2"" of type '" "std::vector< ViewEdge * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer_reserve" "', argument " "2"" of type '" "std::vector<ViewEdge * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector< ViewEdge * >::size_type >(val2);
+  arg2 = static_cast< std::vector<ViewEdge * >::size_type >(val2);
   {
     try {
       (arg1)->reserve(arg2);
@@ -41794,21 +42333,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_capacity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
-  std::vector< ViewEdge * >::size_type result;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_capacity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_capacity" "', argument " "1"" of type '" "std::vector< ViewEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_capacity" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
   {
     try {
-      result = ((std::vector< ViewEdge * > const *)arg1)->capacity();
+      result = ((std::vector<ViewEdge * > const *)arg1)->capacity();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -41826,17 +42365,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_ViewEdgesContainer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_ViewEdgesContainer",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ViewEdgesContainer" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ViewEdgesContainer" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
   {
     try {
       delete arg1;
@@ -41858,14 +42397,14 @@ fail:
 
 SWIGINTERN PyObject *ViewEdgesContainer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
   PyObject **arg2 = (PyObject **) 0 ;
   swig::PySwigIterator *result = 0 ;
   void *argp1 = 0 ;
@@ -41874,11 +42413,11 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_iterator(PyObject *SWIGUNUSEDPARM(sel
   
   arg2 = &obj0;
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_iterator" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_iterator" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
   {
     try {
       result = (swig::PySwigIterator *)std_vector_Sl_FEdge_Sm__Sg__iterator(arg1,arg2);
@@ -41899,21 +42438,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer___nonzero__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer___nonzero__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___nonzero__" "', argument " "1"" of type '" "std::vector< FEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___nonzero__" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
   {
     try {
-      result = (bool)std_vector_Sl_FEdge_Sm__Sg____nonzero__((std::vector< FEdge * > const *)arg1);
+      result = (bool)std_vector_Sl_FEdge_Sm__Sg____nonzero__((std::vector<FEdge * > const *)arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -41931,21 +42470,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer___len__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
-  std::vector< FEdge * >::size_type result;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer___len__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___len__" "', argument " "1"" of type '" "std::vector< FEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___len__" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
   {
     try {
-      result = std_vector_Sl_FEdge_Sm__Sg____len__((std::vector< FEdge * > const *)arg1);
+      result = std_vector_Sl_FEdge_Sm__Sg____len__((std::vector<FEdge * > const *)arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -41963,22 +42502,22 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
-  std::vector< FEdge * >::value_type result;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_pop" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_pop" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
   {
     try {
       try {
-        result = (std::vector< FEdge * >::value_type)std_vector_Sl_FEdge_Sm__Sg__pop(arg1);
+        result = (std::vector<FEdge * >::value_type)std_vector_Sl_FEdge_Sm__Sg__pop(arg1);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -41992,7 +42531,7 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_pop(PyObject *SWIGUNUSEDPARM(self), P
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -42001,10 +42540,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
-  std::vector< FEdge * >::difference_type arg2 ;
-  std::vector< FEdge * >::difference_type arg3 ;
-  std::vector< FEdge *,std::allocator< FEdge * > > *result = 0 ;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::difference_type arg2 ;
+  std::vector<FEdge * >::difference_type arg3 ;
+  std::vector<FEdge *,std::allocator<FEdge * > > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -42016,25 +42555,25 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer___getslice__(PyObject *SWIGUNUSEDPARM
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:FEdgesContainer___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___getslice__" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___getslice__" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer___getslice__" "', argument " "2"" of type '" "std::vector< FEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer___getslice__" "', argument " "2"" of type '" "std::vector<FEdge * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector< FEdge * >::difference_type >(val2);
+  arg2 = static_cast< std::vector<FEdge * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FEdgesContainer___getslice__" "', argument " "3"" of type '" "std::vector< FEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FEdgesContainer___getslice__" "', argument " "3"" of type '" "std::vector<FEdge * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector< FEdge * >::difference_type >(val3);
+  arg3 = static_cast< std::vector<FEdge * >::difference_type >(val3);
   {
     try {
       try {
-        result = (std::vector< FEdge *,std::allocator< FEdge * > > *)std_vector_Sl_FEdge_Sm__Sg____getslice__(arg1,arg2,arg3);
+        result = (std::vector<FEdge *,std::allocator<FEdge * > > *)std_vector_Sl_FEdge_Sm__Sg____getslice__(arg1,arg2,arg3);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -42048,7 +42587,7 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer___getslice__(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -42057,10 +42596,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer___setslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
-  std::vector< FEdge * >::difference_type arg2 ;
-  std::vector< FEdge * >::difference_type arg3 ;
-  std::vector< FEdge *,std::allocator< FEdge * > > *arg4 = 0 ;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::difference_type arg2 ;
+  std::vector<FEdge * >::difference_type arg3 ;
+  std::vector<FEdge *,std::allocator<FEdge * > > *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -42074,36 +42613,36 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer___setslice__(PyObject *SWIGUNUSEDPARM
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:FEdgesContainer___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___setslice__" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___setslice__" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer___setslice__" "', argument " "2"" of type '" "std::vector< FEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer___setslice__" "', argument " "2"" of type '" "std::vector<FEdge * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector< FEdge * >::difference_type >(val2);
+  arg2 = static_cast< std::vector<FEdge * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FEdgesContainer___setslice__" "', argument " "3"" of type '" "std::vector< FEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FEdgesContainer___setslice__" "', argument " "3"" of type '" "std::vector<FEdge * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector< FEdge * >::difference_type >(val3);
+  arg3 = static_cast< std::vector<FEdge * >::difference_type >(val3);
   {
-    std::vector<FEdge*,std::allocator< FEdge * > > *ptr = (std::vector<FEdge*,std::allocator< FEdge * > > *)0;
+    std::vector<FEdge*,std::allocator<FEdge * > > *ptr = (std::vector<FEdge*,std::allocator<FEdge * > > *)0;
     res4 = swig::asptr(obj3, &ptr);
     if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "FEdgesContainer___setslice__" "', argument " "4"" of type '" "std::vector< FEdge *,std::allocator< FEdge * > > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "FEdgesContainer___setslice__" "', argument " "4"" of type '" "std::vector<FEdge *,std::allocator<FEdge * > > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdgesContainer___setslice__" "', argument " "4"" of type '" "std::vector< FEdge *,std::allocator< FEdge * > > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdgesContainer___setslice__" "', argument " "4"" of type '" "std::vector<FEdge *,std::allocator<FEdge * > > const &""'"); 
     }
     arg4 = ptr;
   }
   {
     try {
       try {
-        std_vector_Sl_FEdge_Sm__Sg____setslice__(arg1,arg2,arg3,(std::vector< FEdge *,std::allocator< FEdge * > > const &)*arg4);
+        std_vector_Sl_FEdge_Sm__Sg____setslice__(arg1,arg2,arg3,(std::vector<FEdge *,std::allocator<FEdge * > > const &)*arg4);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -42131,9 +42670,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer___delslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
-  std::vector< FEdge * >::difference_type arg2 ;
-  std::vector< FEdge * >::difference_type arg3 ;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::difference_type arg2 ;
+  std::vector<FEdge * >::difference_type arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -42145,21 +42684,21 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer___delslice__(PyObject *SWIGUNUSEDPARM
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:FEdgesContainer___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___delslice__" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___delslice__" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer___delslice__" "', argument " "2"" of type '" "std::vector< FEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer___delslice__" "', argument " "2"" of type '" "std::vector<FEdge * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector< FEdge * >::difference_type >(val2);
+  arg2 = static_cast< std::vector<FEdge * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FEdgesContainer___delslice__" "', argument " "3"" of type '" "std::vector< FEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FEdgesContainer___delslice__" "', argument " "3"" of type '" "std::vector<FEdge * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector< FEdge * >::difference_type >(val3);
+  arg3 = static_cast< std::vector<FEdge * >::difference_type >(val3);
   {
     try {
       try {
@@ -42186,8 +42725,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer___delitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
-  std::vector< FEdge * >::difference_type arg2 ;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::difference_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -42196,16 +42735,16 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer___delitem__(PyObject *SWIGUNUSEDPARM(
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:FEdgesContainer___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___delitem__" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___delitem__" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer___delitem__" "', argument " "2"" of type '" "std::vector< FEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer___delitem__" "', argument " "2"" of type '" "std::vector<FEdge * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector< FEdge * >::difference_type >(val2);
+  arg2 = static_cast< std::vector<FEdge * >::difference_type >(val2);
   {
     try {
       try {
@@ -42232,9 +42771,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer___getitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
-  std::vector< FEdge * >::difference_type arg2 ;
-  std::vector< FEdge * >::value_type result;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::difference_type arg2 ;
+  std::vector<FEdge * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -42243,20 +42782,20 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer___getitem__(PyObject *SWIGUNUSEDPARM(
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:FEdgesContainer___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___getitem__" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___getitem__" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer___getitem__" "', argument " "2"" of type '" "std::vector< FEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer___getitem__" "', argument " "2"" of type '" "std::vector<FEdge * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector< FEdge * >::difference_type >(val2);
+  arg2 = static_cast< std::vector<FEdge * >::difference_type >(val2);
   {
     try {
       try {
-        result = (std::vector< FEdge * >::value_type)std_vector_Sl_FEdge_Sm__Sg____getitem__(arg1,arg2);
+        result = (std::vector<FEdge * >::value_type)std_vector_Sl_FEdge_Sm__Sg____getitem__(arg1,arg2);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -42270,7 +42809,7 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer___getitem__(PyObject *SWIGUNUSEDPARM(
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -42279,9 +42818,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer___setitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
-  std::vector< FEdge * >::difference_type arg2 ;
-  std::vector< FEdge * >::value_type arg3 = (std::vector< FEdge * >::value_type) 0 ;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::difference_type arg2 ;
+  std::vector<FEdge * >::value_type arg3 = (std::vector<FEdge * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -42293,21 +42832,21 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer___setitem__(PyObject *SWIGUNUSEDPARM(
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:FEdgesContainer___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___setitem__" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___setitem__" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer___setitem__" "', argument " "2"" of type '" "std::vector< FEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer___setitem__" "', argument " "2"" of type '" "std::vector<FEdge * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector< FEdge * >::difference_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector<FEdge * >::difference_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FEdgesContainer___setitem__" "', argument " "3"" of type '" "std::vector< FEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FEdgesContainer___setitem__" "', argument " "3"" of type '" "std::vector<FEdge * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector< FEdge * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector<FEdge * >::value_type >(argp3);
   {
     try {
       try {
@@ -42334,8 +42873,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
-  std::vector< FEdge * >::value_type arg2 = (std::vector< FEdge * >::value_type) 0 ;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::value_type arg2 = (std::vector<FEdge * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -42344,16 +42883,16 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_append(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:FEdgesContainer_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_append" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_append" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0 |  0 );
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgesContainer_append" "', argument " "2"" of type '" "std::vector< FEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgesContainer_append" "', argument " "2"" of type '" "std::vector<FEdge * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector< FEdge * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector<FEdge * >::value_type >(argp2);
   {
     try {
       std_vector_Sl_FEdge_Sm__Sg__append(arg1,arg2);
@@ -42374,12 +42913,12 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_FEdgesContainer__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< FEdge * > *result = 0 ;
+  std::vector<FEdge * > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_FEdgesContainer")) SWIG_fail;
   {
     try {
-      result = (std::vector< FEdge * > *)new std::vector< FEdge * >();
+      result = (std::vector<FEdge * > *)new std::vector<FEdge * >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -42388,7 +42927,7 @@ SWIGINTERN PyObject *_wrap_new_FEdgesContainer__SWIG_0(PyObject *SWIGUNUSEDPARM(
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -42397,26 +42936,26 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_FEdgesContainer__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< FEdge * > *arg1 = 0 ;
-  std::vector< FEdge * > *result = 0 ;
+  std::vector<FEdge * > *arg1 = 0 ;
+  std::vector<FEdge * > *result = 0 ;
   int res1 = SWIG_OLDOBJ ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_FEdgesContainer",&obj0)) SWIG_fail;
   {
-    std::vector<FEdge*,std::allocator< FEdge * > > *ptr = (std::vector<FEdge*,std::allocator< FEdge * > > *)0;
+    std::vector<FEdge*,std::allocator<FEdge * > > *ptr = (std::vector<FEdge*,std::allocator<FEdge * > > *)0;
     res1 = swig::asptr(obj0, &ptr);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_FEdgesContainer" "', argument " "1"" of type '" "std::vector< FEdge * > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_FEdgesContainer" "', argument " "1"" of type '" "std::vector<FEdge * > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_FEdgesContainer" "', argument " "1"" of type '" "std::vector< FEdge * > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_FEdgesContainer" "', argument " "1"" of type '" "std::vector<FEdge * > const &""'"); 
     }
     arg1 = ptr;
   }
   {
     try {
-      result = (std::vector< FEdge * > *)new std::vector< FEdge * >((std::vector< FEdge * > const &)*arg1);
+      result = (std::vector<FEdge * > *)new std::vector<FEdge * >((std::vector<FEdge * > const &)*arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -42425,7 +42964,7 @@ SWIGINTERN PyObject *_wrap_new_FEdgesContainer__SWIG_1(PyObject *SWIGUNUSEDPARM(
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, SWIG_POINTER_NEW |  0 );
   if (SWIG_IsNewObj(res1)) delete arg1;
   return resultobj;
 fail:
@@ -42436,21 +42975,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_empty",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_empty" "', argument " "1"" of type '" "std::vector< FEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_empty" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
   {
     try {
-      result = (bool)((std::vector< FEdge * > const *)arg1)->empty();
+      result = (bool)((std::vector<FEdge * > const *)arg1)->empty();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -42468,21 +43007,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
-  std::vector< FEdge * >::size_type result;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_size" "', argument " "1"" of type '" "std::vector< FEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_size" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
   {
     try {
-      result = ((std::vector< FEdge * > const *)arg1)->size();
+      result = ((std::vector<FEdge * > const *)arg1)->size();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -42500,17 +43039,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_clear" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_clear" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
   {
     try {
       (arg1)->clear();
@@ -42531,8 +43070,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
-  std::vector< FEdge * > *arg2 = 0 ;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -42541,19 +43080,19 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_swap(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:FEdgesContainer_swap",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_swap" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_swap" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t,  0 );
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgesContainer_swap" "', argument " "2"" of type '" "std::vector< FEdge * > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgesContainer_swap" "', argument " "2"" of type '" "std::vector<FEdge * > &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdgesContainer_swap" "', argument " "2"" of type '" "std::vector< FEdge * > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdgesContainer_swap" "', argument " "2"" of type '" "std::vector<FEdge * > &""'"); 
   }
-  arg2 = reinterpret_cast< std::vector< FEdge * > * >(argp2);
+  arg2 = reinterpret_cast< std::vector<FEdge * > * >(argp2);
   {
     try {
       (arg1)->swap(*arg2);
@@ -42574,21 +43113,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
-  SwigValueWrapper< std::allocator< FEdge * > > result;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  SwigValueWrapper<std::allocator<FEdge * > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_get_allocator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_get_allocator" "', argument " "1"" of type '" "std::vector< FEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_get_allocator" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
   {
     try {
-      result = ((std::vector< FEdge * > const *)arg1)->get_allocator();
+      result = ((std::vector<FEdge * > const *)arg1)->get_allocator();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -42597,30 +43136,30 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_get_allocator(PyObject *SWIGUNUSEDPAR
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new std::vector< FEdge * >::allocator_type(static_cast< const std::vector< FEdge * >::allocator_type& >(result))), SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new std::vector<FEdge * >::allocator_type(static_cast< const std::vector<FEdge * >::allocator_type& >(result))), SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgesContainer_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FEdgesContainer_begin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
-  std::vector< FEdge * >::const_iterator result;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_begin" "', argument " "1"" of type '" "std::vector< FEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_begin" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
   {
     try {
-      result = ((std::vector< FEdge * > const *)arg1)->begin();
+      result = (arg1)->begin();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -42629,7 +43168,7 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_begin(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< FEdge * >::const_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<FEdge * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -42637,23 +43176,89 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgesContainer_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FEdgesContainer_begin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
-  std::vector< FEdge * >::const_iterator result;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_begin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_begin" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<FEdge * > const *)arg1)->begin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<FEdge * >::const_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer_begin(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_FEdgesContainer_begin__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_FEdgesContainer_begin__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdgesContainer_begin'.\n  Possible C/C++ prototypes are:\n    begin()\n    begin()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_end" "', argument " "1"" of type '" "std::vector< FEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_end" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
   {
     try {
-      result = ((std::vector< FEdge * > const *)arg1)->end();
+      result = (arg1)->end();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -42662,7 +43267,7 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_end(PyObject *SWIGUNUSEDPARM(self), P
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< FEdge * >::const_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<FEdge * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -42670,23 +43275,89 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgesContainer_rbegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FEdgesContainer_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
-  std::vector< FEdge * >::const_reverse_iterator result;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_end",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_end" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<FEdge * > const *)arg1)->end();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<FEdge * >::const_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer_end(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_FEdgesContainer_end__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_FEdgesContainer_end__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdgesContainer_end'.\n  Possible C/C++ prototypes are:\n    end()\n    end()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer_rbegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::reverse_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_rbegin" "', argument " "1"" of type '" "std::vector< FEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_rbegin" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
   {
     try {
-      result = ((std::vector< FEdge * > const *)arg1)->rbegin();
+      result = (arg1)->rbegin();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -42695,7 +43366,7 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_rbegin(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< FEdge * >::const_reverse_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<FEdge * >::reverse_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -42703,23 +43374,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgesContainer_rend(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FEdgesContainer_rbegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
-  std::vector< FEdge * >::const_reverse_iterator result;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::const_reverse_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_rbegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_rend" "', argument " "1"" of type '" "std::vector< FEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_rbegin" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
   {
     try {
-      result = ((std::vector< FEdge * > const *)arg1)->rend();
+      result = ((std::vector<FEdge * > const *)arg1)->rbegin();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -42728,7 +43399,7 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_rend(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< FEdge * >::const_reverse_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<FEdge * >::const_reverse_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -42736,10 +43407,142 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_FEdgesContainer_rbegin(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_FEdgesContainer_rbegin__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_FEdgesContainer_rbegin__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdgesContainer_rbegin'.\n  Possible C/C++ prototypes are:\n    rbegin()\n    rbegin()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer_rend__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::reverse_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_rend",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_rend" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  {
+    try {
+      result = (arg1)->rend();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<FEdge * >::reverse_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer_rend__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::const_reverse_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_rend",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_rend" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<FEdge * > const *)arg1)->rend();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<FEdge * >::const_reverse_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FEdgesContainer_rend(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_FEdgesContainer_rend__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_FEdgesContainer_rend__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdgesContainer_rend'.\n  Possible C/C++ prototypes are:\n    rend()\n    rend()\n");
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_new_FEdgesContainer__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< FEdge * >::size_type arg1 ;
-  std::vector< FEdge * > *result = 0 ;
+  std::vector<FEdge * >::size_type arg1 ;
+  std::vector<FEdge * > *result = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -42747,12 +43550,12 @@ SWIGINTERN PyObject *_wrap_new_FEdgesContainer__SWIG_2(PyObject *SWIGUNUSEDPARM(
   if (!PyArg_ParseTuple(args,(char *)"O:new_FEdgesContainer",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FEdgesContainer" "', argument " "1"" of type '" "std::vector< FEdge * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FEdgesContainer" "', argument " "1"" of type '" "std::vector<FEdge * >::size_type""'");
   } 
-  arg1 = static_cast< std::vector< FEdge * >::size_type >(val1);
+  arg1 = static_cast< std::vector<FEdge * >::size_type >(val1);
   {
     try {
-      result = (std::vector< FEdge * > *)new std::vector< FEdge * >(arg1);
+      result = (std::vector<FEdge * > *)new std::vector<FEdge * >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -42761,7 +43564,7 @@ SWIGINTERN PyObject *_wrap_new_FEdgesContainer__SWIG_2(PyObject *SWIGUNUSEDPARM(
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -42770,17 +43573,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_pop_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_pop_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_pop_back" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_pop_back" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
   {
     try {
       (arg1)->pop_back();
@@ -42801,8 +43604,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
-  std::vector< FEdge * >::size_type arg2 ;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::size_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -42811,16 +43614,16 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_resize__SWIG_0(PyObject *SWIGUNUSEDPA
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:FEdgesContainer_resize",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_resize" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_resize" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer_resize" "', argument " "2"" of type '" "std::vector< FEdge * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer_resize" "', argument " "2"" of type '" "std::vector<FEdge * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector< FEdge * >::size_type >(val2);
+  arg2 = static_cast< std::vector<FEdge * >::size_type >(val2);
   {
     try {
       (arg1)->resize(arg2);
@@ -42841,9 +43644,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
-  std::vector< FEdge * >::iterator arg2 ;
-  std::vector< FEdge * >::iterator result;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::iterator arg2 ;
+  std::vector<FEdge * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -42852,20 +43655,20 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_erase__SWIG_0(PyObject *SWIGUNUSEDPAR
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:FEdgesContainer_erase",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_erase" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_erase" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_erase" "', argument " "2"" of type '" "std::vector< FEdge * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_erase" "', argument " "2"" of type '" "std::vector<FEdge * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector< FEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< FEdge * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_erase" "', argument " "2"" of type '" "std::vector< FEdge * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_erase" "', argument " "2"" of type '" "std::vector<FEdge * >::iterator""'");
     }
   }
   {
@@ -42879,7 +43682,7 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_erase__SWIG_0(PyObject *SWIGUNUSEDPAR
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< FEdge * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<FEdge * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -42889,10 +43692,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
-  std::vector< FEdge * >::iterator arg2 ;
-  std::vector< FEdge * >::iterator arg3 ;
-  std::vector< FEdge * >::iterator result;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::iterator arg2 ;
+  std::vector<FEdge * >::iterator arg3 ;
+  std::vector<FEdge * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -42904,31 +43707,31 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_erase__SWIG_1(PyObject *SWIGUNUSEDPAR
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:FEdgesContainer_erase",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_erase" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_erase" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_erase" "', argument " "2"" of type '" "std::vector< FEdge * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_erase" "', argument " "2"" of type '" "std::vector<FEdge * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector< FEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< FEdge * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_erase" "', argument " "2"" of type '" "std::vector< FEdge * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_erase" "', argument " "2"" of type '" "std::vector<FEdge * >::iterator""'");
     }
   }
   res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res3) || !iter3) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_erase" "', argument " "3"" of type '" "std::vector< FEdge * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_erase" "', argument " "3"" of type '" "std::vector<FEdge * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector< FEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< FEdge * >::iterator > *>(iter3);
+    swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *>(iter3);
     if (iter_t) {
       arg3 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_erase" "', argument " "3"" of type '" "std::vector< FEdge * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_erase" "', argument " "3"" of type '" "std::vector<FEdge * >::iterator""'");
     }
   }
   {
@@ -42942,7 +43745,7 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_erase__SWIG_1(PyObject *SWIGUNUSEDPAR
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< FEdge * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<FEdge * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -42956,18 +43759,18 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_erase(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator< FEdge * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< FEdge * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *>(iter) != 0));
       if (_v) {
         return _wrap_FEdgesContainer_erase__SWIG_0(self, args);
       }
@@ -42975,16 +43778,16 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_erase(PyObject *self, PyObject *args)
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator< FEdge * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< FEdge * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *>(iter) != 0));
       if (_v) {
         swig::PySwigIterator *iter = 0;
         int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< FEdge * >::iterator > *>(iter) != 0));
+        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *>(iter) != 0));
         if (_v) {
           return _wrap_FEdgesContainer_erase__SWIG_1(self, args);
         }
@@ -42993,19 +43796,16 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_erase(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdgesContainer_erase'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    erase(std::vector< FEdge * > *,std::vector< FEdge * >::iterator)\n"
-    "    erase(std::vector< FEdge * > *,std::vector< FEdge * >::iterator,std::vector< FEdge * >::iterator)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdgesContainer_erase'.\n  Possible C/C++ prototypes are:\n    erase(std::vector<FEdge * >::iterator)\n    erase(std::vector<FEdge * >::iterator,std::vector<FEdge * >::iterator)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_new_FEdgesContainer__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< FEdge * >::size_type arg1 ;
-  std::vector< FEdge * >::value_type arg2 = (std::vector< FEdge * >::value_type) 0 ;
-  std::vector< FEdge * > *result = 0 ;
+  std::vector<FEdge * >::size_type arg1 ;
+  std::vector<FEdge * >::value_type arg2 = (std::vector<FEdge * >::value_type) 0 ;
+  std::vector<FEdge * > *result = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   void *argp2 = 0 ;
@@ -43016,17 +43816,17 @@ SWIGINTERN PyObject *_wrap_new_FEdgesContainer__SWIG_3(PyObject *SWIGUNUSEDPARM(
   if (!PyArg_ParseTuple(args,(char *)"OO:new_FEdgesContainer",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FEdgesContainer" "', argument " "1"" of type '" "std::vector< FEdge * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FEdgesContainer" "', argument " "1"" of type '" "std::vector<FEdge * >::size_type""'");
   } 
-  arg1 = static_cast< std::vector< FEdge * >::size_type >(val1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0 |  0 );
+  arg1 = static_cast< std::vector<FEdge * >::size_type >(val1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_FEdgesContainer" "', argument " "2"" of type '" "std::vector< FEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_FEdgesContainer" "', argument " "2"" of type '" "std::vector<FEdge * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector< FEdge * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector<FEdge * >::value_type >(argp2);
   {
     try {
-      result = (std::vector< FEdge * > *)new std::vector< FEdge * >(arg1,arg2);
+      result = (std::vector<FEdge * > *)new std::vector<FEdge * >(arg1,arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -43035,7 +43835,7 @@ SWIGINTERN PyObject *_wrap_new_FEdgesContainer__SWIG_3(PyObject *SWIGUNUSEDPARM(
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -43048,7 +43848,7 @@ SWIGINTERN PyObject *_wrap_new_FEdgesContainer(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -43067,7 +43867,7 @@ SWIGINTERN PyObject *_wrap_new_FEdgesContainer(PyObject *self, PyObject *args) {
   }
   if (argc == 1) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator< FEdge * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_new_FEdgesContainer__SWIG_1(self, args);
@@ -43081,7 +43881,7 @@ SWIGINTERN PyObject *_wrap_new_FEdgesContainer(PyObject *self, PyObject *args) {
     }
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_new_FEdgesContainer__SWIG_3(self, args);
@@ -43090,20 +43890,15 @@ SWIGINTERN PyObject *_wrap_new_FEdgesContainer(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_FEdgesContainer'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    std::vector< FEdge * >()\n"
-    "    std::vector< FEdge * >(std::vector< FEdge * > const &)\n"
-    "    std::vector< FEdge * >(std::vector< FEdge * >::size_type)\n"
-    "    std::vector< FEdge * >(std::vector< FEdge * >::size_type,std::vector< FEdge * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_FEdgesContainer'.\n  Possible C/C++ prototypes are:\n    std::vector<(p.FEdge)>()\n    std::vector<(p.FEdge)>(std::vector<FEdge * > const &)\n    std::vector<(p.FEdge)>(std::vector<FEdge * >::size_type)\n    std::vector<(p.FEdge)>(std::vector<FEdge * >::size_type,std::vector<FEdge * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_push_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
-  std::vector< FEdge * >::value_type arg2 = (std::vector< FEdge * >::value_type) 0 ;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::value_type arg2 = (std::vector<FEdge * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -43112,16 +43907,16 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_push_back(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:FEdgesContainer_push_back",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_push_back" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_push_back" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0 |  0 );
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgesContainer_push_back" "', argument " "2"" of type '" "std::vector< FEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgesContainer_push_back" "', argument " "2"" of type '" "std::vector<FEdge * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector< FEdge * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector<FEdge * >::value_type >(argp2);
   {
     try {
       (arg1)->push_back(arg2);
@@ -43142,21 +43937,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_front(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
-  std::vector< FEdge * >::value_type result;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_front",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_front" "', argument " "1"" of type '" "std::vector< FEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_front" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
   {
     try {
-      result = (std::vector< FEdge * >::value_type)((std::vector< FEdge * > const *)arg1)->front();
+      result = (std::vector<FEdge * >::value_type)((std::vector<FEdge * > const *)arg1)->front();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -43165,7 +43960,7 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_front(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -43174,21 +43969,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
-  std::vector< FEdge * >::value_type result;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_back" "', argument " "1"" of type '" "std::vector< FEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_back" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
   {
     try {
-      result = (std::vector< FEdge * >::value_type)((std::vector< FEdge * > const *)arg1)->back();
+      result = (std::vector<FEdge * >::value_type)((std::vector<FEdge * > const *)arg1)->back();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -43197,7 +43992,7 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_back(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -43206,9 +44001,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_assign(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
-  std::vector< FEdge * >::size_type arg2 ;
-  std::vector< FEdge * >::value_type arg3 = (std::vector< FEdge * >::value_type) 0 ;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::size_type arg2 ;
+  std::vector<FEdge * >::value_type arg3 = (std::vector<FEdge * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -43220,21 +44015,21 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_assign(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:FEdgesContainer_assign",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_assign" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_assign" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer_assign" "', argument " "2"" of type '" "std::vector< FEdge * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer_assign" "', argument " "2"" of type '" "std::vector<FEdge * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector< FEdge * >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector<FEdge * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FEdgesContainer_assign" "', argument " "3"" of type '" "std::vector< FEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FEdgesContainer_assign" "', argument " "3"" of type '" "std::vector<FEdge * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector< FEdge * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector<FEdge * >::value_type >(argp3);
   {
     try {
       (arg1)->assign(arg2,arg3);
@@ -43255,9 +44050,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
-  std::vector< FEdge * >::size_type arg2 ;
-  std::vector< FEdge * >::value_type arg3 = (std::vector< FEdge * >::value_type) 0 ;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::size_type arg2 ;
+  std::vector<FEdge * >::value_type arg3 = (std::vector<FEdge * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -43269,21 +44064,21 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_resize__SWIG_1(PyObject *SWIGUNUSEDPA
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:FEdgesContainer_resize",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_resize" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_resize" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer_resize" "', argument " "2"" of type '" "std::vector< FEdge * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer_resize" "', argument " "2"" of type '" "std::vector<FEdge * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector< FEdge * >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector<FEdge * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FEdgesContainer_resize" "', argument " "3"" of type '" "std::vector< FEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FEdgesContainer_resize" "', argument " "3"" of type '" "std::vector<FEdge * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector< FEdge * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector<FEdge * >::value_type >(argp3);
   {
     try {
       (arg1)->resize(arg2,arg3);
@@ -43308,13 +44103,13 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_resize(PyObject *self, PyObject *args
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator< FEdge * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -43328,7 +44123,7 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_resize(PyObject *self, PyObject *args
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator< FEdge * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -43337,7 +44132,7 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_resize(PyObject *self, PyObject *args
       }
       if (_v) {
         void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0);
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           return _wrap_FEdgesContainer_resize__SWIG_1(self, args);
@@ -43347,20 +44142,17 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_resize(PyObject *self, PyObject *args
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdgesContainer_resize'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    resize(std::vector< FEdge * > *,std::vector< FEdge * >::size_type)\n"
-    "    resize(std::vector< FEdge * > *,std::vector< FEdge * >::size_type,std::vector< FEdge * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdgesContainer_resize'.\n  Possible C/C++ prototypes are:\n    resize(std::vector<FEdge * >::size_type)\n    resize(std::vector<FEdge * >::size_type,std::vector<FEdge * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
-  std::vector< FEdge * >::iterator arg2 ;
-  std::vector< FEdge * >::value_type arg3 = (std::vector< FEdge * >::value_type) 0 ;
-  std::vector< FEdge * >::iterator result;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::iterator arg2 ;
+  std::vector<FEdge * >::value_type arg3 = (std::vector<FEdge * >::value_type) 0 ;
+  std::vector<FEdge * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -43372,27 +44164,27 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_insert__SWIG_0(PyObject *SWIGUNUSEDPA
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:FEdgesContainer_insert",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_insert" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_insert" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_insert" "', argument " "2"" of type '" "std::vector< FEdge * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_insert" "', argument " "2"" of type '" "std::vector<FEdge * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector< FEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< FEdge * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_insert" "', argument " "2"" of type '" "std::vector< FEdge * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_insert" "', argument " "2"" of type '" "std::vector<FEdge * >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0 |  0 );
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FEdgesContainer_insert" "', argument " "3"" of type '" "std::vector< FEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FEdgesContainer_insert" "', argument " "3"" of type '" "std::vector<FEdge * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector< FEdge * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector<FEdge * >::value_type >(argp3);
   {
     try {
       result = (arg1)->insert(arg2,arg3);
@@ -43404,7 +44196,7 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_insert__SWIG_0(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< FEdge * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<FEdge * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -43414,10 +44206,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
-  std::vector< FEdge * >::iterator arg2 ;
-  std::vector< FEdge * >::size_type arg3 ;
-  std::vector< FEdge * >::value_type arg4 = (std::vector< FEdge * >::value_type) 0 ;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::iterator arg2 ;
+  std::vector<FEdge * >::size_type arg3 ;
+  std::vector<FEdge * >::value_type arg4 = (std::vector<FEdge * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -43432,32 +44224,32 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_insert__SWIG_1(PyObject *SWIGUNUSEDPA
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:FEdgesContainer_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_insert" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_insert" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_insert" "', argument " "2"" of type '" "std::vector< FEdge * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_insert" "', argument " "2"" of type '" "std::vector<FEdge * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector< FEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< FEdge * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_insert" "', argument " "2"" of type '" "std::vector< FEdge * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_insert" "', argument " "2"" of type '" "std::vector<FEdge * >::iterator""'");
     }
   }
   ecode3 = SWIG_AsVal_size_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FEdgesContainer_insert" "', argument " "3"" of type '" "std::vector< FEdge * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FEdgesContainer_insert" "', argument " "3"" of type '" "std::vector<FEdge * >::size_type""'");
   } 
-  arg3 = static_cast< std::vector< FEdge * >::size_type >(val3);
-  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0 |  0 );
+  arg3 = static_cast< std::vector<FEdge * >::size_type >(val3);
+  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "FEdgesContainer_insert" "', argument " "4"" of type '" "std::vector< FEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "FEdgesContainer_insert" "', argument " "4"" of type '" "std::vector<FEdge * >::value_type""'"); 
   }
-  arg4 = reinterpret_cast< std::vector< FEdge * >::value_type >(argp4);
+  arg4 = reinterpret_cast< std::vector<FEdge * >::value_type >(argp4);
   {
     try {
       (arg1)->insert(arg2,arg3,arg4);
@@ -43482,21 +44274,21 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_insert(PyObject *self, PyObject *args
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator< FEdge * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< FEdge * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *>(iter) != 0));
       if (_v) {
         void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0);
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           return _wrap_FEdgesContainer_insert__SWIG_0(self, args);
@@ -43506,12 +44298,12 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_insert(PyObject *self, PyObject *args
   }
   if (argc == 4) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator< FEdge * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< FEdge * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *>(iter) != 0));
       if (_v) {
         {
           int res = SWIG_AsVal_size_t(argv[2], NULL);
@@ -43519,7 +44311,7 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_insert(PyObject *self, PyObject *args
         }
         if (_v) {
           void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0);
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0);
           _v = SWIG_CheckState(res);
           if (_v) {
             return _wrap_FEdgesContainer_insert__SWIG_1(self, args);
@@ -43530,18 +44322,15 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_insert(PyObject *self, PyObject *args
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdgesContainer_insert'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    insert(std::vector< FEdge * > *,std::vector< FEdge * >::iterator,std::vector< FEdge * >::value_type)\n"
-    "    insert(std::vector< FEdge * > *,std::vector< FEdge * >::iterator,std::vector< FEdge * >::size_type,std::vector< FEdge * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdgesContainer_insert'.\n  Possible C/C++ prototypes are:\n    insert(std::vector<FEdge * >::iterator,std::vector<FEdge * >::value_type)\n    insert(std::vector<FEdge * >::iterator,std::vector<FEdge * >::size_type,std::vector<FEdge * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_reserve(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
-  std::vector< FEdge * >::size_type arg2 ;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::size_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -43550,16 +44339,16 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_reserve(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:FEdgesContainer_reserve",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_reserve" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_reserve" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer_reserve" "', argument " "2"" of type '" "std::vector< FEdge * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer_reserve" "', argument " "2"" of type '" "std::vector<FEdge * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector< FEdge * >::size_type >(val2);
+  arg2 = static_cast< std::vector<FEdge * >::size_type >(val2);
   {
     try {
       (arg1)->reserve(arg2);
@@ -43580,21 +44369,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_capacity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
-  std::vector< FEdge * >::size_type result;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector<FEdge * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_capacity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_capacity" "', argument " "1"" of type '" "std::vector< FEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_capacity" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
   {
     try {
-      result = ((std::vector< FEdge * > const *)arg1)->capacity();
+      result = ((std::vector<FEdge * > const *)arg1)->capacity();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -43612,17 +44401,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_FEdgesContainer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_FEdgesContainer",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FEdgesContainer" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FEdgesContainer" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
   {
     try {
       delete arg1;
@@ -43644,14 +44433,14 @@ fail:
 
 SWIGINTERN PyObject *FEdgesContainer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
   PyObject **arg2 = (PyObject **) 0 ;
   swig::PySwigIterator *result = 0 ;
   void *argp1 = 0 ;
@@ -43660,11 +44449,11 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_iterator(PyObject *SWIGUNUSEDPA
   
   arg2 = &obj0;
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_iterator" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_iterator" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
   {
     try {
       result = (swig::PySwigIterator *)std_vector_Sl_ViewVertex_Sm__Sg__iterator(arg1,arg2);
@@ -43685,21 +44474,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer___nonzero__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer___nonzero__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___nonzero__" "', argument " "1"" of type '" "std::vector< ViewVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___nonzero__" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
   {
     try {
-      result = (bool)std_vector_Sl_ViewVertex_Sm__Sg____nonzero__((std::vector< ViewVertex * > const *)arg1);
+      result = (bool)std_vector_Sl_ViewVertex_Sm__Sg____nonzero__((std::vector<ViewVertex * > const *)arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -43717,21 +44506,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer___len__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
-  std::vector< ViewVertex * >::size_type result;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer___len__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___len__" "', argument " "1"" of type '" "std::vector< ViewVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___len__" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
   {
     try {
-      result = std_vector_Sl_ViewVertex_Sm__Sg____len__((std::vector< ViewVertex * > const *)arg1);
+      result = std_vector_Sl_ViewVertex_Sm__Sg____len__((std::vector<ViewVertex * > const *)arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -43749,22 +44538,22 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
-  std::vector< ViewVertex * >::value_type result;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_pop" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_pop" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
   {
     try {
       try {
-        result = (std::vector< ViewVertex * >::value_type)std_vector_Sl_ViewVertex_Sm__Sg__pop(arg1);
+        result = (std::vector<ViewVertex * >::value_type)std_vector_Sl_ViewVertex_Sm__Sg__pop(arg1);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -43778,7 +44567,7 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_pop(PyObject *SWIGUNUSEDPARM(se
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -43787,10 +44576,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
-  std::vector< ViewVertex * >::difference_type arg2 ;
-  std::vector< ViewVertex * >::difference_type arg3 ;
-  std::vector< ViewVertex *,std::allocator< ViewVertex * > > *result = 0 ;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::difference_type arg2 ;
+  std::vector<ViewVertex * >::difference_type arg3 ;
+  std::vector<ViewVertex *,std::allocator<ViewVertex * > > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -43802,25 +44591,25 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer___getslice__(PyObject *SWIGUNUS
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewVerticesContainer___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___getslice__" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___getslice__" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer___getslice__" "', argument " "2"" of type '" "std::vector< ViewVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer___getslice__" "', argument " "2"" of type '" "std::vector<ViewVertex * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector< ViewVertex * >::difference_type >(val2);
+  arg2 = static_cast< std::vector<ViewVertex * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewVerticesContainer___getslice__" "', argument " "3"" of type '" "std::vector< ViewVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewVerticesContainer___getslice__" "', argument " "3"" of type '" "std::vector<ViewVertex * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector< ViewVertex * >::difference_type >(val3);
+  arg3 = static_cast< std::vector<ViewVertex * >::difference_type >(val3);
   {
     try {
       try {
-        result = (std::vector< ViewVertex *,std::allocator< ViewVertex * > > *)std_vector_Sl_ViewVertex_Sm__Sg____getslice__(arg1,arg2,arg3);
+        result = (std::vector<ViewVertex *,std::allocator<ViewVertex * > > *)std_vector_Sl_ViewVertex_Sm__Sg____getslice__(arg1,arg2,arg3);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -43834,7 +44623,7 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer___getslice__(PyObject *SWIGUNUS
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -43843,10 +44632,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer___setslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
-  std::vector< ViewVertex * >::difference_type arg2 ;
-  std::vector< ViewVertex * >::difference_type arg3 ;
-  std::vector< ViewVertex *,std::allocator< ViewVertex * > > *arg4 = 0 ;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::difference_type arg2 ;
+  std::vector<ViewVertex * >::difference_type arg3 ;
+  std::vector<ViewVertex *,std::allocator<ViewVertex * > > *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -43860,36 +44649,36 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer___setslice__(PyObject *SWIGUNUS
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:ViewVerticesContainer___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___setslice__" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___setslice__" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer___setslice__" "', argument " "2"" of type '" "std::vector< ViewVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer___setslice__" "', argument " "2"" of type '" "std::vector<ViewVertex * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector< ViewVertex * >::difference_type >(val2);
+  arg2 = static_cast< std::vector<ViewVertex * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewVerticesContainer___setslice__" "', argument " "3"" of type '" "std::vector< ViewVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewVerticesContainer___setslice__" "', argument " "3"" of type '" "std::vector<ViewVertex * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector< ViewVertex * >::difference_type >(val3);
+  arg3 = static_cast< std::vector<ViewVertex * >::difference_type >(val3);
   {
-    std::vector<ViewVertex*,std::allocator< ViewVertex * > > *ptr = (std::vector<ViewVertex*,std::allocator< ViewVertex * > > *)0;
+    std::vector<ViewVertex*,std::allocator<ViewVertex * > > *ptr = (std::vector<ViewVertex*,std::allocator<ViewVertex * > > *)0;
     res4 = swig::asptr(obj3, &ptr);
     if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewVerticesContainer___setslice__" "', argument " "4"" of type '" "std::vector< ViewVertex *,std::allocator< ViewVertex * > > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewVerticesContainer___setslice__" "', argument " "4"" of type '" "std::vector<ViewVertex *,std::allocator<ViewVertex * > > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewVerticesContainer___setslice__" "', argument " "4"" of type '" "std::vector< ViewVertex *,std::allocator< ViewVertex * > > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewVerticesContainer___setslice__" "', argument " "4"" of type '" "std::vector<ViewVertex *,std::allocator<ViewVertex * > > const &""'"); 
     }
     arg4 = ptr;
   }
   {
     try {
       try {
-        std_vector_Sl_ViewVertex_Sm__Sg____setslice__(arg1,arg2,arg3,(std::vector< ViewVertex *,std::allocator< ViewVertex * > > const &)*arg4);
+        std_vector_Sl_ViewVertex_Sm__Sg____setslice__(arg1,arg2,arg3,(std::vector<ViewVertex *,std::allocator<ViewVertex * > > const &)*arg4);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -43917,9 +44706,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer___delslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
-  std::vector< ViewVertex * >::difference_type arg2 ;
-  std::vector< ViewVertex * >::difference_type arg3 ;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::difference_type arg2 ;
+  std::vector<ViewVertex * >::difference_type arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -43931,21 +44720,21 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer___delslice__(PyObject *SWIGUNUS
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewVerticesContainer___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___delslice__" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___delslice__" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer___delslice__" "', argument " "2"" of type '" "std::vector< ViewVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer___delslice__" "', argument " "2"" of type '" "std::vector<ViewVertex * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector< ViewVertex * >::difference_type >(val2);
+  arg2 = static_cast< std::vector<ViewVertex * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewVerticesContainer___delslice__" "', argument " "3"" of type '" "std::vector< ViewVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewVerticesContainer___delslice__" "', argument " "3"" of type '" "std::vector<ViewVertex * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector< ViewVertex * >::difference_type >(val3);
+  arg3 = static_cast< std::vector<ViewVertex * >::difference_type >(val3);
   {
     try {
       try {
@@ -43972,8 +44761,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer___delitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
-  std::vector< ViewVertex * >::difference_type arg2 ;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::difference_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -43982,16 +44771,16 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer___delitem__(PyObject *SWIGUNUSE
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewVerticesContainer___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___delitem__" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___delitem__" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer___delitem__" "', argument " "2"" of type '" "std::vector< ViewVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer___delitem__" "', argument " "2"" of type '" "std::vector<ViewVertex * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector< ViewVertex * >::difference_type >(val2);
+  arg2 = static_cast< std::vector<ViewVertex * >::difference_type >(val2);
   {
     try {
       try {
@@ -44018,9 +44807,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer___getitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
-  std::vector< ViewVertex * >::difference_type arg2 ;
-  std::vector< ViewVertex * >::value_type result;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::difference_type arg2 ;
+  std::vector<ViewVertex * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -44029,20 +44818,20 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer___getitem__(PyObject *SWIGUNUSE
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewVerticesContainer___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___getitem__" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___getitem__" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer___getitem__" "', argument " "2"" of type '" "std::vector< ViewVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer___getitem__" "', argument " "2"" of type '" "std::vector<ViewVertex * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector< ViewVertex * >::difference_type >(val2);
+  arg2 = static_cast< std::vector<ViewVertex * >::difference_type >(val2);
   {
     try {
       try {
-        result = (std::vector< ViewVertex * >::value_type)std_vector_Sl_ViewVertex_Sm__Sg____getitem__(arg1,arg2);
+        result = (std::vector<ViewVertex * >::value_type)std_vector_Sl_ViewVertex_Sm__Sg____getitem__(arg1,arg2);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -44056,7 +44845,7 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer___getitem__(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -44065,9 +44854,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer___setitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
-  std::vector< ViewVertex * >::difference_type arg2 ;
-  std::vector< ViewVertex * >::value_type arg3 = (std::vector< ViewVertex * >::value_type) 0 ;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::difference_type arg2 ;
+  std::vector<ViewVertex * >::value_type arg3 = (std::vector<ViewVertex * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -44079,21 +44868,21 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer___setitem__(PyObject *SWIGUNUSE
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewVerticesContainer___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___setitem__" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___setitem__" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer___setitem__" "', argument " "2"" of type '" "std::vector< ViewVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer___setitem__" "', argument " "2"" of type '" "std::vector<ViewVertex * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector< ViewVertex * >::difference_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector<ViewVertex * >::difference_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewVerticesContainer___setitem__" "', argument " "3"" of type '" "std::vector< ViewVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewVerticesContainer___setitem__" "', argument " "3"" of type '" "std::vector<ViewVertex * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector< ViewVertex * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector<ViewVertex * >::value_type >(argp3);
   {
     try {
       try {
@@ -44120,8 +44909,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
-  std::vector< ViewVertex * >::value_type arg2 = (std::vector< ViewVertex * >::value_type) 0 ;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::value_type arg2 = (std::vector<ViewVertex * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -44130,16 +44919,16 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_append(PyObject *SWIGUNUSEDPARM
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewVerticesContainer_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_append" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_append" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0 |  0 );
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewVerticesContainer_append" "', argument " "2"" of type '" "std::vector< ViewVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewVerticesContainer_append" "', argument " "2"" of type '" "std::vector<ViewVertex * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector< ViewVertex * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector<ViewVertex * >::value_type >(argp2);
   {
     try {
       std_vector_Sl_ViewVertex_Sm__Sg__append(arg1,arg2);
@@ -44160,12 +44949,12 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewVertex * > *result = 0 ;
+  std::vector<ViewVertex * > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_ViewVerticesContainer")) SWIG_fail;
   {
     try {
-      result = (std::vector< ViewVertex * > *)new std::vector< ViewVertex * >();
+      result = (std::vector<ViewVertex * > *)new std::vector<ViewVertex * >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -44174,7 +44963,7 @@ SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer__SWIG_0(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -44183,26 +44972,26 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewVertex * > *arg1 = 0 ;
-  std::vector< ViewVertex * > *result = 0 ;
+  std::vector<ViewVertex * > *arg1 = 0 ;
+  std::vector<ViewVertex * > *result = 0 ;
   int res1 = SWIG_OLDOBJ ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_ViewVerticesContainer",&obj0)) SWIG_fail;
   {
-    std::vector<ViewVertex*,std::allocator< ViewVertex * > > *ptr = (std::vector<ViewVertex*,std::allocator< ViewVertex * > > *)0;
+    std::vector<ViewVertex*,std::allocator<ViewVertex * > > *ptr = (std::vector<ViewVertex*,std::allocator<ViewVertex * > > *)0;
     res1 = swig::asptr(obj0, &ptr);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ViewVerticesContainer" "', argument " "1"" of type '" "std::vector< ViewVertex * > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ViewVerticesContainer" "', argument " "1"" of type '" "std::vector<ViewVertex * > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ViewVerticesContainer" "', argument " "1"" of type '" "std::vector< ViewVertex * > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ViewVerticesContainer" "', argument " "1"" of type '" "std::vector<ViewVertex * > const &""'"); 
     }
     arg1 = ptr;
   }
   {
     try {
-      result = (std::vector< ViewVertex * > *)new std::vector< ViewVertex * >((std::vector< ViewVertex * > const &)*arg1);
+      result = (std::vector<ViewVertex * > *)new std::vector<ViewVertex * >((std::vector<ViewVertex * > const &)*arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -44211,7 +45000,7 @@ SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer__SWIG_1(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, SWIG_POINTER_NEW |  0 );
   if (SWIG_IsNewObj(res1)) delete arg1;
   return resultobj;
 fail:
@@ -44222,21 +45011,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_empty",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_empty" "', argument " "1"" of type '" "std::vector< ViewVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_empty" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
   {
     try {
-      result = (bool)((std::vector< ViewVertex * > const *)arg1)->empty();
+      result = (bool)((std::vector<ViewVertex * > const *)arg1)->empty();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -44254,21 +45043,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
-  std::vector< ViewVertex * >::size_type result;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_size" "', argument " "1"" of type '" "std::vector< ViewVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_size" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
   {
     try {
-      result = ((std::vector< ViewVertex * > const *)arg1)->size();
+      result = ((std::vector<ViewVertex * > const *)arg1)->size();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -44286,17 +45075,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_clear" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_clear" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
   {
     try {
       (arg1)->clear();
@@ -44317,8 +45106,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
-  std::vector< ViewVertex * > *arg2 = 0 ;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -44327,19 +45116,19 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_swap(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewVerticesContainer_swap",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_swap" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_swap" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t,  0 );
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewVerticesContainer_swap" "', argument " "2"" of type '" "std::vector< ViewVertex * > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewVerticesContainer_swap" "', argument " "2"" of type '" "std::vector<ViewVertex * > &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewVerticesContainer_swap" "', argument " "2"" of type '" "std::vector< ViewVertex * > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewVerticesContainer_swap" "', argument " "2"" of type '" "std::vector<ViewVertex * > &""'"); 
   }
-  arg2 = reinterpret_cast< std::vector< ViewVertex * > * >(argp2);
+  arg2 = reinterpret_cast< std::vector<ViewVertex * > * >(argp2);
   {
     try {
       (arg1)->swap(*arg2);
@@ -44360,21 +45149,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
-  SwigValueWrapper< std::allocator< ViewVertex * > > result;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  SwigValueWrapper<std::allocator<ViewVertex * > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_get_allocator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_get_allocator" "', argument " "1"" of type '" "std::vector< ViewVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_get_allocator" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
   {
     try {
-      result = ((std::vector< ViewVertex * > const *)arg1)->get_allocator();
+      result = ((std::vector<ViewVertex * > const *)arg1)->get_allocator();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -44383,30 +45172,30 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_get_allocator(PyObject *SWIGUNU
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new std::vector< ViewVertex * >::allocator_type(static_cast< const std::vector< ViewVertex * >::allocator_type& >(result))), SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new std::vector<ViewVertex * >::allocator_type(static_cast< const std::vector<ViewVertex * >::allocator_type& >(result))), SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVerticesContainer_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_begin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
-  std::vector< ViewVertex * >::const_iterator result;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_begin" "', argument " "1"" of type '" "std::vector< ViewVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_begin" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
   {
     try {
-      result = ((std::vector< ViewVertex * > const *)arg1)->begin();
+      result = (arg1)->begin();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -44415,7 +45204,7 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_begin(PyObject *SWIGUNUSEDPARM(
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewVertex * >::const_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewVertex * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -44423,23 +45212,89 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVerticesContainer_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_begin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
-  std::vector< ViewVertex * >::const_iterator result;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_begin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_begin" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<ViewVertex * > const *)arg1)->begin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewVertex * >::const_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_begin(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewVerticesContainer_begin__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewVerticesContainer_begin__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVerticesContainer_begin'.\n  Possible C/C++ prototypes are:\n    begin()\n    begin()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_end" "', argument " "1"" of type '" "std::vector< ViewVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_end" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
   {
     try {
-      result = ((std::vector< ViewVertex * > const *)arg1)->end();
+      result = (arg1)->end();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -44448,7 +45303,7 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_end(PyObject *SWIGUNUSEDPARM(se
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewVertex * >::const_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewVertex * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -44456,23 +45311,89 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVerticesContainer_rbegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
-  std::vector< ViewVertex * >::const_reverse_iterator result;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_end",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_end" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<ViewVertex * > const *)arg1)->end();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewVertex * >::const_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_end(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewVerticesContainer_end__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewVerticesContainer_end__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVerticesContainer_end'.\n  Possible C/C++ prototypes are:\n    end()\n    end()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_rbegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::reverse_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_rbegin" "', argument " "1"" of type '" "std::vector< ViewVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_rbegin" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
   {
     try {
-      result = ((std::vector< ViewVertex * > const *)arg1)->rbegin();
+      result = (arg1)->rbegin();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -44481,7 +45402,7 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_rbegin(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewVertex * >::const_reverse_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewVertex * >::reverse_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -44489,23 +45410,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVerticesContainer_rend(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_rbegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
-  std::vector< ViewVertex * >::const_reverse_iterator result;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::const_reverse_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_rbegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_rend" "', argument " "1"" of type '" "std::vector< ViewVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_rbegin" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
   {
     try {
-      result = ((std::vector< ViewVertex * > const *)arg1)->rend();
+      result = ((std::vector<ViewVertex * > const *)arg1)->rbegin();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -44514,7 +45435,7 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_rend(PyObject *SWIGUNUSEDPARM(s
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewVertex * >::const_reverse_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewVertex * >::const_reverse_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -44522,10 +45443,142 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_rbegin(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewVerticesContainer_rbegin__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewVerticesContainer_rbegin__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVerticesContainer_rbegin'.\n  Possible C/C++ prototypes are:\n    rbegin()\n    rbegin()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_rend__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::reverse_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_rend",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_rend" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  {
+    try {
+      result = (arg1)->rend();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewVertex * >::reverse_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_rend__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::const_reverse_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_rend",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_rend" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<ViewVertex * > const *)arg1)->rend();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewVertex * >::const_reverse_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_rend(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewVerticesContainer_rend__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ViewVerticesContainer_rend__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVerticesContainer_rend'.\n  Possible C/C++ prototypes are:\n    rend()\n    rend()\n");
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewVertex * >::size_type arg1 ;
-  std::vector< ViewVertex * > *result = 0 ;
+  std::vector<ViewVertex * >::size_type arg1 ;
+  std::vector<ViewVertex * > *result = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -44533,12 +45586,12 @@ SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer__SWIG_2(PyObject *SWIGUNUSE
   if (!PyArg_ParseTuple(args,(char *)"O:new_ViewVerticesContainer",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ViewVerticesContainer" "', argument " "1"" of type '" "std::vector< ViewVertex * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ViewVerticesContainer" "', argument " "1"" of type '" "std::vector<ViewVertex * >::size_type""'");
   } 
-  arg1 = static_cast< std::vector< ViewVertex * >::size_type >(val1);
+  arg1 = static_cast< std::vector<ViewVertex * >::size_type >(val1);
   {
     try {
-      result = (std::vector< ViewVertex * > *)new std::vector< ViewVertex * >(arg1);
+      result = (std::vector<ViewVertex * > *)new std::vector<ViewVertex * >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -44547,7 +45600,7 @@ SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer__SWIG_2(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -44556,17 +45609,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_pop_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_pop_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_pop_back" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_pop_back" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
   {
     try {
       (arg1)->pop_back();
@@ -44587,8 +45640,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
-  std::vector< ViewVertex * >::size_type arg2 ;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::size_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -44597,16 +45650,16 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_resize__SWIG_0(PyObject *SWIGUN
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewVerticesContainer_resize",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_resize" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_resize" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer_resize" "', argument " "2"" of type '" "std::vector< ViewVertex * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer_resize" "', argument " "2"" of type '" "std::vector<ViewVertex * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector< ViewVertex * >::size_type >(val2);
+  arg2 = static_cast< std::vector<ViewVertex * >::size_type >(val2);
   {
     try {
       (arg1)->resize(arg2);
@@ -44627,9 +45680,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
-  std::vector< ViewVertex * >::iterator arg2 ;
-  std::vector< ViewVertex * >::iterator result;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::iterator arg2 ;
+  std::vector<ViewVertex * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -44638,20 +45691,20 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_erase__SWIG_0(PyObject *SWIGUNU
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewVerticesContainer_erase",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_erase" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_erase" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_erase" "', argument " "2"" of type '" "std::vector< ViewVertex * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewVertex * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector< ViewVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< ViewVertex * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_erase" "', argument " "2"" of type '" "std::vector< ViewVertex * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewVertex * >::iterator""'");
     }
   }
   {
@@ -44665,7 +45718,7 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_erase__SWIG_0(PyObject *SWIGUNU
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewVertex * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewVertex * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -44675,10 +45728,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
-  std::vector< ViewVertex * >::iterator arg2 ;
-  std::vector< ViewVertex * >::iterator arg3 ;
-  std::vector< ViewVertex * >::iterator result;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::iterator arg2 ;
+  std::vector<ViewVertex * >::iterator arg3 ;
+  std::vector<ViewVertex * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -44690,31 +45743,31 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_erase__SWIG_1(PyObject *SWIGUNU
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewVerticesContainer_erase",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_erase" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_erase" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_erase" "', argument " "2"" of type '" "std::vector< ViewVertex * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewVertex * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector< ViewVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< ViewVertex * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_erase" "', argument " "2"" of type '" "std::vector< ViewVertex * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewVertex * >::iterator""'");
     }
   }
   res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res3) || !iter3) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_erase" "', argument " "3"" of type '" "std::vector< ViewVertex * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_erase" "', argument " "3"" of type '" "std::vector<ViewVertex * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector< ViewVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< ViewVertex * >::iterator > *>(iter3);
+    swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *>(iter3);
     if (iter_t) {
       arg3 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_erase" "', argument " "3"" of type '" "std::vector< ViewVertex * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_erase" "', argument " "3"" of type '" "std::vector<ViewVertex * >::iterator""'");
     }
   }
   {
@@ -44728,7 +45781,7 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_erase__SWIG_1(PyObject *SWIGUNU
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewVertex * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewVertex * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -44742,18 +45795,18 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_erase(PyObject *self, PyObject
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator< ViewVertex * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< ViewVertex * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *>(iter) != 0));
       if (_v) {
         return _wrap_ViewVerticesContainer_erase__SWIG_0(self, args);
       }
@@ -44761,16 +45814,16 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_erase(PyObject *self, PyObject
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator< ViewVertex * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< ViewVertex * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *>(iter) != 0));
       if (_v) {
         swig::PySwigIterator *iter = 0;
         int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< ViewVertex * >::iterator > *>(iter) != 0));
+        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *>(iter) != 0));
         if (_v) {
           return _wrap_ViewVerticesContainer_erase__SWIG_1(self, args);
         }
@@ -44779,19 +45832,16 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_erase(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVerticesContainer_erase'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    erase(std::vector< ViewVertex * > *,std::vector< ViewVertex * >::iterator)\n"
-    "    erase(std::vector< ViewVertex * > *,std::vector< ViewVertex * >::iterator,std::vector< ViewVertex * >::iterator)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVerticesContainer_erase'.\n  Possible C/C++ prototypes are:\n    erase(std::vector<ViewVertex * >::iterator)\n    erase(std::vector<ViewVertex * >::iterator,std::vector<ViewVertex * >::iterator)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewVertex * >::size_type arg1 ;
-  std::vector< ViewVertex * >::value_type arg2 = (std::vector< ViewVertex * >::value_type) 0 ;
-  std::vector< ViewVertex * > *result = 0 ;
+  std::vector<ViewVertex * >::size_type arg1 ;
+  std::vector<ViewVertex * >::value_type arg2 = (std::vector<ViewVertex * >::value_type) 0 ;
+  std::vector<ViewVertex * > *result = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   void *argp2 = 0 ;
@@ -44802,17 +45852,17 @@ SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer__SWIG_3(PyObject *SWIGUNUSE
   if (!PyArg_ParseTuple(args,(char *)"OO:new_ViewVerticesContainer",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ViewVerticesContainer" "', argument " "1"" of type '" "std::vector< ViewVertex * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ViewVerticesContainer" "', argument " "1"" of type '" "std::vector<ViewVertex * >::size_type""'");
   } 
-  arg1 = static_cast< std::vector< ViewVertex * >::size_type >(val1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0 |  0 );
+  arg1 = static_cast< std::vector<ViewVertex * >::size_type >(val1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ViewVerticesContainer" "', argument " "2"" of type '" "std::vector< ViewVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ViewVerticesContainer" "', argument " "2"" of type '" "std::vector<ViewVertex * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector< ViewVertex * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector<ViewVertex * >::value_type >(argp2);
   {
     try {
-      result = (std::vector< ViewVertex * > *)new std::vector< ViewVertex * >(arg1,arg2);
+      result = (std::vector<ViewVertex * > *)new std::vector<ViewVertex * >(arg1,arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -44821,7 +45871,7 @@ SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer__SWIG_3(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -44834,7 +45884,7 @@ SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer(PyObject *self, PyObject *a
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -44853,7 +45903,7 @@ SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer(PyObject *self, PyObject *a
   }
   if (argc == 1) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator< ViewVertex * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_new_ViewVerticesContainer__SWIG_1(self, args);
@@ -44867,7 +45917,7 @@ SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer(PyObject *self, PyObject *a
     }
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_new_ViewVerticesContainer__SWIG_3(self, args);
@@ -44876,20 +45926,15 @@ SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer(PyObject *self, PyObject *a
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewVerticesContainer'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    std::vector< ViewVertex * >()\n"
-    "    std::vector< ViewVertex * >(std::vector< ViewVertex * > const &)\n"
-    "    std::vector< ViewVertex * >(std::vector< ViewVertex * >::size_type)\n"
-    "    std::vector< ViewVertex * >(std::vector< ViewVertex * >::size_type,std::vector< ViewVertex * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewVerticesContainer'.\n  Possible C/C++ prototypes are:\n    std::vector<(p.ViewVertex)>()\n    std::vector<(p.ViewVertex)>(std::vector<ViewVertex * > const &)\n    std::vector<(p.ViewVertex)>(std::vector<ViewVertex * >::size_type)\n    std::vector<(p.ViewVertex)>(std::vector<ViewVertex * >::size_type,std::vector<ViewVertex * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_push_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
-  std::vector< ViewVertex * >::value_type arg2 = (std::vector< ViewVertex * >::value_type) 0 ;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::value_type arg2 = (std::vector<ViewVertex * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -44898,16 +45943,16 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_push_back(PyObject *SWIGUNUSEDP
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewVerticesContainer_push_back",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_push_back" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_push_back" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0 |  0 );
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewVerticesContainer_push_back" "', argument " "2"" of type '" "std::vector< ViewVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewVerticesContainer_push_back" "', argument " "2"" of type '" "std::vector<ViewVertex * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector< ViewVertex * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector<ViewVertex * >::value_type >(argp2);
   {
     try {
       (arg1)->push_back(arg2);
@@ -44928,21 +45973,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_front(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
-  std::vector< ViewVertex * >::value_type result;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_front",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_front" "', argument " "1"" of type '" "std::vector< ViewVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_front" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
   {
     try {
-      result = (std::vector< ViewVertex * >::value_type)((std::vector< ViewVertex * > const *)arg1)->front();
+      result = (std::vector<ViewVertex * >::value_type)((std::vector<ViewVertex * > const *)arg1)->front();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -44951,7 +45996,7 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_front(PyObject *SWIGUNUSEDPARM(
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -44960,21 +46005,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
-  std::vector< ViewVertex * >::value_type result;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_back" "', argument " "1"" of type '" "std::vector< ViewVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_back" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
   {
     try {
-      result = (std::vector< ViewVertex * >::value_type)((std::vector< ViewVertex * > const *)arg1)->back();
+      result = (std::vector<ViewVertex * >::value_type)((std::vector<ViewVertex * > const *)arg1)->back();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -44983,7 +46028,7 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_back(PyObject *SWIGUNUSEDPARM(s
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -44992,9 +46037,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_assign(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
-  std::vector< ViewVertex * >::size_type arg2 ;
-  std::vector< ViewVertex * >::value_type arg3 = (std::vector< ViewVertex * >::value_type) 0 ;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::size_type arg2 ;
+  std::vector<ViewVertex * >::value_type arg3 = (std::vector<ViewVertex * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -45006,21 +46051,21 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_assign(PyObject *SWIGUNUSEDPARM
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewVerticesContainer_assign",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_assign" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_assign" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer_assign" "', argument " "2"" of type '" "std::vector< ViewVertex * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer_assign" "', argument " "2"" of type '" "std::vector<ViewVertex * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector< ViewVertex * >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector<ViewVertex * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewVerticesContainer_assign" "', argument " "3"" of type '" "std::vector< ViewVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewVerticesContainer_assign" "', argument " "3"" of type '" "std::vector<ViewVertex * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector< ViewVertex * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector<ViewVertex * >::value_type >(argp3);
   {
     try {
       (arg1)->assign(arg2,arg3);
@@ -45041,9 +46086,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
-  std::vector< ViewVertex * >::size_type arg2 ;
-  std::vector< ViewVertex * >::value_type arg3 = (std::vector< ViewVertex * >::value_type) 0 ;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::size_type arg2 ;
+  std::vector<ViewVertex * >::value_type arg3 = (std::vector<ViewVertex * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -45055,21 +46100,21 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_resize__SWIG_1(PyObject *SWIGUN
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewVerticesContainer_resize",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_resize" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_resize" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer_resize" "', argument " "2"" of type '" "std::vector< ViewVertex * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer_resize" "', argument " "2"" of type '" "std::vector<ViewVertex * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector< ViewVertex * >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector<ViewVertex * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewVerticesContainer_resize" "', argument " "3"" of type '" "std::vector< ViewVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewVerticesContainer_resize" "', argument " "3"" of type '" "std::vector<ViewVertex * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector< ViewVertex * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector<ViewVertex * >::value_type >(argp3);
   {
     try {
       (arg1)->resize(arg2,arg3);
@@ -45094,13 +46139,13 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_resize(PyObject *self, PyObject
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator< ViewVertex * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -45114,7 +46159,7 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_resize(PyObject *self, PyObject
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator< ViewVertex * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -45123,7 +46168,7 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_resize(PyObject *self, PyObject
       }
       if (_v) {
         void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0);
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           return _wrap_ViewVerticesContainer_resize__SWIG_1(self, args);
@@ -45133,20 +46178,17 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_resize(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVerticesContainer_resize'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    resize(std::vector< ViewVertex * > *,std::vector< ViewVertex * >::size_type)\n"
-    "    resize(std::vector< ViewVertex * > *,std::vector< ViewVertex * >::size_type,std::vector< ViewVertex * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVerticesContainer_resize'.\n  Possible C/C++ prototypes are:\n    resize(std::vector<ViewVertex * >::size_type)\n    resize(std::vector<ViewVertex * >::size_type,std::vector<ViewVertex * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
-  std::vector< ViewVertex * >::iterator arg2 ;
-  std::vector< ViewVertex * >::value_type arg3 = (std::vector< ViewVertex * >::value_type) 0 ;
-  std::vector< ViewVertex * >::iterator result;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::iterator arg2 ;
+  std::vector<ViewVertex * >::value_type arg3 = (std::vector<ViewVertex * >::value_type) 0 ;
+  std::vector<ViewVertex * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -45158,27 +46200,27 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_insert__SWIG_0(PyObject *SWIGUN
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewVerticesContainer_insert",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_insert" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_insert" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_insert" "', argument " "2"" of type '" "std::vector< ViewVertex * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewVertex * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector< ViewVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< ViewVertex * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_insert" "', argument " "2"" of type '" "std::vector< ViewVertex * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewVertex * >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0 |  0 );
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewVerticesContainer_insert" "', argument " "3"" of type '" "std::vector< ViewVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewVerticesContainer_insert" "', argument " "3"" of type '" "std::vector<ViewVertex * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector< ViewVertex * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector<ViewVertex * >::value_type >(argp3);
   {
     try {
       result = (arg1)->insert(arg2,arg3);
@@ -45190,7 +46232,7 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_insert__SWIG_0(PyObject *SWIGUN
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewVertex * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewVertex * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -45200,10 +46242,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
-  std::vector< ViewVertex * >::iterator arg2 ;
-  std::vector< ViewVertex * >::size_type arg3 ;
-  std::vector< ViewVertex * >::value_type arg4 = (std::vector< ViewVertex * >::value_type) 0 ;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::iterator arg2 ;
+  std::vector<ViewVertex * >::size_type arg3 ;
+  std::vector<ViewVertex * >::value_type arg4 = (std::vector<ViewVertex * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -45218,32 +46260,32 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_insert__SWIG_1(PyObject *SWIGUN
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:ViewVerticesContainer_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_insert" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_insert" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_insert" "', argument " "2"" of type '" "std::vector< ViewVertex * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewVertex * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector< ViewVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< ViewVertex * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_insert" "', argument " "2"" of type '" "std::vector< ViewVertex * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewVertex * >::iterator""'");
     }
   }
   ecode3 = SWIG_AsVal_size_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewVerticesContainer_insert" "', argument " "3"" of type '" "std::vector< ViewVertex * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewVerticesContainer_insert" "', argument " "3"" of type '" "std::vector<ViewVertex * >::size_type""'");
   } 
-  arg3 = static_cast< std::vector< ViewVertex * >::size_type >(val3);
-  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0 |  0 );
+  arg3 = static_cast< std::vector<ViewVertex * >::size_type >(val3);
+  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewVerticesContainer_insert" "', argument " "4"" of type '" "std::vector< ViewVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewVerticesContainer_insert" "', argument " "4"" of type '" "std::vector<ViewVertex * >::value_type""'"); 
   }
-  arg4 = reinterpret_cast< std::vector< ViewVertex * >::value_type >(argp4);
+  arg4 = reinterpret_cast< std::vector<ViewVertex * >::value_type >(argp4);
   {
     try {
       (arg1)->insert(arg2,arg3,arg4);
@@ -45268,21 +46310,21 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_insert(PyObject *self, PyObject
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator< ViewVertex * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< ViewVertex * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *>(iter) != 0));
       if (_v) {
         void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0);
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           return _wrap_ViewVerticesContainer_insert__SWIG_0(self, args);
@@ -45292,12 +46334,12 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_insert(PyObject *self, PyObject
   }
   if (argc == 4) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator< ViewVertex * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< ViewVertex * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *>(iter) != 0));
       if (_v) {
         {
           int res = SWIG_AsVal_size_t(argv[2], NULL);
@@ -45305,7 +46347,7 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_insert(PyObject *self, PyObject
         }
         if (_v) {
           void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0);
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0);
           _v = SWIG_CheckState(res);
           if (_v) {
             return _wrap_ViewVerticesContainer_insert__SWIG_1(self, args);
@@ -45316,18 +46358,15 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_insert(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVerticesContainer_insert'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    insert(std::vector< ViewVertex * > *,std::vector< ViewVertex * >::iterator,std::vector< ViewVertex * >::value_type)\n"
-    "    insert(std::vector< ViewVertex * > *,std::vector< ViewVertex * >::iterator,std::vector< ViewVertex * >::size_type,std::vector< ViewVertex * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVerticesContainer_insert'.\n  Possible C/C++ prototypes are:\n    insert(std::vector<ViewVertex * >::iterator,std::vector<ViewVertex * >::value_type)\n    insert(std::vector<ViewVertex * >::iterator,std::vector<ViewVertex * >::size_type,std::vector<ViewVertex * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_reserve(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
-  std::vector< ViewVertex * >::size_type arg2 ;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::size_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -45336,16 +46375,16 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_reserve(PyObject *SWIGUNUSEDPAR
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewVerticesContainer_reserve",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_reserve" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_reserve" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer_reserve" "', argument " "2"" of type '" "std::vector< ViewVertex * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer_reserve" "', argument " "2"" of type '" "std::vector<ViewVertex * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector< ViewVertex * >::size_type >(val2);
+  arg2 = static_cast< std::vector<ViewVertex * >::size_type >(val2);
   {
     try {
       (arg1)->reserve(arg2);
@@ -45366,21 +46405,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_capacity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
-  std::vector< ViewVertex * >::size_type result;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_capacity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_capacity" "', argument " "1"" of type '" "std::vector< ViewVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_capacity" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
   {
     try {
-      result = ((std::vector< ViewVertex * > const *)arg1)->capacity();
+      result = ((std::vector<ViewVertex * > const *)arg1)->capacity();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -45398,17 +46437,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_ViewVerticesContainer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_ViewVerticesContainer",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ViewVerticesContainer" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ViewVerticesContainer" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
   {
     try {
       delete arg1;
@@ -45430,14 +46469,14 @@ fail:
 
 SWIGINTERN PyObject *ViewVerticesContainer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
   PyObject **arg2 = (PyObject **) 0 ;
   swig::PySwigIterator *result = 0 ;
   void *argp1 = 0 ;
@@ -45446,11 +46485,11 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_iterator(PyObject *SWIGUNUSEDPARM(
   
   arg2 = &obj0;
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_iterator" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_iterator" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
   {
     try {
       result = (swig::PySwigIterator *)std_vector_Sl_SVertex_Sm__Sg__iterator(arg1,arg2);
@@ -45471,21 +46510,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer___nonzero__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer___nonzero__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___nonzero__" "', argument " "1"" of type '" "std::vector< SVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___nonzero__" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
   {
     try {
-      result = (bool)std_vector_Sl_SVertex_Sm__Sg____nonzero__((std::vector< SVertex * > const *)arg1);
+      result = (bool)std_vector_Sl_SVertex_Sm__Sg____nonzero__((std::vector<SVertex * > const *)arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -45503,21 +46542,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer___len__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
-  std::vector< SVertex * >::size_type result;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer___len__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___len__" "', argument " "1"" of type '" "std::vector< SVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___len__" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
   {
     try {
-      result = std_vector_Sl_SVertex_Sm__Sg____len__((std::vector< SVertex * > const *)arg1);
+      result = std_vector_Sl_SVertex_Sm__Sg____len__((std::vector<SVertex * > const *)arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -45535,22 +46574,22 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
-  std::vector< SVertex * >::value_type result;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_pop" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_pop" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
   {
     try {
       try {
-        result = (std::vector< SVertex * >::value_type)std_vector_Sl_SVertex_Sm__Sg__pop(arg1);
+        result = (std::vector<SVertex * >::value_type)std_vector_Sl_SVertex_Sm__Sg__pop(arg1);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -45564,7 +46603,7 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_pop(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -45573,10 +46612,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
-  std::vector< SVertex * >::difference_type arg2 ;
-  std::vector< SVertex * >::difference_type arg3 ;
-  std::vector< SVertex *,std::allocator< SVertex * > > *result = 0 ;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::difference_type arg2 ;
+  std::vector<SVertex * >::difference_type arg3 ;
+  std::vector<SVertex *,std::allocator<SVertex * > > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -45588,25 +46627,25 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer___getslice__(PyObject *SWIGUNUSEDP
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:SVerticesContainer___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___getslice__" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___getslice__" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer___getslice__" "', argument " "2"" of type '" "std::vector< SVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer___getslice__" "', argument " "2"" of type '" "std::vector<SVertex * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector< SVertex * >::difference_type >(val2);
+  arg2 = static_cast< std::vector<SVertex * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SVerticesContainer___getslice__" "', argument " "3"" of type '" "std::vector< SVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SVerticesContainer___getslice__" "', argument " "3"" of type '" "std::vector<SVertex * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector< SVertex * >::difference_type >(val3);
+  arg3 = static_cast< std::vector<SVertex * >::difference_type >(val3);
   {
     try {
       try {
-        result = (std::vector< SVertex *,std::allocator< SVertex * > > *)std_vector_Sl_SVertex_Sm__Sg____getslice__(arg1,arg2,arg3);
+        result = (std::vector<SVertex *,std::allocator<SVertex * > > *)std_vector_Sl_SVertex_Sm__Sg____getslice__(arg1,arg2,arg3);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -45620,7 +46659,7 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer___getslice__(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -45629,10 +46668,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer___setslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
-  std::vector< SVertex * >::difference_type arg2 ;
-  std::vector< SVertex * >::difference_type arg3 ;
-  std::vector< SVertex *,std::allocator< SVertex * > > *arg4 = 0 ;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::difference_type arg2 ;
+  std::vector<SVertex * >::difference_type arg3 ;
+  std::vector<SVertex *,std::allocator<SVertex * > > *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -45646,36 +46685,36 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer___setslice__(PyObject *SWIGUNUSEDP
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:SVerticesContainer___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___setslice__" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___setslice__" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer___setslice__" "', argument " "2"" of type '" "std::vector< SVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer___setslice__" "', argument " "2"" of type '" "std::vector<SVertex * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector< SVertex * >::difference_type >(val2);
+  arg2 = static_cast< std::vector<SVertex * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SVerticesContainer___setslice__" "', argument " "3"" of type '" "std::vector< SVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SVerticesContainer___setslice__" "', argument " "3"" of type '" "std::vector<SVertex * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector< SVertex * >::difference_type >(val3);
+  arg3 = static_cast< std::vector<SVertex * >::difference_type >(val3);
   {
-    std::vector<SVertex*,std::allocator< SVertex * > > *ptr = (std::vector<SVertex*,std::allocator< SVertex * > > *)0;
+    std::vector<SVertex*,std::allocator<SVertex * > > *ptr = (std::vector<SVertex*,std::allocator<SVertex * > > *)0;
     res4 = swig::asptr(obj3, &ptr);
     if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "SVerticesContainer___setslice__" "', argument " "4"" of type '" "std::vector< SVertex *,std::allocator< SVertex * > > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "SVerticesContainer___setslice__" "', argument " "4"" of type '" "std::vector<SVertex *,std::allocator<SVertex * > > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SVerticesContainer___setslice__" "', argument " "4"" of type '" "std::vector< SVertex *,std::allocator< SVertex * > > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SVerticesContainer___setslice__" "', argument " "4"" of type '" "std::vector<SVertex *,std::allocator<SVertex * > > const &""'"); 
     }
     arg4 = ptr;
   }
   {
     try {
       try {
-        std_vector_Sl_SVertex_Sm__Sg____setslice__(arg1,arg2,arg3,(std::vector< SVertex *,std::allocator< SVertex * > > const &)*arg4);
+        std_vector_Sl_SVertex_Sm__Sg____setslice__(arg1,arg2,arg3,(std::vector<SVertex *,std::allocator<SVertex * > > const &)*arg4);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -45703,9 +46742,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer___delslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
-  std::vector< SVertex * >::difference_type arg2 ;
-  std::vector< SVertex * >::difference_type arg3 ;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::difference_type arg2 ;
+  std::vector<SVertex * >::difference_type arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -45717,21 +46756,21 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer___delslice__(PyObject *SWIGUNUSEDP
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:SVerticesContainer___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___delslice__" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___delslice__" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer___delslice__" "', argument " "2"" of type '" "std::vector< SVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer___delslice__" "', argument " "2"" of type '" "std::vector<SVertex * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector< SVertex * >::difference_type >(val2);
+  arg2 = static_cast< std::vector<SVertex * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SVerticesContainer___delslice__" "', argument " "3"" of type '" "std::vector< SVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SVerticesContainer___delslice__" "', argument " "3"" of type '" "std::vector<SVertex * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector< SVertex * >::difference_type >(val3);
+  arg3 = static_cast< std::vector<SVertex * >::difference_type >(val3);
   {
     try {
       try {
@@ -45758,8 +46797,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer___delitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
-  std::vector< SVertex * >::difference_type arg2 ;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::difference_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -45768,16 +46807,16 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer___delitem__(PyObject *SWIGUNUSEDPA
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:SVerticesContainer___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___delitem__" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___delitem__" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer___delitem__" "', argument " "2"" of type '" "std::vector< SVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer___delitem__" "', argument " "2"" of type '" "std::vector<SVertex * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector< SVertex * >::difference_type >(val2);
+  arg2 = static_cast< std::vector<SVertex * >::difference_type >(val2);
   {
     try {
       try {
@@ -45804,9 +46843,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer___getitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
-  std::vector< SVertex * >::difference_type arg2 ;
-  std::vector< SVertex * >::value_type result;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::difference_type arg2 ;
+  std::vector<SVertex * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -45815,20 +46854,20 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer___getitem__(PyObject *SWIGUNUSEDPA
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:SVerticesContainer___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___getitem__" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___getitem__" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer___getitem__" "', argument " "2"" of type '" "std::vector< SVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer___getitem__" "', argument " "2"" of type '" "std::vector<SVertex * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector< SVertex * >::difference_type >(val2);
+  arg2 = static_cast< std::vector<SVertex * >::difference_type >(val2);
   {
     try {
       try {
-        result = (std::vector< SVertex * >::value_type)std_vector_Sl_SVertex_Sm__Sg____getitem__(arg1,arg2);
+        result = (std::vector<SVertex * >::value_type)std_vector_Sl_SVertex_Sm__Sg____getitem__(arg1,arg2);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -45842,7 +46881,7 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer___getitem__(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -45851,9 +46890,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer___setitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
-  std::vector< SVertex * >::difference_type arg2 ;
-  std::vector< SVertex * >::value_type arg3 = (std::vector< SVertex * >::value_type) 0 ;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::difference_type arg2 ;
+  std::vector<SVertex * >::value_type arg3 = (std::vector<SVertex * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -45865,21 +46904,21 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer___setitem__(PyObject *SWIGUNUSEDPA
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:SVerticesContainer___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___setitem__" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___setitem__" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer___setitem__" "', argument " "2"" of type '" "std::vector< SVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer___setitem__" "', argument " "2"" of type '" "std::vector<SVertex * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector< SVertex * >::difference_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector<SVertex * >::difference_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SVerticesContainer___setitem__" "', argument " "3"" of type '" "std::vector< SVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SVerticesContainer___setitem__" "', argument " "3"" of type '" "std::vector<SVertex * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector< SVertex * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector<SVertex * >::value_type >(argp3);
   {
     try {
       try {
@@ -45906,8 +46945,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
-  std::vector< SVertex * >::value_type arg2 = (std::vector< SVertex * >::value_type) 0 ;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::value_type arg2 = (std::vector<SVertex * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -45916,16 +46955,16 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_append(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:SVerticesContainer_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_append" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_append" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0 |  0 );
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVerticesContainer_append" "', argument " "2"" of type '" "std::vector< SVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVerticesContainer_append" "', argument " "2"" of type '" "std::vector<SVertex * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector< SVertex * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector<SVertex * >::value_type >(argp2);
   {
     try {
       std_vector_Sl_SVertex_Sm__Sg__append(arg1,arg2);
@@ -45946,12 +46985,12 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_SVerticesContainer__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< SVertex * > *result = 0 ;
+  std::vector<SVertex * > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_SVerticesContainer")) SWIG_fail;
   {
     try {
-      result = (std::vector< SVertex * > *)new std::vector< SVertex * >();
+      result = (std::vector<SVertex * > *)new std::vector<SVertex * >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -45960,7 +46999,7 @@ SWIGINTERN PyObject *_wrap_new_SVerticesContainer__SWIG_0(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -45969,26 +47008,26 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_SVerticesContainer__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< SVertex * > *arg1 = 0 ;
-  std::vector< SVertex * > *result = 0 ;
+  std::vector<SVertex * > *arg1 = 0 ;
+  std::vector<SVertex * > *result = 0 ;
   int res1 = SWIG_OLDOBJ ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_SVerticesContainer",&obj0)) SWIG_fail;
   {
-    std::vector<SVertex*,std::allocator< SVertex * > > *ptr = (std::vector<SVertex*,std::allocator< SVertex * > > *)0;
+    std::vector<SVertex*,std::allocator<SVertex * > > *ptr = (std::vector<SVertex*,std::allocator<SVertex * > > *)0;
     res1 = swig::asptr(obj0, &ptr);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_SVerticesContainer" "', argument " "1"" of type '" "std::vector< SVertex * > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_SVerticesContainer" "', argument " "1"" of type '" "std::vector<SVertex * > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_SVerticesContainer" "', argument " "1"" of type '" "std::vector< SVertex * > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_SVerticesContainer" "', argument " "1"" of type '" "std::vector<SVertex * > const &""'"); 
     }
     arg1 = ptr;
   }
   {
     try {
-      result = (std::vector< SVertex * > *)new std::vector< SVertex * >((std::vector< SVertex * > const &)*arg1);
+      result = (std::vector<SVertex * > *)new std::vector<SVertex * >((std::vector<SVertex * > const &)*arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -45997,7 +47036,7 @@ SWIGINTERN PyObject *_wrap_new_SVerticesContainer__SWIG_1(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, SWIG_POINTER_NEW |  0 );
   if (SWIG_IsNewObj(res1)) delete arg1;
   return resultobj;
 fail:
@@ -46008,21 +47047,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_empty",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_empty" "', argument " "1"" of type '" "std::vector< SVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_empty" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
   {
     try {
-      result = (bool)((std::vector< SVertex * > const *)arg1)->empty();
+      result = (bool)((std::vector<SVertex * > const *)arg1)->empty();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -46040,21 +47079,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
-  std::vector< SVertex * >::size_type result;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_size" "', argument " "1"" of type '" "std::vector< SVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_size" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
   {
     try {
-      result = ((std::vector< SVertex * > const *)arg1)->size();
+      result = ((std::vector<SVertex * > const *)arg1)->size();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -46072,17 +47111,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_clear" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_clear" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
   {
     try {
       (arg1)->clear();
@@ -46103,8 +47142,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
-  std::vector< SVertex * > *arg2 = 0 ;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -46113,19 +47152,19 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_swap(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:SVerticesContainer_swap",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_swap" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_swap" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t,  0 );
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVerticesContainer_swap" "', argument " "2"" of type '" "std::vector< SVertex * > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVerticesContainer_swap" "', argument " "2"" of type '" "std::vector<SVertex * > &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SVerticesContainer_swap" "', argument " "2"" of type '" "std::vector< SVertex * > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SVerticesContainer_swap" "', argument " "2"" of type '" "std::vector<SVertex * > &""'"); 
   }
-  arg2 = reinterpret_cast< std::vector< SVertex * > * >(argp2);
+  arg2 = reinterpret_cast< std::vector<SVertex * > * >(argp2);
   {
     try {
       (arg1)->swap(*arg2);
@@ -46146,21 +47185,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
-  SwigValueWrapper< std::allocator< SVertex * > > result;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  SwigValueWrapper<std::allocator<SVertex * > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_get_allocator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_get_allocator" "', argument " "1"" of type '" "std::vector< SVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_get_allocator" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
   {
     try {
-      result = ((std::vector< SVertex * > const *)arg1)->get_allocator();
+      result = ((std::vector<SVertex * > const *)arg1)->get_allocator();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -46169,30 +47208,30 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_get_allocator(PyObject *SWIGUNUSED
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new std::vector< SVertex * >::allocator_type(static_cast< const std::vector< SVertex * >::allocator_type& >(result))), SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new std::vector<SVertex * >::allocator_type(static_cast< const std::vector<SVertex * >::allocator_type& >(result))), SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_SVerticesContainer_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SVerticesContainer_begin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
-  std::vector< SVertex * >::const_iterator result;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_begin" "', argument " "1"" of type '" "std::vector< SVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_begin" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
   {
     try {
-      result = ((std::vector< SVertex * > const *)arg1)->begin();
+      result = (arg1)->begin();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -46201,7 +47240,7 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_begin(PyObject *SWIGUNUSEDPARM(sel
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< SVertex * >::const_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<SVertex * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -46209,23 +47248,89 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SVerticesContainer_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SVerticesContainer_begin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
-  std::vector< SVertex * >::const_iterator result;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_begin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_begin" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<SVertex * > const *)arg1)->begin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<SVertex * >::const_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer_begin(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_SVerticesContainer_begin__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_SVerticesContainer_begin__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SVerticesContainer_begin'.\n  Possible C/C++ prototypes are:\n    begin()\n    begin()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_end" "', argument " "1"" of type '" "std::vector< SVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_end" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
   {
     try {
-      result = ((std::vector< SVertex * > const *)arg1)->end();
+      result = (arg1)->end();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -46234,7 +47339,7 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_end(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< SVertex * >::const_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<SVertex * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -46242,23 +47347,89 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SVerticesContainer_rbegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SVerticesContainer_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
-  std::vector< SVertex * >::const_reverse_iterator result;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_end",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_end" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<SVertex * > const *)arg1)->end();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<SVertex * >::const_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer_end(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_SVerticesContainer_end__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_SVerticesContainer_end__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SVerticesContainer_end'.\n  Possible C/C++ prototypes are:\n    end()\n    end()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer_rbegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::reverse_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_rbegin" "', argument " "1"" of type '" "std::vector< SVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_rbegin" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
   {
     try {
-      result = ((std::vector< SVertex * > const *)arg1)->rbegin();
+      result = (arg1)->rbegin();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -46267,7 +47438,7 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_rbegin(PyObject *SWIGUNUSEDPARM(se
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< SVertex * >::const_reverse_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<SVertex * >::reverse_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -46275,23 +47446,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SVerticesContainer_rend(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SVerticesContainer_rbegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
-  std::vector< SVertex * >::const_reverse_iterator result;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::const_reverse_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
+  if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_rbegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_rend" "', argument " "1"" of type '" "std::vector< SVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_rbegin" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
   {
     try {
-      result = ((std::vector< SVertex * > const *)arg1)->rend();
+      result = ((std::vector<SVertex * > const *)arg1)->rbegin();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -46300,7 +47471,7 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_rend(PyObject *SWIGUNUSEDPARM(self
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< SVertex * >::const_reverse_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<SVertex * >::const_reverse_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -46308,10 +47479,142 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_SVerticesContainer_rbegin(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_SVerticesContainer_rbegin__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_SVerticesContainer_rbegin__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SVerticesContainer_rbegin'.\n  Possible C/C++ prototypes are:\n    rbegin()\n    rbegin()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer_rend__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::reverse_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_rend",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_rend" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  {
+    try {
+      result = (arg1)->rend();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<SVertex * >::reverse_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer_rend__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::const_reverse_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_rend",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_rend" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<SVertex * > const *)arg1)->rend();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<SVertex * >::const_reverse_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_SVerticesContainer_rend(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_SVerticesContainer_rend__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_SVerticesContainer_rend__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SVerticesContainer_rend'.\n  Possible C/C++ prototypes are:\n    rend()\n    rend()\n");
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_new_SVerticesContainer__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< SVertex * >::size_type arg1 ;
-  std::vector< SVertex * > *result = 0 ;
+  std::vector<SVertex * >::size_type arg1 ;
+  std::vector<SVertex * > *result = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -46319,12 +47622,12 @@ SWIGINTERN PyObject *_wrap_new_SVerticesContainer__SWIG_2(PyObject *SWIGUNUSEDPA
   if (!PyArg_ParseTuple(args,(char *)"O:new_SVerticesContainer",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_SVerticesContainer" "', argument " "1"" of type '" "std::vector< SVertex * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_SVerticesContainer" "', argument " "1"" of type '" "std::vector<SVertex * >::size_type""'");
   } 
-  arg1 = static_cast< std::vector< SVertex * >::size_type >(val1);
+  arg1 = static_cast< std::vector<SVertex * >::size_type >(val1);
   {
     try {
-      result = (std::vector< SVertex * > *)new std::vector< SVertex * >(arg1);
+      result = (std::vector<SVertex * > *)new std::vector<SVertex * >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -46333,7 +47636,7 @@ SWIGINTERN PyObject *_wrap_new_SVerticesContainer__SWIG_2(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -46342,17 +47645,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_pop_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_pop_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_pop_back" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_pop_back" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
   {
     try {
       (arg1)->pop_back();
@@ -46373,8 +47676,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
-  std::vector< SVertex * >::size_type arg2 ;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::size_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -46383,16 +47686,16 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_resize__SWIG_0(PyObject *SWIGUNUSE
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:SVerticesContainer_resize",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_resize" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_resize" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer_resize" "', argument " "2"" of type '" "std::vector< SVertex * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer_resize" "', argument " "2"" of type '" "std::vector<SVertex * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector< SVertex * >::size_type >(val2);
+  arg2 = static_cast< std::vector<SVertex * >::size_type >(val2);
   {
     try {
       (arg1)->resize(arg2);
@@ -46413,9 +47716,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
-  std::vector< SVertex * >::iterator arg2 ;
-  std::vector< SVertex * >::iterator result;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::iterator arg2 ;
+  std::vector<SVertex * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -46424,20 +47727,20 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_erase__SWIG_0(PyObject *SWIGUNUSED
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:SVerticesContainer_erase",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_erase" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_erase" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_erase" "', argument " "2"" of type '" "std::vector< SVertex * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_erase" "', argument " "2"" of type '" "std::vector<SVertex * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector< SVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< SVertex * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_erase" "', argument " "2"" of type '" "std::vector< SVertex * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_erase" "', argument " "2"" of type '" "std::vector<SVertex * >::iterator""'");
     }
   }
   {
@@ -46451,7 +47754,7 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_erase__SWIG_0(PyObject *SWIGUNUSED
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< SVertex * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<SVertex * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -46461,10 +47764,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
-  std::vector< SVertex * >::iterator arg2 ;
-  std::vector< SVertex * >::iterator arg3 ;
-  std::vector< SVertex * >::iterator result;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::iterator arg2 ;
+  std::vector<SVertex * >::iterator arg3 ;
+  std::vector<SVertex * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -46476,31 +47779,31 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_erase__SWIG_1(PyObject *SWIGUNUSED
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:SVerticesContainer_erase",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_erase" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_erase" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_erase" "', argument " "2"" of type '" "std::vector< SVertex * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_erase" "', argument " "2"" of type '" "std::vector<SVertex * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector< SVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< SVertex * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_erase" "', argument " "2"" of type '" "std::vector< SVertex * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_erase" "', argument " "2"" of type '" "std::vector<SVertex * >::iterator""'");
     }
   }
   res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res3) || !iter3) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_erase" "', argument " "3"" of type '" "std::vector< SVertex * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_erase" "', argument " "3"" of type '" "std::vector<SVertex * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector< SVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< SVertex * >::iterator > *>(iter3);
+    swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *>(iter3);
     if (iter_t) {
       arg3 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_erase" "', argument " "3"" of type '" "std::vector< SVertex * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_erase" "', argument " "3"" of type '" "std::vector<SVertex * >::iterator""'");
     }
   }
   {
@@ -46514,7 +47817,7 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_erase__SWIG_1(PyObject *SWIGUNUSED
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< SVertex * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<SVertex * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -46528,18 +47831,18 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_erase(PyObject *self, PyObject *ar
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator< SVertex * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< SVertex * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *>(iter) != 0));
       if (_v) {
         return _wrap_SVerticesContainer_erase__SWIG_0(self, args);
       }
@@ -46547,16 +47850,16 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_erase(PyObject *self, PyObject *ar
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator< SVertex * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< SVertex * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *>(iter) != 0));
       if (_v) {
         swig::PySwigIterator *iter = 0;
         int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< SVertex * >::iterator > *>(iter) != 0));
+        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *>(iter) != 0));
         if (_v) {
           return _wrap_SVerticesContainer_erase__SWIG_1(self, args);
         }
@@ -46565,19 +47868,16 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_erase(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SVerticesContainer_erase'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    erase(std::vector< SVertex * > *,std::vector< SVertex * >::iterator)\n"
-    "    erase(std::vector< SVertex * > *,std::vector< SVertex * >::iterator,std::vector< SVertex * >::iterator)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SVerticesContainer_erase'.\n  Possible C/C++ prototypes are:\n    erase(std::vector<SVertex * >::iterator)\n    erase(std::vector<SVertex * >::iterator,std::vector<SVertex * >::iterator)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_new_SVerticesContainer__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< SVertex * >::size_type arg1 ;
-  std::vector< SVertex * >::value_type arg2 = (std::vector< SVertex * >::value_type) 0 ;
-  std::vector< SVertex * > *result = 0 ;
+  std::vector<SVertex * >::size_type arg1 ;
+  std::vector<SVertex * >::value_type arg2 = (std::vector<SVertex * >::value_type) 0 ;
+  std::vector<SVertex * > *result = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   void *argp2 = 0 ;
@@ -46588,17 +47888,17 @@ SWIGINTERN PyObject *_wrap_new_SVerticesContainer__SWIG_3(PyObject *SWIGUNUSEDPA
   if (!PyArg_ParseTuple(args,(char *)"OO:new_SVerticesContainer",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_SVerticesContainer" "', argument " "1"" of type '" "std::vector< SVertex * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_SVerticesContainer" "', argument " "1"" of type '" "std::vector<SVertex * >::size_type""'");
   } 
-  arg1 = static_cast< std::vector< SVertex * >::size_type >(val1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0 |  0 );
+  arg1 = static_cast< std::vector<SVertex * >::size_type >(val1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_SVerticesContainer" "', argument " "2"" of type '" "std::vector< SVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_SVerticesContainer" "', argument " "2"" of type '" "std::vector<SVertex * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector< SVertex * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector<SVertex * >::value_type >(argp2);
   {
     try {
-      result = (std::vector< SVertex * > *)new std::vector< SVertex * >(arg1,arg2);
+      result = (std::vector<SVertex * > *)new std::vector<SVertex * >(arg1,arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -46607,7 +47907,7 @@ SWIGINTERN PyObject *_wrap_new_SVerticesContainer__SWIG_3(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -46620,7 +47920,7 @@ SWIGINTERN PyObject *_wrap_new_SVerticesContainer(PyObject *self, PyObject *args
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -46639,7 +47939,7 @@ SWIGINTERN PyObject *_wrap_new_SVerticesContainer(PyObject *self, PyObject *args
   }
   if (argc == 1) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator< SVertex * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_new_SVerticesContainer__SWIG_1(self, args);
@@ -46653,7 +47953,7 @@ SWIGINTERN PyObject *_wrap_new_SVerticesContainer(PyObject *self, PyObject *args
     }
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_new_SVerticesContainer__SWIG_3(self, args);
@@ -46662,20 +47962,15 @@ SWIGINTERN PyObject *_wrap_new_SVerticesContainer(PyObject *self, PyObject *args
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_SVerticesContainer'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    std::vector< SVertex * >()\n"
-    "    std::vector< SVertex * >(std::vector< SVertex * > const &)\n"
-    "    std::vector< SVertex * >(std::vector< SVertex * >::size_type)\n"
-    "    std::vector< SVertex * >(std::vector< SVertex * >::size_type,std::vector< SVertex * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_SVerticesContainer'.\n  Possible C/C++ prototypes are:\n    std::vector<(p.SVertex)>()\n    std::vector<(p.SVertex)>(std::vector<SVertex * > const &)\n    std::vector<(p.SVertex)>(std::vector<SVertex * >::size_type)\n    std::vector<(p.SVertex)>(std::vector<SVertex * >::size_type,std::vector<SVertex * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_push_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
-  std::vector< SVertex * >::value_type arg2 = (std::vector< SVertex * >::value_type) 0 ;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::value_type arg2 = (std::vector<SVertex * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -46684,16 +47979,16 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_push_back(PyObject *SWIGUNUSEDPARM
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:SVerticesContainer_push_back",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_push_back" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_push_back" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0 |  0 );
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVerticesContainer_push_back" "', argument " "2"" of type '" "std::vector< SVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVerticesContainer_push_back" "', argument " "2"" of type '" "std::vector<SVertex * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector< SVertex * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector<SVertex * >::value_type >(argp2);
   {
     try {
       (arg1)->push_back(arg2);
@@ -46714,21 +48009,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_front(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
-  std::vector< SVertex * >::value_type result;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_front",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_front" "', argument " "1"" of type '" "std::vector< SVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_front" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
   {
     try {
-      result = (std::vector< SVertex * >::value_type)((std::vector< SVertex * > const *)arg1)->front();
+      result = (std::vector<SVertex * >::value_type)((std::vector<SVertex * > const *)arg1)->front();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -46737,7 +48032,7 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_front(PyObject *SWIGUNUSEDPARM(sel
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -46746,21 +48041,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
-  std::vector< SVertex * >::value_type result;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_back" "', argument " "1"" of type '" "std::vector< SVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_back" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
   {
     try {
-      result = (std::vector< SVertex * >::value_type)((std::vector< SVertex * > const *)arg1)->back();
+      result = (std::vector<SVertex * >::value_type)((std::vector<SVertex * > const *)arg1)->back();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -46769,7 +48064,7 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_back(PyObject *SWIGUNUSEDPARM(self
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -46778,9 +48073,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_assign(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
-  std::vector< SVertex * >::size_type arg2 ;
-  std::vector< SVertex * >::value_type arg3 = (std::vector< SVertex * >::value_type) 0 ;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::size_type arg2 ;
+  std::vector<SVertex * >::value_type arg3 = (std::vector<SVertex * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -46792,21 +48087,21 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_assign(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:SVerticesContainer_assign",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_assign" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_assign" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer_assign" "', argument " "2"" of type '" "std::vector< SVertex * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer_assign" "', argument " "2"" of type '" "std::vector<SVertex * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector< SVertex * >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector<SVertex * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SVerticesContainer_assign" "', argument " "3"" of type '" "std::vector< SVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SVerticesContainer_assign" "', argument " "3"" of type '" "std::vector<SVertex * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector< SVertex * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector<SVertex * >::value_type >(argp3);
   {
     try {
       (arg1)->assign(arg2,arg3);
@@ -46827,9 +48122,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
-  std::vector< SVertex * >::size_type arg2 ;
-  std::vector< SVertex * >::value_type arg3 = (std::vector< SVertex * >::value_type) 0 ;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::size_type arg2 ;
+  std::vector<SVertex * >::value_type arg3 = (std::vector<SVertex * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -46841,21 +48136,21 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_resize__SWIG_1(PyObject *SWIGUNUSE
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:SVerticesContainer_resize",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_resize" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_resize" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer_resize" "', argument " "2"" of type '" "std::vector< SVertex * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer_resize" "', argument " "2"" of type '" "std::vector<SVertex * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector< SVertex * >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector<SVertex * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SVerticesContainer_resize" "', argument " "3"" of type '" "std::vector< SVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SVerticesContainer_resize" "', argument " "3"" of type '" "std::vector<SVertex * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector< SVertex * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector<SVertex * >::value_type >(argp3);
   {
     try {
       (arg1)->resize(arg2,arg3);
@@ -46880,13 +48175,13 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_resize(PyObject *self, PyObject *a
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator< SVertex * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -46900,7 +48195,7 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_resize(PyObject *self, PyObject *a
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator< SVertex * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -46909,7 +48204,7 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_resize(PyObject *self, PyObject *a
       }
       if (_v) {
         void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0);
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           return _wrap_SVerticesContainer_resize__SWIG_1(self, args);
@@ -46919,20 +48214,17 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_resize(PyObject *self, PyObject *a
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SVerticesContainer_resize'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    resize(std::vector< SVertex * > *,std::vector< SVertex * >::size_type)\n"
-    "    resize(std::vector< SVertex * > *,std::vector< SVertex * >::size_type,std::vector< SVertex * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SVerticesContainer_resize'.\n  Possible C/C++ prototypes are:\n    resize(std::vector<SVertex * >::size_type)\n    resize(std::vector<SVertex * >::size_type,std::vector<SVertex * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
-  std::vector< SVertex * >::iterator arg2 ;
-  std::vector< SVertex * >::value_type arg3 = (std::vector< SVertex * >::value_type) 0 ;
-  std::vector< SVertex * >::iterator result;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::iterator arg2 ;
+  std::vector<SVertex * >::value_type arg3 = (std::vector<SVertex * >::value_type) 0 ;
+  std::vector<SVertex * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -46944,27 +48236,27 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_insert__SWIG_0(PyObject *SWIGUNUSE
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:SVerticesContainer_insert",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_insert" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_insert" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_insert" "', argument " "2"" of type '" "std::vector< SVertex * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_insert" "', argument " "2"" of type '" "std::vector<SVertex * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector< SVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< SVertex * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_insert" "', argument " "2"" of type '" "std::vector< SVertex * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_insert" "', argument " "2"" of type '" "std::vector<SVertex * >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0 |  0 );
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SVerticesContainer_insert" "', argument " "3"" of type '" "std::vector< SVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SVerticesContainer_insert" "', argument " "3"" of type '" "std::vector<SVertex * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector< SVertex * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector<SVertex * >::value_type >(argp3);
   {
     try {
       result = (arg1)->insert(arg2,arg3);
@@ -46976,7 +48268,7 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_insert__SWIG_0(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< SVertex * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<SVertex * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -46986,10 +48278,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
-  std::vector< SVertex * >::iterator arg2 ;
-  std::vector< SVertex * >::size_type arg3 ;
-  std::vector< SVertex * >::value_type arg4 = (std::vector< SVertex * >::value_type) 0 ;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::iterator arg2 ;
+  std::vector<SVertex * >::size_type arg3 ;
+  std::vector<SVertex * >::value_type arg4 = (std::vector<SVertex * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -47004,32 +48296,32 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_insert__SWIG_1(PyObject *SWIGUNUSE
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:SVerticesContainer_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_insert" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_insert" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_insert" "', argument " "2"" of type '" "std::vector< SVertex * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_insert" "', argument " "2"" of type '" "std::vector<SVertex * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector< SVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< SVertex * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_insert" "', argument " "2"" of type '" "std::vector< SVertex * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_insert" "', argument " "2"" of type '" "std::vector<SVertex * >::iterator""'");
     }
   }
   ecode3 = SWIG_AsVal_size_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SVerticesContainer_insert" "', argument " "3"" of type '" "std::vector< SVertex * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SVerticesContainer_insert" "', argument " "3"" of type '" "std::vector<SVertex * >::size_type""'");
   } 
-  arg3 = static_cast< std::vector< SVertex * >::size_type >(val3);
-  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0 |  0 );
+  arg3 = static_cast< std::vector<SVertex * >::size_type >(val3);
+  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "SVerticesContainer_insert" "', argument " "4"" of type '" "std::vector< SVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "SVerticesContainer_insert" "', argument " "4"" of type '" "std::vector<SVertex * >::value_type""'"); 
   }
-  arg4 = reinterpret_cast< std::vector< SVertex * >::value_type >(argp4);
+  arg4 = reinterpret_cast< std::vector<SVertex * >::value_type >(argp4);
   {
     try {
       (arg1)->insert(arg2,arg3,arg4);
@@ -47054,21 +48346,21 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_insert(PyObject *self, PyObject *a
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator< SVertex * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< SVertex * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *>(iter) != 0));
       if (_v) {
         void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0);
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           return _wrap_SVerticesContainer_insert__SWIG_0(self, args);
@@ -47078,12 +48370,12 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_insert(PyObject *self, PyObject *a
   }
   if (argc == 4) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator< SVertex * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< SVertex * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *>(iter) != 0));
       if (_v) {
         {
           int res = SWIG_AsVal_size_t(argv[2], NULL);
@@ -47091,7 +48383,7 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_insert(PyObject *self, PyObject *a
         }
         if (_v) {
           void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0);
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0);
           _v = SWIG_CheckState(res);
           if (_v) {
             return _wrap_SVerticesContainer_insert__SWIG_1(self, args);
@@ -47102,18 +48394,15 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_insert(PyObject *self, PyObject *a
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SVerticesContainer_insert'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    insert(std::vector< SVertex * > *,std::vector< SVertex * >::iterator,std::vector< SVertex * >::value_type)\n"
-    "    insert(std::vector< SVertex * > *,std::vector< SVertex * >::iterator,std::vector< SVertex * >::size_type,std::vector< SVertex * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SVerticesContainer_insert'.\n  Possible C/C++ prototypes are:\n    insert(std::vector<SVertex * >::iterator,std::vector<SVertex * >::value_type)\n    insert(std::vector<SVertex * >::iterator,std::vector<SVertex * >::size_type,std::vector<SVertex * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_reserve(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
-  std::vector< SVertex * >::size_type arg2 ;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::size_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -47122,16 +48411,16 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_reserve(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:SVerticesContainer_reserve",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_reserve" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_reserve" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer_reserve" "', argument " "2"" of type '" "std::vector< SVertex * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer_reserve" "', argument " "2"" of type '" "std::vector<SVertex * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector< SVertex * >::size_type >(val2);
+  arg2 = static_cast< std::vector<SVertex * >::size_type >(val2);
   {
     try {
       (arg1)->reserve(arg2);
@@ -47152,21 +48441,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_capacity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
-  std::vector< SVertex * >::size_type result;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector<SVertex * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_capacity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_capacity" "', argument " "1"" of type '" "std::vector< SVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_capacity" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
   {
     try {
-      result = ((std::vector< SVertex * > const *)arg1)->capacity();
+      result = ((std::vector<SVertex * > const *)arg1)->capacity();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -47184,17 +48473,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_SVerticesContainer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_SVerticesContainer",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_SVerticesContainer" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_SVerticesContainer" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
   {
     try {
       delete arg1;
@@ -47216,8 +48505,8 @@ fail:
 
 SWIGINTERN PyObject *SVerticesContainer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
@@ -47478,7 +48767,7 @@ SWIGINTERN PyObject *_wrap_ViewMap_ViewShapes(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -47513,7 +48802,7 @@ SWIGINTERN PyObject *_wrap_ViewMap_ViewEdges(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -47548,7 +48837,7 @@ SWIGINTERN PyObject *_wrap_ViewMap_ViewVertices(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -47583,7 +48872,7 @@ SWIGINTERN PyObject *_wrap_ViewMap_FEdges(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -47618,7 +48907,7 @@ SWIGINTERN PyObject *_wrap_ViewMap_SVertices(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -47792,7 +49081,7 @@ SWIGINTERN PyObject *_wrap_ViewMap_shapeIdToIndexMap(PyObject *SWIGUNUSEDPARM(se
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__mapT_int_int_std__lessT_int_t_std__allocatorT_std__pairT_int_const_int_t_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__mapTint_int_std__lessTint_t_std__allocatorTstd__pairTint_const_int_t_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -47802,7 +49091,7 @@ fail:
 SWIGINTERN PyObject *_wrap_ViewMap_getScene3dBBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewMap *arg1 = (ViewMap *) 0 ;
-  SwigValueWrapper< BBox< VecMat::Vec3< double > > > result;
+  SwigValueWrapper<BBox<VecMat::Vec3<double > > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -47824,7 +49113,7 @@ SWIGINTERN PyObject *_wrap_ViewMap_getScene3dBBox(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new BBox< Geometry::Vec3r >(static_cast< const BBox< Geometry::Vec3r >& >(result))), SWIGTYPE_p_BBoxT_VecMat__Vec3T_double_t_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new BBox<Geometry::Vec3r >(static_cast< const BBox<Geometry::Vec3r >& >(result))), SWIGTYPE_p_BBoxTVecMat__Vec3Tdouble_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -48034,7 +49323,7 @@ fail:
 SWIGINTERN PyObject *_wrap_ViewMap_setScene3dBBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewMap *arg1 = (ViewMap *) 0 ;
-  BBox< Geometry::Vec3r > *arg2 = 0 ;
+  BBox<Geometry::Vec3r > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -48048,17 +49337,17 @@ SWIGINTERN PyObject *_wrap_ViewMap_setScene3dBBox(PyObject *SWIGUNUSEDPARM(self)
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewMap_setScene3dBBox" "', argument " "1"" of type '" "ViewMap *""'"); 
   }
   arg1 = reinterpret_cast< ViewMap * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BBoxT_VecMat__Vec3T_double_t_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BBoxTVecMat__Vec3Tdouble_t_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewMap_setScene3dBBox" "', argument " "2"" of type '" "BBox< Geometry::Vec3r > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewMap_setScene3dBBox" "', argument " "2"" of type '" "BBox<Geometry::Vec3r > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewMap_setScene3dBBox" "', argument " "2"" of type '" "BBox< Geometry::Vec3r > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewMap_setScene3dBBox" "', argument " "2"" of type '" "BBox<Geometry::Vec3r > const &""'"); 
   }
-  arg2 = reinterpret_cast< BBox< Geometry::Vec3r > * >(argp2);
+  arg2 = reinterpret_cast< BBox<Geometry::Vec3r > * >(argp2);
   {
     try {
-      (arg1)->setScene3dBBox((BBox< Geometry::Vec3r > const &)*arg2);
+      (arg1)->setScene3dBBox((BBox<Geometry::Vec3r > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -48116,7 +49405,7 @@ SWIGINTERN PyObject *_wrap_ViewMap_CreateTVertex(PyObject *SWIGUNUSEDPARM(self),
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewMap_CreateTVertex" "', argument " "1"" of type '" "ViewMap *""'"); 
   }
   arg1 = reinterpret_cast< ViewMap * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewMap_CreateTVertex" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -48124,7 +49413,7 @@ SWIGINTERN PyObject *_wrap_ViewMap_CreateTVertex(PyObject *SWIGUNUSEDPARM(self),
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewMap_CreateTVertex" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
   arg2 = reinterpret_cast< Geometry::Vec3r * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewMap_CreateTVertex" "', argument " "3"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -48137,7 +49426,7 @@ SWIGINTERN PyObject *_wrap_ViewMap_CreateTVertex(PyObject *SWIGUNUSEDPARM(self),
     SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewMap_CreateTVertex" "', argument " "4"" of type '" "FEdge *""'"); 
   }
   arg4 = reinterpret_cast< FEdge * >(argp4);
-  res5 = SWIG_ConvertPtr(obj4, &argp5, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
+  res5 = SWIG_ConvertPtr(obj4, &argp5, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
   if (!SWIG_IsOK(res5)) {
     SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "ViewMap_CreateTVertex" "', argument " "5"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -48145,7 +49434,7 @@ SWIGINTERN PyObject *_wrap_ViewMap_CreateTVertex(PyObject *SWIGUNUSEDPARM(self),
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewMap_CreateTVertex" "', argument " "5"" of type '" "Geometry::Vec3r const &""'"); 
   }
   arg5 = reinterpret_cast< Geometry::Vec3r * >(argp5);
-  res6 = SWIG_ConvertPtr(obj5, &argp6, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
+  res6 = SWIG_ConvertPtr(obj5, &argp6, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
   if (!SWIG_IsOK(res6)) {
     SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "ViewMap_CreateTVertex" "', argument " "6"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -48188,7 +49477,7 @@ SWIGINTERN PyObject *_wrap_ViewMap_InsertViewVertex(PyObject *SWIGUNUSEDPARM(sel
   PyObject *resultobj = 0;
   ViewMap *arg1 = (ViewMap *) 0 ;
   SVertex *arg2 = (SVertex *) 0 ;
-  std::vector< ViewEdge * > *arg3 = 0 ;
+  std::vector<ViewEdge * > *arg3 = 0 ;
   ViewVertex *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -48211,14 +49500,14 @@ SWIGINTERN PyObject *_wrap_ViewMap_InsertViewVertex(PyObject *SWIGUNUSEDPARM(sel
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewMap_InsertViewVertex" "', argument " "2"" of type '" "SVertex *""'"); 
   }
   arg2 = reinterpret_cast< SVertex * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t,  0 );
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t,  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewMap_InsertViewVertex" "', argument " "3"" of type '" "std::vector< ViewEdge * > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewMap_InsertViewVertex" "', argument " "3"" of type '" "std::vector<ViewEdge * > &""'"); 
   }
   if (!argp3) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewMap_InsertViewVertex" "', argument " "3"" of type '" "std::vector< ViewEdge * > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewMap_InsertViewVertex" "', argument " "3"" of type '" "std::vector<ViewEdge * > &""'"); 
   }
-  arg3 = reinterpret_cast< std::vector< ViewEdge * > * >(argp3);
+  arg3 = reinterpret_cast< std::vector<ViewEdge * > * >(argp3);
   {
     try {
       result = (ViewVertex *)(arg1)->InsertViewVertex(arg2,*arg3);
@@ -48239,7 +49528,7 @@ fail:
 
 SWIGINTERN PyObject *ViewMap_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ViewMap, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -48483,7 +49772,7 @@ fail:
 SWIGINTERN PyObject *_wrap_ViewVertex_edges_begin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewVertex *arg1 = (ViewVertex *) 0 ;
-  SwigValueWrapper< ViewVertexInternal::edge_iterator_base< ViewVertexInternal::edge_nonconst_traits > > result;
+  SwigValueWrapper<ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_nonconst_traits > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -48505,7 +49794,7 @@ SWIGINTERN PyObject *_wrap_ViewVertex_edges_begin__SWIG_0(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new ViewVertex::edge_iterator(static_cast< const ViewVertex::edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_nonconst_traits_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new ViewVertex::edge_iterator(static_cast< const ViewVertex::edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -48515,7 +49804,7 @@ fail:
 SWIGINTERN PyObject *_wrap_ViewVertex_edges_begin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewVertex *arg1 = (ViewVertex *) 0 ;
-  SwigValueWrapper< ViewVertexInternal::edge_iterator_base< ViewVertexInternal::edge_const_traits > > result;
+  SwigValueWrapper<ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_const_traits > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -48537,7 +49826,7 @@ SWIGINTERN PyObject *_wrap_ViewVertex_edges_begin__SWIG_1(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new ViewVertex::const_edge_iterator(static_cast< const ViewVertex::const_edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_const_traits_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new ViewVertex::const_edge_iterator(static_cast< const ViewVertex::const_edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -48550,7 +49839,7 @@ SWIGINTERN PyObject *_wrap_ViewVertex_edges_begin(PyObject *self, PyObject *args
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -48574,10 +49863,7 @@ SWIGINTERN PyObject *_wrap_ViewVertex_edges_begin(PyObject *self, PyObject *args
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVertex_edges_begin'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    edges_begin(ViewVertex *)\n"
-    "    edges_begin(ViewVertex const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVertex_edges_begin'.\n  Possible C/C++ prototypes are:\n    edges_begin()\n    edges_begin()\n");
   return NULL;
 }
 
@@ -48585,7 +49871,7 @@ fail:
 SWIGINTERN PyObject *_wrap_ViewVertex_edges_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewVertex *arg1 = (ViewVertex *) 0 ;
-  SwigValueWrapper< ViewVertexInternal::edge_iterator_base< ViewVertexInternal::edge_nonconst_traits > > result;
+  SwigValueWrapper<ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_nonconst_traits > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -48607,7 +49893,7 @@ SWIGINTERN PyObject *_wrap_ViewVertex_edges_end__SWIG_0(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new ViewVertex::edge_iterator(static_cast< const ViewVertex::edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_nonconst_traits_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new ViewVertex::edge_iterator(static_cast< const ViewVertex::edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -48617,7 +49903,7 @@ fail:
 SWIGINTERN PyObject *_wrap_ViewVertex_edges_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewVertex *arg1 = (ViewVertex *) 0 ;
-  SwigValueWrapper< ViewVertexInternal::edge_iterator_base< ViewVertexInternal::edge_const_traits > > result;
+  SwigValueWrapper<ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_const_traits > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -48639,7 +49925,7 @@ SWIGINTERN PyObject *_wrap_ViewVertex_edges_end__SWIG_1(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new ViewVertex::const_edge_iterator(static_cast< const ViewVertex::const_edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_const_traits_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new ViewVertex::const_edge_iterator(static_cast< const ViewVertex::const_edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -48652,7 +49938,7 @@ SWIGINTERN PyObject *_wrap_ViewVertex_edges_end(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -48676,10 +49962,7 @@ SWIGINTERN PyObject *_wrap_ViewVertex_edges_end(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVertex_edges_end'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    edges_end(ViewVertex *)\n"
-    "    edges_end(ViewVertex const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVertex_edges_end'.\n  Possible C/C++ prototypes are:\n    edges_end()\n    edges_end()\n");
   return NULL;
 }
 
@@ -48688,7 +49971,7 @@ SWIGINTERN PyObject *_wrap_ViewVertex_edges_iterator__SWIG_0(PyObject *SWIGUNUSE
   PyObject *resultobj = 0;
   ViewVertex *arg1 = (ViewVertex *) 0 ;
   ViewEdge *arg2 = (ViewEdge *) 0 ;
-  SwigValueWrapper< ViewVertexInternal::edge_iterator_base< ViewVertexInternal::edge_nonconst_traits > > result;
+  SwigValueWrapper<ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_nonconst_traits > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -48718,7 +50001,7 @@ SWIGINTERN PyObject *_wrap_ViewVertex_edges_iterator__SWIG_0(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new ViewVertex::edge_iterator(static_cast< const ViewVertex::edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_nonconst_traits_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new ViewVertex::edge_iterator(static_cast< const ViewVertex::edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -48729,7 +50012,7 @@ SWIGINTERN PyObject *_wrap_ViewVertex_edges_iterator__SWIG_1(PyObject *SWIGUNUSE
   PyObject *resultobj = 0;
   ViewVertex *arg1 = (ViewVertex *) 0 ;
   ViewEdge *arg2 = (ViewEdge *) 0 ;
-  SwigValueWrapper< ViewVertexInternal::edge_iterator_base< ViewVertexInternal::edge_const_traits > > result;
+  SwigValueWrapper<ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_const_traits > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -48759,7 +50042,7 @@ SWIGINTERN PyObject *_wrap_ViewVertex_edges_iterator__SWIG_1(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new ViewVertex::const_edge_iterator(static_cast< const ViewVertex::const_edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_const_traits_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new ViewVertex::const_edge_iterator(static_cast< const ViewVertex::const_edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -48772,7 +50055,7 @@ SWIGINTERN PyObject *_wrap_ViewVertex_edges_iterator(PyObject *self, PyObject *a
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -48806,10 +50089,7 @@ SWIGINTERN PyObject *_wrap_ViewVertex_edges_iterator(PyObject *self, PyObject *a
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVertex_edges_iterator'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    edges_iterator(ViewVertex *,ViewEdge *)\n"
-    "    edges_iterator(ViewVertex const *,ViewEdge *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVertex_edges_iterator'.\n  Possible C/C++ prototypes are:\n    edges_iterator(ViewEdge *)\n    edges_iterator(ViewEdge *)\n");
   return NULL;
 }
 
@@ -48921,7 +50201,7 @@ fail:
 
 SWIGINTERN PyObject *ViewVertex_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ViewVertex, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -49079,7 +50359,7 @@ SWIGINTERN PyObject *_wrap_TVertex_getPoint3D(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -49207,7 +50487,7 @@ SWIGINTERN PyObject *_wrap_TVertex_getPoint2D(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -49380,7 +50660,7 @@ SWIGINTERN PyObject *_wrap_new_TVertex(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -49403,10 +50683,7 @@ SWIGINTERN PyObject *_wrap_new_TVertex(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_TVertex'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    TVertex()\n"
-    "    TVertex(SVertex *,SVertex *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_TVertex'.\n  Possible C/C++ prototypes are:\n    TVertex()\n    TVertex(SVertex *,SVertex *)\n");
   return NULL;
 }
 
@@ -49503,7 +50780,7 @@ SWIGINTERN PyObject *_wrap_TVertex_frontEdgeA(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairT_ViewEdge_p_bool_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairTViewEdge_p_bool_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -49538,7 +50815,7 @@ SWIGINTERN PyObject *_wrap_TVertex_frontEdgeB(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairT_ViewEdge_p_bool_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairTViewEdge_p_bool_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -49573,7 +50850,7 @@ SWIGINTERN PyObject *_wrap_TVertex_backEdgeA(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairT_ViewEdge_p_bool_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairTViewEdge_p_bool_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -49608,14 +50885,14 @@ SWIGINTERN PyObject *_wrap_TVertex_backEdgeB(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairT_ViewEdge_p_bool_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairTViewEdge_p_bool_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_SetFrontVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_TVertex_setFrontVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   TVertex *arg1 = (TVertex *) 0 ;
   SVertex *arg2 = (SVertex *) 0 ;
@@ -49626,20 +50903,20 @@ SWIGINTERN PyObject *_wrap_TVertex_SetFrontVertex(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:TVertex_SetFrontVertex",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:TVertex_setFrontVertex",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_SetFrontVertex" "', argument " "1"" of type '" "TVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_setFrontVertex" "', argument " "1"" of type '" "TVertex *""'"); 
   }
   arg1 = reinterpret_cast< TVertex * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SVertex, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TVertex_SetFrontVertex" "', argument " "2"" of type '" "SVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TVertex_setFrontVertex" "', argument " "2"" of type '" "SVertex *""'"); 
   }
   arg2 = reinterpret_cast< SVertex * >(argp2);
   {
     try {
-      (arg1)->SetFrontVertex(arg2);
+      (arg1)->setFrontVertex(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -49655,7 +50932,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_SetBackSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_TVertex_setBackSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   TVertex *arg1 = (TVertex *) 0 ;
   SVertex *arg2 = (SVertex *) 0 ;
@@ -49666,20 +50943,20 @@ SWIGINTERN PyObject *_wrap_TVertex_SetBackSVertex(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:TVertex_SetBackSVertex",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:TVertex_setBackSVertex",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_SetBackSVertex" "', argument " "1"" of type '" "TVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_setBackSVertex" "', argument " "1"" of type '" "TVertex *""'"); 
   }
   arg1 = reinterpret_cast< TVertex * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SVertex, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TVertex_SetBackSVertex" "', argument " "2"" of type '" "SVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TVertex_setBackSVertex" "', argument " "2"" of type '" "SVertex *""'"); 
   }
   arg2 = reinterpret_cast< SVertex * >(argp2);
   {
     try {
-      (arg1)->SetBackSVertex(arg2);
+      (arg1)->setBackSVertex(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -49695,7 +50972,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_SetFrontEdgeA__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_TVertex_setFrontEdgeA__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   TVertex *arg1 = (TVertex *) 0 ;
   ViewEdge *arg2 = (ViewEdge *) 0 ;
@@ -49710,25 +50987,25 @@ SWIGINTERN PyObject *_wrap_TVertex_SetFrontEdgeA__SWIG_0(PyObject *SWIGUNUSEDPAR
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:TVertex_SetFrontEdgeA",&obj0,&obj1,&obj2)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OOO:TVertex_setFrontEdgeA",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_SetFrontEdgeA" "', argument " "1"" of type '" "TVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_setFrontEdgeA" "', argument " "1"" of type '" "TVertex *""'"); 
   }
   arg1 = reinterpret_cast< TVertex * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewEdge, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TVertex_SetFrontEdgeA" "', argument " "2"" of type '" "ViewEdge *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TVertex_setFrontEdgeA" "', argument " "2"" of type '" "ViewEdge *""'"); 
   }
   arg2 = reinterpret_cast< ViewEdge * >(argp2);
   ecode3 = SWIG_AsVal_bool(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TVertex_SetFrontEdgeA" "', argument " "3"" of type '" "bool""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TVertex_setFrontEdgeA" "', argument " "3"" of type '" "bool""'");
   } 
   arg3 = static_cast< bool >(val3);
   {
     try {
-      (arg1)->SetFrontEdgeA(arg2,arg3);
+      (arg1)->setFrontEdgeA(arg2,arg3);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -49744,7 +51021,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_SetFrontEdgeA__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_TVertex_setFrontEdgeA__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   TVertex *arg1 = (TVertex *) 0 ;
   ViewEdge *arg2 = (ViewEdge *) 0 ;
@@ -49755,20 +51032,20 @@ SWIGINTERN PyObject *_wrap_TVertex_SetFrontEdgeA__SWIG_1(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:TVertex_SetFrontEdgeA",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:TVertex_setFrontEdgeA",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_SetFrontEdgeA" "', argument " "1"" of type '" "TVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_setFrontEdgeA" "', argument " "1"" of type '" "TVertex *""'"); 
   }
   arg1 = reinterpret_cast< TVertex * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewEdge, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TVertex_SetFrontEdgeA" "', argument " "2"" of type '" "ViewEdge *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TVertex_setFrontEdgeA" "', argument " "2"" of type '" "ViewEdge *""'"); 
   }
   arg2 = reinterpret_cast< ViewEdge * >(argp2);
   {
     try {
-      (arg1)->SetFrontEdgeA(arg2);
+      (arg1)->setFrontEdgeA(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -49784,13 +51061,13 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_SetFrontEdgeA(PyObject *self, PyObject *args) {
+SWIGINTERN PyObject *_wrap_TVertex_setFrontEdgeA(PyObject *self, PyObject *args) {
   int argc;
   PyObject *argv[4];
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -49804,7 +51081,7 @@ SWIGINTERN PyObject *_wrap_TVertex_SetFrontEdgeA(PyObject *self, PyObject *args)
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_ViewEdge, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_TVertex_SetFrontEdgeA__SWIG_1(self, args);
+        return _wrap_TVertex_setFrontEdgeA__SWIG_1(self, args);
       }
     }
   }
@@ -49823,22 +51100,19 @@ SWIGINTERN PyObject *_wrap_TVertex_SetFrontEdgeA(PyObject *self, PyObject *args)
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_TVertex_SetFrontEdgeA__SWIG_0(self, args);
+          return _wrap_TVertex_setFrontEdgeA__SWIG_0(self, args);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'TVertex_SetFrontEdgeA'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    SetFrontEdgeA(TVertex *,ViewEdge *,bool)\n"
-    "    SetFrontEdgeA(TVertex *,ViewEdge *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'TVertex_setFrontEdgeA'.\n  Possible C/C++ prototypes are:\n    setFrontEdgeA(ViewEdge *,bool)\n    setFrontEdgeA(ViewEdge *)\n");
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_SetFrontEdgeB__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_TVertex_setFrontEdgeB__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   TVertex *arg1 = (TVertex *) 0 ;
   ViewEdge *arg2 = (ViewEdge *) 0 ;
@@ -49853,25 +51127,25 @@ SWIGINTERN PyObject *_wrap_TVertex_SetFrontEdgeB__SWIG_0(PyObject *SWIGUNUSEDPAR
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:TVertex_SetFrontEdgeB",&obj0,&obj1,&obj2)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OOO:TVertex_setFrontEdgeB",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_SetFrontEdgeB" "', argument " "1"" of type '" "TVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_setFrontEdgeB" "', argument " "1"" of type '" "TVertex *""'"); 
   }
   arg1 = reinterpret_cast< TVertex * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewEdge, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TVertex_SetFrontEdgeB" "', argument " "2"" of type '" "ViewEdge *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TVertex_setFrontEdgeB" "', argument " "2"" of type '" "ViewEdge *""'"); 
   }
   arg2 = reinterpret_cast< ViewEdge * >(argp2);
   ecode3 = SWIG_AsVal_bool(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TVertex_SetFrontEdgeB" "', argument " "3"" of type '" "bool""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TVertex_setFrontEdgeB" "', argument " "3"" of type '" "bool""'");
   } 
   arg3 = static_cast< bool >(val3);
   {
     try {
-      (arg1)->SetFrontEdgeB(arg2,arg3);
+      (arg1)->setFrontEdgeB(arg2,arg3);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -49887,7 +51161,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_SetFrontEdgeB__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_TVertex_setFrontEdgeB__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   TVertex *arg1 = (TVertex *) 0 ;
   ViewEdge *arg2 = (ViewEdge *) 0 ;
@@ -49898,20 +51172,20 @@ SWIGINTERN PyObject *_wrap_TVertex_SetFrontEdgeB__SWIG_1(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:TVertex_SetFrontEdgeB",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:TVertex_setFrontEdgeB",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_SetFrontEdgeB" "', argument " "1"" of type '" "TVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_setFrontEdgeB" "', argument " "1"" of type '" "TVertex *""'"); 
   }
   arg1 = reinterpret_cast< TVertex * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewEdge, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TVertex_SetFrontEdgeB" "', argument " "2"" of type '" "ViewEdge *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TVertex_setFrontEdgeB" "', argument " "2"" of type '" "ViewEdge *""'"); 
   }
   arg2 = reinterpret_cast< ViewEdge * >(argp2);
   {
     try {
-      (arg1)->SetFrontEdgeB(arg2);
+      (arg1)->setFrontEdgeB(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -49927,13 +51201,13 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_SetFrontEdgeB(PyObject *self, PyObject *args) {
+SWIGINTERN PyObject *_wrap_TVertex_setFrontEdgeB(PyObject *self, PyObject *args) {
   int argc;
   PyObject *argv[4];
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -49947,7 +51221,7 @@ SWIGINTERN PyObject *_wrap_TVertex_SetFrontEdgeB(PyObject *self, PyObject *args)
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_ViewEdge, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_TVertex_SetFrontEdgeB__SWIG_1(self, args);
+        return _wrap_TVertex_setFrontEdgeB__SWIG_1(self, args);
       }
     }
   }
@@ -49966,22 +51240,19 @@ SWIGINTERN PyObject *_wrap_TVertex_SetFrontEdgeB(PyObject *self, PyObject *args)
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_TVertex_SetFrontEdgeB__SWIG_0(self, args);
+          return _wrap_TVertex_setFrontEdgeB__SWIG_0(self, args);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'TVertex_SetFrontEdgeB'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    SetFrontEdgeB(TVertex *,ViewEdge *,bool)\n"
-    "    SetFrontEdgeB(TVertex *,ViewEdge *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'TVertex_setFrontEdgeB'.\n  Possible C/C++ prototypes are:\n    setFrontEdgeB(ViewEdge *,bool)\n    setFrontEdgeB(ViewEdge *)\n");
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_SetBackEdgeA__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_TVertex_setBackEdgeA__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   TVertex *arg1 = (TVertex *) 0 ;
   ViewEdge *arg2 = (ViewEdge *) 0 ;
@@ -49996,25 +51267,25 @@ SWIGINTERN PyObject *_wrap_TVertex_SetBackEdgeA__SWIG_0(PyObject *SWIGUNUSEDPARM
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:TVertex_SetBackEdgeA",&obj0,&obj1,&obj2)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OOO:TVertex_setBackEdgeA",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_SetBackEdgeA" "', argument " "1"" of type '" "TVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_setBackEdgeA" "', argument " "1"" of type '" "TVertex *""'"); 
   }
   arg1 = reinterpret_cast< TVertex * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewEdge, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TVertex_SetBackEdgeA" "', argument " "2"" of type '" "ViewEdge *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TVertex_setBackEdgeA" "', argument " "2"" of type '" "ViewEdge *""'"); 
   }
   arg2 = reinterpret_cast< ViewEdge * >(argp2);
   ecode3 = SWIG_AsVal_bool(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TVertex_SetBackEdgeA" "', argument " "3"" of type '" "bool""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TVertex_setBackEdgeA" "', argument " "3"" of type '" "bool""'");
   } 
   arg3 = static_cast< bool >(val3);
   {
     try {
-      (arg1)->SetBackEdgeA(arg2,arg3);
+      (arg1)->setBackEdgeA(arg2,arg3);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -50030,7 +51301,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_SetBackEdgeA__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_TVertex_setBackEdgeA__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   TVertex *arg1 = (TVertex *) 0 ;
   ViewEdge *arg2 = (ViewEdge *) 0 ;
@@ -50041,20 +51312,20 @@ SWIGINTERN PyObject *_wrap_TVertex_SetBackEdgeA__SWIG_1(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:TVertex_SetBackEdgeA",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:TVertex_setBackEdgeA",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_SetBackEdgeA" "', argument " "1"" of type '" "TVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_setBackEdgeA" "', argument " "1"" of type '" "TVertex *""'"); 
   }
   arg1 = reinterpret_cast< TVertex * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewEdge, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TVertex_SetBackEdgeA" "', argument " "2"" of type '" "ViewEdge *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TVertex_setBackEdgeA" "', argument " "2"" of type '" "ViewEdge *""'"); 
   }
   arg2 = reinterpret_cast< ViewEdge * >(argp2);
   {
     try {
-      (arg1)->SetBackEdgeA(arg2);
+      (arg1)->setBackEdgeA(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -50070,13 +51341,13 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_SetBackEdgeA(PyObject *self, PyObject *args) {
+SWIGINTERN PyObject *_wrap_TVertex_setBackEdgeA(PyObject *self, PyObject *args) {
   int argc;
   PyObject *argv[4];
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -50090,7 +51361,7 @@ SWIGINTERN PyObject *_wrap_TVertex_SetBackEdgeA(PyObject *self, PyObject *args)
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_ViewEdge, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_TVertex_SetBackEdgeA__SWIG_1(self, args);
+        return _wrap_TVertex_setBackEdgeA__SWIG_1(self, args);
       }
     }
   }
@@ -50109,22 +51380,19 @@ SWIGINTERN PyObject *_wrap_TVertex_SetBackEdgeA(PyObject *self, PyObject *args)
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_TVertex_SetBackEdgeA__SWIG_0(self, args);
+          return _wrap_TVertex_setBackEdgeA__SWIG_0(self, args);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'TVertex_SetBackEdgeA'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    SetBackEdgeA(TVertex *,ViewEdge *,bool)\n"
-    "    SetBackEdgeA(TVertex *,ViewEdge *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'TVertex_setBackEdgeA'.\n  Possible C/C++ prototypes are:\n    setBackEdgeA(ViewEdge *,bool)\n    setBackEdgeA(ViewEdge *)\n");
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_SetBackEdgeB__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_TVertex_setBackEdgeB__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   TVertex *arg1 = (TVertex *) 0 ;
   ViewEdge *arg2 = (ViewEdge *) 0 ;
@@ -50139,25 +51407,25 @@ SWIGINTERN PyObject *_wrap_TVertex_SetBackEdgeB__SWIG_0(PyObject *SWIGUNUSEDPARM
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:TVertex_SetBackEdgeB",&obj0,&obj1,&obj2)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OOO:TVertex_setBackEdgeB",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_SetBackEdgeB" "', argument " "1"" of type '" "TVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_setBackEdgeB" "', argument " "1"" of type '" "TVertex *""'"); 
   }
   arg1 = reinterpret_cast< TVertex * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewEdge, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TVertex_SetBackEdgeB" "', argument " "2"" of type '" "ViewEdge *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TVertex_setBackEdgeB" "', argument " "2"" of type '" "ViewEdge *""'"); 
   }
   arg2 = reinterpret_cast< ViewEdge * >(argp2);
   ecode3 = SWIG_AsVal_bool(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TVertex_SetBackEdgeB" "', argument " "3"" of type '" "bool""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "TVertex_setBackEdgeB" "', argument " "3"" of type '" "bool""'");
   } 
   arg3 = static_cast< bool >(val3);
   {
     try {
-      (arg1)->SetBackEdgeB(arg2,arg3);
+      (arg1)->setBackEdgeB(arg2,arg3);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -50173,7 +51441,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_SetBackEdgeB__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_TVertex_setBackEdgeB__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   TVertex *arg1 = (TVertex *) 0 ;
   ViewEdge *arg2 = (ViewEdge *) 0 ;
@@ -50184,20 +51452,20 @@ SWIGINTERN PyObject *_wrap_TVertex_SetBackEdgeB__SWIG_1(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:TVertex_SetBackEdgeB",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:TVertex_setBackEdgeB",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_SetBackEdgeB" "', argument " "1"" of type '" "TVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_setBackEdgeB" "', argument " "1"" of type '" "TVertex *""'"); 
   }
   arg1 = reinterpret_cast< TVertex * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewEdge, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TVertex_SetBackEdgeB" "', argument " "2"" of type '" "ViewEdge *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TVertex_setBackEdgeB" "', argument " "2"" of type '" "ViewEdge *""'"); 
   }
   arg2 = reinterpret_cast< ViewEdge * >(argp2);
   {
     try {
-      (arg1)->SetBackEdgeB(arg2);
+      (arg1)->setBackEdgeB(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -50213,13 +51481,13 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_SetBackEdgeB(PyObject *self, PyObject *args) {
+SWIGINTERN PyObject *_wrap_TVertex_setBackEdgeB(PyObject *self, PyObject *args) {
   int argc;
   PyObject *argv[4];
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -50233,7 +51501,7 @@ SWIGINTERN PyObject *_wrap_TVertex_SetBackEdgeB(PyObject *self, PyObject *args)
       int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_ViewEdge, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_TVertex_SetBackEdgeB__SWIG_1(self, args);
+        return _wrap_TVertex_setBackEdgeB__SWIG_1(self, args);
       }
     }
   }
@@ -50252,22 +51520,19 @@ SWIGINTERN PyObject *_wrap_TVertex_SetBackEdgeB(PyObject *self, PyObject *args)
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_TVertex_SetBackEdgeB__SWIG_0(self, args);
+          return _wrap_TVertex_setBackEdgeB__SWIG_0(self, args);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'TVertex_SetBackEdgeB'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    SetBackEdgeB(TVertex *,ViewEdge *,bool)\n"
-    "    SetBackEdgeB(TVertex *,ViewEdge *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'TVertex_setBackEdgeB'.\n  Possible C/C++ prototypes are:\n    setBackEdgeB(ViewEdge *,bool)\n    setBackEdgeB(ViewEdge *)\n");
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_SetId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_TVertex_setId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   TVertex *arg1 = (TVertex *) 0 ;
   Id *arg2 = 0 ;
@@ -50278,23 +51543,23 @@ SWIGINTERN PyObject *_wrap_TVertex_SetId(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:TVertex_SetId",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:TVertex_setId",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_SetId" "', argument " "1"" of type '" "TVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_setId" "', argument " "1"" of type '" "TVertex *""'"); 
   }
   arg1 = reinterpret_cast< TVertex * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Id,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TVertex_SetId" "', argument " "2"" of type '" "Id const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TVertex_setId" "', argument " "2"" of type '" "Id const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TVertex_SetId" "', argument " "2"" of type '" "Id const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "TVertex_setId" "', argument " "2"" of type '" "Id const &""'"); 
   }
   arg2 = reinterpret_cast< Id * >(argp2);
   {
     try {
-      (arg1)->SetId((Id const &)*arg2);
+      (arg1)->setId((Id const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -50444,7 +51709,7 @@ fail:
 SWIGINTERN PyObject *_wrap_TVertex_edges_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   TVertex *arg1 = (TVertex *) 0 ;
-  SwigValueWrapper< ViewVertexInternal::edge_iterator_base< ViewVertexInternal::edge_nonconst_traits > > result;
+  SwigValueWrapper<ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_nonconst_traits > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -50466,7 +51731,7 @@ SWIGINTERN PyObject *_wrap_TVertex_edges_end__SWIG_0(PyObject *SWIGUNUSEDPARM(se
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new ViewVertex::edge_iterator(static_cast< const ViewVertex::edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_nonconst_traits_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new ViewVertex::edge_iterator(static_cast< const ViewVertex::edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -50476,7 +51741,7 @@ fail:
 SWIGINTERN PyObject *_wrap_TVertex_edges_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   TVertex *arg1 = (TVertex *) 0 ;
-  SwigValueWrapper< ViewVertexInternal::edge_iterator_base< ViewVertexInternal::edge_const_traits > > result;
+  SwigValueWrapper<ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_const_traits > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -50498,7 +51763,7 @@ SWIGINTERN PyObject *_wrap_TVertex_edges_end__SWIG_1(PyObject *SWIGUNUSEDPARM(se
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new ViewVertex::const_edge_iterator(static_cast< const ViewVertex::const_edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_const_traits_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new ViewVertex::const_edge_iterator(static_cast< const ViewVertex::const_edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -50511,7 +51776,7 @@ SWIGINTERN PyObject *_wrap_TVertex_edges_end(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -50535,10 +51800,7 @@ SWIGINTERN PyObject *_wrap_TVertex_edges_end(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'TVertex_edges_end'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    edges_end(TVertex *)\n"
-    "    edges_end(TVertex const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'TVertex_edges_end'.\n  Possible C/C++ prototypes are:\n    edges_end()\n    edges_end()\n");
   return NULL;
 }
 
@@ -50682,7 +51944,7 @@ fail:
 
 SWIGINTERN PyObject *TVertex_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_TVertex, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -50840,7 +52102,7 @@ SWIGINTERN PyObject *_wrap_NonTVertex_getPoint3D(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -50968,7 +52230,7 @@ SWIGINTERN PyObject *_wrap_NonTVertex_getPoint2D(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -51164,7 +52426,7 @@ SWIGINTERN PyObject *_wrap_new_NonTVertex(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -51182,10 +52444,7 @@ SWIGINTERN PyObject *_wrap_new_NonTVertex(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_NonTVertex'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    NonTVertex()\n"
-    "    NonTVertex(SVertex *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_NonTVertex'.\n  Possible C/C++ prototypes are:\n    NonTVertex()\n    NonTVertex(SVertex *)\n");
   return NULL;
 }
 
@@ -51282,14 +52541,14 @@ SWIGINTERN PyObject *_wrap_NonTVertex_viewedges(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_std__pairT_ViewEdge_p_bool_t_std__allocatorT_std__pairT_ViewEdge_p_bool_t_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTstd__pairTViewEdge_p_bool_t_std__allocatorTstd__pairTViewEdge_p_bool_t_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_SetSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_NonTVertex_setSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   NonTVertex *arg1 = (NonTVertex *) 0 ;
   SVertex *arg2 = (SVertex *) 0 ;
@@ -51300,20 +52559,20 @@ SWIGINTERN PyObject *_wrap_NonTVertex_SetSVertex(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:NonTVertex_SetSVertex",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:NonTVertex_setSVertex",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_NonTVertex, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NonTVertex_SetSVertex" "', argument " "1"" of type '" "NonTVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NonTVertex_setSVertex" "', argument " "1"" of type '" "NonTVertex *""'"); 
   }
   arg1 = reinterpret_cast< NonTVertex * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SVertex, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "NonTVertex_SetSVertex" "', argument " "2"" of type '" "SVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "NonTVertex_setSVertex" "', argument " "2"" of type '" "SVertex *""'"); 
   }
   arg2 = reinterpret_cast< SVertex * >(argp2);
   {
     try {
-      (arg1)->SetSVertex(arg2);
+      (arg1)->setSVertex(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -51329,10 +52588,10 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_SetViewEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_NonTVertex_setViewEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   NonTVertex *arg1 = (NonTVertex *) 0 ;
-  std::vector< ViewVertex::directedViewEdge > *arg2 = 0 ;
+  std::vector<ViewVertex::directedViewEdge > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -51340,23 +52599,23 @@ SWIGINTERN PyObject *_wrap_NonTVertex_SetViewEdges(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:NonTVertex_SetViewEdges",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:NonTVertex_setViewEdges",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_NonTVertex, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NonTVertex_SetViewEdges" "', argument " "1"" of type '" "NonTVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NonTVertex_setViewEdges" "', argument " "1"" of type '" "NonTVertex *""'"); 
   }
   arg1 = reinterpret_cast< NonTVertex * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_std__pairT_ViewEdge_p_bool_t_std__allocatorT_std__pairT_ViewEdge_p_bool_t_t_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTstd__pairTViewEdge_p_bool_t_std__allocatorTstd__pairTViewEdge_p_bool_t_t_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "NonTVertex_SetViewEdges" "', argument " "2"" of type '" "std::vector< ViewVertex::directedViewEdge > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "NonTVertex_setViewEdges" "', argument " "2"" of type '" "std::vector<ViewVertex::directedViewEdge > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "NonTVertex_SetViewEdges" "', argument " "2"" of type '" "std::vector< ViewVertex::directedViewEdge > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "NonTVertex_setViewEdges" "', argument " "2"" of type '" "std::vector<ViewVertex::directedViewEdge > const &""'"); 
   }
-  arg2 = reinterpret_cast< std::vector< ViewVertex::directedViewEdge > * >(argp2);
+  arg2 = reinterpret_cast< std::vector<ViewVertex::directedViewEdge > * >(argp2);
   {
     try {
-      (arg1)->SetViewEdges((std::vector< ViewVertex::directedViewEdge > const &)*arg2);
+      (arg1)->setViewEdges((std::vector<ViewVertex::directedViewEdge > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -51547,7 +52806,7 @@ SWIGINTERN PyObject *_wrap_NonTVertex_AddViewEdge(PyObject *self, PyObject *args
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -51587,10 +52846,7 @@ SWIGINTERN PyObject *_wrap_NonTVertex_AddViewEdge(PyObject *self, PyObject *args
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'NonTVertex_AddViewEdge'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    AddViewEdge(NonTVertex *,ViewEdge *,bool)\n"
-    "    AddViewEdge(NonTVertex *,ViewEdge *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'NonTVertex_AddViewEdge'.\n  Possible C/C++ prototypes are:\n    AddViewEdge(ViewEdge *,bool)\n    AddViewEdge(ViewEdge *)\n");
   return NULL;
 }
 
@@ -51647,7 +52903,7 @@ fail:
 SWIGINTERN PyObject *_wrap_NonTVertex_edges_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   NonTVertex *arg1 = (NonTVertex *) 0 ;
-  SwigValueWrapper< ViewVertexInternal::edge_iterator_base< ViewVertexInternal::edge_nonconst_traits > > result;
+  SwigValueWrapper<ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_nonconst_traits > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -51669,7 +52925,7 @@ SWIGINTERN PyObject *_wrap_NonTVertex_edges_end__SWIG_0(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new ViewVertex::edge_iterator(static_cast< const ViewVertex::edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_nonconst_traits_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new ViewVertex::edge_iterator(static_cast< const ViewVertex::edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -51679,7 +52935,7 @@ fail:
 SWIGINTERN PyObject *_wrap_NonTVertex_edges_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   NonTVertex *arg1 = (NonTVertex *) 0 ;
-  SwigValueWrapper< ViewVertexInternal::edge_iterator_base< ViewVertexInternal::edge_const_traits > > result;
+  SwigValueWrapper<ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_const_traits > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -51701,7 +52957,7 @@ SWIGINTERN PyObject *_wrap_NonTVertex_edges_end__SWIG_1(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new ViewVertex::const_edge_iterator(static_cast< const ViewVertex::const_edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_const_traits_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new ViewVertex::const_edge_iterator(static_cast< const ViewVertex::const_edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -51714,7 +52970,7 @@ SWIGINTERN PyObject *_wrap_NonTVertex_edges_end(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -51738,10 +52994,7 @@ SWIGINTERN PyObject *_wrap_NonTVertex_edges_end(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'NonTVertex_edges_end'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    edges_end(NonTVertex *)\n"
-    "    edges_end(NonTVertex const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'NonTVertex_edges_end'.\n  Possible C/C++ prototypes are:\n    edges_end()\n    edges_end()\n");
   return NULL;
 }
 
@@ -51853,7 +53106,7 @@ fail:
 
 SWIGINTERN PyObject *NonTVertex_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_NonTVertex, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -52193,7 +53446,7 @@ SWIGINTERN PyObject *_wrap_new_ViewEdge(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 5); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -52264,12 +53517,7 @@ SWIGINTERN PyObject *_wrap_new_ViewEdge(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewEdge'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    ViewEdge()\n"
-    "    ViewEdge(ViewVertex *,ViewVertex *)\n"
-    "    ViewEdge(ViewVertex *,ViewVertex *,FEdge *)\n"
-    "    ViewEdge(ViewVertex *,ViewVertex *,FEdge *,FEdge *,ViewShape *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewEdge'.\n  Possible C/C++ prototypes are:\n    ViewEdge()\n    ViewEdge(ViewVertex *,ViewVertex *)\n    ViewEdge(ViewVertex *,ViewVertex *,FEdge *)\n    ViewEdge(ViewVertex *,ViewVertex *,FEdge *,FEdge *,ViewShape *)\n");
   return NULL;
 }
 
@@ -52600,7 +53848,7 @@ SWIGINTERN PyObject *_wrap_ViewEdge_aShape(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -52624,10 +53872,7 @@ SWIGINTERN PyObject *_wrap_ViewEdge_aShape(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdge_aShape'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    aShape(ViewEdge *)\n"
-    "    aShape(ViewEdge const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdge_aShape'.\n  Possible C/C++ prototypes are:\n    aShape()\n    aShape()\n");
   return NULL;
 }
 
@@ -52667,7 +53912,7 @@ fail:
 SWIGINTERN PyObject *_wrap_ViewEdge_occluders(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewEdge *arg1 = (ViewEdge *) 0 ;
-  std::vector< ViewShape * > *result = 0 ;
+  std::vector<ViewShape * > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -52681,8 +53926,8 @@ SWIGINTERN PyObject *_wrap_ViewEdge_occluders(PyObject *SWIGUNUSEDPARM(self), Py
   {
     try {
       {
-        std::vector< ViewShape * > &_result_ref = (arg1)->occluders();
-        result = (std::vector< ViewShape * > *) &_result_ref;
+        std::vector<ViewShape * > &_result_ref = (arg1)->occluders();
+        result = (std::vector<ViewShape * > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -52692,7 +53937,7 @@ SWIGINTERN PyObject *_wrap_ViewEdge_occluders(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -52731,7 +53976,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_SetA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewEdge_setA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewEdge *arg1 = (ViewEdge *) 0 ;
   ViewVertex *arg2 = (ViewVertex *) 0 ;
@@ -52742,20 +53987,20 @@ SWIGINTERN PyObject *_wrap_ViewEdge_SetA(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdge_SetA",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdge_setA",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_SetA" "', argument " "1"" of type '" "ViewEdge *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_setA" "', argument " "1"" of type '" "ViewEdge *""'"); 
   }
   arg1 = reinterpret_cast< ViewEdge * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewVertex, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdge_SetA" "', argument " "2"" of type '" "ViewVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdge_setA" "', argument " "2"" of type '" "ViewVertex *""'"); 
   }
   arg2 = reinterpret_cast< ViewVertex * >(argp2);
   {
     try {
-      (arg1)->SetA(arg2);
+      (arg1)->setA(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -52771,7 +54016,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_SetB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewEdge_setB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewEdge *arg1 = (ViewEdge *) 0 ;
   ViewVertex *arg2 = (ViewVertex *) 0 ;
@@ -52782,20 +54027,20 @@ SWIGINTERN PyObject *_wrap_ViewEdge_SetB(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdge_SetB",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdge_setB",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_SetB" "', argument " "1"" of type '" "ViewEdge *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_setB" "', argument " "1"" of type '" "ViewEdge *""'"); 
   }
   arg1 = reinterpret_cast< ViewEdge * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewVertex, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdge_SetB" "', argument " "2"" of type '" "ViewVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdge_setB" "', argument " "2"" of type '" "ViewVertex *""'"); 
   }
   arg2 = reinterpret_cast< ViewVertex * >(argp2);
   {
     try {
-      (arg1)->SetB(arg2);
+      (arg1)->setB(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -52811,7 +54056,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_SetNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewEdge_setNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewEdge *arg1 = (ViewEdge *) 0 ;
   Nature::EdgeNature arg2 ;
@@ -52822,20 +54067,20 @@ SWIGINTERN PyObject *_wrap_ViewEdge_SetNature(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdge_SetNature",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdge_setNature",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_SetNature" "', argument " "1"" of type '" "ViewEdge *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_setNature" "', argument " "1"" of type '" "ViewEdge *""'"); 
   }
   arg1 = reinterpret_cast< ViewEdge * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_short(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdge_SetNature" "', argument " "2"" of type '" "Nature::EdgeNature""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdge_setNature" "', argument " "2"" of type '" "Nature::EdgeNature""'");
   } 
   arg2 = static_cast< Nature::EdgeNature >(val2);
   {
     try {
-      (arg1)->SetNature(arg2);
+      (arg1)->setNature(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -52851,7 +54096,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_SetFEdgeA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewEdge_setFEdgeA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewEdge *arg1 = (ViewEdge *) 0 ;
   FEdge *arg2 = (FEdge *) 0 ;
@@ -52862,20 +54107,20 @@ SWIGINTERN PyObject *_wrap_ViewEdge_SetFEdgeA(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdge_SetFEdgeA",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdge_setFEdgeA",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_SetFEdgeA" "', argument " "1"" of type '" "ViewEdge *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_setFEdgeA" "', argument " "1"" of type '" "ViewEdge *""'"); 
   }
   arg1 = reinterpret_cast< ViewEdge * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FEdge, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdge_SetFEdgeA" "', argument " "2"" of type '" "FEdge *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdge_setFEdgeA" "', argument " "2"" of type '" "FEdge *""'"); 
   }
   arg2 = reinterpret_cast< FEdge * >(argp2);
   {
     try {
-      (arg1)->SetFEdgeA(arg2);
+      (arg1)->setFEdgeA(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -52891,7 +54136,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_SetFEdgeB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewEdge_setFEdgeB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewEdge *arg1 = (ViewEdge *) 0 ;
   FEdge *arg2 = (FEdge *) 0 ;
@@ -52902,20 +54147,20 @@ SWIGINTERN PyObject *_wrap_ViewEdge_SetFEdgeB(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdge_SetFEdgeB",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdge_setFEdgeB",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_SetFEdgeB" "', argument " "1"" of type '" "ViewEdge *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_setFEdgeB" "', argument " "1"" of type '" "ViewEdge *""'"); 
   }
   arg1 = reinterpret_cast< ViewEdge * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FEdge, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdge_SetFEdgeB" "', argument " "2"" of type '" "FEdge *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdge_setFEdgeB" "', argument " "2"" of type '" "FEdge *""'"); 
   }
   arg2 = reinterpret_cast< FEdge * >(argp2);
   {
     try {
-      (arg1)->SetFEdgeB(arg2);
+      (arg1)->setFEdgeB(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -52931,7 +54176,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_SetShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewEdge_setShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewEdge *arg1 = (ViewEdge *) 0 ;
   ViewShape *arg2 = (ViewShape *) 0 ;
@@ -52942,20 +54187,20 @@ SWIGINTERN PyObject *_wrap_ViewEdge_SetShape(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdge_SetShape",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdge_setShape",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_SetShape" "', argument " "1"" of type '" "ViewEdge *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_setShape" "', argument " "1"" of type '" "ViewEdge *""'"); 
   }
   arg1 = reinterpret_cast< ViewEdge * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewShape, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdge_SetShape" "', argument " "2"" of type '" "ViewShape *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdge_setShape" "', argument " "2"" of type '" "ViewShape *""'"); 
   }
   arg2 = reinterpret_cast< ViewShape * >(argp2);
   {
     try {
-      (arg1)->SetShape(arg2);
+      (arg1)->setShape(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -52971,7 +54216,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_SetId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewEdge_setId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewEdge *arg1 = (ViewEdge *) 0 ;
   Id *arg2 = 0 ;
@@ -52982,23 +54227,23 @@ SWIGINTERN PyObject *_wrap_ViewEdge_SetId(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdge_SetId",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdge_setId",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_SetId" "', argument " "1"" of type '" "ViewEdge *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_setId" "', argument " "1"" of type '" "ViewEdge *""'"); 
   }
   arg1 = reinterpret_cast< ViewEdge * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Id,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdge_SetId" "', argument " "2"" of type '" "Id const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdge_setId" "', argument " "2"" of type '" "Id const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdge_SetId" "', argument " "2"" of type '" "Id const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdge_setId" "', argument " "2"" of type '" "Id const &""'"); 
   }
   arg2 = reinterpret_cast< Id * >(argp2);
   {
     try {
-      (arg1)->SetId((Id const &)*arg2);
+      (arg1)->setId((Id const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -53045,7 +54290,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_SetaShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewEdge_setaShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewEdge *arg1 = (ViewEdge *) 0 ;
   ViewShape *arg2 = (ViewShape *) 0 ;
@@ -53056,20 +54301,20 @@ SWIGINTERN PyObject *_wrap_ViewEdge_SetaShape(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdge_SetaShape",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdge_setaShape",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_SetaShape" "', argument " "1"" of type '" "ViewEdge *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_setaShape" "', argument " "1"" of type '" "ViewEdge *""'"); 
   }
   arg1 = reinterpret_cast< ViewEdge * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewShape, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdge_SetaShape" "', argument " "2"" of type '" "ViewShape *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdge_setaShape" "', argument " "2"" of type '" "ViewShape *""'"); 
   }
   arg2 = reinterpret_cast< ViewShape * >(argp2);
   {
     try {
-      (arg1)->SetaShape(arg2);
+      (arg1)->setaShape(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -53085,7 +54330,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_SetQI(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewEdge_setQI(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewEdge *arg1 = (ViewEdge *) 0 ;
   int arg2 ;
@@ -53096,20 +54341,20 @@ SWIGINTERN PyObject *_wrap_ViewEdge_SetQI(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdge_SetQI",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdge_setQI",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_SetQI" "', argument " "1"" of type '" "ViewEdge *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_setQI" "', argument " "1"" of type '" "ViewEdge *""'"); 
   }
   arg1 = reinterpret_cast< ViewEdge * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdge_SetQI" "', argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdge_setQI" "', argument " "2"" of type '" "int""'");
   } 
   arg2 = static_cast< int >(val2);
   {
     try {
-      (arg1)->SetQI(arg2);
+      (arg1)->setQI(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -53267,7 +54512,7 @@ SWIGINTERN PyObject *_wrap_ViewEdge_intersect_2d_area(PyObject *SWIGUNUSEDPARM(s
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_intersect_2d_area" "', argument " "1"" of type '" "ViewEdge const *""'"); 
   }
   arg1 = reinterpret_cast< ViewEdge * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdge_intersect_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
   }
@@ -53275,7 +54520,7 @@ SWIGINTERN PyObject *_wrap_ViewEdge_intersect_2d_area(PyObject *SWIGUNUSEDPARM(s
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdge_intersect_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
   }
   arg2 = reinterpret_cast< Geometry::Vec2r * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewEdge_intersect_2d_area" "', argument " "3"" of type '" "Geometry::Vec2r const &""'"); 
   }
@@ -53323,7 +54568,7 @@ SWIGINTERN PyObject *_wrap_ViewEdge_include_in_2d_area(PyObject *SWIGUNUSEDPARM(
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_include_in_2d_area" "', argument " "1"" of type '" "ViewEdge const *""'"); 
   }
   arg1 = reinterpret_cast< ViewEdge * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdge_include_in_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
   }
@@ -53331,7 +54576,7 @@ SWIGINTERN PyObject *_wrap_ViewEdge_include_in_2d_area(PyObject *SWIGUNUSEDPARM(
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdge_include_in_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
   }
   arg2 = reinterpret_cast< Geometry::Vec2r * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewEdge_include_in_2d_area" "', argument " "3"" of type '" "Geometry::Vec2r const &""'"); 
   }
@@ -53887,7 +55132,7 @@ SWIGINTERN PyObject *_wrap_ViewEdge_pointsBegin(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -53917,10 +55162,7 @@ SWIGINTERN PyObject *_wrap_ViewEdge_pointsBegin(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdge_pointsBegin'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    pointsBegin(ViewEdge *,float)\n"
-    "    pointsBegin(ViewEdge *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdge_pointsBegin'.\n  Possible C/C++ prototypes are:\n    pointsBegin(float)\n    pointsBegin()\n");
   return NULL;
 }
 
@@ -54004,7 +55246,7 @@ SWIGINTERN PyObject *_wrap_ViewEdge_pointsEnd(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -54034,17 +55276,14 @@ SWIGINTERN PyObject *_wrap_ViewEdge_pointsEnd(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdge_pointsEnd'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    pointsEnd(ViewEdge *,float)\n"
-    "    pointsEnd(ViewEdge *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdge_pointsEnd'.\n  Possible C/C++ prototypes are:\n    pointsEnd(float)\n    pointsEnd()\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *ViewEdge_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ViewEdge, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -54196,7 +55435,7 @@ SWIGINTERN PyObject *_wrap_new_ViewShape(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -54223,11 +55462,7 @@ SWIGINTERN PyObject *_wrap_new_ViewShape(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewShape'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    ViewShape()\n"
-    "    ViewShape(SShape *)\n"
-    "    ViewShape(ViewShape &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewShape'.\n  Possible C/C++ prototypes are:\n    ViewShape()\n    ViewShape(SShape *)\n    ViewShape(ViewShape &)\n");
   return NULL;
 }
 
@@ -54300,9 +55535,9 @@ SWIGINTERN PyObject *_wrap_ViewShape_SplitEdge(PyObject *SWIGUNUSEDPARM(self), P
   PyObject *resultobj = 0;
   ViewShape *arg1 = (ViewShape *) 0 ;
   FEdge *arg2 = (FEdge *) 0 ;
-  std::vector< TVertex * > *arg3 = 0 ;
-  std::vector< FEdge * > *arg4 = 0 ;
-  std::vector< ViewEdge * > *arg5 = 0 ;
+  std::vector<TVertex * > *arg3 = 0 ;
+  std::vector<FEdge * > *arg4 = 0 ;
+  std::vector<ViewEdge * > *arg5 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -54330,33 +55565,33 @@ SWIGINTERN PyObject *_wrap_ViewShape_SplitEdge(PyObject *SWIGUNUSEDPARM(self), P
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShape_SplitEdge" "', argument " "2"" of type '" "FEdge *""'"); 
   }
   arg2 = reinterpret_cast< FEdge * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_std__vectorT_TVertex_p_std__allocatorT_TVertex_p_t_t,  0  | 0);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_std__vectorTTVertex_p_std__allocatorTTVertex_p_t_t,  0  | 0);
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewShape_SplitEdge" "', argument " "3"" of type '" "std::vector< TVertex * > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewShape_SplitEdge" "', argument " "3"" of type '" "std::vector<TVertex * > const &""'"); 
   }
   if (!argp3) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShape_SplitEdge" "', argument " "3"" of type '" "std::vector< TVertex * > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShape_SplitEdge" "', argument " "3"" of type '" "std::vector<TVertex * > const &""'"); 
   }
-  arg3 = reinterpret_cast< std::vector< TVertex * > * >(argp3);
-  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t,  0 );
+  arg3 = reinterpret_cast< std::vector<TVertex * > * >(argp3);
+  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t,  0 );
   if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewShape_SplitEdge" "', argument " "4"" of type '" "std::vector< FEdge * > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewShape_SplitEdge" "', argument " "4"" of type '" "std::vector<FEdge * > &""'"); 
   }
   if (!argp4) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShape_SplitEdge" "', argument " "4"" of type '" "std::vector< FEdge * > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShape_SplitEdge" "', argument " "4"" of type '" "std::vector<FEdge * > &""'"); 
   }
-  arg4 = reinterpret_cast< std::vector< FEdge * > * >(argp4);
-  res5 = SWIG_ConvertPtr(obj4, &argp5, SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t,  0 );
+  arg4 = reinterpret_cast< std::vector<FEdge * > * >(argp4);
+  res5 = SWIG_ConvertPtr(obj4, &argp5, SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t,  0 );
   if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "ViewShape_SplitEdge" "', argument " "5"" of type '" "std::vector< ViewEdge * > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "ViewShape_SplitEdge" "', argument " "5"" of type '" "std::vector<ViewEdge * > &""'"); 
   }
   if (!argp5) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShape_SplitEdge" "', argument " "5"" of type '" "std::vector< ViewEdge * > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShape_SplitEdge" "', argument " "5"" of type '" "std::vector<ViewEdge * > &""'"); 
   }
-  arg5 = reinterpret_cast< std::vector< ViewEdge * > * >(argp5);
+  arg5 = reinterpret_cast< std::vector<ViewEdge * > * >(argp5);
   {
     try {
-      (arg1)->SplitEdge(arg2,(std::vector< TVertex * > const &)*arg3,*arg4,*arg5);
+      (arg1)->SplitEdge(arg2,(std::vector<TVertex * > const &)*arg3,*arg4,*arg5);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -54442,7 +55677,7 @@ SWIGINTERN PyObject *_wrap_ViewShape_sshape(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -54466,10 +55701,7 @@ SWIGINTERN PyObject *_wrap_ViewShape_sshape(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewShape_sshape'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    sshape(ViewShape *)\n"
-    "    sshape(ViewShape const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewShape_sshape'.\n  Possible C/C++ prototypes are:\n    sshape()\n    sshape()\n");
   return NULL;
 }
 
@@ -54477,7 +55709,7 @@ fail:
 SWIGINTERN PyObject *_wrap_ViewShape_vertices(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewShape *arg1 = (ViewShape *) 0 ;
-  std::vector< ViewVertex * > *result = 0 ;
+  std::vector<ViewVertex * > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -54491,8 +55723,8 @@ SWIGINTERN PyObject *_wrap_ViewShape_vertices(PyObject *SWIGUNUSEDPARM(self), Py
   {
     try {
       {
-        std::vector< ViewVertex * > &_result_ref = (arg1)->vertices();
-        result = (std::vector< ViewVertex * > *) &_result_ref;
+        std::vector<ViewVertex * > &_result_ref = (arg1)->vertices();
+        result = (std::vector<ViewVertex * > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -54502,7 +55734,7 @@ SWIGINTERN PyObject *_wrap_ViewShape_vertices(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -54512,7 +55744,7 @@ fail:
 SWIGINTERN PyObject *_wrap_ViewShape_edges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewShape *arg1 = (ViewShape *) 0 ;
-  std::vector< ViewEdge * > *result = 0 ;
+  std::vector<ViewEdge * > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -54526,8 +55758,8 @@ SWIGINTERN PyObject *_wrap_ViewShape_edges(PyObject *SWIGUNUSEDPARM(self), PyObj
   {
     try {
       {
-        std::vector< ViewEdge * > &_result_ref = (arg1)->edges();
-        result = (std::vector< ViewEdge * > *) &_result_ref;
+        std::vector<ViewEdge * > &_result_ref = (arg1)->edges();
+        result = (std::vector<ViewEdge * > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -54537,7 +55769,7 @@ SWIGINTERN PyObject *_wrap_ViewShape_edges(PyObject *SWIGUNUSEDPARM(self), PyObj
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -54576,7 +55808,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShape_SetSShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewShape_setSShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewShape *arg1 = (ViewShape *) 0 ;
   SShape *arg2 = (SShape *) 0 ;
@@ -54587,20 +55819,20 @@ SWIGINTERN PyObject *_wrap_ViewShape_SetSShape(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ViewShape_SetSShape",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewShape_setSShape",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewShape, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShape_SetSShape" "', argument " "1"" of type '" "ViewShape *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShape_setSShape" "', argument " "1"" of type '" "ViewShape *""'"); 
   }
   arg1 = reinterpret_cast< ViewShape * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SShape, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShape_SetSShape" "', argument " "2"" of type '" "SShape *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShape_setSShape" "', argument " "2"" of type '" "SShape *""'"); 
   }
   arg2 = reinterpret_cast< SShape * >(argp2);
   {
     try {
-      (arg1)->SetSShape(arg2);
+      (arg1)->setSShape(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -54616,36 +55848,36 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShape_SetVertices(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewShape_setVertices(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewShape *arg1 = (ViewShape *) 0 ;
-  std::vector< ViewVertex * > *arg2 = 0 ;
+  std::vector<ViewVertex * > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ViewShape_SetVertices",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewShape_setVertices",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewShape, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShape_SetVertices" "', argument " "1"" of type '" "ViewShape *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShape_setVertices" "', argument " "1"" of type '" "ViewShape *""'"); 
   }
   arg1 = reinterpret_cast< ViewShape * >(argp1);
   {
-    std::vector<ViewVertex*,std::allocator< ViewVertex * > > *ptr = (std::vector<ViewVertex*,std::allocator< ViewVertex * > > *)0;
+    std::vector<ViewVertex*,std::allocator<ViewVertex * > > *ptr = (std::vector<ViewVertex*,std::allocator<ViewVertex * > > *)0;
     res2 = swig::asptr(obj1, &ptr);
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShape_SetVertices" "', argument " "2"" of type '" "std::vector< ViewVertex * > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShape_setVertices" "', argument " "2"" of type '" "std::vector<ViewVertex * > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShape_SetVertices" "', argument " "2"" of type '" "std::vector< ViewVertex * > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShape_setVertices" "', argument " "2"" of type '" "std::vector<ViewVertex * > const &""'"); 
     }
     arg2 = ptr;
   }
   {
     try {
-      (arg1)->SetVertices((std::vector< ViewVertex * > const &)*arg2);
+      (arg1)->setVertices((std::vector<ViewVertex * > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -54663,36 +55895,36 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShape_SetEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewShape_setEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewShape *arg1 = (ViewShape *) 0 ;
-  std::vector< ViewEdge * > *arg2 = 0 ;
+  std::vector<ViewEdge * > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ViewShape_SetEdges",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewShape_setEdges",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewShape, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShape_SetEdges" "', argument " "1"" of type '" "ViewShape *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShape_setEdges" "', argument " "1"" of type '" "ViewShape *""'"); 
   }
   arg1 = reinterpret_cast< ViewShape * >(argp1);
   {
-    std::vector<ViewEdge*,std::allocator< ViewEdge * > > *ptr = (std::vector<ViewEdge*,std::allocator< ViewEdge * > > *)0;
+    std::vector<ViewEdge*,std::allocator<ViewEdge * > > *ptr = (std::vector<ViewEdge*,std::allocator<ViewEdge * > > *)0;
     res2 = swig::asptr(obj1, &ptr);
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShape_SetEdges" "', argument " "2"" of type '" "std::vector< ViewEdge * > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShape_setEdges" "', argument " "2"" of type '" "std::vector<ViewEdge * > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShape_SetEdges" "', argument " "2"" of type '" "std::vector< ViewEdge * > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShape_setEdges" "', argument " "2"" of type '" "std::vector<ViewEdge * > const &""'"); 
     }
     arg2 = ptr;
   }
   {
     try {
-      (arg1)->SetEdges((std::vector< ViewEdge * > const &)*arg2);
+      (arg1)->setEdges((std::vector<ViewEdge * > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -54872,7 +56104,7 @@ fail:
 
 SWIGINTERN PyObject *ViewShape_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ViewShape, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -55153,7 +56385,7 @@ SWIGINTERN PyObject *_wrap_new_ViewVertexOrientedViewEdgeIterator(PyObject *self
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -55212,13 +56444,7 @@ SWIGINTERN PyObject *_wrap_new_ViewVertexOrientedViewEdgeIterator(PyObject *self
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewVertexOrientedViewEdgeIterator'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    ViewVertexInternal::orientedViewEdgeIterator()\n"
-    "    ViewVertexInternal::orientedViewEdgeIterator(Nature::VertexNature)\n"
-    "    ViewVertexInternal::orientedViewEdgeIterator(ViewVertexInternal::orientedViewEdgeIterator const &)\n"
-    "    ViewVertexInternal::orientedViewEdgeIterator(ViewVertexInternal::orientedViewEdgeIterator::edge_pointers_container::iterator,ViewVertexInternal::orientedViewEdgeIterator::edge_pointers_container::iterator,ViewVertexInternal::orientedViewEdgeIterator::edge_pointers_container::iterator)\n"
-    "    ViewVertexInternal::orientedViewEdgeIterator(ViewVertexInternal::orientedViewEdgeIterator::edges_container::iterator,ViewVertexInternal::orientedViewEdgeIterator::edges_container::iterator,ViewVertexInternal::orientedViewEdgeIterator::edges_container::iterator)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewVertexOrientedViewEdgeIterator'.\n  Possible C/C++ prototypes are:\n    ViewVertexInternal::orientedViewEdgeIterator()\n    ViewVertexInternal::orientedViewEdgeIterator(Nature::VertexNature)\n    ViewVertexInternal::orientedViewEdgeIterator(ViewVertexInternal::orientedViewEdgeIterator const &)\n    ViewVertexInternal::orientedViewEdgeIterator(ViewVertexInternal::orientedViewEdgeIterator::edge_pointers_container::iterator,ViewVertexInternal::orientedViewEdgeIterator::edge_pointers_container::iterator,ViewVertexInternal::orientedViewEdgeIterator::edge_pointers_container::iterator)\n    ViewVertexInternal::orientedViewEdgeIterator(ViewVertexInternal::orientedViewEdgeIterator::edges_container::iterator,ViewVertexInternal::orientedViewEdgeIterator::edges_container::iterator,ViewVertexInternal::orientedViewEdgeIterator::edges_container::iterator)\n");
   return NULL;
 }
 
@@ -55403,7 +56629,7 @@ SWIGINTERN PyObject *_wrap_ViewVertexOrientedViewEdgeIterator_getObject(PyObject
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairT_ViewEdge_p_bool_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairTViewEdge_p_bool_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -55435,7 +56661,7 @@ SWIGINTERN PyObject *_wrap_ViewVertexOrientedViewEdgeIterator___deref__(PyObject
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairT_ViewEdge_p_bool_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairTViewEdge_p_bool_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -55475,7 +56701,7 @@ fail:
 
 SWIGINTERN PyObject *ViewVertexOrientedViewEdgeIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -55612,7 +56838,7 @@ SWIGINTERN PyObject *_wrap_new_ViewEdgeSVertexIterator(PyObject *self, PyObject
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 5); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -55659,11 +56885,7 @@ SWIGINTERN PyObject *_wrap_new_ViewEdgeSVertexIterator(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewEdgeSVertexIterator'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    ViewEdgeInternal::SVertexIterator()\n"
-    "    ViewEdgeInternal::SVertexIterator(ViewEdgeInternal::SVertexIterator const &)\n"
-    "    ViewEdgeInternal::SVertexIterator(SVertex *,SVertex *,FEdge *,FEdge *,float)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewEdgeSVertexIterator'.\n  Possible C/C++ prototypes are:\n    ViewEdgeInternal::SVertexIterator()\n    ViewEdgeInternal::SVertexIterator(ViewEdgeInternal::SVertexIterator const &)\n    ViewEdgeInternal::SVertexIterator(SVertex *,SVertex *,FEdge *,FEdge *,float)\n");
   return NULL;
 }
 
@@ -56186,7 +57408,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_getPoint3D(PyObject *SWIGUNUS
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -56314,7 +57536,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_getPoint2D(PyObject *SWIGUNUS
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -56668,7 +57890,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_point3D(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -56703,7 +57925,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_point2D(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -56713,7 +57935,7 @@ fail:
 SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_normals(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
-  SwigValueWrapper< set< VecMat::Vec3< double > > > result;
+  SwigValueWrapper<set<VecMat::Vec3<double > > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -56735,7 +57957,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_normals(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new set< Geometry::Vec3r >(static_cast< const set< Geometry::Vec3r >& >(result))), SWIGTYPE_p_setT_VecMat__Vec3T_double_t_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new set<Geometry::Vec3r >(static_cast< const set<Geometry::Vec3r >& >(result))), SWIGTYPE_p_setTVecMat__Vec3Tdouble_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -56777,7 +57999,7 @@ fail:
 SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_fedges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
-  std::vector< FEdge * > *result = 0 ;
+  std::vector<FEdge * > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -56791,8 +58013,8 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_fedges(PyObject *SWIGUNUSEDPA
   {
     try {
       {
-        std::vector< FEdge * > const &_result_ref = (*arg1)->fedges();
-        result = (std::vector< FEdge * > *) &_result_ref;
+        std::vector<FEdge * > const &_result_ref = (*arg1)->fedges();
+        result = (std::vector<FEdge * > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -56802,7 +58024,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_fedges(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = swig::from(static_cast< std::vector<FEdge*,std::allocator< FEdge * > > >(*result));
+  resultobj = swig::from(static_cast< std::vector<FEdge*,std::allocator<FEdge * > > >(*result));
   return resultobj;
 fail:
   return NULL;
@@ -56943,7 +58165,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_shape(PyObject *self, PyObjec
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -56967,10 +58189,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_shape(PyObject *self, PyObjec
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgeSVertexIterator_shape'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    shape(ViewEdgeInternal::SVertexIterator *)\n"
-    "    shape(ViewEdgeInternal::SVertexIterator const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgeSVertexIterator_shape'.\n  Possible C/C++ prototypes are:\n    shape()\n    shape()\n");
   return NULL;
 }
 
@@ -57039,7 +58258,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_SetPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_setPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
   Geometry::Vec3r *arg2 = 0 ;
@@ -57050,23 +58269,23 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_SetPoint3D(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeSVertexIterator_SetPoint3D",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeSVertexIterator_setPoint3D",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_SetPoint3D" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_setPoint3D" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
   }
   arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeSVertexIterator_SetPoint3D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeSVertexIterator_setPoint3D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgeSVertexIterator_SetPoint3D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgeSVertexIterator_setPoint3D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
   arg2 = reinterpret_cast< Geometry::Vec3r * >(argp2);
   {
     try {
-      (*arg1)->SetPoint3D((Geometry::Vec3r const &)*arg2);
+      (*arg1)->setPoint3D((Geometry::Vec3r const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -57082,7 +58301,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_SetPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_setPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
   Geometry::Vec3r *arg2 = 0 ;
@@ -57093,23 +58312,23 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_SetPoint2D(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeSVertexIterator_SetPoint2D",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeSVertexIterator_setPoint2D",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_SetPoint2D" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_setPoint2D" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
   }
   arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeSVertexIterator_SetPoint2D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeSVertexIterator_setPoint2D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgeSVertexIterator_SetPoint2D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgeSVertexIterator_setPoint2D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
   arg2 = reinterpret_cast< Geometry::Vec3r * >(argp2);
   {
     try {
-      (*arg1)->SetPoint2D((Geometry::Vec3r const &)*arg2);
+      (*arg1)->setPoint2D((Geometry::Vec3r const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -57142,7 +58361,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_AddNormal(PyObject *SWIGUNUSE
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_AddNormal" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
   }
   arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeSVertexIterator_AddNormal" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -57298,7 +58517,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_setDirectionFredo(PyObject *S
   }
   arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeSVertexIterator_setDirectionFredo" "', argument " "2"" of type '" "Geometry::Vec2r""'"); 
     }  
@@ -57385,14 +58604,14 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_directionFredo(PyObject *SWIG
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2r(static_cast< const Geometry::Vec2r& >(result))), SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2r(static_cast< const Geometry::Vec2r& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_SetId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_setId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
   Id *arg2 = 0 ;
@@ -57403,23 +58622,23 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_SetId(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeSVertexIterator_SetId",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeSVertexIterator_setId",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_SetId" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_setId" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
   }
   arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Id,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeSVertexIterator_SetId" "', argument " "2"" of type '" "Id const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeSVertexIterator_setId" "', argument " "2"" of type '" "Id const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgeSVertexIterator_SetId" "', argument " "2"" of type '" "Id const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgeSVertexIterator_setId" "', argument " "2"" of type '" "Id const &""'"); 
   }
   arg2 = reinterpret_cast< Id * >(argp2);
   {
     try {
-      (*arg1)->SetId((Id const &)*arg2);
+      (*arg1)->setId((Id const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -57435,36 +58654,36 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_SetFEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_setFEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
-  std::vector< FEdge * > *arg2 = 0 ;
+  std::vector<FEdge * > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeSVertexIterator_SetFEdges",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeSVertexIterator_setFEdges",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_SetFEdges" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_setFEdges" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
   }
   arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
   {
-    std::vector<FEdge*,std::allocator< FEdge * > > *ptr = (std::vector<FEdge*,std::allocator< FEdge * > > *)0;
+    std::vector<FEdge*,std::allocator<FEdge * > > *ptr = (std::vector<FEdge*,std::allocator<FEdge * > > *)0;
     res2 = swig::asptr(obj1, &ptr);
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeSVertexIterator_SetFEdges" "', argument " "2"" of type '" "std::vector< FEdge * > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeSVertexIterator_setFEdges" "', argument " "2"" of type '" "std::vector<FEdge * > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgeSVertexIterator_SetFEdges" "', argument " "2"" of type '" "std::vector< FEdge * > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgeSVertexIterator_setFEdges" "', argument " "2"" of type '" "std::vector<FEdge * > const &""'"); 
     }
     arg2 = ptr;
   }
   {
     try {
-      (*arg1)->SetFEdges((std::vector< FEdge * > const &)*arg2);
+      (*arg1)->setFEdges((std::vector<FEdge * > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -57482,7 +58701,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_SetShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_setShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
   SShape *arg2 = (SShape *) 0 ;
@@ -57493,20 +58712,20 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_SetShape(PyObject *SWIGUNUSED
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeSVertexIterator_SetShape",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeSVertexIterator_setShape",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_SetShape" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_setShape" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
   }
   arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SShape, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeSVertexIterator_SetShape" "', argument " "2"" of type '" "SShape *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeSVertexIterator_setShape" "', argument " "2"" of type '" "SShape *""'"); 
   }
   arg2 = reinterpret_cast< SShape * >(argp2);
   {
     try {
-      (*arg1)->SetShape(arg2);
+      (*arg1)->setShape(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -57522,7 +58741,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_SetViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_setViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
   ViewVertex *arg2 = (ViewVertex *) 0 ;
@@ -57533,20 +58752,20 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_SetViewVertex(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeSVertexIterator_SetViewVertex",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeSVertexIterator_setViewVertex",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_SetViewVertex" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_setViewVertex" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
   }
   arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewVertex, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeSVertexIterator_SetViewVertex" "', argument " "2"" of type '" "ViewVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeSVertexIterator_setViewVertex" "', argument " "2"" of type '" "ViewVertex *""'"); 
   }
   arg2 = reinterpret_cast< ViewVertex * >(argp2);
   {
     try {
-      (*arg1)->SetViewVertex(arg2);
+      (*arg1)->setViewVertex(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -57711,7 +58930,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_point2d(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -57746,7 +58965,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_point3d(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -57778,7 +58997,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_normal(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -58142,7 +59361,7 @@ fail:
 
 SWIGINTERN PyObject *ViewEdgeSVertexIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -58320,7 +59539,7 @@ SWIGINTERN PyObject *_wrap_new_ViewEdgeViewEdgeIterator(PyObject *self, PyObject
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -58374,12 +59593,7 @@ SWIGINTERN PyObject *_wrap_new_ViewEdgeViewEdgeIterator(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewEdgeViewEdgeIterator'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    ViewEdgeInternal::ViewEdgeIterator(PyObject *,ViewEdge *,bool)\n"
-    "    ViewEdgeInternal::ViewEdgeIterator(PyObject *,ViewEdge *)\n"
-    "    ViewEdgeInternal::ViewEdgeIterator(PyObject *)\n"
-    "    ViewEdgeInternal::ViewEdgeIterator(PyObject *,ViewEdgeInternal::ViewEdgeIterator const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewEdgeViewEdgeIterator'.\n  Possible C/C++ prototypes are:\n    ViewEdgeInternal::ViewEdgeIterator(PyObject *,ViewEdge *,bool)\n    ViewEdgeInternal::ViewEdgeIterator(PyObject *,ViewEdge *)\n    ViewEdgeInternal::ViewEdgeIterator(PyObject *)\n    ViewEdgeInternal::ViewEdgeIterator(PyObject *,ViewEdgeInternal::ViewEdgeIterator const &)\n");
   return NULL;
 }
 
@@ -59432,7 +60646,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_aShape(PyObject *self, PyObj
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -59456,10 +60670,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_aShape(PyObject *self, PyObj
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgeViewEdgeIterator_aShape'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    aShape(ViewEdgeInternal::ViewEdgeIterator *)\n"
-    "    aShape(ViewEdgeInternal::ViewEdgeIterator const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgeViewEdgeIterator_aShape'.\n  Possible C/C++ prototypes are:\n    aShape()\n    aShape()\n");
   return NULL;
 }
 
@@ -59563,7 +60774,7 @@ fail:
 SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_occluders(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
-  std::vector< ViewShape * > *result = 0 ;
+  std::vector<ViewShape * > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -59577,8 +60788,8 @@ SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_occluders(PyObject *SWIGUNUS
   {
     try {
       {
-        std::vector< ViewShape * > &_result_ref = (*arg1)->occluders();
-        result = (std::vector< ViewShape * > *) &_result_ref;
+        std::vector<ViewShape * > &_result_ref = (*arg1)->occluders();
+        result = (std::vector<ViewShape * > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -59588,7 +60799,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_occluders(PyObject *SWIGUNUS
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -59627,7 +60838,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_SetA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_setA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
   ViewVertex *arg2 = (ViewVertex *) 0 ;
@@ -59638,20 +60849,20 @@ SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_SetA(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeViewEdgeIterator_SetA",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeViewEdgeIterator_setA",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_SetA" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_setA" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
   }
   arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewVertex, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeViewEdgeIterator_SetA" "', argument " "2"" of type '" "ViewVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeViewEdgeIterator_setA" "', argument " "2"" of type '" "ViewVertex *""'"); 
   }
   arg2 = reinterpret_cast< ViewVertex * >(argp2);
   {
     try {
-      (*arg1)->SetA(arg2);
+      (*arg1)->setA(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -59667,7 +60878,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_SetB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_setB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
   ViewVertex *arg2 = (ViewVertex *) 0 ;
@@ -59678,20 +60889,20 @@ SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_SetB(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeViewEdgeIterator_SetB",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeViewEdgeIterator_setB",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_SetB" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_setB" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
   }
   arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewVertex, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeViewEdgeIterator_SetB" "', argument " "2"" of type '" "ViewVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeViewEdgeIterator_setB" "', argument " "2"" of type '" "ViewVertex *""'"); 
   }
   arg2 = reinterpret_cast< ViewVertex * >(argp2);
   {
     try {
-      (*arg1)->SetB(arg2);
+      (*arg1)->setB(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -59707,7 +60918,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_SetNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_setNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
   Nature::EdgeNature arg2 ;
@@ -59718,20 +60929,20 @@ SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_SetNature(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeViewEdgeIterator_SetNature",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeViewEdgeIterator_setNature",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_SetNature" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_setNature" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
   }
   arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_short(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgeViewEdgeIterator_SetNature" "', argument " "2"" of type '" "Nature::EdgeNature""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgeViewEdgeIterator_setNature" "', argument " "2"" of type '" "Nature::EdgeNature""'");
   } 
   arg2 = static_cast< Nature::EdgeNature >(val2);
   {
     try {
-      (*arg1)->SetNature(arg2);
+      (*arg1)->setNature(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -59747,7 +60958,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_SetFEdgeA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_setFEdgeA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
   FEdge *arg2 = (FEdge *) 0 ;
@@ -59758,20 +60969,20 @@ SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_SetFEdgeA(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeViewEdgeIterator_SetFEdgeA",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeViewEdgeIterator_setFEdgeA",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_SetFEdgeA" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_setFEdgeA" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
   }
   arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FEdge, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeViewEdgeIterator_SetFEdgeA" "', argument " "2"" of type '" "FEdge *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeViewEdgeIterator_setFEdgeA" "', argument " "2"" of type '" "FEdge *""'"); 
   }
   arg2 = reinterpret_cast< FEdge * >(argp2);
   {
     try {
-      (*arg1)->SetFEdgeA(arg2);
+      (*arg1)->setFEdgeA(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -59787,7 +60998,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_SetFEdgeB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_setFEdgeB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
   FEdge *arg2 = (FEdge *) 0 ;
@@ -59798,20 +61009,20 @@ SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_SetFEdgeB(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeViewEdgeIterator_SetFEdgeB",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeViewEdgeIterator_setFEdgeB",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_SetFEdgeB" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_setFEdgeB" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
   }
   arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FEdge, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeViewEdgeIterator_SetFEdgeB" "', argument " "2"" of type '" "FEdge *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeViewEdgeIterator_setFEdgeB" "', argument " "2"" of type '" "FEdge *""'"); 
   }
   arg2 = reinterpret_cast< FEdge * >(argp2);
   {
     try {
-      (*arg1)->SetFEdgeB(arg2);
+      (*arg1)->setFEdgeB(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -59827,7 +61038,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_SetShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_setShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
   ViewShape *arg2 = (ViewShape *) 0 ;
@@ -59838,20 +61049,20 @@ SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_SetShape(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeViewEdgeIterator_SetShape",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeViewEdgeIterator_setShape",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_SetShape" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_setShape" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
   }
   arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewShape, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeViewEdgeIterator_SetShape" "', argument " "2"" of type '" "ViewShape *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeViewEdgeIterator_setShape" "', argument " "2"" of type '" "ViewShape *""'"); 
   }
   arg2 = reinterpret_cast< ViewShape * >(argp2);
   {
     try {
-      (*arg1)->SetShape(arg2);
+      (*arg1)->setShape(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -59867,7 +61078,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_SetId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_setId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
   Id *arg2 = 0 ;
@@ -59878,23 +61089,23 @@ SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_SetId(PyObject *SWIGUNUSEDPA
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeViewEdgeIterator_SetId",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeViewEdgeIterator_setId",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_SetId" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_setId" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
   }
   arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Id,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeViewEdgeIterator_SetId" "', argument " "2"" of type '" "Id const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeViewEdgeIterator_setId" "', argument " "2"" of type '" "Id const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgeViewEdgeIterator_SetId" "', argument " "2"" of type '" "Id const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgeViewEdgeIterator_setId" "', argument " "2"" of type '" "Id const &""'"); 
   }
   arg2 = reinterpret_cast< Id * >(argp2);
   {
     try {
-      (*arg1)->SetId((Id const &)*arg2);
+      (*arg1)->setId((Id const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -59941,7 +61152,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_SetaShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_setaShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
   ViewShape *arg2 = (ViewShape *) 0 ;
@@ -59952,20 +61163,20 @@ SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_SetaShape(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeViewEdgeIterator_SetaShape",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeViewEdgeIterator_setaShape",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_SetaShape" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_setaShape" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
   }
   arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewShape, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeViewEdgeIterator_SetaShape" "', argument " "2"" of type '" "ViewShape *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeViewEdgeIterator_setaShape" "', argument " "2"" of type '" "ViewShape *""'"); 
   }
   arg2 = reinterpret_cast< ViewShape * >(argp2);
   {
     try {
-      (*arg1)->SetaShape(arg2);
+      (*arg1)->setaShape(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -59981,7 +61192,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_SetQI(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_setQI(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
   int arg2 ;
@@ -59992,20 +61203,20 @@ SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_SetQI(PyObject *SWIGUNUSEDPA
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeViewEdgeIterator_SetQI",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgeViewEdgeIterator_setQI",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_SetQI" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_setQI" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
   }
   arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgeViewEdgeIterator_SetQI" "', argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgeViewEdgeIterator_setQI" "', argument " "2"" of type '" "int""'");
   } 
   arg2 = static_cast< int >(val2);
   {
     try {
-      (*arg1)->SetQI(arg2);
+      (*arg1)->setQI(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -60163,7 +61374,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_intersect_2d_area(PyObject *
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_intersect_2d_area" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator const *""'"); 
   }
   arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeViewEdgeIterator_intersect_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
   }
@@ -60171,7 +61382,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_intersect_2d_area(PyObject *
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgeViewEdgeIterator_intersect_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
   }
   arg2 = reinterpret_cast< Geometry::Vec2r * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewEdgeViewEdgeIterator_intersect_2d_area" "', argument " "3"" of type '" "Geometry::Vec2r const &""'"); 
   }
@@ -60219,7 +61430,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_include_in_2d_area(PyObject
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_include_in_2d_area" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator const *""'"); 
   }
   arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeViewEdgeIterator_include_in_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
   }
@@ -60227,7 +61438,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_include_in_2d_area(PyObject
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgeViewEdgeIterator_include_in_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
   }
   arg2 = reinterpret_cast< Geometry::Vec2r * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewEdgeViewEdgeIterator_include_in_2d_area" "', argument " "3"" of type '" "Geometry::Vec2r const &""'"); 
   }
@@ -60783,7 +61994,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_pointsBegin(PyObject *self,
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -60813,10 +62024,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_pointsBegin(PyObject *self,
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgeViewEdgeIterator_pointsBegin'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    pointsBegin(ViewEdgeInternal::ViewEdgeIterator *,float)\n"
-    "    pointsBegin(ViewEdgeInternal::ViewEdgeIterator *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgeViewEdgeIterator_pointsBegin'.\n  Possible C/C++ prototypes are:\n    pointsBegin(float)\n    pointsBegin()\n");
   return NULL;
 }
 
@@ -60900,7 +62108,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_pointsEnd(PyObject *self, Py
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -60930,10 +62138,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_pointsEnd(PyObject *self, Py
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgeViewEdgeIterator_pointsEnd'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    pointsEnd(ViewEdgeInternal::ViewEdgeIterator *,float)\n"
-    "    pointsEnd(ViewEdgeInternal::ViewEdgeIterator *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgeViewEdgeIterator_pointsEnd'.\n  Possible C/C++ prototypes are:\n    pointsEnd(float)\n    pointsEnd()\n");
   return NULL;
 }
 
@@ -61037,7 +62242,7 @@ fail:
 
 SWIGINTERN PyObject *ViewEdgeViewEdgeIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -61045,7 +62250,7 @@ SWIGINTERN PyObject *ViewEdgeViewEdgeIterator_swigregister(PyObject *SWIGUNUSEDP
 SWIGINTERN PyObject *_wrap_new_UnaryFunction0DVoid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  UnaryFunction0D< void > *result = 0 ;
+  UnaryFunction0D<void > *result = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction0DVoid",&obj0)) SWIG_fail;
@@ -61054,9 +62259,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DVoid(PyObject *SWIGUNUSEDPARM(self
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction0D< void > *)new SwigDirector_UnaryFunction0DVoid(arg1); 
+        result = (UnaryFunction0D<void > *)new SwigDirector_UnaryFunction0DVoid(arg1); 
       } else {
-        result = (UnaryFunction0D< void > *)new UnaryFunction0D< void >(); 
+        result = (UnaryFunction0D<void > *)new UnaryFunction0D<void >(); 
       }
       
     }
@@ -61067,7 +62272,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DVoid(PyObject *SWIGUNUSEDPARM(self
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DT_void_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DTvoid_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -61076,17 +62281,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction0DVoid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D< void > *arg1 = (UnaryFunction0D< void > *) 0 ;
+  UnaryFunction0D<void > *arg1 = (UnaryFunction0D<void > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction0DVoid",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_void_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTvoid_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DVoid" "', argument " "1"" of type '" "UnaryFunction0D< void > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DVoid" "', argument " "1"" of type '" "UnaryFunction0D<void > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D< void > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D<void > * >(argp1);
   {
     try {
       delete arg1;
@@ -61108,7 +62313,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DVoid_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D< void > *arg1 = (UnaryFunction0D< void > *) 0 ;
+  UnaryFunction0D<void > *arg1 = (UnaryFunction0D<void > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -61117,20 +62322,20 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DVoid_getName(PyObject *SWIGUNUSEDPARM(
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction0DVoid_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_void_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTvoid_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVoid_getName" "', argument " "1"" of type '" "UnaryFunction0D< void > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVoid_getName" "', argument " "1"" of type '" "UnaryFunction0D<void > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D< void > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D<void > * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
   upcall = (director && (director->swig_get_self()==obj0));
   try {
     {
       try {
         if (upcall) {
-          result = ((UnaryFunction0D< void > const *)arg1)->UnaryFunction0D< void >::getName();
+          result = ((UnaryFunction0D<void > const *)arg1)->UnaryFunction0D<void >::getName();
         } else {
-          result = ((UnaryFunction0D< void > const *)arg1)->getName();
+          result = ((UnaryFunction0D<void > const *)arg1)->getName();
         }
       }
       //    catch (Swig::DirectorTypeMismatch&) {
@@ -61152,7 +62357,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DVoid___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D< void > *arg1 = (UnaryFunction0D< void > *) 0 ;
+  UnaryFunction0D<void > *arg1 = (UnaryFunction0D<void > *) 0 ;
   Interface0DIterator *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -61164,11 +62369,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DVoid___call__(PyObject *SWIGUNUSEDPARM
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction0DVoid___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_void_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTvoid_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVoid___call__" "', argument " "1"" of type '" "UnaryFunction0D< void > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVoid___call__" "', argument " "1"" of type '" "UnaryFunction0D<void > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D< void > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D<void > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction0DVoid___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
@@ -61183,7 +62388,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DVoid___call__(PyObject *SWIGUNUSEDPARM
     {
       try {
         if (upcall) {
-          (arg1)->UnaryFunction0D< void >::operator ()(*arg2);
+          (arg1)->UnaryFunction0D<void >::operator ()(*arg2);
         } else {
           (arg1)->operator ()(*arg2);
         }
@@ -61207,17 +62412,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DVoid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D< void > *arg1 = (UnaryFunction0D< void > *) 0 ;
+  UnaryFunction0D<void > *arg1 = (UnaryFunction0D<void > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction0DVoid",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_void_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTvoid_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DVoid" "', argument " "1"" of type '" "UnaryFunction0D< void > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DVoid" "', argument " "1"" of type '" "UnaryFunction0D<void > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D< void > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D<void > * >(argp1);
   {
     Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
@@ -61232,15 +62437,15 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction0DVoid_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DT_void_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DTvoid_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_UnaryFunction0DUnsigned(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  UnaryFunction0D< unsigned int > *result = 0 ;
+  UnaryFunction0D<unsigned int > *result = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction0DUnsigned",&obj0)) SWIG_fail;
@@ -61249,9 +62454,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DUnsigned(PyObject *SWIGUNUSEDPARM(
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction0D< unsigned int > *)new SwigDirector_UnaryFunction0DUnsigned(arg1); 
+        result = (UnaryFunction0D<unsigned int > *)new SwigDirector_UnaryFunction0DUnsigned(arg1); 
       } else {
-        result = (UnaryFunction0D< unsigned int > *)new UnaryFunction0D< unsigned int >(); 
+        result = (UnaryFunction0D<unsigned int > *)new UnaryFunction0D<unsigned int >(); 
       }
       
     }
@@ -61262,7 +62467,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DUnsigned(PyObject *SWIGUNUSEDPARM(
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DT_unsigned_int_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DTunsigned_int_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -61271,17 +62476,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction0DUnsigned(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D< unsigned int > *arg1 = (UnaryFunction0D< unsigned int > *) 0 ;
+  UnaryFunction0D<unsigned int > *arg1 = (UnaryFunction0D<unsigned int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction0DUnsigned",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_unsigned_int_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTunsigned_int_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DUnsigned" "', argument " "1"" of type '" "UnaryFunction0D< unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DUnsigned" "', argument " "1"" of type '" "UnaryFunction0D<unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D< unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D<unsigned int > * >(argp1);
   {
     try {
       delete arg1;
@@ -61303,7 +62508,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DUnsigned_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D< unsigned int > *arg1 = (UnaryFunction0D< unsigned int > *) 0 ;
+  UnaryFunction0D<unsigned int > *arg1 = (UnaryFunction0D<unsigned int > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -61312,20 +62517,20 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DUnsigned_getName(PyObject *SWIGUNUSEDP
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction0DUnsigned_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_unsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTunsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DUnsigned_getName" "', argument " "1"" of type '" "UnaryFunction0D< unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DUnsigned_getName" "', argument " "1"" of type '" "UnaryFunction0D<unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D< unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D<unsigned int > * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
   upcall = (director && (director->swig_get_self()==obj0));
   try {
     {
       try {
         if (upcall) {
-          result = ((UnaryFunction0D< unsigned int > const *)arg1)->UnaryFunction0D< unsigned int >::getName();
+          result = ((UnaryFunction0D<unsigned int > const *)arg1)->UnaryFunction0D<unsigned int >::getName();
         } else {
-          result = ((UnaryFunction0D< unsigned int > const *)arg1)->getName();
+          result = ((UnaryFunction0D<unsigned int > const *)arg1)->getName();
         }
       }
       //    catch (Swig::DirectorTypeMismatch&) {
@@ -61347,7 +62552,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DUnsigned___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D< unsigned int > *arg1 = (UnaryFunction0D< unsigned int > *) 0 ;
+  UnaryFunction0D<unsigned int > *arg1 = (UnaryFunction0D<unsigned int > *) 0 ;
   Interface0DIterator *arg2 = 0 ;
   unsigned int result;
   void *argp1 = 0 ;
@@ -61360,11 +62565,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DUnsigned___call__(PyObject *SWIGUNUSED
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction0DUnsigned___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_unsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTunsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DUnsigned___call__" "', argument " "1"" of type '" "UnaryFunction0D< unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DUnsigned___call__" "', argument " "1"" of type '" "UnaryFunction0D<unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D< unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D<unsigned int > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction0DUnsigned___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
@@ -61379,7 +62584,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DUnsigned___call__(PyObject *SWIGUNUSED
     {
       try {
         if (upcall) {
-          result = (unsigned int)(arg1)->UnaryFunction0D< unsigned int >::operator ()(*arg2);
+          result = (unsigned int)(arg1)->UnaryFunction0D<unsigned int >::operator ()(*arg2);
         } else {
           result = (unsigned int)(arg1)->operator ()(*arg2);
         }
@@ -61403,17 +62608,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DUnsigned(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D< unsigned int > *arg1 = (UnaryFunction0D< unsigned int > *) 0 ;
+  UnaryFunction0D<unsigned int > *arg1 = (UnaryFunction0D<unsigned int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction0DUnsigned",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_unsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTunsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DUnsigned" "', argument " "1"" of type '" "UnaryFunction0D< unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DUnsigned" "', argument " "1"" of type '" "UnaryFunction0D<unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D< unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D<unsigned int > * >(argp1);
   {
     Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
@@ -61428,15 +62633,15 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction0DUnsigned_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DT_unsigned_int_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DTunsigned_int_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_UnaryFunction0DFloat(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  UnaryFunction0D< float > *result = 0 ;
+  UnaryFunction0D<float > *result = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction0DFloat",&obj0)) SWIG_fail;
@@ -61445,9 +62650,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DFloat(PyObject *SWIGUNUSEDPARM(sel
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction0D< float > *)new SwigDirector_UnaryFunction0DFloat(arg1); 
+        result = (UnaryFunction0D<float > *)new SwigDirector_UnaryFunction0DFloat(arg1); 
       } else {
-        result = (UnaryFunction0D< float > *)new UnaryFunction0D< float >(); 
+        result = (UnaryFunction0D<float > *)new UnaryFunction0D<float >(); 
       }
       
     }
@@ -61458,7 +62663,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DFloat(PyObject *SWIGUNUSEDPARM(sel
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DT_float_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DTfloat_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -61467,17 +62672,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction0DFloat(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D< float > *arg1 = (UnaryFunction0D< float > *) 0 ;
+  UnaryFunction0D<float > *arg1 = (UnaryFunction0D<float > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction0DFloat",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_float_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTfloat_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DFloat" "', argument " "1"" of type '" "UnaryFunction0D< float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DFloat" "', argument " "1"" of type '" "UnaryFunction0D<float > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D< float > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D<float > * >(argp1);
   {
     try {
       delete arg1;
@@ -61499,7 +62704,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DFloat_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D< float > *arg1 = (UnaryFunction0D< float > *) 0 ;
+  UnaryFunction0D<float > *arg1 = (UnaryFunction0D<float > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -61508,20 +62713,20 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DFloat_getName(PyObject *SWIGUNUSEDPARM
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction0DFloat_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_float_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTfloat_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DFloat_getName" "', argument " "1"" of type '" "UnaryFunction0D< float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DFloat_getName" "', argument " "1"" of type '" "UnaryFunction0D<float > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D< float > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D<float > * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
   upcall = (director && (director->swig_get_self()==obj0));
   try {
     {
       try {
         if (upcall) {
-          result = ((UnaryFunction0D< float > const *)arg1)->UnaryFunction0D< float >::getName();
+          result = ((UnaryFunction0D<float > const *)arg1)->UnaryFunction0D<float >::getName();
         } else {
-          result = ((UnaryFunction0D< float > const *)arg1)->getName();
+          result = ((UnaryFunction0D<float > const *)arg1)->getName();
         }
       }
       //    catch (Swig::DirectorTypeMismatch&) {
@@ -61543,7 +62748,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DFloat___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D< float > *arg1 = (UnaryFunction0D< float > *) 0 ;
+  UnaryFunction0D<float > *arg1 = (UnaryFunction0D<float > *) 0 ;
   Interface0DIterator *arg2 = 0 ;
   float result;
   void *argp1 = 0 ;
@@ -61556,11 +62761,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DFloat___call__(PyObject *SWIGUNUSEDPAR
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction0DFloat___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_float_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTfloat_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DFloat___call__" "', argument " "1"" of type '" "UnaryFunction0D< float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DFloat___call__" "', argument " "1"" of type '" "UnaryFunction0D<float > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D< float > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D<float > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction0DFloat___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
@@ -61575,7 +62780,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DFloat___call__(PyObject *SWIGUNUSEDPAR
     {
       try {
         if (upcall) {
-          result = (float)(arg1)->UnaryFunction0D< float >::operator ()(*arg2);
+          result = (float)(arg1)->UnaryFunction0D<float >::operator ()(*arg2);
         } else {
           result = (float)(arg1)->operator ()(*arg2);
         }
@@ -61599,17 +62804,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DFloat(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D< float > *arg1 = (UnaryFunction0D< float > *) 0 ;
+  UnaryFunction0D<float > *arg1 = (UnaryFunction0D<float > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction0DFloat",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_float_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTfloat_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DFloat" "', argument " "1"" of type '" "UnaryFunction0D< float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DFloat" "', argument " "1"" of type '" "UnaryFunction0D<float > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D< float > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D<float > * >(argp1);
   {
     Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
@@ -61624,15 +62829,15 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction0DFloat_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DT_float_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DTfloat_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_UnaryFunction0DDouble(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  UnaryFunction0D< double > *result = 0 ;
+  UnaryFunction0D<double > *result = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction0DDouble",&obj0)) SWIG_fail;
@@ -61641,9 +62846,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DDouble(PyObject *SWIGUNUSEDPARM(se
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction0D< double > *)new SwigDirector_UnaryFunction0DDouble(arg1); 
+        result = (UnaryFunction0D<double > *)new SwigDirector_UnaryFunction0DDouble(arg1); 
       } else {
-        result = (UnaryFunction0D< double > *)new UnaryFunction0D< double >(); 
+        result = (UnaryFunction0D<double > *)new UnaryFunction0D<double >(); 
       }
       
     }
@@ -61654,7 +62859,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DDouble(PyObject *SWIGUNUSEDPARM(se
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DT_double_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DTdouble_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -61663,17 +62868,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction0DDouble(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D< double > *arg1 = (UnaryFunction0D< double > *) 0 ;
+  UnaryFunction0D<double > *arg1 = (UnaryFunction0D<double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction0DDouble",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_double_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTdouble_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DDouble" "', argument " "1"" of type '" "UnaryFunction0D< double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DDouble" "', argument " "1"" of type '" "UnaryFunction0D<double > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D< double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D<double > * >(argp1);
   {
     try {
       delete arg1;
@@ -61695,7 +62900,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DDouble_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D< double > *arg1 = (UnaryFunction0D< double > *) 0 ;
+  UnaryFunction0D<double > *arg1 = (UnaryFunction0D<double > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -61704,20 +62909,20 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DDouble_getName(PyObject *SWIGUNUSEDPAR
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction0DDouble_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_double_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTdouble_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DDouble_getName" "', argument " "1"" of type '" "UnaryFunction0D< double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DDouble_getName" "', argument " "1"" of type '" "UnaryFunction0D<double > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D< double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D<double > * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
   upcall = (director && (director->swig_get_self()==obj0));
   try {
     {
       try {
         if (upcall) {
-          result = ((UnaryFunction0D< double > const *)arg1)->UnaryFunction0D< double >::getName();
+          result = ((UnaryFunction0D<double > const *)arg1)->UnaryFunction0D<double >::getName();
         } else {
-          result = ((UnaryFunction0D< double > const *)arg1)->getName();
+          result = ((UnaryFunction0D<double > const *)arg1)->getName();
         }
       }
       //    catch (Swig::DirectorTypeMismatch&) {
@@ -61739,7 +62944,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DDouble___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D< double > *arg1 = (UnaryFunction0D< double > *) 0 ;
+  UnaryFunction0D<double > *arg1 = (UnaryFunction0D<double > *) 0 ;
   Interface0DIterator *arg2 = 0 ;
   double result;
   void *argp1 = 0 ;
@@ -61752,11 +62957,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DDouble___call__(PyObject *SWIGUNUSEDPA
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction0DDouble___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_double_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTdouble_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DDouble___call__" "', argument " "1"" of type '" "UnaryFunction0D< double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DDouble___call__" "', argument " "1"" of type '" "UnaryFunction0D<double > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D< double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D<double > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction0DDouble___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
@@ -61771,7 +62976,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DDouble___call__(PyObject *SWIGUNUSEDPA
     {
       try {
         if (upcall) {
-          result = (double)(arg1)->UnaryFunction0D< double >::operator ()(*arg2);
+          result = (double)(arg1)->UnaryFunction0D<double >::operator ()(*arg2);
         } else {
           result = (double)(arg1)->operator ()(*arg2);
         }
@@ -61795,17 +63000,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DDouble(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D< double > *arg1 = (UnaryFunction0D< double > *) 0 ;
+  UnaryFunction0D<double > *arg1 = (UnaryFunction0D<double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction0DDouble",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_double_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTdouble_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DDouble" "', argument " "1"" of type '" "UnaryFunction0D< double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DDouble" "', argument " "1"" of type '" "UnaryFunction0D<double > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D< double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D<double > * >(argp1);
   {
     Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
@@ -61820,15 +63025,15 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction0DDouble_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DT_double_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DTdouble_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_UnaryFunction0DVec2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  UnaryFunction0D< Geometry::Vec2f > *result = 0 ;
+  UnaryFunction0D<Geometry::Vec2f > *result = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction0DVec2f",&obj0)) SWIG_fail;
@@ -61837,9 +63042,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DVec2f(PyObject *SWIGUNUSEDPARM(sel
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction0D< Geometry::Vec2f > *)new SwigDirector_UnaryFunction0DVec2f(arg1); 
+        result = (UnaryFunction0D<Geometry::Vec2f > *)new SwigDirector_UnaryFunction0DVec2f(arg1); 
       } else {
-        result = (UnaryFunction0D< Geometry::Vec2f > *)new UnaryFunction0D< Geometry::Vec2f >(); 
+        result = (UnaryFunction0D<Geometry::Vec2f > *)new UnaryFunction0D<Geometry::Vec2f >(); 
       }
       
     }
@@ -61850,7 +63055,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DVec2f(PyObject *SWIGUNUSEDPARM(sel
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DT_VecMat__Vec2T_float_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -61859,17 +63064,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction0DVec2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D< Geometry::Vec2f > *arg1 = (UnaryFunction0D< Geometry::Vec2f > *) 0 ;
+  UnaryFunction0D<Geometry::Vec2f > *arg1 = (UnaryFunction0D<Geometry::Vec2f > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction0DVec2f",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_VecMat__Vec2T_float_t_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DVec2f" "', argument " "1"" of type '" "UnaryFunction0D< Geometry::Vec2f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DVec2f" "', argument " "1"" of type '" "UnaryFunction0D<Geometry::Vec2f > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D< Geometry::Vec2f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D<Geometry::Vec2f > * >(argp1);
   {
     try {
       delete arg1;
@@ -61891,7 +63096,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DVec2f_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D< Geometry::Vec2f > *arg1 = (UnaryFunction0D< Geometry::Vec2f > *) 0 ;
+  UnaryFunction0D<Geometry::Vec2f > *arg1 = (UnaryFunction0D<Geometry::Vec2f > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -61900,20 +63105,20 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DVec2f_getName(PyObject *SWIGUNUSEDPARM
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction0DVec2f_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_VecMat__Vec2T_float_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVec2f_getName" "', argument " "1"" of type '" "UnaryFunction0D< Geometry::Vec2f > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVec2f_getName" "', argument " "1"" of type '" "UnaryFunction0D<Geometry::Vec2f > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D< Geometry::Vec2f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D<Geometry::Vec2f > * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
   upcall = (director && (director->swig_get_self()==obj0));
   try {
     {
       try {
         if (upcall) {
-          result = ((UnaryFunction0D< Geometry::Vec2f > const *)arg1)->UnaryFunction0D< VecMat::Vec2< float > >::getName();
+          result = ((UnaryFunction0D<Geometry::Vec2f > const *)arg1)->UnaryFunction0D<VecMat::Vec2<float > >::getName();
         } else {
-          result = ((UnaryFunction0D< Geometry::Vec2f > const *)arg1)->getName();
+          result = ((UnaryFunction0D<Geometry::Vec2f > const *)arg1)->getName();
         }
       }
       //    catch (Swig::DirectorTypeMismatch&) {
@@ -61935,9 +63140,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DVec2f___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D< Geometry::Vec2f > *arg1 = (UnaryFunction0D< Geometry::Vec2f > *) 0 ;
+  UnaryFunction0D<Geometry::Vec2f > *arg1 = (UnaryFunction0D<Geometry::Vec2f > *) 0 ;
   Interface0DIterator *arg2 = 0 ;
-  VecMat::Vec2< float > result;
+  VecMat::Vec2<float > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -61948,11 +63153,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DVec2f___call__(PyObject *SWIGUNUSEDPAR
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction0DVec2f___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_VecMat__Vec2T_float_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVec2f___call__" "', argument " "1"" of type '" "UnaryFunction0D< Geometry::Vec2f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVec2f___call__" "', argument " "1"" of type '" "UnaryFunction0D<Geometry::Vec2f > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D< Geometry::Vec2f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D<Geometry::Vec2f > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction0DVec2f___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
@@ -61967,7 +63172,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DVec2f___call__(PyObject *SWIGUNUSEDPAR
     {
       try {
         if (upcall) {
-          result = (arg1)->UnaryFunction0D< VecMat::Vec2< float > >::operator ()(*arg2);
+          result = (arg1)->UnaryFunction0D<VecMat::Vec2<float > >::operator ()(*arg2);
         } else {
           result = (arg1)->operator ()(*arg2);
         }
@@ -61982,7 +63187,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DVec2f___call__(PyObject *SWIGUNUSEDPAR
   } catch (Swig::DirectorException&) {
     SWIG_fail;
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< float >(static_cast< const VecMat::Vec2< float >& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<float >(static_cast< const VecMat::Vec2<float >& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -61991,17 +63196,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DVec2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D< Geometry::Vec2f > *arg1 = (UnaryFunction0D< Geometry::Vec2f > *) 0 ;
+  UnaryFunction0D<Geometry::Vec2f > *arg1 = (UnaryFunction0D<Geometry::Vec2f > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction0DVec2f",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_VecMat__Vec2T_float_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DVec2f" "', argument " "1"" of type '" "UnaryFunction0D< Geometry::Vec2f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DVec2f" "', argument " "1"" of type '" "UnaryFunction0D<Geometry::Vec2f > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D< Geometry::Vec2f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D<Geometry::Vec2f > * >(argp1);
   {
     Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
@@ -62016,15 +63221,15 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction0DVec2f_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DT_VecMat__Vec2T_float_t_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_UnaryFunction0DVec3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  UnaryFunction0D< Geometry::Vec3f > *result = 0 ;
+  UnaryFunction0D<Geometry::Vec3f > *result = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction0DVec3f",&obj0)) SWIG_fail;
@@ -62033,9 +63238,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DVec3f(PyObject *SWIGUNUSEDPARM(sel
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction0D< Geometry::Vec3f > *)new SwigDirector_UnaryFunction0DVec3f(arg1); 
+        result = (UnaryFunction0D<Geometry::Vec3f > *)new SwigDirector_UnaryFunction0DVec3f(arg1); 
       } else {
-        result = (UnaryFunction0D< Geometry::Vec3f > *)new UnaryFunction0D< Geometry::Vec3f >(); 
+        result = (UnaryFunction0D<Geometry::Vec3f > *)new UnaryFunction0D<Geometry::Vec3f >(); 
       }
       
     }
@@ -62046,7 +63251,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DVec3f(PyObject *SWIGUNUSEDPARM(sel
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DT_VecMat__Vec3T_float_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -62055,17 +63260,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction0DVec3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D< Geometry::Vec3f > *arg1 = (UnaryFunction0D< Geometry::Vec3f > *) 0 ;
+  UnaryFunction0D<Geometry::Vec3f > *arg1 = (UnaryFunction0D<Geometry::Vec3f > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction0DVec3f",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_VecMat__Vec3T_float_t_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DVec3f" "', argument " "1"" of type '" "UnaryFunction0D< Geometry::Vec3f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DVec3f" "', argument " "1"" of type '" "UnaryFunction0D<Geometry::Vec3f > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D< Geometry::Vec3f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D<Geometry::Vec3f > * >(argp1);
   {
     try {
       delete arg1;
@@ -62087,7 +63292,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DVec3f_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D< Geometry::Vec3f > *arg1 = (UnaryFunction0D< Geometry::Vec3f > *) 0 ;
+  UnaryFunction0D<Geometry::Vec3f > *arg1 = (UnaryFunction0D<Geometry::Vec3f > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -62096,20 +63301,20 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DVec3f_getName(PyObject *SWIGUNUSEDPARM
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction0DVec3f_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_VecMat__Vec3T_float_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVec3f_getName" "', argument " "1"" of type '" "UnaryFunction0D< Geometry::Vec3f > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVec3f_getName" "', argument " "1"" of type '" "UnaryFunction0D<Geometry::Vec3f > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D< Geometry::Vec3f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D<Geometry::Vec3f > * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
   upcall = (director && (director->swig_get_self()==obj0));
   try {
     {
       try {
         if (upcall) {
-          result = ((UnaryFunction0D< Geometry::Vec3f > const *)arg1)->UnaryFunction0D< VecMat::Vec3< float > >::getName();
+          result = ((UnaryFunction0D<Geometry::Vec3f > const *)arg1)->UnaryFunction0D<VecMat::Vec3<float > >::getName();
         } else {
-          result = ((UnaryFunction0D< Geometry::Vec3f > const *)arg1)->getName();
+          result = ((UnaryFunction0D<Geometry::Vec3f > const *)arg1)->getName();
         }
       }
       //    catch (Swig::DirectorTypeMismatch&) {
@@ -62131,9 +63336,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DVec3f___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D< Geometry::Vec3f > *arg1 = (UnaryFunction0D< Geometry::Vec3f > *) 0 ;
+  UnaryFunction0D<Geometry::Vec3f > *arg1 = (UnaryFunction0D<Geometry::Vec3f > *) 0 ;
   Interface0DIterator *arg2 = 0 ;
-  VecMat::Vec3< float > result;
+  VecMat::Vec3<float > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -62144,11 +63349,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DVec3f___call__(PyObject *SWIGUNUSEDPAR
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction0DVec3f___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_VecMat__Vec3T_float_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVec3f___call__" "', argument " "1"" of type '" "UnaryFunction0D< Geometry::Vec3f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVec3f___call__" "', argument " "1"" of type '" "UnaryFunction0D<Geometry::Vec3f > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D< Geometry::Vec3f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D<Geometry::Vec3f > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction0DVec3f___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
@@ -62163,7 +63368,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DVec3f___call__(PyObject *SWIGUNUSEDPAR
     {
       try {
         if (upcall) {
-          result = (arg1)->UnaryFunction0D< VecMat::Vec3< float > >::operator ()(*arg2);
+          result = (arg1)->UnaryFunction0D<VecMat::Vec3<float > >::operator ()(*arg2);
         } else {
           result = (arg1)->operator ()(*arg2);
         }
@@ -62178,7 +63383,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DVec3f___call__(PyObject *SWIGUNUSEDPAR
   } catch (Swig::DirectorException&) {
     SWIG_fail;
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< float >(static_cast< const VecMat::Vec3< float >& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<float >(static_cast< const VecMat::Vec3<float >& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -62187,17 +63392,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DVec3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D< Geometry::Vec3f > *arg1 = (UnaryFunction0D< Geometry::Vec3f > *) 0 ;
+  UnaryFunction0D<Geometry::Vec3f > *arg1 = (UnaryFunction0D<Geometry::Vec3f > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction0DVec3f",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_VecMat__Vec3T_float_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DVec3f" "', argument " "1"" of type '" "UnaryFunction0D< Geometry::Vec3f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DVec3f" "', argument " "1"" of type '" "UnaryFunction0D<Geometry::Vec3f > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D< Geometry::Vec3f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D<Geometry::Vec3f > * >(argp1);
   {
     Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
@@ -62212,15 +63417,15 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction0DVec3f_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DT_VecMat__Vec3T_float_t_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_UnaryFunction0DId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  UnaryFunction0D< Id > *result = 0 ;
+  UnaryFunction0D<Id > *result = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction0DId",&obj0)) SWIG_fail;
@@ -62229,9 +63434,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DId(PyObject *SWIGUNUSEDPARM(self),
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction0D< Id > *)new SwigDirector_UnaryFunction0DId(arg1); 
+        result = (UnaryFunction0D<Id > *)new SwigDirector_UnaryFunction0DId(arg1); 
       } else {
-        result = (UnaryFunction0D< Id > *)new UnaryFunction0D< Id >(); 
+        result = (UnaryFunction0D<Id > *)new UnaryFunction0D<Id >(); 
       }
       
     }
@@ -62242,7 +63447,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DId(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DT_Id_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DTId_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -62251,17 +63456,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction0DId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D< Id > *arg1 = (UnaryFunction0D< Id > *) 0 ;
+  UnaryFunction0D<Id > *arg1 = (UnaryFunction0D<Id > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction0DId",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_Id_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTId_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DId" "', argument " "1"" of type '" "UnaryFunction0D< Id > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DId" "', argument " "1"" of type '" "UnaryFunction0D<Id > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D< Id > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D<Id > * >(argp1);
   {
     try {
       delete arg1;
@@ -62283,7 +63488,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DId_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D< Id > *arg1 = (UnaryFunction0D< Id > *) 0 ;
+  UnaryFunction0D<Id > *arg1 = (UnaryFunction0D<Id > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -62292,20 +63497,20 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DId_getName(PyObject *SWIGUNUSEDPARM(se
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction0DId_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_Id_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTId_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DId_getName" "', argument " "1"" of type '" "UnaryFunction0D< Id > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DId_getName" "', argument " "1"" of type '" "UnaryFunction0D<Id > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D< Id > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D<Id > * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
   upcall = (director && (director->swig_get_self()==obj0));
   try {
     {
       try {
         if (upcall) {
-          result = ((UnaryFunction0D< Id > const *)arg1)->UnaryFunction0D< Id >::getName();
+          result = ((UnaryFunction0D<Id > const *)arg1)->UnaryFunction0D<Id >::getName();
         } else {
-          result = ((UnaryFunction0D< Id > const *)arg1)->getName();
+          result = ((UnaryFunction0D<Id > const *)arg1)->getName();
         }
       }
       //    catch (Swig::DirectorTypeMismatch&) {
@@ -62327,7 +63532,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DId___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D< Id > *arg1 = (UnaryFunction0D< Id > *) 0 ;
+  UnaryFunction0D<Id > *arg1 = (UnaryFunction0D<Id > *) 0 ;
   Interface0DIterator *arg2 = 0 ;
   Id result;
   void *argp1 = 0 ;
@@ -62340,11 +63545,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DId___call__(PyObject *SWIGUNUSEDPARM(s
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction0DId___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_Id_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTId_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DId___call__" "', argument " "1"" of type '" "UnaryFunction0D< Id > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DId___call__" "', argument " "1"" of type '" "UnaryFunction0D<Id > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D< Id > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D<Id > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction0DId___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
@@ -62359,7 +63564,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DId___call__(PyObject *SWIGUNUSEDPARM(s
     {
       try {
         if (upcall) {
-          result = (arg1)->UnaryFunction0D< Id >::operator ()(*arg2);
+          result = (arg1)->UnaryFunction0D<Id >::operator ()(*arg2);
         } else {
           result = (arg1)->operator ()(*arg2);
         }
@@ -62383,17 +63588,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D< Id > *arg1 = (UnaryFunction0D< Id > *) 0 ;
+  UnaryFunction0D<Id > *arg1 = (UnaryFunction0D<Id > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction0DId",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_Id_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTId_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DId" "', argument " "1"" of type '" "UnaryFunction0D< Id > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DId" "', argument " "1"" of type '" "UnaryFunction0D<Id > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D< Id > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D<Id > * >(argp1);
   {
     Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
@@ -62408,19 +63613,19 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction0DId_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DT_Id_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DTId_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_UnaryFunction0DViewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D< ViewShape * > *result = 0 ;
+  UnaryFunction0D<ViewShape * > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_UnaryFunction0DViewShape")) SWIG_fail;
   {
     try {
-      result = (UnaryFunction0D< ViewShape * > *)new UnaryFunction0D< ViewShape * >();
+      result = (UnaryFunction0D<ViewShape * > *)new UnaryFunction0D<ViewShape * >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -62429,7 +63634,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DViewShape(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DT_ViewShape_p_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DTViewShape_p_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -62438,17 +63643,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction0DViewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D< ViewShape * > *arg1 = (UnaryFunction0D< ViewShape * > *) 0 ;
+  UnaryFunction0D<ViewShape * > *arg1 = (UnaryFunction0D<ViewShape * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction0DViewShape",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_ViewShape_p_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTViewShape_p_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DViewShape" "', argument " "1"" of type '" "UnaryFunction0D< ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DViewShape" "', argument " "1"" of type '" "UnaryFunction0D<ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D< ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D<ViewShape * > * >(argp1);
   {
     try {
       delete arg1;
@@ -62470,21 +63675,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DViewShape_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D< ViewShape * > *arg1 = (UnaryFunction0D< ViewShape * > *) 0 ;
+  UnaryFunction0D<ViewShape * > *arg1 = (UnaryFunction0D<ViewShape * > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction0DViewShape_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_ViewShape_p_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTViewShape_p_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DViewShape_getName" "', argument " "1"" of type '" "UnaryFunction0D< ViewShape * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DViewShape_getName" "', argument " "1"" of type '" "UnaryFunction0D<ViewShape * > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D< ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D<ViewShape * > * >(argp1);
   {
     try {
-      result = ((UnaryFunction0D< ViewShape * > const *)arg1)->getName();
+      result = ((UnaryFunction0D<ViewShape * > const *)arg1)->getName();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -62502,7 +63707,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DViewShape___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D< ViewShape * > *arg1 = (UnaryFunction0D< ViewShape * > *) 0 ;
+  UnaryFunction0D<ViewShape * > *arg1 = (UnaryFunction0D<ViewShape * > *) 0 ;
   Interface0DIterator *arg2 = 0 ;
   ViewShape *result = 0 ;
   void *argp1 = 0 ;
@@ -62513,11 +63718,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DViewShape___call__(PyObject *SWIGUNUSE
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction0DViewShape___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_ViewShape_p_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTViewShape_p_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DViewShape___call__" "', argument " "1"" of type '" "UnaryFunction0D< ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DViewShape___call__" "', argument " "1"" of type '" "UnaryFunction0D<ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D< ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D<ViewShape * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction0DViewShape___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
@@ -62546,19 +63751,19 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction0DViewShape_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DT_ViewShape_p_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DTViewShape_p_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_UnaryFunction0DVectorViewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D< std::vector< ViewShape * > > *result = 0 ;
+  UnaryFunction0D<std::vector<ViewShape * > > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_UnaryFunction0DVectorViewShape")) SWIG_fail;
   {
     try {
-      result = (UnaryFunction0D< std::vector< ViewShape * > > *)new UnaryFunction0D< std::vector< ViewShape * > >();
+      result = (UnaryFunction0D<std::vector<ViewShape * > > *)new UnaryFunction0D<std::vector<ViewShape * > >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -62567,7 +63772,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DVectorViewShape(PyObject *SWIGUNUS
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -62576,17 +63781,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction0DVectorViewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D< std::vector< ViewShape * > > *arg1 = (UnaryFunction0D< std::vector< ViewShape * > > *) 0 ;
+  UnaryFunction0D<std::vector<ViewShape * > > *arg1 = (UnaryFunction0D<std::vector<ViewShape * > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction0DVectorViewShape",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DVectorViewShape" "', argument " "1"" of type '" "UnaryFunction0D< std::vector< ViewShape * > > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DVectorViewShape" "', argument " "1"" of type '" "UnaryFunction0D<std::vector<ViewShape * > > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D< std::vector< ViewShape * > > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D<std::vector<ViewShape * > > * >(argp1);
   {
     try {
       delete arg1;
@@ -62608,21 +63813,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DVectorViewShape_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D< std::vector< ViewShape * > > *arg1 = (UnaryFunction0D< std::vector< ViewShape * > > *) 0 ;
+  UnaryFunction0D<std::vector<ViewShape * > > *arg1 = (UnaryFunction0D<std::vector<ViewShape * > > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction0DVectorViewShape_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVectorViewShape_getName" "', argument " "1"" of type '" "UnaryFunction0D< std::vector< ViewShape * > > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVectorViewShape_getName" "', argument " "1"" of type '" "UnaryFunction0D<std::vector<ViewShape * > > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D< std::vector< ViewShape * > > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D<std::vector<ViewShape * > > * >(argp1);
   {
     try {
-      result = ((UnaryFunction0D< std::vector< ViewShape * > > const *)arg1)->getName();
+      result = ((UnaryFunction0D<std::vector<ViewShape * > > const *)arg1)->getName();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -62640,9 +63845,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DVectorViewShape___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D< std::vector< ViewShape * > > *arg1 = (UnaryFunction0D< std::vector< ViewShape * > > *) 0 ;
+  UnaryFunction0D<std::vector<ViewShape * > > *arg1 = (UnaryFunction0D<std::vector<ViewShape * > > *) 0 ;
   Interface0DIterator *arg2 = 0 ;
-  std::vector< ViewShape *,std::allocator< ViewShape * > > result;
+  std::vector<ViewShape *,std::allocator<ViewShape * > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -62651,11 +63856,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DVectorViewShape___call__(PyObject *SWI
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction0DVectorViewShape___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVectorViewShape___call__" "', argument " "1"" of type '" "UnaryFunction0D< std::vector< ViewShape * > > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVectorViewShape___call__" "', argument " "1"" of type '" "UnaryFunction0D<std::vector<ViewShape * > > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D< std::vector< ViewShape * > > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D<std::vector<ViewShape * > > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction0DVectorViewShape___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
@@ -62675,7 +63880,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DVectorViewShape___call__(PyObject *SWI
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = swig::from(static_cast< std::vector<ViewShape*,std::allocator< ViewShape * > > >(result));
+  resultobj = swig::from(static_cast< std::vector<ViewShape*,std::allocator<ViewShape * > > >(result));
   return resultobj;
 fail:
   return NULL;
@@ -62684,8 +63889,8 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction0DVectorViewShape_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
@@ -62822,7 +64027,7 @@ fail:
 
 SWIGINTERN PyObject *GetXF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetXF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -62960,7 +64165,7 @@ fail:
 
 SWIGINTERN PyObject *GetYF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetYF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -63098,7 +64303,7 @@ fail:
 
 SWIGINTERN PyObject *GetZF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetZF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -63236,7 +64441,7 @@ fail:
 
 SWIGINTERN PyObject *GetProjectedXF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetProjectedXF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -63374,7 +64579,7 @@ fail:
 
 SWIGINTERN PyObject *GetProjectedYF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetProjectedYF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -63512,7 +64717,7 @@ fail:
 
 SWIGINTERN PyObject *GetProjectedZF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetProjectedZF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -63650,7 +64855,7 @@ fail:
 
 SWIGINTERN PyObject *GetCurvilinearAbscissaF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetCurvilinearAbscissaF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -63788,7 +64993,7 @@ fail:
 
 SWIGINTERN PyObject *GetParameterF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetParameterF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -63862,7 +65067,7 @@ SWIGINTERN PyObject *_wrap_VertexOrientation2DF0D___call__(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -63926,7 +65131,7 @@ fail:
 
 SWIGINTERN PyObject *VertexOrientation2DF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__VertexOrientation2DF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -64000,7 +65205,7 @@ SWIGINTERN PyObject *_wrap_VertexOrientation3DF0D___call__(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -64064,7 +65269,7 @@ fail:
 
 SWIGINTERN PyObject *VertexOrientation3DF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__VertexOrientation3DF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -64202,7 +65407,7 @@ fail:
 
 SWIGINTERN PyObject *Curvature2DAngleF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__Curvature2DAngleF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -64340,7 +65545,7 @@ fail:
 
 SWIGINTERN PyObject *ZDiscontinuityF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__ZDiscontinuityF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -64414,7 +65619,7 @@ SWIGINTERN PyObject *_wrap_Normal2DF0D___call__(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -64478,7 +65683,7 @@ fail:
 
 SWIGINTERN PyObject *Normal2DF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__Normal2DF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -64616,7 +65821,7 @@ fail:
 
 SWIGINTERN PyObject *MaterialF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__MaterialF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -64754,7 +65959,7 @@ fail:
 
 SWIGINTERN PyObject *ShapeIdF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__ShapeIdF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -64892,7 +66097,7 @@ fail:
 
 SWIGINTERN PyObject *QuantitativeInvisibilityF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__QuantitativeInvisibilityF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -65030,7 +66235,7 @@ fail:
 
 SWIGINTERN PyObject *CurveNatureF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__CurveNatureF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -65168,7 +66373,7 @@ fail:
 
 SWIGINTERN PyObject *GetShapeF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetShapeF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -65209,7 +66414,7 @@ SWIGINTERN PyObject *_wrap_GetOccludersF0D___call__(PyObject *SWIGUNUSEDPARM(sel
   PyObject *resultobj = 0;
   Functions0D::GetOccludersF0D *arg1 = (Functions0D::GetOccludersF0D *) 0 ;
   Interface0DIterator *arg2 = 0 ;
-  std::vector< ViewShape *,std::allocator< ViewShape * > > result;
+  std::vector<ViewShape *,std::allocator<ViewShape * > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -65242,7 +66447,7 @@ SWIGINTERN PyObject *_wrap_GetOccludersF0D___call__(PyObject *SWIGUNUSEDPARM(sel
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = swig::from(static_cast< std::vector<ViewShape*,std::allocator< ViewShape * > > >(result));
+  resultobj = swig::from(static_cast< std::vector<ViewShape*,std::allocator<ViewShape * > > >(result));
   return resultobj;
 fail:
   return NULL;
@@ -65306,7 +66511,7 @@ fail:
 
 SWIGINTERN PyObject *GetOccludersF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetOccludersF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -65444,7 +66649,7 @@ fail:
 
 SWIGINTERN PyObject *GetOccludeeF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetOccludeeF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -65499,7 +66704,7 @@ fail:
 SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVoid__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  UnaryFunction1D< void > *result = 0 ;
+  UnaryFunction1D<void > *result = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction1DVoid",&obj0)) SWIG_fail;
@@ -65508,9 +66713,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVoid__SWIG_0(PyObject *SWIGUNUSEDP
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction1D< void > *)new SwigDirector_UnaryFunction1DVoid(arg1); 
+        result = (UnaryFunction1D<void > *)new SwigDirector_UnaryFunction1DVoid(arg1); 
       } else {
-        result = (UnaryFunction1D< void > *)new UnaryFunction1D< void >(); 
+        result = (UnaryFunction1D<void > *)new UnaryFunction1D<void >(); 
       }
       
     }
@@ -65521,7 +66726,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVoid__SWIG_0(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DT_void_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTvoid_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -65532,7 +66737,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVoid__SWIG_1(PyObject *SWIGUNUSEDP
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
   IntegrationType arg2 ;
-  UnaryFunction1D< void > *result = 0 ;
+  UnaryFunction1D<void > *result = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
@@ -65549,9 +66754,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVoid__SWIG_1(PyObject *SWIGUNUSEDP
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction1D< void > *)new SwigDirector_UnaryFunction1DVoid(arg1,arg2); 
+        result = (UnaryFunction1D<void > *)new SwigDirector_UnaryFunction1DVoid(arg1,arg2); 
       } else {
-        result = (UnaryFunction1D< void > *)new UnaryFunction1D< void >(arg2); 
+        result = (UnaryFunction1D<void > *)new UnaryFunction1D<void >(arg2); 
       }
       
     }
@@ -65562,7 +66767,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVoid__SWIG_1(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DT_void_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTvoid_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -65575,7 +66780,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVoid(PyObject *self, PyObject *arg
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -65601,27 +66806,24 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVoid(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DVoid'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    UnaryFunction1D< void >(PyObject *)\n"
-    "    UnaryFunction1D< void >(PyObject *,IntegrationType)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DVoid'.\n  Possible C/C++ prototypes are:\n    UnaryFunction1D<(void)>(PyObject *)\n    UnaryFunction1D<(void)>(PyObject *,IntegrationType)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction1DVoid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D< void > *arg1 = (UnaryFunction1D< void > *) 0 ;
+  UnaryFunction1D<void > *arg1 = (UnaryFunction1D<void > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction1DVoid",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_void_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTvoid_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DVoid" "', argument " "1"" of type '" "UnaryFunction1D< void > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DVoid" "', argument " "1"" of type '" "UnaryFunction1D<void > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D< void > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D<void > * >(argp1);
   {
     try {
       delete arg1;
@@ -65643,7 +66845,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVoid_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D< void > *arg1 = (UnaryFunction1D< void > *) 0 ;
+  UnaryFunction1D<void > *arg1 = (UnaryFunction1D<void > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -65652,20 +66854,20 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVoid_getName(PyObject *SWIGUNUSEDPARM(
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DVoid_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_void_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTvoid_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVoid_getName" "', argument " "1"" of type '" "UnaryFunction1D< void > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVoid_getName" "', argument " "1"" of type '" "UnaryFunction1D<void > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D< void > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D<void > * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
   upcall = (director && (director->swig_get_self()==obj0));
   try {
     {
       try {
         if (upcall) {
-          result = ((UnaryFunction1D< void > const *)arg1)->UnaryFunction1D< void >::getName();
+          result = ((UnaryFunction1D<void > const *)arg1)->UnaryFunction1D<void >::getName();
         } else {
-          result = ((UnaryFunction1D< void > const *)arg1)->getName();
+          result = ((UnaryFunction1D<void > const *)arg1)->getName();
         }
       }
       //    catch (Swig::DirectorTypeMismatch&) {
@@ -65687,7 +66889,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVoid___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D< void > *arg1 = (UnaryFunction1D< void > *) 0 ;
+  UnaryFunction1D<void > *arg1 = (UnaryFunction1D<void > *) 0 ;
   Interface1D *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -65699,11 +66901,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVoid___call__(PyObject *SWIGUNUSEDPARM
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DVoid___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_void_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTvoid_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVoid___call__" "', argument " "1"" of type '" "UnaryFunction1D< void > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVoid___call__" "', argument " "1"" of type '" "UnaryFunction1D<void > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D< void > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D<void > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction1DVoid___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
@@ -65718,7 +66920,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVoid___call__(PyObject *SWIGUNUSEDPARM
     {
       try {
         if (upcall) {
-          (arg1)->UnaryFunction1D< void >::operator ()(*arg2);
+          (arg1)->UnaryFunction1D<void >::operator ()(*arg2);
         } else {
           (arg1)->operator ()(*arg2);
         }
@@ -65742,7 +66944,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVoid_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D< void > *arg1 = (UnaryFunction1D< void > *) 0 ;
+  UnaryFunction1D<void > *arg1 = (UnaryFunction1D<void > *) 0 ;
   IntegrationType arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -65752,11 +66954,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVoid_setIntegrationType(PyObject *SWIG
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DVoid_setIntegrationType",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_void_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTvoid_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVoid_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D< void > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVoid_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<void > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D< void > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D<void > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "UnaryFunction1DVoid_setIntegrationType" "', argument " "2"" of type '" "IntegrationType""'");
@@ -65782,21 +66984,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVoid_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D< void > *arg1 = (UnaryFunction1D< void > *) 0 ;
+  UnaryFunction1D<void > *arg1 = (UnaryFunction1D<void > *) 0 ;
   IntegrationType result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DVoid_getIntegrationType",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_void_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTvoid_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVoid_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D< void > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVoid_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<void > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D< void > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D<void > * >(argp1);
   {
     try {
-      result = (IntegrationType)((UnaryFunction1D< void > const *)arg1)->getIntegrationType();
+      result = (IntegrationType)((UnaryFunction1D<void > const *)arg1)->getIntegrationType();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -65814,17 +67016,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_disown_UnaryFunction1DVoid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D< void > *arg1 = (UnaryFunction1D< void > *) 0 ;
+  UnaryFunction1D<void > *arg1 = (UnaryFunction1D<void > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction1DVoid",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_void_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTvoid_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction1DVoid" "', argument " "1"" of type '" "UnaryFunction1D< void > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction1DVoid" "', argument " "1"" of type '" "UnaryFunction1D<void > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D< void > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D<void > * >(argp1);
   {
     Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
@@ -65839,15 +67041,15 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction1DVoid_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DT_void_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DTvoid_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_UnaryFunction1DUnsigned__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  UnaryFunction1D< unsigned int > *result = 0 ;
+  UnaryFunction1D<unsigned int > *result = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction1DUnsigned",&obj0)) SWIG_fail;
@@ -65856,9 +67058,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DUnsigned__SWIG_0(PyObject *SWIGUNU
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction1D< unsigned int > *)new SwigDirector_UnaryFunction1DUnsigned(arg1); 
+        result = (UnaryFunction1D<unsigned int > *)new SwigDirector_UnaryFunction1DUnsigned(arg1); 
       } else {
-        result = (UnaryFunction1D< unsigned int > *)new UnaryFunction1D< unsigned int >(); 
+        result = (UnaryFunction1D<unsigned int > *)new UnaryFunction1D<unsigned int >(); 
       }
       
     }
@@ -65869,7 +67071,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DUnsigned__SWIG_0(PyObject *SWIGUNU
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DT_unsigned_int_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTunsigned_int_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -65880,7 +67082,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DUnsigned__SWIG_1(PyObject *SWIGUNU
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
   IntegrationType arg2 ;
-  UnaryFunction1D< unsigned int > *result = 0 ;
+  UnaryFunction1D<unsigned int > *result = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
@@ -65897,9 +67099,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DUnsigned__SWIG_1(PyObject *SWIGUNU
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction1D< unsigned int > *)new SwigDirector_UnaryFunction1DUnsigned(arg1,arg2); 
+        result = (UnaryFunction1D<unsigned int > *)new SwigDirector_UnaryFunction1DUnsigned(arg1,arg2); 
       } else {
-        result = (UnaryFunction1D< unsigned int > *)new UnaryFunction1D< unsigned int >(arg2); 
+        result = (UnaryFunction1D<unsigned int > *)new UnaryFunction1D<unsigned int >(arg2); 
       }
       
     }
@@ -65910,7 +67112,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DUnsigned__SWIG_1(PyObject *SWIGUNU
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DT_unsigned_int_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTunsigned_int_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -65923,7 +67125,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DUnsigned(PyObject *self, PyObject
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -65949,27 +67151,24 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DUnsigned(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DUnsigned'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    UnaryFunction1D< unsigned int >(PyObject *)\n"
-    "    UnaryFunction1D< unsigned int >(PyObject *,IntegrationType)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DUnsigned'.\n  Possible C/C++ prototypes are:\n    UnaryFunction1D<(unsigned int)>(PyObject *)\n    UnaryFunction1D<(unsigned int)>(PyObject *,IntegrationType)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction1DUnsigned(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D< unsigned int > *arg1 = (UnaryFunction1D< unsigned int > *) 0 ;
+  UnaryFunction1D<unsigned int > *arg1 = (UnaryFunction1D<unsigned int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction1DUnsigned",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_unsigned_int_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTunsigned_int_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DUnsigned" "', argument " "1"" of type '" "UnaryFunction1D< unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DUnsigned" "', argument " "1"" of type '" "UnaryFunction1D<unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D< unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D<unsigned int > * >(argp1);
   {
     try {
       delete arg1;
@@ -65991,7 +67190,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DUnsigned_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D< unsigned int > *arg1 = (UnaryFunction1D< unsigned int > *) 0 ;
+  UnaryFunction1D<unsigned int > *arg1 = (UnaryFunction1D<unsigned int > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -66000,20 +67199,20 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DUnsigned_getName(PyObject *SWIGUNUSEDP
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DUnsigned_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_unsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTunsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DUnsigned_getName" "', argument " "1"" of type '" "UnaryFunction1D< unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DUnsigned_getName" "', argument " "1"" of type '" "UnaryFunction1D<unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D< unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D<unsigned int > * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
   upcall = (director && (director->swig_get_self()==obj0));
   try {
     {
       try {
         if (upcall) {
-          result = ((UnaryFunction1D< unsigned int > const *)arg1)->UnaryFunction1D< unsigned int >::getName();
+          result = ((UnaryFunction1D<unsigned int > const *)arg1)->UnaryFunction1D<unsigned int >::getName();
         } else {
-          result = ((UnaryFunction1D< unsigned int > const *)arg1)->getName();
+          result = ((UnaryFunction1D<unsigned int > const *)arg1)->getName();
         }
       }
       //    catch (Swig::DirectorTypeMismatch&) {
@@ -66035,7 +67234,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DUnsigned___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D< unsigned int > *arg1 = (UnaryFunction1D< unsigned int > *) 0 ;
+  UnaryFunction1D<unsigned int > *arg1 = (UnaryFunction1D<unsigned int > *) 0 ;
   Interface1D *arg2 = 0 ;
   unsigned int result;
   void *argp1 = 0 ;
@@ -66048,11 +67247,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DUnsigned___call__(PyObject *SWIGUNUSED
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DUnsigned___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_unsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTunsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DUnsigned___call__" "', argument " "1"" of type '" "UnaryFunction1D< unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DUnsigned___call__" "', argument " "1"" of type '" "UnaryFunction1D<unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D< unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D<unsigned int > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction1DUnsigned___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
@@ -66067,7 +67266,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DUnsigned___call__(PyObject *SWIGUNUSED
     {
       try {
         if (upcall) {
-          result = (unsigned int)(arg1)->UnaryFunction1D< unsigned int >::operator ()(*arg2);
+          result = (unsigned int)(arg1)->UnaryFunction1D<unsigned int >::operator ()(*arg2);
         } else {
           result = (unsigned int)(arg1)->operator ()(*arg2);
         }
@@ -66091,7 +67290,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DUnsigned_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D< unsigned int > *arg1 = (UnaryFunction1D< unsigned int > *) 0 ;
+  UnaryFunction1D<unsigned int > *arg1 = (UnaryFunction1D<unsigned int > *) 0 ;
   IntegrationType arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -66101,11 +67300,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DUnsigned_setIntegrationType(PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DUnsigned_setIntegrationType",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_unsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTunsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DUnsigned_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D< unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DUnsigned_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D< unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D<unsigned int > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "UnaryFunction1DUnsigned_setIntegrationType" "', argument " "2"" of type '" "IntegrationType""'");
@@ -66131,21 +67330,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DUnsigned_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D< unsigned int > *arg1 = (UnaryFunction1D< unsigned int > *) 0 ;
+  UnaryFunction1D<unsigned int > *arg1 = (UnaryFunction1D<unsigned int > *) 0 ;
   IntegrationType result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DUnsigned_getIntegrationType",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_unsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTunsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DUnsigned_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D< unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DUnsigned_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D< unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D<unsigned int > * >(argp1);
   {
     try {
-      result = (IntegrationType)((UnaryFunction1D< unsigned int > const *)arg1)->getIntegrationType();
+      result = (IntegrationType)((UnaryFunction1D<unsigned int > const *)arg1)->getIntegrationType();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -66163,17 +67362,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_disown_UnaryFunction1DUnsigned(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D< unsigned int > *arg1 = (UnaryFunction1D< unsigned int > *) 0 ;
+  UnaryFunction1D<unsigned int > *arg1 = (UnaryFunction1D<unsigned int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction1DUnsigned",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_unsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTunsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction1DUnsigned" "', argument " "1"" of type '" "UnaryFunction1D< unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction1DUnsigned" "', argument " "1"" of type '" "UnaryFunction1D<unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D< unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D<unsigned int > * >(argp1);
   {
     Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
@@ -66188,15 +67387,15 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction1DUnsigned_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DT_unsigned_int_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DTunsigned_int_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_UnaryFunction1DFloat__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  UnaryFunction1D< float > *result = 0 ;
+  UnaryFunction1D<float > *result = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction1DFloat",&obj0)) SWIG_fail;
@@ -66205,9 +67404,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DFloat__SWIG_0(PyObject *SWIGUNUSED
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction1D< float > *)new SwigDirector_UnaryFunction1DFloat(arg1); 
+        result = (UnaryFunction1D<float > *)new SwigDirector_UnaryFunction1DFloat(arg1); 
       } else {
-        result = (UnaryFunction1D< float > *)new UnaryFunction1D< float >(); 
+        result = (UnaryFunction1D<float > *)new UnaryFunction1D<float >(); 
       }
       
     }
@@ -66218,7 +67417,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DFloat__SWIG_0(PyObject *SWIGUNUSED
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DT_float_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTfloat_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -66229,7 +67428,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DFloat__SWIG_1(PyObject *SWIGUNUSED
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
   IntegrationType arg2 ;
-  UnaryFunction1D< float > *result = 0 ;
+  UnaryFunction1D<float > *result = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
@@ -66246,9 +67445,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DFloat__SWIG_1(PyObject *SWIGUNUSED
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction1D< float > *)new SwigDirector_UnaryFunction1DFloat(arg1,arg2); 
+        result = (UnaryFunction1D<float > *)new SwigDirector_UnaryFunction1DFloat(arg1,arg2); 
       } else {
-        result = (UnaryFunction1D< float > *)new UnaryFunction1D< float >(arg2); 
+        result = (UnaryFunction1D<float > *)new UnaryFunction1D<float >(arg2); 
       }
       
     }
@@ -66259,7 +67458,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DFloat__SWIG_1(PyObject *SWIGUNUSED
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DT_float_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTfloat_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -66272,7 +67471,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DFloat(PyObject *self, PyObject *ar
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -66298,27 +67497,24 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DFloat(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DFloat'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    UnaryFunction1D< float >(PyObject *)\n"
-    "    UnaryFunction1D< float >(PyObject *,IntegrationType)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DFloat'.\n  Possible C/C++ prototypes are:\n    UnaryFunction1D<(float)>(PyObject *)\n    UnaryFunction1D<(float)>(PyObject *,IntegrationType)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction1DFloat(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D< float > *arg1 = (UnaryFunction1D< float > *) 0 ;
+  UnaryFunction1D<float > *arg1 = (UnaryFunction1D<float > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction1DFloat",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_float_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTfloat_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DFloat" "', argument " "1"" of type '" "UnaryFunction1D< float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DFloat" "', argument " "1"" of type '" "UnaryFunction1D<float > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D< float > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D<float > * >(argp1);
   {
     try {
       delete arg1;
@@ -66340,7 +67536,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DFloat_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D< float > *arg1 = (UnaryFunction1D< float > *) 0 ;
+  UnaryFunction1D<float > *arg1 = (UnaryFunction1D<float > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -66349,20 +67545,20 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DFloat_getName(PyObject *SWIGUNUSEDPARM
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DFloat_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_float_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTfloat_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DFloat_getName" "', argument " "1"" of type '" "UnaryFunction1D< float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DFloat_getName" "', argument " "1"" of type '" "UnaryFunction1D<float > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D< float > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D<float > * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
   upcall = (director && (director->swig_get_self()==obj0));
   try {
     {
       try {
         if (upcall) {
-          result = ((UnaryFunction1D< float > const *)arg1)->UnaryFunction1D< float >::getName();
+          result = ((UnaryFunction1D<float > const *)arg1)->UnaryFunction1D<float >::getName();
         } else {
-          result = ((UnaryFunction1D< float > const *)arg1)->getName();
+          result = ((UnaryFunction1D<float > const *)arg1)->getName();
         }
       }
       //    catch (Swig::DirectorTypeMismatch&) {
@@ -66384,7 +67580,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DFloat___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D< float > *arg1 = (UnaryFunction1D< float > *) 0 ;
+  UnaryFunction1D<float > *arg1 = (UnaryFunction1D<float > *) 0 ;
   Interface1D *arg2 = 0 ;
   float result;
   void *argp1 = 0 ;
@@ -66397,11 +67593,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DFloat___call__(PyObject *SWIGUNUSEDPAR
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DFloat___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_float_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTfloat_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DFloat___call__" "', argument " "1"" of type '" "UnaryFunction1D< float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DFloat___call__" "', argument " "1"" of type '" "UnaryFunction1D<float > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D< float > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D<float > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction1DFloat___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
@@ -66416,7 +67612,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DFloat___call__(PyObject *SWIGUNUSEDPAR
     {
       try {
         if (upcall) {
-          result = (float)(arg1)->UnaryFunction1D< float >::operator ()(*arg2);
+          result = (float)(arg1)->UnaryFunction1D<float >::operator ()(*arg2);
         } else {
           result = (float)(arg1)->operator ()(*arg2);
         }
@@ -66440,7 +67636,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DFloat_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D< float > *arg1 = (UnaryFunction1D< float > *) 0 ;
+  UnaryFunction1D<float > *arg1 = (UnaryFunction1D<float > *) 0 ;
   IntegrationType arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -66450,11 +67646,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DFloat_setIntegrationType(PyObject *SWI
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DFloat_setIntegrationType",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_float_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTfloat_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DFloat_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D< float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DFloat_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<float > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D< float > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D<float > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "UnaryFunction1DFloat_setIntegrationType" "', argument " "2"" of type '" "IntegrationType""'");
@@ -66480,21 +67676,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DFloat_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D< float > *arg1 = (UnaryFunction1D< float > *) 0 ;
+  UnaryFunction1D<float > *arg1 = (UnaryFunction1D<float > *) 0 ;
   IntegrationType result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DFloat_getIntegrationType",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_float_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTfloat_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DFloat_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D< float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DFloat_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<float > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D< float > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D<float > * >(argp1);
   {
     try {
-      result = (IntegrationType)((UnaryFunction1D< float > const *)arg1)->getIntegrationType();
+      result = (IntegrationType)((UnaryFunction1D<float > const *)arg1)->getIntegrationType();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -66512,17 +67708,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_disown_UnaryFunction1DFloat(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D< float > *arg1 = (UnaryFunction1D< float > *) 0 ;
+  UnaryFunction1D<float > *arg1 = (UnaryFunction1D<float > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction1DFloat",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_float_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTfloat_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction1DFloat" "', argument " "1"" of type '" "UnaryFunction1D< float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction1DFloat" "', argument " "1"" of type '" "UnaryFunction1D<float > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D< float > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D<float > * >(argp1);
   {
     Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
@@ -66537,15 +67733,15 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction1DFloat_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DT_float_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DTfloat_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_UnaryFunction1DDouble__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  UnaryFunction1D< double > *result = 0 ;
+  UnaryFunction1D<double > *result = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction1DDouble",&obj0)) SWIG_fail;
@@ -66554,9 +67750,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DDouble__SWIG_0(PyObject *SWIGUNUSE
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction1D< double > *)new SwigDirector_UnaryFunction1DDouble(arg1); 
+        result = (UnaryFunction1D<double > *)new SwigDirector_UnaryFunction1DDouble(arg1); 
       } else {
-        result = (UnaryFunction1D< double > *)new UnaryFunction1D< double >(); 
+        result = (UnaryFunction1D<double > *)new UnaryFunction1D<double >(); 
       }
       
     }
@@ -66567,7 +67763,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DDouble__SWIG_0(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DT_double_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTdouble_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -66578,7 +67774,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DDouble__SWIG_1(PyObject *SWIGUNUSE
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
   IntegrationType arg2 ;
-  UnaryFunction1D< double > *result = 0 ;
+  UnaryFunction1D<double > *result = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
@@ -66595,9 +67791,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DDouble__SWIG_1(PyObject *SWIGUNUSE
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction1D< double > *)new SwigDirector_UnaryFunction1DDouble(arg1,arg2); 
+        result = (UnaryFunction1D<double > *)new SwigDirector_UnaryFunction1DDouble(arg1,arg2); 
       } else {
-        result = (UnaryFunction1D< double > *)new UnaryFunction1D< double >(arg2); 
+        result = (UnaryFunction1D<double > *)new UnaryFunction1D<double >(arg2); 
       }
       
     }
@@ -66608,7 +67804,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DDouble__SWIG_1(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DT_double_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTdouble_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -66621,7 +67817,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DDouble(PyObject *self, PyObject *a
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -66647,27 +67843,24 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DDouble(PyObject *self, PyObject *a
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DDouble'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    UnaryFunction1D< double >(PyObject *)\n"
-    "    UnaryFunction1D< double >(PyObject *,IntegrationType)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DDouble'.\n  Possible C/C++ prototypes are:\n    UnaryFunction1D<(double)>(PyObject *)\n    UnaryFunction1D<(double)>(PyObject *,IntegrationType)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction1DDouble(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D< double > *arg1 = (UnaryFunction1D< double > *) 0 ;
+  UnaryFunction1D<double > *arg1 = (UnaryFunction1D<double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction1DDouble",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_double_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTdouble_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DDouble" "', argument " "1"" of type '" "UnaryFunction1D< double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DDouble" "', argument " "1"" of type '" "UnaryFunction1D<double > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D< double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D<double > * >(argp1);
   {
     try {
       delete arg1;
@@ -66689,7 +67882,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DDouble_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D< double > *arg1 = (UnaryFunction1D< double > *) 0 ;
+  UnaryFunction1D<double > *arg1 = (UnaryFunction1D<double > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -66698,20 +67891,20 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DDouble_getName(PyObject *SWIGUNUSEDPAR
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DDouble_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_double_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTdouble_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DDouble_getName" "', argument " "1"" of type '" "UnaryFunction1D< double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DDouble_getName" "', argument " "1"" of type '" "UnaryFunction1D<double > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D< double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D<double > * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
   upcall = (director && (director->swig_get_self()==obj0));
   try {
     {
       try {
         if (upcall) {
-          result = ((UnaryFunction1D< double > const *)arg1)->UnaryFunction1D< double >::getName();
+          result = ((UnaryFunction1D<double > const *)arg1)->UnaryFunction1D<double >::getName();
         } else {
-          result = ((UnaryFunction1D< double > const *)arg1)->getName();
+          result = ((UnaryFunction1D<double > const *)arg1)->getName();
         }
       }
       //    catch (Swig::DirectorTypeMismatch&) {
@@ -66733,7 +67926,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DDouble___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D< double > *arg1 = (UnaryFunction1D< double > *) 0 ;
+  UnaryFunction1D<double > *arg1 = (UnaryFunction1D<double > *) 0 ;
   Interface1D *arg2 = 0 ;
   double result;
   void *argp1 = 0 ;
@@ -66746,11 +67939,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DDouble___call__(PyObject *SWIGUNUSEDPA
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DDouble___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_double_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTdouble_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DDouble___call__" "', argument " "1"" of type '" "UnaryFunction1D< double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DDouble___call__" "', argument " "1"" of type '" "UnaryFunction1D<double > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D< double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D<double > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction1DDouble___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
@@ -66765,7 +67958,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DDouble___call__(PyObject *SWIGUNUSEDPA
     {
       try {
         if (upcall) {
-          result = (double)(arg1)->UnaryFunction1D< double >::operator ()(*arg2);
+          result = (double)(arg1)->UnaryFunction1D<double >::operator ()(*arg2);
         } else {
           result = (double)(arg1)->operator ()(*arg2);
         }
@@ -66789,7 +67982,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DDouble_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D< double > *arg1 = (UnaryFunction1D< double > *) 0 ;
+  UnaryFunction1D<double > *arg1 = (UnaryFunction1D<double > *) 0 ;
   IntegrationType arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -66799,11 +67992,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DDouble_setIntegrationType(PyObject *SW
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DDouble_setIntegrationType",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_double_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTdouble_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DDouble_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D< double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DDouble_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<double > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D< double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D<double > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "UnaryFunction1DDouble_setIntegrationType" "', argument " "2"" of type '" "IntegrationType""'");
@@ -66829,21 +68022,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DDouble_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D< double > *arg1 = (UnaryFunction1D< double > *) 0 ;
+  UnaryFunction1D<double > *arg1 = (UnaryFunction1D<double > *) 0 ;
   IntegrationType result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DDouble_getIntegrationType",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_double_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTdouble_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DDouble_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D< double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DDouble_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<double > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D< double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D<double > * >(argp1);
   {
     try {
-      result = (IntegrationType)((UnaryFunction1D< double > const *)arg1)->getIntegrationType();
+      result = (IntegrationType)((UnaryFunction1D<double > const *)arg1)->getIntegrationType();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -66861,17 +68054,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_disown_UnaryFunction1DDouble(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D< double > *arg1 = (UnaryFunction1D< double > *) 0 ;
+  UnaryFunction1D<double > *arg1 = (UnaryFunction1D<double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction1DDouble",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_double_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTdouble_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction1DDouble" "', argument " "1"" of type '" "UnaryFunction1D< double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction1DDouble" "', argument " "1"" of type '" "UnaryFunction1D<double > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D< double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D<double > * >(argp1);
   {
     Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
@@ -66886,15 +68079,15 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction1DDouble_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DT_double_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DTdouble_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec2f__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  UnaryFunction1D< Geometry::Vec2f > *result = 0 ;
+  UnaryFunction1D<Geometry::Vec2f > *result = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction1DVec2f",&obj0)) SWIG_fail;
@@ -66903,9 +68096,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec2f__SWIG_0(PyObject *SWIGUNUSED
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction1D< Geometry::Vec2f > *)new SwigDirector_UnaryFunction1DVec2f(arg1); 
+        result = (UnaryFunction1D<Geometry::Vec2f > *)new SwigDirector_UnaryFunction1DVec2f(arg1); 
       } else {
-        result = (UnaryFunction1D< Geometry::Vec2f > *)new UnaryFunction1D< Geometry::Vec2f >(); 
+        result = (UnaryFunction1D<Geometry::Vec2f > *)new UnaryFunction1D<Geometry::Vec2f >(); 
       }
       
     }
@@ -66916,7 +68109,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec2f__SWIG_0(PyObject *SWIGUNUSED
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec2T_float_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -66927,7 +68120,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec2f__SWIG_1(PyObject *SWIGUNUSED
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
   IntegrationType arg2 ;
-  UnaryFunction1D< Geometry::Vec2f > *result = 0 ;
+  UnaryFunction1D<Geometry::Vec2f > *result = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
@@ -66944,9 +68137,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec2f__SWIG_1(PyObject *SWIGUNUSED
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction1D< Geometry::Vec2f > *)new SwigDirector_UnaryFunction1DVec2f(arg1,arg2); 
+        result = (UnaryFunction1D<Geometry::Vec2f > *)new SwigDirector_UnaryFunction1DVec2f(arg1,arg2); 
       } else {
-        result = (UnaryFunction1D< Geometry::Vec2f > *)new UnaryFunction1D< Geometry::Vec2f >(arg2); 
+        result = (UnaryFunction1D<Geometry::Vec2f > *)new UnaryFunction1D<Geometry::Vec2f >(arg2); 
       }
       
     }
@@ -66957,7 +68150,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec2f__SWIG_1(PyObject *SWIGUNUSED
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec2T_float_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -66970,7 +68163,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec2f(PyObject *self, PyObject *ar
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -66996,27 +68189,24 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec2f(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DVec2f'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    UnaryFunction1D< Geometry::Vec2f >(PyObject *)\n"
-    "    UnaryFunction1D< Geometry::Vec2f >(PyObject *,IntegrationType)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DVec2f'.\n  Possible C/C++ prototypes are:\n    UnaryFunction1D<(Geometry::Vec2f)>(PyObject *)\n    UnaryFunction1D<(Geometry::Vec2f)>(PyObject *,IntegrationType)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction1DVec2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D< Geometry::Vec2f > *arg1 = (UnaryFunction1D< Geometry::Vec2f > *) 0 ;
+  UnaryFunction1D<Geometry::Vec2f > *arg1 = (UnaryFunction1D<Geometry::Vec2f > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction1DVec2f",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec2T_float_t_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DVec2f" "', argument " "1"" of type '" "UnaryFunction1D< Geometry::Vec2f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DVec2f" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec2f > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D< Geometry::Vec2f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec2f > * >(argp1);
   {
     try {
       delete arg1;
@@ -67038,7 +68228,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVec2f_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D< Geometry::Vec2f > *arg1 = (UnaryFunction1D< Geometry::Vec2f > *) 0 ;
+  UnaryFunction1D<Geometry::Vec2f > *arg1 = (UnaryFunction1D<Geometry::Vec2f > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -67047,20 +68237,20 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVec2f_getName(PyObject *SWIGUNUSEDPARM
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DVec2f_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec2T_float_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec2f_getName" "', argument " "1"" of type '" "UnaryFunction1D< Geometry::Vec2f > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec2f_getName" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec2f > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D< Geometry::Vec2f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec2f > * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
   upcall = (director && (director->swig_get_self()==obj0));
   try {
     {
       try {
         if (upcall) {
-          result = ((UnaryFunction1D< Geometry::Vec2f > const *)arg1)->UnaryFunction1D< VecMat::Vec2< float > >::getName();
+          result = ((UnaryFunction1D<Geometry::Vec2f > const *)arg1)->UnaryFunction1D<VecMat::Vec2<float > >::getName();
         } else {
-          result = ((UnaryFunction1D< Geometry::Vec2f > const *)arg1)->getName();
+          result = ((UnaryFunction1D<Geometry::Vec2f > const *)arg1)->getName();
         }
       }
       //    catch (Swig::DirectorTypeMismatch&) {
@@ -67082,9 +68272,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVec2f___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D< Geometry::Vec2f > *arg1 = (UnaryFunction1D< Geometry::Vec2f > *) 0 ;
+  UnaryFunction1D<Geometry::Vec2f > *arg1 = (UnaryFunction1D<Geometry::Vec2f > *) 0 ;
   Interface1D *arg2 = 0 ;
-  VecMat::Vec2< float > result;
+  VecMat::Vec2<float > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -67095,11 +68285,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVec2f___call__(PyObject *SWIGUNUSEDPAR
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DVec2f___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec2T_float_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec2f___call__" "', argument " "1"" of type '" "UnaryFunction1D< Geometry::Vec2f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec2f___call__" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec2f > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D< Geometry::Vec2f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec2f > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction1DVec2f___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
@@ -67114,7 +68304,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVec2f___call__(PyObject *SWIGUNUSEDPAR
     {
       try {
         if (upcall) {
-          result = (arg1)->UnaryFunction1D< VecMat::Vec2< float > >::operator ()(*arg2);
+          result = (arg1)->UnaryFunction1D<VecMat::Vec2<float > >::operator ()(*arg2);
         } else {
           result = (arg1)->operator ()(*arg2);
         }
@@ -67129,7 +68319,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVec2f___call__(PyObject *SWIGUNUSEDPAR
   } catch (Swig::DirectorException&) {
     SWIG_fail;
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< float >(static_cast< const VecMat::Vec2< float >& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<float >(static_cast< const VecMat::Vec2<float >& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -67138,7 +68328,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVec2f_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D< Geometry::Vec2f > *arg1 = (UnaryFunction1D< Geometry::Vec2f > *) 0 ;
+  UnaryFunction1D<Geometry::Vec2f > *arg1 = (UnaryFunction1D<Geometry::Vec2f > *) 0 ;
   IntegrationType arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -67148,11 +68338,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVec2f_setIntegrationType(PyObject *SWI
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DVec2f_setIntegrationType",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec2T_float_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec2f_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D< Geometry::Vec2f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec2f_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec2f > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D< Geometry::Vec2f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec2f > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "UnaryFunction1DVec2f_setIntegrationType" "', argument " "2"" of type '" "IntegrationType""'");
@@ -67178,21 +68368,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVec2f_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D< Geometry::Vec2f > *arg1 = (UnaryFunction1D< Geometry::Vec2f > *) 0 ;
+  UnaryFunction1D<Geometry::Vec2f > *arg1 = (UnaryFunction1D<Geometry::Vec2f > *) 0 ;
   IntegrationType result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DVec2f_getIntegrationType",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec2T_float_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec2f_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D< Geometry::Vec2f > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec2f_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec2f > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D< Geometry::Vec2f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec2f > * >(argp1);
   {
     try {
-      result = (IntegrationType)((UnaryFunction1D< Geometry::Vec2f > const *)arg1)->getIntegrationType();
+      result = (IntegrationType)((UnaryFunction1D<Geometry::Vec2f > const *)arg1)->getIntegrationType();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -67210,17 +68400,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_disown_UnaryFunction1DVec2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D< Geometry::Vec2f > *arg1 = (UnaryFunction1D< Geometry::Vec2f > *) 0 ;
+  UnaryFunction1D<Geometry::Vec2f > *arg1 = (UnaryFunction1D<Geometry::Vec2f > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction1DVec2f",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec2T_float_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction1DVec2f" "', argument " "1"" of type '" "UnaryFunction1D< Geometry::Vec2f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction1DVec2f" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec2f > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D< Geometry::Vec2f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec2f > * >(argp1);
   {
     Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
@@ -67235,15 +68425,15 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction1DVec2f_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec2T_float_t_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec3f__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  UnaryFunction1D< Geometry::Vec3f > *result = 0 ;
+  UnaryFunction1D<Geometry::Vec3f > *result = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction1DVec3f",&obj0)) SWIG_fail;
@@ -67252,9 +68442,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec3f__SWIG_0(PyObject *SWIGUNUSED
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction1D< Geometry::Vec3f > *)new SwigDirector_UnaryFunction1DVec3f(arg1); 
+        result = (UnaryFunction1D<Geometry::Vec3f > *)new SwigDirector_UnaryFunction1DVec3f(arg1); 
       } else {
-        result = (UnaryFunction1D< Geometry::Vec3f > *)new UnaryFunction1D< Geometry::Vec3f >(); 
+        result = (UnaryFunction1D<Geometry::Vec3f > *)new UnaryFunction1D<Geometry::Vec3f >(); 
       }
       
     }
@@ -67265,7 +68455,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec3f__SWIG_0(PyObject *SWIGUNUSED
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec3T_float_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -67276,7 +68466,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec3f__SWIG_1(PyObject *SWIGUNUSED
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
   IntegrationType arg2 ;
-  UnaryFunction1D< Geometry::Vec3f > *result = 0 ;
+  UnaryFunction1D<Geometry::Vec3f > *result = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
@@ -67293,9 +68483,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec3f__SWIG_1(PyObject *SWIGUNUSED
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction1D< Geometry::Vec3f > *)new SwigDirector_UnaryFunction1DVec3f(arg1,arg2); 
+        result = (UnaryFunction1D<Geometry::Vec3f > *)new SwigDirector_UnaryFunction1DVec3f(arg1,arg2); 
       } else {
-        result = (UnaryFunction1D< Geometry::Vec3f > *)new UnaryFunction1D< Geometry::Vec3f >(arg2); 
+        result = (UnaryFunction1D<Geometry::Vec3f > *)new UnaryFunction1D<Geometry::Vec3f >(arg2); 
       }
       
     }
@@ -67306,7 +68496,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec3f__SWIG_1(PyObject *SWIGUNUSED
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec3T_float_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -67319,7 +68509,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec3f(PyObject *self, PyObject *ar
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -67345,27 +68535,24 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec3f(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DVec3f'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    UnaryFunction1D< Geometry::Vec3f >(PyObject *)\n"
-    "    UnaryFunction1D< Geometry::Vec3f >(PyObject *,IntegrationType)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DVec3f'.\n  Possible C/C++ prototypes are:\n    UnaryFunction1D<(Geometry::Vec3f)>(PyObject *)\n    UnaryFunction1D<(Geometry::Vec3f)>(PyObject *,IntegrationType)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction1DVec3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D< Geometry::Vec3f > *arg1 = (UnaryFunction1D< Geometry::Vec3f > *) 0 ;
+  UnaryFunction1D<Geometry::Vec3f > *arg1 = (UnaryFunction1D<Geometry::Vec3f > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction1DVec3f",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec3T_float_t_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DVec3f" "', argument " "1"" of type '" "UnaryFunction1D< Geometry::Vec3f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DVec3f" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec3f > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D< Geometry::Vec3f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec3f > * >(argp1);
   {
     try {
       delete arg1;
@@ -67387,7 +68574,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVec3f_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D< Geometry::Vec3f > *arg1 = (UnaryFunction1D< Geometry::Vec3f > *) 0 ;
+  UnaryFunction1D<Geometry::Vec3f > *arg1 = (UnaryFunction1D<Geometry::Vec3f > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -67396,20 +68583,20 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVec3f_getName(PyObject *SWIGUNUSEDPARM
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DVec3f_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec3T_float_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec3f_getName" "', argument " "1"" of type '" "UnaryFunction1D< Geometry::Vec3f > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec3f_getName" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec3f > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D< Geometry::Vec3f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec3f > * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
   upcall = (director && (director->swig_get_self()==obj0));
   try {
     {
       try {
         if (upcall) {
-          result = ((UnaryFunction1D< Geometry::Vec3f > const *)arg1)->UnaryFunction1D< VecMat::Vec3< float > >::getName();
+          result = ((UnaryFunction1D<Geometry::Vec3f > const *)arg1)->UnaryFunction1D<VecMat::Vec3<float > >::getName();
         } else {
-          result = ((UnaryFunction1D< Geometry::Vec3f > const *)arg1)->getName();
+          result = ((UnaryFunction1D<Geometry::Vec3f > const *)arg1)->getName();
         }
       }
       //    catch (Swig::DirectorTypeMismatch&) {
@@ -67431,9 +68618,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVec3f___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D< Geometry::Vec3f > *arg1 = (UnaryFunction1D< Geometry::Vec3f > *) 0 ;
+  UnaryFunction1D<Geometry::Vec3f > *arg1 = (UnaryFunction1D<Geometry::Vec3f > *) 0 ;
   Interface1D *arg2 = 0 ;
-  VecMat::Vec3< float > result;
+  VecMat::Vec3<float > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -67444,11 +68631,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVec3f___call__(PyObject *SWIGUNUSEDPAR
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DVec3f___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec3T_float_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec3f___call__" "', argument " "1"" of type '" "UnaryFunction1D< Geometry::Vec3f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec3f___call__" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec3f > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D< Geometry::Vec3f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec3f > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction1DVec3f___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
@@ -67463,7 +68650,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVec3f___call__(PyObject *SWIGUNUSEDPAR
     {
       try {
         if (upcall) {
-          result = (arg1)->UnaryFunction1D< VecMat::Vec3< float > >::operator ()(*arg2);
+          result = (arg1)->UnaryFunction1D<VecMat::Vec3<float > >::operator ()(*arg2);
         } else {
           result = (arg1)->operator ()(*arg2);
         }
@@ -67478,7 +68665,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVec3f___call__(PyObject *SWIGUNUSEDPAR
   } catch (Swig::DirectorException&) {
     SWIG_fail;
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< float >(static_cast< const VecMat::Vec3< float >& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<float >(static_cast< const VecMat::Vec3<float >& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -67487,7 +68674,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVec3f_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D< Geometry::Vec3f > *arg1 = (UnaryFunction1D< Geometry::Vec3f > *) 0 ;
+  UnaryFunction1D<Geometry::Vec3f > *arg1 = (UnaryFunction1D<Geometry::Vec3f > *) 0 ;
   IntegrationType arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -67497,11 +68684,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVec3f_setIntegrationType(PyObject *SWI
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DVec3f_setIntegrationType",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec3T_float_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec3f_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D< Geometry::Vec3f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec3f_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec3f > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D< Geometry::Vec3f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec3f > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "UnaryFunction1DVec3f_setIntegrationType" "', argument " "2"" of type '" "IntegrationType""'");
@@ -67527,21 +68714,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVec3f_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D< Geometry::Vec3f > *arg1 = (UnaryFunction1D< Geometry::Vec3f > *) 0 ;
+  UnaryFunction1D<Geometry::Vec3f > *arg1 = (UnaryFunction1D<Geometry::Vec3f > *) 0 ;
   IntegrationType result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DVec3f_getIntegrationType",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec3T_float_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec3f_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D< Geometry::Vec3f > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec3f_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec3f > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D< Geometry::Vec3f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec3f > * >(argp1);
   {
     try {
-      result = (IntegrationType)((UnaryFunction1D< Geometry::Vec3f > const *)arg1)->getIntegrationType();
+      result = (IntegrationType)((UnaryFunction1D<Geometry::Vec3f > const *)arg1)->getIntegrationType();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -67559,17 +68746,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_disown_UnaryFunction1DVec3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D< Geometry::Vec3f > *arg1 = (UnaryFunction1D< Geometry::Vec3f > *) 0 ;
+  UnaryFunction1D<Geometry::Vec3f > *arg1 = (UnaryFunction1D<Geometry::Vec3f > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction1DVec3f",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec3T_float_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction1DVec3f" "', argument " "1"" of type '" "UnaryFunction1D< Geometry::Vec3f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction1DVec3f" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec3f > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D< Geometry::Vec3f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec3f > * >(argp1);
   {
     Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
@@ -67584,19 +68771,19 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction1DVec3f_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec3T_float_t_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVectorViewShape__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D< std::vector< ViewShape * > > *result = 0 ;
+  UnaryFunction1D<std::vector<ViewShape * > > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_UnaryFunction1DVectorViewShape")) SWIG_fail;
   {
     try {
-      result = (UnaryFunction1D< std::vector< ViewShape * > > *)new UnaryFunction1D< std::vector< ViewShape * > >();
+      result = (UnaryFunction1D<std::vector<ViewShape * > > *)new UnaryFunction1D<std::vector<ViewShape * > >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -67605,7 +68792,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVectorViewShape__SWIG_0(PyObject *
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -67615,7 +68802,7 @@ fail:
 SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVectorViewShape__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IntegrationType arg1 ;
-  UnaryFunction1D< std::vector< ViewShape * > > *result = 0 ;
+  UnaryFunction1D<std::vector<ViewShape * > > *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -67628,7 +68815,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVectorViewShape__SWIG_1(PyObject *
   arg1 = static_cast< IntegrationType >(val1);
   {
     try {
-      result = (UnaryFunction1D< std::vector< ViewShape * > > *)new UnaryFunction1D< std::vector< ViewShape * > >(arg1);
+      result = (UnaryFunction1D<std::vector<ViewShape * > > *)new UnaryFunction1D<std::vector<ViewShape * > >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -67637,7 +68824,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVectorViewShape__SWIG_1(PyObject *
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -67650,7 +68837,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVectorViewShape(PyObject *self, Py
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -67669,27 +68856,24 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVectorViewShape(PyObject *self, Py
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DVectorViewShape'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    UnaryFunction1D< std::vector< ViewShape * > >()\n"
-    "    UnaryFunction1D< std::vector< ViewShape * > >(IntegrationType)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DVectorViewShape'.\n  Possible C/C++ prototypes are:\n    UnaryFunction1D<(std::vector<(p.ViewShape)>)>()\n    UnaryFunction1D<(std::vector<(p.ViewShape)>)>(IntegrationType)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction1DVectorViewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D< std::vector< ViewShape * > > *arg1 = (UnaryFunction1D< std::vector< ViewShape * > > *) 0 ;
+  UnaryFunction1D<std::vector<ViewShape * > > *arg1 = (UnaryFunction1D<std::vector<ViewShape * > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction1DVectorViewShape",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DVectorViewShape" "', argument " "1"" of type '" "UnaryFunction1D< std::vector< ViewShape * > > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DVectorViewShape" "', argument " "1"" of type '" "UnaryFunction1D<std::vector<ViewShape * > > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D< std::vector< ViewShape * > > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D<std::vector<ViewShape * > > * >(argp1);
   {
     try {
       delete arg1;
@@ -67711,21 +68895,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVectorViewShape_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D< std::vector< ViewShape * > > *arg1 = (UnaryFunction1D< std::vector< ViewShape * > > *) 0 ;
+  UnaryFunction1D<std::vector<ViewShape * > > *arg1 = (UnaryFunction1D<std::vector<ViewShape * > > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DVectorViewShape_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVectorViewShape_getName" "', argument " "1"" of type '" "UnaryFunction1D< std::vector< ViewShape * > > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVectorViewShape_getName" "', argument " "1"" of type '" "UnaryFunction1D<std::vector<ViewShape * > > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D< std::vector< ViewShape * > > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D<std::vector<ViewShape * > > * >(argp1);
   {
     try {
-      result = ((UnaryFunction1D< std::vector< ViewShape * > > const *)arg1)->getName();
+      result = ((UnaryFunction1D<std::vector<ViewShape * > > const *)arg1)->getName();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -67743,9 +68927,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVectorViewShape___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D< std::vector< ViewShape * > > *arg1 = (UnaryFunction1D< std::vector< ViewShape * > > *) 0 ;
+  UnaryFunction1D<std::vector<ViewShape * > > *arg1 = (UnaryFunction1D<std::vector<ViewShape * > > *) 0 ;
   Interface1D *arg2 = 0 ;
-  std::vector< ViewShape *,std::allocator< ViewShape * > > result;
+  std::vector<ViewShape *,std::allocator<ViewShape * > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -67754,11 +68938,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVectorViewShape___call__(PyObject *SWI
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DVectorViewShape___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVectorViewShape___call__" "', argument " "1"" of type '" "UnaryFunction1D< std::vector< ViewShape * > > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVectorViewShape___call__" "', argument " "1"" of type '" "UnaryFunction1D<std::vector<ViewShape * > > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D< std::vector< ViewShape * > > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D<std::vector<ViewShape * > > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction1DVectorViewShape___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
@@ -67778,7 +68962,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVectorViewShape___call__(PyObject *SWI
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = swig::from(static_cast< std::vector<ViewShape*,std::allocator< ViewShape * > > >(result));
+  resultobj = swig::from(static_cast< std::vector<ViewShape*,std::allocator<ViewShape * > > >(result));
   return resultobj;
 fail:
   return NULL;
@@ -67787,7 +68971,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVectorViewShape_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D< std::vector< ViewShape * > > *arg1 = (UnaryFunction1D< std::vector< ViewShape * > > *) 0 ;
+  UnaryFunction1D<std::vector<ViewShape * > > *arg1 = (UnaryFunction1D<std::vector<ViewShape * > > *) 0 ;
   IntegrationType arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -67797,11 +68981,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVectorViewShape_setIntegrationType(PyO
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DVectorViewShape_setIntegrationType",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVectorViewShape_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D< std::vector< ViewShape * > > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVectorViewShape_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<std::vector<ViewShape * > > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D< std::vector< ViewShape * > > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D<std::vector<ViewShape * > > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "UnaryFunction1DVectorViewShape_setIntegrationType" "', argument " "2"" of type '" "IntegrationType""'");
@@ -67827,21 +69011,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVectorViewShape_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D< std::vector< ViewShape * > > *arg1 = (UnaryFunction1D< std::vector< ViewShape * > > *) 0 ;
+  UnaryFunction1D<std::vector<ViewShape * > > *arg1 = (UnaryFunction1D<std::vector<ViewShape * > > *) 0 ;
   IntegrationType result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DVectorViewShape_getIntegrationType",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVectorViewShape_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D< std::vector< ViewShape * > > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVectorViewShape_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<std::vector<ViewShape * > > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D< std::vector< ViewShape * > > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D<std::vector<ViewShape * > > * >(argp1);
   {
     try {
-      result = (IntegrationType)((UnaryFunction1D< std::vector< ViewShape * > > const *)arg1)->getIntegrationType();
+      result = (IntegrationType)((UnaryFunction1D<std::vector<ViewShape * > > const *)arg1)->getIntegrationType();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -67859,8 +69043,8 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction1DVectorViewShape_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
@@ -68006,7 +69190,7 @@ fail:
 
 SWIGINTERN PyObject *GetXF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetXF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -68072,7 +69256,7 @@ SWIGINTERN PyObject *_wrap_new_GetYF1D(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -68091,10 +69275,7 @@ SWIGINTERN PyObject *_wrap_new_GetYF1D(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetYF1D'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    Functions1D::GetYF1D(IntegrationType)\n"
-    "    Functions1D::GetYF1D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetYF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::GetYF1D(IntegrationType)\n    Functions1D::GetYF1D()\n");
   return NULL;
 }
 
@@ -68209,7 +69390,7 @@ fail:
 
 SWIGINTERN PyObject *GetYF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetYF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -68275,7 +69456,7 @@ SWIGINTERN PyObject *_wrap_new_GetZF1D(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -68294,10 +69475,7 @@ SWIGINTERN PyObject *_wrap_new_GetZF1D(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetZF1D'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    Functions1D::GetZF1D(IntegrationType)\n"
-    "    Functions1D::GetZF1D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetZF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::GetZF1D(IntegrationType)\n    Functions1D::GetZF1D()\n");
   return NULL;
 }
 
@@ -68412,7 +69590,7 @@ fail:
 
 SWIGINTERN PyObject *GetZF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetZF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -68478,7 +69656,7 @@ SWIGINTERN PyObject *_wrap_new_GetProjectedXF1D(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -68497,10 +69675,7 @@ SWIGINTERN PyObject *_wrap_new_GetProjectedXF1D(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetProjectedXF1D'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    Functions1D::GetProjectedXF1D(IntegrationType)\n"
-    "    Functions1D::GetProjectedXF1D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetProjectedXF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::GetProjectedXF1D(IntegrationType)\n    Functions1D::GetProjectedXF1D()\n");
   return NULL;
 }
 
@@ -68615,7 +69790,7 @@ fail:
 
 SWIGINTERN PyObject *GetProjectedXF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetProjectedXF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -68681,7 +69856,7 @@ SWIGINTERN PyObject *_wrap_new_GetProjectedYF1D(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -68700,10 +69875,7 @@ SWIGINTERN PyObject *_wrap_new_GetProjectedYF1D(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetProjectedYF1D'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    Functions1D::GetProjectedYF1D(IntegrationType)\n"
-    "    Functions1D::GetProjectedYF1D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetProjectedYF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::GetProjectedYF1D(IntegrationType)\n    Functions1D::GetProjectedYF1D()\n");
   return NULL;
 }
 
@@ -68818,7 +69990,7 @@ fail:
 
 SWIGINTERN PyObject *GetProjectedYF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetProjectedYF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -68884,7 +70056,7 @@ SWIGINTERN PyObject *_wrap_new_GetProjectedZF1D(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -68903,10 +70075,7 @@ SWIGINTERN PyObject *_wrap_new_GetProjectedZF1D(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetProjectedZF1D'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    Functions1D::GetProjectedZF1D(IntegrationType)\n"
-    "    Functions1D::GetProjectedZF1D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetProjectedZF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::GetProjectedZF1D(IntegrationType)\n    Functions1D::GetProjectedZF1D()\n");
   return NULL;
 }
 
@@ -69021,7 +70190,7 @@ fail:
 
 SWIGINTERN PyObject *GetProjectedZF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetProjectedZF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -69087,7 +70256,7 @@ SWIGINTERN PyObject *_wrap_new_Orientation2DF1D(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -69106,10 +70275,7 @@ SWIGINTERN PyObject *_wrap_new_Orientation2DF1D(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Orientation2DF1D'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    Functions1D::Orientation2DF1D(IntegrationType)\n"
-    "    Functions1D::Orientation2DF1D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Orientation2DF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::Orientation2DF1D(IntegrationType)\n    Functions1D::Orientation2DF1D()\n");
   return NULL;
 }
 
@@ -69183,7 +70349,7 @@ SWIGINTERN PyObject *_wrap_Orientation2DF1D___call__(PyObject *SWIGUNUSEDPARM(se
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -69224,7 +70390,7 @@ fail:
 
 SWIGINTERN PyObject *Orientation2DF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__Orientation2DF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -69290,7 +70456,7 @@ SWIGINTERN PyObject *_wrap_new_Orientation3DF1D(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -69309,10 +70475,7 @@ SWIGINTERN PyObject *_wrap_new_Orientation3DF1D(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Orientation3DF1D'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    Functions1D::Orientation3DF1D(IntegrationType)\n"
-    "    Functions1D::Orientation3DF1D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Orientation3DF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::Orientation3DF1D(IntegrationType)\n    Functions1D::Orientation3DF1D()\n");
   return NULL;
 }
 
@@ -69386,7 +70549,7 @@ SWIGINTERN PyObject *_wrap_Orientation3DF1D___call__(PyObject *SWIGUNUSEDPARM(se
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -69427,7 +70590,7 @@ fail:
 
 SWIGINTERN PyObject *Orientation3DF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__Orientation3DF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -69493,7 +70656,7 @@ SWIGINTERN PyObject *_wrap_new_ZDiscontinuityF1D(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -69512,10 +70675,7 @@ SWIGINTERN PyObject *_wrap_new_ZDiscontinuityF1D(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ZDiscontinuityF1D'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    Functions1D::ZDiscontinuityF1D(IntegrationType)\n"
-    "    Functions1D::ZDiscontinuityF1D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ZDiscontinuityF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::ZDiscontinuityF1D(IntegrationType)\n    Functions1D::ZDiscontinuityF1D()\n");
   return NULL;
 }
 
@@ -69630,7 +70790,7 @@ fail:
 
 SWIGINTERN PyObject *ZDiscontinuityF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__ZDiscontinuityF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -69696,7 +70856,7 @@ SWIGINTERN PyObject *_wrap_new_QuantitativeInvisibilityF1D(PyObject *self, PyObj
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -69715,10 +70875,7 @@ SWIGINTERN PyObject *_wrap_new_QuantitativeInvisibilityF1D(PyObject *self, PyObj
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_QuantitativeInvisibilityF1D'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    Functions1D::QuantitativeInvisibilityF1D(IntegrationType)\n"
-    "    Functions1D::QuantitativeInvisibilityF1D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_QuantitativeInvisibilityF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::QuantitativeInvisibilityF1D(IntegrationType)\n    Functions1D::QuantitativeInvisibilityF1D()\n");
   return NULL;
 }
 
@@ -69833,7 +70990,7 @@ fail:
 
 SWIGINTERN PyObject *QuantitativeInvisibilityF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__QuantitativeInvisibilityF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -69899,7 +71056,7 @@ SWIGINTERN PyObject *_wrap_new_CurveNatureF1D(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -69918,10 +71075,7 @@ SWIGINTERN PyObject *_wrap_new_CurveNatureF1D(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CurveNatureF1D'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    Functions1D::CurveNatureF1D(IntegrationType)\n"
-    "    Functions1D::CurveNatureF1D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CurveNatureF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::CurveNatureF1D(IntegrationType)\n    Functions1D::CurveNatureF1D()\n");
   return NULL;
 }
 
@@ -70036,7 +71190,7 @@ fail:
 
 SWIGINTERN PyObject *CurveNatureF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__CurveNatureF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -70173,7 +71327,7 @@ fail:
 
 SWIGINTERN PyObject *TimeStampF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__TimeStampF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -70310,7 +71464,7 @@ fail:
 
 SWIGINTERN PyObject *IncrementChainingTimeStampF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__IncrementChainingTimeStampF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -70447,7 +71601,7 @@ fail:
 
 SWIGINTERN PyObject *ChainingTimeStampF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__ChainingTimeStampF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -70513,7 +71667,7 @@ SWIGINTERN PyObject *_wrap_new_Curvature2DAngleF1D(PyObject *self, PyObject *arg
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -70532,10 +71686,7 @@ SWIGINTERN PyObject *_wrap_new_Curvature2DAngleF1D(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Curvature2DAngleF1D'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    Functions1D::Curvature2DAngleF1D(IntegrationType)\n"
-    "    Functions1D::Curvature2DAngleF1D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Curvature2DAngleF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::Curvature2DAngleF1D(IntegrationType)\n    Functions1D::Curvature2DAngleF1D()\n");
   return NULL;
 }
 
@@ -70650,7 +71801,7 @@ fail:
 
 SWIGINTERN PyObject *Curvature2DAngleF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__Curvature2DAngleF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -70716,7 +71867,7 @@ SWIGINTERN PyObject *_wrap_new_Normal2DF1D(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -70735,10 +71886,7 @@ SWIGINTERN PyObject *_wrap_new_Normal2DF1D(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Normal2DF1D'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    Functions1D::Normal2DF1D(IntegrationType)\n"
-    "    Functions1D::Normal2DF1D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Normal2DF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::Normal2DF1D(IntegrationType)\n    Functions1D::Normal2DF1D()\n");
   return NULL;
 }
 
@@ -70812,7 +71960,7 @@ SWIGINTERN PyObject *_wrap_Normal2DF1D___call__(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -70853,7 +72001,7 @@ fail:
 
 SWIGINTERN PyObject *Normal2DF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__Normal2DF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -70917,7 +72065,7 @@ SWIGINTERN PyObject *_wrap_GetShapeF1D___call__(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   Functions1D::GetShapeF1D *arg1 = (Functions1D::GetShapeF1D *) 0 ;
   Interface1D *arg2 = 0 ;
-  std::vector< ViewShape *,std::allocator< ViewShape * > > result;
+  std::vector<ViewShape *,std::allocator<ViewShape * > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -70950,7 +72098,7 @@ SWIGINTERN PyObject *_wrap_GetShapeF1D___call__(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = swig::from(static_cast< std::vector<ViewShape*,std::allocator< ViewShape * > > >(result));
+  resultobj = swig::from(static_cast< std::vector<ViewShape*,std::allocator<ViewShape * > > >(result));
   return resultobj;
 fail:
   return NULL;
@@ -70991,7 +72139,7 @@ fail:
 
 SWIGINTERN PyObject *GetShapeF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetShapeF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -71055,7 +72203,7 @@ SWIGINTERN PyObject *_wrap_GetOccludersF1D___call__(PyObject *SWIGUNUSEDPARM(sel
   PyObject *resultobj = 0;
   Functions1D::GetOccludersF1D *arg1 = (Functions1D::GetOccludersF1D *) 0 ;
   Interface1D *arg2 = 0 ;
-  std::vector< ViewShape *,std::allocator< ViewShape * > > result;
+  std::vector<ViewShape *,std::allocator<ViewShape * > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -71088,7 +72236,7 @@ SWIGINTERN PyObject *_wrap_GetOccludersF1D___call__(PyObject *SWIGUNUSEDPARM(sel
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = swig::from(static_cast< std::vector<ViewShape*,std::allocator< ViewShape * > > >(result));
+  resultobj = swig::from(static_cast< std::vector<ViewShape*,std::allocator<ViewShape * > > >(result));
   return resultobj;
 fail:
   return NULL;
@@ -71129,7 +72277,7 @@ fail:
 
 SWIGINTERN PyObject *GetOccludersF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetOccludersF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -71193,7 +72341,7 @@ SWIGINTERN PyObject *_wrap_GetOccludeeF1D___call__(PyObject *SWIGUNUSEDPARM(self
   PyObject *resultobj = 0;
   Functions1D::GetOccludeeF1D *arg1 = (Functions1D::GetOccludeeF1D *) 0 ;
   Interface1D *arg2 = 0 ;
-  std::vector< ViewShape *,std::allocator< ViewShape * > > result;
+  std::vector<ViewShape *,std::allocator<ViewShape * > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -71226,7 +72374,7 @@ SWIGINTERN PyObject *_wrap_GetOccludeeF1D___call__(PyObject *SWIGUNUSEDPARM(self
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = swig::from(static_cast< std::vector<ViewShape*,std::allocator< ViewShape * > > >(result));
+  resultobj = swig::from(static_cast< std::vector<ViewShape*,std::allocator<ViewShape * > > >(result));
   return resultobj;
 fail:
   return NULL;
@@ -71267,7 +72415,7 @@ fail:
 
 SWIGINTERN PyObject *GetOccludeeF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetOccludeeF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -71331,7 +72479,7 @@ SWIGINTERN PyObject *_wrap_Module_setAlwaysRefresh(PyObject *self, PyObject *arg
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -71350,10 +72498,7 @@ SWIGINTERN PyObject *_wrap_Module_setAlwaysRefresh(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Module_setAlwaysRefresh'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    setAlwaysRefresh(bool)\n"
-    "    Module::setAlwaysRefresh()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Module_setAlwaysRefresh'.\n  Possible C/C++ prototypes are:\n    setAlwaysRefresh(bool)\n    Module::setAlwaysRefresh()\n");
   return NULL;
 }
 
@@ -71417,7 +72562,7 @@ SWIGINTERN PyObject *_wrap_Module_setCausal(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -71436,10 +72581,7 @@ SWIGINTERN PyObject *_wrap_Module_setCausal(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Module_setCausal'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    setCausal(bool)\n"
-    "    Module::setCausal()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Module_setCausal'.\n  Possible C/C++ prototypes are:\n    setCausal(bool)\n    Module::setCausal()\n");
   return NULL;
 }
 
@@ -71503,7 +72645,7 @@ SWIGINTERN PyObject *_wrap_Module_setDrawable(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -71522,10 +72664,7 @@ SWIGINTERN PyObject *_wrap_Module_setDrawable(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Module_setDrawable'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    setDrawable(bool)\n"
-    "    Module::setDrawable()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Module_setDrawable'.\n  Possible C/C++ prototypes are:\n    setDrawable(bool)\n    Module::setDrawable()\n");
   return NULL;
 }
 
@@ -71656,7 +72795,7 @@ fail:
 
 SWIGINTERN PyObject *Module_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Module, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -71722,7 +72861,7 @@ SWIGINTERN PyObject *_wrap_new_DensityF0D(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -71741,10 +72880,7 @@ SWIGINTERN PyObject *_wrap_new_DensityF0D(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_DensityF0D'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    Functions0D::DensityF0D(double)\n"
-    "    Functions0D::DensityF0D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_DensityF0D'.\n  Possible C/C++ prototypes are:\n    Functions0D::DensityF0D(double)\n    Functions0D::DensityF0D()\n");
   return NULL;
 }
 
@@ -71859,7 +72995,7 @@ fail:
 
 SWIGINTERN PyObject *DensityF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__DensityF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -71925,7 +73061,7 @@ SWIGINTERN PyObject *_wrap_new_LocalAverageDepthF0D(PyObject *self, PyObject *ar
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -71944,10 +73080,7 @@ SWIGINTERN PyObject *_wrap_new_LocalAverageDepthF0D(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_LocalAverageDepthF0D'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    Functions0D::LocalAverageDepthF0D(real)\n"
-    "    Functions0D::LocalAverageDepthF0D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_LocalAverageDepthF0D'.\n  Possible C/C++ prototypes are:\n    Functions0D::LocalAverageDepthF0D(real)\n    Functions0D::LocalAverageDepthF0D()\n");
   return NULL;
 }
 
@@ -72062,7 +73195,7 @@ fail:
 
 SWIGINTERN PyObject *LocalAverageDepthF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__LocalAverageDepthF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -72221,7 +73354,7 @@ fail:
 
 SWIGINTERN PyObject *ReadMapPixelF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__ReadMapPixelF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -72377,7 +73510,7 @@ fail:
 
 SWIGINTERN PyObject *ReadSteerableViewMapPixelF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__ReadSteerableViewMapPixelF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -72524,7 +73657,7 @@ fail:
 
 SWIGINTERN PyObject *ReadCompleteViewMapPixelF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__ReadCompleteViewMapPixelF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -72671,7 +73804,7 @@ fail:
 
 SWIGINTERN PyObject *GetViewMapGradientNormF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetViewMapGradientNormF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -72828,7 +73961,7 @@ SWIGINTERN PyObject *_wrap_new_DensityF1D(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -72885,12 +74018,7 @@ SWIGINTERN PyObject *_wrap_new_DensityF1D(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_DensityF1D'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    Functions1D::DensityF1D(double,IntegrationType,float)\n"
-    "    Functions1D::DensityF1D(double,IntegrationType)\n"
-    "    Functions1D::DensityF1D(double)\n"
-    "    Functions1D::DensityF1D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_DensityF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::DensityF1D(double,IntegrationType,float)\n    Functions1D::DensityF1D(double,IntegrationType)\n    Functions1D::DensityF1D(double)\n    Functions1D::DensityF1D()\n");
   return NULL;
 }
 
@@ -73005,7 +74133,7 @@ fail:
 
 SWIGINTERN PyObject *DensityF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__DensityF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -73089,7 +74217,7 @@ SWIGINTERN PyObject *_wrap_new_LocalAverageDepthF1D(PyObject *self, PyObject *ar
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -73121,10 +74249,7 @@ SWIGINTERN PyObject *_wrap_new_LocalAverageDepthF1D(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_LocalAverageDepthF1D'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    Functions1D::LocalAverageDepthF1D(real,IntegrationType)\n"
-    "    Functions1D::LocalAverageDepthF1D(real)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_LocalAverageDepthF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::LocalAverageDepthF1D(real,IntegrationType)\n    Functions1D::LocalAverageDepthF1D(real)\n");
   return NULL;
 }
 
@@ -73239,7 +74364,7 @@ fail:
 
 SWIGINTERN PyObject *LocalAverageDepthF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__LocalAverageDepthF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -73373,7 +74498,7 @@ SWIGINTERN PyObject *_wrap_new_GetCompleteViewMapDensityF1D(PyObject *self, PyOb
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -73427,11 +74552,7 @@ SWIGINTERN PyObject *_wrap_new_GetCompleteViewMapDensityF1D(PyObject *self, PyOb
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetCompleteViewMapDensityF1D'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    Functions1D::GetCompleteViewMapDensityF1D(unsigned int,IntegrationType,float)\n"
-    "    Functions1D::GetCompleteViewMapDensityF1D(unsigned int,IntegrationType)\n"
-    "    Functions1D::GetCompleteViewMapDensityF1D(unsigned int)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetCompleteViewMapDensityF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::GetCompleteViewMapDensityF1D(unsigned int,IntegrationType,float)\n    Functions1D::GetCompleteViewMapDensityF1D(unsigned int,IntegrationType)\n    Functions1D::GetCompleteViewMapDensityF1D(unsigned int)\n");
   return NULL;
 }
 
@@ -73546,7 +74667,7 @@ fail:
 
 SWIGINTERN PyObject *GetCompleteViewMapDensityF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetCompleteViewMapDensityF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -73707,7 +74828,7 @@ SWIGINTERN PyObject *_wrap_new_GetDirectionalViewMapDensityF1D(PyObject *self, P
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -73779,11 +74900,7 @@ SWIGINTERN PyObject *_wrap_new_GetDirectionalViewMapDensityF1D(PyObject *self, P
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetDirectionalViewMapDensityF1D'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    Functions1D::GetDirectionalViewMapDensityF1D(unsigned int,unsigned int,IntegrationType,float)\n"
-    "    Functions1D::GetDirectionalViewMapDensityF1D(unsigned int,unsigned int,IntegrationType)\n"
-    "    Functions1D::GetDirectionalViewMapDensityF1D(unsigned int,unsigned int)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetDirectionalViewMapDensityF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::GetDirectionalViewMapDensityF1D(unsigned int,unsigned int,IntegrationType,float)\n    Functions1D::GetDirectionalViewMapDensityF1D(unsigned int,unsigned int,IntegrationType)\n    Functions1D::GetDirectionalViewMapDensityF1D(unsigned int,unsigned int)\n");
   return NULL;
 }
 
@@ -73898,7 +75015,7 @@ fail:
 
 SWIGINTERN PyObject *GetDirectionalViewMapDensityF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetDirectionalViewMapDensityF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -74032,7 +75149,7 @@ SWIGINTERN PyObject *_wrap_new_GetSteerableViewMapDensityF1D(PyObject *self, PyO
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -74086,11 +75203,7 @@ SWIGINTERN PyObject *_wrap_new_GetSteerableViewMapDensityF1D(PyObject *self, PyO
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetSteerableViewMapDensityF1D'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    Functions1D::GetSteerableViewMapDensityF1D(int,IntegrationType,float)\n"
-    "    Functions1D::GetSteerableViewMapDensityF1D(int,IntegrationType)\n"
-    "    Functions1D::GetSteerableViewMapDensityF1D(int)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetSteerableViewMapDensityF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::GetSteerableViewMapDensityF1D(int,IntegrationType,float)\n    Functions1D::GetSteerableViewMapDensityF1D(int,IntegrationType)\n    Functions1D::GetSteerableViewMapDensityF1D(int)\n");
   return NULL;
 }
 
@@ -74205,7 +75318,7 @@ fail:
 
 SWIGINTERN PyObject *GetSteerableViewMapDensityF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetSteerableViewMapDensityF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -74339,7 +75452,7 @@ SWIGINTERN PyObject *_wrap_new_GetViewMapGradientNormF1D(PyObject *self, PyObjec
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -74393,11 +75506,7 @@ SWIGINTERN PyObject *_wrap_new_GetViewMapGradientNormF1D(PyObject *self, PyObjec
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetViewMapGradientNormF1D'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    Functions1D::GetViewMapGradientNormF1D(int,IntegrationType,float)\n"
-    "    Functions1D::GetViewMapGradientNormF1D(int,IntegrationType)\n"
-    "    Functions1D::GetViewMapGradientNormF1D(int)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetViewMapGradientNormF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::GetViewMapGradientNormF1D(int,IntegrationType,float)\n    Functions1D::GetViewMapGradientNormF1D(int,IntegrationType)\n    Functions1D::GetViewMapGradientNormF1D(int)\n");
   return NULL;
 }
 
@@ -74512,7 +75621,7 @@ fail:
 
 SWIGINTERN PyObject *GetViewMapGradientNormF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetViewMapGradientNormF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -74757,7 +75866,7 @@ SWIGINTERN PyObject *_wrap_LoadMapCF(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -74817,11 +75926,7 @@ SWIGINTERN PyObject *_wrap_LoadMapCF(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'LoadMapCF'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    ContextFunctions::LoadMapCF(char const *,char const *,unsigned int,float)\n"
-    "    ContextFunctions::LoadMapCF(char const *,char const *,unsigned int)\n"
-    "    ContextFunctions::LoadMapCF(char const *,char const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'LoadMapCF'.\n  Possible C/C++ prototypes are:\n    ContextFunctions::LoadMapCF(char const *,char const *,unsigned int,float)\n    ContextFunctions::LoadMapCF(char const *,char const *,unsigned int)\n    ContextFunctions::LoadMapCF(char const *,char const *)\n");
   return NULL;
 }
 
@@ -75207,7 +76312,7 @@ SWIGINTERN PyObject *_wrap_new_AdjacencyIterator(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -75269,13 +76374,7 @@ SWIGINTERN PyObject *_wrap_new_AdjacencyIterator(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_AdjacencyIterator'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    AdjacencyIterator()\n"
-    "    AdjacencyIterator(ViewVertex *,bool,bool)\n"
-    "    AdjacencyIterator(ViewVertex *,bool)\n"
-    "    AdjacencyIterator(ViewVertex *)\n"
-    "    AdjacencyIterator(AdjacencyIterator const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_AdjacencyIterator'.\n  Possible C/C++ prototypes are:\n    AdjacencyIterator()\n    AdjacencyIterator(ViewVertex *,bool,bool)\n    AdjacencyIterator(ViewVertex *,bool)\n    AdjacencyIterator(ViewVertex *)\n    AdjacencyIterator(AdjacencyIterator const &)\n");
   return NULL;
 }
 
@@ -75880,7 +76979,7 @@ SWIGINTERN PyObject *_wrap_AdjacencyIterator_aShape(PyObject *self, PyObject *ar
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -75904,10 +77003,7 @@ SWIGINTERN PyObject *_wrap_AdjacencyIterator_aShape(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'AdjacencyIterator_aShape'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    aShape(AdjacencyIterator *)\n"
-    "    aShape(AdjacencyIterator const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'AdjacencyIterator_aShape'.\n  Possible C/C++ prototypes are:\n    aShape()\n    aShape()\n");
   return NULL;
 }
 
@@ -76011,7 +77107,7 @@ fail:
 SWIGINTERN PyObject *_wrap_AdjacencyIterator_occluders(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
-  std::vector< ViewShape * > *result = 0 ;
+  std::vector<ViewShape * > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -76025,8 +77121,8 @@ SWIGINTERN PyObject *_wrap_AdjacencyIterator_occluders(PyObject *SWIGUNUSEDPARM(
   {
     try {
       {
-        std::vector< ViewShape * > &_result_ref = (*arg1)->occluders();
-        result = (std::vector< ViewShape * > *) &_result_ref;
+        std::vector<ViewShape * > &_result_ref = (*arg1)->occluders();
+        result = (std::vector<ViewShape * > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -76036,7 +77132,7 @@ SWIGINTERN PyObject *_wrap_AdjacencyIterator_occluders(PyObject *SWIGUNUSEDPARM(
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -76075,7 +77171,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_AdjacencyIterator_SetA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_setA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
   ViewVertex *arg2 = (ViewVertex *) 0 ;
@@ -76086,20 +77182,20 @@ SWIGINTERN PyObject *_wrap_AdjacencyIterator_SetA(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:AdjacencyIterator_SetA",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:AdjacencyIterator_setA",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_SetA" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_setA" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
   }
   arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewVertex, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AdjacencyIterator_SetA" "', argument " "2"" of type '" "ViewVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AdjacencyIterator_setA" "', argument " "2"" of type '" "ViewVertex *""'"); 
   }
   arg2 = reinterpret_cast< ViewVertex * >(argp2);
   {
     try {
-      (*arg1)->SetA(arg2);
+      (*arg1)->setA(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -76115,7 +77211,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_AdjacencyIterator_SetB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_setB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
   ViewVertex *arg2 = (ViewVertex *) 0 ;
@@ -76126,20 +77222,20 @@ SWIGINTERN PyObject *_wrap_AdjacencyIterator_SetB(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:AdjacencyIterator_SetB",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:AdjacencyIterator_setB",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_SetB" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_setB" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
   }
   arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewVertex, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AdjacencyIterator_SetB" "', argument " "2"" of type '" "ViewVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AdjacencyIterator_setB" "', argument " "2"" of type '" "ViewVertex *""'"); 
   }
   arg2 = reinterpret_cast< ViewVertex * >(argp2);
   {
     try {
-      (*arg1)->SetB(arg2);
+      (*arg1)->setB(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -76155,7 +77251,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_AdjacencyIterator_SetNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_setNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
   Nature::EdgeNature arg2 ;
@@ -76166,20 +77262,20 @@ SWIGINTERN PyObject *_wrap_AdjacencyIterator_SetNature(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:AdjacencyIterator_SetNature",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:AdjacencyIterator_setNature",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_SetNature" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_setNature" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
   }
   arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_short(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "AdjacencyIterator_SetNature" "', argument " "2"" of type '" "Nature::EdgeNature""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "AdjacencyIterator_setNature" "', argument " "2"" of type '" "Nature::EdgeNature""'");
   } 
   arg2 = static_cast< Nature::EdgeNature >(val2);
   {
     try {
-      (*arg1)->SetNature(arg2);
+      (*arg1)->setNature(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -76195,7 +77291,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_AdjacencyIterator_SetFEdgeA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_setFEdgeA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
   FEdge *arg2 = (FEdge *) 0 ;
@@ -76206,20 +77302,20 @@ SWIGINTERN PyObject *_wrap_AdjacencyIterator_SetFEdgeA(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:AdjacencyIterator_SetFEdgeA",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:AdjacencyIterator_setFEdgeA",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_SetFEdgeA" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_setFEdgeA" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
   }
   arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FEdge, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AdjacencyIterator_SetFEdgeA" "', argument " "2"" of type '" "FEdge *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AdjacencyIterator_setFEdgeA" "', argument " "2"" of type '" "FEdge *""'"); 
   }
   arg2 = reinterpret_cast< FEdge * >(argp2);
   {
     try {
-      (*arg1)->SetFEdgeA(arg2);
+      (*arg1)->setFEdgeA(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -76235,7 +77331,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_AdjacencyIterator_SetFEdgeB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_setFEdgeB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
   FEdge *arg2 = (FEdge *) 0 ;
@@ -76246,20 +77342,20 @@ SWIGINTERN PyObject *_wrap_AdjacencyIterator_SetFEdgeB(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:AdjacencyIterator_SetFEdgeB",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:AdjacencyIterator_setFEdgeB",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_SetFEdgeB" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_setFEdgeB" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
   }
   arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FEdge, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AdjacencyIterator_SetFEdgeB" "', argument " "2"" of type '" "FEdge *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AdjacencyIterator_setFEdgeB" "', argument " "2"" of type '" "FEdge *""'"); 
   }
   arg2 = reinterpret_cast< FEdge * >(argp2);
   {
     try {
-      (*arg1)->SetFEdgeB(arg2);
+      (*arg1)->setFEdgeB(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -76275,7 +77371,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_AdjacencyIterator_SetShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_setShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
   ViewShape *arg2 = (ViewShape *) 0 ;
@@ -76286,20 +77382,20 @@ SWIGINTERN PyObject *_wrap_AdjacencyIterator_SetShape(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:AdjacencyIterator_SetShape",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:AdjacencyIterator_setShape",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_SetShape" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_setShape" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
   }
   arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewShape, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AdjacencyIterator_SetShape" "', argument " "2"" of type '" "ViewShape *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AdjacencyIterator_setShape" "', argument " "2"" of type '" "ViewShape *""'"); 
   }
   arg2 = reinterpret_cast< ViewShape * >(argp2);
   {
     try {
-      (*arg1)->SetShape(arg2);
+      (*arg1)->setShape(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -76315,7 +77411,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_AdjacencyIterator_SetId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_setId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
   Id *arg2 = 0 ;
@@ -76326,23 +77422,23 @@ SWIGINTERN PyObject *_wrap_AdjacencyIterator_SetId(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:AdjacencyIterator_SetId",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:AdjacencyIterator_setId",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_SetId" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_setId" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
   }
   arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Id,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AdjacencyIterator_SetId" "', argument " "2"" of type '" "Id const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AdjacencyIterator_setId" "', argument " "2"" of type '" "Id const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AdjacencyIterator_SetId" "', argument " "2"" of type '" "Id const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AdjacencyIterator_setId" "', argument " "2"" of type '" "Id const &""'"); 
   }
   arg2 = reinterpret_cast< Id * >(argp2);
   {
     try {
-      (*arg1)->SetId((Id const &)*arg2);
+      (*arg1)->setId((Id const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -76389,7 +77485,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_AdjacencyIterator_SetaShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_setaShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
   ViewShape *arg2 = (ViewShape *) 0 ;
@@ -76400,20 +77496,20 @@ SWIGINTERN PyObject *_wrap_AdjacencyIterator_SetaShape(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:AdjacencyIterator_SetaShape",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:AdjacencyIterator_setaShape",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_SetaShape" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_setaShape" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
   }
   arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_ViewShape, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AdjacencyIterator_SetaShape" "', argument " "2"" of type '" "ViewShape *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AdjacencyIterator_setaShape" "', argument " "2"" of type '" "ViewShape *""'"); 
   }
   arg2 = reinterpret_cast< ViewShape * >(argp2);
   {
     try {
-      (*arg1)->SetaShape(arg2);
+      (*arg1)->setaShape(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -76429,7 +77525,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_AdjacencyIterator_SetQI(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_setQI(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
   int arg2 ;
@@ -76440,20 +77536,20 @@ SWIGINTERN PyObject *_wrap_AdjacencyIterator_SetQI(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:AdjacencyIterator_SetQI",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:AdjacencyIterator_setQI",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_SetQI" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_setQI" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
   }
   arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "AdjacencyIterator_SetQI" "', argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "AdjacencyIterator_setQI" "', argument " "2"" of type '" "int""'");
   } 
   arg2 = static_cast< int >(val2);
   {
     try {
-      (*arg1)->SetQI(arg2);
+      (*arg1)->setQI(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -76611,7 +77707,7 @@ SWIGINTERN PyObject *_wrap_AdjacencyIterator_intersect_2d_area(PyObject *SWIGUNU
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_intersect_2d_area" "', argument " "1"" of type '" "AdjacencyIterator const *""'"); 
   }
   arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AdjacencyIterator_intersect_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
   }
@@ -76619,7 +77715,7 @@ SWIGINTERN PyObject *_wrap_AdjacencyIterator_intersect_2d_area(PyObject *SWIGUNU
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AdjacencyIterator_intersect_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
   }
   arg2 = reinterpret_cast< Geometry::Vec2r * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "AdjacencyIterator_intersect_2d_area" "', argument " "3"" of type '" "Geometry::Vec2r const &""'"); 
   }
@@ -76667,7 +77763,7 @@ SWIGINTERN PyObject *_wrap_AdjacencyIterator_include_in_2d_area(PyObject *SWIGUN
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_include_in_2d_area" "', argument " "1"" of type '" "AdjacencyIterator const *""'"); 
   }
   arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AdjacencyIterator_include_in_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
   }
@@ -76675,7 +77771,7 @@ SWIGINTERN PyObject *_wrap_AdjacencyIterator_include_in_2d_area(PyObject *SWIGUN
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AdjacencyIterator_include_in_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
   }
   arg2 = reinterpret_cast< Geometry::Vec2r * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "AdjacencyIterator_include_in_2d_area" "', argument " "3"" of type '" "Geometry::Vec2r const &""'"); 
   }
@@ -77231,7 +78327,7 @@ SWIGINTERN PyObject *_wrap_AdjacencyIterator_pointsBegin(PyObject *self, PyObjec
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -77261,10 +78357,7 @@ SWIGINTERN PyObject *_wrap_AdjacencyIterator_pointsBegin(PyObject *self, PyObjec
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'AdjacencyIterator_pointsBegin'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    pointsBegin(AdjacencyIterator *,float)\n"
-    "    pointsBegin(AdjacencyIterator *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'AdjacencyIterator_pointsBegin'.\n  Possible C/C++ prototypes are:\n    pointsBegin(float)\n    pointsBegin()\n");
   return NULL;
 }
 
@@ -77348,7 +78441,7 @@ SWIGINTERN PyObject *_wrap_AdjacencyIterator_pointsEnd(PyObject *self, PyObject
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -77378,10 +78471,7 @@ SWIGINTERN PyObject *_wrap_AdjacencyIterator_pointsEnd(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'AdjacencyIterator_pointsEnd'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    pointsEnd(AdjacencyIterator *,float)\n"
-    "    pointsEnd(AdjacencyIterator *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'AdjacencyIterator_pointsEnd'.\n  Possible C/C++ prototypes are:\n    pointsEnd(float)\n    pointsEnd()\n");
   return NULL;
 }
 
@@ -77460,7 +78550,7 @@ fail:
 
 SWIGINTERN PyObject *AdjacencyIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_AdjacencyIterator, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -77765,7 +78855,7 @@ SWIGINTERN PyObject *_wrap_new_ChainingIterator(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 5); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -77875,14 +78965,7 @@ SWIGINTERN PyObject *_wrap_new_ChainingIterator(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ChainingIterator'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    ChainingIterator(PyObject *,bool,bool,ViewEdge *,bool)\n"
-    "    ChainingIterator(PyObject *,bool,bool,ViewEdge *)\n"
-    "    ChainingIterator(PyObject *,bool,bool)\n"
-    "    ChainingIterator(PyObject *,bool)\n"
-    "    ChainingIterator(PyObject *)\n"
-    "    ChainingIterator(PyObject *,ChainingIterator const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ChainingIterator'.\n  Possible C/C++ prototypes are:\n    ChainingIterator(PyObject *,bool,bool,ViewEdge *,bool)\n    ChainingIterator(PyObject *,bool,bool,ViewEdge *)\n    ChainingIterator(PyObject *,bool,bool)\n    ChainingIterator(PyObject *,bool)\n    ChainingIterator(PyObject *)\n    ChainingIterator(PyObject *,ChainingIterator const &)\n");
   return NULL;
 }
 
@@ -78242,7 +79325,7 @@ fail:
 
 SWIGINTERN PyObject *ChainingIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ChainingIterator, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -78479,7 +79562,7 @@ SWIGINTERN PyObject *_wrap_new_ChainSilhouetteIterator(PyObject *self, PyObject
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -78558,13 +79641,7 @@ SWIGINTERN PyObject *_wrap_new_ChainSilhouetteIterator(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ChainSilhouetteIterator'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    ChainSilhouetteIterator(PyObject *,bool,ViewEdge *,bool)\n"
-    "    ChainSilhouetteIterator(PyObject *,bool,ViewEdge *)\n"
-    "    ChainSilhouetteIterator(PyObject *,bool)\n"
-    "    ChainSilhouetteIterator(PyObject *)\n"
-    "    ChainSilhouetteIterator(PyObject *,ChainSilhouetteIterator const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ChainSilhouetteIterator'.\n  Possible C/C++ prototypes are:\n    ChainSilhouetteIterator(PyObject *,bool,ViewEdge *,bool)\n    ChainSilhouetteIterator(PyObject *,bool,ViewEdge *)\n    ChainSilhouetteIterator(PyObject *,bool)\n    ChainSilhouetteIterator(PyObject *)\n    ChainSilhouetteIterator(PyObject *,ChainSilhouetteIterator const &)\n");
   return NULL;
 }
 
@@ -78731,7 +79808,7 @@ fail:
 
 SWIGINTERN PyObject *ChainSilhouetteIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ChainSilhouetteIterator, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -79406,7 +80483,7 @@ SWIGINTERN PyObject *_wrap_new_ChainPredicateIterator(PyObject *self, PyObject *
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 7); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -79659,19 +80736,7 @@ SWIGINTERN PyObject *_wrap_new_ChainPredicateIterator(PyObject *self, PyObject *
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ChainPredicateIterator'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    ChainPredicateIterator(PyObject *,bool,bool,ViewEdge *,bool)\n"
-    "    ChainPredicateIterator(PyObject *,bool,bool,ViewEdge *)\n"
-    "    ChainPredicateIterator(PyObject *,bool,bool)\n"
-    "    ChainPredicateIterator(PyObject *,bool)\n"
-    "    ChainPredicateIterator(PyObject *)\n"
-    "    ChainPredicateIterator(PyObject *,UnaryPredicate1D &,BinaryPredicate1D &,bool,bool,ViewEdge *,bool)\n"
-    "    ChainPredicateIterator(PyObject *,UnaryPredicate1D &,BinaryPredicate1D &,bool,bool,ViewEdge *)\n"
-    "    ChainPredicateIterator(PyObject *,UnaryPredicate1D &,BinaryPredicate1D &,bool,bool)\n"
-    "    ChainPredicateIterator(PyObject *,UnaryPredicate1D &,BinaryPredicate1D &,bool)\n"
-    "    ChainPredicateIterator(PyObject *,UnaryPredicate1D &,BinaryPredicate1D &)\n"
-    "    ChainPredicateIterator(PyObject *,ChainPredicateIterator const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ChainPredicateIterator'.\n  Possible C/C++ prototypes are:\n    ChainPredicateIterator(PyObject *,bool,bool,ViewEdge *,bool)\n    ChainPredicateIterator(PyObject *,bool,bool,ViewEdge *)\n    ChainPredicateIterator(PyObject *,bool,bool)\n    ChainPredicateIterator(PyObject *,bool)\n    ChainPredicateIterator(PyObject *)\n    ChainPredicateIterator(PyObject *,UnaryPredicate1D &,BinaryPredicate1D &,bool,bool,ViewEdge *,bool)\n    ChainPredicateIterator(PyObject *,UnaryPredicate1D &,BinaryPredicate1D &,bool,bool,ViewEdge *)\n    ChainPredicateIterator(PyObject *,UnaryPredicate1D &,BinaryPredicate1D &,bool,bool)\n    ChainPredicateIterator(PyObject *,UnaryPredicate1D &,BinaryPredicate1D &,bool)\n    ChainPredicateIterator(PyObject *,UnaryPredicate1D &,BinaryPredicate1D &)\n    ChainPredicateIterator(PyObject *,ChainPredicateIterator const &)\n");
   return NULL;
 }
 
@@ -79838,7 +80903,7 @@ fail:
 
 SWIGINTERN PyObject *ChainPredicateIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ChainPredicateIterator, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -80034,7 +81099,7 @@ fail:
 
 SWIGINTERN PyObject *UnaryPredicate0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_UnaryPredicate0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -80184,7 +81249,7 @@ fail:
 
 SWIGINTERN PyObject *BinaryPredicate0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_BinaryPredicate0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -80322,7 +81387,7 @@ fail:
 
 SWIGINTERN PyObject *TrueUP0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates0D__TrueUP0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -80460,7 +81525,7 @@ fail:
 
 SWIGINTERN PyObject *FalseUP0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates0D__FalseUP0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -80656,7 +81721,7 @@ fail:
 
 SWIGINTERN PyObject *UnaryPredicate1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_UnaryPredicate1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -80864,7 +81929,7 @@ fail:
 
 SWIGINTERN PyObject *BinaryPredicate1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_BinaryPredicate1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -81002,7 +82067,7 @@ fail:
 
 SWIGINTERN PyObject *TrueUP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__TrueUP1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -81140,7 +82205,7 @@ fail:
 
 SWIGINTERN PyObject *FalseUP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__FalseUP1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -81206,7 +82271,7 @@ SWIGINTERN PyObject *_wrap_new_QuantitativeInvisibilityUP1D(PyObject *self, PyOb
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -81225,10 +82290,7 @@ SWIGINTERN PyObject *_wrap_new_QuantitativeInvisibilityUP1D(PyObject *self, PyOb
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_QuantitativeInvisibilityUP1D'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    Predicates1D::QuantitativeInvisibilityUP1D(unsigned int)\n"
-    "    Predicates1D::QuantitativeInvisibilityUP1D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_QuantitativeInvisibilityUP1D'.\n  Possible C/C++ prototypes are:\n    Predicates1D::QuantitativeInvisibilityUP1D(unsigned int)\n    Predicates1D::QuantitativeInvisibilityUP1D()\n");
   return NULL;
 }
 
@@ -81343,7 +82405,7 @@ fail:
 
 SWIGINTERN PyObject *QuantitativeInvisibilityUP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__QuantitativeInvisibilityUP1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -81481,7 +82543,7 @@ fail:
 
 SWIGINTERN PyObject *ContourUP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__ContourUP1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -81619,7 +82681,7 @@ fail:
 
 SWIGINTERN PyObject *ExternalContourUP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__ExternalContourUP1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -81766,7 +82828,7 @@ fail:
 
 SWIGINTERN PyObject *EqualToTimeStampUP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__EqualToTimeStampUP1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -81913,7 +82975,7 @@ fail:
 
 SWIGINTERN PyObject *EqualToChainingTimeStampUP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__EqualToChainingTimeStampUP1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -81997,7 +83059,7 @@ SWIGINTERN PyObject *_wrap_new_ShapeUP1D(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -82029,10 +83091,7 @@ SWIGINTERN PyObject *_wrap_new_ShapeUP1D(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ShapeUP1D'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    Predicates1D::ShapeUP1D(unsigned int,unsigned int)\n"
-    "    Predicates1D::ShapeUP1D(unsigned int)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ShapeUP1D'.\n  Possible C/C++ prototypes are:\n    Predicates1D::ShapeUP1D(unsigned int,unsigned int)\n    Predicates1D::ShapeUP1D(unsigned int)\n");
   return NULL;
 }
 
@@ -82147,7 +83206,7 @@ fail:
 
 SWIGINTERN PyObject *ShapeUP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__ShapeUP1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -82297,7 +83356,7 @@ fail:
 
 SWIGINTERN PyObject *TrueBP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__TrueBP1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -82447,7 +83506,7 @@ fail:
 
 SWIGINTERN PyObject *FalseBP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__FalseBP1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -82597,7 +83656,7 @@ fail:
 
 SWIGINTERN PyObject *Length2DBP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__Length2DBP1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -82747,7 +83806,7 @@ fail:
 
 SWIGINTERN PyObject *SameShapeIdBP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__SameShapeIdBP1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -82881,7 +83940,7 @@ SWIGINTERN PyObject *_wrap_new_ViewMapGradientNormBP1D(PyObject *self, PyObject
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -82935,11 +83994,7 @@ SWIGINTERN PyObject *_wrap_new_ViewMapGradientNormBP1D(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewMapGradientNormBP1D'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    Predicates1D::ViewMapGradientNormBP1D(int,IntegrationType,float)\n"
-    "    Predicates1D::ViewMapGradientNormBP1D(int,IntegrationType)\n"
-    "    Predicates1D::ViewMapGradientNormBP1D(int)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewMapGradientNormBP1D'.\n  Possible C/C++ prototypes are:\n    Predicates1D::ViewMapGradientNormBP1D(int,IntegrationType,float)\n    Predicates1D::ViewMapGradientNormBP1D(int,IntegrationType)\n    Predicates1D::ViewMapGradientNormBP1D(int)\n");
   return NULL;
 }
 
@@ -83066,7 +84121,7 @@ fail:
 
 SWIGINTERN PyObject *ViewMapGradientNormBP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__ViewMapGradientNormBP1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -83150,7 +84205,7 @@ SWIGINTERN PyObject *_wrap_new_DensityLowerThanUP1D(PyObject *self, PyObject *ar
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -83182,10 +84237,7 @@ SWIGINTERN PyObject *_wrap_new_DensityLowerThanUP1D(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_DensityLowerThanUP1D'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    Predicates1D::DensityLowerThanUP1D(double,double)\n"
-    "    Predicates1D::DensityLowerThanUP1D(double)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_DensityLowerThanUP1D'.\n  Possible C/C++ prototypes are:\n    Predicates1D::DensityLowerThanUP1D(double,double)\n    Predicates1D::DensityLowerThanUP1D(double)\n");
   return NULL;
 }
 
@@ -83300,7 +84352,7 @@ fail:
 
 SWIGINTERN PyObject *DensityLowerThanUP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__DensityLowerThanUP1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -84016,7 +85068,7 @@ SWIGINTERN PyObject *_wrap_new_CurvePointIterator(PyObject *self, PyObject *args
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -84043,11 +85095,7 @@ SWIGINTERN PyObject *_wrap_new_CurvePointIterator(PyObject *self, PyObject *args
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CurvePointIterator'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    CurveInternal::CurvePointIterator(float)\n"
-    "    CurveInternal::CurvePointIterator()\n"
-    "    CurveInternal::CurvePointIterator(CurveInternal::CurvePointIterator const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CurvePointIterator'.\n  Possible C/C++ prototypes are:\n    CurveInternal::CurvePointIterator(float)\n    CurveInternal::CurvePointIterator()\n    CurveInternal::CurvePointIterator(CurveInternal::CurvePointIterator const &)\n");
   return NULL;
 }
 
@@ -84476,7 +85524,7 @@ SWIGINTERN PyObject *_wrap_CurvePointIterator_getPoint3D(PyObject *SWIGUNUSEDPAR
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -84604,7 +85652,7 @@ SWIGINTERN PyObject *_wrap_CurvePointIterator_getPoint2D(PyObject *SWIGUNUSEDPAR
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -84943,7 +85991,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_SetA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_CurvePointIterator_setA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
   SVertex *arg2 = (SVertex *) 0 ;
@@ -84954,20 +86002,20 @@ SWIGINTERN PyObject *_wrap_CurvePointIterator_SetA(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:CurvePointIterator_SetA",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:CurvePointIterator_setA",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_SetA" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_setA" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator *""'"); 
   }
   arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SVertex, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CurvePointIterator_SetA" "', argument " "2"" of type '" "SVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CurvePointIterator_setA" "', argument " "2"" of type '" "SVertex *""'"); 
   }
   arg2 = reinterpret_cast< SVertex * >(argp2);
   {
     try {
-      (*arg1)->SetA(arg2);
+      (*arg1)->setA(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -84983,7 +86031,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_SetB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_CurvePointIterator_setB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
   SVertex *arg2 = (SVertex *) 0 ;
@@ -84994,20 +86042,20 @@ SWIGINTERN PyObject *_wrap_CurvePointIterator_SetB(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:CurvePointIterator_SetB",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:CurvePointIterator_setB",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_SetB" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_setB" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator *""'"); 
   }
   arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SVertex, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CurvePointIterator_SetB" "', argument " "2"" of type '" "SVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CurvePointIterator_setB" "', argument " "2"" of type '" "SVertex *""'"); 
   }
   arg2 = reinterpret_cast< SVertex * >(argp2);
   {
     try {
-      (*arg1)->SetB(arg2);
+      (*arg1)->setB(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -85023,7 +86071,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_SetT2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_CurvePointIterator_setT2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
   float arg2 ;
@@ -85034,20 +86082,20 @@ SWIGINTERN PyObject *_wrap_CurvePointIterator_SetT2d(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:CurvePointIterator_SetT2d",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:CurvePointIterator_setT2d",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_SetT2d" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_setT2d" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator *""'"); 
   }
   arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CurvePointIterator_SetT2d" "', argument " "2"" of type '" "float""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CurvePointIterator_setT2d" "', argument " "2"" of type '" "float""'");
   } 
   arg2 = static_cast< float >(val2);
   {
     try {
-      (*arg1)->SetT2d(arg2);
+      (*arg1)->setT2d(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -85123,7 +86171,7 @@ SWIGINTERN PyObject *_wrap_CurvePointIterator_point2d(PyObject *SWIGUNUSEDPARM(s
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -85158,7 +86206,7 @@ SWIGINTERN PyObject *_wrap_CurvePointIterator_point3d(PyObject *SWIGUNUSEDPARM(s
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -85190,7 +86238,7 @@ SWIGINTERN PyObject *_wrap_CurvePointIterator_normal(PyObject *SWIGUNUSEDPARM(se
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -85545,7 +86593,7 @@ SWIGINTERN PyObject *_wrap_CurvePointIterator_directionFredo(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2d(static_cast< const Geometry::Vec2d& >(result))), SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2d(static_cast< const Geometry::Vec2d& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -85554,7 +86602,7 @@ fail:
 
 SWIGINTERN PyObject *CurvePointIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CurveInternal__CurvePointIterator, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -85712,7 +86760,7 @@ SWIGINTERN PyObject *_wrap_CurvePoint_getPoint3D(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -85840,7 +86888,7 @@ SWIGINTERN PyObject *_wrap_CurvePoint_getPoint2D(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -86247,7 +87295,7 @@ SWIGINTERN PyObject *_wrap_new_CurvePoint(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -86304,12 +87352,7 @@ SWIGINTERN PyObject *_wrap_new_CurvePoint(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CurvePoint'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    CurvePoint()\n"
-    "    CurvePoint(SVertex *,SVertex *,float)\n"
-    "    CurvePoint(CurvePoint *,CurvePoint *,float)\n"
-    "    CurvePoint(CurvePoint const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CurvePoint'.\n  Possible C/C++ prototypes are:\n    CurvePoint()\n    CurvePoint(SVertex *,SVertex *,float)\n    CurvePoint(CurvePoint *,CurvePoint *,float)\n    CurvePoint(CurvePoint const &)\n");
   return NULL;
 }
 
@@ -86486,7 +87529,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_SetA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_CurvePoint_setA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CurvePoint *arg1 = (CurvePoint *) 0 ;
   SVertex *arg2 = (SVertex *) 0 ;
@@ -86497,20 +87540,20 @@ SWIGINTERN PyObject *_wrap_CurvePoint_SetA(PyObject *SWIGUNUSEDPARM(self), PyObj
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:CurvePoint_SetA",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:CurvePoint_setA",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurvePoint, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePoint_SetA" "', argument " "1"" of type '" "CurvePoint *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePoint_setA" "', argument " "1"" of type '" "CurvePoint *""'"); 
   }
   arg1 = reinterpret_cast< CurvePoint * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SVertex, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CurvePoint_SetA" "', argument " "2"" of type '" "SVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CurvePoint_setA" "', argument " "2"" of type '" "SVertex *""'"); 
   }
   arg2 = reinterpret_cast< SVertex * >(argp2);
   {
     try {
-      (arg1)->SetA(arg2);
+      (arg1)->setA(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -86526,7 +87569,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_SetB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_CurvePoint_setB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CurvePoint *arg1 = (CurvePoint *) 0 ;
   SVertex *arg2 = (SVertex *) 0 ;
@@ -86537,20 +87580,20 @@ SWIGINTERN PyObject *_wrap_CurvePoint_SetB(PyObject *SWIGUNUSEDPARM(self), PyObj
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:CurvePoint_SetB",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:CurvePoint_setB",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurvePoint, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePoint_SetB" "', argument " "1"" of type '" "CurvePoint *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePoint_setB" "', argument " "1"" of type '" "CurvePoint *""'"); 
   }
   arg1 = reinterpret_cast< CurvePoint * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SVertex, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CurvePoint_SetB" "', argument " "2"" of type '" "SVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CurvePoint_setB" "', argument " "2"" of type '" "SVertex *""'"); 
   }
   arg2 = reinterpret_cast< SVertex * >(argp2);
   {
     try {
-      (arg1)->SetB(arg2);
+      (arg1)->setB(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -86566,7 +87609,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_SetT2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_CurvePoint_setT2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CurvePoint *arg1 = (CurvePoint *) 0 ;
   float arg2 ;
@@ -86577,20 +87620,20 @@ SWIGINTERN PyObject *_wrap_CurvePoint_SetT2d(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:CurvePoint_SetT2d",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:CurvePoint_setT2d",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurvePoint, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePoint_SetT2d" "', argument " "1"" of type '" "CurvePoint *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePoint_setT2d" "', argument " "1"" of type '" "CurvePoint *""'"); 
   }
   arg1 = reinterpret_cast< CurvePoint * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CurvePoint_SetT2d" "', argument " "2"" of type '" "float""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CurvePoint_setT2d" "', argument " "2"" of type '" "float""'");
   } 
   arg2 = static_cast< float >(val2);
   {
     try {
-      (arg1)->SetT2d(arg2);
+      (arg1)->setT2d(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -86666,7 +87709,7 @@ SWIGINTERN PyObject *_wrap_CurvePoint_point2d(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -86701,7 +87744,7 @@ SWIGINTERN PyObject *_wrap_CurvePoint_point3d(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -86733,7 +87776,7 @@ SWIGINTERN PyObject *_wrap_CurvePoint_normal(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -87088,7 +88131,7 @@ SWIGINTERN PyObject *_wrap_CurvePoint_directionFredo(PyObject *SWIGUNUSEDPARM(se
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2d(static_cast< const Geometry::Vec2d& >(result))), SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2d(static_cast< const Geometry::Vec2d& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -87097,7 +88140,7 @@ fail:
 
 SWIGINTERN PyObject *CurvePoint_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CurvePoint, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -87201,7 +88244,7 @@ SWIGINTERN PyObject *_wrap_new_Curve(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -87226,11 +88269,7 @@ SWIGINTERN PyObject *_wrap_new_Curve(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Curve'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    Curve()\n"
-    "    Curve(Id const &)\n"
-    "    Curve(Curve const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Curve'.\n  Possible C/C++ prototypes are:\n    Curve()\n    Curve(Id const &)\n    Curve(Curve const &)\n");
   return NULL;
 }
 
@@ -87384,7 +88423,7 @@ SWIGINTERN PyObject *_wrap_Curve_push_vertex_back(PyObject *self, PyObject *args
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -87418,10 +88457,7 @@ SWIGINTERN PyObject *_wrap_Curve_push_vertex_back(PyObject *self, PyObject *args
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Curve_push_vertex_back'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    push_vertex_back(Curve *,Curve::Vertex *)\n"
-    "    push_vertex_back(Curve *,SVertex *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Curve_push_vertex_back'.\n  Possible C/C++ prototypes are:\n    push_vertex_back(Curve::Vertex *)\n    push_vertex_back(SVertex *)\n");
   return NULL;
 }
 
@@ -87512,7 +88548,7 @@ SWIGINTERN PyObject *_wrap_Curve_push_vertex_front(PyObject *self, PyObject *arg
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -87546,10 +88582,7 @@ SWIGINTERN PyObject *_wrap_Curve_push_vertex_front(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Curve_push_vertex_front'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    push_vertex_front(Curve *,Curve::Vertex *)\n"
-    "    push_vertex_front(Curve *,SVertex *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Curve_push_vertex_front'.\n  Possible C/C++ prototypes are:\n    push_vertex_front(Curve::Vertex *)\n    push_vertex_front(SVertex *)\n");
   return NULL;
 }
 
@@ -87804,7 +88837,7 @@ SWIGINTERN PyObject *_wrap_Curve_curvePointsBegin(PyObject *self, PyObject *args
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -87834,10 +88867,7 @@ SWIGINTERN PyObject *_wrap_Curve_curvePointsBegin(PyObject *self, PyObject *args
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Curve_curvePointsBegin'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    curvePointsBegin(Curve *,float)\n"
-    "    curvePointsBegin(Curve *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Curve_curvePointsBegin'.\n  Possible C/C++ prototypes are:\n    curvePointsBegin(float)\n    curvePointsBegin()\n");
   return NULL;
 }
 
@@ -87921,7 +88951,7 @@ SWIGINTERN PyObject *_wrap_Curve_curvePointsEnd(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -87951,10 +88981,7 @@ SWIGINTERN PyObject *_wrap_Curve_curvePointsEnd(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Curve_curvePointsEnd'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    curvePointsEnd(Curve *,float)\n"
-    "    curvePointsEnd(Curve *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Curve_curvePointsEnd'.\n  Possible C/C++ prototypes are:\n    curvePointsEnd(float)\n    curvePointsEnd()\n");
   return NULL;
 }
 
@@ -88166,7 +89193,7 @@ SWIGINTERN PyObject *_wrap_Curve_pointsBegin(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -88196,10 +89223,7 @@ SWIGINTERN PyObject *_wrap_Curve_pointsBegin(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Curve_pointsBegin'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    pointsBegin(Curve *,float)\n"
-    "    pointsBegin(Curve *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Curve_pointsBegin'.\n  Possible C/C++ prototypes are:\n    pointsBegin(float)\n    pointsBegin()\n");
   return NULL;
 }
 
@@ -88283,7 +89307,7 @@ SWIGINTERN PyObject *_wrap_Curve_pointsEnd(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -88313,17 +89337,14 @@ SWIGINTERN PyObject *_wrap_Curve_pointsEnd(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Curve_pointsEnd'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    pointsEnd(Curve *,float)\n"
-    "    pointsEnd(Curve *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Curve_pointsEnd'.\n  Possible C/C++ prototypes are:\n    pointsEnd(float)\n    pointsEnd()\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *Curve_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Curve, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -88451,7 +89472,7 @@ SWIGINTERN PyObject *_wrap_new_StrokeVertexIterator(PyObject *self, PyObject *ar
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -88484,11 +89505,7 @@ SWIGINTERN PyObject *_wrap_new_StrokeVertexIterator(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_StrokeVertexIterator'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    StrokeInternal::StrokeVertexIterator()\n"
-    "    StrokeInternal::StrokeVertexIterator(StrokeInternal::StrokeVertexIterator const &)\n"
-    "    StrokeInternal::StrokeVertexIterator(Stroke::vertex_container::iterator const &,Stroke::vertex_container::iterator const &,Stroke::vertex_container::iterator const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_StrokeVertexIterator'.\n  Possible C/C++ prototypes are:\n    StrokeInternal::StrokeVertexIterator()\n    StrokeInternal::StrokeVertexIterator(StrokeInternal::StrokeVertexIterator const &)\n    StrokeInternal::StrokeVertexIterator(Stroke::vertex_container::iterator const &,Stroke::vertex_container::iterator const &,Stroke::vertex_container::iterator const &)\n");
   return NULL;
 }
 
@@ -89046,7 +90063,7 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getPoint(PyObject *SWIGUNUSEDPAR
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -89129,7 +90146,7 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_attribute(PyObject *self, PyObje
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -89153,10 +90170,7 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_attribute(PyObject *self, PyObje
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'StrokeVertexIterator_attribute'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    attribute(StrokeInternal::StrokeVertexIterator const *)\n"
-    "    attribute(StrokeInternal::StrokeVertexIterator *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'StrokeVertexIterator_attribute'.\n  Possible C/C++ prototypes are:\n    attribute()\n    attribute()\n");
   return NULL;
 }
 
@@ -89225,7 +90239,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
   real arg2 ;
@@ -89236,20 +90250,20 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetX(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertexIterator_SetX",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertexIterator_setX",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_SetX" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_setX" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
   }
   arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "StrokeVertexIterator_SetX" "', argument " "2"" of type '" "real""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "StrokeVertexIterator_setX" "', argument " "2"" of type '" "real""'");
   } 
   arg2 = static_cast< real >(val2);
   {
     try {
-      (*arg1)->SetX(arg2);
+      (*arg1)->setX(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -89265,7 +90279,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
   real arg2 ;
@@ -89276,20 +90290,20 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetY(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertexIterator_SetY",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertexIterator_setY",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_SetY" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_setY" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
   }
   arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "StrokeVertexIterator_SetY" "', argument " "2"" of type '" "real""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "StrokeVertexIterator_setY" "', argument " "2"" of type '" "real""'");
   } 
   arg2 = static_cast< real >(val2);
   {
     try {
-      (*arg1)->SetY(arg2);
+      (*arg1)->setY(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -89305,7 +90319,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetPoint__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_setPoint__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
   real arg2 ;
@@ -89320,25 +90334,25 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetPoint__SWIG_0(PyObject *SWIGU
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:StrokeVertexIterator_SetPoint",&obj0,&obj1,&obj2)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OOO:StrokeVertexIterator_setPoint",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_SetPoint" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_setPoint" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
   }
   arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "StrokeVertexIterator_SetPoint" "', argument " "2"" of type '" "real""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "StrokeVertexIterator_setPoint" "', argument " "2"" of type '" "real""'");
   } 
   arg2 = static_cast< real >(val2);
   ecode3 = SWIG_AsVal_double(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "StrokeVertexIterator_SetPoint" "', argument " "3"" of type '" "real""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "StrokeVertexIterator_setPoint" "', argument " "3"" of type '" "real""'");
   } 
   arg3 = static_cast< real >(val3);
   {
     try {
-      (*arg1)->SetPoint(arg2,arg3);
+      (*arg1)->setPoint(arg2,arg3);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -89354,7 +90368,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetPoint__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_setPoint__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
   Geometry::Vec2f *arg2 = 0 ;
@@ -89365,23 +90379,23 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetPoint__SWIG_1(PyObject *SWIGU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertexIterator_SetPoint",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertexIterator_setPoint",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_SetPoint" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_setPoint" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
   }
   arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_float_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeVertexIterator_SetPoint" "', argument " "2"" of type '" "Geometry::Vec2f const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeVertexIterator_setPoint" "', argument " "2"" of type '" "Geometry::Vec2f const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "StrokeVertexIterator_SetPoint" "', argument " "2"" of type '" "Geometry::Vec2f const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "StrokeVertexIterator_setPoint" "', argument " "2"" of type '" "Geometry::Vec2f const &""'"); 
   }
   arg2 = reinterpret_cast< Geometry::Vec2f * >(argp2);
   {
     try {
-      (*arg1)->SetPoint((Geometry::Vec2f const &)*arg2);
+      (*arg1)->setPoint((Geometry::Vec2f const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -89397,13 +90411,13 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetPoint(PyObject *self, PyObject *args) {
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_setPoint(PyObject *self, PyObject *args) {
   int argc;
   PyObject *argv[4];
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -89413,10 +90427,10 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetPoint(PyObject *self, PyObjec
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2T_float_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_StrokeVertexIterator_SetPoint__SWIG_1(self, args);
+        return _wrap_StrokeVertexIterator_setPoint__SWIG_1(self, args);
       }
     }
   }
@@ -89436,22 +90450,19 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetPoint(PyObject *self, PyObjec
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_StrokeVertexIterator_SetPoint__SWIG_0(self, args);
+          return _wrap_StrokeVertexIterator_setPoint__SWIG_0(self, args);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'StrokeVertexIterator_SetPoint'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    SetPoint(StrokeInternal::StrokeVertexIterator *,real,real)\n"
-    "    SetPoint(StrokeInternal::StrokeVertexIterator *,Geometry::Vec2f const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'StrokeVertexIterator_setPoint'.\n  Possible C/C++ prototypes are:\n    setPoint(real,real)\n    setPoint(Geometry::Vec2f const &)\n");
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetAttribute(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_setAttribute(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
   StrokeAttribute *arg2 = 0 ;
@@ -89462,23 +90473,23 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetAttribute(PyObject *SWIGUNUSE
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertexIterator_SetAttribute",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertexIterator_setAttribute",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_SetAttribute" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_setAttribute" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
   }
   arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_StrokeAttribute,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeVertexIterator_SetAttribute" "', argument " "2"" of type '" "StrokeAttribute const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeVertexIterator_setAttribute" "', argument " "2"" of type '" "StrokeAttribute const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "StrokeVertexIterator_SetAttribute" "', argument " "2"" of type '" "StrokeAttribute const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "StrokeVertexIterator_setAttribute" "', argument " "2"" of type '" "StrokeAttribute const &""'"); 
   }
   arg2 = reinterpret_cast< StrokeAttribute * >(argp2);
   {
     try {
-      (*arg1)->SetAttribute((StrokeAttribute const &)*arg2);
+      (*arg1)->setAttribute((StrokeAttribute const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -89494,7 +90505,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetCurvilinearAbscissa(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_setCurvilinearAbscissa(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
   float arg2 ;
@@ -89505,20 +90516,20 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetCurvilinearAbscissa(PyObject
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertexIterator_SetCurvilinearAbscissa",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertexIterator_setCurvilinearAbscissa",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_SetCurvilinearAbscissa" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_setCurvilinearAbscissa" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
   }
   arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "StrokeVertexIterator_SetCurvilinearAbscissa" "', argument " "2"" of type '" "float""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "StrokeVertexIterator_setCurvilinearAbscissa" "', argument " "2"" of type '" "float""'");
   } 
   arg2 = static_cast< float >(val2);
   {
     try {
-      (*arg1)->SetCurvilinearAbscissa(arg2);
+      (*arg1)->setCurvilinearAbscissa(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -89534,7 +90545,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetStrokeLength(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_setStrokeLength(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
   float arg2 ;
@@ -89545,20 +90556,20 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetStrokeLength(PyObject *SWIGUN
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertexIterator_SetStrokeLength",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertexIterator_setStrokeLength",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_SetStrokeLength" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_setStrokeLength" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
   }
   arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "StrokeVertexIterator_SetStrokeLength" "', argument " "2"" of type '" "float""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "StrokeVertexIterator_setStrokeLength" "', argument " "2"" of type '" "float""'");
   } 
   arg2 = static_cast< float >(val2);
   {
     try {
-      (*arg1)->SetStrokeLength(arg2);
+      (*arg1)->setStrokeLength(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -89695,7 +90706,7 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getPoint3D(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -89823,7 +90834,7 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getPoint2D(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -90162,7 +91173,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_setA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
   SVertex *arg2 = (SVertex *) 0 ;
@@ -90173,20 +91184,20 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetA(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertexIterator_SetA",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertexIterator_setA",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_SetA" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_setA" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
   }
   arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SVertex, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeVertexIterator_SetA" "', argument " "2"" of type '" "SVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeVertexIterator_setA" "', argument " "2"" of type '" "SVertex *""'"); 
   }
   arg2 = reinterpret_cast< SVertex * >(argp2);
   {
     try {
-      (*arg1)->SetA(arg2);
+      (*arg1)->setA(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -90202,7 +91213,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_setB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
   SVertex *arg2 = (SVertex *) 0 ;
@@ -90213,20 +91224,20 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetB(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertexIterator_SetB",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertexIterator_setB",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_SetB" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_setB" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
   }
   arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SVertex, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeVertexIterator_SetB" "', argument " "2"" of type '" "SVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeVertexIterator_setB" "', argument " "2"" of type '" "SVertex *""'"); 
   }
   arg2 = reinterpret_cast< SVertex * >(argp2);
   {
     try {
-      (*arg1)->SetB(arg2);
+      (*arg1)->setB(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -90242,7 +91253,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetT2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_StrokeVertexIterator_setT2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   StrokeInternal::StrokeVertexIterator *arg1 = (StrokeInternal::StrokeVertexIterator *) 0 ;
   float arg2 ;
@@ -90253,20 +91264,20 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetT2d(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertexIterator_SetT2d",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertexIterator_setT2d",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_SetT2d" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_setT2d" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
   }
   arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "StrokeVertexIterator_SetT2d" "', argument " "2"" of type '" "float""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "StrokeVertexIterator_setT2d" "', argument " "2"" of type '" "float""'");
   } 
   arg2 = static_cast< float >(val2);
   {
     try {
-      (*arg1)->SetT2d(arg2);
+      (*arg1)->setT2d(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -90342,7 +91353,7 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_point2d(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -90377,7 +91388,7 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_point3d(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -90409,7 +91420,7 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_normal(PyObject *SWIGUNUSEDPARM(
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -90764,7 +91775,7 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_directionFredo(PyObject *SWIGUNU
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2d(static_cast< const Geometry::Vec2d& >(result))), SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2d(static_cast< const Geometry::Vec2d& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -90773,7 +91784,7 @@ fail:
 
 SWIGINTERN PyObject *StrokeVertexIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -90975,7 +91986,7 @@ SWIGINTERN PyObject *_wrap_new_StrokeAttribute(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 6); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -91050,12 +92061,7 @@ SWIGINTERN PyObject *_wrap_new_StrokeAttribute(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_StrokeAttribute'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    StrokeAttribute()\n"
-    "    StrokeAttribute(StrokeAttribute const &)\n"
-    "    StrokeAttribute(float,float,float,float,float,float)\n"
-    "    StrokeAttribute(StrokeAttribute const &,StrokeAttribute const &,float)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_StrokeAttribute'.\n  Possible C/C++ prototypes are:\n    StrokeAttribute()\n    StrokeAttribute(StrokeAttribute const &)\n    StrokeAttribute(float,float,float,float,float,float)\n    StrokeAttribute(StrokeAttribute const &,StrokeAttribute const &,float)\n");
   return NULL;
 }
 
@@ -91245,7 +92251,7 @@ SWIGINTERN PyObject *_wrap_StrokeAttribute_getColorRGB(PyObject *SWIGUNUSEDPARM(
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -91405,7 +92411,7 @@ SWIGINTERN PyObject *_wrap_StrokeAttribute_getThicknessRL(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -91523,7 +92529,7 @@ SWIGINTERN PyObject *_wrap_StrokeAttribute_getAttributeVec2f(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
   if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
   return resultobj;
 fail:
@@ -91567,7 +92573,7 @@ SWIGINTERN PyObject *_wrap_StrokeAttribute_getAttributeVec3f(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
   if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
   return resultobj;
 fail:
@@ -91783,7 +92789,7 @@ SWIGINTERN PyObject *_wrap_StrokeAttribute_setColor__SWIG_1(PyObject *SWIGUNUSED
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeAttribute_setColor" "', argument " "1"" of type '" "StrokeAttribute *""'"); 
   }
   arg1 = reinterpret_cast< StrokeAttribute * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_float_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tfloat_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeAttribute_setColor" "', argument " "2"" of type '" "Geometry::Vec3f const &""'"); 
   }
@@ -91815,7 +92821,7 @@ SWIGINTERN PyObject *_wrap_StrokeAttribute_setColor(PyObject *self, PyObject *ar
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -91825,7 +92831,7 @@ SWIGINTERN PyObject *_wrap_StrokeAttribute_setColor(PyObject *self, PyObject *ar
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_StrokeAttribute, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec3T_float_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_StrokeAttribute_setColor__SWIG_1(self, args);
@@ -91861,10 +92867,7 @@ SWIGINTERN PyObject *_wrap_StrokeAttribute_setColor(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'StrokeAttribute_setColor'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    setColor(StrokeAttribute *,float,float,float)\n"
-    "    setColor(StrokeAttribute *,Geometry::Vec3f const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'StrokeAttribute_setColor'.\n  Possible C/C++ prototypes are:\n    setColor(float,float,float)\n    setColor(Geometry::Vec3f const &)\n");
   return NULL;
 }
 
@@ -91975,7 +92978,7 @@ SWIGINTERN PyObject *_wrap_StrokeAttribute_setThickness__SWIG_1(PyObject *SWIGUN
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeAttribute_setThickness" "', argument " "1"" of type '" "StrokeAttribute *""'"); 
   }
   arg1 = reinterpret_cast< StrokeAttribute * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_float_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeAttribute_setThickness" "', argument " "2"" of type '" "Geometry::Vec2f const &""'"); 
   }
@@ -92007,7 +93010,7 @@ SWIGINTERN PyObject *_wrap_StrokeAttribute_setThickness(PyObject *self, PyObject
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -92017,7 +93020,7 @@ SWIGINTERN PyObject *_wrap_StrokeAttribute_setThickness(PyObject *self, PyObject
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_StrokeAttribute, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2T_float_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_StrokeAttribute_setThickness__SWIG_1(self, args);
@@ -92047,15 +93050,12 @@ SWIGINTERN PyObject *_wrap_StrokeAttribute_setThickness(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'StrokeAttribute_setThickness'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    setThickness(StrokeAttribute *,float,float)\n"
-    "    setThickness(StrokeAttribute *,Geometry::Vec2f const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'StrokeAttribute_setThickness'.\n  Possible C/C++ prototypes are:\n    setThickness(float,float)\n    setThickness(Geometry::Vec2f const &)\n");
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_SetVisible(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_StrokeAttribute_setVisible(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   StrokeAttribute *arg1 = (StrokeAttribute *) 0 ;
   bool arg2 ;
@@ -92066,20 +93066,20 @@ SWIGINTERN PyObject *_wrap_StrokeAttribute_SetVisible(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeAttribute_SetVisible",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeAttribute_setVisible",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeAttribute, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeAttribute_SetVisible" "', argument " "1"" of type '" "StrokeAttribute *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeAttribute_setVisible" "', argument " "1"" of type '" "StrokeAttribute *""'"); 
   }
   arg1 = reinterpret_cast< StrokeAttribute * >(argp1);
   ecode2 = SWIG_AsVal_bool(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "StrokeAttribute_SetVisible" "', argument " "2"" of type '" "bool""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "StrokeAttribute_setVisible" "', argument " "2"" of type '" "bool""'");
   } 
   arg2 = static_cast< bool >(val2);
   {
     try {
-      (arg1)->SetVisible(arg2);
+      (arg1)->setVisible(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -92174,7 +93174,7 @@ SWIGINTERN PyObject *_wrap_StrokeAttribute_setAttributeVec2f(PyObject *SWIGUNUSE
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeAttribute_setAttributeVec2f" "', argument " "2"" of type '" "char const *""'");
   }
   arg2 = reinterpret_cast< char * >(buf2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2T_float_t,  0  | 0);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "StrokeAttribute_setAttributeVec2f" "', argument " "3"" of type '" "Geometry::Vec2f const &""'"); 
   }
@@ -92229,7 +93229,7 @@ SWIGINTERN PyObject *_wrap_StrokeAttribute_setAttributeVec3f(PyObject *SWIGUNUSE
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeAttribute_setAttributeVec3f" "', argument " "2"" of type '" "char const *""'");
   }
   arg2 = reinterpret_cast< char * >(buf2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec3T_float_t,  0  | 0);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec3Tfloat_t,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "StrokeAttribute_setAttributeVec3f" "', argument " "3"" of type '" "Geometry::Vec3f const &""'"); 
   }
@@ -92259,7 +93259,7 @@ fail:
 
 SWIGINTERN PyObject *StrokeAttribute_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeAttribute, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -92518,7 +93518,7 @@ SWIGINTERN PyObject *_wrap_new_StrokeVertex(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -92586,14 +93586,7 @@ SWIGINTERN PyObject *_wrap_new_StrokeVertex(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_StrokeVertex'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    StrokeVertex()\n"
-    "    StrokeVertex(StrokeVertex const &)\n"
-    "    StrokeVertex(SVertex *)\n"
-    "    StrokeVertex(CurvePoint *)\n"
-    "    StrokeVertex(StrokeVertex *,StrokeVertex *,float)\n"
-    "    StrokeVertex(SVertex *,StrokeAttribute const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_StrokeVertex'.\n  Possible C/C++ prototypes are:\n    StrokeVertex()\n    StrokeVertex(StrokeVertex const &)\n    StrokeVertex(SVertex *)\n    StrokeVertex(CurvePoint *)\n    StrokeVertex(StrokeVertex *,StrokeVertex *,float)\n    StrokeVertex(SVertex *,StrokeAttribute const &)\n");
   return NULL;
 }
 
@@ -92719,7 +93712,7 @@ SWIGINTERN PyObject *_wrap_StrokeVertex_getPoint(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -92802,7 +93795,7 @@ SWIGINTERN PyObject *_wrap_StrokeVertex_attribute(PyObject *self, PyObject *args
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -92826,10 +93819,7 @@ SWIGINTERN PyObject *_wrap_StrokeVertex_attribute(PyObject *self, PyObject *args
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'StrokeVertex_attribute'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    attribute(StrokeVertex const *)\n"
-    "    attribute(StrokeVertex *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'StrokeVertex_attribute'.\n  Possible C/C++ prototypes are:\n    attribute()\n    attribute()\n");
   return NULL;
 }
 
@@ -92930,7 +93920,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertex_SetX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_StrokeVertex_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   StrokeVertex *arg1 = (StrokeVertex *) 0 ;
   real arg2 ;
@@ -92941,20 +93931,20 @@ SWIGINTERN PyObject *_wrap_StrokeVertex_SetX(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertex_SetX",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertex_setX",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeVertex, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertex_SetX" "', argument " "1"" of type '" "StrokeVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertex_setX" "', argument " "1"" of type '" "StrokeVertex *""'"); 
   }
   arg1 = reinterpret_cast< StrokeVertex * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "StrokeVertex_SetX" "', argument " "2"" of type '" "real""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "StrokeVertex_setX" "', argument " "2"" of type '" "real""'");
   } 
   arg2 = static_cast< real >(val2);
   {
     try {
-      (arg1)->SetX(arg2);
+      (arg1)->setX(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -92970,7 +93960,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertex_SetY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_StrokeVertex_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   StrokeVertex *arg1 = (StrokeVertex *) 0 ;
   real arg2 ;
@@ -92981,20 +93971,20 @@ SWIGINTERN PyObject *_wrap_StrokeVertex_SetY(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertex_SetY",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertex_setY",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeVertex, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertex_SetY" "', argument " "1"" of type '" "StrokeVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertex_setY" "', argument " "1"" of type '" "StrokeVertex *""'"); 
   }
   arg1 = reinterpret_cast< StrokeVertex * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "StrokeVertex_SetY" "', argument " "2"" of type '" "real""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "StrokeVertex_setY" "', argument " "2"" of type '" "real""'");
   } 
   arg2 = static_cast< real >(val2);
   {
     try {
-      (arg1)->SetY(arg2);
+      (arg1)->setY(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -93010,7 +94000,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertex_SetPoint__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_StrokeVertex_setPoint__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   StrokeVertex *arg1 = (StrokeVertex *) 0 ;
   real arg2 ;
@@ -93025,25 +94015,25 @@ SWIGINTERN PyObject *_wrap_StrokeVertex_SetPoint__SWIG_0(PyObject *SWIGUNUSEDPAR
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:StrokeVertex_SetPoint",&obj0,&obj1,&obj2)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OOO:StrokeVertex_setPoint",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeVertex, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertex_SetPoint" "', argument " "1"" of type '" "StrokeVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertex_setPoint" "', argument " "1"" of type '" "StrokeVertex *""'"); 
   }
   arg1 = reinterpret_cast< StrokeVertex * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "StrokeVertex_SetPoint" "', argument " "2"" of type '" "real""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "StrokeVertex_setPoint" "', argument " "2"" of type '" "real""'");
   } 
   arg2 = static_cast< real >(val2);
   ecode3 = SWIG_AsVal_double(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "StrokeVertex_SetPoint" "', argument " "3"" of type '" "real""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "StrokeVertex_setPoint" "', argument " "3"" of type '" "real""'");
   } 
   arg3 = static_cast< real >(val3);
   {
     try {
-      (arg1)->SetPoint(arg2,arg3);
+      (arg1)->setPoint(arg2,arg3);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -93059,7 +94049,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertex_SetPoint__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_StrokeVertex_setPoint__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   StrokeVertex *arg1 = (StrokeVertex *) 0 ;
   Geometry::Vec2f *arg2 = 0 ;
@@ -93070,23 +94060,23 @@ SWIGINTERN PyObject *_wrap_StrokeVertex_SetPoint__SWIG_1(PyObject *SWIGUNUSEDPAR
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertex_SetPoint",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertex_setPoint",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeVertex, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertex_SetPoint" "', argument " "1"" of type '" "StrokeVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertex_setPoint" "', argument " "1"" of type '" "StrokeVertex *""'"); 
   }
   arg1 = reinterpret_cast< StrokeVertex * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_float_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeVertex_SetPoint" "', argument " "2"" of type '" "Geometry::Vec2f const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeVertex_setPoint" "', argument " "2"" of type '" "Geometry::Vec2f const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "StrokeVertex_SetPoint" "', argument " "2"" of type '" "Geometry::Vec2f const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "StrokeVertex_setPoint" "', argument " "2"" of type '" "Geometry::Vec2f const &""'"); 
   }
   arg2 = reinterpret_cast< Geometry::Vec2f * >(argp2);
   {
     try {
-      (arg1)->SetPoint((Geometry::Vec2f const &)*arg2);
+      (arg1)->setPoint((Geometry::Vec2f const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -93102,13 +94092,13 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertex_SetPoint(PyObject *self, PyObject *args) {
+SWIGINTERN PyObject *_wrap_StrokeVertex_setPoint(PyObject *self, PyObject *args) {
   int argc;
   PyObject *argv[4];
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -93118,10 +94108,10 @@ SWIGINTERN PyObject *_wrap_StrokeVertex_SetPoint(PyObject *self, PyObject *args)
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_StrokeVertex, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2T_float_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_StrokeVertex_SetPoint__SWIG_1(self, args);
+        return _wrap_StrokeVertex_setPoint__SWIG_1(self, args);
       }
     }
   }
@@ -93141,22 +94131,19 @@ SWIGINTERN PyObject *_wrap_StrokeVertex_SetPoint(PyObject *self, PyObject *args)
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_StrokeVertex_SetPoint__SWIG_0(self, args);
+          return _wrap_StrokeVertex_setPoint__SWIG_0(self, args);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'StrokeVertex_SetPoint'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    SetPoint(StrokeVertex *,real,real)\n"
-    "    SetPoint(StrokeVertex *,Geometry::Vec2f const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'StrokeVertex_setPoint'.\n  Possible C/C++ prototypes are:\n    setPoint(real,real)\n    setPoint(Geometry::Vec2f const &)\n");
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertex_SetAttribute(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_StrokeVertex_setAttribute(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   StrokeVertex *arg1 = (StrokeVertex *) 0 ;
   StrokeAttribute *arg2 = 0 ;
@@ -93167,23 +94154,23 @@ SWIGINTERN PyObject *_wrap_StrokeVertex_SetAttribute(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertex_SetAttribute",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertex_setAttribute",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeVertex, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertex_SetAttribute" "', argument " "1"" of type '" "StrokeVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertex_setAttribute" "', argument " "1"" of type '" "StrokeVertex *""'"); 
   }
   arg1 = reinterpret_cast< StrokeVertex * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_StrokeAttribute,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeVertex_SetAttribute" "', argument " "2"" of type '" "StrokeAttribute const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeVertex_setAttribute" "', argument " "2"" of type '" "StrokeAttribute const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "StrokeVertex_SetAttribute" "', argument " "2"" of type '" "StrokeAttribute const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "StrokeVertex_setAttribute" "', argument " "2"" of type '" "StrokeAttribute const &""'"); 
   }
   arg2 = reinterpret_cast< StrokeAttribute * >(argp2);
   {
     try {
-      (arg1)->SetAttribute((StrokeAttribute const &)*arg2);
+      (arg1)->setAttribute((StrokeAttribute const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -93199,7 +94186,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertex_SetCurvilinearAbscissa(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_StrokeVertex_setCurvilinearAbscissa(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   StrokeVertex *arg1 = (StrokeVertex *) 0 ;
   float arg2 ;
@@ -93210,20 +94197,20 @@ SWIGINTERN PyObject *_wrap_StrokeVertex_SetCurvilinearAbscissa(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertex_SetCurvilinearAbscissa",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertex_setCurvilinearAbscissa",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeVertex, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertex_SetCurvilinearAbscissa" "', argument " "1"" of type '" "StrokeVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertex_setCurvilinearAbscissa" "', argument " "1"" of type '" "StrokeVertex *""'"); 
   }
   arg1 = reinterpret_cast< StrokeVertex * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "StrokeVertex_SetCurvilinearAbscissa" "', argument " "2"" of type '" "float""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "StrokeVertex_setCurvilinearAbscissa" "', argument " "2"" of type '" "float""'");
   } 
   arg2 = static_cast< float >(val2);
   {
     try {
-      (arg1)->SetCurvilinearAbscissa(arg2);
+      (arg1)->setCurvilinearAbscissa(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -93239,7 +94226,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertex_SetStrokeLength(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_StrokeVertex_setStrokeLength(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   StrokeVertex *arg1 = (StrokeVertex *) 0 ;
   float arg2 ;
@@ -93250,20 +94237,20 @@ SWIGINTERN PyObject *_wrap_StrokeVertex_SetStrokeLength(PyObject *SWIGUNUSEDPARM
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertex_SetStrokeLength",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:StrokeVertex_setStrokeLength",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_StrokeVertex, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertex_SetStrokeLength" "', argument " "1"" of type '" "StrokeVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertex_setStrokeLength" "', argument " "1"" of type '" "StrokeVertex *""'"); 
   }
   arg1 = reinterpret_cast< StrokeVertex * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "StrokeVertex_SetStrokeLength" "', argument " "2"" of type '" "float""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "StrokeVertex_setStrokeLength" "', argument " "2"" of type '" "float""'");
   } 
   arg2 = static_cast< float >(val2);
   {
     try {
-      (arg1)->SetStrokeLength(arg2);
+      (arg1)->setStrokeLength(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -93281,7 +94268,7 @@ fail:
 
 SWIGINTERN PyObject *StrokeVertex_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeVertex, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -93414,7 +94401,7 @@ SWIGINTERN PyObject *_wrap_new_Stroke(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -93431,10 +94418,7 @@ SWIGINTERN PyObject *_wrap_new_Stroke(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Stroke'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    Stroke()\n"
-    "    Stroke(Stroke const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Stroke'.\n  Possible C/C++ prototypes are:\n    Stroke()\n    Stroke(Stroke const &)\n");
   return NULL;
 }
 
@@ -93598,7 +94582,7 @@ SWIGINTERN PyObject *_wrap_Stroke_Resample(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -93634,10 +94618,7 @@ SWIGINTERN PyObject *_wrap_Stroke_Resample(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_Resample'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    Resample(Stroke *,int)\n"
-    "    Resample(Stroke *,float)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_Resample'.\n  Possible C/C++ prototypes are:\n    Resample(int)\n    Resample(float)\n");
   return NULL;
 }
 
@@ -94049,7 +95030,7 @@ SWIGINTERN PyObject *_wrap_Stroke_viewedges_begin(PyObject *self, PyObject *args
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -94073,10 +95054,7 @@ SWIGINTERN PyObject *_wrap_Stroke_viewedges_begin(PyObject *self, PyObject *args
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_viewedges_begin'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    viewedges_begin(Stroke const *)\n"
-    "    viewedges_begin(Stroke *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_viewedges_begin'.\n  Possible C/C++ prototypes are:\n    viewedges_begin()\n    viewedges_begin()\n");
   return NULL;
 }
 
@@ -94151,7 +95129,7 @@ SWIGINTERN PyObject *_wrap_Stroke_viewedges_end(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -94175,10 +95153,7 @@ SWIGINTERN PyObject *_wrap_Stroke_viewedges_end(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_viewedges_end'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    viewedges_end(Stroke const *)\n"
-    "    viewedges_end(Stroke *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_viewedges_end'.\n  Possible C/C++ prototypes are:\n    viewedges_end()\n    viewedges_end()\n");
   return NULL;
 }
 
@@ -94240,7 +95215,7 @@ SWIGINTERN PyObject *_wrap_Stroke_getBeginningOrientation(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2r(static_cast< const Geometry::Vec2r& >(result))), SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2r(static_cast< const Geometry::Vec2r& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -94336,7 +95311,7 @@ SWIGINTERN PyObject *_wrap_Stroke_getEndingOrientation(PyObject *SWIGUNUSEDPARM(
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2r(static_cast< const Geometry::Vec2r& >(result))), SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2r(static_cast< const Geometry::Vec2r& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -94407,7 +95382,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_SetId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Stroke_setId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   Stroke *arg1 = (Stroke *) 0 ;
   Id *arg2 = 0 ;
@@ -94418,23 +95393,23 @@ SWIGINTERN PyObject *_wrap_Stroke_SetId(PyObject *SWIGUNUSEDPARM(self), PyObject
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Stroke_SetId",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:Stroke_setId",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_SetId" "', argument " "1"" of type '" "Stroke *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_setId" "', argument " "1"" of type '" "Stroke *""'"); 
   }
   arg1 = reinterpret_cast< Stroke * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Id,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Stroke_SetId" "', argument " "2"" of type '" "Id const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Stroke_setId" "', argument " "2"" of type '" "Id const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Stroke_SetId" "', argument " "2"" of type '" "Id const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Stroke_setId" "', argument " "2"" of type '" "Id const &""'"); 
   }
   arg2 = reinterpret_cast< Id * >(argp2);
   {
     try {
-      (arg1)->SetId((Id const &)*arg2);
+      (arg1)->setId((Id const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -94450,7 +95425,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_SetLength(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Stroke_setLength(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   Stroke *arg1 = (Stroke *) 0 ;
   float arg2 ;
@@ -94461,20 +95436,20 @@ SWIGINTERN PyObject *_wrap_Stroke_SetLength(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Stroke_SetLength",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:Stroke_setLength",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_SetLength" "', argument " "1"" of type '" "Stroke *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_setLength" "', argument " "1"" of type '" "Stroke *""'"); 
   }
   arg1 = reinterpret_cast< Stroke * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Stroke_SetLength" "', argument " "2"" of type '" "float""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Stroke_setLength" "', argument " "2"" of type '" "float""'");
   } 
   arg2 = static_cast< float >(val2);
   {
     try {
-      (arg1)->SetLength(arg2);
+      (arg1)->setLength(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -94490,7 +95465,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_SetMediumType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Stroke_setMediumType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   Stroke *arg1 = (Stroke *) 0 ;
   Stroke::MediumType arg2 ;
@@ -94501,20 +95476,20 @@ SWIGINTERN PyObject *_wrap_Stroke_SetMediumType(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Stroke_SetMediumType",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:Stroke_setMediumType",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_SetMediumType" "', argument " "1"" of type '" "Stroke *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_setMediumType" "', argument " "1"" of type '" "Stroke *""'"); 
   }
   arg1 = reinterpret_cast< Stroke * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Stroke_SetMediumType" "', argument " "2"" of type '" "Stroke::MediumType""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Stroke_setMediumType" "', argument " "2"" of type '" "Stroke::MediumType""'");
   } 
   arg2 = static_cast< Stroke::MediumType >(val2);
   {
     try {
-      (arg1)->SetMediumType(arg2);
+      (arg1)->setMediumType(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -94530,7 +95505,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_SetTextureId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Stroke_setTextureId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   Stroke *arg1 = (Stroke *) 0 ;
   unsigned int arg2 ;
@@ -94541,20 +95516,20 @@ SWIGINTERN PyObject *_wrap_Stroke_SetTextureId(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Stroke_SetTextureId",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:Stroke_setTextureId",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_SetTextureId" "', argument " "1"" of type '" "Stroke *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_setTextureId" "', argument " "1"" of type '" "Stroke *""'"); 
   }
   arg1 = reinterpret_cast< Stroke * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Stroke_SetTextureId" "', argument " "2"" of type '" "unsigned int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Stroke_setTextureId" "', argument " "2"" of type '" "unsigned int""'");
   } 
   arg2 = static_cast< unsigned int >(val2);
   {
     try {
-      (arg1)->SetTextureId(arg2);
+      (arg1)->setTextureId(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -94570,7 +95545,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_SetTips(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Stroke_setTips(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   Stroke *arg1 = (Stroke *) 0 ;
   bool arg2 ;
@@ -94581,20 +95556,20 @@ SWIGINTERN PyObject *_wrap_Stroke_SetTips(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Stroke_SetTips",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:Stroke_setTips",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_SetTips" "', argument " "1"" of type '" "Stroke *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_setTips" "', argument " "1"" of type '" "Stroke *""'"); 
   }
   arg1 = reinterpret_cast< Stroke * >(argp1);
   ecode2 = SWIG_AsVal_bool(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Stroke_SetTips" "', argument " "2"" of type '" "bool""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Stroke_setTips" "', argument " "2"" of type '" "bool""'");
   } 
   arg2 = static_cast< bool >(val2);
   {
     try {
-      (arg1)->SetTips(arg2);
+      (arg1)->setTips(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -94730,7 +95705,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_SetBeginningOrientation__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Stroke_setBeginningOrientation__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   Stroke *arg1 = (Stroke *) 0 ;
   Geometry::Vec2r *arg2 = 0 ;
@@ -94741,23 +95716,23 @@ SWIGINTERN PyObject *_wrap_Stroke_SetBeginningOrientation__SWIG_0(PyObject *SWIG
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Stroke_SetBeginningOrientation",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:Stroke_setBeginningOrientation",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_SetBeginningOrientation" "', argument " "1"" of type '" "Stroke *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_setBeginningOrientation" "', argument " "1"" of type '" "Stroke *""'"); 
   }
   arg1 = reinterpret_cast< Stroke * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Stroke_SetBeginningOrientation" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Stroke_setBeginningOrientation" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Stroke_SetBeginningOrientation" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Stroke_setBeginningOrientation" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
   }
   arg2 = reinterpret_cast< Geometry::Vec2r * >(argp2);
   {
     try {
-      (arg1)->SetBeginningOrientation((Geometry::Vec2r const &)*arg2);
+      (arg1)->setBeginningOrientation((Geometry::Vec2r const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -94773,7 +95748,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_SetBeginningOrientation__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Stroke_setBeginningOrientation__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   Stroke *arg1 = (Stroke *) 0 ;
   real arg2 ;
@@ -94788,25 +95763,25 @@ SWIGINTERN PyObject *_wrap_Stroke_SetBeginningOrientation__SWIG_1(PyObject *SWIG
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:Stroke_SetBeginningOrientation",&obj0,&obj1,&obj2)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OOO:Stroke_setBeginningOrientation",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_SetBeginningOrientation" "', argument " "1"" of type '" "Stroke *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_setBeginningOrientation" "', argument " "1"" of type '" "Stroke *""'"); 
   }
   arg1 = reinterpret_cast< Stroke * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Stroke_SetBeginningOrientation" "', argument " "2"" of type '" "real""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Stroke_setBeginningOrientation" "', argument " "2"" of type '" "real""'");
   } 
   arg2 = static_cast< real >(val2);
   ecode3 = SWIG_AsVal_double(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Stroke_SetBeginningOrientation" "', argument " "3"" of type '" "real""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Stroke_setBeginningOrientation" "', argument " "3"" of type '" "real""'");
   } 
   arg3 = static_cast< real >(val3);
   {
     try {
-      (arg1)->SetBeginningOrientation(arg2,arg3);
+      (arg1)->setBeginningOrientation(arg2,arg3);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -94822,13 +95797,13 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_SetBeginningOrientation(PyObject *self, PyObject *args) {
+SWIGINTERN PyObject *_wrap_Stroke_setBeginningOrientation(PyObject *self, PyObject *args) {
   int argc;
   PyObject *argv[4];
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -94838,10 +95813,10 @@ SWIGINTERN PyObject *_wrap_Stroke_SetBeginningOrientation(PyObject *self, PyObje
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Stroke, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2T_double_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_Stroke_SetBeginningOrientation__SWIG_0(self, args);
+        return _wrap_Stroke_setBeginningOrientation__SWIG_0(self, args);
       }
     }
   }
@@ -94861,22 +95836,19 @@ SWIGINTERN PyObject *_wrap_Stroke_SetBeginningOrientation(PyObject *self, PyObje
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_Stroke_SetBeginningOrientation__SWIG_1(self, args);
+          return _wrap_Stroke_setBeginningOrientation__SWIG_1(self, args);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_SetBeginningOrientation'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    SetBeginningOrientation(Stroke *,Geometry::Vec2r const &)\n"
-    "    SetBeginningOrientation(Stroke *,real,real)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_setBeginningOrientation'.\n  Possible C/C++ prototypes are:\n    setBeginningOrientation(Geometry::Vec2r const &)\n    setBeginningOrientation(real,real)\n");
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_SetEndingOrientation__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Stroke_setEndingOrientation__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   Stroke *arg1 = (Stroke *) 0 ;
   Geometry::Vec2r *arg2 = 0 ;
@@ -94887,23 +95859,23 @@ SWIGINTERN PyObject *_wrap_Stroke_SetEndingOrientation__SWIG_0(PyObject *SWIGUNU
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Stroke_SetEndingOrientation",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:Stroke_setEndingOrientation",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_SetEndingOrientation" "', argument " "1"" of type '" "Stroke *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_setEndingOrientation" "', argument " "1"" of type '" "Stroke *""'"); 
   }
   arg1 = reinterpret_cast< Stroke * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Stroke_SetEndingOrientation" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Stroke_setEndingOrientation" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Stroke_SetEndingOrientation" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Stroke_setEndingOrientation" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
   }
   arg2 = reinterpret_cast< Geometry::Vec2r * >(argp2);
   {
     try {
-      (arg1)->SetEndingOrientation((Geometry::Vec2r const &)*arg2);
+      (arg1)->setEndingOrientation((Geometry::Vec2r const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -94919,7 +95891,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_SetEndingOrientation__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Stroke_setEndingOrientation__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   Stroke *arg1 = (Stroke *) 0 ;
   real arg2 ;
@@ -94934,25 +95906,25 @@ SWIGINTERN PyObject *_wrap_Stroke_SetEndingOrientation__SWIG_1(PyObject *SWIGUNU
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:Stroke_SetEndingOrientation",&obj0,&obj1,&obj2)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OOO:Stroke_setEndingOrientation",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Stroke, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_SetEndingOrientation" "', argument " "1"" of type '" "Stroke *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_setEndingOrientation" "', argument " "1"" of type '" "Stroke *""'"); 
   }
   arg1 = reinterpret_cast< Stroke * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Stroke_SetEndingOrientation" "', argument " "2"" of type '" "real""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Stroke_setEndingOrientation" "', argument " "2"" of type '" "real""'");
   } 
   arg2 = static_cast< real >(val2);
   ecode3 = SWIG_AsVal_double(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Stroke_SetEndingOrientation" "', argument " "3"" of type '" "real""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Stroke_setEndingOrientation" "', argument " "3"" of type '" "real""'");
   } 
   arg3 = static_cast< real >(val3);
   {
     try {
-      (arg1)->SetEndingOrientation(arg2,arg3);
+      (arg1)->setEndingOrientation(arg2,arg3);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -94968,13 +95940,13 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_SetEndingOrientation(PyObject *self, PyObject *args) {
+SWIGINTERN PyObject *_wrap_Stroke_setEndingOrientation(PyObject *self, PyObject *args) {
   int argc;
   PyObject *argv[4];
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -94984,10 +95956,10 @@ SWIGINTERN PyObject *_wrap_Stroke_SetEndingOrientation(PyObject *self, PyObject
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Stroke, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2T_double_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
-        return _wrap_Stroke_SetEndingOrientation__SWIG_0(self, args);
+        return _wrap_Stroke_setEndingOrientation__SWIG_0(self, args);
       }
     }
   }
@@ -95007,17 +95979,14 @@ SWIGINTERN PyObject *_wrap_Stroke_SetEndingOrientation(PyObject *self, PyObject
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          return _wrap_Stroke_SetEndingOrientation__SWIG_1(self, args);
+          return _wrap_Stroke_setEndingOrientation__SWIG_1(self, args);
         }
       }
     }
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_SetEndingOrientation'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    SetEndingOrientation(Stroke *,Geometry::Vec2r const &)\n"
-    "    SetEndingOrientation(Stroke *,real,real)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_setEndingOrientation'.\n  Possible C/C++ prototypes are:\n    setEndingOrientation(Geometry::Vec2r const &)\n    setEndingOrientation(real,real)\n");
   return NULL;
 }
 
@@ -95101,7 +96070,7 @@ SWIGINTERN PyObject *_wrap_Stroke_strokeVerticesBegin(PyObject *self, PyObject *
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -95131,10 +96100,7 @@ SWIGINTERN PyObject *_wrap_Stroke_strokeVerticesBegin(PyObject *self, PyObject *
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_strokeVerticesBegin'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    strokeVerticesBegin(Stroke *,float)\n"
-    "    strokeVerticesBegin(Stroke *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_strokeVerticesBegin'.\n  Possible C/C++ prototypes are:\n    strokeVerticesBegin(float)\n    strokeVerticesBegin()\n");
   return NULL;
 }
 
@@ -95346,7 +96312,7 @@ SWIGINTERN PyObject *_wrap_Stroke_pointsBegin(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -95376,10 +96342,7 @@ SWIGINTERN PyObject *_wrap_Stroke_pointsBegin(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_pointsBegin'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    pointsBegin(Stroke *,float)\n"
-    "    pointsBegin(Stroke *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_pointsBegin'.\n  Possible C/C++ prototypes are:\n    pointsBegin(float)\n    pointsBegin()\n");
   return NULL;
 }
 
@@ -95463,7 +96426,7 @@ SWIGINTERN PyObject *_wrap_Stroke_pointsEnd(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -95493,24 +96456,21 @@ SWIGINTERN PyObject *_wrap_Stroke_pointsEnd(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_pointsEnd'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    pointsEnd(Stroke *,float)\n"
-    "    pointsEnd(Stroke *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_pointsEnd'.\n  Possible C/C++ prototypes are:\n    pointsEnd(float)\n    pointsEnd()\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *Stroke_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Stroke, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
   PyObject **arg2 = (PyObject **) 0 ;
   swig::PySwigIterator *result = 0 ;
   void *argp1 = 0 ;
@@ -95519,11 +96479,11 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_iterator(PyObject *SWIGUNUSEDPARM(se
   
   arg2 = &obj0;
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_iterator" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_iterator" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
   {
     try {
       result = (swig::PySwigIterator *)std_vector_Sl_StrokeShader_Sm__Sg__iterator(arg1,arg2);
@@ -95544,21 +96504,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer___nonzero__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer___nonzero__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___nonzero__" "', argument " "1"" of type '" "std::vector< StrokeShader * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___nonzero__" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
   {
     try {
-      result = (bool)std_vector_Sl_StrokeShader_Sm__Sg____nonzero__((std::vector< StrokeShader * > const *)arg1);
+      result = (bool)std_vector_Sl_StrokeShader_Sm__Sg____nonzero__((std::vector<StrokeShader * > const *)arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -95576,21 +96536,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer___len__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
-  std::vector< StrokeShader * >::size_type result;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer___len__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___len__" "', argument " "1"" of type '" "std::vector< StrokeShader * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___len__" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
   {
     try {
-      result = std_vector_Sl_StrokeShader_Sm__Sg____len__((std::vector< StrokeShader * > const *)arg1);
+      result = std_vector_Sl_StrokeShader_Sm__Sg____len__((std::vector<StrokeShader * > const *)arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -95608,22 +96568,22 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
-  std::vector< StrokeShader * >::value_type result;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_pop" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_pop" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
   {
     try {
       try {
-        result = (std::vector< StrokeShader * >::value_type)std_vector_Sl_StrokeShader_Sm__Sg__pop(arg1);
+        result = (std::vector<StrokeShader * >::value_type)std_vector_Sl_StrokeShader_Sm__Sg__pop(arg1);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -95637,7 +96597,7 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_pop(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -95646,10 +96606,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
-  std::vector< StrokeShader * >::difference_type arg2 ;
-  std::vector< StrokeShader * >::difference_type arg3 ;
-  std::vector< StrokeShader *,std::allocator< StrokeShader * > > *result = 0 ;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::difference_type arg2 ;
+  std::vector<StrokeShader * >::difference_type arg3 ;
+  std::vector<StrokeShader *,std::allocator<StrokeShader * > > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -95661,25 +96621,25 @@ SWIGINTERN PyObject *_wrap_ShadersContainer___getslice__(PyObject *SWIGUNUSEDPAR
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ShadersContainer___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___getslice__" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___getslice__" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer___getslice__" "', argument " "2"" of type '" "std::vector< StrokeShader * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer___getslice__" "', argument " "2"" of type '" "std::vector<StrokeShader * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector< StrokeShader * >::difference_type >(val2);
+  arg2 = static_cast< std::vector<StrokeShader * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ShadersContainer___getslice__" "', argument " "3"" of type '" "std::vector< StrokeShader * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ShadersContainer___getslice__" "', argument " "3"" of type '" "std::vector<StrokeShader * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector< StrokeShader * >::difference_type >(val3);
+  arg3 = static_cast< std::vector<StrokeShader * >::difference_type >(val3);
   {
     try {
       try {
-        result = (std::vector< StrokeShader *,std::allocator< StrokeShader * > > *)std_vector_Sl_StrokeShader_Sm__Sg____getslice__(arg1,arg2,arg3);
+        result = (std::vector<StrokeShader *,std::allocator<StrokeShader * > > *)std_vector_Sl_StrokeShader_Sm__Sg____getslice__(arg1,arg2,arg3);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -95693,7 +96653,7 @@ SWIGINTERN PyObject *_wrap_ShadersContainer___getslice__(PyObject *SWIGUNUSEDPAR
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -95702,10 +96662,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer___setslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
-  std::vector< StrokeShader * >::difference_type arg2 ;
-  std::vector< StrokeShader * >::difference_type arg3 ;
-  std::vector< StrokeShader *,std::allocator< StrokeShader * > > *arg4 = 0 ;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::difference_type arg2 ;
+  std::vector<StrokeShader * >::difference_type arg3 ;
+  std::vector<StrokeShader *,std::allocator<StrokeShader * > > *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -95719,36 +96679,36 @@ SWIGINTERN PyObject *_wrap_ShadersContainer___setslice__(PyObject *SWIGUNUSEDPAR
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:ShadersContainer___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___setslice__" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___setslice__" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer___setslice__" "', argument " "2"" of type '" "std::vector< StrokeShader * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer___setslice__" "', argument " "2"" of type '" "std::vector<StrokeShader * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector< StrokeShader * >::difference_type >(val2);
+  arg2 = static_cast< std::vector<StrokeShader * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ShadersContainer___setslice__" "', argument " "3"" of type '" "std::vector< StrokeShader * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ShadersContainer___setslice__" "', argument " "3"" of type '" "std::vector<StrokeShader * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector< StrokeShader * >::difference_type >(val3);
+  arg3 = static_cast< std::vector<StrokeShader * >::difference_type >(val3);
   {
-    std::vector<StrokeShader*,std::allocator< StrokeShader * > > *ptr = (std::vector<StrokeShader*,std::allocator< StrokeShader * > > *)0;
+    std::vector<StrokeShader*,std::allocator<StrokeShader * > > *ptr = (std::vector<StrokeShader*,std::allocator<StrokeShader * > > *)0;
     res4 = swig::asptr(obj3, &ptr);
     if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ShadersContainer___setslice__" "', argument " "4"" of type '" "std::vector< StrokeShader *,std::allocator< StrokeShader * > > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ShadersContainer___setslice__" "', argument " "4"" of type '" "std::vector<StrokeShader *,std::allocator<StrokeShader * > > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ShadersContainer___setslice__" "', argument " "4"" of type '" "std::vector< StrokeShader *,std::allocator< StrokeShader * > > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ShadersContainer___setslice__" "', argument " "4"" of type '" "std::vector<StrokeShader *,std::allocator<StrokeShader * > > const &""'"); 
     }
     arg4 = ptr;
   }
   {
     try {
       try {
-        std_vector_Sl_StrokeShader_Sm__Sg____setslice__(arg1,arg2,arg3,(std::vector< StrokeShader *,std::allocator< StrokeShader * > > const &)*arg4);
+        std_vector_Sl_StrokeShader_Sm__Sg____setslice__(arg1,arg2,arg3,(std::vector<StrokeShader *,std::allocator<StrokeShader * > > const &)*arg4);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -95776,9 +96736,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer___delslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
-  std::vector< StrokeShader * >::difference_type arg2 ;
-  std::vector< StrokeShader * >::difference_type arg3 ;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::difference_type arg2 ;
+  std::vector<StrokeShader * >::difference_type arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -95790,21 +96750,21 @@ SWIGINTERN PyObject *_wrap_ShadersContainer___delslice__(PyObject *SWIGUNUSEDPAR
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ShadersContainer___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___delslice__" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___delslice__" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer___delslice__" "', argument " "2"" of type '" "std::vector< StrokeShader * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer___delslice__" "', argument " "2"" of type '" "std::vector<StrokeShader * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector< StrokeShader * >::difference_type >(val2);
+  arg2 = static_cast< std::vector<StrokeShader * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ShadersContainer___delslice__" "', argument " "3"" of type '" "std::vector< StrokeShader * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ShadersContainer___delslice__" "', argument " "3"" of type '" "std::vector<StrokeShader * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector< StrokeShader * >::difference_type >(val3);
+  arg3 = static_cast< std::vector<StrokeShader * >::difference_type >(val3);
   {
     try {
       try {
@@ -95831,8 +96791,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer___delitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
-  std::vector< StrokeShader * >::difference_type arg2 ;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::difference_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -95841,16 +96801,16 @@ SWIGINTERN PyObject *_wrap_ShadersContainer___delitem__(PyObject *SWIGUNUSEDPARM
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ShadersContainer___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___delitem__" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___delitem__" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer___delitem__" "', argument " "2"" of type '" "std::vector< StrokeShader * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer___delitem__" "', argument " "2"" of type '" "std::vector<StrokeShader * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector< StrokeShader * >::difference_type >(val2);
+  arg2 = static_cast< std::vector<StrokeShader * >::difference_type >(val2);
   {
     try {
       try {
@@ -95877,9 +96837,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer___getitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
-  std::vector< StrokeShader * >::difference_type arg2 ;
-  std::vector< StrokeShader * >::value_type result;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::difference_type arg2 ;
+  std::vector<StrokeShader * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -95888,20 +96848,20 @@ SWIGINTERN PyObject *_wrap_ShadersContainer___getitem__(PyObject *SWIGUNUSEDPARM
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ShadersContainer___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___getitem__" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___getitem__" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer___getitem__" "', argument " "2"" of type '" "std::vector< StrokeShader * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer___getitem__" "', argument " "2"" of type '" "std::vector<StrokeShader * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector< StrokeShader * >::difference_type >(val2);
+  arg2 = static_cast< std::vector<StrokeShader * >::difference_type >(val2);
   {
     try {
       try {
-        result = (std::vector< StrokeShader * >::value_type)std_vector_Sl_StrokeShader_Sm__Sg____getitem__(arg1,arg2);
+        result = (std::vector<StrokeShader * >::value_type)std_vector_Sl_StrokeShader_Sm__Sg____getitem__(arg1,arg2);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -95915,7 +96875,7 @@ SWIGINTERN PyObject *_wrap_ShadersContainer___getitem__(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -95924,9 +96884,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer___setitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
-  std::vector< StrokeShader * >::difference_type arg2 ;
-  std::vector< StrokeShader * >::value_type arg3 = (std::vector< StrokeShader * >::value_type) 0 ;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::difference_type arg2 ;
+  std::vector<StrokeShader * >::value_type arg3 = (std::vector<StrokeShader * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -95938,21 +96898,21 @@ SWIGINTERN PyObject *_wrap_ShadersContainer___setitem__(PyObject *SWIGUNUSEDPARM
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ShadersContainer___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___setitem__" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___setitem__" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer___setitem__" "', argument " "2"" of type '" "std::vector< StrokeShader * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer___setitem__" "', argument " "2"" of type '" "std::vector<StrokeShader * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector< StrokeShader * >::difference_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector<StrokeShader * >::difference_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ShadersContainer___setitem__" "', argument " "3"" of type '" "std::vector< StrokeShader * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ShadersContainer___setitem__" "', argument " "3"" of type '" "std::vector<StrokeShader * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector< StrokeShader * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector<StrokeShader * >::value_type >(argp3);
   {
     try {
       try {
@@ -95979,8 +96939,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
-  std::vector< StrokeShader * >::value_type arg2 = (std::vector< StrokeShader * >::value_type) 0 ;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::value_type arg2 = (std::vector<StrokeShader * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -95989,16 +96949,16 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_append(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ShadersContainer_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_append" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_append" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0 |  0 );
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ShadersContainer_append" "', argument " "2"" of type '" "std::vector< StrokeShader * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ShadersContainer_append" "', argument " "2"" of type '" "std::vector<StrokeShader * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector< StrokeShader * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector<StrokeShader * >::value_type >(argp2);
   {
     try {
       std_vector_Sl_StrokeShader_Sm__Sg__append(arg1,arg2);
@@ -96019,12 +96979,12 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_ShadersContainer__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< StrokeShader * > *result = 0 ;
+  std::vector<StrokeShader * > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_ShadersContainer")) SWIG_fail;
   {
     try {
-      result = (std::vector< StrokeShader * > *)new std::vector< StrokeShader * >();
+      result = (std::vector<StrokeShader * > *)new std::vector<StrokeShader * >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -96033,7 +96993,7 @@ SWIGINTERN PyObject *_wrap_new_ShadersContainer__SWIG_0(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -96042,26 +97002,26 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_ShadersContainer__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< StrokeShader * > *arg1 = 0 ;
-  std::vector< StrokeShader * > *result = 0 ;
+  std::vector<StrokeShader * > *arg1 = 0 ;
+  std::vector<StrokeShader * > *result = 0 ;
   int res1 = SWIG_OLDOBJ ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_ShadersContainer",&obj0)) SWIG_fail;
   {
-    std::vector<StrokeShader*,std::allocator< StrokeShader * > > *ptr = (std::vector<StrokeShader*,std::allocator< StrokeShader * > > *)0;
+    std::vector<StrokeShader*,std::allocator<StrokeShader * > > *ptr = (std::vector<StrokeShader*,std::allocator<StrokeShader * > > *)0;
     res1 = swig::asptr(obj0, &ptr);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ShadersContainer" "', argument " "1"" of type '" "std::vector< StrokeShader * > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ShadersContainer" "', argument " "1"" of type '" "std::vector<StrokeShader * > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ShadersContainer" "', argument " "1"" of type '" "std::vector< StrokeShader * > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ShadersContainer" "', argument " "1"" of type '" "std::vector<StrokeShader * > const &""'"); 
     }
     arg1 = ptr;
   }
   {
     try {
-      result = (std::vector< StrokeShader * > *)new std::vector< StrokeShader * >((std::vector< StrokeShader * > const &)*arg1);
+      result = (std::vector<StrokeShader * > *)new std::vector<StrokeShader * >((std::vector<StrokeShader * > const &)*arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -96070,7 +97030,7 @@ SWIGINTERN PyObject *_wrap_new_ShadersContainer__SWIG_1(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, SWIG_POINTER_NEW |  0 );
   if (SWIG_IsNewObj(res1)) delete arg1;
   return resultobj;
 fail:
@@ -96081,21 +97041,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_empty",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_empty" "', argument " "1"" of type '" "std::vector< StrokeShader * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_empty" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
   {
     try {
-      result = (bool)((std::vector< StrokeShader * > const *)arg1)->empty();
+      result = (bool)((std::vector<StrokeShader * > const *)arg1)->empty();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -96113,21 +97073,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
-  std::vector< StrokeShader * >::size_type result;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_size" "', argument " "1"" of type '" "std::vector< StrokeShader * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_size" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
   {
     try {
-      result = ((std::vector< StrokeShader * > const *)arg1)->size();
+      result = ((std::vector<StrokeShader * > const *)arg1)->size();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -96145,17 +97105,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_clear" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_clear" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
   {
     try {
       (arg1)->clear();
@@ -96176,8 +97136,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
-  std::vector< StrokeShader * > *arg2 = 0 ;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -96186,19 +97146,19 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_swap(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ShadersContainer_swap",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_swap" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_swap" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t,  0 );
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ShadersContainer_swap" "', argument " "2"" of type '" "std::vector< StrokeShader * > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ShadersContainer_swap" "', argument " "2"" of type '" "std::vector<StrokeShader * > &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ShadersContainer_swap" "', argument " "2"" of type '" "std::vector< StrokeShader * > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ShadersContainer_swap" "', argument " "2"" of type '" "std::vector<StrokeShader * > &""'"); 
   }
-  arg2 = reinterpret_cast< std::vector< StrokeShader * > * >(argp2);
+  arg2 = reinterpret_cast< std::vector<StrokeShader * > * >(argp2);
   {
     try {
       (arg1)->swap(*arg2);
@@ -96219,21 +97179,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
-  SwigValueWrapper< std::allocator< StrokeShader * > > result;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  SwigValueWrapper<std::allocator<StrokeShader * > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_get_allocator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_get_allocator" "', argument " "1"" of type '" "std::vector< StrokeShader * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_get_allocator" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
   {
     try {
-      result = ((std::vector< StrokeShader * > const *)arg1)->get_allocator();
+      result = ((std::vector<StrokeShader * > const *)arg1)->get_allocator();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -96242,30 +97202,30 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_get_allocator(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new std::vector< StrokeShader * >::allocator_type(static_cast< const std::vector< StrokeShader * >::allocator_type& >(result))), SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new std::vector<StrokeShader * >::allocator_type(static_cast< const std::vector<StrokeShader * >::allocator_type& >(result))), SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_ShadersContainer_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ShadersContainer_begin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
-  std::vector< StrokeShader * >::const_iterator result;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_begin" "', argument " "1"" of type '" "std::vector< StrokeShader * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_begin" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
   {
     try {
-      result = ((std::vector< StrokeShader * > const *)arg1)->begin();
+      result = (arg1)->begin();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -96274,7 +97234,7 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_begin(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< StrokeShader * >::const_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<StrokeShader * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -96282,23 +97242,89 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ShadersContainer_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ShadersContainer_begin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
-  std::vector< StrokeShader * >::const_iterator result;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_begin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_begin" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<StrokeShader * > const *)arg1)->begin();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<StrokeShader * >::const_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer_begin(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ShadersContainer_begin__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ShadersContainer_begin__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ShadersContainer_begin'.\n  Possible C/C++ prototypes are:\n    begin()\n    begin()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_end" "', argument " "1"" of type '" "std::vector< StrokeShader * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_end" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
   {
     try {
-      result = ((std::vector< StrokeShader * > const *)arg1)->end();
+      result = (arg1)->end();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -96307,7 +97333,7 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_end(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< StrokeShader * >::const_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<StrokeShader * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -96315,23 +97341,89 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ShadersContainer_rbegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ShadersContainer_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
-  std::vector< StrokeShader * >::const_reverse_iterator result;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::const_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_end",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_end" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<StrokeShader * > const *)arg1)->end();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<StrokeShader * >::const_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer_end(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ShadersContainer_end__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ShadersContainer_end__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ShadersContainer_end'.\n  Possible C/C++ prototypes are:\n    end()\n    end()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer_rbegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::reverse_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_rbegin" "', argument " "1"" of type '" "std::vector< StrokeShader * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_rbegin" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
   {
     try {
-      result = ((std::vector< StrokeShader * > const *)arg1)->rbegin();
+      result = (arg1)->rbegin();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -96340,7 +97432,7 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_rbegin(PyObject *SWIGUNUSEDPARM(self
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< StrokeShader * >::const_reverse_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<StrokeShader * >::reverse_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -96348,23 +97440,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ShadersContainer_rend(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ShadersContainer_rbegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
-  std::vector< StrokeShader * >::const_reverse_iterator result;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::const_reverse_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
+  if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_rbegin",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_rend" "', argument " "1"" of type '" "std::vector< StrokeShader * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_rbegin" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
   {
     try {
-      result = ((std::vector< StrokeShader * > const *)arg1)->rend();
+      result = ((std::vector<StrokeShader * > const *)arg1)->rbegin();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -96373,7 +97465,7 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_rend(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< StrokeShader * >::const_reverse_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<StrokeShader * >::const_reverse_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -96381,10 +97473,142 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_ShadersContainer_rbegin(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ShadersContainer_rbegin__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ShadersContainer_rbegin__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ShadersContainer_rbegin'.\n  Possible C/C++ prototypes are:\n    rbegin()\n    rbegin()\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer_rend__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::reverse_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_rend",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_rend" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  {
+    try {
+      result = (arg1)->rend();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<StrokeShader * >::reverse_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer_rend__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::const_reverse_iterator result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_rend",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_rend" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  {
+    try {
+      result = ((std::vector<StrokeShader * > const *)arg1)->rend();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<StrokeShader * >::const_reverse_iterator & >(result)),
+    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ShadersContainer_rend(PyObject *self, PyObject *args) {
+  int argc;
+  PyObject *argv[2];
+  int ii;
+  
+  if (!PyTuple_Check(args)) SWIG_fail;
+  argc = PyObject_Length(args);
+  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
+    argv[ii] = PyTuple_GET_ITEM(args,ii);
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ShadersContainer_rend__SWIG_0(self, args);
+    }
+  }
+  if (argc == 1) {
+    int _v;
+    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_ShadersContainer_rend__SWIG_1(self, args);
+    }
+  }
+  
+fail:
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ShadersContainer_rend'.\n  Possible C/C++ prototypes are:\n    rend()\n    rend()\n");
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_new_ShadersContainer__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< StrokeShader * >::size_type arg1 ;
-  std::vector< StrokeShader * > *result = 0 ;
+  std::vector<StrokeShader * >::size_type arg1 ;
+  std::vector<StrokeShader * > *result = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -96392,12 +97616,12 @@ SWIGINTERN PyObject *_wrap_new_ShadersContainer__SWIG_2(PyObject *SWIGUNUSEDPARM
   if (!PyArg_ParseTuple(args,(char *)"O:new_ShadersContainer",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ShadersContainer" "', argument " "1"" of type '" "std::vector< StrokeShader * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ShadersContainer" "', argument " "1"" of type '" "std::vector<StrokeShader * >::size_type""'");
   } 
-  arg1 = static_cast< std::vector< StrokeShader * >::size_type >(val1);
+  arg1 = static_cast< std::vector<StrokeShader * >::size_type >(val1);
   {
     try {
-      result = (std::vector< StrokeShader * > *)new std::vector< StrokeShader * >(arg1);
+      result = (std::vector<StrokeShader * > *)new std::vector<StrokeShader * >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -96406,7 +97630,7 @@ SWIGINTERN PyObject *_wrap_new_ShadersContainer__SWIG_2(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -96415,17 +97639,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_pop_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_pop_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_pop_back" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_pop_back" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
   {
     try {
       (arg1)->pop_back();
@@ -96446,8 +97670,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
-  std::vector< StrokeShader * >::size_type arg2 ;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::size_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -96456,16 +97680,16 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_resize__SWIG_0(PyObject *SWIGUNUSEDP
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ShadersContainer_resize",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_resize" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_resize" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer_resize" "', argument " "2"" of type '" "std::vector< StrokeShader * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer_resize" "', argument " "2"" of type '" "std::vector<StrokeShader * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector< StrokeShader * >::size_type >(val2);
+  arg2 = static_cast< std::vector<StrokeShader * >::size_type >(val2);
   {
     try {
       (arg1)->resize(arg2);
@@ -96486,9 +97710,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
-  std::vector< StrokeShader * >::iterator arg2 ;
-  std::vector< StrokeShader * >::iterator result;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::iterator arg2 ;
+  std::vector<StrokeShader * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -96497,20 +97721,20 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_erase__SWIG_0(PyObject *SWIGUNUSEDPA
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ShadersContainer_erase",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_erase" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_erase" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_erase" "', argument " "2"" of type '" "std::vector< StrokeShader * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_erase" "', argument " "2"" of type '" "std::vector<StrokeShader * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector< StrokeShader * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< StrokeShader * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_erase" "', argument " "2"" of type '" "std::vector< StrokeShader * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_erase" "', argument " "2"" of type '" "std::vector<StrokeShader * >::iterator""'");
     }
   }
   {
@@ -96524,7 +97748,7 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_erase__SWIG_0(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< StrokeShader * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<StrokeShader * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -96534,10 +97758,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
-  std::vector< StrokeShader * >::iterator arg2 ;
-  std::vector< StrokeShader * >::iterator arg3 ;
-  std::vector< StrokeShader * >::iterator result;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::iterator arg2 ;
+  std::vector<StrokeShader * >::iterator arg3 ;
+  std::vector<StrokeShader * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -96549,31 +97773,31 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_erase__SWIG_1(PyObject *SWIGUNUSEDPA
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ShadersContainer_erase",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_erase" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_erase" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_erase" "', argument " "2"" of type '" "std::vector< StrokeShader * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_erase" "', argument " "2"" of type '" "std::vector<StrokeShader * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector< StrokeShader * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< StrokeShader * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_erase" "', argument " "2"" of type '" "std::vector< StrokeShader * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_erase" "', argument " "2"" of type '" "std::vector<StrokeShader * >::iterator""'");
     }
   }
   res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res3) || !iter3) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_erase" "', argument " "3"" of type '" "std::vector< StrokeShader * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_erase" "', argument " "3"" of type '" "std::vector<StrokeShader * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector< StrokeShader * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< StrokeShader * >::iterator > *>(iter3);
+    swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *>(iter3);
     if (iter_t) {
       arg3 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_erase" "', argument " "3"" of type '" "std::vector< StrokeShader * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_erase" "', argument " "3"" of type '" "std::vector<StrokeShader * >::iterator""'");
     }
   }
   {
@@ -96587,7 +97811,7 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_erase__SWIG_1(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< StrokeShader * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<StrokeShader * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -96601,18 +97825,18 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_erase(PyObject *self, PyObject *args
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator< StrokeShader * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< StrokeShader * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *>(iter) != 0));
       if (_v) {
         return _wrap_ShadersContainer_erase__SWIG_0(self, args);
       }
@@ -96620,16 +97844,16 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_erase(PyObject *self, PyObject *args
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator< StrokeShader * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< StrokeShader * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *>(iter) != 0));
       if (_v) {
         swig::PySwigIterator *iter = 0;
         int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< StrokeShader * >::iterator > *>(iter) != 0));
+        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *>(iter) != 0));
         if (_v) {
           return _wrap_ShadersContainer_erase__SWIG_1(self, args);
         }
@@ -96638,19 +97862,16 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_erase(PyObject *self, PyObject *args
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ShadersContainer_erase'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    erase(std::vector< StrokeShader * > *,std::vector< StrokeShader * >::iterator)\n"
-    "    erase(std::vector< StrokeShader * > *,std::vector< StrokeShader * >::iterator,std::vector< StrokeShader * >::iterator)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ShadersContainer_erase'.\n  Possible C/C++ prototypes are:\n    erase(std::vector<StrokeShader * >::iterator)\n    erase(std::vector<StrokeShader * >::iterator,std::vector<StrokeShader * >::iterator)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_new_ShadersContainer__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< StrokeShader * >::size_type arg1 ;
-  std::vector< StrokeShader * >::value_type arg2 = (std::vector< StrokeShader * >::value_type) 0 ;
-  std::vector< StrokeShader * > *result = 0 ;
+  std::vector<StrokeShader * >::size_type arg1 ;
+  std::vector<StrokeShader * >::value_type arg2 = (std::vector<StrokeShader * >::value_type) 0 ;
+  std::vector<StrokeShader * > *result = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   void *argp2 = 0 ;
@@ -96661,17 +97882,17 @@ SWIGINTERN PyObject *_wrap_new_ShadersContainer__SWIG_3(PyObject *SWIGUNUSEDPARM
   if (!PyArg_ParseTuple(args,(char *)"OO:new_ShadersContainer",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ShadersContainer" "', argument " "1"" of type '" "std::vector< StrokeShader * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ShadersContainer" "', argument " "1"" of type '" "std::vector<StrokeShader * >::size_type""'");
   } 
-  arg1 = static_cast< std::vector< StrokeShader * >::size_type >(val1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0 |  0 );
+  arg1 = static_cast< std::vector<StrokeShader * >::size_type >(val1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ShadersContainer" "', argument " "2"" of type '" "std::vector< StrokeShader * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ShadersContainer" "', argument " "2"" of type '" "std::vector<StrokeShader * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector< StrokeShader * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector<StrokeShader * >::value_type >(argp2);
   {
     try {
-      result = (std::vector< StrokeShader * > *)new std::vector< StrokeShader * >(arg1,arg2);
+      result = (std::vector<StrokeShader * > *)new std::vector<StrokeShader * >(arg1,arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -96680,7 +97901,7 @@ SWIGINTERN PyObject *_wrap_new_ShadersContainer__SWIG_3(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -96693,7 +97914,7 @@ SWIGINTERN PyObject *_wrap_new_ShadersContainer(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -96712,7 +97933,7 @@ SWIGINTERN PyObject *_wrap_new_ShadersContainer(PyObject *self, PyObject *args)
   }
   if (argc == 1) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator< StrokeShader * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_new_ShadersContainer__SWIG_1(self, args);
@@ -96726,7 +97947,7 @@ SWIGINTERN PyObject *_wrap_new_ShadersContainer(PyObject *self, PyObject *args)
     }
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_new_ShadersContainer__SWIG_3(self, args);
@@ -96735,20 +97956,15 @@ SWIGINTERN PyObject *_wrap_new_ShadersContainer(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ShadersContainer'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    std::vector< StrokeShader * >()\n"
-    "    std::vector< StrokeShader * >(std::vector< StrokeShader * > const &)\n"
-    "    std::vector< StrokeShader * >(std::vector< StrokeShader * >::size_type)\n"
-    "    std::vector< StrokeShader * >(std::vector< StrokeShader * >::size_type,std::vector< StrokeShader * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ShadersContainer'.\n  Possible C/C++ prototypes are:\n    std::vector<(p.StrokeShader)>()\n    std::vector<(p.StrokeShader)>(std::vector<StrokeShader * > const &)\n    std::vector<(p.StrokeShader)>(std::vector<StrokeShader * >::size_type)\n    std::vector<(p.StrokeShader)>(std::vector<StrokeShader * >::size_type,std::vector<StrokeShader * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_push_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
-  std::vector< StrokeShader * >::value_type arg2 = (std::vector< StrokeShader * >::value_type) 0 ;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::value_type arg2 = (std::vector<StrokeShader * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -96757,16 +97973,16 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_push_back(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ShadersContainer_push_back",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_push_back" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_push_back" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0 |  0 );
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ShadersContainer_push_back" "', argument " "2"" of type '" "std::vector< StrokeShader * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ShadersContainer_push_back" "', argument " "2"" of type '" "std::vector<StrokeShader * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector< StrokeShader * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector<StrokeShader * >::value_type >(argp2);
   {
     try {
       (arg1)->push_back(arg2);
@@ -96787,21 +98003,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_front(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
-  std::vector< StrokeShader * >::value_type result;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_front",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_front" "', argument " "1"" of type '" "std::vector< StrokeShader * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_front" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
   {
     try {
-      result = (std::vector< StrokeShader * >::value_type)((std::vector< StrokeShader * > const *)arg1)->front();
+      result = (std::vector<StrokeShader * >::value_type)((std::vector<StrokeShader * > const *)arg1)->front();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -96810,7 +98026,7 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_front(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -96819,21 +98035,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
-  std::vector< StrokeShader * >::value_type result;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_back" "', argument " "1"" of type '" "std::vector< StrokeShader * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_back" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
   {
     try {
-      result = (std::vector< StrokeShader * >::value_type)((std::vector< StrokeShader * > const *)arg1)->back();
+      result = (std::vector<StrokeShader * >::value_type)((std::vector<StrokeShader * > const *)arg1)->back();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -96842,7 +98058,7 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_back(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -96851,9 +98067,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_assign(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
-  std::vector< StrokeShader * >::size_type arg2 ;
-  std::vector< StrokeShader * >::value_type arg3 = (std::vector< StrokeShader * >::value_type) 0 ;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::size_type arg2 ;
+  std::vector<StrokeShader * >::value_type arg3 = (std::vector<StrokeShader * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -96865,21 +98081,21 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_assign(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ShadersContainer_assign",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_assign" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_assign" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer_assign" "', argument " "2"" of type '" "std::vector< StrokeShader * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer_assign" "', argument " "2"" of type '" "std::vector<StrokeShader * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector< StrokeShader * >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector<StrokeShader * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ShadersContainer_assign" "', argument " "3"" of type '" "std::vector< StrokeShader * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ShadersContainer_assign" "', argument " "3"" of type '" "std::vector<StrokeShader * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector< StrokeShader * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector<StrokeShader * >::value_type >(argp3);
   {
     try {
       (arg1)->assign(arg2,arg3);
@@ -96900,9 +98116,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
-  std::vector< StrokeShader * >::size_type arg2 ;
-  std::vector< StrokeShader * >::value_type arg3 = (std::vector< StrokeShader * >::value_type) 0 ;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::size_type arg2 ;
+  std::vector<StrokeShader * >::value_type arg3 = (std::vector<StrokeShader * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -96914,21 +98130,21 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_resize__SWIG_1(PyObject *SWIGUNUSEDP
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ShadersContainer_resize",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_resize" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_resize" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer_resize" "', argument " "2"" of type '" "std::vector< StrokeShader * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer_resize" "', argument " "2"" of type '" "std::vector<StrokeShader * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector< StrokeShader * >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector<StrokeShader * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ShadersContainer_resize" "', argument " "3"" of type '" "std::vector< StrokeShader * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ShadersContainer_resize" "', argument " "3"" of type '" "std::vector<StrokeShader * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector< StrokeShader * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector<StrokeShader * >::value_type >(argp3);
   {
     try {
       (arg1)->resize(arg2,arg3);
@@ -96953,13 +98169,13 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_resize(PyObject *self, PyObject *arg
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator< StrokeShader * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -96973,7 +98189,7 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_resize(PyObject *self, PyObject *arg
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator< StrokeShader * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -96982,7 +98198,7 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_resize(PyObject *self, PyObject *arg
       }
       if (_v) {
         void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0);
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           return _wrap_ShadersContainer_resize__SWIG_1(self, args);
@@ -96992,20 +98208,17 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_resize(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ShadersContainer_resize'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    resize(std::vector< StrokeShader * > *,std::vector< StrokeShader * >::size_type)\n"
-    "    resize(std::vector< StrokeShader * > *,std::vector< StrokeShader * >::size_type,std::vector< StrokeShader * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ShadersContainer_resize'.\n  Possible C/C++ prototypes are:\n    resize(std::vector<StrokeShader * >::size_type)\n    resize(std::vector<StrokeShader * >::size_type,std::vector<StrokeShader * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
-  std::vector< StrokeShader * >::iterator arg2 ;
-  std::vector< StrokeShader * >::value_type arg3 = (std::vector< StrokeShader * >::value_type) 0 ;
-  std::vector< StrokeShader * >::iterator result;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::iterator arg2 ;
+  std::vector<StrokeShader * >::value_type arg3 = (std::vector<StrokeShader * >::value_type) 0 ;
+  std::vector<StrokeShader * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -97017,27 +98230,27 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_insert__SWIG_0(PyObject *SWIGUNUSEDP
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ShadersContainer_insert",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_insert" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_insert" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_insert" "', argument " "2"" of type '" "std::vector< StrokeShader * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_insert" "', argument " "2"" of type '" "std::vector<StrokeShader * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector< StrokeShader * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< StrokeShader * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_insert" "', argument " "2"" of type '" "std::vector< StrokeShader * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_insert" "', argument " "2"" of type '" "std::vector<StrokeShader * >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0 |  0 );
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ShadersContainer_insert" "', argument " "3"" of type '" "std::vector< StrokeShader * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ShadersContainer_insert" "', argument " "3"" of type '" "std::vector<StrokeShader * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector< StrokeShader * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector<StrokeShader * >::value_type >(argp3);
   {
     try {
       result = (arg1)->insert(arg2,arg3);
@@ -97049,7 +98262,7 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_insert__SWIG_0(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< StrokeShader * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<StrokeShader * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -97059,10 +98272,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
-  std::vector< StrokeShader * >::iterator arg2 ;
-  std::vector< StrokeShader * >::size_type arg3 ;
-  std::vector< StrokeShader * >::value_type arg4 = (std::vector< StrokeShader * >::value_type) 0 ;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::iterator arg2 ;
+  std::vector<StrokeShader * >::size_type arg3 ;
+  std::vector<StrokeShader * >::value_type arg4 = (std::vector<StrokeShader * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -97077,32 +98290,32 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_insert__SWIG_1(PyObject *SWIGUNUSEDP
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:ShadersContainer_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_insert" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_insert" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_insert" "', argument " "2"" of type '" "std::vector< StrokeShader * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_insert" "', argument " "2"" of type '" "std::vector<StrokeShader * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector< StrokeShader * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< StrokeShader * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_insert" "', argument " "2"" of type '" "std::vector< StrokeShader * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_insert" "', argument " "2"" of type '" "std::vector<StrokeShader * >::iterator""'");
     }
   }
   ecode3 = SWIG_AsVal_size_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ShadersContainer_insert" "', argument " "3"" of type '" "std::vector< StrokeShader * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ShadersContainer_insert" "', argument " "3"" of type '" "std::vector<StrokeShader * >::size_type""'");
   } 
-  arg3 = static_cast< std::vector< StrokeShader * >::size_type >(val3);
-  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0 |  0 );
+  arg3 = static_cast< std::vector<StrokeShader * >::size_type >(val3);
+  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ShadersContainer_insert" "', argument " "4"" of type '" "std::vector< StrokeShader * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ShadersContainer_insert" "', argument " "4"" of type '" "std::vector<StrokeShader * >::value_type""'"); 
   }
-  arg4 = reinterpret_cast< std::vector< StrokeShader * >::value_type >(argp4);
+  arg4 = reinterpret_cast< std::vector<StrokeShader * >::value_type >(argp4);
   {
     try {
       (arg1)->insert(arg2,arg3,arg4);
@@ -97127,21 +98340,21 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_insert(PyObject *self, PyObject *arg
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator< StrokeShader * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< StrokeShader * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *>(iter) != 0));
       if (_v) {
         void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0);
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           return _wrap_ShadersContainer_insert__SWIG_0(self, args);
@@ -97151,12 +98364,12 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_insert(PyObject *self, PyObject *arg
   }
   if (argc == 4) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator< StrokeShader * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< StrokeShader * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *>(iter) != 0));
       if (_v) {
         {
           int res = SWIG_AsVal_size_t(argv[2], NULL);
@@ -97164,7 +98377,7 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_insert(PyObject *self, PyObject *arg
         }
         if (_v) {
           void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0);
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0);
           _v = SWIG_CheckState(res);
           if (_v) {
             return _wrap_ShadersContainer_insert__SWIG_1(self, args);
@@ -97175,18 +98388,15 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_insert(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ShadersContainer_insert'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    insert(std::vector< StrokeShader * > *,std::vector< StrokeShader * >::iterator,std::vector< StrokeShader * >::value_type)\n"
-    "    insert(std::vector< StrokeShader * > *,std::vector< StrokeShader * >::iterator,std::vector< StrokeShader * >::size_type,std::vector< StrokeShader * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ShadersContainer_insert'.\n  Possible C/C++ prototypes are:\n    insert(std::vector<StrokeShader * >::iterator,std::vector<StrokeShader * >::value_type)\n    insert(std::vector<StrokeShader * >::iterator,std::vector<StrokeShader * >::size_type,std::vector<StrokeShader * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_reserve(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
-  std::vector< StrokeShader * >::size_type arg2 ;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::size_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -97195,16 +98405,16 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_reserve(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ShadersContainer_reserve",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_reserve" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_reserve" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer_reserve" "', argument " "2"" of type '" "std::vector< StrokeShader * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer_reserve" "', argument " "2"" of type '" "std::vector<StrokeShader * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector< StrokeShader * >::size_type >(val2);
+  arg2 = static_cast< std::vector<StrokeShader * >::size_type >(val2);
   {
     try {
       (arg1)->reserve(arg2);
@@ -97225,21 +98435,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_capacity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
-  std::vector< StrokeShader * >::size_type result;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_capacity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_capacity" "', argument " "1"" of type '" "std::vector< StrokeShader * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_capacity" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
   {
     try {
-      result = ((std::vector< StrokeShader * > const *)arg1)->capacity();
+      result = ((std::vector<StrokeShader * > const *)arg1)->capacity();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -97257,17 +98467,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_ShadersContainer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_ShadersContainer",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ShadersContainer" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ShadersContainer" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
   {
     try {
       delete arg1;
@@ -97289,8 +98499,8 @@ fail:
 
 SWIGINTERN PyObject *ShadersContainer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
@@ -97484,7 +98694,7 @@ fail:
 
 SWIGINTERN PyObject *StrokeShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -97630,7 +98840,7 @@ fail:
 
 SWIGINTERN PyObject *ConstantThicknessShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__ConstantThicknessShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -97776,7 +98986,7 @@ fail:
 
 SWIGINTERN PyObject *ConstantExternThicknessShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__ConstantExternThicknessShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -97899,7 +99109,7 @@ fail:
 
 SWIGINTERN PyObject *IncreasingThicknessShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__IncreasingThicknessShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -98031,7 +99241,7 @@ fail:
 
 SWIGINTERN PyObject *ConstrainedIncreasingThicknessShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__ConstrainedIncreasingThicknessShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -98154,7 +99364,7 @@ fail:
 
 SWIGINTERN PyObject *LengthDependingThicknessShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__LengthDependingThicknessShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -98355,7 +99565,7 @@ SWIGINTERN PyObject *_wrap_new_ThicknessVariationPatternShader(PyObject *self, P
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -98429,12 +99639,7 @@ SWIGINTERN PyObject *_wrap_new_ThicknessVariationPatternShader(PyObject *self, P
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ThicknessVariationPatternShader'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    StrokeShaders::ThicknessVariationPatternShader(std::string const,float,float,bool)\n"
-    "    StrokeShaders::ThicknessVariationPatternShader(std::string const,float,float)\n"
-    "    StrokeShaders::ThicknessVariationPatternShader(std::string const,float)\n"
-    "    StrokeShaders::ThicknessVariationPatternShader(std::string const)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ThicknessVariationPatternShader'.\n  Possible C/C++ prototypes are:\n    StrokeShaders::ThicknessVariationPatternShader(std::string const,float,float,bool)\n    StrokeShaders::ThicknessVariationPatternShader(std::string const,float,float)\n    StrokeShaders::ThicknessVariationPatternShader(std::string const,float)\n    StrokeShaders::ThicknessVariationPatternShader(std::string const)\n");
   return NULL;
 }
 
@@ -98516,7 +99721,7 @@ fail:
 
 SWIGINTERN PyObject *ThicknessVariationPatternShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__ThicknessVariationPatternShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -98591,7 +99796,7 @@ SWIGINTERN PyObject *_wrap_new_ThicknessNoiseShader(PyObject *self, PyObject *ar
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -98616,10 +99821,7 @@ SWIGINTERN PyObject *_wrap_new_ThicknessNoiseShader(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ThicknessNoiseShader'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    StrokeShaders::ThicknessNoiseShader()\n"
-    "    StrokeShaders::ThicknessNoiseShader(float,float)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ThicknessNoiseShader'.\n  Possible C/C++ prototypes are:\n    StrokeShaders::ThicknessNoiseShader()\n    StrokeShaders::ThicknessNoiseShader(float,float)\n");
   return NULL;
 }
 
@@ -98701,7 +99903,7 @@ fail:
 
 SWIGINTERN PyObject *ThicknessNoiseShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__ThicknessNoiseShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -98821,7 +100023,7 @@ SWIGINTERN PyObject *_wrap_new_ConstantColorShader(PyObject *self, PyObject *arg
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -98877,10 +100079,7 @@ SWIGINTERN PyObject *_wrap_new_ConstantColorShader(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ConstantColorShader'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    StrokeShaders::ConstantColorShader(float,float,float,float)\n"
-    "    StrokeShaders::ConstantColorShader(float,float,float)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ConstantColorShader'.\n  Possible C/C++ prototypes are:\n    StrokeShaders::ConstantColorShader(float,float,float,float)\n    StrokeShaders::ConstantColorShader(float,float,float)\n");
   return NULL;
 }
 
@@ -98994,7 +100193,7 @@ fail:
 
 SWIGINTERN PyObject *ConstantColorShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__ConstantColorShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -99171,7 +100370,7 @@ fail:
 
 SWIGINTERN PyObject *IncreasingColorShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__IncreasingColorShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -99259,7 +100458,7 @@ SWIGINTERN PyObject *_wrap_new_ColorVariationPatternShader(PyObject *self, PyObj
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -99287,10 +100486,7 @@ SWIGINTERN PyObject *_wrap_new_ColorVariationPatternShader(PyObject *self, PyObj
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ColorVariationPatternShader'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    StrokeShaders::ColorVariationPatternShader(std::string const,bool)\n"
-    "    StrokeShaders::ColorVariationPatternShader(std::string const)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ColorVariationPatternShader'.\n  Possible C/C++ prototypes are:\n    StrokeShaders::ColorVariationPatternShader(std::string const,bool)\n    StrokeShaders::ColorVariationPatternShader(std::string const)\n");
   return NULL;
 }
 
@@ -99372,7 +100568,7 @@ fail:
 
 SWIGINTERN PyObject *ColorVariationPatternShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__ColorVariationPatternShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -99438,7 +100634,7 @@ SWIGINTERN PyObject *_wrap_new_MaterialColorShader(PyObject *self, PyObject *arg
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -99457,10 +100653,7 @@ SWIGINTERN PyObject *_wrap_new_MaterialColorShader(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_MaterialColorShader'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    StrokeShaders::MaterialColorShader(float)\n"
-    "    StrokeShaders::MaterialColorShader()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_MaterialColorShader'.\n  Possible C/C++ prototypes are:\n    StrokeShaders::MaterialColorShader(float)\n    StrokeShaders::MaterialColorShader()\n");
   return NULL;
 }
 
@@ -99542,7 +100735,7 @@ fail:
 
 SWIGINTERN PyObject *MaterialColorShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__MaterialColorShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -99556,7 +100749,7 @@ SWIGINTERN PyObject *_wrap_new_CalligraphicColorShader(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_CalligraphicColorShader",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CalligraphicColorShader" "', argument " "1"" of type '" "Geometry::Vec2d const &""'"); 
   }
@@ -99659,7 +100852,7 @@ fail:
 
 SWIGINTERN PyObject *CalligraphicColorShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__CalligraphicColorShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -99734,7 +100927,7 @@ SWIGINTERN PyObject *_wrap_new_ColorNoiseShader(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -99759,10 +100952,7 @@ SWIGINTERN PyObject *_wrap_new_ColorNoiseShader(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ColorNoiseShader'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    StrokeShaders::ColorNoiseShader()\n"
-    "    StrokeShaders::ColorNoiseShader(float,float)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ColorNoiseShader'.\n  Possible C/C++ prototypes are:\n    StrokeShaders::ColorNoiseShader()\n    StrokeShaders::ColorNoiseShader(float,float)\n");
   return NULL;
 }
 
@@ -99844,7 +101034,7 @@ fail:
 
 SWIGINTERN PyObject *ColorNoiseShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__ColorNoiseShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -99958,7 +101148,7 @@ fail:
 
 SWIGINTERN PyObject *TextureAssignerShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__TextureAssignerShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -100098,7 +101288,7 @@ SWIGINTERN PyObject *_wrap_new_StrokeTextureShader(PyObject *self, PyObject *arg
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -100146,11 +101336,7 @@ SWIGINTERN PyObject *_wrap_new_StrokeTextureShader(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_StrokeTextureShader'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    StrokeShaders::StrokeTextureShader(std::string const,Stroke::MediumType,bool)\n"
-    "    StrokeShaders::StrokeTextureShader(std::string const,Stroke::MediumType)\n"
-    "    StrokeShaders::StrokeTextureShader(std::string const)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_StrokeTextureShader'.\n  Possible C/C++ prototypes are:\n    StrokeShaders::StrokeTextureShader(std::string const,Stroke::MediumType,bool)\n    StrokeShaders::StrokeTextureShader(std::string const,Stroke::MediumType)\n    StrokeShaders::StrokeTextureShader(std::string const)\n");
   return NULL;
 }
 
@@ -100232,7 +101418,7 @@ fail:
 
 SWIGINTERN PyObject *StrokeTextureShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__StrokeTextureShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -100298,7 +101484,7 @@ SWIGINTERN PyObject *_wrap_new_BackboneStretcherShader(PyObject *self, PyObject
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -100317,10 +101503,7 @@ SWIGINTERN PyObject *_wrap_new_BackboneStretcherShader(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_BackboneStretcherShader'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    StrokeShaders::BackboneStretcherShader(float)\n"
-    "    StrokeShaders::BackboneStretcherShader()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_BackboneStretcherShader'.\n  Possible C/C++ prototypes are:\n    StrokeShaders::BackboneStretcherShader(float)\n    StrokeShaders::BackboneStretcherShader()\n");
   return NULL;
 }
 
@@ -100402,7 +101585,7 @@ fail:
 
 SWIGINTERN PyObject *BackboneStretcherShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__BackboneStretcherShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -100516,7 +101699,7 @@ fail:
 
 SWIGINTERN PyObject *SamplingShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__SamplingShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -100582,7 +101765,7 @@ SWIGINTERN PyObject *_wrap_new_ExternalContourStretcherShader(PyObject *self, Py
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -100601,10 +101784,7 @@ SWIGINTERN PyObject *_wrap_new_ExternalContourStretcherShader(PyObject *self, Py
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ExternalContourStretcherShader'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    StrokeShaders::ExternalContourStretcherShader(float)\n"
-    "    StrokeShaders::ExternalContourStretcherShader()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ExternalContourStretcherShader'.\n  Possible C/C++ prototypes are:\n    StrokeShaders::ExternalContourStretcherShader(float)\n    StrokeShaders::ExternalContourStretcherShader()\n");
   return NULL;
 }
 
@@ -100686,7 +101866,7 @@ fail:
 
 SWIGINTERN PyObject *ExternalContourStretcherShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__ExternalContourStretcherShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -100791,7 +101971,7 @@ fail:
 
 SWIGINTERN PyObject *BSplineShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__BSplineShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -100857,7 +102037,7 @@ SWIGINTERN PyObject *_wrap_new_BezierCurveShader(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -100876,10 +102056,7 @@ SWIGINTERN PyObject *_wrap_new_BezierCurveShader(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_BezierCurveShader'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    StrokeShaders::BezierCurveShader(float)\n"
-    "    StrokeShaders::BezierCurveShader()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_BezierCurveShader'.\n  Possible C/C++ prototypes are:\n    StrokeShaders::BezierCurveShader(float)\n    StrokeShaders::BezierCurveShader()\n");
   return NULL;
 }
 
@@ -100961,7 +102138,7 @@ fail:
 
 SWIGINTERN PyObject *BezierCurveShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__BezierCurveShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -101084,7 +102261,7 @@ fail:
 
 SWIGINTERN PyObject *InflateShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__InflateShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -101198,7 +102375,7 @@ fail:
 
 SWIGINTERN PyObject *PolygonalizationShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__PolygonalizationShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -101312,7 +102489,7 @@ fail:
 
 SWIGINTERN PyObject *GuidingLinesShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__GuidingLinesShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -101426,7 +102603,7 @@ fail:
 
 SWIGINTERN PyObject *TipRemoverShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__TipRemoverShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -101563,7 +102740,7 @@ fail:
 
 SWIGINTERN PyObject *streamShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__streamShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -101712,7 +102889,7 @@ fail:
 
 SWIGINTERN PyObject *fstreamShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__fstreamShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -101748,7 +102925,7 @@ SWIGINTERN PyObject *_wrap_new_CalligraphicShader(PyObject *SWIGUNUSEDPARM(self)
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CalligraphicShader" "', argument " "2"" of type '" "real""'");
   } 
   arg2 = static_cast< real >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2T_float_t,  0  | 0);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_CalligraphicShader" "', argument " "3"" of type '" "Geometry::Vec2f const &""'"); 
   }
@@ -101856,7 +103033,7 @@ fail:
 
 SWIGINTERN PyObject *CalligraphicShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CalligraphicShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -102006,7 +103183,7 @@ fail:
 
 SWIGINTERN PyObject *SpatialNoiseShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_SpatialNoiseShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -102183,7 +103360,7 @@ fail:
 
 SWIGINTERN PyObject *SmoothingShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_SmoothingShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -102391,7 +103568,7 @@ fail:
 
 SWIGINTERN PyObject *Smoother_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Smoother, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -102532,7 +103709,7 @@ fail:
 
 SWIGINTERN PyObject *Omitter_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Omitter, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -102673,7 +103850,7 @@ fail:
 
 SWIGINTERN PyObject *OmissionShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_OmissionShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -102716,7 +103893,7 @@ SWIGINTERN PyObject *_wrap_Operators_chain__SWIG_0(PyObject *SWIGUNUSEDPARM(self
   PyObject *resultobj = 0;
   ViewEdgeInternal::ViewEdgeIterator *arg1 = 0 ;
   UnaryPredicate1D *arg2 = 0 ;
-  UnaryFunction1D< void > *arg3 = 0 ;
+  UnaryFunction1D<void > *arg3 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -102744,14 +103921,14 @@ SWIGINTERN PyObject *_wrap_Operators_chain__SWIG_0(PyObject *SWIGUNUSEDPARM(self
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_chain" "', argument " "2"" of type '" "UnaryPredicate1D &""'"); 
   }
   arg2 = reinterpret_cast< UnaryPredicate1D * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_UnaryFunction1DT_void_t,  0 );
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_UnaryFunction1DTvoid_t,  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Operators_chain" "', argument " "3"" of type '" "UnaryFunction1D< void > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Operators_chain" "', argument " "3"" of type '" "UnaryFunction1D<void > &""'"); 
   }
   if (!argp3) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_chain" "', argument " "3"" of type '" "UnaryFunction1D< void > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_chain" "', argument " "3"" of type '" "UnaryFunction1D<void > &""'"); 
   }
-  arg3 = reinterpret_cast< UnaryFunction1D< void > * >(argp3);
+  arg3 = reinterpret_cast< UnaryFunction1D<void > * >(argp3);
   {
     try {
       Operators::chain(*arg1,*arg2,*arg3);
@@ -102822,7 +103999,7 @@ SWIGINTERN PyObject *_wrap_Operators_chain(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -102851,7 +104028,7 @@ SWIGINTERN PyObject *_wrap_Operators_chain(PyObject *self, PyObject *args) {
       _v = SWIG_CheckState(res);
       if (_v) {
         void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_UnaryFunction1DT_void_t, 0);
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_UnaryFunction1DTvoid_t, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           return _wrap_Operators_chain__SWIG_0(self, args);
@@ -102861,10 +104038,7 @@ SWIGINTERN PyObject *_wrap_Operators_chain(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Operators_chain'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    chain(ViewEdgeInternal::ViewEdgeIterator &,UnaryPredicate1D &,UnaryFunction1D< void > &)\n"
-    "    Operators::chain(ViewEdgeInternal::ViewEdgeIterator &,UnaryPredicate1D &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Operators_chain'.\n  Possible C/C++ prototypes are:\n    chain(ViewEdgeInternal::ViewEdgeIterator &,UnaryPredicate1D &,UnaryFunction1D<void > &)\n    Operators::chain(ViewEdgeInternal::ViewEdgeIterator &,UnaryPredicate1D &)\n");
   return NULL;
 }
 
@@ -102955,7 +104129,7 @@ SWIGINTERN PyObject *_wrap_Operators_bidirectionalChain(PyObject *self, PyObject
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -102984,10 +104158,7 @@ SWIGINTERN PyObject *_wrap_Operators_bidirectionalChain(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Operators_bidirectionalChain'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    bidirectionalChain(ChainingIterator &,UnaryPredicate1D &)\n"
-    "    Operators::bidirectionalChain(ChainingIterator &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Operators_bidirectionalChain'.\n  Possible C/C++ prototypes are:\n    bidirectionalChain(ChainingIterator &,UnaryPredicate1D &)\n    Operators::bidirectionalChain(ChainingIterator &)\n");
   return NULL;
 }
 
@@ -103176,7 +104347,7 @@ SWIGINTERN PyObject *_wrap_Operators_sequentialSplit(PyObject *self, PyObject *a
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -103240,19 +104411,14 @@ SWIGINTERN PyObject *_wrap_Operators_sequentialSplit(PyObject *self, PyObject *a
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Operators_sequentialSplit'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    sequentialSplit(UnaryPredicate0D &,UnaryPredicate0D &,float)\n"
-    "    sequentialSplit(UnaryPredicate0D &,UnaryPredicate0D &)\n"
-    "    sequentialSplit(UnaryPredicate0D &,float)\n"
-    "    Operators::sequentialSplit(UnaryPredicate0D &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Operators_sequentialSplit'.\n  Possible C/C++ prototypes are:\n    sequentialSplit(UnaryPredicate0D &,UnaryPredicate0D &,float)\n    sequentialSplit(UnaryPredicate0D &,UnaryPredicate0D &)\n    sequentialSplit(UnaryPredicate0D &,float)\n    Operators::sequentialSplit(UnaryPredicate0D &)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Operators_recursiveSplit__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D< double > *arg1 = 0 ;
+  UnaryFunction0D<double > *arg1 = 0 ;
   UnaryPredicate1D *arg2 = 0 ;
   float arg3 ;
   void *argp1 = 0 ;
@@ -103266,14 +104432,14 @@ SWIGINTERN PyObject *_wrap_Operators_recursiveSplit__SWIG_0(PyObject *SWIGUNUSED
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:Operators_recursiveSplit",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DT_double_t,  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DTdouble_t,  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D< double > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
   }
   if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D< double > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D< double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D<double > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_UnaryPredicate1D,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Operators_recursiveSplit" "', argument " "2"" of type '" "UnaryPredicate1D &""'"); 
@@ -103307,7 +104473,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Operators_recursiveSplit__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D< double > *arg1 = 0 ;
+  UnaryFunction0D<double > *arg1 = 0 ;
   UnaryPredicate1D *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -103317,14 +104483,14 @@ SWIGINTERN PyObject *_wrap_Operators_recursiveSplit__SWIG_1(PyObject *SWIGUNUSED
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Operators_recursiveSplit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DT_double_t,  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DTdouble_t,  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D< double > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
   }
   if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D< double > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D< double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D<double > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_UnaryPredicate1D,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Operators_recursiveSplit" "', argument " "2"" of type '" "UnaryPredicate1D &""'"); 
@@ -103353,7 +104519,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Operators_recursiveSplit__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D< double > *arg1 = 0 ;
+  UnaryFunction0D<double > *arg1 = 0 ;
   UnaryPredicate0D *arg2 = 0 ;
   UnaryPredicate1D *arg3 = 0 ;
   float arg4 ;
@@ -103371,14 +104537,14 @@ SWIGINTERN PyObject *_wrap_Operators_recursiveSplit__SWIG_2(PyObject *SWIGUNUSED
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:Operators_recursiveSplit",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DT_double_t,  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DTdouble_t,  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D< double > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
   }
   if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D< double > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D< double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D<double > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_UnaryPredicate0D,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Operators_recursiveSplit" "', argument " "2"" of type '" "UnaryPredicate0D &""'"); 
@@ -103420,7 +104586,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Operators_recursiveSplit__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D< double > *arg1 = 0 ;
+  UnaryFunction0D<double > *arg1 = 0 ;
   UnaryPredicate0D *arg2 = 0 ;
   UnaryPredicate1D *arg3 = 0 ;
   void *argp1 = 0 ;
@@ -103434,14 +104600,14 @@ SWIGINTERN PyObject *_wrap_Operators_recursiveSplit__SWIG_3(PyObject *SWIGUNUSED
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:Operators_recursiveSplit",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DT_double_t,  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DTdouble_t,  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D< double > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
   }
   if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D< double > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D< double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D<double > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_UnaryPredicate0D,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Operators_recursiveSplit" "', argument " "2"" of type '" "UnaryPredicate0D &""'"); 
@@ -103482,14 +104648,14 @@ SWIGINTERN PyObject *_wrap_Operators_recursiveSplit(PyObject *self, PyObject *ar
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DT_double_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DTdouble_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
@@ -103503,7 +104669,7 @@ SWIGINTERN PyObject *_wrap_Operators_recursiveSplit(PyObject *self, PyObject *ar
   if (argc == 3) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DT_double_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DTdouble_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
@@ -103523,7 +104689,7 @@ SWIGINTERN PyObject *_wrap_Operators_recursiveSplit(PyObject *self, PyObject *ar
   if (argc == 3) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DT_double_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DTdouble_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
@@ -103542,7 +104708,7 @@ SWIGINTERN PyObject *_wrap_Operators_recursiveSplit(PyObject *self, PyObject *ar
   if (argc == 4) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DT_double_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DTdouble_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
@@ -103566,12 +104732,7 @@ SWIGINTERN PyObject *_wrap_Operators_recursiveSplit(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Operators_recursiveSplit'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    recursiveSplit(UnaryFunction0D< double > &,UnaryPredicate1D &,float)\n"
-    "    recursiveSplit(UnaryFunction0D< double > &,UnaryPredicate1D &)\n"
-    "    recursiveSplit(UnaryFunction0D< double > &,UnaryPredicate0D &,UnaryPredicate1D &,float)\n"
-    "    Operators::recursiveSplit(UnaryFunction0D< double > &,UnaryPredicate0D &,UnaryPredicate1D &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Operators_recursiveSplit'.\n  Possible C/C++ prototypes are:\n    recursiveSplit(UnaryFunction0D<double > &,UnaryPredicate1D &,float)\n    recursiveSplit(UnaryFunction0D<double > &,UnaryPredicate1D &)\n    recursiveSplit(UnaryFunction0D<double > &,UnaryPredicate0D &,UnaryPredicate1D &,float)\n    Operators::recursiveSplit(UnaryFunction0D<double > &,UnaryPredicate0D &,UnaryPredicate1D &)\n");
   return NULL;
 }
 
@@ -103613,7 +104774,7 @@ fail:
 SWIGINTERN PyObject *_wrap_Operators_create(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   UnaryPredicate1D *arg1 = 0 ;
-  std::vector< StrokeShader * > arg2 ;
+  std::vector<StrokeShader * > arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -103629,10 +104790,10 @@ SWIGINTERN PyObject *_wrap_Operators_create(PyObject *SWIGUNUSEDPARM(self), PyOb
   }
   arg1 = reinterpret_cast< UnaryPredicate1D * >(argp1);
   {
-    std::vector<StrokeShader*,std::allocator< StrokeShader * > > *ptr = (std::vector<StrokeShader*,std::allocator< StrokeShader * > > *)0;
+    std::vector<StrokeShader*,std::allocator<StrokeShader * > > *ptr = (std::vector<StrokeShader*,std::allocator<StrokeShader * > > *)0;
     int res = swig::asptr(obj1, &ptr);
     if (!SWIG_IsOK(res) || !ptr) {
-      SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "Operators_create" "', argument " "2"" of type '" "std::vector< StrokeShader * >""'"); 
+      SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "Operators_create" "', argument " "2"" of type '" "std::vector<StrokeShader * >""'"); 
     }
     arg2 = *ptr;
     if (SWIG_IsNewObj(res)) delete ptr;
@@ -103854,7 +105015,7 @@ fail:
 
 SWIGINTERN PyObject *Operators_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Operators, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -103972,7 +105133,7 @@ fail:
 
 SWIGINTERN PyObject *ltstr_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ltstr, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -104757,7 +105918,7 @@ SWIGINTERN PyObject *_wrap_Canvas_loadMap(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 5); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -104832,11 +105993,7 @@ SWIGINTERN PyObject *_wrap_Canvas_loadMap(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Canvas_loadMap'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    loadMap(Canvas *,char const *,char const *,unsigned int,float)\n"
-    "    loadMap(Canvas *,char const *,char const *,unsigned int)\n"
-    "    loadMap(Canvas *,char const *,char const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Canvas_loadMap'.\n  Possible C/C++ prototypes are:\n    loadMap(char const *,char const *,unsigned int,float)\n    loadMap(char const *,char const *,unsigned int)\n    loadMap(char const *,char const *)\n");
   return NULL;
 }
 
@@ -105054,7 +106211,7 @@ SWIGINTERN PyObject *_wrap_Canvas_selectedFEdge(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -105078,10 +106235,7 @@ SWIGINTERN PyObject *_wrap_Canvas_selectedFEdge(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Canvas_selectedFEdge'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    selectedFEdge(Canvas const *)\n"
-    "    selectedFEdge(Canvas *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Canvas_selectedFEdge'.\n  Possible C/C++ prototypes are:\n    selectedFEdge()\n    selectedFEdge()\n");
   return NULL;
 }
 
@@ -105185,7 +106339,7 @@ fail:
 SWIGINTERN PyObject *_wrap_Canvas_scene3DBBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   Canvas *arg1 = (Canvas *) 0 ;
-  SwigValueWrapper< BBox< VecMat::Vec3< double > > > result;
+  SwigValueWrapper<BBox<VecMat::Vec3<double > > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -105207,7 +106361,7 @@ SWIGINTERN PyObject *_wrap_Canvas_scene3DBBox(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new BBox< Geometry::Vec3r >(static_cast< const BBox< Geometry::Vec3r >& >(result))), SWIGTYPE_p_BBoxT_VecMat__Vec3T_double_t_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new BBox<Geometry::Vec3r >(static_cast< const BBox<Geometry::Vec3r >& >(result))), SWIGTYPE_p_BBoxTVecMat__Vec3Tdouble_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -105310,7 +106464,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Canvas_SetSelectedFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Canvas_setSelectedFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   Canvas *arg1 = (Canvas *) 0 ;
   FEdge *arg2 = (FEdge *) 0 ;
@@ -105321,20 +106475,20 @@ SWIGINTERN PyObject *_wrap_Canvas_SetSelectedFEdge(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Canvas_SetSelectedFEdge",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:Canvas_setSelectedFEdge",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_SetSelectedFEdge" "', argument " "1"" of type '" "Canvas *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_setSelectedFEdge" "', argument " "1"" of type '" "Canvas *""'"); 
   }
   arg1 = reinterpret_cast< Canvas * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FEdge, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Canvas_SetSelectedFEdge" "', argument " "2"" of type '" "FEdge *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Canvas_setSelectedFEdge" "', argument " "2"" of type '" "FEdge *""'"); 
   }
   arg2 = reinterpret_cast< FEdge * >(argp2);
   {
     try {
-      (arg1)->SetSelectedFEdge(arg2);
+      (arg1)->setSelectedFEdge(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -105537,7 +106691,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Canvas_SetVisible(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Canvas_setVisible(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   Canvas *arg1 = (Canvas *) 0 ;
   unsigned int arg2 ;
@@ -105552,25 +106706,25 @@ SWIGINTERN PyObject *_wrap_Canvas_SetVisible(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:Canvas_SetVisible",&obj0,&obj1,&obj2)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OOO:Canvas_setVisible",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_SetVisible" "', argument " "1"" of type '" "Canvas *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_setVisible" "', argument " "1"" of type '" "Canvas *""'"); 
   }
   arg1 = reinterpret_cast< Canvas * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Canvas_SetVisible" "', argument " "2"" of type '" "unsigned int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Canvas_setVisible" "', argument " "2"" of type '" "unsigned int""'");
   } 
   arg2 = static_cast< unsigned int >(val2);
   ecode3 = SWIG_AsVal_bool(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Canvas_SetVisible" "', argument " "3"" of type '" "bool""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Canvas_setVisible" "', argument " "3"" of type '" "bool""'");
   } 
   arg3 = static_cast< bool >(val3);
   {
     try {
-      (arg1)->SetVisible(arg2,arg3);
+      (arg1)->setVisible(arg2,arg3);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -105626,7 +106780,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_Canvas_SetCurrentPaperTextureIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_Canvas_setCurrentPaperTextureIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   Canvas *arg1 = (Canvas *) 0 ;
   int arg2 ;
@@ -105637,20 +106791,20 @@ SWIGINTERN PyObject *_wrap_Canvas_SetCurrentPaperTextureIndex(PyObject *SWIGUNUS
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:Canvas_SetCurrentPaperTextureIndex",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:Canvas_setCurrentPaperTextureIndex",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_Canvas, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_SetCurrentPaperTextureIndex" "', argument " "1"" of type '" "Canvas *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_setCurrentPaperTextureIndex" "', argument " "1"" of type '" "Canvas *""'"); 
   }
   arg1 = reinterpret_cast< Canvas * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Canvas_SetCurrentPaperTextureIndex" "', argument " "2"" of type '" "int""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Canvas_setCurrentPaperTextureIndex" "', argument " "2"" of type '" "int""'");
   } 
   arg2 = static_cast< int >(val2);
   {
     try {
-      (arg1)->SetCurrentPaperTextureIndex(arg2);
+      (arg1)->setCurrentPaperTextureIndex(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -105743,7 +106897,7 @@ SWIGINTERN PyObject *_wrap_Canvas_changePaperTexture(PyObject *self, PyObject *a
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -105773,10 +106927,7 @@ SWIGINTERN PyObject *_wrap_Canvas_changePaperTexture(PyObject *self, PyObject *a
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Canvas_changePaperTexture'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    changePaperTexture(Canvas *,bool)\n"
-    "    changePaperTexture(Canvas *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Canvas_changePaperTexture'.\n  Possible C/C++ prototypes are:\n    changePaperTexture(bool)\n    changePaperTexture()\n");
   return NULL;
 }
 
@@ -105889,7 +107040,7 @@ SWIGINTERN PyObject *_wrap_Canvas_resetModified(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -105919,10 +107070,7 @@ SWIGINTERN PyObject *_wrap_Canvas_resetModified(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Canvas_resetModified'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    resetModified(Canvas *,bool)\n"
-    "    resetModified(Canvas *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Canvas_resetModified'.\n  Possible C/C++ prototypes are:\n    resetModified(bool)\n    resetModified()\n");
   return NULL;
 }
 
@@ -105930,7 +107078,7 @@ fail:
 SWIGINTERN PyObject *_wrap_Canvas_causalStyleModules__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   Canvas *arg1 = (Canvas *) 0 ;
-  std::vector< unsigned int,std::allocator< unsigned int > > *arg2 = 0 ;
+  std::vector<unsigned int,std::allocator<unsigned int > > *arg2 = 0 ;
   unsigned int arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -105948,14 +107096,14 @@ SWIGINTERN PyObject *_wrap_Canvas_causalStyleModules__SWIG_0(PyObject *SWIGUNUSE
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_causalStyleModules" "', argument " "1"" of type '" "Canvas *""'"); 
   }
   arg1 = reinterpret_cast< Canvas * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t,  0 );
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTunsigned_int_std__allocatorTunsigned_int_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Canvas_causalStyleModules" "', argument " "2"" of type '" "std::vector< unsigned int,std::allocator< unsigned int > > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Canvas_causalStyleModules" "', argument " "2"" of type '" "std::vector<unsigned int,std::allocator<unsigned int > > &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Canvas_causalStyleModules" "', argument " "2"" of type '" "std::vector< unsigned int,std::allocator< unsigned int > > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Canvas_causalStyleModules" "', argument " "2"" of type '" "std::vector<unsigned int,std::allocator<unsigned int > > &""'"); 
   }
-  arg2 = reinterpret_cast< std::vector< unsigned int,std::allocator< unsigned int > > * >(argp2);
+  arg2 = reinterpret_cast< std::vector<unsigned int,std::allocator<unsigned int > > * >(argp2);
   ecode3 = SWIG_AsVal_unsigned_SS_int(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Canvas_causalStyleModules" "', argument " "3"" of type '" "unsigned int""'");
@@ -105982,7 +107130,7 @@ fail:
 SWIGINTERN PyObject *_wrap_Canvas_causalStyleModules__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   Canvas *arg1 = (Canvas *) 0 ;
-  std::vector< unsigned int,std::allocator< unsigned int > > *arg2 = 0 ;
+  std::vector<unsigned int,std::allocator<unsigned int > > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -105996,14 +107144,14 @@ SWIGINTERN PyObject *_wrap_Canvas_causalStyleModules__SWIG_1(PyObject *SWIGUNUSE
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_causalStyleModules" "', argument " "1"" of type '" "Canvas *""'"); 
   }
   arg1 = reinterpret_cast< Canvas * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t,  0 );
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTunsigned_int_std__allocatorTunsigned_int_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Canvas_causalStyleModules" "', argument " "2"" of type '" "std::vector< unsigned int,std::allocator< unsigned int > > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Canvas_causalStyleModules" "', argument " "2"" of type '" "std::vector<unsigned int,std::allocator<unsigned int > > &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Canvas_causalStyleModules" "', argument " "2"" of type '" "std::vector< unsigned int,std::allocator< unsigned int > > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Canvas_causalStyleModules" "', argument " "2"" of type '" "std::vector<unsigned int,std::allocator<unsigned int > > &""'"); 
   }
-  arg2 = reinterpret_cast< std::vector< unsigned int,std::allocator< unsigned int > > * >(argp2);
+  arg2 = reinterpret_cast< std::vector<unsigned int,std::allocator<unsigned int > > * >(argp2);
   {
     try {
       (arg1)->causalStyleModules(*arg2);
@@ -106028,7 +107176,7 @@ SWIGINTERN PyObject *_wrap_Canvas_causalStyleModules(PyObject *self, PyObject *a
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = (int)PyObject_Length(args);
+  argc = PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -106039,7 +107187,7 @@ SWIGINTERN PyObject *_wrap_Canvas_causalStyleModules(PyObject *self, PyObject *a
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_std__vectorTunsigned_int_std__allocatorTunsigned_int_t_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Canvas_causalStyleModules__SWIG_1(self, args);
@@ -106053,7 +107201,7 @@ SWIGINTERN PyObject *_wrap_Canvas_causalStyleModules(PyObject *self, PyObject *a
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_std__vectorTunsigned_int_std__allocatorTunsigned_int_t_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         {
@@ -106068,10 +107216,7 @@ SWIGINTERN PyObject *_wrap_Canvas_causalStyleModules(PyObject *self, PyObject *a
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Canvas_causalStyleModules'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    causalStyleModules(Canvas *,std::vector< unsigned int,std::allocator< unsigned int > > &,unsigned int)\n"
-    "    causalStyleModules(Canvas *,std::vector< unsigned int,std::allocator< unsigned int > > &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Canvas_causalStyleModules'.\n  Possible C/C++ prototypes are:\n    causalStyleModules(std::vector<unsigned int,std::allocator<unsigned int > > &,unsigned int)\n    causalStyleModules(std::vector<unsigned int,std::allocator<unsigned int > > &)\n");
   return NULL;
 }
 
@@ -106127,7 +107272,7 @@ fail:
 
 SWIGINTERN PyObject *Canvas_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Canvas, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -106148,7 +107293,7 @@ SWIGINTERN PyObject *_wrap_castToSVertex(PyObject *SWIGUNUSEDPARM(self), PyObjec
   arg1 = reinterpret_cast< Interface0D * >(argp1);
   {
     try {
-      result = (SVertex *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast< Interface0D,SVertex >(arg1);
+      result = (SVertex *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast<Interface0D,SVertex >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -106180,7 +107325,7 @@ SWIGINTERN PyObject *_wrap_castToViewVertex(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg1 = reinterpret_cast< Interface0D * >(argp1);
   {
     try {
-      result = (ViewVertex *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast< Interface0D,ViewVertex >(arg1);
+      result = (ViewVertex *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast<Interface0D,ViewVertex >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -106212,7 +107357,7 @@ SWIGINTERN PyObject *_wrap_castToTVertex(PyObject *SWIGUNUSEDPARM(self), PyObjec
   arg1 = reinterpret_cast< Interface0D * >(argp1);
   {
     try {
-      result = (TVertex *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast< Interface0D,TVertex >(arg1);
+      result = (TVertex *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast<Interface0D,TVertex >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -106244,7 +107389,7 @@ SWIGINTERN PyObject *_wrap_castToCurvePoint(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg1 = reinterpret_cast< Interface0D * >(argp1);
   {
     try {
-      result = (CurvePoint *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast< Interface0D,CurvePoint >(arg1);
+      result = (CurvePoint *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast<Interface0D,CurvePoint >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -106276,7 +107421,7 @@ SWIGINTERN PyObject *_wrap_castToStrokeVertex(PyObject *SWIGUNUSEDPARM(self), Py
   arg1 = reinterpret_cast< Interface0D * >(argp1);
   {
     try {
-      result = (StrokeVertex *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast< Interface0D,StrokeVertex >(arg1);
+      result = (StrokeVertex *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast<Interface0D,StrokeVertex >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -106308,7 +107453,7 @@ SWIGINTERN PyObject *_wrap_castToNonTVertex(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg1 = reinterpret_cast< Interface0D * >(argp1);
   {
     try {
-      result = (NonTVertex *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast< Interface0D,NonTVertex >(arg1);
+      result = (NonTVertex *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast<Interface0D,NonTVertex >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -106340,7 +107485,7 @@ SWIGINTERN PyObject *_wrap_castToFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject
   arg1 = reinterpret_cast< Interface1D * >(argp1);
   {
     try {
-      result = (FEdge *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast< Interface1D,FEdge >(arg1);
+      result = (FEdge *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast<Interface1D,FEdge >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -106372,7 +107517,7 @@ SWIGINTERN PyObject *_wrap_castToViewEdge(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg1 = reinterpret_cast< Interface1D * >(argp1);
   {
     try {
-      result = (ViewEdge *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast< Interface1D,ViewEdge >(arg1);
+      result = (ViewEdge *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast<Interface1D,ViewEdge >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -106404,7 +107549,7 @@ SWIGINTERN PyObject *_wrap_castToStroke(PyObject *SWIGUNUSEDPARM(self), PyObject
   arg1 = reinterpret_cast< Interface1D * >(argp1);
   {
     try {
-      result = (Stroke *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast< Interface1D,Stroke >(arg1);
+      result = (Stroke *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast<Interface1D,Stroke >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -106436,7 +107581,7 @@ SWIGINTERN PyObject *_wrap_castToChain(PyObject *SWIGUNUSEDPARM(self), PyObject
   arg1 = reinterpret_cast< Interface1D * >(argp1);
   {
     try {
-      result = (Chain *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast< Interface1D,Chain >(arg1);
+      result = (Chain *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast<Interface1D,Chain >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -106773,11 +107918,11 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"Material_emissionB", _wrap_Material_emissionB, METH_VARARGS, NULL},
 	 { (char *)"Material_emissionA", _wrap_Material_emissionA, METH_VARARGS, NULL},
 	 { (char *)"Material_shininess", _wrap_Material_shininess, METH_VARARGS, NULL},
-	 { (char *)"Material_SetDiffuse", _wrap_Material_SetDiffuse, METH_VARARGS, NULL},
-	 { (char *)"Material_SetSpecular", _wrap_Material_SetSpecular, METH_VARARGS, NULL},
-	 { (char *)"Material_SetAmbient", _wrap_Material_SetAmbient, METH_VARARGS, NULL},
-	 { (char *)"Material_SetEmission", _wrap_Material_SetEmission, METH_VARARGS, NULL},
-	 { (char *)"Material_SetShininess", _wrap_Material_SetShininess, METH_VARARGS, NULL},
+	 { (char *)"Material_setDiffuse", _wrap_Material_setDiffuse, METH_VARARGS, NULL},
+	 { (char *)"Material_setSpecular", _wrap_Material_setSpecular, METH_VARARGS, NULL},
+	 { (char *)"Material_setAmbient", _wrap_Material_setAmbient, METH_VARARGS, NULL},
+	 { (char *)"Material_setEmission", _wrap_Material_setEmission, METH_VARARGS, NULL},
+	 { (char *)"Material_setShininess", _wrap_Material_setShininess, METH_VARARGS, NULL},
 	 { (char *)"Material___ne__", _wrap_Material___ne__, METH_VARARGS, NULL},
 	 { (char *)"Material___eq__", _wrap_Material___eq__, METH_VARARGS, NULL},
 	 { (char *)"Material_swigregister", Material_swigregister, METH_VARARGS, NULL},
@@ -106858,6 +108003,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"Interface0DIterator_castToNonTVertex", _wrap_Interface0DIterator_castToNonTVertex, METH_VARARGS, NULL},
 	 { (char *)"Interface0DIterator_castToTVertex", _wrap_Interface0DIterator_castToTVertex, METH_VARARGS, NULL},
 	 { (char *)"Interface0DIterator_swigregister", Interface0DIterator_swigregister, METH_VARARGS, NULL},
+	 { (char *)"new_Interface1D", _wrap_new_Interface1D, METH_VARARGS, NULL},
 	 { (char *)"delete_Interface1D", _wrap_delete_Interface1D, METH_VARARGS, NULL},
 	 { (char *)"Interface1D_getExactTypeName", _wrap_Interface1D_getExactTypeName, METH_VARARGS, NULL},
 	 { (char *)"Interface1D_verticesBegin", _wrap_Interface1D_verticesBegin, METH_VARARGS, NULL},
@@ -106904,8 +108050,8 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"SVertex_fedges_end", _wrap_SVertex_fedges_end, METH_VARARGS, NULL},
 	 { (char *)"SVertex_z", _wrap_SVertex_z, METH_VARARGS, NULL},
 	 { (char *)"SVertex_viewvertex", _wrap_SVertex_viewvertex, METH_VARARGS, NULL},
-	 { (char *)"SVertex_SetPoint3D", _wrap_SVertex_SetPoint3D, METH_VARARGS, NULL},
-	 { (char *)"SVertex_SetPoint2D", _wrap_SVertex_SetPoint2D, METH_VARARGS, NULL},
+	 { (char *)"SVertex_setPoint3D", _wrap_SVertex_setPoint3D, METH_VARARGS, NULL},
+	 { (char *)"SVertex_setPoint2D", _wrap_SVertex_setPoint2D, METH_VARARGS, NULL},
 	 { (char *)"SVertex_AddNormal", _wrap_SVertex_AddNormal, METH_VARARGS, NULL},
 	 { (char *)"SVertex_setCurvatureInfo", _wrap_SVertex_setCurvatureInfo, METH_VARARGS, NULL},
 	 { (char *)"SVertex_getCurvatureInfo", _wrap_SVertex_getCurvatureInfo, METH_VARARGS, NULL},
@@ -106913,10 +108059,10 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"SVertex_setDirectionFredo", _wrap_SVertex_setDirectionFredo, METH_VARARGS, NULL},
 	 { (char *)"SVertex_curvatureFredo", _wrap_SVertex_curvatureFredo, METH_VARARGS, NULL},
 	 { (char *)"SVertex_directionFredo", _wrap_SVertex_directionFredo, METH_VARARGS, NULL},
-	 { (char *)"SVertex_SetId", _wrap_SVertex_SetId, METH_VARARGS, NULL},
-	 { (char *)"SVertex_SetFEdges", _wrap_SVertex_SetFEdges, METH_VARARGS, NULL},
-	 { (char *)"SVertex_SetShape", _wrap_SVertex_SetShape, METH_VARARGS, NULL},
-	 { (char *)"SVertex_SetViewVertex", _wrap_SVertex_SetViewVertex, METH_VARARGS, NULL},
+	 { (char *)"SVertex_setId", _wrap_SVertex_setId, METH_VARARGS, NULL},
+	 { (char *)"SVertex_setFEdges", _wrap_SVertex_setFEdges, METH_VARARGS, NULL},
+	 { (char *)"SVertex_setShape", _wrap_SVertex_setShape, METH_VARARGS, NULL},
+	 { (char *)"SVertex_setViewVertex", _wrap_SVertex_setViewVertex, METH_VARARGS, NULL},
 	 { (char *)"SVertex_AddFEdge", _wrap_SVertex_AddFEdge, METH_VARARGS, NULL},
 	 { (char *)"SVertex_Replace", _wrap_SVertex_Replace, METH_VARARGS, NULL},
 	 { (char *)"SVertex_fedge", _wrap_SVertex_fedge, METH_VARARGS, NULL},
@@ -106957,17 +108103,17 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"FEdge_getOccludeeIntersection", _wrap_FEdge_getOccludeeIntersection, METH_VARARGS, NULL},
 	 { (char *)"FEdge_getOccludeeEmpty", _wrap_FEdge_getOccludeeEmpty, METH_VARARGS, NULL},
 	 { (char *)"FEdge_isSmooth", _wrap_FEdge_isSmooth, METH_VARARGS, NULL},
-	 { (char *)"FEdge_SetVertexA", _wrap_FEdge_SetVertexA, METH_VARARGS, NULL},
-	 { (char *)"FEdge_SetVertexB", _wrap_FEdge_SetVertexB, METH_VARARGS, NULL},
-	 { (char *)"FEdge_SetId", _wrap_FEdge_SetId, METH_VARARGS, NULL},
-	 { (char *)"FEdge_SetNextEdge", _wrap_FEdge_SetNextEdge, METH_VARARGS, NULL},
-	 { (char *)"FEdge_SetPreviousEdge", _wrap_FEdge_SetPreviousEdge, METH_VARARGS, NULL},
-	 { (char *)"FEdge_SetNature", _wrap_FEdge_SetNature, METH_VARARGS, NULL},
-	 { (char *)"FEdge_SetViewEdge", _wrap_FEdge_SetViewEdge, METH_VARARGS, NULL},
-	 { (char *)"FEdge_SetaFace", _wrap_FEdge_SetaFace, METH_VARARGS, NULL},
-	 { (char *)"FEdge_SetOccludeeIntersection", _wrap_FEdge_SetOccludeeIntersection, METH_VARARGS, NULL},
-	 { (char *)"FEdge_SetOccludeeEmpty", _wrap_FEdge_SetOccludeeEmpty, METH_VARARGS, NULL},
-	 { (char *)"FEdge_SetSmooth", _wrap_FEdge_SetSmooth, METH_VARARGS, NULL},
+	 { (char *)"FEdge_setVertexA", _wrap_FEdge_setVertexA, METH_VARARGS, NULL},
+	 { (char *)"FEdge_setVertexB", _wrap_FEdge_setVertexB, METH_VARARGS, NULL},
+	 { (char *)"FEdge_setId", _wrap_FEdge_setId, METH_VARARGS, NULL},
+	 { (char *)"FEdge_setNextEdge", _wrap_FEdge_setNextEdge, METH_VARARGS, NULL},
+	 { (char *)"FEdge_setPreviousEdge", _wrap_FEdge_setPreviousEdge, METH_VARARGS, NULL},
+	 { (char *)"FEdge_setNature", _wrap_FEdge_setNature, METH_VARARGS, NULL},
+	 { (char *)"FEdge_setViewEdge", _wrap_FEdge_setViewEdge, METH_VARARGS, NULL},
+	 { (char *)"FEdge_setaFace", _wrap_FEdge_setaFace, METH_VARARGS, NULL},
+	 { (char *)"FEdge_setOccludeeIntersection", _wrap_FEdge_setOccludeeIntersection, METH_VARARGS, NULL},
+	 { (char *)"FEdge_setOccludeeEmpty", _wrap_FEdge_setOccludeeEmpty, METH_VARARGS, NULL},
+	 { (char *)"FEdge_setSmooth", _wrap_FEdge_setSmooth, METH_VARARGS, NULL},
 	 { (char *)"FEdge_CommonVertex", _wrap_FEdge_CommonVertex, METH_VARARGS, NULL},
 	 { (char *)"FEdge_min2d", _wrap_FEdge_min2d, METH_VARARGS, NULL},
 	 { (char *)"FEdge_max2d", _wrap_FEdge_max2d, METH_VARARGS, NULL},
@@ -107032,8 +108178,8 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"FEdgeSVertexIterator_shape", _wrap_FEdgeSVertexIterator_shape, METH_VARARGS, NULL},
 	 { (char *)"FEdgeSVertexIterator_z", _wrap_FEdgeSVertexIterator_z, METH_VARARGS, NULL},
 	 { (char *)"FEdgeSVertexIterator_viewvertex", _wrap_FEdgeSVertexIterator_viewvertex, METH_VARARGS, NULL},
-	 { (char *)"FEdgeSVertexIterator_SetPoint3D", _wrap_FEdgeSVertexIterator_SetPoint3D, METH_VARARGS, NULL},
-	 { (char *)"FEdgeSVertexIterator_SetPoint2D", _wrap_FEdgeSVertexIterator_SetPoint2D, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_setPoint3D", _wrap_FEdgeSVertexIterator_setPoint3D, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_setPoint2D", _wrap_FEdgeSVertexIterator_setPoint2D, METH_VARARGS, NULL},
 	 { (char *)"FEdgeSVertexIterator_AddNormal", _wrap_FEdgeSVertexIterator_AddNormal, METH_VARARGS, NULL},
 	 { (char *)"FEdgeSVertexIterator_setCurvatureInfo", _wrap_FEdgeSVertexIterator_setCurvatureInfo, METH_VARARGS, NULL},
 	 { (char *)"FEdgeSVertexIterator_getCurvatureInfo", _wrap_FEdgeSVertexIterator_getCurvatureInfo, METH_VARARGS, NULL},
@@ -107041,10 +108187,10 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"FEdgeSVertexIterator_setDirectionFredo", _wrap_FEdgeSVertexIterator_setDirectionFredo, METH_VARARGS, NULL},
 	 { (char *)"FEdgeSVertexIterator_curvatureFredo", _wrap_FEdgeSVertexIterator_curvatureFredo, METH_VARARGS, NULL},
 	 { (char *)"FEdgeSVertexIterator_directionFredo", _wrap_FEdgeSVertexIterator_directionFredo, METH_VARARGS, NULL},
-	 { (char *)"FEdgeSVertexIterator_SetId", _wrap_FEdgeSVertexIterator_SetId, METH_VARARGS, NULL},
-	 { (char *)"FEdgeSVertexIterator_SetFEdges", _wrap_FEdgeSVertexIterator_SetFEdges, METH_VARARGS, NULL},
-	 { (char *)"FEdgeSVertexIterator_SetShape", _wrap_FEdgeSVertexIterator_SetShape, METH_VARARGS, NULL},
-	 { (char *)"FEdgeSVertexIterator_SetViewVertex", _wrap_FEdgeSVertexIterator_SetViewVertex, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_setId", _wrap_FEdgeSVertexIterator_setId, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_setFEdges", _wrap_FEdgeSVertexIterator_setFEdges, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_setShape", _wrap_FEdgeSVertexIterator_setShape, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSVertexIterator_setViewVertex", _wrap_FEdgeSVertexIterator_setViewVertex, METH_VARARGS, NULL},
 	 { (char *)"FEdgeSVertexIterator_AddFEdge", _wrap_FEdgeSVertexIterator_AddFEdge, METH_VARARGS, NULL},
 	 { (char *)"FEdgeSVertexIterator_Replace", _wrap_FEdgeSVertexIterator_Replace, METH_VARARGS, NULL},
 	 { (char *)"FEdgeSVertexIterator_fedge", _wrap_FEdgeSVertexIterator_fedge, METH_VARARGS, NULL},
@@ -107072,10 +108218,10 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"FEdgeSharp_aMaterial", _wrap_FEdgeSharp_aMaterial, METH_VARARGS, NULL},
 	 { (char *)"FEdgeSharp_bMaterialIndex", _wrap_FEdgeSharp_bMaterialIndex, METH_VARARGS, NULL},
 	 { (char *)"FEdgeSharp_bMaterial", _wrap_FEdgeSharp_bMaterial, METH_VARARGS, NULL},
-	 { (char *)"FEdgeSharp_SetNormalA", _wrap_FEdgeSharp_SetNormalA, METH_VARARGS, NULL},
-	 { (char *)"FEdgeSharp_SetNormalB", _wrap_FEdgeSharp_SetNormalB, METH_VARARGS, NULL},
-	 { (char *)"FEdgeSharp_SetaMaterialIndex", _wrap_FEdgeSharp_SetaMaterialIndex, METH_VARARGS, NULL},
-	 { (char *)"FEdgeSharp_SetbMaterialIndex", _wrap_FEdgeSharp_SetbMaterialIndex, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSharp_setNormalA", _wrap_FEdgeSharp_setNormalA, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSharp_setNormalB", _wrap_FEdgeSharp_setNormalB, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSharp_setaMaterialIndex", _wrap_FEdgeSharp_setaMaterialIndex, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSharp_setbMaterialIndex", _wrap_FEdgeSharp_setbMaterialIndex, METH_VARARGS, NULL},
 	 { (char *)"FEdgeSharp_swigregister", FEdgeSharp_swigregister, METH_VARARGS, NULL},
 	 { (char *)"new_FEdgeSmooth", _wrap_new_FEdgeSmooth, METH_VARARGS, NULL},
 	 { (char *)"delete_FEdgeSmooth", _wrap_delete_FEdgeSmooth, METH_VARARGS, NULL},
@@ -107084,9 +108230,9 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"FEdgeSmooth_normal", _wrap_FEdgeSmooth_normal, METH_VARARGS, NULL},
 	 { (char *)"FEdgeSmooth_materialIndex", _wrap_FEdgeSmooth_materialIndex, METH_VARARGS, NULL},
 	 { (char *)"FEdgeSmooth_material", _wrap_FEdgeSmooth_material, METH_VARARGS, NULL},
-	 { (char *)"FEdgeSmooth_SetFace", _wrap_FEdgeSmooth_SetFace, METH_VARARGS, NULL},
-	 { (char *)"FEdgeSmooth_SetNormal", _wrap_FEdgeSmooth_SetNormal, METH_VARARGS, NULL},
-	 { (char *)"FEdgeSmooth_SetMaterialIndex", _wrap_FEdgeSmooth_SetMaterialIndex, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSmooth_setFace", _wrap_FEdgeSmooth_setFace, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSmooth_setNormal", _wrap_FEdgeSmooth_setNormal, METH_VARARGS, NULL},
+	 { (char *)"FEdgeSmooth_setMaterialIndex", _wrap_FEdgeSmooth_setMaterialIndex, METH_VARARGS, NULL},
 	 { (char *)"FEdgeSmooth_swigregister", FEdgeSmooth_swigregister, METH_VARARGS, NULL},
 	 { (char *)"SShape_userdata_set", _wrap_SShape_userdata_set, METH_VARARGS, NULL},
 	 { (char *)"SShape_userdata_get", _wrap_SShape_userdata_get, METH_VARARGS, NULL},
@@ -107099,7 +108245,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"SShape_CreateSVertex", _wrap_SShape_CreateSVertex, METH_VARARGS, NULL},
 	 { (char *)"SShape_SplitEdge", _wrap_SShape_SplitEdge, METH_VARARGS, NULL},
 	 { (char *)"SShape_SplitEdgeIn2", _wrap_SShape_SplitEdgeIn2, METH_VARARGS, NULL},
-	 { (char *)"SShape_SetBBox", _wrap_SShape_SetBBox, METH_VARARGS, NULL},
+	 { (char *)"SShape_setBBox", _wrap_SShape_setBBox, METH_VARARGS, NULL},
 	 { (char *)"SShape_ComputeBBox", _wrap_SShape_ComputeBBox, METH_VARARGS, NULL},
 	 { (char *)"SShape_RemoveEdgeFromChain", _wrap_SShape_RemoveEdgeFromChain, METH_VARARGS, NULL},
 	 { (char *)"SShape_RemoveEdge", _wrap_SShape_RemoveEdge, METH_VARARGS, NULL},
@@ -107112,10 +108258,10 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"SShape_viewShape", _wrap_SShape_viewShape, METH_VARARGS, NULL},
 	 { (char *)"SShape_importance", _wrap_SShape_importance, METH_VARARGS, NULL},
 	 { (char *)"SShape_getId", _wrap_SShape_getId, METH_VARARGS, NULL},
-	 { (char *)"SShape_SetId", _wrap_SShape_SetId, METH_VARARGS, NULL},
-	 { (char *)"SShape_SetMaterials", _wrap_SShape_SetMaterials, METH_VARARGS, NULL},
-	 { (char *)"SShape_SetViewShape", _wrap_SShape_SetViewShape, METH_VARARGS, NULL},
-	 { (char *)"SShape_SetImportance", _wrap_SShape_SetImportance, METH_VARARGS, NULL},
+	 { (char *)"SShape_setId", _wrap_SShape_setId, METH_VARARGS, NULL},
+	 { (char *)"SShape_setMaterials", _wrap_SShape_setMaterials, METH_VARARGS, NULL},
+	 { (char *)"SShape_setViewShape", _wrap_SShape_setViewShape, METH_VARARGS, NULL},
+	 { (char *)"SShape_setImportance", _wrap_SShape_setImportance, METH_VARARGS, NULL},
 	 { (char *)"SShape_swigregister", SShape_swigregister, METH_VARARGS, NULL},
 	 { (char *)"ViewShapesContainer_iterator", _wrap_ViewShapesContainer_iterator, METH_VARARGS, NULL},
 	 { (char *)"ViewShapesContainer___nonzero__", _wrap_ViewShapesContainer___nonzero__, METH_VARARGS, NULL},
@@ -107342,13 +108488,13 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"TVertex_frontEdgeB", _wrap_TVertex_frontEdgeB, METH_VARARGS, NULL},
 	 { (char *)"TVertex_backEdgeA", _wrap_TVertex_backEdgeA, METH_VARARGS, NULL},
 	 { (char *)"TVertex_backEdgeB", _wrap_TVertex_backEdgeB, METH_VARARGS, NULL},
-	 { (char *)"TVertex_SetFrontVertex", _wrap_TVertex_SetFrontVertex, METH_VARARGS, NULL},
-	 { (char *)"TVertex_SetBackSVertex", _wrap_TVertex_SetBackSVertex, METH_VARARGS, NULL},
-	 { (char *)"TVertex_SetFrontEdgeA", _wrap_TVertex_SetFrontEdgeA, METH_VARARGS, NULL},
-	 { (char *)"TVertex_SetFrontEdgeB", _wrap_TVertex_SetFrontEdgeB, METH_VARARGS, NULL},
-	 { (char *)"TVertex_SetBackEdgeA", _wrap_TVertex_SetBackEdgeA, METH_VARARGS, NULL},
-	 { (char *)"TVertex_SetBackEdgeB", _wrap_TVertex_SetBackEdgeB, METH_VARARGS, NULL},
-	 { (char *)"TVertex_SetId", _wrap_TVertex_SetId, METH_VARARGS, NULL},
+	 { (char *)"TVertex_setFrontVertex", _wrap_TVertex_setFrontVertex, METH_VARARGS, NULL},
+	 { (char *)"TVertex_setBackSVertex", _wrap_TVertex_setBackSVertex, METH_VARARGS, NULL},
+	 { (char *)"TVertex_setFrontEdgeA", _wrap_TVertex_setFrontEdgeA, METH_VARARGS, NULL},
+	 { (char *)"TVertex_setFrontEdgeB", _wrap_TVertex_setFrontEdgeB, METH_VARARGS, NULL},
+	 { (char *)"TVertex_setBackEdgeA", _wrap_TVertex_setBackEdgeA, METH_VARARGS, NULL},
+	 { (char *)"TVertex_setBackEdgeB", _wrap_TVertex_setBackEdgeB, METH_VARARGS, NULL},
+	 { (char *)"TVertex_setId", _wrap_TVertex_setId, METH_VARARGS, NULL},
 	 { (char *)"TVertex_GetSVertex", _wrap_TVertex_GetSVertex, METH_VARARGS, NULL},
 	 { (char *)"TVertex_Replace", _wrap_TVertex_Replace, METH_VARARGS, NULL},
 	 { (char *)"TVertex_mate", _wrap_TVertex_mate, METH_VARARGS, NULL},
@@ -107375,8 +108521,8 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"delete_NonTVertex", _wrap_delete_NonTVertex, METH_VARARGS, NULL},
 	 { (char *)"NonTVertex_svertex", _wrap_NonTVertex_svertex, METH_VARARGS, NULL},
 	 { (char *)"NonTVertex_viewedges", _wrap_NonTVertex_viewedges, METH_VARARGS, NULL},
-	 { (char *)"NonTVertex_SetSVertex", _wrap_NonTVertex_SetSVertex, METH_VARARGS, NULL},
-	 { (char *)"NonTVertex_SetViewEdges", _wrap_NonTVertex_SetViewEdges, METH_VARARGS, NULL},
+	 { (char *)"NonTVertex_setSVertex", _wrap_NonTVertex_setSVertex, METH_VARARGS, NULL},
+	 { (char *)"NonTVertex_setViewEdges", _wrap_NonTVertex_setViewEdges, METH_VARARGS, NULL},
 	 { (char *)"NonTVertex_AddIncomingViewEdge", _wrap_NonTVertex_AddIncomingViewEdge, METH_VARARGS, NULL},
 	 { (char *)"NonTVertex_AddOutgoingViewEdge", _wrap_NonTVertex_AddOutgoingViewEdge, METH_VARARGS, NULL},
 	 { (char *)"NonTVertex_AddViewEdge", _wrap_NonTVertex_AddViewEdge, METH_VARARGS, NULL},
@@ -107404,16 +108550,16 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"ViewEdge_bShape", _wrap_ViewEdge_bShape, METH_VARARGS, NULL},
 	 { (char *)"ViewEdge_occluders", _wrap_ViewEdge_occluders, METH_VARARGS, NULL},
 	 { (char *)"ViewEdge_splittingId", _wrap_ViewEdge_splittingId, METH_VARARGS, NULL},
-	 { (char *)"ViewEdge_SetA", _wrap_ViewEdge_SetA, METH_VARARGS, NULL},
-	 { (char *)"ViewEdge_SetB", _wrap_ViewEdge_SetB, METH_VARARGS, NULL},
-	 { (char *)"ViewEdge_SetNature", _wrap_ViewEdge_SetNature, METH_VARARGS, NULL},
-	 { (char *)"ViewEdge_SetFEdgeA", _wrap_ViewEdge_SetFEdgeA, METH_VARARGS, NULL},
-	 { (char *)"ViewEdge_SetFEdgeB", _wrap_ViewEdge_SetFEdgeB, METH_VARARGS, NULL},
-	 { (char *)"ViewEdge_SetShape", _wrap_ViewEdge_SetShape, METH_VARARGS, NULL},
-	 { (char *)"ViewEdge_SetId", _wrap_ViewEdge_SetId, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_setA", _wrap_ViewEdge_setA, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_setB", _wrap_ViewEdge_setB, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_setNature", _wrap_ViewEdge_setNature, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_setFEdgeA", _wrap_ViewEdge_setFEdgeA, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_setFEdgeB", _wrap_ViewEdge_setFEdgeB, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_setShape", _wrap_ViewEdge_setShape, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_setId", _wrap_ViewEdge_setId, METH_VARARGS, NULL},
 	 { (char *)"ViewEdge_UpdateFEdges", _wrap_ViewEdge_UpdateFEdges, METH_VARARGS, NULL},
-	 { (char *)"ViewEdge_SetaShape", _wrap_ViewEdge_SetaShape, METH_VARARGS, NULL},
-	 { (char *)"ViewEdge_SetQI", _wrap_ViewEdge_SetQI, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_setaShape", _wrap_ViewEdge_setaShape, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_setQI", _wrap_ViewEdge_setQI, METH_VARARGS, NULL},
 	 { (char *)"ViewEdge_setChainingTimeStamp", _wrap_ViewEdge_setChainingTimeStamp, METH_VARARGS, NULL},
 	 { (char *)"ViewEdge_AddOccluder", _wrap_ViewEdge_AddOccluder, METH_VARARGS, NULL},
 	 { (char *)"ViewEdge_setSplittingId", _wrap_ViewEdge_setSplittingId, METH_VARARGS, NULL},
@@ -107446,9 +108592,9 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"ViewShape_vertices", _wrap_ViewShape_vertices, METH_VARARGS, NULL},
 	 { (char *)"ViewShape_edges", _wrap_ViewShape_edges, METH_VARARGS, NULL},
 	 { (char *)"ViewShape_getId", _wrap_ViewShape_getId, METH_VARARGS, NULL},
-	 { (char *)"ViewShape_SetSShape", _wrap_ViewShape_SetSShape, METH_VARARGS, NULL},
-	 { (char *)"ViewShape_SetVertices", _wrap_ViewShape_SetVertices, METH_VARARGS, NULL},
-	 { (char *)"ViewShape_SetEdges", _wrap_ViewShape_SetEdges, METH_VARARGS, NULL},
+	 { (char *)"ViewShape_setSShape", _wrap_ViewShape_setSShape, METH_VARARGS, NULL},
+	 { (char *)"ViewShape_setVertices", _wrap_ViewShape_setVertices, METH_VARARGS, NULL},
+	 { (char *)"ViewShape_setEdges", _wrap_ViewShape_setEdges, METH_VARARGS, NULL},
 	 { (char *)"ViewShape_AddVertex", _wrap_ViewShape_AddVertex, METH_VARARGS, NULL},
 	 { (char *)"ViewShape_AddEdge", _wrap_ViewShape_AddEdge, METH_VARARGS, NULL},
 	 { (char *)"ViewShape_RemoveEdge", _wrap_ViewShape_RemoveEdge, METH_VARARGS, NULL},
@@ -107505,8 +108651,8 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"ViewEdgeSVertexIterator_shape", _wrap_ViewEdgeSVertexIterator_shape, METH_VARARGS, NULL},
 	 { (char *)"ViewEdgeSVertexIterator_z", _wrap_ViewEdgeSVertexIterator_z, METH_VARARGS, NULL},
 	 { (char *)"ViewEdgeSVertexIterator_viewvertex", _wrap_ViewEdgeSVertexIterator_viewvertex, METH_VARARGS, NULL},
-	 { (char *)"ViewEdgeSVertexIterator_SetPoint3D", _wrap_ViewEdgeSVertexIterator_SetPoint3D, METH_VARARGS, NULL},
-	 { (char *)"ViewEdgeSVertexIterator_SetPoint2D", _wrap_ViewEdgeSVertexIterator_SetPoint2D, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_setPoint3D", _wrap_ViewEdgeSVertexIterator_setPoint3D, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_setPoint2D", _wrap_ViewEdgeSVertexIterator_setPoint2D, METH_VARARGS, NULL},
 	 { (char *)"ViewEdgeSVertexIterator_AddNormal", _wrap_ViewEdgeSVertexIterator_AddNormal, METH_VARARGS, NULL},
 	 { (char *)"ViewEdgeSVertexIterator_setCurvatureInfo", _wrap_ViewEdgeSVertexIterator_setCurvatureInfo, METH_VARARGS, NULL},
 	 { (char *)"ViewEdgeSVertexIterator_getCurvatureInfo", _wrap_ViewEdgeSVertexIterator_getCurvatureInfo, METH_VARARGS, NULL},
@@ -107514,10 +108660,10 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"ViewEdgeSVertexIterator_setDirectionFredo", _wrap_ViewEdgeSVertexIterator_setDirectionFredo, METH_VARARGS, NULL},
 	 { (char *)"ViewEdgeSVertexIterator_curvatureFredo", _wrap_ViewEdgeSVertexIterator_curvatureFredo, METH_VARARGS, NULL},
 	 { (char *)"ViewEdgeSVertexIterator_directionFredo", _wrap_ViewEdgeSVertexIterator_directionFredo, METH_VARARGS, NULL},
-	 { (char *)"ViewEdgeSVertexIterator_SetId", _wrap_ViewEdgeSVertexIterator_SetId, METH_VARARGS, NULL},
-	 { (char *)"ViewEdgeSVertexIterator_SetFEdges", _wrap_ViewEdgeSVertexIterator_SetFEdges, METH_VARARGS, NULL},
-	 { (char *)"ViewEdgeSVertexIterator_SetShape", _wrap_ViewEdgeSVertexIterator_SetShape, METH_VARARGS, NULL},
-	 { (char *)"ViewEdgeSVertexIterator_SetViewVertex", _wrap_ViewEdgeSVertexIterator_SetViewVertex, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_setId", _wrap_ViewEdgeSVertexIterator_setId, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_setFEdges", _wrap_ViewEdgeSVertexIterator_setFEdges, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_setShape", _wrap_ViewEdgeSVertexIterator_setShape, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeSVertexIterator_setViewVertex", _wrap_ViewEdgeSVertexIterator_setViewVertex, METH_VARARGS, NULL},
 	 { (char *)"ViewEdgeSVertexIterator_AddFEdge", _wrap_ViewEdgeSVertexIterator_AddFEdge, METH_VARARGS, NULL},
 	 { (char *)"ViewEdgeSVertexIterator_Replace", _wrap_ViewEdgeSVertexIterator_Replace, METH_VARARGS, NULL},
 	 { (char *)"ViewEdgeSVertexIterator_fedge", _wrap_ViewEdgeSVertexIterator_fedge, METH_VARARGS, NULL},
@@ -107569,16 +108715,16 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"ViewEdgeViewEdgeIterator_bShape", _wrap_ViewEdgeViewEdgeIterator_bShape, METH_VARARGS, NULL},
 	 { (char *)"ViewEdgeViewEdgeIterator_occluders", _wrap_ViewEdgeViewEdgeIterator_occluders, METH_VARARGS, NULL},
 	 { (char *)"ViewEdgeViewEdgeIterator_splittingId", _wrap_ViewEdgeViewEdgeIterator_splittingId, METH_VARARGS, NULL},
-	 { (char *)"ViewEdgeViewEdgeIterator_SetA", _wrap_ViewEdgeViewEdgeIterator_SetA, METH_VARARGS, NULL},
-	 { (char *)"ViewEdgeViewEdgeIterator_SetB", _wrap_ViewEdgeViewEdgeIterator_SetB, METH_VARARGS, NULL},
-	 { (char *)"ViewEdgeViewEdgeIterator_SetNature", _wrap_ViewEdgeViewEdgeIterator_SetNature, METH_VARARGS, NULL},
-	 { (char *)"ViewEdgeViewEdgeIterator_SetFEdgeA", _wrap_ViewEdgeViewEdgeIterator_SetFEdgeA, METH_VARARGS, NULL},
-	 { (char *)"ViewEdgeViewEdgeIterator_SetFEdgeB", _wrap_ViewEdgeViewEdgeIterator_SetFEdgeB, METH_VARARGS, NULL},
-	 { (char *)"ViewEdgeViewEdgeIterator_SetShape", _wrap_ViewEdgeViewEdgeIterator_SetShape, METH_VARARGS, NULL},
-	 { (char *)"ViewEdgeViewEdgeIterator_SetId", _wrap_ViewEdgeViewEdgeIterator_SetId, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_setA", _wrap_ViewEdgeViewEdgeIterator_setA, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_setB", _wrap_ViewEdgeViewEdgeIterator_setB, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_setNature", _wrap_ViewEdgeViewEdgeIterator_setNature, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_setFEdgeA", _wrap_ViewEdgeViewEdgeIterator_setFEdgeA, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_setFEdgeB", _wrap_ViewEdgeViewEdgeIterator_setFEdgeB, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_setShape", _wrap_ViewEdgeViewEdgeIterator_setShape, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_setId", _wrap_ViewEdgeViewEdgeIterator_setId, METH_VARARGS, NULL},
 	 { (char *)"ViewEdgeViewEdgeIterator_UpdateFEdges", _wrap_ViewEdgeViewEdgeIterator_UpdateFEdges, METH_VARARGS, NULL},
-	 { (char *)"ViewEdgeViewEdgeIterator_SetaShape", _wrap_ViewEdgeViewEdgeIterator_SetaShape, METH_VARARGS, NULL},
-	 { (char *)"ViewEdgeViewEdgeIterator_SetQI", _wrap_ViewEdgeViewEdgeIterator_SetQI, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_setaShape", _wrap_ViewEdgeViewEdgeIterator_setaShape, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_setQI", _wrap_ViewEdgeViewEdgeIterator_setQI, METH_VARARGS, NULL},
 	 { (char *)"ViewEdgeViewEdgeIterator_setChainingTimeStamp", _wrap_ViewEdgeViewEdgeIterator_setChainingTimeStamp, METH_VARARGS, NULL},
 	 { (char *)"ViewEdgeViewEdgeIterator_AddOccluder", _wrap_ViewEdgeViewEdgeIterator_AddOccluder, METH_VARARGS, NULL},
 	 { (char *)"ViewEdgeViewEdgeIterator_setSplittingId", _wrap_ViewEdgeViewEdgeIterator_setSplittingId, METH_VARARGS, NULL},
@@ -108008,16 +109154,16 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"AdjacencyIterator_bShape", _wrap_AdjacencyIterator_bShape, METH_VARARGS, NULL},
 	 { (char *)"AdjacencyIterator_occluders", _wrap_AdjacencyIterator_occluders, METH_VARARGS, NULL},
 	 { (char *)"AdjacencyIterator_splittingId", _wrap_AdjacencyIterator_splittingId, METH_VARARGS, NULL},
-	 { (char *)"AdjacencyIterator_SetA", _wrap_AdjacencyIterator_SetA, METH_VARARGS, NULL},
-	 { (char *)"AdjacencyIterator_SetB", _wrap_AdjacencyIterator_SetB, METH_VARARGS, NULL},
-	 { (char *)"AdjacencyIterator_SetNature", _wrap_AdjacencyIterator_SetNature, METH_VARARGS, NULL},
-	 { (char *)"AdjacencyIterator_SetFEdgeA", _wrap_AdjacencyIterator_SetFEdgeA, METH_VARARGS, NULL},
-	 { (char *)"AdjacencyIterator_SetFEdgeB", _wrap_AdjacencyIterator_SetFEdgeB, METH_VARARGS, NULL},
-	 { (char *)"AdjacencyIterator_SetShape", _wrap_AdjacencyIterator_SetShape, METH_VARARGS, NULL},
-	 { (char *)"AdjacencyIterator_SetId", _wrap_AdjacencyIterator_SetId, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_setA", _wrap_AdjacencyIterator_setA, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_setB", _wrap_AdjacencyIterator_setB, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_setNature", _wrap_AdjacencyIterator_setNature, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_setFEdgeA", _wrap_AdjacencyIterator_setFEdgeA, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_setFEdgeB", _wrap_AdjacencyIterator_setFEdgeB, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_setShape", _wrap_AdjacencyIterator_setShape, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_setId", _wrap_AdjacencyIterator_setId, METH_VARARGS, NULL},
 	 { (char *)"AdjacencyIterator_UpdateFEdges", _wrap_AdjacencyIterator_UpdateFEdges, METH_VARARGS, NULL},
-	 { (char *)"AdjacencyIterator_SetaShape", _wrap_AdjacencyIterator_SetaShape, METH_VARARGS, NULL},
-	 { (char *)"AdjacencyIterator_SetQI", _wrap_AdjacencyIterator_SetQI, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_setaShape", _wrap_AdjacencyIterator_setaShape, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_setQI", _wrap_AdjacencyIterator_setQI, METH_VARARGS, NULL},
 	 { (char *)"AdjacencyIterator_setChainingTimeStamp", _wrap_AdjacencyIterator_setChainingTimeStamp, METH_VARARGS, NULL},
 	 { (char *)"AdjacencyIterator_AddOccluder", _wrap_AdjacencyIterator_AddOccluder, METH_VARARGS, NULL},
 	 { (char *)"AdjacencyIterator_setSplittingId", _wrap_AdjacencyIterator_setSplittingId, METH_VARARGS, NULL},
@@ -108218,9 +109364,9 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"CurvePointIterator_A", _wrap_CurvePointIterator_A, METH_VARARGS, NULL},
 	 { (char *)"CurvePointIterator_B", _wrap_CurvePointIterator_B, METH_VARARGS, NULL},
 	 { (char *)"CurvePointIterator_t2d", _wrap_CurvePointIterator_t2d, METH_VARARGS, NULL},
-	 { (char *)"CurvePointIterator_SetA", _wrap_CurvePointIterator_SetA, METH_VARARGS, NULL},
-	 { (char *)"CurvePointIterator_SetB", _wrap_CurvePointIterator_SetB, METH_VARARGS, NULL},
-	 { (char *)"CurvePointIterator_SetT2d", _wrap_CurvePointIterator_SetT2d, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_setA", _wrap_CurvePointIterator_setA, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_setB", _wrap_CurvePointIterator_setB, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_setT2d", _wrap_CurvePointIterator_setT2d, METH_VARARGS, NULL},
 	 { (char *)"CurvePointIterator_fedge", _wrap_CurvePointIterator_fedge, METH_VARARGS, NULL},
 	 { (char *)"CurvePointIterator_point2d", _wrap_CurvePointIterator_point2d, METH_VARARGS, NULL},
 	 { (char *)"CurvePointIterator_point3d", _wrap_CurvePointIterator_point3d, METH_VARARGS, NULL},
@@ -108259,9 +109405,9 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"CurvePoint_A", _wrap_CurvePoint_A, METH_VARARGS, NULL},
 	 { (char *)"CurvePoint_B", _wrap_CurvePoint_B, METH_VARARGS, NULL},
 	 { (char *)"CurvePoint_t2d", _wrap_CurvePoint_t2d, METH_VARARGS, NULL},
-	 { (char *)"CurvePoint_SetA", _wrap_CurvePoint_SetA, METH_VARARGS, NULL},
-	 { (char *)"CurvePoint_SetB", _wrap_CurvePoint_SetB, METH_VARARGS, NULL},
-	 { (char *)"CurvePoint_SetT2d", _wrap_CurvePoint_SetT2d, METH_VARARGS, NULL},
+	 { (char *)"CurvePoint_setA", _wrap_CurvePoint_setA, METH_VARARGS, NULL},
+	 { (char *)"CurvePoint_setB", _wrap_CurvePoint_setB, METH_VARARGS, NULL},
+	 { (char *)"CurvePoint_setT2d", _wrap_CurvePoint_setT2d, METH_VARARGS, NULL},
 	 { (char *)"CurvePoint_fedge", _wrap_CurvePoint_fedge, METH_VARARGS, NULL},
 	 { (char *)"CurvePoint_point2d", _wrap_CurvePoint_point2d, METH_VARARGS, NULL},
 	 { (char *)"CurvePoint_point3d", _wrap_CurvePoint_point3d, METH_VARARGS, NULL},
@@ -108318,12 +109464,12 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"StrokeVertexIterator_attribute", _wrap_StrokeVertexIterator_attribute, METH_VARARGS, NULL},
 	 { (char *)"StrokeVertexIterator_curvilinearAbscissa", _wrap_StrokeVertexIterator_curvilinearAbscissa, METH_VARARGS, NULL},
 	 { (char *)"StrokeVertexIterator_strokeLength", _wrap_StrokeVertexIterator_strokeLength, METH_VARARGS, NULL},
-	 { (char *)"StrokeVertexIterator_SetX", _wrap_StrokeVertexIterator_SetX, METH_VARARGS, NULL},
-	 { (char *)"StrokeVertexIterator_SetY", _wrap_StrokeVertexIterator_SetY, METH_VARARGS, NULL},
-	 { (char *)"StrokeVertexIterator_SetPoint", _wrap_StrokeVertexIterator_SetPoint, METH_VARARGS, NULL},
-	 { (char *)"StrokeVertexIterator_SetAttribute", _wrap_StrokeVertexIterator_SetAttribute, METH_VARARGS, NULL},
-	 { (char *)"StrokeVertexIterator_SetCurvilinearAbscissa", _wrap_StrokeVertexIterator_SetCurvilinearAbscissa, METH_VARARGS, NULL},
-	 { (char *)"StrokeVertexIterator_SetStrokeLength", _wrap_StrokeVertexIterator_SetStrokeLength, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_setX", _wrap_StrokeVertexIterator_setX, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_setY", _wrap_StrokeVertexIterator_setY, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_setPoint", _wrap_StrokeVertexIterator_setPoint, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_setAttribute", _wrap_StrokeVertexIterator_setAttribute, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_setCurvilinearAbscissa", _wrap_StrokeVertexIterator_setCurvilinearAbscissa, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_setStrokeLength", _wrap_StrokeVertexIterator_setStrokeLength, METH_VARARGS, NULL},
 	 { (char *)"StrokeVertexIterator_getX", _wrap_StrokeVertexIterator_getX, METH_VARARGS, NULL},
 	 { (char *)"StrokeVertexIterator_getY", _wrap_StrokeVertexIterator_getY, METH_VARARGS, NULL},
 	 { (char *)"StrokeVertexIterator_getZ", _wrap_StrokeVertexIterator_getZ, METH_VARARGS, NULL},
@@ -108342,9 +109488,9 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"StrokeVertexIterator_A", _wrap_StrokeVertexIterator_A, METH_VARARGS, NULL},
 	 { (char *)"StrokeVertexIterator_B", _wrap_StrokeVertexIterator_B, METH_VARARGS, NULL},
 	 { (char *)"StrokeVertexIterator_t2d", _wrap_StrokeVertexIterator_t2d, METH_VARARGS, NULL},
-	 { (char *)"StrokeVertexIterator_SetA", _wrap_StrokeVertexIterator_SetA, METH_VARARGS, NULL},
-	 { (char *)"StrokeVertexIterator_SetB", _wrap_StrokeVertexIterator_SetB, METH_VARARGS, NULL},
-	 { (char *)"StrokeVertexIterator_SetT2d", _wrap_StrokeVertexIterator_SetT2d, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_setA", _wrap_StrokeVertexIterator_setA, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_setB", _wrap_StrokeVertexIterator_setB, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertexIterator_setT2d", _wrap_StrokeVertexIterator_setT2d, METH_VARARGS, NULL},
 	 { (char *)"StrokeVertexIterator_fedge", _wrap_StrokeVertexIterator_fedge, METH_VARARGS, NULL},
 	 { (char *)"StrokeVertexIterator_point2d", _wrap_StrokeVertexIterator_point2d, METH_VARARGS, NULL},
 	 { (char *)"StrokeVertexIterator_point3d", _wrap_StrokeVertexIterator_point3d, METH_VARARGS, NULL},
@@ -108383,7 +109529,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"StrokeAttribute_setColor", _wrap_StrokeAttribute_setColor, METH_VARARGS, NULL},
 	 { (char *)"StrokeAttribute_setAlpha", _wrap_StrokeAttribute_setAlpha, METH_VARARGS, NULL},
 	 { (char *)"StrokeAttribute_setThickness", _wrap_StrokeAttribute_setThickness, METH_VARARGS, NULL},
-	 { (char *)"StrokeAttribute_SetVisible", _wrap_StrokeAttribute_SetVisible, METH_VARARGS, NULL},
+	 { (char *)"StrokeAttribute_setVisible", _wrap_StrokeAttribute_setVisible, METH_VARARGS, NULL},
 	 { (char *)"StrokeAttribute_setAttributeReal", _wrap_StrokeAttribute_setAttributeReal, METH_VARARGS, NULL},
 	 { (char *)"StrokeAttribute_setAttributeVec2f", _wrap_StrokeAttribute_setAttributeVec2f, METH_VARARGS, NULL},
 	 { (char *)"StrokeAttribute_setAttributeVec3f", _wrap_StrokeAttribute_setAttributeVec3f, METH_VARARGS, NULL},
@@ -108398,12 +109544,12 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"StrokeVertex_curvilinearAbscissa", _wrap_StrokeVertex_curvilinearAbscissa, METH_VARARGS, NULL},
 	 { (char *)"StrokeVertex_strokeLength", _wrap_StrokeVertex_strokeLength, METH_VARARGS, NULL},
 	 { (char *)"StrokeVertex_u", _wrap_StrokeVertex_u, METH_VARARGS, NULL},
-	 { (char *)"StrokeVertex_SetX", _wrap_StrokeVertex_SetX, METH_VARARGS, NULL},
-	 { (char *)"StrokeVertex_SetY", _wrap_StrokeVertex_SetY, METH_VARARGS, NULL},
-	 { (char *)"StrokeVertex_SetPoint", _wrap_StrokeVertex_SetPoint, METH_VARARGS, NULL},
-	 { (char *)"StrokeVertex_SetAttribute", _wrap_StrokeVertex_SetAttribute, METH_VARARGS, NULL},
-	 { (char *)"StrokeVertex_SetCurvilinearAbscissa", _wrap_StrokeVertex_SetCurvilinearAbscissa, METH_VARARGS, NULL},
-	 { (char *)"StrokeVertex_SetStrokeLength", _wrap_StrokeVertex_SetStrokeLength, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertex_setX", _wrap_StrokeVertex_setX, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertex_setY", _wrap_StrokeVertex_setY, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertex_setPoint", _wrap_StrokeVertex_setPoint, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertex_setAttribute", _wrap_StrokeVertex_setAttribute, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertex_setCurvilinearAbscissa", _wrap_StrokeVertex_setCurvilinearAbscissa, METH_VARARGS, NULL},
+	 { (char *)"StrokeVertex_setStrokeLength", _wrap_StrokeVertex_setStrokeLength, METH_VARARGS, NULL},
 	 { (char *)"StrokeVertex_swigregister", StrokeVertex_swigregister, METH_VARARGS, NULL},
 	 { (char *)"Stroke_getExactTypeName", _wrap_Stroke_getExactTypeName, METH_VARARGS, NULL},
 	 { (char *)"Stroke_getId", _wrap_Stroke_getId, METH_VARARGS, NULL},
@@ -108429,16 +109575,16 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"Stroke_getEndingOrientation", _wrap_Stroke_getEndingOrientation, METH_VARARGS, NULL},
 	 { (char *)"Stroke_getEndingOrientationX", _wrap_Stroke_getEndingOrientationX, METH_VARARGS, NULL},
 	 { (char *)"Stroke_getEndingOrientationY", _wrap_Stroke_getEndingOrientationY, METH_VARARGS, NULL},
-	 { (char *)"Stroke_SetId", _wrap_Stroke_SetId, METH_VARARGS, NULL},
-	 { (char *)"Stroke_SetLength", _wrap_Stroke_SetLength, METH_VARARGS, NULL},
-	 { (char *)"Stroke_SetMediumType", _wrap_Stroke_SetMediumType, METH_VARARGS, NULL},
-	 { (char *)"Stroke_SetTextureId", _wrap_Stroke_SetTextureId, METH_VARARGS, NULL},
-	 { (char *)"Stroke_SetTips", _wrap_Stroke_SetTips, METH_VARARGS, NULL},
+	 { (char *)"Stroke_setId", _wrap_Stroke_setId, METH_VARARGS, NULL},
+	 { (char *)"Stroke_setLength", _wrap_Stroke_setLength, METH_VARARGS, NULL},
+	 { (char *)"Stroke_setMediumType", _wrap_Stroke_setMediumType, METH_VARARGS, NULL},
+	 { (char *)"Stroke_setTextureId", _wrap_Stroke_setTextureId, METH_VARARGS, NULL},
+	 { (char *)"Stroke_setTips", _wrap_Stroke_setTips, METH_VARARGS, NULL},
 	 { (char *)"Stroke_push_back", _wrap_Stroke_push_back, METH_VARARGS, NULL},
 	 { (char *)"Stroke_push_front", _wrap_Stroke_push_front, METH_VARARGS, NULL},
 	 { (char *)"Stroke_AddViewEdge", _wrap_Stroke_AddViewEdge, METH_VARARGS, NULL},
-	 { (char *)"Stroke_SetBeginningOrientation", _wrap_Stroke_SetBeginningOrientation, METH_VARARGS, NULL},
-	 { (char *)"Stroke_SetEndingOrientation", _wrap_Stroke_SetEndingOrientation, METH_VARARGS, NULL},
+	 { (char *)"Stroke_setBeginningOrientation", _wrap_Stroke_setBeginningOrientation, METH_VARARGS, NULL},
+	 { (char *)"Stroke_setEndingOrientation", _wrap_Stroke_setEndingOrientation, METH_VARARGS, NULL},
 	 { (char *)"Stroke_strokeVerticesBegin", _wrap_Stroke_strokeVerticesBegin, METH_VARARGS, NULL},
 	 { (char *)"Stroke_strokeVerticesEnd", _wrap_Stroke_strokeVerticesEnd, METH_VARARGS, NULL},
 	 { (char *)"Stroke_strokeVerticesSize", _wrap_Stroke_strokeVerticesSize, METH_VARARGS, NULL},
@@ -108666,14 +109812,14 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"Canvas_renderer", _wrap_Canvas_renderer, METH_VARARGS, NULL},
 	 { (char *)"Canvas_getCurrentStyleModule", _wrap_Canvas_getCurrentStyleModule, METH_VARARGS, NULL},
 	 { (char *)"Canvas_getRecordFlag", _wrap_Canvas_getRecordFlag, METH_VARARGS, NULL},
-	 { (char *)"Canvas_SetSelectedFEdge", _wrap_Canvas_SetSelectedFEdge, METH_VARARGS, NULL},
+	 { (char *)"Canvas_setSelectedFEdge", _wrap_Canvas_setSelectedFEdge, METH_VARARGS, NULL},
 	 { (char *)"Canvas_InsertStyleModule", _wrap_Canvas_InsertStyleModule, METH_VARARGS, NULL},
 	 { (char *)"Canvas_RemoveStyleModule", _wrap_Canvas_RemoveStyleModule, METH_VARARGS, NULL},
 	 { (char *)"Canvas_SwapStyleModules", _wrap_Canvas_SwapStyleModules, METH_VARARGS, NULL},
 	 { (char *)"Canvas_ReplaceStyleModule", _wrap_Canvas_ReplaceStyleModule, METH_VARARGS, NULL},
-	 { (char *)"Canvas_SetVisible", _wrap_Canvas_SetVisible, METH_VARARGS, NULL},
+	 { (char *)"Canvas_setVisible", _wrap_Canvas_setVisible, METH_VARARGS, NULL},
 	 { (char *)"Canvas_AddLayer", _wrap_Canvas_AddLayer, METH_VARARGS, NULL},
-	 { (char *)"Canvas_SetCurrentPaperTextureIndex", _wrap_Canvas_SetCurrentPaperTextureIndex, METH_VARARGS, NULL},
+	 { (char *)"Canvas_setCurrentPaperTextureIndex", _wrap_Canvas_setCurrentPaperTextureIndex, METH_VARARGS, NULL},
 	 { (char *)"Canvas_changePaperTexture", _wrap_Canvas_changePaperTexture, METH_VARARGS, NULL},
 	 { (char *)"Canvas_togglePaperTexture", _wrap_Canvas_togglePaperTexture, METH_VARARGS, NULL},
 	 { (char *)"Canvas_resetModified", _wrap_Canvas_resetModified, METH_VARARGS, NULL},
@@ -108696,395 +109842,395 @@ static PyMethodDef SwigMethods[] = {
 
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
 
-static void *_p_Functions0D__GetOccludersF0DTo_p_UnaryFunction0DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction0D< std::vector< ViewShape *,std::allocator< ViewShape * > > > *)  ((Functions0D::GetOccludersF0D *) x));
+static void *_p_Functions0D__GetOccludersF0DTo_p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t(void *x) {
+    return (void *)((UnaryFunction0D<std::vector<ViewShape *,std::allocator<ViewShape * > > > *)  ((Functions0D::GetOccludersF0D *) x));
 }
-static void *_p_Functions1D__GetOccludeeF1DTo_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction1D< std::vector< ViewShape *,std::allocator< ViewShape * > > > *)  ((Functions1D::GetOccludeeF1D *) x));
+static void *_p_Functions1D__GetOccludeeF1DTo_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t(void *x) {
+    return (void *)((UnaryFunction1D<std::vector<ViewShape *,std::allocator<ViewShape * > > > *)  ((Functions1D::GetOccludeeF1D *) x));
 }
-static void *_p_Functions1D__GetShapeF1DTo_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction1D< std::vector< ViewShape *,std::allocator< ViewShape * > > > *)  ((Functions1D::GetShapeF1D *) x));
+static void *_p_Functions1D__GetShapeF1DTo_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t(void *x) {
+    return (void *)((UnaryFunction1D<std::vector<ViewShape *,std::allocator<ViewShape * > > > *)  ((Functions1D::GetShapeF1D *) x));
 }
-static void *_p_Functions1D__GetOccludersF1DTo_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction1D< std::vector< ViewShape *,std::allocator< ViewShape * > > > *)  ((Functions1D::GetOccludersF1D *) x));
+static void *_p_Functions1D__GetOccludersF1DTo_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t(void *x) {
+    return (void *)((UnaryFunction1D<std::vector<ViewShape *,std::allocator<ViewShape * > > > *)  ((Functions1D::GetOccludersF1D *) x));
 }
-static void *_p_TVertexTo_p_Interface0D(void *x, int *newmemory) {
+static void *_p_TVertexTo_p_Interface0D(void *x) {
     return (void *)((Interface0D *) (ViewVertex *) ((TVertex *) x));
 }
-static void *_p_NonTVertexTo_p_Interface0D(void *x, int *newmemory) {
+static void *_p_NonTVertexTo_p_Interface0D(void *x) {
     return (void *)((Interface0D *) (ViewVertex *) ((NonTVertex *) x));
 }
-static void *_p_SVertexTo_p_Interface0D(void *x, int *newmemory) {
+static void *_p_SVertexTo_p_Interface0D(void *x) {
     return (void *)((Interface0D *)  ((SVertex *) x));
 }
-static void *_p_ViewVertexTo_p_Interface0D(void *x, int *newmemory) {
+static void *_p_ViewVertexTo_p_Interface0D(void *x) {
     return (void *)((Interface0D *)  ((ViewVertex *) x));
 }
-static void *_p_StrokeVertexTo_p_Interface0D(void *x, int *newmemory) {
+static void *_p_StrokeVertexTo_p_Interface0D(void *x) {
     return (void *)((Interface0D *) (CurvePoint *) ((StrokeVertex *) x));
 }
-static void *_p_CurvePointTo_p_Interface0D(void *x, int *newmemory) {
+static void *_p_CurvePointTo_p_Interface0D(void *x) {
     return (void *)((Interface0D *)  ((CurvePoint *) x));
 }
-static void *_p_Functions0D__GetShapeF0DTo_p_UnaryFunction0DT_ViewShape_p_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction0D< ViewShape * > *)  ((Functions0D::GetShapeF0D *) x));
+static void *_p_Functions0D__GetShapeF0DTo_p_UnaryFunction0DTViewShape_p_t(void *x) {
+    return (void *)((UnaryFunction0D<ViewShape * > *)  ((Functions0D::GetShapeF0D *) x));
 }
-static void *_p_Functions0D__GetOccludeeF0DTo_p_UnaryFunction0DT_ViewShape_p_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction0D< ViewShape * > *)  ((Functions0D::GetOccludeeF0D *) x));
+static void *_p_Functions0D__GetOccludeeF0DTo_p_UnaryFunction0DTViewShape_p_t(void *x) {
+    return (void *)((UnaryFunction0D<ViewShape * > *)  ((Functions0D::GetOccludeeF0D *) x));
 }
-static void *_p_ChainSilhouetteIteratorTo_p_ChainingIterator(void *x, int *newmemory) {
+static void *_p_ChainSilhouetteIteratorTo_p_ChainingIterator(void *x) {
     return (void *)((ChainingIterator *)  ((ChainSilhouetteIterator *) x));
 }
-static void *_p_ChainPredicateIteratorTo_p_ChainingIterator(void *x, int *newmemory) {
+static void *_p_ChainPredicateIteratorTo_p_ChainingIterator(void *x) {
     return (void *)((ChainingIterator *)  ((ChainPredicateIterator *) x));
 }
-static void *_p_ChainingIteratorTo_p_ViewEdgeInternal__ViewEdgeIterator(void *x, int *newmemory) {
+static void *_p_ChainingIteratorTo_p_ViewEdgeInternal__ViewEdgeIterator(void *x) {
     return (void *)((ViewEdgeInternal::ViewEdgeIterator *)  ((ChainingIterator *) x));
 }
-static void *_p_ChainSilhouetteIteratorTo_p_ViewEdgeInternal__ViewEdgeIterator(void *x, int *newmemory) {
+static void *_p_ChainSilhouetteIteratorTo_p_ViewEdgeInternal__ViewEdgeIterator(void *x) {
     return (void *)((ViewEdgeInternal::ViewEdgeIterator *) (ChainingIterator *) ((ChainSilhouetteIterator *) x));
 }
-static void *_p_ChainPredicateIteratorTo_p_ViewEdgeInternal__ViewEdgeIterator(void *x, int *newmemory) {
+static void *_p_ChainPredicateIteratorTo_p_ViewEdgeInternal__ViewEdgeIterator(void *x) {
     return (void *)((ViewEdgeInternal::ViewEdgeIterator *) (ChainingIterator *) ((ChainPredicateIterator *) x));
 }
-static void *_p_ViewEdgeTo_p_Interface1D(void *x, int *newmemory) {
+static void *_p_ViewEdgeTo_p_Interface1D(void *x) {
     return (void *)((Interface1D *)  ((ViewEdge *) x));
 }
-static void *_p_StrokeTo_p_Interface1D(void *x, int *newmemory) {
+static void *_p_StrokeTo_p_Interface1D(void *x) {
     return (void *)((Interface1D *)  ((Stroke *) x));
 }
-static void *_p_CurveTo_p_Interface1D(void *x, int *newmemory) {
+static void *_p_CurveTo_p_Interface1D(void *x) {
     return (void *)((Interface1D *)  ((Curve *) x));
 }
-static void *_p_FEdgeSharpTo_p_Interface1D(void *x, int *newmemory) {
+static void *_p_FEdgeSharpTo_p_Interface1D(void *x) {
     return (void *)((Interface1D *) (FEdge *) ((FEdgeSharp *) x));
 }
-static void *_p_FEdgeSmoothTo_p_Interface1D(void *x, int *newmemory) {
+static void *_p_FEdgeSmoothTo_p_Interface1D(void *x) {
     return (void *)((Interface1D *) (FEdge *) ((FEdgeSmooth *) x));
 }
-static void *_p_FEdgeTo_p_Interface1D(void *x, int *newmemory) {
+static void *_p_FEdgeTo_p_Interface1D(void *x) {
     return (void *)((Interface1D *)  ((FEdge *) x));
 }
-static void *_p_VecMat__Vec2T_int_tTo_p_VecMat__VecT_int_2_t(void *x, int *newmemory) {
-    return (void *)((VecMat::Vec< int,2 > *)  ((VecMat::Vec2< int > *) x));
+static void *_p_VecMat__Vec2Tint_tTo_p_VecMat__VecTint_2_t(void *x) {
+    return (void *)((VecMat::Vec<int,2 > *)  ((VecMat::Vec2<int > *) x));
 }
-static void *_p_VecMat__Vec2T_unsigned_int_tTo_p_VecMat__VecT_unsigned_int_2_t(void *x, int *newmemory) {
-    return (void *)((VecMat::Vec< unsigned int,2 > *)  ((VecMat::Vec2< unsigned int > *) x));
+static void *_p_VecMat__Vec2Tunsigned_int_tTo_p_VecMat__VecTunsigned_int_2_t(void *x) {
+    return (void *)((VecMat::Vec<unsigned int,2 > *)  ((VecMat::Vec2<unsigned int > *) x));
 }
-static void *_p_VecMat__Vec3T_int_tTo_p_VecMat__VecT_int_3_t(void *x, int *newmemory) {
-    return (void *)((VecMat::Vec< int,3 > *)  ((VecMat::Vec3< int > *) x));
+static void *_p_VecMat__Vec3Tint_tTo_p_VecMat__VecTint_3_t(void *x) {
+    return (void *)((VecMat::Vec<int,3 > *)  ((VecMat::Vec3<int > *) x));
 }
-static void *_p_VecMat__Vec3T_unsigned_int_tTo_p_VecMat__VecT_unsigned_int_3_t(void *x, int *newmemory) {
-    return (void *)((VecMat::Vec< unsigned int,3 > *)  ((VecMat::Vec3< unsigned int > *) x));
+static void *_p_VecMat__Vec3Tunsigned_int_tTo_p_VecMat__VecTunsigned_int_3_t(void *x) {
+    return (void *)((VecMat::Vec<unsigned int,3 > *)  ((VecMat::Vec3<unsigned int > *) x));
 }
-static void *_p_StrokeVertexTo_p_CurvePoint(void *x, int *newmemory) {
+static void *_p_StrokeVertexTo_p_CurvePoint(void *x) {
     return (void *)((CurvePoint *)  ((StrokeVertex *) x));
 }
-static void *_p_Predicates0D__TrueUP0DTo_p_UnaryPredicate0D(void *x, int *newmemory) {
+static void *_p_Predicates0D__TrueUP0DTo_p_UnaryPredicate0D(void *x) {
     return (void *)((UnaryPredicate0D *)  ((Predicates0D::TrueUP0D *) x));
 }
-static void *_p_Predicates0D__FalseUP0DTo_p_UnaryPredicate0D(void *x, int *newmemory) {
+static void *_p_Predicates0D__FalseUP0DTo_p_UnaryPredicate0D(void *x) {
     return (void *)((UnaryPredicate0D *)  ((Predicates0D::FalseUP0D *) x));
 }
-static void *_p_FEdgeSharpTo_p_FEdge(void *x, int *newmemory) {
+static void *_p_FEdgeSharpTo_p_FEdge(void *x) {
     return (void *)((FEdge *)  ((FEdgeSharp *) x));
 }
-static void *_p_FEdgeSmoothTo_p_FEdge(void *x, int *newmemory) {
+static void *_p_FEdgeSmoothTo_p_FEdge(void *x) {
     return (void *)((FEdge *)  ((FEdgeSmooth *) x));
 }
-static void *_p_StrokeShaders__ConstrainedIncreasingThicknessShaderTo_p_StrokeShader(void *x, int *newmemory) {
+static void *_p_StrokeShaders__ConstrainedIncreasingThicknessShaderTo_p_StrokeShader(void *x) {
     return (void *)((StrokeShader *)  ((StrokeShaders::ConstrainedIncreasingThicknessShader *) x));
 }
-static void *_p_StrokeShaders__ColorNoiseShaderTo_p_StrokeShader(void *x, int *newmemory) {
+static void *_p_StrokeShaders__ColorNoiseShaderTo_p_StrokeShader(void *x) {
     return (void *)((StrokeShader *)  ((StrokeShaders::ColorNoiseShader *) x));
 }
-static void *_p_StrokeShaders__ThicknessNoiseShaderTo_p_StrokeShader(void *x, int *newmemory) {
+static void *_p_StrokeShaders__ThicknessNoiseShaderTo_p_StrokeShader(void *x) {
     return (void *)((StrokeShader *)  ((StrokeShaders::ThicknessNoiseShader *) x));
 }
-static void *_p_StrokeShaders__LengthDependingThicknessShaderTo_p_StrokeShader(void *x, int *newmemory) {
+static void *_p_StrokeShaders__LengthDependingThicknessShaderTo_p_StrokeShader(void *x) {
     return (void *)((StrokeShader *)  ((StrokeShaders::LengthDependingThicknessShader *) x));
 }
-static void *_p_StrokeShaders__IncreasingThicknessShaderTo_p_StrokeShader(void *x, int *newmemory) {
+static void *_p_StrokeShaders__IncreasingThicknessShaderTo_p_StrokeShader(void *x) {
     return (void *)((StrokeShader *)  ((StrokeShaders::IncreasingThicknessShader *) x));
 }
-static void *_p_StrokeShaders__ConstantExternThicknessShaderTo_p_StrokeShader(void *x, int *newmemory) {
+static void *_p_StrokeShaders__ConstantExternThicknessShaderTo_p_StrokeShader(void *x) {
     return (void *)((StrokeShader *)  ((StrokeShaders::ConstantExternThicknessShader *) x));
 }
-static void *_p_StrokeShaders__ConstantThicknessShaderTo_p_StrokeShader(void *x, int *newmemory) {
+static void *_p_StrokeShaders__ConstantThicknessShaderTo_p_StrokeShader(void *x) {
     return (void *)((StrokeShader *)  ((StrokeShaders::ConstantThicknessShader *) x));
 }
-static void *_p_StrokeShaders__StrokeTextureShaderTo_p_StrokeShader(void *x, int *newmemory) {
+static void *_p_StrokeShaders__StrokeTextureShaderTo_p_StrokeShader(void *x) {
     return (void *)((StrokeShader *)  ((StrokeShaders::StrokeTextureShader *) x));
 }
-static void *_p_StrokeShaders__SamplingShaderTo_p_StrokeShader(void *x, int *newmemory) {
+static void *_p_StrokeShaders__SamplingShaderTo_p_StrokeShader(void *x) {
     return (void *)((StrokeShader *)  ((StrokeShaders::SamplingShader *) x));
 }
-static void *_p_StrokeShaders__BSplineShaderTo_p_StrokeShader(void *x, int *newmemory) {
+static void *_p_StrokeShaders__BSplineShaderTo_p_StrokeShader(void *x) {
     return (void *)((StrokeShader *)  ((StrokeShaders::BSplineShader *) x));
 }
-static void *_p_StrokeShaders__BezierCurveShaderTo_p_StrokeShader(void *x, int *newmemory) {
+static void *_p_StrokeShaders__BezierCurveShaderTo_p_StrokeShader(void *x) {
     return (void *)((StrokeShader *)  ((StrokeShaders::BezierCurveShader *) x));
 }
-static void *_p_StrokeShaders__InflateShaderTo_p_StrokeShader(void *x, int *newmemory) {
+static void *_p_StrokeShaders__InflateShaderTo_p_StrokeShader(void *x) {
     return (void *)((StrokeShader *)  ((StrokeShaders::InflateShader *) x));
 }
-static void *_p_StrokeShaders__GuidingLinesShaderTo_p_StrokeShader(void *x, int *newmemory) {
+static void *_p_StrokeShaders__GuidingLinesShaderTo_p_StrokeShader(void *x) {
     return (void *)((StrokeShader *)  ((StrokeShaders::GuidingLinesShader *) x));
 }
-static void *_p_StrokeShaders__streamShaderTo_p_StrokeShader(void *x, int *newmemory) {
+static void *_p_StrokeShaders__streamShaderTo_p_StrokeShader(void *x) {
     return (void *)((StrokeShader *)  ((StrokeShaders::streamShader *) x));
 }
-static void *_p_StrokeShaders__fstreamShaderTo_p_StrokeShader(void *x, int *newmemory) {
+static void *_p_StrokeShaders__fstreamShaderTo_p_StrokeShader(void *x) {
     return (void *)((StrokeShader *)  ((StrokeShaders::fstreamShader *) x));
 }
-static void *_p_CalligraphicShaderTo_p_StrokeShader(void *x, int *newmemory) {
+static void *_p_CalligraphicShaderTo_p_StrokeShader(void *x) {
     return (void *)((StrokeShader *)  ((CalligraphicShader *) x));
 }
-static void *_p_SpatialNoiseShaderTo_p_StrokeShader(void *x, int *newmemory) {
+static void *_p_SpatialNoiseShaderTo_p_StrokeShader(void *x) {
     return (void *)((StrokeShader *)  ((SpatialNoiseShader *) x));
 }
-static void *_p_SmoothingShaderTo_p_StrokeShader(void *x, int *newmemory) {
+static void *_p_SmoothingShaderTo_p_StrokeShader(void *x) {
     return (void *)((StrokeShader *)  ((SmoothingShader *) x));
 }
-static void *_p_StrokeShaders__TextureAssignerShaderTo_p_StrokeShader(void *x, int *newmemory) {
+static void *_p_StrokeShaders__TextureAssignerShaderTo_p_StrokeShader(void *x) {
     return (void *)((StrokeShader *)  ((StrokeShaders::TextureAssignerShader *) x));
 }
-static void *_p_StrokeShaders__CalligraphicColorShaderTo_p_StrokeShader(void *x, int *newmemory) {
+static void *_p_StrokeShaders__CalligraphicColorShaderTo_p_StrokeShader(void *x) {
     return (void *)((StrokeShader *)  ((StrokeShaders::CalligraphicColorShader *) x));
 }
-static void *_p_StrokeShaders__MaterialColorShaderTo_p_StrokeShader(void *x, int *newmemory) {
+static void *_p_StrokeShaders__MaterialColorShaderTo_p_StrokeShader(void *x) {
     return (void *)((StrokeShader *)  ((StrokeShaders::MaterialColorShader *) x));
 }
-static void *_p_StrokeShaders__ColorVariationPatternShaderTo_p_StrokeShader(void *x, int *newmemory) {
+static void *_p_StrokeShaders__ColorVariationPatternShaderTo_p_StrokeShader(void *x) {
     return (void *)((StrokeShader *)  ((StrokeShaders::ColorVariationPatternShader *) x));
 }
-static void *_p_StrokeShaders__IncreasingColorShaderTo_p_StrokeShader(void *x, int *newmemory) {
+static void *_p_StrokeShaders__IncreasingColorShaderTo_p_StrokeShader(void *x) {
     return (void *)((StrokeShader *)  ((StrokeShaders::IncreasingColorShader *) x));
 }
-static void *_p_StrokeShaders__ConstantColorShaderTo_p_StrokeShader(void *x, int *newmemory) {
+static void *_p_StrokeShaders__ConstantColorShaderTo_p_StrokeShader(void *x) {
     return (void *)((StrokeShader *)  ((StrokeShaders::ConstantColorShader *) x));
 }
-static void *_p_StrokeShaders__ThicknessVariationPatternShaderTo_p_StrokeShader(void *x, int *newmemory) {
+static void *_p_StrokeShaders__ThicknessVariationPatternShaderTo_p_StrokeShader(void *x) {
     return (void *)((StrokeShader *)  ((StrokeShaders::ThicknessVariationPatternShader *) x));
 }
-static void *_p_StrokeShaders__BackboneStretcherShaderTo_p_StrokeShader(void *x, int *newmemory) {
+static void *_p_StrokeShaders__BackboneStretcherShaderTo_p_StrokeShader(void *x) {
     return (void *)((StrokeShader *)  ((StrokeShaders::BackboneStretcherShader *) x));
 }
-static void *_p_StrokeShaders__ExternalContourStretcherShaderTo_p_StrokeShader(void *x, int *newmemory) {
+static void *_p_StrokeShaders__ExternalContourStretcherShaderTo_p_StrokeShader(void *x) {
     return (void *)((StrokeShader *)  ((StrokeShaders::ExternalContourStretcherShader *) x));
 }
-static void *_p_StrokeShaders__PolygonalizationShaderTo_p_StrokeShader(void *x, int *newmemory) {
+static void *_p_StrokeShaders__PolygonalizationShaderTo_p_StrokeShader(void *x) {
     return (void *)((StrokeShader *)  ((StrokeShaders::PolygonalizationShader *) x));
 }
-static void *_p_StrokeShaders__TipRemoverShaderTo_p_StrokeShader(void *x, int *newmemory) {
+static void *_p_StrokeShaders__TipRemoverShaderTo_p_StrokeShader(void *x) {
     return (void *)((StrokeShader *)  ((StrokeShaders::TipRemoverShader *) x));
 }
-static void *_p_OmissionShaderTo_p_StrokeShader(void *x, int *newmemory) {
+static void *_p_OmissionShaderTo_p_StrokeShader(void *x) {
     return (void *)((StrokeShader *)  ((OmissionShader *) x));
 }
-static void *_p_OmitterTo_p_Smoother(void *x, int *newmemory) {
+static void *_p_OmitterTo_p_Smoother(void *x) {
     return (void *)((Smoother *)  ((Omitter *) x));
 }
-static void *_p_Predicates1D__Length2DBP1DTo_p_BinaryPredicate1D(void *x, int *newmemory) {
+static void *_p_Predicates1D__Length2DBP1DTo_p_BinaryPredicate1D(void *x) {
     return (void *)((BinaryPredicate1D *)  ((Predicates1D::Length2DBP1D *) x));
 }
-static void *_p_Predicates1D__FalseBP1DTo_p_BinaryPredicate1D(void *x, int *newmemory) {
+static void *_p_Predicates1D__FalseBP1DTo_p_BinaryPredicate1D(void *x) {
     return (void *)((BinaryPredicate1D *)  ((Predicates1D::FalseBP1D *) x));
 }
-static void *_p_Predicates1D__ViewMapGradientNormBP1DTo_p_BinaryPredicate1D(void *x, int *newmemory) {
+static void *_p_Predicates1D__ViewMapGradientNormBP1DTo_p_BinaryPredicate1D(void *x) {
     return (void *)((BinaryPredicate1D *)  ((Predicates1D::ViewMapGradientNormBP1D *) x));
 }
-static void *_p_Predicates1D__TrueBP1DTo_p_BinaryPredicate1D(void *x, int *newmemory) {
+static void *_p_Predicates1D__TrueBP1DTo_p_BinaryPredicate1D(void *x) {
     return (void *)((BinaryPredicate1D *)  ((Predicates1D::TrueBP1D *) x));
 }
-static void *_p_Predicates1D__SameShapeIdBP1DTo_p_BinaryPredicate1D(void *x, int *newmemory) {
+static void *_p_Predicates1D__SameShapeIdBP1DTo_p_BinaryPredicate1D(void *x) {
     return (void *)((BinaryPredicate1D *)  ((Predicates1D::SameShapeIdBP1D *) x));
 }
-static void *_p_Predicates1D__FalseUP1DTo_p_UnaryPredicate1D(void *x, int *newmemory) {
+static void *_p_Predicates1D__FalseUP1DTo_p_UnaryPredicate1D(void *x) {
     return (void *)((UnaryPredicate1D *)  ((Predicates1D::FalseUP1D *) x));
 }
-static void *_p_Predicates1D__ShapeUP1DTo_p_UnaryPredicate1D(void *x, int *newmemory) {
+static void *_p_Predicates1D__ShapeUP1DTo_p_UnaryPredicate1D(void *x) {
     return (void *)((UnaryPredicate1D *)  ((Predicates1D::ShapeUP1D *) x));
 }
-static void *_p_Predicates1D__DensityLowerThanUP1DTo_p_UnaryPredicate1D(void *x, int *newmemory) {
+static void *_p_Predicates1D__DensityLowerThanUP1DTo_p_UnaryPredicate1D(void *x) {
     return (void *)((UnaryPredicate1D *)  ((Predicates1D::DensityLowerThanUP1D *) x));
 }
-static void *_p_Predicates1D__EqualToTimeStampUP1DTo_p_UnaryPredicate1D(void *x, int *newmemory) {
+static void *_p_Predicates1D__EqualToTimeStampUP1DTo_p_UnaryPredicate1D(void *x) {
     return (void *)((UnaryPredicate1D *)  ((Predicates1D::EqualToTimeStampUP1D *) x));
 }
-static void *_p_Predicates1D__EqualToChainingTimeStampUP1DTo_p_UnaryPredicate1D(void *x, int *newmemory) {
+static void *_p_Predicates1D__EqualToChainingTimeStampUP1DTo_p_UnaryPredicate1D(void *x) {
     return (void *)((UnaryPredicate1D *)  ((Predicates1D::EqualToChainingTimeStampUP1D *) x));
 }
-static void *_p_Predicates1D__TrueUP1DTo_p_UnaryPredicate1D(void *x, int *newmemory) {
+static void *_p_Predicates1D__TrueUP1DTo_p_UnaryPredicate1D(void *x) {
     return (void *)((UnaryPredicate1D *)  ((Predicates1D::TrueUP1D *) x));
 }
-static void *_p_Predicates1D__QuantitativeInvisibilityUP1DTo_p_UnaryPredicate1D(void *x, int *newmemory) {
+static void *_p_Predicates1D__QuantitativeInvisibilityUP1DTo_p_UnaryPredicate1D(void *x) {
     return (void *)((UnaryPredicate1D *)  ((Predicates1D::QuantitativeInvisibilityUP1D *) x));
 }
-static void *_p_Predicates1D__ContourUP1DTo_p_UnaryPredicate1D(void *x, int *newmemory) {
+static void *_p_Predicates1D__ContourUP1DTo_p_UnaryPredicate1D(void *x) {
     return (void *)((UnaryPredicate1D *)  ((Predicates1D::ContourUP1D *) x));
 }
-static void *_p_Predicates1D__ExternalContourUP1DTo_p_UnaryPredicate1D(void *x, int *newmemory) {
+static void *_p_Predicates1D__ExternalContourUP1DTo_p_UnaryPredicate1D(void *x) {
     return (void *)((UnaryPredicate1D *)  ((Predicates1D::ExternalContourUP1D *) x));
 }
-static void *_p_VecMat__Vec2T_float_tTo_p_VecMat__VecT_float_2_t(void *x, int *newmemory) {
-    return (void *)((VecMat::Vec< float,2 > *)  ((VecMat::Vec2< float > *) x));
+static void *_p_VecMat__Vec2Tfloat_tTo_p_VecMat__VecTfloat_2_t(void *x) {
+    return (void *)((VecMat::Vec<float,2 > *)  ((VecMat::Vec2<float > *) x));
 }
-static void *_p_Functions1D__TimeStampF1DTo_p_UnaryFunction1DT_void_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction1D< void > *)  ((Functions1D::TimeStampF1D *) x));
+static void *_p_Functions1D__TimeStampF1DTo_p_UnaryFunction1DTvoid_t(void *x) {
+    return (void *)((UnaryFunction1D<void > *)  ((Functions1D::TimeStampF1D *) x));
 }
-static void *_p_Functions1D__IncrementChainingTimeStampF1DTo_p_UnaryFunction1DT_void_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction1D< void > *)  ((Functions1D::IncrementChainingTimeStampF1D *) x));
+static void *_p_Functions1D__IncrementChainingTimeStampF1DTo_p_UnaryFunction1DTvoid_t(void *x) {
+    return (void *)((UnaryFunction1D<void > *)  ((Functions1D::IncrementChainingTimeStampF1D *) x));
 }
-static void *_p_Functions1D__ChainingTimeStampF1DTo_p_UnaryFunction1DT_void_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction1D< void > *)  ((Functions1D::ChainingTimeStampF1D *) x));
+static void *_p_Functions1D__ChainingTimeStampF1DTo_p_UnaryFunction1DTvoid_t(void *x) {
+    return (void *)((UnaryFunction1D<void > *)  ((Functions1D::ChainingTimeStampF1D *) x));
 }
-static void *_p_VecMat__Vec3T_float_tTo_p_VecMat__VecT_float_3_t(void *x, int *newmemory) {
-    return (void *)((VecMat::Vec< float,3 > *)  ((VecMat::Vec3< float > *) x));
+static void *_p_VecMat__Vec3Tfloat_tTo_p_VecMat__VecTfloat_3_t(void *x) {
+    return (void *)((VecMat::Vec<float,3 > *)  ((VecMat::Vec3<float > *) x));
 }
-static void *_p_FEdgeInternal__SVertexIteratorTo_p_Interface0DIteratorNested(void *x, int *newmemory) {
+static void *_p_FEdgeInternal__SVertexIteratorTo_p_Interface0DIteratorNested(void *x) {
     return (void *)((Interface0DIteratorNested *)  ((FEdgeInternal::SVertexIterator *) x));
 }
-static void *_p_ViewEdgeInternal__SVertexIteratorTo_p_Interface0DIteratorNested(void *x, int *newmemory) {
+static void *_p_ViewEdgeInternal__SVertexIteratorTo_p_Interface0DIteratorNested(void *x) {
     return (void *)((Interface0DIteratorNested *)  ((ViewEdgeInternal::SVertexIterator *) x));
 }
-static void *_p_CurveInternal__CurvePointIteratorTo_p_Interface0DIteratorNested(void *x, int *newmemory) {
+static void *_p_CurveInternal__CurvePointIteratorTo_p_Interface0DIteratorNested(void *x) {
     return (void *)((Interface0DIteratorNested *)  ((CurveInternal::CurvePointIterator *) x));
 }
-static void *_p_StrokeInternal__StrokeVertexIteratorTo_p_Interface0DIteratorNested(void *x, int *newmemory) {
+static void *_p_StrokeInternal__StrokeVertexIteratorTo_p_Interface0DIteratorNested(void *x) {
     return (void *)((Interface0DIteratorNested *)  ((StrokeInternal::StrokeVertexIterator *) x));
 }
-static void *_p_Functions0D__VertexOrientation2DF0DTo_p_UnaryFunction0DT_VecMat__Vec2T_float_t_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction0D< VecMat::Vec2< float > > *)  ((Functions0D::VertexOrientation2DF0D *) x));
+static void *_p_Functions0D__VertexOrientation2DF0DTo_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t(void *x) {
+    return (void *)((UnaryFunction0D<VecMat::Vec2<float > > *)  ((Functions0D::VertexOrientation2DF0D *) x));
 }
-static void *_p_Functions0D__Normal2DF0DTo_p_UnaryFunction0DT_VecMat__Vec2T_float_t_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction0D< VecMat::Vec2< float > > *)  ((Functions0D::Normal2DF0D *) x));
+static void *_p_Functions0D__Normal2DF0DTo_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t(void *x) {
+    return (void *)((UnaryFunction0D<VecMat::Vec2<float > > *)  ((Functions0D::Normal2DF0D *) x));
 }
-static void *_p_Functions0D__VertexOrientation3DF0DTo_p_UnaryFunction0DT_VecMat__Vec3T_float_t_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction0D< VecMat::Vec3< float > > *)  ((Functions0D::VertexOrientation3DF0D *) x));
+static void *_p_Functions0D__VertexOrientation3DF0DTo_p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t(void *x) {
+    return (void *)((UnaryFunction0D<VecMat::Vec3<float > > *)  ((Functions0D::VertexOrientation3DF0D *) x));
 }
-static void *_p_Functions1D__Orientation2DF1DTo_p_UnaryFunction1DT_VecMat__Vec2T_float_t_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction1D< VecMat::Vec2< float > > *)  ((Functions1D::Orientation2DF1D *) x));
+static void *_p_Functions1D__Orientation2DF1DTo_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t(void *x) {
+    return (void *)((UnaryFunction1D<VecMat::Vec2<float > > *)  ((Functions1D::Orientation2DF1D *) x));
 }
-static void *_p_Functions1D__Normal2DF1DTo_p_UnaryFunction1DT_VecMat__Vec2T_float_t_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction1D< VecMat::Vec2< float > > *)  ((Functions1D::Normal2DF1D *) x));
+static void *_p_Functions1D__Normal2DF1DTo_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t(void *x) {
+    return (void *)((UnaryFunction1D<VecMat::Vec2<float > > *)  ((Functions1D::Normal2DF1D *) x));
 }
-static void *_p_Functions1D__Orientation3DF1DTo_p_UnaryFunction1DT_VecMat__Vec3T_float_t_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction1D< VecMat::Vec3< float > > *)  ((Functions1D::Orientation3DF1D *) x));
+static void *_p_Functions1D__Orientation3DF1DTo_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t(void *x) {
+    return (void *)((UnaryFunction1D<VecMat::Vec3<float > > *)  ((Functions1D::Orientation3DF1D *) x));
 }
-static void *_p_Functions0D__QuantitativeInvisibilityF0DTo_p_UnaryFunction0DT_unsigned_int_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction0D< unsigned int > *)  ((Functions0D::QuantitativeInvisibilityF0D *) x));
+static void *_p_Functions0D__QuantitativeInvisibilityF0DTo_p_UnaryFunction0DTunsigned_int_t(void *x) {
+    return (void *)((UnaryFunction0D<unsigned int > *)  ((Functions0D::QuantitativeInvisibilityF0D *) x));
 }
-static void *_p_Functions1D__QuantitativeInvisibilityF1DTo_p_UnaryFunction1DT_unsigned_int_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction1D< unsigned int > *)  ((Functions1D::QuantitativeInvisibilityF1D *) x));
+static void *_p_Functions1D__QuantitativeInvisibilityF1DTo_p_UnaryFunction1DTunsigned_int_t(void *x) {
+    return (void *)((UnaryFunction1D<unsigned int > *)  ((Functions1D::QuantitativeInvisibilityF1D *) x));
 }
-static void *_p_Functions0D__ShapeIdF0DTo_p_UnaryFunction0DT_Id_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction0D< Id > *)  ((Functions0D::ShapeIdF0D *) x));
+static void *_p_Functions0D__ShapeIdF0DTo_p_UnaryFunction0DTId_t(void *x) {
+    return (void *)((UnaryFunction0D<Id > *)  ((Functions0D::ShapeIdF0D *) x));
 }
-static void *_p_VecMat__Vec2T_double_tTo_p_VecMat__VecT_double_2_t(void *x, int *newmemory) {
-    return (void *)((VecMat::Vec< double,2 > *)  ((VecMat::Vec2< double > *) x));
+static void *_p_VecMat__Vec2Tdouble_tTo_p_VecMat__VecTdouble_2_t(void *x) {
+    return (void *)((VecMat::Vec<double,2 > *)  ((VecMat::Vec2<double > *) x));
 }
-static void *_p_TVertexTo_p_ViewVertex(void *x, int *newmemory) {
+static void *_p_TVertexTo_p_ViewVertex(void *x) {
     return (void *)((ViewVertex *)  ((TVertex *) x));
 }
-static void *_p_NonTVertexTo_p_ViewVertex(void *x, int *newmemory) {
+static void *_p_NonTVertexTo_p_ViewVertex(void *x) {
     return (void *)((ViewVertex *)  ((NonTVertex *) x));
 }
-static void *_p_Functions0D__ZDiscontinuityF0DTo_p_UnaryFunction0DT_double_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction0D< double > *)  ((Functions0D::ZDiscontinuityF0D *) x));
+static void *_p_Functions0D__ZDiscontinuityF0DTo_p_UnaryFunction0DTdouble_t(void *x) {
+    return (void *)((UnaryFunction0D<double > *)  ((Functions0D::ZDiscontinuityF0D *) x));
 }
-static void *_p_Functions0D__DensityF0DTo_p_UnaryFunction0DT_double_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction0D< double > *)  ((Functions0D::DensityF0D *) x));
+static void *_p_Functions0D__DensityF0DTo_p_UnaryFunction0DTdouble_t(void *x) {
+    return (void *)((UnaryFunction0D<double > *)  ((Functions0D::DensityF0D *) x));
 }
-static void *_p_Functions0D__GetXF0DTo_p_UnaryFunction0DT_double_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction0D< double > *)  ((Functions0D::GetXF0D *) x));
+static void *_p_Functions0D__GetXF0DTo_p_UnaryFunction0DTdouble_t(void *x) {
+    return (void *)((UnaryFunction0D<double > *)  ((Functions0D::GetXF0D *) x));
 }
-static void *_p_Functions0D__GetProjectedXF0DTo_p_UnaryFunction0DT_double_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction0D< double > *)  ((Functions0D::GetProjectedXF0D *) x));
+static void *_p_Functions0D__GetProjectedXF0DTo_p_UnaryFunction0DTdouble_t(void *x) {
+    return (void *)((UnaryFunction0D<double > *)  ((Functions0D::GetProjectedXF0D *) x));
 }
-static void *_p_Functions0D__Curvature2DAngleF0DTo_p_UnaryFunction0DT_double_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction0D< double > *)  ((Functions0D::Curvature2DAngleF0D *) x));
+static void *_p_Functions0D__Curvature2DAngleF0DTo_p_UnaryFunction0DTdouble_t(void *x) {
+    return (void *)((UnaryFunction0D<double > *)  ((Functions0D::Curvature2DAngleF0D *) x));
 }
-static void *_p_Functions0D__GetYF0DTo_p_UnaryFunction0DT_double_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction0D< double > *)  ((Functions0D::GetYF0D *) x));
+static void *_p_Functions0D__GetYF0DTo_p_UnaryFunction0DTdouble_t(void *x) {
+    return (void *)((UnaryFunction0D<double > *)  ((Functions0D::GetYF0D *) x));
 }
-static void *_p_Functions0D__GetProjectedYF0DTo_p_UnaryFunction0DT_double_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction0D< double > *)  ((Functions0D::GetProjectedYF0D *) x));
+static void *_p_Functions0D__GetProjectedYF0DTo_p_UnaryFunction0DTdouble_t(void *x) {
+    return (void *)((UnaryFunction0D<double > *)  ((Functions0D::GetProjectedYF0D *) x));
 }
-static void *_p_Functions0D__GetZF0DTo_p_UnaryFunction0DT_double_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction0D< double > *)  ((Functions0D::GetZF0D *) x));
+static void *_p_Functions0D__GetZF0DTo_p_UnaryFunction0DTdouble_t(void *x) {
+    return (void *)((UnaryFunction0D<double > *)  ((Functions0D::GetZF0D *) x));
 }
-static void *_p_Functions0D__GetProjectedZF0DTo_p_UnaryFunction0DT_double_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction0D< double > *)  ((Functions0D::GetProjectedZF0D *) x));
+static void *_p_Functions0D__GetProjectedZF0DTo_p_UnaryFunction0DTdouble_t(void *x) {
+    return (void *)((UnaryFunction0D<double > *)  ((Functions0D::GetProjectedZF0D *) x));
 }
-static void *_p_Functions0D__LocalAverageDepthF0DTo_p_UnaryFunction0DT_double_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction0D< double > *)  ((Functions0D::LocalAverageDepthF0D *) x));
+static void *_p_Functions0D__LocalAverageDepthF0DTo_p_UnaryFunction0DTdouble_t(void *x) {
+    return (void *)((UnaryFunction0D<double > *)  ((Functions0D::LocalAverageDepthF0D *) x));
 }
-static void *_p_Functions1D__GetSteerableViewMapDensityF1DTo_p_UnaryFunction1DT_double_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction1D< double > *)  ((Functions1D::GetSteerableViewMapDensityF1D *) x));
+static void *_p_Functions1D__GetSteerableViewMapDensityF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
+    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::GetSteerableViewMapDensityF1D *) x));
 }
-static void *_p_Functions1D__GetDirectionalViewMapDensityF1DTo_p_UnaryFunction1DT_double_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction1D< double > *)  ((Functions1D::GetDirectionalViewMapDensityF1D *) x));
+static void *_p_Functions1D__GetDirectionalViewMapDensityF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
+    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::GetDirectionalViewMapDensityF1D *) x));
 }
-static void *_p_Functions1D__GetCompleteViewMapDensityF1DTo_p_UnaryFunction1DT_double_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction1D< double > *)  ((Functions1D::GetCompleteViewMapDensityF1D *) x));
+static void *_p_Functions1D__GetCompleteViewMapDensityF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
+    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::GetCompleteViewMapDensityF1D *) x));
 }
-static void *_p_Functions1D__DensityF1DTo_p_UnaryFunction1DT_double_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction1D< double > *)  ((Functions1D::DensityF1D *) x));
+static void *_p_Functions1D__DensityF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
+    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::DensityF1D *) x));
 }
-static void *_p_Functions1D__ZDiscontinuityF1DTo_p_UnaryFunction1DT_double_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction1D< double > *)  ((Functions1D::ZDiscontinuityF1D *) x));
+static void *_p_Functions1D__ZDiscontinuityF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
+    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::ZDiscontinuityF1D *) x));
 }
-static void *_p_Functions1D__GetXF1DTo_p_UnaryFunction1DT_double_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction1D< double > *)  ((Functions1D::GetXF1D *) x));
+static void *_p_Functions1D__GetXF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
+    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::GetXF1D *) x));
 }
-static void *_p_Functions1D__GetZF1DTo_p_UnaryFunction1DT_double_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction1D< double > *)  ((Functions1D::GetZF1D *) x));
+static void *_p_Functions1D__GetZF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
+    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::GetZF1D *) x));
 }
-static void *_p_Functions1D__GetViewMapGradientNormF1DTo_p_UnaryFunction1DT_double_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction1D< double > *)  ((Functions1D::GetViewMapGradientNormF1D *) x));
+static void *_p_Functions1D__GetViewMapGradientNormF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
+    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::GetViewMapGradientNormF1D *) x));
 }
-static void *_p_Functions1D__GetProjectedYF1DTo_p_UnaryFunction1DT_double_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction1D< double > *)  ((Functions1D::GetProjectedYF1D *) x));
+static void *_p_Functions1D__GetProjectedYF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
+    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::GetProjectedYF1D *) x));
 }
-static void *_p_Functions1D__Curvature2DAngleF1DTo_p_UnaryFunction1DT_double_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction1D< double > *)  ((Functions1D::Curvature2DAngleF1D *) x));
+static void *_p_Functions1D__Curvature2DAngleF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
+    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::Curvature2DAngleF1D *) x));
 }
-static void *_p_Functions1D__GetYF1DTo_p_UnaryFunction1DT_double_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction1D< double > *)  ((Functions1D::GetYF1D *) x));
+static void *_p_Functions1D__GetYF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
+    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::GetYF1D *) x));
 }
-static void *_p_Functions1D__GetProjectedXF1DTo_p_UnaryFunction1DT_double_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction1D< double > *)  ((Functions1D::GetProjectedXF1D *) x));
+static void *_p_Functions1D__GetProjectedXF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
+    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::GetProjectedXF1D *) x));
 }
-static void *_p_Functions1D__LocalAverageDepthF1DTo_p_UnaryFunction1DT_double_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction1D< double > *)  ((Functions1D::LocalAverageDepthF1D *) x));
+static void *_p_Functions1D__LocalAverageDepthF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
+    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::LocalAverageDepthF1D *) x));
 }
-static void *_p_Functions1D__GetProjectedZF1DTo_p_UnaryFunction1DT_double_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction1D< double > *)  ((Functions1D::GetProjectedZF1D *) x));
+static void *_p_Functions1D__GetProjectedZF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
+    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::GetProjectedZF1D *) x));
 }
-static void *_p_Functions0D__GetCurvilinearAbscissaF0DTo_p_UnaryFunction0DT_float_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction0D< float > *)  ((Functions0D::GetCurvilinearAbscissaF0D *) x));
+static void *_p_Functions0D__GetCurvilinearAbscissaF0DTo_p_UnaryFunction0DTfloat_t(void *x) {
+    return (void *)((UnaryFunction0D<float > *)  ((Functions0D::GetCurvilinearAbscissaF0D *) x));
 }
-static void *_p_Functions0D__ReadMapPixelF0DTo_p_UnaryFunction0DT_float_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction0D< float > *)  ((Functions0D::ReadMapPixelF0D *) x));
+static void *_p_Functions0D__ReadMapPixelF0DTo_p_UnaryFunction0DTfloat_t(void *x) {
+    return (void *)((UnaryFunction0D<float > *)  ((Functions0D::ReadMapPixelF0D *) x));
 }
-static void *_p_Functions0D__ReadSteerableViewMapPixelF0DTo_p_UnaryFunction0DT_float_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction0D< float > *)  ((Functions0D::ReadSteerableViewMapPixelF0D *) x));
+static void *_p_Functions0D__ReadSteerableViewMapPixelF0DTo_p_UnaryFunction0DTfloat_t(void *x) {
+    return (void *)((UnaryFunction0D<float > *)  ((Functions0D::ReadSteerableViewMapPixelF0D *) x));
 }
-static void *_p_Functions0D__ReadCompleteViewMapPixelF0DTo_p_UnaryFunction0DT_float_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction0D< float > *)  ((Functions0D::ReadCompleteViewMapPixelF0D *) x));
+static void *_p_Functions0D__ReadCompleteViewMapPixelF0DTo_p_UnaryFunction0DTfloat_t(void *x) {
+    return (void *)((UnaryFunction0D<float > *)  ((Functions0D::ReadCompleteViewMapPixelF0D *) x));
 }
-static void *_p_Functions0D__GetViewMapGradientNormF0DTo_p_UnaryFunction0DT_float_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction0D< float > *)  ((Functions0D::GetViewMapGradientNormF0D *) x));
+static void *_p_Functions0D__GetViewMapGradientNormF0DTo_p_UnaryFunction0DTfloat_t(void *x) {
+    return (void *)((UnaryFunction0D<float > *)  ((Functions0D::GetViewMapGradientNormF0D *) x));
 }
-static void *_p_Functions0D__GetParameterF0DTo_p_UnaryFunction0DT_float_t(void *x, int *newmemory) {
-    return (void *)((UnaryFunction0D< float > *)  ((Functions0D::GetParameterF0D *) x));
+static void *_p_Functions0D__GetParameterF0DTo_p_UnaryFunction0DTfloat_t(void *x) {
+    return (void *)((UnaryFunction0D<float > *)  ((Functions0D::GetParameterF0D *) x));
 }
-static void *_p_VecMat__Vec3T_double_tTo_p_VecMat__VecT_double_3_t(void *x, int *newmemory) {
-    return (void *)((VecMat::Vec< double,3 > *)  ((VecMat::Vec3< double > *) x));
+static void *_p_VecMat__Vec3Tdouble_tTo_p_VecMat__VecTdouble_3_t(void *x) {
+    return (void *)((VecMat::Vec<double,3 > *)  ((VecMat::Vec3<double > *) x));
 }
 static swig_type_info _swigt__p_AdjacencyIterator = {"_p_AdjacencyIterator", "AdjacencyIterator *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_BBoxT_VecMat__Vec3T_double_t_t = {"_p_BBoxT_VecMat__Vec3T_double_t_t", "BBox< VecMat::Vec3< double > > *|BBox< Geometry::Vec3r > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_BBoxTVecMat__Vec3Tdouble_t_t = {"_p_BBoxTVecMat__Vec3Tdouble_t_t", "BBox<VecMat::Vec3<double > > *|BBox<Geometry::Vec3r > *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_BinaryPredicate0D = {"_p_BinaryPredicate0D", "BinaryPredicate0D *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_BinaryPredicate1D = {"_p_BinaryPredicate1D", "BinaryPredicate1D *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CalligraphicShader = {"_p_CalligraphicShader", "CalligraphicShader *", 0, 0, (void*)0, 0};
@@ -109096,7 +110242,7 @@ static swig_type_info _swigt__p_ChainingIterator = {"_p_ChainingIterator", "Chai
 static swig_type_info _swigt__p_CurvatureInfo = {"_p_CurvatureInfo", "CurvatureInfo *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_Curve = {"_p_Curve", "Curve *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CurveInternal__CurvePointIterator = {"_p_CurveInternal__CurvePointIterator", "CurveInternal::CurvePointIterator *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_CurvePoint = {"_p_CurvePoint", "Curve::Vertex *|CurvePoint *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_CurvePoint = {"_p_CurvePoint", "CurvePoint *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_Curve__vertex_container__iterator = {"_p_Curve__vertex_container__iterator", "::Curve::vertex_container::iterator *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_FEdge = {"_p_FEdge", "FEdge *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_FEdgeInternal__SVertexIterator = {"_p_FEdgeInternal__SVertexIterator", "FEdgeInternal::SVertexIterator *", 0, 0, (void*)0, 0};
@@ -109235,56 +110381,56 @@ static swig_type_info _swigt__p_Stroke__viewedge_container__iterator = {"_p_Stro
 static swig_type_info _swigt__p_StrokesContainer = {"_p_StrokesContainer", "StrokesContainer *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_StyleModule = {"_p_StyleModule", "StyleModule *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_TVertex = {"_p_TVertex", "TVertex *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction0DT_Id_t = {"_p_UnaryFunction0DT_Id_t", "UnaryFunction0D< Id > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction0DT_VecMat__Vec2T_float_t_t = {"_p_UnaryFunction0DT_VecMat__Vec2T_float_t_t", "UnaryFunction0D< Geometry::Vec2f > *|UnaryFunction0D< VecMat::Vec2< float > > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction0DT_VecMat__Vec3T_float_t_t = {"_p_UnaryFunction0DT_VecMat__Vec3T_float_t_t", "UnaryFunction0D< VecMat::Vec3< float > > *|UnaryFunction0D< Geometry::Vec3f > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction0DT_ViewShape_p_t = {"_p_UnaryFunction0DT_ViewShape_p_t", "UnaryFunction0D< ViewShape * > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction0DT_double_t = {"_p_UnaryFunction0DT_double_t", "UnaryFunction0D< double > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction0DT_float_t = {"_p_UnaryFunction0DT_float_t", "UnaryFunction0D< float > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction0DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t = {"_p_UnaryFunction0DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t", "UnaryFunction0D< std::vector< ViewShape * > > *|UnaryFunction0D< std::vector< ViewShape *,std::allocator< ViewShape * > > > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction0DT_unsigned_int_t = {"_p_UnaryFunction0DT_unsigned_int_t", "UnaryFunction0D< unsigned int > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction0DT_void_t = {"_p_UnaryFunction0DT_void_t", "UnaryFunction0D< void > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction1DT_VecMat__Vec2T_float_t_t = {"_p_UnaryFunction1DT_VecMat__Vec2T_float_t_t", "UnaryFunction1D< Geometry::Vec2f > *|UnaryFunction1D< VecMat::Vec2< float > > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction1DT_VecMat__Vec3T_float_t_t = {"_p_UnaryFunction1DT_VecMat__Vec3T_float_t_t", "UnaryFunction1D< VecMat::Vec3< float > > *|UnaryFunction1D< Geometry::Vec3f > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction1DT_double_t = {"_p_UnaryFunction1DT_double_t", "UnaryFunction1D< double > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction1DT_float_t = {"_p_UnaryFunction1DT_float_t", "UnaryFunction1D< float > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t = {"_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t", "UnaryFunction1D< std::vector< ViewShape * > > *|UnaryFunction1D< std::vector< ViewShape *,std::allocator< ViewShape * > > > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction1DT_unsigned_int_t = {"_p_UnaryFunction1DT_unsigned_int_t", "UnaryFunction1D< unsigned int > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction1DT_void_t = {"_p_UnaryFunction1DT_void_t", "UnaryFunction1D< void > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction0DTId_t = {"_p_UnaryFunction0DTId_t", "UnaryFunction0D<Id > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t = {"_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t", "UnaryFunction0D<VecMat::Vec2<float > > *|UnaryFunction0D<Geometry::Vec2f > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t = {"_p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t", "UnaryFunction0D<VecMat::Vec3<float > > *|UnaryFunction0D<Geometry::Vec3f > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction0DTViewShape_p_t = {"_p_UnaryFunction0DTViewShape_p_t", "UnaryFunction0D<ViewShape * > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction0DTdouble_t = {"_p_UnaryFunction0DTdouble_t", "UnaryFunction0D<double > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction0DTfloat_t = {"_p_UnaryFunction0DTfloat_t", "UnaryFunction0D<float > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t = {"_p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t", "UnaryFunction0D<std::vector<ViewShape * > > *|UnaryFunction0D<std::vector<ViewShape *,std::allocator<ViewShape * > > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction0DTunsigned_int_t = {"_p_UnaryFunction0DTunsigned_int_t", "UnaryFunction0D<unsigned int > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction0DTvoid_t = {"_p_UnaryFunction0DTvoid_t", "UnaryFunction0D<void > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t = {"_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t", "UnaryFunction1D<VecMat::Vec2<float > > *|UnaryFunction1D<Geometry::Vec2f > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t = {"_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t", "UnaryFunction1D<VecMat::Vec3<float > > *|UnaryFunction1D<Geometry::Vec3f > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction1DTdouble_t = {"_p_UnaryFunction1DTdouble_t", "UnaryFunction1D<double > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction1DTfloat_t = {"_p_UnaryFunction1DTfloat_t", "UnaryFunction1D<float > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t = {"_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t", "UnaryFunction1D<std::vector<ViewShape * > > *|UnaryFunction1D<std::vector<ViewShape *,std::allocator<ViewShape * > > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction1DTunsigned_int_t = {"_p_UnaryFunction1DTunsigned_int_t", "UnaryFunction1D<unsigned int > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction1DTvoid_t = {"_p_UnaryFunction1DTvoid_t", "UnaryFunction1D<void > *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_UnaryPredicate0D = {"_p_UnaryPredicate0D", "UnaryPredicate0D *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_UnaryPredicate1D = {"_p_UnaryPredicate1D", "UnaryPredicate1D *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__HVec3T_double_t = {"_p_VecMat__HVec3T_double_t", "Geometry::HVec3d *|Geometry::HVec3r *|VecMat::HVec3< double > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__HVec3T_float_t = {"_p_VecMat__HVec3T_float_t", "VecMat::HVec3< float > *|Geometry::HVec3f *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__HVec3T_int_t = {"_p_VecMat__HVec3T_int_t", "Geometry::HVec3i *|VecMat::HVec3< int > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__HVec3T_unsigned_int_t = {"_p_VecMat__HVec3T_unsigned_int_t", "Geometry::HVec3u *|VecMat::HVec3< unsigned int > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__SquareMatrixT_double_2_t = {"_p_VecMat__SquareMatrixT_double_2_t", "Geometry::Matrix22d *|Geometry::Matrix22r *|VecMat::SquareMatrix< double,2 > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__SquareMatrixT_double_3_t = {"_p_VecMat__SquareMatrixT_double_3_t", "VecMat::SquareMatrix< double,3 > *|Geometry::Matrix33d *|Geometry::Matrix33r *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__SquareMatrixT_double_4_t = {"_p_VecMat__SquareMatrixT_double_4_t", "VecMat::SquareMatrix< double,4 > *|Geometry::Matrix44d *|Geometry::Matrix44r *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__SquareMatrixT_float_2_t = {"_p_VecMat__SquareMatrixT_float_2_t", "Geometry::Matrix22f *|VecMat::SquareMatrix< float,2 > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__SquareMatrixT_float_3_t = {"_p_VecMat__SquareMatrixT_float_3_t", "VecMat::SquareMatrix< float,3 > *|Geometry::Matrix33f *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__SquareMatrixT_float_4_t = {"_p_VecMat__SquareMatrixT_float_4_t", "Geometry::Matrix44f *|VecMat::SquareMatrix< float,4 > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__SquareMatrixT_int_2_t = {"_p_VecMat__SquareMatrixT_int_2_t", "VecMat::SquareMatrix< int,2 > *|Geometry::Matrix22i *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__SquareMatrixT_int_3_t = {"_p_VecMat__SquareMatrixT_int_3_t", "VecMat::SquareMatrix< int,3 > *|Geometry::Matrix33i *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__SquareMatrixT_int_4_t = {"_p_VecMat__SquareMatrixT_int_4_t", "Geometry::Matrix44i *|VecMat::SquareMatrix< int,4 > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__SquareMatrixT_unsigned_int_2_t = {"_p_VecMat__SquareMatrixT_unsigned_int_2_t", "Geometry::Matrix22u *|VecMat::SquareMatrix< unsigned int,2 > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__SquareMatrixT_unsigned_int_3_t = {"_p_VecMat__SquareMatrixT_unsigned_int_3_t", "Geometry::Matrix33u *|VecMat::SquareMatrix< unsigned int,3 > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__SquareMatrixT_unsigned_int_4_t = {"_p_VecMat__SquareMatrixT_unsigned_int_4_t", "Geometry::Matrix44u *|VecMat::SquareMatrix< unsigned int,4 > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__Vec2T_double_t = {"_p_VecMat__Vec2T_double_t", "Geometry::Vec2d *|Geometry::Vec2r *|VecMat::Vec2< double > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__Vec2T_float_t = {"_p_VecMat__Vec2T_float_t", "VecMat::Vec2< float > *|Geometry::Vec2f *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__Vec2T_int_t = {"_p_VecMat__Vec2T_int_t", "Geometry::Vec2i *|VecMat::Vec2< int > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__Vec2T_unsigned_int_t = {"_p_VecMat__Vec2T_unsigned_int_t", "Geometry::Vec2u *|VecMat::Vec2< unsigned int > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__Vec3T_double_t = {"_p_VecMat__Vec3T_double_t", "Geometry::Vec3d *|Geometry::Vec3r *|VecMat::Vec3< double > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__Vec3T_float_t = {"_p_VecMat__Vec3T_float_t", "VecMat::Vec3< float > *|Geometry::Vec3f *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__Vec3T_int_t = {"_p_VecMat__Vec3T_int_t", "Geometry::Vec3i *|VecMat::Vec3< int > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__Vec3T_unsigned_int_t = {"_p_VecMat__Vec3T_unsigned_int_t", "Geometry::Vec3u *|VecMat::Vec3< unsigned int > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__VecT_double_2_t = {"_p_VecMat__VecT_double_2_t", "VecMat::Vec< double,2 > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__VecT_double_3_t = {"_p_VecMat__VecT_double_3_t", "VecMat::Vec< double,3 > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__VecT_float_2_t = {"_p_VecMat__VecT_float_2_t", "VecMat::Vec< float,2 > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__VecT_float_3_t = {"_p_VecMat__VecT_float_3_t", "VecMat::Vec< float,3 > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__VecT_int_2_t = {"_p_VecMat__VecT_int_2_t", "VecMat::Vec< int,2 > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__VecT_int_3_t = {"_p_VecMat__VecT_int_3_t", "VecMat::Vec< int,3 > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__VecT_unsigned_int_2_t = {"_p_VecMat__VecT_unsigned_int_2_t", "VecMat::Vec< unsigned int,2 > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__VecT_unsigned_int_3_t = {"_p_VecMat__VecT_unsigned_int_3_t", "VecMat::Vec< unsigned int,3 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__HVec3Tdouble_t = {"_p_VecMat__HVec3Tdouble_t", "VecMat::HVec3<double > *|Geometry::HVec3r *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__HVec3Tfloat_t = {"_p_VecMat__HVec3Tfloat_t", "VecMat::HVec3<float > *|Geometry::HVec3f *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__HVec3Tint_t = {"_p_VecMat__HVec3Tint_t", "VecMat::HVec3<int > *|Geometry::HVec3i *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__HVec3Tunsigned_int_t = {"_p_VecMat__HVec3Tunsigned_int_t", "VecMat::HVec3<unsigned int > *|Geometry::HVec3u *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixTdouble_2_t = {"_p_VecMat__SquareMatrixTdouble_2_t", "VecMat::SquareMatrix<double,2 > *|Geometry::Matrix22r *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixTdouble_3_t = {"_p_VecMat__SquareMatrixTdouble_3_t", "VecMat::SquareMatrix<double,3 > *|Geometry::Matrix33r *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixTdouble_4_t = {"_p_VecMat__SquareMatrixTdouble_4_t", "VecMat::SquareMatrix<double,4 > *|Geometry::Matrix44r *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixTfloat_2_t = {"_p_VecMat__SquareMatrixTfloat_2_t", "VecMat::SquareMatrix<float,2 > *|Geometry::Matrix22f *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixTfloat_3_t = {"_p_VecMat__SquareMatrixTfloat_3_t", "VecMat::SquareMatrix<float,3 > *|Geometry::Matrix33f *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixTfloat_4_t = {"_p_VecMat__SquareMatrixTfloat_4_t", "VecMat::SquareMatrix<float,4 > *|Geometry::Matrix44f *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixTint_2_t = {"_p_VecMat__SquareMatrixTint_2_t", "VecMat::SquareMatrix<int,2 > *|Geometry::Matrix22i *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixTint_3_t = {"_p_VecMat__SquareMatrixTint_3_t", "VecMat::SquareMatrix<int,3 > *|Geometry::Matrix33i *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixTint_4_t = {"_p_VecMat__SquareMatrixTint_4_t", "VecMat::SquareMatrix<int,4 > *|Geometry::Matrix44i *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixTunsigned_int_2_t = {"_p_VecMat__SquareMatrixTunsigned_int_2_t", "VecMat::SquareMatrix<unsigned int,2 > *|Geometry::Matrix22u *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixTunsigned_int_3_t = {"_p_VecMat__SquareMatrixTunsigned_int_3_t", "VecMat::SquareMatrix<unsigned int,3 > *|Geometry::Matrix33u *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixTunsigned_int_4_t = {"_p_VecMat__SquareMatrixTunsigned_int_4_t", "VecMat::SquareMatrix<unsigned int,4 > *|Geometry::Matrix44u *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__Vec2Tdouble_t = {"_p_VecMat__Vec2Tdouble_t", "VecMat::Vec2<double > *|Geometry::Vec2d *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__Vec2Tfloat_t = {"_p_VecMat__Vec2Tfloat_t", "VecMat::Vec2<float > *|Geometry::Vec2f *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__Vec2Tint_t = {"_p_VecMat__Vec2Tint_t", "VecMat::Vec2<int > *|Geometry::Vec2i *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__Vec2Tunsigned_int_t = {"_p_VecMat__Vec2Tunsigned_int_t", "VecMat::Vec2<unsigned int > *|Geometry::Vec2u *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__Vec3Tdouble_t = {"_p_VecMat__Vec3Tdouble_t", "VecMat::Vec3<double > *|Geometry::Vec3r *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__Vec3Tfloat_t = {"_p_VecMat__Vec3Tfloat_t", "VecMat::Vec3<float > *|Geometry::Vec3f *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__Vec3Tint_t = {"_p_VecMat__Vec3Tint_t", "VecMat::Vec3<int > *|Geometry::Vec3i *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__Vec3Tunsigned_int_t = {"_p_VecMat__Vec3Tunsigned_int_t", "VecMat::Vec3<unsigned int > *|Geometry::Vec3u *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__VecTdouble_2_t = {"_p_VecMat__VecTdouble_2_t", "VecMat::Vec<double,2 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__VecTdouble_3_t = {"_p_VecMat__VecTdouble_3_t", "VecMat::Vec<double,3 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__VecTfloat_2_t = {"_p_VecMat__VecTfloat_2_t", "VecMat::Vec<float,2 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__VecTfloat_3_t = {"_p_VecMat__VecTfloat_3_t", "VecMat::Vec<float,3 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__VecTint_2_t = {"_p_VecMat__VecTint_2_t", "VecMat::Vec<int,2 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__VecTint_3_t = {"_p_VecMat__VecTint_3_t", "VecMat::Vec<int,3 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__VecTunsigned_int_2_t = {"_p_VecMat__VecTunsigned_int_2_t", "VecMat::Vec<unsigned int,2 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__VecTunsigned_int_3_t = {"_p_VecMat__VecTunsigned_int_3_t", "VecMat::Vec<unsigned int,3 > *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_Vertex = {"_p_Vertex", "Vertex *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_ViewEdge = {"_p_ViewEdge", "ViewEdge *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_ViewEdgeInternal__SVertexIterator = {"_p_ViewEdgeInternal__SVertexIterator", "ViewEdgeInternal::SVertexIterator *", 0, 0, (void*)0, 0};
@@ -109292,8 +110438,8 @@ static swig_type_info _swigt__p_ViewEdgeInternal__ViewEdgeIterator = {"_p_ViewEd
 static swig_type_info _swigt__p_ViewMap = {"_p_ViewMap", "ViewMap *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_ViewShape = {"_p_ViewShape", "ViewShape *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_ViewVertex = {"_p_ViewVertex", "ViewVertex *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_const_traits_t = {"_p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_const_traits_t", "ViewVertexInternal::edge_iterator_base< ViewVertexInternal::edge_const_traits > *|ViewVertex::const_edge_iterator *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_nonconst_traits_t = {"_p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_nonconst_traits_t", "ViewVertexInternal::edge_iterator_base< ViewVertexInternal::edge_nonconst_traits > *|ViewVertex::edge_iterator *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t = {"_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t", "ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_const_traits > *|ViewVertex::const_edge_iterator *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t = {"_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t", "ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_nonconst_traits > *|ViewVertex::edge_iterator *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_ViewVertexInternal__orientedViewEdgeIterator = {"_p_ViewVertexInternal__orientedViewEdgeIterator", "ViewVertexInternal::orientedViewEdgeIterator *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_ViewVertexInternal__orientedViewEdgeIterator__edge_pointers_container__iterator = {"_p_ViewVertexInternal__orientedViewEdgeIterator__edge_pointers_container__iterator", "ViewVertexInternal::orientedViewEdgeIterator::edge_pointers_container::iterator *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_ViewVertexInternal__orientedViewEdgeIterator__edges_container__iterator = {"_p_ViewVertexInternal__orientedViewEdgeIterator__edges_container__iterator", "ViewVertexInternal::orientedViewEdgeIterator::edges_container::iterator *", 0, 0, (void*)0, 0};
@@ -109306,16 +110452,16 @@ static swig_type_info _swigt__p_const_reference = {"_p_const_reference", "const_
 static swig_type_info _swigt__p_const_vertex_iterator = {"_p_const_vertex_iterator", "const_vertex_iterator *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_difference_type = {"_p_difference_type", "difference_type *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_directedViewEdge = {"_p_directedViewEdge", "directedViewEdge *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_double = {"_p_double", "real *|VecMat::Vec2< double >::value_type *|VecMat::Vec3< double >::value_type *|double *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_double = {"_p_double", "double *|VecMat::Vec3<double >::value_type *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_edge_iterator = {"_p_edge_iterator", "edge_iterator *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_edge_pointers_container = {"_p_edge_pointers_container", "edge_pointers_container *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_edges_container = {"_p_edges_container", "edges_container *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_fedge_iterator = {"_p_fedge_iterator", "fedge_iterator *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_fedges_container = {"_p_fedges_container", "fedges_container *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_float = {"_p_float", "VecMat::Vec2< float >::value_type *|VecMat::Vec3< float >::value_type *|float *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_float = {"_p_float", "float *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_id_to_index_map = {"_p_id_to_index_map", "id_to_index_map *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_id_type = {"_p_id_type", "id_type *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_int = {"_p_int", "VecMat::Vec2< int >::value_type *|VecMat::Vec3< int >::value_type *|int *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_int = {"_p_int", "int *|VecMat::Vec3<int >::value_type *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_ltstr = {"_p_ltstr", "ltstr *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_mapsMap = {"_p_mapsMap", "mapsMap *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_occluder_container__const_iterator = {"_p_occluder_container__const_iterator", "occluder_container::const_iterator *", 0, 0, (void*)0, 0};
@@ -109323,34 +110469,34 @@ static swig_type_info _swigt__p_p_PyObject = {"_p_p_PyObject", "PyObject **", 0,
 static swig_type_info _swigt__p_point_iterator = {"_p_point_iterator", "point_iterator *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_point_type = {"_p_point_type", "point_type *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_reference = {"_p_reference", "reference *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_setT_VecMat__Vec3T_double_t_t = {"_p_setT_VecMat__Vec3T_double_t_t", "set< VecMat::Vec3< double > > *|set< Geometry::Vec3r > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_setTVecMat__Vec3Tdouble_t_t = {"_p_setTVecMat__Vec3Tdouble_t_t", "set<VecMat::Vec3<double > > *|set<Geometry::Vec3r > *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_size_type = {"_p_size_type", "size_type *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_std__invalid_argument = {"_p_std__invalid_argument", "std::invalid_argument *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__mapT_int_int_std__lessT_int_t_std__allocatorT_std__pairT_int_const_int_t_t_t = {"_p_std__mapT_int_int_std__lessT_int_t_std__allocatorT_std__pairT_int_const_int_t_t_t", "ViewMap::id_to_index_map *|std::map< int,int,std::less< int >,std::allocator< std::pair< int const,int > > > *|std::map< int,int > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__pairT_ViewEdge_p_bool_t = {"_p_std__pairT_ViewEdge_p_bool_t", "std::pair< ViewEdge *,bool > *|ViewVertex::directedViewEdge *|::ViewVertex::directedViewEdge *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t = {"_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t", "std::vector< FEdge *,std::allocator< FEdge * > > *|std::vector< FEdge * > *|ViewMap::fedges_container *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__allocator_type = {"_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__allocator_type", "std::vector< FEdge * >::allocator_type *|std::allocator< FEdge * > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorT_Material_std__allocatorT_Material_t_t = {"_p_std__vectorT_Material_std__allocatorT_Material_t_t", "std::vector< Material,std::allocator< Material > > *|std::vector< Material > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t = {"_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t", "std::vector< SVertex * > *|ViewMap::svertices_container *|std::vector< SVertex *,std::allocator< SVertex * > > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__allocator_type = {"_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__allocator_type", "std::vector< SVertex * >::allocator_type *|std::allocator< SVertex * > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t = {"_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t", "std::vector< StrokeShader *,std::allocator< StrokeShader * > > *|std::vector< StrokeShader * > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__allocator_type = {"_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__allocator_type", "std::vector< StrokeShader * >::allocator_type *|std::allocator< StrokeShader * > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorT_TVertex_p_std__allocatorT_TVertex_p_t_t = {"_p_std__vectorT_TVertex_p_std__allocatorT_TVertex_p_t_t", "std::vector< TVertex * > *|std::vector< TVertex *,std::allocator< TVertex * > > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorT_VecMat__Vec2T_double_t_std__allocatorT_VecMat__Vec2T_double_t_t_t = {"_p_std__vectorT_VecMat__Vec2T_double_t_std__allocatorT_VecMat__Vec2T_double_t_t_t", "std::vector< VecMat::Vec2< double > > *|std::vector< VecMat::Vec2< double >,std::allocator< VecMat::Vec2< double > > > *|std::vector< Geometry::Vec2r > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t = {"_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t", "std::vector< ViewEdge *,std::allocator< ViewEdge * > > *|std::vector< ViewEdge * > *|ViewMap::viewedges_container *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__allocator_type = {"_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__allocator_type", "std::vector< ViewEdge * >::allocator_type *|std::allocator< ViewEdge * > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t = {"_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t", "std::vector< ViewShape *,std::allocator< ViewShape * > > *|std::vector< ViewShape * > *|occluder_container *|ViewMap::viewshapes_container *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__allocator_type = {"_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__allocator_type", "std::vector< ViewShape * >::allocator_type *|std::allocator< ViewShape * > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t = {"_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t", "std::vector< ViewVertex *,std::allocator< ViewVertex * > > *|std::vector< ViewVertex * > *|ViewMap::viewvertices_container *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__allocator_type = {"_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__allocator_type", "std::vector< ViewVertex * >::allocator_type *|std::allocator< ViewVertex * > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorT_int_std__allocatorT_int_t_t = {"_p_std__vectorT_int_std__allocatorT_int_t_t", "std::vector< int,std::allocator< int > > *|std::vector< int > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorT_int_std__allocatorT_int_t_t__allocator_type = {"_p_std__vectorT_int_std__allocatorT_int_t_t__allocator_type", "std::vector< int >::allocator_type *|std::allocator< int > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorT_std__pairT_ViewEdge_p_bool_t_std__allocatorT_std__pairT_ViewEdge_p_bool_t_t_t = {"_p_std__vectorT_std__pairT_ViewEdge_p_bool_t_std__allocatorT_std__pairT_ViewEdge_p_bool_t_t_t", "std::vector< std::pair< ViewEdge *,bool > > *|std::vector< ViewVertex::directedViewEdge > *|std::vector< std::pair< ViewEdge *,bool >,std::allocator< std::pair< ViewEdge *,bool > > > *|NonTVertex::edges_container *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t = {"_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t", "std::vector< unsigned int,std::allocator< unsigned int > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__mapTint_int_std__lessTint_t_std__allocatorTstd__pairTint_const_int_t_t_t = {"_p_std__mapTint_int_std__lessTint_t_std__allocatorTstd__pairTint_const_int_t_t_t", "std::map<int,int > *|ViewMap::id_to_index_map *|std::map<int,int,std::less<int >,std::allocator<std::pair<int const,int > > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__pairTViewEdge_p_bool_t = {"_p_std__pairTViewEdge_p_bool_t", "std::pair<ViewEdge *,bool > *|::ViewVertex::directedViewEdge *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t = {"_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t", "std::vector<FEdge * > *|std::vector<FEdge *,std::allocator<FEdge * > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__allocator_type = {"_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__allocator_type", "std::allocator<FEdge * > *|std::vector<FEdge * >::allocator_type *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorTMaterial_std__allocatorTMaterial_t_t = {"_p_std__vectorTMaterial_std__allocatorTMaterial_t_t", "std::vector<Material > *|std::vector<Material,std::allocator<Material > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t = {"_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t", "std::vector<SVertex * > *|ViewMap::svertices_container *|std::vector<SVertex *,std::allocator<SVertex * > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__allocator_type = {"_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__allocator_type", "std::allocator<SVertex * > *|std::vector<SVertex * >::allocator_type *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t = {"_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t", "std::vector<StrokeShader * > *|std::vector<StrokeShader *,std::allocator<StrokeShader * > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__allocator_type = {"_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__allocator_type", "std::allocator<StrokeShader * > *|std::vector<StrokeShader * >::allocator_type *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorTTVertex_p_std__allocatorTTVertex_p_t_t = {"_p_std__vectorTTVertex_p_std__allocatorTTVertex_p_t_t", "std::vector<TVertex * > *|std::vector<TVertex *,std::allocator<TVertex * > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorTVecMat__Vec2Tdouble_t_std__allocatorTVecMat__Vec2Tdouble_t_t_t = {"_p_std__vectorTVecMat__Vec2Tdouble_t_std__allocatorTVecMat__Vec2Tdouble_t_t_t", "std::vector<VecMat::Vec2<double > > *|std::vector<Geometry::Vec2r > *|std::vector<VecMat::Vec2<double >,std::allocator<VecMat::Vec2<double > > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t = {"_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t", "std::vector<ViewEdge * > *|std::vector<ViewEdge *,std::allocator<ViewEdge * > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__allocator_type = {"_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__allocator_type", "std::allocator<ViewEdge * > *|std::vector<ViewEdge * >::allocator_type *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t = {"_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t", "std::vector<ViewShape * > *|std::vector<ViewShape *,std::allocator<ViewShape * > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__allocator_type = {"_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__allocator_type", "std::allocator<ViewShape * > *|std::vector<ViewShape * >::allocator_type *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t = {"_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t", "std::vector<ViewVertex * > *|std::vector<ViewVertex *,std::allocator<ViewVertex * > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__allocator_type = {"_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__allocator_type", "std::allocator<ViewVertex * > *|std::vector<ViewVertex * >::allocator_type *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorTint_std__allocatorTint_t_t = {"_p_std__vectorTint_std__allocatorTint_t_t", "std::vector<int > *|std::vector<int,std::allocator<int > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorTint_std__allocatorTint_t_t__allocator_type = {"_p_std__vectorTint_std__allocatorTint_t_t__allocator_type", "std::allocator<int > *|std::vector<int >::allocator_type *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorTstd__pairTViewEdge_p_bool_t_std__allocatorTstd__pairTViewEdge_p_bool_t_t_t = {"_p_std__vectorTstd__pairTViewEdge_p_bool_t_std__allocatorTstd__pairTViewEdge_p_bool_t_t_t", "std::vector<std::pair<ViewEdge *,bool > > *|std::vector<ViewVertex::directedViewEdge > *|std::vector<std::pair<ViewEdge *,bool >,std::allocator<std::pair<ViewEdge *,bool > > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorTunsigned_int_std__allocatorTunsigned_int_t_t = {"_p_std__vectorTunsigned_int_std__allocatorTunsigned_int_t_t", "std::vector<unsigned int,std::allocator<unsigned int > > *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svertices_container = {"_p_svertices_container", "svertices_container *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_swig__PySwigIterator = {"_p_swig__PySwigIterator", "swig::PySwigIterator *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_unsigned_int = {"_p_unsigned_int", "VecMat::Vec2< unsigned int >::value_type *|VecMat::Vec3< unsigned int >::value_type *|unsigned int *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_unsigned_short = {"_p_unsigned_short", "Nature::VertexNature *|Nature::EdgeNature *|unsigned short *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_unsigned_int = {"_p_unsigned_int", "unsigned int *|VecMat::Vec3<unsigned int >::value_type *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_unsigned_short = {"_p_unsigned_short", "unsigned short *|Nature::EdgeNature *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_value_type = {"_p_value_type", "value_type *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_vertex_container = {"_p_vertex_container", "vertex_container *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_vertex_iterator = {"_p_vertex_iterator", "vertex_iterator *", 0, 0, (void*)0, 0};
@@ -109360,16 +110506,16 @@ static swig_type_info _swigt__p_viewedges_container = {"_p_viewedges_container",
 static swig_type_info _swigt__p_viewshapes_container = {"_p_viewshapes_container", "viewshapes_container *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_viewvertices_container = {"_p_viewvertices_container", "viewvertices_container *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_void = {"_p_void", "void *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type = {"_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type", "std::vector< FEdge * >::value_type|FEdge *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type = {"_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type", "std::vector< SVertex * >::value_type|SVertex *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type = {"_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type", "std::vector< StrokeShader * >::value_type|StrokeShader *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type = {"_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type", "std::vector< ViewEdge * >::value_type|ViewEdge *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type = {"_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type", "std::vector< ViewShape * >::value_type|ViewShape *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type = {"_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type", "std::vector< ViewVertex * >::value_type|ViewVertex *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type = {"_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type", "FEdge *|std::vector<FEdge * >::value_type", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type = {"_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type", "SVertex *|std::vector<SVertex * >::value_type", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type = {"_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type", "StrokeShader *|std::vector<StrokeShader * >::value_type", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type = {"_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type", "ViewEdge *|std::vector<ViewEdge * >::value_type", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type = {"_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type", "ViewShape *|std::vector<ViewShape * >::value_type", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type = {"_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type", "ViewVertex *|std::vector<ViewVertex * >::value_type", 0, 0, (void*)0, 0};
 
 static swig_type_info *swig_type_initial[] = {
   &_swigt__p_AdjacencyIterator,
-  &_swigt__p_BBoxT_VecMat__Vec3T_double_t_t,
+  &_swigt__p_BBoxTVecMat__Vec3Tdouble_t_t,
   &_swigt__p_BinaryPredicate0D,
   &_swigt__p_BinaryPredicate1D,
   &_swigt__p_CalligraphicShader,
@@ -109520,56 +110666,56 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_StrokesContainer,
   &_swigt__p_StyleModule,
   &_swigt__p_TVertex,
-  &_swigt__p_UnaryFunction0DT_Id_t,
-  &_swigt__p_UnaryFunction0DT_VecMat__Vec2T_float_t_t,
-  &_swigt__p_UnaryFunction0DT_VecMat__Vec3T_float_t_t,
-  &_swigt__p_UnaryFunction0DT_ViewShape_p_t,
-  &_swigt__p_UnaryFunction0DT_double_t,
-  &_swigt__p_UnaryFunction0DT_float_t,
-  &_swigt__p_UnaryFunction0DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t,
-  &_swigt__p_UnaryFunction0DT_unsigned_int_t,
-  &_swigt__p_UnaryFunction0DT_void_t,
-  &_swigt__p_UnaryFunction1DT_VecMat__Vec2T_float_t_t,
-  &_swigt__p_UnaryFunction1DT_VecMat__Vec3T_float_t_t,
-  &_swigt__p_UnaryFunction1DT_double_t,
-  &_swigt__p_UnaryFunction1DT_float_t,
-  &_swigt__p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t,
-  &_swigt__p_UnaryFunction1DT_unsigned_int_t,
-  &_swigt__p_UnaryFunction1DT_void_t,
+  &_swigt__p_UnaryFunction0DTId_t,
+  &_swigt__p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t,
+  &_swigt__p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t,
+  &_swigt__p_UnaryFunction0DTViewShape_p_t,
+  &_swigt__p_UnaryFunction0DTdouble_t,
+  &_swigt__p_UnaryFunction0DTfloat_t,
+  &_swigt__p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t,
+  &_swigt__p_UnaryFunction0DTunsigned_int_t,
+  &_swigt__p_UnaryFunction0DTvoid_t,
+  &_swigt__p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t,
+  &_swigt__p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t,
+  &_swigt__p_UnaryFunction1DTdouble_t,
+  &_swigt__p_UnaryFunction1DTfloat_t,
+  &_swigt__p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t,
+  &_swigt__p_UnaryFunction1DTunsigned_int_t,
+  &_swigt__p_UnaryFunction1DTvoid_t,
   &_swigt__p_UnaryPredicate0D,
   &_swigt__p_UnaryPredicate1D,
-  &_swigt__p_VecMat__HVec3T_double_t,
-  &_swigt__p_VecMat__HVec3T_float_t,
-  &_swigt__p_VecMat__HVec3T_int_t,
-  &_swigt__p_VecMat__HVec3T_unsigned_int_t,
-  &_swigt__p_VecMat__SquareMatrixT_double_2_t,
-  &_swigt__p_VecMat__SquareMatrixT_double_3_t,
-  &_swigt__p_VecMat__SquareMatrixT_double_4_t,
-  &_swigt__p_VecMat__SquareMatrixT_float_2_t,
-  &_swigt__p_VecMat__SquareMatrixT_float_3_t,
-  &_swigt__p_VecMat__SquareMatrixT_float_4_t,
-  &_swigt__p_VecMat__SquareMatrixT_int_2_t,
-  &_swigt__p_VecMat__SquareMatrixT_int_3_t,
-  &_swigt__p_VecMat__SquareMatrixT_int_4_t,
-  &_swigt__p_VecMat__SquareMatrixT_unsigned_int_2_t,
-  &_swigt__p_VecMat__SquareMatrixT_unsigned_int_3_t,
-  &_swigt__p_VecMat__SquareMatrixT_unsigned_int_4_t,
-  &_swigt__p_VecMat__Vec2T_double_t,
-  &_swigt__p_VecMat__Vec2T_float_t,
-  &_swigt__p_VecMat__Vec2T_int_t,
-  &_swigt__p_VecMat__Vec2T_unsigned_int_t,
-  &_swigt__p_VecMat__Vec3T_double_t,
-  &_swigt__p_VecMat__Vec3T_float_t,
-  &_swigt__p_VecMat__Vec3T_int_t,
-  &_swigt__p_VecMat__Vec3T_unsigned_int_t,
-  &_swigt__p_VecMat__VecT_double_2_t,
-  &_swigt__p_VecMat__VecT_double_3_t,
-  &_swigt__p_VecMat__VecT_float_2_t,
-  &_swigt__p_VecMat__VecT_float_3_t,
-  &_swigt__p_VecMat__VecT_int_2_t,
-  &_swigt__p_VecMat__VecT_int_3_t,
-  &_swigt__p_VecMat__VecT_unsigned_int_2_t,
-  &_swigt__p_VecMat__VecT_unsigned_int_3_t,
+  &_swigt__p_VecMat__HVec3Tdouble_t,
+  &_swigt__p_VecMat__HVec3Tfloat_t,
+  &_swigt__p_VecMat__HVec3Tint_t,
+  &_swigt__p_VecMat__HVec3Tunsigned_int_t,
+  &_swigt__p_VecMat__SquareMatrixTdouble_2_t,
+  &_swigt__p_VecMat__SquareMatrixTdouble_3_t,
+  &_swigt__p_VecMat__SquareMatrixTdouble_4_t,
+  &_swigt__p_VecMat__SquareMatrixTfloat_2_t,
+  &_swigt__p_VecMat__SquareMatrixTfloat_3_t,
+  &_swigt__p_VecMat__SquareMatrixTfloat_4_t,
+  &_swigt__p_VecMat__SquareMatrixTint_2_t,
+  &_swigt__p_VecMat__SquareMatrixTint_3_t,
+  &_swigt__p_VecMat__SquareMatrixTint_4_t,
+  &_swigt__p_VecMat__SquareMatrixTunsigned_int_2_t,
+  &_swigt__p_VecMat__SquareMatrixTunsigned_int_3_t,
+  &_swigt__p_VecMat__SquareMatrixTunsigned_int_4_t,
+  &_swigt__p_VecMat__Vec2Tdouble_t,
+  &_swigt__p_VecMat__Vec2Tfloat_t,
+  &_swigt__p_VecMat__Vec2Tint_t,
+  &_swigt__p_VecMat__Vec2Tunsigned_int_t,
+  &_swigt__p_VecMat__Vec3Tdouble_t,
+  &_swigt__p_VecMat__Vec3Tfloat_t,
+  &_swigt__p_VecMat__Vec3Tint_t,
+  &_swigt__p_VecMat__Vec3Tunsigned_int_t,
+  &_swigt__p_VecMat__VecTdouble_2_t,
+  &_swigt__p_VecMat__VecTdouble_3_t,
+  &_swigt__p_VecMat__VecTfloat_2_t,
+  &_swigt__p_VecMat__VecTfloat_3_t,
+  &_swigt__p_VecMat__VecTint_2_t,
+  &_swigt__p_VecMat__VecTint_3_t,
+  &_swigt__p_VecMat__VecTunsigned_int_2_t,
+  &_swigt__p_VecMat__VecTunsigned_int_3_t,
   &_swigt__p_Vertex,
   &_swigt__p_ViewEdge,
   &_swigt__p_ViewEdgeInternal__SVertexIterator,
@@ -109577,8 +110723,8 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_ViewMap,
   &_swigt__p_ViewShape,
   &_swigt__p_ViewVertex,
-  &_swigt__p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_const_traits_t,
-  &_swigt__p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_nonconst_traits_t,
+  &_swigt__p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t,
+  &_swigt__p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t,
   &_swigt__p_ViewVertexInternal__orientedViewEdgeIterator,
   &_swigt__p_ViewVertexInternal__orientedViewEdgeIterator__edge_pointers_container__iterator,
   &_swigt__p_ViewVertexInternal__orientedViewEdgeIterator__edges_container__iterator,
@@ -109608,30 +110754,30 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_point_iterator,
   &_swigt__p_point_type,
   &_swigt__p_reference,
-  &_swigt__p_setT_VecMat__Vec3T_double_t_t,
+  &_swigt__p_setTVecMat__Vec3Tdouble_t_t,
   &_swigt__p_size_type,
   &_swigt__p_std__invalid_argument,
-  &_swigt__p_std__mapT_int_int_std__lessT_int_t_std__allocatorT_std__pairT_int_const_int_t_t_t,
-  &_swigt__p_std__pairT_ViewEdge_p_bool_t,
-  &_swigt__p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t,
-  &_swigt__p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__allocator_type,
-  &_swigt__p_std__vectorT_Material_std__allocatorT_Material_t_t,
-  &_swigt__p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t,
-  &_swigt__p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__allocator_type,
-  &_swigt__p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t,
-  &_swigt__p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__allocator_type,
-  &_swigt__p_std__vectorT_TVertex_p_std__allocatorT_TVertex_p_t_t,
-  &_swigt__p_std__vectorT_VecMat__Vec2T_double_t_std__allocatorT_VecMat__Vec2T_double_t_t_t,
-  &_swigt__p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t,
-  &_swigt__p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__allocator_type,
-  &_swigt__p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t,
-  &_swigt__p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__allocator_type,
-  &_swigt__p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t,
-  &_swigt__p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__allocator_type,
-  &_swigt__p_std__vectorT_int_std__allocatorT_int_t_t,
-  &_swigt__p_std__vectorT_int_std__allocatorT_int_t_t__allocator_type,
-  &_swigt__p_std__vectorT_std__pairT_ViewEdge_p_bool_t_std__allocatorT_std__pairT_ViewEdge_p_bool_t_t_t,
-  &_swigt__p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t,
+  &_swigt__p_std__mapTint_int_std__lessTint_t_std__allocatorTstd__pairTint_const_int_t_t_t,
+  &_swigt__p_std__pairTViewEdge_p_bool_t,
+  &_swigt__p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t,
+  &_swigt__p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__allocator_type,
+  &_swigt__p_std__vectorTMaterial_std__allocatorTMaterial_t_t,
+  &_swigt__p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t,
+  &_swigt__p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__allocator_type,
+  &_swigt__p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t,
+  &_swigt__p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__allocator_type,
+  &_swigt__p_std__vectorTTVertex_p_std__allocatorTTVertex_p_t_t,
+  &_swigt__p_std__vectorTVecMat__Vec2Tdouble_t_std__allocatorTVecMat__Vec2Tdouble_t_t_t,
+  &_swigt__p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t,
+  &_swigt__p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__allocator_type,
+  &_swigt__p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t,
+  &_swigt__p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__allocator_type,
+  &_swigt__p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t,
+  &_swigt__p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__allocator_type,
+  &_swigt__p_std__vectorTint_std__allocatorTint_t_t,
+  &_swigt__p_std__vectorTint_std__allocatorTint_t_t__allocator_type,
+  &_swigt__p_std__vectorTstd__pairTViewEdge_p_bool_t_std__allocatorTstd__pairTViewEdge_p_bool_t_t_t,
+  &_swigt__p_std__vectorTunsigned_int_std__allocatorTunsigned_int_t_t,
   &_swigt__p_svertices_container,
   &_swigt__p_swig__PySwigIterator,
   &_swigt__p_unsigned_int,
@@ -109645,16 +110791,16 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_viewshapes_container,
   &_swigt__p_viewvertices_container,
   &_swigt__p_void,
-  &_swigt__std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type,
-  &_swigt__std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type,
-  &_swigt__std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type,
-  &_swigt__std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type,
-  &_swigt__std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type,
-  &_swigt__std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type,
+  &_swigt__std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type,
+  &_swigt__std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type,
+  &_swigt__std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type,
+  &_swigt__std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type,
+  &_swigt__std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type,
+  &_swigt__std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type,
 };
 
 static swig_cast_info _swigc__p_AdjacencyIterator[] = {  {&_swigt__p_AdjacencyIterator, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_BBoxT_VecMat__Vec3T_double_t_t[] = {  {&_swigt__p_BBoxT_VecMat__Vec3T_double_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_BBoxTVecMat__Vec3Tdouble_t_t[] = {  {&_swigt__p_BBoxTVecMat__Vec3Tdouble_t_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_BinaryPredicate0D[] = {  {&_swigt__p_BinaryPredicate0D, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_BinaryPredicate1D[] = {  {&_swigt__p_Predicates1D__Length2DBP1D, _p_Predicates1D__Length2DBP1DTo_p_BinaryPredicate1D, 0, 0},  {&_swigt__p_Predicates1D__FalseBP1D, _p_Predicates1D__FalseBP1DTo_p_BinaryPredicate1D, 0, 0},  {&_swigt__p_BinaryPredicate1D, 0, 0, 0},  {&_swigt__p_Predicates1D__ViewMapGradientNormBP1D, _p_Predicates1D__ViewMapGradientNormBP1DTo_p_BinaryPredicate1D, 0, 0},  {&_swigt__p_Predicates1D__TrueBP1D, _p_Predicates1D__TrueBP1DTo_p_BinaryPredicate1D, 0, 0},  {&_swigt__p_Predicates1D__SameShapeIdBP1D, _p_Predicates1D__SameShapeIdBP1DTo_p_BinaryPredicate1D, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CalligraphicShader[] = {  {&_swigt__p_CalligraphicShader, 0, 0, 0},{0, 0, 0, 0}};
@@ -109668,7 +110814,7 @@ static swig_cast_info _swigc__p_Curve[] = {  {&_swigt__p_Curve, 0, 0, 0},{0, 0,
 static swig_cast_info _swigc__p_CurveInternal__CurvePointIterator[] = {  {&_swigt__p_CurveInternal__CurvePointIterator, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CurvePoint[] = {  {&_swigt__p_StrokeVertex, _p_StrokeVertexTo_p_CurvePoint, 0, 0},  {&_swigt__p_CurvePoint, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_Curve__vertex_container__iterator[] = {  {&_swigt__p_Curve__vertex_container__iterator, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_FEdge[] = {  {&_swigt__std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_FEdge, 0, 0, 0},  {&_swigt__p_FEdgeSharp, _p_FEdgeSharpTo_p_FEdge, 0, 0},  {&_swigt__p_FEdgeSmooth, _p_FEdgeSmoothTo_p_FEdge, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_FEdge[] = {  {&_swigt__p_FEdge, 0, 0, 0},  {&_swigt__p_FEdgeSharp, _p_FEdgeSharpTo_p_FEdge, 0, 0},  {&_swigt__p_FEdgeSmooth, _p_FEdgeSmoothTo_p_FEdge, 0, 0},  {&_swigt__std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_FEdgeInternal__SVertexIterator[] = {  {&_swigt__p_FEdgeInternal__SVertexIterator, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_FEdgeSharp[] = {  {&_swigt__p_FEdgeSharp, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_FEdgeSmooth[] = {  {&_swigt__p_FEdgeSmooth, 0, 0, 0},{0, 0, 0, 0}};
@@ -109727,10 +110873,10 @@ static swig_cast_info _swigc__p_GrayImage[] = {  {&_swigt__p_GrayImage, 0, 0, 0}
 static swig_cast_info _swigc__p_I1DContainer[] = {  {&_swigt__p_I1DContainer, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_Id[] = {  {&_swigt__p_Id, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_IntegrationType[] = {  {&_swigt__p_IntegrationType, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_Interface0D[] = {  {&_swigt__std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, _p_ViewVertexTo_p_Interface0D, 0, 0},  {&_swigt__p_TVertex, _p_TVertexTo_p_Interface0D, 0, 0},  {&_swigt__p_NonTVertex, _p_NonTVertexTo_p_Interface0D, 0, 0},  {&_swigt__p_Interface0D, 0, 0, 0},  {&_swigt__p_ViewVertex, _p_ViewVertexTo_p_Interface0D, 0, 0},  {&_swigt__p_SVertex, _p_SVertexTo_p_Interface0D, 0, 0},  {&_swigt__std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, _p_SVertexTo_p_Interface0D, 0, 0},  {&_swigt__p_StrokeVertex, _p_StrokeVertexTo_p_Interface0D, 0, 0},  {&_swigt__p_CurvePoint, _p_CurvePointTo_p_Interface0D, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Interface0D[] = {  {&_swigt__std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, _p_SVertexTo_p_Interface0D, 0, 0},  {&_swigt__p_TVertex, _p_TVertexTo_p_Interface0D, 0, 0},  {&_swigt__p_NonTVertex, _p_NonTVertexTo_p_Interface0D, 0, 0},  {&_swigt__p_Interface0D, 0, 0, 0},  {&_swigt__p_SVertex, _p_SVertexTo_p_Interface0D, 0, 0},  {&_swigt__p_ViewVertex, _p_ViewVertexTo_p_Interface0D, 0, 0},  {&_swigt__std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, _p_ViewVertexTo_p_Interface0D, 0, 0},  {&_swigt__p_StrokeVertex, _p_StrokeVertexTo_p_Interface0D, 0, 0},  {&_swigt__p_CurvePoint, _p_CurvePointTo_p_Interface0D, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_Interface0DIterator[] = {  {&_swigt__p_Interface0DIterator, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_Interface0DIteratorNested[] = {  {&_swigt__p_Interface0DIteratorNested, 0, 0, 0},  {&_swigt__p_FEdgeInternal__SVertexIterator, _p_FEdgeInternal__SVertexIteratorTo_p_Interface0DIteratorNested, 0, 0},  {&_swigt__p_ViewEdgeInternal__SVertexIterator, _p_ViewEdgeInternal__SVertexIteratorTo_p_Interface0DIteratorNested, 0, 0},  {&_swigt__p_CurveInternal__CurvePointIterator, _p_CurveInternal__CurvePointIteratorTo_p_Interface0DIteratorNested, 0, 0},  {&_swigt__p_StrokeInternal__StrokeVertexIterator, _p_StrokeInternal__StrokeVertexIteratorTo_p_Interface0DIteratorNested, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_Interface1D[] = {  {&_swigt__p_Interface1D, 0, 0, 0},  {&_swigt__std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_ViewEdge, _p_ViewEdgeTo_p_Interface1D, 0, 0},  {&_swigt__p_Curve, _p_CurveTo_p_Interface1D, 0, 0},  {&_swigt__p_Stroke, _p_StrokeTo_p_Interface1D, 0, 0},  {&_swigt__std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_FEdgeSharp, _p_FEdgeSharpTo_p_Interface1D, 0, 0},  {&_swigt__p_FEdgeSmooth, _p_FEdgeSmoothTo_p_Interface1D, 0, 0},  {&_swigt__p_FEdge, _p_FEdgeTo_p_Interface1D, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Interface1D[] = {  {&_swigt__p_Interface1D, 0, 0, 0},  {&_swigt__p_ViewEdge, _p_ViewEdgeTo_p_Interface1D, 0, 0},  {&_swigt__std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_Curve, _p_CurveTo_p_Interface1D, 0, 0},  {&_swigt__p_Stroke, _p_StrokeTo_p_Interface1D, 0, 0},  {&_swigt__p_FEdgeSharp, _p_FEdgeSharpTo_p_Interface1D, 0, 0},  {&_swigt__p_FEdgeSmooth, _p_FEdgeSmoothTo_p_Interface1D, 0, 0},  {&_swigt__p_FEdge, _p_FEdgeTo_p_Interface1D, 0, 0},  {&_swigt__std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_Material[] = {  {&_swigt__p_Material, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_MediumType[] = {  {&_swigt__p_MediumType, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_Module[] = {  {&_swigt__p_Module, 0, 0, 0},{0, 0, 0, 0}};
@@ -109760,7 +110906,7 @@ static swig_cast_info _swigc__p_Predicates1D__ViewMapGradientNormBP1D[] = {  {&_
 static swig_cast_info _swigc__p_RGBImage[] = {  {&_swigt__p_RGBImage, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_ReturnedValueType[] = {  {&_swigt__p_ReturnedValueType, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_SShape[] = {  {&_swigt__p_SShape, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_SVertex[] = {  {&_swigt__p_SVertex, 0, 0, 0},  {&_swigt__std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_SVertex[] = {  {&_swigt__std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_SVertex, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_SVertex__fedges_container__iterator[] = {  {&_swigt__p_SVertex__fedges_container__iterator, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_Smoother[] = {  {&_swigt__p_Smoother, 0, 0, 0},  {&_swigt__p_Omitter, _p_OmitterTo_p_Smoother, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_SmoothingShader[] = {  {&_swigt__p_SmoothingShader, 0, 0, 0},{0, 0, 0, 0}};
@@ -109771,7 +110917,7 @@ static swig_cast_info _swigc__p_StrokeAttribute[] = {  {&_swigt__p_StrokeAttribu
 static swig_cast_info _swigc__p_StrokeInternal__StrokeVertexIterator[] = {  {&_swigt__p_StrokeInternal__StrokeVertexIterator, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_StrokeLayer[] = {  {&_swigt__p_StrokeLayer, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_StrokeRenderer[] = {  {&_swigt__p_StrokeRenderer, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_StrokeShader[] = {  {&_swigt__p_StrokeShaders__ConstrainedIncreasingThicknessShader, _p_StrokeShaders__ConstrainedIncreasingThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_StrokeShaders__ColorNoiseShader, _p_StrokeShaders__ColorNoiseShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ThicknessNoiseShader, _p_StrokeShaders__ThicknessNoiseShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__LengthDependingThicknessShader, _p_StrokeShaders__LengthDependingThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__IncreasingThicknessShader, _p_StrokeShaders__IncreasingThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ConstantExternThicknessShader, _p_StrokeShaders__ConstantExternThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ConstantThicknessShader, _p_StrokeShaders__ConstantThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__StrokeTextureShader, _p_StrokeShaders__StrokeTextureShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__SamplingShader, _p_StrokeShaders__SamplingShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__BSplineShader, _p_StrokeShaders__BSplineShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__BezierCurveShader, _p_StrokeShaders__BezierCurveShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__InflateShader, _p_StrokeShaders__InflateShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShader, 0, 0, 0},  {&_swigt__p_StrokeShaders__GuidingLinesShader, _p_StrokeShaders__GuidingLinesShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__streamShader, _p_StrokeShaders__streamShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__fstreamShader, _p_StrokeShaders__fstreamShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_CalligraphicShader, _p_CalligraphicShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_SpatialNoiseShader, _p_SpatialNoiseShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_SmoothingShader, _p_SmoothingShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__TextureAssignerShader, _p_StrokeShaders__TextureAssignerShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__CalligraphicColorShader, _p_StrokeShaders__CalligraphicColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__MaterialColorShader, _p_StrokeShaders__MaterialColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ColorVariationPatternShader, _p_StrokeShaders__ColorVariationPatternShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__IncreasingColorShader, _p_StrokeShaders__IncreasingColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ConstantColorShader, _p_StrokeShaders__ConstantColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ThicknessVariationPatternShader, _p_StrokeShaders__ThicknessVariationPatternShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__BackboneStretcherShader, _p_StrokeShaders__BackboneStretcherShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ExternalContourStretcherShader, _p_StrokeShaders__ExternalContourStretcherShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__PolygonalizationShader, _p_StrokeShaders__PolygonalizationShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__TipRemoverShader, _p_StrokeShaders__TipRemoverShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_OmissionShader, _p_OmissionShaderTo_p_StrokeShader, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_StrokeShader[] = {  {&_swigt__p_StrokeShaders__ConstrainedIncreasingThicknessShader, _p_StrokeShaders__ConstrainedIncreasingThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_StrokeShaders__ColorNoiseShader, _p_StrokeShaders__ColorNoiseShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ThicknessNoiseShader, _p_StrokeShaders__ThicknessNoiseShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__LengthDependingThicknessShader, _p_StrokeShaders__LengthDependingThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__IncreasingThicknessShader, _p_StrokeShaders__IncreasingThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ConstantExternThicknessShader, _p_StrokeShaders__ConstantExternThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ConstantThicknessShader, _p_StrokeShaders__ConstantThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__StrokeTextureShader, _p_StrokeShaders__StrokeTextureShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__SamplingShader, _p_StrokeShaders__SamplingShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__BSplineShader, _p_StrokeShaders__BSplineShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__BezierCurveShader, _p_StrokeShaders__BezierCurveShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__InflateShader, _p_StrokeShaders__InflateShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShader, 0, 0, 0},  {&_swigt__p_StrokeShaders__GuidingLinesShader, _p_StrokeShaders__GuidingLinesShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__streamShader, _p_StrokeShaders__streamShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__fstreamShader, _p_StrokeShaders__fstreamShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_CalligraphicShader, _p_CalligraphicShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_SpatialNoiseShader, _p_SpatialNoiseShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_SmoothingShader, _p_SmoothingShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__TextureAssignerShader, _p_StrokeShaders__TextureAssignerShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__CalligraphicColorShader, _p_StrokeShaders__CalligraphicColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__MaterialColorShader, _p_StrokeShaders__MaterialColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ColorVariationPatternShader, _p_StrokeShaders__ColorVariationPatternShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__IncreasingColorShader, _p_StrokeShaders__IncreasingColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ConstantColorShader, _p_StrokeShaders__ConstantColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ThicknessVariationPatternShader, _p_StrokeShaders__ThicknessVariationPatternShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__BackboneStretcherShader, _p_StrokeShaders__BackboneStretcherShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ExternalContourStretcherShader, _p_StrokeShaders__ExternalContourStretcherShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__PolygonalizationShader, _p_StrokeShaders__PolygonalizationShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__TipRemoverShader, _p_StrokeShaders__TipRemoverShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_OmissionShader, _p_OmissionShaderTo_p_StrokeShader, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_StrokeShaders__BSplineShader[] = {  {&_swigt__p_StrokeShaders__BSplineShader, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_StrokeShaders__BackboneStretcherShader[] = {  {&_swigt__p_StrokeShaders__BackboneStretcherShader, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_StrokeShaders__BezierCurveShader[] = {  {&_swigt__p_StrokeShaders__BezierCurveShader, 0, 0, 0},{0, 0, 0, 0}};
@@ -109805,65 +110951,65 @@ static swig_cast_info _swigc__p_Stroke__viewedge_container__iterator[] = {  {&_s
 static swig_cast_info _swigc__p_StrokesContainer[] = {  {&_swigt__p_StrokesContainer, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_StyleModule[] = {  {&_swigt__p_StyleModule, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_TVertex[] = {  {&_swigt__p_TVertex, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction0DT_Id_t[] = {  {&_swigt__p_Functions0D__ShapeIdF0D, _p_Functions0D__ShapeIdF0DTo_p_UnaryFunction0DT_Id_t, 0, 0},  {&_swigt__p_UnaryFunction0DT_Id_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction0DT_VecMat__Vec2T_float_t_t[] = {  {&_swigt__p_UnaryFunction0DT_VecMat__Vec2T_float_t_t, 0, 0, 0},  {&_swigt__p_Functions0D__VertexOrientation2DF0D, _p_Functions0D__VertexOrientation2DF0DTo_p_UnaryFunction0DT_VecMat__Vec2T_float_t_t, 0, 0},  {&_swigt__p_Functions0D__Normal2DF0D, _p_Functions0D__Normal2DF0DTo_p_UnaryFunction0DT_VecMat__Vec2T_float_t_t, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction0DT_VecMat__Vec3T_float_t_t[] = {  {&_swigt__p_Functions0D__VertexOrientation3DF0D, _p_Functions0D__VertexOrientation3DF0DTo_p_UnaryFunction0DT_VecMat__Vec3T_float_t_t, 0, 0},  {&_swigt__p_UnaryFunction0DT_VecMat__Vec3T_float_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction0DT_ViewShape_p_t[] = {  {&_swigt__p_Functions0D__GetShapeF0D, _p_Functions0D__GetShapeF0DTo_p_UnaryFunction0DT_ViewShape_p_t, 0, 0},  {&_swigt__p_Functions0D__GetOccludeeF0D, _p_Functions0D__GetOccludeeF0DTo_p_UnaryFunction0DT_ViewShape_p_t, 0, 0},  {&_swigt__p_UnaryFunction0DT_ViewShape_p_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction0DT_double_t[] = {  {&_swigt__p_UnaryFunction0DT_double_t, 0, 0, 0},  {&_swigt__p_Functions0D__ZDiscontinuityF0D, _p_Functions0D__ZDiscontinuityF0DTo_p_UnaryFunction0DT_double_t, 0, 0},  {&_swigt__p_Functions0D__DensityF0D, _p_Functions0D__DensityF0DTo_p_UnaryFunction0DT_double_t, 0, 0},  {&_swigt__p_Functions0D__GetXF0D, _p_Functions0D__GetXF0DTo_p_UnaryFunction0DT_double_t, 0, 0},  {&_swigt__p_Functions0D__GetProjectedXF0D, _p_Functions0D__GetProjectedXF0DTo_p_UnaryFunction0DT_double_t, 0, 0},  {&_swigt__p_Functions0D__Curvature2DAngleF0D, _p_Functions0D__Curvature2DAngleF0DTo_p_UnaryFunction0DT_double_t, 0, 0},  {&_swigt__p_Functions0D__GetYF0D, _p_Functions0D__GetYF0DTo_p_UnaryFunction0DT_double_t, 0, 0},  {&_swigt__p_Functions0D__GetProjectedYF0D, _p_Functions0D__GetProjectedYF0DTo_p_UnaryFunction0DT_double_t, 0, 0},  {&_swigt__p_Functions0D__GetZF0D, _p_Functions0D__GetZF0DTo_p_UnaryFunction0DT_double_t, 0, 0},  {&_swigt__p_Functions0D__GetProjectedZF0D, _p_Functions0D__GetProjectedZF0DTo_p_UnaryFunction0DT_double_t, 0, 0},  {&_swigt__p_Functions0D__LocalAverageDepthF0D, _p_Functions0D__LocalAverageDepthF0DTo_p_UnaryFunction0DT_double_t, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction0DT_float_t[] = {  {&_swigt__p_Functions0D__GetCurvilinearAbscissaF0D, _p_Functions0D__GetCurvilinearAbscissaF0DTo_p_UnaryFunction0DT_float_t, 0, 0},  {&_swigt__p_Functions0D__ReadMapPixelF0D, _p_Functions0D__ReadMapPixelF0DTo_p_UnaryFunction0DT_float_t, 0, 0},  {&_swigt__p_Functions0D__ReadSteerableViewMapPixelF0D, _p_Functions0D__ReadSteerableViewMapPixelF0DTo_p_UnaryFunction0DT_float_t, 0, 0},  {&_swigt__p_Functions0D__ReadCompleteViewMapPixelF0D, _p_Functions0D__ReadCompleteViewMapPixelF0DTo_p_UnaryFunction0DT_float_t, 0, 0},  {&_swigt__p_Functions0D__GetViewMapGradientNormF0D, _p_Functions0D__GetViewMapGradientNormF0DTo_p_UnaryFunction0DT_float_t, 0, 0},  {&_swigt__p_UnaryFunction0DT_float_t, 0, 0, 0},  {&_swigt__p_Functions0D__GetParameterF0D, _p_Functions0D__GetParameterF0DTo_p_UnaryFunction0DT_float_t, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction0DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t[] = {  {&_swigt__p_Functions0D__GetOccludersF0D, _p_Functions0D__GetOccludersF0DTo_p_UnaryFunction0DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, 0, 0},  {&_swigt__p_UnaryFunction0DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction0DT_unsigned_int_t[] = {  {&_swigt__p_Functions0D__QuantitativeInvisibilityF0D, _p_Functions0D__QuantitativeInvisibilityF0DTo_p_UnaryFunction0DT_unsigned_int_t, 0, 0},  {&_swigt__p_UnaryFunction0DT_unsigned_int_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction0DT_void_t[] = {  {&_swigt__p_UnaryFunction0DT_void_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction1DT_VecMat__Vec2T_float_t_t[] = {  {&_swigt__p_Functions1D__Orientation2DF1D, _p_Functions1D__Orientation2DF1DTo_p_UnaryFunction1DT_VecMat__Vec2T_float_t_t, 0, 0},  {&_swigt__p_UnaryFunction1DT_VecMat__Vec2T_float_t_t, 0, 0, 0},  {&_swigt__p_Functions1D__Normal2DF1D, _p_Functions1D__Normal2DF1DTo_p_UnaryFunction1DT_VecMat__Vec2T_float_t_t, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction1DT_VecMat__Vec3T_float_t_t[] = {  {&_swigt__p_UnaryFunction1DT_VecMat__Vec3T_float_t_t, 0, 0, 0},  {&_swigt__p_Functions1D__Orientation3DF1D, _p_Functions1D__Orientation3DF1DTo_p_UnaryFunction1DT_VecMat__Vec3T_float_t_t, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction1DT_double_t[] = {  {&_swigt__p_Functions1D__GetSteerableViewMapDensityF1D, _p_Functions1D__GetSteerableViewMapDensityF1DTo_p_UnaryFunction1DT_double_t, 0, 0},  {&_swigt__p_Functions1D__GetDirectionalViewMapDensityF1D, _p_Functions1D__GetDirectionalViewMapDensityF1DTo_p_UnaryFunction1DT_double_t, 0, 0},  {&_swigt__p_Functions1D__GetCompleteViewMapDensityF1D, _p_Functions1D__GetCompleteViewMapDensityF1DTo_p_UnaryFunction1DT_double_t, 0, 0},  {&_swigt__p_Functions1D__DensityF1D, _p_Functions1D__DensityF1DTo_p_UnaryFunction1DT_double_t, 0, 0},  {&_swigt__p_Functions1D__ZDiscontinuityF1D, _p_Functions1D__ZDiscontinuityF1DTo_p_UnaryFunction1DT_double_t, 0, 0},  {&_swigt__p_Functions1D__GetXF1D, _p_Functions1D__GetXF1DTo_p_UnaryFunction1DT_double_t, 0, 0},  {&_swigt__p_Functions1D__GetZF1D, _p_Functions1D__GetZF1DTo_p_UnaryFunction1DT_double_t, 0, 0},  {&_swigt__p_Functions1D__GetViewMapGradientNormF1D, _p_Functions1D__GetViewMapGradientNormF1DTo_p_UnaryFunction1DT_double_t, 0, 0},  {&_swigt__p_Functions1D__GetProjectedYF1D, _p_Functions1D__GetProjectedYF1DTo_p_UnaryFunction1DT_double_t, 0, 0},  {&_swigt__p_UnaryFunction1DT_double_t, 0, 0, 0},  {&_swigt__p_Functions1D__Curvature2DAngleF1D, _p_Functions1D__Curvature2DAngleF1DTo_p_UnaryFunction1DT_double_t, 0, 0},  {&_swigt__p_Functions1D__GetYF1D, _p_Functions1D__GetYF1DTo_p_UnaryFunction1DT_double_t, 0, 0},  {&_swigt__p_Functions1D__GetProjectedXF1D, _p_Functions1D__GetProjectedXF1DTo_p_UnaryFunction1DT_double_t, 0, 0},  {&_swigt__p_Functions1D__LocalAverageDepthF1D, _p_Functions1D__LocalAverageDepthF1DTo_p_UnaryFunction1DT_double_t, 0, 0},  {&_swigt__p_Functions1D__GetProjectedZF1D, _p_Functions1D__GetProjectedZF1DTo_p_UnaryFunction1DT_double_t, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction1DT_float_t[] = {  {&_swigt__p_UnaryFunction1DT_float_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t[] = {  {&_swigt__p_Functions1D__GetOccludeeF1D, _p_Functions1D__GetOccludeeF1DTo_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, 0, 0},  {&_swigt__p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, 0, 0, 0},  {&_swigt__p_Functions1D__GetShapeF1D, _p_Functions1D__GetShapeF1DTo_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, 0, 0},  {&_swigt__p_Functions1D__GetOccludersF1D, _p_Functions1D__GetOccludersF1DTo_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction1DT_unsigned_int_t[] = {  {&_swigt__p_Functions1D__QuantitativeInvisibilityF1D, _p_Functions1D__QuantitativeInvisibilityF1DTo_p_UnaryFunction1DT_unsigned_int_t, 0, 0},  {&_swigt__p_UnaryFunction1DT_unsigned_int_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction1DT_void_t[] = {  {&_swigt__p_UnaryFunction1DT_void_t, 0, 0, 0},  {&_swigt__p_Functions1D__TimeStampF1D, _p_Functions1D__TimeStampF1DTo_p_UnaryFunction1DT_void_t, 0, 0},  {&_swigt__p_Functions1D__IncrementChainingTimeStampF1D, _p_Functions1D__IncrementChainingTimeStampF1DTo_p_UnaryFunction1DT_void_t, 0, 0},  {&_swigt__p_Functions1D__ChainingTimeStampF1D, _p_Functions1D__ChainingTimeStampF1DTo_p_UnaryFunction1DT_void_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction0DTId_t[] = {  {&_swigt__p_UnaryFunction0DTId_t, 0, 0, 0},  {&_swigt__p_Functions0D__ShapeIdF0D, _p_Functions0D__ShapeIdF0DTo_p_UnaryFunction0DTId_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t[] = {  {&_swigt__p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t, 0, 0, 0},  {&_swigt__p_Functions0D__VertexOrientation2DF0D, _p_Functions0D__VertexOrientation2DF0DTo_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t, 0, 0},  {&_swigt__p_Functions0D__Normal2DF0D, _p_Functions0D__Normal2DF0DTo_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t[] = {  {&_swigt__p_Functions0D__VertexOrientation3DF0D, _p_Functions0D__VertexOrientation3DF0DTo_p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t, 0, 0},  {&_swigt__p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction0DTViewShape_p_t[] = {  {&_swigt__p_Functions0D__GetShapeF0D, _p_Functions0D__GetShapeF0DTo_p_UnaryFunction0DTViewShape_p_t, 0, 0},  {&_swigt__p_Functions0D__GetOccludeeF0D, _p_Functions0D__GetOccludeeF0DTo_p_UnaryFunction0DTViewShape_p_t, 0, 0},  {&_swigt__p_UnaryFunction0DTViewShape_p_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction0DTdouble_t[] = {  {&_swigt__p_UnaryFunction0DTdouble_t, 0, 0, 0},  {&_swigt__p_Functions0D__ZDiscontinuityF0D, _p_Functions0D__ZDiscontinuityF0DTo_p_UnaryFunction0DTdouble_t, 0, 0},  {&_swigt__p_Functions0D__DensityF0D, _p_Functions0D__DensityF0DTo_p_UnaryFunction0DTdouble_t, 0, 0},  {&_swigt__p_Functions0D__GetXF0D, _p_Functions0D__GetXF0DTo_p_UnaryFunction0DTdouble_t, 0, 0},  {&_swigt__p_Functions0D__GetProjectedXF0D, _p_Functions0D__GetProjectedXF0DTo_p_UnaryFunction0DTdouble_t, 0, 0},  {&_swigt__p_Functions0D__Curvature2DAngleF0D, _p_Functions0D__Curvature2DAngleF0DTo_p_UnaryFunction0DTdouble_t, 0, 0},  {&_swigt__p_Functions0D__GetYF0D, _p_Functions0D__GetYF0DTo_p_UnaryFunction0DTdouble_t, 0, 0},  {&_swigt__p_Functions0D__GetProjectedYF0D, _p_Functions0D__GetProjectedYF0DTo_p_UnaryFunction0DTdouble_t, 0, 0},  {&_swigt__p_Functions0D__GetZF0D, _p_Functions0D__GetZF0DTo_p_UnaryFunction0DTdouble_t, 0, 0},  {&_swigt__p_Functions0D__GetProjectedZF0D, _p_Functions0D__GetProjectedZF0DTo_p_UnaryFunction0DTdouble_t, 0, 0},  {&_swigt__p_Functions0D__LocalAverageDepthF0D, _p_Functions0D__LocalAverageDepthF0DTo_p_UnaryFunction0DTdouble_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction0DTfloat_t[] = {  {&_swigt__p_Functions0D__GetCurvilinearAbscissaF0D, _p_Functions0D__GetCurvilinearAbscissaF0DTo_p_UnaryFunction0DTfloat_t, 0, 0},  {&_swigt__p_Functions0D__ReadMapPixelF0D, _p_Functions0D__ReadMapPixelF0DTo_p_UnaryFunction0DTfloat_t, 0, 0},  {&_swigt__p_Functions0D__ReadSteerableViewMapPixelF0D, _p_Functions0D__ReadSteerableViewMapPixelF0DTo_p_UnaryFunction0DTfloat_t, 0, 0},  {&_swigt__p_Functions0D__ReadCompleteViewMapPixelF0D, _p_Functions0D__ReadCompleteViewMapPixelF0DTo_p_UnaryFunction0DTfloat_t, 0, 0},  {&_swigt__p_Functions0D__GetViewMapGradientNormF0D, _p_Functions0D__GetViewMapGradientNormF0DTo_p_UnaryFunction0DTfloat_t, 0, 0},  {&_swigt__p_UnaryFunction0DTfloat_t, 0, 0, 0},  {&_swigt__p_Functions0D__GetParameterF0D, _p_Functions0D__GetParameterF0DTo_p_UnaryFunction0DTfloat_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t[] = {  {&_swigt__p_Functions0D__GetOccludersF0D, _p_Functions0D__GetOccludersF0DTo_p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0, 0},  {&_swigt__p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction0DTunsigned_int_t[] = {  {&_swigt__p_Functions0D__QuantitativeInvisibilityF0D, _p_Functions0D__QuantitativeInvisibilityF0DTo_p_UnaryFunction0DTunsigned_int_t, 0, 0},  {&_swigt__p_UnaryFunction0DTunsigned_int_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction0DTvoid_t[] = {  {&_swigt__p_UnaryFunction0DTvoid_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t[] = {  {&_swigt__p_Functions1D__Orientation2DF1D, _p_Functions1D__Orientation2DF1DTo_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, 0, 0},  {&_swigt__p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, 0, 0, 0},  {&_swigt__p_Functions1D__Normal2DF1D, _p_Functions1D__Normal2DF1DTo_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t[] = {  {&_swigt__p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t, 0, 0, 0},  {&_swigt__p_Functions1D__Orientation3DF1D, _p_Functions1D__Orientation3DF1DTo_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction1DTdouble_t[] = {  {&_swigt__p_Functions1D__GetSteerableViewMapDensityF1D, _p_Functions1D__GetSteerableViewMapDensityF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__GetDirectionalViewMapDensityF1D, _p_Functions1D__GetDirectionalViewMapDensityF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__GetCompleteViewMapDensityF1D, _p_Functions1D__GetCompleteViewMapDensityF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__DensityF1D, _p_Functions1D__DensityF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__ZDiscontinuityF1D, _p_Functions1D__ZDiscontinuityF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__GetXF1D, _p_Functions1D__GetXF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__GetZF1D, _p_Functions1D__GetZF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__GetViewMapGradientNormF1D, _p_Functions1D__GetViewMapGradientNormF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__GetProjectedYF1D, _p_Functions1D__GetProjectedYF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_UnaryFunction1DTdouble_t, 0, 0, 0},  {&_swigt__p_Functions1D__Curvature2DAngleF1D, _p_Functions1D__Curvature2DAngleF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__GetYF1D, _p_Functions1D__GetYF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__GetProjectedXF1D, _p_Functions1D__GetProjectedXF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__LocalAverageDepthF1D, _p_Functions1D__LocalAverageDepthF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__GetProjectedZF1D, _p_Functions1D__GetProjectedZF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction1DTfloat_t[] = {  {&_swigt__p_UnaryFunction1DTfloat_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t[] = {  {&_swigt__p_Functions1D__GetOccludeeF1D, _p_Functions1D__GetOccludeeF1DTo_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0, 0},  {&_swigt__p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0, 0, 0},  {&_swigt__p_Functions1D__GetShapeF1D, _p_Functions1D__GetShapeF1DTo_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0, 0},  {&_swigt__p_Functions1D__GetOccludersF1D, _p_Functions1D__GetOccludersF1DTo_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction1DTunsigned_int_t[] = {  {&_swigt__p_Functions1D__QuantitativeInvisibilityF1D, _p_Functions1D__QuantitativeInvisibilityF1DTo_p_UnaryFunction1DTunsigned_int_t, 0, 0},  {&_swigt__p_UnaryFunction1DTunsigned_int_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction1DTvoid_t[] = {  {&_swigt__p_UnaryFunction1DTvoid_t, 0, 0, 0},  {&_swigt__p_Functions1D__TimeStampF1D, _p_Functions1D__TimeStampF1DTo_p_UnaryFunction1DTvoid_t, 0, 0},  {&_swigt__p_Functions1D__IncrementChainingTimeStampF1D, _p_Functions1D__IncrementChainingTimeStampF1DTo_p_UnaryFunction1DTvoid_t, 0, 0},  {&_swigt__p_Functions1D__ChainingTimeStampF1D, _p_Functions1D__ChainingTimeStampF1DTo_p_UnaryFunction1DTvoid_t, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_UnaryPredicate0D[] = {  {&_swigt__p_Predicates0D__TrueUP0D, _p_Predicates0D__TrueUP0DTo_p_UnaryPredicate0D, 0, 0},  {&_swigt__p_Predicates0D__FalseUP0D, _p_Predicates0D__FalseUP0DTo_p_UnaryPredicate0D, 0, 0},  {&_swigt__p_UnaryPredicate0D, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_UnaryPredicate1D[] = {  {&_swigt__p_Predicates1D__FalseUP1D, _p_Predicates1D__FalseUP1DTo_p_UnaryPredicate1D, 0, 0},  {&_swigt__p_Predicates1D__ShapeUP1D, _p_Predicates1D__ShapeUP1DTo_p_UnaryPredicate1D, 0, 0},  {&_swigt__p_Predicates1D__DensityLowerThanUP1D, _p_Predicates1D__DensityLowerThanUP1DTo_p_UnaryPredicate1D, 0, 0},  {&_swigt__p_UnaryPredicate1D, 0, 0, 0},  {&_swigt__p_Predicates1D__EqualToTimeStampUP1D, _p_Predicates1D__EqualToTimeStampUP1DTo_p_UnaryPredicate1D, 0, 0},  {&_swigt__p_Predicates1D__EqualToChainingTimeStampUP1D, _p_Predicates1D__EqualToChainingTimeStampUP1DTo_p_UnaryPredicate1D, 0, 0},  {&_swigt__p_Predicates1D__TrueUP1D, _p_Predicates1D__TrueUP1DTo_p_UnaryPredicate1D, 0, 0},  {&_swigt__p_Predicates1D__QuantitativeInvisibilityUP1D, _p_Predicates1D__QuantitativeInvisibilityUP1DTo_p_UnaryPredicate1D, 0, 0},  {&_swigt__p_Predicates1D__ContourUP1D, _p_Predicates1D__ContourUP1DTo_p_UnaryPredicate1D, 0, 0},  {&_swigt__p_Predicates1D__ExternalContourUP1D, _p_Predicates1D__ExternalContourUP1DTo_p_UnaryPredicate1D, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__HVec3T_double_t[] = {  {&_swigt__p_VecMat__HVec3T_double_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__HVec3T_float_t[] = {  {&_swigt__p_VecMat__HVec3T_float_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__HVec3T_int_t[] = {  {&_swigt__p_VecMat__HVec3T_int_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__HVec3T_unsigned_int_t[] = {  {&_swigt__p_VecMat__HVec3T_unsigned_int_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__SquareMatrixT_double_2_t[] = {  {&_swigt__p_VecMat__SquareMatrixT_double_2_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__SquareMatrixT_double_3_t[] = {  {&_swigt__p_VecMat__SquareMatrixT_double_3_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__SquareMatrixT_double_4_t[] = {  {&_swigt__p_VecMat__SquareMatrixT_double_4_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__SquareMatrixT_float_2_t[] = {  {&_swigt__p_VecMat__SquareMatrixT_float_2_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__SquareMatrixT_float_3_t[] = {  {&_swigt__p_VecMat__SquareMatrixT_float_3_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__SquareMatrixT_float_4_t[] = {  {&_swigt__p_VecMat__SquareMatrixT_float_4_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__SquareMatrixT_int_2_t[] = {  {&_swigt__p_VecMat__SquareMatrixT_int_2_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__SquareMatrixT_int_3_t[] = {  {&_swigt__p_VecMat__SquareMatrixT_int_3_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__SquareMatrixT_int_4_t[] = {  {&_swigt__p_VecMat__SquareMatrixT_int_4_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__SquareMatrixT_unsigned_int_2_t[] = {  {&_swigt__p_VecMat__SquareMatrixT_unsigned_int_2_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__SquareMatrixT_unsigned_int_3_t[] = {  {&_swigt__p_VecMat__SquareMatrixT_unsigned_int_3_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__SquareMatrixT_unsigned_int_4_t[] = {  {&_swigt__p_VecMat__SquareMatrixT_unsigned_int_4_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__Vec2T_double_t[] = {  {&_swigt__p_VecMat__Vec2T_double_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__Vec2T_float_t[] = {  {&_swigt__p_VecMat__Vec2T_float_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__Vec2T_int_t[] = {  {&_swigt__p_VecMat__Vec2T_int_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__Vec2T_unsigned_int_t[] = {  {&_swigt__p_VecMat__Vec2T_unsigned_int_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__Vec3T_double_t[] = {  {&_swigt__p_VecMat__Vec3T_double_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__Vec3T_float_t[] = {  {&_swigt__p_VecMat__Vec3T_float_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__Vec3T_int_t[] = {  {&_swigt__p_VecMat__Vec3T_int_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__Vec3T_unsigned_int_t[] = {  {&_swigt__p_VecMat__Vec3T_unsigned_int_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__VecT_double_2_t[] = {  {&_swigt__p_VecMat__VecT_double_2_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec2T_double_t, _p_VecMat__Vec2T_double_tTo_p_VecMat__VecT_double_2_t, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__VecT_double_3_t[] = {  {&_swigt__p_VecMat__Vec3T_double_t, _p_VecMat__Vec3T_double_tTo_p_VecMat__VecT_double_3_t, 0, 0},  {&_swigt__p_VecMat__VecT_double_3_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__VecT_float_2_t[] = {  {&_swigt__p_VecMat__VecT_float_2_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec2T_float_t, _p_VecMat__Vec2T_float_tTo_p_VecMat__VecT_float_2_t, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__VecT_float_3_t[] = {  {&_swigt__p_VecMat__VecT_float_3_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec3T_float_t, _p_VecMat__Vec3T_float_tTo_p_VecMat__VecT_float_3_t, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__VecT_int_2_t[] = {  {&_swigt__p_VecMat__VecT_int_2_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec2T_int_t, _p_VecMat__Vec2T_int_tTo_p_VecMat__VecT_int_2_t, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__VecT_int_3_t[] = {  {&_swigt__p_VecMat__VecT_int_3_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec3T_int_t, _p_VecMat__Vec3T_int_tTo_p_VecMat__VecT_int_3_t, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__VecT_unsigned_int_2_t[] = {  {&_swigt__p_VecMat__VecT_unsigned_int_2_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec2T_unsigned_int_t, _p_VecMat__Vec2T_unsigned_int_tTo_p_VecMat__VecT_unsigned_int_2_t, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__VecT_unsigned_int_3_t[] = {  {&_swigt__p_VecMat__VecT_unsigned_int_3_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec3T_unsigned_int_t, _p_VecMat__Vec3T_unsigned_int_tTo_p_VecMat__VecT_unsigned_int_3_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__HVec3Tdouble_t[] = {  {&_swigt__p_VecMat__HVec3Tdouble_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__HVec3Tfloat_t[] = {  {&_swigt__p_VecMat__HVec3Tfloat_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__HVec3Tint_t[] = {  {&_swigt__p_VecMat__HVec3Tint_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__HVec3Tunsigned_int_t[] = {  {&_swigt__p_VecMat__HVec3Tunsigned_int_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixTdouble_2_t[] = {  {&_swigt__p_VecMat__SquareMatrixTdouble_2_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixTdouble_3_t[] = {  {&_swigt__p_VecMat__SquareMatrixTdouble_3_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixTdouble_4_t[] = {  {&_swigt__p_VecMat__SquareMatrixTdouble_4_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixTfloat_2_t[] = {  {&_swigt__p_VecMat__SquareMatrixTfloat_2_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixTfloat_3_t[] = {  {&_swigt__p_VecMat__SquareMatrixTfloat_3_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixTfloat_4_t[] = {  {&_swigt__p_VecMat__SquareMatrixTfloat_4_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixTint_2_t[] = {  {&_swigt__p_VecMat__SquareMatrixTint_2_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixTint_3_t[] = {  {&_swigt__p_VecMat__SquareMatrixTint_3_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixTint_4_t[] = {  {&_swigt__p_VecMat__SquareMatrixTint_4_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixTunsigned_int_2_t[] = {  {&_swigt__p_VecMat__SquareMatrixTunsigned_int_2_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixTunsigned_int_3_t[] = {  {&_swigt__p_VecMat__SquareMatrixTunsigned_int_3_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixTunsigned_int_4_t[] = {  {&_swigt__p_VecMat__SquareMatrixTunsigned_int_4_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__Vec2Tdouble_t[] = {  {&_swigt__p_VecMat__Vec2Tdouble_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__Vec2Tfloat_t[] = {  {&_swigt__p_VecMat__Vec2Tfloat_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__Vec2Tint_t[] = {  {&_swigt__p_VecMat__Vec2Tint_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__Vec2Tunsigned_int_t[] = {  {&_swigt__p_VecMat__Vec2Tunsigned_int_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__Vec3Tdouble_t[] = {  {&_swigt__p_VecMat__Vec3Tdouble_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__Vec3Tfloat_t[] = {  {&_swigt__p_VecMat__Vec3Tfloat_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__Vec3Tint_t[] = {  {&_swigt__p_VecMat__Vec3Tint_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__Vec3Tunsigned_int_t[] = {  {&_swigt__p_VecMat__Vec3Tunsigned_int_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__VecTdouble_2_t[] = {  {&_swigt__p_VecMat__VecTdouble_2_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec2Tdouble_t, _p_VecMat__Vec2Tdouble_tTo_p_VecMat__VecTdouble_2_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__VecTdouble_3_t[] = {  {&_swigt__p_VecMat__Vec3Tdouble_t, _p_VecMat__Vec3Tdouble_tTo_p_VecMat__VecTdouble_3_t, 0, 0},  {&_swigt__p_VecMat__VecTdouble_3_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__VecTfloat_2_t[] = {  {&_swigt__p_VecMat__VecTfloat_2_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec2Tfloat_t, _p_VecMat__Vec2Tfloat_tTo_p_VecMat__VecTfloat_2_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__VecTfloat_3_t[] = {  {&_swigt__p_VecMat__VecTfloat_3_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec3Tfloat_t, _p_VecMat__Vec3Tfloat_tTo_p_VecMat__VecTfloat_3_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__VecTint_2_t[] = {  {&_swigt__p_VecMat__VecTint_2_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec2Tint_t, _p_VecMat__Vec2Tint_tTo_p_VecMat__VecTint_2_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__VecTint_3_t[] = {  {&_swigt__p_VecMat__VecTint_3_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec3Tint_t, _p_VecMat__Vec3Tint_tTo_p_VecMat__VecTint_3_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__VecTunsigned_int_2_t[] = {  {&_swigt__p_VecMat__VecTunsigned_int_2_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec2Tunsigned_int_t, _p_VecMat__Vec2Tunsigned_int_tTo_p_VecMat__VecTunsigned_int_2_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__VecTunsigned_int_3_t[] = {  {&_swigt__p_VecMat__VecTunsigned_int_3_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec3Tunsigned_int_t, _p_VecMat__Vec3Tunsigned_int_tTo_p_VecMat__VecTunsigned_int_3_t, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_Vertex[] = {  {&_swigt__p_Vertex, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_ViewEdge[] = {  {&_swigt__std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_ViewEdge, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_ViewEdge[] = {  {&_swigt__p_ViewEdge, 0, 0, 0},  {&_swigt__std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_ViewEdgeInternal__SVertexIterator[] = {  {&_swigt__p_ViewEdgeInternal__SVertexIterator, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_ViewEdgeInternal__ViewEdgeIterator[] = {  {&_swigt__p_ViewEdgeInternal__ViewEdgeIterator, 0, 0, 0},  {&_swigt__p_ChainingIterator, _p_ChainingIteratorTo_p_ViewEdgeInternal__ViewEdgeIterator, 0, 0},  {&_swigt__p_ChainSilhouetteIterator, _p_ChainSilhouetteIteratorTo_p_ViewEdgeInternal__ViewEdgeIterator, 0, 0},  {&_swigt__p_ChainPredicateIterator, _p_ChainPredicateIteratorTo_p_ViewEdgeInternal__ViewEdgeIterator, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_ViewMap[] = {  {&_swigt__p_ViewMap, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_ViewShape[] = {  {&_swigt__p_ViewShape, 0, 0, 0},  {&_swigt__std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_ViewVertex[] = {  {&_swigt__std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_TVertex, _p_TVertexTo_p_ViewVertex, 0, 0},  {&_swigt__p_NonTVertex, _p_NonTVertexTo_p_ViewVertex, 0, 0},  {&_swigt__p_ViewVertex, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_const_traits_t[] = {  {&_swigt__p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_const_traits_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_nonconst_traits_t[] = {  {&_swigt__p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_nonconst_traits_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_ViewShape[] = {  {&_swigt__p_ViewShape, 0, 0, 0},  {&_swigt__std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_ViewVertex[] = {  {&_swigt__p_TVertex, _p_TVertexTo_p_ViewVertex, 0, 0},  {&_swigt__p_NonTVertex, _p_NonTVertexTo_p_ViewVertex, 0, 0},  {&_swigt__p_ViewVertex, 0, 0, 0},  {&_swigt__std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t[] = {  {&_swigt__p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t[] = {  {&_swigt__p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_ViewVertexInternal__orientedViewEdgeIterator[] = {  {&_swigt__p_ViewVertexInternal__orientedViewEdgeIterator, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_ViewVertexInternal__orientedViewEdgeIterator__edge_pointers_container__iterator[] = {  {&_swigt__p_ViewVertexInternal__orientedViewEdgeIterator__edge_pointers_container__iterator, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_ViewVertexInternal__orientedViewEdgeIterator__edges_container__iterator[] = {  {&_swigt__p_ViewVertexInternal__orientedViewEdgeIterator__edges_container__iterator, 0, 0, 0},{0, 0, 0, 0}};
@@ -109893,30 +111039,30 @@ static swig_cast_info _swigc__p_p_PyObject[] = {  {&_swigt__p_p_PyObject, 0, 0,
 static swig_cast_info _swigc__p_point_iterator[] = {  {&_swigt__p_point_iterator, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_point_type[] = {  {&_swigt__p_point_type, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_reference[] = {  {&_swigt__p_reference, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_setT_VecMat__Vec3T_double_t_t[] = {  {&_swigt__p_setT_VecMat__Vec3T_double_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_setTVecMat__Vec3Tdouble_t_t[] = {  {&_swigt__p_setTVecMat__Vec3Tdouble_t_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_size_type[] = {  {&_swigt__p_size_type, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_std__invalid_argument[] = {  {&_swigt__p_std__invalid_argument, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__mapT_int_int_std__lessT_int_t_std__allocatorT_std__pairT_int_const_int_t_t_t[] = {  {&_swigt__p_std__mapT_int_int_std__lessT_int_t_std__allocatorT_std__pairT_int_const_int_t_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__pairT_ViewEdge_p_bool_t[] = {  {&_swigt__p_std__pairT_ViewEdge_p_bool_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t[] = {  {&_swigt__p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__allocator_type[] = {  {&_swigt__p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorT_Material_std__allocatorT_Material_t_t[] = {  {&_swigt__p_std__vectorT_Material_std__allocatorT_Material_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t[] = {  {&_swigt__p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__allocator_type[] = {  {&_swigt__p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t[] = {  {&_swigt__p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__allocator_type[] = {  {&_swigt__p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorT_TVertex_p_std__allocatorT_TVertex_p_t_t[] = {  {&_swigt__p_std__vectorT_TVertex_p_std__allocatorT_TVertex_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorT_VecMat__Vec2T_double_t_std__allocatorT_VecMat__Vec2T_double_t_t_t[] = {  {&_swigt__p_std__vectorT_VecMat__Vec2T_double_t_std__allocatorT_VecMat__Vec2T_double_t_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t[] = {  {&_swigt__p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__allocator_type[] = {  {&_swigt__p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t[] = {  {&_swigt__p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__allocator_type[] = {  {&_swigt__p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t[] = {  {&_swigt__p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__allocator_type[] = {  {&_swigt__p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorT_int_std__allocatorT_int_t_t[] = {  {&_swigt__p_std__vectorT_int_std__allocatorT_int_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorT_int_std__allocatorT_int_t_t__allocator_type[] = {  {&_swigt__p_std__vectorT_int_std__allocatorT_int_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorT_std__pairT_ViewEdge_p_bool_t_std__allocatorT_std__pairT_ViewEdge_p_bool_t_t_t[] = {  {&_swigt__p_std__vectorT_std__pairT_ViewEdge_p_bool_t_std__allocatorT_std__pairT_ViewEdge_p_bool_t_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t[] = {  {&_swigt__p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__mapTint_int_std__lessTint_t_std__allocatorTstd__pairTint_const_int_t_t_t[] = {  {&_swigt__p_std__mapTint_int_std__lessTint_t_std__allocatorTstd__pairTint_const_int_t_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__pairTViewEdge_p_bool_t[] = {  {&_swigt__p_std__pairTViewEdge_p_bool_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t[] = {  {&_swigt__p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__allocator_type[] = {  {&_swigt__p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorTMaterial_std__allocatorTMaterial_t_t[] = {  {&_swigt__p_std__vectorTMaterial_std__allocatorTMaterial_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t[] = {  {&_swigt__p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__allocator_type[] = {  {&_swigt__p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t[] = {  {&_swigt__p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__allocator_type[] = {  {&_swigt__p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorTTVertex_p_std__allocatorTTVertex_p_t_t[] = {  {&_swigt__p_std__vectorTTVertex_p_std__allocatorTTVertex_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorTVecMat__Vec2Tdouble_t_std__allocatorTVecMat__Vec2Tdouble_t_t_t[] = {  {&_swigt__p_std__vectorTVecMat__Vec2Tdouble_t_std__allocatorTVecMat__Vec2Tdouble_t_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t[] = {  {&_swigt__p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__allocator_type[] = {  {&_swigt__p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t[] = {  {&_swigt__p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__allocator_type[] = {  {&_swigt__p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t[] = {  {&_swigt__p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__allocator_type[] = {  {&_swigt__p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorTint_std__allocatorTint_t_t[] = {  {&_swigt__p_std__vectorTint_std__allocatorTint_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorTint_std__allocatorTint_t_t__allocator_type[] = {  {&_swigt__p_std__vectorTint_std__allocatorTint_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorTstd__pairTViewEdge_p_bool_t_std__allocatorTstd__pairTViewEdge_p_bool_t_t_t[] = {  {&_swigt__p_std__vectorTstd__pairTViewEdge_p_bool_t_std__allocatorTstd__pairTViewEdge_p_bool_t_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorTunsigned_int_std__allocatorTunsigned_int_t_t[] = {  {&_swigt__p_std__vectorTunsigned_int_std__allocatorTunsigned_int_t_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svertices_container[] = {  {&_swigt__p_svertices_container, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_swig__PySwigIterator[] = {  {&_swigt__p_swig__PySwigIterator, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_unsigned_int[] = {  {&_swigt__p_unsigned_int, 0, 0, 0},{0, 0, 0, 0}};
@@ -109930,16 +111076,16 @@ static swig_cast_info _swigc__p_viewedges_container[] = {  {&_swigt__p_viewedges
 static swig_cast_info _swigc__p_viewshapes_container[] = {  {&_swigt__p_viewshapes_container, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_viewvertices_container[] = {  {&_swigt__p_viewvertices_container, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_void[] = {  {&_swigt__p_void, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type[] = {  {&_swigt__std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_FEdge, 0, 0, 0},  {&_swigt__p_FEdgeSharp, _p_FEdgeSharpTo_p_FEdge, 0, 0},  {&_swigt__p_FEdgeSmooth, _p_FEdgeSmoothTo_p_FEdge, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type[] = {  {&_swigt__std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_SVertex, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type[] = {  {&_swigt__p_StrokeShaders__ConstrainedIncreasingThicknessShader, _p_StrokeShaders__ConstrainedIncreasingThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_StrokeShader, 0, 0, 0},  {&_swigt__p_StrokeShaders__ColorNoiseShader, _p_StrokeShaders__ColorNoiseShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ThicknessNoiseShader, _p_StrokeShaders__ThicknessNoiseShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__LengthDependingThicknessShader, _p_StrokeShaders__LengthDependingThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__IncreasingThicknessShader, _p_StrokeShaders__IncreasingThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ConstantExternThicknessShader, _p_StrokeShaders__ConstantExternThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ConstantThicknessShader, _p_StrokeShaders__ConstantThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__StrokeTextureShader, _p_StrokeShaders__StrokeTextureShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__SamplingShader, _p_StrokeShaders__SamplingShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__BSplineShader, _p_StrokeShaders__BSplineShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__BezierCurveShader, _p_StrokeShaders__BezierCurveShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__InflateShader, _p_StrokeShaders__InflateShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__GuidingLinesShader, _p_StrokeShaders__GuidingLinesShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__streamShader, _p_StrokeShaders__streamShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__fstreamShader, _p_StrokeShaders__fstreamShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_CalligraphicShader, _p_CalligraphicShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_SpatialNoiseShader, _p_SpatialNoiseShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_SmoothingShader, _p_SmoothingShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__TextureAssignerShader, _p_StrokeShaders__TextureAssignerShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__CalligraphicColorShader, _p_StrokeShaders__CalligraphicColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__MaterialColorShader, _p_StrokeShaders__MaterialColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ColorVariationPatternShader, _p_StrokeShaders__ColorVariationPatternShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__IncreasingColorShader, _p_StrokeShaders__IncreasingColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ConstantColorShader, _p_StrokeShaders__ConstantColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ThicknessVariationPatternShader, _p_StrokeShaders__ThicknessVariationPatternShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__BackboneStretcherShader, _p_StrokeShaders__BackboneStretcherShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ExternalContourStretcherShader, _p_StrokeShaders__ExternalContourStretcherShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__PolygonalizationShader, _p_StrokeShaders__PolygonalizationShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__TipRemoverShader, _p_StrokeShaders__TipRemoverShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_OmissionShader, _p_OmissionShaderTo_p_StrokeShader, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type[] = {  {&_swigt__std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_ViewEdge, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type[] = {  {&_swigt__p_ViewShape, 0, 0, 0},  {&_swigt__std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type[] = {  {&_swigt__std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_TVertex, _p_TVertexTo_p_ViewVertex, 0, 0},  {&_swigt__p_NonTVertex, _p_NonTVertexTo_p_ViewVertex, 0, 0},  {&_swigt__p_ViewVertex, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type[] = {  {&_swigt__p_FEdge, 0, 0, 0},  {&_swigt__p_FEdgeSharp, _p_FEdgeSharpTo_p_FEdge, 0, 0},  {&_swigt__p_FEdgeSmooth, _p_FEdgeSmoothTo_p_FEdge, 0, 0},  {&_swigt__std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type[] = {  {&_swigt__std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_SVertex, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type[] = {  {&_swigt__p_StrokeShaders__ConstrainedIncreasingThicknessShader, _p_StrokeShaders__ConstrainedIncreasingThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_StrokeShader, 0, 0, 0},  {&_swigt__p_StrokeShaders__ColorNoiseShader, _p_StrokeShaders__ColorNoiseShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ThicknessNoiseShader, _p_StrokeShaders__ThicknessNoiseShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__LengthDependingThicknessShader, _p_StrokeShaders__LengthDependingThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__IncreasingThicknessShader, _p_StrokeShaders__IncreasingThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ConstantExternThicknessShader, _p_StrokeShaders__ConstantExternThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ConstantThicknessShader, _p_StrokeShaders__ConstantThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__StrokeTextureShader, _p_StrokeShaders__StrokeTextureShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__SamplingShader, _p_StrokeShaders__SamplingShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__BSplineShader, _p_StrokeShaders__BSplineShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__BezierCurveShader, _p_StrokeShaders__BezierCurveShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__InflateShader, _p_StrokeShaders__InflateShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__GuidingLinesShader, _p_StrokeShaders__GuidingLinesShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__streamShader, _p_StrokeShaders__streamShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__fstreamShader, _p_StrokeShaders__fstreamShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_CalligraphicShader, _p_CalligraphicShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_SpatialNoiseShader, _p_SpatialNoiseShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_SmoothingShader, _p_SmoothingShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__TextureAssignerShader, _p_StrokeShaders__TextureAssignerShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__CalligraphicColorShader, _p_StrokeShaders__CalligraphicColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__MaterialColorShader, _p_StrokeShaders__MaterialColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ColorVariationPatternShader, _p_StrokeShaders__ColorVariationPatternShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__IncreasingColorShader, _p_StrokeShaders__IncreasingColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ConstantColorShader, _p_StrokeShaders__ConstantColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ThicknessVariationPatternShader, _p_StrokeShaders__ThicknessVariationPatternShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__BackboneStretcherShader, _p_StrokeShaders__BackboneStretcherShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ExternalContourStretcherShader, _p_StrokeShaders__ExternalContourStretcherShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__PolygonalizationShader, _p_StrokeShaders__PolygonalizationShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__TipRemoverShader, _p_StrokeShaders__TipRemoverShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_OmissionShader, _p_OmissionShaderTo_p_StrokeShader, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type[] = {  {&_swigt__std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_ViewEdge, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type[] = {  {&_swigt__p_ViewShape, 0, 0, 0},  {&_swigt__std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type[] = {  {&_swigt__p_TVertex, _p_TVertexTo_p_ViewVertex, 0, 0},  {&_swigt__p_NonTVertex, _p_NonTVertexTo_p_ViewVertex, 0, 0},  {&_swigt__std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_ViewVertex, 0, 0, 0},{0, 0, 0, 0}};
 
 static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_AdjacencyIterator,
-  _swigc__p_BBoxT_VecMat__Vec3T_double_t_t,
+  _swigc__p_BBoxTVecMat__Vec3Tdouble_t_t,
   _swigc__p_BinaryPredicate0D,
   _swigc__p_BinaryPredicate1D,
   _swigc__p_CalligraphicShader,
@@ -110090,56 +111236,56 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_StrokesContainer,
   _swigc__p_StyleModule,
   _swigc__p_TVertex,
-  _swigc__p_UnaryFunction0DT_Id_t,
-  _swigc__p_UnaryFunction0DT_VecMat__Vec2T_float_t_t,
-  _swigc__p_UnaryFunction0DT_VecMat__Vec3T_float_t_t,
-  _swigc__p_UnaryFunction0DT_ViewShape_p_t,
-  _swigc__p_UnaryFunction0DT_double_t,
-  _swigc__p_UnaryFunction0DT_float_t,
-  _swigc__p_UnaryFunction0DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t,
-  _swigc__p_UnaryFunction0DT_unsigned_int_t,
-  _swigc__p_UnaryFunction0DT_void_t,
-  _swigc__p_UnaryFunction1DT_VecMat__Vec2T_float_t_t,
-  _swigc__p_UnaryFunction1DT_VecMat__Vec3T_float_t_t,
-  _swigc__p_UnaryFunction1DT_double_t,
-  _swigc__p_UnaryFunction1DT_float_t,
-  _swigc__p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t,
-  _swigc__p_UnaryFunction1DT_unsigned_int_t,
-  _swigc__p_UnaryFunction1DT_void_t,
+  _swigc__p_UnaryFunction0DTId_t,
+  _swigc__p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t,
+  _swigc__p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t,
+  _swigc__p_UnaryFunction0DTViewShape_p_t,
+  _swigc__p_UnaryFunction0DTdouble_t,
+  _swigc__p_UnaryFunction0DTfloat_t,
+  _swigc__p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t,
+  _swigc__p_UnaryFunction0DTunsigned_int_t,
+  _swigc__p_UnaryFunction0DTvoid_t,
+  _swigc__p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t,
+  _swigc__p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t,
+  _swigc__p_UnaryFunction1DTdouble_t,
+  _swigc__p_UnaryFunction1DTfloat_t,
+  _swigc__p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t,
+  _swigc__p_UnaryFunction1DTunsigned_int_t,
+  _swigc__p_UnaryFunction1DTvoid_t,
   _swigc__p_UnaryPredicate0D,
   _swigc__p_UnaryPredicate1D,
-  _swigc__p_VecMat__HVec3T_double_t,
-  _swigc__p_VecMat__HVec3T_float_t,
-  _swigc__p_VecMat__HVec3T_int_t,
-  _swigc__p_VecMat__HVec3T_unsigned_int_t,
-  _swigc__p_VecMat__SquareMatrixT_double_2_t,
-  _swigc__p_VecMat__SquareMatrixT_double_3_t,
-  _swigc__p_VecMat__SquareMatrixT_double_4_t,
-  _swigc__p_VecMat__SquareMatrixT_float_2_t,
-  _swigc__p_VecMat__SquareMatrixT_float_3_t,
-  _swigc__p_VecMat__SquareMatrixT_float_4_t,
-  _swigc__p_VecMat__SquareMatrixT_int_2_t,
-  _swigc__p_VecMat__SquareMatrixT_int_3_t,
-  _swigc__p_VecMat__SquareMatrixT_int_4_t,
-  _swigc__p_VecMat__SquareMatrixT_unsigned_int_2_t,
-  _swigc__p_VecMat__SquareMatrixT_unsigned_int_3_t,
-  _swigc__p_VecMat__SquareMatrixT_unsigned_int_4_t,
-  _swigc__p_VecMat__Vec2T_double_t,
-  _swigc__p_VecMat__Vec2T_float_t,
-  _swigc__p_VecMat__Vec2T_int_t,
-  _swigc__p_VecMat__Vec2T_unsigned_int_t,
-  _swigc__p_VecMat__Vec3T_double_t,
-  _swigc__p_VecMat__Vec3T_float_t,
-  _swigc__p_VecMat__Vec3T_int_t,
-  _swigc__p_VecMat__Vec3T_unsigned_int_t,
-  _swigc__p_VecMat__VecT_double_2_t,
-  _swigc__p_VecMat__VecT_double_3_t,
-  _swigc__p_VecMat__VecT_float_2_t,
-  _swigc__p_VecMat__VecT_float_3_t,
-  _swigc__p_VecMat__VecT_int_2_t,
-  _swigc__p_VecMat__VecT_int_3_t,
-  _swigc__p_VecMat__VecT_unsigned_int_2_t,
-  _swigc__p_VecMat__VecT_unsigned_int_3_t,
+  _swigc__p_VecMat__HVec3Tdouble_t,
+  _swigc__p_VecMat__HVec3Tfloat_t,
+  _swigc__p_VecMat__HVec3Tint_t,
+  _swigc__p_VecMat__HVec3Tunsigned_int_t,
+  _swigc__p_VecMat__SquareMatrixTdouble_2_t,
+  _swigc__p_VecMat__SquareMatrixTdouble_3_t,
+  _swigc__p_VecMat__SquareMatrixTdouble_4_t,
+  _swigc__p_VecMat__SquareMatrixTfloat_2_t,
+  _swigc__p_VecMat__SquareMatrixTfloat_3_t,
+  _swigc__p_VecMat__SquareMatrixTfloat_4_t,
+  _swigc__p_VecMat__SquareMatrixTint_2_t,
+  _swigc__p_VecMat__SquareMatrixTint_3_t,
+  _swigc__p_VecMat__SquareMatrixTint_4_t,
+  _swigc__p_VecMat__SquareMatrixTunsigned_int_2_t,
+  _swigc__p_VecMat__SquareMatrixTunsigned_int_3_t,
+  _swigc__p_VecMat__SquareMatrixTunsigned_int_4_t,
+  _swigc__p_VecMat__Vec2Tdouble_t,
+  _swigc__p_VecMat__Vec2Tfloat_t,
+  _swigc__p_VecMat__Vec2Tint_t,
+  _swigc__p_VecMat__Vec2Tunsigned_int_t,
+  _swigc__p_VecMat__Vec3Tdouble_t,
+  _swigc__p_VecMat__Vec3Tfloat_t,
+  _swigc__p_VecMat__Vec3Tint_t,
+  _swigc__p_VecMat__Vec3Tunsigned_int_t,
+  _swigc__p_VecMat__VecTdouble_2_t,
+  _swigc__p_VecMat__VecTdouble_3_t,
+  _swigc__p_VecMat__VecTfloat_2_t,
+  _swigc__p_VecMat__VecTfloat_3_t,
+  _swigc__p_VecMat__VecTint_2_t,
+  _swigc__p_VecMat__VecTint_3_t,
+  _swigc__p_VecMat__VecTunsigned_int_2_t,
+  _swigc__p_VecMat__VecTunsigned_int_3_t,
   _swigc__p_Vertex,
   _swigc__p_ViewEdge,
   _swigc__p_ViewEdgeInternal__SVertexIterator,
@@ -110147,8 +111293,8 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_ViewMap,
   _swigc__p_ViewShape,
   _swigc__p_ViewVertex,
-  _swigc__p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_const_traits_t,
-  _swigc__p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_nonconst_traits_t,
+  _swigc__p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t,
+  _swigc__p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t,
   _swigc__p_ViewVertexInternal__orientedViewEdgeIterator,
   _swigc__p_ViewVertexInternal__orientedViewEdgeIterator__edge_pointers_container__iterator,
   _swigc__p_ViewVertexInternal__orientedViewEdgeIterator__edges_container__iterator,
@@ -110178,30 +111324,30 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_point_iterator,
   _swigc__p_point_type,
   _swigc__p_reference,
-  _swigc__p_setT_VecMat__Vec3T_double_t_t,
+  _swigc__p_setTVecMat__Vec3Tdouble_t_t,
   _swigc__p_size_type,
   _swigc__p_std__invalid_argument,
-  _swigc__p_std__mapT_int_int_std__lessT_int_t_std__allocatorT_std__pairT_int_const_int_t_t_t,
-  _swigc__p_std__pairT_ViewEdge_p_bool_t,
-  _swigc__p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t,
-  _swigc__p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__allocator_type,
-  _swigc__p_std__vectorT_Material_std__allocatorT_Material_t_t,
-  _swigc__p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t,
-  _swigc__p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__allocator_type,
-  _swigc__p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t,
-  _swigc__p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__allocator_type,
-  _swigc__p_std__vectorT_TVertex_p_std__allocatorT_TVertex_p_t_t,
-  _swigc__p_std__vectorT_VecMat__Vec2T_double_t_std__allocatorT_VecMat__Vec2T_double_t_t_t,
-  _swigc__p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t,
-  _swigc__p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__allocator_type,
-  _swigc__p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t,
-  _swigc__p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__allocator_type,
-  _swigc__p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t,
-  _swigc__p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__allocator_type,
-  _swigc__p_std__vectorT_int_std__allocatorT_int_t_t,
-  _swigc__p_std__vectorT_int_std__allocatorT_int_t_t__allocator_type,
-  _swigc__p_std__vectorT_std__pairT_ViewEdge_p_bool_t_std__allocatorT_std__pairT_ViewEdge_p_bool_t_t_t,
-  _swigc__p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t,
+  _swigc__p_std__mapTint_int_std__lessTint_t_std__allocatorTstd__pairTint_const_int_t_t_t,
+  _swigc__p_std__pairTViewEdge_p_bool_t,
+  _swigc__p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t,
+  _swigc__p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__allocator_type,
+  _swigc__p_std__vectorTMaterial_std__allocatorTMaterial_t_t,
+  _swigc__p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t,
+  _swigc__p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__allocator_type,
+  _swigc__p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t,
+  _swigc__p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__allocator_type,
+  _swigc__p_std__vectorTTVertex_p_std__allocatorTTVertex_p_t_t,
+  _swigc__p_std__vectorTVecMat__Vec2Tdouble_t_std__allocatorTVecMat__Vec2Tdouble_t_t_t,
+  _swigc__p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t,
+  _swigc__p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__allocator_type,
+  _swigc__p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t,
+  _swigc__p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__allocator_type,
+  _swigc__p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t,
+  _swigc__p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__allocator_type,
+  _swigc__p_std__vectorTint_std__allocatorTint_t_t,
+  _swigc__p_std__vectorTint_std__allocatorTint_t_t__allocator_type,
+  _swigc__p_std__vectorTstd__pairTViewEdge_p_bool_t_std__allocatorTstd__pairTViewEdge_p_bool_t_t_t,
+  _swigc__p_std__vectorTunsigned_int_std__allocatorTunsigned_int_t_t,
   _swigc__p_svertices_container,
   _swigc__p_swig__PySwigIterator,
   _swigc__p_unsigned_int,
@@ -110215,12 +111361,12 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_viewshapes_container,
   _swigc__p_viewvertices_container,
   _swigc__p_void,
-  _swigc__std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type,
-  _swigc__std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type,
-  _swigc__std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type,
-  _swigc__std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type,
-  _swigc__std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type,
-  _swigc__std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type,
+  _swigc__std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type,
+  _swigc__std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type,
+  _swigc__std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type,
+  _swigc__std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type,
+  _swigc__std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type,
+  _swigc__std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type,
 };
 
 
@@ -110289,7 +111435,7 @@ SWIGRUNTIME void
 SWIG_InitializeModule(void *clientdata) {
   size_t i;
   swig_module_info *module_head, *iter;
-  int found, init;
+  int found;
   
   clientdata = clientdata;
   
@@ -110299,9 +111445,6 @@ SWIG_InitializeModule(void *clientdata) {
     swig_module.type_initial = swig_type_initial;
     swig_module.cast_initial = swig_cast_initial;
     swig_module.next = &swig_module;
-    init = 1;
-  } else {
-    init = 0;
   }
   
   /* Try and load any already created modules */
@@ -110330,12 +111473,6 @@ SWIG_InitializeModule(void *clientdata) {
     module_head->next = &swig_module;
   }
   
-  /* When multiple interpeters are used, a module could have already been initialized in
-       a different interpreter, but not yet have a pointer in this interpreter.
-       In this case, we do not want to continue adding types... everything should be
-       set up already */
-  if (init == 0) return;
-  
   /* Now work on filling in swig_module.types */
 #ifdef SWIGRUNTIME_DEBUG
   printf("SWIG_InitializeModule: size %d\n", swig_module.size);
@@ -110752,19 +111889,19 @@ SWIGEXPORT void SWIG_init(void) {
   
   SWIG_Python_SetConstant(d, "_Noise_B_",SWIG_From_int(static_cast< int >(0x100)));
   PyDict_SetItemString(d,(char*)"cvar", SWIG_globals());
-  SWIG_addvarlink(SWIG_globals(),(char*)"POINT",Swig_var_POINT_get, Swig_var_POINT_set);
-  SWIG_addvarlink(SWIG_globals(),(char*)"S_VERTEX",Swig_var_S_VERTEX_get, Swig_var_S_VERTEX_set);
-  SWIG_addvarlink(SWIG_globals(),(char*)"VIEW_VERTEX",Swig_var_VIEW_VERTEX_get, Swig_var_VIEW_VERTEX_set);
-  SWIG_addvarlink(SWIG_globals(),(char*)"NON_T_VERTEX",Swig_var_NON_T_VERTEX_get, Swig_var_NON_T_VERTEX_set);
-  SWIG_addvarlink(SWIG_globals(),(char*)"T_VERTEX",Swig_var_T_VERTEX_get, Swig_var_T_VERTEX_set);
-  SWIG_addvarlink(SWIG_globals(),(char*)"CUSP",Swig_var_CUSP_get, Swig_var_CUSP_set);
-  SWIG_addvarlink(SWIG_globals(),(char*)"NO_FEATURE",Swig_var_NO_FEATURE_get, Swig_var_NO_FEATURE_set);
-  SWIG_addvarlink(SWIG_globals(),(char*)"SILHOUETTE",Swig_var_SILHOUETTE_get, Swig_var_SILHOUETTE_set);
-  SWIG_addvarlink(SWIG_globals(),(char*)"BORDER",Swig_var_BORDER_get, Swig_var_BORDER_set);
-  SWIG_addvarlink(SWIG_globals(),(char*)"CREASE",Swig_var_CREASE_get, Swig_var_CREASE_set);
-  SWIG_addvarlink(SWIG_globals(),(char*)"RIDGE",Swig_var_RIDGE_get, Swig_var_RIDGE_set);
-  SWIG_addvarlink(SWIG_globals(),(char*)"VALLEY",Swig_var_VALLEY_get, Swig_var_VALLEY_set);
-  SWIG_addvarlink(SWIG_globals(),(char*)"SUGGESTIVE_CONTOUR",Swig_var_SUGGESTIVE_CONTOUR_get, Swig_var_SUGGESTIVE_CONTOUR_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"POINT",POINT_get, POINT_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"S_VERTEX",S_VERTEX_get, S_VERTEX_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"VIEW_VERTEX",VIEW_VERTEX_get, VIEW_VERTEX_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"NON_T_VERTEX",NON_T_VERTEX_get, NON_T_VERTEX_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"T_VERTEX",T_VERTEX_get, T_VERTEX_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"CUSP",CUSP_get, CUSP_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"NO_FEATURE",NO_FEATURE_get, NO_FEATURE_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"SILHOUETTE",SILHOUETTE_get, SILHOUETTE_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"BORDER",BORDER_get, BORDER_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"CREASE",CREASE_get, CREASE_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"RIDGE",RIDGE_get, RIDGE_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"VALLEY",VALLEY_get, VALLEY_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"SUGGESTIVE_CONTOUR",SUGGESTIVE_CONTOUR_get, SUGGESTIVE_CONTOUR_set);
   SWIG_Python_SetConstant(d, "MEAN",SWIG_From_int(static_cast< int >(MEAN)));
   SWIG_Python_SetConstant(d, "MIN",SWIG_From_int(static_cast< int >(MIN)));
   SWIG_Python_SetConstant(d, "MAX",SWIG_From_int(static_cast< int >(MAX)));
diff --git a/source/blender/freestyle/intern/swig/ModuleWrapper.h b/source/blender/freestyle/intern/swig/ModuleWrapper.h
index f24a77d53b2..06ca8c90f37 100755
--- a/source/blender/freestyle/intern/swig/ModuleWrapper.h
+++ b/source/blender/freestyle/intern/swig/ModuleWrapper.h
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 1.3.31
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -73,7 +73,7 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction0DVoid : public UnaryFunction0D< void >, public Swig::Director {
+class SwigDirector_UnaryFunction0DVoid : public UnaryFunction0D<void >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction0DVoid(PyObject *self);
@@ -119,7 +119,7 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction0DUnsigned : public UnaryFunction0D< unsigned int >, public Swig::Director {
+class SwigDirector_UnaryFunction0DUnsigned : public UnaryFunction0D<unsigned int >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction0DUnsigned(PyObject *self);
@@ -165,7 +165,7 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction0DFloat : public UnaryFunction0D< float >, public Swig::Director {
+class SwigDirector_UnaryFunction0DFloat : public UnaryFunction0D<float >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction0DFloat(PyObject *self);
@@ -211,7 +211,7 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction0DDouble : public UnaryFunction0D< double >, public Swig::Director {
+class SwigDirector_UnaryFunction0DDouble : public UnaryFunction0D<double >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction0DDouble(PyObject *self);
@@ -257,13 +257,13 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction0DVec2f : public UnaryFunction0D< Geometry::Vec2f >, public Swig::Director {
+class SwigDirector_UnaryFunction0DVec2f : public UnaryFunction0D<Geometry::Vec2f >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction0DVec2f(PyObject *self);
     virtual ~SwigDirector_UnaryFunction0DVec2f();
     virtual std::string getName() const;
-    virtual VecMat::Vec2< float > operator ()(Interface0DIterator &iter);
+    virtual VecMat::Vec2<float > operator ()(Interface0DIterator &iter);
 
 
 /* Internal Director utilities */
@@ -303,13 +303,13 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction0DVec3f : public UnaryFunction0D< Geometry::Vec3f >, public Swig::Director {
+class SwigDirector_UnaryFunction0DVec3f : public UnaryFunction0D<Geometry::Vec3f >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction0DVec3f(PyObject *self);
     virtual ~SwigDirector_UnaryFunction0DVec3f();
     virtual std::string getName() const;
-    virtual VecMat::Vec3< float > operator ()(Interface0DIterator &iter);
+    virtual VecMat::Vec3<float > operator ()(Interface0DIterator &iter);
 
 
 /* Internal Director utilities */
@@ -349,7 +349,7 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction0DId : public UnaryFunction0D< Id >, public Swig::Director {
+class SwigDirector_UnaryFunction0DId : public UnaryFunction0D<Id >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction0DId(PyObject *self);
@@ -395,7 +395,7 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction1DVoid : public UnaryFunction1D< void >, public Swig::Director {
+class SwigDirector_UnaryFunction1DVoid : public UnaryFunction1D<void >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction1DVoid(PyObject *self);
@@ -442,7 +442,7 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction1DUnsigned : public UnaryFunction1D< unsigned int >, public Swig::Director {
+class SwigDirector_UnaryFunction1DUnsigned : public UnaryFunction1D<unsigned int >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction1DUnsigned(PyObject *self);
@@ -489,7 +489,7 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction1DFloat : public UnaryFunction1D< float >, public Swig::Director {
+class SwigDirector_UnaryFunction1DFloat : public UnaryFunction1D<float >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction1DFloat(PyObject *self);
@@ -536,7 +536,7 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction1DDouble : public UnaryFunction1D< double >, public Swig::Director {
+class SwigDirector_UnaryFunction1DDouble : public UnaryFunction1D<double >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction1DDouble(PyObject *self);
@@ -583,14 +583,14 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction1DVec2f : public UnaryFunction1D< Geometry::Vec2f >, public Swig::Director {
+class SwigDirector_UnaryFunction1DVec2f : public UnaryFunction1D<Geometry::Vec2f >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction1DVec2f(PyObject *self);
     SwigDirector_UnaryFunction1DVec2f(PyObject *self, IntegrationType iType);
     virtual ~SwigDirector_UnaryFunction1DVec2f();
     virtual std::string getName() const;
-    virtual VecMat::Vec2< float > operator ()(Interface1D &inter);
+    virtual VecMat::Vec2<float > operator ()(Interface1D &inter);
 
 
 /* Internal Director utilities */
@@ -630,14 +630,14 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction1DVec3f : public UnaryFunction1D< Geometry::Vec3f >, public Swig::Director {
+class SwigDirector_UnaryFunction1DVec3f : public UnaryFunction1D<Geometry::Vec3f >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction1DVec3f(PyObject *self);
     SwigDirector_UnaryFunction1DVec3f(PyObject *self, IntegrationType iType);
     virtual ~SwigDirector_UnaryFunction1DVec3f();
     virtual std::string getName() const;
-    virtual VecMat::Vec3< float > operator ()(Interface1D &inter);
+    virtual VecMat::Vec3<float > operator ()(Interface1D &inter);
 
 
 /* Internal Director utilities */
diff --git a/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp b/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp
index d9caee85e18..54a982b8bd8 100755
--- a/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp
+++ b/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp
@@ -132,11 +132,11 @@ void FEdgeXDetector::preProcessFace(WXFace *iFace){
   Vec3r V(_Viewpoint - firstPoint);
   N.normalize();
   V.normalize();
-  iFace->SetDotP(N * V);
+  iFace->setDotP(N * V);
   
   // compute the distance between the face center and the viewpoint:
   Vec3r dist_vec(iFace->center() - _Viewpoint);
-  iFace->SetZ(dist_vec.norm());
+  iFace->setZ(dist_vec.norm());
 }
 
 void FEdgeXDetector::computeCurvatures(WXVertex *vertex){
@@ -257,7 +257,7 @@ void FEdgeXDetector::ProcessSilhouetteFace(WXFace *iFace)
     }
   }
   // Set the closest point id:
-  faceLayer->SetClosestPointIndex(closestPointId);
+  faceLayer->setClosestPointIndex(closestPointId);
   // Add this layer to the face:
   iFace->AddSmoothLayer(faceLayer);
 }
@@ -281,9 +281,9 @@ void FEdgeXDetector::ProcessSilhouetteEdge(WXEdge *iEdge)
       return;
     iEdge->AddNature(Nature::SILHOUETTE);
     if(fB->front())
-      iEdge->SetOrder(1);
+      iEdge->setOrder(1);
     else
-      iEdge->SetOrder(-1);
+      iEdge->setOrder(-1);
   }
 }
 
diff --git a/source/blender/freestyle/intern/view_map/FEdgeXDetector.h b/source/blender/freestyle/intern/view_map/FEdgeXDetector.h
index a6235dd53b5..5e6788c6ff8 100755
--- a/source/blender/freestyle/intern/view_map/FEdgeXDetector.h
+++ b/source/blender/freestyle/intern/view_map/FEdgeXDetector.h
@@ -106,7 +106,7 @@ public:
   virtual void buildSmoothEdges(WXShape* iShape);
 
   /*! Sets the current viewpoint */
-  inline void SetViewpoint(const Vec3r& ivp) {_Viewpoint = ivp;}
+  inline void setViewpoint(const Vec3r& ivp) {_Viewpoint = ivp;}
   inline void enableRidgesAndValleysFlag(bool b) {_computeRidgesAndValleys = b;}
   inline void enableSuggestiveContours(bool b) {_computeSuggestiveContours = b;}
   /*! Sets the radius of the geodesic sphere around each vertex (for the curvature computation)
@@ -120,7 +120,7 @@ public:
     }
   }
 
-  inline void SetProgressBar(ProgressBar *iProgressBar) {_pProgressBar = iProgressBar;}
+  inline void setProgressBar(ProgressBar *iProgressBar) {_pProgressBar = iProgressBar;}
 
 protected:
 
diff --git a/source/blender/freestyle/intern/view_map/Silhouette.h b/source/blender/freestyle/intern/view_map/Silhouette.h
index 15947fe3ba4..c88a3da8967 100755
--- a/source/blender/freestyle/intern/view_map/Silhouette.h
+++ b/source/blender/freestyle/intern/view_map/Silhouette.h
@@ -240,9 +240,9 @@ public:
 
   /*! modifiers */
   /*! Sets the 3D coordinates of the SVertex. */
-  inline void SetPoint3D(const Vec3r &iPoint3D) {_Point3D = iPoint3D;}
+  inline void setPoint3D(const Vec3r &iPoint3D) {_Point3D = iPoint3D;}
   /*! Sets the 3D projected coordinates of the SVertex. */
-  inline void SetPoint2D(const Vec3r &iPoint2D) {_Point2D = iPoint2D;}
+  inline void setPoint2D(const Vec3r &iPoint2D) {_Point2D = iPoint2D;}
   /*! Adds a normal to the Svertex's set of normals. If the same
    * normal is already in the set, nothing changes.
    */
@@ -266,10 +266,10 @@ public:
   const Vec2r directionFredo () {return _directionFredo;}
 
   /*! Sets the Id */
-  inline void SetId(const Id& id) {_Id = id;}
-  inline void SetFEdges(const vector<FEdge*>& iFEdges) {_FEdges = iFEdges;}
-  inline void SetShape(SShape *iShape) {_Shape = iShape;}
-  inline void SetViewVertex(ViewVertex *iViewVertex) {_pViewVertex = iViewVertex;}
+  inline void setId(const Id& id) {_Id = id;}
+  inline void setFEdges(const vector<FEdge*>& iFEdges) {_FEdges = iFEdges;}
+  inline void setShape(SShape *iShape) {_Shape = iShape;}
+  inline void setViewVertex(ViewVertex *iViewVertex) {_pViewVertex = iViewVertex;}
   /*! Add an FEdge to the list of edges emanating from this SVertex. */
   inline void AddFEdge(FEdge* iFEdge) {_FEdges.push_back(iFEdge);}
   /* replaces edge 1 by edge 2 in the list of edges */
@@ -501,30 +501,30 @@ public:
 
   /* modifiers */
   /*! Sets the first SVertex. */
-  inline void SetVertexA(SVertex *vA) {_VertexA = vA;}
+  inline void setVertexA(SVertex *vA) {_VertexA = vA;}
   /*! Sets the second SVertex. */
-  inline void SetVertexB(SVertex *vB) {_VertexB = vB;}
+  inline void setVertexB(SVertex *vB) {_VertexB = vB;}
   /*! Sets the FEdge Id . */
-  inline void SetId(const Id& id) {_Id = id;}
+  inline void setId(const Id& id) {_Id = id;}
   /*! Sets the pointer to the next FEdge. */
-  inline void SetNextEdge(FEdge* iEdge) {_NextEdge = iEdge;}
+  inline void setNextEdge(FEdge* iEdge) {_NextEdge = iEdge;}
   /*! Sets the pointer to the previous FEdge. */
-  inline void SetPreviousEdge(FEdge *iEdge) {_PreviousEdge = iEdge;}
+  inline void setPreviousEdge(FEdge *iEdge) {_PreviousEdge = iEdge;}
   /*! Sets the nature of this FEdge. */
-  inline void SetNature(Nature::EdgeNature iNature) {_Nature = iNature;}
+  inline void setNature(Nature::EdgeNature iNature) {_Nature = iNature;}
   //inline void AddOccluder(Polygon3r& iPolygon) {_Occluders.push_back(iPolygon);}
   /*! Sets the ViewEdge to which this FEdge belongs to. */
-  inline void SetViewEdge(ViewEdge *iViewEdge) {_ViewEdge = iViewEdge;}
-  //  inline void SetHasVisibilityPoint(bool iBool) {_hasVisibilityPoint = iBool;}
-  //  inline void SetVisibilityPointA(const Vec3r& iPoint) {_VisibilityPointA = iPoint;}
-  //  inline void SetVisibilityPointB(const Vec3r& iPoint) {_VisibilityPointB = iPoint;}
-  inline void SetaFace(Polygon3r& iFace) {_aFace = iFace;}
-  inline void SetOccludeeIntersection(const Vec3r& iPoint) {_occludeeIntersection = iPoint;}
-  inline void SetOccludeeEmpty(bool iempty) {_occludeeEmpty = iempty;}
+  inline void setViewEdge(ViewEdge *iViewEdge) {_ViewEdge = iViewEdge;}
+  //  inline void setHasVisibilityPoint(bool iBool) {_hasVisibilityPoint = iBool;}
+  //  inline void setVisibilityPointA(const Vec3r& iPoint) {_VisibilityPointA = iPoint;}
+  //  inline void setVisibilityPointB(const Vec3r& iPoint) {_VisibilityPointB = iPoint;}
+  inline void setaFace(Polygon3r& iFace) {_aFace = iFace;}
+  inline void setOccludeeIntersection(const Vec3r& iPoint) {_occludeeIntersection = iPoint;}
+  inline void setOccludeeEmpty(bool iempty) {_occludeeEmpty = iempty;}
   /*! Sets the flag telling whether this FEdge is smooth or sharp.
    *  true for Smooth, false for Sharp.
    */
-  inline void SetSmooth(bool iFlag) {_isSmooth = iFlag;}
+  inline void setSmooth(bool iFlag) {_isSmooth = iFlag;}
   
   /* checks whether two FEdge have a common vertex.
    *  Returns a pointer on the common vertex if it exists, 
@@ -840,13 +840,13 @@ public:
   const Material& bMaterial() const ;
 
   /*! Sets the normal to the face lying on the right of the FEdge. */
-  inline void SetNormalA(const Vec3r& iNormal) {_aNormal = iNormal;}
+  inline void setNormalA(const Vec3r& iNormal) {_aNormal = iNormal;}
   /*! Sets the normal to the face lying on the left of the FEdge. */ 
-  inline void SetNormalB(const Vec3r& iNormal) {_bNormal = iNormal;}
+  inline void setNormalB(const Vec3r& iNormal) {_bNormal = iNormal;}
   /*! Sets the index of the material lying on the right of the FEdge.*/
-  inline void SetaMaterialIndex(unsigned i) {_aMaterialIndex = i;}
+  inline void setaMaterialIndex(unsigned i) {_aMaterialIndex = i;}
   /*! Sets the index of the material lying on the left of the FEdge.*/
-  inline void SetbMaterialIndex(unsigned i) {_bMaterialIndex = i;}
+  inline void setbMaterialIndex(unsigned i) {_bMaterialIndex = i;}
   
 };
 
@@ -901,11 +901,11 @@ public:
   /*! Returns the material of the face it is running accross. */
   const Material& material() const ;
 
-  inline void SetFace(void * iFace) {_Face = iFace;}
+  inline void setFace(void * iFace) {_Face = iFace;}
   /*! Sets the normal to the Face it is running accross. */
-  inline void SetNormal(const Vec3r& iNormal) {_Normal = iNormal;}
+  inline void setNormal(const Vec3r& iNormal) {_Normal = iNormal;}
   /*! Sets the index of the material of the face it is running accross. */
-  inline void SetMaterialIndex(unsigned i) {_MaterialIndex = i;}
+  inline void setMaterialIndex(unsigned i) {_MaterialIndex = i;}
 };
                   /**********************************/
                   /*                                */
@@ -969,7 +969,7 @@ public:
         sv++)
       {
         SVertex *newv = new SVertex(*(*sv));
-        newv->SetShape(this);
+        newv->setShape(this);
         _verticesList.push_back(newv);
       }
     
@@ -1015,7 +1015,7 @@ public:
             FEdge *current = *fed;
             newfedgelist.push_back((FEdge*)current->userdata);
           }
-        (*sv)->SetFEdges(newfedgelist); 
+        (*sv)->setFEdges(newfedgelist); 
       }
     
     //-------------------------------------
@@ -1025,10 +1025,10 @@ public:
         e!=eend;
         e++)
       {
-        (*e)->SetVertexA((SVertex*)((*e)->vertexA()->userdata));
-        (*e)->SetVertexB((SVertex*)((*e)->vertexB()->userdata));
-        (*e)->SetNextEdge((FEdge*)((*e)->nextEdge()->userdata));
-        (*e)->SetPreviousEdge((FEdge*)((*e)->previousEdge()->userdata));
+        (*e)->setVertexA((SVertex*)((*e)->vertexA()->userdata));
+        (*e)->setVertexB((SVertex*)((*e)->vertexB()->userdata));
+        (*e)->setNextEdge((FEdge*)((*e)->nextEdge()->userdata));
+        (*e)->setPreviousEdge((FEdge*)((*e)->previousEdge()->userdata));
       }
     
 
@@ -1104,7 +1104,7 @@ public:
   /*! Adds a SVertex to the list of SVertex of this Shape.
    * The SShape attribute of the SVertex is also set to 'this'.
    */
-  inline void AddNewVertex(SVertex* iv) {iv->SetShape(this);_verticesList.push_back(iv);}
+  inline void AddNewVertex(SVertex* iv) {iv->setShape(this);_verticesList.push_back(iv);}
   inline void AddChain(FEdge *iEdge){
     _chains.push_back(iEdge);
   }
@@ -1112,7 +1112,7 @@ public:
   inline SVertex * CreateSVertex(const Vec3r& P3D, const Vec3r& P2D, const Id& id)
   {
     SVertex *Ia = new SVertex(P3D, id);
-    Ia->SetPoint2D(P2D);
+    Ia->setPoint2D(P2D);
     AddNewVertex(Ia);
     return Ia;
   }
@@ -1172,7 +1172,7 @@ public:
       // create new SVertex:
       // (we keep B's id)
       SVertex* newVertex = new SVertex(newpoint3d, ioB->getId());
-      newVertex->SetPoint2D(newpoint2d);
+      newVertex->setPoint2D(newpoint2d);
       
       // Add this vertex to the intersections list:
       intersections.push_back(newVertex);
@@ -1192,23 +1192,23 @@ public:
       // AB becomes (address speaking) AA'. B is updated.
       //--------------------------------------------------
       // The edge AB becomes edge AA'.
-      (fe)->SetVertexB((*sv));
+      (fe)->setVertexB((*sv));
       // a new edge, A'B is created.
       FEdge *newEdge;
       if(fe->isSmooth()){
         newEdge = new FEdgeSmooth((*sv), svB);
         FEdgeSmooth * se = dynamic_cast<FEdgeSmooth*>(newEdge);
         FEdgeSmooth * fes = dynamic_cast<FEdgeSmooth*>(fe);
-        se->SetMaterialIndex(fes->materialIndex());
+        se->setMaterialIndex(fes->materialIndex());
       }else{
         newEdge = new FEdgeSharp((*sv), svB);
         FEdgeSharp * se = dynamic_cast<FEdgeSharp*>(newEdge);
         FEdgeSharp * fes = dynamic_cast<FEdgeSharp*>(fe);
-        se->SetaMaterialIndex(fes->aMaterialIndex());
-        se->SetbMaterialIndex(fes->bMaterialIndex());
+        se->setaMaterialIndex(fes->aMaterialIndex());
+        se->setbMaterialIndex(fes->bMaterialIndex());
       }
         
-      newEdge->SetNature((fe)->getNature());
+      newEdge->setNature((fe)->getNature());
       
 
       // to build a new chain:
@@ -1219,15 +1219,15 @@ public:
       ioNewEdges.push_back(newEdge);
 
       // update edge A'B for the next pointing edge
-      newEdge->SetNextEdge((fe)->nextEdge());
-      fe->nextEdge()->SetPreviousEdge(newEdge);
+      newEdge->setNextEdge((fe)->nextEdge());
+      fe->nextEdge()->setPreviousEdge(newEdge);
       Id id(fe->getId().getFirst(), fe->getId().getSecond()+1);
-      newEdge->SetId(fe->getId());
-      fe->SetId(id);
+      newEdge->setId(fe->getId());
+      fe->setId(id);
 
       // update edge AA' for the next pointing edge
-      //ioEdge->SetNextEdge(newEdge);
-      (fe)->SetNextEdge(NULL);
+      //ioEdge->setNextEdge(newEdge);
+      (fe)->setNextEdge(NULL);
 
       // update vertex pointing edges list:
       // -- vertex B --
@@ -1264,30 +1264,30 @@ public:
         newEdge = new FEdgeSmooth(ioNewVertex, B);
         FEdgeSmooth * se = dynamic_cast<FEdgeSmooth*>(newEdge);
         FEdgeSmooth * fes = dynamic_cast<FEdgeSmooth*>(ioEdge);
-        se->SetMaterialIndex(fes->materialIndex());
+        se->setMaterialIndex(fes->materialIndex());
       }else{
         newEdge = new FEdgeSharp(ioNewVertex, B);
         FEdgeSharp * se = dynamic_cast<FEdgeSharp*>(newEdge);
         FEdgeSharp * fes = dynamic_cast<FEdgeSharp*>(ioEdge);
-        se->SetaMaterialIndex(fes->aMaterialIndex());
-        se->SetbMaterialIndex(fes->bMaterialIndex());
+        se->setaMaterialIndex(fes->aMaterialIndex());
+        se->setbMaterialIndex(fes->bMaterialIndex());
       }
-      newEdge->SetNature(ioEdge->getNature());
+      newEdge->setNature(ioEdge->getNature());
       
       
       if(ioEdge->nextEdge() != 0)
-        ioEdge->nextEdge()->SetPreviousEdge(newEdge);
+        ioEdge->nextEdge()->setPreviousEdge(newEdge);
 
       // update edge A'B for the next pointing edge
-      newEdge->SetNextEdge(ioEdge->nextEdge());
+      newEdge->setNextEdge(ioEdge->nextEdge());
       // update edge A'B for the previous pointing edge
-      newEdge->SetPreviousEdge(0); // because it is now a TVertex
+      newEdge->setPreviousEdge(0); // because it is now a TVertex
       Id id(ioEdge->getId().getFirst(), ioEdge->getId().getSecond()+1);
-      newEdge->SetId(ioEdge->getId());
-      ioEdge->SetId(id);
+      newEdge->setId(ioEdge->getId());
+      ioEdge->setId(id);
    
       // update edge AA' for the next pointing edge
-      ioEdge->SetNextEdge(0); // because it is now a TVertex
+      ioEdge->setNextEdge(0); // because it is now a TVertex
 
       // update vertex pointing edges list:
       // -- vertex B --
@@ -1301,17 +1301,17 @@ public:
       AddEdge(newEdge); // FIXME ??
       
       // The edge AB becomes edge AA'.
-      ioEdge->SetVertexB(ioNewVertex);
+      ioEdge->setVertexB(ioNewVertex);
       
       if(ioEdge->isSmooth()){
-        ((FEdgeSmooth*)newEdge)->SetFace(((FEdgeSmooth*)ioEdge)->face());
+        ((FEdgeSmooth*)newEdge)->setFace(((FEdgeSmooth*)ioEdge)->face());
       }
       
       return newEdge;
     }
 
   /*! Sets the Bounding Box of the Shape */
-  inline void SetBBox(const BBox<Vec3r>& iBBox) {_BBox = iBBox;}
+  inline void setBBox(const BBox<Vec3r>& iBBox) {_BBox = iBBox;}
 
   /*! Compute the bbox of the sshape */
   inline void ComputeBBox()
@@ -1359,7 +1359,7 @@ public:
       }
     
     
-    SetBBox(BBox<Vec3r>(Vec3r(XMin, YMin, ZMin), Vec3r(XMax, YMax, ZMax)));
+    setBBox(BBox<Vec3r>(Vec3r(XMin, YMin, ZMin), Vec3r(XMax, YMax, ZMax)));
   }
 
   inline void RemoveEdgeFromChain(FEdge *iEdge)
@@ -1409,11 +1409,11 @@ public:
   
   /* Modififers */
   /*! Sets the Id of the shape.*/
-  inline void SetId(Id id) {_Id = id;}
+  inline void setId(Id id) {_Id = id;}
   /*! Sets the list of materials for the shape */
-  inline void SetMaterials(const vector<Material>& iMaterials) {_Materials = iMaterials;}
-  inline void SetViewShape(ViewShape *iShape) {_ViewShape = iShape;}
-  inline void SetImportance(float importance){_importance = importance;}
+  inline void setMaterials(const vector<Material>& iMaterials) {_Materials = iMaterials;}
+  inline void setViewShape(ViewShape *iShape) {_ViewShape = iShape;}
+  inline void setImportance(float importance){_importance = importance;}
 };
 
 #endif // SILHOUETTE_H
diff --git a/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp b/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp
index 19b8a632ffe..33c1115e94f 100755
--- a/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp
+++ b/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp
@@ -55,7 +55,7 @@ real SilhouetteGeomEngine::_zfar = 100.0;
   
 SilhouetteGeomEngine * SilhouetteGeomEngine::_pInstance = 0;
 
-void SilhouetteGeomEngine::SetTransform(const real iModelViewMatrix[4][4], const real iProjectionMatrix[4][4], const int iViewport[4], real iFocal) 
+void SilhouetteGeomEngine::setTransform(const real iModelViewMatrix[4][4], const real iProjectionMatrix[4][4], const int iViewport[4], real iFocal) 
 {
   unsigned int i,j;
   _translation[0] = iModelViewMatrix[3][0];
@@ -93,7 +93,7 @@ void SilhouetteGeomEngine::SetTransform(const real iModelViewMatrix[4][4], const
   _Focal = iFocal;
 }
 
-void SilhouetteGeomEngine::SetFrustum(real iZNear, real iZFar) 
+void SilhouetteGeomEngine::setFrustum(real iZNear, real iZFar) 
 {
   _znear = iZNear;
   _zfar = iZFar;
@@ -117,7 +117,7 @@ void SilhouetteGeomEngine::ProjectSilhouette(vector<SVertex*>& ioVertices)
     {
       GeomUtils::fromWorldToImage((*sv)->point3D(), newPoint, _modelViewMatrix, _projectionMatrix, _viewport);
       newPoint[2] = (-newPoint[2]-_znear)/(_zfar-_znear); // normalize Z between 0 and 1
-      (*sv)->SetPoint2D(newPoint);  
+      (*sv)->setPoint2D(newPoint);  
       //cerr << (*sv)->point2d().z() << "  ";
       //      real d=(*sv)->point2d()[2];
       //      if (d>max) max =d;
@@ -128,7 +128,7 @@ void SilhouetteGeomEngine::ProjectSilhouette(vector<SVertex*>& ioVertices)
       //      sv++)
       //    {
       //      Vec3r P((*sv)->point2d());
-      //      (*sv)->SetPoint2D(Vec3r(P[0], P[1], 1.0-(P[2]-min)/(max-min)));
+      //      (*sv)->setPoint2D(Vec3r(P[0], P[1], 1.0-(P[2]-min)/(max-min)));
       //      //cerr<<(*sv)->point2d()[2]<<"  ";
       //    }
 }
@@ -141,7 +141,7 @@ void SilhouetteGeomEngine::ProjectSilhouette(SVertex* ioVertex)
   vector<SVertex*>::iterator sv, svend;
   GeomUtils::fromWorldToImage(ioVertex->point3D(), newPoint, _modelViewMatrix, _projectionMatrix, _viewport);
   newPoint[2] = (-newPoint[2]-_znear)/(_zfar-_znear); // normalize Z between 0 and 1
-  ioVertex->SetPoint2D(newPoint);  
+  ioVertex->setPoint2D(newPoint);  
 }
 
 real SilhouetteGeomEngine::ImageToWorldParameter(FEdge *fe, real t)
diff --git a/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.h b/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.h
index 159dda1afc0..9638d26986f 100755
--- a/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.h
+++ b/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.h
@@ -75,7 +75,7 @@ public:
   }
 
   /*! Sets the current viewpoint */
-  static inline void SetViewpoint(const Vec3r& ivp) {_Viewpoint = ivp;}
+  static inline void setViewpoint(const Vec3r& ivp) {_Viewpoint = ivp;}
 
   /*! Sets the current transformation
    *    iModelViewMatrix
@@ -87,11 +87,11 @@ public:
    *    iFocal
    *      The focal length
    */
-  static void SetTransform(const real iModelViewMatrix[4][4], const real iProjectionMatrix[4][4], const int iViewport[4], real iFocal) ;  
+  static void setTransform(const real iModelViewMatrix[4][4], const real iProjectionMatrix[4][4], const int iViewport[4], real iFocal) ;  
 
   /*! Sets the current znear and zfar
    */
-  static void SetFrustum(real iZNear, real iZFar) ;  
+  static void setFrustum(real iZNear, real iZFar) ;  
 
   /* accessors */
   static void retrieveViewport(int viewport[4]);
diff --git a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp
index bf4369bcf41..3feeb6664df 100755
--- a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp
@@ -160,7 +160,7 @@ ViewEdge * ViewEdgeXBuilder::BuildSmoothViewEdge(const OWXFaceLayer& iFaceLayer)
   
   // Start a new chain edges
   ViewEdge * newVEdge = new ViewEdge;
-  newVEdge->SetId(_currentViewId);
+  newVEdge->setId(_currentViewId);
   ++_currentViewId;
   
   _pCurrentVShape->AddEdge(newVEdge);
@@ -174,23 +174,23 @@ ViewEdge * ViewEdgeXBuilder::BuildSmoothViewEdge(const OWXFaceLayer& iFaceLayer)
   fl!=flend;
   ++fl){
     fe = BuildSmoothFEdge(feprevious, (*fl));
-    fe->SetViewEdge(newVEdge);
+    fe->setViewEdge(newVEdge);
     if(!fefirst)
       fefirst = fe;
     feprevious = fe;
   }
   // Store the chain starting edge:
   _pCurrentSShape->AddChain(fefirst);
-  newVEdge->SetNature(iFaceLayer.fl->nature());
-  newVEdge->SetFEdgeA(fefirst);
-  newVEdge->SetFEdgeB(fe);
+  newVEdge->setNature(iFaceLayer.fl->nature());
+  newVEdge->setFEdgeA(fefirst);
+  newVEdge->setFEdgeB(fe);
 
   // is it a closed loop ?
   if((first == end) && (size != 1)){
-    fefirst->SetPreviousEdge(fe);
-    fe->SetNextEdge(fefirst);
-    newVEdge->SetA(0);
-    newVEdge->SetB(0);
+    fefirst->setPreviousEdge(fe);
+    fe->setNextEdge(fefirst);
+    newVEdge->setA(0);
+    newVEdge->setB(0);
   }else{
     ViewVertex *vva = MakeViewVertex(fefirst->vertexA());
     ViewVertex *vvb = MakeViewVertex(fe->vertexB());
@@ -198,8 +198,8 @@ ViewEdge * ViewEdgeXBuilder::BuildSmoothViewEdge(const OWXFaceLayer& iFaceLayer)
     ((NonTVertex*)vva)->AddOutgoingViewEdge(newVEdge);
     ((NonTVertex*)vvb)->AddIncomingViewEdge(newVEdge);
 
-    newVEdge->SetA(vva);
-    newVEdge->SetB(vvb);
+    newVEdge->setA(vva);
+    newVEdge->setB(vvb);
   } 
   
   return newVEdge;
@@ -208,7 +208,7 @@ ViewEdge * ViewEdgeXBuilder::BuildSmoothViewEdge(const OWXFaceLayer& iFaceLayer)
 ViewEdge * ViewEdgeXBuilder::BuildSharpViewEdge(const OWXEdge& iWEdge) {
   // Start a new sharp chain edges
   ViewEdge * newVEdge = new ViewEdge;
-  newVEdge->SetId(_currentViewId);
+  newVEdge->setId(_currentViewId);
   ++_currentViewId;
   unsigned size=0;
   
@@ -248,23 +248,23 @@ ViewEdge * ViewEdgeXBuilder::BuildSharpViewEdge(const OWXEdge& iWEdge) {
   we!=weend;
   ++we){
     fe = BuildSharpFEdge(feprevious, (*we));
-    fe->SetViewEdge(newVEdge);
+    fe->setViewEdge(newVEdge);
     if(!fefirst)
       fefirst = fe;
     feprevious = fe;
   }
   // Store the chain starting edge:
   _pCurrentSShape->AddChain(fefirst);
-  newVEdge->SetNature(iWEdge.e->nature());
-  newVEdge->SetFEdgeA(fefirst);
-  newVEdge->SetFEdgeB(fe);
+  newVEdge->setNature(iWEdge.e->nature());
+  newVEdge->setFEdgeA(fefirst);
+  newVEdge->setFEdgeB(fe);
 
   // is it a closed loop ?
   if((firstWEdge == endWEdge) && (size!=1)){
-    fefirst->SetPreviousEdge(fe);
-    fe->SetNextEdge(fefirst);
-    newVEdge->SetA(0);
-    newVEdge->SetB(0);
+    fefirst->setPreviousEdge(fe);
+    fe->setNextEdge(fefirst);
+    newVEdge->setA(0);
+    newVEdge->setB(0);
   }else{
     ViewVertex *vva = MakeViewVertex(fefirst->vertexA());
     ViewVertex *vvb = MakeViewVertex(fe->vertexB());
@@ -272,8 +272,8 @@ ViewEdge * ViewEdgeXBuilder::BuildSharpViewEdge(const OWXEdge& iWEdge) {
     ((NonTVertex*)vva)->AddOutgoingViewEdge(newVEdge);
     ((NonTVertex*)vvb)->AddIncomingViewEdge(newVEdge);
 
-    newVEdge->SetA(vva);
-    newVEdge->SetB(vvb);
+    newVEdge->setA(vva);
+    newVEdge->setB(vvb);
   }
 
   return newVEdge;
@@ -468,14 +468,14 @@ FEdge * ViewEdgeXBuilder::BuildSmoothFEdge(FEdge *feprevious, const OWXFaceLayer
   
   // Creates the corresponding feature edge
   fe = new FEdgeSmooth(va, vb);
-  fe->SetNature(ifl.fl->nature());
-  fe->SetId(_currentFId);
-  fe->SetMaterialIndex(ifl.fl->getFace()->materialIndex());
-  fe->SetFace(ifl.fl->getFace());
-  fe->SetNormal(normal);
-  fe->SetPreviousEdge(feprevious);
+  fe->setNature(ifl.fl->nature());
+  fe->setId(_currentFId);
+  fe->setMaterialIndex(ifl.fl->getFace()->materialIndex());
+  fe->setFace(ifl.fl->getFace());
+  fe->setNormal(normal);
+  fe->setPreviousEdge(feprevious);
   if(feprevious)
-    feprevious->SetNextEdge(fe);
+    feprevious->setNextEdge(fe);
   _pCurrentSShape->AddEdge(fe);
   va->AddFEdge(fe);
   vb->AddFEdge(fe);
@@ -603,15 +603,15 @@ FEdge * ViewEdgeXBuilder::BuildSharpFEdge(FEdge *feprevious, const OWXEdge& iwe)
   // Creates the corresponding feature edge
   // Creates the corresponding feature edge
   fe = new FEdgeSharp(va, vb);
-  fe->SetNature(iwe.e->nature());
-  fe->SetId(_currentFId);
-  fe->SetaMaterialIndex(matA);
-  fe->SetbMaterialIndex(matB);
-  fe->SetNormalA(normalA);
-  fe->SetNormalB(normalB);
-  fe->SetPreviousEdge(feprevious);
+  fe->setNature(iwe.e->nature());
+  fe->setId(_currentFId);
+  fe->setaMaterialIndex(matA);
+  fe->setbMaterialIndex(matB);
+  fe->setNormalA(normalA);
+  fe->setNormalB(normalB);
+  fe->setPreviousEdge(feprevious);
   if(feprevious)
-    feprevious->SetNextEdge(fe);
+    feprevious->setNextEdge(fe);
   _pCurrentSShape->AddEdge(fe);
   va->AddFEdge(fe);
   vb->AddFEdge(fe);
diff --git a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h
index da63fa2f515..28a5d7d9dd4 100755
--- a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h
+++ b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h
@@ -175,9 +175,9 @@ public:
   inline int currentFId() const { return _currentFId; }
   inline int currentSVertexId() const { return _currentSVertexId; }
   /*! modifiers */
-  inline void SetCurrentViewId(int id) { _currentViewId = id; }
-  inline void SetCurrentFId(int id) { _currentFId = id; }
-  inline void SetCurrentSVertexId(int id) { _currentSVertexId = id; }
+  inline void setCurrentViewId(int id) { _currentViewId = id; }
+  inline void setCurrentFId(int id) { _currentFId = id; }
+  inline void setCurrentSVertexId(int id) { _currentSVertexId = id; }
 
 protected:
   /*! Init the view edges building */
diff --git a/source/blender/freestyle/intern/view_map/ViewMap.cpp b/source/blender/freestyle/intern/view_map/ViewMap.cpp
index 9a2d262b703..e0ae2ca373e 100755
--- a/source/blender/freestyle/intern/view_map/ViewMap.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewMap.cpp
@@ -144,7 +144,7 @@ TVertex* ViewMap::CreateTVertex(const Vec3r& iA3D, const Vec3r& iA2D, FEdge *iFE
     else
       tvertex = new TVertex(Ib,Ia);
 
-    tvertex->SetId(id);
+    tvertex->setId(id);
     
     // add these vertices to the view map
     AddViewVertex(tvertex);
@@ -191,18 +191,18 @@ ViewVertex * ViewMap::InsertViewVertex(SVertex *iVertex,
   // a new VEdge
   if(ioEdge->A() == 0){
     // closed loop
-    ioEdge->SetA(vva);
-    ioEdge->SetB(vva);
+    ioEdge->setA(vva);
+    ioEdge->setB(vva);
     // update sshape
     vshape->sshape()->RemoveEdgeFromChain(ioEdge->fedgeA());
     vshape->sshape()->RemoveEdgeFromChain(ioEdge->fedgeB());
 
-    ioEdge->SetFEdgeA(fbegin);
-    ioEdge->SetFEdgeB(fend);
+    ioEdge->setFEdgeA(fbegin);
+    ioEdge->setFEdgeB(fend);
 
     // Update FEdges
-    fend->SetNextEdge(0);
-    fbegin->SetPreviousEdge(0);
+    fend->setNextEdge(0);
+    fbegin->setPreviousEdge(0);
     
     // update new View Vertex:
     vva->AddOutgoingViewEdge(ioEdge);
@@ -213,16 +213,16 @@ ViewVertex * ViewMap::InsertViewVertex(SVertex *iVertex,
   }else{
     // Create new ViewEdge
     ViewEdge * newVEdge = new ViewEdge(vva, ioEdge->B(), fbegin, ioEdge->fedgeB(), vshape);
-    newVEdge->SetId(Id(ioEdge->getId().getFirst(), ioEdge->getId().getSecond()+1));
-    newVEdge->SetNature(ioEdge->getNature());
+    newVEdge->setId(Id(ioEdge->getId().getFirst(), ioEdge->getId().getSecond()+1));
+    newVEdge->setNature(ioEdge->getNature());
     //newVEdge->UpdateFEdges(); // done in the ViewEdge constructor
     // Update old ViewEdge
-    ioEdge->SetB(vva);
-    ioEdge->SetFEdgeB(fend);
+    ioEdge->setB(vva);
+    ioEdge->setFEdgeB(fend);
 
     // Update FEdges
-    fend->SetNextEdge(0);
-    fbegin->SetPreviousEdge(0);
+    fend->setNextEdge(0);
+    fbegin->setPreviousEdge(0);
 
     // update new View Vertex:
     vva->AddOutgoingViewEdge(newVEdge);
@@ -291,9 +291,9 @@ bool ViewEdgeComp(ViewVertex::directedViewEdge& dve1, ViewVertex::directedViewEd
   }
   return false;
 }
-void TVertex::SetFrontEdgeA(ViewEdge *iFrontEdgeA, bool incoming) {
+void TVertex::setFrontEdgeA(ViewEdge *iFrontEdgeA, bool incoming) {
   if (!iFrontEdgeA) {
-    cerr << "Warning: null pointer passed as argument of TVertex::SetFrontEdgeA()" << endl;
+    cerr << "Warning: null pointer passed as argument of TVertex::setFrontEdgeA()" << endl;
     return;
   }
   _FrontEdgeA = directedViewEdge(iFrontEdgeA, incoming);
@@ -307,9 +307,9 @@ void TVertex::SetFrontEdgeA(ViewEdge *iFrontEdgeA, bool incoming) {
   else
     _sortedEdges.push_back(&_FrontEdgeA);
 }
-void TVertex::SetFrontEdgeB(ViewEdge *iFrontEdgeB, bool incoming) {
+void TVertex::setFrontEdgeB(ViewEdge *iFrontEdgeB, bool incoming) {
   if (!iFrontEdgeB) {
-    cerr << "Warning: null pointer passed as argument of TVertex::SetFrontEdgeB()" << endl;
+    cerr << "Warning: null pointer passed as argument of TVertex::setFrontEdgeB()" << endl;
     return;
   }
   _FrontEdgeB = directedViewEdge(iFrontEdgeB, incoming);
@@ -323,9 +323,9 @@ void TVertex::SetFrontEdgeB(ViewEdge *iFrontEdgeB, bool incoming) {
   else
     _sortedEdges.push_back(&_FrontEdgeB);
 }
-void TVertex::SetBackEdgeA(ViewEdge *iBackEdgeA, bool incoming) {
+void TVertex::setBackEdgeA(ViewEdge *iBackEdgeA, bool incoming) {
   if (!iBackEdgeA) {
-    cerr << "Warning: null pointer passed as argument of TVertex::SetBackEdgeA()" << endl;
+    cerr << "Warning: null pointer passed as argument of TVertex::setBackEdgeA()" << endl;
     return;
   }
   _BackEdgeA = directedViewEdge(iBackEdgeA, incoming);
@@ -339,9 +339,9 @@ void TVertex::SetBackEdgeA(ViewEdge *iBackEdgeA, bool incoming) {
   else
     _sortedEdges.push_back(&_BackEdgeA);
 }
-void TVertex::SetBackEdgeB(ViewEdge *iBackEdgeB, bool incoming) {
+void TVertex::setBackEdgeB(ViewEdge *iBackEdgeB, bool incoming) {
   if (!iBackEdgeB) {
-    cerr << "Warning: null pointer passed as argument of TVertex::SetBackEdgeB()" << endl;
+    cerr << "Warning: null pointer passed as argument of TVertex::setBackEdgeB()" << endl;
     return;
   }
   _BackEdgeB = directedViewEdge(iBackEdgeB, incoming);
@@ -694,10 +694,10 @@ void ViewEdge::UpdateFEdges()
   FEdge *currentEdge = _FEdgeA;
   do
   {
-    currentEdge->SetViewEdge(this);
+    currentEdge->setViewEdge(this);
     currentEdge = currentEdge->nextEdge();
   }while((currentEdge != NULL) && (currentEdge!= _FEdgeB));
   // last one
-  _FEdgeB->SetViewEdge(this);
+  _FEdgeB->setViewEdge(this);
 
 }
diff --git a/source/blender/freestyle/intern/view_map/ViewMap.h b/source/blender/freestyle/intern/view_map/ViewMap.h
index 416b7e8f23f..2691da20057 100755
--- a/source/blender/freestyle/intern/view_map/ViewMap.h
+++ b/source/blender/freestyle/intern/view_map/ViewMap.h
@@ -427,8 +427,8 @@ public:
     _FrontEdgeB.first = 0;
     _BackEdgeA.first = 0;
     _BackEdgeB.first = 0;
-    svFront->SetViewVertex(this);
-    svBack->SetViewVertex(this);
+    svFront->setViewVertex(this);
+    svBack->setViewVertex(this);
   }
 
 protected:
@@ -465,15 +465,15 @@ public:
   
   /* modifiers */
   /*! Sets the SVertex that is closer to the viewpoint. */
-  inline void SetFrontVertex(SVertex  *iFrontSVertex) {_FrontSVertex = iFrontSVertex;_FrontSVertex->SetViewVertex(this);}
+  inline void setFrontVertex(SVertex  *iFrontSVertex) {_FrontSVertex = iFrontSVertex;_FrontSVertex->setViewVertex(this);}
   /*! Sets the SVertex that is further away from the viewpoint. */
-  inline void SetBackSVertex(SVertex  *iBackSVertex) {_BackSVertex = iBackSVertex;_BackSVertex->SetViewVertex(this);}
-  void SetFrontEdgeA(ViewEdge *iFrontEdgeA, bool incoming=true);
-  void SetFrontEdgeB(ViewEdge *iFrontEdgeB, bool incoming=true) ;
-  void SetBackEdgeA(ViewEdge *iBackEdgeA, bool incoming=true);
-  void SetBackEdgeB(ViewEdge *iBackEdgeB, bool incoming=true) ;
+  inline void setBackSVertex(SVertex  *iBackSVertex) {_BackSVertex = iBackSVertex;_BackSVertex->setViewVertex(this);}
+  void setFrontEdgeA(ViewEdge *iFrontEdgeA, bool incoming=true);
+  void setFrontEdgeB(ViewEdge *iFrontEdgeB, bool incoming=true) ;
+  void setBackEdgeA(ViewEdge *iBackEdgeA, bool incoming=true);
+  void setBackEdgeB(ViewEdge *iBackEdgeB, bool incoming=true) ;
   /*! Sets the Id. */
-  inline void SetId(const Id& iId) {_Id = iId;}
+  inline void setId(const Id& iId) {_Id = iId;}
   
   /*! Returns the SVertex (among the 2) belonging to the FEdge iFEdge */
   inline SVertex * GetSVertex(FEdge *iFEdge)
@@ -641,7 +641,7 @@ public:
   inline NonTVertex(SVertex* iSVertex) : ViewVertex(Nature::NON_T_VERTEX)
   {
     _SVertex = iSVertex;
-    _SVertex->SetViewVertex(this);
+    _SVertex->setViewVertex(this);
   }
 protected:
   /*! Copy constructor. */
@@ -649,7 +649,7 @@ protected:
     : ViewVertex(iBrother)
   {
     _SVertex = iBrother._SVertex;
-    _SVertex->SetViewVertex(this);
+    _SVertex->setViewVertex(this);
     _ViewEdges = iBrother._ViewEdges;
   }
   /*! Cloning method. */
@@ -669,8 +669,8 @@ public:
   
   /* modifiers */
   /*! Sets the SVertex on top of which this NonTVertex is built. */
-  inline void SetSVertex(SVertex *iSVertex) {_SVertex = iSVertex;_SVertex->SetViewVertex(this);}
-  inline void SetViewEdges(const vector<directedViewEdge>& iViewEdges) {_ViewEdges = iViewEdges;}
+  inline void setSVertex(SVertex *iSVertex) {_SVertex = iSVertex;_SVertex->setViewVertex(this);}
+  inline void setViewEdges(const vector<directedViewEdge>& iViewEdges) {_ViewEdges = iViewEdges;}
   void AddIncomingViewEdge(ViewEdge * iVEdge) ;
   void AddOutgoingViewEdge(ViewEdge * iVEdge) ;
   inline void AddViewEdge(ViewEdge * iVEdge, bool incoming=true) {
@@ -938,28 +938,28 @@ public:
   
   /* modifiers */
   /*! Sets the first ViewVertex of the ViewEdge. */
-  inline void SetA(ViewVertex* iA) { __A = iA; }
+  inline void setA(ViewVertex* iA) { __A = iA; }
   /*! Sets the last ViewVertex of the ViewEdge. */
-  inline void SetB(ViewVertex* iB) { __B = iB; }
+  inline void setB(ViewVertex* iB) { __B = iB; }
   /*! Sets the nature of the ViewEdge. */
-  inline void SetNature(Nature::EdgeNature iNature) { _Nature = iNature; }
+  inline void setNature(Nature::EdgeNature iNature) { _Nature = iNature; }
   /*! Sets the first FEdge of the ViewEdge. */
-  inline void SetFEdgeA(FEdge* iFEdge) { _FEdgeA = iFEdge; }
+  inline void setFEdgeA(FEdge* iFEdge) { _FEdgeA = iFEdge; }
   /*! Sets the last FEdge of the ViewEdge. */
-  inline void SetFEdgeB(FEdge* iFEdge) { _FEdgeB = iFEdge; }
+  inline void setFEdgeB(FEdge* iFEdge) { _FEdgeB = iFEdge; }
   /*! Sets the ViewShape to which this ViewEdge belongs to.*/
-  inline void SetShape(ViewShape *iVShape) 
+  inline void setShape(ViewShape *iVShape) 
   {
     _Shape = iVShape;
   }
   /*! Sets the ViewEdge id. */
-  inline void SetId(const Id& id) {_Id = id;}
+  inline void setId(const Id& id) {_Id = id;}
   /*! Sets Viewedge to this for all embedded fedges */
   void UpdateFEdges();
   /*! Sets the occluded ViewShape */
-  inline void SetaShape(ViewShape * iShape) {_aShape = iShape;}
+  inline void setaShape(ViewShape * iShape) {_aShape = iShape;}
   /*! Sets the quantitative invisibility value. */
-  inline void SetQI(int qi) {_qi = qi;}
+  inline void setQI(int qi) {_qi = qi;}
   /*! Sets the time stamp value. */
   inline void setChainingTimeStamp(unsigned ts) {_ChainingTimeStamp = ts;}
   inline void AddOccluder(ViewShape *iShape) {_Occluders.push_back(iShape);}
@@ -1099,7 +1099,7 @@ public:
   /*! Default constructor.*/
   inline ViewShape() { userdata = 0; _SShape = 0;}
   /*! Builds a ViewShape from a SShape. */
-  inline ViewShape(SShape *iSShape) {userdata = 0; _SShape = iSShape;}//_SShape->SetViewShape(this);}
+  inline ViewShape(SShape *iSShape) {userdata = 0; _SShape = iSShape;}//_SShape->setViewShape(this);}
   /*! Copy constructor. */
   inline ViewShape(ViewShape& iBrother)
   {
@@ -1146,10 +1146,10 @@ public:
           ViewEdge *veBackA = (ViewEdge*)(v)->backEdgeA().first->userdata;
           ViewEdge *veBackB = (ViewEdge*)(v)->backEdgeB().first->userdata;
 
-          v->SetFrontEdgeA(veFrontA, v->frontEdgeA().second);
-          v->SetFrontEdgeB(veFrontB, v->frontEdgeB().second);
-          v->SetBackEdgeA(veBackA, v->backEdgeA().second);
-          v->SetBackEdgeB(veBackB, v->backEdgeB().second);
+          v->setFrontEdgeA(veFrontA, v->frontEdgeA().second);
+          v->setFrontEdgeB(veFrontB, v->frontEdgeB().second);
+          v->setBackEdgeA(veBackA, v->backEdgeA().second);
+          v->setBackEdgeB(veBackB, v->backEdgeB().second);
         }
         break;
       case Nature::NON_T_VERTEX:
@@ -1164,7 +1164,7 @@ public:
             ViewEdge *current = (ViewEdge*)((ve)->first)->userdata;
             newEdges.push_back(ViewVertex::directedViewEdge(current, ve->second));
           }
-          (v)->SetViewEdges(newEdges);
+          (v)->setViewEdges(newEdges);
         }
         break;
       default:
@@ -1179,8 +1179,8 @@ public:
         ve!=veend;
         ve++)
       {
-        (*ve)->SetA((ViewVertex*)((*ve)->A()->userdata));
-        (*ve)->SetB((ViewVertex*)((*ve)->B()->userdata));
+        (*ve)->setA((ViewVertex*)((*ve)->A()->userdata));
+        (*ve)->setB((ViewVertex*)((*ve)->B()->userdata));
         //---------------------------------------
         // Update all embedded FEdges
         //---------------------------------------
@@ -1253,11 +1253,11 @@ public:
 
   /* modifiers */
   /*! Sets the SShape on top of which the ViewShape is built. */
-  inline void SetSShape(SShape* iSShape) {_SShape = iSShape;}
+  inline void setSShape(SShape* iSShape) {_SShape = iSShape;}
   /*! Sets the list of ViewVertex contained in this ViewShape. */
-  inline void SetVertices(const vector<ViewVertex*>& iVertices) {_Vertices = iVertices;}
+  inline void setVertices(const vector<ViewVertex*>& iVertices) {_Vertices = iVertices;}
   /*! Sets the list of ViewEdge contained in this ViewShape. */
-  inline void SetEdges(const vector<ViewEdge*>& iEdges) {_Edges = iEdges;}
+  inline void setEdges(const vector<ViewEdge*>& iEdges) {_Edges = iEdges;}
   /*! Adds a ViewVertex to the list. */
   inline void AddVertex(ViewVertex *iVertex) 
   {
@@ -1268,7 +1268,7 @@ public:
   inline void AddEdge(ViewEdge *iEdge) 
   {
     _Edges.push_back(iEdge);
-    iEdge->SetShape(this);
+    iEdge->setShape(this);
     //_SShape->AddNewEdge(iEdge->fedge());
   }
 
@@ -1358,13 +1358,13 @@ void ViewShape::SplitEdge(FEdge *fe,
         // remove the chain that was starting by the fedge A of vEdge (which is different from fe !!!!)
         shape->RemoveEdgeFromChain(vEdge->fedgeA());
         // we set 
-        vEdge->SetA(*vv);
-        vEdge->SetB(*vv);
-        vEdge->SetFEdgeA(newEdge);
+        vEdge->setA(*vv);
+        vEdge->setB(*vv);
+        vEdge->setFEdgeA(newEdge);
         //FEdge *previousEdge = newEdge->previousEdge();  
-        vEdge->SetFEdgeB(fe);
+        vEdge->setFEdgeB(fe);
         newVEdge = vEdge;
-        vEdge->fedgeA()->SetViewEdge(newVEdge);
+        vEdge->fedgeA()->setViewEdge(newVEdge);
       }
       else
       {
@@ -1372,15 +1372,15 @@ void ViewShape::SplitEdge(FEdge *fe,
         // while we create the view edge, it updates the "ViewEdge" pointer 
         // of every underlying FEdges to this.
         newVEdge = new ViewEdge((*vv),vvb);//, newEdge, vEdge->fedgeB());
-        newVEdge->SetNature((fe)->getNature());
-        newVEdge->SetFEdgeA(newEdge);
-        //newVEdge->SetFEdgeB(fe);
+        newVEdge->setNature((fe)->getNature());
+        newVEdge->setFEdgeA(newEdge);
+        //newVEdge->setFEdgeB(fe);
         // If our original viewedge is made of one FEdge, 
         // then 
         if((vEdge->fedgeA() == vEdge->fedgeB()) || (fe == vEdge->fedgeB()))
-          newVEdge->SetFEdgeB(newEdge);
+          newVEdge->setFEdgeB(newEdge);
         else
-          newVEdge->SetFEdgeB(vEdge->fedgeB()); //MODIF
+          newVEdge->setFEdgeB(vEdge->fedgeB()); //MODIF
 
         Id * newId = vEdge->splittingId();
         if(newId == 0){
@@ -1388,11 +1388,11 @@ void ViewShape::SplitEdge(FEdge *fe,
           vEdge->setSplittingId(newId);
         }
         newId->setSecond(newId->getSecond()+1);
-        newVEdge->SetId(*newId);
+        newVEdge->setId(*newId);
         newVEdge->setSplittingId(newId);
         //        Id id(vEdge->getId().getFirst(), vEdge->getId().getSecond()+1);
-        //        newVEdge->SetId(vEdge->getId());
-        //        vEdge->SetId(id);
+        //        newVEdge->setId(vEdge->getId());
+        //        vEdge->setId(id);
         
         AddEdge(newVEdge); // here this shape is set as the edge's shape
       
@@ -1405,8 +1405,8 @@ void ViewShape::SplitEdge(FEdge *fe,
           vvb->Replace((vEdge), newVEdge);
 
         // we split the view edge:
-        vEdge->SetB((*vv));
-        vEdge->SetFEdgeB(fe); //MODIF
+        vEdge->setB((*vv));
+        vEdge->setFEdgeB(fe); //MODIF
       
         // Update fedges so that they point to the new viewedge:
         newVEdge->UpdateFEdges();
@@ -1418,14 +1418,14 @@ void ViewShape::SplitEdge(FEdge *fe,
       if(sv == (*vv)->frontSVertex())
       { 
         // -- View Vertex A' --
-        (*vv)->SetFrontEdgeA(vEdge, true);
-        (*vv)->SetFrontEdgeB(newVEdge, false);
+        (*vv)->setFrontEdgeA(vEdge, true);
+        (*vv)->setFrontEdgeB(newVEdge, false);
       }
       else
       {
         // -- View Vertex A' --
-        (*vv)->SetBackEdgeA(vEdge, true);
-        (*vv)->SetBackEdgeB(newVEdge, false);
+        (*vv)->setBackEdgeA(vEdge, true);
+        (*vv)->setBackEdgeB(newVEdge, false);
       }
     }
 } 
diff --git a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
index 32f5283a63c..89e91e4f2c8 100755
--- a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
@@ -55,17 +55,17 @@ void ViewMapBuilder::computeInitialViewEdges(WingedEdge& we)
        it++) {
     // create the embedding
     psShape = new SShape;
-    psShape->SetId((*it)->GetId());
-    psShape->SetMaterials((*it)->materials()); // FIXME
+    psShape->setId((*it)->GetId());
+    psShape->setMaterials((*it)->materials()); // FIXME
 
     // create the view shape
     ViewShape * vshape = new ViewShape(psShape);
     // add this view shape to the view map:
     _ViewMap->AddViewShape(vshape);
   
-    _pViewEdgeBuilder->SetCurrentViewId(_currentId); // we want to number the view edges in a unique way for the while scene.
-    _pViewEdgeBuilder->SetCurrentFId(_currentFId); // we want to number the feature edges in a unique way for the while scene.
-    _pViewEdgeBuilder->SetCurrentSVertexId(_currentFId); // we want to number the SVertex in a unique way for the while scene.
+    _pViewEdgeBuilder->setCurrentViewId(_currentId); // we want to number the view edges in a unique way for the while scene.
+    _pViewEdgeBuilder->setCurrentFId(_currentFId); // we want to number the feature edges in a unique way for the while scene.
+    _pViewEdgeBuilder->setCurrentSVertexId(_currentFId); // we want to number the SVertex in a unique way for the while scene.
     _pViewEdgeBuilder->BuildViewEdges(dynamic_cast<WXShape*>(*it), vshape, 
 				      _ViewMap->ViewEdges(), 
 				      _ViewMap->ViewVertices(), 
@@ -239,12 +239,12 @@ void ViewMapBuilder::ComputeRayCastingVisibility(ViewMap *ioViewMap, Grid* iGrid
 	FindOccludee(fe, iGrid, epsilon, &aFace, timestamp++);
 
       if(aFace) { 
-	fe->SetaFace(*aFace);
+	fe->setaFace(*aFace);
 	aFaces.push_back(aFace);
-	fe->SetOccludeeEmpty(false);
+	fe->setOccludeeEmpty(false);
       }
       else
-	fe->SetOccludeeEmpty(true);
+	fe->setOccludeeEmpty(true);
 
       ++nSamples;
       fe = fe->nextEdge();
@@ -253,7 +253,7 @@ void ViewMapBuilder::ComputeRayCastingVisibility(ViewMap *ioViewMap, Grid* iGrid
 
     // ViewEdge
     // qi --
-    (*ve)->SetQI(maxIndex);
+    (*ve)->setQI(maxIndex);
     // occluders --
     for(set<ViewShape*>::iterator o=occluders.begin(), oend=occluders.end();
     o!=oend;
@@ -264,7 +264,7 @@ void ViewMapBuilder::ComputeRayCastingVisibility(ViewMap *ioViewMap, Grid* iGrid
     {
       if(aFaces.size() <= (float)nSamples/2.f)
       {
-        (*ve)->SetaShape(0);
+        (*ve)->setaShape(0);
       }
       else
       {
@@ -272,7 +272,7 @@ void ViewMapBuilder::ComputeRayCastingVisibility(ViewMap *ioViewMap, Grid* iGrid
         WFace * wface = (WFace*)((*p)->userdata);
         ViewShape *vshape = ioViewMap->viewShape(wface->GetVertex(0)->shape()->GetId());
         ++p;
-        (*ve)->SetaShape(vshape);
+        (*ve)->setaShape(vshape);
       }
     }
     
@@ -360,7 +360,7 @@ void ViewMapBuilder::ComputeFastRayCastingVisibility(ViewMap *ioViewMap, Grid* i
 
         if(aFace)
         { 
-          fe->SetaFace(*aFace);
+          fe->setaFace(*aFace);
           aFaces.push_back(aFace);
         } 
         ++nSamples;
@@ -371,13 +371,13 @@ void ViewMapBuilder::ComputeFastRayCastingVisibility(ViewMap *ioViewMap, Grid* i
       fe = fe->nextEdge();
     } while ((maxCard < qiMajority) && (0!=fe) && (fe!=festart));
 
-    (*ve)->SetQI(maxIndex);
+    (*ve)->setQI(maxIndex);
 
     if(!aFaces.empty())
     {
       if(aFaces.size() < nSamples / 2)
       {
-        (*ve)->SetaShape(0);
+        (*ve)->setaShape(0);
       }
       else
       {
@@ -398,11 +398,11 @@ void ViewMapBuilder::ComputeFastRayCastingVisibility(ViewMap *ioViewMap, Grid* i
         //          } 
         //        } 
         //        if(sameShape)
-        (*ve)->SetaShape(vshape);
+        (*ve)->setaShape(vshape);
       }
     }
     
-    //(*ve)->SetaFace(aFace);
+    //(*ve)->setaFace(aFace);
     
     if(progressBarDisplay) {  
       counter--;
@@ -448,17 +448,17 @@ void ViewMapBuilder::ComputeVeryFastRayCastingVisibility(ViewMap *ioViewMap, Gri
     qi = ComputeRayCastingVisibility(fe, iGrid, epsilon, occluders, &aFace, timestamp++);
     if(aFace)
     { 
-      fe->SetaFace(*aFace);
+      fe->setaFace(*aFace);
       WFace * wface = (WFace*)(aFace->userdata);
       ViewShape *vshape = ioViewMap->viewShape(wface->GetVertex(0)->shape()->GetId());
-      (*ve)->SetaShape(vshape);
+      (*ve)->setaShape(vshape);
     } 
     else
     {
-      (*ve)->SetaShape(0);
+      (*ve)->setaShape(0);
     }
 
-    (*ve)->SetQI(qi);
+    (*ve)->setQI(qi);
     
     if(progressBarDisplay) {  
       counter--;
@@ -562,7 +562,7 @@ void ViewMapBuilder::FindOccludee(FEdge *fe, Grid* iGrid, real epsilon, Polygon3
               *oaPolygon = (*p);
               mint = t;
               noIntersection = false;
-              fe->SetOccludeeIntersection(Vec3r(A+t*v));
+              fe->setOccludeeIntersection(Vec3r(A+t*v));
             }
           }
       }  
diff --git a/source/blender/freestyle/intern/view_map/ViewMapBuilder.h b/source/blender/freestyle/intern/view_map/ViewMapBuilder.h
index ec52d4fdd7e..5ac100bae15 100755
--- a/source/blender/freestyle/intern/view_map/ViewMapBuilder.h
+++ b/source/blender/freestyle/intern/view_map/ViewMapBuilder.h
@@ -113,7 +113,7 @@ public:
 
 
   /*! Sets the current viewpoint */
-  inline void SetViewpoint(const Vec3r& ivp) {_viewpoint = ivp; SilhouetteGeomEngine::SetViewpoint(ivp);}
+  inline void setViewpoint(const Vec3r& ivp) {_viewpoint = ivp; SilhouetteGeomEngine::setViewpoint(ivp);}
 
   /*! Sets the current transformation
    *    iModelViewMatrix
@@ -123,17 +123,17 @@ public:
    *    iViewport
    *      The viewport. 4 real array: origin.x, origin.y, width, length
    */
-  inline void SetTransform(const real iModelViewMatrix[4][4],
+  inline void setTransform(const real iModelViewMatrix[4][4],
 			   const real iProjectionMatrix[4][4],
 			   const int iViewport[4],
 			   real iFocalLength,
 			   real iAspect,
 			   real iFovy) {
-    SilhouetteGeomEngine::SetTransform(iModelViewMatrix, iProjectionMatrix, iViewport, iFocalLength);
+    SilhouetteGeomEngine::setTransform(iModelViewMatrix, iProjectionMatrix, iViewport, iFocalLength);
   }
   
-  inline void SetFrustum(real iZnear, real iZfar) {
-    SilhouetteGeomEngine::SetFrustum(iZnear, iZfar);
+  inline void setFrustum(real iZnear, real iZfar) {
+    SilhouetteGeomEngine::setFrustum(iZnear, iZfar);
   }
 
   /*! Builds the scene view map
@@ -164,13 +164,13 @@ public:
    */
   void ComputeEdgesVisibility(ViewMap *ioViewMap, visibility_algo iAlgo= ray_casting, Grid* iGrid = 0, real epsilon=1e-6);
 
-  void SetGrid(Grid *iGrid) {_Grid = iGrid;}
+  void setGrid(Grid *iGrid) {_Grid = iGrid;}
   
   /*! accessors */
  
   /*! Modifiers */
-  inline void SetProgressBar(ProgressBar *iProgressBar) {_pProgressBar = iProgressBar;}
-  inline void SetEnableQI(bool iBool) {_EnableQI = iBool;}
+  inline void setProgressBar(ProgressBar *iProgressBar) {_pProgressBar = iProgressBar;}
+  inline void setEnableQI(bool iBool) {_EnableQI = iBool;}
 
 protected:
 
diff --git a/source/blender/freestyle/intern/view_map/ViewMapIO.cpp b/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
index 4e2796113c8..370f44dffcf 100755
--- a/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
@@ -99,26 +99,26 @@ namespace ViewMapIO {
       // Diffuse
       for (i = 0; i < 4; i++)
 	READ(tmp_array[i]);
-      m.SetDiffuse(tmp_array[0], tmp_array[1], tmp_array[2], tmp_array[3]);
+      m.setDiffuse(tmp_array[0], tmp_array[1], tmp_array[2], tmp_array[3]);
 
       // Specular
       for (i = 0; i < 4; i++)
 	READ(tmp_array[i]);
-      m.SetSpecular(tmp_array[0], tmp_array[1], tmp_array[2], tmp_array[3]);
+      m.setSpecular(tmp_array[0], tmp_array[1], tmp_array[2], tmp_array[3]);
 
       // Ambient
       for (i = 0; i < 4; i++)
 	READ(tmp_array[i]);
-      m.SetAmbient(tmp_array[0], tmp_array[1], tmp_array[2], tmp_array[3]);
+      m.setAmbient(tmp_array[0], tmp_array[1], tmp_array[2], tmp_array[3]);
 
       // Emission
       for (i = 0; i < 4; i++)
 	READ(tmp_array[i]);
-      m.SetEmission(tmp_array[0], tmp_array[1], tmp_array[2], tmp_array[3]);
+      m.setEmission(tmp_array[0], tmp_array[1], tmp_array[2], tmp_array[3]);
 
       // Shininess
       READ(tmp_array[0]);
-      m.SetShininess(tmp_array[0]);
+      m.setShininess(tmp_array[0]);
 
       return 0;
     }
@@ -135,12 +135,12 @@ namespace ViewMapIO {
       Id::id_type id1, id2;
       READ(id1);
       READ(id2);
-      vs->sshape()->SetId(Id(id1, id2));
+      vs->sshape()->setId(Id(id1, id2));
 
       // -> Importance
       float importance;
       READ(importance);
-      vs->sshape()->SetImportance(importance);
+      vs->sshape()->setImportance(importance);
 
       // -> BBox
       //    Not necessary (only used during view map computatiom)
@@ -155,7 +155,7 @@ namespace ViewMapIO {
         load(in, m);
         materials.push_back(m);
       }
-      vs->sshape()->SetMaterials(materials);
+      vs->sshape()->setMaterials(materials);
 
       
 
@@ -222,51 +222,51 @@ namespace ViewMapIO {
       Id::id_type id1, id2;
       READ(id1);
       READ(id2);
-      fe->SetId(Id(id1, id2));
+      fe->setId(Id(id1, id2));
 
       // Nature
       Nature::EdgeNature nature;
       READ(nature);
-      fe->SetNature(nature);
+      fe->setNature(nature);
 
       // hasVisibilityPoint
       //      bool b;
       //      READ(b);
-      //      fe->SetHasVisibilityPoint(b);
+      //      fe->setHasVisibilityPoint(b);
  
       Vec3r v;
       unsigned int matindex;
 
       // VisibilityPointA
       //      load(in, v);
-      //      fe->SetVisibilityPointA(v);
+      //      fe->setVisibilityPointA(v);
 
       // VisibilityPointB
       //      load(in, v);
-      //      fe->SetVisibilityPointB(v);
+      //      fe->setVisibilityPointB(v);
 
       if(fe->isSmooth()){
         // Normal
         load(in, v);
-        fesmooth->SetNormal(v);
+        fesmooth->setNormal(v);
 
         // Material
         READ(matindex);
-        fesmooth->SetMaterialIndex(matindex);
+        fesmooth->setMaterialIndex(matindex);
       }else{
         // aNormal
         load(in, v);
-        fesharp->SetNormalA(v);
+        fesharp->setNormalA(v);
 
         // bNormal
         load(in, v);
-        fesharp->SetNormalB(v);
+        fesharp->setNormalB(v);
 
         // Materials 
         READ(matindex);
-        fesharp->SetaMaterialIndex(matindex);
+        fesharp->setaMaterialIndex(matindex);
         READ(matindex);
-        fesharp->SetbMaterialIndex(matindex);
+        fesharp->setbMaterialIndex(matindex);
       }
       
       unsigned tmp;
@@ -274,27 +274,27 @@ namespace ViewMapIO {
       // VertexA
       SVertex* sva;
       READ_IF_NON_NULL(sva, g_vm->SVertices());
-      fe->SetVertexA(sva);
+      fe->setVertexA(sva);
      
       // VertexB
       SVertex* svb;
       READ_IF_NON_NULL(svb, g_vm->SVertices());
-      fe->SetVertexB(svb);
+      fe->setVertexB(svb);
 
       // NextEdge
       FEdge* nfe;
       READ_IF_NON_NULL(nfe, g_vm->FEdges());
-      fe->SetNextEdge(nfe);
+      fe->setNextEdge(nfe);
 
       // PreviousEdge
       FEdge* pfe;
       READ_IF_NON_NULL(pfe, g_vm->FEdges());
-      fe->SetPreviousEdge(pfe);
+      fe->setPreviousEdge(pfe);
 
       // ViewEdge
       ViewEdge* ve;
       READ_IF_NON_NULL(ve, g_vm->ViewEdges());
-      fe->SetViewEdge(ve);
+      fe->setViewEdge(ve);
 
       // Face
       // Not necessary (only used during view map computatiom)
@@ -303,15 +303,15 @@ namespace ViewMapIO {
     
       // aFace
       load(in, p);
-      fe->SetaFace(p);
+      fe->setaFace(p);
 
       // occludeeEmpty
       READ(b);
-      fe->SetOccludeeEmpty(b);
+      fe->setOccludeeEmpty(b);
       
       // occludeeIntersection
       load(in, v);
-      fe->SetOccludeeIntersection(v);
+      fe->setOccludeeIntersection(v);
 
       return 0;
     }
@@ -326,29 +326,29 @@ namespace ViewMapIO {
       Id::id_type id1, id2;
       READ(id1);
       READ(id2);
-      sv->SetId(Id(id1, id2));
+      sv->setId(Id(id1, id2));
 
       Vec3r v;
 
       // Point3D
       load(in, v);
-      sv->SetPoint3D(v);
+      sv->setPoint3D(v);
 
       // Point2D
       load(in, v);
-      sv->SetPoint2D(v);
+      sv->setPoint2D(v);
 
       unsigned tmp;
 
       // Shape
       ViewShape* vs;
       READ_IF_NON_NULL(vs, g_vm->ViewShapes());
-      sv->SetShape(vs->sshape());
+      sv->setShape(vs->sshape());
 
       // pViewVertex
       ViewVertex* vv;
       READ_IF_NON_NULL(vv, g_vm->ViewVertices());
-      sv->SetViewVertex(vv);
+      sv->setViewVertex(vv);
 
       unsigned i, size;
 
@@ -382,46 +382,46 @@ namespace ViewMapIO {
       Id::id_type id1, id2;
       READ(id1);
       READ(id2);
-      ve->SetId(Id(id1, id2));
+      ve->setId(Id(id1, id2));
 
       // Nature
       Nature::EdgeNature nature;
       READ(nature);
-      ve->SetNature(nature);
+      ve->setNature(nature);
 
       // QI
       READ(tmp);
-      ve->SetQI(tmp);
+      ve->setQI(tmp);
 
       // Shape
       ViewShape* vs;
       READ_IF_NON_NULL(vs, g_vm->ViewShapes());
-      ve->SetShape(vs);
+      ve->setShape(vs);
 
       // aShape
       ViewShape* avs;
       READ_IF_NON_NULL(avs, g_vm->ViewShapes());
-      ve->SetaShape(avs);
+      ve->setaShape(avs);
 
       // FEdgeA
       FEdge* fea;
       READ_IF_NON_NULL(fea, g_vm->FEdges());
-      ve->SetFEdgeA(fea);
+      ve->setFEdgeA(fea);
 
       // FEdgeB
       FEdge* feb;
       READ_IF_NON_NULL(feb, g_vm->FEdges());
-      ve->SetFEdgeB(feb);
+      ve->setFEdgeB(feb);
 
       // A
       ViewVertex* vva;
       READ_IF_NON_NULL(vva, g_vm->ViewVertices());
-      ve->SetA(vva);
+      ve->setA(vva);
 
       // B
       ViewVertex* vvb;
       READ_IF_NON_NULL(vvb, g_vm->ViewVertices());
-      ve->SetB(vvb);
+      ve->setB(vvb);
 
       // Occluders (List)
       if (!(Options::getFlags() & Options::NO_OCCLUDERS)) {
@@ -458,41 +458,41 @@ namespace ViewMapIO {
 	Id::id_type id1, id2;
 	READ(id1);
 	READ(id2);
-	tv->SetId(Id(id1, id2));
+	tv->setId(Id(id1, id2));
 
 	// FrontSVertex
 	SVertex* fsv;
 	READ_IF_NON_NULL(fsv, g_vm->SVertices());
-	tv->SetFrontVertex(fsv);
+	tv->setFrontVertex(fsv);
 
 	// BackSVertex
 	SVertex* bsv;
 	READ_IF_NON_NULL(bsv, g_vm->SVertices());
-	tv->SetBackSVertex(bsv);
+	tv->setBackSVertex(bsv);
 
 	// FrontEdgeA
 	ViewEdge* fea;
 	READ_IF_NON_NULL(fea, g_vm->ViewEdges());
 	READ(b);
-	tv->SetFrontEdgeA(fea, b);
+	tv->setFrontEdgeA(fea, b);
 
 	// FrontEdgeB
 	ViewEdge* feb;
 	READ_IF_NON_NULL(feb, g_vm->ViewEdges());
 	READ(b);
-	tv->SetFrontEdgeB(feb, b);
+	tv->setFrontEdgeB(feb, b);
 
 	// BackEdgeA
 	ViewEdge* bea;
 	READ_IF_NON_NULL(bea, g_vm->ViewEdges());
 	READ(b);
-	tv->SetBackEdgeA(bea, b);
+	tv->setBackEdgeA(bea, b);
 
 	// BackEdgeB
 	ViewEdge* beb;
 	READ_IF_NON_NULL(beb, g_vm->ViewEdges());
 	READ(b);
-	tv->SetBackEdgeB(beb, b);
+	tv->setBackEdgeB(beb, b);
       }
       else if (vv->getNature() & Nature::NON_T_VERTEX) {
 	NonTVertex* ntv = dynamic_cast<NonTVertex*>(vv);
@@ -500,7 +500,7 @@ namespace ViewMapIO {
 	// SVertex
 	SVertex* sv;
 	READ_IF_NON_NULL(sv, g_vm->SVertices());
-	ntv->SetSVertex(sv);
+	ntv->setSVertex(sv);
 	
 	// ViewEdges (List)
 	unsigned size;
@@ -1015,8 +1015,8 @@ namespace ViewMapIO {
     for (unsigned i0 = 0; i0 < vs_s; i0++) {
       SShape* ss = new SShape();
       ViewShape* vs = new ViewShape();
-      vs->SetSShape(ss);
-      ss->SetViewShape(vs);
+      vs->setSShape(ss);
+      ss->setViewShape(vs);
       vm->AddViewShape(vs);
     }
     //    for (unsigned i1 = 0; i1 < fe_s; i1++) {
diff --git a/source/blender/freestyle/intern/view_map/ViewMapTesselator.h b/source/blender/freestyle/intern/view_map/ViewMapTesselator.h
index fc1ec8e373e..2d054d8a067 100755
--- a/source/blender/freestyle/intern/view_map/ViewMapTesselator.h
+++ b/source/blender/freestyle/intern/view_map/ViewMapTesselator.h
@@ -49,7 +49,7 @@ class LIB_VIEW_MAP_EXPORT ViewMapTesselator
 {
 public:
 
-  inline ViewMapTesselator() {_nature = Nature::SILHOUETTE | Nature::BORDER | Nature::CREASE;_Material.SetDiffuse(0,0,0,1);_overloadMaterial=false;}
+  inline ViewMapTesselator() {_nature = Nature::SILHOUETTE | Nature::BORDER | Nature::CREASE;_Material.setDiffuse(0,0,0,1);_overloadMaterial=false;}
   virtual ~ViewMapTesselator() {}
 
   /*! Builds a set of lines rep contained under a 
@@ -70,8 +70,8 @@ public:
   NodeGroup* Tesselate(WShape* iWShape);
 
   
-  inline void SetNature(Nature::EdgeNature iNature) {_nature = iNature;}
-  inline void SetMaterial(const Material& iMaterial) {_Material=iMaterial;_overloadMaterial=true;}
+  inline void setNature(Nature::EdgeNature iNature) {_nature = iNature;}
+  inline void setMaterial(const Material& iMaterial) {_Material=iMaterial;_overloadMaterial=true;}
   inline Nature::EdgeNature nature() {return _nature;}
   inline const Material& material() const {return _Material;}
 
@@ -123,8 +123,8 @@ NodeGroup * ViewMapTesselator::Tesselate(ViewEdgesIterator begin, ViewEdgesItera
   NodeGroup *group = new NodeGroup;
   NodeShape *tshape = new NodeShape;
   group->AddChild(tshape);
-  //tshape->material().SetDiffuse(0.f, 0.f, 0.f, 1.f);
-  tshape->SetMaterial(_Material);
+  //tshape->material().setDiffuse(0.f, 0.f, 0.f, 1.f);
+  tshape->setMaterial(_Material);
 
   LineRep* line;
 
@@ -153,12 +153,12 @@ NodeGroup * ViewMapTesselator::Tesselate(ViewEdgesIterator begin, ViewEdgesItera
       
       line = new OrientedLineRep();
       if(_overloadMaterial)
-        line->SetMaterial(_Material);
+        line->setMaterial(_Material);
 
       // there might be chains containing a single element
       if(0 == (firstEdge)->nextEdge())
       {
-        line->SetStyle(LineRep::LINES);
+        line->setStyle(LineRep::LINES);
         // line->AddVertex((*c)->vertexA()->point3D());
         // line->AddVertex((*c)->vertexB()->point3D());
         AddVertexToLine(line, firstEdge->vertexA());
@@ -166,7 +166,7 @@ NodeGroup * ViewMapTesselator::Tesselate(ViewEdgesIterator begin, ViewEdgesItera
       }
       else
       {
-        line->SetStyle(LineRep::LINE_STRIP);
+        line->setStyle(LineRep::LINE_STRIP);
 
         //firstEdge = (*c);
         nextFEdge = firstEdge;
@@ -184,7 +184,7 @@ NodeGroup * ViewMapTesselator::Tesselate(ViewEdgesIterator begin, ViewEdgesItera
                 
       }
 
-      line->SetId((*c)->getId().getFirst());
+      line->setId((*c)->getId().getFirst());
       line->ComputeBBox();
       tshape->AddRep(line);
       id++;
diff --git a/source/blender/freestyle/intern/winged_edge/WEdge.cpp b/source/blender/freestyle/intern/winged_edge/WEdge.cpp
index 3f27bf6a8a0..0d02e0ca131 100755
--- a/source/blender/freestyle/intern/winged_edge/WEdge.cpp
+++ b/source/blender/freestyle/intern/winged_edge/WEdge.cpp
@@ -292,10 +292,10 @@ WOEdge * WFace::MakeEdge(WVertex *v1, WVertex *v2)
       // Adds the edge to the face
       //AddEdge((*it1)->GetaOEdge());
       AddEdge(woea);
-      (*it1)->SetNumberOfOEdges((*it1)->GetNumberOfOEdges()+1);
+      (*it1)->setNumberOfOEdges((*it1)->GetNumberOfOEdges()+1);
       //sets these vertices as border:
-      v1->SetBorder(true);
-      v2->SetBorder(true);
+      v1->setBorder(true);
+      v2->setBorder(true);
       //return (*it1)->GetaOEdge();
       return woea;
     }
@@ -311,10 +311,10 @@ WOEdge * WFace::MakeEdge(WVertex *v1, WVertex *v2)
       // Adds the edge to the face
       //AddEdge((*it1)->GetaOEdge());
       AddEdge(woeb);
-      (*it1)->SetNumberOfOEdges((*it1)->GetNumberOfOEdges()+1);
+      (*it1)->setNumberOfOEdges((*it1)->GetNumberOfOEdges()+1);
       //sets these vertices as border:
-      v1->SetBorder(true);
-      v2->SetBorder(true);
+      v1->setBorder(true);
+      v2->setBorder(true);
       //return (*it1)->GetaOEdge();
       return woeb;
     }
@@ -352,10 +352,10 @@ WOEdge * WFace::MakeEdge(WVertex *v1, WVertex *v2)
     edge = pInvertEdge->GetOwner(); 
     
     // Sets the a Face (retrieved from pInvertEdge
-    pOEdge->SetaFace(pInvertEdge->GetbFace());
+    pOEdge->setaFace(pInvertEdge->GetbFace());
     
     // Updates the invert edge:
-    pInvertEdge->SetaFace(this);
+    pInvertEdge->setaFace(this);
   }
   else // The invert edge does not exist yet
   {
@@ -369,20 +369,20 @@ WOEdge * WFace::MakeEdge(WVertex *v1, WVertex *v2)
 
   }
 
-  pOEdge->SetOwner(edge);
+  pOEdge->setOwner(edge);
   // Add the vertices:
-  pOEdge->SetaVertex(v1);
-  pOEdge->SetbVertex(v2);
+  pOEdge->setaVertex(v1);
+  pOEdge->setbVertex(v2);
 
   // Debug:
   if(v1->GetId() == v2->GetId())
     cerr << "Warning: edge " << this << " null with vertex " << v1->GetId() << endl;
 
   edge->AddOEdge(pOEdge);
-  //edge->SetNumberOfOEdges(edge->GetNumberOfOEdges()+1);
+  //edge->setNumberOfOEdges(edge->GetNumberOfOEdges()+1);
 
   // Add this face (the b face)
-  pOEdge->SetbFace(this);
+  pOEdge->setbFace(this);
 
   // Adds the edge to the face
   AddEdge(pOEdge);
@@ -487,7 +487,7 @@ WShape::WShape(WShape& iBrother)
     //WVertex *newVertex = new WVertex(*(*v));
     WVertex *newVertex = (*v)->duplicate();
 
-    newVertex->SetShape(this);
+    newVertex->setShape(this);
     AddVertex(newVertex);
   }
 
@@ -528,7 +528,7 @@ WShape::WShape(WShape& iBrother)
       edgedata * currentvedata = (edgedata*)current->userdata;
       newvedgelist.push_back(currentvedata->_copy);
     }
-    (*v)->SetEdges(newvedgelist);
+    (*v)->setEdges(newvedgelist);
   }
 
   eend = _EdgeList.end();
@@ -538,23 +538,23 @@ WShape::WShape(WShape& iBrother)
   {
     // update aOedge:
     WOEdge *aoEdge = (*e)->GetaOEdge();
-    aoEdge->SetaVertex(((vertexdata*)(aoEdge->GetaVertex()->userdata))->_copy);
-    aoEdge->SetbVertex(((vertexdata*)(aoEdge->GetbVertex()->userdata))->_copy);
+    aoEdge->setaVertex(((vertexdata*)(aoEdge->GetaVertex()->userdata))->_copy);
+    aoEdge->setbVertex(((vertexdata*)(aoEdge->GetbVertex()->userdata))->_copy);
     if(NULL != aoEdge->GetaFace())
-      aoEdge->SetaFace(((facedata*)(aoEdge->GetaFace()->userdata))->_copy);
-    aoEdge->SetbFace(((facedata*)(aoEdge->GetbFace()->userdata))->_copy);
-    aoEdge->SetOwner(((edgedata*)(aoEdge->GetOwner()->userdata))->_copy);
+      aoEdge->setaFace(((facedata*)(aoEdge->GetaFace()->userdata))->_copy);
+    aoEdge->setbFace(((facedata*)(aoEdge->GetbFace()->userdata))->_copy);
+    aoEdge->setOwner(((edgedata*)(aoEdge->GetOwner()->userdata))->_copy);
     // update bOedge:
 
     WOEdge *boEdge = (*e)->GetbOEdge();
     if(boEdge != 0)
     {
-      boEdge->SetaVertex(((vertexdata*)(boEdge->GetaVertex()->userdata))->_copy);
-      boEdge->SetbVertex(((vertexdata*)(boEdge->GetbVertex()->userdata))->_copy);
+      boEdge->setaVertex(((vertexdata*)(boEdge->GetaVertex()->userdata))->_copy);
+      boEdge->setbVertex(((vertexdata*)(boEdge->GetbVertex()->userdata))->_copy);
       if(NULL != boEdge->GetaFace())
-        boEdge->SetaFace(((facedata*)(boEdge->GetaFace()->userdata))->_copy);
-      boEdge->SetbFace(((facedata*)(boEdge->GetbFace()->userdata))->_copy);
-      boEdge->SetOwner(((edgedata*)(boEdge->GetOwner()->userdata))->_copy);
+        boEdge->setaFace(((facedata*)(boEdge->GetaFace()->userdata))->_copy);
+      boEdge->setbFace(((facedata*)(boEdge->GetbFace()->userdata))->_copy);
+      boEdge->setOwner(((edgedata*)(boEdge->GetOwner()->userdata))->_copy);
     }
   }
 
@@ -576,7 +576,7 @@ WShape::WShape(WShape& iBrother)
       //oedgeList[i] = currentoedata->_copy;
       //oedgeList[i] = ((oedgedata*)(oedgeList[i]->userdata))->_copy;
     }
-    (*f)->SetEdgeList(newoedgelist);
+    (*f)->setEdgeList(newoedgelist);
   }
 
   // Free all memory (arghh!)
@@ -638,9 +638,9 @@ WFace * WShape::MakeFace(vector<WVertex*>& iVertexList, vector<Vec3r>& iNormalsL
     return 0;
 
   // set the list of per-vertex normals
-  face->SetNormalList(iNormalsList);
+  face->setNormalList(iNormalsList);
   // set the list of per-vertex tex coords
-  face->SetTexCoordsList(iTexCoordsList);
+  face->setTexCoordsList(iTexCoordsList);
 
   return face;
 }
@@ -650,7 +650,7 @@ WFace* WShape::MakeFace(vector<WVertex*>& iVertexList, unsigned iMaterial, WFace
 
   int id = _FaceList.size();
 
-  face->SetMaterialIndex(iMaterial);
+  face->setMaterialIndex(iMaterial);
 
   // Check whether we have a degenerated face:
 
@@ -701,7 +701,7 @@ WFace* WShape::MakeFace(vector<WVertex*>& iVertexList, unsigned iMaterial, WFace
     {
       // means that we just created a new edge and that we must add it to the 
       // shape's edges list
-      edge->SetId(_EdgeList.size());
+      edge->setId(_EdgeList.size());
       AddEdge(edge);
       // compute the mean edge value:
       _meanEdgeSize += edge->GetaOEdge()->getVec3r().norm();
@@ -722,10 +722,10 @@ WFace* WShape::MakeFace(vector<WVertex*>& iVertexList, unsigned iMaterial, WFace
 
   Vec3r normal(vector1 ^ vector2);
   normal.normalize();
-  face->SetNormal(normal);
+  face->setNormal(normal);
 
   // Add the face to the shape's faces list:
-  face->SetId(id);
+  face->setId(id);
   AddFace(face);
 
   return face;
diff --git a/source/blender/freestyle/intern/winged_edge/WEdge.h b/source/blender/freestyle/intern/winged_edge/WEdge.h
index b4c6a38f5bd..99dc83faf96 100755
--- a/source/blender/freestyle/intern/winged_edge/WEdge.h
+++ b/source/blender/freestyle/intern/winged_edge/WEdge.h
@@ -80,12 +80,12 @@ public:
   bool isBoundary();
   
   /*! modifiers */
-  inline void SetVertex(const Vec3r& v) {_Vertex = v;}
-  inline void SetEdges(const vector<WEdge *>& iEdgeList) {_EdgeList = iEdgeList;}
-  inline void SetId(int id) {_Id = id;}
-  inline void SetShape(WShape *iShape) {_Shape = iShape;}
-  inline void SetSmooth(bool b) {_Smooth = b;}
-  inline void SetBorder(bool b) {if(b) _Border= 1; else _Border = 0;}
+  inline void setVertex(const Vec3r& v) {_Vertex = v;}
+  inline void setEdges(const vector<WEdge *>& iEdgeList) {_EdgeList = iEdgeList;}
+  inline void setId(int id) {_Id = id;}
+  inline void setShape(WShape *iShape) {_Shape = iShape;}
+  inline void setSmooth(bool b) {_Smooth = b;}
+  inline void setBorder(bool b) {if(b) _Border= 1; else _Border = 0;}
   
   /*! Adds an edge to the edges list */
   void AddEdge(WEdge *iEdge) ;
@@ -333,11 +333,11 @@ public:
   //  inline void SetbCWEdge(WOEdge *pe) {_pbCWEdge = pe;}
   //  inline void SetaCCWEdge(WOEdge *pe) {_paCCWEdge = pe;}
   //  inline void SetbCCCWEdge(WOEdge *pe) {_pbCCWEdge = pe;}
-  inline void SetaVertex(WVertex *pv) {_paVertex = pv;}
-  inline void SetbVertex(WVertex *pv) {_pbVertex = pv;}
-  inline void SetaFace(WFace *pf) {_paFace = pf;}
-  inline void SetbFace(WFace *pf) {_pbFace = pf;}
-  inline void SetOwner(WEdge *pe) {_pOwner = pe;}
+  inline void setaVertex(WVertex *pv) {_paVertex = pv;}
+  inline void setbVertex(WVertex *pv) {_pbVertex = pv;}
+  inline void setaFace(WFace *pf) {_paFace = pf;}
+  inline void setbFace(WFace *pf) {_pbFace = pf;}
+  inline void setOwner(WEdge *pe) {_pOwner = pe;}
 
   /*! Retrieves the list of edges in CW order */
   inline void RetrieveCWOrderedEdges(vector<WEdge*>& oEdges);
@@ -453,8 +453,8 @@ public:
   }
 
   /*! modifiers */
-  inline void SetaOEdge(WOEdge *iEdge) {_paOEdge = iEdge;}
-  inline void SetbOEdge(WOEdge *iEdge) {_pbOEdge = iEdge;}
+  inline void setaOEdge(WOEdge *iEdge) {_paOEdge = iEdge;}
+  inline void setbOEdge(WOEdge *iEdge) {_pbOEdge = iEdge;}
   inline void AddOEdge(WOEdge *iEdge) 
   {
     if(NULL == _paOEdge)
@@ -470,8 +470,8 @@ public:
       return;
     }
   }
-  inline void SetNumberOfOEdges(int n) {_nOEdges = n;}
-  inline void SetId(int id) {_Id = id;}
+  inline void setNumberOfOEdges(int n) {_nOEdges = n;}
+  inline void setId(int id) {_Id = id;}
   virtual void ResetUserData() {userdata = 0;}
 };
 
@@ -648,12 +648,12 @@ public:
     return false;
   }
   /*! modifiers */
-  inline void SetEdgeList(const vector<WOEdge*>& iEdgeList) {_OEdgeList = iEdgeList;}
-  inline void SetNormal(const Vec3r& iNormal) {_Normal = iNormal;}
-  inline void SetNormalList(const vector<Vec3r>& iNormalsList) {_VerticesNormals = iNormalsList;}
-  inline void SetTexCoordsList(const vector<Vec2r>& iTexCoordsList) {_VerticesTexCoords = iTexCoordsList;}
-  inline void SetId(int id) {_Id = id;}
-  inline void SetMaterialIndex(unsigned iMaterialIndex) {_MaterialIndex = iMaterialIndex;}
+  inline void setEdgeList(const vector<WOEdge*>& iEdgeList) {_OEdgeList = iEdgeList;}
+  inline void setNormal(const Vec3r& iNormal) {_Normal = iNormal;}
+  inline void setNormalList(const vector<Vec3r>& iNormalsList) {_VerticesNormals = iNormalsList;}
+  inline void setTexCoordsList(const vector<Vec2r>& iTexCoordsList) {_VerticesTexCoords = iTexCoordsList;}
+  inline void setId(int id) {_Id = id;}
+  inline void setMaterialIndex(unsigned iMaterialIndex) {_MaterialIndex = iMaterialIndex;}
 
   /*! designed to build a specialized WEdge 
    *  for use in MakeEdge
@@ -753,14 +753,14 @@ public:
   inline const vector<Material>& materials() const {return _Materials;}
   inline const real getMeanEdgeSize() const {return _meanEdgeSize;}
   /*! modifiers */
-  static inline void SetCurrentId(const unsigned id) { _SceneCurrentId = id; }
-  inline void SetEdgeList(const vector<WEdge*>& iEdgeList) {_EdgeList = iEdgeList;}
-  inline void SetVertexList(const vector<WVertex*>& iVertexList) {_VertexList = iVertexList;}
-  inline void SetFaceList(const vector<WFace*>& iFaceList) {_FaceList = iFaceList;}
-  inline void SetId(int id) {_Id = id;}
-  inline void SetBBox(const Vec3r& min, const Vec3r& max) {_min = min; _max=max;}
-  inline void SetMaterial(const Material& material, unsigned i) {_Materials[i]=material;}
-  inline void SetMaterials(const vector<Material>& iMaterials) {_Materials = iMaterials;}
+  static inline void setCurrentId(const unsigned id) { _SceneCurrentId = id; }
+  inline void setEdgeList(const vector<WEdge*>& iEdgeList) {_EdgeList = iEdgeList;}
+  inline void setVertexList(const vector<WVertex*>& iVertexList) {_VertexList = iVertexList;}
+  inline void setFaceList(const vector<WFace*>& iFaceList) {_FaceList = iFaceList;}
+  inline void setId(int id) {_Id = id;}
+  inline void setBBox(const Vec3r& min, const Vec3r& max) {_min = min; _max=max;}
+  inline void setMaterial(const Material& material, unsigned i) {_Materials[i]=material;}
+  inline void setMaterials(const vector<Material>& iMaterials) {_Materials = iMaterials;}
 
   /*! designed to build a specialized WFace 
    *  for use in MakeFace
@@ -806,7 +806,7 @@ public:
 
   inline void AddEdge(WEdge *iEdge) {_EdgeList.push_back(iEdge);}
   inline void AddFace(WFace* iFace) {_FaceList.push_back(iFace);}
-  inline void AddVertex(WVertex *iVertex) {iVertex->SetShape(this); _VertexList.push_back(iVertex);}
+  inline void AddVertex(WVertex *iVertex) {iVertex->setShape(this); _VertexList.push_back(iVertex);}
 
   inline void ResetUserData()
   {
diff --git a/source/blender/freestyle/intern/winged_edge/WXEdge.cpp b/source/blender/freestyle/intern/winged_edge/WXEdge.cpp
index 115a4f61789..ff567aee06a 100755
--- a/source/blender/freestyle/intern/winged_edge/WXEdge.cpp
+++ b/source/blender/freestyle/intern/winged_edge/WXEdge.cpp
@@ -162,16 +162,16 @@ WXSmoothEdge* WXFaceLayer::BuildSmoothEdge(){
   }
   if(ok){
     _pSmoothEdge = new WXSmoothEdge;
-    _pSmoothEdge->SetWOeA(woea);
-    _pSmoothEdge->SetWOeB(woeb);
-    _pSmoothEdge->SetTa(ta);
-    _pSmoothEdge->SetTb(tb);
+    _pSmoothEdge->setWOeA(woea);
+    _pSmoothEdge->setWOeB(woeb);
+    _pSmoothEdge->setTa(ta);
+    _pSmoothEdge->setTb(tb);
     if(_Nature & Nature::SILHOUETTE){
       if(_nNullDotP != 2){
         if(_DotP[_ClosestPointIndex] + 0.01 > 0)
-          _pSmoothEdge->SetFront(true);
+          _pSmoothEdge->setFront(true);
         else
-          _pSmoothEdge->SetFront(false); 
+          _pSmoothEdge->setFront(false); 
       }
     }
   }
@@ -221,10 +221,10 @@ WXSmoothEdge* WXFaceLayer::BuildSmoothEdge(){
   //          } 
   //      
   //        _pSmoothEdge = new ExactSilhouetteEdge(ExactSilhouetteEdge::VERTEX_VERTEX);
-  //        _pSmoothEdge->SetWOeA(woea);
-  //        _pSmoothEdge->SetWOeA(woeb);
-  //        _pSmoothEdge->SetTa(ta);
-  //        _pSmoothEdge->SetTb(tb);
+  //        _pSmoothEdge->setWOeA(woea);
+  //        _pSmoothEdge->setWOeA(woeb);
+  //        _pSmoothEdge->setTa(ta);
+  //        _pSmoothEdge->setTb(tb);
   //
   //        return _pSmoothEdge;
   //        }
@@ -246,7 +246,7 @@ void WXFace::ComputeCenter()
     center += (*wv)->GetVertex();
   }
   center /= (real)iVertexList.size();
-  SetCenter(center);
+  setCenter(center);
 }
 
                   /**********************************/
@@ -272,7 +272,7 @@ WFace* WXShape::MakeFace(vector<WVertex*>& iVertexList, unsigned iMaterialIndex)
     center += (*wv)->GetVertex();
   }
   center /= (real)iVertexList.size();
-  ((WXFace*)face)->SetCenter(center);
+  ((WXFace*)face)->setCenter(center);
 
   return face;
 }
@@ -289,7 +289,7 @@ WFace * WXShape::MakeFace(vector<WVertex*>& iVertexList, vector<Vec3r>& iNormals
   //    center += (*wv)->GetVertex();
   //  }
   //  center /= (real)iVertexList.size();
-  //  ((WSFace*)face)->SetCenter(center);
+  //  ((WSFace*)face)->setCenter(center);
 
   return face;
 }
diff --git a/source/blender/freestyle/intern/winged_edge/WXEdge.h b/source/blender/freestyle/intern/winged_edge/WXEdge.h
index 8c53bb8390e..0518e70d90b 100755
--- a/source/blender/freestyle/intern/winged_edge/WXEdge.h
+++ b/source/blender/freestyle/intern/winged_edge/WXEdge.h
@@ -129,10 +129,10 @@ public:
   inline int order() const {return _order;}
   
   /*! modifiers */
-  inline void SetFront(bool iFront) {_front = iFront;}
-  inline void SetNature(WXNature iNature) {_nature = iNature;}
+  inline void setFront(bool iFront) {_front = iFront;}
+  inline void setNature(WXNature iNature) {_nature = iNature;}
   inline void AddNature(WXNature iNature) {_nature = _nature|iNature;}
-  inline void SetOrder(int i) {_order = i;}
+  inline void setOrder(int i) {_order = i;}
   
 };
 
@@ -186,12 +186,12 @@ public:
   inline Configuration configuration() const {return _config;} 
   
   /*! modifiers */
-  inline void SetWOeA(WOEdge *iwoea) {_woea = iwoea;}
-  inline void SetWOeB(WOEdge *iwoeb) {_woeb = iwoeb;}
-  inline void SetTa(real ta) {_ta = ta;}
-  inline void SetTb(real tb) {_tb = tb;}
-  inline void SetFront(bool iFront) {_front = iFront;}
-  inline void SetConfiguration(Configuration iConf) {_config = iConf;}
+  inline void setWOeA(WOEdge *iwoea) {_woea = iwoea;}
+  inline void setWOeB(WOEdge *iwoeb) {_woeb = iwoeb;}
+  inline void setTa(real ta) {_ta = ta;}
+  inline void setTb(real tb) {_tb = tb;}
+  inline void setFront(bool iFront) {_front = iFront;}
+  inline void setConfiguration(Configuration iConf) {_config = iConf;}
   
 };
 /* Class to store a value per vertex and a smooth edge. 
@@ -256,7 +256,7 @@ public:
   inline WXFace * getFace() {return _pWXFace;}
   inline WXSmoothEdge * getSmoothEdge() {return _pSmoothEdge;}
   inline bool isViewDependant() const {return _viewDependant;}
-  inline void SetClosestPointIndex(int iIndex) {_ClosestPointIndex = iIndex;}
+  inline void setClosestPointIndex(int iIndex) {_ClosestPointIndex = iIndex;}
 
   inline void removeSmoothEdge() {
     if(!_DotP.empty())
@@ -283,7 +283,7 @@ public:
    */
   void RetrieveCuspEdgesIndices(vector<int>& oCuspEdges);
   WXSmoothEdge * BuildSmoothEdge();
-  inline void SetDotP(const vector<real>& iDotP) {_DotP = iDotP;}
+  inline void setDotP(const vector<real>& iDotP) {_DotP = iDotP;}
   inline void PushDotP(real iDotP) {
     _DotP.push_back(iDotP);
     if(iDotP > 0)
@@ -401,11 +401,11 @@ public:
     }
   }
   /*! modifiers */
-  inline void SetCenter(const Vec3r& iCenter) {_center = iCenter;}
+  inline void setCenter(const Vec3r& iCenter) {_center = iCenter;}
   void ComputeCenter();
-  inline void SetZ(real z) {_Z = z;}
-  inline void SetFront(bool iFront) {_front = iFront;}
-  inline void SetDotP(real iDotP) 
+  inline void setZ(real z) {_Z = z;}
+  inline void setFront(bool iFront) {_front = iFront;}
+  inline void setDotP(real iDotP) 
   {
     _dotp = iDotP;
     if(_dotp > 0)
diff --git a/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp b/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp
index 534c6e323a9..9d22b4f8db5 100755
--- a/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp
+++ b/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp
@@ -25,8 +25,8 @@ void WXEdgeBuilder::visitIndexedFaceSet(IndexedFaceSet& ifs)
 {
   WXShape *shape = new WXShape;
   buildWShape(*shape, ifs);
-  shape->SetId(ifs.getId().getFirst());
-  //ifs.SetId(shape->GetId());
+  shape->setId(ifs.getId().getFirst());
+  //ifs.setId(shape->GetId());
 }
 
 void WXEdgeBuilder::buildWVertices(WShape& shape,
@@ -37,7 +37,7 @@ void WXEdgeBuilder::buildWVertices(WShape& shape,
     vertex = new WXVertex(Vec3r(vertices[i],
 				      vertices[i + 1],
 				      vertices[i + 2]));
-    vertex->SetId(i / 3);
+    vertex->setId(i / 3);
     shape.AddVertex(vertex);
   }
 }
diff --git a/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp
index e611c1106f2..c95231a72dc 100755
--- a/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp
+++ b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp
@@ -28,8 +28,8 @@ using namespace std;
 void WingedEdgeBuilder::visitIndexedFaceSet(IndexedFaceSet& ifs) {
   WShape *shape = new WShape;
   buildWShape(*shape, ifs);
-  shape->SetId(ifs.getId().getFirst());
-  //ifs.SetId(shape->GetId());
+  shape->setId(ifs.getId().getFirst());
+  //ifs.setId(shape->GetId());
 }
 
 void WingedEdgeBuilder::visitNodeShape(NodeShape& ns) {
@@ -93,14 +93,14 @@ void WingedEdgeBuilder::buildWShape(WShape& shape, IndexedFaceSet& ifs) {
 		const Material*const* mats = ifs.materials();
 		for(unsigned i=0; i<ifs.msize(); ++i)
 			materials.push_back(*(mats[i]));
-		shape.SetMaterials(materials);
+		shape.setMaterials(materials);
 	}
 
   //  const Material * mat = (ifs.material());
   //  if (mat)
-  //    shape.SetMaterial(*mat);
+  //    shape.setMaterial(*mat);
   //  else if(_current_material)
-  //    shape.SetMaterial(*_current_material);
+  //    shape.setMaterial(*_current_material);
 
   // sets the current WShape to shape
   _current_wshape = &shape;
@@ -193,7 +193,7 @@ void WingedEdgeBuilder::buildWShape(WShape& shape, IndexedFaceSet& ifs) {
       ++fit;
     }
     if(normalsSet.size()!=1){
-      (*wv)->SetSmooth(false);
+      (*wv)->setSmooth(false);
     }
   }
   // Adds the new WShape to the WingedEdge structure
@@ -208,7 +208,7 @@ void WingedEdgeBuilder::buildWVertices(WShape& shape,
     vertex = new WVertex(Vec3r(vertices[i],
 			       vertices[i + 1],
 			       vertices[i + 2]));
-    vertex->SetId(i / 3);
+    vertex->setId(i / 3);
     shape.AddVertex(vertex);
   }
 }
diff --git a/source/blender/freestyle/python/Freestyle.py b/source/blender/freestyle/python/Freestyle.py
index 40e879654bc..e4b81a7d071 100755
--- a/source/blender/freestyle/python/Freestyle.py
+++ b/source/blender/freestyle/python/Freestyle.py
@@ -1,5 +1,5 @@
 # This file was automatically generated by SWIG (http://www.swig.org).
-# Version 1.3.35
+# Version 1.3.31
 #
 # Don't modify this file, modify the SWIG interface instead.
 # This file is compatible with both classic and new-style classes.
@@ -60,7 +60,7 @@ class PySwigIterator(_object):
     __setattr__ = lambda self, name, value: _swig_setattr(self, PySwigIterator, name, value)
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, PySwigIterator, name)
-    def __init__(self, *args, **kwargs): raise AttributeError, "No constructor defined"
+    def __init__(self): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
     __swig_destroy__ = _Freestyle.delete_PySwigIterator
     __del__ = lambda self : None;
@@ -658,11 +658,11 @@ class Material(_object):
     def emissionB(*args): return _Freestyle.Material_emissionB(*args)
     def emissionA(*args): return _Freestyle.Material_emissionA(*args)
     def shininess(*args): return _Freestyle.Material_shininess(*args)
-    def SetDiffuse(*args): return _Freestyle.Material_SetDiffuse(*args)
-    def SetSpecular(*args): return _Freestyle.Material_SetSpecular(*args)
-    def SetAmbient(*args): return _Freestyle.Material_SetAmbient(*args)
-    def SetEmission(*args): return _Freestyle.Material_SetEmission(*args)
-    def SetShininess(*args): return _Freestyle.Material_SetShininess(*args)
+    def setDiffuse(*args): return _Freestyle.Material_setDiffuse(*args)
+    def setSpecular(*args): return _Freestyle.Material_setSpecular(*args)
+    def setAmbient(*args): return _Freestyle.Material_setAmbient(*args)
+    def setEmission(*args): return _Freestyle.Material_setEmission(*args)
+    def setShininess(*args): return _Freestyle.Material_setShininess(*args)
     def __ne__(*args): return _Freestyle.Material___ne__(*args)
     def __eq__(*args): return _Freestyle.Material___eq__(*args)
 Material_swigregister = _Freestyle.Material_swigregister
@@ -718,7 +718,7 @@ class Interface0DIteratorNested(_object):
     __setattr__ = lambda self, name, value: _swig_setattr(self, Interface0DIteratorNested, name, value)
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, Interface0DIteratorNested, name)
-    def __init__(self, *args, **kwargs): raise AttributeError, "No constructor defined"
+    def __init__(self): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
     __swig_destroy__ = _Freestyle.delete_Interface0DIteratorNested
     __del__ = lambda self : None;
@@ -803,8 +803,11 @@ class Interface1D(_object):
     __setattr__ = lambda self, name, value: _swig_setattr(self, Interface1D, name, value)
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, Interface1D, name)
-    def __init__(self, *args, **kwargs): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
+    def __init__(self, *args): 
+        this = _Freestyle.new_Interface1D(*args)
+        try: self.this.append(this)
+        except: self.this = this
     __swig_destroy__ = _Freestyle.delete_Interface1D
     __del__ = lambda self : None;
     def getExactTypeName(*args): return _Freestyle.Interface1D_getExactTypeName(*args)
@@ -864,8 +867,8 @@ class SVertex(Interface0D):
     def fedges_end(*args): return _Freestyle.SVertex_fedges_end(*args)
     def z(*args): return _Freestyle.SVertex_z(*args)
     def viewvertex(*args): return _Freestyle.SVertex_viewvertex(*args)
-    def SetPoint3D(*args): return _Freestyle.SVertex_SetPoint3D(*args)
-    def SetPoint2D(*args): return _Freestyle.SVertex_SetPoint2D(*args)
+    def setPoint3D(*args): return _Freestyle.SVertex_setPoint3D(*args)
+    def setPoint2D(*args): return _Freestyle.SVertex_setPoint2D(*args)
     def AddNormal(*args): return _Freestyle.SVertex_AddNormal(*args)
     def setCurvatureInfo(*args): return _Freestyle.SVertex_setCurvatureInfo(*args)
     def getCurvatureInfo(*args): return _Freestyle.SVertex_getCurvatureInfo(*args)
@@ -873,10 +876,10 @@ class SVertex(Interface0D):
     def setDirectionFredo(*args): return _Freestyle.SVertex_setDirectionFredo(*args)
     def curvatureFredo(*args): return _Freestyle.SVertex_curvatureFredo(*args)
     def directionFredo(*args): return _Freestyle.SVertex_directionFredo(*args)
-    def SetId(*args): return _Freestyle.SVertex_SetId(*args)
-    def SetFEdges(*args): return _Freestyle.SVertex_SetFEdges(*args)
-    def SetShape(*args): return _Freestyle.SVertex_SetShape(*args)
-    def SetViewVertex(*args): return _Freestyle.SVertex_SetViewVertex(*args)
+    def setId(*args): return _Freestyle.SVertex_setId(*args)
+    def setFEdges(*args): return _Freestyle.SVertex_setFEdges(*args)
+    def setShape(*args): return _Freestyle.SVertex_setShape(*args)
+    def setViewVertex(*args): return _Freestyle.SVertex_setViewVertex(*args)
     def AddFEdge(*args): return _Freestyle.SVertex_AddFEdge(*args)
     def Replace(*args): return _Freestyle.SVertex_Replace(*args)
     def fedge(*args): return _Freestyle.SVertex_fedge(*args)
@@ -935,17 +938,17 @@ class FEdge(Interface1D):
     def getOccludeeIntersection(*args): return _Freestyle.FEdge_getOccludeeIntersection(*args)
     def getOccludeeEmpty(*args): return _Freestyle.FEdge_getOccludeeEmpty(*args)
     def isSmooth(*args): return _Freestyle.FEdge_isSmooth(*args)
-    def SetVertexA(*args): return _Freestyle.FEdge_SetVertexA(*args)
-    def SetVertexB(*args): return _Freestyle.FEdge_SetVertexB(*args)
-    def SetId(*args): return _Freestyle.FEdge_SetId(*args)
-    def SetNextEdge(*args): return _Freestyle.FEdge_SetNextEdge(*args)
-    def SetPreviousEdge(*args): return _Freestyle.FEdge_SetPreviousEdge(*args)
-    def SetNature(*args): return _Freestyle.FEdge_SetNature(*args)
-    def SetViewEdge(*args): return _Freestyle.FEdge_SetViewEdge(*args)
-    def SetaFace(*args): return _Freestyle.FEdge_SetaFace(*args)
-    def SetOccludeeIntersection(*args): return _Freestyle.FEdge_SetOccludeeIntersection(*args)
-    def SetOccludeeEmpty(*args): return _Freestyle.FEdge_SetOccludeeEmpty(*args)
-    def SetSmooth(*args): return _Freestyle.FEdge_SetSmooth(*args)
+    def setVertexA(*args): return _Freestyle.FEdge_setVertexA(*args)
+    def setVertexB(*args): return _Freestyle.FEdge_setVertexB(*args)
+    def setId(*args): return _Freestyle.FEdge_setId(*args)
+    def setNextEdge(*args): return _Freestyle.FEdge_setNextEdge(*args)
+    def setPreviousEdge(*args): return _Freestyle.FEdge_setPreviousEdge(*args)
+    def setNature(*args): return _Freestyle.FEdge_setNature(*args)
+    def setViewEdge(*args): return _Freestyle.FEdge_setViewEdge(*args)
+    def setaFace(*args): return _Freestyle.FEdge_setaFace(*args)
+    def setOccludeeIntersection(*args): return _Freestyle.FEdge_setOccludeeIntersection(*args)
+    def setOccludeeEmpty(*args): return _Freestyle.FEdge_setOccludeeEmpty(*args)
+    def setSmooth(*args): return _Freestyle.FEdge_setSmooth(*args)
     __swig_getmethods__["CommonVertex"] = lambda x: _Freestyle.FEdge_CommonVertex
     if _newclass:CommonVertex = staticmethod(_Freestyle.FEdge_CommonVertex)
     def min2d(*args): return _Freestyle.FEdge_min2d(*args)
@@ -1027,8 +1030,8 @@ class FEdgeSVertexIterator(Interface0DIteratorNested):
     def shape(*args): return _Freestyle.FEdgeSVertexIterator_shape(*args)
     def z(*args): return _Freestyle.FEdgeSVertexIterator_z(*args)
     def viewvertex(*args): return _Freestyle.FEdgeSVertexIterator_viewvertex(*args)
-    def SetPoint3D(*args): return _Freestyle.FEdgeSVertexIterator_SetPoint3D(*args)
-    def SetPoint2D(*args): return _Freestyle.FEdgeSVertexIterator_SetPoint2D(*args)
+    def setPoint3D(*args): return _Freestyle.FEdgeSVertexIterator_setPoint3D(*args)
+    def setPoint2D(*args): return _Freestyle.FEdgeSVertexIterator_setPoint2D(*args)
     def AddNormal(*args): return _Freestyle.FEdgeSVertexIterator_AddNormal(*args)
     def setCurvatureInfo(*args): return _Freestyle.FEdgeSVertexIterator_setCurvatureInfo(*args)
     def getCurvatureInfo(*args): return _Freestyle.FEdgeSVertexIterator_getCurvatureInfo(*args)
@@ -1036,10 +1039,10 @@ class FEdgeSVertexIterator(Interface0DIteratorNested):
     def setDirectionFredo(*args): return _Freestyle.FEdgeSVertexIterator_setDirectionFredo(*args)
     def curvatureFredo(*args): return _Freestyle.FEdgeSVertexIterator_curvatureFredo(*args)
     def directionFredo(*args): return _Freestyle.FEdgeSVertexIterator_directionFredo(*args)
-    def SetId(*args): return _Freestyle.FEdgeSVertexIterator_SetId(*args)
-    def SetFEdges(*args): return _Freestyle.FEdgeSVertexIterator_SetFEdges(*args)
-    def SetShape(*args): return _Freestyle.FEdgeSVertexIterator_SetShape(*args)
-    def SetViewVertex(*args): return _Freestyle.FEdgeSVertexIterator_SetViewVertex(*args)
+    def setId(*args): return _Freestyle.FEdgeSVertexIterator_setId(*args)
+    def setFEdges(*args): return _Freestyle.FEdgeSVertexIterator_setFEdges(*args)
+    def setShape(*args): return _Freestyle.FEdgeSVertexIterator_setShape(*args)
+    def setViewVertex(*args): return _Freestyle.FEdgeSVertexIterator_setViewVertex(*args)
     def AddFEdge(*args): return _Freestyle.FEdgeSVertexIterator_AddFEdge(*args)
     def Replace(*args): return _Freestyle.FEdgeSVertexIterator_Replace(*args)
     def fedge(*args): return _Freestyle.FEdgeSVertexIterator_fedge(*args)
@@ -1081,10 +1084,10 @@ class FEdgeSharp(FEdge):
     def aMaterial(*args): return _Freestyle.FEdgeSharp_aMaterial(*args)
     def bMaterialIndex(*args): return _Freestyle.FEdgeSharp_bMaterialIndex(*args)
     def bMaterial(*args): return _Freestyle.FEdgeSharp_bMaterial(*args)
-    def SetNormalA(*args): return _Freestyle.FEdgeSharp_SetNormalA(*args)
-    def SetNormalB(*args): return _Freestyle.FEdgeSharp_SetNormalB(*args)
-    def SetaMaterialIndex(*args): return _Freestyle.FEdgeSharp_SetaMaterialIndex(*args)
-    def SetbMaterialIndex(*args): return _Freestyle.FEdgeSharp_SetbMaterialIndex(*args)
+    def setNormalA(*args): return _Freestyle.FEdgeSharp_setNormalA(*args)
+    def setNormalB(*args): return _Freestyle.FEdgeSharp_setNormalB(*args)
+    def setaMaterialIndex(*args): return _Freestyle.FEdgeSharp_setaMaterialIndex(*args)
+    def setbMaterialIndex(*args): return _Freestyle.FEdgeSharp_setbMaterialIndex(*args)
 FEdgeSharp_swigregister = _Freestyle.FEdgeSharp_swigregister
 FEdgeSharp_swigregister(FEdgeSharp)
 
@@ -1107,9 +1110,9 @@ class FEdgeSmooth(FEdge):
     def normal(*args): return _Freestyle.FEdgeSmooth_normal(*args)
     def materialIndex(*args): return _Freestyle.FEdgeSmooth_materialIndex(*args)
     def material(*args): return _Freestyle.FEdgeSmooth_material(*args)
-    def SetFace(*args): return _Freestyle.FEdgeSmooth_SetFace(*args)
-    def SetNormal(*args): return _Freestyle.FEdgeSmooth_SetNormal(*args)
-    def SetMaterialIndex(*args): return _Freestyle.FEdgeSmooth_SetMaterialIndex(*args)
+    def setFace(*args): return _Freestyle.FEdgeSmooth_setFace(*args)
+    def setNormal(*args): return _Freestyle.FEdgeSmooth_setNormal(*args)
+    def setMaterialIndex(*args): return _Freestyle.FEdgeSmooth_setMaterialIndex(*args)
 FEdgeSmooth_swigregister = _Freestyle.FEdgeSmooth_swigregister
 FEdgeSmooth_swigregister(FEdgeSmooth)
 
@@ -1135,7 +1138,7 @@ class SShape(_object):
     def CreateSVertex(*args): return _Freestyle.SShape_CreateSVertex(*args)
     def SplitEdge(*args): return _Freestyle.SShape_SplitEdge(*args)
     def SplitEdgeIn2(*args): return _Freestyle.SShape_SplitEdgeIn2(*args)
-    def SetBBox(*args): return _Freestyle.SShape_SetBBox(*args)
+    def setBBox(*args): return _Freestyle.SShape_setBBox(*args)
     def ComputeBBox(*args): return _Freestyle.SShape_ComputeBBox(*args)
     def RemoveEdgeFromChain(*args): return _Freestyle.SShape_RemoveEdgeFromChain(*args)
     def RemoveEdge(*args): return _Freestyle.SShape_RemoveEdge(*args)
@@ -1148,10 +1151,10 @@ class SShape(_object):
     def viewShape(*args): return _Freestyle.SShape_viewShape(*args)
     def importance(*args): return _Freestyle.SShape_importance(*args)
     def getId(*args): return _Freestyle.SShape_getId(*args)
-    def SetId(*args): return _Freestyle.SShape_SetId(*args)
-    def SetMaterials(*args): return _Freestyle.SShape_SetMaterials(*args)
-    def SetViewShape(*args): return _Freestyle.SShape_SetViewShape(*args)
-    def SetImportance(*args): return _Freestyle.SShape_SetImportance(*args)
+    def setId(*args): return _Freestyle.SShape_setId(*args)
+    def setMaterials(*args): return _Freestyle.SShape_setMaterials(*args)
+    def setViewShape(*args): return _Freestyle.SShape_setViewShape(*args)
+    def setImportance(*args): return _Freestyle.SShape_setImportance(*args)
 SShape_swigregister = _Freestyle.SShape_swigregister
 SShape_swigregister(SShape)
 
@@ -1434,7 +1437,7 @@ class ViewVertex(Interface0D):
     __swig_getmethods__ = {}
     for _s in [Interface0D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
     __getattr__ = lambda self, name: _swig_getattr(self, ViewVertex, name)
-    def __init__(self, *args, **kwargs): raise AttributeError, "No constructor defined"
+    def __init__(self): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
     def getExactTypeName(*args): return _Freestyle.ViewVertex_getExactTypeName(*args)
     __swig_setmethods__["userdata"] = _Freestyle.ViewVertex_userdata_set
@@ -1484,13 +1487,13 @@ class TVertex(ViewVertex):
     def frontEdgeB(*args): return _Freestyle.TVertex_frontEdgeB(*args)
     def backEdgeA(*args): return _Freestyle.TVertex_backEdgeA(*args)
     def backEdgeB(*args): return _Freestyle.TVertex_backEdgeB(*args)
-    def SetFrontVertex(*args): return _Freestyle.TVertex_SetFrontVertex(*args)
-    def SetBackSVertex(*args): return _Freestyle.TVertex_SetBackSVertex(*args)
-    def SetFrontEdgeA(*args): return _Freestyle.TVertex_SetFrontEdgeA(*args)
-    def SetFrontEdgeB(*args): return _Freestyle.TVertex_SetFrontEdgeB(*args)
-    def SetBackEdgeA(*args): return _Freestyle.TVertex_SetBackEdgeA(*args)
-    def SetBackEdgeB(*args): return _Freestyle.TVertex_SetBackEdgeB(*args)
-    def SetId(*args): return _Freestyle.TVertex_SetId(*args)
+    def setFrontVertex(*args): return _Freestyle.TVertex_setFrontVertex(*args)
+    def setBackSVertex(*args): return _Freestyle.TVertex_setBackSVertex(*args)
+    def setFrontEdgeA(*args): return _Freestyle.TVertex_setFrontEdgeA(*args)
+    def setFrontEdgeB(*args): return _Freestyle.TVertex_setFrontEdgeB(*args)
+    def setBackEdgeA(*args): return _Freestyle.TVertex_setBackEdgeA(*args)
+    def setBackEdgeB(*args): return _Freestyle.TVertex_setBackEdgeB(*args)
+    def setId(*args): return _Freestyle.TVertex_setId(*args)
     def GetSVertex(*args): return _Freestyle.TVertex_GetSVertex(*args)
     def Replace(*args): return _Freestyle.TVertex_Replace(*args)
     def mate(*args): return _Freestyle.TVertex_mate(*args)
@@ -1532,8 +1535,8 @@ class NonTVertex(ViewVertex):
     __del__ = lambda self : None;
     def svertex(*args): return _Freestyle.NonTVertex_svertex(*args)
     def viewedges(*args): return _Freestyle.NonTVertex_viewedges(*args)
-    def SetSVertex(*args): return _Freestyle.NonTVertex_SetSVertex(*args)
-    def SetViewEdges(*args): return _Freestyle.NonTVertex_SetViewEdges(*args)
+    def setSVertex(*args): return _Freestyle.NonTVertex_setSVertex(*args)
+    def setViewEdges(*args): return _Freestyle.NonTVertex_setViewEdges(*args)
     def AddIncomingViewEdge(*args): return _Freestyle.NonTVertex_AddIncomingViewEdge(*args)
     def AddOutgoingViewEdge(*args): return _Freestyle.NonTVertex_AddOutgoingViewEdge(*args)
     def AddViewEdge(*args): return _Freestyle.NonTVertex_AddViewEdge(*args)
@@ -1576,16 +1579,16 @@ class ViewEdge(Interface1D):
     def bShape(*args): return _Freestyle.ViewEdge_bShape(*args)
     def occluders(*args): return _Freestyle.ViewEdge_occluders(*args)
     def splittingId(*args): return _Freestyle.ViewEdge_splittingId(*args)
-    def SetA(*args): return _Freestyle.ViewEdge_SetA(*args)
-    def SetB(*args): return _Freestyle.ViewEdge_SetB(*args)
-    def SetNature(*args): return _Freestyle.ViewEdge_SetNature(*args)
-    def SetFEdgeA(*args): return _Freestyle.ViewEdge_SetFEdgeA(*args)
-    def SetFEdgeB(*args): return _Freestyle.ViewEdge_SetFEdgeB(*args)
-    def SetShape(*args): return _Freestyle.ViewEdge_SetShape(*args)
-    def SetId(*args): return _Freestyle.ViewEdge_SetId(*args)
+    def setA(*args): return _Freestyle.ViewEdge_setA(*args)
+    def setB(*args): return _Freestyle.ViewEdge_setB(*args)
+    def setNature(*args): return _Freestyle.ViewEdge_setNature(*args)
+    def setFEdgeA(*args): return _Freestyle.ViewEdge_setFEdgeA(*args)
+    def setFEdgeB(*args): return _Freestyle.ViewEdge_setFEdgeB(*args)
+    def setShape(*args): return _Freestyle.ViewEdge_setShape(*args)
+    def setId(*args): return _Freestyle.ViewEdge_setId(*args)
     def UpdateFEdges(*args): return _Freestyle.ViewEdge_UpdateFEdges(*args)
-    def SetaShape(*args): return _Freestyle.ViewEdge_SetaShape(*args)
-    def SetQI(*args): return _Freestyle.ViewEdge_SetQI(*args)
+    def setaShape(*args): return _Freestyle.ViewEdge_setaShape(*args)
+    def setQI(*args): return _Freestyle.ViewEdge_setQI(*args)
     def setChainingTimeStamp(*args): return _Freestyle.ViewEdge_setChainingTimeStamp(*args)
     def AddOccluder(*args): return _Freestyle.ViewEdge_AddOccluder(*args)
     def setSplittingId(*args): return _Freestyle.ViewEdge_setSplittingId(*args)
@@ -1631,9 +1634,9 @@ class ViewShape(_object):
     def vertices(*args): return _Freestyle.ViewShape_vertices(*args)
     def edges(*args): return _Freestyle.ViewShape_edges(*args)
     def getId(*args): return _Freestyle.ViewShape_getId(*args)
-    def SetSShape(*args): return _Freestyle.ViewShape_SetSShape(*args)
-    def SetVertices(*args): return _Freestyle.ViewShape_SetVertices(*args)
-    def SetEdges(*args): return _Freestyle.ViewShape_SetEdges(*args)
+    def setSShape(*args): return _Freestyle.ViewShape_setSShape(*args)
+    def setVertices(*args): return _Freestyle.ViewShape_setVertices(*args)
+    def setEdges(*args): return _Freestyle.ViewShape_setEdges(*args)
     def AddVertex(*args): return _Freestyle.ViewShape_AddVertex(*args)
     def AddEdge(*args): return _Freestyle.ViewShape_AddEdge(*args)
     def RemoveEdge(*args): return _Freestyle.ViewShape_RemoveEdge(*args)
@@ -1717,8 +1720,8 @@ class ViewEdgeSVertexIterator(Interface0DIteratorNested):
     def shape(*args): return _Freestyle.ViewEdgeSVertexIterator_shape(*args)
     def z(*args): return _Freestyle.ViewEdgeSVertexIterator_z(*args)
     def viewvertex(*args): return _Freestyle.ViewEdgeSVertexIterator_viewvertex(*args)
-    def SetPoint3D(*args): return _Freestyle.ViewEdgeSVertexIterator_SetPoint3D(*args)
-    def SetPoint2D(*args): return _Freestyle.ViewEdgeSVertexIterator_SetPoint2D(*args)
+    def setPoint3D(*args): return _Freestyle.ViewEdgeSVertexIterator_setPoint3D(*args)
+    def setPoint2D(*args): return _Freestyle.ViewEdgeSVertexIterator_setPoint2D(*args)
     def AddNormal(*args): return _Freestyle.ViewEdgeSVertexIterator_AddNormal(*args)
     def setCurvatureInfo(*args): return _Freestyle.ViewEdgeSVertexIterator_setCurvatureInfo(*args)
     def getCurvatureInfo(*args): return _Freestyle.ViewEdgeSVertexIterator_getCurvatureInfo(*args)
@@ -1726,10 +1729,10 @@ class ViewEdgeSVertexIterator(Interface0DIteratorNested):
     def setDirectionFredo(*args): return _Freestyle.ViewEdgeSVertexIterator_setDirectionFredo(*args)
     def curvatureFredo(*args): return _Freestyle.ViewEdgeSVertexIterator_curvatureFredo(*args)
     def directionFredo(*args): return _Freestyle.ViewEdgeSVertexIterator_directionFredo(*args)
-    def SetId(*args): return _Freestyle.ViewEdgeSVertexIterator_SetId(*args)
-    def SetFEdges(*args): return _Freestyle.ViewEdgeSVertexIterator_SetFEdges(*args)
-    def SetShape(*args): return _Freestyle.ViewEdgeSVertexIterator_SetShape(*args)
-    def SetViewVertex(*args): return _Freestyle.ViewEdgeSVertexIterator_SetViewVertex(*args)
+    def setId(*args): return _Freestyle.ViewEdgeSVertexIterator_setId(*args)
+    def setFEdges(*args): return _Freestyle.ViewEdgeSVertexIterator_setFEdges(*args)
+    def setShape(*args): return _Freestyle.ViewEdgeSVertexIterator_setShape(*args)
+    def setViewVertex(*args): return _Freestyle.ViewEdgeSVertexIterator_setViewVertex(*args)
     def AddFEdge(*args): return _Freestyle.ViewEdgeSVertexIterator_AddFEdge(*args)
     def Replace(*args): return _Freestyle.ViewEdgeSVertexIterator_Replace(*args)
     def fedge(*args): return _Freestyle.ViewEdgeSVertexIterator_fedge(*args)
@@ -1798,16 +1801,16 @@ class ViewEdgeViewEdgeIterator(_object):
     def bShape(*args): return _Freestyle.ViewEdgeViewEdgeIterator_bShape(*args)
     def occluders(*args): return _Freestyle.ViewEdgeViewEdgeIterator_occluders(*args)
     def splittingId(*args): return _Freestyle.ViewEdgeViewEdgeIterator_splittingId(*args)
-    def SetA(*args): return _Freestyle.ViewEdgeViewEdgeIterator_SetA(*args)
-    def SetB(*args): return _Freestyle.ViewEdgeViewEdgeIterator_SetB(*args)
-    def SetNature(*args): return _Freestyle.ViewEdgeViewEdgeIterator_SetNature(*args)
-    def SetFEdgeA(*args): return _Freestyle.ViewEdgeViewEdgeIterator_SetFEdgeA(*args)
-    def SetFEdgeB(*args): return _Freestyle.ViewEdgeViewEdgeIterator_SetFEdgeB(*args)
-    def SetShape(*args): return _Freestyle.ViewEdgeViewEdgeIterator_SetShape(*args)
-    def SetId(*args): return _Freestyle.ViewEdgeViewEdgeIterator_SetId(*args)
+    def setA(*args): return _Freestyle.ViewEdgeViewEdgeIterator_setA(*args)
+    def setB(*args): return _Freestyle.ViewEdgeViewEdgeIterator_setB(*args)
+    def setNature(*args): return _Freestyle.ViewEdgeViewEdgeIterator_setNature(*args)
+    def setFEdgeA(*args): return _Freestyle.ViewEdgeViewEdgeIterator_setFEdgeA(*args)
+    def setFEdgeB(*args): return _Freestyle.ViewEdgeViewEdgeIterator_setFEdgeB(*args)
+    def setShape(*args): return _Freestyle.ViewEdgeViewEdgeIterator_setShape(*args)
+    def setId(*args): return _Freestyle.ViewEdgeViewEdgeIterator_setId(*args)
     def UpdateFEdges(*args): return _Freestyle.ViewEdgeViewEdgeIterator_UpdateFEdges(*args)
-    def SetaShape(*args): return _Freestyle.ViewEdgeViewEdgeIterator_SetaShape(*args)
-    def SetQI(*args): return _Freestyle.ViewEdgeViewEdgeIterator_SetQI(*args)
+    def setaShape(*args): return _Freestyle.ViewEdgeViewEdgeIterator_setaShape(*args)
+    def setQI(*args): return _Freestyle.ViewEdgeViewEdgeIterator_setQI(*args)
     def setChainingTimeStamp(*args): return _Freestyle.ViewEdgeViewEdgeIterator_setChainingTimeStamp(*args)
     def AddOccluder(*args): return _Freestyle.ViewEdgeViewEdgeIterator_AddOccluder(*args)
     def setSplittingId(*args): return _Freestyle.ViewEdgeViewEdgeIterator_setSplittingId(*args)
@@ -3267,16 +3270,16 @@ class AdjacencyIterator(_object):
     def bShape(*args): return _Freestyle.AdjacencyIterator_bShape(*args)
     def occluders(*args): return _Freestyle.AdjacencyIterator_occluders(*args)
     def splittingId(*args): return _Freestyle.AdjacencyIterator_splittingId(*args)
-    def SetA(*args): return _Freestyle.AdjacencyIterator_SetA(*args)
-    def SetB(*args): return _Freestyle.AdjacencyIterator_SetB(*args)
-    def SetNature(*args): return _Freestyle.AdjacencyIterator_SetNature(*args)
-    def SetFEdgeA(*args): return _Freestyle.AdjacencyIterator_SetFEdgeA(*args)
-    def SetFEdgeB(*args): return _Freestyle.AdjacencyIterator_SetFEdgeB(*args)
-    def SetShape(*args): return _Freestyle.AdjacencyIterator_SetShape(*args)
-    def SetId(*args): return _Freestyle.AdjacencyIterator_SetId(*args)
+    def setA(*args): return _Freestyle.AdjacencyIterator_setA(*args)
+    def setB(*args): return _Freestyle.AdjacencyIterator_setB(*args)
+    def setNature(*args): return _Freestyle.AdjacencyIterator_setNature(*args)
+    def setFEdgeA(*args): return _Freestyle.AdjacencyIterator_setFEdgeA(*args)
+    def setFEdgeB(*args): return _Freestyle.AdjacencyIterator_setFEdgeB(*args)
+    def setShape(*args): return _Freestyle.AdjacencyIterator_setShape(*args)
+    def setId(*args): return _Freestyle.AdjacencyIterator_setId(*args)
     def UpdateFEdges(*args): return _Freestyle.AdjacencyIterator_UpdateFEdges(*args)
-    def SetaShape(*args): return _Freestyle.AdjacencyIterator_SetaShape(*args)
-    def SetQI(*args): return _Freestyle.AdjacencyIterator_SetQI(*args)
+    def setaShape(*args): return _Freestyle.AdjacencyIterator_setaShape(*args)
+    def setQI(*args): return _Freestyle.AdjacencyIterator_setQI(*args)
     def setChainingTimeStamp(*args): return _Freestyle.AdjacencyIterator_setChainingTimeStamp(*args)
     def AddOccluder(*args): return _Freestyle.AdjacencyIterator_AddOccluder(*args)
     def setSplittingId(*args): return _Freestyle.AdjacencyIterator_setSplittingId(*args)
@@ -3859,9 +3862,9 @@ class CurvePointIterator(Interface0DIteratorNested):
     def A(*args): return _Freestyle.CurvePointIterator_A(*args)
     def B(*args): return _Freestyle.CurvePointIterator_B(*args)
     def t2d(*args): return _Freestyle.CurvePointIterator_t2d(*args)
-    def SetA(*args): return _Freestyle.CurvePointIterator_SetA(*args)
-    def SetB(*args): return _Freestyle.CurvePointIterator_SetB(*args)
-    def SetT2d(*args): return _Freestyle.CurvePointIterator_SetT2d(*args)
+    def setA(*args): return _Freestyle.CurvePointIterator_setA(*args)
+    def setB(*args): return _Freestyle.CurvePointIterator_setB(*args)
+    def setT2d(*args): return _Freestyle.CurvePointIterator_setT2d(*args)
     def fedge(*args): return _Freestyle.CurvePointIterator_fedge(*args)
     def point2d(*args): return _Freestyle.CurvePointIterator_point2d(*args)
     def point3d(*args): return _Freestyle.CurvePointIterator_point3d(*args)
@@ -3914,9 +3917,9 @@ class CurvePoint(Interface0D):
     def A(*args): return _Freestyle.CurvePoint_A(*args)
     def B(*args): return _Freestyle.CurvePoint_B(*args)
     def t2d(*args): return _Freestyle.CurvePoint_t2d(*args)
-    def SetA(*args): return _Freestyle.CurvePoint_SetA(*args)
-    def SetB(*args): return _Freestyle.CurvePoint_SetB(*args)
-    def SetT2d(*args): return _Freestyle.CurvePoint_SetT2d(*args)
+    def setA(*args): return _Freestyle.CurvePoint_setA(*args)
+    def setB(*args): return _Freestyle.CurvePoint_setB(*args)
+    def setT2d(*args): return _Freestyle.CurvePoint_setT2d(*args)
     def fedge(*args): return _Freestyle.CurvePoint_fedge(*args)
     def point2d(*args): return _Freestyle.CurvePoint_point2d(*args)
     def point3d(*args): return _Freestyle.CurvePoint_point3d(*args)
@@ -4001,12 +4004,12 @@ class StrokeVertexIterator(Interface0DIteratorNested):
     def attribute(*args): return _Freestyle.StrokeVertexIterator_attribute(*args)
     def curvilinearAbscissa(*args): return _Freestyle.StrokeVertexIterator_curvilinearAbscissa(*args)
     def strokeLength(*args): return _Freestyle.StrokeVertexIterator_strokeLength(*args)
-    def SetX(*args): return _Freestyle.StrokeVertexIterator_SetX(*args)
-    def SetY(*args): return _Freestyle.StrokeVertexIterator_SetY(*args)
-    def SetPoint(*args): return _Freestyle.StrokeVertexIterator_SetPoint(*args)
-    def SetAttribute(*args): return _Freestyle.StrokeVertexIterator_SetAttribute(*args)
-    def SetCurvilinearAbscissa(*args): return _Freestyle.StrokeVertexIterator_SetCurvilinearAbscissa(*args)
-    def SetStrokeLength(*args): return _Freestyle.StrokeVertexIterator_SetStrokeLength(*args)
+    def setX(*args): return _Freestyle.StrokeVertexIterator_setX(*args)
+    def setY(*args): return _Freestyle.StrokeVertexIterator_setY(*args)
+    def setPoint(*args): return _Freestyle.StrokeVertexIterator_setPoint(*args)
+    def setAttribute(*args): return _Freestyle.StrokeVertexIterator_setAttribute(*args)
+    def setCurvilinearAbscissa(*args): return _Freestyle.StrokeVertexIterator_setCurvilinearAbscissa(*args)
+    def setStrokeLength(*args): return _Freestyle.StrokeVertexIterator_setStrokeLength(*args)
     def getX(*args): return _Freestyle.StrokeVertexIterator_getX(*args)
     def getY(*args): return _Freestyle.StrokeVertexIterator_getY(*args)
     def getZ(*args): return _Freestyle.StrokeVertexIterator_getZ(*args)
@@ -4025,9 +4028,9 @@ class StrokeVertexIterator(Interface0DIteratorNested):
     def A(*args): return _Freestyle.StrokeVertexIterator_A(*args)
     def B(*args): return _Freestyle.StrokeVertexIterator_B(*args)
     def t2d(*args): return _Freestyle.StrokeVertexIterator_t2d(*args)
-    def SetA(*args): return _Freestyle.StrokeVertexIterator_SetA(*args)
-    def SetB(*args): return _Freestyle.StrokeVertexIterator_SetB(*args)
-    def SetT2d(*args): return _Freestyle.StrokeVertexIterator_SetT2d(*args)
+    def setA(*args): return _Freestyle.StrokeVertexIterator_setA(*args)
+    def setB(*args): return _Freestyle.StrokeVertexIterator_setB(*args)
+    def setT2d(*args): return _Freestyle.StrokeVertexIterator_setT2d(*args)
     def fedge(*args): return _Freestyle.StrokeVertexIterator_fedge(*args)
     def point2d(*args): return _Freestyle.StrokeVertexIterator_point2d(*args)
     def point3d(*args): return _Freestyle.StrokeVertexIterator_point3d(*args)
@@ -4078,7 +4081,7 @@ class StrokeAttribute(_object):
     def setColor(*args): return _Freestyle.StrokeAttribute_setColor(*args)
     def setAlpha(*args): return _Freestyle.StrokeAttribute_setAlpha(*args)
     def setThickness(*args): return _Freestyle.StrokeAttribute_setThickness(*args)
-    def SetVisible(*args): return _Freestyle.StrokeAttribute_SetVisible(*args)
+    def setVisible(*args): return _Freestyle.StrokeAttribute_setVisible(*args)
     def setAttributeReal(*args): return _Freestyle.StrokeAttribute_setAttributeReal(*args)
     def setAttributeVec2f(*args): return _Freestyle.StrokeAttribute_setAttributeVec2f(*args)
     def setAttributeVec3f(*args): return _Freestyle.StrokeAttribute_setAttributeVec3f(*args)
@@ -4107,12 +4110,12 @@ class StrokeVertex(CurvePoint):
     def curvilinearAbscissa(*args): return _Freestyle.StrokeVertex_curvilinearAbscissa(*args)
     def strokeLength(*args): return _Freestyle.StrokeVertex_strokeLength(*args)
     def u(*args): return _Freestyle.StrokeVertex_u(*args)
-    def SetX(*args): return _Freestyle.StrokeVertex_SetX(*args)
-    def SetY(*args): return _Freestyle.StrokeVertex_SetY(*args)
-    def SetPoint(*args): return _Freestyle.StrokeVertex_SetPoint(*args)
-    def SetAttribute(*args): return _Freestyle.StrokeVertex_SetAttribute(*args)
-    def SetCurvilinearAbscissa(*args): return _Freestyle.StrokeVertex_SetCurvilinearAbscissa(*args)
-    def SetStrokeLength(*args): return _Freestyle.StrokeVertex_SetStrokeLength(*args)
+    def setX(*args): return _Freestyle.StrokeVertex_setX(*args)
+    def setY(*args): return _Freestyle.StrokeVertex_setY(*args)
+    def setPoint(*args): return _Freestyle.StrokeVertex_setPoint(*args)
+    def setAttribute(*args): return _Freestyle.StrokeVertex_setAttribute(*args)
+    def setCurvilinearAbscissa(*args): return _Freestyle.StrokeVertex_setCurvilinearAbscissa(*args)
+    def setStrokeLength(*args): return _Freestyle.StrokeVertex_setStrokeLength(*args)
 StrokeVertex_swigregister = _Freestyle.StrokeVertex_swigregister
 StrokeVertex_swigregister(StrokeVertex)
 
@@ -4155,16 +4158,16 @@ class Stroke(Interface1D):
     def getEndingOrientation(*args): return _Freestyle.Stroke_getEndingOrientation(*args)
     def getEndingOrientationX(*args): return _Freestyle.Stroke_getEndingOrientationX(*args)
     def getEndingOrientationY(*args): return _Freestyle.Stroke_getEndingOrientationY(*args)
-    def SetId(*args): return _Freestyle.Stroke_SetId(*args)
-    def SetLength(*args): return _Freestyle.Stroke_SetLength(*args)
-    def SetMediumType(*args): return _Freestyle.Stroke_SetMediumType(*args)
-    def SetTextureId(*args): return _Freestyle.Stroke_SetTextureId(*args)
-    def SetTips(*args): return _Freestyle.Stroke_SetTips(*args)
+    def setId(*args): return _Freestyle.Stroke_setId(*args)
+    def setLength(*args): return _Freestyle.Stroke_setLength(*args)
+    def setMediumType(*args): return _Freestyle.Stroke_setMediumType(*args)
+    def setTextureId(*args): return _Freestyle.Stroke_setTextureId(*args)
+    def setTips(*args): return _Freestyle.Stroke_setTips(*args)
     def push_back(*args): return _Freestyle.Stroke_push_back(*args)
     def push_front(*args): return _Freestyle.Stroke_push_front(*args)
     def AddViewEdge(*args): return _Freestyle.Stroke_AddViewEdge(*args)
-    def SetBeginningOrientation(*args): return _Freestyle.Stroke_SetBeginningOrientation(*args)
-    def SetEndingOrientation(*args): return _Freestyle.Stroke_SetEndingOrientation(*args)
+    def setBeginningOrientation(*args): return _Freestyle.Stroke_setBeginningOrientation(*args)
+    def setEndingOrientation(*args): return _Freestyle.Stroke_setEndingOrientation(*args)
     def strokeVerticesBegin(*args): return _Freestyle.Stroke_strokeVerticesBegin(*args)
     def strokeVerticesEnd(*args): return _Freestyle.Stroke_strokeVerticesEnd(*args)
     def strokeVerticesSize(*args): return _Freestyle.Stroke_strokeVerticesSize(*args)
@@ -4831,7 +4834,7 @@ class Operators(_object):
     __setattr__ = lambda self, name, value: _swig_setattr(self, Operators, name, value)
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, Operators, name)
-    def __init__(self, *args, **kwargs): raise AttributeError, "No constructor defined"
+    def __init__(self): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
     __swig_getmethods__["select"] = lambda x: _Freestyle.Operators_select
     if _newclass:select = staticmethod(_Freestyle.Operators_select)
@@ -4898,7 +4901,7 @@ class Canvas(_object):
     __setattr__ = lambda self, name, value: _swig_setattr(self, Canvas, name, value)
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, Canvas, name)
-    def __init__(self, *args, **kwargs): raise AttributeError, "No constructor defined"
+    def __init__(self): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
     __swig_getmethods__["getInstance"] = lambda x: _Freestyle.Canvas_getInstance
     if _newclass:getInstance = staticmethod(_Freestyle.Canvas_getInstance)
@@ -4930,14 +4933,14 @@ class Canvas(_object):
     def renderer(*args): return _Freestyle.Canvas_renderer(*args)
     def getCurrentStyleModule(*args): return _Freestyle.Canvas_getCurrentStyleModule(*args)
     def getRecordFlag(*args): return _Freestyle.Canvas_getRecordFlag(*args)
-    def SetSelectedFEdge(*args): return _Freestyle.Canvas_SetSelectedFEdge(*args)
+    def setSelectedFEdge(*args): return _Freestyle.Canvas_setSelectedFEdge(*args)
     def InsertStyleModule(*args): return _Freestyle.Canvas_InsertStyleModule(*args)
     def RemoveStyleModule(*args): return _Freestyle.Canvas_RemoveStyleModule(*args)
     def SwapStyleModules(*args): return _Freestyle.Canvas_SwapStyleModules(*args)
     def ReplaceStyleModule(*args): return _Freestyle.Canvas_ReplaceStyleModule(*args)
-    def SetVisible(*args): return _Freestyle.Canvas_SetVisible(*args)
+    def setVisible(*args): return _Freestyle.Canvas_setVisible(*args)
     def AddLayer(*args): return _Freestyle.Canvas_AddLayer(*args)
-    def SetCurrentPaperTextureIndex(*args): return _Freestyle.Canvas_SetCurrentPaperTextureIndex(*args)
+    def setCurrentPaperTextureIndex(*args): return _Freestyle.Canvas_setCurrentPaperTextureIndex(*args)
     def changePaperTexture(*args): return _Freestyle.Canvas_changePaperTexture(*args)
     def togglePaperTexture(*args): return _Freestyle.Canvas_togglePaperTexture(*args)
     def resetModified(*args): return _Freestyle.Canvas_resetModified(*args)
diff --git a/source/blender/freestyle/style_modules/anisotropic_diffusion.py b/source/blender/freestyle/style_modules/anisotropic_diffusion.py
index f8b68ee51a6..688554dc92e 100755
--- a/source/blender/freestyle/style_modules/anisotropic_diffusion.py
+++ b/source/blender/freestyle/style_modules/anisotropic_diffusion.py
@@ -55,7 +55,7 @@ class pyDiffusion2Shader(StrokeShader):
 				v=it.getObject()
 				p1 = v.getPoint()
 				p2 = normalInfo(it.castToInterface0DIterator())*self._lambda*curvatureInfo(it.castToInterface0DIterator())
-				v.SetPoint(p1+p2)
+				v.setPoint(p1+p2)
 				it.increment()
 
 upred = AndUP1D(QuantitativeInvisibilityUP1D(0), ExternalContourUP1D())
diff --git a/source/blender/freestyle/style_modules/shaders.py b/source/blender/freestyle/style_modules/shaders.py
index 17ad31961d5..208dfe91bb6 100755
--- a/source/blender/freestyle/style_modules/shaders.py
+++ b/source/blender/freestyle/style_modules/shaders.py
@@ -603,8 +603,8 @@ class pyBackboneStretcherShader(StrokeShader):
 		dn = dn/dn.norm()
 		newFirst = p0+d1*float(self._l)
 		newLast = pn+dn*float(self._l)
-		v0.SetPoint(newFirst)
-		vn.SetPoint(newLast)
+		v0.setPoint(newFirst)
+		vn.setPoint(newLast)
 		
 class pyLengthDependingBackboneStretcherShader(StrokeShader):
 	def __init__(self, l):
@@ -636,8 +636,8 @@ class pyLengthDependingBackboneStretcherShader(StrokeShader):
 		dn = dn/dn.norm()
 		newFirst = p0+d1*float(stretch)
 		newLast = pn+dn*float(stretch)
-		v0.SetPoint(newFirst)
-		vn.SetPoint(newLast)
+		v0.setPoint(newFirst)
+		vn.setPoint(newLast)
 
 
 ## Shader to replace a stroke by its corresponding tangent
@@ -656,16 +656,16 @@ class pyGuidingLineShader(StrokeShader):
 		it = StrokeVertexIterator(itmiddle)	
 		it.increment()
 		while(it.isEnd() == 0):			## position all the vertices along the tangent for the right part
-			it.getObject().SetPoint(itmiddle.getObject().getPoint() \
+			it.getObject().setPoint(itmiddle.getObject().getPoint() \
 			+t*(it.getObject().u()-itmiddle.getObject().u()))
 			it.increment()
 		it = StrokeVertexIterator(itmiddle)
 		it.decrement()
 		while(it.isBegin() == 0):		## position all the vertices along the tangent for the left part
-			it.getObject().SetPoint(itmiddle.getObject().getPoint() \
+			it.getObject().setPoint(itmiddle.getObject().getPoint() \
 			-t*(itmiddle.getObject().u()-it.getObject().u()))
 			it.decrement()
-		it.getObject().SetPoint(itmiddle.getObject().getPoint()-t*(itmiddle.getObject().u())) ## first vertex
+		it.getObject().setPoint(itmiddle.getObject().getPoint()-t*(itmiddle.getObject().u())) ## first vertex
 
 
 class pyBackboneStretcherNoCuspShader(StrokeShader):
@@ -690,7 +690,7 @@ class pyBackboneStretcherNoCuspShader(StrokeShader):
 			d1 = p0-p1
 			d1 = d1/d1.norm()
 			newFirst = p0+d1*float(self._l)
-			v0.SetPoint(newFirst)
+			v0.setPoint(newFirst)
 		vn_1 = itn_1.getObject()
 		vn = itn.getObject()
 		if((vn.getNature() & CUSP == 0) and (vn_1.getNature() & CUSP == 0)):
@@ -699,7 +699,7 @@ class pyBackboneStretcherNoCuspShader(StrokeShader):
 			dn = pn-pn_1
 			dn = dn/dn.norm()
 			newLast = pn+dn*float(self._l)	
-			vn.SetPoint(newLast)
+			vn.setPoint(newLast)
 
 normalInfo=Normal2DF0D()
 curvatureInfo=Curvature2DAngleF0D()
@@ -723,7 +723,7 @@ class pyDiffusion2Shader(StrokeShader):
 				v=it.getObject()
 				p1 = v.getPoint()
 				p2 = self._normalInfo(it.castToInterface0DIterator())*self._lambda*self._curvatureInfo(it.castToInterface0DIterator())
-				v.SetPoint(p1+p2)
+				v.setPoint(p1+p2)
 				it.increment()
 
 class pyTipRemoverShader(StrokeShader):
@@ -757,7 +757,7 @@ class pyTipRemoverShader(StrokeShader):
 			if(it.isEnd() == 1):
 				break
 			v = it.getObject()
-			v.SetAttribute(a)
+			v.setAttribute(a)
 			it.increment()
 
 class pyTVertexRemoverShader(StrokeShader):
@@ -784,8 +784,8 @@ class pyExtremitiesOrientationShader(StrokeShader):
 		return "pyExtremitiesOrientationShader"
 	def shade(self, stroke):
 		print self._v1.x(),self._v1.y()
-		stroke.SetBeginningOrientation(self._v1.x(),self._v1.y())
-		stroke.SetEndingOrientation(self._v2.x(),self._v2.y())
+		stroke.setBeginningOrientation(self._v1.x(),self._v1.y())
+		stroke.setEndingOrientation(self._v2.x(),self._v2.y())
 
 class pyHLRShader(StrokeShader):
 	def getName(self):
@@ -813,7 +813,7 @@ class pyHLRShader(StrokeShader):
 				else:
 					invisible = 0
 			if(invisible == 1):		
-				v.attribute().SetVisible(0)
+				v.attribute().setVisible(0)
 			it.increment()
 			it2.increment()
 
@@ -902,8 +902,8 @@ class pySinusDisplacementShader(StrokeShader):
 			a = self._a*(1-2*(fabs(u-0.5)))
 			n = n*a*cos(self._f*u*6.28)
 			#print n.x(), n.y()
-			v.SetPoint(p+n)
-			#v.SetPoint(v.getPoint()+n*a*cos(f*v.u()))
+			v.setPoint(p+n)
+			#v.setPoint(v.getPoint()+n*a*cos(f*v.u()))
 			it.increment()
 
 class pyPerlinNoise1DShader(StrokeShader):
@@ -921,7 +921,7 @@ class pyPerlinNoise1DShader(StrokeShader):
 		while it.isEnd() == 0:
 			v = it.getObject()
 			nres = self.__noise.turbulence1(i, self.__freq, self.__amp, self.__oct)
-			v.SetPoint(v.getProjectedX() + nres, v.getProjectedY() + nres)
+			v.setPoint(v.getProjectedX() + nres, v.getProjectedY() + nres)
 			i = i+1
 			it.increment()
 
@@ -940,7 +940,7 @@ class pyPerlinNoise2DShader(StrokeShader):
 			v = it.getObject()
 			vec = Vec2f(v.getProjectedX(), v.getProjectedY())
 			nres = self.__noise.turbulence2(vec, self.__freq, self.__amp, self.__oct)
-			v.SetPoint(v.getProjectedX() + nres, v.getProjectedY() + nres)
+			v.setPoint(v.getProjectedX() + nres, v.getProjectedY() + nres)
 			it.increment()
 
 class pyBluePrintCirclesShader(StrokeShader):
@@ -987,7 +987,7 @@ class pyBluePrintCirclesShader(StrokeShader):
 			while i < sv_nb:
 				p_new.setX(center.x() + radius * cos(2 * pi * float(i) / float(sv_nb - 1)))
    				p_new.setY(center.y() + radius * sin(2 * pi * float(i) / float(sv_nb - 1)))
-				it.getObject().SetPoint(p_new.x(), p_new.y())
+				it.getObject().setPoint(p_new.x(), p_new.y())
 				i = i + 1
 				it.increment()
 		while it.isEnd() == 0:
@@ -1041,7 +1041,7 @@ class pyBluePrintEllipsesShader(StrokeShader):
 			while i < sv_nb:
 				p_new.setX(center.x() + radius_x * cos(2 * pi * float(i) / float(sv_nb - 1)))
    				p_new.setY(center.y() + radius_y * sin(2 * pi * float(i) / float(sv_nb - 1)))
-				it.getObject().SetPoint(p_new.x(), p_new.y())
+				it.getObject().setPoint(p_new.x(), p_new.y())
 				i = i + 1
 				it.increment()
 		while it.isEnd() == 0:
@@ -1109,8 +1109,8 @@ class pyBluePrintSquaresShader(StrokeShader):
 					p_new = p_fourth + vec_fourth * float(i - third)/float(fourth - third - 1)
 					if i == fourth - 1:
 						visible = 0
-				it.getObject().SetPoint(p_new.x(), p_new.y())
-				it.getObject().attribute().SetVisible(visible)
+				it.getObject().setPoint(p_new.x(), p_new.y())
+				it.getObject().attribute().setVisible(visible)
 				if visible == 0:
 					visible = 1
 				i = i + 1
@@ -1214,8 +1214,8 @@ class pyBluePrintDirectedSquaresShader(StrokeShader):
 					p_new = p_fourth + vec_fourth * float(i - third)/float(fourth - third - 1)
 					if i == fourth - 1:
 						visible = 0
-				it.getObject().SetPoint(p_new.x(), p_new.y())
-				it.getObject().attribute().SetVisible(visible)
+				it.getObject().setPoint(p_new.x(), p_new.y())
+				it.getObject().attribute().setVisible(visible)
 				if visible == 0:
 					visible = 1
 				i = i + 1
diff --git a/source/blender/freestyle/style_modules/sketchy_topology_broken.py b/source/blender/freestyle/style_modules/sketchy_topology_broken.py
index c1cefedfad2..7383347a0fb 100755
--- a/source/blender/freestyle/style_modules/sketchy_topology_broken.py
+++ b/source/blender/freestyle/style_modules/sketchy_topology_broken.py
@@ -55,7 +55,7 @@ class pyBackboneStretcherNoCuspShader(StrokeShader):
 			d1 = p0-p1
 			d1 = d1/d1.norm()
 			newFirst = p0+d1*float(self._l)
-			v0.SetPoint(newFirst)
+			v0.setPoint(newFirst)
 		else:
 			print "got a v0 cusp"
 		vn_1 = itn_1.getObject()
@@ -66,7 +66,7 @@ class pyBackboneStretcherNoCuspShader(StrokeShader):
 			dn = pn-pn_1
 			dn = dn/dn.norm()
 			newLast = pn+dn*float(self._l)	
-			vn.SetPoint(newLast)
+			vn.setPoint(newLast)
 		else:
 			print "got a vn cusp"
 

From 2c29af6a29725d9905ecfd90f0ea08b4c440a848 Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Tue, 22 Jul 2008 00:27:40 +0000
Subject: [PATCH 116/252] soc-2008-mxcurioni: corrected StrokeAttribute,
 verified with test case.

I realized today that it will not be possible to implement getter/setter functionality easily for our Freestyle API. The reason is that Python does not support function overloading as-is. It is possible to 'fake' overloading by taking a general argument object and count the number of arguments in the object (rgbTuple_setCol in Blender's API is a good example of how to go about it).

For the time being, we'll get around that problem. The tangible effect of that constraint is that all API setter functions return a 'None' PyObject, instead of returning an integer status code. It is important to note that this problem is due to Freestyle's API being C++ in nature. Fortunately, this shouldn't really impact the usage of the API.

If the Blender Python group wants me to correct that, I'll be able to do it. It is just going to take me quite some time correcting it, writing support functions for methods having different types of arguments.
---
 .../intern/python/StrokeAttribute.cpp         | 106 ++++++++----------
 1 file changed, 45 insertions(+), 61 deletions(-)

diff --git a/source/blender/freestyle/intern/python/StrokeAttribute.cpp b/source/blender/freestyle/intern/python/StrokeAttribute.cpp
index 5f7814ff4dd..b9f37dfa165 100644
--- a/source/blender/freestyle/intern/python/StrokeAttribute.cpp
+++ b/source/blender/freestyle/intern/python/StrokeAttribute.cpp
@@ -28,13 +28,13 @@ static PyObject * StrokeAttribute_getAttributeVec3f( BPy_StrokeAttribute *self,
 static PyObject * StrokeAttribute_isAttributeAvailableReal( BPy_StrokeAttribute *self, PyObject *args );
 static PyObject * StrokeAttribute_isAttributeAvailableVec2f( BPy_StrokeAttribute *self, PyObject *args );
 static PyObject * StrokeAttribute_isAttributeAvailableVec3f( BPy_StrokeAttribute *self, PyObject *args );
-static int StrokeAttribute_setColor( BPy_StrokeAttribute *self, PyObject *args );
-static int StrokeAttribute_setAlpha( BPy_StrokeAttribute *self, PyObject *args );
-static int StrokeAttribute_setThickness( BPy_StrokeAttribute *self, PyObject *args );
-static int StrokeAttribute_setVisible( BPy_StrokeAttribute *self, PyObject *args );
-static int StrokeAttribute_setAttributeReal( BPy_StrokeAttribute *self, PyObject *args );
-static int StrokeAttribute_setAttributeVec2f( BPy_StrokeAttribute *self, PyObject *args );
-static int StrokeAttribute_setAttributeVec3f( BPy_StrokeAttribute *self, PyObject *args );
+static PyObject * StrokeAttribute_setColor( BPy_StrokeAttribute *self, PyObject *args );
+static PyObject * StrokeAttribute_setAlpha( BPy_StrokeAttribute *self, PyObject *args );
+static PyObject * StrokeAttribute_setThickness( BPy_StrokeAttribute *self, PyObject *args );
+static PyObject * StrokeAttribute_setVisible( BPy_StrokeAttribute *self, PyObject *args );
+static PyObject * StrokeAttribute_setAttributeReal( BPy_StrokeAttribute *self, PyObject *args );
+static PyObject * StrokeAttribute_setAttributeVec2f( BPy_StrokeAttribute *self, PyObject *args );
+static PyObject * StrokeAttribute_setAttributeVec3f( BPy_StrokeAttribute *self, PyObject *args );
 
 
 /*----------------------StrokeAttribute instance definitions ----------------------------*/
@@ -64,6 +64,8 @@ static PyMethodDef BPy_StrokeAttribute_methods[] = {
 	{NULL, NULL, 0, NULL}
 };
 
+
+
 /*-----------------------BPy_StrokeAttribute type definition ------------------------------*/
 
 PyTypeObject StrokeAttribute_Type = {
@@ -124,7 +126,7 @@ PyTypeObject StrokeAttribute_Type = {
   /*** Attribute descriptor and subclassing stuff ***/
 	BPy_StrokeAttribute_methods,	/* struct PyMethodDef *tp_methods; */
 	NULL,                       	/* struct PyMemberDef *tp_members; */
-	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	NULL,  							/* struct PyGetSetDef *tp_getset; */
 	NULL,							/* struct _typeobject *tp_base; */
 	NULL,							/* PyObject *tp_dict; */
 	NULL,							/* descrgetfunc tp_descr_get; */
@@ -184,9 +186,7 @@ int StrokeAttribute___init__(BPy_StrokeAttribute *self, PyObject *args, PyObject
 											*( ((BPy_StrokeAttribute *) obj2)->sa ),
 											PyFloat_AsDouble( obj3 ) );	
 										
-	} else if( 	obj4 && obj5 && obj6 &&
-				PyFloat_Check(obj1) && PyFloat_Check(obj2) && PyFloat_Check(obj2) &&
-				PyFloat_Check(obj4) && PyFloat_Check(obj5) && PyFloat_Check(obj6) ) {
+	} else if( 	obj4 && obj5 && obj6 ) {
 	
 			self->sa = new StrokeAttribute(	PyFloat_AsDouble( obj1 ),
 											PyFloat_AsDouble( obj2 ),
@@ -212,18 +212,18 @@ void StrokeAttribute___dealloc__(BPy_StrokeAttribute* self)
 
 PyObject * StrokeAttribute___repr__(BPy_StrokeAttribute* self)
 {
-    return PyString_FromFormat("StrokeAttribute: r:%f g:%f b:%f a:%f - R:%f L:%f", 
-		self->sa->getColorR(), self->sa->getColorG(), self->sa->getColorB(), self->sa->getAlpha(),
-		self->sa->getThicknessR(), self->sa->getThicknessL() );
+	stringstream repr("StrokeAttribute:");
+	repr << " r: " << self->sa->getColorR()
+		 << " g: " << self->sa->getColorG()
+		 << " b: " << self->sa->getColorB()
+		 << " a: " << self->sa->getAlpha()
+		 << " - R: " << self->sa->getThicknessR() 
+		 << " L: " << self->sa->getThicknessL();
+
+	return PyString_FromFormat( repr.str().c_str() );
 }
 
 
-// PyObject *StrokeAttribute_getColor( BPy_StrokeAttribute *self ) {
-// 	float *c = self->sa->getColor();
-// 	Vec3f v( c[0], c[1], c[2]);
-// 	return Vector_from_Vec3f( v );
-// }
-
 PyObject *StrokeAttribute_getColorR( BPy_StrokeAttribute *self ) {
 	return PyFloat_FromDouble( self->sa->getColorR() );	
 }
@@ -245,11 +245,6 @@ PyObject *StrokeAttribute_getAlpha( BPy_StrokeAttribute *self ) {
 	return PyFloat_FromDouble( self->sa->getAlpha() );	
 }
 
-// PyObject *StrokeAttribute_getThickness( BPy_StrokeAttribute *self ) {
-// 	// vector
-// 	return PyString_FromString( self->sa->getExactTypeName() );	
-// }
-
 PyObject *StrokeAttribute_getThicknessR( BPy_StrokeAttribute *self ) {
 	return PyFloat_FromDouble( self->sa->getThicknessR() );	
 }
@@ -337,14 +332,14 @@ PyObject *StrokeAttribute_isAttributeAvailableVec3f( BPy_StrokeAttribute *self,
 }
 
 
-int StrokeAttribute_setColor( BPy_StrokeAttribute *self, PyObject *args ) {
+PyObject * StrokeAttribute_setColor( BPy_StrokeAttribute *self, PyObject *args ) {
 	PyObject *obj1 = 0, *obj2 = 0, *obj3 = 0 ;
 
 	if(!( PyArg_ParseTuple(args, "O|OO", &obj1, &obj2, &obj3) )) {
 		cout << "ERROR: StrokeAttribute_setColor" << endl;
-		return -1;
+		Py_RETURN_NONE;
 	}
-
+	
 	if( PyList_Check(obj1) && !obj2 && !obj3 ){
 		
 		Vec3f v( 	PyFloat_AsDouble( PyList_GetItem(obj1, 0) ),
@@ -352,39 +347,35 @@ int StrokeAttribute_setColor( BPy_StrokeAttribute *self, PyObject *args ) {
 					PyFloat_AsDouble( PyList_GetItem(obj1, 2) )  );
 		
 		self->sa->setColor( v );
-		return 0;
 		
-	} else if( 	obj1 && PyFloat_Check(obj1) &&
-				obj2 && PyFloat_Check(obj2) &&
-				obj3 && PyFloat_Check(obj3)	   ){
-					
+	} else if( 	obj1 && obj2 && obj3 ){
+
 		self->sa->setColor(	PyFloat_AsDouble(obj1),
 							PyFloat_AsDouble(obj2),
 							PyFloat_AsDouble(obj3) );
-		return 0;
 	}
 	
-	return -1;
+	Py_RETURN_NONE;
 }
 
-int StrokeAttribute_setAlpha( BPy_StrokeAttribute *self, PyObject *args ){
+PyObject * StrokeAttribute_setAlpha( BPy_StrokeAttribute *self, PyObject *args ){
 	float f = 0;
 
 	if(!( PyArg_ParseTuple(args, "f", &f) )) {
 		cout << "ERROR: StrokeAttribute_setAlpha" << endl;
-		return -1;
+		Py_RETURN_NONE;
 	}
 	
 	self->sa->setAlpha( f );
-	return 0;
+	Py_RETURN_NONE;
 }
 
-int StrokeAttribute_setThickness( BPy_StrokeAttribute *self, PyObject *args )  {
+PyObject * StrokeAttribute_setThickness( BPy_StrokeAttribute *self, PyObject *args )  {
 	PyObject *obj1 = 0, *obj2 = 0;
 
 	if(!( PyArg_ParseTuple(args, "O|O", &obj1, &obj2) )) {
 		cout << "ERROR: StrokeAttribute_setThickness" << endl;
-		return -1;
+		Py_RETURN_NONE;
 	}
 
 	if( PyList_Check(obj1) && !obj2 ){
@@ -393,51 +384,48 @@ int StrokeAttribute_setThickness( BPy_StrokeAttribute *self, PyObject *args )  {
 					PyFloat_AsDouble( PyList_GetItem(obj1, 1) )  );
 		
 		self->sa->setThickness( v );
-		return 0;
 		
-	} else if( 	obj1 && PyFloat_Check(obj1) &&
-				obj2 && PyFloat_Check(obj2)	   ){
+	} else if( 	obj1 && obj2 ){
 					
 		self->sa->setThickness(	PyFloat_AsDouble(obj1),
 								PyFloat_AsDouble(obj2) );
-		return 0;
 	}
 	
-	return -1;
+	Py_RETURN_NONE;
 }
 
-int StrokeAttribute_setVisible( BPy_StrokeAttribute *self, PyObject *args ) {
+PyObject * StrokeAttribute_setVisible( BPy_StrokeAttribute *self, PyObject *args ) {
 	int i = 0;
 
 	if(!( PyArg_ParseTuple(args, "i", &i) )) {
 		cout << "ERROR: StrokeAttribute_setVisible" << endl;
-		return -1;
+		Py_RETURN_NONE;
 	}
 
 	self->sa->setVisible( i );
-	return 0;
+	Py_RETURN_NONE;
 }
 
-int StrokeAttribute_setAttributeReal( BPy_StrokeAttribute *self, PyObject *args ) {
+PyObject * StrokeAttribute_setAttributeReal( BPy_StrokeAttribute *self, PyObject *args ) {
 	char *s = 0;
 	double d = 0;
 
 	if(!( PyArg_ParseTuple(args, "sd", &s, &d) )) {
 		cout << "ERROR: StrokeAttribute_setAttributeReal" << endl;
-		return -1;
+		Py_RETURN_NONE;
 	}
 
 	self->sa->setAttributeReal( s, d );
-	return 0;
+	Py_RETURN_NONE;
 }
 
-int StrokeAttribute_setAttributeVec2f( BPy_StrokeAttribute *self, PyObject *args ) {
+PyObject * StrokeAttribute_setAttributeVec2f( BPy_StrokeAttribute *self, PyObject *args ) {
 	char *s;
 	PyObject *obj = 0;
 
 	if(!( PyArg_ParseTuple(args, "sO", &s, &obj) )) {
 		cout << "ERROR: StrokeAttribute_setAttributeVec2f" << endl;
-		return -1;
+		Py_RETURN_NONE;
 	}
 
 	if( PyList_Check(obj) && PyList_Size(obj) > 1) {
@@ -446,20 +434,18 @@ int StrokeAttribute_setAttributeVec2f( BPy_StrokeAttribute *self, PyObject *args
 					PyFloat_AsDouble( PyList_GetItem(obj, 1) )  );
 
 		self->sa->setAttributeVec2f( s, v );
-		return 0;
-		
 	}
 	
-	return -1;
+	Py_RETURN_NONE;
 }
 
-int StrokeAttribute_setAttributeVec3f( BPy_StrokeAttribute *self, PyObject *args ) {
+PyObject * StrokeAttribute_setAttributeVec3f( BPy_StrokeAttribute *self, PyObject *args ) {
 	char *s;
 	PyObject *obj = 0;
 
 	if(!( PyArg_ParseTuple(args, "sO", &s, &obj) )) {
 		cout << "ERROR: StrokeAttribute_setAttributeVec3f" << endl;
-		return -1;
+		Py_RETURN_NONE;
 	}
 
 	if( PyList_Check(obj)  && PyList_Size(obj) > 2 ) {
@@ -469,11 +455,9 @@ int StrokeAttribute_setAttributeVec3f( BPy_StrokeAttribute *self, PyObject *args
 					PyFloat_AsDouble( PyList_GetItem(obj, 2) )  );
 
 		self->sa->setAttributeVec3f( s, v );
-		return 0;
-
 	}
 
-	return -1;
+	Py_RETURN_NONE;
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////

From 48732bf2ab5284316f01babb71aa3e2289f2c0dd Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Tue, 22 Jul 2008 08:15:21 +0000
Subject: [PATCH 117/252] soc-2008-mxcurioni: filled and tested StrokeVertex
 class

---
 source/blender/freestyle/SConscript           |   2 +-
 .../freestyle/intern/python/Convert.cpp       |   7 +
 .../blender/freestyle/intern/python/Convert.h |   6 +-
 .../freestyle/intern/python/Interface0D.cpp   |   5 +
 .../Interface0D/CurvePoint/StrokeVertex.cpp   | 281 ++++++++++--------
 .../Interface0D/CurvePoint/StrokeVertex.h     |   2 +-
 6 files changed, 179 insertions(+), 124 deletions(-)

diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript
index 81749b60b2a..65cafb306e5 100644
--- a/source/blender/freestyle/SConscript
+++ b/source/blender/freestyle/SConscript
@@ -68,7 +68,7 @@ python_sources = [
 					prefix + '/IntegrationType.cpp',
 					prefix + '/Interface0D.cpp',
 					prefix + '/Interface0D/CurvePoint.cpp',
-					# prefix + '/Interface0D/CurvePoint/StrokeVertex.cpp',
+					prefix + '/Interface0D/CurvePoint/StrokeVertex.cpp',
 					prefix + '/Interface0D/SVertex.cpp',
 					prefix + '/Interface0D/ViewVertex.cpp',
 					prefix + '/Interface1D.cpp',
diff --git a/source/blender/freestyle/intern/python/Convert.cpp b/source/blender/freestyle/intern/python/Convert.cpp
index 9cd2a098253..5183457a669 100644
--- a/source/blender/freestyle/intern/python/Convert.cpp
+++ b/source/blender/freestyle/intern/python/Convert.cpp
@@ -75,6 +75,13 @@ PyObject * BPy_Nature_from_Nature( unsigned short n ) {
 	return py_n;
 }
 
+PyObject * BPy_StrokeAttribute_from_StrokeAttribute( StrokeAttribute& sa ) {
+	PyObject *py_sa = StrokeAttribute_Type.tp_new( &StrokeAttribute_Type, 0, 0 );
+	((BPy_StrokeAttribute *) py_sa)->sa = new StrokeAttribute( sa );
+
+	return py_sa;	
+}
+
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/Convert.h b/source/blender/freestyle/intern/python/Convert.h
index 2346d420813..43deae224e3 100644
--- a/source/blender/freestyle/intern/python/Convert.h
+++ b/source/blender/freestyle/intern/python/Convert.h
@@ -10,6 +10,7 @@ using namespace Geometry;
 #include "Interface0D/SVertex.h"
 #include "Interface1D/FEdge.h"
 #include "Nature.h"
+#include "StrokeAttribute.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -27,11 +28,12 @@ PyObject * Vector_from_Vec2f( Vec2f& v );
 PyObject * Vector_from_Vec3f( Vec3f& v );
 PyObject * Vector_from_Vec3r( Vec3r& v );
 
-PyObject * BPy_Id_from_Id( Id& id );
-PyObject * BPy_SVertex_from_SVertex( SVertex& sv );
 PyObject * BPy_FEdge_from_FEdge( FEdge& fe );
+PyObject * BPy_Id_from_Id( Id& id );
 PyObject * BPy_Interface0D_from_Interface0D( Interface0D& if0D );
 PyObject * BPy_Nature_from_Nature( unsigned short n );
+PyObject * BPy_StrokeAttribute_from_StrokeAttribute( StrokeAttribute& sa );
+PyObject * BPy_SVertex_from_SVertex( SVertex& sv );
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/source/blender/freestyle/intern/python/Interface0D.cpp b/source/blender/freestyle/intern/python/Interface0D.cpp
index 469e2bc4c79..4c3e0af0edb 100644
--- a/source/blender/freestyle/intern/python/Interface0D.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D.cpp
@@ -2,6 +2,7 @@
 
 #include "Convert.h"
 #include "Interface0D/CurvePoint.h"
+#include "Interface0D/CurvePoint/StrokeVertex.h"
 #include "Interface0D/SVertex.h"
 #include "Interface0D/ViewVertex.h"
 #include "Interface1D/FEdge.h"
@@ -159,6 +160,10 @@ PyMODINIT_FUNC Interface0D_Init( PyObject *module )
 	Py_INCREF( &ViewVertex_Type );
 	PyModule_AddObject(module, "ViewVertex", (PyObject *)&ViewVertex_Type);
 	
+	if( PyType_Ready( &StrokeVertex_Type ) < 0 )
+		return;
+	Py_INCREF( &StrokeVertex_Type );
+	PyModule_AddObject(module, "StrokeVertex", (PyObject *)&StrokeVertex_Type);
 }
 
 //------------------------INSTANCE METHODS ----------------------------------
diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.cpp
index 69069a68f33..9d07125476e 100644
--- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.cpp
@@ -1,6 +1,7 @@
 #include "StrokeVertex.h"
 
 #include "../../Convert.h"
+#include "../../StrokeAttribute.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -11,10 +12,36 @@ extern "C" {
 /*---------------  Python API function prototypes for StrokeVertex instance  -----------*/
 static int StrokeVertex___init__(BPy_StrokeVertex *self, PyObject *args, PyObject *kwds);
 
+static PyObject * StrokeVertex_x( BPy_StrokeVertex *self );
+static PyObject * StrokeVertex_y( BPy_StrokeVertex *self );
+static PyObject * StrokeVertex_getPoint( BPy_StrokeVertex *self );
+static PyObject * StrokeVertex_attribute( BPy_StrokeVertex *self );
+static PyObject * StrokeVertex_curvilinearAbscissa( BPy_StrokeVertex *self );
+static PyObject * StrokeVertex_strokeLength( BPy_StrokeVertex *self );
+static PyObject * StrokeVertex_u( BPy_StrokeVertex *self );
+static PyObject * StrokeVertex_setX( BPy_StrokeVertex *self , PyObject *args);
+static PyObject * StrokeVertex_setY( BPy_StrokeVertex *self , PyObject *args);
+static PyObject * StrokeVertex_setPoint( BPy_StrokeVertex *self , PyObject *args);
+static PyObject * StrokeVertex_setAttribute( BPy_StrokeVertex *self , PyObject *args);
+static PyObject * StrokeVertex_setCurvilinearAbscissa( BPy_StrokeVertex *self , PyObject *args);
+static PyObject * StrokeVertex_setStrokeLength( BPy_StrokeVertex *self , PyObject *args);
 
 /*----------------------StrokeVertex instance definitions ----------------------------*/
 static PyMethodDef BPy_StrokeVertex_methods[] = {	
 //	{"__copy__", ( PyCFunction ) StrokeVertex___copy__, METH_NOARGS, "（ ）Cloning method."},
+	{"x", ( PyCFunction ) StrokeVertex_x, METH_NOARGS, "（ ）Returns the 2D point x coordinate"},
+	{"y", ( PyCFunction ) StrokeVertex_y, METH_NOARGS, "（ ）Returns the 2D point y coordinate"},
+	{"getPoint", ( PyCFunction ) StrokeVertex_getPoint, METH_NOARGS, "（ ）Returns the 2D point coordinates as a Vec2d"},
+	{"attribute", ( PyCFunction ) StrokeVertex_attribute, METH_NOARGS, "（ ）Returns the StrokeAttribute of this StrokeVertex"},
+	{"curvilinearAbscissa", ( PyCFunction ) StrokeVertex_curvilinearAbscissa, METH_NOARGS, "（ ）Returns the curvilinear abscissa "},
+	{"strokeLength", ( PyCFunction ) StrokeVertex_strokeLength, METH_NOARGS, "（ ）Returns the length of the Stroke to which this StrokeVertex belongs"},
+	{"u", ( PyCFunction ) StrokeVertex_u, METH_NOARGS, "（ ）Returns the curvilinear abscissa of this StrokeVertex in the Stroke"},
+	{"setX", ( PyCFunction ) StrokeVertex_setX, METH_VARARGS, "（double r ）Sets the 2D x value "},
+	{"setY", ( PyCFunction ) StrokeVertex_setY, METH_VARARGS, "（double r ）Sets the 2D y value "},
+	{"setPoint", ( PyCFunction ) StrokeVertex_setPoint, METH_VARARGS, "(double x, double y) / ( [x,y] ) Sets the 2D x and y values"},
+	{"setAttribute", ( PyCFunction ) StrokeVertex_setAttribute, METH_VARARGS, "（StrokeAttribute sa ）Sets the attribute."},
+	{"setCurvilinearAbscissa", ( PyCFunction ) StrokeVertex_setCurvilinearAbscissa, METH_VARARGS, "（double r ）Sets the curvilinear abscissa of this StrokeVertex in the Stroke"},
+	{"setStrokeLength", ( PyCFunction ) StrokeVertex_setStrokeLength, METH_VARARGS, "（double r ）Sets the Stroke's length (it's only a value stored by the Stroke Vertex, it won't change the real Stroke's length.) "},
 	{NULL, NULL, 0, NULL}
 };
 
@@ -79,7 +106,7 @@ PyTypeObject StrokeVertex_Type = {
 	BPy_StrokeVertex_methods,	/* struct PyMethodDef *tp_methods; */
 	NULL,                       	/* struct PyMemberDef *tp_members; */
 	NULL,         					/* struct PyGetSetDef *tp_getset; */
-	&Interface0D_Type,				/* struct _typeobject *tp_base; */
+	&CurvePoint_Type,				/* struct _typeobject *tp_base; */
 	NULL,							/* PyObject *tp_dict; */
 	NULL,							/* descrgetfunc tp_descr_get; */
 	NULL,							/* descrsetfunc tp_descr_set; */
@@ -117,138 +144,152 @@ int StrokeVertex___init__(BPy_StrokeVertex *self, PyObject *args, PyObject *kwds
         return -1;
 
 	if( !obj1 && !obj2 && !obj3 ){
-		self->cp = new CurvePoint();
-	} else if( PyFloat_Check(obj3) ) {
-		if( BPy_SVertex_Check(obj1) && BPy_SVertex_Check(obj2) ) {
-			self->cp = new CurvePoint(  ((BPy_SVertex *) obj1)->sv,
-										((BPy_SVertex *) obj2)->sv,
+		self->sv = new StrokeVertex();
+		
+	} else if( BPy_CurvePoint_Check(obj1) && ((BPy_CurvePoint *) obj1)->cp ) {
+		self->sv = new StrokeVertex( ((BPy_CurvePoint *) obj1)->cp );
+	
+	} else if( BPy_SVertex_Check(obj1) && ((BPy_SVertex *) obj1)->sv ) {
+		self->sv = new StrokeVertex( ((BPy_SVertex *) obj1)->sv );
+	
+	} else if( BPy_StrokeVertex_Check(obj1) && BPy_StrokeVertex_Check(obj2) 
+				&& ((BPy_StrokeVertex *) obj1)->sv && ((BPy_StrokeVertex *) obj2)->sv) {
+	
+		self->sv = new StrokeVertex(	((BPy_StrokeVertex *) obj1)->sv,
+										((BPy_StrokeVertex *) obj2)->sv,
 										PyFloat_AsDouble( obj3 ) );
-		} else if( BPy_CurvePoint_Check(obj1) && BPy_CurvePoint_Check(obj2) ) {
-			self->cp = new CurvePoint(  ((BPy_CurvePoint *) obj1)->cp,
-										((BPy_CurvePoint *) obj2)->cp,
-										PyFloat_AsDouble( obj3 ) );
-		} else {
-			return -1;	
-		}		
 	} else {
 		return -1;
 	}
 
-	self->py_if0D.if0D = self->cp;
+	self->py_cp.cp = self->sv;
+	self->py_cp.py_if0D.if0D = self->sv;
 
 	return 0;
 }
 
+PyObject * StrokeVertex_x( BPy_StrokeVertex *self ) {
+	return PyFloat_FromDouble( self->sv->x() );
+}
 
+PyObject * StrokeVertex_y( BPy_StrokeVertex *self ) {
+	return PyFloat_FromDouble( self->sv->y() );
+}
+
+PyObject * StrokeVertex_getPoint( BPy_StrokeVertex *self ) {
+	Vec2f v( self->sv->getPoint() );
+	return Vector_from_Vec2f( v );
+}
+
+PyObject * StrokeVertex_attribute( BPy_StrokeVertex *self ) {
+	StrokeAttribute sa( self->sv->attribute() );
+	return BPy_StrokeAttribute_from_StrokeAttribute( sa );
+}
+
+PyObject * StrokeVertex_curvilinearAbscissa( BPy_StrokeVertex *self ) {
+	return PyFloat_FromDouble( self->sv->curvilinearAbscissa() );
+}
+
+PyObject * StrokeVertex_strokeLength( BPy_StrokeVertex *self ) {
+	return PyFloat_FromDouble( self->sv->strokeLength() );
+}
+
+PyObject * StrokeVertex_u( BPy_StrokeVertex *self ) {
+	return PyFloat_FromDouble( self->sv->u() );
+}
+
+
+PyObject *StrokeVertex_setX( BPy_StrokeVertex *self , PyObject *args) {
+	double r;
+
+	if(!( PyArg_ParseTuple(args, "d", &r)  )) {
+		cout << "ERROR: StrokeVertex_setX" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->sv->setX( r );
+
+	Py_RETURN_NONE;
+}
+
+PyObject *StrokeVertex_setY( BPy_StrokeVertex *self , PyObject *args) {
+	double r;
+
+	if(!( PyArg_ParseTuple(args, "d", &r)  )) {
+		cout << "ERROR: StrokeVertex_setY" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->sv->setY( r );
+
+	Py_RETURN_NONE;
+}
+
+
+PyObject *StrokeVertex_setPoint( BPy_StrokeVertex *self , PyObject *args) {
+	PyObject *obj1 = 0, *obj2 = 0;
+
+	if(!( PyArg_ParseTuple(args, "O|O", &obj1, &obj2) )) {
+		cout << "ERROR: StrokeVertex_setPoint" << endl;
+		Py_RETURN_NONE;
+	}
+	
+	if( PyList_Check(obj1) && !obj2 ){
+		Vec2f v( 	PyFloat_AsDouble( PyList_GetItem(obj1, 0) ),
+					PyFloat_AsDouble( PyList_GetItem(obj1, 1) )  );
+		self->sv->setPoint( v );
+	} else if( obj1 && obj2 ){
+		self->sv->setPoint( PyFloat_AsDouble(obj1), PyFloat_AsDouble(obj2) );
+	}
+
+	Py_RETURN_NONE;
+}
+
+PyObject *StrokeVertex_setAttribute( BPy_StrokeVertex *self , PyObject *args) {
+	PyObject *py_sa;
+
+	if(!( PyArg_ParseTuple(args, "O", &py_sa) && BPy_StrokeAttribute_Check(py_sa)  )) {
+		cout << "ERROR: StrokeVertex_setAttribute" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->sv->setAttribute(*( ((BPy_StrokeAttribute *) py_sa)->sa ));
+
+	Py_RETURN_NONE;
+}
+
+PyObject *StrokeVertex_setCurvilinearAbscissa( BPy_StrokeVertex *self , PyObject *args) {
+	double r;
+
+	if(!( PyArg_ParseTuple(args, "d", &r)  )) {
+		cout << "ERROR: StrokeVertex_setCurvilinearAbscissa" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->sv->setCurvilinearAbscissa( r );
+
+	Py_RETURN_NONE;
+}
+
+
+PyObject *StrokeVertex_setStrokeLength( BPy_StrokeVertex *self , PyObject *args) {
+	double r;
+
+	if(!( PyArg_ParseTuple(args, "d", &r)  )) {
+		cout << "ERROR: StrokeVertex_setStrokeLength" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->sv->setStrokeLength( r );
+
+	Py_RETURN_NONE;
+}
+
+// real 	operator[] (const int i) const
+// real & 	operator[] (const int i)
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 #ifdef __cplusplus
 }
 #endif
-
-
-//  PyObject *_wrap_StrokeVertex_getExactTypeName(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-//  PyObject *_wrap_new_StrokeVertex__SWIG_0(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-//  PyObject *_wrap_new_StrokeVertex__SWIG_1(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-//  PyObject *_wrap_new_StrokeVertex__SWIG_2(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-//  PyObject *_wrap_new_StrokeVertex__SWIG_3(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-//  PyObject *_wrap_new_StrokeVertex__SWIG_4(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-//  PyObject *_wrap_new_StrokeVertex__SWIG_5(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-//  PyObject *_wrap_new_StrokeVertex(PyObject *self, PyObject *args) {
-// }
-// 
-// 
-//  PyObject *_wrap_delete_StrokeVertex(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-//  PyObject *_wrap_StrokeVertex_x(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-//  PyObject *_wrap_StrokeVertex_y(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-//  PyObject *_wrap_StrokeVertex_getPoint(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-//  PyObject *_wrap_StrokeVertex_attribute__SWIG_0(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-//  PyObject *_wrap_StrokeVertex_attribute__SWIG_1(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-//  PyObject *_wrap_StrokeVertex_attribute(PyObject *self, PyObject *args) {
-// }
-// 
-// 
-//  PyObject *_wrap_StrokeVertex_curvilinearAbscissa(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-//  PyObject *_wrap_StrokeVertex_strokeLength(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-//  PyObject *_wrap_StrokeVertex_u(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-//  PyObject *_wrap_StrokeVertex_SetX(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-//  PyObject *_wrap_StrokeVertex_SetY(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-//  PyObject *_wrap_StrokeVertex_SetPoint__SWIG_0(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-//  PyObject *_wrap_StrokeVertex_SetPoint__SWIG_1(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-//  PyObject *_wrap_StrokeVertex_SetPoint(PyObject *self, PyObject *args) {
-// }
-// 
-// 
-//  PyObject *_wrap_StrokeVertex_SetAttribute(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-//  PyObject *_wrap_StrokeVertex_SetCurvilinearAbscissa(PyObject *self , PyObject *args) {
-// }
-// 
-// 
-//  PyObject *_wrap_StrokeVertex_SetStrokeLength(PyObject *self , PyObject *args) {
-// }
-// 
-
diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.h b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.h
index dccecb093f5..4bc33ea4058 100644
--- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.h
+++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.h
@@ -2,7 +2,7 @@
 #define FREESTYLE_PYTHON_STROKEVERTEX_H
 
 #include "../CurvePoint.h"
-#include "../../stroke/Stroke.h"
+#include "../../../stroke/Stroke.h"
 
 #ifdef __cplusplus
 extern "C" {

From 20af6c61e8d76764d29e800924963fd770ae5acd Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Tue, 22 Jul 2008 14:56:02 +0000
Subject: [PATCH 118/252] Bugfix: Pasting non-text data (or trying to retrieve
 non-text data from the clipboard) crashed blender on Windows.

---
 intern/ghost/intern/GHOST_SystemWin32.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp
index f5c7c08ebfe..0b42fb80295 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.cpp
+++ b/intern/ghost/intern/GHOST_SystemWin32.cpp
@@ -919,6 +919,8 @@ GHOST_TUns8* GHOST_SystemWin32::getClipboard(int flag) const
 	
 	if ( OpenClipboard(NULL) ) {
 		HANDLE hData = GetClipboardData( CF_TEXT );
+		if (hData == NULL)
+			return NULL;
 		buffer = (char*)GlobalLock( hData );
 		
 		temp_buff = (char*) malloc(strlen(buffer)+1);

From 6d0e840648b1349302ea20891598806beddb6714 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Tue, 22 Jul 2008 15:31:22 +0000
Subject: [PATCH 119/252] Bug fix for the bug fix. Wasn't closing the clipboard
 before returning. Thanks b333rt for catching this.

---
 intern/ghost/intern/GHOST_SystemWin32.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp
index 0b42fb80295..7bc20d38739 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.cpp
+++ b/intern/ghost/intern/GHOST_SystemWin32.cpp
@@ -917,10 +917,12 @@ GHOST_TUns8* GHOST_SystemWin32::getClipboard(int flag) const
 	char *buffer;
 	char *temp_buff;
 	
-	if ( OpenClipboard(NULL) ) {
+	if ( IsClipboardFormatAvailable(CF_TEXT) && OpenClipboard(NULL) ) {
 		HANDLE hData = GetClipboardData( CF_TEXT );
-		if (hData == NULL)
+		if (hData == NULL) {
+			CloseClipboard();
 			return NULL;
+		}
 		buffer = (char*)GlobalLock( hData );
 		
 		temp_buff = (char*) malloc(strlen(buffer)+1);

From deccefc029e3a8e07e0b37eb6453ffce5e772c74 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Tue, 22 Jul 2008 17:44:06 +0000
Subject: [PATCH 120/252] First draft for control bones repositioning. All
 bones marked as no deform are repositioned after the retarget based on their
 "linked" bone (linked bone is constraint owner if control bone is a target,
 parent bone if not).

Arithb:
 Function to make a quat between two normalized vectors
---
 source/blender/blenlib/BLI_arithb.h    |   1 +
 source/blender/blenlib/intern/arithb.c |  12 +
 source/blender/src/autoarmature.c      | 364 ++++++++++++++-----------
 3 files changed, 215 insertions(+), 162 deletions(-)

diff --git a/source/blender/blenlib/BLI_arithb.h b/source/blender/blenlib/BLI_arithb.h
index c22b6f79e08..ccb592bba05 100644
--- a/source/blender/blenlib/BLI_arithb.h
+++ b/source/blender/blenlib/BLI_arithb.h
@@ -262,6 +262,7 @@ void Vec2Subf(float *v, float *v1, float *v2);
 void Vec2Copyf(float *v1, float *v2);
 
 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);
 
 float VecAngle2(float *v1, float *v2);
diff --git a/source/blender/blenlib/intern/arithb.c b/source/blender/blenlib/intern/arithb.c
index c97ca3c6a8a..6685e1b6dc5 100644
--- a/source/blender/blenlib/intern/arithb.c
+++ b/source/blender/blenlib/intern/arithb.c
@@ -1335,6 +1335,18 @@ void NormalQuat(float *q)
 	}
 }
 
+void RotationBetweenVectorsToQuat(float *q, float v1[3], float v2[3])
+{
+	float axis[3];
+	float angle;
+	
+	Crossf(axis, v1, v2);
+	
+	angle = NormalizedVecAngle2(v1, v2);
+	
+	AxisAngleToQuat(q, axis, angle);
+}
+
 void AxisAngleToQuat(float *q, float *axis, float angle)
 {
 	float nor[3];
diff --git a/source/blender/src/autoarmature.c b/source/blender/src/autoarmature.c
index 728cbff77da..cbbe0ffbb15 100644
--- a/source/blender/src/autoarmature.c
+++ b/source/blender/src/autoarmature.c
@@ -37,7 +37,9 @@
 #include "PIL_time.h"
 
 #include "DNA_ID.h"
+#include "DNA_action_types.h"
 #include "DNA_armature_types.h"
+#include "DNA_constraint_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
@@ -55,6 +57,7 @@
 
 #include "BKE_global.h"
 #include "BKE_utildefines.h"
+#include "BKE_constraint.h"
 
 #include "BIF_editarmature.h"
 #include "BIF_space.h"
@@ -87,6 +90,12 @@ typedef struct RigGraph {
 
 	struct RigNode *head;
 	ReebGraph *link_mesh;
+	
+	ListBase controls;
+	
+	GHash *bones_map;
+	
+	Object *ob;
 } RigGraph;
 
 typedef struct RigNode {
@@ -130,6 +139,13 @@ typedef struct RigEdge {
 	EditBone *bone;
 } RigEdge;
 
+typedef struct RigControl {
+	struct RigControl *next, *prev;
+	EditBone *bone;
+	EditBone *parent;
+	float offset[3];
+} RigControl;
+
 /*******************************************************************************************************/
 
 static void RIG_calculateEdgeAngle(RigEdge *edge_first, RigEdge *edge_second);
@@ -196,6 +212,8 @@ void RIG_freeRigGraph(BGraph *rg)
 	}
 	BLI_freelistN(&rg->nodes);
 	
+	BLI_ghash_free(((RigGraph*)rg)->bones_map, NULL, NULL);
+	
 	MEM_freeN(rg);
 }
 
@@ -208,6 +226,8 @@ static RigGraph *newRigGraph()
 	
 	rg->head = NULL;
 	
+	rg->bones_map = BLI_ghash_new(BLI_ghashutil_strhash, BLI_ghashutil_strcmp);
+	
 	rg->free_arc = RIG_freeRigArc;
 	rg->free_node = NULL;
 	
@@ -226,6 +246,17 @@ static RigArc *newRigArc(RigGraph *rg)
 	return arc;
 }
 
+static RigControl *newRigControl(RigGraph *rg)
+{
+	RigControl *ctrl;
+	
+	ctrl = MEM_callocN(sizeof(RigControl), "rig control");
+	
+	BLI_addtail(&rg->controls, ctrl);
+	
+	return ctrl;
+}
+
 static RigNode *newRigNodeHead(RigGraph *rg, RigArc *arc, float p[3])
 {
 	RigNode *node;
@@ -308,39 +339,121 @@ static void RIG_calculateEdgeAngle(RigEdge *edge_first, RigEdge *edge_second)
 	edge_first->angle = saacos(Inpf(vec_first, vec_second));
 }
 
+/************************************ CONTROL BONES ****************************************************/
+
+static void RIG_addControlBone(RigGraph *rg, EditBone *bone)
+{
+	RigControl *ctrl = newRigControl(rg);
+	ctrl->bone = bone;
+}
+
+static void RIG_parentControl(RigControl *ctrl, EditBone *parent)
+{
+	if (parent)
+	{
+		ctrl->parent = parent;
+		
+		VecSubf(ctrl->offset, ctrl->bone->head, ctrl->parent->tail);
+	}
+}
+
+static void RIG_reconnectControlBones(RigGraph *rg)
+{
+	RigControl *ctrl;
+	
+	for (ctrl = rg->controls.first; ctrl; ctrl = ctrl->next)
+	{
+		bPoseChannel *pchan;
+		bConstraint *con;
+		int found = 0;
+		
+		/* DO SOME MAGIC HERE */
+		for (pchan= rg->ob->pose->chanbase.first; pchan; pchan= pchan->next)
+		{
+			for (con= pchan->constraints.first; con; con= con->next) 
+			{
+				bConstraintTypeInfo *cti= constraint_get_typeinfo(con);
+				ListBase targets = {NULL, NULL};
+				bConstraintTarget *ct;
+				
+				/* constraint targets */
+				if (cti && cti->get_constraint_targets)
+				{
+					cti->get_constraint_targets(con, &targets);
+					
+					for (ct= targets.first; ct; ct= ct->next)
+					{
+						if ((ct->tar == rg->ob) && strcmp(ct->subtarget, ctrl->bone->name) == 0)
+						{
+							/* SET bone parent to bone corresponding to pchan */
+							EditBone *parent = BLI_ghash_lookup(rg->bones_map, pchan->name);
+							
+							RIG_parentControl(ctrl, parent);
+							found = 1;
+						}
+					}
+					
+					if (cti->flush_constraint_targets)
+						cti->flush_constraint_targets(con, &targets, 0);
+				}
+			}
+		}
+
+		/* if not found yet, check parent */		
+		if (found == 0)
+		{
+			RIG_parentControl(ctrl, ctrl->bone->parent);
+		}
+	}
+}
+
 /*******************************************************************************************************/
 
 static void RIG_arcFromBoneChain(RigGraph *rg, ListBase *list, EditBone *root_bone, RigNode *starting_node)
 {
-	EditBone *bone, *last_bone = NULL;
-	RigArc *arc;
+	EditBone *bone, *last_bone = root_bone;
+	RigArc *arc = NULL;
 	int contain_head = 0;
 	
-	arc = newRigArc(rg);
-	
-	if (starting_node == NULL)
-	{
-		starting_node = newRigNodeHead(rg, arc, root_bone->head);
-	}
-	else
-	{
-		addRigNodeHead(rg, arc, starting_node);
-	}
-	
 	for(bone = root_bone; bone; bone = nextEditBoneChild(list, bone, 0))
 	{
 		int nb_children;
 		
-		if (bone->parent && (bone->flag & BONE_CONNECTED) == 0)
+		BLI_ghash_insert(rg->bones_map, bone->name, bone);
+		
+		if ((bone->flag & BONE_NO_DEFORM) == 0)
 		{
-			RIG_addEdgeToArc(arc, bone->head, NULL);
+			if (arc == NULL)
+			{
+				arc = newRigArc(rg);
+				
+				if (starting_node == NULL)
+				{
+					starting_node = newRigNodeHead(rg, arc, root_bone->head);
+				}
+				else
+				{
+					addRigNodeHead(rg, arc, starting_node);
+				}
+			}
+			
+			if (bone->parent && (bone->flag & BONE_CONNECTED) == 0)
+			{
+				RIG_addEdgeToArc(arc, bone->head, NULL);
+			}
+			
+			RIG_addEdgeToArc(arc, bone->tail, bone);
+			
+			last_bone = bone;
+			
+			if (strcmp(bone->name, "head") == 0)
+			{
+				contain_head = 1;
+			}
 		}
-		
-		RIG_addEdgeToArc(arc, bone->tail, bone);
-		
-		if (strcmp(bone->name, "head") == 0)
+		else
 		{
-			contain_head = 1;
+			RIG_addControlBone(rg, bone);
 		}
 		
 		nb_children = countEditBoneChildren(list, bone);
@@ -358,11 +471,10 @@ static void RIG_arcFromBoneChain(RigGraph *rg, ListBase *list, EditBone *root_bo
 			/* arc ends here, break */
 			break;
 		}
-		last_bone = bone;
 	}
 	
 	/* If the loop exited without forking */
-	if (bone == NULL)
+	if (arc != NULL && bone == NULL)
 	{
 		newRigNodeTail(rg, arc, last_bone->tail);
 	}
@@ -480,12 +592,14 @@ void RIG_printGraph(RigGraph *rg)
 
 /*******************************************************************************************************/
 
-static RigGraph *armatureToGraph(ListBase *list)
+static RigGraph *armatureToGraph(Object *ob, ListBase *list)
 {
 	EditBone *ebone;
 	RigGraph *rg;
  	
 	rg = newRigGraph();
+	
+	rg->ob = ob;
 
 	/* Do the rotations */
 	for (ebone = list->first; ebone; ebone=ebone->next){
@@ -495,6 +609,8 @@ static RigGraph *armatureToGraph(ListBase *list)
 		}
 	}
 	
+	RIG_reconnectControlBones(rg);
+	
 	BLI_removeDoubleNodes((BGraph*)rg, 0.001);
 	
 	BLI_buildAdjacencyList((BGraph*)rg);
@@ -506,6 +622,57 @@ static RigGraph *armatureToGraph(ListBase *list)
 
 /************************************ RETARGETTING *****************************************************/
 
+static void repositionControl(RigControl *ctrl, float parent[3], float qrot[4], float resize)
+{
+	float parent_offset[3], tail_offset[3];
+	
+	VecSubf(tail_offset, ctrl->bone->tail, ctrl->bone->head);
+	
+	VECCOPY(parent_offset, ctrl->offset);
+	VecMulf(parent_offset, resize);
+	
+	QuatMulVecf(qrot, parent_offset);
+	QuatMulVecf(qrot, tail_offset);
+	
+	VecAddf(ctrl->bone->head, parent, parent_offset); 
+	VecAddf(ctrl->bone->tail, ctrl->bone->head, tail_offset);
+}
+
+static void repositionBone(RigGraph *rigg, EditBone *bone, float vec0[3], float vec1[3])
+{
+	RigControl *ctrl;
+	float qrot[4], resize = 0;
+	
+	QuatOne(qrot);
+	
+	for (ctrl = rigg->controls.first; ctrl; ctrl = ctrl->next)
+	{
+		if (ctrl->parent == bone)
+		{
+			if (resize == 0)
+			{
+				float v1[3], v2[3];
+				float l1, l2;
+				
+				VecSubf(v1, bone->tail, bone->head);
+				VecSubf(v2, vec1, vec0);
+				
+				l1 = Normalize(v1);
+				l2 = Normalize(v2);
+
+				resize = l2 / l1;
+				
+				RotationBetweenVectorsToQuat(qrot, v1, v2);
+			}
+			
+			repositionControl(ctrl, vec1, qrot, resize);
+		}
+	}
+	
+	VECCOPY(bone->head, vec0);
+	VECCOPY(bone->tail, vec1);
+}
+
 typedef enum 
 {
 	RETARGET_LENGTH,
@@ -513,7 +680,7 @@ typedef enum
 } RetargetMode; 
 
 static RetargetMode detectArcRetargetMode(RigArc *arc);
-static void retargetArctoArcLength(RigArc *iarc);
+static void retargetArctoArcLength(RigGraph *rigg, RigArc *iarc);
 
 
 static RetargetMode detectArcRetargetMode(RigArc *iarc)
@@ -881,7 +1048,7 @@ static int neighbour(int nb_joints, float *cost_cube, int *moving_joint, int *mo
 	return 1;
 }
 
-static void retargetArctoArcAggresive(RigArc *iarc)
+static void retargetArctoArcAggresive(RigGraph *rigg, RigArc *iarc)
 {
 	ReebArcIterator iter;
 	RigEdge *edge;
@@ -1195,86 +1362,7 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 		
 		MEM_freeN(cost_cube);
 	}	
-	/* GRADIENT DESCENT*/
-	else if (G.scene->toolsettings->skgen_optimisation_method == 2)
-	{
-		RigEdge *previous;
-		float *cost_cube;
-		
-		/* [joint: index][position: -1, 0, +1] */
-		cost_cube = MEM_callocN(sizeof(float) * 3 * nb_joints, "Cost Cube");
-		
-		initArcIterator(&iter, earc, node_start);
 
-		/* init vec_cache */
-		for (i = 0; i < nb_joints; i++)
-		{
-			bucket = peekBucket(&iter, positions[i]);
-			vec_cache[i + 1] = bucket->p;
-		}
-
-		/* init cost cube */
-		for (previous = iarc->edges.first, edge = previous->next, i = 0;
-			 edge;
-			 previous = edge, edge = edge->next, i += 1)
-		{
-			calcGradient(previous, edge, &iter, i, nb_joints, cost_cube, positions, vec_cache);
-		}
-
-		while(1)
-		{
-			float min_gradient = 0;
-			int moving_joint = -1;
-			int move_direction = -1;
-		
-			for (i = 0; i < nb_joints; i++)
-			{
-				if (cost_cube[i * 3] < min_gradient)
-				{
-					min_gradient = cost_cube[i * 3]; 
-					moving_joint = i;
-					move_direction = -1;
-				}
-				
-				if  (cost_cube[i * 3 + 2] < min_gradient)
-				{
-					min_gradient = cost_cube[i * 3 + 2]; 
-					moving_joint = i;
-					move_direction = 1;
-				}
-			}
-			
-			if (moving_joint == -1)
-			{
-				break;
-			}
-			
-			positions[moving_joint] += move_direction;
-			
-			/* update vector cache */
-			bucket = peekBucket(&iter, positions[moving_joint]);
-			vec_cache[moving_joint + 1] = bucket->p;
-
-			/* update cost cube */			
-			for (previous = iarc->edges.first, edge = previous->next, i = 0;
-				 edge;
-				 previous = edge, edge = edge->next, i += 1)
-			{
-				if (i == moving_joint - 1 ||
-					i == moving_joint ||
-					i == moving_joint + 1)
-				{
-					calcGradient(previous, edge, &iter, i, nb_joints, cost_cube, positions, vec_cache);
-				}
-			}
-			
-			
-		}
-		
-		memcpy(best_positions, positions, sizeof(int) * nb_joints);
-		
-		MEM_freeN(cost_cube);
-	}
 
 	vec0 = node_start->p;
 	initArcIterator(&iter, earc, node_start);
@@ -1303,8 +1391,7 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 		
 		if (bone)
 		{
-			VECCOPY(bone->head, vec0);
-			VECCOPY(bone->tail, vec1);
+			repositionBone(rigg, bone, vec0, vec1);
 		}
 		
 		vec0 = vec1;
@@ -1316,7 +1403,7 @@ static void retargetArctoArcAggresive(RigArc *iarc)
 	MEM_freeN(vec_cache);
 }
 
-static void retargetArctoArcLength(RigArc *iarc)
+static void retargetArctoArcLength(RigGraph *rigg, RigArc *iarc)
 {
 	ReebArcIterator iter;
 	ReebArc *earc = iarc->link_mesh;
@@ -1370,50 +1457,11 @@ static void retargetArctoArcLength(RigArc *iarc)
 	previous_vec = vec0;
 	vec1 = bucket->p;
 	
-	printf("arc: %f embedding %f\n",  iarc->length, embedding_length);
-	
 	for (edge = iarc->edges.first; edge; edge = edge->next)
 	{
 		EditBone *bone = edge->bone;
 		float new_bone_length = edge->length / iarc->length * embedding_length;
 
-#if 0		
-		while (bucket && new_bone_length > VecLenf(vec0, vec1))
-		{
-			bucket = nextBucket(&iter);
-			previous_vec = vec1;
-			vec1 = bucket->p;
-		}
-		
-		if (bucket == NULL)
-		{
-			vec1 = node_end->p;
-		}
-		
-		if (embedding_length < VecLenf(vec0, vec1))
-		{
-			float dv[3], off[3];
-			float a, b, c, f;
-			
-			/* Solve quadratic distance equation */
-			VecSubf(dv, vec1, previous_vec);
-			a = Inpf(dv, dv);
-			
-			VecSubf(off, previous_vec, vec0);
-			b = 2 * Inpf(dv, off);
-			
-			c = Inpf(off, off) - (new_bone_length * new_bone_length);
-			
-			f = (-b + (float)sqrt(b * b - 4 * a * c)) / (2 * a);
-			
-			if (isnan(f) == 0 && f < 1.0f)
-			{
-				VECCOPY(vec1, dv);
-				VecMulf(vec1, f);
-				VecAddf(vec1,vec1, vec0);
-			}
-		}
-#else
 		float length = 0;
 
 		while (bucket && new_bone_length > length)
@@ -1428,25 +1476,19 @@ static void retargetArctoArcLength(RigArc *iarc)
 		{
 			vec1 = node_end->p;
 		}
-#endif
 
 		/* no need to move virtual edges (space between unconnected bones) */		
 		if (bone)
 		{
-			printf("BONE: %s\n", bone->name);
-			VECCOPY(bone->head, vec0);
-			VECCOPY(bone->tail, vec1);
+			repositionBone(rigg, bone, vec0, vec1);
 		}
-		printvecf("vec0", vec0);
-		printvecf("vec1", vec1);
-		printf("old: %f target: %f new: %f\n", edge->length, new_bone_length, VecLenf(vec0, vec1));
 		
 		vec0 = vec1;
 		previous_vec = vec1;
 	}
 }
 
-static void retargetArctoArc(RigArc *iarc)
+static void retargetArctoArc(RigGraph *rigg, RigArc *iarc)
 {
 	ReebArc *earc = iarc->link_mesh;
 	
@@ -1458,14 +1500,12 @@ static void retargetArctoArc(RigArc *iarc)
 		/* symmetry axis */
 		if (earc->symmetry_level == 1 && iarc->symmetry_level == 1)
 		{
-			VECCOPY(bone->head, earc->tail->p);
-			VECCOPY(bone->tail, earc->head->p);
+			repositionBone(rigg, bone, earc->tail->p, earc->head->p);
 		}
 		/* or not */
 		else
 		{
-			VECCOPY(bone->head, earc->head->p);
-			VECCOPY(bone->tail, earc->tail->p);
+			repositionBone(rigg, bone, earc->head->p, earc->tail->p);
 		}
 	}
 	else
@@ -1474,11 +1514,11 @@ static void retargetArctoArc(RigArc *iarc)
 		
 		if (mode == RETARGET_AGGRESSIVE)
 		{
-			retargetArctoArcAggresive(iarc);
+			retargetArctoArcAggresive(rigg, iarc);
 		}
 		else
 		{		
-			retargetArctoArcLength(iarc);
+			retargetArctoArcLength(rigg, iarc);
 		}
 	}
 }
@@ -1598,7 +1638,7 @@ static void retargetSubgraph(RigGraph *rigg, RigArc *start_arc, RigNode *start_n
 		ReebNode *enode = start_node->link_mesh;
 		ReebArc *earc = start_arc->link_mesh;
 		
-		retargetArctoArc(start_arc);
+		retargetArctoArc(rigg, start_arc);
 		
 		enode = BIF_otherNodeFromIndex(earc, enode);
 		inode = (RigNode*)BLI_otherNode((BArc*)start_arc, (BNode*)inode);
@@ -1672,7 +1712,7 @@ void BIF_retargetArmature()
 				list.first= list.last = NULL;
 				make_boneList(&list, &arm->bonebase, NULL);
 			
-				rigg = armatureToGraph(&list);
+				rigg = armatureToGraph(ob, &list);
 				
 				BLI_markdownSymmetry((BGraph*)rigg, (BNode*)rigg->head, G.scene->toolsettings->skgen_symmetry_limit);
 				

From 0c3f7c2b7e0c9d8ad5945029170fc8ed1f0c1eda Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Wed, 23 Jul 2008 05:54:34 +0000
Subject: [PATCH 121/252] soc-2008-mxcurioni: implemented (without testing)
 StrokeShader, Stroke and MediumType (used by Stroke to define medium types)
 classes. The Stroke class is missing the InsertVertex method.

Before porting other classes, I'll resolve the List (Python) <=> Iterator (C++) correspondence problem by implementing a general class appropriately suited for the task.
---
 source/blender/freestyle/SConscript           |   3 +
 .../freestyle/intern/python/Convert.cpp       |  20 +
 .../blender/freestyle/intern/python/Convert.h |   4 +
 .../freestyle/intern/python/Freestyle.cpp     |   2 +
 .../freestyle/intern/python/Interface1D.cpp   |  14 +
 .../intern/python/Interface1D/Stroke.cpp      | 518 ++++++++++--------
 .../intern/python/Interface1D/Stroke.h        |  31 ++
 .../freestyle/intern/python/MediumType.cpp    | 119 ++++
 .../freestyle/intern/python/MediumType.h      |  33 ++
 .../freestyle/intern/python/StrokeShader.cpp  | 164 +++++-
 .../freestyle/intern/python/StrokeShader.h    |  41 ++
 11 files changed, 726 insertions(+), 223 deletions(-)
 create mode 100644 source/blender/freestyle/intern/python/Interface1D/Stroke.h
 create mode 100644 source/blender/freestyle/intern/python/MediumType.cpp
 create mode 100644 source/blender/freestyle/intern/python/MediumType.h
 create mode 100644 source/blender/freestyle/intern/python/StrokeShader.h

diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript
index 65cafb306e5..12b649c362d 100644
--- a/source/blender/freestyle/SConscript
+++ b/source/blender/freestyle/SConscript
@@ -73,8 +73,11 @@ python_sources = [
 					prefix + '/Interface0D/ViewVertex.cpp',
 					prefix + '/Interface1D.cpp',
 					prefix + '/Interface1D/FEdge.cpp',
+					prefix + '/Interface1D/Stroke.cpp',
 					prefix + '/Nature.cpp',
+					prefix + '/MediumType.cpp',
 					prefix + '/StrokeAttribute.cpp',
+					prefix + '/StrokeShader.cpp',
 					prefix + '/UnaryFunction0D.cpp',
 					prefix + '/UnaryFunction1D.cpp',
 					prefix + '/UnaryPredicate0D.cpp',
diff --git a/source/blender/freestyle/intern/python/Convert.cpp b/source/blender/freestyle/intern/python/Convert.cpp
index 5183457a669..410afe99d63 100644
--- a/source/blender/freestyle/intern/python/Convert.cpp
+++ b/source/blender/freestyle/intern/python/Convert.cpp
@@ -82,6 +82,26 @@ PyObject * BPy_StrokeAttribute_from_StrokeAttribute( StrokeAttribute& sa ) {
 	return py_sa;	
 }
 
+PyObject * BPy_MediumType_from_MediumType( unsigned short n ) {
+	PyObject *py_mt =  MediumType_Type.tp_new( &MediumType_Type, 0, 0 );
+
+	PyObject *args = PyTuple_New(1);
+	PyTuple_SetItem( args, 0, PyInt_FromLong(n) );
+	MediumType_Type.tp_init( py_mt, args, 0 );
+	Py_DECREF(args);
+
+	return py_mt;
+}
+
+PyObject * BPy_StrokeVertex_from_StrokeVertex( StrokeVertex& sv ) {
+	PyObject *py_sv = StrokeVertex_Type.tp_new( &StrokeVertex_Type, 0, 0 );
+	((BPy_StrokeVertex *) py_sv)->sv = new StrokeVertex( sv );
+	((BPy_StrokeVertex *) py_sv)->py_cp.cp = ((BPy_StrokeVertex *) py_sv)->sv;
+	((BPy_StrokeVertex *) py_sv)->py_cp.py_if0D.if0D = ((BPy_StrokeVertex *) py_sv)->sv;
+
+	return py_sv;
+}
+
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/Convert.h b/source/blender/freestyle/intern/python/Convert.h
index 43deae224e3..3caf8bf67f9 100644
--- a/source/blender/freestyle/intern/python/Convert.h
+++ b/source/blender/freestyle/intern/python/Convert.h
@@ -7,9 +7,11 @@ using namespace Geometry;
 #include "Id.h"
 #include "IntegrationType.h"
 #include "Interface0D.h"
+#include "Interface0D/CurvePoint/StrokeVertex.h"
 #include "Interface0D/SVertex.h"
 #include "Interface1D/FEdge.h"
 #include "Nature.h"
+#include "MediumType.h"
 #include "StrokeAttribute.h"
 
 #ifdef __cplusplus
@@ -32,7 +34,9 @@ PyObject * BPy_FEdge_from_FEdge( FEdge& fe );
 PyObject * BPy_Id_from_Id( Id& id );
 PyObject * BPy_Interface0D_from_Interface0D( Interface0D& if0D );
 PyObject * BPy_Nature_from_Nature( unsigned short n );
+PyObject * BPy_MediumType_from_MediumType( unsigned short n );
 PyObject * BPy_StrokeAttribute_from_StrokeAttribute( StrokeAttribute& sa );
+PyObject * BPy_StrokeVertex_from_StrokeVertex( StrokeVertex& sv );
 PyObject * BPy_SVertex_from_SVertex( SVertex& sv );
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/Freestyle.cpp b/source/blender/freestyle/intern/python/Freestyle.cpp
index a5aada0c470..2f93f1f8a74 100644
--- a/source/blender/freestyle/intern/python/Freestyle.cpp
+++ b/source/blender/freestyle/intern/python/Freestyle.cpp
@@ -9,6 +9,7 @@
 #include "Interface1D.h"
 #include "Nature.h"
 #include "StrokeAttribute.h"
+#include "StrokeShader.h"
 #include "UnaryFunction0D.h"
 #include "UnaryFunction1D.h"
 #include "UnaryPredicate0D.h"
@@ -136,6 +137,7 @@ PyObject *Freestyle_Init( void )
 	Interface1D_Init( module );
 	Nature_Init( module );
 	StrokeAttribute_Init( module );
+	StrokeShader_Init( module );
 	UnaryFunction0D_Init( module );
 	UnaryFunction1D_Init( module );
 	UnaryPredicate0D_Init( module );
diff --git a/source/blender/freestyle/intern/python/Interface1D.cpp b/source/blender/freestyle/intern/python/Interface1D.cpp
index 30dd5b349bd..f1a14b5d62f 100644
--- a/source/blender/freestyle/intern/python/Interface1D.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D.cpp
@@ -2,6 +2,8 @@
 
 #include "Convert.h"
 #include "Interface1D/FEdge.h"
+#include "Interface1D/Stroke.h"
+#include "MediumType.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -124,6 +126,8 @@ PyTypeObject Interface1D_Type = {
 //-------------------MODULE INITIALIZATION--------------------------------
 PyMODINIT_FUNC Interface1D_Init( PyObject *module )
 {
+	PyObject *tmp;
+	
 	if( module == NULL )
 		return;
 
@@ -136,6 +140,16 @@ PyMODINIT_FUNC Interface1D_Init( PyObject *module )
 		return;
 	Py_INCREF( &FEdge_Type );
 	PyModule_AddObject(module, "FEdge", (PyObject *)&FEdge_Type);
+
+	if( PyType_Ready( &Stroke_Type ) < 0 )
+		return;
+	Py_INCREF( &Stroke_Type );
+	PyModule_AddObject(module, "Stroke", (PyObject *)&Stroke_Type);
+
+	tmp = BPy_MediumType_from_MediumType( Stroke::DRY_MEDIUM ); PyDict_SetItemString( Stroke_Type.tp_dict, "DRY_MEDIUM", tmp); Py_DECREF(tmp);
+	tmp = BPy_MediumType_from_MediumType( Stroke::HUMID_MEDIUM ); PyDict_SetItemString( Stroke_Type.tp_dict, "HUMID_MEDIUM", tmp); Py_DECREF(tmp);
+	tmp = BPy_MediumType_from_MediumType( Stroke::OPAQUE_MEDIUM ); PyDict_SetItemString( Stroke_Type.tp_dict, "OPAQUE_MEDIUM", tmp); Py_DECREF(tmp);
+
 	
 }
 
diff --git a/source/blender/freestyle/intern/python/Interface1D/Stroke.cpp b/source/blender/freestyle/intern/python/Interface1D/Stroke.cpp
index fe5feb7068b..9951f21a0e1 100644
--- a/source/blender/freestyle/intern/python/Interface1D/Stroke.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/Stroke.cpp
@@ -1,236 +1,314 @@
-PyObject *Stroke_getExactTypeName(PyObject *self , PyObject *args) {
+#include "Stroke.h"
+
+#include "../Convert.h"
+#include "../Interface0D/SVertex.h"
+#include "../../stroke/StrokeIterators.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for Stroke instance  -----------*/
+static int Stroke___init__(BPy_Stroke *self, PyObject *args, PyObject *kwds);
+
+static PyObject * Stroke_ComputeSampling( BPy_Stroke *self, PyObject *args );
+static PyObject * Stroke_Resample( BPy_Stroke *self, PyObject *args );
+//static PyObject * Stroke_InsertVertex( BPy_Stroke *self, PyObject *args );
+static PyObject * Stroke_RemoveVertex( BPy_Stroke *self, PyObject *args );
+static PyObject * Stroke_getMediumType( BPy_Stroke *self );
+static PyObject * Stroke_getTextureId( BPy_Stroke *self );
+static PyObject * Stroke_hasTips( BPy_Stroke *self );
+static PyObject * Stroke_setId( BPy_Stroke *self , PyObject *args);
+static PyObject * Stroke_setLength( BPy_Stroke *self , PyObject *args);
+static PyObject * Stroke_setMediumType( BPy_Stroke *self , PyObject *args);
+static PyObject * Stroke_setTextureId( BPy_Stroke *self , PyObject *args);
+static PyObject * Stroke_setTips( BPy_Stroke *self , PyObject *args);
+static PyObject * Stroke_strokeVerticesSize( BPy_Stroke *self );
+static PyObject * Stroke_getStrokeVertices( BPy_Stroke *self );
+
+/*----------------------Stroke instance definitions ----------------------------*/
+static PyMethodDef BPy_Stroke_methods[] = {	
+	{"ComputeSampling", ( PyCFunction ) Stroke_ComputeSampling, METH_VARARGS, "(int nVertices) Compute the sampling needed to get nVertices vertices. If the specified number of vertices is less than the actual number of vertices, the actual sampling value is returned."},
+		{"Resample", ( PyCFunction ) Stroke_Resample, METH_VARARGS, "(float f | int n) Resampling method. If the argument is a float, Resamples the curve with a given sampling; if this sampling is < to the actual sampling value, no resampling is done. If the argument is an integer, Resamples the curve so that it eventually has n. That means it is going to add n-vertices_size, if vertices_size is the number of points we already have. Is vertices_size >= n, no resampling is done."},
+	{"RemoveVertex", ( PyCFunction ) Stroke_RemoveVertex, METH_VARARGS, "(StrokeVertex sv) Removes the stroke vertex sv from the stroke. The length and curvilinear abscissa are updated consequently."},
+	{"getMediumType", ( PyCFunction ) Stroke_getMediumType, METH_NOARGS, "() Returns the MediumType used for this Stroke."},
+	{"getTextureId", ( PyCFunction ) Stroke_getTextureId, METH_NOARGS, "() Returns the id of the texture used to simulate th marks system for this Stroke."},
+	{"hasTips", ( PyCFunction ) Stroke_hasTips, METH_NOARGS, "() Returns true if this Stroke uses a texture with tips, false otherwise."},
+	{"setId", ( PyCFunction ) Stroke_setId, METH_VARARGS, "(Id id) Sets the Id of the Stroke."},
+	{"setLength", ( PyCFunction ) Stroke_setLength, METH_VARARGS, "(float l) Sets the 2D length of the Stroke."},
+	{"setMediumType", ( PyCFunction ) Stroke_setMediumType, METH_VARARGS, "(MediumType mt) Sets the medium type that must be used for this Stroke."},
+	{"setTextureId", ( PyCFunction ) Stroke_setTextureId, METH_VARARGS, "(unsigned int id) Sets the texture id to be used to simulate the marks system for this Stroke."},
+	{"setTips", ( PyCFunction ) Stroke_setTips, METH_VARARGS, "(bool b) Sets the flag telling whether this stroke is using a texture with tips or not."},
+	{"strokeVerticesSize", ( PyCFunction ) Stroke_strokeVerticesSize, METH_NOARGS, "() Returns the number of StrokeVertex constituing the Stroke."},
+	{"getStrokeVertices", ( PyCFunction ) Stroke_getStrokeVertices, METH_NOARGS, "() Returns the stroke vertices. The difference with vertices() is that here we can iterate over points of the 1D element at a any given sampling. Indeed, for each iteration, a virtual point is created."},
+	//{"InsertVertex", ( PyCFunction ) Stroke_InsertVertex, METH_NOARGS, "(StrokeVertex sv, int i) Inserts the stroke vertex iVertex in the stroke before i. The length, curvilinear abscissa are updated consequently."},
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_Stroke type definition ------------------------------*/
+
+PyTypeObject Stroke_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"Stroke",				/* tp_name */
+	sizeof( BPy_Stroke ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_Stroke_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&Interface1D_Type,				/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)Stroke___init__,                       	/* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+// Stroke ()
+// template<class InputVertexIterator> Stroke (InputVertexIterator iBegin, InputVertexIterator iEnd)
+
+int Stroke___init__(BPy_Stroke *self, PyObject *args, PyObject *kwds)
+{
+	PyObject *obj1 = 0, *obj2 = 0;
+
+    if (! PyArg_ParseTuple(args, "|OO", &obj1) )
+        return -1;
+
+	if( !obj1 && !obj2 ){
+		self->s = new Stroke();
+
+	// template<class InputVertexIterator> Stroke (InputVertexIterator iBegin, InputVertexIterator iEnd)
+	//
+	// pb: - need to be able to switch representation: InputVertexIterator <=> position
+	//     - is it even used ? not even in SWIG version
+	} else {
+		return -1;
+	}
+
+	self->py_if1D.if1D = self->s;
+
+	return 0;
+}
+
+PyObject * Stroke_ComputeSampling( BPy_Stroke *self, PyObject *args ) {	
+	int i;
+
+	if(!( PyArg_ParseTuple(args, "i", &i)  )) {
+		cout << "ERROR: Stroke_ComputeSampling" << endl;
+		Py_RETURN_NONE;
+	}
+
+	return PyFloat_FromDouble( self->s->ComputeSampling( i ) );
+}
+
+PyObject * Stroke_Resample( BPy_Stroke *self, PyObject *args ) {	
+	PyObject *obj;
+
+	if(!( PyArg_ParseTuple(args, "O", &obj) )) {
+		cout << "ERROR: Stroke_Resample" << endl;
+		Py_RETURN_NONE;
+	}
+
+	if( PyInt_Check(obj) )
+		self->s->Resample( (int) PyInt_AsLong(obj) );
+	else if( PyFloat_Check(obj) )
+		self->s->Resample( (float) PyFloat_AsDouble(obj) );
+		
+	Py_RETURN_NONE;
 }
 
 
-PyObject *Stroke_getId(PyObject *self , PyObject *args) {
+PyObject * Stroke_RemoveVertex( BPy_Stroke *self, PyObject *args ) {	
+	PyObject *py_sv;
+
+	if(!( PyArg_ParseTuple(args, "O", &py_sv) )) {
+		cout << "ERROR: Stroke_RemoveVertex" << endl;
+		Py_RETURN_NONE;
+	}
+
+	if( BPy_StrokeVertex_Check(py_sv) && ((BPy_StrokeVertex *) py_sv)->sv )
+		self->s->RemoveVertex( ((BPy_StrokeVertex *) py_sv)->sv );
+		
+	Py_RETURN_NONE;
+}
+
+// pb: 'iterator <=> list' correspondence
+// void 	InsertVertex (StrokeVertex *iVertex, StrokeInternal::StrokeVertexIterator next)
+
+PyObject * Stroke_getMediumType( BPy_Stroke *self ) {	
+	return BPy_MediumType_from_MediumType( self->s->getMediumType() );
+}
+
+PyObject * Stroke_getTextureId( BPy_Stroke *self ) {	
+	return PyInt_FromLong( self->s->getTextureId() );
+}
+
+PyObject * Stroke_hasTips( BPy_Stroke *self ) {	
+	return PyBool_from_bool( self->s->hasTips() );
 }
 
 
- PyObject *_wrap_new_Stroke__SWIG_0(PyObject *self , PyObject *args) {
+PyObject *Stroke_setId( BPy_Stroke *self , PyObject *args) {
+	PyObject *py_id;
+
+	if(!( PyArg_ParseTuple(args, "O", &py_id) && BPy_Id_Check(py_id)  )) {
+		cout << "ERROR: Stroke_setId" << endl;
+		Py_RETURN_NONE;
+	}
+
+	if( ((BPy_Id *) py_id)->id )
+		self->s->setId(*( ((BPy_Id *) py_id)->id ));
+
+	Py_RETURN_NONE;
+}
+
+PyObject *Stroke_setLength( BPy_Stroke *self , PyObject *args) {
+	float f;
+
+	if(!( PyArg_ParseTuple(args, "f", &f) )) {
+		cout << "ERROR: Stroke_setLength" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->s->setLength( f );
+
+	Py_RETURN_NONE;
+}
+
+PyObject *Stroke_setMediumType( BPy_Stroke *self , PyObject *args) {
+	PyObject *py_mt;
+
+	if(!( PyArg_ParseTuple(args, "O", &py_mt) && BPy_MediumType_Check(py_mt)  )) {
+		cout << "ERROR: Stroke_setMediumType" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->s->setMediumType( static_cast<Stroke::MediumType>(PyInt_AsLong(py_mt)) );
+
+	Py_RETURN_NONE;
+}
+
+PyObject *Stroke_setTextureId( BPy_Stroke *self , PyObject *args) {
+	unsigned int i;
+
+	if(!( PyArg_ParseTuple(args, "I", &i) )) {
+		cout << "ERROR: Stroke_setTextureId" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->s->setTextureId( i );
+
+	Py_RETURN_NONE;
+}
+
+PyObject *Stroke_setTips( BPy_Stroke *self , PyObject *args) {
+	PyObject *py_b;
+
+	if(!( PyArg_ParseTuple(args, "O", &py_b) && PyBool_Check(py_b)  )) {
+		cout << "ERROR: Stroke_setTips" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->s->setTips( py_b == Py_True );
+
+	Py_RETURN_NONE;
 }
 
 
- PyObject *_wrap_new_Stroke__SWIG_1(PyObject *self , PyObject *args) {
+PyObject * Stroke_strokeVerticesSize( BPy_Stroke *self ) {	
+	return PyInt_FromLong( self->s->strokeVerticesSize() );
 }
 
 
- PyObject *_wrap_new_Stroke(PyObject *self, PyObject *args) {
+PyObject *Stroke_getStrokeVertices( BPy_Stroke *self ) {
+	PyObject *py_stroke_vertices = PyList_New(NULL);
+		
+	for( StrokeInternal::StrokeVertexIterator it = self->s->strokeVerticesBegin();
+		it != self->s->strokeVerticesEnd();
+		it++ ) {
+		PyList_Append( py_stroke_vertices, BPy_StrokeVertex_from_StrokeVertex( *it ) );
+	}
+	
+	return py_stroke_vertices;
 }
 
 
- PyObject *_wrap_delete_Stroke(PyObject *self , PyObject *args) {
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
 }
-
-
-PyObject *Stroke_ComputeSampling(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Stroke_Resample__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Stroke_Resample__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Stroke_Resample(PyObject *self, PyObject *args) {
-}
-
-
-PyObject *Stroke_RemoveVertex(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Stroke_InsertVertex(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Stroke_Render(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Stroke_RenderBasic(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Stroke_getLength2D(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Stroke_getMediumType(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Stroke_getTextureId(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Stroke_hasTips(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Stroke_vertices_size(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Stroke_viewedges_begin__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Stroke_viewedges_begin__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Stroke_viewedges_begin(PyObject *self, PyObject *args) {
-}
-
-
-PyObject *Stroke_viewedges_end__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Stroke_viewedges_end__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Stroke_viewedges_end(PyObject *self, PyObject *args) {
-}
-
-
-PyObject *Stroke_viewedges_size(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Stroke_getBeginningOrientation(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Stroke_getBeginningOrientationX(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Stroke_getBeginningOrientationY(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Stroke_getEndingOrientation(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Stroke_getEndingOrientationX(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Stroke_getEndingOrientationY(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Stroke_SetId(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Stroke_SetLength(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Stroke_SetMediumType(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Stroke_SetTextureId(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Stroke_SetTips(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Stroke_push_back(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Stroke_push_front(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Stroke_AddViewEdge(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Stroke_SetBeginningOrientation__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Stroke_SetBeginningOrientation__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Stroke_SetBeginningOrientation(PyObject *self, PyObject *args) {
-}
-
-
-PyObject *Stroke_SetEndingOrientation__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Stroke_SetEndingOrientation__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Stroke_SetEndingOrientation(PyObject *self, PyObject *args) {
-}
-
-
-PyObject *Stroke_strokeVerticesBegin__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Stroke_strokeVerticesBegin__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Stroke_strokeVerticesBegin(PyObject *self, PyObject *args) {
-}
-
-
-PyObject *Stroke_strokeVerticesEnd(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Stroke_strokeVerticesSize(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Stroke_verticesBegin(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Stroke_verticesEnd(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Stroke_pointsBegin__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Stroke_pointsBegin__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Stroke_pointsBegin(PyObject *self, PyObject *args) {
-}
-
-
-PyObject *Stroke_pointsEnd__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Stroke_pointsEnd__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Stroke_pointsEnd(PyObject *self, PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/Interface1D/Stroke.h b/source/blender/freestyle/intern/python/Interface1D/Stroke.h
new file mode 100644
index 00000000000..fc4b426fd53
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Interface1D/Stroke.h
@@ -0,0 +1,31 @@
+#ifndef FREESTYLE_PYTHON_STROKE_H
+#define FREESTYLE_PYTHON_STROKE_H
+
+#include "../Interface1D.h"
+#include "../../stroke/Stroke.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject Stroke_Type;
+
+#define BPy_Stroke_Check(v)	(( (PyObject *) v)->ob_type == &Stroke_Type)
+
+/*---------------------------Python BPy_Stroke structure definition----------*/
+typedef struct {
+	BPy_Interface1D py_if1D;
+	Stroke *s;
+} BPy_Stroke;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_STROKE_H */
diff --git a/source/blender/freestyle/intern/python/MediumType.cpp b/source/blender/freestyle/intern/python/MediumType.cpp
new file mode 100644
index 00000000000..f0c5fcc58a4
--- /dev/null
+++ b/source/blender/freestyle/intern/python/MediumType.cpp
@@ -0,0 +1,119 @@
+#include "MediumType.h"
+
+#include "Convert.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for MediumType instance  -----------*/
+static int MediumType___init__(BPy_MediumType *self, PyObject *args, PyObject *kwds);
+
+/*----------------------MediumType instance definitions ----------------------------*/
+static PyMethodDef BPy_MediumType_methods[] = {
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_MediumType type definition ------------------------------*/
+
+PyTypeObject MediumType_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"MediumType",				/* tp_name */
+	sizeof( BPy_MediumType ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_MediumType_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&PyInt_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)MediumType___init__,                       	/* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	PyType_GenericNew,			/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+
+int MediumType___init__(BPy_MediumType *self, PyObject *args, PyObject *kwds)
+{
+    if (PyInt_Type.tp_init((PyObject *)self, args, kwds) < 0)
+        return -1;
+	
+	return 0;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/source/blender/freestyle/intern/python/MediumType.h b/source/blender/freestyle/intern/python/MediumType.h
new file mode 100644
index 00000000000..d56594e0f68
--- /dev/null
+++ b/source/blender/freestyle/intern/python/MediumType.h
@@ -0,0 +1,33 @@
+#ifndef FREESTYLE_PYTHON_MEDIUMTYPE_H
+#define FREESTYLE_PYTHON_MEDIUMTYPE_H
+
+#include "../stroke/Stroke.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject MediumType_Type;
+
+#define BPy_MediumType_Check(v)	(( (PyObject *) v)->ob_type == &MediumType_Type)
+
+/*---------------------------Python BPy_MediumType structure definition----------*/
+typedef struct {
+	PyIntObject i;
+} BPy_MediumType;
+
+/*---------------------------Python BPy_MediumType visible prototypes-----------*/
+
+PyMODINIT_FUNC MediumType_Init( PyObject *module );
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_MEDIUMTYPE_H */
diff --git a/source/blender/freestyle/intern/python/StrokeShader.cpp b/source/blender/freestyle/intern/python/StrokeShader.cpp
index 268d1fabe36..029f8776c73 100644
--- a/source/blender/freestyle/intern/python/StrokeShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader.cpp
@@ -1,12 +1,170 @@
- PyObject *_wrap_StrokeShader_getName(PyObject *self , PyObject *args) {
+#include "StrokeShader.h"
+
+#include "Convert.h"
+#include "Interface1D/Stroke.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for StrokeShader instance  -----------*/
+static int StrokeShader___init__(BPy_StrokeShader *self, PyObject *args, PyObject *kwds);
+static void StrokeShader___dealloc__(BPy_StrokeShader *self);
+static PyObject * StrokeShader___repr__(BPy_StrokeShader *self);
+
+static PyObject * StrokeShader_getName( BPy_StrokeShader *self, PyObject *args);
+static PyObject * StrokeShader_shade( BPy_StrokeShader *self , PyObject *args);
+
+/*----------------------StrokeShader instance definitions ----------------------------*/
+static PyMethodDef BPy_StrokeShader_methods[] = {
+	{"getName", ( PyCFunction ) StrokeShader_getName, METH_NOARGS, "（ ）Returns the string of the name of the binary predicate."},
+	{"shade", ( PyCFunction ) StrokeShader_shade, METH_VARARGS, "（Stroke s ）The shading method. This method must be overloaded by inherited classes. The shading method is designed to modify any Stroke's attribute such as Thickness, Color, Geometry, Texture, Blending mode... The basic way to achieve this operation consists in iterating over the StrokeVertices of the Stroke and to modify each one's StrokeAttribute."},
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_StrokeShader type definition ------------------------------*/
+
+PyTypeObject StrokeShader_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"StrokeShader",				/* tp_name */
+	sizeof( BPy_StrokeShader ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	(destructor)StrokeShader___dealloc__,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	(reprfunc)StrokeShader___repr__,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_StrokeShader_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	NULL,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)StrokeShader___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	PyType_GenericNew,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+PyMODINIT_FUNC StrokeShader_Init( PyObject *module )
+{
+	if( module == NULL )
+		return;
+
+	if( PyType_Ready( &StrokeShader_Type ) < 0 )
+		return;
+
+	Py_INCREF( &StrokeShader_Type );
+	PyModule_AddObject(module, "StrokeShader", (PyObject *)&StrokeShader_Type);
+}
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int StrokeShader___init__(BPy_StrokeShader *self, PyObject *args, PyObject *kwds)
+{
+	self->ss = new StrokeShader();
+	return 0;
+}
+
+void StrokeShader___dealloc__(BPy_StrokeShader* self)
+{
+	delete self->ss;
+    self->ob_type->tp_free((PyObject*)self);
 }
 
 
- PyObject *_wrap_StrokeShader_shade(PyObject *self , PyObject *args) {
+PyObject * StrokeShader___repr__(BPy_StrokeShader* self)
+{
+    return PyString_FromFormat("type: %s - address: %p", self->ss->getName().c_str(), self->ss );
 }
 
 
- PyObject *_wrap_disown_StrokeShader(PyObject *self , PyObject *args) {
+PyObject * StrokeShader_getName( BPy_StrokeShader *self, PyObject *args)
+{
+	return PyString_FromString( self->ss->getName().c_str() );
+}
+
+PyObject *StrokeShader_shade( BPy_StrokeShader *self , PyObject *args) {
+	PyObject *py_s = 0;
+
+	if(!( PyArg_ParseTuple(args, "O", &py_s) && BPy_Stroke_Check(py_s) )) {
+		cout << "ERROR: StrokeShader_shade" << endl;
+		Py_RETURN_NONE;
+	}
+	
+	self->ss->shade(*( ((BPy_Stroke *) py_s)->s ));
+
+	Py_RETURN_NONE;
 }
 
 
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/StrokeShader.h b/source/blender/freestyle/intern/python/StrokeShader.h
new file mode 100644
index 00000000000..091eaa50383
--- /dev/null
+++ b/source/blender/freestyle/intern/python/StrokeShader.h
@@ -0,0 +1,41 @@
+#ifndef FREESTYLE_PYTHON_STROKESHADER_H
+#define FREESTYLE_PYTHON_STROKESHADER_H
+
+
+#include "../system/FreestyleConfig.h"
+
+using namespace std;
+
+#include "../stroke/StrokeShader.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject StrokeShader_Type;
+
+#define BPy_StrokeShader_Check(v)	(( (PyObject *) v)->ob_type == &StrokeShader_Type)
+
+/*---------------------------Python BPy_StrokeShader structure definition----------*/
+typedef struct {
+	PyObject_HEAD
+	StrokeShader *ss;
+} BPy_StrokeShader;
+
+/*---------------------------Python BPy_StrokeShader visible prototypes-----------*/
+
+PyMODINIT_FUNC StrokeShader_Init( PyObject *module );
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* FREESTYLE_PYTHON_STROKESHADER_H */

From a9789d90ae7c4408684490844ee9edf37ae84f65 Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Wed, 23 Jul 2008 07:56:08 +0000
Subject: [PATCH 122/252] soc-2008-mxcurioni: renamed all Freestyle API related
 files with 'BPy_' prefix to avoid library name collision.

Included MediumType's initialization at proper time to avoid Blender's crash.
---
 source/blender/freestyle/SConscript           | 44 +++++++++----------
 ...dicate0D.cpp => BPy_BinaryPredicate0D.cpp} |  6 +--
 ...yPredicate0D.h => BPy_BinaryPredicate0D.h} |  0
 ...dicate1D.cpp => BPy_BinaryPredicate1D.cpp} |  6 +--
 ...yPredicate1D.h => BPy_BinaryPredicate1D.h} |  0
 .../python/{Convert.cpp => BPy_Convert.cpp}   |  4 +-
 .../python/{Convert.h => BPy_Convert.h}       | 20 ++++-----
 ...terator.cpp => BPy_CurvePointIterator.cpp} |  0
 ...{EdgeModifier.cpp => BPy_EdgeModifier.cpp} |  0
 .../{Freestyle.cpp => BPy_Freestyle.cpp}      | 38 +++++++++-------
 .../python/{Freestyle.h => BPy_Freestyle.h}   |  0
 .../intern/python/{Id.cpp => BPy_Id.cpp}      |  4 +-
 .../intern/python/{Id.h => BPy_Id.h}          |  0
 ...rationType.cpp => BPy_IntegrationType.cpp} |  4 +-
 ...ntegrationType.h => BPy_IntegrationType.h} |  0
 .../{Interface0D.cpp => BPy_Interface0D.cpp}  | 16 +++----
 .../{Interface0D.h => BPy_Interface0D.h}      |  0
 ...erator.cpp => BPy_Interface0DIterator.cpp} |  0
 .../{Interface1D.cpp => BPy_Interface1D.cpp}  | 10 ++---
 .../{Interface1D.h => BPy_Interface1D.h}      |  0
 .../python/{Material.cpp => BPy_Material.cpp} |  0
 .../{MediumType.cpp => BPy_MediumType.cpp}    | 16 ++++++-
 .../python/{MediumType.h => BPy_MediumType.h} |  0
 .../python/{Nature.cpp => BPy_Nature.cpp}     |  4 +-
 .../intern/python/{Nature.h => BPy_Nature.h}  |  0
 .../python/{Noise.cpp => BPy_Noise.cpp}       |  0
 .../{Operators.cpp => BPy_Operators.cpp}      |  0
 .../python/{SShape.cpp => BPy_SShape.cpp}     |  0
 ...eAttribute.cpp => BPy_StrokeAttribute.cpp} |  4 +-
 ...trokeAttribute.h => BPy_StrokeAttribute.h} |  0
 ...{StrokeShader.cpp => BPy_StrokeShader.cpp} |  6 +--
 .../{StrokeShader.h => BPy_StrokeShader.h}    |  0
 ...rator.cpp => BPy_StrokeVertexIterator.cpp} |  0
 ...Function0D.cpp => BPy_UnaryFunction0D.cpp} |  4 +-
 ...naryFunction0D.h => BPy_UnaryFunction0D.h} |  0
 ...Function1D.cpp => BPy_UnaryFunction1D.cpp} |  4 +-
 ...naryFunction1D.h => BPy_UnaryFunction1D.h} |  0
 ...edicate0D.cpp => BPy_UnaryPredicate0D.cpp} |  4 +-
 ...ryPredicate0D.h => BPy_UnaryPredicate0D.h} |  0
 ...edicate1D.cpp => BPy_UnaryPredicate1D.cpp} |  4 +-
 ...ryPredicate1D.h => BPy_UnaryPredicate1D.h} |  0
 ...pModifier.cpp => BPy_ViewEdgeIterator.cpp} |  0
 .../python/{ViewMap.cpp => BPy_ViewMap.cpp}   |  0
 .../{ViewShape.cpp => BPy_ViewShape.cpp}      |  0
 ...n.cpp => BPy_orientedViewEdgeIterator.cpp} |  0
 .../{FalseBP1D.cpp => BPy_FalseBP1D.cpp}      |  0
 ...{Length2DBP1D.cpp => BPy_Length2DBP1D.cpp} |  0
 ...hapeIdBP1D.cpp => BPy_SameShapeIdBP1D.cpp} |  0
 .../{TrueBP1D.cpp => BPy_TrueBP1D.cpp}        |  0
 ...1D.cpp => BPy_ViewMapGradientNormBP1D.cpp} |  0
 .../BPy_TimestampModifier.cpp}                |  0
 .../{CurvePoint.cpp => BPy_CurvePoint.cpp}    |  4 +-
 .../{CurvePoint.h => BPy_CurvePoint.h}        |  2 +-
 .../{SVertex.cpp => BPy_SVertex.cpp}          |  6 +--
 .../Interface0D/{SVertex.h => BPy_SVertex.h}  |  2 +-
 .../{ViewVertex.cpp => BPy_ViewVertex.cpp}    |  4 +-
 .../{ViewVertex.h => BPy_ViewVertex.h}        |  2 +-
 ...{StrokeVertex.cpp => BPy_StrokeVertex.cpp} |  6 +--
 .../{StrokeVertex.h => BPy_StrokeVertex.h}    |  2 +-
 .../{NonTVertex.cpp => BPy_NonTVertex.cpp}    |  0
 .../{TVertex.cpp => BPy_TVertex.cpp}          |  0
 .../Interface1D/{Curve.cpp => BPy_Curve.cpp}  |  0
 .../Interface1D/{FEdge.cpp => BPy_FEdge.cpp}  |  6 +--
 .../Interface1D/{FEdge.h => BPy_FEdge.h}      |  2 +-
 .../{Stroke.cpp => BPy_Stroke.cpp}            |  6 +--
 .../Interface1D/{Stroke.h => BPy_Stroke.h}    |  2 +-
 .../{ViewEdge.cpp => BPy_ViewEdge.cpp}        |  0
 .../Curve/BPy_Chain.cpp}                      |  0
 .../{FEdgeSharp.cpp => BPy_FEdgeSharp.cpp}    |  0
 .../{FEdgeSmooth.cpp => BPy_FEdgeSmooth.cpp}  |  0
 ...er.cpp => BPy_BackboneStretcherShader.cpp} |  0
 ...veShader.cpp => BPy_BezierCurveShader.cpp} |  0
 ...cShader.cpp => BPy_CalligraphicShader.cpp} |  0
 ...iseShader.cpp => BPy_ColorNoiseShader.cpp} |  0
 ...pp => BPy_ColorVariationPatternShader.cpp} |  0
 ...Shader.cpp => BPy_ConstantColorShader.cpp} |  0
 ...er.cpp => BPy_ConstantThicknessShader.cpp} |  0
 ..._ConstrainedIncreasingThicknessShader.cpp} |  0
 ...sShader.cpp => BPy_GuidingLinesShader.cpp} |  0
 ...ader.cpp => BPy_IncreasingColorShader.cpp} |  0
 ....cpp => BPy_IncreasingThicknessShader.cpp} |  0
 ...der.cpp => BPy_PolygonalizationShader.cpp} |  0
 ...plingShader.cpp => BPy_SamplingShader.cpp} |  0
 ...eShader.cpp => BPy_SpatialNoiseShader.cpp} |  0
 ...Shader.cpp => BPy_StrokeTextureShader.cpp} |  0
 ...ader.cpp => BPy_TextureAssignerShader.cpp} |  0
 ...hader.cpp => BPy_ThicknessNoiseShader.cpp} |  0
 ...> BPy_ThicknessVariationPatternShader.cpp} |  0
 ...verShader.cpp => BPy_TipRemoverShader.cpp} |  0
 ...streamShader.cpp => BPy_fstreamShader.cpp} |  0
 ...{streamShader.cpp => BPy_streamShader.cpp} |  0
 ...uble.cpp => BPy_UnaryFunction0DDouble.cpp} |  0
 ...Float.cpp => BPy_UnaryFunction0DFloat.cpp} |  0
 ...tion0DId.cpp => BPy_UnaryFunction0DId.cpp} |  0
 ...ed.cpp => BPy_UnaryFunction0DUnsigned.cpp} |  0
 ...Vec2f.cpp => BPy_UnaryFunction0DVec2f.cpp} |  0
 ...Vec3f.cpp => BPy_UnaryFunction0DVec3f.cpp} |  0
 ...=> BPy_UnaryFunction0DVectorViewShape.cpp} |  0
 ...e.cpp => BPy_UnaryFunction0DViewShape.cpp} |  0
 .../{ShapeIdF0D.cpp => BPy_ShapeIdF0D.cpp}    |  0
 .../{MaterialF0D.cpp => BPy_MaterialF0D.cpp}  |  0
 ...veNatureF0D.cpp => BPy_CurveNatureF0D.cpp} |  0
 .../{Normal2DF0D.cpp => BPy_Normal2DF0D.cpp}  |  0
 ...F0D.cpp => BPy_VertexOrientation2DF0D.cpp} |  0
 ...F0D.cpp => BPy_VertexOrientation3DF0D.cpp} |  0
 ...OccludeeF0D.cpp => BPy_GetOccludeeF0D.cpp} |  0
 .../{GetShapeF0D.cpp => BPy_GetShapeF0D.cpp}  |  0
 .../{DensityF0D.cpp => BPy_DensityF0D.cpp}    |  0
 ...thF0D.cpp => BPy_LocalAverageDepthF0D.cpp} |  0
 ....cpp => BPy_GetCurvilinearAbscissaF0D.cpp} |  0
 ...rameterF0D.cpp => BPy_GetParameterF0D.cpp} |  0
 ....cpp => BPy_GetViewMapGradientNormF0D.cpp} |  0
 ...pp => BPy_ReadCompleteViewMapPixelF0D.cpp} |  0
 ...apPixelF0D.cpp => BPy_ReadMapPixelF0D.cpp} |  0
 ...p => BPy_ReadSteerableViewMapPixelF0D.cpp} |  0
 ...gleF0D.cpp => BPy_Curvature2DAngleF0D.cpp} |  0
 ...ectedXF0D.cpp => BPy_GetProjectedXF0D.cpp} |  0
 ...ectedYF0D.cpp => BPy_GetProjectedYF0D.cpp} |  0
 ...ectedZF0D.cpp => BPy_GetProjectedZF0D.cpp} |  0
 .../{GetXF0D.cpp => BPy_GetXF0D.cpp}          |  0
 .../{GetYF0D.cpp => BPy_GetYF0D.cpp}          |  0
 .../{GetZF0D.cpp => BPy_GetZF0D.cpp}          |  0
 ...nuityF0D.cpp => BPy_ZDiscontinuityF0D.cpp} |  0
 ...pp => BPy_QuantitativeInvisibilityF0D.cpp} |  0
 ...cludersF0D.cpp => BPy_GetOccludersF0D.cpp} |  0
 ...uble.cpp => BPy_UnaryFunction1DDouble.cpp} |  0
 ...Float.cpp => BPy_UnaryFunction1DFloat.cpp} |  0
 ...ed.cpp => BPy_UnaryFunction1DUnsigned.cpp} |  0
 ...Vec2f.cpp => BPy_UnaryFunction1DVec2f.cpp} |  0
 ...Vec3f.cpp => BPy_UnaryFunction1DVec3f.cpp} |  0
 ...=> BPy_UnaryFunction1DVectorViewShape.cpp} |  0
 ...veNatureF1D.cpp => BPy_CurveNatureF1D.cpp} |  0
 .../{Normal2DF1D.cpp => BPy_Normal2DF1D.cpp}  |  0
 ...tion2DF1D.cpp => BPy_Orientation2DF1D.cpp} |  0
 ...tion3DF1D.cpp => BPy_Orientation3DF1D.cpp} |  0
 .../{DensityF1D.cpp => BPy_DensityF1D.cpp}    |  0
 ...p => BPy_GetCompleteViewMapDensityF1D.cpp} |  0
 ...> BPy_GetDirectionalViewMapDensityF1D.cpp} |  0
 ...thF1D.cpp => BPy_LocalAverageDepthF1D.cpp} |  0
 ...gleF1D.cpp => BPy_Curvature2DAngleF1D.cpp} |  0
 ...ectedXF1D.cpp => BPy_GetProjectedXF1D.cpp} |  0
 ...ectedYF1D.cpp => BPy_GetProjectedYF1D.cpp} |  0
 ...ectedZF1D.cpp => BPy_GetProjectedZF1D.cpp} |  0
 ... => BPy_GetSteerableViewMapDensityF1D.cpp} |  0
 ....cpp => BPy_GetViewMapGradientNormF1D.cpp} |  0
 .../{GetXF1D.cpp => BPy_GetXF1D.cpp}          |  0
 .../{GetYF1D.cpp => BPy_GetYF1D.cpp}          |  0
 .../{GetZF1D.cpp => BPy_GetZF1D.cpp}          |  0
 ...nuityF1D.cpp => BPy_ZDiscontinuityF1D.cpp} |  0
 ...pp => BPy_QuantitativeInvisibilityF1D.cpp} |  0
 ...OccludeeF1D.cpp => BPy_GetOccludeeF1D.cpp} |  0
 ...cludersF1D.cpp => BPy_GetOccludersF1D.cpp} |  0
 .../{GetShapeF1D.cpp => BPy_GetShapeF1D.cpp}  |  0
 ...mpF1D.cpp => BPy_ChainingTimeStampF1D.cpp} |  0
 ... => BPy_IncrementChainingTimeStampF1D.cpp} |  0
 ...{TimeStampF1D.cpp => BPy_TimeStampF1D.cpp} |  0
 .../{FalseUP0D.cpp => BPy_FalseUP0D.cpp}      |  0
 .../{TrueUP0D.cpp => BPy_TrueUP0D.cpp}        |  0
 .../{ContourUP1D.cpp => BPy_ContourUP1D.cpp}  |  0
 ...nUP1D.cpp => BPy_DensityLowerThanUP1D.cpp} |  0
 ...p => BPy_EqualToChainingTimeStampUP1D.cpp} |  0
 ...pUP1D.cpp => BPy_EqualToTimeStampUP1D.cpp} |  0
 ...urUP1D.cpp => BPy_ExternalContourUP1D.cpp} |  0
 .../{FalseUP1D.cpp => BPy_FalseUP1D.cpp}      |  0
 ...p => BPy_QuantitativeInvisibilityUP1D.cpp} |  0
 .../{ShapeUP1D.cpp => BPy_ShapeUP1D.cpp}      |  0
 .../{TrueUP1D.cpp => BPy_TrueUP1D.cpp}        |  0
 ...gIterator.cpp => BPy_ChainingIterator.cpp} |  0
 ...tor.cpp => BPy_ChainPredicateIterator.cpp} |  0
 ...or.cpp => BPy_ChainSilhouetteIterator.cpp} |  0
 source/blender/python/api2_2x/Blender.c       |  3 +-
 171 files changed, 132 insertions(+), 113 deletions(-)
 rename source/blender/freestyle/intern/python/{BinaryPredicate0D.cpp => BPy_BinaryPredicate0D.cpp} (98%)
 rename source/blender/freestyle/intern/python/{BinaryPredicate0D.h => BPy_BinaryPredicate0D.h} (100%)
 rename source/blender/freestyle/intern/python/{BinaryPredicate1D.cpp => BPy_BinaryPredicate1D.cpp} (98%)
 rename source/blender/freestyle/intern/python/{BinaryPredicate1D.h => BPy_BinaryPredicate1D.h} (100%)
 rename source/blender/freestyle/intern/python/{Convert.cpp => BPy_Convert.cpp} (97%)
 rename source/blender/freestyle/intern/python/{Convert.h => BPy_Convert.h} (75%)
 rename source/blender/freestyle/intern/python/{CurvePointIterator.cpp => BPy_CurvePointIterator.cpp} (100%)
 rename source/blender/freestyle/intern/python/{EdgeModifier.cpp => BPy_EdgeModifier.cpp} (100%)
 rename source/blender/freestyle/intern/python/{Freestyle.cpp => BPy_Freestyle.cpp} (89%)
 rename source/blender/freestyle/intern/python/{Freestyle.h => BPy_Freestyle.h} (100%)
 rename source/blender/freestyle/intern/python/{Id.cpp => BPy_Id.cpp} (99%)
 rename source/blender/freestyle/intern/python/{Id.h => BPy_Id.h} (100%)
 rename source/blender/freestyle/intern/python/{IntegrationType.cpp => BPy_IntegrationType.cpp} (98%)
 rename source/blender/freestyle/intern/python/{IntegrationType.h => BPy_IntegrationType.h} (100%)
 rename source/blender/freestyle/intern/python/{Interface0D.cpp => BPy_Interface0D.cpp} (97%)
 rename source/blender/freestyle/intern/python/{Interface0D.h => BPy_Interface0D.h} (100%)
 rename source/blender/freestyle/intern/python/{Interface0DIterator.cpp => BPy_Interface0DIterator.cpp} (100%)
 rename source/blender/freestyle/intern/python/{Interface1D.cpp => BPy_Interface1D.cpp} (98%)
 rename source/blender/freestyle/intern/python/{Interface1D.h => BPy_Interface1D.h} (100%)
 rename source/blender/freestyle/intern/python/{Material.cpp => BPy_Material.cpp} (100%)
 rename source/blender/freestyle/intern/python/{MediumType.cpp => BPy_MediumType.cpp} (93%)
 rename source/blender/freestyle/intern/python/{MediumType.h => BPy_MediumType.h} (100%)
 rename source/blender/freestyle/intern/python/{Nature.cpp => BPy_Nature.cpp} (99%)
 rename source/blender/freestyle/intern/python/{Nature.h => BPy_Nature.h} (100%)
 rename source/blender/freestyle/intern/python/{Noise.cpp => BPy_Noise.cpp} (100%)
 rename source/blender/freestyle/intern/python/{Operators.cpp => BPy_Operators.cpp} (100%)
 rename source/blender/freestyle/intern/python/{SShape.cpp => BPy_SShape.cpp} (100%)
 rename source/blender/freestyle/intern/python/{StrokeAttribute.cpp => BPy_StrokeAttribute.cpp} (99%)
 rename source/blender/freestyle/intern/python/{StrokeAttribute.h => BPy_StrokeAttribute.h} (100%)
 rename source/blender/freestyle/intern/python/{StrokeShader.cpp => BPy_StrokeShader.cpp} (98%)
 rename source/blender/freestyle/intern/python/{StrokeShader.h => BPy_StrokeShader.h} (100%)
 rename source/blender/freestyle/intern/python/{StrokeVertexIterator.cpp => BPy_StrokeVertexIterator.cpp} (100%)
 rename source/blender/freestyle/intern/python/{UnaryFunction0D.cpp => BPy_UnaryFunction0D.cpp} (99%)
 rename source/blender/freestyle/intern/python/{UnaryFunction0D.h => BPy_UnaryFunction0D.h} (100%)
 rename source/blender/freestyle/intern/python/{UnaryFunction1D.cpp => BPy_UnaryFunction1D.cpp} (99%)
 rename source/blender/freestyle/intern/python/{UnaryFunction1D.h => BPy_UnaryFunction1D.h} (100%)
 rename source/blender/freestyle/intern/python/{UnaryPredicate0D.cpp => BPy_UnaryPredicate0D.cpp} (98%)
 rename source/blender/freestyle/intern/python/{UnaryPredicate0D.h => BPy_UnaryPredicate0D.h} (100%)
 rename source/blender/freestyle/intern/python/{UnaryPredicate1D.cpp => BPy_UnaryPredicate1D.cpp} (98%)
 rename source/blender/freestyle/intern/python/{UnaryPredicate1D.h => BPy_UnaryPredicate1D.h} (100%)
 rename source/blender/freestyle/intern/python/{EdgeModifier/TimestampModifier.cpp => BPy_ViewEdgeIterator.cpp} (100%)
 rename source/blender/freestyle/intern/python/{ViewMap.cpp => BPy_ViewMap.cpp} (100%)
 rename source/blender/freestyle/intern/python/{ViewShape.cpp => BPy_ViewShape.cpp} (100%)
 rename source/blender/freestyle/intern/python/{Interface1D/Curve/Chain.cpp => BPy_orientedViewEdgeIterator.cpp} (100%)
 rename source/blender/freestyle/intern/python/BinaryPredicate1D/{FalseBP1D.cpp => BPy_FalseBP1D.cpp} (100%)
 rename source/blender/freestyle/intern/python/BinaryPredicate1D/{Length2DBP1D.cpp => BPy_Length2DBP1D.cpp} (100%)
 rename source/blender/freestyle/intern/python/BinaryPredicate1D/{SameShapeIdBP1D.cpp => BPy_SameShapeIdBP1D.cpp} (100%)
 rename source/blender/freestyle/intern/python/BinaryPredicate1D/{TrueBP1D.cpp => BPy_TrueBP1D.cpp} (100%)
 rename source/blender/freestyle/intern/python/BinaryPredicate1D/{ViewMapGradientNormBP1D.cpp => BPy_ViewMapGradientNormBP1D.cpp} (100%)
 rename source/blender/freestyle/intern/python/{ViewEdgeIterator.cpp => EdgeModifier/BPy_TimestampModifier.cpp} (100%)
 rename source/blender/freestyle/intern/python/Interface0D/{CurvePoint.cpp => BPy_CurvePoint.cpp} (99%)
 rename source/blender/freestyle/intern/python/Interface0D/{CurvePoint.h => BPy_CurvePoint.h} (95%)
 rename source/blender/freestyle/intern/python/Interface0D/{SVertex.cpp => BPy_SVertex.cpp} (99%)
 rename source/blender/freestyle/intern/python/Interface0D/{SVertex.h => BPy_SVertex.h} (95%)
 rename source/blender/freestyle/intern/python/Interface0D/{ViewVertex.cpp => BPy_ViewVertex.cpp} (98%)
 rename source/blender/freestyle/intern/python/Interface0D/{ViewVertex.h => BPy_ViewVertex.h} (95%)
 rename source/blender/freestyle/intern/python/Interface0D/CurvePoint/{StrokeVertex.cpp => BPy_StrokeVertex.cpp} (99%)
 rename source/blender/freestyle/intern/python/Interface0D/CurvePoint/{StrokeVertex.h => BPy_StrokeVertex.h} (95%)
 rename source/blender/freestyle/intern/python/Interface0D/ViewVertex/{NonTVertex.cpp => BPy_NonTVertex.cpp} (100%)
 rename source/blender/freestyle/intern/python/Interface0D/ViewVertex/{TVertex.cpp => BPy_TVertex.cpp} (100%)
 rename source/blender/freestyle/intern/python/Interface1D/{Curve.cpp => BPy_Curve.cpp} (100%)
 rename source/blender/freestyle/intern/python/Interface1D/{FEdge.cpp => BPy_FEdge.cpp} (99%)
 rename source/blender/freestyle/intern/python/Interface1D/{FEdge.h => BPy_FEdge.h} (95%)
 rename source/blender/freestyle/intern/python/Interface1D/{Stroke.cpp => BPy_Stroke.cpp} (99%)
 rename source/blender/freestyle/intern/python/Interface1D/{Stroke.h => BPy_Stroke.h} (95%)
 rename source/blender/freestyle/intern/python/Interface1D/{ViewEdge.cpp => BPy_ViewEdge.cpp} (100%)
 rename source/blender/freestyle/intern/python/{orientedViewEdgeIterator.cpp => Interface1D/Curve/BPy_Chain.cpp} (100%)
 rename source/blender/freestyle/intern/python/Interface1D/FEdge/{FEdgeSharp.cpp => BPy_FEdgeSharp.cpp} (100%)
 rename source/blender/freestyle/intern/python/Interface1D/FEdge/{FEdgeSmooth.cpp => BPy_FEdgeSmooth.cpp} (100%)
 rename source/blender/freestyle/intern/python/StrokeShader/{BackboneStretcherShader.cpp => BPy_BackboneStretcherShader.cpp} (100%)
 rename source/blender/freestyle/intern/python/StrokeShader/{BezierCurveShader.cpp => BPy_BezierCurveShader.cpp} (100%)
 rename source/blender/freestyle/intern/python/StrokeShader/{CalligraphicShader.cpp => BPy_CalligraphicShader.cpp} (100%)
 rename source/blender/freestyle/intern/python/StrokeShader/{ColorNoiseShader.cpp => BPy_ColorNoiseShader.cpp} (100%)
 rename source/blender/freestyle/intern/python/StrokeShader/{ColorVariationPatternShader.cpp => BPy_ColorVariationPatternShader.cpp} (100%)
 rename source/blender/freestyle/intern/python/StrokeShader/{ConstantColorShader.cpp => BPy_ConstantColorShader.cpp} (100%)
 rename source/blender/freestyle/intern/python/StrokeShader/{ConstantThicknessShader.cpp => BPy_ConstantThicknessShader.cpp} (100%)
 rename source/blender/freestyle/intern/python/StrokeShader/{ConstrainedIncreasingThicknessShader.cpp => BPy_ConstrainedIncreasingThicknessShader.cpp} (100%)
 rename source/blender/freestyle/intern/python/StrokeShader/{GuidingLinesShader.cpp => BPy_GuidingLinesShader.cpp} (100%)
 rename source/blender/freestyle/intern/python/StrokeShader/{IncreasingColorShader.cpp => BPy_IncreasingColorShader.cpp} (100%)
 rename source/blender/freestyle/intern/python/StrokeShader/{IncreasingThicknessShader.cpp => BPy_IncreasingThicknessShader.cpp} (100%)
 rename source/blender/freestyle/intern/python/StrokeShader/{PolygonalizationShader.cpp => BPy_PolygonalizationShader.cpp} (100%)
 rename source/blender/freestyle/intern/python/StrokeShader/{SamplingShader.cpp => BPy_SamplingShader.cpp} (100%)
 rename source/blender/freestyle/intern/python/StrokeShader/{SpatialNoiseShader.cpp => BPy_SpatialNoiseShader.cpp} (100%)
 rename source/blender/freestyle/intern/python/StrokeShader/{StrokeTextureShader.cpp => BPy_StrokeTextureShader.cpp} (100%)
 rename source/blender/freestyle/intern/python/StrokeShader/{TextureAssignerShader.cpp => BPy_TextureAssignerShader.cpp} (100%)
 rename source/blender/freestyle/intern/python/StrokeShader/{ThicknessNoiseShader.cpp => BPy_ThicknessNoiseShader.cpp} (100%)
 rename source/blender/freestyle/intern/python/StrokeShader/{ThicknessVariationPatternShader.cpp => BPy_ThicknessVariationPatternShader.cpp} (100%)
 rename source/blender/freestyle/intern/python/StrokeShader/{TipRemoverShader.cpp => BPy_TipRemoverShader.cpp} (100%)
 rename source/blender/freestyle/intern/python/StrokeShader/{fstreamShader.cpp => BPy_fstreamShader.cpp} (100%)
 rename source/blender/freestyle/intern/python/StrokeShader/{streamShader.cpp => BPy_streamShader.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction0D/{UnaryFunction0DDouble.cpp => BPy_UnaryFunction0DDouble.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction0D/{UnaryFunction0DFloat.cpp => BPy_UnaryFunction0DFloat.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction0D/{UnaryFunction0DId.cpp => BPy_UnaryFunction0DId.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction0D/{UnaryFunction0DUnsigned.cpp => BPy_UnaryFunction0DUnsigned.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction0D/{UnaryFunction0DVec2f.cpp => BPy_UnaryFunction0DVec2f.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction0D/{UnaryFunction0DVec3f.cpp => BPy_UnaryFunction0DVec3f.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction0D/{UnaryFunction0DVectorViewShape.cpp => BPy_UnaryFunction0DVectorViewShape.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction0D/{UnaryFunction0DViewShape.cpp => BPy_UnaryFunction0DViewShape.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/{ShapeIdF0D.cpp => BPy_ShapeIdF0D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/{MaterialF0D.cpp => BPy_MaterialF0D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/{CurveNatureF0D.cpp => BPy_CurveNatureF0D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/{Normal2DF0D.cpp => BPy_Normal2DF0D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/{VertexOrientation2DF0D.cpp => BPy_VertexOrientation2DF0D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/{VertexOrientation3DF0D.cpp => BPy_VertexOrientation3DF0D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/{GetOccludeeF0D.cpp => BPy_GetOccludeeF0D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/{GetShapeF0D.cpp => BPy_GetShapeF0D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/{DensityF0D.cpp => BPy_DensityF0D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/{LocalAverageDepthF0D.cpp => BPy_LocalAverageDepthF0D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/{GetCurvilinearAbscissaF0D.cpp => BPy_GetCurvilinearAbscissaF0D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/{GetParameterF0D.cpp => BPy_GetParameterF0D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/{GetViewMapGradientNormF0D.cpp => BPy_GetViewMapGradientNormF0D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/{ReadCompleteViewMapPixelF0D.cpp => BPy_ReadCompleteViewMapPixelF0D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/{ReadMapPixelF0D.cpp => BPy_ReadMapPixelF0D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/{ReadSteerableViewMapPixelF0D.cpp => BPy_ReadSteerableViewMapPixelF0D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/{Curvature2DAngleF0D.cpp => BPy_Curvature2DAngleF0D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/{GetProjectedXF0D.cpp => BPy_GetProjectedXF0D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/{GetProjectedYF0D.cpp => BPy_GetProjectedYF0D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/{GetProjectedZF0D.cpp => BPy_GetProjectedZF0D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/{GetXF0D.cpp => BPy_GetXF0D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/{GetYF0D.cpp => BPy_GetYF0D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/{GetZF0D.cpp => BPy_GetZF0D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/{ZDiscontinuityF0D.cpp => BPy_ZDiscontinuityF0D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/{QuantitativeInvisibilityF0D.cpp => BPy_QuantitativeInvisibilityF0D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/{GetOccludersF0D.cpp => BPy_GetOccludersF0D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction1D/{UnaryFunction1DDouble.cpp => BPy_UnaryFunction1DDouble.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction1D/{UnaryFunction1DFloat.cpp => BPy_UnaryFunction1DFloat.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction1D/{UnaryFunction1DUnsigned.cpp => BPy_UnaryFunction1DUnsigned.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction1D/{UnaryFunction1DVec2f.cpp => BPy_UnaryFunction1DVec2f.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction1D/{UnaryFunction1DVec3f.cpp => BPy_UnaryFunction1DVec3f.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction1D/{UnaryFunction1DVectorViewShape.cpp => BPy_UnaryFunction1DVectorViewShape.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/{CurveNatureF1D.cpp => BPy_CurveNatureF1D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/{Normal2DF1D.cpp => BPy_Normal2DF1D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/{Orientation2DF1D.cpp => BPy_Orientation2DF1D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/{Orientation3DF1D.cpp => BPy_Orientation3DF1D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/{DensityF1D.cpp => BPy_DensityF1D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/{GetCompleteViewMapDensityF1D.cpp => BPy_GetCompleteViewMapDensityF1D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/{GetDirectionalViewMapDensityF1D.cpp => BPy_GetDirectionalViewMapDensityF1D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/{LocalAverageDepthF1D.cpp => BPy_LocalAverageDepthF1D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/{Curvature2DAngleF1D.cpp => BPy_Curvature2DAngleF1D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/{GetProjectedXF1D.cpp => BPy_GetProjectedXF1D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/{GetProjectedYF1D.cpp => BPy_GetProjectedYF1D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/{GetProjectedZF1D.cpp => BPy_GetProjectedZF1D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/{GetSteerableViewMapDensityF1D.cpp => BPy_GetSteerableViewMapDensityF1D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/{GetViewMapGradientNormF1D.cpp => BPy_GetViewMapGradientNormF1D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/{GetXF1D.cpp => BPy_GetXF1D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/{GetYF1D.cpp => BPy_GetYF1D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/{GetZF1D.cpp => BPy_GetZF1D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/{ZDiscontinuityF1D.cpp => BPy_ZDiscontinuityF1D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned/{QuantitativeInvisibilityF1D.cpp => BPy_QuantitativeInvisibilityF1D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/{GetOccludeeF1D.cpp => BPy_GetOccludeeF1D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/{GetOccludersF1D.cpp => BPy_GetOccludersF1D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/{GetShapeF1D.cpp => BPy_GetShapeF1D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/{ChainingTimeStampF1D.cpp => BPy_ChainingTimeStampF1D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/{IncrementChainingTimeStampF1D.cpp => BPy_IncrementChainingTimeStampF1D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/{TimeStampF1D.cpp => BPy_TimeStampF1D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryPredicate0D/{FalseUP0D.cpp => BPy_FalseUP0D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryPredicate0D/{TrueUP0D.cpp => BPy_TrueUP0D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryPredicate1D/{ContourUP1D.cpp => BPy_ContourUP1D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryPredicate1D/{DensityLowerThanUP1D.cpp => BPy_DensityLowerThanUP1D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryPredicate1D/{EqualToChainingTimeStampUP1D.cpp => BPy_EqualToChainingTimeStampUP1D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryPredicate1D/{EqualToTimeStampUP1D.cpp => BPy_EqualToTimeStampUP1D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryPredicate1D/{ExternalContourUP1D.cpp => BPy_ExternalContourUP1D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryPredicate1D/{FalseUP1D.cpp => BPy_FalseUP1D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryPredicate1D/{QuantitativeInvisibilityUP1D.cpp => BPy_QuantitativeInvisibilityUP1D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryPredicate1D/{ShapeUP1D.cpp => BPy_ShapeUP1D.cpp} (100%)
 rename source/blender/freestyle/intern/python/UnaryPredicate1D/{TrueUP1D.cpp => BPy_TrueUP1D.cpp} (100%)
 rename source/blender/freestyle/intern/python/ViewEdgeIterator/{ChainingIterator.cpp => BPy_ChainingIterator.cpp} (100%)
 rename source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/{ChainPredicateIterator.cpp => BPy_ChainPredicateIterator.cpp} (100%)
 rename source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/{ChainSilhouetteIterator.cpp => BPy_ChainSilhouetteIterator.cpp} (100%)

diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript
index 12b649c362d..94e8b7163fb 100644
--- a/source/blender/freestyle/SConscript
+++ b/source/blender/freestyle/SConscript
@@ -60,28 +60,28 @@ app_sources = env.Glob(prefix + '/*.cpp')
 prefix = 'intern/python'
 # python_sources = env.Glob(prefix + '/*.cpp')
 python_sources = [
-					prefix + '/Freestyle.cpp',
-					prefix + '/Convert.cpp',
-					prefix + '/BinaryPredicate0D.cpp',
-					prefix + '/BinaryPredicate1D.cpp',
-					prefix + '/Id.cpp',
-					prefix + '/IntegrationType.cpp',
-					prefix + '/Interface0D.cpp',
-					prefix + '/Interface0D/CurvePoint.cpp',
-					prefix + '/Interface0D/CurvePoint/StrokeVertex.cpp',
-					prefix + '/Interface0D/SVertex.cpp',
-					prefix + '/Interface0D/ViewVertex.cpp',
-					prefix + '/Interface1D.cpp',
-					prefix + '/Interface1D/FEdge.cpp',
-					prefix + '/Interface1D/Stroke.cpp',
-					prefix + '/Nature.cpp',
-					prefix + '/MediumType.cpp',
-					prefix + '/StrokeAttribute.cpp',
-					prefix + '/StrokeShader.cpp',
-					prefix + '/UnaryFunction0D.cpp',
-					prefix + '/UnaryFunction1D.cpp',
-					prefix + '/UnaryPredicate0D.cpp',
-					prefix + '/UnaryPredicate1D.cpp',
+					prefix + '/BPy_Freestyle.cpp',
+					prefix + '/BPy_Convert.cpp',
+					prefix + '/BPy_BinaryPredicate0D.cpp',
+					prefix + '/BPy_BinaryPredicate1D.cpp',
+					prefix + '/BPy_Id.cpp',
+					prefix + '/BPy_IntegrationType.cpp',
+					prefix + '/BPy_Interface0D.cpp',
+					prefix + '/Interface0D/BPy_CurvePoint.cpp',
+					prefix + '/Interface0D/CurvePoint/BPy_StrokeVertex.cpp',
+					prefix + '/Interface0D/BPy_SVertex.cpp',
+					prefix + '/Interface0D/BPy_ViewVertex.cpp',
+					prefix + '/BPy_Interface1D.cpp',
+					prefix + '/Interface1D/BPy_FEdge.cpp',
+					prefix + '/Interface1D/BPy_Stroke.cpp',
+					prefix + '/BPy_MediumType.cpp',
+					prefix + '/BPy_Nature.cpp',
+					prefix + '/BPy_StrokeAttribute.cpp',
+					prefix + '/BPy_StrokeShader.cpp',
+					prefix + '/BPy_UnaryFunction0D.cpp',
+					prefix + '/BPy_UnaryFunction1D.cpp',
+					prefix + '/BPy_UnaryPredicate0D.cpp',
+					prefix + '/BPy_UnaryPredicate1D.cpp',
 				]
 
 sources = 	system_sources + image_sources + geometry_sources + scene_graph_sources \
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate0D.cpp b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp
similarity index 98%
rename from source/blender/freestyle/intern/python/BinaryPredicate0D.cpp
rename to source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp
index 67358c65bbf..9c3247b30b8 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate0D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp
@@ -1,7 +1,7 @@
-#include "BinaryPredicate0D.h"
+#include "BPy_BinaryPredicate0D.h"
 
-#include "Convert.h"
-#include "Interface0D.h"
+#include "BPy_Convert.h"
+#include "BPy_Interface0D.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate0D.h b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h
similarity index 100%
rename from source/blender/freestyle/intern/python/BinaryPredicate0D.h
rename to source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D.cpp b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp
similarity index 98%
rename from source/blender/freestyle/intern/python/BinaryPredicate1D.cpp
rename to source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp
index bf2772ecdcc..9dd2bd19204 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp
@@ -1,7 +1,7 @@
-#include "BinaryPredicate1D.h"
+#include "BPy_BinaryPredicate1D.h"
 
-#include "Convert.h"
-#include "Interface1D.h"
+#include "BPy_Convert.h"
+#include "BPy_Interface1D.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D.h b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h
similarity index 100%
rename from source/blender/freestyle/intern/python/BinaryPredicate1D.h
rename to source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h
diff --git a/source/blender/freestyle/intern/python/Convert.cpp b/source/blender/freestyle/intern/python/BPy_Convert.cpp
similarity index 97%
rename from source/blender/freestyle/intern/python/Convert.cpp
rename to source/blender/freestyle/intern/python/BPy_Convert.cpp
index 410afe99d63..843bdc7c7d1 100644
--- a/source/blender/freestyle/intern/python/Convert.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Convert.cpp
@@ -1,4 +1,4 @@
-#include "Convert.h"
+#include "BPy_Convert.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -82,7 +82,7 @@ PyObject * BPy_StrokeAttribute_from_StrokeAttribute( StrokeAttribute& sa ) {
 	return py_sa;	
 }
 
-PyObject * BPy_MediumType_from_MediumType( unsigned short n ) {
+PyObject * BPy_MediumType_from_MediumType( int n ) {
 	PyObject *py_mt =  MediumType_Type.tp_new( &MediumType_Type, 0, 0 );
 
 	PyObject *args = PyTuple_New(1);
diff --git a/source/blender/freestyle/intern/python/Convert.h b/source/blender/freestyle/intern/python/BPy_Convert.h
similarity index 75%
rename from source/blender/freestyle/intern/python/Convert.h
rename to source/blender/freestyle/intern/python/BPy_Convert.h
index 3caf8bf67f9..8e935f6e229 100644
--- a/source/blender/freestyle/intern/python/Convert.h
+++ b/source/blender/freestyle/intern/python/BPy_Convert.h
@@ -4,15 +4,15 @@
 #include "../geometry/Geom.h"
 using namespace Geometry;
 
-#include "Id.h"
-#include "IntegrationType.h"
-#include "Interface0D.h"
-#include "Interface0D/CurvePoint/StrokeVertex.h"
-#include "Interface0D/SVertex.h"
-#include "Interface1D/FEdge.h"
-#include "Nature.h"
-#include "MediumType.h"
-#include "StrokeAttribute.h"
+#include "BPy_Id.h"
+#include "BPy_IntegrationType.h"
+#include "BPy_Interface0D.h"
+#include "Interface0D/CurvePoint/BPy_StrokeVertex.h"
+#include "Interface0D/BPy_SVertex.h"
+#include "Interface1D/BPy_FEdge.h"
+#include "BPy_Nature.h"
+#include "BPy_MediumType.h"
+#include "BPy_StrokeAttribute.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -34,7 +34,7 @@ PyObject * BPy_FEdge_from_FEdge( FEdge& fe );
 PyObject * BPy_Id_from_Id( Id& id );
 PyObject * BPy_Interface0D_from_Interface0D( Interface0D& if0D );
 PyObject * BPy_Nature_from_Nature( unsigned short n );
-PyObject * BPy_MediumType_from_MediumType( unsigned short n );
+PyObject * BPy_MediumType_from_MediumType( int n );
 PyObject * BPy_StrokeAttribute_from_StrokeAttribute( StrokeAttribute& sa );
 PyObject * BPy_StrokeVertex_from_StrokeVertex( StrokeVertex& sv );
 PyObject * BPy_SVertex_from_SVertex( SVertex& sv );
diff --git a/source/blender/freestyle/intern/python/CurvePointIterator.cpp b/source/blender/freestyle/intern/python/BPy_CurvePointIterator.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/CurvePointIterator.cpp
rename to source/blender/freestyle/intern/python/BPy_CurvePointIterator.cpp
diff --git a/source/blender/freestyle/intern/python/EdgeModifier.cpp b/source/blender/freestyle/intern/python/BPy_EdgeModifier.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/EdgeModifier.cpp
rename to source/blender/freestyle/intern/python/BPy_EdgeModifier.cpp
diff --git a/source/blender/freestyle/intern/python/Freestyle.cpp b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
similarity index 89%
rename from source/blender/freestyle/intern/python/Freestyle.cpp
rename to source/blender/freestyle/intern/python/BPy_Freestyle.cpp
index 2f93f1f8a74..bbb4acf4f85 100644
--- a/source/blender/freestyle/intern/python/Freestyle.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
@@ -1,19 +1,20 @@
-#include "Freestyle.h"
+#include "BPy_Freestyle.h"
 
-#include "BinaryPredicate0D.h"
-#include "BinaryPredicate1D.h"
-#include "Id.h"
-#include "IntegrationType.h"
-#include "Interface0D.h"
-#include "Interface0D/CurvePoint.h"
-#include "Interface1D.h"
-#include "Nature.h"
-#include "StrokeAttribute.h"
-#include "StrokeShader.h"
-#include "UnaryFunction0D.h"
-#include "UnaryFunction1D.h"
-#include "UnaryPredicate0D.h"
-#include "UnaryPredicate1D.h"
+#include "BPy_BinaryPredicate0D.h"
+#include "BPy_BinaryPredicate1D.h"
+#include "BPy_Id.h"
+#include "BPy_IntegrationType.h"
+#include "BPy_Interface0D.h"
+#include "Interface0D/BPy_CurvePoint.h"
+#include "BPy_Interface1D.h"
+#include "BPy_MediumType.h"
+#include "BPy_Nature.h"
+#include "BPy_StrokeAttribute.h"
+#include "BPy_StrokeShader.h"
+#include "BPy_UnaryFunction0D.h"
+#include "BPy_UnaryFunction1D.h"
+#include "BPy_UnaryPredicate0D.h"
+#include "BPy_UnaryPredicate1D.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -128,14 +129,19 @@ PyObject *Freestyle_Init( void )
 	// initialize modules
 	module = Py_InitModule3( "Blender.Freestyle", M_Freestyle_methods, M_Freestyle_doc );
 	
+	
 	// attach its classes (adding the object types to the module)
+	
+	// those classes have to be initialized before the others
+	MediumType_Init( module );
+	Nature_Init( module );
+	
 	BinaryPredicate0D_Init( module );
 	BinaryPredicate1D_Init( module );
 	Id_Init( module );
 	IntegrationType_Init( module );
 	Interface0D_Init( module );
 	Interface1D_Init( module );
-	Nature_Init( module );
 	StrokeAttribute_Init( module );
 	StrokeShader_Init( module );
 	UnaryFunction0D_Init( module );
diff --git a/source/blender/freestyle/intern/python/Freestyle.h b/source/blender/freestyle/intern/python/BPy_Freestyle.h
similarity index 100%
rename from source/blender/freestyle/intern/python/Freestyle.h
rename to source/blender/freestyle/intern/python/BPy_Freestyle.h
diff --git a/source/blender/freestyle/intern/python/Id.cpp b/source/blender/freestyle/intern/python/BPy_Id.cpp
similarity index 99%
rename from source/blender/freestyle/intern/python/Id.cpp
rename to source/blender/freestyle/intern/python/BPy_Id.cpp
index 4f2964d8060..7d8ea07d563 100644
--- a/source/blender/freestyle/intern/python/Id.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Id.cpp
@@ -1,6 +1,6 @@
-#include "Id.h"
+#include "BPy_Id.h"
 
-#include "Convert.h"
+#include "BPy_Convert.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/Id.h b/source/blender/freestyle/intern/python/BPy_Id.h
similarity index 100%
rename from source/blender/freestyle/intern/python/Id.h
rename to source/blender/freestyle/intern/python/BPy_Id.h
diff --git a/source/blender/freestyle/intern/python/IntegrationType.cpp b/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp
similarity index 98%
rename from source/blender/freestyle/intern/python/IntegrationType.cpp
rename to source/blender/freestyle/intern/python/BPy_IntegrationType.cpp
index ff6bd3d4794..9c21557da3d 100644
--- a/source/blender/freestyle/intern/python/IntegrationType.cpp
+++ b/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp
@@ -1,6 +1,6 @@
-#include "IntegrationType.h"
+#include "BPy_IntegrationType.h"
 
-#include "Convert.h"
+#include "BPy_Convert.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/IntegrationType.h b/source/blender/freestyle/intern/python/BPy_IntegrationType.h
similarity index 100%
rename from source/blender/freestyle/intern/python/IntegrationType.h
rename to source/blender/freestyle/intern/python/BPy_IntegrationType.h
diff --git a/source/blender/freestyle/intern/python/Interface0D.cpp b/source/blender/freestyle/intern/python/BPy_Interface0D.cpp
similarity index 97%
rename from source/blender/freestyle/intern/python/Interface0D.cpp
rename to source/blender/freestyle/intern/python/BPy_Interface0D.cpp
index 4c3e0af0edb..defe76464eb 100644
--- a/source/blender/freestyle/intern/python/Interface0D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Interface0D.cpp
@@ -1,12 +1,12 @@
-#include "Interface0D.h"
+#include "BPy_Interface0D.h"
 
-#include "Convert.h"
-#include "Interface0D/CurvePoint.h"
-#include "Interface0D/CurvePoint/StrokeVertex.h"
-#include "Interface0D/SVertex.h"
-#include "Interface0D/ViewVertex.h"
-#include "Interface1D/FEdge.h"
-#include "Nature.h"
+#include "BPy_Convert.h"
+#include "Interface0D/BPy_CurvePoint.h"
+#include "Interface0D/CurvePoint/BPy_StrokeVertex.h"
+#include "Interface0D/BPy_SVertex.h"
+#include "Interface0D/BPy_ViewVertex.h"
+#include "Interface1D/BPy_FEdge.h"
+#include "BPy_Nature.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/Interface0D.h b/source/blender/freestyle/intern/python/BPy_Interface0D.h
similarity index 100%
rename from source/blender/freestyle/intern/python/Interface0D.h
rename to source/blender/freestyle/intern/python/BPy_Interface0D.h
diff --git a/source/blender/freestyle/intern/python/Interface0DIterator.cpp b/source/blender/freestyle/intern/python/BPy_Interface0DIterator.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/Interface0DIterator.cpp
rename to source/blender/freestyle/intern/python/BPy_Interface0DIterator.cpp
diff --git a/source/blender/freestyle/intern/python/Interface1D.cpp b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
similarity index 98%
rename from source/blender/freestyle/intern/python/Interface1D.cpp
rename to source/blender/freestyle/intern/python/BPy_Interface1D.cpp
index f1a14b5d62f..113fc3f1cf7 100644
--- a/source/blender/freestyle/intern/python/Interface1D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
@@ -1,9 +1,9 @@
-#include "Interface1D.h"
+#include "BPy_Interface1D.h"
 
-#include "Convert.h"
-#include "Interface1D/FEdge.h"
-#include "Interface1D/Stroke.h"
-#include "MediumType.h"
+#include "BPy_Convert.h"
+#include "Interface1D/BPy_FEdge.h"
+#include "Interface1D/BPy_Stroke.h"
+#include "BPy_MediumType.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/Interface1D.h b/source/blender/freestyle/intern/python/BPy_Interface1D.h
similarity index 100%
rename from source/blender/freestyle/intern/python/Interface1D.h
rename to source/blender/freestyle/intern/python/BPy_Interface1D.h
diff --git a/source/blender/freestyle/intern/python/Material.cpp b/source/blender/freestyle/intern/python/BPy_Material.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/Material.cpp
rename to source/blender/freestyle/intern/python/BPy_Material.cpp
diff --git a/source/blender/freestyle/intern/python/MediumType.cpp b/source/blender/freestyle/intern/python/BPy_MediumType.cpp
similarity index 93%
rename from source/blender/freestyle/intern/python/MediumType.cpp
rename to source/blender/freestyle/intern/python/BPy_MediumType.cpp
index f0c5fcc58a4..b889d2b5c2f 100644
--- a/source/blender/freestyle/intern/python/MediumType.cpp
+++ b/source/blender/freestyle/intern/python/BPy_MediumType.cpp
@@ -1,6 +1,6 @@
-#include "MediumType.h"
+#include "BPy_MediumType.h"
 
-#include "Convert.h"
+#include "BPy_Convert.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -103,6 +103,18 @@ PyTypeObject MediumType_Type = {
 
 //-------------------MODULE INITIALIZATION--------------------------------
 
+PyMODINIT_FUNC MediumType_Init( PyObject *module )
+{	
+	if( module == NULL )
+		return;
+
+	if( PyType_Ready( &MediumType_Type ) < 0 )
+		return;
+	Py_INCREF( &MediumType_Type );
+	PyModule_AddObject(module, "MediumType", (PyObject *)&MediumType_Type);
+
+}
+
 int MediumType___init__(BPy_MediumType *self, PyObject *args, PyObject *kwds)
 {
     if (PyInt_Type.tp_init((PyObject *)self, args, kwds) < 0)
diff --git a/source/blender/freestyle/intern/python/MediumType.h b/source/blender/freestyle/intern/python/BPy_MediumType.h
similarity index 100%
rename from source/blender/freestyle/intern/python/MediumType.h
rename to source/blender/freestyle/intern/python/BPy_MediumType.h
diff --git a/source/blender/freestyle/intern/python/Nature.cpp b/source/blender/freestyle/intern/python/BPy_Nature.cpp
similarity index 99%
rename from source/blender/freestyle/intern/python/Nature.cpp
rename to source/blender/freestyle/intern/python/BPy_Nature.cpp
index 14357949022..8a29bdb5bdf 100644
--- a/source/blender/freestyle/intern/python/Nature.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Nature.cpp
@@ -1,6 +1,6 @@
-#include "Nature.h"
+#include "BPy_Nature.h"
 
-#include "Convert.h"
+#include "BPy_Convert.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/Nature.h b/source/blender/freestyle/intern/python/BPy_Nature.h
similarity index 100%
rename from source/blender/freestyle/intern/python/Nature.h
rename to source/blender/freestyle/intern/python/BPy_Nature.h
diff --git a/source/blender/freestyle/intern/python/Noise.cpp b/source/blender/freestyle/intern/python/BPy_Noise.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/Noise.cpp
rename to source/blender/freestyle/intern/python/BPy_Noise.cpp
diff --git a/source/blender/freestyle/intern/python/Operators.cpp b/source/blender/freestyle/intern/python/BPy_Operators.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/Operators.cpp
rename to source/blender/freestyle/intern/python/BPy_Operators.cpp
diff --git a/source/blender/freestyle/intern/python/SShape.cpp b/source/blender/freestyle/intern/python/BPy_SShape.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/SShape.cpp
rename to source/blender/freestyle/intern/python/BPy_SShape.cpp
diff --git a/source/blender/freestyle/intern/python/StrokeAttribute.cpp b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp
similarity index 99%
rename from source/blender/freestyle/intern/python/StrokeAttribute.cpp
rename to source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp
index b9f37dfa165..24c0263bc5f 100644
--- a/source/blender/freestyle/intern/python/StrokeAttribute.cpp
+++ b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp
@@ -1,6 +1,6 @@
-#include "StrokeAttribute.h"
+#include "BPy_StrokeAttribute.h"
 
-#include "Convert.h"
+#include "BPy_Convert.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/StrokeAttribute.h b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.h
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeAttribute.h
rename to source/blender/freestyle/intern/python/BPy_StrokeAttribute.h
diff --git a/source/blender/freestyle/intern/python/StrokeShader.cpp b/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp
similarity index 98%
rename from source/blender/freestyle/intern/python/StrokeShader.cpp
rename to source/blender/freestyle/intern/python/BPy_StrokeShader.cpp
index 029f8776c73..cdca779dafb 100644
--- a/source/blender/freestyle/intern/python/StrokeShader.cpp
+++ b/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp
@@ -1,7 +1,7 @@
-#include "StrokeShader.h"
+#include "BPy_StrokeShader.h"
 
-#include "Convert.h"
-#include "Interface1D/Stroke.h"
+#include "BPy_Convert.h"
+#include "Interface1D/BPy_Stroke.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/StrokeShader.h b/source/blender/freestyle/intern/python/BPy_StrokeShader.h
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeShader.h
rename to source/blender/freestyle/intern/python/BPy_StrokeShader.h
diff --git a/source/blender/freestyle/intern/python/StrokeVertexIterator.cpp b/source/blender/freestyle/intern/python/BPy_StrokeVertexIterator.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeVertexIterator.cpp
rename to source/blender/freestyle/intern/python/BPy_StrokeVertexIterator.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp
similarity index 99%
rename from source/blender/freestyle/intern/python/UnaryFunction0D.cpp
rename to source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp
index b9da3dfc20d..dda236a0989 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp
@@ -1,6 +1,6 @@
-#include "UnaryFunction0D.h"
+#include "BPy_UnaryFunction0D.h"
 
-#include "Convert.h"
+#include "BPy_Convert.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D.h b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D.h
rename to source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp
similarity index 99%
rename from source/blender/freestyle/intern/python/UnaryFunction1D.cpp
rename to source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp
index db026ced338..70f6feb02d3 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp
@@ -1,6 +1,6 @@
-#include "UnaryFunction1D.h"
+#include "BPy_UnaryFunction1D.h"
 
-#include "Convert.h"
+#include "BPy_Convert.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D.h b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D.h
rename to source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate0D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp
similarity index 98%
rename from source/blender/freestyle/intern/python/UnaryPredicate0D.cpp
rename to source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp
index 1d2fd6b284f..29ea68c01ca 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate0D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp
@@ -1,6 +1,6 @@
-#include "UnaryPredicate0D.h"
+#include "BPy_UnaryPredicate0D.h"
 
-#include "Convert.h"
+#include "BPy_Convert.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate0D.h b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryPredicate0D.h
rename to source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp
similarity index 98%
rename from source/blender/freestyle/intern/python/UnaryPredicate1D.cpp
rename to source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp
index bbbc9bfcc43..b00422a0aab 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp
@@ -1,6 +1,6 @@
-#include "UnaryPredicate1D.h"
+#include "BPy_UnaryPredicate1D.h"
 
-#include "Convert.h"
+#include "BPy_Convert.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D.h b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryPredicate1D.h
rename to source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h
diff --git a/source/blender/freestyle/intern/python/EdgeModifier/TimestampModifier.cpp b/source/blender/freestyle/intern/python/BPy_ViewEdgeIterator.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/EdgeModifier/TimestampModifier.cpp
rename to source/blender/freestyle/intern/python/BPy_ViewEdgeIterator.cpp
diff --git a/source/blender/freestyle/intern/python/ViewMap.cpp b/source/blender/freestyle/intern/python/BPy_ViewMap.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/ViewMap.cpp
rename to source/blender/freestyle/intern/python/BPy_ViewMap.cpp
diff --git a/source/blender/freestyle/intern/python/ViewShape.cpp b/source/blender/freestyle/intern/python/BPy_ViewShape.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/ViewShape.cpp
rename to source/blender/freestyle/intern/python/BPy_ViewShape.cpp
diff --git a/source/blender/freestyle/intern/python/Interface1D/Curve/Chain.cpp b/source/blender/freestyle/intern/python/BPy_orientedViewEdgeIterator.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/Interface1D/Curve/Chain.cpp
rename to source/blender/freestyle/intern/python/BPy_orientedViewEdgeIterator.cpp
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/FalseBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/BinaryPredicate1D/FalseBP1D.cpp
rename to source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.cpp
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/Length2DBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/BinaryPredicate1D/Length2DBP1D.cpp
rename to source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.cpp
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/SameShapeIdBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/BinaryPredicate1D/SameShapeIdBP1D.cpp
rename to source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.cpp
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/TrueBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/BinaryPredicate1D/TrueBP1D.cpp
rename to source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.cpp
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/ViewMapGradientNormBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/BinaryPredicate1D/ViewMapGradientNormBP1D.cpp
rename to source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.cpp
diff --git a/source/blender/freestyle/intern/python/ViewEdgeIterator.cpp b/source/blender/freestyle/intern/python/EdgeModifier/BPy_TimestampModifier.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/ViewEdgeIterator.cpp
rename to source/blender/freestyle/intern/python/EdgeModifier/BPy_TimestampModifier.cpp
diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp
similarity index 99%
rename from source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp
rename to source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp
index e1cf63727e5..6765bc84baa 100644
--- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp
@@ -1,6 +1,6 @@
-#include "CurvePoint.h"
+#include "BPy_CurvePoint.h"
 
-#include "../Convert.h"
+#include "../BPy_Convert.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint.h b/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.h
similarity index 95%
rename from source/blender/freestyle/intern/python/Interface0D/CurvePoint.h
rename to source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.h
index e40f261504f..c2a8023b745 100644
--- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint.h
+++ b/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.h
@@ -1,7 +1,7 @@
 #ifndef FREESTYLE_PYTHON_CURVEPOINT_H
 #define FREESTYLE_PYTHON_CURVEPOINT_H
 
-#include "../Interface0D.h"
+#include "../BPy_Interface0D.h"
 #include "../../stroke/Curve.h"
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/Interface0D/SVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
similarity index 99%
rename from source/blender/freestyle/intern/python/Interface0D/SVertex.cpp
rename to source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
index d0c622d1df2..bbfff34cb20 100644
--- a/source/blender/freestyle/intern/python/Interface0D/SVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
@@ -1,7 +1,7 @@
-#include "SVertex.h"
+#include "BPy_SVertex.h"
 
-#include "../Convert.h"
-#include "../Id.h"
+#include "../BPy_Convert.h"
+#include "../BPy_Id.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/Interface0D/SVertex.h b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.h
similarity index 95%
rename from source/blender/freestyle/intern/python/Interface0D/SVertex.h
rename to source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.h
index 099417b5139..95b7d833d65 100644
--- a/source/blender/freestyle/intern/python/Interface0D/SVertex.h
+++ b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.h
@@ -2,7 +2,7 @@
 #define FREESTYLE_PYTHON_SVERTEX_H
 
 #include "../../view_map/Silhouette.h"
-#include "../Interface0D.h"
+#include "../BPy_Interface0D.h"
 
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp
similarity index 98%
rename from source/blender/freestyle/intern/python/Interface0D/ViewVertex.cpp
rename to source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp
index 6168d1fb711..7e6ef8590fd 100644
--- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp
@@ -1,6 +1,6 @@
-#include "ViewVertex.h"
+#include "BPy_ViewVertex.h"
 
-#include "../Convert.h"
+#include "../BPy_Convert.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex.h b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.h
similarity index 95%
rename from source/blender/freestyle/intern/python/Interface0D/ViewVertex.h
rename to source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.h
index 98bcb9bac90..b70a69c95e7 100644
--- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex.h
+++ b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.h
@@ -2,7 +2,7 @@
 #define FREESTYLE_PYTHON_VIEWVERTEX_H
 
 #include "../../view_map/ViewMap.h"
-#include "../Interface0D.h"
+#include "../BPy_Interface0D.h"
 
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp
similarity index 99%
rename from source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.cpp
rename to source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp
index 9d07125476e..2039b165457 100644
--- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp
@@ -1,7 +1,7 @@
-#include "StrokeVertex.h"
+#include "BPy_StrokeVertex.h"
 
-#include "../../Convert.h"
-#include "../../StrokeAttribute.h"
+#include "../../BPy_Convert.h"
+#include "../../BPy_StrokeAttribute.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.h b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.h
similarity index 95%
rename from source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.h
rename to source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.h
index 4bc33ea4058..f1c54ed0041 100644
--- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.h
+++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.h
@@ -1,7 +1,7 @@
 #ifndef FREESTYLE_PYTHON_STROKEVERTEX_H
 #define FREESTYLE_PYTHON_STROKEVERTEX_H
 
-#include "../CurvePoint.h"
+#include "../BPy_CurvePoint.h"
 #include "../../../stroke/Stroke.h"
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/NonTVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/Interface0D/ViewVertex/NonTVertex.cpp
rename to source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/TVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/Interface0D/ViewVertex/TVertex.cpp
rename to source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp
diff --git a/source/blender/freestyle/intern/python/Interface1D/Curve.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_Curve.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/Interface1D/Curve.cpp
rename to source/blender/freestyle/intern/python/Interface1D/BPy_Curve.cpp
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp
similarity index 99%
rename from source/blender/freestyle/intern/python/Interface1D/FEdge.cpp
rename to source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp
index 0cdfb9f1e0d..56dc76f0acd 100644
--- a/source/blender/freestyle/intern/python/Interface1D/FEdge.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp
@@ -1,7 +1,7 @@
-#include "FEdge.h"
+#include "BPy_FEdge.h"
 
-#include "../Convert.h"
-#include "../Interface0D/SVertex.h"
+#include "../BPy_Convert.h"
+#include "../Interface0D/BPy_SVertex.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge.h b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.h
similarity index 95%
rename from source/blender/freestyle/intern/python/Interface1D/FEdge.h
rename to source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.h
index 230a5f36954..c54dbee98b7 100644
--- a/source/blender/freestyle/intern/python/Interface1D/FEdge.h
+++ b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.h
@@ -1,7 +1,7 @@
 #ifndef FREESTYLE_PYTHON_FEDGE_H
 #define FREESTYLE_PYTHON_FEDGE_H
 
-#include "../Interface1D.h"
+#include "../BPy_Interface1D.h"
 #include "../../view_map/Silhouette.h"
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/Interface1D/Stroke.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
similarity index 99%
rename from source/blender/freestyle/intern/python/Interface1D/Stroke.cpp
rename to source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
index 9951f21a0e1..8027f625cc5 100644
--- a/source/blender/freestyle/intern/python/Interface1D/Stroke.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
@@ -1,7 +1,7 @@
-#include "Stroke.h"
+#include "BPy_Stroke.h"
 
-#include "../Convert.h"
-#include "../Interface0D/SVertex.h"
+#include "../BPy_Convert.h"
+#include "../Interface0D/BPy_SVertex.h"
 #include "../../stroke/StrokeIterators.h"
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/Interface1D/Stroke.h b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.h
similarity index 95%
rename from source/blender/freestyle/intern/python/Interface1D/Stroke.h
rename to source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.h
index fc4b426fd53..52c6d214b85 100644
--- a/source/blender/freestyle/intern/python/Interface1D/Stroke.h
+++ b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.h
@@ -1,7 +1,7 @@
 #ifndef FREESTYLE_PYTHON_STROKE_H
 #define FREESTYLE_PYTHON_STROKE_H
 
-#include "../Interface1D.h"
+#include "../BPy_Interface1D.h"
 #include "../../stroke/Stroke.h"
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/Interface1D/ViewEdge.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/Interface1D/ViewEdge.cpp
rename to source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp
diff --git a/source/blender/freestyle/intern/python/orientedViewEdgeIterator.cpp b/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/orientedViewEdgeIterator.cpp
rename to source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.cpp
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/FEdgeSharp.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/Interface1D/FEdge/FEdgeSharp.cpp
rename to source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/FEdgeSmooth.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/Interface1D/FEdge/FEdgeSmooth.cpp
rename to source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BackboneStretcherShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeShader/BackboneStretcherShader.cpp
rename to source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.cpp
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BezierCurveShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeShader/BezierCurveShader.cpp
rename to source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.cpp
diff --git a/source/blender/freestyle/intern/python/StrokeShader/CalligraphicShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeShader/CalligraphicShader.cpp
rename to source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.cpp
diff --git a/source/blender/freestyle/intern/python/StrokeShader/ColorNoiseShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeShader/ColorNoiseShader.cpp
rename to source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.cpp
diff --git a/source/blender/freestyle/intern/python/StrokeShader/ColorVariationPatternShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeShader/ColorVariationPatternShader.cpp
rename to source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.cpp
diff --git a/source/blender/freestyle/intern/python/StrokeShader/ConstantColorShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeShader/ConstantColorShader.cpp
rename to source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.cpp
diff --git a/source/blender/freestyle/intern/python/StrokeShader/ConstantThicknessShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeShader/ConstantThicknessShader.cpp
rename to source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.cpp
diff --git a/source/blender/freestyle/intern/python/StrokeShader/ConstrainedIncreasingThicknessShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeShader/ConstrainedIncreasingThicknessShader.cpp
rename to source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.cpp
diff --git a/source/blender/freestyle/intern/python/StrokeShader/GuidingLinesShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeShader/GuidingLinesShader.cpp
rename to source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.cpp
diff --git a/source/blender/freestyle/intern/python/StrokeShader/IncreasingColorShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeShader/IncreasingColorShader.cpp
rename to source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.cpp
diff --git a/source/blender/freestyle/intern/python/StrokeShader/IncreasingThicknessShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeShader/IncreasingThicknessShader.cpp
rename to source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.cpp
diff --git a/source/blender/freestyle/intern/python/StrokeShader/PolygonalizationShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeShader/PolygonalizationShader.cpp
rename to source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.cpp
diff --git a/source/blender/freestyle/intern/python/StrokeShader/SamplingShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeShader/SamplingShader.cpp
rename to source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.cpp
diff --git a/source/blender/freestyle/intern/python/StrokeShader/SpatialNoiseShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeShader/SpatialNoiseShader.cpp
rename to source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.cpp
diff --git a/source/blender/freestyle/intern/python/StrokeShader/StrokeTextureShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeShader/StrokeTextureShader.cpp
rename to source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.cpp
diff --git a/source/blender/freestyle/intern/python/StrokeShader/TextureAssignerShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_TextureAssignerShader.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeShader/TextureAssignerShader.cpp
rename to source/blender/freestyle/intern/python/StrokeShader/BPy_TextureAssignerShader.cpp
diff --git a/source/blender/freestyle/intern/python/StrokeShader/ThicknessNoiseShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeShader/ThicknessNoiseShader.cpp
rename to source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.cpp
diff --git a/source/blender/freestyle/intern/python/StrokeShader/ThicknessVariationPatternShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeShader/ThicknessVariationPatternShader.cpp
rename to source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.cpp
diff --git a/source/blender/freestyle/intern/python/StrokeShader/TipRemoverShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeShader/TipRemoverShader.cpp
rename to source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.cpp
diff --git a/source/blender/freestyle/intern/python/StrokeShader/fstreamShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeShader/fstreamShader.cpp
rename to source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.cpp
diff --git a/source/blender/freestyle/intern/python/StrokeShader/streamShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_streamShader.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/StrokeShader/streamShader.cpp
rename to source/blender/freestyle/intern/python/StrokeShader/BPy_streamShader.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DDouble.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DDouble.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DFloat.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DFloat.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DId.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DId.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DUnsigned.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DUnsigned.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVec2f.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVec2f.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVec3f.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVec3f.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVectorViewShape.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVectorViewShape.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DViewShape.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DViewShape.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/ShapeIdF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/BPy_ShapeIdF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/ShapeIdF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/BPy_ShapeIdF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/MaterialF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/MaterialF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/CurveNatureF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/CurveNatureF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/Normal2DF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/Normal2DF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/VertexOrientation2DF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/VertexOrientation2DF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/VertexOrientation3DF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/VertexOrientation3DF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/GetOccludeeF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/GetOccludeeF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/GetShapeF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/GetShapeF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/DensityF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/DensityF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/LocalAverageDepthF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_LocalAverageDepthF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/LocalAverageDepthF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_LocalAverageDepthF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetCurvilinearAbscissaF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetCurvilinearAbscissaF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetParameterF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetParameterF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetParameterF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetParameterF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetViewMapGradientNormF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetViewMapGradientNormF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadCompleteViewMapPixelF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadCompleteViewMapPixelF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadMapPixelF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadMapPixelF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadMapPixelF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadMapPixelF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadSteerableViewMapPixelF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadSteerableViewMapPixelF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/Curvature2DAngleF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_Curvature2DAngleF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/Curvature2DAngleF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_Curvature2DAngleF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedXF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetProjectedXF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedXF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetProjectedXF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedYF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetProjectedYF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedYF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetProjectedYF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedZF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetProjectedZF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedZF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetProjectedZF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetXF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetXF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetXF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetXF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetYF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetYF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetYF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetYF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetZF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetZF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetZF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetZF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/ZDiscontinuityF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_ZDiscontinuityF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/ZDiscontinuityF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_ZDiscontinuityF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/QuantitativeInvisibilityF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/QuantitativeInvisibilityF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/GetOccludersF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/GetOccludersF0D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DDouble.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DDouble.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DFloat.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DFloat.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DUnsigned.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DUnsigned.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVec2f.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVec2f.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVec3f.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVec3f.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVectorViewShape.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVectorViewShape.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/CurveNatureF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/CurveNatureF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/Normal2DF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Normal2DF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/Normal2DF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Normal2DF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/Orientation2DF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/Orientation2DF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/Orientation3DF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/Orientation3DF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/DensityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_DensityF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/DensityF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_DensityF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/GetCompleteViewMapDensityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/GetCompleteViewMapDensityF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/GetDirectionalViewMapDensityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/GetDirectionalViewMapDensityF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/LocalAverageDepthF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_LocalAverageDepthF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/LocalAverageDepthF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_LocalAverageDepthF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/Curvature2DAngleF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_Curvature2DAngleF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/Curvature2DAngleF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_Curvature2DAngleF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedXF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetProjectedXF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedXF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetProjectedXF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedYF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetProjectedYF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedYF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetProjectedYF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedZF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetProjectedZF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedZF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetProjectedZF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetSteerableViewMapDensityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetSteerableViewMapDensityF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetSteerableViewMapDensityF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetSteerableViewMapDensityF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetViewMapGradientNormF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetViewMapGradientNormF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetViewMapGradientNormF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetViewMapGradientNormF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetXF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetXF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetXF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetXF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetYF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetYF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetYF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetYF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetZF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetZF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetZF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetZF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/ZDiscontinuityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_ZDiscontinuityF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/ZDiscontinuityF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_ZDiscontinuityF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned/QuantitativeInvisibilityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned/BPy_QuantitativeInvisibilityF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned/QuantitativeInvisibilityF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned/BPy_QuantitativeInvisibilityF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetOccludeeF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetOccludeeF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetOccludersF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetOccludersF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetShapeF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetShapeF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/ChainingTimeStampF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/ChainingTimeStampF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/IncrementChainingTimeStampF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/IncrementChainingTimeStampF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/TimeStampF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/TimeStampF1D.cpp
rename to source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate0D/FalseUP0D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_FalseUP0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryPredicate0D/FalseUP0D.cpp
rename to source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_FalseUP0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate0D/TrueUP0D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_TrueUP0D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryPredicate0D/TrueUP0D.cpp
rename to source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_TrueUP0D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/ContourUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryPredicate1D/ContourUP1D.cpp
rename to source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/DensityLowerThanUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryPredicate1D/DensityLowerThanUP1D.cpp
rename to source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/EqualToChainingTimeStampUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryPredicate1D/EqualToChainingTimeStampUP1D.cpp
rename to source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/EqualToTimeStampUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryPredicate1D/EqualToTimeStampUP1D.cpp
rename to source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/ExternalContourUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryPredicate1D/ExternalContourUP1D.cpp
rename to source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/FalseUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryPredicate1D/FalseUP1D.cpp
rename to source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/QuantitativeInvisibilityUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryPredicate1D/QuantitativeInvisibilityUP1D.cpp
rename to source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/ShapeUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryPredicate1D/ShapeUP1D.cpp
rename to source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.cpp
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/TrueUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/UnaryPredicate1D/TrueUP1D.cpp
rename to source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.cpp
diff --git a/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator.cpp b/source/blender/freestyle/intern/python/ViewEdgeIterator/BPy_ChainingIterator.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator.cpp
rename to source/blender/freestyle/intern/python/ViewEdgeIterator/BPy_ChainingIterator.cpp
diff --git a/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/ChainPredicateIterator.cpp b/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/BPy_ChainPredicateIterator.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/ChainPredicateIterator.cpp
rename to source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/BPy_ChainPredicateIterator.cpp
diff --git a/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/ChainSilhouetteIterator.cpp b/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/BPy_ChainSilhouetteIterator.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/ChainSilhouetteIterator.cpp
rename to source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/BPy_ChainSilhouetteIterator.cpp
diff --git a/source/blender/python/api2_2x/Blender.c b/source/blender/python/api2_2x/Blender.c
index 71675ade605..9d3d89a660b 100644
--- a/source/blender/python/api2_2x/Blender.c
+++ b/source/blender/python/api2_2x/Blender.c
@@ -97,7 +97,8 @@ struct ID; /*keep me up here */
 #include "World.h"
 #include "Types.h"
 #include "Particle.h"
-#include "Freestyle.h"
+
+#include "BPy_Freestyle.h"
 
 /**********************************************************/
 /* Python API function prototypes for the Blender module.	*/

From d1b82d1f15a04a7c2383f0689ceede94971f4b81 Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Wed, 23 Jul 2008 10:19:08 +0000
Subject: [PATCH 123/252] soc-2008-mxcurioni: added Iterator class, base class
 for all iterators in Freestyle (on the C++ side). Created the equivalent in
 Python BPy_Iterator with the simple interface: - getExactTypeName() -
 increment() - decrement() - isBegin() - isEnd()

Contrary to previously stated, I am reverting back to implementing iterators in the (Python) API, for different reasons:
- it will make testing quicker to achieve, as I won't have to recode a big chunk of the original Python files
- it will be a base for API refactoring
- it won't prevent the use a list-based approach later (it is simple to get it from the Iterator)
---
 source/blender/freestyle/SConscript           |     1 +
 .../freestyle/intern/python/BPy_Freestyle.cpp |     2 +
 .../freestyle/intern/python/BPy_Iterator.cpp  |   176 +
 .../freestyle/intern/python/BPy_Iterator.h    |    35 +
 .../intern/stroke/ChainingIterators.h         |    12 +-
 .../freestyle/intern/swig/ModuleWrapper.cpp   | 16351 +++++++---------
 .../freestyle/intern/swig/ModuleWrapper.h     |    36 +-
 .../freestyle/intern/system/Iterator.cpp      |     1 +
 .../freestyle/intern/system/Iterator.h        |    38 +
 .../freestyle/intern/view_map/Interface0D.h   |     5 +-
 .../view_map/ViewMapAdvancedIterators.h       |     2 +-
 .../intern/view_map/ViewMapIterators.h        |    12 +-
 source/blender/freestyle/python/Freestyle.py  |    12 +-
 13 files changed, 7915 insertions(+), 8768 deletions(-)
 create mode 100644 source/blender/freestyle/intern/python/BPy_Iterator.cpp
 create mode 100644 source/blender/freestyle/intern/python/BPy_Iterator.h
 create mode 100644 source/blender/freestyle/intern/system/Iterator.cpp
 create mode 100644 source/blender/freestyle/intern/system/Iterator.h

diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript
index 94e8b7163fb..3c9f2abebe3 100644
--- a/source/blender/freestyle/SConscript
+++ b/source/blender/freestyle/SConscript
@@ -74,6 +74,7 @@ python_sources = [
 					prefix + '/BPy_Interface1D.cpp',
 					prefix + '/Interface1D/BPy_FEdge.cpp',
 					prefix + '/Interface1D/BPy_Stroke.cpp',
+					prefix + '/BPy_Iterator.cpp',
 					prefix + '/BPy_MediumType.cpp',
 					prefix + '/BPy_Nature.cpp',
 					prefix + '/BPy_StrokeAttribute.cpp',
diff --git a/source/blender/freestyle/intern/python/BPy_Freestyle.cpp b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
index bbb4acf4f85..a6ef92d8f51 100644
--- a/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
@@ -5,6 +5,7 @@
 #include "BPy_Id.h"
 #include "BPy_IntegrationType.h"
 #include "BPy_Interface0D.h"
+#include "BPy_Iterator.h"
 #include "Interface0D/BPy_CurvePoint.h"
 #include "BPy_Interface1D.h"
 #include "BPy_MediumType.h"
@@ -142,6 +143,7 @@ PyObject *Freestyle_Init( void )
 	IntegrationType_Init( module );
 	Interface0D_Init( module );
 	Interface1D_Init( module );
+	Iterator_Init( module );
 	StrokeAttribute_Init( module );
 	StrokeShader_Init( module );
 	UnaryFunction0D_Init( module );
diff --git a/source/blender/freestyle/intern/python/BPy_Iterator.cpp b/source/blender/freestyle/intern/python/BPy_Iterator.cpp
new file mode 100644
index 00000000000..aebf5e45630
--- /dev/null
+++ b/source/blender/freestyle/intern/python/BPy_Iterator.cpp
@@ -0,0 +1,176 @@
+#include "BPy_Iterator.h"
+
+#include "BPy_Convert.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for Iterator instance  -----------*/
+static void Iterator___dealloc__(BPy_Iterator *self);
+static PyObject * Iterator___repr__(BPy_Iterator* self);
+
+static PyObject * Iterator_getExactTypeName(BPy_Iterator* self);
+static PyObject * Iterator_increment(BPy_Iterator* self);
+static PyObject * Iterator_decrement(BPy_Iterator* self);
+static PyObject * Iterator_isBegin(BPy_Iterator* self);
+static PyObject * Iterator_isEnd(BPy_Iterator* self);
+
+/*----------------------Iterator instance definitions ----------------------------*/
+static PyMethodDef BPy_Iterator_methods[] = {
+	{"getExactTypeName", ( PyCFunction ) Iterator_getExactTypeName, METH_NOARGS, "（ ）Returns the string of the name of the iterator."},
+	{"increment", ( PyCFunction ) Iterator_increment, METH_NOARGS, "（ ）Increments iterator."},
+	{"decrement", ( PyCFunction ) Iterator_decrement, METH_NOARGS, "（ ）Decrements iterator."},
+	{"isBegin", ( PyCFunction ) Iterator_isBegin, METH_NOARGS, "（ ）Tests if iterator points to beginning."},
+	{"isEnd", ( PyCFunction ) Iterator_isEnd, METH_NOARGS, "（ ）Tests if iterator points to end."},
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_Iterator type definition ------------------------------*/
+
+PyTypeObject Iterator_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"Iterator",				/* tp_name */
+	sizeof( BPy_Iterator ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	(destructor)Iterator___dealloc__,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	(reprfunc)Iterator___repr__,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_Iterator_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	NULL,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	NULL,                       	/* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	PyType_GenericNew,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+PyMODINIT_FUNC Iterator_Init( PyObject *module )
+{
+	
+	if( module == NULL )
+		return;
+
+	if( PyType_Ready( &Iterator_Type ) < 0 )
+		return;
+	Py_INCREF( &Iterator_Type );
+	PyModule_AddObject(module, "Iterator", (PyObject *)&Iterator_Type);
+	
+}
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+void Iterator___dealloc__(BPy_Iterator* self)
+{
+	delete self->it;
+    self->ob_type->tp_free((PyObject*)self);
+}
+
+PyObject * Iterator___repr__(BPy_Iterator* self)
+{
+    return PyString_FromFormat("type: %s - address: %p", self->it->getExactTypeName().c_str(), self->it );
+}
+
+PyObject * Iterator_getExactTypeName(BPy_Iterator* self) {
+	return PyString_FromString( self->it->getExactTypeName().c_str() );	
+}
+
+
+PyObject * Iterator_increment(BPy_Iterator* self) {
+	self->it->increment();
+		
+	Py_RETURN_NONE;
+}
+
+PyObject * Iterator_decrement(BPy_Iterator* self) {
+	self->it->decrement();
+		
+	Py_RETURN_NONE;
+}
+
+PyObject * Iterator_isBegin(BPy_Iterator* self) {
+	return PyBool_from_bool( self->it->isBegin() );
+}
+
+PyObject * Iterator_isEnd(BPy_Iterator* self) {
+	return PyBool_from_bool( self->it->isEnd() );
+}
+
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+
diff --git a/source/blender/freestyle/intern/python/BPy_Iterator.h b/source/blender/freestyle/intern/python/BPy_Iterator.h
new file mode 100644
index 00000000000..0f92c3b7f28
--- /dev/null
+++ b/source/blender/freestyle/intern/python/BPy_Iterator.h
@@ -0,0 +1,35 @@
+#ifndef FREESTYLE_PYTHON_ITERATOR_H
+#define FREESTYLE_PYTHON_ITERATOR_H
+
+#include "../system/Iterator.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject Iterator_Type;
+
+#define BPy_Iterator_Check(v)	(( (PyObject *) v)->ob_type == &Iterator_Type)
+
+/*---------------------------Python BPy_Iterator structure definition----------*/
+typedef struct {
+	PyObject_HEAD
+	Iterator *it;
+} BPy_Iterator;
+
+/*---------------------------Python BPy_Iterator visible prototypes-----------*/
+
+PyMODINIT_FUNC Iterator_Init( PyObject *module );
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_ITERATOR_H */
diff --git a/source/blender/freestyle/intern/stroke/ChainingIterators.h b/source/blender/freestyle/intern/stroke/ChainingIterators.h
index 1e946855dce..121f1c8ba54 100755
--- a/source/blender/freestyle/intern/stroke/ChainingIterators.h
+++ b/source/blender/freestyle/intern/stroke/ChainingIterators.h
@@ -34,13 +34,15 @@
 # include "../view_map/ViewMapAdvancedIterators.h"
 # include "Predicates1D.h"
 
+#include "../system/Iterator.h" //soc 
+
 //using namespace ViewEdgeInternal;
 
 //
 // Adjacency iterator used in the chaining process
 //
 ///////////////////////////////////////////////////////////
-class LIB_STROKE_EXPORT AdjacencyIterator{
+class LIB_STROKE_EXPORT AdjacencyIterator : Iterator {
 protected:
   ViewVertexInternal::orientedViewEdgeIterator _internalIterator;
   bool _restrictToSelection;
@@ -71,10 +73,10 @@ public:
   virtual ~AdjacencyIterator(){
   }
   
-  inline bool isEnd(){
+  virtual inline bool isEnd(){
     return _internalIterator.isEnd();
   }
-  inline bool isBegin(){
+  virtual inline bool isBegin(){
     return _internalIterator.isBegin();
   }
   /*! Returns true if the current ViewEdge is is coming
@@ -94,8 +96,8 @@ public:
     increment();
     return tmp;
   }
-  void increment();
-  
+  virtual void increment();
+
 protected:
   bool isValid(ViewEdge* edge);
 };
diff --git a/source/blender/freestyle/intern/swig/ModuleWrapper.cpp b/source/blender/freestyle/intern/swig/ModuleWrapper.cpp
index 792388b52cb..14c3dbb57be 100755
--- a/source/blender/freestyle/intern/swig/ModuleWrapper.cpp
+++ b/source/blender/freestyle/intern/swig/ModuleWrapper.cpp
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.31
+ * Version 1.3.35
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -13,7 +13,7 @@
 #define SWIG_PYTHON_DIRECTOR_NO_VTABLE
 
 #ifdef __cplusplus
-template<class T> class SwigValueWrapper {
+template<typename T> class SwigValueWrapper {
     T *tt;
 public:
     SwigValueWrapper() : tt(0) { }
@@ -26,6 +26,10 @@ public:
 private:
     SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs);
 };
+
+template <typename T> T SwigValueInit() {
+  return T();
+}
 #endif
 
 /* -----------------------------------------------------------------------------
@@ -35,14 +39,14 @@ private:
 
 /* template workaround for compilers that cannot correctly implement the C++ standard */
 #ifndef SWIGTEMPLATEDISAMBIGUATOR
-# if defined(__SUNPRO_CC)
-#   if (__SUNPRO_CC <= 0x560)
-#     define SWIGTEMPLATEDISAMBIGUATOR template
-#   else
-#     define SWIGTEMPLATEDISAMBIGUATOR 
-#   endif
+# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560)
+#  define SWIGTEMPLATEDISAMBIGUATOR template
+# elif defined(__HP_aCC)
+/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */
+/* If we find a maximum version that requires this, the test would be __HP_aCC <= 35500 for A.03.55 */
+#  define SWIGTEMPLATEDISAMBIGUATOR template
 # else
-#   define SWIGTEMPLATEDISAMBIGUATOR 
+#  define SWIGTEMPLATEDISAMBIGUATOR
 # endif
 #endif
 
@@ -125,6 +129,12 @@ private:
 # define _CRT_SECURE_NO_DEPRECATE
 #endif
 
+/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */
+#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE)
+# define _SCL_SECURE_NO_DEPRECATE
+#endif
+
+
 
 /* Python.h has to appear first */
 #include <Python.h>
@@ -138,7 +148,7 @@ private:
 
 /* This should only be incremented when either the layout of swig_type_info changes,
    or for whatever reason, the runtime changes incompatibly */
-#define SWIG_RUNTIME_VERSION "3"
+#define SWIG_RUNTIME_VERSION "4"
 
 /* define SWIG_TYPE_TABLE_NAME as "SWIG_TYPE_TABLE" */
 #ifdef SWIG_TYPE_TABLE
@@ -173,6 +183,7 @@ private:
 
 /* Flags for pointer conversions */
 #define SWIG_POINTER_DISOWN        0x1
+#define SWIG_CAST_NEW_MEMORY       0x2
 
 /* Flags for new pointer objects */
 #define SWIG_POINTER_OWN           0x1
@@ -313,10 +324,10 @@ SWIGINTERNINLINE int SWIG_CheckState(int r) {
 extern "C" {
 #endif
 
-typedef void *(*swig_converter_func)(void *);
+typedef void *(*swig_converter_func)(void *, int *);
 typedef struct swig_type_info *(*swig_dycast_func)(void **);
 
-/* Structure to store inforomation on one type */
+/* Structure to store information on one type */
 typedef struct swig_type_info {
   const char             *name;			/* mangled name of this type */
   const char             *str;			/* human readable name of this type */
@@ -361,7 +372,7 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
     while ((*f2 == ' ') && (f2 != l2)) ++f2;
     if (*f1 != *f2) return (*f1 > *f2) ? 1 : -1;
   }
-  return (l1 - f1) - (l2 - f2);
+  return (int)((l1 - f1) - (l2 - f2));
 }
 
 /*
@@ -443,8 +454,8 @@ SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *into) {
   Cast a pointer up an inheritance hierarchy
 */
 SWIGRUNTIMEINLINE void *
-SWIG_TypeCast(swig_cast_info *ty, void *ptr) {
-  return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr);
+SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
+  return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
 }
 
 /* 
@@ -868,7 +879,7 @@ SWIG_Python_AddErrorMsg(const char* mesg)
     Py_DECREF(old_str);
     Py_DECREF(value);
   } else {
-    PyErr_Format(PyExc_RuntimeError, mesg);
+    PyErr_SetString(PyExc_RuntimeError, mesg);
   }
 }
 
@@ -1108,14 +1119,14 @@ SWIG_Python_AppendOutput(PyObject* result, PyObject* obj) {
 /* Unpack the argument tuple */
 
 SWIGINTERN int
-SWIG_Python_UnpackTuple(PyObject *args, const char *name, int min, int max, PyObject **objs)
+SWIG_Python_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssize_t max, PyObject **objs)
 {
   if (!args) {
     if (!min && !max) {
       return 1;
     } else {
       PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got none", 
-		   name, (min == max ? "" : "at least "), min);
+		   name, (min == max ? "" : "at least "), (int)min);
       return 0;
     }
   }  
@@ -1123,14 +1134,14 @@ SWIG_Python_UnpackTuple(PyObject *args, const char *name, int min, int max, PyOb
     PyErr_SetString(PyExc_SystemError, "UnpackTuple() argument list is not a tuple");
     return 0;
   } else {
-    register int l = PyTuple_GET_SIZE(args);
+    register Py_ssize_t l = PyTuple_GET_SIZE(args);
     if (l < min) {
       PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got %d", 
-		   name, (min == max ? "" : "at least "), min, l);
+		   name, (min == max ? "" : "at least "), (int)min, (int)l);
       return 0;
     } else if (l > max) {
       PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got %d", 
-		   name, (min == max ? "" : "at most "), max, l);
+		   name, (min == max ? "" : "at most "), (int)max, (int)l);
       return 0;
     } else {
       register int i;
@@ -1428,7 +1439,7 @@ PySwigObject_dealloc(PyObject *v)
 {
   PySwigObject *sobj = (PySwigObject *) v;
   PyObject *next = sobj->next;
-  if (sobj->own) {
+  if (sobj->own == SWIG_POINTER_OWN) {
     swig_type_info *ty = sobj->ty;
     PySwigClientData *data = ty ? (PySwigClientData *) ty->clientdata : 0;
     PyObject *destroy = data ? data->destroy : 0;
@@ -1446,12 +1457,13 @@ PySwigObject_dealloc(PyObject *v)
 	res = ((*meth)(mself, v));
       }
       Py_XDECREF(res);
-    } else {
-      const char *name = SWIG_TypePrettyName(ty);
+    } 
 #if !defined(SWIG_PYTHON_SILENT_MEMLEAK)
-      printf("swig/python detected a memory leak of type '%s', no destructor found.\n", name);
-#endif
+    else {
+      const char *name = SWIG_TypePrettyName(ty);
+      printf("swig/python detected a memory leak of type '%s', no destructor found.\n", (name ? name : "unknown"));
     }
+#endif
   } 
   Py_XDECREF(next);
   PyObject_DEL(v);
@@ -1609,9 +1621,11 @@ _PySwigObject_type(void) {
     (unaryfunc)0,                 /*nb_float*/
     (unaryfunc)PySwigObject_oct,  /*nb_oct*/
     (unaryfunc)PySwigObject_hex,  /*nb_hex*/
-#if PY_VERSION_HEX >= 0x02020000
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_true_divide */ 
-#elif PY_VERSION_HEX >= 0x02000000
+#if PY_VERSION_HEX >= 0x02050000 /* 2.5.0 */
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_index */
+#elif PY_VERSION_HEX >= 0x02020000 /* 2.2.0 */
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_true_divide */
+#elif PY_VERSION_HEX >= 0x02000000 /* 2.0.0 */
     0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_or */
 #endif
   };
@@ -1954,7 +1968,7 @@ SWIG_Python_GetSwigThis(PyObject *pyobj)
 
 SWIGRUNTIME int
 SWIG_Python_AcquirePtr(PyObject *obj, int own) {
-  if (own) {
+  if (own == SWIG_POINTER_OWN) {
     PySwigObject *sobj = SWIG_Python_GetSwigThis(obj);
     if (sobj) {
       int oldown = sobj->own;
@@ -1975,6 +1989,8 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
     return SWIG_OK;
   } else {
     PySwigObject *sobj = SWIG_Python_GetSwigThis(obj);
+    if (own)
+      *own = 0;
     while (sobj) {
       void *vptr = sobj->ptr;
       if (ty) {
@@ -1988,7 +2004,15 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
 	  if (!tc) {
 	    sobj = (PySwigObject *)sobj->next;
 	  } else {
-	    if (ptr) *ptr = SWIG_TypeCast(tc,vptr);
+	    if (ptr) {
+              int newmemory = 0;
+              *ptr = SWIG_TypeCast(tc,vptr,&newmemory);
+              if (newmemory == SWIG_CAST_NEW_MEMORY) {
+                assert(own);
+                if (own)
+                  *own = *own | SWIG_CAST_NEW_MEMORY;
+              }
+            }
 	    break;
 	  }
 	}
@@ -1998,7 +2022,8 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
       }
     }
     if (sobj) {
-      if (own) *own = sobj->own;
+      if (own)
+        *own = *own | sobj->own;
       if (flags & SWIG_POINTER_DISOWN) {
 	sobj->own = 0;
       }
@@ -2063,8 +2088,13 @@ SWIG_Python_ConvertFunctionPtr(PyObject *obj, void **ptr, swig_type_info *ty) {
     }
     if (ty) {
       swig_cast_info *tc = SWIG_TypeCheck(desc,ty);
-      if (!tc) return SWIG_ERROR;
-      *ptr = SWIG_TypeCast(tc,vptr);
+      if (tc) {
+        int newmemory = 0;
+        *ptr = SWIG_TypeCast(tc,vptr,&newmemory);
+        assert(!newmemory); /* newmemory handling not yet implemented */
+      } else {
+        return SWIG_ERROR;
+      }
     } else {
       *ptr = vptr;
     }
@@ -2680,6 +2710,7 @@ namespace Swig {
         swig_msg += msg;
       }
       if (!PyErr_Occurred()) {
+        swig_msg.insert(0, ": ");
         PyErr_SetString(error, getMessage());
       } else {
         SWIG_Python_AddErrorMsg(getMessage());
@@ -2774,7 +2805,7 @@ namespace Swig {
   class DirectorMethodException : public Swig::DirectorException {
   public:
     DirectorMethodException(const char* msg = "") 
-      : DirectorException(PyExc_RuntimeError, "Swig director method error", msg)
+      : DirectorException(PyExc_RuntimeError, "Swig director method error.", msg)
     {
     }    
 
@@ -2807,33 +2838,21 @@ namespace Swig {
 # endif
 #endif
 
-/* simple thread abstraction for pthreads on win32 */
 #ifdef __THREAD__
-# define __PTHREAD__
-# if defined(_WIN32) || defined(__WIN32__)
-#  define pthread_mutex_lock EnterCriticalSection
-#  define pthread_mutex_unlock LeaveCriticalSection
-#  define pthread_mutex_t CRITICAL_SECTION
-#  define SWIG_MUTEX_INIT(var) var
-# else
-#  include <pthread.h>
-#  define SWIG_MUTEX_INIT(var) var = PTHREAD_MUTEX_INITIALIZER 
-# endif
-#endif
-
-#ifdef  __PTHREAD__
-  struct Guard
+# include "pythread.h"
+  class Guard
   {
-    pthread_mutex_t *_mutex;
+    PyThread_type_lock & mutex_;
     
-    Guard(pthread_mutex_t &mutex) : _mutex(&mutex)
+  public:
+    Guard(PyThread_type_lock & mutex) : mutex_(mutex)
     {
-      pthread_mutex_lock(_mutex);
+      PyThread_acquire_lock(mutex_, WAIT_LOCK);
     }
     
     ~Guard()
     {
-      pthread_mutex_unlock(_mutex);
+      PyThread_release_lock(mutex_);
     }
   };
 # define SWIG_GUARD(mutex) Guard _guard(mutex)
@@ -2904,8 +2923,8 @@ namespace Swig {
   private:
     typedef std::map<void*, GCItem_var> ownership_map;
     mutable ownership_map owner;
-#ifdef __PTHREAD__
-    static pthread_mutex_t swig_mutex_own;
+#ifdef __THREAD__
+    static PyThread_type_lock swig_mutex_own;
 #endif
 
   public:
@@ -2950,8 +2969,8 @@ namespace Swig {
     }
   };
 
-#ifdef __PTHREAD__
-  pthread_mutex_t SWIG_MUTEX_INIT(Director::swig_mutex_own);
+#ifdef __THREAD__
+  PyThread_type_lock Director::swig_mutex_own = PyThread_allocate_lock();
 #endif
 }
 
@@ -2963,7 +2982,7 @@ namespace Swig {
 /* -------- TYPES TABLE (BEGIN) -------- */
 
 #define SWIGTYPE_p_AdjacencyIterator swig_types[0]
-#define SWIGTYPE_p_BBoxTVecMat__Vec3Tdouble_t_t swig_types[1]
+#define SWIGTYPE_p_BBoxT_VecMat__Vec3T_double_t_t swig_types[1]
 #define SWIGTYPE_p_BinaryPredicate0D swig_types[2]
 #define SWIGTYPE_p_BinaryPredicate1D swig_types[3]
 #define SWIGTYPE_p_CalligraphicShader swig_types[4]
@@ -3114,56 +3133,56 @@ namespace Swig {
 #define SWIGTYPE_p_StrokesContainer swig_types[149]
 #define SWIGTYPE_p_StyleModule swig_types[150]
 #define SWIGTYPE_p_TVertex swig_types[151]
-#define SWIGTYPE_p_UnaryFunction0DTId_t swig_types[152]
-#define SWIGTYPE_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t swig_types[153]
-#define SWIGTYPE_p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t swig_types[154]
-#define SWIGTYPE_p_UnaryFunction0DTViewShape_p_t swig_types[155]
-#define SWIGTYPE_p_UnaryFunction0DTdouble_t swig_types[156]
-#define SWIGTYPE_p_UnaryFunction0DTfloat_t swig_types[157]
-#define SWIGTYPE_p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t swig_types[158]
-#define SWIGTYPE_p_UnaryFunction0DTunsigned_int_t swig_types[159]
-#define SWIGTYPE_p_UnaryFunction0DTvoid_t swig_types[160]
-#define SWIGTYPE_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t swig_types[161]
-#define SWIGTYPE_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t swig_types[162]
-#define SWIGTYPE_p_UnaryFunction1DTdouble_t swig_types[163]
-#define SWIGTYPE_p_UnaryFunction1DTfloat_t swig_types[164]
-#define SWIGTYPE_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t swig_types[165]
-#define SWIGTYPE_p_UnaryFunction1DTunsigned_int_t swig_types[166]
-#define SWIGTYPE_p_UnaryFunction1DTvoid_t swig_types[167]
+#define SWIGTYPE_p_UnaryFunction0DT_Id_t swig_types[152]
+#define SWIGTYPE_p_UnaryFunction0DT_VecMat__Vec2T_float_t_t swig_types[153]
+#define SWIGTYPE_p_UnaryFunction0DT_VecMat__Vec3T_float_t_t swig_types[154]
+#define SWIGTYPE_p_UnaryFunction0DT_ViewShape_p_t swig_types[155]
+#define SWIGTYPE_p_UnaryFunction0DT_double_t swig_types[156]
+#define SWIGTYPE_p_UnaryFunction0DT_float_t swig_types[157]
+#define SWIGTYPE_p_UnaryFunction0DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t swig_types[158]
+#define SWIGTYPE_p_UnaryFunction0DT_unsigned_int_t swig_types[159]
+#define SWIGTYPE_p_UnaryFunction0DT_void_t swig_types[160]
+#define SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec2T_float_t_t swig_types[161]
+#define SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec3T_float_t_t swig_types[162]
+#define SWIGTYPE_p_UnaryFunction1DT_double_t swig_types[163]
+#define SWIGTYPE_p_UnaryFunction1DT_float_t swig_types[164]
+#define SWIGTYPE_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t swig_types[165]
+#define SWIGTYPE_p_UnaryFunction1DT_unsigned_int_t swig_types[166]
+#define SWIGTYPE_p_UnaryFunction1DT_void_t swig_types[167]
 #define SWIGTYPE_p_UnaryPredicate0D swig_types[168]
 #define SWIGTYPE_p_UnaryPredicate1D swig_types[169]
-#define SWIGTYPE_p_VecMat__HVec3Tdouble_t swig_types[170]
-#define SWIGTYPE_p_VecMat__HVec3Tfloat_t swig_types[171]
-#define SWIGTYPE_p_VecMat__HVec3Tint_t swig_types[172]
-#define SWIGTYPE_p_VecMat__HVec3Tunsigned_int_t swig_types[173]
-#define SWIGTYPE_p_VecMat__SquareMatrixTdouble_2_t swig_types[174]
-#define SWIGTYPE_p_VecMat__SquareMatrixTdouble_3_t swig_types[175]
-#define SWIGTYPE_p_VecMat__SquareMatrixTdouble_4_t swig_types[176]
-#define SWIGTYPE_p_VecMat__SquareMatrixTfloat_2_t swig_types[177]
-#define SWIGTYPE_p_VecMat__SquareMatrixTfloat_3_t swig_types[178]
-#define SWIGTYPE_p_VecMat__SquareMatrixTfloat_4_t swig_types[179]
-#define SWIGTYPE_p_VecMat__SquareMatrixTint_2_t swig_types[180]
-#define SWIGTYPE_p_VecMat__SquareMatrixTint_3_t swig_types[181]
-#define SWIGTYPE_p_VecMat__SquareMatrixTint_4_t swig_types[182]
-#define SWIGTYPE_p_VecMat__SquareMatrixTunsigned_int_2_t swig_types[183]
-#define SWIGTYPE_p_VecMat__SquareMatrixTunsigned_int_3_t swig_types[184]
-#define SWIGTYPE_p_VecMat__SquareMatrixTunsigned_int_4_t swig_types[185]
-#define SWIGTYPE_p_VecMat__Vec2Tdouble_t swig_types[186]
-#define SWIGTYPE_p_VecMat__Vec2Tfloat_t swig_types[187]
-#define SWIGTYPE_p_VecMat__Vec2Tint_t swig_types[188]
-#define SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t swig_types[189]
-#define SWIGTYPE_p_VecMat__Vec3Tdouble_t swig_types[190]
-#define SWIGTYPE_p_VecMat__Vec3Tfloat_t swig_types[191]
-#define SWIGTYPE_p_VecMat__Vec3Tint_t swig_types[192]
-#define SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t swig_types[193]
-#define SWIGTYPE_p_VecMat__VecTdouble_2_t swig_types[194]
-#define SWIGTYPE_p_VecMat__VecTdouble_3_t swig_types[195]
-#define SWIGTYPE_p_VecMat__VecTfloat_2_t swig_types[196]
-#define SWIGTYPE_p_VecMat__VecTfloat_3_t swig_types[197]
-#define SWIGTYPE_p_VecMat__VecTint_2_t swig_types[198]
-#define SWIGTYPE_p_VecMat__VecTint_3_t swig_types[199]
-#define SWIGTYPE_p_VecMat__VecTunsigned_int_2_t swig_types[200]
-#define SWIGTYPE_p_VecMat__VecTunsigned_int_3_t swig_types[201]
+#define SWIGTYPE_p_VecMat__HVec3T_double_t swig_types[170]
+#define SWIGTYPE_p_VecMat__HVec3T_float_t swig_types[171]
+#define SWIGTYPE_p_VecMat__HVec3T_int_t swig_types[172]
+#define SWIGTYPE_p_VecMat__HVec3T_unsigned_int_t swig_types[173]
+#define SWIGTYPE_p_VecMat__SquareMatrixT_double_2_t swig_types[174]
+#define SWIGTYPE_p_VecMat__SquareMatrixT_double_3_t swig_types[175]
+#define SWIGTYPE_p_VecMat__SquareMatrixT_double_4_t swig_types[176]
+#define SWIGTYPE_p_VecMat__SquareMatrixT_float_2_t swig_types[177]
+#define SWIGTYPE_p_VecMat__SquareMatrixT_float_3_t swig_types[178]
+#define SWIGTYPE_p_VecMat__SquareMatrixT_float_4_t swig_types[179]
+#define SWIGTYPE_p_VecMat__SquareMatrixT_int_2_t swig_types[180]
+#define SWIGTYPE_p_VecMat__SquareMatrixT_int_3_t swig_types[181]
+#define SWIGTYPE_p_VecMat__SquareMatrixT_int_4_t swig_types[182]
+#define SWIGTYPE_p_VecMat__SquareMatrixT_unsigned_int_2_t swig_types[183]
+#define SWIGTYPE_p_VecMat__SquareMatrixT_unsigned_int_3_t swig_types[184]
+#define SWIGTYPE_p_VecMat__SquareMatrixT_unsigned_int_4_t swig_types[185]
+#define SWIGTYPE_p_VecMat__Vec2T_double_t swig_types[186]
+#define SWIGTYPE_p_VecMat__Vec2T_float_t swig_types[187]
+#define SWIGTYPE_p_VecMat__Vec2T_int_t swig_types[188]
+#define SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t swig_types[189]
+#define SWIGTYPE_p_VecMat__Vec3T_double_t swig_types[190]
+#define SWIGTYPE_p_VecMat__Vec3T_float_t swig_types[191]
+#define SWIGTYPE_p_VecMat__Vec3T_int_t swig_types[192]
+#define SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t swig_types[193]
+#define SWIGTYPE_p_VecMat__VecT_double_2_t swig_types[194]
+#define SWIGTYPE_p_VecMat__VecT_double_3_t swig_types[195]
+#define SWIGTYPE_p_VecMat__VecT_float_2_t swig_types[196]
+#define SWIGTYPE_p_VecMat__VecT_float_3_t swig_types[197]
+#define SWIGTYPE_p_VecMat__VecT_int_2_t swig_types[198]
+#define SWIGTYPE_p_VecMat__VecT_int_3_t swig_types[199]
+#define SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t swig_types[200]
+#define SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t swig_types[201]
 #define SWIGTYPE_p_Vertex swig_types[202]
 #define SWIGTYPE_p_ViewEdge swig_types[203]
 #define SWIGTYPE_p_ViewEdgeInternal__SVertexIterator swig_types[204]
@@ -3171,8 +3190,8 @@ namespace Swig {
 #define SWIGTYPE_p_ViewMap swig_types[206]
 #define SWIGTYPE_p_ViewShape swig_types[207]
 #define SWIGTYPE_p_ViewVertex swig_types[208]
-#define SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t swig_types[209]
-#define SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t swig_types[210]
+#define SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_const_traits_t swig_types[209]
+#define SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_nonconst_traits_t swig_types[210]
 #define SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator swig_types[211]
 #define SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator__edge_pointers_container__iterator swig_types[212]
 #define SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator__edges_container__iterator swig_types[213]
@@ -3202,30 +3221,30 @@ namespace Swig {
 #define SWIGTYPE_p_point_iterator swig_types[237]
 #define SWIGTYPE_p_point_type swig_types[238]
 #define SWIGTYPE_p_reference swig_types[239]
-#define SWIGTYPE_p_setTVecMat__Vec3Tdouble_t_t swig_types[240]
+#define SWIGTYPE_p_setT_VecMat__Vec3T_double_t_t swig_types[240]
 #define SWIGTYPE_p_size_type swig_types[241]
 #define SWIGTYPE_p_std__invalid_argument swig_types[242]
-#define SWIGTYPE_p_std__mapTint_int_std__lessTint_t_std__allocatorTstd__pairTint_const_int_t_t_t swig_types[243]
-#define SWIGTYPE_p_std__pairTViewEdge_p_bool_t swig_types[244]
-#define SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t swig_types[245]
-#define SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__allocator_type swig_types[246]
-#define SWIGTYPE_p_std__vectorTMaterial_std__allocatorTMaterial_t_t swig_types[247]
-#define SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t swig_types[248]
-#define SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__allocator_type swig_types[249]
-#define SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t swig_types[250]
-#define SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__allocator_type swig_types[251]
-#define SWIGTYPE_p_std__vectorTTVertex_p_std__allocatorTTVertex_p_t_t swig_types[252]
-#define SWIGTYPE_p_std__vectorTVecMat__Vec2Tdouble_t_std__allocatorTVecMat__Vec2Tdouble_t_t_t swig_types[253]
-#define SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t swig_types[254]
-#define SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__allocator_type swig_types[255]
-#define SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t swig_types[256]
-#define SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__allocator_type swig_types[257]
-#define SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t swig_types[258]
-#define SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__allocator_type swig_types[259]
-#define SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t swig_types[260]
-#define SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t__allocator_type swig_types[261]
-#define SWIGTYPE_p_std__vectorTstd__pairTViewEdge_p_bool_t_std__allocatorTstd__pairTViewEdge_p_bool_t_t_t swig_types[262]
-#define SWIGTYPE_p_std__vectorTunsigned_int_std__allocatorTunsigned_int_t_t swig_types[263]
+#define SWIGTYPE_p_std__mapT_int_int_std__lessT_int_t_std__allocatorT_std__pairT_int_const_int_t_t_t swig_types[243]
+#define SWIGTYPE_p_std__pairT_ViewEdge_p_bool_t swig_types[244]
+#define SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t swig_types[245]
+#define SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__allocator_type swig_types[246]
+#define SWIGTYPE_p_std__vectorT_Material_std__allocatorT_Material_t_t swig_types[247]
+#define SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t swig_types[248]
+#define SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__allocator_type swig_types[249]
+#define SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t swig_types[250]
+#define SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__allocator_type swig_types[251]
+#define SWIGTYPE_p_std__vectorT_TVertex_p_std__allocatorT_TVertex_p_t_t swig_types[252]
+#define SWIGTYPE_p_std__vectorT_VecMat__Vec2T_double_t_std__allocatorT_VecMat__Vec2T_double_t_t_t swig_types[253]
+#define SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t swig_types[254]
+#define SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__allocator_type swig_types[255]
+#define SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t swig_types[256]
+#define SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__allocator_type swig_types[257]
+#define SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t swig_types[258]
+#define SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__allocator_type swig_types[259]
+#define SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t swig_types[260]
+#define SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t__allocator_type swig_types[261]
+#define SWIGTYPE_p_std__vectorT_std__pairT_ViewEdge_p_bool_t_std__allocatorT_std__pairT_ViewEdge_p_bool_t_t_t swig_types[262]
+#define SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t swig_types[263]
 #define SWIGTYPE_p_svertices_container swig_types[264]
 #define SWIGTYPE_p_swig__PySwigIterator swig_types[265]
 #define SWIGTYPE_p_unsigned_int swig_types[266]
@@ -3239,12 +3258,12 @@ namespace Swig {
 #define SWIGTYPE_p_viewshapes_container swig_types[274]
 #define SWIGTYPE_p_viewvertices_container swig_types[275]
 #define SWIGTYPE_p_void swig_types[276]
-#define SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type swig_types[277]
-#define SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type swig_types[278]
-#define SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type swig_types[279]
-#define SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type swig_types[280]
-#define SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type swig_types[281]
-#define SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type swig_types[282]
+#define SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type swig_types[277]
+#define SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type swig_types[278]
+#define SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type swig_types[279]
+#define SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type swig_types[280]
+#define SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type swig_types[281]
+#define SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type swig_types[282]
 static swig_type_info *swig_types[284];
 static swig_module_info swig_module = {swig_types, 283, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
@@ -3265,7 +3284,7 @@ static swig_module_info swig_module = {swig_types, 283, 0, 0, 0, 0};
 
 #define SWIG_name    "_Freestyle"
 
-#define SWIGVERSION 0x010331 
+#define SWIGVERSION 0x010335 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -3293,7 +3312,9 @@ namespace swig {
     
     PyObject_ptr(PyObject *obj, bool initial_ref = true) :_obj(obj)
     {
-      if (initial_ref) Py_XINCREF(_obj);
+      if (initial_ref) {
+        Py_XINCREF(_obj);
+      }
     }
     
     PyObject_ptr & operator=(const PyObject_ptr& item) 
@@ -3441,17 +3462,22 @@ namespace swig {
     // C++ common/needed methods
     virtual PySwigIterator *copy() const = 0;
 
-    PyObject *next()
+    PyObject *next()     
     {
+      SWIG_PYTHON_THREAD_BEGIN_BLOCK; // disable threads       
       PyObject *obj = value();
-      incr();
-      return obj;
+      incr();       
+      SWIG_PYTHON_THREAD_END_BLOCK; // re-enable threads
+      return obj;     
     }
 
     PyObject *previous()
     {
+      SWIG_PYTHON_THREAD_BEGIN_BLOCK; // disable threads       
       decr();
-      return value();
+      PyObject *obj = value();
+      SWIG_PYTHON_THREAD_END_BLOCK; // re-enable threads       
+      return obj;
     }
 
     PySwigIterator *advance(ptrdiff_t n)
@@ -4534,12 +4560,12 @@ namespace swig
 
     ~PySequence_Cont()
     {
-      if (_seq) Py_DECREF(_seq);
+      Py_XDECREF(_seq);
     }
 
     size_type size() const
     {
-      return PySequence_Size(_seq);
+      return static_cast<size_type>(PySequence_Size(_seq));
     }
 
     bool empty() const
@@ -4602,14 +4628,12 @@ namespace swig
 
 
 #include <limits.h>
-#ifndef LLONG_MIN
-# define LLONG_MIN	LONG_LONG_MIN
-#endif
-#ifndef LLONG_MAX
-# define LLONG_MAX	LONG_LONG_MAX
-#endif
-#ifndef ULLONG_MAX
-# define ULLONG_MAX	ULONG_LONG_MAX
+#if !defined(SWIG_NO_LLONG_MAX)
+# if !defined(LLONG_MAX) && defined(__GNUC__) && defined (__LONG_LONG_MAX__)
+#   define LLONG_MAX __LONG_LONG_MAX__
+#   define LLONG_MIN (-LLONG_MAX - 1LL)
+#   define ULLONG_MAX (LLONG_MAX * 2ULL + 1ULL)
+# endif
 #endif
 
 
@@ -4677,7 +4701,14 @@ namespace swig {
     typedef T value_type;
 
     static int asptr(PyObject *obj, sequence **seq) {
-      if (PySequence_Check(obj)) {
+      if (obj == Py_None || SWIG_Python_GetSwigThis(obj)) {
+	sequence *p;
+	if (SWIG_ConvertPtr(obj,(void**)&p,
+			    swig::type_info<sequence>(),0) == SWIG_OK) {
+	  if (seq) *seq = p;
+	  return SWIG_OLDOBJ;
+	}
+      } else if (PySequence_Check(obj)) {
 	try {
 	  PySequence_Cont<value_type> pyseq(obj);
 	  if (seq) {
@@ -4696,13 +4727,6 @@ namespace swig {
 	  }
 	  return SWIG_ERROR;
 	}
-      } else {
-	sequence *p;
-	if (SWIG_ConvertPtr(obj,(void**)&p,
-			    swig::type_info<sequence>(),0) == SWIG_OK) {
-	  if (seq) *seq = p;
-	  return SWIG_OLDOBJ;
-	}
       }
       return SWIG_ERROR;
     }
@@ -4758,21 +4782,21 @@ namespace swig {
 
 
       namespace swig {
-	template <>  struct traits<std::vector<int, std::allocator<int > > > {
+	template <>  struct traits<std::vector<int, std::allocator< int > > > {
 	  typedef pointer_category category;
 	  static const char* type_name() {
-	    return "std::vector<" "int" "," "std::allocator<int >" " >";
+	    return "std::vector<" "int" "," "std::allocator< int >" " >";
 	  }
 	};
       }
     
-SWIGINTERN swig::PySwigIterator *std_vector_Sl_int_Sg__iterator(std::vector<int > *self,PyObject **PYTHON_SELF){
+SWIGINTERN swig::PySwigIterator *std_vector_Sl_int_Sg__iterator(std::vector< int > *self,PyObject **PYTHON_SELF){
       return swig::make_output_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
     }
-SWIGINTERN bool std_vector_Sl_int_Sg____nonzero__(std::vector<int > const *self){
+SWIGINTERN bool std_vector_Sl_int_Sg____nonzero__(std::vector< int > const *self){
       return !(self->empty());
     }
-SWIGINTERN std::vector<int >::size_type std_vector_Sl_int_Sg____len__(std::vector<int > const *self){
+SWIGINTERN std::vector< int >::size_type std_vector_Sl_int_Sg____len__(std::vector< int > const *self){
       return self->size();
     }
 
@@ -4790,32 +4814,32 @@ SWIG_From_size_t  (size_t value)
   return SWIG_From_unsigned_SS_long  (static_cast< unsigned long >(value));
 }
 
-SWIGINTERN std::vector<int >::value_type std_vector_Sl_int_Sg__pop(std::vector<int > *self){
+SWIGINTERN std::vector< int >::value_type std_vector_Sl_int_Sg__pop(std::vector< int > *self){
       if (self->size() == 0)
 	throw std::out_of_range("pop from empty container");
-      std::vector<int,std::allocator<int > >::value_type x = self->back();
+      std::vector<int,std::allocator< int > >::value_type x = self->back();
       self->pop_back();
       return x;
     }
-SWIGINTERN std::vector<int,std::allocator<int > > *std_vector_Sl_int_Sg____getslice__(std::vector<int > *self,std::vector<int >::difference_type i,std::vector<int >::difference_type j){
+SWIGINTERN std::vector< int,std::allocator< int > > *std_vector_Sl_int_Sg____getslice__(std::vector< int > *self,std::vector< int >::difference_type i,std::vector< int >::difference_type j){
       return swig::getslice(self, i, j);
     }
-SWIGINTERN void std_vector_Sl_int_Sg____setslice__(std::vector<int > *self,std::vector<int >::difference_type i,std::vector<int >::difference_type j,std::vector<int,std::allocator<int > > const &v){
+SWIGINTERN void std_vector_Sl_int_Sg____setslice__(std::vector< int > *self,std::vector< int >::difference_type i,std::vector< int >::difference_type j,std::vector< int,std::allocator< int > > const &v){
       swig::setslice(self, i, j, v);
     }
-SWIGINTERN void std_vector_Sl_int_Sg____delslice__(std::vector<int > *self,std::vector<int >::difference_type i,std::vector<int >::difference_type j){
+SWIGINTERN void std_vector_Sl_int_Sg____delslice__(std::vector< int > *self,std::vector< int >::difference_type i,std::vector< int >::difference_type j){
       swig::delslice(self, i, j);
     }
-SWIGINTERN void std_vector_Sl_int_Sg____delitem__(std::vector<int > *self,std::vector<int >::difference_type i){
+SWIGINTERN void std_vector_Sl_int_Sg____delitem__(std::vector< int > *self,std::vector< int >::difference_type i){
       self->erase(swig::getpos(self,i));
     }
-SWIGINTERN std::vector<int >::value_type const &std_vector_Sl_int_Sg____getitem__(std::vector<int > const *self,std::vector<int >::difference_type i){
+SWIGINTERN std::vector< int >::value_type const &std_vector_Sl_int_Sg____getitem__(std::vector< int > const *self,std::vector< int >::difference_type i){
       return *(swig::cgetpos(self, i));
     }
-SWIGINTERN void std_vector_Sl_int_Sg____setitem__(std::vector<int > *self,std::vector<int >::difference_type i,std::vector<int >::value_type const &x){
+SWIGINTERN void std_vector_Sl_int_Sg____setitem__(std::vector< int > *self,std::vector< int >::difference_type i,std::vector< int >::value_type const &x){
       *(swig::getpos(self,i)) = x;
     }
-SWIGINTERN void std_vector_Sl_int_Sg__append(std::vector<int > *self,std::vector<int >::value_type const &x){
+SWIGINTERN void std_vector_Sl_int_Sg__append(std::vector< int > *self,std::vector< int >::value_type const &x){
       self->push_back(x);
     }
 
@@ -4935,18 +4959,11 @@ SWIG_AsVal_unsigned_SS_short (PyObject * obj, unsigned short *val)
 SWIGINTERN int
 SWIG_AsVal_bool (PyObject *obj, bool *val)
 {
-  if (obj == Py_True) {
-    if (val) *val = true;
-    return SWIG_OK;
-  } else if (obj == Py_False) {
-    if (val) *val = false;
-    return SWIG_OK;
-  } else {
-    long v = 0;
-    int res = SWIG_AddCast(SWIG_AsVal_long (obj, val ? &v : 0));
-    if (SWIG_IsOK(res) && val) *val = v ? true : false;
-    return res;
-  }
+  int r = PyObject_IsTrue(obj);
+  if (r == -1)
+    return SWIG_ERROR;
+  if (val) *val = r ? true : false;
+  return SWIG_OK;
 }
 
 
@@ -4959,49 +4976,49 @@ SWIG_AsVal_bool (PyObject *obj, bool *val)
 
 
       namespace swig {
-	template <>  struct traits<std::vector<ViewShape*, std::allocator<ViewShape * > > > {
+	template <>  struct traits<std::vector<ViewShape*, std::allocator< ViewShape * > > > {
 	  typedef value_category category;
 	  static const char* type_name() {
-	    return "std::vector<" "ViewShape" " *," "std::allocator<ViewShape * >" " >";
+	    return "std::vector<" "ViewShape" " *," "std::allocator< ViewShape * >" " >";
 	  }
 	};
       }
     
-SWIGINTERN swig::PySwigIterator *std_vector_Sl_ViewShape_Sm__Sg__iterator(std::vector<ViewShape * > *self,PyObject **PYTHON_SELF){
+SWIGINTERN swig::PySwigIterator *std_vector_Sl_ViewShape_Sm__Sg__iterator(std::vector< ViewShape * > *self,PyObject **PYTHON_SELF){
       return swig::make_output_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
     }
-SWIGINTERN bool std_vector_Sl_ViewShape_Sm__Sg____nonzero__(std::vector<ViewShape * > const *self){
+SWIGINTERN bool std_vector_Sl_ViewShape_Sm__Sg____nonzero__(std::vector< ViewShape * > const *self){
       return !(self->empty());
     }
-SWIGINTERN std::vector<ViewShape * >::size_type std_vector_Sl_ViewShape_Sm__Sg____len__(std::vector<ViewShape * > const *self){
+SWIGINTERN std::vector< ViewShape * >::size_type std_vector_Sl_ViewShape_Sm__Sg____len__(std::vector< ViewShape * > const *self){
       return self->size();
     }
-SWIGINTERN std::vector<ViewShape * >::value_type std_vector_Sl_ViewShape_Sm__Sg__pop(std::vector<ViewShape * > *self){
+SWIGINTERN std::vector< ViewShape * >::value_type std_vector_Sl_ViewShape_Sm__Sg__pop(std::vector< ViewShape * > *self){
       if (self->size() == 0)
 	throw std::out_of_range("pop from empty container");
-      std::vector<ViewShape*,std::allocator<ViewShape * > >::value_type x = self->back();
+      std::vector<ViewShape*,std::allocator< ViewShape * > >::value_type x = self->back();
       self->pop_back();
       return x;
     }
-SWIGINTERN std::vector<ViewShape *,std::allocator<ViewShape * > > *std_vector_Sl_ViewShape_Sm__Sg____getslice__(std::vector<ViewShape * > *self,std::vector<ViewShape * >::difference_type i,std::vector<ViewShape * >::difference_type j){
+SWIGINTERN std::vector< ViewShape *,std::allocator< ViewShape * > > *std_vector_Sl_ViewShape_Sm__Sg____getslice__(std::vector< ViewShape * > *self,std::vector< ViewShape * >::difference_type i,std::vector< ViewShape * >::difference_type j){
       return swig::getslice(self, i, j);
     }
-SWIGINTERN void std_vector_Sl_ViewShape_Sm__Sg____setslice__(std::vector<ViewShape * > *self,std::vector<ViewShape * >::difference_type i,std::vector<ViewShape * >::difference_type j,std::vector<ViewShape *,std::allocator<ViewShape * > > const &v){
+SWIGINTERN void std_vector_Sl_ViewShape_Sm__Sg____setslice__(std::vector< ViewShape * > *self,std::vector< ViewShape * >::difference_type i,std::vector< ViewShape * >::difference_type j,std::vector< ViewShape *,std::allocator< ViewShape * > > const &v){
       swig::setslice(self, i, j, v);
     }
-SWIGINTERN void std_vector_Sl_ViewShape_Sm__Sg____delslice__(std::vector<ViewShape * > *self,std::vector<ViewShape * >::difference_type i,std::vector<ViewShape * >::difference_type j){
+SWIGINTERN void std_vector_Sl_ViewShape_Sm__Sg____delslice__(std::vector< ViewShape * > *self,std::vector< ViewShape * >::difference_type i,std::vector< ViewShape * >::difference_type j){
       swig::delslice(self, i, j);
     }
-SWIGINTERN void std_vector_Sl_ViewShape_Sm__Sg____delitem__(std::vector<ViewShape * > *self,std::vector<ViewShape * >::difference_type i){
+SWIGINTERN void std_vector_Sl_ViewShape_Sm__Sg____delitem__(std::vector< ViewShape * > *self,std::vector< ViewShape * >::difference_type i){
       self->erase(swig::getpos(self,i));
     }
-SWIGINTERN std::vector<ViewShape * >::value_type std_vector_Sl_ViewShape_Sm__Sg____getitem__(std::vector<ViewShape * > *self,std::vector<ViewShape * >::difference_type i){
+SWIGINTERN std::vector< ViewShape * >::value_type std_vector_Sl_ViewShape_Sm__Sg____getitem__(std::vector< ViewShape * > *self,std::vector< ViewShape * >::difference_type i){
       return *(swig::cgetpos(self, i));
     }
-SWIGINTERN void std_vector_Sl_ViewShape_Sm__Sg____setitem__(std::vector<ViewShape * > *self,std::vector<ViewShape * >::difference_type i,std::vector<ViewShape * >::value_type x){
+SWIGINTERN void std_vector_Sl_ViewShape_Sm__Sg____setitem__(std::vector< ViewShape * > *self,std::vector< ViewShape * >::difference_type i,std::vector< ViewShape * >::value_type x){
       *(swig::getpos(self,i)) = x;
     }
-SWIGINTERN void std_vector_Sl_ViewShape_Sm__Sg__append(std::vector<ViewShape * > *self,std::vector<ViewShape * >::value_type x){
+SWIGINTERN void std_vector_Sl_ViewShape_Sm__Sg__append(std::vector< ViewShape * > *self,std::vector< ViewShape * >::value_type x){
       self->push_back(x);
     }
 
@@ -5014,49 +5031,49 @@ SWIGINTERN void std_vector_Sl_ViewShape_Sm__Sg__append(std::vector<ViewShape * >
 
 
       namespace swig {
-	template <>  struct traits<std::vector<ViewEdge*, std::allocator<ViewEdge * > > > {
+	template <>  struct traits<std::vector<ViewEdge*, std::allocator< ViewEdge * > > > {
 	  typedef value_category category;
 	  static const char* type_name() {
-	    return "std::vector<" "ViewEdge" " *," "std::allocator<ViewEdge * >" " >";
+	    return "std::vector<" "ViewEdge" " *," "std::allocator< ViewEdge * >" " >";
 	  }
 	};
       }
     
-SWIGINTERN swig::PySwigIterator *std_vector_Sl_ViewEdge_Sm__Sg__iterator(std::vector<ViewEdge * > *self,PyObject **PYTHON_SELF){
+SWIGINTERN swig::PySwigIterator *std_vector_Sl_ViewEdge_Sm__Sg__iterator(std::vector< ViewEdge * > *self,PyObject **PYTHON_SELF){
       return swig::make_output_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
     }
-SWIGINTERN bool std_vector_Sl_ViewEdge_Sm__Sg____nonzero__(std::vector<ViewEdge * > const *self){
+SWIGINTERN bool std_vector_Sl_ViewEdge_Sm__Sg____nonzero__(std::vector< ViewEdge * > const *self){
       return !(self->empty());
     }
-SWIGINTERN std::vector<ViewEdge * >::size_type std_vector_Sl_ViewEdge_Sm__Sg____len__(std::vector<ViewEdge * > const *self){
+SWIGINTERN std::vector< ViewEdge * >::size_type std_vector_Sl_ViewEdge_Sm__Sg____len__(std::vector< ViewEdge * > const *self){
       return self->size();
     }
-SWIGINTERN std::vector<ViewEdge * >::value_type std_vector_Sl_ViewEdge_Sm__Sg__pop(std::vector<ViewEdge * > *self){
+SWIGINTERN std::vector< ViewEdge * >::value_type std_vector_Sl_ViewEdge_Sm__Sg__pop(std::vector< ViewEdge * > *self){
       if (self->size() == 0)
 	throw std::out_of_range("pop from empty container");
-      std::vector<ViewEdge*,std::allocator<ViewEdge * > >::value_type x = self->back();
+      std::vector<ViewEdge*,std::allocator< ViewEdge * > >::value_type x = self->back();
       self->pop_back();
       return x;
     }
-SWIGINTERN std::vector<ViewEdge *,std::allocator<ViewEdge * > > *std_vector_Sl_ViewEdge_Sm__Sg____getslice__(std::vector<ViewEdge * > *self,std::vector<ViewEdge * >::difference_type i,std::vector<ViewEdge * >::difference_type j){
+SWIGINTERN std::vector< ViewEdge *,std::allocator< ViewEdge * > > *std_vector_Sl_ViewEdge_Sm__Sg____getslice__(std::vector< ViewEdge * > *self,std::vector< ViewEdge * >::difference_type i,std::vector< ViewEdge * >::difference_type j){
       return swig::getslice(self, i, j);
     }
-SWIGINTERN void std_vector_Sl_ViewEdge_Sm__Sg____setslice__(std::vector<ViewEdge * > *self,std::vector<ViewEdge * >::difference_type i,std::vector<ViewEdge * >::difference_type j,std::vector<ViewEdge *,std::allocator<ViewEdge * > > const &v){
+SWIGINTERN void std_vector_Sl_ViewEdge_Sm__Sg____setslice__(std::vector< ViewEdge * > *self,std::vector< ViewEdge * >::difference_type i,std::vector< ViewEdge * >::difference_type j,std::vector< ViewEdge *,std::allocator< ViewEdge * > > const &v){
       swig::setslice(self, i, j, v);
     }
-SWIGINTERN void std_vector_Sl_ViewEdge_Sm__Sg____delslice__(std::vector<ViewEdge * > *self,std::vector<ViewEdge * >::difference_type i,std::vector<ViewEdge * >::difference_type j){
+SWIGINTERN void std_vector_Sl_ViewEdge_Sm__Sg____delslice__(std::vector< ViewEdge * > *self,std::vector< ViewEdge * >::difference_type i,std::vector< ViewEdge * >::difference_type j){
       swig::delslice(self, i, j);
     }
-SWIGINTERN void std_vector_Sl_ViewEdge_Sm__Sg____delitem__(std::vector<ViewEdge * > *self,std::vector<ViewEdge * >::difference_type i){
+SWIGINTERN void std_vector_Sl_ViewEdge_Sm__Sg____delitem__(std::vector< ViewEdge * > *self,std::vector< ViewEdge * >::difference_type i){
       self->erase(swig::getpos(self,i));
     }
-SWIGINTERN std::vector<ViewEdge * >::value_type std_vector_Sl_ViewEdge_Sm__Sg____getitem__(std::vector<ViewEdge * > *self,std::vector<ViewEdge * >::difference_type i){
+SWIGINTERN std::vector< ViewEdge * >::value_type std_vector_Sl_ViewEdge_Sm__Sg____getitem__(std::vector< ViewEdge * > *self,std::vector< ViewEdge * >::difference_type i){
       return *(swig::cgetpos(self, i));
     }
-SWIGINTERN void std_vector_Sl_ViewEdge_Sm__Sg____setitem__(std::vector<ViewEdge * > *self,std::vector<ViewEdge * >::difference_type i,std::vector<ViewEdge * >::value_type x){
+SWIGINTERN void std_vector_Sl_ViewEdge_Sm__Sg____setitem__(std::vector< ViewEdge * > *self,std::vector< ViewEdge * >::difference_type i,std::vector< ViewEdge * >::value_type x){
       *(swig::getpos(self,i)) = x;
     }
-SWIGINTERN void std_vector_Sl_ViewEdge_Sm__Sg__append(std::vector<ViewEdge * > *self,std::vector<ViewEdge * >::value_type x){
+SWIGINTERN void std_vector_Sl_ViewEdge_Sm__Sg__append(std::vector< ViewEdge * > *self,std::vector< ViewEdge * >::value_type x){
       self->push_back(x);
     }
 
@@ -5069,49 +5086,49 @@ SWIGINTERN void std_vector_Sl_ViewEdge_Sm__Sg__append(std::vector<ViewEdge * > *
 
 
       namespace swig {
-	template <>  struct traits<std::vector<FEdge*, std::allocator<FEdge * > > > {
+	template <>  struct traits<std::vector<FEdge*, std::allocator< FEdge * > > > {
 	  typedef value_category category;
 	  static const char* type_name() {
-	    return "std::vector<" "FEdge" " *," "std::allocator<FEdge * >" " >";
+	    return "std::vector<" "FEdge" " *," "std::allocator< FEdge * >" " >";
 	  }
 	};
       }
     
-SWIGINTERN swig::PySwigIterator *std_vector_Sl_FEdge_Sm__Sg__iterator(std::vector<FEdge * > *self,PyObject **PYTHON_SELF){
+SWIGINTERN swig::PySwigIterator *std_vector_Sl_FEdge_Sm__Sg__iterator(std::vector< FEdge * > *self,PyObject **PYTHON_SELF){
       return swig::make_output_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
     }
-SWIGINTERN bool std_vector_Sl_FEdge_Sm__Sg____nonzero__(std::vector<FEdge * > const *self){
+SWIGINTERN bool std_vector_Sl_FEdge_Sm__Sg____nonzero__(std::vector< FEdge * > const *self){
       return !(self->empty());
     }
-SWIGINTERN std::vector<FEdge * >::size_type std_vector_Sl_FEdge_Sm__Sg____len__(std::vector<FEdge * > const *self){
+SWIGINTERN std::vector< FEdge * >::size_type std_vector_Sl_FEdge_Sm__Sg____len__(std::vector< FEdge * > const *self){
       return self->size();
     }
-SWIGINTERN std::vector<FEdge * >::value_type std_vector_Sl_FEdge_Sm__Sg__pop(std::vector<FEdge * > *self){
+SWIGINTERN std::vector< FEdge * >::value_type std_vector_Sl_FEdge_Sm__Sg__pop(std::vector< FEdge * > *self){
       if (self->size() == 0)
 	throw std::out_of_range("pop from empty container");
-      std::vector<FEdge*,std::allocator<FEdge * > >::value_type x = self->back();
+      std::vector<FEdge*,std::allocator< FEdge * > >::value_type x = self->back();
       self->pop_back();
       return x;
     }
-SWIGINTERN std::vector<FEdge *,std::allocator<FEdge * > > *std_vector_Sl_FEdge_Sm__Sg____getslice__(std::vector<FEdge * > *self,std::vector<FEdge * >::difference_type i,std::vector<FEdge * >::difference_type j){
+SWIGINTERN std::vector< FEdge *,std::allocator< FEdge * > > *std_vector_Sl_FEdge_Sm__Sg____getslice__(std::vector< FEdge * > *self,std::vector< FEdge * >::difference_type i,std::vector< FEdge * >::difference_type j){
       return swig::getslice(self, i, j);
     }
-SWIGINTERN void std_vector_Sl_FEdge_Sm__Sg____setslice__(std::vector<FEdge * > *self,std::vector<FEdge * >::difference_type i,std::vector<FEdge * >::difference_type j,std::vector<FEdge *,std::allocator<FEdge * > > const &v){
+SWIGINTERN void std_vector_Sl_FEdge_Sm__Sg____setslice__(std::vector< FEdge * > *self,std::vector< FEdge * >::difference_type i,std::vector< FEdge * >::difference_type j,std::vector< FEdge *,std::allocator< FEdge * > > const &v){
       swig::setslice(self, i, j, v);
     }
-SWIGINTERN void std_vector_Sl_FEdge_Sm__Sg____delslice__(std::vector<FEdge * > *self,std::vector<FEdge * >::difference_type i,std::vector<FEdge * >::difference_type j){
+SWIGINTERN void std_vector_Sl_FEdge_Sm__Sg____delslice__(std::vector< FEdge * > *self,std::vector< FEdge * >::difference_type i,std::vector< FEdge * >::difference_type j){
       swig::delslice(self, i, j);
     }
-SWIGINTERN void std_vector_Sl_FEdge_Sm__Sg____delitem__(std::vector<FEdge * > *self,std::vector<FEdge * >::difference_type i){
+SWIGINTERN void std_vector_Sl_FEdge_Sm__Sg____delitem__(std::vector< FEdge * > *self,std::vector< FEdge * >::difference_type i){
       self->erase(swig::getpos(self,i));
     }
-SWIGINTERN std::vector<FEdge * >::value_type std_vector_Sl_FEdge_Sm__Sg____getitem__(std::vector<FEdge * > *self,std::vector<FEdge * >::difference_type i){
+SWIGINTERN std::vector< FEdge * >::value_type std_vector_Sl_FEdge_Sm__Sg____getitem__(std::vector< FEdge * > *self,std::vector< FEdge * >::difference_type i){
       return *(swig::cgetpos(self, i));
     }
-SWIGINTERN void std_vector_Sl_FEdge_Sm__Sg____setitem__(std::vector<FEdge * > *self,std::vector<FEdge * >::difference_type i,std::vector<FEdge * >::value_type x){
+SWIGINTERN void std_vector_Sl_FEdge_Sm__Sg____setitem__(std::vector< FEdge * > *self,std::vector< FEdge * >::difference_type i,std::vector< FEdge * >::value_type x){
       *(swig::getpos(self,i)) = x;
     }
-SWIGINTERN void std_vector_Sl_FEdge_Sm__Sg__append(std::vector<FEdge * > *self,std::vector<FEdge * >::value_type x){
+SWIGINTERN void std_vector_Sl_FEdge_Sm__Sg__append(std::vector< FEdge * > *self,std::vector< FEdge * >::value_type x){
       self->push_back(x);
     }
 
@@ -5124,49 +5141,49 @@ SWIGINTERN void std_vector_Sl_FEdge_Sm__Sg__append(std::vector<FEdge * > *self,s
 
 
       namespace swig {
-	template <>  struct traits<std::vector<ViewVertex*, std::allocator<ViewVertex * > > > {
+	template <>  struct traits<std::vector<ViewVertex*, std::allocator< ViewVertex * > > > {
 	  typedef value_category category;
 	  static const char* type_name() {
-	    return "std::vector<" "ViewVertex" " *," "std::allocator<ViewVertex * >" " >";
+	    return "std::vector<" "ViewVertex" " *," "std::allocator< ViewVertex * >" " >";
 	  }
 	};
       }
     
-SWIGINTERN swig::PySwigIterator *std_vector_Sl_ViewVertex_Sm__Sg__iterator(std::vector<ViewVertex * > *self,PyObject **PYTHON_SELF){
+SWIGINTERN swig::PySwigIterator *std_vector_Sl_ViewVertex_Sm__Sg__iterator(std::vector< ViewVertex * > *self,PyObject **PYTHON_SELF){
       return swig::make_output_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
     }
-SWIGINTERN bool std_vector_Sl_ViewVertex_Sm__Sg____nonzero__(std::vector<ViewVertex * > const *self){
+SWIGINTERN bool std_vector_Sl_ViewVertex_Sm__Sg____nonzero__(std::vector< ViewVertex * > const *self){
       return !(self->empty());
     }
-SWIGINTERN std::vector<ViewVertex * >::size_type std_vector_Sl_ViewVertex_Sm__Sg____len__(std::vector<ViewVertex * > const *self){
+SWIGINTERN std::vector< ViewVertex * >::size_type std_vector_Sl_ViewVertex_Sm__Sg____len__(std::vector< ViewVertex * > const *self){
       return self->size();
     }
-SWIGINTERN std::vector<ViewVertex * >::value_type std_vector_Sl_ViewVertex_Sm__Sg__pop(std::vector<ViewVertex * > *self){
+SWIGINTERN std::vector< ViewVertex * >::value_type std_vector_Sl_ViewVertex_Sm__Sg__pop(std::vector< ViewVertex * > *self){
       if (self->size() == 0)
 	throw std::out_of_range("pop from empty container");
-      std::vector<ViewVertex*,std::allocator<ViewVertex * > >::value_type x = self->back();
+      std::vector<ViewVertex*,std::allocator< ViewVertex * > >::value_type x = self->back();
       self->pop_back();
       return x;
     }
-SWIGINTERN std::vector<ViewVertex *,std::allocator<ViewVertex * > > *std_vector_Sl_ViewVertex_Sm__Sg____getslice__(std::vector<ViewVertex * > *self,std::vector<ViewVertex * >::difference_type i,std::vector<ViewVertex * >::difference_type j){
+SWIGINTERN std::vector< ViewVertex *,std::allocator< ViewVertex * > > *std_vector_Sl_ViewVertex_Sm__Sg____getslice__(std::vector< ViewVertex * > *self,std::vector< ViewVertex * >::difference_type i,std::vector< ViewVertex * >::difference_type j){
       return swig::getslice(self, i, j);
     }
-SWIGINTERN void std_vector_Sl_ViewVertex_Sm__Sg____setslice__(std::vector<ViewVertex * > *self,std::vector<ViewVertex * >::difference_type i,std::vector<ViewVertex * >::difference_type j,std::vector<ViewVertex *,std::allocator<ViewVertex * > > const &v){
+SWIGINTERN void std_vector_Sl_ViewVertex_Sm__Sg____setslice__(std::vector< ViewVertex * > *self,std::vector< ViewVertex * >::difference_type i,std::vector< ViewVertex * >::difference_type j,std::vector< ViewVertex *,std::allocator< ViewVertex * > > const &v){
       swig::setslice(self, i, j, v);
     }
-SWIGINTERN void std_vector_Sl_ViewVertex_Sm__Sg____delslice__(std::vector<ViewVertex * > *self,std::vector<ViewVertex * >::difference_type i,std::vector<ViewVertex * >::difference_type j){
+SWIGINTERN void std_vector_Sl_ViewVertex_Sm__Sg____delslice__(std::vector< ViewVertex * > *self,std::vector< ViewVertex * >::difference_type i,std::vector< ViewVertex * >::difference_type j){
       swig::delslice(self, i, j);
     }
-SWIGINTERN void std_vector_Sl_ViewVertex_Sm__Sg____delitem__(std::vector<ViewVertex * > *self,std::vector<ViewVertex * >::difference_type i){
+SWIGINTERN void std_vector_Sl_ViewVertex_Sm__Sg____delitem__(std::vector< ViewVertex * > *self,std::vector< ViewVertex * >::difference_type i){
       self->erase(swig::getpos(self,i));
     }
-SWIGINTERN std::vector<ViewVertex * >::value_type std_vector_Sl_ViewVertex_Sm__Sg____getitem__(std::vector<ViewVertex * > *self,std::vector<ViewVertex * >::difference_type i){
+SWIGINTERN std::vector< ViewVertex * >::value_type std_vector_Sl_ViewVertex_Sm__Sg____getitem__(std::vector< ViewVertex * > *self,std::vector< ViewVertex * >::difference_type i){
       return *(swig::cgetpos(self, i));
     }
-SWIGINTERN void std_vector_Sl_ViewVertex_Sm__Sg____setitem__(std::vector<ViewVertex * > *self,std::vector<ViewVertex * >::difference_type i,std::vector<ViewVertex * >::value_type x){
+SWIGINTERN void std_vector_Sl_ViewVertex_Sm__Sg____setitem__(std::vector< ViewVertex * > *self,std::vector< ViewVertex * >::difference_type i,std::vector< ViewVertex * >::value_type x){
       *(swig::getpos(self,i)) = x;
     }
-SWIGINTERN void std_vector_Sl_ViewVertex_Sm__Sg__append(std::vector<ViewVertex * > *self,std::vector<ViewVertex * >::value_type x){
+SWIGINTERN void std_vector_Sl_ViewVertex_Sm__Sg__append(std::vector< ViewVertex * > *self,std::vector< ViewVertex * >::value_type x){
       self->push_back(x);
     }
 
@@ -5179,49 +5196,49 @@ SWIGINTERN void std_vector_Sl_ViewVertex_Sm__Sg__append(std::vector<ViewVertex *
 
 
       namespace swig {
-	template <>  struct traits<std::vector<SVertex*, std::allocator<SVertex * > > > {
+	template <>  struct traits<std::vector<SVertex*, std::allocator< SVertex * > > > {
 	  typedef value_category category;
 	  static const char* type_name() {
-	    return "std::vector<" "SVertex" " *," "std::allocator<SVertex * >" " >";
+	    return "std::vector<" "SVertex" " *," "std::allocator< SVertex * >" " >";
 	  }
 	};
       }
     
-SWIGINTERN swig::PySwigIterator *std_vector_Sl_SVertex_Sm__Sg__iterator(std::vector<SVertex * > *self,PyObject **PYTHON_SELF){
+SWIGINTERN swig::PySwigIterator *std_vector_Sl_SVertex_Sm__Sg__iterator(std::vector< SVertex * > *self,PyObject **PYTHON_SELF){
       return swig::make_output_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
     }
-SWIGINTERN bool std_vector_Sl_SVertex_Sm__Sg____nonzero__(std::vector<SVertex * > const *self){
+SWIGINTERN bool std_vector_Sl_SVertex_Sm__Sg____nonzero__(std::vector< SVertex * > const *self){
       return !(self->empty());
     }
-SWIGINTERN std::vector<SVertex * >::size_type std_vector_Sl_SVertex_Sm__Sg____len__(std::vector<SVertex * > const *self){
+SWIGINTERN std::vector< SVertex * >::size_type std_vector_Sl_SVertex_Sm__Sg____len__(std::vector< SVertex * > const *self){
       return self->size();
     }
-SWIGINTERN std::vector<SVertex * >::value_type std_vector_Sl_SVertex_Sm__Sg__pop(std::vector<SVertex * > *self){
+SWIGINTERN std::vector< SVertex * >::value_type std_vector_Sl_SVertex_Sm__Sg__pop(std::vector< SVertex * > *self){
       if (self->size() == 0)
 	throw std::out_of_range("pop from empty container");
-      std::vector<SVertex*,std::allocator<SVertex * > >::value_type x = self->back();
+      std::vector<SVertex*,std::allocator< SVertex * > >::value_type x = self->back();
       self->pop_back();
       return x;
     }
-SWIGINTERN std::vector<SVertex *,std::allocator<SVertex * > > *std_vector_Sl_SVertex_Sm__Sg____getslice__(std::vector<SVertex * > *self,std::vector<SVertex * >::difference_type i,std::vector<SVertex * >::difference_type j){
+SWIGINTERN std::vector< SVertex *,std::allocator< SVertex * > > *std_vector_Sl_SVertex_Sm__Sg____getslice__(std::vector< SVertex * > *self,std::vector< SVertex * >::difference_type i,std::vector< SVertex * >::difference_type j){
       return swig::getslice(self, i, j);
     }
-SWIGINTERN void std_vector_Sl_SVertex_Sm__Sg____setslice__(std::vector<SVertex * > *self,std::vector<SVertex * >::difference_type i,std::vector<SVertex * >::difference_type j,std::vector<SVertex *,std::allocator<SVertex * > > const &v){
+SWIGINTERN void std_vector_Sl_SVertex_Sm__Sg____setslice__(std::vector< SVertex * > *self,std::vector< SVertex * >::difference_type i,std::vector< SVertex * >::difference_type j,std::vector< SVertex *,std::allocator< SVertex * > > const &v){
       swig::setslice(self, i, j, v);
     }
-SWIGINTERN void std_vector_Sl_SVertex_Sm__Sg____delslice__(std::vector<SVertex * > *self,std::vector<SVertex * >::difference_type i,std::vector<SVertex * >::difference_type j){
+SWIGINTERN void std_vector_Sl_SVertex_Sm__Sg____delslice__(std::vector< SVertex * > *self,std::vector< SVertex * >::difference_type i,std::vector< SVertex * >::difference_type j){
       swig::delslice(self, i, j);
     }
-SWIGINTERN void std_vector_Sl_SVertex_Sm__Sg____delitem__(std::vector<SVertex * > *self,std::vector<SVertex * >::difference_type i){
+SWIGINTERN void std_vector_Sl_SVertex_Sm__Sg____delitem__(std::vector< SVertex * > *self,std::vector< SVertex * >::difference_type i){
       self->erase(swig::getpos(self,i));
     }
-SWIGINTERN std::vector<SVertex * >::value_type std_vector_Sl_SVertex_Sm__Sg____getitem__(std::vector<SVertex * > *self,std::vector<SVertex * >::difference_type i){
+SWIGINTERN std::vector< SVertex * >::value_type std_vector_Sl_SVertex_Sm__Sg____getitem__(std::vector< SVertex * > *self,std::vector< SVertex * >::difference_type i){
       return *(swig::cgetpos(self, i));
     }
-SWIGINTERN void std_vector_Sl_SVertex_Sm__Sg____setitem__(std::vector<SVertex * > *self,std::vector<SVertex * >::difference_type i,std::vector<SVertex * >::value_type x){
+SWIGINTERN void std_vector_Sl_SVertex_Sm__Sg____setitem__(std::vector< SVertex * > *self,std::vector< SVertex * >::difference_type i,std::vector< SVertex * >::value_type x){
       *(swig::getpos(self,i)) = x;
     }
-SWIGINTERN void std_vector_Sl_SVertex_Sm__Sg__append(std::vector<SVertex * > *self,std::vector<SVertex * >::value_type x){
+SWIGINTERN void std_vector_Sl_SVertex_Sm__Sg__append(std::vector< SVertex * > *self,std::vector< SVertex * >::value_type x){
       self->push_back(x);
     }
 
@@ -5320,49 +5337,49 @@ SWIG_AsPtr_std_string (PyObject * obj, std::string **val)
 
 
       namespace swig {
-	template <>  struct traits<std::vector<StrokeShader*, std::allocator<StrokeShader * > > > {
+	template <>  struct traits<std::vector<StrokeShader*, std::allocator< StrokeShader * > > > {
 	  typedef value_category category;
 	  static const char* type_name() {
-	    return "std::vector<" "StrokeShader" " *," "std::allocator<StrokeShader * >" " >";
+	    return "std::vector<" "StrokeShader" " *," "std::allocator< StrokeShader * >" " >";
 	  }
 	};
       }
     
-SWIGINTERN swig::PySwigIterator *std_vector_Sl_StrokeShader_Sm__Sg__iterator(std::vector<StrokeShader * > *self,PyObject **PYTHON_SELF){
+SWIGINTERN swig::PySwigIterator *std_vector_Sl_StrokeShader_Sm__Sg__iterator(std::vector< StrokeShader * > *self,PyObject **PYTHON_SELF){
       return swig::make_output_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
     }
-SWIGINTERN bool std_vector_Sl_StrokeShader_Sm__Sg____nonzero__(std::vector<StrokeShader * > const *self){
+SWIGINTERN bool std_vector_Sl_StrokeShader_Sm__Sg____nonzero__(std::vector< StrokeShader * > const *self){
       return !(self->empty());
     }
-SWIGINTERN std::vector<StrokeShader * >::size_type std_vector_Sl_StrokeShader_Sm__Sg____len__(std::vector<StrokeShader * > const *self){
+SWIGINTERN std::vector< StrokeShader * >::size_type std_vector_Sl_StrokeShader_Sm__Sg____len__(std::vector< StrokeShader * > const *self){
       return self->size();
     }
-SWIGINTERN std::vector<StrokeShader * >::value_type std_vector_Sl_StrokeShader_Sm__Sg__pop(std::vector<StrokeShader * > *self){
+SWIGINTERN std::vector< StrokeShader * >::value_type std_vector_Sl_StrokeShader_Sm__Sg__pop(std::vector< StrokeShader * > *self){
       if (self->size() == 0)
 	throw std::out_of_range("pop from empty container");
-      std::vector<StrokeShader*,std::allocator<StrokeShader * > >::value_type x = self->back();
+      std::vector<StrokeShader*,std::allocator< StrokeShader * > >::value_type x = self->back();
       self->pop_back();
       return x;
     }
-SWIGINTERN std::vector<StrokeShader *,std::allocator<StrokeShader * > > *std_vector_Sl_StrokeShader_Sm__Sg____getslice__(std::vector<StrokeShader * > *self,std::vector<StrokeShader * >::difference_type i,std::vector<StrokeShader * >::difference_type j){
+SWIGINTERN std::vector< StrokeShader *,std::allocator< StrokeShader * > > *std_vector_Sl_StrokeShader_Sm__Sg____getslice__(std::vector< StrokeShader * > *self,std::vector< StrokeShader * >::difference_type i,std::vector< StrokeShader * >::difference_type j){
       return swig::getslice(self, i, j);
     }
-SWIGINTERN void std_vector_Sl_StrokeShader_Sm__Sg____setslice__(std::vector<StrokeShader * > *self,std::vector<StrokeShader * >::difference_type i,std::vector<StrokeShader * >::difference_type j,std::vector<StrokeShader *,std::allocator<StrokeShader * > > const &v){
+SWIGINTERN void std_vector_Sl_StrokeShader_Sm__Sg____setslice__(std::vector< StrokeShader * > *self,std::vector< StrokeShader * >::difference_type i,std::vector< StrokeShader * >::difference_type j,std::vector< StrokeShader *,std::allocator< StrokeShader * > > const &v){
       swig::setslice(self, i, j, v);
     }
-SWIGINTERN void std_vector_Sl_StrokeShader_Sm__Sg____delslice__(std::vector<StrokeShader * > *self,std::vector<StrokeShader * >::difference_type i,std::vector<StrokeShader * >::difference_type j){
+SWIGINTERN void std_vector_Sl_StrokeShader_Sm__Sg____delslice__(std::vector< StrokeShader * > *self,std::vector< StrokeShader * >::difference_type i,std::vector< StrokeShader * >::difference_type j){
       swig::delslice(self, i, j);
     }
-SWIGINTERN void std_vector_Sl_StrokeShader_Sm__Sg____delitem__(std::vector<StrokeShader * > *self,std::vector<StrokeShader * >::difference_type i){
+SWIGINTERN void std_vector_Sl_StrokeShader_Sm__Sg____delitem__(std::vector< StrokeShader * > *self,std::vector< StrokeShader * >::difference_type i){
       self->erase(swig::getpos(self,i));
     }
-SWIGINTERN std::vector<StrokeShader * >::value_type std_vector_Sl_StrokeShader_Sm__Sg____getitem__(std::vector<StrokeShader * > *self,std::vector<StrokeShader * >::difference_type i){
+SWIGINTERN std::vector< StrokeShader * >::value_type std_vector_Sl_StrokeShader_Sm__Sg____getitem__(std::vector< StrokeShader * > *self,std::vector< StrokeShader * >::difference_type i){
       return *(swig::cgetpos(self, i));
     }
-SWIGINTERN void std_vector_Sl_StrokeShader_Sm__Sg____setitem__(std::vector<StrokeShader * > *self,std::vector<StrokeShader * >::difference_type i,std::vector<StrokeShader * >::value_type x){
+SWIGINTERN void std_vector_Sl_StrokeShader_Sm__Sg____setitem__(std::vector< StrokeShader * > *self,std::vector< StrokeShader * >::difference_type i,std::vector< StrokeShader * >::value_type x){
       *(swig::getpos(self,i)) = x;
     }
-SWIGINTERN void std_vector_Sl_StrokeShader_Sm__Sg__append(std::vector<StrokeShader * > *self,std::vector<StrokeShader * >::value_type x){
+SWIGINTERN void std_vector_Sl_StrokeShader_Sm__Sg__append(std::vector< StrokeShader * > *self,std::vector< StrokeShader * >::value_type x){
       self->push_back(x);
     }
 
@@ -5448,7 +5465,7 @@ ViewEdge *SwigDirector_ViewEdgeViewEdgeIterator::operator *() {
     Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""ViewEdge *""'");
   }
   c_result = reinterpret_cast< ViewEdge * >(swig_argp);
-  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own);
+  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own /* & TODO: SWIG_POINTER_OWN */);
   return (ViewEdge *) c_result;
 }
 
@@ -5481,7 +5498,7 @@ ViewEdge *SwigDirector_ViewEdgeViewEdgeIterator::operator ->() {
     Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""ViewEdge *""'");
   }
   c_result = reinterpret_cast< ViewEdge * >(swig_argp);
-  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own);
+  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own /* & TODO: SWIG_POINTER_OWN */);
   return (ViewEdge *) c_result;
 }
 
@@ -5668,8 +5685,8 @@ bool SwigDirector_ViewEdgeViewEdgeIterator::operator !=(ViewEdgeInternal::ViewEd
 }
 
 
-SwigDirector_UnaryFunction0DVoid::SwigDirector_UnaryFunction0DVoid(PyObject *self): UnaryFunction0D<void >(), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction0D<void > *)this, this); 
+SwigDirector_UnaryFunction0DVoid::SwigDirector_UnaryFunction0DVoid(PyObject *self): UnaryFunction0D< void >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction0D< void > *)this, this); 
 }
 
 
@@ -5731,8 +5748,8 @@ void SwigDirector_UnaryFunction0DVoid::operator ()(Interface0DIterator &iter) {
 }
 
 
-SwigDirector_UnaryFunction0DUnsigned::SwigDirector_UnaryFunction0DUnsigned(PyObject *self): UnaryFunction0D<unsigned int >(), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction0D<unsigned int > *)this, this); 
+SwigDirector_UnaryFunction0DUnsigned::SwigDirector_UnaryFunction0DUnsigned(PyObject *self): UnaryFunction0D< unsigned int >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction0D< unsigned int > *)this, this); 
 }
 
 
@@ -5802,8 +5819,8 @@ unsigned int SwigDirector_UnaryFunction0DUnsigned::operator ()(Interface0DIterat
 }
 
 
-SwigDirector_UnaryFunction0DFloat::SwigDirector_UnaryFunction0DFloat(PyObject *self): UnaryFunction0D<float >(), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction0D<float > *)this, this); 
+SwigDirector_UnaryFunction0DFloat::SwigDirector_UnaryFunction0DFloat(PyObject *self): UnaryFunction0D< float >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction0D< float > *)this, this); 
 }
 
 
@@ -5873,8 +5890,8 @@ float SwigDirector_UnaryFunction0DFloat::operator ()(Interface0DIterator &iter)
 }
 
 
-SwigDirector_UnaryFunction0DDouble::SwigDirector_UnaryFunction0DDouble(PyObject *self): UnaryFunction0D<double >(), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction0D<double > *)this, this); 
+SwigDirector_UnaryFunction0DDouble::SwigDirector_UnaryFunction0DDouble(PyObject *self): UnaryFunction0D< double >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction0D< double > *)this, this); 
 }
 
 
@@ -5944,8 +5961,8 @@ double SwigDirector_UnaryFunction0DDouble::operator ()(Interface0DIterator &iter
 }
 
 
-SwigDirector_UnaryFunction0DVec2f::SwigDirector_UnaryFunction0DVec2f(PyObject *self): UnaryFunction0D<Geometry::Vec2f >(), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction0D<Geometry::Vec2f > *)this, this); 
+SwigDirector_UnaryFunction0DVec2f::SwigDirector_UnaryFunction0DVec2f(PyObject *self): UnaryFunction0D< Geometry::Vec2f >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction0D< Geometry::Vec2f > *)this, this); 
 }
 
 
@@ -5984,11 +6001,11 @@ std::string SwigDirector_UnaryFunction0DVec2f::getName() const {
 }
 
 
-VecMat::Vec2<float > SwigDirector_UnaryFunction0DVec2f::operator ()(Interface0DIterator &iter) {
+VecMat::Vec2< float > SwigDirector_UnaryFunction0DVec2f::operator ()(Interface0DIterator &iter) {
   void *swig_argp ;
   int swig_res = 0 ;
   
-  VecMat::Vec2<float > c_result;
+  VecMat::Vec2< float > c_result;
   swig::PyObject_var obj0;
   obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&iter), SWIGTYPE_p_Interface0DIterator,  0 );
   if (!swig_get_self()) {
@@ -6008,18 +6025,18 @@ VecMat::Vec2<float > SwigDirector_UnaryFunction0DVec2f::operator ()(Interface0DI
       Swig::DirectorMethodException::raise("Error detected when calling 'UnaryFunction0DVec2f.__call__'");
     }
   }
-  swig_res = SWIG_ConvertPtr(result,&swig_argp,SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0  | 0);
+  swig_res = SWIG_ConvertPtr(result,&swig_argp,SWIGTYPE_p_VecMat__Vec2T_float_t,  0  | 0);
   if (!SWIG_IsOK(swig_res)) {
-    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""VecMat::Vec2<float >""'");
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""VecMat::Vec2< float >""'");
   }
-  c_result = *(reinterpret_cast< VecMat::Vec2<float > * >(swig_argp));
-  if (SWIG_IsNewObj(swig_res)) delete reinterpret_cast< VecMat::Vec2<float > * >(swig_argp);
-  return (VecMat::Vec2<float >) c_result;
+  c_result = *(reinterpret_cast< VecMat::Vec2< float > * >(swig_argp));
+  if (SWIG_IsNewObj(swig_res)) delete reinterpret_cast< VecMat::Vec2< float > * >(swig_argp);
+  return (VecMat::Vec2< float >) c_result;
 }
 
 
-SwigDirector_UnaryFunction0DVec3f::SwigDirector_UnaryFunction0DVec3f(PyObject *self): UnaryFunction0D<Geometry::Vec3f >(), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction0D<Geometry::Vec3f > *)this, this); 
+SwigDirector_UnaryFunction0DVec3f::SwigDirector_UnaryFunction0DVec3f(PyObject *self): UnaryFunction0D< Geometry::Vec3f >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction0D< Geometry::Vec3f > *)this, this); 
 }
 
 
@@ -6058,11 +6075,11 @@ std::string SwigDirector_UnaryFunction0DVec3f::getName() const {
 }
 
 
-VecMat::Vec3<float > SwigDirector_UnaryFunction0DVec3f::operator ()(Interface0DIterator &iter) {
+VecMat::Vec3< float > SwigDirector_UnaryFunction0DVec3f::operator ()(Interface0DIterator &iter) {
   void *swig_argp ;
   int swig_res = 0 ;
   
-  VecMat::Vec3<float > c_result;
+  VecMat::Vec3< float > c_result;
   swig::PyObject_var obj0;
   obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&iter), SWIGTYPE_p_Interface0DIterator,  0 );
   if (!swig_get_self()) {
@@ -6082,18 +6099,18 @@ VecMat::Vec3<float > SwigDirector_UnaryFunction0DVec3f::operator ()(Interface0DI
       Swig::DirectorMethodException::raise("Error detected when calling 'UnaryFunction0DVec3f.__call__'");
     }
   }
-  swig_res = SWIG_ConvertPtr(result,&swig_argp,SWIGTYPE_p_VecMat__Vec3Tfloat_t,  0  | 0);
+  swig_res = SWIG_ConvertPtr(result,&swig_argp,SWIGTYPE_p_VecMat__Vec3T_float_t,  0  | 0);
   if (!SWIG_IsOK(swig_res)) {
-    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""VecMat::Vec3<float >""'");
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""VecMat::Vec3< float >""'");
   }
-  c_result = *(reinterpret_cast< VecMat::Vec3<float > * >(swig_argp));
-  if (SWIG_IsNewObj(swig_res)) delete reinterpret_cast< VecMat::Vec3<float > * >(swig_argp);
-  return (VecMat::Vec3<float >) c_result;
+  c_result = *(reinterpret_cast< VecMat::Vec3< float > * >(swig_argp));
+  if (SWIG_IsNewObj(swig_res)) delete reinterpret_cast< VecMat::Vec3< float > * >(swig_argp);
+  return (VecMat::Vec3< float >) c_result;
 }
 
 
-SwigDirector_UnaryFunction0DId::SwigDirector_UnaryFunction0DId(PyObject *self): UnaryFunction0D<Id >(), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction0D<Id > *)this, this); 
+SwigDirector_UnaryFunction0DId::SwigDirector_UnaryFunction0DId(PyObject *self): UnaryFunction0D< Id >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction0D< Id > *)this, this); 
 }
 
 
@@ -6166,15 +6183,15 @@ Id SwigDirector_UnaryFunction0DId::operator ()(Interface0DIterator &iter) {
 }
 
 
-SwigDirector_UnaryFunction1DVoid::SwigDirector_UnaryFunction1DVoid(PyObject *self): UnaryFunction1D<void >(), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction1D<void > *)this, this); 
+SwigDirector_UnaryFunction1DVoid::SwigDirector_UnaryFunction1DVoid(PyObject *self): UnaryFunction1D< void >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D< void > *)this, this); 
 }
 
 
 
 
-SwigDirector_UnaryFunction1DVoid::SwigDirector_UnaryFunction1DVoid(PyObject *self, IntegrationType iType): UnaryFunction1D<void >(iType), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction1D<void > *)this, this); 
+SwigDirector_UnaryFunction1DVoid::SwigDirector_UnaryFunction1DVoid(PyObject *self, IntegrationType iType): UnaryFunction1D< void >(iType), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D< void > *)this, this); 
 }
 
 
@@ -6236,15 +6253,15 @@ void SwigDirector_UnaryFunction1DVoid::operator ()(Interface1D &inter) {
 }
 
 
-SwigDirector_UnaryFunction1DUnsigned::SwigDirector_UnaryFunction1DUnsigned(PyObject *self): UnaryFunction1D<unsigned int >(), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction1D<unsigned int > *)this, this); 
+SwigDirector_UnaryFunction1DUnsigned::SwigDirector_UnaryFunction1DUnsigned(PyObject *self): UnaryFunction1D< unsigned int >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D< unsigned int > *)this, this); 
 }
 
 
 
 
-SwigDirector_UnaryFunction1DUnsigned::SwigDirector_UnaryFunction1DUnsigned(PyObject *self, IntegrationType iType): UnaryFunction1D<unsigned int >(iType), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction1D<unsigned int > *)this, this); 
+SwigDirector_UnaryFunction1DUnsigned::SwigDirector_UnaryFunction1DUnsigned(PyObject *self, IntegrationType iType): UnaryFunction1D< unsigned int >(iType), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D< unsigned int > *)this, this); 
 }
 
 
@@ -6314,15 +6331,15 @@ unsigned int SwigDirector_UnaryFunction1DUnsigned::operator ()(Interface1D &inte
 }
 
 
-SwigDirector_UnaryFunction1DFloat::SwigDirector_UnaryFunction1DFloat(PyObject *self): UnaryFunction1D<float >(), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction1D<float > *)this, this); 
+SwigDirector_UnaryFunction1DFloat::SwigDirector_UnaryFunction1DFloat(PyObject *self): UnaryFunction1D< float >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D< float > *)this, this); 
 }
 
 
 
 
-SwigDirector_UnaryFunction1DFloat::SwigDirector_UnaryFunction1DFloat(PyObject *self, IntegrationType iType): UnaryFunction1D<float >(iType), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction1D<float > *)this, this); 
+SwigDirector_UnaryFunction1DFloat::SwigDirector_UnaryFunction1DFloat(PyObject *self, IntegrationType iType): UnaryFunction1D< float >(iType), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D< float > *)this, this); 
 }
 
 
@@ -6392,15 +6409,15 @@ float SwigDirector_UnaryFunction1DFloat::operator ()(Interface1D &inter) {
 }
 
 
-SwigDirector_UnaryFunction1DDouble::SwigDirector_UnaryFunction1DDouble(PyObject *self): UnaryFunction1D<double >(), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction1D<double > *)this, this); 
+SwigDirector_UnaryFunction1DDouble::SwigDirector_UnaryFunction1DDouble(PyObject *self): UnaryFunction1D< double >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D< double > *)this, this); 
 }
 
 
 
 
-SwigDirector_UnaryFunction1DDouble::SwigDirector_UnaryFunction1DDouble(PyObject *self, IntegrationType iType): UnaryFunction1D<double >(iType), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction1D<double > *)this, this); 
+SwigDirector_UnaryFunction1DDouble::SwigDirector_UnaryFunction1DDouble(PyObject *self, IntegrationType iType): UnaryFunction1D< double >(iType), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D< double > *)this, this); 
 }
 
 
@@ -6470,15 +6487,15 @@ double SwigDirector_UnaryFunction1DDouble::operator ()(Interface1D &inter) {
 }
 
 
-SwigDirector_UnaryFunction1DVec2f::SwigDirector_UnaryFunction1DVec2f(PyObject *self): UnaryFunction1D<Geometry::Vec2f >(), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction1D<Geometry::Vec2f > *)this, this); 
+SwigDirector_UnaryFunction1DVec2f::SwigDirector_UnaryFunction1DVec2f(PyObject *self): UnaryFunction1D< Geometry::Vec2f >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D< Geometry::Vec2f > *)this, this); 
 }
 
 
 
 
-SwigDirector_UnaryFunction1DVec2f::SwigDirector_UnaryFunction1DVec2f(PyObject *self, IntegrationType iType): UnaryFunction1D<Geometry::Vec2f >(iType), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction1D<Geometry::Vec2f > *)this, this); 
+SwigDirector_UnaryFunction1DVec2f::SwigDirector_UnaryFunction1DVec2f(PyObject *self, IntegrationType iType): UnaryFunction1D< Geometry::Vec2f >(iType), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D< Geometry::Vec2f > *)this, this); 
 }
 
 
@@ -6517,11 +6534,11 @@ std::string SwigDirector_UnaryFunction1DVec2f::getName() const {
 }
 
 
-VecMat::Vec2<float > SwigDirector_UnaryFunction1DVec2f::operator ()(Interface1D &inter) {
+VecMat::Vec2< float > SwigDirector_UnaryFunction1DVec2f::operator ()(Interface1D &inter) {
   void *swig_argp ;
   int swig_res = 0 ;
   
-  VecMat::Vec2<float > c_result;
+  VecMat::Vec2< float > c_result;
   swig::PyObject_var obj0;
   obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&inter), SWIGTYPE_p_Interface1D,  0 );
   if (!swig_get_self()) {
@@ -6541,25 +6558,25 @@ VecMat::Vec2<float > SwigDirector_UnaryFunction1DVec2f::operator ()(Interface1D
       Swig::DirectorMethodException::raise("Error detected when calling 'UnaryFunction1DVec2f.__call__'");
     }
   }
-  swig_res = SWIG_ConvertPtr(result,&swig_argp,SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0  | 0);
+  swig_res = SWIG_ConvertPtr(result,&swig_argp,SWIGTYPE_p_VecMat__Vec2T_float_t,  0  | 0);
   if (!SWIG_IsOK(swig_res)) {
-    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""VecMat::Vec2<float >""'");
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""VecMat::Vec2< float >""'");
   }
-  c_result = *(reinterpret_cast< VecMat::Vec2<float > * >(swig_argp));
-  if (SWIG_IsNewObj(swig_res)) delete reinterpret_cast< VecMat::Vec2<float > * >(swig_argp);
-  return (VecMat::Vec2<float >) c_result;
+  c_result = *(reinterpret_cast< VecMat::Vec2< float > * >(swig_argp));
+  if (SWIG_IsNewObj(swig_res)) delete reinterpret_cast< VecMat::Vec2< float > * >(swig_argp);
+  return (VecMat::Vec2< float >) c_result;
 }
 
 
-SwigDirector_UnaryFunction1DVec3f::SwigDirector_UnaryFunction1DVec3f(PyObject *self): UnaryFunction1D<Geometry::Vec3f >(), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction1D<Geometry::Vec3f > *)this, this); 
+SwigDirector_UnaryFunction1DVec3f::SwigDirector_UnaryFunction1DVec3f(PyObject *self): UnaryFunction1D< Geometry::Vec3f >(), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D< Geometry::Vec3f > *)this, this); 
 }
 
 
 
 
-SwigDirector_UnaryFunction1DVec3f::SwigDirector_UnaryFunction1DVec3f(PyObject *self, IntegrationType iType): UnaryFunction1D<Geometry::Vec3f >(iType), Swig::Director(self) {
-  SWIG_DIRECTOR_RGTR((UnaryFunction1D<Geometry::Vec3f > *)this, this); 
+SwigDirector_UnaryFunction1DVec3f::SwigDirector_UnaryFunction1DVec3f(PyObject *self, IntegrationType iType): UnaryFunction1D< Geometry::Vec3f >(iType), Swig::Director(self) {
+  SWIG_DIRECTOR_RGTR((UnaryFunction1D< Geometry::Vec3f > *)this, this); 
 }
 
 
@@ -6598,11 +6615,11 @@ std::string SwigDirector_UnaryFunction1DVec3f::getName() const {
 }
 
 
-VecMat::Vec3<float > SwigDirector_UnaryFunction1DVec3f::operator ()(Interface1D &inter) {
+VecMat::Vec3< float > SwigDirector_UnaryFunction1DVec3f::operator ()(Interface1D &inter) {
   void *swig_argp ;
   int swig_res = 0 ;
   
-  VecMat::Vec3<float > c_result;
+  VecMat::Vec3< float > c_result;
   swig::PyObject_var obj0;
   obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(&inter), SWIGTYPE_p_Interface1D,  0 );
   if (!swig_get_self()) {
@@ -6622,13 +6639,13 @@ VecMat::Vec3<float > SwigDirector_UnaryFunction1DVec3f::operator ()(Interface1D
       Swig::DirectorMethodException::raise("Error detected when calling 'UnaryFunction1DVec3f.__call__'");
     }
   }
-  swig_res = SWIG_ConvertPtr(result,&swig_argp,SWIGTYPE_p_VecMat__Vec3Tfloat_t,  0  | 0);
+  swig_res = SWIG_ConvertPtr(result,&swig_argp,SWIGTYPE_p_VecMat__Vec3T_float_t,  0  | 0);
   if (!SWIG_IsOK(swig_res)) {
-    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""VecMat::Vec3<float >""'");
+    Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""VecMat::Vec3< float >""'");
   }
-  c_result = *(reinterpret_cast< VecMat::Vec3<float > * >(swig_argp));
-  if (SWIG_IsNewObj(swig_res)) delete reinterpret_cast< VecMat::Vec3<float > * >(swig_argp);
-  return (VecMat::Vec3<float >) c_result;
+  c_result = *(reinterpret_cast< VecMat::Vec3< float > * >(swig_argp));
+  if (SWIG_IsNewObj(swig_res)) delete reinterpret_cast< VecMat::Vec3< float > * >(swig_argp);
+  return (VecMat::Vec3< float >) c_result;
 }
 
 
@@ -6707,7 +6724,7 @@ ViewEdge *SwigDirector_ChainingIterator::operator *() {
     Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""ViewEdge *""'");
   }
   c_result = reinterpret_cast< ViewEdge * >(swig_argp);
-  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own);
+  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own /* & TODO: SWIG_POINTER_OWN */);
   return (ViewEdge *) c_result;
 }
 
@@ -6740,7 +6757,7 @@ ViewEdge *SwigDirector_ChainingIterator::operator ->() {
     Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""ViewEdge *""'");
   }
   c_result = reinterpret_cast< ViewEdge * >(swig_argp);
-  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own);
+  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own /* & TODO: SWIG_POINTER_OWN */);
   return (ViewEdge *) c_result;
 }
 
@@ -6978,7 +6995,7 @@ ViewEdge *SwigDirector_ChainingIterator::traverse(AdjacencyIterator const &it) {
     Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""ViewEdge *""'");
   }
   c_result = reinterpret_cast< ViewEdge * >(swig_argp);
-  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own);
+  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own /* & TODO: SWIG_POINTER_OWN */);
   return (ViewEdge *) c_result;
 }
 
@@ -7058,7 +7075,7 @@ ViewEdge *SwigDirector_ChainSilhouetteIterator::operator *() {
     Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""ViewEdge *""'");
   }
   c_result = reinterpret_cast< ViewEdge * >(swig_argp);
-  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own);
+  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own /* & TODO: SWIG_POINTER_OWN */);
   return (ViewEdge *) c_result;
 }
 
@@ -7091,7 +7108,7 @@ ViewEdge *SwigDirector_ChainSilhouetteIterator::operator ->() {
     Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""ViewEdge *""'");
   }
   c_result = reinterpret_cast< ViewEdge * >(swig_argp);
-  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own);
+  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own /* & TODO: SWIG_POINTER_OWN */);
   return (ViewEdge *) c_result;
 }
 
@@ -7329,7 +7346,7 @@ ViewEdge *SwigDirector_ChainSilhouetteIterator::traverse(AdjacencyIterator const
     Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""ViewEdge *""'");
   }
   c_result = reinterpret_cast< ViewEdge * >(swig_argp);
-  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own);
+  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own /* & TODO: SWIG_POINTER_OWN */);
   return (ViewEdge *) c_result;
 }
 
@@ -7416,7 +7433,7 @@ ViewEdge *SwigDirector_ChainPredicateIterator::operator *() {
     Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""ViewEdge *""'");
   }
   c_result = reinterpret_cast< ViewEdge * >(swig_argp);
-  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own);
+  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own /* & TODO: SWIG_POINTER_OWN */);
   return (ViewEdge *) c_result;
 }
 
@@ -7449,7 +7466,7 @@ ViewEdge *SwigDirector_ChainPredicateIterator::operator ->() {
     Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""ViewEdge *""'");
   }
   c_result = reinterpret_cast< ViewEdge * >(swig_argp);
-  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own);
+  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own /* & TODO: SWIG_POINTER_OWN */);
   return (ViewEdge *) c_result;
 }
 
@@ -7687,7 +7704,7 @@ ViewEdge *SwigDirector_ChainPredicateIterator::traverse(AdjacencyIterator const
     Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""ViewEdge *""'");
   }
   c_result = reinterpret_cast< ViewEdge * >(swig_argp);
-  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own);
+  swig_acquire_ownership_obj(SWIG_as_voidptr(c_result), own /* & TODO: SWIG_POINTER_OWN */);
   return (ViewEdge *) c_result;
 }
 
@@ -8106,7 +8123,7 @@ SWIGINTERN PyObject *_wrap_PySwigIterator_incr(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -8136,7 +8153,10 @@ SWIGINTERN PyObject *_wrap_PySwigIterator_incr(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'PySwigIterator_incr'.\n  Possible C/C++ prototypes are:\n    incr(size_t)\n    incr()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'PySwigIterator_incr'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    incr(swig::PySwigIterator *,size_t)\n"
+    "    incr(swig::PySwigIterator *)\n");
   return NULL;
 }
 
@@ -8220,7 +8240,7 @@ SWIGINTERN PyObject *_wrap_PySwigIterator_decr(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -8250,7 +8270,10 @@ SWIGINTERN PyObject *_wrap_PySwigIterator_decr(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'PySwigIterator_decr'.\n  Possible C/C++ prototypes are:\n    decr(size_t)\n    decr()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'PySwigIterator_decr'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    decr(swig::PySwigIterator *,size_t)\n"
+    "    decr(swig::PySwigIterator *)\n");
   return NULL;
 }
 
@@ -8740,7 +8763,7 @@ SWIGINTERN PyObject *_wrap_PySwigIterator___sub__(PyObject *self, PyObject *args
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -8781,14 +8804,14 @@ fail:
 
 SWIGINTERN PyObject *PySwigIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_swig__PySwigIterator, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_vectorInt_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   PyObject **arg2 = (PyObject **) 0 ;
   swig::PySwigIterator *result = 0 ;
   void *argp1 = 0 ;
@@ -8797,11 +8820,11 @@ SWIGINTERN PyObject *_wrap_vectorInt_iterator(PyObject *SWIGUNUSEDPARM(self), Py
   
   arg2 = &obj0;
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_iterator" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_iterator" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   result = (swig::PySwigIterator *)std_vector_Sl_int_Sg__iterator(arg1,arg2);
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__PySwigIterator, SWIG_POINTER_OWN |  0 );
   return resultobj;
@@ -8812,19 +8835,19 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt___nonzero__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt___nonzero__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___nonzero__" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___nonzero__" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
-  result = (bool)std_vector_Sl_int_Sg____nonzero__((std::vector<int > const *)arg1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
+  result = (bool)std_vector_Sl_int_Sg____nonzero__((std::vector< int > const *)arg1);
   resultobj = SWIG_From_bool(static_cast< bool >(result));
   return resultobj;
 fail:
@@ -8834,19 +8857,19 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt___len__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::size_type result;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt___len__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___len__" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___len__" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
-  result = std_vector_Sl_int_Sg____len__((std::vector<int > const *)arg1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
+  result = std_vector_Sl_int_Sg____len__((std::vector< int > const *)arg1);
   resultobj = SWIG_From_size_t(static_cast< size_t >(result));
   return resultobj;
 fail:
@@ -8856,20 +8879,20 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::value_type result;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_pop" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_pop" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   try {
-    result = (std::vector<int >::value_type)std_vector_Sl_int_Sg__pop(arg1);
+    result = (std::vector< int >::value_type)std_vector_Sl_int_Sg__pop(arg1);
   }
   catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -8884,10 +8907,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::difference_type arg2 ;
-  std::vector<int >::difference_type arg3 ;
-  std::vector<int,std::allocator<int > > *result = 0 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::difference_type arg2 ;
+  std::vector< int >::difference_type arg3 ;
+  std::vector< int,std::allocator< int > > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -8899,29 +8922,29 @@ SWIGINTERN PyObject *_wrap_vectorInt___getslice__(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:vectorInt___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___getslice__" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___getslice__" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt___getslice__" "', argument " "2"" of type '" "std::vector<int >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt___getslice__" "', argument " "2"" of type '" "std::vector< int >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<int >::difference_type >(val2);
+  arg2 = static_cast< std::vector< int >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt___getslice__" "', argument " "3"" of type '" "std::vector<int >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt___getslice__" "', argument " "3"" of type '" "std::vector< int >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<int >::difference_type >(val3);
+  arg3 = static_cast< std::vector< int >::difference_type >(val3);
   try {
-    result = (std::vector<int,std::allocator<int > > *)std_vector_Sl_int_Sg____getslice__(arg1,arg2,arg3);
+    result = (std::vector< int,std::allocator< int > > *)std_vector_Sl_int_Sg____getslice__(arg1,arg2,arg3);
   }
   catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
   
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -8930,10 +8953,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt___setslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::difference_type arg2 ;
-  std::vector<int >::difference_type arg3 ;
-  std::vector<int,std::allocator<int > > *arg4 = 0 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::difference_type arg2 ;
+  std::vector< int >::difference_type arg3 ;
+  std::vector< int,std::allocator< int > > *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -8947,34 +8970,34 @@ SWIGINTERN PyObject *_wrap_vectorInt___setslice__(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:vectorInt___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___setslice__" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___setslice__" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt___setslice__" "', argument " "2"" of type '" "std::vector<int >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt___setslice__" "', argument " "2"" of type '" "std::vector< int >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<int >::difference_type >(val2);
+  arg2 = static_cast< std::vector< int >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt___setslice__" "', argument " "3"" of type '" "std::vector<int >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt___setslice__" "', argument " "3"" of type '" "std::vector< int >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<int >::difference_type >(val3);
+  arg3 = static_cast< std::vector< int >::difference_type >(val3);
   {
-    std::vector<int,std::allocator<int > > *ptr = (std::vector<int,std::allocator<int > > *)0;
+    std::vector<int,std::allocator< int > > *ptr = (std::vector<int,std::allocator< int > > *)0;
     res4 = swig::asptr(obj3, &ptr);
     if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vectorInt___setslice__" "', argument " "4"" of type '" "std::vector<int,std::allocator<int > > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vectorInt___setslice__" "', argument " "4"" of type '" "std::vector< int,std::allocator< int > > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vectorInt___setslice__" "', argument " "4"" of type '" "std::vector<int,std::allocator<int > > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vectorInt___setslice__" "', argument " "4"" of type '" "std::vector< int,std::allocator< int > > const &""'"); 
     }
     arg4 = ptr;
   }
   try {
-    std_vector_Sl_int_Sg____setslice__(arg1,arg2,arg3,(std::vector<int,std::allocator<int > > const &)*arg4);
+    std_vector_Sl_int_Sg____setslice__(arg1,arg2,arg3,(std::vector< int,std::allocator< int > > const &)*arg4);
   }
   catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -8994,9 +9017,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt___delslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::difference_type arg2 ;
-  std::vector<int >::difference_type arg3 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::difference_type arg2 ;
+  std::vector< int >::difference_type arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -9008,21 +9031,21 @@ SWIGINTERN PyObject *_wrap_vectorInt___delslice__(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:vectorInt___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___delslice__" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___delslice__" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt___delslice__" "', argument " "2"" of type '" "std::vector<int >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt___delslice__" "', argument " "2"" of type '" "std::vector< int >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<int >::difference_type >(val2);
+  arg2 = static_cast< std::vector< int >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt___delslice__" "', argument " "3"" of type '" "std::vector<int >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt___delslice__" "', argument " "3"" of type '" "std::vector< int >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<int >::difference_type >(val3);
+  arg3 = static_cast< std::vector< int >::difference_type >(val3);
   try {
     std_vector_Sl_int_Sg____delslice__(arg1,arg2,arg3);
   }
@@ -9039,8 +9062,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt___delitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::difference_type arg2 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::difference_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -9049,16 +9072,16 @@ SWIGINTERN PyObject *_wrap_vectorInt___delitem__(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:vectorInt___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___delitem__" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___delitem__" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt___delitem__" "', argument " "2"" of type '" "std::vector<int >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt___delitem__" "', argument " "2"" of type '" "std::vector< int >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<int >::difference_type >(val2);
+  arg2 = static_cast< std::vector< int >::difference_type >(val2);
   try {
     std_vector_Sl_int_Sg____delitem__(arg1,arg2);
   }
@@ -9075,9 +9098,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt___getitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::difference_type arg2 ;
-  std::vector<int >::value_type *result = 0 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::difference_type arg2 ;
+  std::vector< int >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -9086,20 +9109,20 @@ SWIGINTERN PyObject *_wrap_vectorInt___getitem__(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:vectorInt___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___getitem__" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___getitem__" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt___getitem__" "', argument " "2"" of type '" "std::vector<int >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt___getitem__" "', argument " "2"" of type '" "std::vector< int >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<int >::difference_type >(val2);
+  arg2 = static_cast< std::vector< int >::difference_type >(val2);
   try {
     {
-      std::vector<int >::value_type const &_result_ref = std_vector_Sl_int_Sg____getitem__((std::vector<int > const *)arg1,arg2);
-      result = (std::vector<int >::value_type *) &_result_ref;
+      std::vector< int >::value_type const &_result_ref = std_vector_Sl_int_Sg____getitem__((std::vector< int > const *)arg1,arg2);
+      result = (std::vector< int >::value_type *) &_result_ref;
     }
   }
   catch(std::out_of_range &_e) {
@@ -9115,14 +9138,14 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt___setitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::difference_type arg2 ;
-  std::vector<int >::value_type *arg3 = 0 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::difference_type arg2 ;
+  std::vector< int >::value_type *arg3 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  std::vector<int >::value_type temp3 ;
+  std::vector< int >::value_type temp3 ;
   int val3 ;
   int ecode3 = 0 ;
   PyObject * obj0 = 0 ;
@@ -9130,21 +9153,21 @@ SWIGINTERN PyObject *_wrap_vectorInt___setitem__(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:vectorInt___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___setitem__" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt___setitem__" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt___setitem__" "', argument " "2"" of type '" "std::vector<int >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt___setitem__" "', argument " "2"" of type '" "std::vector< int >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<int >::difference_type >(val2);
+  arg2 = static_cast< std::vector< int >::difference_type >(val2);
   ecode3 = SWIG_AsVal_int(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt___setitem__" "', argument " "3"" of type '" "std::vector<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt___setitem__" "', argument " "3"" of type '" "std::vector< int >::value_type""'");
   } 
-  temp3 = static_cast< std::vector<int >::value_type >(val3);
+  temp3 = static_cast< std::vector< int >::value_type >(val3);
   arg3 = &temp3;
   try {
     std_vector_Sl_int_Sg____setitem__(arg1,arg2,(int const &)*arg3);
@@ -9162,27 +9185,27 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::value_type *arg2 = 0 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::value_type *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  std::vector<int >::value_type temp2 ;
+  std::vector< int >::value_type temp2 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:vectorInt_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_append" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_append" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt_append" "', argument " "2"" of type '" "std::vector<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt_append" "', argument " "2"" of type '" "std::vector< int >::value_type""'");
   } 
-  temp2 = static_cast< std::vector<int >::value_type >(val2);
+  temp2 = static_cast< std::vector< int >::value_type >(val2);
   arg2 = &temp2;
   std_vector_Sl_int_Sg__append(arg1,(int const &)*arg2);
   resultobj = SWIG_Py_Void();
@@ -9194,11 +9217,11 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_vectorInt__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *result = 0 ;
+  std::vector< int > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_vectorInt")) SWIG_fail;
-  result = (std::vector<int > *)new std::vector<int >();
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, SWIG_POINTER_NEW |  0 );
+  result = (std::vector< int > *)new std::vector< int >();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -9207,25 +9230,25 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_vectorInt__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = 0 ;
-  std::vector<int > *result = 0 ;
+  std::vector< int > *arg1 = 0 ;
+  std::vector< int > *result = 0 ;
   int res1 = SWIG_OLDOBJ ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_vectorInt",&obj0)) SWIG_fail;
   {
-    std::vector<int,std::allocator<int > > *ptr = (std::vector<int,std::allocator<int > > *)0;
+    std::vector<int,std::allocator< int > > *ptr = (std::vector<int,std::allocator< int > > *)0;
     res1 = swig::asptr(obj0, &ptr);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_vectorInt" "', argument " "1"" of type '" "std::vector<int > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_vectorInt" "', argument " "1"" of type '" "std::vector< int > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_vectorInt" "', argument " "1"" of type '" "std::vector<int > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_vectorInt" "', argument " "1"" of type '" "std::vector< int > const &""'"); 
     }
     arg1 = ptr;
   }
-  result = (std::vector<int > *)new std::vector<int >((std::vector<int > const &)*arg1);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, SWIG_POINTER_NEW |  0 );
+  result = (std::vector< int > *)new std::vector< int >((std::vector< int > const &)*arg1);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, SWIG_POINTER_NEW |  0 );
   if (SWIG_IsNewObj(res1)) delete arg1;
   return resultobj;
 fail:
@@ -9236,19 +9259,19 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_empty",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_empty" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_empty" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
-  result = (bool)((std::vector<int > const *)arg1)->empty();
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
+  result = (bool)((std::vector< int > const *)arg1)->empty();
   resultobj = SWIG_From_bool(static_cast< bool >(result));
   return resultobj;
 fail:
@@ -9258,19 +9281,19 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::size_type result;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_size" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_size" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
-  result = ((std::vector<int > const *)arg1)->size();
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
+  result = ((std::vector< int > const *)arg1)->size();
   resultobj = SWIG_From_size_t(static_cast< size_t >(result));
   return resultobj;
 fail:
@@ -9280,17 +9303,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_clear" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_clear" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   (arg1)->clear();
   resultobj = SWIG_Py_Void();
   return resultobj;
@@ -9301,8 +9324,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int > *arg2 = 0 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -9311,19 +9334,19 @@ SWIGINTERN PyObject *_wrap_vectorInt_swap(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:vectorInt_swap",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_swap" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_swap" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t,  0 );
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vectorInt_swap" "', argument " "2"" of type '" "std::vector<int > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vectorInt_swap" "', argument " "2"" of type '" "std::vector< int > &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vectorInt_swap" "', argument " "2"" of type '" "std::vector<int > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vectorInt_swap" "', argument " "2"" of type '" "std::vector< int > &""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<int > * >(argp2);
+  arg2 = reinterpret_cast< std::vector< int > * >(argp2);
   (arg1)->swap(*arg2);
   resultobj = SWIG_Py_Void();
   return resultobj;
@@ -9334,42 +9357,42 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  SwigValueWrapper<std::allocator<int > > result;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  SwigValueWrapper< std::allocator< int > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_get_allocator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_get_allocator" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_get_allocator" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
-  result = ((std::vector<int > const *)arg1)->get_allocator();
-  resultobj = SWIG_NewPointerObj((new std::vector<int >::allocator_type(static_cast< const std::vector<int >::allocator_type& >(result))), SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
+  result = ((std::vector< int > const *)arg1)->get_allocator();
+  resultobj = SWIG_NewPointerObj((new std::vector< int >::allocator_type(static_cast< const std::vector< int >::allocator_type& >(result))), SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorInt_begin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vectorInt_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::iterator result;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::const_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_begin" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_begin" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
-  result = (arg1)->begin();
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<int >::iterator & >(result)),
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
+  result = ((std::vector< int > const *)arg1)->begin();
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< int >::const_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -9377,78 +9400,22 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorInt_begin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vectorInt_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::const_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_begin" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
-  result = ((std::vector<int > const *)arg1)->begin();
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<int >::const_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_vectorInt_begin(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_vectorInt_begin__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_vectorInt_begin__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'vectorInt_begin'.\n  Possible C/C++ prototypes are:\n    begin()\n    begin()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_vectorInt_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::iterator result;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::const_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_end" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_end" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
-  result = (arg1)->end();
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<int >::iterator & >(result)),
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
+  result = ((std::vector< int > const *)arg1)->end();
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< int >::const_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -9456,78 +9423,22 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorInt_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vectorInt_rbegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::const_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_end" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
-  result = ((std::vector<int > const *)arg1)->end();
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<int >::const_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_vectorInt_end(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_vectorInt_end__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_vectorInt_end__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'vectorInt_end'.\n  Possible C/C++ prototypes are:\n    end()\n    end()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_vectorInt_rbegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::reverse_iterator result;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::const_reverse_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_rbegin" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_rbegin" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
-  result = (arg1)->rbegin();
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<int >::reverse_iterator & >(result)),
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
+  result = ((std::vector< int > const *)arg1)->rbegin();
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< int >::const_reverse_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -9535,78 +9446,22 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorInt_rbegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_vectorInt_rend(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::const_reverse_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_rbegin" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
-  result = ((std::vector<int > const *)arg1)->rbegin();
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<int >::const_reverse_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_vectorInt_rbegin(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_vectorInt_rbegin__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_vectorInt_rbegin__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'vectorInt_rbegin'.\n  Possible C/C++ prototypes are:\n    rbegin()\n    rbegin()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_vectorInt_rend__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::reverse_iterator result;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::const_reverse_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_rend" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_rend" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
-  result = (arg1)->rend();
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<int >::reverse_iterator & >(result)),
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
+  result = ((std::vector< int > const *)arg1)->rend();
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< int >::const_reverse_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -9614,66 +9469,10 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_vectorInt_rend__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::const_reverse_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_rend" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
-  result = ((std::vector<int > const *)arg1)->rend();
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<int >::const_reverse_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_vectorInt_rend(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_vectorInt_rend__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_vectorInt_rend__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'vectorInt_rend'.\n  Possible C/C++ prototypes are:\n    rend()\n    rend()\n");
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_new_vectorInt__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int >::size_type arg1 ;
-  std::vector<int > *result = 0 ;
+  std::vector< int >::size_type arg1 ;
+  std::vector< int > *result = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -9681,11 +9480,11 @@ SWIGINTERN PyObject *_wrap_new_vectorInt__SWIG_2(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"O:new_vectorInt",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vectorInt" "', argument " "1"" of type '" "std::vector<int >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vectorInt" "', argument " "1"" of type '" "std::vector< int >::size_type""'");
   } 
-  arg1 = static_cast< std::vector<int >::size_type >(val1);
-  result = (std::vector<int > *)new std::vector<int >(arg1);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, SWIG_POINTER_NEW |  0 );
+  arg1 = static_cast< std::vector< int >::size_type >(val1);
+  result = (std::vector< int > *)new std::vector< int >(arg1);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -9694,17 +9493,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_pop_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_pop_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_pop_back" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_pop_back" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   (arg1)->pop_back();
   resultobj = SWIG_Py_Void();
   return resultobj;
@@ -9715,8 +9514,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::size_type arg2 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::size_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -9725,16 +9524,16 @@ SWIGINTERN PyObject *_wrap_vectorInt_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:vectorInt_resize",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_resize" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_resize" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt_resize" "', argument " "2"" of type '" "std::vector<int >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt_resize" "', argument " "2"" of type '" "std::vector< int >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<int >::size_type >(val2);
+  arg2 = static_cast< std::vector< int >::size_type >(val2);
   (arg1)->resize(arg2);
   resultobj = SWIG_Py_Void();
   return resultobj;
@@ -9745,9 +9544,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::iterator arg2 ;
-  std::vector<int >::iterator result;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::iterator arg2 ;
+  std::vector< int >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -9756,24 +9555,24 @@ SWIGINTERN PyObject *_wrap_vectorInt_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:vectorInt_erase",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_erase" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_erase" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_erase" "', argument " "2"" of type '" "std::vector<int >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_erase" "', argument " "2"" of type '" "std::vector< int >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<int >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<int >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< int >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< int >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_erase" "', argument " "2"" of type '" "std::vector<int >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_erase" "', argument " "2"" of type '" "std::vector< int >::iterator""'");
     }
   }
   result = (arg1)->erase(arg2);
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<int >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< int >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -9783,10 +9582,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::iterator arg2 ;
-  std::vector<int >::iterator arg3 ;
-  std::vector<int >::iterator result;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::iterator arg2 ;
+  std::vector< int >::iterator arg3 ;
+  std::vector< int >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -9798,35 +9597,35 @@ SWIGINTERN PyObject *_wrap_vectorInt_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:vectorInt_erase",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_erase" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_erase" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_erase" "', argument " "2"" of type '" "std::vector<int >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_erase" "', argument " "2"" of type '" "std::vector< int >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<int >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<int >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< int >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< int >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_erase" "', argument " "2"" of type '" "std::vector<int >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_erase" "', argument " "2"" of type '" "std::vector< int >::iterator""'");
     }
   }
   res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res3) || !iter3) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_erase" "', argument " "3"" of type '" "std::vector<int >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_erase" "', argument " "3"" of type '" "std::vector< int >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<int >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<int >::iterator > *>(iter3);
+    swig::PySwigIterator_T<std::vector< int >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< int >::iterator > *>(iter3);
     if (iter_t) {
       arg3 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_erase" "', argument " "3"" of type '" "std::vector<int >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_erase" "', argument " "3"" of type '" "std::vector< int >::iterator""'");
     }
   }
   result = (arg1)->erase(arg2,arg3);
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<int >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< int >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -9840,18 +9639,18 @@ SWIGINTERN PyObject *_wrap_vectorInt_erase(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<int >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< int >::iterator > *>(iter) != 0));
       if (_v) {
         return _wrap_vectorInt_erase__SWIG_0(self, args);
       }
@@ -9859,16 +9658,16 @@ SWIGINTERN PyObject *_wrap_vectorInt_erase(PyObject *self, PyObject *args) {
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<int >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< int >::iterator > *>(iter) != 0));
       if (_v) {
         swig::PySwigIterator *iter = 0;
         int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<int >::iterator > *>(iter) != 0));
+        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< int >::iterator > *>(iter) != 0));
         if (_v) {
           return _wrap_vectorInt_erase__SWIG_1(self, args);
         }
@@ -9877,19 +9676,22 @@ SWIGINTERN PyObject *_wrap_vectorInt_erase(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'vectorInt_erase'.\n  Possible C/C++ prototypes are:\n    erase(std::vector<int >::iterator)\n    erase(std::vector<int >::iterator,std::vector<int >::iterator)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'vectorInt_erase'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    erase(std::vector< int > *,std::vector< int >::iterator)\n"
+    "    erase(std::vector< int > *,std::vector< int >::iterator,std::vector< int >::iterator)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_new_vectorInt__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int >::size_type arg1 ;
-  std::vector<int >::value_type *arg2 = 0 ;
-  std::vector<int > *result = 0 ;
+  std::vector< int >::size_type arg1 ;
+  std::vector< int >::value_type *arg2 = 0 ;
+  std::vector< int > *result = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
-  std::vector<int >::value_type temp2 ;
+  std::vector< int >::value_type temp2 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
@@ -9898,17 +9700,17 @@ SWIGINTERN PyObject *_wrap_new_vectorInt__SWIG_3(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTuple(args,(char *)"OO:new_vectorInt",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vectorInt" "', argument " "1"" of type '" "std::vector<int >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_vectorInt" "', argument " "1"" of type '" "std::vector< int >::size_type""'");
   } 
-  arg1 = static_cast< std::vector<int >::size_type >(val1);
+  arg1 = static_cast< std::vector< int >::size_type >(val1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_vectorInt" "', argument " "2"" of type '" "std::vector<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_vectorInt" "', argument " "2"" of type '" "std::vector< int >::value_type""'");
   } 
-  temp2 = static_cast< std::vector<int >::value_type >(val2);
+  temp2 = static_cast< std::vector< int >::value_type >(val2);
   arg2 = &temp2;
-  result = (std::vector<int > *)new std::vector<int >(arg1,(std::vector<int >::value_type const &)*arg2);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, SWIG_POINTER_NEW |  0 );
+  result = (std::vector< int > *)new std::vector< int >(arg1,(std::vector< int >::value_type const &)*arg2);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -9921,7 +9723,7 @@ SWIGINTERN PyObject *_wrap_new_vectorInt(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -9940,7 +9742,7 @@ SWIGINTERN PyObject *_wrap_new_vectorInt(PyObject *self, PyObject *args) {
   }
   if (argc == 1) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_new_vectorInt__SWIG_1(self, args);
@@ -9964,36 +9766,41 @@ SWIGINTERN PyObject *_wrap_new_vectorInt(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_vectorInt'.\n  Possible C/C++ prototypes are:\n    std::vector<(int)>()\n    std::vector<(int)>(std::vector<int > const &)\n    std::vector<(int)>(std::vector<int >::size_type)\n    std::vector<(int)>(std::vector<int >::size_type,std::vector<int >::value_type const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_vectorInt'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    std::vector< int >()\n"
+    "    std::vector< int >(std::vector< int > const &)\n"
+    "    std::vector< int >(std::vector< int >::size_type)\n"
+    "    std::vector< int >(std::vector< int >::size_type,std::vector< int >::value_type const &)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_vectorInt_push_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::value_type *arg2 = 0 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::value_type *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  std::vector<int >::value_type temp2 ;
+  std::vector< int >::value_type temp2 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:vectorInt_push_back",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_push_back" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_push_back" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt_push_back" "', argument " "2"" of type '" "std::vector<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt_push_back" "', argument " "2"" of type '" "std::vector< int >::value_type""'");
   } 
-  temp2 = static_cast< std::vector<int >::value_type >(val2);
+  temp2 = static_cast< std::vector< int >::value_type >(val2);
   arg2 = &temp2;
-  (arg1)->push_back((std::vector<int >::value_type const &)*arg2);
+  (arg1)->push_back((std::vector< int >::value_type const &)*arg2);
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -10003,21 +9810,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_front(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::value_type *result = 0 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_front",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_front" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_front" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   {
-    std::vector<int >::value_type const &_result_ref = ((std::vector<int > const *)arg1)->front();
-    result = (std::vector<int >::value_type *) &_result_ref;
+    std::vector< int >::value_type const &_result_ref = ((std::vector< int > const *)arg1)->front();
+    result = (std::vector< int >::value_type *) &_result_ref;
   }
   resultobj = SWIG_From_int(static_cast< int >(*result));
   return resultobj;
@@ -10028,21 +9835,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::value_type *result = 0 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_back" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_back" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   {
-    std::vector<int >::value_type const &_result_ref = ((std::vector<int > const *)arg1)->back();
-    result = (std::vector<int >::value_type *) &_result_ref;
+    std::vector< int >::value_type const &_result_ref = ((std::vector< int > const *)arg1)->back();
+    result = (std::vector< int >::value_type *) &_result_ref;
   }
   resultobj = SWIG_From_int(static_cast< int >(*result));
   return resultobj;
@@ -10053,14 +9860,14 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_assign(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::size_type arg2 ;
-  std::vector<int >::value_type *arg3 = 0 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::size_type arg2 ;
+  std::vector< int >::value_type *arg3 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  std::vector<int >::value_type temp3 ;
+  std::vector< int >::value_type temp3 ;
   int val3 ;
   int ecode3 = 0 ;
   PyObject * obj0 = 0 ;
@@ -10068,23 +9875,23 @@ SWIGINTERN PyObject *_wrap_vectorInt_assign(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:vectorInt_assign",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_assign" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_assign" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt_assign" "', argument " "2"" of type '" "std::vector<int >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt_assign" "', argument " "2"" of type '" "std::vector< int >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<int >::size_type >(val2);
+  arg2 = static_cast< std::vector< int >::size_type >(val2);
   ecode3 = SWIG_AsVal_int(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt_assign" "', argument " "3"" of type '" "std::vector<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt_assign" "', argument " "3"" of type '" "std::vector< int >::value_type""'");
   } 
-  temp3 = static_cast< std::vector<int >::value_type >(val3);
+  temp3 = static_cast< std::vector< int >::value_type >(val3);
   arg3 = &temp3;
-  (arg1)->assign(arg2,(std::vector<int >::value_type const &)*arg3);
+  (arg1)->assign(arg2,(std::vector< int >::value_type const &)*arg3);
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -10094,14 +9901,14 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::size_type arg2 ;
-  std::vector<int >::value_type *arg3 = 0 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::size_type arg2 ;
+  std::vector< int >::value_type *arg3 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  std::vector<int >::value_type temp3 ;
+  std::vector< int >::value_type temp3 ;
   int val3 ;
   int ecode3 = 0 ;
   PyObject * obj0 = 0 ;
@@ -10109,23 +9916,23 @@ SWIGINTERN PyObject *_wrap_vectorInt_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:vectorInt_resize",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_resize" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_resize" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt_resize" "', argument " "2"" of type '" "std::vector<int >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt_resize" "', argument " "2"" of type '" "std::vector< int >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<int >::size_type >(val2);
+  arg2 = static_cast< std::vector< int >::size_type >(val2);
   ecode3 = SWIG_AsVal_int(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt_resize" "', argument " "3"" of type '" "std::vector<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt_resize" "', argument " "3"" of type '" "std::vector< int >::value_type""'");
   } 
-  temp3 = static_cast< std::vector<int >::value_type >(val3);
+  temp3 = static_cast< std::vector< int >::value_type >(val3);
   arg3 = &temp3;
-  (arg1)->resize(arg2,(std::vector<int >::value_type const &)*arg3);
+  (arg1)->resize(arg2,(std::vector< int >::value_type const &)*arg3);
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -10139,13 +9946,13 @@ SWIGINTERN PyObject *_wrap_vectorInt_resize(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -10159,7 +9966,7 @@ SWIGINTERN PyObject *_wrap_vectorInt_resize(PyObject *self, PyObject *args) {
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -10179,22 +9986,25 @@ SWIGINTERN PyObject *_wrap_vectorInt_resize(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'vectorInt_resize'.\n  Possible C/C++ prototypes are:\n    resize(std::vector<int >::size_type)\n    resize(std::vector<int >::size_type,std::vector<int >::value_type const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'vectorInt_resize'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    resize(std::vector< int > *,std::vector< int >::size_type)\n"
+    "    resize(std::vector< int > *,std::vector< int >::size_type,std::vector< int >::value_type const &)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_vectorInt_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::iterator arg2 ;
-  std::vector<int >::value_type *arg3 = 0 ;
-  std::vector<int >::iterator result;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::iterator arg2 ;
+  std::vector< int >::value_type *arg3 = 0 ;
+  std::vector< int >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
   int res2 ;
-  std::vector<int >::value_type temp3 ;
+  std::vector< int >::value_type temp3 ;
   int val3 ;
   int ecode3 = 0 ;
   PyObject * obj0 = 0 ;
@@ -10202,30 +10012,30 @@ SWIGINTERN PyObject *_wrap_vectorInt_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:vectorInt_insert",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_insert" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_insert" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_insert" "', argument " "2"" of type '" "std::vector<int >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_insert" "', argument " "2"" of type '" "std::vector< int >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<int >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<int >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< int >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< int >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_insert" "', argument " "2"" of type '" "std::vector<int >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_insert" "', argument " "2"" of type '" "std::vector< int >::iterator""'");
     }
   }
   ecode3 = SWIG_AsVal_int(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt_insert" "', argument " "3"" of type '" "std::vector<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt_insert" "', argument " "3"" of type '" "std::vector< int >::value_type""'");
   } 
-  temp3 = static_cast< std::vector<int >::value_type >(val3);
+  temp3 = static_cast< std::vector< int >::value_type >(val3);
   arg3 = &temp3;
-  result = (arg1)->insert(arg2,(std::vector<int >::value_type const &)*arg3);
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<int >::iterator & >(result)),
+  result = (arg1)->insert(arg2,(std::vector< int >::value_type const &)*arg3);
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< int >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -10235,17 +10045,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::iterator arg2 ;
-  std::vector<int >::size_type arg3 ;
-  std::vector<int >::value_type *arg4 = 0 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::iterator arg2 ;
+  std::vector< int >::size_type arg3 ;
+  std::vector< int >::value_type *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
   int res2 ;
   size_t val3 ;
   int ecode3 = 0 ;
-  std::vector<int >::value_type temp4 ;
+  std::vector< int >::value_type temp4 ;
   int val4 ;
   int ecode4 = 0 ;
   PyObject * obj0 = 0 ;
@@ -10254,34 +10064,34 @@ SWIGINTERN PyObject *_wrap_vectorInt_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:vectorInt_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_insert" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_insert" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_insert" "', argument " "2"" of type '" "std::vector<int >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_insert" "', argument " "2"" of type '" "std::vector< int >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<int >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<int >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< int >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< int >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_insert" "', argument " "2"" of type '" "std::vector<int >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "vectorInt_insert" "', argument " "2"" of type '" "std::vector< int >::iterator""'");
     }
   }
   ecode3 = SWIG_AsVal_size_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt_insert" "', argument " "3"" of type '" "std::vector<int >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vectorInt_insert" "', argument " "3"" of type '" "std::vector< int >::size_type""'");
   } 
-  arg3 = static_cast< std::vector<int >::size_type >(val3);
+  arg3 = static_cast< std::vector< int >::size_type >(val3);
   ecode4 = SWIG_AsVal_int(obj3, &val4);
   if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "vectorInt_insert" "', argument " "4"" of type '" "std::vector<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "vectorInt_insert" "', argument " "4"" of type '" "std::vector< int >::value_type""'");
   } 
-  temp4 = static_cast< std::vector<int >::value_type >(val4);
+  temp4 = static_cast< std::vector< int >::value_type >(val4);
   arg4 = &temp4;
-  (arg1)->insert(arg2,arg3,(std::vector<int >::value_type const &)*arg4);
+  (arg1)->insert(arg2,arg3,(std::vector< int >::value_type const &)*arg4);
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -10295,18 +10105,18 @@ SWIGINTERN PyObject *_wrap_vectorInt_insert(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<int >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< int >::iterator > *>(iter) != 0));
       if (_v) {
         {
           int res = SWIG_AsVal_int(argv[2], NULL);
@@ -10320,12 +10130,12 @@ SWIGINTERN PyObject *_wrap_vectorInt_insert(PyObject *self, PyObject *args) {
   }
   if (argc == 4) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<int,std::allocator<int > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<int >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< int >::iterator > *>(iter) != 0));
       if (_v) {
         {
           int res = SWIG_AsVal_size_t(argv[2], NULL);
@@ -10345,15 +10155,18 @@ SWIGINTERN PyObject *_wrap_vectorInt_insert(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'vectorInt_insert'.\n  Possible C/C++ prototypes are:\n    insert(std::vector<int >::iterator,std::vector<int >::value_type const &)\n    insert(std::vector<int >::iterator,std::vector<int >::size_type,std::vector<int >::value_type const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'vectorInt_insert'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    insert(std::vector< int > *,std::vector< int >::iterator,std::vector< int >::value_type const &)\n"
+    "    insert(std::vector< int > *,std::vector< int >::iterator,std::vector< int >::size_type,std::vector< int >::value_type const &)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_vectorInt_reserve(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::size_type arg2 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::size_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -10362,16 +10175,16 @@ SWIGINTERN PyObject *_wrap_vectorInt_reserve(PyObject *SWIGUNUSEDPARM(self), PyO
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:vectorInt_reserve",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_reserve" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_reserve" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt_reserve" "', argument " "2"" of type '" "std::vector<int >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vectorInt_reserve" "', argument " "2"" of type '" "std::vector< int >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<int >::size_type >(val2);
+  arg2 = static_cast< std::vector< int >::size_type >(val2);
   (arg1)->reserve(arg2);
   resultobj = SWIG_Py_Void();
   return resultobj;
@@ -10382,19 +10195,19 @@ fail:
 
 SWIGINTERN PyObject *_wrap_vectorInt_capacity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
-  std::vector<int >::size_type result;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
+  std::vector< int >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:vectorInt_capacity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_capacity" "', argument " "1"" of type '" "std::vector<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vectorInt_capacity" "', argument " "1"" of type '" "std::vector< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
-  result = ((std::vector<int > const *)arg1)->capacity();
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
+  result = ((std::vector< int > const *)arg1)->capacity();
   resultobj = SWIG_From_size_t(static_cast< size_t >(result));
   return resultobj;
 fail:
@@ -10404,17 +10217,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_vectorInt(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<int > *arg1 = (std::vector<int > *) 0 ;
+  std::vector< int > *arg1 = (std::vector< int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_vectorInt",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_vectorInt" "', argument " "1"" of type '" "std::vector<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_vectorInt" "', argument " "1"" of type '" "std::vector< int > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<int > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< int > * >(argp1);
   {
     try {
       delete arg1;
@@ -10436,8 +10249,8 @@ fail:
 
 SWIGINTERN PyObject *vectorInt_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorTint_std__allocatorTint_t_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
@@ -10578,7 +10391,7 @@ SWIGINTERN PyObject *_wrap_new_Id(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -10621,7 +10434,12 @@ SWIGINTERN PyObject *_wrap_new_Id(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Id'.\n  Possible C/C++ prototypes are:\n    Id()\n    Id(Id::id_type)\n    Id(Id::id_type,Id::id_type)\n    Id(Id const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Id'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Id()\n"
+    "    Id(Id::id_type)\n"
+    "    Id(Id::id_type,Id::id_type)\n"
+    "    Id(Id const &)\n");
   return NULL;
 }
 
@@ -10936,19 +10754,19 @@ fail:
 
 SWIGINTERN PyObject *Id_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Id, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec_2u(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,2 > *result = 0 ;
+  VecMat::Vec< unsigned int,2 > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec_2u")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec<unsigned int,2 > *)new VecMat::Vec<unsigned int,2 >();
+      result = (VecMat::Vec< unsigned int,2 > *)new VecMat::Vec< unsigned int,2 >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -10957,7 +10775,7 @@ SWIGINTERN PyObject *_wrap_new_Vec_2u(PyObject *SWIGUNUSEDPARM(self), PyObject *
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -10966,17 +10784,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec_2u(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
+  VecMat::Vec< unsigned int,2 > *arg1 = (VecMat::Vec< unsigned int,2 > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec_2u",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_2u" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_2u" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,2 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp1);
   {
     try {
       delete arg1;
@@ -11003,7 +10821,7 @@ SWIGINTERN PyObject *_wrap_Vec_2u_dim(PyObject *SWIGUNUSEDPARM(self), PyObject *
   if (!PyArg_ParseTuple(args,(char *)":Vec_2u_dim")) SWIG_fail;
   {
     try {
-      result = (unsigned int)VecMat::Vec<unsigned int,2 >::SWIGTEMPLATEDISAMBIGUATOR dim();
+      result = (unsigned int)VecMat::Vec< unsigned int,2 >::SWIGTEMPLATEDISAMBIGUATOR dim();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11021,21 +10839,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2u_norm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
-  VecMat::Vec<unsigned int,2 >::value_type result;
+  VecMat::Vec< unsigned int,2 > *arg1 = (VecMat::Vec< unsigned int,2 > *) 0 ;
+  VecMat::Vec< unsigned int,2 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2u_norm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u_norm" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u_norm" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec<unsigned int,2 >::value_type)((VecMat::Vec<unsigned int,2 > const *)arg1)->norm();
+      result = (VecMat::Vec< unsigned int,2 >::value_type)((VecMat::Vec< unsigned int,2 > const *)arg1)->norm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11053,21 +10871,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2u_squareNorm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
-  VecMat::Vec<unsigned int,2 >::value_type result;
+  VecMat::Vec< unsigned int,2 > *arg1 = (VecMat::Vec< unsigned int,2 > *) 0 ;
+  VecMat::Vec< unsigned int,2 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2u_squareNorm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u_squareNorm" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u_squareNorm" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec<unsigned int,2 >::value_type)((VecMat::Vec<unsigned int,2 > const *)arg1)->squareNorm();
+      result = (VecMat::Vec< unsigned int,2 >::value_type)((VecMat::Vec< unsigned int,2 > const *)arg1)->squareNorm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11085,23 +10903,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2u_normalize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
-  VecMat::Vec<unsigned int,2 > *result = 0 ;
+  VecMat::Vec< unsigned int,2 > *arg1 = (VecMat::Vec< unsigned int,2 > *) 0 ;
+  VecMat::Vec< unsigned int,2 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2u_normalize",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u_normalize" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u_normalize" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,2 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec<unsigned int,2 > &_result_ref = (arg1)->normalize();
-        result = (VecMat::Vec<unsigned int,2 > *) &_result_ref;
+        VecMat::Vec< unsigned int,2 > &_result_ref = (arg1)->normalize();
+        result = (VecMat::Vec< unsigned int,2 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -11111,7 +10929,7 @@ SWIGINTERN PyObject *_wrap_Vec_2u_normalize(PyObject *SWIGUNUSEDPARM(self), PyOb
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -11120,23 +10938,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2u_normalizeSafe(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
-  VecMat::Vec<unsigned int,2 > *result = 0 ;
+  VecMat::Vec< unsigned int,2 > *arg1 = (VecMat::Vec< unsigned int,2 > *) 0 ;
+  VecMat::Vec< unsigned int,2 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2u_normalizeSafe",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,2 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec<unsigned int,2 > &_result_ref = (arg1)->normalizeSafe();
-        result = (VecMat::Vec<unsigned int,2 > *) &_result_ref;
+        VecMat::Vec< unsigned int,2 > &_result_ref = (arg1)->normalizeSafe();
+        result = (VecMat::Vec< unsigned int,2 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -11146,7 +10964,7 @@ SWIGINTERN PyObject *_wrap_Vec_2u_normalizeSafe(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -11155,9 +10973,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2u___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
-  VecMat::Vec<unsigned int,2 > *arg2 = 0 ;
-  VecMat::Vec<unsigned int,2 > result;
+  VecMat::Vec< unsigned int,2 > *arg1 = (VecMat::Vec< unsigned int,2 > *) 0 ;
+  VecMat::Vec< unsigned int,2 > *arg2 = 0 ;
+  VecMat::Vec< unsigned int,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -11166,22 +10984,22 @@ SWIGINTERN PyObject *_wrap_Vec_2u___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2u___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___add__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___add__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___add__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___add__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___add__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___add__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec<unsigned int,2 > const *)arg1)->operator +((VecMat::Vec<unsigned int,2 > const &)*arg2);
+      result = ((VecMat::Vec< unsigned int,2 > const *)arg1)->operator +((VecMat::Vec< unsigned int,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11190,7 +11008,7 @@ SWIGINTERN PyObject *_wrap_Vec_2u___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<unsigned int,2 >(static_cast< const VecMat::Vec<unsigned int,2 >& >(result))), SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< unsigned int,2 >(static_cast< const VecMat::Vec< unsigned int,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -11199,9 +11017,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2u___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
-  VecMat::Vec<unsigned int,2 > *arg2 = 0 ;
-  VecMat::Vec<unsigned int,2 > result;
+  VecMat::Vec< unsigned int,2 > *arg1 = (VecMat::Vec< unsigned int,2 > *) 0 ;
+  VecMat::Vec< unsigned int,2 > *arg2 = 0 ;
+  VecMat::Vec< unsigned int,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -11210,22 +11028,22 @@ SWIGINTERN PyObject *_wrap_Vec_2u___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2u___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___sub__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___sub__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___sub__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___sub__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___sub__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___sub__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec<unsigned int,2 > const *)arg1)->operator -((VecMat::Vec<unsigned int,2 > const &)*arg2);
+      result = ((VecMat::Vec< unsigned int,2 > const *)arg1)->operator -((VecMat::Vec< unsigned int,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11234,7 +11052,7 @@ SWIGINTERN PyObject *_wrap_Vec_2u___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<unsigned int,2 >(static_cast< const VecMat::Vec<unsigned int,2 >& >(result))), SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< unsigned int,2 >(static_cast< const VecMat::Vec< unsigned int,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -11243,9 +11061,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2u___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
-  VecMat::Vec<unsigned int,2 >::value_type arg2 ;
-  VecMat::Vec<unsigned int,2 > result;
+  VecMat::Vec< unsigned int,2 > *arg1 = (VecMat::Vec< unsigned int,2 > *) 0 ;
+  VecMat::Vec< unsigned int,2 >::value_type arg2 ;
+  VecMat::Vec< unsigned int,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned int val2 ;
@@ -11254,19 +11072,19 @@ SWIGINTERN PyObject *_wrap_Vec_2u___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2u___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___mul__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___mul__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2u___mul__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2u___mul__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec<unsigned int,2 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec< unsigned int,2 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec<unsigned int,2 > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec< unsigned int,2 > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11275,7 +11093,7 @@ SWIGINTERN PyObject *_wrap_Vec_2u___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<unsigned int,2 >(static_cast< const VecMat::Vec<unsigned int,2 >& >(result))), SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< unsigned int,2 >(static_cast< const VecMat::Vec< unsigned int,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -11284,9 +11102,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2u___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
-  VecMat::Vec<unsigned int,2 >::value_type arg2 ;
-  VecMat::Vec<unsigned int,2 > result;
+  VecMat::Vec< unsigned int,2 > *arg1 = (VecMat::Vec< unsigned int,2 > *) 0 ;
+  VecMat::Vec< unsigned int,2 >::value_type arg2 ;
+  VecMat::Vec< unsigned int,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned int val2 ;
@@ -11295,19 +11113,19 @@ SWIGINTERN PyObject *_wrap_Vec_2u___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2u___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___div__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___div__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2u___div__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2u___div__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec<unsigned int,2 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec< unsigned int,2 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec<unsigned int,2 > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec< unsigned int,2 > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11316,7 +11134,7 @@ SWIGINTERN PyObject *_wrap_Vec_2u___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<unsigned int,2 >(static_cast< const VecMat::Vec<unsigned int,2 >& >(result))), SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< unsigned int,2 >(static_cast< const VecMat::Vec< unsigned int,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -11325,9 +11143,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2u___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
-  VecMat::Vec<unsigned int,2 > *arg2 = 0 ;
-  VecMat::Vec<unsigned int,2 >::value_type result;
+  VecMat::Vec< unsigned int,2 > *arg1 = (VecMat::Vec< unsigned int,2 > *) 0 ;
+  VecMat::Vec< unsigned int,2 > *arg2 = 0 ;
+  VecMat::Vec< unsigned int,2 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -11336,22 +11154,22 @@ SWIGINTERN PyObject *_wrap_Vec_2u___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2u___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___mul__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___mul__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___mul__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___mul__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___mul__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___mul__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp2);
   {
     try {
-      result = (VecMat::Vec<unsigned int,2 >::value_type)((VecMat::Vec<unsigned int,2 > const *)arg1)->operator *((VecMat::Vec<unsigned int,2 > const &)*arg2);
+      result = (VecMat::Vec< unsigned int,2 >::value_type)((VecMat::Vec< unsigned int,2 > const *)arg1)->operator *((VecMat::Vec< unsigned int,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11373,17 +11191,17 @@ SWIGINTERN PyObject *_wrap_Vec_2u___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec_2u___mul____SWIG_1(self, args);
@@ -11393,7 +11211,7 @@ SWIGINTERN PyObject *_wrap_Vec_2u___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -11414,8 +11232,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2u___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
-  VecMat::Vec<unsigned int,2 > *arg2 = 0 ;
+  VecMat::Vec< unsigned int,2 > *arg1 = (VecMat::Vec< unsigned int,2 > *) 0 ;
+  VecMat::Vec< unsigned int,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -11425,22 +11243,22 @@ SWIGINTERN PyObject *_wrap_Vec_2u___eq__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2u___eq__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___eq__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___eq__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___eq__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___eq__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___eq__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___eq__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<unsigned int,2 > const *)arg1)->operator ==((VecMat::Vec<unsigned int,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec< unsigned int,2 > const *)arg1)->operator ==((VecMat::Vec< unsigned int,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11458,8 +11276,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2u___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
-  VecMat::Vec<unsigned int,2 > *arg2 = 0 ;
+  VecMat::Vec< unsigned int,2 > *arg1 = (VecMat::Vec< unsigned int,2 > *) 0 ;
+  VecMat::Vec< unsigned int,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -11469,22 +11287,22 @@ SWIGINTERN PyObject *_wrap_Vec_2u___ne__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2u___ne__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___ne__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___ne__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___ne__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___ne__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___ne__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___ne__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<unsigned int,2 > const *)arg1)->operator !=((VecMat::Vec<unsigned int,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec< unsigned int,2 > const *)arg1)->operator !=((VecMat::Vec< unsigned int,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11502,8 +11320,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2u___lt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
-  VecMat::Vec<unsigned int,2 > *arg2 = 0 ;
+  VecMat::Vec< unsigned int,2 > *arg1 = (VecMat::Vec< unsigned int,2 > *) 0 ;
+  VecMat::Vec< unsigned int,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -11513,22 +11331,22 @@ SWIGINTERN PyObject *_wrap_Vec_2u___lt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2u___lt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___lt__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___lt__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___lt__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___lt__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___lt__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___lt__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<unsigned int,2 > const *)arg1)->operator <((VecMat::Vec<unsigned int,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec< unsigned int,2 > const *)arg1)->operator <((VecMat::Vec< unsigned int,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11546,8 +11364,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2u___gt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,2 > *arg1 = (VecMat::Vec<unsigned int,2 > *) 0 ;
-  VecMat::Vec<unsigned int,2 > *arg2 = 0 ;
+  VecMat::Vec< unsigned int,2 > *arg1 = (VecMat::Vec< unsigned int,2 > *) 0 ;
+  VecMat::Vec< unsigned int,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -11557,22 +11375,22 @@ SWIGINTERN PyObject *_wrap_Vec_2u___gt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2u___gt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___gt__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2u___gt__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___gt__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2u___gt__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___gt__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2u___gt__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< unsigned int,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<unsigned int,2 > const *)arg1)->operator >((VecMat::Vec<unsigned int,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec< unsigned int,2 > const *)arg1)->operator >((VecMat::Vec< unsigned int,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11590,19 +11408,19 @@ fail:
 
 SWIGINTERN PyObject *Vec_2u_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecTunsigned_int_2_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecT_unsigned_int_2_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec_2i(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,2 > *result = 0 ;
+  VecMat::Vec< int,2 > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec_2i")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec<int,2 > *)new VecMat::Vec<int,2 >();
+      result = (VecMat::Vec< int,2 > *)new VecMat::Vec< int,2 >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11611,7 +11429,7 @@ SWIGINTERN PyObject *_wrap_new_Vec_2i(PyObject *SWIGUNUSEDPARM(self), PyObject *
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTint_2_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_int_2_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -11620,17 +11438,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec_2i(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
+  VecMat::Vec< int,2 > *arg1 = (VecMat::Vec< int,2 > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec_2i",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_2_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_2i" "', argument " "1"" of type '" "VecMat::Vec<int,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_2i" "', argument " "1"" of type '" "VecMat::Vec< int,2 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp1);
   {
     try {
       delete arg1;
@@ -11657,7 +11475,7 @@ SWIGINTERN PyObject *_wrap_Vec_2i_dim(PyObject *SWIGUNUSEDPARM(self), PyObject *
   if (!PyArg_ParseTuple(args,(char *)":Vec_2i_dim")) SWIG_fail;
   {
     try {
-      result = (unsigned int)VecMat::Vec<int,2 >::SWIGTEMPLATEDISAMBIGUATOR dim();
+      result = (unsigned int)VecMat::Vec< int,2 >::SWIGTEMPLATEDISAMBIGUATOR dim();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11675,21 +11493,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2i_norm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
-  VecMat::Vec<int,2 >::value_type result;
+  VecMat::Vec< int,2 > *arg1 = (VecMat::Vec< int,2 > *) 0 ;
+  VecMat::Vec< int,2 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2i_norm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i_norm" "', argument " "1"" of type '" "VecMat::Vec<int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i_norm" "', argument " "1"" of type '" "VecMat::Vec< int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec<int,2 >::value_type)((VecMat::Vec<int,2 > const *)arg1)->norm();
+      result = (VecMat::Vec< int,2 >::value_type)((VecMat::Vec< int,2 > const *)arg1)->norm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11707,21 +11525,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2i_squareNorm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
-  VecMat::Vec<int,2 >::value_type result;
+  VecMat::Vec< int,2 > *arg1 = (VecMat::Vec< int,2 > *) 0 ;
+  VecMat::Vec< int,2 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2i_squareNorm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i_squareNorm" "', argument " "1"" of type '" "VecMat::Vec<int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i_squareNorm" "', argument " "1"" of type '" "VecMat::Vec< int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec<int,2 >::value_type)((VecMat::Vec<int,2 > const *)arg1)->squareNorm();
+      result = (VecMat::Vec< int,2 >::value_type)((VecMat::Vec< int,2 > const *)arg1)->squareNorm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11739,23 +11557,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2i_normalize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
-  VecMat::Vec<int,2 > *result = 0 ;
+  VecMat::Vec< int,2 > *arg1 = (VecMat::Vec< int,2 > *) 0 ;
+  VecMat::Vec< int,2 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2i_normalize",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i_normalize" "', argument " "1"" of type '" "VecMat::Vec<int,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i_normalize" "', argument " "1"" of type '" "VecMat::Vec< int,2 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec<int,2 > &_result_ref = (arg1)->normalize();
-        result = (VecMat::Vec<int,2 > *) &_result_ref;
+        VecMat::Vec< int,2 > &_result_ref = (arg1)->normalize();
+        result = (VecMat::Vec< int,2 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -11765,7 +11583,7 @@ SWIGINTERN PyObject *_wrap_Vec_2i_normalize(PyObject *SWIGUNUSEDPARM(self), PyOb
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_int_2_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -11774,23 +11592,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2i_normalizeSafe(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
-  VecMat::Vec<int,2 > *result = 0 ;
+  VecMat::Vec< int,2 > *arg1 = (VecMat::Vec< int,2 > *) 0 ;
+  VecMat::Vec< int,2 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2i_normalizeSafe",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec<int,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec< int,2 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec<int,2 > &_result_ref = (arg1)->normalizeSafe();
-        result = (VecMat::Vec<int,2 > *) &_result_ref;
+        VecMat::Vec< int,2 > &_result_ref = (arg1)->normalizeSafe();
+        result = (VecMat::Vec< int,2 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -11800,7 +11618,7 @@ SWIGINTERN PyObject *_wrap_Vec_2i_normalizeSafe(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_int_2_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -11809,9 +11627,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2i___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
-  VecMat::Vec<int,2 > *arg2 = 0 ;
-  VecMat::Vec<int,2 > result;
+  VecMat::Vec< int,2 > *arg1 = (VecMat::Vec< int,2 > *) 0 ;
+  VecMat::Vec< int,2 > *arg2 = 0 ;
+  VecMat::Vec< int,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -11820,22 +11638,22 @@ SWIGINTERN PyObject *_wrap_Vec_2i___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2i___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___add__" "', argument " "1"" of type '" "VecMat::Vec<int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___add__" "', argument " "1"" of type '" "VecMat::Vec< int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_int_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___add__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___add__" "', argument " "2"" of type '" "VecMat::Vec< int,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___add__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___add__" "', argument " "2"" of type '" "VecMat::Vec< int,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec<int,2 > const *)arg1)->operator +((VecMat::Vec<int,2 > const &)*arg2);
+      result = ((VecMat::Vec< int,2 > const *)arg1)->operator +((VecMat::Vec< int,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11844,7 +11662,7 @@ SWIGINTERN PyObject *_wrap_Vec_2i___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<int,2 >(static_cast< const VecMat::Vec<int,2 >& >(result))), SWIGTYPE_p_VecMat__VecTint_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< int,2 >(static_cast< const VecMat::Vec< int,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_int_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -11853,9 +11671,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2i___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
-  VecMat::Vec<int,2 > *arg2 = 0 ;
-  VecMat::Vec<int,2 > result;
+  VecMat::Vec< int,2 > *arg1 = (VecMat::Vec< int,2 > *) 0 ;
+  VecMat::Vec< int,2 > *arg2 = 0 ;
+  VecMat::Vec< int,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -11864,22 +11682,22 @@ SWIGINTERN PyObject *_wrap_Vec_2i___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2i___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___sub__" "', argument " "1"" of type '" "VecMat::Vec<int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___sub__" "', argument " "1"" of type '" "VecMat::Vec< int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_int_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___sub__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___sub__" "', argument " "2"" of type '" "VecMat::Vec< int,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___sub__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___sub__" "', argument " "2"" of type '" "VecMat::Vec< int,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec<int,2 > const *)arg1)->operator -((VecMat::Vec<int,2 > const &)*arg2);
+      result = ((VecMat::Vec< int,2 > const *)arg1)->operator -((VecMat::Vec< int,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11888,7 +11706,7 @@ SWIGINTERN PyObject *_wrap_Vec_2i___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<int,2 >(static_cast< const VecMat::Vec<int,2 >& >(result))), SWIGTYPE_p_VecMat__VecTint_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< int,2 >(static_cast< const VecMat::Vec< int,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_int_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -11897,9 +11715,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2i___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
-  VecMat::Vec<int,2 >::value_type arg2 ;
-  VecMat::Vec<int,2 > result;
+  VecMat::Vec< int,2 > *arg1 = (VecMat::Vec< int,2 > *) 0 ;
+  VecMat::Vec< int,2 >::value_type arg2 ;
+  VecMat::Vec< int,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -11908,19 +11726,19 @@ SWIGINTERN PyObject *_wrap_Vec_2i___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2i___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___mul__" "', argument " "1"" of type '" "VecMat::Vec<int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___mul__" "', argument " "1"" of type '" "VecMat::Vec< int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2i___mul__" "', argument " "2"" of type '" "VecMat::Vec<int,2 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2i___mul__" "', argument " "2"" of type '" "VecMat::Vec< int,2 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec<int,2 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec< int,2 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec<int,2 > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec< int,2 > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11929,7 +11747,7 @@ SWIGINTERN PyObject *_wrap_Vec_2i___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<int,2 >(static_cast< const VecMat::Vec<int,2 >& >(result))), SWIGTYPE_p_VecMat__VecTint_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< int,2 >(static_cast< const VecMat::Vec< int,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_int_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -11938,9 +11756,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2i___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
-  VecMat::Vec<int,2 >::value_type arg2 ;
-  VecMat::Vec<int,2 > result;
+  VecMat::Vec< int,2 > *arg1 = (VecMat::Vec< int,2 > *) 0 ;
+  VecMat::Vec< int,2 >::value_type arg2 ;
+  VecMat::Vec< int,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -11949,19 +11767,19 @@ SWIGINTERN PyObject *_wrap_Vec_2i___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2i___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___div__" "', argument " "1"" of type '" "VecMat::Vec<int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___div__" "', argument " "1"" of type '" "VecMat::Vec< int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2i___div__" "', argument " "2"" of type '" "VecMat::Vec<int,2 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2i___div__" "', argument " "2"" of type '" "VecMat::Vec< int,2 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec<int,2 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec< int,2 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec<int,2 > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec< int,2 > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -11970,7 +11788,7 @@ SWIGINTERN PyObject *_wrap_Vec_2i___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<int,2 >(static_cast< const VecMat::Vec<int,2 >& >(result))), SWIGTYPE_p_VecMat__VecTint_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< int,2 >(static_cast< const VecMat::Vec< int,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_int_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -11979,9 +11797,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2i___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
-  VecMat::Vec<int,2 > *arg2 = 0 ;
-  VecMat::Vec<int,2 >::value_type result;
+  VecMat::Vec< int,2 > *arg1 = (VecMat::Vec< int,2 > *) 0 ;
+  VecMat::Vec< int,2 > *arg2 = 0 ;
+  VecMat::Vec< int,2 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -11990,22 +11808,22 @@ SWIGINTERN PyObject *_wrap_Vec_2i___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2i___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___mul__" "', argument " "1"" of type '" "VecMat::Vec<int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___mul__" "', argument " "1"" of type '" "VecMat::Vec< int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_int_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___mul__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___mul__" "', argument " "2"" of type '" "VecMat::Vec< int,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___mul__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___mul__" "', argument " "2"" of type '" "VecMat::Vec< int,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp2);
   {
     try {
-      result = (VecMat::Vec<int,2 >::value_type)((VecMat::Vec<int,2 > const *)arg1)->operator *((VecMat::Vec<int,2 > const &)*arg2);
+      result = (VecMat::Vec< int,2 >::value_type)((VecMat::Vec< int,2 > const *)arg1)->operator *((VecMat::Vec< int,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12027,17 +11845,17 @@ SWIGINTERN PyObject *_wrap_Vec_2i___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTint_2_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_int_2_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecTint_2_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecT_int_2_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec_2i___mul____SWIG_1(self, args);
@@ -12047,7 +11865,7 @@ SWIGINTERN PyObject *_wrap_Vec_2i___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTint_2_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_int_2_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -12068,8 +11886,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2i___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
-  VecMat::Vec<int,2 > *arg2 = 0 ;
+  VecMat::Vec< int,2 > *arg1 = (VecMat::Vec< int,2 > *) 0 ;
+  VecMat::Vec< int,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -12079,22 +11897,22 @@ SWIGINTERN PyObject *_wrap_Vec_2i___eq__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2i___eq__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___eq__" "', argument " "1"" of type '" "VecMat::Vec<int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___eq__" "', argument " "1"" of type '" "VecMat::Vec< int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_int_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___eq__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___eq__" "', argument " "2"" of type '" "VecMat::Vec< int,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___eq__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___eq__" "', argument " "2"" of type '" "VecMat::Vec< int,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<int,2 > const *)arg1)->operator ==((VecMat::Vec<int,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec< int,2 > const *)arg1)->operator ==((VecMat::Vec< int,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12112,8 +11930,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2i___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
-  VecMat::Vec<int,2 > *arg2 = 0 ;
+  VecMat::Vec< int,2 > *arg1 = (VecMat::Vec< int,2 > *) 0 ;
+  VecMat::Vec< int,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -12123,22 +11941,22 @@ SWIGINTERN PyObject *_wrap_Vec_2i___ne__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2i___ne__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___ne__" "', argument " "1"" of type '" "VecMat::Vec<int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___ne__" "', argument " "1"" of type '" "VecMat::Vec< int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_int_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___ne__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___ne__" "', argument " "2"" of type '" "VecMat::Vec< int,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___ne__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___ne__" "', argument " "2"" of type '" "VecMat::Vec< int,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<int,2 > const *)arg1)->operator !=((VecMat::Vec<int,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec< int,2 > const *)arg1)->operator !=((VecMat::Vec< int,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12156,8 +11974,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2i___lt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
-  VecMat::Vec<int,2 > *arg2 = 0 ;
+  VecMat::Vec< int,2 > *arg1 = (VecMat::Vec< int,2 > *) 0 ;
+  VecMat::Vec< int,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -12167,22 +11985,22 @@ SWIGINTERN PyObject *_wrap_Vec_2i___lt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2i___lt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___lt__" "', argument " "1"" of type '" "VecMat::Vec<int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___lt__" "', argument " "1"" of type '" "VecMat::Vec< int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_int_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___lt__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___lt__" "', argument " "2"" of type '" "VecMat::Vec< int,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___lt__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___lt__" "', argument " "2"" of type '" "VecMat::Vec< int,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<int,2 > const *)arg1)->operator <((VecMat::Vec<int,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec< int,2 > const *)arg1)->operator <((VecMat::Vec< int,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12200,8 +12018,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2i___gt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,2 > *arg1 = (VecMat::Vec<int,2 > *) 0 ;
-  VecMat::Vec<int,2 > *arg2 = 0 ;
+  VecMat::Vec< int,2 > *arg1 = (VecMat::Vec< int,2 > *) 0 ;
+  VecMat::Vec< int,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -12211,22 +12029,22 @@ SWIGINTERN PyObject *_wrap_Vec_2i___gt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2i___gt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___gt__" "', argument " "1"" of type '" "VecMat::Vec<int,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2i___gt__" "', argument " "1"" of type '" "VecMat::Vec< int,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_int_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___gt__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2i___gt__" "', argument " "2"" of type '" "VecMat::Vec< int,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___gt__" "', argument " "2"" of type '" "VecMat::Vec<int,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2i___gt__" "', argument " "2"" of type '" "VecMat::Vec< int,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<int,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< int,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<int,2 > const *)arg1)->operator >((VecMat::Vec<int,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec< int,2 > const *)arg1)->operator >((VecMat::Vec< int,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12244,19 +12062,19 @@ fail:
 
 SWIGINTERN PyObject *Vec_2i_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecTint_2_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecT_int_2_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec_2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,2 > *result = 0 ;
+  VecMat::Vec< double,2 > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec_2d")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec<double,2 > *)new VecMat::Vec<double,2 >();
+      result = (VecMat::Vec< double,2 > *)new VecMat::Vec< double,2 >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12265,7 +12083,7 @@ SWIGINTERN PyObject *_wrap_new_Vec_2d(PyObject *SWIGUNUSEDPARM(self), PyObject *
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTdouble_2_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_double_2_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -12274,17 +12092,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec_2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
+  VecMat::Vec< double,2 > *arg1 = (VecMat::Vec< double,2 > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec_2d",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_2_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_2d" "', argument " "1"" of type '" "VecMat::Vec<double,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_2d" "', argument " "1"" of type '" "VecMat::Vec< double,2 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp1);
   {
     try {
       delete arg1;
@@ -12311,7 +12129,7 @@ SWIGINTERN PyObject *_wrap_Vec_2d_dim(PyObject *SWIGUNUSEDPARM(self), PyObject *
   if (!PyArg_ParseTuple(args,(char *)":Vec_2d_dim")) SWIG_fail;
   {
     try {
-      result = (unsigned int)VecMat::Vec<double,2 >::SWIGTEMPLATEDISAMBIGUATOR dim();
+      result = (unsigned int)VecMat::Vec< double,2 >::SWIGTEMPLATEDISAMBIGUATOR dim();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12329,21 +12147,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2d_norm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
-  VecMat::Vec<double,2 >::value_type result;
+  VecMat::Vec< double,2 > *arg1 = (VecMat::Vec< double,2 > *) 0 ;
+  VecMat::Vec< double,2 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2d_norm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d_norm" "', argument " "1"" of type '" "VecMat::Vec<double,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d_norm" "', argument " "1"" of type '" "VecMat::Vec< double,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec<double,2 >::value_type)((VecMat::Vec<double,2 > const *)arg1)->norm();
+      result = (VecMat::Vec< double,2 >::value_type)((VecMat::Vec< double,2 > const *)arg1)->norm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12361,21 +12179,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2d_squareNorm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
-  VecMat::Vec<double,2 >::value_type result;
+  VecMat::Vec< double,2 > *arg1 = (VecMat::Vec< double,2 > *) 0 ;
+  VecMat::Vec< double,2 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2d_squareNorm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d_squareNorm" "', argument " "1"" of type '" "VecMat::Vec<double,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d_squareNorm" "', argument " "1"" of type '" "VecMat::Vec< double,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec<double,2 >::value_type)((VecMat::Vec<double,2 > const *)arg1)->squareNorm();
+      result = (VecMat::Vec< double,2 >::value_type)((VecMat::Vec< double,2 > const *)arg1)->squareNorm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12393,23 +12211,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2d_normalize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
-  VecMat::Vec<double,2 > *result = 0 ;
+  VecMat::Vec< double,2 > *arg1 = (VecMat::Vec< double,2 > *) 0 ;
+  VecMat::Vec< double,2 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2d_normalize",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d_normalize" "', argument " "1"" of type '" "VecMat::Vec<double,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d_normalize" "', argument " "1"" of type '" "VecMat::Vec< double,2 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec<double,2 > &_result_ref = (arg1)->normalize();
-        result = (VecMat::Vec<double,2 > *) &_result_ref;
+        VecMat::Vec< double,2 > &_result_ref = (arg1)->normalize();
+        result = (VecMat::Vec< double,2 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -12419,7 +12237,7 @@ SWIGINTERN PyObject *_wrap_Vec_2d_normalize(PyObject *SWIGUNUSEDPARM(self), PyOb
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_double_2_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -12428,23 +12246,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2d_normalizeSafe(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
-  VecMat::Vec<double,2 > *result = 0 ;
+  VecMat::Vec< double,2 > *arg1 = (VecMat::Vec< double,2 > *) 0 ;
+  VecMat::Vec< double,2 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2d_normalizeSafe",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec<double,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec< double,2 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec<double,2 > &_result_ref = (arg1)->normalizeSafe();
-        result = (VecMat::Vec<double,2 > *) &_result_ref;
+        VecMat::Vec< double,2 > &_result_ref = (arg1)->normalizeSafe();
+        result = (VecMat::Vec< double,2 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -12454,7 +12272,7 @@ SWIGINTERN PyObject *_wrap_Vec_2d_normalizeSafe(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_double_2_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -12463,9 +12281,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2d___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
-  VecMat::Vec<double,2 > *arg2 = 0 ;
-  VecMat::Vec<double,2 > result;
+  VecMat::Vec< double,2 > *arg1 = (VecMat::Vec< double,2 > *) 0 ;
+  VecMat::Vec< double,2 > *arg2 = 0 ;
+  VecMat::Vec< double,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -12474,22 +12292,22 @@ SWIGINTERN PyObject *_wrap_Vec_2d___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2d___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___add__" "', argument " "1"" of type '" "VecMat::Vec<double,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___add__" "', argument " "1"" of type '" "VecMat::Vec< double,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_double_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___add__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___add__" "', argument " "2"" of type '" "VecMat::Vec< double,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___add__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___add__" "', argument " "2"" of type '" "VecMat::Vec< double,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec<double,2 > const *)arg1)->operator +((VecMat::Vec<double,2 > const &)*arg2);
+      result = ((VecMat::Vec< double,2 > const *)arg1)->operator +((VecMat::Vec< double,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12498,7 +12316,7 @@ SWIGINTERN PyObject *_wrap_Vec_2d___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<double,2 >(static_cast< const VecMat::Vec<double,2 >& >(result))), SWIGTYPE_p_VecMat__VecTdouble_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< double,2 >(static_cast< const VecMat::Vec< double,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_double_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -12507,9 +12325,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2d___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
-  VecMat::Vec<double,2 > *arg2 = 0 ;
-  VecMat::Vec<double,2 > result;
+  VecMat::Vec< double,2 > *arg1 = (VecMat::Vec< double,2 > *) 0 ;
+  VecMat::Vec< double,2 > *arg2 = 0 ;
+  VecMat::Vec< double,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -12518,22 +12336,22 @@ SWIGINTERN PyObject *_wrap_Vec_2d___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2d___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___sub__" "', argument " "1"" of type '" "VecMat::Vec<double,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___sub__" "', argument " "1"" of type '" "VecMat::Vec< double,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_double_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___sub__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___sub__" "', argument " "2"" of type '" "VecMat::Vec< double,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___sub__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___sub__" "', argument " "2"" of type '" "VecMat::Vec< double,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec<double,2 > const *)arg1)->operator -((VecMat::Vec<double,2 > const &)*arg2);
+      result = ((VecMat::Vec< double,2 > const *)arg1)->operator -((VecMat::Vec< double,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12542,7 +12360,7 @@ SWIGINTERN PyObject *_wrap_Vec_2d___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<double,2 >(static_cast< const VecMat::Vec<double,2 >& >(result))), SWIGTYPE_p_VecMat__VecTdouble_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< double,2 >(static_cast< const VecMat::Vec< double,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_double_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -12551,9 +12369,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2d___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
-  VecMat::Vec<double,2 >::value_type arg2 ;
-  VecMat::Vec<double,2 > result;
+  VecMat::Vec< double,2 > *arg1 = (VecMat::Vec< double,2 > *) 0 ;
+  VecMat::Vec< double,2 >::value_type arg2 ;
+  VecMat::Vec< double,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
@@ -12562,19 +12380,19 @@ SWIGINTERN PyObject *_wrap_Vec_2d___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2d___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___mul__" "', argument " "1"" of type '" "VecMat::Vec<double,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___mul__" "', argument " "1"" of type '" "VecMat::Vec< double,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2d___mul__" "', argument " "2"" of type '" "VecMat::Vec<double,2 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2d___mul__" "', argument " "2"" of type '" "VecMat::Vec< double,2 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec<double,2 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec< double,2 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec<double,2 > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec< double,2 > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12583,7 +12401,7 @@ SWIGINTERN PyObject *_wrap_Vec_2d___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<double,2 >(static_cast< const VecMat::Vec<double,2 >& >(result))), SWIGTYPE_p_VecMat__VecTdouble_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< double,2 >(static_cast< const VecMat::Vec< double,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_double_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -12592,9 +12410,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2d___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
-  VecMat::Vec<double,2 >::value_type arg2 ;
-  VecMat::Vec<double,2 > result;
+  VecMat::Vec< double,2 > *arg1 = (VecMat::Vec< double,2 > *) 0 ;
+  VecMat::Vec< double,2 >::value_type arg2 ;
+  VecMat::Vec< double,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
@@ -12603,19 +12421,19 @@ SWIGINTERN PyObject *_wrap_Vec_2d___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2d___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___div__" "', argument " "1"" of type '" "VecMat::Vec<double,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___div__" "', argument " "1"" of type '" "VecMat::Vec< double,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2d___div__" "', argument " "2"" of type '" "VecMat::Vec<double,2 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2d___div__" "', argument " "2"" of type '" "VecMat::Vec< double,2 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec<double,2 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec< double,2 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec<double,2 > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec< double,2 > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12624,7 +12442,7 @@ SWIGINTERN PyObject *_wrap_Vec_2d___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<double,2 >(static_cast< const VecMat::Vec<double,2 >& >(result))), SWIGTYPE_p_VecMat__VecTdouble_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< double,2 >(static_cast< const VecMat::Vec< double,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_double_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -12633,9 +12451,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2d___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
-  VecMat::Vec<double,2 > *arg2 = 0 ;
-  VecMat::Vec<double,2 >::value_type result;
+  VecMat::Vec< double,2 > *arg1 = (VecMat::Vec< double,2 > *) 0 ;
+  VecMat::Vec< double,2 > *arg2 = 0 ;
+  VecMat::Vec< double,2 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -12644,22 +12462,22 @@ SWIGINTERN PyObject *_wrap_Vec_2d___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2d___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___mul__" "', argument " "1"" of type '" "VecMat::Vec<double,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___mul__" "', argument " "1"" of type '" "VecMat::Vec< double,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_double_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___mul__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___mul__" "', argument " "2"" of type '" "VecMat::Vec< double,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___mul__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___mul__" "', argument " "2"" of type '" "VecMat::Vec< double,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp2);
   {
     try {
-      result = (VecMat::Vec<double,2 >::value_type)((VecMat::Vec<double,2 > const *)arg1)->operator *((VecMat::Vec<double,2 > const &)*arg2);
+      result = (VecMat::Vec< double,2 >::value_type)((VecMat::Vec< double,2 > const *)arg1)->operator *((VecMat::Vec< double,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12681,17 +12499,17 @@ SWIGINTERN PyObject *_wrap_Vec_2d___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTdouble_2_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_double_2_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecTdouble_2_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecT_double_2_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec_2d___mul____SWIG_1(self, args);
@@ -12701,7 +12519,7 @@ SWIGINTERN PyObject *_wrap_Vec_2d___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTdouble_2_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_double_2_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -12722,8 +12540,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2d___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
-  VecMat::Vec<double,2 > *arg2 = 0 ;
+  VecMat::Vec< double,2 > *arg1 = (VecMat::Vec< double,2 > *) 0 ;
+  VecMat::Vec< double,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -12733,22 +12551,22 @@ SWIGINTERN PyObject *_wrap_Vec_2d___eq__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2d___eq__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___eq__" "', argument " "1"" of type '" "VecMat::Vec<double,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___eq__" "', argument " "1"" of type '" "VecMat::Vec< double,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_double_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___eq__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___eq__" "', argument " "2"" of type '" "VecMat::Vec< double,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___eq__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___eq__" "', argument " "2"" of type '" "VecMat::Vec< double,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<double,2 > const *)arg1)->operator ==((VecMat::Vec<double,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec< double,2 > const *)arg1)->operator ==((VecMat::Vec< double,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12766,8 +12584,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2d___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
-  VecMat::Vec<double,2 > *arg2 = 0 ;
+  VecMat::Vec< double,2 > *arg1 = (VecMat::Vec< double,2 > *) 0 ;
+  VecMat::Vec< double,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -12777,22 +12595,22 @@ SWIGINTERN PyObject *_wrap_Vec_2d___ne__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2d___ne__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___ne__" "', argument " "1"" of type '" "VecMat::Vec<double,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___ne__" "', argument " "1"" of type '" "VecMat::Vec< double,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_double_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___ne__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___ne__" "', argument " "2"" of type '" "VecMat::Vec< double,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___ne__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___ne__" "', argument " "2"" of type '" "VecMat::Vec< double,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<double,2 > const *)arg1)->operator !=((VecMat::Vec<double,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec< double,2 > const *)arg1)->operator !=((VecMat::Vec< double,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12810,8 +12628,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2d___lt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
-  VecMat::Vec<double,2 > *arg2 = 0 ;
+  VecMat::Vec< double,2 > *arg1 = (VecMat::Vec< double,2 > *) 0 ;
+  VecMat::Vec< double,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -12821,22 +12639,22 @@ SWIGINTERN PyObject *_wrap_Vec_2d___lt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2d___lt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___lt__" "', argument " "1"" of type '" "VecMat::Vec<double,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___lt__" "', argument " "1"" of type '" "VecMat::Vec< double,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_double_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___lt__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___lt__" "', argument " "2"" of type '" "VecMat::Vec< double,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___lt__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___lt__" "', argument " "2"" of type '" "VecMat::Vec< double,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<double,2 > const *)arg1)->operator <((VecMat::Vec<double,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec< double,2 > const *)arg1)->operator <((VecMat::Vec< double,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12854,8 +12672,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2d___gt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,2 > *arg1 = (VecMat::Vec<double,2 > *) 0 ;
-  VecMat::Vec<double,2 > *arg2 = 0 ;
+  VecMat::Vec< double,2 > *arg1 = (VecMat::Vec< double,2 > *) 0 ;
+  VecMat::Vec< double,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -12865,22 +12683,22 @@ SWIGINTERN PyObject *_wrap_Vec_2d___gt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2d___gt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___gt__" "', argument " "1"" of type '" "VecMat::Vec<double,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2d___gt__" "', argument " "1"" of type '" "VecMat::Vec< double,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_double_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___gt__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2d___gt__" "', argument " "2"" of type '" "VecMat::Vec< double,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___gt__" "', argument " "2"" of type '" "VecMat::Vec<double,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2d___gt__" "', argument " "2"" of type '" "VecMat::Vec< double,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<double,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< double,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<double,2 > const *)arg1)->operator >((VecMat::Vec<double,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec< double,2 > const *)arg1)->operator >((VecMat::Vec< double,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12898,19 +12716,19 @@ fail:
 
 SWIGINTERN PyObject *Vec_2d_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecTdouble_2_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecT_double_2_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec_2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,2 > *result = 0 ;
+  VecMat::Vec< float,2 > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec_2f")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec<float,2 > *)new VecMat::Vec<float,2 >();
+      result = (VecMat::Vec< float,2 > *)new VecMat::Vec< float,2 >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12919,7 +12737,7 @@ SWIGINTERN PyObject *_wrap_new_Vec_2f(PyObject *SWIGUNUSEDPARM(self), PyObject *
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTfloat_2_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_float_2_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -12928,17 +12746,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec_2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
+  VecMat::Vec< float,2 > *arg1 = (VecMat::Vec< float,2 > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec_2f",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_2_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_2f" "', argument " "1"" of type '" "VecMat::Vec<float,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_2f" "', argument " "1"" of type '" "VecMat::Vec< float,2 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp1);
   {
     try {
       delete arg1;
@@ -12965,7 +12783,7 @@ SWIGINTERN PyObject *_wrap_Vec_2f_dim(PyObject *SWIGUNUSEDPARM(self), PyObject *
   if (!PyArg_ParseTuple(args,(char *)":Vec_2f_dim")) SWIG_fail;
   {
     try {
-      result = (unsigned int)VecMat::Vec<float,2 >::SWIGTEMPLATEDISAMBIGUATOR dim();
+      result = (unsigned int)VecMat::Vec< float,2 >::SWIGTEMPLATEDISAMBIGUATOR dim();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -12983,21 +12801,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2f_norm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
-  VecMat::Vec<float,2 >::value_type result;
+  VecMat::Vec< float,2 > *arg1 = (VecMat::Vec< float,2 > *) 0 ;
+  VecMat::Vec< float,2 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2f_norm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f_norm" "', argument " "1"" of type '" "VecMat::Vec<float,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f_norm" "', argument " "1"" of type '" "VecMat::Vec< float,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec<float,2 >::value_type)((VecMat::Vec<float,2 > const *)arg1)->norm();
+      result = (VecMat::Vec< float,2 >::value_type)((VecMat::Vec< float,2 > const *)arg1)->norm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13015,21 +12833,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2f_squareNorm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
-  VecMat::Vec<float,2 >::value_type result;
+  VecMat::Vec< float,2 > *arg1 = (VecMat::Vec< float,2 > *) 0 ;
+  VecMat::Vec< float,2 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2f_squareNorm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f_squareNorm" "', argument " "1"" of type '" "VecMat::Vec<float,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f_squareNorm" "', argument " "1"" of type '" "VecMat::Vec< float,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec<float,2 >::value_type)((VecMat::Vec<float,2 > const *)arg1)->squareNorm();
+      result = (VecMat::Vec< float,2 >::value_type)((VecMat::Vec< float,2 > const *)arg1)->squareNorm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13047,23 +12865,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2f_normalize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
-  VecMat::Vec<float,2 > *result = 0 ;
+  VecMat::Vec< float,2 > *arg1 = (VecMat::Vec< float,2 > *) 0 ;
+  VecMat::Vec< float,2 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2f_normalize",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f_normalize" "', argument " "1"" of type '" "VecMat::Vec<float,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f_normalize" "', argument " "1"" of type '" "VecMat::Vec< float,2 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec<float,2 > &_result_ref = (arg1)->normalize();
-        result = (VecMat::Vec<float,2 > *) &_result_ref;
+        VecMat::Vec< float,2 > &_result_ref = (arg1)->normalize();
+        result = (VecMat::Vec< float,2 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -13073,7 +12891,7 @@ SWIGINTERN PyObject *_wrap_Vec_2f_normalize(PyObject *SWIGUNUSEDPARM(self), PyOb
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_float_2_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -13082,23 +12900,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2f_normalizeSafe(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
-  VecMat::Vec<float,2 > *result = 0 ;
+  VecMat::Vec< float,2 > *arg1 = (VecMat::Vec< float,2 > *) 0 ;
+  VecMat::Vec< float,2 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_2f_normalizeSafe",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec<float,2 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec< float,2 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec<float,2 > &_result_ref = (arg1)->normalizeSafe();
-        result = (VecMat::Vec<float,2 > *) &_result_ref;
+        VecMat::Vec< float,2 > &_result_ref = (arg1)->normalizeSafe();
+        result = (VecMat::Vec< float,2 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -13108,7 +12926,7 @@ SWIGINTERN PyObject *_wrap_Vec_2f_normalizeSafe(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_float_2_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -13117,9 +12935,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2f___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
-  VecMat::Vec<float,2 > *arg2 = 0 ;
-  VecMat::Vec<float,2 > result;
+  VecMat::Vec< float,2 > *arg1 = (VecMat::Vec< float,2 > *) 0 ;
+  VecMat::Vec< float,2 > *arg2 = 0 ;
+  VecMat::Vec< float,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -13128,22 +12946,22 @@ SWIGINTERN PyObject *_wrap_Vec_2f___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2f___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___add__" "', argument " "1"" of type '" "VecMat::Vec<float,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___add__" "', argument " "1"" of type '" "VecMat::Vec< float,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_float_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___add__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___add__" "', argument " "2"" of type '" "VecMat::Vec< float,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___add__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___add__" "', argument " "2"" of type '" "VecMat::Vec< float,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec<float,2 > const *)arg1)->operator +((VecMat::Vec<float,2 > const &)*arg2);
+      result = ((VecMat::Vec< float,2 > const *)arg1)->operator +((VecMat::Vec< float,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13152,7 +12970,7 @@ SWIGINTERN PyObject *_wrap_Vec_2f___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<float,2 >(static_cast< const VecMat::Vec<float,2 >& >(result))), SWIGTYPE_p_VecMat__VecTfloat_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< float,2 >(static_cast< const VecMat::Vec< float,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_float_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -13161,9 +12979,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2f___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
-  VecMat::Vec<float,2 > *arg2 = 0 ;
-  VecMat::Vec<float,2 > result;
+  VecMat::Vec< float,2 > *arg1 = (VecMat::Vec< float,2 > *) 0 ;
+  VecMat::Vec< float,2 > *arg2 = 0 ;
+  VecMat::Vec< float,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -13172,22 +12990,22 @@ SWIGINTERN PyObject *_wrap_Vec_2f___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2f___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___sub__" "', argument " "1"" of type '" "VecMat::Vec<float,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___sub__" "', argument " "1"" of type '" "VecMat::Vec< float,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_float_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___sub__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___sub__" "', argument " "2"" of type '" "VecMat::Vec< float,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___sub__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___sub__" "', argument " "2"" of type '" "VecMat::Vec< float,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec<float,2 > const *)arg1)->operator -((VecMat::Vec<float,2 > const &)*arg2);
+      result = ((VecMat::Vec< float,2 > const *)arg1)->operator -((VecMat::Vec< float,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13196,7 +13014,7 @@ SWIGINTERN PyObject *_wrap_Vec_2f___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<float,2 >(static_cast< const VecMat::Vec<float,2 >& >(result))), SWIGTYPE_p_VecMat__VecTfloat_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< float,2 >(static_cast< const VecMat::Vec< float,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_float_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -13205,9 +13023,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2f___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
-  VecMat::Vec<float,2 >::value_type arg2 ;
-  VecMat::Vec<float,2 > result;
+  VecMat::Vec< float,2 > *arg1 = (VecMat::Vec< float,2 > *) 0 ;
+  VecMat::Vec< float,2 >::value_type arg2 ;
+  VecMat::Vec< float,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   float val2 ;
@@ -13216,19 +13034,19 @@ SWIGINTERN PyObject *_wrap_Vec_2f___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2f___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___mul__" "', argument " "1"" of type '" "VecMat::Vec<float,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___mul__" "', argument " "1"" of type '" "VecMat::Vec< float,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2f___mul__" "', argument " "2"" of type '" "VecMat::Vec<float,2 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2f___mul__" "', argument " "2"" of type '" "VecMat::Vec< float,2 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec<float,2 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec< float,2 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec<float,2 > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec< float,2 > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13237,7 +13055,7 @@ SWIGINTERN PyObject *_wrap_Vec_2f___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<float,2 >(static_cast< const VecMat::Vec<float,2 >& >(result))), SWIGTYPE_p_VecMat__VecTfloat_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< float,2 >(static_cast< const VecMat::Vec< float,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_float_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -13246,9 +13064,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2f___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
-  VecMat::Vec<float,2 >::value_type arg2 ;
-  VecMat::Vec<float,2 > result;
+  VecMat::Vec< float,2 > *arg1 = (VecMat::Vec< float,2 > *) 0 ;
+  VecMat::Vec< float,2 >::value_type arg2 ;
+  VecMat::Vec< float,2 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   float val2 ;
@@ -13257,19 +13075,19 @@ SWIGINTERN PyObject *_wrap_Vec_2f___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2f___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___div__" "', argument " "1"" of type '" "VecMat::Vec<float,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___div__" "', argument " "1"" of type '" "VecMat::Vec< float,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2f___div__" "', argument " "2"" of type '" "VecMat::Vec<float,2 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_2f___div__" "', argument " "2"" of type '" "VecMat::Vec< float,2 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec<float,2 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec< float,2 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec<float,2 > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec< float,2 > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13278,7 +13096,7 @@ SWIGINTERN PyObject *_wrap_Vec_2f___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<float,2 >(static_cast< const VecMat::Vec<float,2 >& >(result))), SWIGTYPE_p_VecMat__VecTfloat_2_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< float,2 >(static_cast< const VecMat::Vec< float,2 >& >(result))), SWIGTYPE_p_VecMat__VecT_float_2_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -13287,9 +13105,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2f___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
-  VecMat::Vec<float,2 > *arg2 = 0 ;
-  VecMat::Vec<float,2 >::value_type result;
+  VecMat::Vec< float,2 > *arg1 = (VecMat::Vec< float,2 > *) 0 ;
+  VecMat::Vec< float,2 > *arg2 = 0 ;
+  VecMat::Vec< float,2 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -13298,22 +13116,22 @@ SWIGINTERN PyObject *_wrap_Vec_2f___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2f___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___mul__" "', argument " "1"" of type '" "VecMat::Vec<float,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___mul__" "', argument " "1"" of type '" "VecMat::Vec< float,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_float_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___mul__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___mul__" "', argument " "2"" of type '" "VecMat::Vec< float,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___mul__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___mul__" "', argument " "2"" of type '" "VecMat::Vec< float,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp2);
   {
     try {
-      result = (VecMat::Vec<float,2 >::value_type)((VecMat::Vec<float,2 > const *)arg1)->operator *((VecMat::Vec<float,2 > const &)*arg2);
+      result = (VecMat::Vec< float,2 >::value_type)((VecMat::Vec< float,2 > const *)arg1)->operator *((VecMat::Vec< float,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13335,17 +13153,17 @@ SWIGINTERN PyObject *_wrap_Vec_2f___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTfloat_2_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_float_2_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecTfloat_2_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecT_float_2_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec_2f___mul____SWIG_1(self, args);
@@ -13355,7 +13173,7 @@ SWIGINTERN PyObject *_wrap_Vec_2f___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTfloat_2_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_float_2_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -13376,8 +13194,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2f___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
-  VecMat::Vec<float,2 > *arg2 = 0 ;
+  VecMat::Vec< float,2 > *arg1 = (VecMat::Vec< float,2 > *) 0 ;
+  VecMat::Vec< float,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -13387,22 +13205,22 @@ SWIGINTERN PyObject *_wrap_Vec_2f___eq__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2f___eq__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___eq__" "', argument " "1"" of type '" "VecMat::Vec<float,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___eq__" "', argument " "1"" of type '" "VecMat::Vec< float,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_float_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___eq__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___eq__" "', argument " "2"" of type '" "VecMat::Vec< float,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___eq__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___eq__" "', argument " "2"" of type '" "VecMat::Vec< float,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<float,2 > const *)arg1)->operator ==((VecMat::Vec<float,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec< float,2 > const *)arg1)->operator ==((VecMat::Vec< float,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13420,8 +13238,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2f___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
-  VecMat::Vec<float,2 > *arg2 = 0 ;
+  VecMat::Vec< float,2 > *arg1 = (VecMat::Vec< float,2 > *) 0 ;
+  VecMat::Vec< float,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -13431,22 +13249,22 @@ SWIGINTERN PyObject *_wrap_Vec_2f___ne__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2f___ne__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___ne__" "', argument " "1"" of type '" "VecMat::Vec<float,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___ne__" "', argument " "1"" of type '" "VecMat::Vec< float,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_float_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___ne__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___ne__" "', argument " "2"" of type '" "VecMat::Vec< float,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___ne__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___ne__" "', argument " "2"" of type '" "VecMat::Vec< float,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<float,2 > const *)arg1)->operator !=((VecMat::Vec<float,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec< float,2 > const *)arg1)->operator !=((VecMat::Vec< float,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13464,8 +13282,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2f___lt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
-  VecMat::Vec<float,2 > *arg2 = 0 ;
+  VecMat::Vec< float,2 > *arg1 = (VecMat::Vec< float,2 > *) 0 ;
+  VecMat::Vec< float,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -13475,22 +13293,22 @@ SWIGINTERN PyObject *_wrap_Vec_2f___lt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2f___lt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___lt__" "', argument " "1"" of type '" "VecMat::Vec<float,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___lt__" "', argument " "1"" of type '" "VecMat::Vec< float,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_float_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___lt__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___lt__" "', argument " "2"" of type '" "VecMat::Vec< float,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___lt__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___lt__" "', argument " "2"" of type '" "VecMat::Vec< float,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<float,2 > const *)arg1)->operator <((VecMat::Vec<float,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec< float,2 > const *)arg1)->operator <((VecMat::Vec< float,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13508,8 +13326,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_2f___gt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,2 > *arg1 = (VecMat::Vec<float,2 > *) 0 ;
-  VecMat::Vec<float,2 > *arg2 = 0 ;
+  VecMat::Vec< float,2 > *arg1 = (VecMat::Vec< float,2 > *) 0 ;
+  VecMat::Vec< float,2 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -13519,22 +13337,22 @@ SWIGINTERN PyObject *_wrap_Vec_2f___gt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_2f___gt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_2_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_2_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___gt__" "', argument " "1"" of type '" "VecMat::Vec<float,2 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_2f___gt__" "', argument " "1"" of type '" "VecMat::Vec< float,2 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_2_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_float_2_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___gt__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_2f___gt__" "', argument " "2"" of type '" "VecMat::Vec< float,2 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___gt__" "', argument " "2"" of type '" "VecMat::Vec<float,2 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_2f___gt__" "', argument " "2"" of type '" "VecMat::Vec< float,2 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<float,2 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< float,2 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<float,2 > const *)arg1)->operator >((VecMat::Vec<float,2 > const &)*arg2);
+      result = (bool)((VecMat::Vec< float,2 > const *)arg1)->operator >((VecMat::Vec< float,2 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13552,19 +13370,19 @@ fail:
 
 SWIGINTERN PyObject *Vec_2f_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecTfloat_2_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecT_float_2_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec2u__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<unsigned int > *result = 0 ;
+  VecMat::Vec2< unsigned int > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec2u")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec2<unsigned int > *)new VecMat::Vec2<unsigned int >();
+      result = (VecMat::Vec2< unsigned int > *)new VecMat::Vec2< unsigned int >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13573,7 +13391,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2u__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -13582,9 +13400,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec2u__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<unsigned int >::value_type arg1 ;
-  VecMat::Vec2<unsigned int >::value_type arg2 ;
-  VecMat::Vec2<unsigned int > *result = 0 ;
+  VecMat::Vec2< unsigned int >::value_type arg1 ;
+  VecMat::Vec2< unsigned int >::value_type arg2 ;
+  VecMat::Vec2< unsigned int > *result = 0 ;
   unsigned int val1 ;
   int ecode1 = 0 ;
   unsigned int val2 ;
@@ -13595,17 +13413,17 @@ SWIGINTERN PyObject *_wrap_new_Vec2u__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OO:new_Vec2u",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_unsigned_SS_int(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2u" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2u" "', argument " "1"" of type '" "VecMat::Vec2< unsigned int >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec2<unsigned int >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec2< unsigned int >::value_type >(val1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec2u" "', argument " "2"" of type '" "VecMat::Vec2<unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec2u" "', argument " "2"" of type '" "VecMat::Vec2< unsigned int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2<unsigned int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2< unsigned int >::value_type >(val2);
   {
     try {
-      result = (VecMat::Vec2<unsigned int > *)new VecMat::Vec2<unsigned int >(arg1,arg2);
+      result = (VecMat::Vec2< unsigned int > *)new VecMat::Vec2< unsigned int >(arg1,arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13614,7 +13432,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2u__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -13623,8 +13441,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec2u__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<unsigned int >::value_type arg1 ;
-  VecMat::Vec2<unsigned int > *result = 0 ;
+  VecMat::Vec2< unsigned int >::value_type arg1 ;
+  VecMat::Vec2< unsigned int > *result = 0 ;
   unsigned int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -13632,12 +13450,12 @@ SWIGINTERN PyObject *_wrap_new_Vec2u__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"O:new_Vec2u",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_unsigned_SS_int(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2u" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2u" "', argument " "1"" of type '" "VecMat::Vec2< unsigned int >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec2<unsigned int >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec2< unsigned int >::value_type >(val1);
   {
     try {
-      result = (VecMat::Vec2<unsigned int > *)new VecMat::Vec2<unsigned int >(arg1);
+      result = (VecMat::Vec2< unsigned int > *)new VecMat::Vec2< unsigned int >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13646,7 +13464,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2u__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -13659,7 +13477,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2u(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -13694,28 +13512,32 @@ SWIGINTERN PyObject *_wrap_new_Vec2u(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec2u'.\n  Possible C/C++ prototypes are:\n    VecMat::Vec2<(unsigned int)>()\n    VecMat::Vec2<(unsigned int)>(VecMat::Vec2<unsigned int >::value_type const,VecMat::Vec2<unsigned int >::value_type const)\n    VecMat::Vec2<(unsigned int)>(VecMat::Vec2<unsigned int >::value_type const)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec2u'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    VecMat::Vec2< unsigned int >()\n"
+    "    VecMat::Vec2< unsigned int >(VecMat::Vec2< unsigned int >::value_type const,VecMat::Vec2< unsigned int >::value_type const)\n"
+    "    VecMat::Vec2< unsigned int >(VecMat::Vec2< unsigned int >::value_type const)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec2u_x__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
-  VecMat::Vec2<unsigned int >::value_type result;
+  VecMat::Vec2< unsigned int > *arg1 = (VecMat::Vec2< unsigned int > *) 0 ;
+  VecMat::Vec2< unsigned int >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2u_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u_x" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u_x" "', argument " "1"" of type '" "VecMat::Vec2< unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< unsigned int > * >(argp1);
   {
     try {
-      result = (VecMat::Vec2<unsigned int >::value_type)((VecMat::Vec2<unsigned int > const *)arg1)->x();
+      result = (VecMat::Vec2< unsigned int >::value_type)((VecMat::Vec2< unsigned int > const *)arg1)->x();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13733,23 +13555,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2u_x__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
-  VecMat::Vec2<unsigned int >::value_type *result = 0 ;
+  VecMat::Vec2< unsigned int > *arg1 = (VecMat::Vec2< unsigned int > *) 0 ;
+  VecMat::Vec2< unsigned int >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2u_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u_x" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u_x" "', argument " "1"" of type '" "VecMat::Vec2< unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< unsigned int > * >(argp1);
   {
     try {
       {
-        VecMat::Vec2<unsigned int >::value_type &_result_ref = (arg1)->x();
-        result = (VecMat::Vec2<unsigned int >::value_type *) &_result_ref;
+        VecMat::Vec2< unsigned int >::value_type &_result_ref = (arg1)->x();
+        result = (VecMat::Vec2< unsigned int >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -13772,14 +13594,14 @@ SWIGINTERN PyObject *_wrap_Vec2u_x(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2u_x__SWIG_0(self, args);
@@ -13788,7 +13610,7 @@ SWIGINTERN PyObject *_wrap_Vec2u_x(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2u_x__SWIG_1(self, args);
@@ -13796,28 +13618,31 @@ SWIGINTERN PyObject *_wrap_Vec2u_x(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2u_x'.\n  Possible C/C++ prototypes are:\n    x()\n    x()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2u_x'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    x(VecMat::Vec2< unsigned int > const *)\n"
+    "    x(VecMat::Vec2< unsigned int > *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec2u_y__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
-  VecMat::Vec2<unsigned int >::value_type result;
+  VecMat::Vec2< unsigned int > *arg1 = (VecMat::Vec2< unsigned int > *) 0 ;
+  VecMat::Vec2< unsigned int >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2u_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u_y" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u_y" "', argument " "1"" of type '" "VecMat::Vec2< unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< unsigned int > * >(argp1);
   {
     try {
-      result = (VecMat::Vec2<unsigned int >::value_type)((VecMat::Vec2<unsigned int > const *)arg1)->y();
+      result = (VecMat::Vec2< unsigned int >::value_type)((VecMat::Vec2< unsigned int > const *)arg1)->y();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -13835,23 +13660,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2u_y__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
-  VecMat::Vec2<unsigned int >::value_type *result = 0 ;
+  VecMat::Vec2< unsigned int > *arg1 = (VecMat::Vec2< unsigned int > *) 0 ;
+  VecMat::Vec2< unsigned int >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2u_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u_y" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u_y" "', argument " "1"" of type '" "VecMat::Vec2< unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< unsigned int > * >(argp1);
   {
     try {
       {
-        VecMat::Vec2<unsigned int >::value_type &_result_ref = (arg1)->y();
-        result = (VecMat::Vec2<unsigned int >::value_type *) &_result_ref;
+        VecMat::Vec2< unsigned int >::value_type &_result_ref = (arg1)->y();
+        result = (VecMat::Vec2< unsigned int >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -13874,14 +13699,14 @@ SWIGINTERN PyObject *_wrap_Vec2u_y(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2u_y__SWIG_0(self, args);
@@ -13890,7 +13715,7 @@ SWIGINTERN PyObject *_wrap_Vec2u_y(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2u_y__SWIG_1(self, args);
@@ -13898,15 +13723,18 @@ SWIGINTERN PyObject *_wrap_Vec2u_y(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2u_y'.\n  Possible C/C++ prototypes are:\n    y()\n    y()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2u_y'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    y(VecMat::Vec2< unsigned int > const *)\n"
+    "    y(VecMat::Vec2< unsigned int > *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec2u_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
-  VecMat::Vec2<unsigned int >::value_type arg2 ;
+  VecMat::Vec2< unsigned int > *arg1 = (VecMat::Vec2< unsigned int > *) 0 ;
+  VecMat::Vec2< unsigned int >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned int val2 ;
@@ -13915,16 +13743,16 @@ SWIGINTERN PyObject *_wrap_Vec2u_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2u_setX",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u_setX" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u_setX" "', argument " "1"" of type '" "VecMat::Vec2< unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< unsigned int > * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2u_setX" "', argument " "2"" of type '" "VecMat::Vec2<unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2u_setX" "', argument " "2"" of type '" "VecMat::Vec2< unsigned int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2<unsigned int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2< unsigned int >::value_type >(val2);
   {
     try {
       (arg1)->setX(arg2);
@@ -13945,8 +13773,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2u_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
-  VecMat::Vec2<unsigned int >::value_type arg2 ;
+  VecMat::Vec2< unsigned int > *arg1 = (VecMat::Vec2< unsigned int > *) 0 ;
+  VecMat::Vec2< unsigned int >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned int val2 ;
@@ -13955,16 +13783,16 @@ SWIGINTERN PyObject *_wrap_Vec2u_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2u_setY",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u_setY" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u_setY" "', argument " "1"" of type '" "VecMat::Vec2< unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< unsigned int > * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2u_setY" "', argument " "2"" of type '" "VecMat::Vec2<unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2u_setY" "', argument " "2"" of type '" "VecMat::Vec2< unsigned int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2<unsigned int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2< unsigned int >::value_type >(val2);
   {
     try {
       (arg1)->setY(arg2);
@@ -13985,9 +13813,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2u___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
-  VecMat::Vec2<unsigned int > *arg2 = 0 ;
-  VecMat::Vec2<unsigned int > result;
+  VecMat::Vec2< unsigned int > *arg1 = (VecMat::Vec2< unsigned int > *) 0 ;
+  VecMat::Vec2< unsigned int > *arg2 = 0 ;
+  VecMat::Vec2< unsigned int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -13996,22 +13824,22 @@ SWIGINTERN PyObject *_wrap_Vec2u___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2u___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u___add__" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u___add__" "', argument " "1"" of type '" "VecMat::Vec2< unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec2< unsigned int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2u___add__" "', argument " "2"" of type '" "VecMat::Vec2<unsigned int > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2u___add__" "', argument " "2"" of type '" "VecMat::Vec2< unsigned int > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2u___add__" "', argument " "2"" of type '" "VecMat::Vec2<unsigned int > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2u___add__" "', argument " "2"" of type '" "VecMat::Vec2< unsigned int > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec2< unsigned int > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec2<unsigned int > const *)arg1)->operator +((VecMat::Vec2<unsigned int > const &)*arg2);
+      result = ((VecMat::Vec2< unsigned int > const *)arg1)->operator +((VecMat::Vec2< unsigned int > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -14020,7 +13848,7 @@ SWIGINTERN PyObject *_wrap_Vec2u___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<unsigned int >(static_cast< const VecMat::Vec2<unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< unsigned int >(static_cast< const VecMat::Vec2< unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -14029,9 +13857,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2u___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
-  VecMat::Vec2<unsigned int > *arg2 = 0 ;
-  VecMat::Vec2<unsigned int > result;
+  VecMat::Vec2< unsigned int > *arg1 = (VecMat::Vec2< unsigned int > *) 0 ;
+  VecMat::Vec2< unsigned int > *arg2 = 0 ;
+  VecMat::Vec2< unsigned int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -14040,22 +13868,22 @@ SWIGINTERN PyObject *_wrap_Vec2u___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2u___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u___sub__" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u___sub__" "', argument " "1"" of type '" "VecMat::Vec2< unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec2< unsigned int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2u___sub__" "', argument " "2"" of type '" "VecMat::Vec2<unsigned int > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2u___sub__" "', argument " "2"" of type '" "VecMat::Vec2< unsigned int > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2u___sub__" "', argument " "2"" of type '" "VecMat::Vec2<unsigned int > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2u___sub__" "', argument " "2"" of type '" "VecMat::Vec2< unsigned int > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec2< unsigned int > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec2<unsigned int > const *)arg1)->operator -((VecMat::Vec2<unsigned int > const &)*arg2);
+      result = ((VecMat::Vec2< unsigned int > const *)arg1)->operator -((VecMat::Vec2< unsigned int > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -14064,7 +13892,7 @@ SWIGINTERN PyObject *_wrap_Vec2u___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<unsigned int >(static_cast< const VecMat::Vec2<unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< unsigned int >(static_cast< const VecMat::Vec2< unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -14073,9 +13901,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2u___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
-  VecMat::Vec2<unsigned int >::value_type arg2 ;
-  VecMat::Vec2<unsigned int > result;
+  VecMat::Vec2< unsigned int > *arg1 = (VecMat::Vec2< unsigned int > *) 0 ;
+  VecMat::Vec2< unsigned int >::value_type arg2 ;
+  VecMat::Vec2< unsigned int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned int val2 ;
@@ -14084,19 +13912,19 @@ SWIGINTERN PyObject *_wrap_Vec2u___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2u___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u___mul__" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u___mul__" "', argument " "1"" of type '" "VecMat::Vec2< unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< unsigned int > * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2u___mul__" "', argument " "2"" of type '" "VecMat::Vec2<unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2u___mul__" "', argument " "2"" of type '" "VecMat::Vec2< unsigned int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2<unsigned int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2< unsigned int >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec2<unsigned int > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec2< unsigned int > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -14105,7 +13933,7 @@ SWIGINTERN PyObject *_wrap_Vec2u___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<unsigned int >(static_cast< const VecMat::Vec2<unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< unsigned int >(static_cast< const VecMat::Vec2< unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -14114,9 +13942,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2u___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
-  VecMat::Vec2<unsigned int >::value_type arg2 ;
-  VecMat::Vec2<unsigned int > result;
+  VecMat::Vec2< unsigned int > *arg1 = (VecMat::Vec2< unsigned int > *) 0 ;
+  VecMat::Vec2< unsigned int >::value_type arg2 ;
+  VecMat::Vec2< unsigned int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned int val2 ;
@@ -14125,19 +13953,19 @@ SWIGINTERN PyObject *_wrap_Vec2u___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2u___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u___div__" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u___div__" "', argument " "1"" of type '" "VecMat::Vec2< unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< unsigned int > * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2u___div__" "', argument " "2"" of type '" "VecMat::Vec2<unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2u___div__" "', argument " "2"" of type '" "VecMat::Vec2< unsigned int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2<unsigned int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2< unsigned int >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec2<unsigned int > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec2< unsigned int > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -14146,7 +13974,7 @@ SWIGINTERN PyObject *_wrap_Vec2u___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<unsigned int >(static_cast< const VecMat::Vec2<unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< unsigned int >(static_cast< const VecMat::Vec2< unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -14155,9 +13983,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2u___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
-  VecMat::Vec2<unsigned int > *arg2 = 0 ;
-  VecMat::Vec2<unsigned int >::value_type result;
+  VecMat::Vec2< unsigned int > *arg1 = (VecMat::Vec2< unsigned int > *) 0 ;
+  VecMat::Vec2< unsigned int > *arg2 = 0 ;
+  VecMat::Vec2< unsigned int >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -14166,22 +13994,22 @@ SWIGINTERN PyObject *_wrap_Vec2u___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2u___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u___mul__" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2u___mul__" "', argument " "1"" of type '" "VecMat::Vec2< unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec2< unsigned int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2u___mul__" "', argument " "2"" of type '" "VecMat::Vec2<unsigned int > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2u___mul__" "', argument " "2"" of type '" "VecMat::Vec2< unsigned int > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2u___mul__" "', argument " "2"" of type '" "VecMat::Vec2<unsigned int > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2u___mul__" "', argument " "2"" of type '" "VecMat::Vec2< unsigned int > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec2< unsigned int > * >(argp2);
   {
     try {
-      result = (VecMat::Vec2<unsigned int >::value_type)((VecMat::Vec2<unsigned int > const *)arg1)->operator *((VecMat::Vec2<unsigned int > const &)*arg2);
+      result = (VecMat::Vec2< unsigned int >::value_type)((VecMat::Vec2< unsigned int > const *)arg1)->operator *((VecMat::Vec2< unsigned int > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -14203,17 +14031,17 @@ SWIGINTERN PyObject *_wrap_Vec2u___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec2u___mul____SWIG_1(self, args);
@@ -14223,7 +14051,7 @@ SWIGINTERN PyObject *_wrap_Vec2u___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -14244,17 +14072,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec2u(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<unsigned int > *arg1 = (VecMat::Vec2<unsigned int > *) 0 ;
+  VecMat::Vec2< unsigned int > *arg1 = (VecMat::Vec2< unsigned int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec2u",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec2u" "', argument " "1"" of type '" "VecMat::Vec2<unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec2u" "', argument " "1"" of type '" "VecMat::Vec2< unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< unsigned int > * >(argp1);
   {
     try {
       delete arg1;
@@ -14276,19 +14104,19 @@ fail:
 
 SWIGINTERN PyObject *Vec2u_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec2Tunsigned_int_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec2T_unsigned_int_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec2i__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<int > *result = 0 ;
+  VecMat::Vec2< int > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec2i")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec2<int > *)new VecMat::Vec2<int >();
+      result = (VecMat::Vec2< int > *)new VecMat::Vec2< int >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -14297,7 +14125,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2i__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tint_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2T_int_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -14306,9 +14134,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec2i__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<int >::value_type arg1 ;
-  VecMat::Vec2<int >::value_type arg2 ;
-  VecMat::Vec2<int > *result = 0 ;
+  VecMat::Vec2< int >::value_type arg1 ;
+  VecMat::Vec2< int >::value_type arg2 ;
+  VecMat::Vec2< int > *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -14319,17 +14147,17 @@ SWIGINTERN PyObject *_wrap_new_Vec2i__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OO:new_Vec2i",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2i" "', argument " "1"" of type '" "VecMat::Vec2<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2i" "', argument " "1"" of type '" "VecMat::Vec2< int >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec2<int >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec2< int >::value_type >(val1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec2i" "', argument " "2"" of type '" "VecMat::Vec2<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec2i" "', argument " "2"" of type '" "VecMat::Vec2< int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2<int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2< int >::value_type >(val2);
   {
     try {
-      result = (VecMat::Vec2<int > *)new VecMat::Vec2<int >(arg1,arg2);
+      result = (VecMat::Vec2< int > *)new VecMat::Vec2< int >(arg1,arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -14338,7 +14166,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2i__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tint_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2T_int_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -14347,8 +14175,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec2i__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<int >::value_type arg1 ;
-  VecMat::Vec2<int > *result = 0 ;
+  VecMat::Vec2< int >::value_type arg1 ;
+  VecMat::Vec2< int > *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -14356,12 +14184,12 @@ SWIGINTERN PyObject *_wrap_new_Vec2i__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"O:new_Vec2i",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2i" "', argument " "1"" of type '" "VecMat::Vec2<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2i" "', argument " "1"" of type '" "VecMat::Vec2< int >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec2<int >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec2< int >::value_type >(val1);
   {
     try {
-      result = (VecMat::Vec2<int > *)new VecMat::Vec2<int >(arg1);
+      result = (VecMat::Vec2< int > *)new VecMat::Vec2< int >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -14370,7 +14198,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2i__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tint_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2T_int_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -14383,7 +14211,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2i(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -14418,28 +14246,32 @@ SWIGINTERN PyObject *_wrap_new_Vec2i(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec2i'.\n  Possible C/C++ prototypes are:\n    VecMat::Vec2<(int)>()\n    VecMat::Vec2<(int)>(VecMat::Vec2<int >::value_type const,VecMat::Vec2<int >::value_type const)\n    VecMat::Vec2<(int)>(VecMat::Vec2<int >::value_type const)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec2i'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    VecMat::Vec2< int >()\n"
+    "    VecMat::Vec2< int >(VecMat::Vec2< int >::value_type const,VecMat::Vec2< int >::value_type const)\n"
+    "    VecMat::Vec2< int >(VecMat::Vec2< int >::value_type const)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec2i_x__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
-  VecMat::Vec2<int >::value_type result;
+  VecMat::Vec2< int > *arg1 = (VecMat::Vec2< int > *) 0 ;
+  VecMat::Vec2< int >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2i_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i_x" "', argument " "1"" of type '" "VecMat::Vec2<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i_x" "', argument " "1"" of type '" "VecMat::Vec2< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< int > * >(argp1);
   {
     try {
-      result = (VecMat::Vec2<int >::value_type)((VecMat::Vec2<int > const *)arg1)->x();
+      result = (VecMat::Vec2< int >::value_type)((VecMat::Vec2< int > const *)arg1)->x();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -14457,23 +14289,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2i_x__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
-  VecMat::Vec2<int >::value_type *result = 0 ;
+  VecMat::Vec2< int > *arg1 = (VecMat::Vec2< int > *) 0 ;
+  VecMat::Vec2< int >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2i_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i_x" "', argument " "1"" of type '" "VecMat::Vec2<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i_x" "', argument " "1"" of type '" "VecMat::Vec2< int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< int > * >(argp1);
   {
     try {
       {
-        VecMat::Vec2<int >::value_type &_result_ref = (arg1)->x();
-        result = (VecMat::Vec2<int >::value_type *) &_result_ref;
+        VecMat::Vec2< int >::value_type &_result_ref = (arg1)->x();
+        result = (VecMat::Vec2< int >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -14496,14 +14328,14 @@ SWIGINTERN PyObject *_wrap_Vec2i_x(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tint_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2i_x__SWIG_0(self, args);
@@ -14512,7 +14344,7 @@ SWIGINTERN PyObject *_wrap_Vec2i_x(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tint_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2i_x__SWIG_1(self, args);
@@ -14520,28 +14352,31 @@ SWIGINTERN PyObject *_wrap_Vec2i_x(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2i_x'.\n  Possible C/C++ prototypes are:\n    x()\n    x()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2i_x'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    x(VecMat::Vec2< int > const *)\n"
+    "    x(VecMat::Vec2< int > *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec2i_y__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
-  VecMat::Vec2<int >::value_type result;
+  VecMat::Vec2< int > *arg1 = (VecMat::Vec2< int > *) 0 ;
+  VecMat::Vec2< int >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2i_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i_y" "', argument " "1"" of type '" "VecMat::Vec2<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i_y" "', argument " "1"" of type '" "VecMat::Vec2< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< int > * >(argp1);
   {
     try {
-      result = (VecMat::Vec2<int >::value_type)((VecMat::Vec2<int > const *)arg1)->y();
+      result = (VecMat::Vec2< int >::value_type)((VecMat::Vec2< int > const *)arg1)->y();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -14559,23 +14394,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2i_y__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
-  VecMat::Vec2<int >::value_type *result = 0 ;
+  VecMat::Vec2< int > *arg1 = (VecMat::Vec2< int > *) 0 ;
+  VecMat::Vec2< int >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2i_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i_y" "', argument " "1"" of type '" "VecMat::Vec2<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i_y" "', argument " "1"" of type '" "VecMat::Vec2< int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< int > * >(argp1);
   {
     try {
       {
-        VecMat::Vec2<int >::value_type &_result_ref = (arg1)->y();
-        result = (VecMat::Vec2<int >::value_type *) &_result_ref;
+        VecMat::Vec2< int >::value_type &_result_ref = (arg1)->y();
+        result = (VecMat::Vec2< int >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -14598,14 +14433,14 @@ SWIGINTERN PyObject *_wrap_Vec2i_y(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tint_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2i_y__SWIG_0(self, args);
@@ -14614,7 +14449,7 @@ SWIGINTERN PyObject *_wrap_Vec2i_y(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tint_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2i_y__SWIG_1(self, args);
@@ -14622,15 +14457,18 @@ SWIGINTERN PyObject *_wrap_Vec2i_y(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2i_y'.\n  Possible C/C++ prototypes are:\n    y()\n    y()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2i_y'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    y(VecMat::Vec2< int > const *)\n"
+    "    y(VecMat::Vec2< int > *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec2i_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
-  VecMat::Vec2<int >::value_type arg2 ;
+  VecMat::Vec2< int > *arg1 = (VecMat::Vec2< int > *) 0 ;
+  VecMat::Vec2< int >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -14639,16 +14477,16 @@ SWIGINTERN PyObject *_wrap_Vec2i_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2i_setX",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i_setX" "', argument " "1"" of type '" "VecMat::Vec2<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i_setX" "', argument " "1"" of type '" "VecMat::Vec2< int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< int > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2i_setX" "', argument " "2"" of type '" "VecMat::Vec2<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2i_setX" "', argument " "2"" of type '" "VecMat::Vec2< int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2<int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2< int >::value_type >(val2);
   {
     try {
       (arg1)->setX(arg2);
@@ -14669,8 +14507,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2i_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
-  VecMat::Vec2<int >::value_type arg2 ;
+  VecMat::Vec2< int > *arg1 = (VecMat::Vec2< int > *) 0 ;
+  VecMat::Vec2< int >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -14679,16 +14517,16 @@ SWIGINTERN PyObject *_wrap_Vec2i_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2i_setY",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i_setY" "', argument " "1"" of type '" "VecMat::Vec2<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i_setY" "', argument " "1"" of type '" "VecMat::Vec2< int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< int > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2i_setY" "', argument " "2"" of type '" "VecMat::Vec2<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2i_setY" "', argument " "2"" of type '" "VecMat::Vec2< int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2<int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2< int >::value_type >(val2);
   {
     try {
       (arg1)->setY(arg2);
@@ -14709,9 +14547,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2i___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
-  VecMat::Vec2<int > *arg2 = 0 ;
-  VecMat::Vec2<int > result;
+  VecMat::Vec2< int > *arg1 = (VecMat::Vec2< int > *) 0 ;
+  VecMat::Vec2< int > *arg2 = 0 ;
+  VecMat::Vec2< int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -14720,22 +14558,22 @@ SWIGINTERN PyObject *_wrap_Vec2i___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2i___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i___add__" "', argument " "1"" of type '" "VecMat::Vec2<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i___add__" "', argument " "1"" of type '" "VecMat::Vec2< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tint_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec2< int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_int_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2i___add__" "', argument " "2"" of type '" "VecMat::Vec2<int > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2i___add__" "', argument " "2"" of type '" "VecMat::Vec2< int > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2i___add__" "', argument " "2"" of type '" "VecMat::Vec2<int > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2i___add__" "', argument " "2"" of type '" "VecMat::Vec2< int > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec2<int > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec2< int > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec2<int > const *)arg1)->operator +((VecMat::Vec2<int > const &)*arg2);
+      result = ((VecMat::Vec2< int > const *)arg1)->operator +((VecMat::Vec2< int > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -14744,7 +14582,7 @@ SWIGINTERN PyObject *_wrap_Vec2i___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<int >(static_cast< const VecMat::Vec2<int >& >(result))), SWIGTYPE_p_VecMat__Vec2Tint_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< int >(static_cast< const VecMat::Vec2< int >& >(result))), SWIGTYPE_p_VecMat__Vec2T_int_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -14753,9 +14591,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2i___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
-  VecMat::Vec2<int > *arg2 = 0 ;
-  VecMat::Vec2<int > result;
+  VecMat::Vec2< int > *arg1 = (VecMat::Vec2< int > *) 0 ;
+  VecMat::Vec2< int > *arg2 = 0 ;
+  VecMat::Vec2< int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -14764,22 +14602,22 @@ SWIGINTERN PyObject *_wrap_Vec2i___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2i___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i___sub__" "', argument " "1"" of type '" "VecMat::Vec2<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i___sub__" "', argument " "1"" of type '" "VecMat::Vec2< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tint_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec2< int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_int_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2i___sub__" "', argument " "2"" of type '" "VecMat::Vec2<int > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2i___sub__" "', argument " "2"" of type '" "VecMat::Vec2< int > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2i___sub__" "', argument " "2"" of type '" "VecMat::Vec2<int > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2i___sub__" "', argument " "2"" of type '" "VecMat::Vec2< int > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec2<int > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec2< int > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec2<int > const *)arg1)->operator -((VecMat::Vec2<int > const &)*arg2);
+      result = ((VecMat::Vec2< int > const *)arg1)->operator -((VecMat::Vec2< int > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -14788,7 +14626,7 @@ SWIGINTERN PyObject *_wrap_Vec2i___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<int >(static_cast< const VecMat::Vec2<int >& >(result))), SWIGTYPE_p_VecMat__Vec2Tint_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< int >(static_cast< const VecMat::Vec2< int >& >(result))), SWIGTYPE_p_VecMat__Vec2T_int_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -14797,9 +14635,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2i___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
-  VecMat::Vec2<int >::value_type arg2 ;
-  VecMat::Vec2<int > result;
+  VecMat::Vec2< int > *arg1 = (VecMat::Vec2< int > *) 0 ;
+  VecMat::Vec2< int >::value_type arg2 ;
+  VecMat::Vec2< int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -14808,19 +14646,19 @@ SWIGINTERN PyObject *_wrap_Vec2i___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2i___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i___mul__" "', argument " "1"" of type '" "VecMat::Vec2<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i___mul__" "', argument " "1"" of type '" "VecMat::Vec2< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< int > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2i___mul__" "', argument " "2"" of type '" "VecMat::Vec2<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2i___mul__" "', argument " "2"" of type '" "VecMat::Vec2< int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2<int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2< int >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec2<int > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec2< int > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -14829,7 +14667,7 @@ SWIGINTERN PyObject *_wrap_Vec2i___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<int >(static_cast< const VecMat::Vec2<int >& >(result))), SWIGTYPE_p_VecMat__Vec2Tint_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< int >(static_cast< const VecMat::Vec2< int >& >(result))), SWIGTYPE_p_VecMat__Vec2T_int_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -14838,9 +14676,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2i___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
-  VecMat::Vec2<int >::value_type arg2 ;
-  VecMat::Vec2<int > result;
+  VecMat::Vec2< int > *arg1 = (VecMat::Vec2< int > *) 0 ;
+  VecMat::Vec2< int >::value_type arg2 ;
+  VecMat::Vec2< int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -14849,19 +14687,19 @@ SWIGINTERN PyObject *_wrap_Vec2i___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2i___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i___div__" "', argument " "1"" of type '" "VecMat::Vec2<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i___div__" "', argument " "1"" of type '" "VecMat::Vec2< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< int > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2i___div__" "', argument " "2"" of type '" "VecMat::Vec2<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2i___div__" "', argument " "2"" of type '" "VecMat::Vec2< int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2<int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2< int >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec2<int > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec2< int > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -14870,7 +14708,7 @@ SWIGINTERN PyObject *_wrap_Vec2i___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<int >(static_cast< const VecMat::Vec2<int >& >(result))), SWIGTYPE_p_VecMat__Vec2Tint_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< int >(static_cast< const VecMat::Vec2< int >& >(result))), SWIGTYPE_p_VecMat__Vec2T_int_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -14879,9 +14717,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2i___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
-  VecMat::Vec2<int > *arg2 = 0 ;
-  VecMat::Vec2<int >::value_type result;
+  VecMat::Vec2< int > *arg1 = (VecMat::Vec2< int > *) 0 ;
+  VecMat::Vec2< int > *arg2 = 0 ;
+  VecMat::Vec2< int >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -14890,22 +14728,22 @@ SWIGINTERN PyObject *_wrap_Vec2i___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2i___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i___mul__" "', argument " "1"" of type '" "VecMat::Vec2<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2i___mul__" "', argument " "1"" of type '" "VecMat::Vec2< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tint_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec2< int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_int_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2i___mul__" "', argument " "2"" of type '" "VecMat::Vec2<int > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2i___mul__" "', argument " "2"" of type '" "VecMat::Vec2< int > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2i___mul__" "', argument " "2"" of type '" "VecMat::Vec2<int > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2i___mul__" "', argument " "2"" of type '" "VecMat::Vec2< int > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec2<int > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec2< int > * >(argp2);
   {
     try {
-      result = (VecMat::Vec2<int >::value_type)((VecMat::Vec2<int > const *)arg1)->operator *((VecMat::Vec2<int > const &)*arg2);
+      result = (VecMat::Vec2< int >::value_type)((VecMat::Vec2< int > const *)arg1)->operator *((VecMat::Vec2< int > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -14927,17 +14765,17 @@ SWIGINTERN PyObject *_wrap_Vec2i___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tint_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2Tint_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2T_int_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec2i___mul____SWIG_1(self, args);
@@ -14947,7 +14785,7 @@ SWIGINTERN PyObject *_wrap_Vec2i___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tint_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -14968,17 +14806,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec2i(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<int > *arg1 = (VecMat::Vec2<int > *) 0 ;
+  VecMat::Vec2< int > *arg1 = (VecMat::Vec2< int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec2i",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tint_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_int_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec2i" "', argument " "1"" of type '" "VecMat::Vec2<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec2i" "', argument " "1"" of type '" "VecMat::Vec2< int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< int > * >(argp1);
   {
     try {
       delete arg1;
@@ -15000,19 +14838,19 @@ fail:
 
 SWIGINTERN PyObject *Vec2i_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec2Tint_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec2T_int_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec2f__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<float > *result = 0 ;
+  VecMat::Vec2< float > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec2f")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec2<float > *)new VecMat::Vec2<float >();
+      result = (VecMat::Vec2< float > *)new VecMat::Vec2< float >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -15021,7 +14859,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2f__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -15030,9 +14868,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec2f__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<float >::value_type arg1 ;
-  VecMat::Vec2<float >::value_type arg2 ;
-  VecMat::Vec2<float > *result = 0 ;
+  VecMat::Vec2< float >::value_type arg1 ;
+  VecMat::Vec2< float >::value_type arg2 ;
+  VecMat::Vec2< float > *result = 0 ;
   float val1 ;
   int ecode1 = 0 ;
   float val2 ;
@@ -15043,17 +14881,17 @@ SWIGINTERN PyObject *_wrap_new_Vec2f__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OO:new_Vec2f",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_float(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2f" "', argument " "1"" of type '" "VecMat::Vec2<float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2f" "', argument " "1"" of type '" "VecMat::Vec2< float >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec2<float >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec2< float >::value_type >(val1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec2f" "', argument " "2"" of type '" "VecMat::Vec2<float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec2f" "', argument " "2"" of type '" "VecMat::Vec2< float >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2<float >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2< float >::value_type >(val2);
   {
     try {
-      result = (VecMat::Vec2<float > *)new VecMat::Vec2<float >(arg1,arg2);
+      result = (VecMat::Vec2< float > *)new VecMat::Vec2< float >(arg1,arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -15062,7 +14900,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2f__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -15071,8 +14909,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec2f__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<float >::value_type arg1 ;
-  VecMat::Vec2<float > *result = 0 ;
+  VecMat::Vec2< float >::value_type arg1 ;
+  VecMat::Vec2< float > *result = 0 ;
   float val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -15080,12 +14918,12 @@ SWIGINTERN PyObject *_wrap_new_Vec2f__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"O:new_Vec2f",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_float(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2f" "', argument " "1"" of type '" "VecMat::Vec2<float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2f" "', argument " "1"" of type '" "VecMat::Vec2< float >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec2<float >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec2< float >::value_type >(val1);
   {
     try {
-      result = (VecMat::Vec2<float > *)new VecMat::Vec2<float >(arg1);
+      result = (VecMat::Vec2< float > *)new VecMat::Vec2< float >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -15094,7 +14932,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2f__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -15107,7 +14945,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2f(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -15142,28 +14980,32 @@ SWIGINTERN PyObject *_wrap_new_Vec2f(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec2f'.\n  Possible C/C++ prototypes are:\n    VecMat::Vec2<(float)>()\n    VecMat::Vec2<(float)>(VecMat::Vec2<float >::value_type const,VecMat::Vec2<float >::value_type const)\n    VecMat::Vec2<(float)>(VecMat::Vec2<float >::value_type const)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec2f'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    VecMat::Vec2< float >()\n"
+    "    VecMat::Vec2< float >(VecMat::Vec2< float >::value_type const,VecMat::Vec2< float >::value_type const)\n"
+    "    VecMat::Vec2< float >(VecMat::Vec2< float >::value_type const)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec2f_x__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
-  VecMat::Vec2<float >::value_type result;
+  VecMat::Vec2< float > *arg1 = (VecMat::Vec2< float > *) 0 ;
+  VecMat::Vec2< float >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2f_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f_x" "', argument " "1"" of type '" "VecMat::Vec2<float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f_x" "', argument " "1"" of type '" "VecMat::Vec2< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< float > * >(argp1);
   {
     try {
-      result = (VecMat::Vec2<float >::value_type)((VecMat::Vec2<float > const *)arg1)->x();
+      result = (VecMat::Vec2< float >::value_type)((VecMat::Vec2< float > const *)arg1)->x();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -15181,23 +15023,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2f_x__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
-  VecMat::Vec2<float >::value_type *result = 0 ;
+  VecMat::Vec2< float > *arg1 = (VecMat::Vec2< float > *) 0 ;
+  VecMat::Vec2< float >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2f_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f_x" "', argument " "1"" of type '" "VecMat::Vec2<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f_x" "', argument " "1"" of type '" "VecMat::Vec2< float > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< float > * >(argp1);
   {
     try {
       {
-        VecMat::Vec2<float >::value_type &_result_ref = (arg1)->x();
-        result = (VecMat::Vec2<float >::value_type *) &_result_ref;
+        VecMat::Vec2< float >::value_type &_result_ref = (arg1)->x();
+        result = (VecMat::Vec2< float >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -15220,14 +15062,14 @@ SWIGINTERN PyObject *_wrap_Vec2f_x(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_float_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2f_x__SWIG_0(self, args);
@@ -15236,7 +15078,7 @@ SWIGINTERN PyObject *_wrap_Vec2f_x(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_float_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2f_x__SWIG_1(self, args);
@@ -15244,28 +15086,31 @@ SWIGINTERN PyObject *_wrap_Vec2f_x(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2f_x'.\n  Possible C/C++ prototypes are:\n    x()\n    x()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2f_x'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    x(VecMat::Vec2< float > const *)\n"
+    "    x(VecMat::Vec2< float > *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec2f_y__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
-  VecMat::Vec2<float >::value_type result;
+  VecMat::Vec2< float > *arg1 = (VecMat::Vec2< float > *) 0 ;
+  VecMat::Vec2< float >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2f_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f_y" "', argument " "1"" of type '" "VecMat::Vec2<float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f_y" "', argument " "1"" of type '" "VecMat::Vec2< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< float > * >(argp1);
   {
     try {
-      result = (VecMat::Vec2<float >::value_type)((VecMat::Vec2<float > const *)arg1)->y();
+      result = (VecMat::Vec2< float >::value_type)((VecMat::Vec2< float > const *)arg1)->y();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -15283,23 +15128,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2f_y__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
-  VecMat::Vec2<float >::value_type *result = 0 ;
+  VecMat::Vec2< float > *arg1 = (VecMat::Vec2< float > *) 0 ;
+  VecMat::Vec2< float >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2f_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f_y" "', argument " "1"" of type '" "VecMat::Vec2<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f_y" "', argument " "1"" of type '" "VecMat::Vec2< float > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< float > * >(argp1);
   {
     try {
       {
-        VecMat::Vec2<float >::value_type &_result_ref = (arg1)->y();
-        result = (VecMat::Vec2<float >::value_type *) &_result_ref;
+        VecMat::Vec2< float >::value_type &_result_ref = (arg1)->y();
+        result = (VecMat::Vec2< float >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -15322,14 +15167,14 @@ SWIGINTERN PyObject *_wrap_Vec2f_y(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_float_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2f_y__SWIG_0(self, args);
@@ -15338,7 +15183,7 @@ SWIGINTERN PyObject *_wrap_Vec2f_y(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_float_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2f_y__SWIG_1(self, args);
@@ -15346,15 +15191,18 @@ SWIGINTERN PyObject *_wrap_Vec2f_y(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2f_y'.\n  Possible C/C++ prototypes are:\n    y()\n    y()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2f_y'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    y(VecMat::Vec2< float > const *)\n"
+    "    y(VecMat::Vec2< float > *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec2f_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
-  VecMat::Vec2<float >::value_type arg2 ;
+  VecMat::Vec2< float > *arg1 = (VecMat::Vec2< float > *) 0 ;
+  VecMat::Vec2< float >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   float val2 ;
@@ -15363,16 +15211,16 @@ SWIGINTERN PyObject *_wrap_Vec2f_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2f_setX",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f_setX" "', argument " "1"" of type '" "VecMat::Vec2<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f_setX" "', argument " "1"" of type '" "VecMat::Vec2< float > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< float > * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2f_setX" "', argument " "2"" of type '" "VecMat::Vec2<float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2f_setX" "', argument " "2"" of type '" "VecMat::Vec2< float >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2<float >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2< float >::value_type >(val2);
   {
     try {
       (arg1)->setX(arg2);
@@ -15393,8 +15241,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2f_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
-  VecMat::Vec2<float >::value_type arg2 ;
+  VecMat::Vec2< float > *arg1 = (VecMat::Vec2< float > *) 0 ;
+  VecMat::Vec2< float >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   float val2 ;
@@ -15403,16 +15251,16 @@ SWIGINTERN PyObject *_wrap_Vec2f_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2f_setY",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f_setY" "', argument " "1"" of type '" "VecMat::Vec2<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f_setY" "', argument " "1"" of type '" "VecMat::Vec2< float > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< float > * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2f_setY" "', argument " "2"" of type '" "VecMat::Vec2<float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2f_setY" "', argument " "2"" of type '" "VecMat::Vec2< float >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2<float >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2< float >::value_type >(val2);
   {
     try {
       (arg1)->setY(arg2);
@@ -15433,9 +15281,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2f___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
-  VecMat::Vec2<float > *arg2 = 0 ;
-  VecMat::Vec2<float > result;
+  VecMat::Vec2< float > *arg1 = (VecMat::Vec2< float > *) 0 ;
+  VecMat::Vec2< float > *arg2 = 0 ;
+  VecMat::Vec2< float > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -15444,22 +15292,22 @@ SWIGINTERN PyObject *_wrap_Vec2f___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2f___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f___add__" "', argument " "1"" of type '" "VecMat::Vec2<float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f___add__" "', argument " "1"" of type '" "VecMat::Vec2< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec2< float > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_float_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2f___add__" "', argument " "2"" of type '" "VecMat::Vec2<float > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2f___add__" "', argument " "2"" of type '" "VecMat::Vec2< float > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2f___add__" "', argument " "2"" of type '" "VecMat::Vec2<float > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2f___add__" "', argument " "2"" of type '" "VecMat::Vec2< float > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec2<float > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec2< float > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec2<float > const *)arg1)->operator +((VecMat::Vec2<float > const &)*arg2);
+      result = ((VecMat::Vec2< float > const *)arg1)->operator +((VecMat::Vec2< float > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -15468,7 +15316,7 @@ SWIGINTERN PyObject *_wrap_Vec2f___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<float >(static_cast< const VecMat::Vec2<float >& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< float >(static_cast< const VecMat::Vec2< float >& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -15477,9 +15325,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2f___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
-  VecMat::Vec2<float > *arg2 = 0 ;
-  VecMat::Vec2<float > result;
+  VecMat::Vec2< float > *arg1 = (VecMat::Vec2< float > *) 0 ;
+  VecMat::Vec2< float > *arg2 = 0 ;
+  VecMat::Vec2< float > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -15488,22 +15336,22 @@ SWIGINTERN PyObject *_wrap_Vec2f___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2f___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f___sub__" "', argument " "1"" of type '" "VecMat::Vec2<float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f___sub__" "', argument " "1"" of type '" "VecMat::Vec2< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec2< float > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_float_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2f___sub__" "', argument " "2"" of type '" "VecMat::Vec2<float > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2f___sub__" "', argument " "2"" of type '" "VecMat::Vec2< float > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2f___sub__" "', argument " "2"" of type '" "VecMat::Vec2<float > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2f___sub__" "', argument " "2"" of type '" "VecMat::Vec2< float > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec2<float > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec2< float > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec2<float > const *)arg1)->operator -((VecMat::Vec2<float > const &)*arg2);
+      result = ((VecMat::Vec2< float > const *)arg1)->operator -((VecMat::Vec2< float > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -15512,7 +15360,7 @@ SWIGINTERN PyObject *_wrap_Vec2f___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<float >(static_cast< const VecMat::Vec2<float >& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< float >(static_cast< const VecMat::Vec2< float >& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -15521,9 +15369,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2f___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
-  VecMat::Vec2<float >::value_type arg2 ;
-  VecMat::Vec2<float > result;
+  VecMat::Vec2< float > *arg1 = (VecMat::Vec2< float > *) 0 ;
+  VecMat::Vec2< float >::value_type arg2 ;
+  VecMat::Vec2< float > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   float val2 ;
@@ -15532,19 +15380,19 @@ SWIGINTERN PyObject *_wrap_Vec2f___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2f___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f___mul__" "', argument " "1"" of type '" "VecMat::Vec2<float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f___mul__" "', argument " "1"" of type '" "VecMat::Vec2< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< float > * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2f___mul__" "', argument " "2"" of type '" "VecMat::Vec2<float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2f___mul__" "', argument " "2"" of type '" "VecMat::Vec2< float >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2<float >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2< float >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec2<float > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec2< float > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -15553,7 +15401,7 @@ SWIGINTERN PyObject *_wrap_Vec2f___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<float >(static_cast< const VecMat::Vec2<float >& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< float >(static_cast< const VecMat::Vec2< float >& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -15562,9 +15410,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2f___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
-  VecMat::Vec2<float >::value_type arg2 ;
-  VecMat::Vec2<float > result;
+  VecMat::Vec2< float > *arg1 = (VecMat::Vec2< float > *) 0 ;
+  VecMat::Vec2< float >::value_type arg2 ;
+  VecMat::Vec2< float > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   float val2 ;
@@ -15573,19 +15421,19 @@ SWIGINTERN PyObject *_wrap_Vec2f___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2f___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f___div__" "', argument " "1"" of type '" "VecMat::Vec2<float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f___div__" "', argument " "1"" of type '" "VecMat::Vec2< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< float > * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2f___div__" "', argument " "2"" of type '" "VecMat::Vec2<float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2f___div__" "', argument " "2"" of type '" "VecMat::Vec2< float >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2<float >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2< float >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec2<float > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec2< float > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -15594,7 +15442,7 @@ SWIGINTERN PyObject *_wrap_Vec2f___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<float >(static_cast< const VecMat::Vec2<float >& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< float >(static_cast< const VecMat::Vec2< float >& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -15603,9 +15451,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2f___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
-  VecMat::Vec2<float > *arg2 = 0 ;
-  VecMat::Vec2<float >::value_type result;
+  VecMat::Vec2< float > *arg1 = (VecMat::Vec2< float > *) 0 ;
+  VecMat::Vec2< float > *arg2 = 0 ;
+  VecMat::Vec2< float >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -15614,22 +15462,22 @@ SWIGINTERN PyObject *_wrap_Vec2f___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2f___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f___mul__" "', argument " "1"" of type '" "VecMat::Vec2<float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2f___mul__" "', argument " "1"" of type '" "VecMat::Vec2< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec2< float > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_float_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2f___mul__" "', argument " "2"" of type '" "VecMat::Vec2<float > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2f___mul__" "', argument " "2"" of type '" "VecMat::Vec2< float > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2f___mul__" "', argument " "2"" of type '" "VecMat::Vec2<float > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2f___mul__" "', argument " "2"" of type '" "VecMat::Vec2< float > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec2<float > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec2< float > * >(argp2);
   {
     try {
-      result = (VecMat::Vec2<float >::value_type)((VecMat::Vec2<float > const *)arg1)->operator *((VecMat::Vec2<float > const &)*arg2);
+      result = (VecMat::Vec2< float >::value_type)((VecMat::Vec2< float > const *)arg1)->operator *((VecMat::Vec2< float > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -15651,17 +15499,17 @@ SWIGINTERN PyObject *_wrap_Vec2f___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_float_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2T_float_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec2f___mul____SWIG_1(self, args);
@@ -15671,7 +15519,7 @@ SWIGINTERN PyObject *_wrap_Vec2f___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_float_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -15692,17 +15540,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<float > *arg1 = (VecMat::Vec2<float > *) 0 ;
+  VecMat::Vec2< float > *arg1 = (VecMat::Vec2< float > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec2f",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec2f" "', argument " "1"" of type '" "VecMat::Vec2<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec2f" "', argument " "1"" of type '" "VecMat::Vec2< float > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< float > * >(argp1);
   {
     try {
       delete arg1;
@@ -15724,19 +15572,19 @@ fail:
 
 SWIGINTERN PyObject *Vec2f_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec2d__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<double > *result = 0 ;
+  VecMat::Vec2< double > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec2d")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec2<double > *)new VecMat::Vec2<double >();
+      result = (VecMat::Vec2< double > *)new VecMat::Vec2< double >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -15745,7 +15593,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2d__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -15754,9 +15602,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec2d__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<double >::value_type arg1 ;
-  VecMat::Vec2<double >::value_type arg2 ;
-  VecMat::Vec2<double > *result = 0 ;
+  VecMat::Vec2< double >::value_type arg1 ;
+  VecMat::Vec2< double >::value_type arg2 ;
+  VecMat::Vec2< double > *result = 0 ;
   double val1 ;
   int ecode1 = 0 ;
   double val2 ;
@@ -15767,17 +15615,17 @@ SWIGINTERN PyObject *_wrap_new_Vec2d__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OO:new_Vec2d",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_double(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2d" "', argument " "1"" of type '" "VecMat::Vec2<double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2d" "', argument " "1"" of type '" "VecMat::Vec2< double >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec2<double >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec2< double >::value_type >(val1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec2d" "', argument " "2"" of type '" "VecMat::Vec2<double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec2d" "', argument " "2"" of type '" "VecMat::Vec2< double >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2<double >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2< double >::value_type >(val2);
   {
     try {
-      result = (VecMat::Vec2<double > *)new VecMat::Vec2<double >(arg1,arg2);
+      result = (VecMat::Vec2< double > *)new VecMat::Vec2< double >(arg1,arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -15786,7 +15634,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2d__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -15795,8 +15643,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec2d__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<double >::value_type arg1 ;
-  VecMat::Vec2<double > *result = 0 ;
+  VecMat::Vec2< double >::value_type arg1 ;
+  VecMat::Vec2< double > *result = 0 ;
   double val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -15804,12 +15652,12 @@ SWIGINTERN PyObject *_wrap_new_Vec2d__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"O:new_Vec2d",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_double(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2d" "', argument " "1"" of type '" "VecMat::Vec2<double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec2d" "', argument " "1"" of type '" "VecMat::Vec2< double >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec2<double >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec2< double >::value_type >(val1);
   {
     try {
-      result = (VecMat::Vec2<double > *)new VecMat::Vec2<double >(arg1);
+      result = (VecMat::Vec2< double > *)new VecMat::Vec2< double >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -15818,7 +15666,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2d__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -15831,7 +15679,7 @@ SWIGINTERN PyObject *_wrap_new_Vec2d(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -15866,28 +15714,32 @@ SWIGINTERN PyObject *_wrap_new_Vec2d(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec2d'.\n  Possible C/C++ prototypes are:\n    VecMat::Vec2<(double)>()\n    VecMat::Vec2<(double)>(VecMat::Vec2<double >::value_type const,VecMat::Vec2<double >::value_type const)\n    VecMat::Vec2<(double)>(VecMat::Vec2<double >::value_type const)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec2d'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    VecMat::Vec2< double >()\n"
+    "    VecMat::Vec2< double >(VecMat::Vec2< double >::value_type const,VecMat::Vec2< double >::value_type const)\n"
+    "    VecMat::Vec2< double >(VecMat::Vec2< double >::value_type const)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec2d_x__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
-  VecMat::Vec2<double >::value_type result;
+  VecMat::Vec2< double > *arg1 = (VecMat::Vec2< double > *) 0 ;
+  VecMat::Vec2< double >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2d_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d_x" "', argument " "1"" of type '" "VecMat::Vec2<double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d_x" "', argument " "1"" of type '" "VecMat::Vec2< double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< double > * >(argp1);
   {
     try {
-      result = (VecMat::Vec2<double >::value_type)((VecMat::Vec2<double > const *)arg1)->x();
+      result = (VecMat::Vec2< double >::value_type)((VecMat::Vec2< double > const *)arg1)->x();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -15905,23 +15757,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2d_x__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
-  VecMat::Vec2<double >::value_type *result = 0 ;
+  VecMat::Vec2< double > *arg1 = (VecMat::Vec2< double > *) 0 ;
+  VecMat::Vec2< double >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2d_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d_x" "', argument " "1"" of type '" "VecMat::Vec2<double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d_x" "', argument " "1"" of type '" "VecMat::Vec2< double > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< double > * >(argp1);
   {
     try {
       {
-        VecMat::Vec2<double >::value_type &_result_ref = (arg1)->x();
-        result = (VecMat::Vec2<double >::value_type *) &_result_ref;
+        VecMat::Vec2< double >::value_type &_result_ref = (arg1)->x();
+        result = (VecMat::Vec2< double >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -15944,14 +15796,14 @@ SWIGINTERN PyObject *_wrap_Vec2d_x(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2d_x__SWIG_0(self, args);
@@ -15960,7 +15812,7 @@ SWIGINTERN PyObject *_wrap_Vec2d_x(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2d_x__SWIG_1(self, args);
@@ -15968,28 +15820,31 @@ SWIGINTERN PyObject *_wrap_Vec2d_x(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2d_x'.\n  Possible C/C++ prototypes are:\n    x()\n    x()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2d_x'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    x(VecMat::Vec2< double > const *)\n"
+    "    x(VecMat::Vec2< double > *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec2d_y__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
-  VecMat::Vec2<double >::value_type result;
+  VecMat::Vec2< double > *arg1 = (VecMat::Vec2< double > *) 0 ;
+  VecMat::Vec2< double >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2d_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d_y" "', argument " "1"" of type '" "VecMat::Vec2<double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d_y" "', argument " "1"" of type '" "VecMat::Vec2< double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< double > * >(argp1);
   {
     try {
-      result = (VecMat::Vec2<double >::value_type)((VecMat::Vec2<double > const *)arg1)->y();
+      result = (VecMat::Vec2< double >::value_type)((VecMat::Vec2< double > const *)arg1)->y();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16007,23 +15862,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2d_y__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
-  VecMat::Vec2<double >::value_type *result = 0 ;
+  VecMat::Vec2< double > *arg1 = (VecMat::Vec2< double > *) 0 ;
+  VecMat::Vec2< double >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec2d_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d_y" "', argument " "1"" of type '" "VecMat::Vec2<double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d_y" "', argument " "1"" of type '" "VecMat::Vec2< double > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< double > * >(argp1);
   {
     try {
       {
-        VecMat::Vec2<double >::value_type &_result_ref = (arg1)->y();
-        result = (VecMat::Vec2<double >::value_type *) &_result_ref;
+        VecMat::Vec2< double >::value_type &_result_ref = (arg1)->y();
+        result = (VecMat::Vec2< double >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -16046,14 +15901,14 @@ SWIGINTERN PyObject *_wrap_Vec2d_y(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2d_y__SWIG_0(self, args);
@@ -16062,7 +15917,7 @@ SWIGINTERN PyObject *_wrap_Vec2d_y(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec2d_y__SWIG_1(self, args);
@@ -16070,15 +15925,18 @@ SWIGINTERN PyObject *_wrap_Vec2d_y(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2d_y'.\n  Possible C/C++ prototypes are:\n    y()\n    y()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec2d_y'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    y(VecMat::Vec2< double > const *)\n"
+    "    y(VecMat::Vec2< double > *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec2d_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
-  VecMat::Vec2<double >::value_type arg2 ;
+  VecMat::Vec2< double > *arg1 = (VecMat::Vec2< double > *) 0 ;
+  VecMat::Vec2< double >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
@@ -16087,16 +15945,16 @@ SWIGINTERN PyObject *_wrap_Vec2d_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2d_setX",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d_setX" "', argument " "1"" of type '" "VecMat::Vec2<double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d_setX" "', argument " "1"" of type '" "VecMat::Vec2< double > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< double > * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2d_setX" "', argument " "2"" of type '" "VecMat::Vec2<double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2d_setX" "', argument " "2"" of type '" "VecMat::Vec2< double >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2<double >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2< double >::value_type >(val2);
   {
     try {
       (arg1)->setX(arg2);
@@ -16117,8 +15975,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2d_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
-  VecMat::Vec2<double >::value_type arg2 ;
+  VecMat::Vec2< double > *arg1 = (VecMat::Vec2< double > *) 0 ;
+  VecMat::Vec2< double >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
@@ -16127,16 +15985,16 @@ SWIGINTERN PyObject *_wrap_Vec2d_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2d_setY",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d_setY" "', argument " "1"" of type '" "VecMat::Vec2<double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d_setY" "', argument " "1"" of type '" "VecMat::Vec2< double > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< double > * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2d_setY" "', argument " "2"" of type '" "VecMat::Vec2<double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2d_setY" "', argument " "2"" of type '" "VecMat::Vec2< double >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2<double >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2< double >::value_type >(val2);
   {
     try {
       (arg1)->setY(arg2);
@@ -16157,9 +16015,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2d___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
-  VecMat::Vec2<double > *arg2 = 0 ;
-  VecMat::Vec2<double > result;
+  VecMat::Vec2< double > *arg1 = (VecMat::Vec2< double > *) 0 ;
+  VecMat::Vec2< double > *arg2 = 0 ;
+  VecMat::Vec2< double > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -16168,22 +16026,22 @@ SWIGINTERN PyObject *_wrap_Vec2d___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2d___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d___add__" "', argument " "1"" of type '" "VecMat::Vec2<double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d___add__" "', argument " "1"" of type '" "VecMat::Vec2< double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec2< double > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2d___add__" "', argument " "2"" of type '" "VecMat::Vec2<double > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2d___add__" "', argument " "2"" of type '" "VecMat::Vec2< double > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2d___add__" "', argument " "2"" of type '" "VecMat::Vec2<double > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2d___add__" "', argument " "2"" of type '" "VecMat::Vec2< double > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec2<double > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec2< double > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec2<double > const *)arg1)->operator +((VecMat::Vec2<double > const &)*arg2);
+      result = ((VecMat::Vec2< double > const *)arg1)->operator +((VecMat::Vec2< double > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16192,7 +16050,7 @@ SWIGINTERN PyObject *_wrap_Vec2d___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<double >(static_cast< const VecMat::Vec2<double >& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< double >(static_cast< const VecMat::Vec2< double >& >(result))), SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -16201,9 +16059,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2d___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
-  VecMat::Vec2<double > *arg2 = 0 ;
-  VecMat::Vec2<double > result;
+  VecMat::Vec2< double > *arg1 = (VecMat::Vec2< double > *) 0 ;
+  VecMat::Vec2< double > *arg2 = 0 ;
+  VecMat::Vec2< double > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -16212,22 +16070,22 @@ SWIGINTERN PyObject *_wrap_Vec2d___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2d___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d___sub__" "', argument " "1"" of type '" "VecMat::Vec2<double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d___sub__" "', argument " "1"" of type '" "VecMat::Vec2< double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec2< double > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2d___sub__" "', argument " "2"" of type '" "VecMat::Vec2<double > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2d___sub__" "', argument " "2"" of type '" "VecMat::Vec2< double > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2d___sub__" "', argument " "2"" of type '" "VecMat::Vec2<double > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2d___sub__" "', argument " "2"" of type '" "VecMat::Vec2< double > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec2<double > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec2< double > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec2<double > const *)arg1)->operator -((VecMat::Vec2<double > const &)*arg2);
+      result = ((VecMat::Vec2< double > const *)arg1)->operator -((VecMat::Vec2< double > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16236,7 +16094,7 @@ SWIGINTERN PyObject *_wrap_Vec2d___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<double >(static_cast< const VecMat::Vec2<double >& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< double >(static_cast< const VecMat::Vec2< double >& >(result))), SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -16245,9 +16103,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2d___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
-  VecMat::Vec2<double >::value_type arg2 ;
-  VecMat::Vec2<double > result;
+  VecMat::Vec2< double > *arg1 = (VecMat::Vec2< double > *) 0 ;
+  VecMat::Vec2< double >::value_type arg2 ;
+  VecMat::Vec2< double > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
@@ -16256,19 +16114,19 @@ SWIGINTERN PyObject *_wrap_Vec2d___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2d___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d___mul__" "', argument " "1"" of type '" "VecMat::Vec2<double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d___mul__" "', argument " "1"" of type '" "VecMat::Vec2< double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< double > * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2d___mul__" "', argument " "2"" of type '" "VecMat::Vec2<double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2d___mul__" "', argument " "2"" of type '" "VecMat::Vec2< double >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2<double >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2< double >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec2<double > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec2< double > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16277,7 +16135,7 @@ SWIGINTERN PyObject *_wrap_Vec2d___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<double >(static_cast< const VecMat::Vec2<double >& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< double >(static_cast< const VecMat::Vec2< double >& >(result))), SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -16286,9 +16144,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2d___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
-  VecMat::Vec2<double >::value_type arg2 ;
-  VecMat::Vec2<double > result;
+  VecMat::Vec2< double > *arg1 = (VecMat::Vec2< double > *) 0 ;
+  VecMat::Vec2< double >::value_type arg2 ;
+  VecMat::Vec2< double > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
@@ -16297,19 +16155,19 @@ SWIGINTERN PyObject *_wrap_Vec2d___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2d___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d___div__" "', argument " "1"" of type '" "VecMat::Vec2<double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d___div__" "', argument " "1"" of type '" "VecMat::Vec2< double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< double > * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2d___div__" "', argument " "2"" of type '" "VecMat::Vec2<double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec2d___div__" "', argument " "2"" of type '" "VecMat::Vec2< double >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec2<double >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec2< double >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec2<double > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec2< double > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16318,7 +16176,7 @@ SWIGINTERN PyObject *_wrap_Vec2d___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<double >(static_cast< const VecMat::Vec2<double >& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< double >(static_cast< const VecMat::Vec2< double >& >(result))), SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -16327,9 +16185,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec2d___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
-  VecMat::Vec2<double > *arg2 = 0 ;
-  VecMat::Vec2<double >::value_type result;
+  VecMat::Vec2< double > *arg1 = (VecMat::Vec2< double > *) 0 ;
+  VecMat::Vec2< double > *arg2 = 0 ;
+  VecMat::Vec2< double >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -16338,22 +16196,22 @@ SWIGINTERN PyObject *_wrap_Vec2d___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec2d___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d___mul__" "', argument " "1"" of type '" "VecMat::Vec2<double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec2d___mul__" "', argument " "1"" of type '" "VecMat::Vec2< double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec2< double > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2d___mul__" "', argument " "2"" of type '" "VecMat::Vec2<double > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec2d___mul__" "', argument " "2"" of type '" "VecMat::Vec2< double > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2d___mul__" "', argument " "2"" of type '" "VecMat::Vec2<double > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec2d___mul__" "', argument " "2"" of type '" "VecMat::Vec2< double > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec2<double > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec2< double > * >(argp2);
   {
     try {
-      result = (VecMat::Vec2<double >::value_type)((VecMat::Vec2<double > const *)arg1)->operator *((VecMat::Vec2<double > const &)*arg2);
+      result = (VecMat::Vec2< double >::value_type)((VecMat::Vec2< double > const *)arg1)->operator *((VecMat::Vec2< double > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16375,17 +16233,17 @@ SWIGINTERN PyObject *_wrap_Vec2d___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2T_double_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec2d___mul____SWIG_1(self, args);
@@ -16395,7 +16253,7 @@ SWIGINTERN PyObject *_wrap_Vec2d___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec2T_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -16416,17 +16274,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec2<double > *arg1 = (VecMat::Vec2<double > *) 0 ;
+  VecMat::Vec2< double > *arg1 = (VecMat::Vec2< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec2d",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec2d" "', argument " "1"" of type '" "VecMat::Vec2<double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec2d" "', argument " "1"" of type '" "VecMat::Vec2< double > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec2<double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec2< double > * >(argp1);
   {
     try {
       delete arg1;
@@ -16448,19 +16306,19 @@ fail:
 
 SWIGINTERN PyObject *Vec2d_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec_3u(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,3 > *result = 0 ;
+  VecMat::Vec< unsigned int,3 > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec_3u")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec<unsigned int,3 > *)new VecMat::Vec<unsigned int,3 >();
+      result = (VecMat::Vec< unsigned int,3 > *)new VecMat::Vec< unsigned int,3 >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16469,7 +16327,7 @@ SWIGINTERN PyObject *_wrap_new_Vec_3u(PyObject *SWIGUNUSEDPARM(self), PyObject *
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -16478,17 +16336,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec_3u(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
+  VecMat::Vec< unsigned int,3 > *arg1 = (VecMat::Vec< unsigned int,3 > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec_3u",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_3u" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_3u" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,3 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp1);
   {
     try {
       delete arg1;
@@ -16515,7 +16373,7 @@ SWIGINTERN PyObject *_wrap_Vec_3u_dim(PyObject *SWIGUNUSEDPARM(self), PyObject *
   if (!PyArg_ParseTuple(args,(char *)":Vec_3u_dim")) SWIG_fail;
   {
     try {
-      result = (unsigned int)VecMat::Vec<unsigned int,3 >::SWIGTEMPLATEDISAMBIGUATOR dim();
+      result = (unsigned int)VecMat::Vec< unsigned int,3 >::SWIGTEMPLATEDISAMBIGUATOR dim();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16533,21 +16391,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3u_norm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
-  VecMat::Vec<unsigned int,3 >::value_type result;
+  VecMat::Vec< unsigned int,3 > *arg1 = (VecMat::Vec< unsigned int,3 > *) 0 ;
+  VecMat::Vec< unsigned int,3 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3u_norm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u_norm" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u_norm" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec<unsigned int,3 >::value_type)((VecMat::Vec<unsigned int,3 > const *)arg1)->norm();
+      result = (VecMat::Vec< unsigned int,3 >::value_type)((VecMat::Vec< unsigned int,3 > const *)arg1)->norm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16565,21 +16423,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3u_squareNorm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
-  VecMat::Vec<unsigned int,3 >::value_type result;
+  VecMat::Vec< unsigned int,3 > *arg1 = (VecMat::Vec< unsigned int,3 > *) 0 ;
+  VecMat::Vec< unsigned int,3 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3u_squareNorm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u_squareNorm" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u_squareNorm" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec<unsigned int,3 >::value_type)((VecMat::Vec<unsigned int,3 > const *)arg1)->squareNorm();
+      result = (VecMat::Vec< unsigned int,3 >::value_type)((VecMat::Vec< unsigned int,3 > const *)arg1)->squareNorm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16597,23 +16455,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3u_normalize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
-  VecMat::Vec<unsigned int,3 > *result = 0 ;
+  VecMat::Vec< unsigned int,3 > *arg1 = (VecMat::Vec< unsigned int,3 > *) 0 ;
+  VecMat::Vec< unsigned int,3 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3u_normalize",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u_normalize" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u_normalize" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,3 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec<unsigned int,3 > &_result_ref = (arg1)->normalize();
-        result = (VecMat::Vec<unsigned int,3 > *) &_result_ref;
+        VecMat::Vec< unsigned int,3 > &_result_ref = (arg1)->normalize();
+        result = (VecMat::Vec< unsigned int,3 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -16623,7 +16481,7 @@ SWIGINTERN PyObject *_wrap_Vec_3u_normalize(PyObject *SWIGUNUSEDPARM(self), PyOb
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -16632,23 +16490,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3u_normalizeSafe(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
-  VecMat::Vec<unsigned int,3 > *result = 0 ;
+  VecMat::Vec< unsigned int,3 > *arg1 = (VecMat::Vec< unsigned int,3 > *) 0 ;
+  VecMat::Vec< unsigned int,3 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3u_normalizeSafe",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,3 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec<unsigned int,3 > &_result_ref = (arg1)->normalizeSafe();
-        result = (VecMat::Vec<unsigned int,3 > *) &_result_ref;
+        VecMat::Vec< unsigned int,3 > &_result_ref = (arg1)->normalizeSafe();
+        result = (VecMat::Vec< unsigned int,3 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -16658,7 +16516,7 @@ SWIGINTERN PyObject *_wrap_Vec_3u_normalizeSafe(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -16667,9 +16525,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3u___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
-  VecMat::Vec<unsigned int,3 > *arg2 = 0 ;
-  VecMat::Vec<unsigned int,3 > result;
+  VecMat::Vec< unsigned int,3 > *arg1 = (VecMat::Vec< unsigned int,3 > *) 0 ;
+  VecMat::Vec< unsigned int,3 > *arg2 = 0 ;
+  VecMat::Vec< unsigned int,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -16678,22 +16536,22 @@ SWIGINTERN PyObject *_wrap_Vec_3u___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3u___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___add__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___add__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___add__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___add__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___add__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___add__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec<unsigned int,3 > const *)arg1)->operator +((VecMat::Vec<unsigned int,3 > const &)*arg2);
+      result = ((VecMat::Vec< unsigned int,3 > const *)arg1)->operator +((VecMat::Vec< unsigned int,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16702,7 +16560,7 @@ SWIGINTERN PyObject *_wrap_Vec_3u___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<unsigned int,3 >(static_cast< const VecMat::Vec<unsigned int,3 >& >(result))), SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< unsigned int,3 >(static_cast< const VecMat::Vec< unsigned int,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -16711,9 +16569,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3u___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
-  VecMat::Vec<unsigned int,3 > *arg2 = 0 ;
-  VecMat::Vec<unsigned int,3 > result;
+  VecMat::Vec< unsigned int,3 > *arg1 = (VecMat::Vec< unsigned int,3 > *) 0 ;
+  VecMat::Vec< unsigned int,3 > *arg2 = 0 ;
+  VecMat::Vec< unsigned int,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -16722,22 +16580,22 @@ SWIGINTERN PyObject *_wrap_Vec_3u___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3u___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___sub__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___sub__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___sub__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___sub__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___sub__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___sub__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec<unsigned int,3 > const *)arg1)->operator -((VecMat::Vec<unsigned int,3 > const &)*arg2);
+      result = ((VecMat::Vec< unsigned int,3 > const *)arg1)->operator -((VecMat::Vec< unsigned int,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16746,7 +16604,7 @@ SWIGINTERN PyObject *_wrap_Vec_3u___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<unsigned int,3 >(static_cast< const VecMat::Vec<unsigned int,3 >& >(result))), SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< unsigned int,3 >(static_cast< const VecMat::Vec< unsigned int,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -16755,9 +16613,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3u___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
-  VecMat::Vec<unsigned int,3 >::value_type arg2 ;
-  VecMat::Vec<unsigned int,3 > result;
+  VecMat::Vec< unsigned int,3 > *arg1 = (VecMat::Vec< unsigned int,3 > *) 0 ;
+  VecMat::Vec< unsigned int,3 >::value_type arg2 ;
+  VecMat::Vec< unsigned int,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned int val2 ;
@@ -16766,19 +16624,19 @@ SWIGINTERN PyObject *_wrap_Vec_3u___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3u___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___mul__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___mul__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3u___mul__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3u___mul__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec<unsigned int,3 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec< unsigned int,3 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec<unsigned int,3 > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec< unsigned int,3 > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16787,7 +16645,7 @@ SWIGINTERN PyObject *_wrap_Vec_3u___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<unsigned int,3 >(static_cast< const VecMat::Vec<unsigned int,3 >& >(result))), SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< unsigned int,3 >(static_cast< const VecMat::Vec< unsigned int,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -16796,9 +16654,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3u___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
-  VecMat::Vec<unsigned int,3 >::value_type arg2 ;
-  VecMat::Vec<unsigned int,3 > result;
+  VecMat::Vec< unsigned int,3 > *arg1 = (VecMat::Vec< unsigned int,3 > *) 0 ;
+  VecMat::Vec< unsigned int,3 >::value_type arg2 ;
+  VecMat::Vec< unsigned int,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned int val2 ;
@@ -16807,19 +16665,19 @@ SWIGINTERN PyObject *_wrap_Vec_3u___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3u___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___div__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___div__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3u___div__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3u___div__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec<unsigned int,3 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec< unsigned int,3 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec<unsigned int,3 > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec< unsigned int,3 > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16828,7 +16686,7 @@ SWIGINTERN PyObject *_wrap_Vec_3u___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<unsigned int,3 >(static_cast< const VecMat::Vec<unsigned int,3 >& >(result))), SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< unsigned int,3 >(static_cast< const VecMat::Vec< unsigned int,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -16837,9 +16695,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3u___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
-  VecMat::Vec<unsigned int,3 > *arg2 = 0 ;
-  VecMat::Vec<unsigned int,3 >::value_type result;
+  VecMat::Vec< unsigned int,3 > *arg1 = (VecMat::Vec< unsigned int,3 > *) 0 ;
+  VecMat::Vec< unsigned int,3 > *arg2 = 0 ;
+  VecMat::Vec< unsigned int,3 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -16848,22 +16706,22 @@ SWIGINTERN PyObject *_wrap_Vec_3u___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3u___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___mul__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___mul__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___mul__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___mul__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___mul__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___mul__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp2);
   {
     try {
-      result = (VecMat::Vec<unsigned int,3 >::value_type)((VecMat::Vec<unsigned int,3 > const *)arg1)->operator *((VecMat::Vec<unsigned int,3 > const &)*arg2);
+      result = (VecMat::Vec< unsigned int,3 >::value_type)((VecMat::Vec< unsigned int,3 > const *)arg1)->operator *((VecMat::Vec< unsigned int,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16885,17 +16743,17 @@ SWIGINTERN PyObject *_wrap_Vec_3u___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec_3u___mul____SWIG_1(self, args);
@@ -16905,7 +16763,7 @@ SWIGINTERN PyObject *_wrap_Vec_3u___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -16926,8 +16784,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3u___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
-  VecMat::Vec<unsigned int,3 > *arg2 = 0 ;
+  VecMat::Vec< unsigned int,3 > *arg1 = (VecMat::Vec< unsigned int,3 > *) 0 ;
+  VecMat::Vec< unsigned int,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -16937,22 +16795,22 @@ SWIGINTERN PyObject *_wrap_Vec_3u___eq__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3u___eq__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___eq__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___eq__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___eq__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___eq__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___eq__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___eq__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<unsigned int,3 > const *)arg1)->operator ==((VecMat::Vec<unsigned int,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec< unsigned int,3 > const *)arg1)->operator ==((VecMat::Vec< unsigned int,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -16970,8 +16828,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3u___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
-  VecMat::Vec<unsigned int,3 > *arg2 = 0 ;
+  VecMat::Vec< unsigned int,3 > *arg1 = (VecMat::Vec< unsigned int,3 > *) 0 ;
+  VecMat::Vec< unsigned int,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -16981,22 +16839,22 @@ SWIGINTERN PyObject *_wrap_Vec_3u___ne__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3u___ne__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___ne__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___ne__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___ne__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___ne__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___ne__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___ne__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<unsigned int,3 > const *)arg1)->operator !=((VecMat::Vec<unsigned int,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec< unsigned int,3 > const *)arg1)->operator !=((VecMat::Vec< unsigned int,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17014,8 +16872,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3u___lt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
-  VecMat::Vec<unsigned int,3 > *arg2 = 0 ;
+  VecMat::Vec< unsigned int,3 > *arg1 = (VecMat::Vec< unsigned int,3 > *) 0 ;
+  VecMat::Vec< unsigned int,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -17025,22 +16883,22 @@ SWIGINTERN PyObject *_wrap_Vec_3u___lt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3u___lt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___lt__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___lt__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___lt__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___lt__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___lt__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___lt__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<unsigned int,3 > const *)arg1)->operator <((VecMat::Vec<unsigned int,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec< unsigned int,3 > const *)arg1)->operator <((VecMat::Vec< unsigned int,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17058,8 +16916,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3u___gt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<unsigned int,3 > *arg1 = (VecMat::Vec<unsigned int,3 > *) 0 ;
-  VecMat::Vec<unsigned int,3 > *arg2 = 0 ;
+  VecMat::Vec< unsigned int,3 > *arg1 = (VecMat::Vec< unsigned int,3 > *) 0 ;
+  VecMat::Vec< unsigned int,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -17069,22 +16927,22 @@ SWIGINTERN PyObject *_wrap_Vec_3u___gt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3u___gt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___gt__" "', argument " "1"" of type '" "VecMat::Vec<unsigned int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3u___gt__" "', argument " "1"" of type '" "VecMat::Vec< unsigned int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTunsigned_int_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___gt__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3u___gt__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___gt__" "', argument " "2"" of type '" "VecMat::Vec<unsigned int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3u___gt__" "', argument " "2"" of type '" "VecMat::Vec< unsigned int,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<unsigned int,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< unsigned int,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<unsigned int,3 > const *)arg1)->operator >((VecMat::Vec<unsigned int,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec< unsigned int,3 > const *)arg1)->operator >((VecMat::Vec< unsigned int,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17102,19 +16960,19 @@ fail:
 
 SWIGINTERN PyObject *Vec_3u_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecTunsigned_int_3_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecT_unsigned_int_3_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec_3i(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,3 > *result = 0 ;
+  VecMat::Vec< int,3 > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec_3i")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec<int,3 > *)new VecMat::Vec<int,3 >();
+      result = (VecMat::Vec< int,3 > *)new VecMat::Vec< int,3 >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17123,7 +16981,7 @@ SWIGINTERN PyObject *_wrap_new_Vec_3i(PyObject *SWIGUNUSEDPARM(self), PyObject *
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTint_3_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_int_3_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -17132,17 +16990,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec_3i(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
+  VecMat::Vec< int,3 > *arg1 = (VecMat::Vec< int,3 > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec_3i",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_3_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_3i" "', argument " "1"" of type '" "VecMat::Vec<int,3 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_3i" "', argument " "1"" of type '" "VecMat::Vec< int,3 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp1);
   {
     try {
       delete arg1;
@@ -17169,7 +17027,7 @@ SWIGINTERN PyObject *_wrap_Vec_3i_dim(PyObject *SWIGUNUSEDPARM(self), PyObject *
   if (!PyArg_ParseTuple(args,(char *)":Vec_3i_dim")) SWIG_fail;
   {
     try {
-      result = (unsigned int)VecMat::Vec<int,3 >::SWIGTEMPLATEDISAMBIGUATOR dim();
+      result = (unsigned int)VecMat::Vec< int,3 >::SWIGTEMPLATEDISAMBIGUATOR dim();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17187,21 +17045,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3i_norm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
-  VecMat::Vec<int,3 >::value_type result;
+  VecMat::Vec< int,3 > *arg1 = (VecMat::Vec< int,3 > *) 0 ;
+  VecMat::Vec< int,3 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3i_norm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i_norm" "', argument " "1"" of type '" "VecMat::Vec<int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i_norm" "', argument " "1"" of type '" "VecMat::Vec< int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec<int,3 >::value_type)((VecMat::Vec<int,3 > const *)arg1)->norm();
+      result = (VecMat::Vec< int,3 >::value_type)((VecMat::Vec< int,3 > const *)arg1)->norm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17219,21 +17077,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3i_squareNorm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
-  VecMat::Vec<int,3 >::value_type result;
+  VecMat::Vec< int,3 > *arg1 = (VecMat::Vec< int,3 > *) 0 ;
+  VecMat::Vec< int,3 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3i_squareNorm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i_squareNorm" "', argument " "1"" of type '" "VecMat::Vec<int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i_squareNorm" "', argument " "1"" of type '" "VecMat::Vec< int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec<int,3 >::value_type)((VecMat::Vec<int,3 > const *)arg1)->squareNorm();
+      result = (VecMat::Vec< int,3 >::value_type)((VecMat::Vec< int,3 > const *)arg1)->squareNorm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17251,23 +17109,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3i_normalize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
-  VecMat::Vec<int,3 > *result = 0 ;
+  VecMat::Vec< int,3 > *arg1 = (VecMat::Vec< int,3 > *) 0 ;
+  VecMat::Vec< int,3 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3i_normalize",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i_normalize" "', argument " "1"" of type '" "VecMat::Vec<int,3 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i_normalize" "', argument " "1"" of type '" "VecMat::Vec< int,3 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec<int,3 > &_result_ref = (arg1)->normalize();
-        result = (VecMat::Vec<int,3 > *) &_result_ref;
+        VecMat::Vec< int,3 > &_result_ref = (arg1)->normalize();
+        result = (VecMat::Vec< int,3 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -17277,7 +17135,7 @@ SWIGINTERN PyObject *_wrap_Vec_3i_normalize(PyObject *SWIGUNUSEDPARM(self), PyOb
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_int_3_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -17286,23 +17144,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3i_normalizeSafe(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
-  VecMat::Vec<int,3 > *result = 0 ;
+  VecMat::Vec< int,3 > *arg1 = (VecMat::Vec< int,3 > *) 0 ;
+  VecMat::Vec< int,3 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3i_normalizeSafe",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec<int,3 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec< int,3 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec<int,3 > &_result_ref = (arg1)->normalizeSafe();
-        result = (VecMat::Vec<int,3 > *) &_result_ref;
+        VecMat::Vec< int,3 > &_result_ref = (arg1)->normalizeSafe();
+        result = (VecMat::Vec< int,3 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -17312,7 +17170,7 @@ SWIGINTERN PyObject *_wrap_Vec_3i_normalizeSafe(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_int_3_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -17321,9 +17179,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3i___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
-  VecMat::Vec<int,3 > *arg2 = 0 ;
-  VecMat::Vec<int,3 > result;
+  VecMat::Vec< int,3 > *arg1 = (VecMat::Vec< int,3 > *) 0 ;
+  VecMat::Vec< int,3 > *arg2 = 0 ;
+  VecMat::Vec< int,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -17332,22 +17190,22 @@ SWIGINTERN PyObject *_wrap_Vec_3i___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3i___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___add__" "', argument " "1"" of type '" "VecMat::Vec<int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___add__" "', argument " "1"" of type '" "VecMat::Vec< int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_int_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___add__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___add__" "', argument " "2"" of type '" "VecMat::Vec< int,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___add__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___add__" "', argument " "2"" of type '" "VecMat::Vec< int,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec<int,3 > const *)arg1)->operator +((VecMat::Vec<int,3 > const &)*arg2);
+      result = ((VecMat::Vec< int,3 > const *)arg1)->operator +((VecMat::Vec< int,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17356,7 +17214,7 @@ SWIGINTERN PyObject *_wrap_Vec_3i___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<int,3 >(static_cast< const VecMat::Vec<int,3 >& >(result))), SWIGTYPE_p_VecMat__VecTint_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< int,3 >(static_cast< const VecMat::Vec< int,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_int_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -17365,9 +17223,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3i___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
-  VecMat::Vec<int,3 > *arg2 = 0 ;
-  VecMat::Vec<int,3 > result;
+  VecMat::Vec< int,3 > *arg1 = (VecMat::Vec< int,3 > *) 0 ;
+  VecMat::Vec< int,3 > *arg2 = 0 ;
+  VecMat::Vec< int,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -17376,22 +17234,22 @@ SWIGINTERN PyObject *_wrap_Vec_3i___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3i___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___sub__" "', argument " "1"" of type '" "VecMat::Vec<int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___sub__" "', argument " "1"" of type '" "VecMat::Vec< int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_int_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___sub__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___sub__" "', argument " "2"" of type '" "VecMat::Vec< int,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___sub__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___sub__" "', argument " "2"" of type '" "VecMat::Vec< int,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec<int,3 > const *)arg1)->operator -((VecMat::Vec<int,3 > const &)*arg2);
+      result = ((VecMat::Vec< int,3 > const *)arg1)->operator -((VecMat::Vec< int,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17400,7 +17258,7 @@ SWIGINTERN PyObject *_wrap_Vec_3i___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<int,3 >(static_cast< const VecMat::Vec<int,3 >& >(result))), SWIGTYPE_p_VecMat__VecTint_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< int,3 >(static_cast< const VecMat::Vec< int,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_int_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -17409,9 +17267,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3i___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
-  VecMat::Vec<int,3 >::value_type arg2 ;
-  VecMat::Vec<int,3 > result;
+  VecMat::Vec< int,3 > *arg1 = (VecMat::Vec< int,3 > *) 0 ;
+  VecMat::Vec< int,3 >::value_type arg2 ;
+  VecMat::Vec< int,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -17420,19 +17278,19 @@ SWIGINTERN PyObject *_wrap_Vec_3i___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3i___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___mul__" "', argument " "1"" of type '" "VecMat::Vec<int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___mul__" "', argument " "1"" of type '" "VecMat::Vec< int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3i___mul__" "', argument " "2"" of type '" "VecMat::Vec<int,3 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3i___mul__" "', argument " "2"" of type '" "VecMat::Vec< int,3 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec<int,3 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec< int,3 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec<int,3 > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec< int,3 > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17441,7 +17299,7 @@ SWIGINTERN PyObject *_wrap_Vec_3i___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<int,3 >(static_cast< const VecMat::Vec<int,3 >& >(result))), SWIGTYPE_p_VecMat__VecTint_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< int,3 >(static_cast< const VecMat::Vec< int,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_int_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -17450,9 +17308,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3i___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
-  VecMat::Vec<int,3 >::value_type arg2 ;
-  VecMat::Vec<int,3 > result;
+  VecMat::Vec< int,3 > *arg1 = (VecMat::Vec< int,3 > *) 0 ;
+  VecMat::Vec< int,3 >::value_type arg2 ;
+  VecMat::Vec< int,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -17461,19 +17319,19 @@ SWIGINTERN PyObject *_wrap_Vec_3i___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3i___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___div__" "', argument " "1"" of type '" "VecMat::Vec<int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___div__" "', argument " "1"" of type '" "VecMat::Vec< int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3i___div__" "', argument " "2"" of type '" "VecMat::Vec<int,3 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3i___div__" "', argument " "2"" of type '" "VecMat::Vec< int,3 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec<int,3 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec< int,3 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec<int,3 > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec< int,3 > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17482,7 +17340,7 @@ SWIGINTERN PyObject *_wrap_Vec_3i___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<int,3 >(static_cast< const VecMat::Vec<int,3 >& >(result))), SWIGTYPE_p_VecMat__VecTint_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< int,3 >(static_cast< const VecMat::Vec< int,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_int_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -17491,9 +17349,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3i___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
-  VecMat::Vec<int,3 > *arg2 = 0 ;
-  VecMat::Vec<int,3 >::value_type result;
+  VecMat::Vec< int,3 > *arg1 = (VecMat::Vec< int,3 > *) 0 ;
+  VecMat::Vec< int,3 > *arg2 = 0 ;
+  VecMat::Vec< int,3 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -17502,22 +17360,22 @@ SWIGINTERN PyObject *_wrap_Vec_3i___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3i___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___mul__" "', argument " "1"" of type '" "VecMat::Vec<int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___mul__" "', argument " "1"" of type '" "VecMat::Vec< int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_int_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___mul__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___mul__" "', argument " "2"" of type '" "VecMat::Vec< int,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___mul__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___mul__" "', argument " "2"" of type '" "VecMat::Vec< int,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp2);
   {
     try {
-      result = (VecMat::Vec<int,3 >::value_type)((VecMat::Vec<int,3 > const *)arg1)->operator *((VecMat::Vec<int,3 > const &)*arg2);
+      result = (VecMat::Vec< int,3 >::value_type)((VecMat::Vec< int,3 > const *)arg1)->operator *((VecMat::Vec< int,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17539,17 +17397,17 @@ SWIGINTERN PyObject *_wrap_Vec_3i___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTint_3_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_int_3_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecTint_3_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecT_int_3_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec_3i___mul____SWIG_1(self, args);
@@ -17559,7 +17417,7 @@ SWIGINTERN PyObject *_wrap_Vec_3i___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTint_3_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_int_3_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -17580,8 +17438,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3i___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
-  VecMat::Vec<int,3 > *arg2 = 0 ;
+  VecMat::Vec< int,3 > *arg1 = (VecMat::Vec< int,3 > *) 0 ;
+  VecMat::Vec< int,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -17591,22 +17449,22 @@ SWIGINTERN PyObject *_wrap_Vec_3i___eq__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3i___eq__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___eq__" "', argument " "1"" of type '" "VecMat::Vec<int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___eq__" "', argument " "1"" of type '" "VecMat::Vec< int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_int_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___eq__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___eq__" "', argument " "2"" of type '" "VecMat::Vec< int,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___eq__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___eq__" "', argument " "2"" of type '" "VecMat::Vec< int,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<int,3 > const *)arg1)->operator ==((VecMat::Vec<int,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec< int,3 > const *)arg1)->operator ==((VecMat::Vec< int,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17624,8 +17482,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3i___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
-  VecMat::Vec<int,3 > *arg2 = 0 ;
+  VecMat::Vec< int,3 > *arg1 = (VecMat::Vec< int,3 > *) 0 ;
+  VecMat::Vec< int,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -17635,22 +17493,22 @@ SWIGINTERN PyObject *_wrap_Vec_3i___ne__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3i___ne__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___ne__" "', argument " "1"" of type '" "VecMat::Vec<int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___ne__" "', argument " "1"" of type '" "VecMat::Vec< int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_int_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___ne__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___ne__" "', argument " "2"" of type '" "VecMat::Vec< int,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___ne__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___ne__" "', argument " "2"" of type '" "VecMat::Vec< int,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<int,3 > const *)arg1)->operator !=((VecMat::Vec<int,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec< int,3 > const *)arg1)->operator !=((VecMat::Vec< int,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17668,8 +17526,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3i___lt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
-  VecMat::Vec<int,3 > *arg2 = 0 ;
+  VecMat::Vec< int,3 > *arg1 = (VecMat::Vec< int,3 > *) 0 ;
+  VecMat::Vec< int,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -17679,22 +17537,22 @@ SWIGINTERN PyObject *_wrap_Vec_3i___lt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3i___lt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___lt__" "', argument " "1"" of type '" "VecMat::Vec<int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___lt__" "', argument " "1"" of type '" "VecMat::Vec< int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_int_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___lt__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___lt__" "', argument " "2"" of type '" "VecMat::Vec< int,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___lt__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___lt__" "', argument " "2"" of type '" "VecMat::Vec< int,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<int,3 > const *)arg1)->operator <((VecMat::Vec<int,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec< int,3 > const *)arg1)->operator <((VecMat::Vec< int,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17712,8 +17570,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3i___gt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<int,3 > *arg1 = (VecMat::Vec<int,3 > *) 0 ;
-  VecMat::Vec<int,3 > *arg2 = 0 ;
+  VecMat::Vec< int,3 > *arg1 = (VecMat::Vec< int,3 > *) 0 ;
+  VecMat::Vec< int,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -17723,22 +17581,22 @@ SWIGINTERN PyObject *_wrap_Vec_3i___gt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3i___gt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTint_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_int_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___gt__" "', argument " "1"" of type '" "VecMat::Vec<int,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3i___gt__" "', argument " "1"" of type '" "VecMat::Vec< int,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTint_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_int_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___gt__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3i___gt__" "', argument " "2"" of type '" "VecMat::Vec< int,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___gt__" "', argument " "2"" of type '" "VecMat::Vec<int,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3i___gt__" "', argument " "2"" of type '" "VecMat::Vec< int,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<int,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< int,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<int,3 > const *)arg1)->operator >((VecMat::Vec<int,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec< int,3 > const *)arg1)->operator >((VecMat::Vec< int,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17756,19 +17614,19 @@ fail:
 
 SWIGINTERN PyObject *Vec_3i_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecTint_3_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecT_int_3_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec_3d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,3 > *result = 0 ;
+  VecMat::Vec< double,3 > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec_3d")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec<double,3 > *)new VecMat::Vec<double,3 >();
+      result = (VecMat::Vec< double,3 > *)new VecMat::Vec< double,3 >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17777,7 +17635,7 @@ SWIGINTERN PyObject *_wrap_new_Vec_3d(PyObject *SWIGUNUSEDPARM(self), PyObject *
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTdouble_3_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_double_3_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -17786,17 +17644,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec_3d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
+  VecMat::Vec< double,3 > *arg1 = (VecMat::Vec< double,3 > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec_3d",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_3_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_3d" "', argument " "1"" of type '" "VecMat::Vec<double,3 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_3d" "', argument " "1"" of type '" "VecMat::Vec< double,3 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp1);
   {
     try {
       delete arg1;
@@ -17823,7 +17681,7 @@ SWIGINTERN PyObject *_wrap_Vec_3d_dim(PyObject *SWIGUNUSEDPARM(self), PyObject *
   if (!PyArg_ParseTuple(args,(char *)":Vec_3d_dim")) SWIG_fail;
   {
     try {
-      result = (unsigned int)VecMat::Vec<double,3 >::SWIGTEMPLATEDISAMBIGUATOR dim();
+      result = (unsigned int)VecMat::Vec< double,3 >::SWIGTEMPLATEDISAMBIGUATOR dim();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17841,21 +17699,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3d_norm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
-  VecMat::Vec<double,3 >::value_type result;
+  VecMat::Vec< double,3 > *arg1 = (VecMat::Vec< double,3 > *) 0 ;
+  VecMat::Vec< double,3 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3d_norm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d_norm" "', argument " "1"" of type '" "VecMat::Vec<double,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d_norm" "', argument " "1"" of type '" "VecMat::Vec< double,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec<double,3 >::value_type)((VecMat::Vec<double,3 > const *)arg1)->norm();
+      result = (VecMat::Vec< double,3 >::value_type)((VecMat::Vec< double,3 > const *)arg1)->norm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17873,21 +17731,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3d_squareNorm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
-  VecMat::Vec<double,3 >::value_type result;
+  VecMat::Vec< double,3 > *arg1 = (VecMat::Vec< double,3 > *) 0 ;
+  VecMat::Vec< double,3 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3d_squareNorm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d_squareNorm" "', argument " "1"" of type '" "VecMat::Vec<double,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d_squareNorm" "', argument " "1"" of type '" "VecMat::Vec< double,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec<double,3 >::value_type)((VecMat::Vec<double,3 > const *)arg1)->squareNorm();
+      result = (VecMat::Vec< double,3 >::value_type)((VecMat::Vec< double,3 > const *)arg1)->squareNorm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -17905,23 +17763,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3d_normalize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
-  VecMat::Vec<double,3 > *result = 0 ;
+  VecMat::Vec< double,3 > *arg1 = (VecMat::Vec< double,3 > *) 0 ;
+  VecMat::Vec< double,3 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3d_normalize",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d_normalize" "', argument " "1"" of type '" "VecMat::Vec<double,3 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d_normalize" "', argument " "1"" of type '" "VecMat::Vec< double,3 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec<double,3 > &_result_ref = (arg1)->normalize();
-        result = (VecMat::Vec<double,3 > *) &_result_ref;
+        VecMat::Vec< double,3 > &_result_ref = (arg1)->normalize();
+        result = (VecMat::Vec< double,3 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -17931,7 +17789,7 @@ SWIGINTERN PyObject *_wrap_Vec_3d_normalize(PyObject *SWIGUNUSEDPARM(self), PyOb
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_double_3_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -17940,23 +17798,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3d_normalizeSafe(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
-  VecMat::Vec<double,3 > *result = 0 ;
+  VecMat::Vec< double,3 > *arg1 = (VecMat::Vec< double,3 > *) 0 ;
+  VecMat::Vec< double,3 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3d_normalizeSafe",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec<double,3 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec< double,3 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec<double,3 > &_result_ref = (arg1)->normalizeSafe();
-        result = (VecMat::Vec<double,3 > *) &_result_ref;
+        VecMat::Vec< double,3 > &_result_ref = (arg1)->normalizeSafe();
+        result = (VecMat::Vec< double,3 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -17966,7 +17824,7 @@ SWIGINTERN PyObject *_wrap_Vec_3d_normalizeSafe(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_double_3_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -17975,9 +17833,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3d___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
-  VecMat::Vec<double,3 > *arg2 = 0 ;
-  VecMat::Vec<double,3 > result;
+  VecMat::Vec< double,3 > *arg1 = (VecMat::Vec< double,3 > *) 0 ;
+  VecMat::Vec< double,3 > *arg2 = 0 ;
+  VecMat::Vec< double,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -17986,22 +17844,22 @@ SWIGINTERN PyObject *_wrap_Vec_3d___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3d___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___add__" "', argument " "1"" of type '" "VecMat::Vec<double,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___add__" "', argument " "1"" of type '" "VecMat::Vec< double,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_double_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___add__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___add__" "', argument " "2"" of type '" "VecMat::Vec< double,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___add__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___add__" "', argument " "2"" of type '" "VecMat::Vec< double,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec<double,3 > const *)arg1)->operator +((VecMat::Vec<double,3 > const &)*arg2);
+      result = ((VecMat::Vec< double,3 > const *)arg1)->operator +((VecMat::Vec< double,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18010,7 +17868,7 @@ SWIGINTERN PyObject *_wrap_Vec_3d___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<double,3 >(static_cast< const VecMat::Vec<double,3 >& >(result))), SWIGTYPE_p_VecMat__VecTdouble_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< double,3 >(static_cast< const VecMat::Vec< double,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_double_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -18019,9 +17877,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3d___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
-  VecMat::Vec<double,3 > *arg2 = 0 ;
-  VecMat::Vec<double,3 > result;
+  VecMat::Vec< double,3 > *arg1 = (VecMat::Vec< double,3 > *) 0 ;
+  VecMat::Vec< double,3 > *arg2 = 0 ;
+  VecMat::Vec< double,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -18030,22 +17888,22 @@ SWIGINTERN PyObject *_wrap_Vec_3d___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3d___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___sub__" "', argument " "1"" of type '" "VecMat::Vec<double,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___sub__" "', argument " "1"" of type '" "VecMat::Vec< double,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_double_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___sub__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___sub__" "', argument " "2"" of type '" "VecMat::Vec< double,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___sub__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___sub__" "', argument " "2"" of type '" "VecMat::Vec< double,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec<double,3 > const *)arg1)->operator -((VecMat::Vec<double,3 > const &)*arg2);
+      result = ((VecMat::Vec< double,3 > const *)arg1)->operator -((VecMat::Vec< double,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18054,7 +17912,7 @@ SWIGINTERN PyObject *_wrap_Vec_3d___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<double,3 >(static_cast< const VecMat::Vec<double,3 >& >(result))), SWIGTYPE_p_VecMat__VecTdouble_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< double,3 >(static_cast< const VecMat::Vec< double,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_double_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -18063,9 +17921,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3d___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
-  VecMat::Vec<double,3 >::value_type arg2 ;
-  VecMat::Vec<double,3 > result;
+  VecMat::Vec< double,3 > *arg1 = (VecMat::Vec< double,3 > *) 0 ;
+  VecMat::Vec< double,3 >::value_type arg2 ;
+  VecMat::Vec< double,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
@@ -18074,19 +17932,19 @@ SWIGINTERN PyObject *_wrap_Vec_3d___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3d___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___mul__" "', argument " "1"" of type '" "VecMat::Vec<double,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___mul__" "', argument " "1"" of type '" "VecMat::Vec< double,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3d___mul__" "', argument " "2"" of type '" "VecMat::Vec<double,3 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3d___mul__" "', argument " "2"" of type '" "VecMat::Vec< double,3 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec<double,3 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec< double,3 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec<double,3 > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec< double,3 > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18095,7 +17953,7 @@ SWIGINTERN PyObject *_wrap_Vec_3d___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<double,3 >(static_cast< const VecMat::Vec<double,3 >& >(result))), SWIGTYPE_p_VecMat__VecTdouble_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< double,3 >(static_cast< const VecMat::Vec< double,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_double_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -18104,9 +17962,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3d___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
-  VecMat::Vec<double,3 >::value_type arg2 ;
-  VecMat::Vec<double,3 > result;
+  VecMat::Vec< double,3 > *arg1 = (VecMat::Vec< double,3 > *) 0 ;
+  VecMat::Vec< double,3 >::value_type arg2 ;
+  VecMat::Vec< double,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
@@ -18115,19 +17973,19 @@ SWIGINTERN PyObject *_wrap_Vec_3d___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3d___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___div__" "', argument " "1"" of type '" "VecMat::Vec<double,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___div__" "', argument " "1"" of type '" "VecMat::Vec< double,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3d___div__" "', argument " "2"" of type '" "VecMat::Vec<double,3 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3d___div__" "', argument " "2"" of type '" "VecMat::Vec< double,3 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec<double,3 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec< double,3 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec<double,3 > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec< double,3 > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18136,7 +17994,7 @@ SWIGINTERN PyObject *_wrap_Vec_3d___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<double,3 >(static_cast< const VecMat::Vec<double,3 >& >(result))), SWIGTYPE_p_VecMat__VecTdouble_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< double,3 >(static_cast< const VecMat::Vec< double,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_double_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -18145,9 +18003,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3d___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
-  VecMat::Vec<double,3 > *arg2 = 0 ;
-  VecMat::Vec<double,3 >::value_type result;
+  VecMat::Vec< double,3 > *arg1 = (VecMat::Vec< double,3 > *) 0 ;
+  VecMat::Vec< double,3 > *arg2 = 0 ;
+  VecMat::Vec< double,3 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -18156,22 +18014,22 @@ SWIGINTERN PyObject *_wrap_Vec_3d___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3d___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___mul__" "', argument " "1"" of type '" "VecMat::Vec<double,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___mul__" "', argument " "1"" of type '" "VecMat::Vec< double,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_double_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___mul__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___mul__" "', argument " "2"" of type '" "VecMat::Vec< double,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___mul__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___mul__" "', argument " "2"" of type '" "VecMat::Vec< double,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp2);
   {
     try {
-      result = (VecMat::Vec<double,3 >::value_type)((VecMat::Vec<double,3 > const *)arg1)->operator *((VecMat::Vec<double,3 > const &)*arg2);
+      result = (VecMat::Vec< double,3 >::value_type)((VecMat::Vec< double,3 > const *)arg1)->operator *((VecMat::Vec< double,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18193,17 +18051,17 @@ SWIGINTERN PyObject *_wrap_Vec_3d___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTdouble_3_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_double_3_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecTdouble_3_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecT_double_3_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec_3d___mul____SWIG_1(self, args);
@@ -18213,7 +18071,7 @@ SWIGINTERN PyObject *_wrap_Vec_3d___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTdouble_3_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_double_3_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -18234,8 +18092,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3d___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
-  VecMat::Vec<double,3 > *arg2 = 0 ;
+  VecMat::Vec< double,3 > *arg1 = (VecMat::Vec< double,3 > *) 0 ;
+  VecMat::Vec< double,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -18245,22 +18103,22 @@ SWIGINTERN PyObject *_wrap_Vec_3d___eq__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3d___eq__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___eq__" "', argument " "1"" of type '" "VecMat::Vec<double,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___eq__" "', argument " "1"" of type '" "VecMat::Vec< double,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_double_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___eq__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___eq__" "', argument " "2"" of type '" "VecMat::Vec< double,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___eq__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___eq__" "', argument " "2"" of type '" "VecMat::Vec< double,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<double,3 > const *)arg1)->operator ==((VecMat::Vec<double,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec< double,3 > const *)arg1)->operator ==((VecMat::Vec< double,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18278,8 +18136,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3d___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
-  VecMat::Vec<double,3 > *arg2 = 0 ;
+  VecMat::Vec< double,3 > *arg1 = (VecMat::Vec< double,3 > *) 0 ;
+  VecMat::Vec< double,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -18289,22 +18147,22 @@ SWIGINTERN PyObject *_wrap_Vec_3d___ne__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3d___ne__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___ne__" "', argument " "1"" of type '" "VecMat::Vec<double,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___ne__" "', argument " "1"" of type '" "VecMat::Vec< double,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_double_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___ne__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___ne__" "', argument " "2"" of type '" "VecMat::Vec< double,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___ne__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___ne__" "', argument " "2"" of type '" "VecMat::Vec< double,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<double,3 > const *)arg1)->operator !=((VecMat::Vec<double,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec< double,3 > const *)arg1)->operator !=((VecMat::Vec< double,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18322,8 +18180,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3d___lt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
-  VecMat::Vec<double,3 > *arg2 = 0 ;
+  VecMat::Vec< double,3 > *arg1 = (VecMat::Vec< double,3 > *) 0 ;
+  VecMat::Vec< double,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -18333,22 +18191,22 @@ SWIGINTERN PyObject *_wrap_Vec_3d___lt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3d___lt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___lt__" "', argument " "1"" of type '" "VecMat::Vec<double,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___lt__" "', argument " "1"" of type '" "VecMat::Vec< double,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_double_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___lt__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___lt__" "', argument " "2"" of type '" "VecMat::Vec< double,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___lt__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___lt__" "', argument " "2"" of type '" "VecMat::Vec< double,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<double,3 > const *)arg1)->operator <((VecMat::Vec<double,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec< double,3 > const *)arg1)->operator <((VecMat::Vec< double,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18366,8 +18224,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3d___gt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<double,3 > *arg1 = (VecMat::Vec<double,3 > *) 0 ;
-  VecMat::Vec<double,3 > *arg2 = 0 ;
+  VecMat::Vec< double,3 > *arg1 = (VecMat::Vec< double,3 > *) 0 ;
+  VecMat::Vec< double,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -18377,22 +18235,22 @@ SWIGINTERN PyObject *_wrap_Vec_3d___gt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3d___gt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTdouble_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_double_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___gt__" "', argument " "1"" of type '" "VecMat::Vec<double,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3d___gt__" "', argument " "1"" of type '" "VecMat::Vec< double,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTdouble_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_double_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___gt__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3d___gt__" "', argument " "2"" of type '" "VecMat::Vec< double,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___gt__" "', argument " "2"" of type '" "VecMat::Vec<double,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3d___gt__" "', argument " "2"" of type '" "VecMat::Vec< double,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<double,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< double,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<double,3 > const *)arg1)->operator >((VecMat::Vec<double,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec< double,3 > const *)arg1)->operator >((VecMat::Vec< double,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18410,19 +18268,19 @@ fail:
 
 SWIGINTERN PyObject *Vec_3d_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecTdouble_3_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecT_double_3_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec_3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,3 > *result = 0 ;
+  VecMat::Vec< float,3 > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec_3f")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec<float,3 > *)new VecMat::Vec<float,3 >();
+      result = (VecMat::Vec< float,3 > *)new VecMat::Vec< float,3 >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18431,7 +18289,7 @@ SWIGINTERN PyObject *_wrap_new_Vec_3f(PyObject *SWIGUNUSEDPARM(self), PyObject *
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTfloat_3_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_float_3_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -18440,17 +18298,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec_3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
+  VecMat::Vec< float,3 > *arg1 = (VecMat::Vec< float,3 > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec_3f",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_3_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_3f" "', argument " "1"" of type '" "VecMat::Vec<float,3 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec_3f" "', argument " "1"" of type '" "VecMat::Vec< float,3 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp1);
   {
     try {
       delete arg1;
@@ -18477,7 +18335,7 @@ SWIGINTERN PyObject *_wrap_Vec_3f_dim(PyObject *SWIGUNUSEDPARM(self), PyObject *
   if (!PyArg_ParseTuple(args,(char *)":Vec_3f_dim")) SWIG_fail;
   {
     try {
-      result = (unsigned int)VecMat::Vec<float,3 >::SWIGTEMPLATEDISAMBIGUATOR dim();
+      result = (unsigned int)VecMat::Vec< float,3 >::SWIGTEMPLATEDISAMBIGUATOR dim();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18495,21 +18353,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3f_norm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
-  VecMat::Vec<float,3 >::value_type result;
+  VecMat::Vec< float,3 > *arg1 = (VecMat::Vec< float,3 > *) 0 ;
+  VecMat::Vec< float,3 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3f_norm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f_norm" "', argument " "1"" of type '" "VecMat::Vec<float,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f_norm" "', argument " "1"" of type '" "VecMat::Vec< float,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec<float,3 >::value_type)((VecMat::Vec<float,3 > const *)arg1)->norm();
+      result = (VecMat::Vec< float,3 >::value_type)((VecMat::Vec< float,3 > const *)arg1)->norm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18527,21 +18385,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3f_squareNorm(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
-  VecMat::Vec<float,3 >::value_type result;
+  VecMat::Vec< float,3 > *arg1 = (VecMat::Vec< float,3 > *) 0 ;
+  VecMat::Vec< float,3 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3f_squareNorm",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f_squareNorm" "', argument " "1"" of type '" "VecMat::Vec<float,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f_squareNorm" "', argument " "1"" of type '" "VecMat::Vec< float,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp1);
   {
     try {
-      result = (VecMat::Vec<float,3 >::value_type)((VecMat::Vec<float,3 > const *)arg1)->squareNorm();
+      result = (VecMat::Vec< float,3 >::value_type)((VecMat::Vec< float,3 > const *)arg1)->squareNorm();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18559,23 +18417,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3f_normalize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
-  VecMat::Vec<float,3 > *result = 0 ;
+  VecMat::Vec< float,3 > *arg1 = (VecMat::Vec< float,3 > *) 0 ;
+  VecMat::Vec< float,3 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3f_normalize",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f_normalize" "', argument " "1"" of type '" "VecMat::Vec<float,3 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f_normalize" "', argument " "1"" of type '" "VecMat::Vec< float,3 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec<float,3 > &_result_ref = (arg1)->normalize();
-        result = (VecMat::Vec<float,3 > *) &_result_ref;
+        VecMat::Vec< float,3 > &_result_ref = (arg1)->normalize();
+        result = (VecMat::Vec< float,3 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -18585,7 +18443,7 @@ SWIGINTERN PyObject *_wrap_Vec_3f_normalize(PyObject *SWIGUNUSEDPARM(self), PyOb
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_float_3_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -18594,23 +18452,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3f_normalizeSafe(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
-  VecMat::Vec<float,3 > *result = 0 ;
+  VecMat::Vec< float,3 > *arg1 = (VecMat::Vec< float,3 > *) 0 ;
+  VecMat::Vec< float,3 > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec_3f_normalizeSafe",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec<float,3 > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f_normalizeSafe" "', argument " "1"" of type '" "VecMat::Vec< float,3 > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp1);
   {
     try {
       {
-        VecMat::Vec<float,3 > &_result_ref = (arg1)->normalizeSafe();
-        result = (VecMat::Vec<float,3 > *) &_result_ref;
+        VecMat::Vec< float,3 > &_result_ref = (arg1)->normalizeSafe();
+        result = (VecMat::Vec< float,3 > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -18620,7 +18478,7 @@ SWIGINTERN PyObject *_wrap_Vec_3f_normalizeSafe(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__VecT_float_3_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -18629,9 +18487,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3f___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
-  VecMat::Vec<float,3 > *arg2 = 0 ;
-  VecMat::Vec<float,3 > result;
+  VecMat::Vec< float,3 > *arg1 = (VecMat::Vec< float,3 > *) 0 ;
+  VecMat::Vec< float,3 > *arg2 = 0 ;
+  VecMat::Vec< float,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -18640,22 +18498,22 @@ SWIGINTERN PyObject *_wrap_Vec_3f___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3f___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___add__" "', argument " "1"" of type '" "VecMat::Vec<float,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___add__" "', argument " "1"" of type '" "VecMat::Vec< float,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_float_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___add__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___add__" "', argument " "2"" of type '" "VecMat::Vec< float,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___add__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___add__" "', argument " "2"" of type '" "VecMat::Vec< float,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec<float,3 > const *)arg1)->operator +((VecMat::Vec<float,3 > const &)*arg2);
+      result = ((VecMat::Vec< float,3 > const *)arg1)->operator +((VecMat::Vec< float,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18664,7 +18522,7 @@ SWIGINTERN PyObject *_wrap_Vec_3f___add__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<float,3 >(static_cast< const VecMat::Vec<float,3 >& >(result))), SWIGTYPE_p_VecMat__VecTfloat_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< float,3 >(static_cast< const VecMat::Vec< float,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_float_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -18673,9 +18531,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3f___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
-  VecMat::Vec<float,3 > *arg2 = 0 ;
-  VecMat::Vec<float,3 > result;
+  VecMat::Vec< float,3 > *arg1 = (VecMat::Vec< float,3 > *) 0 ;
+  VecMat::Vec< float,3 > *arg2 = 0 ;
+  VecMat::Vec< float,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -18684,22 +18542,22 @@ SWIGINTERN PyObject *_wrap_Vec_3f___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3f___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___sub__" "', argument " "1"" of type '" "VecMat::Vec<float,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___sub__" "', argument " "1"" of type '" "VecMat::Vec< float,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_float_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___sub__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___sub__" "', argument " "2"" of type '" "VecMat::Vec< float,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___sub__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___sub__" "', argument " "2"" of type '" "VecMat::Vec< float,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec<float,3 > const *)arg1)->operator -((VecMat::Vec<float,3 > const &)*arg2);
+      result = ((VecMat::Vec< float,3 > const *)arg1)->operator -((VecMat::Vec< float,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18708,7 +18566,7 @@ SWIGINTERN PyObject *_wrap_Vec_3f___sub__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<float,3 >(static_cast< const VecMat::Vec<float,3 >& >(result))), SWIGTYPE_p_VecMat__VecTfloat_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< float,3 >(static_cast< const VecMat::Vec< float,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_float_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -18717,9 +18575,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3f___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
-  VecMat::Vec<float,3 >::value_type arg2 ;
-  VecMat::Vec<float,3 > result;
+  VecMat::Vec< float,3 > *arg1 = (VecMat::Vec< float,3 > *) 0 ;
+  VecMat::Vec< float,3 >::value_type arg2 ;
+  VecMat::Vec< float,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   float val2 ;
@@ -18728,19 +18586,19 @@ SWIGINTERN PyObject *_wrap_Vec_3f___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3f___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___mul__" "', argument " "1"" of type '" "VecMat::Vec<float,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___mul__" "', argument " "1"" of type '" "VecMat::Vec< float,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3f___mul__" "', argument " "2"" of type '" "VecMat::Vec<float,3 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3f___mul__" "', argument " "2"" of type '" "VecMat::Vec< float,3 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec<float,3 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec< float,3 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec<float,3 > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec< float,3 > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18749,7 +18607,7 @@ SWIGINTERN PyObject *_wrap_Vec_3f___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<float,3 >(static_cast< const VecMat::Vec<float,3 >& >(result))), SWIGTYPE_p_VecMat__VecTfloat_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< float,3 >(static_cast< const VecMat::Vec< float,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_float_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -18758,9 +18616,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3f___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
-  VecMat::Vec<float,3 >::value_type arg2 ;
-  VecMat::Vec<float,3 > result;
+  VecMat::Vec< float,3 > *arg1 = (VecMat::Vec< float,3 > *) 0 ;
+  VecMat::Vec< float,3 >::value_type arg2 ;
+  VecMat::Vec< float,3 > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   float val2 ;
@@ -18769,19 +18627,19 @@ SWIGINTERN PyObject *_wrap_Vec_3f___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3f___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___div__" "', argument " "1"" of type '" "VecMat::Vec<float,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___div__" "', argument " "1"" of type '" "VecMat::Vec< float,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3f___div__" "', argument " "2"" of type '" "VecMat::Vec<float,3 >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec_3f___div__" "', argument " "2"" of type '" "VecMat::Vec< float,3 >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec<float,3 >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec< float,3 >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec<float,3 > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec< float,3 > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18790,7 +18648,7 @@ SWIGINTERN PyObject *_wrap_Vec_3f___div__(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec<float,3 >(static_cast< const VecMat::Vec<float,3 >& >(result))), SWIGTYPE_p_VecMat__VecTfloat_3_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec< float,3 >(static_cast< const VecMat::Vec< float,3 >& >(result))), SWIGTYPE_p_VecMat__VecT_float_3_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -18799,9 +18657,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3f___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
-  VecMat::Vec<float,3 > *arg2 = 0 ;
-  VecMat::Vec<float,3 >::value_type result;
+  VecMat::Vec< float,3 > *arg1 = (VecMat::Vec< float,3 > *) 0 ;
+  VecMat::Vec< float,3 > *arg2 = 0 ;
+  VecMat::Vec< float,3 >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -18810,22 +18668,22 @@ SWIGINTERN PyObject *_wrap_Vec_3f___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3f___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___mul__" "', argument " "1"" of type '" "VecMat::Vec<float,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___mul__" "', argument " "1"" of type '" "VecMat::Vec< float,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_float_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___mul__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___mul__" "', argument " "2"" of type '" "VecMat::Vec< float,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___mul__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___mul__" "', argument " "2"" of type '" "VecMat::Vec< float,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp2);
   {
     try {
-      result = (VecMat::Vec<float,3 >::value_type)((VecMat::Vec<float,3 > const *)arg1)->operator *((VecMat::Vec<float,3 > const &)*arg2);
+      result = (VecMat::Vec< float,3 >::value_type)((VecMat::Vec< float,3 > const *)arg1)->operator *((VecMat::Vec< float,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18847,17 +18705,17 @@ SWIGINTERN PyObject *_wrap_Vec_3f___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTfloat_3_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_float_3_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecTfloat_3_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__VecT_float_3_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec_3f___mul____SWIG_1(self, args);
@@ -18867,7 +18725,7 @@ SWIGINTERN PyObject *_wrap_Vec_3f___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecTfloat_3_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__VecT_float_3_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -18888,8 +18746,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3f___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
-  VecMat::Vec<float,3 > *arg2 = 0 ;
+  VecMat::Vec< float,3 > *arg1 = (VecMat::Vec< float,3 > *) 0 ;
+  VecMat::Vec< float,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -18899,22 +18757,22 @@ SWIGINTERN PyObject *_wrap_Vec_3f___eq__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3f___eq__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___eq__" "', argument " "1"" of type '" "VecMat::Vec<float,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___eq__" "', argument " "1"" of type '" "VecMat::Vec< float,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_float_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___eq__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___eq__" "', argument " "2"" of type '" "VecMat::Vec< float,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___eq__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___eq__" "', argument " "2"" of type '" "VecMat::Vec< float,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<float,3 > const *)arg1)->operator ==((VecMat::Vec<float,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec< float,3 > const *)arg1)->operator ==((VecMat::Vec< float,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18932,8 +18790,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3f___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
-  VecMat::Vec<float,3 > *arg2 = 0 ;
+  VecMat::Vec< float,3 > *arg1 = (VecMat::Vec< float,3 > *) 0 ;
+  VecMat::Vec< float,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -18943,22 +18801,22 @@ SWIGINTERN PyObject *_wrap_Vec_3f___ne__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3f___ne__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___ne__" "', argument " "1"" of type '" "VecMat::Vec<float,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___ne__" "', argument " "1"" of type '" "VecMat::Vec< float,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_float_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___ne__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___ne__" "', argument " "2"" of type '" "VecMat::Vec< float,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___ne__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___ne__" "', argument " "2"" of type '" "VecMat::Vec< float,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<float,3 > const *)arg1)->operator !=((VecMat::Vec<float,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec< float,3 > const *)arg1)->operator !=((VecMat::Vec< float,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -18976,8 +18834,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3f___lt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
-  VecMat::Vec<float,3 > *arg2 = 0 ;
+  VecMat::Vec< float,3 > *arg1 = (VecMat::Vec< float,3 > *) 0 ;
+  VecMat::Vec< float,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -18987,22 +18845,22 @@ SWIGINTERN PyObject *_wrap_Vec_3f___lt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3f___lt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___lt__" "', argument " "1"" of type '" "VecMat::Vec<float,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___lt__" "', argument " "1"" of type '" "VecMat::Vec< float,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_float_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___lt__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___lt__" "', argument " "2"" of type '" "VecMat::Vec< float,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___lt__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___lt__" "', argument " "2"" of type '" "VecMat::Vec< float,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<float,3 > const *)arg1)->operator <((VecMat::Vec<float,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec< float,3 > const *)arg1)->operator <((VecMat::Vec< float,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -19020,8 +18878,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec_3f___gt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec<float,3 > *arg1 = (VecMat::Vec<float,3 > *) 0 ;
-  VecMat::Vec<float,3 > *arg2 = 0 ;
+  VecMat::Vec< float,3 > *arg1 = (VecMat::Vec< float,3 > *) 0 ;
+  VecMat::Vec< float,3 > *arg2 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -19031,22 +18889,22 @@ SWIGINTERN PyObject *_wrap_Vec_3f___gt__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec_3f___gt__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecTfloat_3_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__VecT_float_3_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___gt__" "', argument " "1"" of type '" "VecMat::Vec<float,3 > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec_3f___gt__" "', argument " "1"" of type '" "VecMat::Vec< float,3 > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecTfloat_3_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__VecT_float_3_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___gt__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec_3f___gt__" "', argument " "2"" of type '" "VecMat::Vec< float,3 > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___gt__" "', argument " "2"" of type '" "VecMat::Vec<float,3 > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec_3f___gt__" "', argument " "2"" of type '" "VecMat::Vec< float,3 > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec<float,3 > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec< float,3 > * >(argp2);
   {
     try {
-      result = (bool)((VecMat::Vec<float,3 > const *)arg1)->operator >((VecMat::Vec<float,3 > const &)*arg2);
+      result = (bool)((VecMat::Vec< float,3 > const *)arg1)->operator >((VecMat::Vec< float,3 > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -19064,19 +18922,19 @@ fail:
 
 SWIGINTERN PyObject *Vec_3f_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecTfloat_3_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__VecT_float_3_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec3u__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<unsigned int > *result = 0 ;
+  VecMat::Vec3< unsigned int > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec3u")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec3<unsigned int > *)new VecMat::Vec3<unsigned int >();
+      result = (VecMat::Vec3< unsigned int > *)new VecMat::Vec3< unsigned int >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -19085,7 +18943,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3u__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -19094,10 +18952,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec3u__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<unsigned int >::value_type arg1 ;
-  VecMat::Vec3<unsigned int >::value_type arg2 ;
-  VecMat::Vec3<unsigned int >::value_type arg3 ;
-  VecMat::Vec3<unsigned int > *result = 0 ;
+  VecMat::Vec3< unsigned int >::value_type arg1 ;
+  VecMat::Vec3< unsigned int >::value_type arg2 ;
+  VecMat::Vec3< unsigned int >::value_type arg3 ;
+  VecMat::Vec3< unsigned int > *result = 0 ;
   unsigned int val1 ;
   int ecode1 = 0 ;
   unsigned int val2 ;
@@ -19111,22 +18969,22 @@ SWIGINTERN PyObject *_wrap_new_Vec3u__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OOO:new_Vec3u",&obj0,&obj1,&obj2)) SWIG_fail;
   ecode1 = SWIG_AsVal_unsigned_SS_int(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3u" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3u" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec3<unsigned int >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec3< unsigned int >::value_type >(val1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3u" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3u" "', argument " "2"" of type '" "VecMat::Vec3< unsigned int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<unsigned int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< unsigned int >::value_type >(val2);
   ecode3 = SWIG_AsVal_unsigned_SS_int(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_Vec3u" "', argument " "3"" of type '" "VecMat::Vec3<unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_Vec3u" "', argument " "3"" of type '" "VecMat::Vec3< unsigned int >::value_type""'");
   } 
-  arg3 = static_cast< VecMat::Vec3<unsigned int >::value_type >(val3);
+  arg3 = static_cast< VecMat::Vec3< unsigned int >::value_type >(val3);
   {
     try {
-      result = (VecMat::Vec3<unsigned int > *)new VecMat::Vec3<unsigned int >(arg1,arg2,arg3);
+      result = (VecMat::Vec3< unsigned int > *)new VecMat::Vec3< unsigned int >(arg1,arg2,arg3);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -19135,7 +18993,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3u__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -19144,9 +19002,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec3u__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<unsigned int >::value_type arg1 ;
-  VecMat::Vec3<unsigned int >::value_type arg2 ;
-  VecMat::Vec3<unsigned int > *result = 0 ;
+  VecMat::Vec3< unsigned int >::value_type arg1 ;
+  VecMat::Vec3< unsigned int >::value_type arg2 ;
+  VecMat::Vec3< unsigned int > *result = 0 ;
   unsigned int val1 ;
   int ecode1 = 0 ;
   unsigned int val2 ;
@@ -19157,17 +19015,17 @@ SWIGINTERN PyObject *_wrap_new_Vec3u__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OO:new_Vec3u",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_unsigned_SS_int(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3u" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3u" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec3<unsigned int >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec3< unsigned int >::value_type >(val1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3u" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3u" "', argument " "2"" of type '" "VecMat::Vec3< unsigned int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<unsigned int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< unsigned int >::value_type >(val2);
   {
     try {
-      result = (VecMat::Vec3<unsigned int > *)new VecMat::Vec3<unsigned int >(arg1,arg2);
+      result = (VecMat::Vec3< unsigned int > *)new VecMat::Vec3< unsigned int >(arg1,arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -19176,7 +19034,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3u__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -19185,8 +19043,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec3u__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<unsigned int >::value_type arg1 ;
-  VecMat::Vec3<unsigned int > *result = 0 ;
+  VecMat::Vec3< unsigned int >::value_type arg1 ;
+  VecMat::Vec3< unsigned int > *result = 0 ;
   unsigned int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -19194,12 +19052,12 @@ SWIGINTERN PyObject *_wrap_new_Vec3u__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"O:new_Vec3u",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_unsigned_SS_int(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3u" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3u" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec3<unsigned int >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec3< unsigned int >::value_type >(val1);
   {
     try {
-      result = (VecMat::Vec3<unsigned int > *)new VecMat::Vec3<unsigned int >(arg1);
+      result = (VecMat::Vec3< unsigned int > *)new VecMat::Vec3< unsigned int >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -19208,7 +19066,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3u__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -19221,7 +19079,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3u(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -19278,28 +19136,33 @@ SWIGINTERN PyObject *_wrap_new_Vec3u(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec3u'.\n  Possible C/C++ prototypes are:\n    VecMat::Vec3<(unsigned int)>()\n    VecMat::Vec3<(unsigned int)>(VecMat::Vec3<unsigned int >::value_type const,VecMat::Vec3<unsigned int >::value_type const,VecMat::Vec3<unsigned int >::value_type const)\n    VecMat::Vec3<(unsigned int)>(VecMat::Vec3<unsigned int >::value_type const,VecMat::Vec3<unsigned int >::value_type const)\n    VecMat::Vec3<(unsigned int)>(VecMat::Vec3<unsigned int >::value_type const)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec3u'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    VecMat::Vec3< unsigned int >()\n"
+    "    VecMat::Vec3< unsigned int >(VecMat::Vec3< unsigned int >::value_type const,VecMat::Vec3< unsigned int >::value_type const,VecMat::Vec3< unsigned int >::value_type const)\n"
+    "    VecMat::Vec3< unsigned int >(VecMat::Vec3< unsigned int >::value_type const,VecMat::Vec3< unsigned int >::value_type const)\n"
+    "    VecMat::Vec3< unsigned int >(VecMat::Vec3< unsigned int >::value_type const)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3u_x__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
-  VecMat::Vec3<unsigned int >::value_type result;
+  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
+  VecMat::Vec3< unsigned int >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3u_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_x" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_x" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
   {
     try {
-      result = (VecMat::Vec3<unsigned int >::value_type)((VecMat::Vec3<unsigned int > const *)arg1)->x();
+      result = (VecMat::Vec3< unsigned int >::value_type)((VecMat::Vec3< unsigned int > const *)arg1)->x();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -19317,23 +19180,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3u_x__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
-  VecMat::Vec3<unsigned int >::value_type *result = 0 ;
+  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
+  VecMat::Vec3< unsigned int >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3u_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_x" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_x" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
   {
     try {
       {
-        VecMat::Vec3<unsigned int >::value_type &_result_ref = (arg1)->x();
-        result = (VecMat::Vec3<unsigned int >::value_type *) &_result_ref;
+        VecMat::Vec3< unsigned int >::value_type &_result_ref = (arg1)->x();
+        result = (VecMat::Vec3< unsigned int >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -19356,14 +19219,14 @@ SWIGINTERN PyObject *_wrap_Vec3u_x(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3u_x__SWIG_0(self, args);
@@ -19372,7 +19235,7 @@ SWIGINTERN PyObject *_wrap_Vec3u_x(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3u_x__SWIG_1(self, args);
@@ -19380,28 +19243,31 @@ SWIGINTERN PyObject *_wrap_Vec3u_x(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3u_x'.\n  Possible C/C++ prototypes are:\n    x()\n    x()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3u_x'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    x(VecMat::Vec3< unsigned int > const *)\n"
+    "    x(VecMat::Vec3< unsigned int > *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3u_y__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
-  VecMat::Vec3<unsigned int >::value_type result;
+  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
+  VecMat::Vec3< unsigned int >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3u_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_y" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_y" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
   {
     try {
-      result = (VecMat::Vec3<unsigned int >::value_type)((VecMat::Vec3<unsigned int > const *)arg1)->y();
+      result = (VecMat::Vec3< unsigned int >::value_type)((VecMat::Vec3< unsigned int > const *)arg1)->y();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -19419,23 +19285,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3u_y__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
-  VecMat::Vec3<unsigned int >::value_type *result = 0 ;
+  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
+  VecMat::Vec3< unsigned int >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3u_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_y" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_y" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
   {
     try {
       {
-        VecMat::Vec3<unsigned int >::value_type &_result_ref = (arg1)->y();
-        result = (VecMat::Vec3<unsigned int >::value_type *) &_result_ref;
+        VecMat::Vec3< unsigned int >::value_type &_result_ref = (arg1)->y();
+        result = (VecMat::Vec3< unsigned int >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -19458,14 +19324,14 @@ SWIGINTERN PyObject *_wrap_Vec3u_y(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3u_y__SWIG_0(self, args);
@@ -19474,7 +19340,7 @@ SWIGINTERN PyObject *_wrap_Vec3u_y(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3u_y__SWIG_1(self, args);
@@ -19482,28 +19348,31 @@ SWIGINTERN PyObject *_wrap_Vec3u_y(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3u_y'.\n  Possible C/C++ prototypes are:\n    y()\n    y()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3u_y'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    y(VecMat::Vec3< unsigned int > const *)\n"
+    "    y(VecMat::Vec3< unsigned int > *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3u_z__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
-  VecMat::Vec3<unsigned int >::value_type result;
+  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
+  VecMat::Vec3< unsigned int >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3u_z",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_z" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_z" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
   {
     try {
-      result = (VecMat::Vec3<unsigned int >::value_type)((VecMat::Vec3<unsigned int > const *)arg1)->z();
+      result = (VecMat::Vec3< unsigned int >::value_type)((VecMat::Vec3< unsigned int > const *)arg1)->z();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -19521,23 +19390,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3u_z__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
-  VecMat::Vec3<unsigned int >::value_type *result = 0 ;
+  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
+  VecMat::Vec3< unsigned int >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3u_z",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_z" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_z" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
   {
     try {
       {
-        VecMat::Vec3<unsigned int >::value_type &_result_ref = (arg1)->z();
-        result = (VecMat::Vec3<unsigned int >::value_type *) &_result_ref;
+        VecMat::Vec3< unsigned int >::value_type &_result_ref = (arg1)->z();
+        result = (VecMat::Vec3< unsigned int >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -19560,14 +19429,14 @@ SWIGINTERN PyObject *_wrap_Vec3u_z(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3u_z__SWIG_0(self, args);
@@ -19576,7 +19445,7 @@ SWIGINTERN PyObject *_wrap_Vec3u_z(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3u_z__SWIG_1(self, args);
@@ -19584,15 +19453,18 @@ SWIGINTERN PyObject *_wrap_Vec3u_z(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3u_z'.\n  Possible C/C++ prototypes are:\n    z()\n    z()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3u_z'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    z(VecMat::Vec3< unsigned int > const *)\n"
+    "    z(VecMat::Vec3< unsigned int > *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3u_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
-  VecMat::Vec3<unsigned int >::value_type arg2 ;
+  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
+  VecMat::Vec3< unsigned int >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned int val2 ;
@@ -19601,16 +19473,16 @@ SWIGINTERN PyObject *_wrap_Vec3u_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3u_setX",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_setX" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_setX" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3u_setX" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3u_setX" "', argument " "2"" of type '" "VecMat::Vec3< unsigned int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<unsigned int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< unsigned int >::value_type >(val2);
   {
     try {
       (arg1)->setX(arg2);
@@ -19631,8 +19503,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3u_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
-  VecMat::Vec3<unsigned int >::value_type arg2 ;
+  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
+  VecMat::Vec3< unsigned int >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned int val2 ;
@@ -19641,16 +19513,16 @@ SWIGINTERN PyObject *_wrap_Vec3u_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3u_setY",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_setY" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_setY" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3u_setY" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3u_setY" "', argument " "2"" of type '" "VecMat::Vec3< unsigned int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<unsigned int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< unsigned int >::value_type >(val2);
   {
     try {
       (arg1)->setY(arg2);
@@ -19671,8 +19543,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3u_setZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
-  VecMat::Vec3<unsigned int >::value_type arg2 ;
+  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
+  VecMat::Vec3< unsigned int >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned int val2 ;
@@ -19681,16 +19553,16 @@ SWIGINTERN PyObject *_wrap_Vec3u_setZ(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3u_setZ",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_setZ" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u_setZ" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3u_setZ" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3u_setZ" "', argument " "2"" of type '" "VecMat::Vec3< unsigned int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<unsigned int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< unsigned int >::value_type >(val2);
   {
     try {
       (arg1)->setZ(arg2);
@@ -19711,9 +19583,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3u___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
-  VecMat::Vec3<unsigned int > *arg2 = 0 ;
-  VecMat::Vec3<unsigned int > result;
+  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
+  VecMat::Vec3< unsigned int > *arg2 = 0 ;
+  VecMat::Vec3< unsigned int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -19722,22 +19594,22 @@ SWIGINTERN PyObject *_wrap_Vec3u___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3u___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u___add__" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u___add__" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3u___add__" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3u___add__" "', argument " "2"" of type '" "VecMat::Vec3< unsigned int > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3u___add__" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3u___add__" "', argument " "2"" of type '" "VecMat::Vec3< unsigned int > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec3<unsigned int > const *)arg1)->operator +((VecMat::Vec3<unsigned int > const &)*arg2);
+      result = ((VecMat::Vec3< unsigned int > const *)arg1)->operator +((VecMat::Vec3< unsigned int > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -19746,7 +19618,7 @@ SWIGINTERN PyObject *_wrap_Vec3u___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<unsigned int >(static_cast< const VecMat::Vec3<unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< unsigned int >(static_cast< const VecMat::Vec3< unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -19755,9 +19627,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3u___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
-  VecMat::Vec3<unsigned int > *arg2 = 0 ;
-  VecMat::Vec3<unsigned int > result;
+  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
+  VecMat::Vec3< unsigned int > *arg2 = 0 ;
+  VecMat::Vec3< unsigned int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -19766,22 +19638,22 @@ SWIGINTERN PyObject *_wrap_Vec3u___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3u___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u___sub__" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u___sub__" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3u___sub__" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3u___sub__" "', argument " "2"" of type '" "VecMat::Vec3< unsigned int > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3u___sub__" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3u___sub__" "', argument " "2"" of type '" "VecMat::Vec3< unsigned int > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec3<unsigned int > const *)arg1)->operator -((VecMat::Vec3<unsigned int > const &)*arg2);
+      result = ((VecMat::Vec3< unsigned int > const *)arg1)->operator -((VecMat::Vec3< unsigned int > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -19790,7 +19662,7 @@ SWIGINTERN PyObject *_wrap_Vec3u___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<unsigned int >(static_cast< const VecMat::Vec3<unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< unsigned int >(static_cast< const VecMat::Vec3< unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -19799,9 +19671,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3u___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
-  VecMat::Vec3<unsigned int >::value_type arg2 ;
-  VecMat::Vec3<unsigned int > result;
+  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
+  VecMat::Vec3< unsigned int >::value_type arg2 ;
+  VecMat::Vec3< unsigned int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned int val2 ;
@@ -19810,19 +19682,19 @@ SWIGINTERN PyObject *_wrap_Vec3u___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3u___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u___mul__" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u___mul__" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3u___mul__" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3u___mul__" "', argument " "2"" of type '" "VecMat::Vec3< unsigned int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<unsigned int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< unsigned int >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec3<unsigned int > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec3< unsigned int > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -19831,7 +19703,7 @@ SWIGINTERN PyObject *_wrap_Vec3u___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<unsigned int >(static_cast< const VecMat::Vec3<unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< unsigned int >(static_cast< const VecMat::Vec3< unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -19840,9 +19712,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3u___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
-  VecMat::Vec3<unsigned int >::value_type arg2 ;
-  VecMat::Vec3<unsigned int > result;
+  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
+  VecMat::Vec3< unsigned int >::value_type arg2 ;
+  VecMat::Vec3< unsigned int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned int val2 ;
@@ -19851,19 +19723,19 @@ SWIGINTERN PyObject *_wrap_Vec3u___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3u___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u___div__" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u___div__" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3u___div__" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3u___div__" "', argument " "2"" of type '" "VecMat::Vec3< unsigned int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<unsigned int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< unsigned int >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec3<unsigned int > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec3< unsigned int > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -19872,7 +19744,7 @@ SWIGINTERN PyObject *_wrap_Vec3u___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<unsigned int >(static_cast< const VecMat::Vec3<unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< unsigned int >(static_cast< const VecMat::Vec3< unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -19881,9 +19753,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3u___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
-  VecMat::Vec3<unsigned int > *arg2 = 0 ;
-  VecMat::Vec3<unsigned int >::value_type result;
+  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
+  VecMat::Vec3< unsigned int > *arg2 = 0 ;
+  VecMat::Vec3< unsigned int >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -19892,22 +19764,22 @@ SWIGINTERN PyObject *_wrap_Vec3u___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3u___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u___mul__" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u___mul__" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3u___mul__" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3u___mul__" "', argument " "2"" of type '" "VecMat::Vec3< unsigned int > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3u___mul__" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3u___mul__" "', argument " "2"" of type '" "VecMat::Vec3< unsigned int > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp2);
   {
     try {
-      result = (VecMat::Vec3<unsigned int >::value_type)((VecMat::Vec3<unsigned int > const *)arg1)->operator *((VecMat::Vec3<unsigned int > const &)*arg2);
+      result = (VecMat::Vec3< unsigned int >::value_type)((VecMat::Vec3< unsigned int > const *)arg1)->operator *((VecMat::Vec3< unsigned int > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -19929,17 +19801,17 @@ SWIGINTERN PyObject *_wrap_Vec3u___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec3u___mul____SWIG_1(self, args);
@@ -19949,7 +19821,7 @@ SWIGINTERN PyObject *_wrap_Vec3u___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -19970,9 +19842,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3u___xor__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
-  VecMat::Vec3<unsigned int > *arg2 = 0 ;
-  VecMat::Vec3<unsigned int > result;
+  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
+  VecMat::Vec3< unsigned int > *arg2 = 0 ;
+  VecMat::Vec3< unsigned int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -19981,22 +19853,22 @@ SWIGINTERN PyObject *_wrap_Vec3u___xor__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3u___xor__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u___xor__" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3u___xor__" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3u___xor__" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3u___xor__" "', argument " "2"" of type '" "VecMat::Vec3< unsigned int > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3u___xor__" "', argument " "2"" of type '" "VecMat::Vec3<unsigned int > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3u___xor__" "', argument " "2"" of type '" "VecMat::Vec3< unsigned int > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec3<unsigned int > const *)arg1)->operator ^((VecMat::Vec3<unsigned int > const &)*arg2);
+      result = ((VecMat::Vec3< unsigned int > const *)arg1)->operator ^((VecMat::Vec3< unsigned int > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -20005,7 +19877,7 @@ SWIGINTERN PyObject *_wrap_Vec3u___xor__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<unsigned int >(static_cast< const VecMat::Vec3<unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< unsigned int >(static_cast< const VecMat::Vec3< unsigned int >& >(result))), SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -20014,17 +19886,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec3u(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<unsigned int > *arg1 = (VecMat::Vec3<unsigned int > *) 0 ;
+  VecMat::Vec3< unsigned int > *arg1 = (VecMat::Vec3< unsigned int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec3u",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec3u" "', argument " "1"" of type '" "VecMat::Vec3<unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec3u" "', argument " "1"" of type '" "VecMat::Vec3< unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< unsigned int > * >(argp1);
   {
     try {
       delete arg1;
@@ -20046,19 +19918,19 @@ fail:
 
 SWIGINTERN PyObject *Vec3u_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec3Tunsigned_int_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec3T_unsigned_int_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec3i__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<int > *result = 0 ;
+  VecMat::Vec3< int > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec3i")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec3<int > *)new VecMat::Vec3<int >();
+      result = (VecMat::Vec3< int > *)new VecMat::Vec3< int >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -20067,7 +19939,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3i__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tint_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_int_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -20076,10 +19948,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec3i__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<int >::value_type arg1 ;
-  VecMat::Vec3<int >::value_type arg2 ;
-  VecMat::Vec3<int >::value_type arg3 ;
-  VecMat::Vec3<int > *result = 0 ;
+  VecMat::Vec3< int >::value_type arg1 ;
+  VecMat::Vec3< int >::value_type arg2 ;
+  VecMat::Vec3< int >::value_type arg3 ;
+  VecMat::Vec3< int > *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -20093,22 +19965,22 @@ SWIGINTERN PyObject *_wrap_new_Vec3i__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OOO:new_Vec3i",&obj0,&obj1,&obj2)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3i" "', argument " "1"" of type '" "VecMat::Vec3<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3i" "', argument " "1"" of type '" "VecMat::Vec3< int >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec3<int >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec3< int >::value_type >(val1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3i" "', argument " "2"" of type '" "VecMat::Vec3<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3i" "', argument " "2"" of type '" "VecMat::Vec3< int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< int >::value_type >(val2);
   ecode3 = SWIG_AsVal_int(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_Vec3i" "', argument " "3"" of type '" "VecMat::Vec3<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_Vec3i" "', argument " "3"" of type '" "VecMat::Vec3< int >::value_type""'");
   } 
-  arg3 = static_cast< VecMat::Vec3<int >::value_type >(val3);
+  arg3 = static_cast< VecMat::Vec3< int >::value_type >(val3);
   {
     try {
-      result = (VecMat::Vec3<int > *)new VecMat::Vec3<int >(arg1,arg2,arg3);
+      result = (VecMat::Vec3< int > *)new VecMat::Vec3< int >(arg1,arg2,arg3);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -20117,7 +19989,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3i__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tint_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_int_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -20126,9 +19998,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec3i__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<int >::value_type arg1 ;
-  VecMat::Vec3<int >::value_type arg2 ;
-  VecMat::Vec3<int > *result = 0 ;
+  VecMat::Vec3< int >::value_type arg1 ;
+  VecMat::Vec3< int >::value_type arg2 ;
+  VecMat::Vec3< int > *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   int val2 ;
@@ -20139,17 +20011,17 @@ SWIGINTERN PyObject *_wrap_new_Vec3i__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OO:new_Vec3i",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3i" "', argument " "1"" of type '" "VecMat::Vec3<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3i" "', argument " "1"" of type '" "VecMat::Vec3< int >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec3<int >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec3< int >::value_type >(val1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3i" "', argument " "2"" of type '" "VecMat::Vec3<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3i" "', argument " "2"" of type '" "VecMat::Vec3< int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< int >::value_type >(val2);
   {
     try {
-      result = (VecMat::Vec3<int > *)new VecMat::Vec3<int >(arg1,arg2);
+      result = (VecMat::Vec3< int > *)new VecMat::Vec3< int >(arg1,arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -20158,7 +20030,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3i__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tint_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_int_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -20167,8 +20039,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec3i__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<int >::value_type arg1 ;
-  VecMat::Vec3<int > *result = 0 ;
+  VecMat::Vec3< int >::value_type arg1 ;
+  VecMat::Vec3< int > *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -20176,12 +20048,12 @@ SWIGINTERN PyObject *_wrap_new_Vec3i__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"O:new_Vec3i",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_int(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3i" "', argument " "1"" of type '" "VecMat::Vec3<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3i" "', argument " "1"" of type '" "VecMat::Vec3< int >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec3<int >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec3< int >::value_type >(val1);
   {
     try {
-      result = (VecMat::Vec3<int > *)new VecMat::Vec3<int >(arg1);
+      result = (VecMat::Vec3< int > *)new VecMat::Vec3< int >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -20190,7 +20062,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3i__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tint_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_int_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -20203,7 +20075,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3i(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -20260,28 +20132,33 @@ SWIGINTERN PyObject *_wrap_new_Vec3i(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec3i'.\n  Possible C/C++ prototypes are:\n    VecMat::Vec3<(int)>()\n    VecMat::Vec3<(int)>(VecMat::Vec3<int >::value_type const,VecMat::Vec3<int >::value_type const,VecMat::Vec3<int >::value_type const)\n    VecMat::Vec3<(int)>(VecMat::Vec3<int >::value_type const,VecMat::Vec3<int >::value_type const)\n    VecMat::Vec3<(int)>(VecMat::Vec3<int >::value_type const)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec3i'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    VecMat::Vec3< int >()\n"
+    "    VecMat::Vec3< int >(VecMat::Vec3< int >::value_type const,VecMat::Vec3< int >::value_type const,VecMat::Vec3< int >::value_type const)\n"
+    "    VecMat::Vec3< int >(VecMat::Vec3< int >::value_type const,VecMat::Vec3< int >::value_type const)\n"
+    "    VecMat::Vec3< int >(VecMat::Vec3< int >::value_type const)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3i_x__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
-  VecMat::Vec3<int >::value_type result;
+  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
+  VecMat::Vec3< int >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3i_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_x" "', argument " "1"" of type '" "VecMat::Vec3<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_x" "', argument " "1"" of type '" "VecMat::Vec3< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
   {
     try {
-      result = (VecMat::Vec3<int >::value_type)((VecMat::Vec3<int > const *)arg1)->x();
+      result = (VecMat::Vec3< int >::value_type)((VecMat::Vec3< int > const *)arg1)->x();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -20299,23 +20176,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3i_x__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
-  VecMat::Vec3<int >::value_type *result = 0 ;
+  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
+  VecMat::Vec3< int >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3i_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_x" "', argument " "1"" of type '" "VecMat::Vec3<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_x" "', argument " "1"" of type '" "VecMat::Vec3< int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
   {
     try {
       {
-        VecMat::Vec3<int >::value_type &_result_ref = (arg1)->x();
-        result = (VecMat::Vec3<int >::value_type *) &_result_ref;
+        VecMat::Vec3< int >::value_type &_result_ref = (arg1)->x();
+        result = (VecMat::Vec3< int >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -20338,14 +20215,14 @@ SWIGINTERN PyObject *_wrap_Vec3i_x(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tint_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3i_x__SWIG_0(self, args);
@@ -20354,7 +20231,7 @@ SWIGINTERN PyObject *_wrap_Vec3i_x(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tint_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3i_x__SWIG_1(self, args);
@@ -20362,28 +20239,31 @@ SWIGINTERN PyObject *_wrap_Vec3i_x(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3i_x'.\n  Possible C/C++ prototypes are:\n    x()\n    x()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3i_x'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    x(VecMat::Vec3< int > const *)\n"
+    "    x(VecMat::Vec3< int > *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3i_y__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
-  VecMat::Vec3<int >::value_type result;
+  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
+  VecMat::Vec3< int >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3i_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_y" "', argument " "1"" of type '" "VecMat::Vec3<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_y" "', argument " "1"" of type '" "VecMat::Vec3< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
   {
     try {
-      result = (VecMat::Vec3<int >::value_type)((VecMat::Vec3<int > const *)arg1)->y();
+      result = (VecMat::Vec3< int >::value_type)((VecMat::Vec3< int > const *)arg1)->y();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -20401,23 +20281,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3i_y__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
-  VecMat::Vec3<int >::value_type *result = 0 ;
+  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
+  VecMat::Vec3< int >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3i_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_y" "', argument " "1"" of type '" "VecMat::Vec3<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_y" "', argument " "1"" of type '" "VecMat::Vec3< int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
   {
     try {
       {
-        VecMat::Vec3<int >::value_type &_result_ref = (arg1)->y();
-        result = (VecMat::Vec3<int >::value_type *) &_result_ref;
+        VecMat::Vec3< int >::value_type &_result_ref = (arg1)->y();
+        result = (VecMat::Vec3< int >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -20440,14 +20320,14 @@ SWIGINTERN PyObject *_wrap_Vec3i_y(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tint_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3i_y__SWIG_0(self, args);
@@ -20456,7 +20336,7 @@ SWIGINTERN PyObject *_wrap_Vec3i_y(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tint_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3i_y__SWIG_1(self, args);
@@ -20464,28 +20344,31 @@ SWIGINTERN PyObject *_wrap_Vec3i_y(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3i_y'.\n  Possible C/C++ prototypes are:\n    y()\n    y()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3i_y'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    y(VecMat::Vec3< int > const *)\n"
+    "    y(VecMat::Vec3< int > *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3i_z__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
-  VecMat::Vec3<int >::value_type result;
+  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
+  VecMat::Vec3< int >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3i_z",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_z" "', argument " "1"" of type '" "VecMat::Vec3<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_z" "', argument " "1"" of type '" "VecMat::Vec3< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
   {
     try {
-      result = (VecMat::Vec3<int >::value_type)((VecMat::Vec3<int > const *)arg1)->z();
+      result = (VecMat::Vec3< int >::value_type)((VecMat::Vec3< int > const *)arg1)->z();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -20503,23 +20386,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3i_z__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
-  VecMat::Vec3<int >::value_type *result = 0 ;
+  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
+  VecMat::Vec3< int >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3i_z",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_z" "', argument " "1"" of type '" "VecMat::Vec3<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_z" "', argument " "1"" of type '" "VecMat::Vec3< int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
   {
     try {
       {
-        VecMat::Vec3<int >::value_type &_result_ref = (arg1)->z();
-        result = (VecMat::Vec3<int >::value_type *) &_result_ref;
+        VecMat::Vec3< int >::value_type &_result_ref = (arg1)->z();
+        result = (VecMat::Vec3< int >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -20542,14 +20425,14 @@ SWIGINTERN PyObject *_wrap_Vec3i_z(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tint_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3i_z__SWIG_0(self, args);
@@ -20558,7 +20441,7 @@ SWIGINTERN PyObject *_wrap_Vec3i_z(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tint_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3i_z__SWIG_1(self, args);
@@ -20566,15 +20449,18 @@ SWIGINTERN PyObject *_wrap_Vec3i_z(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3i_z'.\n  Possible C/C++ prototypes are:\n    z()\n    z()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3i_z'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    z(VecMat::Vec3< int > const *)\n"
+    "    z(VecMat::Vec3< int > *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3i_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
-  VecMat::Vec3<int >::value_type arg2 ;
+  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
+  VecMat::Vec3< int >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -20583,16 +20469,16 @@ SWIGINTERN PyObject *_wrap_Vec3i_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3i_setX",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_setX" "', argument " "1"" of type '" "VecMat::Vec3<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_setX" "', argument " "1"" of type '" "VecMat::Vec3< int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3i_setX" "', argument " "2"" of type '" "VecMat::Vec3<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3i_setX" "', argument " "2"" of type '" "VecMat::Vec3< int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< int >::value_type >(val2);
   {
     try {
       (arg1)->setX(arg2);
@@ -20613,8 +20499,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3i_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
-  VecMat::Vec3<int >::value_type arg2 ;
+  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
+  VecMat::Vec3< int >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -20623,16 +20509,16 @@ SWIGINTERN PyObject *_wrap_Vec3i_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3i_setY",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_setY" "', argument " "1"" of type '" "VecMat::Vec3<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_setY" "', argument " "1"" of type '" "VecMat::Vec3< int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3i_setY" "', argument " "2"" of type '" "VecMat::Vec3<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3i_setY" "', argument " "2"" of type '" "VecMat::Vec3< int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< int >::value_type >(val2);
   {
     try {
       (arg1)->setY(arg2);
@@ -20653,8 +20539,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3i_setZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
-  VecMat::Vec3<int >::value_type arg2 ;
+  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
+  VecMat::Vec3< int >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -20663,16 +20549,16 @@ SWIGINTERN PyObject *_wrap_Vec3i_setZ(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3i_setZ",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_setZ" "', argument " "1"" of type '" "VecMat::Vec3<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i_setZ" "', argument " "1"" of type '" "VecMat::Vec3< int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3i_setZ" "', argument " "2"" of type '" "VecMat::Vec3<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3i_setZ" "', argument " "2"" of type '" "VecMat::Vec3< int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< int >::value_type >(val2);
   {
     try {
       (arg1)->setZ(arg2);
@@ -20693,9 +20579,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3i___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
-  VecMat::Vec3<int > *arg2 = 0 ;
-  VecMat::Vec3<int > result;
+  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
+  VecMat::Vec3< int > *arg2 = 0 ;
+  VecMat::Vec3< int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -20704,22 +20590,22 @@ SWIGINTERN PyObject *_wrap_Vec3i___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3i___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i___add__" "', argument " "1"" of type '" "VecMat::Vec3<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i___add__" "', argument " "1"" of type '" "VecMat::Vec3< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tint_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_int_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3i___add__" "', argument " "2"" of type '" "VecMat::Vec3<int > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3i___add__" "', argument " "2"" of type '" "VecMat::Vec3< int > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3i___add__" "', argument " "2"" of type '" "VecMat::Vec3<int > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3i___add__" "', argument " "2"" of type '" "VecMat::Vec3< int > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3<int > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3< int > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec3<int > const *)arg1)->operator +((VecMat::Vec3<int > const &)*arg2);
+      result = ((VecMat::Vec3< int > const *)arg1)->operator +((VecMat::Vec3< int > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -20728,7 +20614,7 @@ SWIGINTERN PyObject *_wrap_Vec3i___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<int >(static_cast< const VecMat::Vec3<int >& >(result))), SWIGTYPE_p_VecMat__Vec3Tint_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< int >(static_cast< const VecMat::Vec3< int >& >(result))), SWIGTYPE_p_VecMat__Vec3T_int_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -20737,9 +20623,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3i___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
-  VecMat::Vec3<int > *arg2 = 0 ;
-  VecMat::Vec3<int > result;
+  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
+  VecMat::Vec3< int > *arg2 = 0 ;
+  VecMat::Vec3< int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -20748,22 +20634,22 @@ SWIGINTERN PyObject *_wrap_Vec3i___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3i___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i___sub__" "', argument " "1"" of type '" "VecMat::Vec3<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i___sub__" "', argument " "1"" of type '" "VecMat::Vec3< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tint_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_int_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3i___sub__" "', argument " "2"" of type '" "VecMat::Vec3<int > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3i___sub__" "', argument " "2"" of type '" "VecMat::Vec3< int > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3i___sub__" "', argument " "2"" of type '" "VecMat::Vec3<int > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3i___sub__" "', argument " "2"" of type '" "VecMat::Vec3< int > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3<int > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3< int > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec3<int > const *)arg1)->operator -((VecMat::Vec3<int > const &)*arg2);
+      result = ((VecMat::Vec3< int > const *)arg1)->operator -((VecMat::Vec3< int > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -20772,7 +20658,7 @@ SWIGINTERN PyObject *_wrap_Vec3i___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<int >(static_cast< const VecMat::Vec3<int >& >(result))), SWIGTYPE_p_VecMat__Vec3Tint_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< int >(static_cast< const VecMat::Vec3< int >& >(result))), SWIGTYPE_p_VecMat__Vec3T_int_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -20781,9 +20667,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3i___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
-  VecMat::Vec3<int >::value_type arg2 ;
-  VecMat::Vec3<int > result;
+  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
+  VecMat::Vec3< int >::value_type arg2 ;
+  VecMat::Vec3< int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -20792,19 +20678,19 @@ SWIGINTERN PyObject *_wrap_Vec3i___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3i___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i___mul__" "', argument " "1"" of type '" "VecMat::Vec3<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i___mul__" "', argument " "1"" of type '" "VecMat::Vec3< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3i___mul__" "', argument " "2"" of type '" "VecMat::Vec3<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3i___mul__" "', argument " "2"" of type '" "VecMat::Vec3< int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< int >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec3<int > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec3< int > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -20813,7 +20699,7 @@ SWIGINTERN PyObject *_wrap_Vec3i___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<int >(static_cast< const VecMat::Vec3<int >& >(result))), SWIGTYPE_p_VecMat__Vec3Tint_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< int >(static_cast< const VecMat::Vec3< int >& >(result))), SWIGTYPE_p_VecMat__Vec3T_int_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -20822,9 +20708,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3i___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
-  VecMat::Vec3<int >::value_type arg2 ;
-  VecMat::Vec3<int > result;
+  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
+  VecMat::Vec3< int >::value_type arg2 ;
+  VecMat::Vec3< int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
@@ -20833,19 +20719,19 @@ SWIGINTERN PyObject *_wrap_Vec3i___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3i___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i___div__" "', argument " "1"" of type '" "VecMat::Vec3<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i___div__" "', argument " "1"" of type '" "VecMat::Vec3< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3i___div__" "', argument " "2"" of type '" "VecMat::Vec3<int >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3i___div__" "', argument " "2"" of type '" "VecMat::Vec3< int >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<int >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< int >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec3<int > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec3< int > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -20854,7 +20740,7 @@ SWIGINTERN PyObject *_wrap_Vec3i___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<int >(static_cast< const VecMat::Vec3<int >& >(result))), SWIGTYPE_p_VecMat__Vec3Tint_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< int >(static_cast< const VecMat::Vec3< int >& >(result))), SWIGTYPE_p_VecMat__Vec3T_int_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -20863,9 +20749,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3i___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
-  VecMat::Vec3<int > *arg2 = 0 ;
-  VecMat::Vec3<int >::value_type result;
+  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
+  VecMat::Vec3< int > *arg2 = 0 ;
+  VecMat::Vec3< int >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -20874,22 +20760,22 @@ SWIGINTERN PyObject *_wrap_Vec3i___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3i___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i___mul__" "', argument " "1"" of type '" "VecMat::Vec3<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i___mul__" "', argument " "1"" of type '" "VecMat::Vec3< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tint_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_int_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3i___mul__" "', argument " "2"" of type '" "VecMat::Vec3<int > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3i___mul__" "', argument " "2"" of type '" "VecMat::Vec3< int > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3i___mul__" "', argument " "2"" of type '" "VecMat::Vec3<int > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3i___mul__" "', argument " "2"" of type '" "VecMat::Vec3< int > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3<int > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3< int > * >(argp2);
   {
     try {
-      result = (VecMat::Vec3<int >::value_type)((VecMat::Vec3<int > const *)arg1)->operator *((VecMat::Vec3<int > const &)*arg2);
+      result = (VecMat::Vec3< int >::value_type)((VecMat::Vec3< int > const *)arg1)->operator *((VecMat::Vec3< int > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -20911,17 +20797,17 @@ SWIGINTERN PyObject *_wrap_Vec3i___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tint_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec3Tint_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec3T_int_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec3i___mul____SWIG_1(self, args);
@@ -20931,7 +20817,7 @@ SWIGINTERN PyObject *_wrap_Vec3i___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tint_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -20952,9 +20838,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3i___xor__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
-  VecMat::Vec3<int > *arg2 = 0 ;
-  VecMat::Vec3<int > result;
+  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
+  VecMat::Vec3< int > *arg2 = 0 ;
+  VecMat::Vec3< int > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -20963,22 +20849,22 @@ SWIGINTERN PyObject *_wrap_Vec3i___xor__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3i___xor__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i___xor__" "', argument " "1"" of type '" "VecMat::Vec3<int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3i___xor__" "', argument " "1"" of type '" "VecMat::Vec3< int > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tint_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_int_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3i___xor__" "', argument " "2"" of type '" "VecMat::Vec3<int > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3i___xor__" "', argument " "2"" of type '" "VecMat::Vec3< int > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3i___xor__" "', argument " "2"" of type '" "VecMat::Vec3<int > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3i___xor__" "', argument " "2"" of type '" "VecMat::Vec3< int > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3<int > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3< int > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec3<int > const *)arg1)->operator ^((VecMat::Vec3<int > const &)*arg2);
+      result = ((VecMat::Vec3< int > const *)arg1)->operator ^((VecMat::Vec3< int > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -20987,7 +20873,7 @@ SWIGINTERN PyObject *_wrap_Vec3i___xor__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<int >(static_cast< const VecMat::Vec3<int >& >(result))), SWIGTYPE_p_VecMat__Vec3Tint_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< int >(static_cast< const VecMat::Vec3< int >& >(result))), SWIGTYPE_p_VecMat__Vec3T_int_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -20996,17 +20882,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec3i(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<int > *arg1 = (VecMat::Vec3<int > *) 0 ;
+  VecMat::Vec3< int > *arg1 = (VecMat::Vec3< int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec3i",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tint_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_int_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec3i" "', argument " "1"" of type '" "VecMat::Vec3<int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec3i" "', argument " "1"" of type '" "VecMat::Vec3< int > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<int > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< int > * >(argp1);
   {
     try {
       delete arg1;
@@ -21028,19 +20914,19 @@ fail:
 
 SWIGINTERN PyObject *Vec3i_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec3Tint_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec3T_int_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec3f__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<float > *result = 0 ;
+  VecMat::Vec3< float > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec3f")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec3<float > *)new VecMat::Vec3<float >();
+      result = (VecMat::Vec3< float > *)new VecMat::Vec3< float >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -21049,7 +20935,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3f__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -21058,10 +20944,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec3f__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<float >::value_type arg1 ;
-  VecMat::Vec3<float >::value_type arg2 ;
-  VecMat::Vec3<float >::value_type arg3 ;
-  VecMat::Vec3<float > *result = 0 ;
+  VecMat::Vec3< float >::value_type arg1 ;
+  VecMat::Vec3< float >::value_type arg2 ;
+  VecMat::Vec3< float >::value_type arg3 ;
+  VecMat::Vec3< float > *result = 0 ;
   float val1 ;
   int ecode1 = 0 ;
   float val2 ;
@@ -21075,22 +20961,22 @@ SWIGINTERN PyObject *_wrap_new_Vec3f__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OOO:new_Vec3f",&obj0,&obj1,&obj2)) SWIG_fail;
   ecode1 = SWIG_AsVal_float(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3f" "', argument " "1"" of type '" "VecMat::Vec3<float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3f" "', argument " "1"" of type '" "VecMat::Vec3< float >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec3<float >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec3< float >::value_type >(val1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3f" "', argument " "2"" of type '" "VecMat::Vec3<float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3f" "', argument " "2"" of type '" "VecMat::Vec3< float >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<float >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< float >::value_type >(val2);
   ecode3 = SWIG_AsVal_float(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_Vec3f" "', argument " "3"" of type '" "VecMat::Vec3<float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_Vec3f" "', argument " "3"" of type '" "VecMat::Vec3< float >::value_type""'");
   } 
-  arg3 = static_cast< VecMat::Vec3<float >::value_type >(val3);
+  arg3 = static_cast< VecMat::Vec3< float >::value_type >(val3);
   {
     try {
-      result = (VecMat::Vec3<float > *)new VecMat::Vec3<float >(arg1,arg2,arg3);
+      result = (VecMat::Vec3< float > *)new VecMat::Vec3< float >(arg1,arg2,arg3);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -21099,7 +20985,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3f__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -21108,9 +20994,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec3f__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<float >::value_type arg1 ;
-  VecMat::Vec3<float >::value_type arg2 ;
-  VecMat::Vec3<float > *result = 0 ;
+  VecMat::Vec3< float >::value_type arg1 ;
+  VecMat::Vec3< float >::value_type arg2 ;
+  VecMat::Vec3< float > *result = 0 ;
   float val1 ;
   int ecode1 = 0 ;
   float val2 ;
@@ -21121,17 +21007,17 @@ SWIGINTERN PyObject *_wrap_new_Vec3f__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OO:new_Vec3f",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_float(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3f" "', argument " "1"" of type '" "VecMat::Vec3<float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3f" "', argument " "1"" of type '" "VecMat::Vec3< float >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec3<float >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec3< float >::value_type >(val1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3f" "', argument " "2"" of type '" "VecMat::Vec3<float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3f" "', argument " "2"" of type '" "VecMat::Vec3< float >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<float >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< float >::value_type >(val2);
   {
     try {
-      result = (VecMat::Vec3<float > *)new VecMat::Vec3<float >(arg1,arg2);
+      result = (VecMat::Vec3< float > *)new VecMat::Vec3< float >(arg1,arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -21140,7 +21026,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3f__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -21149,8 +21035,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec3f__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<float >::value_type arg1 ;
-  VecMat::Vec3<float > *result = 0 ;
+  VecMat::Vec3< float >::value_type arg1 ;
+  VecMat::Vec3< float > *result = 0 ;
   float val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -21158,12 +21044,12 @@ SWIGINTERN PyObject *_wrap_new_Vec3f__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"O:new_Vec3f",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_float(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3f" "', argument " "1"" of type '" "VecMat::Vec3<float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3f" "', argument " "1"" of type '" "VecMat::Vec3< float >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec3<float >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec3< float >::value_type >(val1);
   {
     try {
-      result = (VecMat::Vec3<float > *)new VecMat::Vec3<float >(arg1);
+      result = (VecMat::Vec3< float > *)new VecMat::Vec3< float >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -21172,7 +21058,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3f__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -21185,7 +21071,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3f(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -21242,28 +21128,33 @@ SWIGINTERN PyObject *_wrap_new_Vec3f(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec3f'.\n  Possible C/C++ prototypes are:\n    VecMat::Vec3<(float)>()\n    VecMat::Vec3<(float)>(VecMat::Vec3<float >::value_type const,VecMat::Vec3<float >::value_type const,VecMat::Vec3<float >::value_type const)\n    VecMat::Vec3<(float)>(VecMat::Vec3<float >::value_type const,VecMat::Vec3<float >::value_type const)\n    VecMat::Vec3<(float)>(VecMat::Vec3<float >::value_type const)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec3f'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    VecMat::Vec3< float >()\n"
+    "    VecMat::Vec3< float >(VecMat::Vec3< float >::value_type const,VecMat::Vec3< float >::value_type const,VecMat::Vec3< float >::value_type const)\n"
+    "    VecMat::Vec3< float >(VecMat::Vec3< float >::value_type const,VecMat::Vec3< float >::value_type const)\n"
+    "    VecMat::Vec3< float >(VecMat::Vec3< float >::value_type const)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3f_x__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
-  VecMat::Vec3<float >::value_type result;
+  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
+  VecMat::Vec3< float >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3f_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_x" "', argument " "1"" of type '" "VecMat::Vec3<float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_x" "', argument " "1"" of type '" "VecMat::Vec3< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
   {
     try {
-      result = (VecMat::Vec3<float >::value_type)((VecMat::Vec3<float > const *)arg1)->x();
+      result = (VecMat::Vec3< float >::value_type)((VecMat::Vec3< float > const *)arg1)->x();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -21281,23 +21172,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3f_x__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
-  VecMat::Vec3<float >::value_type *result = 0 ;
+  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
+  VecMat::Vec3< float >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3f_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_x" "', argument " "1"" of type '" "VecMat::Vec3<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_x" "', argument " "1"" of type '" "VecMat::Vec3< float > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
   {
     try {
       {
-        VecMat::Vec3<float >::value_type &_result_ref = (arg1)->x();
-        result = (VecMat::Vec3<float >::value_type *) &_result_ref;
+        VecMat::Vec3< float >::value_type &_result_ref = (arg1)->x();
+        result = (VecMat::Vec3< float >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -21320,14 +21211,14 @@ SWIGINTERN PyObject *_wrap_Vec3f_x(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_float_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3f_x__SWIG_0(self, args);
@@ -21336,7 +21227,7 @@ SWIGINTERN PyObject *_wrap_Vec3f_x(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_float_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3f_x__SWIG_1(self, args);
@@ -21344,28 +21235,31 @@ SWIGINTERN PyObject *_wrap_Vec3f_x(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3f_x'.\n  Possible C/C++ prototypes are:\n    x()\n    x()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3f_x'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    x(VecMat::Vec3< float > const *)\n"
+    "    x(VecMat::Vec3< float > *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3f_y__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
-  VecMat::Vec3<float >::value_type result;
+  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
+  VecMat::Vec3< float >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3f_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_y" "', argument " "1"" of type '" "VecMat::Vec3<float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_y" "', argument " "1"" of type '" "VecMat::Vec3< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
   {
     try {
-      result = (VecMat::Vec3<float >::value_type)((VecMat::Vec3<float > const *)arg1)->y();
+      result = (VecMat::Vec3< float >::value_type)((VecMat::Vec3< float > const *)arg1)->y();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -21383,23 +21277,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3f_y__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
-  VecMat::Vec3<float >::value_type *result = 0 ;
+  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
+  VecMat::Vec3< float >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3f_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_y" "', argument " "1"" of type '" "VecMat::Vec3<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_y" "', argument " "1"" of type '" "VecMat::Vec3< float > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
   {
     try {
       {
-        VecMat::Vec3<float >::value_type &_result_ref = (arg1)->y();
-        result = (VecMat::Vec3<float >::value_type *) &_result_ref;
+        VecMat::Vec3< float >::value_type &_result_ref = (arg1)->y();
+        result = (VecMat::Vec3< float >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -21422,14 +21316,14 @@ SWIGINTERN PyObject *_wrap_Vec3f_y(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_float_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3f_y__SWIG_0(self, args);
@@ -21438,7 +21332,7 @@ SWIGINTERN PyObject *_wrap_Vec3f_y(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_float_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3f_y__SWIG_1(self, args);
@@ -21446,28 +21340,31 @@ SWIGINTERN PyObject *_wrap_Vec3f_y(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3f_y'.\n  Possible C/C++ prototypes are:\n    y()\n    y()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3f_y'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    y(VecMat::Vec3< float > const *)\n"
+    "    y(VecMat::Vec3< float > *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3f_z__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
-  VecMat::Vec3<float >::value_type result;
+  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
+  VecMat::Vec3< float >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3f_z",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_z" "', argument " "1"" of type '" "VecMat::Vec3<float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_z" "', argument " "1"" of type '" "VecMat::Vec3< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
   {
     try {
-      result = (VecMat::Vec3<float >::value_type)((VecMat::Vec3<float > const *)arg1)->z();
+      result = (VecMat::Vec3< float >::value_type)((VecMat::Vec3< float > const *)arg1)->z();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -21485,23 +21382,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3f_z__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
-  VecMat::Vec3<float >::value_type *result = 0 ;
+  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
+  VecMat::Vec3< float >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3f_z",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_z" "', argument " "1"" of type '" "VecMat::Vec3<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_z" "', argument " "1"" of type '" "VecMat::Vec3< float > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
   {
     try {
       {
-        VecMat::Vec3<float >::value_type &_result_ref = (arg1)->z();
-        result = (VecMat::Vec3<float >::value_type *) &_result_ref;
+        VecMat::Vec3< float >::value_type &_result_ref = (arg1)->z();
+        result = (VecMat::Vec3< float >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -21524,14 +21421,14 @@ SWIGINTERN PyObject *_wrap_Vec3f_z(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_float_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3f_z__SWIG_0(self, args);
@@ -21540,7 +21437,7 @@ SWIGINTERN PyObject *_wrap_Vec3f_z(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_float_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3f_z__SWIG_1(self, args);
@@ -21548,15 +21445,18 @@ SWIGINTERN PyObject *_wrap_Vec3f_z(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3f_z'.\n  Possible C/C++ prototypes are:\n    z()\n    z()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3f_z'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    z(VecMat::Vec3< float > const *)\n"
+    "    z(VecMat::Vec3< float > *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3f_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
-  VecMat::Vec3<float >::value_type arg2 ;
+  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
+  VecMat::Vec3< float >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   float val2 ;
@@ -21565,16 +21465,16 @@ SWIGINTERN PyObject *_wrap_Vec3f_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3f_setX",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_setX" "', argument " "1"" of type '" "VecMat::Vec3<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_setX" "', argument " "1"" of type '" "VecMat::Vec3< float > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3f_setX" "', argument " "2"" of type '" "VecMat::Vec3<float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3f_setX" "', argument " "2"" of type '" "VecMat::Vec3< float >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<float >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< float >::value_type >(val2);
   {
     try {
       (arg1)->setX(arg2);
@@ -21595,8 +21495,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3f_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
-  VecMat::Vec3<float >::value_type arg2 ;
+  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
+  VecMat::Vec3< float >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   float val2 ;
@@ -21605,16 +21505,16 @@ SWIGINTERN PyObject *_wrap_Vec3f_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3f_setY",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_setY" "', argument " "1"" of type '" "VecMat::Vec3<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_setY" "', argument " "1"" of type '" "VecMat::Vec3< float > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3f_setY" "', argument " "2"" of type '" "VecMat::Vec3<float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3f_setY" "', argument " "2"" of type '" "VecMat::Vec3< float >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<float >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< float >::value_type >(val2);
   {
     try {
       (arg1)->setY(arg2);
@@ -21635,8 +21535,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3f_setZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
-  VecMat::Vec3<float >::value_type arg2 ;
+  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
+  VecMat::Vec3< float >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   float val2 ;
@@ -21645,16 +21545,16 @@ SWIGINTERN PyObject *_wrap_Vec3f_setZ(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3f_setZ",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_setZ" "', argument " "1"" of type '" "VecMat::Vec3<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f_setZ" "', argument " "1"" of type '" "VecMat::Vec3< float > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3f_setZ" "', argument " "2"" of type '" "VecMat::Vec3<float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3f_setZ" "', argument " "2"" of type '" "VecMat::Vec3< float >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<float >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< float >::value_type >(val2);
   {
     try {
       (arg1)->setZ(arg2);
@@ -21675,9 +21575,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3f___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
-  VecMat::Vec3<float > *arg2 = 0 ;
-  VecMat::Vec3<float > result;
+  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
+  VecMat::Vec3< float > *arg2 = 0 ;
+  VecMat::Vec3< float > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -21686,22 +21586,22 @@ SWIGINTERN PyObject *_wrap_Vec3f___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3f___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f___add__" "', argument " "1"" of type '" "VecMat::Vec3<float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f___add__" "', argument " "1"" of type '" "VecMat::Vec3< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tfloat_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_float_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3f___add__" "', argument " "2"" of type '" "VecMat::Vec3<float > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3f___add__" "', argument " "2"" of type '" "VecMat::Vec3< float > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3f___add__" "', argument " "2"" of type '" "VecMat::Vec3<float > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3f___add__" "', argument " "2"" of type '" "VecMat::Vec3< float > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3<float > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3< float > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec3<float > const *)arg1)->operator +((VecMat::Vec3<float > const &)*arg2);
+      result = ((VecMat::Vec3< float > const *)arg1)->operator +((VecMat::Vec3< float > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -21710,7 +21610,7 @@ SWIGINTERN PyObject *_wrap_Vec3f___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<float >(static_cast< const VecMat::Vec3<float >& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< float >(static_cast< const VecMat::Vec3< float >& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -21719,9 +21619,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3f___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
-  VecMat::Vec3<float > *arg2 = 0 ;
-  VecMat::Vec3<float > result;
+  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
+  VecMat::Vec3< float > *arg2 = 0 ;
+  VecMat::Vec3< float > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -21730,22 +21630,22 @@ SWIGINTERN PyObject *_wrap_Vec3f___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3f___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f___sub__" "', argument " "1"" of type '" "VecMat::Vec3<float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f___sub__" "', argument " "1"" of type '" "VecMat::Vec3< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tfloat_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_float_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3f___sub__" "', argument " "2"" of type '" "VecMat::Vec3<float > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3f___sub__" "', argument " "2"" of type '" "VecMat::Vec3< float > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3f___sub__" "', argument " "2"" of type '" "VecMat::Vec3<float > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3f___sub__" "', argument " "2"" of type '" "VecMat::Vec3< float > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3<float > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3< float > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec3<float > const *)arg1)->operator -((VecMat::Vec3<float > const &)*arg2);
+      result = ((VecMat::Vec3< float > const *)arg1)->operator -((VecMat::Vec3< float > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -21754,7 +21654,7 @@ SWIGINTERN PyObject *_wrap_Vec3f___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<float >(static_cast< const VecMat::Vec3<float >& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< float >(static_cast< const VecMat::Vec3< float >& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -21763,9 +21663,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3f___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
-  VecMat::Vec3<float >::value_type arg2 ;
-  VecMat::Vec3<float > result;
+  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
+  VecMat::Vec3< float >::value_type arg2 ;
+  VecMat::Vec3< float > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   float val2 ;
@@ -21774,19 +21674,19 @@ SWIGINTERN PyObject *_wrap_Vec3f___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3f___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f___mul__" "', argument " "1"" of type '" "VecMat::Vec3<float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f___mul__" "', argument " "1"" of type '" "VecMat::Vec3< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3f___mul__" "', argument " "2"" of type '" "VecMat::Vec3<float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3f___mul__" "', argument " "2"" of type '" "VecMat::Vec3< float >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<float >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< float >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec3<float > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec3< float > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -21795,7 +21695,7 @@ SWIGINTERN PyObject *_wrap_Vec3f___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<float >(static_cast< const VecMat::Vec3<float >& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< float >(static_cast< const VecMat::Vec3< float >& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -21804,9 +21704,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3f___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
-  VecMat::Vec3<float >::value_type arg2 ;
-  VecMat::Vec3<float > result;
+  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
+  VecMat::Vec3< float >::value_type arg2 ;
+  VecMat::Vec3< float > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   float val2 ;
@@ -21815,19 +21715,19 @@ SWIGINTERN PyObject *_wrap_Vec3f___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3f___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f___div__" "', argument " "1"" of type '" "VecMat::Vec3<float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f___div__" "', argument " "1"" of type '" "VecMat::Vec3< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
   ecode2 = SWIG_AsVal_float(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3f___div__" "', argument " "2"" of type '" "VecMat::Vec3<float >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3f___div__" "', argument " "2"" of type '" "VecMat::Vec3< float >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<float >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< float >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec3<float > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec3< float > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -21836,7 +21736,7 @@ SWIGINTERN PyObject *_wrap_Vec3f___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<float >(static_cast< const VecMat::Vec3<float >& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< float >(static_cast< const VecMat::Vec3< float >& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -21845,9 +21745,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3f___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
-  VecMat::Vec3<float > *arg2 = 0 ;
-  VecMat::Vec3<float >::value_type result;
+  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
+  VecMat::Vec3< float > *arg2 = 0 ;
+  VecMat::Vec3< float >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -21856,22 +21756,22 @@ SWIGINTERN PyObject *_wrap_Vec3f___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3f___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f___mul__" "', argument " "1"" of type '" "VecMat::Vec3<float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f___mul__" "', argument " "1"" of type '" "VecMat::Vec3< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tfloat_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_float_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3f___mul__" "', argument " "2"" of type '" "VecMat::Vec3<float > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3f___mul__" "', argument " "2"" of type '" "VecMat::Vec3< float > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3f___mul__" "', argument " "2"" of type '" "VecMat::Vec3<float > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3f___mul__" "', argument " "2"" of type '" "VecMat::Vec3< float > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3<float > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3< float > * >(argp2);
   {
     try {
-      result = (VecMat::Vec3<float >::value_type)((VecMat::Vec3<float > const *)arg1)->operator *((VecMat::Vec3<float > const &)*arg2);
+      result = (VecMat::Vec3< float >::value_type)((VecMat::Vec3< float > const *)arg1)->operator *((VecMat::Vec3< float > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -21893,17 +21793,17 @@ SWIGINTERN PyObject *_wrap_Vec3f___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_float_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec3T_float_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec3f___mul____SWIG_1(self, args);
@@ -21913,7 +21813,7 @@ SWIGINTERN PyObject *_wrap_Vec3f___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_float_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -21934,9 +21834,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3f___xor__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
-  VecMat::Vec3<float > *arg2 = 0 ;
-  VecMat::Vec3<float > result;
+  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
+  VecMat::Vec3< float > *arg2 = 0 ;
+  VecMat::Vec3< float > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -21945,22 +21845,22 @@ SWIGINTERN PyObject *_wrap_Vec3f___xor__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3f___xor__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f___xor__" "', argument " "1"" of type '" "VecMat::Vec3<float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3f___xor__" "', argument " "1"" of type '" "VecMat::Vec3< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tfloat_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_float_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3f___xor__" "', argument " "2"" of type '" "VecMat::Vec3<float > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3f___xor__" "', argument " "2"" of type '" "VecMat::Vec3< float > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3f___xor__" "', argument " "2"" of type '" "VecMat::Vec3<float > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3f___xor__" "', argument " "2"" of type '" "VecMat::Vec3< float > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3<float > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3< float > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec3<float > const *)arg1)->operator ^((VecMat::Vec3<float > const &)*arg2);
+      result = ((VecMat::Vec3< float > const *)arg1)->operator ^((VecMat::Vec3< float > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -21969,7 +21869,7 @@ SWIGINTERN PyObject *_wrap_Vec3f___xor__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<float >(static_cast< const VecMat::Vec3<float >& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< float >(static_cast< const VecMat::Vec3< float >& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -21978,17 +21878,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<float > *arg1 = (VecMat::Vec3<float > *) 0 ;
+  VecMat::Vec3< float > *arg1 = (VecMat::Vec3< float > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec3f",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec3f" "', argument " "1"" of type '" "VecMat::Vec3<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec3f" "', argument " "1"" of type '" "VecMat::Vec3< float > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<float > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< float > * >(argp1);
   {
     try {
       delete arg1;
@@ -22010,19 +21910,19 @@ fail:
 
 SWIGINTERN PyObject *Vec3f_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_Vec3d__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<double > *result = 0 ;
+  VecMat::Vec3< double > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_Vec3d")) SWIG_fail;
   {
     try {
-      result = (VecMat::Vec3<double > *)new VecMat::Vec3<double >();
+      result = (VecMat::Vec3< double > *)new VecMat::Vec3< double >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -22031,7 +21931,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3d__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -22040,10 +21940,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec3d__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<double >::value_type arg1 ;
-  VecMat::Vec3<double >::value_type arg2 ;
-  VecMat::Vec3<double >::value_type arg3 ;
-  VecMat::Vec3<double > *result = 0 ;
+  VecMat::Vec3< double >::value_type arg1 ;
+  VecMat::Vec3< double >::value_type arg2 ;
+  VecMat::Vec3< double >::value_type arg3 ;
+  VecMat::Vec3< double > *result = 0 ;
   double val1 ;
   int ecode1 = 0 ;
   double val2 ;
@@ -22057,22 +21957,22 @@ SWIGINTERN PyObject *_wrap_new_Vec3d__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OOO:new_Vec3d",&obj0,&obj1,&obj2)) SWIG_fail;
   ecode1 = SWIG_AsVal_double(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3d" "', argument " "1"" of type '" "VecMat::Vec3<double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3d" "', argument " "1"" of type '" "VecMat::Vec3< double >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec3<double >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec3< double >::value_type >(val1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3d" "', argument " "2"" of type '" "VecMat::Vec3<double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3d" "', argument " "2"" of type '" "VecMat::Vec3< double >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<double >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< double >::value_type >(val2);
   ecode3 = SWIG_AsVal_double(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_Vec3d" "', argument " "3"" of type '" "VecMat::Vec3<double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "new_Vec3d" "', argument " "3"" of type '" "VecMat::Vec3< double >::value_type""'");
   } 
-  arg3 = static_cast< VecMat::Vec3<double >::value_type >(val3);
+  arg3 = static_cast< VecMat::Vec3< double >::value_type >(val3);
   {
     try {
-      result = (VecMat::Vec3<double > *)new VecMat::Vec3<double >(arg1,arg2,arg3);
+      result = (VecMat::Vec3< double > *)new VecMat::Vec3< double >(arg1,arg2,arg3);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -22081,7 +21981,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3d__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -22090,9 +21990,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec3d__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<double >::value_type arg1 ;
-  VecMat::Vec3<double >::value_type arg2 ;
-  VecMat::Vec3<double > *result = 0 ;
+  VecMat::Vec3< double >::value_type arg1 ;
+  VecMat::Vec3< double >::value_type arg2 ;
+  VecMat::Vec3< double > *result = 0 ;
   double val1 ;
   int ecode1 = 0 ;
   double val2 ;
@@ -22103,17 +22003,17 @@ SWIGINTERN PyObject *_wrap_new_Vec3d__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"OO:new_Vec3d",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_double(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3d" "', argument " "1"" of type '" "VecMat::Vec3<double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3d" "', argument " "1"" of type '" "VecMat::Vec3< double >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec3<double >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec3< double >::value_type >(val1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3d" "', argument " "2"" of type '" "VecMat::Vec3<double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_Vec3d" "', argument " "2"" of type '" "VecMat::Vec3< double >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<double >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< double >::value_type >(val2);
   {
     try {
-      result = (VecMat::Vec3<double > *)new VecMat::Vec3<double >(arg1,arg2);
+      result = (VecMat::Vec3< double > *)new VecMat::Vec3< double >(arg1,arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -22122,7 +22022,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3d__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -22131,8 +22031,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_Vec3d__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<double >::value_type arg1 ;
-  VecMat::Vec3<double > *result = 0 ;
+  VecMat::Vec3< double >::value_type arg1 ;
+  VecMat::Vec3< double > *result = 0 ;
   double val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -22140,12 +22040,12 @@ SWIGINTERN PyObject *_wrap_new_Vec3d__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyO
   if (!PyArg_ParseTuple(args,(char *)"O:new_Vec3d",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_double(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3d" "', argument " "1"" of type '" "VecMat::Vec3<double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_Vec3d" "', argument " "1"" of type '" "VecMat::Vec3< double >::value_type""'");
   } 
-  arg1 = static_cast< VecMat::Vec3<double >::value_type >(val1);
+  arg1 = static_cast< VecMat::Vec3< double >::value_type >(val1);
   {
     try {
-      result = (VecMat::Vec3<double > *)new VecMat::Vec3<double >(arg1);
+      result = (VecMat::Vec3< double > *)new VecMat::Vec3< double >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -22154,7 +22054,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3d__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -22167,7 +22067,7 @@ SWIGINTERN PyObject *_wrap_new_Vec3d(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -22224,28 +22124,33 @@ SWIGINTERN PyObject *_wrap_new_Vec3d(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec3d'.\n  Possible C/C++ prototypes are:\n    VecMat::Vec3<(double)>()\n    VecMat::Vec3<(double)>(VecMat::Vec3<double >::value_type const,VecMat::Vec3<double >::value_type const,VecMat::Vec3<double >::value_type const)\n    VecMat::Vec3<(double)>(VecMat::Vec3<double >::value_type const,VecMat::Vec3<double >::value_type const)\n    VecMat::Vec3<(double)>(VecMat::Vec3<double >::value_type const)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Vec3d'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    VecMat::Vec3< double >()\n"
+    "    VecMat::Vec3< double >(VecMat::Vec3< double >::value_type const,VecMat::Vec3< double >::value_type const,VecMat::Vec3< double >::value_type const)\n"
+    "    VecMat::Vec3< double >(VecMat::Vec3< double >::value_type const,VecMat::Vec3< double >::value_type const)\n"
+    "    VecMat::Vec3< double >(VecMat::Vec3< double >::value_type const)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3d_x__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
-  VecMat::Vec3<double >::value_type result;
+  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
+  VecMat::Vec3< double >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3d_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_x" "', argument " "1"" of type '" "VecMat::Vec3<double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_x" "', argument " "1"" of type '" "VecMat::Vec3< double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
   {
     try {
-      result = (VecMat::Vec3<double >::value_type)((VecMat::Vec3<double > const *)arg1)->x();
+      result = (VecMat::Vec3< double >::value_type)((VecMat::Vec3< double > const *)arg1)->x();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -22263,23 +22168,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3d_x__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
-  VecMat::Vec3<double >::value_type *result = 0 ;
+  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
+  VecMat::Vec3< double >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3d_x",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_x" "', argument " "1"" of type '" "VecMat::Vec3<double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_x" "', argument " "1"" of type '" "VecMat::Vec3< double > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
   {
     try {
       {
-        VecMat::Vec3<double >::value_type &_result_ref = (arg1)->x();
-        result = (VecMat::Vec3<double >::value_type *) &_result_ref;
+        VecMat::Vec3< double >::value_type &_result_ref = (arg1)->x();
+        result = (VecMat::Vec3< double >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -22302,14 +22207,14 @@ SWIGINTERN PyObject *_wrap_Vec3d_x(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3d_x__SWIG_0(self, args);
@@ -22318,7 +22223,7 @@ SWIGINTERN PyObject *_wrap_Vec3d_x(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3d_x__SWIG_1(self, args);
@@ -22326,28 +22231,31 @@ SWIGINTERN PyObject *_wrap_Vec3d_x(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3d_x'.\n  Possible C/C++ prototypes are:\n    x()\n    x()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3d_x'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    x(VecMat::Vec3< double > const *)\n"
+    "    x(VecMat::Vec3< double > *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3d_y__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
-  VecMat::Vec3<double >::value_type result;
+  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
+  VecMat::Vec3< double >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3d_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_y" "', argument " "1"" of type '" "VecMat::Vec3<double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_y" "', argument " "1"" of type '" "VecMat::Vec3< double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
   {
     try {
-      result = (VecMat::Vec3<double >::value_type)((VecMat::Vec3<double > const *)arg1)->y();
+      result = (VecMat::Vec3< double >::value_type)((VecMat::Vec3< double > const *)arg1)->y();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -22365,23 +22273,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3d_y__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
-  VecMat::Vec3<double >::value_type *result = 0 ;
+  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
+  VecMat::Vec3< double >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3d_y",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_y" "', argument " "1"" of type '" "VecMat::Vec3<double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_y" "', argument " "1"" of type '" "VecMat::Vec3< double > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
   {
     try {
       {
-        VecMat::Vec3<double >::value_type &_result_ref = (arg1)->y();
-        result = (VecMat::Vec3<double >::value_type *) &_result_ref;
+        VecMat::Vec3< double >::value_type &_result_ref = (arg1)->y();
+        result = (VecMat::Vec3< double >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -22404,14 +22312,14 @@ SWIGINTERN PyObject *_wrap_Vec3d_y(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3d_y__SWIG_0(self, args);
@@ -22420,7 +22328,7 @@ SWIGINTERN PyObject *_wrap_Vec3d_y(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3d_y__SWIG_1(self, args);
@@ -22428,28 +22336,31 @@ SWIGINTERN PyObject *_wrap_Vec3d_y(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3d_y'.\n  Possible C/C++ prototypes are:\n    y()\n    y()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3d_y'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    y(VecMat::Vec3< double > const *)\n"
+    "    y(VecMat::Vec3< double > *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3d_z__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
-  VecMat::Vec3<double >::value_type result;
+  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
+  VecMat::Vec3< double >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3d_z",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_z" "', argument " "1"" of type '" "VecMat::Vec3<double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_z" "', argument " "1"" of type '" "VecMat::Vec3< double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
   {
     try {
-      result = (VecMat::Vec3<double >::value_type)((VecMat::Vec3<double > const *)arg1)->z();
+      result = (VecMat::Vec3< double >::value_type)((VecMat::Vec3< double > const *)arg1)->z();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -22467,23 +22378,23 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3d_z__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
-  VecMat::Vec3<double >::value_type *result = 0 ;
+  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
+  VecMat::Vec3< double >::value_type *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:Vec3d_z",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_z" "', argument " "1"" of type '" "VecMat::Vec3<double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_z" "', argument " "1"" of type '" "VecMat::Vec3< double > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
   {
     try {
       {
-        VecMat::Vec3<double >::value_type &_result_ref = (arg1)->z();
-        result = (VecMat::Vec3<double >::value_type *) &_result_ref;
+        VecMat::Vec3< double >::value_type &_result_ref = (arg1)->z();
+        result = (VecMat::Vec3< double >::value_type *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -22506,14 +22417,14 @@ SWIGINTERN PyObject *_wrap_Vec3d_z(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3d_z__SWIG_0(self, args);
@@ -22522,7 +22433,7 @@ SWIGINTERN PyObject *_wrap_Vec3d_z(PyObject *self, PyObject *args) {
   if (argc == 1) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_Vec3d_z__SWIG_1(self, args);
@@ -22530,15 +22441,18 @@ SWIGINTERN PyObject *_wrap_Vec3d_z(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3d_z'.\n  Possible C/C++ prototypes are:\n    z()\n    z()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Vec3d_z'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    z(VecMat::Vec3< double > const *)\n"
+    "    z(VecMat::Vec3< double > *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Vec3d_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
-  VecMat::Vec3<double >::value_type arg2 ;
+  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
+  VecMat::Vec3< double >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
@@ -22547,16 +22461,16 @@ SWIGINTERN PyObject *_wrap_Vec3d_setX(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3d_setX",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_setX" "', argument " "1"" of type '" "VecMat::Vec3<double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_setX" "', argument " "1"" of type '" "VecMat::Vec3< double > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3d_setX" "', argument " "2"" of type '" "VecMat::Vec3<double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3d_setX" "', argument " "2"" of type '" "VecMat::Vec3< double >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<double >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< double >::value_type >(val2);
   {
     try {
       (arg1)->setX(arg2);
@@ -22577,8 +22491,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3d_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
-  VecMat::Vec3<double >::value_type arg2 ;
+  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
+  VecMat::Vec3< double >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
@@ -22587,16 +22501,16 @@ SWIGINTERN PyObject *_wrap_Vec3d_setY(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3d_setY",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_setY" "', argument " "1"" of type '" "VecMat::Vec3<double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_setY" "', argument " "1"" of type '" "VecMat::Vec3< double > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3d_setY" "', argument " "2"" of type '" "VecMat::Vec3<double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3d_setY" "', argument " "2"" of type '" "VecMat::Vec3< double >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<double >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< double >::value_type >(val2);
   {
     try {
       (arg1)->setY(arg2);
@@ -22617,8 +22531,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3d_setZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
-  VecMat::Vec3<double >::value_type arg2 ;
+  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
+  VecMat::Vec3< double >::value_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
@@ -22627,16 +22541,16 @@ SWIGINTERN PyObject *_wrap_Vec3d_setZ(PyObject *SWIGUNUSEDPARM(self), PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3d_setZ",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_setZ" "', argument " "1"" of type '" "VecMat::Vec3<double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d_setZ" "', argument " "1"" of type '" "VecMat::Vec3< double > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3d_setZ" "', argument " "2"" of type '" "VecMat::Vec3<double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3d_setZ" "', argument " "2"" of type '" "VecMat::Vec3< double >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<double >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< double >::value_type >(val2);
   {
     try {
       (arg1)->setZ(arg2);
@@ -22657,9 +22571,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3d___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
-  VecMat::Vec3<double > *arg2 = 0 ;
-  VecMat::Vec3<double > result;
+  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
+  VecMat::Vec3< double > *arg2 = 0 ;
+  VecMat::Vec3< double > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -22668,22 +22582,22 @@ SWIGINTERN PyObject *_wrap_Vec3d___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3d___add__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d___add__" "', argument " "1"" of type '" "VecMat::Vec3<double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d___add__" "', argument " "1"" of type '" "VecMat::Vec3< double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3d___add__" "', argument " "2"" of type '" "VecMat::Vec3<double > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3d___add__" "', argument " "2"" of type '" "VecMat::Vec3< double > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3d___add__" "', argument " "2"" of type '" "VecMat::Vec3<double > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3d___add__" "', argument " "2"" of type '" "VecMat::Vec3< double > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3<double > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3< double > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec3<double > const *)arg1)->operator +((VecMat::Vec3<double > const &)*arg2);
+      result = ((VecMat::Vec3< double > const *)arg1)->operator +((VecMat::Vec3< double > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -22692,7 +22606,7 @@ SWIGINTERN PyObject *_wrap_Vec3d___add__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<double >(static_cast< const VecMat::Vec3<double >& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< double >(static_cast< const VecMat::Vec3< double >& >(result))), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -22701,9 +22615,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3d___sub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
-  VecMat::Vec3<double > *arg2 = 0 ;
-  VecMat::Vec3<double > result;
+  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
+  VecMat::Vec3< double > *arg2 = 0 ;
+  VecMat::Vec3< double > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -22712,22 +22626,22 @@ SWIGINTERN PyObject *_wrap_Vec3d___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3d___sub__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d___sub__" "', argument " "1"" of type '" "VecMat::Vec3<double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d___sub__" "', argument " "1"" of type '" "VecMat::Vec3< double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3d___sub__" "', argument " "2"" of type '" "VecMat::Vec3<double > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3d___sub__" "', argument " "2"" of type '" "VecMat::Vec3< double > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3d___sub__" "', argument " "2"" of type '" "VecMat::Vec3<double > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3d___sub__" "', argument " "2"" of type '" "VecMat::Vec3< double > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3<double > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3< double > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec3<double > const *)arg1)->operator -((VecMat::Vec3<double > const &)*arg2);
+      result = ((VecMat::Vec3< double > const *)arg1)->operator -((VecMat::Vec3< double > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -22736,7 +22650,7 @@ SWIGINTERN PyObject *_wrap_Vec3d___sub__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<double >(static_cast< const VecMat::Vec3<double >& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< double >(static_cast< const VecMat::Vec3< double >& >(result))), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -22745,9 +22659,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3d___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
-  VecMat::Vec3<double >::value_type arg2 ;
-  VecMat::Vec3<double > result;
+  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
+  VecMat::Vec3< double >::value_type arg2 ;
+  VecMat::Vec3< double > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
@@ -22756,19 +22670,19 @@ SWIGINTERN PyObject *_wrap_Vec3d___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3d___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d___mul__" "', argument " "1"" of type '" "VecMat::Vec3<double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d___mul__" "', argument " "1"" of type '" "VecMat::Vec3< double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3d___mul__" "', argument " "2"" of type '" "VecMat::Vec3<double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3d___mul__" "', argument " "2"" of type '" "VecMat::Vec3< double >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<double >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< double >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec3<double > const *)arg1)->operator *(arg2);
+      result = ((VecMat::Vec3< double > const *)arg1)->operator *(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -22777,7 +22691,7 @@ SWIGINTERN PyObject *_wrap_Vec3d___mul____SWIG_0(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<double >(static_cast< const VecMat::Vec3<double >& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< double >(static_cast< const VecMat::Vec3< double >& >(result))), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -22786,9 +22700,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3d___div__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
-  VecMat::Vec3<double >::value_type arg2 ;
-  VecMat::Vec3<double > result;
+  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
+  VecMat::Vec3< double >::value_type arg2 ;
+  VecMat::Vec3< double > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
@@ -22797,19 +22711,19 @@ SWIGINTERN PyObject *_wrap_Vec3d___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3d___div__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d___div__" "', argument " "1"" of type '" "VecMat::Vec3<double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d___div__" "', argument " "1"" of type '" "VecMat::Vec3< double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3d___div__" "', argument " "2"" of type '" "VecMat::Vec3<double >::value_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Vec3d___div__" "', argument " "2"" of type '" "VecMat::Vec3< double >::value_type""'");
   } 
-  arg2 = static_cast< VecMat::Vec3<double >::value_type >(val2);
+  arg2 = static_cast< VecMat::Vec3< double >::value_type >(val2);
   {
     try {
-      result = ((VecMat::Vec3<double > const *)arg1)->operator /(arg2);
+      result = ((VecMat::Vec3< double > const *)arg1)->operator /(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -22818,7 +22732,7 @@ SWIGINTERN PyObject *_wrap_Vec3d___div__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<double >(static_cast< const VecMat::Vec3<double >& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< double >(static_cast< const VecMat::Vec3< double >& >(result))), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -22827,9 +22741,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3d___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
-  VecMat::Vec3<double > *arg2 = 0 ;
-  VecMat::Vec3<double >::value_type result;
+  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
+  VecMat::Vec3< double > *arg2 = 0 ;
+  VecMat::Vec3< double >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -22838,22 +22752,22 @@ SWIGINTERN PyObject *_wrap_Vec3d___mul____SWIG_1(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3d___mul__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d___mul__" "', argument " "1"" of type '" "VecMat::Vec3<double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d___mul__" "', argument " "1"" of type '" "VecMat::Vec3< double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3d___mul__" "', argument " "2"" of type '" "VecMat::Vec3<double > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3d___mul__" "', argument " "2"" of type '" "VecMat::Vec3< double > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3d___mul__" "', argument " "2"" of type '" "VecMat::Vec3<double > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3d___mul__" "', argument " "2"" of type '" "VecMat::Vec3< double > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3<double > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3< double > * >(argp2);
   {
     try {
-      result = (VecMat::Vec3<double >::value_type)((VecMat::Vec3<double > const *)arg1)->operator *((VecMat::Vec3<double > const &)*arg2);
+      result = (VecMat::Vec3< double >::value_type)((VecMat::Vec3< double > const *)arg1)->operator *((VecMat::Vec3< double > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -22875,17 +22789,17 @@ SWIGINTERN PyObject *_wrap_Vec3d___mul__(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec3T_double_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Vec3d___mul____SWIG_1(self, args);
@@ -22895,7 +22809,7 @@ SWIGINTERN PyObject *_wrap_Vec3d___mul__(PyObject *self, PyObject *args) {
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_VecMat__Vec3T_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -22916,9 +22830,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Vec3d___xor__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
-  VecMat::Vec3<double > *arg2 = 0 ;
-  VecMat::Vec3<double > result;
+  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
+  VecMat::Vec3< double > *arg2 = 0 ;
+  VecMat::Vec3< double > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -22927,22 +22841,22 @@ SWIGINTERN PyObject *_wrap_Vec3d___xor__(PyObject *SWIGUNUSEDPARM(self), PyObjec
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Vec3d___xor__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d___xor__" "', argument " "1"" of type '" "VecMat::Vec3<double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Vec3d___xor__" "', argument " "1"" of type '" "VecMat::Vec3< double > const *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3d___xor__" "', argument " "2"" of type '" "VecMat::Vec3<double > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Vec3d___xor__" "', argument " "2"" of type '" "VecMat::Vec3< double > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3d___xor__" "', argument " "2"" of type '" "VecMat::Vec3<double > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Vec3d___xor__" "', argument " "2"" of type '" "VecMat::Vec3< double > const &""'"); 
   }
-  arg2 = reinterpret_cast< VecMat::Vec3<double > * >(argp2);
+  arg2 = reinterpret_cast< VecMat::Vec3< double > * >(argp2);
   {
     try {
-      result = ((VecMat::Vec3<double > const *)arg1)->operator ^((VecMat::Vec3<double > const &)*arg2);
+      result = ((VecMat::Vec3< double > const *)arg1)->operator ^((VecMat::Vec3< double > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -22951,7 +22865,7 @@ SWIGINTERN PyObject *_wrap_Vec3d___xor__(PyObject *SWIGUNUSEDPARM(self), PyObjec
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<double >(static_cast< const VecMat::Vec3<double >& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< double >(static_cast< const VecMat::Vec3< double >& >(result))), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -22960,17 +22874,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_Vec3d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  VecMat::Vec3<double > *arg1 = (VecMat::Vec3<double > *) 0 ;
+  VecMat::Vec3< double > *arg1 = (VecMat::Vec3< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_Vec3d",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec3d" "', argument " "1"" of type '" "VecMat::Vec3<double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Vec3d" "', argument " "1"" of type '" "VecMat::Vec3< double > *""'"); 
   }
-  arg1 = reinterpret_cast< VecMat::Vec3<double > * >(argp1);
+  arg1 = reinterpret_cast< VecMat::Vec3< double > * >(argp1);
   {
     try {
       delete arg1;
@@ -22992,8 +22906,8 @@ fail:
 
 SWIGINTERN PyObject *Vec3d_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
@@ -23185,7 +23099,7 @@ SWIGINTERN PyObject *_wrap_Noise_turbulence1(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 5); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -23251,7 +23165,10 @@ SWIGINTERN PyObject *_wrap_Noise_turbulence1(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Noise_turbulence1'.\n  Possible C/C++ prototypes are:\n    turbulence1(float,float,float,unsigned int)\n    turbulence1(float,float,float)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Noise_turbulence1'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    turbulence1(Noise *,float,float,float,unsigned int)\n"
+    "    turbulence1(Noise *,float,float,float)\n");
   return NULL;
 }
 
@@ -23286,7 +23203,7 @@ SWIGINTERN PyObject *_wrap_Noise_turbulence2__SWIG_0(PyObject *SWIGUNUSEDPARM(se
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Noise_turbulence2" "', argument " "1"" of type '" "Noise *""'"); 
   }
   arg1 = reinterpret_cast< Noise * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0 );
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_float_t,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Noise_turbulence2" "', argument " "2"" of type '" "Geometry::Vec2f &""'"); 
   }
@@ -23353,7 +23270,7 @@ SWIGINTERN PyObject *_wrap_Noise_turbulence2__SWIG_1(PyObject *SWIGUNUSEDPARM(se
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Noise_turbulence2" "', argument " "1"" of type '" "Noise *""'"); 
   }
   arg1 = reinterpret_cast< Noise * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0 );
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_float_t,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Noise_turbulence2" "', argument " "2"" of type '" "Geometry::Vec2f &""'"); 
   }
@@ -23395,7 +23312,7 @@ SWIGINTERN PyObject *_wrap_Noise_turbulence2(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 5); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -23406,7 +23323,7 @@ SWIGINTERN PyObject *_wrap_Noise_turbulence2(PyObject *self, PyObject *args) {
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_VecMat__Vec2T_float_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         {
@@ -23432,7 +23349,7 @@ SWIGINTERN PyObject *_wrap_Noise_turbulence2(PyObject *self, PyObject *args) {
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_VecMat__Vec2T_float_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         {
@@ -23459,7 +23376,10 @@ SWIGINTERN PyObject *_wrap_Noise_turbulence2(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Noise_turbulence2'.\n  Possible C/C++ prototypes are:\n    turbulence2(Geometry::Vec2f &,float,float,unsigned int)\n    turbulence2(Geometry::Vec2f &,float,float)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Noise_turbulence2'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    turbulence2(Noise *,Geometry::Vec2f &,float,float,unsigned int)\n"
+    "    turbulence2(Noise *,Geometry::Vec2f &,float,float)\n");
   return NULL;
 }
 
@@ -23494,7 +23414,7 @@ SWIGINTERN PyObject *_wrap_Noise_turbulence3__SWIG_0(PyObject *SWIGUNUSEDPARM(se
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Noise_turbulence3" "', argument " "1"" of type '" "Noise *""'"); 
   }
   arg1 = reinterpret_cast< Noise * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tfloat_t,  0 );
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_float_t,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Noise_turbulence3" "', argument " "2"" of type '" "Geometry::Vec3f &""'"); 
   }
@@ -23561,7 +23481,7 @@ SWIGINTERN PyObject *_wrap_Noise_turbulence3__SWIG_1(PyObject *SWIGUNUSEDPARM(se
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Noise_turbulence3" "', argument " "1"" of type '" "Noise *""'"); 
   }
   arg1 = reinterpret_cast< Noise * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tfloat_t,  0 );
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_float_t,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Noise_turbulence3" "', argument " "2"" of type '" "Geometry::Vec3f &""'"); 
   }
@@ -23603,7 +23523,7 @@ SWIGINTERN PyObject *_wrap_Noise_turbulence3(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 5); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -23614,7 +23534,7 @@ SWIGINTERN PyObject *_wrap_Noise_turbulence3(PyObject *self, PyObject *args) {
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_VecMat__Vec3T_float_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         {
@@ -23640,7 +23560,7 @@ SWIGINTERN PyObject *_wrap_Noise_turbulence3(PyObject *self, PyObject *args) {
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_VecMat__Vec3T_float_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         {
@@ -23667,7 +23587,10 @@ SWIGINTERN PyObject *_wrap_Noise_turbulence3(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Noise_turbulence3'.\n  Possible C/C++ prototypes are:\n    turbulence3(Geometry::Vec3f &,float,float,unsigned int)\n    turbulence3(Geometry::Vec3f &,float,float)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Noise_turbulence3'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    turbulence3(Noise *,Geometry::Vec3f &,float,float,unsigned int)\n"
+    "    turbulence3(Noise *,Geometry::Vec3f &,float,float)\n");
   return NULL;
 }
 
@@ -23731,7 +23654,7 @@ SWIGINTERN PyObject *_wrap_Noise_smoothNoise2(PyObject *SWIGUNUSEDPARM(self), Py
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Noise_smoothNoise2" "', argument " "1"" of type '" "Noise *""'"); 
   }
   arg1 = reinterpret_cast< Noise * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0 );
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_float_t,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Noise_smoothNoise2" "', argument " "2"" of type '" "Geometry::Vec2f &""'"); 
   }
@@ -23775,7 +23698,7 @@ SWIGINTERN PyObject *_wrap_Noise_smoothNoise3(PyObject *SWIGUNUSEDPARM(self), Py
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Noise_smoothNoise3" "', argument " "1"" of type '" "Noise *""'"); 
   }
   arg1 = reinterpret_cast< Noise * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tfloat_t,  0 );
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_float_t,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Noise_smoothNoise3" "', argument " "2"" of type '" "Geometry::Vec3f &""'"); 
   }
@@ -23803,7 +23726,7 @@ fail:
 
 SWIGINTERN PyObject *Noise_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Noise, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -23940,7 +23863,7 @@ SWIGINTERN PyObject *_wrap_new_Material(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 5); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -23987,7 +23910,11 @@ SWIGINTERN PyObject *_wrap_new_Material(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Material'.\n  Possible C/C++ prototypes are:\n    Material()\n    Material(float const *,float const *,float const *,float const *,float const)\n    Material(Material const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Material'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Material()\n"
+    "    Material(float const *,float const *,float const *,float const *,float const)\n"
+    "    Material(Material const &)\n");
   return NULL;
 }
 
@@ -25094,18 +25021,18 @@ fail:
 
 SWIGINTERN PyObject *Material_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Material, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN int POINT_set(PyObject *) {
+SWIGINTERN int Swig_var_POINT_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable POINT is read-only.");
   return 1;
 }
 
 
-SWIGINTERN PyObject *POINT_get(void) {
+SWIGINTERN PyObject *Swig_var_POINT_get(void) {
   PyObject *pyobj = 0;
   
   pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::POINT));
@@ -25113,13 +25040,13 @@ SWIGINTERN PyObject *POINT_get(void) {
 }
 
 
-SWIGINTERN int S_VERTEX_set(PyObject *) {
+SWIGINTERN int Swig_var_S_VERTEX_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable S_VERTEX is read-only.");
   return 1;
 }
 
 
-SWIGINTERN PyObject *S_VERTEX_get(void) {
+SWIGINTERN PyObject *Swig_var_S_VERTEX_get(void) {
   PyObject *pyobj = 0;
   
   pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::S_VERTEX));
@@ -25127,13 +25054,13 @@ SWIGINTERN PyObject *S_VERTEX_get(void) {
 }
 
 
-SWIGINTERN int VIEW_VERTEX_set(PyObject *) {
+SWIGINTERN int Swig_var_VIEW_VERTEX_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable VIEW_VERTEX is read-only.");
   return 1;
 }
 
 
-SWIGINTERN PyObject *VIEW_VERTEX_get(void) {
+SWIGINTERN PyObject *Swig_var_VIEW_VERTEX_get(void) {
   PyObject *pyobj = 0;
   
   pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::VIEW_VERTEX));
@@ -25141,13 +25068,13 @@ SWIGINTERN PyObject *VIEW_VERTEX_get(void) {
 }
 
 
-SWIGINTERN int NON_T_VERTEX_set(PyObject *) {
+SWIGINTERN int Swig_var_NON_T_VERTEX_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable NON_T_VERTEX is read-only.");
   return 1;
 }
 
 
-SWIGINTERN PyObject *NON_T_VERTEX_get(void) {
+SWIGINTERN PyObject *Swig_var_NON_T_VERTEX_get(void) {
   PyObject *pyobj = 0;
   
   pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::NON_T_VERTEX));
@@ -25155,13 +25082,13 @@ SWIGINTERN PyObject *NON_T_VERTEX_get(void) {
 }
 
 
-SWIGINTERN int T_VERTEX_set(PyObject *) {
+SWIGINTERN int Swig_var_T_VERTEX_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable T_VERTEX is read-only.");
   return 1;
 }
 
 
-SWIGINTERN PyObject *T_VERTEX_get(void) {
+SWIGINTERN PyObject *Swig_var_T_VERTEX_get(void) {
   PyObject *pyobj = 0;
   
   pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::T_VERTEX));
@@ -25169,13 +25096,13 @@ SWIGINTERN PyObject *T_VERTEX_get(void) {
 }
 
 
-SWIGINTERN int CUSP_set(PyObject *) {
+SWIGINTERN int Swig_var_CUSP_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable CUSP is read-only.");
   return 1;
 }
 
 
-SWIGINTERN PyObject *CUSP_get(void) {
+SWIGINTERN PyObject *Swig_var_CUSP_get(void) {
   PyObject *pyobj = 0;
   
   pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::CUSP));
@@ -25183,13 +25110,13 @@ SWIGINTERN PyObject *CUSP_get(void) {
 }
 
 
-SWIGINTERN int NO_FEATURE_set(PyObject *) {
+SWIGINTERN int Swig_var_NO_FEATURE_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable NO_FEATURE is read-only.");
   return 1;
 }
 
 
-SWIGINTERN PyObject *NO_FEATURE_get(void) {
+SWIGINTERN PyObject *Swig_var_NO_FEATURE_get(void) {
   PyObject *pyobj = 0;
   
   pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::NO_FEATURE));
@@ -25197,13 +25124,13 @@ SWIGINTERN PyObject *NO_FEATURE_get(void) {
 }
 
 
-SWIGINTERN int SILHOUETTE_set(PyObject *) {
+SWIGINTERN int Swig_var_SILHOUETTE_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable SILHOUETTE is read-only.");
   return 1;
 }
 
 
-SWIGINTERN PyObject *SILHOUETTE_get(void) {
+SWIGINTERN PyObject *Swig_var_SILHOUETTE_get(void) {
   PyObject *pyobj = 0;
   
   pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::SILHOUETTE));
@@ -25211,13 +25138,13 @@ SWIGINTERN PyObject *SILHOUETTE_get(void) {
 }
 
 
-SWIGINTERN int BORDER_set(PyObject *) {
+SWIGINTERN int Swig_var_BORDER_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable BORDER is read-only.");
   return 1;
 }
 
 
-SWIGINTERN PyObject *BORDER_get(void) {
+SWIGINTERN PyObject *Swig_var_BORDER_get(void) {
   PyObject *pyobj = 0;
   
   pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::BORDER));
@@ -25225,13 +25152,13 @@ SWIGINTERN PyObject *BORDER_get(void) {
 }
 
 
-SWIGINTERN int CREASE_set(PyObject *) {
+SWIGINTERN int Swig_var_CREASE_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable CREASE is read-only.");
   return 1;
 }
 
 
-SWIGINTERN PyObject *CREASE_get(void) {
+SWIGINTERN PyObject *Swig_var_CREASE_get(void) {
   PyObject *pyobj = 0;
   
   pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::CREASE));
@@ -25239,13 +25166,13 @@ SWIGINTERN PyObject *CREASE_get(void) {
 }
 
 
-SWIGINTERN int RIDGE_set(PyObject *) {
+SWIGINTERN int Swig_var_RIDGE_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable RIDGE is read-only.");
   return 1;
 }
 
 
-SWIGINTERN PyObject *RIDGE_get(void) {
+SWIGINTERN PyObject *Swig_var_RIDGE_get(void) {
   PyObject *pyobj = 0;
   
   pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::RIDGE));
@@ -25253,13 +25180,13 @@ SWIGINTERN PyObject *RIDGE_get(void) {
 }
 
 
-SWIGINTERN int VALLEY_set(PyObject *) {
+SWIGINTERN int Swig_var_VALLEY_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable VALLEY is read-only.");
   return 1;
 }
 
 
-SWIGINTERN PyObject *VALLEY_get(void) {
+SWIGINTERN PyObject *Swig_var_VALLEY_get(void) {
   PyObject *pyobj = 0;
   
   pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::VALLEY));
@@ -25267,13 +25194,13 @@ SWIGINTERN PyObject *VALLEY_get(void) {
 }
 
 
-SWIGINTERN int SUGGESTIVE_CONTOUR_set(PyObject *) {
+SWIGINTERN int Swig_var_SUGGESTIVE_CONTOUR_set(PyObject *) {
   SWIG_Error(SWIG_AttributeError,"Variable SUGGESTIVE_CONTOUR is read-only.");
   return 1;
 }
 
 
-SWIGINTERN PyObject *SUGGESTIVE_CONTOUR_get(void) {
+SWIGINTERN PyObject *Swig_var_SUGGESTIVE_CONTOUR_get(void) {
   PyObject *pyobj = 0;
   
   pyobj = SWIG_From_unsigned_SS_short(static_cast< unsigned short >(Nature::SUGGESTIVE_CONTOUR));
@@ -25466,7 +25393,7 @@ SWIGINTERN PyObject *_wrap_Interface0D_getPoint3D(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -25594,7 +25521,7 @@ SWIGINTERN PyObject *_wrap_Interface0D_getPoint2D(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -25862,7 +25789,7 @@ fail:
 
 SWIGINTERN PyObject *Interface0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Interface0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -26429,7 +26356,7 @@ SWIGINTERN PyObject *_wrap_Interface0DIteratorNested_getPoint3D(PyObject *SWIGUN
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -26557,7 +26484,7 @@ SWIGINTERN PyObject *_wrap_Interface0DIteratorNested_getPoint2D(PyObject *SWIGUN
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -26802,7 +26729,7 @@ fail:
 
 SWIGINTERN PyObject *Interface0DIteratorNested_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Interface0DIteratorNested, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -26903,7 +26830,7 @@ SWIGINTERN PyObject *_wrap_new_Interface0DIterator(PyObject *self, PyObject *arg
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -26929,7 +26856,11 @@ SWIGINTERN PyObject *_wrap_new_Interface0DIterator(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Interface0DIterator'.\n  Possible C/C++ prototypes are:\n    Interface0DIterator(Interface0DIteratorNested *)\n    Interface0DIterator()\n    Interface0DIterator(Interface0DIterator const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Interface0DIterator'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Interface0DIterator(Interface0DIteratorNested *)\n"
+    "    Interface0DIterator()\n"
+    "    Interface0DIterator(Interface0DIterator const &)\n");
   return NULL;
 }
 
@@ -27464,7 +27395,7 @@ SWIGINTERN PyObject *_wrap_Interface0DIterator_getPoint3D(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -27592,7 +27523,7 @@ SWIGINTERN PyObject *_wrap_Interface0DIterator_getPoint2D(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -27837,7 +27768,7 @@ fail:
 
 SWIGINTERN PyObject *Interface0DIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Interface0DIterator, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -28072,7 +28003,7 @@ SWIGINTERN PyObject *_wrap_Interface1D_pointsBegin(PyObject *self, PyObject *arg
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -28102,7 +28033,10 @@ SWIGINTERN PyObject *_wrap_Interface1D_pointsBegin(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Interface1D_pointsBegin'.\n  Possible C/C++ prototypes are:\n    pointsBegin(float)\n    pointsBegin()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Interface1D_pointsBegin'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    pointsBegin(Interface1D *,float)\n"
+    "    pointsBegin(Interface1D *)\n");
   return NULL;
 }
 
@@ -28186,7 +28120,7 @@ SWIGINTERN PyObject *_wrap_Interface1D_pointsEnd(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -28216,7 +28150,10 @@ SWIGINTERN PyObject *_wrap_Interface1D_pointsEnd(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Interface1D_pointsEnd'.\n  Possible C/C++ prototypes are:\n    pointsEnd(float)\n    pointsEnd()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Interface1D_pointsEnd'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    pointsEnd(Interface1D *,float)\n"
+    "    pointsEnd(Interface1D *)\n");
   return NULL;
 }
 
@@ -28391,14 +28328,14 @@ fail:
 
 SWIGINTERN PyObject *Interface1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Interface1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_integrateUnsigned__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<unsigned int > *arg1 = 0 ;
+  UnaryFunction0D< unsigned int > *arg1 = 0 ;
   Interface0DIterator arg2 ;
   Interface0DIterator arg3 ;
   IntegrationType arg4 ;
@@ -28417,14 +28354,14 @@ SWIGINTERN PyObject *_wrap_integrateUnsigned__SWIG_0(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:integrateUnsigned",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DTunsigned_int_t,  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DT_unsigned_int_t,  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "integrateUnsigned" "', argument " "1"" of type '" "UnaryFunction0D<unsigned int > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "integrateUnsigned" "', argument " "1"" of type '" "UnaryFunction0D< unsigned int > &""'"); 
   }
   if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateUnsigned" "', argument " "1"" of type '" "UnaryFunction0D<unsigned int > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateUnsigned" "', argument " "1"" of type '" "UnaryFunction0D< unsigned int > &""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< unsigned int > * >(argp1);
   {
     res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0  | 0);
     if (!SWIG_IsOK(res2)) {
@@ -28458,7 +28395,7 @@ SWIGINTERN PyObject *_wrap_integrateUnsigned__SWIG_0(PyObject *SWIGUNUSEDPARM(se
   arg4 = static_cast< IntegrationType >(val4);
   {
     try {
-      result = (unsigned int)integrate<unsigned int >(*arg1,arg2,arg3,arg4);
+      result = (unsigned int)integrate< unsigned int >(*arg1,arg2,arg3,arg4);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -28476,7 +28413,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_integrateUnsigned__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<unsigned int > *arg1 = 0 ;
+  UnaryFunction0D< unsigned int > *arg1 = 0 ;
   Interface0DIterator arg2 ;
   Interface0DIterator arg3 ;
   unsigned int result;
@@ -28491,14 +28428,14 @@ SWIGINTERN PyObject *_wrap_integrateUnsigned__SWIG_1(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:integrateUnsigned",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DTunsigned_int_t,  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DT_unsigned_int_t,  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "integrateUnsigned" "', argument " "1"" of type '" "UnaryFunction0D<unsigned int > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "integrateUnsigned" "', argument " "1"" of type '" "UnaryFunction0D< unsigned int > &""'"); 
   }
   if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateUnsigned" "', argument " "1"" of type '" "UnaryFunction0D<unsigned int > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateUnsigned" "', argument " "1"" of type '" "UnaryFunction0D< unsigned int > &""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< unsigned int > * >(argp1);
   {
     res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0  | 0);
     if (!SWIG_IsOK(res2)) {
@@ -28527,7 +28464,7 @@ SWIGINTERN PyObject *_wrap_integrateUnsigned__SWIG_1(PyObject *SWIGUNUSEDPARM(se
   }
   {
     try {
-      result = (unsigned int)integrate<unsigned int >(*arg1,arg2,arg3);
+      result = (unsigned int)integrate< unsigned int >(*arg1,arg2,arg3);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -28549,14 +28486,14 @@ SWIGINTERN PyObject *_wrap_integrateUnsigned(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 3) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DTunsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DT_unsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Interface0DIterator, 0);
@@ -28573,7 +28510,7 @@ SWIGINTERN PyObject *_wrap_integrateUnsigned(PyObject *self, PyObject *args) {
   if (argc == 4) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DTunsigned_int_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DT_unsigned_int_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Interface0DIterator, 0);
@@ -28595,14 +28532,17 @@ SWIGINTERN PyObject *_wrap_integrateUnsigned(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'integrateUnsigned'.\n  Possible C/C++ prototypes are:\n    integrate<(unsigned int)>(UnaryFunction0D<unsigned int > &,Interface0DIterator,Interface0DIterator,IntegrationType)\n    integrate<(unsigned int)>(UnaryFunction0D<unsigned int > &,Interface0DIterator,Interface0DIterator)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'integrateUnsigned'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    integrate< unsigned int >(UnaryFunction0D< unsigned int > &,Interface0DIterator,Interface0DIterator,IntegrationType)\n"
+    "    integrate< unsigned int >(UnaryFunction0D< unsigned int > &,Interface0DIterator,Interface0DIterator)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_integrateFloat__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<float > *arg1 = 0 ;
+  UnaryFunction0D< float > *arg1 = 0 ;
   Interface0DIterator arg2 ;
   Interface0DIterator arg3 ;
   IntegrationType arg4 ;
@@ -28621,14 +28561,14 @@ SWIGINTERN PyObject *_wrap_integrateFloat__SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:integrateFloat",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DTfloat_t,  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DT_float_t,  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "integrateFloat" "', argument " "1"" of type '" "UnaryFunction0D<float > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "integrateFloat" "', argument " "1"" of type '" "UnaryFunction0D< float > &""'"); 
   }
   if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateFloat" "', argument " "1"" of type '" "UnaryFunction0D<float > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateFloat" "', argument " "1"" of type '" "UnaryFunction0D< float > &""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<float > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< float > * >(argp1);
   {
     res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0  | 0);
     if (!SWIG_IsOK(res2)) {
@@ -28662,7 +28602,7 @@ SWIGINTERN PyObject *_wrap_integrateFloat__SWIG_0(PyObject *SWIGUNUSEDPARM(self)
   arg4 = static_cast< IntegrationType >(val4);
   {
     try {
-      result = (float)integrate<float >(*arg1,arg2,arg3,arg4);
+      result = (float)integrate< float >(*arg1,arg2,arg3,arg4);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -28680,7 +28620,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_integrateFloat__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<float > *arg1 = 0 ;
+  UnaryFunction0D< float > *arg1 = 0 ;
   Interface0DIterator arg2 ;
   Interface0DIterator arg3 ;
   float result;
@@ -28695,14 +28635,14 @@ SWIGINTERN PyObject *_wrap_integrateFloat__SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:integrateFloat",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DTfloat_t,  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DT_float_t,  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "integrateFloat" "', argument " "1"" of type '" "UnaryFunction0D<float > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "integrateFloat" "', argument " "1"" of type '" "UnaryFunction0D< float > &""'"); 
   }
   if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateFloat" "', argument " "1"" of type '" "UnaryFunction0D<float > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateFloat" "', argument " "1"" of type '" "UnaryFunction0D< float > &""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<float > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< float > * >(argp1);
   {
     res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0  | 0);
     if (!SWIG_IsOK(res2)) {
@@ -28731,7 +28671,7 @@ SWIGINTERN PyObject *_wrap_integrateFloat__SWIG_1(PyObject *SWIGUNUSEDPARM(self)
   }
   {
     try {
-      result = (float)integrate<float >(*arg1,arg2,arg3);
+      result = (float)integrate< float >(*arg1,arg2,arg3);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -28753,14 +28693,14 @@ SWIGINTERN PyObject *_wrap_integrateFloat(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 3) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DTfloat_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DT_float_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Interface0DIterator, 0);
@@ -28777,7 +28717,7 @@ SWIGINTERN PyObject *_wrap_integrateFloat(PyObject *self, PyObject *args) {
   if (argc == 4) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DTfloat_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DT_float_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Interface0DIterator, 0);
@@ -28799,14 +28739,17 @@ SWIGINTERN PyObject *_wrap_integrateFloat(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'integrateFloat'.\n  Possible C/C++ prototypes are:\n    integrate<(float)>(UnaryFunction0D<float > &,Interface0DIterator,Interface0DIterator,IntegrationType)\n    integrate<(float)>(UnaryFunction0D<float > &,Interface0DIterator,Interface0DIterator)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'integrateFloat'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    integrate< float >(UnaryFunction0D< float > &,Interface0DIterator,Interface0DIterator,IntegrationType)\n"
+    "    integrate< float >(UnaryFunction0D< float > &,Interface0DIterator,Interface0DIterator)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_integrateDouble__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<double > *arg1 = 0 ;
+  UnaryFunction0D< double > *arg1 = 0 ;
   Interface0DIterator arg2 ;
   Interface0DIterator arg3 ;
   IntegrationType arg4 ;
@@ -28825,14 +28768,14 @@ SWIGINTERN PyObject *_wrap_integrateDouble__SWIG_0(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:integrateDouble",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DTdouble_t,  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DT_double_t,  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "integrateDouble" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "integrateDouble" "', argument " "1"" of type '" "UnaryFunction0D< double > &""'"); 
   }
   if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateDouble" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateDouble" "', argument " "1"" of type '" "UnaryFunction0D< double > &""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< double > * >(argp1);
   {
     res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0  | 0);
     if (!SWIG_IsOK(res2)) {
@@ -28866,7 +28809,7 @@ SWIGINTERN PyObject *_wrap_integrateDouble__SWIG_0(PyObject *SWIGUNUSEDPARM(self
   arg4 = static_cast< IntegrationType >(val4);
   {
     try {
-      result = (double)integrate<double >(*arg1,arg2,arg3,arg4);
+      result = (double)integrate< double >(*arg1,arg2,arg3,arg4);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -28884,7 +28827,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_integrateDouble__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<double > *arg1 = 0 ;
+  UnaryFunction0D< double > *arg1 = 0 ;
   Interface0DIterator arg2 ;
   Interface0DIterator arg3 ;
   double result;
@@ -28899,14 +28842,14 @@ SWIGINTERN PyObject *_wrap_integrateDouble__SWIG_1(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:integrateDouble",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DTdouble_t,  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DT_double_t,  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "integrateDouble" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "integrateDouble" "', argument " "1"" of type '" "UnaryFunction0D< double > &""'"); 
   }
   if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateDouble" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "integrateDouble" "', argument " "1"" of type '" "UnaryFunction0D< double > &""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< double > * >(argp1);
   {
     res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0  | 0);
     if (!SWIG_IsOK(res2)) {
@@ -28935,7 +28878,7 @@ SWIGINTERN PyObject *_wrap_integrateDouble__SWIG_1(PyObject *SWIGUNUSEDPARM(self
   }
   {
     try {
-      result = (double)integrate<double >(*arg1,arg2,arg3);
+      result = (double)integrate< double >(*arg1,arg2,arg3);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -28957,14 +28900,14 @@ SWIGINTERN PyObject *_wrap_integrateDouble(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 3) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DTdouble_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DT_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Interface0DIterator, 0);
@@ -28981,7 +28924,7 @@ SWIGINTERN PyObject *_wrap_integrateDouble(PyObject *self, PyObject *args) {
   if (argc == 4) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DTdouble_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DT_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Interface0DIterator, 0);
@@ -29003,7 +28946,10 @@ SWIGINTERN PyObject *_wrap_integrateDouble(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'integrateDouble'.\n  Possible C/C++ prototypes are:\n    integrate<(double)>(UnaryFunction0D<double > &,Interface0DIterator,Interface0DIterator,IntegrationType)\n    integrate<(double)>(UnaryFunction0D<double > &,Interface0DIterator,Interface0DIterator)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'integrateDouble'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    integrate< double >(UnaryFunction0D< double > &,Interface0DIterator,Interface0DIterator,IntegrationType)\n"
+    "    integrate< double >(UnaryFunction0D< double > &,Interface0DIterator,Interface0DIterator)\n");
   return NULL;
 }
 
@@ -29161,7 +29107,7 @@ SWIGINTERN PyObject *_wrap_SVertex_getPoint3D(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -29289,7 +29235,7 @@ SWIGINTERN PyObject *_wrap_SVertex_getPoint2D(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -29619,7 +29565,7 @@ SWIGINTERN PyObject *_wrap_new_SVertex__SWIG_1(PyObject *SWIGUNUSEDPARM(self), P
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:new_SVertex",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_SVertex" "', argument " "1"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -29694,7 +29640,7 @@ SWIGINTERN PyObject *_wrap_new_SVertex(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -29712,7 +29658,7 @@ SWIGINTERN PyObject *_wrap_new_SVertex(PyObject *self, PyObject *args) {
   }
   if (argc == 2) {
     int _v;
-    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_VecMat__Vec3T_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_Id, 0);
@@ -29724,7 +29670,11 @@ SWIGINTERN PyObject *_wrap_new_SVertex(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_SVertex'.\n  Possible C/C++ prototypes are:\n    SVertex()\n    SVertex(Geometry::Vec3r const &,Id const &)\n    SVertex(SVertex &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_SVertex'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    SVertex()\n"
+    "    SVertex(Geometry::Vec3r const &,Id const &)\n"
+    "    SVertex(SVertex &)\n");
   return NULL;
 }
 
@@ -29865,7 +29815,7 @@ SWIGINTERN PyObject *_wrap_SVertex_point3D(PyObject *SWIGUNUSEDPARM(self), PyObj
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -29900,7 +29850,7 @@ SWIGINTERN PyObject *_wrap_SVertex_point2D(PyObject *SWIGUNUSEDPARM(self), PyObj
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -29910,7 +29860,7 @@ fail:
 SWIGINTERN PyObject *_wrap_SVertex_normals(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SVertex *arg1 = (SVertex *) 0 ;
-  SwigValueWrapper<set<VecMat::Vec3<double > > > result;
+  SwigValueWrapper< set< VecMat::Vec3< double > > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -29932,7 +29882,7 @@ SWIGINTERN PyObject *_wrap_SVertex_normals(PyObject *SWIGUNUSEDPARM(self), PyObj
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new set<Geometry::Vec3r >(static_cast< const set<Geometry::Vec3r >& >(result))), SWIGTYPE_p_setTVecMat__Vec3Tdouble_t_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new set< Geometry::Vec3r >(static_cast< const set< Geometry::Vec3r >& >(result))), SWIGTYPE_p_setT_VecMat__Vec3T_double_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -29974,7 +29924,7 @@ fail:
 SWIGINTERN PyObject *_wrap_SVertex_fedges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SVertex *arg1 = (SVertex *) 0 ;
-  std::vector<FEdge * > *result = 0 ;
+  std::vector< FEdge * > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -29988,8 +29938,8 @@ SWIGINTERN PyObject *_wrap_SVertex_fedges(PyObject *SWIGUNUSEDPARM(self), PyObje
   {
     try {
       {
-        std::vector<FEdge * > const &_result_ref = (arg1)->fedges();
-        result = (std::vector<FEdge * > *) &_result_ref;
+        std::vector< FEdge * > const &_result_ref = (arg1)->fedges();
+        result = (std::vector< FEdge * > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -29999,7 +29949,7 @@ SWIGINTERN PyObject *_wrap_SVertex_fedges(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -30183,7 +30133,7 @@ SWIGINTERN PyObject *_wrap_SVertex_setPoint3D(PyObject *SWIGUNUSEDPARM(self), Py
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_setPoint3D" "', argument " "1"" of type '" "SVertex *""'"); 
   }
   arg1 = reinterpret_cast< SVertex * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVertex_setPoint3D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -30226,7 +30176,7 @@ SWIGINTERN PyObject *_wrap_SVertex_setPoint2D(PyObject *SWIGUNUSEDPARM(self), Py
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_setPoint2D" "', argument " "1"" of type '" "SVertex *""'"); 
   }
   arg1 = reinterpret_cast< SVertex * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVertex_setPoint2D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -30269,7 +30219,7 @@ SWIGINTERN PyObject *_wrap_SVertex_AddNormal(PyObject *SWIGUNUSEDPARM(self), PyO
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_AddNormal" "', argument " "1"" of type '" "SVertex *""'"); 
   }
   arg1 = reinterpret_cast< SVertex * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVertex_AddNormal" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -30425,7 +30375,7 @@ SWIGINTERN PyObject *_wrap_SVertex_setDirectionFredo(PyObject *SWIGUNUSEDPARM(se
   }
   arg1 = reinterpret_cast< SVertex * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVertex_setDirectionFredo" "', argument " "2"" of type '" "Geometry::Vec2r""'"); 
     }  
@@ -30512,7 +30462,7 @@ SWIGINTERN PyObject *_wrap_SVertex_directionFredo(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2r(static_cast< const Geometry::Vec2r& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2r(static_cast< const Geometry::Vec2r& >(result))), SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -30565,7 +30515,7 @@ fail:
 SWIGINTERN PyObject *_wrap_SVertex_setFEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SVertex *arg1 = (SVertex *) 0 ;
-  std::vector<FEdge * > *arg2 = 0 ;
+  std::vector< FEdge * > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -30579,17 +30529,17 @@ SWIGINTERN PyObject *_wrap_SVertex_setFEdges(PyObject *SWIGUNUSEDPARM(self), PyO
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVertex_setFEdges" "', argument " "1"" of type '" "SVertex *""'"); 
   }
   arg1 = reinterpret_cast< SVertex * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVertex_setFEdges" "', argument " "2"" of type '" "std::vector<FEdge * > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVertex_setFEdges" "', argument " "2"" of type '" "std::vector< FEdge * > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SVertex_setFEdges" "', argument " "2"" of type '" "std::vector<FEdge * > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SVertex_setFEdges" "', argument " "2"" of type '" "std::vector< FEdge * > const &""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<FEdge * > * >(argp2);
+  arg2 = reinterpret_cast< std::vector< FEdge * > * >(argp2);
   {
     try {
-      (arg1)->setFEdges((std::vector<FEdge * > const &)*arg2);
+      (arg1)->setFEdges((std::vector< FEdge * > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -30834,7 +30784,7 @@ SWIGINTERN PyObject *_wrap_SVertex_point2d(PyObject *SWIGUNUSEDPARM(self), PyObj
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -30869,7 +30819,7 @@ SWIGINTERN PyObject *_wrap_SVertex_point3d(PyObject *SWIGUNUSEDPARM(self), PyObj
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -30901,7 +30851,7 @@ SWIGINTERN PyObject *_wrap_SVertex_normal(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -30978,7 +30928,7 @@ SWIGINTERN PyObject *_wrap_SVertex_shape(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -31002,7 +30952,10 @@ SWIGINTERN PyObject *_wrap_SVertex_shape(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SVertex_shape'.\n  Possible C/C++ prototypes are:\n    shape()\n    shape()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SVertex_shape'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    shape(SVertex *)\n"
+    "    shape(SVertex const *)\n");
   return NULL;
 }
 
@@ -31332,7 +31285,7 @@ fail:
 
 SWIGINTERN PyObject *SVertex_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_SVertex, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -31589,7 +31542,7 @@ SWIGINTERN PyObject *_wrap_new_FEdge(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -31621,7 +31574,11 @@ SWIGINTERN PyObject *_wrap_new_FEdge(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_FEdge'.\n  Possible C/C++ prototypes are:\n    FEdge()\n    FEdge(SVertex *,SVertex *)\n    FEdge(FEdge &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_FEdge'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    FEdge()\n"
+    "    FEdge(SVertex *,SVertex *)\n"
+    "    FEdge(FEdge &)\n");
   return NULL;
 }
 
@@ -31971,7 +31928,7 @@ SWIGINTERN PyObject *_wrap_FEdge_center3d(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -32003,7 +31960,7 @@ SWIGINTERN PyObject *_wrap_FEdge_center2d(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -32073,7 +32030,7 @@ SWIGINTERN PyObject *_wrap_FEdge_getOccludeeIntersection(PyObject *SWIGUNUSEDPAR
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -32487,7 +32444,7 @@ SWIGINTERN PyObject *_wrap_FEdge_setOccludeeIntersection(PyObject *SWIGUNUSEDPAR
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdge_setOccludeeIntersection" "', argument " "1"" of type '" "FEdge *""'"); 
   }
   arg1 = reinterpret_cast< FEdge * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdge_setOccludeeIntersection" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -32768,7 +32725,7 @@ SWIGINTERN PyObject *_wrap_FEdge_shape(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -32792,7 +32749,10 @@ SWIGINTERN PyObject *_wrap_FEdge_shape(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdge_shape'.\n  Possible C/C++ prototypes are:\n    shape()\n    shape()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdge_shape'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    shape(FEdge *)\n"
+    "    shape(FEdge const *)\n");
   return NULL;
 }
 
@@ -33177,7 +33137,7 @@ SWIGINTERN PyObject *_wrap_FEdge_orientation2d(PyObject *SWIGUNUSEDPARM(self), P
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -33209,7 +33169,7 @@ SWIGINTERN PyObject *_wrap_FEdge_orientation3d(PyObject *SWIGUNUSEDPARM(self), P
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -33359,7 +33319,7 @@ SWIGINTERN PyObject *_wrap_FEdge_pointsBegin(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -33389,7 +33349,10 @@ SWIGINTERN PyObject *_wrap_FEdge_pointsBegin(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdge_pointsBegin'.\n  Possible C/C++ prototypes are:\n    pointsBegin(float)\n    pointsBegin()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdge_pointsBegin'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    pointsBegin(FEdge *,float)\n"
+    "    pointsBegin(FEdge *)\n");
   return NULL;
 }
 
@@ -33473,7 +33436,7 @@ SWIGINTERN PyObject *_wrap_FEdge_pointsEnd(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -33503,14 +33466,17 @@ SWIGINTERN PyObject *_wrap_FEdge_pointsEnd(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdge_pointsEnd'.\n  Possible C/C++ prototypes are:\n    pointsEnd(float)\n    pointsEnd()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdge_pointsEnd'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    pointsEnd(FEdge *,float)\n"
+    "    pointsEnd(FEdge *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *FEdge_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FEdge, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -33620,7 +33586,7 @@ SWIGINTERN PyObject *_wrap_new_FEdgeSVertexIterator(PyObject *self, PyObject *ar
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -33651,7 +33617,11 @@ SWIGINTERN PyObject *_wrap_new_FEdgeSVertexIterator(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_FEdgeSVertexIterator'.\n  Possible C/C++ prototypes are:\n    FEdgeInternal::SVertexIterator()\n    FEdgeInternal::SVertexIterator(FEdgeInternal::SVertexIterator const &)\n    FEdgeInternal::SVertexIterator(SVertex *,FEdge *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_FEdgeSVertexIterator'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    FEdgeInternal::SVertexIterator()\n"
+    "    FEdgeInternal::SVertexIterator(FEdgeInternal::SVertexIterator const &)\n"
+    "    FEdgeInternal::SVertexIterator(SVertex *,FEdge *)\n");
   return NULL;
 }
 
@@ -34174,7 +34144,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_getPoint3D(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -34302,7 +34272,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_getPoint2D(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -34656,7 +34626,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_point3D(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -34691,7 +34661,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_point2D(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -34701,7 +34671,7 @@ fail:
 SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_normals(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
-  SwigValueWrapper<set<VecMat::Vec3<double > > > result;
+  SwigValueWrapper< set< VecMat::Vec3< double > > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -34723,7 +34693,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_normals(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new set<Geometry::Vec3r >(static_cast< const set<Geometry::Vec3r >& >(result))), SWIGTYPE_p_setTVecMat__Vec3Tdouble_t_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new set< Geometry::Vec3r >(static_cast< const set< Geometry::Vec3r >& >(result))), SWIGTYPE_p_setT_VecMat__Vec3T_double_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -34765,7 +34735,7 @@ fail:
 SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_fedges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
-  std::vector<FEdge * > *result = 0 ;
+  std::vector< FEdge * > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -34779,8 +34749,8 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_fedges(PyObject *SWIGUNUSEDPARM(
   {
     try {
       {
-        std::vector<FEdge * > const &_result_ref = (*arg1)->fedges();
-        result = (std::vector<FEdge * > *) &_result_ref;
+        std::vector< FEdge * > const &_result_ref = (*arg1)->fedges();
+        result = (std::vector< FEdge * > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -34790,7 +34760,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_fedges(PyObject *SWIGUNUSEDPARM(
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -34931,7 +34901,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_shape(PyObject *self, PyObject *
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -34955,7 +34925,10 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_shape(PyObject *self, PyObject *
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdgeSVertexIterator_shape'.\n  Possible C/C++ prototypes are:\n    shape()\n    shape()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdgeSVertexIterator_shape'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    shape(FEdgeInternal::SVertexIterator *)\n"
+    "    shape(FEdgeInternal::SVertexIterator const *)\n");
   return NULL;
 }
 
@@ -35041,7 +35014,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_setPoint3D(PyObject *SWIGUNUSEDP
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_setPoint3D" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
   }
   arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSVertexIterator_setPoint3D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -35084,7 +35057,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_setPoint2D(PyObject *SWIGUNUSEDP
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_setPoint2D" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
   }
   arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSVertexIterator_setPoint2D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -35127,7 +35100,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_AddNormal(PyObject *SWIGUNUSEDPA
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_AddNormal" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
   }
   arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSVertexIterator_AddNormal" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -35283,7 +35256,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_setDirectionFredo(PyObject *SWIG
   }
   arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSVertexIterator_setDirectionFredo" "', argument " "2"" of type '" "Geometry::Vec2r""'"); 
     }  
@@ -35370,7 +35343,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_directionFredo(PyObject *SWIGUNU
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2r(static_cast< const Geometry::Vec2r& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2r(static_cast< const Geometry::Vec2r& >(result))), SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -35423,7 +35396,7 @@ fail:
 SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_setFEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   FEdgeInternal::SVertexIterator *arg1 = (FEdgeInternal::SVertexIterator *) 0 ;
-  std::vector<FEdge * > *arg2 = 0 ;
+  std::vector< FEdge * > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -35437,17 +35410,17 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_setFEdges(PyObject *SWIGUNUSEDPA
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSVertexIterator_setFEdges" "', argument " "1"" of type '" "FEdgeInternal::SVertexIterator *""'"); 
   }
   arg1 = reinterpret_cast< FEdgeInternal::SVertexIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSVertexIterator_setFEdges" "', argument " "2"" of type '" "std::vector<FEdge * > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSVertexIterator_setFEdges" "', argument " "2"" of type '" "std::vector< FEdge * > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdgeSVertexIterator_setFEdges" "', argument " "2"" of type '" "std::vector<FEdge * > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdgeSVertexIterator_setFEdges" "', argument " "2"" of type '" "std::vector< FEdge * > const &""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<FEdge * > * >(argp2);
+  arg2 = reinterpret_cast< std::vector< FEdge * > * >(argp2);
   {
     try {
-      (*arg1)->setFEdges((std::vector<FEdge * > const &)*arg2);
+      (*arg1)->setFEdges((std::vector< FEdge * > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -35692,7 +35665,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_point2d(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -35727,7 +35700,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_point3d(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -35759,7 +35732,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSVertexIterator_normal(PyObject *SWIGUNUSEDPARM(
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -36123,7 +36096,7 @@ fail:
 
 SWIGINTERN PyObject *FEdgeSVertexIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FEdgeInternal__SVertexIterator, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -36233,7 +36206,7 @@ SWIGINTERN PyObject *_wrap_new_FEdgeSharp(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -36265,7 +36238,11 @@ SWIGINTERN PyObject *_wrap_new_FEdgeSharp(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_FEdgeSharp'.\n  Possible C/C++ prototypes are:\n    FEdgeSharp()\n    FEdgeSharp(SVertex *,SVertex *)\n    FEdgeSharp(FEdgeSharp &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_FEdgeSharp'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    FEdgeSharp()\n"
+    "    FEdgeSharp(SVertex *,SVertex *)\n"
+    "    FEdgeSharp(FEdgeSharp &)\n");
   return NULL;
 }
 
@@ -36362,7 +36339,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSharp_normalA(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -36397,7 +36374,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSharp_normalB(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -36555,7 +36532,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSharp_setNormalA(PyObject *SWIGUNUSEDPARM(self),
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSharp_setNormalA" "', argument " "1"" of type '" "FEdgeSharp *""'"); 
   }
   arg1 = reinterpret_cast< FEdgeSharp * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSharp_setNormalA" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -36598,7 +36575,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSharp_setNormalB(PyObject *SWIGUNUSEDPARM(self),
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSharp_setNormalB" "', argument " "1"" of type '" "FEdgeSharp *""'"); 
   }
   arg1 = reinterpret_cast< FEdgeSharp * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSharp_setNormalB" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -36706,7 +36683,7 @@ fail:
 
 SWIGINTERN PyObject *FEdgeSharp_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FEdgeSharp, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -36816,7 +36793,7 @@ SWIGINTERN PyObject *_wrap_new_FEdgeSmooth(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -36848,7 +36825,11 @@ SWIGINTERN PyObject *_wrap_new_FEdgeSmooth(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_FEdgeSmooth'.\n  Possible C/C++ prototypes are:\n    FEdgeSmooth()\n    FEdgeSmooth(SVertex *,SVertex *)\n    FEdgeSmooth(FEdgeSmooth &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_FEdgeSmooth'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    FEdgeSmooth()\n"
+    "    FEdgeSmooth(SVertex *,SVertex *)\n"
+    "    FEdgeSmooth(FEdgeSmooth &)\n");
   return NULL;
 }
 
@@ -36977,7 +36958,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSmooth_normal(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -37106,7 +37087,7 @@ SWIGINTERN PyObject *_wrap_FEdgeSmooth_setNormal(PyObject *SWIGUNUSEDPARM(self),
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgeSmooth_setNormal" "', argument " "1"" of type '" "FEdgeSmooth *""'"); 
   }
   arg1 = reinterpret_cast< FEdgeSmooth * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgeSmooth_setNormal" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -37174,7 +37155,7 @@ fail:
 
 SWIGINTERN PyObject *FEdgeSmooth_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_FEdgeSmooth, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -37294,7 +37275,7 @@ SWIGINTERN PyObject *_wrap_new_SShape(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -37312,7 +37293,10 @@ SWIGINTERN PyObject *_wrap_new_SShape(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_SShape'.\n  Possible C/C++ prototypes are:\n    SShape()\n    SShape(SShape &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_SShape'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    SShape()\n"
+    "    SShape(SShape &)\n");
   return NULL;
 }
 
@@ -37527,7 +37511,7 @@ SWIGINTERN PyObject *_wrap_SShape_CreateSVertex(PyObject *SWIGUNUSEDPARM(self),
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_CreateSVertex" "', argument " "1"" of type '" "SShape *""'"); 
   }
   arg1 = reinterpret_cast< SShape * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SShape_CreateSVertex" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -37535,7 +37519,7 @@ SWIGINTERN PyObject *_wrap_SShape_CreateSVertex(PyObject *SWIGUNUSEDPARM(self),
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SShape_CreateSVertex" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
   arg2 = reinterpret_cast< Geometry::Vec3r * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SShape_CreateSVertex" "', argument " "3"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -37573,8 +37557,8 @@ SWIGINTERN PyObject *_wrap_SShape_SplitEdge(PyObject *SWIGUNUSEDPARM(self), PyOb
   PyObject *resultobj = 0;
   SShape *arg1 = (SShape *) 0 ;
   FEdge *arg2 = (FEdge *) 0 ;
-  std::vector<Geometry::Vec2r > *arg3 = 0 ;
-  std::vector<FEdge * > *arg4 = 0 ;
+  std::vector< Geometry::Vec2r > *arg3 = 0 ;
+  std::vector< FEdge * > *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -37599,25 +37583,25 @@ SWIGINTERN PyObject *_wrap_SShape_SplitEdge(PyObject *SWIGUNUSEDPARM(self), PyOb
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SShape_SplitEdge" "', argument " "2"" of type '" "FEdge *""'"); 
   }
   arg2 = reinterpret_cast< FEdge * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_std__vectorTVecMat__Vec2Tdouble_t_std__allocatorTVecMat__Vec2Tdouble_t_t_t,  0  | 0);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_std__vectorT_VecMat__Vec2T_double_t_std__allocatorT_VecMat__Vec2T_double_t_t_t,  0  | 0);
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SShape_SplitEdge" "', argument " "3"" of type '" "std::vector<Geometry::Vec2r > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SShape_SplitEdge" "', argument " "3"" of type '" "std::vector< Geometry::Vec2r > const &""'"); 
   }
   if (!argp3) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SShape_SplitEdge" "', argument " "3"" of type '" "std::vector<Geometry::Vec2r > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SShape_SplitEdge" "', argument " "3"" of type '" "std::vector< Geometry::Vec2r > const &""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<Geometry::Vec2r > * >(argp3);
-  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t,  0 );
+  arg3 = reinterpret_cast< std::vector< Geometry::Vec2r > * >(argp3);
+  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t,  0 );
   if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "SShape_SplitEdge" "', argument " "4"" of type '" "std::vector<FEdge * > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "SShape_SplitEdge" "', argument " "4"" of type '" "std::vector< FEdge * > &""'"); 
   }
   if (!argp4) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SShape_SplitEdge" "', argument " "4"" of type '" "std::vector<FEdge * > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SShape_SplitEdge" "', argument " "4"" of type '" "std::vector< FEdge * > &""'"); 
   }
-  arg4 = reinterpret_cast< std::vector<FEdge * > * >(argp4);
+  arg4 = reinterpret_cast< std::vector< FEdge * > * >(argp4);
   {
     try {
-      (arg1)->SplitEdge(arg2,(std::vector<Geometry::Vec2r > const &)*arg3,*arg4);
+      (arg1)->SplitEdge(arg2,(std::vector< Geometry::Vec2r > const &)*arg3,*arg4);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -37686,7 +37670,7 @@ fail:
 SWIGINTERN PyObject *_wrap_SShape_setBBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SShape *arg1 = (SShape *) 0 ;
-  BBox<Geometry::Vec3r > *arg2 = 0 ;
+  BBox< Geometry::Vec3r > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -37700,17 +37684,17 @@ SWIGINTERN PyObject *_wrap_SShape_setBBox(PyObject *SWIGUNUSEDPARM(self), PyObje
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_setBBox" "', argument " "1"" of type '" "SShape *""'"); 
   }
   arg1 = reinterpret_cast< SShape * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BBoxTVecMat__Vec3Tdouble_t_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BBoxT_VecMat__Vec3T_double_t_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SShape_setBBox" "', argument " "2"" of type '" "BBox<Geometry::Vec3r > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SShape_setBBox" "', argument " "2"" of type '" "BBox< Geometry::Vec3r > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SShape_setBBox" "', argument " "2"" of type '" "BBox<Geometry::Vec3r > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SShape_setBBox" "', argument " "2"" of type '" "BBox< Geometry::Vec3r > const &""'"); 
   }
-  arg2 = reinterpret_cast< BBox<Geometry::Vec3r > * >(argp2);
+  arg2 = reinterpret_cast< BBox< Geometry::Vec3r > * >(argp2);
   {
     try {
-      (arg1)->setBBox((BBox<Geometry::Vec3r > const &)*arg2);
+      (arg1)->setBBox((BBox< Geometry::Vec3r > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -37840,7 +37824,7 @@ fail:
 SWIGINTERN PyObject *_wrap_SShape_GetVertexList(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SShape *arg1 = (SShape *) 0 ;
-  std::vector<SVertex * > *result = 0 ;
+  std::vector< SVertex * > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -37854,8 +37838,8 @@ SWIGINTERN PyObject *_wrap_SShape_GetVertexList(PyObject *SWIGUNUSEDPARM(self),
   {
     try {
       {
-        std::vector<SVertex * > &_result_ref = (arg1)->GetVertexList();
-        result = (std::vector<SVertex * > *) &_result_ref;
+        std::vector< SVertex * > &_result_ref = (arg1)->GetVertexList();
+        result = (std::vector< SVertex * > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -37865,7 +37849,7 @@ SWIGINTERN PyObject *_wrap_SShape_GetVertexList(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -37875,7 +37859,7 @@ fail:
 SWIGINTERN PyObject *_wrap_SShape_GetEdgeList(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SShape *arg1 = (SShape *) 0 ;
-  std::vector<FEdge * > *result = 0 ;
+  std::vector< FEdge * > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -37889,8 +37873,8 @@ SWIGINTERN PyObject *_wrap_SShape_GetEdgeList(PyObject *SWIGUNUSEDPARM(self), Py
   {
     try {
       {
-        std::vector<FEdge * > &_result_ref = (arg1)->GetEdgeList();
-        result = (std::vector<FEdge * > *) &_result_ref;
+        std::vector< FEdge * > &_result_ref = (arg1)->GetEdgeList();
+        result = (std::vector< FEdge * > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -37900,7 +37884,7 @@ SWIGINTERN PyObject *_wrap_SShape_GetEdgeList(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -37910,7 +37894,7 @@ fail:
 SWIGINTERN PyObject *_wrap_SShape_GetChains(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SShape *arg1 = (SShape *) 0 ;
-  std::vector<FEdge * > *result = 0 ;
+  std::vector< FEdge * > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -37924,8 +37908,8 @@ SWIGINTERN PyObject *_wrap_SShape_GetChains(PyObject *SWIGUNUSEDPARM(self), PyOb
   {
     try {
       {
-        std::vector<FEdge * > &_result_ref = (arg1)->GetChains();
-        result = (std::vector<FEdge * > *) &_result_ref;
+        std::vector< FEdge * > &_result_ref = (arg1)->GetChains();
+        result = (std::vector< FEdge * > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -37935,7 +37919,7 @@ SWIGINTERN PyObject *_wrap_SShape_GetChains(PyObject *SWIGUNUSEDPARM(self), PyOb
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -37945,7 +37929,7 @@ fail:
 SWIGINTERN PyObject *_wrap_SShape_bbox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SShape *arg1 = (SShape *) 0 ;
-  BBox<Geometry::Vec3r > *result = 0 ;
+  BBox< Geometry::Vec3r > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -37959,8 +37943,8 @@ SWIGINTERN PyObject *_wrap_SShape_bbox(PyObject *SWIGUNUSEDPARM(self), PyObject
   {
     try {
       {
-        BBox<Geometry::Vec3r > const &_result_ref = (arg1)->bbox();
-        result = (BBox<Geometry::Vec3r > *) &_result_ref;
+        BBox< Geometry::Vec3r > const &_result_ref = (arg1)->bbox();
+        result = (BBox< Geometry::Vec3r > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -37970,7 +37954,7 @@ SWIGINTERN PyObject *_wrap_SShape_bbox(PyObject *SWIGUNUSEDPARM(self), PyObject
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_BBoxTVecMat__Vec3Tdouble_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_BBoxT_VecMat__Vec3T_double_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -38024,7 +38008,7 @@ fail:
 SWIGINTERN PyObject *_wrap_SShape_materials(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SShape *arg1 = (SShape *) 0 ;
-  std::vector<Material > *result = 0 ;
+  std::vector< Material > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -38038,8 +38022,8 @@ SWIGINTERN PyObject *_wrap_SShape_materials(PyObject *SWIGUNUSEDPARM(self), PyOb
   {
     try {
       {
-        std::vector<Material > const &_result_ref = ((SShape const *)arg1)->materials();
-        result = (std::vector<Material > *) &_result_ref;
+        std::vector< Material > const &_result_ref = ((SShape const *)arg1)->materials();
+        result = (std::vector< Material > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -38049,7 +38033,7 @@ SWIGINTERN PyObject *_wrap_SShape_materials(PyObject *SWIGUNUSEDPARM(self), PyOb
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTMaterial_std__allocatorTMaterial_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_Material_std__allocatorT_Material_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -38203,7 +38187,7 @@ fail:
 SWIGINTERN PyObject *_wrap_SShape_setMaterials(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SShape *arg1 = (SShape *) 0 ;
-  std::vector<Material > *arg2 = 0 ;
+  std::vector< Material > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -38217,17 +38201,17 @@ SWIGINTERN PyObject *_wrap_SShape_setMaterials(PyObject *SWIGUNUSEDPARM(self), P
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_setMaterials" "', argument " "1"" of type '" "SShape *""'"); 
   }
   arg1 = reinterpret_cast< SShape * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTMaterial_std__allocatorTMaterial_t_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_Material_std__allocatorT_Material_t_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SShape_setMaterials" "', argument " "2"" of type '" "std::vector<Material > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SShape_setMaterials" "', argument " "2"" of type '" "std::vector< Material > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SShape_setMaterials" "', argument " "2"" of type '" "std::vector<Material > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SShape_setMaterials" "', argument " "2"" of type '" "std::vector< Material > const &""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<Material > * >(argp2);
+  arg2 = reinterpret_cast< std::vector< Material > * >(argp2);
   {
     try {
-      (arg1)->setMaterials((std::vector<Material > const &)*arg2);
+      (arg1)->setMaterials((std::vector< Material > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -38325,14 +38309,14 @@ fail:
 
 SWIGINTERN PyObject *SShape_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_SShape, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
   PyObject **arg2 = (PyObject **) 0 ;
   swig::PySwigIterator *result = 0 ;
   void *argp1 = 0 ;
@@ -38341,11 +38325,11 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_iterator(PyObject *SWIGUNUSEDPARM
   
   arg2 = &obj0;
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_iterator" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_iterator" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   {
     try {
       result = (swig::PySwigIterator *)std_vector_Sl_ViewShape_Sm__Sg__iterator(arg1,arg2);
@@ -38366,21 +38350,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer___nonzero__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer___nonzero__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___nonzero__" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___nonzero__" "', argument " "1"" of type '" "std::vector< ViewShape * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   {
     try {
-      result = (bool)std_vector_Sl_ViewShape_Sm__Sg____nonzero__((std::vector<ViewShape * > const *)arg1);
+      result = (bool)std_vector_Sl_ViewShape_Sm__Sg____nonzero__((std::vector< ViewShape * > const *)arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -38398,21 +38382,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer___len__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::size_type result;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer___len__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___len__" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___len__" "', argument " "1"" of type '" "std::vector< ViewShape * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   {
     try {
-      result = std_vector_Sl_ViewShape_Sm__Sg____len__((std::vector<ViewShape * > const *)arg1);
+      result = std_vector_Sl_ViewShape_Sm__Sg____len__((std::vector< ViewShape * > const *)arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -38430,22 +38414,22 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::value_type result;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_pop" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_pop" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   {
     try {
       try {
-        result = (std::vector<ViewShape * >::value_type)std_vector_Sl_ViewShape_Sm__Sg__pop(arg1);
+        result = (std::vector< ViewShape * >::value_type)std_vector_Sl_ViewShape_Sm__Sg__pop(arg1);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -38459,7 +38443,7 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_pop(PyObject *SWIGUNUSEDPARM(self
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -38468,10 +38452,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::difference_type arg2 ;
-  std::vector<ViewShape * >::difference_type arg3 ;
-  std::vector<ViewShape *,std::allocator<ViewShape * > > *result = 0 ;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::difference_type arg2 ;
+  std::vector< ViewShape * >::difference_type arg3 ;
+  std::vector< ViewShape *,std::allocator< ViewShape * > > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -38483,25 +38467,25 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer___getslice__(PyObject *SWIGUNUSED
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewShapesContainer___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___getslice__" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___getslice__" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer___getslice__" "', argument " "2"" of type '" "std::vector<ViewShape * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer___getslice__" "', argument " "2"" of type '" "std::vector< ViewShape * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewShape * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< ViewShape * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewShapesContainer___getslice__" "', argument " "3"" of type '" "std::vector<ViewShape * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewShapesContainer___getslice__" "', argument " "3"" of type '" "std::vector< ViewShape * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<ViewShape * >::difference_type >(val3);
+  arg3 = static_cast< std::vector< ViewShape * >::difference_type >(val3);
   {
     try {
       try {
-        result = (std::vector<ViewShape *,std::allocator<ViewShape * > > *)std_vector_Sl_ViewShape_Sm__Sg____getslice__(arg1,arg2,arg3);
+        result = (std::vector< ViewShape *,std::allocator< ViewShape * > > *)std_vector_Sl_ViewShape_Sm__Sg____getslice__(arg1,arg2,arg3);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -38515,7 +38499,7 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer___getslice__(PyObject *SWIGUNUSED
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -38524,10 +38508,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer___setslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::difference_type arg2 ;
-  std::vector<ViewShape * >::difference_type arg3 ;
-  std::vector<ViewShape *,std::allocator<ViewShape * > > *arg4 = 0 ;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::difference_type arg2 ;
+  std::vector< ViewShape * >::difference_type arg3 ;
+  std::vector< ViewShape *,std::allocator< ViewShape * > > *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -38541,36 +38525,36 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer___setslice__(PyObject *SWIGUNUSED
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:ViewShapesContainer___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___setslice__" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___setslice__" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer___setslice__" "', argument " "2"" of type '" "std::vector<ViewShape * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer___setslice__" "', argument " "2"" of type '" "std::vector< ViewShape * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewShape * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< ViewShape * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewShapesContainer___setslice__" "', argument " "3"" of type '" "std::vector<ViewShape * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewShapesContainer___setslice__" "', argument " "3"" of type '" "std::vector< ViewShape * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<ViewShape * >::difference_type >(val3);
+  arg3 = static_cast< std::vector< ViewShape * >::difference_type >(val3);
   {
-    std::vector<ViewShape*,std::allocator<ViewShape * > > *ptr = (std::vector<ViewShape*,std::allocator<ViewShape * > > *)0;
+    std::vector<ViewShape*,std::allocator< ViewShape * > > *ptr = (std::vector<ViewShape*,std::allocator< ViewShape * > > *)0;
     res4 = swig::asptr(obj3, &ptr);
     if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewShapesContainer___setslice__" "', argument " "4"" of type '" "std::vector<ViewShape *,std::allocator<ViewShape * > > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewShapesContainer___setslice__" "', argument " "4"" of type '" "std::vector< ViewShape *,std::allocator< ViewShape * > > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShapesContainer___setslice__" "', argument " "4"" of type '" "std::vector<ViewShape *,std::allocator<ViewShape * > > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShapesContainer___setslice__" "', argument " "4"" of type '" "std::vector< ViewShape *,std::allocator< ViewShape * > > const &""'"); 
     }
     arg4 = ptr;
   }
   {
     try {
       try {
-        std_vector_Sl_ViewShape_Sm__Sg____setslice__(arg1,arg2,arg3,(std::vector<ViewShape *,std::allocator<ViewShape * > > const &)*arg4);
+        std_vector_Sl_ViewShape_Sm__Sg____setslice__(arg1,arg2,arg3,(std::vector< ViewShape *,std::allocator< ViewShape * > > const &)*arg4);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -38598,9 +38582,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer___delslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::difference_type arg2 ;
-  std::vector<ViewShape * >::difference_type arg3 ;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::difference_type arg2 ;
+  std::vector< ViewShape * >::difference_type arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -38612,21 +38596,21 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer___delslice__(PyObject *SWIGUNUSED
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewShapesContainer___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___delslice__" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___delslice__" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer___delslice__" "', argument " "2"" of type '" "std::vector<ViewShape * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer___delslice__" "', argument " "2"" of type '" "std::vector< ViewShape * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewShape * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< ViewShape * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewShapesContainer___delslice__" "', argument " "3"" of type '" "std::vector<ViewShape * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewShapesContainer___delslice__" "', argument " "3"" of type '" "std::vector< ViewShape * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<ViewShape * >::difference_type >(val3);
+  arg3 = static_cast< std::vector< ViewShape * >::difference_type >(val3);
   {
     try {
       try {
@@ -38653,8 +38637,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer___delitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::difference_type arg2 ;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::difference_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -38663,16 +38647,16 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer___delitem__(PyObject *SWIGUNUSEDP
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewShapesContainer___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___delitem__" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___delitem__" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer___delitem__" "', argument " "2"" of type '" "std::vector<ViewShape * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer___delitem__" "', argument " "2"" of type '" "std::vector< ViewShape * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewShape * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< ViewShape * >::difference_type >(val2);
   {
     try {
       try {
@@ -38699,9 +38683,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer___getitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::difference_type arg2 ;
-  std::vector<ViewShape * >::value_type result;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::difference_type arg2 ;
+  std::vector< ViewShape * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -38710,20 +38694,20 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer___getitem__(PyObject *SWIGUNUSEDP
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewShapesContainer___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___getitem__" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___getitem__" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer___getitem__" "', argument " "2"" of type '" "std::vector<ViewShape * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer___getitem__" "', argument " "2"" of type '" "std::vector< ViewShape * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewShape * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< ViewShape * >::difference_type >(val2);
   {
     try {
       try {
-        result = (std::vector<ViewShape * >::value_type)std_vector_Sl_ViewShape_Sm__Sg____getitem__(arg1,arg2);
+        result = (std::vector< ViewShape * >::value_type)std_vector_Sl_ViewShape_Sm__Sg____getitem__(arg1,arg2);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -38737,7 +38721,7 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer___getitem__(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -38746,9 +38730,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer___setitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::difference_type arg2 ;
-  std::vector<ViewShape * >::value_type arg3 = (std::vector<ViewShape * >::value_type) 0 ;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::difference_type arg2 ;
+  std::vector< ViewShape * >::value_type arg3 = (std::vector< ViewShape * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -38760,21 +38744,21 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer___setitem__(PyObject *SWIGUNUSEDP
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewShapesContainer___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___setitem__" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer___setitem__" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer___setitem__" "', argument " "2"" of type '" "std::vector<ViewShape * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer___setitem__" "', argument " "2"" of type '" "std::vector< ViewShape * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewShape * >::difference_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector< ViewShape * >::difference_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewShapesContainer___setitem__" "', argument " "3"" of type '" "std::vector<ViewShape * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewShapesContainer___setitem__" "', argument " "3"" of type '" "std::vector< ViewShape * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<ViewShape * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< ViewShape * >::value_type >(argp3);
   {
     try {
       try {
@@ -38801,8 +38785,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::value_type arg2 = (std::vector<ViewShape * >::value_type) 0 ;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::value_type arg2 = (std::vector< ViewShape * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -38811,16 +38795,16 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_append(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewShapesContainer_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_append" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_append" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShapesContainer_append" "', argument " "2"" of type '" "std::vector<ViewShape * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShapesContainer_append" "', argument " "2"" of type '" "std::vector< ViewShape * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<ViewShape * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector< ViewShape * >::value_type >(argp2);
   {
     try {
       std_vector_Sl_ViewShape_Sm__Sg__append(arg1,arg2);
@@ -38841,12 +38825,12 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_ViewShapesContainer__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *result = 0 ;
+  std::vector< ViewShape * > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_ViewShapesContainer")) SWIG_fail;
   {
     try {
-      result = (std::vector<ViewShape * > *)new std::vector<ViewShape * >();
+      result = (std::vector< ViewShape * > *)new std::vector< ViewShape * >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -38855,7 +38839,7 @@ SWIGINTERN PyObject *_wrap_new_ViewShapesContainer__SWIG_0(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -38864,26 +38848,26 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_ViewShapesContainer__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = 0 ;
-  std::vector<ViewShape * > *result = 0 ;
+  std::vector< ViewShape * > *arg1 = 0 ;
+  std::vector< ViewShape * > *result = 0 ;
   int res1 = SWIG_OLDOBJ ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_ViewShapesContainer",&obj0)) SWIG_fail;
   {
-    std::vector<ViewShape*,std::allocator<ViewShape * > > *ptr = (std::vector<ViewShape*,std::allocator<ViewShape * > > *)0;
+    std::vector<ViewShape*,std::allocator< ViewShape * > > *ptr = (std::vector<ViewShape*,std::allocator< ViewShape * > > *)0;
     res1 = swig::asptr(obj0, &ptr);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ViewShapesContainer" "', argument " "1"" of type '" "std::vector<ViewShape * > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ViewShapesContainer" "', argument " "1"" of type '" "std::vector< ViewShape * > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ViewShapesContainer" "', argument " "1"" of type '" "std::vector<ViewShape * > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ViewShapesContainer" "', argument " "1"" of type '" "std::vector< ViewShape * > const &""'"); 
     }
     arg1 = ptr;
   }
   {
     try {
-      result = (std::vector<ViewShape * > *)new std::vector<ViewShape * >((std::vector<ViewShape * > const &)*arg1);
+      result = (std::vector< ViewShape * > *)new std::vector< ViewShape * >((std::vector< ViewShape * > const &)*arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -38892,7 +38876,7 @@ SWIGINTERN PyObject *_wrap_new_ViewShapesContainer__SWIG_1(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, SWIG_POINTER_NEW |  0 );
   if (SWIG_IsNewObj(res1)) delete arg1;
   return resultobj;
 fail:
@@ -38903,21 +38887,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_empty",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_empty" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_empty" "', argument " "1"" of type '" "std::vector< ViewShape * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   {
     try {
-      result = (bool)((std::vector<ViewShape * > const *)arg1)->empty();
+      result = (bool)((std::vector< ViewShape * > const *)arg1)->empty();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -38935,21 +38919,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::size_type result;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_size" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_size" "', argument " "1"" of type '" "std::vector< ViewShape * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   {
     try {
-      result = ((std::vector<ViewShape * > const *)arg1)->size();
+      result = ((std::vector< ViewShape * > const *)arg1)->size();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -38967,17 +38951,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_clear" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_clear" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   {
     try {
       (arg1)->clear();
@@ -38998,8 +38982,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * > *arg2 = 0 ;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -39008,19 +38992,19 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_swap(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewShapesContainer_swap",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_swap" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_swap" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t,  0 );
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShapesContainer_swap" "', argument " "2"" of type '" "std::vector<ViewShape * > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShapesContainer_swap" "', argument " "2"" of type '" "std::vector< ViewShape * > &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShapesContainer_swap" "', argument " "2"" of type '" "std::vector<ViewShape * > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShapesContainer_swap" "', argument " "2"" of type '" "std::vector< ViewShape * > &""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<ViewShape * > * >(argp2);
+  arg2 = reinterpret_cast< std::vector< ViewShape * > * >(argp2);
   {
     try {
       (arg1)->swap(*arg2);
@@ -39041,21 +39025,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  SwigValueWrapper<std::allocator<ViewShape * > > result;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  SwigValueWrapper< std::allocator< ViewShape * > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_get_allocator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_get_allocator" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_get_allocator" "', argument " "1"" of type '" "std::vector< ViewShape * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   {
     try {
-      result = ((std::vector<ViewShape * > const *)arg1)->get_allocator();
+      result = ((std::vector< ViewShape * > const *)arg1)->get_allocator();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -39064,30 +39048,30 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_get_allocator(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new std::vector<ViewShape * >::allocator_type(static_cast< const std::vector<ViewShape * >::allocator_type& >(result))), SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new std::vector< ViewShape * >::allocator_type(static_cast< const std::vector< ViewShape * >::allocator_type& >(result))), SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShapesContainer_begin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::iterator result;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::const_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_begin" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_begin" "', argument " "1"" of type '" "std::vector< ViewShape * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   {
     try {
-      result = (arg1)->begin();
+      result = ((std::vector< ViewShape * > const *)arg1)->begin();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -39096,7 +39080,7 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_begin__SWIG_0(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewShape * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewShape * >::const_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -39104,89 +39088,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShapesContainer_begin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::const_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_begin" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<ViewShape * > const *)arg1)->begin();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewShape * >::const_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ViewShapesContainer_begin(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewShapesContainer_begin__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewShapesContainer_begin__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewShapesContainer_begin'.\n  Possible C/C++ prototypes are:\n    begin()\n    begin()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ViewShapesContainer_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::iterator result;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::const_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_end" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_end" "', argument " "1"" of type '" "std::vector< ViewShape * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   {
     try {
-      result = (arg1)->end();
+      result = ((std::vector< ViewShape * > const *)arg1)->end();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -39195,7 +39113,7 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_end__SWIG_0(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewShape * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewShape * >::const_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -39203,89 +39121,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShapesContainer_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_rbegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::const_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_end" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<ViewShape * > const *)arg1)->end();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewShape * >::const_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ViewShapesContainer_end(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewShapesContainer_end__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewShapesContainer_end__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewShapesContainer_end'.\n  Possible C/C++ prototypes are:\n    end()\n    end()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ViewShapesContainer_rbegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::reverse_iterator result;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::const_reverse_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_rbegin" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_rbegin" "', argument " "1"" of type '" "std::vector< ViewShape * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   {
     try {
-      result = (arg1)->rbegin();
+      result = ((std::vector< ViewShape * > const *)arg1)->rbegin();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -39294,7 +39146,7 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_rbegin__SWIG_0(PyObject *SWIGUNUS
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewShape * >::reverse_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewShape * >::const_reverse_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -39302,89 +39154,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShapesContainer_rbegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewShapesContainer_rend(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::const_reverse_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_rbegin" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<ViewShape * > const *)arg1)->rbegin();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewShape * >::const_reverse_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ViewShapesContainer_rbegin(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewShapesContainer_rbegin__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewShapesContainer_rbegin__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewShapesContainer_rbegin'.\n  Possible C/C++ prototypes are:\n    rbegin()\n    rbegin()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ViewShapesContainer_rend__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::reverse_iterator result;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::const_reverse_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_rend" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_rend" "', argument " "1"" of type '" "std::vector< ViewShape * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   {
     try {
-      result = (arg1)->rend();
+      result = ((std::vector< ViewShape * > const *)arg1)->rend();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -39393,7 +39179,7 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_rend__SWIG_0(PyObject *SWIGUNUSED
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewShape * >::reverse_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewShape * >::const_reverse_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -39401,76 +39187,10 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShapesContainer_rend__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::const_reverse_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_rend" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<ViewShape * > const *)arg1)->rend();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewShape * >::const_reverse_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ViewShapesContainer_rend(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewShapesContainer_rend__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewShapesContainer_rend__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewShapesContainer_rend'.\n  Possible C/C++ prototypes are:\n    rend()\n    rend()\n");
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_new_ViewShapesContainer__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * >::size_type arg1 ;
-  std::vector<ViewShape * > *result = 0 ;
+  std::vector< ViewShape * >::size_type arg1 ;
+  std::vector< ViewShape * > *result = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -39478,12 +39198,12 @@ SWIGINTERN PyObject *_wrap_new_ViewShapesContainer__SWIG_2(PyObject *SWIGUNUSEDP
   if (!PyArg_ParseTuple(args,(char *)"O:new_ViewShapesContainer",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ViewShapesContainer" "', argument " "1"" of type '" "std::vector<ViewShape * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ViewShapesContainer" "', argument " "1"" of type '" "std::vector< ViewShape * >::size_type""'");
   } 
-  arg1 = static_cast< std::vector<ViewShape * >::size_type >(val1);
+  arg1 = static_cast< std::vector< ViewShape * >::size_type >(val1);
   {
     try {
-      result = (std::vector<ViewShape * > *)new std::vector<ViewShape * >(arg1);
+      result = (std::vector< ViewShape * > *)new std::vector< ViewShape * >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -39492,7 +39212,7 @@ SWIGINTERN PyObject *_wrap_new_ViewShapesContainer__SWIG_2(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -39501,17 +39221,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_pop_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_pop_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_pop_back" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_pop_back" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   {
     try {
       (arg1)->pop_back();
@@ -39532,8 +39252,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::size_type arg2 ;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::size_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -39542,16 +39262,16 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_resize__SWIG_0(PyObject *SWIGUNUS
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewShapesContainer_resize",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_resize" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_resize" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer_resize" "', argument " "2"" of type '" "std::vector<ViewShape * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer_resize" "', argument " "2"" of type '" "std::vector< ViewShape * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewShape * >::size_type >(val2);
+  arg2 = static_cast< std::vector< ViewShape * >::size_type >(val2);
   {
     try {
       (arg1)->resize(arg2);
@@ -39572,9 +39292,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::iterator arg2 ;
-  std::vector<ViewShape * >::iterator result;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::iterator arg2 ;
+  std::vector< ViewShape * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -39583,20 +39303,20 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_erase__SWIG_0(PyObject *SWIGUNUSE
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewShapesContainer_erase",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_erase" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_erase" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewShape * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_erase" "', argument " "2"" of type '" "std::vector< ViewShape * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< ViewShape * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< ViewShape * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewShape * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_erase" "', argument " "2"" of type '" "std::vector< ViewShape * >::iterator""'");
     }
   }
   {
@@ -39610,7 +39330,7 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_erase__SWIG_0(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewShape * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewShape * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -39620,10 +39340,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::iterator arg2 ;
-  std::vector<ViewShape * >::iterator arg3 ;
-  std::vector<ViewShape * >::iterator result;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::iterator arg2 ;
+  std::vector< ViewShape * >::iterator arg3 ;
+  std::vector< ViewShape * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -39635,31 +39355,31 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_erase__SWIG_1(PyObject *SWIGUNUSE
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewShapesContainer_erase",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_erase" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_erase" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewShape * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_erase" "', argument " "2"" of type '" "std::vector< ViewShape * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< ViewShape * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< ViewShape * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewShape * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_erase" "', argument " "2"" of type '" "std::vector< ViewShape * >::iterator""'");
     }
   }
   res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res3) || !iter3) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_erase" "', argument " "3"" of type '" "std::vector<ViewShape * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_erase" "', argument " "3"" of type '" "std::vector< ViewShape * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *>(iter3);
+    swig::PySwigIterator_T<std::vector< ViewShape * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< ViewShape * >::iterator > *>(iter3);
     if (iter_t) {
       arg3 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_erase" "', argument " "3"" of type '" "std::vector<ViewShape * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_erase" "', argument " "3"" of type '" "std::vector< ViewShape * >::iterator""'");
     }
   }
   {
@@ -39673,7 +39393,7 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_erase__SWIG_1(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewShape * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewShape * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -39687,18 +39407,18 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_erase(PyObject *self, PyObject *a
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator< ViewShape * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< ViewShape * >::iterator > *>(iter) != 0));
       if (_v) {
         return _wrap_ViewShapesContainer_erase__SWIG_0(self, args);
       }
@@ -39706,16 +39426,16 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_erase(PyObject *self, PyObject *a
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator< ViewShape * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< ViewShape * >::iterator > *>(iter) != 0));
       if (_v) {
         swig::PySwigIterator *iter = 0;
         int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *>(iter) != 0));
+        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< ViewShape * >::iterator > *>(iter) != 0));
         if (_v) {
           return _wrap_ViewShapesContainer_erase__SWIG_1(self, args);
         }
@@ -39724,16 +39444,19 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_erase(PyObject *self, PyObject *a
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewShapesContainer_erase'.\n  Possible C/C++ prototypes are:\n    erase(std::vector<ViewShape * >::iterator)\n    erase(std::vector<ViewShape * >::iterator,std::vector<ViewShape * >::iterator)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewShapesContainer_erase'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    erase(std::vector< ViewShape * > *,std::vector< ViewShape * >::iterator)\n"
+    "    erase(std::vector< ViewShape * > *,std::vector< ViewShape * >::iterator,std::vector< ViewShape * >::iterator)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_new_ViewShapesContainer__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * >::size_type arg1 ;
-  std::vector<ViewShape * >::value_type arg2 = (std::vector<ViewShape * >::value_type) 0 ;
-  std::vector<ViewShape * > *result = 0 ;
+  std::vector< ViewShape * >::size_type arg1 ;
+  std::vector< ViewShape * >::value_type arg2 = (std::vector< ViewShape * >::value_type) 0 ;
+  std::vector< ViewShape * > *result = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   void *argp2 = 0 ;
@@ -39744,17 +39467,17 @@ SWIGINTERN PyObject *_wrap_new_ViewShapesContainer__SWIG_3(PyObject *SWIGUNUSEDP
   if (!PyArg_ParseTuple(args,(char *)"OO:new_ViewShapesContainer",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ViewShapesContainer" "', argument " "1"" of type '" "std::vector<ViewShape * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ViewShapesContainer" "', argument " "1"" of type '" "std::vector< ViewShape * >::size_type""'");
   } 
-  arg1 = static_cast< std::vector<ViewShape * >::size_type >(val1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
+  arg1 = static_cast< std::vector< ViewShape * >::size_type >(val1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ViewShapesContainer" "', argument " "2"" of type '" "std::vector<ViewShape * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ViewShapesContainer" "', argument " "2"" of type '" "std::vector< ViewShape * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<ViewShape * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector< ViewShape * >::value_type >(argp2);
   {
     try {
-      result = (std::vector<ViewShape * > *)new std::vector<ViewShape * >(arg1,arg2);
+      result = (std::vector< ViewShape * > *)new std::vector< ViewShape * >(arg1,arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -39763,7 +39486,7 @@ SWIGINTERN PyObject *_wrap_new_ViewShapesContainer__SWIG_3(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -39776,7 +39499,7 @@ SWIGINTERN PyObject *_wrap_new_ViewShapesContainer(PyObject *self, PyObject *arg
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -39795,7 +39518,7 @@ SWIGINTERN PyObject *_wrap_new_ViewShapesContainer(PyObject *self, PyObject *arg
   }
   if (argc == 1) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator< ViewShape * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_new_ViewShapesContainer__SWIG_1(self, args);
@@ -39809,7 +39532,7 @@ SWIGINTERN PyObject *_wrap_new_ViewShapesContainer(PyObject *self, PyObject *arg
     }
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_new_ViewShapesContainer__SWIG_3(self, args);
@@ -39818,15 +39541,20 @@ SWIGINTERN PyObject *_wrap_new_ViewShapesContainer(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewShapesContainer'.\n  Possible C/C++ prototypes are:\n    std::vector<(p.ViewShape)>()\n    std::vector<(p.ViewShape)>(std::vector<ViewShape * > const &)\n    std::vector<(p.ViewShape)>(std::vector<ViewShape * >::size_type)\n    std::vector<(p.ViewShape)>(std::vector<ViewShape * >::size_type,std::vector<ViewShape * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewShapesContainer'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    std::vector< ViewShape * >()\n"
+    "    std::vector< ViewShape * >(std::vector< ViewShape * > const &)\n"
+    "    std::vector< ViewShape * >(std::vector< ViewShape * >::size_type)\n"
+    "    std::vector< ViewShape * >(std::vector< ViewShape * >::size_type,std::vector< ViewShape * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_push_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::value_type arg2 = (std::vector<ViewShape * >::value_type) 0 ;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::value_type arg2 = (std::vector< ViewShape * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -39835,16 +39563,16 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_push_back(PyObject *SWIGUNUSEDPAR
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewShapesContainer_push_back",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_push_back" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_push_back" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShapesContainer_push_back" "', argument " "2"" of type '" "std::vector<ViewShape * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShapesContainer_push_back" "', argument " "2"" of type '" "std::vector< ViewShape * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<ViewShape * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector< ViewShape * >::value_type >(argp2);
   {
     try {
       (arg1)->push_back(arg2);
@@ -39865,21 +39593,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_front(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::value_type result;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_front",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_front" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_front" "', argument " "1"" of type '" "std::vector< ViewShape * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   {
     try {
-      result = (std::vector<ViewShape * >::value_type)((std::vector<ViewShape * > const *)arg1)->front();
+      result = (std::vector< ViewShape * >::value_type)((std::vector< ViewShape * > const *)arg1)->front();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -39888,7 +39616,7 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_front(PyObject *SWIGUNUSEDPARM(se
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -39897,21 +39625,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::value_type result;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_back" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_back" "', argument " "1"" of type '" "std::vector< ViewShape * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   {
     try {
-      result = (std::vector<ViewShape * >::value_type)((std::vector<ViewShape * > const *)arg1)->back();
+      result = (std::vector< ViewShape * >::value_type)((std::vector< ViewShape * > const *)arg1)->back();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -39920,7 +39648,7 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_back(PyObject *SWIGUNUSEDPARM(sel
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -39929,9 +39657,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_assign(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::size_type arg2 ;
-  std::vector<ViewShape * >::value_type arg3 = (std::vector<ViewShape * >::value_type) 0 ;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::size_type arg2 ;
+  std::vector< ViewShape * >::value_type arg3 = (std::vector< ViewShape * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -39943,21 +39671,21 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_assign(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewShapesContainer_assign",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_assign" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_assign" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer_assign" "', argument " "2"" of type '" "std::vector<ViewShape * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer_assign" "', argument " "2"" of type '" "std::vector< ViewShape * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewShape * >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector< ViewShape * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewShapesContainer_assign" "', argument " "3"" of type '" "std::vector<ViewShape * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewShapesContainer_assign" "', argument " "3"" of type '" "std::vector< ViewShape * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<ViewShape * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< ViewShape * >::value_type >(argp3);
   {
     try {
       (arg1)->assign(arg2,arg3);
@@ -39978,9 +39706,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::size_type arg2 ;
-  std::vector<ViewShape * >::value_type arg3 = (std::vector<ViewShape * >::value_type) 0 ;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::size_type arg2 ;
+  std::vector< ViewShape * >::value_type arg3 = (std::vector< ViewShape * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -39992,21 +39720,21 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_resize__SWIG_1(PyObject *SWIGUNUS
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewShapesContainer_resize",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_resize" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_resize" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer_resize" "', argument " "2"" of type '" "std::vector<ViewShape * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer_resize" "', argument " "2"" of type '" "std::vector< ViewShape * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewShape * >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector< ViewShape * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewShapesContainer_resize" "', argument " "3"" of type '" "std::vector<ViewShape * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewShapesContainer_resize" "', argument " "3"" of type '" "std::vector< ViewShape * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<ViewShape * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< ViewShape * >::value_type >(argp3);
   {
     try {
       (arg1)->resize(arg2,arg3);
@@ -40031,13 +39759,13 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_resize(PyObject *self, PyObject *
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator< ViewShape * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -40051,7 +39779,7 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_resize(PyObject *self, PyObject *
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator< ViewShape * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -40060,7 +39788,7 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_resize(PyObject *self, PyObject *
       }
       if (_v) {
         void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0);
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           return _wrap_ViewShapesContainer_resize__SWIG_1(self, args);
@@ -40070,17 +39798,20 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_resize(PyObject *self, PyObject *
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewShapesContainer_resize'.\n  Possible C/C++ prototypes are:\n    resize(std::vector<ViewShape * >::size_type)\n    resize(std::vector<ViewShape * >::size_type,std::vector<ViewShape * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewShapesContainer_resize'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    resize(std::vector< ViewShape * > *,std::vector< ViewShape * >::size_type)\n"
+    "    resize(std::vector< ViewShape * > *,std::vector< ViewShape * >::size_type,std::vector< ViewShape * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::iterator arg2 ;
-  std::vector<ViewShape * >::value_type arg3 = (std::vector<ViewShape * >::value_type) 0 ;
-  std::vector<ViewShape * >::iterator result;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::iterator arg2 ;
+  std::vector< ViewShape * >::value_type arg3 = (std::vector< ViewShape * >::value_type) 0 ;
+  std::vector< ViewShape * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -40092,27 +39823,27 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_insert__SWIG_0(PyObject *SWIGUNUS
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewShapesContainer_insert",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_insert" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_insert" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewShape * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_insert" "', argument " "2"" of type '" "std::vector< ViewShape * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< ViewShape * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< ViewShape * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewShape * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_insert" "', argument " "2"" of type '" "std::vector< ViewShape * >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewShapesContainer_insert" "', argument " "3"" of type '" "std::vector<ViewShape * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewShapesContainer_insert" "', argument " "3"" of type '" "std::vector< ViewShape * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<ViewShape * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< ViewShape * >::value_type >(argp3);
   {
     try {
       result = (arg1)->insert(arg2,arg3);
@@ -40124,7 +39855,7 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_insert__SWIG_0(PyObject *SWIGUNUS
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewShape * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewShape * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -40134,10 +39865,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::iterator arg2 ;
-  std::vector<ViewShape * >::size_type arg3 ;
-  std::vector<ViewShape * >::value_type arg4 = (std::vector<ViewShape * >::value_type) 0 ;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::iterator arg2 ;
+  std::vector< ViewShape * >::size_type arg3 ;
+  std::vector< ViewShape * >::value_type arg4 = (std::vector< ViewShape * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -40152,32 +39883,32 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_insert__SWIG_1(PyObject *SWIGUNUS
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:ViewShapesContainer_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_insert" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_insert" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewShape * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_insert" "', argument " "2"" of type '" "std::vector< ViewShape * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< ViewShape * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< ViewShape * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewShape * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewShapesContainer_insert" "', argument " "2"" of type '" "std::vector< ViewShape * >::iterator""'");
     }
   }
   ecode3 = SWIG_AsVal_size_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewShapesContainer_insert" "', argument " "3"" of type '" "std::vector<ViewShape * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewShapesContainer_insert" "', argument " "3"" of type '" "std::vector< ViewShape * >::size_type""'");
   } 
-  arg3 = static_cast< std::vector<ViewShape * >::size_type >(val3);
-  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0 |  0 );
+  arg3 = static_cast< std::vector< ViewShape * >::size_type >(val3);
+  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewShapesContainer_insert" "', argument " "4"" of type '" "std::vector<ViewShape * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewShapesContainer_insert" "', argument " "4"" of type '" "std::vector< ViewShape * >::value_type""'"); 
   }
-  arg4 = reinterpret_cast< std::vector<ViewShape * >::value_type >(argp4);
+  arg4 = reinterpret_cast< std::vector< ViewShape * >::value_type >(argp4);
   {
     try {
       (arg1)->insert(arg2,arg3,arg4);
@@ -40202,21 +39933,21 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_insert(PyObject *self, PyObject *
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator< ViewShape * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< ViewShape * >::iterator > *>(iter) != 0));
       if (_v) {
         void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0);
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           return _wrap_ViewShapesContainer_insert__SWIG_0(self, args);
@@ -40226,12 +39957,12 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_insert(PyObject *self, PyObject *
   }
   if (argc == 4) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator<ViewShape * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewShape*,std::allocator< ViewShape * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewShape * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< ViewShape * >::iterator > *>(iter) != 0));
       if (_v) {
         {
           int res = SWIG_AsVal_size_t(argv[2], NULL);
@@ -40239,7 +39970,7 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_insert(PyObject *self, PyObject *
         }
         if (_v) {
           void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0);
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0);
           _v = SWIG_CheckState(res);
           if (_v) {
             return _wrap_ViewShapesContainer_insert__SWIG_1(self, args);
@@ -40250,15 +39981,18 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_insert(PyObject *self, PyObject *
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewShapesContainer_insert'.\n  Possible C/C++ prototypes are:\n    insert(std::vector<ViewShape * >::iterator,std::vector<ViewShape * >::value_type)\n    insert(std::vector<ViewShape * >::iterator,std::vector<ViewShape * >::size_type,std::vector<ViewShape * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewShapesContainer_insert'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    insert(std::vector< ViewShape * > *,std::vector< ViewShape * >::iterator,std::vector< ViewShape * >::value_type)\n"
+    "    insert(std::vector< ViewShape * > *,std::vector< ViewShape * >::iterator,std::vector< ViewShape * >::size_type,std::vector< ViewShape * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_reserve(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::size_type arg2 ;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::size_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -40267,16 +40001,16 @@ SWIGINTERN PyObject *_wrap_ViewShapesContainer_reserve(PyObject *SWIGUNUSEDPARM(
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewShapesContainer_reserve",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_reserve" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_reserve" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer_reserve" "', argument " "2"" of type '" "std::vector<ViewShape * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewShapesContainer_reserve" "', argument " "2"" of type '" "std::vector< ViewShape * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewShape * >::size_type >(val2);
+  arg2 = static_cast< std::vector< ViewShape * >::size_type >(val2);
   {
     try {
       (arg1)->reserve(arg2);
@@ -40297,21 +40031,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewShapesContainer_capacity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
-  std::vector<ViewShape * >::size_type result;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
+  std::vector< ViewShape * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewShapesContainer_capacity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_capacity" "', argument " "1"" of type '" "std::vector<ViewShape * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewShapesContainer_capacity" "', argument " "1"" of type '" "std::vector< ViewShape * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   {
     try {
-      result = ((std::vector<ViewShape * > const *)arg1)->capacity();
+      result = ((std::vector< ViewShape * > const *)arg1)->capacity();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -40329,17 +40063,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_ViewShapesContainer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewShape * > *arg1 = (std::vector<ViewShape * > *) 0 ;
+  std::vector< ViewShape * > *arg1 = (std::vector< ViewShape * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_ViewShapesContainer",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ViewShapesContainer" "', argument " "1"" of type '" "std::vector<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ViewShapesContainer" "', argument " "1"" of type '" "std::vector< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewShape * > * >(argp1);
   {
     try {
       delete arg1;
@@ -40361,14 +40095,14 @@ fail:
 
 SWIGINTERN PyObject *ViewShapesContainer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
   PyObject **arg2 = (PyObject **) 0 ;
   swig::PySwigIterator *result = 0 ;
   void *argp1 = 0 ;
@@ -40377,11 +40111,11 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_iterator(PyObject *SWIGUNUSEDPARM(
   
   arg2 = &obj0;
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_iterator" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_iterator" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   {
     try {
       result = (swig::PySwigIterator *)std_vector_Sl_ViewEdge_Sm__Sg__iterator(arg1,arg2);
@@ -40402,21 +40136,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer___nonzero__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer___nonzero__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___nonzero__" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___nonzero__" "', argument " "1"" of type '" "std::vector< ViewEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   {
     try {
-      result = (bool)std_vector_Sl_ViewEdge_Sm__Sg____nonzero__((std::vector<ViewEdge * > const *)arg1);
+      result = (bool)std_vector_Sl_ViewEdge_Sm__Sg____nonzero__((std::vector< ViewEdge * > const *)arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -40434,21 +40168,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer___len__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::size_type result;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer___len__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___len__" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___len__" "', argument " "1"" of type '" "std::vector< ViewEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   {
     try {
-      result = std_vector_Sl_ViewEdge_Sm__Sg____len__((std::vector<ViewEdge * > const *)arg1);
+      result = std_vector_Sl_ViewEdge_Sm__Sg____len__((std::vector< ViewEdge * > const *)arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -40466,22 +40200,22 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::value_type result;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_pop" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_pop" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   {
     try {
       try {
-        result = (std::vector<ViewEdge * >::value_type)std_vector_Sl_ViewEdge_Sm__Sg__pop(arg1);
+        result = (std::vector< ViewEdge * >::value_type)std_vector_Sl_ViewEdge_Sm__Sg__pop(arg1);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -40495,7 +40229,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_pop(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -40504,10 +40238,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::difference_type arg2 ;
-  std::vector<ViewEdge * >::difference_type arg3 ;
-  std::vector<ViewEdge *,std::allocator<ViewEdge * > > *result = 0 ;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::difference_type arg2 ;
+  std::vector< ViewEdge * >::difference_type arg3 ;
+  std::vector< ViewEdge *,std::allocator< ViewEdge * > > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -40519,25 +40253,25 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer___getslice__(PyObject *SWIGUNUSEDP
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewEdgesContainer___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___getslice__" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___getslice__" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer___getslice__" "', argument " "2"" of type '" "std::vector<ViewEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer___getslice__" "', argument " "2"" of type '" "std::vector< ViewEdge * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewEdge * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< ViewEdge * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewEdgesContainer___getslice__" "', argument " "3"" of type '" "std::vector<ViewEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewEdgesContainer___getslice__" "', argument " "3"" of type '" "std::vector< ViewEdge * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<ViewEdge * >::difference_type >(val3);
+  arg3 = static_cast< std::vector< ViewEdge * >::difference_type >(val3);
   {
     try {
       try {
-        result = (std::vector<ViewEdge *,std::allocator<ViewEdge * > > *)std_vector_Sl_ViewEdge_Sm__Sg____getslice__(arg1,arg2,arg3);
+        result = (std::vector< ViewEdge *,std::allocator< ViewEdge * > > *)std_vector_Sl_ViewEdge_Sm__Sg____getslice__(arg1,arg2,arg3);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -40551,7 +40285,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer___getslice__(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -40560,10 +40294,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer___setslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::difference_type arg2 ;
-  std::vector<ViewEdge * >::difference_type arg3 ;
-  std::vector<ViewEdge *,std::allocator<ViewEdge * > > *arg4 = 0 ;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::difference_type arg2 ;
+  std::vector< ViewEdge * >::difference_type arg3 ;
+  std::vector< ViewEdge *,std::allocator< ViewEdge * > > *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -40577,36 +40311,36 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer___setslice__(PyObject *SWIGUNUSEDP
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:ViewEdgesContainer___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___setslice__" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___setslice__" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer___setslice__" "', argument " "2"" of type '" "std::vector<ViewEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer___setslice__" "', argument " "2"" of type '" "std::vector< ViewEdge * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewEdge * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< ViewEdge * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewEdgesContainer___setslice__" "', argument " "3"" of type '" "std::vector<ViewEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewEdgesContainer___setslice__" "', argument " "3"" of type '" "std::vector< ViewEdge * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<ViewEdge * >::difference_type >(val3);
+  arg3 = static_cast< std::vector< ViewEdge * >::difference_type >(val3);
   {
-    std::vector<ViewEdge*,std::allocator<ViewEdge * > > *ptr = (std::vector<ViewEdge*,std::allocator<ViewEdge * > > *)0;
+    std::vector<ViewEdge*,std::allocator< ViewEdge * > > *ptr = (std::vector<ViewEdge*,std::allocator< ViewEdge * > > *)0;
     res4 = swig::asptr(obj3, &ptr);
     if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewEdgesContainer___setslice__" "', argument " "4"" of type '" "std::vector<ViewEdge *,std::allocator<ViewEdge * > > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewEdgesContainer___setslice__" "', argument " "4"" of type '" "std::vector< ViewEdge *,std::allocator< ViewEdge * > > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgesContainer___setslice__" "', argument " "4"" of type '" "std::vector<ViewEdge *,std::allocator<ViewEdge * > > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgesContainer___setslice__" "', argument " "4"" of type '" "std::vector< ViewEdge *,std::allocator< ViewEdge * > > const &""'"); 
     }
     arg4 = ptr;
   }
   {
     try {
       try {
-        std_vector_Sl_ViewEdge_Sm__Sg____setslice__(arg1,arg2,arg3,(std::vector<ViewEdge *,std::allocator<ViewEdge * > > const &)*arg4);
+        std_vector_Sl_ViewEdge_Sm__Sg____setslice__(arg1,arg2,arg3,(std::vector< ViewEdge *,std::allocator< ViewEdge * > > const &)*arg4);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -40634,9 +40368,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer___delslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::difference_type arg2 ;
-  std::vector<ViewEdge * >::difference_type arg3 ;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::difference_type arg2 ;
+  std::vector< ViewEdge * >::difference_type arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -40648,21 +40382,21 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer___delslice__(PyObject *SWIGUNUSEDP
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewEdgesContainer___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___delslice__" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___delslice__" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer___delslice__" "', argument " "2"" of type '" "std::vector<ViewEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer___delslice__" "', argument " "2"" of type '" "std::vector< ViewEdge * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewEdge * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< ViewEdge * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewEdgesContainer___delslice__" "', argument " "3"" of type '" "std::vector<ViewEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewEdgesContainer___delslice__" "', argument " "3"" of type '" "std::vector< ViewEdge * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<ViewEdge * >::difference_type >(val3);
+  arg3 = static_cast< std::vector< ViewEdge * >::difference_type >(val3);
   {
     try {
       try {
@@ -40689,8 +40423,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer___delitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::difference_type arg2 ;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::difference_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -40699,16 +40433,16 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer___delitem__(PyObject *SWIGUNUSEDPA
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgesContainer___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___delitem__" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___delitem__" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer___delitem__" "', argument " "2"" of type '" "std::vector<ViewEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer___delitem__" "', argument " "2"" of type '" "std::vector< ViewEdge * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewEdge * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< ViewEdge * >::difference_type >(val2);
   {
     try {
       try {
@@ -40735,9 +40469,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer___getitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::difference_type arg2 ;
-  std::vector<ViewEdge * >::value_type result;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::difference_type arg2 ;
+  std::vector< ViewEdge * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -40746,20 +40480,20 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer___getitem__(PyObject *SWIGUNUSEDPA
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgesContainer___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___getitem__" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___getitem__" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer___getitem__" "', argument " "2"" of type '" "std::vector<ViewEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer___getitem__" "', argument " "2"" of type '" "std::vector< ViewEdge * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewEdge * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< ViewEdge * >::difference_type >(val2);
   {
     try {
       try {
-        result = (std::vector<ViewEdge * >::value_type)std_vector_Sl_ViewEdge_Sm__Sg____getitem__(arg1,arg2);
+        result = (std::vector< ViewEdge * >::value_type)std_vector_Sl_ViewEdge_Sm__Sg____getitem__(arg1,arg2);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -40773,7 +40507,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer___getitem__(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -40782,9 +40516,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer___setitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::difference_type arg2 ;
-  std::vector<ViewEdge * >::value_type arg3 = (std::vector<ViewEdge * >::value_type) 0 ;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::difference_type arg2 ;
+  std::vector< ViewEdge * >::value_type arg3 = (std::vector< ViewEdge * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -40796,21 +40530,21 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer___setitem__(PyObject *SWIGUNUSEDPA
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewEdgesContainer___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___setitem__" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer___setitem__" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer___setitem__" "', argument " "2"" of type '" "std::vector<ViewEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer___setitem__" "', argument " "2"" of type '" "std::vector< ViewEdge * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewEdge * >::difference_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector< ViewEdge * >::difference_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewEdgesContainer___setitem__" "', argument " "3"" of type '" "std::vector<ViewEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewEdgesContainer___setitem__" "', argument " "3"" of type '" "std::vector< ViewEdge * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<ViewEdge * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< ViewEdge * >::value_type >(argp3);
   {
     try {
       try {
@@ -40837,8 +40571,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::value_type arg2 = (std::vector<ViewEdge * >::value_type) 0 ;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::value_type arg2 = (std::vector< ViewEdge * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -40847,16 +40581,16 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_append(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgesContainer_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_append" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_append" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgesContainer_append" "', argument " "2"" of type '" "std::vector<ViewEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgesContainer_append" "', argument " "2"" of type '" "std::vector< ViewEdge * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<ViewEdge * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector< ViewEdge * >::value_type >(argp2);
   {
     try {
       std_vector_Sl_ViewEdge_Sm__Sg__append(arg1,arg2);
@@ -40877,12 +40611,12 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *result = 0 ;
+  std::vector< ViewEdge * > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_ViewEdgesContainer")) SWIG_fail;
   {
     try {
-      result = (std::vector<ViewEdge * > *)new std::vector<ViewEdge * >();
+      result = (std::vector< ViewEdge * > *)new std::vector< ViewEdge * >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -40891,7 +40625,7 @@ SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer__SWIG_0(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -40900,26 +40634,26 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = 0 ;
-  std::vector<ViewEdge * > *result = 0 ;
+  std::vector< ViewEdge * > *arg1 = 0 ;
+  std::vector< ViewEdge * > *result = 0 ;
   int res1 = SWIG_OLDOBJ ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_ViewEdgesContainer",&obj0)) SWIG_fail;
   {
-    std::vector<ViewEdge*,std::allocator<ViewEdge * > > *ptr = (std::vector<ViewEdge*,std::allocator<ViewEdge * > > *)0;
+    std::vector<ViewEdge*,std::allocator< ViewEdge * > > *ptr = (std::vector<ViewEdge*,std::allocator< ViewEdge * > > *)0;
     res1 = swig::asptr(obj0, &ptr);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ViewEdgesContainer" "', argument " "1"" of type '" "std::vector<ViewEdge * > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ViewEdgesContainer" "', argument " "1"" of type '" "std::vector< ViewEdge * > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ViewEdgesContainer" "', argument " "1"" of type '" "std::vector<ViewEdge * > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ViewEdgesContainer" "', argument " "1"" of type '" "std::vector< ViewEdge * > const &""'"); 
     }
     arg1 = ptr;
   }
   {
     try {
-      result = (std::vector<ViewEdge * > *)new std::vector<ViewEdge * >((std::vector<ViewEdge * > const &)*arg1);
+      result = (std::vector< ViewEdge * > *)new std::vector< ViewEdge * >((std::vector< ViewEdge * > const &)*arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -40928,7 +40662,7 @@ SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer__SWIG_1(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, SWIG_POINTER_NEW |  0 );
   if (SWIG_IsNewObj(res1)) delete arg1;
   return resultobj;
 fail:
@@ -40939,21 +40673,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_empty",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_empty" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_empty" "', argument " "1"" of type '" "std::vector< ViewEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   {
     try {
-      result = (bool)((std::vector<ViewEdge * > const *)arg1)->empty();
+      result = (bool)((std::vector< ViewEdge * > const *)arg1)->empty();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -40971,21 +40705,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::size_type result;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_size" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_size" "', argument " "1"" of type '" "std::vector< ViewEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   {
     try {
-      result = ((std::vector<ViewEdge * > const *)arg1)->size();
+      result = ((std::vector< ViewEdge * > const *)arg1)->size();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -41003,17 +40737,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_clear" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_clear" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   {
     try {
       (arg1)->clear();
@@ -41034,8 +40768,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * > *arg2 = 0 ;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -41044,19 +40778,19 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_swap(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgesContainer_swap",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_swap" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_swap" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t,  0 );
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgesContainer_swap" "', argument " "2"" of type '" "std::vector<ViewEdge * > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgesContainer_swap" "', argument " "2"" of type '" "std::vector< ViewEdge * > &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgesContainer_swap" "', argument " "2"" of type '" "std::vector<ViewEdge * > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgesContainer_swap" "', argument " "2"" of type '" "std::vector< ViewEdge * > &""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<ViewEdge * > * >(argp2);
+  arg2 = reinterpret_cast< std::vector< ViewEdge * > * >(argp2);
   {
     try {
       (arg1)->swap(*arg2);
@@ -41077,21 +40811,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  SwigValueWrapper<std::allocator<ViewEdge * > > result;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  SwigValueWrapper< std::allocator< ViewEdge * > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_get_allocator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_get_allocator" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_get_allocator" "', argument " "1"" of type '" "std::vector< ViewEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   {
     try {
-      result = ((std::vector<ViewEdge * > const *)arg1)->get_allocator();
+      result = ((std::vector< ViewEdge * > const *)arg1)->get_allocator();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -41100,30 +40834,30 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_get_allocator(PyObject *SWIGUNUSED
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new std::vector<ViewEdge * >::allocator_type(static_cast< const std::vector<ViewEdge * >::allocator_type& >(result))), SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new std::vector< ViewEdge * >::allocator_type(static_cast< const std::vector< ViewEdge * >::allocator_type& >(result))), SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdgesContainer_begin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::iterator result;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::const_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_begin" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_begin" "', argument " "1"" of type '" "std::vector< ViewEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   {
     try {
-      result = (arg1)->begin();
+      result = ((std::vector< ViewEdge * > const *)arg1)->begin();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -41132,7 +40866,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_begin__SWIG_0(PyObject *SWIGUNUSED
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewEdge * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewEdge * >::const_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -41140,89 +40874,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdgesContainer_begin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::const_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_begin" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<ViewEdge * > const *)arg1)->begin();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewEdge * >::const_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ViewEdgesContainer_begin(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewEdgesContainer_begin__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewEdgesContainer_begin__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgesContainer_begin'.\n  Possible C/C++ prototypes are:\n    begin()\n    begin()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ViewEdgesContainer_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::iterator result;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::const_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_end" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_end" "', argument " "1"" of type '" "std::vector< ViewEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   {
     try {
-      result = (arg1)->end();
+      result = ((std::vector< ViewEdge * > const *)arg1)->end();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -41231,7 +40899,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_end__SWIG_0(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewEdge * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewEdge * >::const_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -41239,89 +40907,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdgesContainer_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_rbegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::const_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_end" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<ViewEdge * > const *)arg1)->end();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewEdge * >::const_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ViewEdgesContainer_end(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewEdgesContainer_end__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewEdgesContainer_end__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgesContainer_end'.\n  Possible C/C++ prototypes are:\n    end()\n    end()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ViewEdgesContainer_rbegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::reverse_iterator result;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::const_reverse_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_rbegin" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_rbegin" "', argument " "1"" of type '" "std::vector< ViewEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   {
     try {
-      result = (arg1)->rbegin();
+      result = ((std::vector< ViewEdge * > const *)arg1)->rbegin();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -41330,7 +40932,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_rbegin__SWIG_0(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewEdge * >::reverse_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewEdge * >::const_reverse_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -41338,89 +40940,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdgesContainer_rbegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewEdgesContainer_rend(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::const_reverse_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_rbegin" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<ViewEdge * > const *)arg1)->rbegin();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewEdge * >::const_reverse_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ViewEdgesContainer_rbegin(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewEdgesContainer_rbegin__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewEdgesContainer_rbegin__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgesContainer_rbegin'.\n  Possible C/C++ prototypes are:\n    rbegin()\n    rbegin()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ViewEdgesContainer_rend__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::reverse_iterator result;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::const_reverse_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_rend" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_rend" "', argument " "1"" of type '" "std::vector< ViewEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   {
     try {
-      result = (arg1)->rend();
+      result = ((std::vector< ViewEdge * > const *)arg1)->rend();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -41429,7 +40965,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_rend__SWIG_0(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewEdge * >::reverse_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewEdge * >::const_reverse_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -41437,76 +40973,10 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdgesContainer_rend__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::const_reverse_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_rend" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<ViewEdge * > const *)arg1)->rend();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewEdge * >::const_reverse_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ViewEdgesContainer_rend(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewEdgesContainer_rend__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewEdgesContainer_rend__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgesContainer_rend'.\n  Possible C/C++ prototypes are:\n    rend()\n    rend()\n");
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * >::size_type arg1 ;
-  std::vector<ViewEdge * > *result = 0 ;
+  std::vector< ViewEdge * >::size_type arg1 ;
+  std::vector< ViewEdge * > *result = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -41514,12 +40984,12 @@ SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer__SWIG_2(PyObject *SWIGUNUSEDPA
   if (!PyArg_ParseTuple(args,(char *)"O:new_ViewEdgesContainer",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ViewEdgesContainer" "', argument " "1"" of type '" "std::vector<ViewEdge * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ViewEdgesContainer" "', argument " "1"" of type '" "std::vector< ViewEdge * >::size_type""'");
   } 
-  arg1 = static_cast< std::vector<ViewEdge * >::size_type >(val1);
+  arg1 = static_cast< std::vector< ViewEdge * >::size_type >(val1);
   {
     try {
-      result = (std::vector<ViewEdge * > *)new std::vector<ViewEdge * >(arg1);
+      result = (std::vector< ViewEdge * > *)new std::vector< ViewEdge * >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -41528,7 +40998,7 @@ SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer__SWIG_2(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -41537,17 +41007,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_pop_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_pop_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_pop_back" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_pop_back" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   {
     try {
       (arg1)->pop_back();
@@ -41568,8 +41038,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::size_type arg2 ;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::size_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -41578,16 +41048,16 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_resize__SWIG_0(PyObject *SWIGUNUSE
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgesContainer_resize",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_resize" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_resize" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer_resize" "', argument " "2"" of type '" "std::vector<ViewEdge * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer_resize" "', argument " "2"" of type '" "std::vector< ViewEdge * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewEdge * >::size_type >(val2);
+  arg2 = static_cast< std::vector< ViewEdge * >::size_type >(val2);
   {
     try {
       (arg1)->resize(arg2);
@@ -41608,9 +41078,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::iterator arg2 ;
-  std::vector<ViewEdge * >::iterator result;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::iterator arg2 ;
+  std::vector< ViewEdge * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -41619,20 +41089,20 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_erase__SWIG_0(PyObject *SWIGUNUSED
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgesContainer_erase",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_erase" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_erase" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewEdge * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_erase" "', argument " "2"" of type '" "std::vector< ViewEdge * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< ViewEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< ViewEdge * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewEdge * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_erase" "', argument " "2"" of type '" "std::vector< ViewEdge * >::iterator""'");
     }
   }
   {
@@ -41646,7 +41116,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_erase__SWIG_0(PyObject *SWIGUNUSED
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewEdge * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewEdge * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -41656,10 +41126,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::iterator arg2 ;
-  std::vector<ViewEdge * >::iterator arg3 ;
-  std::vector<ViewEdge * >::iterator result;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::iterator arg2 ;
+  std::vector< ViewEdge * >::iterator arg3 ;
+  std::vector< ViewEdge * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -41671,31 +41141,31 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_erase__SWIG_1(PyObject *SWIGUNUSED
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewEdgesContainer_erase",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_erase" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_erase" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewEdge * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_erase" "', argument " "2"" of type '" "std::vector< ViewEdge * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< ViewEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< ViewEdge * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewEdge * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_erase" "', argument " "2"" of type '" "std::vector< ViewEdge * >::iterator""'");
     }
   }
   res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res3) || !iter3) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_erase" "', argument " "3"" of type '" "std::vector<ViewEdge * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_erase" "', argument " "3"" of type '" "std::vector< ViewEdge * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *>(iter3);
+    swig::PySwigIterator_T<std::vector< ViewEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< ViewEdge * >::iterator > *>(iter3);
     if (iter_t) {
       arg3 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_erase" "', argument " "3"" of type '" "std::vector<ViewEdge * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_erase" "', argument " "3"" of type '" "std::vector< ViewEdge * >::iterator""'");
     }
   }
   {
@@ -41709,7 +41179,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_erase__SWIG_1(PyObject *SWIGUNUSED
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewEdge * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewEdge * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -41723,18 +41193,18 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_erase(PyObject *self, PyObject *ar
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator< ViewEdge * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< ViewEdge * >::iterator > *>(iter) != 0));
       if (_v) {
         return _wrap_ViewEdgesContainer_erase__SWIG_0(self, args);
       }
@@ -41742,16 +41212,16 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_erase(PyObject *self, PyObject *ar
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator< ViewEdge * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< ViewEdge * >::iterator > *>(iter) != 0));
       if (_v) {
         swig::PySwigIterator *iter = 0;
         int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *>(iter) != 0));
+        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< ViewEdge * >::iterator > *>(iter) != 0));
         if (_v) {
           return _wrap_ViewEdgesContainer_erase__SWIG_1(self, args);
         }
@@ -41760,16 +41230,19 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_erase(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgesContainer_erase'.\n  Possible C/C++ prototypes are:\n    erase(std::vector<ViewEdge * >::iterator)\n    erase(std::vector<ViewEdge * >::iterator,std::vector<ViewEdge * >::iterator)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgesContainer_erase'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    erase(std::vector< ViewEdge * > *,std::vector< ViewEdge * >::iterator)\n"
+    "    erase(std::vector< ViewEdge * > *,std::vector< ViewEdge * >::iterator,std::vector< ViewEdge * >::iterator)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * >::size_type arg1 ;
-  std::vector<ViewEdge * >::value_type arg2 = (std::vector<ViewEdge * >::value_type) 0 ;
-  std::vector<ViewEdge * > *result = 0 ;
+  std::vector< ViewEdge * >::size_type arg1 ;
+  std::vector< ViewEdge * >::value_type arg2 = (std::vector< ViewEdge * >::value_type) 0 ;
+  std::vector< ViewEdge * > *result = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   void *argp2 = 0 ;
@@ -41780,17 +41253,17 @@ SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer__SWIG_3(PyObject *SWIGUNUSEDPA
   if (!PyArg_ParseTuple(args,(char *)"OO:new_ViewEdgesContainer",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ViewEdgesContainer" "', argument " "1"" of type '" "std::vector<ViewEdge * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ViewEdgesContainer" "', argument " "1"" of type '" "std::vector< ViewEdge * >::size_type""'");
   } 
-  arg1 = static_cast< std::vector<ViewEdge * >::size_type >(val1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
+  arg1 = static_cast< std::vector< ViewEdge * >::size_type >(val1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ViewEdgesContainer" "', argument " "2"" of type '" "std::vector<ViewEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ViewEdgesContainer" "', argument " "2"" of type '" "std::vector< ViewEdge * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<ViewEdge * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector< ViewEdge * >::value_type >(argp2);
   {
     try {
-      result = (std::vector<ViewEdge * > *)new std::vector<ViewEdge * >(arg1,arg2);
+      result = (std::vector< ViewEdge * > *)new std::vector< ViewEdge * >(arg1,arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -41799,7 +41272,7 @@ SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer__SWIG_3(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -41812,7 +41285,7 @@ SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer(PyObject *self, PyObject *args
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -41831,7 +41304,7 @@ SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer(PyObject *self, PyObject *args
   }
   if (argc == 1) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator< ViewEdge * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_new_ViewEdgesContainer__SWIG_1(self, args);
@@ -41845,7 +41318,7 @@ SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer(PyObject *self, PyObject *args
     }
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_new_ViewEdgesContainer__SWIG_3(self, args);
@@ -41854,15 +41327,20 @@ SWIGINTERN PyObject *_wrap_new_ViewEdgesContainer(PyObject *self, PyObject *args
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewEdgesContainer'.\n  Possible C/C++ prototypes are:\n    std::vector<(p.ViewEdge)>()\n    std::vector<(p.ViewEdge)>(std::vector<ViewEdge * > const &)\n    std::vector<(p.ViewEdge)>(std::vector<ViewEdge * >::size_type)\n    std::vector<(p.ViewEdge)>(std::vector<ViewEdge * >::size_type,std::vector<ViewEdge * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewEdgesContainer'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    std::vector< ViewEdge * >()\n"
+    "    std::vector< ViewEdge * >(std::vector< ViewEdge * > const &)\n"
+    "    std::vector< ViewEdge * >(std::vector< ViewEdge * >::size_type)\n"
+    "    std::vector< ViewEdge * >(std::vector< ViewEdge * >::size_type,std::vector< ViewEdge * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_push_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::value_type arg2 = (std::vector<ViewEdge * >::value_type) 0 ;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::value_type arg2 = (std::vector< ViewEdge * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -41871,16 +41349,16 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_push_back(PyObject *SWIGUNUSEDPARM
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgesContainer_push_back",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_push_back" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_push_back" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgesContainer_push_back" "', argument " "2"" of type '" "std::vector<ViewEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgesContainer_push_back" "', argument " "2"" of type '" "std::vector< ViewEdge * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<ViewEdge * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector< ViewEdge * >::value_type >(argp2);
   {
     try {
       (arg1)->push_back(arg2);
@@ -41901,21 +41379,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_front(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::value_type result;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_front",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_front" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_front" "', argument " "1"" of type '" "std::vector< ViewEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   {
     try {
-      result = (std::vector<ViewEdge * >::value_type)((std::vector<ViewEdge * > const *)arg1)->front();
+      result = (std::vector< ViewEdge * >::value_type)((std::vector< ViewEdge * > const *)arg1)->front();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -41924,7 +41402,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_front(PyObject *SWIGUNUSEDPARM(sel
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -41933,21 +41411,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::value_type result;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_back" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_back" "', argument " "1"" of type '" "std::vector< ViewEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   {
     try {
-      result = (std::vector<ViewEdge * >::value_type)((std::vector<ViewEdge * > const *)arg1)->back();
+      result = (std::vector< ViewEdge * >::value_type)((std::vector< ViewEdge * > const *)arg1)->back();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -41956,7 +41434,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_back(PyObject *SWIGUNUSEDPARM(self
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -41965,9 +41443,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_assign(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::size_type arg2 ;
-  std::vector<ViewEdge * >::value_type arg3 = (std::vector<ViewEdge * >::value_type) 0 ;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::size_type arg2 ;
+  std::vector< ViewEdge * >::value_type arg3 = (std::vector< ViewEdge * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -41979,21 +41457,21 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_assign(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewEdgesContainer_assign",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_assign" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_assign" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer_assign" "', argument " "2"" of type '" "std::vector<ViewEdge * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer_assign" "', argument " "2"" of type '" "std::vector< ViewEdge * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewEdge * >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector< ViewEdge * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewEdgesContainer_assign" "', argument " "3"" of type '" "std::vector<ViewEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewEdgesContainer_assign" "', argument " "3"" of type '" "std::vector< ViewEdge * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<ViewEdge * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< ViewEdge * >::value_type >(argp3);
   {
     try {
       (arg1)->assign(arg2,arg3);
@@ -42014,9 +41492,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::size_type arg2 ;
-  std::vector<ViewEdge * >::value_type arg3 = (std::vector<ViewEdge * >::value_type) 0 ;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::size_type arg2 ;
+  std::vector< ViewEdge * >::value_type arg3 = (std::vector< ViewEdge * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -42028,21 +41506,21 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_resize__SWIG_1(PyObject *SWIGUNUSE
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewEdgesContainer_resize",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_resize" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_resize" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer_resize" "', argument " "2"" of type '" "std::vector<ViewEdge * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer_resize" "', argument " "2"" of type '" "std::vector< ViewEdge * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewEdge * >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector< ViewEdge * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewEdgesContainer_resize" "', argument " "3"" of type '" "std::vector<ViewEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewEdgesContainer_resize" "', argument " "3"" of type '" "std::vector< ViewEdge * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<ViewEdge * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< ViewEdge * >::value_type >(argp3);
   {
     try {
       (arg1)->resize(arg2,arg3);
@@ -42067,13 +41545,13 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_resize(PyObject *self, PyObject *a
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator< ViewEdge * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -42087,7 +41565,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_resize(PyObject *self, PyObject *a
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator< ViewEdge * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -42096,7 +41574,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_resize(PyObject *self, PyObject *a
       }
       if (_v) {
         void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0);
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           return _wrap_ViewEdgesContainer_resize__SWIG_1(self, args);
@@ -42106,17 +41584,20 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_resize(PyObject *self, PyObject *a
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgesContainer_resize'.\n  Possible C/C++ prototypes are:\n    resize(std::vector<ViewEdge * >::size_type)\n    resize(std::vector<ViewEdge * >::size_type,std::vector<ViewEdge * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgesContainer_resize'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    resize(std::vector< ViewEdge * > *,std::vector< ViewEdge * >::size_type)\n"
+    "    resize(std::vector< ViewEdge * > *,std::vector< ViewEdge * >::size_type,std::vector< ViewEdge * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::iterator arg2 ;
-  std::vector<ViewEdge * >::value_type arg3 = (std::vector<ViewEdge * >::value_type) 0 ;
-  std::vector<ViewEdge * >::iterator result;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::iterator arg2 ;
+  std::vector< ViewEdge * >::value_type arg3 = (std::vector< ViewEdge * >::value_type) 0 ;
+  std::vector< ViewEdge * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -42128,27 +41609,27 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_insert__SWIG_0(PyObject *SWIGUNUSE
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewEdgesContainer_insert",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_insert" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_insert" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewEdge * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_insert" "', argument " "2"" of type '" "std::vector< ViewEdge * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< ViewEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< ViewEdge * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewEdge * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_insert" "', argument " "2"" of type '" "std::vector< ViewEdge * >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewEdgesContainer_insert" "', argument " "3"" of type '" "std::vector<ViewEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewEdgesContainer_insert" "', argument " "3"" of type '" "std::vector< ViewEdge * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<ViewEdge * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< ViewEdge * >::value_type >(argp3);
   {
     try {
       result = (arg1)->insert(arg2,arg3);
@@ -42160,7 +41641,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_insert__SWIG_0(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewEdge * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewEdge * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -42170,10 +41651,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::iterator arg2 ;
-  std::vector<ViewEdge * >::size_type arg3 ;
-  std::vector<ViewEdge * >::value_type arg4 = (std::vector<ViewEdge * >::value_type) 0 ;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::iterator arg2 ;
+  std::vector< ViewEdge * >::size_type arg3 ;
+  std::vector< ViewEdge * >::value_type arg4 = (std::vector< ViewEdge * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -42188,32 +41669,32 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_insert__SWIG_1(PyObject *SWIGUNUSE
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:ViewEdgesContainer_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_insert" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_insert" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewEdge * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_insert" "', argument " "2"" of type '" "std::vector< ViewEdge * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< ViewEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< ViewEdge * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewEdge * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewEdgesContainer_insert" "', argument " "2"" of type '" "std::vector< ViewEdge * >::iterator""'");
     }
   }
   ecode3 = SWIG_AsVal_size_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewEdgesContainer_insert" "', argument " "3"" of type '" "std::vector<ViewEdge * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewEdgesContainer_insert" "', argument " "3"" of type '" "std::vector< ViewEdge * >::size_type""'");
   } 
-  arg3 = static_cast< std::vector<ViewEdge * >::size_type >(val3);
-  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0 |  0 );
+  arg3 = static_cast< std::vector< ViewEdge * >::size_type >(val3);
+  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewEdgesContainer_insert" "', argument " "4"" of type '" "std::vector<ViewEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewEdgesContainer_insert" "', argument " "4"" of type '" "std::vector< ViewEdge * >::value_type""'"); 
   }
-  arg4 = reinterpret_cast< std::vector<ViewEdge * >::value_type >(argp4);
+  arg4 = reinterpret_cast< std::vector< ViewEdge * >::value_type >(argp4);
   {
     try {
       (arg1)->insert(arg2,arg3,arg4);
@@ -42238,21 +41719,21 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_insert(PyObject *self, PyObject *a
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator< ViewEdge * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< ViewEdge * >::iterator > *>(iter) != 0));
       if (_v) {
         void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0);
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           return _wrap_ViewEdgesContainer_insert__SWIG_0(self, args);
@@ -42262,12 +41743,12 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_insert(PyObject *self, PyObject *a
   }
   if (argc == 4) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator<ViewEdge * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewEdge*,std::allocator< ViewEdge * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewEdge * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< ViewEdge * >::iterator > *>(iter) != 0));
       if (_v) {
         {
           int res = SWIG_AsVal_size_t(argv[2], NULL);
@@ -42275,7 +41756,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_insert(PyObject *self, PyObject *a
         }
         if (_v) {
           void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0);
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0);
           _v = SWIG_CheckState(res);
           if (_v) {
             return _wrap_ViewEdgesContainer_insert__SWIG_1(self, args);
@@ -42286,15 +41767,18 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_insert(PyObject *self, PyObject *a
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgesContainer_insert'.\n  Possible C/C++ prototypes are:\n    insert(std::vector<ViewEdge * >::iterator,std::vector<ViewEdge * >::value_type)\n    insert(std::vector<ViewEdge * >::iterator,std::vector<ViewEdge * >::size_type,std::vector<ViewEdge * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgesContainer_insert'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    insert(std::vector< ViewEdge * > *,std::vector< ViewEdge * >::iterator,std::vector< ViewEdge * >::value_type)\n"
+    "    insert(std::vector< ViewEdge * > *,std::vector< ViewEdge * >::iterator,std::vector< ViewEdge * >::size_type,std::vector< ViewEdge * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_reserve(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::size_type arg2 ;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::size_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -42303,16 +41787,16 @@ SWIGINTERN PyObject *_wrap_ViewEdgesContainer_reserve(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewEdgesContainer_reserve",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_reserve" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_reserve" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer_reserve" "', argument " "2"" of type '" "std::vector<ViewEdge * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewEdgesContainer_reserve" "', argument " "2"" of type '" "std::vector< ViewEdge * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewEdge * >::size_type >(val2);
+  arg2 = static_cast< std::vector< ViewEdge * >::size_type >(val2);
   {
     try {
       (arg1)->reserve(arg2);
@@ -42333,21 +41817,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewEdgesContainer_capacity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
-  std::vector<ViewEdge * >::size_type result;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgesContainer_capacity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_capacity" "', argument " "1"" of type '" "std::vector<ViewEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgesContainer_capacity" "', argument " "1"" of type '" "std::vector< ViewEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   {
     try {
-      result = ((std::vector<ViewEdge * > const *)arg1)->capacity();
+      result = ((std::vector< ViewEdge * > const *)arg1)->capacity();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -42365,17 +41849,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_ViewEdgesContainer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewEdge * > *arg1 = (std::vector<ViewEdge * > *) 0 ;
+  std::vector< ViewEdge * > *arg1 = (std::vector< ViewEdge * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_ViewEdgesContainer",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ViewEdgesContainer" "', argument " "1"" of type '" "std::vector<ViewEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ViewEdgesContainer" "', argument " "1"" of type '" "std::vector< ViewEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewEdge * > * >(argp1);
   {
     try {
       delete arg1;
@@ -42397,14 +41881,14 @@ fail:
 
 SWIGINTERN PyObject *ViewEdgesContainer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
   PyObject **arg2 = (PyObject **) 0 ;
   swig::PySwigIterator *result = 0 ;
   void *argp1 = 0 ;
@@ -42413,11 +41897,11 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_iterator(PyObject *SWIGUNUSEDPARM(sel
   
   arg2 = &obj0;
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_iterator" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_iterator" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   {
     try {
       result = (swig::PySwigIterator *)std_vector_Sl_FEdge_Sm__Sg__iterator(arg1,arg2);
@@ -42438,21 +41922,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer___nonzero__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer___nonzero__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___nonzero__" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___nonzero__" "', argument " "1"" of type '" "std::vector< FEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   {
     try {
-      result = (bool)std_vector_Sl_FEdge_Sm__Sg____nonzero__((std::vector<FEdge * > const *)arg1);
+      result = (bool)std_vector_Sl_FEdge_Sm__Sg____nonzero__((std::vector< FEdge * > const *)arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -42470,21 +41954,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer___len__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::size_type result;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer___len__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___len__" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___len__" "', argument " "1"" of type '" "std::vector< FEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   {
     try {
-      result = std_vector_Sl_FEdge_Sm__Sg____len__((std::vector<FEdge * > const *)arg1);
+      result = std_vector_Sl_FEdge_Sm__Sg____len__((std::vector< FEdge * > const *)arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -42502,22 +41986,22 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::value_type result;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_pop" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_pop" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   {
     try {
       try {
-        result = (std::vector<FEdge * >::value_type)std_vector_Sl_FEdge_Sm__Sg__pop(arg1);
+        result = (std::vector< FEdge * >::value_type)std_vector_Sl_FEdge_Sm__Sg__pop(arg1);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -42531,7 +42015,7 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_pop(PyObject *SWIGUNUSEDPARM(self), P
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -42540,10 +42024,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::difference_type arg2 ;
-  std::vector<FEdge * >::difference_type arg3 ;
-  std::vector<FEdge *,std::allocator<FEdge * > > *result = 0 ;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::difference_type arg2 ;
+  std::vector< FEdge * >::difference_type arg3 ;
+  std::vector< FEdge *,std::allocator< FEdge * > > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -42555,25 +42039,25 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer___getslice__(PyObject *SWIGUNUSEDPARM
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:FEdgesContainer___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___getslice__" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___getslice__" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer___getslice__" "', argument " "2"" of type '" "std::vector<FEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer___getslice__" "', argument " "2"" of type '" "std::vector< FEdge * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<FEdge * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< FEdge * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FEdgesContainer___getslice__" "', argument " "3"" of type '" "std::vector<FEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FEdgesContainer___getslice__" "', argument " "3"" of type '" "std::vector< FEdge * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<FEdge * >::difference_type >(val3);
+  arg3 = static_cast< std::vector< FEdge * >::difference_type >(val3);
   {
     try {
       try {
-        result = (std::vector<FEdge *,std::allocator<FEdge * > > *)std_vector_Sl_FEdge_Sm__Sg____getslice__(arg1,arg2,arg3);
+        result = (std::vector< FEdge *,std::allocator< FEdge * > > *)std_vector_Sl_FEdge_Sm__Sg____getslice__(arg1,arg2,arg3);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -42587,7 +42071,7 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer___getslice__(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -42596,10 +42080,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer___setslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::difference_type arg2 ;
-  std::vector<FEdge * >::difference_type arg3 ;
-  std::vector<FEdge *,std::allocator<FEdge * > > *arg4 = 0 ;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::difference_type arg2 ;
+  std::vector< FEdge * >::difference_type arg3 ;
+  std::vector< FEdge *,std::allocator< FEdge * > > *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -42613,36 +42097,36 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer___setslice__(PyObject *SWIGUNUSEDPARM
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:FEdgesContainer___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___setslice__" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___setslice__" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer___setslice__" "', argument " "2"" of type '" "std::vector<FEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer___setslice__" "', argument " "2"" of type '" "std::vector< FEdge * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<FEdge * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< FEdge * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FEdgesContainer___setslice__" "', argument " "3"" of type '" "std::vector<FEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FEdgesContainer___setslice__" "', argument " "3"" of type '" "std::vector< FEdge * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<FEdge * >::difference_type >(val3);
+  arg3 = static_cast< std::vector< FEdge * >::difference_type >(val3);
   {
-    std::vector<FEdge*,std::allocator<FEdge * > > *ptr = (std::vector<FEdge*,std::allocator<FEdge * > > *)0;
+    std::vector<FEdge*,std::allocator< FEdge * > > *ptr = (std::vector<FEdge*,std::allocator< FEdge * > > *)0;
     res4 = swig::asptr(obj3, &ptr);
     if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "FEdgesContainer___setslice__" "', argument " "4"" of type '" "std::vector<FEdge *,std::allocator<FEdge * > > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "FEdgesContainer___setslice__" "', argument " "4"" of type '" "std::vector< FEdge *,std::allocator< FEdge * > > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdgesContainer___setslice__" "', argument " "4"" of type '" "std::vector<FEdge *,std::allocator<FEdge * > > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdgesContainer___setslice__" "', argument " "4"" of type '" "std::vector< FEdge *,std::allocator< FEdge * > > const &""'"); 
     }
     arg4 = ptr;
   }
   {
     try {
       try {
-        std_vector_Sl_FEdge_Sm__Sg____setslice__(arg1,arg2,arg3,(std::vector<FEdge *,std::allocator<FEdge * > > const &)*arg4);
+        std_vector_Sl_FEdge_Sm__Sg____setslice__(arg1,arg2,arg3,(std::vector< FEdge *,std::allocator< FEdge * > > const &)*arg4);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -42670,9 +42154,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer___delslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::difference_type arg2 ;
-  std::vector<FEdge * >::difference_type arg3 ;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::difference_type arg2 ;
+  std::vector< FEdge * >::difference_type arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -42684,21 +42168,21 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer___delslice__(PyObject *SWIGUNUSEDPARM
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:FEdgesContainer___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___delslice__" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___delslice__" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer___delslice__" "', argument " "2"" of type '" "std::vector<FEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer___delslice__" "', argument " "2"" of type '" "std::vector< FEdge * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<FEdge * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< FEdge * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FEdgesContainer___delslice__" "', argument " "3"" of type '" "std::vector<FEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FEdgesContainer___delslice__" "', argument " "3"" of type '" "std::vector< FEdge * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<FEdge * >::difference_type >(val3);
+  arg3 = static_cast< std::vector< FEdge * >::difference_type >(val3);
   {
     try {
       try {
@@ -42725,8 +42209,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer___delitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::difference_type arg2 ;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::difference_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -42735,16 +42219,16 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer___delitem__(PyObject *SWIGUNUSEDPARM(
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:FEdgesContainer___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___delitem__" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___delitem__" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer___delitem__" "', argument " "2"" of type '" "std::vector<FEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer___delitem__" "', argument " "2"" of type '" "std::vector< FEdge * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<FEdge * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< FEdge * >::difference_type >(val2);
   {
     try {
       try {
@@ -42771,9 +42255,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer___getitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::difference_type arg2 ;
-  std::vector<FEdge * >::value_type result;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::difference_type arg2 ;
+  std::vector< FEdge * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -42782,20 +42266,20 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer___getitem__(PyObject *SWIGUNUSEDPARM(
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:FEdgesContainer___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___getitem__" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___getitem__" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer___getitem__" "', argument " "2"" of type '" "std::vector<FEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer___getitem__" "', argument " "2"" of type '" "std::vector< FEdge * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<FEdge * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< FEdge * >::difference_type >(val2);
   {
     try {
       try {
-        result = (std::vector<FEdge * >::value_type)std_vector_Sl_FEdge_Sm__Sg____getitem__(arg1,arg2);
+        result = (std::vector< FEdge * >::value_type)std_vector_Sl_FEdge_Sm__Sg____getitem__(arg1,arg2);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -42809,7 +42293,7 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer___getitem__(PyObject *SWIGUNUSEDPARM(
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -42818,9 +42302,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer___setitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::difference_type arg2 ;
-  std::vector<FEdge * >::value_type arg3 = (std::vector<FEdge * >::value_type) 0 ;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::difference_type arg2 ;
+  std::vector< FEdge * >::value_type arg3 = (std::vector< FEdge * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -42832,21 +42316,21 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer___setitem__(PyObject *SWIGUNUSEDPARM(
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:FEdgesContainer___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___setitem__" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer___setitem__" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer___setitem__" "', argument " "2"" of type '" "std::vector<FEdge * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer___setitem__" "', argument " "2"" of type '" "std::vector< FEdge * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<FEdge * >::difference_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector< FEdge * >::difference_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FEdgesContainer___setitem__" "', argument " "3"" of type '" "std::vector<FEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FEdgesContainer___setitem__" "', argument " "3"" of type '" "std::vector< FEdge * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<FEdge * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< FEdge * >::value_type >(argp3);
   {
     try {
       try {
@@ -42873,8 +42357,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::value_type arg2 = (std::vector<FEdge * >::value_type) 0 ;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::value_type arg2 = (std::vector< FEdge * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -42883,16 +42367,16 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_append(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:FEdgesContainer_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_append" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_append" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgesContainer_append" "', argument " "2"" of type '" "std::vector<FEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgesContainer_append" "', argument " "2"" of type '" "std::vector< FEdge * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<FEdge * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector< FEdge * >::value_type >(argp2);
   {
     try {
       std_vector_Sl_FEdge_Sm__Sg__append(arg1,arg2);
@@ -42913,12 +42397,12 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_FEdgesContainer__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *result = 0 ;
+  std::vector< FEdge * > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_FEdgesContainer")) SWIG_fail;
   {
     try {
-      result = (std::vector<FEdge * > *)new std::vector<FEdge * >();
+      result = (std::vector< FEdge * > *)new std::vector< FEdge * >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -42927,7 +42411,7 @@ SWIGINTERN PyObject *_wrap_new_FEdgesContainer__SWIG_0(PyObject *SWIGUNUSEDPARM(
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -42936,26 +42420,26 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_FEdgesContainer__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = 0 ;
-  std::vector<FEdge * > *result = 0 ;
+  std::vector< FEdge * > *arg1 = 0 ;
+  std::vector< FEdge * > *result = 0 ;
   int res1 = SWIG_OLDOBJ ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_FEdgesContainer",&obj0)) SWIG_fail;
   {
-    std::vector<FEdge*,std::allocator<FEdge * > > *ptr = (std::vector<FEdge*,std::allocator<FEdge * > > *)0;
+    std::vector<FEdge*,std::allocator< FEdge * > > *ptr = (std::vector<FEdge*,std::allocator< FEdge * > > *)0;
     res1 = swig::asptr(obj0, &ptr);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_FEdgesContainer" "', argument " "1"" of type '" "std::vector<FEdge * > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_FEdgesContainer" "', argument " "1"" of type '" "std::vector< FEdge * > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_FEdgesContainer" "', argument " "1"" of type '" "std::vector<FEdge * > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_FEdgesContainer" "', argument " "1"" of type '" "std::vector< FEdge * > const &""'"); 
     }
     arg1 = ptr;
   }
   {
     try {
-      result = (std::vector<FEdge * > *)new std::vector<FEdge * >((std::vector<FEdge * > const &)*arg1);
+      result = (std::vector< FEdge * > *)new std::vector< FEdge * >((std::vector< FEdge * > const &)*arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -42964,7 +42448,7 @@ SWIGINTERN PyObject *_wrap_new_FEdgesContainer__SWIG_1(PyObject *SWIGUNUSEDPARM(
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, SWIG_POINTER_NEW |  0 );
   if (SWIG_IsNewObj(res1)) delete arg1;
   return resultobj;
 fail:
@@ -42975,21 +42459,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_empty",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_empty" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_empty" "', argument " "1"" of type '" "std::vector< FEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   {
     try {
-      result = (bool)((std::vector<FEdge * > const *)arg1)->empty();
+      result = (bool)((std::vector< FEdge * > const *)arg1)->empty();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -43007,21 +42491,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::size_type result;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_size" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_size" "', argument " "1"" of type '" "std::vector< FEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   {
     try {
-      result = ((std::vector<FEdge * > const *)arg1)->size();
+      result = ((std::vector< FEdge * > const *)arg1)->size();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -43039,17 +42523,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_clear" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_clear" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   {
     try {
       (arg1)->clear();
@@ -43070,8 +42554,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * > *arg2 = 0 ;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -43080,19 +42564,19 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_swap(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:FEdgesContainer_swap",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_swap" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_swap" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t,  0 );
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgesContainer_swap" "', argument " "2"" of type '" "std::vector<FEdge * > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgesContainer_swap" "', argument " "2"" of type '" "std::vector< FEdge * > &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdgesContainer_swap" "', argument " "2"" of type '" "std::vector<FEdge * > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FEdgesContainer_swap" "', argument " "2"" of type '" "std::vector< FEdge * > &""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<FEdge * > * >(argp2);
+  arg2 = reinterpret_cast< std::vector< FEdge * > * >(argp2);
   {
     try {
       (arg1)->swap(*arg2);
@@ -43113,21 +42597,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  SwigValueWrapper<std::allocator<FEdge * > > result;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  SwigValueWrapper< std::allocator< FEdge * > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_get_allocator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_get_allocator" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_get_allocator" "', argument " "1"" of type '" "std::vector< FEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   {
     try {
-      result = ((std::vector<FEdge * > const *)arg1)->get_allocator();
+      result = ((std::vector< FEdge * > const *)arg1)->get_allocator();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -43136,30 +42620,30 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_get_allocator(PyObject *SWIGUNUSEDPAR
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new std::vector<FEdge * >::allocator_type(static_cast< const std::vector<FEdge * >::allocator_type& >(result))), SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new std::vector< FEdge * >::allocator_type(static_cast< const std::vector< FEdge * >::allocator_type& >(result))), SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgesContainer_begin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FEdgesContainer_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::iterator result;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::const_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_begin" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_begin" "', argument " "1"" of type '" "std::vector< FEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   {
     try {
-      result = (arg1)->begin();
+      result = ((std::vector< FEdge * > const *)arg1)->begin();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -43168,7 +42652,7 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_begin__SWIG_0(PyObject *SWIGUNUSEDPAR
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<FEdge * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< FEdge * >::const_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -43176,89 +42660,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgesContainer_begin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FEdgesContainer_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::const_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_begin" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<FEdge * > const *)arg1)->begin();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<FEdge * >::const_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_FEdgesContainer_begin(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_FEdgesContainer_begin__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_FEdgesContainer_begin__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdgesContainer_begin'.\n  Possible C/C++ prototypes are:\n    begin()\n    begin()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_FEdgesContainer_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::iterator result;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::const_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_end" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_end" "', argument " "1"" of type '" "std::vector< FEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   {
     try {
-      result = (arg1)->end();
+      result = ((std::vector< FEdge * > const *)arg1)->end();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -43267,7 +42685,7 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_end__SWIG_0(PyObject *SWIGUNUSEDPARM(
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<FEdge * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< FEdge * >::const_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -43275,89 +42693,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgesContainer_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FEdgesContainer_rbegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::const_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_end" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<FEdge * > const *)arg1)->end();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<FEdge * >::const_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_FEdgesContainer_end(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_FEdgesContainer_end__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_FEdgesContainer_end__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdgesContainer_end'.\n  Possible C/C++ prototypes are:\n    end()\n    end()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_FEdgesContainer_rbegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::reverse_iterator result;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::const_reverse_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_rbegin" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_rbegin" "', argument " "1"" of type '" "std::vector< FEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   {
     try {
-      result = (arg1)->rbegin();
+      result = ((std::vector< FEdge * > const *)arg1)->rbegin();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -43366,7 +42718,7 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_rbegin__SWIG_0(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<FEdge * >::reverse_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< FEdge * >::const_reverse_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -43374,89 +42726,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgesContainer_rbegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_FEdgesContainer_rend(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::const_reverse_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_rbegin" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<FEdge * > const *)arg1)->rbegin();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<FEdge * >::const_reverse_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_FEdgesContainer_rbegin(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_FEdgesContainer_rbegin__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_FEdgesContainer_rbegin__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdgesContainer_rbegin'.\n  Possible C/C++ prototypes are:\n    rbegin()\n    rbegin()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_FEdgesContainer_rend__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::reverse_iterator result;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::const_reverse_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_rend" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_rend" "', argument " "1"" of type '" "std::vector< FEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   {
     try {
-      result = (arg1)->rend();
+      result = ((std::vector< FEdge * > const *)arg1)->rend();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -43465,7 +42751,7 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_rend__SWIG_0(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<FEdge * >::reverse_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< FEdge * >::const_reverse_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -43473,76 +42759,10 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgesContainer_rend__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::const_reverse_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_rend" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<FEdge * > const *)arg1)->rend();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<FEdge * >::const_reverse_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_FEdgesContainer_rend(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_FEdgesContainer_rend__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_FEdgesContainer_rend__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdgesContainer_rend'.\n  Possible C/C++ prototypes are:\n    rend()\n    rend()\n");
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_new_FEdgesContainer__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * >::size_type arg1 ;
-  std::vector<FEdge * > *result = 0 ;
+  std::vector< FEdge * >::size_type arg1 ;
+  std::vector< FEdge * > *result = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -43550,12 +42770,12 @@ SWIGINTERN PyObject *_wrap_new_FEdgesContainer__SWIG_2(PyObject *SWIGUNUSEDPARM(
   if (!PyArg_ParseTuple(args,(char *)"O:new_FEdgesContainer",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FEdgesContainer" "', argument " "1"" of type '" "std::vector<FEdge * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FEdgesContainer" "', argument " "1"" of type '" "std::vector< FEdge * >::size_type""'");
   } 
-  arg1 = static_cast< std::vector<FEdge * >::size_type >(val1);
+  arg1 = static_cast< std::vector< FEdge * >::size_type >(val1);
   {
     try {
-      result = (std::vector<FEdge * > *)new std::vector<FEdge * >(arg1);
+      result = (std::vector< FEdge * > *)new std::vector< FEdge * >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -43564,7 +42784,7 @@ SWIGINTERN PyObject *_wrap_new_FEdgesContainer__SWIG_2(PyObject *SWIGUNUSEDPARM(
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -43573,17 +42793,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_pop_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_pop_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_pop_back" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_pop_back" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   {
     try {
       (arg1)->pop_back();
@@ -43604,8 +42824,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::size_type arg2 ;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::size_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -43614,16 +42834,16 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_resize__SWIG_0(PyObject *SWIGUNUSEDPA
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:FEdgesContainer_resize",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_resize" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_resize" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer_resize" "', argument " "2"" of type '" "std::vector<FEdge * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer_resize" "', argument " "2"" of type '" "std::vector< FEdge * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<FEdge * >::size_type >(val2);
+  arg2 = static_cast< std::vector< FEdge * >::size_type >(val2);
   {
     try {
       (arg1)->resize(arg2);
@@ -43644,9 +42864,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::iterator arg2 ;
-  std::vector<FEdge * >::iterator result;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::iterator arg2 ;
+  std::vector< FEdge * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -43655,20 +42875,20 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_erase__SWIG_0(PyObject *SWIGUNUSEDPAR
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:FEdgesContainer_erase",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_erase" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_erase" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_erase" "', argument " "2"" of type '" "std::vector<FEdge * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_erase" "', argument " "2"" of type '" "std::vector< FEdge * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< FEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< FEdge * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_erase" "', argument " "2"" of type '" "std::vector<FEdge * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_erase" "', argument " "2"" of type '" "std::vector< FEdge * >::iterator""'");
     }
   }
   {
@@ -43682,7 +42902,7 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_erase__SWIG_0(PyObject *SWIGUNUSEDPAR
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<FEdge * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< FEdge * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -43692,10 +42912,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::iterator arg2 ;
-  std::vector<FEdge * >::iterator arg3 ;
-  std::vector<FEdge * >::iterator result;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::iterator arg2 ;
+  std::vector< FEdge * >::iterator arg3 ;
+  std::vector< FEdge * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -43707,31 +42927,31 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_erase__SWIG_1(PyObject *SWIGUNUSEDPAR
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:FEdgesContainer_erase",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_erase" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_erase" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_erase" "', argument " "2"" of type '" "std::vector<FEdge * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_erase" "', argument " "2"" of type '" "std::vector< FEdge * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< FEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< FEdge * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_erase" "', argument " "2"" of type '" "std::vector<FEdge * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_erase" "', argument " "2"" of type '" "std::vector< FEdge * >::iterator""'");
     }
   }
   res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res3) || !iter3) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_erase" "', argument " "3"" of type '" "std::vector<FEdge * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_erase" "', argument " "3"" of type '" "std::vector< FEdge * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *>(iter3);
+    swig::PySwigIterator_T<std::vector< FEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< FEdge * >::iterator > *>(iter3);
     if (iter_t) {
       arg3 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_erase" "', argument " "3"" of type '" "std::vector<FEdge * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_erase" "', argument " "3"" of type '" "std::vector< FEdge * >::iterator""'");
     }
   }
   {
@@ -43745,7 +42965,7 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_erase__SWIG_1(PyObject *SWIGUNUSEDPAR
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<FEdge * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< FEdge * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -43759,18 +42979,18 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_erase(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator< FEdge * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< FEdge * >::iterator > *>(iter) != 0));
       if (_v) {
         return _wrap_FEdgesContainer_erase__SWIG_0(self, args);
       }
@@ -43778,16 +42998,16 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_erase(PyObject *self, PyObject *args)
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator< FEdge * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< FEdge * >::iterator > *>(iter) != 0));
       if (_v) {
         swig::PySwigIterator *iter = 0;
         int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *>(iter) != 0));
+        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< FEdge * >::iterator > *>(iter) != 0));
         if (_v) {
           return _wrap_FEdgesContainer_erase__SWIG_1(self, args);
         }
@@ -43796,16 +43016,19 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_erase(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdgesContainer_erase'.\n  Possible C/C++ prototypes are:\n    erase(std::vector<FEdge * >::iterator)\n    erase(std::vector<FEdge * >::iterator,std::vector<FEdge * >::iterator)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdgesContainer_erase'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    erase(std::vector< FEdge * > *,std::vector< FEdge * >::iterator)\n"
+    "    erase(std::vector< FEdge * > *,std::vector< FEdge * >::iterator,std::vector< FEdge * >::iterator)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_new_FEdgesContainer__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * >::size_type arg1 ;
-  std::vector<FEdge * >::value_type arg2 = (std::vector<FEdge * >::value_type) 0 ;
-  std::vector<FEdge * > *result = 0 ;
+  std::vector< FEdge * >::size_type arg1 ;
+  std::vector< FEdge * >::value_type arg2 = (std::vector< FEdge * >::value_type) 0 ;
+  std::vector< FEdge * > *result = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   void *argp2 = 0 ;
@@ -43816,17 +43039,17 @@ SWIGINTERN PyObject *_wrap_new_FEdgesContainer__SWIG_3(PyObject *SWIGUNUSEDPARM(
   if (!PyArg_ParseTuple(args,(char *)"OO:new_FEdgesContainer",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FEdgesContainer" "', argument " "1"" of type '" "std::vector<FEdge * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_FEdgesContainer" "', argument " "1"" of type '" "std::vector< FEdge * >::size_type""'");
   } 
-  arg1 = static_cast< std::vector<FEdge * >::size_type >(val1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
+  arg1 = static_cast< std::vector< FEdge * >::size_type >(val1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_FEdgesContainer" "', argument " "2"" of type '" "std::vector<FEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_FEdgesContainer" "', argument " "2"" of type '" "std::vector< FEdge * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<FEdge * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector< FEdge * >::value_type >(argp2);
   {
     try {
-      result = (std::vector<FEdge * > *)new std::vector<FEdge * >(arg1,arg2);
+      result = (std::vector< FEdge * > *)new std::vector< FEdge * >(arg1,arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -43835,7 +43058,7 @@ SWIGINTERN PyObject *_wrap_new_FEdgesContainer__SWIG_3(PyObject *SWIGUNUSEDPARM(
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -43848,7 +43071,7 @@ SWIGINTERN PyObject *_wrap_new_FEdgesContainer(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -43867,7 +43090,7 @@ SWIGINTERN PyObject *_wrap_new_FEdgesContainer(PyObject *self, PyObject *args) {
   }
   if (argc == 1) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator< FEdge * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_new_FEdgesContainer__SWIG_1(self, args);
@@ -43881,7 +43104,7 @@ SWIGINTERN PyObject *_wrap_new_FEdgesContainer(PyObject *self, PyObject *args) {
     }
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_new_FEdgesContainer__SWIG_3(self, args);
@@ -43890,15 +43113,20 @@ SWIGINTERN PyObject *_wrap_new_FEdgesContainer(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_FEdgesContainer'.\n  Possible C/C++ prototypes are:\n    std::vector<(p.FEdge)>()\n    std::vector<(p.FEdge)>(std::vector<FEdge * > const &)\n    std::vector<(p.FEdge)>(std::vector<FEdge * >::size_type)\n    std::vector<(p.FEdge)>(std::vector<FEdge * >::size_type,std::vector<FEdge * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_FEdgesContainer'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    std::vector< FEdge * >()\n"
+    "    std::vector< FEdge * >(std::vector< FEdge * > const &)\n"
+    "    std::vector< FEdge * >(std::vector< FEdge * >::size_type)\n"
+    "    std::vector< FEdge * >(std::vector< FEdge * >::size_type,std::vector< FEdge * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_push_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::value_type arg2 = (std::vector<FEdge * >::value_type) 0 ;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::value_type arg2 = (std::vector< FEdge * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -43907,16 +43135,16 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_push_back(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:FEdgesContainer_push_back",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_push_back" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_push_back" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgesContainer_push_back" "', argument " "2"" of type '" "std::vector<FEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FEdgesContainer_push_back" "', argument " "2"" of type '" "std::vector< FEdge * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<FEdge * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector< FEdge * >::value_type >(argp2);
   {
     try {
       (arg1)->push_back(arg2);
@@ -43937,21 +43165,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_front(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::value_type result;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_front",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_front" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_front" "', argument " "1"" of type '" "std::vector< FEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   {
     try {
-      result = (std::vector<FEdge * >::value_type)((std::vector<FEdge * > const *)arg1)->front();
+      result = (std::vector< FEdge * >::value_type)((std::vector< FEdge * > const *)arg1)->front();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -43960,7 +43188,7 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_front(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -43969,21 +43197,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::value_type result;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_back" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_back" "', argument " "1"" of type '" "std::vector< FEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   {
     try {
-      result = (std::vector<FEdge * >::value_type)((std::vector<FEdge * > const *)arg1)->back();
+      result = (std::vector< FEdge * >::value_type)((std::vector< FEdge * > const *)arg1)->back();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -43992,7 +43220,7 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_back(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -44001,9 +43229,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_assign(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::size_type arg2 ;
-  std::vector<FEdge * >::value_type arg3 = (std::vector<FEdge * >::value_type) 0 ;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::size_type arg2 ;
+  std::vector< FEdge * >::value_type arg3 = (std::vector< FEdge * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -44015,21 +43243,21 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_assign(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:FEdgesContainer_assign",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_assign" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_assign" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer_assign" "', argument " "2"" of type '" "std::vector<FEdge * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer_assign" "', argument " "2"" of type '" "std::vector< FEdge * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<FEdge * >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector< FEdge * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FEdgesContainer_assign" "', argument " "3"" of type '" "std::vector<FEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FEdgesContainer_assign" "', argument " "3"" of type '" "std::vector< FEdge * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<FEdge * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< FEdge * >::value_type >(argp3);
   {
     try {
       (arg1)->assign(arg2,arg3);
@@ -44050,9 +43278,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::size_type arg2 ;
-  std::vector<FEdge * >::value_type arg3 = (std::vector<FEdge * >::value_type) 0 ;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::size_type arg2 ;
+  std::vector< FEdge * >::value_type arg3 = (std::vector< FEdge * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -44064,21 +43292,21 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_resize__SWIG_1(PyObject *SWIGUNUSEDPA
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:FEdgesContainer_resize",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_resize" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_resize" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer_resize" "', argument " "2"" of type '" "std::vector<FEdge * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer_resize" "', argument " "2"" of type '" "std::vector< FEdge * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<FEdge * >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector< FEdge * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FEdgesContainer_resize" "', argument " "3"" of type '" "std::vector<FEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FEdgesContainer_resize" "', argument " "3"" of type '" "std::vector< FEdge * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<FEdge * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< FEdge * >::value_type >(argp3);
   {
     try {
       (arg1)->resize(arg2,arg3);
@@ -44103,13 +43331,13 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_resize(PyObject *self, PyObject *args
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator< FEdge * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -44123,7 +43351,7 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_resize(PyObject *self, PyObject *args
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator< FEdge * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -44132,7 +43360,7 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_resize(PyObject *self, PyObject *args
       }
       if (_v) {
         void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0);
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           return _wrap_FEdgesContainer_resize__SWIG_1(self, args);
@@ -44142,17 +43370,20 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_resize(PyObject *self, PyObject *args
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdgesContainer_resize'.\n  Possible C/C++ prototypes are:\n    resize(std::vector<FEdge * >::size_type)\n    resize(std::vector<FEdge * >::size_type,std::vector<FEdge * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdgesContainer_resize'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    resize(std::vector< FEdge * > *,std::vector< FEdge * >::size_type)\n"
+    "    resize(std::vector< FEdge * > *,std::vector< FEdge * >::size_type,std::vector< FEdge * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::iterator arg2 ;
-  std::vector<FEdge * >::value_type arg3 = (std::vector<FEdge * >::value_type) 0 ;
-  std::vector<FEdge * >::iterator result;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::iterator arg2 ;
+  std::vector< FEdge * >::value_type arg3 = (std::vector< FEdge * >::value_type) 0 ;
+  std::vector< FEdge * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -44164,27 +43395,27 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_insert__SWIG_0(PyObject *SWIGUNUSEDPA
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:FEdgesContainer_insert",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_insert" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_insert" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_insert" "', argument " "2"" of type '" "std::vector<FEdge * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_insert" "', argument " "2"" of type '" "std::vector< FEdge * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< FEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< FEdge * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_insert" "', argument " "2"" of type '" "std::vector<FEdge * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_insert" "', argument " "2"" of type '" "std::vector< FEdge * >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FEdgesContainer_insert" "', argument " "3"" of type '" "std::vector<FEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "FEdgesContainer_insert" "', argument " "3"" of type '" "std::vector< FEdge * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<FEdge * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< FEdge * >::value_type >(argp3);
   {
     try {
       result = (arg1)->insert(arg2,arg3);
@@ -44196,7 +43427,7 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_insert__SWIG_0(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<FEdge * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< FEdge * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -44206,10 +43437,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::iterator arg2 ;
-  std::vector<FEdge * >::size_type arg3 ;
-  std::vector<FEdge * >::value_type arg4 = (std::vector<FEdge * >::value_type) 0 ;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::iterator arg2 ;
+  std::vector< FEdge * >::size_type arg3 ;
+  std::vector< FEdge * >::value_type arg4 = (std::vector< FEdge * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -44224,32 +43455,32 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_insert__SWIG_1(PyObject *SWIGUNUSEDPA
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:FEdgesContainer_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_insert" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_insert" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_insert" "', argument " "2"" of type '" "std::vector<FEdge * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_insert" "', argument " "2"" of type '" "std::vector< FEdge * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< FEdge * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< FEdge * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_insert" "', argument " "2"" of type '" "std::vector<FEdge * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "FEdgesContainer_insert" "', argument " "2"" of type '" "std::vector< FEdge * >::iterator""'");
     }
   }
   ecode3 = SWIG_AsVal_size_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FEdgesContainer_insert" "', argument " "3"" of type '" "std::vector<FEdge * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "FEdgesContainer_insert" "', argument " "3"" of type '" "std::vector< FEdge * >::size_type""'");
   } 
-  arg3 = static_cast< std::vector<FEdge * >::size_type >(val3);
-  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0 |  0 );
+  arg3 = static_cast< std::vector< FEdge * >::size_type >(val3);
+  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "FEdgesContainer_insert" "', argument " "4"" of type '" "std::vector<FEdge * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "FEdgesContainer_insert" "', argument " "4"" of type '" "std::vector< FEdge * >::value_type""'"); 
   }
-  arg4 = reinterpret_cast< std::vector<FEdge * >::value_type >(argp4);
+  arg4 = reinterpret_cast< std::vector< FEdge * >::value_type >(argp4);
   {
     try {
       (arg1)->insert(arg2,arg3,arg4);
@@ -44274,21 +43505,21 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_insert(PyObject *self, PyObject *args
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator< FEdge * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< FEdge * >::iterator > *>(iter) != 0));
       if (_v) {
         void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0);
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           return _wrap_FEdgesContainer_insert__SWIG_0(self, args);
@@ -44298,12 +43529,12 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_insert(PyObject *self, PyObject *args
   }
   if (argc == 4) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator<FEdge * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<FEdge*,std::allocator< FEdge * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<FEdge * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< FEdge * >::iterator > *>(iter) != 0));
       if (_v) {
         {
           int res = SWIG_AsVal_size_t(argv[2], NULL);
@@ -44311,7 +43542,7 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_insert(PyObject *self, PyObject *args
         }
         if (_v) {
           void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0);
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0);
           _v = SWIG_CheckState(res);
           if (_v) {
             return _wrap_FEdgesContainer_insert__SWIG_1(self, args);
@@ -44322,15 +43553,18 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_insert(PyObject *self, PyObject *args
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdgesContainer_insert'.\n  Possible C/C++ prototypes are:\n    insert(std::vector<FEdge * >::iterator,std::vector<FEdge * >::value_type)\n    insert(std::vector<FEdge * >::iterator,std::vector<FEdge * >::size_type,std::vector<FEdge * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'FEdgesContainer_insert'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    insert(std::vector< FEdge * > *,std::vector< FEdge * >::iterator,std::vector< FEdge * >::value_type)\n"
+    "    insert(std::vector< FEdge * > *,std::vector< FEdge * >::iterator,std::vector< FEdge * >::size_type,std::vector< FEdge * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_reserve(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::size_type arg2 ;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::size_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -44339,16 +43573,16 @@ SWIGINTERN PyObject *_wrap_FEdgesContainer_reserve(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:FEdgesContainer_reserve",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_reserve" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_reserve" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer_reserve" "', argument " "2"" of type '" "std::vector<FEdge * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FEdgesContainer_reserve" "', argument " "2"" of type '" "std::vector< FEdge * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<FEdge * >::size_type >(val2);
+  arg2 = static_cast< std::vector< FEdge * >::size_type >(val2);
   {
     try {
       (arg1)->reserve(arg2);
@@ -44369,21 +43603,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_FEdgesContainer_capacity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
-  std::vector<FEdge * >::size_type result;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
+  std::vector< FEdge * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:FEdgesContainer_capacity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_capacity" "', argument " "1"" of type '" "std::vector<FEdge * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FEdgesContainer_capacity" "', argument " "1"" of type '" "std::vector< FEdge * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   {
     try {
-      result = ((std::vector<FEdge * > const *)arg1)->capacity();
+      result = ((std::vector< FEdge * > const *)arg1)->capacity();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -44401,17 +43635,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_FEdgesContainer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<FEdge * > *arg1 = (std::vector<FEdge * > *) 0 ;
+  std::vector< FEdge * > *arg1 = (std::vector< FEdge * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_FEdgesContainer",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FEdgesContainer" "', argument " "1"" of type '" "std::vector<FEdge * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_FEdgesContainer" "', argument " "1"" of type '" "std::vector< FEdge * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<FEdge * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< FEdge * > * >(argp1);
   {
     try {
       delete arg1;
@@ -44433,14 +43667,14 @@ fail:
 
 SWIGINTERN PyObject *FEdgesContainer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
   PyObject **arg2 = (PyObject **) 0 ;
   swig::PySwigIterator *result = 0 ;
   void *argp1 = 0 ;
@@ -44449,11 +43683,11 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_iterator(PyObject *SWIGUNUSEDPA
   
   arg2 = &obj0;
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_iterator" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_iterator" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   {
     try {
       result = (swig::PySwigIterator *)std_vector_Sl_ViewVertex_Sm__Sg__iterator(arg1,arg2);
@@ -44474,21 +43708,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer___nonzero__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer___nonzero__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___nonzero__" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___nonzero__" "', argument " "1"" of type '" "std::vector< ViewVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   {
     try {
-      result = (bool)std_vector_Sl_ViewVertex_Sm__Sg____nonzero__((std::vector<ViewVertex * > const *)arg1);
+      result = (bool)std_vector_Sl_ViewVertex_Sm__Sg____nonzero__((std::vector< ViewVertex * > const *)arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -44506,21 +43740,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer___len__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::size_type result;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer___len__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___len__" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___len__" "', argument " "1"" of type '" "std::vector< ViewVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   {
     try {
-      result = std_vector_Sl_ViewVertex_Sm__Sg____len__((std::vector<ViewVertex * > const *)arg1);
+      result = std_vector_Sl_ViewVertex_Sm__Sg____len__((std::vector< ViewVertex * > const *)arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -44538,22 +43772,22 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::value_type result;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_pop" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_pop" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   {
     try {
       try {
-        result = (std::vector<ViewVertex * >::value_type)std_vector_Sl_ViewVertex_Sm__Sg__pop(arg1);
+        result = (std::vector< ViewVertex * >::value_type)std_vector_Sl_ViewVertex_Sm__Sg__pop(arg1);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -44567,7 +43801,7 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_pop(PyObject *SWIGUNUSEDPARM(se
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -44576,10 +43810,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::difference_type arg2 ;
-  std::vector<ViewVertex * >::difference_type arg3 ;
-  std::vector<ViewVertex *,std::allocator<ViewVertex * > > *result = 0 ;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::difference_type arg2 ;
+  std::vector< ViewVertex * >::difference_type arg3 ;
+  std::vector< ViewVertex *,std::allocator< ViewVertex * > > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -44591,25 +43825,25 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer___getslice__(PyObject *SWIGUNUS
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewVerticesContainer___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___getslice__" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___getslice__" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer___getslice__" "', argument " "2"" of type '" "std::vector<ViewVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer___getslice__" "', argument " "2"" of type '" "std::vector< ViewVertex * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewVertex * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< ViewVertex * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewVerticesContainer___getslice__" "', argument " "3"" of type '" "std::vector<ViewVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewVerticesContainer___getslice__" "', argument " "3"" of type '" "std::vector< ViewVertex * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<ViewVertex * >::difference_type >(val3);
+  arg3 = static_cast< std::vector< ViewVertex * >::difference_type >(val3);
   {
     try {
       try {
-        result = (std::vector<ViewVertex *,std::allocator<ViewVertex * > > *)std_vector_Sl_ViewVertex_Sm__Sg____getslice__(arg1,arg2,arg3);
+        result = (std::vector< ViewVertex *,std::allocator< ViewVertex * > > *)std_vector_Sl_ViewVertex_Sm__Sg____getslice__(arg1,arg2,arg3);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -44623,7 +43857,7 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer___getslice__(PyObject *SWIGUNUS
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -44632,10 +43866,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer___setslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::difference_type arg2 ;
-  std::vector<ViewVertex * >::difference_type arg3 ;
-  std::vector<ViewVertex *,std::allocator<ViewVertex * > > *arg4 = 0 ;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::difference_type arg2 ;
+  std::vector< ViewVertex * >::difference_type arg3 ;
+  std::vector< ViewVertex *,std::allocator< ViewVertex * > > *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -44649,36 +43883,36 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer___setslice__(PyObject *SWIGUNUS
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:ViewVerticesContainer___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___setslice__" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___setslice__" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer___setslice__" "', argument " "2"" of type '" "std::vector<ViewVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer___setslice__" "', argument " "2"" of type '" "std::vector< ViewVertex * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewVertex * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< ViewVertex * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewVerticesContainer___setslice__" "', argument " "3"" of type '" "std::vector<ViewVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewVerticesContainer___setslice__" "', argument " "3"" of type '" "std::vector< ViewVertex * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<ViewVertex * >::difference_type >(val3);
+  arg3 = static_cast< std::vector< ViewVertex * >::difference_type >(val3);
   {
-    std::vector<ViewVertex*,std::allocator<ViewVertex * > > *ptr = (std::vector<ViewVertex*,std::allocator<ViewVertex * > > *)0;
+    std::vector<ViewVertex*,std::allocator< ViewVertex * > > *ptr = (std::vector<ViewVertex*,std::allocator< ViewVertex * > > *)0;
     res4 = swig::asptr(obj3, &ptr);
     if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewVerticesContainer___setslice__" "', argument " "4"" of type '" "std::vector<ViewVertex *,std::allocator<ViewVertex * > > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewVerticesContainer___setslice__" "', argument " "4"" of type '" "std::vector< ViewVertex *,std::allocator< ViewVertex * > > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewVerticesContainer___setslice__" "', argument " "4"" of type '" "std::vector<ViewVertex *,std::allocator<ViewVertex * > > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewVerticesContainer___setslice__" "', argument " "4"" of type '" "std::vector< ViewVertex *,std::allocator< ViewVertex * > > const &""'"); 
     }
     arg4 = ptr;
   }
   {
     try {
       try {
-        std_vector_Sl_ViewVertex_Sm__Sg____setslice__(arg1,arg2,arg3,(std::vector<ViewVertex *,std::allocator<ViewVertex * > > const &)*arg4);
+        std_vector_Sl_ViewVertex_Sm__Sg____setslice__(arg1,arg2,arg3,(std::vector< ViewVertex *,std::allocator< ViewVertex * > > const &)*arg4);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -44706,9 +43940,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer___delslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::difference_type arg2 ;
-  std::vector<ViewVertex * >::difference_type arg3 ;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::difference_type arg2 ;
+  std::vector< ViewVertex * >::difference_type arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -44720,21 +43954,21 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer___delslice__(PyObject *SWIGUNUS
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewVerticesContainer___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___delslice__" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___delslice__" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer___delslice__" "', argument " "2"" of type '" "std::vector<ViewVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer___delslice__" "', argument " "2"" of type '" "std::vector< ViewVertex * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewVertex * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< ViewVertex * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewVerticesContainer___delslice__" "', argument " "3"" of type '" "std::vector<ViewVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewVerticesContainer___delslice__" "', argument " "3"" of type '" "std::vector< ViewVertex * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<ViewVertex * >::difference_type >(val3);
+  arg3 = static_cast< std::vector< ViewVertex * >::difference_type >(val3);
   {
     try {
       try {
@@ -44761,8 +43995,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer___delitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::difference_type arg2 ;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::difference_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -44771,16 +44005,16 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer___delitem__(PyObject *SWIGUNUSE
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewVerticesContainer___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___delitem__" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___delitem__" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer___delitem__" "', argument " "2"" of type '" "std::vector<ViewVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer___delitem__" "', argument " "2"" of type '" "std::vector< ViewVertex * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewVertex * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< ViewVertex * >::difference_type >(val2);
   {
     try {
       try {
@@ -44807,9 +44041,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer___getitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::difference_type arg2 ;
-  std::vector<ViewVertex * >::value_type result;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::difference_type arg2 ;
+  std::vector< ViewVertex * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -44818,20 +44052,20 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer___getitem__(PyObject *SWIGUNUSE
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewVerticesContainer___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___getitem__" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___getitem__" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer___getitem__" "', argument " "2"" of type '" "std::vector<ViewVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer___getitem__" "', argument " "2"" of type '" "std::vector< ViewVertex * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewVertex * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< ViewVertex * >::difference_type >(val2);
   {
     try {
       try {
-        result = (std::vector<ViewVertex * >::value_type)std_vector_Sl_ViewVertex_Sm__Sg____getitem__(arg1,arg2);
+        result = (std::vector< ViewVertex * >::value_type)std_vector_Sl_ViewVertex_Sm__Sg____getitem__(arg1,arg2);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -44845,7 +44079,7 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer___getitem__(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -44854,9 +44088,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer___setitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::difference_type arg2 ;
-  std::vector<ViewVertex * >::value_type arg3 = (std::vector<ViewVertex * >::value_type) 0 ;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::difference_type arg2 ;
+  std::vector< ViewVertex * >::value_type arg3 = (std::vector< ViewVertex * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -44868,21 +44102,21 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer___setitem__(PyObject *SWIGUNUSE
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewVerticesContainer___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___setitem__" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer___setitem__" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer___setitem__" "', argument " "2"" of type '" "std::vector<ViewVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer___setitem__" "', argument " "2"" of type '" "std::vector< ViewVertex * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewVertex * >::difference_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector< ViewVertex * >::difference_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewVerticesContainer___setitem__" "', argument " "3"" of type '" "std::vector<ViewVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewVerticesContainer___setitem__" "', argument " "3"" of type '" "std::vector< ViewVertex * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<ViewVertex * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< ViewVertex * >::value_type >(argp3);
   {
     try {
       try {
@@ -44909,8 +44143,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::value_type arg2 = (std::vector<ViewVertex * >::value_type) 0 ;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::value_type arg2 = (std::vector< ViewVertex * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -44919,16 +44153,16 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_append(PyObject *SWIGUNUSEDPARM
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewVerticesContainer_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_append" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_append" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewVerticesContainer_append" "', argument " "2"" of type '" "std::vector<ViewVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewVerticesContainer_append" "', argument " "2"" of type '" "std::vector< ViewVertex * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<ViewVertex * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector< ViewVertex * >::value_type >(argp2);
   {
     try {
       std_vector_Sl_ViewVertex_Sm__Sg__append(arg1,arg2);
@@ -44949,12 +44183,12 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *result = 0 ;
+  std::vector< ViewVertex * > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_ViewVerticesContainer")) SWIG_fail;
   {
     try {
-      result = (std::vector<ViewVertex * > *)new std::vector<ViewVertex * >();
+      result = (std::vector< ViewVertex * > *)new std::vector< ViewVertex * >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -44963,7 +44197,7 @@ SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer__SWIG_0(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -44972,26 +44206,26 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = 0 ;
-  std::vector<ViewVertex * > *result = 0 ;
+  std::vector< ViewVertex * > *arg1 = 0 ;
+  std::vector< ViewVertex * > *result = 0 ;
   int res1 = SWIG_OLDOBJ ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_ViewVerticesContainer",&obj0)) SWIG_fail;
   {
-    std::vector<ViewVertex*,std::allocator<ViewVertex * > > *ptr = (std::vector<ViewVertex*,std::allocator<ViewVertex * > > *)0;
+    std::vector<ViewVertex*,std::allocator< ViewVertex * > > *ptr = (std::vector<ViewVertex*,std::allocator< ViewVertex * > > *)0;
     res1 = swig::asptr(obj0, &ptr);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ViewVerticesContainer" "', argument " "1"" of type '" "std::vector<ViewVertex * > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ViewVerticesContainer" "', argument " "1"" of type '" "std::vector< ViewVertex * > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ViewVerticesContainer" "', argument " "1"" of type '" "std::vector<ViewVertex * > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ViewVerticesContainer" "', argument " "1"" of type '" "std::vector< ViewVertex * > const &""'"); 
     }
     arg1 = ptr;
   }
   {
     try {
-      result = (std::vector<ViewVertex * > *)new std::vector<ViewVertex * >((std::vector<ViewVertex * > const &)*arg1);
+      result = (std::vector< ViewVertex * > *)new std::vector< ViewVertex * >((std::vector< ViewVertex * > const &)*arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -45000,7 +44234,7 @@ SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer__SWIG_1(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, SWIG_POINTER_NEW |  0 );
   if (SWIG_IsNewObj(res1)) delete arg1;
   return resultobj;
 fail:
@@ -45011,21 +44245,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_empty",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_empty" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_empty" "', argument " "1"" of type '" "std::vector< ViewVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   {
     try {
-      result = (bool)((std::vector<ViewVertex * > const *)arg1)->empty();
+      result = (bool)((std::vector< ViewVertex * > const *)arg1)->empty();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -45043,21 +44277,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::size_type result;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_size" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_size" "', argument " "1"" of type '" "std::vector< ViewVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   {
     try {
-      result = ((std::vector<ViewVertex * > const *)arg1)->size();
+      result = ((std::vector< ViewVertex * > const *)arg1)->size();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -45075,17 +44309,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_clear" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_clear" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   {
     try {
       (arg1)->clear();
@@ -45106,8 +44340,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * > *arg2 = 0 ;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -45116,19 +44350,19 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_swap(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewVerticesContainer_swap",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_swap" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_swap" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t,  0 );
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewVerticesContainer_swap" "', argument " "2"" of type '" "std::vector<ViewVertex * > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewVerticesContainer_swap" "', argument " "2"" of type '" "std::vector< ViewVertex * > &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewVerticesContainer_swap" "', argument " "2"" of type '" "std::vector<ViewVertex * > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewVerticesContainer_swap" "', argument " "2"" of type '" "std::vector< ViewVertex * > &""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<ViewVertex * > * >(argp2);
+  arg2 = reinterpret_cast< std::vector< ViewVertex * > * >(argp2);
   {
     try {
       (arg1)->swap(*arg2);
@@ -45149,21 +44383,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  SwigValueWrapper<std::allocator<ViewVertex * > > result;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  SwigValueWrapper< std::allocator< ViewVertex * > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_get_allocator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_get_allocator" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_get_allocator" "', argument " "1"" of type '" "std::vector< ViewVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   {
     try {
-      result = ((std::vector<ViewVertex * > const *)arg1)->get_allocator();
+      result = ((std::vector< ViewVertex * > const *)arg1)->get_allocator();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -45172,30 +44406,30 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_get_allocator(PyObject *SWIGUNU
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new std::vector<ViewVertex * >::allocator_type(static_cast< const std::vector<ViewVertex * >::allocator_type& >(result))), SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new std::vector< ViewVertex * >::allocator_type(static_cast< const std::vector< ViewVertex * >::allocator_type& >(result))), SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVerticesContainer_begin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::iterator result;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::const_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_begin" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_begin" "', argument " "1"" of type '" "std::vector< ViewVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   {
     try {
-      result = (arg1)->begin();
+      result = ((std::vector< ViewVertex * > const *)arg1)->begin();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -45204,7 +44438,7 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_begin__SWIG_0(PyObject *SWIGUNU
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewVertex * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewVertex * >::const_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -45212,89 +44446,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVerticesContainer_begin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::const_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_begin" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<ViewVertex * > const *)arg1)->begin();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewVertex * >::const_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ViewVerticesContainer_begin(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewVerticesContainer_begin__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewVerticesContainer_begin__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVerticesContainer_begin'.\n  Possible C/C++ prototypes are:\n    begin()\n    begin()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ViewVerticesContainer_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::iterator result;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::const_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_end" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_end" "', argument " "1"" of type '" "std::vector< ViewVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   {
     try {
-      result = (arg1)->end();
+      result = ((std::vector< ViewVertex * > const *)arg1)->end();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -45303,7 +44471,7 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_end__SWIG_0(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewVertex * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewVertex * >::const_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -45311,89 +44479,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVerticesContainer_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_rbegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::const_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_end" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<ViewVertex * > const *)arg1)->end();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewVertex * >::const_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ViewVerticesContainer_end(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewVerticesContainer_end__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewVerticesContainer_end__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVerticesContainer_end'.\n  Possible C/C++ prototypes are:\n    end()\n    end()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ViewVerticesContainer_rbegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::reverse_iterator result;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::const_reverse_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_rbegin" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_rbegin" "', argument " "1"" of type '" "std::vector< ViewVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   {
     try {
-      result = (arg1)->rbegin();
+      result = ((std::vector< ViewVertex * > const *)arg1)->rbegin();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -45402,7 +44504,7 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_rbegin__SWIG_0(PyObject *SWIGUN
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewVertex * >::reverse_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewVertex * >::const_reverse_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -45410,89 +44512,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVerticesContainer_rbegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewVerticesContainer_rend(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::const_reverse_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_rbegin" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<ViewVertex * > const *)arg1)->rbegin();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewVertex * >::const_reverse_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ViewVerticesContainer_rbegin(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewVerticesContainer_rbegin__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewVerticesContainer_rbegin__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVerticesContainer_rbegin'.\n  Possible C/C++ prototypes are:\n    rbegin()\n    rbegin()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ViewVerticesContainer_rend__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::reverse_iterator result;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::const_reverse_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_rend" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_rend" "', argument " "1"" of type '" "std::vector< ViewVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   {
     try {
-      result = (arg1)->rend();
+      result = ((std::vector< ViewVertex * > const *)arg1)->rend();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -45501,7 +44537,7 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_rend__SWIG_0(PyObject *SWIGUNUS
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewVertex * >::reverse_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewVertex * >::const_reverse_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -45509,76 +44545,10 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVerticesContainer_rend__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::const_reverse_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_rend" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<ViewVertex * > const *)arg1)->rend();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewVertex * >::const_reverse_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ViewVerticesContainer_rend(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewVerticesContainer_rend__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ViewVerticesContainer_rend__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVerticesContainer_rend'.\n  Possible C/C++ prototypes are:\n    rend()\n    rend()\n");
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * >::size_type arg1 ;
-  std::vector<ViewVertex * > *result = 0 ;
+  std::vector< ViewVertex * >::size_type arg1 ;
+  std::vector< ViewVertex * > *result = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -45586,12 +44556,12 @@ SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer__SWIG_2(PyObject *SWIGUNUSE
   if (!PyArg_ParseTuple(args,(char *)"O:new_ViewVerticesContainer",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ViewVerticesContainer" "', argument " "1"" of type '" "std::vector<ViewVertex * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ViewVerticesContainer" "', argument " "1"" of type '" "std::vector< ViewVertex * >::size_type""'");
   } 
-  arg1 = static_cast< std::vector<ViewVertex * >::size_type >(val1);
+  arg1 = static_cast< std::vector< ViewVertex * >::size_type >(val1);
   {
     try {
-      result = (std::vector<ViewVertex * > *)new std::vector<ViewVertex * >(arg1);
+      result = (std::vector< ViewVertex * > *)new std::vector< ViewVertex * >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -45600,7 +44570,7 @@ SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer__SWIG_2(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -45609,17 +44579,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_pop_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_pop_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_pop_back" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_pop_back" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   {
     try {
       (arg1)->pop_back();
@@ -45640,8 +44610,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::size_type arg2 ;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::size_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -45650,16 +44620,16 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_resize__SWIG_0(PyObject *SWIGUN
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewVerticesContainer_resize",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_resize" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_resize" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer_resize" "', argument " "2"" of type '" "std::vector<ViewVertex * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer_resize" "', argument " "2"" of type '" "std::vector< ViewVertex * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewVertex * >::size_type >(val2);
+  arg2 = static_cast< std::vector< ViewVertex * >::size_type >(val2);
   {
     try {
       (arg1)->resize(arg2);
@@ -45680,9 +44650,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::iterator arg2 ;
-  std::vector<ViewVertex * >::iterator result;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::iterator arg2 ;
+  std::vector< ViewVertex * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -45691,20 +44661,20 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_erase__SWIG_0(PyObject *SWIGUNU
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewVerticesContainer_erase",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_erase" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_erase" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewVertex * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_erase" "', argument " "2"" of type '" "std::vector< ViewVertex * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< ViewVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< ViewVertex * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewVertex * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_erase" "', argument " "2"" of type '" "std::vector< ViewVertex * >::iterator""'");
     }
   }
   {
@@ -45718,7 +44688,7 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_erase__SWIG_0(PyObject *SWIGUNU
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewVertex * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewVertex * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -45728,10 +44698,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::iterator arg2 ;
-  std::vector<ViewVertex * >::iterator arg3 ;
-  std::vector<ViewVertex * >::iterator result;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::iterator arg2 ;
+  std::vector< ViewVertex * >::iterator arg3 ;
+  std::vector< ViewVertex * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -45743,31 +44713,31 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_erase__SWIG_1(PyObject *SWIGUNU
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewVerticesContainer_erase",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_erase" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_erase" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewVertex * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_erase" "', argument " "2"" of type '" "std::vector< ViewVertex * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< ViewVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< ViewVertex * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_erase" "', argument " "2"" of type '" "std::vector<ViewVertex * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_erase" "', argument " "2"" of type '" "std::vector< ViewVertex * >::iterator""'");
     }
   }
   res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res3) || !iter3) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_erase" "', argument " "3"" of type '" "std::vector<ViewVertex * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_erase" "', argument " "3"" of type '" "std::vector< ViewVertex * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *>(iter3);
+    swig::PySwigIterator_T<std::vector< ViewVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< ViewVertex * >::iterator > *>(iter3);
     if (iter_t) {
       arg3 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_erase" "', argument " "3"" of type '" "std::vector<ViewVertex * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_erase" "', argument " "3"" of type '" "std::vector< ViewVertex * >::iterator""'");
     }
   }
   {
@@ -45781,7 +44751,7 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_erase__SWIG_1(PyObject *SWIGUNU
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewVertex * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewVertex * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -45795,18 +44765,18 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_erase(PyObject *self, PyObject
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator< ViewVertex * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< ViewVertex * >::iterator > *>(iter) != 0));
       if (_v) {
         return _wrap_ViewVerticesContainer_erase__SWIG_0(self, args);
       }
@@ -45814,16 +44784,16 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_erase(PyObject *self, PyObject
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator< ViewVertex * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< ViewVertex * >::iterator > *>(iter) != 0));
       if (_v) {
         swig::PySwigIterator *iter = 0;
         int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *>(iter) != 0));
+        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< ViewVertex * >::iterator > *>(iter) != 0));
         if (_v) {
           return _wrap_ViewVerticesContainer_erase__SWIG_1(self, args);
         }
@@ -45832,16 +44802,19 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_erase(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVerticesContainer_erase'.\n  Possible C/C++ prototypes are:\n    erase(std::vector<ViewVertex * >::iterator)\n    erase(std::vector<ViewVertex * >::iterator,std::vector<ViewVertex * >::iterator)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVerticesContainer_erase'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    erase(std::vector< ViewVertex * > *,std::vector< ViewVertex * >::iterator)\n"
+    "    erase(std::vector< ViewVertex * > *,std::vector< ViewVertex * >::iterator,std::vector< ViewVertex * >::iterator)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * >::size_type arg1 ;
-  std::vector<ViewVertex * >::value_type arg2 = (std::vector<ViewVertex * >::value_type) 0 ;
-  std::vector<ViewVertex * > *result = 0 ;
+  std::vector< ViewVertex * >::size_type arg1 ;
+  std::vector< ViewVertex * >::value_type arg2 = (std::vector< ViewVertex * >::value_type) 0 ;
+  std::vector< ViewVertex * > *result = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   void *argp2 = 0 ;
@@ -45852,17 +44825,17 @@ SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer__SWIG_3(PyObject *SWIGUNUSE
   if (!PyArg_ParseTuple(args,(char *)"OO:new_ViewVerticesContainer",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ViewVerticesContainer" "', argument " "1"" of type '" "std::vector<ViewVertex * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ViewVerticesContainer" "', argument " "1"" of type '" "std::vector< ViewVertex * >::size_type""'");
   } 
-  arg1 = static_cast< std::vector<ViewVertex * >::size_type >(val1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
+  arg1 = static_cast< std::vector< ViewVertex * >::size_type >(val1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ViewVerticesContainer" "', argument " "2"" of type '" "std::vector<ViewVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ViewVerticesContainer" "', argument " "2"" of type '" "std::vector< ViewVertex * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<ViewVertex * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector< ViewVertex * >::value_type >(argp2);
   {
     try {
-      result = (std::vector<ViewVertex * > *)new std::vector<ViewVertex * >(arg1,arg2);
+      result = (std::vector< ViewVertex * > *)new std::vector< ViewVertex * >(arg1,arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -45871,7 +44844,7 @@ SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer__SWIG_3(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -45884,7 +44857,7 @@ SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer(PyObject *self, PyObject *a
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -45903,7 +44876,7 @@ SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer(PyObject *self, PyObject *a
   }
   if (argc == 1) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator< ViewVertex * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_new_ViewVerticesContainer__SWIG_1(self, args);
@@ -45917,7 +44890,7 @@ SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer(PyObject *self, PyObject *a
     }
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_new_ViewVerticesContainer__SWIG_3(self, args);
@@ -45926,15 +44899,20 @@ SWIGINTERN PyObject *_wrap_new_ViewVerticesContainer(PyObject *self, PyObject *a
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewVerticesContainer'.\n  Possible C/C++ prototypes are:\n    std::vector<(p.ViewVertex)>()\n    std::vector<(p.ViewVertex)>(std::vector<ViewVertex * > const &)\n    std::vector<(p.ViewVertex)>(std::vector<ViewVertex * >::size_type)\n    std::vector<(p.ViewVertex)>(std::vector<ViewVertex * >::size_type,std::vector<ViewVertex * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewVerticesContainer'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    std::vector< ViewVertex * >()\n"
+    "    std::vector< ViewVertex * >(std::vector< ViewVertex * > const &)\n"
+    "    std::vector< ViewVertex * >(std::vector< ViewVertex * >::size_type)\n"
+    "    std::vector< ViewVertex * >(std::vector< ViewVertex * >::size_type,std::vector< ViewVertex * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_push_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::value_type arg2 = (std::vector<ViewVertex * >::value_type) 0 ;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::value_type arg2 = (std::vector< ViewVertex * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -45943,16 +44921,16 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_push_back(PyObject *SWIGUNUSEDP
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewVerticesContainer_push_back",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_push_back" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_push_back" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewVerticesContainer_push_back" "', argument " "2"" of type '" "std::vector<ViewVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewVerticesContainer_push_back" "', argument " "2"" of type '" "std::vector< ViewVertex * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<ViewVertex * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector< ViewVertex * >::value_type >(argp2);
   {
     try {
       (arg1)->push_back(arg2);
@@ -45973,21 +44951,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_front(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::value_type result;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_front",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_front" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_front" "', argument " "1"" of type '" "std::vector< ViewVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   {
     try {
-      result = (std::vector<ViewVertex * >::value_type)((std::vector<ViewVertex * > const *)arg1)->front();
+      result = (std::vector< ViewVertex * >::value_type)((std::vector< ViewVertex * > const *)arg1)->front();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -45996,7 +44974,7 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_front(PyObject *SWIGUNUSEDPARM(
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -46005,21 +44983,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::value_type result;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_back" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_back" "', argument " "1"" of type '" "std::vector< ViewVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   {
     try {
-      result = (std::vector<ViewVertex * >::value_type)((std::vector<ViewVertex * > const *)arg1)->back();
+      result = (std::vector< ViewVertex * >::value_type)((std::vector< ViewVertex * > const *)arg1)->back();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -46028,7 +45006,7 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_back(PyObject *SWIGUNUSEDPARM(s
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -46037,9 +45015,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_assign(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::size_type arg2 ;
-  std::vector<ViewVertex * >::value_type arg3 = (std::vector<ViewVertex * >::value_type) 0 ;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::size_type arg2 ;
+  std::vector< ViewVertex * >::value_type arg3 = (std::vector< ViewVertex * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -46051,21 +45029,21 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_assign(PyObject *SWIGUNUSEDPARM
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewVerticesContainer_assign",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_assign" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_assign" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer_assign" "', argument " "2"" of type '" "std::vector<ViewVertex * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer_assign" "', argument " "2"" of type '" "std::vector< ViewVertex * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewVertex * >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector< ViewVertex * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewVerticesContainer_assign" "', argument " "3"" of type '" "std::vector<ViewVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewVerticesContainer_assign" "', argument " "3"" of type '" "std::vector< ViewVertex * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<ViewVertex * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< ViewVertex * >::value_type >(argp3);
   {
     try {
       (arg1)->assign(arg2,arg3);
@@ -46086,9 +45064,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::size_type arg2 ;
-  std::vector<ViewVertex * >::value_type arg3 = (std::vector<ViewVertex * >::value_type) 0 ;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::size_type arg2 ;
+  std::vector< ViewVertex * >::value_type arg3 = (std::vector< ViewVertex * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -46100,21 +45078,21 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_resize__SWIG_1(PyObject *SWIGUN
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewVerticesContainer_resize",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_resize" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_resize" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer_resize" "', argument " "2"" of type '" "std::vector<ViewVertex * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer_resize" "', argument " "2"" of type '" "std::vector< ViewVertex * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewVertex * >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector< ViewVertex * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewVerticesContainer_resize" "', argument " "3"" of type '" "std::vector<ViewVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewVerticesContainer_resize" "', argument " "3"" of type '" "std::vector< ViewVertex * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<ViewVertex * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< ViewVertex * >::value_type >(argp3);
   {
     try {
       (arg1)->resize(arg2,arg3);
@@ -46139,13 +45117,13 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_resize(PyObject *self, PyObject
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator< ViewVertex * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -46159,7 +45137,7 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_resize(PyObject *self, PyObject
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator< ViewVertex * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -46168,7 +45146,7 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_resize(PyObject *self, PyObject
       }
       if (_v) {
         void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0);
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           return _wrap_ViewVerticesContainer_resize__SWIG_1(self, args);
@@ -46178,17 +45156,20 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_resize(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVerticesContainer_resize'.\n  Possible C/C++ prototypes are:\n    resize(std::vector<ViewVertex * >::size_type)\n    resize(std::vector<ViewVertex * >::size_type,std::vector<ViewVertex * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVerticesContainer_resize'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    resize(std::vector< ViewVertex * > *,std::vector< ViewVertex * >::size_type)\n"
+    "    resize(std::vector< ViewVertex * > *,std::vector< ViewVertex * >::size_type,std::vector< ViewVertex * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::iterator arg2 ;
-  std::vector<ViewVertex * >::value_type arg3 = (std::vector<ViewVertex * >::value_type) 0 ;
-  std::vector<ViewVertex * >::iterator result;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::iterator arg2 ;
+  std::vector< ViewVertex * >::value_type arg3 = (std::vector< ViewVertex * >::value_type) 0 ;
+  std::vector< ViewVertex * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -46200,27 +45181,27 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_insert__SWIG_0(PyObject *SWIGUN
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ViewVerticesContainer_insert",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_insert" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_insert" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewVertex * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_insert" "', argument " "2"" of type '" "std::vector< ViewVertex * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< ViewVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< ViewVertex * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewVertex * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_insert" "', argument " "2"" of type '" "std::vector< ViewVertex * >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewVerticesContainer_insert" "', argument " "3"" of type '" "std::vector<ViewVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewVerticesContainer_insert" "', argument " "3"" of type '" "std::vector< ViewVertex * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<ViewVertex * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< ViewVertex * >::value_type >(argp3);
   {
     try {
       result = (arg1)->insert(arg2,arg3);
@@ -46232,7 +45213,7 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_insert__SWIG_0(PyObject *SWIGUN
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<ViewVertex * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< ViewVertex * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -46242,10 +45223,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::iterator arg2 ;
-  std::vector<ViewVertex * >::size_type arg3 ;
-  std::vector<ViewVertex * >::value_type arg4 = (std::vector<ViewVertex * >::value_type) 0 ;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::iterator arg2 ;
+  std::vector< ViewVertex * >::size_type arg3 ;
+  std::vector< ViewVertex * >::value_type arg4 = (std::vector< ViewVertex * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -46260,32 +45241,32 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_insert__SWIG_1(PyObject *SWIGUN
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:ViewVerticesContainer_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_insert" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_insert" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewVertex * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_insert" "', argument " "2"" of type '" "std::vector< ViewVertex * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< ViewVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< ViewVertex * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_insert" "', argument " "2"" of type '" "std::vector<ViewVertex * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ViewVerticesContainer_insert" "', argument " "2"" of type '" "std::vector< ViewVertex * >::iterator""'");
     }
   }
   ecode3 = SWIG_AsVal_size_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewVerticesContainer_insert" "', argument " "3"" of type '" "std::vector<ViewVertex * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewVerticesContainer_insert" "', argument " "3"" of type '" "std::vector< ViewVertex * >::size_type""'");
   } 
-  arg3 = static_cast< std::vector<ViewVertex * >::size_type >(val3);
-  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0 |  0 );
+  arg3 = static_cast< std::vector< ViewVertex * >::size_type >(val3);
+  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewVerticesContainer_insert" "', argument " "4"" of type '" "std::vector<ViewVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewVerticesContainer_insert" "', argument " "4"" of type '" "std::vector< ViewVertex * >::value_type""'"); 
   }
-  arg4 = reinterpret_cast< std::vector<ViewVertex * >::value_type >(argp4);
+  arg4 = reinterpret_cast< std::vector< ViewVertex * >::value_type >(argp4);
   {
     try {
       (arg1)->insert(arg2,arg3,arg4);
@@ -46310,21 +45291,21 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_insert(PyObject *self, PyObject
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator< ViewVertex * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< ViewVertex * >::iterator > *>(iter) != 0));
       if (_v) {
         void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0);
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           return _wrap_ViewVerticesContainer_insert__SWIG_0(self, args);
@@ -46334,12 +45315,12 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_insert(PyObject *self, PyObject
   }
   if (argc == 4) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator<ViewVertex * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<ViewVertex*,std::allocator< ViewVertex * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<ViewVertex * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< ViewVertex * >::iterator > *>(iter) != 0));
       if (_v) {
         {
           int res = SWIG_AsVal_size_t(argv[2], NULL);
@@ -46347,7 +45328,7 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_insert(PyObject *self, PyObject
         }
         if (_v) {
           void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0);
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0);
           _v = SWIG_CheckState(res);
           if (_v) {
             return _wrap_ViewVerticesContainer_insert__SWIG_1(self, args);
@@ -46358,15 +45339,18 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_insert(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVerticesContainer_insert'.\n  Possible C/C++ prototypes are:\n    insert(std::vector<ViewVertex * >::iterator,std::vector<ViewVertex * >::value_type)\n    insert(std::vector<ViewVertex * >::iterator,std::vector<ViewVertex * >::size_type,std::vector<ViewVertex * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVerticesContainer_insert'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    insert(std::vector< ViewVertex * > *,std::vector< ViewVertex * >::iterator,std::vector< ViewVertex * >::value_type)\n"
+    "    insert(std::vector< ViewVertex * > *,std::vector< ViewVertex * >::iterator,std::vector< ViewVertex * >::size_type,std::vector< ViewVertex * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_reserve(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::size_type arg2 ;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::size_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -46375,16 +45359,16 @@ SWIGINTERN PyObject *_wrap_ViewVerticesContainer_reserve(PyObject *SWIGUNUSEDPAR
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ViewVerticesContainer_reserve",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_reserve" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_reserve" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer_reserve" "', argument " "2"" of type '" "std::vector<ViewVertex * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewVerticesContainer_reserve" "', argument " "2"" of type '" "std::vector< ViewVertex * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<ViewVertex * >::size_type >(val2);
+  arg2 = static_cast< std::vector< ViewVertex * >::size_type >(val2);
   {
     try {
       (arg1)->reserve(arg2);
@@ -46405,21 +45389,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ViewVerticesContainer_capacity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
-  std::vector<ViewVertex * >::size_type result;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ViewVerticesContainer_capacity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_capacity" "', argument " "1"" of type '" "std::vector<ViewVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewVerticesContainer_capacity" "', argument " "1"" of type '" "std::vector< ViewVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   {
     try {
-      result = ((std::vector<ViewVertex * > const *)arg1)->capacity();
+      result = ((std::vector< ViewVertex * > const *)arg1)->capacity();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -46437,17 +45421,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_ViewVerticesContainer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<ViewVertex * > *arg1 = (std::vector<ViewVertex * > *) 0 ;
+  std::vector< ViewVertex * > *arg1 = (std::vector< ViewVertex * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_ViewVerticesContainer",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ViewVerticesContainer" "', argument " "1"" of type '" "std::vector<ViewVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ViewVerticesContainer" "', argument " "1"" of type '" "std::vector< ViewVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<ViewVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< ViewVertex * > * >(argp1);
   {
     try {
       delete arg1;
@@ -46469,14 +45453,14 @@ fail:
 
 SWIGINTERN PyObject *ViewVerticesContainer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
   PyObject **arg2 = (PyObject **) 0 ;
   swig::PySwigIterator *result = 0 ;
   void *argp1 = 0 ;
@@ -46485,11 +45469,11 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_iterator(PyObject *SWIGUNUSEDPARM(
   
   arg2 = &obj0;
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_iterator" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_iterator" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   {
     try {
       result = (swig::PySwigIterator *)std_vector_Sl_SVertex_Sm__Sg__iterator(arg1,arg2);
@@ -46510,21 +45494,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer___nonzero__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer___nonzero__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___nonzero__" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___nonzero__" "', argument " "1"" of type '" "std::vector< SVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   {
     try {
-      result = (bool)std_vector_Sl_SVertex_Sm__Sg____nonzero__((std::vector<SVertex * > const *)arg1);
+      result = (bool)std_vector_Sl_SVertex_Sm__Sg____nonzero__((std::vector< SVertex * > const *)arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -46542,21 +45526,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer___len__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::size_type result;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer___len__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___len__" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___len__" "', argument " "1"" of type '" "std::vector< SVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   {
     try {
-      result = std_vector_Sl_SVertex_Sm__Sg____len__((std::vector<SVertex * > const *)arg1);
+      result = std_vector_Sl_SVertex_Sm__Sg____len__((std::vector< SVertex * > const *)arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -46574,22 +45558,22 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::value_type result;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_pop" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_pop" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   {
     try {
       try {
-        result = (std::vector<SVertex * >::value_type)std_vector_Sl_SVertex_Sm__Sg__pop(arg1);
+        result = (std::vector< SVertex * >::value_type)std_vector_Sl_SVertex_Sm__Sg__pop(arg1);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -46603,7 +45587,7 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_pop(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -46612,10 +45596,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::difference_type arg2 ;
-  std::vector<SVertex * >::difference_type arg3 ;
-  std::vector<SVertex *,std::allocator<SVertex * > > *result = 0 ;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::difference_type arg2 ;
+  std::vector< SVertex * >::difference_type arg3 ;
+  std::vector< SVertex *,std::allocator< SVertex * > > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -46627,25 +45611,25 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer___getslice__(PyObject *SWIGUNUSEDP
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:SVerticesContainer___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___getslice__" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___getslice__" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer___getslice__" "', argument " "2"" of type '" "std::vector<SVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer___getslice__" "', argument " "2"" of type '" "std::vector< SVertex * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<SVertex * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< SVertex * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SVerticesContainer___getslice__" "', argument " "3"" of type '" "std::vector<SVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SVerticesContainer___getslice__" "', argument " "3"" of type '" "std::vector< SVertex * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<SVertex * >::difference_type >(val3);
+  arg3 = static_cast< std::vector< SVertex * >::difference_type >(val3);
   {
     try {
       try {
-        result = (std::vector<SVertex *,std::allocator<SVertex * > > *)std_vector_Sl_SVertex_Sm__Sg____getslice__(arg1,arg2,arg3);
+        result = (std::vector< SVertex *,std::allocator< SVertex * > > *)std_vector_Sl_SVertex_Sm__Sg____getslice__(arg1,arg2,arg3);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -46659,7 +45643,7 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer___getslice__(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -46668,10 +45652,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer___setslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::difference_type arg2 ;
-  std::vector<SVertex * >::difference_type arg3 ;
-  std::vector<SVertex *,std::allocator<SVertex * > > *arg4 = 0 ;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::difference_type arg2 ;
+  std::vector< SVertex * >::difference_type arg3 ;
+  std::vector< SVertex *,std::allocator< SVertex * > > *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -46685,36 +45669,36 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer___setslice__(PyObject *SWIGUNUSEDP
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:SVerticesContainer___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___setslice__" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___setslice__" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer___setslice__" "', argument " "2"" of type '" "std::vector<SVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer___setslice__" "', argument " "2"" of type '" "std::vector< SVertex * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<SVertex * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< SVertex * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SVerticesContainer___setslice__" "', argument " "3"" of type '" "std::vector<SVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SVerticesContainer___setslice__" "', argument " "3"" of type '" "std::vector< SVertex * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<SVertex * >::difference_type >(val3);
+  arg3 = static_cast< std::vector< SVertex * >::difference_type >(val3);
   {
-    std::vector<SVertex*,std::allocator<SVertex * > > *ptr = (std::vector<SVertex*,std::allocator<SVertex * > > *)0;
+    std::vector<SVertex*,std::allocator< SVertex * > > *ptr = (std::vector<SVertex*,std::allocator< SVertex * > > *)0;
     res4 = swig::asptr(obj3, &ptr);
     if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "SVerticesContainer___setslice__" "', argument " "4"" of type '" "std::vector<SVertex *,std::allocator<SVertex * > > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "SVerticesContainer___setslice__" "', argument " "4"" of type '" "std::vector< SVertex *,std::allocator< SVertex * > > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SVerticesContainer___setslice__" "', argument " "4"" of type '" "std::vector<SVertex *,std::allocator<SVertex * > > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SVerticesContainer___setslice__" "', argument " "4"" of type '" "std::vector< SVertex *,std::allocator< SVertex * > > const &""'"); 
     }
     arg4 = ptr;
   }
   {
     try {
       try {
-        std_vector_Sl_SVertex_Sm__Sg____setslice__(arg1,arg2,arg3,(std::vector<SVertex *,std::allocator<SVertex * > > const &)*arg4);
+        std_vector_Sl_SVertex_Sm__Sg____setslice__(arg1,arg2,arg3,(std::vector< SVertex *,std::allocator< SVertex * > > const &)*arg4);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -46742,9 +45726,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer___delslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::difference_type arg2 ;
-  std::vector<SVertex * >::difference_type arg3 ;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::difference_type arg2 ;
+  std::vector< SVertex * >::difference_type arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -46756,21 +45740,21 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer___delslice__(PyObject *SWIGUNUSEDP
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:SVerticesContainer___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___delslice__" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___delslice__" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer___delslice__" "', argument " "2"" of type '" "std::vector<SVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer___delslice__" "', argument " "2"" of type '" "std::vector< SVertex * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<SVertex * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< SVertex * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SVerticesContainer___delslice__" "', argument " "3"" of type '" "std::vector<SVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SVerticesContainer___delslice__" "', argument " "3"" of type '" "std::vector< SVertex * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<SVertex * >::difference_type >(val3);
+  arg3 = static_cast< std::vector< SVertex * >::difference_type >(val3);
   {
     try {
       try {
@@ -46797,8 +45781,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer___delitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::difference_type arg2 ;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::difference_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -46807,16 +45791,16 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer___delitem__(PyObject *SWIGUNUSEDPA
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:SVerticesContainer___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___delitem__" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___delitem__" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer___delitem__" "', argument " "2"" of type '" "std::vector<SVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer___delitem__" "', argument " "2"" of type '" "std::vector< SVertex * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<SVertex * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< SVertex * >::difference_type >(val2);
   {
     try {
       try {
@@ -46843,9 +45827,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer___getitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::difference_type arg2 ;
-  std::vector<SVertex * >::value_type result;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::difference_type arg2 ;
+  std::vector< SVertex * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -46854,20 +45838,20 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer___getitem__(PyObject *SWIGUNUSEDPA
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:SVerticesContainer___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___getitem__" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___getitem__" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer___getitem__" "', argument " "2"" of type '" "std::vector<SVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer___getitem__" "', argument " "2"" of type '" "std::vector< SVertex * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<SVertex * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< SVertex * >::difference_type >(val2);
   {
     try {
       try {
-        result = (std::vector<SVertex * >::value_type)std_vector_Sl_SVertex_Sm__Sg____getitem__(arg1,arg2);
+        result = (std::vector< SVertex * >::value_type)std_vector_Sl_SVertex_Sm__Sg____getitem__(arg1,arg2);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -46881,7 +45865,7 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer___getitem__(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -46890,9 +45874,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer___setitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::difference_type arg2 ;
-  std::vector<SVertex * >::value_type arg3 = (std::vector<SVertex * >::value_type) 0 ;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::difference_type arg2 ;
+  std::vector< SVertex * >::value_type arg3 = (std::vector< SVertex * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -46904,21 +45888,21 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer___setitem__(PyObject *SWIGUNUSEDPA
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:SVerticesContainer___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___setitem__" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer___setitem__" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer___setitem__" "', argument " "2"" of type '" "std::vector<SVertex * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer___setitem__" "', argument " "2"" of type '" "std::vector< SVertex * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<SVertex * >::difference_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector< SVertex * >::difference_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SVerticesContainer___setitem__" "', argument " "3"" of type '" "std::vector<SVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SVerticesContainer___setitem__" "', argument " "3"" of type '" "std::vector< SVertex * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<SVertex * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< SVertex * >::value_type >(argp3);
   {
     try {
       try {
@@ -46945,8 +45929,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::value_type arg2 = (std::vector<SVertex * >::value_type) 0 ;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::value_type arg2 = (std::vector< SVertex * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -46955,16 +45939,16 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_append(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:SVerticesContainer_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_append" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_append" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVerticesContainer_append" "', argument " "2"" of type '" "std::vector<SVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVerticesContainer_append" "', argument " "2"" of type '" "std::vector< SVertex * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<SVertex * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector< SVertex * >::value_type >(argp2);
   {
     try {
       std_vector_Sl_SVertex_Sm__Sg__append(arg1,arg2);
@@ -46985,12 +45969,12 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_SVerticesContainer__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *result = 0 ;
+  std::vector< SVertex * > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_SVerticesContainer")) SWIG_fail;
   {
     try {
-      result = (std::vector<SVertex * > *)new std::vector<SVertex * >();
+      result = (std::vector< SVertex * > *)new std::vector< SVertex * >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -46999,7 +45983,7 @@ SWIGINTERN PyObject *_wrap_new_SVerticesContainer__SWIG_0(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -47008,26 +45992,26 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_SVerticesContainer__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = 0 ;
-  std::vector<SVertex * > *result = 0 ;
+  std::vector< SVertex * > *arg1 = 0 ;
+  std::vector< SVertex * > *result = 0 ;
   int res1 = SWIG_OLDOBJ ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_SVerticesContainer",&obj0)) SWIG_fail;
   {
-    std::vector<SVertex*,std::allocator<SVertex * > > *ptr = (std::vector<SVertex*,std::allocator<SVertex * > > *)0;
+    std::vector<SVertex*,std::allocator< SVertex * > > *ptr = (std::vector<SVertex*,std::allocator< SVertex * > > *)0;
     res1 = swig::asptr(obj0, &ptr);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_SVerticesContainer" "', argument " "1"" of type '" "std::vector<SVertex * > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_SVerticesContainer" "', argument " "1"" of type '" "std::vector< SVertex * > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_SVerticesContainer" "', argument " "1"" of type '" "std::vector<SVertex * > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_SVerticesContainer" "', argument " "1"" of type '" "std::vector< SVertex * > const &""'"); 
     }
     arg1 = ptr;
   }
   {
     try {
-      result = (std::vector<SVertex * > *)new std::vector<SVertex * >((std::vector<SVertex * > const &)*arg1);
+      result = (std::vector< SVertex * > *)new std::vector< SVertex * >((std::vector< SVertex * > const &)*arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -47036,7 +46020,7 @@ SWIGINTERN PyObject *_wrap_new_SVerticesContainer__SWIG_1(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, SWIG_POINTER_NEW |  0 );
   if (SWIG_IsNewObj(res1)) delete arg1;
   return resultobj;
 fail:
@@ -47047,21 +46031,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_empty",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_empty" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_empty" "', argument " "1"" of type '" "std::vector< SVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   {
     try {
-      result = (bool)((std::vector<SVertex * > const *)arg1)->empty();
+      result = (bool)((std::vector< SVertex * > const *)arg1)->empty();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -47079,21 +46063,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::size_type result;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_size" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_size" "', argument " "1"" of type '" "std::vector< SVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   {
     try {
-      result = ((std::vector<SVertex * > const *)arg1)->size();
+      result = ((std::vector< SVertex * > const *)arg1)->size();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -47111,17 +46095,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_clear" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_clear" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   {
     try {
       (arg1)->clear();
@@ -47142,8 +46126,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * > *arg2 = 0 ;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -47152,19 +46136,19 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_swap(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:SVerticesContainer_swap",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_swap" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_swap" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t,  0 );
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVerticesContainer_swap" "', argument " "2"" of type '" "std::vector<SVertex * > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVerticesContainer_swap" "', argument " "2"" of type '" "std::vector< SVertex * > &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SVerticesContainer_swap" "', argument " "2"" of type '" "std::vector<SVertex * > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "SVerticesContainer_swap" "', argument " "2"" of type '" "std::vector< SVertex * > &""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<SVertex * > * >(argp2);
+  arg2 = reinterpret_cast< std::vector< SVertex * > * >(argp2);
   {
     try {
       (arg1)->swap(*arg2);
@@ -47185,21 +46169,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  SwigValueWrapper<std::allocator<SVertex * > > result;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  SwigValueWrapper< std::allocator< SVertex * > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_get_allocator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_get_allocator" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_get_allocator" "', argument " "1"" of type '" "std::vector< SVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   {
     try {
-      result = ((std::vector<SVertex * > const *)arg1)->get_allocator();
+      result = ((std::vector< SVertex * > const *)arg1)->get_allocator();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -47208,30 +46192,30 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_get_allocator(PyObject *SWIGUNUSED
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new std::vector<SVertex * >::allocator_type(static_cast< const std::vector<SVertex * >::allocator_type& >(result))), SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new std::vector< SVertex * >::allocator_type(static_cast< const std::vector< SVertex * >::allocator_type& >(result))), SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_SVerticesContainer_begin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SVerticesContainer_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::iterator result;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::const_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_begin" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_begin" "', argument " "1"" of type '" "std::vector< SVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   {
     try {
-      result = (arg1)->begin();
+      result = ((std::vector< SVertex * > const *)arg1)->begin();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -47240,7 +46224,7 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_begin__SWIG_0(PyObject *SWIGUNUSED
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<SVertex * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< SVertex * >::const_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -47248,89 +46232,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SVerticesContainer_begin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SVerticesContainer_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::const_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_begin" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<SVertex * > const *)arg1)->begin();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<SVertex * >::const_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SVerticesContainer_begin(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_SVerticesContainer_begin__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_SVerticesContainer_begin__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SVerticesContainer_begin'.\n  Possible C/C++ prototypes are:\n    begin()\n    begin()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SVerticesContainer_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::iterator result;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::const_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_end" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_end" "', argument " "1"" of type '" "std::vector< SVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   {
     try {
-      result = (arg1)->end();
+      result = ((std::vector< SVertex * > const *)arg1)->end();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -47339,7 +46257,7 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_end__SWIG_0(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<SVertex * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< SVertex * >::const_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -47347,89 +46265,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SVerticesContainer_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SVerticesContainer_rbegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::const_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_end" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<SVertex * > const *)arg1)->end();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<SVertex * >::const_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SVerticesContainer_end(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_SVerticesContainer_end__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_SVerticesContainer_end__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SVerticesContainer_end'.\n  Possible C/C++ prototypes are:\n    end()\n    end()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SVerticesContainer_rbegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::reverse_iterator result;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::const_reverse_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_rbegin" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_rbegin" "', argument " "1"" of type '" "std::vector< SVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   {
     try {
-      result = (arg1)->rbegin();
+      result = ((std::vector< SVertex * > const *)arg1)->rbegin();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -47438,7 +46290,7 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_rbegin__SWIG_0(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<SVertex * >::reverse_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< SVertex * >::const_reverse_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -47446,89 +46298,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SVerticesContainer_rbegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SVerticesContainer_rend(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::const_reverse_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_rbegin" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<SVertex * > const *)arg1)->rbegin();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<SVertex * >::const_reverse_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SVerticesContainer_rbegin(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_SVerticesContainer_rbegin__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_SVerticesContainer_rbegin__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SVerticesContainer_rbegin'.\n  Possible C/C++ prototypes are:\n    rbegin()\n    rbegin()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SVerticesContainer_rend__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::reverse_iterator result;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::const_reverse_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_rend" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_rend" "', argument " "1"" of type '" "std::vector< SVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   {
     try {
-      result = (arg1)->rend();
+      result = ((std::vector< SVertex * > const *)arg1)->rend();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -47537,7 +46323,7 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_rend__SWIG_0(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<SVertex * >::reverse_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< SVertex * >::const_reverse_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -47545,76 +46331,10 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SVerticesContainer_rend__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::const_reverse_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_rend" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<SVertex * > const *)arg1)->rend();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<SVertex * >::const_reverse_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_SVerticesContainer_rend(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_SVerticesContainer_rend__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_SVerticesContainer_rend__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SVerticesContainer_rend'.\n  Possible C/C++ prototypes are:\n    rend()\n    rend()\n");
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_new_SVerticesContainer__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * >::size_type arg1 ;
-  std::vector<SVertex * > *result = 0 ;
+  std::vector< SVertex * >::size_type arg1 ;
+  std::vector< SVertex * > *result = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -47622,12 +46342,12 @@ SWIGINTERN PyObject *_wrap_new_SVerticesContainer__SWIG_2(PyObject *SWIGUNUSEDPA
   if (!PyArg_ParseTuple(args,(char *)"O:new_SVerticesContainer",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_SVerticesContainer" "', argument " "1"" of type '" "std::vector<SVertex * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_SVerticesContainer" "', argument " "1"" of type '" "std::vector< SVertex * >::size_type""'");
   } 
-  arg1 = static_cast< std::vector<SVertex * >::size_type >(val1);
+  arg1 = static_cast< std::vector< SVertex * >::size_type >(val1);
   {
     try {
-      result = (std::vector<SVertex * > *)new std::vector<SVertex * >(arg1);
+      result = (std::vector< SVertex * > *)new std::vector< SVertex * >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -47636,7 +46356,7 @@ SWIGINTERN PyObject *_wrap_new_SVerticesContainer__SWIG_2(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -47645,17 +46365,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_pop_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_pop_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_pop_back" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_pop_back" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   {
     try {
       (arg1)->pop_back();
@@ -47676,8 +46396,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::size_type arg2 ;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::size_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -47686,16 +46406,16 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_resize__SWIG_0(PyObject *SWIGUNUSE
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:SVerticesContainer_resize",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_resize" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_resize" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer_resize" "', argument " "2"" of type '" "std::vector<SVertex * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer_resize" "', argument " "2"" of type '" "std::vector< SVertex * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<SVertex * >::size_type >(val2);
+  arg2 = static_cast< std::vector< SVertex * >::size_type >(val2);
   {
     try {
       (arg1)->resize(arg2);
@@ -47716,9 +46436,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::iterator arg2 ;
-  std::vector<SVertex * >::iterator result;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::iterator arg2 ;
+  std::vector< SVertex * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -47727,20 +46447,20 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_erase__SWIG_0(PyObject *SWIGUNUSED
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:SVerticesContainer_erase",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_erase" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_erase" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_erase" "', argument " "2"" of type '" "std::vector<SVertex * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_erase" "', argument " "2"" of type '" "std::vector< SVertex * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< SVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< SVertex * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_erase" "', argument " "2"" of type '" "std::vector<SVertex * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_erase" "', argument " "2"" of type '" "std::vector< SVertex * >::iterator""'");
     }
   }
   {
@@ -47754,7 +46474,7 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_erase__SWIG_0(PyObject *SWIGUNUSED
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<SVertex * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< SVertex * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -47764,10 +46484,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::iterator arg2 ;
-  std::vector<SVertex * >::iterator arg3 ;
-  std::vector<SVertex * >::iterator result;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::iterator arg2 ;
+  std::vector< SVertex * >::iterator arg3 ;
+  std::vector< SVertex * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -47779,31 +46499,31 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_erase__SWIG_1(PyObject *SWIGUNUSED
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:SVerticesContainer_erase",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_erase" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_erase" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_erase" "', argument " "2"" of type '" "std::vector<SVertex * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_erase" "', argument " "2"" of type '" "std::vector< SVertex * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< SVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< SVertex * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_erase" "', argument " "2"" of type '" "std::vector<SVertex * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_erase" "', argument " "2"" of type '" "std::vector< SVertex * >::iterator""'");
     }
   }
   res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res3) || !iter3) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_erase" "', argument " "3"" of type '" "std::vector<SVertex * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_erase" "', argument " "3"" of type '" "std::vector< SVertex * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *>(iter3);
+    swig::PySwigIterator_T<std::vector< SVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< SVertex * >::iterator > *>(iter3);
     if (iter_t) {
       arg3 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_erase" "', argument " "3"" of type '" "std::vector<SVertex * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_erase" "', argument " "3"" of type '" "std::vector< SVertex * >::iterator""'");
     }
   }
   {
@@ -47817,7 +46537,7 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_erase__SWIG_1(PyObject *SWIGUNUSED
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<SVertex * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< SVertex * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -47831,18 +46551,18 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_erase(PyObject *self, PyObject *ar
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator< SVertex * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< SVertex * >::iterator > *>(iter) != 0));
       if (_v) {
         return _wrap_SVerticesContainer_erase__SWIG_0(self, args);
       }
@@ -47850,16 +46570,16 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_erase(PyObject *self, PyObject *ar
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator< SVertex * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< SVertex * >::iterator > *>(iter) != 0));
       if (_v) {
         swig::PySwigIterator *iter = 0;
         int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *>(iter) != 0));
+        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< SVertex * >::iterator > *>(iter) != 0));
         if (_v) {
           return _wrap_SVerticesContainer_erase__SWIG_1(self, args);
         }
@@ -47868,16 +46588,19 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_erase(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SVerticesContainer_erase'.\n  Possible C/C++ prototypes are:\n    erase(std::vector<SVertex * >::iterator)\n    erase(std::vector<SVertex * >::iterator,std::vector<SVertex * >::iterator)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SVerticesContainer_erase'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    erase(std::vector< SVertex * > *,std::vector< SVertex * >::iterator)\n"
+    "    erase(std::vector< SVertex * > *,std::vector< SVertex * >::iterator,std::vector< SVertex * >::iterator)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_new_SVerticesContainer__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * >::size_type arg1 ;
-  std::vector<SVertex * >::value_type arg2 = (std::vector<SVertex * >::value_type) 0 ;
-  std::vector<SVertex * > *result = 0 ;
+  std::vector< SVertex * >::size_type arg1 ;
+  std::vector< SVertex * >::value_type arg2 = (std::vector< SVertex * >::value_type) 0 ;
+  std::vector< SVertex * > *result = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   void *argp2 = 0 ;
@@ -47888,17 +46611,17 @@ SWIGINTERN PyObject *_wrap_new_SVerticesContainer__SWIG_3(PyObject *SWIGUNUSEDPA
   if (!PyArg_ParseTuple(args,(char *)"OO:new_SVerticesContainer",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_SVerticesContainer" "', argument " "1"" of type '" "std::vector<SVertex * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_SVerticesContainer" "', argument " "1"" of type '" "std::vector< SVertex * >::size_type""'");
   } 
-  arg1 = static_cast< std::vector<SVertex * >::size_type >(val1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
+  arg1 = static_cast< std::vector< SVertex * >::size_type >(val1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_SVerticesContainer" "', argument " "2"" of type '" "std::vector<SVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_SVerticesContainer" "', argument " "2"" of type '" "std::vector< SVertex * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<SVertex * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector< SVertex * >::value_type >(argp2);
   {
     try {
-      result = (std::vector<SVertex * > *)new std::vector<SVertex * >(arg1,arg2);
+      result = (std::vector< SVertex * > *)new std::vector< SVertex * >(arg1,arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -47907,7 +46630,7 @@ SWIGINTERN PyObject *_wrap_new_SVerticesContainer__SWIG_3(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -47920,7 +46643,7 @@ SWIGINTERN PyObject *_wrap_new_SVerticesContainer(PyObject *self, PyObject *args
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -47939,7 +46662,7 @@ SWIGINTERN PyObject *_wrap_new_SVerticesContainer(PyObject *self, PyObject *args
   }
   if (argc == 1) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator< SVertex * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_new_SVerticesContainer__SWIG_1(self, args);
@@ -47953,7 +46676,7 @@ SWIGINTERN PyObject *_wrap_new_SVerticesContainer(PyObject *self, PyObject *args
     }
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_new_SVerticesContainer__SWIG_3(self, args);
@@ -47962,15 +46685,20 @@ SWIGINTERN PyObject *_wrap_new_SVerticesContainer(PyObject *self, PyObject *args
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_SVerticesContainer'.\n  Possible C/C++ prototypes are:\n    std::vector<(p.SVertex)>()\n    std::vector<(p.SVertex)>(std::vector<SVertex * > const &)\n    std::vector<(p.SVertex)>(std::vector<SVertex * >::size_type)\n    std::vector<(p.SVertex)>(std::vector<SVertex * >::size_type,std::vector<SVertex * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_SVerticesContainer'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    std::vector< SVertex * >()\n"
+    "    std::vector< SVertex * >(std::vector< SVertex * > const &)\n"
+    "    std::vector< SVertex * >(std::vector< SVertex * >::size_type)\n"
+    "    std::vector< SVertex * >(std::vector< SVertex * >::size_type,std::vector< SVertex * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_push_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::value_type arg2 = (std::vector<SVertex * >::value_type) 0 ;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::value_type arg2 = (std::vector< SVertex * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -47979,16 +46707,16 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_push_back(PyObject *SWIGUNUSEDPARM
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:SVerticesContainer_push_back",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_push_back" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_push_back" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVerticesContainer_push_back" "', argument " "2"" of type '" "std::vector<SVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "SVerticesContainer_push_back" "', argument " "2"" of type '" "std::vector< SVertex * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<SVertex * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector< SVertex * >::value_type >(argp2);
   {
     try {
       (arg1)->push_back(arg2);
@@ -48009,21 +46737,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_front(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::value_type result;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_front",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_front" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_front" "', argument " "1"" of type '" "std::vector< SVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   {
     try {
-      result = (std::vector<SVertex * >::value_type)((std::vector<SVertex * > const *)arg1)->front();
+      result = (std::vector< SVertex * >::value_type)((std::vector< SVertex * > const *)arg1)->front();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -48032,7 +46760,7 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_front(PyObject *SWIGUNUSEDPARM(sel
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -48041,21 +46769,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::value_type result;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_back" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_back" "', argument " "1"" of type '" "std::vector< SVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   {
     try {
-      result = (std::vector<SVertex * >::value_type)((std::vector<SVertex * > const *)arg1)->back();
+      result = (std::vector< SVertex * >::value_type)((std::vector< SVertex * > const *)arg1)->back();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -48064,7 +46792,7 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_back(PyObject *SWIGUNUSEDPARM(self
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -48073,9 +46801,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_assign(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::size_type arg2 ;
-  std::vector<SVertex * >::value_type arg3 = (std::vector<SVertex * >::value_type) 0 ;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::size_type arg2 ;
+  std::vector< SVertex * >::value_type arg3 = (std::vector< SVertex * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -48087,21 +46815,21 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_assign(PyObject *SWIGUNUSEDPARM(se
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:SVerticesContainer_assign",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_assign" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_assign" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer_assign" "', argument " "2"" of type '" "std::vector<SVertex * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer_assign" "', argument " "2"" of type '" "std::vector< SVertex * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<SVertex * >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector< SVertex * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SVerticesContainer_assign" "', argument " "3"" of type '" "std::vector<SVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SVerticesContainer_assign" "', argument " "3"" of type '" "std::vector< SVertex * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<SVertex * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< SVertex * >::value_type >(argp3);
   {
     try {
       (arg1)->assign(arg2,arg3);
@@ -48122,9 +46850,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::size_type arg2 ;
-  std::vector<SVertex * >::value_type arg3 = (std::vector<SVertex * >::value_type) 0 ;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::size_type arg2 ;
+  std::vector< SVertex * >::value_type arg3 = (std::vector< SVertex * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -48136,21 +46864,21 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_resize__SWIG_1(PyObject *SWIGUNUSE
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:SVerticesContainer_resize",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_resize" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_resize" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer_resize" "', argument " "2"" of type '" "std::vector<SVertex * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer_resize" "', argument " "2"" of type '" "std::vector< SVertex * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<SVertex * >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector< SVertex * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SVerticesContainer_resize" "', argument " "3"" of type '" "std::vector<SVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SVerticesContainer_resize" "', argument " "3"" of type '" "std::vector< SVertex * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<SVertex * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< SVertex * >::value_type >(argp3);
   {
     try {
       (arg1)->resize(arg2,arg3);
@@ -48175,13 +46903,13 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_resize(PyObject *self, PyObject *a
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator< SVertex * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -48195,7 +46923,7 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_resize(PyObject *self, PyObject *a
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator< SVertex * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -48204,7 +46932,7 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_resize(PyObject *self, PyObject *a
       }
       if (_v) {
         void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0);
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           return _wrap_SVerticesContainer_resize__SWIG_1(self, args);
@@ -48214,17 +46942,20 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_resize(PyObject *self, PyObject *a
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SVerticesContainer_resize'.\n  Possible C/C++ prototypes are:\n    resize(std::vector<SVertex * >::size_type)\n    resize(std::vector<SVertex * >::size_type,std::vector<SVertex * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SVerticesContainer_resize'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    resize(std::vector< SVertex * > *,std::vector< SVertex * >::size_type)\n"
+    "    resize(std::vector< SVertex * > *,std::vector< SVertex * >::size_type,std::vector< SVertex * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::iterator arg2 ;
-  std::vector<SVertex * >::value_type arg3 = (std::vector<SVertex * >::value_type) 0 ;
-  std::vector<SVertex * >::iterator result;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::iterator arg2 ;
+  std::vector< SVertex * >::value_type arg3 = (std::vector< SVertex * >::value_type) 0 ;
+  std::vector< SVertex * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -48236,27 +46967,27 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_insert__SWIG_0(PyObject *SWIGUNUSE
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:SVerticesContainer_insert",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_insert" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_insert" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_insert" "', argument " "2"" of type '" "std::vector<SVertex * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_insert" "', argument " "2"" of type '" "std::vector< SVertex * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< SVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< SVertex * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_insert" "', argument " "2"" of type '" "std::vector<SVertex * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_insert" "', argument " "2"" of type '" "std::vector< SVertex * >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SVerticesContainer_insert" "', argument " "3"" of type '" "std::vector<SVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "SVerticesContainer_insert" "', argument " "3"" of type '" "std::vector< SVertex * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<SVertex * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< SVertex * >::value_type >(argp3);
   {
     try {
       result = (arg1)->insert(arg2,arg3);
@@ -48268,7 +46999,7 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_insert__SWIG_0(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<SVertex * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< SVertex * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -48278,10 +47009,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::iterator arg2 ;
-  std::vector<SVertex * >::size_type arg3 ;
-  std::vector<SVertex * >::value_type arg4 = (std::vector<SVertex * >::value_type) 0 ;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::iterator arg2 ;
+  std::vector< SVertex * >::size_type arg3 ;
+  std::vector< SVertex * >::value_type arg4 = (std::vector< SVertex * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -48296,32 +47027,32 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_insert__SWIG_1(PyObject *SWIGUNUSE
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:SVerticesContainer_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_insert" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_insert" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_insert" "', argument " "2"" of type '" "std::vector<SVertex * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_insert" "', argument " "2"" of type '" "std::vector< SVertex * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< SVertex * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< SVertex * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_insert" "', argument " "2"" of type '" "std::vector<SVertex * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "SVerticesContainer_insert" "', argument " "2"" of type '" "std::vector< SVertex * >::iterator""'");
     }
   }
   ecode3 = SWIG_AsVal_size_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SVerticesContainer_insert" "', argument " "3"" of type '" "std::vector<SVertex * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SVerticesContainer_insert" "', argument " "3"" of type '" "std::vector< SVertex * >::size_type""'");
   } 
-  arg3 = static_cast< std::vector<SVertex * >::size_type >(val3);
-  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0 |  0 );
+  arg3 = static_cast< std::vector< SVertex * >::size_type >(val3);
+  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "SVerticesContainer_insert" "', argument " "4"" of type '" "std::vector<SVertex * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "SVerticesContainer_insert" "', argument " "4"" of type '" "std::vector< SVertex * >::value_type""'"); 
   }
-  arg4 = reinterpret_cast< std::vector<SVertex * >::value_type >(argp4);
+  arg4 = reinterpret_cast< std::vector< SVertex * >::value_type >(argp4);
   {
     try {
       (arg1)->insert(arg2,arg3,arg4);
@@ -48346,21 +47077,21 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_insert(PyObject *self, PyObject *a
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator< SVertex * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< SVertex * >::iterator > *>(iter) != 0));
       if (_v) {
         void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0);
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           return _wrap_SVerticesContainer_insert__SWIG_0(self, args);
@@ -48370,12 +47101,12 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_insert(PyObject *self, PyObject *a
   }
   if (argc == 4) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator<SVertex * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<SVertex*,std::allocator< SVertex * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<SVertex * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< SVertex * >::iterator > *>(iter) != 0));
       if (_v) {
         {
           int res = SWIG_AsVal_size_t(argv[2], NULL);
@@ -48383,7 +47114,7 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_insert(PyObject *self, PyObject *a
         }
         if (_v) {
           void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0);
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0);
           _v = SWIG_CheckState(res);
           if (_v) {
             return _wrap_SVerticesContainer_insert__SWIG_1(self, args);
@@ -48394,15 +47125,18 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_insert(PyObject *self, PyObject *a
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SVerticesContainer_insert'.\n  Possible C/C++ prototypes are:\n    insert(std::vector<SVertex * >::iterator,std::vector<SVertex * >::value_type)\n    insert(std::vector<SVertex * >::iterator,std::vector<SVertex * >::size_type,std::vector<SVertex * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'SVerticesContainer_insert'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    insert(std::vector< SVertex * > *,std::vector< SVertex * >::iterator,std::vector< SVertex * >::value_type)\n"
+    "    insert(std::vector< SVertex * > *,std::vector< SVertex * >::iterator,std::vector< SVertex * >::size_type,std::vector< SVertex * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_reserve(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::size_type arg2 ;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::size_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -48411,16 +47145,16 @@ SWIGINTERN PyObject *_wrap_SVerticesContainer_reserve(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:SVerticesContainer_reserve",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_reserve" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_reserve" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer_reserve" "', argument " "2"" of type '" "std::vector<SVertex * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SVerticesContainer_reserve" "', argument " "2"" of type '" "std::vector< SVertex * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<SVertex * >::size_type >(val2);
+  arg2 = static_cast< std::vector< SVertex * >::size_type >(val2);
   {
     try {
       (arg1)->reserve(arg2);
@@ -48441,21 +47175,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_SVerticesContainer_capacity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
-  std::vector<SVertex * >::size_type result;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
+  std::vector< SVertex * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:SVerticesContainer_capacity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_capacity" "', argument " "1"" of type '" "std::vector<SVertex * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SVerticesContainer_capacity" "', argument " "1"" of type '" "std::vector< SVertex * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   {
     try {
-      result = ((std::vector<SVertex * > const *)arg1)->capacity();
+      result = ((std::vector< SVertex * > const *)arg1)->capacity();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -48473,17 +47207,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_SVerticesContainer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<SVertex * > *arg1 = (std::vector<SVertex * > *) 0 ;
+  std::vector< SVertex * > *arg1 = (std::vector< SVertex * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_SVerticesContainer",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_SVerticesContainer" "', argument " "1"" of type '" "std::vector<SVertex * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_SVerticesContainer" "', argument " "1"" of type '" "std::vector< SVertex * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<SVertex * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< SVertex * > * >(argp1);
   {
     try {
       delete arg1;
@@ -48505,8 +47239,8 @@ fail:
 
 SWIGINTERN PyObject *SVerticesContainer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
@@ -48767,7 +47501,7 @@ SWIGINTERN PyObject *_wrap_ViewMap_ViewShapes(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -48802,7 +47536,7 @@ SWIGINTERN PyObject *_wrap_ViewMap_ViewEdges(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -48837,7 +47571,7 @@ SWIGINTERN PyObject *_wrap_ViewMap_ViewVertices(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -48872,7 +47606,7 @@ SWIGINTERN PyObject *_wrap_ViewMap_FEdges(PyObject *SWIGUNUSEDPARM(self), PyObje
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -48907,7 +47641,7 @@ SWIGINTERN PyObject *_wrap_ViewMap_SVertices(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -49081,7 +47815,7 @@ SWIGINTERN PyObject *_wrap_ViewMap_shapeIdToIndexMap(PyObject *SWIGUNUSEDPARM(se
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__mapTint_int_std__lessTint_t_std__allocatorTstd__pairTint_const_int_t_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__mapT_int_int_std__lessT_int_t_std__allocatorT_std__pairT_int_const_int_t_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -49091,7 +47825,7 @@ fail:
 SWIGINTERN PyObject *_wrap_ViewMap_getScene3dBBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewMap *arg1 = (ViewMap *) 0 ;
-  SwigValueWrapper<BBox<VecMat::Vec3<double > > > result;
+  SwigValueWrapper< BBox< VecMat::Vec3< double > > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -49113,7 +47847,7 @@ SWIGINTERN PyObject *_wrap_ViewMap_getScene3dBBox(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new BBox<Geometry::Vec3r >(static_cast< const BBox<Geometry::Vec3r >& >(result))), SWIGTYPE_p_BBoxTVecMat__Vec3Tdouble_t_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new BBox< Geometry::Vec3r >(static_cast< const BBox< Geometry::Vec3r >& >(result))), SWIGTYPE_p_BBoxT_VecMat__Vec3T_double_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -49323,7 +48057,7 @@ fail:
 SWIGINTERN PyObject *_wrap_ViewMap_setScene3dBBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewMap *arg1 = (ViewMap *) 0 ;
-  BBox<Geometry::Vec3r > *arg2 = 0 ;
+  BBox< Geometry::Vec3r > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -49337,17 +48071,17 @@ SWIGINTERN PyObject *_wrap_ViewMap_setScene3dBBox(PyObject *SWIGUNUSEDPARM(self)
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewMap_setScene3dBBox" "', argument " "1"" of type '" "ViewMap *""'"); 
   }
   arg1 = reinterpret_cast< ViewMap * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BBoxTVecMat__Vec3Tdouble_t_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_BBoxT_VecMat__Vec3T_double_t_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewMap_setScene3dBBox" "', argument " "2"" of type '" "BBox<Geometry::Vec3r > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewMap_setScene3dBBox" "', argument " "2"" of type '" "BBox< Geometry::Vec3r > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewMap_setScene3dBBox" "', argument " "2"" of type '" "BBox<Geometry::Vec3r > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewMap_setScene3dBBox" "', argument " "2"" of type '" "BBox< Geometry::Vec3r > const &""'"); 
   }
-  arg2 = reinterpret_cast< BBox<Geometry::Vec3r > * >(argp2);
+  arg2 = reinterpret_cast< BBox< Geometry::Vec3r > * >(argp2);
   {
     try {
-      (arg1)->setScene3dBBox((BBox<Geometry::Vec3r > const &)*arg2);
+      (arg1)->setScene3dBBox((BBox< Geometry::Vec3r > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -49405,7 +48139,7 @@ SWIGINTERN PyObject *_wrap_ViewMap_CreateTVertex(PyObject *SWIGUNUSEDPARM(self),
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewMap_CreateTVertex" "', argument " "1"" of type '" "ViewMap *""'"); 
   }
   arg1 = reinterpret_cast< ViewMap * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewMap_CreateTVertex" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -49413,7 +48147,7 @@ SWIGINTERN PyObject *_wrap_ViewMap_CreateTVertex(PyObject *SWIGUNUSEDPARM(self),
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewMap_CreateTVertex" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
   arg2 = reinterpret_cast< Geometry::Vec3r * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewMap_CreateTVertex" "', argument " "3"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -49426,7 +48160,7 @@ SWIGINTERN PyObject *_wrap_ViewMap_CreateTVertex(PyObject *SWIGUNUSEDPARM(self),
     SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewMap_CreateTVertex" "', argument " "4"" of type '" "FEdge *""'"); 
   }
   arg4 = reinterpret_cast< FEdge * >(argp4);
-  res5 = SWIG_ConvertPtr(obj4, &argp5, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  res5 = SWIG_ConvertPtr(obj4, &argp5, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res5)) {
     SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "ViewMap_CreateTVertex" "', argument " "5"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -49434,7 +48168,7 @@ SWIGINTERN PyObject *_wrap_ViewMap_CreateTVertex(PyObject *SWIGUNUSEDPARM(self),
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewMap_CreateTVertex" "', argument " "5"" of type '" "Geometry::Vec3r const &""'"); 
   }
   arg5 = reinterpret_cast< Geometry::Vec3r * >(argp5);
-  res6 = SWIG_ConvertPtr(obj5, &argp6, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  res6 = SWIG_ConvertPtr(obj5, &argp6, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res6)) {
     SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "ViewMap_CreateTVertex" "', argument " "6"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -49477,7 +48211,7 @@ SWIGINTERN PyObject *_wrap_ViewMap_InsertViewVertex(PyObject *SWIGUNUSEDPARM(sel
   PyObject *resultobj = 0;
   ViewMap *arg1 = (ViewMap *) 0 ;
   SVertex *arg2 = (SVertex *) 0 ;
-  std::vector<ViewEdge * > *arg3 = 0 ;
+  std::vector< ViewEdge * > *arg3 = 0 ;
   ViewVertex *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -49500,14 +48234,14 @@ SWIGINTERN PyObject *_wrap_ViewMap_InsertViewVertex(PyObject *SWIGUNUSEDPARM(sel
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewMap_InsertViewVertex" "', argument " "2"" of type '" "SVertex *""'"); 
   }
   arg2 = reinterpret_cast< SVertex * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t,  0 );
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t,  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewMap_InsertViewVertex" "', argument " "3"" of type '" "std::vector<ViewEdge * > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewMap_InsertViewVertex" "', argument " "3"" of type '" "std::vector< ViewEdge * > &""'"); 
   }
   if (!argp3) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewMap_InsertViewVertex" "', argument " "3"" of type '" "std::vector<ViewEdge * > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewMap_InsertViewVertex" "', argument " "3"" of type '" "std::vector< ViewEdge * > &""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<ViewEdge * > * >(argp3);
+  arg3 = reinterpret_cast< std::vector< ViewEdge * > * >(argp3);
   {
     try {
       result = (ViewVertex *)(arg1)->InsertViewVertex(arg2,*arg3);
@@ -49528,7 +48262,7 @@ fail:
 
 SWIGINTERN PyObject *ViewMap_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ViewMap, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -49772,7 +48506,7 @@ fail:
 SWIGINTERN PyObject *_wrap_ViewVertex_edges_begin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewVertex *arg1 = (ViewVertex *) 0 ;
-  SwigValueWrapper<ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_nonconst_traits > > result;
+  SwigValueWrapper< ViewVertexInternal::edge_iterator_base< ViewVertexInternal::edge_nonconst_traits > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -49794,7 +48528,7 @@ SWIGINTERN PyObject *_wrap_ViewVertex_edges_begin__SWIG_0(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new ViewVertex::edge_iterator(static_cast< const ViewVertex::edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new ViewVertex::edge_iterator(static_cast< const ViewVertex::edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_nonconst_traits_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -49804,7 +48538,7 @@ fail:
 SWIGINTERN PyObject *_wrap_ViewVertex_edges_begin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewVertex *arg1 = (ViewVertex *) 0 ;
-  SwigValueWrapper<ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_const_traits > > result;
+  SwigValueWrapper< ViewVertexInternal::edge_iterator_base< ViewVertexInternal::edge_const_traits > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -49826,7 +48560,7 @@ SWIGINTERN PyObject *_wrap_ViewVertex_edges_begin__SWIG_1(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new ViewVertex::const_edge_iterator(static_cast< const ViewVertex::const_edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new ViewVertex::const_edge_iterator(static_cast< const ViewVertex::const_edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_const_traits_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -49839,7 +48573,7 @@ SWIGINTERN PyObject *_wrap_ViewVertex_edges_begin(PyObject *self, PyObject *args
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -49863,7 +48597,10 @@ SWIGINTERN PyObject *_wrap_ViewVertex_edges_begin(PyObject *self, PyObject *args
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVertex_edges_begin'.\n  Possible C/C++ prototypes are:\n    edges_begin()\n    edges_begin()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVertex_edges_begin'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    edges_begin(ViewVertex *)\n"
+    "    edges_begin(ViewVertex const *)\n");
   return NULL;
 }
 
@@ -49871,7 +48608,7 @@ fail:
 SWIGINTERN PyObject *_wrap_ViewVertex_edges_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewVertex *arg1 = (ViewVertex *) 0 ;
-  SwigValueWrapper<ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_nonconst_traits > > result;
+  SwigValueWrapper< ViewVertexInternal::edge_iterator_base< ViewVertexInternal::edge_nonconst_traits > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -49893,7 +48630,7 @@ SWIGINTERN PyObject *_wrap_ViewVertex_edges_end__SWIG_0(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new ViewVertex::edge_iterator(static_cast< const ViewVertex::edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new ViewVertex::edge_iterator(static_cast< const ViewVertex::edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_nonconst_traits_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -49903,7 +48640,7 @@ fail:
 SWIGINTERN PyObject *_wrap_ViewVertex_edges_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewVertex *arg1 = (ViewVertex *) 0 ;
-  SwigValueWrapper<ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_const_traits > > result;
+  SwigValueWrapper< ViewVertexInternal::edge_iterator_base< ViewVertexInternal::edge_const_traits > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -49925,7 +48662,7 @@ SWIGINTERN PyObject *_wrap_ViewVertex_edges_end__SWIG_1(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new ViewVertex::const_edge_iterator(static_cast< const ViewVertex::const_edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new ViewVertex::const_edge_iterator(static_cast< const ViewVertex::const_edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_const_traits_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -49938,7 +48675,7 @@ SWIGINTERN PyObject *_wrap_ViewVertex_edges_end(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -49962,7 +48699,10 @@ SWIGINTERN PyObject *_wrap_ViewVertex_edges_end(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVertex_edges_end'.\n  Possible C/C++ prototypes are:\n    edges_end()\n    edges_end()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVertex_edges_end'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    edges_end(ViewVertex *)\n"
+    "    edges_end(ViewVertex const *)\n");
   return NULL;
 }
 
@@ -49971,7 +48711,7 @@ SWIGINTERN PyObject *_wrap_ViewVertex_edges_iterator__SWIG_0(PyObject *SWIGUNUSE
   PyObject *resultobj = 0;
   ViewVertex *arg1 = (ViewVertex *) 0 ;
   ViewEdge *arg2 = (ViewEdge *) 0 ;
-  SwigValueWrapper<ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_nonconst_traits > > result;
+  SwigValueWrapper< ViewVertexInternal::edge_iterator_base< ViewVertexInternal::edge_nonconst_traits > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -50001,7 +48741,7 @@ SWIGINTERN PyObject *_wrap_ViewVertex_edges_iterator__SWIG_0(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new ViewVertex::edge_iterator(static_cast< const ViewVertex::edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new ViewVertex::edge_iterator(static_cast< const ViewVertex::edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_nonconst_traits_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -50012,7 +48752,7 @@ SWIGINTERN PyObject *_wrap_ViewVertex_edges_iterator__SWIG_1(PyObject *SWIGUNUSE
   PyObject *resultobj = 0;
   ViewVertex *arg1 = (ViewVertex *) 0 ;
   ViewEdge *arg2 = (ViewEdge *) 0 ;
-  SwigValueWrapper<ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_const_traits > > result;
+  SwigValueWrapper< ViewVertexInternal::edge_iterator_base< ViewVertexInternal::edge_const_traits > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -50042,7 +48782,7 @@ SWIGINTERN PyObject *_wrap_ViewVertex_edges_iterator__SWIG_1(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new ViewVertex::const_edge_iterator(static_cast< const ViewVertex::const_edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new ViewVertex::const_edge_iterator(static_cast< const ViewVertex::const_edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_const_traits_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -50055,7 +48795,7 @@ SWIGINTERN PyObject *_wrap_ViewVertex_edges_iterator(PyObject *self, PyObject *a
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -50089,7 +48829,10 @@ SWIGINTERN PyObject *_wrap_ViewVertex_edges_iterator(PyObject *self, PyObject *a
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVertex_edges_iterator'.\n  Possible C/C++ prototypes are:\n    edges_iterator(ViewEdge *)\n    edges_iterator(ViewEdge *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewVertex_edges_iterator'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    edges_iterator(ViewVertex *,ViewEdge *)\n"
+    "    edges_iterator(ViewVertex const *,ViewEdge *)\n");
   return NULL;
 }
 
@@ -50201,7 +48944,7 @@ fail:
 
 SWIGINTERN PyObject *ViewVertex_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ViewVertex, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -50359,7 +49102,7 @@ SWIGINTERN PyObject *_wrap_TVertex_getPoint3D(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -50487,7 +49230,7 @@ SWIGINTERN PyObject *_wrap_TVertex_getPoint2D(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -50660,7 +49403,7 @@ SWIGINTERN PyObject *_wrap_new_TVertex(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -50683,7 +49426,10 @@ SWIGINTERN PyObject *_wrap_new_TVertex(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_TVertex'.\n  Possible C/C++ prototypes are:\n    TVertex()\n    TVertex(SVertex *,SVertex *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_TVertex'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    TVertex()\n"
+    "    TVertex(SVertex *,SVertex *)\n");
   return NULL;
 }
 
@@ -50780,7 +49526,7 @@ SWIGINTERN PyObject *_wrap_TVertex_frontEdgeA(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairTViewEdge_p_bool_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairT_ViewEdge_p_bool_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -50815,7 +49561,7 @@ SWIGINTERN PyObject *_wrap_TVertex_frontEdgeB(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairTViewEdge_p_bool_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairT_ViewEdge_p_bool_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -50850,7 +49596,7 @@ SWIGINTERN PyObject *_wrap_TVertex_backEdgeA(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairTViewEdge_p_bool_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairT_ViewEdge_p_bool_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -50885,7 +49631,7 @@ SWIGINTERN PyObject *_wrap_TVertex_backEdgeB(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairTViewEdge_p_bool_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairT_ViewEdge_p_bool_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -51067,7 +49813,7 @@ SWIGINTERN PyObject *_wrap_TVertex_setFrontEdgeA(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -51107,7 +49853,10 @@ SWIGINTERN PyObject *_wrap_TVertex_setFrontEdgeA(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'TVertex_setFrontEdgeA'.\n  Possible C/C++ prototypes are:\n    setFrontEdgeA(ViewEdge *,bool)\n    setFrontEdgeA(ViewEdge *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'TVertex_setFrontEdgeA'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    setFrontEdgeA(TVertex *,ViewEdge *,bool)\n"
+    "    setFrontEdgeA(TVertex *,ViewEdge *)\n");
   return NULL;
 }
 
@@ -51207,7 +49956,7 @@ SWIGINTERN PyObject *_wrap_TVertex_setFrontEdgeB(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -51247,7 +49996,10 @@ SWIGINTERN PyObject *_wrap_TVertex_setFrontEdgeB(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'TVertex_setFrontEdgeB'.\n  Possible C/C++ prototypes are:\n    setFrontEdgeB(ViewEdge *,bool)\n    setFrontEdgeB(ViewEdge *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'TVertex_setFrontEdgeB'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    setFrontEdgeB(TVertex *,ViewEdge *,bool)\n"
+    "    setFrontEdgeB(TVertex *,ViewEdge *)\n");
   return NULL;
 }
 
@@ -51347,7 +50099,7 @@ SWIGINTERN PyObject *_wrap_TVertex_setBackEdgeA(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -51387,7 +50139,10 @@ SWIGINTERN PyObject *_wrap_TVertex_setBackEdgeA(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'TVertex_setBackEdgeA'.\n  Possible C/C++ prototypes are:\n    setBackEdgeA(ViewEdge *,bool)\n    setBackEdgeA(ViewEdge *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'TVertex_setBackEdgeA'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    setBackEdgeA(TVertex *,ViewEdge *,bool)\n"
+    "    setBackEdgeA(TVertex *,ViewEdge *)\n");
   return NULL;
 }
 
@@ -51487,7 +50242,7 @@ SWIGINTERN PyObject *_wrap_TVertex_setBackEdgeB(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -51527,7 +50282,10 @@ SWIGINTERN PyObject *_wrap_TVertex_setBackEdgeB(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'TVertex_setBackEdgeB'.\n  Possible C/C++ prototypes are:\n    setBackEdgeB(ViewEdge *,bool)\n    setBackEdgeB(ViewEdge *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'TVertex_setBackEdgeB'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    setBackEdgeB(TVertex *,ViewEdge *,bool)\n"
+    "    setBackEdgeB(TVertex *,ViewEdge *)\n");
   return NULL;
 }
 
@@ -51709,7 +50467,7 @@ fail:
 SWIGINTERN PyObject *_wrap_TVertex_edges_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   TVertex *arg1 = (TVertex *) 0 ;
-  SwigValueWrapper<ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_nonconst_traits > > result;
+  SwigValueWrapper< ViewVertexInternal::edge_iterator_base< ViewVertexInternal::edge_nonconst_traits > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -51731,7 +50489,7 @@ SWIGINTERN PyObject *_wrap_TVertex_edges_end__SWIG_0(PyObject *SWIGUNUSEDPARM(se
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new ViewVertex::edge_iterator(static_cast< const ViewVertex::edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new ViewVertex::edge_iterator(static_cast< const ViewVertex::edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_nonconst_traits_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -51741,7 +50499,7 @@ fail:
 SWIGINTERN PyObject *_wrap_TVertex_edges_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   TVertex *arg1 = (TVertex *) 0 ;
-  SwigValueWrapper<ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_const_traits > > result;
+  SwigValueWrapper< ViewVertexInternal::edge_iterator_base< ViewVertexInternal::edge_const_traits > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -51763,7 +50521,7 @@ SWIGINTERN PyObject *_wrap_TVertex_edges_end__SWIG_1(PyObject *SWIGUNUSEDPARM(se
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new ViewVertex::const_edge_iterator(static_cast< const ViewVertex::const_edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new ViewVertex::const_edge_iterator(static_cast< const ViewVertex::const_edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_const_traits_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -51776,7 +50534,7 @@ SWIGINTERN PyObject *_wrap_TVertex_edges_end(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -51800,7 +50558,10 @@ SWIGINTERN PyObject *_wrap_TVertex_edges_end(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'TVertex_edges_end'.\n  Possible C/C++ prototypes are:\n    edges_end()\n    edges_end()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'TVertex_edges_end'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    edges_end(TVertex *)\n"
+    "    edges_end(TVertex const *)\n");
   return NULL;
 }
 
@@ -51944,7 +50705,7 @@ fail:
 
 SWIGINTERN PyObject *TVertex_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_TVertex, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -52102,7 +50863,7 @@ SWIGINTERN PyObject *_wrap_NonTVertex_getPoint3D(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -52230,7 +50991,7 @@ SWIGINTERN PyObject *_wrap_NonTVertex_getPoint2D(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -52426,7 +51187,7 @@ SWIGINTERN PyObject *_wrap_new_NonTVertex(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -52444,7 +51205,10 @@ SWIGINTERN PyObject *_wrap_new_NonTVertex(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_NonTVertex'.\n  Possible C/C++ prototypes are:\n    NonTVertex()\n    NonTVertex(SVertex *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_NonTVertex'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    NonTVertex()\n"
+    "    NonTVertex(SVertex *)\n");
   return NULL;
 }
 
@@ -52541,7 +51305,7 @@ SWIGINTERN PyObject *_wrap_NonTVertex_viewedges(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTstd__pairTViewEdge_p_bool_t_std__allocatorTstd__pairTViewEdge_p_bool_t_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_std__pairT_ViewEdge_p_bool_t_std__allocatorT_std__pairT_ViewEdge_p_bool_t_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -52591,7 +51355,7 @@ fail:
 SWIGINTERN PyObject *_wrap_NonTVertex_setViewEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   NonTVertex *arg1 = (NonTVertex *) 0 ;
-  std::vector<ViewVertex::directedViewEdge > *arg2 = 0 ;
+  std::vector< ViewVertex::directedViewEdge > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -52605,17 +51369,17 @@ SWIGINTERN PyObject *_wrap_NonTVertex_setViewEdges(PyObject *SWIGUNUSEDPARM(self
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "NonTVertex_setViewEdges" "', argument " "1"" of type '" "NonTVertex *""'"); 
   }
   arg1 = reinterpret_cast< NonTVertex * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTstd__pairTViewEdge_p_bool_t_std__allocatorTstd__pairTViewEdge_p_bool_t_t_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_std__pairT_ViewEdge_p_bool_t_std__allocatorT_std__pairT_ViewEdge_p_bool_t_t_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "NonTVertex_setViewEdges" "', argument " "2"" of type '" "std::vector<ViewVertex::directedViewEdge > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "NonTVertex_setViewEdges" "', argument " "2"" of type '" "std::vector< ViewVertex::directedViewEdge > const &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "NonTVertex_setViewEdges" "', argument " "2"" of type '" "std::vector<ViewVertex::directedViewEdge > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "NonTVertex_setViewEdges" "', argument " "2"" of type '" "std::vector< ViewVertex::directedViewEdge > const &""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<ViewVertex::directedViewEdge > * >(argp2);
+  arg2 = reinterpret_cast< std::vector< ViewVertex::directedViewEdge > * >(argp2);
   {
     try {
-      (arg1)->setViewEdges((std::vector<ViewVertex::directedViewEdge > const &)*arg2);
+      (arg1)->setViewEdges((std::vector< ViewVertex::directedViewEdge > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -52806,7 +51570,7 @@ SWIGINTERN PyObject *_wrap_NonTVertex_AddViewEdge(PyObject *self, PyObject *args
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -52846,7 +51610,10 @@ SWIGINTERN PyObject *_wrap_NonTVertex_AddViewEdge(PyObject *self, PyObject *args
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'NonTVertex_AddViewEdge'.\n  Possible C/C++ prototypes are:\n    AddViewEdge(ViewEdge *,bool)\n    AddViewEdge(ViewEdge *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'NonTVertex_AddViewEdge'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    AddViewEdge(NonTVertex *,ViewEdge *,bool)\n"
+    "    AddViewEdge(NonTVertex *,ViewEdge *)\n");
   return NULL;
 }
 
@@ -52903,7 +51670,7 @@ fail:
 SWIGINTERN PyObject *_wrap_NonTVertex_edges_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   NonTVertex *arg1 = (NonTVertex *) 0 ;
-  SwigValueWrapper<ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_nonconst_traits > > result;
+  SwigValueWrapper< ViewVertexInternal::edge_iterator_base< ViewVertexInternal::edge_nonconst_traits > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -52925,7 +51692,7 @@ SWIGINTERN PyObject *_wrap_NonTVertex_edges_end__SWIG_0(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new ViewVertex::edge_iterator(static_cast< const ViewVertex::edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new ViewVertex::edge_iterator(static_cast< const ViewVertex::edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_nonconst_traits_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -52935,7 +51702,7 @@ fail:
 SWIGINTERN PyObject *_wrap_NonTVertex_edges_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   NonTVertex *arg1 = (NonTVertex *) 0 ;
-  SwigValueWrapper<ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_const_traits > > result;
+  SwigValueWrapper< ViewVertexInternal::edge_iterator_base< ViewVertexInternal::edge_const_traits > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -52957,7 +51724,7 @@ SWIGINTERN PyObject *_wrap_NonTVertex_edges_end__SWIG_1(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new ViewVertex::const_edge_iterator(static_cast< const ViewVertex::const_edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new ViewVertex::const_edge_iterator(static_cast< const ViewVertex::const_edge_iterator& >(result))), SWIGTYPE_p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_const_traits_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -52970,7 +51737,7 @@ SWIGINTERN PyObject *_wrap_NonTVertex_edges_end(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -52994,7 +51761,10 @@ SWIGINTERN PyObject *_wrap_NonTVertex_edges_end(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'NonTVertex_edges_end'.\n  Possible C/C++ prototypes are:\n    edges_end()\n    edges_end()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'NonTVertex_edges_end'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    edges_end(NonTVertex *)\n"
+    "    edges_end(NonTVertex const *)\n");
   return NULL;
 }
 
@@ -53106,7 +51876,7 @@ fail:
 
 SWIGINTERN PyObject *NonTVertex_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_NonTVertex, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -53446,7 +52216,7 @@ SWIGINTERN PyObject *_wrap_new_ViewEdge(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 5); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -53517,7 +52287,12 @@ SWIGINTERN PyObject *_wrap_new_ViewEdge(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewEdge'.\n  Possible C/C++ prototypes are:\n    ViewEdge()\n    ViewEdge(ViewVertex *,ViewVertex *)\n    ViewEdge(ViewVertex *,ViewVertex *,FEdge *)\n    ViewEdge(ViewVertex *,ViewVertex *,FEdge *,FEdge *,ViewShape *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewEdge'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    ViewEdge()\n"
+    "    ViewEdge(ViewVertex *,ViewVertex *)\n"
+    "    ViewEdge(ViewVertex *,ViewVertex *,FEdge *)\n"
+    "    ViewEdge(ViewVertex *,ViewVertex *,FEdge *,FEdge *,ViewShape *)\n");
   return NULL;
 }
 
@@ -53848,7 +52623,7 @@ SWIGINTERN PyObject *_wrap_ViewEdge_aShape(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -53872,7 +52647,10 @@ SWIGINTERN PyObject *_wrap_ViewEdge_aShape(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdge_aShape'.\n  Possible C/C++ prototypes are:\n    aShape()\n    aShape()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdge_aShape'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    aShape(ViewEdge *)\n"
+    "    aShape(ViewEdge const *)\n");
   return NULL;
 }
 
@@ -53912,7 +52690,7 @@ fail:
 SWIGINTERN PyObject *_wrap_ViewEdge_occluders(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewEdge *arg1 = (ViewEdge *) 0 ;
-  std::vector<ViewShape * > *result = 0 ;
+  std::vector< ViewShape * > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -53926,8 +52704,8 @@ SWIGINTERN PyObject *_wrap_ViewEdge_occluders(PyObject *SWIGUNUSEDPARM(self), Py
   {
     try {
       {
-        std::vector<ViewShape * > &_result_ref = (arg1)->occluders();
-        result = (std::vector<ViewShape * > *) &_result_ref;
+        std::vector< ViewShape * > &_result_ref = (arg1)->occluders();
+        result = (std::vector< ViewShape * > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -53937,7 +52715,7 @@ SWIGINTERN PyObject *_wrap_ViewEdge_occluders(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -54512,7 +53290,7 @@ SWIGINTERN PyObject *_wrap_ViewEdge_intersect_2d_area(PyObject *SWIGUNUSEDPARM(s
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_intersect_2d_area" "', argument " "1"" of type '" "ViewEdge const *""'"); 
   }
   arg1 = reinterpret_cast< ViewEdge * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdge_intersect_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
   }
@@ -54520,7 +53298,7 @@ SWIGINTERN PyObject *_wrap_ViewEdge_intersect_2d_area(PyObject *SWIGUNUSEDPARM(s
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdge_intersect_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
   }
   arg2 = reinterpret_cast< Geometry::Vec2r * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewEdge_intersect_2d_area" "', argument " "3"" of type '" "Geometry::Vec2r const &""'"); 
   }
@@ -54568,7 +53346,7 @@ SWIGINTERN PyObject *_wrap_ViewEdge_include_in_2d_area(PyObject *SWIGUNUSEDPARM(
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_include_in_2d_area" "', argument " "1"" of type '" "ViewEdge const *""'"); 
   }
   arg1 = reinterpret_cast< ViewEdge * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdge_include_in_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
   }
@@ -54576,7 +53354,7 @@ SWIGINTERN PyObject *_wrap_ViewEdge_include_in_2d_area(PyObject *SWIGUNUSEDPARM(
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdge_include_in_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
   }
   arg2 = reinterpret_cast< Geometry::Vec2r * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewEdge_include_in_2d_area" "', argument " "3"" of type '" "Geometry::Vec2r const &""'"); 
   }
@@ -55132,7 +53910,7 @@ SWIGINTERN PyObject *_wrap_ViewEdge_pointsBegin(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -55162,7 +53940,10 @@ SWIGINTERN PyObject *_wrap_ViewEdge_pointsBegin(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdge_pointsBegin'.\n  Possible C/C++ prototypes are:\n    pointsBegin(float)\n    pointsBegin()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdge_pointsBegin'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    pointsBegin(ViewEdge *,float)\n"
+    "    pointsBegin(ViewEdge *)\n");
   return NULL;
 }
 
@@ -55246,7 +54027,7 @@ SWIGINTERN PyObject *_wrap_ViewEdge_pointsEnd(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -55276,14 +54057,17 @@ SWIGINTERN PyObject *_wrap_ViewEdge_pointsEnd(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdge_pointsEnd'.\n  Possible C/C++ prototypes are:\n    pointsEnd(float)\n    pointsEnd()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdge_pointsEnd'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    pointsEnd(ViewEdge *,float)\n"
+    "    pointsEnd(ViewEdge *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *ViewEdge_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ViewEdge, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -55435,7 +54219,7 @@ SWIGINTERN PyObject *_wrap_new_ViewShape(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -55462,7 +54246,11 @@ SWIGINTERN PyObject *_wrap_new_ViewShape(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewShape'.\n  Possible C/C++ prototypes are:\n    ViewShape()\n    ViewShape(SShape *)\n    ViewShape(ViewShape &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewShape'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    ViewShape()\n"
+    "    ViewShape(SShape *)\n"
+    "    ViewShape(ViewShape &)\n");
   return NULL;
 }
 
@@ -55535,9 +54323,9 @@ SWIGINTERN PyObject *_wrap_ViewShape_SplitEdge(PyObject *SWIGUNUSEDPARM(self), P
   PyObject *resultobj = 0;
   ViewShape *arg1 = (ViewShape *) 0 ;
   FEdge *arg2 = (FEdge *) 0 ;
-  std::vector<TVertex * > *arg3 = 0 ;
-  std::vector<FEdge * > *arg4 = 0 ;
-  std::vector<ViewEdge * > *arg5 = 0 ;
+  std::vector< TVertex * > *arg3 = 0 ;
+  std::vector< FEdge * > *arg4 = 0 ;
+  std::vector< ViewEdge * > *arg5 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -55565,33 +54353,33 @@ SWIGINTERN PyObject *_wrap_ViewShape_SplitEdge(PyObject *SWIGUNUSEDPARM(self), P
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShape_SplitEdge" "', argument " "2"" of type '" "FEdge *""'"); 
   }
   arg2 = reinterpret_cast< FEdge * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_std__vectorTTVertex_p_std__allocatorTTVertex_p_t_t,  0  | 0);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_std__vectorT_TVertex_p_std__allocatorT_TVertex_p_t_t,  0  | 0);
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewShape_SplitEdge" "', argument " "3"" of type '" "std::vector<TVertex * > const &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewShape_SplitEdge" "', argument " "3"" of type '" "std::vector< TVertex * > const &""'"); 
   }
   if (!argp3) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShape_SplitEdge" "', argument " "3"" of type '" "std::vector<TVertex * > const &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShape_SplitEdge" "', argument " "3"" of type '" "std::vector< TVertex * > const &""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<TVertex * > * >(argp3);
-  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t,  0 );
+  arg3 = reinterpret_cast< std::vector< TVertex * > * >(argp3);
+  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t,  0 );
   if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewShape_SplitEdge" "', argument " "4"" of type '" "std::vector<FEdge * > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ViewShape_SplitEdge" "', argument " "4"" of type '" "std::vector< FEdge * > &""'"); 
   }
   if (!argp4) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShape_SplitEdge" "', argument " "4"" of type '" "std::vector<FEdge * > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShape_SplitEdge" "', argument " "4"" of type '" "std::vector< FEdge * > &""'"); 
   }
-  arg4 = reinterpret_cast< std::vector<FEdge * > * >(argp4);
-  res5 = SWIG_ConvertPtr(obj4, &argp5, SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t,  0 );
+  arg4 = reinterpret_cast< std::vector< FEdge * > * >(argp4);
+  res5 = SWIG_ConvertPtr(obj4, &argp5, SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t,  0 );
   if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "ViewShape_SplitEdge" "', argument " "5"" of type '" "std::vector<ViewEdge * > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "ViewShape_SplitEdge" "', argument " "5"" of type '" "std::vector< ViewEdge * > &""'"); 
   }
   if (!argp5) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShape_SplitEdge" "', argument " "5"" of type '" "std::vector<ViewEdge * > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShape_SplitEdge" "', argument " "5"" of type '" "std::vector< ViewEdge * > &""'"); 
   }
-  arg5 = reinterpret_cast< std::vector<ViewEdge * > * >(argp5);
+  arg5 = reinterpret_cast< std::vector< ViewEdge * > * >(argp5);
   {
     try {
-      (arg1)->SplitEdge(arg2,(std::vector<TVertex * > const &)*arg3,*arg4,*arg5);
+      (arg1)->SplitEdge(arg2,(std::vector< TVertex * > const &)*arg3,*arg4,*arg5);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -55677,7 +54465,7 @@ SWIGINTERN PyObject *_wrap_ViewShape_sshape(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -55701,7 +54489,10 @@ SWIGINTERN PyObject *_wrap_ViewShape_sshape(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewShape_sshape'.\n  Possible C/C++ prototypes are:\n    sshape()\n    sshape()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewShape_sshape'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    sshape(ViewShape *)\n"
+    "    sshape(ViewShape const *)\n");
   return NULL;
 }
 
@@ -55709,7 +54500,7 @@ fail:
 SWIGINTERN PyObject *_wrap_ViewShape_vertices(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewShape *arg1 = (ViewShape *) 0 ;
-  std::vector<ViewVertex * > *result = 0 ;
+  std::vector< ViewVertex * > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -55723,8 +54514,8 @@ SWIGINTERN PyObject *_wrap_ViewShape_vertices(PyObject *SWIGUNUSEDPARM(self), Py
   {
     try {
       {
-        std::vector<ViewVertex * > &_result_ref = (arg1)->vertices();
-        result = (std::vector<ViewVertex * > *) &_result_ref;
+        std::vector< ViewVertex * > &_result_ref = (arg1)->vertices();
+        result = (std::vector< ViewVertex * > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -55734,7 +54525,7 @@ SWIGINTERN PyObject *_wrap_ViewShape_vertices(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -55744,7 +54535,7 @@ fail:
 SWIGINTERN PyObject *_wrap_ViewShape_edges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewShape *arg1 = (ViewShape *) 0 ;
-  std::vector<ViewEdge * > *result = 0 ;
+  std::vector< ViewEdge * > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -55758,8 +54549,8 @@ SWIGINTERN PyObject *_wrap_ViewShape_edges(PyObject *SWIGUNUSEDPARM(self), PyObj
   {
     try {
       {
-        std::vector<ViewEdge * > &_result_ref = (arg1)->edges();
-        result = (std::vector<ViewEdge * > *) &_result_ref;
+        std::vector< ViewEdge * > &_result_ref = (arg1)->edges();
+        result = (std::vector< ViewEdge * > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -55769,7 +54560,7 @@ SWIGINTERN PyObject *_wrap_ViewShape_edges(PyObject *SWIGUNUSEDPARM(self), PyObj
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -55851,7 +54642,7 @@ fail:
 SWIGINTERN PyObject *_wrap_ViewShape_setVertices(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewShape *arg1 = (ViewShape *) 0 ;
-  std::vector<ViewVertex * > *arg2 = 0 ;
+  std::vector< ViewVertex * > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
@@ -55865,19 +54656,19 @@ SWIGINTERN PyObject *_wrap_ViewShape_setVertices(PyObject *SWIGUNUSEDPARM(self),
   }
   arg1 = reinterpret_cast< ViewShape * >(argp1);
   {
-    std::vector<ViewVertex*,std::allocator<ViewVertex * > > *ptr = (std::vector<ViewVertex*,std::allocator<ViewVertex * > > *)0;
+    std::vector<ViewVertex*,std::allocator< ViewVertex * > > *ptr = (std::vector<ViewVertex*,std::allocator< ViewVertex * > > *)0;
     res2 = swig::asptr(obj1, &ptr);
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShape_setVertices" "', argument " "2"" of type '" "std::vector<ViewVertex * > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShape_setVertices" "', argument " "2"" of type '" "std::vector< ViewVertex * > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShape_setVertices" "', argument " "2"" of type '" "std::vector<ViewVertex * > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShape_setVertices" "', argument " "2"" of type '" "std::vector< ViewVertex * > const &""'"); 
     }
     arg2 = ptr;
   }
   {
     try {
-      (arg1)->setVertices((std::vector<ViewVertex * > const &)*arg2);
+      (arg1)->setVertices((std::vector< ViewVertex * > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -55898,7 +54689,7 @@ fail:
 SWIGINTERN PyObject *_wrap_ViewShape_setEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewShape *arg1 = (ViewShape *) 0 ;
-  std::vector<ViewEdge * > *arg2 = 0 ;
+  std::vector< ViewEdge * > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
@@ -55912,19 +54703,19 @@ SWIGINTERN PyObject *_wrap_ViewShape_setEdges(PyObject *SWIGUNUSEDPARM(self), Py
   }
   arg1 = reinterpret_cast< ViewShape * >(argp1);
   {
-    std::vector<ViewEdge*,std::allocator<ViewEdge * > > *ptr = (std::vector<ViewEdge*,std::allocator<ViewEdge * > > *)0;
+    std::vector<ViewEdge*,std::allocator< ViewEdge * > > *ptr = (std::vector<ViewEdge*,std::allocator< ViewEdge * > > *)0;
     res2 = swig::asptr(obj1, &ptr);
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShape_setEdges" "', argument " "2"" of type '" "std::vector<ViewEdge * > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewShape_setEdges" "', argument " "2"" of type '" "std::vector< ViewEdge * > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShape_setEdges" "', argument " "2"" of type '" "std::vector<ViewEdge * > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewShape_setEdges" "', argument " "2"" of type '" "std::vector< ViewEdge * > const &""'"); 
     }
     arg2 = ptr;
   }
   {
     try {
-      (arg1)->setEdges((std::vector<ViewEdge * > const &)*arg2);
+      (arg1)->setEdges((std::vector< ViewEdge * > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -56104,7 +54895,7 @@ fail:
 
 SWIGINTERN PyObject *ViewShape_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ViewShape, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -56385,7 +55176,7 @@ SWIGINTERN PyObject *_wrap_new_ViewVertexOrientedViewEdgeIterator(PyObject *self
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -56444,7 +55235,13 @@ SWIGINTERN PyObject *_wrap_new_ViewVertexOrientedViewEdgeIterator(PyObject *self
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewVertexOrientedViewEdgeIterator'.\n  Possible C/C++ prototypes are:\n    ViewVertexInternal::orientedViewEdgeIterator()\n    ViewVertexInternal::orientedViewEdgeIterator(Nature::VertexNature)\n    ViewVertexInternal::orientedViewEdgeIterator(ViewVertexInternal::orientedViewEdgeIterator const &)\n    ViewVertexInternal::orientedViewEdgeIterator(ViewVertexInternal::orientedViewEdgeIterator::edge_pointers_container::iterator,ViewVertexInternal::orientedViewEdgeIterator::edge_pointers_container::iterator,ViewVertexInternal::orientedViewEdgeIterator::edge_pointers_container::iterator)\n    ViewVertexInternal::orientedViewEdgeIterator(ViewVertexInternal::orientedViewEdgeIterator::edges_container::iterator,ViewVertexInternal::orientedViewEdgeIterator::edges_container::iterator,ViewVertexInternal::orientedViewEdgeIterator::edges_container::iterator)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewVertexOrientedViewEdgeIterator'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    ViewVertexInternal::orientedViewEdgeIterator()\n"
+    "    ViewVertexInternal::orientedViewEdgeIterator(Nature::VertexNature)\n"
+    "    ViewVertexInternal::orientedViewEdgeIterator(ViewVertexInternal::orientedViewEdgeIterator const &)\n"
+    "    ViewVertexInternal::orientedViewEdgeIterator(ViewVertexInternal::orientedViewEdgeIterator::edge_pointers_container::iterator,ViewVertexInternal::orientedViewEdgeIterator::edge_pointers_container::iterator,ViewVertexInternal::orientedViewEdgeIterator::edge_pointers_container::iterator)\n"
+    "    ViewVertexInternal::orientedViewEdgeIterator(ViewVertexInternal::orientedViewEdgeIterator::edges_container::iterator,ViewVertexInternal::orientedViewEdgeIterator::edges_container::iterator,ViewVertexInternal::orientedViewEdgeIterator::edges_container::iterator)\n");
   return NULL;
 }
 
@@ -56629,7 +55426,7 @@ SWIGINTERN PyObject *_wrap_ViewVertexOrientedViewEdgeIterator_getObject(PyObject
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairTViewEdge_p_bool_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairT_ViewEdge_p_bool_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -56661,7 +55458,7 @@ SWIGINTERN PyObject *_wrap_ViewVertexOrientedViewEdgeIterator___deref__(PyObject
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairTViewEdge_p_bool_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairT_ViewEdge_p_bool_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -56701,7 +55498,7 @@ fail:
 
 SWIGINTERN PyObject *ViewVertexOrientedViewEdgeIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ViewVertexInternal__orientedViewEdgeIterator, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -56838,7 +55635,7 @@ SWIGINTERN PyObject *_wrap_new_ViewEdgeSVertexIterator(PyObject *self, PyObject
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 5); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -56885,7 +55682,11 @@ SWIGINTERN PyObject *_wrap_new_ViewEdgeSVertexIterator(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewEdgeSVertexIterator'.\n  Possible C/C++ prototypes are:\n    ViewEdgeInternal::SVertexIterator()\n    ViewEdgeInternal::SVertexIterator(ViewEdgeInternal::SVertexIterator const &)\n    ViewEdgeInternal::SVertexIterator(SVertex *,SVertex *,FEdge *,FEdge *,float)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewEdgeSVertexIterator'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    ViewEdgeInternal::SVertexIterator()\n"
+    "    ViewEdgeInternal::SVertexIterator(ViewEdgeInternal::SVertexIterator const &)\n"
+    "    ViewEdgeInternal::SVertexIterator(SVertex *,SVertex *,FEdge *,FEdge *,float)\n");
   return NULL;
 }
 
@@ -57408,7 +56209,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_getPoint3D(PyObject *SWIGUNUS
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -57536,7 +56337,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_getPoint2D(PyObject *SWIGUNUS
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -57890,7 +56691,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_point3D(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -57925,7 +56726,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_point2D(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -57935,7 +56736,7 @@ fail:
 SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_normals(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
-  SwigValueWrapper<set<VecMat::Vec3<double > > > result;
+  SwigValueWrapper< set< VecMat::Vec3< double > > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -57957,7 +56758,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_normals(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new set<Geometry::Vec3r >(static_cast< const set<Geometry::Vec3r >& >(result))), SWIGTYPE_p_setTVecMat__Vec3Tdouble_t_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new set< Geometry::Vec3r >(static_cast< const set< Geometry::Vec3r >& >(result))), SWIGTYPE_p_setT_VecMat__Vec3T_double_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -57999,7 +56800,7 @@ fail:
 SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_fedges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
-  std::vector<FEdge * > *result = 0 ;
+  std::vector< FEdge * > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -58013,8 +56814,8 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_fedges(PyObject *SWIGUNUSEDPA
   {
     try {
       {
-        std::vector<FEdge * > const &_result_ref = (*arg1)->fedges();
-        result = (std::vector<FEdge * > *) &_result_ref;
+        std::vector< FEdge * > const &_result_ref = (*arg1)->fedges();
+        result = (std::vector< FEdge * > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -58024,7 +56825,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_fedges(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = swig::from(static_cast< std::vector<FEdge*,std::allocator<FEdge * > > >(*result));
+  resultobj = swig::from(static_cast< std::vector<FEdge*,std::allocator< FEdge * > > >(*result));
   return resultobj;
 fail:
   return NULL;
@@ -58165,7 +56966,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_shape(PyObject *self, PyObjec
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -58189,7 +56990,10 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_shape(PyObject *self, PyObjec
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgeSVertexIterator_shape'.\n  Possible C/C++ prototypes are:\n    shape()\n    shape()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgeSVertexIterator_shape'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    shape(ViewEdgeInternal::SVertexIterator *)\n"
+    "    shape(ViewEdgeInternal::SVertexIterator const *)\n");
   return NULL;
 }
 
@@ -58275,7 +57079,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_setPoint3D(PyObject *SWIGUNUS
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_setPoint3D" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
   }
   arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeSVertexIterator_setPoint3D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -58318,7 +57122,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_setPoint2D(PyObject *SWIGUNUS
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_setPoint2D" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
   }
   arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeSVertexIterator_setPoint2D" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -58361,7 +57165,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_AddNormal(PyObject *SWIGUNUSE
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeSVertexIterator_AddNormal" "', argument " "1"" of type '" "ViewEdgeInternal::SVertexIterator *""'"); 
   }
   arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tdouble_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeSVertexIterator_AddNormal" "', argument " "2"" of type '" "Geometry::Vec3r const &""'"); 
   }
@@ -58517,7 +57321,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_setDirectionFredo(PyObject *S
   }
   arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
   {
-    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
     if (!SWIG_IsOK(res2)) {
       SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeSVertexIterator_setDirectionFredo" "', argument " "2"" of type '" "Geometry::Vec2r""'"); 
     }  
@@ -58604,7 +57408,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_directionFredo(PyObject *SWIG
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2r(static_cast< const Geometry::Vec2r& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2r(static_cast< const Geometry::Vec2r& >(result))), SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -58657,7 +57461,7 @@ fail:
 SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_setFEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewEdgeInternal::SVertexIterator *arg1 = (ViewEdgeInternal::SVertexIterator *) 0 ;
-  std::vector<FEdge * > *arg2 = 0 ;
+  std::vector< FEdge * > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 = SWIG_OLDOBJ ;
@@ -58671,19 +57475,19 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_setFEdges(PyObject *SWIGUNUSE
   }
   arg1 = reinterpret_cast< ViewEdgeInternal::SVertexIterator * >(argp1);
   {
-    std::vector<FEdge*,std::allocator<FEdge * > > *ptr = (std::vector<FEdge*,std::allocator<FEdge * > > *)0;
+    std::vector<FEdge*,std::allocator< FEdge * > > *ptr = (std::vector<FEdge*,std::allocator< FEdge * > > *)0;
     res2 = swig::asptr(obj1, &ptr);
     if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeSVertexIterator_setFEdges" "', argument " "2"" of type '" "std::vector<FEdge * > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeSVertexIterator_setFEdges" "', argument " "2"" of type '" "std::vector< FEdge * > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgeSVertexIterator_setFEdges" "', argument " "2"" of type '" "std::vector<FEdge * > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgeSVertexIterator_setFEdges" "', argument " "2"" of type '" "std::vector< FEdge * > const &""'"); 
     }
     arg2 = ptr;
   }
   {
     try {
-      (*arg1)->setFEdges((std::vector<FEdge * > const &)*arg2);
+      (*arg1)->setFEdges((std::vector< FEdge * > const &)*arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -58930,7 +57734,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_point2d(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -58965,7 +57769,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_point3d(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -58997,7 +57801,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeSVertexIterator_normal(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -59361,7 +58165,7 @@ fail:
 
 SWIGINTERN PyObject *ViewEdgeSVertexIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ViewEdgeInternal__SVertexIterator, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -59539,7 +58343,7 @@ SWIGINTERN PyObject *_wrap_new_ViewEdgeViewEdgeIterator(PyObject *self, PyObject
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -59593,7 +58397,12 @@ SWIGINTERN PyObject *_wrap_new_ViewEdgeViewEdgeIterator(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewEdgeViewEdgeIterator'.\n  Possible C/C++ prototypes are:\n    ViewEdgeInternal::ViewEdgeIterator(PyObject *,ViewEdge *,bool)\n    ViewEdgeInternal::ViewEdgeIterator(PyObject *,ViewEdge *)\n    ViewEdgeInternal::ViewEdgeIterator(PyObject *)\n    ViewEdgeInternal::ViewEdgeIterator(PyObject *,ViewEdgeInternal::ViewEdgeIterator const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewEdgeViewEdgeIterator'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    ViewEdgeInternal::ViewEdgeIterator(PyObject *,ViewEdge *,bool)\n"
+    "    ViewEdgeInternal::ViewEdgeIterator(PyObject *,ViewEdge *)\n"
+    "    ViewEdgeInternal::ViewEdgeIterator(PyObject *)\n"
+    "    ViewEdgeInternal::ViewEdgeIterator(PyObject *,ViewEdgeInternal::ViewEdgeIterator const &)\n");
   return NULL;
 }
 
@@ -60646,7 +59455,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_aShape(PyObject *self, PyObj
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -60670,7 +59479,10 @@ SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_aShape(PyObject *self, PyObj
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgeViewEdgeIterator_aShape'.\n  Possible C/C++ prototypes are:\n    aShape()\n    aShape()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgeViewEdgeIterator_aShape'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    aShape(ViewEdgeInternal::ViewEdgeIterator *)\n"
+    "    aShape(ViewEdgeInternal::ViewEdgeIterator const *)\n");
   return NULL;
 }
 
@@ -60774,7 +59586,7 @@ fail:
 SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_occluders(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
-  std::vector<ViewShape * > *result = 0 ;
+  std::vector< ViewShape * > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -60788,8 +59600,8 @@ SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_occluders(PyObject *SWIGUNUS
   {
     try {
       {
-        std::vector<ViewShape * > &_result_ref = (*arg1)->occluders();
-        result = (std::vector<ViewShape * > *) &_result_ref;
+        std::vector< ViewShape * > &_result_ref = (*arg1)->occluders();
+        result = (std::vector< ViewShape * > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -60799,7 +59611,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_occluders(PyObject *SWIGUNUS
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -61374,7 +60186,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_intersect_2d_area(PyObject *
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_intersect_2d_area" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator const *""'"); 
   }
   arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeViewEdgeIterator_intersect_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
   }
@@ -61382,7 +60194,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_intersect_2d_area(PyObject *
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgeViewEdgeIterator_intersect_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
   }
   arg2 = reinterpret_cast< Geometry::Vec2r * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewEdgeViewEdgeIterator_intersect_2d_area" "', argument " "3"" of type '" "Geometry::Vec2r const &""'"); 
   }
@@ -61430,7 +60242,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_include_in_2d_area(PyObject
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_include_in_2d_area" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator const *""'"); 
   }
   arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ViewEdgeViewEdgeIterator_include_in_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
   }
@@ -61438,7 +60250,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_include_in_2d_area(PyObject
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ViewEdgeViewEdgeIterator_include_in_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
   }
   arg2 = reinterpret_cast< Geometry::Vec2r * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ViewEdgeViewEdgeIterator_include_in_2d_area" "', argument " "3"" of type '" "Geometry::Vec2r const &""'"); 
   }
@@ -61994,7 +60806,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_pointsBegin(PyObject *self,
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -62024,7 +60836,10 @@ SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_pointsBegin(PyObject *self,
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgeViewEdgeIterator_pointsBegin'.\n  Possible C/C++ prototypes are:\n    pointsBegin(float)\n    pointsBegin()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgeViewEdgeIterator_pointsBegin'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    pointsBegin(ViewEdgeInternal::ViewEdgeIterator *,float)\n"
+    "    pointsBegin(ViewEdgeInternal::ViewEdgeIterator *)\n");
   return NULL;
 }
 
@@ -62108,7 +60923,7 @@ SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_pointsEnd(PyObject *self, Py
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -62138,7 +60953,10 @@ SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_pointsEnd(PyObject *self, Py
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgeViewEdgeIterator_pointsEnd'.\n  Possible C/C++ prototypes are:\n    pointsEnd(float)\n    pointsEnd()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ViewEdgeViewEdgeIterator_pointsEnd'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    pointsEnd(ViewEdgeInternal::ViewEdgeIterator *,float)\n"
+    "    pointsEnd(ViewEdgeInternal::ViewEdgeIterator *)\n");
   return NULL;
 }
 
@@ -62242,7 +61060,7 @@ fail:
 
 SWIGINTERN PyObject *ViewEdgeViewEdgeIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -62250,7 +61068,7 @@ SWIGINTERN PyObject *ViewEdgeViewEdgeIterator_swigregister(PyObject *SWIGUNUSEDP
 SWIGINTERN PyObject *_wrap_new_UnaryFunction0DVoid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  UnaryFunction0D<void > *result = 0 ;
+  UnaryFunction0D< void > *result = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction0DVoid",&obj0)) SWIG_fail;
@@ -62259,9 +61077,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DVoid(PyObject *SWIGUNUSEDPARM(self
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction0D<void > *)new SwigDirector_UnaryFunction0DVoid(arg1); 
+        result = (UnaryFunction0D< void > *)new SwigDirector_UnaryFunction0DVoid(arg1); 
       } else {
-        result = (UnaryFunction0D<void > *)new UnaryFunction0D<void >(); 
+        result = (UnaryFunction0D< void > *)new UnaryFunction0D< void >(); 
       }
       
     }
@@ -62272,7 +61090,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DVoid(PyObject *SWIGUNUSEDPARM(self
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DTvoid_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DT_void_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -62281,17 +61099,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction0DVoid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<void > *arg1 = (UnaryFunction0D<void > *) 0 ;
+  UnaryFunction0D< void > *arg1 = (UnaryFunction0D< void > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction0DVoid",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTvoid_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_void_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DVoid" "', argument " "1"" of type '" "UnaryFunction0D<void > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DVoid" "', argument " "1"" of type '" "UnaryFunction0D< void > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<void > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< void > * >(argp1);
   {
     try {
       delete arg1;
@@ -62313,7 +61131,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DVoid_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<void > *arg1 = (UnaryFunction0D<void > *) 0 ;
+  UnaryFunction0D< void > *arg1 = (UnaryFunction0D< void > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -62322,20 +61140,20 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DVoid_getName(PyObject *SWIGUNUSEDPARM(
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction0DVoid_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTvoid_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_void_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVoid_getName" "', argument " "1"" of type '" "UnaryFunction0D<void > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVoid_getName" "', argument " "1"" of type '" "UnaryFunction0D< void > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<void > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< void > * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
   upcall = (director && (director->swig_get_self()==obj0));
   try {
     {
       try {
         if (upcall) {
-          result = ((UnaryFunction0D<void > const *)arg1)->UnaryFunction0D<void >::getName();
+          result = ((UnaryFunction0D< void > const *)arg1)->UnaryFunction0D< void >::getName();
         } else {
-          result = ((UnaryFunction0D<void > const *)arg1)->getName();
+          result = ((UnaryFunction0D< void > const *)arg1)->getName();
         }
       }
       //    catch (Swig::DirectorTypeMismatch&) {
@@ -62357,7 +61175,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DVoid___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<void > *arg1 = (UnaryFunction0D<void > *) 0 ;
+  UnaryFunction0D< void > *arg1 = (UnaryFunction0D< void > *) 0 ;
   Interface0DIterator *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -62369,11 +61187,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DVoid___call__(PyObject *SWIGUNUSEDPARM
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction0DVoid___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTvoid_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_void_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVoid___call__" "', argument " "1"" of type '" "UnaryFunction0D<void > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVoid___call__" "', argument " "1"" of type '" "UnaryFunction0D< void > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<void > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< void > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction0DVoid___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
@@ -62388,7 +61206,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DVoid___call__(PyObject *SWIGUNUSEDPARM
     {
       try {
         if (upcall) {
-          (arg1)->UnaryFunction0D<void >::operator ()(*arg2);
+          (arg1)->UnaryFunction0D< void >::operator ()(*arg2);
         } else {
           (arg1)->operator ()(*arg2);
         }
@@ -62412,17 +61230,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DVoid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<void > *arg1 = (UnaryFunction0D<void > *) 0 ;
+  UnaryFunction0D< void > *arg1 = (UnaryFunction0D< void > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction0DVoid",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTvoid_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_void_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DVoid" "', argument " "1"" of type '" "UnaryFunction0D<void > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DVoid" "', argument " "1"" of type '" "UnaryFunction0D< void > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<void > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< void > * >(argp1);
   {
     Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
@@ -62437,15 +61255,15 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction0DVoid_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DTvoid_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DT_void_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_UnaryFunction0DUnsigned(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  UnaryFunction0D<unsigned int > *result = 0 ;
+  UnaryFunction0D< unsigned int > *result = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction0DUnsigned",&obj0)) SWIG_fail;
@@ -62454,9 +61272,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DUnsigned(PyObject *SWIGUNUSEDPARM(
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction0D<unsigned int > *)new SwigDirector_UnaryFunction0DUnsigned(arg1); 
+        result = (UnaryFunction0D< unsigned int > *)new SwigDirector_UnaryFunction0DUnsigned(arg1); 
       } else {
-        result = (UnaryFunction0D<unsigned int > *)new UnaryFunction0D<unsigned int >(); 
+        result = (UnaryFunction0D< unsigned int > *)new UnaryFunction0D< unsigned int >(); 
       }
       
     }
@@ -62467,7 +61285,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DUnsigned(PyObject *SWIGUNUSEDPARM(
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DTunsigned_int_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DT_unsigned_int_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -62476,17 +61294,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction0DUnsigned(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<unsigned int > *arg1 = (UnaryFunction0D<unsigned int > *) 0 ;
+  UnaryFunction0D< unsigned int > *arg1 = (UnaryFunction0D< unsigned int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction0DUnsigned",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTunsigned_int_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_unsigned_int_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DUnsigned" "', argument " "1"" of type '" "UnaryFunction0D<unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DUnsigned" "', argument " "1"" of type '" "UnaryFunction0D< unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< unsigned int > * >(argp1);
   {
     try {
       delete arg1;
@@ -62508,7 +61326,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DUnsigned_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<unsigned int > *arg1 = (UnaryFunction0D<unsigned int > *) 0 ;
+  UnaryFunction0D< unsigned int > *arg1 = (UnaryFunction0D< unsigned int > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -62517,20 +61335,20 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DUnsigned_getName(PyObject *SWIGUNUSEDP
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction0DUnsigned_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DUnsigned_getName" "', argument " "1"" of type '" "UnaryFunction0D<unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DUnsigned_getName" "', argument " "1"" of type '" "UnaryFunction0D< unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< unsigned int > * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
   upcall = (director && (director->swig_get_self()==obj0));
   try {
     {
       try {
         if (upcall) {
-          result = ((UnaryFunction0D<unsigned int > const *)arg1)->UnaryFunction0D<unsigned int >::getName();
+          result = ((UnaryFunction0D< unsigned int > const *)arg1)->UnaryFunction0D< unsigned int >::getName();
         } else {
-          result = ((UnaryFunction0D<unsigned int > const *)arg1)->getName();
+          result = ((UnaryFunction0D< unsigned int > const *)arg1)->getName();
         }
       }
       //    catch (Swig::DirectorTypeMismatch&) {
@@ -62552,7 +61370,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DUnsigned___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<unsigned int > *arg1 = (UnaryFunction0D<unsigned int > *) 0 ;
+  UnaryFunction0D< unsigned int > *arg1 = (UnaryFunction0D< unsigned int > *) 0 ;
   Interface0DIterator *arg2 = 0 ;
   unsigned int result;
   void *argp1 = 0 ;
@@ -62565,11 +61383,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DUnsigned___call__(PyObject *SWIGUNUSED
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction0DUnsigned___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DUnsigned___call__" "', argument " "1"" of type '" "UnaryFunction0D<unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DUnsigned___call__" "', argument " "1"" of type '" "UnaryFunction0D< unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< unsigned int > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction0DUnsigned___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
@@ -62584,7 +61402,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DUnsigned___call__(PyObject *SWIGUNUSED
     {
       try {
         if (upcall) {
-          result = (unsigned int)(arg1)->UnaryFunction0D<unsigned int >::operator ()(*arg2);
+          result = (unsigned int)(arg1)->UnaryFunction0D< unsigned int >::operator ()(*arg2);
         } else {
           result = (unsigned int)(arg1)->operator ()(*arg2);
         }
@@ -62608,17 +61426,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DUnsigned(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<unsigned int > *arg1 = (UnaryFunction0D<unsigned int > *) 0 ;
+  UnaryFunction0D< unsigned int > *arg1 = (UnaryFunction0D< unsigned int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction0DUnsigned",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DUnsigned" "', argument " "1"" of type '" "UnaryFunction0D<unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DUnsigned" "', argument " "1"" of type '" "UnaryFunction0D< unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< unsigned int > * >(argp1);
   {
     Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
@@ -62633,15 +61451,15 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction0DUnsigned_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DTunsigned_int_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DT_unsigned_int_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_UnaryFunction0DFloat(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  UnaryFunction0D<float > *result = 0 ;
+  UnaryFunction0D< float > *result = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction0DFloat",&obj0)) SWIG_fail;
@@ -62650,9 +61468,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DFloat(PyObject *SWIGUNUSEDPARM(sel
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction0D<float > *)new SwigDirector_UnaryFunction0DFloat(arg1); 
+        result = (UnaryFunction0D< float > *)new SwigDirector_UnaryFunction0DFloat(arg1); 
       } else {
-        result = (UnaryFunction0D<float > *)new UnaryFunction0D<float >(); 
+        result = (UnaryFunction0D< float > *)new UnaryFunction0D< float >(); 
       }
       
     }
@@ -62663,7 +61481,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DFloat(PyObject *SWIGUNUSEDPARM(sel
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DTfloat_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DT_float_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -62672,17 +61490,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction0DFloat(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<float > *arg1 = (UnaryFunction0D<float > *) 0 ;
+  UnaryFunction0D< float > *arg1 = (UnaryFunction0D< float > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction0DFloat",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTfloat_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_float_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DFloat" "', argument " "1"" of type '" "UnaryFunction0D<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DFloat" "', argument " "1"" of type '" "UnaryFunction0D< float > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<float > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< float > * >(argp1);
   {
     try {
       delete arg1;
@@ -62704,7 +61522,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DFloat_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<float > *arg1 = (UnaryFunction0D<float > *) 0 ;
+  UnaryFunction0D< float > *arg1 = (UnaryFunction0D< float > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -62713,20 +61531,20 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DFloat_getName(PyObject *SWIGUNUSEDPARM
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction0DFloat_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DFloat_getName" "', argument " "1"" of type '" "UnaryFunction0D<float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DFloat_getName" "', argument " "1"" of type '" "UnaryFunction0D< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<float > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< float > * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
   upcall = (director && (director->swig_get_self()==obj0));
   try {
     {
       try {
         if (upcall) {
-          result = ((UnaryFunction0D<float > const *)arg1)->UnaryFunction0D<float >::getName();
+          result = ((UnaryFunction0D< float > const *)arg1)->UnaryFunction0D< float >::getName();
         } else {
-          result = ((UnaryFunction0D<float > const *)arg1)->getName();
+          result = ((UnaryFunction0D< float > const *)arg1)->getName();
         }
       }
       //    catch (Swig::DirectorTypeMismatch&) {
@@ -62748,7 +61566,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DFloat___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<float > *arg1 = (UnaryFunction0D<float > *) 0 ;
+  UnaryFunction0D< float > *arg1 = (UnaryFunction0D< float > *) 0 ;
   Interface0DIterator *arg2 = 0 ;
   float result;
   void *argp1 = 0 ;
@@ -62761,11 +61579,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DFloat___call__(PyObject *SWIGUNUSEDPAR
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction0DFloat___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DFloat___call__" "', argument " "1"" of type '" "UnaryFunction0D<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DFloat___call__" "', argument " "1"" of type '" "UnaryFunction0D< float > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<float > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< float > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction0DFloat___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
@@ -62780,7 +61598,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DFloat___call__(PyObject *SWIGUNUSEDPAR
     {
       try {
         if (upcall) {
-          result = (float)(arg1)->UnaryFunction0D<float >::operator ()(*arg2);
+          result = (float)(arg1)->UnaryFunction0D< float >::operator ()(*arg2);
         } else {
           result = (float)(arg1)->operator ()(*arg2);
         }
@@ -62804,17 +61622,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DFloat(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<float > *arg1 = (UnaryFunction0D<float > *) 0 ;
+  UnaryFunction0D< float > *arg1 = (UnaryFunction0D< float > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction0DFloat",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DFloat" "', argument " "1"" of type '" "UnaryFunction0D<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DFloat" "', argument " "1"" of type '" "UnaryFunction0D< float > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<float > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< float > * >(argp1);
   {
     Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
@@ -62829,15 +61647,15 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction0DFloat_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DTfloat_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DT_float_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_UnaryFunction0DDouble(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  UnaryFunction0D<double > *result = 0 ;
+  UnaryFunction0D< double > *result = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction0DDouble",&obj0)) SWIG_fail;
@@ -62846,9 +61664,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DDouble(PyObject *SWIGUNUSEDPARM(se
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction0D<double > *)new SwigDirector_UnaryFunction0DDouble(arg1); 
+        result = (UnaryFunction0D< double > *)new SwigDirector_UnaryFunction0DDouble(arg1); 
       } else {
-        result = (UnaryFunction0D<double > *)new UnaryFunction0D<double >(); 
+        result = (UnaryFunction0D< double > *)new UnaryFunction0D< double >(); 
       }
       
     }
@@ -62859,7 +61677,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DDouble(PyObject *SWIGUNUSEDPARM(se
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DTdouble_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DT_double_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -62868,17 +61686,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction0DDouble(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<double > *arg1 = (UnaryFunction0D<double > *) 0 ;
+  UnaryFunction0D< double > *arg1 = (UnaryFunction0D< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction0DDouble",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTdouble_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_double_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DDouble" "', argument " "1"" of type '" "UnaryFunction0D<double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DDouble" "', argument " "1"" of type '" "UnaryFunction0D< double > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< double > * >(argp1);
   {
     try {
       delete arg1;
@@ -62900,7 +61718,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DDouble_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<double > *arg1 = (UnaryFunction0D<double > *) 0 ;
+  UnaryFunction0D< double > *arg1 = (UnaryFunction0D< double > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -62909,20 +61727,20 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DDouble_getName(PyObject *SWIGUNUSEDPAR
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction0DDouble_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DDouble_getName" "', argument " "1"" of type '" "UnaryFunction0D<double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DDouble_getName" "', argument " "1"" of type '" "UnaryFunction0D< double > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< double > * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
   upcall = (director && (director->swig_get_self()==obj0));
   try {
     {
       try {
         if (upcall) {
-          result = ((UnaryFunction0D<double > const *)arg1)->UnaryFunction0D<double >::getName();
+          result = ((UnaryFunction0D< double > const *)arg1)->UnaryFunction0D< double >::getName();
         } else {
-          result = ((UnaryFunction0D<double > const *)arg1)->getName();
+          result = ((UnaryFunction0D< double > const *)arg1)->getName();
         }
       }
       //    catch (Swig::DirectorTypeMismatch&) {
@@ -62944,7 +61762,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DDouble___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<double > *arg1 = (UnaryFunction0D<double > *) 0 ;
+  UnaryFunction0D< double > *arg1 = (UnaryFunction0D< double > *) 0 ;
   Interface0DIterator *arg2 = 0 ;
   double result;
   void *argp1 = 0 ;
@@ -62957,11 +61775,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DDouble___call__(PyObject *SWIGUNUSEDPA
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction0DDouble___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DDouble___call__" "', argument " "1"" of type '" "UnaryFunction0D<double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DDouble___call__" "', argument " "1"" of type '" "UnaryFunction0D< double > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< double > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction0DDouble___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
@@ -62976,7 +61794,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DDouble___call__(PyObject *SWIGUNUSEDPA
     {
       try {
         if (upcall) {
-          result = (double)(arg1)->UnaryFunction0D<double >::operator ()(*arg2);
+          result = (double)(arg1)->UnaryFunction0D< double >::operator ()(*arg2);
         } else {
           result = (double)(arg1)->operator ()(*arg2);
         }
@@ -63000,17 +61818,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DDouble(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<double > *arg1 = (UnaryFunction0D<double > *) 0 ;
+  UnaryFunction0D< double > *arg1 = (UnaryFunction0D< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction0DDouble",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DDouble" "', argument " "1"" of type '" "UnaryFunction0D<double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DDouble" "', argument " "1"" of type '" "UnaryFunction0D< double > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< double > * >(argp1);
   {
     Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
@@ -63025,15 +61843,15 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction0DDouble_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DTdouble_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DT_double_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_UnaryFunction0DVec2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  UnaryFunction0D<Geometry::Vec2f > *result = 0 ;
+  UnaryFunction0D< Geometry::Vec2f > *result = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction0DVec2f",&obj0)) SWIG_fail;
@@ -63042,9 +61860,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DVec2f(PyObject *SWIGUNUSEDPARM(sel
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction0D<Geometry::Vec2f > *)new SwigDirector_UnaryFunction0DVec2f(arg1); 
+        result = (UnaryFunction0D< Geometry::Vec2f > *)new SwigDirector_UnaryFunction0DVec2f(arg1); 
       } else {
-        result = (UnaryFunction0D<Geometry::Vec2f > *)new UnaryFunction0D<Geometry::Vec2f >(); 
+        result = (UnaryFunction0D< Geometry::Vec2f > *)new UnaryFunction0D< Geometry::Vec2f >(); 
       }
       
     }
@@ -63055,7 +61873,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DVec2f(PyObject *SWIGUNUSEDPARM(sel
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DT_VecMat__Vec2T_float_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -63064,17 +61882,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction0DVec2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<Geometry::Vec2f > *arg1 = (UnaryFunction0D<Geometry::Vec2f > *) 0 ;
+  UnaryFunction0D< Geometry::Vec2f > *arg1 = (UnaryFunction0D< Geometry::Vec2f > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction0DVec2f",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_VecMat__Vec2T_float_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DVec2f" "', argument " "1"" of type '" "UnaryFunction0D<Geometry::Vec2f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DVec2f" "', argument " "1"" of type '" "UnaryFunction0D< Geometry::Vec2f > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<Geometry::Vec2f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< Geometry::Vec2f > * >(argp1);
   {
     try {
       delete arg1;
@@ -63096,7 +61914,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DVec2f_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<Geometry::Vec2f > *arg1 = (UnaryFunction0D<Geometry::Vec2f > *) 0 ;
+  UnaryFunction0D< Geometry::Vec2f > *arg1 = (UnaryFunction0D< Geometry::Vec2f > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -63105,20 +61923,20 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DVec2f_getName(PyObject *SWIGUNUSEDPARM
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction0DVec2f_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_VecMat__Vec2T_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVec2f_getName" "', argument " "1"" of type '" "UnaryFunction0D<Geometry::Vec2f > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVec2f_getName" "', argument " "1"" of type '" "UnaryFunction0D< Geometry::Vec2f > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<Geometry::Vec2f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< Geometry::Vec2f > * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
   upcall = (director && (director->swig_get_self()==obj0));
   try {
     {
       try {
         if (upcall) {
-          result = ((UnaryFunction0D<Geometry::Vec2f > const *)arg1)->UnaryFunction0D<VecMat::Vec2<float > >::getName();
+          result = ((UnaryFunction0D< Geometry::Vec2f > const *)arg1)->UnaryFunction0D< VecMat::Vec2< float > >::getName();
         } else {
-          result = ((UnaryFunction0D<Geometry::Vec2f > const *)arg1)->getName();
+          result = ((UnaryFunction0D< Geometry::Vec2f > const *)arg1)->getName();
         }
       }
       //    catch (Swig::DirectorTypeMismatch&) {
@@ -63140,9 +61958,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DVec2f___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<Geometry::Vec2f > *arg1 = (UnaryFunction0D<Geometry::Vec2f > *) 0 ;
+  UnaryFunction0D< Geometry::Vec2f > *arg1 = (UnaryFunction0D< Geometry::Vec2f > *) 0 ;
   Interface0DIterator *arg2 = 0 ;
-  VecMat::Vec2<float > result;
+  VecMat::Vec2< float > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -63153,11 +61971,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DVec2f___call__(PyObject *SWIGUNUSEDPAR
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction0DVec2f___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_VecMat__Vec2T_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVec2f___call__" "', argument " "1"" of type '" "UnaryFunction0D<Geometry::Vec2f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVec2f___call__" "', argument " "1"" of type '" "UnaryFunction0D< Geometry::Vec2f > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<Geometry::Vec2f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< Geometry::Vec2f > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction0DVec2f___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
@@ -63172,7 +61990,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DVec2f___call__(PyObject *SWIGUNUSEDPAR
     {
       try {
         if (upcall) {
-          result = (arg1)->UnaryFunction0D<VecMat::Vec2<float > >::operator ()(*arg2);
+          result = (arg1)->UnaryFunction0D< VecMat::Vec2< float > >::operator ()(*arg2);
         } else {
           result = (arg1)->operator ()(*arg2);
         }
@@ -63187,7 +62005,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DVec2f___call__(PyObject *SWIGUNUSEDPAR
   } catch (Swig::DirectorException&) {
     SWIG_fail;
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<float >(static_cast< const VecMat::Vec2<float >& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< float >(static_cast< const VecMat::Vec2< float >& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -63196,17 +62014,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DVec2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<Geometry::Vec2f > *arg1 = (UnaryFunction0D<Geometry::Vec2f > *) 0 ;
+  UnaryFunction0D< Geometry::Vec2f > *arg1 = (UnaryFunction0D< Geometry::Vec2f > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction0DVec2f",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_VecMat__Vec2T_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DVec2f" "', argument " "1"" of type '" "UnaryFunction0D<Geometry::Vec2f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DVec2f" "', argument " "1"" of type '" "UnaryFunction0D< Geometry::Vec2f > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<Geometry::Vec2f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< Geometry::Vec2f > * >(argp1);
   {
     Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
@@ -63221,15 +62039,15 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction0DVec2f_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DT_VecMat__Vec2T_float_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_UnaryFunction0DVec3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  UnaryFunction0D<Geometry::Vec3f > *result = 0 ;
+  UnaryFunction0D< Geometry::Vec3f > *result = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction0DVec3f",&obj0)) SWIG_fail;
@@ -63238,9 +62056,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DVec3f(PyObject *SWIGUNUSEDPARM(sel
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction0D<Geometry::Vec3f > *)new SwigDirector_UnaryFunction0DVec3f(arg1); 
+        result = (UnaryFunction0D< Geometry::Vec3f > *)new SwigDirector_UnaryFunction0DVec3f(arg1); 
       } else {
-        result = (UnaryFunction0D<Geometry::Vec3f > *)new UnaryFunction0D<Geometry::Vec3f >(); 
+        result = (UnaryFunction0D< Geometry::Vec3f > *)new UnaryFunction0D< Geometry::Vec3f >(); 
       }
       
     }
@@ -63251,7 +62069,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DVec3f(PyObject *SWIGUNUSEDPARM(sel
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DT_VecMat__Vec3T_float_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -63260,17 +62078,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction0DVec3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<Geometry::Vec3f > *arg1 = (UnaryFunction0D<Geometry::Vec3f > *) 0 ;
+  UnaryFunction0D< Geometry::Vec3f > *arg1 = (UnaryFunction0D< Geometry::Vec3f > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction0DVec3f",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_VecMat__Vec3T_float_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DVec3f" "', argument " "1"" of type '" "UnaryFunction0D<Geometry::Vec3f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DVec3f" "', argument " "1"" of type '" "UnaryFunction0D< Geometry::Vec3f > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<Geometry::Vec3f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< Geometry::Vec3f > * >(argp1);
   {
     try {
       delete arg1;
@@ -63292,7 +62110,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DVec3f_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<Geometry::Vec3f > *arg1 = (UnaryFunction0D<Geometry::Vec3f > *) 0 ;
+  UnaryFunction0D< Geometry::Vec3f > *arg1 = (UnaryFunction0D< Geometry::Vec3f > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -63301,20 +62119,20 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DVec3f_getName(PyObject *SWIGUNUSEDPARM
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction0DVec3f_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_VecMat__Vec3T_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVec3f_getName" "', argument " "1"" of type '" "UnaryFunction0D<Geometry::Vec3f > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVec3f_getName" "', argument " "1"" of type '" "UnaryFunction0D< Geometry::Vec3f > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<Geometry::Vec3f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< Geometry::Vec3f > * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
   upcall = (director && (director->swig_get_self()==obj0));
   try {
     {
       try {
         if (upcall) {
-          result = ((UnaryFunction0D<Geometry::Vec3f > const *)arg1)->UnaryFunction0D<VecMat::Vec3<float > >::getName();
+          result = ((UnaryFunction0D< Geometry::Vec3f > const *)arg1)->UnaryFunction0D< VecMat::Vec3< float > >::getName();
         } else {
-          result = ((UnaryFunction0D<Geometry::Vec3f > const *)arg1)->getName();
+          result = ((UnaryFunction0D< Geometry::Vec3f > const *)arg1)->getName();
         }
       }
       //    catch (Swig::DirectorTypeMismatch&) {
@@ -63336,9 +62154,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DVec3f___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<Geometry::Vec3f > *arg1 = (UnaryFunction0D<Geometry::Vec3f > *) 0 ;
+  UnaryFunction0D< Geometry::Vec3f > *arg1 = (UnaryFunction0D< Geometry::Vec3f > *) 0 ;
   Interface0DIterator *arg2 = 0 ;
-  VecMat::Vec3<float > result;
+  VecMat::Vec3< float > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -63349,11 +62167,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DVec3f___call__(PyObject *SWIGUNUSEDPAR
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction0DVec3f___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_VecMat__Vec3T_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVec3f___call__" "', argument " "1"" of type '" "UnaryFunction0D<Geometry::Vec3f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVec3f___call__" "', argument " "1"" of type '" "UnaryFunction0D< Geometry::Vec3f > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<Geometry::Vec3f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< Geometry::Vec3f > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction0DVec3f___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
@@ -63368,7 +62186,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DVec3f___call__(PyObject *SWIGUNUSEDPAR
     {
       try {
         if (upcall) {
-          result = (arg1)->UnaryFunction0D<VecMat::Vec3<float > >::operator ()(*arg2);
+          result = (arg1)->UnaryFunction0D< VecMat::Vec3< float > >::operator ()(*arg2);
         } else {
           result = (arg1)->operator ()(*arg2);
         }
@@ -63383,7 +62201,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DVec3f___call__(PyObject *SWIGUNUSEDPAR
   } catch (Swig::DirectorException&) {
     SWIG_fail;
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<float >(static_cast< const VecMat::Vec3<float >& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< float >(static_cast< const VecMat::Vec3< float >& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -63392,17 +62210,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DVec3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<Geometry::Vec3f > *arg1 = (UnaryFunction0D<Geometry::Vec3f > *) 0 ;
+  UnaryFunction0D< Geometry::Vec3f > *arg1 = (UnaryFunction0D< Geometry::Vec3f > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction0DVec3f",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_VecMat__Vec3T_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DVec3f" "', argument " "1"" of type '" "UnaryFunction0D<Geometry::Vec3f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DVec3f" "', argument " "1"" of type '" "UnaryFunction0D< Geometry::Vec3f > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<Geometry::Vec3f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< Geometry::Vec3f > * >(argp1);
   {
     Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
@@ -63417,15 +62235,15 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction0DVec3f_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DT_VecMat__Vec3T_float_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_UnaryFunction0DId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  UnaryFunction0D<Id > *result = 0 ;
+  UnaryFunction0D< Id > *result = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction0DId",&obj0)) SWIG_fail;
@@ -63434,9 +62252,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DId(PyObject *SWIGUNUSEDPARM(self),
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction0D<Id > *)new SwigDirector_UnaryFunction0DId(arg1); 
+        result = (UnaryFunction0D< Id > *)new SwigDirector_UnaryFunction0DId(arg1); 
       } else {
-        result = (UnaryFunction0D<Id > *)new UnaryFunction0D<Id >(); 
+        result = (UnaryFunction0D< Id > *)new UnaryFunction0D< Id >(); 
       }
       
     }
@@ -63447,7 +62265,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DId(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DTId_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DT_Id_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -63456,17 +62274,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction0DId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<Id > *arg1 = (UnaryFunction0D<Id > *) 0 ;
+  UnaryFunction0D< Id > *arg1 = (UnaryFunction0D< Id > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction0DId",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTId_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_Id_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DId" "', argument " "1"" of type '" "UnaryFunction0D<Id > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DId" "', argument " "1"" of type '" "UnaryFunction0D< Id > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<Id > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< Id > * >(argp1);
   {
     try {
       delete arg1;
@@ -63488,7 +62306,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DId_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<Id > *arg1 = (UnaryFunction0D<Id > *) 0 ;
+  UnaryFunction0D< Id > *arg1 = (UnaryFunction0D< Id > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -63497,20 +62315,20 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DId_getName(PyObject *SWIGUNUSEDPARM(se
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction0DId_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTId_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_Id_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DId_getName" "', argument " "1"" of type '" "UnaryFunction0D<Id > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DId_getName" "', argument " "1"" of type '" "UnaryFunction0D< Id > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<Id > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< Id > * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
   upcall = (director && (director->swig_get_self()==obj0));
   try {
     {
       try {
         if (upcall) {
-          result = ((UnaryFunction0D<Id > const *)arg1)->UnaryFunction0D<Id >::getName();
+          result = ((UnaryFunction0D< Id > const *)arg1)->UnaryFunction0D< Id >::getName();
         } else {
-          result = ((UnaryFunction0D<Id > const *)arg1)->getName();
+          result = ((UnaryFunction0D< Id > const *)arg1)->getName();
         }
       }
       //    catch (Swig::DirectorTypeMismatch&) {
@@ -63532,7 +62350,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DId___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<Id > *arg1 = (UnaryFunction0D<Id > *) 0 ;
+  UnaryFunction0D< Id > *arg1 = (UnaryFunction0D< Id > *) 0 ;
   Interface0DIterator *arg2 = 0 ;
   Id result;
   void *argp1 = 0 ;
@@ -63545,11 +62363,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DId___call__(PyObject *SWIGUNUSEDPARM(s
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction0DId___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTId_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_Id_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DId___call__" "', argument " "1"" of type '" "UnaryFunction0D<Id > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DId___call__" "', argument " "1"" of type '" "UnaryFunction0D< Id > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<Id > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< Id > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction0DId___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
@@ -63564,7 +62382,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DId___call__(PyObject *SWIGUNUSEDPARM(s
     {
       try {
         if (upcall) {
-          result = (arg1)->UnaryFunction0D<Id >::operator ()(*arg2);
+          result = (arg1)->UnaryFunction0D< Id >::operator ()(*arg2);
         } else {
           result = (arg1)->operator ()(*arg2);
         }
@@ -63588,17 +62406,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<Id > *arg1 = (UnaryFunction0D<Id > *) 0 ;
+  UnaryFunction0D< Id > *arg1 = (UnaryFunction0D< Id > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction0DId",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTId_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_Id_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DId" "', argument " "1"" of type '" "UnaryFunction0D<Id > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction0DId" "', argument " "1"" of type '" "UnaryFunction0D< Id > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<Id > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< Id > * >(argp1);
   {
     Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
@@ -63613,19 +62431,19 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction0DId_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DTId_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DT_Id_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_UnaryFunction0DViewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<ViewShape * > *result = 0 ;
+  UnaryFunction0D< ViewShape * > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_UnaryFunction0DViewShape")) SWIG_fail;
   {
     try {
-      result = (UnaryFunction0D<ViewShape * > *)new UnaryFunction0D<ViewShape * >();
+      result = (UnaryFunction0D< ViewShape * > *)new UnaryFunction0D< ViewShape * >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -63634,7 +62452,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DViewShape(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DTViewShape_p_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DT_ViewShape_p_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -63643,17 +62461,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction0DViewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<ViewShape * > *arg1 = (UnaryFunction0D<ViewShape * > *) 0 ;
+  UnaryFunction0D< ViewShape * > *arg1 = (UnaryFunction0D< ViewShape * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction0DViewShape",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTViewShape_p_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_ViewShape_p_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DViewShape" "', argument " "1"" of type '" "UnaryFunction0D<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DViewShape" "', argument " "1"" of type '" "UnaryFunction0D< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< ViewShape * > * >(argp1);
   {
     try {
       delete arg1;
@@ -63675,21 +62493,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DViewShape_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<ViewShape * > *arg1 = (UnaryFunction0D<ViewShape * > *) 0 ;
+  UnaryFunction0D< ViewShape * > *arg1 = (UnaryFunction0D< ViewShape * > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction0DViewShape_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTViewShape_p_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_ViewShape_p_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DViewShape_getName" "', argument " "1"" of type '" "UnaryFunction0D<ViewShape * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DViewShape_getName" "', argument " "1"" of type '" "UnaryFunction0D< ViewShape * > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< ViewShape * > * >(argp1);
   {
     try {
-      result = ((UnaryFunction0D<ViewShape * > const *)arg1)->getName();
+      result = ((UnaryFunction0D< ViewShape * > const *)arg1)->getName();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -63707,7 +62525,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DViewShape___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<ViewShape * > *arg1 = (UnaryFunction0D<ViewShape * > *) 0 ;
+  UnaryFunction0D< ViewShape * > *arg1 = (UnaryFunction0D< ViewShape * > *) 0 ;
   Interface0DIterator *arg2 = 0 ;
   ViewShape *result = 0 ;
   void *argp1 = 0 ;
@@ -63718,11 +62536,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DViewShape___call__(PyObject *SWIGUNUSE
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction0DViewShape___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTViewShape_p_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_ViewShape_p_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DViewShape___call__" "', argument " "1"" of type '" "UnaryFunction0D<ViewShape * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DViewShape___call__" "', argument " "1"" of type '" "UnaryFunction0D< ViewShape * > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<ViewShape * > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< ViewShape * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction0DViewShape___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
@@ -63751,19 +62569,19 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction0DViewShape_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DTViewShape_p_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DT_ViewShape_p_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_UnaryFunction0DVectorViewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<std::vector<ViewShape * > > *result = 0 ;
+  UnaryFunction0D< std::vector< ViewShape * > > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_UnaryFunction0DVectorViewShape")) SWIG_fail;
   {
     try {
-      result = (UnaryFunction0D<std::vector<ViewShape * > > *)new UnaryFunction0D<std::vector<ViewShape * > >();
+      result = (UnaryFunction0D< std::vector< ViewShape * > > *)new UnaryFunction0D< std::vector< ViewShape * > >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -63772,7 +62590,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction0DVectorViewShape(PyObject *SWIGUNUS
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction0DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -63781,17 +62599,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction0DVectorViewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<std::vector<ViewShape * > > *arg1 = (UnaryFunction0D<std::vector<ViewShape * > > *) 0 ;
+  UnaryFunction0D< std::vector< ViewShape * > > *arg1 = (UnaryFunction0D< std::vector< ViewShape * > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction0DVectorViewShape",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DVectorViewShape" "', argument " "1"" of type '" "UnaryFunction0D<std::vector<ViewShape * > > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction0DVectorViewShape" "', argument " "1"" of type '" "UnaryFunction0D< std::vector< ViewShape * > > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<std::vector<ViewShape * > > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< std::vector< ViewShape * > > * >(argp1);
   {
     try {
       delete arg1;
@@ -63813,21 +62631,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DVectorViewShape_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<std::vector<ViewShape * > > *arg1 = (UnaryFunction0D<std::vector<ViewShape * > > *) 0 ;
+  UnaryFunction0D< std::vector< ViewShape * > > *arg1 = (UnaryFunction0D< std::vector< ViewShape * > > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction0DVectorViewShape_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVectorViewShape_getName" "', argument " "1"" of type '" "UnaryFunction0D<std::vector<ViewShape * > > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVectorViewShape_getName" "', argument " "1"" of type '" "UnaryFunction0D< std::vector< ViewShape * > > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<std::vector<ViewShape * > > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< std::vector< ViewShape * > > * >(argp1);
   {
     try {
-      result = ((UnaryFunction0D<std::vector<ViewShape * > > const *)arg1)->getName();
+      result = ((UnaryFunction0D< std::vector< ViewShape * > > const *)arg1)->getName();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -63845,9 +62663,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction0DVectorViewShape___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<std::vector<ViewShape * > > *arg1 = (UnaryFunction0D<std::vector<ViewShape * > > *) 0 ;
+  UnaryFunction0D< std::vector< ViewShape * > > *arg1 = (UnaryFunction0D< std::vector< ViewShape * > > *) 0 ;
   Interface0DIterator *arg2 = 0 ;
-  std::vector<ViewShape *,std::allocator<ViewShape * > > result;
+  std::vector< ViewShape *,std::allocator< ViewShape * > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -63856,11 +62674,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DVectorViewShape___call__(PyObject *SWI
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction0DVectorViewShape___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction0DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVectorViewShape___call__" "', argument " "1"" of type '" "UnaryFunction0D<std::vector<ViewShape * > > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction0DVectorViewShape___call__" "', argument " "1"" of type '" "UnaryFunction0D< std::vector< ViewShape * > > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<std::vector<ViewShape * > > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< std::vector< ViewShape * > > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface0DIterator,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction0DVectorViewShape___call__" "', argument " "2"" of type '" "Interface0DIterator &""'"); 
@@ -63880,7 +62698,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction0DVectorViewShape___call__(PyObject *SWI
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = swig::from(static_cast< std::vector<ViewShape*,std::allocator<ViewShape * > > >(result));
+  resultobj = swig::from(static_cast< std::vector<ViewShape*,std::allocator< ViewShape * > > >(result));
   return resultobj;
 fail:
   return NULL;
@@ -63889,8 +62707,8 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction0DVectorViewShape_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction0DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
@@ -64027,7 +62845,7 @@ fail:
 
 SWIGINTERN PyObject *GetXF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetXF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -64165,7 +62983,7 @@ fail:
 
 SWIGINTERN PyObject *GetYF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetYF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -64303,7 +63121,7 @@ fail:
 
 SWIGINTERN PyObject *GetZF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetZF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -64441,7 +63259,7 @@ fail:
 
 SWIGINTERN PyObject *GetProjectedXF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetProjectedXF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -64579,7 +63397,7 @@ fail:
 
 SWIGINTERN PyObject *GetProjectedYF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetProjectedYF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -64717,7 +63535,7 @@ fail:
 
 SWIGINTERN PyObject *GetProjectedZF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetProjectedZF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -64855,7 +63673,7 @@ fail:
 
 SWIGINTERN PyObject *GetCurvilinearAbscissaF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetCurvilinearAbscissaF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -64993,7 +63811,7 @@ fail:
 
 SWIGINTERN PyObject *GetParameterF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetParameterF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -65067,7 +63885,7 @@ SWIGINTERN PyObject *_wrap_VertexOrientation2DF0D___call__(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -65131,7 +63949,7 @@ fail:
 
 SWIGINTERN PyObject *VertexOrientation2DF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__VertexOrientation2DF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -65205,7 +64023,7 @@ SWIGINTERN PyObject *_wrap_VertexOrientation3DF0D___call__(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -65269,7 +64087,7 @@ fail:
 
 SWIGINTERN PyObject *VertexOrientation3DF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__VertexOrientation3DF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -65407,7 +64225,7 @@ fail:
 
 SWIGINTERN PyObject *Curvature2DAngleF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__Curvature2DAngleF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -65545,7 +64363,7 @@ fail:
 
 SWIGINTERN PyObject *ZDiscontinuityF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__ZDiscontinuityF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -65619,7 +64437,7 @@ SWIGINTERN PyObject *_wrap_Normal2DF0D___call__(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -65683,7 +64501,7 @@ fail:
 
 SWIGINTERN PyObject *Normal2DF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__Normal2DF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -65821,7 +64639,7 @@ fail:
 
 SWIGINTERN PyObject *MaterialF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__MaterialF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -65959,7 +64777,7 @@ fail:
 
 SWIGINTERN PyObject *ShapeIdF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__ShapeIdF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -66097,7 +64915,7 @@ fail:
 
 SWIGINTERN PyObject *QuantitativeInvisibilityF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__QuantitativeInvisibilityF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -66235,7 +65053,7 @@ fail:
 
 SWIGINTERN PyObject *CurveNatureF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__CurveNatureF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -66373,7 +65191,7 @@ fail:
 
 SWIGINTERN PyObject *GetShapeF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetShapeF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -66414,7 +65232,7 @@ SWIGINTERN PyObject *_wrap_GetOccludersF0D___call__(PyObject *SWIGUNUSEDPARM(sel
   PyObject *resultobj = 0;
   Functions0D::GetOccludersF0D *arg1 = (Functions0D::GetOccludersF0D *) 0 ;
   Interface0DIterator *arg2 = 0 ;
-  std::vector<ViewShape *,std::allocator<ViewShape * > > result;
+  std::vector< ViewShape *,std::allocator< ViewShape * > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -66447,7 +65265,7 @@ SWIGINTERN PyObject *_wrap_GetOccludersF0D___call__(PyObject *SWIGUNUSEDPARM(sel
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = swig::from(static_cast< std::vector<ViewShape*,std::allocator<ViewShape * > > >(result));
+  resultobj = swig::from(static_cast< std::vector<ViewShape*,std::allocator< ViewShape * > > >(result));
   return resultobj;
 fail:
   return NULL;
@@ -66511,7 +65329,7 @@ fail:
 
 SWIGINTERN PyObject *GetOccludersF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetOccludersF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -66649,7 +65467,7 @@ fail:
 
 SWIGINTERN PyObject *GetOccludeeF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetOccludeeF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -66704,7 +65522,7 @@ fail:
 SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVoid__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  UnaryFunction1D<void > *result = 0 ;
+  UnaryFunction1D< void > *result = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction1DVoid",&obj0)) SWIG_fail;
@@ -66713,9 +65531,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVoid__SWIG_0(PyObject *SWIGUNUSEDP
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction1D<void > *)new SwigDirector_UnaryFunction1DVoid(arg1); 
+        result = (UnaryFunction1D< void > *)new SwigDirector_UnaryFunction1DVoid(arg1); 
       } else {
-        result = (UnaryFunction1D<void > *)new UnaryFunction1D<void >(); 
+        result = (UnaryFunction1D< void > *)new UnaryFunction1D< void >(); 
       }
       
     }
@@ -66726,7 +65544,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVoid__SWIG_0(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTvoid_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DT_void_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -66737,7 +65555,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVoid__SWIG_1(PyObject *SWIGUNUSEDP
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
   IntegrationType arg2 ;
-  UnaryFunction1D<void > *result = 0 ;
+  UnaryFunction1D< void > *result = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
@@ -66754,9 +65572,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVoid__SWIG_1(PyObject *SWIGUNUSEDP
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction1D<void > *)new SwigDirector_UnaryFunction1DVoid(arg1,arg2); 
+        result = (UnaryFunction1D< void > *)new SwigDirector_UnaryFunction1DVoid(arg1,arg2); 
       } else {
-        result = (UnaryFunction1D<void > *)new UnaryFunction1D<void >(arg2); 
+        result = (UnaryFunction1D< void > *)new UnaryFunction1D< void >(arg2); 
       }
       
     }
@@ -66767,7 +65585,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVoid__SWIG_1(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTvoid_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DT_void_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -66780,7 +65598,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVoid(PyObject *self, PyObject *arg
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -66806,24 +65624,27 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVoid(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DVoid'.\n  Possible C/C++ prototypes are:\n    UnaryFunction1D<(void)>(PyObject *)\n    UnaryFunction1D<(void)>(PyObject *,IntegrationType)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DVoid'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    UnaryFunction1D< void >(PyObject *)\n"
+    "    UnaryFunction1D< void >(PyObject *,IntegrationType)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction1DVoid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<void > *arg1 = (UnaryFunction1D<void > *) 0 ;
+  UnaryFunction1D< void > *arg1 = (UnaryFunction1D< void > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction1DVoid",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTvoid_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_void_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DVoid" "', argument " "1"" of type '" "UnaryFunction1D<void > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DVoid" "', argument " "1"" of type '" "UnaryFunction1D< void > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<void > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< void > * >(argp1);
   {
     try {
       delete arg1;
@@ -66845,7 +65666,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVoid_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<void > *arg1 = (UnaryFunction1D<void > *) 0 ;
+  UnaryFunction1D< void > *arg1 = (UnaryFunction1D< void > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -66854,20 +65675,20 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVoid_getName(PyObject *SWIGUNUSEDPARM(
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DVoid_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTvoid_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_void_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVoid_getName" "', argument " "1"" of type '" "UnaryFunction1D<void > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVoid_getName" "', argument " "1"" of type '" "UnaryFunction1D< void > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<void > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< void > * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
   upcall = (director && (director->swig_get_self()==obj0));
   try {
     {
       try {
         if (upcall) {
-          result = ((UnaryFunction1D<void > const *)arg1)->UnaryFunction1D<void >::getName();
+          result = ((UnaryFunction1D< void > const *)arg1)->UnaryFunction1D< void >::getName();
         } else {
-          result = ((UnaryFunction1D<void > const *)arg1)->getName();
+          result = ((UnaryFunction1D< void > const *)arg1)->getName();
         }
       }
       //    catch (Swig::DirectorTypeMismatch&) {
@@ -66889,7 +65710,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVoid___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<void > *arg1 = (UnaryFunction1D<void > *) 0 ;
+  UnaryFunction1D< void > *arg1 = (UnaryFunction1D< void > *) 0 ;
   Interface1D *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -66901,11 +65722,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVoid___call__(PyObject *SWIGUNUSEDPARM
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DVoid___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTvoid_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_void_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVoid___call__" "', argument " "1"" of type '" "UnaryFunction1D<void > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVoid___call__" "', argument " "1"" of type '" "UnaryFunction1D< void > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<void > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< void > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction1DVoid___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
@@ -66920,7 +65741,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVoid___call__(PyObject *SWIGUNUSEDPARM
     {
       try {
         if (upcall) {
-          (arg1)->UnaryFunction1D<void >::operator ()(*arg2);
+          (arg1)->UnaryFunction1D< void >::operator ()(*arg2);
         } else {
           (arg1)->operator ()(*arg2);
         }
@@ -66944,7 +65765,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVoid_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<void > *arg1 = (UnaryFunction1D<void > *) 0 ;
+  UnaryFunction1D< void > *arg1 = (UnaryFunction1D< void > *) 0 ;
   IntegrationType arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -66954,11 +65775,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVoid_setIntegrationType(PyObject *SWIG
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DVoid_setIntegrationType",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTvoid_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_void_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVoid_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<void > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVoid_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D< void > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<void > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< void > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "UnaryFunction1DVoid_setIntegrationType" "', argument " "2"" of type '" "IntegrationType""'");
@@ -66984,21 +65805,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVoid_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<void > *arg1 = (UnaryFunction1D<void > *) 0 ;
+  UnaryFunction1D< void > *arg1 = (UnaryFunction1D< void > *) 0 ;
   IntegrationType result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DVoid_getIntegrationType",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTvoid_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_void_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVoid_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<void > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVoid_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D< void > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<void > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< void > * >(argp1);
   {
     try {
-      result = (IntegrationType)((UnaryFunction1D<void > const *)arg1)->getIntegrationType();
+      result = (IntegrationType)((UnaryFunction1D< void > const *)arg1)->getIntegrationType();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -67016,17 +65837,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_disown_UnaryFunction1DVoid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<void > *arg1 = (UnaryFunction1D<void > *) 0 ;
+  UnaryFunction1D< void > *arg1 = (UnaryFunction1D< void > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction1DVoid",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTvoid_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_void_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction1DVoid" "', argument " "1"" of type '" "UnaryFunction1D<void > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction1DVoid" "', argument " "1"" of type '" "UnaryFunction1D< void > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<void > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< void > * >(argp1);
   {
     Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
@@ -67041,15 +65862,15 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction1DVoid_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DTvoid_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DT_void_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_UnaryFunction1DUnsigned__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  UnaryFunction1D<unsigned int > *result = 0 ;
+  UnaryFunction1D< unsigned int > *result = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction1DUnsigned",&obj0)) SWIG_fail;
@@ -67058,9 +65879,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DUnsigned__SWIG_0(PyObject *SWIGUNU
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction1D<unsigned int > *)new SwigDirector_UnaryFunction1DUnsigned(arg1); 
+        result = (UnaryFunction1D< unsigned int > *)new SwigDirector_UnaryFunction1DUnsigned(arg1); 
       } else {
-        result = (UnaryFunction1D<unsigned int > *)new UnaryFunction1D<unsigned int >(); 
+        result = (UnaryFunction1D< unsigned int > *)new UnaryFunction1D< unsigned int >(); 
       }
       
     }
@@ -67071,7 +65892,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DUnsigned__SWIG_0(PyObject *SWIGUNU
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTunsigned_int_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DT_unsigned_int_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -67082,7 +65903,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DUnsigned__SWIG_1(PyObject *SWIGUNU
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
   IntegrationType arg2 ;
-  UnaryFunction1D<unsigned int > *result = 0 ;
+  UnaryFunction1D< unsigned int > *result = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
@@ -67099,9 +65920,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DUnsigned__SWIG_1(PyObject *SWIGUNU
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction1D<unsigned int > *)new SwigDirector_UnaryFunction1DUnsigned(arg1,arg2); 
+        result = (UnaryFunction1D< unsigned int > *)new SwigDirector_UnaryFunction1DUnsigned(arg1,arg2); 
       } else {
-        result = (UnaryFunction1D<unsigned int > *)new UnaryFunction1D<unsigned int >(arg2); 
+        result = (UnaryFunction1D< unsigned int > *)new UnaryFunction1D< unsigned int >(arg2); 
       }
       
     }
@@ -67112,7 +65933,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DUnsigned__SWIG_1(PyObject *SWIGUNU
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTunsigned_int_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DT_unsigned_int_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -67125,7 +65946,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DUnsigned(PyObject *self, PyObject
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -67151,24 +65972,27 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DUnsigned(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DUnsigned'.\n  Possible C/C++ prototypes are:\n    UnaryFunction1D<(unsigned int)>(PyObject *)\n    UnaryFunction1D<(unsigned int)>(PyObject *,IntegrationType)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DUnsigned'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    UnaryFunction1D< unsigned int >(PyObject *)\n"
+    "    UnaryFunction1D< unsigned int >(PyObject *,IntegrationType)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction1DUnsigned(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<unsigned int > *arg1 = (UnaryFunction1D<unsigned int > *) 0 ;
+  UnaryFunction1D< unsigned int > *arg1 = (UnaryFunction1D< unsigned int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction1DUnsigned",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTunsigned_int_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_unsigned_int_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DUnsigned" "', argument " "1"" of type '" "UnaryFunction1D<unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DUnsigned" "', argument " "1"" of type '" "UnaryFunction1D< unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< unsigned int > * >(argp1);
   {
     try {
       delete arg1;
@@ -67190,7 +66014,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DUnsigned_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<unsigned int > *arg1 = (UnaryFunction1D<unsigned int > *) 0 ;
+  UnaryFunction1D< unsigned int > *arg1 = (UnaryFunction1D< unsigned int > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -67199,20 +66023,20 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DUnsigned_getName(PyObject *SWIGUNUSEDP
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DUnsigned_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DUnsigned_getName" "', argument " "1"" of type '" "UnaryFunction1D<unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DUnsigned_getName" "', argument " "1"" of type '" "UnaryFunction1D< unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< unsigned int > * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
   upcall = (director && (director->swig_get_self()==obj0));
   try {
     {
       try {
         if (upcall) {
-          result = ((UnaryFunction1D<unsigned int > const *)arg1)->UnaryFunction1D<unsigned int >::getName();
+          result = ((UnaryFunction1D< unsigned int > const *)arg1)->UnaryFunction1D< unsigned int >::getName();
         } else {
-          result = ((UnaryFunction1D<unsigned int > const *)arg1)->getName();
+          result = ((UnaryFunction1D< unsigned int > const *)arg1)->getName();
         }
       }
       //    catch (Swig::DirectorTypeMismatch&) {
@@ -67234,7 +66058,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DUnsigned___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<unsigned int > *arg1 = (UnaryFunction1D<unsigned int > *) 0 ;
+  UnaryFunction1D< unsigned int > *arg1 = (UnaryFunction1D< unsigned int > *) 0 ;
   Interface1D *arg2 = 0 ;
   unsigned int result;
   void *argp1 = 0 ;
@@ -67247,11 +66071,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DUnsigned___call__(PyObject *SWIGUNUSED
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DUnsigned___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DUnsigned___call__" "', argument " "1"" of type '" "UnaryFunction1D<unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DUnsigned___call__" "', argument " "1"" of type '" "UnaryFunction1D< unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< unsigned int > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction1DUnsigned___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
@@ -67266,7 +66090,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DUnsigned___call__(PyObject *SWIGUNUSED
     {
       try {
         if (upcall) {
-          result = (unsigned int)(arg1)->UnaryFunction1D<unsigned int >::operator ()(*arg2);
+          result = (unsigned int)(arg1)->UnaryFunction1D< unsigned int >::operator ()(*arg2);
         } else {
           result = (unsigned int)(arg1)->operator ()(*arg2);
         }
@@ -67290,7 +66114,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DUnsigned_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<unsigned int > *arg1 = (UnaryFunction1D<unsigned int > *) 0 ;
+  UnaryFunction1D< unsigned int > *arg1 = (UnaryFunction1D< unsigned int > *) 0 ;
   IntegrationType arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -67300,11 +66124,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DUnsigned_setIntegrationType(PyObject *
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DUnsigned_setIntegrationType",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DUnsigned_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DUnsigned_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D< unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< unsigned int > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "UnaryFunction1DUnsigned_setIntegrationType" "', argument " "2"" of type '" "IntegrationType""'");
@@ -67330,21 +66154,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DUnsigned_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<unsigned int > *arg1 = (UnaryFunction1D<unsigned int > *) 0 ;
+  UnaryFunction1D< unsigned int > *arg1 = (UnaryFunction1D< unsigned int > *) 0 ;
   IntegrationType result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DUnsigned_getIntegrationType",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DUnsigned_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<unsigned int > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DUnsigned_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D< unsigned int > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< unsigned int > * >(argp1);
   {
     try {
-      result = (IntegrationType)((UnaryFunction1D<unsigned int > const *)arg1)->getIntegrationType();
+      result = (IntegrationType)((UnaryFunction1D< unsigned int > const *)arg1)->getIntegrationType();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -67362,17 +66186,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_disown_UnaryFunction1DUnsigned(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<unsigned int > *arg1 = (UnaryFunction1D<unsigned int > *) 0 ;
+  UnaryFunction1D< unsigned int > *arg1 = (UnaryFunction1D< unsigned int > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction1DUnsigned",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTunsigned_int_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_unsigned_int_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction1DUnsigned" "', argument " "1"" of type '" "UnaryFunction1D<unsigned int > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction1DUnsigned" "', argument " "1"" of type '" "UnaryFunction1D< unsigned int > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<unsigned int > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< unsigned int > * >(argp1);
   {
     Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
@@ -67387,15 +66211,15 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction1DUnsigned_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DTunsigned_int_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DT_unsigned_int_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_UnaryFunction1DFloat__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  UnaryFunction1D<float > *result = 0 ;
+  UnaryFunction1D< float > *result = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction1DFloat",&obj0)) SWIG_fail;
@@ -67404,9 +66228,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DFloat__SWIG_0(PyObject *SWIGUNUSED
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction1D<float > *)new SwigDirector_UnaryFunction1DFloat(arg1); 
+        result = (UnaryFunction1D< float > *)new SwigDirector_UnaryFunction1DFloat(arg1); 
       } else {
-        result = (UnaryFunction1D<float > *)new UnaryFunction1D<float >(); 
+        result = (UnaryFunction1D< float > *)new UnaryFunction1D< float >(); 
       }
       
     }
@@ -67417,7 +66241,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DFloat__SWIG_0(PyObject *SWIGUNUSED
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTfloat_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DT_float_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -67428,7 +66252,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DFloat__SWIG_1(PyObject *SWIGUNUSED
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
   IntegrationType arg2 ;
-  UnaryFunction1D<float > *result = 0 ;
+  UnaryFunction1D< float > *result = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
@@ -67445,9 +66269,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DFloat__SWIG_1(PyObject *SWIGUNUSED
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction1D<float > *)new SwigDirector_UnaryFunction1DFloat(arg1,arg2); 
+        result = (UnaryFunction1D< float > *)new SwigDirector_UnaryFunction1DFloat(arg1,arg2); 
       } else {
-        result = (UnaryFunction1D<float > *)new UnaryFunction1D<float >(arg2); 
+        result = (UnaryFunction1D< float > *)new UnaryFunction1D< float >(arg2); 
       }
       
     }
@@ -67458,7 +66282,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DFloat__SWIG_1(PyObject *SWIGUNUSED
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTfloat_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DT_float_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -67471,7 +66295,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DFloat(PyObject *self, PyObject *ar
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -67497,24 +66321,27 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DFloat(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DFloat'.\n  Possible C/C++ prototypes are:\n    UnaryFunction1D<(float)>(PyObject *)\n    UnaryFunction1D<(float)>(PyObject *,IntegrationType)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DFloat'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    UnaryFunction1D< float >(PyObject *)\n"
+    "    UnaryFunction1D< float >(PyObject *,IntegrationType)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction1DFloat(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<float > *arg1 = (UnaryFunction1D<float > *) 0 ;
+  UnaryFunction1D< float > *arg1 = (UnaryFunction1D< float > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction1DFloat",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTfloat_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_float_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DFloat" "', argument " "1"" of type '" "UnaryFunction1D<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DFloat" "', argument " "1"" of type '" "UnaryFunction1D< float > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<float > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< float > * >(argp1);
   {
     try {
       delete arg1;
@@ -67536,7 +66363,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DFloat_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<float > *arg1 = (UnaryFunction1D<float > *) 0 ;
+  UnaryFunction1D< float > *arg1 = (UnaryFunction1D< float > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -67545,20 +66372,20 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DFloat_getName(PyObject *SWIGUNUSEDPARM
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DFloat_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DFloat_getName" "', argument " "1"" of type '" "UnaryFunction1D<float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DFloat_getName" "', argument " "1"" of type '" "UnaryFunction1D< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<float > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< float > * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
   upcall = (director && (director->swig_get_self()==obj0));
   try {
     {
       try {
         if (upcall) {
-          result = ((UnaryFunction1D<float > const *)arg1)->UnaryFunction1D<float >::getName();
+          result = ((UnaryFunction1D< float > const *)arg1)->UnaryFunction1D< float >::getName();
         } else {
-          result = ((UnaryFunction1D<float > const *)arg1)->getName();
+          result = ((UnaryFunction1D< float > const *)arg1)->getName();
         }
       }
       //    catch (Swig::DirectorTypeMismatch&) {
@@ -67580,7 +66407,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DFloat___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<float > *arg1 = (UnaryFunction1D<float > *) 0 ;
+  UnaryFunction1D< float > *arg1 = (UnaryFunction1D< float > *) 0 ;
   Interface1D *arg2 = 0 ;
   float result;
   void *argp1 = 0 ;
@@ -67593,11 +66420,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DFloat___call__(PyObject *SWIGUNUSEDPAR
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DFloat___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DFloat___call__" "', argument " "1"" of type '" "UnaryFunction1D<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DFloat___call__" "', argument " "1"" of type '" "UnaryFunction1D< float > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<float > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< float > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction1DFloat___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
@@ -67612,7 +66439,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DFloat___call__(PyObject *SWIGUNUSEDPAR
     {
       try {
         if (upcall) {
-          result = (float)(arg1)->UnaryFunction1D<float >::operator ()(*arg2);
+          result = (float)(arg1)->UnaryFunction1D< float >::operator ()(*arg2);
         } else {
           result = (float)(arg1)->operator ()(*arg2);
         }
@@ -67636,7 +66463,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DFloat_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<float > *arg1 = (UnaryFunction1D<float > *) 0 ;
+  UnaryFunction1D< float > *arg1 = (UnaryFunction1D< float > *) 0 ;
   IntegrationType arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -67646,11 +66473,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DFloat_setIntegrationType(PyObject *SWI
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DFloat_setIntegrationType",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DFloat_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DFloat_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D< float > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<float > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< float > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "UnaryFunction1DFloat_setIntegrationType" "', argument " "2"" of type '" "IntegrationType""'");
@@ -67676,21 +66503,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DFloat_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<float > *arg1 = (UnaryFunction1D<float > *) 0 ;
+  UnaryFunction1D< float > *arg1 = (UnaryFunction1D< float > *) 0 ;
   IntegrationType result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DFloat_getIntegrationType",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DFloat_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<float > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DFloat_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D< float > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<float > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< float > * >(argp1);
   {
     try {
-      result = (IntegrationType)((UnaryFunction1D<float > const *)arg1)->getIntegrationType();
+      result = (IntegrationType)((UnaryFunction1D< float > const *)arg1)->getIntegrationType();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -67708,17 +66535,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_disown_UnaryFunction1DFloat(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<float > *arg1 = (UnaryFunction1D<float > *) 0 ;
+  UnaryFunction1D< float > *arg1 = (UnaryFunction1D< float > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction1DFloat",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTfloat_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_float_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction1DFloat" "', argument " "1"" of type '" "UnaryFunction1D<float > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction1DFloat" "', argument " "1"" of type '" "UnaryFunction1D< float > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<float > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< float > * >(argp1);
   {
     Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
@@ -67733,15 +66560,15 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction1DFloat_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DTfloat_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DT_float_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_UnaryFunction1DDouble__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  UnaryFunction1D<double > *result = 0 ;
+  UnaryFunction1D< double > *result = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction1DDouble",&obj0)) SWIG_fail;
@@ -67750,9 +66577,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DDouble__SWIG_0(PyObject *SWIGUNUSE
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction1D<double > *)new SwigDirector_UnaryFunction1DDouble(arg1); 
+        result = (UnaryFunction1D< double > *)new SwigDirector_UnaryFunction1DDouble(arg1); 
       } else {
-        result = (UnaryFunction1D<double > *)new UnaryFunction1D<double >(); 
+        result = (UnaryFunction1D< double > *)new UnaryFunction1D< double >(); 
       }
       
     }
@@ -67763,7 +66590,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DDouble__SWIG_0(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTdouble_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DT_double_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -67774,7 +66601,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DDouble__SWIG_1(PyObject *SWIGUNUSE
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
   IntegrationType arg2 ;
-  UnaryFunction1D<double > *result = 0 ;
+  UnaryFunction1D< double > *result = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
@@ -67791,9 +66618,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DDouble__SWIG_1(PyObject *SWIGUNUSE
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction1D<double > *)new SwigDirector_UnaryFunction1DDouble(arg1,arg2); 
+        result = (UnaryFunction1D< double > *)new SwigDirector_UnaryFunction1DDouble(arg1,arg2); 
       } else {
-        result = (UnaryFunction1D<double > *)new UnaryFunction1D<double >(arg2); 
+        result = (UnaryFunction1D< double > *)new UnaryFunction1D< double >(arg2); 
       }
       
     }
@@ -67804,7 +66631,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DDouble__SWIG_1(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTdouble_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DT_double_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -67817,7 +66644,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DDouble(PyObject *self, PyObject *a
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -67843,24 +66670,27 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DDouble(PyObject *self, PyObject *a
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DDouble'.\n  Possible C/C++ prototypes are:\n    UnaryFunction1D<(double)>(PyObject *)\n    UnaryFunction1D<(double)>(PyObject *,IntegrationType)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DDouble'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    UnaryFunction1D< double >(PyObject *)\n"
+    "    UnaryFunction1D< double >(PyObject *,IntegrationType)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction1DDouble(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<double > *arg1 = (UnaryFunction1D<double > *) 0 ;
+  UnaryFunction1D< double > *arg1 = (UnaryFunction1D< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction1DDouble",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTdouble_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_double_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DDouble" "', argument " "1"" of type '" "UnaryFunction1D<double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DDouble" "', argument " "1"" of type '" "UnaryFunction1D< double > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< double > * >(argp1);
   {
     try {
       delete arg1;
@@ -67882,7 +66712,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DDouble_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<double > *arg1 = (UnaryFunction1D<double > *) 0 ;
+  UnaryFunction1D< double > *arg1 = (UnaryFunction1D< double > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -67891,20 +66721,20 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DDouble_getName(PyObject *SWIGUNUSEDPAR
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DDouble_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DDouble_getName" "', argument " "1"" of type '" "UnaryFunction1D<double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DDouble_getName" "', argument " "1"" of type '" "UnaryFunction1D< double > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< double > * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
   upcall = (director && (director->swig_get_self()==obj0));
   try {
     {
       try {
         if (upcall) {
-          result = ((UnaryFunction1D<double > const *)arg1)->UnaryFunction1D<double >::getName();
+          result = ((UnaryFunction1D< double > const *)arg1)->UnaryFunction1D< double >::getName();
         } else {
-          result = ((UnaryFunction1D<double > const *)arg1)->getName();
+          result = ((UnaryFunction1D< double > const *)arg1)->getName();
         }
       }
       //    catch (Swig::DirectorTypeMismatch&) {
@@ -67926,7 +66756,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DDouble___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<double > *arg1 = (UnaryFunction1D<double > *) 0 ;
+  UnaryFunction1D< double > *arg1 = (UnaryFunction1D< double > *) 0 ;
   Interface1D *arg2 = 0 ;
   double result;
   void *argp1 = 0 ;
@@ -67939,11 +66769,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DDouble___call__(PyObject *SWIGUNUSEDPA
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DDouble___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DDouble___call__" "', argument " "1"" of type '" "UnaryFunction1D<double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DDouble___call__" "', argument " "1"" of type '" "UnaryFunction1D< double > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< double > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction1DDouble___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
@@ -67958,7 +66788,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DDouble___call__(PyObject *SWIGUNUSEDPA
     {
       try {
         if (upcall) {
-          result = (double)(arg1)->UnaryFunction1D<double >::operator ()(*arg2);
+          result = (double)(arg1)->UnaryFunction1D< double >::operator ()(*arg2);
         } else {
           result = (double)(arg1)->operator ()(*arg2);
         }
@@ -67982,7 +66812,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DDouble_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<double > *arg1 = (UnaryFunction1D<double > *) 0 ;
+  UnaryFunction1D< double > *arg1 = (UnaryFunction1D< double > *) 0 ;
   IntegrationType arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -67992,11 +66822,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DDouble_setIntegrationType(PyObject *SW
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DDouble_setIntegrationType",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DDouble_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DDouble_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D< double > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< double > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "UnaryFunction1DDouble_setIntegrationType" "', argument " "2"" of type '" "IntegrationType""'");
@@ -68022,21 +66852,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DDouble_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<double > *arg1 = (UnaryFunction1D<double > *) 0 ;
+  UnaryFunction1D< double > *arg1 = (UnaryFunction1D< double > *) 0 ;
   IntegrationType result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DDouble_getIntegrationType",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DDouble_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<double > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DDouble_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D< double > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< double > * >(argp1);
   {
     try {
-      result = (IntegrationType)((UnaryFunction1D<double > const *)arg1)->getIntegrationType();
+      result = (IntegrationType)((UnaryFunction1D< double > const *)arg1)->getIntegrationType();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -68054,17 +66884,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_disown_UnaryFunction1DDouble(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<double > *arg1 = (UnaryFunction1D<double > *) 0 ;
+  UnaryFunction1D< double > *arg1 = (UnaryFunction1D< double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction1DDouble",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTdouble_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction1DDouble" "', argument " "1"" of type '" "UnaryFunction1D<double > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction1DDouble" "', argument " "1"" of type '" "UnaryFunction1D< double > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< double > * >(argp1);
   {
     Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
@@ -68079,15 +66909,15 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction1DDouble_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DTdouble_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DT_double_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec2f__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  UnaryFunction1D<Geometry::Vec2f > *result = 0 ;
+  UnaryFunction1D< Geometry::Vec2f > *result = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction1DVec2f",&obj0)) SWIG_fail;
@@ -68096,9 +66926,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec2f__SWIG_0(PyObject *SWIGUNUSED
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction1D<Geometry::Vec2f > *)new SwigDirector_UnaryFunction1DVec2f(arg1); 
+        result = (UnaryFunction1D< Geometry::Vec2f > *)new SwigDirector_UnaryFunction1DVec2f(arg1); 
       } else {
-        result = (UnaryFunction1D<Geometry::Vec2f > *)new UnaryFunction1D<Geometry::Vec2f >(); 
+        result = (UnaryFunction1D< Geometry::Vec2f > *)new UnaryFunction1D< Geometry::Vec2f >(); 
       }
       
     }
@@ -68109,7 +66939,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec2f__SWIG_0(PyObject *SWIGUNUSED
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec2T_float_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -68120,7 +66950,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec2f__SWIG_1(PyObject *SWIGUNUSED
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
   IntegrationType arg2 ;
-  UnaryFunction1D<Geometry::Vec2f > *result = 0 ;
+  UnaryFunction1D< Geometry::Vec2f > *result = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
@@ -68137,9 +66967,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec2f__SWIG_1(PyObject *SWIGUNUSED
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction1D<Geometry::Vec2f > *)new SwigDirector_UnaryFunction1DVec2f(arg1,arg2); 
+        result = (UnaryFunction1D< Geometry::Vec2f > *)new SwigDirector_UnaryFunction1DVec2f(arg1,arg2); 
       } else {
-        result = (UnaryFunction1D<Geometry::Vec2f > *)new UnaryFunction1D<Geometry::Vec2f >(arg2); 
+        result = (UnaryFunction1D< Geometry::Vec2f > *)new UnaryFunction1D< Geometry::Vec2f >(arg2); 
       }
       
     }
@@ -68150,7 +66980,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec2f__SWIG_1(PyObject *SWIGUNUSED
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec2T_float_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -68163,7 +66993,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec2f(PyObject *self, PyObject *ar
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -68189,24 +67019,27 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec2f(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DVec2f'.\n  Possible C/C++ prototypes are:\n    UnaryFunction1D<(Geometry::Vec2f)>(PyObject *)\n    UnaryFunction1D<(Geometry::Vec2f)>(PyObject *,IntegrationType)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DVec2f'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    UnaryFunction1D< Geometry::Vec2f >(PyObject *)\n"
+    "    UnaryFunction1D< Geometry::Vec2f >(PyObject *,IntegrationType)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction1DVec2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<Geometry::Vec2f > *arg1 = (UnaryFunction1D<Geometry::Vec2f > *) 0 ;
+  UnaryFunction1D< Geometry::Vec2f > *arg1 = (UnaryFunction1D< Geometry::Vec2f > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction1DVec2f",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec2T_float_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DVec2f" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec2f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DVec2f" "', argument " "1"" of type '" "UnaryFunction1D< Geometry::Vec2f > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec2f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< Geometry::Vec2f > * >(argp1);
   {
     try {
       delete arg1;
@@ -68228,7 +67061,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVec2f_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<Geometry::Vec2f > *arg1 = (UnaryFunction1D<Geometry::Vec2f > *) 0 ;
+  UnaryFunction1D< Geometry::Vec2f > *arg1 = (UnaryFunction1D< Geometry::Vec2f > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -68237,20 +67070,20 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVec2f_getName(PyObject *SWIGUNUSEDPARM
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DVec2f_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec2T_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec2f_getName" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec2f > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec2f_getName" "', argument " "1"" of type '" "UnaryFunction1D< Geometry::Vec2f > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec2f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< Geometry::Vec2f > * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
   upcall = (director && (director->swig_get_self()==obj0));
   try {
     {
       try {
         if (upcall) {
-          result = ((UnaryFunction1D<Geometry::Vec2f > const *)arg1)->UnaryFunction1D<VecMat::Vec2<float > >::getName();
+          result = ((UnaryFunction1D< Geometry::Vec2f > const *)arg1)->UnaryFunction1D< VecMat::Vec2< float > >::getName();
         } else {
-          result = ((UnaryFunction1D<Geometry::Vec2f > const *)arg1)->getName();
+          result = ((UnaryFunction1D< Geometry::Vec2f > const *)arg1)->getName();
         }
       }
       //    catch (Swig::DirectorTypeMismatch&) {
@@ -68272,9 +67105,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVec2f___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<Geometry::Vec2f > *arg1 = (UnaryFunction1D<Geometry::Vec2f > *) 0 ;
+  UnaryFunction1D< Geometry::Vec2f > *arg1 = (UnaryFunction1D< Geometry::Vec2f > *) 0 ;
   Interface1D *arg2 = 0 ;
-  VecMat::Vec2<float > result;
+  VecMat::Vec2< float > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -68285,11 +67118,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVec2f___call__(PyObject *SWIGUNUSEDPAR
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DVec2f___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec2T_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec2f___call__" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec2f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec2f___call__" "', argument " "1"" of type '" "UnaryFunction1D< Geometry::Vec2f > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec2f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< Geometry::Vec2f > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction1DVec2f___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
@@ -68304,7 +67137,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVec2f___call__(PyObject *SWIGUNUSEDPAR
     {
       try {
         if (upcall) {
-          result = (arg1)->UnaryFunction1D<VecMat::Vec2<float > >::operator ()(*arg2);
+          result = (arg1)->UnaryFunction1D< VecMat::Vec2< float > >::operator ()(*arg2);
         } else {
           result = (arg1)->operator ()(*arg2);
         }
@@ -68319,7 +67152,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVec2f___call__(PyObject *SWIGUNUSEDPAR
   } catch (Swig::DirectorException&) {
     SWIG_fail;
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec2<float >(static_cast< const VecMat::Vec2<float >& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec2< float >(static_cast< const VecMat::Vec2< float >& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -68328,7 +67161,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVec2f_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<Geometry::Vec2f > *arg1 = (UnaryFunction1D<Geometry::Vec2f > *) 0 ;
+  UnaryFunction1D< Geometry::Vec2f > *arg1 = (UnaryFunction1D< Geometry::Vec2f > *) 0 ;
   IntegrationType arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -68338,11 +67171,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVec2f_setIntegrationType(PyObject *SWI
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DVec2f_setIntegrationType",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec2T_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec2f_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec2f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec2f_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D< Geometry::Vec2f > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec2f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< Geometry::Vec2f > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "UnaryFunction1DVec2f_setIntegrationType" "', argument " "2"" of type '" "IntegrationType""'");
@@ -68368,21 +67201,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVec2f_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<Geometry::Vec2f > *arg1 = (UnaryFunction1D<Geometry::Vec2f > *) 0 ;
+  UnaryFunction1D< Geometry::Vec2f > *arg1 = (UnaryFunction1D< Geometry::Vec2f > *) 0 ;
   IntegrationType result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DVec2f_getIntegrationType",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec2T_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec2f_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec2f > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec2f_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D< Geometry::Vec2f > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec2f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< Geometry::Vec2f > * >(argp1);
   {
     try {
-      result = (IntegrationType)((UnaryFunction1D<Geometry::Vec2f > const *)arg1)->getIntegrationType();
+      result = (IntegrationType)((UnaryFunction1D< Geometry::Vec2f > const *)arg1)->getIntegrationType();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -68400,17 +67233,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_disown_UnaryFunction1DVec2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<Geometry::Vec2f > *arg1 = (UnaryFunction1D<Geometry::Vec2f > *) 0 ;
+  UnaryFunction1D< Geometry::Vec2f > *arg1 = (UnaryFunction1D< Geometry::Vec2f > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction1DVec2f",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec2T_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction1DVec2f" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec2f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction1DVec2f" "', argument " "1"" of type '" "UnaryFunction1D< Geometry::Vec2f > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec2f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< Geometry::Vec2f > * >(argp1);
   {
     Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
@@ -68425,15 +67258,15 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction1DVec2f_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec2T_float_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec3f__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
-  UnaryFunction1D<Geometry::Vec3f > *result = 0 ;
+  UnaryFunction1D< Geometry::Vec3f > *result = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_UnaryFunction1DVec3f",&obj0)) SWIG_fail;
@@ -68442,9 +67275,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec3f__SWIG_0(PyObject *SWIGUNUSED
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction1D<Geometry::Vec3f > *)new SwigDirector_UnaryFunction1DVec3f(arg1); 
+        result = (UnaryFunction1D< Geometry::Vec3f > *)new SwigDirector_UnaryFunction1DVec3f(arg1); 
       } else {
-        result = (UnaryFunction1D<Geometry::Vec3f > *)new UnaryFunction1D<Geometry::Vec3f >(); 
+        result = (UnaryFunction1D< Geometry::Vec3f > *)new UnaryFunction1D< Geometry::Vec3f >(); 
       }
       
     }
@@ -68455,7 +67288,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec3f__SWIG_0(PyObject *SWIGUNUSED
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec3T_float_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -68466,7 +67299,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec3f__SWIG_1(PyObject *SWIGUNUSED
   PyObject *resultobj = 0;
   PyObject *arg1 = (PyObject *) 0 ;
   IntegrationType arg2 ;
-  UnaryFunction1D<Geometry::Vec3f > *result = 0 ;
+  UnaryFunction1D< Geometry::Vec3f > *result = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
@@ -68483,9 +67316,9 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec3f__SWIG_1(PyObject *SWIGUNUSED
     try {
       if ( arg1 != Py_None ) {
         /* subclassed */
-        result = (UnaryFunction1D<Geometry::Vec3f > *)new SwigDirector_UnaryFunction1DVec3f(arg1,arg2); 
+        result = (UnaryFunction1D< Geometry::Vec3f > *)new SwigDirector_UnaryFunction1DVec3f(arg1,arg2); 
       } else {
-        result = (UnaryFunction1D<Geometry::Vec3f > *)new UnaryFunction1D<Geometry::Vec3f >(arg2); 
+        result = (UnaryFunction1D< Geometry::Vec3f > *)new UnaryFunction1D< Geometry::Vec3f >(arg2); 
       }
       
     }
@@ -68496,7 +67329,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec3f__SWIG_1(PyObject *SWIGUNUSED
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec3T_float_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -68509,7 +67342,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec3f(PyObject *self, PyObject *ar
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -68535,24 +67368,27 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVec3f(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DVec3f'.\n  Possible C/C++ prototypes are:\n    UnaryFunction1D<(Geometry::Vec3f)>(PyObject *)\n    UnaryFunction1D<(Geometry::Vec3f)>(PyObject *,IntegrationType)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DVec3f'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    UnaryFunction1D< Geometry::Vec3f >(PyObject *)\n"
+    "    UnaryFunction1D< Geometry::Vec3f >(PyObject *,IntegrationType)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction1DVec3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<Geometry::Vec3f > *arg1 = (UnaryFunction1D<Geometry::Vec3f > *) 0 ;
+  UnaryFunction1D< Geometry::Vec3f > *arg1 = (UnaryFunction1D< Geometry::Vec3f > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction1DVec3f",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec3T_float_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DVec3f" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec3f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DVec3f" "', argument " "1"" of type '" "UnaryFunction1D< Geometry::Vec3f > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec3f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< Geometry::Vec3f > * >(argp1);
   {
     try {
       delete arg1;
@@ -68574,7 +67410,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVec3f_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<Geometry::Vec3f > *arg1 = (UnaryFunction1D<Geometry::Vec3f > *) 0 ;
+  UnaryFunction1D< Geometry::Vec3f > *arg1 = (UnaryFunction1D< Geometry::Vec3f > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -68583,20 +67419,20 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVec3f_getName(PyObject *SWIGUNUSEDPARM
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DVec3f_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec3T_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec3f_getName" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec3f > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec3f_getName" "', argument " "1"" of type '" "UnaryFunction1D< Geometry::Vec3f > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec3f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< Geometry::Vec3f > * >(argp1);
   director = SWIG_DIRECTOR_CAST(arg1);
   upcall = (director && (director->swig_get_self()==obj0));
   try {
     {
       try {
         if (upcall) {
-          result = ((UnaryFunction1D<Geometry::Vec3f > const *)arg1)->UnaryFunction1D<VecMat::Vec3<float > >::getName();
+          result = ((UnaryFunction1D< Geometry::Vec3f > const *)arg1)->UnaryFunction1D< VecMat::Vec3< float > >::getName();
         } else {
-          result = ((UnaryFunction1D<Geometry::Vec3f > const *)arg1)->getName();
+          result = ((UnaryFunction1D< Geometry::Vec3f > const *)arg1)->getName();
         }
       }
       //    catch (Swig::DirectorTypeMismatch&) {
@@ -68618,9 +67454,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVec3f___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<Geometry::Vec3f > *arg1 = (UnaryFunction1D<Geometry::Vec3f > *) 0 ;
+  UnaryFunction1D< Geometry::Vec3f > *arg1 = (UnaryFunction1D< Geometry::Vec3f > *) 0 ;
   Interface1D *arg2 = 0 ;
-  VecMat::Vec3<float > result;
+  VecMat::Vec3< float > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -68631,11 +67467,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVec3f___call__(PyObject *SWIGUNUSEDPAR
   bool upcall = false;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DVec3f___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec3T_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec3f___call__" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec3f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec3f___call__" "', argument " "1"" of type '" "UnaryFunction1D< Geometry::Vec3f > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec3f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< Geometry::Vec3f > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction1DVec3f___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
@@ -68650,7 +67486,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVec3f___call__(PyObject *SWIGUNUSEDPAR
     {
       try {
         if (upcall) {
-          result = (arg1)->UnaryFunction1D<VecMat::Vec3<float > >::operator ()(*arg2);
+          result = (arg1)->UnaryFunction1D< VecMat::Vec3< float > >::operator ()(*arg2);
         } else {
           result = (arg1)->operator ()(*arg2);
         }
@@ -68665,7 +67501,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVec3f___call__(PyObject *SWIGUNUSEDPAR
   } catch (Swig::DirectorException&) {
     SWIG_fail;
   }
-  resultobj = SWIG_NewPointerObj((new VecMat::Vec3<float >(static_cast< const VecMat::Vec3<float >& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new VecMat::Vec3< float >(static_cast< const VecMat::Vec3< float >& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -68674,7 +67510,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVec3f_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<Geometry::Vec3f > *arg1 = (UnaryFunction1D<Geometry::Vec3f > *) 0 ;
+  UnaryFunction1D< Geometry::Vec3f > *arg1 = (UnaryFunction1D< Geometry::Vec3f > *) 0 ;
   IntegrationType arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -68684,11 +67520,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVec3f_setIntegrationType(PyObject *SWI
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DVec3f_setIntegrationType",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec3T_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec3f_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec3f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec3f_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D< Geometry::Vec3f > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec3f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< Geometry::Vec3f > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "UnaryFunction1DVec3f_setIntegrationType" "', argument " "2"" of type '" "IntegrationType""'");
@@ -68714,21 +67550,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVec3f_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<Geometry::Vec3f > *arg1 = (UnaryFunction1D<Geometry::Vec3f > *) 0 ;
+  UnaryFunction1D< Geometry::Vec3f > *arg1 = (UnaryFunction1D< Geometry::Vec3f > *) 0 ;
   IntegrationType result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DVec3f_getIntegrationType",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec3T_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec3f_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec3f > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVec3f_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D< Geometry::Vec3f > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec3f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< Geometry::Vec3f > * >(argp1);
   {
     try {
-      result = (IntegrationType)((UnaryFunction1D<Geometry::Vec3f > const *)arg1)->getIntegrationType();
+      result = (IntegrationType)((UnaryFunction1D< Geometry::Vec3f > const *)arg1)->getIntegrationType();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -68746,17 +67582,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_disown_UnaryFunction1DVec3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<Geometry::Vec3f > *arg1 = (UnaryFunction1D<Geometry::Vec3f > *) 0 ;
+  UnaryFunction1D< Geometry::Vec3f > *arg1 = (UnaryFunction1D< Geometry::Vec3f > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:disown_UnaryFunction1DVec3f",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec3T_float_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction1DVec3f" "', argument " "1"" of type '" "UnaryFunction1D<Geometry::Vec3f > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "disown_UnaryFunction1DVec3f" "', argument " "1"" of type '" "UnaryFunction1D< Geometry::Vec3f > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<Geometry::Vec3f > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< Geometry::Vec3f > * >(argp1);
   {
     Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
     if (director) director->swig_disown();
@@ -68771,19 +67607,19 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction1DVec3f_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DT_VecMat__Vec3T_float_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVectorViewShape__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<std::vector<ViewShape * > > *result = 0 ;
+  UnaryFunction1D< std::vector< ViewShape * > > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_UnaryFunction1DVectorViewShape")) SWIG_fail;
   {
     try {
-      result = (UnaryFunction1D<std::vector<ViewShape * > > *)new UnaryFunction1D<std::vector<ViewShape * > >();
+      result = (UnaryFunction1D< std::vector< ViewShape * > > *)new UnaryFunction1D< std::vector< ViewShape * > >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -68792,7 +67628,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVectorViewShape__SWIG_0(PyObject *
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -68802,7 +67638,7 @@ fail:
 SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVectorViewShape__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   IntegrationType arg1 ;
-  UnaryFunction1D<std::vector<ViewShape * > > *result = 0 ;
+  UnaryFunction1D< std::vector< ViewShape * > > *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -68815,7 +67651,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVectorViewShape__SWIG_1(PyObject *
   arg1 = static_cast< IntegrationType >(val1);
   {
     try {
-      result = (UnaryFunction1D<std::vector<ViewShape * > > *)new UnaryFunction1D<std::vector<ViewShape * > >(arg1);
+      result = (UnaryFunction1D< std::vector< ViewShape * > > *)new UnaryFunction1D< std::vector< ViewShape * > >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -68824,7 +67660,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVectorViewShape__SWIG_1(PyObject *
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -68837,7 +67673,7 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVectorViewShape(PyObject *self, Py
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -68856,24 +67692,27 @@ SWIGINTERN PyObject *_wrap_new_UnaryFunction1DVectorViewShape(PyObject *self, Py
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DVectorViewShape'.\n  Possible C/C++ prototypes are:\n    UnaryFunction1D<(std::vector<(p.ViewShape)>)>()\n    UnaryFunction1D<(std::vector<(p.ViewShape)>)>(IntegrationType)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_UnaryFunction1DVectorViewShape'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    UnaryFunction1D< std::vector< ViewShape * > >()\n"
+    "    UnaryFunction1D< std::vector< ViewShape * > >(IntegrationType)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_delete_UnaryFunction1DVectorViewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<std::vector<ViewShape * > > *arg1 = (UnaryFunction1D<std::vector<ViewShape * > > *) 0 ;
+  UnaryFunction1D< std::vector< ViewShape * > > *arg1 = (UnaryFunction1D< std::vector< ViewShape * > > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_UnaryFunction1DVectorViewShape",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DVectorViewShape" "', argument " "1"" of type '" "UnaryFunction1D<std::vector<ViewShape * > > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UnaryFunction1DVectorViewShape" "', argument " "1"" of type '" "UnaryFunction1D< std::vector< ViewShape * > > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<std::vector<ViewShape * > > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< std::vector< ViewShape * > > * >(argp1);
   {
     try {
       delete arg1;
@@ -68895,21 +67734,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVectorViewShape_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<std::vector<ViewShape * > > *arg1 = (UnaryFunction1D<std::vector<ViewShape * > > *) 0 ;
+  UnaryFunction1D< std::vector< ViewShape * > > *arg1 = (UnaryFunction1D< std::vector< ViewShape * > > *) 0 ;
   std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DVectorViewShape_getName",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVectorViewShape_getName" "', argument " "1"" of type '" "UnaryFunction1D<std::vector<ViewShape * > > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVectorViewShape_getName" "', argument " "1"" of type '" "UnaryFunction1D< std::vector< ViewShape * > > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<std::vector<ViewShape * > > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< std::vector< ViewShape * > > * >(argp1);
   {
     try {
-      result = ((UnaryFunction1D<std::vector<ViewShape * > > const *)arg1)->getName();
+      result = ((UnaryFunction1D< std::vector< ViewShape * > > const *)arg1)->getName();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -68927,9 +67766,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVectorViewShape___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<std::vector<ViewShape * > > *arg1 = (UnaryFunction1D<std::vector<ViewShape * > > *) 0 ;
+  UnaryFunction1D< std::vector< ViewShape * > > *arg1 = (UnaryFunction1D< std::vector< ViewShape * > > *) 0 ;
   Interface1D *arg2 = 0 ;
-  std::vector<ViewShape *,std::allocator<ViewShape * > > result;
+  std::vector< ViewShape *,std::allocator< ViewShape * > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -68938,11 +67777,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVectorViewShape___call__(PyObject *SWI
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DVectorViewShape___call__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVectorViewShape___call__" "', argument " "1"" of type '" "UnaryFunction1D<std::vector<ViewShape * > > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVectorViewShape___call__" "', argument " "1"" of type '" "UnaryFunction1D< std::vector< ViewShape * > > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<std::vector<ViewShape * > > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< std::vector< ViewShape * > > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_Interface1D,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UnaryFunction1DVectorViewShape___call__" "', argument " "2"" of type '" "Interface1D &""'"); 
@@ -68962,7 +67801,7 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVectorViewShape___call__(PyObject *SWI
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = swig::from(static_cast< std::vector<ViewShape*,std::allocator<ViewShape * > > >(result));
+  resultobj = swig::from(static_cast< std::vector<ViewShape*,std::allocator< ViewShape * > > >(result));
   return resultobj;
 fail:
   return NULL;
@@ -68971,7 +67810,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVectorViewShape_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<std::vector<ViewShape * > > *arg1 = (UnaryFunction1D<std::vector<ViewShape * > > *) 0 ;
+  UnaryFunction1D< std::vector< ViewShape * > > *arg1 = (UnaryFunction1D< std::vector< ViewShape * > > *) 0 ;
   IntegrationType arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -68981,11 +67820,11 @@ SWIGINTERN PyObject *_wrap_UnaryFunction1DVectorViewShape_setIntegrationType(PyO
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:UnaryFunction1DVectorViewShape_setIntegrationType",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVectorViewShape_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<std::vector<ViewShape * > > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVectorViewShape_setIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D< std::vector< ViewShape * > > *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<std::vector<ViewShape * > > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< std::vector< ViewShape * > > * >(argp1);
   ecode2 = SWIG_AsVal_int(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "UnaryFunction1DVectorViewShape_setIntegrationType" "', argument " "2"" of type '" "IntegrationType""'");
@@ -69011,21 +67850,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_UnaryFunction1DVectorViewShape_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction1D<std::vector<ViewShape * > > *arg1 = (UnaryFunction1D<std::vector<ViewShape * > > *) 0 ;
+  UnaryFunction1D< std::vector< ViewShape * > > *arg1 = (UnaryFunction1D< std::vector< ViewShape * > > *) 0 ;
   IntegrationType result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:UnaryFunction1DVectorViewShape_getIntegrationType",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVectorViewShape_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D<std::vector<ViewShape * > > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UnaryFunction1DVectorViewShape_getIntegrationType" "', argument " "1"" of type '" "UnaryFunction1D< std::vector< ViewShape * > > const *""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction1D<std::vector<ViewShape * > > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction1D< std::vector< ViewShape * > > * >(argp1);
   {
     try {
-      result = (IntegrationType)((UnaryFunction1D<std::vector<ViewShape * > > const *)arg1)->getIntegrationType();
+      result = (IntegrationType)((UnaryFunction1D< std::vector< ViewShape * > > const *)arg1)->getIntegrationType();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -69043,8 +67882,8 @@ fail:
 
 SWIGINTERN PyObject *UnaryFunction1DVectorViewShape_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
@@ -69190,7 +68029,7 @@ fail:
 
 SWIGINTERN PyObject *GetXF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetXF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -69256,7 +68095,7 @@ SWIGINTERN PyObject *_wrap_new_GetYF1D(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -69275,7 +68114,10 @@ SWIGINTERN PyObject *_wrap_new_GetYF1D(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetYF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::GetYF1D(IntegrationType)\n    Functions1D::GetYF1D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetYF1D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Functions1D::GetYF1D(IntegrationType)\n"
+    "    Functions1D::GetYF1D()\n");
   return NULL;
 }
 
@@ -69390,7 +68232,7 @@ fail:
 
 SWIGINTERN PyObject *GetYF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetYF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -69456,7 +68298,7 @@ SWIGINTERN PyObject *_wrap_new_GetZF1D(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -69475,7 +68317,10 @@ SWIGINTERN PyObject *_wrap_new_GetZF1D(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetZF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::GetZF1D(IntegrationType)\n    Functions1D::GetZF1D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetZF1D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Functions1D::GetZF1D(IntegrationType)\n"
+    "    Functions1D::GetZF1D()\n");
   return NULL;
 }
 
@@ -69590,7 +68435,7 @@ fail:
 
 SWIGINTERN PyObject *GetZF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetZF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -69656,7 +68501,7 @@ SWIGINTERN PyObject *_wrap_new_GetProjectedXF1D(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -69675,7 +68520,10 @@ SWIGINTERN PyObject *_wrap_new_GetProjectedXF1D(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetProjectedXF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::GetProjectedXF1D(IntegrationType)\n    Functions1D::GetProjectedXF1D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetProjectedXF1D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Functions1D::GetProjectedXF1D(IntegrationType)\n"
+    "    Functions1D::GetProjectedXF1D()\n");
   return NULL;
 }
 
@@ -69790,7 +68638,7 @@ fail:
 
 SWIGINTERN PyObject *GetProjectedXF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetProjectedXF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -69856,7 +68704,7 @@ SWIGINTERN PyObject *_wrap_new_GetProjectedYF1D(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -69875,7 +68723,10 @@ SWIGINTERN PyObject *_wrap_new_GetProjectedYF1D(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetProjectedYF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::GetProjectedYF1D(IntegrationType)\n    Functions1D::GetProjectedYF1D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetProjectedYF1D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Functions1D::GetProjectedYF1D(IntegrationType)\n"
+    "    Functions1D::GetProjectedYF1D()\n");
   return NULL;
 }
 
@@ -69990,7 +68841,7 @@ fail:
 
 SWIGINTERN PyObject *GetProjectedYF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetProjectedYF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -70056,7 +68907,7 @@ SWIGINTERN PyObject *_wrap_new_GetProjectedZF1D(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -70075,7 +68926,10 @@ SWIGINTERN PyObject *_wrap_new_GetProjectedZF1D(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetProjectedZF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::GetProjectedZF1D(IntegrationType)\n    Functions1D::GetProjectedZF1D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetProjectedZF1D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Functions1D::GetProjectedZF1D(IntegrationType)\n"
+    "    Functions1D::GetProjectedZF1D()\n");
   return NULL;
 }
 
@@ -70190,7 +69044,7 @@ fail:
 
 SWIGINTERN PyObject *GetProjectedZF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetProjectedZF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -70256,7 +69110,7 @@ SWIGINTERN PyObject *_wrap_new_Orientation2DF1D(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -70275,7 +69129,10 @@ SWIGINTERN PyObject *_wrap_new_Orientation2DF1D(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Orientation2DF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::Orientation2DF1D(IntegrationType)\n    Functions1D::Orientation2DF1D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Orientation2DF1D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Functions1D::Orientation2DF1D(IntegrationType)\n"
+    "    Functions1D::Orientation2DF1D()\n");
   return NULL;
 }
 
@@ -70349,7 +69206,7 @@ SWIGINTERN PyObject *_wrap_Orientation2DF1D___call__(PyObject *SWIGUNUSEDPARM(se
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -70390,7 +69247,7 @@ fail:
 
 SWIGINTERN PyObject *Orientation2DF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__Orientation2DF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -70456,7 +69313,7 @@ SWIGINTERN PyObject *_wrap_new_Orientation3DF1D(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -70475,7 +69332,10 @@ SWIGINTERN PyObject *_wrap_new_Orientation3DF1D(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Orientation3DF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::Orientation3DF1D(IntegrationType)\n    Functions1D::Orientation3DF1D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Orientation3DF1D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Functions1D::Orientation3DF1D(IntegrationType)\n"
+    "    Functions1D::Orientation3DF1D()\n");
   return NULL;
 }
 
@@ -70549,7 +69409,7 @@ SWIGINTERN PyObject *_wrap_Orientation3DF1D___call__(PyObject *SWIGUNUSEDPARM(se
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -70590,7 +69450,7 @@ fail:
 
 SWIGINTERN PyObject *Orientation3DF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__Orientation3DF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -70656,7 +69516,7 @@ SWIGINTERN PyObject *_wrap_new_ZDiscontinuityF1D(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -70675,7 +69535,10 @@ SWIGINTERN PyObject *_wrap_new_ZDiscontinuityF1D(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ZDiscontinuityF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::ZDiscontinuityF1D(IntegrationType)\n    Functions1D::ZDiscontinuityF1D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ZDiscontinuityF1D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Functions1D::ZDiscontinuityF1D(IntegrationType)\n"
+    "    Functions1D::ZDiscontinuityF1D()\n");
   return NULL;
 }
 
@@ -70790,7 +69653,7 @@ fail:
 
 SWIGINTERN PyObject *ZDiscontinuityF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__ZDiscontinuityF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -70856,7 +69719,7 @@ SWIGINTERN PyObject *_wrap_new_QuantitativeInvisibilityF1D(PyObject *self, PyObj
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -70875,7 +69738,10 @@ SWIGINTERN PyObject *_wrap_new_QuantitativeInvisibilityF1D(PyObject *self, PyObj
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_QuantitativeInvisibilityF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::QuantitativeInvisibilityF1D(IntegrationType)\n    Functions1D::QuantitativeInvisibilityF1D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_QuantitativeInvisibilityF1D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Functions1D::QuantitativeInvisibilityF1D(IntegrationType)\n"
+    "    Functions1D::QuantitativeInvisibilityF1D()\n");
   return NULL;
 }
 
@@ -70990,7 +69856,7 @@ fail:
 
 SWIGINTERN PyObject *QuantitativeInvisibilityF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__QuantitativeInvisibilityF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -71056,7 +69922,7 @@ SWIGINTERN PyObject *_wrap_new_CurveNatureF1D(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -71075,7 +69941,10 @@ SWIGINTERN PyObject *_wrap_new_CurveNatureF1D(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CurveNatureF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::CurveNatureF1D(IntegrationType)\n    Functions1D::CurveNatureF1D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CurveNatureF1D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Functions1D::CurveNatureF1D(IntegrationType)\n"
+    "    Functions1D::CurveNatureF1D()\n");
   return NULL;
 }
 
@@ -71190,7 +70059,7 @@ fail:
 
 SWIGINTERN PyObject *CurveNatureF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__CurveNatureF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -71327,7 +70196,7 @@ fail:
 
 SWIGINTERN PyObject *TimeStampF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__TimeStampF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -71464,7 +70333,7 @@ fail:
 
 SWIGINTERN PyObject *IncrementChainingTimeStampF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__IncrementChainingTimeStampF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -71601,7 +70470,7 @@ fail:
 
 SWIGINTERN PyObject *ChainingTimeStampF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__ChainingTimeStampF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -71667,7 +70536,7 @@ SWIGINTERN PyObject *_wrap_new_Curvature2DAngleF1D(PyObject *self, PyObject *arg
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -71686,7 +70555,10 @@ SWIGINTERN PyObject *_wrap_new_Curvature2DAngleF1D(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Curvature2DAngleF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::Curvature2DAngleF1D(IntegrationType)\n    Functions1D::Curvature2DAngleF1D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Curvature2DAngleF1D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Functions1D::Curvature2DAngleF1D(IntegrationType)\n"
+    "    Functions1D::Curvature2DAngleF1D()\n");
   return NULL;
 }
 
@@ -71801,7 +70673,7 @@ fail:
 
 SWIGINTERN PyObject *Curvature2DAngleF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__Curvature2DAngleF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -71867,7 +70739,7 @@ SWIGINTERN PyObject *_wrap_new_Normal2DF1D(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -71886,7 +70758,10 @@ SWIGINTERN PyObject *_wrap_new_Normal2DF1D(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Normal2DF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::Normal2DF1D(IntegrationType)\n    Functions1D::Normal2DF1D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Normal2DF1D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Functions1D::Normal2DF1D(IntegrationType)\n"
+    "    Functions1D::Normal2DF1D()\n");
   return NULL;
 }
 
@@ -71960,7 +70835,7 @@ SWIGINTERN PyObject *_wrap_Normal2DF1D___call__(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -72001,7 +70876,7 @@ fail:
 
 SWIGINTERN PyObject *Normal2DF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__Normal2DF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -72065,7 +70940,7 @@ SWIGINTERN PyObject *_wrap_GetShapeF1D___call__(PyObject *SWIGUNUSEDPARM(self),
   PyObject *resultobj = 0;
   Functions1D::GetShapeF1D *arg1 = (Functions1D::GetShapeF1D *) 0 ;
   Interface1D *arg2 = 0 ;
-  std::vector<ViewShape *,std::allocator<ViewShape * > > result;
+  std::vector< ViewShape *,std::allocator< ViewShape * > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -72098,7 +70973,7 @@ SWIGINTERN PyObject *_wrap_GetShapeF1D___call__(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = swig::from(static_cast< std::vector<ViewShape*,std::allocator<ViewShape * > > >(result));
+  resultobj = swig::from(static_cast< std::vector<ViewShape*,std::allocator< ViewShape * > > >(result));
   return resultobj;
 fail:
   return NULL;
@@ -72139,7 +71014,7 @@ fail:
 
 SWIGINTERN PyObject *GetShapeF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetShapeF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -72203,7 +71078,7 @@ SWIGINTERN PyObject *_wrap_GetOccludersF1D___call__(PyObject *SWIGUNUSEDPARM(sel
   PyObject *resultobj = 0;
   Functions1D::GetOccludersF1D *arg1 = (Functions1D::GetOccludersF1D *) 0 ;
   Interface1D *arg2 = 0 ;
-  std::vector<ViewShape *,std::allocator<ViewShape * > > result;
+  std::vector< ViewShape *,std::allocator< ViewShape * > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -72236,7 +71111,7 @@ SWIGINTERN PyObject *_wrap_GetOccludersF1D___call__(PyObject *SWIGUNUSEDPARM(sel
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = swig::from(static_cast< std::vector<ViewShape*,std::allocator<ViewShape * > > >(result));
+  resultobj = swig::from(static_cast< std::vector<ViewShape*,std::allocator< ViewShape * > > >(result));
   return resultobj;
 fail:
   return NULL;
@@ -72277,7 +71152,7 @@ fail:
 
 SWIGINTERN PyObject *GetOccludersF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetOccludersF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -72341,7 +71216,7 @@ SWIGINTERN PyObject *_wrap_GetOccludeeF1D___call__(PyObject *SWIGUNUSEDPARM(self
   PyObject *resultobj = 0;
   Functions1D::GetOccludeeF1D *arg1 = (Functions1D::GetOccludeeF1D *) 0 ;
   Interface1D *arg2 = 0 ;
-  std::vector<ViewShape *,std::allocator<ViewShape * > > result;
+  std::vector< ViewShape *,std::allocator< ViewShape * > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -72374,7 +71249,7 @@ SWIGINTERN PyObject *_wrap_GetOccludeeF1D___call__(PyObject *SWIGUNUSEDPARM(self
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = swig::from(static_cast< std::vector<ViewShape*,std::allocator<ViewShape * > > >(result));
+  resultobj = swig::from(static_cast< std::vector<ViewShape*,std::allocator< ViewShape * > > >(result));
   return resultobj;
 fail:
   return NULL;
@@ -72415,7 +71290,7 @@ fail:
 
 SWIGINTERN PyObject *GetOccludeeF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetOccludeeF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -72479,7 +71354,7 @@ SWIGINTERN PyObject *_wrap_Module_setAlwaysRefresh(PyObject *self, PyObject *arg
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -72498,7 +71373,10 @@ SWIGINTERN PyObject *_wrap_Module_setAlwaysRefresh(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Module_setAlwaysRefresh'.\n  Possible C/C++ prototypes are:\n    setAlwaysRefresh(bool)\n    Module::setAlwaysRefresh()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Module_setAlwaysRefresh'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    setAlwaysRefresh(bool)\n"
+    "    Module::setAlwaysRefresh()\n");
   return NULL;
 }
 
@@ -72562,7 +71440,7 @@ SWIGINTERN PyObject *_wrap_Module_setCausal(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -72581,7 +71459,10 @@ SWIGINTERN PyObject *_wrap_Module_setCausal(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Module_setCausal'.\n  Possible C/C++ prototypes are:\n    setCausal(bool)\n    Module::setCausal()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Module_setCausal'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    setCausal(bool)\n"
+    "    Module::setCausal()\n");
   return NULL;
 }
 
@@ -72645,7 +71526,7 @@ SWIGINTERN PyObject *_wrap_Module_setDrawable(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -72664,7 +71545,10 @@ SWIGINTERN PyObject *_wrap_Module_setDrawable(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Module_setDrawable'.\n  Possible C/C++ prototypes are:\n    setDrawable(bool)\n    Module::setDrawable()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Module_setDrawable'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    setDrawable(bool)\n"
+    "    Module::setDrawable()\n");
   return NULL;
 }
 
@@ -72795,7 +71679,7 @@ fail:
 
 SWIGINTERN PyObject *Module_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Module, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -72861,7 +71745,7 @@ SWIGINTERN PyObject *_wrap_new_DensityF0D(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -72880,7 +71764,10 @@ SWIGINTERN PyObject *_wrap_new_DensityF0D(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_DensityF0D'.\n  Possible C/C++ prototypes are:\n    Functions0D::DensityF0D(double)\n    Functions0D::DensityF0D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_DensityF0D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Functions0D::DensityF0D(double)\n"
+    "    Functions0D::DensityF0D()\n");
   return NULL;
 }
 
@@ -72995,7 +71882,7 @@ fail:
 
 SWIGINTERN PyObject *DensityF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__DensityF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -73061,7 +71948,7 @@ SWIGINTERN PyObject *_wrap_new_LocalAverageDepthF0D(PyObject *self, PyObject *ar
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -73080,7 +71967,10 @@ SWIGINTERN PyObject *_wrap_new_LocalAverageDepthF0D(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_LocalAverageDepthF0D'.\n  Possible C/C++ prototypes are:\n    Functions0D::LocalAverageDepthF0D(real)\n    Functions0D::LocalAverageDepthF0D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_LocalAverageDepthF0D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Functions0D::LocalAverageDepthF0D(real)\n"
+    "    Functions0D::LocalAverageDepthF0D()\n");
   return NULL;
 }
 
@@ -73195,7 +72085,7 @@ fail:
 
 SWIGINTERN PyObject *LocalAverageDepthF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__LocalAverageDepthF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -73354,7 +72244,7 @@ fail:
 
 SWIGINTERN PyObject *ReadMapPixelF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__ReadMapPixelF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -73510,7 +72400,7 @@ fail:
 
 SWIGINTERN PyObject *ReadSteerableViewMapPixelF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__ReadSteerableViewMapPixelF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -73657,7 +72547,7 @@ fail:
 
 SWIGINTERN PyObject *ReadCompleteViewMapPixelF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__ReadCompleteViewMapPixelF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -73804,7 +72694,7 @@ fail:
 
 SWIGINTERN PyObject *GetViewMapGradientNormF0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions0D__GetViewMapGradientNormF0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -73961,7 +72851,7 @@ SWIGINTERN PyObject *_wrap_new_DensityF1D(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -74018,7 +72908,12 @@ SWIGINTERN PyObject *_wrap_new_DensityF1D(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_DensityF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::DensityF1D(double,IntegrationType,float)\n    Functions1D::DensityF1D(double,IntegrationType)\n    Functions1D::DensityF1D(double)\n    Functions1D::DensityF1D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_DensityF1D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Functions1D::DensityF1D(double,IntegrationType,float)\n"
+    "    Functions1D::DensityF1D(double,IntegrationType)\n"
+    "    Functions1D::DensityF1D(double)\n"
+    "    Functions1D::DensityF1D()\n");
   return NULL;
 }
 
@@ -74133,7 +73028,7 @@ fail:
 
 SWIGINTERN PyObject *DensityF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__DensityF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -74217,7 +73112,7 @@ SWIGINTERN PyObject *_wrap_new_LocalAverageDepthF1D(PyObject *self, PyObject *ar
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -74249,7 +73144,10 @@ SWIGINTERN PyObject *_wrap_new_LocalAverageDepthF1D(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_LocalAverageDepthF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::LocalAverageDepthF1D(real,IntegrationType)\n    Functions1D::LocalAverageDepthF1D(real)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_LocalAverageDepthF1D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Functions1D::LocalAverageDepthF1D(real,IntegrationType)\n"
+    "    Functions1D::LocalAverageDepthF1D(real)\n");
   return NULL;
 }
 
@@ -74364,7 +73262,7 @@ fail:
 
 SWIGINTERN PyObject *LocalAverageDepthF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__LocalAverageDepthF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -74498,7 +73396,7 @@ SWIGINTERN PyObject *_wrap_new_GetCompleteViewMapDensityF1D(PyObject *self, PyOb
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -74552,7 +73450,11 @@ SWIGINTERN PyObject *_wrap_new_GetCompleteViewMapDensityF1D(PyObject *self, PyOb
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetCompleteViewMapDensityF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::GetCompleteViewMapDensityF1D(unsigned int,IntegrationType,float)\n    Functions1D::GetCompleteViewMapDensityF1D(unsigned int,IntegrationType)\n    Functions1D::GetCompleteViewMapDensityF1D(unsigned int)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetCompleteViewMapDensityF1D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Functions1D::GetCompleteViewMapDensityF1D(unsigned int,IntegrationType,float)\n"
+    "    Functions1D::GetCompleteViewMapDensityF1D(unsigned int,IntegrationType)\n"
+    "    Functions1D::GetCompleteViewMapDensityF1D(unsigned int)\n");
   return NULL;
 }
 
@@ -74667,7 +73569,7 @@ fail:
 
 SWIGINTERN PyObject *GetCompleteViewMapDensityF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetCompleteViewMapDensityF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -74828,7 +73730,7 @@ SWIGINTERN PyObject *_wrap_new_GetDirectionalViewMapDensityF1D(PyObject *self, P
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -74900,7 +73802,11 @@ SWIGINTERN PyObject *_wrap_new_GetDirectionalViewMapDensityF1D(PyObject *self, P
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetDirectionalViewMapDensityF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::GetDirectionalViewMapDensityF1D(unsigned int,unsigned int,IntegrationType,float)\n    Functions1D::GetDirectionalViewMapDensityF1D(unsigned int,unsigned int,IntegrationType)\n    Functions1D::GetDirectionalViewMapDensityF1D(unsigned int,unsigned int)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetDirectionalViewMapDensityF1D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Functions1D::GetDirectionalViewMapDensityF1D(unsigned int,unsigned int,IntegrationType,float)\n"
+    "    Functions1D::GetDirectionalViewMapDensityF1D(unsigned int,unsigned int,IntegrationType)\n"
+    "    Functions1D::GetDirectionalViewMapDensityF1D(unsigned int,unsigned int)\n");
   return NULL;
 }
 
@@ -75015,7 +73921,7 @@ fail:
 
 SWIGINTERN PyObject *GetDirectionalViewMapDensityF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetDirectionalViewMapDensityF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -75149,7 +74055,7 @@ SWIGINTERN PyObject *_wrap_new_GetSteerableViewMapDensityF1D(PyObject *self, PyO
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -75203,7 +74109,11 @@ SWIGINTERN PyObject *_wrap_new_GetSteerableViewMapDensityF1D(PyObject *self, PyO
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetSteerableViewMapDensityF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::GetSteerableViewMapDensityF1D(int,IntegrationType,float)\n    Functions1D::GetSteerableViewMapDensityF1D(int,IntegrationType)\n    Functions1D::GetSteerableViewMapDensityF1D(int)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetSteerableViewMapDensityF1D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Functions1D::GetSteerableViewMapDensityF1D(int,IntegrationType,float)\n"
+    "    Functions1D::GetSteerableViewMapDensityF1D(int,IntegrationType)\n"
+    "    Functions1D::GetSteerableViewMapDensityF1D(int)\n");
   return NULL;
 }
 
@@ -75318,7 +74228,7 @@ fail:
 
 SWIGINTERN PyObject *GetSteerableViewMapDensityF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetSteerableViewMapDensityF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -75452,7 +74362,7 @@ SWIGINTERN PyObject *_wrap_new_GetViewMapGradientNormF1D(PyObject *self, PyObjec
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -75506,7 +74416,11 @@ SWIGINTERN PyObject *_wrap_new_GetViewMapGradientNormF1D(PyObject *self, PyObjec
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetViewMapGradientNormF1D'.\n  Possible C/C++ prototypes are:\n    Functions1D::GetViewMapGradientNormF1D(int,IntegrationType,float)\n    Functions1D::GetViewMapGradientNormF1D(int,IntegrationType)\n    Functions1D::GetViewMapGradientNormF1D(int)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_GetViewMapGradientNormF1D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Functions1D::GetViewMapGradientNormF1D(int,IntegrationType,float)\n"
+    "    Functions1D::GetViewMapGradientNormF1D(int,IntegrationType)\n"
+    "    Functions1D::GetViewMapGradientNormF1D(int)\n");
   return NULL;
 }
 
@@ -75621,7 +74535,7 @@ fail:
 
 SWIGINTERN PyObject *GetViewMapGradientNormF1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Functions1D__GetViewMapGradientNormF1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -75866,7 +74780,7 @@ SWIGINTERN PyObject *_wrap_LoadMapCF(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -75926,7 +74840,11 @@ SWIGINTERN PyObject *_wrap_LoadMapCF(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'LoadMapCF'.\n  Possible C/C++ prototypes are:\n    ContextFunctions::LoadMapCF(char const *,char const *,unsigned int,float)\n    ContextFunctions::LoadMapCF(char const *,char const *,unsigned int)\n    ContextFunctions::LoadMapCF(char const *,char const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'LoadMapCF'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    ContextFunctions::LoadMapCF(char const *,char const *,unsigned int,float)\n"
+    "    ContextFunctions::LoadMapCF(char const *,char const *,unsigned int)\n"
+    "    ContextFunctions::LoadMapCF(char const *,char const *)\n");
   return NULL;
 }
 
@@ -76312,7 +75230,7 @@ SWIGINTERN PyObject *_wrap_new_AdjacencyIterator(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -76374,7 +75292,13 @@ SWIGINTERN PyObject *_wrap_new_AdjacencyIterator(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_AdjacencyIterator'.\n  Possible C/C++ prototypes are:\n    AdjacencyIterator()\n    AdjacencyIterator(ViewVertex *,bool,bool)\n    AdjacencyIterator(ViewVertex *,bool)\n    AdjacencyIterator(ViewVertex *)\n    AdjacencyIterator(AdjacencyIterator const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_AdjacencyIterator'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    AdjacencyIterator()\n"
+    "    AdjacencyIterator(ViewVertex *,bool,bool)\n"
+    "    AdjacencyIterator(ViewVertex *,bool)\n"
+    "    AdjacencyIterator(ViewVertex *)\n"
+    "    AdjacencyIterator(AdjacencyIterator const &)\n");
   return NULL;
 }
 
@@ -76979,7 +75903,7 @@ SWIGINTERN PyObject *_wrap_AdjacencyIterator_aShape(PyObject *self, PyObject *ar
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -77003,7 +75927,10 @@ SWIGINTERN PyObject *_wrap_AdjacencyIterator_aShape(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'AdjacencyIterator_aShape'.\n  Possible C/C++ prototypes are:\n    aShape()\n    aShape()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'AdjacencyIterator_aShape'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    aShape(AdjacencyIterator *)\n"
+    "    aShape(AdjacencyIterator const *)\n");
   return NULL;
 }
 
@@ -77107,7 +76034,7 @@ fail:
 SWIGINTERN PyObject *_wrap_AdjacencyIterator_occluders(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
-  std::vector<ViewShape * > *result = 0 ;
+  std::vector< ViewShape * > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -77121,8 +76048,8 @@ SWIGINTERN PyObject *_wrap_AdjacencyIterator_occluders(PyObject *SWIGUNUSEDPARM(
   {
     try {
       {
-        std::vector<ViewShape * > &_result_ref = (*arg1)->occluders();
-        result = (std::vector<ViewShape * > *) &_result_ref;
+        std::vector< ViewShape * > &_result_ref = (*arg1)->occluders();
+        result = (std::vector< ViewShape * > *) &_result_ref;
       }
     }
     //    catch (Swig::DirectorTypeMismatch&) {
@@ -77132,7 +76059,7 @@ SWIGINTERN PyObject *_wrap_AdjacencyIterator_occluders(PyObject *SWIGUNUSEDPARM(
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -77707,7 +76634,7 @@ SWIGINTERN PyObject *_wrap_AdjacencyIterator_intersect_2d_area(PyObject *SWIGUNU
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_intersect_2d_area" "', argument " "1"" of type '" "AdjacencyIterator const *""'"); 
   }
   arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AdjacencyIterator_intersect_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
   }
@@ -77715,7 +76642,7 @@ SWIGINTERN PyObject *_wrap_AdjacencyIterator_intersect_2d_area(PyObject *SWIGUNU
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AdjacencyIterator_intersect_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
   }
   arg2 = reinterpret_cast< Geometry::Vec2r * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "AdjacencyIterator_intersect_2d_area" "', argument " "3"" of type '" "Geometry::Vec2r const &""'"); 
   }
@@ -77763,7 +76690,7 @@ SWIGINTERN PyObject *_wrap_AdjacencyIterator_include_in_2d_area(PyObject *SWIGUN
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_include_in_2d_area" "', argument " "1"" of type '" "AdjacencyIterator const *""'"); 
   }
   arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AdjacencyIterator_include_in_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
   }
@@ -77771,7 +76698,7 @@ SWIGINTERN PyObject *_wrap_AdjacencyIterator_include_in_2d_area(PyObject *SWIGUN
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AdjacencyIterator_include_in_2d_area" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
   }
   arg2 = reinterpret_cast< Geometry::Vec2r * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "AdjacencyIterator_include_in_2d_area" "', argument " "3"" of type '" "Geometry::Vec2r const &""'"); 
   }
@@ -78327,7 +77254,7 @@ SWIGINTERN PyObject *_wrap_AdjacencyIterator_pointsBegin(PyObject *self, PyObjec
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -78357,7 +77284,10 @@ SWIGINTERN PyObject *_wrap_AdjacencyIterator_pointsBegin(PyObject *self, PyObjec
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'AdjacencyIterator_pointsBegin'.\n  Possible C/C++ prototypes are:\n    pointsBegin(float)\n    pointsBegin()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'AdjacencyIterator_pointsBegin'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    pointsBegin(AdjacencyIterator *,float)\n"
+    "    pointsBegin(AdjacencyIterator *)\n");
   return NULL;
 }
 
@@ -78441,7 +77371,7 @@ SWIGINTERN PyObject *_wrap_AdjacencyIterator_pointsEnd(PyObject *self, PyObject
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -78471,7 +77401,10 @@ SWIGINTERN PyObject *_wrap_AdjacencyIterator_pointsEnd(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'AdjacencyIterator_pointsEnd'.\n  Possible C/C++ prototypes are:\n    pointsEnd(float)\n    pointsEnd()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'AdjacencyIterator_pointsEnd'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    pointsEnd(AdjacencyIterator *,float)\n"
+    "    pointsEnd(AdjacencyIterator *)\n");
   return NULL;
 }
 
@@ -78550,7 +77483,7 @@ fail:
 
 SWIGINTERN PyObject *AdjacencyIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_AdjacencyIterator, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -78855,7 +77788,7 @@ SWIGINTERN PyObject *_wrap_new_ChainingIterator(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 5); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -78965,7 +77898,14 @@ SWIGINTERN PyObject *_wrap_new_ChainingIterator(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ChainingIterator'.\n  Possible C/C++ prototypes are:\n    ChainingIterator(PyObject *,bool,bool,ViewEdge *,bool)\n    ChainingIterator(PyObject *,bool,bool,ViewEdge *)\n    ChainingIterator(PyObject *,bool,bool)\n    ChainingIterator(PyObject *,bool)\n    ChainingIterator(PyObject *)\n    ChainingIterator(PyObject *,ChainingIterator const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ChainingIterator'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    ChainingIterator(PyObject *,bool,bool,ViewEdge *,bool)\n"
+    "    ChainingIterator(PyObject *,bool,bool,ViewEdge *)\n"
+    "    ChainingIterator(PyObject *,bool,bool)\n"
+    "    ChainingIterator(PyObject *,bool)\n"
+    "    ChainingIterator(PyObject *)\n"
+    "    ChainingIterator(PyObject *,ChainingIterator const &)\n");
   return NULL;
 }
 
@@ -79325,7 +78265,7 @@ fail:
 
 SWIGINTERN PyObject *ChainingIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ChainingIterator, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -79562,7 +78502,7 @@ SWIGINTERN PyObject *_wrap_new_ChainSilhouetteIterator(PyObject *self, PyObject
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -79641,7 +78581,13 @@ SWIGINTERN PyObject *_wrap_new_ChainSilhouetteIterator(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ChainSilhouetteIterator'.\n  Possible C/C++ prototypes are:\n    ChainSilhouetteIterator(PyObject *,bool,ViewEdge *,bool)\n    ChainSilhouetteIterator(PyObject *,bool,ViewEdge *)\n    ChainSilhouetteIterator(PyObject *,bool)\n    ChainSilhouetteIterator(PyObject *)\n    ChainSilhouetteIterator(PyObject *,ChainSilhouetteIterator const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ChainSilhouetteIterator'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    ChainSilhouetteIterator(PyObject *,bool,ViewEdge *,bool)\n"
+    "    ChainSilhouetteIterator(PyObject *,bool,ViewEdge *)\n"
+    "    ChainSilhouetteIterator(PyObject *,bool)\n"
+    "    ChainSilhouetteIterator(PyObject *)\n"
+    "    ChainSilhouetteIterator(PyObject *,ChainSilhouetteIterator const &)\n");
   return NULL;
 }
 
@@ -79808,7 +78754,7 @@ fail:
 
 SWIGINTERN PyObject *ChainSilhouetteIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ChainSilhouetteIterator, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -80483,7 +79429,7 @@ SWIGINTERN PyObject *_wrap_new_ChainPredicateIterator(PyObject *self, PyObject *
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 7); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -80736,7 +79682,19 @@ SWIGINTERN PyObject *_wrap_new_ChainPredicateIterator(PyObject *self, PyObject *
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ChainPredicateIterator'.\n  Possible C/C++ prototypes are:\n    ChainPredicateIterator(PyObject *,bool,bool,ViewEdge *,bool)\n    ChainPredicateIterator(PyObject *,bool,bool,ViewEdge *)\n    ChainPredicateIterator(PyObject *,bool,bool)\n    ChainPredicateIterator(PyObject *,bool)\n    ChainPredicateIterator(PyObject *)\n    ChainPredicateIterator(PyObject *,UnaryPredicate1D &,BinaryPredicate1D &,bool,bool,ViewEdge *,bool)\n    ChainPredicateIterator(PyObject *,UnaryPredicate1D &,BinaryPredicate1D &,bool,bool,ViewEdge *)\n    ChainPredicateIterator(PyObject *,UnaryPredicate1D &,BinaryPredicate1D &,bool,bool)\n    ChainPredicateIterator(PyObject *,UnaryPredicate1D &,BinaryPredicate1D &,bool)\n    ChainPredicateIterator(PyObject *,UnaryPredicate1D &,BinaryPredicate1D &)\n    ChainPredicateIterator(PyObject *,ChainPredicateIterator const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ChainPredicateIterator'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    ChainPredicateIterator(PyObject *,bool,bool,ViewEdge *,bool)\n"
+    "    ChainPredicateIterator(PyObject *,bool,bool,ViewEdge *)\n"
+    "    ChainPredicateIterator(PyObject *,bool,bool)\n"
+    "    ChainPredicateIterator(PyObject *,bool)\n"
+    "    ChainPredicateIterator(PyObject *)\n"
+    "    ChainPredicateIterator(PyObject *,UnaryPredicate1D &,BinaryPredicate1D &,bool,bool,ViewEdge *,bool)\n"
+    "    ChainPredicateIterator(PyObject *,UnaryPredicate1D &,BinaryPredicate1D &,bool,bool,ViewEdge *)\n"
+    "    ChainPredicateIterator(PyObject *,UnaryPredicate1D &,BinaryPredicate1D &,bool,bool)\n"
+    "    ChainPredicateIterator(PyObject *,UnaryPredicate1D &,BinaryPredicate1D &,bool)\n"
+    "    ChainPredicateIterator(PyObject *,UnaryPredicate1D &,BinaryPredicate1D &)\n"
+    "    ChainPredicateIterator(PyObject *,ChainPredicateIterator const &)\n");
   return NULL;
 }
 
@@ -80903,7 +79861,7 @@ fail:
 
 SWIGINTERN PyObject *ChainPredicateIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ChainPredicateIterator, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -81099,7 +80057,7 @@ fail:
 
 SWIGINTERN PyObject *UnaryPredicate0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_UnaryPredicate0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -81249,7 +80207,7 @@ fail:
 
 SWIGINTERN PyObject *BinaryPredicate0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_BinaryPredicate0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -81387,7 +80345,7 @@ fail:
 
 SWIGINTERN PyObject *TrueUP0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates0D__TrueUP0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -81525,7 +80483,7 @@ fail:
 
 SWIGINTERN PyObject *FalseUP0D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates0D__FalseUP0D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -81721,7 +80679,7 @@ fail:
 
 SWIGINTERN PyObject *UnaryPredicate1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_UnaryPredicate1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -81929,7 +80887,7 @@ fail:
 
 SWIGINTERN PyObject *BinaryPredicate1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_BinaryPredicate1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -82067,7 +81025,7 @@ fail:
 
 SWIGINTERN PyObject *TrueUP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__TrueUP1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -82205,7 +81163,7 @@ fail:
 
 SWIGINTERN PyObject *FalseUP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__FalseUP1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -82271,7 +81229,7 @@ SWIGINTERN PyObject *_wrap_new_QuantitativeInvisibilityUP1D(PyObject *self, PyOb
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -82290,7 +81248,10 @@ SWIGINTERN PyObject *_wrap_new_QuantitativeInvisibilityUP1D(PyObject *self, PyOb
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_QuantitativeInvisibilityUP1D'.\n  Possible C/C++ prototypes are:\n    Predicates1D::QuantitativeInvisibilityUP1D(unsigned int)\n    Predicates1D::QuantitativeInvisibilityUP1D()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_QuantitativeInvisibilityUP1D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Predicates1D::QuantitativeInvisibilityUP1D(unsigned int)\n"
+    "    Predicates1D::QuantitativeInvisibilityUP1D()\n");
   return NULL;
 }
 
@@ -82405,7 +81366,7 @@ fail:
 
 SWIGINTERN PyObject *QuantitativeInvisibilityUP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__QuantitativeInvisibilityUP1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -82543,7 +81504,7 @@ fail:
 
 SWIGINTERN PyObject *ContourUP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__ContourUP1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -82681,7 +81642,7 @@ fail:
 
 SWIGINTERN PyObject *ExternalContourUP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__ExternalContourUP1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -82828,7 +81789,7 @@ fail:
 
 SWIGINTERN PyObject *EqualToTimeStampUP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__EqualToTimeStampUP1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -82975,7 +81936,7 @@ fail:
 
 SWIGINTERN PyObject *EqualToChainingTimeStampUP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__EqualToChainingTimeStampUP1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -83059,7 +82020,7 @@ SWIGINTERN PyObject *_wrap_new_ShapeUP1D(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -83091,7 +82052,10 @@ SWIGINTERN PyObject *_wrap_new_ShapeUP1D(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ShapeUP1D'.\n  Possible C/C++ prototypes are:\n    Predicates1D::ShapeUP1D(unsigned int,unsigned int)\n    Predicates1D::ShapeUP1D(unsigned int)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ShapeUP1D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Predicates1D::ShapeUP1D(unsigned int,unsigned int)\n"
+    "    Predicates1D::ShapeUP1D(unsigned int)\n");
   return NULL;
 }
 
@@ -83206,7 +82170,7 @@ fail:
 
 SWIGINTERN PyObject *ShapeUP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__ShapeUP1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -83356,7 +82320,7 @@ fail:
 
 SWIGINTERN PyObject *TrueBP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__TrueBP1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -83506,7 +82470,7 @@ fail:
 
 SWIGINTERN PyObject *FalseBP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__FalseBP1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -83656,7 +82620,7 @@ fail:
 
 SWIGINTERN PyObject *Length2DBP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__Length2DBP1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -83806,7 +82770,7 @@ fail:
 
 SWIGINTERN PyObject *SameShapeIdBP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__SameShapeIdBP1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -83940,7 +82904,7 @@ SWIGINTERN PyObject *_wrap_new_ViewMapGradientNormBP1D(PyObject *self, PyObject
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -83994,7 +82958,11 @@ SWIGINTERN PyObject *_wrap_new_ViewMapGradientNormBP1D(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewMapGradientNormBP1D'.\n  Possible C/C++ prototypes are:\n    Predicates1D::ViewMapGradientNormBP1D(int,IntegrationType,float)\n    Predicates1D::ViewMapGradientNormBP1D(int,IntegrationType)\n    Predicates1D::ViewMapGradientNormBP1D(int)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ViewMapGradientNormBP1D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Predicates1D::ViewMapGradientNormBP1D(int,IntegrationType,float)\n"
+    "    Predicates1D::ViewMapGradientNormBP1D(int,IntegrationType)\n"
+    "    Predicates1D::ViewMapGradientNormBP1D(int)\n");
   return NULL;
 }
 
@@ -84121,7 +83089,7 @@ fail:
 
 SWIGINTERN PyObject *ViewMapGradientNormBP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__ViewMapGradientNormBP1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -84205,7 +83173,7 @@ SWIGINTERN PyObject *_wrap_new_DensityLowerThanUP1D(PyObject *self, PyObject *ar
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -84237,7 +83205,10 @@ SWIGINTERN PyObject *_wrap_new_DensityLowerThanUP1D(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_DensityLowerThanUP1D'.\n  Possible C/C++ prototypes are:\n    Predicates1D::DensityLowerThanUP1D(double,double)\n    Predicates1D::DensityLowerThanUP1D(double)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_DensityLowerThanUP1D'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Predicates1D::DensityLowerThanUP1D(double,double)\n"
+    "    Predicates1D::DensityLowerThanUP1D(double)\n");
   return NULL;
 }
 
@@ -84352,7 +83323,7 @@ fail:
 
 SWIGINTERN PyObject *DensityLowerThanUP1D_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Predicates1D__DensityLowerThanUP1D, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -85068,7 +84039,7 @@ SWIGINTERN PyObject *_wrap_new_CurvePointIterator(PyObject *self, PyObject *args
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -85095,7 +84066,11 @@ SWIGINTERN PyObject *_wrap_new_CurvePointIterator(PyObject *self, PyObject *args
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CurvePointIterator'.\n  Possible C/C++ prototypes are:\n    CurveInternal::CurvePointIterator(float)\n    CurveInternal::CurvePointIterator()\n    CurveInternal::CurvePointIterator(CurveInternal::CurvePointIterator const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CurvePointIterator'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    CurveInternal::CurvePointIterator(float)\n"
+    "    CurveInternal::CurvePointIterator()\n"
+    "    CurveInternal::CurvePointIterator(CurveInternal::CurvePointIterator const &)\n");
   return NULL;
 }
 
@@ -85524,7 +84499,7 @@ SWIGINTERN PyObject *_wrap_CurvePointIterator_getPoint3D(PyObject *SWIGUNUSEDPAR
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -85652,7 +84627,7 @@ SWIGINTERN PyObject *_wrap_CurvePointIterator_getPoint2D(PyObject *SWIGUNUSEDPAR
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -86171,7 +85146,7 @@ SWIGINTERN PyObject *_wrap_CurvePointIterator_point2d(PyObject *SWIGUNUSEDPARM(s
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -86206,7 +85181,7 @@ SWIGINTERN PyObject *_wrap_CurvePointIterator_point3d(PyObject *SWIGUNUSEDPARM(s
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -86238,7 +85213,7 @@ SWIGINTERN PyObject *_wrap_CurvePointIterator_normal(PyObject *SWIGUNUSEDPARM(se
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -86593,7 +85568,7 @@ SWIGINTERN PyObject *_wrap_CurvePointIterator_directionFredo(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2d(static_cast< const Geometry::Vec2d& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2d(static_cast< const Geometry::Vec2d& >(result))), SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -86602,7 +85577,7 @@ fail:
 
 SWIGINTERN PyObject *CurvePointIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CurveInternal__CurvePointIterator, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -86760,7 +85735,7 @@ SWIGINTERN PyObject *_wrap_CurvePoint_getPoint3D(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -86888,7 +85863,7 @@ SWIGINTERN PyObject *_wrap_CurvePoint_getPoint2D(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -87295,7 +86270,7 @@ SWIGINTERN PyObject *_wrap_new_CurvePoint(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -87352,7 +86327,12 @@ SWIGINTERN PyObject *_wrap_new_CurvePoint(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CurvePoint'.\n  Possible C/C++ prototypes are:\n    CurvePoint()\n    CurvePoint(SVertex *,SVertex *,float)\n    CurvePoint(CurvePoint *,CurvePoint *,float)\n    CurvePoint(CurvePoint const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_CurvePoint'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    CurvePoint()\n"
+    "    CurvePoint(SVertex *,SVertex *,float)\n"
+    "    CurvePoint(CurvePoint *,CurvePoint *,float)\n"
+    "    CurvePoint(CurvePoint const &)\n");
   return NULL;
 }
 
@@ -87709,7 +86689,7 @@ SWIGINTERN PyObject *_wrap_CurvePoint_point2d(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -87744,7 +86724,7 @@ SWIGINTERN PyObject *_wrap_CurvePoint_point3d(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -87776,7 +86756,7 @@ SWIGINTERN PyObject *_wrap_CurvePoint_normal(PyObject *SWIGUNUSEDPARM(self), PyO
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -88131,7 +87111,7 @@ SWIGINTERN PyObject *_wrap_CurvePoint_directionFredo(PyObject *SWIGUNUSEDPARM(se
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2d(static_cast< const Geometry::Vec2d& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2d(static_cast< const Geometry::Vec2d& >(result))), SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -88140,7 +87120,7 @@ fail:
 
 SWIGINTERN PyObject *CurvePoint_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CurvePoint, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -88244,7 +87224,7 @@ SWIGINTERN PyObject *_wrap_new_Curve(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -88269,7 +87249,11 @@ SWIGINTERN PyObject *_wrap_new_Curve(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Curve'.\n  Possible C/C++ prototypes are:\n    Curve()\n    Curve(Id const &)\n    Curve(Curve const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Curve'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Curve()\n"
+    "    Curve(Id const &)\n"
+    "    Curve(Curve const &)\n");
   return NULL;
 }
 
@@ -88423,7 +87407,7 @@ SWIGINTERN PyObject *_wrap_Curve_push_vertex_back(PyObject *self, PyObject *args
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -88457,7 +87441,10 @@ SWIGINTERN PyObject *_wrap_Curve_push_vertex_back(PyObject *self, PyObject *args
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Curve_push_vertex_back'.\n  Possible C/C++ prototypes are:\n    push_vertex_back(Curve::Vertex *)\n    push_vertex_back(SVertex *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Curve_push_vertex_back'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    push_vertex_back(Curve *,Curve::Vertex *)\n"
+    "    push_vertex_back(Curve *,SVertex *)\n");
   return NULL;
 }
 
@@ -88548,7 +87535,7 @@ SWIGINTERN PyObject *_wrap_Curve_push_vertex_front(PyObject *self, PyObject *arg
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -88582,7 +87569,10 @@ SWIGINTERN PyObject *_wrap_Curve_push_vertex_front(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Curve_push_vertex_front'.\n  Possible C/C++ prototypes are:\n    push_vertex_front(Curve::Vertex *)\n    push_vertex_front(SVertex *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Curve_push_vertex_front'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    push_vertex_front(Curve *,Curve::Vertex *)\n"
+    "    push_vertex_front(Curve *,SVertex *)\n");
   return NULL;
 }
 
@@ -88837,7 +87827,7 @@ SWIGINTERN PyObject *_wrap_Curve_curvePointsBegin(PyObject *self, PyObject *args
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -88867,7 +87857,10 @@ SWIGINTERN PyObject *_wrap_Curve_curvePointsBegin(PyObject *self, PyObject *args
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Curve_curvePointsBegin'.\n  Possible C/C++ prototypes are:\n    curvePointsBegin(float)\n    curvePointsBegin()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Curve_curvePointsBegin'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    curvePointsBegin(Curve *,float)\n"
+    "    curvePointsBegin(Curve *)\n");
   return NULL;
 }
 
@@ -88951,7 +87944,7 @@ SWIGINTERN PyObject *_wrap_Curve_curvePointsEnd(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -88981,7 +87974,10 @@ SWIGINTERN PyObject *_wrap_Curve_curvePointsEnd(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Curve_curvePointsEnd'.\n  Possible C/C++ prototypes are:\n    curvePointsEnd(float)\n    curvePointsEnd()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Curve_curvePointsEnd'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    curvePointsEnd(Curve *,float)\n"
+    "    curvePointsEnd(Curve *)\n");
   return NULL;
 }
 
@@ -89193,7 +88189,7 @@ SWIGINTERN PyObject *_wrap_Curve_pointsBegin(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -89223,7 +88219,10 @@ SWIGINTERN PyObject *_wrap_Curve_pointsBegin(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Curve_pointsBegin'.\n  Possible C/C++ prototypes are:\n    pointsBegin(float)\n    pointsBegin()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Curve_pointsBegin'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    pointsBegin(Curve *,float)\n"
+    "    pointsBegin(Curve *)\n");
   return NULL;
 }
 
@@ -89307,7 +88306,7 @@ SWIGINTERN PyObject *_wrap_Curve_pointsEnd(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -89337,14 +88336,17 @@ SWIGINTERN PyObject *_wrap_Curve_pointsEnd(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Curve_pointsEnd'.\n  Possible C/C++ prototypes are:\n    pointsEnd(float)\n    pointsEnd()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Curve_pointsEnd'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    pointsEnd(Curve *,float)\n"
+    "    pointsEnd(Curve *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *Curve_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Curve, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -89472,7 +88474,7 @@ SWIGINTERN PyObject *_wrap_new_StrokeVertexIterator(PyObject *self, PyObject *ar
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -89505,7 +88507,11 @@ SWIGINTERN PyObject *_wrap_new_StrokeVertexIterator(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_StrokeVertexIterator'.\n  Possible C/C++ prototypes are:\n    StrokeInternal::StrokeVertexIterator()\n    StrokeInternal::StrokeVertexIterator(StrokeInternal::StrokeVertexIterator const &)\n    StrokeInternal::StrokeVertexIterator(Stroke::vertex_container::iterator const &,Stroke::vertex_container::iterator const &,Stroke::vertex_container::iterator const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_StrokeVertexIterator'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    StrokeInternal::StrokeVertexIterator()\n"
+    "    StrokeInternal::StrokeVertexIterator(StrokeInternal::StrokeVertexIterator const &)\n"
+    "    StrokeInternal::StrokeVertexIterator(Stroke::vertex_container::iterator const &,Stroke::vertex_container::iterator const &,Stroke::vertex_container::iterator const &)\n");
   return NULL;
 }
 
@@ -90063,7 +89069,7 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getPoint(PyObject *SWIGUNUSEDPAR
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -90146,7 +89152,7 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_attribute(PyObject *self, PyObje
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -90170,7 +89176,10 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_attribute(PyObject *self, PyObje
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'StrokeVertexIterator_attribute'.\n  Possible C/C++ prototypes are:\n    attribute()\n    attribute()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'StrokeVertexIterator_attribute'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    attribute(StrokeInternal::StrokeVertexIterator const *)\n"
+    "    attribute(StrokeInternal::StrokeVertexIterator *)\n");
   return NULL;
 }
 
@@ -90385,7 +89394,7 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_setPoint__SWIG_1(PyObject *SWIGU
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertexIterator_setPoint" "', argument " "1"" of type '" "StrokeInternal::StrokeVertexIterator *""'"); 
   }
   arg1 = reinterpret_cast< StrokeInternal::StrokeVertexIterator * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_float_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeVertexIterator_setPoint" "', argument " "2"" of type '" "Geometry::Vec2f const &""'"); 
   }
@@ -90417,7 +89426,7 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_setPoint(PyObject *self, PyObjec
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -90427,7 +89436,7 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_setPoint(PyObject *self, PyObjec
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2T_float_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_StrokeVertexIterator_setPoint__SWIG_1(self, args);
@@ -90457,7 +89466,10 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_setPoint(PyObject *self, PyObjec
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'StrokeVertexIterator_setPoint'.\n  Possible C/C++ prototypes are:\n    setPoint(real,real)\n    setPoint(Geometry::Vec2f const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'StrokeVertexIterator_setPoint'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    setPoint(StrokeInternal::StrokeVertexIterator *,real,real)\n"
+    "    setPoint(StrokeInternal::StrokeVertexIterator *,Geometry::Vec2f const &)\n");
   return NULL;
 }
 
@@ -90706,7 +89718,7 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getPoint3D(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -90834,7 +89846,7 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getPoint2D(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -91353,7 +90365,7 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_point2d(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -91388,7 +90400,7 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_point3d(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3Tdouble_t, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_VecMat__Vec3T_double_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -91420,7 +90432,7 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_normal(PyObject *SWIGUNUSEDPARM(
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3r(static_cast< const Geometry::Vec3r& >(result))), SWIGTYPE_p_VecMat__Vec3T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -91775,7 +90787,7 @@ SWIGINTERN PyObject *_wrap_StrokeVertexIterator_directionFredo(PyObject *SWIGUNU
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2d(static_cast< const Geometry::Vec2d& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2d(static_cast< const Geometry::Vec2d& >(result))), SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -91784,7 +90796,7 @@ fail:
 
 SWIGINTERN PyObject *StrokeVertexIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeInternal__StrokeVertexIterator, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -91986,7 +90998,7 @@ SWIGINTERN PyObject *_wrap_new_StrokeAttribute(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 6); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -92061,7 +91073,12 @@ SWIGINTERN PyObject *_wrap_new_StrokeAttribute(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_StrokeAttribute'.\n  Possible C/C++ prototypes are:\n    StrokeAttribute()\n    StrokeAttribute(StrokeAttribute const &)\n    StrokeAttribute(float,float,float,float,float,float)\n    StrokeAttribute(StrokeAttribute const &,StrokeAttribute const &,float)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_StrokeAttribute'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    StrokeAttribute()\n"
+    "    StrokeAttribute(StrokeAttribute const &)\n"
+    "    StrokeAttribute(float,float,float,float,float,float)\n"
+    "    StrokeAttribute(StrokeAttribute const &,StrokeAttribute const &,float)\n");
   return NULL;
 }
 
@@ -92251,7 +91268,7 @@ SWIGINTERN PyObject *_wrap_StrokeAttribute_getColorRGB(PyObject *SWIGUNUSEDPARM(
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -92411,7 +91428,7 @@ SWIGINTERN PyObject *_wrap_StrokeAttribute_getThicknessRL(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -92529,7 +91546,7 @@ SWIGINTERN PyObject *_wrap_StrokeAttribute_getAttributeVec2f(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
   return resultobj;
 fail:
@@ -92573,7 +91590,7 @@ SWIGINTERN PyObject *_wrap_StrokeAttribute_getAttributeVec3f(PyObject *SWIGUNUSE
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec3f(static_cast< const Geometry::Vec3f& >(result))), SWIGTYPE_p_VecMat__Vec3T_float_t, SWIG_POINTER_OWN |  0 );
   if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
   return resultobj;
 fail:
@@ -92789,7 +91806,7 @@ SWIGINTERN PyObject *_wrap_StrokeAttribute_setColor__SWIG_1(PyObject *SWIGUNUSED
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeAttribute_setColor" "', argument " "1"" of type '" "StrokeAttribute *""'"); 
   }
   arg1 = reinterpret_cast< StrokeAttribute * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3Tfloat_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec3T_float_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeAttribute_setColor" "', argument " "2"" of type '" "Geometry::Vec3f const &""'"); 
   }
@@ -92821,7 +91838,7 @@ SWIGINTERN PyObject *_wrap_StrokeAttribute_setColor(PyObject *self, PyObject *ar
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -92831,7 +91848,7 @@ SWIGINTERN PyObject *_wrap_StrokeAttribute_setColor(PyObject *self, PyObject *ar
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_StrokeAttribute, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec3Tfloat_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec3T_float_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_StrokeAttribute_setColor__SWIG_1(self, args);
@@ -92867,7 +91884,10 @@ SWIGINTERN PyObject *_wrap_StrokeAttribute_setColor(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'StrokeAttribute_setColor'.\n  Possible C/C++ prototypes are:\n    setColor(float,float,float)\n    setColor(Geometry::Vec3f const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'StrokeAttribute_setColor'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    setColor(StrokeAttribute *,float,float,float)\n"
+    "    setColor(StrokeAttribute *,Geometry::Vec3f const &)\n");
   return NULL;
 }
 
@@ -92978,7 +91998,7 @@ SWIGINTERN PyObject *_wrap_StrokeAttribute_setThickness__SWIG_1(PyObject *SWIGUN
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeAttribute_setThickness" "', argument " "1"" of type '" "StrokeAttribute *""'"); 
   }
   arg1 = reinterpret_cast< StrokeAttribute * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_float_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeAttribute_setThickness" "', argument " "2"" of type '" "Geometry::Vec2f const &""'"); 
   }
@@ -93010,7 +92030,7 @@ SWIGINTERN PyObject *_wrap_StrokeAttribute_setThickness(PyObject *self, PyObject
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -93020,7 +92040,7 @@ SWIGINTERN PyObject *_wrap_StrokeAttribute_setThickness(PyObject *self, PyObject
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_StrokeAttribute, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2T_float_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_StrokeAttribute_setThickness__SWIG_1(self, args);
@@ -93050,7 +92070,10 @@ SWIGINTERN PyObject *_wrap_StrokeAttribute_setThickness(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'StrokeAttribute_setThickness'.\n  Possible C/C++ prototypes are:\n    setThickness(float,float)\n    setThickness(Geometry::Vec2f const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'StrokeAttribute_setThickness'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    setThickness(StrokeAttribute *,float,float)\n"
+    "    setThickness(StrokeAttribute *,Geometry::Vec2f const &)\n");
   return NULL;
 }
 
@@ -93174,7 +92197,7 @@ SWIGINTERN PyObject *_wrap_StrokeAttribute_setAttributeVec2f(PyObject *SWIGUNUSE
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeAttribute_setAttributeVec2f" "', argument " "2"" of type '" "char const *""'");
   }
   arg2 = reinterpret_cast< char * >(buf2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0  | 0);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2T_float_t,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "StrokeAttribute_setAttributeVec2f" "', argument " "3"" of type '" "Geometry::Vec2f const &""'"); 
   }
@@ -93229,7 +92252,7 @@ SWIGINTERN PyObject *_wrap_StrokeAttribute_setAttributeVec3f(PyObject *SWIGUNUSE
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeAttribute_setAttributeVec3f" "', argument " "2"" of type '" "char const *""'");
   }
   arg2 = reinterpret_cast< char * >(buf2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec3Tfloat_t,  0  | 0);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec3T_float_t,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "StrokeAttribute_setAttributeVec3f" "', argument " "3"" of type '" "Geometry::Vec3f const &""'"); 
   }
@@ -93259,7 +92282,7 @@ fail:
 
 SWIGINTERN PyObject *StrokeAttribute_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeAttribute, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -93518,7 +92541,7 @@ SWIGINTERN PyObject *_wrap_new_StrokeVertex(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -93586,7 +92609,14 @@ SWIGINTERN PyObject *_wrap_new_StrokeVertex(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_StrokeVertex'.\n  Possible C/C++ prototypes are:\n    StrokeVertex()\n    StrokeVertex(StrokeVertex const &)\n    StrokeVertex(SVertex *)\n    StrokeVertex(CurvePoint *)\n    StrokeVertex(StrokeVertex *,StrokeVertex *,float)\n    StrokeVertex(SVertex *,StrokeAttribute const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_StrokeVertex'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    StrokeVertex()\n"
+    "    StrokeVertex(StrokeVertex const &)\n"
+    "    StrokeVertex(SVertex *)\n"
+    "    StrokeVertex(CurvePoint *)\n"
+    "    StrokeVertex(StrokeVertex *,StrokeVertex *,float)\n"
+    "    StrokeVertex(SVertex *,StrokeAttribute const &)\n");
   return NULL;
 }
 
@@ -93712,7 +92742,7 @@ SWIGINTERN PyObject *_wrap_StrokeVertex_getPoint(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2Tfloat_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2f(static_cast< const Geometry::Vec2f& >(result))), SWIGTYPE_p_VecMat__Vec2T_float_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -93795,7 +92825,7 @@ SWIGINTERN PyObject *_wrap_StrokeVertex_attribute(PyObject *self, PyObject *args
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -93819,7 +92849,10 @@ SWIGINTERN PyObject *_wrap_StrokeVertex_attribute(PyObject *self, PyObject *args
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'StrokeVertex_attribute'.\n  Possible C/C++ prototypes are:\n    attribute()\n    attribute()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'StrokeVertex_attribute'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    attribute(StrokeVertex const *)\n"
+    "    attribute(StrokeVertex *)\n");
   return NULL;
 }
 
@@ -94066,7 +93099,7 @@ SWIGINTERN PyObject *_wrap_StrokeVertex_setPoint__SWIG_1(PyObject *SWIGUNUSEDPAR
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StrokeVertex_setPoint" "', argument " "1"" of type '" "StrokeVertex *""'"); 
   }
   arg1 = reinterpret_cast< StrokeVertex * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_float_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "StrokeVertex_setPoint" "', argument " "2"" of type '" "Geometry::Vec2f const &""'"); 
   }
@@ -94098,7 +93131,7 @@ SWIGINTERN PyObject *_wrap_StrokeVertex_setPoint(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -94108,7 +93141,7 @@ SWIGINTERN PyObject *_wrap_StrokeVertex_setPoint(PyObject *self, PyObject *args)
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_StrokeVertex, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2Tfloat_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2T_float_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_StrokeVertex_setPoint__SWIG_1(self, args);
@@ -94138,7 +93171,10 @@ SWIGINTERN PyObject *_wrap_StrokeVertex_setPoint(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'StrokeVertex_setPoint'.\n  Possible C/C++ prototypes are:\n    setPoint(real,real)\n    setPoint(Geometry::Vec2f const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'StrokeVertex_setPoint'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    setPoint(StrokeVertex *,real,real)\n"
+    "    setPoint(StrokeVertex *,Geometry::Vec2f const &)\n");
   return NULL;
 }
 
@@ -94268,7 +93304,7 @@ fail:
 
 SWIGINTERN PyObject *StrokeVertex_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeVertex, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -94401,7 +93437,7 @@ SWIGINTERN PyObject *_wrap_new_Stroke(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -94418,7 +93454,10 @@ SWIGINTERN PyObject *_wrap_new_Stroke(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Stroke'.\n  Possible C/C++ prototypes are:\n    Stroke()\n    Stroke(Stroke const &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_Stroke'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Stroke()\n"
+    "    Stroke(Stroke const &)\n");
   return NULL;
 }
 
@@ -94582,7 +93621,7 @@ SWIGINTERN PyObject *_wrap_Stroke_Resample(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -94618,7 +93657,10 @@ SWIGINTERN PyObject *_wrap_Stroke_Resample(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_Resample'.\n  Possible C/C++ prototypes are:\n    Resample(int)\n    Resample(float)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_Resample'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    Resample(Stroke *,int)\n"
+    "    Resample(Stroke *,float)\n");
   return NULL;
 }
 
@@ -95030,7 +94072,7 @@ SWIGINTERN PyObject *_wrap_Stroke_viewedges_begin(PyObject *self, PyObject *args
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -95054,7 +94096,10 @@ SWIGINTERN PyObject *_wrap_Stroke_viewedges_begin(PyObject *self, PyObject *args
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_viewedges_begin'.\n  Possible C/C++ prototypes are:\n    viewedges_begin()\n    viewedges_begin()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_viewedges_begin'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    viewedges_begin(Stroke const *)\n"
+    "    viewedges_begin(Stroke *)\n");
   return NULL;
 }
 
@@ -95129,7 +94174,7 @@ SWIGINTERN PyObject *_wrap_Stroke_viewedges_end(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -95153,7 +94198,10 @@ SWIGINTERN PyObject *_wrap_Stroke_viewedges_end(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_viewedges_end'.\n  Possible C/C++ prototypes are:\n    viewedges_end()\n    viewedges_end()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_viewedges_end'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    viewedges_end(Stroke const *)\n"
+    "    viewedges_end(Stroke *)\n");
   return NULL;
 }
 
@@ -95215,7 +94263,7 @@ SWIGINTERN PyObject *_wrap_Stroke_getBeginningOrientation(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2r(static_cast< const Geometry::Vec2r& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2r(static_cast< const Geometry::Vec2r& >(result))), SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -95311,7 +94359,7 @@ SWIGINTERN PyObject *_wrap_Stroke_getEndingOrientation(PyObject *SWIGUNUSEDPARM(
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new Geometry::Vec2r(static_cast< const Geometry::Vec2r& >(result))), SWIGTYPE_p_VecMat__Vec2Tdouble_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new Geometry::Vec2r(static_cast< const Geometry::Vec2r& >(result))), SWIGTYPE_p_VecMat__Vec2T_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -95722,7 +94770,7 @@ SWIGINTERN PyObject *_wrap_Stroke_setBeginningOrientation__SWIG_0(PyObject *SWIG
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_setBeginningOrientation" "', argument " "1"" of type '" "Stroke *""'"); 
   }
   arg1 = reinterpret_cast< Stroke * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Stroke_setBeginningOrientation" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
   }
@@ -95803,7 +94851,7 @@ SWIGINTERN PyObject *_wrap_Stroke_setBeginningOrientation(PyObject *self, PyObje
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -95813,7 +94861,7 @@ SWIGINTERN PyObject *_wrap_Stroke_setBeginningOrientation(PyObject *self, PyObje
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Stroke, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2T_double_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Stroke_setBeginningOrientation__SWIG_0(self, args);
@@ -95843,7 +94891,10 @@ SWIGINTERN PyObject *_wrap_Stroke_setBeginningOrientation(PyObject *self, PyObje
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_setBeginningOrientation'.\n  Possible C/C++ prototypes are:\n    setBeginningOrientation(Geometry::Vec2r const &)\n    setBeginningOrientation(real,real)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_setBeginningOrientation'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    setBeginningOrientation(Stroke *,Geometry::Vec2r const &)\n"
+    "    setBeginningOrientation(Stroke *,real,real)\n");
   return NULL;
 }
 
@@ -95865,7 +94916,7 @@ SWIGINTERN PyObject *_wrap_Stroke_setEndingOrientation__SWIG_0(PyObject *SWIGUNU
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Stroke_setEndingOrientation" "', argument " "1"" of type '" "Stroke *""'"); 
   }
   arg1 = reinterpret_cast< Stroke * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Stroke_setEndingOrientation" "', argument " "2"" of type '" "Geometry::Vec2r const &""'"); 
   }
@@ -95946,7 +94997,7 @@ SWIGINTERN PyObject *_wrap_Stroke_setEndingOrientation(PyObject *self, PyObject
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -95956,7 +95007,7 @@ SWIGINTERN PyObject *_wrap_Stroke_setEndingOrientation(PyObject *self, PyObject
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Stroke, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2Tdouble_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_VecMat__Vec2T_double_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Stroke_setEndingOrientation__SWIG_0(self, args);
@@ -95986,7 +95037,10 @@ SWIGINTERN PyObject *_wrap_Stroke_setEndingOrientation(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_setEndingOrientation'.\n  Possible C/C++ prototypes are:\n    setEndingOrientation(Geometry::Vec2r const &)\n    setEndingOrientation(real,real)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_setEndingOrientation'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    setEndingOrientation(Stroke *,Geometry::Vec2r const &)\n"
+    "    setEndingOrientation(Stroke *,real,real)\n");
   return NULL;
 }
 
@@ -96070,7 +95124,7 @@ SWIGINTERN PyObject *_wrap_Stroke_strokeVerticesBegin(PyObject *self, PyObject *
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -96100,7 +95154,10 @@ SWIGINTERN PyObject *_wrap_Stroke_strokeVerticesBegin(PyObject *self, PyObject *
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_strokeVerticesBegin'.\n  Possible C/C++ prototypes are:\n    strokeVerticesBegin(float)\n    strokeVerticesBegin()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_strokeVerticesBegin'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    strokeVerticesBegin(Stroke *,float)\n"
+    "    strokeVerticesBegin(Stroke *)\n");
   return NULL;
 }
 
@@ -96312,7 +95369,7 @@ SWIGINTERN PyObject *_wrap_Stroke_pointsBegin(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -96342,7 +95399,10 @@ SWIGINTERN PyObject *_wrap_Stroke_pointsBegin(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_pointsBegin'.\n  Possible C/C++ prototypes are:\n    pointsBegin(float)\n    pointsBegin()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_pointsBegin'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    pointsBegin(Stroke *,float)\n"
+    "    pointsBegin(Stroke *)\n");
   return NULL;
 }
 
@@ -96426,7 +95486,7 @@ SWIGINTERN PyObject *_wrap_Stroke_pointsEnd(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -96456,21 +95516,24 @@ SWIGINTERN PyObject *_wrap_Stroke_pointsEnd(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_pointsEnd'.\n  Possible C/C++ prototypes are:\n    pointsEnd(float)\n    pointsEnd()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Stroke_pointsEnd'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    pointsEnd(Stroke *,float)\n"
+    "    pointsEnd(Stroke *)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *Stroke_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Stroke, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
   PyObject **arg2 = (PyObject **) 0 ;
   swig::PySwigIterator *result = 0 ;
   void *argp1 = 0 ;
@@ -96479,11 +95542,11 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_iterator(PyObject *SWIGUNUSEDPARM(se
   
   arg2 = &obj0;
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_iterator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_iterator" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_iterator" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   {
     try {
       result = (swig::PySwigIterator *)std_vector_Sl_StrokeShader_Sm__Sg__iterator(arg1,arg2);
@@ -96504,21 +95567,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer___nonzero__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer___nonzero__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___nonzero__" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___nonzero__" "', argument " "1"" of type '" "std::vector< StrokeShader * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   {
     try {
-      result = (bool)std_vector_Sl_StrokeShader_Sm__Sg____nonzero__((std::vector<StrokeShader * > const *)arg1);
+      result = (bool)std_vector_Sl_StrokeShader_Sm__Sg____nonzero__((std::vector< StrokeShader * > const *)arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -96536,21 +95599,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer___len__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::size_type result;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer___len__",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___len__" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___len__" "', argument " "1"" of type '" "std::vector< StrokeShader * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   {
     try {
-      result = std_vector_Sl_StrokeShader_Sm__Sg____len__((std::vector<StrokeShader * > const *)arg1);
+      result = std_vector_Sl_StrokeShader_Sm__Sg____len__((std::vector< StrokeShader * > const *)arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -96568,22 +95631,22 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::value_type result;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_pop",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_pop" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_pop" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   {
     try {
       try {
-        result = (std::vector<StrokeShader * >::value_type)std_vector_Sl_StrokeShader_Sm__Sg__pop(arg1);
+        result = (std::vector< StrokeShader * >::value_type)std_vector_Sl_StrokeShader_Sm__Sg__pop(arg1);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -96597,7 +95660,7 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_pop(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -96606,10 +95669,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::difference_type arg2 ;
-  std::vector<StrokeShader * >::difference_type arg3 ;
-  std::vector<StrokeShader *,std::allocator<StrokeShader * > > *result = 0 ;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::difference_type arg2 ;
+  std::vector< StrokeShader * >::difference_type arg3 ;
+  std::vector< StrokeShader *,std::allocator< StrokeShader * > > *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -96621,25 +95684,25 @@ SWIGINTERN PyObject *_wrap_ShadersContainer___getslice__(PyObject *SWIGUNUSEDPAR
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ShadersContainer___getslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___getslice__" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___getslice__" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer___getslice__" "', argument " "2"" of type '" "std::vector<StrokeShader * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer___getslice__" "', argument " "2"" of type '" "std::vector< StrokeShader * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<StrokeShader * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< StrokeShader * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ShadersContainer___getslice__" "', argument " "3"" of type '" "std::vector<StrokeShader * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ShadersContainer___getslice__" "', argument " "3"" of type '" "std::vector< StrokeShader * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<StrokeShader * >::difference_type >(val3);
+  arg3 = static_cast< std::vector< StrokeShader * >::difference_type >(val3);
   {
     try {
       try {
-        result = (std::vector<StrokeShader *,std::allocator<StrokeShader * > > *)std_vector_Sl_StrokeShader_Sm__Sg____getslice__(arg1,arg2,arg3);
+        result = (std::vector< StrokeShader *,std::allocator< StrokeShader * > > *)std_vector_Sl_StrokeShader_Sm__Sg____getslice__(arg1,arg2,arg3);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -96653,7 +95716,7 @@ SWIGINTERN PyObject *_wrap_ShadersContainer___getslice__(PyObject *SWIGUNUSEDPAR
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -96662,10 +95725,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer___setslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::difference_type arg2 ;
-  std::vector<StrokeShader * >::difference_type arg3 ;
-  std::vector<StrokeShader *,std::allocator<StrokeShader * > > *arg4 = 0 ;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::difference_type arg2 ;
+  std::vector< StrokeShader * >::difference_type arg3 ;
+  std::vector< StrokeShader *,std::allocator< StrokeShader * > > *arg4 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -96679,36 +95742,36 @@ SWIGINTERN PyObject *_wrap_ShadersContainer___setslice__(PyObject *SWIGUNUSEDPAR
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:ShadersContainer___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___setslice__" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___setslice__" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer___setslice__" "', argument " "2"" of type '" "std::vector<StrokeShader * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer___setslice__" "', argument " "2"" of type '" "std::vector< StrokeShader * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<StrokeShader * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< StrokeShader * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ShadersContainer___setslice__" "', argument " "3"" of type '" "std::vector<StrokeShader * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ShadersContainer___setslice__" "', argument " "3"" of type '" "std::vector< StrokeShader * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<StrokeShader * >::difference_type >(val3);
+  arg3 = static_cast< std::vector< StrokeShader * >::difference_type >(val3);
   {
-    std::vector<StrokeShader*,std::allocator<StrokeShader * > > *ptr = (std::vector<StrokeShader*,std::allocator<StrokeShader * > > *)0;
+    std::vector<StrokeShader*,std::allocator< StrokeShader * > > *ptr = (std::vector<StrokeShader*,std::allocator< StrokeShader * > > *)0;
     res4 = swig::asptr(obj3, &ptr);
     if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ShadersContainer___setslice__" "', argument " "4"" of type '" "std::vector<StrokeShader *,std::allocator<StrokeShader * > > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ShadersContainer___setslice__" "', argument " "4"" of type '" "std::vector< StrokeShader *,std::allocator< StrokeShader * > > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ShadersContainer___setslice__" "', argument " "4"" of type '" "std::vector<StrokeShader *,std::allocator<StrokeShader * > > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ShadersContainer___setslice__" "', argument " "4"" of type '" "std::vector< StrokeShader *,std::allocator< StrokeShader * > > const &""'"); 
     }
     arg4 = ptr;
   }
   {
     try {
       try {
-        std_vector_Sl_StrokeShader_Sm__Sg____setslice__(arg1,arg2,arg3,(std::vector<StrokeShader *,std::allocator<StrokeShader * > > const &)*arg4);
+        std_vector_Sl_StrokeShader_Sm__Sg____setslice__(arg1,arg2,arg3,(std::vector< StrokeShader *,std::allocator< StrokeShader * > > const &)*arg4);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -96736,9 +95799,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer___delslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::difference_type arg2 ;
-  std::vector<StrokeShader * >::difference_type arg3 ;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::difference_type arg2 ;
+  std::vector< StrokeShader * >::difference_type arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -96750,21 +95813,21 @@ SWIGINTERN PyObject *_wrap_ShadersContainer___delslice__(PyObject *SWIGUNUSEDPAR
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ShadersContainer___delslice__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___delslice__" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___delslice__" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer___delslice__" "', argument " "2"" of type '" "std::vector<StrokeShader * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer___delslice__" "', argument " "2"" of type '" "std::vector< StrokeShader * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<StrokeShader * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< StrokeShader * >::difference_type >(val2);
   ecode3 = SWIG_AsVal_ptrdiff_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ShadersContainer___delslice__" "', argument " "3"" of type '" "std::vector<StrokeShader * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ShadersContainer___delslice__" "', argument " "3"" of type '" "std::vector< StrokeShader * >::difference_type""'");
   } 
-  arg3 = static_cast< std::vector<StrokeShader * >::difference_type >(val3);
+  arg3 = static_cast< std::vector< StrokeShader * >::difference_type >(val3);
   {
     try {
       try {
@@ -96791,8 +95854,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer___delitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::difference_type arg2 ;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::difference_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -96801,16 +95864,16 @@ SWIGINTERN PyObject *_wrap_ShadersContainer___delitem__(PyObject *SWIGUNUSEDPARM
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ShadersContainer___delitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___delitem__" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___delitem__" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer___delitem__" "', argument " "2"" of type '" "std::vector<StrokeShader * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer___delitem__" "', argument " "2"" of type '" "std::vector< StrokeShader * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<StrokeShader * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< StrokeShader * >::difference_type >(val2);
   {
     try {
       try {
@@ -96837,9 +95900,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer___getitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::difference_type arg2 ;
-  std::vector<StrokeShader * >::value_type result;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::difference_type arg2 ;
+  std::vector< StrokeShader * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -96848,20 +95911,20 @@ SWIGINTERN PyObject *_wrap_ShadersContainer___getitem__(PyObject *SWIGUNUSEDPARM
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ShadersContainer___getitem__",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___getitem__" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___getitem__" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer___getitem__" "', argument " "2"" of type '" "std::vector<StrokeShader * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer___getitem__" "', argument " "2"" of type '" "std::vector< StrokeShader * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<StrokeShader * >::difference_type >(val2);
+  arg2 = static_cast< std::vector< StrokeShader * >::difference_type >(val2);
   {
     try {
       try {
-        result = (std::vector<StrokeShader * >::value_type)std_vector_Sl_StrokeShader_Sm__Sg____getitem__(arg1,arg2);
+        result = (std::vector< StrokeShader * >::value_type)std_vector_Sl_StrokeShader_Sm__Sg____getitem__(arg1,arg2);
       }
       catch(std::out_of_range &_e) {
         SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
@@ -96875,7 +95938,7 @@ SWIGINTERN PyObject *_wrap_ShadersContainer___getitem__(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -96884,9 +95947,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer___setitem__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::difference_type arg2 ;
-  std::vector<StrokeShader * >::value_type arg3 = (std::vector<StrokeShader * >::value_type) 0 ;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::difference_type arg2 ;
+  std::vector< StrokeShader * >::value_type arg3 = (std::vector< StrokeShader * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   ptrdiff_t val2 ;
@@ -96898,21 +95961,21 @@ SWIGINTERN PyObject *_wrap_ShadersContainer___setitem__(PyObject *SWIGUNUSEDPARM
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ShadersContainer___setitem__",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___setitem__" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer___setitem__" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   ecode2 = SWIG_AsVal_ptrdiff_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer___setitem__" "', argument " "2"" of type '" "std::vector<StrokeShader * >::difference_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer___setitem__" "', argument " "2"" of type '" "std::vector< StrokeShader * >::difference_type""'");
   } 
-  arg2 = static_cast< std::vector<StrokeShader * >::difference_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector< StrokeShader * >::difference_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ShadersContainer___setitem__" "', argument " "3"" of type '" "std::vector<StrokeShader * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ShadersContainer___setitem__" "', argument " "3"" of type '" "std::vector< StrokeShader * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<StrokeShader * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< StrokeShader * >::value_type >(argp3);
   {
     try {
       try {
@@ -96939,8 +96002,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::value_type arg2 = (std::vector<StrokeShader * >::value_type) 0 ;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::value_type arg2 = (std::vector< StrokeShader * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -96949,16 +96012,16 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_append(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ShadersContainer_append",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_append" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_append" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ShadersContainer_append" "', argument " "2"" of type '" "std::vector<StrokeShader * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ShadersContainer_append" "', argument " "2"" of type '" "std::vector< StrokeShader * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<StrokeShader * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector< StrokeShader * >::value_type >(argp2);
   {
     try {
       std_vector_Sl_StrokeShader_Sm__Sg__append(arg1,arg2);
@@ -96979,12 +96042,12 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_ShadersContainer__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *result = 0 ;
+  std::vector< StrokeShader * > *result = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)":new_ShadersContainer")) SWIG_fail;
   {
     try {
-      result = (std::vector<StrokeShader * > *)new std::vector<StrokeShader * >();
+      result = (std::vector< StrokeShader * > *)new std::vector< StrokeShader * >();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -96993,7 +96056,7 @@ SWIGINTERN PyObject *_wrap_new_ShadersContainer__SWIG_0(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -97002,26 +96065,26 @@ fail:
 
 SWIGINTERN PyObject *_wrap_new_ShadersContainer__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = 0 ;
-  std::vector<StrokeShader * > *result = 0 ;
+  std::vector< StrokeShader * > *arg1 = 0 ;
+  std::vector< StrokeShader * > *result = 0 ;
   int res1 = SWIG_OLDOBJ ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_ShadersContainer",&obj0)) SWIG_fail;
   {
-    std::vector<StrokeShader*,std::allocator<StrokeShader * > > *ptr = (std::vector<StrokeShader*,std::allocator<StrokeShader * > > *)0;
+    std::vector<StrokeShader*,std::allocator< StrokeShader * > > *ptr = (std::vector<StrokeShader*,std::allocator< StrokeShader * > > *)0;
     res1 = swig::asptr(obj0, &ptr);
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ShadersContainer" "', argument " "1"" of type '" "std::vector<StrokeShader * > const &""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ShadersContainer" "', argument " "1"" of type '" "std::vector< StrokeShader * > const &""'"); 
     }
     if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ShadersContainer" "', argument " "1"" of type '" "std::vector<StrokeShader * > const &""'"); 
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ShadersContainer" "', argument " "1"" of type '" "std::vector< StrokeShader * > const &""'"); 
     }
     arg1 = ptr;
   }
   {
     try {
-      result = (std::vector<StrokeShader * > *)new std::vector<StrokeShader * >((std::vector<StrokeShader * > const &)*arg1);
+      result = (std::vector< StrokeShader * > *)new std::vector< StrokeShader * >((std::vector< StrokeShader * > const &)*arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -97030,7 +96093,7 @@ SWIGINTERN PyObject *_wrap_new_ShadersContainer__SWIG_1(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, SWIG_POINTER_NEW |  0 );
   if (SWIG_IsNewObj(res1)) delete arg1;
   return resultobj;
 fail:
@@ -97041,21 +96104,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_empty",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_empty" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_empty" "', argument " "1"" of type '" "std::vector< StrokeShader * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   {
     try {
-      result = (bool)((std::vector<StrokeShader * > const *)arg1)->empty();
+      result = (bool)((std::vector< StrokeShader * > const *)arg1)->empty();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -97073,21 +96136,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::size_type result;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_size",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_size" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_size" "', argument " "1"" of type '" "std::vector< StrokeShader * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   {
     try {
-      result = ((std::vector<StrokeShader * > const *)arg1)->size();
+      result = ((std::vector< StrokeShader * > const *)arg1)->size();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -97105,17 +96168,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_clear",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_clear" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_clear" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   {
     try {
       (arg1)->clear();
@@ -97136,8 +96199,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * > *arg2 = 0 ;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -97146,19 +96209,19 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_swap(PyObject *SWIGUNUSEDPARM(self),
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ShadersContainer_swap",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_swap" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_swap" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t,  0 );
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ShadersContainer_swap" "', argument " "2"" of type '" "std::vector<StrokeShader * > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ShadersContainer_swap" "', argument " "2"" of type '" "std::vector< StrokeShader * > &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ShadersContainer_swap" "', argument " "2"" of type '" "std::vector<StrokeShader * > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "ShadersContainer_swap" "', argument " "2"" of type '" "std::vector< StrokeShader * > &""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<StrokeShader * > * >(argp2);
+  arg2 = reinterpret_cast< std::vector< StrokeShader * > * >(argp2);
   {
     try {
       (arg1)->swap(*arg2);
@@ -97179,21 +96242,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  SwigValueWrapper<std::allocator<StrokeShader * > > result;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  SwigValueWrapper< std::allocator< StrokeShader * > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_get_allocator",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_get_allocator" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_get_allocator" "', argument " "1"" of type '" "std::vector< StrokeShader * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   {
     try {
-      result = ((std::vector<StrokeShader * > const *)arg1)->get_allocator();
+      result = ((std::vector< StrokeShader * > const *)arg1)->get_allocator();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -97202,30 +96265,30 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_get_allocator(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new std::vector<StrokeShader * >::allocator_type(static_cast< const std::vector<StrokeShader * >::allocator_type& >(result))), SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new std::vector< StrokeShader * >::allocator_type(static_cast< const std::vector< StrokeShader * >::allocator_type& >(result))), SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__allocator_type, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_ShadersContainer_begin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ShadersContainer_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::iterator result;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::const_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_begin" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_begin" "', argument " "1"" of type '" "std::vector< StrokeShader * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   {
     try {
-      result = (arg1)->begin();
+      result = ((std::vector< StrokeShader * > const *)arg1)->begin();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -97234,7 +96297,7 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_begin__SWIG_0(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<StrokeShader * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< StrokeShader * >::const_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -97242,89 +96305,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ShadersContainer_begin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ShadersContainer_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::const_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_begin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_begin" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<StrokeShader * > const *)arg1)->begin();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<StrokeShader * >::const_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ShadersContainer_begin(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ShadersContainer_begin__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ShadersContainer_begin__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ShadersContainer_begin'.\n  Possible C/C++ prototypes are:\n    begin()\n    begin()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ShadersContainer_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::iterator result;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::const_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_end" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_end" "', argument " "1"" of type '" "std::vector< StrokeShader * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   {
     try {
-      result = (arg1)->end();
+      result = ((std::vector< StrokeShader * > const *)arg1)->end();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -97333,7 +96330,7 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_end__SWIG_0(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<StrokeShader * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< StrokeShader * >::const_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -97341,89 +96338,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ShadersContainer_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ShadersContainer_rbegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::const_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_end",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_end" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<StrokeShader * > const *)arg1)->end();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<StrokeShader * >::const_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ShadersContainer_end(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ShadersContainer_end__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ShadersContainer_end__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ShadersContainer_end'.\n  Possible C/C++ prototypes are:\n    end()\n    end()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ShadersContainer_rbegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::reverse_iterator result;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::const_reverse_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_rbegin" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_rbegin" "', argument " "1"" of type '" "std::vector< StrokeShader * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   {
     try {
-      result = (arg1)->rbegin();
+      result = ((std::vector< StrokeShader * > const *)arg1)->rbegin();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -97432,7 +96363,7 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_rbegin__SWIG_0(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<StrokeShader * >::reverse_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< StrokeShader * >::const_reverse_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -97440,89 +96371,23 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ShadersContainer_rbegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ShadersContainer_rend(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::const_reverse_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_rbegin",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_rbegin" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<StrokeShader * > const *)arg1)->rbegin();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<StrokeShader * >::const_reverse_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ShadersContainer_rbegin(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ShadersContainer_rbegin__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ShadersContainer_rbegin__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ShadersContainer_rbegin'.\n  Possible C/C++ prototypes are:\n    rbegin()\n    rbegin()\n");
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ShadersContainer_rend__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::reverse_iterator result;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::const_reverse_iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_rend" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_rend" "', argument " "1"" of type '" "std::vector< StrokeShader * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   {
     try {
-      result = (arg1)->rend();
+      result = ((std::vector< StrokeShader * > const *)arg1)->rend();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -97531,7 +96396,7 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_rend__SWIG_0(PyObject *SWIGUNUSEDPAR
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<StrokeShader * >::reverse_iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< StrokeShader * >::const_reverse_iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -97539,76 +96404,10 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ShadersContainer_rend__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::const_reverse_iterator result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_rend",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_rend" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
-  {
-    try {
-      result = ((std::vector<StrokeShader * > const *)arg1)->rend();
-    }
-    //    catch (Swig::DirectorTypeMismatch&) {
-    //      cout << "Warning: return type mismatch" << endl;
-    //    }
-    catch (Swig::DirectorException&) {
-      cout << "Warning: director exception catched" << endl;
-    }
-  }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<StrokeShader * >::const_reverse_iterator & >(result)),
-    swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_ShadersContainer_rend(PyObject *self, PyObject *args) {
-  int argc;
-  PyObject *argv[2];
-  int ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
-  for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ShadersContainer_rend__SWIG_0(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_ShadersContainer_rend__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ShadersContainer_rend'.\n  Possible C/C++ prototypes are:\n    rend()\n    rend()\n");
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_new_ShadersContainer__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * >::size_type arg1 ;
-  std::vector<StrokeShader * > *result = 0 ;
+  std::vector< StrokeShader * >::size_type arg1 ;
+  std::vector< StrokeShader * > *result = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -97616,12 +96415,12 @@ SWIGINTERN PyObject *_wrap_new_ShadersContainer__SWIG_2(PyObject *SWIGUNUSEDPARM
   if (!PyArg_ParseTuple(args,(char *)"O:new_ShadersContainer",&obj0)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ShadersContainer" "', argument " "1"" of type '" "std::vector<StrokeShader * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ShadersContainer" "', argument " "1"" of type '" "std::vector< StrokeShader * >::size_type""'");
   } 
-  arg1 = static_cast< std::vector<StrokeShader * >::size_type >(val1);
+  arg1 = static_cast< std::vector< StrokeShader * >::size_type >(val1);
   {
     try {
-      result = (std::vector<StrokeShader * > *)new std::vector<StrokeShader * >(arg1);
+      result = (std::vector< StrokeShader * > *)new std::vector< StrokeShader * >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -97630,7 +96429,7 @@ SWIGINTERN PyObject *_wrap_new_ShadersContainer__SWIG_2(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -97639,17 +96438,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_pop_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_pop_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_pop_back" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_pop_back" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   {
     try {
       (arg1)->pop_back();
@@ -97670,8 +96469,8 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::size_type arg2 ;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::size_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -97680,16 +96479,16 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_resize__SWIG_0(PyObject *SWIGUNUSEDP
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ShadersContainer_resize",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_resize" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_resize" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer_resize" "', argument " "2"" of type '" "std::vector<StrokeShader * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer_resize" "', argument " "2"" of type '" "std::vector< StrokeShader * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<StrokeShader * >::size_type >(val2);
+  arg2 = static_cast< std::vector< StrokeShader * >::size_type >(val2);
   {
     try {
       (arg1)->resize(arg2);
@@ -97710,9 +96509,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::iterator arg2 ;
-  std::vector<StrokeShader * >::iterator result;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::iterator arg2 ;
+  std::vector< StrokeShader * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -97721,20 +96520,20 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_erase__SWIG_0(PyObject *SWIGUNUSEDPA
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ShadersContainer_erase",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_erase" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_erase" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_erase" "', argument " "2"" of type '" "std::vector<StrokeShader * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_erase" "', argument " "2"" of type '" "std::vector< StrokeShader * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< StrokeShader * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< StrokeShader * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_erase" "', argument " "2"" of type '" "std::vector<StrokeShader * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_erase" "', argument " "2"" of type '" "std::vector< StrokeShader * >::iterator""'");
     }
   }
   {
@@ -97748,7 +96547,7 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_erase__SWIG_0(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<StrokeShader * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< StrokeShader * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -97758,10 +96557,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::iterator arg2 ;
-  std::vector<StrokeShader * >::iterator arg3 ;
-  std::vector<StrokeShader * >::iterator result;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::iterator arg2 ;
+  std::vector< StrokeShader * >::iterator arg3 ;
+  std::vector< StrokeShader * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -97773,31 +96572,31 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_erase__SWIG_1(PyObject *SWIGUNUSEDPA
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ShadersContainer_erase",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_erase" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_erase" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_erase" "', argument " "2"" of type '" "std::vector<StrokeShader * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_erase" "', argument " "2"" of type '" "std::vector< StrokeShader * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< StrokeShader * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< StrokeShader * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_erase" "', argument " "2"" of type '" "std::vector<StrokeShader * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_erase" "', argument " "2"" of type '" "std::vector< StrokeShader * >::iterator""'");
     }
   }
   res3 = SWIG_ConvertPtr(obj2, SWIG_as_voidptrptr(&iter3), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res3) || !iter3) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_erase" "', argument " "3"" of type '" "std::vector<StrokeShader * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_erase" "', argument " "3"" of type '" "std::vector< StrokeShader * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *>(iter3);
+    swig::PySwigIterator_T<std::vector< StrokeShader * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< StrokeShader * >::iterator > *>(iter3);
     if (iter_t) {
       arg3 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_erase" "', argument " "3"" of type '" "std::vector<StrokeShader * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_erase" "', argument " "3"" of type '" "std::vector< StrokeShader * >::iterator""'");
     }
   }
   {
@@ -97811,7 +96610,7 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_erase__SWIG_1(PyObject *SWIGUNUSEDPA
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<StrokeShader * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< StrokeShader * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -97825,18 +96624,18 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_erase(PyObject *self, PyObject *args
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator< StrokeShader * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< StrokeShader * >::iterator > *>(iter) != 0));
       if (_v) {
         return _wrap_ShadersContainer_erase__SWIG_0(self, args);
       }
@@ -97844,16 +96643,16 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_erase(PyObject *self, PyObject *args
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator< StrokeShader * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< StrokeShader * >::iterator > *>(iter) != 0));
       if (_v) {
         swig::PySwigIterator *iter = 0;
         int res = SWIG_ConvertPtr(argv[2], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *>(iter) != 0));
+        _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< StrokeShader * >::iterator > *>(iter) != 0));
         if (_v) {
           return _wrap_ShadersContainer_erase__SWIG_1(self, args);
         }
@@ -97862,16 +96661,19 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_erase(PyObject *self, PyObject *args
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ShadersContainer_erase'.\n  Possible C/C++ prototypes are:\n    erase(std::vector<StrokeShader * >::iterator)\n    erase(std::vector<StrokeShader * >::iterator,std::vector<StrokeShader * >::iterator)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ShadersContainer_erase'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    erase(std::vector< StrokeShader * > *,std::vector< StrokeShader * >::iterator)\n"
+    "    erase(std::vector< StrokeShader * > *,std::vector< StrokeShader * >::iterator,std::vector< StrokeShader * >::iterator)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_new_ShadersContainer__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * >::size_type arg1 ;
-  std::vector<StrokeShader * >::value_type arg2 = (std::vector<StrokeShader * >::value_type) 0 ;
-  std::vector<StrokeShader * > *result = 0 ;
+  std::vector< StrokeShader * >::size_type arg1 ;
+  std::vector< StrokeShader * >::value_type arg2 = (std::vector< StrokeShader * >::value_type) 0 ;
+  std::vector< StrokeShader * > *result = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
   void *argp2 = 0 ;
@@ -97882,17 +96684,17 @@ SWIGINTERN PyObject *_wrap_new_ShadersContainer__SWIG_3(PyObject *SWIGUNUSEDPARM
   if (!PyArg_ParseTuple(args,(char *)"OO:new_ShadersContainer",&obj0,&obj1)) SWIG_fail;
   ecode1 = SWIG_AsVal_size_t(obj0, &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ShadersContainer" "', argument " "1"" of type '" "std::vector<StrokeShader * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_ShadersContainer" "', argument " "1"" of type '" "std::vector< StrokeShader * >::size_type""'");
   } 
-  arg1 = static_cast< std::vector<StrokeShader * >::size_type >(val1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
+  arg1 = static_cast< std::vector< StrokeShader * >::size_type >(val1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ShadersContainer" "', argument " "2"" of type '" "std::vector<StrokeShader * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_ShadersContainer" "', argument " "2"" of type '" "std::vector< StrokeShader * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<StrokeShader * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector< StrokeShader * >::value_type >(argp2);
   {
     try {
-      result = (std::vector<StrokeShader * > *)new std::vector<StrokeShader * >(arg1,arg2);
+      result = (std::vector< StrokeShader * > *)new std::vector< StrokeShader * >(arg1,arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -97901,7 +96703,7 @@ SWIGINTERN PyObject *_wrap_new_ShadersContainer__SWIG_3(PyObject *SWIGUNUSEDPARM
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, SWIG_POINTER_NEW |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, SWIG_POINTER_NEW |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -97914,7 +96716,7 @@ SWIGINTERN PyObject *_wrap_new_ShadersContainer(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -97933,7 +96735,7 @@ SWIGINTERN PyObject *_wrap_new_ShadersContainer(PyObject *self, PyObject *args)
   }
   if (argc == 1) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator< StrokeShader * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       return _wrap_new_ShadersContainer__SWIG_1(self, args);
@@ -97947,7 +96749,7 @@ SWIGINTERN PyObject *_wrap_new_ShadersContainer(PyObject *self, PyObject *args)
     }
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_new_ShadersContainer__SWIG_3(self, args);
@@ -97956,15 +96758,20 @@ SWIGINTERN PyObject *_wrap_new_ShadersContainer(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ShadersContainer'.\n  Possible C/C++ prototypes are:\n    std::vector<(p.StrokeShader)>()\n    std::vector<(p.StrokeShader)>(std::vector<StrokeShader * > const &)\n    std::vector<(p.StrokeShader)>(std::vector<StrokeShader * >::size_type)\n    std::vector<(p.StrokeShader)>(std::vector<StrokeShader * >::size_type,std::vector<StrokeShader * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ShadersContainer'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    std::vector< StrokeShader * >()\n"
+    "    std::vector< StrokeShader * >(std::vector< StrokeShader * > const &)\n"
+    "    std::vector< StrokeShader * >(std::vector< StrokeShader * >::size_type)\n"
+    "    std::vector< StrokeShader * >(std::vector< StrokeShader * >::size_type,std::vector< StrokeShader * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_push_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::value_type arg2 = (std::vector<StrokeShader * >::value_type) 0 ;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::value_type arg2 = (std::vector< StrokeShader * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -97973,16 +96780,16 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_push_back(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ShadersContainer_push_back",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_push_back" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_push_back" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ShadersContainer_push_back" "', argument " "2"" of type '" "std::vector<StrokeShader * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ShadersContainer_push_back" "', argument " "2"" of type '" "std::vector< StrokeShader * >::value_type""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<StrokeShader * >::value_type >(argp2);
+  arg2 = reinterpret_cast< std::vector< StrokeShader * >::value_type >(argp2);
   {
     try {
       (arg1)->push_back(arg2);
@@ -98003,21 +96810,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_front(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::value_type result;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_front",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_front" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_front" "', argument " "1"" of type '" "std::vector< StrokeShader * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   {
     try {
-      result = (std::vector<StrokeShader * >::value_type)((std::vector<StrokeShader * > const *)arg1)->front();
+      result = (std::vector< StrokeShader * >::value_type)((std::vector< StrokeShader * > const *)arg1)->front();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -98026,7 +96833,7 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_front(PyObject *SWIGUNUSEDPARM(self)
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -98035,21 +96842,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::value_type result;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::value_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_back",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_back" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_back" "', argument " "1"" of type '" "std::vector< StrokeShader * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   {
     try {
-      result = (std::vector<StrokeShader * >::value_type)((std::vector<StrokeShader * > const *)arg1)->back();
+      result = (std::vector< StrokeShader * >::value_type)((std::vector< StrokeShader * > const *)arg1)->back();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -98058,7 +96865,7 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_back(PyObject *SWIGUNUSEDPARM(self),
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -98067,9 +96874,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_assign(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::size_type arg2 ;
-  std::vector<StrokeShader * >::value_type arg3 = (std::vector<StrokeShader * >::value_type) 0 ;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::size_type arg2 ;
+  std::vector< StrokeShader * >::value_type arg3 = (std::vector< StrokeShader * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -98081,21 +96888,21 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_assign(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ShadersContainer_assign",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_assign" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_assign" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer_assign" "', argument " "2"" of type '" "std::vector<StrokeShader * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer_assign" "', argument " "2"" of type '" "std::vector< StrokeShader * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<StrokeShader * >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector< StrokeShader * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ShadersContainer_assign" "', argument " "3"" of type '" "std::vector<StrokeShader * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ShadersContainer_assign" "', argument " "3"" of type '" "std::vector< StrokeShader * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<StrokeShader * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< StrokeShader * >::value_type >(argp3);
   {
     try {
       (arg1)->assign(arg2,arg3);
@@ -98116,9 +96923,9 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::size_type arg2 ;
-  std::vector<StrokeShader * >::value_type arg3 = (std::vector<StrokeShader * >::value_type) 0 ;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::size_type arg2 ;
+  std::vector< StrokeShader * >::value_type arg3 = (std::vector< StrokeShader * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -98130,21 +96937,21 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_resize__SWIG_1(PyObject *SWIGUNUSEDP
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ShadersContainer_resize",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_resize" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_resize" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer_resize" "', argument " "2"" of type '" "std::vector<StrokeShader * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer_resize" "', argument " "2"" of type '" "std::vector< StrokeShader * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<StrokeShader * >::size_type >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
+  arg2 = static_cast< std::vector< StrokeShader * >::size_type >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ShadersContainer_resize" "', argument " "3"" of type '" "std::vector<StrokeShader * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ShadersContainer_resize" "', argument " "3"" of type '" "std::vector< StrokeShader * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<StrokeShader * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< StrokeShader * >::value_type >(argp3);
   {
     try {
       (arg1)->resize(arg2,arg3);
@@ -98169,13 +96976,13 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_resize(PyObject *self, PyObject *arg
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator< StrokeShader * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -98189,7 +96996,7 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_resize(PyObject *self, PyObject *arg
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator< StrokeShader * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       {
@@ -98198,7 +97005,7 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_resize(PyObject *self, PyObject *arg
       }
       if (_v) {
         void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0);
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           return _wrap_ShadersContainer_resize__SWIG_1(self, args);
@@ -98208,17 +97015,20 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_resize(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ShadersContainer_resize'.\n  Possible C/C++ prototypes are:\n    resize(std::vector<StrokeShader * >::size_type)\n    resize(std::vector<StrokeShader * >::size_type,std::vector<StrokeShader * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ShadersContainer_resize'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    resize(std::vector< StrokeShader * > *,std::vector< StrokeShader * >::size_type)\n"
+    "    resize(std::vector< StrokeShader * > *,std::vector< StrokeShader * >::size_type,std::vector< StrokeShader * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::iterator arg2 ;
-  std::vector<StrokeShader * >::value_type arg3 = (std::vector<StrokeShader * >::value_type) 0 ;
-  std::vector<StrokeShader * >::iterator result;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::iterator arg2 ;
+  std::vector< StrokeShader * >::value_type arg3 = (std::vector< StrokeShader * >::value_type) 0 ;
+  std::vector< StrokeShader * >::iterator result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -98230,27 +97040,27 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_insert__SWIG_0(PyObject *SWIGUNUSEDP
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:ShadersContainer_insert",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_insert" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_insert" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_insert" "', argument " "2"" of type '" "std::vector<StrokeShader * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_insert" "', argument " "2"" of type '" "std::vector< StrokeShader * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< StrokeShader * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< StrokeShader * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_insert" "', argument " "2"" of type '" "std::vector<StrokeShader * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_insert" "', argument " "2"" of type '" "std::vector< StrokeShader * >::iterator""'");
     }
   }
-  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ShadersContainer_insert" "', argument " "3"" of type '" "std::vector<StrokeShader * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "ShadersContainer_insert" "', argument " "3"" of type '" "std::vector< StrokeShader * >::value_type""'"); 
   }
-  arg3 = reinterpret_cast< std::vector<StrokeShader * >::value_type >(argp3);
+  arg3 = reinterpret_cast< std::vector< StrokeShader * >::value_type >(argp3);
   {
     try {
       result = (arg1)->insert(arg2,arg3);
@@ -98262,7 +97072,7 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_insert__SWIG_0(PyObject *SWIGUNUSEDP
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector<StrokeShader * >::iterator & >(result)),
+  resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< StrokeShader * >::iterator & >(result)),
     swig::PySwigIterator::descriptor(),SWIG_POINTER_OWN);
   return resultobj;
 fail:
@@ -98272,10 +97082,10 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::iterator arg2 ;
-  std::vector<StrokeShader * >::size_type arg3 ;
-  std::vector<StrokeShader * >::value_type arg4 = (std::vector<StrokeShader * >::value_type) 0 ;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::iterator arg2 ;
+  std::vector< StrokeShader * >::size_type arg3 ;
+  std::vector< StrokeShader * >::value_type arg4 = (std::vector< StrokeShader * >::value_type) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   swig::PySwigIterator *iter2 = 0 ;
@@ -98290,32 +97100,32 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_insert__SWIG_1(PyObject *SWIGUNUSEDP
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:ShadersContainer_insert",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_insert" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_insert" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&iter2), swig::PySwigIterator::descriptor(), 0);
   if (!SWIG_IsOK(res2) || !iter2) {
-    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_insert" "', argument " "2"" of type '" "std::vector<StrokeShader * >::iterator""'");
+    SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_insert" "', argument " "2"" of type '" "std::vector< StrokeShader * >::iterator""'");
   } else {
-    swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *>(iter2);
+    swig::PySwigIterator_T<std::vector< StrokeShader * >::iterator > *iter_t = dynamic_cast<swig::PySwigIterator_T<std::vector< StrokeShader * >::iterator > *>(iter2);
     if (iter_t) {
       arg2 = iter_t->get_current();
     } else {
-      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_insert" "', argument " "2"" of type '" "std::vector<StrokeShader * >::iterator""'");
+      SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "ShadersContainer_insert" "', argument " "2"" of type '" "std::vector< StrokeShader * >::iterator""'");
     }
   }
   ecode3 = SWIG_AsVal_size_t(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ShadersContainer_insert" "', argument " "3"" of type '" "std::vector<StrokeShader * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ShadersContainer_insert" "', argument " "3"" of type '" "std::vector< StrokeShader * >::size_type""'");
   } 
-  arg3 = static_cast< std::vector<StrokeShader * >::size_type >(val3);
-  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0 |  0 );
+  arg3 = static_cast< std::vector< StrokeShader * >::size_type >(val3);
+  res4 = SWIG_ConvertPtr(obj3, &argp4,SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0 |  0 );
   if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ShadersContainer_insert" "', argument " "4"" of type '" "std::vector<StrokeShader * >::value_type""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ShadersContainer_insert" "', argument " "4"" of type '" "std::vector< StrokeShader * >::value_type""'"); 
   }
-  arg4 = reinterpret_cast< std::vector<StrokeShader * >::value_type >(argp4);
+  arg4 = reinterpret_cast< std::vector< StrokeShader * >::value_type >(argp4);
   {
     try {
       (arg1)->insert(arg2,arg3,arg4);
@@ -98340,21 +97150,21 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_insert(PyObject *self, PyObject *arg
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 3) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator< StrokeShader * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< StrokeShader * >::iterator > *>(iter) != 0));
       if (_v) {
         void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0);
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           return _wrap_ShadersContainer_insert__SWIG_0(self, args);
@@ -98364,12 +97174,12 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_insert(PyObject *self, PyObject *arg
   }
   if (argc == 4) {
     int _v;
-    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator<StrokeShader * > >**)(0));
+    int res = swig::asptr(argv[0], (std::vector<StrokeShader*,std::allocator< StrokeShader * > >**)(0));
     _v = SWIG_CheckState(res);
     if (_v) {
       swig::PySwigIterator *iter = 0;
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::PySwigIterator::descriptor(), 0);
-      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector<StrokeShader * >::iterator > *>(iter) != 0));
+      _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::PySwigIterator_T<std::vector< StrokeShader * >::iterator > *>(iter) != 0));
       if (_v) {
         {
           int res = SWIG_AsVal_size_t(argv[2], NULL);
@@ -98377,7 +97187,7 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_insert(PyObject *self, PyObject *arg
         }
         if (_v) {
           void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0);
+          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0);
           _v = SWIG_CheckState(res);
           if (_v) {
             return _wrap_ShadersContainer_insert__SWIG_1(self, args);
@@ -98388,15 +97198,18 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_insert(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ShadersContainer_insert'.\n  Possible C/C++ prototypes are:\n    insert(std::vector<StrokeShader * >::iterator,std::vector<StrokeShader * >::value_type)\n    insert(std::vector<StrokeShader * >::iterator,std::vector<StrokeShader * >::size_type,std::vector<StrokeShader * >::value_type)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'ShadersContainer_insert'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    insert(std::vector< StrokeShader * > *,std::vector< StrokeShader * >::iterator,std::vector< StrokeShader * >::value_type)\n"
+    "    insert(std::vector< StrokeShader * > *,std::vector< StrokeShader * >::iterator,std::vector< StrokeShader * >::size_type,std::vector< StrokeShader * >::value_type)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_reserve(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::size_type arg2 ;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::size_type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   size_t val2 ;
@@ -98405,16 +97218,16 @@ SWIGINTERN PyObject *_wrap_ShadersContainer_reserve(PyObject *SWIGUNUSEDPARM(sel
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:ShadersContainer_reserve",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_reserve" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_reserve" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   ecode2 = SWIG_AsVal_size_t(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer_reserve" "', argument " "2"" of type '" "std::vector<StrokeShader * >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ShadersContainer_reserve" "', argument " "2"" of type '" "std::vector< StrokeShader * >::size_type""'");
   } 
-  arg2 = static_cast< std::vector<StrokeShader * >::size_type >(val2);
+  arg2 = static_cast< std::vector< StrokeShader * >::size_type >(val2);
   {
     try {
       (arg1)->reserve(arg2);
@@ -98435,21 +97248,21 @@ fail:
 
 SWIGINTERN PyObject *_wrap_ShadersContainer_capacity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
-  std::vector<StrokeShader * >::size_type result;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * >::size_type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:ShadersContainer_capacity",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_capacity" "', argument " "1"" of type '" "std::vector<StrokeShader * > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ShadersContainer_capacity" "', argument " "1"" of type '" "std::vector< StrokeShader * > const *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   {
     try {
-      result = ((std::vector<StrokeShader * > const *)arg1)->capacity();
+      result = ((std::vector< StrokeShader * > const *)arg1)->capacity();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -98467,17 +97280,17 @@ fail:
 
 SWIGINTERN PyObject *_wrap_delete_ShadersContainer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector<StrokeShader * > *arg1 = (std::vector<StrokeShader * > *) 0 ;
+  std::vector< StrokeShader * > *arg1 = (std::vector< StrokeShader * > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:delete_ShadersContainer",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ShadersContainer" "', argument " "1"" of type '" "std::vector<StrokeShader * > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_ShadersContainer" "', argument " "1"" of type '" "std::vector< StrokeShader * > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector<StrokeShader * > * >(argp1);
+  arg1 = reinterpret_cast< std::vector< StrokeShader * > * >(argp1);
   {
     try {
       delete arg1;
@@ -98499,8 +97312,8 @@ fail:
 
 SWIGINTERN PyObject *ShadersContainer_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, SWIG_NewClientData(obj));
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
@@ -98694,7 +97507,7 @@ fail:
 
 SWIGINTERN PyObject *StrokeShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -98840,7 +97653,7 @@ fail:
 
 SWIGINTERN PyObject *ConstantThicknessShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__ConstantThicknessShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -98986,7 +97799,7 @@ fail:
 
 SWIGINTERN PyObject *ConstantExternThicknessShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__ConstantExternThicknessShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -99109,7 +97922,7 @@ fail:
 
 SWIGINTERN PyObject *IncreasingThicknessShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__IncreasingThicknessShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -99241,7 +98054,7 @@ fail:
 
 SWIGINTERN PyObject *ConstrainedIncreasingThicknessShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__ConstrainedIncreasingThicknessShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -99364,7 +98177,7 @@ fail:
 
 SWIGINTERN PyObject *LengthDependingThicknessShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__LengthDependingThicknessShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -99565,7 +98378,7 @@ SWIGINTERN PyObject *_wrap_new_ThicknessVariationPatternShader(PyObject *self, P
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -99639,7 +98452,12 @@ SWIGINTERN PyObject *_wrap_new_ThicknessVariationPatternShader(PyObject *self, P
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ThicknessVariationPatternShader'.\n  Possible C/C++ prototypes are:\n    StrokeShaders::ThicknessVariationPatternShader(std::string const,float,float,bool)\n    StrokeShaders::ThicknessVariationPatternShader(std::string const,float,float)\n    StrokeShaders::ThicknessVariationPatternShader(std::string const,float)\n    StrokeShaders::ThicknessVariationPatternShader(std::string const)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ThicknessVariationPatternShader'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    StrokeShaders::ThicknessVariationPatternShader(std::string const,float,float,bool)\n"
+    "    StrokeShaders::ThicknessVariationPatternShader(std::string const,float,float)\n"
+    "    StrokeShaders::ThicknessVariationPatternShader(std::string const,float)\n"
+    "    StrokeShaders::ThicknessVariationPatternShader(std::string const)\n");
   return NULL;
 }
 
@@ -99721,7 +98539,7 @@ fail:
 
 SWIGINTERN PyObject *ThicknessVariationPatternShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__ThicknessVariationPatternShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -99796,7 +98614,7 @@ SWIGINTERN PyObject *_wrap_new_ThicknessNoiseShader(PyObject *self, PyObject *ar
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -99821,7 +98639,10 @@ SWIGINTERN PyObject *_wrap_new_ThicknessNoiseShader(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ThicknessNoiseShader'.\n  Possible C/C++ prototypes are:\n    StrokeShaders::ThicknessNoiseShader()\n    StrokeShaders::ThicknessNoiseShader(float,float)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ThicknessNoiseShader'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    StrokeShaders::ThicknessNoiseShader()\n"
+    "    StrokeShaders::ThicknessNoiseShader(float,float)\n");
   return NULL;
 }
 
@@ -99903,7 +98724,7 @@ fail:
 
 SWIGINTERN PyObject *ThicknessNoiseShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__ThicknessNoiseShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -100023,7 +98844,7 @@ SWIGINTERN PyObject *_wrap_new_ConstantColorShader(PyObject *self, PyObject *arg
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -100079,7 +98900,10 @@ SWIGINTERN PyObject *_wrap_new_ConstantColorShader(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ConstantColorShader'.\n  Possible C/C++ prototypes are:\n    StrokeShaders::ConstantColorShader(float,float,float,float)\n    StrokeShaders::ConstantColorShader(float,float,float)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ConstantColorShader'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    StrokeShaders::ConstantColorShader(float,float,float,float)\n"
+    "    StrokeShaders::ConstantColorShader(float,float,float)\n");
   return NULL;
 }
 
@@ -100193,7 +99017,7 @@ fail:
 
 SWIGINTERN PyObject *ConstantColorShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__ConstantColorShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -100370,7 +99194,7 @@ fail:
 
 SWIGINTERN PyObject *IncreasingColorShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__IncreasingColorShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -100458,7 +99282,7 @@ SWIGINTERN PyObject *_wrap_new_ColorVariationPatternShader(PyObject *self, PyObj
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -100486,7 +99310,10 @@ SWIGINTERN PyObject *_wrap_new_ColorVariationPatternShader(PyObject *self, PyObj
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ColorVariationPatternShader'.\n  Possible C/C++ prototypes are:\n    StrokeShaders::ColorVariationPatternShader(std::string const,bool)\n    StrokeShaders::ColorVariationPatternShader(std::string const)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ColorVariationPatternShader'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    StrokeShaders::ColorVariationPatternShader(std::string const,bool)\n"
+    "    StrokeShaders::ColorVariationPatternShader(std::string const)\n");
   return NULL;
 }
 
@@ -100568,7 +99395,7 @@ fail:
 
 SWIGINTERN PyObject *ColorVariationPatternShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__ColorVariationPatternShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -100634,7 +99461,7 @@ SWIGINTERN PyObject *_wrap_new_MaterialColorShader(PyObject *self, PyObject *arg
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -100653,7 +99480,10 @@ SWIGINTERN PyObject *_wrap_new_MaterialColorShader(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_MaterialColorShader'.\n  Possible C/C++ prototypes are:\n    StrokeShaders::MaterialColorShader(float)\n    StrokeShaders::MaterialColorShader()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_MaterialColorShader'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    StrokeShaders::MaterialColorShader(float)\n"
+    "    StrokeShaders::MaterialColorShader()\n");
   return NULL;
 }
 
@@ -100735,7 +99565,7 @@ fail:
 
 SWIGINTERN PyObject *MaterialColorShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__MaterialColorShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -100749,7 +99579,7 @@ SWIGINTERN PyObject *_wrap_new_CalligraphicColorShader(PyObject *SWIGUNUSEDPARM(
   PyObject * obj0 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"O:new_CalligraphicColorShader",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_VecMat__Vec2Tdouble_t,  0  | 0);
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_VecMat__Vec2T_double_t,  0  | 0);
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_CalligraphicColorShader" "', argument " "1"" of type '" "Geometry::Vec2d const &""'"); 
   }
@@ -100852,7 +99682,7 @@ fail:
 
 SWIGINTERN PyObject *CalligraphicColorShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__CalligraphicColorShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -100927,7 +99757,7 @@ SWIGINTERN PyObject *_wrap_new_ColorNoiseShader(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -100952,7 +99782,10 @@ SWIGINTERN PyObject *_wrap_new_ColorNoiseShader(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ColorNoiseShader'.\n  Possible C/C++ prototypes are:\n    StrokeShaders::ColorNoiseShader()\n    StrokeShaders::ColorNoiseShader(float,float)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ColorNoiseShader'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    StrokeShaders::ColorNoiseShader()\n"
+    "    StrokeShaders::ColorNoiseShader(float,float)\n");
   return NULL;
 }
 
@@ -101034,7 +99867,7 @@ fail:
 
 SWIGINTERN PyObject *ColorNoiseShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__ColorNoiseShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -101148,7 +99981,7 @@ fail:
 
 SWIGINTERN PyObject *TextureAssignerShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__TextureAssignerShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -101288,7 +100121,7 @@ SWIGINTERN PyObject *_wrap_new_StrokeTextureShader(PyObject *self, PyObject *arg
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -101336,7 +100169,11 @@ SWIGINTERN PyObject *_wrap_new_StrokeTextureShader(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_StrokeTextureShader'.\n  Possible C/C++ prototypes are:\n    StrokeShaders::StrokeTextureShader(std::string const,Stroke::MediumType,bool)\n    StrokeShaders::StrokeTextureShader(std::string const,Stroke::MediumType)\n    StrokeShaders::StrokeTextureShader(std::string const)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_StrokeTextureShader'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    StrokeShaders::StrokeTextureShader(std::string const,Stroke::MediumType,bool)\n"
+    "    StrokeShaders::StrokeTextureShader(std::string const,Stroke::MediumType)\n"
+    "    StrokeShaders::StrokeTextureShader(std::string const)\n");
   return NULL;
 }
 
@@ -101418,7 +100255,7 @@ fail:
 
 SWIGINTERN PyObject *StrokeTextureShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__StrokeTextureShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -101484,7 +100321,7 @@ SWIGINTERN PyObject *_wrap_new_BackboneStretcherShader(PyObject *self, PyObject
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -101503,7 +100340,10 @@ SWIGINTERN PyObject *_wrap_new_BackboneStretcherShader(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_BackboneStretcherShader'.\n  Possible C/C++ prototypes are:\n    StrokeShaders::BackboneStretcherShader(float)\n    StrokeShaders::BackboneStretcherShader()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_BackboneStretcherShader'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    StrokeShaders::BackboneStretcherShader(float)\n"
+    "    StrokeShaders::BackboneStretcherShader()\n");
   return NULL;
 }
 
@@ -101585,7 +100425,7 @@ fail:
 
 SWIGINTERN PyObject *BackboneStretcherShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__BackboneStretcherShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -101699,7 +100539,7 @@ fail:
 
 SWIGINTERN PyObject *SamplingShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__SamplingShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -101765,7 +100605,7 @@ SWIGINTERN PyObject *_wrap_new_ExternalContourStretcherShader(PyObject *self, Py
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -101784,7 +100624,10 @@ SWIGINTERN PyObject *_wrap_new_ExternalContourStretcherShader(PyObject *self, Py
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ExternalContourStretcherShader'.\n  Possible C/C++ prototypes are:\n    StrokeShaders::ExternalContourStretcherShader(float)\n    StrokeShaders::ExternalContourStretcherShader()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_ExternalContourStretcherShader'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    StrokeShaders::ExternalContourStretcherShader(float)\n"
+    "    StrokeShaders::ExternalContourStretcherShader()\n");
   return NULL;
 }
 
@@ -101866,7 +100709,7 @@ fail:
 
 SWIGINTERN PyObject *ExternalContourStretcherShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__ExternalContourStretcherShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -101971,7 +100814,7 @@ fail:
 
 SWIGINTERN PyObject *BSplineShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__BSplineShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -102037,7 +100880,7 @@ SWIGINTERN PyObject *_wrap_new_BezierCurveShader(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -102056,7 +100899,10 @@ SWIGINTERN PyObject *_wrap_new_BezierCurveShader(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_BezierCurveShader'.\n  Possible C/C++ prototypes are:\n    StrokeShaders::BezierCurveShader(float)\n    StrokeShaders::BezierCurveShader()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_BezierCurveShader'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    StrokeShaders::BezierCurveShader(float)\n"
+    "    StrokeShaders::BezierCurveShader()\n");
   return NULL;
 }
 
@@ -102138,7 +100984,7 @@ fail:
 
 SWIGINTERN PyObject *BezierCurveShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__BezierCurveShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -102261,7 +101107,7 @@ fail:
 
 SWIGINTERN PyObject *InflateShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__InflateShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -102375,7 +101221,7 @@ fail:
 
 SWIGINTERN PyObject *PolygonalizationShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__PolygonalizationShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -102489,7 +101335,7 @@ fail:
 
 SWIGINTERN PyObject *GuidingLinesShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__GuidingLinesShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -102603,7 +101449,7 @@ fail:
 
 SWIGINTERN PyObject *TipRemoverShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__TipRemoverShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -102740,7 +101586,7 @@ fail:
 
 SWIGINTERN PyObject *streamShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__streamShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -102889,7 +101735,7 @@ fail:
 
 SWIGINTERN PyObject *fstreamShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_StrokeShaders__fstreamShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -102925,7 +101771,7 @@ SWIGINTERN PyObject *_wrap_new_CalligraphicShader(PyObject *SWIGUNUSEDPARM(self)
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_CalligraphicShader" "', argument " "2"" of type '" "real""'");
   } 
   arg2 = static_cast< real >(val2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2Tfloat_t,  0  | 0);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_VecMat__Vec2T_float_t,  0  | 0);
   if (!SWIG_IsOK(res3)) {
     SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_CalligraphicShader" "', argument " "3"" of type '" "Geometry::Vec2f const &""'"); 
   }
@@ -103033,7 +101879,7 @@ fail:
 
 SWIGINTERN PyObject *CalligraphicShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_CalligraphicShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -103183,7 +102029,7 @@ fail:
 
 SWIGINTERN PyObject *SpatialNoiseShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_SpatialNoiseShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -103360,7 +102206,7 @@ fail:
 
 SWIGINTERN PyObject *SmoothingShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_SmoothingShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -103568,7 +102414,7 @@ fail:
 
 SWIGINTERN PyObject *Smoother_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Smoother, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -103709,7 +102555,7 @@ fail:
 
 SWIGINTERN PyObject *Omitter_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Omitter, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -103850,7 +102696,7 @@ fail:
 
 SWIGINTERN PyObject *OmissionShader_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_OmissionShader, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -103893,7 +102739,7 @@ SWIGINTERN PyObject *_wrap_Operators_chain__SWIG_0(PyObject *SWIGUNUSEDPARM(self
   PyObject *resultobj = 0;
   ViewEdgeInternal::ViewEdgeIterator *arg1 = 0 ;
   UnaryPredicate1D *arg2 = 0 ;
-  UnaryFunction1D<void > *arg3 = 0 ;
+  UnaryFunction1D< void > *arg3 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -103921,14 +102767,14 @@ SWIGINTERN PyObject *_wrap_Operators_chain__SWIG_0(PyObject *SWIGUNUSEDPARM(self
     SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_chain" "', argument " "2"" of type '" "UnaryPredicate1D &""'"); 
   }
   arg2 = reinterpret_cast< UnaryPredicate1D * >(argp2);
-  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_UnaryFunction1DTvoid_t,  0 );
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_UnaryFunction1DT_void_t,  0 );
   if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Operators_chain" "', argument " "3"" of type '" "UnaryFunction1D<void > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Operators_chain" "', argument " "3"" of type '" "UnaryFunction1D< void > &""'"); 
   }
   if (!argp3) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_chain" "', argument " "3"" of type '" "UnaryFunction1D<void > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_chain" "', argument " "3"" of type '" "UnaryFunction1D< void > &""'"); 
   }
-  arg3 = reinterpret_cast< UnaryFunction1D<void > * >(argp3);
+  arg3 = reinterpret_cast< UnaryFunction1D< void > * >(argp3);
   {
     try {
       Operators::chain(*arg1,*arg2,*arg3);
@@ -103999,7 +102845,7 @@ SWIGINTERN PyObject *_wrap_Operators_chain(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -104028,7 +102874,7 @@ SWIGINTERN PyObject *_wrap_Operators_chain(PyObject *self, PyObject *args) {
       _v = SWIG_CheckState(res);
       if (_v) {
         void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_UnaryFunction1DTvoid_t, 0);
+        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_UnaryFunction1DT_void_t, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           return _wrap_Operators_chain__SWIG_0(self, args);
@@ -104038,7 +102884,10 @@ SWIGINTERN PyObject *_wrap_Operators_chain(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Operators_chain'.\n  Possible C/C++ prototypes are:\n    chain(ViewEdgeInternal::ViewEdgeIterator &,UnaryPredicate1D &,UnaryFunction1D<void > &)\n    Operators::chain(ViewEdgeInternal::ViewEdgeIterator &,UnaryPredicate1D &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Operators_chain'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    chain(ViewEdgeInternal::ViewEdgeIterator &,UnaryPredicate1D &,UnaryFunction1D< void > &)\n"
+    "    Operators::chain(ViewEdgeInternal::ViewEdgeIterator &,UnaryPredicate1D &)\n");
   return NULL;
 }
 
@@ -104129,7 +102978,7 @@ SWIGINTERN PyObject *_wrap_Operators_bidirectionalChain(PyObject *self, PyObject
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -104158,7 +103007,10 @@ SWIGINTERN PyObject *_wrap_Operators_bidirectionalChain(PyObject *self, PyObject
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Operators_bidirectionalChain'.\n  Possible C/C++ prototypes are:\n    bidirectionalChain(ChainingIterator &,UnaryPredicate1D &)\n    Operators::bidirectionalChain(ChainingIterator &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Operators_bidirectionalChain'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    bidirectionalChain(ChainingIterator &,UnaryPredicate1D &)\n"
+    "    Operators::bidirectionalChain(ChainingIterator &)\n");
   return NULL;
 }
 
@@ -104347,7 +103199,7 @@ SWIGINTERN PyObject *_wrap_Operators_sequentialSplit(PyObject *self, PyObject *a
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -104411,14 +103263,19 @@ SWIGINTERN PyObject *_wrap_Operators_sequentialSplit(PyObject *self, PyObject *a
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Operators_sequentialSplit'.\n  Possible C/C++ prototypes are:\n    sequentialSplit(UnaryPredicate0D &,UnaryPredicate0D &,float)\n    sequentialSplit(UnaryPredicate0D &,UnaryPredicate0D &)\n    sequentialSplit(UnaryPredicate0D &,float)\n    Operators::sequentialSplit(UnaryPredicate0D &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Operators_sequentialSplit'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    sequentialSplit(UnaryPredicate0D &,UnaryPredicate0D &,float)\n"
+    "    sequentialSplit(UnaryPredicate0D &,UnaryPredicate0D &)\n"
+    "    sequentialSplit(UnaryPredicate0D &,float)\n"
+    "    Operators::sequentialSplit(UnaryPredicate0D &)\n");
   return NULL;
 }
 
 
 SWIGINTERN PyObject *_wrap_Operators_recursiveSplit__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<double > *arg1 = 0 ;
+  UnaryFunction0D< double > *arg1 = 0 ;
   UnaryPredicate1D *arg2 = 0 ;
   float arg3 ;
   void *argp1 = 0 ;
@@ -104432,14 +103289,14 @@ SWIGINTERN PyObject *_wrap_Operators_recursiveSplit__SWIG_0(PyObject *SWIGUNUSED
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:Operators_recursiveSplit",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DTdouble_t,  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DT_double_t,  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D< double > &""'"); 
   }
   if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D< double > &""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< double > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_UnaryPredicate1D,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Operators_recursiveSplit" "', argument " "2"" of type '" "UnaryPredicate1D &""'"); 
@@ -104473,7 +103330,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Operators_recursiveSplit__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<double > *arg1 = 0 ;
+  UnaryFunction0D< double > *arg1 = 0 ;
   UnaryPredicate1D *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -104483,14 +103340,14 @@ SWIGINTERN PyObject *_wrap_Operators_recursiveSplit__SWIG_1(PyObject *SWIGUNUSED
   PyObject * obj1 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OO:Operators_recursiveSplit",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DTdouble_t,  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DT_double_t,  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D< double > &""'"); 
   }
   if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D< double > &""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< double > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_UnaryPredicate1D,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Operators_recursiveSplit" "', argument " "2"" of type '" "UnaryPredicate1D &""'"); 
@@ -104519,7 +103376,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Operators_recursiveSplit__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<double > *arg1 = 0 ;
+  UnaryFunction0D< double > *arg1 = 0 ;
   UnaryPredicate0D *arg2 = 0 ;
   UnaryPredicate1D *arg3 = 0 ;
   float arg4 ;
@@ -104537,14 +103394,14 @@ SWIGINTERN PyObject *_wrap_Operators_recursiveSplit__SWIG_2(PyObject *SWIGUNUSED
   PyObject * obj3 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOOO:Operators_recursiveSplit",&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DTdouble_t,  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DT_double_t,  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D< double > &""'"); 
   }
   if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D< double > &""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< double > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_UnaryPredicate0D,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Operators_recursiveSplit" "', argument " "2"" of type '" "UnaryPredicate0D &""'"); 
@@ -104586,7 +103443,7 @@ fail:
 
 SWIGINTERN PyObject *_wrap_Operators_recursiveSplit__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
-  UnaryFunction0D<double > *arg1 = 0 ;
+  UnaryFunction0D< double > *arg1 = 0 ;
   UnaryPredicate0D *arg2 = 0 ;
   UnaryPredicate1D *arg3 = 0 ;
   void *argp1 = 0 ;
@@ -104600,14 +103457,14 @@ SWIGINTERN PyObject *_wrap_Operators_recursiveSplit__SWIG_3(PyObject *SWIGUNUSED
   PyObject * obj2 = 0 ;
   
   if (!PyArg_ParseTuple(args,(char *)"OOO:Operators_recursiveSplit",&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DTdouble_t,  0 );
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_UnaryFunction0DT_double_t,  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D< double > &""'"); 
   }
   if (!argp1) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D<double > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Operators_recursiveSplit" "', argument " "1"" of type '" "UnaryFunction0D< double > &""'"); 
   }
-  arg1 = reinterpret_cast< UnaryFunction0D<double > * >(argp1);
+  arg1 = reinterpret_cast< UnaryFunction0D< double > * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_UnaryPredicate0D,  0 );
   if (!SWIG_IsOK(res2)) {
     SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Operators_recursiveSplit" "', argument " "2"" of type '" "UnaryPredicate0D &""'"); 
@@ -104648,14 +103505,14 @@ SWIGINTERN PyObject *_wrap_Operators_recursiveSplit(PyObject *self, PyObject *ar
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 4); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DTdouble_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DT_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
@@ -104669,7 +103526,7 @@ SWIGINTERN PyObject *_wrap_Operators_recursiveSplit(PyObject *self, PyObject *ar
   if (argc == 3) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DTdouble_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DT_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
@@ -104689,7 +103546,7 @@ SWIGINTERN PyObject *_wrap_Operators_recursiveSplit(PyObject *self, PyObject *ar
   if (argc == 3) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DTdouble_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DT_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
@@ -104708,7 +103565,7 @@ SWIGINTERN PyObject *_wrap_Operators_recursiveSplit(PyObject *self, PyObject *ar
   if (argc == 4) {
     int _v;
     void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DTdouble_t, 0);
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_UnaryFunction0DT_double_t, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
@@ -104732,7 +103589,12 @@ SWIGINTERN PyObject *_wrap_Operators_recursiveSplit(PyObject *self, PyObject *ar
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Operators_recursiveSplit'.\n  Possible C/C++ prototypes are:\n    recursiveSplit(UnaryFunction0D<double > &,UnaryPredicate1D &,float)\n    recursiveSplit(UnaryFunction0D<double > &,UnaryPredicate1D &)\n    recursiveSplit(UnaryFunction0D<double > &,UnaryPredicate0D &,UnaryPredicate1D &,float)\n    Operators::recursiveSplit(UnaryFunction0D<double > &,UnaryPredicate0D &,UnaryPredicate1D &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Operators_recursiveSplit'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    recursiveSplit(UnaryFunction0D< double > &,UnaryPredicate1D &,float)\n"
+    "    recursiveSplit(UnaryFunction0D< double > &,UnaryPredicate1D &)\n"
+    "    recursiveSplit(UnaryFunction0D< double > &,UnaryPredicate0D &,UnaryPredicate1D &,float)\n"
+    "    Operators::recursiveSplit(UnaryFunction0D< double > &,UnaryPredicate0D &,UnaryPredicate1D &)\n");
   return NULL;
 }
 
@@ -104774,7 +103636,7 @@ fail:
 SWIGINTERN PyObject *_wrap_Operators_create(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   UnaryPredicate1D *arg1 = 0 ;
-  std::vector<StrokeShader * > arg2 ;
+  std::vector< StrokeShader * > arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -104790,10 +103652,10 @@ SWIGINTERN PyObject *_wrap_Operators_create(PyObject *SWIGUNUSEDPARM(self), PyOb
   }
   arg1 = reinterpret_cast< UnaryPredicate1D * >(argp1);
   {
-    std::vector<StrokeShader*,std::allocator<StrokeShader * > > *ptr = (std::vector<StrokeShader*,std::allocator<StrokeShader * > > *)0;
+    std::vector<StrokeShader*,std::allocator< StrokeShader * > > *ptr = (std::vector<StrokeShader*,std::allocator< StrokeShader * > > *)0;
     int res = swig::asptr(obj1, &ptr);
     if (!SWIG_IsOK(res) || !ptr) {
-      SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "Operators_create" "', argument " "2"" of type '" "std::vector<StrokeShader * >""'"); 
+      SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "Operators_create" "', argument " "2"" of type '" "std::vector< StrokeShader * >""'"); 
     }
     arg2 = *ptr;
     if (SWIG_IsNewObj(res)) delete ptr;
@@ -105015,7 +103877,7 @@ fail:
 
 SWIGINTERN PyObject *Operators_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Operators, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -105133,7 +103995,7 @@ fail:
 
 SWIGINTERN PyObject *ltstr_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_ltstr, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -105918,7 +104780,7 @@ SWIGINTERN PyObject *_wrap_Canvas_loadMap(PyObject *self, PyObject *args) {
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 5); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -105993,7 +104855,11 @@ SWIGINTERN PyObject *_wrap_Canvas_loadMap(PyObject *self, PyObject *args) {
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Canvas_loadMap'.\n  Possible C/C++ prototypes are:\n    loadMap(char const *,char const *,unsigned int,float)\n    loadMap(char const *,char const *,unsigned int)\n    loadMap(char const *,char const *)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Canvas_loadMap'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    loadMap(Canvas *,char const *,char const *,unsigned int,float)\n"
+    "    loadMap(Canvas *,char const *,char const *,unsigned int)\n"
+    "    loadMap(Canvas *,char const *,char const *)\n");
   return NULL;
 }
 
@@ -106211,7 +105077,7 @@ SWIGINTERN PyObject *_wrap_Canvas_selectedFEdge(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 1); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -106235,7 +105101,10 @@ SWIGINTERN PyObject *_wrap_Canvas_selectedFEdge(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Canvas_selectedFEdge'.\n  Possible C/C++ prototypes are:\n    selectedFEdge()\n    selectedFEdge()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Canvas_selectedFEdge'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    selectedFEdge(Canvas const *)\n"
+    "    selectedFEdge(Canvas *)\n");
   return NULL;
 }
 
@@ -106339,7 +105208,7 @@ fail:
 SWIGINTERN PyObject *_wrap_Canvas_scene3DBBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   Canvas *arg1 = (Canvas *) 0 ;
-  SwigValueWrapper<BBox<VecMat::Vec3<double > > > result;
+  SwigValueWrapper< BBox< VecMat::Vec3< double > > > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
@@ -106361,7 +105230,7 @@ SWIGINTERN PyObject *_wrap_Canvas_scene3DBBox(PyObject *SWIGUNUSEDPARM(self), Py
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_NewPointerObj((new BBox<Geometry::Vec3r >(static_cast< const BBox<Geometry::Vec3r >& >(result))), SWIGTYPE_p_BBoxTVecMat__Vec3Tdouble_t_t, SWIG_POINTER_OWN |  0 );
+  resultobj = SWIG_NewPointerObj((new BBox< Geometry::Vec3r >(static_cast< const BBox< Geometry::Vec3r >& >(result))), SWIGTYPE_p_BBoxT_VecMat__Vec3T_double_t_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -106897,7 +105766,7 @@ SWIGINTERN PyObject *_wrap_Canvas_changePaperTexture(PyObject *self, PyObject *a
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -106927,7 +105796,10 @@ SWIGINTERN PyObject *_wrap_Canvas_changePaperTexture(PyObject *self, PyObject *a
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Canvas_changePaperTexture'.\n  Possible C/C++ prototypes are:\n    changePaperTexture(bool)\n    changePaperTexture()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Canvas_changePaperTexture'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    changePaperTexture(Canvas *,bool)\n"
+    "    changePaperTexture(Canvas *)\n");
   return NULL;
 }
 
@@ -107040,7 +105912,7 @@ SWIGINTERN PyObject *_wrap_Canvas_resetModified(PyObject *self, PyObject *args)
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 2); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -107070,7 +105942,10 @@ SWIGINTERN PyObject *_wrap_Canvas_resetModified(PyObject *self, PyObject *args)
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Canvas_resetModified'.\n  Possible C/C++ prototypes are:\n    resetModified(bool)\n    resetModified()\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Canvas_resetModified'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    resetModified(Canvas *,bool)\n"
+    "    resetModified(Canvas *)\n");
   return NULL;
 }
 
@@ -107078,7 +105953,7 @@ fail:
 SWIGINTERN PyObject *_wrap_Canvas_causalStyleModules__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   Canvas *arg1 = (Canvas *) 0 ;
-  std::vector<unsigned int,std::allocator<unsigned int > > *arg2 = 0 ;
+  std::vector< unsigned int,std::allocator< unsigned int > > *arg2 = 0 ;
   unsigned int arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -107096,14 +105971,14 @@ SWIGINTERN PyObject *_wrap_Canvas_causalStyleModules__SWIG_0(PyObject *SWIGUNUSE
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_causalStyleModules" "', argument " "1"" of type '" "Canvas *""'"); 
   }
   arg1 = reinterpret_cast< Canvas * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTunsigned_int_std__allocatorTunsigned_int_t_t,  0 );
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Canvas_causalStyleModules" "', argument " "2"" of type '" "std::vector<unsigned int,std::allocator<unsigned int > > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Canvas_causalStyleModules" "', argument " "2"" of type '" "std::vector< unsigned int,std::allocator< unsigned int > > &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Canvas_causalStyleModules" "', argument " "2"" of type '" "std::vector<unsigned int,std::allocator<unsigned int > > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Canvas_causalStyleModules" "', argument " "2"" of type '" "std::vector< unsigned int,std::allocator< unsigned int > > &""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<unsigned int,std::allocator<unsigned int > > * >(argp2);
+  arg2 = reinterpret_cast< std::vector< unsigned int,std::allocator< unsigned int > > * >(argp2);
   ecode3 = SWIG_AsVal_unsigned_SS_int(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Canvas_causalStyleModules" "', argument " "3"" of type '" "unsigned int""'");
@@ -107130,7 +106005,7 @@ fail:
 SWIGINTERN PyObject *_wrap_Canvas_causalStyleModules__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   Canvas *arg1 = (Canvas *) 0 ;
-  std::vector<unsigned int,std::allocator<unsigned int > > *arg2 = 0 ;
+  std::vector< unsigned int,std::allocator< unsigned int > > *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -107144,14 +106019,14 @@ SWIGINTERN PyObject *_wrap_Canvas_causalStyleModules__SWIG_1(PyObject *SWIGUNUSE
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Canvas_causalStyleModules" "', argument " "1"" of type '" "Canvas *""'"); 
   }
   arg1 = reinterpret_cast< Canvas * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorTunsigned_int_std__allocatorTunsigned_int_t_t,  0 );
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Canvas_causalStyleModules" "', argument " "2"" of type '" "std::vector<unsigned int,std::allocator<unsigned int > > &""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Canvas_causalStyleModules" "', argument " "2"" of type '" "std::vector< unsigned int,std::allocator< unsigned int > > &""'"); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Canvas_causalStyleModules" "', argument " "2"" of type '" "std::vector<unsigned int,std::allocator<unsigned int > > &""'"); 
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Canvas_causalStyleModules" "', argument " "2"" of type '" "std::vector< unsigned int,std::allocator< unsigned int > > &""'"); 
   }
-  arg2 = reinterpret_cast< std::vector<unsigned int,std::allocator<unsigned int > > * >(argp2);
+  arg2 = reinterpret_cast< std::vector< unsigned int,std::allocator< unsigned int > > * >(argp2);
   {
     try {
       (arg1)->causalStyleModules(*arg2);
@@ -107176,7 +106051,7 @@ SWIGINTERN PyObject *_wrap_Canvas_causalStyleModules(PyObject *self, PyObject *a
   int ii;
   
   if (!PyTuple_Check(args)) SWIG_fail;
-  argc = PyObject_Length(args);
+  argc = (int)PyObject_Length(args);
   for (ii = 0; (ii < argc) && (ii < 3); ii++) {
     argv[ii] = PyTuple_GET_ITEM(args,ii);
   }
@@ -107187,7 +106062,7 @@ SWIGINTERN PyObject *_wrap_Canvas_causalStyleModules(PyObject *self, PyObject *a
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_std__vectorTunsigned_int_std__allocatorTunsigned_int_t_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_Canvas_causalStyleModules__SWIG_1(self, args);
@@ -107201,7 +106076,7 @@ SWIGINTERN PyObject *_wrap_Canvas_causalStyleModules(PyObject *self, PyObject *a
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_std__vectorTunsigned_int_std__allocatorTunsigned_int_t_t, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         {
@@ -107216,7 +106091,10 @@ SWIGINTERN PyObject *_wrap_Canvas_causalStyleModules(PyObject *self, PyObject *a
   }
   
 fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Canvas_causalStyleModules'.\n  Possible C/C++ prototypes are:\n    causalStyleModules(std::vector<unsigned int,std::allocator<unsigned int > > &,unsigned int)\n    causalStyleModules(std::vector<unsigned int,std::allocator<unsigned int > > &)\n");
+  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'Canvas_causalStyleModules'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    causalStyleModules(Canvas *,std::vector< unsigned int,std::allocator< unsigned int > > &,unsigned int)\n"
+    "    causalStyleModules(Canvas *,std::vector< unsigned int,std::allocator< unsigned int > > &)\n");
   return NULL;
 }
 
@@ -107272,7 +106150,7 @@ fail:
 
 SWIGINTERN PyObject *Canvas_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O|swigregister", &obj)) return NULL;
+  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
   SWIG_TypeNewClientData(SWIGTYPE_p_Canvas, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
@@ -107293,7 +106171,7 @@ SWIGINTERN PyObject *_wrap_castToSVertex(PyObject *SWIGUNUSEDPARM(self), PyObjec
   arg1 = reinterpret_cast< Interface0D * >(argp1);
   {
     try {
-      result = (SVertex *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast<Interface0D,SVertex >(arg1);
+      result = (SVertex *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast< Interface0D,SVertex >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -107325,7 +106203,7 @@ SWIGINTERN PyObject *_wrap_castToViewVertex(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg1 = reinterpret_cast< Interface0D * >(argp1);
   {
     try {
-      result = (ViewVertex *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast<Interface0D,ViewVertex >(arg1);
+      result = (ViewVertex *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast< Interface0D,ViewVertex >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -107357,7 +106235,7 @@ SWIGINTERN PyObject *_wrap_castToTVertex(PyObject *SWIGUNUSEDPARM(self), PyObjec
   arg1 = reinterpret_cast< Interface0D * >(argp1);
   {
     try {
-      result = (TVertex *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast<Interface0D,TVertex >(arg1);
+      result = (TVertex *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast< Interface0D,TVertex >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -107389,7 +106267,7 @@ SWIGINTERN PyObject *_wrap_castToCurvePoint(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg1 = reinterpret_cast< Interface0D * >(argp1);
   {
     try {
-      result = (CurvePoint *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast<Interface0D,CurvePoint >(arg1);
+      result = (CurvePoint *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast< Interface0D,CurvePoint >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -107421,7 +106299,7 @@ SWIGINTERN PyObject *_wrap_castToStrokeVertex(PyObject *SWIGUNUSEDPARM(self), Py
   arg1 = reinterpret_cast< Interface0D * >(argp1);
   {
     try {
-      result = (StrokeVertex *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast<Interface0D,StrokeVertex >(arg1);
+      result = (StrokeVertex *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast< Interface0D,StrokeVertex >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -107453,7 +106331,7 @@ SWIGINTERN PyObject *_wrap_castToNonTVertex(PyObject *SWIGUNUSEDPARM(self), PyOb
   arg1 = reinterpret_cast< Interface0D * >(argp1);
   {
     try {
-      result = (NonTVertex *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast<Interface0D,NonTVertex >(arg1);
+      result = (NonTVertex *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast< Interface0D,NonTVertex >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -107485,7 +106363,7 @@ SWIGINTERN PyObject *_wrap_castToFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject
   arg1 = reinterpret_cast< Interface1D * >(argp1);
   {
     try {
-      result = (FEdge *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast<Interface1D,FEdge >(arg1);
+      result = (FEdge *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast< Interface1D,FEdge >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -107517,7 +106395,7 @@ SWIGINTERN PyObject *_wrap_castToViewEdge(PyObject *SWIGUNUSEDPARM(self), PyObje
   arg1 = reinterpret_cast< Interface1D * >(argp1);
   {
     try {
-      result = (ViewEdge *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast<Interface1D,ViewEdge >(arg1);
+      result = (ViewEdge *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast< Interface1D,ViewEdge >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -107549,7 +106427,7 @@ SWIGINTERN PyObject *_wrap_castToStroke(PyObject *SWIGUNUSEDPARM(self), PyObject
   arg1 = reinterpret_cast< Interface1D * >(argp1);
   {
     try {
-      result = (Stroke *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast<Interface1D,Stroke >(arg1);
+      result = (Stroke *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast< Interface1D,Stroke >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -107581,7 +106459,7 @@ SWIGINTERN PyObject *_wrap_castToChain(PyObject *SWIGUNUSEDPARM(self), PyObject
   arg1 = reinterpret_cast< Interface1D * >(argp1);
   {
     try {
-      result = (Chain *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast<Interface1D,Chain >(arg1);
+      result = (Chain *)Cast::SWIGTEMPLATEDISAMBIGUATOR cast< Interface1D,Chain >(arg1);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -109842,395 +108720,395 @@ static PyMethodDef SwigMethods[] = {
 
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
 
-static void *_p_Functions0D__GetOccludersF0DTo_p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t(void *x) {
-    return (void *)((UnaryFunction0D<std::vector<ViewShape *,std::allocator<ViewShape * > > > *)  ((Functions0D::GetOccludersF0D *) x));
+static void *_p_Functions0D__GetOccludersF0DTo_p_UnaryFunction0DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< std::vector< ViewShape *,std::allocator< ViewShape * > > > *)  ((Functions0D::GetOccludersF0D *) x));
 }
-static void *_p_Functions1D__GetOccludeeF1DTo_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t(void *x) {
-    return (void *)((UnaryFunction1D<std::vector<ViewShape *,std::allocator<ViewShape * > > > *)  ((Functions1D::GetOccludeeF1D *) x));
+static void *_p_Functions1D__GetOccludeeF1DTo_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< std::vector< ViewShape *,std::allocator< ViewShape * > > > *)  ((Functions1D::GetOccludeeF1D *) x));
 }
-static void *_p_Functions1D__GetShapeF1DTo_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t(void *x) {
-    return (void *)((UnaryFunction1D<std::vector<ViewShape *,std::allocator<ViewShape * > > > *)  ((Functions1D::GetShapeF1D *) x));
+static void *_p_Functions1D__GetShapeF1DTo_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< std::vector< ViewShape *,std::allocator< ViewShape * > > > *)  ((Functions1D::GetShapeF1D *) x));
 }
-static void *_p_Functions1D__GetOccludersF1DTo_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t(void *x) {
-    return (void *)((UnaryFunction1D<std::vector<ViewShape *,std::allocator<ViewShape * > > > *)  ((Functions1D::GetOccludersF1D *) x));
+static void *_p_Functions1D__GetOccludersF1DTo_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< std::vector< ViewShape *,std::allocator< ViewShape * > > > *)  ((Functions1D::GetOccludersF1D *) x));
 }
-static void *_p_TVertexTo_p_Interface0D(void *x) {
+static void *_p_TVertexTo_p_Interface0D(void *x, int *newmemory) {
     return (void *)((Interface0D *) (ViewVertex *) ((TVertex *) x));
 }
-static void *_p_NonTVertexTo_p_Interface0D(void *x) {
+static void *_p_NonTVertexTo_p_Interface0D(void *x, int *newmemory) {
     return (void *)((Interface0D *) (ViewVertex *) ((NonTVertex *) x));
 }
-static void *_p_SVertexTo_p_Interface0D(void *x) {
+static void *_p_SVertexTo_p_Interface0D(void *x, int *newmemory) {
     return (void *)((Interface0D *)  ((SVertex *) x));
 }
-static void *_p_ViewVertexTo_p_Interface0D(void *x) {
+static void *_p_ViewVertexTo_p_Interface0D(void *x, int *newmemory) {
     return (void *)((Interface0D *)  ((ViewVertex *) x));
 }
-static void *_p_StrokeVertexTo_p_Interface0D(void *x) {
+static void *_p_StrokeVertexTo_p_Interface0D(void *x, int *newmemory) {
     return (void *)((Interface0D *) (CurvePoint *) ((StrokeVertex *) x));
 }
-static void *_p_CurvePointTo_p_Interface0D(void *x) {
+static void *_p_CurvePointTo_p_Interface0D(void *x, int *newmemory) {
     return (void *)((Interface0D *)  ((CurvePoint *) x));
 }
-static void *_p_Functions0D__GetShapeF0DTo_p_UnaryFunction0DTViewShape_p_t(void *x) {
-    return (void *)((UnaryFunction0D<ViewShape * > *)  ((Functions0D::GetShapeF0D *) x));
+static void *_p_Functions0D__GetShapeF0DTo_p_UnaryFunction0DT_ViewShape_p_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< ViewShape * > *)  ((Functions0D::GetShapeF0D *) x));
 }
-static void *_p_Functions0D__GetOccludeeF0DTo_p_UnaryFunction0DTViewShape_p_t(void *x) {
-    return (void *)((UnaryFunction0D<ViewShape * > *)  ((Functions0D::GetOccludeeF0D *) x));
+static void *_p_Functions0D__GetOccludeeF0DTo_p_UnaryFunction0DT_ViewShape_p_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< ViewShape * > *)  ((Functions0D::GetOccludeeF0D *) x));
 }
-static void *_p_ChainSilhouetteIteratorTo_p_ChainingIterator(void *x) {
+static void *_p_ChainSilhouetteIteratorTo_p_ChainingIterator(void *x, int *newmemory) {
     return (void *)((ChainingIterator *)  ((ChainSilhouetteIterator *) x));
 }
-static void *_p_ChainPredicateIteratorTo_p_ChainingIterator(void *x) {
+static void *_p_ChainPredicateIteratorTo_p_ChainingIterator(void *x, int *newmemory) {
     return (void *)((ChainingIterator *)  ((ChainPredicateIterator *) x));
 }
-static void *_p_ChainingIteratorTo_p_ViewEdgeInternal__ViewEdgeIterator(void *x) {
+static void *_p_ChainingIteratorTo_p_ViewEdgeInternal__ViewEdgeIterator(void *x, int *newmemory) {
     return (void *)((ViewEdgeInternal::ViewEdgeIterator *)  ((ChainingIterator *) x));
 }
-static void *_p_ChainSilhouetteIteratorTo_p_ViewEdgeInternal__ViewEdgeIterator(void *x) {
+static void *_p_ChainSilhouetteIteratorTo_p_ViewEdgeInternal__ViewEdgeIterator(void *x, int *newmemory) {
     return (void *)((ViewEdgeInternal::ViewEdgeIterator *) (ChainingIterator *) ((ChainSilhouetteIterator *) x));
 }
-static void *_p_ChainPredicateIteratorTo_p_ViewEdgeInternal__ViewEdgeIterator(void *x) {
+static void *_p_ChainPredicateIteratorTo_p_ViewEdgeInternal__ViewEdgeIterator(void *x, int *newmemory) {
     return (void *)((ViewEdgeInternal::ViewEdgeIterator *) (ChainingIterator *) ((ChainPredicateIterator *) x));
 }
-static void *_p_ViewEdgeTo_p_Interface1D(void *x) {
+static void *_p_ViewEdgeTo_p_Interface1D(void *x, int *newmemory) {
     return (void *)((Interface1D *)  ((ViewEdge *) x));
 }
-static void *_p_StrokeTo_p_Interface1D(void *x) {
+static void *_p_StrokeTo_p_Interface1D(void *x, int *newmemory) {
     return (void *)((Interface1D *)  ((Stroke *) x));
 }
-static void *_p_CurveTo_p_Interface1D(void *x) {
+static void *_p_CurveTo_p_Interface1D(void *x, int *newmemory) {
     return (void *)((Interface1D *)  ((Curve *) x));
 }
-static void *_p_FEdgeSharpTo_p_Interface1D(void *x) {
+static void *_p_FEdgeSharpTo_p_Interface1D(void *x, int *newmemory) {
     return (void *)((Interface1D *) (FEdge *) ((FEdgeSharp *) x));
 }
-static void *_p_FEdgeSmoothTo_p_Interface1D(void *x) {
+static void *_p_FEdgeSmoothTo_p_Interface1D(void *x, int *newmemory) {
     return (void *)((Interface1D *) (FEdge *) ((FEdgeSmooth *) x));
 }
-static void *_p_FEdgeTo_p_Interface1D(void *x) {
+static void *_p_FEdgeTo_p_Interface1D(void *x, int *newmemory) {
     return (void *)((Interface1D *)  ((FEdge *) x));
 }
-static void *_p_VecMat__Vec2Tint_tTo_p_VecMat__VecTint_2_t(void *x) {
-    return (void *)((VecMat::Vec<int,2 > *)  ((VecMat::Vec2<int > *) x));
+static void *_p_VecMat__Vec2T_int_tTo_p_VecMat__VecT_int_2_t(void *x, int *newmemory) {
+    return (void *)((VecMat::Vec< int,2 > *)  ((VecMat::Vec2< int > *) x));
 }
-static void *_p_VecMat__Vec2Tunsigned_int_tTo_p_VecMat__VecTunsigned_int_2_t(void *x) {
-    return (void *)((VecMat::Vec<unsigned int,2 > *)  ((VecMat::Vec2<unsigned int > *) x));
+static void *_p_VecMat__Vec2T_unsigned_int_tTo_p_VecMat__VecT_unsigned_int_2_t(void *x, int *newmemory) {
+    return (void *)((VecMat::Vec< unsigned int,2 > *)  ((VecMat::Vec2< unsigned int > *) x));
 }
-static void *_p_VecMat__Vec3Tint_tTo_p_VecMat__VecTint_3_t(void *x) {
-    return (void *)((VecMat::Vec<int,3 > *)  ((VecMat::Vec3<int > *) x));
+static void *_p_VecMat__Vec3T_int_tTo_p_VecMat__VecT_int_3_t(void *x, int *newmemory) {
+    return (void *)((VecMat::Vec< int,3 > *)  ((VecMat::Vec3< int > *) x));
 }
-static void *_p_VecMat__Vec3Tunsigned_int_tTo_p_VecMat__VecTunsigned_int_3_t(void *x) {
-    return (void *)((VecMat::Vec<unsigned int,3 > *)  ((VecMat::Vec3<unsigned int > *) x));
+static void *_p_VecMat__Vec3T_unsigned_int_tTo_p_VecMat__VecT_unsigned_int_3_t(void *x, int *newmemory) {
+    return (void *)((VecMat::Vec< unsigned int,3 > *)  ((VecMat::Vec3< unsigned int > *) x));
 }
-static void *_p_StrokeVertexTo_p_CurvePoint(void *x) {
+static void *_p_StrokeVertexTo_p_CurvePoint(void *x, int *newmemory) {
     return (void *)((CurvePoint *)  ((StrokeVertex *) x));
 }
-static void *_p_Predicates0D__TrueUP0DTo_p_UnaryPredicate0D(void *x) {
+static void *_p_Predicates0D__TrueUP0DTo_p_UnaryPredicate0D(void *x, int *newmemory) {
     return (void *)((UnaryPredicate0D *)  ((Predicates0D::TrueUP0D *) x));
 }
-static void *_p_Predicates0D__FalseUP0DTo_p_UnaryPredicate0D(void *x) {
+static void *_p_Predicates0D__FalseUP0DTo_p_UnaryPredicate0D(void *x, int *newmemory) {
     return (void *)((UnaryPredicate0D *)  ((Predicates0D::FalseUP0D *) x));
 }
-static void *_p_FEdgeSharpTo_p_FEdge(void *x) {
+static void *_p_FEdgeSharpTo_p_FEdge(void *x, int *newmemory) {
     return (void *)((FEdge *)  ((FEdgeSharp *) x));
 }
-static void *_p_FEdgeSmoothTo_p_FEdge(void *x) {
+static void *_p_FEdgeSmoothTo_p_FEdge(void *x, int *newmemory) {
     return (void *)((FEdge *)  ((FEdgeSmooth *) x));
 }
-static void *_p_StrokeShaders__ConstrainedIncreasingThicknessShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__ConstrainedIncreasingThicknessShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::ConstrainedIncreasingThicknessShader *) x));
 }
-static void *_p_StrokeShaders__ColorNoiseShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__ColorNoiseShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::ColorNoiseShader *) x));
 }
-static void *_p_StrokeShaders__ThicknessNoiseShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__ThicknessNoiseShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::ThicknessNoiseShader *) x));
 }
-static void *_p_StrokeShaders__LengthDependingThicknessShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__LengthDependingThicknessShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::LengthDependingThicknessShader *) x));
 }
-static void *_p_StrokeShaders__IncreasingThicknessShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__IncreasingThicknessShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::IncreasingThicknessShader *) x));
 }
-static void *_p_StrokeShaders__ConstantExternThicknessShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__ConstantExternThicknessShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::ConstantExternThicknessShader *) x));
 }
-static void *_p_StrokeShaders__ConstantThicknessShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__ConstantThicknessShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::ConstantThicknessShader *) x));
 }
-static void *_p_StrokeShaders__StrokeTextureShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__StrokeTextureShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::StrokeTextureShader *) x));
 }
-static void *_p_StrokeShaders__SamplingShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__SamplingShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::SamplingShader *) x));
 }
-static void *_p_StrokeShaders__BSplineShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__BSplineShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::BSplineShader *) x));
 }
-static void *_p_StrokeShaders__BezierCurveShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__BezierCurveShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::BezierCurveShader *) x));
 }
-static void *_p_StrokeShaders__InflateShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__InflateShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::InflateShader *) x));
 }
-static void *_p_StrokeShaders__GuidingLinesShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__GuidingLinesShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::GuidingLinesShader *) x));
 }
-static void *_p_StrokeShaders__streamShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__streamShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::streamShader *) x));
 }
-static void *_p_StrokeShaders__fstreamShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__fstreamShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::fstreamShader *) x));
 }
-static void *_p_CalligraphicShaderTo_p_StrokeShader(void *x) {
+static void *_p_CalligraphicShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((CalligraphicShader *) x));
 }
-static void *_p_SpatialNoiseShaderTo_p_StrokeShader(void *x) {
+static void *_p_SpatialNoiseShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((SpatialNoiseShader *) x));
 }
-static void *_p_SmoothingShaderTo_p_StrokeShader(void *x) {
+static void *_p_SmoothingShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((SmoothingShader *) x));
 }
-static void *_p_StrokeShaders__TextureAssignerShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__TextureAssignerShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::TextureAssignerShader *) x));
 }
-static void *_p_StrokeShaders__CalligraphicColorShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__CalligraphicColorShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::CalligraphicColorShader *) x));
 }
-static void *_p_StrokeShaders__MaterialColorShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__MaterialColorShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::MaterialColorShader *) x));
 }
-static void *_p_StrokeShaders__ColorVariationPatternShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__ColorVariationPatternShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::ColorVariationPatternShader *) x));
 }
-static void *_p_StrokeShaders__IncreasingColorShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__IncreasingColorShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::IncreasingColorShader *) x));
 }
-static void *_p_StrokeShaders__ConstantColorShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__ConstantColorShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::ConstantColorShader *) x));
 }
-static void *_p_StrokeShaders__ThicknessVariationPatternShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__ThicknessVariationPatternShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::ThicknessVariationPatternShader *) x));
 }
-static void *_p_StrokeShaders__BackboneStretcherShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__BackboneStretcherShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::BackboneStretcherShader *) x));
 }
-static void *_p_StrokeShaders__ExternalContourStretcherShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__ExternalContourStretcherShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::ExternalContourStretcherShader *) x));
 }
-static void *_p_StrokeShaders__PolygonalizationShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__PolygonalizationShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::PolygonalizationShader *) x));
 }
-static void *_p_StrokeShaders__TipRemoverShaderTo_p_StrokeShader(void *x) {
+static void *_p_StrokeShaders__TipRemoverShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((StrokeShaders::TipRemoverShader *) x));
 }
-static void *_p_OmissionShaderTo_p_StrokeShader(void *x) {
+static void *_p_OmissionShaderTo_p_StrokeShader(void *x, int *newmemory) {
     return (void *)((StrokeShader *)  ((OmissionShader *) x));
 }
-static void *_p_OmitterTo_p_Smoother(void *x) {
+static void *_p_OmitterTo_p_Smoother(void *x, int *newmemory) {
     return (void *)((Smoother *)  ((Omitter *) x));
 }
-static void *_p_Predicates1D__Length2DBP1DTo_p_BinaryPredicate1D(void *x) {
+static void *_p_Predicates1D__Length2DBP1DTo_p_BinaryPredicate1D(void *x, int *newmemory) {
     return (void *)((BinaryPredicate1D *)  ((Predicates1D::Length2DBP1D *) x));
 }
-static void *_p_Predicates1D__FalseBP1DTo_p_BinaryPredicate1D(void *x) {
+static void *_p_Predicates1D__FalseBP1DTo_p_BinaryPredicate1D(void *x, int *newmemory) {
     return (void *)((BinaryPredicate1D *)  ((Predicates1D::FalseBP1D *) x));
 }
-static void *_p_Predicates1D__ViewMapGradientNormBP1DTo_p_BinaryPredicate1D(void *x) {
+static void *_p_Predicates1D__ViewMapGradientNormBP1DTo_p_BinaryPredicate1D(void *x, int *newmemory) {
     return (void *)((BinaryPredicate1D *)  ((Predicates1D::ViewMapGradientNormBP1D *) x));
 }
-static void *_p_Predicates1D__TrueBP1DTo_p_BinaryPredicate1D(void *x) {
+static void *_p_Predicates1D__TrueBP1DTo_p_BinaryPredicate1D(void *x, int *newmemory) {
     return (void *)((BinaryPredicate1D *)  ((Predicates1D::TrueBP1D *) x));
 }
-static void *_p_Predicates1D__SameShapeIdBP1DTo_p_BinaryPredicate1D(void *x) {
+static void *_p_Predicates1D__SameShapeIdBP1DTo_p_BinaryPredicate1D(void *x, int *newmemory) {
     return (void *)((BinaryPredicate1D *)  ((Predicates1D::SameShapeIdBP1D *) x));
 }
-static void *_p_Predicates1D__FalseUP1DTo_p_UnaryPredicate1D(void *x) {
+static void *_p_Predicates1D__FalseUP1DTo_p_UnaryPredicate1D(void *x, int *newmemory) {
     return (void *)((UnaryPredicate1D *)  ((Predicates1D::FalseUP1D *) x));
 }
-static void *_p_Predicates1D__ShapeUP1DTo_p_UnaryPredicate1D(void *x) {
+static void *_p_Predicates1D__ShapeUP1DTo_p_UnaryPredicate1D(void *x, int *newmemory) {
     return (void *)((UnaryPredicate1D *)  ((Predicates1D::ShapeUP1D *) x));
 }
-static void *_p_Predicates1D__DensityLowerThanUP1DTo_p_UnaryPredicate1D(void *x) {
+static void *_p_Predicates1D__DensityLowerThanUP1DTo_p_UnaryPredicate1D(void *x, int *newmemory) {
     return (void *)((UnaryPredicate1D *)  ((Predicates1D::DensityLowerThanUP1D *) x));
 }
-static void *_p_Predicates1D__EqualToTimeStampUP1DTo_p_UnaryPredicate1D(void *x) {
+static void *_p_Predicates1D__EqualToTimeStampUP1DTo_p_UnaryPredicate1D(void *x, int *newmemory) {
     return (void *)((UnaryPredicate1D *)  ((Predicates1D::EqualToTimeStampUP1D *) x));
 }
-static void *_p_Predicates1D__EqualToChainingTimeStampUP1DTo_p_UnaryPredicate1D(void *x) {
+static void *_p_Predicates1D__EqualToChainingTimeStampUP1DTo_p_UnaryPredicate1D(void *x, int *newmemory) {
     return (void *)((UnaryPredicate1D *)  ((Predicates1D::EqualToChainingTimeStampUP1D *) x));
 }
-static void *_p_Predicates1D__TrueUP1DTo_p_UnaryPredicate1D(void *x) {
+static void *_p_Predicates1D__TrueUP1DTo_p_UnaryPredicate1D(void *x, int *newmemory) {
     return (void *)((UnaryPredicate1D *)  ((Predicates1D::TrueUP1D *) x));
 }
-static void *_p_Predicates1D__QuantitativeInvisibilityUP1DTo_p_UnaryPredicate1D(void *x) {
+static void *_p_Predicates1D__QuantitativeInvisibilityUP1DTo_p_UnaryPredicate1D(void *x, int *newmemory) {
     return (void *)((UnaryPredicate1D *)  ((Predicates1D::QuantitativeInvisibilityUP1D *) x));
 }
-static void *_p_Predicates1D__ContourUP1DTo_p_UnaryPredicate1D(void *x) {
+static void *_p_Predicates1D__ContourUP1DTo_p_UnaryPredicate1D(void *x, int *newmemory) {
     return (void *)((UnaryPredicate1D *)  ((Predicates1D::ContourUP1D *) x));
 }
-static void *_p_Predicates1D__ExternalContourUP1DTo_p_UnaryPredicate1D(void *x) {
+static void *_p_Predicates1D__ExternalContourUP1DTo_p_UnaryPredicate1D(void *x, int *newmemory) {
     return (void *)((UnaryPredicate1D *)  ((Predicates1D::ExternalContourUP1D *) x));
 }
-static void *_p_VecMat__Vec2Tfloat_tTo_p_VecMat__VecTfloat_2_t(void *x) {
-    return (void *)((VecMat::Vec<float,2 > *)  ((VecMat::Vec2<float > *) x));
+static void *_p_VecMat__Vec2T_float_tTo_p_VecMat__VecT_float_2_t(void *x, int *newmemory) {
+    return (void *)((VecMat::Vec< float,2 > *)  ((VecMat::Vec2< float > *) x));
 }
-static void *_p_Functions1D__TimeStampF1DTo_p_UnaryFunction1DTvoid_t(void *x) {
-    return (void *)((UnaryFunction1D<void > *)  ((Functions1D::TimeStampF1D *) x));
+static void *_p_Functions1D__TimeStampF1DTo_p_UnaryFunction1DT_void_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< void > *)  ((Functions1D::TimeStampF1D *) x));
 }
-static void *_p_Functions1D__IncrementChainingTimeStampF1DTo_p_UnaryFunction1DTvoid_t(void *x) {
-    return (void *)((UnaryFunction1D<void > *)  ((Functions1D::IncrementChainingTimeStampF1D *) x));
+static void *_p_Functions1D__IncrementChainingTimeStampF1DTo_p_UnaryFunction1DT_void_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< void > *)  ((Functions1D::IncrementChainingTimeStampF1D *) x));
 }
-static void *_p_Functions1D__ChainingTimeStampF1DTo_p_UnaryFunction1DTvoid_t(void *x) {
-    return (void *)((UnaryFunction1D<void > *)  ((Functions1D::ChainingTimeStampF1D *) x));
+static void *_p_Functions1D__ChainingTimeStampF1DTo_p_UnaryFunction1DT_void_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< void > *)  ((Functions1D::ChainingTimeStampF1D *) x));
 }
-static void *_p_VecMat__Vec3Tfloat_tTo_p_VecMat__VecTfloat_3_t(void *x) {
-    return (void *)((VecMat::Vec<float,3 > *)  ((VecMat::Vec3<float > *) x));
+static void *_p_VecMat__Vec3T_float_tTo_p_VecMat__VecT_float_3_t(void *x, int *newmemory) {
+    return (void *)((VecMat::Vec< float,3 > *)  ((VecMat::Vec3< float > *) x));
 }
-static void *_p_FEdgeInternal__SVertexIteratorTo_p_Interface0DIteratorNested(void *x) {
+static void *_p_FEdgeInternal__SVertexIteratorTo_p_Interface0DIteratorNested(void *x, int *newmemory) {
     return (void *)((Interface0DIteratorNested *)  ((FEdgeInternal::SVertexIterator *) x));
 }
-static void *_p_ViewEdgeInternal__SVertexIteratorTo_p_Interface0DIteratorNested(void *x) {
+static void *_p_ViewEdgeInternal__SVertexIteratorTo_p_Interface0DIteratorNested(void *x, int *newmemory) {
     return (void *)((Interface0DIteratorNested *)  ((ViewEdgeInternal::SVertexIterator *) x));
 }
-static void *_p_CurveInternal__CurvePointIteratorTo_p_Interface0DIteratorNested(void *x) {
+static void *_p_CurveInternal__CurvePointIteratorTo_p_Interface0DIteratorNested(void *x, int *newmemory) {
     return (void *)((Interface0DIteratorNested *)  ((CurveInternal::CurvePointIterator *) x));
 }
-static void *_p_StrokeInternal__StrokeVertexIteratorTo_p_Interface0DIteratorNested(void *x) {
+static void *_p_StrokeInternal__StrokeVertexIteratorTo_p_Interface0DIteratorNested(void *x, int *newmemory) {
     return (void *)((Interface0DIteratorNested *)  ((StrokeInternal::StrokeVertexIterator *) x));
 }
-static void *_p_Functions0D__VertexOrientation2DF0DTo_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t(void *x) {
-    return (void *)((UnaryFunction0D<VecMat::Vec2<float > > *)  ((Functions0D::VertexOrientation2DF0D *) x));
+static void *_p_Functions0D__VertexOrientation2DF0DTo_p_UnaryFunction0DT_VecMat__Vec2T_float_t_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< VecMat::Vec2< float > > *)  ((Functions0D::VertexOrientation2DF0D *) x));
 }
-static void *_p_Functions0D__Normal2DF0DTo_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t(void *x) {
-    return (void *)((UnaryFunction0D<VecMat::Vec2<float > > *)  ((Functions0D::Normal2DF0D *) x));
+static void *_p_Functions0D__Normal2DF0DTo_p_UnaryFunction0DT_VecMat__Vec2T_float_t_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< VecMat::Vec2< float > > *)  ((Functions0D::Normal2DF0D *) x));
 }
-static void *_p_Functions0D__VertexOrientation3DF0DTo_p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t(void *x) {
-    return (void *)((UnaryFunction0D<VecMat::Vec3<float > > *)  ((Functions0D::VertexOrientation3DF0D *) x));
+static void *_p_Functions0D__VertexOrientation3DF0DTo_p_UnaryFunction0DT_VecMat__Vec3T_float_t_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< VecMat::Vec3< float > > *)  ((Functions0D::VertexOrientation3DF0D *) x));
 }
-static void *_p_Functions1D__Orientation2DF1DTo_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t(void *x) {
-    return (void *)((UnaryFunction1D<VecMat::Vec2<float > > *)  ((Functions1D::Orientation2DF1D *) x));
+static void *_p_Functions1D__Orientation2DF1DTo_p_UnaryFunction1DT_VecMat__Vec2T_float_t_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< VecMat::Vec2< float > > *)  ((Functions1D::Orientation2DF1D *) x));
 }
-static void *_p_Functions1D__Normal2DF1DTo_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t(void *x) {
-    return (void *)((UnaryFunction1D<VecMat::Vec2<float > > *)  ((Functions1D::Normal2DF1D *) x));
+static void *_p_Functions1D__Normal2DF1DTo_p_UnaryFunction1DT_VecMat__Vec2T_float_t_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< VecMat::Vec2< float > > *)  ((Functions1D::Normal2DF1D *) x));
 }
-static void *_p_Functions1D__Orientation3DF1DTo_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t(void *x) {
-    return (void *)((UnaryFunction1D<VecMat::Vec3<float > > *)  ((Functions1D::Orientation3DF1D *) x));
+static void *_p_Functions1D__Orientation3DF1DTo_p_UnaryFunction1DT_VecMat__Vec3T_float_t_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< VecMat::Vec3< float > > *)  ((Functions1D::Orientation3DF1D *) x));
 }
-static void *_p_Functions0D__QuantitativeInvisibilityF0DTo_p_UnaryFunction0DTunsigned_int_t(void *x) {
-    return (void *)((UnaryFunction0D<unsigned int > *)  ((Functions0D::QuantitativeInvisibilityF0D *) x));
+static void *_p_Functions0D__QuantitativeInvisibilityF0DTo_p_UnaryFunction0DT_unsigned_int_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< unsigned int > *)  ((Functions0D::QuantitativeInvisibilityF0D *) x));
 }
-static void *_p_Functions1D__QuantitativeInvisibilityF1DTo_p_UnaryFunction1DTunsigned_int_t(void *x) {
-    return (void *)((UnaryFunction1D<unsigned int > *)  ((Functions1D::QuantitativeInvisibilityF1D *) x));
+static void *_p_Functions1D__QuantitativeInvisibilityF1DTo_p_UnaryFunction1DT_unsigned_int_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< unsigned int > *)  ((Functions1D::QuantitativeInvisibilityF1D *) x));
 }
-static void *_p_Functions0D__ShapeIdF0DTo_p_UnaryFunction0DTId_t(void *x) {
-    return (void *)((UnaryFunction0D<Id > *)  ((Functions0D::ShapeIdF0D *) x));
+static void *_p_Functions0D__ShapeIdF0DTo_p_UnaryFunction0DT_Id_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< Id > *)  ((Functions0D::ShapeIdF0D *) x));
 }
-static void *_p_VecMat__Vec2Tdouble_tTo_p_VecMat__VecTdouble_2_t(void *x) {
-    return (void *)((VecMat::Vec<double,2 > *)  ((VecMat::Vec2<double > *) x));
+static void *_p_VecMat__Vec2T_double_tTo_p_VecMat__VecT_double_2_t(void *x, int *newmemory) {
+    return (void *)((VecMat::Vec< double,2 > *)  ((VecMat::Vec2< double > *) x));
 }
-static void *_p_TVertexTo_p_ViewVertex(void *x) {
+static void *_p_TVertexTo_p_ViewVertex(void *x, int *newmemory) {
     return (void *)((ViewVertex *)  ((TVertex *) x));
 }
-static void *_p_NonTVertexTo_p_ViewVertex(void *x) {
+static void *_p_NonTVertexTo_p_ViewVertex(void *x, int *newmemory) {
     return (void *)((ViewVertex *)  ((NonTVertex *) x));
 }
-static void *_p_Functions0D__ZDiscontinuityF0DTo_p_UnaryFunction0DTdouble_t(void *x) {
-    return (void *)((UnaryFunction0D<double > *)  ((Functions0D::ZDiscontinuityF0D *) x));
+static void *_p_Functions0D__ZDiscontinuityF0DTo_p_UnaryFunction0DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< double > *)  ((Functions0D::ZDiscontinuityF0D *) x));
 }
-static void *_p_Functions0D__DensityF0DTo_p_UnaryFunction0DTdouble_t(void *x) {
-    return (void *)((UnaryFunction0D<double > *)  ((Functions0D::DensityF0D *) x));
+static void *_p_Functions0D__DensityF0DTo_p_UnaryFunction0DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< double > *)  ((Functions0D::DensityF0D *) x));
 }
-static void *_p_Functions0D__GetXF0DTo_p_UnaryFunction0DTdouble_t(void *x) {
-    return (void *)((UnaryFunction0D<double > *)  ((Functions0D::GetXF0D *) x));
+static void *_p_Functions0D__GetXF0DTo_p_UnaryFunction0DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< double > *)  ((Functions0D::GetXF0D *) x));
 }
-static void *_p_Functions0D__GetProjectedXF0DTo_p_UnaryFunction0DTdouble_t(void *x) {
-    return (void *)((UnaryFunction0D<double > *)  ((Functions0D::GetProjectedXF0D *) x));
+static void *_p_Functions0D__GetProjectedXF0DTo_p_UnaryFunction0DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< double > *)  ((Functions0D::GetProjectedXF0D *) x));
 }
-static void *_p_Functions0D__Curvature2DAngleF0DTo_p_UnaryFunction0DTdouble_t(void *x) {
-    return (void *)((UnaryFunction0D<double > *)  ((Functions0D::Curvature2DAngleF0D *) x));
+static void *_p_Functions0D__Curvature2DAngleF0DTo_p_UnaryFunction0DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< double > *)  ((Functions0D::Curvature2DAngleF0D *) x));
 }
-static void *_p_Functions0D__GetYF0DTo_p_UnaryFunction0DTdouble_t(void *x) {
-    return (void *)((UnaryFunction0D<double > *)  ((Functions0D::GetYF0D *) x));
+static void *_p_Functions0D__GetYF0DTo_p_UnaryFunction0DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< double > *)  ((Functions0D::GetYF0D *) x));
 }
-static void *_p_Functions0D__GetProjectedYF0DTo_p_UnaryFunction0DTdouble_t(void *x) {
-    return (void *)((UnaryFunction0D<double > *)  ((Functions0D::GetProjectedYF0D *) x));
+static void *_p_Functions0D__GetProjectedYF0DTo_p_UnaryFunction0DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< double > *)  ((Functions0D::GetProjectedYF0D *) x));
 }
-static void *_p_Functions0D__GetZF0DTo_p_UnaryFunction0DTdouble_t(void *x) {
-    return (void *)((UnaryFunction0D<double > *)  ((Functions0D::GetZF0D *) x));
+static void *_p_Functions0D__GetZF0DTo_p_UnaryFunction0DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< double > *)  ((Functions0D::GetZF0D *) x));
 }
-static void *_p_Functions0D__GetProjectedZF0DTo_p_UnaryFunction0DTdouble_t(void *x) {
-    return (void *)((UnaryFunction0D<double > *)  ((Functions0D::GetProjectedZF0D *) x));
+static void *_p_Functions0D__GetProjectedZF0DTo_p_UnaryFunction0DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< double > *)  ((Functions0D::GetProjectedZF0D *) x));
 }
-static void *_p_Functions0D__LocalAverageDepthF0DTo_p_UnaryFunction0DTdouble_t(void *x) {
-    return (void *)((UnaryFunction0D<double > *)  ((Functions0D::LocalAverageDepthF0D *) x));
+static void *_p_Functions0D__LocalAverageDepthF0DTo_p_UnaryFunction0DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< double > *)  ((Functions0D::LocalAverageDepthF0D *) x));
 }
-static void *_p_Functions1D__GetSteerableViewMapDensityF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
-    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::GetSteerableViewMapDensityF1D *) x));
+static void *_p_Functions1D__GetSteerableViewMapDensityF1DTo_p_UnaryFunction1DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< double > *)  ((Functions1D::GetSteerableViewMapDensityF1D *) x));
 }
-static void *_p_Functions1D__GetDirectionalViewMapDensityF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
-    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::GetDirectionalViewMapDensityF1D *) x));
+static void *_p_Functions1D__GetDirectionalViewMapDensityF1DTo_p_UnaryFunction1DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< double > *)  ((Functions1D::GetDirectionalViewMapDensityF1D *) x));
 }
-static void *_p_Functions1D__GetCompleteViewMapDensityF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
-    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::GetCompleteViewMapDensityF1D *) x));
+static void *_p_Functions1D__GetCompleteViewMapDensityF1DTo_p_UnaryFunction1DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< double > *)  ((Functions1D::GetCompleteViewMapDensityF1D *) x));
 }
-static void *_p_Functions1D__DensityF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
-    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::DensityF1D *) x));
+static void *_p_Functions1D__DensityF1DTo_p_UnaryFunction1DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< double > *)  ((Functions1D::DensityF1D *) x));
 }
-static void *_p_Functions1D__ZDiscontinuityF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
-    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::ZDiscontinuityF1D *) x));
+static void *_p_Functions1D__ZDiscontinuityF1DTo_p_UnaryFunction1DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< double > *)  ((Functions1D::ZDiscontinuityF1D *) x));
 }
-static void *_p_Functions1D__GetXF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
-    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::GetXF1D *) x));
+static void *_p_Functions1D__GetXF1DTo_p_UnaryFunction1DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< double > *)  ((Functions1D::GetXF1D *) x));
 }
-static void *_p_Functions1D__GetZF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
-    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::GetZF1D *) x));
+static void *_p_Functions1D__GetZF1DTo_p_UnaryFunction1DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< double > *)  ((Functions1D::GetZF1D *) x));
 }
-static void *_p_Functions1D__GetViewMapGradientNormF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
-    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::GetViewMapGradientNormF1D *) x));
+static void *_p_Functions1D__GetViewMapGradientNormF1DTo_p_UnaryFunction1DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< double > *)  ((Functions1D::GetViewMapGradientNormF1D *) x));
 }
-static void *_p_Functions1D__GetProjectedYF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
-    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::GetProjectedYF1D *) x));
+static void *_p_Functions1D__GetProjectedYF1DTo_p_UnaryFunction1DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< double > *)  ((Functions1D::GetProjectedYF1D *) x));
 }
-static void *_p_Functions1D__Curvature2DAngleF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
-    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::Curvature2DAngleF1D *) x));
+static void *_p_Functions1D__Curvature2DAngleF1DTo_p_UnaryFunction1DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< double > *)  ((Functions1D::Curvature2DAngleF1D *) x));
 }
-static void *_p_Functions1D__GetYF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
-    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::GetYF1D *) x));
+static void *_p_Functions1D__GetYF1DTo_p_UnaryFunction1DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< double > *)  ((Functions1D::GetYF1D *) x));
 }
-static void *_p_Functions1D__GetProjectedXF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
-    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::GetProjectedXF1D *) x));
+static void *_p_Functions1D__GetProjectedXF1DTo_p_UnaryFunction1DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< double > *)  ((Functions1D::GetProjectedXF1D *) x));
 }
-static void *_p_Functions1D__LocalAverageDepthF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
-    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::LocalAverageDepthF1D *) x));
+static void *_p_Functions1D__LocalAverageDepthF1DTo_p_UnaryFunction1DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< double > *)  ((Functions1D::LocalAverageDepthF1D *) x));
 }
-static void *_p_Functions1D__GetProjectedZF1DTo_p_UnaryFunction1DTdouble_t(void *x) {
-    return (void *)((UnaryFunction1D<double > *)  ((Functions1D::GetProjectedZF1D *) x));
+static void *_p_Functions1D__GetProjectedZF1DTo_p_UnaryFunction1DT_double_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction1D< double > *)  ((Functions1D::GetProjectedZF1D *) x));
 }
-static void *_p_Functions0D__GetCurvilinearAbscissaF0DTo_p_UnaryFunction0DTfloat_t(void *x) {
-    return (void *)((UnaryFunction0D<float > *)  ((Functions0D::GetCurvilinearAbscissaF0D *) x));
+static void *_p_Functions0D__GetCurvilinearAbscissaF0DTo_p_UnaryFunction0DT_float_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< float > *)  ((Functions0D::GetCurvilinearAbscissaF0D *) x));
 }
-static void *_p_Functions0D__ReadMapPixelF0DTo_p_UnaryFunction0DTfloat_t(void *x) {
-    return (void *)((UnaryFunction0D<float > *)  ((Functions0D::ReadMapPixelF0D *) x));
+static void *_p_Functions0D__ReadMapPixelF0DTo_p_UnaryFunction0DT_float_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< float > *)  ((Functions0D::ReadMapPixelF0D *) x));
 }
-static void *_p_Functions0D__ReadSteerableViewMapPixelF0DTo_p_UnaryFunction0DTfloat_t(void *x) {
-    return (void *)((UnaryFunction0D<float > *)  ((Functions0D::ReadSteerableViewMapPixelF0D *) x));
+static void *_p_Functions0D__ReadSteerableViewMapPixelF0DTo_p_UnaryFunction0DT_float_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< float > *)  ((Functions0D::ReadSteerableViewMapPixelF0D *) x));
 }
-static void *_p_Functions0D__ReadCompleteViewMapPixelF0DTo_p_UnaryFunction0DTfloat_t(void *x) {
-    return (void *)((UnaryFunction0D<float > *)  ((Functions0D::ReadCompleteViewMapPixelF0D *) x));
+static void *_p_Functions0D__ReadCompleteViewMapPixelF0DTo_p_UnaryFunction0DT_float_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< float > *)  ((Functions0D::ReadCompleteViewMapPixelF0D *) x));
 }
-static void *_p_Functions0D__GetViewMapGradientNormF0DTo_p_UnaryFunction0DTfloat_t(void *x) {
-    return (void *)((UnaryFunction0D<float > *)  ((Functions0D::GetViewMapGradientNormF0D *) x));
+static void *_p_Functions0D__GetViewMapGradientNormF0DTo_p_UnaryFunction0DT_float_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< float > *)  ((Functions0D::GetViewMapGradientNormF0D *) x));
 }
-static void *_p_Functions0D__GetParameterF0DTo_p_UnaryFunction0DTfloat_t(void *x) {
-    return (void *)((UnaryFunction0D<float > *)  ((Functions0D::GetParameterF0D *) x));
+static void *_p_Functions0D__GetParameterF0DTo_p_UnaryFunction0DT_float_t(void *x, int *newmemory) {
+    return (void *)((UnaryFunction0D< float > *)  ((Functions0D::GetParameterF0D *) x));
 }
-static void *_p_VecMat__Vec3Tdouble_tTo_p_VecMat__VecTdouble_3_t(void *x) {
-    return (void *)((VecMat::Vec<double,3 > *)  ((VecMat::Vec3<double > *) x));
+static void *_p_VecMat__Vec3T_double_tTo_p_VecMat__VecT_double_3_t(void *x, int *newmemory) {
+    return (void *)((VecMat::Vec< double,3 > *)  ((VecMat::Vec3< double > *) x));
 }
 static swig_type_info _swigt__p_AdjacencyIterator = {"_p_AdjacencyIterator", "AdjacencyIterator *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_BBoxTVecMat__Vec3Tdouble_t_t = {"_p_BBoxTVecMat__Vec3Tdouble_t_t", "BBox<VecMat::Vec3<double > > *|BBox<Geometry::Vec3r > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_BBoxT_VecMat__Vec3T_double_t_t = {"_p_BBoxT_VecMat__Vec3T_double_t_t", "BBox< VecMat::Vec3< double > > *|BBox< Geometry::Vec3r > *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_BinaryPredicate0D = {"_p_BinaryPredicate0D", "BinaryPredicate0D *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_BinaryPredicate1D = {"_p_BinaryPredicate1D", "BinaryPredicate1D *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CalligraphicShader = {"_p_CalligraphicShader", "CalligraphicShader *", 0, 0, (void*)0, 0};
@@ -110242,7 +109120,7 @@ static swig_type_info _swigt__p_ChainingIterator = {"_p_ChainingIterator", "Chai
 static swig_type_info _swigt__p_CurvatureInfo = {"_p_CurvatureInfo", "CurvatureInfo *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_Curve = {"_p_Curve", "Curve *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CurveInternal__CurvePointIterator = {"_p_CurveInternal__CurvePointIterator", "CurveInternal::CurvePointIterator *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_CurvePoint = {"_p_CurvePoint", "CurvePoint *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_CurvePoint = {"_p_CurvePoint", "Curve::Vertex *|CurvePoint *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_Curve__vertex_container__iterator = {"_p_Curve__vertex_container__iterator", "::Curve::vertex_container::iterator *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_FEdge = {"_p_FEdge", "FEdge *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_FEdgeInternal__SVertexIterator = {"_p_FEdgeInternal__SVertexIterator", "FEdgeInternal::SVertexIterator *", 0, 0, (void*)0, 0};
@@ -110381,56 +109259,56 @@ static swig_type_info _swigt__p_Stroke__viewedge_container__iterator = {"_p_Stro
 static swig_type_info _swigt__p_StrokesContainer = {"_p_StrokesContainer", "StrokesContainer *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_StyleModule = {"_p_StyleModule", "StyleModule *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_TVertex = {"_p_TVertex", "TVertex *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction0DTId_t = {"_p_UnaryFunction0DTId_t", "UnaryFunction0D<Id > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t = {"_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t", "UnaryFunction0D<VecMat::Vec2<float > > *|UnaryFunction0D<Geometry::Vec2f > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t = {"_p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t", "UnaryFunction0D<VecMat::Vec3<float > > *|UnaryFunction0D<Geometry::Vec3f > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction0DTViewShape_p_t = {"_p_UnaryFunction0DTViewShape_p_t", "UnaryFunction0D<ViewShape * > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction0DTdouble_t = {"_p_UnaryFunction0DTdouble_t", "UnaryFunction0D<double > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction0DTfloat_t = {"_p_UnaryFunction0DTfloat_t", "UnaryFunction0D<float > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t = {"_p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t", "UnaryFunction0D<std::vector<ViewShape * > > *|UnaryFunction0D<std::vector<ViewShape *,std::allocator<ViewShape * > > > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction0DTunsigned_int_t = {"_p_UnaryFunction0DTunsigned_int_t", "UnaryFunction0D<unsigned int > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction0DTvoid_t = {"_p_UnaryFunction0DTvoid_t", "UnaryFunction0D<void > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t = {"_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t", "UnaryFunction1D<VecMat::Vec2<float > > *|UnaryFunction1D<Geometry::Vec2f > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t = {"_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t", "UnaryFunction1D<VecMat::Vec3<float > > *|UnaryFunction1D<Geometry::Vec3f > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction1DTdouble_t = {"_p_UnaryFunction1DTdouble_t", "UnaryFunction1D<double > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction1DTfloat_t = {"_p_UnaryFunction1DTfloat_t", "UnaryFunction1D<float > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t = {"_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t", "UnaryFunction1D<std::vector<ViewShape * > > *|UnaryFunction1D<std::vector<ViewShape *,std::allocator<ViewShape * > > > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction1DTunsigned_int_t = {"_p_UnaryFunction1DTunsigned_int_t", "UnaryFunction1D<unsigned int > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UnaryFunction1DTvoid_t = {"_p_UnaryFunction1DTvoid_t", "UnaryFunction1D<void > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction0DT_Id_t = {"_p_UnaryFunction0DT_Id_t", "UnaryFunction0D< Id > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction0DT_VecMat__Vec2T_float_t_t = {"_p_UnaryFunction0DT_VecMat__Vec2T_float_t_t", "UnaryFunction0D< Geometry::Vec2f > *|UnaryFunction0D< VecMat::Vec2< float > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction0DT_VecMat__Vec3T_float_t_t = {"_p_UnaryFunction0DT_VecMat__Vec3T_float_t_t", "UnaryFunction0D< VecMat::Vec3< float > > *|UnaryFunction0D< Geometry::Vec3f > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction0DT_ViewShape_p_t = {"_p_UnaryFunction0DT_ViewShape_p_t", "UnaryFunction0D< ViewShape * > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction0DT_double_t = {"_p_UnaryFunction0DT_double_t", "UnaryFunction0D< double > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction0DT_float_t = {"_p_UnaryFunction0DT_float_t", "UnaryFunction0D< float > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction0DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t = {"_p_UnaryFunction0DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t", "UnaryFunction0D< std::vector< ViewShape * > > *|UnaryFunction0D< std::vector< ViewShape *,std::allocator< ViewShape * > > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction0DT_unsigned_int_t = {"_p_UnaryFunction0DT_unsigned_int_t", "UnaryFunction0D< unsigned int > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction0DT_void_t = {"_p_UnaryFunction0DT_void_t", "UnaryFunction0D< void > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction1DT_VecMat__Vec2T_float_t_t = {"_p_UnaryFunction1DT_VecMat__Vec2T_float_t_t", "UnaryFunction1D< Geometry::Vec2f > *|UnaryFunction1D< VecMat::Vec2< float > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction1DT_VecMat__Vec3T_float_t_t = {"_p_UnaryFunction1DT_VecMat__Vec3T_float_t_t", "UnaryFunction1D< VecMat::Vec3< float > > *|UnaryFunction1D< Geometry::Vec3f > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction1DT_double_t = {"_p_UnaryFunction1DT_double_t", "UnaryFunction1D< double > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction1DT_float_t = {"_p_UnaryFunction1DT_float_t", "UnaryFunction1D< float > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t = {"_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t", "UnaryFunction1D< std::vector< ViewShape * > > *|UnaryFunction1D< std::vector< ViewShape *,std::allocator< ViewShape * > > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction1DT_unsigned_int_t = {"_p_UnaryFunction1DT_unsigned_int_t", "UnaryFunction1D< unsigned int > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_UnaryFunction1DT_void_t = {"_p_UnaryFunction1DT_void_t", "UnaryFunction1D< void > *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_UnaryPredicate0D = {"_p_UnaryPredicate0D", "UnaryPredicate0D *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_UnaryPredicate1D = {"_p_UnaryPredicate1D", "UnaryPredicate1D *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__HVec3Tdouble_t = {"_p_VecMat__HVec3Tdouble_t", "VecMat::HVec3<double > *|Geometry::HVec3r *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__HVec3Tfloat_t = {"_p_VecMat__HVec3Tfloat_t", "VecMat::HVec3<float > *|Geometry::HVec3f *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__HVec3Tint_t = {"_p_VecMat__HVec3Tint_t", "VecMat::HVec3<int > *|Geometry::HVec3i *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__HVec3Tunsigned_int_t = {"_p_VecMat__HVec3Tunsigned_int_t", "VecMat::HVec3<unsigned int > *|Geometry::HVec3u *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__SquareMatrixTdouble_2_t = {"_p_VecMat__SquareMatrixTdouble_2_t", "VecMat::SquareMatrix<double,2 > *|Geometry::Matrix22r *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__SquareMatrixTdouble_3_t = {"_p_VecMat__SquareMatrixTdouble_3_t", "VecMat::SquareMatrix<double,3 > *|Geometry::Matrix33r *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__SquareMatrixTdouble_4_t = {"_p_VecMat__SquareMatrixTdouble_4_t", "VecMat::SquareMatrix<double,4 > *|Geometry::Matrix44r *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__SquareMatrixTfloat_2_t = {"_p_VecMat__SquareMatrixTfloat_2_t", "VecMat::SquareMatrix<float,2 > *|Geometry::Matrix22f *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__SquareMatrixTfloat_3_t = {"_p_VecMat__SquareMatrixTfloat_3_t", "VecMat::SquareMatrix<float,3 > *|Geometry::Matrix33f *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__SquareMatrixTfloat_4_t = {"_p_VecMat__SquareMatrixTfloat_4_t", "VecMat::SquareMatrix<float,4 > *|Geometry::Matrix44f *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__SquareMatrixTint_2_t = {"_p_VecMat__SquareMatrixTint_2_t", "VecMat::SquareMatrix<int,2 > *|Geometry::Matrix22i *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__SquareMatrixTint_3_t = {"_p_VecMat__SquareMatrixTint_3_t", "VecMat::SquareMatrix<int,3 > *|Geometry::Matrix33i *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__SquareMatrixTint_4_t = {"_p_VecMat__SquareMatrixTint_4_t", "VecMat::SquareMatrix<int,4 > *|Geometry::Matrix44i *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__SquareMatrixTunsigned_int_2_t = {"_p_VecMat__SquareMatrixTunsigned_int_2_t", "VecMat::SquareMatrix<unsigned int,2 > *|Geometry::Matrix22u *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__SquareMatrixTunsigned_int_3_t = {"_p_VecMat__SquareMatrixTunsigned_int_3_t", "VecMat::SquareMatrix<unsigned int,3 > *|Geometry::Matrix33u *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__SquareMatrixTunsigned_int_4_t = {"_p_VecMat__SquareMatrixTunsigned_int_4_t", "VecMat::SquareMatrix<unsigned int,4 > *|Geometry::Matrix44u *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__Vec2Tdouble_t = {"_p_VecMat__Vec2Tdouble_t", "VecMat::Vec2<double > *|Geometry::Vec2d *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__Vec2Tfloat_t = {"_p_VecMat__Vec2Tfloat_t", "VecMat::Vec2<float > *|Geometry::Vec2f *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__Vec2Tint_t = {"_p_VecMat__Vec2Tint_t", "VecMat::Vec2<int > *|Geometry::Vec2i *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__Vec2Tunsigned_int_t = {"_p_VecMat__Vec2Tunsigned_int_t", "VecMat::Vec2<unsigned int > *|Geometry::Vec2u *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__Vec3Tdouble_t = {"_p_VecMat__Vec3Tdouble_t", "VecMat::Vec3<double > *|Geometry::Vec3r *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__Vec3Tfloat_t = {"_p_VecMat__Vec3Tfloat_t", "VecMat::Vec3<float > *|Geometry::Vec3f *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__Vec3Tint_t = {"_p_VecMat__Vec3Tint_t", "VecMat::Vec3<int > *|Geometry::Vec3i *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__Vec3Tunsigned_int_t = {"_p_VecMat__Vec3Tunsigned_int_t", "VecMat::Vec3<unsigned int > *|Geometry::Vec3u *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__VecTdouble_2_t = {"_p_VecMat__VecTdouble_2_t", "VecMat::Vec<double,2 > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__VecTdouble_3_t = {"_p_VecMat__VecTdouble_3_t", "VecMat::Vec<double,3 > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__VecTfloat_2_t = {"_p_VecMat__VecTfloat_2_t", "VecMat::Vec<float,2 > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__VecTfloat_3_t = {"_p_VecMat__VecTfloat_3_t", "VecMat::Vec<float,3 > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__VecTint_2_t = {"_p_VecMat__VecTint_2_t", "VecMat::Vec<int,2 > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__VecTint_3_t = {"_p_VecMat__VecTint_3_t", "VecMat::Vec<int,3 > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__VecTunsigned_int_2_t = {"_p_VecMat__VecTunsigned_int_2_t", "VecMat::Vec<unsigned int,2 > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_VecMat__VecTunsigned_int_3_t = {"_p_VecMat__VecTunsigned_int_3_t", "VecMat::Vec<unsigned int,3 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__HVec3T_double_t = {"_p_VecMat__HVec3T_double_t", "Geometry::HVec3d *|Geometry::HVec3r *|VecMat::HVec3< double > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__HVec3T_float_t = {"_p_VecMat__HVec3T_float_t", "VecMat::HVec3< float > *|Geometry::HVec3f *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__HVec3T_int_t = {"_p_VecMat__HVec3T_int_t", "Geometry::HVec3i *|VecMat::HVec3< int > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__HVec3T_unsigned_int_t = {"_p_VecMat__HVec3T_unsigned_int_t", "Geometry::HVec3u *|VecMat::HVec3< unsigned int > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixT_double_2_t = {"_p_VecMat__SquareMatrixT_double_2_t", "Geometry::Matrix22d *|Geometry::Matrix22r *|VecMat::SquareMatrix< double,2 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixT_double_3_t = {"_p_VecMat__SquareMatrixT_double_3_t", "VecMat::SquareMatrix< double,3 > *|Geometry::Matrix33d *|Geometry::Matrix33r *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixT_double_4_t = {"_p_VecMat__SquareMatrixT_double_4_t", "VecMat::SquareMatrix< double,4 > *|Geometry::Matrix44d *|Geometry::Matrix44r *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixT_float_2_t = {"_p_VecMat__SquareMatrixT_float_2_t", "Geometry::Matrix22f *|VecMat::SquareMatrix< float,2 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixT_float_3_t = {"_p_VecMat__SquareMatrixT_float_3_t", "VecMat::SquareMatrix< float,3 > *|Geometry::Matrix33f *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixT_float_4_t = {"_p_VecMat__SquareMatrixT_float_4_t", "Geometry::Matrix44f *|VecMat::SquareMatrix< float,4 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixT_int_2_t = {"_p_VecMat__SquareMatrixT_int_2_t", "VecMat::SquareMatrix< int,2 > *|Geometry::Matrix22i *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixT_int_3_t = {"_p_VecMat__SquareMatrixT_int_3_t", "VecMat::SquareMatrix< int,3 > *|Geometry::Matrix33i *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixT_int_4_t = {"_p_VecMat__SquareMatrixT_int_4_t", "Geometry::Matrix44i *|VecMat::SquareMatrix< int,4 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixT_unsigned_int_2_t = {"_p_VecMat__SquareMatrixT_unsigned_int_2_t", "Geometry::Matrix22u *|VecMat::SquareMatrix< unsigned int,2 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixT_unsigned_int_3_t = {"_p_VecMat__SquareMatrixT_unsigned_int_3_t", "Geometry::Matrix33u *|VecMat::SquareMatrix< unsigned int,3 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__SquareMatrixT_unsigned_int_4_t = {"_p_VecMat__SquareMatrixT_unsigned_int_4_t", "Geometry::Matrix44u *|VecMat::SquareMatrix< unsigned int,4 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__Vec2T_double_t = {"_p_VecMat__Vec2T_double_t", "Geometry::Vec2d *|Geometry::Vec2r *|VecMat::Vec2< double > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__Vec2T_float_t = {"_p_VecMat__Vec2T_float_t", "VecMat::Vec2< float > *|Geometry::Vec2f *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__Vec2T_int_t = {"_p_VecMat__Vec2T_int_t", "Geometry::Vec2i *|VecMat::Vec2< int > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__Vec2T_unsigned_int_t = {"_p_VecMat__Vec2T_unsigned_int_t", "Geometry::Vec2u *|VecMat::Vec2< unsigned int > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__Vec3T_double_t = {"_p_VecMat__Vec3T_double_t", "Geometry::Vec3d *|Geometry::Vec3r *|VecMat::Vec3< double > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__Vec3T_float_t = {"_p_VecMat__Vec3T_float_t", "VecMat::Vec3< float > *|Geometry::Vec3f *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__Vec3T_int_t = {"_p_VecMat__Vec3T_int_t", "Geometry::Vec3i *|VecMat::Vec3< int > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__Vec3T_unsigned_int_t = {"_p_VecMat__Vec3T_unsigned_int_t", "Geometry::Vec3u *|VecMat::Vec3< unsigned int > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__VecT_double_2_t = {"_p_VecMat__VecT_double_2_t", "VecMat::Vec< double,2 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__VecT_double_3_t = {"_p_VecMat__VecT_double_3_t", "VecMat::Vec< double,3 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__VecT_float_2_t = {"_p_VecMat__VecT_float_2_t", "VecMat::Vec< float,2 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__VecT_float_3_t = {"_p_VecMat__VecT_float_3_t", "VecMat::Vec< float,3 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__VecT_int_2_t = {"_p_VecMat__VecT_int_2_t", "VecMat::Vec< int,2 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__VecT_int_3_t = {"_p_VecMat__VecT_int_3_t", "VecMat::Vec< int,3 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__VecT_unsigned_int_2_t = {"_p_VecMat__VecT_unsigned_int_2_t", "VecMat::Vec< unsigned int,2 > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_VecMat__VecT_unsigned_int_3_t = {"_p_VecMat__VecT_unsigned_int_3_t", "VecMat::Vec< unsigned int,3 > *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_Vertex = {"_p_Vertex", "Vertex *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_ViewEdge = {"_p_ViewEdge", "ViewEdge *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_ViewEdgeInternal__SVertexIterator = {"_p_ViewEdgeInternal__SVertexIterator", "ViewEdgeInternal::SVertexIterator *", 0, 0, (void*)0, 0};
@@ -110438,8 +109316,8 @@ static swig_type_info _swigt__p_ViewEdgeInternal__ViewEdgeIterator = {"_p_ViewEd
 static swig_type_info _swigt__p_ViewMap = {"_p_ViewMap", "ViewMap *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_ViewShape = {"_p_ViewShape", "ViewShape *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_ViewVertex = {"_p_ViewVertex", "ViewVertex *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t = {"_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t", "ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_const_traits > *|ViewVertex::const_edge_iterator *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t = {"_p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t", "ViewVertexInternal::edge_iterator_base<ViewVertexInternal::edge_nonconst_traits > *|ViewVertex::edge_iterator *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_const_traits_t = {"_p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_const_traits_t", "ViewVertexInternal::edge_iterator_base< ViewVertexInternal::edge_const_traits > *|ViewVertex::const_edge_iterator *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_nonconst_traits_t = {"_p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_nonconst_traits_t", "ViewVertexInternal::edge_iterator_base< ViewVertexInternal::edge_nonconst_traits > *|ViewVertex::edge_iterator *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_ViewVertexInternal__orientedViewEdgeIterator = {"_p_ViewVertexInternal__orientedViewEdgeIterator", "ViewVertexInternal::orientedViewEdgeIterator *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_ViewVertexInternal__orientedViewEdgeIterator__edge_pointers_container__iterator = {"_p_ViewVertexInternal__orientedViewEdgeIterator__edge_pointers_container__iterator", "ViewVertexInternal::orientedViewEdgeIterator::edge_pointers_container::iterator *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_ViewVertexInternal__orientedViewEdgeIterator__edges_container__iterator = {"_p_ViewVertexInternal__orientedViewEdgeIterator__edges_container__iterator", "ViewVertexInternal::orientedViewEdgeIterator::edges_container::iterator *", 0, 0, (void*)0, 0};
@@ -110452,16 +109330,16 @@ static swig_type_info _swigt__p_const_reference = {"_p_const_reference", "const_
 static swig_type_info _swigt__p_const_vertex_iterator = {"_p_const_vertex_iterator", "const_vertex_iterator *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_difference_type = {"_p_difference_type", "difference_type *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_directedViewEdge = {"_p_directedViewEdge", "directedViewEdge *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_double = {"_p_double", "double *|VecMat::Vec3<double >::value_type *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_double = {"_p_double", "real *|VecMat::Vec2< double >::value_type *|VecMat::Vec3< double >::value_type *|double *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_edge_iterator = {"_p_edge_iterator", "edge_iterator *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_edge_pointers_container = {"_p_edge_pointers_container", "edge_pointers_container *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_edges_container = {"_p_edges_container", "edges_container *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_fedge_iterator = {"_p_fedge_iterator", "fedge_iterator *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_fedges_container = {"_p_fedges_container", "fedges_container *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_float = {"_p_float", "float *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_float = {"_p_float", "VecMat::Vec2< float >::value_type *|VecMat::Vec3< float >::value_type *|float *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_id_to_index_map = {"_p_id_to_index_map", "id_to_index_map *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_id_type = {"_p_id_type", "id_type *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_int = {"_p_int", "int *|VecMat::Vec3<int >::value_type *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_int = {"_p_int", "VecMat::Vec2< int >::value_type *|VecMat::Vec3< int >::value_type *|int *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_ltstr = {"_p_ltstr", "ltstr *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_mapsMap = {"_p_mapsMap", "mapsMap *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_occluder_container__const_iterator = {"_p_occluder_container__const_iterator", "occluder_container::const_iterator *", 0, 0, (void*)0, 0};
@@ -110469,34 +109347,34 @@ static swig_type_info _swigt__p_p_PyObject = {"_p_p_PyObject", "PyObject **", 0,
 static swig_type_info _swigt__p_point_iterator = {"_p_point_iterator", "point_iterator *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_point_type = {"_p_point_type", "point_type *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_reference = {"_p_reference", "reference *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_setTVecMat__Vec3Tdouble_t_t = {"_p_setTVecMat__Vec3Tdouble_t_t", "set<VecMat::Vec3<double > > *|set<Geometry::Vec3r > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_setT_VecMat__Vec3T_double_t_t = {"_p_setT_VecMat__Vec3T_double_t_t", "set< VecMat::Vec3< double > > *|set< Geometry::Vec3r > *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_size_type = {"_p_size_type", "size_type *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_std__invalid_argument = {"_p_std__invalid_argument", "std::invalid_argument *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__mapTint_int_std__lessTint_t_std__allocatorTstd__pairTint_const_int_t_t_t = {"_p_std__mapTint_int_std__lessTint_t_std__allocatorTstd__pairTint_const_int_t_t_t", "std::map<int,int > *|ViewMap::id_to_index_map *|std::map<int,int,std::less<int >,std::allocator<std::pair<int const,int > > > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__pairTViewEdge_p_bool_t = {"_p_std__pairTViewEdge_p_bool_t", "std::pair<ViewEdge *,bool > *|::ViewVertex::directedViewEdge *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t = {"_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t", "std::vector<FEdge * > *|std::vector<FEdge *,std::allocator<FEdge * > > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__allocator_type = {"_p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__allocator_type", "std::allocator<FEdge * > *|std::vector<FEdge * >::allocator_type *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorTMaterial_std__allocatorTMaterial_t_t = {"_p_std__vectorTMaterial_std__allocatorTMaterial_t_t", "std::vector<Material > *|std::vector<Material,std::allocator<Material > > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t = {"_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t", "std::vector<SVertex * > *|ViewMap::svertices_container *|std::vector<SVertex *,std::allocator<SVertex * > > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__allocator_type = {"_p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__allocator_type", "std::allocator<SVertex * > *|std::vector<SVertex * >::allocator_type *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t = {"_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t", "std::vector<StrokeShader * > *|std::vector<StrokeShader *,std::allocator<StrokeShader * > > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__allocator_type = {"_p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__allocator_type", "std::allocator<StrokeShader * > *|std::vector<StrokeShader * >::allocator_type *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorTTVertex_p_std__allocatorTTVertex_p_t_t = {"_p_std__vectorTTVertex_p_std__allocatorTTVertex_p_t_t", "std::vector<TVertex * > *|std::vector<TVertex *,std::allocator<TVertex * > > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorTVecMat__Vec2Tdouble_t_std__allocatorTVecMat__Vec2Tdouble_t_t_t = {"_p_std__vectorTVecMat__Vec2Tdouble_t_std__allocatorTVecMat__Vec2Tdouble_t_t_t", "std::vector<VecMat::Vec2<double > > *|std::vector<Geometry::Vec2r > *|std::vector<VecMat::Vec2<double >,std::allocator<VecMat::Vec2<double > > > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t = {"_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t", "std::vector<ViewEdge * > *|std::vector<ViewEdge *,std::allocator<ViewEdge * > > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__allocator_type = {"_p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__allocator_type", "std::allocator<ViewEdge * > *|std::vector<ViewEdge * >::allocator_type *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t = {"_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t", "std::vector<ViewShape * > *|std::vector<ViewShape *,std::allocator<ViewShape * > > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__allocator_type = {"_p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__allocator_type", "std::allocator<ViewShape * > *|std::vector<ViewShape * >::allocator_type *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t = {"_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t", "std::vector<ViewVertex * > *|std::vector<ViewVertex *,std::allocator<ViewVertex * > > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__allocator_type = {"_p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__allocator_type", "std::allocator<ViewVertex * > *|std::vector<ViewVertex * >::allocator_type *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorTint_std__allocatorTint_t_t = {"_p_std__vectorTint_std__allocatorTint_t_t", "std::vector<int > *|std::vector<int,std::allocator<int > > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorTint_std__allocatorTint_t_t__allocator_type = {"_p_std__vectorTint_std__allocatorTint_t_t__allocator_type", "std::allocator<int > *|std::vector<int >::allocator_type *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorTstd__pairTViewEdge_p_bool_t_std__allocatorTstd__pairTViewEdge_p_bool_t_t_t = {"_p_std__vectorTstd__pairTViewEdge_p_bool_t_std__allocatorTstd__pairTViewEdge_p_bool_t_t_t", "std::vector<std::pair<ViewEdge *,bool > > *|std::vector<ViewVertex::directedViewEdge > *|std::vector<std::pair<ViewEdge *,bool >,std::allocator<std::pair<ViewEdge *,bool > > > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__vectorTunsigned_int_std__allocatorTunsigned_int_t_t = {"_p_std__vectorTunsigned_int_std__allocatorTunsigned_int_t_t", "std::vector<unsigned int,std::allocator<unsigned int > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__mapT_int_int_std__lessT_int_t_std__allocatorT_std__pairT_int_const_int_t_t_t = {"_p_std__mapT_int_int_std__lessT_int_t_std__allocatorT_std__pairT_int_const_int_t_t_t", "ViewMap::id_to_index_map *|std::map< int,int,std::less< int >,std::allocator< std::pair< int const,int > > > *|std::map< int,int > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__pairT_ViewEdge_p_bool_t = {"_p_std__pairT_ViewEdge_p_bool_t", "std::pair< ViewEdge *,bool > *|ViewVertex::directedViewEdge *|::ViewVertex::directedViewEdge *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t = {"_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t", "std::vector< FEdge *,std::allocator< FEdge * > > *|std::vector< FEdge * > *|ViewMap::fedges_container *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__allocator_type = {"_p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__allocator_type", "std::vector< FEdge * >::allocator_type *|std::allocator< FEdge * > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorT_Material_std__allocatorT_Material_t_t = {"_p_std__vectorT_Material_std__allocatorT_Material_t_t", "std::vector< Material,std::allocator< Material > > *|std::vector< Material > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t = {"_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t", "std::vector< SVertex * > *|ViewMap::svertices_container *|std::vector< SVertex *,std::allocator< SVertex * > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__allocator_type = {"_p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__allocator_type", "std::vector< SVertex * >::allocator_type *|std::allocator< SVertex * > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t = {"_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t", "std::vector< StrokeShader *,std::allocator< StrokeShader * > > *|std::vector< StrokeShader * > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__allocator_type = {"_p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__allocator_type", "std::vector< StrokeShader * >::allocator_type *|std::allocator< StrokeShader * > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorT_TVertex_p_std__allocatorT_TVertex_p_t_t = {"_p_std__vectorT_TVertex_p_std__allocatorT_TVertex_p_t_t", "std::vector< TVertex * > *|std::vector< TVertex *,std::allocator< TVertex * > > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorT_VecMat__Vec2T_double_t_std__allocatorT_VecMat__Vec2T_double_t_t_t = {"_p_std__vectorT_VecMat__Vec2T_double_t_std__allocatorT_VecMat__Vec2T_double_t_t_t", "std::vector< VecMat::Vec2< double > > *|std::vector< VecMat::Vec2< double >,std::allocator< VecMat::Vec2< double > > > *|std::vector< Geometry::Vec2r > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t = {"_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t", "std::vector< ViewEdge *,std::allocator< ViewEdge * > > *|std::vector< ViewEdge * > *|ViewMap::viewedges_container *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__allocator_type = {"_p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__allocator_type", "std::vector< ViewEdge * >::allocator_type *|std::allocator< ViewEdge * > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t = {"_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t", "std::vector< ViewShape *,std::allocator< ViewShape * > > *|std::vector< ViewShape * > *|occluder_container *|ViewMap::viewshapes_container *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__allocator_type = {"_p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__allocator_type", "std::vector< ViewShape * >::allocator_type *|std::allocator< ViewShape * > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t = {"_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t", "std::vector< ViewVertex *,std::allocator< ViewVertex * > > *|std::vector< ViewVertex * > *|ViewMap::viewvertices_container *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__allocator_type = {"_p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__allocator_type", "std::vector< ViewVertex * >::allocator_type *|std::allocator< ViewVertex * > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorT_int_std__allocatorT_int_t_t = {"_p_std__vectorT_int_std__allocatorT_int_t_t", "std::vector< int,std::allocator< int > > *|std::vector< int > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorT_int_std__allocatorT_int_t_t__allocator_type = {"_p_std__vectorT_int_std__allocatorT_int_t_t__allocator_type", "std::vector< int >::allocator_type *|std::allocator< int > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorT_std__pairT_ViewEdge_p_bool_t_std__allocatorT_std__pairT_ViewEdge_p_bool_t_t_t = {"_p_std__vectorT_std__pairT_ViewEdge_p_bool_t_std__allocatorT_std__pairT_ViewEdge_p_bool_t_t_t", "std::vector< std::pair< ViewEdge *,bool > > *|std::vector< ViewVertex::directedViewEdge > *|std::vector< std::pair< ViewEdge *,bool >,std::allocator< std::pair< ViewEdge *,bool > > > *|NonTVertex::edges_container *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t = {"_p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t", "std::vector< unsigned int,std::allocator< unsigned int > > *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_svertices_container = {"_p_svertices_container", "svertices_container *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_swig__PySwigIterator = {"_p_swig__PySwigIterator", "swig::PySwigIterator *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_unsigned_int = {"_p_unsigned_int", "unsigned int *|VecMat::Vec3<unsigned int >::value_type *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_unsigned_short = {"_p_unsigned_short", "unsigned short *|Nature::EdgeNature *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_unsigned_int = {"_p_unsigned_int", "VecMat::Vec2< unsigned int >::value_type *|VecMat::Vec3< unsigned int >::value_type *|unsigned int *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_unsigned_short = {"_p_unsigned_short", "Nature::VertexNature *|Nature::EdgeNature *|unsigned short *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_value_type = {"_p_value_type", "value_type *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_vertex_container = {"_p_vertex_container", "vertex_container *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_vertex_iterator = {"_p_vertex_iterator", "vertex_iterator *", 0, 0, (void*)0, 0};
@@ -110506,16 +109384,16 @@ static swig_type_info _swigt__p_viewedges_container = {"_p_viewedges_container",
 static swig_type_info _swigt__p_viewshapes_container = {"_p_viewshapes_container", "viewshapes_container *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_viewvertices_container = {"_p_viewvertices_container", "viewvertices_container *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_void = {"_p_void", "void *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type = {"_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type", "FEdge *|std::vector<FEdge * >::value_type", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type = {"_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type", "SVertex *|std::vector<SVertex * >::value_type", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type = {"_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type", "StrokeShader *|std::vector<StrokeShader * >::value_type", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type = {"_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type", "ViewEdge *|std::vector<ViewEdge * >::value_type", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type = {"_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type", "ViewShape *|std::vector<ViewShape * >::value_type", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type = {"_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type", "ViewVertex *|std::vector<ViewVertex * >::value_type", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type = {"_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type", "std::vector< FEdge * >::value_type|FEdge *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type = {"_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type", "std::vector< SVertex * >::value_type|SVertex *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type = {"_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type", "std::vector< StrokeShader * >::value_type|StrokeShader *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type = {"_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type", "std::vector< ViewEdge * >::value_type|ViewEdge *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type = {"_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type", "std::vector< ViewShape * >::value_type|ViewShape *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type = {"_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type", "std::vector< ViewVertex * >::value_type|ViewVertex *", 0, 0, (void*)0, 0};
 
 static swig_type_info *swig_type_initial[] = {
   &_swigt__p_AdjacencyIterator,
-  &_swigt__p_BBoxTVecMat__Vec3Tdouble_t_t,
+  &_swigt__p_BBoxT_VecMat__Vec3T_double_t_t,
   &_swigt__p_BinaryPredicate0D,
   &_swigt__p_BinaryPredicate1D,
   &_swigt__p_CalligraphicShader,
@@ -110666,56 +109544,56 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_StrokesContainer,
   &_swigt__p_StyleModule,
   &_swigt__p_TVertex,
-  &_swigt__p_UnaryFunction0DTId_t,
-  &_swigt__p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t,
-  &_swigt__p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t,
-  &_swigt__p_UnaryFunction0DTViewShape_p_t,
-  &_swigt__p_UnaryFunction0DTdouble_t,
-  &_swigt__p_UnaryFunction0DTfloat_t,
-  &_swigt__p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t,
-  &_swigt__p_UnaryFunction0DTunsigned_int_t,
-  &_swigt__p_UnaryFunction0DTvoid_t,
-  &_swigt__p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t,
-  &_swigt__p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t,
-  &_swigt__p_UnaryFunction1DTdouble_t,
-  &_swigt__p_UnaryFunction1DTfloat_t,
-  &_swigt__p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t,
-  &_swigt__p_UnaryFunction1DTunsigned_int_t,
-  &_swigt__p_UnaryFunction1DTvoid_t,
+  &_swigt__p_UnaryFunction0DT_Id_t,
+  &_swigt__p_UnaryFunction0DT_VecMat__Vec2T_float_t_t,
+  &_swigt__p_UnaryFunction0DT_VecMat__Vec3T_float_t_t,
+  &_swigt__p_UnaryFunction0DT_ViewShape_p_t,
+  &_swigt__p_UnaryFunction0DT_double_t,
+  &_swigt__p_UnaryFunction0DT_float_t,
+  &_swigt__p_UnaryFunction0DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t,
+  &_swigt__p_UnaryFunction0DT_unsigned_int_t,
+  &_swigt__p_UnaryFunction0DT_void_t,
+  &_swigt__p_UnaryFunction1DT_VecMat__Vec2T_float_t_t,
+  &_swigt__p_UnaryFunction1DT_VecMat__Vec3T_float_t_t,
+  &_swigt__p_UnaryFunction1DT_double_t,
+  &_swigt__p_UnaryFunction1DT_float_t,
+  &_swigt__p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t,
+  &_swigt__p_UnaryFunction1DT_unsigned_int_t,
+  &_swigt__p_UnaryFunction1DT_void_t,
   &_swigt__p_UnaryPredicate0D,
   &_swigt__p_UnaryPredicate1D,
-  &_swigt__p_VecMat__HVec3Tdouble_t,
-  &_swigt__p_VecMat__HVec3Tfloat_t,
-  &_swigt__p_VecMat__HVec3Tint_t,
-  &_swigt__p_VecMat__HVec3Tunsigned_int_t,
-  &_swigt__p_VecMat__SquareMatrixTdouble_2_t,
-  &_swigt__p_VecMat__SquareMatrixTdouble_3_t,
-  &_swigt__p_VecMat__SquareMatrixTdouble_4_t,
-  &_swigt__p_VecMat__SquareMatrixTfloat_2_t,
-  &_swigt__p_VecMat__SquareMatrixTfloat_3_t,
-  &_swigt__p_VecMat__SquareMatrixTfloat_4_t,
-  &_swigt__p_VecMat__SquareMatrixTint_2_t,
-  &_swigt__p_VecMat__SquareMatrixTint_3_t,
-  &_swigt__p_VecMat__SquareMatrixTint_4_t,
-  &_swigt__p_VecMat__SquareMatrixTunsigned_int_2_t,
-  &_swigt__p_VecMat__SquareMatrixTunsigned_int_3_t,
-  &_swigt__p_VecMat__SquareMatrixTunsigned_int_4_t,
-  &_swigt__p_VecMat__Vec2Tdouble_t,
-  &_swigt__p_VecMat__Vec2Tfloat_t,
-  &_swigt__p_VecMat__Vec2Tint_t,
-  &_swigt__p_VecMat__Vec2Tunsigned_int_t,
-  &_swigt__p_VecMat__Vec3Tdouble_t,
-  &_swigt__p_VecMat__Vec3Tfloat_t,
-  &_swigt__p_VecMat__Vec3Tint_t,
-  &_swigt__p_VecMat__Vec3Tunsigned_int_t,
-  &_swigt__p_VecMat__VecTdouble_2_t,
-  &_swigt__p_VecMat__VecTdouble_3_t,
-  &_swigt__p_VecMat__VecTfloat_2_t,
-  &_swigt__p_VecMat__VecTfloat_3_t,
-  &_swigt__p_VecMat__VecTint_2_t,
-  &_swigt__p_VecMat__VecTint_3_t,
-  &_swigt__p_VecMat__VecTunsigned_int_2_t,
-  &_swigt__p_VecMat__VecTunsigned_int_3_t,
+  &_swigt__p_VecMat__HVec3T_double_t,
+  &_swigt__p_VecMat__HVec3T_float_t,
+  &_swigt__p_VecMat__HVec3T_int_t,
+  &_swigt__p_VecMat__HVec3T_unsigned_int_t,
+  &_swigt__p_VecMat__SquareMatrixT_double_2_t,
+  &_swigt__p_VecMat__SquareMatrixT_double_3_t,
+  &_swigt__p_VecMat__SquareMatrixT_double_4_t,
+  &_swigt__p_VecMat__SquareMatrixT_float_2_t,
+  &_swigt__p_VecMat__SquareMatrixT_float_3_t,
+  &_swigt__p_VecMat__SquareMatrixT_float_4_t,
+  &_swigt__p_VecMat__SquareMatrixT_int_2_t,
+  &_swigt__p_VecMat__SquareMatrixT_int_3_t,
+  &_swigt__p_VecMat__SquareMatrixT_int_4_t,
+  &_swigt__p_VecMat__SquareMatrixT_unsigned_int_2_t,
+  &_swigt__p_VecMat__SquareMatrixT_unsigned_int_3_t,
+  &_swigt__p_VecMat__SquareMatrixT_unsigned_int_4_t,
+  &_swigt__p_VecMat__Vec2T_double_t,
+  &_swigt__p_VecMat__Vec2T_float_t,
+  &_swigt__p_VecMat__Vec2T_int_t,
+  &_swigt__p_VecMat__Vec2T_unsigned_int_t,
+  &_swigt__p_VecMat__Vec3T_double_t,
+  &_swigt__p_VecMat__Vec3T_float_t,
+  &_swigt__p_VecMat__Vec3T_int_t,
+  &_swigt__p_VecMat__Vec3T_unsigned_int_t,
+  &_swigt__p_VecMat__VecT_double_2_t,
+  &_swigt__p_VecMat__VecT_double_3_t,
+  &_swigt__p_VecMat__VecT_float_2_t,
+  &_swigt__p_VecMat__VecT_float_3_t,
+  &_swigt__p_VecMat__VecT_int_2_t,
+  &_swigt__p_VecMat__VecT_int_3_t,
+  &_swigt__p_VecMat__VecT_unsigned_int_2_t,
+  &_swigt__p_VecMat__VecT_unsigned_int_3_t,
   &_swigt__p_Vertex,
   &_swigt__p_ViewEdge,
   &_swigt__p_ViewEdgeInternal__SVertexIterator,
@@ -110723,8 +109601,8 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_ViewMap,
   &_swigt__p_ViewShape,
   &_swigt__p_ViewVertex,
-  &_swigt__p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t,
-  &_swigt__p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t,
+  &_swigt__p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_const_traits_t,
+  &_swigt__p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_nonconst_traits_t,
   &_swigt__p_ViewVertexInternal__orientedViewEdgeIterator,
   &_swigt__p_ViewVertexInternal__orientedViewEdgeIterator__edge_pointers_container__iterator,
   &_swigt__p_ViewVertexInternal__orientedViewEdgeIterator__edges_container__iterator,
@@ -110754,30 +109632,30 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_point_iterator,
   &_swigt__p_point_type,
   &_swigt__p_reference,
-  &_swigt__p_setTVecMat__Vec3Tdouble_t_t,
+  &_swigt__p_setT_VecMat__Vec3T_double_t_t,
   &_swigt__p_size_type,
   &_swigt__p_std__invalid_argument,
-  &_swigt__p_std__mapTint_int_std__lessTint_t_std__allocatorTstd__pairTint_const_int_t_t_t,
-  &_swigt__p_std__pairTViewEdge_p_bool_t,
-  &_swigt__p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t,
-  &_swigt__p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__allocator_type,
-  &_swigt__p_std__vectorTMaterial_std__allocatorTMaterial_t_t,
-  &_swigt__p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t,
-  &_swigt__p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__allocator_type,
-  &_swigt__p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t,
-  &_swigt__p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__allocator_type,
-  &_swigt__p_std__vectorTTVertex_p_std__allocatorTTVertex_p_t_t,
-  &_swigt__p_std__vectorTVecMat__Vec2Tdouble_t_std__allocatorTVecMat__Vec2Tdouble_t_t_t,
-  &_swigt__p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t,
-  &_swigt__p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__allocator_type,
-  &_swigt__p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t,
-  &_swigt__p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__allocator_type,
-  &_swigt__p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t,
-  &_swigt__p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__allocator_type,
-  &_swigt__p_std__vectorTint_std__allocatorTint_t_t,
-  &_swigt__p_std__vectorTint_std__allocatorTint_t_t__allocator_type,
-  &_swigt__p_std__vectorTstd__pairTViewEdge_p_bool_t_std__allocatorTstd__pairTViewEdge_p_bool_t_t_t,
-  &_swigt__p_std__vectorTunsigned_int_std__allocatorTunsigned_int_t_t,
+  &_swigt__p_std__mapT_int_int_std__lessT_int_t_std__allocatorT_std__pairT_int_const_int_t_t_t,
+  &_swigt__p_std__pairT_ViewEdge_p_bool_t,
+  &_swigt__p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t,
+  &_swigt__p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__allocator_type,
+  &_swigt__p_std__vectorT_Material_std__allocatorT_Material_t_t,
+  &_swigt__p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t,
+  &_swigt__p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__allocator_type,
+  &_swigt__p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t,
+  &_swigt__p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__allocator_type,
+  &_swigt__p_std__vectorT_TVertex_p_std__allocatorT_TVertex_p_t_t,
+  &_swigt__p_std__vectorT_VecMat__Vec2T_double_t_std__allocatorT_VecMat__Vec2T_double_t_t_t,
+  &_swigt__p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t,
+  &_swigt__p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__allocator_type,
+  &_swigt__p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t,
+  &_swigt__p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__allocator_type,
+  &_swigt__p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t,
+  &_swigt__p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__allocator_type,
+  &_swigt__p_std__vectorT_int_std__allocatorT_int_t_t,
+  &_swigt__p_std__vectorT_int_std__allocatorT_int_t_t__allocator_type,
+  &_swigt__p_std__vectorT_std__pairT_ViewEdge_p_bool_t_std__allocatorT_std__pairT_ViewEdge_p_bool_t_t_t,
+  &_swigt__p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t,
   &_swigt__p_svertices_container,
   &_swigt__p_swig__PySwigIterator,
   &_swigt__p_unsigned_int,
@@ -110791,16 +109669,16 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_viewshapes_container,
   &_swigt__p_viewvertices_container,
   &_swigt__p_void,
-  &_swigt__std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type,
-  &_swigt__std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type,
-  &_swigt__std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type,
-  &_swigt__std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type,
-  &_swigt__std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type,
-  &_swigt__std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type,
+  &_swigt__std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type,
+  &_swigt__std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type,
+  &_swigt__std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type,
+  &_swigt__std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type,
+  &_swigt__std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type,
+  &_swigt__std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type,
 };
 
 static swig_cast_info _swigc__p_AdjacencyIterator[] = {  {&_swigt__p_AdjacencyIterator, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_BBoxTVecMat__Vec3Tdouble_t_t[] = {  {&_swigt__p_BBoxTVecMat__Vec3Tdouble_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_BBoxT_VecMat__Vec3T_double_t_t[] = {  {&_swigt__p_BBoxT_VecMat__Vec3T_double_t_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_BinaryPredicate0D[] = {  {&_swigt__p_BinaryPredicate0D, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_BinaryPredicate1D[] = {  {&_swigt__p_Predicates1D__Length2DBP1D, _p_Predicates1D__Length2DBP1DTo_p_BinaryPredicate1D, 0, 0},  {&_swigt__p_Predicates1D__FalseBP1D, _p_Predicates1D__FalseBP1DTo_p_BinaryPredicate1D, 0, 0},  {&_swigt__p_BinaryPredicate1D, 0, 0, 0},  {&_swigt__p_Predicates1D__ViewMapGradientNormBP1D, _p_Predicates1D__ViewMapGradientNormBP1DTo_p_BinaryPredicate1D, 0, 0},  {&_swigt__p_Predicates1D__TrueBP1D, _p_Predicates1D__TrueBP1DTo_p_BinaryPredicate1D, 0, 0},  {&_swigt__p_Predicates1D__SameShapeIdBP1D, _p_Predicates1D__SameShapeIdBP1DTo_p_BinaryPredicate1D, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CalligraphicShader[] = {  {&_swigt__p_CalligraphicShader, 0, 0, 0},{0, 0, 0, 0}};
@@ -110814,7 +109692,7 @@ static swig_cast_info _swigc__p_Curve[] = {  {&_swigt__p_Curve, 0, 0, 0},{0, 0,
 static swig_cast_info _swigc__p_CurveInternal__CurvePointIterator[] = {  {&_swigt__p_CurveInternal__CurvePointIterator, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_CurvePoint[] = {  {&_swigt__p_StrokeVertex, _p_StrokeVertexTo_p_CurvePoint, 0, 0},  {&_swigt__p_CurvePoint, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_Curve__vertex_container__iterator[] = {  {&_swigt__p_Curve__vertex_container__iterator, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_FEdge[] = {  {&_swigt__p_FEdge, 0, 0, 0},  {&_swigt__p_FEdgeSharp, _p_FEdgeSharpTo_p_FEdge, 0, 0},  {&_swigt__p_FEdgeSmooth, _p_FEdgeSmoothTo_p_FEdge, 0, 0},  {&_swigt__std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_FEdge[] = {  {&_swigt__std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_FEdge, 0, 0, 0},  {&_swigt__p_FEdgeSharp, _p_FEdgeSharpTo_p_FEdge, 0, 0},  {&_swigt__p_FEdgeSmooth, _p_FEdgeSmoothTo_p_FEdge, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_FEdgeInternal__SVertexIterator[] = {  {&_swigt__p_FEdgeInternal__SVertexIterator, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_FEdgeSharp[] = {  {&_swigt__p_FEdgeSharp, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_FEdgeSmooth[] = {  {&_swigt__p_FEdgeSmooth, 0, 0, 0},{0, 0, 0, 0}};
@@ -110873,10 +109751,10 @@ static swig_cast_info _swigc__p_GrayImage[] = {  {&_swigt__p_GrayImage, 0, 0, 0}
 static swig_cast_info _swigc__p_I1DContainer[] = {  {&_swigt__p_I1DContainer, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_Id[] = {  {&_swigt__p_Id, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_IntegrationType[] = {  {&_swigt__p_IntegrationType, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_Interface0D[] = {  {&_swigt__std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, _p_SVertexTo_p_Interface0D, 0, 0},  {&_swigt__p_TVertex, _p_TVertexTo_p_Interface0D, 0, 0},  {&_swigt__p_NonTVertex, _p_NonTVertexTo_p_Interface0D, 0, 0},  {&_swigt__p_Interface0D, 0, 0, 0},  {&_swigt__p_SVertex, _p_SVertexTo_p_Interface0D, 0, 0},  {&_swigt__p_ViewVertex, _p_ViewVertexTo_p_Interface0D, 0, 0},  {&_swigt__std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, _p_ViewVertexTo_p_Interface0D, 0, 0},  {&_swigt__p_StrokeVertex, _p_StrokeVertexTo_p_Interface0D, 0, 0},  {&_swigt__p_CurvePoint, _p_CurvePointTo_p_Interface0D, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Interface0D[] = {  {&_swigt__std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, _p_ViewVertexTo_p_Interface0D, 0, 0},  {&_swigt__p_TVertex, _p_TVertexTo_p_Interface0D, 0, 0},  {&_swigt__p_NonTVertex, _p_NonTVertexTo_p_Interface0D, 0, 0},  {&_swigt__p_Interface0D, 0, 0, 0},  {&_swigt__p_ViewVertex, _p_ViewVertexTo_p_Interface0D, 0, 0},  {&_swigt__p_SVertex, _p_SVertexTo_p_Interface0D, 0, 0},  {&_swigt__std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, _p_SVertexTo_p_Interface0D, 0, 0},  {&_swigt__p_StrokeVertex, _p_StrokeVertexTo_p_Interface0D, 0, 0},  {&_swigt__p_CurvePoint, _p_CurvePointTo_p_Interface0D, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_Interface0DIterator[] = {  {&_swigt__p_Interface0DIterator, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_Interface0DIteratorNested[] = {  {&_swigt__p_Interface0DIteratorNested, 0, 0, 0},  {&_swigt__p_FEdgeInternal__SVertexIterator, _p_FEdgeInternal__SVertexIteratorTo_p_Interface0DIteratorNested, 0, 0},  {&_swigt__p_ViewEdgeInternal__SVertexIterator, _p_ViewEdgeInternal__SVertexIteratorTo_p_Interface0DIteratorNested, 0, 0},  {&_swigt__p_CurveInternal__CurvePointIterator, _p_CurveInternal__CurvePointIteratorTo_p_Interface0DIteratorNested, 0, 0},  {&_swigt__p_StrokeInternal__StrokeVertexIterator, _p_StrokeInternal__StrokeVertexIteratorTo_p_Interface0DIteratorNested, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_Interface1D[] = {  {&_swigt__p_Interface1D, 0, 0, 0},  {&_swigt__p_ViewEdge, _p_ViewEdgeTo_p_Interface1D, 0, 0},  {&_swigt__std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_Curve, _p_CurveTo_p_Interface1D, 0, 0},  {&_swigt__p_Stroke, _p_StrokeTo_p_Interface1D, 0, 0},  {&_swigt__p_FEdgeSharp, _p_FEdgeSharpTo_p_Interface1D, 0, 0},  {&_swigt__p_FEdgeSmooth, _p_FEdgeSmoothTo_p_Interface1D, 0, 0},  {&_swigt__p_FEdge, _p_FEdgeTo_p_Interface1D, 0, 0},  {&_swigt__std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_Interface1D[] = {  {&_swigt__p_Interface1D, 0, 0, 0},  {&_swigt__std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_ViewEdge, _p_ViewEdgeTo_p_Interface1D, 0, 0},  {&_swigt__p_Curve, _p_CurveTo_p_Interface1D, 0, 0},  {&_swigt__p_Stroke, _p_StrokeTo_p_Interface1D, 0, 0},  {&_swigt__std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_FEdgeSharp, _p_FEdgeSharpTo_p_Interface1D, 0, 0},  {&_swigt__p_FEdgeSmooth, _p_FEdgeSmoothTo_p_Interface1D, 0, 0},  {&_swigt__p_FEdge, _p_FEdgeTo_p_Interface1D, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_Material[] = {  {&_swigt__p_Material, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_MediumType[] = {  {&_swigt__p_MediumType, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_Module[] = {  {&_swigt__p_Module, 0, 0, 0},{0, 0, 0, 0}};
@@ -110906,7 +109784,7 @@ static swig_cast_info _swigc__p_Predicates1D__ViewMapGradientNormBP1D[] = {  {&_
 static swig_cast_info _swigc__p_RGBImage[] = {  {&_swigt__p_RGBImage, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_ReturnedValueType[] = {  {&_swigt__p_ReturnedValueType, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_SShape[] = {  {&_swigt__p_SShape, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_SVertex[] = {  {&_swigt__std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_SVertex, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_SVertex[] = {  {&_swigt__p_SVertex, 0, 0, 0},  {&_swigt__std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_SVertex__fedges_container__iterator[] = {  {&_swigt__p_SVertex__fedges_container__iterator, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_Smoother[] = {  {&_swigt__p_Smoother, 0, 0, 0},  {&_swigt__p_Omitter, _p_OmitterTo_p_Smoother, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_SmoothingShader[] = {  {&_swigt__p_SmoothingShader, 0, 0, 0},{0, 0, 0, 0}};
@@ -110917,7 +109795,7 @@ static swig_cast_info _swigc__p_StrokeAttribute[] = {  {&_swigt__p_StrokeAttribu
 static swig_cast_info _swigc__p_StrokeInternal__StrokeVertexIterator[] = {  {&_swigt__p_StrokeInternal__StrokeVertexIterator, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_StrokeLayer[] = {  {&_swigt__p_StrokeLayer, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_StrokeRenderer[] = {  {&_swigt__p_StrokeRenderer, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_StrokeShader[] = {  {&_swigt__p_StrokeShaders__ConstrainedIncreasingThicknessShader, _p_StrokeShaders__ConstrainedIncreasingThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_StrokeShaders__ColorNoiseShader, _p_StrokeShaders__ColorNoiseShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ThicknessNoiseShader, _p_StrokeShaders__ThicknessNoiseShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__LengthDependingThicknessShader, _p_StrokeShaders__LengthDependingThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__IncreasingThicknessShader, _p_StrokeShaders__IncreasingThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ConstantExternThicknessShader, _p_StrokeShaders__ConstantExternThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ConstantThicknessShader, _p_StrokeShaders__ConstantThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__StrokeTextureShader, _p_StrokeShaders__StrokeTextureShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__SamplingShader, _p_StrokeShaders__SamplingShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__BSplineShader, _p_StrokeShaders__BSplineShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__BezierCurveShader, _p_StrokeShaders__BezierCurveShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__InflateShader, _p_StrokeShaders__InflateShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShader, 0, 0, 0},  {&_swigt__p_StrokeShaders__GuidingLinesShader, _p_StrokeShaders__GuidingLinesShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__streamShader, _p_StrokeShaders__streamShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__fstreamShader, _p_StrokeShaders__fstreamShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_CalligraphicShader, _p_CalligraphicShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_SpatialNoiseShader, _p_SpatialNoiseShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_SmoothingShader, _p_SmoothingShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__TextureAssignerShader, _p_StrokeShaders__TextureAssignerShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__CalligraphicColorShader, _p_StrokeShaders__CalligraphicColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__MaterialColorShader, _p_StrokeShaders__MaterialColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ColorVariationPatternShader, _p_StrokeShaders__ColorVariationPatternShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__IncreasingColorShader, _p_StrokeShaders__IncreasingColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ConstantColorShader, _p_StrokeShaders__ConstantColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ThicknessVariationPatternShader, _p_StrokeShaders__ThicknessVariationPatternShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__BackboneStretcherShader, _p_StrokeShaders__BackboneStretcherShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ExternalContourStretcherShader, _p_StrokeShaders__ExternalContourStretcherShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__PolygonalizationShader, _p_StrokeShaders__PolygonalizationShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__TipRemoverShader, _p_StrokeShaders__TipRemoverShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_OmissionShader, _p_OmissionShaderTo_p_StrokeShader, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_StrokeShader[] = {  {&_swigt__p_StrokeShaders__ConstrainedIncreasingThicknessShader, _p_StrokeShaders__ConstrainedIncreasingThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_StrokeShaders__ColorNoiseShader, _p_StrokeShaders__ColorNoiseShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ThicknessNoiseShader, _p_StrokeShaders__ThicknessNoiseShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__LengthDependingThicknessShader, _p_StrokeShaders__LengthDependingThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__IncreasingThicknessShader, _p_StrokeShaders__IncreasingThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ConstantExternThicknessShader, _p_StrokeShaders__ConstantExternThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ConstantThicknessShader, _p_StrokeShaders__ConstantThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__StrokeTextureShader, _p_StrokeShaders__StrokeTextureShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__SamplingShader, _p_StrokeShaders__SamplingShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__BSplineShader, _p_StrokeShaders__BSplineShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__BezierCurveShader, _p_StrokeShaders__BezierCurveShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__InflateShader, _p_StrokeShaders__InflateShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShader, 0, 0, 0},  {&_swigt__p_StrokeShaders__GuidingLinesShader, _p_StrokeShaders__GuidingLinesShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__streamShader, _p_StrokeShaders__streamShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__fstreamShader, _p_StrokeShaders__fstreamShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_CalligraphicShader, _p_CalligraphicShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_SpatialNoiseShader, _p_SpatialNoiseShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_SmoothingShader, _p_SmoothingShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__TextureAssignerShader, _p_StrokeShaders__TextureAssignerShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__CalligraphicColorShader, _p_StrokeShaders__CalligraphicColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__MaterialColorShader, _p_StrokeShaders__MaterialColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ColorVariationPatternShader, _p_StrokeShaders__ColorVariationPatternShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__IncreasingColorShader, _p_StrokeShaders__IncreasingColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ConstantColorShader, _p_StrokeShaders__ConstantColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ThicknessVariationPatternShader, _p_StrokeShaders__ThicknessVariationPatternShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__BackboneStretcherShader, _p_StrokeShaders__BackboneStretcherShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ExternalContourStretcherShader, _p_StrokeShaders__ExternalContourStretcherShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__PolygonalizationShader, _p_StrokeShaders__PolygonalizationShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__TipRemoverShader, _p_StrokeShaders__TipRemoverShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_OmissionShader, _p_OmissionShaderTo_p_StrokeShader, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_StrokeShaders__BSplineShader[] = {  {&_swigt__p_StrokeShaders__BSplineShader, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_StrokeShaders__BackboneStretcherShader[] = {  {&_swigt__p_StrokeShaders__BackboneStretcherShader, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_StrokeShaders__BezierCurveShader[] = {  {&_swigt__p_StrokeShaders__BezierCurveShader, 0, 0, 0},{0, 0, 0, 0}};
@@ -110951,65 +109829,65 @@ static swig_cast_info _swigc__p_Stroke__viewedge_container__iterator[] = {  {&_s
 static swig_cast_info _swigc__p_StrokesContainer[] = {  {&_swigt__p_StrokesContainer, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_StyleModule[] = {  {&_swigt__p_StyleModule, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_TVertex[] = {  {&_swigt__p_TVertex, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction0DTId_t[] = {  {&_swigt__p_UnaryFunction0DTId_t, 0, 0, 0},  {&_swigt__p_Functions0D__ShapeIdF0D, _p_Functions0D__ShapeIdF0DTo_p_UnaryFunction0DTId_t, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t[] = {  {&_swigt__p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t, 0, 0, 0},  {&_swigt__p_Functions0D__VertexOrientation2DF0D, _p_Functions0D__VertexOrientation2DF0DTo_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t, 0, 0},  {&_swigt__p_Functions0D__Normal2DF0D, _p_Functions0D__Normal2DF0DTo_p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t[] = {  {&_swigt__p_Functions0D__VertexOrientation3DF0D, _p_Functions0D__VertexOrientation3DF0DTo_p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t, 0, 0},  {&_swigt__p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction0DTViewShape_p_t[] = {  {&_swigt__p_Functions0D__GetShapeF0D, _p_Functions0D__GetShapeF0DTo_p_UnaryFunction0DTViewShape_p_t, 0, 0},  {&_swigt__p_Functions0D__GetOccludeeF0D, _p_Functions0D__GetOccludeeF0DTo_p_UnaryFunction0DTViewShape_p_t, 0, 0},  {&_swigt__p_UnaryFunction0DTViewShape_p_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction0DTdouble_t[] = {  {&_swigt__p_UnaryFunction0DTdouble_t, 0, 0, 0},  {&_swigt__p_Functions0D__ZDiscontinuityF0D, _p_Functions0D__ZDiscontinuityF0DTo_p_UnaryFunction0DTdouble_t, 0, 0},  {&_swigt__p_Functions0D__DensityF0D, _p_Functions0D__DensityF0DTo_p_UnaryFunction0DTdouble_t, 0, 0},  {&_swigt__p_Functions0D__GetXF0D, _p_Functions0D__GetXF0DTo_p_UnaryFunction0DTdouble_t, 0, 0},  {&_swigt__p_Functions0D__GetProjectedXF0D, _p_Functions0D__GetProjectedXF0DTo_p_UnaryFunction0DTdouble_t, 0, 0},  {&_swigt__p_Functions0D__Curvature2DAngleF0D, _p_Functions0D__Curvature2DAngleF0DTo_p_UnaryFunction0DTdouble_t, 0, 0},  {&_swigt__p_Functions0D__GetYF0D, _p_Functions0D__GetYF0DTo_p_UnaryFunction0DTdouble_t, 0, 0},  {&_swigt__p_Functions0D__GetProjectedYF0D, _p_Functions0D__GetProjectedYF0DTo_p_UnaryFunction0DTdouble_t, 0, 0},  {&_swigt__p_Functions0D__GetZF0D, _p_Functions0D__GetZF0DTo_p_UnaryFunction0DTdouble_t, 0, 0},  {&_swigt__p_Functions0D__GetProjectedZF0D, _p_Functions0D__GetProjectedZF0DTo_p_UnaryFunction0DTdouble_t, 0, 0},  {&_swigt__p_Functions0D__LocalAverageDepthF0D, _p_Functions0D__LocalAverageDepthF0DTo_p_UnaryFunction0DTdouble_t, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction0DTfloat_t[] = {  {&_swigt__p_Functions0D__GetCurvilinearAbscissaF0D, _p_Functions0D__GetCurvilinearAbscissaF0DTo_p_UnaryFunction0DTfloat_t, 0, 0},  {&_swigt__p_Functions0D__ReadMapPixelF0D, _p_Functions0D__ReadMapPixelF0DTo_p_UnaryFunction0DTfloat_t, 0, 0},  {&_swigt__p_Functions0D__ReadSteerableViewMapPixelF0D, _p_Functions0D__ReadSteerableViewMapPixelF0DTo_p_UnaryFunction0DTfloat_t, 0, 0},  {&_swigt__p_Functions0D__ReadCompleteViewMapPixelF0D, _p_Functions0D__ReadCompleteViewMapPixelF0DTo_p_UnaryFunction0DTfloat_t, 0, 0},  {&_swigt__p_Functions0D__GetViewMapGradientNormF0D, _p_Functions0D__GetViewMapGradientNormF0DTo_p_UnaryFunction0DTfloat_t, 0, 0},  {&_swigt__p_UnaryFunction0DTfloat_t, 0, 0, 0},  {&_swigt__p_Functions0D__GetParameterF0D, _p_Functions0D__GetParameterF0DTo_p_UnaryFunction0DTfloat_t, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t[] = {  {&_swigt__p_Functions0D__GetOccludersF0D, _p_Functions0D__GetOccludersF0DTo_p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0, 0},  {&_swigt__p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction0DTunsigned_int_t[] = {  {&_swigt__p_Functions0D__QuantitativeInvisibilityF0D, _p_Functions0D__QuantitativeInvisibilityF0DTo_p_UnaryFunction0DTunsigned_int_t, 0, 0},  {&_swigt__p_UnaryFunction0DTunsigned_int_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction0DTvoid_t[] = {  {&_swigt__p_UnaryFunction0DTvoid_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t[] = {  {&_swigt__p_Functions1D__Orientation2DF1D, _p_Functions1D__Orientation2DF1DTo_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, 0, 0},  {&_swigt__p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, 0, 0, 0},  {&_swigt__p_Functions1D__Normal2DF1D, _p_Functions1D__Normal2DF1DTo_p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t[] = {  {&_swigt__p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t, 0, 0, 0},  {&_swigt__p_Functions1D__Orientation3DF1D, _p_Functions1D__Orientation3DF1DTo_p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction1DTdouble_t[] = {  {&_swigt__p_Functions1D__GetSteerableViewMapDensityF1D, _p_Functions1D__GetSteerableViewMapDensityF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__GetDirectionalViewMapDensityF1D, _p_Functions1D__GetDirectionalViewMapDensityF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__GetCompleteViewMapDensityF1D, _p_Functions1D__GetCompleteViewMapDensityF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__DensityF1D, _p_Functions1D__DensityF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__ZDiscontinuityF1D, _p_Functions1D__ZDiscontinuityF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__GetXF1D, _p_Functions1D__GetXF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__GetZF1D, _p_Functions1D__GetZF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__GetViewMapGradientNormF1D, _p_Functions1D__GetViewMapGradientNormF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__GetProjectedYF1D, _p_Functions1D__GetProjectedYF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_UnaryFunction1DTdouble_t, 0, 0, 0},  {&_swigt__p_Functions1D__Curvature2DAngleF1D, _p_Functions1D__Curvature2DAngleF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__GetYF1D, _p_Functions1D__GetYF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__GetProjectedXF1D, _p_Functions1D__GetProjectedXF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__LocalAverageDepthF1D, _p_Functions1D__LocalAverageDepthF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},  {&_swigt__p_Functions1D__GetProjectedZF1D, _p_Functions1D__GetProjectedZF1DTo_p_UnaryFunction1DTdouble_t, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction1DTfloat_t[] = {  {&_swigt__p_UnaryFunction1DTfloat_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t[] = {  {&_swigt__p_Functions1D__GetOccludeeF1D, _p_Functions1D__GetOccludeeF1DTo_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0, 0},  {&_swigt__p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0, 0, 0},  {&_swigt__p_Functions1D__GetShapeF1D, _p_Functions1D__GetShapeF1DTo_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0, 0},  {&_swigt__p_Functions1D__GetOccludersF1D, _p_Functions1D__GetOccludersF1DTo_p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction1DTunsigned_int_t[] = {  {&_swigt__p_Functions1D__QuantitativeInvisibilityF1D, _p_Functions1D__QuantitativeInvisibilityF1DTo_p_UnaryFunction1DTunsigned_int_t, 0, 0},  {&_swigt__p_UnaryFunction1DTunsigned_int_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UnaryFunction1DTvoid_t[] = {  {&_swigt__p_UnaryFunction1DTvoid_t, 0, 0, 0},  {&_swigt__p_Functions1D__TimeStampF1D, _p_Functions1D__TimeStampF1DTo_p_UnaryFunction1DTvoid_t, 0, 0},  {&_swigt__p_Functions1D__IncrementChainingTimeStampF1D, _p_Functions1D__IncrementChainingTimeStampF1DTo_p_UnaryFunction1DTvoid_t, 0, 0},  {&_swigt__p_Functions1D__ChainingTimeStampF1D, _p_Functions1D__ChainingTimeStampF1DTo_p_UnaryFunction1DTvoid_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction0DT_Id_t[] = {  {&_swigt__p_Functions0D__ShapeIdF0D, _p_Functions0D__ShapeIdF0DTo_p_UnaryFunction0DT_Id_t, 0, 0},  {&_swigt__p_UnaryFunction0DT_Id_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction0DT_VecMat__Vec2T_float_t_t[] = {  {&_swigt__p_UnaryFunction0DT_VecMat__Vec2T_float_t_t, 0, 0, 0},  {&_swigt__p_Functions0D__VertexOrientation2DF0D, _p_Functions0D__VertexOrientation2DF0DTo_p_UnaryFunction0DT_VecMat__Vec2T_float_t_t, 0, 0},  {&_swigt__p_Functions0D__Normal2DF0D, _p_Functions0D__Normal2DF0DTo_p_UnaryFunction0DT_VecMat__Vec2T_float_t_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction0DT_VecMat__Vec3T_float_t_t[] = {  {&_swigt__p_Functions0D__VertexOrientation3DF0D, _p_Functions0D__VertexOrientation3DF0DTo_p_UnaryFunction0DT_VecMat__Vec3T_float_t_t, 0, 0},  {&_swigt__p_UnaryFunction0DT_VecMat__Vec3T_float_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction0DT_ViewShape_p_t[] = {  {&_swigt__p_Functions0D__GetShapeF0D, _p_Functions0D__GetShapeF0DTo_p_UnaryFunction0DT_ViewShape_p_t, 0, 0},  {&_swigt__p_Functions0D__GetOccludeeF0D, _p_Functions0D__GetOccludeeF0DTo_p_UnaryFunction0DT_ViewShape_p_t, 0, 0},  {&_swigt__p_UnaryFunction0DT_ViewShape_p_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction0DT_double_t[] = {  {&_swigt__p_UnaryFunction0DT_double_t, 0, 0, 0},  {&_swigt__p_Functions0D__ZDiscontinuityF0D, _p_Functions0D__ZDiscontinuityF0DTo_p_UnaryFunction0DT_double_t, 0, 0},  {&_swigt__p_Functions0D__DensityF0D, _p_Functions0D__DensityF0DTo_p_UnaryFunction0DT_double_t, 0, 0},  {&_swigt__p_Functions0D__GetXF0D, _p_Functions0D__GetXF0DTo_p_UnaryFunction0DT_double_t, 0, 0},  {&_swigt__p_Functions0D__GetProjectedXF0D, _p_Functions0D__GetProjectedXF0DTo_p_UnaryFunction0DT_double_t, 0, 0},  {&_swigt__p_Functions0D__Curvature2DAngleF0D, _p_Functions0D__Curvature2DAngleF0DTo_p_UnaryFunction0DT_double_t, 0, 0},  {&_swigt__p_Functions0D__GetYF0D, _p_Functions0D__GetYF0DTo_p_UnaryFunction0DT_double_t, 0, 0},  {&_swigt__p_Functions0D__GetProjectedYF0D, _p_Functions0D__GetProjectedYF0DTo_p_UnaryFunction0DT_double_t, 0, 0},  {&_swigt__p_Functions0D__GetZF0D, _p_Functions0D__GetZF0DTo_p_UnaryFunction0DT_double_t, 0, 0},  {&_swigt__p_Functions0D__GetProjectedZF0D, _p_Functions0D__GetProjectedZF0DTo_p_UnaryFunction0DT_double_t, 0, 0},  {&_swigt__p_Functions0D__LocalAverageDepthF0D, _p_Functions0D__LocalAverageDepthF0DTo_p_UnaryFunction0DT_double_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction0DT_float_t[] = {  {&_swigt__p_Functions0D__GetCurvilinearAbscissaF0D, _p_Functions0D__GetCurvilinearAbscissaF0DTo_p_UnaryFunction0DT_float_t, 0, 0},  {&_swigt__p_Functions0D__ReadMapPixelF0D, _p_Functions0D__ReadMapPixelF0DTo_p_UnaryFunction0DT_float_t, 0, 0},  {&_swigt__p_Functions0D__ReadSteerableViewMapPixelF0D, _p_Functions0D__ReadSteerableViewMapPixelF0DTo_p_UnaryFunction0DT_float_t, 0, 0},  {&_swigt__p_Functions0D__ReadCompleteViewMapPixelF0D, _p_Functions0D__ReadCompleteViewMapPixelF0DTo_p_UnaryFunction0DT_float_t, 0, 0},  {&_swigt__p_Functions0D__GetViewMapGradientNormF0D, _p_Functions0D__GetViewMapGradientNormF0DTo_p_UnaryFunction0DT_float_t, 0, 0},  {&_swigt__p_UnaryFunction0DT_float_t, 0, 0, 0},  {&_swigt__p_Functions0D__GetParameterF0D, _p_Functions0D__GetParameterF0DTo_p_UnaryFunction0DT_float_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction0DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t[] = {  {&_swigt__p_Functions0D__GetOccludersF0D, _p_Functions0D__GetOccludersF0DTo_p_UnaryFunction0DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, 0, 0},  {&_swigt__p_UnaryFunction0DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction0DT_unsigned_int_t[] = {  {&_swigt__p_Functions0D__QuantitativeInvisibilityF0D, _p_Functions0D__QuantitativeInvisibilityF0DTo_p_UnaryFunction0DT_unsigned_int_t, 0, 0},  {&_swigt__p_UnaryFunction0DT_unsigned_int_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction0DT_void_t[] = {  {&_swigt__p_UnaryFunction0DT_void_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction1DT_VecMat__Vec2T_float_t_t[] = {  {&_swigt__p_Functions1D__Orientation2DF1D, _p_Functions1D__Orientation2DF1DTo_p_UnaryFunction1DT_VecMat__Vec2T_float_t_t, 0, 0},  {&_swigt__p_UnaryFunction1DT_VecMat__Vec2T_float_t_t, 0, 0, 0},  {&_swigt__p_Functions1D__Normal2DF1D, _p_Functions1D__Normal2DF1DTo_p_UnaryFunction1DT_VecMat__Vec2T_float_t_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction1DT_VecMat__Vec3T_float_t_t[] = {  {&_swigt__p_UnaryFunction1DT_VecMat__Vec3T_float_t_t, 0, 0, 0},  {&_swigt__p_Functions1D__Orientation3DF1D, _p_Functions1D__Orientation3DF1DTo_p_UnaryFunction1DT_VecMat__Vec3T_float_t_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction1DT_double_t[] = {  {&_swigt__p_Functions1D__GetSteerableViewMapDensityF1D, _p_Functions1D__GetSteerableViewMapDensityF1DTo_p_UnaryFunction1DT_double_t, 0, 0},  {&_swigt__p_Functions1D__GetDirectionalViewMapDensityF1D, _p_Functions1D__GetDirectionalViewMapDensityF1DTo_p_UnaryFunction1DT_double_t, 0, 0},  {&_swigt__p_Functions1D__GetCompleteViewMapDensityF1D, _p_Functions1D__GetCompleteViewMapDensityF1DTo_p_UnaryFunction1DT_double_t, 0, 0},  {&_swigt__p_Functions1D__DensityF1D, _p_Functions1D__DensityF1DTo_p_UnaryFunction1DT_double_t, 0, 0},  {&_swigt__p_Functions1D__ZDiscontinuityF1D, _p_Functions1D__ZDiscontinuityF1DTo_p_UnaryFunction1DT_double_t, 0, 0},  {&_swigt__p_Functions1D__GetXF1D, _p_Functions1D__GetXF1DTo_p_UnaryFunction1DT_double_t, 0, 0},  {&_swigt__p_Functions1D__GetZF1D, _p_Functions1D__GetZF1DTo_p_UnaryFunction1DT_double_t, 0, 0},  {&_swigt__p_Functions1D__GetViewMapGradientNormF1D, _p_Functions1D__GetViewMapGradientNormF1DTo_p_UnaryFunction1DT_double_t, 0, 0},  {&_swigt__p_Functions1D__GetProjectedYF1D, _p_Functions1D__GetProjectedYF1DTo_p_UnaryFunction1DT_double_t, 0, 0},  {&_swigt__p_UnaryFunction1DT_double_t, 0, 0, 0},  {&_swigt__p_Functions1D__Curvature2DAngleF1D, _p_Functions1D__Curvature2DAngleF1DTo_p_UnaryFunction1DT_double_t, 0, 0},  {&_swigt__p_Functions1D__GetYF1D, _p_Functions1D__GetYF1DTo_p_UnaryFunction1DT_double_t, 0, 0},  {&_swigt__p_Functions1D__GetProjectedXF1D, _p_Functions1D__GetProjectedXF1DTo_p_UnaryFunction1DT_double_t, 0, 0},  {&_swigt__p_Functions1D__LocalAverageDepthF1D, _p_Functions1D__LocalAverageDepthF1DTo_p_UnaryFunction1DT_double_t, 0, 0},  {&_swigt__p_Functions1D__GetProjectedZF1D, _p_Functions1D__GetProjectedZF1DTo_p_UnaryFunction1DT_double_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction1DT_float_t[] = {  {&_swigt__p_UnaryFunction1DT_float_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t[] = {  {&_swigt__p_Functions1D__GetOccludeeF1D, _p_Functions1D__GetOccludeeF1DTo_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, 0, 0},  {&_swigt__p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, 0, 0, 0},  {&_swigt__p_Functions1D__GetShapeF1D, _p_Functions1D__GetShapeF1DTo_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, 0, 0},  {&_swigt__p_Functions1D__GetOccludersF1D, _p_Functions1D__GetOccludersF1DTo_p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction1DT_unsigned_int_t[] = {  {&_swigt__p_Functions1D__QuantitativeInvisibilityF1D, _p_Functions1D__QuantitativeInvisibilityF1DTo_p_UnaryFunction1DT_unsigned_int_t, 0, 0},  {&_swigt__p_UnaryFunction1DT_unsigned_int_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UnaryFunction1DT_void_t[] = {  {&_swigt__p_UnaryFunction1DT_void_t, 0, 0, 0},  {&_swigt__p_Functions1D__TimeStampF1D, _p_Functions1D__TimeStampF1DTo_p_UnaryFunction1DT_void_t, 0, 0},  {&_swigt__p_Functions1D__IncrementChainingTimeStampF1D, _p_Functions1D__IncrementChainingTimeStampF1DTo_p_UnaryFunction1DT_void_t, 0, 0},  {&_swigt__p_Functions1D__ChainingTimeStampF1D, _p_Functions1D__ChainingTimeStampF1DTo_p_UnaryFunction1DT_void_t, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_UnaryPredicate0D[] = {  {&_swigt__p_Predicates0D__TrueUP0D, _p_Predicates0D__TrueUP0DTo_p_UnaryPredicate0D, 0, 0},  {&_swigt__p_Predicates0D__FalseUP0D, _p_Predicates0D__FalseUP0DTo_p_UnaryPredicate0D, 0, 0},  {&_swigt__p_UnaryPredicate0D, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_UnaryPredicate1D[] = {  {&_swigt__p_Predicates1D__FalseUP1D, _p_Predicates1D__FalseUP1DTo_p_UnaryPredicate1D, 0, 0},  {&_swigt__p_Predicates1D__ShapeUP1D, _p_Predicates1D__ShapeUP1DTo_p_UnaryPredicate1D, 0, 0},  {&_swigt__p_Predicates1D__DensityLowerThanUP1D, _p_Predicates1D__DensityLowerThanUP1DTo_p_UnaryPredicate1D, 0, 0},  {&_swigt__p_UnaryPredicate1D, 0, 0, 0},  {&_swigt__p_Predicates1D__EqualToTimeStampUP1D, _p_Predicates1D__EqualToTimeStampUP1DTo_p_UnaryPredicate1D, 0, 0},  {&_swigt__p_Predicates1D__EqualToChainingTimeStampUP1D, _p_Predicates1D__EqualToChainingTimeStampUP1DTo_p_UnaryPredicate1D, 0, 0},  {&_swigt__p_Predicates1D__TrueUP1D, _p_Predicates1D__TrueUP1DTo_p_UnaryPredicate1D, 0, 0},  {&_swigt__p_Predicates1D__QuantitativeInvisibilityUP1D, _p_Predicates1D__QuantitativeInvisibilityUP1DTo_p_UnaryPredicate1D, 0, 0},  {&_swigt__p_Predicates1D__ContourUP1D, _p_Predicates1D__ContourUP1DTo_p_UnaryPredicate1D, 0, 0},  {&_swigt__p_Predicates1D__ExternalContourUP1D, _p_Predicates1D__ExternalContourUP1DTo_p_UnaryPredicate1D, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__HVec3Tdouble_t[] = {  {&_swigt__p_VecMat__HVec3Tdouble_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__HVec3Tfloat_t[] = {  {&_swigt__p_VecMat__HVec3Tfloat_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__HVec3Tint_t[] = {  {&_swigt__p_VecMat__HVec3Tint_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__HVec3Tunsigned_int_t[] = {  {&_swigt__p_VecMat__HVec3Tunsigned_int_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__SquareMatrixTdouble_2_t[] = {  {&_swigt__p_VecMat__SquareMatrixTdouble_2_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__SquareMatrixTdouble_3_t[] = {  {&_swigt__p_VecMat__SquareMatrixTdouble_3_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__SquareMatrixTdouble_4_t[] = {  {&_swigt__p_VecMat__SquareMatrixTdouble_4_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__SquareMatrixTfloat_2_t[] = {  {&_swigt__p_VecMat__SquareMatrixTfloat_2_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__SquareMatrixTfloat_3_t[] = {  {&_swigt__p_VecMat__SquareMatrixTfloat_3_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__SquareMatrixTfloat_4_t[] = {  {&_swigt__p_VecMat__SquareMatrixTfloat_4_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__SquareMatrixTint_2_t[] = {  {&_swigt__p_VecMat__SquareMatrixTint_2_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__SquareMatrixTint_3_t[] = {  {&_swigt__p_VecMat__SquareMatrixTint_3_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__SquareMatrixTint_4_t[] = {  {&_swigt__p_VecMat__SquareMatrixTint_4_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__SquareMatrixTunsigned_int_2_t[] = {  {&_swigt__p_VecMat__SquareMatrixTunsigned_int_2_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__SquareMatrixTunsigned_int_3_t[] = {  {&_swigt__p_VecMat__SquareMatrixTunsigned_int_3_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__SquareMatrixTunsigned_int_4_t[] = {  {&_swigt__p_VecMat__SquareMatrixTunsigned_int_4_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__Vec2Tdouble_t[] = {  {&_swigt__p_VecMat__Vec2Tdouble_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__Vec2Tfloat_t[] = {  {&_swigt__p_VecMat__Vec2Tfloat_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__Vec2Tint_t[] = {  {&_swigt__p_VecMat__Vec2Tint_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__Vec2Tunsigned_int_t[] = {  {&_swigt__p_VecMat__Vec2Tunsigned_int_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__Vec3Tdouble_t[] = {  {&_swigt__p_VecMat__Vec3Tdouble_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__Vec3Tfloat_t[] = {  {&_swigt__p_VecMat__Vec3Tfloat_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__Vec3Tint_t[] = {  {&_swigt__p_VecMat__Vec3Tint_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__Vec3Tunsigned_int_t[] = {  {&_swigt__p_VecMat__Vec3Tunsigned_int_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__VecTdouble_2_t[] = {  {&_swigt__p_VecMat__VecTdouble_2_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec2Tdouble_t, _p_VecMat__Vec2Tdouble_tTo_p_VecMat__VecTdouble_2_t, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__VecTdouble_3_t[] = {  {&_swigt__p_VecMat__Vec3Tdouble_t, _p_VecMat__Vec3Tdouble_tTo_p_VecMat__VecTdouble_3_t, 0, 0},  {&_swigt__p_VecMat__VecTdouble_3_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__VecTfloat_2_t[] = {  {&_swigt__p_VecMat__VecTfloat_2_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec2Tfloat_t, _p_VecMat__Vec2Tfloat_tTo_p_VecMat__VecTfloat_2_t, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__VecTfloat_3_t[] = {  {&_swigt__p_VecMat__VecTfloat_3_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec3Tfloat_t, _p_VecMat__Vec3Tfloat_tTo_p_VecMat__VecTfloat_3_t, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__VecTint_2_t[] = {  {&_swigt__p_VecMat__VecTint_2_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec2Tint_t, _p_VecMat__Vec2Tint_tTo_p_VecMat__VecTint_2_t, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__VecTint_3_t[] = {  {&_swigt__p_VecMat__VecTint_3_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec3Tint_t, _p_VecMat__Vec3Tint_tTo_p_VecMat__VecTint_3_t, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__VecTunsigned_int_2_t[] = {  {&_swigt__p_VecMat__VecTunsigned_int_2_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec2Tunsigned_int_t, _p_VecMat__Vec2Tunsigned_int_tTo_p_VecMat__VecTunsigned_int_2_t, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_VecMat__VecTunsigned_int_3_t[] = {  {&_swigt__p_VecMat__VecTunsigned_int_3_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec3Tunsigned_int_t, _p_VecMat__Vec3Tunsigned_int_tTo_p_VecMat__VecTunsigned_int_3_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__HVec3T_double_t[] = {  {&_swigt__p_VecMat__HVec3T_double_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__HVec3T_float_t[] = {  {&_swigt__p_VecMat__HVec3T_float_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__HVec3T_int_t[] = {  {&_swigt__p_VecMat__HVec3T_int_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__HVec3T_unsigned_int_t[] = {  {&_swigt__p_VecMat__HVec3T_unsigned_int_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixT_double_2_t[] = {  {&_swigt__p_VecMat__SquareMatrixT_double_2_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixT_double_3_t[] = {  {&_swigt__p_VecMat__SquareMatrixT_double_3_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixT_double_4_t[] = {  {&_swigt__p_VecMat__SquareMatrixT_double_4_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixT_float_2_t[] = {  {&_swigt__p_VecMat__SquareMatrixT_float_2_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixT_float_3_t[] = {  {&_swigt__p_VecMat__SquareMatrixT_float_3_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixT_float_4_t[] = {  {&_swigt__p_VecMat__SquareMatrixT_float_4_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixT_int_2_t[] = {  {&_swigt__p_VecMat__SquareMatrixT_int_2_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixT_int_3_t[] = {  {&_swigt__p_VecMat__SquareMatrixT_int_3_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixT_int_4_t[] = {  {&_swigt__p_VecMat__SquareMatrixT_int_4_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixT_unsigned_int_2_t[] = {  {&_swigt__p_VecMat__SquareMatrixT_unsigned_int_2_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixT_unsigned_int_3_t[] = {  {&_swigt__p_VecMat__SquareMatrixT_unsigned_int_3_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__SquareMatrixT_unsigned_int_4_t[] = {  {&_swigt__p_VecMat__SquareMatrixT_unsigned_int_4_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__Vec2T_double_t[] = {  {&_swigt__p_VecMat__Vec2T_double_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__Vec2T_float_t[] = {  {&_swigt__p_VecMat__Vec2T_float_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__Vec2T_int_t[] = {  {&_swigt__p_VecMat__Vec2T_int_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__Vec2T_unsigned_int_t[] = {  {&_swigt__p_VecMat__Vec2T_unsigned_int_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__Vec3T_double_t[] = {  {&_swigt__p_VecMat__Vec3T_double_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__Vec3T_float_t[] = {  {&_swigt__p_VecMat__Vec3T_float_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__Vec3T_int_t[] = {  {&_swigt__p_VecMat__Vec3T_int_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__Vec3T_unsigned_int_t[] = {  {&_swigt__p_VecMat__Vec3T_unsigned_int_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__VecT_double_2_t[] = {  {&_swigt__p_VecMat__VecT_double_2_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec2T_double_t, _p_VecMat__Vec2T_double_tTo_p_VecMat__VecT_double_2_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__VecT_double_3_t[] = {  {&_swigt__p_VecMat__Vec3T_double_t, _p_VecMat__Vec3T_double_tTo_p_VecMat__VecT_double_3_t, 0, 0},  {&_swigt__p_VecMat__VecT_double_3_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__VecT_float_2_t[] = {  {&_swigt__p_VecMat__VecT_float_2_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec2T_float_t, _p_VecMat__Vec2T_float_tTo_p_VecMat__VecT_float_2_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__VecT_float_3_t[] = {  {&_swigt__p_VecMat__VecT_float_3_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec3T_float_t, _p_VecMat__Vec3T_float_tTo_p_VecMat__VecT_float_3_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__VecT_int_2_t[] = {  {&_swigt__p_VecMat__VecT_int_2_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec2T_int_t, _p_VecMat__Vec2T_int_tTo_p_VecMat__VecT_int_2_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__VecT_int_3_t[] = {  {&_swigt__p_VecMat__VecT_int_3_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec3T_int_t, _p_VecMat__Vec3T_int_tTo_p_VecMat__VecT_int_3_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__VecT_unsigned_int_2_t[] = {  {&_swigt__p_VecMat__VecT_unsigned_int_2_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec2T_unsigned_int_t, _p_VecMat__Vec2T_unsigned_int_tTo_p_VecMat__VecT_unsigned_int_2_t, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_VecMat__VecT_unsigned_int_3_t[] = {  {&_swigt__p_VecMat__VecT_unsigned_int_3_t, 0, 0, 0},  {&_swigt__p_VecMat__Vec3T_unsigned_int_t, _p_VecMat__Vec3T_unsigned_int_tTo_p_VecMat__VecT_unsigned_int_3_t, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_Vertex[] = {  {&_swigt__p_Vertex, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_ViewEdge[] = {  {&_swigt__p_ViewEdge, 0, 0, 0},  {&_swigt__std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_ViewEdge[] = {  {&_swigt__std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_ViewEdge, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_ViewEdgeInternal__SVertexIterator[] = {  {&_swigt__p_ViewEdgeInternal__SVertexIterator, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_ViewEdgeInternal__ViewEdgeIterator[] = {  {&_swigt__p_ViewEdgeInternal__ViewEdgeIterator, 0, 0, 0},  {&_swigt__p_ChainingIterator, _p_ChainingIteratorTo_p_ViewEdgeInternal__ViewEdgeIterator, 0, 0},  {&_swigt__p_ChainSilhouetteIterator, _p_ChainSilhouetteIteratorTo_p_ViewEdgeInternal__ViewEdgeIterator, 0, 0},  {&_swigt__p_ChainPredicateIterator, _p_ChainPredicateIteratorTo_p_ViewEdgeInternal__ViewEdgeIterator, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_ViewMap[] = {  {&_swigt__p_ViewMap, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_ViewShape[] = {  {&_swigt__p_ViewShape, 0, 0, 0},  {&_swigt__std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_ViewVertex[] = {  {&_swigt__p_TVertex, _p_TVertexTo_p_ViewVertex, 0, 0},  {&_swigt__p_NonTVertex, _p_NonTVertexTo_p_ViewVertex, 0, 0},  {&_swigt__p_ViewVertex, 0, 0, 0},  {&_swigt__std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t[] = {  {&_swigt__p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t[] = {  {&_swigt__p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_ViewShape[] = {  {&_swigt__p_ViewShape, 0, 0, 0},  {&_swigt__std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_ViewVertex[] = {  {&_swigt__std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_TVertex, _p_TVertexTo_p_ViewVertex, 0, 0},  {&_swigt__p_NonTVertex, _p_NonTVertexTo_p_ViewVertex, 0, 0},  {&_swigt__p_ViewVertex, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_const_traits_t[] = {  {&_swigt__p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_const_traits_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_nonconst_traits_t[] = {  {&_swigt__p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_nonconst_traits_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_ViewVertexInternal__orientedViewEdgeIterator[] = {  {&_swigt__p_ViewVertexInternal__orientedViewEdgeIterator, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_ViewVertexInternal__orientedViewEdgeIterator__edge_pointers_container__iterator[] = {  {&_swigt__p_ViewVertexInternal__orientedViewEdgeIterator__edge_pointers_container__iterator, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_ViewVertexInternal__orientedViewEdgeIterator__edges_container__iterator[] = {  {&_swigt__p_ViewVertexInternal__orientedViewEdgeIterator__edges_container__iterator, 0, 0, 0},{0, 0, 0, 0}};
@@ -111039,30 +109917,30 @@ static swig_cast_info _swigc__p_p_PyObject[] = {  {&_swigt__p_p_PyObject, 0, 0,
 static swig_cast_info _swigc__p_point_iterator[] = {  {&_swigt__p_point_iterator, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_point_type[] = {  {&_swigt__p_point_type, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_reference[] = {  {&_swigt__p_reference, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_setTVecMat__Vec3Tdouble_t_t[] = {  {&_swigt__p_setTVecMat__Vec3Tdouble_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_setT_VecMat__Vec3T_double_t_t[] = {  {&_swigt__p_setT_VecMat__Vec3T_double_t_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_size_type[] = {  {&_swigt__p_size_type, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_std__invalid_argument[] = {  {&_swigt__p_std__invalid_argument, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__mapTint_int_std__lessTint_t_std__allocatorTstd__pairTint_const_int_t_t_t[] = {  {&_swigt__p_std__mapTint_int_std__lessTint_t_std__allocatorTstd__pairTint_const_int_t_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__pairTViewEdge_p_bool_t[] = {  {&_swigt__p_std__pairTViewEdge_p_bool_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t[] = {  {&_swigt__p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__allocator_type[] = {  {&_swigt__p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorTMaterial_std__allocatorTMaterial_t_t[] = {  {&_swigt__p_std__vectorTMaterial_std__allocatorTMaterial_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t[] = {  {&_swigt__p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__allocator_type[] = {  {&_swigt__p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t[] = {  {&_swigt__p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__allocator_type[] = {  {&_swigt__p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorTTVertex_p_std__allocatorTTVertex_p_t_t[] = {  {&_swigt__p_std__vectorTTVertex_p_std__allocatorTTVertex_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorTVecMat__Vec2Tdouble_t_std__allocatorTVecMat__Vec2Tdouble_t_t_t[] = {  {&_swigt__p_std__vectorTVecMat__Vec2Tdouble_t_std__allocatorTVecMat__Vec2Tdouble_t_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t[] = {  {&_swigt__p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__allocator_type[] = {  {&_swigt__p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t[] = {  {&_swigt__p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__allocator_type[] = {  {&_swigt__p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t[] = {  {&_swigt__p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__allocator_type[] = {  {&_swigt__p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorTint_std__allocatorTint_t_t[] = {  {&_swigt__p_std__vectorTint_std__allocatorTint_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorTint_std__allocatorTint_t_t__allocator_type[] = {  {&_swigt__p_std__vectorTint_std__allocatorTint_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorTstd__pairTViewEdge_p_bool_t_std__allocatorTstd__pairTViewEdge_p_bool_t_t_t[] = {  {&_swigt__p_std__vectorTstd__pairTViewEdge_p_bool_t_std__allocatorTstd__pairTViewEdge_p_bool_t_t_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_std__vectorTunsigned_int_std__allocatorTunsigned_int_t_t[] = {  {&_swigt__p_std__vectorTunsigned_int_std__allocatorTunsigned_int_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__mapT_int_int_std__lessT_int_t_std__allocatorT_std__pairT_int_const_int_t_t_t[] = {  {&_swigt__p_std__mapT_int_int_std__lessT_int_t_std__allocatorT_std__pairT_int_const_int_t_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__pairT_ViewEdge_p_bool_t[] = {  {&_swigt__p_std__pairT_ViewEdge_p_bool_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t[] = {  {&_swigt__p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__allocator_type[] = {  {&_swigt__p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorT_Material_std__allocatorT_Material_t_t[] = {  {&_swigt__p_std__vectorT_Material_std__allocatorT_Material_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t[] = {  {&_swigt__p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__allocator_type[] = {  {&_swigt__p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t[] = {  {&_swigt__p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__allocator_type[] = {  {&_swigt__p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorT_TVertex_p_std__allocatorT_TVertex_p_t_t[] = {  {&_swigt__p_std__vectorT_TVertex_p_std__allocatorT_TVertex_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorT_VecMat__Vec2T_double_t_std__allocatorT_VecMat__Vec2T_double_t_t_t[] = {  {&_swigt__p_std__vectorT_VecMat__Vec2T_double_t_std__allocatorT_VecMat__Vec2T_double_t_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t[] = {  {&_swigt__p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__allocator_type[] = {  {&_swigt__p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t[] = {  {&_swigt__p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__allocator_type[] = {  {&_swigt__p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t[] = {  {&_swigt__p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__allocator_type[] = {  {&_swigt__p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorT_int_std__allocatorT_int_t_t[] = {  {&_swigt__p_std__vectorT_int_std__allocatorT_int_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorT_int_std__allocatorT_int_t_t__allocator_type[] = {  {&_swigt__p_std__vectorT_int_std__allocatorT_int_t_t__allocator_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorT_std__pairT_ViewEdge_p_bool_t_std__allocatorT_std__pairT_ViewEdge_p_bool_t_t_t[] = {  {&_swigt__p_std__vectorT_std__pairT_ViewEdge_p_bool_t_std__allocatorT_std__pairT_ViewEdge_p_bool_t_t_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t[] = {  {&_swigt__p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_svertices_container[] = {  {&_swigt__p_svertices_container, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_swig__PySwigIterator[] = {  {&_swigt__p_swig__PySwigIterator, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_unsigned_int[] = {  {&_swigt__p_unsigned_int, 0, 0, 0},{0, 0, 0, 0}};
@@ -111076,16 +109954,16 @@ static swig_cast_info _swigc__p_viewedges_container[] = {  {&_swigt__p_viewedges
 static swig_cast_info _swigc__p_viewshapes_container[] = {  {&_swigt__p_viewshapes_container, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_viewvertices_container[] = {  {&_swigt__p_viewvertices_container, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_void[] = {  {&_swigt__p_void, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type[] = {  {&_swigt__p_FEdge, 0, 0, 0},  {&_swigt__p_FEdgeSharp, _p_FEdgeSharpTo_p_FEdge, 0, 0},  {&_swigt__p_FEdgeSmooth, _p_FEdgeSmoothTo_p_FEdge, 0, 0},  {&_swigt__std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type[] = {  {&_swigt__std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_SVertex, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type[] = {  {&_swigt__p_StrokeShaders__ConstrainedIncreasingThicknessShader, _p_StrokeShaders__ConstrainedIncreasingThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_StrokeShader, 0, 0, 0},  {&_swigt__p_StrokeShaders__ColorNoiseShader, _p_StrokeShaders__ColorNoiseShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ThicknessNoiseShader, _p_StrokeShaders__ThicknessNoiseShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__LengthDependingThicknessShader, _p_StrokeShaders__LengthDependingThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__IncreasingThicknessShader, _p_StrokeShaders__IncreasingThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ConstantExternThicknessShader, _p_StrokeShaders__ConstantExternThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ConstantThicknessShader, _p_StrokeShaders__ConstantThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__StrokeTextureShader, _p_StrokeShaders__StrokeTextureShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__SamplingShader, _p_StrokeShaders__SamplingShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__BSplineShader, _p_StrokeShaders__BSplineShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__BezierCurveShader, _p_StrokeShaders__BezierCurveShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__InflateShader, _p_StrokeShaders__InflateShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__GuidingLinesShader, _p_StrokeShaders__GuidingLinesShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__streamShader, _p_StrokeShaders__streamShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__fstreamShader, _p_StrokeShaders__fstreamShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_CalligraphicShader, _p_CalligraphicShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_SpatialNoiseShader, _p_SpatialNoiseShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_SmoothingShader, _p_SmoothingShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__TextureAssignerShader, _p_StrokeShaders__TextureAssignerShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__CalligraphicColorShader, _p_StrokeShaders__CalligraphicColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__MaterialColorShader, _p_StrokeShaders__MaterialColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ColorVariationPatternShader, _p_StrokeShaders__ColorVariationPatternShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__IncreasingColorShader, _p_StrokeShaders__IncreasingColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ConstantColorShader, _p_StrokeShaders__ConstantColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ThicknessVariationPatternShader, _p_StrokeShaders__ThicknessVariationPatternShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__BackboneStretcherShader, _p_StrokeShaders__BackboneStretcherShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ExternalContourStretcherShader, _p_StrokeShaders__ExternalContourStretcherShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__PolygonalizationShader, _p_StrokeShaders__PolygonalizationShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__TipRemoverShader, _p_StrokeShaders__TipRemoverShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_OmissionShader, _p_OmissionShaderTo_p_StrokeShader, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type[] = {  {&_swigt__std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_ViewEdge, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type[] = {  {&_swigt__p_ViewShape, 0, 0, 0},  {&_swigt__std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type[] = {  {&_swigt__p_TVertex, _p_TVertexTo_p_ViewVertex, 0, 0},  {&_swigt__p_NonTVertex, _p_NonTVertexTo_p_ViewVertex, 0, 0},  {&_swigt__std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_ViewVertex, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type[] = {  {&_swigt__std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_FEdge, 0, 0, 0},  {&_swigt__p_FEdgeSharp, _p_FEdgeSharpTo_p_FEdge, 0, 0},  {&_swigt__p_FEdgeSmooth, _p_FEdgeSmoothTo_p_FEdge, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type[] = {  {&_swigt__std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_SVertex, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type[] = {  {&_swigt__p_StrokeShaders__ConstrainedIncreasingThicknessShader, _p_StrokeShaders__ConstrainedIncreasingThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_StrokeShader, 0, 0, 0},  {&_swigt__p_StrokeShaders__ColorNoiseShader, _p_StrokeShaders__ColorNoiseShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ThicknessNoiseShader, _p_StrokeShaders__ThicknessNoiseShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__LengthDependingThicknessShader, _p_StrokeShaders__LengthDependingThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__IncreasingThicknessShader, _p_StrokeShaders__IncreasingThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ConstantExternThicknessShader, _p_StrokeShaders__ConstantExternThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ConstantThicknessShader, _p_StrokeShaders__ConstantThicknessShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__StrokeTextureShader, _p_StrokeShaders__StrokeTextureShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__SamplingShader, _p_StrokeShaders__SamplingShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__BSplineShader, _p_StrokeShaders__BSplineShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__BezierCurveShader, _p_StrokeShaders__BezierCurveShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__InflateShader, _p_StrokeShaders__InflateShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__GuidingLinesShader, _p_StrokeShaders__GuidingLinesShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__streamShader, _p_StrokeShaders__streamShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__fstreamShader, _p_StrokeShaders__fstreamShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_CalligraphicShader, _p_CalligraphicShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_SpatialNoiseShader, _p_SpatialNoiseShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_SmoothingShader, _p_SmoothingShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__TextureAssignerShader, _p_StrokeShaders__TextureAssignerShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__CalligraphicColorShader, _p_StrokeShaders__CalligraphicColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__MaterialColorShader, _p_StrokeShaders__MaterialColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ColorVariationPatternShader, _p_StrokeShaders__ColorVariationPatternShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__IncreasingColorShader, _p_StrokeShaders__IncreasingColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ConstantColorShader, _p_StrokeShaders__ConstantColorShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ThicknessVariationPatternShader, _p_StrokeShaders__ThicknessVariationPatternShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__BackboneStretcherShader, _p_StrokeShaders__BackboneStretcherShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__ExternalContourStretcherShader, _p_StrokeShaders__ExternalContourStretcherShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__PolygonalizationShader, _p_StrokeShaders__PolygonalizationShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_StrokeShaders__TipRemoverShader, _p_StrokeShaders__TipRemoverShaderTo_p_StrokeShader, 0, 0},  {&_swigt__p_OmissionShader, _p_OmissionShaderTo_p_StrokeShader, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type[] = {  {&_swigt__std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_ViewEdge, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type[] = {  {&_swigt__p_ViewShape, 0, 0, 0},  {&_swigt__std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type[] = {  {&_swigt__std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type, 0, 0, 0},  {&_swigt__p_TVertex, _p_TVertexTo_p_ViewVertex, 0, 0},  {&_swigt__p_NonTVertex, _p_NonTVertexTo_p_ViewVertex, 0, 0},  {&_swigt__p_ViewVertex, 0, 0, 0},{0, 0, 0, 0}};
 
 static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_AdjacencyIterator,
-  _swigc__p_BBoxTVecMat__Vec3Tdouble_t_t,
+  _swigc__p_BBoxT_VecMat__Vec3T_double_t_t,
   _swigc__p_BinaryPredicate0D,
   _swigc__p_BinaryPredicate1D,
   _swigc__p_CalligraphicShader,
@@ -111236,56 +110114,56 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_StrokesContainer,
   _swigc__p_StyleModule,
   _swigc__p_TVertex,
-  _swigc__p_UnaryFunction0DTId_t,
-  _swigc__p_UnaryFunction0DTVecMat__Vec2Tfloat_t_t,
-  _swigc__p_UnaryFunction0DTVecMat__Vec3Tfloat_t_t,
-  _swigc__p_UnaryFunction0DTViewShape_p_t,
-  _swigc__p_UnaryFunction0DTdouble_t,
-  _swigc__p_UnaryFunction0DTfloat_t,
-  _swigc__p_UnaryFunction0DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t,
-  _swigc__p_UnaryFunction0DTunsigned_int_t,
-  _swigc__p_UnaryFunction0DTvoid_t,
-  _swigc__p_UnaryFunction1DTVecMat__Vec2Tfloat_t_t,
-  _swigc__p_UnaryFunction1DTVecMat__Vec3Tfloat_t_t,
-  _swigc__p_UnaryFunction1DTdouble_t,
-  _swigc__p_UnaryFunction1DTfloat_t,
-  _swigc__p_UnaryFunction1DTstd__vectorTViewShape_p_std__allocatorTViewShape_p_t_t_t,
-  _swigc__p_UnaryFunction1DTunsigned_int_t,
-  _swigc__p_UnaryFunction1DTvoid_t,
+  _swigc__p_UnaryFunction0DT_Id_t,
+  _swigc__p_UnaryFunction0DT_VecMat__Vec2T_float_t_t,
+  _swigc__p_UnaryFunction0DT_VecMat__Vec3T_float_t_t,
+  _swigc__p_UnaryFunction0DT_ViewShape_p_t,
+  _swigc__p_UnaryFunction0DT_double_t,
+  _swigc__p_UnaryFunction0DT_float_t,
+  _swigc__p_UnaryFunction0DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t,
+  _swigc__p_UnaryFunction0DT_unsigned_int_t,
+  _swigc__p_UnaryFunction0DT_void_t,
+  _swigc__p_UnaryFunction1DT_VecMat__Vec2T_float_t_t,
+  _swigc__p_UnaryFunction1DT_VecMat__Vec3T_float_t_t,
+  _swigc__p_UnaryFunction1DT_double_t,
+  _swigc__p_UnaryFunction1DT_float_t,
+  _swigc__p_UnaryFunction1DT_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t_t,
+  _swigc__p_UnaryFunction1DT_unsigned_int_t,
+  _swigc__p_UnaryFunction1DT_void_t,
   _swigc__p_UnaryPredicate0D,
   _swigc__p_UnaryPredicate1D,
-  _swigc__p_VecMat__HVec3Tdouble_t,
-  _swigc__p_VecMat__HVec3Tfloat_t,
-  _swigc__p_VecMat__HVec3Tint_t,
-  _swigc__p_VecMat__HVec3Tunsigned_int_t,
-  _swigc__p_VecMat__SquareMatrixTdouble_2_t,
-  _swigc__p_VecMat__SquareMatrixTdouble_3_t,
-  _swigc__p_VecMat__SquareMatrixTdouble_4_t,
-  _swigc__p_VecMat__SquareMatrixTfloat_2_t,
-  _swigc__p_VecMat__SquareMatrixTfloat_3_t,
-  _swigc__p_VecMat__SquareMatrixTfloat_4_t,
-  _swigc__p_VecMat__SquareMatrixTint_2_t,
-  _swigc__p_VecMat__SquareMatrixTint_3_t,
-  _swigc__p_VecMat__SquareMatrixTint_4_t,
-  _swigc__p_VecMat__SquareMatrixTunsigned_int_2_t,
-  _swigc__p_VecMat__SquareMatrixTunsigned_int_3_t,
-  _swigc__p_VecMat__SquareMatrixTunsigned_int_4_t,
-  _swigc__p_VecMat__Vec2Tdouble_t,
-  _swigc__p_VecMat__Vec2Tfloat_t,
-  _swigc__p_VecMat__Vec2Tint_t,
-  _swigc__p_VecMat__Vec2Tunsigned_int_t,
-  _swigc__p_VecMat__Vec3Tdouble_t,
-  _swigc__p_VecMat__Vec3Tfloat_t,
-  _swigc__p_VecMat__Vec3Tint_t,
-  _swigc__p_VecMat__Vec3Tunsigned_int_t,
-  _swigc__p_VecMat__VecTdouble_2_t,
-  _swigc__p_VecMat__VecTdouble_3_t,
-  _swigc__p_VecMat__VecTfloat_2_t,
-  _swigc__p_VecMat__VecTfloat_3_t,
-  _swigc__p_VecMat__VecTint_2_t,
-  _swigc__p_VecMat__VecTint_3_t,
-  _swigc__p_VecMat__VecTunsigned_int_2_t,
-  _swigc__p_VecMat__VecTunsigned_int_3_t,
+  _swigc__p_VecMat__HVec3T_double_t,
+  _swigc__p_VecMat__HVec3T_float_t,
+  _swigc__p_VecMat__HVec3T_int_t,
+  _swigc__p_VecMat__HVec3T_unsigned_int_t,
+  _swigc__p_VecMat__SquareMatrixT_double_2_t,
+  _swigc__p_VecMat__SquareMatrixT_double_3_t,
+  _swigc__p_VecMat__SquareMatrixT_double_4_t,
+  _swigc__p_VecMat__SquareMatrixT_float_2_t,
+  _swigc__p_VecMat__SquareMatrixT_float_3_t,
+  _swigc__p_VecMat__SquareMatrixT_float_4_t,
+  _swigc__p_VecMat__SquareMatrixT_int_2_t,
+  _swigc__p_VecMat__SquareMatrixT_int_3_t,
+  _swigc__p_VecMat__SquareMatrixT_int_4_t,
+  _swigc__p_VecMat__SquareMatrixT_unsigned_int_2_t,
+  _swigc__p_VecMat__SquareMatrixT_unsigned_int_3_t,
+  _swigc__p_VecMat__SquareMatrixT_unsigned_int_4_t,
+  _swigc__p_VecMat__Vec2T_double_t,
+  _swigc__p_VecMat__Vec2T_float_t,
+  _swigc__p_VecMat__Vec2T_int_t,
+  _swigc__p_VecMat__Vec2T_unsigned_int_t,
+  _swigc__p_VecMat__Vec3T_double_t,
+  _swigc__p_VecMat__Vec3T_float_t,
+  _swigc__p_VecMat__Vec3T_int_t,
+  _swigc__p_VecMat__Vec3T_unsigned_int_t,
+  _swigc__p_VecMat__VecT_double_2_t,
+  _swigc__p_VecMat__VecT_double_3_t,
+  _swigc__p_VecMat__VecT_float_2_t,
+  _swigc__p_VecMat__VecT_float_3_t,
+  _swigc__p_VecMat__VecT_int_2_t,
+  _swigc__p_VecMat__VecT_int_3_t,
+  _swigc__p_VecMat__VecT_unsigned_int_2_t,
+  _swigc__p_VecMat__VecT_unsigned_int_3_t,
   _swigc__p_Vertex,
   _swigc__p_ViewEdge,
   _swigc__p_ViewEdgeInternal__SVertexIterator,
@@ -111293,8 +110171,8 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_ViewMap,
   _swigc__p_ViewShape,
   _swigc__p_ViewVertex,
-  _swigc__p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_const_traits_t,
-  _swigc__p_ViewVertexInternal__edge_iterator_baseTViewVertexInternal__edge_nonconst_traits_t,
+  _swigc__p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_const_traits_t,
+  _swigc__p_ViewVertexInternal__edge_iterator_baseT_ViewVertexInternal__edge_nonconst_traits_t,
   _swigc__p_ViewVertexInternal__orientedViewEdgeIterator,
   _swigc__p_ViewVertexInternal__orientedViewEdgeIterator__edge_pointers_container__iterator,
   _swigc__p_ViewVertexInternal__orientedViewEdgeIterator__edges_container__iterator,
@@ -111324,30 +110202,30 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_point_iterator,
   _swigc__p_point_type,
   _swigc__p_reference,
-  _swigc__p_setTVecMat__Vec3Tdouble_t_t,
+  _swigc__p_setT_VecMat__Vec3T_double_t_t,
   _swigc__p_size_type,
   _swigc__p_std__invalid_argument,
-  _swigc__p_std__mapTint_int_std__lessTint_t_std__allocatorTstd__pairTint_const_int_t_t_t,
-  _swigc__p_std__pairTViewEdge_p_bool_t,
-  _swigc__p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t,
-  _swigc__p_std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__allocator_type,
-  _swigc__p_std__vectorTMaterial_std__allocatorTMaterial_t_t,
-  _swigc__p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t,
-  _swigc__p_std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__allocator_type,
-  _swigc__p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t,
-  _swigc__p_std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__allocator_type,
-  _swigc__p_std__vectorTTVertex_p_std__allocatorTTVertex_p_t_t,
-  _swigc__p_std__vectorTVecMat__Vec2Tdouble_t_std__allocatorTVecMat__Vec2Tdouble_t_t_t,
-  _swigc__p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t,
-  _swigc__p_std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__allocator_type,
-  _swigc__p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t,
-  _swigc__p_std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__allocator_type,
-  _swigc__p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t,
-  _swigc__p_std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__allocator_type,
-  _swigc__p_std__vectorTint_std__allocatorTint_t_t,
-  _swigc__p_std__vectorTint_std__allocatorTint_t_t__allocator_type,
-  _swigc__p_std__vectorTstd__pairTViewEdge_p_bool_t_std__allocatorTstd__pairTViewEdge_p_bool_t_t_t,
-  _swigc__p_std__vectorTunsigned_int_std__allocatorTunsigned_int_t_t,
+  _swigc__p_std__mapT_int_int_std__lessT_int_t_std__allocatorT_std__pairT_int_const_int_t_t_t,
+  _swigc__p_std__pairT_ViewEdge_p_bool_t,
+  _swigc__p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t,
+  _swigc__p_std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__allocator_type,
+  _swigc__p_std__vectorT_Material_std__allocatorT_Material_t_t,
+  _swigc__p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t,
+  _swigc__p_std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__allocator_type,
+  _swigc__p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t,
+  _swigc__p_std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__allocator_type,
+  _swigc__p_std__vectorT_TVertex_p_std__allocatorT_TVertex_p_t_t,
+  _swigc__p_std__vectorT_VecMat__Vec2T_double_t_std__allocatorT_VecMat__Vec2T_double_t_t_t,
+  _swigc__p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t,
+  _swigc__p_std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__allocator_type,
+  _swigc__p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t,
+  _swigc__p_std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__allocator_type,
+  _swigc__p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t,
+  _swigc__p_std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__allocator_type,
+  _swigc__p_std__vectorT_int_std__allocatorT_int_t_t,
+  _swigc__p_std__vectorT_int_std__allocatorT_int_t_t__allocator_type,
+  _swigc__p_std__vectorT_std__pairT_ViewEdge_p_bool_t_std__allocatorT_std__pairT_ViewEdge_p_bool_t_t_t,
+  _swigc__p_std__vectorT_unsigned_int_std__allocatorT_unsigned_int_t_t,
   _swigc__p_svertices_container,
   _swigc__p_swig__PySwigIterator,
   _swigc__p_unsigned_int,
@@ -111361,12 +110239,12 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_viewshapes_container,
   _swigc__p_viewvertices_container,
   _swigc__p_void,
-  _swigc__std__vectorTFEdge_p_std__allocatorTFEdge_p_t_t__value_type,
-  _swigc__std__vectorTSVertex_p_std__allocatorTSVertex_p_t_t__value_type,
-  _swigc__std__vectorTStrokeShader_p_std__allocatorTStrokeShader_p_t_t__value_type,
-  _swigc__std__vectorTViewEdge_p_std__allocatorTViewEdge_p_t_t__value_type,
-  _swigc__std__vectorTViewShape_p_std__allocatorTViewShape_p_t_t__value_type,
-  _swigc__std__vectorTViewVertex_p_std__allocatorTViewVertex_p_t_t__value_type,
+  _swigc__std__vectorT_FEdge_p_std__allocatorT_FEdge_p_t_t__value_type,
+  _swigc__std__vectorT_SVertex_p_std__allocatorT_SVertex_p_t_t__value_type,
+  _swigc__std__vectorT_StrokeShader_p_std__allocatorT_StrokeShader_p_t_t__value_type,
+  _swigc__std__vectorT_ViewEdge_p_std__allocatorT_ViewEdge_p_t_t__value_type,
+  _swigc__std__vectorT_ViewShape_p_std__allocatorT_ViewShape_p_t_t__value_type,
+  _swigc__std__vectorT_ViewVertex_p_std__allocatorT_ViewVertex_p_t_t__value_type,
 };
 
 
@@ -111435,7 +110313,7 @@ SWIGRUNTIME void
 SWIG_InitializeModule(void *clientdata) {
   size_t i;
   swig_module_info *module_head, *iter;
-  int found;
+  int found, init;
   
   clientdata = clientdata;
   
@@ -111445,6 +110323,9 @@ SWIG_InitializeModule(void *clientdata) {
     swig_module.type_initial = swig_type_initial;
     swig_module.cast_initial = swig_cast_initial;
     swig_module.next = &swig_module;
+    init = 1;
+  } else {
+    init = 0;
   }
   
   /* Try and load any already created modules */
@@ -111473,6 +110354,12 @@ SWIG_InitializeModule(void *clientdata) {
     module_head->next = &swig_module;
   }
   
+  /* When multiple interpeters are used, a module could have already been initialized in
+       a different interpreter, but not yet have a pointer in this interpreter.
+       In this case, we do not want to continue adding types... everything should be
+       set up already */
+  if (init == 0) return;
+  
   /* Now work on filling in swig_module.types */
 #ifdef SWIGRUNTIME_DEBUG
   printf("SWIG_InitializeModule: size %d\n", swig_module.size);
@@ -111889,19 +110776,19 @@ SWIGEXPORT void SWIG_init(void) {
   
   SWIG_Python_SetConstant(d, "_Noise_B_",SWIG_From_int(static_cast< int >(0x100)));
   PyDict_SetItemString(d,(char*)"cvar", SWIG_globals());
-  SWIG_addvarlink(SWIG_globals(),(char*)"POINT",POINT_get, POINT_set);
-  SWIG_addvarlink(SWIG_globals(),(char*)"S_VERTEX",S_VERTEX_get, S_VERTEX_set);
-  SWIG_addvarlink(SWIG_globals(),(char*)"VIEW_VERTEX",VIEW_VERTEX_get, VIEW_VERTEX_set);
-  SWIG_addvarlink(SWIG_globals(),(char*)"NON_T_VERTEX",NON_T_VERTEX_get, NON_T_VERTEX_set);
-  SWIG_addvarlink(SWIG_globals(),(char*)"T_VERTEX",T_VERTEX_get, T_VERTEX_set);
-  SWIG_addvarlink(SWIG_globals(),(char*)"CUSP",CUSP_get, CUSP_set);
-  SWIG_addvarlink(SWIG_globals(),(char*)"NO_FEATURE",NO_FEATURE_get, NO_FEATURE_set);
-  SWIG_addvarlink(SWIG_globals(),(char*)"SILHOUETTE",SILHOUETTE_get, SILHOUETTE_set);
-  SWIG_addvarlink(SWIG_globals(),(char*)"BORDER",BORDER_get, BORDER_set);
-  SWIG_addvarlink(SWIG_globals(),(char*)"CREASE",CREASE_get, CREASE_set);
-  SWIG_addvarlink(SWIG_globals(),(char*)"RIDGE",RIDGE_get, RIDGE_set);
-  SWIG_addvarlink(SWIG_globals(),(char*)"VALLEY",VALLEY_get, VALLEY_set);
-  SWIG_addvarlink(SWIG_globals(),(char*)"SUGGESTIVE_CONTOUR",SUGGESTIVE_CONTOUR_get, SUGGESTIVE_CONTOUR_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"POINT",Swig_var_POINT_get, Swig_var_POINT_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"S_VERTEX",Swig_var_S_VERTEX_get, Swig_var_S_VERTEX_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"VIEW_VERTEX",Swig_var_VIEW_VERTEX_get, Swig_var_VIEW_VERTEX_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"NON_T_VERTEX",Swig_var_NON_T_VERTEX_get, Swig_var_NON_T_VERTEX_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"T_VERTEX",Swig_var_T_VERTEX_get, Swig_var_T_VERTEX_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"CUSP",Swig_var_CUSP_get, Swig_var_CUSP_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"NO_FEATURE",Swig_var_NO_FEATURE_get, Swig_var_NO_FEATURE_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"SILHOUETTE",Swig_var_SILHOUETTE_get, Swig_var_SILHOUETTE_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"BORDER",Swig_var_BORDER_get, Swig_var_BORDER_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"CREASE",Swig_var_CREASE_get, Swig_var_CREASE_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"RIDGE",Swig_var_RIDGE_get, Swig_var_RIDGE_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"VALLEY",Swig_var_VALLEY_get, Swig_var_VALLEY_set);
+  SWIG_addvarlink(SWIG_globals(),(char*)"SUGGESTIVE_CONTOUR",Swig_var_SUGGESTIVE_CONTOUR_get, Swig_var_SUGGESTIVE_CONTOUR_set);
   SWIG_Python_SetConstant(d, "MEAN",SWIG_From_int(static_cast< int >(MEAN)));
   SWIG_Python_SetConstant(d, "MIN",SWIG_From_int(static_cast< int >(MIN)));
   SWIG_Python_SetConstant(d, "MAX",SWIG_From_int(static_cast< int >(MAX)));
diff --git a/source/blender/freestyle/intern/swig/ModuleWrapper.h b/source/blender/freestyle/intern/swig/ModuleWrapper.h
index 06ca8c90f37..f24a77d53b2 100755
--- a/source/blender/freestyle/intern/swig/ModuleWrapper.h
+++ b/source/blender/freestyle/intern/swig/ModuleWrapper.h
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.31
+ * Version 1.3.35
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -73,7 +73,7 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction0DVoid : public UnaryFunction0D<void >, public Swig::Director {
+class SwigDirector_UnaryFunction0DVoid : public UnaryFunction0D< void >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction0DVoid(PyObject *self);
@@ -119,7 +119,7 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction0DUnsigned : public UnaryFunction0D<unsigned int >, public Swig::Director {
+class SwigDirector_UnaryFunction0DUnsigned : public UnaryFunction0D< unsigned int >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction0DUnsigned(PyObject *self);
@@ -165,7 +165,7 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction0DFloat : public UnaryFunction0D<float >, public Swig::Director {
+class SwigDirector_UnaryFunction0DFloat : public UnaryFunction0D< float >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction0DFloat(PyObject *self);
@@ -211,7 +211,7 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction0DDouble : public UnaryFunction0D<double >, public Swig::Director {
+class SwigDirector_UnaryFunction0DDouble : public UnaryFunction0D< double >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction0DDouble(PyObject *self);
@@ -257,13 +257,13 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction0DVec2f : public UnaryFunction0D<Geometry::Vec2f >, public Swig::Director {
+class SwigDirector_UnaryFunction0DVec2f : public UnaryFunction0D< Geometry::Vec2f >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction0DVec2f(PyObject *self);
     virtual ~SwigDirector_UnaryFunction0DVec2f();
     virtual std::string getName() const;
-    virtual VecMat::Vec2<float > operator ()(Interface0DIterator &iter);
+    virtual VecMat::Vec2< float > operator ()(Interface0DIterator &iter);
 
 
 /* Internal Director utilities */
@@ -303,13 +303,13 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction0DVec3f : public UnaryFunction0D<Geometry::Vec3f >, public Swig::Director {
+class SwigDirector_UnaryFunction0DVec3f : public UnaryFunction0D< Geometry::Vec3f >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction0DVec3f(PyObject *self);
     virtual ~SwigDirector_UnaryFunction0DVec3f();
     virtual std::string getName() const;
-    virtual VecMat::Vec3<float > operator ()(Interface0DIterator &iter);
+    virtual VecMat::Vec3< float > operator ()(Interface0DIterator &iter);
 
 
 /* Internal Director utilities */
@@ -349,7 +349,7 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction0DId : public UnaryFunction0D<Id >, public Swig::Director {
+class SwigDirector_UnaryFunction0DId : public UnaryFunction0D< Id >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction0DId(PyObject *self);
@@ -395,7 +395,7 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction1DVoid : public UnaryFunction1D<void >, public Swig::Director {
+class SwigDirector_UnaryFunction1DVoid : public UnaryFunction1D< void >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction1DVoid(PyObject *self);
@@ -442,7 +442,7 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction1DUnsigned : public UnaryFunction1D<unsigned int >, public Swig::Director {
+class SwigDirector_UnaryFunction1DUnsigned : public UnaryFunction1D< unsigned int >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction1DUnsigned(PyObject *self);
@@ -489,7 +489,7 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction1DFloat : public UnaryFunction1D<float >, public Swig::Director {
+class SwigDirector_UnaryFunction1DFloat : public UnaryFunction1D< float >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction1DFloat(PyObject *self);
@@ -536,7 +536,7 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction1DDouble : public UnaryFunction1D<double >, public Swig::Director {
+class SwigDirector_UnaryFunction1DDouble : public UnaryFunction1D< double >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction1DDouble(PyObject *self);
@@ -583,14 +583,14 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction1DVec2f : public UnaryFunction1D<Geometry::Vec2f >, public Swig::Director {
+class SwigDirector_UnaryFunction1DVec2f : public UnaryFunction1D< Geometry::Vec2f >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction1DVec2f(PyObject *self);
     SwigDirector_UnaryFunction1DVec2f(PyObject *self, IntegrationType iType);
     virtual ~SwigDirector_UnaryFunction1DVec2f();
     virtual std::string getName() const;
-    virtual VecMat::Vec2<float > operator ()(Interface1D &inter);
+    virtual VecMat::Vec2< float > operator ()(Interface1D &inter);
 
 
 /* Internal Director utilities */
@@ -630,14 +630,14 @@ private:
 };
 
 
-class SwigDirector_UnaryFunction1DVec3f : public UnaryFunction1D<Geometry::Vec3f >, public Swig::Director {
+class SwigDirector_UnaryFunction1DVec3f : public UnaryFunction1D< Geometry::Vec3f >, public Swig::Director {
 
 public:
     SwigDirector_UnaryFunction1DVec3f(PyObject *self);
     SwigDirector_UnaryFunction1DVec3f(PyObject *self, IntegrationType iType);
     virtual ~SwigDirector_UnaryFunction1DVec3f();
     virtual std::string getName() const;
-    virtual VecMat::Vec3<float > operator ()(Interface1D &inter);
+    virtual VecMat::Vec3< float > operator ()(Interface1D &inter);
 
 
 /* Internal Director utilities */
diff --git a/source/blender/freestyle/intern/system/Iterator.cpp b/source/blender/freestyle/intern/system/Iterator.cpp
new file mode 100644
index 00000000000..b3b0de9563d
--- /dev/null
+++ b/source/blender/freestyle/intern/system/Iterator.cpp
@@ -0,0 +1 @@
+#include "Iterator.h"
\ No newline at end of file
diff --git a/source/blender/freestyle/intern/system/Iterator.h b/source/blender/freestyle/intern/system/Iterator.h
new file mode 100644
index 00000000000..10862d7c8da
--- /dev/null
+++ b/source/blender/freestyle/intern/system/Iterator.h
@@ -0,0 +1,38 @@
+#ifndef  ITERATOR_H
+#define ITERATOR_H
+
+#include <iostream>
+#include <string>
+using namespace std;
+
+class Iterator
+{
+public:
+
+  virtual ~Iterator() {}
+
+  virtual string getExactTypeName() const {
+    return "Iterator";
+  }
+
+  virtual void increment() {
+	cerr << "Warning: method increment() not implemented" << endl;
+  }
+
+  virtual void decrement() {
+	cerr << "Warning: method decrement() not implemented" << endl;
+  }
+
+  virtual bool isBegin() const {
+	cerr << "Warning: method isBegin() not implemented" << endl;
+	return false;
+  }
+
+  virtual bool isEnd() const {
+	cerr << "Warning: method isEnd() not implemented" << endl;
+	return false;
+  }
+
+};
+
+#endif // ITERATOR_H
\ No newline at end of file
diff --git a/source/blender/freestyle/intern/view_map/Interface0D.h b/source/blender/freestyle/intern/view_map/Interface0D.h
index fd2e882e9b6..40027e13d80 100755
--- a/source/blender/freestyle/intern/view_map/Interface0D.h
+++ b/source/blender/freestyle/intern/view_map/Interface0D.h
@@ -38,6 +38,9 @@
 # include "../geometry/Geom.h"
 using namespace std;
 
+#include "../system/Iterator.h" //soc 
+
+
 //
 // Interface0D
 //
@@ -160,7 +163,7 @@ public:
 //
 //////////////////////////////////////////////////
 
-class Interface0DIteratorNested
+class Interface0DIteratorNested : Iterator
 {
 public:
 
diff --git a/source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h b/source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h
index bb2d916f2df..31abefbfb97 100755
--- a/source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h
+++ b/source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h
@@ -32,7 +32,7 @@
 # define VIEWMAPADVANCEDITERATORS_H
 
 #include "ViewMap.h"
-
+#include "../system/Iterator.h" //soc 
 
                   /**********************************/
                   /*                                */
diff --git a/source/blender/freestyle/intern/view_map/ViewMapIterators.h b/source/blender/freestyle/intern/view_map/ViewMapIterators.h
index 004674ba758..25da503af66 100755
--- a/source/blender/freestyle/intern/view_map/ViewMapIterators.h
+++ b/source/blender/freestyle/intern/view_map/ViewMapIterators.h
@@ -32,6 +32,8 @@
 # define VIEWMAPITERATORS_H
 
 #include "ViewMap.h"
+#include "../system/Iterator.h" //soc 
+
 
                   /**********************************/
                   /*                                */
@@ -57,7 +59,7 @@ namespace ViewVertexInternal{
    *  An instance of an orientedViewEdgeIterator can only
    *  be obtained from a ViewVertex by calling edgesBegin() or edgesEnd().
    */
-  class orientedViewEdgeIterator 
+  class orientedViewEdgeIterator : Iterator
   {
   public:
     friend class ViewVertex;
@@ -204,7 +206,7 @@ namespace ViewVertexInternal{
 
   public:
     /*! increments.*/
-    inline void increment()
+    virtual inline void increment()
     {
       if(_Nature & Nature::T_VERTEX)
       { 
@@ -336,11 +338,11 @@ namespace ViewEdgeInternal {
       _previous_edge = _previous_edge->previousEdge();
   } 
 
-    bool isBegin() const {
+    virtual bool isBegin() const {
       return _vertex == _begin;
     }
 
-    bool isEnd() const {
+    virtual bool isEnd() const {
       return (!_vertex) || (_vertex == _begin && _previous_edge);
     }
 
@@ -385,7 +387,7 @@ namespace ViewEdgeInternal {
    *  ::Caution::: the dereferencing operator returns a *pointer* to
    *  the pointed ViewEdge.
    */
-class ViewEdgeIterator
+class ViewEdgeIterator : Iterator
 {
 public:
 
diff --git a/source/blender/freestyle/python/Freestyle.py b/source/blender/freestyle/python/Freestyle.py
index e4b81a7d071..156eac8d26e 100755
--- a/source/blender/freestyle/python/Freestyle.py
+++ b/source/blender/freestyle/python/Freestyle.py
@@ -1,5 +1,5 @@
 # This file was automatically generated by SWIG (http://www.swig.org).
-# Version 1.3.31
+# Version 1.3.35
 #
 # Don't modify this file, modify the SWIG interface instead.
 # This file is compatible with both classic and new-style classes.
@@ -60,7 +60,7 @@ class PySwigIterator(_object):
     __setattr__ = lambda self, name, value: _swig_setattr(self, PySwigIterator, name, value)
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, PySwigIterator, name)
-    def __init__(self): raise AttributeError, "No constructor defined"
+    def __init__(self, *args, **kwargs): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
     __swig_destroy__ = _Freestyle.delete_PySwigIterator
     __del__ = lambda self : None;
@@ -718,7 +718,7 @@ class Interface0DIteratorNested(_object):
     __setattr__ = lambda self, name, value: _swig_setattr(self, Interface0DIteratorNested, name, value)
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, Interface0DIteratorNested, name)
-    def __init__(self): raise AttributeError, "No constructor defined"
+    def __init__(self, *args, **kwargs): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
     __swig_destroy__ = _Freestyle.delete_Interface0DIteratorNested
     __del__ = lambda self : None;
@@ -1437,7 +1437,7 @@ class ViewVertex(Interface0D):
     __swig_getmethods__ = {}
     for _s in [Interface0D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
     __getattr__ = lambda self, name: _swig_getattr(self, ViewVertex, name)
-    def __init__(self): raise AttributeError, "No constructor defined"
+    def __init__(self, *args, **kwargs): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
     def getExactTypeName(*args): return _Freestyle.ViewVertex_getExactTypeName(*args)
     __swig_setmethods__["userdata"] = _Freestyle.ViewVertex_userdata_set
@@ -4834,7 +4834,7 @@ class Operators(_object):
     __setattr__ = lambda self, name, value: _swig_setattr(self, Operators, name, value)
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, Operators, name)
-    def __init__(self): raise AttributeError, "No constructor defined"
+    def __init__(self, *args, **kwargs): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
     __swig_getmethods__["select"] = lambda x: _Freestyle.Operators_select
     if _newclass:select = staticmethod(_Freestyle.Operators_select)
@@ -4901,7 +4901,7 @@ class Canvas(_object):
     __setattr__ = lambda self, name, value: _swig_setattr(self, Canvas, name, value)
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, Canvas, name)
-    def __init__(self): raise AttributeError, "No constructor defined"
+    def __init__(self, *args, **kwargs): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
     __swig_getmethods__["getInstance"] = lambda x: _Freestyle.Canvas_getInstance
     if _newclass:getInstance = staticmethod(_Freestyle.Canvas_getInstance)

From 6b4b03317d4713058a35a0c080de41e140f85123 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Wed, 23 Jul 2008 12:59:05 +0000
Subject: [PATCH 124/252] Bugfix: Deleting backward selected text was getting
 stuck on redo.

Selections were not correctly preserved through undo/redo operations causing unexpected behaviour.
---
 source/blender/blenkernel/intern/text.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c
index 6d512575244..5c1ec1b4008 100644
--- a/source/blender/blenkernel/intern/text.c
+++ b/source/blender/blenkernel/intern/text.c
@@ -1821,6 +1821,12 @@ void txt_do_undo(Text *text)
 			
 			break;
 	}
+
+	/* next undo step may need evaluating */
+	if (text->undo_pos>=0 && text->undo_buf[text->undo_pos] == UNDO_STO) {
+		txt_do_undo(text);
+		txt_do_redo(text); /* selections need restoring */
+	}
 	
 	undoing= 0;	
 }
@@ -1895,7 +1901,7 @@ void txt_do_redo(Text *text)
 
 		case UNDO_SWAP:
 			txt_curs_swap(text);
-			txt_do_undo(text); /* swaps should appear transparent a*/
+			txt_do_redo(text); /* swaps should appear transparent a*/
 			break;
 			
 		case UNDO_CTO:

From 16ebff308e5813117a49c4bd5a45617103a66d93 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Wed, 23 Jul 2008 18:19:56 +0000
Subject: [PATCH 125/252] time_t isn't supported in SDNA so we'll use double
 instead. 56bit precision is plenty for storing seconds (for a billion years
 at least)

---
 source/blender/makesdna/DNA_text_types.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/source/blender/makesdna/DNA_text_types.h b/source/blender/makesdna/DNA_text_types.h
index d6ec62e63c0..fc2a28ea320 100644
--- a/source/blender/makesdna/DNA_text_types.h
+++ b/source/blender/makesdna/DNA_text_types.h
@@ -31,8 +31,6 @@
 #ifndef DNA_TEXT_TYPES_H
 #define DNA_TEXT_TYPES_H
 
-#include "time.h"
-
 #include "DNA_listBase.h"
 #include "DNA_ID.h"
 
@@ -59,8 +57,8 @@ typedef struct Text {
 	int undo_pos, undo_len;
 	
 	void *compiled;
-	
-	time_t mtime;
+
+	double mtime;
 } Text;
 
 

From 3b70337f7f247f8f394992c57c835b65fee25c03 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Wed, 23 Jul 2008 19:35:13 +0000
Subject: [PATCH 126/252] Improvements to text find (and replace):  - Added GUI
 panel  - Selected text is copied to "find" field  - Option to search "all
 texts"  - Option to replace text  - Alt+F finds, Ctrl+Alt+F finds again
 (without UI)  - Alt+H replaces (UI), Ctrl+Alt+H replaces again (and undo
 works)  - Fixed: Find didn't push undos so cursor position was wrong

---
 source/blender/blenkernel/BKE_text.h    |   9 +-
 source/blender/blenkernel/intern/text.c |  23 ++-
 source/blender/src/drawtext.c           | 213 ++++++++++++++++++++----
 source/blender/src/header_text.c        |  16 +-
 4 files changed, 211 insertions(+), 50 deletions(-)

diff --git a/source/blender/blenkernel/BKE_text.h b/source/blender/blenkernel/BKE_text.h
index 10223589859..abdf32c8ea5 100644
--- a/source/blender/blenkernel/BKE_text.h
+++ b/source/blender/blenkernel/BKE_text.h
@@ -52,7 +52,7 @@ void	txt_free_cut_buffer	(void);
 char*	txt_to_buf			(struct Text *text);
 void	txt_clean_text		(struct Text *text);
 void	txt_order_cursors	(struct Text *text);
-int		txt_find_string		(struct Text *text, char *findstr);
+int		txt_find_string		(struct Text *text, char *findstr, int wrap);
 int		txt_has_sel			(struct Text *text);
 int		txt_get_span		(struct TextLine *from, struct TextLine *to);
 void	txt_move_up			(struct Text *text, short sel);
@@ -87,7 +87,7 @@ void	txt_backspace_char	(struct Text *text);
 void	txt_backspace_word	(struct Text *text);
 int		txt_add_char		(struct Text *text, char add);
 int		txt_replace_char	(struct Text *text, char add);
-void	txt_find_panel		(struct SpaceText *st, int again);
+void	txt_find_panel		(struct SpaceText *st, int again, int flags);
 void	run_python_script	(struct SpaceText *st);
 int	jumptoline_interactive	(struct SpaceText *st);
 void	txt_export_to_object	(struct Text *text);
@@ -141,6 +141,11 @@ void	txt_paste_clipboard	(struct Text *text);
 #define UNDO_COMMENT		034
 #define UNDO_UNCOMMENT		035
 
+/* Find and replace flags */
+#define TXT_FIND_REPLACE 0x01
+#define TXT_FIND_ALLTEXTS 0x02
+#define TXT_FIND_WRAP 0x04
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c
index 5c1ec1b4008..4291150f443 100644
--- a/source/blender/blenkernel/intern/text.c
+++ b/source/blender/blenkernel/intern/text.c
@@ -1080,22 +1080,31 @@ char *txt_to_buf (Text *text)
 	return buf;
 }
 
-int txt_find_string(Text *text, char *findstr)
+int txt_find_string(Text *text, char *findstr, int wrap)
 {
 	TextLine *tl, *startl;
 	char *s= NULL;
+	int oldcl, oldsl, oldcc, oldsc;
 
 	if (!text || !text->curl || !text->sell) return 0;
 	
 	txt_order_cursors(text);
 
+	oldcl= txt_get_span(text->lines.first, text->curl);
+	oldsl= txt_get_span(text->lines.first, text->sell);
 	tl= startl= text->sell;
+	oldcc= text->curc;
+	oldsc= text->selc;
 	
 	s= strstr(&tl->line[text->selc], findstr);
 	while (!s) {
 		tl= tl->next;
-		if (!tl)
-			tl= text->lines.first;
+		if (!tl) {
+			if (wrap)
+				tl= text->lines.first;
+			else
+				break;
+		}
 
 		s= strstr(tl->line, findstr);
 		if (tl==startl)
@@ -1103,10 +1112,10 @@ int txt_find_string(Text *text, char *findstr)
 	}
 	
 	if (s) {
-		text->curl= text->sell= tl;
-		text->curc= (int) (s-tl->line);
-		text->selc= text->curc + strlen(findstr);
-		
+		int newl= txt_get_span(text->lines.first, tl);
+		int newc= (int)(s-tl->line);
+		txt_move_to(text, newl, newc, 0);
+		txt_move_to(text, newl, newc + strlen(findstr), 1);
 		return 1;				
 	} else
 		return 0;
diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index ce8128de790..5dfadf5b7f7 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -115,7 +115,10 @@ static int check_whitespace(char ch);
 static void get_suggest_prefix(Text *text);
 static void confirm_suggestion(Text *text, int skipleft);
 
+static int last_txt_find_flags= 0;
 static void *last_txt_find_string= NULL;
+static void *last_txt_repl_string= NULL;
+
 static double last_check_time= 0;
 
 static BMF_Font *spacetext_get_font(SpaceText *st) {
@@ -178,6 +181,7 @@ void free_txt_data(void) {
 	txt_free_cut_buffer();
 	
 	if (last_txt_find_string) MEM_freeN(last_txt_find_string);
+	if (last_txt_repl_string) MEM_freeN(last_txt_repl_string);
 	if (temp_char_buf) MEM_freeN(temp_char_buf);
 	if (temp_char_accum) MEM_freeN(temp_char_accum);	
 }
@@ -1650,41 +1654,168 @@ void txt_copy_clipboard(Text *text) {
 	}
 }
 
-/*
- * again==0 show find panel or find
- * again==1 find text again */
-void txt_find_panel(SpaceText *st, int again)
+static short find_and_replace_popup(char *findvar, char *replvar, int *flags, short min, short max)
 {
-	Text *text=st->text;
-	char *findstr= last_txt_find_string;
-			
-	if (again==0) {
-		findstr= txt_sel_to_buf(text);
-	} else if (again==1) {
-		char buf[256];
+	uiBlock *block;
+	ListBase listb={0, 0};
+	short x1,y1;
+	short ret=0;
+	char *editfindvar=NULL, *editreplvar=NULL; /* dont edit the original text, incase we cancel the popup */
+	
+	if(min>max) min= max;
 
-	if (findstr && strlen(findstr)<(sizeof(buf)-1))
-		strcpy(buf, findstr);
-	else
-		buf[0]= 0;
-		
-	if (sbutton(buf, 0, sizeof(buf)-1, "Find: ") && buf[0])
-		findstr= BLI_strdup(buf);
-	else
-		findstr= NULL;
+	block= uiNewBlock(&listb, "button", UI_EMBOSS, UI_HELV, G.curscreen->mainwin);
+	uiBlockSetFlag(block, UI_BLOCK_LOOP|UI_BLOCK_REDRAW|UI_BLOCK_RET_1|UI_BLOCK_ENTER_OK);
+
+	x1= curarea->winrct.xmax - 240;
+	y1= curarea->winrct.ymin;
+	
+	editfindvar = MEM_callocN(max+1, "findvar");
+	editreplvar = MEM_callocN(max+1, "replvar");
+	BLI_strncpy(editfindvar, findvar, max);
+	BLI_strncpy(editreplvar, replvar, max);
+	
+	uiDefButC(block, TEX, 0, "Find: ", x1+5,y1+85,225,20, editfindvar,(float)min,(float)max, 0, 0, "");
+	uiDefButC(block, TEX, 0, "Replace: ", x1+5,y1+60,225,20, editreplvar,(float)min,(float)max, 0, 0, "");
+	uiDefButBitI(block, TOG, TXT_FIND_REPLACE, 0, "Replace", x1+5,y1+35,55,20, flags, 0, 0, 0, 0, "Replace previous item found");
+	uiDefButBitI(block, TOG, TXT_FIND_ALLTEXTS, 0, "All Texts", x1+60,y1+35,55,20, flags, 0, 0, 0, 0, "Search all texts");
+	uiDefButBitI(block, TOG, TXT_FIND_WRAP, 0, "Wrap", x1+115,y1+35,55,20, flags, 0, 0, 0, 0, "Wrap search around current text");
+	uiDefBut(block, BUT, 3, "Replace/Find", x1+125,y1+10,105,20, NULL, 0, 0, 0, 0, "");
+
+	uiBoundsBlock(block, 5);
+	
+	ret= uiDoBlocks(&listb, 0, 0);
+
+	if(ret==UI_RETURN_OK) {
+		BLI_strncpy(findvar, editfindvar, max);
+		BLI_strncpy(replvar, editreplvar, max);
+		MEM_freeN(editfindvar);
+		MEM_freeN(editreplvar);
+		return 1;
+	}
+	MEM_freeN(editfindvar);
+	MEM_freeN(editreplvar);
+	return 0;
+	
+}
+
+/*
+ * again==0 always show find panel
+ * again==1 find text again (no panel) If first find, panel shown anyway
+ * flags:
+ *   TXT_FIND_REPLACE  replace last found occurrence before searching again
+ *   TXT_FIND_ALLTEXTS search through all texts (off wraps current text)
+ */
+void txt_find_panel(SpaceText *st, int again, int flags)
+{
+	Text *text, *start;
+	char *tmp= NULL;
+	char buf[256], repbuf[256];
+	int searched, skip, noswitch;
+
+	text= start= st->text;
+	if (!text) return;
+	if (again) {
+		if (!last_txt_find_string) again= 0; /* Can't search again */
+		if (!last_txt_repl_string && (flags & TXT_FIND_REPLACE)) again= 0;
 	}
 
-	if (findstr!=last_txt_find_string) {
-		if (last_txt_find_string)
-			MEM_freeN(last_txt_find_string);
-		last_txt_find_string= findstr;
-	}
+	if (!again) {
+		/* Populate tmp with selected text, or the last searched string */
+		if (txt_has_sel(text))
+			tmp= txt_sel_to_buf(text);
+		else if (last_txt_find_string)
+			tmp= BLI_strdup(last_txt_find_string);
+
+		if (tmp && strlen(tmp) < sizeof(buf)-1)strcpy(buf, tmp);
+		else buf[0]= 0;
+		if (tmp) { MEM_freeN(tmp); tmp= NULL; }
+
+		if (last_txt_repl_string) strcpy(repbuf, last_txt_repl_string);
+		else repbuf[0]= 0;
+
+		searched= skip= noswitch= 0;
+		while (skip || find_and_replace_popup(buf, repbuf, &flags, 0, sizeof(buf)-1) && buf[0]) {
+			skip= 0;
+
+			/* Allow us to detect when to go to the next text */
+			if (flags & TXT_FIND_ALLTEXTS)
+				flags &= ~TXT_FIND_WRAP;
+
+			/* Replace selection first */
+			if ((flags & TXT_FIND_REPLACE) && txt_has_sel(text)) {
+				tmp= txt_sel_to_buf(text);
+				if (strcmp(buf, tmp)==0) { /* Searching for same thing? */
+					txt_insert_buf(text, repbuf);
+					if (st->showsyntax) get_format_string(st);
+				}
+				MEM_freeN(tmp);
+				tmp= NULL;
+			}
+
+			/* Now find the next occurrence */
+			searched= 1;
+			if (txt_find_string(text, buf, flags&TXT_FIND_WRAP)) {
+				pop_space_text(st);
+			} else if ((flags & TXT_FIND_ALLTEXTS) && !noswitch) {
+				if (text->id.next) text= st->text= text->id.next;
+				else text= st->text= G.main->text.first;
 				
-	if (findstr) {
-		if (txt_find_string(text, findstr))
-			pop_space_text(st);
-		else
-			error("Not found: %s", findstr);
+				/* Finish at end of this text if we've been round once */
+				if (text==start)
+					noswitch= 1;
+				
+				txt_move_toline(text, 0, 0);
+				pop_space_text(st);
+				skip= 1; /* Skip panel so we immediately search the next text */
+			} else {
+				okee("Text not found: %s", buf);
+				break;
+			}
+			
+			/* Redraw */
+			scrarea_do_windraw(curarea);
+			screen_swapbuffers();
+		}
+
+		/* Store last search details */
+		if (searched) {
+			last_txt_find_flags= flags;
+			if (last_txt_find_string)
+				MEM_freeN(last_txt_find_string);
+			last_txt_find_string= BLI_strdup(buf);
+			if (last_txt_repl_string)
+				MEM_freeN(last_txt_repl_string);
+			last_txt_repl_string= BLI_strdup(repbuf);
+		}
+	} else {
+		if (strlen(last_txt_find_string) < sizeof(buf)-1) {
+
+			/* Replace current */
+			if ((flags & TXT_FIND_REPLACE) && last_txt_repl_string && txt_has_sel(text)) {
+				tmp= txt_sel_to_buf(text);
+				if (strcmp(last_txt_find_string, tmp)==0)
+					txt_insert_buf(text, last_txt_repl_string);
+				MEM_freeN(tmp);
+				tmp= NULL;
+			}
+
+			/* Find next */
+			if (flags & TXT_FIND_ALLTEXTS)
+				flags &= ~TXT_FIND_WRAP;
+			if (txt_find_string(text, last_txt_find_string, flags & TXT_FIND_WRAP)) {
+				pop_space_text(st);
+			} else if (flags & flags&TXT_FIND_ALLTEXTS) {
+				if (text->id.next)
+					text= st->text= text->id.next;
+				else
+					text= st->text= G.main->text.first;
+				txt_move_toline(text, 0, 0);
+				pop_space_text(st);
+			} else {
+				okee("Text not found: %s", last_txt_find_string);
+			}
+		}
 	}
 }
 
@@ -2051,13 +2182,21 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 				}
 			}
 			else if (G.qual == LR_ALTKEY) {
-				if (txt_has_sel(text)) {
-					txt_find_panel(st,0);
-					do_draw= 1;
-				}
+				txt_find_panel(st, 0, last_txt_find_flags & ~TXT_FIND_REPLACE);
+				do_draw= 1;
 			}
-			else if (G.qual == (LR_ALTKEY|LR_CTRLKEY)) {	/* always search button */
-				txt_find_panel(st,1);
+			else if (G.qual == (LR_ALTKEY|LR_CTRLKEY)) {
+				txt_find_panel(st, 1, last_txt_find_flags & ~TXT_FIND_REPLACE);
+				do_draw= 1;
+			}
+			break; /* BREAK F */
+		case HKEY:
+			if (G.qual == LR_ALTKEY) {
+				txt_find_panel(st, 0, last_txt_find_flags | TXT_FIND_REPLACE);
+				do_draw= 1;
+			}
+			else if (G.qual == (LR_ALTKEY|LR_CTRLKEY)) {
+				txt_find_panel(st, 1, last_txt_find_flags | TXT_FIND_REPLACE);
 				do_draw= 1;
 			}
 			break; /* BREAK F */
@@ -2140,7 +2279,7 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			}
 			break; /* BREAK S */
 		case UKEY:
-			//txt_print_undo(text); //debug buffer in console
+			txt_print_undo(text); //debug buffer in console
 			if (G.qual == (LR_ALTKEY|LR_SHIFTKEY)) {
 				txt_do_redo(text);
 				do_draw= 1;
diff --git a/source/blender/src/header_text.c b/source/blender/src/header_text.c
index e371bd56160..49f14784927 100644
--- a/source/blender/src/header_text.c
+++ b/source/blender/src/header_text.c
@@ -404,10 +404,16 @@ static void do_text_editmenu(void *arg, int event)
 		jumptoline_interactive(st);
 		break;
 	case 8:
-		txt_find_panel(st,1);
+		txt_find_panel(st, 0, TXT_FIND_WRAP);
 		break;
 	case 9:
-		txt_find_panel(st,0);
+		txt_find_panel(st, 1, TXT_FIND_WRAP);
+		break;
+	case 10:
+		txt_find_panel(st, 0, TXT_FIND_WRAP | TXT_FIND_REPLACE);
+		break;
+	case 11:
+		txt_find_panel(st, 1, TXT_FIND_WRAP | TXT_FIND_REPLACE);
 		break;
 	default:
 		break;
@@ -707,8 +713,10 @@ static uiBlock *text_editmenu(void *arg_unused)
 	uiDefIconTextBlockBut(block, text_editmenu_selectmenu, NULL, ICON_RIGHTARROW_THIN, "Select|Alt Shift S   ", 0, yco-=20, 120, 19, "");
 	uiDefBut(block, SEPR, 0, "",        0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Jump...|Alt J", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 7, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Find...|Alt Ctrl F", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 8, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Find Again|Alt F", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 9, "");
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Find...|Alt F", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 8, "");
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Find Again|Alt Ctrl F", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 9, "");
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Replace...|Alt H", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 10, "");
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Replace Again|Alt Ctrl H", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 11, "");
 	uiDefBut(block, SEPR, 0, "",        0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
 	uiDefIconTextBlockBut(block, text_editmenu_to3dmenu, NULL, ICON_RIGHTARROW_THIN, "Text to 3d Object", 0, yco-=20, 120, 19, "");
 	

From d2013570a086d8af4545cf200a84cf74cb7be05f Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Wed, 23 Jul 2008 21:28:48 +0000
Subject: [PATCH 127/252] Refactor: Renamed text tool methods (suggestions and
 docs) for clarity and consistency.

---
 source/blender/blenkernel/BKE_suggestions.h   | 33 +++----
 .../blender/blenkernel/intern/suggestions.c   | 65 +++++++-------
 source/blender/python/api2_2x/Text.c          | 12 +--
 source/blender/src/drawtext.c                 | 88 +++++++++----------
 source/blender/src/usiblender.c               |  2 +-
 5 files changed, 100 insertions(+), 100 deletions(-)

diff --git a/source/blender/blenkernel/BKE_suggestions.h b/source/blender/blenkernel/BKE_suggestions.h
index b150e279574..41a87aaa05e 100644
--- a/source/blender/blenkernel/BKE_suggestions.h
+++ b/source/blender/blenkernel/BKE_suggestions.h
@@ -62,26 +62,27 @@ typedef struct SuggList {
 	SuggItem *selected;
 } SuggList;
 
-/* Free all suggestion related memory */
-void free_suggestions();
+/* Free all text tool memory */
+void free_texttools();
 
 /* Used to identify which Text object the current tools should appear against */
-void suggest_set_active(Text *text);
-void suggest_clear_active();
-short suggest_is_active(Text *text);
+void texttool_text_set_active(Text *text);
+void texttool_text_clear();
+short texttool_text_is_active(Text *text);
 
-void suggest_add(const char *name, char type);
-void suggest_prefix(const char *prefix);
-void suggest_clear_list();
-SuggItem *suggest_first();
-SuggItem *suggest_last();
+/* Suggestions */
+void texttool_suggest_add(const char *name, char type);
+void texttool_suggest_prefix(const char *prefix);
+void texttool_suggest_clear();
+SuggItem *texttool_suggest_first();
+SuggItem *texttool_suggest_last();
+void texttool_suggest_select(SuggItem *sel);
+SuggItem *texttool_suggest_selected();
 
-void suggest_set_selected(SuggItem *sel);
-SuggItem *suggest_get_selected();
-
-void suggest_documentation(const char *docs);
-char *suggest_get_docs();
-void suggest_clear_docs();
+/* Documentation */
+void texttool_docs_show(const char *docs);
+char *texttool_docs_get();
+void texttool_docs_clear();
 
 #ifdef __cplusplus
 }
diff --git a/source/blender/blenkernel/intern/suggestions.c b/source/blender/blenkernel/intern/suggestions.c
index 41265c35170..edccc0886f6 100644
--- a/source/blender/blenkernel/intern/suggestions.c
+++ b/source/blender/blenkernel/intern/suggestions.c
@@ -41,13 +41,12 @@
 /* Static definitions */
 /**********************/
 
+static Text *activeToolText = NULL;
 static SuggList suggestions = {NULL, NULL, NULL, NULL, NULL};
-static Text *suggText = NULL;
-static SuggItem *lastInsert = NULL;
 static char *documentation = NULL;
 static int doc_lines = 0;
 
-static int suggest_cmp(const char *first, const char *second, int len) {	
+static int txttl_cmp(const char *first, const char *second, int len) {	
 	int cmp, i;
 	for (cmp=0, i=0; i<len; i++) {
 		if (cmp= toupper(first[i])-toupper(second[i])) {
@@ -57,7 +56,7 @@ static int suggest_cmp(const char *first, const char *second, int len) {
 	return cmp;
 }
 
-static void sugg_free() {
+static void txttl_free_suggest() {
 	SuggItem *item, *prev;
 	for (item = suggestions.last; item; item=prev) {
 		prev = item->prev;
@@ -68,7 +67,7 @@ static void sugg_free() {
 	suggestions.selected = NULL;
 }
 
-static void docs_free() {
+static void txttl_free_docs() {
 	if (documentation) {
 		MEM_freeN(documentation);
 		documentation = NULL;
@@ -79,31 +78,31 @@ static void docs_free() {
 /* General tool functions */
 /**************************/
 
-void free_suggestions() {
-	sugg_free();
-	docs_free();
+void free_texttools() {
+	txttl_free_suggest();
+	txttl_free_docs();
 }
 
-void suggest_set_active(Text *text) {
-	if (suggText == text) return;
-	suggest_clear_active();
-	suggText = text;
+void texttool_text_set_active(Text *text) {
+	if (activeToolText == text) return;
+	texttool_text_clear();
+	activeToolText = text;
 }
 
-void suggest_clear_active() {
-	free_suggestions();
-	suggText = NULL;
+void texttool_text_clear() {
+	free_texttools();
+	activeToolText = NULL;
 }
 
-short suggest_is_active(Text *text) {
-	return suggText==text ? 1 : 0;
+short texttool_text_is_active(Text *text) {
+	return activeToolText==text ? 1 : 0;
 }
 
 /***************************/
 /* Suggestion list methods */
 /***************************/
 
-void suggest_add(const char *name, char type) {
+void texttool_suggest_add(const char *name, char type) {
 	SuggItem *newitem, *item;
 	int len, cmp;
 
@@ -126,7 +125,7 @@ void suggest_add(const char *name, char type) {
 	} else {
 		cmp = -1;
 		for (item=suggestions.last; item; item=item->prev) {
-			cmp = suggest_cmp(name, item->name, len);
+			cmp = txttl_cmp(name, item->name, len);
 
 			/* Newitem comes after this item, insert here */
 			if (cmp >= 0) {
@@ -152,7 +151,7 @@ void suggest_add(const char *name, char type) {
 	suggestions.firstmatch = suggestions.lastmatch = suggestions.selected = NULL;
 }
 
-void suggest_prefix(const char *prefix) {
+void texttool_suggest_prefix(const char *prefix) {
 	SuggItem *match, *first, *last;
 	int cmp, len = strlen(prefix);
 
@@ -165,7 +164,7 @@ void suggest_prefix(const char *prefix) {
 	
 	first = last = NULL;
 	for (match=suggestions.first; match; match=match->next) {
-		cmp = suggest_cmp(prefix, match->name, len);
+		cmp = txttl_cmp(prefix, match->name, len);
 		if (cmp==0) {
 			if (!first)
 				first = match;
@@ -188,31 +187,31 @@ void suggest_prefix(const char *prefix) {
 	}
 }
 
-void suggest_clear_list() {
-	sugg_free();
+void texttool_suggest_clear() {
+	txttl_free_suggest();
 }
 
-SuggItem *suggest_first() {
+SuggItem *texttool_suggest_first() {
 	return suggestions.firstmatch;
 }
 
-SuggItem *suggest_last() {
+SuggItem *texttool_suggest_last() {
 	return suggestions.lastmatch;
 }
 
-SuggItem *suggest_get_selected() {
-	return suggestions.selected;
+void texttool_suggest_select(SuggItem *sel) {
+	suggestions.selected = sel;
 }
 
-void suggest_set_selected(SuggItem *sel) {
-	suggestions.selected = sel;
+SuggItem *texttool_suggest_selected() {
+	return suggestions.selected;
 }
 
 /*************************/
 /* Documentation methods */
 /*************************/
 
-void suggest_documentation(const char *docs) {
+void texttool_docs_show(const char *docs) {
 	int len;
 
 	if (!docs) return;
@@ -236,10 +235,10 @@ void suggest_documentation(const char *docs) {
 	documentation[len] = '\0';
 }
 
-char *suggest_get_docs() {
+char *texttool_docs_get() {
 	return documentation;
 }
 
-void suggest_clear_docs() {
-	docs_free();
+void texttool_docs_clear() {
+	txttl_free_docs();
 }
diff --git a/source/blender/python/api2_2x/Text.c b/source/blender/python/api2_2x/Text.c
index 170f808da0d..ae847d26f2d 100644
--- a/source/blender/python/api2_2x/Text.c
+++ b/source/blender/python/api2_2x/Text.c
@@ -598,8 +598,8 @@ static PyObject *Text_suggest( BPy_Text * self, PyObject * args )
 		return EXPP_ReturnPyObjError(PyExc_RuntimeError,
 				"Active text area has no Text object");
 	
-	suggest_clear_list();
-	suggest_set_active(st->text);
+	texttool_suggest_clear();
+	texttool_text_set_active(st->text);
 	list_len = PyList_Size(list);
 	
 	for (i = 0; i < list_len; i++) {
@@ -625,11 +625,11 @@ static PyObject *Text_suggest( BPy_Text * self, PyObject * args )
 			return EXPP_ReturnPyObjError(PyExc_AttributeError,
 					"names must be non-empty and types in ['m', 'v', 'f', 'k', '?']" );
 
-		suggest_add(name, type);
+		texttool_suggest_add(name, type);
 	}
 	if (!prefix)
 		prefix = "";
-	suggest_prefix(prefix);
+	texttool_suggest_prefix(prefix);
 	scrarea_queue_redraw(curarea);
 
 	Py_RETURN_NONE;
@@ -657,8 +657,8 @@ static PyObject *Text_showDocs( BPy_Text * self, PyObject * args )
 		return EXPP_ReturnPyObjError(PyExc_RuntimeError,
 				"Active text area has no Text object");
 
-	suggest_set_active(st->text);
-	suggest_documentation(docs);
+	texttool_text_set_active(st->text);
+	texttool_docs_show(docs);
 	scrarea_queue_redraw(curarea);
 
 	Py_RETURN_NONE;
diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index 5dfadf5b7f7..c112bbe9350 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -1029,11 +1029,11 @@ static int do_suggest_select(SpaceText *st)
 	int seli, tgti;
 	
 	if (!st || !st->text) return 0;
-	if (!suggest_is_active(st->text)) return 0;
+	if (!texttool_text_is_active(st->text)) return 0;
 
-	first = suggest_first();
-	last = suggest_last();
-	sel = suggest_get_selected();
+	first = texttool_suggest_first();
+	last = texttool_suggest_last();
+	sel = texttool_suggest_selected();
 
 	if (!last || !first)
 		return 0;
@@ -1068,11 +1068,11 @@ static int do_suggest_select(SpaceText *st)
 	if (seli<tgti) {
 		for (i=seli; i<tgti && sel && sel!=last; i++, sel=sel->next);
 		if (sel)
-			suggest_set_selected(sel);
+			texttool_suggest_select(sel);
 	} else {
 		for (i=seli; i>tgti && sel && sel!=first; i--, sel=sel->prev);
 		if (sel)
-			suggest_set_selected(sel);
+			texttool_suggest_select(sel);
 	}
 	return 1;
 }
@@ -1085,9 +1085,9 @@ void draw_documentation(SpaceText *st)
 	int boxw=0, boxh, l, x, y;
 	
 	if (!st || !st->text) return;
-	if (!suggest_is_active(st->text)) return;
+	if (!texttool_text_is_active(st->text)) return;
 	
-	docs = suggest_get_docs();
+	docs = texttool_docs_get();
 
 	if (!docs) return;
 
@@ -1100,7 +1100,7 @@ void draw_documentation(SpaceText *st)
 	} else {
 		x = spacetext_get_fontwidth(st)*(st->text->curc-st->left) + TXT_OFFSET - 4;
 	}
-	if (suggest_first()) {
+	if (texttool_suggest_first()) {
 		x += SUGG_LIST_WIDTH*spacetext_get_fontwidth(st) + 50;
 	}
 	y = curarea->winy - st->lheight*l - 2;
@@ -1155,14 +1155,14 @@ void draw_suggestion_list(SpaceText *st)
 	int w, boxw=0, boxh, i, l, x, y, b;
 	
 	if (!st || !st->text) return;
-	if (!suggest_is_active(st->text)) return;
+	if (!texttool_text_is_active(st->text)) return;
 
-	first = suggest_first();
-	last = suggest_last();
+	first = texttool_suggest_first();
+	last = texttool_suggest_last();
 
 	if (!first || !last) return;
 
-	sel = suggest_get_selected();
+	sel = texttool_suggest_selected();
 
 	/* Count the visible lines to the cursor */
 	for (tmp=st->text->curl, l=-st->top; tmp; tmp=tmp->prev, l++);
@@ -1858,7 +1858,7 @@ static void get_suggest_prefix(Text *text) {
 	char *line, tmp[256];
 
 	if (!text) return;
-	if (!suggest_is_active(text)) return;
+	if (!texttool_text_is_active(text)) return;
 
 	line= text->curl->line;
 	for (i=text->curc-1; i>=0; i--)
@@ -1872,7 +1872,7 @@ static void get_suggest_prefix(Text *text) {
 	}
 	strncpy(tmp, line+i, len);
 	tmp[len]= '\0';
-	suggest_prefix(tmp);
+	texttool_suggest_prefix(tmp);
 }
 
 static void confirm_suggestion(Text *text, int skipleft) {
@@ -1881,9 +1881,9 @@ static void confirm_suggestion(Text *text, int skipleft) {
 	SuggItem *sel;
 
 	if (!text) return;
-	if (!suggest_is_active(text)) return;
+	if (!texttool_text_is_active(text)) return;
 
-	sel = suggest_get_selected();
+	sel = texttool_suggest_selected();
 	if (!sel) return;
 
 	line= text->curl->line;
@@ -1905,7 +1905,7 @@ static void confirm_suggestion(Text *text, int skipleft) {
 	for (i=0; i<skipleft; i++)
 		txt_move_right(text, 0);
 
-	suggest_clear_active();
+	texttool_text_clear();
 }
 
 void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
@@ -1980,9 +1980,9 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 		return;
 	}
 
-	if (st->showsyntax && suggest_is_active(text)) {
-		if (suggest_first()) tools |= TOOL_SUGG_LIST;
-		if (suggest_get_docs()) tools |= TOOL_DOCUMENT;
+	if (st->showsyntax && texttool_text_is_active(text)) {
+		if (texttool_suggest_first()) tools |= TOOL_SUGG_LIST;
+		if (texttool_docs_get()) tools |= TOOL_DOCUMENT;
 	}
 	
 	if (event==LEFTMOUSE) {
@@ -2454,11 +2454,11 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			break;
 		case DOWNARROWKEY:
 			if (tools & TOOL_SUGG_LIST) {
-				SuggItem *sel = suggest_get_selected();
+				SuggItem *sel = texttool_suggest_selected();
 				if (!sel) {
-					suggest_set_selected(suggest_first());
-				} else if (sel!=suggest_last() && sel->next) {
-					suggest_set_selected(sel->next);
+					texttool_suggest_select(texttool_suggest_first());
+				} else if (sel!=texttool_suggest_last() && sel->next) {
+					texttool_suggest_select(sel->next);
 				}
 				tools_cancel &= ~TOOL_SUGG_LIST;
 				break;
@@ -2492,9 +2492,9 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			break;
 		case UPARROWKEY:
 			if (tools & TOOL_SUGG_LIST) {
-				SuggItem *sel = suggest_get_selected();
-				if (sel && sel!=suggest_first() && sel->prev)
-					suggest_set_selected(sel->prev);
+				SuggItem *sel = texttool_suggest_selected();
+				if (sel && sel!=texttool_suggest_first() && sel->prev)
+					texttool_suggest_select(sel->prev);
 				tools_cancel &= ~TOOL_SUGG_LIST;
 				break;
 			}
@@ -2506,11 +2506,11 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 		case PAGEDOWNKEY:
 			if (tools & TOOL_SUGG_LIST) {
 				int i;
-				SuggItem *sel = suggest_get_selected();
+				SuggItem *sel = texttool_suggest_selected();
 				if (!sel)
-					sel = suggest_first();
-				for (i=0; i<SUGG_LIST_SIZE-1 && sel && sel!=suggest_last() && sel->next; i++, sel=sel->next)
-					suggest_set_selected(sel->next);
+					sel = texttool_suggest_first();
+				for (i=0; i<SUGG_LIST_SIZE-1 && sel && sel!=texttool_suggest_last() && sel->next; i++, sel=sel->next)
+					texttool_suggest_select(sel->next);
 				tools_cancel &= ~TOOL_SUGG_LIST;
 				break;
 			} else {
@@ -2521,9 +2521,9 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 		case PAGEUPKEY:
 			if (tools & TOOL_SUGG_LIST) {
 				int i;
-				SuggItem *sel = suggest_get_selected();
-				for (i=0; i<SUGG_LIST_SIZE-1 && sel && sel!=suggest_first() && sel->prev; i++, sel=sel->prev)
-					suggest_set_selected(sel->prev);
+				SuggItem *sel = texttool_suggest_selected();
+				for (i=0; i<SUGG_LIST_SIZE-1 && sel && sel!=texttool_suggest_first() && sel->prev; i++, sel=sel->prev)
+					texttool_suggest_select(sel->prev);
 				tools_cancel &= ~TOOL_SUGG_LIST;
 				break;
 			} else {
@@ -2543,9 +2543,9 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			break;
 		case WHEELUPMOUSE:
 			if (tools & TOOL_SUGG_LIST) {
-				SuggItem *sel = suggest_get_selected();
-				if (sel && sel!=suggest_first() && sel->prev)
-					suggest_set_selected(sel->prev);
+				SuggItem *sel = texttool_suggest_selected();
+				if (sel && sel!=texttool_suggest_first() && sel->prev)
+					texttool_suggest_select(sel->prev);
 				tools_cancel &= ~TOOL_SUGG_LIST;
 			} else {
 				screen_skip(st, -U.wheellinescroll);
@@ -2555,11 +2555,11 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			break;
 		case WHEELDOWNMOUSE:
 			if (tools & TOOL_SUGG_LIST) {
-				SuggItem *sel = suggest_get_selected();
+				SuggItem *sel = texttool_suggest_selected();
 				if (!sel) {
-					suggest_set_selected(suggest_first());
-				} else if (sel && sel!=suggest_last() && sel->next) {
-					suggest_set_selected(sel->next);
+					texttool_suggest_select(texttool_suggest_first());
+				} else if (sel && sel!=texttool_suggest_last() && sel->next) {
+					texttool_suggest_select(sel->next);
 				}
 				tools_cancel &= ~TOOL_SUGG_LIST;
 			} else {
@@ -2637,13 +2637,13 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 		if (tools_update & TOOL_SUGG_LIST) {
 			get_suggest_prefix(text);
 		} else if (tools_cancel & TOOL_SUGG_LIST) {
-			suggest_clear_active();
+			texttool_suggest_clear();
 		}
 		do_draw= 1;
 	}
 	if (tools & TOOL_DOCUMENT) {
 		if (tools_cancel & TOOL_DOCUMENT) {
-			suggest_clear_docs();
+			texttool_docs_clear();
 		}
 		do_draw= 1;
 	}
diff --git a/source/blender/src/usiblender.c b/source/blender/src/usiblender.c
index a45ddc73972..4e5a7dc92c7 100644
--- a/source/blender/src/usiblender.c
+++ b/source/blender/src/usiblender.c
@@ -1101,7 +1101,7 @@ void exit_usiblender(void)
 	free_actcopybuf();
 	free_vertexpaint();
 	free_imagepaint();
-	free_suggestions();
+	free_texttools();
 	
 	/* editnurb can remain to exist outside editmode */
 	freeNurblist(&editNurb);

From dd899939dabae68564f7a1d1994b50ee2f2cf8be Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Thu, 24 Jul 2008 04:48:34 +0000
Subject: [PATCH 128/252] soc-2008-mxcurioni: Added first batch of Iterators:
 AdjacencyIterator,  Interface0DIterator, CurvePointIterator,
 StrokeVertexIterator,  SVertexIterator, orientedViewEdgeIterator.

---
 .../freestyle/intern/python/BPy_Convert.cpp   |   3 +
 .../freestyle/intern/python/BPy_Convert.h     |   1 +
 .../intern/python/BPy_CurvePointIterator.cpp  | 284 ------------------
 .../intern/python/BPy_Interface0DIterator.cpp | 104 -------
 .../freestyle/intern/python/BPy_Iterator.cpp  |  47 ++-
 .../python/BPy_StrokeVertexIterator.cpp       | 260 ----------------
 .../python/Interface0D/BPy_ViewVertex.h       |   1 +
 .../intern/python/Interface1D/BPy_Stroke.cpp  |   2 +-
 .../python/Iterator/BPy_AdjacencyIterator.cpp | 142 +++++++++
 .../python/Iterator/BPy_AdjacencyIterator.h   |  32 ++
 .../BPy_ChainingIterator.cpp}                 |   0
 .../BPy_ChainingPredicateIterator.cpp}        |   0
 .../BPy_ChainingSilhouetteIterator.cpp        |   0
 .../Iterator/BPy_CurvePointIterator.cpp       | 162 ++++++++++
 .../python/Iterator/BPy_CurvePointIterator.h  |  33 ++
 .../Iterator/BPy_Interface0DIterator.cpp      | 139 +++++++++
 .../python/Iterator/BPy_Interface0DIterator.h |  32 ++
 .../python/Iterator/BPy_SVertexIterator.cpp   | 162 ++++++++++
 .../python/Iterator/BPy_SVertexIterator.h     |  34 +++
 .../Iterator/BPy_StrokeVertexIterator.cpp     | 158 ++++++++++
 .../Iterator/BPy_StrokeVertexIterator.h       |  33 ++
 .../python/Iterator/BPy_ViewEdgeIterator.cpp  | 150 +++++++++
 .../python/Iterator/BPy_ViewEdgeIterator.h    |  34 +++
 .../Iterator/BPy_orientedViewEdgeIterator.cpp | 130 ++++++++
 .../Iterator/BPy_orientedViewEdgeIterator.h   |  34 +++
 .../ViewEdgeIterator/BPy_ChainingIterator.cpp |  36 ---
 .../BPy_ChainPredicateIterator.cpp            |  12 -
 .../BPy_ChainSilhouetteIterator.cpp           |  16 -
 28 files changed, 1326 insertions(+), 715 deletions(-)
 delete mode 100644 source/blender/freestyle/intern/python/BPy_CurvePointIterator.cpp
 delete mode 100644 source/blender/freestyle/intern/python/BPy_Interface0DIterator.cpp
 delete mode 100644 source/blender/freestyle/intern/python/BPy_StrokeVertexIterator.cpp
 create mode 100644 source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp
 create mode 100644 source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.h
 rename source/blender/freestyle/intern/python/{BPy_ViewEdgeIterator.cpp => Iterator/BPy_ChainingIterator.cpp} (100%)
 rename source/blender/freestyle/intern/python/{BPy_orientedViewEdgeIterator.cpp => Iterator/BPy_ChainingPredicateIterator.cpp} (100%)
 create mode 100644 source/blender/freestyle/intern/python/Iterator/BPy_ChainingSilhouetteIterator.cpp
 create mode 100644 source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp
 create mode 100644 source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.h
 create mode 100644 source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp
 create mode 100644 source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.h
 create mode 100644 source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp
 create mode 100644 source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.h
 create mode 100644 source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp
 create mode 100644 source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.h
 create mode 100644 source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp
 create mode 100644 source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.h
 create mode 100644 source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp
 create mode 100644 source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.h
 delete mode 100644 source/blender/freestyle/intern/python/ViewEdgeIterator/BPy_ChainingIterator.cpp
 delete mode 100644 source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/BPy_ChainPredicateIterator.cpp
 delete mode 100644 source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/BPy_ChainSilhouetteIterator.cpp

diff --git a/source/blender/freestyle/intern/python/BPy_Convert.cpp b/source/blender/freestyle/intern/python/BPy_Convert.cpp
index 843bdc7c7d1..89fa677aac0 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Convert.cpp
@@ -12,6 +12,9 @@ PyObject * PyBool_from_bool( bool b ){
 	return PyBool_FromLong( b ? 1 : 0);
 }
 
+bool bool_from_PyBool( PyObject *b ) {
+	return b == Py_True;
+}
 
 PyObject * Vector_from_Vec2f( Vec2f& vec ) {
 	float vec_data[2]; // because vec->_coord is protected
diff --git a/source/blender/freestyle/intern/python/BPy_Convert.h b/source/blender/freestyle/intern/python/BPy_Convert.h
index 8e935f6e229..16f991e0e51 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.h
+++ b/source/blender/freestyle/intern/python/BPy_Convert.h
@@ -25,6 +25,7 @@ extern "C" {
 #include "api2_2x/gen_utils.h"
 
 PyObject * PyBool_from_bool( bool b );
+bool bool_from_PyBool( PyObject *b );
 
 PyObject * Vector_from_Vec2f( Vec2f& v );
 PyObject * Vector_from_Vec3f( Vec3f& v );
diff --git a/source/blender/freestyle/intern/python/BPy_CurvePointIterator.cpp b/source/blender/freestyle/intern/python/BPy_CurvePointIterator.cpp
deleted file mode 100644
index 57dc86ea5e4..00000000000
--- a/source/blender/freestyle/intern/python/BPy_CurvePointIterator.cpp
+++ /dev/null
@@ -1,284 +0,0 @@
- PyObject *_wrap_CurvePointIterator__CurvilinearLength_set(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator__CurvilinearLength_get(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator__step_set(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator__step_get(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator___A_set(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator___A_get(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator___B_set(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator___B_get(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator__begin_set(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator__begin_get(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator__end_set(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator__end_get(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator__n_set(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator__n_get(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator__currentn_set(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator__currentn_get(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator__t_set(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator__t_get(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator__Point_set(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator__Point_get(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator__CurveLength_set(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator__CurveLength_get(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_CurvePointIterator__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_CurvePointIterator__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_CurvePointIterator__SWIG_2(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_CurvePointIterator(PyObject *self, PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_CurvePointIterator(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator_copy(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator_CastToInterface0DIterator(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator_getExactTypeName(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator___eq__(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator_getObject(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator___deref__(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator_isBegin(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator_isEnd(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator_getX(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator_getY(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator_getZ(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator_getPoint3D(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator_getProjectedX(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator_getProjectedY(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator_getProjectedZ(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator_getPoint2D(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator_getFEdge(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator_getId(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator_getNature(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator_castToSVertex(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator_castToViewVertex(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator_castToNonTVertex(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator_castToTVertex(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator_A(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator_B(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator_t2d(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator_SetA(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator_SetB(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator_SetT2d(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator_fedge(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator_point2d(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator_point3d(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator_normal(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator_shape(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator_occluders_begin(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator_occluders_end(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator_occluders_empty(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator_occluders_size(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator_occludee(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator_occluded_shape(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator_occludee_empty(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator_z_discontinuity(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator_curvatureFredo(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_CurvePointIterator_directionFredo(PyObject *self , PyObject *args) {
-}
-
-
diff --git a/source/blender/freestyle/intern/python/BPy_Interface0DIterator.cpp b/source/blender/freestyle/intern/python/BPy_Interface0DIterator.cpp
deleted file mode 100644
index 48b7560acea..00000000000
--- a/source/blender/freestyle/intern/python/BPy_Interface0DIterator.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
- PyObject *_wrap_Interface0DIterator_getExactTypeName(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Interface0DIterator_getObject(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Interface0DIterator___deref__(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Interface0DIterator_increment(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Interface0DIterator_decrement(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Interface0DIterator_isBegin(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Interface0DIterator_isEnd(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Interface0DIterator___eq__(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Interface0DIterator___ne__(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Interface0DIterator_t(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Interface0DIterator_u(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Interface0DIterator_getX(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Interface0DIterator_getY(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Interface0DIterator_getZ(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Interface0DIterator_getPoint3D(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Interface0DIterator_getProjectedX(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Interface0DIterator_getProjectedY(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Interface0DIterator_getProjectedZ(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Interface0DIterator_getPoint2D(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Interface0DIterator_getFEdge(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Interface0DIterator_getId(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Interface0DIterator_getNature(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Interface0DIterator_castToSVertex(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Interface0DIterator_castToViewVertex(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Interface0DIterator_castToNonTVertex(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Interface0DIterator_castToTVertex(PyObject *self , PyObject *args) {
-}
-
-
diff --git a/source/blender/freestyle/intern/python/BPy_Iterator.cpp b/source/blender/freestyle/intern/python/BPy_Iterator.cpp
index aebf5e45630..6a613c5f5ab 100644
--- a/source/blender/freestyle/intern/python/BPy_Iterator.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Iterator.cpp
@@ -1,7 +1,15 @@
 #include "BPy_Iterator.h"
 
 #include "BPy_Convert.h"
+#include "Iterator/BPy_AdjacencyIterator.h"
+#include "Iterator/BPy_Interface0DIterator.h"
+#include "Iterator/BPy_CurvePointIterator.h"
+#include "Iterator/BPy_StrokeVertexIterator.h"
+#include "Iterator/BPy_SVertexIterator.h"
+#include "Iterator/BPy_orientedViewEdgeIterator.h"
+#include "Iterator/BPy_ViewEdgeIterator.h"
 
+	
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -115,8 +123,7 @@ PyTypeObject Iterator_Type = {
 
 //-------------------MODULE INITIALIZATION--------------------------------
 PyMODINIT_FUNC Iterator_Init( PyObject *module )
-{
-	
+{	
 	if( module == NULL )
 		return;
 
@@ -124,6 +131,42 @@ PyMODINIT_FUNC Iterator_Init( PyObject *module )
 		return;
 	Py_INCREF( &Iterator_Type );
 	PyModule_AddObject(module, "Iterator", (PyObject *)&Iterator_Type);
+
+	if( PyType_Ready( &AdjacencyIterator_Type ) < 0 )
+		return;
+	Py_INCREF( &AdjacencyIterator_Type );
+	PyModule_AddObject(module, "AdjacencyIterator", (PyObject *)&AdjacencyIterator_Type);
+
+	if( PyType_Ready( &Interface0DIterator_Type ) < 0 )
+		return;
+	Py_INCREF( &Interface0DIterator_Type );
+	PyModule_AddObject(module, "Interface0DIterator", (PyObject *)&Interface0DIterator_Type);
+	
+	if( PyType_Ready( &CurvePointIterator_Type ) < 0 )
+		return;
+	Py_INCREF( &CurvePointIterator_Type );
+	PyModule_AddObject(module, "CurvePointIterator", (PyObject *)&CurvePointIterator_Type);
+	
+	if( PyType_Ready( &StrokeVertexIterator_Type ) < 0 )
+		return;
+	Py_INCREF( &StrokeVertexIterator_Type );
+	PyModule_AddObject(module, "StrokeVertexIterator", (PyObject *)&StrokeVertexIterator_Type);
+	
+	if( PyType_Ready( &SVertexIterator_Type ) < 0 )
+		return;
+	Py_INCREF( &SVertexIterator_Type );
+	PyModule_AddObject(module, "SVertexIterator", (PyObject *)&SVertexIterator_Type);
+	
+	if( PyType_Ready( &orientedViewEdgeIterator_Type ) < 0 )
+		return;
+	Py_INCREF( &orientedViewEdgeIterator_Type );
+	PyModule_AddObject(module, "orientedViewEdgeIterator", (PyObject *)&orientedViewEdgeIterator_Type);
+	
+	if( PyType_Ready( &ViewEdgeIterator_Type ) < 0 )
+		return;
+	Py_INCREF( &ViewEdgeIterator_Type );
+	PyModule_AddObject(module, "ViewEdgeIterator", (PyObject *)&ViewEdgeIterator_Type);
+	
 	
 }
 
diff --git a/source/blender/freestyle/intern/python/BPy_StrokeVertexIterator.cpp b/source/blender/freestyle/intern/python/BPy_StrokeVertexIterator.cpp
deleted file mode 100644
index 3fae5a34060..00000000000
--- a/source/blender/freestyle/intern/python/BPy_StrokeVertexIterator.cpp
+++ /dev/null
@@ -1,260 +0,0 @@
- PyObject *_wrap_StrokeVertexIterator_castToInterface0DIterator(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_getExactTypeName(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_getObject(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator___deref__(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_increment(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_decrement(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_isBegin(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_isEnd(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator___eq__(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_t(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_u(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_copy(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_getIt(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_x(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_y(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_getPoint(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_attribute__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_attribute__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_attribute(PyObject *self, PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_curvilinearAbscissa(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_strokeLength(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_SetX(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_SetY(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_SetPoint__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_SetPoint__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_SetPoint(PyObject *self, PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_SetAttribute(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_SetCurvilinearAbscissa(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_SetStrokeLength(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_getX(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_getY(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_getZ(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_getPoint3D(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_getProjectedX(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_getProjectedY(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_getProjectedZ(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_getPoint2D(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_getFEdge(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_getId(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_getNature(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_castToSVertex(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_castToViewVertex(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_castToNonTVertex(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_castToTVertex(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_A(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_B(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_t2d(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_SetA(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_SetB(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_SetT2d(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_fedge(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_point2d(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_point3d(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_normal(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_shape(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_occluders_begin(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_occluders_end(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_occluders_empty(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_occluders_size(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_occludee(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_occluded_shape(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_occludee_empty(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_z_discontinuity(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_curvatureFredo(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertexIterator_directionFredo(PyObject *self , PyObject *args) {
-}
-
-
diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.h b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.h
index b70a69c95e7..841040af180 100644
--- a/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.h
+++ b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.h
@@ -20,6 +20,7 @@ extern PyTypeObject ViewVertex_Type;
 /*---------------------------Python BPy_ViewVertex structure definition----------*/
 typedef struct {
 	BPy_Interface0D py_if0D;
+	ViewVertex *vv;
 } BPy_ViewVertex;
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
index 8027f625cc5..7574c8d7fc1 100644
--- a/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
@@ -282,7 +282,7 @@ PyObject *Stroke_setTips( BPy_Stroke *self , PyObject *args) {
 		Py_RETURN_NONE;
 	}
 
-	self->s->setTips( py_b == Py_True );
+	self->s->setTips( bool_from_PyBool(py_b) );
 
 	Py_RETURN_NONE;
 }
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp
new file mode 100644
index 00000000000..cc7ce17f4cf
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp
@@ -0,0 +1,142 @@
+#include "BPy_AdjacencyIterator.h"
+
+#include "../BPy_Convert.h"
+#include "../Interface0D/BPy_ViewVertex.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for AdjacencyIterator instance  -----------*/
+static int AdjacencyIterator___init__(BPy_AdjacencyIterator *self, PyObject *args);
+
+/*----------------------AdjacencyIterator instance definitions ----------------------------*/
+static PyMethodDef BPy_AdjacencyIterator_methods[] = {
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_AdjacencyIterator type definition ------------------------------*/
+
+PyTypeObject AdjacencyIterator_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"AdjacencyIterator",				/* tp_name */
+	sizeof( BPy_AdjacencyIterator ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_AdjacencyIterator_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&Iterator_Type,				/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)AdjacencyIterator___init__,                       	/* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int AdjacencyIterator___init__(BPy_AdjacencyIterator *self, PyObject *args )
+{	
+	PyObject *obj1 = 0, *obj2 = 0 , *obj3 = 0;
+
+	if (! PyArg_ParseTuple(args, "|OOO", &obj1, &obj2, &obj3) )
+	    return -1;
+
+	if( !obj1 && !obj2 && !obj3 ){
+		self->ai = new AdjacencyIterator();
+		
+	} else if( BPy_AdjacencyIterator_Check(obj1) ) {
+		self->ai = new AdjacencyIterator(*( ((BPy_AdjacencyIterator *) obj1)->ai ));
+	
+	} else if( BPy_ViewVertex_Check(obj1) ) {
+		bool restrictToSelection = ( obj2 && PyBool_Check(obj2) ) ? bool_from_PyBool(obj2) : true;
+		bool restrictToUnvisited = ( obj3 && PyBool_Check(obj3) ) ? bool_from_PyBool(obj3) : true;
+		
+		self->ai = new AdjacencyIterator( ((BPy_ViewVertex *) obj1)->vv, restrictToSelection, restrictToUnvisited );
+			
+	} else {
+		return -1;
+	}
+
+	self->py_it.it = self->ai;
+	return 0;
+
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.h
new file mode 100644
index 00000000000..91319ff9c92
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.h
@@ -0,0 +1,32 @@
+#ifndef FREESTYLE_PYTHON_ADJACENCYITERATOR_H
+#define FREESTYLE_PYTHON_ADJACENCYITERATOR_H
+
+#include "../../stroke/ChainingIterators.h"
+#include "../BPy_Iterator.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject AdjacencyIterator_Type;
+
+#define BPy_AdjacencyIterator_Check(v)	(( (PyObject *) v)->ob_type == &AdjacencyIterator_Type)
+
+/*---------------------------Python BPy_AdjacencyIterator structure definition----------*/
+typedef struct {
+	BPy_Iterator py_it;
+	AdjacencyIterator *ai;
+} BPy_AdjacencyIterator;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_ADJACENCYITERATOR_H */
diff --git a/source/blender/freestyle/intern/python/BPy_ViewEdgeIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/BPy_ViewEdgeIterator.cpp
rename to source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp
diff --git a/source/blender/freestyle/intern/python/BPy_orientedViewEdgeIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingPredicateIterator.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/BPy_orientedViewEdgeIterator.cpp
rename to source/blender/freestyle/intern/python/Iterator/BPy_ChainingPredicateIterator.cpp
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingSilhouetteIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingSilhouetteIterator.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp
new file mode 100644
index 00000000000..b1b33b347bc
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp
@@ -0,0 +1,162 @@
+#include "BPy_CurvePointIterator.h"
+
+#include "../BPy_Convert.h"
+#include "BPy_Interface0DIterator.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for CurvePointIterator instance  -----------*/
+static int CurvePointIterator___init__(BPy_CurvePointIterator *self, PyObject *args);
+static PyObject * CurvePointIterator_t( BPy_CurvePointIterator *self );
+static PyObject * CurvePointIterator_u( BPy_CurvePointIterator *self );
+static PyObject * CurvePointIterator_castToInterface0DIterator( BPy_CurvePointIterator *self );
+
+
+/*----------------------CurvePointIterator instance definitions ----------------------------*/
+static PyMethodDef BPy_CurvePointIterator_methods[] = {
+	{"t", ( PyCFunction ) CurvePointIterator_t, METH_NOARGS, "（ ）Returns the curvilinear abscissa."},
+	{"u", ( PyCFunction ) CurvePointIterator_u, METH_NOARGS, "（ ）Returns the point parameter in the curve 0<=u<=1."},
+	{"castToInterface0DIterator", ( PyCFunction ) CurvePointIterator_castToInterface0DIterator, METH_NOARGS, "() Casts this CurvePointIterator into an Interface0DIterator. Useful for any call to a function of the type UnaryFunction0D."},
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_CurvePointIterator type definition ------------------------------*/
+
+PyTypeObject CurvePointIterator_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"CurvePointIterator",				/* tp_name */
+	sizeof( BPy_CurvePointIterator ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_CurvePointIterator_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&Iterator_Type,				/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)CurvePointIterator___init__,                       	/* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int CurvePointIterator___init__(BPy_CurvePointIterator *self, PyObject *args )
+{	
+	PyObject *obj = 0;
+
+	if (! PyArg_ParseTuple(args, "|O", &obj) )
+	    return -1;
+
+	if( !obj ){
+		self->cp_it = new CurvePointIterator();
+		
+	} else if( BPy_CurvePointIterator_Check(obj) ) {
+		self->cp_it = new CurvePointIterator(*( ((BPy_CurvePointIterator *) obj)->cp_it ));
+	
+	} else if( PyFloat_Check(obj) ) {
+		self->cp_it = new CurvePointIterator( PyFloat_AsDouble(obj) );
+			
+	} else {
+		return -1;
+	}
+
+	self->py_it.it = self->cp_it;
+
+	return 0;
+}
+
+PyObject * CurvePointIterator_t( BPy_CurvePointIterator *self ) {
+	return PyFloat_FromDouble( self->cp_it->t() );
+}
+
+PyObject * CurvePointIterator_u( BPy_CurvePointIterator *self ) {
+	return PyFloat_FromDouble( self->cp_it->u() );
+}
+
+PyObject * CurvePointIterator_castToInterface0DIterator( BPy_CurvePointIterator *self ) {
+	PyObject *py_if0D_it =  Interface0DIterator_Type.tp_new( &Interface0DIterator_Type, 0, 0 );
+	((BPy_Interface0DIterator *) py_if0D_it)->if0D_it = new Interface0DIterator( self->cp_it->castToInterface0DIterator() );
+
+	return py_if0D_it;
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.h
new file mode 100644
index 00000000000..652f6fffb97
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.h
@@ -0,0 +1,33 @@
+#ifndef FREESTYLE_PYTHON_CURVEPOINTITERATOR_H
+#define FREESTYLE_PYTHON_CURVEPOINTITERATOR_H
+
+#include "../../stroke/CurveIterators.h"
+using namespace CurveInternal;
+
+#include "../BPy_Iterator.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject CurvePointIterator_Type;
+
+#define BPy_CurvePointIterator_Check(v)	(( (PyObject *) v)->ob_type == &CurvePointIterator_Type)
+
+/*---------------------------Python BPy_CurvePointIterator structure definition----------*/
+typedef struct {
+	BPy_Iterator py_it;
+	CurvePointIterator *cp_it;
+} BPy_CurvePointIterator;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_CURVEPOINTITERATOR_H */
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp
new file mode 100644
index 00000000000..b2b6d67aa0f
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp
@@ -0,0 +1,139 @@
+#include "BPy_Interface0DIterator.h"
+
+#include "../BPy_Convert.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for Interface0DIterator instance  -----------*/
+static int Interface0DIterator___init__(BPy_Interface0DIterator *self, PyObject *args);
+
+static PyObject * Interface0DIterator_t( BPy_Interface0DIterator *self );
+static PyObject * Interface0DIterator_u( BPy_Interface0DIterator *self );
+
+/*----------------------Interface0DIterator instance definitions ----------------------------*/
+static PyMethodDef BPy_Interface0DIterator_methods[] = {
+	{"t", ( PyCFunction ) Interface0DIterator_t, METH_NOARGS, "（ ）Returns the curvilinear abscissa."},
+	{"u", ( PyCFunction ) Interface0DIterator_u, METH_NOARGS, "（ ）Returns the point parameter in the curve 0<=u<=1."},
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_Interface0DIterator type definition ------------------------------*/
+
+PyTypeObject Interface0DIterator_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"Interface0DIterator",				/* tp_name */
+	sizeof( BPy_Interface0DIterator ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_Interface0DIterator_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&Iterator_Type,				/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)Interface0DIterator___init__,                       	/* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int Interface0DIterator___init__(BPy_Interface0DIterator *self, PyObject *args )
+{	
+	PyObject *obj = 0;
+
+	if (!( PyArg_ParseTuple(args, "O", &obj) && BPy_Interface0DIterator_Check(obj) ))
+	    return -1;
+
+	self->if0D_it = new Interface0DIterator(*( ((BPy_Interface0DIterator *) obj)->if0D_it ));
+	self->py_it.it = self->if0D_it;
+	return 0;
+
+}
+
+PyObject * Interface0DIterator_t( BPy_Interface0DIterator *self ) {
+	return PyFloat_FromDouble( self->if0D_it->t() );
+}
+
+PyObject * Interface0DIterator_u( BPy_Interface0DIterator *self ) {
+	return PyFloat_FromDouble( self->if0D_it->u() );
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.h
new file mode 100644
index 00000000000..16edb2c3d68
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.h
@@ -0,0 +1,32 @@
+#ifndef FREESTYLE_PYTHON_INTERFACE0DITERATOR_H
+#define FREESTYLE_PYTHON_INTERFACE0DITERATOR_H
+
+#include "../../view_map/Interface0D.h"
+#include "../BPy_Iterator.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject Interface0DIterator_Type;
+
+#define BPy_Interface0DIterator_Check(v)	(( (PyObject *) v)->ob_type == &Interface0DIterator_Type)
+
+/*---------------------------Python BPy_Interface0DIterator structure definition----------*/
+typedef struct {
+	BPy_Iterator py_it;
+	Interface0DIterator *if0D_it;
+} BPy_Interface0DIterator;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_INTERFACE0DITERATOR_H */
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp
new file mode 100644
index 00000000000..da8b1453102
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp
@@ -0,0 +1,162 @@
+#include "BPy_SVertexIterator.h"
+
+#include "../BPy_Convert.h"
+#include "../Interface0D/BPy_SVertex.h"
+#include "../Interface1D/BPy_FEdge.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for SVertexIterator instance  -----------*/
+static int SVertexIterator___init__(BPy_SVertexIterator *self, PyObject *args);
+
+static PyObject * SVertexIterator_t( BPy_SVertexIterator *self );
+static PyObject * SVertexIterator_u( BPy_SVertexIterator *self );
+
+/*----------------------SVertexIterator instance definitions ----------------------------*/
+static PyMethodDef BPy_SVertexIterator_methods[] = {
+	{"t", ( PyCFunction ) SVertexIterator_t, METH_NOARGS, "（ ）Returns the curvilinear abscissa."},
+	{"u", ( PyCFunction ) SVertexIterator_u, METH_NOARGS, "（ ）Returns the point parameter in the curve 0<=u<=1."},
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_SVertexIterator type definition ------------------------------*/
+
+PyTypeObject SVertexIterator_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"SVertexIterator",				/* tp_name */
+	sizeof( BPy_SVertexIterator ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_SVertexIterator_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&Iterator_Type,				/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)SVertexIterator___init__,                       	/* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int SVertexIterator___init__(BPy_SVertexIterator *self, PyObject *args )
+{	
+	PyObject *obj1 = 0, *obj2 = 0, *obj3 = 0, *obj4 = 0;
+	float f;
+
+	if (! PyArg_ParseTuple(args, "|OOOOf", &obj1, &obj2, &obj3, &obj4, f) )
+	    return -1;
+
+	if( !obj1 ){
+		self->sv_it = new SVertexIterator();
+		
+	} else if( BPy_SVertexIterator_Check(obj1) ) {
+		self->sv_it = new SVertexIterator(*( ((BPy_SVertexIterator *) obj1)->sv_it ));
+	
+	} else if(  obj1 && BPy_SVertex_Check(obj1) &&
+	 			obj2 && BPy_SVertex_Check(obj2) &&
+				obj3 && BPy_FEdge_Check(obj3) &&
+				obj4 && BPy_FEdge_Check(obj4) ) {
+
+		self->sv_it = new SVertexIterator(	((BPy_SVertex *) obj1)->sv,
+											((BPy_SVertex *) obj2)->sv,
+											((BPy_FEdge *) obj3)->fe,
+											((BPy_FEdge *) obj4)->fe,
+											f );
+			
+	} else {
+		return -1;
+	}
+
+	self->py_it.it = self->sv_it;
+
+	return 0;
+}
+
+PyObject * SVertexIterator_t( BPy_SVertexIterator *self ) {
+	return PyFloat_FromDouble( self->sv_it->t() );
+}
+
+PyObject * SVertexIterator_u( BPy_SVertexIterator *self ) {
+	return PyFloat_FromDouble( self->sv_it->u() );
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.h
new file mode 100644
index 00000000000..662685571eb
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.h
@@ -0,0 +1,34 @@
+#ifndef FREESTYLE_PYTHON_SVERTEXITERATOR_H
+#define FREESTYLE_PYTHON_SVERTEXITERATOR_H
+
+#include "../../view_map/ViewMapIterators.h"
+using namespace ViewEdgeInternal;
+
+#include "../BPy_Iterator.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject SVertexIterator_Type;
+
+#define BPy_SVertexIterator_Check(v)	(( (PyObject *) v)->ob_type == &SVertexIterator_Type)
+
+/*---------------------------Python BPy_SVertexIterator structure definition----------*/
+typedef struct {
+	BPy_Iterator py_it;
+	SVertexIterator *sv_it;
+} BPy_SVertexIterator;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_SVERTEXITERATOR_H */
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp
new file mode 100644
index 00000000000..895aaee2323
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp
@@ -0,0 +1,158 @@
+#include "BPy_StrokeVertexIterator.h"
+
+#include "../BPy_Convert.h"
+#include "BPy_Interface0DIterator.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for StrokeVertexIterator instance  -----------*/
+static int StrokeVertexIterator___init__(BPy_StrokeVertexIterator *self, PyObject *args);
+static PyObject * StrokeVertexIterator_t( BPy_StrokeVertexIterator *self );
+static PyObject * StrokeVertexIterator_u( BPy_StrokeVertexIterator *self );
+static PyObject * StrokeVertexIterator_castToInterface0DIterator( BPy_StrokeVertexIterator *self );
+
+/*----------------------StrokeVertexIterator instance definitions ----------------------------*/
+static PyMethodDef BPy_StrokeVertexIterator_methods[] = {
+	{"t", ( PyCFunction ) StrokeVertexIterator_t, METH_NOARGS, "（ ）Returns the curvilinear abscissa."},
+	{"u", ( PyCFunction ) StrokeVertexIterator_u, METH_NOARGS, "（ ）Returns the point parameter in the curve 0<=u<=1."},
+	{"castToInterface0DIterator", ( PyCFunction ) StrokeVertexIterator_castToInterface0DIterator, METH_NOARGS, "() Casts this StrokeVertexIterator into an Interface0DIterator. Useful for any call to a function of the type UnaryFunction0D."},
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_StrokeVertexIterator type definition ------------------------------*/
+
+PyTypeObject StrokeVertexIterator_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"StrokeVertexIterator",				/* tp_name */
+	sizeof( BPy_StrokeVertexIterator ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_StrokeVertexIterator_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&Iterator_Type,				/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)StrokeVertexIterator___init__,                       	/* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int StrokeVertexIterator___init__(BPy_StrokeVertexIterator *self, PyObject *args )
+{	
+	PyObject *obj = 0;
+
+	if (! PyArg_ParseTuple(args, "|O", &obj) )
+	    return -1;
+
+	if( !obj ){
+		self->sv_it = new StrokeVertexIterator();
+		
+	} else if( BPy_StrokeVertexIterator_Check(obj) ) {
+		self->sv_it = new StrokeVertexIterator(*( ((BPy_StrokeVertexIterator *) obj)->sv_it ));
+	
+	} else {
+		return -1;
+	}
+
+	self->py_it.it = self->sv_it;
+
+	return 0;
+}
+
+PyObject * StrokeVertexIterator_t( BPy_StrokeVertexIterator *self ) {
+	return PyFloat_FromDouble( self->sv_it->t() );
+}
+
+PyObject * StrokeVertexIterator_u( BPy_StrokeVertexIterator *self ) {
+	return PyFloat_FromDouble( self->sv_it->u() );
+}
+
+PyObject * StrokeVertexIterator_castToInterface0DIterator( BPy_StrokeVertexIterator *self ) {
+	PyObject *py_if0D_it =  Interface0DIterator_Type.tp_new( &Interface0DIterator_Type, 0, 0 );
+	((BPy_Interface0DIterator *) py_if0D_it)->if0D_it = new Interface0DIterator( self->sv_it->castToInterface0DIterator() );
+
+	return py_if0D_it;
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.h
new file mode 100644
index 00000000000..8d9ffc56018
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.h
@@ -0,0 +1,33 @@
+#ifndef FREESTYLE_PYTHON_STROKEVERTEXITERATOR_H
+#define FREESTYLE_PYTHON_STROKEVERTEXITERATOR_H
+
+#include "../../stroke/StrokeIterators.h"
+using namespace StrokeInternal;
+
+#include "../BPy_Iterator.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject StrokeVertexIterator_Type;
+
+#define BPy_StrokeVertexIterator_Check(v)	(( (PyObject *) v)->ob_type == &StrokeVertexIterator_Type)
+
+/*---------------------------Python BPy_StrokeVertexIterator structure definition----------*/
+typedef struct {
+	BPy_Iterator py_it;
+	StrokeVertexIterator *sv_it;
+} BPy_StrokeVertexIterator;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_STROKEVERTEXITERATOR_H */
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp
new file mode 100644
index 00000000000..25ae25d52a9
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp
@@ -0,0 +1,150 @@
+#include "BPy_ViewEdgeIterator.h"
+
+#include "../BPy_Convert.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for ViewEdgeIterator instance  -----------*/
+static int ViewEdgeIterator___init__(BPy_ViewEdgeIterator *self, PyObject *args);
+
+/*----------------------ViewEdgeIterator instance definitions ----------------------------*/
+static PyMethodDef BPy_ViewEdgeIterator_methods[] = {
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_ViewEdgeIterator type definition ------------------------------*/
+
+PyTypeObject ViewEdgeIterator_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"ViewEdgeIterator",				/* tp_name */
+	sizeof( BPy_ViewEdgeIterator ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_ViewEdgeIterator_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&Iterator_Type,				/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)ViewEdgeIterator___init__,                       	/* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int ViewEdgeIterator___init__(BPy_ViewEdgeIterator *self, PyObject *args )
+{	
+	PyObject *obj1 = 0, *obj2 = 0;
+
+	if (!( PyArg_ParseTuple(args, "O|O", &obj1, &obj2) ))
+	    return -1;
+
+	if( obj1 && BPy_ViewEdgeIterator_Check(obj1)  ) {
+		self->ve_it = new ViewEdgeIterator(*( ((BPy_ViewEdgeIterator *) obj1)->ve_it ));
+	
+	} else {
+		ViewEdge *begin = ( obj1 && BPy_ViewEdge_Check(obj1) ) ? ((BPy_ViewEdge *) obj1)->ve : 0;
+		bool orientation = ( obj2 && PyBool_Check(obj2) ) ? bool_from_PyBool(obj2) : true;
+		
+		self->ve_it = new ViewEdgeIterator( begin, orientation);
+		
+	}
+		
+	self->py_it.it = self->ve_it;
+	
+	return 0;
+}
+
+
+
+// ViewEdge * 	getCurrentEdge ()
+// void 	setCurrentEdge (ViewEdge *edge)
+// ViewEdge * 	getBegin ()
+// bool 	getOrientation () const
+
+
+
+// void 	setCurrentEdge (ViewEdge *edge)
+// void 	setBegin (ViewEdge *begin)
+// void 	setOrientation (bool orientation)
+// void 	changeOrientation ()
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.h
new file mode 100644
index 00000000000..35d2f3f255b
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.h
@@ -0,0 +1,34 @@
+#ifndef FREESTYLE_PYTHON_VIEWEDGEITERATOR_H
+#define FREESTYLE_PYTHON_VIEWEDGEITERATOR_H
+
+
+#include "../../view_map/ViewMapIterators.h"
+using namespace ViewEdgeInternal;
+
+#include "../BPy_Iterator.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject ViewEdgeIterator_Type;
+
+#define BPy_ViewEdgeIterator_Check(v)	(( (PyObject *) v)->ob_type == &ViewEdgeIterator_Type)
+
+/*---------------------------Python BPy_ViewEdgeIterator structure definition----------*/
+typedef struct {
+	BPy_Iterator py_it;
+	ViewEdgeIterator *ve_it;
+} BPy_ViewEdgeIterator;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_VIEWEDGEITERATOR_H */
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp
new file mode 100644
index 00000000000..9a32f384be9
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp
@@ -0,0 +1,130 @@
+#include "BPy_orientedViewEdgeIterator.h"
+
+#include "../BPy_Convert.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for orientedViewEdgeIterator instance  -----------*/
+static int orientedViewEdgeIterator___init__(BPy_orientedViewEdgeIterator *self, PyObject *args);
+
+/*----------------------orientedViewEdgeIterator instance definitions ----------------------------*/
+static PyMethodDef BPy_orientedViewEdgeIterator_methods[] = {
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_orientedViewEdgeIterator type definition ------------------------------*/
+
+PyTypeObject orientedViewEdgeIterator_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"orientedViewEdgeIterator",				/* tp_name */
+	sizeof( BPy_orientedViewEdgeIterator ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_orientedViewEdgeIterator_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&Iterator_Type,				/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)orientedViewEdgeIterator___init__,                       	/* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int orientedViewEdgeIterator___init__(BPy_orientedViewEdgeIterator *self, PyObject *args )
+{	
+	PyObject *obj = 0;
+
+	if (!( PyArg_ParseTuple(args, "|O", &obj) ))
+	    return -1;
+
+	if( !obj )
+		self->ove_it = new orientedViewEdgeIterator();
+	else if( BPy_orientedViewEdgeIterator_Check(obj) )
+		self->ove_it = new orientedViewEdgeIterator(*( ((BPy_orientedViewEdgeIterator *) obj)->ove_it ));
+	
+	self->py_it.it = self->ove_it;
+	
+	return 0;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.h
new file mode 100644
index 00000000000..60754939220
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.h
@@ -0,0 +1,34 @@
+#ifndef FREESTYLE_PYTHON_ORIENTEDVIEWEDGEITERATOR_H
+#define FREESTYLE_PYTHON_ORIENTEDVIEWEDGEITERATOR_H
+
+#include "../../stroke/Stroke.h"
+#include "../../view_map/ViewMapIterators.h"
+using namespace ViewVertexInternal;
+
+#include "../BPy_Iterator.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject orientedViewEdgeIterator_Type;
+
+#define BPy_orientedViewEdgeIterator_Check(v)	(( (PyObject *) v)->ob_type == &orientedViewEdgeIterator_Type)
+
+/*---------------------------Python BPy_orientedViewEdgeIterator structure definition----------*/
+typedef struct {
+	BPy_Iterator py_it;
+	orientedViewEdgeIterator *ove_it;
+} BPy_orientedViewEdgeIterator;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_ORIENTEDVIEWEDGEITERATOR_H */
diff --git a/source/blender/freestyle/intern/python/ViewEdgeIterator/BPy_ChainingIterator.cpp b/source/blender/freestyle/intern/python/ViewEdgeIterator/BPy_ChainingIterator.cpp
deleted file mode 100644
index 18ab37aeecd..00000000000
--- a/source/blender/freestyle/intern/python/ViewEdgeIterator/BPy_ChainingIterator.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
- PyObject *_wrap_ChainingIterator_getExactTypeName(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ChainingIterator_init(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ChainingIterator_traverse(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ChainingIterator_getVertex(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ChainingIterator_isIncrementing(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ChainingIterator_increment(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ChainingIterator_decrement(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_ChainingIterator(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_disown_ChainingIterator(PyObject *self , PyObject *args) {
-}
-
-
diff --git a/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/BPy_ChainPredicateIterator.cpp b/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/BPy_ChainPredicateIterator.cpp
deleted file mode 100644
index 3b3b4433e59..00000000000
--- a/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/BPy_ChainPredicateIterator.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
- PyObject *_wrap_ChainPredicateIterator_getExactTypeName(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ChainPredicateIterator_traverse(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_disown_ChainPredicateIterator(PyObject *self , PyObject *args) {
-}
-
-
diff --git a/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/BPy_ChainSilhouetteIterator.cpp b/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/BPy_ChainSilhouetteIterator.cpp
deleted file mode 100644
index 53d37c1578c..00000000000
--- a/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/BPy_ChainSilhouetteIterator.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
- PyObject *_wrap_ChainSilhouetteIterator_getExactTypeName(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ChainSilhouetteIterator_traverse(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_ChainSilhouetteIterator(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_disown_ChainSilhouetteIterator(PyObject *self , PyObject *args) {
-}
-
-

From a0359c37506d05589bae86e4818fa653c8f281ab Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Thu, 24 Jul 2008 08:29:48 +0000
Subject: [PATCH 129/252] soc-2008-mxcurioni: added (without testing) the
 following classes: BBox, SShape, ViewShape. Also corrected a few typos
 (Get#->get#).

---
 source/blender/freestyle/SConscript           |  23 +-
 .../freestyle/intern/python/BPy_BBox.cpp      | 142 +++++
 .../freestyle/intern/python/BPy_BBox.h        |  38 ++
 .../freestyle/intern/python/BPy_Convert.cpp   |  31 +
 .../freestyle/intern/python/BPy_Convert.h     |   9 +
 .../freestyle/intern/python/BPy_Freestyle.cpp |   7 +
 .../intern/python/BPy_Interface1D.cpp         |   6 +
 .../freestyle/intern/python/BPy_Material.h    |   0
 .../freestyle/intern/python/BPy_SShape.cpp    | 377 ++++++++----
 .../freestyle/intern/python/BPy_SShape.h      |  34 ++
 .../freestyle/intern/python/BPy_ViewShape.cpp | 325 +++++++++--
 .../freestyle/intern/python/BPy_ViewShape.h   |  34 ++
 .../python/Interface0D/BPy_ViewVertex.h       |   1 -
 .../python/Interface1D/BPy_ViewEdge.cpp       | 535 ++++++++++--------
 .../intern/python/Interface1D/BPy_ViewEdge.h  |  32 ++
 .../Iterator/BPy_CurvePointIterator.cpp       |   1 -
 .../Iterator/BPy_Interface0DIterator.cpp      |   2 -
 .../python/Iterator/BPy_SVertexIterator.cpp   |   1 -
 .../Iterator/BPy_StrokeVertexIterator.cpp     |   1 -
 .../python/Iterator/BPy_ViewEdgeIterator.cpp  |   1 +
 .../Iterator/BPy_orientedViewEdgeIterator.cpp |   2 -
 .../intern/stroke/ChainingIterators.h         |  10 +-
 .../freestyle/intern/stroke/CurveIterators.h  |   6 +-
 .../freestyle/intern/stroke/Operators.cpp     |   8 +-
 .../freestyle/intern/swig/ModuleWrapper.cpp   | 362 +++++++++++-
 .../intern/view_map/FEdgeXDetector.cpp        |   8 +-
 .../freestyle/intern/view_map/Interface0D.h   |  14 +-
 .../freestyle/intern/view_map/Silhouette.h    |  12 +-
 .../intern/view_map/ViewEdgeXBuilder.cpp      |   6 +-
 .../freestyle/intern/view_map/ViewMap.h       |   4 +-
 .../freestyle/intern/view_map/ViewMapIO.cpp   |  18 +-
 .../intern/view_map/ViewMapIterators.h        |   4 +-
 .../intern/winged_edge/Curvature.cpp          |   2 +-
 .../freestyle/intern/winged_edge/WEdge.cpp    |  16 +-
 .../freestyle/intern/winged_edge/WEdge.h      |   6 +-
 .../freestyle/intern/winged_edge/WXEdge.h     |   2 +-
 .../intern/winged_edge/WingedEdgeBuilder.cpp  |  20 +-
 source/blender/freestyle/python/Freestyle.py  |  18 +-
 38 files changed, 1611 insertions(+), 507 deletions(-)
 create mode 100644 source/blender/freestyle/intern/python/BPy_BBox.cpp
 create mode 100644 source/blender/freestyle/intern/python/BPy_BBox.h
 create mode 100644 source/blender/freestyle/intern/python/BPy_Material.h
 create mode 100644 source/blender/freestyle/intern/python/BPy_SShape.h
 create mode 100644 source/blender/freestyle/intern/python/BPy_ViewShape.h
 create mode 100644 source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.h

diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript
index 3c9f2abebe3..ed6beefd337 100644
--- a/source/blender/freestyle/SConscript
+++ b/source/blender/freestyle/SConscript
@@ -62,27 +62,38 @@ prefix = 'intern/python'
 python_sources = [
 					prefix + '/BPy_Freestyle.cpp',
 					prefix + '/BPy_Convert.cpp',
+					prefix + '/BPy_BBox.cpp',
 					prefix + '/BPy_BinaryPredicate0D.cpp',
 					prefix + '/BPy_BinaryPredicate1D.cpp',
 					prefix + '/BPy_Id.cpp',
 					prefix + '/BPy_IntegrationType.cpp',
 					prefix + '/BPy_Interface0D.cpp',
-					prefix + '/Interface0D/BPy_CurvePoint.cpp',
-					prefix + '/Interface0D/CurvePoint/BPy_StrokeVertex.cpp',
-					prefix + '/Interface0D/BPy_SVertex.cpp',
-					prefix + '/Interface0D/BPy_ViewVertex.cpp',
+						prefix + '/Interface0D/BPy_CurvePoint.cpp',
+						prefix + '/Interface0D/CurvePoint/BPy_StrokeVertex.cpp',
+						prefix + '/Interface0D/BPy_SVertex.cpp',
+						prefix + '/Interface0D/BPy_ViewVertex.cpp',
 					prefix + '/BPy_Interface1D.cpp',
-					prefix + '/Interface1D/BPy_FEdge.cpp',
-					prefix + '/Interface1D/BPy_Stroke.cpp',
+						prefix + '/Interface1D/BPy_FEdge.cpp',
+						prefix + '/Interface1D/BPy_Stroke.cpp',
+						prefix + '/Interface1D/BPy_ViewEdge.cpp',
 					prefix + '/BPy_Iterator.cpp',
+						prefix + '/Iterator/BPy_AdjacencyIterator.cpp',
+						prefix + '/Iterator/BPy_Interface0DIterator.cpp',
+						prefix + '/Iterator/BPy_CurvePointIterator.cpp',
+						prefix + '/Iterator/BPy_StrokeVertexIterator.cpp',
+						prefix + '/Iterator/BPy_SVertexIterator.cpp',
+						prefix + '/Iterator/BPy_orientedViewEdgeIterator.cpp',
+						prefix + '/Iterator/BPy_ViewEdgeIterator.cpp',
 					prefix + '/BPy_MediumType.cpp',
 					prefix + '/BPy_Nature.cpp',
+					prefix + '/BPy_SShape.cpp',
 					prefix + '/BPy_StrokeAttribute.cpp',
 					prefix + '/BPy_StrokeShader.cpp',
 					prefix + '/BPy_UnaryFunction0D.cpp',
 					prefix + '/BPy_UnaryFunction1D.cpp',
 					prefix + '/BPy_UnaryPredicate0D.cpp',
 					prefix + '/BPy_UnaryPredicate1D.cpp',
+					prefix + '/BPy_ViewShape.cpp'
 				]
 
 sources = 	system_sources + image_sources + geometry_sources + scene_graph_sources \
diff --git a/source/blender/freestyle/intern/python/BPy_BBox.cpp b/source/blender/freestyle/intern/python/BPy_BBox.cpp
new file mode 100644
index 00000000000..ac15672580d
--- /dev/null
+++ b/source/blender/freestyle/intern/python/BPy_BBox.cpp
@@ -0,0 +1,142 @@
+#include "BPy_BBox.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for BBox instance  -----------*/
+static int BBox___init__(BPy_BBox *self, PyObject *args, PyObject *kwds);
+static void BBox___dealloc__(BPy_BBox *self);
+static PyObject * BBox___repr__(BPy_BBox *self);
+
+/*----------------------BBox instance definitions ----------------------------*/
+static PyMethodDef BPy_BBox_methods[] = {
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_BBox type definition ------------------------------*/
+
+PyTypeObject BBox_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"BBox",				/* tp_name */
+	sizeof( BPy_BBox ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	(destructor)BBox___dealloc__,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	(reprfunc)BBox___repr__,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_BBox_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	NULL,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)BBox___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	PyType_GenericNew,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+PyMODINIT_FUNC BBox_Init( PyObject *module )
+{
+	if( module == NULL )
+		return;
+
+	if( PyType_Ready( &BBox_Type ) < 0 )
+		return;
+
+	Py_INCREF( &BBox_Type );
+	PyModule_AddObject(module, "BBox", (PyObject *)&BBox_Type);
+}
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int BBox___init__(BPy_BBox *self, PyObject *args, PyObject *kwds)
+{
+	self->bb = new BBox< Vec3r>();
+	return 0;
+}
+
+void BBox___dealloc__(BPy_BBox* self)
+{
+	delete self->bb;
+    self->ob_type->tp_free((PyObject*)self);
+}
+
+
+PyObject * BBox___repr__(BPy_BBox* self)
+{
+    return PyString_FromFormat("BBox - address: %p", self->bb );
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/BPy_BBox.h b/source/blender/freestyle/intern/python/BPy_BBox.h
new file mode 100644
index 00000000000..88bba3301bb
--- /dev/null
+++ b/source/blender/freestyle/intern/python/BPy_BBox.h
@@ -0,0 +1,38 @@
+#ifndef FREESTYLE_PYTHON_BBOX_H
+#define FREESTYLE_PYTHON_BBOX_H
+
+#include "../geometry/BBox.h"
+#include "../geometry/Geom.h"
+using namespace Geometry;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject BBox_Type;
+
+#define BPy_BBox_Check(v)	(( (PyObject *) v)->ob_type == &BBox_Type)
+
+/*---------------------------Python BPy_BBox structure definition----------*/
+typedef struct {
+	PyObject_HEAD
+	BBox<Vec3r> *bb;
+} BPy_BBox;
+
+/*---------------------------Python BPy_BBox visible prototypes-----------*/
+
+PyMODINIT_FUNC BBox_Init( PyObject *module );
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* FREESTYLE_PYTHON_BBOX_H */
diff --git a/source/blender/freestyle/intern/python/BPy_Convert.cpp b/source/blender/freestyle/intern/python/BPy_Convert.cpp
index 89fa677aac0..c052acb446f 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Convert.cpp
@@ -105,6 +105,37 @@ PyObject * BPy_StrokeVertex_from_StrokeVertex( StrokeVertex& sv ) {
 	return py_sv;
 }
 
+PyObject * BPy_ViewVertex_from_ViewVertex_ptr( ViewVertex *vv ) {
+	PyObject *py_vv = ViewVertex_Type.tp_new( &ViewVertex_Type, 0, 0 );
+	((BPy_ViewVertex *) py_vv)->vv = vv;
+	((BPy_ViewVertex *) py_vv)->py_if0D.if0D = ((BPy_ViewVertex *) py_vv)->vv;
+
+	return py_vv;
+}
+
+PyObject * BPy_BBox_from_BBox( BBox< Vec3r > &bb ) {
+	PyObject *py_bb = BBox_Type.tp_new( &BBox_Type, 0, 0 );
+	((BPy_BBox *) py_bb)->bb = new BBox< Vec3r >( bb );
+
+	return py_bb;
+}
+
+PyObject * BPy_ViewEdge_from_ViewEdge( ViewEdge& ve ) {
+	PyObject *py_ve = ViewEdge_Type.tp_new( &ViewEdge_Type, 0, 0 );
+	((BPy_ViewEdge *) py_ve)->ve = new ViewEdge( ve );
+	((BPy_ViewEdge *) py_ve)->py_if1D.if1D = ((BPy_ViewEdge *) py_ve)->ve;
+
+	return py_ve;
+}
+
+PyObject * BPy_SShape_from_SShape( SShape& ss ) {
+	PyObject *py_ss = SShape_Type.tp_new( &SShape_Type, 0, 0 );
+	((BPy_SShape *) py_ss)->ss = new SShape( ss );
+
+	return py_ss;	
+}
+
+
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/BPy_Convert.h b/source/blender/freestyle/intern/python/BPy_Convert.h
index 16f991e0e51..6bf05dc8047 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.h
+++ b/source/blender/freestyle/intern/python/BPy_Convert.h
@@ -4,12 +4,17 @@
 #include "../geometry/Geom.h"
 using namespace Geometry;
 
+
+#include "BPy_BBox.h"
 #include "BPy_Id.h"
 #include "BPy_IntegrationType.h"
 #include "BPy_Interface0D.h"
 #include "Interface0D/CurvePoint/BPy_StrokeVertex.h"
 #include "Interface0D/BPy_SVertex.h"
+#include "Interface0D/BPy_ViewVertex.h"
 #include "Interface1D/BPy_FEdge.h"
+#include "Interface1D/BPy_ViewEdge.h"
+#include "BPy_SShape.h"
 #include "BPy_Nature.h"
 #include "BPy_MediumType.h"
 #include "BPy_StrokeAttribute.h"
@@ -31,14 +36,18 @@ PyObject * Vector_from_Vec2f( Vec2f& v );
 PyObject * Vector_from_Vec3f( Vec3f& v );
 PyObject * Vector_from_Vec3r( Vec3r& v );
 
+PyObject * BPy_BBox_from_BBox( BBox< Vec3r > &bb );
 PyObject * BPy_FEdge_from_FEdge( FEdge& fe );
 PyObject * BPy_Id_from_Id( Id& id );
 PyObject * BPy_Interface0D_from_Interface0D( Interface0D& if0D );
 PyObject * BPy_Nature_from_Nature( unsigned short n );
 PyObject * BPy_MediumType_from_MediumType( int n );
+PyObject * BPy_SShape_from_SShape( SShape& ss );
 PyObject * BPy_StrokeAttribute_from_StrokeAttribute( StrokeAttribute& sa );
 PyObject * BPy_StrokeVertex_from_StrokeVertex( StrokeVertex& sv );
 PyObject * BPy_SVertex_from_SVertex( SVertex& sv );
+PyObject * BPy_ViewVertex_from_ViewVertex_ptr( ViewVertex *vv );
+PyObject * BPy_ViewEdge_from_ViewEdge( ViewEdge& ve );
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/source/blender/freestyle/intern/python/BPy_Freestyle.cpp b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
index a6ef92d8f51..0496060d0f3 100644
--- a/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
@@ -1,5 +1,6 @@
 #include "BPy_Freestyle.h"
 
+#include "BPy_BBox.h"
 #include "BPy_BinaryPredicate0D.h"
 #include "BPy_BinaryPredicate1D.h"
 #include "BPy_Id.h"
@@ -10,12 +11,15 @@
 #include "BPy_Interface1D.h"
 #include "BPy_MediumType.h"
 #include "BPy_Nature.h"
+#include "BPy_SShape.h"
 #include "BPy_StrokeAttribute.h"
 #include "BPy_StrokeShader.h"
 #include "BPy_UnaryFunction0D.h"
 #include "BPy_UnaryFunction1D.h"
 #include "BPy_UnaryPredicate0D.h"
 #include "BPy_UnaryPredicate1D.h"
+#include "BPy_ViewShape.h"
+
 
 #ifdef __cplusplus
 extern "C" {
@@ -137,6 +141,7 @@ PyObject *Freestyle_Init( void )
 	MediumType_Init( module );
 	Nature_Init( module );
 	
+	BBox_Init( module );
 	BinaryPredicate0D_Init( module );
 	BinaryPredicate1D_Init( module );
 	Id_Init( module );
@@ -144,12 +149,14 @@ PyObject *Freestyle_Init( void )
 	Interface0D_Init( module );
 	Interface1D_Init( module );
 	Iterator_Init( module );
+	SShape_Init( module );
 	StrokeAttribute_Init( module );
 	StrokeShader_Init( module );
 	UnaryFunction0D_Init( module );
 	UnaryFunction1D_Init( module );
 	UnaryPredicate0D_Init( module );
 	UnaryPredicate1D_Init( module );
+	ViewShape_Init( module );
 	
 	return module;
 }
diff --git a/source/blender/freestyle/intern/python/BPy_Interface1D.cpp b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
index 113fc3f1cf7..ec881b010ee 100644
--- a/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
@@ -3,6 +3,7 @@
 #include "BPy_Convert.h"
 #include "Interface1D/BPy_FEdge.h"
 #include "Interface1D/BPy_Stroke.h"
+#include "Interface1D/BPy_ViewEdge.h"
 #include "BPy_MediumType.h"
 
 #ifdef __cplusplus
@@ -150,6 +151,11 @@ PyMODINIT_FUNC Interface1D_Init( PyObject *module )
 	tmp = BPy_MediumType_from_MediumType( Stroke::HUMID_MEDIUM ); PyDict_SetItemString( Stroke_Type.tp_dict, "HUMID_MEDIUM", tmp); Py_DECREF(tmp);
 	tmp = BPy_MediumType_from_MediumType( Stroke::OPAQUE_MEDIUM ); PyDict_SetItemString( Stroke_Type.tp_dict, "OPAQUE_MEDIUM", tmp); Py_DECREF(tmp);
 
+	if( PyType_Ready( &ViewEdge_Type ) < 0 )
+		return;
+	Py_INCREF( &ViewEdge_Type );
+	PyModule_AddObject(module, "ViewEdge", (PyObject *)&ViewEdge_Type);
+
 	
 }
 
diff --git a/source/blender/freestyle/intern/python/BPy_Material.h b/source/blender/freestyle/intern/python/BPy_Material.h
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/source/blender/freestyle/intern/python/BPy_SShape.cpp b/source/blender/freestyle/intern/python/BPy_SShape.cpp
index a5b1cf3f27a..62c554aab51 100644
--- a/source/blender/freestyle/intern/python/BPy_SShape.cpp
+++ b/source/blender/freestyle/intern/python/BPy_SShape.cpp
@@ -1,120 +1,277 @@
- PyObject *_wrap_SShape_userdata_set(PyObject *self , PyObject *args) {
+#include "BPy_SShape.h"
+
+#include "BPy_Convert.h"
+#include "Interface0D/BPy_SVertex.h"
+#include "Interface1D/BPy_FEdge.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for SShape instance  -----------*/
+static int SShape___init__(BPy_SShape *self, PyObject *args, PyObject *kwds);
+static void SShape___dealloc__(BPy_SShape *self);
+static PyObject * SShape___repr__(BPy_SShape* self);
+
+static PyObject * SShape_AddEdge( BPy_SShape *self , PyObject *args);
+static PyObject * SShape_AddNewVertex( BPy_SShape *self , PyObject *args);
+static PyObject * SShape_setBBox( BPy_SShape *self , PyObject *args);
+static PyObject * SShape_ComputeBBox( BPy_SShape *self );
+static PyObject * SShape_bbox( BPy_SShape *self );
+static PyObject * SShape_getVertexList( BPy_SShape *self );
+static PyObject * SShape_getEdgeList( BPy_SShape *self );
+static PyObject * SShape_getId( BPy_SShape *self );
+static PyObject * SShape_setId( BPy_SShape *self , PyObject *args);
+
+/*----------------------SShape instance definitions ----------------------------*/
+static PyMethodDef BPy_SShape_methods[] = {
+	{"AddEdge", ( PyCFunction ) SShape_AddEdge, METH_VARARGS, "（FEdge fe ）Adds a FEdge to the list of FEdges. "},
+	{"AddNewVertex", ( PyCFunction ) SShape_AddNewVertex, METH_VARARGS, "（SVertex sv ）Adds a SVertex to the list of SVertex of this Shape. The SShape attribute of the SVertex is also set to 'this'."},
+	{"setBBox", ( PyCFunction ) SShape_setBBox, METH_VARARGS, "（BBox bb ）Sets the Bounding Box of the Shape"},
+	{"ComputeBBox", ( PyCFunction ) SShape_ComputeBBox, METH_NOARGS, "（ ）Compute the bbox of the SShape"},
+	{"bbox", ( PyCFunction ) SShape_bbox, METH_NOARGS, "（ ）Returns the bounding box of the shape."},
+	{"getVertexList", ( PyCFunction ) SShape_getVertexList, METH_NOARGS, "（ ）Returns the list of SVertex of the Shape"},
+	{"getEdgeList", ( PyCFunction ) SShape_getEdgeList, METH_NOARGS, "（ ）Returns the list of FEdges of the Shape."},
+	{"getId", ( PyCFunction ) SShape_getId, METH_NOARGS, "（ ）Returns the Id of the Shape. "},
+	{"setId", ( PyCFunction ) SShape_setId, METH_VARARGS, "（Id id ）Sets the Id of the shape. "},
+	
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_SShape type definition ------------------------------*/
+
+PyTypeObject SShape_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"SShape",						/* tp_name */
+	sizeof( BPy_SShape ),			/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	(destructor)SShape___dealloc__,	/* tp_dealloc */
+	NULL,                       /* printfunc tp_print; */
+	NULL,                       /* getattrfunc tp_getattr; */
+	NULL,                       /* setattrfunc tp_setattr; */
+	NULL,						/* tp_compare */
+	(reprfunc)SShape___repr__,				/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_SShape_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	NULL,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)SShape___init__,           /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	PyType_GenericNew,						/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+PyMODINIT_FUNC SShape_Init( PyObject *module )
+{
+	if( module == NULL )
+		return;
+
+	if( PyType_Ready( &SShape_Type ) < 0 )
+		return;
+
+	Py_INCREF( &SShape_Type );
+	PyModule_AddObject(module, "SShape", (PyObject *)&SShape_Type);
+}
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int SShape___init__(BPy_SShape *self, PyObject *args, PyObject *kwds)
+{
+	PyObject *obj;
+
+    if (! PyArg_ParseTuple(args, "|O", &obj) )
+        return -1;
+
+	if( !obj ) {
+		self->ss = new SShape();
+	
+	} else if( BPy_SShape_Check(obj) ) {
+		self->ss = new SShape(*( ((BPy_SShape *) obj)->ss ));
+	}
+	
+    return 0;
+}
+
+void SShape___dealloc__(BPy_SShape *self)
+{
+	delete self->ss;
+    self->ob_type->tp_free((PyObject*)self);
+}
+
+PyObject * SShape___repr__(BPy_SShape *self)
+{
+    return PyString_FromFormat("SShape - address: %p", self->ss );
+}
+
+PyObject * SShape_AddEdge( BPy_SShape *self , PyObject *args) {
+	PyObject *py_fe = 0;
+
+	if(!( PyArg_ParseTuple(args, "O", &py_fe) && BPy_FEdge_Check(py_fe) )) {
+		cout << "ERROR: SShape_AddEdge" << endl;
+		Py_RETURN_NONE;
+	}
+	
+	self->ss->AddEdge( ((BPy_FEdge *) py_fe)->fe );
+
+	Py_RETURN_NONE;
+}
+
+PyObject * SShape_AddNewVertex( BPy_SShape *self , PyObject *args) {
+	PyObject *py_sv = 0;
+
+	if(!( PyArg_ParseTuple(args, "O", &py_sv) && BPy_SVertex_Check(py_sv) )) {
+		cout << "ERROR: SShape_AddNewVertex" << endl;
+		Py_RETURN_NONE;
+	}
+	
+	self->ss->AddNewVertex( ((BPy_SVertex *) py_sv)->sv );
+
+	Py_RETURN_NONE;
+}
+
+PyObject * SShape_setBBox( BPy_SShape *self , PyObject *args) {
+	PyObject *py_bb = 0;
+
+	if(!( PyArg_ParseTuple(args, "O", &py_bb) && BPy_BBox_Check(py_bb) )) {
+		cout << "ERROR: SShape_SetBBox" << endl;
+		Py_RETURN_NONE;
+	}
+	
+	self->ss->setBBox(*( ((BPy_BBox*) py_bb)->bb ));
+
+	Py_RETURN_NONE;
+}
+
+PyObject * SShape_ComputeBBox( BPy_SShape *self ) {
+	self->ss->ComputeBBox();
+
+	Py_RETURN_NONE;
+}
+
+PyObject * SShape_bbox( BPy_SShape *self ) {
+	BBox<Vec3r> bb( self->ss->bbox() );
+	return BPy_BBox_from_BBox( bb );
 }
 
 
- PyObject *_wrap_SShape_userdata_get(PyObject *self , PyObject *args) {
+PyObject * SShape_getVertexList( BPy_SShape *self ) {
+	PyObject *py_vertices = PyList_New(NULL);
+
+	vector< SVertex * > vertices = self->ss->getVertexList();
+	vector< SVertex * >::iterator it;
+	
+	for( it = vertices.begin(); it != vertices.end(); it++ ) {
+		PyList_Append( py_vertices, BPy_SVertex_from_SVertex(*( *it )) );
+	}
+	
+	return py_vertices;
 }
 
 
- PyObject *_wrap_new_SShape__SWIG_0(PyObject *self , PyObject *args) {
+PyObject * SShape_getEdgeList( BPy_SShape *self ) {
+	PyObject *py_edges = PyList_New(NULL);
+
+	vector< FEdge * > edges = self->ss->getEdgeList();
+	vector< FEdge * >::iterator it;
+	
+	for( it = edges.begin(); it != edges.end(); it++ ) {
+		PyList_Append( py_edges, BPy_FEdge_from_FEdge(*( *it )) );
+	}
+	
+	return py_edges;
+}
+
+PyObject * SShape_getId( BPy_SShape *self ) {
+	Id id( self->ss->getId() );
+	return BPy_Id_from_Id( id );
+}
+
+PyObject * SShape_setId( BPy_SShape *self , PyObject *args) {
+	PyObject *py_id;
+
+	if(!( PyArg_ParseTuple(args, "O", &py_id) && BPy_Id_Check(py_id) )) {
+		cout << "ERROR: SShape_setId" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->ss->setId(*( ((BPy_Id *) py_id)->id ));
+
+	Py_RETURN_NONE;
 }
 
 
- PyObject *_wrap_new_SShape__SWIG_1(PyObject *self , PyObject *args) {
+// const Material & 	material (unsigned i) const
+// const vector< Material > & 	materials () const
+// void 	SetMaterials (const vector< Material > &iMaterials)
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_new_SShape(PyObject *self, PyObject *args) {
-}
-
-
- PyObject *_wrap_SShape_dupplicate(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_SShape(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SShape_AddEdge(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SShape_AddNewVertex(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SShape_AddChain(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SShape_CreateSVertex(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SShape_SplitEdge(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SShape_SplitEdgeIn2(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SShape_SetBBox(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SShape_ComputeBBox(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SShape_RemoveEdgeFromChain(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SShape_RemoveEdge(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SShape_GetVertexList(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SShape_GetEdgeList(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SShape_GetChains(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SShape_bbox(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SShape_material(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SShape_materials(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SShape_viewShape(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SShape_importance(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SShape_getId(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SShape_SetId(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SShape_SetMaterials(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SShape_SetViewShape(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_SShape_SetImportance(PyObject *self , PyObject *args) {
-}
-
-
+#endif
\ No newline at end of file
diff --git a/source/blender/freestyle/intern/python/BPy_SShape.h b/source/blender/freestyle/intern/python/BPy_SShape.h
new file mode 100644
index 00000000000..2064b6c4b64
--- /dev/null
+++ b/source/blender/freestyle/intern/python/BPy_SShape.h
@@ -0,0 +1,34 @@
+#ifndef FREESTYLE_PYTHON_SSHAPE_H
+#define FREESTYLE_PYTHON_SSHAPE_H
+
+#include "../view_map/Silhouette.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject SShape_Type;
+
+#define BPy_SShape_Check(v)	(( (PyObject *) v)->ob_type == &SShape_Type)
+
+/*---------------------------Python BPy_SShape structure definition----------*/
+typedef struct {
+	PyObject_HEAD
+	SShape *ss;
+} BPy_SShape;
+
+/*---------------------------Python BPy_SShape visible prototypes-----------*/
+
+PyMODINIT_FUNC SShape_Init( PyObject *module );
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_SSHAPE_H */
diff --git a/source/blender/freestyle/intern/python/BPy_ViewShape.cpp b/source/blender/freestyle/intern/python/BPy_ViewShape.cpp
index 023ce06f44f..3ac2c02a274 100644
--- a/source/blender/freestyle/intern/python/BPy_ViewShape.cpp
+++ b/source/blender/freestyle/intern/python/BPy_ViewShape.cpp
@@ -1,88 +1,291 @@
- PyObject *_wrap_ViewShape_userdata_set(PyObject *self , PyObject *args) {
+#include "BPy_ViewShape.h"
+
+#include "BPy_Convert.h"
+#include "Interface0D/BPy_ViewVertex.h"
+#include "Interface1D/BPy_ViewEdge.h"
+#include "BPy_SShape.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for ViewShape instance  -----------*/
+static int ViewShape___init__(BPy_ViewShape *self, PyObject *args, PyObject *kwds);
+static void ViewShape___dealloc__(BPy_ViewShape *self);
+static PyObject * ViewShape___repr__(BPy_ViewShape* self);
+
+
+/*---------------------- BPy_ViewShape instance definitions ----------------------------*/
+static PyMethodDef BPy_ViewShape_methods[] = {
+	//{"AddEdge", ( PyCFunction ) ViewShape_AddEdge, METH_VARARGS, "（FEdge fe ）Adds a FEdge to the list of FEdges. "},
+
+	
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_ViewShape type definition ------------------------------*/
+
+PyTypeObject ViewShape_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"ViewShape",						/* tp_name */
+	sizeof( BPy_ViewShape ),			/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	(destructor)ViewShape___dealloc__,	/* tp_dealloc */
+	NULL,                       /* printfunc tp_print; */
+	NULL,                       /* getattrfunc tp_getattr; */
+	NULL,                       /* setattrfunc tp_setattr; */
+	NULL,						/* tp_compare */
+	(reprfunc)ViewShape___repr__,				/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_ViewShape_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	NULL,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)ViewShape___init__,           /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	PyType_GenericNew,						/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+PyMODINIT_FUNC ViewShape_Init( PyObject *module )
+{
+	if( module == NULL )
+		return;
+
+	if( PyType_Ready( &ViewShape_Type ) < 0 )
+		return;
+
+	Py_INCREF( &ViewShape_Type );
+	PyModule_AddObject(module, "ViewShape", (PyObject *)&ViewShape_Type);
+}
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int ViewShape___init__(BPy_ViewShape *self, PyObject *args, PyObject *kwds)
+{
+	PyObject *obj;
+
+    if (! PyArg_ParseTuple(args, "|O", &obj) )
+        return -1;
+
+	if( !obj ) {
+		self->vs = new ViewShape();
+	
+	} else if( BPy_ViewShape_Check(obj) ) {
+		self->vs = new ViewShape( ((BPy_SShape *) obj)->ss );
+	
+	} else if( BPy_ViewShape_Check(obj) ) {
+		self->vs = new ViewShape(*( ((BPy_ViewShape *) obj)->vs ));
+	}
+	
+    return 0;
+}
+
+void ViewShape___dealloc__(BPy_ViewShape *self)
+{
+	delete self->vs;
+    self->ob_type->tp_free((PyObject*)self);
+}
+
+PyObject * ViewShape___repr__(BPy_ViewShape *self)
+{
+    return PyString_FromFormat("ViewShape - address: %p", self->vs );
+}
+
+PyObject * ViewShape_sshape( BPy_ViewShape *self ) {
+	SShape ss(*( self->vs->sshape() ));
+	return BPy_SShape_from_SShape( ss );
 }
 
 
- PyObject *_wrap_ViewShape_userdata_get(PyObject *self , PyObject *args) {
+PyObject * ViewShape_vertices( BPy_ViewShape *self ) {
+	PyObject *py_vertices = PyList_New(NULL);
+
+	vector< ViewVertex * > vertices = self->vs->vertices();
+	vector< ViewVertex * >::iterator it;
+	
+	for( it = vertices.begin(); it != vertices.end(); it++ ) {
+		PyList_Append( py_vertices, BPy_ViewVertex_from_ViewVertex_ptr( *it ) );
+	}
+	
+	return py_vertices;
 }
 
 
- PyObject *_wrap_new_ViewShape__SWIG_0(PyObject *self , PyObject *args) {
+PyObject * ViewShape_edges( BPy_ViewShape *self ) {
+	PyObject *py_edges = PyList_New(NULL);
+
+	vector< ViewEdge * > edges = self->vs->edges();
+	vector< ViewEdge * >::iterator it;
+	
+	for( it = edges.begin(); it != edges.end(); it++ ) {
+		PyList_Append( py_edges, BPy_ViewEdge_from_ViewEdge(*( *it )) );
+	}
+	
+	return py_edges;
 }
 
-
- PyObject *_wrap_new_ViewShape__SWIG_1(PyObject *self , PyObject *args) {
+PyObject * ViewShape_getId( BPy_ViewShape *self ) {
+	Id id( self->vs->getId() );
+	return BPy_Id_from_Id( id );
 }
 
+PyObject * ViewShape_setSShape( BPy_ViewShape *self , PyObject *args) {
+	PyObject *py_ss = 0;
 
- PyObject *_wrap_new_ViewShape__SWIG_2(PyObject *self , PyObject *args) {
+	if(!( PyArg_ParseTuple(args, "O", &py_ss) && BPy_SShape_Check(py_ss) )) {
+		cout << "ERROR: ViewShape_SetSShape" << endl;
+		Py_RETURN_NONE;
+	}
+	
+	self->vs->setSShape( ((BPy_SShape *) py_ss)->ss );
+
+	Py_RETURN_NONE;
 }
 
+PyObject * ViewShape_setVertices( BPy_ViewShape *self , PyObject *args) {
+	PyObject *list = 0;
+	PyObject *tmp;
+	
+	if(!( PyArg_ParseTuple(args, "O", &list) && PyList_Check(list) )) {
+		cout << "ERROR: ViewShape_SetVertices" << endl;
+		Py_RETURN_NONE;
+	}
+	
+	vector< ViewVertex *> v;
+	
+	for( int i=0; i < PyList_Size(list); i++ ) {
+		tmp = PyList_GetItem(list, i);
+		if( BPy_ViewVertex_Check(tmp) )
+			v.push_back( ((BPy_ViewVertex *) tmp)->vv );
+		else
+			Py_RETURN_NONE;
+	}
+		
+	self->vs->setVertices( v );
 
- PyObject *_wrap_new_ViewShape(PyObject *self, PyObject *args) {
+	Py_RETURN_NONE;
 }
 
+//void 	SetEdges (const vector< ViewEdge * > &iEdges)
+PyObject * ViewShape_setEdges( BPy_ViewShape *self , PyObject *args) {
+	PyObject *list = 0;
+	PyObject *tmp;
 
- PyObject *_wrap_ViewShape_dupplicate(PyObject *self , PyObject *args) {
+	if(!( PyArg_ParseTuple(args, "O", &list) && PyList_Check(list) )) {
+		cout << "ERROR: ViewShape_SetVertices" << endl;
+		Py_RETURN_NONE;
+	}
+
+	vector<ViewEdge *> v;
+
+	for( int i=0; i < PyList_Size(list); i++ ) {
+		tmp = PyList_GetItem(list, i);
+		if( BPy_ViewEdge_Check(tmp) )
+			v.push_back( ((BPy_ViewEdge *) tmp)->ve );
+		else
+			Py_RETURN_NONE;
+	}
+
+	self->vs->setEdges( v );
+
+	Py_RETURN_NONE;
 }
 
+PyObject * ViewShape_AddEdge( BPy_ViewShape *self , PyObject *args) {
+	PyObject *py_ve = 0;
 
- PyObject *_wrap_delete_ViewShape(PyObject *self , PyObject *args) {
+	if(!( PyArg_ParseTuple(args, "O", &py_ve) && BPy_ViewEdge_Check(py_ve) )) {
+		cout << "ERROR: ViewShape_AddEdge" << endl;
+		Py_RETURN_NONE;
+	}
+	
+	self->vs->AddEdge( ((BPy_ViewEdge *) py_ve)->ve );
+
+	Py_RETURN_NONE;
 }
 
+PyObject * ViewShape_AddVertex( BPy_ViewShape *self , PyObject *args) {
+	PyObject *py_vv = 0;
 
- PyObject *_wrap_ViewShape_SplitEdge(PyObject *self , PyObject *args) {
+	if(!( PyArg_ParseTuple(args, "O", &py_vv) && BPy_ViewVertex_Check(py_vv) )) {
+		cout << "ERROR: ViewShape_AddNewVertex" << endl;
+		Py_RETURN_NONE;
+	}
+	
+	self->vs->AddVertex( ((BPy_ViewVertex *) py_vv)->vv );
+
+	Py_RETURN_NONE;
 }
 
+// virtual ViewShape * 	dupplicate ()
 
- PyObject *_wrap_ViewShape_sshape__SWIG_0(PyObject *self , PyObject *args) {
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_ViewShape_sshape__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewShape_sshape(PyObject *self, PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewShape_vertices(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewShape_edges(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewShape_getId(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewShape_SetSShape(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewShape_SetVertices(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewShape_SetEdges(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewShape_AddVertex(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewShape_AddEdge(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewShape_RemoveEdge(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewShape_RemoveVertex(PyObject *self , PyObject *args) {
-}
-
-
+#endif
\ No newline at end of file
diff --git a/source/blender/freestyle/intern/python/BPy_ViewShape.h b/source/blender/freestyle/intern/python/BPy_ViewShape.h
new file mode 100644
index 00000000000..20490cd71aa
--- /dev/null
+++ b/source/blender/freestyle/intern/python/BPy_ViewShape.h
@@ -0,0 +1,34 @@
+#ifndef FREESTYLE_PYTHON_VIEWSHAPE_H
+#define FREESTYLE_PYTHON_VIEWSHAPE_H
+
+#include "../view_map/ViewMap.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject ViewShape_Type;
+
+#define BPy_ViewShape_Check(v)	(( (PyObject *) v)->ob_type == &ViewShape_Type)
+
+/*---------------------------Python BPy_ViewShape structure definition----------*/
+typedef struct {
+	PyObject_HEAD
+	ViewShape *vs;
+} BPy_ViewShape;
+
+/*---------------------------Python BPy_ViewShape visible prototypes-----------*/
+
+PyMODINIT_FUNC ViewShape_Init( PyObject *module );
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_VIEWSHAPE_H */
diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.h b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.h
index 841040af180..592a46186c2 100644
--- a/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.h
+++ b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.h
@@ -4,7 +4,6 @@
 #include "../../view_map/ViewMap.h"
 #include "../BPy_Interface0D.h"
 
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp
index 1b55b601c89..02d06757fcb 100644
--- a/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp
@@ -1,236 +1,317 @@
- PyObject *_wrap_ViewEdge_getExactTypeName(PyObject *self , PyObject *args) {
+#include "BPy_ViewEdge.h"
+
+#include "../BPy_Convert.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for ViewEdge instance  -----------*/
+static int ViewEdge___init__(BPy_ViewEdge *self, PyObject *args, PyObject *kwds);
+
+static PyObject * ViewEdge_A( BPy_ViewEdge *self );
+static PyObject * ViewEdge_B( BPy_ViewEdge *self );
+
+
+/*----------------------ViewEdge instance definitions ----------------------------*/
+static PyMethodDef BPy_ViewEdge_methods[] = {	
+
+	{"A", ( PyCFunction ) ViewEdge_A, METH_NOARGS, "() Returns the first ViewVertex."},
+	{"B", ( PyCFunction ) ViewEdge_B, METH_NOARGS, "() Returns the second ViewVertex."},
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_ViewEdge type definition ------------------------------*/
+
+PyTypeObject ViewEdge_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"ViewEdge",				/* tp_name */
+	sizeof( BPy_ViewEdge ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_ViewEdge_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&Interface1D_Type,				/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)ViewEdge___init__,                       	/* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+	
+int ViewEdge___init__(BPy_ViewEdge *self, PyObject *args, PyObject *kwds)
+{
+	self->ve = new ViewEdge();
+	self->py_if1D.if1D = self->ve;
+
+	return 0;
 }
 
 
- PyObject *_wrap_ViewEdge_getId(PyObject *self , PyObject *args) {
+PyObject * ViewEdge_A( BPy_ViewEdge *self ) {	
+	// if( self->ve->A() ){
+	// 	return BPy_ViewVertex_from_ViewVertex_ptr( self->ve->A() );
+	// }
+	// 	
+	Py_RETURN_NONE;
 }
 
-
- PyObject *_wrap_ViewEdge_getNature(PyObject *self , PyObject *args) {
+PyObject * ViewEdge_B( BPy_ViewEdge *self ) {	
+	// if( self->ve->B() ){
+	// 	return BPy_ViewVertex_from_ViewVertex_ptr( self->ve->B() );
+	// }
+		
+	Py_RETURN_NONE;
 }
 
+// 
+// PyObject * ViewEdge___getitem__( BPy_ViewEdge *self, PyObject *args ) {
+// 	int i;
+// 
+// 	if(!( PyArg_ParseTuple(args, "i", &i) && (i == 0 || i == 1)  )) {
+// 		cout << "ERROR: ViewEdge___getitem__" << endl;
+// 		Py_RETURN_NONE;
+// 	}
+// 	
+// 	if( SVertex *v = self->ve->operator[](i) )
+// 		return BPy_SVertex_from_SVertex( *v );
+// 
+// 	Py_RETURN_NONE;
+// }
+// 
+// PyObject * ViewEdge_nextEdge( BPy_ViewEdge *self ) {
+// 	if( ViewEdge *fe = self->ve->nextEdge() )
+// 		return BPy_ViewEdge_from_ViewEdge( *fe );
+// 
+// 	Py_RETURN_NONE;
+// }
+// 
+// PyObject * ViewEdge_previousEdge( BPy_ViewEdge *self ) {
+// 	if( ViewEdge *fe = self->ve->previousEdge() )
+// 		return BPy_ViewEdge_from_ViewEdge( *fe );
+// 
+// 	Py_RETURN_NONE;
+// }
+// 
+// PyObject * ViewEdge_isSmooth( BPy_ViewEdge *self ) {
+// 	return PyBool_from_bool( self->ve->isSmooth() );
+// }
+// 	
+// PyObject *ViewEdge_setVertexA( BPy_ViewEdge *self , PyObject *args) {
+// 	PyObject *py_sv;
+// 
+// 	if(!( PyArg_ParseTuple(args, "O", &py_sv) && BPy_SVertex_Check(py_sv) )) {
+// 		cout << "ERROR: ViewEdge_setVertexA" << endl;
+// 		Py_RETURN_NONE;
+// 	}
+// 
+// 	self->ve->setVertexA( ((BPy_SVertex *) py_sv)->sv );
+// 
+// 	Py_RETURN_NONE;
+// }
+// 
+// PyObject *ViewEdge_setVertexB( BPy_ViewEdge *self , PyObject *args) {
+// 	PyObject *py_sv;
+// 
+// 	if(!( PyArg_ParseTuple(args, "O", &py_sv) && BPy_SVertex_Check(py_sv) )) {
+// 		cout << "ERROR: ViewEdge_setVertexB" << endl;
+// 		Py_RETURN_NONE;
+// 	}
+// 
+// 	self->ve->setVertexB( ((BPy_SVertex *) py_sv)->sv );
+// 
+// 	Py_RETURN_NONE;
+// }
+// 
+// PyObject *ViewEdge_setId( BPy_ViewEdge *self , PyObject *args) {
+// 	PyObject *py_id;
+// 
+// 	if(!( PyArg_ParseTuple(args, "O", &py_id) && BPy_Id_Check(py_id) )) {
+// 		cout << "ERROR: ViewEdge_setId" << endl;
+// 		Py_RETURN_NONE;
+// 	}
+// 
+// 	self->ve->setId(*( ((BPy_Id *) py_id)->id ));
+// 
+// 	Py_RETURN_NONE;
+// }
+// 
+// 
+// PyObject *ViewEdge_setNextEdge( BPy_ViewEdge *self , PyObject *args) {
+// 	PyObject *py_fe;
+// 
+// 	if(!( PyArg_ParseTuple(args, "O", &py_fe) && BPy_ViewEdge_Check(py_fe) )) {
+// 		cout << "ERROR: ViewEdge_setNextEdge" << endl;
+// 		Py_RETURN_NONE;
+// 	}
+// 
+// 	self->ve->setNextEdge( ((BPy_ViewEdge *) py_fe)->ve );
+// 
+// 	Py_RETURN_NONE;
+// }
+// 
+// PyObject *ViewEdge_setPreviousEdge( BPy_ViewEdge *self , PyObject *args) {
+// 	PyObject *py_fe;
+// 
+// 	if(!( PyArg_ParseTuple(args, "O", &py_fe) && BPy_ViewEdge_Check(py_fe) )) {
+// 		cout << "ERROR: ViewEdge_setPreviousEdge" << endl;
+// 		Py_RETURN_NONE;
+// 	}
+// 
+// 	self->ve->setPreviousEdge( ((BPy_ViewEdge *) py_fe)->ve );
+// 
+// 	Py_RETURN_NONE;
+// }
+// 
+// PyObject *ViewEdge_setSmooth( BPy_ViewEdge *self , PyObject *args) {
+// 	int b;
+// 
+// 	if(!( PyArg_ParseTuple(args, "i", &b) )) {
+// 		cout << "ERROR: ViewEdge_setSmooth" << endl;
+// 		Py_RETURN_NONE;
+// 	}
+// 
+// 	self->ve->setSmooth( (bool) b );
+// 
+// 	Py_RETURN_NONE;
+// }
+// 
+// PyObject * ViewEdge_setNature( BPy_ViewEdge *self, PyObject *args ) {
+// 	PyObject *py_n;
+// 
+// 	if(!( PyArg_ParseTuple(args, "O", &py_n) && BPy_Nature_Check(py_n) )) {
+// 		cout << "ERROR: ViewEdge_setNature" << endl;
+// 		Py_RETURN_NONE;
+// 	}
+// 	
+// 	PyObject *i = (PyObject *) &( ((BPy_Nature *) py_n)->i );
+// 	((ViewEdge *) self->py_if1D.if1D)->setNature( PyInt_AsLong(i) );
+// 
+// 	Py_RETURN_NONE;
+// }
+// 
+// PyObject *ViewEdge_getVertices( BPy_ViewEdge *self ) {
+// 	PyObject *py_vertices = PyList_New(NULL);
+// 		
+// 	for( Interface0DIterator it = self->ve->verticesBegin(); it != self->ve->verticesEnd(); it++ ) {
+// 		PyList_Append( py_vertices, BPy_Interface0D_from_Interface0D( *it ) );
+// 	}
+// 	
+// 	return py_vertices;
+// }
+// 
+// PyObject *ViewEdge_getPoints( BPy_ViewEdge *self ) {
+// 	PyObject *py_points = PyList_New(NULL);
+// 	
+// 	for( Interface0DIterator it = self->ve->pointsBegin(); it != self->ve->pointsEnd(); it++ ) {
+// 		PyList_Append( py_points, BPy_Interface0D_from_Interface0D( *it ) );
+// 	}
+// 	
+// 	return py_points;
+// }
+// 
+// 
+// 
+// 
+// 
+// FEdge * 	fedgeA ()
+// FEdge * 	fedgeB ()
+// ViewShape * 	viewShape ()
+// ViewShape * 	aShape ()
+// bool 	isClosed ()
+// unsigned 	getChainingTimeStamp ()
+// void 	SetA (ViewVertex *iA)
+// void 	SetB (ViewVertex *iB)
+// void 	SetNature (Nature::EdgeNature iNature)
+// void 	SetFEdgeA (FEdge *iFEdge)
+// void 	SetFEdgeB (FEdge *iFEdge)
+// void 	SetShape (ViewShape *iVShape)
+// void 	SetId (const Id &id)
+// void 	UpdateFEdges ()
+// void 	SetaShape (ViewShape *iShape)
+// void 	SetQI (int qi)
+// void 	setChainingTimeStamp (unsigned ts)
+// real 	getLength2D () const
+// virtual Interface0DIterator 	verticesBegin ()
+// virtual Interface0DIterator 	verticesEnd ()
+// virtual Interface0DIterator 	pointsBegin (float t=0.f)
+// virtual Interface0DIterator 	pointsEnd (float t=0.f)
 
- PyObject *_wrap_ViewEdge_userdata_set(PyObject *self , PyObject *args) {
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_ViewEdge_userdata_get(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_ViewEdge__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_ViewEdge__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_ViewEdge__SWIG_2(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_ViewEdge__SWIG_3(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_ViewEdge(PyObject *self, PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_ViewEdge(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_A(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_B(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_fedgeA(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_fedgeB(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_viewShape(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_aShape__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_isClosed(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_getChainingTimeStamp(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_aShape__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_aShape(PyObject *self, PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_bShape(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_occluders(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_splittingId(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_SetA(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_SetB(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_SetNature(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_SetFEdgeA(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_SetFEdgeB(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_SetShape(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_SetId(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_UpdateFEdges(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_SetaShape(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_SetQI(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_setChainingTimeStamp(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_AddOccluder(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_setSplittingId(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_intersect_2d_area(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_include_in_2d_area(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_getLength2D(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_qi(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_occluders_begin(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_occluders_end(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_occluders_size(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_occluders_empty(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_occludee(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_occluded_shape(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_occludee_empty(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_shape_id(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_shape(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_shape_importance(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_verticesBegin(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_verticesEnd(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_pointsBegin__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_pointsBegin__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_pointsBegin(PyObject *self, PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_pointsEnd__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_pointsEnd__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewEdge_pointsEnd(PyObject *self, PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.h b/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.h
new file mode 100644
index 00000000000..a7e7455b764
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.h
@@ -0,0 +1,32 @@
+#ifndef FREESTYLE_PYTHON_VIEWEDGE_H
+#define FREESTYLE_PYTHON_VIEWEDGE_H
+
+#include "../../view_map/ViewMap.h"
+
+#include "../BPy_Interface1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject ViewEdge_Type;
+
+#define BPy_ViewEdge_Check(v)	(( (PyObject *) v)->ob_type == &ViewEdge_Type)
+
+/*---------------------------Python BPy_ViewEdge structure definition----------*/
+typedef struct {
+	BPy_Interface1D py_if1D;
+	ViewEdge *ve;
+} BPy_ViewEdge;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_VIEWEDGE_H */
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp
index b1b33b347bc..72273e73a65 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp
@@ -1,6 +1,5 @@
 #include "BPy_CurvePointIterator.h"
 
-#include "../BPy_Convert.h"
 #include "BPy_Interface0DIterator.h"
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp
index b2b6d67aa0f..c88ba7773ab 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp
@@ -1,7 +1,5 @@
 #include "BPy_Interface0DIterator.h"
 
-#include "../BPy_Convert.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp
index da8b1453102..be1f946302f 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp
@@ -1,6 +1,5 @@
 #include "BPy_SVertexIterator.h"
 
-#include "../BPy_Convert.h"
 #include "../Interface0D/BPy_SVertex.h"
 #include "../Interface1D/BPy_FEdge.h"
 
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp
index 895aaee2323..72e41a37301 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp
@@ -1,6 +1,5 @@
 #include "BPy_StrokeVertexIterator.h"
 
-#include "../BPy_Convert.h"
 #include "BPy_Interface0DIterator.h"
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp
index 25ae25d52a9..e5de7769fbb 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp
@@ -1,6 +1,7 @@
 #include "BPy_ViewEdgeIterator.h"
 
 #include "../BPy_Convert.h"
+#include "../Interface1D/BPy_ViewEdge.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp
index 9a32f384be9..0622481f412 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp
@@ -1,7 +1,5 @@
 #include "BPy_orientedViewEdgeIterator.h"
 
-#include "../BPy_Convert.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/source/blender/freestyle/intern/stroke/ChainingIterators.h b/source/blender/freestyle/intern/stroke/ChainingIterators.h
index 121f1c8ba54..b01c895d89a 100755
--- a/source/blender/freestyle/intern/stroke/ChainingIterators.h
+++ b/source/blender/freestyle/intern/stroke/ChainingIterators.h
@@ -42,7 +42,7 @@
 // Adjacency iterator used in the chaining process
 //
 ///////////////////////////////////////////////////////////
-class LIB_STROKE_EXPORT AdjacencyIterator : Iterator {
+class LIB_STROKE_EXPORT AdjacencyIterator : public Iterator {
 protected:
   ViewVertexInternal::orientedViewEdgeIterator _internalIterator;
   bool _restrictToSelection;
@@ -73,6 +73,10 @@ public:
   virtual ~AdjacencyIterator(){
   }
   
+  virtual string getExactTypeName() const {
+    return "AdjacencyIterator";
+  }
+
   virtual inline bool isEnd(){
     return _internalIterator.isEnd();
   }
@@ -98,6 +102,10 @@ public:
   }
   virtual void increment();
 
+  virtual void decrement(){
+    cerr << "Warning: method decrement() not implemented" << endl;
+  }
+
 protected:
   bool isValid(ViewEdge* edge);
 };
diff --git a/source/blender/freestyle/intern/stroke/CurveIterators.h b/source/blender/freestyle/intern/stroke/CurveIterators.h
index 92f8bf065f4..2ba77a3c478 100755
--- a/source/blender/freestyle/intern/stroke/CurveIterators.h
+++ b/source/blender/freestyle/intern/stroke/CurveIterators.h
@@ -134,7 +134,7 @@ namespace CurveInternal {
       return new CurvePointIterator(*this);
     }
 
-    inline Interface0DIterator CastToInterface0DIterator() const{
+    inline Interface0DIterator castToInterface0DIterator() const{
       Interface0DIterator ret(new CurveInternal::CurvePointIterator(*this));
       return ret;
     }
@@ -183,7 +183,9 @@ namespace CurveInternal {
         return true;
       return false;
     }
-  protected:
+ 
+// protected:
+
     virtual void increment() 
     {
       if((_currentn == _n-1) && (_t == 1.f))
diff --git a/source/blender/freestyle/intern/stroke/Operators.cpp b/source/blender/freestyle/intern/stroke/Operators.cpp
index cfdd72ac839..fe1ac27b04e 100755
--- a/source/blender/freestyle/intern/stroke/Operators.cpp
+++ b/source/blender/freestyle/intern/stroke/Operators.cpp
@@ -464,14 +464,14 @@ void __recursiveSplit(Chain *_curve, UnaryFunction0D<double>& func, UnaryPredica
   CurveInternal::CurvePointIterator end               = _curve->curvePointsEnd(sampling);
   CurveInternal::CurvePointIterator it                = second;
   CurveInternal::CurvePointIterator split             = second;
-  Interface0DIterator it0d                            = it.CastToInterface0DIterator();
+  Interface0DIterator it0d                            = it.castToInterface0DIterator();
   real _min                                           = FLT_MAX;++it;//func(it0d);++it;
   CurveInternal::CurvePointIterator next              = it;++next;
   real tmp;
   
   bool bsplit = false;
   for(; ((it != end) && (next != end)); ++it,++next){
-    it0d = it.CastToInterface0DIterator();
+    it0d = it.castToInterface0DIterator();
     tmp = func(it0d);
     if(tmp < _min){
       _min = tmp;
@@ -600,7 +600,7 @@ void __recursiveSplit(Chain *_curve, UnaryFunction0D<double>& func, UnaryPredica
   CurveInternal::CurvePointIterator end               = _curve->curvePointsEnd(sampling);
   CurveInternal::CurvePointIterator it                = second;
   CurveInternal::CurvePointIterator split             = second;
-  Interface0DIterator it0d                            = it.CastToInterface0DIterator();
+  Interface0DIterator it0d                            = it.castToInterface0DIterator();
   //real _min                                           = func(it0d);++it;
   real _min                                           = FLT_MAX;++it;
   real mean                                           = 0.f;
@@ -612,7 +612,7 @@ void __recursiveSplit(Chain *_curve, UnaryFunction0D<double>& func, UnaryPredica
   bool bsplit = false;
   for(; ((it != end) && (next != end)); ++it,++next){
     ++count;
-    it0d = it.CastToInterface0DIterator();
+    it0d = it.castToInterface0DIterator();
     if(!pred0d(it0d))
       continue;
     tmp = func(it0d);
diff --git a/source/blender/freestyle/intern/swig/ModuleWrapper.cpp b/source/blender/freestyle/intern/swig/ModuleWrapper.cpp
index 14c3dbb57be..67672d3a2ac 100755
--- a/source/blender/freestyle/intern/swig/ModuleWrapper.cpp
+++ b/source/blender/freestyle/intern/swig/ModuleWrapper.cpp
@@ -37821,7 +37821,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_GetVertexList(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SShape_getVertexList(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SShape *arg1 = (SShape *) 0 ;
   std::vector< SVertex * > *result = 0 ;
@@ -37829,16 +37829,16 @@ SWIGINTERN PyObject *_wrap_SShape_GetVertexList(PyObject *SWIGUNUSEDPARM(self),
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SShape_GetVertexList",&obj0)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"O:SShape_getVertexList",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SShape, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_GetVertexList" "', argument " "1"" of type '" "SShape *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_getVertexList" "', argument " "1"" of type '" "SShape *""'"); 
   }
   arg1 = reinterpret_cast< SShape * >(argp1);
   {
     try {
       {
-        std::vector< SVertex * > &_result_ref = (arg1)->GetVertexList();
+        std::vector< SVertex * > &_result_ref = (arg1)->getVertexList();
         result = (std::vector< SVertex * > *) &_result_ref;
       }
     }
@@ -37856,7 +37856,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_GetEdgeList(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SShape_getEdgeList(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SShape *arg1 = (SShape *) 0 ;
   std::vector< FEdge * > *result = 0 ;
@@ -37864,16 +37864,16 @@ SWIGINTERN PyObject *_wrap_SShape_GetEdgeList(PyObject *SWIGUNUSEDPARM(self), Py
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SShape_GetEdgeList",&obj0)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"O:SShape_getEdgeList",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SShape, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_GetEdgeList" "', argument " "1"" of type '" "SShape *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_getEdgeList" "', argument " "1"" of type '" "SShape *""'"); 
   }
   arg1 = reinterpret_cast< SShape * >(argp1);
   {
     try {
       {
-        std::vector< FEdge * > &_result_ref = (arg1)->GetEdgeList();
+        std::vector< FEdge * > &_result_ref = (arg1)->getEdgeList();
         result = (std::vector< FEdge * > *) &_result_ref;
       }
     }
@@ -37891,7 +37891,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_GetChains(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_SShape_getChains(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   SShape *arg1 = (SShape *) 0 ;
   std::vector< FEdge * > *result = 0 ;
@@ -37899,16 +37899,16 @@ SWIGINTERN PyObject *_wrap_SShape_GetChains(PyObject *SWIGUNUSEDPARM(self), PyOb
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:SShape_GetChains",&obj0)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"O:SShape_getChains",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_SShape, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_GetChains" "', argument " "1"" of type '" "SShape *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SShape_getChains" "', argument " "1"" of type '" "SShape *""'"); 
   }
   arg1 = reinterpret_cast< SShape * >(argp1);
   {
     try {
       {
-        std::vector< FEdge * > &_result_ref = (arg1)->GetChains();
+        std::vector< FEdge * > &_result_ref = (arg1)->getChains();
         result = (std::vector< FEdge * > *) &_result_ref;
       }
     }
@@ -52210,6 +52210,41 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_new_ViewEdge__SWIG_4(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = 0 ;
+  ViewEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:new_ViewEdge",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1, SWIGTYPE_p_ViewEdge,  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_ViewEdge" "', argument " "1"" of type '" "ViewEdge &""'"); 
+  }
+  if (!argp1) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_ViewEdge" "', argument " "1"" of type '" "ViewEdge &""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  {
+    try {
+      result = (ViewEdge *)new ViewEdge(*arg1);
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewEdge, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_new_ViewEdge(PyObject *self, PyObject *args) {
   int argc;
   PyObject *argv[6];
@@ -52223,6 +52258,15 @@ SWIGINTERN PyObject *_wrap_new_ViewEdge(PyObject *self, PyObject *args) {
   if (argc == 0) {
     return _wrap_new_ViewEdge__SWIG_0(self, args);
   }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ViewEdge, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_new_ViewEdge__SWIG_4(self, args);
+    }
+  }
   if (argc == 2) {
     int _v;
     void *vptr = 0;
@@ -52292,7 +52336,40 @@ fail:
     "    ViewEdge()\n"
     "    ViewEdge(ViewVertex *,ViewVertex *)\n"
     "    ViewEdge(ViewVertex *,ViewVertex *,FEdge *)\n"
-    "    ViewEdge(ViewVertex *,ViewVertex *,FEdge *,FEdge *,ViewShape *)\n");
+    "    ViewEdge(ViewVertex *,ViewVertex *,FEdge *,FEdge *,ViewShape *)\n"
+    "    ViewEdge(ViewEdge &)\n");
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_ViewEdge_duplicate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdge *arg1 = (ViewEdge *) 0 ;
+  ViewEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdge_duplicate",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdge, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdge_duplicate" "', argument " "1"" of type '" "ViewEdge *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdge * >(argp1);
+  {
+    try {
+      result = (ViewEdge *)(arg1)->duplicate();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewEdge, 0 |  0 );
+  return resultobj;
+fail:
   return NULL;
 }
 
@@ -59225,6 +59302,38 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_duplicate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
+  ViewEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:ViewEdgeViewEdgeIterator_duplicate",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewEdgeInternal__ViewEdgeIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewEdgeViewEdgeIterator_duplicate" "', argument " "1"" of type '" "ViewEdgeInternal::ViewEdgeIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< ViewEdgeInternal::ViewEdgeIterator * >(argp1);
+  {
+    try {
+      result = (ViewEdge *)(*arg1)->duplicate();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewEdge, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_ViewEdgeViewEdgeIterator_A(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewEdgeInternal::ViewEdgeIterator *arg1 = (ViewEdgeInternal::ViewEdgeIterator *) 0 ;
@@ -75335,6 +75444,38 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  std::string result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:AdjacencyIterator_getExactTypeName",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_getExactTypeName" "', argument " "1"" of type '" "AdjacencyIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  {
+    try {
+      result = ((AdjacencyIterator const *)arg1)->getExactTypeName();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_AdjacencyIterator_isEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
@@ -75526,23 +75667,22 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_AdjacencyIterator_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_decrement(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
-  std::string result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:AdjacencyIterator_getExactTypeName",&obj0)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"O:AdjacencyIterator_decrement",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_getExactTypeName" "', argument " "1"" of type '" "AdjacencyIterator const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_decrement" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
   }
   arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
   {
     try {
-      result = (*arg1)->getExactTypeName();
+      (arg1)->decrement();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -75551,7 +75691,7 @@ SWIGINTERN PyObject *_wrap_AdjacencyIterator_getExactTypeName(PyObject *SWIGUNUS
       cout << "Warning: director exception catched" << endl;
     }
   }
-  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+  resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
   return NULL;
@@ -75673,6 +75813,38 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_AdjacencyIterator_duplicate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
+  ViewEdge *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:AdjacencyIterator_duplicate",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_AdjacencyIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AdjacencyIterator_duplicate" "', argument " "1"" of type '" "AdjacencyIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< AdjacencyIterator * >(argp1);
+  {
+    try {
+      result = (ViewEdge *)(*arg1)->duplicate();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ViewEdge, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_AdjacencyIterator_A(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   AdjacencyIterator *arg1 = (AdjacencyIterator *) 0 ;
@@ -84139,7 +84311,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_CastToInterface0DIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_CurvePointIterator_castToInterface0DIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
   Interface0DIterator result;
@@ -84147,15 +84319,15 @@ SWIGINTERN PyObject *_wrap_CurvePointIterator_CastToInterface0DIterator(PyObject
   int res1 = 0 ;
   PyObject * obj0 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator_CastToInterface0DIterator",&obj0)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator_castToInterface0DIterator",&obj0)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_CastToInterface0DIterator" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_castToInterface0DIterator" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator const *""'"); 
   }
   arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
   {
     try {
-      result = ((CurveInternal::CurvePointIterator const *)arg1)->CastToInterface0DIterator();
+      result = ((CurveInternal::CurvePointIterator const *)arg1)->castToInterface0DIterator();
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -84378,6 +84550,132 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_CurvePointIterator_increment(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator_increment",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_increment" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    try {
+      (arg1)->increment();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_decrement(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator_decrement",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_decrement" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    try {
+      (arg1)->decrement();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_t(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator_t",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_t" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    try {
+      result = (float)((CurveInternal::CurvePointIterator const *)arg1)->t();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_CurvePointIterator_u(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
+  float result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  
+  if (!PyArg_ParseTuple(args,(char *)"O:CurvePointIterator_u",&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_CurveInternal__CurvePointIterator, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CurvePointIterator_u" "', argument " "1"" of type '" "CurveInternal::CurvePointIterator const *""'"); 
+  }
+  arg1 = reinterpret_cast< CurveInternal::CurvePointIterator * >(argp1);
+  {
+    try {
+      result = (float)((CurveInternal::CurvePointIterator const *)arg1)->u();
+    }
+    //    catch (Swig::DirectorTypeMismatch&) {
+    //      cout << "Warning: return type mismatch" << endl;
+    //    }
+    catch (Swig::DirectorException&) {
+      cout << "Warning: director exception catched" << endl;
+    }
+  }
+  resultobj = SWIG_From_float(static_cast< float >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_CurvePointIterator_getX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   CurveInternal::CurvePointIterator *arg1 = (CurveInternal::CurvePointIterator *) 0 ;
@@ -107127,9 +107425,9 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"SShape_ComputeBBox", _wrap_SShape_ComputeBBox, METH_VARARGS, NULL},
 	 { (char *)"SShape_RemoveEdgeFromChain", _wrap_SShape_RemoveEdgeFromChain, METH_VARARGS, NULL},
 	 { (char *)"SShape_RemoveEdge", _wrap_SShape_RemoveEdge, METH_VARARGS, NULL},
-	 { (char *)"SShape_GetVertexList", _wrap_SShape_GetVertexList, METH_VARARGS, NULL},
-	 { (char *)"SShape_GetEdgeList", _wrap_SShape_GetEdgeList, METH_VARARGS, NULL},
-	 { (char *)"SShape_GetChains", _wrap_SShape_GetChains, METH_VARARGS, NULL},
+	 { (char *)"SShape_getVertexList", _wrap_SShape_getVertexList, METH_VARARGS, NULL},
+	 { (char *)"SShape_getEdgeList", _wrap_SShape_getEdgeList, METH_VARARGS, NULL},
+	 { (char *)"SShape_getChains", _wrap_SShape_getChains, METH_VARARGS, NULL},
 	 { (char *)"SShape_bbox", _wrap_SShape_bbox, METH_VARARGS, NULL},
 	 { (char *)"SShape_material", _wrap_SShape_material, METH_VARARGS, NULL},
 	 { (char *)"SShape_materials", _wrap_SShape_materials, METH_VARARGS, NULL},
@@ -107416,6 +107714,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"ViewEdge_userdata_set", _wrap_ViewEdge_userdata_set, METH_VARARGS, NULL},
 	 { (char *)"ViewEdge_userdata_get", _wrap_ViewEdge_userdata_get, METH_VARARGS, NULL},
 	 { (char *)"new_ViewEdge", _wrap_new_ViewEdge, METH_VARARGS, NULL},
+	 { (char *)"ViewEdge_duplicate", _wrap_ViewEdge_duplicate, METH_VARARGS, NULL},
 	 { (char *)"delete_ViewEdge", _wrap_delete_ViewEdge, METH_VARARGS, NULL},
 	 { (char *)"ViewEdge_A", _wrap_ViewEdge_A, METH_VARARGS, NULL},
 	 { (char *)"ViewEdge_B", _wrap_ViewEdge_B, METH_VARARGS, NULL},
@@ -107582,6 +107881,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"ViewEdgeViewEdgeIterator_getNature", _wrap_ViewEdgeViewEdgeIterator_getNature, METH_VARARGS, NULL},
 	 { (char *)"ViewEdgeViewEdgeIterator_userdata_set", _wrap_ViewEdgeViewEdgeIterator_userdata_set, METH_VARARGS, NULL},
 	 { (char *)"ViewEdgeViewEdgeIterator_userdata_get", _wrap_ViewEdgeViewEdgeIterator_userdata_get, METH_VARARGS, NULL},
+	 { (char *)"ViewEdgeViewEdgeIterator_duplicate", _wrap_ViewEdgeViewEdgeIterator_duplicate, METH_VARARGS, NULL},
 	 { (char *)"ViewEdgeViewEdgeIterator_A", _wrap_ViewEdgeViewEdgeIterator_A, METH_VARARGS, NULL},
 	 { (char *)"ViewEdgeViewEdgeIterator_B", _wrap_ViewEdgeViewEdgeIterator_B, METH_VARARGS, NULL},
 	 { (char *)"ViewEdgeViewEdgeIterator_fedgeA", _wrap_ViewEdgeViewEdgeIterator_fedgeA, METH_VARARGS, NULL},
@@ -108010,17 +108310,19 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"GetSelectedFEdgeCF", _wrap_GetSelectedFEdgeCF, METH_VARARGS, NULL},
 	 { (char *)"new_AdjacencyIterator", _wrap_new_AdjacencyIterator, METH_VARARGS, NULL},
 	 { (char *)"delete_AdjacencyIterator", _wrap_delete_AdjacencyIterator, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_getExactTypeName", _wrap_AdjacencyIterator_getExactTypeName, METH_VARARGS, NULL},
 	 { (char *)"AdjacencyIterator_isEnd", _wrap_AdjacencyIterator_isEnd, METH_VARARGS, NULL},
 	 { (char *)"AdjacencyIterator_isBegin", _wrap_AdjacencyIterator_isBegin, METH_VARARGS, NULL},
 	 { (char *)"AdjacencyIterator_isIncoming", _wrap_AdjacencyIterator_isIncoming, METH_VARARGS, NULL},
 	 { (char *)"AdjacencyIterator_getObject", _wrap_AdjacencyIterator_getObject, METH_VARARGS, NULL},
 	 { (char *)"AdjacencyIterator___deref__", _wrap_AdjacencyIterator___deref__, METH_VARARGS, NULL},
 	 { (char *)"AdjacencyIterator_increment", _wrap_AdjacencyIterator_increment, METH_VARARGS, NULL},
-	 { (char *)"AdjacencyIterator_getExactTypeName", _wrap_AdjacencyIterator_getExactTypeName, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_decrement", _wrap_AdjacencyIterator_decrement, METH_VARARGS, NULL},
 	 { (char *)"AdjacencyIterator_getId", _wrap_AdjacencyIterator_getId, METH_VARARGS, NULL},
 	 { (char *)"AdjacencyIterator_getNature", _wrap_AdjacencyIterator_getNature, METH_VARARGS, NULL},
 	 { (char *)"AdjacencyIterator_userdata_set", _wrap_AdjacencyIterator_userdata_set, METH_VARARGS, NULL},
 	 { (char *)"AdjacencyIterator_userdata_get", _wrap_AdjacencyIterator_userdata_get, METH_VARARGS, NULL},
+	 { (char *)"AdjacencyIterator_duplicate", _wrap_AdjacencyIterator_duplicate, METH_VARARGS, NULL},
 	 { (char *)"AdjacencyIterator_A", _wrap_AdjacencyIterator_A, METH_VARARGS, NULL},
 	 { (char *)"AdjacencyIterator_B", _wrap_AdjacencyIterator_B, METH_VARARGS, NULL},
 	 { (char *)"AdjacencyIterator_fedgeA", _wrap_AdjacencyIterator_fedgeA, METH_VARARGS, NULL},
@@ -108217,13 +108519,17 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"new_CurvePointIterator", _wrap_new_CurvePointIterator, METH_VARARGS, NULL},
 	 { (char *)"delete_CurvePointIterator", _wrap_delete_CurvePointIterator, METH_VARARGS, NULL},
 	 { (char *)"CurvePointIterator_copy", _wrap_CurvePointIterator_copy, METH_VARARGS, NULL},
-	 { (char *)"CurvePointIterator_CastToInterface0DIterator", _wrap_CurvePointIterator_CastToInterface0DIterator, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_castToInterface0DIterator", _wrap_CurvePointIterator_castToInterface0DIterator, METH_VARARGS, NULL},
 	 { (char *)"CurvePointIterator_getExactTypeName", _wrap_CurvePointIterator_getExactTypeName, METH_VARARGS, NULL},
 	 { (char *)"CurvePointIterator___eq__", _wrap_CurvePointIterator___eq__, METH_VARARGS, NULL},
 	 { (char *)"CurvePointIterator_getObject", _wrap_CurvePointIterator_getObject, METH_VARARGS, NULL},
 	 { (char *)"CurvePointIterator___deref__", _wrap_CurvePointIterator___deref__, METH_VARARGS, NULL},
 	 { (char *)"CurvePointIterator_isBegin", _wrap_CurvePointIterator_isBegin, METH_VARARGS, NULL},
 	 { (char *)"CurvePointIterator_isEnd", _wrap_CurvePointIterator_isEnd, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_increment", _wrap_CurvePointIterator_increment, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_decrement", _wrap_CurvePointIterator_decrement, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_t", _wrap_CurvePointIterator_t, METH_VARARGS, NULL},
+	 { (char *)"CurvePointIterator_u", _wrap_CurvePointIterator_u, METH_VARARGS, NULL},
 	 { (char *)"CurvePointIterator_getX", _wrap_CurvePointIterator_getX, METH_VARARGS, NULL},
 	 { (char *)"CurvePointIterator_getY", _wrap_CurvePointIterator_getY, METH_VARARGS, NULL},
 	 { (char *)"CurvePointIterator_getZ", _wrap_CurvePointIterator_getZ, METH_VARARGS, NULL},
diff --git a/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp b/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp
index 54a982b8bd8..d7086e4baff 100755
--- a/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp
+++ b/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp
@@ -112,7 +112,7 @@ void FEdgeXDetector::preProcessShape(WXShape* iWShape) {
     preProcessFace((WXFace*)(*f));
   }
 
-  vector<WVertex*>& wvertices = iWShape->GetVertexList();
+  vector<WVertex*>& wvertices = iWShape->getVertexList();
   for(vector<WVertex*>::iterator wv=wvertices.begin(), wvend=wvertices.end(); 
   wv!=wvend;
   ++wv){
@@ -219,7 +219,7 @@ void FEdgeXDetector::processSilhouetteShape(WXShape* iWShape) {
   // the silhouette edges that are not smooth
   // --------------------
   vector<WEdge*>::iterator we, weend;
-  vector<WEdge*> &wedges = iWShape->GetEdgeList();
+  vector<WEdge*> &wedges = iWShape->getEdgeList();
   for(we=wedges.begin(), weend=wedges.end();
   we!=weend;
   ++we)
@@ -298,7 +298,7 @@ void FEdgeXDetector::processBorderShape(WXShape* iWShape) {
   // the BORDER
   // --------------------
   vector<WEdge*>::iterator we, weend;
-  vector<WEdge*> &wedges = iWShape->GetEdgeList();
+  vector<WEdge*> &wedges = iWShape->getEdgeList();
   for(we=wedges.begin(), weend=wedges.end();
   we!=weend;
   ++we){
@@ -328,7 +328,7 @@ void FEdgeXDetector::processCreaseShape(WXShape* iWShape) {
   // the CREASE 
   // --------------------
   vector<WEdge*>::iterator we, weend;
-  vector<WEdge*> &wedges = iWShape->GetEdgeList();
+  vector<WEdge*> &wedges = iWShape->getEdgeList();
   for(we=wedges.begin(), weend=wedges.end();
   we!=weend;
   ++we){
diff --git a/source/blender/freestyle/intern/view_map/Interface0D.h b/source/blender/freestyle/intern/view_map/Interface0D.h
index 40027e13d80..eaa6d31829b 100755
--- a/source/blender/freestyle/intern/view_map/Interface0D.h
+++ b/source/blender/freestyle/intern/view_map/Interface0D.h
@@ -163,7 +163,7 @@ public:
 //
 //////////////////////////////////////////////////
 
-class Interface0DIteratorNested : Iterator
+class Interface0DIteratorNested : public Iterator
 {
 public:
 
@@ -215,7 +215,7 @@ public:
  *  where \a it1 and \a it2 are 2 Interface0DIterator.
  *  Otherwise, incrementing \a it1 will also increment \a it2.
  */
-class Interface0DIterator
+class Interface0DIterator : public Iterator
 {
 public:
 
@@ -248,7 +248,7 @@ public:
   }
 
   /*! Returns the string "Interface0DIterator". */
-  string getExactTypeName() const {
+  virtual string getExactTypeName() const {
     if (!_iterator)
       return "Interface0DIterator";
     return _iterator->getExactTypeName() + "Proxy";
@@ -306,12 +306,12 @@ public:
   }
 
   /*! Increments. */
-  void increment() {
+  virtual void increment() {
     _iterator->increment();
   }
   
   /*! Decrements. */
-  void decrement() {
+  virtual void decrement() {
     _iterator->decrement();
   }
 
@@ -319,14 +319,14 @@ public:
    * first of the 1D element containing the points over
    * which we're iterating.
    */
-  bool isBegin() const {
+  virtual bool isBegin() const {
     return _iterator->isBegin();
   }
 
   /*! Returns true if the pointed Interface0D is after the
    * after the last point of the 1D element we're iterating from.
    */
-  bool isEnd() const {
+  virtual bool isEnd() const {
     return _iterator->isEnd();
   }
 
diff --git a/source/blender/freestyle/intern/view_map/Silhouette.h b/source/blender/freestyle/intern/view_map/Silhouette.h
index c88a3da8967..14d934c6791 100755
--- a/source/blender/freestyle/intern/view_map/Silhouette.h
+++ b/source/blender/freestyle/intern/view_map/Silhouette.h
@@ -963,7 +963,7 @@ public:
     // vertices
     //---------
     vector<SVertex*>::iterator sv,svend;
-    vector<SVertex*>& verticesList = iBrother.GetVertexList();
+    vector<SVertex*>& verticesList = iBrother.getVertexList();
     for(sv=verticesList.begin(), svend=verticesList.end();
         sv!=svend;
         sv++)
@@ -977,7 +977,7 @@ public:
     // edges
     //------
     vector<FEdge*>::iterator e,eend;
-    vector<FEdge*>& edgesList = iBrother.GetEdgeList();
+    vector<FEdge*>& edgesList = iBrother.getEdgeList();
     for(e=edgesList.begin(),eend=edgesList.end();
         e!=eend;
         e++)
@@ -990,7 +990,7 @@ public:
         // starting chain edges
         //-------------------------
         vector<FEdge*>::iterator fe,fend;
-        vector<FEdge*>& fedges = iBrother.GetChains();
+        vector<FEdge*>& fedges = iBrother.getChains();
         for(fe=fedges.begin(),fend=fedges.end();
         fe!=fend;
         fe++)
@@ -1392,10 +1392,10 @@ public:
 
   /* accessors */
   /*! Returns the list of SVertex of the Shape. */
-  inline vector<SVertex*>& GetVertexList() {return _verticesList;} // Get vertices list
+  inline vector<SVertex*>& getVertexList() {return _verticesList;} // Get vertices list
   /*! Returns the list of FEdges of the Shape. */
-  inline vector<FEdge*>& GetEdgeList() {return _edgesList;} // Get edges list
-  inline vector<FEdge*>& GetChains() {return _chains;}
+  inline vector<FEdge*>& getEdgeList() {return _edgesList;} // Get edges list
+  inline vector<FEdge*>& getChains() {return _chains;}
   /*! Returns the bounding box of the shape. */
   inline const BBox<Vec3r>& bbox() {return _BBox;}
   /*! Returns the ith material of the shape. */
diff --git a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp
index 3feeb6664df..42c39d5795e 100755
--- a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp
@@ -87,7 +87,7 @@ void ViewEdgeXBuilder::BuildViewEdges( WXShape *iWShape, ViewShape *oVShape,
   //iWShape->ResetUserData();
   
   WXEdge * wxe;
-  vector<WEdge*>& wedges = iWShape->GetEdgeList();
+  vector<WEdge*>& wedges = iWShape->getEdgeList();
   // 
   //------------------------------
   for(vector<WEdge*>::iterator we=wedges.begin(),weend=wedges.end();
@@ -111,8 +111,8 @@ void ViewEdgeXBuilder::BuildViewEdges( WXShape *iWShape, ViewShape *oVShape,
  
   // Add all these new edges to the scene's feature edges list:
   //-----------------------------------------------------------
-  vector<FEdge*>& newedges = _pCurrentSShape->GetEdgeList();
-  vector<SVertex*>& newVertices = _pCurrentSShape->GetVertexList();
+  vector<FEdge*>& newedges = _pCurrentSShape->getEdgeList();
+  vector<SVertex*>& newVertices = _pCurrentSShape->getVertexList();
   vector<ViewVertex*>& newVVertices = _pCurrentVShape->vertices();
   vector<ViewEdge*>& newVEdges = _pCurrentVShape->edges();
 
diff --git a/source/blender/freestyle/intern/view_map/ViewMap.h b/source/blender/freestyle/intern/view_map/ViewMap.h
index 2691da20057..2ddeb198fff 100755
--- a/source/blender/freestyle/intern/view_map/ViewMap.h
+++ b/source/blender/freestyle/intern/view_map/ViewMap.h
@@ -862,7 +862,9 @@ public:
     _splittingId = 0;
     UpdateFEdges(); // tells every FEdge between iFEdgeA and iFEdgeB that this is theit ViewEdge
   }
-protected:
+
+//soc protected:
+
   /*! Copy constructor. */
   inline ViewEdge(ViewEdge& iBrother)
   {
diff --git a/source/blender/freestyle/intern/view_map/ViewMapIO.cpp b/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
index 370f44dffcf..3591c67ce1f 100755
--- a/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
@@ -628,24 +628,24 @@ namespace ViewMapIO {
         save(out, vs->sshape()->material(i));
 
       // -> VerticesList (List)
-      tmp = vs->sshape()->GetVertexList().size();
+      tmp = vs->sshape()->getVertexList().size();
       WRITE(tmp);
-      for (vector<SVertex*>::const_iterator i1 = vs->sshape()->GetVertexList().begin();
-	   i1 != vs->sshape()->GetVertexList().end(); i1++)
+      for (vector<SVertex*>::const_iterator i1 = vs->sshape()->getVertexList().begin();
+	   i1 != vs->sshape()->getVertexList().end(); i1++)
 	WRITE_IF_NON_NULL(*i1);
 
       // -> Chains (List)
-      tmp = vs->sshape()->GetChains().size();
+      tmp = vs->sshape()->getChains().size();
       WRITE(tmp);
-      for (vector<FEdge*>::const_iterator i2 = vs->sshape()->GetChains().begin();
-	   i2 != vs->sshape()->GetChains().end(); i2++)
+      for (vector<FEdge*>::const_iterator i2 = vs->sshape()->getChains().begin();
+	   i2 != vs->sshape()->getChains().end(); i2++)
 	WRITE_IF_NON_NULL(*i2);
 
       // -> EdgesList (List)
-      tmp = vs->sshape()->GetEdgeList().size();
+      tmp = vs->sshape()->getEdgeList().size();
       WRITE(tmp);
-      for (vector<FEdge*>::const_iterator i3 = vs->sshape()->GetEdgeList().begin();
-	   i3 != vs->sshape()->GetEdgeList().end(); i3++)
+      for (vector<FEdge*>::const_iterator i3 = vs->sshape()->getEdgeList().begin();
+	   i3 != vs->sshape()->getEdgeList().end(); i3++)
 	WRITE_IF_NON_NULL(*i3);
 
       // ViewEdges (List)
diff --git a/source/blender/freestyle/intern/view_map/ViewMapIterators.h b/source/blender/freestyle/intern/view_map/ViewMapIterators.h
index 25da503af66..fa6fb8e1641 100755
--- a/source/blender/freestyle/intern/view_map/ViewMapIterators.h
+++ b/source/blender/freestyle/intern/view_map/ViewMapIterators.h
@@ -59,7 +59,7 @@ namespace ViewVertexInternal{
    *  An instance of an orientedViewEdgeIterator can only
    *  be obtained from a ViewVertex by calling edgesBegin() or edgesEnd().
    */
-  class orientedViewEdgeIterator : Iterator
+  class orientedViewEdgeIterator : public Iterator
   {
   public:
     friend class ViewVertex;
@@ -387,7 +387,7 @@ namespace ViewEdgeInternal {
    *  ::Caution::: the dereferencing operator returns a *pointer* to
    *  the pointed ViewEdge.
    */
-class ViewEdgeIterator : Iterator
+class ViewEdgeIterator : public Iterator
 {
 public:
 
diff --git a/source/blender/freestyle/intern/winged_edge/Curvature.cpp b/source/blender/freestyle/intern/winged_edge/Curvature.cpp
index a890fb92c04..42edef0cb6c 100755
--- a/source/blender/freestyle/intern/winged_edge/Curvature.cpp
+++ b/source/blender/freestyle/intern/winged_edge/Curvature.cpp
@@ -42,7 +42,7 @@ static bool triangle_obtuse (WVertex*, WFace * f)
   bool b=false;
   for (int i=0; i<3; i++)
     b = b ||
-      ((f->GetEdgeList()[i]->getVec3r() * f->GetEdgeList()[(i+1)%3]->getVec3r()) < 0);
+      ((f->getEdgeList()[i]->getVec3r() * f->getEdgeList()[(i+1)%3]->getVec3r()) < 0);
   return b;
 }
 
diff --git a/source/blender/freestyle/intern/winged_edge/WEdge.cpp b/source/blender/freestyle/intern/winged_edge/WEdge.cpp
index 0d02e0ca131..b480b67b3d8 100755
--- a/source/blender/freestyle/intern/winged_edge/WEdge.cpp
+++ b/source/blender/freestyle/intern/winged_edge/WEdge.cpp
@@ -249,7 +249,7 @@ WEdge * WEdge::duplicate()
 
 WFace::WFace(WFace& iBrother)
 {
-  _OEdgeList = iBrother.GetEdgeList();
+  _OEdgeList = iBrother.getEdgeList();
   _Normal = iBrother.GetNormal();
   _VerticesNormals = iBrother._VerticesNormals;
   _VerticesTexCoords = iBrother._VerticesTexCoords;
@@ -478,7 +478,7 @@ WShape::WShape(WShape& iBrother)
   _Materials = iBrother._Materials;
   _meanEdgeSize = iBrother._meanEdgeSize;
   iBrother.bbox(_min, _max);
-  vector<WVertex*>& vertexList = iBrother.GetVertexList();
+  vector<WVertex*>& vertexList = iBrother.getVertexList();
   vector<WVertex*>::iterator v=vertexList.begin(), vend=vertexList.end();
   for(;
   v!=vend;
@@ -491,7 +491,7 @@ WShape::WShape(WShape& iBrother)
     AddVertex(newVertex);
   }
 
-  vector<WEdge*>& edgeList = iBrother.GetEdgeList();
+  vector<WEdge*>& edgeList = iBrother.getEdgeList();
   vector<WEdge*>::iterator e=edgeList.begin(), eend=edgeList.end();
   for(;
   e!=eend;
@@ -564,7 +564,7 @@ WShape::WShape(WShape& iBrother)
   f++)
   {
     unsigned i;
-    const vector<WOEdge*>& oedgeList = (*f)->GetEdgeList();
+    const vector<WOEdge*>& oedgeList = (*f)->getEdgeList();
     vector<WOEdge*> newoedgelist;
 
     unsigned n = oedgeList.size();
@@ -581,8 +581,8 @@ WShape::WShape(WShape& iBrother)
 
   // Free all memory (arghh!)
   // Vertex
-  vend = iBrother.GetVertexList().end();
-  for(v=iBrother.GetVertexList().begin();
+  vend = iBrother.getVertexList().end();
+  for(v=iBrother.getVertexList().begin();
   v!=vend;
   v++)
   {
@@ -591,8 +591,8 @@ WShape::WShape(WShape& iBrother)
   }
 
   // Edges and OEdges:
-  eend = iBrother.GetEdgeList().end();
-  for(e=iBrother.GetEdgeList().begin();
+  eend = iBrother.getEdgeList().end();
+  for(e=iBrother.getEdgeList().begin();
   e!=eend;
   e++)
   {
diff --git a/source/blender/freestyle/intern/winged_edge/WEdge.h b/source/blender/freestyle/intern/winged_edge/WEdge.h
index 99dc83faf96..ea6c793bdfe 100755
--- a/source/blender/freestyle/intern/winged_edge/WEdge.h
+++ b/source/blender/freestyle/intern/winged_edge/WEdge.h
@@ -506,7 +506,7 @@ public:
   virtual ~WFace() {}
 
   /*! accessors */
-  inline const vector<WOEdge*>& GetEdgeList() {return _OEdgeList;}
+  inline const vector<WOEdge*>& getEdgeList() {return _OEdgeList;}
   inline WOEdge * GetOEdge(int i) {return _OEdgeList[i];}
   inline Vec3r& GetNormal() {return _Normal;}
   inline int    GetId()     {return _Id;}
@@ -744,8 +744,8 @@ public:
   }
 
   /*! accessors */
-  inline vector<WEdge *>& GetEdgeList() {return _EdgeList;}
-  inline vector<WVertex*>& GetVertexList() {return _VertexList;}
+  inline vector<WEdge *>& getEdgeList() {return _EdgeList;}
+  inline vector<WVertex*>& getVertexList() {return _VertexList;}
   inline vector<WFace*>& GetFaceList() {return _FaceList;}
   inline unsigned GetId() {return _Id;}
   inline void bbox(Vec3r& min, Vec3r& max) {min=_min; max=_max;}
diff --git a/source/blender/freestyle/intern/winged_edge/WXEdge.h b/source/blender/freestyle/intern/winged_edge/WXEdge.h
index 0518e70d90b..9ec8fd4bddb 100755
--- a/source/blender/freestyle/intern/winged_edge/WXEdge.h
+++ b/source/blender/freestyle/intern/winged_edge/WXEdge.h
@@ -527,7 +527,7 @@ public:
    */
   virtual void Reset(){
     // Reset Edges
-    vector<WEdge*>& wedges = GetEdgeList();
+    vector<WEdge*>& wedges = getEdgeList();
     for(vector<WEdge*>::iterator we=wedges.begin(),weend=wedges.end();
     we!=weend;
     we++){
diff --git a/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp
index c95231a72dc..cccf876db8b 100755
--- a/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp
+++ b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp
@@ -175,7 +175,7 @@ void WingedEdgeBuilder::buildWShape(WShape& shape, IndexedFaceSet& ifs) {
 
   // Parse the built winged-edge shape to update post-flags
   set<Vec3r> normalsSet;
-  vector<WVertex*>& wvertices = shape.GetVertexList();
+  vector<WVertex*>& wvertices = shape.getVertexList();
   for(vector<WVertex*>::iterator wv=wvertices.begin(), wvend=wvertices.end();
   wv!=wvend;
   ++wv){
@@ -238,9 +238,9 @@ void WingedEdgeBuilder::buildTriangleStrip( const real *vertices,
     //Then rebuild it:
     if(0 == nTriangle%2) // if nTriangle is even
     {
-      triangleVertices.push_back(currentShape->GetVertexList()[vindices[nTriangle]/3]);
-      triangleVertices.push_back(currentShape->GetVertexList()[vindices[nTriangle+1]/3]);
-      triangleVertices.push_back(currentShape->GetVertexList()[vindices[nTriangle+2]/3]);
+      triangleVertices.push_back(currentShape->getVertexList()[vindices[nTriangle]/3]);
+      triangleVertices.push_back(currentShape->getVertexList()[vindices[nTriangle+1]/3]);
+      triangleVertices.push_back(currentShape->getVertexList()[vindices[nTriangle+2]/3]);
 
       triangleNormals.push_back(Vec3r(normals[nindices[nTriangle]],normals[nindices[nTriangle]+1], normals[nindices[nTriangle]+2]));
       triangleNormals.push_back(Vec3r(normals[nindices[nTriangle+1]],normals[nindices[nTriangle+1]+1],normals[nindices[nTriangle+1]+2]));
@@ -254,9 +254,9 @@ void WingedEdgeBuilder::buildTriangleStrip( const real *vertices,
     }
     else                 // if nTriangle is odd
     {
-      triangleVertices.push_back(currentShape->GetVertexList()[vindices[nTriangle]/3]);
-      triangleVertices.push_back(currentShape->GetVertexList()[vindices[nTriangle+2]/3]);
-      triangleVertices.push_back(currentShape->GetVertexList()[vindices[nTriangle+1]/3]);
+      triangleVertices.push_back(currentShape->getVertexList()[vindices[nTriangle]/3]);
+      triangleVertices.push_back(currentShape->getVertexList()[vindices[nTriangle+2]/3]);
+      triangleVertices.push_back(currentShape->getVertexList()[vindices[nTriangle+1]/3]);
 
       triangleNormals.push_back(Vec3r(normals[nindices[nTriangle]],normals[nindices[nTriangle]+1], normals[nindices[nTriangle]+2]));
       triangleNormals.push_back(Vec3r(normals[nindices[nTriangle+2]],normals[nindices[nTriangle+2]+1],normals[nindices[nTriangle+2]+2]));
@@ -306,9 +306,9 @@ void WingedEdgeBuilder::buildTriangles(const real *vertices,
   // Each triplet of vertices is considered as an independent triangle
   for(unsigned i = 0; i < nvertices / 3; i++)
   {
-    triangleVertices.push_back(currentShape->GetVertexList()[vindices[3*i]/3]);
-    triangleVertices.push_back(currentShape->GetVertexList()[vindices[3*i+1]/3]);
-    triangleVertices.push_back(currentShape->GetVertexList()[vindices[3*i+2]/3]);
+    triangleVertices.push_back(currentShape->getVertexList()[vindices[3*i]/3]);
+    triangleVertices.push_back(currentShape->getVertexList()[vindices[3*i+1]/3]);
+    triangleVertices.push_back(currentShape->getVertexList()[vindices[3*i+2]/3]);
 
     triangleNormals.push_back(Vec3r(normals[nindices[3*i]],normals[nindices[3*i]+1], normals[nindices[3*i]+2]));
     triangleNormals.push_back(Vec3r(normals[nindices[3*i+1]],normals[nindices[3*i+1]+1],normals[nindices[3*i+1]+2]));
diff --git a/source/blender/freestyle/python/Freestyle.py b/source/blender/freestyle/python/Freestyle.py
index 156eac8d26e..079eb01eb31 100755
--- a/source/blender/freestyle/python/Freestyle.py
+++ b/source/blender/freestyle/python/Freestyle.py
@@ -1142,9 +1142,9 @@ class SShape(_object):
     def ComputeBBox(*args): return _Freestyle.SShape_ComputeBBox(*args)
     def RemoveEdgeFromChain(*args): return _Freestyle.SShape_RemoveEdgeFromChain(*args)
     def RemoveEdge(*args): return _Freestyle.SShape_RemoveEdge(*args)
-    def GetVertexList(*args): return _Freestyle.SShape_GetVertexList(*args)
-    def GetEdgeList(*args): return _Freestyle.SShape_GetEdgeList(*args)
-    def GetChains(*args): return _Freestyle.SShape_GetChains(*args)
+    def getVertexList(*args): return _Freestyle.SShape_getVertexList(*args)
+    def getEdgeList(*args): return _Freestyle.SShape_getEdgeList(*args)
+    def getChains(*args): return _Freestyle.SShape_getChains(*args)
     def bbox(*args): return _Freestyle.SShape_bbox(*args)
     def material(*args): return _Freestyle.SShape_material(*args)
     def materials(*args): return _Freestyle.SShape_materials(*args)
@@ -1566,6 +1566,7 @@ class ViewEdge(Interface1D):
         this = _Freestyle.new_ViewEdge(*args)
         try: self.this.append(this)
         except: self.this = this
+    def duplicate(*args): return _Freestyle.ViewEdge_duplicate(*args)
     __swig_destroy__ = _Freestyle.delete_ViewEdge
     __del__ = lambda self : None;
     def A(*args): return _Freestyle.ViewEdge_A(*args)
@@ -1790,6 +1791,7 @@ class ViewEdgeViewEdgeIterator(_object):
     __swig_setmethods__["userdata"] = _Freestyle.ViewEdgeViewEdgeIterator_userdata_set
     __swig_getmethods__["userdata"] = _Freestyle.ViewEdgeViewEdgeIterator_userdata_get
     if _newclass:userdata = _swig_property(_Freestyle.ViewEdgeViewEdgeIterator_userdata_get, _Freestyle.ViewEdgeViewEdgeIterator_userdata_set)
+    def duplicate(*args): return _Freestyle.ViewEdgeViewEdgeIterator_duplicate(*args)
     def A(*args): return _Freestyle.ViewEdgeViewEdgeIterator_A(*args)
     def B(*args): return _Freestyle.ViewEdgeViewEdgeIterator_B(*args)
     def fedgeA(*args): return _Freestyle.ViewEdgeViewEdgeIterator_fedgeA(*args)
@@ -3247,18 +3249,20 @@ class AdjacencyIterator(_object):
         except: self.this = this
     __swig_destroy__ = _Freestyle.delete_AdjacencyIterator
     __del__ = lambda self : None;
+    def getExactTypeName(*args): return _Freestyle.AdjacencyIterator_getExactTypeName(*args)
     def isEnd(*args): return _Freestyle.AdjacencyIterator_isEnd(*args)
     def isBegin(*args): return _Freestyle.AdjacencyIterator_isBegin(*args)
     def isIncoming(*args): return _Freestyle.AdjacencyIterator_isIncoming(*args)
     def getObject(*args): return _Freestyle.AdjacencyIterator_getObject(*args)
     def __deref__(*args): return _Freestyle.AdjacencyIterator___deref__(*args)
     def increment(*args): return _Freestyle.AdjacencyIterator_increment(*args)
-    def getExactTypeName(*args): return _Freestyle.AdjacencyIterator_getExactTypeName(*args)
+    def decrement(*args): return _Freestyle.AdjacencyIterator_decrement(*args)
     def getId(*args): return _Freestyle.AdjacencyIterator_getId(*args)
     def getNature(*args): return _Freestyle.AdjacencyIterator_getNature(*args)
     __swig_setmethods__["userdata"] = _Freestyle.AdjacencyIterator_userdata_set
     __swig_getmethods__["userdata"] = _Freestyle.AdjacencyIterator_userdata_get
     if _newclass:userdata = _swig_property(_Freestyle.AdjacencyIterator_userdata_get, _Freestyle.AdjacencyIterator_userdata_set)
+    def duplicate(*args): return _Freestyle.AdjacencyIterator_duplicate(*args)
     def A(*args): return _Freestyle.AdjacencyIterator_A(*args)
     def B(*args): return _Freestyle.AdjacencyIterator_B(*args)
     def fedgeA(*args): return _Freestyle.AdjacencyIterator_fedgeA(*args)
@@ -3837,13 +3841,17 @@ class CurvePointIterator(Interface0DIteratorNested):
     __swig_destroy__ = _Freestyle.delete_CurvePointIterator
     __del__ = lambda self : None;
     def copy(*args): return _Freestyle.CurvePointIterator_copy(*args)
-    def CastToInterface0DIterator(*args): return _Freestyle.CurvePointIterator_CastToInterface0DIterator(*args)
+    def castToInterface0DIterator(*args): return _Freestyle.CurvePointIterator_castToInterface0DIterator(*args)
     def getExactTypeName(*args): return _Freestyle.CurvePointIterator_getExactTypeName(*args)
     def __eq__(*args): return _Freestyle.CurvePointIterator___eq__(*args)
     def getObject(*args): return _Freestyle.CurvePointIterator_getObject(*args)
     def __deref__(*args): return _Freestyle.CurvePointIterator___deref__(*args)
     def isBegin(*args): return _Freestyle.CurvePointIterator_isBegin(*args)
     def isEnd(*args): return _Freestyle.CurvePointIterator_isEnd(*args)
+    def increment(*args): return _Freestyle.CurvePointIterator_increment(*args)
+    def decrement(*args): return _Freestyle.CurvePointIterator_decrement(*args)
+    def t(*args): return _Freestyle.CurvePointIterator_t(*args)
+    def u(*args): return _Freestyle.CurvePointIterator_u(*args)
     def getX(*args): return _Freestyle.CurvePointIterator_getX(*args)
     def getY(*args): return _Freestyle.CurvePointIterator_getY(*args)
     def getZ(*args): return _Freestyle.CurvePointIterator_getZ(*args)

From 059b0651de98ca3ea4be28dc857643a406e66930 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Thu, 24 Jul 2008 14:11:36 +0000
Subject: [PATCH 130/252] Propagate control bones repositioning (can deal with
 chains of control bones)

Retargetting IK/FK switcher setups should work ok now (worked on a setup I did, need to test with more)
---
 source/blender/src/autoarmature.c | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/source/blender/src/autoarmature.c b/source/blender/src/autoarmature.c
index cbbe0ffbb15..edda00dd84b 100644
--- a/source/blender/src/autoarmature.c
+++ b/source/blender/src/autoarmature.c
@@ -139,11 +139,14 @@ typedef struct RigEdge {
 	EditBone *bone;
 } RigEdge;
 
+#define RIG_CTRL_DONE	1
+
 typedef struct RigControl {
 	struct RigControl *next, *prev;
 	EditBone *bone;
 	EditBone *parent;
-	float offset[3];
+	float	offset[3];
+	int		flag;
 } RigControl;
 
 /*******************************************************************************************************/
@@ -622,11 +625,13 @@ static RigGraph *armatureToGraph(Object *ob, ListBase *list)
 
 /************************************ RETARGETTING *****************************************************/
 
-static void repositionControl(RigControl *ctrl, float parent[3], float qrot[4], float resize)
+static void repositionControl(RigGraph *rigg, RigControl *ctrl, float parent[3], float qrot[4], float resize)
 {
+	RigControl *ctrl_child;
 	float parent_offset[3], tail_offset[3];
 	
 	VecSubf(tail_offset, ctrl->bone->tail, ctrl->bone->head);
+	VecMulf(tail_offset, resize);
 	
 	VECCOPY(parent_offset, ctrl->offset);
 	VecMulf(parent_offset, resize);
@@ -636,6 +641,18 @@ static void repositionControl(RigControl *ctrl, float parent[3], float qrot[4],
 	
 	VecAddf(ctrl->bone->head, parent, parent_offset); 
 	VecAddf(ctrl->bone->tail, ctrl->bone->head, tail_offset);
+	
+	ctrl->flag |= RIG_CTRL_DONE;
+
+	/* Cascade to connected control bones */
+	for (ctrl_child = rigg->controls.first; ctrl_child; ctrl_child = ctrl_child->next)
+	{
+		if (ctrl_child->parent == ctrl->bone)
+		{
+			repositionControl(rigg, ctrl_child, ctrl->bone->tail, qrot, resize);
+		}
+	}
+
 }
 
 static void repositionBone(RigGraph *rigg, EditBone *bone, float vec0[3], float vec1[3])
@@ -665,7 +682,7 @@ static void repositionBone(RigGraph *rigg, EditBone *bone, float vec0[3], float
 				RotationBetweenVectorsToQuat(qrot, v1, v2);
 			}
 			
-			repositionControl(ctrl, vec1, qrot, resize);
+			repositionControl(rigg, ctrl, vec1, qrot, resize);
 		}
 	}
 	

From d1bdd587970cf80fb6bd9b9e916e7945b6a304b8 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Thu, 24 Jul 2008 19:12:30 +0000
Subject: [PATCH 131/252] Axial symmetry stability bug fix.

Axial symmetry tagging was depending on the order of the nodes, so it might tag left side as right and vice versa depending on the order. Stability test ensures the tagging is order independant (what it tags as right and left might not be the real right and left, but at least they are consistant between mesh graph and armature graph, so it doesn't flip limbs)
---
 source/blender/blenlib/intern/graph.c | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/source/blender/blenlib/intern/graph.c b/source/blender/blenlib/intern/graph.c
index 32d9f3b91b7..abdf2969e49 100644
--- a/source/blender/blenlib/intern/graph.c
+++ b/source/blender/blenlib/intern/graph.c
@@ -714,15 +714,28 @@ static void testAxialSymmetry(BGraph *graph, BNode* root_node, BNode* node1, BNo
 {
 	float nor[3], vec[3], p[3];
 
-	VecSubf(vec, node1->p, root_node->p);
-	Normalize(vec);
-	VecSubf(p, root_node->p, node2->p);
-	Normalize(p);
-	VecAddf(p, p, vec);
+	VecSubf(p, node1->p, root_node->p);
+	Crossf(nor, p, axis);
 
+	VecSubf(p, root_node->p, node2->p);
 	Crossf(vec, p, axis);
+	VecAddf(vec, vec, nor);
+	
 	Crossf(nor, vec, axis);
 	
+	if (abs(nor[0]) > abs(nor[1]) && abs(nor[0]) > abs(nor[2]) && nor[0] < 0)
+	{
+		VecMulf(nor, -1);
+	}
+	else if (abs(nor[1]) > abs(nor[0]) && abs(nor[1]) > abs(nor[2]) && nor[1] < 0)
+	{
+		VecMulf(nor, -1);
+	}
+	else if (abs(nor[2]) > abs(nor[1]) && abs(nor[2]) > abs(nor[0]) && nor[2] < 0)
+	{
+		VecMulf(nor, -1);
+	}
+	
 	/* mirror node2 along axis */
 	VECCOPY(p, node2->p);
 	BLI_mirrorAlongAxis(p, root_node->p, nor);

From 71b2bf23e0c8f1e5ae57f7ecbb352b7889551148 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Thu, 24 Jul 2008 20:03:25 +0000
Subject: [PATCH 132/252] Slight code changes to select different limits for
 simulated annealing (commit now to test on another machine later)

---
 source/blender/src/autoarmature.c    | 74 ++++++++++++++++------------
 source/blender/src/buttons_editing.c |  2 +-
 2 files changed, 43 insertions(+), 33 deletions(-)

diff --git a/source/blender/src/autoarmature.c b/source/blender/src/autoarmature.c
index edda00dd84b..ba68ec0e322 100644
--- a/source/blender/src/autoarmature.c
+++ b/source/blender/src/autoarmature.c
@@ -149,6 +149,18 @@ typedef struct RigControl {
 	int		flag;
 } RigControl;
 
+typedef enum 
+{
+	RETARGET_LENGTH,
+	RETARGET_AGGRESSIVE
+} RetargetMode; 
+
+typedef enum
+{
+	METHOD_BRUTE_FORCE = 0,
+	METHOD_ANNEALING = 1
+} RetargetMethod;
+
 /*******************************************************************************************************/
 
 static void RIG_calculateEdgeAngle(RigEdge *edge_first, RigEdge *edge_second);
@@ -690,12 +702,6 @@ static void repositionBone(RigGraph *rigg, EditBone *bone, float vec0[3], float
 	VECCOPY(bone->tail, vec1);
 }
 
-typedef enum 
-{
-	RETARGET_LENGTH,
-	RETARGET_AGGRESSIVE
-} RetargetMode; 
-
 static RetargetMode detectArcRetargetMode(RigArc *arc);
 static void retargetArctoArcLength(RigGraph *rigg, RigArc *iarc);
 
@@ -1081,9 +1087,7 @@ static void retargetArctoArcAggresive(RigGraph *rigg, RigArc *iarc)
 	int nb_edges = BLI_countlist(&iarc->edges);
 	int nb_joints = nb_edges - 1;
 	int symmetry_axis = 0;
-	int last_index = 0;
-	int first_pass = 1;
-	int must_move = nb_joints - 1;
+	RetargetMethod method = METHOD_ANNEALING; //G.scene->toolsettings->skgen_optimisation_method;
 	int i;
 
 	positions = MEM_callocN(sizeof(int) * nb_joints, "Aggresive positions");
@@ -1119,10 +1123,24 @@ static void retargetArctoArcAggresive(RigGraph *rigg, RigArc *iarc)
 	
 	vec_cache[0] = node_start->p;
 	vec_cache[nb_edges] = node_end->p;
-
-	/* BRUTE FORCE */
+	
+	if (nb_joints < 3)
+	{
+		method = METHOD_BRUTE_FORCE;
+	}
+	
 	if (G.scene->toolsettings->skgen_optimisation_method == 0)
 	{
+		method = METHOD_BRUTE_FORCE;
+	}
+
+	/* BRUTE FORCE */
+	if (method == METHOD_BRUTE_FORCE)
+	{
+		int last_index = 0;
+		int first_pass = 1;
+		int must_move = nb_joints - 1;
+		
 		while(1)
 		{
 			float cost = 0;
@@ -1259,20 +1277,23 @@ static void retargetArctoArcAggresive(RigGraph *rigg, RigArc *iarc)
 		}
 	}
 	/* SIMULATED ANNEALING */
-#define ANNEALING_ITERATION
-	else if (G.scene->toolsettings->skgen_optimisation_method == 1)
+	else if (method == METHOD_ANNEALING)
 	{
 		RigEdge *previous;
 		float *cost_cube;
 		float cost;
-#ifdef ANNEALING_ITERATION
 		int k;
-		//int kmax = 100000;
-		int kmax = nb_joints * earc->bcount * 200;
-#else
-		double time_start, time_current, time_length = 3;
-		int k;
-#endif
+		int kmax;
+
+		switch (G.scene->toolsettings->skgen_optimisation_method)
+		{
+			case 1:
+				kmax = 100000;
+				break;
+			case 2:
+				kmax = nb_joints * earc->bcount * 200;
+				break;
+		}
 		
 		BLI_srand(nb_joints);
 		
@@ -1303,13 +1324,7 @@ static void retargetArctoArcAggresive(RigGraph *rigg, RigArc *iarc)
 		printf("initial cost: %f\n", cost);
 		printf("kmax: %i\n", kmax);
 		
-#ifdef ANNEALING_ITERATION
 		for (k = 0; k < kmax; k++)
-#else
-		for (time_start = PIL_check_seconds_timer(), time_current = time_start, k = 0;
-			 time_current - time_start < time_length;
-			 time_current = PIL_check_seconds_timer(), k++)
-#endif
 		{
 			int status;
 			int moving_joint = -1;
@@ -1332,12 +1347,7 @@ static void retargetArctoArcAggresive(RigGraph *rigg, RigArc *iarc)
 			
 			delta_cost = cost_cube[moving_joint * 3 + (1 + move_direction)];
 
-#ifdef ANNEALING_ITERATION
 			temperature = 1 - (float)k / (float)kmax;
-#else
-			temperature = 1 - (float)((time_current - time_start) / time_length);
-			temperature = temperature * temperature;
-#endif
 			if (probability(delta_cost, temperature) > BLI_frand())
 			{
 				/* update position */			
@@ -1390,7 +1400,7 @@ static void retargetArctoArcAggresive(RigGraph *rigg, RigArc *iarc)
 	printf("buckets: %i\n", earc->bcount);
 
 	/* set joints to best position */
-	for (edge = iarc->edges.first, i = 0, last_index = 0;
+	for (edge = iarc->edges.first, i = 0;
 		 edge;
 		 edge = edge->next, i++)
 	{
diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c
index da3f98231a0..50c9b50c3b8 100644
--- a/source/blender/src/buttons_editing.c
+++ b/source/blender/src/buttons_editing.c
@@ -5068,7 +5068,7 @@ static void editing_panel_mesh_skgen_retarget(Object *ob, Mesh *me)
 	uiDefButF(block, NUM, B_DIFF, 							"Ang:",			1025, 40, 83,19, &G.scene->toolsettings->skgen_retarget_angle_weight, 0, 10, 1, 0,		"Angle Weight");
 	uiDefButF(block, NUM, B_DIFF, 							"Len:",			1108, 40, 83,19, &G.scene->toolsettings->skgen_retarget_length_weight, 0, 10, 1, 0,		"Length Weight");
 	uiDefButF(block, NUM, B_DIFF, 							"Dist:",		1191, 40, 84,19, &G.scene->toolsettings->skgen_retarget_distance_weight, 0, 10, 1, 0,		"Distance Weight");
-	uiDefButC(block, NUM, B_DIFF, 							"Method:",		1025, 20, 125,19, &G.scene->toolsettings->skgen_optimisation_method, 0, 2, 1, 0,"Optimisation Method (0: brute, 1: annealing, 3: gradient");
+	uiDefButC(block, NUM, B_DIFF, 							"Method:",		1025, 20, 125,19, &G.scene->toolsettings->skgen_optimisation_method, 0, 2, 1, 0,"Optimisation Method (0: brute, 1: annealing max fixed, 2: annealing max linear");
 }
 
 static void editing_panel_mesh_skgen(Object *ob, Mesh *me)

From 2860bc5d5b1b2495c52a64eb7b30490e24ca4a41 Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Thu, 24 Jul 2008 20:39:13 +0000
Subject: [PATCH 133/252] soc-2008-mxcurioni: cleaned up the Convert header
 file to prevent cyclic or header positioning problems and adapted classes
 accordingly

---
 .../freestyle/intern/python/BPy_Convert.cpp   | 14 +++++++++
 .../freestyle/intern/python/BPy_Convert.h     | 29 ++++++++++---------
 .../freestyle/intern/python/BPy_SShape.cpp    |  2 ++
 .../python/Interface0D/BPy_CurvePoint.cpp     |  1 +
 .../intern/python/Interface0D/BPy_SVertex.cpp |  1 +
 .../python/Interface0D/BPy_ViewVertex.cpp     | 20 +++++--------
 .../CurvePoint/BPy_StrokeVertex.cpp           |  1 +
 .../intern/python/Interface1D/BPy_FEdge.cpp   |  2 ++
 .../intern/python/Interface1D/BPy_Stroke.cpp  |  4 +++
 9 files changed, 48 insertions(+), 26 deletions(-)

diff --git a/source/blender/freestyle/intern/python/BPy_Convert.cpp b/source/blender/freestyle/intern/python/BPy_Convert.cpp
index c052acb446f..9bc937b15d9 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Convert.cpp
@@ -1,5 +1,19 @@
 #include "BPy_Convert.h"
 
+#include "BPy_BBox.h"
+#include "BPy_Id.h"
+#include "BPy_IntegrationType.h"
+#include "BPy_Interface0D.h"
+#include "Interface0D/CurvePoint/BPy_StrokeVertex.h"
+#include "Interface0D/BPy_SVertex.h"
+#include "Interface0D/BPy_ViewVertex.h"
+#include "Interface1D/BPy_FEdge.h"
+#include "Interface1D/BPy_ViewEdge.h"
+#include "BPy_SShape.h"
+#include "BPy_Nature.h"
+#include "BPy_MediumType.h"
+#include "BPy_StrokeAttribute.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/source/blender/freestyle/intern/python/BPy_Convert.h b/source/blender/freestyle/intern/python/BPy_Convert.h
index 6bf05dc8047..db0b5e589d2 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.h
+++ b/source/blender/freestyle/intern/python/BPy_Convert.h
@@ -4,20 +4,23 @@
 #include "../geometry/Geom.h"
 using namespace Geometry;
 
+// BBox
+#include "../geometry/BBox.h"
 
-#include "BPy_BBox.h"
-#include "BPy_Id.h"
-#include "BPy_IntegrationType.h"
-#include "BPy_Interface0D.h"
-#include "Interface0D/CurvePoint/BPy_StrokeVertex.h"
-#include "Interface0D/BPy_SVertex.h"
-#include "Interface0D/BPy_ViewVertex.h"
-#include "Interface1D/BPy_FEdge.h"
-#include "Interface1D/BPy_ViewEdge.h"
-#include "BPy_SShape.h"
-#include "BPy_Nature.h"
-#include "BPy_MediumType.h"
-#include "BPy_StrokeAttribute.h"
+// FEdge, FEdgeSharp, FEdgeSmooth, SShape, SVertex, FEdgeInternal::SVertexIterator
+#include "../view_map/Silhouette.h" 
+
+// Id
+#include "../system/Id.h"
+
+// Interface0D, Interface0DIteratorNested, Interface0DIterator
+#include "../view_map/Interface0D.h"
+
+// Stroke, StrokeAttribute, StrokeVertex
+#include "../stroke/Stroke.h"
+
+// NonTVertex, TVertex, ViewEdge, ViewMap, ViewShape, ViewVertex
+#include "../view_map/ViewMap.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/BPy_SShape.cpp b/source/blender/freestyle/intern/python/BPy_SShape.cpp
index 62c554aab51..ab8a39d6193 100644
--- a/source/blender/freestyle/intern/python/BPy_SShape.cpp
+++ b/source/blender/freestyle/intern/python/BPy_SShape.cpp
@@ -1,6 +1,8 @@
 #include "BPy_SShape.h"
 
 #include "BPy_Convert.h"
+#include "BPy_BBox.h"
+#include "BPy_Id.h"
 #include "Interface0D/BPy_SVertex.h"
 #include "Interface1D/BPy_FEdge.h"
 
diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp
index 6765bc84baa..7fce126d309 100644
--- a/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp
@@ -1,6 +1,7 @@
 #include "BPy_CurvePoint.h"
 
 #include "../BPy_Convert.h"
+#include "../Interface0D/BPy_SVertex.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
index bbfff34cb20..233ee3f10b5 100644
--- a/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
@@ -2,6 +2,7 @@
 
 #include "../BPy_Convert.h"
 #include "../BPy_Id.h"
+#include "../Interface1D/BPy_FEdge.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp
index 7e6ef8590fd..2c68dc0e2e3 100644
--- a/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp
@@ -1,6 +1,7 @@
 #include "BPy_ViewVertex.h"
 
 #include "../BPy_Convert.h"
+#include "../BPy_Nature.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -115,16 +116,7 @@ int ViewVertex___init__(BPy_ViewVertex *self )
 	return 0;
 }
 
-// PyObject * ViewVertex___copy__( BPy_ViewVertex *self ) {
-// 	BPy_ViewVertex *py_vv;
-// 	
-// 	py_vv = (BPy_ViewVertex *) ViewVertex_Type.tp_new( &ViewVertex_Type, 0, 0 );
-// 	
-// 	py_vv->vv = self->vv->duplicate();
-// 	py_svertex->py_if0D.if->sv;
-// 
-// 	return (PyObject *) py_svertex;
-// }
+
 
 PyObject * ViewVertex_setNature( BPy_ViewVertex *self, PyObject *args ) {
 	PyObject *py_n;
@@ -140,7 +132,10 @@ PyObject * ViewVertex_setNature( BPy_ViewVertex *self, PyObject *args ) {
 	Py_RETURN_NONE;
 }
 
-
+//PyObject * ViewVertex_edgesBegin( BPy_ViewVertex *self ) {
+	// orientedViewEdgeIterator ove( self->vv->edgesBegin() )
+	// return BPy_orientedViewEdgeIterator_from_orientedViewEdgeIterator( ove );
+//}
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
@@ -149,9 +144,8 @@ PyObject * ViewVertex_setNature( BPy_ViewVertex *self, PyObject *args ) {
 #endif
 
 
-// virtual string 	getExactTypeName () const
 
-// void 	setNature (Nature::VertexNature iNature)
+
 // virtual ViewVertexInternal::orientedViewEdgeIterator 	edgesBegin ()=0
 // virtual ViewVertexInternal::orientedViewEdgeIterator 	edgesEnd ()=0
 // virtual ViewVertexInternal::orientedViewEdgeIterator 	edgesIterator (ViewEdge *iEdge)=0
diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp
index 2039b165457..3616e69447f 100644
--- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp
@@ -2,6 +2,7 @@
 
 #include "../../BPy_Convert.h"
 #include "../../BPy_StrokeAttribute.h"
+#include "../../Interface0D/BPy_SVertex.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp
index 56dc76f0acd..bee852a96cb 100644
--- a/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp
@@ -1,7 +1,9 @@
 #include "BPy_FEdge.h"
 
 #include "../BPy_Convert.h"
+#include "../BPy_Id.h"
 #include "../Interface0D/BPy_SVertex.h"
+#include "../BPy_Nature.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
index 7574c8d7fc1..6e5be90bc82 100644
--- a/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
@@ -1,7 +1,11 @@
 #include "BPy_Stroke.h"
 
 #include "../BPy_Convert.h"
+#include "../BPy_Id.h"
 #include "../Interface0D/BPy_SVertex.h"
+#include "../Interface0D/CurvePoint/BPy_StrokeVertex.h"
+#include "../BPy_MediumType.h"
+
 #include "../../stroke/StrokeIterators.h"
 
 #ifdef __cplusplus

From fc97e91a3efd7dec5f21ec0a8ba6b81a1db7b72d Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Thu, 24 Jul 2008 21:32:50 +0000
Subject: [PATCH 134/252] soc-2008-mxcurioni: found and fixed all potential
 issues iterating over internal view-map data. The internal namespaces
 (ViewEdgeInternal, ViewVertexInternal, CurveInternal, StrokeInternal...)
 should NOT be included to prevent redefintion errors.

---
 .../freestyle/intern/python/BPy_Convert.cpp       |  7 +++++++
 .../blender/freestyle/intern/python/BPy_Convert.h | 13 +++++++++++++
 .../python/Iterator/BPy_CurvePointIterator.cpp    |  6 +++---
 .../python/Iterator/BPy_CurvePointIterator.h      |  3 +--
 .../python/Iterator/BPy_SVertexIterator.cpp       | 15 ++++++++-------
 .../intern/python/Iterator/BPy_SVertexIterator.h  |  3 +--
 .../python/Iterator/BPy_StrokeVertexIterator.cpp  |  4 ++--
 .../python/Iterator/BPy_StrokeVertexIterator.h    |  3 +--
 .../python/Iterator/BPy_ViewEdgeIterator.cpp      |  4 ++--
 .../intern/python/Iterator/BPy_ViewEdgeIterator.h |  3 +--
 .../Iterator/BPy_orientedViewEdgeIterator.cpp     |  4 ++--
 .../Iterator/BPy_orientedViewEdgeIterator.h       |  3 +--
 12 files changed, 42 insertions(+), 26 deletions(-)

diff --git a/source/blender/freestyle/intern/python/BPy_Convert.cpp b/source/blender/freestyle/intern/python/BPy_Convert.cpp
index 9bc937b15d9..bab9da8332e 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Convert.cpp
@@ -9,6 +9,7 @@
 #include "Interface0D/BPy_ViewVertex.h"
 #include "Interface1D/BPy_FEdge.h"
 #include "Interface1D/BPy_ViewEdge.h"
+#include "Iterator/BPy_orientedViewEdgeIterator.h"
 #include "BPy_SShape.h"
 #include "BPy_Nature.h"
 #include "BPy_MediumType.h"
@@ -149,6 +150,12 @@ PyObject * BPy_SShape_from_SShape( SShape& ss ) {
 	return py_ss;	
 }
 
+PyObject * BPy_orientedViewEdgeIterator_from_orientedViewEdgeIterator( ViewVertexInternal::orientedViewEdgeIterator& ove_it ) {
+	PyObject *py_ove_it = orientedViewEdgeIterator_Type.tp_new( &orientedViewEdgeIterator_Type, 0, 0 );
+	((BPy_orientedViewEdgeIterator *) py_ove_it)->ove_it = new ViewVertexInternal::orientedViewEdgeIterator( ove_it );
+
+	return py_ove_it;
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/source/blender/freestyle/intern/python/BPy_Convert.h b/source/blender/freestyle/intern/python/BPy_Convert.h
index db0b5e589d2..87d902f28a8 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.h
+++ b/source/blender/freestyle/intern/python/BPy_Convert.h
@@ -1,6 +1,7 @@
 #ifndef FREESTYLE_PYTHON_CONVERT_H
 #define FREESTYLE_PYTHON_CONVERT_H
 
+
 #include "../geometry/Geom.h"
 using namespace Geometry;
 
@@ -22,6 +23,17 @@ using namespace Geometry;
 // NonTVertex, TVertex, ViewEdge, ViewMap, ViewShape, ViewVertex
 #include "../view_map/ViewMap.h"
 
+// ViewVertexInternal::orientedViewEdgeIterator
+// ViewEdgeInternal::SVertexIterator
+// ViewEdgeInternal::ViewEdgeIterator
+#include "../view_map/ViewMapIterators.h"
+//#####################    IMPORTANT   #####################
+//  Do not use the following namespaces within this file :
+//   - ViewVertexInternal 
+//   - ViewEdgeInternal
+//##########################################################
+
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -45,6 +57,7 @@ PyObject * BPy_Id_from_Id( Id& id );
 PyObject * BPy_Interface0D_from_Interface0D( Interface0D& if0D );
 PyObject * BPy_Nature_from_Nature( unsigned short n );
 PyObject * BPy_MediumType_from_MediumType( int n );
+PyObject * BPy_orientedViewEdgeIterator_from_orientedViewEdgeIterator( ViewVertexInternal::orientedViewEdgeIterator& ove_it );
 PyObject * BPy_SShape_from_SShape( SShape& ss );
 PyObject * BPy_StrokeAttribute_from_StrokeAttribute( StrokeAttribute& sa );
 PyObject * BPy_StrokeVertex_from_StrokeVertex( StrokeVertex& sv );
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp
index 72273e73a65..1f830261739 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp
@@ -121,13 +121,13 @@ int CurvePointIterator___init__(BPy_CurvePointIterator *self, PyObject *args )
 	    return -1;
 
 	if( !obj ){
-		self->cp_it = new CurvePointIterator();
+		self->cp_it = new CurveInternal::CurvePointIterator();
 		
 	} else if( BPy_CurvePointIterator_Check(obj) ) {
-		self->cp_it = new CurvePointIterator(*( ((BPy_CurvePointIterator *) obj)->cp_it ));
+		self->cp_it = new CurveInternal::CurvePointIterator(*( ((BPy_CurvePointIterator *) obj)->cp_it ));
 	
 	} else if( PyFloat_Check(obj) ) {
-		self->cp_it = new CurvePointIterator( PyFloat_AsDouble(obj) );
+		self->cp_it = new CurveInternal::CurvePointIterator( PyFloat_AsDouble(obj) );
 			
 	} else {
 		return -1;
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.h
index 652f6fffb97..e8f082216de 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.h
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.h
@@ -2,7 +2,6 @@
 #define FREESTYLE_PYTHON_CURVEPOINTITERATOR_H
 
 #include "../../stroke/CurveIterators.h"
-using namespace CurveInternal;
 
 #include "../BPy_Iterator.h"
 
@@ -21,7 +20,7 @@ extern PyTypeObject CurvePointIterator_Type;
 /*---------------------------Python BPy_CurvePointIterator structure definition----------*/
 typedef struct {
 	BPy_Iterator py_it;
-	CurvePointIterator *cp_it;
+	CurveInternal::CurvePointIterator *cp_it;
 } BPy_CurvePointIterator;
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp
index be1f946302f..649447f1db6 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp
@@ -121,21 +121,22 @@ int SVertexIterator___init__(BPy_SVertexIterator *self, PyObject *args )
 	    return -1;
 
 	if( !obj1 ){
-		self->sv_it = new SVertexIterator();
+		self->sv_it = new ViewEdgeInternal::SVertexIterator();
 		
 	} else if( BPy_SVertexIterator_Check(obj1) ) {
-		self->sv_it = new SVertexIterator(*( ((BPy_SVertexIterator *) obj1)->sv_it ));
+		self->sv_it = new ViewEdgeInternal::SVertexIterator(*( ((BPy_SVertexIterator *) obj1)->sv_it ));
 	
 	} else if(  obj1 && BPy_SVertex_Check(obj1) &&
 	 			obj2 && BPy_SVertex_Check(obj2) &&
 				obj3 && BPy_FEdge_Check(obj3) &&
 				obj4 && BPy_FEdge_Check(obj4) ) {
 
-		self->sv_it = new SVertexIterator(	((BPy_SVertex *) obj1)->sv,
-											((BPy_SVertex *) obj2)->sv,
-											((BPy_FEdge *) obj3)->fe,
-											((BPy_FEdge *) obj4)->fe,
-											f );
+		self->sv_it = new ViewEdgeInternal::SVertexIterator(
+							((BPy_SVertex *) obj1)->sv,
+							((BPy_SVertex *) obj2)->sv,
+							((BPy_FEdge *) obj3)->fe,
+							((BPy_FEdge *) obj4)->fe,
+							f );
 			
 	} else {
 		return -1;
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.h
index 662685571eb..ba6fbf020d0 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.h
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.h
@@ -2,7 +2,6 @@
 #define FREESTYLE_PYTHON_SVERTEXITERATOR_H
 
 #include "../../view_map/ViewMapIterators.h"
-using namespace ViewEdgeInternal;
 
 #include "../BPy_Iterator.h"
 
@@ -22,7 +21,7 @@ extern PyTypeObject SVertexIterator_Type;
 /*---------------------------Python BPy_SVertexIterator structure definition----------*/
 typedef struct {
 	BPy_Iterator py_it;
-	SVertexIterator *sv_it;
+	ViewEdgeInternal::SVertexIterator *sv_it;
 } BPy_SVertexIterator;
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp
index 72e41a37301..1f04be635c5 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp
@@ -120,10 +120,10 @@ int StrokeVertexIterator___init__(BPy_StrokeVertexIterator *self, PyObject *args
 	    return -1;
 
 	if( !obj ){
-		self->sv_it = new StrokeVertexIterator();
+		self->sv_it = new StrokeInternal::StrokeVertexIterator();
 		
 	} else if( BPy_StrokeVertexIterator_Check(obj) ) {
-		self->sv_it = new StrokeVertexIterator(*( ((BPy_StrokeVertexIterator *) obj)->sv_it ));
+		self->sv_it = new StrokeInternal::StrokeVertexIterator(*( ((BPy_StrokeVertexIterator *) obj)->sv_it ));
 	
 	} else {
 		return -1;
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.h
index 8d9ffc56018..488a1efea3d 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.h
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.h
@@ -2,7 +2,6 @@
 #define FREESTYLE_PYTHON_STROKEVERTEXITERATOR_H
 
 #include "../../stroke/StrokeIterators.h"
-using namespace StrokeInternal;
 
 #include "../BPy_Iterator.h"
 
@@ -21,7 +20,7 @@ extern PyTypeObject StrokeVertexIterator_Type;
 /*---------------------------Python BPy_StrokeVertexIterator structure definition----------*/
 typedef struct {
 	BPy_Iterator py_it;
-	StrokeVertexIterator *sv_it;
+	StrokeInternal::StrokeVertexIterator *sv_it;
 } BPy_StrokeVertexIterator;
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp
index e5de7769fbb..2256d374c0c 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp
@@ -115,13 +115,13 @@ int ViewEdgeIterator___init__(BPy_ViewEdgeIterator *self, PyObject *args )
 	    return -1;
 
 	if( obj1 && BPy_ViewEdgeIterator_Check(obj1)  ) {
-		self->ve_it = new ViewEdgeIterator(*( ((BPy_ViewEdgeIterator *) obj1)->ve_it ));
+		self->ve_it = new ViewEdgeInternal::ViewEdgeIterator(*( ((BPy_ViewEdgeIterator *) obj1)->ve_it ));
 	
 	} else {
 		ViewEdge *begin = ( obj1 && BPy_ViewEdge_Check(obj1) ) ? ((BPy_ViewEdge *) obj1)->ve : 0;
 		bool orientation = ( obj2 && PyBool_Check(obj2) ) ? bool_from_PyBool(obj2) : true;
 		
-		self->ve_it = new ViewEdgeIterator( begin, orientation);
+		self->ve_it = new ViewEdgeInternal::ViewEdgeIterator( begin, orientation);
 		
 	}
 		
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.h
index 35d2f3f255b..a86547c5937 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.h
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.h
@@ -3,7 +3,6 @@
 
 
 #include "../../view_map/ViewMapIterators.h"
-using namespace ViewEdgeInternal;
 
 #include "../BPy_Iterator.h"
 
@@ -22,7 +21,7 @@ extern PyTypeObject ViewEdgeIterator_Type;
 /*---------------------------Python BPy_ViewEdgeIterator structure definition----------*/
 typedef struct {
 	BPy_Iterator py_it;
-	ViewEdgeIterator *ve_it;
+	ViewEdgeInternal::ViewEdgeIterator *ve_it;
 } BPy_ViewEdgeIterator;
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp
index 0622481f412..ec6850c3b96 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp
@@ -112,9 +112,9 @@ int orientedViewEdgeIterator___init__(BPy_orientedViewEdgeIterator *self, PyObje
 	    return -1;
 
 	if( !obj )
-		self->ove_it = new orientedViewEdgeIterator();
+		self->ove_it = new ViewVertexInternal::orientedViewEdgeIterator();
 	else if( BPy_orientedViewEdgeIterator_Check(obj) )
-		self->ove_it = new orientedViewEdgeIterator(*( ((BPy_orientedViewEdgeIterator *) obj)->ove_it ));
+		self->ove_it = new ViewVertexInternal::orientedViewEdgeIterator(*( ((BPy_orientedViewEdgeIterator *) obj)->ove_it ));
 	
 	self->py_it.it = self->ove_it;
 	
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.h
index 60754939220..1c8a25258b7 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.h
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.h
@@ -3,7 +3,6 @@
 
 #include "../../stroke/Stroke.h"
 #include "../../view_map/ViewMapIterators.h"
-using namespace ViewVertexInternal;
 
 #include "../BPy_Iterator.h"
 
@@ -22,7 +21,7 @@ extern PyTypeObject orientedViewEdgeIterator_Type;
 /*---------------------------Python BPy_orientedViewEdgeIterator structure definition----------*/
 typedef struct {
 	BPy_Iterator py_it;
-	orientedViewEdgeIterator *ove_it;
+	ViewVertexInternal::orientedViewEdgeIterator *ove_it;
 } BPy_orientedViewEdgeIterator;
 
 ///////////////////////////////////////////////////////////////////////////////////////////

From d8d9839ab31f774d6e8bcdda00cac31db0995d41 Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Fri, 25 Jul 2008 00:18:10 +0000
Subject: [PATCH 135/252] soc-2008-mxcurioni: Added iterator capability to
 FEdge and Stroke. Recoded parts of ViewVertex, SVertex and Convert to support
 these changes.

---
 .../freestyle/intern/python/BPy_Convert.cpp   |  16 +++
 .../freestyle/intern/python/BPy_Convert.h     |   7 +-
 .../intern/python/Interface0D/BPy_SVertex.cpp |   6 +
 .../python/Interface0D/BPy_ViewVertex.cpp     |  56 +++++++--
 .../intern/python/Interface1D/BPy_FEdge.cpp   | 106 +++++++++++++-----
 .../intern/python/Interface1D/BPy_Stroke.cpp  |  92 +++++++++++----
 6 files changed, 220 insertions(+), 63 deletions(-)

diff --git a/source/blender/freestyle/intern/python/BPy_Convert.cpp b/source/blender/freestyle/intern/python/BPy_Convert.cpp
index bab9da8332e..6ab2dc9ebfb 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Convert.cpp
@@ -9,7 +9,9 @@
 #include "Interface0D/BPy_ViewVertex.h"
 #include "Interface1D/BPy_FEdge.h"
 #include "Interface1D/BPy_ViewEdge.h"
+#include "Iterator/BPy_Interface0DIterator.h"
 #include "Iterator/BPy_orientedViewEdgeIterator.h"
+#include "Iterator/BPy_StrokeVertexIterator.h"
 #include "BPy_SShape.h"
 #include "BPy_Nature.h"
 #include "BPy_MediumType.h"
@@ -157,6 +159,20 @@ PyObject * BPy_orientedViewEdgeIterator_from_orientedViewEdgeIterator( ViewVerte
 	return py_ove_it;
 }
 
+PyObject * BPy_Interface0DIterator_from_Interface0DIterator( Interface0DIterator& if0D_it ) {
+	PyObject *py_if0D_it = Interface0DIterator_Type.tp_new( &Interface0DIterator_Type, 0, 0 );
+	((BPy_Interface0DIterator *) py_if0D_it)->if0D_it = new Interface0DIterator( if0D_it );
+
+	return py_if0D_it;
+}
+
+PyObject * BPy_StrokeVertexIterator_from_StrokeVertexIterator( StrokeInternal::StrokeVertexIterator& sv_it) {
+	PyObject *py_sv_it = StrokeVertexIterator_Type.tp_new( &StrokeVertexIterator_Type, 0, 0 );
+	((BPy_StrokeVertexIterator*) py_sv_it)->sv_it = new StrokeInternal::StrokeVertexIterator( sv_it );
+
+	return py_sv_it;
+}
+
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/BPy_Convert.h b/source/blender/freestyle/intern/python/BPy_Convert.h
index 87d902f28a8..05f002656c7 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.h
+++ b/source/blender/freestyle/intern/python/BPy_Convert.h
@@ -33,6 +33,8 @@ using namespace Geometry;
 //   - ViewEdgeInternal
 //##########################################################
 
+// StrokeInternal::StrokeVertexIterator
+#include "../stroke/StrokeIterators.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -57,7 +59,6 @@ PyObject * BPy_Id_from_Id( Id& id );
 PyObject * BPy_Interface0D_from_Interface0D( Interface0D& if0D );
 PyObject * BPy_Nature_from_Nature( unsigned short n );
 PyObject * BPy_MediumType_from_MediumType( int n );
-PyObject * BPy_orientedViewEdgeIterator_from_orientedViewEdgeIterator( ViewVertexInternal::orientedViewEdgeIterator& ove_it );
 PyObject * BPy_SShape_from_SShape( SShape& ss );
 PyObject * BPy_StrokeAttribute_from_StrokeAttribute( StrokeAttribute& sa );
 PyObject * BPy_StrokeVertex_from_StrokeVertex( StrokeVertex& sv );
@@ -65,6 +66,10 @@ PyObject * BPy_SVertex_from_SVertex( SVertex& sv );
 PyObject * BPy_ViewVertex_from_ViewVertex_ptr( ViewVertex *vv );
 PyObject * BPy_ViewEdge_from_ViewEdge( ViewEdge& ve );
 
+PyObject * BPy_Interface0DIterator_from_Interface0DIterator( Interface0DIterator& if0D_it );
+PyObject * BPy_orientedViewEdgeIterator_from_orientedViewEdgeIterator( ViewVertexInternal::orientedViewEdgeIterator& ove_it );
+PyObject * BPy_StrokeVertexIterator_from_StrokeVertexIterator( StrokeInternal::StrokeVertexIterator& sv_it);
+
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
index 233ee3f10b5..748cbc8f1db 100644
--- a/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
@@ -15,6 +15,7 @@ static int SVertex___init__(BPy_SVertex *self, PyObject *args, PyObject *kwds);
 static PyObject * SVertex___copy__( BPy_SVertex *self );
 static PyObject * SVertex_normals( BPy_SVertex *self );
 static PyObject * SVertex_normalsSize( BPy_SVertex *self );
+static PyObject * SVertex_viewvertex( BPy_SVertex *self );
 static PyObject * SVertex_setPoint3D( BPy_SVertex *self , PyObject *args);
 static PyObject * SVertex_setPoint2D( BPy_SVertex *self , PyObject *args);
 static PyObject * SVertex_AddNormal( BPy_SVertex *self , PyObject *args);
@@ -26,6 +27,7 @@ static PyMethodDef BPy_SVertex_methods[] = {
 	{"__copy__", ( PyCFunction ) SVertex___copy__, METH_NOARGS, "（ ）Cloning method."},
 	{"normals", ( PyCFunction ) SVertex_normals, METH_NOARGS, "Returns the normals for this Vertex as a list. In a smooth surface, a vertex has exactly one normal. In a sharp surface, a vertex can have any number of normals."},
 	{"normalsSize", ( PyCFunction ) SVertex_normalsSize, METH_NOARGS, "Returns the number of different normals for this vertex." },
+	{"viewvertex", ( PyCFunction ) SVertex_viewvertex, METH_NOARGS, "If this SVertex is also a ViewVertex, this method returns a pointer onto this ViewVertex. 0 is returned otherwise." },	
 	{"setPoint3D", ( PyCFunction ) SVertex_setPoint3D, METH_VARARGS, "Sets the 3D coordinates of the SVertex." },
 	{"setPoint2D", ( PyCFunction ) SVertex_setPoint2D, METH_VARARGS, "Sets the 3D projected coordinates of the SVertex." },
 	{"AddNormal", ( PyCFunction ) SVertex_AddNormal, METH_VARARGS, "Adds a normal to the Svertex's set of normals. If the same normal is already in the set, nothing changes." },
@@ -178,6 +180,10 @@ PyObject * SVertex_normalsSize( BPy_SVertex *self ) {
 	return PyInt_FromLong( self->sv->normalsSize() );
 }
 
+PyObject * SVertex_viewvertex( BPy_SVertex *self ) {
+	return BPy_ViewVertex_from_ViewVertex_ptr( self->sv->viewvertex() );
+}
+
 PyObject *SVertex_setPoint3D( BPy_SVertex *self , PyObject *args) {
 	PyObject *py_point;
 
diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp
index 2c68dc0e2e3..ba06d071977 100644
--- a/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp
@@ -1,6 +1,7 @@
 #include "BPy_ViewVertex.h"
 
 #include "../BPy_Convert.h"
+#include "../Interface1D/BPy_ViewEdge.h"
 #include "../BPy_Nature.h"
 
 #ifdef __cplusplus
@@ -12,11 +13,16 @@ extern "C" {
 /*---------------  Python API function prototypes for ViewVertex instance  -----------*/
 static int ViewVertex___init__(BPy_ViewVertex *self);
 static PyObject * ViewVertex_setNature( BPy_ViewVertex *self, PyObject *args );
-
+static PyObject * ViewVertex_edgesBegin( BPy_ViewVertex *self );
+static PyObject * ViewVertex_edgesEnd( BPy_ViewVertex *self );
+static PyObject * ViewVertex_edgesIterator( BPy_ViewVertex *self, PyObject *args );
 
 /*----------------------ViewVertex instance definitions ----------------------------*/
 static PyMethodDef BPy_ViewVertex_methods[] = {
 	{"setNature", ( PyCFunction ) ViewVertex_setNature, METH_VARARGS, "（Nature n ）Sets the nature of the vertex."},
+	{"edgesBegin", ( PyCFunction ) ViewVertex_edgesBegin, METH_NOARGS, "() Returns an iterator over the ViewEdges that goes to or comes from this ViewVertex pointing to the first ViewEdge of the list. The orientedViewEdgeIterator allows to iterate in CCW order over these ViewEdges and to get the orientation for each ViewEdge (incoming/outgoing). "},
+	{"edgesEnd", ( PyCFunction ) ViewVertex_edgesEnd, METH_NOARGS, "() Returns an orientedViewEdgeIterator over the ViewEdges around this ViewVertex, pointing after the last ViewEdge."},
+	{"edgesIterator", ( PyCFunction ) ViewVertex_edgesIterator, METH_VARARGS, "(ViewEdge ve) Returns an orientedViewEdgeIterator pointing to the ViewEdge given as argument. "},
 	{NULL, NULL, 0, NULL}
 };
 
@@ -112,6 +118,7 @@ PyTypeObject ViewVertex_Type = {
 
 int ViewVertex___init__(BPy_ViewVertex *self )
 {	
+	self->vv = 0; // ViewVertex is abstract
 	self->py_if0D.if0D = new Interface0D();
 	return 0;
 }
@@ -121,6 +128,9 @@ int ViewVertex___init__(BPy_ViewVertex *self )
 PyObject * ViewVertex_setNature( BPy_ViewVertex *self, PyObject *args ) {
 	PyObject *py_n;
 
+	if( !self->vv )
+		Py_RETURN_NONE;
+		
 	if(!( PyArg_ParseTuple(args, "O", &py_n) && BPy_Nature_Check(py_n) )) {
 		cout << "ERROR: ViewVertex_setNature" << endl;
 		Py_RETURN_NONE;
@@ -132,10 +142,39 @@ PyObject * ViewVertex_setNature( BPy_ViewVertex *self, PyObject *args ) {
 	Py_RETURN_NONE;
 }
 
-//PyObject * ViewVertex_edgesBegin( BPy_ViewVertex *self ) {
-	// orientedViewEdgeIterator ove( self->vv->edgesBegin() )
-	// return BPy_orientedViewEdgeIterator_from_orientedViewEdgeIterator( ove );
-//}
+PyObject * ViewVertex_edgesBegin( BPy_ViewVertex *self ) {
+	if( !self->vv )
+		Py_RETURN_NONE;
+		
+	ViewVertexInternal::orientedViewEdgeIterator ove_it( self->vv->edgesBegin() );
+	return BPy_orientedViewEdgeIterator_from_orientedViewEdgeIterator( ove_it );
+}
+
+PyObject * ViewVertex_edgesEnd( BPy_ViewVertex *self ) {
+	if( !self->vv )
+		Py_RETURN_NONE;
+		
+	ViewVertexInternal::orientedViewEdgeIterator ove_it( self->vv->edgesEnd() );
+	return BPy_orientedViewEdgeIterator_from_orientedViewEdgeIterator( ove_it );
+}
+
+
+PyObject * ViewVertex_edgesIterator( BPy_ViewVertex *self, PyObject *args ) {
+	PyObject *py_ve;
+
+	if( !self->vv )
+		Py_RETURN_NONE;
+
+	if(!( PyArg_ParseTuple(args, "O", &py_ve) && BPy_ViewEdge_Check(py_ve) )) {
+		cout << "ERROR: ViewVertex_setNature" << endl;
+		Py_RETURN_NONE;
+	}
+	
+	ViewEdge *ve = ((BPy_ViewEdge *) py_ve)->ve;
+	ViewVertexInternal::orientedViewEdgeIterator ove_it( self->vv->edgesIterator( ve ) );
+	return BPy_orientedViewEdgeIterator_from_orientedViewEdgeIterator( ove_it );
+}
+
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
@@ -143,10 +182,3 @@ PyObject * ViewVertex_setNature( BPy_ViewVertex *self, PyObject *args ) {
 }
 #endif
 
-
-
-
-// virtual ViewVertexInternal::orientedViewEdgeIterator 	edgesBegin ()=0
-// virtual ViewVertexInternal::orientedViewEdgeIterator 	edgesEnd ()=0
-// virtual ViewVertexInternal::orientedViewEdgeIterator 	edgesIterator (ViewEdge *iEdge)=0
-// 
diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp
index bee852a96cb..3eaad2bd8c4 100644
--- a/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp
@@ -3,6 +3,7 @@
 #include "../BPy_Convert.h"
 #include "../BPy_Id.h"
 #include "../Interface0D/BPy_SVertex.h"
+#include "../Interface1D/BPy_ViewEdge.h"
 #include "../BPy_Nature.h"
 
 #ifdef __cplusplus
@@ -19,8 +20,7 @@ static PyObject * FEdge_vertexB( BPy_FEdge *self );
 static PyObject * FEdge___getitem__( BPy_FEdge *self, PyObject *args );
 static PyObject * FEdge_nextEdge( BPy_FEdge *self );
 static PyObject * FEdge_previousEdge( BPy_FEdge *self );
-static PyObject * FEdge_getVertices( BPy_FEdge *self );
-static PyObject * FEdge_getPoints( BPy_FEdge *self );
+static PyObject * FEdge_viewedge( BPy_FEdge *self );
 static PyObject * FEdge_isSmooth( BPy_FEdge *self );
 static PyObject * FEdge_setVertexA( BPy_FEdge *self , PyObject *args);
 static PyObject * FEdge_setVertexB( BPy_FEdge *self , PyObject *args);
@@ -29,6 +29,11 @@ static PyObject * FEdge_setNextEdge( BPy_FEdge *self , PyObject *args);
 static PyObject * FEdge_setPreviousEdge( BPy_FEdge *self , PyObject *args);
 static PyObject * FEdge_setSmooth( BPy_FEdge *self , PyObject *args); 
 static PyObject * FEdge_setNature( BPy_FEdge *self, PyObject *args );
+static PyObject * FEdge_setViewEdge( BPy_FEdge *self, PyObject *args );
+static PyObject * FEdge_verticesBegin( BPy_FEdge *self );
+static PyObject * FEdge_verticesEnd( BPy_FEdge *self );
+static PyObject * FEdge_pointsBegin( BPy_FEdge *self, PyObject *args );
+static PyObject * FEdge_pointsEnd( BPy_FEdge *self, PyObject *args );
 
 /*----------------------FEdge instance definitions ----------------------------*/
 static PyMethodDef BPy_FEdge_methods[] = {	
@@ -38,8 +43,7 @@ static PyMethodDef BPy_FEdge_methods[] = {
 	{"__getitem__", ( PyCFunction ) FEdge___getitem__, METH_VARARGS, "(int i) Returns the first SVertex if i=0, the seccond SVertex if i=1."},
 	{"nextEdge", ( PyCFunction ) FEdge_nextEdge, METH_NOARGS, "() Returns the FEdge following this one in the ViewEdge. If this FEdge is the last of the ViewEdge, 0 is returned."},
 	{"previousEdge", ( PyCFunction ) FEdge_previousEdge, METH_NOARGS, "Returns the Edge preceding this one in the ViewEdge. If this FEdge is the first one of the ViewEdge, 0 is returned."},
-	{"getVertices", ( PyCFunction ) FEdge_getVertices, METH_NOARGS, "Returns the vertices"},
-	{"getPoints", ( PyCFunction ) FEdge_getPoints, METH_NOARGS, "Returns the points. The difference with getVertices() is that here we can iterate over points of the 1D element at any given sampling. At each call, a virtual point is created."}, 
+	{"viewedge", ( PyCFunction ) FEdge_viewedge, METH_NOARGS, "Returns a pointer to the ViewEdge to which this FEdge belongs to."},
 	{"isSmooth", ( PyCFunction ) FEdge_isSmooth, METH_NOARGS, "() Returns true if this FEdge is a smooth FEdge."},
 	{"setVertexA", ( PyCFunction ) FEdge_setVertexA, METH_VARARGS, "(SVertex v) Sets the first SVertex. ."},
 	{"setVertexB", ( PyCFunction ) FEdge_setVertexB, METH_VARARGS, "(SVertex v) Sets the second SVertex. "},
@@ -47,7 +51,12 @@ static PyMethodDef BPy_FEdge_methods[] = {
 	{"setNextEdge", ( PyCFunction ) FEdge_setNextEdge, METH_VARARGS, "(FEdge e) Sets the pointer to the next FEdge. "},
 	{"setPreviousEdge", ( PyCFunction ) FEdge_setPreviousEdge, METH_VARARGS, "(FEdge e) Sets the pointer to the previous FEdge. "},
 	{"setSmooth", ( PyCFunction ) FEdge_setSmooth, METH_VARARGS, "(bool b) Sets the flag telling whether this FEdge is smooth or sharp. true for Smooth, false for Sharp. "},
+	{"setViewEdge", ( PyCFunction ) FEdge_setViewEdge, METH_VARARGS, "(ViewEdge ve) Sets the ViewEdge to which this FEdge belongs to."},
 	{"setNature", ( PyCFunction ) FEdge_setNature, METH_VARARGS, "(Nature n) Sets the nature of this FEdge. "},
+	{"verticesBegin", ( PyCFunction ) FEdge_verticesBegin, METH_NOARGS, "() Returns an iterator over the 2 (!) SVertex pointing to the first SVertex."},
+	{"verticesEnd", ( PyCFunction ) FEdge_verticesEnd, METH_NOARGS, "() Returns an iterator over the 2 (!) SVertex pointing after the last SVertex. "},
+	{"pointsBegin", ( PyCFunction ) FEdge_pointsBegin, METH_VARARGS, "(float t=0) Returns an iterator over the FEdge points, pointing to the first point. The difference with verticesBegin() is that here we can iterate over points of the FEdge at a any given sampling t. Indeed, for each iteration, a virtual point is created."},
+	{"pointsEnd", ( PyCFunction ) FEdge_pointsEnd, METH_VARARGS, "(float t=0) Returns an iterator over the FEdge points, pointing after the last point. The difference with verticesEnd() is that here we can iterate over points of the FEdge at a any given sampling t. Indeed, for each iteration, a virtual point is created."},
 	{NULL, NULL, 0, NULL}
 };
 
@@ -219,6 +228,13 @@ PyObject * FEdge_previousEdge( BPy_FEdge *self ) {
 	Py_RETURN_NONE;
 }
 
+PyObject * FEdge_viewedge( BPy_FEdge *self ) {
+	if( ViewEdge *ve = self->fe->viewedge() )
+		return BPy_ViewEdge_from_ViewEdge( *ve );
+
+	Py_RETURN_NONE;
+}
+
 PyObject * FEdge_isSmooth( BPy_FEdge *self ) {
 	return PyBool_from_bool( self->fe->isSmooth() );
 }
@@ -289,6 +305,37 @@ PyObject *FEdge_setPreviousEdge( BPy_FEdge *self , PyObject *args) {
 	Py_RETURN_NONE;
 }
 
+PyObject * FEdge_setNature( BPy_FEdge *self, PyObject *args ) {
+	PyObject *py_n;
+
+	if(!( PyArg_ParseTuple(args, "O", &py_n) && BPy_Nature_Check(py_n) )) {
+		cout << "ERROR: FEdge_setNature" << endl;
+		Py_RETURN_NONE;
+	}
+	
+	PyObject *i = (PyObject *) &( ((BPy_Nature *) py_n)->i );
+	self->fe->setNature( PyInt_AsLong(i) );
+
+	Py_RETURN_NONE;
+}
+
+
+PyObject * FEdge_setViewEdge( BPy_FEdge *self, PyObject *args ) {
+	PyObject *py_ve;
+
+	if(!( PyArg_ParseTuple(args, "O", &py_ve) && BPy_ViewEdge_Check(py_ve) )) {
+		cout << "ERROR: FEdge_setViewEdge" << endl;
+		Py_RETURN_NONE;
+	}
+
+	ViewEdge *ve = ((BPy_ViewEdge *) py_ve)->ve;
+	self->fe->setViewEdge( ve );
+
+	Py_RETURN_NONE;
+}
+
+
+
 PyObject *FEdge_setSmooth( BPy_FEdge *self , PyObject *args) {
 	int b;
 
@@ -302,40 +349,41 @@ PyObject *FEdge_setSmooth( BPy_FEdge *self , PyObject *args) {
 	Py_RETURN_NONE;
 }
 
-PyObject * FEdge_setNature( BPy_FEdge *self, PyObject *args ) {
-	PyObject *py_n;
 
-	if(!( PyArg_ParseTuple(args, "O", &py_n) && BPy_Nature_Check(py_n) )) {
-		cout << "ERROR: FEdge_setNature" << endl;
+PyObject * FEdge_verticesBegin( BPy_FEdge *self ) {
+	Interface0DIterator if0D_it( self->fe->verticesBegin() );
+	return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it );
+}
+
+PyObject * FEdge_verticesEnd( BPy_FEdge *self ) {
+	Interface0DIterator if0D_it( self->fe->verticesEnd() );
+	return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it );
+}
+
+
+PyObject * FEdge_pointsBegin( BPy_FEdge *self, PyObject *args ) {
+	float f = 0;
+
+	if(!( PyArg_ParseTuple(args, "|f", &f)  )) {
+		cout << "ERROR: FEdge_pointsBegin" << endl;
 		Py_RETURN_NONE;
 	}
 	
-	PyObject *i = (PyObject *) &( ((BPy_Nature *) py_n)->i );
-	((FEdge *) self->py_if1D.if1D)->setNature( PyInt_AsLong(i) );
-
-	Py_RETURN_NONE;
+	Interface0DIterator if0D_it( self->fe->pointsBegin(f) );
+	return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it );
 }
 
-PyObject *FEdge_getVertices( BPy_FEdge *self ) {
-	PyObject *py_vertices = PyList_New(NULL);
-		
-	for( Interface0DIterator it = self->fe->verticesBegin(); it != self->fe->verticesEnd(); it++ ) {
-		PyList_Append( py_vertices, BPy_Interface0D_from_Interface0D( *it ) );
+PyObject * FEdge_pointsEnd( BPy_FEdge *self, PyObject *args ) {
+	float f = 0;
+
+	if(!( PyArg_ParseTuple(args, "|f", &f)  )) {
+		cout << "ERROR: FEdge_pointsEnd" << endl;
+		Py_RETURN_NONE;
 	}
 	
-	return py_vertices;
+	Interface0DIterator if0D_it( self->fe->pointsEnd(f) );
+	return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it );
 }
-
-PyObject *FEdge_getPoints( BPy_FEdge *self ) {
-	PyObject *py_points = PyList_New(NULL);
-	
-	for( Interface0DIterator it = self->fe->pointsBegin(); it != self->fe->pointsEnd(); it++ ) {
-		PyList_Append( py_points, BPy_Interface0D_from_Interface0D( *it ) );
-	}
-	
-	return py_points;
-}
-
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
index 6e5be90bc82..af4e882a672 100644
--- a/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
@@ -4,10 +4,9 @@
 #include "../BPy_Id.h"
 #include "../Interface0D/BPy_SVertex.h"
 #include "../Interface0D/CurvePoint/BPy_StrokeVertex.h"
+#include "../Iterator/BPy_StrokeVertexIterator.h"
 #include "../BPy_MediumType.h"
 
-#include "../../stroke/StrokeIterators.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -19,7 +18,7 @@ static int Stroke___init__(BPy_Stroke *self, PyObject *args, PyObject *kwds);
 
 static PyObject * Stroke_ComputeSampling( BPy_Stroke *self, PyObject *args );
 static PyObject * Stroke_Resample( BPy_Stroke *self, PyObject *args );
-//static PyObject * Stroke_InsertVertex( BPy_Stroke *self, PyObject *args );
+static PyObject * Stroke_InsertVertex( BPy_Stroke *self, PyObject *args );
 static PyObject * Stroke_RemoveVertex( BPy_Stroke *self, PyObject *args );
 static PyObject * Stroke_getMediumType( BPy_Stroke *self );
 static PyObject * Stroke_getTextureId( BPy_Stroke *self );
@@ -29,14 +28,20 @@ static PyObject * Stroke_setLength( BPy_Stroke *self , PyObject *args);
 static PyObject * Stroke_setMediumType( BPy_Stroke *self , PyObject *args);
 static PyObject * Stroke_setTextureId( BPy_Stroke *self , PyObject *args);
 static PyObject * Stroke_setTips( BPy_Stroke *self , PyObject *args);
+static PyObject * Stroke_strokeVerticesBegin( BPy_Stroke *self , PyObject *args);
+static PyObject * Stroke_strokeVerticesEnd( BPy_Stroke *self );
 static PyObject * Stroke_strokeVerticesSize( BPy_Stroke *self );
-static PyObject * Stroke_getStrokeVertices( BPy_Stroke *self );
+static PyObject * Stroke_verticesBegin( BPy_Stroke *self );
+static PyObject * Stroke_verticesEnd( BPy_Stroke *self );
+static PyObject * Stroke_pointsBegin( BPy_Stroke *self , PyObject *args);
+static PyObject * Stroke_pointsEnd( BPy_Stroke *self , PyObject *args);
 
 /*----------------------Stroke instance definitions ----------------------------*/
 static PyMethodDef BPy_Stroke_methods[] = {	
 	{"ComputeSampling", ( PyCFunction ) Stroke_ComputeSampling, METH_VARARGS, "(int nVertices) Compute the sampling needed to get nVertices vertices. If the specified number of vertices is less than the actual number of vertices, the actual sampling value is returned."},
 		{"Resample", ( PyCFunction ) Stroke_Resample, METH_VARARGS, "(float f | int n) Resampling method. If the argument is a float, Resamples the curve with a given sampling; if this sampling is < to the actual sampling value, no resampling is done. If the argument is an integer, Resamples the curve so that it eventually has n. That means it is going to add n-vertices_size, if vertices_size is the number of points we already have. Is vertices_size >= n, no resampling is done."},
 	{"RemoveVertex", ( PyCFunction ) Stroke_RemoveVertex, METH_VARARGS, "(StrokeVertex sv) Removes the stroke vertex sv from the stroke. The length and curvilinear abscissa are updated consequently."},
+	{"InsertVertex", ( PyCFunction ) Stroke_InsertVertex, METH_VARARGS, "(StrokeVertex sv, StrokeVertexIterator next) Inserts the stroke vertex iVertex in the stroke before next. The length, curvilinear abscissa are updated consequently."},
 	{"getMediumType", ( PyCFunction ) Stroke_getMediumType, METH_NOARGS, "() Returns the MediumType used for this Stroke."},
 	{"getTextureId", ( PyCFunction ) Stroke_getTextureId, METH_NOARGS, "() Returns the id of the texture used to simulate th marks system for this Stroke."},
 	{"hasTips", ( PyCFunction ) Stroke_hasTips, METH_NOARGS, "() Returns true if this Stroke uses a texture with tips, false otherwise."},
@@ -45,9 +50,14 @@ static PyMethodDef BPy_Stroke_methods[] = {
 	{"setMediumType", ( PyCFunction ) Stroke_setMediumType, METH_VARARGS, "(MediumType mt) Sets the medium type that must be used for this Stroke."},
 	{"setTextureId", ( PyCFunction ) Stroke_setTextureId, METH_VARARGS, "(unsigned int id) Sets the texture id to be used to simulate the marks system for this Stroke."},
 	{"setTips", ( PyCFunction ) Stroke_setTips, METH_VARARGS, "(bool b) Sets the flag telling whether this stroke is using a texture with tips or not."},
+	{"strokeVerticesBegin", ( PyCFunction ) Stroke_strokeVerticesBegin, METH_VARARGS, "(float t=0.f) Returns a StrokeVertexIterator pointing on the first StrokeVertex of the Stroke. One can specifly a sampling value t to resample the Stroke on the fly if needed. "},
+	{"strokeVerticesEnd", ( PyCFunction ) Stroke_strokeVerticesEnd, METH_NOARGS, "() Returns a StrokeVertexIterator pointing after the last StrokeVertex of the Stroke."},
 	{"strokeVerticesSize", ( PyCFunction ) Stroke_strokeVerticesSize, METH_NOARGS, "() Returns the number of StrokeVertex constituing the Stroke."},
-	{"getStrokeVertices", ( PyCFunction ) Stroke_getStrokeVertices, METH_NOARGS, "() Returns the stroke vertices. The difference with vertices() is that here we can iterate over points of the 1D element at a any given sampling. Indeed, for each iteration, a virtual point is created."},
-	//{"InsertVertex", ( PyCFunction ) Stroke_InsertVertex, METH_NOARGS, "(StrokeVertex sv, int i) Inserts the stroke vertex iVertex in the stroke before i. The length, curvilinear abscissa are updated consequently."},
+	{"verticesBegin", ( PyCFunction ) Stroke_verticesBegin, METH_NOARGS, "() Returns an Interface0DIterator pointing on the first StrokeVertex of the Stroke. "},
+	{"verticesEnd", ( PyCFunction ) Stroke_verticesEnd, METH_NOARGS, "() Returns an Interface0DIterator pointing after the last StrokeVertex of the Stroke. "},
+	{"pointsBegin", ( PyCFunction ) Stroke_pointsBegin, METH_VARARGS, "(float t=0.f) Returns an iterator over the Interface1D points, pointing to the first point. The difference with verticesBegin() is that here we can iterate over points of the 1D element at a any given sampling t. Indeed, for each iteration, a virtual point is created. "},
+	{"pointsEnd", ( PyCFunction ) Stroke_pointsEnd, METH_VARARGS, "(float t=0.f) Returns an iterator over the Interface1D points, pointing after the last point. The difference with verticesEnd() is that here we can iterate over points of the 1D element at a any given sampling t. Indeed, for each iteration, a virtual point is created. "},
+
 	{NULL, NULL, 0, NULL}
 };
 
@@ -194,6 +204,21 @@ PyObject * Stroke_Resample( BPy_Stroke *self, PyObject *args ) {
 	Py_RETURN_NONE;
 }
 
+PyObject * Stroke_InsertVertex( BPy_Stroke *self, PyObject *args ) {
+	PyObject *py_sv = 0, *py_sv_it = 0;
+
+	if(!( PyArg_ParseTuple(args, "OO", &py_sv, &py_sv_it) &&
+			BPy_StrokeVertex_Check(py_sv) && BPy_StrokeVertexIterator_Check(py_sv_it) )) {
+		cout << "ERROR: Stroke_InsertVertex" << endl;
+		Py_RETURN_NONE;
+	}
+
+	StrokeVertex *sv = ((BPy_StrokeVertex *) py_sv)->sv;
+	StrokeInternal::StrokeVertexIterator sv_it(*( ((BPy_StrokeVertexIterator *) py_sv_it)->sv_it ));
+	self->s->InsertVertex( sv, sv_it );
+
+	Py_RETURN_NONE;
+}
 
 PyObject * Stroke_RemoveVertex( BPy_Stroke *self, PyObject *args ) {	
 	PyObject *py_sv;
@@ -209,9 +234,6 @@ PyObject * Stroke_RemoveVertex( BPy_Stroke *self, PyObject *args ) {
 	Py_RETURN_NONE;
 }
 
-// pb: 'iterator <=> list' correspondence
-// void 	InsertVertex (StrokeVertex *iVertex, StrokeInternal::StrokeVertexIterator next)
-
 PyObject * Stroke_getMediumType( BPy_Stroke *self ) {	
 	return BPy_MediumType_from_MediumType( self->s->getMediumType() );
 }
@@ -291,26 +313,54 @@ PyObject *Stroke_setTips( BPy_Stroke *self , PyObject *args) {
 	Py_RETURN_NONE;
 }
 
+PyObject * Stroke_strokeVerticesBegin( BPy_Stroke *self , PyObject *args) {
+	StrokeInternal::StrokeVertexIterator sv_it( self->s->strokeVerticesBegin() );
+	return BPy_StrokeVertexIterator_from_StrokeVertexIterator( sv_it );
+}
 
-PyObject * Stroke_strokeVerticesSize( BPy_Stroke *self ) {	
+PyObject * Stroke_strokeVerticesEnd( BPy_Stroke *self ) {
+	StrokeInternal::StrokeVertexIterator sv_it( self->s->strokeVerticesEnd() );
+	return BPy_StrokeVertexIterator_from_StrokeVertexIterator( sv_it );
+}
+
+PyObject * Stroke_strokeVerticesSize( BPy_Stroke *self ) {
 	return PyInt_FromLong( self->s->strokeVerticesSize() );
 }
 
-
-PyObject *Stroke_getStrokeVertices( BPy_Stroke *self ) {
-	PyObject *py_stroke_vertices = PyList_New(NULL);
-		
-	for( StrokeInternal::StrokeVertexIterator it = self->s->strokeVerticesBegin();
-		it != self->s->strokeVerticesEnd();
-		it++ ) {
-		PyList_Append( py_stroke_vertices, BPy_StrokeVertex_from_StrokeVertex( *it ) );
-	}
-	
-	return py_stroke_vertices;
+PyObject * Stroke_verticesBegin( BPy_Stroke *self ) {
+	Interface0DIterator if0D_it( self->s->verticesBegin() );
+	return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it );
 }
 
+PyObject * Stroke_verticesEnd( BPy_Stroke *self ) {
+	Interface0DIterator if0D_it( self->s->verticesEnd() );
+	return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it );	
+}
 
+PyObject * Stroke_pointsBegin( BPy_Stroke *self , PyObject *args) {
+	float f = 0;
 
+	if(!( PyArg_ParseTuple(args, "|f", &f)  )) {
+		cout << "ERROR: Stroke_pointsBegin" << endl;
+		Py_RETURN_NONE;
+	}
+
+	Interface0DIterator if0D_it( self->s->pointsBegin(f) );
+	return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it );
+}
+
+PyObject * Stroke_pointsEnd( BPy_Stroke *self , PyObject *args) {
+	float f = 0;
+
+	if(!( PyArg_ParseTuple(args, "|f", &f)  )) {
+		cout << "ERROR: Stroke_pointsEnd" << endl;
+		Py_RETURN_NONE;
+	}
+	
+	Interface0DIterator if0D_it( self->s->pointsEnd(f) );
+	return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it );
+}
+	
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 #ifdef __cplusplus

From c0f567e757cab55c1ed77d44a204c21023422859 Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Fri, 25 Jul 2008 01:38:19 +0000
Subject: [PATCH 136/252] soc-2008-mxcurioni: fully implemented (but did not
 test) ViewEdge class. Modified functions accross API taking input boolean
 values.

---
 .../freestyle/intern/python/BPy_Convert.cpp   |  12 +-
 .../freestyle/intern/python/BPy_Convert.h     |   1 +
 .../intern/python/BPy_StrokeAttribute.cpp     |   8 +-
 .../intern/python/Interface1D/BPy_FEdge.cpp   |   6 +-
 .../python/Interface1D/BPy_ViewEdge.cpp       | 454 +++++++++++-------
 5 files changed, 290 insertions(+), 191 deletions(-)

diff --git a/source/blender/freestyle/intern/python/BPy_Convert.cpp b/source/blender/freestyle/intern/python/BPy_Convert.cpp
index 6ab2dc9ebfb..1edc4cf1e16 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Convert.cpp
@@ -12,10 +12,11 @@
 #include "Iterator/BPy_Interface0DIterator.h"
 #include "Iterator/BPy_orientedViewEdgeIterator.h"
 #include "Iterator/BPy_StrokeVertexIterator.h"
-#include "BPy_SShape.h"
 #include "BPy_Nature.h"
 #include "BPy_MediumType.h"
+#include "BPy_SShape.h"
 #include "BPy_StrokeAttribute.h"
+#include "BPy_ViewShape.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -152,6 +153,13 @@ PyObject * BPy_SShape_from_SShape( SShape& ss ) {
 	return py_ss;	
 }
 
+PyObject * BPy_ViewShape_from_ViewShape( ViewShape& vs ) {
+	PyObject *py_vs = ViewShape_Type.tp_new( &ViewShape_Type, 0, 0 );
+	((BPy_ViewShape *) py_vs)->vs = new ViewShape( vs );
+
+	return py_vs;
+}
+
 PyObject * BPy_orientedViewEdgeIterator_from_orientedViewEdgeIterator( ViewVertexInternal::orientedViewEdgeIterator& ove_it ) {
 	PyObject *py_ove_it = orientedViewEdgeIterator_Type.tp_new( &orientedViewEdgeIterator_Type, 0, 0 );
 	((BPy_orientedViewEdgeIterator *) py_ove_it)->ove_it = new ViewVertexInternal::orientedViewEdgeIterator( ove_it );
@@ -173,6 +181,8 @@ PyObject * BPy_StrokeVertexIterator_from_StrokeVertexIterator( StrokeInternal::S
 	return py_sv_it;
 }
 
+
+
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/BPy_Convert.h b/source/blender/freestyle/intern/python/BPy_Convert.h
index 05f002656c7..ab80908cf8f 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.h
+++ b/source/blender/freestyle/intern/python/BPy_Convert.h
@@ -65,6 +65,7 @@ PyObject * BPy_StrokeVertex_from_StrokeVertex( StrokeVertex& sv );
 PyObject * BPy_SVertex_from_SVertex( SVertex& sv );
 PyObject * BPy_ViewVertex_from_ViewVertex_ptr( ViewVertex *vv );
 PyObject * BPy_ViewEdge_from_ViewEdge( ViewEdge& ve );
+PyObject * BPy_ViewShape_from_ViewShape( ViewShape& vs );
 
 PyObject * BPy_Interface0DIterator_from_Interface0DIterator( Interface0DIterator& if0D_it );
 PyObject * BPy_orientedViewEdgeIterator_from_orientedViewEdgeIterator( ViewVertexInternal::orientedViewEdgeIterator& ove_it );
diff --git a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp
index 24c0263bc5f..541ef4f4516 100644
--- a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp
+++ b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp
@@ -395,17 +395,19 @@ PyObject * StrokeAttribute_setThickness( BPy_StrokeAttribute *self, PyObject *ar
 }
 
 PyObject * StrokeAttribute_setVisible( BPy_StrokeAttribute *self, PyObject *args ) {
-	int i = 0;
+	PyObject *py_b;
 
-	if(!( PyArg_ParseTuple(args, "i", &i) )) {
+	if(!( PyArg_ParseTuple(args, "O", &py_b) && PyBool_Check(py_b) )) {
 		cout << "ERROR: StrokeAttribute_setVisible" << endl;
 		Py_RETURN_NONE;
 	}
 
-	self->sa->setVisible( i );
+	self->sa->setVisible( bool_from_PyBool(py_b) );
+
 	Py_RETURN_NONE;
 }
 
+
 PyObject * StrokeAttribute_setAttributeReal( BPy_StrokeAttribute *self, PyObject *args ) {
 	char *s = 0;
 	double d = 0;
diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp
index 3eaad2bd8c4..369dd7c61a5 100644
--- a/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp
@@ -337,14 +337,14 @@ PyObject * FEdge_setViewEdge( BPy_FEdge *self, PyObject *args ) {
 
 
 PyObject *FEdge_setSmooth( BPy_FEdge *self , PyObject *args) {
-	int b;
+	PyObject *py_b;
 
-	if(!( PyArg_ParseTuple(args, "i", &b) )) {
+	if(!( PyArg_ParseTuple(args, "O", &py_b) && PyBool_Check(py_b) )) {
 		cout << "ERROR: FEdge_setSmooth" << endl;
 		Py_RETURN_NONE;
 	}
 
-	self->fe->setSmooth( (bool) b );
+	self->fe->setSmooth( bool_from_PyBool(py_b) );
 
 	Py_RETURN_NONE;
 }
diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp
index 02d06757fcb..e32b90a2382 100644
--- a/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp
@@ -1,6 +1,12 @@
 #include "BPy_ViewEdge.h"
 
 #include "../BPy_Convert.h"
+#include "../BPy_Id.h"
+#include "../Interface0D/BPy_ViewVertex.h"
+#include "../Interface1D/BPy_FEdge.h"
+#include "../Interface1D/BPy_ViewEdge.h"
+#include "../BPy_Nature.h"
+#include "../BPy_ViewShape.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -13,13 +19,54 @@ static int ViewEdge___init__(BPy_ViewEdge *self, PyObject *args, PyObject *kwds)
 
 static PyObject * ViewEdge_A( BPy_ViewEdge *self );
 static PyObject * ViewEdge_B( BPy_ViewEdge *self );
+static PyObject * ViewEdge_fedgeA( BPy_ViewEdge *self ) ;
+static PyObject * ViewEdge_fedgeB( BPy_ViewEdge *self ) ;
+static PyObject * ViewEdge_viewShape( BPy_ViewEdge *self ) ;
+static PyObject * ViewEdge_aShape( BPy_ViewEdge *self ) ;
+static PyObject * ViewEdge_isClosed( BPy_ViewEdge *self );
+static PyObject * ViewEdge_getChainingTimeStamp( BPy_ViewEdge *self );
+static PyObject * ViewEdge_setChainingTimeStamp( BPy_ViewEdge *self, PyObject *args) ;
+static PyObject * ViewEdge_setA( BPy_ViewEdge *self , PyObject *args) ;
+static PyObject * ViewEdge_setB( BPy_ViewEdge *self , PyObject *args);
+static PyObject * ViewEdge_setNature( BPy_ViewEdge *self, PyObject *args );
+static PyObject * ViewEdge_setFEdgeA( BPy_ViewEdge *self, PyObject *args ) ;
+static PyObject * ViewEdge_setFEdgeB( BPy_ViewEdge *self, PyObject *args ) ;
+static PyObject * ViewEdge_setShape( BPy_ViewEdge *self, PyObject *args ) ;
+static PyObject * ViewEdge_setId( BPy_ViewEdge *self, PyObject *args ) ;
+static PyObject * ViewEdge_UpdateFEdges( BPy_ViewEdge *self );
+static PyObject * ViewEdge_setaShape( BPy_ViewEdge *self, PyObject *args );
+static PyObject * ViewEdge_setQI( BPy_ViewEdge *self, PyObject *args );
+static PyObject * ViewEdge_verticesBegin( BPy_ViewEdge *self );
+static PyObject * ViewEdge_verticesEnd( BPy_ViewEdge *self );
+static PyObject * ViewEdge_pointsBegin( BPy_ViewEdge *self, PyObject *args );
+static PyObject * ViewEdge_pointsEnd( BPy_ViewEdge *self, PyObject *args );
 
 
 /*----------------------ViewEdge instance definitions ----------------------------*/
 static PyMethodDef BPy_ViewEdge_methods[] = {	
-
 	{"A", ( PyCFunction ) ViewEdge_A, METH_NOARGS, "() Returns the first ViewVertex."},
 	{"B", ( PyCFunction ) ViewEdge_B, METH_NOARGS, "() Returns the second ViewVertex."},
+	{"fedgeA", ( PyCFunction ) ViewEdge_fedgeA, METH_NOARGS, "() Returns the first FEdge that constitues this ViewEdge."},
+	{"fedgeB", ( PyCFunction ) ViewEdge_fedgeB, METH_NOARGS, "() Returns the last FEdge that constitues this ViewEdge."},
+	{"viewShape", ( PyCFunction ) ViewEdge_viewShape, METH_NOARGS, "() Returns the ViewShape to which this ViewEdge belongs to . "},
+	{"aShape", ( PyCFunction ) ViewEdge_aShape, METH_NOARGS, "() Returns the shape that is occluded by the ViewShape to which this ViewEdge belongs to. If no object is occluded, 0 is returned."},
+	{"isClosed", ( PyCFunction ) ViewEdge_isClosed, METH_NOARGS, "() Tells whether this ViewEdge forms a closed loop or not."},
+	{"getChainingTimeStamp", ( PyCFunction ) ViewEdge_getChainingTimeStamp, METH_NOARGS, "() Returns the time stamp of this ViewEdge."},
+	{"setChainingTimeStamp", ( PyCFunction ) ViewEdge_setChainingTimeStamp, METH_VARARGS, "(int ts) Sets the time stamp value."},
+	{"setA", ( PyCFunction ) ViewEdge_setA, METH_VARARGS, "(ViewVertex sv) Sets the first ViewVertex of the ViewEdge."},
+	{"setB", ( PyCFunction ) ViewEdge_setB, METH_VARARGS, "(ViewVertex sv) Sets the last ViewVertex of the ViewEdge."},
+	{"setNature", ( PyCFunction ) ViewEdge_setNature, METH_VARARGS, "(Nature n) Sets the nature of the ViewEdge."},
+	{"setFEdgeA", ( PyCFunction ) ViewEdge_setFEdgeA, METH_VARARGS, "(FEdge fe) Sets the first FEdge of the ViewEdge."},
+	{"setFEdgeB", ( PyCFunction ) ViewEdge_setFEdgeB, METH_VARARGS, "(FEdge fe) Sets the last FEdge of the ViewEdge."},
+	{"setShape", ( PyCFunction ) ViewEdge_setShape, METH_VARARGS, "(ViewShape vs) Sets the ViewShape to which this ViewEdge belongs to."},
+	{"setId", ( PyCFunction ) ViewEdge_setId, METH_VARARGS, "(Id id) Sets the ViewEdge id."},
+	{"UpdateFEdges", ( PyCFunction ) ViewEdge_UpdateFEdges, METH_NOARGS, "() Sets ViewEdge to this for all embedded fedges"},
+	{"setaShape", ( PyCFunction ) ViewEdge_setaShape, METH_VARARGS, "(ViewShape vs) Sets the occluded ViewShape"},
+	{"setQI", ( PyCFunction ) ViewEdge_setQI, METH_VARARGS, "(int qi) Sets the quantitative invisibility value."},
+	{"verticesBegin", ( PyCFunction ) ViewEdge_verticesBegin, METH_NOARGS, "() Returns an Interface0DIterator to iterate over the SVertex constituing the embedding of this ViewEdge. The returned Interface0DIterator points to the first SVertex of the ViewEdge."},
+	{"verticesEnd", ( PyCFunction ) ViewEdge_verticesEnd, METH_NOARGS, "() Returns an Interface0DIterator to iterate over the SVertex constituing the embedding of this ViewEdge. The returned Interface0DIterator points after the last SVertex of the ViewEdge."},
+	{"pointsBegin", ( PyCFunction ) ViewEdge_pointsBegin, METH_VARARGS, "(float t=0) Returns an Interface0DIterator to iterate over the points of this ViewEdge at a given resolution t. The returned Interface0DIterator points on the first Point of the ViewEdge."},
+	{"pointsEnd", ( PyCFunction ) ViewEdge_pointsEnd, METH_VARARGS, "(float t=0) Returns an Interface0DIterator to iterate over the points of this ViewEdge at a given resolution t. The returned Interface0DIterator points after the last Point of the ViewEdge."},
 	{NULL, NULL, 0, NULL}
 };
 
@@ -120,195 +167,234 @@ int ViewEdge___init__(BPy_ViewEdge *self, PyObject *args, PyObject *kwds)
 
 
 PyObject * ViewEdge_A( BPy_ViewEdge *self ) {	
-	// if( self->ve->A() ){
-	// 	return BPy_ViewVertex_from_ViewVertex_ptr( self->ve->A() );
-	// }
-	// 	
-	Py_RETURN_NONE;
-}
-
-PyObject * ViewEdge_B( BPy_ViewEdge *self ) {	
-	// if( self->ve->B() ){
-	// 	return BPy_ViewVertex_from_ViewVertex_ptr( self->ve->B() );
-	// }
+	if( self->ve->A() ){
+		return BPy_ViewVertex_from_ViewVertex_ptr( self->ve->A() );
+	}
 		
 	Py_RETURN_NONE;
 }
 
-// 
-// PyObject * ViewEdge___getitem__( BPy_ViewEdge *self, PyObject *args ) {
-// 	int i;
-// 
-// 	if(!( PyArg_ParseTuple(args, "i", &i) && (i == 0 || i == 1)  )) {
-// 		cout << "ERROR: ViewEdge___getitem__" << endl;
-// 		Py_RETURN_NONE;
-// 	}
-// 	
-// 	if( SVertex *v = self->ve->operator[](i) )
-// 		return BPy_SVertex_from_SVertex( *v );
-// 
-// 	Py_RETURN_NONE;
-// }
-// 
-// PyObject * ViewEdge_nextEdge( BPy_ViewEdge *self ) {
-// 	if( ViewEdge *fe = self->ve->nextEdge() )
-// 		return BPy_ViewEdge_from_ViewEdge( *fe );
-// 
-// 	Py_RETURN_NONE;
-// }
-// 
-// PyObject * ViewEdge_previousEdge( BPy_ViewEdge *self ) {
-// 	if( ViewEdge *fe = self->ve->previousEdge() )
-// 		return BPy_ViewEdge_from_ViewEdge( *fe );
-// 
-// 	Py_RETURN_NONE;
-// }
-// 
-// PyObject * ViewEdge_isSmooth( BPy_ViewEdge *self ) {
-// 	return PyBool_from_bool( self->ve->isSmooth() );
-// }
-// 	
-// PyObject *ViewEdge_setVertexA( BPy_ViewEdge *self , PyObject *args) {
-// 	PyObject *py_sv;
-// 
-// 	if(!( PyArg_ParseTuple(args, "O", &py_sv) && BPy_SVertex_Check(py_sv) )) {
-// 		cout << "ERROR: ViewEdge_setVertexA" << endl;
-// 		Py_RETURN_NONE;
-// 	}
-// 
-// 	self->ve->setVertexA( ((BPy_SVertex *) py_sv)->sv );
-// 
-// 	Py_RETURN_NONE;
-// }
-// 
-// PyObject *ViewEdge_setVertexB( BPy_ViewEdge *self , PyObject *args) {
-// 	PyObject *py_sv;
-// 
-// 	if(!( PyArg_ParseTuple(args, "O", &py_sv) && BPy_SVertex_Check(py_sv) )) {
-// 		cout << "ERROR: ViewEdge_setVertexB" << endl;
-// 		Py_RETURN_NONE;
-// 	}
-// 
-// 	self->ve->setVertexB( ((BPy_SVertex *) py_sv)->sv );
-// 
-// 	Py_RETURN_NONE;
-// }
-// 
-// PyObject *ViewEdge_setId( BPy_ViewEdge *self , PyObject *args) {
-// 	PyObject *py_id;
-// 
-// 	if(!( PyArg_ParseTuple(args, "O", &py_id) && BPy_Id_Check(py_id) )) {
-// 		cout << "ERROR: ViewEdge_setId" << endl;
-// 		Py_RETURN_NONE;
-// 	}
-// 
-// 	self->ve->setId(*( ((BPy_Id *) py_id)->id ));
-// 
-// 	Py_RETURN_NONE;
-// }
-// 
-// 
-// PyObject *ViewEdge_setNextEdge( BPy_ViewEdge *self , PyObject *args) {
-// 	PyObject *py_fe;
-// 
-// 	if(!( PyArg_ParseTuple(args, "O", &py_fe) && BPy_ViewEdge_Check(py_fe) )) {
-// 		cout << "ERROR: ViewEdge_setNextEdge" << endl;
-// 		Py_RETURN_NONE;
-// 	}
-// 
-// 	self->ve->setNextEdge( ((BPy_ViewEdge *) py_fe)->ve );
-// 
-// 	Py_RETURN_NONE;
-// }
-// 
-// PyObject *ViewEdge_setPreviousEdge( BPy_ViewEdge *self , PyObject *args) {
-// 	PyObject *py_fe;
-// 
-// 	if(!( PyArg_ParseTuple(args, "O", &py_fe) && BPy_ViewEdge_Check(py_fe) )) {
-// 		cout << "ERROR: ViewEdge_setPreviousEdge" << endl;
-// 		Py_RETURN_NONE;
-// 	}
-// 
-// 	self->ve->setPreviousEdge( ((BPy_ViewEdge *) py_fe)->ve );
-// 
-// 	Py_RETURN_NONE;
-// }
-// 
-// PyObject *ViewEdge_setSmooth( BPy_ViewEdge *self , PyObject *args) {
-// 	int b;
-// 
-// 	if(!( PyArg_ParseTuple(args, "i", &b) )) {
-// 		cout << "ERROR: ViewEdge_setSmooth" << endl;
-// 		Py_RETURN_NONE;
-// 	}
-// 
-// 	self->ve->setSmooth( (bool) b );
-// 
-// 	Py_RETURN_NONE;
-// }
-// 
-// PyObject * ViewEdge_setNature( BPy_ViewEdge *self, PyObject *args ) {
-// 	PyObject *py_n;
-// 
-// 	if(!( PyArg_ParseTuple(args, "O", &py_n) && BPy_Nature_Check(py_n) )) {
-// 		cout << "ERROR: ViewEdge_setNature" << endl;
-// 		Py_RETURN_NONE;
-// 	}
-// 	
-// 	PyObject *i = (PyObject *) &( ((BPy_Nature *) py_n)->i );
-// 	((ViewEdge *) self->py_if1D.if1D)->setNature( PyInt_AsLong(i) );
-// 
-// 	Py_RETURN_NONE;
-// }
-// 
-// PyObject *ViewEdge_getVertices( BPy_ViewEdge *self ) {
-// 	PyObject *py_vertices = PyList_New(NULL);
-// 		
-// 	for( Interface0DIterator it = self->ve->verticesBegin(); it != self->ve->verticesEnd(); it++ ) {
-// 		PyList_Append( py_vertices, BPy_Interface0D_from_Interface0D( *it ) );
-// 	}
-// 	
-// 	return py_vertices;
-// }
-// 
-// PyObject *ViewEdge_getPoints( BPy_ViewEdge *self ) {
-// 	PyObject *py_points = PyList_New(NULL);
-// 	
-// 	for( Interface0DIterator it = self->ve->pointsBegin(); it != self->ve->pointsEnd(); it++ ) {
-// 		PyList_Append( py_points, BPy_Interface0D_from_Interface0D( *it ) );
-// 	}
-// 	
-// 	return py_points;
-// }
-// 
-// 
-// 
-// 
-// 
-// FEdge * 	fedgeA ()
-// FEdge * 	fedgeB ()
-// ViewShape * 	viewShape ()
-// ViewShape * 	aShape ()
-// bool 	isClosed ()
-// unsigned 	getChainingTimeStamp ()
-// void 	SetA (ViewVertex *iA)
-// void 	SetB (ViewVertex *iB)
-// void 	SetNature (Nature::EdgeNature iNature)
-// void 	SetFEdgeA (FEdge *iFEdge)
-// void 	SetFEdgeB (FEdge *iFEdge)
-// void 	SetShape (ViewShape *iVShape)
-// void 	SetId (const Id &id)
-// void 	UpdateFEdges ()
-// void 	SetaShape (ViewShape *iShape)
-// void 	SetQI (int qi)
-// void 	setChainingTimeStamp (unsigned ts)
-// real 	getLength2D () const
-// virtual Interface0DIterator 	verticesBegin ()
-// virtual Interface0DIterator 	verticesEnd ()
-// virtual Interface0DIterator 	pointsBegin (float t=0.f)
-// virtual Interface0DIterator 	pointsEnd (float t=0.f)
+PyObject * ViewEdge_B( BPy_ViewEdge *self ) {	
+	if( self->ve->B() ){
+		return BPy_ViewVertex_from_ViewVertex_ptr( self->ve->B() );
+	}
+		
+	Py_RETURN_NONE;
+}
+
+PyObject * ViewEdge_fedgeA( BPy_ViewEdge *self ) {	
+	if( self->ve->fedgeA() ){
+		return BPy_FEdge_from_FEdge(*( self->ve->fedgeA() ));
+	}
+		
+	Py_RETURN_NONE;
+}
+
+PyObject * ViewEdge_fedgeB( BPy_ViewEdge *self ) {	
+	if( self->ve->fedgeB() ){
+		return BPy_FEdge_from_FEdge(*( self->ve->fedgeB() ));
+	}
+		
+	Py_RETURN_NONE;
+}
+
+PyObject * ViewEdge_viewShape( BPy_ViewEdge *self ) {	
+	if( self->ve->viewShape() ){
+		return BPy_ViewShape_from_ViewShape(*( self->ve->viewShape() ));
+	}
+		
+	Py_RETURN_NONE;
+}
+
+PyObject * ViewEdge_aShape( BPy_ViewEdge *self ) {	
+	if( self->ve->aShape() ){
+		return BPy_ViewShape_from_ViewShape(*( self->ve->aShape() ));
+	}
+		
+	Py_RETURN_NONE;
+}
+
+PyObject * ViewEdge_isClosed( BPy_ViewEdge *self ) {
+	return PyBool_from_bool( self->ve->isClosed() );	
+}
+
+PyObject * ViewEdge_getChainingTimeStamp( BPy_ViewEdge *self ) {
+	return PyInt_FromLong( self->ve->getChainingTimeStamp() );
+}
+
+PyObject * ViewEdge_setChainingTimeStamp( BPy_ViewEdge *self, PyObject *args) {
+	int timestamp = 0 ;
+
+	if( !PyArg_ParseTuple(args, "i", &timestamp) ) {
+		cout << "ERROR: ViewEdge_setChainingTimeStamp" << endl;
+		Py_RETURN_NONE;
+	}
+	
+	self->ve->setChainingTimeStamp( timestamp );
+
+	Py_RETURN_NONE;
+}
+
+PyObject *ViewEdge_setA( BPy_ViewEdge *self , PyObject *args) {
+	PyObject *py_vv;
+
+	if(!( PyArg_ParseTuple(args, "O", &py_vv) && BPy_ViewVertex_Check(py_vv) )) {
+		cout << "ERROR: ViewEdge_setA" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->ve->setA( ((BPy_ViewVertex *) py_vv)->vv );
+
+	Py_RETURN_NONE;
+}
+
+PyObject *ViewEdge_setB( BPy_ViewEdge *self , PyObject *args) {
+	PyObject *py_vv;
+
+	if(!( PyArg_ParseTuple(args, "O", &py_vv) && BPy_ViewVertex_Check(py_vv) )) {
+		cout << "ERROR: ViewEdge_setB" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->ve->setB( ((BPy_ViewVertex *) py_vv)->vv );
+
+	Py_RETURN_NONE;
+}
+
+PyObject * ViewEdge_setNature( BPy_ViewEdge *self, PyObject *args ) {
+	PyObject *py_n;
+
+	if(!( PyArg_ParseTuple(args, "O", &py_n) && BPy_Nature_Check(py_n) )) {
+		cout << "ERROR: ViewEdge_setNature" << endl;
+		Py_RETURN_NONE;
+	}
+	
+	PyObject *i = (PyObject *) &( ((BPy_Nature *) py_n)->i );
+	self->ve->setNature( PyInt_AsLong(i) );
+
+	Py_RETURN_NONE;
+}
+
+PyObject * ViewEdge_setFEdgeA( BPy_ViewEdge *self, PyObject *args ) {
+	PyObject *py_fe;
+
+	if(!( PyArg_ParseTuple(args, "O", &py_fe) && BPy_FEdge_Check(py_fe) )) {
+		cout << "ERROR: ViewEdge_setFEdgeA" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->ve->setFEdgeA( ((BPy_FEdge *) py_fe)->fe );
+
+	Py_RETURN_NONE;
+}
+
+PyObject * ViewEdge_setFEdgeB( BPy_ViewEdge *self, PyObject *args ) {
+	PyObject *py_fe;
+
+	if(!( PyArg_ParseTuple(args, "O", &py_fe) && BPy_FEdge_Check(py_fe) )) {
+		cout << "ERROR: ViewEdge_setFEdgeB" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->ve->setFEdgeB( ((BPy_FEdge *) py_fe)->fe );
+
+	Py_RETURN_NONE;
+}
+
+PyObject * ViewEdge_setShape( BPy_ViewEdge *self, PyObject *args ) {
+	PyObject *py_vs;
+
+	if(!( PyArg_ParseTuple(args, "O", &py_vs) && BPy_ViewShape_Check(py_vs) )) {
+		cout << "ERROR: ViewEdge_setShape" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->ve->setShape( ((BPy_ViewShape *) py_vs)->vs );
+
+	Py_RETURN_NONE;
+}
+
+PyObject * ViewEdge_setId( BPy_ViewEdge *self, PyObject *args ) {
+	PyObject *py_id;
+
+	if(!( PyArg_ParseTuple(args, "O", &py_id) && BPy_Id_Check(py_id) )) {
+		cout << "ERROR: ViewEdge_setId" << endl;
+		Py_RETURN_NONE;
+	}
+
+	Id id(*( ((BPy_Id *) py_id)->id ));
+	self->ve->setId( id );
+
+	Py_RETURN_NONE;
+}
+
+PyObject * ViewEdge_UpdateFEdges( BPy_ViewEdge *self ) {
+	self->ve->UpdateFEdges();
+
+	Py_RETURN_NONE;
+}
+
+PyObject * ViewEdge_setaShape( BPy_ViewEdge *self, PyObject *args ) {
+	PyObject *py_vs;
+
+	if(!( PyArg_ParseTuple(args, "O", &py_vs) && BPy_ViewShape_Check(py_vs) )) {
+		cout << "ERROR: ViewEdge_setaShape" << endl;
+		Py_RETURN_NONE;
+	}
+
+	ViewShape *vs = ((BPy_ViewShape *) py_vs)->vs;
+	self->ve->setaShape( vs );
+
+	Py_RETURN_NONE;
+}
+
+PyObject * ViewEdge_setQI( BPy_ViewEdge *self, PyObject *args ) {
+	int qi;
+
+	if(!( PyArg_ParseTuple(args, "i", &qi) )) {
+		cout << "ERROR: ViewEdge_setQI" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->ve->setQI( qi );
+
+	Py_RETURN_NONE;
+}
+
+PyObject * ViewEdge_verticesBegin( BPy_ViewEdge *self ) {
+	Interface0DIterator if0D_it( self->ve->verticesBegin() );
+	return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it );
+}
+
+PyObject * ViewEdge_verticesEnd( BPy_ViewEdge *self ) {
+	Interface0DIterator if0D_it( self->ve->verticesEnd() );
+	return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it );
+}
 
 
+PyObject * ViewEdge_pointsBegin( BPy_ViewEdge *self, PyObject *args ) {
+	float f = 0;
+
+	if(!( PyArg_ParseTuple(args, "|f", &f)  )) {
+		cout << "ERROR: ViewEdge_pointsBegin" << endl;
+		Py_RETURN_NONE;
+	}
+	
+	Interface0DIterator if0D_it( self->ve->pointsBegin(f) );
+	return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it );
+}
+
+PyObject * ViewEdge_pointsEnd( BPy_ViewEdge *self, PyObject *args ) {
+	float f = 0;
+
+	if(!( PyArg_ParseTuple(args, "|f", &f)  )) {
+		cout << "ERROR: ViewEdge_pointsEnd" << endl;
+		Py_RETURN_NONE;
+	}
+	
+	Interface0DIterator if0D_it( self->ve->pointsEnd(f) );
+	return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it );
+}
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 

From dc385c59ea12ceb32e18baf4da46905327ea1103 Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Fri, 25 Jul 2008 02:18:02 +0000
Subject: [PATCH 137/252] soc-2008-mxcurioni: fully implemented (but did not
 test) Curve class.

---
 source/blender/freestyle/SConscript           |   1 +
 .../intern/python/BPy_Interface1D.cpp         |   6 +
 .../intern/python/Interface1D/BPy_Curve.cpp   | 341 ++++++++++++------
 .../intern/python/Interface1D/BPy_Curve.h     |  31 ++
 4 files changed, 277 insertions(+), 102 deletions(-)
 create mode 100644 source/blender/freestyle/intern/python/Interface1D/BPy_Curve.h

diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript
index ed6beefd337..3b7d503ed43 100644
--- a/source/blender/freestyle/SConscript
+++ b/source/blender/freestyle/SConscript
@@ -73,6 +73,7 @@ python_sources = [
 						prefix + '/Interface0D/BPy_SVertex.cpp',
 						prefix + '/Interface0D/BPy_ViewVertex.cpp',
 					prefix + '/BPy_Interface1D.cpp',
+						prefix + '/Interface1D/BPy_Curve.cpp',
 						prefix + '/Interface1D/BPy_FEdge.cpp',
 						prefix + '/Interface1D/BPy_Stroke.cpp',
 						prefix + '/Interface1D/BPy_ViewEdge.cpp',
diff --git a/source/blender/freestyle/intern/python/BPy_Interface1D.cpp b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
index ec881b010ee..5166fca4aef 100644
--- a/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
@@ -1,6 +1,7 @@
 #include "BPy_Interface1D.h"
 
 #include "BPy_Convert.h"
+#include "Interface1D/BPy_Curve.h"
 #include "Interface1D/BPy_FEdge.h"
 #include "Interface1D/BPy_Stroke.h"
 #include "Interface1D/BPy_ViewEdge.h"
@@ -137,6 +138,11 @@ PyMODINIT_FUNC Interface1D_Init( PyObject *module )
 	Py_INCREF( &Interface1D_Type );
 	PyModule_AddObject(module, "Interface1D", (PyObject *)&Interface1D_Type);
 	
+	if( PyType_Ready( &Curve_Type ) < 0 )
+		return;
+	Py_INCREF( &Curve_Type );
+	PyModule_AddObject(module, "Curve", (PyObject *)&Curve_Type);
+	
 	if( PyType_Ready( &FEdge_Type ) < 0 )
 		return;
 	Py_INCREF( &FEdge_Type );
diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_Curve.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_Curve.cpp
index 4fac75b3f0d..b0f043a6525 100644
--- a/source/blender/freestyle/intern/python/Interface1D/BPy_Curve.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/BPy_Curve.cpp
@@ -1,112 +1,249 @@
- PyObject *_wrap_Curve_computeCurvatureAndOrientation(PyObject *self , PyObject *args) {
+#include "BPy_Curve.h"
+
+#include "../BPy_Convert.h"
+#include "../BPy_Id.h"
+#include "../Interface0D/BPy_CurvePoint.h"
+#include "../Interface0D/BPy_SVertex.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for Curve instance  -----------*/
+static int Curve___init__(BPy_Curve *self, PyObject *args, PyObject *kwds);
+static PyObject * Curve_push_vertex_back( BPy_Curve *self, PyObject *args );
+static PyObject * Curve_push_vertex_front( BPy_Curve *self, PyObject *args );
+static PyObject * Curve_empty( BPy_Curve *self );
+static PyObject * Curve_nSegments( BPy_Curve *self );
+// point_iterator 	points_begin (float step=0)
+static PyObject * Curve_verticesBegin( BPy_Curve *self );
+static PyObject * Curve_verticesEnd( BPy_Curve *self );
+static PyObject * Curve_pointsBegin( BPy_Curve *self, PyObject *args );
+static PyObject * Curve_pointsEnd( BPy_Curve *self, PyObject *args );
+
+/*----------------------Curve instance definitions ----------------------------*/
+static PyMethodDef BPy_Curve_methods[] = {	
+	{"push_vertex_back", ( PyCFunction ) Curve_push_vertex_back, METH_VARARGS, "(CurvePoint cp | SVertex sv) Adds a single vertex at the front of the Curve."},
+	{"push_vertex_front", ( PyCFunction ) Curve_push_vertex_front, METH_VARARGS, "(CurvePoint cp | SVertex sv) Adds a single vertex at the end of the Curve."},
+	{"empty", ( PyCFunction ) Curve_empty, METH_NOARGS, "() Returns true is the Curve doesn't have any Vertex yet."},
+	{"nSegments", ( PyCFunction ) Curve_nSegments, METH_NOARGS, "() Returns the number of segments in the oplyline constituing the Curve."},
+	{"verticesBegin", ( PyCFunction ) Curve_verticesBegin, METH_NOARGS, "() Returns an Interface0DIterator pointing onto the first vertex of the Curve and that can iterate over the vertices of the Curve."},
+	{"verticesEnd", ( PyCFunction ) Curve_verticesEnd, METH_NOARGS, "() Returns an Interface0DIterator pointing after the last vertex of the Curve and that can iterate over the vertices of the Curve."},
+	{"pointsBegin", ( PyCFunction ) Curve_pointsBegin, METH_VARARGS, "(float t=0) Returns an Interface0DIterator pointing onto the first point of the Curve and that can iterate over the points of the Curve at any resolution t. At each iteration a virtual temporary CurvePoint is created."},
+	{"pointsEnd", ( PyCFunction ) Curve_pointsEnd, METH_VARARGS, "(float t=0) Returns an Interface0DIterator pointing after the last point of the Curve and that can iterate over the points of the Curve at any resolution t. At each iteration a virtual temporary CurvePoint is created."},
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_Curve type definition ------------------------------*/
+
+PyTypeObject Curve_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"Curve",				/* tp_name */
+	sizeof( BPy_Curve ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_Curve_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&Interface1D_Type,				/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)Curve___init__,                       	/* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+
+
+//------------------------INSTANCE METHODS ----------------------------------
+	
+int Curve___init__(BPy_Curve *self, PyObject *args, PyObject *kwds)
+{
+
+	PyObject *obj = 0;
+
+    if (! PyArg_ParseTuple(args, "|O", &obj) )
+        return -1;
+
+	if( !obj ){
+		self->c = new Curve();
+		
+	} else if( BPy_Curve_Check(obj) ) {
+		if( ((BPy_Curve *) obj)->c )
+			self->c = new Curve(*( ((BPy_Curve *) obj)->c ));
+		else
+			return -1;
+		
+	} else if( BPy_Id_Check(obj) ) {
+		if( ((BPy_Id *) obj)->id )
+			self->c = new Curve(*( ((BPy_Id *) obj)->id ));
+		else
+			return -1;
+			
+	} else {
+		return -1;
+	}
+
+	self->py_if1D.if1D = self->c;
+
+	return 0;
 }
 
 
- PyObject *_wrap_Curve_push_vertex_back__SWIG_0(PyObject *self , PyObject *args) {
+PyObject * Curve_push_vertex_back( BPy_Curve *self, PyObject *args ) {
+	PyObject *obj;
+
+	if(!( PyArg_ParseTuple(args, "O", &obj) )) {
+		cout << "ERROR: Curve_push_vertex_back" << endl;
+		Py_RETURN_NONE;
+	}
+
+	if( BPy_CurvePoint_Check(obj) ) {
+		self->c->push_vertex_back( ((BPy_CurvePoint *) obj)->cp );
+	} else if( BPy_SVertex_Check(obj) ) {
+		self->c->push_vertex_back( ((BPy_SVertex *) obj)->sv );
+	}
+
+	Py_RETURN_NONE;
+}
+
+PyObject * Curve_push_vertex_front( BPy_Curve *self, PyObject *args ) {
+		PyObject *obj;
+
+		if(!( PyArg_ParseTuple(args, "O", &obj) )) {
+			cout << "ERROR: Curve_push_vertex_front" << endl;
+			Py_RETURN_NONE;
+		}
+
+		if( BPy_CurvePoint_Check(obj) ) {
+			self->c->push_vertex_front( ((BPy_CurvePoint *) obj)->cp );
+		} else if( BPy_SVertex_Check(obj) ) {
+			self->c->push_vertex_front( ((BPy_SVertex *) obj)->sv );
+		}
+
+		Py_RETURN_NONE;
+	}
+
+PyObject * Curve_empty( BPy_Curve *self ) {
+	return PyBool_from_bool( self->c->empty() );
+}
+
+PyObject * Curve_nSegments( BPy_Curve *self ) {
+	return PyInt_FromLong( self->c->nSegments() );
+}
+
+// point_iterator 	points_begin (float step=0)
+// not implemented
+
+
+PyObject * Curve_verticesBegin( BPy_Curve *self ) {
+	Interface0DIterator if0D_it( self->c->verticesBegin() );
+	return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it );
+}
+
+PyObject * Curve_verticesEnd( BPy_Curve *self ) {
+	Interface0DIterator if0D_it( self->c->verticesEnd() );
+	return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it );
 }
 
 
- PyObject *_wrap_Curve_push_vertex_back__SWIG_1(PyObject *self , PyObject *args) {
+PyObject * Curve_pointsBegin( BPy_Curve *self, PyObject *args ) {
+	float f = 0;
+
+	if(!( PyArg_ParseTuple(args, "|f", &f)  )) {
+		cout << "ERROR: FEdge_pointsBegin" << endl;
+		Py_RETURN_NONE;
+	}
+	
+	Interface0DIterator if0D_it( self->c->pointsBegin(f) );
+	return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it );
+}
+
+PyObject * Curve_pointsEnd( BPy_Curve *self, PyObject *args ) {
+	float f = 0;
+
+	if(!( PyArg_ParseTuple(args, "|f", &f)  )) {
+		cout << "ERROR: FEdge_pointsEnd" << endl;
+		Py_RETURN_NONE;
+	}
+	
+	Interface0DIterator if0D_it( self->c->pointsEnd(f) );
+	return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it );
 }
 
 
- PyObject *_wrap_Curve_push_vertex_back(PyObject *self, PyObject *args) {
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_Curve_push_vertex_front__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Curve_push_vertex_front__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Curve_push_vertex_front(PyObject *self, PyObject *args) {
-}
-
-
- PyObject *_wrap_Curve_empty(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Curve_getLength2D(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Curve_getId(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Curve_nSegments(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Curve_setId(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Curve_curvePointsBegin__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Curve_curvePointsBegin__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Curve_curvePointsBegin(PyObject *self, PyObject *args) {
-}
-
-
- PyObject *_wrap_Curve_curvePointsEnd__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Curve_curvePointsEnd__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Curve_curvePointsEnd(PyObject *self, PyObject *args) {
-}
-
-
- PyObject *_wrap_Curve_curveVerticesBegin(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Curve_curveVerticesEnd(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Curve_verticesBegin(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Curve_verticesEnd(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Curve_pointsBegin__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Curve_pointsBegin__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Curve_pointsBegin(PyObject *self, PyObject *args) {
-}
-
-
- PyObject *_wrap_Curve_pointsEnd__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Curve_pointsEnd__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Curve_pointsEnd(PyObject *self, PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_Curve.h b/source/blender/freestyle/intern/python/Interface1D/BPy_Curve.h
new file mode 100644
index 00000000000..fd19612261a
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Interface1D/BPy_Curve.h
@@ -0,0 +1,31 @@
+#ifndef FREESTYLE_PYTHON_CURVE_H
+#define FREESTYLE_PYTHON_CURVE_H
+
+#include "../BPy_Interface1D.h"
+#include "../../stroke/Curve.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject Curve_Type;
+
+#define BPy_Curve_Check(v)	(( (PyObject *) v)->ob_type == &Curve_Type)
+
+/*---------------------------Python BPy_Curve structure definition----------*/
+typedef struct {
+	BPy_Interface1D py_if1D;
+	Curve *c;
+} BPy_Curve;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_CURVE_H */

From 1634b7c46035eb029fc5ad31b0b2471e6eda0f72 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Fri, 25 Jul 2008 08:06:30 +0000
Subject: [PATCH 138/252] Documentation panel improved to scroll and have
 better word-wrapping.

---
 source/blender/src/drawtext.c | 119 ++++++++++++++++++++++------------
 1 file changed, 77 insertions(+), 42 deletions(-)

diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index c112bbe9350..203676eb55e 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -92,6 +92,7 @@
 #define SUGG_LIST_SIZE	7
 #define SUGG_LIST_WIDTH	20
 #define DOC_WIDTH		40
+#define DOC_HEIGHT		10
 
 #define TOOL_SUGG_LIST	0x01
 #define TOOL_DOCUMENT	0x02
@@ -119,6 +120,7 @@ static int last_txt_find_flags= 0;
 static void *last_txt_find_string= NULL;
 static void *last_txt_repl_string= NULL;
 
+static int doc_scroll= 0;
 static double last_check_time= 0;
 
 static BMF_Font *spacetext_get_font(SpaceText *st) {
@@ -1080,9 +1082,9 @@ static int do_suggest_select(SpaceText *st)
 void draw_documentation(SpaceText *st)
 {
 	TextLine *tmp;
-	char *docs, buf[DOC_WIDTH+1];
-	int len, prevsp, i, a;
-	int boxw=0, boxh, l, x, y;
+	char *docs, buf[DOC_WIDTH+1], *p;
+	int len, i, br, lines;
+	int boxw, boxh, l, x, y, top;
 	
 	if (!st || !st->text) return;
 	if (!texttool_text_is_active(st->text)) return;
@@ -1096,54 +1098,69 @@ void draw_documentation(SpaceText *st)
 	if (l<0) return;
 	
 	if(st->showlinenrs) {
-		x = spacetext_get_fontwidth(st)*(st->text->curc-st->left) + TXT_OFFSET + TEXTXLOC - 4;
+		x= spacetext_get_fontwidth(st)*(st->text->curc-st->left) + TXT_OFFSET + TEXTXLOC - 4;
 	} else {
-		x = spacetext_get_fontwidth(st)*(st->text->curc-st->left) + TXT_OFFSET - 4;
+		x= spacetext_get_fontwidth(st)*(st->text->curc-st->left) + TXT_OFFSET - 4;
 	}
 	if (texttool_suggest_first()) {
 		x += SUGG_LIST_WIDTH*spacetext_get_fontwidth(st) + 50;
 	}
-	y = curarea->winy - st->lheight*l - 2;
 
-	len = strlen(docs);
+	top= y= curarea->winy - st->lheight*l - 2;
+	len= strlen(docs);
+	boxw= DOC_WIDTH*spacetext_get_fontwidth(st) + 20;
+	boxh= (DOC_HEIGHT+1)*st->lheight;
 
-	boxw = DOC_WIDTH*spacetext_get_fontwidth(st) + 20;
-	boxh = (2*len/DOC_WIDTH+1)*st->lheight + 8; /* Rough guess at box height */
-	
-	BIF_ThemeColor(TH_SHADE1);
-	glRecti(x-1, y+1, x+boxw+1, y-boxh-1);
+	/* Draw panel */
 	BIF_ThemeColor(TH_BACK);
 	glRecti(x, y, x+boxw, y-boxh);
+	BIF_ThemeColor(TH_SHADE1);
+	glBegin(GL_LINE_LOOP);
+	glVertex2i(x, y);
+	glVertex2i(x+boxw, y);
+	glVertex2i(x+boxw, y-boxh);
+	glVertex2i(x, y-boxh);
+	glEnd();
+	glBegin(GL_LINE_LOOP);
+	glVertex2i(x+boxw-10, y-7);
+	glVertex2i(x+boxw-4, y-7);
+	glVertex2i(x+boxw-7, y-2);
+	glEnd();
+	glBegin(GL_LINE_LOOP);
+	glVertex2i(x+boxw-10, y-boxh+7);
+	glVertex2i(x+boxw-4, y-boxh+7);
+	glVertex2i(x+boxw-7, y-boxh+2);
+	glEnd();
 	BIF_ThemeColor(TH_TEXT);
 
-	len = strlen(docs);
-	prevsp = a = 0;
-
-	for (i=0; i<len; i++) {
-		if (docs[i] == ' ' || docs[i] == '\t' || docs[i] == '\n') {
-
-			/* If we would exceed the line length, print up to the last space */
-			if (a + i-prevsp > DOC_WIDTH) {
+	i= 0; br= DOC_WIDTH; lines= -doc_scroll;
+	for (p=docs; *p; p++) {
+		if (*p == '\r' && *(++p) != '\n') *(--p)= '\n'; /* Fix line endings */
+		if (*p == ' ' || *p == '\t')
+			br= i;
+		else if (*p == '\n') {
+			buf[i]= '\0';
+			if (lines>=0) {
 				y -= st->lheight;
-				buf[a] = '\0';
-				text_draw(st, buf, 0, 0, 1, x+4, y-1, NULL);
-				a = 0;
-			}
-
-			/* Buffer up the next bit ready to draw */
-			if (i-prevsp > DOC_WIDTH) break; /* TODO: Deal with long, unbroken strings */
-			strncpy(buf+a, docs+prevsp, i-prevsp);
-			a += i-prevsp;
-			prevsp = i;
-
-			/* Hit a new line, print what we have */
-			if (docs[i] == '\n') {
-				y -= st->lheight;
-				buf[a] = '\0';
-				text_draw(st, buf, 0, 0, 1, x+4, y-1, NULL);
-				a = 0;
+				text_draw(st, buf, 0, 0, 1, x+4, y-3, NULL);
 			}
+			i= 0; br= DOC_WIDTH; lines++;
 		}
+		buf[i++]= *p;
+		if (i == DOC_WIDTH) { /* Reached the width, go to last break and wrap there */
+			buf[br]= '\0';
+			if (lines>=0) {
+				y -= st->lheight;
+				text_draw(st, buf, 0, 0, 1, x+4, y-3, NULL);
+			}
+			p -= i-br-1; /* Rewind pointer to last break */
+			i= 0; br= DOC_WIDTH; lines++;
+		}
+		if (lines >= DOC_HEIGHT) break;
+	}
+	if (doc_scroll > 0 && lines < DOC_HEIGHT) {
+		doc_scroll--;
+		draw_documentation(st);
 	}
 }
 
@@ -2018,10 +2035,11 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 					do_selection(st, G.qual&LR_SHIFTKEY);
 					get_selection_buffer(text);
 					do_draw= 1;
+					tools_cancel |= TOOL_SUGG_LIST | TOOL_DOCUMENT;
 				} else {
 					do_textscroll(st, 1);
+					tools_cancel |= TOOL_SUGG_LIST;
 				}
-				tools_cancel |= TOOL_SUGG_LIST | TOOL_DOCUMENT;
 			}
 		}
 	} else if (event==RIGHTMOUSE) {
@@ -2453,7 +2471,11 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			tools_cancel = 0;
 			break;
 		case DOWNARROWKEY:
-			if (tools & TOOL_SUGG_LIST) {
+			if (tools & TOOL_DOCUMENT) {
+				doc_scroll++;
+				tools_cancel &= ~(TOOL_SUGG_LIST | TOOL_DOCUMENT);
+				break;
+			} else if (tools & TOOL_SUGG_LIST) {
 				SuggItem *sel = texttool_suggest_selected();
 				if (!sel) {
 					texttool_suggest_select(texttool_suggest_first());
@@ -2491,7 +2513,11 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			pop_space_text(st);
 			break;
 		case UPARROWKEY:
-			if (tools & TOOL_SUGG_LIST) {
+			if (tools & TOOL_DOCUMENT) {
+				if (doc_scroll) doc_scroll--;
+				tools_cancel &= ~(TOOL_SUGG_LIST | TOOL_DOCUMENT);
+				break;
+			} else if (tools & TOOL_SUGG_LIST) {
 				SuggItem *sel = texttool_suggest_selected();
 				if (sel && sel!=texttool_suggest_first() && sel->prev)
 					texttool_suggest_select(sel->prev);
@@ -2542,7 +2568,11 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			pop_space_text(st);
 			break;
 		case WHEELUPMOUSE:
-			if (tools & TOOL_SUGG_LIST) {
+			if (tools & TOOL_DOCUMENT) {
+				if (doc_scroll) doc_scroll--;
+				tools_cancel &= ~(TOOL_SUGG_LIST | TOOL_DOCUMENT);
+				break;
+			} else if (tools & TOOL_SUGG_LIST) {
 				SuggItem *sel = texttool_suggest_selected();
 				if (sel && sel!=texttool_suggest_first() && sel->prev)
 					texttool_suggest_select(sel->prev);
@@ -2554,7 +2584,11 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			do_draw= 1;
 			break;
 		case WHEELDOWNMOUSE:
-			if (tools & TOOL_SUGG_LIST) {
+			if (tools & TOOL_DOCUMENT) {
+				doc_scroll++;
+				tools_cancel &= ~(TOOL_SUGG_LIST | TOOL_DOCUMENT);
+				break;
+			} else if (tools & TOOL_SUGG_LIST) {
 				SuggItem *sel = texttool_suggest_selected();
 				if (!sel) {
 					texttool_suggest_select(texttool_suggest_first());
@@ -2644,6 +2678,7 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 	if (tools & TOOL_DOCUMENT) {
 		if (tools_cancel & TOOL_DOCUMENT) {
 			texttool_docs_clear();
+			doc_scroll= 0;
 		}
 		do_draw= 1;
 	}

From 51f9082c964fda6ba90aa5b503a06f22c5a9ee60 Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Fri, 25 Jul 2008 21:56:06 +0000
Subject: [PATCH 139/252] soc-2008-mxcurioni: added (but did not test)
 NonTVertex and TVertex classes. All Interface0D structures have been
 implemented

---
 source/blender/freestyle/SConscript           |   2 +
 .../intern/python/BPy_Interface0D.cpp         |  12 +
 .../Interface0D/ViewVertex/BPy_NonTVertex.cpp | 316 +++++++++------
 .../Interface0D/ViewVertex/BPy_NonTVertex.h   |  31 ++
 .../Interface0D/ViewVertex/BPy_TVertex.cpp    | 371 ++++++++++--------
 .../Interface0D/ViewVertex/BPy_TVertex.h      |  31 ++
 .../freestyle/intern/view_map/ViewMap.h       |   4 +-
 .../freestyle/intern/view_map/ViewMapIO.cpp   |   2 +-
 8 files changed, 485 insertions(+), 284 deletions(-)
 create mode 100644 source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.h
 create mode 100644 source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.h

diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript
index 3b7d503ed43..6bbf5c9ca4b 100644
--- a/source/blender/freestyle/SConscript
+++ b/source/blender/freestyle/SConscript
@@ -72,6 +72,8 @@ python_sources = [
 						prefix + '/Interface0D/CurvePoint/BPy_StrokeVertex.cpp',
 						prefix + '/Interface0D/BPy_SVertex.cpp',
 						prefix + '/Interface0D/BPy_ViewVertex.cpp',
+						prefix + '/Interface0D/ViewVertex/BPy_NonTVertex.cpp',
+						prefix + '/Interface0D/ViewVertex/BPy_TVertex.cpp',
 					prefix + '/BPy_Interface1D.cpp',
 						prefix + '/Interface1D/BPy_Curve.cpp',
 						prefix + '/Interface1D/BPy_FEdge.cpp',
diff --git a/source/blender/freestyle/intern/python/BPy_Interface0D.cpp b/source/blender/freestyle/intern/python/BPy_Interface0D.cpp
index defe76464eb..506fc3b4e9d 100644
--- a/source/blender/freestyle/intern/python/BPy_Interface0D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Interface0D.cpp
@@ -5,6 +5,8 @@
 #include "Interface0D/CurvePoint/BPy_StrokeVertex.h"
 #include "Interface0D/BPy_SVertex.h"
 #include "Interface0D/BPy_ViewVertex.h"
+#include "Interface0D/ViewVertex/BPy_NonTVertex.h"
+#include "Interface0D/ViewVertex/BPy_TVertex.h"
 #include "Interface1D/BPy_FEdge.h"
 #include "BPy_Nature.h"
 
@@ -164,6 +166,16 @@ PyMODINIT_FUNC Interface0D_Init( PyObject *module )
 		return;
 	Py_INCREF( &StrokeVertex_Type );
 	PyModule_AddObject(module, "StrokeVertex", (PyObject *)&StrokeVertex_Type);
+	
+	if( PyType_Ready( &NonTVertex_Type ) < 0 )
+		return;
+	Py_INCREF( &NonTVertex_Type );
+	PyModule_AddObject(module, "NonTVertex", (PyObject *)&NonTVertex_Type);
+	
+	if( PyType_Ready( &TVertex_Type ) < 0 )
+		return;
+	Py_INCREF( &TVertex_Type );
+	PyModule_AddObject(module, "TVertex", (PyObject *)&TVertex_Type);
 }
 
 //------------------------INSTANCE METHODS ----------------------------------
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp
index 772a385139e..206674a20a5 100644
--- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp
@@ -1,132 +1,192 @@
- PyObject *_wrap_NonTVertex_getExactTypeName(PyObject *self , PyObject *args) {
+#include "BPy_NonTVertex.h"
+
+#include "../../BPy_Convert.h"
+#include "../BPy_SVertex.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for NonTVertex___init__ instance  -----------*/
+static int NonTVertex___init__(BPy_NonTVertex *self, PyObject *args, PyObject *kwds);
+
+static PyObject * NonTVertex_castToSVertex( BPy_NonTVertex *self );
+static PyObject * NonTVertex_castToViewVertex( BPy_NonTVertex *self );
+static PyObject * NonTVertex_castToNonTVertex( BPy_NonTVertex *self );
+static PyObject * NonTVertex_svertex( BPy_NonTVertex *self );
+static PyObject * NonTVertex_setSVertex( BPy_NonTVertex *self, PyObject *args);
+
+/*----------------------NonTVertex instance definitions ----------------------------*/
+static PyMethodDef BPy_NonTVertex_methods[] = {	
+//	{"__copy__", ( PyCFunction ) NonTVertex___copy__, METH_NOARGS, "（ ）Cloning method."},
+	{"castToSVertex", ( PyCFunction ) NonTVertex_castToSVertex, METH_NOARGS, "（ ）Cast the Interface0D in SVertex if it can be. "},
+	{"castToViewVertex", ( PyCFunction ) NonTVertex_castToViewVertex, METH_NOARGS, "（ ）Cast the Interface0D in ViewVertex if it can be. "},
+	{"castToNonTVertex", ( PyCFunction ) NonTVertex_castToNonTVertex, METH_NOARGS, "（ ）Cast the Interface0D in NonTVertex if it can be. "},
+	{"svertex", ( PyCFunction ) NonTVertex_svertex, METH_NOARGS, "（ ）Returns the SVertex on top of which this NonTVertex is built. "},
+	{"setSVertex", ( PyCFunction ) NonTVertex_setSVertex, METH_VARARGS, "（SVertex sv ）Sets the SVertex on top of which this NonTVertex is built. "},
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_NonTVertex type definition ------------------------------*/
+
+PyTypeObject NonTVertex_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"NonTVertex",				/* tp_name */
+	sizeof( BPy_NonTVertex ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_NonTVertex_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&ViewVertex_Type,				/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)NonTVertex___init__,                       	/* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int NonTVertex___init__(BPy_NonTVertex *self, PyObject *args, PyObject *kwds)
+{
+
+	PyObject *obj = 0;
+
+    if (! PyArg_ParseTuple(args, "|O", &obj) )
+        return -1;
+
+	if( !obj ){
+		self->ntv = new NonTVertex();
+
+	} else if( BPy_SVertex_Check(obj) && ((BPy_SVertex *) obj)->sv ) {
+		self->ntv = new NonTVertex( ((BPy_SVertex *) obj)->sv );
+
+	} else {
+		return -1;
+	}
+
+	self->py_vv.vv = self->ntv;
+	self->py_vv.py_if0D.if0D = self->ntv;
+
+	return 0;
+}
+
+PyObject * NonTVertex_castToSVertex( BPy_NonTVertex *self ) {
+	PyObject *py_sv =  SVertex_Type.tp_new( &SVertex_Type, 0, 0 );
+	((BPy_SVertex *) py_sv)->sv = self->ntv->castToSVertex();
+
+	return py_sv;
+}
+
+PyObject * NonTVertex_castToViewVertex( BPy_NonTVertex *self ) {
+	PyObject *py_vv =  ViewVertex_Type.tp_new( &ViewVertex_Type, 0, 0 );
+	((BPy_ViewVertex *) py_vv)->vv = self->ntv->castToViewVertex();
+
+	return py_vv;
+}
+
+PyObject * NonTVertex_castToNonTVertex( BPy_NonTVertex *self ) {
+	PyObject *py_ntv =  NonTVertex_Type.tp_new( &NonTVertex_Type, 0, 0 );
+	((BPy_NonTVertex *) py_ntv)->ntv = self->ntv->castToNonTVertex();
+
+	return py_ntv;
+}
+
+PyObject * NonTVertex_svertex( BPy_NonTVertex *self ) {
+	if( self->ntv->svertex() ){
+		return BPy_SVertex_from_SVertex(*( self->ntv->svertex() ));
+	}
+
+	Py_RETURN_NONE;
+}
+
+PyObject * NonTVertex_setSVertex( BPy_NonTVertex *self, PyObject *args) {
+	PyObject *py_sv;
+
+	if(!( PyArg_ParseTuple(args, "O", &py_sv) && BPy_SVertex_Check(py_sv) )) {
+		cout << "ERROR: NonTVertex_setSVertex" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->ntv->setSVertex( ((BPy_SVertex *) py_sv)->sv );
+
+	Py_RETURN_NONE;
 }
 
 
- PyObject *_wrap_NonTVertex_getX(PyObject *self , PyObject *args) {
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_NonTVertex_getY(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_NonTVertex_getZ(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_NonTVertex_getPoint3D(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_NonTVertex_getProjectedX(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_NonTVertex_getProjectedY(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_NonTVertex_getProjectedZ(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_NonTVertex_getPoint2D(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_NonTVertex_getId(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_NonTVertex_castToSVertex(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_NonTVertex_castToViewVertex(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_NonTVertex_castToNonTVertex(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_NonTVertex__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_NonTVertex__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_NonTVertex(PyObject *self, PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_NonTVertex(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_NonTVertex_svertex(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_NonTVertex_viewedges(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_NonTVertex_SetSVertex(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_NonTVertex_SetViewEdges(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_NonTVertex_AddIncomingViewEdge(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_NonTVertex_AddOutgoingViewEdge(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_NonTVertex_AddViewEdge__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_NonTVertex_AddViewEdge__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_NonTVertex_AddViewEdge(PyObject *self, PyObject *args) {
-}
-
-
- PyObject *_wrap_NonTVertex_Replace(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_NonTVertex_edges_end__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_NonTVertex_edges_end__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_NonTVertex_edges_end(PyObject *self, PyObject *args) {
-}
-
-
- PyObject *_wrap_NonTVertex_edgesBegin(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_NonTVertex_edgesEnd(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_NonTVertex_edgesIterator(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.h b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.h
new file mode 100644
index 00000000000..13b520d81db
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.h
@@ -0,0 +1,31 @@
+#ifndef FREESTYLE_PYTHON_NONTVERTEX_H
+#define FREESTYLE_PYTHON_NONTVERTEX_H
+
+#include "../BPy_ViewVertex.h"
+#include "../../../view_map/ViewMap.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject NonTVertex_Type;
+
+#define BPy_NonTVertex_Check(v)	(( (PyObject *) v)->ob_type == &NonTVertex_Type)
+
+/*---------------------------Python BPy_NonTVertex structure definition----------*/
+typedef struct {
+	BPy_ViewVertex py_vv;
+	NonTVertex *ntv;
+} BPy_NonTVertex;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_NONTVERTEX_H */
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp
index 715170c1422..ab8bb72604c 100644
--- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp
@@ -1,184 +1,249 @@
- PyObject *_wrap_TVertex_getExactTypeName(PyObject *self , PyObject *args) {
+#include "BPy_TVertex.h"
+
+#include "../../BPy_Convert.h"
+#include "../BPy_SVertex.h"
+#include "../../BPy_Id.h"
+#include "../../Interface1D/BPy_FEdge.h"
+#include "../../Interface1D/BPy_ViewEdge.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for TVertex___init__ instance  -----------*/
+static int TVertex___init__(BPy_TVertex *self, PyObject *args, PyObject *kwds);
+
+static PyObject * TVertex_castToViewVertex( BPy_TVertex *self );
+static PyObject * TVertex_castToTVertex( BPy_TVertex *self );
+static PyObject * TVertex_frontSVertex( BPy_TVertex *self );
+static PyObject * TVertex_backSVertex( BPy_TVertex *self );
+static PyObject * TVertex_setFrontSVertex( BPy_TVertex *self, PyObject *args); 
+static PyObject * TVertex_setBackSVertex( BPy_TVertex *self, PyObject *args); 
+static PyObject * TVertex_setId( BPy_TVertex *self, PyObject *args);
+static PyObject * TVertex_getSVertex( BPy_TVertex *self, PyObject *args);
+static PyObject * TVertex_mate( BPy_TVertex *self, PyObject *args);
+
+/*----------------------TVertex instance definitions ----------------------------*/
+static PyMethodDef BPy_TVertex_methods[] = {	
+//	{"__copy__", ( PyCFunction ) TVertex___copy__, METH_NOARGS, "（ ）Cloning method."},
+	{"castToViewVertex", ( PyCFunction ) TVertex_castToViewVertex, METH_NOARGS, "（ ）Cast the Interface0D in ViewVertex if it can be. "},
+	{"castToTVertex", ( PyCFunction ) TVertex_castToTVertex, METH_NOARGS, "（ ）Cast the Interface0D in TVertex if it can be. "},
+	{"frontSVertex", ( PyCFunction ) TVertex_frontSVertex, METH_NOARGS, "（ ）Returns the SVertex that is closer to the viewpoint. "},
+	{"backSVertex", ( PyCFunction ) TVertex_backSVertex, METH_NOARGS, "（ ）Returns the SVertex that is further away from the viewpoint. "},
+	{"setFrontSVertex", ( PyCFunction ) TVertex_setFrontSVertex, METH_VARARGS, "（SVertex sv ）Sets the SVertex that is closer to the viewpoint. "},
+	{"setBackSVertex", ( PyCFunction ) TVertex_setBackSVertex, METH_VARARGS, "（SVertex sv ）Sets the SVertex that is further away from the viewpoint. "},
+	{"setId", ( PyCFunction ) TVertex_setId, METH_VARARGS, "（Id id ）Sets the Id."},
+	{"getSVertex", ( PyCFunction ) TVertex_getSVertex, METH_VARARGS, "（FEdge fe ）Returns the SVertex (among the 2) belonging to the FEdge iFEdge "},
+	{"mate", ( PyCFunction ) TVertex_mate, METH_VARARGS, "（ViewEdge ve ）Returns the mate edge of iEdgeA. For example, if iEdgeA is frontEdgeA, then frontEdgeB is returned. If iEdgeA is frontEdgeB then frontEdgeA is returned. Same for back edges"},
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_TVertex type definition ------------------------------*/
+
+PyTypeObject TVertex_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"TVertex",				/* tp_name */
+	sizeof( BPy_TVertex ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_TVertex_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&ViewVertex_Type,				/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)TVertex___init__,                       	/* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int TVertex___init__(BPy_TVertex *self, PyObject *args, PyObject *kwds)
+{
+	self->tv = new TVertex();
+	self->py_vv.vv = self->tv;
+	self->py_vv.py_if0D.if0D = self->tv;
+
+	return 0;
 }
 
 
- PyObject *_wrap_TVertex_getX(PyObject *self , PyObject *args) {
+PyObject * TVertex_castToViewVertex( BPy_TVertex *self ) {
+	PyObject *py_vv =  ViewVertex_Type.tp_new( &ViewVertex_Type, 0, 0 );
+	((BPy_ViewVertex *) py_vv)->vv = self->tv->castToViewVertex();
+
+	return py_vv;
 }
 
+PyObject * TVertex_castToTVertex( BPy_TVertex *self ) {
+	PyObject *py_tv =  TVertex_Type.tp_new( &TVertex_Type, 0, 0 );
+	((BPy_TVertex *) py_tv)->tv = self->tv->castToTVertex();
 
- PyObject *_wrap_TVertex_getY(PyObject *self , PyObject *args) {
+	return py_tv;
 }
 
+PyObject * TVertex_frontSVertex( BPy_TVertex *self ) {
+	if( self->tv->frontSVertex() ){
+		return BPy_SVertex_from_SVertex(*( self->tv->frontSVertex() ));
+	}
 
- PyObject *_wrap_TVertex_getZ(PyObject *self , PyObject *args) {
+	Py_RETURN_NONE;
 }
 
+PyObject * TVertex_backSVertex( BPy_TVertex *self ) {
+	if( self->tv->backSVertex() ){
+		return BPy_SVertex_from_SVertex(*( self->tv->backSVertex() ));
+	}
 
- PyObject *_wrap_TVertex_getPoint3D(PyObject *self , PyObject *args) {
+	Py_RETURN_NONE;
 }
 
+PyObject * TVertex_setFrontSVertex( BPy_TVertex *self, PyObject *args) {
+	PyObject *py_sv;
 
- PyObject *_wrap_TVertex_getProjectedX(PyObject *self , PyObject *args) {
+	if(!( PyArg_ParseTuple(args, "O", &py_sv) && BPy_SVertex_Check(py_sv) )) {
+		cout << "ERROR: TVertex_setFrontSVertex" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->tv->setFrontSVertex( ((BPy_SVertex *) py_sv)->sv );
+
+	Py_RETURN_NONE;
 }
 
+PyObject * TVertex_setBackSVertex( BPy_TVertex *self, PyObject *args) {
+	PyObject *py_sv;
 
- PyObject *_wrap_TVertex_getProjectedY(PyObject *self , PyObject *args) {
+	if(!( PyArg_ParseTuple(args, "O", &py_sv) && BPy_SVertex_Check(py_sv) )) {
+		cout << "ERROR: TVertex_setBackSVertex" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->tv->setBackSVertex( ((BPy_SVertex *) py_sv)->sv );
+
+	Py_RETURN_NONE;
 }
 
+PyObject * TVertex_setId( BPy_TVertex *self, PyObject *args) {
+	PyObject *py_id;
 
- PyObject *_wrap_TVertex_getProjectedZ(PyObject *self , PyObject *args) {
+	if(!( PyArg_ParseTuple(args, "O", &py_id) && BPy_Id_Check(py_id) )) {
+		cout << "ERROR: TVertex_setId" << endl;
+		Py_RETURN_NONE;
+	}
+
+	if( ((BPy_Id *) py_id)->id )
+		self->tv->setId(*( ((BPy_Id *) py_id)->id ));
+
+	Py_RETURN_NONE;
 }
 
+PyObject * TVertex_getSVertex( BPy_TVertex *self, PyObject *args) {
+	PyObject *py_fe;
 
- PyObject *_wrap_TVertex_getPoint2D(PyObject *self , PyObject *args) {
+	if(!( PyArg_ParseTuple(args, "O", &py_fe) && BPy_FEdge_Check(py_fe) )) {
+		cout << "ERROR: TVertex_getSVertex" << endl;
+		Py_RETURN_NONE;
+	}
+
+	SVertex *sv = self->tv->getSVertex( ((BPy_FEdge *) py_fe)->fe );
+	if( sv ){
+		return BPy_SVertex_from_SVertex(*( sv ));
+	}
+
+	Py_RETURN_NONE;
 }
 
+PyObject * TVertex_mate( BPy_TVertex *self, PyObject *args) {
+	PyObject *py_ve;
 
- PyObject *_wrap_TVertex_getId(PyObject *self , PyObject *args) {
+	if(!( PyArg_ParseTuple(args, "O", &py_ve) && BPy_ViewEdge_Check(py_ve) )) {
+		cout << "ERROR: TVertex_mate" << endl;
+		Py_RETURN_NONE;
+	}
+
+	ViewEdge *ve = self->tv->mate( ((BPy_ViewEdge *) py_ve)->ve );
+	if( ve ){
+		return BPy_ViewEdge_from_ViewEdge(*( ve ));
+	}
+
+	Py_RETURN_NONE;
 }
 
+	
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_TVertex_castToViewVertex(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_TVertex_castToTVertex(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_TVertex__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_TVertex__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_TVertex(PyObject *self, PyObject *args) {
-}
-
-
- PyObject *_wrap_TVertex_frontSVertex(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_TVertex_backSVertex(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_TVertex_frontEdgeA(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_TVertex_frontEdgeB(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_TVertex_backEdgeA(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_TVertex_backEdgeB(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_TVertex_SetFrontVertex(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_TVertex_SetBackSVertex(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_TVertex_SetFrontEdgeA__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_TVertex_SetFrontEdgeA__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_TVertex_SetFrontEdgeA(PyObject *self, PyObject *args) {
-}
-
-
- PyObject *_wrap_TVertex_SetFrontEdgeB__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_TVertex_SetFrontEdgeB__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_TVertex_SetFrontEdgeB(PyObject *self, PyObject *args) {
-}
-
-
- PyObject *_wrap_TVertex_SetBackEdgeA__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_TVertex_SetBackEdgeA__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_TVertex_SetBackEdgeA(PyObject *self, PyObject *args) {
-}
-
-
- PyObject *_wrap_TVertex_SetBackEdgeB__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_TVertex_SetBackEdgeB__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_TVertex_SetBackEdgeB(PyObject *self, PyObject *args) {
-}
-
-
- PyObject *_wrap_TVertex_SetId(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_TVertex_GetSVertex(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_TVertex_Replace(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_TVertex_mate(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_TVertex_edges_end__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_TVertex_edges_end__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_TVertex_edges_end(PyObject *self, PyObject *args) {
-}
-
-
- PyObject *_wrap_TVertex_edgesBegin(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_TVertex_edgesEnd(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_TVertex_edgesIterator(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_TVertex(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.h b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.h
new file mode 100644
index 00000000000..a4f564446ef
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.h
@@ -0,0 +1,31 @@
+#ifndef FREESTYLE_PYTHON_TVERTEX_H
+#define FREESTYLE_PYTHON_TVERTEX_H
+
+#include "../BPy_ViewVertex.h"
+#include "../../../view_map/ViewMap.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject TVertex_Type;
+
+#define BPy_TVertex_Check(v)	(( (PyObject *) v)->ob_type == &TVertex_Type)
+
+/*---------------------------Python BPy_TVertex structure definition----------*/
+typedef struct {
+	BPy_ViewVertex py_vv;
+	TVertex *tv;
+} BPy_TVertex;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_TVERTEX_H */
diff --git a/source/blender/freestyle/intern/view_map/ViewMap.h b/source/blender/freestyle/intern/view_map/ViewMap.h
index 2ddeb198fff..e4b0d915ada 100755
--- a/source/blender/freestyle/intern/view_map/ViewMap.h
+++ b/source/blender/freestyle/intern/view_map/ViewMap.h
@@ -465,7 +465,7 @@ public:
   
   /* modifiers */
   /*! Sets the SVertex that is closer to the viewpoint. */
-  inline void setFrontVertex(SVertex  *iFrontSVertex) {_FrontSVertex = iFrontSVertex;_FrontSVertex->setViewVertex(this);}
+  inline void setFrontSVertex(SVertex  *iFrontSVertex) {_FrontSVertex = iFrontSVertex;_FrontSVertex->setViewVertex(this);}
   /*! Sets the SVertex that is further away from the viewpoint. */
   inline void setBackSVertex(SVertex  *iBackSVertex) {_BackSVertex = iBackSVertex;_BackSVertex->setViewVertex(this);}
   void setFrontEdgeA(ViewEdge *iFrontEdgeA, bool incoming=true);
@@ -476,7 +476,7 @@ public:
   inline void setId(const Id& iId) {_Id = iId;}
   
   /*! Returns the SVertex (among the 2) belonging to the FEdge iFEdge */
-  inline SVertex * GetSVertex(FEdge *iFEdge)
+  inline SVertex * getSVertex(FEdge *iFEdge)
   {
     const vector<FEdge*>& vfEdges = _FrontSVertex->fedges();
     vector<FEdge*>::const_iterator fe,fend;
diff --git a/source/blender/freestyle/intern/view_map/ViewMapIO.cpp b/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
index 3591c67ce1f..e42a0df0422 100755
--- a/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
@@ -463,7 +463,7 @@ namespace ViewMapIO {
 	// FrontSVertex
 	SVertex* fsv;
 	READ_IF_NON_NULL(fsv, g_vm->SVertices());
-	tv->setFrontVertex(fsv);
+	tv->setFrontSVertex(fsv);
 
 	// BackSVertex
 	SVertex* bsv;

From 4c6e0d49c8defaf5bb3efa56e9843965cfed7f92 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Sat, 26 Jul 2008 00:25:03 +0000
Subject: [PATCH 140/252] Text plug-ins should only be invoked when syntax
 highlight is enabled (since they only update when it is set). We don't want
 things popping up when we're just writing text.

---
 source/blender/src/drawtext.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index 203676eb55e..99d03d46e34 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -2608,7 +2608,8 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 		}
 	}
 
-	if (event && val) {
+	/* Run text plugin scripts if in syntax mode */
+	if (st->showsyntax && event && val) {
 		if (BPY_menu_do_shortcut(PYMENU_TEXTPLUGIN, event, G.qual)) {
 			do_draw= 1;
 		}

From b216e4d12d8e4e416724d33a9a4c017d2809e5d0 Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Sat, 26 Jul 2008 02:33:21 +0000
Subject: [PATCH 141/252] soc-2008-mxcurioni: implemented (but did not test)
 the following classes: Material, Chain, FEdgeSharp, FEdgeSmooth. All
 Interface1D classes have now been fully implemented.

---
 .../freestyle/intern/python/BPy_Convert.cpp   |   7 +
 .../freestyle/intern/python/BPy_Convert.h     |   6 +
 .../freestyle/intern/python/BPy_Freestyle.cpp |   2 +
 .../intern/python/BPy_FrsMaterial.cpp         | 407 ++++++++++++++++++
 .../freestyle/intern/python/BPy_FrsMaterial.h |  36 ++
 .../intern/python/BPy_Interface1D.cpp         |  19 +
 .../freestyle/intern/python/BPy_Material.cpp  | 112 -----
 .../freestyle/intern/python/BPy_Material.h    |   0
 .../python/Interface1D/Curve/BPy_Chain.cpp    | 188 ++++++++
 .../python/Interface1D/Curve/BPy_Chain.h      |  31 ++
 .../Interface1D/FEdge/BPy_FEdgeSharp.cpp      | 238 +++++++++-
 .../python/Interface1D/FEdge/BPy_FEdgeSharp.h |  31 ++
 .../Interface1D/FEdge/BPy_FEdgeSmooth.cpp     | 204 ++++++++-
 .../Interface1D/FEdge/BPy_FEdgeSmooth.h       |  31 ++
 14 files changed, 1165 insertions(+), 147 deletions(-)
 create mode 100644 source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
 create mode 100644 source/blender/freestyle/intern/python/BPy_FrsMaterial.h
 delete mode 100644 source/blender/freestyle/intern/python/BPy_Material.cpp
 delete mode 100644 source/blender/freestyle/intern/python/BPy_Material.h
 create mode 100644 source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.h
 create mode 100644 source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.h
 create mode 100644 source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.h

diff --git a/source/blender/freestyle/intern/python/BPy_Convert.cpp b/source/blender/freestyle/intern/python/BPy_Convert.cpp
index 1edc4cf1e16..4d66b46420a 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Convert.cpp
@@ -1,6 +1,7 @@
 #include "BPy_Convert.h"
 
 #include "BPy_BBox.h"
+#include "BPy_FrsMaterial.h"
 #include "BPy_Id.h"
 #include "BPy_IntegrationType.h"
 #include "BPy_Interface0D.h"
@@ -181,6 +182,12 @@ PyObject * BPy_StrokeVertexIterator_from_StrokeVertexIterator( StrokeInternal::S
 	return py_sv_it;
 }
 
+PyObject * BPy_FrsMaterial_from_Material( Material& m ){
+	PyObject *py_m = FrsMaterial_Type.tp_new( &FrsMaterial_Type, 0, 0 );
+	((BPy_FrsMaterial*) py_m)->m = new Material( m );
+
+	return py_m;
+}
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/BPy_Convert.h b/source/blender/freestyle/intern/python/BPy_Convert.h
index ab80908cf8f..9bf535ead6a 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.h
+++ b/source/blender/freestyle/intern/python/BPy_Convert.h
@@ -17,6 +17,9 @@ using namespace Geometry;
 // Interface0D, Interface0DIteratorNested, Interface0DIterator
 #include "../view_map/Interface0D.h"
 
+// Material
+#include "../scene_graph/Material.h"
+
 // Stroke, StrokeAttribute, StrokeVertex
 #include "../stroke/Stroke.h"
 
@@ -36,6 +39,8 @@ using namespace Geometry;
 // StrokeInternal::StrokeVertexIterator
 #include "../stroke/StrokeIterators.h"
 
+
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -57,6 +62,7 @@ PyObject * BPy_BBox_from_BBox( BBox< Vec3r > &bb );
 PyObject * BPy_FEdge_from_FEdge( FEdge& fe );
 PyObject * BPy_Id_from_Id( Id& id );
 PyObject * BPy_Interface0D_from_Interface0D( Interface0D& if0D );
+PyObject * BPy_FrsMaterial_from_Material( Material& m );
 PyObject * BPy_Nature_from_Nature( unsigned short n );
 PyObject * BPy_MediumType_from_MediumType( int n );
 PyObject * BPy_SShape_from_SShape( SShape& ss );
diff --git a/source/blender/freestyle/intern/python/BPy_Freestyle.cpp b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
index 0496060d0f3..13164d0a153 100644
--- a/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
@@ -3,6 +3,7 @@
 #include "BPy_BBox.h"
 #include "BPy_BinaryPredicate0D.h"
 #include "BPy_BinaryPredicate1D.h"
+#include "BPy_FrsMaterial.h"
 #include "BPy_Id.h"
 #include "BPy_IntegrationType.h"
 #include "BPy_Interface0D.h"
@@ -144,6 +145,7 @@ PyObject *Freestyle_Init( void )
 	BBox_Init( module );
 	BinaryPredicate0D_Init( module );
 	BinaryPredicate1D_Init( module );
+	FrsMaterial_Init( module );
 	Id_Init( module );
 	IntegrationType_Init( module );
 	Interface0D_Init( module );
diff --git a/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp b/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
new file mode 100644
index 00000000000..052583e4621
--- /dev/null
+++ b/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
@@ -0,0 +1,407 @@
+#include "BPy_FrsMaterial.h"
+
+#include "BPy_Convert.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for FrsMaterial instance  -----------*/
+static int FrsMaterial___init__(BPy_FrsMaterial *self, PyObject *args, PyObject *kwds);
+static void FrsMaterial___dealloc__(BPy_FrsMaterial *self);
+static PyObject * FrsMaterial___repr__(BPy_FrsMaterial *self);
+
+static PyObject * FrsMaterial_diffuse( BPy_FrsMaterial* self);
+static PyObject * FrsMaterial_diffuseR( BPy_FrsMaterial* self);
+static PyObject * FrsMaterial_diffuseG( BPy_FrsMaterial* self) ;
+static PyObject * FrsMaterial_diffuseB( BPy_FrsMaterial* self) ;
+static PyObject * FrsMaterial_diffuseA( BPy_FrsMaterial* self);
+static PyObject * FrsMaterial_specular( BPy_FrsMaterial* self);
+static PyObject * FrsMaterial_specularR( BPy_FrsMaterial* self);
+static PyObject * FrsMaterial_specularG( BPy_FrsMaterial* self);
+static PyObject * FrsMaterial_specularB( BPy_FrsMaterial* self) ;
+static PyObject * FrsMaterial_specularA( BPy_FrsMaterial* self) ;
+static PyObject * FrsMaterial_ambient( BPy_FrsMaterial* self) ;
+static PyObject * FrsMaterial_ambientR( BPy_FrsMaterial* self);
+static PyObject * FrsMaterial_ambientG( BPy_FrsMaterial* self);
+static PyObject * FrsMaterial_ambientB( BPy_FrsMaterial* self);
+static PyObject * FrsMaterial_ambientA( BPy_FrsMaterial* self);
+static PyObject * FrsMaterial_emission( BPy_FrsMaterial* self);
+static PyObject * FrsMaterial_emissionR( BPy_FrsMaterial* self);
+static PyObject * FrsMaterial_emissionG( BPy_FrsMaterial* self) ;
+static PyObject * FrsMaterial_emissionB( BPy_FrsMaterial* self);
+static PyObject * FrsMaterial_emissionA( BPy_FrsMaterial* self);
+static PyObject * FrsMaterial_shininess( BPy_FrsMaterial* self);
+static PyObject * FrsMaterial_setDiffuse( BPy_FrsMaterial *self, PyObject *args );
+static PyObject * FrsMaterial_setSpecular( BPy_FrsMaterial *self, PyObject *args );
+static PyObject * FrsMaterial_setAmbient( BPy_FrsMaterial *self, PyObject *args );
+static PyObject * FrsMaterial_setEmission( BPy_FrsMaterial *self, PyObject *args );
+static PyObject * FrsMaterial_setShininess( BPy_FrsMaterial *self, PyObject *args );
+
+/*----------------------FrsMaterial instance definitions ----------------------------*/
+static PyMethodDef BPy_FrsMaterial_methods[] = {
+	{"diffuse", ( PyCFunction ) FrsMaterial_diffuse, METH_NOARGS, "() Returns the diffuse color as a 4 float array"},
+	{"diffuseR", ( PyCFunction ) FrsMaterial_diffuseR, METH_NOARGS, "() Returns the red component of the diffuse color "},
+	{"diffuseG", ( PyCFunction ) FrsMaterial_diffuseG, METH_NOARGS, "() Returns the green component of the diffuse color "},
+	{"diffuseB", ( PyCFunction ) FrsMaterial_diffuseB, METH_NOARGS, "() Returns the blue component of the diffuse color "},
+	{"diffuseA", ( PyCFunction ) FrsMaterial_diffuseA, METH_NOARGS, "() Returns the alpha component of the diffuse color "},
+	{"specular", ( PyCFunction ) FrsMaterial_specular, METH_NOARGS, "() Returns the specular color as a 4 float array"},
+	{"specularR", ( PyCFunction ) FrsMaterial_specularR, METH_NOARGS, "() Returns the red component of the specular color "},
+	{"specularG", ( PyCFunction ) FrsMaterial_specularG, METH_NOARGS, "() Returns the green component of the specular color "},
+	{"specularB", ( PyCFunction ) FrsMaterial_specularB, METH_NOARGS, "() Returns the blue component of the specular color "},
+	{"specularA", ( PyCFunction ) FrsMaterial_specularA, METH_NOARGS, "() Returns the alpha component of the specular color "},
+	{"ambient", ( PyCFunction ) FrsMaterial_ambient, METH_NOARGS, "() Returns the ambient color as a 4 float array"},
+	{"ambientR", ( PyCFunction ) FrsMaterial_ambientR, METH_NOARGS, "() Returns the red component of the ambient color "},
+	{"ambientG", ( PyCFunction ) FrsMaterial_ambientG, METH_NOARGS, "() Returns the green component of the ambient color "},
+	{"ambientB", ( PyCFunction ) FrsMaterial_ambientB, METH_NOARGS, "() Returns the blue component of the ambient color "},
+	{"ambientA", ( PyCFunction ) FrsMaterial_ambientA, METH_NOARGS, "() Returns the alpha component of the ambient color "},
+	{"emission", ( PyCFunction ) FrsMaterial_emission, METH_NOARGS, "() Returns the emission color as a 4 float array"},
+	{"emissionR", ( PyCFunction ) FrsMaterial_emissionR, METH_NOARGS, "() Returns the red component of the emission color "},
+	{"emissionG", ( PyCFunction ) FrsMaterial_emissionG, METH_NOARGS, "() Returns the green component of the emission color "},
+	{"emissionB", ( PyCFunction ) FrsMaterial_emissionB, METH_NOARGS, "() Returns the blue component of the emission color "},
+	{"emissionA", ( PyCFunction ) FrsMaterial_emissionA, METH_NOARGS, "() Returns the alpha component of the emission color "},
+	{"shininess", ( PyCFunction ) FrsMaterial_shininess, METH_NOARGS, "() Returns the shininess coefficient "},
+	{"setDiffuse", ( PyCFunction ) FrsMaterial_setDiffuse, METH_NOARGS, "(float r, float g, float b, float a) Sets the diffuse color"},
+	{"setSpecular", ( PyCFunction ) FrsMaterial_setSpecular, METH_NOARGS, "(float r, float g, float b, float a) Sets the specular color"},
+	{"setAmbient", ( PyCFunction ) FrsMaterial_setAmbient, METH_NOARGS, "(float r, float g, float b, float a) Sets the ambient color"},
+	{"setEmission", ( PyCFunction ) FrsMaterial_setEmission, METH_NOARGS, "(float r, float g, float b, float a) Sets the emission color"},
+	{"setShininess", ( PyCFunction ) FrsMaterial_setShininess, METH_NOARGS, "(float r, float g, float b, float a) Sets the shininess color"},
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_FrsMaterial type definition ------------------------------*/
+
+PyTypeObject FrsMaterial_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"FrsMaterial",				/* tp_name */
+	sizeof( BPy_FrsMaterial ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	(destructor)FrsMaterial___dealloc__,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	(reprfunc)FrsMaterial___repr__,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_FrsMaterial_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	NULL,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)FrsMaterial___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	PyType_GenericNew,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+PyMODINIT_FUNC FrsMaterial_Init( PyObject *module )
+{
+	if( module == NULL )
+		return;
+
+	if( PyType_Ready( &FrsMaterial_Type ) < 0 )
+		return;
+
+	Py_INCREF( &FrsMaterial_Type );
+	PyModule_AddObject(module, "FrsMaterial", (PyObject *)&FrsMaterial_Type);
+}
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int FrsMaterial___init__(BPy_FrsMaterial *self, PyObject *args, PyObject *kwds)
+{
+	PyObject *obj1 = 0;
+	float f1 = 0, f2 = 0., f3 = 0., f4 = 0., f5 = 0.;
+
+    if (! PyArg_ParseTuple(args, "|Offff", &obj1, &f2, &f3, &f4, &f5) )
+        return -1;
+
+	if( !obj1 ){
+		self->m = new Material();
+
+	} else if( BPy_FrsMaterial_Check(obj1) ) {
+		if( ((BPy_FrsMaterial *) obj1)->m )
+			self->m = new Material(*( ((BPy_FrsMaterial *) obj1)->m ));
+		else
+			return -1;
+
+	} else if( PyFloat_Check(obj1) ) {
+		f1 = PyFloat_AsDouble(obj1);
+		self->m = new Material(&f1, &f2, &f3, &f4, f5);
+
+	} else {
+		return -1;
+	}
+
+	return 0;
+}
+
+void FrsMaterial___dealloc__( BPy_FrsMaterial* self)
+{
+	delete self->m;
+    self->ob_type->tp_free((PyObject*)self);
+}
+
+
+PyObject * FrsMaterial___repr__( BPy_FrsMaterial* self)
+{
+    return PyString_FromFormat("FrsMaterial - address: %p", self->m );
+}
+
+PyObject * FrsMaterial_diffuse( BPy_FrsMaterial* self) {
+	PyObject *tmp;
+	
+	const float *diffuse = self->m->diffuse();
+	PyObject *py_diffuse = PyList_New(4);
+	
+	tmp = PyFloat_FromDouble( diffuse[0] ); PyList_SetItem( py_diffuse, 0, tmp); Py_DECREF(tmp);
+	tmp = PyFloat_FromDouble( diffuse[1] ); PyList_SetItem( py_diffuse, 1, tmp); Py_DECREF(tmp);
+	tmp = PyFloat_FromDouble( diffuse[2] ); PyList_SetItem( py_diffuse, 2, tmp); Py_DECREF(tmp);
+	tmp = PyFloat_FromDouble( diffuse[3] ); PyList_SetItem( py_diffuse, 3, tmp); Py_DECREF(tmp);
+	
+	return py_diffuse;
+}
+
+PyObject * FrsMaterial_diffuseR( BPy_FrsMaterial* self) {
+	return PyFloat_FromDouble( self->m->diffuseR() );
+}
+
+PyObject * FrsMaterial_diffuseG( BPy_FrsMaterial* self) {
+	return PyFloat_FromDouble( self->m->diffuseG() );
+}
+
+PyObject * FrsMaterial_diffuseB( BPy_FrsMaterial* self) {
+	return PyFloat_FromDouble( self->m->diffuseB() );
+}
+
+PyObject * FrsMaterial_diffuseA( BPy_FrsMaterial* self) {
+	return PyFloat_FromDouble( self->m->diffuseA() );
+}
+
+PyObject * FrsMaterial_specular( BPy_FrsMaterial* self) {
+	PyObject *tmp;
+	
+	const float *specular = self->m->specular();
+	PyObject *py_specular = PyList_New(4);
+	
+	tmp = PyFloat_FromDouble( specular[0] ); PyList_SetItem( py_specular, 0, tmp); Py_DECREF(tmp);
+	tmp = PyFloat_FromDouble( specular[1] ); PyList_SetItem( py_specular, 1, tmp); Py_DECREF(tmp);
+	tmp = PyFloat_FromDouble( specular[2] ); PyList_SetItem( py_specular, 2, tmp); Py_DECREF(tmp);
+	tmp = PyFloat_FromDouble( specular[3] ); PyList_SetItem( py_specular, 3, tmp); Py_DECREF(tmp);
+	
+	return py_specular;
+}
+
+PyObject * FrsMaterial_specularR( BPy_FrsMaterial* self) {
+	return PyFloat_FromDouble( self->m->specularR() );
+}
+
+PyObject * FrsMaterial_specularG( BPy_FrsMaterial* self) {
+	return PyFloat_FromDouble( self->m->specularG() );
+}
+
+PyObject * FrsMaterial_specularB( BPy_FrsMaterial* self) {
+	return PyFloat_FromDouble( self->m->specularB() );
+}
+
+PyObject * FrsMaterial_specularA( BPy_FrsMaterial* self) {
+	return PyFloat_FromDouble( self->m->specularA() );
+}
+
+PyObject * FrsMaterial_ambient( BPy_FrsMaterial* self) {
+	PyObject *tmp;
+	
+	const float *ambient = self->m->ambient();
+	PyObject *py_ambient = PyList_New(4);
+	
+	tmp = PyFloat_FromDouble( ambient[0] ); PyList_SetItem(	py_ambient, 0, tmp); Py_DECREF(tmp);
+	tmp = PyFloat_FromDouble( ambient[1] ); PyList_SetItem(	py_ambient, 1, tmp); Py_DECREF(tmp);
+	tmp = PyFloat_FromDouble( ambient[2] ); PyList_SetItem(	py_ambient, 2, tmp); Py_DECREF(tmp);
+	tmp = PyFloat_FromDouble( ambient[3] ); PyList_SetItem(	py_ambient, 3, tmp); Py_DECREF(tmp);
+	
+	return py_ambient;
+}
+
+PyObject * FrsMaterial_ambientR( BPy_FrsMaterial* self) {
+	return PyFloat_FromDouble( self->m->ambientR() );
+}
+
+PyObject * FrsMaterial_ambientG( BPy_FrsMaterial* self) {
+	return PyFloat_FromDouble( self->m->ambientG() );
+}
+
+PyObject * FrsMaterial_ambientB( BPy_FrsMaterial* self) {
+	return PyFloat_FromDouble( self->m->ambientB() );
+}
+
+PyObject * FrsMaterial_ambientA( BPy_FrsMaterial* self) {
+	return PyFloat_FromDouble( self->m->ambientA() );
+}
+
+PyObject * FrsMaterial_emission( BPy_FrsMaterial* self) {
+	PyObject *tmp;
+	
+	const float *emission = self->m->emission();
+	PyObject *py_emission = PyList_New(4);
+	
+	tmp = PyFloat_FromDouble( emission[0] ); PyList_SetItem( py_emission, 0, tmp); Py_DECREF(tmp);
+	tmp = PyFloat_FromDouble( emission[1] ); PyList_SetItem( py_emission, 1, tmp); Py_DECREF(tmp);
+	tmp = PyFloat_FromDouble( emission[2] ); PyList_SetItem( py_emission, 2, tmp); Py_DECREF(tmp);
+	tmp = PyFloat_FromDouble( emission[3] ); PyList_SetItem( py_emission, 3, tmp); Py_DECREF(tmp);
+	
+	return py_emission;
+}
+
+PyObject * FrsMaterial_emissionR( BPy_FrsMaterial* self) {
+	return PyFloat_FromDouble( self->m->emissionR() );
+}
+
+PyObject * FrsMaterial_emissionG( BPy_FrsMaterial* self) {
+	return PyFloat_FromDouble( self->m->emissionG() );
+}
+
+PyObject * FrsMaterial_emissionB( BPy_FrsMaterial* self) {
+	return PyFloat_FromDouble( self->m->emissionB() );
+}
+
+PyObject * FrsMaterial_emissionA( BPy_FrsMaterial* self) {
+	return PyFloat_FromDouble( self->m->emissionA() );
+}
+
+PyObject * FrsMaterial_shininess( BPy_FrsMaterial* self) {
+	return PyFloat_FromDouble( self->m->shininess() );
+}
+
+PyObject * FrsMaterial_setDiffuse( BPy_FrsMaterial *self, PyObject *args ) {
+	float f1, f2, f3, f4;
+
+	if(!( PyArg_ParseTuple(args, "ffff", &f1, &f2, &f3, &f4)  )) {
+		cout << "ERROR: FrsMaterial_setDiffuse" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->m->setDiffuse(f1, f2, f3, f4);
+
+	Py_RETURN_NONE;
+}
+ 
+PyObject * FrsMaterial_setSpecular( BPy_FrsMaterial *self, PyObject *args ) {
+	float f1, f2, f3, f4;
+
+	if(!( PyArg_ParseTuple(args, "ffff", &f1, &f2, &f3, &f4)  )) {
+		cout << "ERROR: FrsMaterial_setSpecular" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->m->setSpecular(f1, f2, f3, f4);
+
+	Py_RETURN_NONE;
+}
+
+PyObject * FrsMaterial_setAmbient( BPy_FrsMaterial *self, PyObject *args ) {
+	float f1, f2, f3, f4;
+
+	if(!( PyArg_ParseTuple(args, "ffff", &f1, &f2, &f3, &f4)  )) {
+		cout << "ERROR: FrsMaterial_setAmbient" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->m->setAmbient(f1, f2, f3, f4);
+
+	Py_RETURN_NONE;
+}
+
+PyObject * FrsMaterial_setEmission( BPy_FrsMaterial *self, PyObject *args ) {
+	float f1, f2, f3, f4;
+
+	if(!( PyArg_ParseTuple(args, "ffff", &f1, &f2, &f3, &f4)  )) {
+		cout << "ERROR: FrsMaterial_setEmission" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->m->setEmission(f1, f2, f3, f4);
+
+	Py_RETURN_NONE;
+}
+
+PyObject * FrsMaterial_setShininess( BPy_FrsMaterial *self, PyObject *args ) {
+	float f;
+
+	if(!( PyArg_ParseTuple(args, "f", &f)  )) {
+		cout << "ERROR: FrsMaterial_setShininess" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->m->setShininess(f);
+
+	Py_RETURN_NONE;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/BPy_FrsMaterial.h b/source/blender/freestyle/intern/python/BPy_FrsMaterial.h
new file mode 100644
index 00000000000..90ed6805974
--- /dev/null
+++ b/source/blender/freestyle/intern/python/BPy_FrsMaterial.h
@@ -0,0 +1,36 @@
+#ifndef FREESTYLE_PYTHON_MATERIAL_H
+#define FREESTYLE_PYTHON_MATERIAL_H
+
+#include "../scene_graph/Material.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject FrsMaterial_Type;
+
+#define BPy_FrsMaterial_Check(v)	(( (PyObject *) v)->ob_type == &FrsMaterial_Type)
+
+/*---------------------------Python BPy_FrsMaterial structure definition----------*/
+typedef struct {
+	PyObject_HEAD
+	Material *m;
+} BPy_FrsMaterial;
+
+/*---------------------------Python BPy_FrsMaterial visible prototypes-----------*/
+
+PyMODINIT_FUNC FrsMaterial_Init( PyObject *module );
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* FREESTYLE_PYTHON_MATERIAL_H */
diff --git a/source/blender/freestyle/intern/python/BPy_Interface1D.cpp b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
index 5166fca4aef..509dfb23894 100644
--- a/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
@@ -2,9 +2,13 @@
 
 #include "BPy_Convert.h"
 #include "Interface1D/BPy_Curve.h"
+#include "Interface1D/Curve/BPy_Chain.h"
 #include "Interface1D/BPy_FEdge.h"
+#include "Interface1D/FEdge/BPy_FEdgeSharp.h"
+#include "Interface1D/FEdge/BPy_FEdgeSmooth.h"
 #include "Interface1D/BPy_Stroke.h"
 #include "Interface1D/BPy_ViewEdge.h"
+
 #include "BPy_MediumType.h"
 
 #ifdef __cplusplus
@@ -142,12 +146,27 @@ PyMODINIT_FUNC Interface1D_Init( PyObject *module )
 		return;
 	Py_INCREF( &Curve_Type );
 	PyModule_AddObject(module, "Curve", (PyObject *)&Curve_Type);
+
+	if( PyType_Ready( &Chain_Type ) < 0 )
+		return;
+	Py_INCREF( &Chain_Type );
+	PyModule_AddObject(module, "Chain", (PyObject *)&Chain_Type);
 	
 	if( PyType_Ready( &FEdge_Type ) < 0 )
 		return;
 	Py_INCREF( &FEdge_Type );
 	PyModule_AddObject(module, "FEdge", (PyObject *)&FEdge_Type);
 
+	if( PyType_Ready( &FEdgeSharp_Type ) < 0 )
+		return;
+	Py_INCREF( &FEdgeSharp_Type );
+	PyModule_AddObject(module, "FEdgeSharp", (PyObject *)&FEdgeSharp_Type);
+	
+	if( PyType_Ready( &FEdgeSmooth_Type ) < 0 )
+		return;
+	Py_INCREF( &FEdgeSmooth_Type );
+	PyModule_AddObject(module, "FEdgeSmooth", (PyObject *)&FEdgeSmooth_Type);
+
 	if( PyType_Ready( &Stroke_Type ) < 0 )
 		return;
 	Py_INCREF( &Stroke_Type );
diff --git a/source/blender/freestyle/intern/python/BPy_Material.cpp b/source/blender/freestyle/intern/python/BPy_Material.cpp
deleted file mode 100644
index 459de449336..00000000000
--- a/source/blender/freestyle/intern/python/BPy_Material.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
- PyObject *_wrap_Material_diffuse(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_diffuseR(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_diffuseG(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_diffuseB(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_diffuseA(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_specular(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_specularR(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_specularG(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_specularB(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_specularA(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_ambient(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_ambientR(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_ambientG(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_ambientB(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_ambientA(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_emission(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_emissionR(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_emissionG(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_emissionB(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_emissionA(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_shininess(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_SetDiffuse(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_SetSpecular(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_SetAmbient(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_SetEmission(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_SetShininess(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material___ne__(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material___eq__(PyObject *self , PyObject *args) {
-}
-
-
diff --git a/source/blender/freestyle/intern/python/BPy_Material.h b/source/blender/freestyle/intern/python/BPy_Material.h
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.cpp b/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.cpp
index e69de29bb2d..8b6240986b9 100644
--- a/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.cpp
@@ -0,0 +1,188 @@
+#include "BPy_Chain.h"
+
+#include "../../BPy_Convert.h"
+#include "../../BPy_Id.h"
+#include "../BPy_ViewEdge.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for Chain instance  -----------*/
+static int Chain___init__(BPy_Chain *self, PyObject *args, PyObject *kwds);
+static PyObject * Chain_push_viewedge_back( BPy_Chain *self, PyObject *args );
+static PyObject * Chain_push_viewedge_front( BPy_Chain *self, PyObject *args );
+
+
+/*----------------------Chain instance definitions ----------------------------*/
+static PyMethodDef BPy_Chain_methods[] = {	
+	{"push_viewedge_back", ( PyCFunction ) Chain_push_viewedge_back, METH_VARARGS, "(ViewEdge ve, bool orientation) Adds a ViewEdge at the end of the chain."},
+	{"push_viewedge_front", ( PyCFunction ) Chain_push_viewedge_front, METH_VARARGS, "(ViewEdge ve, bool orientation) Adds a ViewEdge at the beginning of the chain."},
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_Chain type definition ------------------------------*/
+
+PyTypeObject Chain_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"Chain",				/* tp_name */
+	sizeof( BPy_Chain ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_Chain_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&Curve_Type,				/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)Chain___init__,                       	/* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int Chain___init__(BPy_Chain *self, PyObject *args, PyObject *kwds)
+{
+
+	PyObject *obj = 0;
+
+    if (! PyArg_ParseTuple(args, "|O", &obj) )
+        return -1;
+
+	if( !obj ){
+		self->c = new Chain();
+		
+	} else if( BPy_Chain_Check(obj) ) {
+		if( ((BPy_Chain *) obj)->c )
+			self->c = new Chain(*( ((BPy_Chain *) obj)->c ));
+		else
+			return -1;
+		
+	} else if( BPy_Id_Check(obj) ) {
+		if( ((BPy_Id *) obj)->id )
+			self->c = new Chain(*( ((BPy_Id *) obj)->id ));
+		else
+			return -1;
+			
+	} else {
+		return -1;
+	}
+
+	self->py_c.c = self->c;
+	self->py_c.py_if1D.if1D = self->c;
+
+	return 0;
+}
+
+
+PyObject * Chain_push_viewedge_back( BPy_Chain *self, PyObject *args ) {
+	PyObject *obj1 = 0, *obj2 = 0;
+
+	if(!( PyArg_ParseTuple(args, "OO", &obj1, &obj2) &&	BPy_ViewEdge_Check(obj1) && PyBool_Check(obj2) )) {
+		cout << "ERROR: Chain_push_viewedge_back" << endl;
+		Py_RETURN_NONE;
+	}
+
+	ViewEdge *ve = ((BPy_ViewEdge *) obj1)->ve;
+	bool orientation = bool_from_PyBool( obj2 );
+	self->c->push_viewedge_back( ve, orientation);
+
+	Py_RETURN_NONE;
+}
+
+PyObject * Chain_push_viewedge_front( BPy_Chain *self, PyObject *args ) {
+	PyObject *obj1 = 0, *obj2 = 0;
+
+	if(!( PyArg_ParseTuple(args, "OO", &obj1, &obj2) &&	BPy_ViewEdge_Check(obj1) && PyBool_Check(obj2) )) {
+		cout << "ERROR: Chain_push_viewedge_front" << endl;
+		Py_RETURN_NONE;
+	}
+
+	ViewEdge *ve = ((BPy_ViewEdge *) obj1)->ve;
+	bool orientation = bool_from_PyBool( obj2 );
+	self->c->push_viewedge_front(ve, orientation);
+
+	Py_RETURN_NONE;
+}
+
+
+
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.h b/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.h
new file mode 100644
index 00000000000..eaf80033098
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.h
@@ -0,0 +1,31 @@
+#ifndef FREESTYLE_PYTHON_CHAIN_H
+#define FREESTYLE_PYTHON_CHAIN_H
+
+#include "../BPy_Curve.h"
+#include "../../../stroke/Chain.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject Chain_Type;
+
+#define BPy_Chain_Check(v)	(( (PyObject *) v)->ob_type == &Chain_Type)
+
+/*---------------------------Python BPy_Chain structure definition----------*/
+typedef struct {
+	BPy_Curve py_c;
+	Chain *c;
+} BPy_Chain;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_CHAIN_H */
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
index da409ffe209..22a4dbc378e 100644
--- a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
@@ -1,44 +1,250 @@
- PyObject *_wrap_FEdgeSharp_duplicate(PyObject *self , PyObject *args) {
+#include "BPy_FEdgeSharp.h"
+
+#include "../../BPy_Convert.h"
+#include "../../Interface0D/BPy_SVertex.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for FEdgeSharp instance  -----------*/
+static int FEdgeSharp___init__(BPy_FEdgeSharp *self, PyObject *args, PyObject *kwds);
+
+static PyObject * FEdgeSharp_normalA( BPy_FEdgeSharp *self ) ;
+static PyObject * FEdgeSharp_normalB( BPy_FEdgeSharp *self );
+static PyObject * FEdgeSharp_aMaterialIndex( BPy_FEdgeSharp *self ) ;
+static PyObject * FEdgeSharp_bMaterialIndex( BPy_FEdgeSharp *self );
+static PyObject * FEdgeSharp_aMaterial( BPy_FEdgeSharp *self );
+static PyObject * FEdgeSharp_bMaterial( BPy_FEdgeSharp *self );
+static PyObject * FEdgeSharp_setNormalA( BPy_FEdgeSharp *self, PyObject *args );
+static PyObject * FEdgeSharp_setNormalB( BPy_FEdgeSharp *self, PyObject *args );
+static PyObject * FEdgeSharp_setaMaterialIndex( BPy_FEdgeSharp *self, PyObject *args );
+static PyObject * FEdgeSharp_setbMaterialIndex( BPy_FEdgeSharp *self, PyObject *args );
+
+/*----------------------FEdgeSharp instance definitions ----------------------------*/
+static PyMethodDef BPy_FEdgeSharp_methods[] = {	
+	{"normalA", ( PyCFunction ) FEdgeSharp_normalA, METH_NOARGS, "() Returns the normal to the face lying on the right of the FEdge. If this FEdge is a border, it has no Face on its right and therefore, no normal."},
+	{"normalB", ( PyCFunction ) FEdgeSharp_normalB, METH_NOARGS, "() Returns the normal to the face lying on the left of the FEdge."},
+	{"aMaterialIndex", ( PyCFunction ) FEdgeSharp_aMaterialIndex, METH_NOARGS, "() Returns the index of the material of the face lying on the right of the FEdge. If this FEdge is a border, it has no Face on its right and therefore, no material. "},
+	{"bMaterialIndex", ( PyCFunction ) FEdgeSharp_bMaterialIndex, METH_NOARGS, "() Returns the material of the face lying on the left of the FEdge. "},
+	{"aMaterial", ( PyCFunction ) FEdgeSharp_aMaterial, METH_NOARGS, "() Returns the material of the face lying on the right of the FEdge. If this FEdge is a border, it has no Face on its right and therefore, no material."},
+	{"bMaterial", ( PyCFunction ) FEdgeSharp_bMaterial, METH_NOARGS, "() Returns the material of the face lying on the left of the FEdge."},
+	{"setNormalA", ( PyCFunction ) FEdgeSharp_setNormalA, METH_VARARGS, "([x,y,z]) Sets the normal to the face lying on the right of the FEdge."},
+	{"setNormalB", ( PyCFunction ) FEdgeSharp_setNormalB, METH_VARARGS, "([x,y,z]) Sets the normal to the face lying on the left of the FEdge. "},
+	{"setaMaterialIndex", ( PyCFunction ) FEdgeSharp_setaMaterialIndex, METH_VARARGS, "(unsigned int i) Sets the index of the material lying on the right of the FEdge. "},
+	{"setbMaterialIndex", ( PyCFunction ) FEdgeSharp_setbMaterialIndex, METH_VARARGS, "(unsigned int i) Sets the index of the material lying on the left of the FEdge. "},
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_FEdgeSharp type definition ------------------------------*/
+
+PyTypeObject FEdgeSharp_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"FEdgeSharp",				/* tp_name */
+	sizeof( BPy_FEdgeSharp ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_FEdgeSharp_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&FEdge_Type,				/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)FEdgeSharp___init__,                       	/* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int FEdgeSharp___init__(BPy_FEdgeSharp *self, PyObject *args, PyObject *kwds)
+{
+	PyObject *obj1 = 0, *obj2 = 0;
+
+    if (! PyArg_ParseTuple(args, "|OO", &obj1, &obj2) )
+        return -1;
+
+	if( !obj1 ){
+		self->fes = new FEdgeSharp();
+		
+	} else if( BPy_FEdgeSharp_Check(obj1) ) {
+		if( ((BPy_FEdgeSharp *) obj1)->fes )
+			self->fes = new FEdgeSharp(*( ((BPy_FEdgeSharp *) obj1)->fes ));
+		else
+			return -1;
+		
+	} else if( BPy_SVertex_Check(obj1) && BPy_SVertex_Check(obj2) ) {
+		self->fes = new FEdgeSharp( ((BPy_SVertex *) obj1)->sv, ((BPy_SVertex *) obj2)->sv );
+
+	} else {
+		return -1;
+	}
+
+	self->py_fe.fe = self->fes;
+	self->py_fe.py_if1D.if1D = self->fes;
+
+	return 0;
 }
 
 
- PyObject *_wrap_FEdgeSharp_normalA(PyObject *self , PyObject *args) {
+PyObject * FEdgeSharp_normalA( BPy_FEdgeSharp *self ) {
+	Vec3r v( self->fes->normalA() );
+	return Vector_from_Vec3r( v );
 }
 
-
- PyObject *_wrap_FEdgeSharp_normalB(PyObject *self , PyObject *args) {
+PyObject * FEdgeSharp_normalB( BPy_FEdgeSharp *self ) {
+	Vec3r v( self->fes->normalB() );
+	return Vector_from_Vec3r( v );
 }
 
-
- PyObject *_wrap_FEdgeSharp_aMaterialIndex(PyObject *self , PyObject *args) {
+PyObject * FEdgeSharp_aMaterialIndex( BPy_FEdgeSharp *self ) {
+	return PyInt_FromLong( self->fes->aMaterialIndex() );
 }
 
-
- PyObject *_wrap_FEdgeSharp_aMaterial(PyObject *self , PyObject *args) {
+PyObject * FEdgeSharp_bMaterialIndex( BPy_FEdgeSharp *self ) {
+	return PyInt_FromLong( self->fes->bMaterialIndex() );
 }
 
-
- PyObject *_wrap_FEdgeSharp_bMaterialIndex(PyObject *self , PyObject *args) {
+PyObject * FEdgeSharp_aMaterial( BPy_FEdgeSharp *self ) {
+	Material m( self->fes->aMaterial() );
+	return BPy_FrsMaterial_from_Material(m);
 }
 
-
- PyObject *_wrap_FEdgeSharp_bMaterial(PyObject *self , PyObject *args) {
+PyObject * FEdgeSharp_bMaterial( BPy_FEdgeSharp *self ) {
+	Material m( self->fes->aMaterial() );
+	return BPy_FrsMaterial_from_Material(m);
 }
 
+PyObject * FEdgeSharp_setNormalA( BPy_FEdgeSharp *self, PyObject *args ) {
+	PyObject *obj = 0;
 
- PyObject *_wrap_FEdgeSharp_SetNormalA(PyObject *self , PyObject *args) {
+	if(!( PyArg_ParseTuple(args, "O", &obj) && PyList_Check(obj) && PyList_Size(obj) > 2 )) {
+		cout << "ERROR: FEdgeSharp_setNormalA" << endl;
+		Py_RETURN_NONE;
+	}
+	
+	Vec3r v(	PyFloat_AsDouble( PyList_GetItem(obj,0) ),
+				PyFloat_AsDouble( PyList_GetItem(obj,1) ),
+				PyFloat_AsDouble( PyList_GetItem(obj,2) ) );
+
+	self->fes->setNormalA( v );
+
+	Py_RETURN_NONE;
 }
 
+PyObject * FEdgeSharp_setNormalB( BPy_FEdgeSharp *self, PyObject *args ) {
+	PyObject *obj = 0;
 
- PyObject *_wrap_FEdgeSharp_SetNormalB(PyObject *self , PyObject *args) {
+	if(!( PyArg_ParseTuple(args, "O", &obj) && PyList_Check(obj) && PyList_Size(obj) > 2 )) {
+		cout << "ERROR: FEdgeSharp_setNormalB" << endl;
+		Py_RETURN_NONE;
+	}
+	
+	Vec3r v(	PyFloat_AsDouble( PyList_GetItem(obj,0) ),
+				PyFloat_AsDouble( PyList_GetItem(obj,1) ),
+				PyFloat_AsDouble( PyList_GetItem(obj,2) ) );
+
+	self->fes->setNormalB( v );
+
+	Py_RETURN_NONE;
 }
 
+PyObject * FEdgeSharp_setaMaterialIndex( BPy_FEdgeSharp *self, PyObject *args ) {
+	unsigned int i;
 
- PyObject *_wrap_FEdgeSharp_SetaMaterialIndex(PyObject *self , PyObject *args) {
+	if(!( PyArg_ParseTuple(args, "I", &i) )) {
+		cout << "ERROR: FEdgeSharp_setaMaterialIndex" << endl;
+		Py_RETURN_NONE;
+	}
+	
+	self->fes->setaMaterialIndex( i );
+
+	Py_RETURN_NONE;
 }
 
+PyObject * FEdgeSharp_setbMaterialIndex( BPy_FEdgeSharp *self, PyObject *args ) {
+	unsigned int i;
 
- PyObject *_wrap_FEdgeSharp_SetbMaterialIndex(PyObject *self , PyObject *args) {
+	if(!( PyArg_ParseTuple(args, "I", &i) )) {
+		cout << "ERROR: FEdgeSharp_setbMaterialIndex" << endl;
+		Py_RETURN_NONE;
+	}
+	
+	self->fes->setbMaterialIndex( i );
+
+	Py_RETURN_NONE;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.h b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.h
new file mode 100644
index 00000000000..d08ef006941
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.h
@@ -0,0 +1,31 @@
+#ifndef FREESTYLE_PYTHON_FEDGESHARP_H
+#define FREESTYLE_PYTHON_FEDGESHARP_H
+
+#include "../BPy_FEdge.h"
+#include "../../../view_map/Silhouette.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject FEdgeSharp_Type;
+
+#define BPy_FEdgeSharp_Check(v)	(( (PyObject *) v)->ob_type == &FEdgeSharp_Type)
+
+/*---------------------------Python BPy_FEdgeSharp structure definition----------*/
+typedef struct {
+	BPy_FEdge py_fe;
+	FEdgeSharp *fes;
+} BPy_FEdgeSharp;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_FEDGESHARP_H */
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp
index e453bbdc863..6a11b6c1e98 100644
--- a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp
@@ -1,32 +1,198 @@
- PyObject *_wrap_FEdgeSmooth_dupplicate(PyObject *self , PyObject *args) {
+#include "BPy_FEdgeSmooth.h"
+
+#include "../../BPy_Convert.h"
+#include "../../Interface0D/BPy_SVertex.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for FEdgeSmooth instance  -----------*/
+static int FEdgeSmooth___init__(BPy_FEdgeSmooth *self, PyObject *args, PyObject *kwds);
+
+static PyObject * FEdgeSmooth_normal( BPy_FEdgeSmooth *self ) ;
+static PyObject * FEdgeSmooth_materialIndex( BPy_FEdgeSmooth *self ) ;
+static PyObject * FEdgeSmooth_material( BPy_FEdgeSmooth *self );
+static PyObject * FEdgeSmooth_setNormal( BPy_FEdgeSmooth *self, PyObject *args );
+static PyObject * FEdgeSmooth_setMaterialIndex( BPy_FEdgeSmooth *self, PyObject *args );
+
+
+/*----------------------FEdgeSmooth instance definitions ----------------------------*/
+static PyMethodDef BPy_FEdgeSmooth_methods[] = {	
+	{"normal", ( PyCFunction ) FEdgeSmooth_normal, METH_NOARGS, "() Returns the normal to the Face it is running accross."},
+	{"materialIndex", ( PyCFunction ) FEdgeSmooth_materialIndex, METH_NOARGS, "() Returns the index of the material of the face it is running accross. "},
+	{"aMaterial", ( PyCFunction ) FEdgeSmooth_material, METH_NOARGS, "() Returns the material of the face it is running accross. "},
+	{"setNormalA", ( PyCFunction ) FEdgeSmooth_setNormal, METH_VARARGS, "([x,y,z]) Sets the normal to the Face it is running accross."},
+	{"setaMaterialIndex", ( PyCFunction ) FEdgeSmooth_setMaterialIndex, METH_VARARGS, "(unsigned int i) Sets the index of the material of the face it is running accross. "},
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_FEdgeSmooth type definition ------------------------------*/
+
+PyTypeObject FEdgeSmooth_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"FEdgeSmooth",				/* tp_name */
+	sizeof( BPy_FEdgeSmooth ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_FEdgeSmooth_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&FEdge_Type,				/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)FEdgeSmooth___init__,                       	/* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+
+int FEdgeSmooth___init__(BPy_FEdgeSmooth *self, PyObject *args, PyObject *kwds)
+{
+	PyObject *obj1 = 0, *obj2 = 0;
+
+    if (! PyArg_ParseTuple(args, "|OO", &obj1, &obj2) )
+        return -1;
+
+	if( !obj1 ){
+		self->fes = new FEdgeSmooth();
+		
+	} else if( BPy_FEdgeSmooth_Check(obj1) ) {
+		if( ((BPy_FEdgeSmooth *) obj1)->fes )
+			self->fes = new FEdgeSmooth(*( ((BPy_FEdgeSmooth *) obj1)->fes ));
+		else
+			return -1;
+		
+	} else if( BPy_SVertex_Check(obj1) && BPy_SVertex_Check(obj2) ) {
+		self->fes = new FEdgeSmooth( ((BPy_SVertex *) obj1)->sv, ((BPy_SVertex *) obj2)->sv );
+
+	} else {
+		return -1;
+	}
+
+	self->py_fe.fe = self->fes;
+	self->py_fe.py_if1D.if1D = self->fes;
+
+	return 0;
+}
+
+PyObject * FEdgeSmooth_normal( BPy_FEdgeSmooth *self ) {
+	Vec3r v( self->fes->normal() );
+	return Vector_from_Vec3r( v );
+}
+
+PyObject * FEdgeSmooth_materialIndex( BPy_FEdgeSmooth *self ) {
+	return PyInt_FromLong( self->fes->materialIndex() );
 }
 
 
- PyObject *_wrap_FEdgeSmooth_face(PyObject *self , PyObject *args) {
+PyObject * FEdgeSmooth_material( BPy_FEdgeSmooth *self ) {
+	Material m( self->fes->material() );
+	return BPy_FrsMaterial_from_Material(m);
 }
 
+PyObject * FEdgeSmooth_setNormal( BPy_FEdgeSmooth *self, PyObject *args ) {
+	PyObject *obj = 0;
 
- PyObject *_wrap_FEdgeSmooth_normal(PyObject *self , PyObject *args) {
+	if(!( PyArg_ParseTuple(args, "O", &obj) && PyList_Check(obj) && PyList_Size(obj) > 2 )) {
+		cout << "ERROR: FEdgeSmooth_setNormal" << endl;
+		Py_RETURN_NONE;
+	}
+	
+	Vec3r v(	PyFloat_AsDouble( PyList_GetItem(obj,0) ),
+				PyFloat_AsDouble( PyList_GetItem(obj,1) ),
+				PyFloat_AsDouble( PyList_GetItem(obj,2) ) );
+
+	self->fes->setNormal( v );
+
+	Py_RETURN_NONE;
 }
 
+PyObject * FEdgeSmooth_setMaterialIndex( BPy_FEdgeSmooth *self, PyObject *args ) {
+	unsigned int i;
 
- PyObject *_wrap_FEdgeSmooth_materialIndex(PyObject *self , PyObject *args) {
+	if(!( PyArg_ParseTuple(args, "I", &i) )) {
+		cout << "ERROR: FEdgeSmooth_setMaterialIndex" << endl;
+		Py_RETURN_NONE;
+	}
+	
+	self->fes->setMaterialIndex( i );
+
+	Py_RETURN_NONE;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_FEdgeSmooth_material(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_FEdgeSmooth_SetFace(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdgeSmooth_SetNormal(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_FEdgeSmooth_SetMaterialIndex(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.h b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.h
new file mode 100644
index 00000000000..6b26f65d81c
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.h
@@ -0,0 +1,31 @@
+#ifndef FREESTYLE_PYTHON_FEDGESMOOTH_H
+#define FREESTYLE_PYTHON_FEDGESMOOTH_H
+
+#include "../BPy_FEdge.h"
+#include "../../../view_map/Silhouette.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject FEdgeSmooth_Type;
+
+#define BPy_FEdgeSmooth_Check(v)	(( (PyObject *) v)->ob_type == &FEdgeSmooth_Type)
+
+/*---------------------------Python BPy_FEdgeSmooth structure definition----------*/
+typedef struct {
+	BPy_FEdge py_fe;
+	FEdgeSmooth *fes;
+} BPy_FEdgeSmooth;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_FEDGESMOOTH_H */

From 4a8aa06a1477f044dd41518d4a8ac633f32f653c Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Sat, 26 Jul 2008 10:45:11 +0000
Subject: [PATCH 142/252] Merge from trunk revs. 15635:15771

---
 .../blender/makesdna/DNA_makesdna.vcproj      |    3 +
 projectfiles_vc7/blender/src/BL_src.vcproj    |   15 +
 source/blender/blenkernel/BKE_global.h        |    2 +
 source/blender/blenkernel/BKE_idprop.h        |    1 +
 .../blenkernel/bad_level_call_stubs/stubs.c   |    3 +-
 source/blender/blenkernel/intern/collision.c  |    3 +
 source/blender/blenkernel/intern/idprop.c     |   15 +-
 source/blender/blenkernel/intern/lattice.c    |    5 +-
 .../blenkernel/intern/particle_system.c       |    5 +-
 source/blender/blenkernel/intern/scene.c      |    2 +-
 source/blender/blenkernel/intern/softbody.c   |    6 +-
 source/blender/blenlib/intern/arithb.c        |    5 -
 source/blender/blenloader/intern/readfile.c   |   83 +-
 source/blender/blenloader/intern/writefile.c  |   35 +-
 source/blender/include/BDR_drawaction.h       |    3 +
 source/blender/include/BDR_gpencil.h          |   74 +
 source/blender/include/BIF_drawgpencil.h      |   44 +
 source/blender/include/BIF_editaction.h       |   34 +-
 source/blender/include/BIF_space.h            |    8 +-
 source/blender/include/BSE_drawview.h         |    1 +
 source/blender/include/BSE_editaction_types.h |    6 +-
 source/blender/include/transform.h            |    1 +
 source/blender/makesdna/DNA_ID.h              |    3 +-
 source/blender/makesdna/DNA_action_types.h    |   19 +-
 source/blender/makesdna/DNA_actuator_types.h  |    6 +-
 source/blender/makesdna/DNA_gpencil_types.h   |  143 ++
 source/blender/makesdna/DNA_sequence_types.h  |    1 +
 source/blender/makesdna/DNA_space_types.h     |    8 +
 source/blender/makesdna/DNA_view3d_types.h    |   15 +-
 source/blender/makesdna/intern/makesdna.c     |    2 +
 .../nodes/intern/SHD_nodes/SHD_material.c     |    3 -
 source/blender/nodes/intern/SHD_util.c        |    4 +-
 source/blender/nodes/intern/SHD_util.h        |   13 +-
 source/blender/python/BPY_interface.c         |    2 +
 source/blender/python/api2_2x/Blender.c       |    2 +-
 source/blender/python/api2_2x/IDProp.c        |   57 +-
 source/blender/python/api2_2x/Library.c       |   69 +
 source/blender/python/api2_2x/Particle.c      |  468 +++++--
 source/blender/python/api2_2x/doc/IDProp.py   |    4 +-
 source/blender/python/api2_2x/doc/Ipo.py      |    4 +-
 source/blender/python/api2_2x/doc/LibData.py  |   42 +-
 source/blender/python/api2_2x/doc/Particle.py |  229 +---
 source/blender/python/api2_2x/sceneRender.c   |    4 +-
 .../render/intern/source/shadeoutput.c        |    2 +
 source/blender/src/buttons_editing.c          |    2 +-
 source/blender/src/buttons_logic.c            |   14 +-
 source/blender/src/drawaction.c               |  227 +++-
 source/blender/src/drawgpencil.c              |  673 +++++++++
 source/blender/src/drawnode.c                 |   77 ++
 source/blender/src/drawobject.c               |    5 +
 source/blender/src/drawseq.c                  |   97 +-
 source/blender/src/drawview.c                 |  120 +-
 source/blender/src/editaction.c               |  453 ++++++-
 source/blender/src/editaction_gpencil.c       |  548 ++++++++
 source/blender/src/editnode.c                 |   51 +-
 source/blender/src/editseq.c                  |   34 +-
 source/blender/src/gpencil.c                  | 1197 +++++++++++++++++
 source/blender/src/header_action.c            |  364 +++--
 source/blender/src/header_node.c              |   10 +
 source/blender/src/header_seq.c               |   13 +-
 source/blender/src/header_view3d.c            |    4 +
 source/blender/src/interface.c                |    5 +
 source/blender/src/interface_draw.c           |    2 +-
 source/blender/src/outliner.c                 |   64 +
 source/blender/src/space.c                    |   51 +-
 source/blender/src/transform_conversions.c    |  223 ++-
 source/blender/src/transform_generics.c       |    9 +
 source/blender/src/usiblender.c               |    2 +-
 .../BlenderRoutines/KX_BlenderCanvas.cpp      |   12 +
 .../BlenderRoutines/KX_BlenderCanvas.h        |    5 +
 .../Converter/BL_BlenderDataConversion.cpp    |   10 +-
 .../Converter/BL_DeformableGameObject.h       |    1 +
 .../Converter/BL_ShapeActionActuator.cpp      |   59 +-
 .../Converter/BL_ShapeActionActuator.h        |   16 +-
 .../Converter/KX_ConvertActuators.cpp         |   16 +-
 source/gameengine/Converter/KX_IpoConvert.cpp |   59 +-
 source/gameengine/Converter/KX_IpoConvert.h   |    2 +-
 .../GameLogic/SCA_ActuatorSensor.cpp          |    5 +-
 .../gameengine/GameLogic/SCA_ActuatorSensor.h |    2 +-
 .../gameengine/GameLogic/SCA_ILogicBrick.cpp  |    5 +-
 source/gameengine/GameLogic/SCA_ILogicBrick.h |    3 +
 source/gameengine/GameLogic/SCA_ISensor.cpp   |   27 +-
 source/gameengine/GameLogic/SCA_ISensor.h     |   10 +-
 .../GameLogic/SCA_PropertyActuator.cpp        |   33 +-
 .../GameLogic/SCA_PropertyActuator.h          |    8 +-
 .../gameengine/GamePlayer/common/GPC_Canvas.h |    6 +
 .../Ketsji/KX_BulletPhysicsController.cpp     |   23 +-
 .../Ketsji/KX_BulletPhysicsController.h       |    6 +-
 .../gameengine/Ketsji/KX_CameraActuator.cpp   |   62 +-
 source/gameengine/Ketsji/KX_CameraActuator.h  |    8 +-
 .../Ketsji/KX_ConstraintActuator.cpp          |  131 +-
 .../gameengine/Ketsji/KX_ConstraintActuator.h |   28 +-
 source/gameengine/Ketsji/KX_GameObject.cpp    |  127 +-
 source/gameengine/Ketsji/KX_GameObject.h      |    3 +
 .../gameengine/Ketsji/KX_IPhysicsController.h |    3 +-
 source/gameengine/Ketsji/KX_IpoActuator.cpp   |   44 +-
 source/gameengine/Ketsji/KX_IpoActuator.h     |   12 +-
 .../Ketsji/KX_MaterialIpoController.cpp       |    1 +
 .../Ketsji/KX_MaterialIpoController.h         |    8 +-
 .../gameengine/Ketsji/KX_ObjectActuator.cpp   |   77 +-
 source/gameengine/Ketsji/KX_ObjectActuator.h  |   22 +-
 .../Ketsji/KX_OdePhysicsController.cpp        |    3 +-
 .../Ketsji/KX_OdePhysicsController.h          |    2 +-
 .../gameengine/Ketsji/KX_ParentActuator.cpp   |   51 +-
 source/gameengine/Ketsji/KX_ParentActuator.h  |    7 +-
 source/gameengine/Ketsji/KX_PyMath.h          |   23 +-
 source/gameengine/Ketsji/KX_PythonInit.cpp    |    9 +
 source/gameengine/Ketsji/KX_RadarSensor.cpp   |    6 +-
 .../Ketsji/KX_SCA_AddObjectActuator.cpp       |   11 +
 .../Ketsji/KX_SCA_AddObjectActuator.h         |    3 +
 source/gameengine/Ketsji/KX_Scene.cpp         |   52 +-
 source/gameengine/Ketsji/KX_SceneActuator.cpp |   45 +-
 source/gameengine/Ketsji/KX_SceneActuator.h   |    3 +
 .../Ketsji/KX_SumoPhysicsController.cpp       |    3 +-
 .../Ketsji/KX_SumoPhysicsController.h         |    2 +-
 .../gameengine/Ketsji/KX_TrackToActuator.cpp  |   20 +-
 source/gameengine/Ketsji/KX_TrackToActuator.h |    1 +
 .../Physics/Bullet/CcdPhysicsController.cpp   |   34 +-
 .../Physics/Bullet/CcdPhysicsController.h     |    5 +-
 .../Physics/Bullet/CcdPhysicsEnvironment.cpp  |   32 +
 .../Physics/Bullet/CcdPhysicsEnvironment.h    |    9 +
 .../PyDoc/BL_ShapeActionActuator.py           |  158 +++
 source/gameengine/PyDoc/KX_ActuatorSensor.py  |   24 +
 .../gameengine/PyDoc/KX_ConstraintActuator.py |  120 +-
 source/gameengine/PyDoc/KX_GameObject.py      |   12 +
 source/gameengine/PyDoc/KX_IpoActuator.py     |   19 +-
 source/gameengine/PyDoc/KX_ObjectActuator.py  |  104 +-
 source/gameengine/PyDoc/KX_StateActuator.py   |   26 +
 source/gameengine/PyDoc/SCA_ISensor.py        |   18 +
 .../Rasterizer/RAS_2DFilterManager.cpp        |   25 +-
 .../Rasterizer/RAS_2DFilterManager.h          |    2 +-
 source/gameengine/Rasterizer/RAS_ICanvas.h    |    8 +
 .../Rasterizer/RAS_IPolygonMaterial.cpp       |    5 +
 .../Rasterizer/RAS_IPolygonMaterial.h         |    1 +
 .../gameengine/Rasterizer/RAS_MeshObject.cpp  |   15 +-
 source/gameengine/Rasterizer/RAS_MeshObject.h |    1 +
 136 files changed, 6316 insertions(+), 1076 deletions(-)
 create mode 100644 source/blender/include/BDR_gpencil.h
 create mode 100644 source/blender/include/BIF_drawgpencil.h
 create mode 100644 source/blender/makesdna/DNA_gpencil_types.h
 create mode 100644 source/blender/src/drawgpencil.c
 create mode 100644 source/blender/src/editaction_gpencil.c
 create mode 100644 source/blender/src/gpencil.c
 create mode 100644 source/gameengine/PyDoc/BL_ShapeActionActuator.py
 create mode 100644 source/gameengine/PyDoc/KX_ActuatorSensor.py
 create mode 100644 source/gameengine/PyDoc/KX_StateActuator.py

diff --git a/projectfiles_vc7/blender/makesdna/DNA_makesdna.vcproj b/projectfiles_vc7/blender/makesdna/DNA_makesdna.vcproj
index 04d964ba657..6ad16dec52c 100644
--- a/projectfiles_vc7/blender/makesdna/DNA_makesdna.vcproj
+++ b/projectfiles_vc7/blender/makesdna/DNA_makesdna.vcproj
@@ -471,6 +471,9 @@ DNA_makesdna.exe dna.c
 			<File
 				RelativePath="..\..\..\source\blender\makesdna\DNA_fileglobal_types.h">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\makesdna\DNA_gpencil_types.h">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\makesdna\DNA_group_types.h">
 			</File>
diff --git a/projectfiles_vc7/blender/src/BL_src.vcproj b/projectfiles_vc7/blender/src/BL_src.vcproj
index 226bedbbfd8..153d9a90b23 100644
--- a/projectfiles_vc7/blender/src/BL_src.vcproj
+++ b/projectfiles_vc7/blender/src/BL_src.vcproj
@@ -181,6 +181,9 @@
 			<File
 				RelativePath="..\..\..\source\blender\src\drawdeps.c">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\src\drawgpencil.c">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\src\drawimage.c">
 			</File>
@@ -232,6 +235,9 @@
 			<File
 				RelativePath="..\..\..\source\blender\src\editaction.c">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\src\editaction_gpencil.c">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\src\editarmature.c">
 			</File>
@@ -349,6 +355,9 @@
 			<File
 				RelativePath="..\..\..\source\blender\src\glutil.c">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\src\gpencil.c">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\src\hddaudio.c">
 			</File>
@@ -617,6 +626,9 @@
 			<File
 				RelativePath="..\..\..\source\blender\include\BDR_editobject.h">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\include\BDR_gpencil.h">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\include\BDR_imagepaint.h">
 			</File>
@@ -635,6 +647,9 @@
 			<File
 				RelativePath="..\..\..\source\blender\include\BIF_cursors.h">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\include\BIF_drawgpencil.h">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\include\BIF_drawimage.h">
 			</File>
diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.h
index 62289d227c7..8c9634cba06 100644
--- a/source/blender/blenkernel/BKE_global.h
+++ b/source/blender/blenkernel/BKE_global.h
@@ -175,6 +175,7 @@ typedef struct Global {
 #define G_WEIGHTPAINT	(1 << 15)	
 #define G_TEXTUREPAINT	(1 << 16)
 /* #define G_NOFROZEN	(1 << 17) also removed */
+#define G_GREASEPENCIL 	(1 << 17)
 #define G_DRAWEDGES		(1 << 18)
 #define G_DRAWCREASES	(1 << 19)
 #define G_DRAWSEAMS     (1 << 20)
@@ -265,3 +266,4 @@ extern Global G;
 	
 #endif
 
+
diff --git a/source/blender/blenkernel/BKE_idprop.h b/source/blender/blenkernel/BKE_idprop.h
index 2d7d0e9286f..2274c54ad3b 100644
--- a/source/blender/blenkernel/BKE_idprop.h
+++ b/source/blender/blenkernel/BKE_idprop.h
@@ -46,6 +46,7 @@ struct ID;
 typedef union {
 	int i;
 	float f;
+	double d;
 	char *str;
 	struct ID *id;
 	struct {
diff --git a/source/blender/blenkernel/bad_level_call_stubs/stubs.c b/source/blender/blenkernel/bad_level_call_stubs/stubs.c
index c913820205b..0feb055eec9 100644
--- a/source/blender/blenkernel/bad_level_call_stubs/stubs.c
+++ b/source/blender/blenkernel/bad_level_call_stubs/stubs.c
@@ -1,4 +1,3 @@
-
 /**
  * $Id$
  *
@@ -356,6 +355,8 @@ TimeMarker *get_frame_marker(int frame){return 0;};
 /* editseq.c */
 Sequence *get_forground_frame_seq(int frame){return 0;};
 void set_last_seq(Sequence *seq){};
+void clear_last_seq(Sequence *seq){};
+    
 
 /* modifier.c stub */
 void harmonic_coordinates_bind(struct MeshDeformModifierData *mmd,
diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c
index 26c5d186d87..6dfb77504fb 100644
--- a/source/blender/blenkernel/intern/collision.c
+++ b/source/blender/blenkernel/intern/collision.c
@@ -1437,6 +1437,9 @@ CollisionModifierData **get_collisionobjects(Object *self, int *numcollobj)
 
 					if(coll_ob == self)
 						continue;
+					
+					if( !collmd->bvhtree)
+						continue;
 
 					if(numobj >= maxobj)
 					{
diff --git a/source/blender/blenkernel/intern/idprop.c b/source/blender/blenkernel/intern/idprop.c
index 2ef2f3a1b77..b16f52571f6 100644
--- a/source/blender/blenkernel/intern/idprop.c
+++ b/source/blender/blenkernel/intern/idprop.c
@@ -54,7 +54,8 @@ static char idp_size_table[] = {
 	sizeof(float)*16, /*Matrix type, deprecated*/
 	0, /*arrays don't have a fixed size*/
 	sizeof(ListBase), /*Group type*/
-	sizeof(void*)
+	sizeof(void*),
+	sizeof(double)
 };
 
 
@@ -365,10 +366,14 @@ IDProperty *IDP_New(int type, IDPropertyTemplate val, char *name)
 			prop = MEM_callocN(sizeof(IDProperty), "IDProperty float");
 			*(float*)&prop->data.val = val.f;
 			break;
+		case IDP_DOUBLE:
+			prop = MEM_callocN(sizeof(IDProperty), "IDProperty float");
+			*(double*)&prop->data.val = val.d;
+			break;		
 		case IDP_ARRAY:
 		{
-			/*for now, we only support float and int arrays*/
-			if (val.array.type == IDP_FLOAT || val.array.type == IDP_INT) {
+			/*for now, we only support float and int and double arrays*/
+			if (val.array.type == IDP_FLOAT || val.array.type == IDP_INT || val.array.type == IDP_DOUBLE) {
 				prop = MEM_callocN(sizeof(IDProperty), "IDProperty array");
 				prop->len = prop->totallen = val.array.len;
 				prop->subtype = val.array.type;
@@ -411,6 +416,10 @@ IDProperty *IDP_New(int type, IDPropertyTemplate val, char *name)
 
 	prop->type = type;
 	strncpy(prop->name, name, MAX_IDPROP_NAME);
+	
+	/*security null byte*/
+	prop->name[MAX_IDPROP_NAME-1] = 0;
+	
 	return prop;
 }
 
diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c
index e8bcae42d5a..54915058bab 100644
--- a/source/blender/blenkernel/intern/lattice.c
+++ b/source/blender/blenkernel/intern/lattice.c
@@ -915,7 +915,10 @@ void lattice_calc_modifiers(Object *ob)
 		mti->deformVerts(md, ob, NULL, vertexCos, numVerts);
 	}
 
-	if (vertexCos) {
+	/* always displist to make this work like derivedmesh */
+	if (!vertexCos) vertexCos = lattice_getVertexCos(ob, &numVerts);
+	
+	{
 		DispList *dl = MEM_callocN(sizeof(*dl), "lt_dl");
 		dl->type = DL_VERTS;
 		dl->parts = 1;
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index f70648965f4..7dca87d5c13 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -2797,7 +2797,10 @@ void do_effectors(int pa_no, ParticleData *pa, ParticleKey *state, Object *ob, P
 				epart= epsys->part;
 				pd= epart->pd;
 				totepart= epsys->totpart;
-
+				
+				if(totepart <= 0)
+					continue;
+				
 				if(pd->forcefield==PFIELD_HARMONIC){
 					/* every particle is mapped to only one harmonic effector particle */
 					p= pa_no%epsys->totpart;
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 2898dca767c..553107dd264 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -303,7 +303,7 @@ void set_scene_bg(Scene *sce)
 	int flag;
 	
 	// Note: this here is defined in editseq.c (BIF_editseq.h), NOT in blenkernel! 
-	set_last_seq(NULL);
+	clear_last_seq();
 	
 	G.scene= sce;
 	
diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c
index 9005db1312f..d5b5ab6d63e 100644
--- a/source/blender/blenkernel/intern/softbody.c
+++ b/source/blender/blenkernel/intern/softbody.c
@@ -2053,7 +2053,6 @@ static void softbody_calc_forces(Object *ob, float forcetime, float timenow, int
 	
 	/* check conditions for various options */
 	do_deflector= query_external_colliders(ob);
-	do_effector= pdInitEffectors(ob,NULL);
 	do_selfcollision=((ob->softflag & OB_SB_EDGES) && (sb->bspring)&& (ob->softflag & OB_SB_SELF));
 	do_springcollision=do_deflector && (ob->softflag & OB_SB_EDGES) &&(ob->softflag & OB_SB_EDGECOLL);
 	do_aero=((sb->aeroedge)&& (ob->softflag & OB_SB_EDGES));
@@ -2061,9 +2060,10 @@ static void softbody_calc_forces(Object *ob, float forcetime, float timenow, int
 	iks  = 1.0f/(1.0f-sb->inspring)-1.0f ;/* inner spring constants function */
 	bproot= sb->bpoint; /* need this for proper spring addressing */
 	
-
-	
 	if (do_springcollision || do_aero)  scan_for_ext_spring_forces(ob,timenow);
+	/* after spring scan because it uses Effoctors too */
+	do_effector= pdInitEffectors(ob,NULL);
+
 	if (do_deflector) {
 		float defforce[3];
 		do_deflector = sb_detect_aabb_collisionCached(defforce,ob->lay,ob,timenow);
diff --git a/source/blender/blenlib/intern/arithb.c b/source/blender/blenlib/intern/arithb.c
index b7598ec0c4d..8bd7ad405af 100644
--- a/source/blender/blenlib/intern/arithb.c
+++ b/source/blender/blenlib/intern/arithb.c
@@ -2536,11 +2536,6 @@ int IsectPQ2Df(float pt[2], float v1[2], float v2[2], float v3[2], float v4[2])
 }
 
 
-
-			/* copied from Geometry.c - todo - move to arithb.c or some other generic place we can reuse */
-#define SIDE_OF_LINE(pa,pb,pp)	((pa[0]-pp[0])*(pb[1]-pp[1]))-((pb[0]-pp[0])*(pa[1]-pp[1]))
-#define POINT_IN_TRI(p0,p1,p2,p3)	((SIDE_OF_LINE(p1,p2,p0)>=0) && (SIDE_OF_LINE(p2,p3,p0)>=0) && (SIDE_OF_LINE(p3,p1,p0)>=0))
-
 /**
  * 
  * @param min 
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 3c629818b2d..ad004dd5c82 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -69,6 +69,7 @@
 #include "DNA_effect_types.h"
 #include "DNA_fileglobal_types.h"
 #include "DNA_group_types.h"
+#include "DNA_gpencil_types.h"
 #include "DNA_ipo_types.h"
 #include "DNA_image_types.h"
 #include "DNA_key_types.h"
@@ -1346,8 +1347,14 @@ void IDP_DirectLinkArray(IDProperty *prop, int switch_endian, void *fd)
 	prop->data.pointer = newdataadr(fd, prop->data.pointer);
 
 	if (switch_endian) {
-		for (i=0; i<prop->len; i++) {
-			SWITCH_INT(((int*)prop->data.pointer)[i]);
+		if (prop->subtype != IDP_DOUBLE) {
+			for (i=0; i<prop->len; i++) {
+				SWITCH_INT(((int*)prop->data.pointer)[i]);
+			}
+		} else {
+			for (i=0; i<prop->len; i++) {
+				SWITCH_LONGINT(((double*)prop->data.pointer)[i]);
+			}
 		}
 	}
 }
@@ -1383,6 +1390,24 @@ void IDP_DirectLinkProperty(IDProperty *prop, int switch_endian, void *fd)
 			break;
 		case IDP_ARRAY:
 			IDP_DirectLinkArray(prop, switch_endian, fd);
+			break;
+		case IDP_DOUBLE:
+			/*erg, stupid doubles.  since I'm storing them
+			 in the same field as int val; val2 in the
+			 IDPropertyData struct, they have to deal with
+			 endianness specifically
+			 
+			 in theory, val and val2 would've already been swapped
+			 if switch_endian is true, so we have to first unswap
+			 them then reswap them as a single 64-bit entity.
+			 */
+			
+			if (switch_endian) {
+				SWITCH_INT(prop->data.val);
+				SWITCH_INT(prop->data.val2);
+				SWITCH_LONGINT(prop->data.val);
+			}
+			
 			break;
 	}
 }
@@ -3698,6 +3723,32 @@ static void lib_link_screen_sequence_ipos(Main *main)
 
 /* ************ READ SCREEN ***************** */
 
+/* relinks grease-pencil data for 3d-view(s) - used for direct_link */
+static void link_gpencil(FileData *fd, bGPdata *gpd)
+{
+	bGPDlayer *gpl;
+	bGPDframe *gpf;
+	bGPDstroke *gps;
+	
+	/* relink layers */
+	link_list(fd, &gpd->layers);
+	
+	for (gpl= gpd->layers.first; gpl; gpl= gpl->next) {
+		/* relink frames */
+		link_list(fd, &gpl->frames);
+		gpl->actframe= newdataadr(fd, gpl->actframe);
+		
+		for (gpf= gpl->frames.first; gpf; gpf= gpf->next) {
+			/* relink strokes (and their points) */
+			link_list(fd, &gpf->strokes);
+			
+			for (gps= gpf->strokes.first; gps; gps= gps->next) {
+				gps->points= newdataadr(fd, gps->points);
+			}
+		}
+	}
+}
+
 /* note: file read without screens option G_FILE_NO_UI; 
    check lib pointers in call below */
 static void lib_link_screen(FileData *fd, Main *main)
@@ -3709,23 +3760,23 @@ static void lib_link_screen(FileData *fd, Main *main)
 		if(sc->id.flag & LIB_NEEDLINK) {
 			sc->id.us= 1;
 			sc->scene= newlibadr(fd, sc->id.lib, sc->scene);
-
+			
 			sa= sc->areabase.first;
 			while(sa) {
 				SpaceLink *sl;
-
+				
 				sa->full= newlibadr(fd, sc->id.lib, sa->full);
-
+				
 				/* space handler scriptlinks */
 				lib_link_scriptlink(fd, &sc->id, &sa->scriptlink);
-
+				
 				for (sl= sa->spacedata.first; sl; sl= sl->next) {
 					if(sl->spacetype==SPACE_VIEW3D) {
 						View3D *v3d= (View3D*) sl;
-
+						
 						v3d->camera= newlibadr(fd, sc->id.lib, v3d->camera);
 						v3d->ob_centre= newlibadr(fd, sc->id.lib, v3d->ob_centre);
-
+						
 						if(v3d->bgpic) {
 							v3d->bgpic->ima= newlibadr_us(fd, sc->id.lib, v3d->bgpic->ima);
 						}
@@ -4081,6 +4132,10 @@ static void direct_link_screen(FileData *fd, bScreen *sc)
 				v3d->bgpic= newdataadr(fd, v3d->bgpic);
 				if(v3d->bgpic)
 					v3d->bgpic->iuser.ok= 1;
+				if(v3d->gpd) {
+					v3d->gpd= newdataadr(fd, v3d->gpd);
+					link_gpencil(fd, v3d->gpd);
+				}
 				v3d->localvd= newdataadr(fd, v3d->localvd);
 				v3d->afterdraw.first= v3d->afterdraw.last= NULL;
 				v3d->clipbb= newdataadr(fd, v3d->clipbb);
@@ -4115,9 +4170,21 @@ static void direct_link_screen(FileData *fd, bScreen *sc)
 			}
 			else if(sl->spacetype==SPACE_NODE) {
 				SpaceNode *snode= (SpaceNode *)sl;
+				
+				if(snode->gpd) {
+					snode->gpd= newdataadr(fd, snode->gpd);
+					link_gpencil(fd, snode->gpd);
+				}
 				snode->nodetree= snode->edittree= NULL;
 				snode->flag |= SNODE_DO_PREVIEW;
 			}
+			else if(sl->spacetype==SPACE_SEQ) {
+				SpaceSeq *sseq= (SpaceSeq *)sl;
+				if(sseq->gpd) {
+					sseq->gpd= newdataadr(fd, sseq->gpd);
+					link_gpencil(fd, sseq->gpd);
+				}
+			}
 		}
 
 		sa->v1= newdataadr(fd, sa->v1);
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index ca91f1dc346..73abf362d12 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -112,6 +112,7 @@ Important to know is that 'streaming' has been added to files, for Blender Publi
 #include "DNA_customdata_types.h"
 #include "DNA_effect_types.h"
 #include "DNA_group_types.h"
+#include "DNA_gpencil_types.h"
 #include "DNA_image_types.h"
 #include "DNA_ipo_types.h"
 #include "DNA_fileglobal_types.h"
@@ -532,6 +533,7 @@ static void write_particlesettings(WriteData *wd, ListBase *idbase)
 		if(part->id.us>0 || wd->current) {
 			/* write LibData */
 			writestruct(wd, ID_PA, "ParticleSettings", 1, part);
+			if (part->id.properties) IDP_WriteProperty(part->id.properties, wd);
 			writestruct(wd, DATA, "PartDeflect", 1, part->pd);
 		}
 		part= part->id.next;
@@ -1565,6 +1567,32 @@ static void write_scenes(WriteData *wd, ListBase *scebase)
 	mywrite(wd, MYWRITE_FLUSH, 0);
 }
 
+static void write_gpencil(WriteData *wd, bGPdata *gpd)
+{
+	bGPDlayer *gpl;
+	bGPDframe *gpf;
+	bGPDstroke *gps;
+	
+	/* write gpd data block to file */
+	writestruct(wd, DATA, "bGPdata", 1, gpd);
+	
+	/* write grease-pencil layers to file */
+	for (gpl= gpd->layers.first; gpl; gpl= gpl->next) {
+		writestruct(wd, DATA, "bGPDlayer", 1, gpl);
+		
+		/* write this layer's frames to file */
+		for (gpf= gpl->frames.first; gpf; gpf= gpf->next) {
+			writestruct(wd, DATA, "bGPDframe", 1, gpf);
+			
+			/* write strokes */
+			for (gps= gpf->strokes.first; gps; gps= gps->next) {
+				writestruct(wd, DATA, "bGPDstroke", 1, gps);
+				writestruct(wd, DATA, "bGPDspoint", gps->totpoints, gps->points);				
+			}
+		}
+	}
+}
+
 static void write_screens(WriteData *wd, ListBase *scrbase)
 {
 	bScreen *sc;
@@ -1610,11 +1638,12 @@ static void write_screens(WriteData *wd, ListBase *scrbase)
 			sl= sa->spacedata.first;
 			while(sl) {
 				if(sl->spacetype==SPACE_VIEW3D) {
-					View3D *v3d= (View3D*) sl;
+					View3D *v3d= (View3D *) sl;
 					writestruct(wd, DATA, "View3D", 1, v3d);
 					if(v3d->bgpic) writestruct(wd, DATA, "BGpic", 1, v3d->bgpic);
 					if(v3d->localvd) writestruct(wd, DATA, "View3D", 1, v3d->localvd);
 					if(v3d->clipbb) writestruct(wd, DATA, "BoundBox", 1, v3d->clipbb);
+					if(v3d->gpd) write_gpencil(wd, v3d->gpd);
 				}
 				else if(sl->spacetype==SPACE_IPO) {
 					writestruct(wd, DATA, "SpaceIpo", 1, sl);
@@ -1626,7 +1655,9 @@ static void write_screens(WriteData *wd, ListBase *scrbase)
 					writestruct(wd, DATA, "SpaceFile", 1, sl);
 				}
 				else if(sl->spacetype==SPACE_SEQ) {
+					SpaceSeq *sseq= (SpaceSeq *)sl;
 					writestruct(wd, DATA, "SpaceSeq", 1, sl);
+					if(sseq->gpd) write_gpencil(wd, sseq->gpd);
 				}
 				else if(sl->spacetype==SPACE_OOPS) {
 					SpaceOops *so= (SpaceOops *)sl;
@@ -1689,7 +1720,9 @@ static void write_screens(WriteData *wd, ListBase *scrbase)
 					writestruct(wd, DATA, "SpaceTime", 1, sl);
 				}
 				else if(sl->spacetype==SPACE_NODE){
+					SpaceNode *snode= (SpaceNode *)sl;
 					writestruct(wd, DATA, "SpaceNode", 1, sl);
+					if(snode->gpd) write_gpencil(wd, snode->gpd);
 				}
 				sl= sl->next;
 			}
diff --git a/source/blender/include/BDR_drawaction.h b/source/blender/include/BDR_drawaction.h
index 91635123cb7..7cb0768e832 100644
--- a/source/blender/include/BDR_drawaction.h
+++ b/source/blender/include/BDR_drawaction.h
@@ -38,6 +38,7 @@ struct bAction;
 struct bActionGroup;
 struct Object;
 struct ListBase;
+struct bGPDlayer;
 
 /* ****************************** Base Structs ****************************** */
 
@@ -82,6 +83,7 @@ void draw_ipo_channel(struct gla2DDrawInfo *di, struct Ipo *ipo, float ypos);
 void draw_agroup_channel(struct gla2DDrawInfo *di, struct bActionGroup *agrp, float ypos);
 void draw_action_channel(struct gla2DDrawInfo *di, struct bAction *act, float ypos);
 void draw_object_channel(struct gla2DDrawInfo *di, struct Object *ob, float ypos);
+void draw_gpl_channel(struct gla2DDrawInfo *di, struct bGPDlayer *gpl, float ypos);
 
 /* Keydata Generation */
 void icu_to_keylist(struct IpoCurve *icu, ListBase *keys, ListBase *blocks, ActKeysInc *aki);
@@ -89,6 +91,7 @@ void ipo_to_keylist(struct Ipo *ipo, ListBase *keys, ListBase *blocks, ActKeysIn
 void agroup_to_keylist(struct bActionGroup *agrp, ListBase *keys, ListBase *blocks, ActKeysInc *aki);
 void action_to_keylist(struct bAction *act, ListBase *keys, ListBase *blocks, ActKeysInc *aki);
 void ob_to_keylist(struct Object *ob, ListBase *keys, ListBase *blocks, ActKeysInc *aki);
+void gpl_to_keylist(struct bGPDlayer *gpl, ListBase *keys, ListBase *blocks, ActKeysInc *aki);
 
 #endif  /*  BDR_DRAWACTION_H */
 
diff --git a/source/blender/include/BDR_gpencil.h b/source/blender/include/BDR_gpencil.h
new file mode 100644
index 00000000000..d2fc7be29ea
--- /dev/null
+++ b/source/blender/include/BDR_gpencil.h
@@ -0,0 +1,74 @@
+/**
+ * $Id: BDR_gpencil.h 14444 2008-04-16 22:40:48Z 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
+ * This is a new part of Blender
+ *
+ * Contributor(s): Joshua Leung
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef BDR_GPENCIL_H
+#define BDR_GPENCIL_H
+
+struct ListBase;
+struct bScreen;
+struct ScrArea;
+struct View3D;
+struct SpaceNode;
+struct SpaceSeq;
+struct bGPdata;
+struct bGPDlayer;
+struct bGPDframe;
+
+/* ------------ Grease-Pencil API ------------------ */
+
+void free_gpencil_strokes(struct bGPDframe *gpf);
+void free_gpencil_frames(struct bGPDlayer *gpl);
+void free_gpencil_layers(struct ListBase *list);
+void free_gpencil_data(struct bGPdata *gpd);
+
+struct bGPDframe *gpencil_frame_addnew(struct bGPDlayer *gpl, int cframe);
+struct bGPDlayer *gpencil_layer_addnew(struct bGPdata *gpd);
+struct bGPdata *gpencil_data_addnew(void);
+
+struct bGPdata *gpencil_data_duplicate(struct bGPdata *gpd);
+
+struct bGPdata *gpencil_data_getactive(struct ScrArea *sa);
+short gpencil_data_setactive(struct ScrArea *sa, struct bGPdata *gpd);
+
+void gpencil_frame_delete_laststroke(struct bGPDframe *gpf);
+
+struct bGPDframe *gpencil_layer_getframe(struct bGPDlayer *gpl, int cframe, short addnew);
+void gpencil_layer_delframe(struct bGPDlayer *gpl, struct bGPDframe *gpf);
+struct bGPDlayer *gpencil_layer_getactive(struct bGPdata *gpd);
+void gpencil_layer_setactive(struct bGPdata *gpd, struct bGPDlayer *active);
+void gpencil_layer_delactive(struct bGPdata *gpd);
+
+void gpencil_delete_actframe(struct bGPdata *gpd);
+void gpencil_delete_laststroke(struct bGPdata *gpd);
+
+void gpencil_delete_operation(short mode);
+void gpencil_delete_menu(void);
+
+//short gpencil_paint(short mousebutton);
+short gpencil_do_paint(struct ScrArea *sa, short mousebutton);
+
+#endif /*  BDR_GPENCIL_H */
diff --git a/source/blender/include/BIF_drawgpencil.h b/source/blender/include/BIF_drawgpencil.h
new file mode 100644
index 00000000000..418446313df
--- /dev/null
+++ b/source/blender/include/BIF_drawgpencil.h
@@ -0,0 +1,44 @@
+/**
+ * $Id: BIF_drawgpencil.h 14444 2008-04-16 22:40:48Z 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
+ * This is a new part of Blender
+ *
+ * Contributor(s): Joshua Leung
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef BIF_DRAWGPENCIL_H
+#define BIF_DRAWGPENCIL_H
+
+struct ScrArea;
+struct View3D;
+struct SpaceNode;
+struct SpaceSeq;
+struct bGPdata;
+struct uiBlock;
+
+short draw_gpencil_panel(struct uiBlock *block, struct bGPdata *gpd, struct ScrArea *sa); 
+
+void draw_gpencil_2dview(struct ScrArea *sa, short onlyv2d);
+void draw_gpencil_3dview(struct ScrArea *sa, short only3d);
+void draw_gpencil_oglrender(struct View3D *v3d, int winx, int winy);
+
+#endif /*  BIF_DRAWGPENCIL_H */ 
diff --git a/source/blender/include/BIF_editaction.h b/source/blender/include/BIF_editaction.h
index 7e0f703681b..77c2f19bb9b 100644
--- a/source/blender/include/BIF_editaction.h
+++ b/source/blender/include/BIF_editaction.h
@@ -48,7 +48,10 @@ enum {
 	ACTTYPE_FILLIPO,
 	ACTTYPE_FILLCON,
 	ACTTYPE_IPO,
-	ACTTYPE_SHAPEKEY
+	ACTTYPE_SHAPEKEY,
+	ACTTYPE_GPDATABLOCK,
+	ACTTYPE_GPLAYER,
+	ACTTYPE_SPECIALDATA
 };
 
 /* Macros for easier/more consistant state testing */
@@ -69,7 +72,12 @@ enum {
 #define EDITABLE_ICU(icu) ((icu->flag & IPO_PROTECT)==0)
 #define SEL_ICU(icu) (icu->flag & IPO_SELECT)
 
-#define NLA_ACTION_SCALED (G.saction->pin==0 && OBACT && OBACT->action)
+#define EXPANDED_GPD(gpd) (gpd->flag & GP_DATA_EXPAND) 
+
+#define EDITABLE_GPL(gpl) ((gpl->flag & GP_LAYER_LOCKED)==0)
+#define SEL_GPL(gpl) ((gpl->flag & GP_LAYER_ACTIVE) || (gpl->flag & GP_LAYER_SELECT))
+
+#define NLA_ACTION_SCALED (G.saction->mode==SACTCONT_ACTION && G.saction->pin==0 && OBACT && OBACT->action)
 #define NLA_IPO_SCALED (OBACT && OBACT->action && G.sipo->pin==0 && G.sipo->actname)
 
 /* constants for setting ipo-interpolation type */
@@ -114,6 +122,8 @@ struct BWinEvent;
 struct Key;
 struct ListBase;
 struct TimeMarker;
+struct bGPdata;
+struct bGPDlayer;
 
 /* Key operations */
 void transform_action_keys(int mode, int dummy);
@@ -176,11 +186,29 @@ void action_add_localmarker(struct bAction *act, int frame);
 void action_rename_localmarker(struct bAction *act);
 void action_remove_localmarkers(struct bAction *act);
 
+/* Grease-Pencil Data */
+void gplayer_make_cfra_list(struct bGPDlayer *gpl, ListBase *elems, short onlysel);
+
+void deselect_gpencil_layers(void *data, short select_mode);
+
+short is_gplayer_frame_selected(struct bGPDlayer *gpl);
+void set_gplayer_frame_selection(struct bGPDlayer *gpl, short mode);
+void select_gpencil_frames(struct bGPDlayer *gpl, short select_mode);
+void select_gpencil_frame(struct bGPDlayer *gpl, int selx, short select_mode);
+void borderselect_gplayer_frames(struct bGPDlayer *gpl, float min, float max, short select_mode);
+
+void delete_gpencil_layers(void);
+void delete_gplayer_frames(struct bGPDlayer *gpl);
+void duplicate_gplayer_frames(struct bGPDlayer *gpd);
+
+void snap_gplayer_frames(struct bGPDlayer *gpl, short mode);
+void mirror_gplayer_frames(struct bGPDlayer *gpl, short mode);
+
 /* ShapeKey stuff */
 struct Key *get_action_mesh_key(void);
 int get_nearest_key_num(struct Key *key, short *mval, float *x);
 
-void *get_nearest_act_channel(short mval[], short *ret_type);
+void *get_nearest_act_channel(short mval[], short *ret_type, void **owner);
 
 /* Action */
 struct bActionChannel *get_hilighted_action_channel(struct bAction* action);
diff --git a/source/blender/include/BIF_space.h b/source/blender/include/BIF_space.h
index 37be4a9eafc..4b2b8e14bb6 100644
--- a/source/blender/include/BIF_space.h
+++ b/source/blender/include/BIF_space.h
@@ -53,6 +53,7 @@ struct SpaceOops;
 #define VIEW3D_HANDLER_PREVIEW		4
 #define VIEW3D_HANDLER_MULTIRES         5
 #define VIEW3D_HANDLER_TRANSFORM	6
+#define VIEW3D_HANDLER_GREASEPENCIL 7
 
 /* ipo handler codes */
 #define IPO_HANDLER_PROPERTIES	20
@@ -73,11 +74,15 @@ struct SpaceOops;
 #define NLA_HANDLER_PROPERTIES	50
 
 /* sequence handler codes */
-#define SEQ_HANDLER_PROPERTIES	60
+#define SEQ_HANDLER_PROPERTIES		60
+#define SEQ_HANDLER_GREASEPENCIL 	61
 
 /* imasel handler codes */
 #define IMASEL_HANDLER_IMAGE	70
 
+/* nodes handler codes */
+#define NODES_HANDLER_GREASEPENCIL		80
+
 /* theme codes */
 #define B_ADD_THEME 	3301
 #define B_DEL_THEME 	3302
@@ -145,3 +150,4 @@ extern		 void mainwindow_close(void);
 
 #endif
 
+
diff --git a/source/blender/include/BSE_drawview.h b/source/blender/include/BSE_drawview.h
index 83031ff3bad..e6f22a4fb67 100644
--- a/source/blender/include/BSE_drawview.h
+++ b/source/blender/include/BSE_drawview.h
@@ -76,6 +76,7 @@ void inner_play_anim_loop(int init, int mode);
 int play_anim(int mode);
 
 void make_axis_color(char *col, char *col2, char axis);
+char *view3d_get_name(struct View3D *v3d);
 
 /* SMOOTHVIEW */
 void smooth_view(struct View3D *v3d, float *ofs, float *quat, float *dist, float *lens);
diff --git a/source/blender/include/BSE_editaction_types.h b/source/blender/include/BSE_editaction_types.h
index c531383accc..be210415973 100644
--- a/source/blender/include/BSE_editaction_types.h
+++ b/source/blender/include/BSE_editaction_types.h
@@ -38,7 +38,8 @@ typedef enum ALE_KEYTYPE {
 	ALE_NONE = 0,
 	ALE_IPO,	
 	ALE_ICU,
-	ALE_GROUP	
+	ALE_GROUP,
+	ALE_GPFRAME,
 } ALE_KEYTYPE;
 
 /* This struct defines a structure used for quick access */
@@ -78,7 +79,8 @@ typedef enum ACTFILTER_FLAGS {
 typedef enum ACTCONT_TYPES {
 	ACTCONT_NONE = 0,
 	ACTCONT_ACTION,
-	ACTCONT_SHAPEKEY
+	ACTCONT_SHAPEKEY,
+	ACTCONT_GPENCIL
 } ACTCONT_TYPES;
 
 #endif
diff --git a/source/blender/include/transform.h b/source/blender/include/transform.h
index 4e3b80134f9..720b856a149 100644
--- a/source/blender/include/transform.h
+++ b/source/blender/include/transform.h
@@ -397,6 +397,7 @@ int Align(TransInfo *t, short mval[2]);
 
 /*********************** transform_conversions.c ********** */
 struct ListBase;
+void flushTransGPactionData(TransInfo *t);
 void flushTransIpoData(TransInfo *t);
 void flushTransUVs(TransInfo *t);
 void flushTransParticles(TransInfo *t);
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h
index 60050ea010e..3054e038ba2 100644
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@ -46,7 +46,7 @@ struct ID;
 typedef struct IDPropertyData {
 	void *pointer;
 	ListBase group;
-	int val, pad;
+	int val, val2; /*note, we actually fit a double into these two ints*/
 } IDPropertyData;
 
 typedef struct IDProperty {
@@ -77,6 +77,7 @@ typedef struct IDProperty {
 /*the ID link property type hasn't been implemented yet, this will require
   some cleanup of blenkernel, most likely.*/
 #define IDP_ID		7
+#define IDP_DOUBLE	8
 
 /*add any future new id property types here.*/
 
diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h
index 18d2a1cb6f3..2e8d95335cc 100644
--- a/source/blender/makesdna/DNA_action_types.h
+++ b/source/blender/makesdna/DNA_action_types.h
@@ -32,6 +32,7 @@
 
 #include "DNA_listBase.h"
 #include "DNA_ID.h"
+#include "DNA_gpencil_types.h"
 #include "DNA_view2d_types.h"
 #include "DNA_userdef_types.h"
 
@@ -183,8 +184,10 @@ typedef struct SpaceAction {
 	View2D v2d;	
 	
 	bAction		*action;		/* the currently active action */
-	short flag, autosnap;		/* flag: bitmapped settings; autosnap: automatic keyframe snapping mode */
-	short pin, actnr, lock;		/* pin: keep showing current action; actnr: used for finding chosen action from menu; lock: lock time to other windows */
+	
+	char  mode, autosnap;		/* mode: editing context; autosnap: automatic keyframe snapping mode   */
+	short flag, actnr; 			/* flag: bitmapped settings; */
+	short pin, lock;			/* pin: keep showing current action; actnr: used for finding chosen action from menu; lock: lock time to other windows */
 	short actwidth;				/* width of the left-hand side name panel (in pixels?) */
 	float timeslide;			/* for Time-Slide transform mode drawing - current frame? */
 } SpaceAction;
@@ -238,6 +241,18 @@ typedef enum SACTION_FLAG {
 	SACTION_NODRAWGCOLORS = (1<<7)
 } SACTION_FLAG;	
 
+/* SpaceAction Mode Settings */
+typedef enum SACTCONT_MODES {
+		/* action (default) */
+	SACTCONT_ACTION	= 0,
+		/* editing of shapekey's IPO block */
+	SACTCONT_SHAPEKEY,
+		/* editing of gpencil data */
+	SACTCONT_GPENCIL,
+		/* dopesheet (unimplemented... future idea?) */
+	SACTCONT_DOPESHEET
+} SACTCONTEXT_MODES;
+
 /* SpaceAction AutoSnap Settings (also used by SpaceNLA) */
 typedef enum SACTSNAP_MODES {
 		/* no auto-snap */
diff --git a/source/blender/makesdna/DNA_actuator_types.h b/source/blender/makesdna/DNA_actuator_types.h
index ac9761f165d..7444ce95f56 100644
--- a/source/blender/makesdna/DNA_actuator_types.h
+++ b/source/blender/makesdna/DNA_actuator_types.h
@@ -368,9 +368,9 @@ typedef struct FreeCamera {
 #define ACT_CONST_DIRPX		1
 #define ACT_CONST_DIRPY		2
 #define ACT_CONST_DIRPZ		4
-#define ACT_CONST_DIRMX		8
-#define ACT_CONST_DIRMY		16
-#define ACT_CONST_DIRMZ		32
+#define ACT_CONST_DIRNX		8
+#define ACT_CONST_DIRNY		16
+#define ACT_CONST_DIRNZ		32
 
 /* constraint type */
 #define ACT_CONST_TYPE_LOC	0
diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h
new file mode 100644
index 00000000000..b88dd698c3f
--- /dev/null
+++ b/source/blender/makesdna/DNA_gpencil_types.h
@@ -0,0 +1,143 @@
+/**
+ * $Id: DNA_gpencil_types.h 8768 2006-11-07 00:10: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.
+ *
+ * The Original Code is Copyright (C) 2008, Blender Foundation.
+ * This is a new part of Blender
+ *
+ * Contributor(s): Joshua Leung
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+#ifndef DNA_GPENCIL_TYPES_H
+#define DNA_GPENCIL_TYPES_H
+
+#include "DNA_listBase.h"
+#include "DNA_ID.h"
+
+/* 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)
+ */
+typedef struct bGPDspoint {
+	float x, y, z;			/* co-ordinates of point (usually 2d, but can be 3d as well) */				
+	float pressure;			/* pressure of input device (from 0 to 1) at this point */
+} bGPDspoint;
+
+/* Grease-Pencil Annotations - 'Stroke'
+ * 	-> A stroke represents a (simplified version) of the curve
+ *	   drawn by the user in one 'mousedown'->'mouseup' operation
+ */
+typedef struct bGPDstroke {
+	struct bGPDstroke *next, *prev;
+	
+	bGPDspoint *points;		/* array of data-points for stroke */
+	int totpoints;			/* number of data-points in array */
+	
+	short thickness;		/* thickness of stroke (currently not used) */	
+	short flag;				/* various settings about this stroke */
+} bGPDstroke;
+
+/* bGPDstroke->flag */
+	/* stroke is in 3d-space */
+#define GP_STROKE_3DSPACE		(1<<0)
+	/* stroke is in 2d-space */
+#define GP_STROKE_2DSPACE		(1<<1)
+	/* stroke is an "eraser" stroke */
+#define GP_STROKE_ERASER		(1<<2)
+
+
+/* Grease-Pencil Annotations - 'Frame'
+ *	-> Acts as storage for the 'image' formed by strokes
+ */
+typedef struct bGPDframe {
+	struct bGPDframe *next, *prev;
+	
+	ListBase strokes;	/* list of the simplified 'strokes' that make up the frame's data */
+	
+	int framenum;		/* frame number of this frame */
+	int flag;			/* temp settings */
+} bGPDframe;
+
+/* bGPDframe->flag */	
+	/* frame is being painted on */
+#define GP_FRAME_PAINT		(1<<0)
+	/* for editing in Action Editor */
+#define GP_FRAME_SELECT		(1<<1)
+
+
+/* Grease-Pencil Annotations - 'Layer' */
+typedef struct bGPDlayer {
+	struct bGPDlayer *next, *prev;
+	
+	ListBase frames;		/* list of annotations to display for frames (bGPDframe list) */
+	bGPDframe *actframe;	/* active frame (should be the frame that is currently being displayed) */
+	
+	int flag;				/* settings for layer */		
+	short thickness;		/* current thickness to apply to strokes */
+	short gstep;			/* max number of frames between active and ghost to show (0=only those on either side) */
+	
+	float color[4];			/* color that should be used to draw all the strokes in this layer */
+	
+	char info[128];			/* optional reference info about this layer (i.e. "director's comments, 12/3") */
+} bGPDlayer;
+
+/* bGPDlayer->flag */
+	/* don't display layer */
+#define GP_LAYER_HIDE		(1<<0)
+	/* protected from further editing */
+#define GP_LAYER_LOCKED		(1<<1)	
+	/* layer is 'active' layer being edited */
+#define GP_LAYER_ACTIVE		(1<<2)
+	/* draw points of stroke for debugging purposes */
+#define GP_LAYER_DRAWDEBUG 	(1<<3)
+	/* do onionskinning */
+#define GP_LAYER_ONIONSKIN	(1<<4)
+	/* for editing in Action Editor */
+#define GP_LAYER_SELECT		(1<<5)
+
+
+/* Grease-Pencil Annotations - 'DataBlock' */
+typedef struct bGPdata {
+	/* saved Grease-Pencil data */
+	ListBase layers;		/* bGPDlayers */
+	int flag;				/* settings for this datablock */
+	
+	/* not-saved stroke buffer data (only used during paint-session) 
+	 * 	- buffer must be initialised before use, but freed after 
+	 *	  whole paint operation is over
+	 */
+	short sbuffer_size;			/* number of elements currently in cache */
+	short sbuffer_sflag;		/* flags for stroke that cache represents */
+	bGPDspoint *sbuffer;		/* stroke buffer (can hold GP_STROKE_BUFFER_MAX) */
+} bGPdata;
+
+/* bGPdata->flag */
+	/* don't allow painting to occur at all */
+#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? */
+#define GP_DATA_EDITPAINT	(1<<3)
+	/* new strokes are added in viewport space */
+#define GP_DATA_VIEWALIGN	(1<<4)
+
+#endif /*  DNA_GPENCIL_TYPES_H */
diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h
index c0b9a6b9590..7bad8ec3b44 100644
--- a/source/blender/makesdna/DNA_sequence_types.h
+++ b/source/blender/makesdna/DNA_sequence_types.h
@@ -257,6 +257,7 @@ typedef struct SpeedControlVars {
 #define SEQ_USE_CROP                           131072
 #define SEQ_USE_COLOR_BALANCE                  262144
 #define SEQ_USE_PROXY_CUSTOM_DIR               524288
+#define SEQ_ACTIVE                            1048576
 
 #define SEQ_COLOR_BALANCE_INVERSE_GAIN 1
 #define SEQ_COLOR_BALANCE_INVERSE_GAMMA 2
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index 36265e25996..f42eb2e1a94 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -50,6 +50,7 @@ struct RenderInfo;
 struct bNodeTree;
 struct uiBlock;
 struct FileList;
+struct bGPdata;
 
 	/**
 	 * The base structure all the other spaces
@@ -150,6 +151,8 @@ typedef struct SpaceSeq {
 	short zebra;
 	int flag;
 	float zoom;
+	
+	struct bGPdata *gpd;		/* grease-pencil data */
 } SpaceSeq;
 
 typedef struct SpaceFile {
@@ -339,6 +342,8 @@ typedef struct SpaceNode {
 	float blockscale;
 	struct ScrArea *area;
 	
+	short blockhandler[8];
+	
 	View2D v2d;
 	
 	struct ID *id, *from;		/* context, no need to save in file? well... pinning... */
@@ -351,11 +356,13 @@ typedef struct SpaceNode {
 	struct bNodeTree *nodetree, *edittree;
 	int treetype, pad;			/* treetype: as same nodetree->type */
 	
+	struct bGPdata *gpd;		/* grease-pencil data */
 } SpaceNode;
 
 /* snode->flag */
 #define SNODE_DO_PREVIEW	1
 #define SNODE_BACKDRAW		2
+#define SNODE_DISPGP		4
 
 typedef struct SpaceImaSel {
 	SpaceLink *next, *prev;
@@ -657,6 +664,7 @@ typedef struct SpaceImaSel {
 #define SEQ_MARKER_TRANS 2
 #define SEQ_DRAW_COLOR_SEPERATED     4
 #define SEQ_DRAW_SAFE_MARGINS        8
+#define SEQ_DRAW_GPENCIL			16
 
 /* space types, moved from DNA_screen_types.h */
 enum {
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h
index c21d629be83..135272b9ac2 100644
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@ -40,6 +40,7 @@ struct Base;
 struct BoundBox;
 struct RenderInfo;
 struct RetopoViewData;
+struct bGPdata;
 
 /* This is needed to not let VC choke on near and far... old
  * proprietary MS extensions... */
@@ -53,9 +54,12 @@ struct RetopoViewData;
 #include "DNA_listBase.h"
 #include "DNA_image_types.h"
 
+/* ******************************** */
+
 /* The near/far thing is a Win EXCEPTION. Thus, leave near/far in the
  * code, and patch for windows. */
-
+ 
+/* Background Picture in 3D-View */
 typedef struct BGpic {
     struct Image *ima;
 	struct ImageUser iuser;
@@ -63,6 +67,9 @@ typedef struct BGpic {
     short xim, yim;
 } BGpic;
 
+/* ********************************* */
+
+/* 3D ViewPort Struct */
 typedef struct View3D {
 	struct SpaceLink *next, *prev;
 	int spacetype;
@@ -135,9 +142,10 @@ typedef struct View3D {
 	char ndoffilter;		/*filter for 6DOF devices 0 normal, 1 dominant */
 	
 	void *properties_storage;	/* Nkey panel stores stuff here, not in file */
-
+	struct bGPdata *gpd;		/* Grease-Pencil Data (annotation layers) */
 } View3D;
 
+
 /* View3D->flag (short) */
 #define V3D_MODE			(16+32+64+128+256+512)
 #define V3D_DISPIMAGE		1
@@ -158,10 +166,12 @@ typedef struct View3D {
 #define V3D_DRAW_CENTERS	32768
 
 /* View3d->flag2 (short) */
+#define V3D_MODE2			(32)
 #define V3D_OPP_DIRECTION_NAME	1
 #define V3D_FLYMODE				2
 #define V3D_DEPRECATED			4 /* V3D_TRANSFORM_SNAP, moved to a scene setting */
 #define V3D_SOLID_TEX			8
+#define V3D_DISPGP				16
 
 /* View3D->around */
 #define V3D_CENTER		 0
@@ -203,3 +213,4 @@ typedef struct View3D {
 
 #endif
 
+
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c
index 83f4e633fa1..3818d66b39c 100644
--- a/source/blender/makesdna/intern/makesdna.c
+++ b/source/blender/makesdna/intern/makesdna.c
@@ -126,6 +126,7 @@ char *includefiles[] = {
 	"DNA_customdata_types.h",
 	"DNA_particle_types.h",
 	"DNA_cloth_types.h",
+	"DNA_gpencil_types.h",
 	// if you add files here, please add them at the end
 	// of makesdna.c (this file) as well
 
@@ -1147,4 +1148,5 @@ int main(int argc, char ** argv)
 #include "DNA_customdata_types.h"
 #include "DNA_particle_types.h"
 #include "DNA_cloth_types.h"
+#include "DNA_gpencil_types.h"
 /* end of list */
diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_material.c b/source/blender/nodes/intern/SHD_nodes/SHD_material.c
index bdceb134c0d..9396410f850 100644
--- a/source/blender/nodes/intern/SHD_nodes/SHD_material.c
+++ b/source/blender/nodes/intern/SHD_nodes/SHD_material.c
@@ -54,7 +54,6 @@ static bNodeSocketType sh_node_material_ext_in[]= {
 	{	SOCK_VALUE, 1, "Refl",		0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
 	{	SOCK_VECTOR, 1, "Normal",	0.0f, 0.0f, 0.0f, 1.0f, -1.0f, 1.0f},
 	{	SOCK_RGBA, 1, "Mirror",		0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
-	{	SOCK_RGBA, 1, "AmbCol",		0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
 	{	SOCK_VALUE, 1, "Ambient",	0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
 	{	SOCK_VALUE, 1, "Emit",		0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
 	{	SOCK_VALUE, 1, "SpecTra",	0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
@@ -117,8 +116,6 @@ static void node_shader_exec_material(void *data, bNode *node, bNodeStack **in,
 		if (node->type == SH_NODE_MATERIAL_EXT) {
 			if(in[MAT_IN_MIR]->hasinput)
 				nodestack_get_vec(&shi->mirr, SOCK_VECTOR, in[MAT_IN_MIR]);
-			if(in[MAT_IN_AMBCOL]->hasinput)
-				nodestack_get_vec(&shi->ambr, SOCK_VECTOR, in[MAT_IN_AMBCOL]);
 			if(in[MAT_IN_AMB]->hasinput)
 				nodestack_get_vec(&shi->amb, SOCK_VALUE, in[MAT_IN_AMB]);
 			if(in[MAT_IN_EMIT]->hasinput)
diff --git a/source/blender/nodes/intern/SHD_util.c b/source/blender/nodes/intern/SHD_util.c
index c9f58fbce49..f673834d2b7 100644
--- a/source/blender/nodes/intern/SHD_util.c
+++ b/source/blender/nodes/intern/SHD_util.c
@@ -164,7 +164,7 @@ void nodeShaderSynchronizeID(bNode *node, int copyto)
 						case MAT_IN_MIR:
 							VECCOPY(&ma->mirr, sock->ns.vec); break;
 						case MAT_IN_AMB:
-							VECCOPY(&ma->ambr, sock->ns.vec); break;
+							ma->amb= sock->ns.vec[0]; break;
 						case MAT_IN_EMIT:
 							ma->emit= sock->ns.vec[0]; break;
 						case MAT_IN_SPECTRA:
@@ -188,7 +188,7 @@ void nodeShaderSynchronizeID(bNode *node, int copyto)
 						case MAT_IN_MIR:
 							VECCOPY(sock->ns.vec, &ma->mirr); break;
 						case MAT_IN_AMB:
-							VECCOPY(sock->ns.vec, &ma->ambr); break;
+							sock->ns.vec[0]= ma->amb; break;
 						case MAT_IN_EMIT:
 							sock->ns.vec[0]= ma->emit; break;
 						case MAT_IN_SPECTRA:
diff --git a/source/blender/nodes/intern/SHD_util.h b/source/blender/nodes/intern/SHD_util.h
index f75802b7c15..bdb2bb3707d 100644
--- a/source/blender/nodes/intern/SHD_util.h
+++ b/source/blender/nodes/intern/SHD_util.h
@@ -117,13 +117,12 @@ typedef struct ShaderCallData {
 #define MAT_IN_REFL		2
 #define MAT_IN_NORMAL	3
 #define MAT_IN_MIR		4
-#define MAT_IN_AMBCOL	5
-#define MAT_IN_AMB		6
-#define MAT_IN_EMIT	7
-#define MAT_IN_SPECTRA	8
-#define MAT_IN_RAY_MIRROR	9
-#define MAT_IN_ALPHA	10
-#define MAT_IN_TRANSLUCENCY	11
+#define MAT_IN_AMB		5
+#define MAT_IN_EMIT	6
+#define MAT_IN_SPECTRA	7
+#define MAT_IN_RAY_MIRROR	8
+#define MAT_IN_ALPHA	9
+#define MAT_IN_TRANSLUCENCY	10
 
 /* output socket defines */
 #define MAT_OUT_COLOR		0
diff --git a/source/blender/python/BPY_interface.c b/source/blender/python/BPY_interface.c
index 2a6d28c8cb3..36a8ee27a50 100644
--- a/source/blender/python/BPY_interface.c
+++ b/source/blender/python/BPY_interface.c
@@ -410,12 +410,14 @@ void BPY_rebuild_syspath( void )
 	mod = PyImport_ImportModule( "sys" );	
 	if (!mod) {
 		printf("error: could not import python sys module. some modules may not import.\n");
+		PyGILState_Release(gilstate);
 		return;
 	}
 	
 	if (!bpy_orig_syspath_List) { /* should never happen */
 		printf("error refershing python path\n");
 		Py_DECREF(mod);
+		PyGILState_Release(gilstate);
 		return;
 	}
 	
diff --git a/source/blender/python/api2_2x/Blender.c b/source/blender/python/api2_2x/Blender.c
index d8385c1d660..420d292cdce 100644
--- a/source/blender/python/api2_2x/Blender.c
+++ b/source/blender/python/api2_2x/Blender.c
@@ -708,7 +708,7 @@ static PyObject *Blender_Save( PyObject * self, PyObject * args )
 					      "expected filename and optional int (overwrite flag) as arguments" );
 
 	for( li = G.main->library.first; li; li = li->id.next ) {
-		if( BLI_streq( li->name, fname ) ) {
+		if( li->parent==NULL && BLI_streq( li->name, fname ) ) {
 			return EXPP_ReturnPyObjError( PyExc_AttributeError,
 						      "cannot overwrite used library" );
 		}
diff --git a/source/blender/python/api2_2x/IDProp.c b/source/blender/python/api2_2x/IDProp.c
index f60ebf8dee1..4a51619aec4 100644
--- a/source/blender/python/api2_2x/IDProp.c
+++ b/source/blender/python/api2_2x/IDProp.c
@@ -60,6 +60,8 @@ PyObject *BPy_IDGroup_WrapData( ID *id, IDProperty *prop )
 			return PyInt_FromLong( (long)prop->data.val );
 		case IDP_FLOAT:
 			return PyFloat_FromDouble( (double)(*(float*)(&prop->data.val)) );
+		case IDP_DOUBLE:
+			return PyFloat_FromDouble( (*(double*)(&prop->data.val)) );
 		case IDP_GROUP:
 			/*blegh*/
 			{
@@ -128,7 +130,19 @@ int BPy_IDGroup_SetData(BPy_IDProperty *self, IDProperty *prop, PyObject *value)
 			Py_XDECREF(value);
 			break;
 		}
-
+		case IDP_DOUBLE:
+		{
+			double dvalue;
+			if (!PyNumber_Check(value))
+				return EXPP_ReturnIntError(PyExc_TypeError, "expected a float!");
+			value = PyNumber_Float(value);
+			if (!value)
+				return EXPP_ReturnIntError(PyExc_TypeError, "expected a float!");
+			dvalue = (float) PyFloat_AsDouble(value);
+			*(double*)&self->prop->data.val = dvalue;
+			Py_XDECREF(value);
+			break;
+		}
 		default:
 			return EXPP_ReturnIntError(PyExc_AttributeError, "attempt to set read-only attribute!");
 	}
@@ -204,8 +218,8 @@ char *BPy_IDProperty_Map_ValidateAndCreate(char *name, IDProperty *group, PyObje
 	IDPropertyTemplate val = {0};
 	
 	if (PyFloat_Check(ob)) {
-		val.f = (float) PyFloat_AsDouble(ob);
-		prop = IDP_New(IDP_FLOAT, val, name);
+		val.d = PyFloat_AsDouble(ob);
+		prop = IDP_New(IDP_DOUBLE, val, name);
 	} else if (PyInt_Check(ob)) {
 		val.i = (int) PyInt_AsLong(ob);
 		prop = IDP_New(IDP_INT, val, name);
@@ -223,7 +237,7 @@ char *BPy_IDProperty_Map_ValidateAndCreate(char *name, IDProperty *group, PyObje
 		val.array.len = PySequence_Length(ob);
 		for (i=0; i<val.array.len; i++) {
 			item = PySequence_GetItem(ob, i);
-			if (PyFloat_Check(item)) val.array.type = IDP_FLOAT;
+			if (PyFloat_Check(item)) val.array.type = IDP_DOUBLE;
 			else if (!PyInt_Check(item)) return "only floats and ints are allowed in ID property arrays";
 			Py_XDECREF(item);
 		}
@@ -236,7 +250,7 @@ char *BPy_IDProperty_Map_ValidateAndCreate(char *name, IDProperty *group, PyObje
 				((int*)prop->data.pointer)[i] = (int)PyInt_AsLong(item);
 			} else {
 				item = PyNumber_Float(item);
-				((float*)prop->data.pointer)[i] = (float)PyFloat_AsDouble(item);
+				((double*)prop->data.pointer)[i] = (float)PyFloat_AsDouble(item);
 			}
 			Py_XDECREF(item);
 		}
@@ -334,6 +348,9 @@ PyObject *BPy_IDGroup_MapDataToPy(IDProperty *prop)
 		case IDP_FLOAT:
 			return PyFloat_FromDouble(*((float*)&prop->data.val));
 			break;
+		case IDP_DOUBLE:
+			return PyFloat_FromDouble(*((double*)&prop->data.val));
+			break;
 		case IDP_INT:
 			return PyInt_FromLong( (long)prop->data.val );
 			break;
@@ -347,12 +364,15 @@ PyObject *BPy_IDGroup_MapDataToPy(IDProperty *prop)
 					   "PyList_New() failed" );
 			
 			for (i=0; i<prop->len; i++) {
-				if (prop->subtype == IDP_FLOAT)
+				if (prop->subtype == IDP_FLOAT) {
 						PyList_SetItem(seq, i,
 						PyFloat_FromDouble(((float*)prop->data.pointer)[i]));
-				
-				else 	PyList_SetItem(seq, i,
-						PyInt_FromLong(((int*)prop->data.pointer)[i]));
+				} else if (prop->subtype == IDP_DOUBLE) {
+						PyList_SetItem(seq, i,
+						PyFloat_FromDouble(((double*)prop->data.pointer)[i]));				
+				} else 	{ PyList_SetItem(seq, i,
+						  PyInt_FromLong(((int*)prop->data.pointer)[i]));
+				}
 			}
 			return seq;
 		}
@@ -451,7 +471,7 @@ PyObject *BPy_IDGroup_GetKeys(BPy_IDProperty *self)
 		/*set correct group length*/
 		self->prop->len = i;
 		
-		/*free the old list*/
+		/*free the list*/
 		Py_DECREF(seq);
 		
 		/*call self again*/
@@ -688,6 +708,9 @@ PyObject *BPy_IDArray_GetItem(BPy_IDArray *self, int index)
 		case IDP_FLOAT:
 			return PyFloat_FromDouble( (double)(((float*)self->prop->data.pointer)[index]));
 			break;
+		case IDP_DOUBLE:
+			return PyFloat_FromDouble( (((double*)self->prop->data.pointer)[index]));
+			break;		
 		case IDP_INT:
 			return PyInt_FromLong( (long)((int*)self->prop->data.pointer)[index] );
 			break;
@@ -700,7 +723,8 @@ int BPy_IDArray_SetItem(BPy_IDArray *self, int index, PyObject *val)
 {
 	int i;
 	float f;
-
+	double d;
+	
 	if (index < 0 || index >= self->prop->len)
 		return EXPP_ReturnIntError( PyExc_RuntimeError,
 				"index out of range!");
@@ -717,6 +741,17 @@ int BPy_IDArray_SetItem(BPy_IDArray *self, int index, PyObject *val)
 			((float*)self->prop->data.pointer)[index] = f;
 			Py_XDECREF(val);
 			break;
+		case IDP_DOUBLE:
+			if (!PyNumber_Check(val)) return EXPP_ReturnIntError( PyExc_TypeError,
+				"expected a float");
+			val = PyNumber_Float(val);
+			if (!val) return EXPP_ReturnIntError( PyExc_TypeError,
+				"expected a float");
+
+			d = (double) PyFloat_AsDouble(val);
+			((double*)self->prop->data.pointer)[index] = d;
+			Py_XDECREF(val);
+			break;
 		case IDP_INT:
 			if (!PyNumber_Check(val)) return EXPP_ReturnIntError( PyExc_TypeError,
 				"expected an int");
diff --git a/source/blender/python/api2_2x/Library.c b/source/blender/python/api2_2x/Library.c
index 799735c2062..468263c4208 100644
--- a/source/blender/python/api2_2x/Library.c
+++ b/source/blender/python/api2_2x/Library.c
@@ -1135,9 +1135,78 @@ static PyObject *M_Library_Load(PyObject *self, PyObject * args)
 	return (PyObject *)lib;
 }
 
+static PyObject *M_Library_GetPaths(PyObject *self, PyObject * args)
+{	
+	PyObject *list;
+	PyObject *name;
+	int type=0;
+	Library *lib;
+	
+	if( !PyArg_ParseTuple( args, "|i", &type ) || type < 0 || type > 2 ) {
+		return EXPP_ReturnPyObjError( PyExc_TypeError,
+			"expected an int between 0 and 2." );
+	}
+	
+	list = PyList_New(0);
+	
+	for(lib= G.main->library.first; lib; lib= lib->id.next) {
+		if (type==0) {
+			/* any type is ok */
+		} else if (type==1 && lib->parent == 0) {
+			/* only direct linked */
+		} else if (type==2 && lib->parent != 0) {
+			/* only indirect */
+		} else {
+			continue; /* incompatible type */
+		}
+		
+		name = PyString_FromString(lib->name);
+		PyList_Append(list, name);
+		Py_DECREF(name);
+	}
+	return list;
+}
+
+static PyObject *M_Library_ReplacePath(PyObject *self, PyObject * args)
+{
+	char *name_from, *name_to;
+	Library *lib;
+	
+	if( !PyArg_ParseTuple( args, "ss", &name_from, &name_to )) {
+		return EXPP_ReturnPyObjError( PyExc_TypeError,
+			"expected the name of a library path" );
+	}
+	
+	for(lib= G.main->library.first; lib; lib= lib->id.next) {
+		if (strcmp(lib->name, name_from)==0) {
+			if (lib->parent) {
+				return EXPP_ReturnPyObjError( PyExc_RuntimeError,
+					"path is indirectly linked, cannot be changed." );
+			}
+			
+			if (strlen(name_to) > sizeof(lib->name)) {
+				return EXPP_ReturnPyObjError( PyExc_RuntimeError,
+					"string length too long, cannot set path." );
+			}
+			
+			strcpy(lib->name, name_to);
+			Py_RETURN_NONE;
+		}
+	}
+	
+	return EXPP_ReturnPyObjError( PyExc_ValueError,
+		"path given does not exist as a library" );
+}
+
+
+
 static struct PyMethodDef M_Library_methods[] = {
 	{"load", (PyCFunction)M_Library_Load, METH_VARARGS,
 	"(string) - declare a .blend file for use as a library"},
+	{"paths", (PyCFunction)M_Library_GetPaths, METH_VARARGS,
+	"(type) - return a list of library paths, type 0 for all, 1 only direct links, 2 only indirect links"},
+	{"replace", (PyCFunction)M_Library_ReplacePath, METH_VARARGS,
+	"(from, to) - replace the path of an existing, directly linked library."},
 	{NULL, NULL, 0, NULL}
 };
 
diff --git a/source/blender/python/api2_2x/Particle.c b/source/blender/python/api2_2x/Particle.c
index 95de9757b87..2c2e724129e 100644
--- a/source/blender/python/api2_2x/Particle.c
+++ b/source/blender/python/api2_2x/Particle.c
@@ -40,6 +40,7 @@
 #include "BKE_material.h"
 #include "BKE_utildefines.h"
 #include "BKE_pointcache.h"
+#include "BKE_DerivedMesh.h"
 #include "BIF_editparticle.h"
 #include "BIF_space.h"
 #include "blendef.h"
@@ -799,22 +800,27 @@ static PyObject *Part_freeEdit( BPy_PartSys * self, PyObject * args ){
 	Py_RETURN_NONE;
 }
 
-static PyObject *Part_GetLoc( BPy_PartSys * self, PyObject * args ){
+static PyObject *Part_GetLoc( BPy_PartSys * self, PyObject * args )
+{
 	ParticleSystem *psys = 0L;
 	Object *ob = 0L;
 	PyObject *partlist,*seglist;
-	PyObject* loc = 0L;
 	ParticleCacheKey **cache,*path;
+	PyObject* loc = 0L;
 	ParticleKey state;
-	float cfra=bsystem_time(ob,(float)CFRA,0.0);
+	DerivedMesh* dm;
+	float cfra;
 	int i,j,k;
+	float vm[4][4],wm[4][4];
 	int	childexists = 0;
 	int all = 0;
 	int id = 0;
 
+	cfra = bsystem_time(ob,(float)CFRA,0.0);
+
 	if( !PyArg_ParseTuple( args, "|ii", &all,&id ) )
 		return EXPP_ReturnPyObjError( PyExc_TypeError,
-				"expected one optional integer as argument" );
+				"expected two optional integers as arguments" );
 
 	psys = self->psys;
 	ob = self->object;
@@ -822,88 +828,118 @@ static PyObject *Part_GetLoc( BPy_PartSys * self, PyObject * args ){
 	if (!ob || !psys)
 		Py_RETURN_NONE;
 
-	if (psys->part->type == 2){
-		cache=psys->pathcache;
+	G.rendering = 1;
 
-		/* little hack to calculate hair steps in render mode */
-		psys->renderdata = (void*)(int)1;
+	/* Just to create a valid rendering context */
+	psys_render_set(ob,psys,vm,wm,0,0,0);
 
-		psys_cache_paths(ob, psys, cfra, 1);
+	dm = mesh_create_derived_render(ob,CD_MASK_BAREMESH|CD_MASK_MTFACE|CD_MASK_MCOL);
+	dm->release(dm);
 
-		psys->renderdata = NULL;
+	if ( !psys_check_enabled(ob,psys) ){
+		G.rendering = 0;
+		psys_render_restore(ob,psys);
+		Particle_Recalc(self,1);
+		Py_RETURN_NONE;
+	}
 
-		partlist = PyList_New( 0 );
-		if( !partlist )
-			return EXPP_ReturnPyObjError( PyExc_MemoryError, "PyList() failed" );
+	partlist = PyList_New( 0 );
+	if( !partlist ){
+		PyErr_SetString( PyExc_MemoryError, "PyList_New() failed" );
+		goto error;
+	}
 
-		for(i = 0; i < psys->totpart; i++){
-			path=cache[i];
-			seglist = PyList_New( 0 );
-			k = path->steps+1;
-			for( j = 0; j < k ; j++){
-				loc = PyTuple_New(3);
+	if (psys->part->type == PART_HAIR){
+		cache = psys->pathcache;
 
-				PyTuple_SetItem(loc,0,PyFloat_FromDouble((double)path->co[0]));
-				PyTuple_SetItem(loc,1,PyFloat_FromDouble((double)path->co[1]));
-				PyTuple_SetItem(loc,2,PyFloat_FromDouble((double)path->co[2]));
+		if ( ((self->psys->part->draw & PART_DRAW_PARENT) && (self->psys->part->childtype != 0)) || (self->psys->part->childtype == 0) ){
 
-				if ( (PyList_Append(seglist,loc) < 0) ){
-					Py_DECREF(seglist);
-					Py_DECREF(partlist);
-					Py_XDECREF(loc);
-					return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-							"Couldn't append item to PyList" );
+			for(i = 0; i < psys->totpart; i++){
+				seglist = PyList_New( 0 );
+				if (!seglist){
+					PyErr_SetString( PyExc_MemoryError,
+							"PyList_New() failed" );
+					goto error;
 				}
-				Py_DECREF(loc); /* PyList_Append increfs */
-				path++;
-			}
 
-			if ( PyList_Append(partlist,seglist) < 0 ){
-				Py_DECREF(seglist);
-				Py_DECREF(partlist);
-				return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-						"Couldn't append item to PyList" );		
+				path=cache[i];
+				k = path->steps+1;
+				for( j = 0; j < k ; j++, path++){
+					loc = Py_BuildValue("(fff)",(double)path->co[0],
+							(double)path->co[1], (double)path->co[2]);
+
+					if (!loc){
+						PyErr_SetString( PyExc_RuntimeError,
+								"Couldn't build tuple" );
+						goto error;
+					}
+
+					if ( (PyList_Append(seglist,loc) < 0) ){
+						PyErr_SetString( PyExc_RuntimeError,
+								"Couldn't append item to PyList" );
+						goto error;
+					}
+					Py_DECREF(loc); /* PyList_Append increfs */
+					loc = NULL;
+				}
+
+				if ( PyList_Append(partlist,seglist) < 0 ){
+					PyErr_SetString( PyExc_RuntimeError,
+							"Couldn't append item to PyList" );		
+					goto error;
+				}
+				Py_DECREF(seglist); /* PyList_Append increfs */
+				seglist = NULL;
 			}
-			Py_DECREF(seglist); /* PyList_Append increfs */
 		}
 
 		cache=psys->childcache;
 
 		for(i = 0; i < psys->totchild; i++){
-			path=cache[i];
 			seglist = PyList_New( 0 );
-			k = path->steps+1;
-			for( j = 0; j < k ; j++){
-				loc = PyTuple_New(3);
+			if (!seglist){
+				PyErr_SetString( PyExc_MemoryError,
+						"PyList_New() failed" );
+				goto error;
+			}
 
-				PyTuple_SetItem(loc,0,PyFloat_FromDouble((double)path->co[0]));
-				PyTuple_SetItem(loc,1,PyFloat_FromDouble((double)path->co[1]));
-				PyTuple_SetItem(loc,2,PyFloat_FromDouble((double)path->co[2]));
+			path=cache[i];
+			k = path->steps+1;
+			for( j = 0; j < k ; j++, path++ ){
+				loc = Py_BuildValue("(fff)",(double)path->co[0],
+						(double)path->co[1], (double)path->co[2]);
+
+				if (!loc){
+					PyErr_SetString( PyExc_RuntimeError,
+							"Couldn't build tuple" );
+					goto error;
+				}
 
 				if ( PyList_Append(seglist,loc) < 0){
-					Py_DECREF(partlist);
-					Py_XDECREF(loc);
-					return EXPP_ReturnPyObjError( PyExc_RuntimeError,
+					PyErr_SetString( PyExc_RuntimeError,
 							"Couldn't append item to PyList" );
+					goto error;
 				}
 				Py_DECREF(loc);/* PyList_Append increfs */
-				path++;
+				loc = NULL;
 			}
 
 			if ( PyList_Append(partlist,seglist) < 0){
-				Py_DECREF(partlist);
-				Py_XDECREF(loc);
-				return EXPP_ReturnPyObjError( PyExc_RuntimeError,
+				PyErr_SetString( PyExc_RuntimeError,
 						"Couldn't append item to PyList" );	
+				goto error;
 			}
 			Py_DECREF(seglist); /* PyList_Append increfs */
+			seglist = NULL;
 		}
-		
 	} else {
 		int init;
-		partlist = PyList_New( 0 );
-		if( !partlist )
-			return EXPP_ReturnPyObjError( PyExc_MemoryError, "PyList() failed" );
+		char *fmt = NULL;
+
+		if(id)
+			fmt = "(fffi)";
+		else
+			fmt = "(fff)";
 
 		if (psys->totchild > 0 && !(psys->part->draw & PART_DRAW_PARENT))
 			childexists = 1;
@@ -919,55 +955,67 @@ static PyObject *Part_GetLoc( BPy_PartSys * self, PyObject * args ){
 				init = 1;
 
 			if (init){
-				if (!id)
-					loc = PyTuple_New(3);
-				else
-					loc = PyTuple_New(4);
-				PyTuple_SetItem(loc,0,PyFloat_FromDouble((double)state.co[0]));
-				PyTuple_SetItem(loc,1,PyFloat_FromDouble((double)state.co[1]));
-				PyTuple_SetItem(loc,2,PyFloat_FromDouble((double)state.co[2]));
-				if (id)
-					PyTuple_SetItem(loc,3,PyInt_FromLong(i));
+				loc = Py_BuildValue(fmt,(double)state.co[0],
+						(double)state.co[1], (double)state.co[2],i);
+				
+				if (!loc){
+					PyErr_SetString( PyExc_RuntimeError,
+							"Couldn't build tuple" );
+					goto error;
+				}
 
 				if ( PyList_Append(partlist,loc) < 0 ){
-					Py_DECREF(partlist);
-					Py_XDECREF(loc);
-					return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-								"Couldn't append item to PyList" );
+					PyErr_SetString( PyExc_RuntimeError,
+							"Couldn't append item to PyList" );
+					goto error;
 				}
-				Py_DECREF(loc);/* PyList_Append increfs */
-			}
-			else {
-				if ( all ){
-					if ( PyList_Append(partlist,Py_None) < 0 ){
-						Py_DECREF(partlist);
-						return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-									"Couldn't append item to PyList" );
-					}
-					Py_DECREF(Py_None); /* PyList_Append increfs */
+				Py_DECREF(loc);
+				loc = NULL;
+			} else {
+				if ( all && PyList_Append(partlist,Py_None) < 0 ){
+					PyErr_SetString( PyExc_RuntimeError,
+							"Couldn't append item to PyList" );
+					goto error;
 				}
 			}
 		}
 	}
+
+	psys_render_restore(ob,psys);
+	G.rendering = 0;
+	Particle_Recalc(self,1);
 	return partlist;
+
+error:
+	Py_XDECREF(partlist);
+	Py_XDECREF(seglist);
+	Py_XDECREF(loc);
+	psys_render_restore(ob,psys);
+	G.rendering = 0;
+	Particle_Recalc(self,1);
+	return NULL;
 }
 
-static PyObject *Part_GetRot( BPy_PartSys * self, PyObject * args ){
+static PyObject *Part_GetRot( BPy_PartSys * self, PyObject * args )
+{
 	ParticleSystem *psys = 0L;
 	Object *ob = 0L;
 	PyObject *partlist = 0L;
 	PyObject* loc = 0L;
 	ParticleKey state;
+	DerivedMesh* dm;
+	float vm[4][4],wm[4][4];
 	int i;
 	int childexists = 0;
 	int all = 0;
 	int id = 0;
+    char *fmt = NULL;
 
 	float cfra=bsystem_time(ob,(float)CFRA,0.0);
 
 	if( !PyArg_ParseTuple( args, "|ii", &all, &id ) )
 		return EXPP_ReturnPyObjError( PyExc_TypeError,
-				"expected one optional integer as argument" );
+				"expected two optional integers as arguments" );
 
 	psys = self->psys;
 	ob = self->object;
@@ -975,63 +1023,105 @@ static PyObject *Part_GetRot( BPy_PartSys * self, PyObject * args ){
 	if (!ob || !psys)
 		Py_RETURN_NONE;
 
-	if (psys->part->type != 2){
+	G.rendering = 1;
+
+	/* Just to create a valid rendering context */
+	psys_render_set(ob,psys,vm,wm,0,0,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) ){
+		G.rendering = 0;
+		psys_render_restore(ob,psys);
+		Particle_Recalc(self,1);
+		Py_RETURN_NONE;
+	}
+
+	if (psys->part->type != PART_HAIR){
 		partlist = PyList_New( 0 );
 
+		if( !partlist ){
+			PyErr_SetString( PyExc_MemoryError, "PyList_New() failed" );
+			goto error;
+		}
+
 		if (psys->totchild > 0 && !(psys->part->draw & PART_DRAW_PARENT))
 			childexists = 1;
 
+		if(id)
+			fmt = "(ffffi)";
+		else
+			fmt = "(ffff)";
+
 		for (i = 0; i < psys->totpart + psys->totchild; i++){
 			if (childexists && (i < psys->totpart))
 				continue;
 
 			state.time = cfra;
 			if(psys_get_particle_state(ob,psys,i,&state,0)==0){
-				if ( all ){
-					PyList_Append(partlist,Py_None);
-					Py_DECREF(Py_None); /* PyList_Append increfs */
-					continue;
-				} else {
-					continue;
+				if ( all && PyList_Append(partlist,Py_None) < 0){
+					PyErr_SetString( PyExc_RuntimeError,
+						"Couldn't append item to PyList" );
+					goto error;
 				}
+			} else {
+				loc = Py_BuildValue(fmt,(double)state.rot[0], (double)state.rot[1],
+						(double)state.rot[2], (double)state.rot[3], i);
+
+				if (!loc){
+					PyErr_SetString( PyExc_RuntimeError,
+							"Couldn't build tuple" );
+					goto error;
+				}
+				if (PyList_Append(partlist,loc) < 0){
+					PyErr_SetString ( PyExc_RuntimeError,
+							"Couldn't append item to PyList" );
+					goto error;
+				}
+				Py_DECREF(loc); /* PyList_Append increfs */
+				loc = NULL;
 			}
-			if (!id)
-				loc = PyTuple_New(4);
-			else
-				loc = PyTuple_New(5);
-			PyTuple_SetItem(loc,0,PyFloat_FromDouble((double)state.rot[0]));
-			PyTuple_SetItem(loc,1,PyFloat_FromDouble((double)state.rot[1]));
-			PyTuple_SetItem(loc,2,PyFloat_FromDouble((double)state.rot[2]));
-			PyTuple_SetItem(loc,3,PyFloat_FromDouble((double)state.rot[3]));
-			if (id)
-				PyTuple_SetItem(loc,4,PyInt_FromLong(i));
-			PyList_Append(partlist,loc);
-			Py_DECREF(loc); /* PyList_Append increfs */
 		}
+	} else {
+		partlist = EXPP_incr_ret( Py_None );
 	}
+
+	psys_render_restore(ob,psys);
+	G.rendering = 0;
+	Particle_Recalc(self,1);
 	return partlist;
+
+error:
+	Py_XDECREF(partlist);
+	Py_XDECREF(loc);
+	psys_render_restore(ob,psys);
+	G.rendering = 0;
+	Particle_Recalc(self,1);
+	return NULL;
 }
 
-static PyObject *Part_GetSize( BPy_PartSys * self, PyObject * args ){
+static PyObject *Part_GetSize( BPy_PartSys * self, PyObject * args )
+{
 	ParticleKey state;
 	ParticleSystem *psys = 0L;
 	ParticleData *data;
 	Object *ob = 0L;
 	PyObject *partlist,*tuple;
-	PyObject* siz = 0L;
+	DerivedMesh* dm;
+	float vm[4][4],wm[4][4];
 	float size;
 	int i;
 	int childexists = 0;
 	int all = 0;
 	int id = 0;
+    char *fmt = NULL;
 
 	float cfra=bsystem_time(ob,(float)CFRA,0.0);
 
 	if( !PyArg_ParseTuple( args, "|ii", &all, &id ) )
 		return EXPP_ReturnPyObjError( PyExc_TypeError,
-				"expected one optional integer as argument" );
-
-	data = self->psys->particles;
+				"expected two optional integers as arguments" );
 
 	psys = self->psys;
 	ob = self->object;
@@ -1039,13 +1129,39 @@ static PyObject *Part_GetSize( BPy_PartSys * self, PyObject * args ){
 	if (!ob || !psys)
 		Py_RETURN_NONE;
 
-		partlist = PyList_New( 0 );
+	G.rendering = 1;
 
-		if (psys->totchild > 0 && !(psys->part->draw & PART_DRAW_PARENT))
-			childexists = 1;
+	/* Just to create a valid rendering context */
+	psys_render_set(ob,psys,vm,wm,0,0,0);
 
-		for (i = 0; i < psys->totpart + psys->totchild; i++, data++){
-		if (psys->part->type != 2){
+	dm = mesh_create_derived_render(ob,CD_MASK_BAREMESH|CD_MASK_MTFACE|CD_MASK_MCOL);
+	dm->release(dm);
+	data = self->psys->particles;
+
+	if ( !psys_check_enabled(ob,psys) ){
+		psys_render_restore(ob,psys);
+		G.rendering = 0;
+		Particle_Recalc(self,1);
+		Py_RETURN_NONE;
+	}
+
+	partlist = PyList_New( 0 );
+
+	if( !partlist ){
+		PyErr_SetString( PyExc_MemoryError, "PyList_New() failed" );
+		goto error;
+	}
+
+	if (psys->totchild > 0 && !(psys->part->draw & PART_DRAW_PARENT))
+		childexists = 1;
+
+	if(id)
+		fmt = "(fi)";
+	else
+		fmt = "f";
+
+	for (i = 0; i < psys->totpart + psys->totchild; i++, data++){
+		if (psys->part->type != PART_HAIR){
 			if (childexists && (i < psys->totpart))
 				continue;
 
@@ -1061,43 +1177,61 @@ static PyObject *Part_GetSize( BPy_PartSys * self, PyObject * args ){
 				ChildParticle *cpa= &psys->child[i-psys->totpart];
 				size = psys_get_child_size(psys,cpa,cfra,0);
 			}
-			if (id){
-				tuple = PyTuple_New(2);
-				PyTuple_SetItem(tuple,0,PyFloat_FromDouble((double)size));
-				PyTuple_SetItem(tuple,1,PyInt_FromLong(i));
-				PyList_Append(partlist,tuple);
-				Py_DECREF(tuple);
-			} else {
-				siz = PyFloat_FromDouble((double)size);
-				PyList_Append(partlist,siz);
-				Py_DECREF(siz);
+
+			tuple = Py_BuildValue(fmt,(double)size,i);
+
+			if (!tuple){
+				PyErr_SetString( PyExc_RuntimeError,
+						"Couldn't build tuple" );
+				goto error;
 			}
+
+			if (PyList_Append(partlist,tuple) < 0){
+				PyErr_SetString( PyExc_RuntimeError,
+						"Couldn't append item to PyList" );
+				goto error;
+			}
+			Py_DECREF(tuple);
+			tuple = NULL;
 		}
 	}
+
+	psys_render_restore(ob,psys);
+	G.rendering = 0;
+	Particle_Recalc(self,1);
 	return partlist;
+
+error:
+	Py_XDECREF(partlist);
+	Py_XDECREF(tuple);
+	psys_render_restore(ob,psys);
+	G.rendering = 0;
+	Particle_Recalc(self,1);
+	return NULL;
 }
 
 
-static PyObject *Part_GetAge( BPy_PartSys * self, PyObject * args ){
+static PyObject *Part_GetAge( BPy_PartSys * self, PyObject * args )
+{
 	ParticleKey state;
 	ParticleSystem *psys = 0L;
 	ParticleData *data;
 	Object *ob = 0L;
 	PyObject *partlist,*tuple;
-	PyObject* lif = 0L;
+	DerivedMesh* dm;
+	float vm[4][4],wm[4][4];
 	float life;
 	int i;
 	int childexists = 0;
 	int all = 0;
 	int id = 0;
+	char *fmt = NULL;
 
 	float cfra=bsystem_time(ob,(float)CFRA,0.0);
 
 	if( !PyArg_ParseTuple( args, "|ii", &all, &id ) )
 		return EXPP_ReturnPyObjError( PyExc_TypeError,
-				"expected one optional integer as argument" );
-
-	data = self->psys->particles;
+				"expected two optional integers as arguments" );
 
 	psys = self->psys;
 	ob = self->object;
@@ -1105,13 +1239,37 @@ static PyObject *Part_GetAge( BPy_PartSys * self, PyObject * args ){
 	if (!ob || !psys)
 		Py_RETURN_NONE;
 
-		partlist = PyList_New( 0 );
+	G.rendering = 1;
 
-		if (psys->totchild > 0 && !(psys->part->draw & PART_DRAW_PARENT))
-			childexists = 1;
+	/* Just to create a valid rendering context */
+	psys_render_set(ob,psys,vm,wm,0,0,0);
 
-		for (i = 0; i < psys->totpart + psys->totchild; i++, data++){
-		if (psys->part->type != 2){
+	dm = mesh_create_derived_render(ob,CD_MASK_BAREMESH|CD_MASK_MTFACE|CD_MASK_MCOL);
+	dm->release(dm);
+	data = self->psys->particles;
+
+	if ( !psys_check_enabled(ob,psys) ){
+		psys_render_restore(ob,psys);
+		G.rendering = 0;
+		Py_RETURN_NONE;
+	}
+
+	partlist = PyList_New( 0 );
+	if( !partlist ){
+		PyErr_SetString( PyExc_MemoryError, "PyList_New() failed" );
+		goto error;
+	}
+
+	if (psys->totchild > 0 && !(psys->part->draw & PART_DRAW_PARENT))
+		childexists = 1;
+
+	if(id)
+		fmt = "(fi)";
+	else
+		fmt = "f";
+
+	for (i = 0; i < psys->totpart + psys->totchild; i++, data++){
+		if (psys->part->type != PART_HAIR){
 
 			if (childexists && (i < psys->totpart))
 				continue;
@@ -1128,20 +1286,37 @@ static PyObject *Part_GetAge( BPy_PartSys * self, PyObject * args ){
 				ChildParticle *cpa= &psys->child[i-psys->totpart];
 				life = psys_get_child_time(psys,cpa,cfra);
 			}
-			if (id){
-				tuple = PyTuple_New(2);
-				PyTuple_SetItem(tuple,0,PyFloat_FromDouble((double)life));
-				PyTuple_SetItem(tuple,1,PyInt_FromLong(i));
-				PyList_Append(partlist,tuple);
-				Py_DECREF(tuple);
-			} else {
-				lif = PyFloat_FromDouble((double)life);
-				PyList_Append(partlist,lif);
-				Py_DECREF(lif);
+
+			tuple = Py_BuildValue(fmt,(double)life,i);
+
+			if (!tuple){
+				PyErr_SetString( PyExc_RuntimeError,
+						"Couldn't build tuple" );
+				goto error;
 			}
+
+			if (PyList_Append(partlist,tuple) < 0){
+				PyErr_SetString( PyExc_RuntimeError,
+						"Couldn't append item to PyList" );
+				goto error;
+			}
+			Py_DECREF(tuple);
+			tuple = NULL;
 		}
 	}
+
+	psys_render_restore(ob,psys);
+	G.rendering = 0;
+	Particle_Recalc(self,1);
 	return partlist;
+
+error:
+	Py_XDECREF(partlist);
+	Py_XDECREF(tuple);
+	psys_render_restore(ob,psys);
+	G.rendering = 0;
+	Particle_Recalc(self,1);
+	return NULL;
 }
 
 
@@ -1376,11 +1551,8 @@ static int Part_set2d( BPy_PartSys * self, PyObject * args )
 {
 	int number;
 
-	if( !PyInt_Check( args ) ) {
-		char errstr[128];
-		sprintf ( errstr, "expected int argument" );
-		return EXPP_ReturnIntError( PyExc_TypeError, errstr );
-	}
+	if( !PyInt_Check( args ) )
+		return EXPP_ReturnIntError( PyExc_TypeError, "expected int argument" );
 
 	number = PyInt_AS_LONG( args );
 
@@ -1526,7 +1698,7 @@ static int Part_setRandEmission( BPy_PartSys * self, PyObject * args )
 
 static PyObject *Part_getRandEmission( BPy_PartSys * self )
 {
-	return PyInt_FromLong( ((long)( self->psys->part->flag & PART_BOIDS_2D )) > 0 );
+	return PyInt_FromLong( ((long)( self->psys->part->flag & PART_TRAND )) > 0 );
 }
 
 static int Part_setParticleDist( BPy_PartSys * self, PyObject * args )
@@ -1546,7 +1718,7 @@ static int Part_setParticleDist( BPy_PartSys * self, PyObject * args )
 		return EXPP_ReturnIntError( PyExc_TypeError, errstr );
 	}
 
-	self->psys->part->from = number;
+	self->psys->part->from = (short)number;
 
 	Particle_RecalcPsys_distr(self,1);
 
@@ -1603,7 +1775,7 @@ static int Part_setDist( BPy_PartSys * self, PyObject * args )
 		return EXPP_ReturnIntError( PyExc_TypeError, errstr );
 	}
 
-	self->psys->part->distr = number;
+	self->psys->part->distr = (short)number;
 
 	Particle_RecalcPsys_distr(self,1);
 
@@ -1731,7 +1903,7 @@ static int Part_setTargetPsys( BPy_PartSys * self, PyObject * args ){
 
 	res = EXPP_setIValueRange( args, &self->psys->target_psys, 0, tottpsys, 'h' );
 
-	if((psys=psys_get_current(ob))){
+	if( ( psys = psys_get_current(ob) ) ){
 		if(psys->keyed_ob==ob || psys->target_ob==ob){
 			if(psys->keyed_ob==ob)
 				psys->keyed_ob=NULL;
diff --git a/source/blender/python/api2_2x/doc/IDProp.py b/source/blender/python/api2_2x/doc/IDProp.py
index 0a0df335fa3..01d5136cd70 100644
--- a/source/blender/python/api2_2x/doc/IDProp.py
+++ b/source/blender/python/api2_2x/doc/IDProp.py
@@ -18,7 +18,9 @@ class IDGroup:
 	
 	Note that for arrays, the array type defaults to int unless a float is found
 	while scanning the template list; if any floats are found, then the whole
-	array is float.
+	array is float.  Note that double-precision floating point numbers are used for
+	python-created float ID properties and arrays (though the internal C api does 
+	support single-precision floats, and the python code will read them).
 	
 	You can also delete properties with the del operator.  For example:
 	
diff --git a/source/blender/python/api2_2x/doc/Ipo.py b/source/blender/python/api2_2x/doc/Ipo.py
index c479926ccf3..d1c72f8cb86 100644
--- a/source/blender/python/api2_2x/doc/Ipo.py
+++ b/source/blender/python/api2_2x/doc/Ipo.py
@@ -250,7 +250,7 @@ class Ipo:
 			OfsZ, SizeX, SizeY, SizeZ, texR, texG, texB, DefVar, Col, Nor, Var,
 			Disp.
 			3. Object Ipo: LocX, LocY, LocZ, dLocX, dLocY, dLocZ, RotX, RotY, RotZ,
-			dRotX, dRotY, dRotZ, SizeX, SizeY, SizeZ, dSizeX, dSizeY, dSizeZ,
+			dRotX, dRotY, dRotZ, ScaleX, ScaleY, ScaleZ, dScaleX, dScaleY, dScaleZ,
 			Layer, Time, ColR, ColG, ColB, ColA, FStreng, FFall, Damping,
 			RDamp, Perm.
 			4. Lamp Ipo: Energ, R, G, B, Dist, SpoSi, SpoBl, Quad1, Quad2, HaInt.
@@ -289,7 +289,7 @@ class Ipo:
 			OfsZ, SizeX, SizeY, SizeZ, texR, texG, texB, DefVar, Col, Nor, Var,
 			Disp.
 			3. Object Ipo: LocX, LocY, LocZ, dLocX, dLocY, dLocZ, RotX, RotY, RotZ,
-			dRotX, dRotY, dRotZ, SizeX, SizeY, SizeZ, dSizeX, dSizeY, dSizeZ,
+			dRotX, dRotY, dRotZ, ScaleX, ScaleY, ScaleZ, dScaleX, dScaleY, dScaleZ,
 			Layer, Time, ColR, ColG, ColB, ColA, FStreng, FFall, Damping,
 			RDamp, Perm.
 			4. Lamp Ipo: Energ, R, G, B, Dist, SpoSi, SpoBl, Quad1, Quad2, HaInt.
diff --git a/source/blender/python/api2_2x/doc/LibData.py b/source/blender/python/api2_2x/doc/LibData.py
index 47bd7fdb763..daa6a186531 100644
--- a/source/blender/python/api2_2x/doc/LibData.py
+++ b/source/blender/python/api2_2x/doc/LibData.py
@@ -27,17 +27,37 @@ Example::
 """
 
 def load(filename,relative=False):
-  """
-  Select an existing .blend file for use as a library.  Unlike the 
-  Library module, multiple libraries can be defined at the same time.  
-  
-  @type filename: string
-  @param filename: The filename of a Blender file. Filenames starting with "//" will be loaded relative to the blend file's location.
-  @type relative: boolean
-  @param relative: Convert relative paths to absolute paths (default).  Setting this parameter to True will leave paths relative.
-  @rtype: Library
-  @return: return a L{Library} object.
-  """
+	"""
+	Select an existing .blend file for use as a library.  Unlike the 
+	Library module, multiple libraries can be defined at the same time.  
+	
+	@type filename: string
+	@param filename: The filename of a Blender file. Filenames starting with "//" will be loaded relative to the blend file's location.
+	@type relative: boolean
+	@param relative: Convert relative paths to absolute paths (default).  Setting this parameter to True will leave paths relative.
+	@rtype: Library
+	@return: return a L{Library} object.
+	"""
+
+def paths(link=0):
+	"""
+	Returns a list of paths used in the current blend file.
+	
+	@type link: int
+	@param link: 0 (default if no args given) for all library paths, 1 for directly linked library paths only, 2 for indirectly linked library paths only.
+	@rtype: List
+	@return: return a list of path strings.
+	"""
+
+def replace(pathFrom, pathTo):
+	"""
+	Replaces an existing directly linked path.
+	
+	@type pathFrom: string
+	@param pathFrom: An existing library path.
+	@type pathTo: string
+	@param pathTo: A new library path.
+	"""
 
 class Libraries:
 	"""
diff --git a/source/blender/python/api2_2x/doc/Particle.py b/source/blender/python/api2_2x/doc/Particle.py
index 192ecd5355b..511ad81b45f 100644
--- a/source/blender/python/api2_2x/doc/Particle.py
+++ b/source/blender/python/api2_2x/doc/Particle.py
@@ -56,17 +56,17 @@ class Particle:
 	@type type: int
 	@ivar resolutionGrid: The resolution of the particle grid.
 	@type resolutionGrid: int
-	@ivar startFrame: Frame # to start emitting particles.
+	@ivar startFrame: Frame number to start emitting particles.
 	@type startFrame: float
-	@ivar endFrame: Frame # to stop emitting particles.
+	@ivar endFrame: Frame number to stop emitting particles.
 	@type endFrame: float
 	@ivar editable: Finalize hair to enable editing in particle mode.
 	@type editable: int
 	@ivar amount: The total number of particles.
 	@type amount: int
-	@ivar multireact: React multiple times ( Paricle.REACTON[ 'NEAR' | 'COLLISION' | 'DEATH' ] ).
+	@ivar multireact: React multiple times ( Particle.REACTON[ 'NEAR' | 'COLLISION' | 'DEATH' ] ).
 	@type multireact: int
-	@ivar reactshape: Power of reaction strength dependence on distance to target.
+	@ivar reactshape: Power of reaction strength, dependent on distance to target.
 	@type reactshape: float
 	@ivar hairSegments: Amount of hair segments.
 	@type hairSegments: int
@@ -74,13 +74,13 @@ class Particle:
 	@type lifetime: float
 	@ivar randlife: Give the particle life a random variation.
 	@type randlife: float
-	@ivar randemission: Give the particle life a random variation
+	@ivar randemission: Emit particles in random order.
 	@type randemission: int
-	@ivar particleDistribution: Where to emit particles from  Paricle.EMITFROM[ 'PARTICLE' | 'VOLUME' | 'FACES' | 'VERTS' ] )
+	@ivar particleDistribution: Where to emit particles from  ( Particle.EMITFROM[ 'PARTICLE' | 'VOLUME' | 'FACES' | 'VERTS' ] )
 	@type particleDistribution: int
 	@ivar evenDistribution: Use even distribution from faces based on face areas or edge lengths.
 	@type evenDistribution: int
-	@ivar distribution: How to distribute particles on selected element Paricle.DISTRIBUTION[ 'GRID' | 'RANDOM' | 'JITTERED' ] ).
+	@ivar distribution: How to distribute particles on selected element ( Particle.DISTRIBUTION[ 'GRID' | 'RANDOM' | 'JITTERED' ] ).
 	@type distribution: int
 	@ivar jitterAmount: Amount of jitter applied to the sampling.
 	@type jitterAmount: float
@@ -131,237 +131,56 @@ class Particle:
 		Get the particles locations.
 		A list of tuple is returned in particle mode.
 		A list of list of tuple is returned in hair mode.
-		The tuple is a vector list of 3 or 4 floats in world space (x,y,z, optionnaly the particle's id).
+		The tuple is a vector of 3 or 4 floats in world space (x,y,z,
+optionally the particle's id).
 		@type all: int
 		@param all: if not 0 export all particles (uninitialized (unborn or died)particles exported as None).
 		@type id: int
 		@param id: add the particle id in the end of the vector tuple
-		@rtype: list of vectors (tuple of 3 floats and optionnaly the id) or list of list of vectors
-		@return: list of vectors or list of list of vectors (hair mode)
+		@rtype: list of vectors (tuple of 3 floats and optionally the id) or list of list of vectors
+		@return: list of vectors or list of list of vectors (hair mode) or None if system is disabled
 		"""
 	def getRot(all=0,id=0):
 		"""
-		Get the particles rotations as quaternion.
+		Get the particles' rotations as quaternion.
 		A list of tuple is returned in particle mode.
-		The tuple is a vector list of 4 or 5 floats (x,y,z,w, optionnaly the id of the particle).
+		The tuple is vector of 4 or 5 floats (x,y,z,w, optionally the id of the particle).
 		
 		@type all: int
-		@param all: if not 0 export all particles (uninitialized (unborn or died) particles exported as None).
+		@param all: if not 0, export all particles (uninitialized (unborn or died) particles exported as None).
 		@type id: int
 		@param id: add the particle id in the return tuple
 		@rtype: list of tuple of 4 or 5 elements (if id is not zero)
-		@return: list of 4-tuples
+		@return: list of 4-tuples or None if system is disabled
 		"""
 		
 	def getMat():
 		"""
-		Get the particles material.
+		Get the particles' material.
 		@rtype: Blender Material
-		@return: The marterial assigned to particles
+		@return: The material assigned to particles
 		"""
 		
 	def getSize(all=0,id=0):
 		"""
-		Get the particles size.
+		Get the particles' size.
 		A list of float or list of tuple (particle's size,particle's id).
 		@type all: int
-		@param all: if not 0 export all particles (uninitialized (unborn or died) particles exported as None).
+		@param all: if not 0, export all particles (uninitialized (unborn or died) particles exported as None).
 		@type id: int
 		@param id: add the particle id in the return tuple
 		@rtype: list of floats
-		@return: list of floats or list of tuples if id is not zero (size,id).
+		@return: list of floats or list of tuples if id is not zero (size,id) or None if system is disabled.
 		"""
 		
 	def getAge(all=0,id=0):
 		"""
-		Get the particles age.
-		A list of float or list of tuple (particle's age,particle's id).
+		Get the particles' age.
+		A list of float or list of tuple (particle's age, particle's id).
 		@type all: int
-		@param all: if not 0 export all particles (uninitialized (unborn or died) particles exported as None).
+		@param all: if not 0, export all particles (uninitialized (unborn or died) particles exported as None).
 		@type id: int
 		@param id: add the particle id in the return tuple
 		@rtype: list of floats
-		@return: list of floats or list of tuples if id is not zero (size,id).
-		"""
-# Blender.Object module and the Object PyType object
-
-"""
-The Blender.Particle submodule
-
-
-Particle
-========
-
-This module provides access to the B{Particle} in Blender.
-
-@type TYPE: readonly dictionary
-@var TYPE: Constant dict used for with L{Particle.TYPE}
-		- HAIR: set particle system to hair mode.
-		- REACTOR: set particle system to reactor mode.
-		- EMITTER: set particle system to emitter mode.
-@type DISTRIBUTION: readonly dictionary
-@var DISTRIBUTION: Constant dict used for with L{Particle.DISTRIBUTION}
-		- GRID: set grid distribution.
-		- RANDOM: set random distribution.
-		- JITTERED: set jittered distribution.
-@type EMITFROM: readonly dictionary
-@var EMITFROM: Constant dict used for with L{Particle.EMITFROM}
-		- VERTS: set particles emit from vertices
-		- FACES: set particles emit from faces
-		- VOLUME: set particles emit from volume
-		- PARTICLE: set particles emit from particles
-@type REACTON: readonly dictionary
-@var REACTON: Constant dict used for with L{Particle.REACTON}
-		- NEAR: react on near
-		- COLLISION: react on collision
-		- DEATH: react on death
-@type DRAWAS: readonly dictionary
-@var DRAWAS: Constant dict used for with L{Particle.DRAWAS}
-		- NONE: Don't draw
-		- POINT: Draw as point
-		- CIRCLE: Draw as circles
-		- CROSS: Draw as crosses
-		- AXIS: Draw as axis
-		- LINE: Draw as lines
-		- PATH: Draw pathes
-		- OBJECT: Draw object
-		- GROUP: Draw goup
-		- BILLBOARD: Draw as billboard 
-"""
-
-def Get(name):
-		"""
-		Get the particle system of the object "name".
-		@type name: string
-		@return: The particle system of the object.
-		"""
-def New(name):
-		"""
-		Assign a new particle system to the object "name".
-		@type name: string
-		@return: The newly created particle system.
-		"""
-
-class Particle:
-	"""
-	The Particle object
-	===================
-		This object gives access to paticles data.
-		
-	@ivar seed: Set an offset in the random table.
-	@type seed: int
-	@ivar type: Type of particle system ( Particle.TYPE[ 'HAIR' | 'REACTOR' | 'EMITTER' ] ).
-	@type type: int
-	@ivar resolutionGrid: The resolution of the particle grid.
-	@type resolutionGrid: int
-	@ivar startFrame: Frame # to start emitting particles.
-	@type startFrame: float
-	@ivar endFrame: Frame # to stop emitting particles.
-	@type endFrame: float
-	@ivar editable: Finalize hair to enable editing in particle mode.
-	@type editable: int
-	@ivar amount: The total number of particles.
-	@type amount: int
-	@ivar multireact: React multiple times ( Paricle.REACTON[ 'NEAR' | 'COLLISION' | 'DEATH' ] ).
-	@type multireact: int
-	@ivar reactshape: Power of reaction strength dependence on distance to target.
-	@type reactshape: float
-	@ivar hairSegments: Amount of hair segments.
-	@type hairSegments: int
-	@ivar lifetime: Specify the life span of the particles.
-	@type lifetime: float
-	@ivar randlife: Give the particle life a random variation.
-	@type randlife: float
-	@ivar randemission: Give the particle life a random variation
-	@type randemission: int
-	@ivar particleDistribution: Where to emit particles from  Paricle.EMITFROM[ 'PARTICLE' | 'VOLUME' | 'FACES' | 'VERTS' ] )
-	@type particleDistribution: int
-	@ivar evenDistribution: Use even distribution from faces based on face areas or edge lengths.
-	@type evenDistribution: int
-	@ivar distribution: How to distribute particles on selected element Paricle.DISTRIBUTION[ 'GRID' | 'RANDOM' | 'JITTERED' ] ).
-	@type distribution: int
-	@ivar jitterAmount: Amount of jitter applied to the sampling.
-	@type jitterAmount: float
-	@ivar pf: Emission locations / face (0 = automatic).
-	@type pf:int
-	@ivar invert: Invert what is considered object and what is not.
-	@type invert: int
-	@ivar targetObject: The object that has the target particle system (empty if same object).
-	@type targetObject: Blender object
-	@ivar targetpsys: The target particle system number in the object.
-	@type targetpsys: int
-	@ivar 2d: Constrain boids to a surface.
-	@type 2d: float
-	@ivar maxvel: Maximum velocity.
-	@type maxvel: float
-	@ivar avvel: The usual speed % of max velocity.
-	@type avvel: float
-	@ivar latacc: Lateral acceleration % of max velocity
-	@type latacc: float
-	@ivar tanacc: Tangential acceleration % of max velocity
-	@type tanacc: float
-	@ivar groundz: Default Z value.
-	@type groundz: float
-	@ivar object: Constrain boids to object's surface.
-	@type object: Blender Object
-	@ivar renderEmitter: Render emitter object.
-	@type renderEmitter: int
-	@ivar displayPercentage: Particle display percentage.
-	@type displayPercentage: int
-	@ivar hairDisplayStep: How many steps paths are drawn with (power of 2) in visu mode.
-	@type hairDisplayStep: int
-	@ivar hairRenderStep: How many steps paths are rendered with (power of 2) in render mode."
-	@type hairRenderStep: int
-	@ivar duplicateObject: Get the duplicate object.
-	@type duplicateObject: Blender Object
-	@ivar drawAs: Get draw type Particle.DRAWAS([ 'NONE' | 'OBJECT' | 'POINT' | ... ]).
-	@type drawAs: int
-	"""
-	def freeEdit():
-		"""
-		Free edit mode.
-		@return: None
-		"""
-
-	def getLoc(all=0,id=0):
-		"""
-		Get the particles locations.
-		A list of tuple is returned in particle mode.
-		A list of list of tuple is returned in hair mode.
-		The tuple is a vector list of 3 floats in world space.
-		@type all: int
-		@param all: if not 0 export all particles (uninitialized (unborn or died)particles exported as None).
-		@type id: int
-		@param id: add the particle id in the end of the vector tuple
-		@rtype: list of vectors (tuple of 3 floats and optionnaly the id) or list of list of vectors
-		@return: list of vectors or list of list of vectors (hair mode)
-		"""
-	def getRot(all=0,id=0):
-		"""
-		Get the particles rotations as quaternion.
-		A list of tuple is returned in particle mode.
-		The tuple is a vector list of 4 floats (quaternion).
-		@type all: int
-		@param all: if not 0 export all particles (uninitialized (unborn or died) particles exported as None).
-		@type id: int
-		@param id: add the particle id in the return tuple
-		@rtype: list of tuple of 4 or 5 elements (if id is not zero)
-		@return: list of 4-tuples
-		"""
-	def getMat():
-		"""
-		Get the particles material.
-		@rtype: Blender Material
-		@return: The marterial assigned to particles
-		"""
-	def getSize(all=0,id=0):
-		"""
-		Get the particles size.
-		A list of float.
-		@type all: int
-		@param all: if not 0 export all particles (uninitialized (unborn or died) particles exported as None).
-		@type id: int
-		@param id: add the particle id in the return tuple
-		@rtype: list of floats
-		@return: list of floats or list of tuples if id is not zero (size,id).
+		@return: list of floats or list of tuples if id is not zero (size,id) or None if system is disabled.
 		"""
diff --git a/source/blender/python/api2_2x/sceneRender.c b/source/blender/python/api2_2x/sceneRender.c
index d382d450970..8f251fc8452 100644
--- a/source/blender/python/api2_2x/sceneRender.c
+++ b/source/blender/python/api2_2x/sceneRender.c
@@ -565,6 +565,8 @@ PyObject *RenderData_SaveRenderedImage ( BPy_RenderData * self, PyObject *args )
 PyObject *RenderData_RenderAnim( BPy_RenderData * self )
 {
 	Scene *oldsce;
+	/* this prevents a deadlock when there are pynodes: */
+	PyThreadState *tstate = PyEval_SaveThread();
 
 	if (!G.background) {
 		oldsce = G.scene;
@@ -582,9 +584,9 @@ PyObject *RenderData_RenderAnim( BPy_RenderData * self )
 		if (G.scene->r.sfra > G.scene->r.efra)
 			return EXPP_ReturnPyObjError (PyExc_RuntimeError,
 				"start frame must be less or equal to end frame");
-		
 		RE_BlenderAnim(re, G.scene, G.scene->r.sfra, G.scene->r.efra);
 	}
+	PyEval_RestoreThread(tstate);
 	Py_RETURN_NONE;
 }
 
diff --git a/source/blender/render/intern/source/shadeoutput.c b/source/blender/render/intern/source/shadeoutput.c
index 0928042729a..5b69323667e 100644
--- a/source/blender/render/intern/source/shadeoutput.c
+++ b/source/blender/render/intern/source/shadeoutput.c
@@ -1379,6 +1379,8 @@ static void shade_one_light(LampRen *lar, ShadeInput *shi, ShadeResult *shr, int
 		}
 		
 		/* specularity */
+		shadfac[3]*= phongcorr;	/* note, shadfac not allowed to be stored nonlocal */
+		
 		if(shadfac[3]>0.0f && shi->spec!=0.0f && !(lar->mode & LA_NO_SPEC) && !(lar->mode & LA_ONLYSHADOW)) {
 			
 			if(!(passflag & (SCE_PASS_COMBINED|SCE_PASS_SPEC)));
diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c
index 529a795a101..4a4eaf3c81f 100644
--- a/source/blender/src/buttons_editing.c
+++ b/source/blender/src/buttons_editing.c
@@ -1929,7 +1929,7 @@ static void draw_modifier(uiBlock *block, Object *ob, ModifierData *md, int *xco
 			uiBlockBeginAlign(block);
 			uiDefButF(block, NUM, B_MODIFIER_RECALC, "Width: ",
 					  lx, (cy -= 19), buttonWidth, 19, &bmd->value,
-					  0.0, 0.5, 5, 2,
+					  0.0, 0.5, 5, 4,
 					  "Bevel value/amount");
 			/*uiDefButI(block, NUM, B_MODIFIER_RECALC, "Recurs",
 					  lx, (cy -= 19), buttonWidth, 19, &bmd->res,
diff --git a/source/blender/src/buttons_logic.c b/source/blender/src/buttons_logic.c
index 441d00ffc30..498edc0dfed 100644
--- a/source/blender/src/buttons_logic.c
+++ b/source/blender/src/buttons_logic.c
@@ -2062,7 +2062,7 @@ static short draw_actuatorbuttons(Object *ob, bActuator *act, uiBlock *block, sh
 			coa->time = 0;
 			uiDefButS(block, MENU, 1, str,		xco+10, yco-65, 70, 19, &coa->flag, 0.0, 0.0, 0, 0, "");
 		
-			uiDefButS(block, NUM,		0, "Damp:",	xco+10, yco-45, 70, 19, &coa->damp, 0.0, 100.0, 0, 0, "");
+			uiDefButS(block, NUM,		0, "damp",	xco+10, yco-45, 70, 19, &coa->damp, 0.0, 100.0, 0, 0, "Damping factor: time constant (in frame) of low pass filter");
 			uiDefBut(block, LABEL,			0, "Min",	xco+80, yco-45, (width-90)/2, 19, NULL, 0.0, 0.0, 0, 0, "");
 			uiDefBut(block, LABEL,			0, "Max",	xco+80+(width-90)/2, yco-45, (width-90)/2, 19, NULL, 0.0, 0.0, 0, 0, "");
 
@@ -2084,12 +2084,12 @@ static short draw_actuatorbuttons(Object *ob, bActuator *act, uiBlock *block, sh
 			str= "Direction %t|None %x0|X axis %x1|Y axis %x2|Z axis %x4|-X axis %x8|-Y axis %x16|-Z axis %x32";
 			uiDefButS(block, MENU, B_REDR, str,		xco+10, yco-65, 70, 19, &coa->mode, 0.0, 0.0, 0, 0, "Set the direction of the ray");
 		
-			uiDefButS(block, NUM,		0, "Damp:",	xco+10, yco-45, 70, 19, &coa->damp, 0.0, 100.0, 0, 0, "");
+			uiDefButS(block, NUM,		0, "damp",	xco+10, yco-45, 70, 19, &coa->damp, 0.0, 100.0, 0, 0, "Damping factor: time constant (in frame) of low pass filter");
 			uiDefBut(block, LABEL,			0, "Range",	xco+80, yco-45, (width-115)/2, 19, NULL, 0.0, 0.0, 0, 0, "Set the maximum length of ray");
 			uiDefButBitS(block, TOG, ACT_CONST_DISTANCE, B_REDR, "Dist",	xco+80+(width-115)/2, yco-45, (width-115)/2, 19, &coa->flag, 0.0, 0.0, 0, 0, "Force distance of object to point of impact of ray");
 
-			if(coa->mode & (ACT_CONST_DIRPX|ACT_CONST_DIRMX)) fp= coa->minloc;
-			else if(coa->mode & (ACT_CONST_DIRPY|ACT_CONST_DIRMY)) fp= coa->minloc+1;
+			if(coa->mode & (ACT_CONST_DIRPX|ACT_CONST_DIRNX)) fp= coa->minloc;
+			else if(coa->mode & (ACT_CONST_DIRPY|ACT_CONST_DIRNY)) fp= coa->minloc+1;
 			else fp= coa->minloc+2;
 
 			uiDefButF(block, NUM, 0, "",		xco+80, yco-65, (width-115)/2, 19, fp+3, 0.0, 2000.0, 10, 0, "Maximum length of ray");
@@ -2124,7 +2124,7 @@ static short draw_actuatorbuttons(Object *ob, bActuator *act, uiBlock *block, sh
 			str= "Direction %t|None %x0|X axis %x1|Y axis %x2|Z axis %x4";
 			uiDefButS(block, MENU, B_REDR, str,		xco+10, yco-65, 70, 19, &coa->mode, 0.0, 0.0, 0, 0, "Select the axis to be aligned along the reference direction");
 		
-			uiDefButS(block, NUM,		0, "Damp:",	xco+10, yco-45, 70, 19, &coa->damp, 0.0, 100.0, 0, 0, "");
+			uiDefButS(block, NUM,		0, "damp",	xco+10, yco-45, 70, 19, &coa->damp, 0.0, 100.0, 0, 0, "Damping factor: time constant (in frame) of low pass filter");
 			uiDefBut(block, LABEL,			0, "X",	xco+80, yco-45, (width-115)/3, 19, NULL, 0.0, 0.0, 0, 0, "");
 			uiDefBut(block, LABEL,			0, "Y",	xco+80+(width-115)/3, yco-45, (width-115)/3, 19, NULL, 0.0, 0.0, 0, 0, "");
 			uiDefBut(block, LABEL,			0, "Z",	xco+80+2*(width-115)/3, yco-45, (width-115)/3, 19, NULL, 0.0, 0.0, 0, 0, "");
@@ -2133,7 +2133,9 @@ static short draw_actuatorbuttons(Object *ob, bActuator *act, uiBlock *block, sh
 			uiDefButF(block, NUM, 0, "",		xco+80+(width-115)/3, yco-65, (width-115)/3, 19, &coa->maxrot[1], -2000.0, 2000.0, 10, 0, "Y component of reference direction");
 			uiDefButF(block, NUM, 0, "",		xco+80+2*(width-115)/3, yco-65, (width-115)/3, 19, &coa->maxrot[2], -2000.0, 2000.0, 10, 0, "Z component of reference direction");
 
-			uiDefButS(block, NUM, 0, "time", xco+10, yco-84, 70+(width-115)/3, 19, &(coa->time), 0.0, 1000.0, 0, 0, "Maximum activation time in frame, 0 for unlimited");
+			uiDefButS(block, NUM, 0, "time", xco+10, yco-84, 70, 19, &(coa->time), 0.0, 1000.0, 0, 0, "Maximum activation time in frame, 0 for unlimited");
+			uiDefButF(block, NUM, 0, "min", xco+80, yco-84, (width-115)/2, 19, &(coa->minloc[0]), 0.0, 180.0, 10, 1, "Minimum angle (in degree) to maintain with target direction. No correction is done if angle with target direction is between min and max");
+			uiDefButF(block, NUM, 0, "max", xco+80+(width-115)/2, yco-84, (width-115)/2, 19, &(coa->maxloc[0]), 0.0, 180.0, 10, 1, "Maximum angle (in degree) allowed with target direction. No correction is done if angle with target direction is between min and max");
 		}
 		str= "Constraint Type %t|Location %x0|Distance %x1|Orientation %x2";
 		but = uiDefButS(block, MENU, B_REDR, str,		xco+40, yco-23, (width-80), 19, &coa->type, 0.0, 0.0, 0, 0, "");
diff --git a/source/blender/src/drawaction.c b/source/blender/src/drawaction.c
index 6fe37c1c6e5..0782ccfc7ee 100644
--- a/source/blender/src/drawaction.c
+++ b/source/blender/src/drawaction.c
@@ -58,6 +58,7 @@
 #include "DNA_constraint_types.h"
 #include "DNA_key_types.h"
 #include "DNA_userdef_types.h"
+#include "DNA_gpencil_types.h"
 
 #include "BKE_action.h"
 #include "BKE_depsgraph.h"
@@ -74,6 +75,7 @@
 #include "BIF_editnla.h"
 #include "BIF_interface.h"
 #include "BIF_interface_icons.h"
+#include "BIF_drawgpencil.h"
 #include "BIF_gl.h"
 #include "BIF_glutil.h"
 #include "BIF_resources.h"
@@ -83,9 +85,11 @@
 
 #include "BDR_drawaction.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_time.h"
@@ -464,7 +468,7 @@ static void draw_channel_names(void)
 			bActionGroup *grp = NULL;
 			short indent= 0, offset= 0, sel= 0, group=0;
 			int expand= -1, protect = -1, special= -1, mute = -1;
-			char name[32];
+			char name[64];
 			
 			/* determine what needs to be drawn */
 			switch (ale->type) {
@@ -622,12 +626,112 @@ static void draw_channel_names(void)
 					sprintf(name, "Constraint");
 				}
 					break;
+				case ACTTYPE_GPDATABLOCK: /* gpencil datablock */
+				{
+					bGPdata *gpd = (bGPdata *)ale->data;
+					ScrArea *sa = (ScrArea *)ale->owner;
+					
+					indent = 0;
+					group= 3;
+					
+					/* only show expand if there are any channels */
+					if (gpd->layers.first) {
+						if (gpd->flag & GP_DATA_EXPAND)
+							expand = ICON_TRIA_DOWN;
+						else
+							expand = ICON_TRIA_RIGHT;
+					}
+					
+					switch (sa->spacetype) {
+						case SPACE_VIEW3D:
+						{
+							/* this shouldn't cause any overflow... */
+							sprintf(name, "3DView: %s", view3d_get_name(sa->spacedata.first));
+							special= ICON_VIEW3D;
+						}
+							break;
+						case SPACE_NODE:
+						{
+							SpaceNode *snode= sa->spacedata.first;
+							char treetype[12];
+							
+							if (snode->treetype == 1)
+								sprintf(treetype, "Composite");
+							else
+								sprintf(treetype, "Material");
+							sprintf(name, "Nodes: %s", treetype);
+							
+							special= ICON_NODE;
+						}
+							break;
+						case SPACE_SEQ:
+						{
+							SpaceSeq *sseq= sa->spacedata.first;
+							char imgpreview[10];
+							
+							switch (sseq->mainb) {
+								case 1: 	sprintf(imgpreview, "Image..."); 	break;
+								case 2: 	sprintf(imgpreview, "Luma..."); 	break;
+								case 3: 	sprintf(imgpreview, "Chroma...");	break;
+								case 4: 	sprintf(imgpreview, "Histogram");	break;
+								
+								default:	sprintf(imgpreview, "Sequence");	break;
+							}
+							sprintf(name, "Sequencer: %s", imgpreview);
+							
+							special= ICON_SEQUENCE;
+						}
+							break;
+						
+						default:
+						{
+							sprintf(name, "<Unknown GP-Data Source>");
+							special= -1;
+						}
+							break;
+					}
+				}
+					break;
+				case ACTTYPE_GPLAYER: /* gpencil layer */
+				{
+					bGPDlayer *gpl = (bGPDlayer *)ale->data;
+					
+					indent = 0;
+					special = -1;
+					expand = -1;
+					group = 1;
+					
+					if (EDITABLE_GPL(gpl))
+						protect = ICON_UNLOCKED;
+					else
+						protect = ICON_LOCKED;
+						
+					if (gpl->flag & GP_LAYER_HIDE)
+						mute = ICON_MUTE_IPO_ON;
+					else
+						mute = ICON_MUTE_IPO_OFF;
+					
+					sel = SEL_GPL(gpl);
+					BLI_snprintf(name, 32, gpl->info);
+				}
+					break;
 			}	
 
 			/* now, start drawing based on this information */
 			/* draw backing strip behind channel name */
-			if (group == 2) {
-				/* only for group-channels */
+			if (group == 3) {
+				/* only for gp-data channels */
+				if (ale->owner == curarea) // fixme... currently useless
+					BIF_ThemeColorShade(TH_GROUP_ACTIVE, 10);
+				else
+					BIF_ThemeColorShade(TH_GROUP, 20);
+				uiSetRoundBox((expand == ICON_TRIA_DOWN)? (1):(1|8));
+				gl_round_box(GL_POLYGON, x,  yminc, (float)NAMEWIDTH, ymaxc, 8);
+				
+				offset = 0;
+			}
+			else if (group == 2) {
+				/* only for action group channels */
 				if (ale->flag & AGRP_ACTIVE)
 					BIF_ThemeColorShade(TH_GROUP_ACTIVE, 10);
 				else
@@ -673,13 +777,19 @@ static void draw_channel_names(void)
 				offset += 17;
 			}
 			
-			/* draw special icon indicating type of ipo-blocktype? 
-			 * 	only for expand widgets for Ipo and Constraint Channels 
-			 */
-			if (special > 0) {
-				offset = (group) ? 29 : 24;
-				BIF_icon_draw(x+offset, yminc, special);
-				offset += 17;
+			/* draw special icon indicating certain data-types */
+			if (special > -1) {
+				if (group == 3) {
+					/* for gpdatablock channels */
+					BIF_icon_draw(x+offset, yminc, special);
+					offset += 17;
+				}
+				else {
+					/* for ipo/constraint channels */
+					offset = (group) ? 29 : 24;
+					BIF_icon_draw(x+offset, yminc, special);
+					offset += 17;
+				}
 			}
 				
 			/* draw name */
@@ -695,13 +805,13 @@ static void draw_channel_names(void)
 			offset = 0;
 			
 			/* draw protect 'lock' */
-			if (protect > 0) {
+			if (protect > -1) {
 				offset = 16;
 				BIF_icon_draw(NAMEWIDTH-offset, yminc, protect);
 			}
 			
 			/* draw mute 'eye' */
-			if (mute > 0) {
+			if (mute > -1) {
 				offset += 16;
 				BIF_icon_draw(NAMEWIDTH-offset, yminc, mute);
 			}
@@ -827,6 +937,12 @@ static void draw_channel_strips(void)
 					sel = SEL_ICU(icu);
 				}
 					break;
+				case ACTTYPE_GPLAYER:
+				{
+					bGPDlayer *gpl = (bGPDlayer *)ale->data;
+					sel = SEL_GPL(gpl);
+				}
+					break;
 			}
 			
 			if (datatype == ACTCONT_ACTION) {
@@ -865,6 +981,19 @@ static void draw_channel_strips(void)
 				glColor4ub(col2[0], col2[1], col2[2], 0x44);
 				glRectf(frame1_x, channel_y-CHANNELHEIGHT/2, G.v2d->hor.xmax,  channel_y+CHANNELHEIGHT/2);
 			}
+			else if (datatype == ACTCONT_GPENCIL) {
+				gla2DDrawTranslatePt(di, G.v2d->cur.xmin, y, &frame1_x, &channel_y);
+				
+				/* frames less than one get less saturated background */
+				if (sel) glColor4ub(col1[0], col1[1], col1[2], 0x22);
+				else glColor4ub(col2[0], col2[1], col2[2], 0x22);
+				glRectf(0, channel_y-CHANNELHEIGHT/2, frame1_x, channel_y+CHANNELHEIGHT/2);
+				
+				/* frames one and higher get a saturated background */
+				if (sel) glColor4ub(col1[0], col1[1], col1[2], 0x44);
+				else glColor4ub(col2[0], col2[1], col2[2], 0x44);
+				glRectf(frame1_x, channel_y-CHANNELHEIGHT/2, G.v2d->hor.xmax,  channel_y+CHANNELHEIGHT/2);
+			}
 		}
 		
 		/*	Increment the step */
@@ -899,6 +1028,9 @@ static void draw_channel_strips(void)
 				case ALE_ICU:
 					draw_icu_channel(di, ale->key_data, y);
 					break;
+				case ALE_GPFRAME:
+					draw_gpl_channel(di, ale->data, y);
+					break;
 			}
 		}
 		
@@ -1075,6 +1207,7 @@ void drawactionspace(ScrArea *sa, void *spacedata)
 {
 	bAction *act = NULL;
 	Key *key = NULL;
+	bGPdata *gpd = NULL;
 	void *data;
 	short datatype;
 	
@@ -1090,18 +1223,32 @@ void drawactionspace(ScrArea *sa, void *spacedata)
 
 	/* only try to refresh action that's displayed if not pinned */
 	if (G.saction->pin==0) {
-		if (OBACT)
-			G.saction->action = OBACT->action;
-		else
-			G.saction->action= NULL;
+		/* depends on mode */
+		switch (G.saction->mode) {
+			case SACTCONT_ACTION:
+			{
+				if (OBACT)
+					G.saction->action = OBACT->action;
+				else
+					G.saction->action= NULL;
+			}
+				break;
+		}
 	}
 	
 	/* get data */
 	data = get_action_context(&datatype);
-	if (datatype == ACTCONT_ACTION)
-		act = data;
-	else if (datatype == ACTCONT_SHAPEKEY)
-		key = data;
+	switch (datatype) {
+		case ACTCONT_ACTION:
+			act = data;
+			break;
+		case ACTCONT_SHAPEKEY:
+			key = data;
+			break;
+		case ACTCONT_GPENCIL:
+			gpd = data;
+			break;
+	}
 	
 	/* Lets make sure the width of the left hand of the screen
 	 * is set to an appropriate value based on whether sliders
@@ -1450,10 +1597,15 @@ static ActKeysInc *init_aki_data()
 	static ActKeysInc aki;
 	
 	/* init data of static struct here */
-	if ((curarea->spacetype == SPACE_ACTION) && NLA_ACTION_SCALED)
+	if ((curarea->spacetype == SPACE_ACTION) && NLA_ACTION_SCALED &&
+		(G.saction->mode == SACTCONT_ACTION))
+	{
 		aki.ob= OBACT;
+	}
 	else if (curarea->spacetype == SPACE_NLA)
+	{
 		aki.ob= NULL; // FIXME
+	}
 	else
 		aki.ob= NULL;
 		
@@ -1528,6 +1680,16 @@ void draw_action_channel(gla2DDrawInfo *di, bAction *act, float ypos)
 	BLI_freelistN(&keys);
 }
 
+void draw_gpl_channel(gla2DDrawInfo *di, bGPDlayer *gpl, float ypos)
+{
+	ListBase keys = {0, 0};
+	ActKeysInc *aki = init_aki_data();
+	
+	gpl_to_keylist(gpl, &keys, NULL, aki);
+	draw_keylist(di, &keys, NULL, ypos);
+	BLI_freelistN(&keys);
+}
+
 /* --------------- Conversion: data -> keyframe list ------------------ */
 
 void ob_to_keylist(Object *ob, ListBase *keys, ListBase *blocks, ActKeysInc *aki)
@@ -1674,3 +1836,26 @@ void action_to_keylist(bAction *act, ListBase *keys, ListBase *blocks, ActKeysIn
 	}
 }
 
+void gpl_to_keylist(bGPDlayer *gpl, ListBase *keys, ListBase *blocks, ActKeysInc *aki)
+{
+	bGPDframe *gpf;
+	ActKeyColumn *ak;
+	
+	if (gpl && keys) {
+		/* loop over frames, converting directly to 'keyframes' (should be in order too) */
+		for (gpf= gpl->frames.first; gpf; gpf= gpf->next) {
+			ak= MEM_callocN(sizeof(ActKeyColumn), "ActKeyColumn");
+			BLI_addtail(keys, ak);
+			
+			ak->cfra= gpf->framenum;
+			ak->modified = 1;
+			ak->handle_type= 0; 
+			
+			if (gpf->flag & GP_FRAME_SELECT)
+				ak->sel = SELECT;
+			else
+				ak->sel = 0;
+		}
+	}
+}
+
diff --git a/source/blender/src/drawgpencil.c b/source/blender/src/drawgpencil.c
new file mode 100644
index 00000000000..aacae08d972
--- /dev/null
+++ b/source/blender/src/drawgpencil.c
@@ -0,0 +1,673 @@
+/**
+ * $Id: drawgpencil.c 14881 2008-05-18 10:41:42Z 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
+ * 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 <math.h>
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "MEM_guardedalloc.h"
+
+#include "BMF_Api.h"
+
+#include "BLI_arithb.h"
+#include "BLI_blenlib.h"
+
+#include "DNA_listBase.h"
+#include "DNA_gpencil_types.h"
+#include "DNA_scene_types.h"
+#include "DNA_screen_types.h"
+#include "DNA_space_types.h"
+#include "DNA_userdef_types.h"
+#include "DNA_view3d_types.h"
+
+#include "BKE_global.h"
+#include "BKE_utildefines.h"
+#include "BKE_blender.h"
+
+#include "BIF_gl.h"
+#include "BIF_glutil.h"
+#include "BIF_butspace.h"
+#include "BIF_graphics.h"
+#include "BIF_interface.h"
+#include "BIF_mywindow.h"
+#include "BIF_resources.h"
+#include "BIF_space.h"
+#include "BIF_screen.h"
+#include "BIF_toolbox.h"
+#include "BIF_toets.h"
+
+#include "BDR_gpencil.h"
+#include "BIF_drawgpencil.h"
+
+#include "BSE_drawipo.h"
+#include "BSE_headerbuttons.h"
+#include "BSE_view.h"
+
+#include "blendef.h"
+#include "butspace.h"
+
+#include "PIL_time.h"			/* sleep				*/
+#include "mydevice.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 */
+
+/* make layer active one after being clicked on */
+void gp_ui_activelayer_cb (void *gpd, void *gpl)
+{
+	gpencil_layer_setactive(gpd, gpl);
+	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);
+	allqueue(REDRAWACTION, 0);
+}
+
+/* add a new layer */
+void gp_ui_addlayer_cb (void *gpd, void *dummy)
+{
+	gpencil_layer_addnew(gpd);
+	allqueue(REDRAWACTION, 0);
+}
+
+/* delete active layer */
+void gp_ui_dellayer_cb (void *gpd, void *dummy)
+{
+	gpencil_layer_delactive(gpd);
+	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);
+	
+	gpencil_layer_setactive(gpd, gpl);
+	gpencil_frame_delete_laststroke(gpf);
+}
+
+/* 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);
+	
+	allqueue(REDRAWACTION, 0);
+}
+
+/* ------- Drawing Code ------- */
+
+/* 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_DIFF, "", *xco-8, *yco-2, width, 24, NULL, 5.0, 0.0, 15 , 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= 26;
+		
+		/* 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)");
+			
+		uiBlockSetEmboss(block, UI_EMBOSS);
+	}
+	else {
+		height= 100;
+		
+		/* 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, 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.3, 1.0, 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)");
+			
+			
+			/* 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);
+				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);
+			
+			//uiDefButBitI(block, TOG, GP_LAYER_DRAWDEBUG, B_REDR, "Show Points", *xco+160, *yco-75, 130, 20, &gpl->flag, 0, 0, 0, 0, "Show points which form the strokes");
+		}
+	}
+	
+	/* adjust height for new to start */
+	(*yco) -= (height + 27); 
+} 
+
+/* 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)
+{
+	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);
+			uiDefButBitI(block, TOG, GP_DATA_EDITPAINT, B_REDR, "Draw Mode", 170, 225, 130, 20, &gpd->flag, 0, 0, 0, 0, "Interpret LMB-click as new strokes (same as holding Shift-Key per stroke)");
+			
+			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);
+		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 if (sa->spacetype != SPACE_SEQ) /* not available for sequencer yet */
+			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;
+}	
+
+/* ************************************************** */
+/* GREASE PENCIL DRAWING */
+
+/* flags for sflag */
+enum {
+	GP_DRAWDATA_NOSTATUS 	= (1<<0),	/* don't draw status info */
+	GP_DRAWDATA_ONLY3D		= (1<<1),	/* only draw 3d-strokes */
+	GP_DRAWDATA_ONLYV2D		= (1<<2),	/* only draw 'canvas' strokes */
+};
+
+/* draw a given stroke */
+static void gp_draw_stroke (bGPDspoint *points, int totpoints, short thickness, short dflag, short sflag, short debug, int winx, int winy)
+{
+	bGPDspoint *pt;
+	int i;
+	
+	/* error checking */
+	if ((points == NULL) || (totpoints <= 0))
+		return;
+	
+	/* check if stroke can be drawn */
+	if ((dflag & GP_DRAWDATA_ONLY3D) && !(sflag & GP_STROKE_3DSPACE))
+		return;
+	if (!(dflag & GP_DRAWDATA_ONLY3D) && (sflag & GP_STROKE_3DSPACE))
+		return;
+	if ((dflag & GP_DRAWDATA_ONLYV2D) && !(sflag & GP_STROKE_2DSPACE))
+		return;
+	if (!(dflag & GP_DRAWDATA_ONLYV2D) && (sflag & GP_STROKE_2DSPACE))
+		return;
+	
+	/* if drawing a single point, draw it larger */
+	if (totpoints == 1) {		
+		/* draw point */
+		if (sflag & GP_STROKE_3DSPACE) {
+			glBegin(GL_POINTS);
+				glVertex3f(points->x, points->y, points->z);
+			glEnd();
+		}
+		else if (sflag & GP_STROKE_2DSPACE) {
+			glBegin(GL_POINTS);
+				glVertex2f(points->x, points->y);
+			glEnd();
+		}
+		else {
+			const float x= (points->x / 1000 * winx);
+			const float y= (points->y / 1000 * winy);
+			
+			glBegin(GL_POINTS);
+				glVertex2f(x, y);
+			glEnd();
+		}
+	}
+	else {
+		float oldpressure = 0.0f;
+		
+		/* draw stroke curve */
+		glBegin(GL_LINE_STRIP);
+		for (i=0, pt=points; i < totpoints && pt; i++, pt++) {
+			float x, y, z;
+			
+			if (sflag & GP_STROKE_3DSPACE) {
+				x= pt->x;
+				y= pt->y;
+				z= pt->z;
+			}
+			else if (sflag & GP_STROKE_2DSPACE) {
+				x= pt->x;
+				y= pt->y;
+				z= 0;
+			}
+			else {
+				x= (pt->x / 1000 * winx);
+				y= (pt->y / 1000 * winy);
+				z= 0;
+			}
+			
+			if (fabs(pt->pressure - oldpressure) > 0.2f) {
+				glEnd();
+				glLineWidth(pt->pressure * thickness);
+				glBegin(GL_LINE_STRIP);
+				
+				if (sflag & GP_STROKE_3DSPACE) 
+					glVertex3f(x, y, z);
+				else
+					glVertex2f(x, y);
+				
+				oldpressure = pt->pressure;
+			}
+			else {
+				if (sflag & GP_STROKE_3DSPACE) 
+					glVertex3f(x, y, z);
+				else
+					glVertex2f(x, y);
+			}
+		}
+		glEnd();
+		
+		/* draw debug points of curve on top? */
+		if (debug) {
+			glBegin(GL_POINTS);
+			for (i=0, pt=points; i < totpoints && pt; i++, pt++) {
+				if (sflag & GP_STROKE_3DSPACE) {
+					glVertex3f(pt->x, pt->y, pt->z);
+				}
+				else if (sflag & GP_STROKE_2DSPACE) {
+					glVertex2f(pt->x, pt->y);
+				}
+				else {
+					const float x= (pt->x / 1000 * winx);
+					const float y= (pt->y / 1000 * winy);
+					
+					glVertex2f(x, y);
+				}
+			}
+			glEnd();
+		}
+	}
+}
+
+/* draw a set of strokes */
+static void gp_draw_strokes (bGPDframe *gpf, int winx, int winy, int dflag, short debug, 
+							 short lthick, float color[4])
+{
+	bGPDstroke *gps;
+	
+	/* set color first (may need to reset it again later too) */
+	glColor4f(color[0], color[1], color[2], color[3]);
+	
+	for (gps= gpf->strokes.first; gps; gps= gps->next) {	
+		/* handle 'eraser' strokes differently */
+		if (gps->flag & GP_STROKE_ERASER) {
+			// FIXME: this method is a failed experiment
+#if 0
+			/* draw stroke twice, first time with 'white' to set a mask to invert
+			 * contents of framebuffer, then second-time the same again but to restore
+			 * the contents
+			 */
+			glEnable(GL_COLOR_LOGIC_OP); 
+			glLogicOp(GL_XOR);
+			
+			glColor4f(1, 1, 1, 1); /* white */
+			
+			gp_draw_stroke(gps->points, gps->totpoints, lthick, dflag, gps->flag, 0, winx, winy);
+			gp_draw_stroke(gps->points, gps->totpoints, lthick, dflag, gps->flag, 0, winx, winy);
+			
+			glDisable(GL_COLOR_LOGIC_OP);
+			
+			/* reset color for drawing next stroke */
+			glColor4f(color[0], color[1], color[2], color[3]);
+#endif
+		}
+		else {
+			/* just draw the stroke once */
+			gp_draw_stroke(gps->points, gps->totpoints, lthick, dflag, gps->flag, debug, winx, winy);
+		}
+	}
+}
+
+/* draw grease-pencil datablock */
+static void gp_draw_data (bGPdata *gpd, int winx, int winy, int dflag)
+{
+	bGPDlayer *gpl, *actlay=NULL;
+	
+	/* turn on smooth lines (i.e. anti-aliasing) */
+	glEnable(GL_LINE_SMOOTH);
+	
+	/* turn on alpha-blending */
+	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	glEnable(GL_BLEND);
+		
+	/* loop over layers, drawing them */
+	for (gpl= gpd->layers.first; gpl; gpl= gpl->next) {
+		bGPDframe *gpf;
+		
+		short debug = (gpl->flag & GP_LAYER_DRAWDEBUG) ? 1 : 0;
+		short lthick= gpl->thickness;
+		float color[4], tcolor[4];
+		
+		/* don't draw layer if hidden */
+		if (gpl->flag & GP_LAYER_HIDE) 
+			continue;
+		
+		/* if layer is active one, store pointer to it */
+		if (gpl->flag & GP_LAYER_ACTIVE)
+			actlay= gpl;
+		
+		/* get frame to draw */
+		gpf= gpencil_layer_getframe(gpl, CFRA, 0);
+		if (gpf == NULL) 
+			continue;
+		
+		/* set color, stroke thickness, and point size */
+		glLineWidth(lthick);
+		QUATCOPY(color, gpl->color); // just for copying 4 array elements
+		QUATCOPY(tcolor, gpl->color); // additional copy of color (for ghosting)
+		glColor4f(color[0], color[1], color[2], color[3]);
+		glPointSize(gpl->thickness + 2);
+		
+		/* draw 'onionskins' (frame left + right) */
+		if (gpl->flag & GP_LAYER_ONIONSKIN) {
+			/* drawing method - only immediately surrounding (gstep = 0), or within a frame range on either side (gstep > 0)*/			
+			if (gpl->gstep) {
+				bGPDframe *gf;
+				short i;
+				
+				/* draw previous frames first */
+				for (gf=gpf->prev, i=0; gf; gf=gf->prev, i++) {
+					/* check if frame is drawable */
+					if ((gpf->framenum - gf->framenum) <= gpl->gstep) {
+						/* alpha decreases with distance from curframe index */
+						tcolor[3] = color[3] - (i * 0.7);
+						gp_draw_strokes(gpf, winx, winy, dflag, debug, lthick, tcolor);
+					}
+					else 
+						break;
+				}
+				
+				/* now draw next frames */
+				for (gf= gpf->next, i=0; gf; gf=gf->next, i++) {
+					/* check if frame is drawable */
+					if ((gf->framenum - gpf->framenum) <= gpl->gstep) {
+						/* alpha decreases with distance from curframe index */
+						tcolor[3] = color[3] - (i * 0.7);
+						gp_draw_strokes(gpf, winx, winy, dflag, debug, lthick, tcolor);
+					}
+					else 
+						break;
+				}	
+				
+				/* restore alpha */
+				glColor4f(color[0], color[1], color[2], color[3]);
+			}
+			else {
+				/* draw the strokes for the ghost frames (at half of the alpha set by user) */
+				if (gpf->prev) {
+					tcolor[3] = (color[3] / 7);
+					gp_draw_strokes(gpf, winx, winy, dflag, debug, lthick, tcolor);
+				}
+				
+				if (gpf->next) {
+					tcolor[3] = (color[3] / 4);
+					gp_draw_strokes(gpf, winx, winy, dflag, debug, lthick, tcolor);
+				}
+				
+				/* restore alpha */
+				glColor4f(color[0], color[1], color[2], color[3]);
+			}
+		}
+		
+		/* draw the strokes already in active frame */
+		tcolor[3]= color[3];
+		gp_draw_strokes(gpf, winx, winy, dflag, debug, lthick, tcolor);
+		
+		/* Check if may need to draw the active stroke cache, only if this layer is the active layer
+		 * that is being edited. (Stroke cache is currently stored in gp-data)
+		 */
+		if ((G.f & G_GREASEPENCIL) && (gpl->flag & GP_LAYER_ACTIVE) &&
+			(gpf->flag & GP_FRAME_PAINT)) 
+		{
+			/* Buffer stroke needs to be drawn with a different linestyle to help differentiate them from normal strokes. */
+			setlinestyle(2);
+			gp_draw_stroke(gpd->sbuffer, gpd->sbuffer_size, lthick, dflag, gpd->sbuffer_sflag, debug, winx, winy);
+			setlinestyle(0);
+		}
+	}
+	
+	/* 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 ( ((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)
+				BIF_ThemeColor(TH_BONE_POSE); // should be blue-ish
+			else if (actlay->actframe == NULL)
+				BIF_ThemeColor(TH_REDALERT);
+			else if (actlay->actframe->framenum == CFRA)
+				BIF_ThemeColor(TH_VERTEX_SELECT); // should be yellow
+			else
+				BIF_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 {
+			BIF_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)) { 
+			glRasterPos2i(winx-xmax, winy-20);
+			BMF_DrawString(G.fonts, printable);
+		}
+	}
+	
+	/* restore initial gl conditions */
+	glLineWidth(1.0);
+	glPointSize(1.0);
+	glColor4f(0, 0, 0, 1);
+}
+
+/* ----------- */
+
+/* draw grease-pencil sketches to specified 2d-view assuming that matrices are already set correctly 
+ * Note: this gets called twice - first time with onlyv2d=1 to draw 'canvas' strokes, second time with onlyv2d=0 for screen-aligned strokes
+ */
+void draw_gpencil_2dview (ScrArea *sa, short onlyv2d)
+{
+	bGPdata *gpd;
+	int dflag = 0;
+	
+	/* check that we have grease-pencil stuff to draw */
+	if (sa == NULL) return;
+	gpd= gpencil_data_getactive(sa);
+	if (gpd == NULL) return;
+	
+	/* draw it! */
+	if (onlyv2d) dflag |= (GP_DRAWDATA_ONLYV2D|GP_DRAWDATA_NOSTATUS);
+	gp_draw_data(gpd, sa->winx, sa->winy, dflag);
+}
+
+/* draw grease-pencil sketches to specified 3d-view assuming that matrices are already set correctly 
+ * Note: this gets called twice - first time with only3d=1 to draw 3d-strokes, second time with only3d=0 for screen-aligned strokes
+ */
+void draw_gpencil_3dview (ScrArea *sa, short only3d)
+{
+	bGPdata *gpd;
+	int dflag = 0;
+	
+	/* check that we have grease-pencil stuff to draw */
+	gpd= gpencil_data_getactive(sa);
+	if (gpd == NULL) return;
+	
+	/* draw it! */
+	if (only3d) dflag |= (GP_DRAWDATA_ONLY3D|GP_DRAWDATA_NOSTATUS);
+	gp_draw_data(gpd, sa->winx, sa->winy, dflag);
+}
+
+/* draw grease-pencil sketches to opengl render window assuming that matrices are already set correctly */
+void draw_gpencil_oglrender (View3D *v3d, int winx, int winy)
+{
+	bGPdata *gpd;
+	
+	/* assume gpencil data comes from v3d */
+	if (v3d == NULL) return;
+	gpd= v3d->gpd;
+	if (gpd == NULL) return;
+	
+	/* pass 1: draw 3d-strokes ------------ > */
+	gp_draw_data(gpd, winx, winy, (GP_DRAWDATA_NOSTATUS|GP_DRAWDATA_ONLY3D));
+	
+	/* pass 2: draw 2d-strokes ------------ > */
+		/* adjust view matrices */
+	myortho2(-0.375, (float)(winx)-0.375, -0.375, (float)(winy)-0.375);
+	glLoadIdentity();
+	
+		/* draw it! */
+	gp_draw_data(gpd, winx, winy, GP_DRAWDATA_NOSTATUS);
+}
+
+/* ************************************************** */
diff --git a/source/blender/src/drawnode.c b/source/blender/src/drawnode.c
index 1169062fdd0..853df3bedfc 100644
--- a/source/blender/src/drawnode.c
+++ b/source/blender/src/drawnode.c
@@ -37,6 +37,7 @@
 #include "DNA_action_types.h"
 #include "DNA_color_types.h"
 #include "DNA_customdata_types.h"
+#include "DNA_gpencil_types.h"
 #include "DNA_ipo_types.h"
 #include "DNA_ID.h"
 #include "DNA_image_types.h"
@@ -65,8 +66,11 @@
 #include "CMP_node.h"
 #include "SHD_node.h"
 
+#include "BDR_gpencil.h"
+
 #include "BIF_gl.h"
 #include "BIF_glutil.h"
+#include "BIF_drawgpencil.h"
 #include "BIF_interface.h"
 #include "BIF_interface_icons.h"
 #include "BIF_language.h"
@@ -3300,6 +3304,66 @@ static void node_draw_group(ScrArea *sa, SpaceNode *snode, bNode *gnode)
 }
 
 
+
+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) {
+		/* clear action value for event */
+		switch(snode->blockhandler[a]) {
+			case NODES_HANDLER_GREASEPENCIL:
+				nodes_panel_gpencil(snode->blockhandler[a+1]);
+				break;
+		}
+	}
+	uiDrawBlocksPanels(sa, 0);
+}
+
 void drawnodespace(ScrArea *sa, void *spacedata)
 {
 	SpaceNode *snode= sa->spacedata.first;
@@ -3354,13 +3418,26 @@ void drawnodespace(ScrArea *sa, void *spacedata)
 		}
 	}
 	
+	/* draw grease-pencil ('canvas' strokes) */
+	if ((snode->flag & SNODE_DISPGP) && (snode->nodetree))
+		draw_gpencil_2dview(sa, 1);
+	
 	/* restore viewport (not needed yet) */
 	mywinset(sa->win);
 
 	/* ortho at pixel level curarea */
 	myortho2(-0.375, sa->winx-0.375, -0.375, sa->winy-0.375);
+	
+	/* draw grease-pencil (screen strokes) */
+	if ((snode->flag & SNODE_DISPGP) && (snode->nodetree))
+		draw_gpencil_2dview(sa, 0);
 
 	draw_area_emboss(sa);
+	
+	/* it is important to end a view in a transform compatible with buttons */
+	bwin_scalematrix(sa->win, snode->blockscale, snode->blockscale, snode->blockscale);
+	nodes_blockhandlers(sa);
+	
 	curarea->win_swap= WIN_BACK_OK;
 	
 	/* in the end, this is a delayed previewrender test, to allow buttons to be first */
diff --git a/source/blender/src/drawobject.c b/source/blender/src/drawobject.c
index 045bf292446..1a469e8b366 100644
--- a/source/blender/src/drawobject.c
+++ b/source/blender/src/drawobject.c
@@ -1199,7 +1199,12 @@ static void drawlattice(Object *ob)
 	int use_wcol= 0;
 
 	lt= (ob==G.obedit)?editLatt:ob->data;
+	
+	/* now we default make displist, this will modifiers work for non animated case */
+	if(ob->disp.first==NULL)
+		lattice_calc_modifiers(ob);
 	dl= find_displist(&ob->disp, DL_VERTS);
+	
 	if(ob==G.obedit) {
 		cpack(0x004000);
 		
diff --git a/source/blender/src/drawseq.c b/source/blender/src/drawseq.c
index e554b91dd52..cc431c73a2e 100644
--- a/source/blender/src/drawseq.c
+++ b/source/blender/src/drawseq.c
@@ -43,6 +43,7 @@
 
 #include "IMB_imbuf_types.h"
 
+#include "DNA_gpencil_types.h"
 #include "DNA_sequence_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
@@ -67,6 +68,9 @@
 #include "BIF_space.h"
 #include "BIF_interface.h"
 
+#include "BIF_drawgpencil.h"
+#include "BDR_gpencil.h"
+
 #include "BSE_view.h"
 #include "BSE_drawipo.h"
 #include "BSE_sequence.h"
@@ -98,6 +102,70 @@ static void draw_seq_text(Sequence *seq, float x1, float x2, float y1, float y2)
 static void draw_shadedstrip(Sequence *seq, char *col, float x1, float y1, float x2, float y2);
 static void draw_seq_strip(struct Sequence *seq, struct ScrArea *sa, struct SpaceSeq *sseq, int outline_tint, float pixelx);
 
+
+static void seq_panel_gpencil(short cntrl)	// SEQ_HANDLER_GREASEPENCIL
+{
+	uiBlock *block;
+	SpaceSeq *sseq;
+	
+	sseq= curarea->spacedata.first;
+
+	block= uiNewBlock(&curarea->uiblocks, "seq_panel_gpencil", UI_EMBOSS, UI_HELV, curarea->win);
+	uiPanelControl(UI_PNL_SOLID | UI_PNL_CLOSE  | cntrl);
+	uiSetPanelHandler(SEQ_HANDLER_GREASEPENCIL);  // for close and esc
+	if (uiNewPanel(curarea, block, "Grease Pencil", "SpaceSeq", 100, 30, 318, 204)==0) return;
+	
+	/* only draw settings if right mode */
+	if (sseq->mainb == 0)
+		return;
+	
+	/* allocate memory for gpd if drawing enabled (this must be done first or else we crash) */
+	if (sseq->flag & SEQ_DRAW_GPENCIL) {
+		if (sseq->gpd == NULL)
+			gpencil_data_setactive(curarea, gpencil_data_addnew());
+	}
+	
+	if (sseq->flag & SEQ_DRAW_GPENCIL) {
+		bGPdata *gpd= sseq->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 */
+		uiDefButBitI(block, TOG, SEQ_DRAW_GPENCIL, B_REDR, "Use Grease Pencil", 10, 225, 150, 20, &sseq->flag, 0, 0, 0, 0, "Display freehand annotations overlay over this Sequencer View (draw using Shift-LMB)");
+		
+		/* extend the panel if the contents won't fit */
+		newheight= draw_gpencil_panel(block, gpd, curarea); 
+		uiNewPanelHeight(block, newheight);
+	}
+	else {
+		uiDefButBitI(block, TOG, SEQ_DRAW_GPENCIL, B_REDR, "Use Grease Pencil", 10, 225, 150, 20, &sseq->flag, 0, 0, 0, 0, "Display freehand annotations overlay over this Sequencer View");
+		uiDefBut(block, LABEL, 1, " ",	160, 180, 150, 20, NULL, 0.0, 0.0, 0, 0, "");
+	}
+}
+
+static void seq_blockhandlers(ScrArea *sa)
+{
+	SpaceSeq *sseq= sa->spacedata.first;
+	short a;
+
+	/* warning; blocks need to be freed each time, handlers dont remove (for ipo moved to drawipospace) */
+	uiFreeBlocksWin(&sa->uiblocks, sa->win);
+
+	for(a=0; a<SPACE_MAXHANDLER; a+=2) {
+		switch(sseq->blockhandler[a]) {
+			case SEQ_HANDLER_GREASEPENCIL:
+				seq_panel_gpencil(sseq->blockhandler[a+1]);
+				break;
+		}
+	}
+	uiDrawBlocksPanels(sa, 0);
+
+}
+
+
 static void draw_cfra_seq(void)
 {
 	glColor3ub(0x30, 0x90, 0x50);
@@ -907,6 +975,17 @@ static void draw_image_seq(ScrArea *sa)
 	if (free_ibuf) {
 		IMB_freeImBuf(ibuf);
 	} 
+	
+	/* draw grease-pencil (screen aligned) */
+	if (sseq->flag & SEQ_DRAW_GPENCIL)
+		draw_gpencil_2dview(sa, 0);
+	
+	/* ortho at pixel level sa */
+	myortho2(-0.375, sa->winx-0.375, -0.375, sa->winy-0.375);
+	
+	/* it is important to end a view in a transform compatible with buttons */
+	bwin_scalematrix(sa->win, sseq->blockscale, sseq->blockscale, sseq->blockscale);
+	seq_blockhandlers(sa);
 
 	sa->win_swap= WIN_BACK_OK;
 }
@@ -1023,24 +1102,6 @@ void seq_viewmove(SpaceSeq *sseq)
 	window_set_cursor(win, oldcursor);
 }
 
-
-
-static void seq_blockhandlers(ScrArea *sa)
-{
-	SpaceSeq *sseq= sa->spacedata.first;
-	short a;
-
-	/* warning; blocks need to be freed each time, handlers dont remove (for ipo moved to drawipospace) */
-	uiFreeBlocksWin(&sa->uiblocks, sa->win);
-
-	for(a=0; a<SPACE_MAXHANDLER; a+=2) {
-		/* clear action value for event */
-		sseq->blockhandler[a+1]= 0;
-	}
-	uiDrawBlocksPanels(sa, 0);
-
-}
-
 void drawprefetchseqspace(ScrArea *sa, void *spacedata)
 {
 	SpaceSeq *sseq= sa->spacedata.first;
diff --git a/source/blender/src/drawview.c b/source/blender/src/drawview.c
index f595a101f63..8c7c78de837 100644
--- a/source/blender/src/drawview.c
+++ b/source/blender/src/drawview.c
@@ -61,6 +61,7 @@
 #include "DNA_constraint_types.h"
 #include "DNA_curve_types.h"
 #include "DNA_group_types.h"
+#include "DNA_gpencil_types.h"
 #include "DNA_image_types.h"
 #include "DNA_key_types.h"
 #include "DNA_lattice_types.h"
@@ -111,6 +112,7 @@
 
 #include "BIF_butspace.h"
 #include "BIF_drawimage.h"
+#include "BIF_drawgpencil.h"
 #include "BIF_editgroup.h"
 #include "BIF_editarmature.h"
 #include "BIF_editmesh.h"
@@ -137,6 +139,7 @@
 #include "BDR_editobject.h"
 #include "BDR_vpaint.h"
 #include "BDR_sculptmode.h"
+#include "BDR_gpencil.h"
 
 #include "BSE_drawview.h"
 #include "BSE_filesel.h"
@@ -1499,44 +1502,52 @@ static void draw_view_icon(void)
 	glDisable(GL_BLEND);
 }
 
-static void draw_viewport_name(ScrArea *sa)
+char *view3d_get_name(View3D *v3d)
 {
 	char *name = NULL;
-	char *printable = NULL;
 	
-	switch(G.vd->view) {
+	switch (v3d->view) {
 		case 1:
-			if (G.vd->persp == V3D_ORTHO)
-				name = (G.vd->flag2 & V3D_OPP_DIRECTION_NAME) ? "Back Ortho" : "Front Ortho";
+			if (v3d->persp == V3D_ORTHO)
+				name = (v3d->flag2 & V3D_OPP_DIRECTION_NAME) ? "Back Ortho" : "Front Ortho";
 			else
-				name = (G.vd->flag2 & V3D_OPP_DIRECTION_NAME) ? "Back Persp" : "Front Persp";
+				name = (v3d->flag2 & V3D_OPP_DIRECTION_NAME) ? "Back Persp" : "Front Persp";
 			break;
 		case 3:
-			if (G.vd->persp == V3D_ORTHO)
-				name = (G.vd->flag2 & V3D_OPP_DIRECTION_NAME) ? "Left Ortho" : "Right Ortho";
+			if (v3d->persp == V3D_ORTHO)
+				name = (v3d->flag2 & V3D_OPP_DIRECTION_NAME) ? "Left Ortho" : "Right Ortho";
 			else
-				name = (G.vd->flag2 & V3D_OPP_DIRECTION_NAME) ? "Left Persp" : "Right Persp";
+				name = (v3d->flag2 & V3D_OPP_DIRECTION_NAME) ? "Left Persp" : "Right Persp";
 			break;
 		case 7:
-			if (G.vd->persp == V3D_ORTHO)
-				name = (G.vd->flag2 & V3D_OPP_DIRECTION_NAME) ? "Bottom Ortho" : "Top Ortho";
+			if (v3d->persp == V3D_ORTHO)
+				name = (v3d->flag2 & V3D_OPP_DIRECTION_NAME) ? "Bottom Ortho" : "Top Ortho";
 			else
-				name = (G.vd->flag2 & V3D_OPP_DIRECTION_NAME) ? "Bottom Persp" : "Top Persp";
+				name = (v3d->flag2 & V3D_OPP_DIRECTION_NAME) ? "Bottom Persp" : "Top Persp";
 			break;
 		default:
-			if (G.vd->persp==V3D_CAMOB) {
-				if ((G.vd->camera) && (G.vd->camera->type == OB_CAMERA)) {
+			if (v3d->persp==V3D_CAMOB) {
+				if ((v3d->camera) && (v3d->camera->type == OB_CAMERA)) {
 					Camera *cam;
-					cam = G.vd->camera->data;
+					cam = v3d->camera->data;
 					name = (cam->type != CAM_ORTHO) ? "Camera Persp" : "Camera Ortho";
 				} else {
 					name = "Object as Camera";
 				}
 			} else { 
-				name = (G.vd->persp == V3D_ORTHO) ? "User Ortho" : "User Persp";
+				name = (v3d->persp == V3D_ORTHO) ? "User Ortho" : "User Persp";
 			}
+			break;
 	}
 	
+	return name;
+}
+
+static void draw_viewport_name(ScrArea *sa)
+{
+	char *name = view3d_get_name(sa->spacedata.first);
+	char *printable = NULL;
+	
 	if (G.vd->localview) {
 		printable = malloc(strlen(name) + strlen(" (Local)_")); /* '_' gives space for '\0' */
 		strcpy(printable, name);
@@ -2498,7 +2509,7 @@ static void view3d_panel_background(short cntrl)	// VIEW3D_HANDLER_BACKGROUND
 	uiSetPanelHandler(VIEW3D_HANDLER_BACKGROUND);  // for close and esc
 	if(uiNewPanel(curarea, block, "Background Image", "View3d", 340, 10, 318, 204)==0) return;
 
-	if(G.f & G_VERTEXPAINT || G.f & G_WEIGHTPAINT || G.f & G_TEXTUREPAINT) {
+	if(G.f & G_VERTEXPAINT || G.f & G_WEIGHTPAINT || G.f & G_TEXTUREPAINT || G.f & G_GREASEPENCIL) {
 		uiBlockSetFlag(block, UI_BLOCK_FRONTBUFFER);	// force old style frontbuffer draw
 	}
 	
@@ -2546,7 +2557,7 @@ static void view3d_panel_properties(short cntrl)	// VIEW3D_HANDLER_SETTINGS
 	/* to force height */
 	uiNewPanelHeight(block, 264);
 
-	if(G.f & (G_VERTEXPAINT|G_FACESELECT|G_TEXTUREPAINT|G_WEIGHTPAINT)) {
+	if(G.f & (G_VERTEXPAINT|G_FACESELECT|G_TEXTUREPAINT|G_WEIGHTPAINT|G_GREASEPENCIL)) {
 		uiBlockSetFlag(block, UI_BLOCK_FRONTBUFFER);	// force old style frontbuffer draw
 	}
 
@@ -2620,6 +2631,49 @@ static void view3d_panel_preview(ScrArea *sa, short cntrl)	// VIEW3D_HANDLER_PRE
 	}
 }
 
+static void view3d_panel_gpencil(short cntrl)	// VIEW3D_HANDLER_GREASEPENCIL
+{
+	uiBlock *block;
+	View3D *vd;
+	
+	vd= G.vd;
+
+	block= uiNewBlock(&curarea->uiblocks, "view3d_panel_gpencil", UI_EMBOSS, UI_HELV, curarea->win);
+	uiPanelControl(UI_PNL_SOLID | UI_PNL_CLOSE  | cntrl);
+	uiSetPanelHandler(VIEW3D_HANDLER_GREASEPENCIL);  // for close and esc
+	if (uiNewPanel(curarea, block, "Grease Pencil", "View3d", 100, 30, 318, 204)==0) return;
+
+	if (G.f & (G_VERTEXPAINT|G_WEIGHTPAINT|G_TEXTUREPAINT|G_GREASEPENCIL)) {
+		uiBlockSetFlag(block, UI_BLOCK_FRONTBUFFER);	// force old style frontbuffer draw
+	}
+	
+	/* allocate memory for gpd if drawing enabled (this must be done first or else we crash) */
+	if (vd->flag2 & V3D_DISPGP) {
+		if (vd->gpd == NULL)
+			gpencil_data_setactive(curarea, gpencil_data_addnew());
+	}
+	
+	if (vd->flag2 & V3D_DISPGP) {
+		bGPdata *gpd= vd->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, V3D_DISPGP, B_REDR, "Use Grease Pencil", 10, 225, 150, 20, &vd->flag2, 0, 0, 0, 0, "Display freehand annotations overlay over this 3D View (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, V3D_DISPGP, B_REDR, "Use Grease Pencil", 10, 225, 150, 20, &vd->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, "");
+	}
+}
+
 
 static void view3d_blockhandlers(ScrArea *sa)
 {
@@ -2634,9 +2688,7 @@ static void view3d_blockhandlers(ScrArea *sa)
 	glDisable(GL_DEPTH_TEST); 
 	
 	for(a=0; a<SPACE_MAXHANDLER; a+=2) {
-	
 		switch(v3d->blockhandler[a]) {
-
 		case VIEW3D_HANDLER_PROPERTIES:
 			view3d_panel_properties(v3d->blockhandler[a+1]);
 			break;
@@ -2651,7 +2703,10 @@ static void view3d_blockhandlers(ScrArea *sa)
 			break;			
 		case VIEW3D_HANDLER_TRANSFORM:
 			view3d_panel_transform_spaces(v3d->blockhandler[a+1]);
- 			break;			
+ 			break;
+		case VIEW3D_HANDLER_GREASEPENCIL:
+			view3d_panel_gpencil(v3d->blockhandler[a+1]);
+			break;
 		}
 		/* clear action value for event */
 		v3d->blockhandler[a+1]= 0;
@@ -3169,7 +3224,11 @@ void drawview3dspace(ScrArea *sa, void *spacedata)
 		v3d->zbuf= FALSE;
 		glDisable(GL_DEPTH_TEST);
 	}
-
+	
+	/* draw grease-pencil stuff */
+	if (v3d->flag2 & V3D_DISPGP)
+		draw_gpencil_3dview(sa, 1);
+	
 	persp(PERSP_WIN);  // set ortho
 
 	/* Draw Sculpt Mode brush */
@@ -3211,6 +3270,11 @@ void drawview3dspace(ScrArea *sa, void *spacedata)
 
 	if(v3d->persp>1) drawviewborder();
 	if(v3d->flag2 & V3D_FLYMODE) drawviewborder_flymode();
+	
+	/* draw grease-pencil stuff */
+	if (v3d->flag2 & V3D_DISPGP)
+		draw_gpencil_3dview(sa, 0);
+	
 	if(!(G.f & G_PLAYANIM)) drawcursor(v3d);
 	if(U.uiflag & USER_SHOW_ROTVIEWICON)
 		draw_view_axis();
@@ -3311,16 +3375,15 @@ void drawview3d_render(struct View3D *v3d, int winx, int winy, float winmat[][4]
 
 	/* first draw set */
 	if(G.scene->set) {
-	
 		for(SETLOOPER(G.scene->set, base)) {
 			if(v3d->lay & base->lay) {
 				if ELEM3(base->object->type, OB_LAMP, OB_CAMERA, OB_LATTICE);
 				else {
 					where_is_object(base->object);
-	
+					
 					BIF_ThemeColorBlend(TH_WIRE, TH_BACK, 0.6f);
 					draw_object(base, DRAW_CONSTCOLOR|DRAW_SCENESET);
-	
+					
 					if(base->object->transflag & OB_DUPLI) {
 						draw_dupli_objects(v3d, base);
 					}
@@ -3377,6 +3440,13 @@ void drawview3d_render(struct View3D *v3d, int winx, int winy, float winmat[][4]
 		glDisable(GL_DEPTH_TEST);
 	}
 	
+	if(v3d->gpd) {
+		/* draw grease-pencil overlays 
+		 * WARNING: view matrices are altered here!
+		 */
+		draw_gpencil_oglrender(v3d, winx, winy);
+	}
+	
 	G.f &= ~G_SIMULATION;
 
 	glFlush();
diff --git a/source/blender/src/editaction.c b/source/blender/src/editaction.c
index 4cc0e52ce3f..c454715b1df 100644
--- a/source/blender/src/editaction.c
+++ b/source/blender/src/editaction.c
@@ -52,6 +52,7 @@
 #include "DNA_mesh_types.h"
 #include "DNA_nla_types.h"
 #include "DNA_lattice_types.h"
+#include "DNA_gpencil_types.h"
 
 #include "BKE_action.h"
 #include "BKE_armature.h"
@@ -90,6 +91,7 @@
 
 #include "BDR_drawaction.h"
 #include "BDR_editobject.h"
+#include "BDR_gpencil.h"
 
 #include "mydevice.h"
 #include "blendef.h"
@@ -296,6 +298,16 @@ bActListElem *make_new_actlistelem (void *data, short datatype, void *owner, sho
 				ale->datatype= ALE_IPO;
 			}
 				break;
+			case ACTTYPE_GPLAYER:
+			{
+				bGPDlayer *gpl= (bGPDlayer *)data;
+				
+				ale->flag= gpl->flag;
+				
+				ale->key_data= NULL;
+				ale->datatype= ALE_GPFRAME;
+			}
+				break;
 		}
 	}
 	
@@ -505,6 +517,49 @@ static void actdata_filter_shapekey (ListBase *act_data, Key *key, int filter_mo
 	}
 }
  
+
+static void actdata_filter_gpencil (ListBase *act_data, bScreen *sc, int filter_mode)
+{
+	bActListElem *ale;
+	ScrArea *sa;
+	bGPdata *gpd;
+	bGPDlayer *gpl;
+	
+	/* check if filtering types are appropriate */
+	if ( !(filter_mode & (ACTFILTER_IPOKEYS|ACTFILTER_ONLYICU|ACTFILTER_ACTGROUPED)) ) 
+	{
+		/* loop over spaces in current screen, finding gpd blocks (could be slow!) */
+		for (sa= sc->areabase.first; sa; sa= sa->next) {
+			/* try to get gp data */
+			gpd= gpencil_data_getactive(sa);
+			if (gpd == NULL) continue;
+			
+			/* add gpd as channel too (if for drawing, and it has layers) */
+			if ((filter_mode & ACTFILTER_FORDRAWING) && (gpd->layers.first)) {
+				/* add to list */
+				ale= make_new_actlistelem(gpd, ACTTYPE_GPDATABLOCK, sa, ACTTYPE_SPECIALDATA);
+				if (ale) BLI_addtail(act_data, ale);
+			}
+			
+			/* only add layers if they will be visible (if drawing channels) */
+			if ( !(filter_mode & ACTFILTER_VISIBLE) || (EXPANDED_GPD(gpd)) ) {
+				/* loop over layers as the conditions are acceptable */
+				for (gpl= gpd->layers.first; gpl; gpl= gpl->next) {
+					/* only if selected */
+					if (!(filter_mode & ACTFILTER_SEL) || SEL_GPL(gpl)) {
+						/* only if editable */
+						if (!(filter_mode & ACTFILTER_FOREDIT) || EDITABLE_GPL(gpl)) {
+							/* add to list */
+							ale= make_new_actlistelem(gpl, ACTTYPE_GPLAYER, gpd, ACTTYPE_GPDATABLOCK);
+							if (ale) BLI_addtail(act_data, ale);
+						}
+					}
+				}
+			}
+		}
+	}
+}
+ 
 /* This function filters the active data source to leave only the desired
  * data types. 'Public' api call.
  * 	*act_data: is a pointer to a ListBase, to which the filtered action data 
@@ -525,6 +580,9 @@ void actdata_filter (ListBase *act_data, int filter_mode, void *data, short data
 			case ACTCONT_SHAPEKEY:
 				actdata_filter_shapekey(act_data, data, filter_mode);
 				break;
+			case ACTCONT_GPENCIL:
+				actdata_filter_gpencil(act_data, data, filter_mode);
+				break;
 		}
 			
 		/* remove any weedy entries */
@@ -599,11 +657,8 @@ int get_nearest_key_num (Key *key, short *mval, float *x)
     return (num + 1);
 }
 
-/* this function is used to get a pointer to an action or shapekey 
- * datablock, thus simplying that process.
- */
-/* this function is intended for use */
-void *get_nearest_act_channel (short mval[], short *ret_type)
+/* this function finds the channel that mouse is floating over */
+void *get_nearest_act_channel (short mval[], short *ret_type, void **owner)
 {
 	ListBase act_data = {NULL, NULL};
 	bActListElem *ale;
@@ -614,6 +669,9 @@ void *get_nearest_act_channel (short mval[], short *ret_type)
 	int clickmin, clickmax;
 	float x,y;
 	
+	/* init 'owner' return val */
+	*owner= NULL;
+	
 	/* determine what type of data we are operating on */
 	data = get_action_context(&datatype);
 	if (data == NULL) {
@@ -641,6 +699,7 @@ void *get_nearest_act_channel (short mval[], short *ret_type)
 			/* found match */
 			*ret_type= ale->type;
 			data= ale->data;
+			*owner= ale->owner;
 			
 			BLI_freelistN(&act_data);
 			
@@ -743,6 +802,10 @@ static void *get_nearest_action_key (float *selx, short *sel, short *ret_type, b
 				bActionGroup *agrp= (bActionGroup *)ale->data;
 				agroup_to_keylist(agrp, &act_keys, NULL, NULL);
 			}
+			else if (ale->type == ACTTYPE_GPLAYER) {
+				bGPDlayer *gpl= (bGPDlayer *)ale->data;
+				gpl_to_keylist(gpl, &act_keys, NULL, NULL);
+			}
 			
 			/* loop through keyframes, finding one that was clicked on */
 			for (ak= act_keys.first; ak; ak= ak->next) {
@@ -766,6 +829,10 @@ static void *get_nearest_action_key (float *selx, short *sel, short *ret_type, b
 				data = ale->key_data;
 				*ret_type= ACTTYPE_ICU;
 			}
+			else if (datatype == ACTCONT_GPENCIL) {
+				data = ale->data;
+				*ret_type= ACTTYPE_GPLAYER;
+			}
 			
 			/* cleanup tempolary lists */
 			BLI_freelistN(&act_keys);
@@ -795,17 +862,40 @@ void *get_action_context (short *datatype)
 	act = (G.saction)? G.saction->action: NULL;
 	key = get_action_mesh_key();
 	
-	if (act) {
-		*datatype= ACTCONT_ACTION;
-		return act;
-	}
-	else if (key) {
-		*datatype= ACTCONT_SHAPEKEY;
-		return key;
+	/* check mode selector */
+	if (G.saction) {
+		switch (G.saction->mode) {
+			case SACTCONT_ACTION: 
+				*datatype= ACTCONT_ACTION;
+				return act;
+				
+			case SACTCONT_SHAPEKEY:
+				*datatype= ACTCONT_SHAPEKEY;
+				return key;
+				
+			case SACTCONT_GPENCIL:
+				*datatype= ACTCONT_GPENCIL;
+				return G.curscreen; // FIXME: add that dopesheet type thing here!
+			
+			default: /* includes SACTCONT_DOPESHEET for now */
+				*datatype= ACTCONT_NONE;
+				return NULL;
+		}
 	}
 	else {
-		*datatype= ACTCONT_NONE;
-		return NULL;
+		/* resort to guessing based on what is available */
+		if (act) {
+			*datatype= ACTCONT_ACTION;
+			return act;
+		}
+		else if (key) {
+			*datatype= ACTCONT_SHAPEKEY;
+			return key;
+		}
+		else {
+			*datatype= ACTCONT_NONE;
+			return NULL;
+		}
 	}
 }
 
@@ -1307,12 +1397,18 @@ void duplicate_action_keys (void)
 	if (data == NULL) return;
 	
 	/* filter data */
-	filter= (ACTFILTER_VISIBLE | ACTFILTER_FOREDIT | ACTFILTER_IPOKEYS);
+	if (datatype == ACTCONT_GPENCIL)
+	filter= (ACTFILTER_VISIBLE | ACTFILTER_FOREDIT);
+	else
+		filter= (ACTFILTER_VISIBLE | ACTFILTER_FOREDIT | ACTFILTER_IPOKEYS);
 	actdata_filter(&act_data, filter, data, datatype);
 	
 	/* loop through filtered data and duplicate selected keys */
 	for (ale= act_data.first; ale; ale= ale->next) {
-		duplicate_ipo_keys((Ipo *)ale->key_data);
+		if (ale->type == ACTTYPE_GPLAYER)
+			duplicate_gplayer_frames(ale->data);
+		else
+			duplicate_ipo_keys((Ipo *)ale->key_data);
 	}
 	
 	/* free filtered list */
@@ -1398,7 +1494,10 @@ void snap_action_keys(short mode)
 	}
 	
 	/* filter data */
-	filter= (ACTFILTER_VISIBLE | ACTFILTER_FOREDIT | ACTFILTER_IPOKEYS);
+	if (datatype == ACTCONT_GPENCIL)
+		filter= (ACTFILTER_VISIBLE | ACTFILTER_FOREDIT);
+	else
+		filter= (ACTFILTER_VISIBLE | ACTFILTER_FOREDIT | ACTFILTER_IPOKEYS);
 	actdata_filter(&act_data, filter, data, datatype);
 	
 	/* snap to frame */
@@ -1408,6 +1507,8 @@ void snap_action_keys(short mode)
 			snap_ipo_keys(ale->key_data, mode);
 			actstrip_map_ipo_keys(OBACT, ale->key_data, 1, 1);
 		}
+		else if (ale->type == ACTTYPE_GPLAYER)
+			snap_gplayer_frames(ale->data, mode);
 		else 
 			snap_ipo_keys(ale->key_data, mode);
 	}
@@ -1421,6 +1522,7 @@ void snap_action_keys(short mode)
 	allqueue(REDRAWACTION, 0);
 	allqueue(REDRAWIPO, 0);
 	allqueue(REDRAWNLA, 0);
+	allqueue(REDRAWVIEW3D, 0);
 }
 
 /* this function is responsible for snapping keyframes to frame-times */
@@ -1456,7 +1558,10 @@ void mirror_action_keys(short mode)
 	}
 	
 	/* filter data */
-	filter= (ACTFILTER_VISIBLE | ACTFILTER_FOREDIT | ACTFILTER_IPOKEYS);
+	if (datatype == ACTCONT_GPENCIL)
+		filter= (ACTFILTER_VISIBLE | ACTFILTER_FOREDIT);
+	else
+		filter= (ACTFILTER_VISIBLE | ACTFILTER_FOREDIT | ACTFILTER_IPOKEYS);
 	actdata_filter(&act_data, filter, data, datatype);
 	
 	/* mirror */
@@ -1466,6 +1571,8 @@ void mirror_action_keys(short mode)
 			mirror_ipo_keys(ale->key_data, mode);
 			actstrip_map_ipo_keys(OBACT, ale->key_data, 1, 1);
 		}
+		else if (ale->type == ACTTYPE_GPLAYER)
+			mirror_gplayer_frames(ale->data, mode);
 		else 
 			mirror_ipo_keys(ale->key_data, mode);
 	}
@@ -1550,6 +1657,10 @@ void insertkey_action(void)
 			}
 		}
 	}
+	else {
+		/* this tool is not supported in this mode */
+		return;
+	}
 	
 	BIF_undo_push("Insert Key");
 	allspace(REMAKEIPO, 0);
@@ -1573,12 +1684,18 @@ void delete_action_keys (void)
 	if (data == NULL) return;
 	
 	/* filter data */
-	filter= (ACTFILTER_VISIBLE | ACTFILTER_FOREDIT | ACTFILTER_IPOKEYS);
+	if (datatype == ACTCONT_GPENCIL)
+		filter= (ACTFILTER_VISIBLE | ACTFILTER_FOREDIT);
+	else
+		filter= (ACTFILTER_VISIBLE | ACTFILTER_FOREDIT | ACTFILTER_IPOKEYS);
 	actdata_filter(&act_data, filter, data, datatype);
 	
 	/* loop through filtered data and delete selected keys */
 	for (ale= act_data.first; ale; ale= ale->next) {
-		delete_ipo_keys((Ipo *)ale->key_data);
+		if (ale->type == ACTTYPE_GPLAYER)
+			delete_gplayer_frames((bGPDlayer *)ale->data);
+		else
+			delete_ipo_keys((Ipo *)ale->key_data);
 	}
 	
 	/* free filtered list */
@@ -1699,6 +1816,7 @@ void clean_action (void)
 				0.0000001f, 1.0, 0.001, 0.1,
 				"Clean Threshold");
 	if (!ok) return;
+	if (datatype == ACTCONT_GPENCIL) return;
 	
 	/* filter data */
 	filter= (ACTFILTER_VISIBLE | ACTFILTER_FOREDIT | ACTFILTER_SEL | ACTFILTER_ONLYICU);
@@ -1737,6 +1855,7 @@ void sample_action_keys (void)
 	/* sanity checks */
 	data= get_action_context(&datatype);
 	if (data == NULL) return;
+	if (datatype == ACTCONT_GPENCIL) return;
 	
 	/* filter data */
 	filter= (ACTFILTER_VISIBLE | ACTFILTER_FOREDIT | ACTFILTER_ONLYICU);
@@ -2096,6 +2215,7 @@ void action_set_ipo_flags (short mode, short event)
 	/* determine what type of data we are operating on */
 	data = get_action_context(&datatype);
 	if (data == NULL) return;
+	if (datatype == ACTCONT_GPENCIL) return;
 	
 	/* determine which set of processing we are doing */
 	switch (mode) {
@@ -2194,6 +2314,7 @@ void sethandles_action_keys (int code)
 	/* determine what type of data we are operating on */
 	data = get_action_context(&datatype);
 	if (data == NULL) return;
+	if (datatype == ACTCONT_GPENCIL) return;
 	
 	/* filter data */
 	filter= (ACTFILTER_VISIBLE | ACTFILTER_FOREDIT | ACTFILTER_IPOKEYS);
@@ -2224,7 +2345,7 @@ static void numbuts_action ()
 	void *data;
 	short datatype;
 	
-	void *act_channel;
+	void *act_channel, *channel_owner;
 	short chantype;
 	
 	bActionGroup *agrp= NULL;
@@ -2232,11 +2353,13 @@ static void numbuts_action ()
 	bConstraintChannel *conchan= NULL;
 	IpoCurve *icu= NULL;
 	KeyBlock *kb= NULL;
+	bGPdata *gpd= NULL;
+	bGPDlayer *gpl= NULL;
 	
 	short mval[2];
 	
 	int but=0;
-    char str[64];
+    char str[128];
 	short expand, protect, mute;
 	float slidermin, slidermax;
 	
@@ -2249,7 +2372,7 @@ static void numbuts_action ()
 	getmouseco_areawin(mval);
 	if (mval[0] > NAMEWIDTH) 
 		return;
-	act_channel= get_nearest_act_channel(mval, &chantype);
+	act_channel= get_nearest_act_channel(mval, &chantype, &channel_owner);
 	
 	/* create items for clever-numbut */
 	if (chantype == ACTTYPE_ACHAN) {
@@ -2345,6 +2468,19 @@ static void numbuts_action ()
 		add_numbut(but++, TOG|SHO, "Expanded", 0, 24, &expand, "Action Group is Expanded");
 		add_numbut(but++, TOG|SHO, "Protected", 0, 24, &protect, "Group is Protected");
 	}
+	else if (chantype == ACTTYPE_GPLAYER) {
+		/* Grease-Pencil Layer */
+		gpd= (bGPdata *)channel_owner;
+		gpl= (bGPDlayer *)act_channel;
+		
+		strcpy(str, gpl->info);
+		protect= (gpl->flag & GP_LAYER_LOCKED);
+		mute = (gpl->flag & GP_LAYER_HIDE);
+		
+		add_numbut(but++, TEX, "GP-Layer: ", 0, 128, str, "Name of Grease Pencil Layer");
+		add_numbut(but++, TOG|SHO, "Hide", 0, 24, &mute, "Grease Pencil Layer is Visible");
+		add_numbut(but++, TOG|SHO, "Protected", 0, 24, &protect, "Grease Pencil Layer is Protected");
+	}
 	else {
 		/* nothing under-cursor */
 		return;
@@ -2393,6 +2529,16 @@ static void numbuts_action ()
 			if (protect) agrp->flag |= AGRP_PROTECTED;
 			else agrp->flag &= ~AGRP_PROTECTED;
 		}
+		else if (gpl) {
+			strcpy(gpl->info, str);
+			BLI_uniquename(&gpd->layers, gpl, "GP_Layer", offsetof(bGPDlayer, info), 128);
+			
+			if (mute) gpl->flag |= GP_LAYER_HIDE;
+			else gpl->flag &= ~GP_LAYER_HIDE;;
+			
+			if (protect) gpl->flag |= GP_LAYER_LOCKED;
+			else gpl->flag &= ~GP_LAYER_LOCKED;
+		}
 		
         allqueue(REDRAWACTION, 0);
 		allspace(REMAKEIPO, 0);
@@ -2524,6 +2670,31 @@ void setflag_action_channels (short mode)
 				}
 			}
 				break;
+			case ACTTYPE_GPLAYER:
+			{
+				bGPDlayer *gpl= (bGPDlayer *)ale->data;
+				
+				/* 'protect' and 'mute' */
+				if (val == 2) {
+					/* mute */
+					if (mode == 2)
+						gpl->flag &= ~GP_LAYER_HIDE;
+					else if (mode == 1)
+						gpl->flag |= GP_LAYER_HIDE;
+					else
+						gpl->flag ^= GP_LAYER_HIDE;
+				}
+				else if (val == 1) {
+					/* protected */
+					if (mode == 2)
+						gpl->flag &= ~GP_LAYER_LOCKED;
+					else if (mode == 1)
+						gpl->flag |= GP_LAYER_LOCKED;
+					else
+						gpl->flag ^= GP_LAYER_LOCKED;
+				}
+			}
+				break;
 		}
 	}
 	BLI_freelistN(&act_data);
@@ -2564,7 +2735,7 @@ static void select_action_group (bAction *act, bActionGroup *agrp, int selectmod
 	set_active_actiongroup(act, agrp, select);
 }
 
-static void hilight_channel(bAction *act, bActionChannel *achan, short select)
+static void hilight_channel (bAction *act, bActionChannel *achan, short select)
 {
 	bActionChannel *curchan;
 
@@ -2637,7 +2808,7 @@ void select_actionchannel_by_name (bAction *act, char *name, int select)
 
 /* exported for outliner (ton) */
 /* apparently within active object context */
-int select_channel(bAction *act, bActionChannel *achan, int selectmode) 
+int select_channel (bAction *act, bActionChannel *achan, int selectmode) 
 {
 	/* Select the channel based on the selection mode */
 	int flag;
@@ -2661,9 +2832,9 @@ int select_channel(bAction *act, bActionChannel *achan, int selectmode)
 	return flag;
 }
 
-static int select_constraint_channel(bAction *act, 
-                                     bConstraintChannel *conchan, 
-                                     int selectmode) 
+static int select_constraint_channel (bAction *act, 
+                                      bConstraintChannel *conchan, 
+                                      int selectmode) 
 {
 	/* Select the constraint channel based on the selection mode */
 	int flag;
@@ -2684,7 +2855,7 @@ static int select_constraint_channel(bAction *act,
 	return flag;
 }
 
-int select_icu_channel(bAction *act, IpoCurve *icu, int selectmode) 
+int select_icu_channel (bAction *act, IpoCurve *icu, int selectmode) 
 {
 	/* Select the channel based on the selection mode */
 	int flag;
@@ -2704,6 +2875,30 @@ int select_icu_channel(bAction *act, IpoCurve *icu, int selectmode)
 	return flag;
 }
 
+int select_gplayer_channel (bGPdata *gpd, bGPDlayer *gpl, int selectmode) 
+{
+	/* Select the channel based on the selection mode */
+	int flag;
+
+	switch (selectmode) {
+	case SELECT_ADD:
+		gpl->flag |= GP_LAYER_SELECT;
+		break;
+	case SELECT_SUBTRACT:
+		gpl->flag &= ~GP_LAYER_SELECT;
+		break;
+	case SELECT_INVERT:
+		gpl->flag ^= GP_LAYER_SELECT;
+		break;
+	}
+	
+	flag = (gpl->flag & GP_LAYER_SELECT) ? 1 : 0;
+	if (flag)
+		gpencil_layer_setactive(gpd, gpl);
+
+	return flag;
+}
+
 
 /* select only the active action-group's action channels */
 void select_action_group_channels (bAction *act, bActionGroup *agrp)
@@ -2848,6 +3043,8 @@ void deselect_action_channels (short mode)
 	/* based on type */
 	if (datatype == ACTCONT_ACTION)
 		deselect_actionchannels(data, mode);
+	else if (datatype == ACTCONT_GPENCIL)
+		deselect_gpencil_layers(data, mode);
 	// should shapekey channels be allowed to do this? 
 }
 
@@ -2863,24 +3060,40 @@ void deselect_action_keys (short test, short sel)
 	/* determine what type of data we are operating on */
 	data = get_action_context(&datatype);
 	if (data == NULL) return;
-		
+	
+	/* determine type-based settings */
+	if (datatype == ACTCONT_GPENCIL)
+		filter= (ACTFILTER_VISIBLE);
+	else
+		filter= (ACTFILTER_VISIBLE | ACTFILTER_IPOKEYS);
+	
 	/* filter data */
-	filter= (ACTFILTER_VISIBLE | ACTFILTER_IPOKEYS);
 	actdata_filter(&act_data, filter, data, datatype);
 	
 	/* See if we should be selecting or deselecting */
 	if (test) {
 		for (ale= act_data.first; ale; ale= ale->next) {
-			if (is_ipo_key_selected(ale->key_data)) {
-				sel= 0;
-				break;
+			if (ale->type == ACTTYPE_GPLAYER) {
+				if (is_gplayer_frame_selected(ale->data)) {
+					sel= 0;
+					break;
+				}
+			}
+			else {
+				if (is_ipo_key_selected(ale->key_data)) {
+					sel= 0;
+					break;
+				}
 			}
 		}
 	}
 		
 	/* Now set the flags */
 	for (ale= act_data.first; ale; ale= ale->next) {
-		set_ipo_key_selection(ale->key_data, sel);
+		if (ale->type == ACTTYPE_GPLAYER)
+			set_gplayer_frame_selection(ale->data, sel);
+		else
+			set_ipo_key_selection(ale->key_data, sel);
 	}
 	
 	/* Cleanup */
@@ -2908,11 +3121,11 @@ void selectall_action_keys (short mval[], short mode, short select_mode)
 	switch (mode) {
 		case 0: /* all in channel*/
 		{
-			void *act_channel;
+			void *act_channel, *channel_owner;
 			short chantype;
 			
 			/* get channel, and act according to type */
-			act_channel= get_nearest_act_channel(mval, &chantype);
+			act_channel= get_nearest_act_channel(mval, &chantype, &channel_owner);
 			switch (chantype) {
 				case ACTTYPE_GROUP:	
 				{
@@ -2946,6 +3159,12 @@ void selectall_action_keys (short mval[], short mode, short select_mode)
 					select_icu_bezier_keys(icu, select_mode);
 				}
 					break;
+				case ACTTYPE_GPLAYER:
+				{
+					bGPDlayer *gpl= (bGPDlayer *)act_channel;
+					select_gpencil_frames(gpl, select_mode);
+				}
+					break;
 			}
 		}
 			break;
@@ -2971,12 +3190,16 @@ void selectall_action_keys (short mval[], short mode, short select_mode)
 			rectf.xmax = rectf.xmax + 0.5;
 			
 			/* filter data */
-			filter= (ACTFILTER_VISIBLE | ACTFILTER_IPOKEYS);
+			if (datatype == ACTCONT_GPENCIL)
+				filter= (ACTFILTER_VISIBLE);
+			else
+				filter= (ACTFILTER_VISIBLE | ACTFILTER_IPOKEYS);
 			actdata_filter(&act_data, filter, data, datatype);
 				
 			/* Now set the flags */
-			for (ale= act_data.first; ale; ale= ale->next)
+			for (ale= act_data.first; ale; ale= ale->next) {
 				borderselect_ipo_key(ale->key_data, rectf.xmin, rectf.xmax, select_mode);
+			}
 			
 			/* Cleanup */
 			BLI_freelistN(&act_data);
@@ -3058,19 +3281,23 @@ void selectkeys_leftright (short leftright, short select_mode)
 	}
 	
 	/* filter data */
-	filter= (ACTFILTER_VISIBLE | ACTFILTER_IPOKEYS);
+	if (datatype == ACTCONT_GPENCIL)
+		filter= (ACTFILTER_VISIBLE);
+	else
+		filter= (ACTFILTER_VISIBLE | ACTFILTER_IPOKEYS);
 	actdata_filter(&act_data, filter, data, datatype);
 		
 	/* select keys on the side where most data occurs */
 	for (ale= act_data.first; ale; ale= ale->next) {
-		if(NLA_ACTION_SCALED && datatype==ACTCONT_ACTION) {
+		if (NLA_ACTION_SCALED && datatype==ACTCONT_ACTION) {
 			actstrip_map_ipo_keys(OBACT, ale->key_data, 0, 1);
 			borderselect_ipo_key(ale->key_data, min, max, SELECT_ADD);
 			actstrip_map_ipo_keys(OBACT, ale->key_data, 1, 1);
 		}
-		else {
+		else if (ale->type == ACTTYPE_GPLAYER)
+			borderselect_gplayer_frames(ale->data, min, max, SELECT_ADD);
+		else
 			borderselect_ipo_key(ale->key_data, min, max, SELECT_ADD);
-		}
 	}
 	
 	/* Cleanup */
@@ -3108,7 +3335,10 @@ void nextprev_action_keyframe (short dir)
 		return;
 	
 	/* get list of keyframes that can be used (in global-time) */
-	filter= (ACTFILTER_VISIBLE | ACTFILTER_IPOKEYS);
+	if (datatype == ACTCONT_GPENCIL)
+		filter= (ACTFILTER_VISIBLE);
+	else
+		filter= (ACTFILTER_VISIBLE | ACTFILTER_IPOKEYS);
 	actdata_filter(&act_data, filter, data, datatype);
 	
 	for (ale= act_data.first; ale; ale= ale->next) {
@@ -3117,6 +3347,8 @@ void nextprev_action_keyframe (short dir)
 			make_cfra_list(ale->key_data, &elems);
 			actstrip_map_ipo_keys(OBACT, ale->key_data, 1, 1);
 		}
+		else if (ale->type == ACTTYPE_GPLAYER)
+			gplayer_make_cfra_list(ale->key_data, &elems, 0);
 		else 
 			make_cfra_list(ale->key_data, &elems);
 	}
@@ -3199,11 +3431,20 @@ void column_select_action_keys (int mode)
 	/* build list of columns */
 	switch (mode) {
 		case 1: /* list of selected keys */
-			filter= (ACTFILTER_VISIBLE | ACTFILTER_IPOKEYS);
-			actdata_filter(&act_data, filter, data, datatype);
-			
-			for (ale= act_data.first; ale; ale= ale->next)
-				make_sel_cfra_list(ale->key_data, &elems);
+			if (datatype == ACTCONT_GPENCIL) {
+				filter= (ACTFILTER_VISIBLE);
+				actdata_filter(&act_data, filter, data, datatype);
+				
+				for (ale= act_data.first; ale; ale= ale->next)
+					gplayer_make_cfra_list(ale->data, &elems, 1);
+			}
+			else {
+				filter= (ACTFILTER_VISIBLE | ACTFILTER_IPOKEYS);
+				actdata_filter(&act_data, filter, data, datatype);
+				
+				for (ale= act_data.first; ale; ale= ale->next)
+					make_sel_cfra_list(ale->key_data, &elems);
+			}
 			
 			BLI_freelistN(&act_data);
 			break;
@@ -3231,19 +3472,34 @@ void column_select_action_keys (int mode)
 	/* loop through all of the keys and select additional keyframes
 	 * based on the keys found to be selected above
 	 */
-	filter= (ACTFILTER_VISIBLE | ACTFILTER_ONLYICU);
+	if (datatype == ACTCONT_GPENCIL)
+		filter= (ACTFILTER_VISIBLE);
+	else
+		filter= (ACTFILTER_VISIBLE | ACTFILTER_ONLYICU);
 	actdata_filter(&act_data, filter, data, datatype);
 	
 	for (ale= act_data.first; ale; ale= ale->next) {
 		for (ce= elems.first; ce; ce= ce->next) {
-			for (icu= ale->key_data; icu; icu= icu->next) {
-				BezTriple *bezt;
-				int verts = 0;
+			/* select elements with frame number matching cfraelem */
+			if (ale->type == ACTTYPE_GPLAYER) {
+				bGPDlayer *gpl= (bGPDlayer *)ale->data;
+				bGPDframe *gpf;
 				
-				for (bezt=icu->bezt; verts<icu->totvert; bezt++, verts++) {
-					if (bezt) {
-						if( (int)(ce->cfra) == (int)(bezt->vec[1][0]) )
-							bezt->f2 |= 1;
+				for (gpf= gpl->frames.first; gpf; gpf= gpf->next) {
+					if ( (int)ce->cfra == gpf->framenum ) 
+						gpf->flag |= GP_FRAME_SELECT;
+				}
+			}
+			else {
+				for (icu= ale->key_data; icu; icu= icu->next) {
+					BezTriple *bezt;
+					int verts = 0;
+					
+					for (bezt=icu->bezt; verts<icu->totvert; bezt++, verts++) {
+						if (bezt) {
+							if( (int)(ce->cfra) == (int)(bezt->vec[1][0]) )
+								bezt->f2 |= 1;
+						}
 					}
 				}
 			}
@@ -3272,7 +3528,7 @@ void borderselect_actionchannels (void)
 	/* determine what type of data we are operating on */
 	data = get_action_context(&datatype);
 	if (data == NULL) return;
-	if (datatype != ACTCONT_ACTION) return;
+	if (ELEM(datatype, ACTCONT_ACTION, ACTCONT_GPENCIL)==0) return;
 	
 	/* draw and handle the borderselect stuff (ui) and get the select rect */
 	if ( (val = get_border(&rect, 3)) ) {
@@ -3344,6 +3600,16 @@ void borderselect_actionchannels (void)
 							icu->flag &= ~IPO_SELECT;
 					}
 						break;
+					case ACTTYPE_GPLAYER: /* grease-pencil layer */
+					{
+						bGPDlayer *gpl = (bGPDlayer *)ale->data;
+						
+						if (selectmode == SELECT_ADD)
+							gpl->flag |= GP_LAYER_SELECT;
+						else
+							gpl->flag &= ~GP_LAYER_SELECT;
+					}
+						break;
 				}
 				
 				/* select action-channel 'owner' */
@@ -3460,6 +3726,9 @@ void borderselect_action (void)
 							borderselect_ipo_key(conchan->ipo, rectf.xmin, rectf.xmax, selectmode);
 					}
 				}
+				else if (ale->type == ACTTYPE_GPLAYER) {
+					borderselect_gplayer_frames(ale->data, rectf.xmin, rectf.xmax, selectmode);
+				}
 				break;
 			case ACTEDIT_BORDERSEL_CHA: /* all in channel(s) */
 				if (!((ymax < rectf.ymin) || (ymin > rectf.ymax))) {
@@ -3481,6 +3750,9 @@ void borderselect_action (void)
 								select_ipo_bezier_keys(conchan->ipo, selectmode);
 						}
 					}
+					else if (ale->type == ACTTYPE_GPLAYER) {
+						select_gpencil_frames(ale->data, selectmode);
+					}
 				}
 				break;
 			default: /* any keyframe inside region defined by region */
@@ -3503,6 +3775,9 @@ void borderselect_action (void)
 								borderselect_ipo_key(conchan->ipo, rectf.xmin, rectf.xmax, selectmode);
 						}
 					}
+					else if (ale->type == ACTTYPE_GPLAYER) {
+						borderselect_gplayer_frames(ale->data, rectf.xmin, rectf.xmax, selectmode);
+					}
 				}
 			}
 			
@@ -3533,6 +3808,8 @@ static void mouse_action (int selectmode)
 	bActionChannel *achan= NULL;
 	bConstraintChannel *conchan= NULL;
 	IpoCurve *icu= NULL;
+	bGPdata *gpd = NULL;
+	bGPDlayer *gpl = NULL;
 	TimeMarker *marker, *pmarker;
 	
 	void *act_channel;
@@ -3543,6 +3820,7 @@ static void mouse_action (int selectmode)
 	data = get_action_context(&datatype);
 	if (data == NULL) return;
 	if (datatype == ACTCONT_ACTION) act= (bAction *)data;
+	if (datatype == ACTCONT_GPENCIL) gpd= (bGPdata *)data;
 
 	act_channel= get_nearest_action_key(&selx, &sel, &act_type, &achan);
 	marker= find_nearest_marker(SCE_MARKERS, 1);
@@ -3615,6 +3893,9 @@ static void mouse_action (int selectmode)
 			case ACTTYPE_GROUP:
 				agrp= (bActionGroup *)act_channel;
 				break;
+			case ACTTYPE_GPLAYER:
+				gpl= (bGPDlayer *)act_channel;
+				break;
 			default:
 				return;
 		}
@@ -3638,6 +3919,13 @@ static void mouse_action (int selectmode)
 					set_active_actiongroup(act, agrp, 1);
 				}
 			}
+			else if (datatype == ACTCONT_GPENCIL) {
+				deselect_action_channels(0);
+				
+				/* Highlight gpencil layer */
+				gpl->flag |= GP_LAYER_SELECT;
+				gpencil_layer_setactive(gpd, gpl);
+			}
 		}
 		
 		if (icu)
@@ -3654,6 +3942,8 @@ static void mouse_action (int selectmode)
 					select_ipo_key(conchan->ipo, selx, selectmode);
 			}
 		}
+		else if (gpl)
+			select_gpencil_frame(gpl, selx, selectmode);
 		
 		std_rmouse_transform(transform_action_keys);
 		
@@ -3670,7 +3960,7 @@ static void mouse_action (int selectmode)
 static void mouse_actionchannels (short mval[])
 {
 	bAction *act= G.saction->action;
-	void *data, *act_channel;
+	void *data, *act_channel, *channel_owner;
 	short datatype, chantype;
 	
 	/* determine what type of data we are operating on */
@@ -3678,7 +3968,7 @@ static void mouse_actionchannels (short mval[])
 	if (data == NULL) return;
 	
 	/* get channel to work on */
-	act_channel= get_nearest_act_channel(mval, &chantype);
+	act_channel= get_nearest_act_channel(mval, &chantype, &channel_owner);
 	
 	/* action to take depends on what channel we've got */
 	switch (chantype) {
@@ -3816,6 +4106,39 @@ static void mouse_actionchannels (short mval[])
 				}
 			}
 				break;
+		case ACTTYPE_GPDATABLOCK:
+			{
+				bGPdata *gpd= (bGPdata *)act_channel;
+				
+				/* toggle expand */
+				gpd->flag ^= GP_DATA_EXPAND;
+			}
+				break;
+		case ACTTYPE_GPLAYER:
+			{
+				bGPdata *gpd= (bGPdata *)channel_owner;
+				bGPDlayer *gpl= (bGPDlayer *)act_channel;
+				
+				if (mval[0] >= (NAMEWIDTH-16)) {
+					/* toggle lock */
+					gpl->flag ^= GP_LAYER_LOCKED;
+				}
+				else if (mval[0] >= (NAMEWIDTH-32)) {
+					/* toggle hide */
+					gpl->flag ^= GP_LAYER_HIDE;
+				}
+				else {
+					/* select/deselect */
+					if (G.qual & LR_SHIFTKEY) {
+						select_gplayer_channel(gpd, gpl, SELECT_INVERT);
+					}
+					else {
+						deselect_gpencil_layers(data, 0);
+						select_gplayer_channel(gpd, gpl, SELECT_INVERT);
+					}
+				}
+			}
+				break;
 		default:
 			return;
 	}
@@ -4482,7 +4805,7 @@ void winqreadactionspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 		case RIGHTMOUSE:
 			/* Clicking in the channel area */
 			if ((G.v2d->mask.xmin) && (mval[0] < NAMEWIDTH)) {
-				if (datatype == ACTCONT_ACTION) {
+				if (ELEM(datatype, ACTCONT_ACTION, ACTCONT_GPENCIL)) {
 					/* mouse is over action channels */
 					if (G.qual == LR_CTRLKEY)
 						numbuts_action();
@@ -4832,8 +5155,12 @@ void winqreadactionspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 		case DELKEY:
 		case XKEY:
 			if (okee("Erase selected")) {
-				if (mval[0] < NAMEWIDTH)
-					delete_action_channels();
+				if (mval[0] < NAMEWIDTH) {
+					if (datatype == ACTCONT_ACTION)
+						delete_action_channels();
+					else if (datatype == ACTCONT_GPENCIL)
+						delete_gpencil_layers();
+				}
 				else
 					delete_action_keys();
 				
diff --git a/source/blender/src/editaction_gpencil.c b/source/blender/src/editaction_gpencil.c
new file mode 100644
index 00000000000..14269080b1f
--- /dev/null
+++ b/source/blender/src/editaction_gpencil.c
@@ -0,0 +1,548 @@
+/**
+ * $Id: editaction_gpencil.c 14881 2008-05-18 10:41:42Z 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
+ * 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 <math.h>
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "MEM_guardedalloc.h"
+
+#include "BMF_Api.h"
+
+#include "BLI_arithb.h"
+#include "BLI_blenlib.h"
+
+#include "DNA_listBase.h"
+#include "DNA_action_types.h"
+#include "DNA_gpencil_types.h"
+#include "DNA_scene_types.h"
+#include "DNA_screen_types.h"
+#include "DNA_space_types.h"
+#include "DNA_userdef_types.h"
+#include "DNA_view3d_types.h"
+#include "DNA_view2d_types.h"
+
+#include "BKE_global.h"
+#include "BKE_utildefines.h"
+#include "BKE_blender.h"
+#include "BKE_ipo.h"
+
+#include "BIF_gl.h"
+#include "BIF_glutil.h"
+#include "BIF_butspace.h"
+#include "BIF_graphics.h"
+#include "BIF_interface.h"
+#include "BIF_mywindow.h"
+#include "BIF_resources.h"
+#include "BIF_space.h"
+#include "BIF_screen.h"
+#include "BIF_toolbox.h"
+#include "BIF_toets.h"
+
+#include "BIF_editaction.h"
+#include "BSE_editaction_types.h"
+
+#include "BDR_gpencil.h"
+#include "BIF_drawgpencil.h"
+
+#include "BSE_drawipo.h"
+#include "BSE_headerbuttons.h"
+#include "BSE_time.h"
+#include "BSE_view.h"
+
+#include "blendef.h"
+#include "butspace.h"
+
+#include "PIL_time.h"			/* sleep				*/
+#include "mydevice.h"
+
+/* ***************************************** */
+/* NOTE ABOUT THIS FILE:
+ * 	This file contains code for editing Grease Pencil data in the Action Editor
+ *	as a 'keyframes', so that a user can adjust the timing of Grease Pencil drawings.
+ * 	Therefore, this file mostly contains functions for selecting Grease-Pencil frames.
+ */
+/* ***************************************** */
+/* Generics - Loopers */
+
+/* Loops over the gp-frames for a gp-layer, and applies the given callback */
+short gplayer_frames_looper (bGPDlayer *gpl, short (*gpf_cb)(bGPDframe *))
+{
+	bGPDframe *gpf;
+	
+	/* error checker */
+	if (gpl == NULL)
+		return 0;
+	
+	/* do loop */
+	for (gpf= gpl->frames.first; gpf; gpf= gpf->next) {
+		/* execute callback */
+		if (gpf_cb(gpf))
+			return 1;
+	}
+		
+	/* nothing to return */
+	return 0;
+}
+
+/* ****************************************** */
+/* Data Conversion Tools */
+
+/* make a listing all the gp-frames in a layer as cfraelems */
+void gplayer_make_cfra_list (bGPDlayer *gpl, ListBase *elems, short onlysel)
+{
+	bGPDframe *gpf;
+	CfraElem *ce;
+	
+	/* error checking */
+	if (ELEM(NULL, gpl, elems))
+		return;
+	
+	/* loop through gp-frames, adding */
+	for (gpf= gpl->frames.first; gpf; gpf= gpf->next) {
+		if ((onlysel == 0) || (gpf->flag & GP_FRAME_SELECT)) {
+			ce= MEM_callocN(sizeof(CfraElem), "CfraElem");
+			
+			ce->cfra= gpf->framenum;
+			ce->sel= (gpf->flag & GP_FRAME_SELECT) ? 1 : 0;
+			
+			BLI_addtail(elems, ce);
+		}
+	}
+}
+
+/* ***************************************** */
+/* Selection Tools */
+
+/* check if one of the frames in this layer is selected */
+short is_gplayer_frame_selected (bGPDlayer *gpl)
+{
+	bGPDframe *gpf;
+	
+	/* error checking */
+	if (gpl == NULL) 
+		return 0;
+	
+	/* stop at the first one found */
+	for (gpf= gpl->frames.first; gpf; gpf= gpf->next) {
+		if (gpf->flag & GP_FRAME_SELECT)
+			return 1;
+	}
+	
+	/* not found */
+	return 0;
+}
+
+/* helper function - select gp-frame based on SELECT_* mode */
+static void gpframe_select (bGPDframe *gpf, short select_mode)
+{
+	switch (select_mode) {
+		case SELECT_ADD:
+			gpf->flag |= GP_FRAME_SELECT;
+			break;
+		case SELECT_SUBTRACT:
+			gpf->flag &= ~GP_FRAME_SELECT;
+			break;
+		case SELECT_INVERT:
+			gpf->flag ^= GP_FRAME_SELECT;
+			break;
+	}
+}
+
+/* set all/none/invert select (like above, but with SELECT_* modes) */
+void select_gpencil_frames (bGPDlayer *gpl, short select_mode)
+{
+	bGPDframe *gpf;
+	
+	/* error checking */
+	if (gpl == NULL) 
+		return;
+		
+	/* handle according to mode */
+	for (gpf= gpl->frames.first; gpf; gpf= gpf->next) {
+		gpframe_select(gpf, select_mode);
+	}
+}
+
+/* set all/none/invert select */
+void set_gplayer_frame_selection (bGPDlayer *gpl, short mode)
+{
+	/* error checking */
+	if (gpl == NULL) 
+		return;
+		
+	/* convert mode to select_mode */
+	switch (mode) {
+		case 2:
+			mode= SELECT_INVERT;
+			break;
+		case 1:
+			mode= SELECT_ADD;
+			break;
+		case 0:
+			mode= SELECT_SUBTRACT;
+			break;
+		default:
+			return;
+	}
+	
+	/* now call the standard function */
+	select_gpencil_frames (gpl, mode);
+}
+
+void select_gpencil_frame (bGPDlayer *gpl, int selx, short select_mode)
+{
+	bGPDframe *gpf;
+   
+	/* search through frames for a match */
+	for (gpf= gpl->frames.first; gpf; gpf= gpf->next) {
+		if (gpf->framenum == selx)
+			gpframe_select(gpf, select_mode);
+	}
+}
+
+void borderselect_gplayer_frames (bGPDlayer *gpl, float min, float max, short select_mode)
+{
+	bGPDframe *gpf;
+	
+	/* only select those frames which are in bounds */
+	for (gpf= gpl->frames.first; gpf; gpf= gpf->next) {
+		if (IN_RANGE(gpf->framenum, min, max))
+			gpframe_select(gpf, select_mode);
+	}
+}
+
+
+/* De-selects or inverts the selection of Layers for a grease-pencil block
+ *	mode: 0 = default behaviour (select all), 1 = test if (de)select all, 2 = invert all 
+ */
+void deselect_gpencil_layers (void *data, short mode)
+{
+	ListBase act_data = {NULL, NULL};
+	bActListElem *ale;
+	int filter, sel=1;
+	
+	/* filter data */
+	filter= ACTFILTER_VISIBLE;
+	actdata_filter(&act_data, filter, data, ACTCONT_GPENCIL);
+	
+	/* See if we should be selecting or deselecting */
+	if (mode == 1) {
+		for (ale= act_data.first; ale; ale= ale->next) {
+			if (sel == 0) 
+				break;
+			
+			if (ale->flag & GP_LAYER_SELECT)
+				sel= 0;
+		}
+	}
+	else
+		sel= 0;
+		
+	/* Now set the flags */
+	for (ale= act_data.first; ale; ale= ale->next) {
+		bGPDlayer *gpl= (bGPDlayer *)ale->data;
+		
+		if (mode == 2)
+			gpl->flag ^= GP_LAYER_SELECT;
+		else if (sel)
+			gpl->flag |= GP_LAYER_SELECT;
+		else
+			gpl->flag &= ~GP_LAYER_SELECT;
+			
+		gpl->flag &= ~GP_LAYER_ACTIVE;
+	}
+	
+	/* Cleanup */
+	BLI_freelistN(&act_data);
+}
+
+/* ***************************************** */
+/* Frame Editing Tools */
+
+void delete_gpencil_layers (void)
+{
+	ListBase act_data = {NULL, NULL};
+	bActListElem *ale, *next;
+	void *data;
+	short datatype;
+	int filter;
+	
+	/* determine what type of data we are operating on */
+	data = get_action_context(&datatype);
+	if (data == NULL) return;
+	if (datatype != ACTCONT_GPENCIL) return;
+	
+	/* filter data */
+	filter= (ACTFILTER_VISIBLE | ACTFILTER_FOREDIT | ACTFILTER_CHANNELS | ACTFILTER_SEL);
+	actdata_filter(&act_data, filter, data, datatype);
+	
+	/* clean up grease-pencil layers */
+	for (ale= act_data.first; ale; ale= next) {
+		bGPdata *gpd= (bGPdata *)ale->owner;
+		bGPDlayer *gpl= (bGPDlayer *)ale->data;
+		next= ale->next;
+		
+		/* free layer and its data */
+		if (SEL_GPL(gpl)) {
+			free_gpencil_frames(gpl);
+			BLI_freelinkN(&gpd->layers, gpl);
+		}
+		
+		/* free temp memory */
+		BLI_freelinkN(&act_data, ale);
+	}
+	
+	BIF_undo_push("Delete GPencil Layers");
+	allspace(REDRAWVIEW3D, 0);
+	allqueue(REDRAWACTION, 0);
+}
+
+/* Delete selected frames */
+void delete_gplayer_frames (bGPDlayer *gpl)
+{
+	bGPDframe *gpf, *gpfn;
+	
+	/* error checking */
+	if (gpl == NULL)
+		return;
+		
+	/* check for frames to delete */
+	for (gpf= gpl->frames.first; gpf; gpf= gpfn) {
+		gpfn= gpf->next;
+		
+		if (gpf->flag & GP_FRAME_SELECT)
+			gpencil_layer_delframe(gpl, gpf);
+	}
+}
+
+/* Duplicate selected frames from given gp-layer */
+void duplicate_gplayer_frames (bGPDlayer *gpl)
+{
+	bGPDframe *gpf, *gpfn;
+	
+	/* error checking */
+	if (gpl == NULL)
+		return;
+	
+	/* duplicate selected frames  */
+	for (gpf= gpl->frames.first; gpf; gpf= gpfn) {
+		gpfn= gpf->next;
+		
+		/* duplicate this frame */
+		if (gpf->flag & GP_FRAME_SELECT) {
+			bGPDframe *gpfd; 
+			bGPDstroke *gps;
+			
+			/* duplicate frame, and deselect self */
+			gpfd= MEM_dupallocN(gpf);
+			gpf->flag &= ~GP_FRAME_SELECT;
+			
+			/* duplicate list of strokes too */
+			duplicatelist(&gpfd->strokes, &gpf->strokes);
+			
+			/* dupalloc only makes another copy of mem, but doesn't adjust pointers */
+			for (gps= gpfd->strokes.first; gps; gps= gps->next) {
+				gps->points= MEM_dupallocN(gps->points);
+			}
+			
+			BLI_insertlinkafter(&gpl->frames, gpf, gpfd);
+		}
+	}
+}
+
+/* -------------------------------------- */
+/* Snap Tools */
+
+static short snap_gpf_nearest (bGPDframe *gpf)
+{
+	if (gpf->flag & GP_FRAME_SELECT)
+		gpf->framenum= (int)(floor(gpf->framenum+0.5));
+	return 0;
+}
+
+static short snap_gpf_nearestsec (bGPDframe *gpf)
+{
+	float secf = FPS;
+	if (gpf->flag & GP_FRAME_SELECT)
+		gpf->framenum= (int)(floor(gpf->framenum/secf + 0.5f) * secf);
+	return 0;
+}
+
+static short snap_gpf_cframe (bGPDframe *gpf)
+{
+	if (gpf->flag & GP_FRAME_SELECT)
+		gpf->framenum= (int)CFRA;
+	return 0;
+}
+
+static short snap_gpf_nearmarker (bGPDframe *gpf)
+{
+	if (gpf->flag & GP_FRAME_SELECT)
+		gpf->framenum= (int)find_nearest_marker_time(gpf->framenum);
+	return 0;
+}
+
+
+/* snap selected frames to ... */
+void snap_gplayer_frames (bGPDlayer *gpl, short mode)
+{
+	switch (mode) {
+		case 1: /* snap to nearest frame */
+			gplayer_frames_looper(gpl, snap_gpf_nearest);
+			break;
+		case 2: /* snap to current frame */
+			gplayer_frames_looper(gpl, snap_gpf_cframe);
+			break;
+		case 3: /* snap to nearest marker */
+			gplayer_frames_looper(gpl, snap_gpf_nearmarker);
+			break;
+		case 4: /* snap to nearest second */
+			gplayer_frames_looper(gpl, snap_gpf_nearestsec);
+			break;
+		default: /* just in case */
+			gplayer_frames_looper(gpl, snap_gpf_nearest);
+			break;
+	}
+}
+
+/* -------------------------------------- */
+/* Mirror Tools */
+
+static short mirror_gpf_cframe (bGPDframe *gpf)
+{
+	float diff;
+	
+	if (gpf->flag & GP_FRAME_SELECT) {
+		diff= ((float)CFRA - gpf->framenum);
+		gpf->framenum= ((float)CFRA + diff);
+	}
+	
+	return 0;
+}
+
+static short mirror_gpf_yaxis (bGPDframe *gpf)
+{
+	float diff;
+	
+	if (gpf->flag & GP_FRAME_SELECT) {
+		diff= (0.0f - gpf->framenum);
+		gpf->framenum= (0.0f + diff);
+	}
+	
+	return 0;
+}
+
+static short mirror_gpf_xaxis (bGPDframe *gpf)
+{
+	float diff;
+	
+	if (gpf->flag & GP_FRAME_SELECT) {
+		diff= (0.0f - gpf->framenum);
+		gpf->framenum= (0.0f + diff);
+	}
+	
+	return 0;
+}
+
+static short mirror_gpf_marker (bGPDframe *gpf)
+{
+	static TimeMarker *marker;
+	static short initialised = 0;
+	float diff;
+	
+	/* In order for this mirror function to work without
+	 * any extra arguments being added, we use the case
+	 * of bezt==NULL to denote that we should find the 
+	 * marker to mirror over. The static pointer is safe
+	 * to use this way, as it will be set to null after 
+	 * each cycle in which this is called.
+	 */
+	
+	if (gpf) {
+		/* mirroring time */
+		if ((gpf->flag & GP_FRAME_SELECT) && (marker)) {
+			diff= (marker->frame - gpf->framenum);
+			gpf->framenum= (marker->frame + diff);
+		}
+	}
+	else {
+		/* initialisation time */
+		if (initialised) {
+			/* reset everything for safety */
+			marker = NULL;
+			initialised = 0;
+		}
+		else {
+			/* try to find a marker */
+			for (marker= G.scene->markers.first; marker; marker=marker->next) {
+				if (marker->flag & SELECT) {
+					initialised = 1;
+					break;
+				}
+			}
+			
+			if (initialised == 0) 
+				marker = NULL;
+		}
+	}
+	
+	return 0;
+}
+
+
+/* mirror selected gp-frames on... */
+void mirror_gplayer_frames (bGPDlayer *gpl, short mode)
+{
+	switch (mode) {
+		case 1: /* mirror over current frame */
+			gplayer_frames_looper(gpl, mirror_gpf_cframe);
+			break;
+		case 2: /* mirror over frame 0 */
+			gplayer_frames_looper(gpl, mirror_gpf_yaxis);
+			break;
+		case 3: /* mirror over value 0 */
+			gplayer_frames_looper(gpl, mirror_gpf_xaxis);
+			break;
+		case 4: /* mirror over marker */
+			mirror_gpf_marker(NULL);
+			gplayer_frames_looper(gpl, mirror_gpf_marker);
+			mirror_gpf_marker(NULL);
+			break;
+		default: /* just in case */
+			gplayer_frames_looper(gpl, mirror_gpf_yaxis);
+			break;
+	}
+}
+
+/* ***************************************** */
diff --git a/source/blender/src/editnode.c b/source/blender/src/editnode.c
index 4c7334c55e0..98f4f1bb46f 100644
--- a/source/blender/src/editnode.c
+++ b/source/blender/src/editnode.c
@@ -82,6 +82,7 @@
 #include "BLI_storage_types.h"
 
 #include "BDR_editobject.h"
+#include "BDR_gpencil.h"
 
 #include "RE_pipeline.h"
 #include "IMB_imbuf_types.h"
@@ -2305,6 +2306,7 @@ static int node_uiDoBlocks(ScrArea *sa, short event)
 	SpaceNode *snode= sa->spacedata.first;
 	ListBase *lb= &sa->uiblocks;
 	ListBase listb= *lb;
+	uiBlock *block;
 	bNode *node;
 	rctf rect;
 	void *prev, *next;
@@ -2319,13 +2321,36 @@ static int node_uiDoBlocks(ScrArea *sa, short event)
 		return UI_NOTHING;
 	}
 	
+	/* evil hack: try to do grease-pencil floating panel (like for nodes) */
+	block= uiGetBlock("nodes_panel_gpencil", sa);
+	if (block) {
+		/* try to process events here... if failed, just carry on */
+			/* when there's menus, the prev pointer becomes zero! */
+		prev= ((struct Link *)block)->prev;
+		next= ((struct Link *)block)->next;
+		((struct Link *)block)->prev= NULL;
+		((struct Link *)block)->next= NULL;
+		
+		lb->first= lb->last= block;
+		retval= uiDoBlocks(lb, event, 1);
+		
+		((struct Link *)block)->prev= prev;
+		((struct Link *)block)->next= next;
+		
+		*lb= listb;
+		
+		/* if something happened, get the heck outta here */
+		if (retval != UI_NOTHING)
+			return retval;
+	}
+	
+	
 	rect.xmin -= 2.0f;
 	rect.ymin -= 2.0f;
 	rect.xmax = rect.xmin + 4.0f;
 	rect.ymax = rect.ymin + 4.0f;
 	
 	for(node= snode->edittree->nodes.first; node; node= node->next) {
-		uiBlock *block;
 		char str[32];
 		
 		/* retreive unique block name, see also drawnode.c */
@@ -2369,14 +2394,16 @@ void winqreadnodespace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 	if(snode->nodetree==NULL) return;
 	
 	if(val) {
-
-		if( node_uiDoBlocks(sa, event)!=UI_NOTHING ) event= 0;	
-
+		if( node_uiDoBlocks(sa, event)!=UI_NOTHING ) event= 0;
+		
 		fromlib= (snode->id && snode->id->lib);
 		
 		switch(event) {
 		case LEFTMOUSE:
-			if(fromlib) {
+			if(gpencil_do_paint(sa, L_MOUSE)) {
+				return;
+			}
+			else if(fromlib) {
 				if(node_mouse_groupheader(snode)==0)
 					node_mouse_select(snode, event);
 			}
@@ -2394,7 +2421,10 @@ void winqreadnodespace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			break;
 			
 		case RIGHTMOUSE: 
-			if(find_indicated_socket(snode, &actnode, &actsock, SOCK_IN)) {
+			if(gpencil_do_paint(sa, R_MOUSE)) {
+				return;
+			}
+			else if(find_indicated_socket(snode, &actnode, &actsock, SOCK_IN)) {
 				if(actsock->flag & SOCK_SEL) {
 					snode->edittree->selin= NULL;
 					actsock->flag&= ~SOCK_SEL;
@@ -2541,8 +2571,13 @@ void winqreadnodespace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			break;
 		case DELKEY:
 		case XKEY:
-			if(fromlib) fromlib= -1;
-			else node_delete(snode);
+			if(G.qual==LR_ALTKEY) {
+				gpencil_delete_menu();
+			}
+			else {
+				if(fromlib) fromlib= -1;
+				else node_delete(snode);
+			}
 			break;
 		}
 	}
diff --git a/source/blender/src/editseq.c b/source/blender/src/editseq.c
index f9432f8e69a..12019a9dab9 100644
--- a/source/blender/src/editseq.c
+++ b/source/blender/src/editseq.c
@@ -122,13 +122,28 @@ Sequence *get_last_seq()
 	if(!_last_seq_init) {
 		Editing *ed;
 		Sequence *seq;
+		Sequence *l_sel = NULL;
+		Sequence *l_act = NULL;
 
 		ed= G.scene->ed;
 		if(!ed) return NULL;
 
-		for(seq= ed->seqbasep->first; seq; seq=seq->next)
+		for(seq= ed->seqbasep->first; seq; seq=seq->next) {
+			if(seq->flag & SEQ_ACTIVE)
+				l_act = seq;
 			if(seq->flag & SELECT)
-				_last_seq= seq;
+				l_sel = seq;
+		}
+
+		if (l_act) {
+			_last_seq = l_act;
+		} else {
+			_last_seq = l_sel;
+		}
+
+		if (_last_seq) {
+			_last_seq->flag |= SEQ_ACTIVE;
+		}
 
 		_last_seq_init = 1;
 	}
@@ -138,12 +153,23 @@ Sequence *get_last_seq()
 
 void set_last_seq(Sequence *seq)
 {
+	if (_last_seq_init && _last_seq) {
+		_last_seq->flag &= ~SEQ_ACTIVE;
+	}
+
 	_last_seq = seq;
 	_last_seq_init = 1;
+
+	if (_last_seq) {
+		_last_seq->flag |= SEQ_ACTIVE;
+	}
 }
 
-void clear_last_seq(Sequence *seq)
+void clear_last_seq()
 {
+	if (_last_seq_init && _last_seq) {
+		_last_seq->flag &= ~SEQ_ACTIVE;
+	}
 	_last_seq = NULL;
 	_last_seq_init = 0;
 }
@@ -2261,6 +2287,8 @@ static Sequence *dupli_seq(Sequence *seq)
 				"handled in duplicate!\nExpect a crash"
 						" now...\n");
 	}
+
+	seqn->flag &= ~SEQ_ACTIVE;
 	
 	return seqn;
 }
diff --git a/source/blender/src/gpencil.c b/source/blender/src/gpencil.c
new file mode 100644
index 00000000000..6deea5e1e81
--- /dev/null
+++ b/source/blender/src/gpencil.c
@@ -0,0 +1,1197 @@
+/**
+ * $Id: gpencil.c 14881 2008-05-18 10:41:42Z 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
+ * 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 <math.h>
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "MEM_guardedalloc.h"
+
+#include "BMF_Api.h"
+
+#include "BLI_arithb.h"
+#include "BLI_blenlib.h"
+
+#include "DNA_listBase.h"
+#include "DNA_gpencil_types.h"
+#include "DNA_scene_types.h"
+#include "DNA_screen_types.h"
+#include "DNA_space_types.h"
+#include "DNA_userdef_types.h"
+#include "DNA_view3d_types.h"
+
+#include "BKE_global.h"
+#include "BKE_utildefines.h"
+#include "BKE_blender.h"
+
+#include "BIF_gl.h"
+#include "BIF_glutil.h"
+#include "BIF_butspace.h"
+#include "BIF_graphics.h"
+#include "BIF_interface.h"
+#include "BIF_mywindow.h"
+#include "BIF_resources.h"
+#include "BIF_space.h"
+#include "BIF_screen.h"
+#include "BIF_toolbox.h"
+#include "BIF_toets.h"
+
+#include "BDR_gpencil.h"
+#include "BIF_drawgpencil.h"
+
+#include "BSE_drawipo.h"
+#include "BSE_headerbuttons.h"
+#include "BSE_view.h"
+
+#include "blendef.h"
+
+#include "PIL_time.h"			/* sleep				*/
+#include "mydevice.h"
+
+/* ************************************************** */
+/* GENERAL STUFF */
+
+/* --------- Memory Management ------------ */
+
+/* Free strokes belonging to a gp-frame */
+void free_gpencil_strokes (bGPDframe *gpf)
+{
+	bGPDstroke *gps, *gpsn;
+	
+	/* error checking */
+	if (gpf == NULL) return;
+	
+	/* free strokes */
+	for (gps= gpf->strokes.first; gps; gps= gpsn) {
+		gpsn= gps->next;
+		
+		/* free stroke memory arrays, then stroke itself */
+		MEM_freeN(gps->points);
+		BLI_freelinkN(&gpf->strokes, gps);
+	}
+}
+
+/* Free all of a gp-layer's frames */
+void free_gpencil_frames (bGPDlayer *gpl)
+{
+	bGPDframe *gpf, *gpfn;
+	
+	/* error checking */
+	if (gpl == NULL) return;
+	
+	/* free frames */
+	for (gpf= gpl->frames.first; gpf; gpf= gpfn) {
+		gpfn= gpf->next;
+		
+		/* free strokes and their associated memory */
+		free_gpencil_strokes(gpf);
+		BLI_freelinkN(&gpl->frames, gpf);
+	}
+}
+
+/* Free all of the gp-layers for a viewport (list should be &G.vd->gpd or so) */
+void free_gpencil_layers (ListBase *list) 
+{
+	bGPDlayer *gpl, *gpln;
+	
+	/* error checking */
+	if (list == NULL) return;
+	
+	/* delete layers*/
+	for (gpl= list->first; gpl; gpl= gpln) {
+		gpln= gpl->next;
+		
+		/* free layers and their data */
+		free_gpencil_frames(gpl);
+		BLI_freelinkN(list, gpl);
+	}
+}
+
+/* Free gp-data and all it's related data */
+void free_gpencil_data (bGPdata *gpd)
+{
+	/* free layers then data itself */
+	free_gpencil_layers(&gpd->layers);
+	MEM_freeN(gpd);
+}
+
+/* -------- Container Creation ---------- */
+
+/* add a new gp-frame to the given layer */
+bGPDframe *gpencil_frame_addnew (bGPDlayer *gpl, int cframe)
+{
+	bGPDframe *gpf, *gf;
+	short state=0;
+	
+	/* error checking */
+	if ((gpl == NULL) || (cframe <= 0))
+		return NULL;
+		
+	/* allocate memory for this frame */
+	gpf= MEM_callocN(sizeof(bGPDframe), "bGPDframe");
+	gpf->framenum= cframe;
+	
+	/* find appropriate place to add frame */
+	if (gpl->frames.first) {
+		for (gf= gpl->frames.first; gf; gf= gf->next) {
+			/* check if frame matches one that is supposed to be added */
+			if (gf->framenum == cframe) {
+				state= -1;
+				break;
+			}
+			
+			/* if current frame has already exceeded the frame to add, add before */
+			if (gf->framenum > cframe) {
+				BLI_insertlinkbefore(&gpl->frames, gf, gpf);
+				state= 1;
+				break;
+			}
+		}
+	}
+	
+	/* check whether frame was added successfully */
+	if (state == -1) {
+		MEM_freeN(gpf);
+		printf("Error: frame (%d) existed already for this layer \n", cframe);
+	}
+	else if (state == 0) {
+		/* add to end then! */
+		BLI_addtail(&gpl->frames, gpf);
+	}
+	
+	/* return frame */
+	return gpf;
+}
+
+/* add a new gp-layer and make it the active layer */
+bGPDlayer *gpencil_layer_addnew (bGPdata *gpd)
+{
+	bGPDlayer *gpl;
+	
+	/* check that list is ok */
+	if (gpd == NULL)
+		return NULL;
+		
+	/* allocate memory for frame and add to end of list */
+	gpl= MEM_callocN(sizeof(bGPDlayer), "bGPDlayer");
+	
+	/* add to datablock */
+	BLI_addtail(&gpd->layers, gpl);
+	
+	/* set basic settings */
+	gpl->color[3]= 1.0f;
+	gpl->thickness = 1;
+	
+	/* auto-name */
+	sprintf(gpl->info, "GP_Layer");
+	BLI_uniquename(&gpd->layers, gpl, "GP_Layer", offsetof(bGPDlayer, info[0]), 128);
+	
+	/* make this one the active one */
+	gpencil_layer_setactive(gpd, gpl);
+	
+	/* return layer */
+	return gpl;
+}
+
+/* add a new gp-datablock */
+bGPdata *gpencil_data_addnew (void)
+{
+	bGPdata *gpd;
+	
+	/* allocate memory for a new block */
+	gpd= MEM_callocN(sizeof(bGPdata), "GreasePencilData");
+	
+	/* initial settings */
+		/* it is quite useful to be able to see this info, so on by default */
+	gpd->flag = GP_DATA_DISPINFO;
+	
+	return gpd;
+}
+
+/* -------- Data Duplication ---------- */
+
+/* make a copy of a given gpencil datablock */
+bGPdata *gpencil_data_duplicate (bGPdata *src)
+{
+	bGPdata *dst;
+	bGPDlayer *gpld, *gpls;
+	bGPDframe *gpfd, *gpfs;
+	bGPDstroke *gps;
+	
+	/* error checking */
+	if (src == NULL)
+		return NULL;
+	
+	/* make a copy of the base-data */
+	dst= MEM_dupallocN(src);
+	
+	/* copy layers */
+	duplicatelist(&dst->layers, &src->layers);
+	
+	for (gpld=dst->layers.first, gpls=src->layers.first; gpld && gpls; 
+		 gpld=gpld->next, gpls=gpls->next) 
+	{
+		/* copy frames */
+		duplicatelist(&gpld->frames, &gpls->frames);
+		
+		for (gpfd=gpld->frames.first, gpfs=gpls->frames.first; gpfd && gpfs;
+			 gpfd=gpfd->next, gpfs=gpfs->next) 
+		{
+			/* copy strokes */
+			duplicatelist(&gpfd->strokes, &gpfs->strokes);
+			
+			for (gps= gpfd->strokes.first; gps; gps= gps->next) 
+			{
+				gps->points= MEM_dupallocN(gps->points);
+			}
+		}
+	}
+	
+	/* return new */
+	return dst;
+}
+
+/* ----------- GP-Datablock API ------------- */
+
+/* get the appropriate bGPdata from the active/given context */
+bGPdata *gpencil_data_getactive (ScrArea *sa)
+{
+	/* 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 Preview" mode */
+			if (sseq->mainb)
+				return sseq->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)
+{
+	/* 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) {
+				/* free the existing block */
+				if (sseq->gpd)
+					free_gpencil_data(sseq->gpd);
+				sseq->gpd= gpd;
+				
+				return 1;
+			}
+		}
+			break;
+	}
+	
+	/* failed to add */
+	return 0;
+}
+
+/* -------- GP-Frame API ---------- */
+
+/* delete the last stroke of the given frame */
+void gpencil_frame_delete_laststroke (bGPDframe *gpf)
+{
+	bGPDstroke *gps= (gpf) ? gpf->strokes.last : NULL;
+	
+	/* error checking */
+	if (ELEM(NULL, gpf, gps))
+		return;
+	
+	/* free the stroke and its data */
+	MEM_freeN(gps->points);
+	BLI_freelinkN(&gpf->strokes, gps);
+}
+
+/* -------- GP-Layer API ---------- */
+
+/* get the appropriate gp-frame from a given layer
+ *	- this sets the layer's actframe var (if allowed to)
+ *	- extension beyond range (if first gp-frame is after all frame in interest and cannot add)
+ */
+bGPDframe *gpencil_layer_getframe (bGPDlayer *gpl, int cframe, short addnew)
+{
+	bGPDframe *gpf = NULL;
+	short found = 0;
+	
+	/* error checking */
+	if (gpl == NULL) return NULL;
+	if (cframe <= 0) cframe = 1;
+	
+	/* check if there is already an active frame */
+	if (gpl->actframe) {
+		gpf= gpl->actframe;
+		
+		/* do not allow any changes to layer's active frame if layer is locked */
+		if (gpl->flag & GP_LAYER_LOCKED)
+			return gpf;
+		/* do not allow any changes to actframe if frame has painting tag attached to it */
+		if (gpf->flag & GP_FRAME_PAINT) 
+			return gpf;
+		
+		/* try to find matching frame */
+		if (gpf->framenum < cframe) {
+			for (; gpf; gpf= gpf->next) {
+				if (gpf->framenum == cframe) {
+					found= 1;
+					break;
+				}
+				else if ((gpf->next) && (gpf->next->framenum > cframe)) {
+					found= 1;
+					break;
+				}
+			}
+			
+			/* set the appropriate frame */
+			if (addnew) {
+				if ((found) && (gpf->framenum == cframe))
+					gpl->actframe= gpf;
+				else
+					gpl->actframe= gpencil_frame_addnew(gpl, cframe);
+			}
+			else if (found)
+				gpl->actframe= gpf;
+			else
+				gpl->actframe= gpl->frames.last;
+		}
+		else {
+			for (; gpf; gpf= gpf->prev) {
+				if (gpf->framenum <= cframe) {
+					found= 1;
+					break;
+				}
+			}
+			
+			/* set the appropriate frame */
+			if (addnew) {
+				if ((found) && (gpf->framenum == cframe))
+					gpl->actframe= gpf;
+				else
+					gpl->actframe= gpencil_frame_addnew(gpl, cframe);
+			}
+			else if (found)
+				gpl->actframe= gpf;
+			else
+				gpl->actframe= gpl->frames.first;
+		}
+	}
+	else if (gpl->frames.first) {
+		/* check which of the ends to start checking from */
+		const int first= ((bGPDframe *)(gpl->frames.first))->framenum;
+		const int last= ((bGPDframe *)(gpl->frames.last))->framenum;
+		
+		if (abs(cframe-first) > abs(cframe-last)) {
+			/* find gp-frame which is less than or equal to cframe */
+			for (gpf= gpl->frames.last; gpf; gpf= gpf->prev) {
+				if (gpf->framenum <= cframe) {
+					found= 1;
+					break;
+				}
+			}
+		}
+		else {
+			/* find gp-frame which is less than or equal to cframe */
+			for (gpf= gpl->frames.first; gpf; gpf= gpf->next) {
+				if (gpf->framenum <= cframe) {
+					found= 1;
+					break;
+				}
+			}
+		}
+		
+		/* set the appropriate frame */
+		if (addnew) {
+			if ((found) && (gpf->framenum == cframe))
+				gpl->actframe= gpf;
+			else
+				gpl->actframe= gpencil_frame_addnew(gpl, cframe);
+		}
+		else if (found)
+			gpl->actframe= gpf;
+		else {
+			/* unresolved errogenous situation! */
+			printf("Error: cannot find appropriate gp-frame \n");
+		}
+	}
+	else {
+		/* currently no frames (add if allowed to) */
+		if (addnew)
+			gpl->actframe= gpencil_frame_addnew(gpl, cframe);
+		else {
+			/* don't do anything... this may be when no frames yet! */
+		}
+	}
+	
+	/* return */
+	return gpl->actframe;
+}
+
+/* delete the given frame from a layer */
+void gpencil_layer_delframe (bGPDlayer *gpl, bGPDframe *gpf)
+{
+	/* error checking */
+	if (ELEM(NULL, gpl, gpf))
+		return;
+		
+	/* free the frame and its data */
+	free_gpencil_strokes(gpf);
+	BLI_freelinkN(&gpl->frames, gpf);
+	gpl->actframe = NULL;
+}
+
+/* get the active gp-layer for editing */
+bGPDlayer *gpencil_layer_getactive (bGPdata *gpd)
+{
+	bGPDlayer *gpl;
+	
+	/* error checking */
+	if (ELEM(NULL, gpd, gpd->layers.first))
+		return NULL;
+		
+	/* loop over layers until found (assume only one active) */
+	for (gpl=gpd->layers.first; gpl; gpl=gpl->next) {
+		if (gpl->flag & GP_LAYER_ACTIVE)
+			return gpl;
+	}
+	
+	/* no active layer found */
+	return NULL;
+}
+
+/* set the active gp-layer */
+void gpencil_layer_setactive (bGPdata *gpd, bGPDlayer *active)
+{
+	bGPDlayer *gpl;
+	
+	/* error checking */
+	if (ELEM3(NULL, gpd, gpd->layers.first, active))
+		return;
+		
+	/* loop over layers deactivating all */
+	for (gpl=gpd->layers.first; gpl; gpl=gpl->next)
+		gpl->flag &= ~GP_LAYER_ACTIVE;
+	
+	/* set as active one */
+	active->flag |= GP_LAYER_ACTIVE;
+}
+
+/* delete the active gp-layer */
+void gpencil_layer_delactive (bGPdata *gpd)
+{
+	bGPDlayer *gpl= gpencil_layer_getactive(gpd);
+	
+	/* error checking */
+	if (ELEM(NULL, gpd, gpl)) 
+		return;
+	
+	/* free layer */	
+	free_gpencil_frames(gpl);
+	BLI_freelinkN(&gpd->layers, gpl);
+
+}
+
+/* ************************************************** */
+/* GREASE-PENCIL EDITING MODE - Tools */
+
+/* --------- Data Deletion ---------- */
+
+/* delete the last stroke on the active layer */
+void gpencil_delete_laststroke (bGPdata *gpd)
+{
+	bGPDlayer *gpl= gpencil_layer_getactive(gpd);
+	bGPDframe *gpf= gpencil_layer_getframe(gpl, CFRA, 0);
+	
+	gpencil_frame_delete_laststroke(gpf);
+}
+
+/* delete the active frame */
+void gpencil_delete_actframe (bGPdata *gpd)
+{
+	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 (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);
+			break;
+		case 2: /* active frame */
+			gpencil_delete_actframe(gpd);
+			break;
+		case 3: /* active layer */
+			gpencil_layer_delactive(gpd);
+			break;
+	}
+	
+	/* redraw and undo-push */
+	BIF_undo_push("GPencil Delete");
+	allqueue(REDRAWVIEW3D, 0);
+}
+
+/* display a menu for deleting different grease-pencil elements */
+void gpencil_delete_menu (void)
+{
+	bGPdata *gpd= gpencil_data_getactive(NULL);
+	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(mode);
+}
+
+/* ************************************************** */
+/* GREASE-PENCIL EDITING MODE - Painting */
+
+/* ---------- 'Globals' and Defines ----------------- */
+
+/* maximum sizes of gp-session buffer */
+#define GP_STROKE_BUFFER_MAX	500	
+
+/* ------ */
+
+/* Temporary 'Stroke' Operation data */
+typedef struct tGPsdata {
+	ScrArea *sa;		/* area where painting originated */
+	View2D *v2d;		/* needed for GP_STROKE_2DSPACE */
+	
+	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 (L_MOUSE or R_MOUSE for now) */
+} 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 */
+};
+
+/* 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(bGPDspoint)*GP_STROKE_BUFFER_MAX);
+	else
+		gpd->sbuffer= MEM_callocN(sizeof(bGPDspoint)*GP_STROKE_BUFFER_MAX, "gp_session_strokebuffer");
+	
+	/* reset indices */
+	gpd->sbuffer_size = 0;
+	
+	/* reset flags */
+	gpd->sbuffer_sflag= 0;
+}
+
+/* init new painting session */
+static void gp_session_initpaint (tGPsdata *p)
+{
+	/* 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;
+	}
+	switch (curarea->spacetype) {
+		/* supported views first */
+		case SPACE_VIEW3D:
+		{
+			View3D *v3d= curarea->spacedata.first;
+			
+			/* set current area */
+			p->sa= curarea;
+			
+			/* 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->v2d= &snode->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->v2d= &sseq->v2d;
+			
+			/* check that gpencil data is allowed to be drawn */
+			if (sseq->mainb == 0) {
+				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;	
+		/* 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();
+		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);
+}
+
+/* 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;
+}
+
+/* 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) {
+		short mx=mval[0], my=mval[1];
+		float *fp= give_cursor();
+		float dvec[3];
+		
+		/* method taken from editview.c - mouse_cursor() */
+		project_short_noclip(fp, mval);
+		window_to_3d(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;
+		
+		areamouseco_to_ipoco(p->v2d, mval, &x, &y);
+		
+		out[0]= x;
+		out[1]= y;
+	}
+	
+	/* 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[], float pressure)
+{
+	bGPdata *gpd= p->gpd;
+	bGPDspoint *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= gpd->sbuffer + gpd->sbuffer_size;
+	
+	/* convert screen-coordinates to appropriate coordinates (and store them) */
+	gp_stroke_convertcoords(p, mval, &pt->x);
+	
+	/* store other settings */
+	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;
+	
+	/* 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++) {
+		bGPDspoint *pc= (gpd->sbuffer + i);
+		bGPDspoint *pb= (i-1 > 0)?(pc-1):(pc);
+		bGPDspoint *pa= (i-2 > 0)?(pc-2):(pb);
+		bGPDspoint *pd= (i+1 < cmx)?(pc+1):(pc);
+		bGPDspoint *pe= (i+2 < cmx)?(pc+2):(pd);
+		
+		pc->x= (0.1*pa->x + 0.2*pb->x + 0.4*pc->x + 0.2*pd->x + 0.1*pe->x);
+		pc->y= (0.1*pa->y + 0.2*pb->y + 0.4*pc->y + 0.2*pd->y + 0.1*pe->y);
+	}
+}
+
+/* make a new stroke from the buffer data */
+static void gp_stroke_newfrombuffer (tGPsdata *p)
+{
+	bGPdata *gpd= p->gpd;
+	bGPDstroke *gps;
+	bGPDspoint *pt, *ptc;
+	int i, totelem;
+	
+	/* get total number of points to allocate space for */
+	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 */
+	for (i=0, ptc=gpd->sbuffer; i < gpd->sbuffer_size && ptc; i++, ptc++) {
+		memcpy(pt, ptc, sizeof(bGPDspoint));
+		pt++;
+	}
+	
+	/* add stroke to frame */
+	BLI_addtail(&p->gpf->strokes, gps);
+}
+
+/* ---------- 'Paint' Tool ------------ */
+
+/* init new stroke */
+static void gp_paint_initstroke (tGPsdata *p, short mousebutton)
+{	
+	/* 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, 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 or right-mouse in action */
+	if ( get_activedevice() == 2 || (mousebutton & R_MOUSE) ) {
+		p->gpd->sbuffer_sflag |= GP_STROKE_ERASER;
+		
+		// for now: eraser isn't ready for prime-time yet, so no painting available here yet
+		p->status= GP_STATUS_ERROR;
+		return;
+	}
+	
+	/* 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:
+			{
+				float *fp= give_cursor();
+				initgrabz(fp[0], fp[1], fp[2]);
+				
+				p->gpd->sbuffer_sflag |= GP_STROKE_3DSPACE;
+			}
+				break;
+			case SPACE_NODE:
+			{
+				p->gpd->sbuffer_sflag |= GP_STROKE_2DSPACE;
+			}
+				break;
+			case SPACE_SEQ:
+			{
+				/* for now, this is not applicable here... */
+			}
+				break;
+		}
+	}
+}
+
+/* finish off a stroke (clears buffer, but doesn't finish the paint operation) */
+static void gp_paint_strokeend (tGPsdata *p)
+{
+	/* sanitize stroke-points in buffer */
+	gp_stroke_smooth(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;
+	
+	/* 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 */
+	force_draw_plus(SPACE_ACTION, 0);
+}
+
+/* -------- */
+
+/* main call to paint a new stroke */
+short gpencil_paint (short mousebutton)
+{
+	tGPsdata p;
+	short prevmval[2], mval[2];
+	float opressure, pressure;
+	short ok = GP_STROKEADD_NORMAL;
+	
+	/* init paint-data */
+	gp_session_initpaint(&p);
+	if (p.status == GP_STATUS_ERROR) {
+		gp_session_cleanup(&p);
+		return 0;
+	}
+	gp_paint_initstroke(&p, mousebutton);
+	if (p.status == GP_STATUS_ERROR) {
+		gp_session_cleanup(&p);
+		return 0;
+	}
+	
+	/* set cursor to indicate drawing */
+	setcursor_space(p.sa->spacetype, CURSOR_VPAINT);
+	
+	/* init drawing-device settings */
+	getmouseco_areawin(mval);
+	pressure = get_pressure();
+	
+	prevmval[0]= mval[0];
+	prevmval[1]= mval[1];
+	opressure= pressure;
+	
+	/* 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
+	 */
+	if (!(pressure >= 0.99f) || (p.gpd->flag & GP_DATA_EDITPAINT)) { 
+		gp_stroke_addpoint(&p, mval, pressure);
+	}
+	
+	/* paint loop */
+	do {
+		/* get current user input */
+		getmouseco_areawin(mval);
+		pressure = get_pressure();
+		
+		/* only add current point to buffer if mouse moved (otherwise wait until it does) */
+		if ((mval[0] != prevmval[0]) || (mval[1] != prevmval[1])) {
+			/* try to add point */
+			ok= gp_stroke_addpoint(&p, mval, 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, prevmval, opressure);
+				ok= gp_stroke_addpoint(&p, mval, 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");
+				break;
+			}
+			force_draw(0);
+			
+			prevmval[0]= mval[0];
+			prevmval[1]= mval[1];
+			opressure= pressure;
+		}
+		else
+			BIF_wait_for_statechange();
+		
+		/* do mouse checking at the end, so don't check twice, and potentially
+		 * miss a short tap 
+		 */
+	} while (get_mbut() & mousebutton);
+	
+	/* clear edit flags */
+	G.f &= ~G_GREASEPENCIL;
+	
+	/* restore cursor to indicate end of drawing */
+	setcursor_space(p.sa->spacetype, CURSOR_STD);
+	
+	/* check size of buffer before cleanup, to determine if anything happened here */
+	ok= p.gpd->sbuffer_size;
+	
+	/* cleanup */
+	gp_paint_cleanup(&p);
+	gp_session_cleanup(&p);
+	
+	/* done! return if a stroke was successfully added */
+	return ok;
+}
+
+
+/* All event (loops) handling checking if stroke drawing should be initiated
+ * should call this function.
+ */
+short gpencil_do_paint (ScrArea *sa, short mousebutton)
+{
+	bGPdata *gpd = gpencil_data_getactive(sa);
+	short retval= 0;
+	
+	/* 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)
+	 *		(single 'dots' are only available via this method)
+	 *	2. if shift-modifier is held + lmb -> 'quick paint'
+	 */
+	if (gpd->flag & GP_DATA_EDITPAINT) {
+		/* try to paint */
+		retval = gpencil_paint(mousebutton);
+	}
+	else if (!(gpd->flag & GP_DATA_LMBPLOCK) && (G.qual == LR_SHIFTKEY)) {
+		/* try to paint */
+		retval = gpencil_paint(mousebutton);
+	}
+	
+	/* return result of trying to paint */
+	return retval;
+}
+
+/* ************************************************** */
diff --git a/source/blender/src/header_action.c b/source/blender/src/header_action.c
index 9c7046c5111..4bb7bb9677e 100644
--- a/source/blender/src/header_action.c
+++ b/source/blender/src/header_action.c
@@ -50,8 +50,11 @@
 #include "DNA_screen_types.h"
 #include "DNA_space_types.h"
 
+#include "BIF_gl.h"
+#include "BIF_glutil.h"
 #include "BIF_editaction.h"
 #include "BIF_interface.h"
+#include "BIF_language.h"
 #include "BIF_poseobject.h"
 #include "BIF_resources.h"
 #include "BIF_screen.h"
@@ -76,6 +79,7 @@
 #include "blendef.h"
 #include "mydevice.h"
 
+/* ------------------------------- */
 /* enums declaring constants that are used as menu event codes  */
 
 enum {
@@ -212,6 +216,16 @@ enum {
 	ACTMENU_MARKERS_LOCALMOVE
 };
 
+/* ------------------------------- */
+/* macros for easier state testing (only for use here) */
+
+/* test if active action editor is showing any markers */
+#define G_SACTION_HASMARKERS \
+	((G.saction->action && G.saction->action->markers.first) \
+	 || (G.scene->markers.first))
+
+/* ------------------------------- */
+
 void do_action_buttons(unsigned short event)
 {
 	Object *ob= OBACT;
@@ -398,32 +412,41 @@ static uiBlock *action_viewmenu(void *arg_unused)
 	
 	uiDefBut(block, SEPR, 0, "",        0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
 	
-	uiDefIconTextBut(block, BUTM, 1, (G.saction->flag & SACTION_SLIDERS)?ICON_CHECKBOX_HLT:ICON_CHECKBOX_DEHLT, 
-					 "Show Sliders|", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 1, 
-					 ACTMENU_VIEW_SLIDERS, "");
-					 
-	uiDefIconTextBut(block, BUTM, 1, (G.saction->flag & SACTION_NOHIDE)?ICON_CHECKBOX_HLT:ICON_CHECKBOX_DEHLT, 
-					 "Show Hidden Channels|", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 1, 
-					 ACTMENU_VIEW_NOHIDE, "");
-					 
-	uiDefIconTextBut(block, BUTM, 1, (G.saction->flag & SACTION_NODRAWGCOLORS)?ICON_CHECKBOX_DEHLT:ICON_CHECKBOX_HLT, 
-					 "Use Group Colors|", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 1, 
-					 ACTMENU_VIEW_GCOLORS, "");
-					 
-		// this option may get removed in future
-	uiDefIconTextBut(block, BUTM, 1, (G.saction->flag & SACTION_HORIZOPTIMISEON)?ICON_CHECKBOX_HLT:ICON_CHECKBOX_DEHLT, 
-					 "Cull Out-of-View Keys (Time)|", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 1, 
-					 ACTMENU_VIEW_HORIZOPTIMISE, "");
+	if (G.saction->mode == SACTCONT_GPENCIL) {
+			// this option may get removed in future
+		uiDefIconTextBut(block, BUTM, 1, (G.saction->flag & SACTION_HORIZOPTIMISEON)?ICON_CHECKBOX_HLT:ICON_CHECKBOX_DEHLT, 
+						 "Cull Out-of-View Keys (Time)|", 0, yco-=20, 
+						 menuwidth, 19, NULL, 0.0, 0.0, 1, 
+						 ACTMENU_VIEW_HORIZOPTIMISE, "");
+	}
+	else {
+		uiDefIconTextBut(block, BUTM, 1, (G.saction->flag & SACTION_SLIDERS)?ICON_CHECKBOX_HLT:ICON_CHECKBOX_DEHLT, 
+						 "Show Sliders|", 0, yco-=20, 
+						 menuwidth, 19, NULL, 0.0, 0.0, 1, 
+						 ACTMENU_VIEW_SLIDERS, "");
+						 
+		uiDefIconTextBut(block, BUTM, 1, (G.saction->flag & SACTION_NOHIDE)?ICON_CHECKBOX_HLT:ICON_CHECKBOX_DEHLT, 
+						 "Show Hidden Channels|", 0, yco-=20, 
+						 menuwidth, 19, NULL, 0.0, 0.0, 1, 
+						 ACTMENU_VIEW_NOHIDE, "");
+						 
+		uiDefIconTextBut(block, BUTM, 1, (G.saction->flag & SACTION_NODRAWGCOLORS)?ICON_CHECKBOX_DEHLT:ICON_CHECKBOX_HLT, 
+						 "Use Group Colors|", 0, yco-=20, 
+						 menuwidth, 19, NULL, 0.0, 0.0, 1, 
+						 ACTMENU_VIEW_GCOLORS, "");
+						 
+			// this option may get removed in future
+		uiDefIconTextBut(block, BUTM, 1, (G.saction->flag & SACTION_HORIZOPTIMISEON)?ICON_CHECKBOX_HLT:ICON_CHECKBOX_DEHLT, 
+						 "Cull Out-of-View Keys (Time)|", 0, yco-=20, 
+						 menuwidth, 19, NULL, 0.0, 0.0, 1, 
+						 ACTMENU_VIEW_HORIZOPTIMISE, "");
+		
+		uiDefIconTextBut(block, BUTM, 1, (G.saction->flag & SACTION_NOTRANSKEYCULL)?ICON_CHECKBOX_DEHLT:ICON_CHECKBOX_HLT, 
+						 "AutoMerge Keyframes|", 0, yco-=20, 
+						 menuwidth, 19, NULL, 0.0, 0.0, 1, 
+						 ACTMENU_VIEW_TRANSDELDUPS, "");
+	}	
 	
-	uiDefIconTextBut(block, BUTM, 1, (G.saction->flag & SACTION_NOTRANSKEYCULL)?ICON_CHECKBOX_DEHLT:ICON_CHECKBOX_HLT, 
-					 "AutoMerge Keyframes|", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 1, 
-					 ACTMENU_VIEW_TRANSDELDUPS, "");
-			
 		
 	uiDefIconTextBut(block, BUTM, 1, (G.v2d->flag & V2D_VIEWLOCK)?ICON_CHECKBOX_HLT:ICON_CHECKBOX_DEHLT, 
 					 "Lock Time to Other Windows|", 0, yco-=20, 
@@ -476,7 +499,7 @@ static uiBlock *action_viewmenu(void *arg_unused)
 					 menuwidth, 19, NULL, 0.0, 0.0, 1, 
 					 ACTMENU_VIEW_PREVRANGECLEAR, "");
 		
-	if (G.saction->action) {
+	if ((G.saction->mode == SACTCONT_ACTION) && (G.saction->action)) {
 		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
 					 "Preview Range from Action Length|Ctrl Alt P", 0, yco-=20, 
 					 menuwidth, 19, NULL, 0.0, 0.0, 1, 
@@ -550,13 +573,15 @@ static uiBlock *action_selectmenu_columnmenu(void *arg_unused)
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
 					 "On Current Frame|Ctrl K", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0,  
 					 ACTMENU_SEL_COLUMN_CFRA, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "On Selected Markers|Shift K", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					 ACTMENU_SEL_COLUMN_MARKERSCOLUMN, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Between Selected Markers|Alt K", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					 ACTMENU_SEL_COLUMN_MARKERSBETWEEN, "");
 	
+	if (G_SACTION_HASMARKERS) {
+		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
+						 "On Selected Markers|Shift K", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 
+						 ACTMENU_SEL_COLUMN_MARKERSCOLUMN, "");
+		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
+						 "Between Selected Markers|Alt K", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 
+						 ACTMENU_SEL_COLUMN_MARKERSBETWEEN, "");
+	}
 	
 	uiBlockSetDirection(block, UI_RIGHT);
 	uiTextBoundsBlock(block, 60);
@@ -659,14 +684,18 @@ static uiBlock *action_selectmenu(void *arg_unused)
 					 "Border Select Keys|B", 0, yco-=20, 
 					 menuwidth, 19, NULL, 0.0, 0.0, 0, 
 					 ACTMENU_SEL_BORDER, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Border Select Channels|B", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					 ACTMENU_SEL_BORDERC, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Border Select Markers|Ctrl B", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					 ACTMENU_SEL_BORDERM, "");
+	if (G_SACTION_HASMARKERS) {
+		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
+						 "Border Select Markers|Ctrl B", 0, yco-=20, 
+						 menuwidth, 19, NULL, 0.0, 0.0, 0, 
+						 ACTMENU_SEL_BORDERM, "");
+	}
+	if (G.saction->mode != SACTCONT_SHAPEKEY) {
+		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
+						 "Border Select Channels|B", 0, yco-=20, 
+						 menuwidth, 19, NULL, 0.0, 0.0, 0, 
+						 ACTMENU_SEL_BORDERC, "");
+	}
 					 
 	uiDefBut(block, SEPR, 0, "", 0, yco-=6, 
 			 menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
@@ -675,14 +704,18 @@ static uiBlock *action_selectmenu(void *arg_unused)
 					 "Select/Deselect All Keys|A", 0, yco-=20, 
 					 menuwidth, 19, NULL, 0.0, 0.0, 0, 
 					 ACTMENU_SEL_ALL_KEYS, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Select/Deselect All Markers|Ctrl A", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					 ACTMENU_SEL_ALL_MARKERS, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Select/Deselect All Channels|A", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					 ACTMENU_SEL_ALL_CHAN, "");
+	if (G_SACTION_HASMARKERS) {
+		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
+						 "Select/Deselect All Markers|Ctrl A", 0, yco-=20, 
+						 menuwidth, 19, NULL, 0.0, 0.0, 0, 
+						 ACTMENU_SEL_ALL_MARKERS, "");
+	}
+	if (G.saction->mode != SACTCONT_SHAPEKEY) {
+		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
+						 "Select/Deselect All Channels|A", 0, yco-=20, 
+						 menuwidth, 19, NULL, 0.0, 0.0, 0, 
+						 ACTMENU_SEL_ALL_CHAN, "");
+	}
 					 
 	uiDefBut(block, SEPR, 0, "", 0, yco-=6, 
 			 menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
@@ -691,14 +724,18 @@ static uiBlock *action_selectmenu(void *arg_unused)
 					 "Inverse Keys|Ctrl I", 0, yco-=20, 
 					 menuwidth, 19, NULL, 0.0, 0.0, 0, 
 					 ACTMENU_SEL_INVERSE_KEYS, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Inverse Markers|Ctrl Shift I", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					 ACTMENU_SEL_INVERSE_MARKERS, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
-					 "Inverse All Channels|Ctrl I", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 0, 
-					 ACTMENU_SEL_INVERSE_CHANNELS, "");
+	if (G_SACTION_HASMARKERS) {
+		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
+						 "Inverse Markers|Ctrl Shift I", 0, yco-=20, 
+						 menuwidth, 19, NULL, 0.0, 0.0, 0, 
+						 ACTMENU_SEL_INVERSE_MARKERS, "");
+	}
+	if (G.saction->mode != SACTCONT_SHAPEKEY) {
+		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
+						 "Inverse All Channels|Ctrl I", 0, yco-=20, 
+						 menuwidth, 19, NULL, 0.0, 0.0, 0, 
+						 ACTMENU_SEL_INVERSE_CHANNELS, "");
+	}
 		
 	uiDefBut(block, SEPR, 0, "", 0, yco-=6, 
 			 menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
@@ -971,6 +1008,40 @@ static uiBlock *action_channelmenu(void *arg_unused)
 	return block;
 }
 
+/* note: uses do_action_channelmenu too... */
+static uiBlock *action_gplayermenu(void *arg_unused)
+{
+	uiBlock *block;
+	short yco= 0, menuwidth=120;
+
+	block= uiNewBlock(&curarea->uiblocks, "action_gplayermenu", 
+					  UI_EMBOSSP, UI_HELV, curarea->headwin);
+	uiBlockSetButmFunc(block, do_action_channelmenu, NULL);
+	
+	uiDefIconTextBlockBut(block, action_channelmenu_settingsmenu, 
+						  NULL, ICON_RIGHTARROW_THIN, 
+						  "Settings", 0, yco-=20, 120, 20, "");	
+	
+	uiDefBut(block, SEPR, 0, "", 0, yco-=6, 
+					menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
+	
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
+			"Delete|X", 0, yco-=20,
+			menuwidth, 19, NULL, 0.0, 0.0, 0, ACTMENU_CHANNELS_DELETE, "");
+	
+	if (curarea->headertype==HEADERTOP) {
+		uiBlockSetDirection(block, UI_DOWN);
+	}
+	else {
+		uiBlockSetDirection(block, UI_TOP);
+		uiBlockFlipOrder(block);
+	}
+
+	uiTextBoundsBlock(block, 50);
+
+	return block;
+}
+
 static void do_action_keymenu_transformmenu(void *arg, int event)
 {	
 	switch (event)
@@ -1400,6 +1471,51 @@ static uiBlock *action_keymenu(void *arg_unused)
 	return block;
 }
 
+/* note: uses do_action_keymenu too! */
+static uiBlock *action_framemenu(void *arg_unused)
+{
+	uiBlock *block;
+	short yco= 0, menuwidth=120;
+
+	block= uiNewBlock(&curarea->uiblocks, "action_framemenu", 
+					  UI_EMBOSSP, UI_HELV, curarea->headwin);
+	uiBlockSetButmFunc(block, do_action_keymenu, NULL);
+	
+	uiDefIconTextBlockBut(block, action_keymenu_transformmenu, 
+						  NULL, ICON_RIGHTARROW_THIN, "Transform", 0, yco-=20, 120, 20, "");
+	
+	uiDefIconTextBlockBut(block, action_keymenu_snapmenu, 
+						  NULL, ICON_RIGHTARROW_THIN, "Snap", 0, yco-=20, 120, 20, "");
+	
+	uiDefIconTextBlockBut(block, action_keymenu_mirrormenu, 
+						  NULL, ICON_RIGHTARROW_THIN, "Mirror", 0, yco-=20, 120, 20, "");
+	
+	uiDefBut(block, SEPR, 0, "", 0, yco-=6, 
+			 menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
+					
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
+					"Duplicate|Shift D", 0, yco-=20, 
+					menuwidth, 19, NULL, 0.0, 0.0, 0, 
+					ACTMENU_KEY_DUPLICATE, "");
+	
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
+					"Delete|X", 0, yco-=20, 
+					menuwidth, 19, NULL, 0.0, 0.0, 0, 
+					ACTMENU_KEY_DELETE, "");
+	
+	if(curarea->headertype==HEADERTOP) {
+		uiBlockSetDirection(block, UI_DOWN);
+	}
+	else {
+		uiBlockSetDirection(block, UI_TOP);
+		uiBlockFlipOrder(block);
+	}
+
+	uiTextBoundsBlock(block, 50);
+
+	return block;
+}
+
 static void do_action_markermenu(void *arg, int event)
 {	
 	switch(event)
@@ -1461,17 +1577,19 @@ static uiBlock *action_markermenu(void *arg_unused)
 					 menuwidth, 19, NULL, 0.0, 0.0, 1, ACTMENU_MARKERS_NAME, "");
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Grab/Move Marker|Ctrl G", 0, yco-=20,
 					 menuwidth, 19, NULL, 0.0, 0.0, 1, ACTMENU_MARKERS_MOVE, "");
-					 
-	uiDefBut(block, SEPR, 0, "",        0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
-	
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Add Pose Marker|Shift L", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 1, ACTMENU_MARKERS_LOCALADD, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Rename Pose Marker|Ctrl Shift L", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 1, ACTMENU_MARKERS_LOCALRENAME, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Delete Pose Marker|Alt L", 0, yco-=20,
-					 menuwidth, 19, NULL, 0.0, 0.0, 1, ACTMENU_MARKERS_LOCALDELETE, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Grab/Move Pose Marker|Ctrl L", 0, yco-=20, 
-					 menuwidth, 19, NULL, 0.0, 0.0, 1, ACTMENU_MARKERS_LOCALMOVE, "");
+		
+	if (G.saction->mode == SACTCONT_ACTION) {
+		uiDefBut(block, SEPR, 0, "",        0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
+		
+		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Add Pose Marker|Shift L", 0, yco-=20, 
+						 menuwidth, 19, NULL, 0.0, 0.0, 1, ACTMENU_MARKERS_LOCALADD, "");
+		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Rename Pose Marker|Ctrl Shift L", 0, yco-=20, 
+						 menuwidth, 19, NULL, 0.0, 0.0, 1, ACTMENU_MARKERS_LOCALRENAME, "");
+		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Delete Pose Marker|Alt L", 0, yco-=20,
+						 menuwidth, 19, NULL, 0.0, 0.0, 1, ACTMENU_MARKERS_LOCALDELETE, "");
+		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Grab/Move Pose Marker|Ctrl L", 0, yco-=20, 
+						 menuwidth, 19, NULL, 0.0, 0.0, 1, ACTMENU_MARKERS_LOCALMOVE, "");
+	}
 	
 	if(curarea->headertype==HEADERTOP) {
 		uiBlockSetDirection(block, UI_DOWN);
@@ -1498,6 +1616,7 @@ void action_buttons(void)
 		return;
 
 	/* copied from drawactionspace.... */
+	// FIXME: do for gpencil too?
 	if (!G.saction->pin) {
 		if (OBACT)
 			G.saction->action = OBACT->action;
@@ -1558,67 +1677,94 @@ void action_buttons(void)
 					  "Select", xco, -2, xmax-3, 24, "");
 		xco+= xmax;
 		
-		if (G.saction->action) {
+		if ((G.saction->action) && (G.saction->mode==SACTCONT_ACTION)) {
 			xmax= GetButStringLength("Channel");
 			uiDefPulldownBut(block, action_channelmenu, NULL, 
 						  "Channel", xco, -2, xmax-3, 24, "");
 			xco+= xmax;
 		}
+		else if (G.saction->mode==SACTCONT_GPENCIL) {
+			xmax= GetButStringLength("Channel");
+			uiDefPulldownBut(block, action_gplayermenu, NULL, 
+						  "Channel", xco, -2, xmax-3, 24, "");
+			xco+= xmax;
+		}
 		
 		xmax= GetButStringLength("Marker");
 		uiDefPulldownBut(block, action_markermenu, NULL, 
 					  "Marker", xco, -2, xmax-3, 24, "");
 		xco+= xmax;
 		
-		xmax= GetButStringLength("Key");
-		uiDefPulldownBut(block, action_keymenu, NULL, 
-					  "Key", xco, -2, xmax-3, 24, "");
-		xco+= xmax;
+		if (G.saction->mode == SACTCONT_GPENCIL) {
+			xmax= GetButStringLength("Frame");
+			uiDefPulldownBut(block, action_framemenu, NULL, 
+						  "Frame", xco, -2, xmax-3, 24, "");
+			xco+= xmax;
+
+		}
+		else {
+			xmax= GetButStringLength("Key");
+			uiDefPulldownBut(block, action_keymenu, NULL, 
+						  "Key", xco, -2, xmax-3, 24, "");
+			xco+= xmax;
+		}
 	}
 
 	uiBlockSetEmboss(block, UI_EMBOSS);
 	
-	/* NAME ETC */
-	ob= OBACT;
-	from = (ID *)ob;
+	/* MODE SELECTOR */
+	uiDefButC(block, MENU, B_REDR, 
+			"Editor Mode %t|Action Editor %x0|ShapeKey Editor %x1|Grease Pencil %x2", 
+			xco,0,90,YIC, &(G.saction->mode), 0, 1, 0, 0, 
+			"Editing modes for this editor");
 
-	xco= std_libbuttons(block, xco, 0, B_ACTPIN, &G.saction->pin, 
-						B_ACTIONBROWSE, ID_AC, 0, (ID*)G.saction->action, 
-						from, &(G.saction->actnr), B_ACTALONE, 
-						B_ACTLOCAL, B_ACTIONDELETE, 0, B_KEEPDATA);	
-
-	uiClearButLock();
-
-	xco += 8;
 	
-	/* COPY PASTE */
-	uiBlockBeginAlign(block);
-	if (curarea->headertype==HEADERTOP) {
-		uiDefIconBut(block, BUT, B_ACTCOPYKEYS, ICON_COPYUP,	xco,0,XIC,YIC, 0, 0, 0, 0, 0, "Copies the selected keyframes from the selected channel(s) to the buffer");
-		uiDefIconBut(block, BUT, B_ACTPASTEKEYS, ICON_PASTEUP,	xco+=XIC,0,XIC,YIC, 0, 0, 0, 0, 0, "Pastes the keyframes from the buffer");
-	}
-	else {
-		uiDefIconBut(block, BUT, B_ACTCOPYKEYS, ICON_COPYDOWN,	xco,0,XIC,YIC, 0, 0, 0, 0, 0, "Copies the selected keyframes from the selected channel(s) to the buffer");
-		uiDefIconBut(block, BUT, B_ACTPASTEKEYS, ICON_PASTEDOWN,	xco+=XIC,0,XIC,YIC, 0, 0, 0, 0, 0, "Pastes the keyframes from the buffer");
-	}
-	uiBlockEndAlign(block);
-	xco += (XIC + 8);
+	xco += (90 + 8);
 	
-	/* draw AUTOSNAP */
-	if (G.saction->flag & SACTION_DRAWTIME) {
-		uiDefButS(block, MENU, B_REDR,
-				"Auto-Snap Keyframes %t|No Snap %x0|Second Step %x1|Nearest Second %x2|Nearest Marker %x3", 
-				xco,0,70,YIC, &(G.saction->autosnap), 0, 1, 0, 0, 
-				"Auto-snapping mode for keyframes when transforming");
+	/* MODE-DEPENDENT DRAWING */
+	if (G.saction->mode != SACTCONT_GPENCIL) {
+		/* NAME ETC */
+		ob= OBACT;
+		from = (ID *)ob;
+		
+		xco= std_libbuttons(block, xco, 0, B_ACTPIN, &G.saction->pin, 
+							B_ACTIONBROWSE, ID_AC, 0, (ID*)G.saction->action, 
+							from, &(G.saction->actnr), B_ACTALONE, 
+							B_ACTLOCAL, B_ACTIONDELETE, 0, B_KEEPDATA);	
+		
+		uiClearButLock();
+		
+		xco += 8;
+		
+		/* COPY PASTE */
+		uiBlockBeginAlign(block);
+		if (curarea->headertype==HEADERTOP) {
+			uiDefIconBut(block, BUT, B_ACTCOPYKEYS, ICON_COPYUP,	xco,0,XIC,YIC, 0, 0, 0, 0, 0, "Copies the selected keyframes from the selected channel(s) to the buffer");
+			uiDefIconBut(block, BUT, B_ACTPASTEKEYS, ICON_PASTEUP,	xco+=XIC,0,XIC,YIC, 0, 0, 0, 0, 0, "Pastes the keyframes from the buffer");
+		}
+		else {
+			uiDefIconBut(block, BUT, B_ACTCOPYKEYS, ICON_COPYDOWN,	xco,0,XIC,YIC, 0, 0, 0, 0, 0, "Copies the selected keyframes from the selected channel(s) to the buffer");
+			uiDefIconBut(block, BUT, B_ACTPASTEKEYS, ICON_PASTEDOWN,	xco+=XIC,0,XIC,YIC, 0, 0, 0, 0, 0, "Pastes the keyframes from the buffer");
+		}
+		uiBlockEndAlign(block);
+		xco += (XIC + 8);
+		
+		/* draw AUTOSNAP */
+		if (G.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,0,70,YIC, &(G.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,0,70,YIC, &(G.saction->autosnap), 0, 1, 0, 0, 
+					"Auto-snapping mode for keyframes when transforming");
+		}
+		
+		xco += (70 + 8);
 	}
-	else {
-		uiDefButS(block, MENU, B_REDR, 
-				"Auto-Snap Keyframes %t|No Snap %x0|Frame Step %x1|Nearest Frame %x2|Nearest Marker %x3", 
-				xco,0,70,YIC, &(G.saction->autosnap), 0, 1, 0, 0, 
-				"Auto-snapping mode for keyframes when transforming");
-	}
-	
-	xco += (70 + 8);
 	
 	/* draw LOCK */
 	uiDefIconButS(block, ICONTOG, 1, ICON_UNLOCKED,	xco, 0, XIC, YIC, 
diff --git a/source/blender/src/header_node.c b/source/blender/src/header_node.c
index ec6bbc9044c..4c7b4aa80bc 100644
--- a/source/blender/src/header_node.c
+++ b/source/blender/src/header_node.c
@@ -110,12 +110,16 @@ static void do_node_viewmenu(void *arg, int event)
 		case 3: /* View all */
 			snode_home(curarea, snode);
 			break;
+		case 4: /* Grease Pencil */
+			add_blockhandler(curarea, NODES_HANDLER_GREASEPENCIL, UI_PNL_UNSTOW);
+		break;
 	}
 	allqueue(REDRAWNODE, 0);
 }
 
 static uiBlock *node_viewmenu(void *arg_unused)
 {
+	SpaceNode *snode= curarea->spacedata.first; 
 	uiBlock *block;
 	short yco= 0, menuwidth=120;
 	
@@ -123,6 +127,12 @@ static uiBlock *node_viewmenu(void *arg_unused)
 					  UI_EMBOSSP, UI_HELV, curarea->headwin);
 	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, "");
 	
diff --git a/source/blender/src/header_seq.c b/source/blender/src/header_seq.c
index 393830a61cf..e5a63b9fe45 100644
--- a/source/blender/src/header_seq.c
+++ b/source/blender/src/header_seq.c
@@ -100,6 +100,9 @@ static void do_seq_viewmenu(void *arg, int event)
 	case 6: /* Draw time/frames */
 		sseq->flag ^= SEQ_DRAWFRAMES;
 		break;
+	case 7: /* Grease Pencil */
+		add_blockhandler(curarea, SEQ_HANDLER_GREASEPENCIL, UI_PNL_UNSTOW);
+		break;
 	}
 }
 
@@ -111,7 +114,15 @@ static uiBlock *seq_viewmenu(void *arg_unused)
 
 	block= uiNewBlock(&curarea->uiblocks, "seq_viewmenu", UI_EMBOSSP, UI_HELV, curarea->headwin);
 	uiBlockSetButmFunc(block, do_seq_viewmenu, NULL);
-
+	
+	if (sseq->mainb) {
+		uiDefIconTextBut(block, BUTM, 1, ICON_MENU_PANEL, 
+				 "Grease Pencil...", 0, yco-=20,
+				 menuwidth, 19, NULL, 0.0, 0.0, 1, 7, "");
+				 
+		uiDefBut(block, SEPR, 0, "",        0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
+	}
+	
 	if (sseq->mainb == 0) {
 		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
 				 "Play Back Animation "
diff --git a/source/blender/src/header_view3d.c b/source/blender/src/header_view3d.c
index 0f3a46c8a8c..71bf0cd9bd4 100644
--- a/source/blender/src/header_view3d.c
+++ b/source/blender/src/header_view3d.c
@@ -601,6 +601,9 @@ static void do_view3d_viewmenu(void *arg, int event)
 		break;
 	case 20: /* Transform  Space Panel */
 		add_blockhandler(curarea, VIEW3D_HANDLER_TRANSFORM, UI_PNL_UNSTOW);
+		break;	
+	case 21: /* Grease Pencil */
+		add_blockhandler(curarea, VIEW3D_HANDLER_GREASEPENCIL, UI_PNL_UNSTOW);
 		break;		
 	}
 	allqueue(REDRAWVIEW3D, 1);
@@ -619,6 +622,7 @@ static uiBlock *view3d_viewmenu(void *arg_unused)
 	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, "");
 	
diff --git a/source/blender/src/interface.c b/source/blender/src/interface.c
index 19e2e4b6245..18e596abcc7 100644
--- a/source/blender/src/interface.c
+++ b/source/blender/src/interface.c
@@ -618,6 +618,9 @@ void uiBoundsBlock(uiBlock *block, int addval)
 	uiBut *bt;
 	int xof;
 	
+	if(block==NULL)
+		return;
+	
 	if(block->buttons.first==NULL) {
 		if(block->panel) {
 			block->minx= 0.0; block->maxx= block->panel->sizex;
@@ -5648,6 +5651,8 @@ static int ui_auto_themecol(uiBut *but)
 		// (weak!) detect if it is a blockloop
 		if(but->block->dt == UI_EMBOSSP) return TH_MENU_ITEM;
 		return TH_BUT_POPUP;
+	case ROUNDBOX:
+		return TH_PANEL;
 	default:
 		return TH_BUT_NEUTRAL;
 	}
diff --git a/source/blender/src/interface_draw.c b/source/blender/src/interface_draw.c
index e7041e60003..83ae449b989 100644
--- a/source/blender/src/interface_draw.c
+++ b/source/blender/src/interface_draw.c
@@ -2351,7 +2351,7 @@ static void ui_draw_roundbox(uiBut *but)
 {
 	glEnable(GL_BLEND);
 	
-	BIF_ThemeColorShadeAlpha(TH_PANEL, but->a2, but->a2);
+	BIF_ThemeColorShadeAlpha(but->themecol, but->a2, but->a2);
 
 	uiSetRoundBox(but->a1);
 	gl_round_box(GL_POLYGON, but->x1, but->y1, but->x2, but->y2, but->min);
diff --git a/source/blender/src/outliner.c b/source/blender/src/outliner.c
index 683b06aafc4..a8409c43b90 100644
--- a/source/blender/src/outliner.c
+++ b/source/blender/src/outliner.c
@@ -68,6 +68,7 @@
 #include "BKE_main.h"
 #include "BKE_material.h"
 #include "BKE_modifier.h"
+#include "BKE_object.h"
 #include "BKE_screen.h"
 #include "BKE_scene.h"
 #include "BKE_utildefines.h"
@@ -698,6 +699,7 @@ static TreeElement *outliner_add_element(SpaceOops *soops, ListBase *lb, void *i
 					for (index=0,md=ob->modifiers.first; md; index++,md=md->next) {
 						TreeElement *te = outliner_add_element(soops, &temod->subtree, ob, temod, TSE_MODIFIER, index);
 						te->name= md->name;
+						te->directdata = md;
 
 						if (md->type==eModifierType_Lattice) {
 							outliner_add_element(soops, &te->subtree, ((LatticeModifierData*) md)->object, te, TSE_LINKED_OB, 0);
@@ -3523,6 +3525,27 @@ static void restrictbutton_r_lay_cb(void *poin, void *poin2)
 	allqueue(REDRAWBUTSSCENE, 0);
 }
 
+static void restrictbutton_modifier_cb(void *poin, void *poin2)
+{
+	Object *ob = (Object *)poin;
+	
+	DAG_object_flush_update(G.scene, ob, OB_RECALC_DATA);
+	object_handle_update(ob);
+	countall();
+
+	allqueue(REDRAWOOPS, 0);
+	allqueue(REDRAWVIEW3D, 0);
+	allqueue(REDRAWBUTSEDIT, 0);
+	allqueue(REDRAWBUTSOBJECT, 0);
+}
+
+static void restrictbutton_bone_cb(void *poin, void *poin2)
+{
+	allqueue(REDRAWOOPS, 0);
+	allqueue(REDRAWVIEW3D, 0);
+	allqueue(REDRAWBUTSEDIT, 0);
+}
+
 static void namebutton_cb(void *tep, void *oldnamep)
 {
 	SpaceOops *soops= curarea->spacedata.first;
@@ -3685,6 +3708,47 @@ static void outliner_draw_restrictbuts(uiBlock *block, SpaceOops *soops, ListBas
 				
 				uiBlockSetEmboss(block, UI_EMBOSS);
 			}
+			else if(tselem->type==TSE_MODIFIER)  {
+				ModifierData *md= (ModifierData *)te->directdata;
+				ob = (Object *)tselem->id;
+				
+				uiBlockSetEmboss(block, UI_EMBOSSN);
+				bt= uiDefIconButBitI(block, ICONTOGN, eModifierMode_Realtime, REDRAWALL, ICON_RESTRICT_VIEW_OFF, 
+						(int)soops->v2d.cur.xmax-OL_TOG_RESTRICT_VIEWX, te->ys, 17, OL_H-1, &(md->mode), 0, 0, 0, 0, "Restrict/Allow visibility in the 3D View");
+				uiButSetFunc(bt, restrictbutton_modifier_cb, ob, NULL);
+				uiButSetFlag(bt, UI_NO_HILITE);
+				
+				/*
+				bt= uiDefIconButBitI(block, ICONTOGN, eModifierMode_Editmode, REDRAWALL, VICON_EDIT, 
+						(int)soops->v2d.cur.xmax-OL_TOG_RESTRICT_SELECTX, te->ys, 17, OL_H-1, &(md->mode), 0, 0, 0, 0, "Restrict/Allow selection in the 3D View");
+				uiButSetFunc(bt, restrictbutton_modifier_cb, ob, NULL);
+				uiButSetFlag(bt, UI_NO_HILITE);
+				*/
+				
+				bt= uiDefIconButBitI(block, ICONTOGN, eModifierMode_Render, REDRAWALL, ICON_RESTRICT_RENDER_OFF, 
+						(int)soops->v2d.cur.xmax-OL_TOG_RESTRICT_RENDERX, te->ys, 17, OL_H-1, &(md->mode), 0, 0, 0, 0, "Restrict/Allow renderability");
+				uiButSetFunc(bt, restrictbutton_modifier_cb, ob, NULL);
+				uiButSetFlag(bt, UI_NO_HILITE);
+			}
+			else if(tselem->type==TSE_POSE_CHANNEL)  {
+				bPoseChannel *pchan= (bPoseChannel *)te->directdata;
+				Bone *bone = pchan->bone;
+				
+				uiBlockSetEmboss(block, UI_EMBOSSN);
+				bt= uiDefIconButBitI(block, ICONTOG, BONE_HIDDEN_P, REDRAWALL, ICON_RESTRICT_VIEW_OFF, 
+						(int)soops->v2d.cur.xmax-OL_TOG_RESTRICT_VIEWX, te->ys, 17, OL_H-1, &(bone->flag), 0, 0, 0, 0, "Restrict/Allow visibility in the 3D View");
+				uiButSetFunc(bt, restrictbutton_bone_cb, ob, NULL);
+				uiButSetFlag(bt, UI_NO_HILITE);
+			}
+			else if(tselem->type==TSE_EBONE)  {
+				EditBone *ebone= (EditBone *)te->directdata;
+				
+				uiBlockSetEmboss(block, UI_EMBOSSN);
+				bt= uiDefIconButBitI(block, ICONTOG, BONE_HIDDEN_A, REDRAWALL, ICON_RESTRICT_VIEW_OFF, 
+						(int)soops->v2d.cur.xmax-OL_TOG_RESTRICT_VIEWX, te->ys, 17, OL_H-1, &(ebone->flag), 0, 0, 0, 0, "Restrict/Allow visibility in the 3D View");
+				uiButSetFunc(bt, restrictbutton_bone_cb, ob, NULL);
+				uiButSetFlag(bt, UI_NO_HILITE);
+			}
 		}
 		
 		if((tselem->flag & TSE_CLOSED)==0) outliner_draw_restrictbuts(block, soops, &te->subtree);
diff --git a/source/blender/src/space.c b/source/blender/src/space.c
index 4bacf76075e..1dc4f5e6b9b 100644
--- a/source/blender/src/space.c
+++ b/source/blender/src/space.c
@@ -56,6 +56,7 @@
 #include "DNA_armature_types.h"
 #include "DNA_curve_types.h"
 #include "DNA_group_types.h" /* used for select_same_group */
+#include "DNA_gpencil_types.h"
 #include "DNA_image_types.h"
 #include "DNA_ipo_types.h"
 #include "DNA_mesh_types.h"
@@ -159,6 +160,7 @@
 #include "BDR_imagepaint.h"
 #include "BDR_sculptmode.h"
 #include "BDR_unwrapper.h"
+#include "BDR_gpencil.h"
 
 #include "BLO_readfile.h" /* for BLO_blendhandle_close */
 
@@ -1193,21 +1195,28 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 		
 		if(event==UI_BUT_EVENT) do_butspace(val); /* temporal, view3d deserves own queue? */
 		
-		/* we consider manipulator a button, defaulting to leftmouse */
+		/* - we consider manipulator a button, defaulting to leftmouse 
+		 * - grease-pencil also defaults to leftmouse
+		 */
 		if(event==LEFTMOUSE) {
 			/* run any view3d event handler script links */
-			if (event && sa->scriptlink.totscript)
+			if (event && sa->scriptlink.totscript) {
 				if (BPY_do_spacehandlers(sa, event, SPACEHANDLER_VIEW3D_EVENT))
 					return; /* return if event was processed (swallowed) by handler(s) */
-
+			}
+			
+			if(gpencil_do_paint(sa, L_MOUSE)) return;
 			if(BIF_do_manipulator(sa)) return;
 		}
+		else if(event==RIGHTMOUSE) {
+			if(gpencil_do_paint(sa, R_MOUSE)) return;
+		}
 		
 		/* swap mouse buttons based on user preference */
 		if (U.flag & USER_LMOUSESELECT) {
 			/* only swap mouse button for selection, in modes where it is relevant.
 			 * painting/sculpting stays on LEFTMOUSE */
-			if (   !((G.f & G_SCULPTMODE) || (G.f & G_WEIGHTPAINT) ||
+			if (   !((G.f & G_SCULPTMODE) || (G.f & G_WEIGHTPAINT) || (G.f & G_GREASEPENCIL) ||
 				(G.f & G_VERTEXPAINT) || (G.f & G_TEXTUREPAINT) || (G.f & G_PARTICLEEDIT)) ||
 				(G.obedit) )
 			{			
@@ -1945,7 +1954,7 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 						adduplicate(0, 0);
 				}
 				else if(G.qual==LR_CTRLKEY) {
-					imagestodisplist();
+					imagestodisplist(); // removed
 				}
 				else if((G.qual==0)){
 					pupval= pupmenu("Draw mode%t|BoundBox %x1|Wire %x2|OpenGL Solid %x3|Shaded Solid %x4|Textured Solid %x5");
@@ -2705,6 +2714,8 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			case DELKEY:
 				if(G.qual==0 || G.qual==LR_SHIFTKEY)
 					delete_context_selected();
+				if(G.qual==LR_ALTKEY)
+					gpencil_delete_menu();
 				break;
 			case YKEY:
 				if((G.qual==0) && (G.obedit)) {
@@ -4816,6 +4827,14 @@ static void winqreadseqspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 	if(val) {
 		if( uiDoBlocks(&curarea->uiblocks, event, 1)!=UI_NOTHING ) event= 0;
 		
+		/* grease-pencil defaults to leftmouse */
+		if (event == LEFTMOUSE) {
+			if(gpencil_do_paint(sa, L_MOUSE)) return;
+		}
+		else if (event == RIGHTMOUSE) {
+			if(gpencil_do_paint(sa, R_MOUSE)) return;
+		}
+		
 		/* swap mouse buttons based on user preference */
 		if (U.flag & USER_LMOUSESELECT) {
 			if (event == LEFTMOUSE) {
@@ -4829,11 +4848,11 @@ static void winqreadseqspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 		
 		switch(event) {
 		case LEFTMOUSE:
-			if(sseq->mainb || view2dmove(event)==0) {
+			if(sseq->mainb==0 && view2dmove(event)==0) {
 				
 				first= 1;		
 				set_special_seq_update(1);
-
+				
 				do {
 					getmouseco_areawin(mval);
 					areamouseco_to_ipoco(v2d, mval, &dx, &dy);
@@ -5088,6 +5107,10 @@ static void winqreadseqspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 				if((G.qual==0))
 					del_seq();
 			}
+			else if(G.qual==LR_ALTKEY) {
+				if(sseq->mainb)
+					gpencil_delete_menu();
+			}
 			break;
 		case PAD1: case PAD2: case PAD4: case PAD8:
 			seq_viewzoom(event, (G.qual & LR_SHIFTKEY)==0);
@@ -6243,6 +6266,7 @@ void freespacelist(ScrArea *sa)
 				if(vd->bgpic->ima) vd->bgpic->ima->id.us--;
 				MEM_freeN(vd->bgpic);
 			}
+			if(vd->gpd) free_gpencil_data(vd->gpd);
 			if(vd->localvd) MEM_freeN(vd->localvd);
 			if(vd->clipbb) MEM_freeN(vd->clipbb);
 			if(vd->depths) {
@@ -6286,7 +6310,12 @@ void freespacelist(ScrArea *sa)
 				curvemapping_free(sima->cumap);
 		}
 		else if(sl->spacetype==SPACE_NODE) {
-/*			SpaceNode *snode= (SpaceNode *)sl; */
+			SpaceNode *snode= (SpaceNode *)sl;
+			if(snode->gpd) free_gpencil_data(snode->gpd);
+		}
+		else if(sl->spacetype==SPACE_SEQ) {
+			SpaceSeq *sseq= (SpaceSeq *)sl;
+			if(sseq->gpd) free_gpencil_data(sseq->gpd);
 		}
 	}
 
@@ -6316,6 +6345,7 @@ void duplicatespacelist(ScrArea *newarea, ListBase *lb1, ListBase *lb2)
 			BIF_view3d_previewrender_free(v3d);
 			v3d->depths= NULL;
 			v3d->retopo_view_data= NULL;
+			v3d->gpd= gpencil_data_duplicate(v3d->gpd);
 		}
 		else if(sl->spacetype==SPACE_OOPS) {
 			SpaceOops *so= (SpaceOops *)sl;
@@ -6335,11 +6365,16 @@ void duplicatespacelist(ScrArea *newarea, ListBase *lb1, ListBase *lb2)
 		else if(sl->spacetype==SPACE_NODE) {
 			SpaceNode *snode= (SpaceNode *)sl;
 			snode->nodetree= NULL;
+			snode->gpd= gpencil_data_duplicate(snode->gpd);
 		}
 		else if(sl->spacetype==SPACE_SCRIPT) {
 			SpaceScript *sc = ( SpaceScript * ) sl;
 			sc->but_refs = NULL;
 		}
+		else if(sl->spacetype==SPACE_SEQ) {
+			SpaceSeq *sseq= (SpaceSeq *)sl;
+			sseq->gpd= gpencil_data_duplicate(sseq->gpd);
+		}
 		sl= sl->next;
 	}
 	
diff --git a/source/blender/src/transform_conversions.c b/source/blender/src/transform_conversions.c
index 562d9a4934d..706b079432c 100644
--- a/source/blender/src/transform_conversions.c
+++ b/source/blender/src/transform_conversions.c
@@ -70,6 +70,7 @@
 #include "DNA_vfont_types.h"
 #include "DNA_constraint_types.h"
 #include "DNA_listBase.h"
+#include "DNA_gpencil_types.h"
 
 #include "BKE_action.h"
 #include "BKE_armature.h"
@@ -125,6 +126,7 @@
 
 #include "BDR_drawaction.h"		// list of keyframes in action
 #include "BDR_editobject.h"		// reset_slowparents()
+#include "BDR_gpencil.h"
 #include "BDR_unwrapper.h"
 
 #include "BLI_arithb.h"
@@ -2474,6 +2476,96 @@ void flushTransIpoData(TransInfo *t)
 
 /* ********************* ACTION/NLA EDITOR ****************** */
 
+/* Called by special_aftertrans_update to make sure selected gp-frames replace
+ * any other gp-frames which may reside on that frame (that are not selected).
+ * It also makes sure gp-frames are still stored in chronological order after
+ * transform.
+ */
+static void posttrans_gpd_clean (bGPdata *gpd)
+{
+	bGPDlayer *gpl;
+	
+	for (gpl= gpd->layers.first; gpl; gpl= gpl->next) {
+		ListBase sel_buffer = {NULL, NULL};
+		bGPDframe *gpf, *gpfn;
+		bGPDframe *gfs, *gfsn;
+		
+		/* loop 1: loop through and isolate selected gp-frames to buffer 
+		 * (these need to be sorted as they are isolated)
+		 */
+		for (gpf= gpl->frames.first; gpf; gpf= gpfn) {
+			gpfn= gpf->next;
+			
+			if (gpf->flag & GP_FRAME_SELECT) {
+				BLI_remlink(&gpl->frames, gpf);
+				
+				/* find place to add them in buffer
+				 * - go backwards as most frames will still be in order,
+				 *   so doing it this way will be faster 
+				 */
+				for (gfs= sel_buffer.last; gfs; gfs= gfs->prev) {
+					/* if current (gpf) occurs after this one in buffer, add! */
+					if (gfs->framenum < gpf->framenum) {
+						BLI_insertlinkafter(&sel_buffer, gfs, gpf);
+						break;
+					}
+				}
+				if (gfs == NULL)
+					BLI_addhead(&sel_buffer, gpf);
+			}
+		}
+		
+		/* error checking: it is unlikely, but may be possible to have none selected */
+		if (sel_buffer.first == NULL)
+			continue;
+		
+		/* if all were selected (i.e. gpl->frames is empty), then just transfer sel-buf over */
+		if (gpl->frames.first == NULL) {
+			gpl->frames.first= sel_buffer.first;
+			gpl->frames.last= sel_buffer.last;
+			
+			continue;
+		}
+		
+		/* loop 2: remove duplicates of frames in buffers */
+		//gfs= sel_buffer.first;
+		//gfsn= gfs->next;
+		
+		for (gpf= gpl->frames.first; gpf && sel_buffer.first; gpf= gpfn) {
+			gpfn= gpf->next;
+			 
+			/* loop through sel_buffer, emptying stuff from front of buffer if ok */
+			for (gfs= sel_buffer.first; gfs && gpf; gfs= gfsn) {
+				gfsn= gfs->next;
+				
+				/* if this buffer frame needs to go before current, add it! */
+				if (gfs->framenum < gpf->framenum) {
+					/* transfer buffer frame to frames list (before current) */
+					BLI_remlink(&sel_buffer, gfs);
+					BLI_insertlinkbefore(&gpl->frames, gpf, gfs);
+				}
+				/* if this buffer frame is on same frame, replace current with it and stop */
+				else if (gfs->framenum == gpf->framenum) {
+					/* transfer buffer frame to frames list (before current) */
+					BLI_remlink(&sel_buffer, gfs);
+					BLI_insertlinkbefore(&gpl->frames, gpf, gfs);
+					
+					/* get rid of current frame */
+					gpencil_layer_delframe(gpl, gpf);
+				}
+			}
+		}
+		
+		/* if anything is still in buffer, append to end */
+		for (gfs= sel_buffer.first; gfs; gfs= gfsn) {
+			gfsn= gfs->next;
+			
+			BLI_remlink(&sel_buffer, gfs);
+			BLI_addtail(&gpl->frames, gfs);
+		}
+	}
+}
+
 /* Called by special_aftertrans_update to make sure selected keyframes replace
  * any other keyframes which may reside on that frame (that is not selected).
  */
@@ -2698,6 +2790,26 @@ static int count_ipo_keys(Ipo *ipo, char side, float cfra)
 	return count;
 }
 
+/* fully select selected beztriples, but only include if it's on the right side of cfra */
+static int count_gplayer_frames(bGPDlayer *gpl, char side, float cfra)
+{
+	bGPDframe *gpf;
+	int count = 0;
+	
+	if (gpl == NULL)
+		return count;
+	
+	/* only include points that occur on the right side of cfra */
+	for (gpf= gpl->frames.first; gpf; gpf= gpf->next) {
+		if (gpf->flag & GP_FRAME_SELECT) {
+			if (FrameOnMouseSide(side, gpf->framenum, cfra))
+				count++;
+		}
+	}
+	
+	return count;
+}
+
 /* This function assigns the information to transdata */
 static void TimeToTransData(TransData *td, float *time, Object *ob)
 {
@@ -2751,9 +2863,68 @@ static TransData *IpoToTransData(TransData *td, Ipo *ipo, Object *ob, char side,
 	return td;
 }
 
+/* helper struct for gp-frame transforms (only used here) */
+typedef struct tGPFtransdata {
+	float val;			/* where transdata writes transform */
+	int *sdata;			/* pointer to gpf->framenum */
+} tGPFtransdata;
+
+/* This function helps flush transdata written to tempdata into the gp-frames  */
+void flushTransGPactionData (TransInfo *t)
+{
+	tGPFtransdata *tfd;
+	int i;
+	
+	/* find the first one to start from */
+	if (t->mode == TFM_TIME_SLIDE)
+		tfd= (tGPFtransdata *)( (float *)(t->customData) + 2 );
+	else
+		tfd= (tGPFtransdata *)(t->customData);
+		
+	/* flush data! */
+	for (i = 0; i < t->total; i++, tfd++) {
+		*(tfd->sdata)= (int)floor(tfd->val + 0.5);
+	}	
+}
+
+/* This function advances the address to which td points to, so it must return
+ * the new address so that the next time new transform data is added, it doesn't
+ * overwrite the existing ones...  i.e.   td = GPLayerToTransData(td, ipo, ob, side, cfra);
+ *
+ * The 'side' argument is needed for the extend mode. 'B' = both sides, 'R'/'L' mean only data
+ * on the named side are used. 
+ */
+static int GPLayerToTransData (TransData *td, tGPFtransdata *tfd, bGPDlayer *gpl, short side, float cfra)
+{
+	bGPDframe *gpf;
+	int count= 0;
+	
+	/* check for select frames on right side of current frame */
+	for (gpf= gpl->frames.first; gpf; gpf= gpf->next) {
+		if (gpf->flag & GP_FRAME_SELECT) {
+			if (FrameOnMouseSide(side, gpf->framenum, cfra)) {
+				/* memory is calloc'ed, so that should zero everything nicely for us */
+				td->val= &tfd->val;
+				td->ival= gpf->framenum;
+				
+				tfd->val= gpf->framenum;
+				tfd->sdata= &gpf->framenum;
+				
+				/* advance td now */
+				td++;
+				tfd++;
+				count++;
+			}
+		}
+	}
+	
+	return count;
+}
+
 static void createTransActionData(TransInfo *t)
 {
 	TransData *td = NULL;
+	tGPFtransdata *tfd = NULL;
 	Object *ob= NULL;
 	
 	ListBase act_data = {NULL, NULL};
@@ -2771,7 +2942,10 @@ static void createTransActionData(TransInfo *t)
 	if (data == NULL) return;
 	
 	/* filter data */
-	filter= (ACTFILTER_VISIBLE | ACTFILTER_FOREDIT | ACTFILTER_IPOKEYS);
+	if (datatype == ACTCONT_GPENCIL)
+		filter= (ACTFILTER_VISIBLE | ACTFILTER_FOREDIT);
+	else
+		filter= (ACTFILTER_VISIBLE | ACTFILTER_FOREDIT | ACTFILTER_IPOKEYS);
 	actdata_filter(&act_data, filter, data, datatype);
 	
 	/* is the action scaled? if so, the it should belong to the active object */
@@ -2800,8 +2974,12 @@ static void createTransActionData(TransInfo *t)
 		cfra = CFRA;
 	
 	/* loop 1: fully select ipo-keys and count how many BezTriples are selected */
-	for (ale= act_data.first; ale; ale= ale->next)
-		count += count_ipo_keys(ale->key_data, side, cfra);
+	for (ale= act_data.first; ale; ale= ale->next) {
+		if (ale->type == ACTTYPE_GPLAYER)
+			count += count_gplayer_frames(ale->data, side, cfra);
+		else
+			count += count_ipo_keys(ale->key_data, side, cfra);
+	}
 	
 	/* stop if trying to build list if nothing selected */
 	if (count == 0) {
@@ -2812,16 +2990,38 @@ static void createTransActionData(TransInfo *t)
 	
 	/* allocate memory for data */
 	t->total= count;
+	
 	t->data= MEM_callocN(t->total*sizeof(TransData), "TransData(Action Editor)");
-	if (t->mode == TFM_TIME_SLIDE)
+	td= t->data;
+	
+	if (datatype == ACTCONT_GPENCIL) {
+		if (t->mode == TFM_TIME_SLIDE) {
+			t->customData= MEM_callocN((sizeof(float)*2)+(sizeof(tGPFtransdata)*count), "TimeSlide + tGPFtransdata");
+			tfd= (tGPFtransdata *)( (float *)(t->customData) + 2 );
+		}
+		else {
+			t->customData= MEM_callocN(sizeof(tGPFtransdata)*count, "tGPFtransdata");
+			tfd= (tGPFtransdata *)(t->customData);
+		}
+	}
+	else if (t->mode == TFM_TIME_SLIDE)
 		t->customData= MEM_callocN(sizeof(float)*2, "TimeSlide Min/Max");
 	
-	td= t->data;
 	/* loop 2: build transdata array */
 	for (ale= act_data.first; ale; ale= ale->next) {
-		Ipo *ipo= (Ipo *)ale->key_data;
-		
-		td= IpoToTransData(td, ipo, ob, side, cfra);
+		if (ale->type == ACTTYPE_GPLAYER) {
+			bGPDlayer *gpl= (bGPDlayer *)ale->data;
+			int i;
+			
+			i = GPLayerToTransData(td, tfd, gpl, side, cfra);
+			td += i;
+			tfd += i;
+		}
+		else {
+			Ipo *ipo= (Ipo *)ale->key_data;
+			
+			td= IpoToTransData(td, ipo, ob, side, cfra);
+		}
 	}
 	
 	/* check if we're supposed to be setting minx/maxx for TimeSlide */
@@ -3673,6 +3873,13 @@ void special_aftertrans_update(TransInfo *t)
 			
 			DAG_object_flush_update(G.scene, OBACT, OB_RECALC_DATA);
 		}
+		else if (datatype == ACTCONT_GPENCIL) {
+			/* remove duplicate frames and also make sure points are in order! */
+			if ((cancelled == 0) || (duplicate))
+			{
+				posttrans_gpd_clean(data);
+			}
+		}
 		
 		G.saction->flag &= ~SACTION_MOVING;
 	}
diff --git a/source/blender/src/transform_generics.c b/source/blender/src/transform_generics.c
index 6cb7a34d1bc..c332fd723eb 100644
--- a/source/blender/src/transform_generics.c
+++ b/source/blender/src/transform_generics.c
@@ -278,6 +278,11 @@ void recalcData(TransInfo *t)
 		data = get_action_context(&context);
 		if (data == NULL) return;
 		
+		/* always flush data if gpencil context */
+		if (context == ACTCONT_GPENCIL) {
+			flushTransGPactionData(t);
+		}
+		
 		if (G.saction->lock) {
 			if (context == ACTCONT_ACTION) {
 				if(ob) {
@@ -753,6 +758,10 @@ void postTrans (TransInfo *t)
 		if (G.sima->flag & SI_LIVE_UNWRAP)
 			unwrap_lscm_live_end(t->state == TRANS_CANCEL);
 	}
+	else if(t->spacetype==SPACE_ACTION) {
+		if (t->customData)
+			MEM_freeN(t->customData);
+	}
 }
 
 void applyTransObjects(TransInfo *t)
diff --git a/source/blender/src/usiblender.c b/source/blender/src/usiblender.c
index 4e5a7dc92c7..36d98245827 100644
--- a/source/blender/src/usiblender.c
+++ b/source/blender/src/usiblender.c
@@ -885,7 +885,7 @@ void BIF_write_file(char *target)
 	if (G.f & G_DOSCRIPTLINKS) BPY_do_pyscript(&G.scene->id, SCRIPT_ONSAVE);
 
 	for (li= G.main->library.first; li; li= li->id.next) {
-		if (BLI_streq(li->name, target)) {
+		if (li->parent==NULL && BLI_streq(li->name, target)) {
 			error("Cannot overwrite used library");
 			return;
 		}
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp b/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
index 5f37de24ed6..1604dfe5cce 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
+++ b/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
@@ -101,6 +101,13 @@ int KX_BlenderCanvas::GetHeight(
 	return scrarea_get_win_height(m_area);
 }
 
+RAS_Rect &
+KX_BlenderCanvas::
+GetWindowArea(
+){
+	return m_area_rect;
+}	
+
 	void
 KX_BlenderCanvas::
 SetViewPort(
@@ -112,6 +119,11 @@ SetViewPort(
 	int minx = scrarea_get_win_x(m_area);
 	int miny = scrarea_get_win_y(m_area);
 
+	m_area_rect.SetLeft(minx + x1);
+	m_area_rect.SetBottom(miny + y1);
+	m_area_rect.SetRight(minx + x2);
+	m_area_rect.SetTop(miny + y2);
+
 	glViewport(minx + x1, miny + y1, vp_width, vp_height);
 	glScissor(minx + x1, miny + y1, vp_width, vp_height);
 }
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h b/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
index b155d39e149..bc202a8558c 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
+++ b/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
@@ -117,6 +117,10 @@ public:
 		return m_displayarea;
 	};
 
+		RAS_Rect &
+	GetWindowArea(
+	);
+
 		void
 	SetViewPort(
 		int x1, int y1,
@@ -159,6 +163,7 @@ public:
 private:
 	/** Blender area the game engine is running within */
 	struct ScrArea* m_area;
+	RAS_Rect 	m_area_rect;
 };
 
 #endif // __KX_BLENDERCANVAS
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
index 1f1ac6da119..ce37ea5907f 100644
--- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp
+++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
@@ -1989,10 +1989,8 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
 			gameobj->NodeUpdateGS(0,true);
 			
 			BL_ConvertIpos(blenderobject,gameobj,converter);
-			// TODO: expand to multiple ipos per mesh
-			Material *mat = give_current_material(blenderobject, 1);
-			if(mat) BL_ConvertMaterialIpos(mat, gameobj, converter);	
-	
+			BL_ConvertMaterialIpos(blenderobject, gameobj, converter);
+			
 			sumolist->Add(gameobj->AddRef());
 			
 			BL_ConvertProperties(blenderobject,gameobj,timemgr,kxscene,isInActiveLayer);
@@ -2171,9 +2169,7 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
 							gameobj->NodeUpdateGS(0,true);
 							
 							BL_ConvertIpos(blenderobject,gameobj,converter);
-							// TODO: expand to multiple ipos per mesh
-							Material *mat = give_current_material(blenderobject, 1);
-							if(mat) BL_ConvertMaterialIpos(mat, gameobj, converter);	
+							BL_ConvertMaterialIpos(blenderobject,gameobj, converter);	
 					
 							sumolist->Add(gameobj->AddRef());
 							
diff --git a/source/gameengine/Converter/BL_DeformableGameObject.h b/source/gameengine/Converter/BL_DeformableGameObject.h
index 57a404ad72b..315ad18c42c 100644
--- a/source/gameengine/Converter/BL_DeformableGameObject.h
+++ b/source/gameengine/Converter/BL_DeformableGameObject.h
@@ -60,6 +60,7 @@ public:
 	{
 		if (m_pDeformer)
 			m_pDeformer->Relink (map);
+		KX_GameObject::Relink(map);
 	};
 	void ProcessReplica(KX_GameObject* replica);
 
diff --git a/source/gameengine/Converter/BL_ShapeActionActuator.cpp b/source/gameengine/Converter/BL_ShapeActionActuator.cpp
index 7196b393ed4..242d648b062 100644
--- a/source/gameengine/Converter/BL_ShapeActionActuator.cpp
+++ b/source/gameengine/Converter/BL_ShapeActionActuator.cpp
@@ -442,15 +442,15 @@ PyMethodDef BL_ShapeActionActuator::Methods[] = {
 	{"setProperty", (PyCFunction) BL_ShapeActionActuator::sPySetProperty, METH_VARARGS, SetProperty_doc},
 	{"setBlendtime", (PyCFunction) BL_ShapeActionActuator::sPySetBlendtime, METH_VARARGS, SetBlendtime_doc},
 
-	{"getAction", (PyCFunction) BL_ShapeActionActuator::sPyGetAction, METH_VARARGS, GetAction_doc},
-	{"getStart", (PyCFunction) BL_ShapeActionActuator::sPyGetStart, METH_VARARGS, GetStart_doc},
-	{"getEnd", (PyCFunction) BL_ShapeActionActuator::sPyGetEnd, METH_VARARGS, GetEnd_doc},
-	{"getBlendin", (PyCFunction) BL_ShapeActionActuator::sPyGetBlendin, METH_VARARGS, GetBlendin_doc},
-	{"getPriority", (PyCFunction) BL_ShapeActionActuator::sPyGetPriority, METH_VARARGS, GetPriority_doc},
-	{"getFrame", (PyCFunction) BL_ShapeActionActuator::sPyGetFrame, METH_VARARGS, GetFrame_doc},
-	{"getProperty", (PyCFunction) BL_ShapeActionActuator::sPyGetProperty, METH_VARARGS, GetProperty_doc},
-	{"getType", (PyCFunction) BL_ShapeActionActuator::sPyGetType, METH_VARARGS, GetType_doc},	
-	{"setType", (PyCFunction) BL_ShapeActionActuator::sPySetType, METH_VARARGS, SetType_doc},
+	{"getAction", (PyCFunction) BL_ShapeActionActuator::sPyGetAction, METH_NOARGS, GetAction_doc},
+	{"getStart", (PyCFunction) BL_ShapeActionActuator::sPyGetStart, METH_NOARGS, GetStart_doc},
+	{"getEnd", (PyCFunction) BL_ShapeActionActuator::sPyGetEnd, METH_NOARGS, GetEnd_doc},
+	{"getBlendin", (PyCFunction) BL_ShapeActionActuator::sPyGetBlendin, METH_NOARGS, GetBlendin_doc},
+	{"getPriority", (PyCFunction) BL_ShapeActionActuator::sPyGetPriority, METH_NOARGS, GetPriority_doc},
+	{"getFrame", (PyCFunction) BL_ShapeActionActuator::sPyGetFrame, METH_NOARGS, GetFrame_doc},
+	{"getProperty", (PyCFunction) BL_ShapeActionActuator::sPyGetProperty, METH_NOARGS, GetProperty_doc},
+	{"getType", (PyCFunction) BL_ShapeActionActuator::sPyGetType, METH_NOARGS, GetType_doc},	
+	{"setType", (PyCFunction) BL_ShapeActionActuator::sPySetType, METH_NOARGS, SetType_doc},
 	{NULL,NULL} //Sentinel
 };
 
@@ -463,9 +463,7 @@ char BL_ShapeActionActuator::GetAction_doc[] =
 "getAction()\n"
 "\tReturns a string containing the name of the current action.\n";
 
-PyObject* BL_ShapeActionActuator::PyGetAction(PyObject* self, 
-											  PyObject* args, 
-											  PyObject* kwds) {
+PyObject* BL_ShapeActionActuator::PyGetAction(PyObject* self) {
 	PyObject *result;
 	
 	if (m_action){
@@ -484,9 +482,7 @@ char BL_ShapeActionActuator::GetProperty_doc[] =
 "getProperty()\n"
 "\tReturns the name of the property to be used in FromProp mode.\n";
 
-PyObject* BL_ShapeActionActuator::PyGetProperty(PyObject* self, 
-												PyObject* args, 
-												PyObject* kwds) {
+PyObject* BL_ShapeActionActuator::PyGetProperty(PyObject* self) {
 	PyObject *result;
 	
 	result = Py_BuildValue("s", (const char *)m_propname);
@@ -499,9 +495,7 @@ char BL_ShapeActionActuator::GetFrame_doc[] =
 "getFrame()\n"
 "\tReturns the current frame number.\n";
 
-PyObject* BL_ShapeActionActuator::PyGetFrame(PyObject* self, 
-											 PyObject* args, 
-											 PyObject* kwds) {
+PyObject* BL_ShapeActionActuator::PyGetFrame(PyObject* self) {
 	PyObject *result;
 	
 	result = Py_BuildValue("f", m_localtime);
@@ -514,9 +508,7 @@ char BL_ShapeActionActuator::GetEnd_doc[] =
 "getEnd()\n"
 "\tReturns the last frame of the action.\n";
 
-PyObject* BL_ShapeActionActuator::PyGetEnd(PyObject* self, 
-										   PyObject* args, 
-										   PyObject* kwds) {
+PyObject* BL_ShapeActionActuator::PyGetEnd(PyObject* self) {
 	PyObject *result;
 	
 	result = Py_BuildValue("f", m_endframe);
@@ -529,9 +521,7 @@ char BL_ShapeActionActuator::GetStart_doc[] =
 "getStart()\n"
 "\tReturns the starting frame of the action.\n";
 
-PyObject* BL_ShapeActionActuator::PyGetStart(PyObject* self, 
-											 PyObject* args, 
-											 PyObject* kwds) {
+PyObject* BL_ShapeActionActuator::PyGetStart(PyObject* self) {
 	PyObject *result;
 	
 	result = Py_BuildValue("f", m_startframe);
@@ -545,9 +535,7 @@ char BL_ShapeActionActuator::GetBlendin_doc[] =
 "\tReturns the number of interpolation animation frames to be\n"
 "\tgenerated when this actuator is triggered.\n";
 
-PyObject* BL_ShapeActionActuator::PyGetBlendin(PyObject* self, 
-											   PyObject* args, 
-											   PyObject* kwds) {
+PyObject* BL_ShapeActionActuator::PyGetBlendin(PyObject* self) {
 	PyObject *result;
 	
 	result = Py_BuildValue("f", m_blendin);
@@ -561,9 +549,7 @@ char BL_ShapeActionActuator::GetPriority_doc[] =
 "\tReturns the priority for this actuator.  Actuators with lower\n"
 "\tPriority numbers will override actuators with higher numbers.\n";
 
-PyObject* BL_ShapeActionActuator::PyGetPriority(PyObject* self, 
-											    PyObject* args, 
-												PyObject* kwds) {
+PyObject* BL_ShapeActionActuator::PyGetPriority(PyObject* self) {
 	PyObject *result;
 	
 	result = Py_BuildValue("i", m_priority);
@@ -605,6 +591,7 @@ PyObject* BL_ShapeActionActuator::PySetAction(PyObject* self,
 		}
 	}
 	else {
+		PyErr_SetString(PyExc_TypeError, "Invalid arguments");
 		return NULL;
 	}
 	
@@ -627,6 +614,7 @@ PyObject* BL_ShapeActionActuator::PySetStart(PyObject* self,
 		m_startframe = start;
 	}
 	else {
+		PyErr_SetString(PyExc_TypeError, "Invalid arguments");
 		return NULL;
 	}
 	
@@ -649,6 +637,7 @@ PyObject* BL_ShapeActionActuator::PySetEnd(PyObject* self,
 		m_endframe = end;
 	}
 	else {
+		PyErr_SetString(PyExc_TypeError, "Invalid arguments");
 		return NULL;
 	}
 	
@@ -672,6 +661,7 @@ PyObject* BL_ShapeActionActuator::PySetBlendin(PyObject* self,
 		m_blendin = blendin;
 	}
 	else {
+		PyErr_SetString(PyExc_TypeError, "Invalid arguments");
 		return NULL;
 	}
 	
@@ -700,6 +690,7 @@ PyObject* BL_ShapeActionActuator::PySetBlendtime(PyObject* self,
 			m_blendframe = m_blendin;
 	}
 	else {
+		PyErr_SetString(PyExc_TypeError, "Invalid arguments");
 		return NULL;
 	}
 	
@@ -724,6 +715,7 @@ PyObject* BL_ShapeActionActuator::PySetPriority(PyObject* self,
 		m_priority = priority;
 	}
 	else {
+		PyErr_SetString(PyExc_TypeError, "Invalid arguments");
 		return NULL;
 	}
 	
@@ -750,6 +742,7 @@ PyObject* BL_ShapeActionActuator::PySetFrame(PyObject* self,
 			m_localtime=m_endframe;
 	}
 	else {
+		PyErr_SetString(PyExc_TypeError, "Invalid arguments");
 		return NULL;
 	}
 	
@@ -773,6 +766,7 @@ PyObject* BL_ShapeActionActuator::PySetProperty(PyObject* self,
 		m_propname = string;
 	}
 	else {
+		PyErr_SetString(PyExc_TypeError, "Invalid arguments");
 		return NULL;
 	}
 	
@@ -784,9 +778,7 @@ PyObject* BL_ShapeActionActuator::PySetProperty(PyObject* self,
 char BL_ShapeActionActuator::GetType_doc[] =
 "getType()\n"
 "\tReturns the operation mode of the actuator.\n";
-PyObject* BL_ShapeActionActuator::PyGetType(PyObject* self,
-											PyObject* args, 
-											PyObject* kwds) {
+PyObject* BL_ShapeActionActuator::PyGetType(PyObject* self) {
     return Py_BuildValue("h", m_playtype);
 }
 
@@ -801,6 +793,7 @@ PyObject* BL_ShapeActionActuator::PySetType(PyObject* self,
 	short typeArg;
                                                                                                              
     if (!PyArg_ParseTuple(args, "h", &typeArg)) {
+		PyErr_SetString(PyExc_TypeError, "Invalid arguments");
         return NULL;
     }
 
diff --git a/source/gameengine/Converter/BL_ShapeActionActuator.h b/source/gameengine/Converter/BL_ShapeActionActuator.h
index 434a62a1233..a9b9ad8fa86 100644
--- a/source/gameengine/Converter/BL_ShapeActionActuator.h
+++ b/source/gameengine/Converter/BL_ShapeActionActuator.h
@@ -87,15 +87,15 @@ public:
 	KX_PYMETHOD_DOC(BL_ShapeActionActuator,SetBlendtime);
 	KX_PYMETHOD_DOC(BL_ShapeActionActuator,SetChannel);
 
-	KX_PYMETHOD_DOC(BL_ShapeActionActuator,GetAction);
-	KX_PYMETHOD_DOC(BL_ShapeActionActuator,GetBlendin);
-	KX_PYMETHOD_DOC(BL_ShapeActionActuator,GetPriority);
-	KX_PYMETHOD_DOC(BL_ShapeActionActuator,GetStart);
-	KX_PYMETHOD_DOC(BL_ShapeActionActuator,GetEnd);
-	KX_PYMETHOD_DOC(BL_ShapeActionActuator,GetFrame);
-	KX_PYMETHOD_DOC(BL_ShapeActionActuator,GetProperty);
+	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(BL_ActionActuator,GetChannel);
-	KX_PYMETHOD_DOC(BL_ShapeActionActuator,GetType);
+	KX_PYMETHOD_DOC_NOARGS(BL_ShapeActionActuator,GetType);
 	KX_PYMETHOD_DOC(BL_ShapeActionActuator,SetType);
 
 	virtual PyObject* _getattr(const STR_String& attr);
diff --git a/source/gameengine/Converter/KX_ConvertActuators.cpp b/source/gameengine/Converter/KX_ConvertActuators.cpp
index 1cc1b2e27a3..53ac730d203 100644
--- a/source/gameengine/Converter/KX_ConvertActuators.cpp
+++ b/source/gameengine/Converter/KX_ConvertActuators.cpp
@@ -503,7 +503,7 @@ void BL_ConvertActuators(char* maggiename,
 		case ACT_PROPERTY:
 			{
 				bPropertyActuator* propact = (bPropertyActuator*) bact->data;
-				CValue* destinationObj = NULL;
+				SCA_IObject* destinationObj = NULL;
 				
 				/*
 				here the destinationobject is searched. problem with multiple scenes: other scenes
@@ -628,6 +628,8 @@ void BL_ConvertActuators(char* maggiename,
 				/* convert settings... degrees in the ui become radians  */ 
 				/* internally                                            */ 
 				if (conact->type == ACT_CONST_TYPE_ORI) {
+					min = (MT_2_PI * conact->minloc[0])/360.0;
+					max = (MT_2_PI * conact->maxloc[0])/360.0;
 					switch (conact->mode) {
 					case ACT_CONST_DIRPX:
 						locrot = KX_ConstraintActuator::KX_ACT_CONSTRAINT_ORIX;
@@ -656,18 +658,18 @@ void BL_ConvertActuators(char* maggiename,
 						min = conact->minloc[2];
 						max = conact->maxloc[2];
 						break;
-					case ACT_CONST_DIRMX:
-						locrot = KX_ConstraintActuator::KX_ACT_CONSTRAINT_DIRMX;
+					case ACT_CONST_DIRNX:
+						locrot = KX_ConstraintActuator::KX_ACT_CONSTRAINT_DIRNX;
 						min = conact->minloc[0];
 						max = conact->maxloc[0];
 						break;
-					case ACT_CONST_DIRMY:
-						locrot = KX_ConstraintActuator::KX_ACT_CONSTRAINT_DIRMY;
+					case ACT_CONST_DIRNY:
+						locrot = KX_ConstraintActuator::KX_ACT_CONSTRAINT_DIRNY;
 						min = conact->minloc[1];
 						max = conact->maxloc[1];
 						break;
-					case ACT_CONST_DIRMZ:
-						locrot = KX_ConstraintActuator::KX_ACT_CONSTRAINT_DIRMZ;
+					case ACT_CONST_DIRNZ:
+						locrot = KX_ConstraintActuator::KX_ACT_CONSTRAINT_DIRNZ;
 						min = conact->minloc[2];
 						max = conact->maxloc[2];
 						break;
diff --git a/source/gameengine/Converter/KX_IpoConvert.cpp b/source/gameengine/Converter/KX_IpoConvert.cpp
index 75ca59d01e7..7410beecaf4 100644
--- a/source/gameengine/Converter/KX_IpoConvert.cpp
+++ b/source/gameengine/Converter/KX_IpoConvert.cpp
@@ -36,6 +36,7 @@
 #pragma warning (disable:4786)
 #endif
 
+#include "BKE_material.h" /* give_current_material */
 
 #include "KX_GameObject.h"
 #include "KX_IpoConvert.h"
@@ -68,6 +69,8 @@
 
 #include "SG_Node.h"
 
+#include "STR_HashedString.h"
+
 static BL_InterpolatorList *GetIpoList(struct Ipo *for_ipo, KX_BlenderSceneConverter *converter) {
 	BL_InterpolatorList *ipoList= converter->FindInterpolatorList(for_ipo);
 
@@ -560,16 +563,15 @@ void BL_ConvertWorldIpos(struct World* blenderworld,KX_BlenderSceneConverter *co
 	}
 }
 
-
-void BL_ConvertMaterialIpos(
-	Material* blendermaterial, 
+static void ConvertMaterialIpos(
+	Material* blendermaterial,
+	dword matname_hash,
 	KX_GameObject* gameobj,  
 	KX_BlenderSceneConverter *converter
 	)
 {
 	if (blendermaterial->ipo) {
-	
-		KX_MaterialIpoController* ipocontr = new KX_MaterialIpoController();
+		KX_MaterialIpoController* ipocontr = new KX_MaterialIpoController(matname_hash);
 		gameobj->GetSGNode()->AddSGController(ipocontr);
 		ipocontr->SetObject(gameobj->GetSGNode());
 		
@@ -596,7 +598,7 @@ void BL_ConvertMaterialIpos(
 		ipo = ipoList->GetScalarInterpolator(MA_COL_R);
 		if (ipo) {
 			if (!ipocontr) {
-				ipocontr = new KX_MaterialIpoController();
+				ipocontr = new KX_MaterialIpoController(matname_hash);
 				gameobj->GetSGNode()->AddSGController(ipocontr);
 				ipocontr->SetObject(gameobj->GetSGNode());
 			}
@@ -610,7 +612,7 @@ void BL_ConvertMaterialIpos(
 		ipo = ipoList->GetScalarInterpolator(MA_COL_G);
 		if (ipo) {
 			if (!ipocontr) {
-				ipocontr = new KX_MaterialIpoController();
+				ipocontr = new KX_MaterialIpoController(matname_hash);
 				gameobj->GetSGNode()->AddSGController(ipocontr);
 				ipocontr->SetObject(gameobj->GetSGNode());
 			}
@@ -624,7 +626,7 @@ void BL_ConvertMaterialIpos(
 		ipo = ipoList->GetScalarInterpolator(MA_COL_B);
 		if (ipo) {
 			if (!ipocontr) {
-				ipocontr = new KX_MaterialIpoController();
+				ipocontr = new KX_MaterialIpoController(matname_hash);
 				gameobj->GetSGNode()->AddSGController(ipocontr);
 				ipocontr->SetObject(gameobj->GetSGNode());
 			}
@@ -638,7 +640,7 @@ void BL_ConvertMaterialIpos(
 		ipo = ipoList->GetScalarInterpolator(MA_ALPHA);
 		if (ipo) {
 			if (!ipocontr) {
-				ipocontr = new KX_MaterialIpoController();
+				ipocontr = new KX_MaterialIpoController(matname_hash);
 				gameobj->GetSGNode()->AddSGController(ipocontr);
 				ipocontr->SetObject(gameobj->GetSGNode());
 			}
@@ -653,7 +655,7 @@ void BL_ConvertMaterialIpos(
 		ipo = ipoList->GetScalarInterpolator(MA_SPEC_R );
 		if (ipo) {
 			if (!ipocontr) {
-				ipocontr = new KX_MaterialIpoController();
+				ipocontr = new KX_MaterialIpoController(matname_hash);
 				gameobj->GetSGNode()->AddSGController(ipocontr);
 				ipocontr->SetObject(gameobj->GetSGNode());
 			}
@@ -667,7 +669,7 @@ void BL_ConvertMaterialIpos(
 		ipo = ipoList->GetScalarInterpolator(MA_SPEC_G);
 		if (ipo) {
 			if (!ipocontr) {
-				ipocontr = new KX_MaterialIpoController();
+				ipocontr = new KX_MaterialIpoController(matname_hash);
 				gameobj->GetSGNode()->AddSGController(ipocontr);
 				ipocontr->SetObject(gameobj->GetSGNode());
 			}
@@ -681,7 +683,7 @@ void BL_ConvertMaterialIpos(
 		ipo = ipoList->GetScalarInterpolator(MA_SPEC_B);
 		if (ipo) {
 			if (!ipocontr) {
-				ipocontr = new KX_MaterialIpoController();
+				ipocontr = new KX_MaterialIpoController(matname_hash);
 				gameobj->GetSGNode()->AddSGController(ipocontr);
 				ipocontr->SetObject(gameobj->GetSGNode());
 			}
@@ -696,7 +698,7 @@ void BL_ConvertMaterialIpos(
 		ipo = ipoList->GetScalarInterpolator(MA_HARD);
 		if (ipo) {
 			if (!ipocontr) {
-				ipocontr = new KX_MaterialIpoController();
+				ipocontr = new KX_MaterialIpoController(matname_hash);
 				gameobj->GetSGNode()->AddSGController(ipocontr);
 				ipocontr->SetObject(gameobj->GetSGNode());
 			}
@@ -710,7 +712,7 @@ void BL_ConvertMaterialIpos(
 		ipo = ipoList->GetScalarInterpolator(MA_SPEC);
 		if (ipo) {
 			if (!ipocontr) {
-				ipocontr = new KX_MaterialIpoController();
+				ipocontr = new KX_MaterialIpoController(matname_hash);
 				gameobj->GetSGNode()->AddSGController(ipocontr);
 				ipocontr->SetObject(gameobj->GetSGNode());
 			}
@@ -725,7 +727,7 @@ void BL_ConvertMaterialIpos(
 		ipo = ipoList->GetScalarInterpolator(MA_REF);
 		if (ipo) {
 			if (!ipocontr) {
-				ipocontr = new KX_MaterialIpoController();
+				ipocontr = new KX_MaterialIpoController(matname_hash);
 				gameobj->GetSGNode()->AddSGController(ipocontr);
 				ipocontr->SetObject(gameobj->GetSGNode());
 			}
@@ -739,7 +741,7 @@ void BL_ConvertMaterialIpos(
 		ipo = ipoList->GetScalarInterpolator(MA_EMIT);
 		if (ipo) {
 			if (!ipocontr) {
-				ipocontr = new KX_MaterialIpoController();
+				ipocontr = new KX_MaterialIpoController(matname_hash);
 				gameobj->GetSGNode()->AddSGController(ipocontr);
 				ipocontr->SetObject(gameobj->GetSGNode());
 			}
@@ -752,3 +754,28 @@ void BL_ConvertMaterialIpos(
 	}		
 }
 
+void BL_ConvertMaterialIpos(
+	struct Object* blenderobject,
+	KX_GameObject* gameobj,  
+	KX_BlenderSceneConverter *converter
+	)
+{
+	if (blenderobject->totcol==1)
+	{
+		Material *mat = give_current_material(blenderobject, 1);
+		// if there is only one material attached to the mesh then set material_index in BL_ConvertMaterialIpos to NULL
+		// --> this makes the UpdateMaterialData function in KX_GameObject.cpp use the old hack of using SetObjectColor
+		// because this yields a better performance as not all the vertex colors need to be edited
+		if(mat) ConvertMaterialIpos(mat, NULL, gameobj, converter);
+	}
+	else
+	{
+		for (int material_index=1; material_index <= blenderobject->totcol; material_index++)
+		{
+			Material *mat = give_current_material(blenderobject, material_index);
+			STR_HashedString matname = mat->id.name;
+			if(mat) ConvertMaterialIpos(mat, matname.hash(), gameobj, converter);
+		}
+	}
+}
+
diff --git a/source/gameengine/Converter/KX_IpoConvert.h b/source/gameengine/Converter/KX_IpoConvert.h
index afcb1b22821..4ec9bd31062 100644
--- a/source/gameengine/Converter/KX_IpoConvert.h
+++ b/source/gameengine/Converter/KX_IpoConvert.h
@@ -46,7 +46,7 @@ void BL_ConvertCameraIpos(struct Camera* blendercamera,
 	class KX_GameObject* cameraobj, 
 	class KX_BlenderSceneConverter *converter);
 
-void BL_ConvertMaterialIpos(struct Material* blendermaterial,
+void BL_ConvertMaterialIpos(struct Object* blenderobject,
 	class KX_GameObject* materialobj, 
 	class KX_BlenderSceneConverter *converter);
 
diff --git a/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp b/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
index e1c8ef87dd1..099cb8eebd0 100644
--- a/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
+++ b/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
@@ -149,7 +149,7 @@ PyParentObject SCA_ActuatorSensor::Parents[] = {
 };
 
 PyMethodDef SCA_ActuatorSensor::Methods[] = {
-	{"getActuator", (PyCFunction) SCA_ActuatorSensor::sPyGetActuator, METH_VARARGS, GetActuator_doc},
+	{"getActuator", (PyCFunction) SCA_ActuatorSensor::sPyGetActuator, METH_NOARGS, GetActuator_doc},
 	{"setActuator", (PyCFunction) SCA_ActuatorSensor::sPySetActuator, METH_VARARGS, SetActuator_doc},
 	{NULL,NULL} //Sentinel
 };
@@ -162,7 +162,7 @@ PyObject* SCA_ActuatorSensor::_getattr(const STR_String& attr) {
 char SCA_ActuatorSensor::GetActuator_doc[] = 
 "getActuator()\n"
 "\tReturn the Actuator with which the sensor operates.\n";
-PyObject* SCA_ActuatorSensor::PyGetActuator(PyObject* self, PyObject* args, PyObject* kwds) 
+PyObject* SCA_ActuatorSensor::PyGetActuator(PyObject* self) 
 {
 	return PyString_FromString(m_checkactname);
 }
@@ -180,6 +180,7 @@ PyObject* SCA_ActuatorSensor::PySetActuator(PyObject* self, PyObject* args, PyOb
 	char *actNameArg = NULL;
 
 	if (!PyArg_ParseTuple(args, "s", &actNameArg)) {
+		PyErr_SetString(PyExc_TypeError, "Invalid arguments");
 		return NULL;
 	}
 
diff --git a/source/gameengine/GameLogic/SCA_ActuatorSensor.h b/source/gameengine/GameLogic/SCA_ActuatorSensor.h
index 6086c5bfce0..a71145f6852 100644
--- a/source/gameengine/GameLogic/SCA_ActuatorSensor.h
+++ b/source/gameengine/GameLogic/SCA_ActuatorSensor.h
@@ -66,7 +66,7 @@ public:
 	/* 3. setProperty */
 	KX_PYMETHOD_DOC(SCA_ActuatorSensor,SetActuator);
 	/* 4. getProperty */
-	KX_PYMETHOD_DOC(SCA_ActuatorSensor,GetActuator);
+	KX_PYMETHOD_DOC_NOARGS(SCA_ActuatorSensor,GetActuator);
 	
 };
 
diff --git a/source/gameengine/GameLogic/SCA_ILogicBrick.cpp b/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
index f6efd485adb..e73358bc1e8 100644
--- a/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
+++ b/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
@@ -82,7 +82,10 @@ void SCA_ILogicBrick::ReParent(SCA_IObject* parent)
 	m_gameobj = parent;
 }
 
-
+void SCA_ILogicBrick::Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map)
+{
+	// nothing to do
+}
 
 CValue* SCA_ILogicBrick::Calc(VALUE_OPERATOR op, CValue *val)
 {
diff --git a/source/gameengine/GameLogic/SCA_ILogicBrick.h b/source/gameengine/GameLogic/SCA_ILogicBrick.h
index 80bc6ae3b86..c28711ac0f6 100644
--- a/source/gameengine/GameLogic/SCA_ILogicBrick.h
+++ b/source/gameengine/GameLogic/SCA_ILogicBrick.h
@@ -32,6 +32,8 @@
 #include "Value.h"
 #include "SCA_IObject.h"
 #include "BoolValue.h"
+#include "GEN_Map.h"
+#include "GEN_HashedPtr.h"
 
 class SCA_ILogicBrick : public CValue
 {
@@ -59,6 +61,7 @@ public:
 
 	SCA_IObject*	GetParent();
 	virtual void	ReParent(SCA_IObject* parent);
+	virtual void	Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map);
 
 	// act as a BoolValue (with value IsPositiveTrigger)
 	virtual CValue*	Calc(VALUE_OPERATOR op, CValue *val);
diff --git a/source/gameengine/GameLogic/SCA_ISensor.cpp b/source/gameengine/GameLogic/SCA_ISensor.cpp
index 68341b57435..f11c8047fac 100644
--- a/source/gameengine/GameLogic/SCA_ISensor.cpp
+++ b/source/gameengine/GameLogic/SCA_ISensor.cpp
@@ -168,23 +168,23 @@ PyMethodDef SCA_ISensor::Methods[] = {
 	{"isPositive", (PyCFunction) SCA_ISensor::sPyIsPositive, 
 	 METH_VARARGS, IsPositive_doc},
 	{"getUsePosPulseMode", (PyCFunction) SCA_ISensor::sPyGetUsePosPulseMode, 
-	 METH_VARARGS, GetUsePosPulseMode_doc},
+	 METH_NOARGS, GetUsePosPulseMode_doc},
 	{"setUsePosPulseMode", (PyCFunction) SCA_ISensor::sPySetUsePosPulseMode, 
 	 METH_VARARGS, SetUsePosPulseMode_doc},
 	{"getFrequency", (PyCFunction) SCA_ISensor::sPyGetFrequency, 
-	 METH_VARARGS, GetFrequency_doc},
+	 METH_NOARGS, GetFrequency_doc},
 	{"setFrequency", (PyCFunction) SCA_ISensor::sPySetFrequency, 
 	 METH_VARARGS, SetFrequency_doc},
 	{"getUseNegPulseMode", (PyCFunction) SCA_ISensor::sPyGetUseNegPulseMode, 
-	 METH_VARARGS, GetUseNegPulseMode_doc},
+	 METH_NOARGS, GetUseNegPulseMode_doc},
 	{"setUseNegPulseMode", (PyCFunction) SCA_ISensor::sPySetUseNegPulseMode, 
 	 METH_VARARGS, SetUseNegPulseMode_doc},
 	{"getInvert", (PyCFunction) SCA_ISensor::sPyGetInvert, 
-	 METH_VARARGS, GetInvert_doc},
+	 METH_NOARGS, GetInvert_doc},
 	{"setInvert", (PyCFunction) SCA_ISensor::sPySetInvert, 
 	 METH_VARARGS, SetInvert_doc},
 	{"getLevel", (PyCFunction) SCA_ISensor::sPyGetLevel, 
-	 METH_VARARGS, GetLevel_doc},
+	 METH_NOARGS, GetLevel_doc},
 	{"setLevel", (PyCFunction) SCA_ISensor::sPySetLevel, 
 	 METH_VARARGS, SetLevel_doc},
 	{NULL,NULL} //Sentinel
@@ -259,7 +259,7 @@ PyObject* SCA_ISensor::PyIsPositive(PyObject* self, PyObject* args, PyObject* kw
 char SCA_ISensor::GetUsePosPulseMode_doc[] = 
 "getUsePosPulseMode()\n"
 "\tReturns whether positive pulse mode is active.\n";
-PyObject* SCA_ISensor::PyGetUsePosPulseMode(PyObject* self, PyObject* args, PyObject* kwds)
+PyObject* SCA_ISensor::PyGetUsePosPulseMode(PyObject* self)
 {
 	return BoolToPyArg(m_pos_pulsemode);
 }
@@ -286,7 +286,7 @@ PyObject* SCA_ISensor::PySetUsePosPulseMode(PyObject* self, PyObject* args, PyOb
 char SCA_ISensor::GetFrequency_doc[] = 
 "getFrequency()\n"
 "\tReturns the frequency of the updates in pulse mode.\n" ;
-PyObject* SCA_ISensor::PyGetFrequency(PyObject* self, PyObject* args, PyObject* kwds)
+PyObject* SCA_ISensor::PyGetFrequency(PyObject* self)
 {
 	return PyInt_FromLong(m_pulse_frequency);
 }
@@ -321,7 +321,7 @@ PyObject* SCA_ISensor::PySetFrequency(PyObject* self, PyObject* args, PyObject*
 char SCA_ISensor::GetInvert_doc[] = 
 "getInvert()\n"
 "\tReturns whether or not pulses from this sensor are inverted.\n" ;
-PyObject* SCA_ISensor::PyGetInvert(PyObject* self, PyObject* args, PyObject* kwds)
+PyObject* SCA_ISensor::PyGetInvert(PyObject* self)
 {
 	return BoolToPyArg(m_invert);
 }
@@ -342,11 +342,10 @@ 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 if the condition for the\n"
-"\tdetector is met when entering the state. A edge detector will wait for an off-on\n"
-"\ttransition to occur.\n"
-"\tOnly some sensors implement this feature: keyboard.\n";
-PyObject* SCA_ISensor::PyGetLevel(PyObject* self, PyObject* args, PyObject* kwds)
+"\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(PyObject* self)
 {
 	return BoolToPyArg(m_level);
 }
@@ -366,7 +365,7 @@ PyObject* SCA_ISensor::PySetLevel(PyObject* self, PyObject* args, PyObject* kwds
 char SCA_ISensor::GetUseNegPulseMode_doc[] = 
 "getUseNegPulseMode()\n"
 "\tReturns whether negative pulse mode is active.\n";
-PyObject* SCA_ISensor::PyGetUseNegPulseMode(PyObject* self, PyObject* args, PyObject* kwds)
+PyObject* SCA_ISensor::PyGetUseNegPulseMode(PyObject* self)
 {
 	return BoolToPyArg(m_neg_pulsemode);
 }
diff --git a/source/gameengine/GameLogic/SCA_ISensor.h b/source/gameengine/GameLogic/SCA_ISensor.h
index 4ce49e71507..51837755ba4 100644
--- a/source/gameengine/GameLogic/SCA_ISensor.h
+++ b/source/gameengine/GameLogic/SCA_ISensor.h
@@ -136,15 +136,15 @@ public:
 
 	/* Python functions: */
 	KX_PYMETHOD_DOC(SCA_ISensor,IsPositive);
-	KX_PYMETHOD_DOC(SCA_ISensor,GetUsePosPulseMode);
+	KX_PYMETHOD_DOC_NOARGS(SCA_ISensor,GetUsePosPulseMode);
 	KX_PYMETHOD_DOC(SCA_ISensor,SetUsePosPulseMode);
-	KX_PYMETHOD_DOC(SCA_ISensor,GetFrequency);
+	KX_PYMETHOD_DOC_NOARGS(SCA_ISensor,GetFrequency);
 	KX_PYMETHOD_DOC(SCA_ISensor,SetFrequency);
-	KX_PYMETHOD_DOC(SCA_ISensor,GetUseNegPulseMode);
+	KX_PYMETHOD_DOC_NOARGS(SCA_ISensor,GetUseNegPulseMode);
 	KX_PYMETHOD_DOC(SCA_ISensor,SetUseNegPulseMode);
-	KX_PYMETHOD_DOC(SCA_ISensor,GetInvert);
+	KX_PYMETHOD_DOC_NOARGS(SCA_ISensor,GetInvert);
 	KX_PYMETHOD_DOC(SCA_ISensor,SetInvert);
-	KX_PYMETHOD_DOC(SCA_ISensor,GetLevel);
+	KX_PYMETHOD_DOC_NOARGS(SCA_ISensor,GetLevel);
 	KX_PYMETHOD_DOC(SCA_ISensor,SetLevel);
 
 };
diff --git a/source/gameengine/GameLogic/SCA_PropertyActuator.cpp b/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
index ebe1cd51863..7062f2cef6a 100644
--- a/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
+++ b/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
@@ -42,7 +42,7 @@
 /* Native functions                                                          */
 /* ------------------------------------------------------------------------- */
 
-SCA_PropertyActuator::SCA_PropertyActuator(SCA_IObject* gameobj,CValue* sourceObj,const STR_String& propname,const STR_String& expr,int acttype,PyTypeObject* T )
+SCA_PropertyActuator::SCA_PropertyActuator(SCA_IObject* gameobj,SCA_IObject* sourceObj,const STR_String& propname,const STR_String& expr,int acttype,PyTypeObject* T )
    :	SCA_IActuator(gameobj,T),
 	m_type(acttype),
 	m_propname(propname),
@@ -51,14 +51,14 @@ SCA_PropertyActuator::SCA_PropertyActuator(SCA_IObject* gameobj,CValue* sourceOb
 {
 	// protect ourselves against someone else deleting the source object
 	// don't protect against ourselves: it would create a dead lock
-	if (m_sourceObj && m_sourceObj != GetParent())
-		m_sourceObj->AddRef();
+	if (m_sourceObj)
+		m_sourceObj->RegisterActuator(this);
 }
 
 SCA_PropertyActuator::~SCA_PropertyActuator()
 {
-	if (m_sourceObj && m_sourceObj != GetParent())
-		m_sourceObj->Release();
+	if (m_sourceObj)
+		m_sourceObj->UnregisterActuator(this);
 }
 
 bool SCA_PropertyActuator::Update()
@@ -185,10 +185,31 @@ void SCA_PropertyActuator::ProcessReplica()
 	// no need to check for self reference like in the constructor:
 	// the replica will always have a different parent
 	if (m_sourceObj)
-		m_sourceObj->AddRef();
+		m_sourceObj->RegisterActuator(this);
 	SCA_IActuator::ProcessReplica();
 }
 
+bool SCA_PropertyActuator::UnlinkObject(SCA_IObject* clientobj)
+{
+	if (clientobj == m_sourceObj)
+	{
+		// this object is being deleted, we cannot continue to track it.
+		m_sourceObj = NULL;
+		return true;
+	}
+	return false;
+}
+
+void SCA_PropertyActuator::Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map)
+{
+	void **h_obj = (*obj_map)[m_sourceObj];
+	if (h_obj) {
+		if (m_sourceObj)
+			m_sourceObj->UnregisterActuator(this);
+		m_sourceObj = (SCA_IObject*)(*h_obj);
+		m_sourceObj->RegisterActuator(this);
+	}
+}
 
 
 /* ------------------------------------------------------------------------- */
diff --git a/source/gameengine/GameLogic/SCA_PropertyActuator.h b/source/gameengine/GameLogic/SCA_PropertyActuator.h
index f8305901c51..1e435684572 100644
--- a/source/gameengine/GameLogic/SCA_PropertyActuator.h
+++ b/source/gameengine/GameLogic/SCA_PropertyActuator.h
@@ -52,7 +52,7 @@ class SCA_PropertyActuator : public SCA_IActuator
 	int			m_type;
 	STR_String	m_propname;
 	STR_String	m_exprtxt;
-	CValue*		m_sourceObj; // for copy property actuator
+	SCA_IObject* m_sourceObj; // for copy property actuator
 
 public:
 
@@ -60,7 +60,7 @@ public:
 
 	SCA_PropertyActuator(
 		SCA_IObject* gameobj,
-		CValue* sourceObj,
+		SCA_IObject* sourceObj,
 		const STR_String& propname,
 		const STR_String& expr,
 		int acttype,
@@ -74,7 +74,9 @@ public:
 	GetReplica(
 	);
 
-	void ProcessReplica();
+	virtual void ProcessReplica();
+	virtual bool UnlinkObject(SCA_IObject* clientobj);
+	virtual void Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map);
 
 	virtual bool 
 	Update();
diff --git a/source/gameengine/GamePlayer/common/GPC_Canvas.h b/source/gameengine/GamePlayer/common/GPC_Canvas.h
index f82166dfa88..87719041f65 100644
--- a/source/gameengine/GamePlayer/common/GPC_Canvas.h
+++ b/source/gameengine/GamePlayer/common/GPC_Canvas.h
@@ -130,6 +130,12 @@ public:
 	) {
 		return m_displayarea;
 	};
+	
+		RAS_Rect &
+	GetWindowArea(
+	) {
+		return m_displayarea;
+	}
 
 		void 
 	BeginFrame(
diff --git a/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp b/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
index dba11efef72..539eaec4a7b 100644
--- a/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
+++ b/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
@@ -13,6 +13,7 @@
 #include "KX_ClientObjectInfo.h"
 
 #include "PHY_IPhysicsEnvironment.h"
+#include "CcdPhysicsEnvironment.h"
 
 
 KX_BulletPhysicsController::KX_BulletPhysicsController (const CcdConstructionInfo& ci, bool dyna)
@@ -132,9 +133,10 @@ void	KX_BulletPhysicsController::getOrientation(MT_Quaternion& orn)
 	CcdPhysicsController::getOrientation(myorn[0],myorn[1],myorn[2],myorn[3]);
 	orn = MT_Quaternion(myorn[0],myorn[1],myorn[2],myorn[3]);
 }
-void KX_BulletPhysicsController::setOrientation(const MT_Quaternion& orn)
+void KX_BulletPhysicsController::setOrientation(const MT_Matrix3x3& orn)
 {
-	CcdPhysicsController::setOrientation(orn.x(),orn.y(),orn.z(),orn.w());
+	btMatrix3x3 btmat(orn[0][0], orn[0][1], orn[0][2], orn[1][0], orn[1][1], orn[1][2], orn[2][0], orn[2][1], orn[2][2]);
+	CcdPhysicsController::setWorldOrientation(btmat);
 }
 void KX_BulletPhysicsController::setPosition(const MT_Point3& pos)
 {
@@ -167,10 +169,17 @@ void	KX_BulletPhysicsController::SuspendDynamics(bool ghost)
 	btRigidBody *body = GetRigidBody();
 	if (body->getActivationState() != DISABLE_SIMULATION)
 	{
+		btBroadphaseProxy* handle = body->getBroadphaseHandle();
 		m_savedCollisionFlags = body->getCollisionFlags();
+		m_savedMass = GetMass();
+		m_savedCollisionFilterGroup = handle->m_collisionFilterGroup;
+		m_savedCollisionFilterMask = handle->m_collisionFilterMask;
 		body->setActivationState(DISABLE_SIMULATION);
-		body->setCollisionFlags((btCollisionObject::CF_STATIC_OBJECT)|
-			((ghost)?btCollisionObject::CF_NO_CONTACT_RESPONSE:0));
+		GetPhysicsEnvironment()->updateCcdPhysicsController(this, 
+			0.0,
+			btCollisionObject::CF_STATIC_OBJECT|((ghost)?btCollisionObject::CF_NO_CONTACT_RESPONSE:(m_savedCollisionFlags&btCollisionObject::CF_NO_CONTACT_RESPONSE)),
+			btBroadphaseProxy::StaticFilter, 
+			btBroadphaseProxy::AllFilter ^ btBroadphaseProxy::StaticFilter);
 	}
 }
 
@@ -179,8 +188,12 @@ void	KX_BulletPhysicsController::RestoreDynamics()
 	btRigidBody *body = GetRigidBody();
 	if (body->getActivationState() == DISABLE_SIMULATION)
 	{
+		GetPhysicsEnvironment()->updateCcdPhysicsController(this, 
+			m_savedMass,
+			m_savedCollisionFlags,
+			m_savedCollisionFilterGroup,
+			m_savedCollisionFilterMask);
 		GetRigidBody()->forceActivationState(ACTIVE_TAG);
-		body->setCollisionFlags(m_savedCollisionFlags);
 	}
 }
 
diff --git a/source/gameengine/Ketsji/KX_BulletPhysicsController.h b/source/gameengine/Ketsji/KX_BulletPhysicsController.h
index 6f048deb16b..2efe0474b30 100644
--- a/source/gameengine/Ketsji/KX_BulletPhysicsController.h
+++ b/source/gameengine/Ketsji/KX_BulletPhysicsController.h
@@ -9,6 +9,10 @@ class KX_BulletPhysicsController : public KX_IPhysicsController ,public CcdPhysi
 {
 private:
 	int m_savedCollisionFlags;
+	short int m_savedCollisionFilterGroup;
+	short int m_savedCollisionFilterMask;
+	MT_Scalar m_savedMass;
+
 public:
 
 	KX_BulletPhysicsController (const CcdConstructionInfo& ci, bool dyna);
@@ -31,7 +35,7 @@ public:
 	virtual void	SetAngularVelocity(const MT_Vector3& ang_vel,bool local);
 	virtual void	SetLinearVelocity(const MT_Vector3& lin_vel,bool local);
 	virtual	void	getOrientation(MT_Quaternion& orn);
-	virtual	void setOrientation(const MT_Quaternion& orn);
+	virtual	void setOrientation(const MT_Matrix3x3& orn);
 	virtual	void setPosition(const MT_Point3& pos);
 	virtual	void setScaling(const MT_Vector3& scaling);
 	virtual	MT_Scalar	GetMass();
diff --git a/source/gameengine/Ketsji/KX_CameraActuator.cpp b/source/gameengine/Ketsji/KX_CameraActuator.cpp
index 27f4870de10..0a97b6f0a2f 100644
--- a/source/gameengine/Ketsji/KX_CameraActuator.cpp
+++ b/source/gameengine/Ketsji/KX_CameraActuator.cpp
@@ -49,7 +49,7 @@ STR_String KX_CameraActuator::Y_AXIS_STRING = "y";
 
 KX_CameraActuator::KX_CameraActuator(
 	SCA_IObject* gameobj, 
-	CValue *obj,
+	SCA_IObject *obj,
 	MT_Scalar hght,
 	MT_Scalar minhght,
 	MT_Scalar maxhght,
@@ -63,11 +63,14 @@ KX_CameraActuator::KX_CameraActuator(
 	m_maxHeight (maxhght),
 	m_x (xytog)
 {
+	if (m_ob)
+		m_ob->RegisterActuator(this);
 }
 
 KX_CameraActuator::~KX_CameraActuator()
 {
-	//nothing to do
+	if (m_ob)
+		m_ob->UnregisterActuator(this);
 }
 
 	CValue* 
@@ -81,8 +84,35 @@ GetReplica(
 	return replica;
 };
 
+void KX_CameraActuator::ProcessReplica()
+{
+	if (m_ob)
+		m_ob->RegisterActuator(this);
+	SCA_IActuator::ProcessReplica();
+}
+
+bool KX_CameraActuator::UnlinkObject(SCA_IObject* clientobj)
+{
+	if (clientobj == m_ob)
+	{
+		// this object is being deleted, we cannot continue to track it.
+		m_ob = NULL;
+		return true;
+	}
+	return false;
+}
 
 
+void KX_CameraActuator::Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map)
+{
+	void **h_obj = (*obj_map)[m_ob];
+	if (h_obj) {
+		if (m_ob)
+			m_ob->UnregisterActuator(this);
+		m_ob = (SCA_IObject*)(*h_obj);
+		m_ob->RegisterActuator(this);
+	}
+}
 
 /* three functions copied from blender arith... don't know if there's an equivalent */
 
@@ -181,8 +211,14 @@ static void Kx_VecUpMat3(float *vec, float mat[][3], short axis)
 
 bool KX_CameraActuator::Update(double curtime, bool frame)
 {
-	bool result = true;
+	/* wondering... is it really neccesary/desirable to suppress negative    */
+	/* events here?                                                          */
+	bool bNegativeEvent = IsNegativeEvent();
+	RemoveAllEvents();
 
+	if (bNegativeEvent || !m_ob) 
+		return false;
+	
 	KX_GameObject *obj = (KX_GameObject*) GetParent();
 	MT_Point3 from = obj->NodeGetWorldPosition();
 	MT_Matrix3x3 frommat = obj->NodeGetWorldOrientation();
@@ -195,13 +231,6 @@ bool KX_CameraActuator::Update(double curtime, bool frame)
 	float mindistsq, maxdistsq, distsq;
 	float mat[3][3];
 	
-	/* wondering... is it really neccesary/desirable to suppress negative    */
-	/* events here?                                                          */
-	bool bNegativeEvent = IsNegativeEvent();
-	RemoveAllEvents();
-
-	if (bNegativeEvent) return false;
-	
 	/* The rules:                                                            */
 	/* CONSTRAINT 1: not implemented */
 	/* CONSTRAINT 2: can camera see actor?              */
@@ -315,7 +344,7 @@ bool KX_CameraActuator::Update(double curtime, bool frame)
 	actormat[2][0]= mat[0][2]; actormat[2][1]= mat[1][2]; actormat[2][2]= mat[2][2];
 	obj->NodeSetLocalOrientation(actormat);
 
-	return result;
+	return true;
 }
 
 CValue *KX_CameraActuator::findObject(char *obName) 
@@ -404,7 +433,11 @@ PyObject* KX_CameraActuator::PySetObject(PyObject* self,
 	PyObject* gameobj;
 	if (PyArg_ParseTuple(args, "O!", &KX_GameObject::Type, &gameobj))
 	{
-		m_ob = (CValue*)gameobj;
+		if (m_ob)
+			m_ob->UnregisterActuator(this);
+		m_ob = (SCA_IObject*)gameobj;
+		if (m_ob)
+			m_ob->RegisterActuator(this);
 		Py_Return;
 	}
 	PyErr_Clear();
@@ -412,10 +445,13 @@ PyObject* KX_CameraActuator::PySetObject(PyObject* self,
 	char* objectname;
 	if (PyArg_ParseTuple(args, "s", &objectname))
 	{
-		CValue *object = (CValue*)SCA_ILogicBrick::m_sCurrentLogicManager->GetGameObjectByName(STR_String(objectname));
+		SCA_IObject *object = (SCA_IObject*)SCA_ILogicBrick::m_sCurrentLogicManager->GetGameObjectByName(STR_String(objectname));
 		if(object)
 		{
+			if (m_ob != NULL)
+				m_ob->UnregisterActuator(this);
 			m_ob = object;
+			m_ob->RegisterActuator(this);
 			Py_Return;
 		}
 	}
diff --git a/source/gameengine/Ketsji/KX_CameraActuator.h b/source/gameengine/Ketsji/KX_CameraActuator.h
index eb007e403ec..488b36922b0 100644
--- a/source/gameengine/Ketsji/KX_CameraActuator.h
+++ b/source/gameengine/Ketsji/KX_CameraActuator.h
@@ -49,7 +49,7 @@ class KX_CameraActuator : public SCA_IActuator
 	Py_Header;
 private :
 	/** Object that will be tracked. */
-	CValue *m_ob;
+	SCA_IObject *m_ob;
 
 	/** height (float), */
 	//const MT_Scalar m_height;
@@ -87,7 +87,7 @@ private :
 
 		SCA_IObject *gameobj,
 		//const CValue *ob,
-		CValue *ob,
+		SCA_IObject *ob,
 		MT_Scalar hght,
 		MT_Scalar minhght,
 		MT_Scalar maxhght,
@@ -103,6 +103,7 @@ private :
 
 	/** Methods Inherited from  CValue */
 	CValue* GetReplica();
+	virtual void ProcessReplica();
 	
 
 	/** Methods inherited from SCA_IActuator */
@@ -110,7 +111,10 @@ private :
 		double curtime,
 		bool frame
 	);
+	virtual bool	UnlinkObject(SCA_IObject* clientobj);
 
+	/** Methods inherited from SCA_ILogicBrick */
+	virtual void	Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map);
 
 	/* --------------------------------------------------------------------- */
 	/* Python interface ---------------------------------------------------- */
diff --git a/source/gameengine/Ketsji/KX_ConstraintActuator.cpp b/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
index 80288a72485..2401d69d3a3 100644
--- a/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
+++ b/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
@@ -88,11 +88,17 @@ KX_ConstraintActuator::KX_ConstraintActuator(SCA_IObject *gameobj,
 			} else {
 				m_refDirection /= len;
 			}
+			m_minimumBound = cos(minBound);
+			m_maximumBound = cos(maxBound);
+			m_minimumSine = sin(minBound);
+			m_maximumSine = sin(maxBound);
 		}
 		break;
 	default:
 		m_minimumBound = minBound;
 		m_maximumBound = maxBound;
+		m_minimumSine = 0.f;
+		m_maximumSine = 0.f;
 		break;
 	}
 
@@ -153,9 +159,9 @@ bool KX_ConstraintActuator::Update(double curtime, bool frame)
 		KX_GameObject  *obj = (KX_GameObject*) GetParent();
 		MT_Point3    position = obj->NodeGetWorldPosition();
 		MT_Point3    newposition;
-		MT_Vector3   direction;
+		MT_Vector3   direction, refDirection;
 		MT_Matrix3x3 rotation = obj->NodeGetWorldOrientation();
-		MT_Scalar    filter, newdistance;
+		MT_Scalar    filter, newdistance, cosangle;
 		int axis, sign;
 
 		if (m_posDampTime) {
@@ -178,16 +184,52 @@ bool KX_ConstraintActuator::Update(double curtime, bool frame)
 				direction[2] = rotation[2][1];
 				axis = 1;
 				break;
-			case KX_ACT_CONSTRAINT_ORIZ:
+			default:
 				direction[0] = rotation[0][2];
 				direction[1] = rotation[1][2];
 				direction[2] = rotation[2][2];
 				axis = 2;
 				break;
 			}
-			// apply damping on the direction
+			if ((m_maximumBound < (1.0f-FLT_EPSILON)) || (m_minimumBound < (1.0f-FLT_EPSILON))) {
+				// reference direction needs to be evaluated
+				// 1. get the cosine between current direction and target
+				cosangle = direction.dot(m_refDirection);
+				if (cosangle >= (m_maximumBound-FLT_EPSILON) && cosangle <= (m_minimumBound+FLT_EPSILON)) {
+					// no change to do
+					result = true;
+					goto CHECK_TIME;
+				}
+				// 2. define a new reference direction
+				//    compute local axis with reference direction as X and
+				//    Y in direction X refDirection plane
+				MT_Vector3 zaxis = m_refDirection.cross(direction);
+				if (MT_fuzzyZero2(zaxis.length2())) {
+					// direction and refDirection are identical,
+					// choose any other direction to define plane
+					if (direction[0] < 0.9999)
+						zaxis = m_refDirection.cross(MT_Vector3(1.0,0.0,0.0));
+					else
+						zaxis = m_refDirection.cross(MT_Vector3(0.0,1.0,0.0));
+				}
+				MT_Vector3 yaxis = zaxis.cross(m_refDirection);
+				yaxis.normalize();
+				if (cosangle > m_minimumBound) {
+					// angle is too close to reference direction,
+					// choose a new reference that is exactly at minimum angle
+					refDirection = m_minimumBound * m_refDirection + m_minimumSine * yaxis;
+				} else {
+					// angle is too large, choose new reference direction at maximum angle
+					refDirection = m_maximumBound * m_refDirection + m_maximumSine * yaxis;
+				}
+			} else {
+				refDirection = m_refDirection;
+			}
 			if (m_posDampTime) {
-				direction = filter*direction + (1.0-filter)*m_refDirection;
+				// apply damping on the direction
+				direction = filter*direction + (1.0-filter)*refDirection;
+			} else {
+				direction = refDirection;
 			}
 			obj->AlignAxisToVect(direction, axis);
 			result = true;
@@ -195,9 +237,9 @@ bool KX_ConstraintActuator::Update(double curtime, bool frame)
 		case KX_ACT_CONSTRAINT_DIRPX:
 		case KX_ACT_CONSTRAINT_DIRPY:
 		case KX_ACT_CONSTRAINT_DIRPZ:
-		case KX_ACT_CONSTRAINT_DIRMX:
-		case KX_ACT_CONSTRAINT_DIRMY:
-		case KX_ACT_CONSTRAINT_DIRMZ:
+		case KX_ACT_CONSTRAINT_DIRNX:
+		case KX_ACT_CONSTRAINT_DIRNY:
+		case KX_ACT_CONSTRAINT_DIRNZ:
 			switch (m_locrot) {
 			case KX_ACT_CONSTRAINT_DIRPX:
 				direction[0] = rotation[0][0];
@@ -220,21 +262,21 @@ bool KX_ConstraintActuator::Update(double curtime, bool frame)
 				axis = 2;
 				sign = 1;
 				break;
-			case KX_ACT_CONSTRAINT_DIRMX:
+			case KX_ACT_CONSTRAINT_DIRNX:
 				direction[0] = -rotation[0][0];
 				direction[1] = -rotation[1][0];
 				direction[2] = -rotation[2][0];
 				axis = 0;
 				sign = 0;
 				break;
-			case KX_ACT_CONSTRAINT_DIRMY:
+			case KX_ACT_CONSTRAINT_DIRNY:
 				direction[0] = -rotation[0][1];
 				direction[1] = -rotation[1][1];
 				direction[2] = -rotation[2][1];
 				axis = 1;
 				sign = 0;
 				break;
-			case KX_ACT_CONSTRAINT_DIRMZ:
+			case KX_ACT_CONSTRAINT_DIRNZ:
 				direction[0] = -rotation[0][2];
 				direction[1] = -rotation[1][2];
 				direction[2] = -rotation[2][2];
@@ -395,27 +437,27 @@ PyParentObject KX_ConstraintActuator::Parents[] = {
 
 PyMethodDef KX_ConstraintActuator::Methods[] = {
 	{"setDamp", (PyCFunction) KX_ConstraintActuator::sPySetDamp, METH_VARARGS, SetDamp_doc},
-	{"getDamp", (PyCFunction) KX_ConstraintActuator::sPyGetDamp, METH_VARARGS, GetDamp_doc},
+	{"getDamp", (PyCFunction) KX_ConstraintActuator::sPyGetDamp, METH_NOARGS, GetDamp_doc},
 	{"setRotDamp", (PyCFunction) KX_ConstraintActuator::sPySetRotDamp, METH_VARARGS, SetRotDamp_doc},
-	{"getRotDamp", (PyCFunction) KX_ConstraintActuator::sPyGetRotDamp, METH_VARARGS, GetRotDamp_doc},
+	{"getRotDamp", (PyCFunction) KX_ConstraintActuator::sPyGetRotDamp, METH_NOARGS, GetRotDamp_doc},
 	{"setDirection", (PyCFunction) KX_ConstraintActuator::sPySetDirection, METH_VARARGS, SetDirection_doc},
-	{"getDirection", (PyCFunction) KX_ConstraintActuator::sPyGetDirection, METH_VARARGS, GetDirection_doc},
+	{"getDirection", (PyCFunction) KX_ConstraintActuator::sPyGetDirection, METH_NOARGS, GetDirection_doc},
 	{"setOption", (PyCFunction) KX_ConstraintActuator::sPySetOption, METH_VARARGS, SetOption_doc},
-	{"getOption", (PyCFunction) KX_ConstraintActuator::sPyGetOption, METH_VARARGS, GetOption_doc},
+	{"getOption", (PyCFunction) KX_ConstraintActuator::sPyGetOption, METH_NOARGS, GetOption_doc},
 	{"setTime", (PyCFunction) KX_ConstraintActuator::sPySetTime, METH_VARARGS, SetTime_doc},
-	{"getTime", (PyCFunction) KX_ConstraintActuator::sPyGetTime, METH_VARARGS, GetTime_doc},
+	{"getTime", (PyCFunction) KX_ConstraintActuator::sPyGetTime, METH_NOARGS, GetTime_doc},
 	{"setProperty", (PyCFunction) KX_ConstraintActuator::sPySetProperty, METH_VARARGS, SetProperty_doc},
-	{"getProperty", (PyCFunction) KX_ConstraintActuator::sPyGetProperty, METH_VARARGS, GetProperty_doc},
+	{"getProperty", (PyCFunction) KX_ConstraintActuator::sPyGetProperty, METH_NOARGS, GetProperty_doc},
 	{"setMin", (PyCFunction) KX_ConstraintActuator::sPySetMin, METH_VARARGS, SetMin_doc},
-	{"getMin", (PyCFunction) KX_ConstraintActuator::sPyGetMin, METH_VARARGS, GetMin_doc},
+	{"getMin", (PyCFunction) KX_ConstraintActuator::sPyGetMin, METH_NOARGS, GetMin_doc},
 	{"setDistance", (PyCFunction) KX_ConstraintActuator::sPySetMin, METH_VARARGS, SetDistance_doc},
-	{"getDistance", (PyCFunction) KX_ConstraintActuator::sPyGetMin, METH_VARARGS, GetDistance_doc},
+	{"getDistance", (PyCFunction) KX_ConstraintActuator::sPyGetMin, METH_NOARGS, GetDistance_doc},
 	{"setMax", (PyCFunction) KX_ConstraintActuator::sPySetMax, METH_VARARGS, SetMax_doc},
-	{"getMax", (PyCFunction) KX_ConstraintActuator::sPyGetMax, METH_VARARGS, GetMax_doc},
+	{"getMax", (PyCFunction) KX_ConstraintActuator::sPyGetMax, METH_NOARGS, GetMax_doc},
 	{"setRayLength", (PyCFunction) KX_ConstraintActuator::sPySetMax, METH_VARARGS, SetRayLength_doc},
-	{"getRayLength", (PyCFunction) KX_ConstraintActuator::sPyGetMax, METH_VARARGS, GetRayLength_doc},
+	{"getRayLength", (PyCFunction) KX_ConstraintActuator::sPyGetMax, METH_NOARGS, GetRayLength_doc},
 	{"setLimit", (PyCFunction) KX_ConstraintActuator::sPySetLimit, METH_VARARGS, SetLimit_doc},
-	{"getLimit", (PyCFunction) KX_ConstraintActuator::sPyGetLimit, METH_VARARGS, GetLimit_doc},
+	{"getLimit", (PyCFunction) KX_ConstraintActuator::sPyGetLimit, METH_NOARGS, GetLimit_doc},
 	{NULL,NULL} //Sentinel
 };
 
@@ -434,6 +476,7 @@ PyObject* KX_ConstraintActuator::PySetDamp(PyObject* self,
 										   PyObject* kwds) {
 	int dampArg;
 	if(!PyArg_ParseTuple(args, "i", &dampArg)) {
+		PyErr_SetString(PyExc_TypeError, "Invalid arguments");
 		return NULL;		
 	}
 	
@@ -446,9 +489,7 @@ PyObject* KX_ConstraintActuator::PySetDamp(PyObject* self,
 char KX_ConstraintActuator::GetDamp_doc[] = 
 "getDamp()\n"
 "\tReturns the damping parameter.\n";
-PyObject* KX_ConstraintActuator::PyGetDamp(PyObject* self, 
-										   PyObject* args, 
-										   PyObject* kwds){
+PyObject* KX_ConstraintActuator::PyGetDamp(PyObject* self){
 	return PyInt_FromLong(m_posDampTime);
 }
 
@@ -463,6 +504,7 @@ PyObject* KX_ConstraintActuator::PySetRotDamp(PyObject* self,
 										      PyObject* kwds) {
 	int dampArg;
 	if(!PyArg_ParseTuple(args, "i", &dampArg)) {
+		PyErr_SetString(PyExc_TypeError, "Invalid arguments");
 		return NULL;		
 	}
 	
@@ -475,9 +517,7 @@ PyObject* KX_ConstraintActuator::PySetRotDamp(PyObject* self,
 char KX_ConstraintActuator::GetRotDamp_doc[] = 
 "getRotDamp()\n"
 "\tReturns the damping time for application of the constraint.\n";
-PyObject* KX_ConstraintActuator::PyGetRotDamp(PyObject* self, 
-										      PyObject* args, 
-										      PyObject* kwds){
+PyObject* KX_ConstraintActuator::PyGetRotDamp(PyObject* self){
 	return PyInt_FromLong(m_rotDampTime);
 }
 
@@ -494,6 +534,7 @@ PyObject* KX_ConstraintActuator::PySetDirection(PyObject* self,
 	MT_Vector3 dir;
 
 	if(!PyArg_ParseTuple(args, "(fff)", &x, &y, &z)) {
+		PyErr_SetString(PyExc_TypeError, "Invalid arguments");
 		return NULL;		
 	}
 	dir[0] = x;
@@ -512,9 +553,7 @@ PyObject* KX_ConstraintActuator::PySetDirection(PyObject* self,
 char KX_ConstraintActuator::GetDirection_doc[] = 
 "getDirection()\n"
 "\tReturns the reference direction of the orientation constraint as a 3-tuple.\n";
-PyObject* KX_ConstraintActuator::PyGetDirection(PyObject* self, 
-										        PyObject* args, 
-										        PyObject* kwds){
+PyObject* KX_ConstraintActuator::PyGetDirection(PyObject* self){
 	PyObject *retVal = PyList_New(3);
 
 	PyList_SetItem(retVal, 0, PyFloat_FromDouble(m_refDirection[0]));
@@ -538,6 +577,7 @@ PyObject* KX_ConstraintActuator::PySetOption(PyObject* self,
 										     PyObject* kwds) {
 	int option;
 	if(!PyArg_ParseTuple(args, "i", &option)) {
+		PyErr_SetString(PyExc_TypeError, "Invalid arguments");
 		return NULL;		
 	}
 	
@@ -549,9 +589,7 @@ PyObject* KX_ConstraintActuator::PySetOption(PyObject* self,
 char KX_ConstraintActuator::GetOption_doc[] = 
 "getOption()\n"
 "\tReturns the option parameter.\n";
-PyObject* KX_ConstraintActuator::PyGetOption(PyObject* self, 
-										     PyObject* args, 
-										     PyObject* kwds){
+PyObject* KX_ConstraintActuator::PyGetOption(PyObject* self){
 	return PyInt_FromLong(m_option);
 }
 
@@ -567,6 +605,7 @@ PyObject* KX_ConstraintActuator::PySetTime(PyObject* self,
 										   PyObject* kwds) {
 	int t;
 	if(!PyArg_ParseTuple(args, "i", &t)) {
+		PyErr_SetString(PyExc_TypeError, "Invalid arguments");
 		return NULL;		
 	}
 	
@@ -580,9 +619,7 @@ PyObject* KX_ConstraintActuator::PySetTime(PyObject* self,
 char KX_ConstraintActuator::GetTime_doc[] = 
 "getTime()\n"
 "\tReturns the time parameter.\n";
-PyObject* KX_ConstraintActuator::PyGetTime(PyObject* self, 
-										   PyObject* args, 
-										   PyObject* kwds){
+PyObject* KX_ConstraintActuator::PyGetTime(PyObject* self){
 	return PyInt_FromLong(m_activeTime);
 }
 
@@ -597,6 +634,7 @@ PyObject* KX_ConstraintActuator::PySetProperty(PyObject* self,
 										       PyObject* kwds) {
 	char *property;
 	if (!PyArg_ParseTuple(args, "s", &property)) {
+		PyErr_SetString(PyExc_TypeError, "Invalid arguments");
 		return NULL;
 	}
 	if (property == NULL) {
@@ -612,9 +650,7 @@ PyObject* KX_ConstraintActuator::PySetProperty(PyObject* self,
 char KX_ConstraintActuator::GetProperty_doc[] = 
 "getProperty()\n"
 "\tReturns the property parameter.\n";
-PyObject* KX_ConstraintActuator::PyGetProperty(PyObject* self, 
-										       PyObject* args, 
-										       PyObject* kwds){
+PyObject* KX_ConstraintActuator::PyGetProperty(PyObject* self){
 	return PyString_FromString(m_property);
 }
 
@@ -634,6 +670,7 @@ PyObject* KX_ConstraintActuator::PySetMin(PyObject* self,
 										  PyObject* kwds) {
 	float minArg;
 	if(!PyArg_ParseTuple(args, "f", &minArg)) {
+		PyErr_SetString(PyExc_TypeError, "Invalid arguments");
 		return NULL;		
 	}
 
@@ -659,9 +696,7 @@ 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(PyObject* self, 
-										  PyObject* args, 
-										  PyObject* kwds) {
+PyObject* KX_ConstraintActuator::PyGetMin(PyObject* self) {
 	return PyFloat_FromDouble(m_minimumBound);
 }
 
@@ -681,6 +716,7 @@ PyObject* KX_ConstraintActuator::PySetMax(PyObject* self,
 										  PyObject* kwds){
 	float maxArg;
 	if(!PyArg_ParseTuple(args, "f", &maxArg)) {
+		PyErr_SetString(PyExc_TypeError, "Invalid arguments");
 		return NULL;		
 	}
 
@@ -706,9 +742,7 @@ 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(PyObject* self, 
-										  PyObject* args, 
-										  PyObject* kwds) {
+PyObject* KX_ConstraintActuator::PyGetMax(PyObject* self) {
 	return PyFloat_FromDouble(m_maximumBound);
 }
 
@@ -736,6 +770,7 @@ PyObject* KX_ConstraintActuator::PySetLimit(PyObject* self,
 											PyObject* kwds) {
 	int locrotArg;
 	if(!PyArg_ParseTuple(args, "i", &locrotArg)) {
+		PyErr_SetString(PyExc_TypeError, "Invalid arguments");
 		return NULL;		
 	}
 	
@@ -747,9 +782,7 @@ PyObject* KX_ConstraintActuator::PySetLimit(PyObject* self,
 char KX_ConstraintActuator::GetLimit_doc[] = 
 "getLimit()\n"
 "\tReturns the type of constraint.\n";
-PyObject* KX_ConstraintActuator::PyGetLimit(PyObject* self, 
-											PyObject* args, 
-											PyObject* kwds) {
+PyObject* KX_ConstraintActuator::PyGetLimit(PyObject* self) {
 	return PyInt_FromLong(m_locrot);
 }
 
diff --git a/source/gameengine/Ketsji/KX_ConstraintActuator.h b/source/gameengine/Ketsji/KX_ConstraintActuator.h
index 5a1d4d23217..d9f39124cac 100644
--- a/source/gameengine/Ketsji/KX_ConstraintActuator.h
+++ b/source/gameengine/Ketsji/KX_ConstraintActuator.h
@@ -48,6 +48,10 @@ protected:
 	float m_minimumBound;
 	// max (float)
 	float m_maximumBound;
+	// sinus of minimum angle
+	float m_minimumSine;
+	// sinus of maximum angle
+	float m_maximumSine;
 	// reference direction
 	MT_Vector3 m_refDirection;
 	// locrotxyz choice (pick one): only one choice allowed at a time!
@@ -80,9 +84,9 @@ protected:
 		KX_ACT_CONSTRAINT_DIRPX,
 		KX_ACT_CONSTRAINT_DIRPY,
 		KX_ACT_CONSTRAINT_DIRPZ,
-		KX_ACT_CONSTRAINT_DIRMX,
-		KX_ACT_CONSTRAINT_DIRMY,
-		KX_ACT_CONSTRAINT_DIRMZ,
+		KX_ACT_CONSTRAINT_DIRNX,
+		KX_ACT_CONSTRAINT_DIRNY,
+		KX_ACT_CONSTRAINT_DIRNZ,
 		KX_ACT_CONSTRAINT_ORIX,
 		KX_ACT_CONSTRAINT_ORIY,
 		KX_ACT_CONSTRAINT_ORIZ,
@@ -127,27 +131,27 @@ protected:
 	virtual PyObject* _getattr(const STR_String& attr);
 
 	KX_PYMETHOD_DOC(KX_ConstraintActuator,SetDamp);
-	KX_PYMETHOD_DOC(KX_ConstraintActuator,GetDamp);
+	KX_PYMETHOD_DOC_NOARGS(KX_ConstraintActuator,GetDamp);
 	KX_PYMETHOD_DOC(KX_ConstraintActuator,SetRotDamp);
-	KX_PYMETHOD_DOC(KX_ConstraintActuator,GetRotDamp);
+	KX_PYMETHOD_DOC_NOARGS(KX_ConstraintActuator,GetRotDamp);
 	KX_PYMETHOD_DOC(KX_ConstraintActuator,SetDirection);
-	KX_PYMETHOD_DOC(KX_ConstraintActuator,GetDirection);
+	KX_PYMETHOD_DOC_NOARGS(KX_ConstraintActuator,GetDirection);
 	KX_PYMETHOD_DOC(KX_ConstraintActuator,SetOption);
-	KX_PYMETHOD_DOC(KX_ConstraintActuator,GetOption);
+	KX_PYMETHOD_DOC_NOARGS(KX_ConstraintActuator,GetOption);
 	KX_PYMETHOD_DOC(KX_ConstraintActuator,SetTime);
-	KX_PYMETHOD_DOC(KX_ConstraintActuator,GetTime);
+	KX_PYMETHOD_DOC_NOARGS(KX_ConstraintActuator,GetTime);
 	KX_PYMETHOD_DOC(KX_ConstraintActuator,SetProperty);
-	KX_PYMETHOD_DOC(KX_ConstraintActuator,GetProperty);
+	KX_PYMETHOD_DOC_NOARGS(KX_ConstraintActuator,GetProperty);
 	KX_PYMETHOD_DOC(KX_ConstraintActuator,SetMin);
-	KX_PYMETHOD_DOC(KX_ConstraintActuator,GetMin);
+	KX_PYMETHOD_DOC_NOARGS(KX_ConstraintActuator,GetMin);
 	static char SetDistance_doc[];
 	static char GetDistance_doc[];
 	KX_PYMETHOD_DOC(KX_ConstraintActuator,SetMax);
-	KX_PYMETHOD_DOC(KX_ConstraintActuator,GetMax);
+	KX_PYMETHOD_DOC_NOARGS(KX_ConstraintActuator,GetMax);
 	static char SetRayLength_doc[];
 	static char GetRayLength_doc[];
 	KX_PYMETHOD_DOC(KX_ConstraintActuator,SetLimit);
-	KX_PYMETHOD_DOC(KX_ConstraintActuator,GetLimit);
+	KX_PYMETHOD_DOC_NOARGS(KX_ConstraintActuator,GetLimit);
 };
 
 #endif //__KX_CONSTRAINTACTUATOR
diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp
index 576ff3ec68f..3d9c7aafd70 100644
--- a/source/gameengine/Ketsji/KX_GameObject.cpp
+++ b/source/gameengine/Ketsji/KX_GameObject.cpp
@@ -61,6 +61,8 @@ typedef unsigned long uint_ptr;
 #include "KX_RayCast.h"
 #include "KX_PythonInit.h"
 #include "KX_PyMath.h"
+#include "SCA_IActuator.h"
+#include "SCA_ISensor.h"
 
 // This file defines relationships between parents and children
 // in the game engine.
@@ -222,6 +224,10 @@ void KX_GameObject::SetParent(KX_Scene *scene, KX_GameObject* obj)
 		RemoveParent(scene);
 		obj->GetSGNode()->AddChild(GetSGNode());
 
+		if (m_pPhysicsController1) 
+		{
+			m_pPhysicsController1->SuspendDynamics(true);
+		}
 		// Set us to our new scale, position, and orientation
 		scale1[0] = scale1[0]/scale2[0];
 		scale1[1] = scale1[1]/scale2[1];
@@ -238,10 +244,6 @@ void KX_GameObject::SetParent(KX_Scene *scene, KX_GameObject* obj)
 		if (rootlist->RemoveValue(this))
 			// the object was in parent list, decrement ref count as it's now removed
 			Release();
-		if (m_pPhysicsController1) 
-		{
-			m_pPhysicsController1->SuspendDynamics(true);
-		}
 	}
 }
 
@@ -440,6 +442,7 @@ void KX_GameObject::UpdateIPO(float curframetime,
 // IPO update
 void 
 KX_GameObject::UpdateMaterialData(
+		dword matname_hash,
 		MT_Vector4 rgba,
 		MT_Vector3 specrgb,
 		MT_Scalar hard,
@@ -458,9 +461,26 @@ KX_GameObject::UpdateMaterialData(
 			RAS_IPolyMaterial* poly = (*mit)->GetPolyMaterial();
 			if(poly->GetFlag() & RAS_BLENDERMAT )
 			{
-				SetObjectColor(rgba);
 				KX_BlenderMaterial *m =  static_cast<KX_BlenderMaterial*>(poly);
-				m->UpdateIPO(rgba, specrgb,hard,spec,ref,emit, alpha);
+				
+				if (matname_hash == NULL)
+				{
+					m->UpdateIPO(rgba, specrgb,hard,spec,ref,emit, alpha);
+					// if mesh has only one material attached to it then use original hack with no need to edit vertices (better performance)
+					SetObjectColor(rgba);
+				}
+				else
+				{
+					if (matname_hash == poly->GetMaterialNameHash())
+					{
+						m->UpdateIPO(rgba, specrgb,hard,spec,ref,emit, alpha);
+						m_meshes[mesh]->SetVertexColor(poly,rgba);
+						
+						// no break here, because one blender material can be split into several game engine materials
+						// (e.g. one uvsphere material is split into one material at poles with ras_mode TRIANGLE and one material for the body
+						// if here was a break then would miss some vertices if material was split
+					}
+				}
 			}
 		}
 	}
@@ -722,8 +742,12 @@ MT_Vector3 KX_GameObject::GetAngularVelocity(bool local)
 
 void KX_GameObject::NodeSetLocalPosition(const MT_Point3& trans)
 {
-	if (m_pPhysicsController1)
+	if (m_pPhysicsController1 && (!GetSGNode() || !GetSGNode()->GetSGParent()))
 	{
+		// don't update physic controller if the object is a child:
+		// 1) the transformation will not be right
+		// 2) in this case, the physic controller is necessarily a static object
+		//    that is updated from the normal kinematic synchronization
 		m_pPhysicsController1->setPosition(trans);
 	}
 
@@ -735,25 +759,22 @@ void KX_GameObject::NodeSetLocalPosition(const MT_Point3& trans)
 
 void KX_GameObject::NodeSetLocalOrientation(const MT_Matrix3x3& rot)
 {
-	if (m_pPhysicsController1)
+	if (m_pPhysicsController1 && (!GetSGNode() || !GetSGNode()->GetSGParent()))
 	{
-		m_pPhysicsController1->setOrientation(rot.getRotation());
+		// see note above
+		m_pPhysicsController1->setOrientation(rot);
 	}
 	if (GetSGNode())
 		GetSGNode()->SetLocalOrientation(rot);
-	else
-	{
-		int i;
-		i=0;
-	}
 }
 
 
 
 void KX_GameObject::NodeSetLocalScale(const MT_Vector3& scale)
 {
-	if (m_pPhysicsController1)
+	if (m_pPhysicsController1 && (!GetSGNode() || !GetSGNode()->GetSGParent()))
 	{
+		// see note above
 		m_pPhysicsController1->setScaling(scale);
 	}
 	
@@ -883,6 +904,8 @@ PyMethodDef KX_GameObject::Methods[] = {
 	{"getParent", (PyCFunction)KX_GameObject::sPyGetParent,METH_NOARGS},
 	{"setParent", (PyCFunction)KX_GameObject::sPySetParent,METH_O},
 	{"removeParent", (PyCFunction)KX_GameObject::sPyRemoveParent,METH_NOARGS},
+	{"getChildren", (PyCFunction)KX_GameObject::sPyGetChildren,METH_NOARGS},
+	{"getChildrenRecursive", (PyCFunction)KX_GameObject::sPyGetChildrenRecursive,METH_NOARGS},
 	{"getMesh", (PyCFunction)KX_GameObject::sPyGetMesh,METH_VARARGS},
 	{"getPhysicsId", (PyCFunction)KX_GameObject::sPyGetPhysicsId,METH_NOARGS},
 	{"getPropertyNames", (PyCFunction)KX_GameObject::sPyGetPropertyNames,METH_NOARGS},
@@ -1300,6 +1323,43 @@ PyObject* KX_GameObject::PyRemoveParent(PyObject* self)
 	Py_RETURN_NONE;
 }
 
+
+static void walk_children(SG_Node* node, CListValue* list, bool recursive)
+{
+	NodeList& children = node->GetSGChildren();
+
+	for (NodeList::iterator childit = children.begin();!(childit==children.end());++childit)
+	{
+		SG_Node* childnode = (*childit);
+		CValue* childobj = (CValue*)childnode->GetSGClientObject();
+		if (childobj != NULL) // This is a GameObject
+		{
+			// add to the list
+			list->Add(childobj->AddRef());
+		}
+		
+		// if the childobj is NULL then this may be an inverse parent link
+		// so a non recursive search should still look down this node.
+		if (recursive || childobj==NULL) {
+			walk_children(childnode, list, recursive);
+		}
+	}
+}
+
+PyObject* KX_GameObject::PyGetChildren(PyObject* self)
+{
+	CListValue* list = new CListValue();
+	walk_children(m_pSGNode, list, 0);
+	return list;
+}
+
+PyObject* KX_GameObject::PyGetChildrenRecursive(PyObject* self)
+{
+	CListValue* list = new CListValue();
+	walk_children(m_pSGNode, list, 1);
+	return list;
+}
+
 PyObject* KX_GameObject::PyGetMesh(PyObject* self, 
 								   PyObject* args, 
 								   PyObject* kwds)
@@ -1428,6 +1488,7 @@ PyObject* KX_GameObject::PyAlignAxisToVect(PyObject* self,
 		if (PyVecTo(pyvect, vect))
 		{
 			AlignAxisToVect(vect,axis,fac);
+			NodeUpdateGS(0.f,true);
 			Py_RETURN_NONE;
 		}
 	}
@@ -1525,8 +1586,10 @@ KX_PYMETHODDEF_DOC(KX_GameObject, rayCastTo,
 	float dist = 0.0f;
 	char *propName = NULL;
 
-	if (!PyArg_ParseTuple(args,"O|fs", &pyarg, &dist, &propName))
+	if (!PyArg_ParseTuple(args,"O|fs", &pyarg, &dist, &propName)) {
+		PyErr_SetString(PyExc_TypeError, "Invalid arguments");
 		return NULL;
+	}
 
 	if (!PyVecTo(pyarg, toPoint))
 	{
@@ -1573,11 +1636,11 @@ KX_PYMETHODDEF_DOC(KX_GameObject, rayCastTo,
 }
 
 KX_PYMETHODDEF_DOC(KX_GameObject, rayCast,
-"rayCast(to,from,dist,prop): cast a ray and return tuple (object,hit,normal) of contact point with object within dist that matches prop or None if no hit\n"
+				   "rayCast(to,from,dist,prop): cast a ray and return tuple (object,hit,normal) of contact point with object within dist that matches prop or (None,None,None) tuple if no hit\n"
 " prop = property name that object must have; can be omitted => detect any object\n"
 " dist = max distance to look (can be negative => look behind); 0 or omitted => detect up to to\n"
 " from = 3-tuple or object reference for origin of ray (if object, use center of object)\n"
-"        Can None or omitted => start from self object center\n"
+"        Can be None or omitted => start from self object center\n"
 " to = 3-tuple or object reference for destination of ray (if object, use center of object)\n"
 "Note: the object on which you call this method matters: the ray will ignore it if it goes through it\n")
 {
@@ -1589,8 +1652,10 @@ KX_PYMETHODDEF_DOC(KX_GameObject, rayCast,
 	char *propName = NULL;
 	KX_GameObject *other;
 
-	if (!PyArg_ParseTuple(args,"O|Ofs", &pyto, &pyfrom, &dist, &propName))
+	if (!PyArg_ParseTuple(args,"O|Ofs", &pyto, &pyfrom, &dist, &propName)) {
+		PyErr_SetString(PyExc_TypeError, "Invalid arguments");
 		return NULL;
+	}
 
 	if (!PyVecTo(pyto, toPoint))
 	{
@@ -1648,16 +1713,14 @@ KX_PYMETHODDEF_DOC(KX_GameObject, rayCast,
     if (m_pHitObject)
 	{
 		PyObject* returnValue = PyTuple_New(3);
-		if (!returnValue)
+		if (!returnValue) {
+			PyErr_SetString(PyExc_TypeError, "PyTuple_New() failed");
 			return NULL;
+		}
 		PyTuple_SET_ITEM(returnValue, 0, m_pHitObject->AddRef());
 		PyTuple_SET_ITEM(returnValue, 1, PyObjectFrom(resultPoint));
 		PyTuple_SET_ITEM(returnValue, 2, PyObjectFrom(resultNormal));
 		return returnValue;
-		//return Py_BuildValue("(O,(fff),(fff))", 
-		//	m_pHitObject->AddRef(),		// trick: KX_GameObject are not true Python object, they use a difference reference count system
-		//	resultPoint[0], resultPoint[1], resultPoint[2],
-		//	resultNormal[0], resultNormal[1], resultNormal[2]);
 	}
 	return Py_BuildValue("OOO", Py_None, Py_None, Py_None);
 	//Py_RETURN_NONE;
@@ -1668,6 +1731,20 @@ KX_PYMETHODDEF_DOC(KX_GameObject, rayCast,
  * --------------------------------------------------------------------- */
 void KX_GameObject::Relink(GEN_Map<GEN_HashedPtr, void*> *map_parameter)	
 {
-	/* intentionally empty ? */
+	// we will relink the sensors and actuators that use object references
+	// if the object is part of the replicated hierarchy, use the new
+	// object reference instead
+	SCA_SensorList& sensorlist = GetSensors();
+	SCA_SensorList::iterator sit;
+	for (sit=sensorlist.begin(); sit != sensorlist.end(); sit++)
+	{
+		(*sit)->Relink(map_parameter);
+	}
+	SCA_ActuatorList& actuatorlist = GetActuators();
+	SCA_ActuatorList::iterator ait;
+	for (ait=actuatorlist.begin(); ait != actuatorlist.end(); ait++)
+	{
+		(*ait)->Relink(map_parameter);
+	}
 }
 
diff --git a/source/gameengine/Ketsji/KX_GameObject.h b/source/gameengine/Ketsji/KX_GameObject.h
index eba154e1094..1d36798b12f 100644
--- a/source/gameengine/Ketsji/KX_GameObject.h
+++ b/source/gameengine/Ketsji/KX_GameObject.h
@@ -521,6 +521,7 @@ public:
 	 */
 		void 
 	UpdateMaterialData(
+		dword matname_hash,
 		MT_Vector4 rgba,
 		MT_Vector3 specrgb,
 		MT_Scalar hard,
@@ -746,6 +747,8 @@ public:
 	KX_PYMETHOD_NOARGS(KX_GameObject,GetParent);
 	KX_PYMETHOD_O(KX_GameObject,SetParent);
 	KX_PYMETHOD_NOARGS(KX_GameObject,RemoveParent);
+	KX_PYMETHOD_NOARGS(KX_GameObject,GetChildren);	
+	KX_PYMETHOD_NOARGS(KX_GameObject,GetChildrenRecursive);
 	KX_PYMETHOD(KX_GameObject,GetMesh);
 	KX_PYMETHOD_NOARGS(KX_GameObject,GetPhysicsId);
 	KX_PYMETHOD_NOARGS(KX_GameObject,GetPropertyNames);
diff --git a/source/gameengine/Ketsji/KX_IPhysicsController.h b/source/gameengine/Ketsji/KX_IPhysicsController.h
index bc4cc185a04..ecfdb8c4275 100644
--- a/source/gameengine/Ketsji/KX_IPhysicsController.h
+++ b/source/gameengine/Ketsji/KX_IPhysicsController.h
@@ -71,7 +71,8 @@ public:
 	virtual void	resolveCombinedVelocities(float linvelX,float linvelY,float linvelZ,float angVelX,float angVelY,float angVelZ) = 0;
 
 	virtual	void	getOrientation(MT_Quaternion& orn)=0;
-	virtual	void setOrientation(const MT_Quaternion& orn)=0;
+	virtual	void setOrientation(const MT_Matrix3x3& orn)=0;
+	//virtual	void setOrientation(const MT_Quaternion& orn)=0;
 	virtual	void setPosition(const MT_Point3& pos)=0;
 	virtual	void setScaling(const MT_Vector3& scaling)=0;
 	virtual	MT_Scalar	GetMass()=0;
diff --git a/source/gameengine/Ketsji/KX_IpoActuator.cpp b/source/gameengine/Ketsji/KX_IpoActuator.cpp
index b7103f49aee..af3add8a323 100644
--- a/source/gameengine/Ketsji/KX_IpoActuator.cpp
+++ b/source/gameengine/Ketsji/KX_IpoActuator.cpp
@@ -430,27 +430,27 @@ PyMethodDef KX_IpoActuator::Methods[] = {
 	{"setStart", (PyCFunction) KX_IpoActuator::sPySetStart, 
 		METH_VARARGS, SetStart_doc},
 	{"getStart", (PyCFunction) KX_IpoActuator::sPyGetStart, 
-		METH_VARARGS, GetStart_doc},
+		METH_NOARGS, GetStart_doc},
 	{"setEnd", (PyCFunction) KX_IpoActuator::sPySetEnd, 
 		METH_VARARGS, SetEnd_doc},
 	{"getEnd", (PyCFunction) KX_IpoActuator::sPyGetEnd, 
-		METH_VARARGS, GetEnd_doc},
+		METH_NOARGS, GetEnd_doc},
 	{"setIpoAsForce", (PyCFunction) KX_IpoActuator::sPySetIpoAsForce, 
 		METH_VARARGS, SetIpoAsForce_doc},
 	{"getIpoAsForce", (PyCFunction) KX_IpoActuator::sPyGetIpoAsForce, 
-		METH_VARARGS, GetIpoAsForce_doc},
+		METH_NOARGS, GetIpoAsForce_doc},
 	{"setIpoAdd", (PyCFunction) KX_IpoActuator::sPySetIpoAdd, 
 		METH_VARARGS, SetIpoAdd_doc},
 	{"getIpoAdd", (PyCFunction) KX_IpoActuator::sPyGetIpoAdd, 
-		METH_VARARGS, GetIpoAdd_doc},
+		METH_NOARGS, GetIpoAdd_doc},
 	{"setType", (PyCFunction) KX_IpoActuator::sPySetType, 
 		METH_VARARGS, SetType_doc},
 	{"getType", (PyCFunction) KX_IpoActuator::sPyGetType, 
-		METH_VARARGS, GetType_doc},	
+		METH_NOARGS, GetType_doc},	
 	{"setForceIpoActsLocal", (PyCFunction) KX_IpoActuator::sPySetForceIpoActsLocal,
 		METH_VARARGS, SetForceIpoActsLocal_doc},
 	{"getForceIpoActsLocal", (PyCFunction) KX_IpoActuator::sPyGetForceIpoActsLocal,
-		METH_VARARGS, GetForceIpoActsLocal_doc},
+		METH_NOARGS, GetForceIpoActsLocal_doc},
 	{NULL,NULL} //Sentinel
 };
 
@@ -480,6 +480,7 @@ PyObject* KX_IpoActuator::PySet(PyObject* self,
 	int startFrame, stopFrame;
 	if(!PyArg_ParseTuple(args, "siii", &mode, &startFrame, 
 						 &stopFrame, &forceToggle)) {
+		PyErr_SetString(PyExc_TypeError, "Invalid arguments");
 		return NULL;
 	}
 	modenum = string2mode(mode);
@@ -515,6 +516,7 @@ PyObject* KX_IpoActuator::PySetProperty(PyObject* self,
 	/* args: property */
 	char *propertyName;
 	if(!PyArg_ParseTuple(args, "s", &propertyName)) {
+		PyErr_SetString(PyExc_TypeError, "Invalid arguments");
 		return NULL;
 	}
 
@@ -533,6 +535,7 @@ PyObject* KX_IpoActuator::PySetStart(PyObject* self,
 									 PyObject* kwds) {
 	float startArg;
 	if(!PyArg_ParseTuple(args, "f", &startArg)) {
+		PyErr_SetString(PyExc_TypeError, "Invalid arguments");
 		return NULL;		
 	}
 	
@@ -544,9 +547,7 @@ PyObject* KX_IpoActuator::PySetStart(PyObject* self,
 char KX_IpoActuator::GetStart_doc[] = 
 "getStart()\n"
 "\tReturns the frame from which the ipo starts playing.\n";
-PyObject* KX_IpoActuator::PyGetStart(PyObject* self, 
-									 PyObject* args, 
-									 PyObject* kwds) {
+PyObject* KX_IpoActuator::PyGetStart(PyObject* self) {
 	return PyFloat_FromDouble(m_startframe);
 }
 
@@ -560,6 +561,7 @@ PyObject* KX_IpoActuator::PySetEnd(PyObject* self,
 								   PyObject* kwds) {
 	float endArg;
 	if(!PyArg_ParseTuple(args, "f", &endArg)) {
+		PyErr_SetString(PyExc_TypeError, "Invalid arguments");
 		return NULL;		
 	}
 	
@@ -571,9 +573,7 @@ PyObject* KX_IpoActuator::PySetEnd(PyObject* self,
 char KX_IpoActuator::GetEnd_doc[] = 
 "getEnd()\n"
 "\tReturns the frame at which the ipo stops playing.\n";
-PyObject* KX_IpoActuator::PyGetEnd(PyObject* self, 
-								   PyObject* args, 
-								   PyObject* kwds) {
+PyObject* KX_IpoActuator::PyGetEnd(PyObject* self) {
 	return PyFloat_FromDouble(m_endframe);
 }
 
@@ -588,6 +588,7 @@ PyObject* KX_IpoActuator::PySetIpoAsForce(PyObject* self,
 	int boolArg;
 	
 	if (!PyArg_ParseTuple(args, "i", &boolArg)) {
+		PyErr_SetString(PyExc_TypeError, "Invalid arguments");
 		return NULL;
 	}
 
@@ -601,9 +602,7 @@ PyObject* KX_IpoActuator::PySetIpoAsForce(PyObject* self,
 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(PyObject* self, 
-									   	  PyObject* args, 
-										  PyObject* kwds) {
+PyObject* KX_IpoActuator::PyGetIpoAsForce(PyObject* self) {
 	return BoolToPyArg(m_ipo_as_force);
 }
 
@@ -618,6 +617,7 @@ PyObject* KX_IpoActuator::PySetIpoAdd(PyObject* self,
 	int boolArg;
 	
 	if (!PyArg_ParseTuple(args, "i", &boolArg)) {
+		PyErr_SetString(PyExc_TypeError, "Invalid arguments");
 		return NULL;
 	}
 
@@ -631,9 +631,7 @@ PyObject* KX_IpoActuator::PySetIpoAdd(PyObject* self,
 char KX_IpoActuator::GetIpoAdd_doc[] = 
 "getIpoAsAdd()\n"
 "\tReturns whether to interpret the ipo as additive rather than absolute.\n";
-PyObject* KX_IpoActuator::PyGetIpoAdd(PyObject* self, 
-									  PyObject* args, 
-									  PyObject* kwds) {
+PyObject* KX_IpoActuator::PyGetIpoAdd(PyObject* self) {
 	return BoolToPyArg(m_ipo_add);
 }
 
@@ -648,6 +646,7 @@ PyObject* KX_IpoActuator::PySetType(PyObject* self,
 	int typeArg;
 	
 	if (!PyArg_ParseTuple(args, "i", &typeArg)) {
+		PyErr_SetString(PyExc_TypeError, "Invalid arguments");
 		return NULL;
 	}
 	
@@ -662,9 +661,7 @@ PyObject* KX_IpoActuator::PySetType(PyObject* self,
 char KX_IpoActuator::GetType_doc[] = 
 "getType()\n"
 "\tReturns the operation mode of the actuator.\n";
-PyObject* KX_IpoActuator::PyGetType(PyObject* self, 
-									PyObject* args, 
-									PyObject* kwds) {
+PyObject* KX_IpoActuator::PyGetType(PyObject* self) {
 	return PyInt_FromLong(m_type);
 }
 
@@ -681,6 +678,7 @@ PyObject* KX_IpoActuator::PySetForceIpoActsLocal(PyObject* self,
 	int boolArg;
 	
 	if (!PyArg_ParseTuple(args, "i", &boolArg)) {
+		PyErr_SetString(PyExc_TypeError, "Invalid arguments");
 		return NULL;
 	}
 
@@ -693,9 +691,7 @@ 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(PyObject* self, 
-									   	         PyObject* args, 
-										         PyObject* kwds) {
+PyObject* KX_IpoActuator::PyGetForceIpoActsLocal(PyObject* self) {
 	return BoolToPyArg(m_ipo_local);
 }
 
diff --git a/source/gameengine/Ketsji/KX_IpoActuator.h b/source/gameengine/Ketsji/KX_IpoActuator.h
index ae554fb0fce..d6f52f8d59d 100644
--- a/source/gameengine/Ketsji/KX_IpoActuator.h
+++ b/source/gameengine/Ketsji/KX_IpoActuator.h
@@ -143,17 +143,17 @@ public:
 	KX_PYMETHOD_DOC(KX_IpoActuator,SetProperty);
 /*  	KX_PYMETHOD_DOC(KX_IpoActuator,SetKey2Key); */
 	KX_PYMETHOD_DOC(KX_IpoActuator,SetStart);
-	KX_PYMETHOD_DOC(KX_IpoActuator,GetStart);
+	KX_PYMETHOD_DOC_NOARGS(KX_IpoActuator,GetStart);
 	KX_PYMETHOD_DOC(KX_IpoActuator,SetEnd);
-	KX_PYMETHOD_DOC(KX_IpoActuator,GetEnd);
+	KX_PYMETHOD_DOC_NOARGS(KX_IpoActuator,GetEnd);
 	KX_PYMETHOD_DOC(KX_IpoActuator,SetIpoAsForce);
-	KX_PYMETHOD_DOC(KX_IpoActuator,GetIpoAsForce);
+	KX_PYMETHOD_DOC_NOARGS(KX_IpoActuator,GetIpoAsForce);
 	KX_PYMETHOD_DOC(KX_IpoActuator,SetIpoAdd);
-	KX_PYMETHOD_DOC(KX_IpoActuator,GetIpoAdd);
+	KX_PYMETHOD_DOC_NOARGS(KX_IpoActuator,GetIpoAdd);
 	KX_PYMETHOD_DOC(KX_IpoActuator,SetType);
-	KX_PYMETHOD_DOC(KX_IpoActuator,GetType);
+	KX_PYMETHOD_DOC_NOARGS(KX_IpoActuator,GetType);
 	KX_PYMETHOD_DOC(KX_IpoActuator,SetForceIpoActsLocal);
-	KX_PYMETHOD_DOC(KX_IpoActuator,GetForceIpoActsLocal);
+	KX_PYMETHOD_DOC_NOARGS(KX_IpoActuator,GetForceIpoActsLocal);
 	
 };
 
diff --git a/source/gameengine/Ketsji/KX_MaterialIpoController.cpp b/source/gameengine/Ketsji/KX_MaterialIpoController.cpp
index c0757a32b9c..2ce5d469380 100644
--- a/source/gameengine/Ketsji/KX_MaterialIpoController.cpp
+++ b/source/gameengine/Ketsji/KX_MaterialIpoController.cpp
@@ -37,6 +37,7 @@ bool KX_MaterialIpoController::Update(double currentTime)
 
 		//kxgameobj->SetObjectColor(m_rgba);
 		kxgameobj->UpdateMaterialData( 
+			m_matname_hash,
 			m_rgba, 
 			m_specrgb, 
 			m_hard, 
diff --git a/source/gameengine/Ketsji/KX_MaterialIpoController.h b/source/gameengine/Ketsji/KX_MaterialIpoController.h
index e76ddeefb04..4d2e258bf94 100644
--- a/source/gameengine/Ketsji/KX_MaterialIpoController.h
+++ b/source/gameengine/Ketsji/KX_MaterialIpoController.h
@@ -7,6 +7,8 @@
 #include "SG_Spatial.h"
 #include "KX_IInterpolator.h"
 
+#include "STR_String.h" //typedef dword
+
 class KX_MaterialIpoController : public SG_Controller
 {
 public:
@@ -23,10 +25,12 @@ private:
 	bool				m_modified;
 
 	double		        m_ipotime;
+	dword				m_matname_hash;
 public:
-	KX_MaterialIpoController() : 
+	KX_MaterialIpoController(dword matname_hash) : 
 				m_modified(true),
-				m_ipotime(0.0)
+				m_ipotime(0.0),
+				m_matname_hash(matname_hash)
 		{}
 	virtual ~KX_MaterialIpoController();
 	virtual	SG_Controller*	GetReplica(class SG_Node* destnode);
diff --git a/source/gameengine/Ketsji/KX_ObjectActuator.cpp b/source/gameengine/Ketsji/KX_ObjectActuator.cpp
index 9ac0b4d4703..5cd4d089c14 100644
--- a/source/gameengine/Ketsji/KX_ObjectActuator.cpp
+++ b/source/gameengine/Ketsji/KX_ObjectActuator.cpp
@@ -304,27 +304,27 @@ PyParentObject KX_ObjectActuator::Parents[] = {
 };
 
 PyMethodDef KX_ObjectActuator::Methods[] = {
-	{"getForce", (PyCFunction) KX_ObjectActuator::sPyGetForce, METH_VARARGS},
+	{"getForce", (PyCFunction) KX_ObjectActuator::sPyGetForce, METH_NOARGS},
 	{"setForce", (PyCFunction) KX_ObjectActuator::sPySetForce, METH_VARARGS},
-	{"getTorque", (PyCFunction) KX_ObjectActuator::sPyGetTorque, METH_VARARGS},
+	{"getTorque", (PyCFunction) KX_ObjectActuator::sPyGetTorque, METH_NOARGS},
 	{"setTorque", (PyCFunction) KX_ObjectActuator::sPySetTorque, METH_VARARGS},
-	{"getDLoc", (PyCFunction) KX_ObjectActuator::sPyGetDLoc, METH_VARARGS},
+	{"getDLoc", (PyCFunction) KX_ObjectActuator::sPyGetDLoc, METH_NOARGS},
 	{"setDLoc", (PyCFunction) KX_ObjectActuator::sPySetDLoc, METH_VARARGS},
-	{"getDRot", (PyCFunction) KX_ObjectActuator::sPyGetDRot, METH_VARARGS},
+	{"getDRot", (PyCFunction) KX_ObjectActuator::sPyGetDRot, METH_NOARGS},
 	{"setDRot", (PyCFunction) KX_ObjectActuator::sPySetDRot, METH_VARARGS},
-	{"getLinearVelocity", (PyCFunction) KX_ObjectActuator::sPyGetLinearVelocity, METH_VARARGS},
+	{"getLinearVelocity", (PyCFunction) KX_ObjectActuator::sPyGetLinearVelocity, METH_NOARGS},
 	{"setLinearVelocity", (PyCFunction) KX_ObjectActuator::sPySetLinearVelocity, METH_VARARGS},
-	{"getAngularVelocity", (PyCFunction) KX_ObjectActuator::sPyGetAngularVelocity, 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_VARARGS},
+	{"getDamping", (PyCFunction) KX_ObjectActuator::sPyGetDamping, METH_NOARGS},
 	{"setForceLimitX", (PyCFunction) KX_ObjectActuator::sPySetForceLimitX, METH_VARARGS},
-	{"getForceLimitX", (PyCFunction) KX_ObjectActuator::sPyGetForceLimitX, METH_VARARGS},
+	{"getForceLimitX", (PyCFunction) KX_ObjectActuator::sPyGetForceLimitX, METH_NOARGS},
 	{"setForceLimitY", (PyCFunction) KX_ObjectActuator::sPySetForceLimitY, METH_VARARGS},
-	{"getForceLimitY", (PyCFunction) KX_ObjectActuator::sPyGetForceLimitY, METH_VARARGS},
+	{"getForceLimitY", (PyCFunction) KX_ObjectActuator::sPyGetForceLimitY, METH_NOARGS},
 	{"setForceLimitZ", (PyCFunction) KX_ObjectActuator::sPySetForceLimitZ, METH_VARARGS},
-	{"getForceLimitZ", (PyCFunction) KX_ObjectActuator::sPyGetForceLimitZ, METH_VARARGS},
-	{"setPID", (PyCFunction) KX_ObjectActuator::sPyGetPID, METH_VARARGS},
+	{"getForceLimitZ", (PyCFunction) KX_ObjectActuator::sPyGetForceLimitZ, METH_NOARGS},
+	{"setPID", (PyCFunction) KX_ObjectActuator::sPyGetPID, METH_NOARGS},
 	{"getPID", (PyCFunction) KX_ObjectActuator::sPySetPID, METH_VARARGS},
 
 
@@ -340,9 +340,7 @@ PyObject* KX_ObjectActuator::_getattr(const STR_String& attr) {
 /* Removed! */
 
 /* 2. getForce                                                               */
-PyObject* KX_ObjectActuator::PyGetForce(PyObject* self, 
-										PyObject* args, 
-										PyObject* kwds)
+PyObject* KX_ObjectActuator::PyGetForce(PyObject* self)
 {
 	PyObject *retVal = PyList_New(4);
 
@@ -362,6 +360,7 @@ PyObject* KX_ObjectActuator::PySetForce(PyObject* self,
 	int bToggle = 0;
 	if (!PyArg_ParseTuple(args, "fffi", &vecArg[0], &vecArg[1], 
 						  &vecArg[2], &bToggle)) {
+		PyErr_SetString(PyExc_TypeError, "Invalid arguments");
 		return NULL;
 	}
 	m_force.setValue(vecArg);
@@ -371,9 +370,7 @@ PyObject* KX_ObjectActuator::PySetForce(PyObject* self,
 }
 
 /* 4. getTorque                                                              */
-PyObject* KX_ObjectActuator::PyGetTorque(PyObject* self, 
-										 PyObject* args, 
-										 PyObject* kwds)
+PyObject* KX_ObjectActuator::PyGetTorque(PyObject* self)
 {
 	PyObject *retVal = PyList_New(4);
 
@@ -393,6 +390,7 @@ PyObject* KX_ObjectActuator::PySetTorque(PyObject* self,
 	int bToggle = 0;
 	if (!PyArg_ParseTuple(args, "fffi", &vecArg[0], &vecArg[1], 
 						  &vecArg[2], &bToggle)) {
+		PyErr_SetString(PyExc_TypeError, "Invalid arguments");
 		return NULL;
 	}
 	m_torque.setValue(vecArg);
@@ -402,9 +400,7 @@ PyObject* KX_ObjectActuator::PySetTorque(PyObject* self,
 }
 
 /* 6. getDLoc                                                                */
-PyObject* KX_ObjectActuator::PyGetDLoc(PyObject* self, 
-									   PyObject* args, 
-									   PyObject* kwds)
+PyObject* KX_ObjectActuator::PyGetDLoc(PyObject* self)
 {
 	PyObject *retVal = PyList_New(4);
 
@@ -424,6 +420,7 @@ PyObject* KX_ObjectActuator::PySetDLoc(PyObject* self,
 	int bToggle = 0;
 	if(!PyArg_ParseTuple(args, "fffi", &vecArg[0], &vecArg[1], 
 						 &vecArg[2], &bToggle)) {
+		PyErr_SetString(PyExc_TypeError, "Invalid arguments");
 		return NULL;
 	}
 	m_dloc.setValue(vecArg);
@@ -433,9 +430,7 @@ PyObject* KX_ObjectActuator::PySetDLoc(PyObject* self,
 }
 
 /* 8. getDRot                                                                */
-PyObject* KX_ObjectActuator::PyGetDRot(PyObject* self, 
-									   PyObject* args, 
-									   PyObject* kwds)
+PyObject* KX_ObjectActuator::PyGetDRot(PyObject* self)
 {
 	PyObject *retVal = PyList_New(4);
 
@@ -455,6 +450,7 @@ PyObject* KX_ObjectActuator::PySetDRot(PyObject* self,
 	int bToggle = 0;
 	if (!PyArg_ParseTuple(args, "fffi", &vecArg[0], &vecArg[1], 
 						  &vecArg[2], &bToggle)) {
+		PyErr_SetString(PyExc_TypeError, "Invalid arguments");
 		return NULL;
 	}
 	m_drot.setValue(vecArg);
@@ -464,9 +460,7 @@ PyObject* KX_ObjectActuator::PySetDRot(PyObject* self,
 }
 
 /* 10. getLinearVelocity                                                 */
-PyObject* KX_ObjectActuator::PyGetLinearVelocity(PyObject* self, 
-												 PyObject* args, 
-												 PyObject* kwds) {
+PyObject* KX_ObjectActuator::PyGetLinearVelocity(PyObject* self) {
 	PyObject *retVal = PyList_New(4);
 
 	PyList_SetItem(retVal, 0, PyFloat_FromDouble(m_linear_velocity[0]));
@@ -485,6 +479,7 @@ PyObject* KX_ObjectActuator::PySetLinearVelocity(PyObject* self,
 	int bToggle = 0;
 	if (!PyArg_ParseTuple(args, "fffi", &vecArg[0], &vecArg[1], 
 						  &vecArg[2], &bToggle)) {
+		PyErr_SetString(PyExc_TypeError, "Invalid arguments");
 		return NULL;
 	}
 	m_linear_velocity.setValue(vecArg);
@@ -495,9 +490,7 @@ PyObject* KX_ObjectActuator::PySetLinearVelocity(PyObject* self,
 
 
 /* 12. getAngularVelocity                                                */
-PyObject* KX_ObjectActuator::PyGetAngularVelocity(PyObject* self, 
-												  PyObject* args, 
-												  PyObject* kwds) {
+PyObject* KX_ObjectActuator::PyGetAngularVelocity(PyObject* self) {
 	PyObject *retVal = PyList_New(4);
 
 	PyList_SetItem(retVal, 0, PyFloat_FromDouble(m_angular_velocity[0]));
@@ -515,6 +508,7 @@ PyObject* KX_ObjectActuator::PySetAngularVelocity(PyObject* self,
 	int bToggle = 0;
 	if (!PyArg_ParseTuple(args, "fffi", &vecArg[0], &vecArg[1], 
 						  &vecArg[2], &bToggle)) {
+		PyErr_SetString(PyExc_TypeError, "Invalid arguments");
 		return NULL;
 	}
 	m_angular_velocity.setValue(vecArg);
@@ -529,6 +523,7 @@ PyObject* KX_ObjectActuator::PySetDamping(PyObject* self,
 										  PyObject* kwds) {
 	int damping = 0;
 	if (!PyArg_ParseTuple(args, "i", &damping) || damping < 0 || damping > 1000) {
+		PyErr_SetString(PyExc_TypeError, "Invalid arguments");
 		return NULL;
 	}
 	m_damping = damping;
@@ -536,15 +531,11 @@ PyObject* KX_ObjectActuator::PySetDamping(PyObject* self,
 }
 
 /* 13. getVelocityDamping                                                */
-PyObject* KX_ObjectActuator::PyGetDamping(PyObject* self, 
-										  PyObject* args, 
-										  PyObject* kwds) {
+PyObject* KX_ObjectActuator::PyGetDamping(PyObject* self) {
 	return Py_BuildValue("i",m_damping);
 }
 /* 6. getForceLimitX                                                                */
-PyObject* KX_ObjectActuator::PyGetForceLimitX(PyObject* self, 
-											  PyObject* args, 
-											  PyObject* kwds)
+PyObject* KX_ObjectActuator::PyGetForceLimitX(PyObject* self)
 {
 	PyObject *retVal = PyList_New(3);
 
@@ -562,6 +553,7 @@ PyObject* KX_ObjectActuator::PySetForceLimitX(PyObject* self,
 	float vecArg[2];
 	int bToggle = 0;
 	if(!PyArg_ParseTuple(args, "ffi", &vecArg[0], &vecArg[1], &bToggle)) {
+		PyErr_SetString(PyExc_TypeError, "Invalid arguments");
 		return NULL;
 	}
 	m_drot[0] = vecArg[0];
@@ -571,9 +563,7 @@ PyObject* KX_ObjectActuator::PySetForceLimitX(PyObject* self,
 }
 
 /* 6. getForceLimitY                                                                */
-PyObject* KX_ObjectActuator::PyGetForceLimitY(PyObject* self, 
-											  PyObject* args, 
-											  PyObject* kwds)
+PyObject* KX_ObjectActuator::PyGetForceLimitY(PyObject* self)
 {
 	PyObject *retVal = PyList_New(3);
 
@@ -591,6 +581,7 @@ PyObject* KX_ObjectActuator::PySetForceLimitY(PyObject* self,
 	float vecArg[2];
 	int bToggle = 0;
 	if(!PyArg_ParseTuple(args, "ffi", &vecArg[0], &vecArg[1], &bToggle)) {
+		PyErr_SetString(PyExc_TypeError, "Invalid arguments");
 		return NULL;
 	}
 	m_drot[1] = vecArg[0];
@@ -600,9 +591,7 @@ PyObject* KX_ObjectActuator::PySetForceLimitY(PyObject* self,
 }
 
 /* 6. getForceLimitZ                                                                */
-PyObject* KX_ObjectActuator::PyGetForceLimitZ(PyObject* self, 
-											  PyObject* args, 
-											  PyObject* kwds)
+PyObject* KX_ObjectActuator::PyGetForceLimitZ(PyObject* self)
 {
 	PyObject *retVal = PyList_New(3);
 
@@ -620,6 +609,7 @@ PyObject* KX_ObjectActuator::PySetForceLimitZ(PyObject* self,
 	float vecArg[2];
 	int bToggle = 0;
 	if(!PyArg_ParseTuple(args, "ffi", &vecArg[0], &vecArg[1], &bToggle)) {
+		PyErr_SetString(PyExc_TypeError, "Invalid arguments");
 		return NULL;
 	}
 	m_drot[2] = vecArg[0];
@@ -629,9 +619,7 @@ PyObject* KX_ObjectActuator::PySetForceLimitZ(PyObject* self,
 }
 
 /* 4. getPID                                                              */
-PyObject* KX_ObjectActuator::PyGetPID(PyObject* self, 
-									  PyObject* args, 
-									  PyObject* kwds)
+PyObject* KX_ObjectActuator::PyGetPID(PyObject* self)
 {
 	PyObject *retVal = PyList_New(3);
 
@@ -648,6 +636,7 @@ PyObject* KX_ObjectActuator::PySetPID(PyObject* self,
 {
 	float vecArg[3];
 	if (!PyArg_ParseTuple(args, "fff", &vecArg[0], &vecArg[1], &vecArg[2])) {
+		PyErr_SetString(PyExc_TypeError, "Invalid arguments");
 		return NULL;
 	}
 	m_torque.setValue(vecArg);
diff --git a/source/gameengine/Ketsji/KX_ObjectActuator.h b/source/gameengine/Ketsji/KX_ObjectActuator.h
index bb74756551f..aa686f41233 100644
--- a/source/gameengine/Ketsji/KX_ObjectActuator.h
+++ b/source/gameengine/Ketsji/KX_ObjectActuator.h
@@ -155,27 +155,27 @@ public:
 	
 	virtual PyObject* _getattr(const STR_String& attr);
 
-	KX_PYMETHOD(KX_ObjectActuator,GetForce);
+	KX_PYMETHOD_NOARGS(KX_ObjectActuator,GetForce);
 	KX_PYMETHOD(KX_ObjectActuator,SetForce);
-	KX_PYMETHOD(KX_ObjectActuator,GetTorque);
+	KX_PYMETHOD_NOARGS(KX_ObjectActuator,GetTorque);
 	KX_PYMETHOD(KX_ObjectActuator,SetTorque);
-	KX_PYMETHOD(KX_ObjectActuator,GetDLoc);
+	KX_PYMETHOD_NOARGS(KX_ObjectActuator,GetDLoc);
 	KX_PYMETHOD(KX_ObjectActuator,SetDLoc);
-	KX_PYMETHOD(KX_ObjectActuator,GetDRot);
+	KX_PYMETHOD_NOARGS(KX_ObjectActuator,GetDRot);
 	KX_PYMETHOD(KX_ObjectActuator,SetDRot);
-	KX_PYMETHOD(KX_ObjectActuator,GetLinearVelocity);
+	KX_PYMETHOD_NOARGS(KX_ObjectActuator,GetLinearVelocity);
 	KX_PYMETHOD(KX_ObjectActuator,SetLinearVelocity);
-	KX_PYMETHOD(KX_ObjectActuator,GetAngularVelocity);
+	KX_PYMETHOD_NOARGS(KX_ObjectActuator,GetAngularVelocity);
 	KX_PYMETHOD(KX_ObjectActuator,SetAngularVelocity);
 	KX_PYMETHOD(KX_ObjectActuator,SetDamping);
-	KX_PYMETHOD(KX_ObjectActuator,GetDamping);
-	KX_PYMETHOD(KX_ObjectActuator,GetForceLimitX);
+	KX_PYMETHOD_NOARGS(KX_ObjectActuator,GetDamping);
+	KX_PYMETHOD_NOARGS(KX_ObjectActuator,GetForceLimitX);
 	KX_PYMETHOD(KX_ObjectActuator,SetForceLimitX);
-	KX_PYMETHOD(KX_ObjectActuator,GetForceLimitY);
+	KX_PYMETHOD_NOARGS(KX_ObjectActuator,GetForceLimitY);
 	KX_PYMETHOD(KX_ObjectActuator,SetForceLimitY);
-	KX_PYMETHOD(KX_ObjectActuator,GetForceLimitZ);
+	KX_PYMETHOD_NOARGS(KX_ObjectActuator,GetForceLimitZ);
 	KX_PYMETHOD(KX_ObjectActuator,SetForceLimitZ);
-	KX_PYMETHOD(KX_ObjectActuator,GetPID);
+	KX_PYMETHOD_NOARGS(KX_ObjectActuator,GetPID);
 	KX_PYMETHOD(KX_ObjectActuator,SetPID);
 };
 
diff --git a/source/gameengine/Ketsji/KX_OdePhysicsController.cpp b/source/gameengine/Ketsji/KX_OdePhysicsController.cpp
index 8b0a6dafc22..05feb11a2bc 100644
--- a/source/gameengine/Ketsji/KX_OdePhysicsController.cpp
+++ b/source/gameengine/Ketsji/KX_OdePhysicsController.cpp
@@ -133,8 +133,9 @@ void	KX_OdePhysicsController::SetLinearVelocity(const MT_Vector3& lin_vel,bool l
 	ODEPhysicsController::SetLinearVelocity(lin_vel[0],lin_vel[1],lin_vel[2],local);
 }
 
-void KX_OdePhysicsController::setOrientation(const MT_Quaternion& orn)
+void KX_OdePhysicsController::setOrientation(const MT_Matrix3x3& rot)
 {
+	MT_Quaternion orn = rot.getRotation();
 	ODEPhysicsController::setOrientation(orn[0],orn[1],orn[2],orn[3]);
 }
 
diff --git a/source/gameengine/Ketsji/KX_OdePhysicsController.h b/source/gameengine/Ketsji/KX_OdePhysicsController.h
index c96c71c81f9..18f9edc6835 100644
--- a/source/gameengine/Ketsji/KX_OdePhysicsController.h
+++ b/source/gameengine/Ketsji/KX_OdePhysicsController.h
@@ -67,7 +67,7 @@ public:
 	virtual void	SetLinearVelocity(const MT_Vector3& lin_vel,bool local);
 	virtual void		resolveCombinedVelocities(float linvelX,float linvelY,float linvelZ,float angVelX,float angVelY,float angVelZ);
 	virtual	void		getOrientation(MT_Quaternion& orn);
-	virtual	void setOrientation(const MT_Quaternion& orn);
+	virtual	void setOrientation(const MT_Matrix3x3& orn);
 	virtual	void setPosition(const MT_Point3& pos);
 	virtual	void setScaling(const MT_Vector3& scaling);
 	virtual	MT_Scalar	GetMass();
diff --git a/source/gameengine/Ketsji/KX_ParentActuator.cpp b/source/gameengine/Ketsji/KX_ParentActuator.cpp
index 8b379bcd44f..fd1b56838e2 100644
--- a/source/gameengine/Ketsji/KX_ParentActuator.cpp
+++ b/source/gameengine/Ketsji/KX_ParentActuator.cpp
@@ -46,19 +46,22 @@
 
 KX_ParentActuator::KX_ParentActuator(SCA_IObject *gameobj, 
 									 int mode,
-									 CValue *ob,
+									 SCA_IObject *ob,
 									 PyTypeObject* T)
 	: SCA_IActuator(gameobj, T),
 	  m_mode(mode),
 	  m_ob(ob)
 {
+	if (m_ob)
+		m_ob->RegisterActuator(this);
 } 
 
 
 
 KX_ParentActuator::~KX_ParentActuator()
 {
-	/* intentionally empty */ 
+	if (m_ob)
+		m_ob->UnregisterActuator(this);
 } 
 
 
@@ -73,6 +76,36 @@ CValue* KX_ParentActuator::GetReplica()
 	return replica;
 }
 
+void KX_ParentActuator::ProcessReplica()
+{
+	if (m_ob)
+		m_ob->RegisterActuator(this);
+	SCA_IActuator::ProcessReplica();
+}
+
+
+bool KX_ParentActuator::UnlinkObject(SCA_IObject* clientobj)
+{
+	if (clientobj == m_ob)
+	{
+		// this object is being deleted, we cannot continue to track it.
+		m_ob = NULL;
+		return true;
+	}
+	return false;
+}
+
+void KX_ParentActuator::Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map)
+{
+	void **h_obj = (*obj_map)[m_ob];
+	if (h_obj) {
+		if (m_ob)
+			m_ob->UnregisterActuator(this);
+		m_ob = (SCA_IObject*)(*h_obj);
+		m_ob->RegisterActuator(this);
+	}
+}
+
 
 
 bool KX_ParentActuator::Update()
@@ -87,7 +120,8 @@ bool KX_ParentActuator::Update()
 	KX_Scene *scene = PHY_GetActiveScene();
 	switch (m_mode) {
 		case KX_PARENT_SET:
-			obj->SetParent(scene, (KX_GameObject*)m_ob);
+			if (m_ob)
+				obj->SetParent(scene, (KX_GameObject*)m_ob);
 			break;
 		case KX_PARENT_REMOVE:
 			obj->RemoveParent(scene);
@@ -148,7 +182,11 @@ PyObject* KX_ParentActuator::PySetObject(PyObject* self, PyObject* args, PyObjec
 	PyObject* gameobj;
 	if (PyArg_ParseTuple(args, "O!", &KX_GameObject::Type, &gameobj))
 	{
-		m_ob = (CValue*)gameobj;
+		if (m_ob != NULL)
+			m_ob->UnregisterActuator(this);
+		m_ob = (SCA_IObject*)gameobj;
+		if (m_ob)
+			m_ob->RegisterActuator(this);
 		Py_Return;
 	}
 	PyErr_Clear();
@@ -156,10 +194,13 @@ PyObject* KX_ParentActuator::PySetObject(PyObject* self, PyObject* args, PyObjec
 	char* objectname;
 	if (PyArg_ParseTuple(args, "s", &objectname))
 	{
-		CValue *object = (CValue*)SCA_ILogicBrick::m_sCurrentLogicManager->GetGameObjectByName(STR_String(objectname));
+		SCA_IObject *object = (SCA_IObject*)SCA_ILogicBrick::m_sCurrentLogicManager->GetGameObjectByName(STR_String(objectname));
 		if(object)
 		{
+			if (m_ob != NULL)
+				m_ob->UnregisterActuator(this);
 			m_ob = object;
+			m_ob->RegisterActuator(this);
 			Py_Return;
 		}
 	}
diff --git a/source/gameengine/Ketsji/KX_ParentActuator.h b/source/gameengine/Ketsji/KX_ParentActuator.h
index 86dcd4e6c12..93b07cd424b 100644
--- a/source/gameengine/Ketsji/KX_ParentActuator.h
+++ b/source/gameengine/Ketsji/KX_ParentActuator.h
@@ -47,7 +47,7 @@ class KX_ParentActuator : public SCA_IActuator
 	int m_mode;
 	
 	/** Object to set as parent */
-	CValue *m_ob;
+	SCA_IObject *m_ob;
 	
 	
 
@@ -62,12 +62,15 @@ class KX_ParentActuator : public SCA_IActuator
  
 	KX_ParentActuator(class SCA_IObject* gameobj,
 						int mode,
-						CValue *ob,
+						SCA_IObject *ob,
 						PyTypeObject* T=&Type);
 	virtual ~KX_ParentActuator();
 	virtual bool Update();
 	
 	virtual CValue* GetReplica();
+	virtual void ProcessReplica();
+	virtual void Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map);
+	virtual bool UnlinkObject(SCA_IObject* clientobj);
 	
 	/* --------------------------------------------------------------------- */
 	/* Python interface ---------------------------------------------------- */
diff --git a/source/gameengine/Ketsji/KX_PyMath.h b/source/gameengine/Ketsji/KX_PyMath.h
index e1715c9275f..4e383e9b3d4 100644
--- a/source/gameengine/Ketsji/KX_PyMath.h
+++ b/source/gameengine/Ketsji/KX_PyMath.h
@@ -84,7 +84,10 @@ bool PyMatTo(PyObject* pymat, T& mat)
 		}
 	} else 
 		noerror = false;
-	 
+	
+	if (noerror==false)
+		PyErr_SetString(PyExc_TypeError, "could not be converted to a matrix (sequence of sequences)");
+	
 	return noerror;
 }
 
@@ -97,9 +100,13 @@ bool PyVecTo(PyObject* pyval, T& vec)
 	if (PySequence_Check(pyval))
 	{
 		unsigned int numitems = PySequence_Size(pyval);
-		if (numitems != Size(vec))
+		if (numitems != Size(vec)) {
+			char err[128];
+			sprintf(err, "error setting vector, %d args, should be %d", numitems, Size(vec));
+			PyErr_SetString(PyExc_AttributeError, err);
 			return false;
-			
+		}
+		
 		for (unsigned int x = 0; x < numitems; x++)
 		{
 			PyObject *item = PySequence_GetItem(pyval, x); /* new ref */
@@ -107,7 +114,17 @@ bool PyVecTo(PyObject* pyval, T& vec)
 			Py_DECREF(item);
 		}
 		
+		if (PyErr_Occurred()) {
+			PyErr_SetString(PyExc_AttributeError, "one or more of the items in the sequence was not a float");
+			return false;
+		}
+		
 		return true;
+	} else
+	{
+		char err[128];
+		sprintf(err, "not a sequence type, expected a sequence of numbers size %d", Size(vec));
+		PyErr_SetString(PyExc_AttributeError, err);
 	}
 	
 	return false;
diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp
index 61ed8b6a8e4..b66c3e42606 100644
--- a/source/gameengine/Ketsji/KX_PythonInit.cpp
+++ b/source/gameengine/Ketsji/KX_PythonInit.cpp
@@ -756,6 +756,15 @@ PyObject* initGameLogic(KX_Scene* scene) // quick hack to get gravity hook
 	KX_MACRO_addTypesToDict(d, KX_CONSTRAINTACT_ROTX, KX_ConstraintActuator::KX_ACT_CONSTRAINT_ROTX);
 	KX_MACRO_addTypesToDict(d, KX_CONSTRAINTACT_ROTY, KX_ConstraintActuator::KX_ACT_CONSTRAINT_ROTY);
 	KX_MACRO_addTypesToDict(d, KX_CONSTRAINTACT_ROTZ, KX_ConstraintActuator::KX_ACT_CONSTRAINT_ROTZ);
+	KX_MACRO_addTypesToDict(d, KX_CONSTRAINTACT_DIRPX, KX_ConstraintActuator::KX_ACT_CONSTRAINT_DIRPX);
+	KX_MACRO_addTypesToDict(d, KX_CONSTRAINTACT_DIRPY, KX_ConstraintActuator::KX_ACT_CONSTRAINT_DIRPY);
+	KX_MACRO_addTypesToDict(d, KX_CONSTRAINTACT_DIRPY, KX_ConstraintActuator::KX_ACT_CONSTRAINT_DIRPY);
+	KX_MACRO_addTypesToDict(d, KX_CONSTRAINTACT_DIRNX, KX_ConstraintActuator::KX_ACT_CONSTRAINT_DIRNX);
+	KX_MACRO_addTypesToDict(d, KX_CONSTRAINTACT_DIRNY, KX_ConstraintActuator::KX_ACT_CONSTRAINT_DIRNY);
+	KX_MACRO_addTypesToDict(d, KX_CONSTRAINTACT_DIRNY, KX_ConstraintActuator::KX_ACT_CONSTRAINT_DIRNY);
+	KX_MACRO_addTypesToDict(d, KX_CONSTRAINTACT_ORIX, KX_ConstraintActuator::KX_ACT_CONSTRAINT_ORIX);
+	KX_MACRO_addTypesToDict(d, KX_CONSTRAINTACT_ORIY, KX_ConstraintActuator::KX_ACT_CONSTRAINT_ORIY);
+	KX_MACRO_addTypesToDict(d, KX_CONSTRAINTACT_ORIZ, KX_ConstraintActuator::KX_ACT_CONSTRAINT_ORIZ);
 
 	/* 4. Ipo actuator, simple part                                            */
 	KX_MACRO_addTypesToDict(d, KX_IPOACT_PLAY,     KX_IpoActuator::KX_ACT_IPO_PLAY);
diff --git a/source/gameengine/Ketsji/KX_RadarSensor.cpp b/source/gameengine/Ketsji/KX_RadarSensor.cpp
index bf2ba18f490..de4979ac4c9 100644
--- a/source/gameengine/Ketsji/KX_RadarSensor.cpp
+++ b/source/gameengine/Ketsji/KX_RadarSensor.cpp
@@ -176,8 +176,10 @@ void KX_RadarSensor::SynchronizeTransform()
 
 	if (m_physCtrl)
 	{
-		m_physCtrl->setPosition(trans.getOrigin().x(),trans.getOrigin().y(),trans.getOrigin().z());
-		m_physCtrl->setOrientation(trans.getRotation().x(),trans.getRotation().y(),trans.getRotation().z(),trans.getRotation().w());
+		MT_Quaternion orn = trans.getRotation();
+		MT_Point3 pos = trans.getOrigin();
+		m_physCtrl->setPosition(pos[0],pos[1],pos[2]);
+		m_physCtrl->setOrientation(orn[0],orn[1],orn[2],orn[3]);
 		m_physCtrl->calcXform();
 	}
 
diff --git a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
index e5ee4cbddf1..e36891b56f4 100644
--- a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
+++ b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
@@ -137,6 +137,17 @@ bool KX_SCA_AddObjectActuator::UnlinkObject(SCA_IObject* clientobj)
 	return false;
 }
 
+void KX_SCA_AddObjectActuator::Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map)
+{
+	void **h_obj = (*obj_map)[m_OriginalObject];
+	if (h_obj) {
+		if (m_OriginalObject)
+			m_OriginalObject->UnregisterActuator(this);
+		m_OriginalObject = (SCA_IObject*)(*h_obj);
+		m_OriginalObject->RegisterActuator(this);
+	}
+}
+
 
 /* ------------------------------------------------------------------------- */
 /* Python functions                                                          */
diff --git a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
index 42123b94a68..1359f39278d 100644
--- a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
+++ b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
@@ -95,6 +95,9 @@ public:
 	virtual bool 
 	UnlinkObject(SCA_IObject* clientobj);
 
+	virtual void 
+	Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map);
+
 	virtual bool 
 	Update();
 
diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp
index 200883a094c..c374b9d6fd1 100644
--- a/source/gameengine/Ketsji/KX_Scene.cpp
+++ b/source/gameengine/Ketsji/KX_Scene.cpp
@@ -712,8 +712,12 @@ void KX_Scene::DupliGroupRecurse(CValue* obj, int level)
 
 		if (replica->GetPhysicsController())
 		{
-			replica->GetPhysicsController()->setPosition(newpos);
-			replica->GetPhysicsController()->setOrientation(newori.getRotation());
+			// not required, already done in NodeSetLocalOrientation..
+			//replica->GetPhysicsController()->setPosition(newpos);
+			//replica->GetPhysicsController()->setOrientation(newori.getRotation());
+			// Scaling has been set relatively hereabove, this does not 
+			// set the scaling of the controller. I don't know why it's just the
+			// relative scale and not the full scale that has to be put here...
 			replica->GetPhysicsController()->setScaling(newscale);
 		}
 
@@ -724,21 +728,23 @@ void KX_Scene::DupliGroupRecurse(CValue* obj, int level)
 		replica->Release();
 	}
 
-	//	relink any pointers as necessary, sort of a temporary solution
+	// the logic must be replicated first because we need
+	// the new logic bricks before relinking
 	vector<KX_GameObject*>::iterator git;
 	for (git = m_logicHierarchicalGameObjects.begin();!(git==m_logicHierarchicalGameObjects.end());++git)
-	{
-		(*git)->Relink(&m_map_gameobject_to_replica);
-		// add the object in the layer of the parent
-		(*git)->SetLayer(groupobj->GetLayer());
-	}
-
-	// now replicate logic
-	for (git = m_logicHierarchicalGameObjects.begin();!(git==m_logicHierarchicalGameObjects.end());++git)
 	{
 		(*git)->ReParentLogic();
 	}
 	
+	//	relink any pointers as necessary, sort of a temporary solution
+	for (git = m_logicHierarchicalGameObjects.begin();!(git==m_logicHierarchicalGameObjects.end());++git)
+	{
+		// this will also relink the actuator to objects within the hierarchy
+		(*git)->Relink(&m_map_gameobject_to_replica);
+		// add the object in the layer of the parent
+		(*git)->SetLayer(groupobj->GetLayer());
+	}
+
 	// replicate crosslinks etc. between logic bricks
 	for (git = m_logicHierarchicalGameObjects.begin();!(git==m_logicHierarchicalGameObjects.end());++git)
 	{
@@ -805,21 +811,22 @@ SCA_IObject* KX_Scene::AddReplicaObject(class CValue* originalobject,
 			replica->GetSGNode()->AddChild(childreplicanode);
 	}
 
-	//	relink any pointers as necessary, sort of a temporary solution
-	vector<KX_GameObject*>::iterator git;
-	for (git = m_logicHierarchicalGameObjects.begin();!(git==m_logicHierarchicalGameObjects.end());++git)
-	{
-		(*git)->Relink(&m_map_gameobject_to_replica);
-		// add the object in the layer of the parent
-		(*git)->SetLayer(parentobj->GetLayer());
-	}
-
 	// now replicate logic
+	vector<KX_GameObject*>::iterator git;
 	for (git = m_logicHierarchicalGameObjects.begin();!(git==m_logicHierarchicalGameObjects.end());++git)
 	{
 		(*git)->ReParentLogic();
 	}
 	
+	//	relink any pointers as necessary, sort of a temporary solution
+	for (git = m_logicHierarchicalGameObjects.begin();!(git==m_logicHierarchicalGameObjects.end());++git)
+	{
+		// this will also relink the actuators in the hierarchy
+		(*git)->Relink(&m_map_gameobject_to_replica);
+		// add the object in the layer of the parent
+		(*git)->SetLayer(parentobj->GetLayer());
+	}
+
 	// replicate crosslinks etc. between logic bricks
 	for (git = m_logicHierarchicalGameObjects.begin();!(git==m_logicHierarchicalGameObjects.end());++git)
 	{
@@ -840,8 +847,9 @@ SCA_IObject* KX_Scene::AddReplicaObject(class CValue* originalobject,
 
 	if (replica->GetPhysicsController())
 	{
-		replica->GetPhysicsController()->setPosition(newpos);
-		replica->GetPhysicsController()->setOrientation(newori.getRotation());
+		// not needed, already done in NodeSetLocalPosition()
+		//replica->GetPhysicsController()->setPosition(newpos);
+		//replica->GetPhysicsController()->setOrientation(newori.getRotation());
 		replica->GetPhysicsController()->setScaling(newscale);
 	}
 
diff --git a/source/gameengine/Ketsji/KX_SceneActuator.cpp b/source/gameengine/Ketsji/KX_SceneActuator.cpp
index 8f7cffd506f..d6164dc812a 100644
--- a/source/gameengine/Ketsji/KX_SceneActuator.cpp
+++ b/source/gameengine/Ketsji/KX_SceneActuator.cpp
@@ -58,13 +58,16 @@ KX_SceneActuator::KX_SceneActuator(SCA_IObject *gameobj,
 	m_KetsjiEngine=ketsjiEngine;
 	m_camera = camera;
 	m_nextSceneName = nextSceneName;
+	if (m_camera)
+		m_camera->RegisterActuator(this);
 } /* End of constructor */
 
 
 
 KX_SceneActuator::~KX_SceneActuator()
 { 
-	// there's nothing to be done here, really....
+	if (m_camera)
+		m_camera->UnregisterActuator(this);
 } /* end of destructor */
 
 
@@ -79,6 +82,34 @@ CValue* KX_SceneActuator::GetReplica()
 	return replica;
 }
 
+void KX_SceneActuator::ProcessReplica()
+{
+	if (m_camera)
+		m_camera->RegisterActuator(this);
+	SCA_IActuator::ProcessReplica();
+}
+
+bool KX_SceneActuator::UnlinkObject(SCA_IObject* clientobj)
+{
+	if (clientobj == (SCA_IObject*)m_camera)
+	{
+		// this object is being deleted, we cannot continue to track it.
+		m_camera = NULL;
+		return true;
+	}
+	return false;
+}
+
+void KX_SceneActuator::Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map)
+{
+	void **h_obj = (*obj_map)[m_camera];
+	if (h_obj) {
+		if (m_camera)
+			m_camera->UnregisterActuator(this);
+		m_camera = (KX_Camera*)(*h_obj);
+		m_camera->RegisterActuator(this);
+	}
+}
 
 
 bool KX_SceneActuator::Update()
@@ -332,7 +363,11 @@ PyObject* KX_SceneActuator::PySetCamera(PyObject* self,
 	PyObject *cam;
 	if (PyArg_ParseTuple(args, "O!", &KX_Camera::Type, &cam))
 	{
+		if (m_camera)
+			m_camera->UnregisterActuator(this);
 		m_camera = (KX_Camera*) cam;
+		if (m_camera)
+			m_camera->RegisterActuator(this);
 		Py_Return;
 	}
 	PyErr_Clear();
@@ -345,7 +380,13 @@ PyObject* KX_SceneActuator::PySetCamera(PyObject* self,
 	}
 
 	KX_Camera *camOb = FindCamera(camName);
-	if (camOb) m_camera = camOb;
+	if (camOb) 
+	{
+		if (m_camera)
+			m_camera->UnregisterActuator(this);
+		m_camera = camOb;
+		m_camera->RegisterActuator(this);
+	}
 
 	Py_Return;
 }
diff --git a/source/gameengine/Ketsji/KX_SceneActuator.h b/source/gameengine/Ketsji/KX_SceneActuator.h
index cfc79b93f8e..55aaf629d7c 100644
--- a/source/gameengine/Ketsji/KX_SceneActuator.h
+++ b/source/gameengine/Ketsji/KX_SceneActuator.h
@@ -82,6 +82,9 @@ class KX_SceneActuator : public SCA_IActuator
 	virtual ~KX_SceneActuator();
 
 	virtual CValue* GetReplica();
+	virtual void ProcessReplica();
+	virtual bool UnlinkObject(SCA_IObject* clientobj);
+	virtual void Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map);
 
 	virtual bool Update();
 	
diff --git a/source/gameengine/Ketsji/KX_SumoPhysicsController.cpp b/source/gameengine/Ketsji/KX_SumoPhysicsController.cpp
index ffb078b346e..4032a795ce3 100644
--- a/source/gameengine/Ketsji/KX_SumoPhysicsController.cpp
+++ b/source/gameengine/Ketsji/KX_SumoPhysicsController.cpp
@@ -170,8 +170,9 @@ void	KX_SumoPhysicsController::setMargin(float collisionMargin)
 }
 
 
-void KX_SumoPhysicsController::setOrientation(const MT_Quaternion& orn)
+void KX_SumoPhysicsController::setOrientation(const MT_Matrix3x3& rot)
 {
+	MT_Quaternion orn = rot.getRotation();
 	SumoPhysicsController::setOrientation(
 		orn[0],orn[1],orn[2],orn[3]);
 
diff --git a/source/gameengine/Ketsji/KX_SumoPhysicsController.h b/source/gameengine/Ketsji/KX_SumoPhysicsController.h
index 33666036c0d..1dd930bf3d9 100644
--- a/source/gameengine/Ketsji/KX_SumoPhysicsController.h
+++ b/source/gameengine/Ketsji/KX_SumoPhysicsController.h
@@ -79,7 +79,7 @@ public:
 	void	SuspendDynamics(bool);
 	void	RestoreDynamics();
 	virtual	void	getOrientation(MT_Quaternion& orn);
-	virtual	void setOrientation(const MT_Quaternion& orn);
+	virtual	void setOrientation(const MT_Matrix3x3& orn);
 	
 	virtual	void setPosition(const MT_Point3& pos);
 	virtual	void setScaling(const MT_Vector3& scaling);
diff --git a/source/gameengine/Ketsji/KX_TrackToActuator.cpp b/source/gameengine/Ketsji/KX_TrackToActuator.cpp
index 731a610c2eb..d4bd109de1a 100644
--- a/source/gameengine/Ketsji/KX_TrackToActuator.cpp
+++ b/source/gameengine/Ketsji/KX_TrackToActuator.cpp
@@ -146,19 +146,19 @@ void compatible_eulFast(float *eul, float *oldrot)
 {
 	float dx, dy, dz;
 	
-	/* verschillen van ong 360 graden corrigeren */
+	/* angular difference of 360 degrees */
 
 	dx= eul[0] - oldrot[0];
 	dy= eul[1] - oldrot[1];
 	dz= eul[2] - oldrot[2];
 
-	if( fabs(dx) > 5.1) {
+	if( fabs(dx) > MT_PI) {
 		if(dx > 0.0) eul[0] -= MT_2_PI; else eul[0]+= MT_2_PI;
 	}
-	if( fabs(dy) > 5.1) {
+	if( fabs(dy) > MT_PI) {
 		if(dy > 0.0) eul[1] -= MT_2_PI; else eul[1]+= MT_2_PI;
 	}
-	if( fabs(dz) > 5.1 ) {
+	if( fabs(dz) > MT_PI ) {
 		if(dz > 0.0) eul[2] -= MT_2_PI; else eul[2]+= MT_2_PI;
 	}
 }
@@ -210,6 +210,18 @@ bool KX_TrackToActuator::UnlinkObject(SCA_IObject* clientobj)
 	return false;
 }
 
+void KX_TrackToActuator::Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map)
+{
+	void **h_obj = (*obj_map)[m_object];
+	if (h_obj) {
+		if (m_object)
+			m_object->UnregisterActuator(this);
+		m_object = (SCA_IObject*)(*h_obj);
+		m_object->RegisterActuator(this);
+	}
+}
+
+
 bool KX_TrackToActuator::Update(double curtime, bool frame)
 {
 	bool result = false;	
diff --git a/source/gameengine/Ketsji/KX_TrackToActuator.h b/source/gameengine/Ketsji/KX_TrackToActuator.h
index a03aa115baa..1d1cf46d21b 100644
--- a/source/gameengine/Ketsji/KX_TrackToActuator.h
+++ b/source/gameengine/Ketsji/KX_TrackToActuator.h
@@ -68,6 +68,7 @@ class KX_TrackToActuator : public SCA_IActuator
 
 	virtual void ProcessReplica();
 	virtual bool UnlinkObject(SCA_IObject* clientobj);
+	virtual void Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map);
 	virtual bool Update(double curtime, bool frame);
 
 	/* Python part */
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
index e444c4c73be..5c70b071661 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
@@ -337,12 +337,33 @@ void		CcdPhysicsController::setOrientation(float quatImag0,float quatImag1,float
 		{
 			m_body->setCollisionFlags(m_body->getCollisionFlags() | btCollisionObject::CF_KINEMATIC_OBJECT);
 		}
-
-		m_MotionState->setWorldOrientation(quatImag0,quatImag1,quatImag2,quatReal);
+		// not required
+		//m_MotionState->setWorldOrientation(quatImag0,quatImag1,quatImag2,quatReal);
 		btTransform xform  = m_body->getCenterOfMassTransform();
 		xform.setRotation(btQuaternion(quatImag0,quatImag1,quatImag2,quatReal));
 		m_body->setCenterOfMassTransform(xform);
-		m_bulletMotionState->setWorldTransform(xform);
+		// not required
+		//m_bulletMotionState->setWorldTransform(xform);
+	}
+
+}
+
+void CcdPhysicsController::setWorldOrientation(const btMatrix3x3& orn)
+{
+	if (m_body)
+	{
+		m_body->activate(true);
+		if (m_body->isStaticObject())
+		{
+			m_body->setCollisionFlags(m_body->getCollisionFlags() | btCollisionObject::CF_KINEMATIC_OBJECT);
+		}
+		// not required
+		//m_MotionState->setWorldOrientation(quatImag0,quatImag1,quatImag2,quatReal);
+		btTransform xform  = m_body->getCenterOfMassTransform();
+		xform.setBasis(orn);
+		m_body->setCenterOfMassTransform(xform);
+		// not required
+		//m_bulletMotionState->setWorldTransform(xform);
 	}
 
 }
@@ -356,12 +377,13 @@ void		CcdPhysicsController::setPosition(float posX,float posY,float posZ)
 		{
 			m_body->setCollisionFlags(m_body->getCollisionFlags() | btCollisionObject::CF_KINEMATIC_OBJECT);
 		}
-		
-		m_MotionState->setWorldPosition(posX,posY,posZ);
+		// not required, this function is only used to update the physic controller
+		//m_MotionState->setWorldPosition(posX,posY,posZ);
 		btTransform xform  = m_body->getCenterOfMassTransform();
 		xform.setOrigin(btVector3(posX,posY,posZ));
 		m_body->setCenterOfMassTransform(xform);
-		m_bulletMotionState->setWorldTransform(xform);
+		// not required
+		//m_bulletMotionState->setWorldTransform(xform);
 	}
 
 
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.h b/source/gameengine/Physics/Bullet/CcdPhysicsController.h
index 37fa465351f..64f1876e199 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsController.h
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.h
@@ -106,6 +106,7 @@ class CcdPhysicsController : public PHY_IPhysicsController
 	btRigidBody* m_body;
 	class PHY_IMotionState*		m_MotionState;
 	btMotionState* 	m_bulletMotionState;
+	friend class CcdPhysicsEnvironment;	// needed when updating the controller
 
 
 	void*		m_newClientInfo;
@@ -115,6 +116,9 @@ class CcdPhysicsController : public PHY_IPhysicsController
 
 	void CreateRigidbody();
 
+	protected:
+		void setWorldOrientation(const btMatrix3x3& mat);
+
 	public:
 	
 		int				m_collisionDelay;
@@ -194,7 +198,6 @@ class CcdPhysicsController : public PHY_IPhysicsController
 			return m_cci.m_collisionFilterMask;
 		}
 
-
 		virtual void	calcXform() {} ;
 		virtual void SetMargin(float margin) {};
 		virtual float GetMargin() const {return 0.f;};
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
index c9d346e316d..b773f40650b 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
@@ -466,6 +466,38 @@ void	CcdPhysicsEnvironment::removeCcdPhysicsController(CcdPhysicsController* ctr
 
 }
 
+void	CcdPhysicsEnvironment::updateCcdPhysicsController(CcdPhysicsController* ctrl, btScalar newMass, int newCollisionFlags, short int newCollisionGroup, short int newCollisionMask)
+{
+	// this function is used when the collisionning group of a controller is changed
+	// remove and add the collistioning object
+	btRigidBody* body = ctrl->GetRigidBody();
+	btVector3 inertia;
+
+	m_dynamicsWorld->removeCollisionObject(body);
+	body->setCollisionFlags(newCollisionFlags);
+	body->getCollisionShape()->calculateLocalInertia(newMass, inertia);
+	body->setMassProps(newMass, inertia);
+	m_dynamicsWorld->addCollisionObject(body, newCollisionGroup, newCollisionMask);
+	// to avoid nasty interaction, we must update the property of the controller as well
+	ctrl->m_cci.m_mass = newMass;
+	ctrl->m_cci.m_collisionFilterGroup = newCollisionGroup;
+	ctrl->m_cci.m_collisionFilterMask = newCollisionMask;
+	ctrl->m_cci.m_collisionFlags = newCollisionFlags;
+}
+
+void CcdPhysicsEnvironment::enableCcdPhysicsController(CcdPhysicsController* ctrl)
+{
+	std::vector<CcdPhysicsController*>::iterator i =
+		std::find(m_controllers.begin(), m_controllers.end(), ctrl);
+	if (i == m_controllers.end())
+	{
+		btRigidBody* body = ctrl->GetRigidBody();
+		m_dynamicsWorld->addCollisionObject(body, 
+			ctrl->GetCollisionFilterGroup(), ctrl->GetCollisionFilterMask());
+	}
+}
+
+
 
 void	CcdPhysicsEnvironment::beginFrame()
 {
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
index 9f14cf6cbef..453749b27b3 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
@@ -183,6 +183,15 @@ protected:
 
 		void	removeCcdPhysicsController(CcdPhysicsController* ctrl);
 
+		void	updateCcdPhysicsController(CcdPhysicsController* ctrl, btScalar newMass, int newCollisionFlags, short int newCollisionGroup, short int newCollisionMask);
+
+		void	disableCcdPhysicsController(CcdPhysicsController* ctrl)
+		{ 
+			removeCcdPhysicsController(ctrl); 
+		}
+
+		void	enableCcdPhysicsController(CcdPhysicsController* ctrl);
+
 		btBroadphaseInterface*	getBroadphase();
 
 		
diff --git a/source/gameengine/PyDoc/BL_ShapeActionActuator.py b/source/gameengine/PyDoc/BL_ShapeActionActuator.py
new file mode 100644
index 00000000000..63cce253fa4
--- /dev/null
+++ b/source/gameengine/PyDoc/BL_ShapeActionActuator.py
@@ -0,0 +1,158 @@
+# $Id$
+# Documentation for BL_ShapeActionActuator
+from SCA_IActuator import *
+
+class BL_ShapeActionActuator(SCA_IActuator):
+	"""
+	ShapeAction Actuators apply an shape action to an mesh object.
+	"""
+	def setAction(action, reset = True):
+		"""
+		Sets the current action.
+		
+		@param action: The name of the action to set as the current action.
+		@type action: string
+		@param reset: Optional parameter indicating whether to reset the
+		              blend timer or not.  A value of 1 indicates that the
+		              timer should be reset.  A value of 0 will leave it
+		              unchanged.  If reset is not specified, the timer will
+		              be reset.
+		"""
+
+	def setStart(start):
+		"""
+		Specifies the starting frame of the animation.
+		
+		@param start: the starting frame of the animation
+		@type start: float
+		"""
+
+	def setEnd(end):
+		"""
+		Specifies the ending frame of the animation.
+		
+		@param end: the ending frame of the animation
+		@type end: float
+		"""
+	def setBlendin(blendin):
+		"""
+		Specifies the number of frames of animation to generate
+		when making transitions between actions.
+		
+		@param blendin: the number of frames in transition.
+		@type blendin: float
+		"""
+
+	def setPriority(priority):
+		"""
+		Sets the priority of this actuator.
+		
+		@param priority: Specifies the new priority.  Actuators will lower
+		                 priority numbers will override actuators with higher
+		                 numbers.
+		@type priority: integer
+		"""
+	def setFrame(frame):
+		"""
+		Sets the current frame for the animation.
+		
+		@param frame: Specifies the new current frame for the animation
+		@type frame: float
+		"""
+
+	def setProperty(prop):
+		"""
+		Sets the property to be used in FromProp playback mode.
+		
+		@param prop: the name of the property to use.
+		@type prop: string.
+		"""
+
+	def setBlendtime(blendtime):
+		"""
+		Sets the internal frame timer.
+		 
+		Allows the script to directly modify the internal timer
+		used when generating transitions between actions.  
+		
+		@param blendtime: The new time. This parameter must be in the range from 0.0 to 1.0.
+		@type blendtime: float
+		"""
+
+	def setType(mode):
+		"""
+		Sets the operation mode of the actuator
+
+		@param mode: KX_ACTIONACT_PLAY, KX_ACTIONACT_PROPERTY, KX_ACTIONACT_FLIPPER, KX_ACTIONACT_LOOPSTOP, KX_ACTIONACT_LOOPEND
+		@type mode: integer
+		"""
+	
+	def setContinue(cont):
+		"""
+		Set the actions continue option True or False. see getContinue.
+
+		@param cont: The continue option.
+		@type cont: bool
+		"""
+
+	def getType():
+		"""
+		Returns the operation mode of the actuator
+	    
+		@rtype: integer
+		@return: KX_ACTIONACT_PLAY, KX_ACTIONACT_PROPERTY, KX_ACTIONACT_FLIPPER, KX_ACTIONACT_LOOPSTOP, KX_ACTIONACT_LOOPEND
+		"""
+
+	def getContinue():
+		"""
+		When True, the action will always play from where last left off, otherwise negative events to this actuator will reset it to its start frame.
+	    
+		@rtype: bool
+		"""
+	
+	def getAction():
+		"""
+		getAction() returns the name of the action associated with this actuator.
+		
+		@rtype: string
+		"""
+	
+	def getStart():
+		"""
+		Returns the starting frame of the action.
+		
+		@rtype: float
+		"""
+	def getEnd():
+		"""
+		Returns the last frame of the action.
+		
+		@rtype: float
+		"""
+	def getBlendin():
+		"""
+		Returns the number of interpolation animation frames to be generated when this actuator is triggered.
+		
+		@rtype: float
+		"""
+	def getPriority():
+		"""
+		Returns the priority for this actuator.  Actuators with lower Priority numbers will
+		override actuators with higher numbers.
+		
+		@rtype: integer
+		"""
+	def getFrame():
+		"""
+		Returns the current frame number.
+		
+		@rtype: float
+		"""
+	def getProperty():
+		"""
+		Returns the name of the property to be used in FromProp mode.
+		
+		@rtype: string
+		"""
+
+
diff --git a/source/gameengine/PyDoc/KX_ActuatorSensor.py b/source/gameengine/PyDoc/KX_ActuatorSensor.py
new file mode 100644
index 00000000000..f9aef86f7f0
--- /dev/null
+++ b/source/gameengine/PyDoc/KX_ActuatorSensor.py
@@ -0,0 +1,24 @@
+# $Id$
+# Documentation for KX_ActuatorSensor
+from SCA_IActuator import *
+
+class KX_ActuatorSensor(SCA_ISensor):
+	"""
+	Actuator sensor detect change in actuator state of the parent object.
+	It generates a positive pulse if the corresponding actuator is activated
+	and a negative pulse if the actuator is deactivated.
+	"""
+	def getActuator():
+		"""
+		Return the Actuator with which the sensor operates.
+		
+		@rtype: string
+		"""
+	def setActuator(name):
+		"""
+		Sets the Actuator with which to operate. If there is no Actuator
+		of this name, the function has no effect.
+		
+		@param name: actuator name
+		@type name: string
+		"""
diff --git a/source/gameengine/PyDoc/KX_ConstraintActuator.py b/source/gameengine/PyDoc/KX_ConstraintActuator.py
index 9630690e572..b1c6f3c0f4e 100644
--- a/source/gameengine/PyDoc/KX_ConstraintActuator.py
+++ b/source/gameengine/PyDoc/KX_ConstraintActuator.py
@@ -4,7 +4,7 @@ from SCA_IActuator import *
 
 class KX_ConstraintActuator(SCA_IActuator):
 	"""
-	A constraint actuator limits the position or orientation of an object.
+	A constraint actuator limits the position, rotation, distance or orientation of an object.
 	"""
 	def setDamp(time):
 		"""
@@ -24,7 +24,7 @@ class KX_ConstraintActuator(SCA_IActuator):
 		"""
 		Sets the lower bound of the constraint.
 		
-		For rotational constraints, lower is specified in degrees.
+		For rotational and orientation constraints, lower is specified in degrees.
 		
 		@type lower: float
 		"""
@@ -32,7 +32,7 @@ class KX_ConstraintActuator(SCA_IActuator):
 		"""
 		Gets the lower bound of the constraint.
 		
-		For rotational constraints, the lower bound is returned in radians.
+		For rotational and orientation constraints, the lower bound is returned in radians.
 		
 		@rtype: float
 		"""
@@ -40,7 +40,7 @@ class KX_ConstraintActuator(SCA_IActuator):
 		"""
 		Sets the upper bound of the constraint.
 		
-		For rotational constraints, upper is specified in degrees.
+		For rotational and orientation constraints, upper is specified in degrees.
 		
 		@type upper: float
 		"""
@@ -48,7 +48,7 @@ class KX_ConstraintActuator(SCA_IActuator):
 		"""
 		Gets the upper bound of the constraint.
 		
-		For rotational constraints, the upper bound is returned in radians.
+		For rotational and orientation constraints, the upper bound is returned in radians.
 		
 		@rtype: float
 		"""
@@ -60,6 +60,9 @@ class KX_ConstraintActuator(SCA_IActuator):
 		
 		@param limit: Position constraints: KX_CONSTRAINTACT_LOCX, KX_CONSTRAINTACT_LOCY, KX_CONSTRAINTACT_LOCZ, 
 		              Rotation constraints: KX_CONSTRAINTACT_ROTX, KX_CONSTRAINTACT_ROTY or KX_CONSTRAINTACT_ROTZ
+		              Distance contraints: KX_ACT_CONSTRAINT_DIRPX, KX_ACT_CONSTRAINT_DIRPY, KX_ACT_CONSTRAINT_DIRPZ,
+		                                   KX_ACT_CONSTRAINT_DIRNX, KX_ACT_CONSTRAINT_DIRNY, KX_ACT_CONSTRAINT_DIRNZ,
+		              Orientation constraints: KX_ACT_CONSTRAINT_ORIX, KX_ACT_CONSTRAINT_ORIY, KX_ACT_CONSTRAINT_ORIZ
 		"""
 	def getLimit():
 		"""
@@ -68,5 +71,110 @@ class KX_ConstraintActuator(SCA_IActuator):
 		See module L{GameLogic} for valid constraints.
 		
 		@return: Position constraints: KX_CONSTRAINTACT_LOCX, KX_CONSTRAINTACT_LOCY, KX_CONSTRAINTACT_LOCZ, 
-		         Rotation constraints: KX_CONSTRAINTACT_ROTX, KX_CONSTRAINTACT_ROTY or KX_CONSTRAINTACT_ROTZ
+		         Rotation constraints: KX_CONSTRAINTACT_ROTX, KX_CONSTRAINTACT_ROTY, KX_CONSTRAINTACT_ROTZ,
+		         Distance contraints: KX_ACT_CONSTRAINT_DIRPX, KX_ACT_CONSTRAINT_DIRPY, KX_ACT_CONSTRAINT_DIRPZ,
+		                              KX_ACT_CONSTRAINT_DIRNX, KX_ACT_CONSTRAINT_DIRNY, KX_ACT_CONSTRAINT_DIRNZ,
+		         Orientation constraints: KX_ACT_CONSTRAINT_ORIX, KX_ACT_CONSTRAINT_ORIY, KX_ACT_CONSTRAINT_ORIZ
 		"""
+	def setRotDamp(duration):
+		"""
+		Sets the time constant of the orientation constraint.
+		
+		@param duration: If the duration is negative, it is set to 0.
+		@type duration: integer
+		"""
+	def getRotDamp():
+		""" 
+		Returns the damping time for application of the constraint.
+		
+		@rtype: integer
+		"""
+	def setDirection(vector):
+		"""
+		Sets the reference direction in world coordinate for the orientation constraint
+		
+		@type vector: 3-tuple
+		"""
+	def getDirection():
+		"""
+		Returns the reference direction of the orientation constraint in world coordinate.
+		
+		@rtype: 3-tuple
+		"""
+	def setOption(option):
+		"""
+		Sets several options of the distance constraint.
+		
+		@type option: integer
+		@param option: Binary combination of the following values:
+		                64 : Activate alignment to surface
+		               128 : Detect material rather than property
+		               256 : No deactivation if ray does not hit target
+		               512 : Activate distance control
+		"""
+	def getOption():
+		"""
+		Returns the option parameter.
+		
+		@rtype: integer
+		"""
+	def setTime(duration):
+		"""
+		Sets the activation time of the actuator.
+		
+		@type duration: integer
+		@param duration: The actuator disables itself after this many frame.
+		                 If set to 0 or negative, the actuator is not limited in time.
+		"""
+	def getTime():
+		"""
+		Returns the time parameter.
+		
+		@rtype: integer
+		"""
+	def setProperty(property):
+		"""
+		Sets the name of the property or material for the ray detection of the distance constraint.
+		
+		@type property: string
+		@param property: If empty, the ray will detect any collisioning object.
+		"""
+	def getProperty():
+		"""
+		Returns the property parameter.
+		
+		@rtype: string
+		"""
+	def setDistance(distance):
+		"""
+		Sets the target distance in distance constraint.
+		
+		@type distance: float
+		"""
+	def getDistance():
+		"""
+		Returns the distance parameter.
+		
+		@rtype: float
+		"""
+	def setRayLength(length):
+		"""
+		Sets the maximum ray length of the distance constraint.
+		
+		@type length: float
+		"""
+	def getRayLength():
+		"""
+		Returns the length of the ray
+		
+		@rtype: float
+		"""
+
+
+
+
+
+
+
+
+		
diff --git a/source/gameengine/PyDoc/KX_GameObject.py b/source/gameengine/PyDoc/KX_GameObject.py
index 37c188b7f22..8f17cf26f15 100644
--- a/source/gameengine/PyDoc/KX_GameObject.py
+++ b/source/gameengine/PyDoc/KX_GameObject.py
@@ -214,6 +214,18 @@ class KX_GameObject:
 		"""
 		Removes this objects parent.
 		"""
+	def getChildren():
+		"""
+		Return a list of immediate children of this object.
+		@rtype: list
+		@return: a list of all this objects children.
+		"""
+	def getChildrenRecursive():
+		"""
+		Return a list of children of this object, including all their childrens children.
+		@rtype: list
+		@return: a list of all this objects children recursivly.
+		"""
 	def getMesh(mesh):
 		"""
 		Gets the mesh object for this object.
diff --git a/source/gameengine/PyDoc/KX_IpoActuator.py b/source/gameengine/PyDoc/KX_IpoActuator.py
index da8d05ddd5e..1cdab829385 100644
--- a/source/gameengine/PyDoc/KX_IpoActuator.py
+++ b/source/gameengine/PyDoc/KX_IpoActuator.py
@@ -6,7 +6,7 @@ class KX_IpoActuator(SCA_IActuator):
 	"""
 	IPO actuator activates an animation.
 	"""
-	def set(mode, startframe, endframe, force):
+	def set(mode, startframe, endframe, mode):
 		"""
 		Sets the properties of the actuator.
 		
@@ -16,8 +16,8 @@ class KX_IpoActuator(SCA_IActuator):
 		@type startframe: integer
 		@param endframe: last frame to use
 		@type endframe: integer
-		@param force: interpret this ipo as a force
-		@type force: boolean (KX_TRUE, KX_FALSE)
+		@param mode: special mode
+		@type mode: integer (0=normal, 1=interpret location as force, 2=additive)
 		"""
 	def setProperty(property):
 		"""
@@ -60,6 +60,19 @@ class KX_IpoActuator(SCA_IActuator):
 		"""
 		Returns whether to interpret the ipo as a force rather than a displacement.
 		
+		@rtype: boolean
+		"""
+	def setIpoAdd(add):
+		"""
+		Set whether to interpret the ipo as additive rather than absolute.
+		
+		@type add: boolean
+		@param add: KX_TRUE or KX_FALSE
+		"""
+	def getIpoAdd():
+		"""
+		Returns whether to interpret the ipo as additive rather than absolute.
+		
 		@rtype: boolean
 		"""
 	def setType(mode):
diff --git a/source/gameengine/PyDoc/KX_ObjectActuator.py b/source/gameengine/PyDoc/KX_ObjectActuator.py
index 532c18eea5c..db577d21e6f 100644
--- a/source/gameengine/PyDoc/KX_ObjectActuator.py
+++ b/source/gameengine/PyDoc/KX_ObjectActuator.py
@@ -6,6 +6,7 @@ class KX_ObjectActuator(SCA_IActuator):
 	"""
 	The object actuator ("Motion Actuator") applies force, torque, displacement, angular displacement,
 	velocity, or angular velocity to an object.
+	Servo control allows to regulate force to achieve a certain speed target.
 	"""
 	def getForce():
 		"""
@@ -107,15 +108,17 @@ class KX_ObjectActuator(SCA_IActuator):
 	def getLinearVelocity():
 		"""
 		Returns the linear velocity applied by the actuator.
+		For the servo control actuator, this is the target speed.
 		
 		@rtype: list [vx, vy, vz, local]
 		@return: A four item list, containing the vector velocity, and whether
 		         the velocity is applied in local coordinates (True) or world
-			 coordinates (False)
+			     coordinates (False)
 		"""
 	def setLinearVelocity(vx, vy, vz, local):
 		"""
 		Sets the linear velocity applied by the actuator.
+		For the servo control actuator, sets the target speed.
 		
 		@type vx: float
 		@param vx: the x component of the velocity vector.
@@ -124,8 +127,8 @@ class KX_ObjectActuator(SCA_IActuator):
 		@type vz: float
 		@param vz: the z component of the velocity vector.
 		@type local: boolean
-		@param local: - False: the velocity vector is applied in world coordinates.
-		              - True: the velocity vector is applied in local coordinates.
+		@param local: - False: the velocity vector is in world coordinates.
+		              - True: the velocity vector is in local coordinates.
 		"""
 	def getAngularVelocity():
 		"""
@@ -150,5 +153,100 @@ class KX_ObjectActuator(SCA_IActuator):
 		@param local: - False: the velocity vector is applied in world coordinates.
 		              - True: the velocity vector is applied in local coordinates.
 		"""
+	def getDamping():
+		"""
+		Returns the damping parameter of the servo controller.
+		
+		@rtype: integer
+		@return: the time constant of the servo controller in frame unit.
+		"""
+	def setDamping(damp):
+		"""
+		Sets the damping parameter of the servo controller.
+		
+		@type damp: integer
+		@param damp: the damping parameter in frame unit.
+		"""
+	def getForceLimitX():
+		"""
+		Returns the min/max force limit along the X axis used by the servo controller.
+		
+		@rtype: list [min, max, enabled]
+		@return: A three item list, containing the min and max limits of the force as float
+		         and whether the limits are active(true) or inactive(true)
+		"""
+	def setForceLimitX(min, max, enable):
+		"""
+		Sets the min/max force limit along the X axis and activates or deactivates the limits in the servo controller.
+		
+		@type min: float
+		@param min: the minimum value of the force along the X axis.
+		@type max: float
+		@param max: the maximum value of the force along the X axis.
+		@type enable: boolean
+		@param enable: - True: the force will be limited to the min/max
+		               - False: the force will not be limited		               
+		"""
+	def getForceLimitY():
+		"""
+		Returns the min/max force limit along the Y axis used by the servo controller.
+		
+		@rtype: list [min, max, enabled]
+		@return: A three item list, containing the min and max limits of the force as float
+		         and whether the limits are active(true) or inactive(true)
+		"""
+	def setForceLimitY(min, max, enable):
+		"""
+		Sets the min/max force limit along the Y axis and activates or deactivates the limits in the servo controller.
+		
+		@type min: float
+		@param min: the minimum value of the force along the Y axis.
+		@type max: float
+		@param max: the maximum value of the force along the Y axis.
+		@type enable: boolean
+		@param enable: - True: the force will be limited to the min/max
+		               - False: the force will not be limited		               
+		"""
+	def getForceLimitZ():
+		"""
+		Returns the min/max force limit along the Z axis used by the servo controller.
+		
+		@rtype: list [min, max, enabled]
+		@return: A three item list, containing the min and max limits of the force as float
+		         and whether the limits are active(true) or inactive(true)
+		"""
+	def setForceLimitZ(min, max, enable):
+		"""
+		Sets the min/max force limit along the Z axis and activates or deactivates the limits in the servo controller.
+		
+		@type min: float
+		@param min: the minimum value of the force along the Z axis.
+		@type max: float
+		@param max: the maximum value of the force along the Z axis.
+		@type enable: boolean
+		@param enable: - True: the force will be limited to the min/max
+		               - False: the force will not be limited		               
+		"""
+	def getPID():
+		"""
+		Returns the PID coefficient of the servo controller.
+		
+		@rtype: list [P, I, D]
+		@return: A three item list, containing the PID coefficient as floats:
+		         P : proportional coefficient
+		         I : Integral coefficient
+		         D : Derivate coefficient
+		"""
+	def setPID(P, I, D):
+		"""
+		Sets the PID coefficients of the servo controller.
+		
+		@type P: flat
+		@param P: proportional coefficient
+		@type I: float
+		@param I: Integral coefficient
+		@type D: float
+		@param D: Derivate coefficient
+		"""
 
 
diff --git a/source/gameengine/PyDoc/KX_StateActuator.py b/source/gameengine/PyDoc/KX_StateActuator.py
new file mode 100644
index 00000000000..fb6ae5a3621
--- /dev/null
+++ b/source/gameengine/PyDoc/KX_StateActuator.py
@@ -0,0 +1,26 @@
+# $Id$
+# Documentation for KX_StateActuator
+from SCA_IActuator import *
+
+class KX_StateActuator(SCA_IActuator):
+	"""
+	State actuator changes the state mask of parent object.
+	"""
+	def setOperation(op):
+		"""
+		Set the type of bit operation to be applied on object state mask.
+		Use setMask() to specify the bits that will be modified.
+		
+		@param op: bit operation (0=Copy, 1=Add, 2=Substract, 3=Invert)
+		@type op: integer
+		"""
+	def setMask(mask):
+		"""
+		Set the value that defines the bits that will be modified by the operation.
+		The bits that are 1 in the value will be updated in the object state,
+		the bits that are 0 are will be left unmodified expect for the Copy operation
+		which copies the value to the object state.
+		
+		@param mask: bits that will be modified
+		@type mask: integer
+		"""
diff --git a/source/gameengine/PyDoc/SCA_ISensor.py b/source/gameengine/PyDoc/SCA_ISensor.py
index b96d8c8c075..0ebc2debb31 100644
--- a/source/gameengine/PyDoc/SCA_ISensor.py
+++ b/source/gameengine/PyDoc/SCA_ISensor.py
@@ -59,4 +59,22 @@ class SCA_ISensor(SCA_ILogicBrick):
 		@type invert: boolean
 		@param invert: true if activates on negative events; false if activates on positive events.
 		"""
+	def getLevel():
+		"""
+		Returns whether this sensor is a level detector or a edge detector.
+		It makes a difference only in case of logic state transition (state actuator).
+		A level detector will immediately generate a pulse, negative or positive
+		depending on the sensor condition, as soon as the state is activated.
+		A edge detector will wait for a state change before generating a pulse.
+		
+		@rtype: boolean
+		@return: true if sensor is level sensitive, false if it is edge sensitive
+		"""
+	def setLevel(level):
+		"""
+		Set whether to detect level or edge transition when entering a state.
+		
+		@param level: Detect level instead of edge? (KX_TRUE, KX_FALSE)
+		@type level: boolean
+		"""
 
diff --git a/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp b/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
index 958fead33ce..ef206332057 100644
--- a/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
+++ b/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
@@ -43,6 +43,7 @@
 
 #include "STR_String.h"
 #include "RAS_ICanvas.h"
+#include "RAS_Rect.h"
 #include "RAS_2DFilterManager.h"
 #include <iostream>
 
@@ -158,7 +159,8 @@ void	RAS_2DFilterManager::AnalyseShader(int passindex, vector<STR_String>& propN
 	texflag[passindex] = 0;
 	if(glGetUniformLocationARB(m_filters[passindex], "bgl_DepthTexture") != -1)
 	{
-		texflag[passindex] |= 0x1;
+		if(GLEW_ARB_depth_texture)
+			texflag[passindex] |= 0x1;
 	}
 	if(glGetUniformLocationARB(m_filters[passindex], "bgl_LuminanceTexture") != -1)
 	{
@@ -261,7 +263,7 @@ void RAS_2DFilterManager::SetupTextures(bool depth, bool luminance)
 	
 	glGenTextures(1, (GLuint*)&texname[0]);
 	glBindTexture(GL_TEXTURE_2D, texname[0]);
-	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, texturewidth, textureheight, 0, GL_RGB,
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, texturewidth, textureheight, 0, GL_RGBA,
 			GL_UNSIGNED_BYTE, 0);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
@@ -293,10 +295,13 @@ void RAS_2DFilterManager::SetupTextures(bool depth, bool luminance)
 	}
 }
 
-void RAS_2DFilterManager::UpdateOffsetMatrix(int width, int height)
+void RAS_2DFilterManager::UpdateOffsetMatrix(RAS_ICanvas* canvas)
 {
-	canvaswidth = texturewidth = width;
-	canvasheight = textureheight = height;
+	RAS_Rect canvas_rect = canvas->GetWindowArea();
+	canvaswidth = canvas->GetWidth();
+	canvasheight = canvas->GetHeight();
+	texturewidth = canvaswidth + canvas_rect.GetLeft();
+	textureheight = canvasheight + canvas_rect.GetBottom();
 
 	GLint i,j;
 	i = 0;
@@ -352,7 +357,7 @@ void RAS_2DFilterManager::RenderFilters(RAS_ICanvas* canvas)
 
 	if(canvaswidth != canvas->GetWidth() || canvasheight != canvas->GetHeight())
 	{
-		UpdateOffsetMatrix(canvas->GetWidth(), canvas->GetHeight());
+		UpdateOffsetMatrix(canvas);
 		SetupTextures(need_depth, need_luminance);
 	}
 	GLuint	viewport[4]={0};
@@ -360,19 +365,21 @@ void RAS_2DFilterManager::RenderFilters(RAS_ICanvas* canvas)
 	if(need_depth){
 		glActiveTextureARB(GL_TEXTURE1);
 		glBindTexture(GL_TEXTURE_2D, texname[1]);
-		glCopyTexImage2D(GL_TEXTURE_2D,0,GL_DEPTH_COMPONENT, 0,0, texturewidth,textureheight, 0);
+		glCopyTexImage2D(GL_TEXTURE_2D,0,GL_DEPTH_COMPONENT, 0, 0, texturewidth,textureheight, 0);
 	}
 	
 	if(need_luminance){
 		glActiveTextureARB(GL_TEXTURE2);
 		glBindTexture(GL_TEXTURE_2D, texname[2]);
-		glCopyTexImage2D(GL_TEXTURE_2D,0,GL_LUMINANCE16, 0,0, texturewidth,textureheight, 0);
+		glCopyTexImage2D(GL_TEXTURE_2D,0,GL_LUMINANCE16, 0, 0 , texturewidth,textureheight, 0);
 	}
 
 	glGetIntegerv(GL_VIEWPORT,(GLint *)viewport);
-	glViewport(0, 0, texturewidth, textureheight);
+	glViewport(0,0, texturewidth, textureheight);
 
 	glDisable(GL_DEPTH_TEST);
+	glMatrixMode(GL_TEXTURE);
+	glLoadIdentity();
 	glMatrixMode(GL_PROJECTION);
 	glLoadIdentity();
 	glMatrixMode(GL_MODELVIEW);
diff --git a/source/gameengine/Rasterizer/RAS_2DFilterManager.h b/source/gameengine/Rasterizer/RAS_2DFilterManager.h
index 9d8326b96de..f5998e1f093 100644
--- a/source/gameengine/Rasterizer/RAS_2DFilterManager.h
+++ b/source/gameengine/Rasterizer/RAS_2DFilterManager.h
@@ -42,7 +42,7 @@ private:
 	void SetupTextures(bool depth, bool luminance);
 	void FreeTextures();
 
-	void UpdateOffsetMatrix(int width, int height);
+	void UpdateOffsetMatrix(RAS_ICanvas* canvas);
 
 	float			textureoffsets[18];
 	float			view[4];
diff --git a/source/gameengine/Rasterizer/RAS_ICanvas.h b/source/gameengine/Rasterizer/RAS_ICanvas.h
index d799dc9c9bb..f3f817a943d 100644
--- a/source/gameengine/Rasterizer/RAS_ICanvas.h
+++ b/source/gameengine/Rasterizer/RAS_ICanvas.h
@@ -136,6 +136,14 @@ public:
 	GetDisplayArea(
 	) = 0;
 
+	/**
+	 * Used to get canvas area within blender.
+	 */
+	virtual
+		RAS_Rect &
+	GetWindowArea(
+	) = 0;
+
 	/**
 	 * Set the visible vieport 
 	 */
diff --git a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
index cb10ba6bf37..31bdd8638c2 100644
--- a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
+++ b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
@@ -139,6 +139,11 @@ const STR_String& RAS_IPolyMaterial::GetMaterialName() const
 	return m_materialname;
 }
 
+dword RAS_IPolyMaterial::GetMaterialNameHash() const
+{
+	return m_materialname.hash();
+}
+
 const STR_String& RAS_IPolyMaterial::GetTextureName() const
 {
 	return m_texturename;
diff --git a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
index d2d1dba99d9..6d90d260a23 100644
--- a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
+++ b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
@@ -138,6 +138,7 @@ public:
 	unsigned int		hash() const;
 	int					GetDrawingMode() const;
 	const STR_String&	GetMaterialName() const;
+	dword				GetMaterialNameHash() const;
 	const STR_String&	GetTextureName() const;
 	const unsigned int	GetFlag() const;
 
diff --git a/source/gameengine/Rasterizer/RAS_MeshObject.cpp b/source/gameengine/Rasterizer/RAS_MeshObject.cpp
index 4420f16c56d..5087f62500e 100644
--- a/source/gameengine/Rasterizer/RAS_MeshObject.cpp
+++ b/source/gameengine/Rasterizer/RAS_MeshObject.cpp
@@ -201,7 +201,20 @@ void RAS_MeshObject::DebugColor(unsigned int abgr)
 	m_debugcolor = abgr;	
 }
 
-
+void RAS_MeshObject::SetVertexColor(RAS_IPolyMaterial* mat,MT_Vector4 rgba)
+{
+	RAS_TexVert* vertex = NULL;
+	const vecVertexArray & vertexvec = GetVertexCache(mat);
+			
+	for (vector<KX_VertexArray*>::const_iterator it = vertexvec.begin(); it != vertexvec.end(); ++it)
+	{
+		KX_VertexArray::iterator vit;
+		for (vit=(*it)->begin(); vit != (*it)->end(); vit++)
+		{
+			vit->SetRGBA(rgba);
+		}
+	}	
+}
 
 void RAS_MeshObject::SchedulePoly(const KX_VertexIndex& idx,
 								  int numverts,
diff --git a/source/gameengine/Rasterizer/RAS_MeshObject.h b/source/gameengine/Rasterizer/RAS_MeshObject.h
index 0d06748f91f..44ad508d1e8 100644
--- a/source/gameengine/Rasterizer/RAS_MeshObject.h
+++ b/source/gameengine/Rasterizer/RAS_MeshObject.h
@@ -189,6 +189,7 @@ public:
 						);
 
 	void				DebugColor(unsigned int abgr);
+	void 				SetVertexColor(RAS_IPolyMaterial* mat,MT_Vector4 rgba);
 	
 	/**
 	 *  Sorts the polygons by their transformed z values.

From 9f19d88a5d5430b00ed63024a0832b28298dd6f7 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Sat, 26 Jul 2008 18:38:59 +0000
Subject: [PATCH 143/252] Word-wrap initial commit. Added button to header and
 updated draw code for text and cursor. Simple typing/deleting works fine.
 Other events (selections, clicking) behave as if text has not been wrapped
 and need work.

---
 source/blender/include/BIF_resources.h    |    4 +-
 source/blender/include/blendef.h          |    1 +
 source/blender/makesdna/DNA_space_types.h |   11 +-
 source/blender/src/blenderbuttons.c       | 4299 ++++++++++-----------
 source/blender/src/drawtext.c             |  222 +-
 source/blender/src/header_text.c          |    6 +-
 source/blender/src/space.c                |    1 +
 7 files changed, 2323 insertions(+), 2221 deletions(-)

diff --git a/source/blender/include/BIF_resources.h b/source/blender/include/BIF_resources.h
index df514190270..55f1439b10e 100644
--- a/source/blender/include/BIF_resources.h
+++ b/source/blender/include/BIF_resources.h
@@ -57,8 +57,8 @@ typedef enum {
 	ICON_TRIA_UP,
 	ICON_FONTPREVIEW,
 	ICON_BLANK4,
-	ICON_BLANK5,
-	ICON_BLANK6,
+	ICON_WORDWRAP,
+	ICON_WORDWRAP_OFF,
 	
 	ICON_ORTHO,
 	ICON_PERSP,
diff --git a/source/blender/include/blendef.h b/source/blender/include/blendef.h
index 6f8b94d7cd1..6b5b315a470 100644
--- a/source/blender/include/blendef.h
+++ b/source/blender/include/blendef.h
@@ -377,6 +377,7 @@
 #define B_TEXTLINENUM		507
 #define B_TAB_NUMBERS		508
 #define B_SYNTAX		509
+#define B_WORDWRAP		510
 
 /* SCRIPT: 525 */
 #define B_SCRIPTBROWSE		526
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index f42eb2e1a94..22e9ee54473 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -275,22 +275,23 @@ typedef struct SpaceText {
 	struct Text *text;	
 
 	int top, viewlines;
-	short flags, menunr;
-	
-	int font_id;	
+	short flags, menunr;	
+	int font_id;
+
 	int lheight;
 	int left;
 	int showlinenrs;
-	
 	int tabnumber;
+
 	int currtab_set; 
 	int showsyntax;
 	int overwrite;
-	
 	float pix_per_line;
 
 	struct rcti txtscroll, txtbar;
 
+	int wordwrap, pad1;
+
 } SpaceText;
 
 typedef struct Script {
diff --git a/source/blender/src/blenderbuttons.c b/source/blender/src/blenderbuttons.c
index e15ef3fd898..3035baf14ac 100644
--- a/source/blender/src/blenderbuttons.c
+++ b/source/blender/src/blenderbuttons.c
@@ -1,2181 +1,2128 @@
 /* DataToC output of file <blenderbuttons> */
 
-int datatoc_blenderbuttons_size= 69599;
+int datatoc_blenderbuttons_size= 67881;
 char datatoc_blenderbuttons[]= {
-137, 80, 78, 71, 13, 10, 26, 10,  0,  0,  0, 13, 73, 72, 68, 82,  0,  0,  2,  0,  0,  0,  1,  0,  8,  6,  0,  0,  0,197,144,
-206,103,  0,  0,  0,  1,115, 82, 71, 66,  0,174,206, 28,233,  0,  0,  0,  6, 98, 75, 71, 68,  0,255,  0,255,  0,255,160,189,167,
-147,  0,  0,  0,  9,112, 72, 89,115,  0,  0, 11, 19,  0,  0, 11, 19,  1,  0,154,156, 24,  0,  0,  0,  7,116, 73, 77, 69,  7,216,
-  5, 19, 11,  8,  1, 11,126, 22,156,  0,  0, 32,  0, 73, 68, 65, 84,120,218,236,125,121, 92, 84,229,254,255,251, 57,179,179,239,
-168,184,128,138,251,130,224, 26,106, 80,168,201,215, 52, 21, 48,179,237,214,189, 78,150,173,150,102,117,111,245,203, 43,106,218,
-170,233,216,162, 89,106,  9,106,120,115,  5, 29,212,144,220, 21, 75, 19,  5, 17, 65,144,109, 96,134,217,207,156,231,247,199,204,
-208,128,192, 44,160, 81,205,251,197,188,152,115,230,204,123,158,115,158,229,253,249,124,158,141, 68, 69, 69, 81,184,225,134, 27,
-110,184,225,134, 27,127, 43, 48,238, 71,224,134, 27,110,184,225,134, 27,127, 31,156, 57,155,  5,  0, 32,238,  8,128, 27,110,184,
-225,134, 27,110,184, 35,  0,110,184,225,134, 27,110,184,225,134,219,  0,112,195, 13, 55,220,112,195, 13, 55,220,  6,128, 27,110,
-184,225,134, 27,110,184,241,151,  0,223,246, 96,222,188,121,196, 85,162,181,107,215,222, 54,150,192,205,231,230,107,  5,116,237,
-218,181,127, 88,250,178,179,179,105, 92, 92, 28,113,231,199,159,151,239,220,185,115, 46, 23,190,168,168, 40,184,243,195,205,247,
- 87,230,115,218,  0,248, 59, 67, 42,149, 54,122,128, 50,153,140,116,228,116,174, 91,183, 14,132, 16,226,206, 57,215,242,120,246,
-236,217, 72, 79, 79,111, 56, 78, 74, 74,250, 75, 60,203, 61,123,207,180,218, 16, 36, 78,142,254, 75,151, 25,137,255, 78,136,117,
-189, 17,  1,  3,234,177, 23,249,218,183, 58,108, 89,236,168,109,140, 27,127,211,  8,192,221, 40,172,123,246,236,137,203,200,200,
-144, 91,143,167, 77,155, 22,159,152,152,152,221, 17, 30,  6,165,230,182,179,163,234,170, 84, 42,165, 69, 69, 69,  0,128,240,240,
-112,  0,248, 83, 52, 34, 77,141, 43,139,129,213,162,103,238, 40,239,214,173, 91, 29, 54,212,164, 82, 41,221,182,109, 91,195,241,
-206,157, 59, 49, 97,194,132,134,227,244,244,116,250, 71, 25,  1, 49, 49, 49, 20,  0, 78,159, 62, 77,218,227,186,140, 31,100,173,
- 24,  0,178, 54,231, 95, 88, 68, 55,  0,192, 45,157, 14,172, 86,111, 62, 89,171,  4,  0, 36, 39, 39, 35, 33, 33,161,197,244,173,
- 79, 88, 79, 35,203, 34,157,250,253,248, 95,227, 29,200, 23,  9,252,159,189,  0, 93,198, 78, 40, 20,211,161,  0, 16, 45,121, 31,
-111, 73, 78,163,155, 24,168,212, 21,224, 45,109,138, 83,191,155,149,149, 21,151,150,150, 38,183, 61,151,156,156, 28,159,144,144,
-144,221,145,234, 86,123,181,  1,127,134,251,189, 19,120,231,141, 23,136,151,192,151,232,197, 66,170,175,213, 50,245, 90, 37,247,
-193, 39,171,255, 22,179,227,236, 26,  0,123,246,236,137,179,254,111,171, 80, 91, 27,146,119,183, 45,129, 87, 55, 95,212,223,168,
-195,219, 41,111,201, 51, 50, 50,224,182,134,237, 67, 38,147,145,240,240,112, 90, 84, 84,132,162,162, 34,236,219,183,175,195,122,
- 18,214,188,150,201,100, 68, 38,147,  9,164, 82,169,113,197,138, 21, 39,  1, 96,225,194,133, 35, 90,251,238,244,233,211, 27,222,
-179,172,  9,  6,163, 30,  6,189,  1,  6,131,249,197,178, 44, 22, 46, 92,232, 84, 90,108,197,191, 57, 76,152, 48,225, 15, 53,  2,
- 28, 49,126, 98, 98, 98,236,114, 36, 78,142, 38,174,136,188,195,240,243, 65, 94,225,119,144,160, 43, 76,200, 65,197, 23,103,112,
-190,160, 26, 51,150,109,112,232,235,145,101,145, 14, 10,186, 25,242,129,114,187, 13,177, 36,241, 45,  4, 76,123, 26,165, 47, 69,
-  3, 90, 69,195,249, 51,218,215,112,  6,  0,180,192,120, 73, 50, 14,250,159,134, 31,128, 24, 69,140,195,229,183, 41,210,210,210,
-228,105,105,105, 29,162,189,178,166,177, 61,218,128, 63,195,253,182, 55, 54,173, 89, 75, 30, 13,139,224,191,144,244, 56, 47,164,
-127, 24,195, 39, 33, 68, 83, 87,199,137, 17,106, 98,186,116, 53,233,110, 94, 51, 57,248,236,110, 58,209,134,119,113,128,111,129,
- 19,124,171,238,168,  1,144,145,145, 33,223,246,239, 55,144,242,222, 82,121, 98, 98, 34,105, 75,  1,179, 10, 63,  0, 84,105,170,
-129, 64, 96,241,193,119,160, 44, 84, 64,250,175,142, 37,100, 45, 85,136, 63, 58,141,182, 70,192,  3, 15, 60,128,162,162, 34,132,
-135,135,119,184,103, 39,151,155, 29,137,248,248,120, 42,147,201, 24,153, 76, 22, 38,149, 74, 75, 87,172, 88,113,218, 81, 30,150,
-101, 97, 48, 24, 27,132,223, 86,252, 79,157, 58,133,225,195,135, 59,149,174,148,148,223, 61,192,217,179,103, 35, 51, 51,179,145,
-  1,208, 30,101,197,149,124, 56,125,250, 52,201,206,206,166, 19, 39, 78,188,237,179,  3,  7, 14, 96,235,214,173, 13,199,173,141,
- 91,184,205,120,111,199,238,128,176,136,110, 40, 85,212, 97,199, 51, 51, 17, 72, 98, 81,240,249,171,232, 57,189, 39, 50,157, 16,
-127, 43,230,206,157, 75,  1, 96,253,250,245,109, 46,179, 97,219,114,160,185, 94,143, 82,105, 68,171,215, 93, 16,103,225,221,193,
-183,144,122,225,205, 54,229,103,123,136,110,123,114,180, 71, 36,224, 78,223,111,123, 33, 39, 39,199,  3,192, 61,  0,188,108, 78,
-215,  2,200,139,141,141,173,113,148, 71,203,105, 25, 67,149, 94, 48,121,234,116,177,  2, 70,177, 64,192,231, 43,117, 98, 70, 40,
-212,114, 60, 31, 79,214, 32, 49, 26,249,229, 55,245, 98,158, 72,167, 51,233, 77, 82,169,148, 52, 55,102,196, 22,181,181,181,255,
-181,190,207,207,207,175,242,244,244,100,212,106, 53,103,123,205,200,145, 35, 63,116, 52,141,148, 82,187,194, 78,  8, 89,208,214,
-103,202,183,231,253,247,233,211,  7,145, 94, 62,104, 75, 20,192, 86,252,171, 52,213, 72,189,255,157,134,207,254,145,241, 44, 16,
-  2, 76, 95,145,226, 84, 33,107, 73,160,219, 75,164,111,220,184,  1,  0,232,214,173, 91,163,247,214,223,181, 87, 32,238,100,136,
-207,214,  8, 48, 26, 89,172, 91,183,238,142,121,  1,206,114, 54, 17,127,219,239,223,148,201,100,254, 82,169, 84,225,176,248, 27,
-141, 48, 24,244,208, 27, 12, 48, 54, 17,127,202, 57, 23,161, 75, 73, 73,193,169, 83,167, 26,142, 87,173, 90,133,164,164,164,134,
-227,244,244,244, 54, 27, 59, 54,  6, 79,155,203,159,173,240,207,158, 61, 27,195,134, 13,115,137,167,189,186,  3, 74, 10,139,161,
-222,249, 31,120, 61,245, 49,194, 34,186, 33, 52, 80,130,194,157,133,102,241,247,243, 49,119,  1,  8,120, 14,113,181,135,240,  3,
- 64,159,139, 87,113,227,237, 37,208,166,109,108, 61, 66, 32,145, 64,167,211,161,160,160,  0, 21,186,203,232,131,176, 22,175,205,
-202,202,138,107,173,236,203,100, 50, 98,173, 39, 89, 89, 89,113,206,132,199,109,163, 98,214,250,106,123,206, 89, 71,160, 37,225,
-118,166, 45,104,238,126, 51, 51, 51, 41, 33,  4,  9,  9,  9,164, 45,247,107,197,211, 79, 63, 77,191,252,242,203, 54,229,121, 78,
- 78,142, 47,128,233,  7, 15, 30,252, 15,199,113,122, 27, 17,228,243,120, 60, 79,  0,255,140,141,141,221, 99,143, 39,191, 48,159,
- 47, 17,138,197,  2,129,200,147,225, 19, 31,202, 19,121,112, 60, 30,159, 35, 12, 56,194, 55, 81, 30, 79,207,227,136, 78,205, 51,
-105, 60,133,  2,194,235,213, 77, 39,158, 26,194,161,216,126, 26, 21, 10,133, 82,163,209,176,  0,160, 86,171,185, 55,222,120,163,
- 65,240,151, 46, 93,250,114, 91,203,251,132,  9, 19,158,177,190,207,204,204, 92,215, 30,117,136,177,231,253, 47,153,149,  4, 93,
-101, 37, 94, 29,216, 15,182,125,247, 14,123, 33,150, 46,  4, 91,241,159, 54,109, 90,188, 76, 38, 35,211,166, 77,139,223, 48,237,
- 51,115,100,177,111, 80,163,235, 29,193,194, 53,249, 88,184, 38, 31,207,173,188,132, 39,222,251,  5, 51, 22,159,107,243,  3, 41,
- 41, 41,113,200, 48,184, 91,226, 95, 84, 84,212,162, 48,135,135,135,195,104, 48, 96,212,200,145,109,254, 29,107,152,124,219,182,
-109,144,203,229, 13,175,214, 12,173,150,196, 48, 62, 62,190,169,248, 55, 24,202,142, 52, 76, 44,107, 50,123,254,122,115,232,191,
-169,248,155, 76, 38,168,181,106,167,238,209, 26, 49,104, 26, 53, 72, 79, 79, 71,122,122,122, 35, 99,192,169,251,205,110,220, 30,
-202,179,179,157,122,102,173,137,255,236,217,179,177, 98,197,138,  6,241, 23,240,  5, 78,241, 36, 78,142, 38,150, 46,152,102, 95,
-206,112,105, 81,140,250,233,163, 64,211, 94, 69, 73, 97, 49,232,244,254,191,123, 43,105,175,130,223, 57, 24,240,243,187,171, 30,
-161,186,170,  0,218,180,141,160,148,226,194,133, 11, 24, 63,126, 60, 36, 18, 73, 35,225,247,247,247,135, 86,171,133, 86,171, 69,
-105,105, 41, 30,209,190,128, 47,252, 95,106,145,211,218,  7,222,218,243,177,126,214,180,191,220, 81,225,110, 47,103,197,250,221,
-166,226,111,207, 65,106,237,126, 51, 51, 51,105,122,122, 58,210,210,210,144,149,149, 69,219,122,191, 79, 63,253, 52,229,243,249,
-120,250,233,167, 93,174, 19, 57, 57, 57, 98,  0,255,202,202,202,122,227,189,247,222, 59, 78,  8,  9,183,190,  0,116, 13, 12, 12,
-244, 56,116,232,208,218,156,156,156,241,173,241,152, 40,199,227, 17,129,200,192, 82, 31,189,222, 24, 98,226,184,174, 38,142,139,
- 48, 17,210, 29, 60, 94, 32, 33,196, 15,132,231,195, 81,  4, 80,  3,231,167,212, 26, 61, 67,124, 88, 30, 51, 82,229, 80, 30,105,
- 52, 26,182,169,215,223,209,193, 56,226,253,107,202,203, 48,121, 88,180,211,  2,109, 53, 34,222,221,182,  4,  0, 26,196,223, 26,
- 69, 72, 76, 76,204,182, 26,  1, 37,202,155,136, 94, 56,218, 41, 35, 67,173, 53, 65,173, 53,161,172, 90,143,210, 74, 29,110,220,
-210,185, 36,124,214,202, 98, 79,252,255, 40,180,100,  4,  0,128,206,160,135, 78,167,115,153,219, 42,218,214, 62,242,224,224, 96,
- 91,111, 22,142, 54, 38, 77, 61,225,150, 66,137,142, 52,122,  6,163,222,236,249,235, 13, 48, 24, 27,139,191,209,104,132, 90,173,
-134, 74,169,250, 67,243,196,108, 48,165,217,  6,228,172,127,216,182, 45,205,101, 35,192, 86,252,173,194,207, 48, 12,196, 98, 49,
- 60,189, 60,218,148,230, 61,123,207,208,150, 94,246,190,187,111,241, 59,  8, 68, 44,216,132,231,  1,  0, 94,185, 87,113,190,160,
-218,108,176, 37, 60, 15,227,133,119,129,170,106,167,210, 51,119,238, 92,106,237, 14,112,  5,158,168,  2,  0,108,220,184, 17, 25,
- 25, 25,120,255,253,247,113,226,196,  9,232,245,122, 84, 84, 84, 88,189,178,134,235,195,194,194,160,  5,192,195,181, 63,164,188,
-180, 84,238,155,122,243,174, 26, 20,205,117, 11, 56,203,103, 27,  9, 75, 75, 75,107,211, 61, 91,197, 31,  0, 92, 53,  2,114,114,
-114, 58, 89,196,127,238,215, 95,127,125,241,173,183,222,122,104,203,150, 45,232,211,167, 15,  0,160, 71,143, 30,168,171,171, 19,
-189,251,238,187,167, 15, 29, 58,244,109, 78, 78, 78,120,179, 68,  4,  0, 71,  9, 56, 86,108, 50,177,  1, 38,214,212,213,104, 50,
-246,230, 49,164,139,144,207,  8,196,  2,158,150,239, 33,172,245,244,230, 41,121, 98,202,138,121, 60, 79, 62,107,240,185,118,230,
-172,232,177,224,143,236,166, 59, 63, 63,191, 74,173, 86,115,205,133,249,135, 14, 29,122,217, 96, 48,180, 91, 89, 26, 58,116,104,
-187,113,241, 91, 19,238,207,231, 62,253,187,216,150,220,192,171,  3,251, 97,101, 70,134,211, 99,  1,172,222,191, 85,244, 27,121,
- 41,137,137,217, 25, 25, 25,  0,128,192,193,157,156, 74,124,189,214,  4,149,134,133, 82,205,162,174,158, 69,173,138,117,250,  1,
- 52, 55,242,223,214,203,183,125, 95, 88, 88,136,218,218,218,187,214,104,172, 91,183, 14,225,225,225,176, 14,250,179,237,235,151,
- 74,165,116,221,186,117,208,105,181, 46, 27,  0, 82,169,148,110,216,176,  1, 37,165,165, 16,240,120,  8,237,212,169,145,248,223,
-127,255,253, 72, 73, 73,113,168,113,146,201,100, 36, 62, 62,190,145, 17,208, 52,146,225,232, 88,  5,131,222,  0,131, 94, 15,163,
-209,  0,150, 53, 53,136,191, 94,175,135, 70,163, 65,125,125, 61, 84, 42,231, 13,  0,219, 46,  0, 43, 92,245,252,183,165,109,  3,
- 40, 80,101, 17, 26,106, 46, 68, 32,148,154,141,128,180, 52,164, 36, 39, 59,221, 29,208, 84,252,  5,  2,  1, 68, 34, 17,196, 98,
- 49,196, 98,177, 75,247,221,168, 94,183,208, 37, 96,175, 75,107,198,186,237,160, 83, 35,112,107, 76, 52,  2, 17, 11,201,204, 79,
-193,150, 85,  2,126, 62,224, 87,111,197,143, 31,157,  6,120, 60,167,210,210,214,174,  0, 53,207,220,166,164,166,166,162,178,178,
- 18,107,215,174,197,208,161, 67,241,222,123,239, 33, 58, 58, 26, 90,173,182,169,135,102, 53,169,239,170,240, 59, 42,208,174,118,
-  7,180,100, 72,184,194,147,156,156,220, 32,252,174,212,141,230,196,191, 65,108,248,124,176, 44,235,108,119,128,119, 94, 94,222,
- 39,243,230,205, 59, 50,120,240, 96, 31,  0,120,231,157,119,144,159,159, 15,  0, 24, 61,122, 52,118,236,216,129,177, 99,199,122,
- 62,242,200, 35,  5,217,217,217, 89, 60, 30,239,145,219, 27,122, 32, 32, 48,128, 43, 44, 44, 96,179,229,  7,247,246,238, 29,153,
- 29,209, 35,252, 34,207, 91, 82,193, 35, 66, 53, 35, 18,104, 24,177,135,202,192,231, 25, 64,141, 60, 78,108,244, 86,149, 86,123,
-157, 56,116,110,100,144,127,232, 14,187,198,168, 77,159,255,206,157, 59,159,152, 62,125,250,215,214,176,191, 82,169,100,132, 66,
- 97,155,203, 82,123,133,253,237, 70,  0,172, 94,254,240, 94,145,208, 85, 86, 66, 93, 98, 22,193,241, 22,239,208,217, 40, 64,225,
- 47, 87,111,227,110,238,184,250, 66,185, 83,137,111,171,248,219, 10, 63,165, 20,221,186,117,107,244,153,209,104,108,120,213,214,
-214, 66,173, 86,163,166,166,230,174, 53, 30,214,121,254,251,246,237,107, 20,  9,176,138,255,144, 33, 67,160,211,105, 27, 26, 58,
-106,181,102, 28,108,152,214,124,182,  6, 70,163, 17, 93,195,194, 96, 52,153,154, 21,127,103, 26, 18,139, 17,112,155, 87, 98,157,
-186,216, 90, 36,227, 54,  3,192, 96,108, 16,255,147, 39, 78, 66,163,213, 66,165, 82,161,174,174, 14,181,181,181,141, 60, 59,103,
- 97,237,  6,112,181,223, 31,  0,170,171,170, 81, 93, 93,133,170,234, 26, 84, 85, 87,163,186,186, 26,213, 85,102,143,180, 95,255,
-254,168,177,188,119,214,251,  7,128, 97,195,134,253,238,245,123,122,194,203,203, 27,222, 94,222, 80,169, 84,241,109, 41, 79,173,
-117,  9,216,251,110,193,251,115, 33,152,249, 41,  2, 17, 11,126,238,167, 48,110,127, 30,240,243,193,174,103,147,112,125,215, 53,
- 60,184, 98, 19,192,191,203,203,138,232,174, 67, 18, 38,129, 90,173,134, 78,167,131, 70,163, 65,110,110, 46,150, 45, 91,214,236,
-229, 30, 30,214,  8,202, 85,167,197,219, 85,175,218,246,249, 54,125,222, 45, 29,183,197,200,104,174, 91,192, 25,158,132,132,  4,
-146,156,156,140,164,164, 36, 76,152, 48,193,229,200,196,151, 95,126, 73, 88,182,113,155,204,178, 44,156, 29, 11, 16, 27, 27,123,
- 37, 57, 57,121,232,150, 45, 91,198, 31, 61,122,212, 59, 33, 33,225,132, 85,252, 45,142, 42, 68, 34, 17,189,126,253,186, 96,239,
-222,189,125,253,253,253, 79,198,198,198, 22, 52,199, 85, 87, 91,199, 69, 70,244, 81,141, 30, 61, 58,233,226,197, 95,239, 83,170,
- 85,157, 40,107,100,193,192,200,234, 25,189, 94,175,215, 42, 81,174,228,244, 58, 85,105,113, 57,251,227,238, 61,203,131,  2,131,
- 43, 12,  6,141, 93,247,189, 57,239, 95,161, 80,240,  1,192,199,199,167,195,118, 11, 48, 45,121,255,219,254,253,134,217,106, 46,
- 47,107,244,153,179, 99,  1,166, 77,155, 22,191,230, 95, 31,  3, 48, 15,248,203,200,200,144,219, 78, 45,204,200,200,144, 79,248,
-230, 33,  0,192,153, 21, 63, 99,218,180,105,241,119,235,230,109, 43, 73, 73, 73, 73,131,183,111, 21,125,155,204,133, 74,165,130,
- 78,167,179,105, 68,238, 94, 26,159,121,198, 60,246,195,200,178,184,120,241, 34,206,158, 57,131,161, 67,134, 66,167,211, 65,171,
-213, 65,167,213,226,219,111,190,129,245, 58, 71, 42,250,170, 85,171, 48,160,255,  0, 24,141, 70, 92,185,114,  5,172,209,128,210,
-146,210,118,125,166,214, 99,203,154,  5,  8, 15, 15,119,168, 97, 50, 24,245, 96, 77,230,176,255,241,227, 63, 67,173, 85,163, 94,
-165, 68, 93, 93, 29, 20,181,181, 80, 40,106,218,100,136, 89, 35,  1,109,241,112,142, 28, 57,  2,149, 74,  5,149, 74,105,249,175,
- 66, 80, 96, 32,250,245,239,143,223, 46, 93,194,225, 35, 71,156,230,180,122,255,124,190,  0, 30, 30, 30,240,242,242,130,183,151,
- 23,188,188, 60, 80,163,168,137,  7,144,125,167, 67,253, 45,225,124, 65, 53,140, 23,222, 69, 53,114, 64, 18, 87,130,196,254,  7,
-  5,239,207,197,212, 21, 95, 67, 44, 96,  0,  1,223,252,114,  1,174,118,  5,148, 78,249, 12,  1, 91,167, 64,163,209, 32, 32, 32,
-  0, 10,133,  2, 10,133,  2,199,142, 29, 67, 89, 89, 89, 67,152,184,225,250,210, 82, 60,235, 47, 65,144, 71,101,107, 30,112,188,
-173,168,218, 14,146,179,190,183,126,102,189,214, 21,239,220,209,238,  1, 71,197,223, 85,207,191,185,251, 77, 72, 72, 32, 19, 38,
- 76, 32,109,185,223,166, 70,128, 43,226,111, 69, 80, 80, 80,222, 67, 15, 61,244, 72,106,106,106,223,243,231,207,199, 74, 36, 18,
-222,212,169, 83,137, 72, 36,  2,199,113, 36, 49, 49, 49,239,197, 23, 95, 28, 50,104,208,160, 93,255,252,231, 63,159, 48,153, 76,
-213,173,196,188,185, 95, 47, 93, 57, 57,104,240,144, 71, 79,158, 56, 49, 99,215,238,255, 45, 61,117,226, 68,167,139,249,191,137,
-175,148, 22,208,111, 63,254, 94,146,186,234,253,  1, 89,187,119,175,234,221,171,247,143, 94,161,158, 71, 98, 99, 99, 77,112, 48,
-229,  9,  9,  9, 56,121,242,100,212,186,117,235,222,213,233,116,130,247,222,123,239,131, 93,187,118,205, 46, 45, 45,189,187,194,
-209,214, 46,128,192,107, 69,168,177,132,254,109, 49, 62, 56, 24, 43,241,155,227, 94,135, 37,196,255,219,233,139,240,235, 27,132,
-  9,223, 60,132,140,199,126,144, 91,195,254, 86,241,183,122,255,206,204, 50,216,145,218, 62, 35,241,  9, 33,184,116,233, 18,172,
-133,181,105,152, 85, 32, 16, 64, 32, 16,160,178,178, 18,137,137,137,119, 61,147,172,163,254,215,173, 91,135,145, 35, 71, 66,167,
-215, 67,171,211, 66,103, 25,220,164,213,153,187,  1, 86,175, 94,109,183, 49,145, 74,165,116,197,138, 21, 48,153, 76, 56,125,250,
- 12,  4,124,115,216, 54, 50, 50, 18,215,138,138, 80, 90, 90,138,173, 91,191,195,236,217, 15,227,224,193,131,212, 54, 18,208, 90,
-  3, 36,147,201,132,  0, 88,169, 84,202, 53,231,  1, 57, 51, 85,209,234,249,231,230,230, 66, 93,175,105, 48,192,148, 42, 37,148,
-202, 58, 40,149,245, 46,135,194,173,222,191,101, 37, 64,151, 12,129,217,179,103, 55, 58,142,  8, 15, 71,191,254,230, 65,113,191,
- 93,186,132,107,150,136, 71,211,235, 28,193,152,123,198, 64, 36, 20, 65, 34,145, 64, 44, 22, 67, 36, 18,161,188,188,220, 97,241,
-183, 23,234,119,117,141,128, 25,203, 54, 96,  7,128,  7, 82,255, 15, 52,237, 85,144,148, 85, 56, 95, 80, 13, 18,224,143,171, 37,
- 74,179,247,239,100, 23, 64,211,174,  0,167,167,  7,106,181,  0,175,160, 73,120,223, 44,244, 70,163, 17, 95,124,241,  5,198,143,
-255,125, 92,216,193, 39,195,128, 10, 13,250,238, 81, 32, 42,184, 71, 75, 13,120,118,147,190,111, 57,208,208,252,203,155, 94,235,
-138, 96,183,214,111,239,170,231,239,170, 33,113,167,239,215, 98,  4,180,121, 22, 64,120,120,248,214,177, 99,199,  6,159,203,203,
- 75,209,106,181, 67,228,242, 67, 18,145, 88,196,103,  8,131, 67,135, 14,121, 15, 24, 48, 96, 83,114,114,242,127, 42, 43, 43,237,
-122,235,179,103,205,228,126,220,251,227,225,161, 67,135, 45, 52,176,250,  7,174,230, 95, 89,202, 21, 21,176,  0,168, 24,140,113,
-112,239,190,105, 33, 33,193,123,120,124,225,183,255,125,107,185,225,219,141, 27, 44,125,124, 45, 99,228,200,145, 31, 38, 36, 36,
-  0,  0, 42, 43, 43,145,149,149,229,243,213, 87, 95, 45,  5,128,147, 39, 79,142, 28, 56,112,224,190, 63,133,  1, 96,245,206,239,
-255,118, 75,235, 94,134, 19, 83,  2,173,214,111,244,194,209,  8, 28,220,169, 65,244,109, 67,255,103, 86,252,236,148,229,218, 94,
-115, 82,173,105,235,223,191, 63, 46, 92,184,208, 72, 88,106,107,107, 11,  0,244,106,238, 59,174,174,189,220,214,116, 54, 61,255,
-237, 55,223, 66,167,211, 65,111,208,195, 96, 48, 96,197,138, 21,176, 39,254, 86,112,156,  9, 98,137, 23,180, 90, 29, 46, 93,188,
-  8,190, 64,  0,163,193,  0, 15, 79, 15,108,221,186, 21, 60, 30,207, 58,119,190,213,123, 93,177, 98,197, 62,169, 84,106,144,201,
-100, 33,214,116, 54, 89,  7,192,169,208,230,194,133, 11,145,147,147,131,250,250,122,212,171,213, 80, 41,149, 22,241, 87, 66,165,
- 84,161, 94, 85, 15,181, 77,131,239,200,179, 27, 62,124, 56, 61,117,234, 84,131,247,223,220, 52, 64, 71, 23,  1,138,139,139,187,
- 45, 47,172,162,127,246,236,217,  6,111,222,209,123,142,137,137,161,214, 69,126,188, 60,188, 32,150,136,161, 82,169,226,109,250,
-176,157,106,120,239,212, 98, 64, 86, 35, 96,122,234, 87,160,219,129,160, 39,101,200,126, 41,  9, 99,151,111,  6,  4,  2,120,138,
-219,214,207,217,212, 16,  0,  0,121,142,189, 96,227, 45, 12,222,231,129,242,255,105,160, 88,242,251, 89,163,209,136,113,227,198,
-  1,  0,194,252, 37,248, 73,214, 13,239, 47,187,129,207,206,104, 91,101,179,245,248,  1,243, 64, 56,107,195,222,116, 80,156,179,
-211,226,108,199,239,180,213,243,111,174, 77,112,133,235, 78,222,175,173, 17,208, 30,229,111,224,192,129,159,168,148,170,189, 35,
- 98,134,143, 84, 41,149,  1,172,137,213,135,134,134, 86,134,133,133,149, 43,149,202,243,149,149,149, 14, 55, 10, 83, 38, 79,225,
-  0,108, 61,122,228, 68,110,236,216,177, 63, 72, 36, 18, 95,  2,202, 17, 66,192,113,180, 78,171, 86,200, 47,231, 21,171,190,221,
-184,193,161,118,222,250,204,  0,243, 64,234,166,  3,245,150, 45, 91,246,159, 63,133,  1,144,152,152,152,221,150,  5,127, 28, 41,
-172, 86, 67,192, 42,252,237, 41,232,109, 73,219,224,193,131,113,242,228, 73, 84, 86, 54,132,  8,123,  1, 64,117,181, 57,162,244,
-216, 99,143,253,161,153,213,244, 25, 81, 74,233,163,143, 61,138,213,171,215, 88,250,204, 89,248,250,250, 18, 71,191,111,133, 68,
- 34,182,242,153,189, 41,181,198,246, 59,  0,236,110, 54,209,127,197,138, 21, 87,164, 82,105,133, 76, 38,227,217, 14,  8,180, 76,
- 11,116,184,161,179,206,125,143,141,141,109,247,103, 55,124,248,240,166,123,  1, 52,124,238,236, 10,128, 50,153,140,100,103,103,
-211,173, 91,183, 54, 90,168,199,202,237, 74,121,142,139,139, 35, 70,214,  8,163,202,216,174,247,222, 90,232,223,217,189,  1,102,
- 44,219,  0,216, 44,252,115,239, 27,191,143, 75, 82,183, 83,122, 27, 69,  0,  6,182,110,124,150,198,150,162, 20, 64,244,251,254,
- 88,114,186, 15,130,  1, 84, 22,168,209,187,119,111,  0,192, 39, 75,252, 49,105, 68, 48, 34, 38,229, 59,244,219,206, 76,117, 75,
- 75, 75,147,183,182,236,177,189,246,166, 61,218,188,182,114,221,141,251,109, 79,140, 30, 51,250, 10,128, 43,183, 69,172,  3,  3,
- 93,226, 27, 55,126,100, 17,154, 29, 21, 26,134,222,125,  6, 57, 99, 72,181,235,125,182,199, 34, 63, 46, 25,  0,119, 90,192,246,
-236,217, 19,151,177,162,227,237,  5, 96,173, 72, 35, 70,140,192,158, 61,123,116, 22,209,231,  0,120,220,137,200, 67, 59, 21, 18,
- 34,147,201, 26, 60,251,214,196,255, 78, 98,225,194,133,182,241,212,134,  6,219, 58,141,208, 25,111,231, 78, 62, 95, 91,238,236,
-236,236, 54, 47,251, 27, 23, 23, 71,226,226,226,218,156, 46,123,107,251,183,  7,218,210, 37,176,104,209, 34, 20, 22, 22,182, 91,
- 90, 28, 89,222,215, 89,156,121, 77,129, 51, 48, 15, 12, 29,159, 44,193,254,227,125, 16,234,225,133, 95, 79,221, 66, 95,  7,197,
-223, 94,249,235,168,203,225,182,199, 90,  2,127,166,251,237,128,207,191, 75, 59,243,173,186, 91,105,191,235,187,  1,222,169,  8,
- 67,123, 26,  1,137,137,137,226, 63, 89,  1, 36,127,240,111, 91, 87,168, 97,173,  6,128,187,241,232, 56,104,107,151, 64,207,158,
- 61, 73,207,158, 61,219,165,189,113,102, 31,  0, 87,113, 36, 77,139, 35,105,249,238, 58,235,134, 27,246,156,200,168,168, 40,234,
-126, 12,110,184,225,134, 27,110,184,241,247,  2,227,126,  4,110,184,225,134, 27,110,184,225, 54,  0,220,112,195, 13, 55,220,112,
-195, 13,183,  1,224,134, 27,110,184,225,134, 27,110,184, 13,  0, 55,220,112,195, 13, 55,220,112,227, 47,129, 70,179,  0,230,205,
-155,231,242,200,212,230,230,137,187,249, 58, 30,223,220,185,115, 93,226, 27, 54,108,216,109,124,103,207,158,117, 57,125,205,241,
-253, 89,242,195,217,103,184,126,253,250,187,146,190,246,206,143,187,153,191,246,166,137, 58,251,252,218,155,207,221,190,184,249,
-154,225,235, 10, 64,  1, 64,  8,160,182,163,165,207,105,  3,192,141,191, 62,214,175, 95,239,126,  8,127, 51,248,249,249, 49, 48,
- 79,207,228,215,213,213,113,148, 82, 83, 71, 74,159,117,223,249,172,172, 44,218, 30, 11,205,180,215, 74,123,110,220, 57,236,218,
-181, 43,110,234,212,169,217,127,242,219,176,174,125, 37,113,214,  0,232,144, 17,  0, 55,254,122,160,148, 54,218,234,216,213,  8,
-192,218,181,107,237, 94, 51,113,226,196,184,204,204,204, 70, 43,139, 77,152, 48, 33,254,192,129,  3, 46, 85,244,244,244,244,102,
-249,146,146,146, 58,  4, 95, 71,  6, 33,132,244,  8, 13, 69, 81,121, 57,173,173,173,181,238,207,224,212, 18,131,182,198,226,169,
- 29,171, 75,  8,193,115,178,189,121, 25,210,201, 67,190,161, 20,202,245,251,242,158, 91, 52, 99, 36,  1, 67,249, 10,149,142, 14,
-159,249,188,211, 91,114,102,101,101,197, 89,151,156,181,252,119,105,185,217,166,226,111, 45,247,109,221,104,167,185,239,186,202,
-217, 30,124,109,221, 50,216,149,104,201,157, 16,255, 61,123,246,200,167, 78,157,250,103, 55,206,172,251,176,223,209,174,244,119,
-222,120,129,241, 18,248, 50,122,177,144,211,215,106,249,245, 90, 37,251,193, 39,171,219,101,135,193,219, 12,128,246, 20,  8, 87,
-185,156,229, 35,132, 48, 22, 43, 76, 75, 41,229, 58, 90,250,218, 75, 96,219,195,  0,176, 54,234,182,105, 37,132,232, 41,165,162,
-182, 68, 10,  8, 33, 20,  0, 86,173, 90,213,104,199,176,  5, 11, 22,200,  9, 33,160,148, 18,103, 27, 37,  0,224,190,247,111,116,
-158,153,149, 41,207,204,204,116,186,  1,108, 79,190, 63, 67, 20,133, 82, 74,227,123, 69,208,248, 94, 17,  0,128,114,  3, 59,167,
-147,144,191,217,250,249,111,202,122, 81,153,  3, 27,167,  0,192,201,237,159,230,115, 28,194,238, 25, 19,228,243,193, 75, 99, 15,
- 12, 25,226,119,253,185,229, 35,255, 11,  0,183,234, 52,255, 39,224,147,255,  1,228,226,220,185,115,  7, 58,251,108,154, 46, 69,
-219,150,229,102,109,197,191, 61,140,128,150,190,227,170, 88,182,  7, 95,114,114, 50,210,210,210, 28,186, 39,103, 34, 42,173,241,
-181, 87,100,198, 86,252, 57,142,195,250,245,235,177,121,243,102, 58,103,206, 28,226,100, 30, 11,101, 50, 89,187,172,151,189,120,
-241,226,185,169,169,169,174, 86,104, 31,139,231,175,190, 19,117,120,211,154,181,204,163, 97, 17,226, 23,146, 30, 23,134,244, 15,
-227,243, 73,  8,163,169,171, 99,197,  8, 53, 48, 93,186, 26,116, 55,175, 25,218,250, 27,124, 71, 26, 55,169, 84, 26, 12, 96, 56,
-128, 83, 50,153,172,178,131,121, 58, 62,  0, 18,  0, 76,  7,176,147, 16,146, 69, 41, 85,182,  3,239,119,148,210,135, 93, 21,216,
-142,  2,134, 97, 90, 53, 82,  8, 33, 35,  1,  8,  9, 33, 33,148,210,138,150,174,107,205, 64, 33,132,208, 23, 95,124, 17,221,187,
-119,191,109,187,208, 85,171, 86,197, 23, 23, 23,203,  9, 33,212, 81, 35, 64, 42,149,210,141,207,123,226,241,177,183,111, 46,195,
-125,239,143, 77, 63, 25,240,164,147, 94, 83,123,242,213,213,213,197,189,254,250,235,242,148,148, 20,196,199,155, 87,182, 59,119,
-238, 92,220,218,181,107,229,221,187,119,  7,199,113,208,106,181,136,139,139,195,196,137, 19,237,114, 10,235,212,113,125, 95,223,
- 38,207,140,238, 26,223,233, 95, 19,178,  1,128, 45,103,227, 46,191,205,202, 77,221,125,160,228, 60,161,208,250,160,194,247,100,
-252,211,139, 66,236,122,199,189,186,117,234,212, 93, 40, 41,123,254,185,199,244,161, 18,161, 80, 89,163, 37, 43,190,218,178,249,
-141,103, 30,133,191, 68, 66,117, 70, 19,253,247,234,175,244,  0, 72,231,206, 65,252,242,242,106, 38, 42,170,249,157, 53, 71,132,
- 28,136,188, 25,230,225, 23,123, 79,240,170, 97, 49,  1,130,141, 27,175,134,  7,  7, 73,170, 62,124,233,248,170,162,235,195, 76,
-147, 39,117,206,205,191,162, 42,126,242,241, 94,137,214,114,227, 76, 29,176,221, 32,167, 45, 94,104, 83,241,111, 90, 63, 93,225,
-239,136, 17,  0,139, 16, 83,171, 17,144,156,156,108,123,190,145,104,219,110,236,227,170, 81, 97,229, 73, 75, 75,107,115,148,192,
- 86,252, 23, 44, 88,128, 83,167, 78,209,159,126,250,  9,115,230,204,113,150,202, 32,149, 74,  5, 50,153,140,109,135, 38,178,124,
-241,226,197,211, 83, 83, 83,119,186,240,221, 48,  0, 53,  0,194,  1,156,203,201,201,233,  1,224, 51,  0,  1,182,252,  0, 62,137,
-141,141,117,120,207,  5, 45,167,229, 27,170,244, 30,147,167, 78,247, 85,192,232, 43, 16,240, 69, 74,157,152, 47, 20,106, 89,158,
-143,167,222, 32, 49,106,249,229, 55, 85, 98,158,168, 86,103,210, 27,164, 82,105,139,245,183,205, 17,  0, 66, 72, 55,  0,159,  3,
- 40,  5,240,162, 84, 42,253, 23,165,244,198,221,242, 96,237,136,116, 32,128, 77,  0,110,  2, 56,  6,224,  1,  0, 79, 19, 66, 30,
-167,148, 86,183,145,126, 22, 33,100,142,189,254,210,187, 25, 98,191, 67, 24, 13,224, 50,128,  8,  0, 21,196,162,212,142, 26, 52,
- 19, 39, 78,140,  3,208, 72,252, 23, 44, 88, 32,183,141,  6, 88, 62,147, 79,156, 56, 49,206, 94,119, 64,122,122,122, 28,128, 70,
- 98,205,204, 82,192,214,123,127,124,172, 16, 79,126,170, 70,122,122,122,156,189,240,125,123,243,  1,192,241,227,199,229, 98,177,
- 24,185,185,185,141,246, 59, 96, 24,  6,111,190,249, 38,177, 54,118,187,119,239,150, 79,156, 56,209,110,  6,116, 58,126, 81, 78,
-197,  2, 12,169, 20,202, 43,126,223,138, 21,132,161, 24,242,166,129,  0,  6, 92, 56,114, 61,238,230,246, 41,114,224, 68,171,141,
-112,124,175,  8,218, 93, 40,193, 43,207,206,209,135,122,  9,133, 85, 23,114,136, 39,195,199, 11,227, 34,209,197, 79,130,235,185,
- 71,137,214, 64,201,130,185,143, 25,226,123, 69,208,126, 30,222, 40,163, 85,100,216,176, 97,205,242,  5,  5,  9,239, 21, 10, 25,
-241,177, 99,101, 47,178, 38,221, 71,161, 93,123, 26,253,130,  4, 68,169,188,234,209, 51,194, 35, 40, 32, 64, 84,201, 81,165,254,
-199, 19, 21,234,121,227,254,152,  2,220, 52,236,111, 91, 55,157, 53,  2,172,215,216,142, 35,176,119,157,189,237,183,219,147,207,
-214,  8,144,201, 20,  0, 20,144, 74,253,209,156,104, 59,138,150,140, 10, 75, 68,166, 77, 81, 15, 91,241,223,189,123,183,156, 97,
- 24, 48, 12,131,113,227,198,225,232,209,163,141,242,203, 81,152, 76,166, 60, 30,143,103,148, 74,165,124,153, 76,214,214,241, 44,
-146,234,234,234,239,  3,  3,  3,103,166,166,166,110,119,242,187, 90,152,247,139, 81,229,228,228, 12,  2,176,253,224,193,131,125,
- 56,142,179,213, 40,240,120,188,135,  0,100,199,198,198,198,219, 35,204, 47,204, 23, 75,132, 98, 95,129, 64, 20,204,240, 73,103,
-202, 19,249,113, 60,158,136, 35, 12, 56,194, 55, 82, 30,175,158,199, 17,149,154,103,170,241, 20, 10,  8,175, 87,183, 58,241,212,
- 16, 22,197,119, 46,  2,240, 17,128,131, 22,203,230, 89,  0, 31,173, 95,191,126,166,139,130,237, 15,224, 69,  0, 35,  0, 36,  2,
-216,  3,224, 36,128,143, 41,165, 10, 23, 40,143, 88,210,181,150, 82,202, 17, 66, 60,  1, 60, 97, 57, 63,176, 13,134,133,175,229,
-173, 39,  0,165, 51, 30,118, 11, 17, 20, 33,128, 55,  0, 44,149,201,100,  6,116, 44,140,  0,144,  3,160, 19, 33,100,171, 37, 79,
-190,105,106,208,180,100,160,100,102,102,202,109,195,254, 11, 22, 44,104, 56,182,125,191,106,213,170,120,139, 97,208,106,141,207,
-204,204,148,219,134,233,153, 89, 10, 92,217, 99,222,133,145, 73,252,166, 65,180,185,239,253,193,204,202,148,219,219,208,167, 57,
- 62,107, 99,198,204,146, 82,103,249, 40,165,113,199,142, 29,195,156, 57,115,240,197, 23, 95,224,204,153, 51,113,209,209,209,217,
- 77,175, 17,139,197,242,206,157, 59, 59, 18,171,143,235,124,236, 23, 92,158, 19,  7,175, 47, 46,128,148,105,226,104,103, 15, 11,
- 31,177, 92,130, 56,129,174,187, 60,160,115,235, 91,217,198,247,138,160,115,255, 57,203, 16,234, 41, 20, 24,175,158, 18,250,  7,
-123, 19,121,153, 18, 51,163,186,161, 95,152, 31,132,181,151, 33, 87,105,209, 77, 32,130, 31,225,  9, 22, 63, 61,135,214, 11, 69,
-249,241,189, 34, 40,124,252,154,229, 84,212,170,  2, 70,142,244, 90,165,100, 71, 45,242,246,175, 20,233, 24, 79, 78,226,101,208,
-  7,  4,  5, 50, 30,126, 98,190,162,166, 76,164,172, 99, 33,168,211, 19,219, 50,211,154, 65,107,233,247,151,219, 19,206,228,228,
-228,120,123,227,  1,154,243,252,155, 26,  2,206, 24,  1,214,207, 90, 19, 99,219,243,246,132,177, 41, 31,221,230,127,123,123,147,
-162,128,163,124,173,133,251,219, 34,218, 77,141, 10,  0,  8,  8,200,106, 23,241,159, 55,111,158,185,251,141,227,240,234,171,175,
-226,163,143, 62,106, 16,255,181,107,215, 58,205,205, 48, 12, 12,  6,195, 89,161, 80,200,182, 67, 36,160,  6,  0,170,171,171,183,
-  7,  6,  6,198,167,166,166,202,157,248, 46, 31,  0,158,124,242, 73, 81, 78, 78, 78,102, 86, 86, 86,167, 37, 75,150,176,111,189,
-245, 86, 35, 93, 13, 12, 12,196,161, 67,135,226,  0,164,197,198,198, 38,183, 70,200, 35,  2, 31,  3, 75,187,112,156, 49, 66,200,
-227,245,160,132,132, 16, 62,159,240,121,188, 58, 66,136, 22,132,167,228, 40,252,169,129,243, 80,154,140,232,229,195,106,153,145,
- 42,174,221, 12,128, 38,125,195, 97,  0,186, 81, 74,173,130,255, 62, 33,228,132, 84, 42, 13,163,148,150, 58,227,193, 18, 66, 30,
-179,136,245,  7,  0, 22,  1,120,212, 18, 66, 73,  6, 80, 76,  8,121,150, 82,250,141, 19, 34,253, 31,  0, 87, 41,165,107,  8, 33,
- 34, 75,133,103, 41,165,159, 17, 66, 38, 17, 66,254, 67, 41,253,127, 46, 22,138,241,  0, 42,  1,220, 11,224,127,206,124,177,185,
-  8,128, 84, 42,125, 10,192,219,  0,202,231,206,157,187,174,131, 69,  0,  6, 90,210, 54,  1,192,100,  0,215,237, 25, 52, 45,193,
- 86,240,109, 69,191,233,184,  0,135, 43,186,141,248,  3,192,149, 61,143, 53, 50,  2, 92,225,179,109,204,100, 50, 25,177, 53,  2,
- 28,193,225,195,135, 97, 48, 24, 16, 19, 19, 19,255,211, 79, 63,201,139,138,138,228,209,209,230, 45,117, 57,142, 67,106,106, 42,
-173,175,175,135, 64, 32,192,140, 25, 51,236,222,183, 46,247, 36, 24,  3,139,218,152,240,120,193, 79, 55,229, 87, 55, 28, 70,175,
- 55, 38,155, 69,139,163,200, 75, 21,210,154,122,111,104,  5, 94,152, 48,239,138,253,231,200,240,234, 43, 47,228,250,234,244, 38,
-198, 87, 34,162, 73, 81,221,225, 35, 17,144,146,234,122,120, 50,124,164, 12,235, 78,143,255, 90,129,159,255,183, 15, 61, 60,189,
-232,121,149,242, 58,128,190, 45,209,229,158,237,242,220,232, 97, 85,135,189,248, 17,172,144,189,213,107,252,152, 20, 47,157,193,
-115, 10,207,235, 36,163,172,173,241, 40,186,116, 50,194,104,184, 84, 89, 88,160,246,177,212, 25,187, 66,229,168,119,106, 29, 31,
-208, 82,255,115, 75,222,180, 61,175, 82, 42,149, 82, 87, 67,166, 29,  9, 77, 61,127,179,120,  3,105,105,237, 55, 72,176, 61, 60,
-127, 74, 41, 88,246,119,141, 30, 59,118, 44,142, 30, 61,234,146,248, 91, 96, 20,  8,  4, 38,142,227,142, 49, 12, 99,108,163, 17,
- 16, 98,125, 83, 93, 93, 45, 15, 12, 12,148,166,166,166, 58,186,115, 86, 81, 74, 74,138,207,225,195,135, 83,179,178,178, 58,125,
-253,245,215,220, 19, 79, 60,193,223,178,101, 11,222,121,231, 29,228,231,231,163, 71,143, 30, 40, 47, 47,199,187,239,190,107,122,
-251,237,183,147,  0, 60, 27, 27, 27,251, 89,139,140, 28,235,107,  2,211,131,112, 24,104,  4, 23,233, 33, 16,  9,133,124,166, 76,
- 44,224, 41,121, 18, 97,149, 72,196,171,215,155, 56, 15,190,145, 31, 96, 96,245,166,107,103,206, 42, 30, 11,254, 72,115, 28,174,
-233,135,189,  8,192, 36,  0, 57, 77,  6,142,229,  0,152,180,126,253,250,175,156, 16,235, 71,  0,188,  4, 32,188, 73,104, 94,  1,
-224, 23, 66,200, 39,  0, 14, 16, 66, 76,148,210, 45, 14,240,121,  0, 19, 92,166, 19,  0,  0, 32,  0, 73, 68, 65, 84,152,107,245,
-242, 41,165,250, 38,151, 60, 14,224, 87, 66,200, 74, 74,169,198,149,240, 63,128,175, 44,255,157, 50,  0,154, 10,166, 84, 42,253,
-  7,128,231, 44,207,114, 21, 33, 68, 47,147,201, 54,116,132,  6,132, 16,210,219, 18,194,250, 17, 64,  6,  0,107, 62,193,209,  8,
-192,223, 13,165,165,165,242, 81,163, 70,129, 16,146, 61,106,212, 40,252,240,195, 15,120,232,161,135,226, 58,117,234, 36,103, 24,
-  6,139, 23, 47, 38,150,198, 36,110,235,214,173,114,189, 94,143, 17, 35, 70,180,216,208,141,185,118, 83, 94, 62,170, 63, 64, 72,
-246,175,161,166,248,129,231,  2,228, 58, 14,241,230, 46,  0, 96,200, 98,  3,  1,170,161,174,174,139, 59,180,181,183, 92,237,125,
- 34,254,225, 39,124,154,245,138, 75, 12,236,202,245,235,183,188, 26, 28, 36, 41,170, 83, 27,124,195,253, 61,  5,201, 67,123,122,
- 12, 11, 23, 17,157,198,  4,141,150,195, 85,162, 53,101, 20,149,106, 10,202,235, 77,157,132,226,178,114,131,110,226, 13,189,241,
-  3,111,224,149,230, 56,125,252,195,186,106,235,175,116, 25,144,112, 31,115,241,120,217,248,210,223,126,184,209,123,248,220, 16,
- 94,255,168,146,179, 71,191,175, 35, 60,159, 17, 28,199,213,220,186,165,181,107, 69, 53, 21,108,123,199, 86,111, 54, 45, 45,173,
- 69,193,182, 13,175, 55,141,  4, 56,114,253,159, 21,  9,  9,  9,196,214,235,183,133,109,  8,191, 45,104, 15,158,250,250,122, 57,
-  0,240,249,124,188,252,242,203, 56,117,234, 20,126,250,233,167,182,210,234,  1,152,244,122, 61, 91, 90, 90,154, 25, 22, 22,102,
-180, 23, 89,108,  5, 42,219,131,234,234,106, 89, 96, 96,224,131,169,169,169,142,180,251,190, 58,157,174,207,194,133, 11,167,206,
-155, 55,143, 14, 30, 60,152,  0,104, 16,127,  0, 24, 61,122, 52,118,236,216,129,177, 99,199, 50,143, 60,242,  8,205,206,206, 94,
-195,227,241,180, 30, 30, 30,208,104,110,151, 38,142,163,186,108,249,193,244,222,189, 35,139, 35,122,132, 95,225,121, 75,202,120,
- 68, 88,199,136,  4,117,140,216,163,194,192,231,105, 64,141,  2, 78,108, 12, 81,149, 86,  7,157, 56,116,238,205, 32,255,208,183,
- 92,125,144,173, 70,  0,164, 82,233, 68,  0,155,155,120,181,135,  0,204,153, 59,119,238, 87,142,120,176,132, 16,158, 37,252, 61,
-173,165,126,121, 74,105, 53, 33, 36,  5, 64,  6, 33,228,123,  7,230, 41, 63,  2,224,  0,165,180,174,  5,190, 58, 66,200,  1,203,
-117, 95, 56, 41,138,247,  1,  8,  4, 48, 31,192, 86, 66,200,125,148,210, 67,174, 68,  0,  8, 33, 73,  0,222,  7,208,131, 82,170,
- 38,132,140,  6,112, 93, 42,149,170, 40,165,233,142, 70,  0,164,102, 83,223,145, 70,139,200,172,110,128, 99, 24,  3,224,  4,165,
-148, 18,179,219,116, 29,128,154, 16,210,205, 58,206,195,153,  8, 64, 83,143,191, 45,222,127, 67, 88, 62,241,155,134, 40, 64,100,
- 27,188,255,223,195,252,191,135,111,165, 82,231,188,127,163,209, 72, 79,157, 58,  5,111,111,111,228,229,229, 81,147,201,  4,165,
- 82,137, 75,151, 46,201,  3,  3,  3,209, 36,236,151, 61, 96,192,128,248,109,219,182,201, 71,140, 24,209,124,184,207,104,164,221,
- 78, 93,128,208, 59, 12,130,188,106, 26,106,242,134, 74,201,192,116,169, 30,  8,108,188, 35,181,103, 32,155,221,125,248,233,248,
-125,219,103,201,129,189,205, 54,118, 87,110,220,120, 45,178, 91, 55,160, 74,251, 42,  0,228,107,149,216, 45, 42,173, 28,112,239,
-248,224,  1,134, 60,252,114, 93,129,221,231,110,241, 11, 42,235,125,  0,160,220,160,243,191,161, 55, 38, 23,148,150,238,136, 10,
- 14,110,214,  0,184,119, 74, 10,227, 33,156, 56,152, 85,255, 82,220,189,127, 66,159,186, 27,219, 13, 87,127,201,172, 53,114, 94,
-183, 42,138,127,174, 80,214,120,142,  0,195,144, 26,149,206, 87, 58, 43,186,155,236,251, 51, 55, 90, 42, 51, 50,153,140,216, 70,
-  0,108,189,203,166,225,118,171, 72, 39, 39, 39, 35, 33, 33,129, 52,183,208, 73, 91, 70,227,187,186,112, 74, 71,131,181,186, 75,
-165,254,183, 69,  4, 92,141, 42,164,165,165,181,139,248,111,222,188,153, 30, 57,114,  4,116,155, 63, 72,138,  2, 31,126,248, 33,
- 40,165, 96, 24,  6,235,214,173,115, 57,178,160, 80, 40,244,  1,  1,  1,241, 71,142, 28,217, 59,126,252,248,201,205,149, 31, 39,
-224,103,169,175,115,171,171,171,215,  7,  6,  6, 62,  6,160,102,241,226,197,255, 72, 77, 77,181,231,168,213,237,218,181,171,116,
-223,190,125, 95,197,199,199, 63,213,175, 95, 63, 36, 36, 36,208,172,172,172,134,116,100,100,100, 64, 36, 18,225,250,245,235,216,
-187,119, 47,233,210,165, 11, 27, 27, 27,251,211,165, 75,151,154, 37,140,140,232, 83,166,213,234,230, 30, 57,114,100,125, 96, 80,
-160,210,215,199,167, 24, 66,161,158,213, 51,245, 44, 79, 95,171,227, 43,171, 60,245,158,226,155, 21,149,190,135,246,237, 93, 63,
- 96,224,160,247, 13, 58, 77,125,187, 24,  0, 82,169,148, 72,165, 82,107,226, 59, 89, 94,135, 45,211,236, 26,162,160,  0, 22, 16,
- 66,186,192, 60,194, 17,  0,154,181,208, 45,162,242,  2,204,  3,244,174, 53,225,105,138,107,150,235, 94, 32,132,124,212, 10, 31,
-  1, 48,  3,192,114, 59,124, 95,  3, 88, 68,  8,249,202, 78,250,108, 11, 77, 56,204,227, 29, 98, 96,238,251,127, 19,192,105, 66,
- 72, 47,  0, 69,182, 54,134,  3,124, 15,  3,120,218, 34,178, 90, 75, 90,181,150,227,117,132, 16, 33,128,239, 90,227,179,228,197,
- 99,  0,230, 57,106,  0, 72,165,210,181,  0,190,105,137,207,194,185, 18,128, 55,  0, 95,  0,187, 44,105, 19,195, 60, 79,252, 23,
-  0,163,  8, 33,243,  1,252,  4, 96,119, 75,233,  3,204,243,232, 91,232,235, 71,211,177,  1, 19, 38, 76,176,107, 12, 76,152, 48,
- 33,158,153,245,123,191,189,213,  8,176,190,183, 13,231,187,204, 55,235,246, 41,129,142,240,157, 59,119, 14,221,187,119,199,203,
- 47,191,220, 80,102, 54,109,218, 68,115,115,115, 49,101,202,148,219,174,247,240,240,144,139,197,226, 22,249,194,207,157, 67,109,
-247,206, 56,254,242, 83, 13,124,151, 95,219, 17, 23,145, 91, 39,103,166,136,111, 75, 75,113,190,  1, 34,113,235,179,159,174,150,
-148, 44, 68,215,174, 63,  3, 24, 77, 65,121,184, 86,249,178,134,101,193,234,204, 65,178,139,149,149,184,166, 51,108,226, 19,162,
-  2, 33,198,171, 37, 37,233,  0,208,210, 32,192, 46,225,253, 22,  2, 88,145,127,244,197, 34,113,232, 12, 69,105,185,184,107,121,
-201, 73, 49,  4,  1,189,139,174,155,194,170,203,111, 64, 40, 20,132, 12, 12,245,124,164, 86,101,252, 22,192, 13,123,158, 43,128,
-184,166,211,255, 90,240, 64,227, 93, 89, 19,160,185,254,255,191,  3,218, 58, 85,207,250,253,180,180, 52,218, 86,190, 45, 91, 54,
-211,236,236,108,144,116,179, 97,124,224, 45,111, 76, 92,162,194,248,241,227,225,204,180,191,230, 16, 16, 16, 16, 15,  0,247,220,
-115,143,166, 29,186, 41, 20,129,129,129,115,  0, 88,157, 83,125,106,106,234,110,  7,191,203,  2,168,200,200,200,144, 63,244,208,
- 67,195, 83, 83, 83,135,152, 76, 38, 34,145, 72, 48, 97,194,  4,236,223,191, 31, 28,199, 33, 49, 49,145,190,248,226,139, 36, 42,
- 42, 74, 63, 99,198,140, 30, 53, 53, 53,183,116, 58, 93, 75,138,204,254,122,233,202,166, 65,131,135,248,158, 60,113,226,253,179,
-124,254,160,158, 61,122,126,233, 19, 24, 92, 34,  8, 22,211,195,123, 15,249,215, 40,170,199,133,  5,  4,191,221,167, 79,159,195,
- 94,161,158,107,251,119,141, 49,228,229,229,181, 75,  4,128,  7,243,116,191, 88,  0,239,  1,120,222, 34, 60,158,182,245,  9,230,
- 65, 98, 87,  1,252,219,210, 37,112,170,  5,126,  6,230, 65,102,  7,  0,120, 56,144,158, 99,  0, 38,162,229,133, 21, 24,  0,193,
-  0,122,  0, 56,109,135,243,180,229,186, 16,180,220, 55,201,192,188,140,163,191,165,219,224, 33,139,112,231, 91,184,243, 45,199,
- 91,  0,252,  0,243,140,  3,  5,  0,131, 29,190, 89,150,200, 67, 63,139,145,100,155,206, 50,  0, 82,  0,191, 89,174,253,222, 14,
-223, 75, 48,207,110,112,164, 43,195,  3,192, 62,  0,155,237,228,199, 76,  0,255,181,252, 63,107,147, 62,129, 37, 47,211,  0,124,
- 10, 96,137,229,243,178,150,126,240,192,129,  3,217,132, 16, 20, 23, 23,203,173, 51,  1,154,122,253,197,197,197,114,235,181,246,
-110, 32, 41, 41, 41, 59, 51, 51, 19,155,126, 50, 52,140,220,111,234,165,111,250,201,208,112,237,221,228,203,205,205,197,184,113,
-141,135,186,135,135,135,199,111,219,182, 77,222,179,103,207,120,142,227,228, 75,151, 46,165,214,105,128,132, 16, 12, 31, 62,188,
- 69,163,162,111,110, 46,190, 11, 12,137,247,177, 57,215,127,254, 68,168,223,191,  1,220, 31,  2,202,  1,121, 75,  5,180,158,243,
- 66,141,214,  7, 10, 50, 12, 67,199,237,138,111,173,216, 91,102,112,108,  7,176,189,119,143,176,190,  0, 94,214,155, 56,164,231,
- 21, 97, 92,168,185,187,147, 80,170, 82,177,236,123,183,110,221,186,229, 64,153,122, 31,128,103,254,111, 53,143,214,158,222, 22,
- 84, 81, 86,131,138, 91, 42,240,249,213,158,245, 10,138, 90,165,137,134,  4, 11,253,248, 28,166,107,245,166,239,150,188, 28,235,
- 23,210,255,137, 90, 59, 66,147,109, 79, 92,218,220,135,157,176,205,252, 63, 43,197, 73, 15,248,206,206,  2, 32, 41, 10,180,133,
-175, 37,143, 61, 38, 38,166,195, 24, 34, 13,131, 29,173,226,159,199, 98,131,220, 92,199,218, 42,254,214,178,241,236,179,207,  6,
-243,249,252,138, 99,199,142,125,121,207, 61,247,180,101,138, 98,247,212,212,212, 53,150, 40,192, 44,203,140,128, 89,169,169,169,
-223, 59, 18, 84,  4, 80, 15,160, 42, 60, 60,124,232,216,177, 99, 75,207,229,229,117,214,106,181, 68, 46, 63,  4,145, 88,  4,134,
- 48, 56,116,232, 16, 25, 48, 96,128, 38, 57, 57,121, 84,101,101,165,221, 58, 55,123,214, 76,246,199,189, 63,126, 58,116,232,176,
-158,  6, 86, 63,249,106,254,149,167,185,162,130,167,  0, 64, 12,134, 14,238,221,247,100, 72, 72,112, 54,143, 47,124,237,191,111,
- 45,175,255,118,163,235, 61,202,205, 25,  0, 47, 91,172,161, 41,  0, 46,  1,240,106,230,123,123, 44, 30,123, 18,128,145, 22,241,
-108, 54,202,  9, 32, 18,192, 86,  7, 13,128,106,203,245,188, 86,248,226,  0, 92,113,144,239,138,229,250, 29,173,240,205,  5,240,
- 36,128, 11, 48,207, 80,184,214,132, 91,110,241,254,159,179,120,195, 27,129, 22, 71, 92,240, 44, 30,251,227,  0,162, 44, 81,132,
-230,210,169,180,124,190,206, 98,  4,108,108,133,239,107,139,209,229,200,253, 82,203,245,173, 61,191, 15, 44,145,141,  3, 22,163,
-  6, 77,184,247,  3, 24, 96,201,139,124,139, 33,213,173,213, 31, 53,247, 32, 80,  0,242,230, 22,  2,178, 94,227, 76,  5,127, 82,
- 42,165, 79,126,170,110,102,225, 30,133,211,  2,209, 94,124, 47,188,240,194,109,215,140, 31, 63, 62,123,252,248,241,  4,  0,238,
-187,239, 62,167, 26,161, 61, 47,188, 64,124,154,182, 40, 61,188,178, 37,171,251, 19,  0, 24, 40, 19, 16,115, 80,198, 58, 50,251,
-186,131,197,192,146, 47, 38, 90,  4, 62,192,171, 71,131,248, 91, 92,228, 91, 98,177,216,209,217, 40,  4,192, 59, 71,179,206,122,
-132,118,237,241, 32,  7,143,200,146,226,114,158, 81, 87, 75, 59,133,120, 17, 47, 79,  1, 97,141, 28, 20,181,  6,150, 72,136,164,
- 78,197,246, 14,105,217, 33,104, 86, 44,154,190,255, 35,151,239,189,211,179,  0,218,202,215,146,199,222,179,103,207, 14, 35,254,
-220,247,254, 56,144,103, 30,147,183, 81,110,192,119,199, 12,160,148,182, 75,190, 90, 57, 76, 38, 83, 53,  0, 68, 71, 71,183,105,
- 65, 32,171,248, 91, 80,101,249,239,104,221, 16, 90, 28,179, 51,  0, 48,112,224,192, 48,149, 82,181,104, 68,204,240,199, 84, 74,
-165, 47,107, 98,141,161,161,161,183,194,194,194,174, 40,149,202, 37,149,149,149,249,142,166,107,202,228, 41, 44,128,231,143, 30,
- 57, 49, 54,118,236,216, 41, 18,137, 36,136,128,154,  8, 33,224, 56, 90,173, 85, 43,214, 92,206, 43, 46,251,118,227,134, 54,173,
-  8,216,212,  0, 48,  1,248, 71, 43,  2, 98,139,147,150,151,201,242,106, 14, 38,152, 71,212,243, 28, 76,143, 28, 64,150, 29,190,
- 12,152,  7,173, 57,130, 71, 29, 72,223,122,  0, 95,218,225,249, 21,230, 41,144,112,128,239, 27, 75,196,192, 30,138, 44,158,189,
- 35,233,227, 57,145,167,235,237,240,221,239,  0,159, 53,218,176,209,242,108,236,206,181,165,148,146,137, 19, 39,198, 89,  5,223,
- 54,  4,239,202, 82,192, 50,153,140,164,167,167,199, 49,179,218,103,233,222,246,230,251, 51,160,160,228,166, 62,178, 91,183,141,
-243,222, 95,247,164,245,156, 65,192,108,214,105,184,125,229,197,197, 42,135, 10,211,250,245,180,234,244,  6,178,252,251, 95, 22,
-238, 94,125,223,206,227, 39,202,158,  9,246,229,166, 50,  1, 62,126,148,  2,132, 80,189,158,229,202, 57,160,202,160,231,252, 74,
-203,180,134, 72, 39,210,152,156,156, 28,111,219, 29,144,156,156, 28,223, 81,158, 95, 71, 92,  9,240,207,130, 73, 75, 84,119,244,
- 30,101, 50, 25, 39,149, 74, 59,139,197,226,178,232,232,232,251,219,131, 51, 53, 53,245, 96, 96, 96,224,147,169,169,169, 27,157,
- 48,  0, 88, 75,228, 20,  0, 48,122,204,232,229,  0,150, 55,189,176,233, 24, 33, 71, 49,110,252,200,159, 96,238,138,109,130, 48,
-244,238, 51,168,205,247,220,156,  1,160,115,129,135,182, 18, 34,209,187,249,254,178,124,141, 96, 17,250,118,171,232, 73, 73, 73,
-217,246,230,229,255,145,124,127,  6,212,104, 52, 79,  1, 30, 70,  0,193, 28,104,169, 78,103,216, 82, 94, 94,121,158, 82,234,240,
-180,169,160,152,127,208,140, 15, 39,147, 91,158, 15,231,118, 29,139,220,172,175, 62,120, 57, 32, 64,180,136,207, 35,180,172, 90,
-119,185,204,192,110,146,  8, 24,177,132,207,227, 25, 89, 78,236, 76,250,172,125,252,214,129,103,174,238,  3,112,219,212, 63,155,
-208,191, 43,139,205, 52,245,204, 29, 57,127,183,249,238,182,225,227, 40,152, 89, 10, 16, 66, 48,117,218,239,  3,162,247,236, 61,
-211,208,134, 36, 78,142,110,175, 41,138,229,237,217,222, 88,140,128,141, 78, 92,238,111, 49,  0,212,127,214,246,129,223,228,129,
- 82, 71, 27,251,166,104,110, 20,187,155,239,175,205,231, 70,199, 71,117,117, 53,133,185,155,171, 77,184,229, 57,157,  2,192,209,
-205, 31,147,132,167, 94,249,240,241,185,121,159, 62, 63,251,216,  0,131,154, 68,  4,  8,248, 65, 32, 68,227, 37,225, 87, 14,234,
-231,147,239, 44,119, 66, 66,  2, 73, 75, 75,115,121,189,249, 59, 37,158,127,150,  8, 64,199, 51, 30,204,177,161,191, 65,245, 10,
-179, 56,204,222,248,147,238,  6, 72,162,162,162,254, 30, 67,100,221,112,195, 13,240,121,128,135,136,128,227,204,109,116,189,214,
- 93,253,221,112,227,111,219, 30,184, 31,129, 27,110,252,125,192,154,  0,165,198, 42,250,110,241,119,195,141,191, 51, 24,247, 35,
-112,195, 13, 55,220,112,195, 13,183,  1,224,134, 27,110,184,225,134, 27,110,184, 13,  0, 55,220,112,195, 13, 55,220,112,227,175,
-136, 70, 99,  0,230,205,155,231,242,200,205,230,214,214,110,142,239,127,223,127, 30, 55,104, 72,111,121,231,174, 97,241, 42,173,
- 90,126, 88,158, 27,159, 52,235,217,108, 87,249, 86,127,181, 61, 46,106,200, 40,249,173,210, 82,120, 74, 60,113,163,164, 32,254,
- 95, 79, 77,115,153,175,189,239,247,194,225,121,113,163, 71,245,148, 75, 60,121,224,243, 24, 16, 49, 65,153,242, 69,226, 42,223,
-153, 91, 67,226, 70,140, 26, 33,247,245,226,  1,124,160,230,220,122,226,104,250, 34, 39, 69,186,124,191, 87,246, 95,185,141,111,
-228,200,145, 46,243,157, 56,113,226,118,190, 72,215,211,119,226,202,237,233, 27,213,167,143,203,124,199,243,243,255,116,124,147,
- 90,201,223,229,203,211,232,162, 69,201, 45,126,190,191,153,252,141,124, 96,146,235,229,101,223,254,219,203,243, 36,215,203,203,
-242,204,106,234,195, 21, 52, 58, 23, 20,249,176,203,124, 85, 87,190,187, 45,125,103,223,184,238,114, 67, 58,108,105,143,219,206,
-125, 24, 84,234, 50,223,203, 85, 97,248, 35,218,171,191, 59,159, 84, 42,229, 55,183,179,160, 35,124,251,247,239,  7,  0, 40, 20,
-138,  8,157, 78,167,120,242,201, 39,107,255,200,251,117,218,  0,104,  9,186,173,210, 72,  0, 61, 97, 94, 39,160, 64, 60, 91,118,
-205,209, 31,216,254,205,242, 56,  2, 14,193,126,  1,200, 61,124, 70,254,245,215, 31, 35, 54, 33, 22,172, 90, 35, 31,208,111, 60,
- 56, 14,242, 95, 35,190,142, 31, 54,108,  8,174, 94,189,142,186, 90, 53,  6,143,153,147,221, 18,223,250,111,229,113, 20,  4, 61,
-122,247,148, 75, 95, 89,130,234, 79,182,227,155,207, 63,  3, 32,198,158,243, 37, 96, 24,200, 63,126,231, 45,228,231, 95, 70,120,
-120, 15,136, 36,124,220, 44,201,111,113,113,145,194, 29,159, 81,161, 80,  8,137, 68,130,130,130,  2,116,  9,241, 65, 16,223, 11,
- 93,186,251,193, 95,226, 11, 79, 98,  2,195, 48,160,156,  9, 26, 17, 31,117,183,234, 80, 49,220,254, 92,242,186,130, 53,212, 91,
- 82,135, 49, 35,122,193,203,147, 15,161,132,  1,159,  7, 48, 66, 62,250,134,125, 78,141,148,135,194,155, 79, 57,156,225,171,247,
-234,226,194,194,194, 16,123, 79, 87,185, 86,167,  7, 35,146,  0, 70, 32,175, 62, 58, 78,171, 81, 99, 84,200,229,236, 63,202,138,
- 92,191,126, 61,157, 59,119,238,223,106,126,125, 71,133, 61,161,111,227,245,158,  0, 70,116,146,120,252,183,180,180,180,159, 64,
- 44,  2,231,225,177, 12,230,149, 49,235, 59,202, 51, 40,248,117,111,220,181,139,135,111,219,107, 32, 33,121,217, 95,165,140,146,
-111, 54,109,250, 77, 36, 20, 74, 56,142,243,245,244,242,242,122,112,234, 84, 15,152, 87,176,235,168, 35, 59,173,209,102,174,173,
- 68, 82,169,212,199,215,215,119, 65,223,190,125,103,136, 68,162,174, 37, 37, 37, 37,165,165,165, 39, 12,  6,195, 82,153, 76, 86,
-224,  2,159,159,191,191,255,146,251,238,187,111,242,179,207, 62, 27,254,197, 23, 95,220,186,112,225,194, 49,157, 78,247,174, 76,
- 38,187,224,  8,199,254,253,251,241,227,200, 29, 24,179,247,222, 21,225,225,225,175,121,122,122, 98,251,246,237,167,103,206,156,
- 57,252, 79, 19,  1,104, 65,252,121,158, 34,254,136,199,198,246, 90,201, 81,170, 59,122,249,214, 39,151,182, 74, 15,136,103,203,
- 46,218,251,110,242,212,222,116,234,125,203, 97,172,175,  5,223,196,224,151,139,151,241,196, 19, 47,254, 94, 34, 24,224,231,220,
-141,  8,234, 30, 38,231,234,149, 48,112,  4,135, 14,229,198,151,104, 91,202,168,165, 20, 66, 95, 16, 15, 31,156,185, 88,140,243,
- 23,255,129,175,190,219,223,240, 57,199,  1, 15,140, 25,  3,212,151,  3,240, 70,193,133, 75, 16,  4,249, 33,118,244, 32,121,173,
-166, 21,155,133, 48,  0, 97, 16, 53, 36, 26,157, 60,133,232, 18, 36,134, 79, 96,  0,252, 69,222,240, 23,243, 32,224,241, 96, 52,
-153, 80,203,114, 56, 89,117,218,238, 67, 45, 63,191,132,  6,248,  2, 62, 30, 30,  8, 14, 10,132,143,143,  7, 40, 99,  2,203,213,
-195,  4, 19,188,188, 60, 16,212,169, 43,122, 70,254, 68,179, 14,143,109,181, 81, 90,151,105,160,190,222,158,232, 25, 17,130,224,
-160, 64,168,213,106,  8, 69, 98,  8,116,230,197,249, 34,194,123,200,107, 20,181,248, 62,183, 40,190,184,228, 38, 20,229,215,177,
-244,217,232, 86,141,129,180,229,105, 14, 55, 18,  9, 79, 38,196,251,135,250,103,183, 38,254,119,195,  8,120,227,253,247, 41,  0,
- 44,125,237,181,118,249,141,197, 43, 86, 80,  0, 72, 93,184,208,101,190, 31,115,114,158, 48, 24, 12, 27,  1, 96, 70,124, 60,227,
- 74,227, 43,219,182,205,188, 70,188,205,180,105, 74, 41,  8, 33, 13,255,173,231,172,215,205, 77,110, 89,176, 23, 45, 74, 38,142,
-138,186,147,226, 63,192,211,200,110,247,246,243,237,  7,  0, 66,137, 24,  6,173, 14,156, 90,179,226,216,145,195,239,220, 59,115,
-102,127,  0,197,246, 72,244, 60, 33,133,121,241, 20,214, 34, 10,156,165, 29,106,182, 45, 26,122,239,100,252,118, 40,195,169, 60,
-186,118,241,176,188,247,160,184,248,240,254, 15, 56,111, 20, 39,215, 56,117,121, 74, 74, 10,182, 37,103,181,122, 77,124, 86,227,
-173, 72,  6,248,153,111,181, 66,199, 65,203,154,243, 85,109,249, 47, 27,229,135, 62,222,130, 86,249, 86,174, 92,153,253,198, 75,
-175,134, 76,155, 49,221, 75,167,211,226,227, 15, 63, 96, 86,175, 94,173,155, 63,127,126, 24,128,155,237, 93,247,246,237,219,151,
-176,115,231,206, 76,192,185, 53,  7,114,115,115,105, 81, 81, 17,170,171,171,161, 82,169,224,237,237,141,192,192, 64,132,135,135,
- 99,204,152, 49, 46,213, 59,169, 84, 58, 62, 58, 58,122,211, 43,175,188,114,181,111,223,190, 27,135, 13, 27,118,233,214,173, 91,
- 93,115,115,115,163,159,122,234,169,221, 82,169,116,133, 76, 38,251,202,  9,190,248, 25, 51,102,164, 45, 95,190, 60,208,104, 52,
- 66, 34,145,192,211,211,179,179, 90,173,158, 57,109,218,180,  7,165, 82,233,124,153, 76,246,121,107, 28,207, 43,164,192, 72, 96,
-202,137, 25,240,236,238,217,101,209,162, 69, 56,117,234, 20, 85,169, 84,126, 54,191,  3,  0,188,153, 51,103,154, 38, 78,156,120,
- 87,196,253,220,185,115,141,142,155,219,208,141,223,130,232,119,  3,208, 11,230, 37, 99, 77,106, 61,123, 35,247, 74,197, 71, 99,
- 34, 67, 94,188,111, 64,231,119, 58,249, 74,186,200,183, 74,183,  2,184, 44,158, 45,107,113,147, 26,125,125, 13, 58,245,190, 31,
- 75, 94,155,129,141,178,223,235,226,225, 99,235,160,214,232,145,152,240, 34,238,137,125, 18, 15,167,220,  7,137, 68,  4,131,137,
-133, 74, 99,144,247, 25,221,187,133,194,113, 29, 48,  0, 51,230,172,197,191, 94,121,166,225,236,  3,247,196, 65, 44, 22,225,135,
- 67,251,177, 39, 39, 23,155, 54,124,  6,157, 86, 15, 33,143, 15, 47, 15, 33,212,213, 37,241,181, 37,104,118,247, 49, 74, 41, 64,
- 57,243,139,225, 64, 41,133,222, 32, 50, 55, 79, 34,128, 26, 76, 48,241,  0, 19, 76, 48, 25, 56,176,166,214, 13,216,130, 19,169,
-180,107, 48,133,143,183, 39,194,186, 70,160,223,224,222,240,246,146,160,174,190, 18,229,149,229, 80,212,221,130, 81, 71,224,225,
-225,129,224,224, 88,204,156,126,129,110,223,217,183,249, 48,254,230, 27,212,228,237, 13, 45, 31, 16,138,133,208,106,132, 48,104,
-132,208,137, 69,224, 19, 22, 20, 60,232,180,245,208,106, 84,232,218,181,139, 92,200,227,163,  6, 74,124,244,209, 17,136, 68,173,
- 23,142,247, 55,189,111,183,  0,189,246,248,107,173,126,174, 80, 40,104,147,227,152,128,128,128,124, 66,136,142, 82,202,247,247,
-247,247, 40, 40, 40,  8, 76, 75, 75,203,158, 59,119,110, 23, 87, 11,178, 48, 52,116,118,195,111,  0,113,254, 64,187, 69, 59,214,
-167,165,209,231,158,123, 46,222, 88, 81,225, 20,231,143, 57, 57,210,145, 35, 71, 46, 29, 27, 21,  5,163, 72,132, 85,171, 86,113,
- 51,239,187,111,  2,165, 52,203, 41, 87,142, 16,172,124,231,157,134,227,  5,111,191,141, 85,239,190,219,234,177, 61, 52, 53,  2,
-150, 47, 79,163, 49, 49, 49,200,202, 42,164,  9,  9, 61,  7,  2, 40, 92,190, 60, 77,235,164,248,231, 14, 30, 56,208,199, 90,103,
- 60,197, 18,148, 85, 86, 64,169,168, 69,244,200, 81, 30, 63,126,181, 33,107,202, 83,255, 24,  8,243,230,  5,173,129,125, 97,233,
-106,254,163, 51, 31,228, 71,134,135,115, 86,207,240,237, 85,159, 54,186,232,221,  5,207,155, 13,191,151,230,199, 63, 62,117,130,
-211,249,234,146,248, 55, 88,200,  1, 78, 92,156,224, 20,181, 39,159,224,252,187, 79,131,248,  4,193, 84,120, 30,250,194, 95,145,
- 95,163,198,240,189, 21, 14,125,127,157, 76,118,244, 21,233,115, 61, 30,255,231, 83,126,105,155,191,227,194,195,195,153, 37,203,
- 87,192,251,157, 37,248,225,135, 31, 74, 31,122,232, 33,151, 12,209, 22,132,127,194,206,157, 59, 15, 88,143,167, 79,159,238,144,
-114,169, 84,170,184,  3,  7, 14,200,141, 70, 35,122,245,234,133,113,227,198,193,215,215, 23,181,181,181,184,121,243, 38,174, 93,
-187,134,155, 55,111,210,137, 19, 39,198,123,123,123, 59,156, 79, 82,169,116,250,125,247,221,247,241,202,149, 43,183, 14, 27, 54,
-236, 99,171,177,211,165, 75, 23,204,156, 57,147, 36, 37, 37,121,  1,200,149, 74,165,185, 45,237, 94,218,148,111,254,252,249,233,
-207, 61,247, 28,115,250,244,105, 16, 66, 16, 24, 24,216,240,218,187,119,175,112,244,232,209,159, 73,165,210,227, 45,241, 61,175,
-144, 98,202,137, 25,  0, 64,182,167,236,160,247,126, 54,190,123,126,126, 62, 10, 11, 11, 73, 93, 93, 93, 47,169, 84,202,159, 54,
-109,154,  9,  0,157, 54,109,154,137,101, 89,220, 13, 52, 21,127,235,185,166,247,193,111, 70,252,  3,135, 71,  4, 62, 30,213, 35,
- 96, 14, 33, 68, 64, 41, 53,114,230,151,193,100,212,105,133, 12,215,101,112, 39,241,107, 65, 62,189,122,239, 60,121,237, 59,221,
- 86,233, 81,241,108, 89, 89, 43,205, 55,  6,244,239, 11,134,201, 70,126,109, 53,128, 75,168, 43,189,  2,129, 88,132,140,221,159,
- 64, 83,101,194,156,127,188, 12,142,  3,166, 62, 56,  6, 38,190,151,221,155,203,207,191,  4,142,  3, 18,135, 18,  0, 93,  0,244,
-128, 78,111, 64,210,  3, 19, 33,246, 99,176,105,203, 62, 48, 12,144,254,221, 70,148, 22,254, 26,255, 80, 92,100,246,229,179,205,
-115,113, 20,224, 56, 14, 28,199,193,100, 50, 65, 47,160, 48, 18, 35, 12,  6,  3, 52, 30, 58,128, 19,131,161, 38,152,132, 20,245,
-  6, 29,212,202,186, 86,211, 22,236,165,  7,159, 47, 65, 96, 96, 32,122,247,238,141,208, 78,163,  0, 30,  3,147,233, 52, 24, 90,
- 11,157,154,133,137, 83,163,252,102, 13,130,  3,171, 16,232, 23, 11,133,106,113, 92,115,155,188, 72,116, 44,168,190, 10,208,137,
- 96, 96,140, 80, 11,249,168,151,  8,192, 23,  8,  1,206, 19,132, 71, 80,175,214, 64, 81,126, 29,  5,167,115, 80, 83, 92, 12,142,
-227,192, 80,158, 75,133,230,171,181,191, 27,206, 79,205,123,202,126, 59,105,217,215,221, 90,116,210,210,210, 22,189,242,202, 43,
-207, 20, 23, 23, 51,132,144, 96,153, 76,246, 29,204,155, 59,121,180,161, 44, 11,214,172, 89,179,229,214,173, 91, 72, 79, 79,199,
-240,190,125,121,254,131,  7,183,185,130,164, 46, 92, 72, 20, 64, 28,165, 84,190,122,245,106, 57,  0, 72, 83, 82, 28,246, 74, 12,
-  6,195,186,177,150,202, 36, 20, 10,209,167, 79, 31,108, 63,116, 40,211, 18, 13,112,152,231, 78,109, 85,187,104, 81, 50,201,202,
- 42,164,167, 79,155, 35, 86, 54,255,127,189,247,222,123, 75, 23, 45, 74,246,117, 84,179, 60,141,236,246,193,  3,  7,250,240, 24,
-  6,207, 62, 58,  7, 90,157, 30,171,190,252, 18, 30, 18,  9,116, 58, 29,116, 90, 45,134, 14,139,138,220,191,121,243,115,147,230,
-204,249,200, 94,212,241,221,  5,207,115,  0,152, 43, 69, 69, 76, 83,193,111, 90, 61, 93,185,247,110,253,198,199,103,165,189, 78,
- 39, 76,125, 58,158,138, 34, 93, 50,  4,108,119,237,163,219,252,237,158,183,107, 65,249,241,113,189,222,132,195, 19,130, 33,120,
- 81,  6,229,156,  8,240,253, 67,156, 18,255,131,  7, 15,150,135,119,238,114,243,159,207, 62,211,237,245,151, 23, 98,245,134,117,
- 23, 71, 70, 71,247, 92,247,233, 58,143,151, 22,190,138,205, 99, 70, 97,203,150, 45,143, 61,242,200, 35,155,218, 40,252,113, 59,
-119,238,108,112,152, 44, 97,245, 23, 96,222, 42,221, 46, 14, 28, 56, 32, 15, 14, 14,198,176, 97,195, 88,134, 97,248,230,232, 44,
-  7,129, 64,128,128,128,  0,116,234,212,  9,215,174, 93,195,129,  3,  7,228, 51,103,206,116,168,174, 72,165,210,228, 41, 83,166,
-124,176,114,229,202, 79,251,246,237,187,150, 16,194,  1,248, 12,192, 36,  0, 71,  0,188, 75, 41, 45, 34,132,188, 10,224, 93, 71,
-248, 86,206,159,255,253,216,228,100,178,107,215, 46,240,249,124,200,229,114,156, 63,127, 30,189,123,247,198,123,239,189,135, 65,
-131,  6,225,153,103,158,225,191,249,230,155, 43, 91,244,252, 45,216,158,178,131,  2,128,135,135, 71,153,159,159, 31,196, 98, 49,
-132, 66, 97,189,112, 25, 88,122,140,146,105,211,166, 97,217,178,101, 56,127,254, 60,182,110,221,122, 87,196,127,238,162,101,191,
- 59, 58,203, 95,111,214,  8,104, 46,  2,192,240,121, 12,159,229,168,138,229, 76, 58,137,128,223,213, 75,200,244,  7,199,  2,145,
-247,  2,157,122,  3,183,174,160,243,229,156,233,143,197, 70,132,103,156, 43, 19,215,108,149,102,152, 55,183,107,190, 14,243,120,
- 86, 65,242,  1,208, 21,190, 97,125,113,253,114, 58,214,202, 54,128,209,123, 96, 98,124, 44,246, 29,204,129, 70,  3,120,  4,180,
-220, 46, 73, 60,250, 66,171,185, 12,147,201,118,111,154,114,  0, 55,193,240,226,240,248, 19, 79,131, 19,169,241,227,238,175, 48,
-245,193,167,224,225,  9,168,235,203, 44, 26,212, 60,140,224, 65, 96, 17,127, 35,107,130, 94,105,132,198,168, 65,173,132, 15,163,
- 70,  0, 61,223,  8,158,145,128, 53,113, 80,106, 89,212,212,179, 45,170,217,121,249,114,218,179, 19,  1,143, 71, 64, 24, 17, 76,
- 38, 10, 86, 83, 12,189,201,136,210,242, 58,212, 40,234, 81,167, 50,129,209,233,192,162, 28, 60,193, 57,116,233,174,196,168,232,
- 24,249,119,223, 94,106,150,147,  7,128,170,116,208,170,110,194,116,171, 14,188, 94, 93,193, 48, 12, 76,172, 30,181,229, 69,184,
-124, 34, 23,149,215,139, 45, 66,194,  7,195,  7,192,187, 59,221,128,214,144,255,250,245,235,245, 73, 73, 73,253,163,162,162, 88,
-145, 72,164,254,224,131, 15, 70,194,188, 41, 81, 31,180,113,166,137, 48, 52,116,  1,  0,140, 30, 52,  8,161,161,161, 21,171, 87,
-175,206,  2, 16, 63,108,240,224, 54, 71,  1,252,129,108,105, 74, 10, 17,132,132,196,173, 94,189, 90, 46,  8,  9,137,115, 38, 18,
- 96, 20,137, 32,208,235,177,125,251,118,132,132,132, 96,198,196,137,214,104,  0,117,198,  8,184, 83,176,138,190, 76, 38,179,109,
-248,112,248,240,225,176,209,163,147, 31, 68,203,219, 70,219, 98,132,159,191,127, 63, 30,195,224, 31, 73, 73,168,173, 83,162,178,
-166, 26,  2,  1, 31,124,190,249, 37, 16,  8, 32,146,120,160, 87,120,248,135, 87, 79,157, 62,223,123,120,140,220, 30,233,149,162,
- 34,124,187,253,127,183,121,252,214, 72,192,168,232, 33, 72,140,191,215,201, 59, 86,197,  1,222,217,125,  7, 39,102,247,237, 19,
- 25,159,185,235, 75, 57,208, 49,250,254,243,190,254,  8,250,125, 27, 16,242,249, 25, 12,240,227,131,231, 19,  0, 86, 81,129,225,
-123, 43,224,201, 39, 80,179, 20, 60, 59, 53,229,218,213,171,213,123,118,237,238,251,245,231, 95,227,147, 47, 63,187,190,238,131,
-143,222, 14,  8, 12,168, 93,178,116,201,193, 77, 91, 54, 99,220,232, 88,124,155,182,245,235,110, 61,186,125, 61, 46,118,156, 75,
-247,220, 84,252,119,237,218,133,174, 93,187,246, 58,121,242,228, 28,152,183, 26,183, 27,246, 55, 26,141,136,142,142,230, 88,150,
-229,171, 84, 42,136,197, 98,112, 28,135,223,126,251, 13,249,249,249,240,242,242, 66, 76, 76, 12,202,203,203,145,155,155, 75,237,
-117,  7, 72,165,210,217, 41, 41, 41, 43, 31,120,224,  1,175,181,107,215,250,124,252,241,199, 66,152,119, 45,205,  4, 16, 13,243,
-  6,103, 31,193,188,157,251, 65,152,119, 60,109,149,111,231, 43,175,108, 30,208,191, 63, 89,157,148,  4,114,255,253,216,126,244,
- 40, 87, 90, 90,186,  4,192,234, 27, 55,110, 76, 91,180,104,209,231, 63,252,240,  3, 98, 99, 99,225,233,233, 57,166, 37,174, 41,
- 39,102, 96,199,142, 29, 88, 63,201, 92,199,252,252,228, 85,157, 58,117,130,151,151, 23,245,244,244,188, 97,120, 29, 32,211,  8,
- 93,182,108, 25,172,134, 70, 99,253,186, 59,152,187,104, 89,131, 17,208, 72,236,155,158, 16,207,150, 85,254,124,181,114,221,198,
- 35, 87, 95,254,173,180,238,  0,  3,202,  7, 40, 48,229, 61,252, 28,243,  1,254,171, 72,194,161,129, 43,128, 73,139,225, 45,224,
-134, 61, 16, 21, 62,199,210, 93,112, 27,118, 29,170, 33,128, 18,211,158,120, 17, 28,  7,  0, 53, 48, 47,155,108, 68,143,190,209,
- 16,139,248, 48,177,122, 80,131, 57, 44,226,237,237,141,234, 26, 69,139, 55,241,209,135,175, 16,  0,184,248,243,151, 96,152,198,
- 78,  2,167,253, 21, 58,189, 17, 60,129, 24, 68,104,238, 67, 83, 41,149, 24, 51,102, 76,235,238,  8,103,  0,199,113, 96, 89, 22,
-122,189, 30,245, 28,139, 58,131, 17,202, 50, 37,234,110,214, 65, 89, 94,131, 26,101, 45,202,117, 26, 40,213,181,168,213,183, 60,
-214,201,219, 75, 13,150,229,160, 55,152, 80, 91,167, 68,254,213, 98,156, 56,157,135,159, 79,228,225,210,111,  5, 40,185, 81,133,
-122,181,  1,170,122, 61,202, 74,235,112,225,215,107,200,205, 61,139,146,178,242, 22, 57,109,139, 10, 91,167, 70,201,185, 75,248,
-101,239, 33,100,110,248, 16,135,182,110, 64, 73,193, 85,112,212,  8,142,144,  6,225,119,166,230,219, 11,243,219,  3,159,207,  7,
-128, 91,  0,110,249,251,251,151,120,123,123,235, 23, 45, 90,116, 18,230,  1, 99, 12,204,107,101,231,187,202,191,102,205,154,212,
-164,164, 36,  0, 64, 68,112,112,136,165, 79,156,215,158,149,195, 42,250,214, 72,128,  3,225,255,  4,  0, 88,181,106, 21,174,148,
-149, 97,198,196,137,176, 70,  3,242,242,242,  0,  0, 59,228,114,234,104, 86, 44,120,251,109,188,250,206, 59, 13,225,125,235,123,
-235,177,245,189, 35,225,127, 43,178,178, 10,105, 83,241,183, 61,206,202, 42,252,214, 17, 30, 63, 62,255,191, 58,131, 30, 60, 30,
- 15,191, 21, 22,160,176,228,  6,142,159, 59, 15,131,193,  8,  6,  4,124, 62, 31,132, 16,112, 38, 19,180,106, 13,242, 14,103, 31,
-114,128,150,177, 21,255, 71,103, 62,120,155,199,127,252, 76, 30,108, 35,  4,142,193, 38,156, 44,138,204,182, 10,127, 86,218,235,
- 84,192, 94,137,251, 67, 45,128,154, 50,  8,187,247, 65,197,115,247, 32,239,235,143,192, 15,234,220,240, 81,197,115,247, 32, 72,
-204,192,135,223,122,113,233, 27,217,183,139,135,135,167,199, 39, 95,172,209,197,223,123,175,112,212,152,209,155,175, 93,189,198,
-253,118, 53, 31,224, 40,196, 34, 17, 98, 99, 98,177,123,215,110,236,220,185,211, 41, 47, 96,223,190,125,113, 82,169,148, 90,197,
-255,192,129,  3, 88,183,110,157,  1,  0, 78,156, 56, 97,144, 74,165,143, 56,210,181, 80, 84, 84,  4,203,214,196, 76, 81, 81, 17,
- 50, 51, 51,145,151,151,  7,181, 90, 13,133, 66,129, 83,167, 78,161,184,184, 24, 55,110,220, 64,143, 30, 61, 80, 84, 84,212, 42,
-223,188,121,243, 30,127,248,225,135,223,143,139,139,243, 58,121,242,164,143, 70,163,249,167, 68, 34,201,  6,240,169, 76, 38, 91,
- 44,147,201,234,  0,252, 15,192,  8, 66,136,144, 82,106,108,205,233,152, 63,127,254,227, 63, 44, 88,176, 57, 54, 36,132,176, 11,
- 23, 98,140,193,128,147,187,118,209,210,210,210,167,101, 50,217,219, 50,153,172, 18,192,198,139, 23, 47,178, 44,203,194,203,203,
- 11, 97, 97, 97, 94, 70,163,177, 89,241,159, 52,105, 18,100, 50, 25,164, 82, 41,164, 82,169, 71,105,105,105,223, 27, 55,110, 64,
-173, 86, 19,133, 66,209,159,207,231, 79,176, 21,127,185, 92,142,  7, 31,124, 16, 29,  5,205,117,  1,132,  2,232, 53,125,120,247,
-103,187,  5,122,206,129, 81, 11,244,157,128, 51,193,211,113,223,252,175,160,173,170,  5,207,199, 27,242,143, 31,199,184,  1, 63,
- 35, 32, 47,115, 60,128,238, 45,253, 64,111,159,174,248, 37,111,135,141,189,161,182,116, 19, 26,  1,163, 30,124,142,  7,198, 82,
-239,119,254, 96,238,110,138,157,156,210,114, 65,189, 64,241,192, 48,219,109, 16,137,229, 54,  4,128, 64, 12,150,152,192, 89,218,
-221, 89,115, 94,  0,  0,249,245, 99,235, 91,172, 89, 38,142,130,229, 24, 48, 44, 11,198,160,135,198, 98, 89,104,121, 60,120,178,
- 90, 40,181, 20, 68, 64, 96, 50,153,160, 49,  1, 21,106,  3, 90,234,204,102, 13, 28,116,  2, 30, 56, 13, 11,150,171,131,170,222,
-  8, 30, 17, 64,207, 26, 97,160,  6,176, 70,  3, 32,228,192, 16,128,136, 56,212,105, 77, 40,175,212, 64,173,103,155, 13,198, 48,
-196,212, 96,  0, 16,242,187,158, 24,117, 90,212,213,212,128, 33, 60,240,249, 20,160,124,240,136,235, 29,127,151,175, 95, 54,244,
-237,209, 87,232, 72,216,191, 81,152,148, 16, 72, 36, 18,  0,208,  2, 48,240,249,124, 20, 22, 22, 98,249,242,229, 15,  2,184,177,
-104,209,162, 97,190,190,190,126,117,117,117,215,107,107,107,157, 14,119, 11, 67, 67,159,  2,128, 78,157, 58,217, 86,224,218, 79,
- 63,253, 52, 11, 64,194,176,193,131, 15,182, 87, 69,152, 63,127,126,188, 35,  6,192,143, 57, 57,113, 35, 71,142, 12,150, 42,201,
-129,  0,  0, 32,  0, 73, 68, 65, 84, 27, 27, 21,  5,226,237,141,229,203,151, 99,225,194,133, 16,  8,  4, 48, 42, 20,240,245,245,
-197,235,243,231, 55,140, 11,112,100,112, 96,211, 62,126,123, 99,  2, 90,194,114, 39,  6,119,158, 62,125, 26,167, 79,159,110,184,
-190,165, 62, 78, 69, 77, 77, 63, 47,111,111, 84, 41, 20,144, 31, 63, 14, 62,195,131,222,104,132, 70,171,  5,199,113, 13,131, 21,
- 89,163,  1,  6,189,222,145, 60,230,  0, 48,150,110,  0,206,166,224,235, 44,231,241,246,170, 79,133,  0, 16, 25, 30, 94,113,237,
-226, 47,109,202,215,132,228,101,228,183, 51,233,113,123,119,126, 41,111,143, 72,128, 51, 97,255, 70, 97,217,109,159, 35,234,137,
-151, 33,138, 24, 98,110, 43,170,202,144, 95, 99,222, 68, 78, 52,102, 10,138, 77, 44, 60, 86, 31,111,149, 67,169, 84,250,137, 36,
- 98,244,142,136, 16, 95, 43,185,209,185,186,178, 26,179, 30,157, 35,223,115, 48, 19, 31, 47, 91,149,190,115,207,174,164,200,136,
- 72, 60, 62,243, 49,228,158,201,193,206,237,219,233,116,  7, 66,236,182, 94,255,129,  3,  7, 48, 97,194,  4,171,177, 40,188,121,
-243, 38,158,121,230, 25,161,245,246,237,113, 85, 87, 87, 99,220,184,113, 48,153, 76, 40, 42, 42, 66, 78, 78, 14,  6, 12, 24,  0,
- 95, 95, 95,116,235,214, 13, 81, 81, 81, 96, 24,  6, 12,195,160,115,231,206, 13, 81,170, 22, 60,245,  1, 67,134, 12,249,104,204,
-152, 49,188,188,188, 60, 31,147,201, 84,190,125,251,118,165, 86,171, 93, 46,147,201,108, 13,216,103, 39, 79,158, 92,188,103,207,
-158,  8, 66, 72, 25, 90,216,209, 86, 42,149, 14,155, 31, 31,191,113, 20,159, 79, 42,151, 46,  5, 53, 26, 33,231,241,184, 92,141,
-230, 73,153, 76,246,141,173,221,241,214, 91,111,241, 25,134, 65, 77, 77, 13, 10, 11, 11, 43,  6, 13, 26, 20,210,148,111,210,164,
- 73,183,253, 70, 88, 88, 88,128,137, 82,104, 53, 26, 92,188,120, 17, 44,203,146,142, 42,254,183, 25,  0,186,173,210,200, 80, 95,
-201,216,201, 67,195,158,241,145,  8, 70,178, 38, 78,193,167, 38, 31,248,117,230,149,213,234,160,173,170,  3,132,124,152,106, 85,
- 40, 81, 24,128,192,238, 96, 56,131, 24,173,204, 38,184,170, 84,162,143,159, 15, 88, 61,112, 53,251, 91,244,142,155,212,224,192,
- 25, 13, 70,  8,192,160, 94,103,222,161,246,129,184,104, 72,  2,195, 90, 77,240,  3,131,  9,246,156,167, 16,136,  1, 97,247, 73,
- 48, 20, 31,109,112, 28,  4, 66, 17,140,208,193, 75, 98,222,145,116,215,158,173,248,229, 68,118,252,156,137, 49, 45,183, 70, 28,
-  7,161, 65, 11, 35,132, 96, 24, 22,208,153, 27, 54,163,209,  8,189, 78,  0, 30, 95,  0,232,  0,202,153,187,  8,122,132, 71,180,
-200,165,209,113,224,241,  8,140,172, 17, 58, 61,  7,165,202, 92, 14,141, 28,133, 65,207,  1,124,128, 39,224,129, 47,  6,136,214,
-  4,142,176,224,160,133, 74,107,  9, 72,219,129,  9,  0,195,  1,148,  0, 12,195,129, 16, 30, 56, 74,192, 48,150,177, 84, 28,  3,
-142, 97, 64, 56,199, 28,100, 27,239, 95,232,106,  1,242,240,240,128,197,219, 15, 46, 44, 44,172, 88,190,124,121, 60,128,135, 22,
- 45, 90, 52,177,103,207,158,106,149, 74, 85,205,178,108,131, 80, 56,163,255,107,214,172,249, 50, 41, 41,  9,225, 65, 65, 13, 39,
-195,131,130,252, 44, 81,128,224, 63,162,194, 24, 12,  6,185,213,219,167, 42, 21,254,253,239,127, 67, 95, 93,221, 48,242,173,183,
-197, 88, 17,232,245,120,240,193,  7, 43, 74, 43, 42, 30,  9,243,240,216,124, 55,210,102, 59,168,207,182,255,191, 57,196,196,196,
- 32, 33,161,103,195,245,205,173,  3,  0,  0,172,222,128, 90, 67, 13,116, 58, 29,252,124,125, 33, 22,138, 96, 52,177,160,148,194,
-100, 50,193, 96, 48,192,104, 52,130, 99, 77,142,230, 47,119,165,168,136,137, 12, 15,183,122,  4,220,149,162, 34,230,219,237,255,
- 19,219, 70,  4, 34,195,195,107,209, 78,131,217,250, 69, 39,101,151, 20,156,106,151,103,236,234, 24,128,123, 51, 43, 81, 17,158,
- 14, 97,247, 62, 32, 17, 67,208, 99,195, 89, 84,233, 56,120,242,  9, 12, 63,253,128,203,133,215,236,238,159,167,101, 13, 56,157,
-123,  2, 31,173,252, 16,247,196,141,197, 91,255,239, 29,236,223,187, 31,155, 55,125,131, 49,227,199, 38,117, 11,239, 14,190,135,
-  0,  7,143, 30,196,150,175,191,193,142, 31,182, 99,247,238,221,244,255,254,239,255, 72, 43, 34, 75,155, 10,191, 21,181,181,206,
-111,112,167, 82,169,224,235,235,123, 28,192,168,240,240,112,196,196,196,128,199,227,129,227, 56,244,232,209,  3, 34,145,  8,117,
-117,117,  8, 15, 15,135,183,183,247,117,149, 74,213,163, 37, 46,153, 76,118, 81, 42,149,166,238,216,177, 35, 49, 50, 50,178,223,
-246,237,219,235, 21, 10,197,187, 50,153,108,139, 77,250,167,223,123,239,189,175,108,216,176, 97, 27,128, 10,  0,201,  0,126,  6,
- 48,180, 25,190,179, 82,169, 52,213,239,212,169, 55, 30,102, 89,124,  8,112, 95,214,215, 63,214,132,239,161, 23, 94,120,225,195,
-185,115,231,226,218,181,107,216,189,123, 55, 88,150, 61,  4,224,225,214,238,219, 18,  5, 96,252,120,188,106, 47,131,  1,234,179,
-103,105, 48,199,169,174,  2,170,187, 45,254, 81, 81, 81, 56,119,238, 92,179, 33,127,123, 93,  0, 61,167, 15,239,190,196, 71, 34,
- 24, 89,169,212,237, 63,118,165,114, 57,120, 34,224,242, 81,220, 31, 78,177,248,249,  7, 17, 51, 48, 28, 47, 72, 39, 99,106, 47,
-  3,112,225,  0,168, 64,194,162,213,193, 58,181,200,175, 45,  6, 95,  4, 60, 48,245,101,108,249,100, 25,  0,  3,160,209,195,164,
-  5,126,144,159, 67,214, 73,243,140,194,174,221, 35,192,240,237,139, 87,226, 80,  2,163, 14,216,181,123, 31,134, 79,124,222,236,
-253, 67,  0,158,  4, 72,153,146,140,196,241,211,  0,  0, 37,215, 11,192,234, 12,173, 91,244,148,130, 37,102,129,215, 27,204,131,
-255,244, 58, 45, 52, 26, 13,234,235,235,161, 82,214, 65,165, 82, 65,169,170,135,174,190, 30, 90,173,182,229,194, 95, 79,160,213,
-153,160,213,153,160,214, 24,161,170,215, 67,161,210,163, 86,105, 64,157,202,136,218, 90,243,255,154,106, 22, 53, 10, 22, 53,117,
- 44,170,106, 12,184, 85,213,114, 26, 25, 74, 97,  2, 64, 76,  4,132,225, 64,  9,  5, 40,  5,165, 60,152,184,223,179,143,179,180,
- 30,206,198,198,251,143,233,143,156, 61, 57,216,127,104,127,131, 81,112,249,250,101,135,190,203,227,241,192, 55,231, 87, 24,128,
- 94, 43, 86,172, 56, 15, 96,245,235,175,191,254, 82,207,158, 61, 89,115,144,192,156, 48, 39,197,159,  8, 67, 67,119,  2, 64,104,
-104,232,109, 31, 62,247,220,115,236,169,203,151,183,158,189,112,161,221,194,186,171, 87,175,150, 59,186,111,188,209,102,138,197,
-247,223,127,143,171,229,230, 46,156, 31,179,179, 27,125,118,249,242,229,144,224,224, 96,197, 31, 97,168, 36, 36,244,100, 44, 13,
- 90,211,  6,191,209,231,118, 13, 60, 31,239,223, 56,147,  9,202, 26,  5,170,170,170, 80, 93,171,128, 90,163,129, 90,163,129,170,
-190, 30,234, 58, 37, 84,181,255,159,189, 43,143,111,162,218,254,223, 59, 89,154,182, 64, 23,118,202, 90,164,236,178, 20,161,  5,
-129,  4, 82,168, 34, 42, 74,  1,225,137,125,  5,155,226,  6, 34, 62, 84, 84,220, 80,121, 63, 11,184,210,212, 39,130,239,129, 64,
-139, 11,155, 44,129,164,178,180,212,130, 11,139, 64,161,208, 66, 89, 10, 77,186, 37,105,182,185,191, 63,146,  9,105, 73,147, 73,
- 90,  4, 53,223,207,167,144, 89,114, 50,115,231,206,253,158,115,238,185,231, 84,160,214,104,128,185,182, 22,172,213,235,252, 38,
-211,163,107, 87,110,204, 96,  1,152, 93,167,  3,  0,224,127,155,182, 96,113,250,199,225,  0,218,250,122,223,191, 31,201,150,170,
-178, 94,170,211,217,206, 30,255,225,246,186,255,  1, 92,158,218, 21, 93,190,252, 25,164,219,221, 48,229,100,163,248,159,131, 16,
- 42, 36,216,151,208, 26,214,202,107, 24,178,163, 12, 94,102,  0, 48,121,242,100,242,228,220, 57, 56,115,234, 20,114, 53,251, 16,
-214, 60, 12,143, 77,125, 12,225, 45, 35,113, 36,191,  0,205,196, 18,132,134,134,162,125,215, 14,248,122,253,215,120,105,209, 43,
-168,169,240,191, 74,237,224,193,131,125,254, 78,243,230,205, 81, 89, 89, 57,140, 97, 24,115,167, 78,157, 48,116,232, 80,244,237,
-219, 23,173, 90,181,130, 68, 34, 65,215,174, 93, 49, 96,192,  0,132,135,135,163,186,186,186, 75,243,230,205,225,133, 88,255, 47,
- 39, 39,103,247, 87, 95,125, 37,210,233,116,175,214, 35,235,164,145, 35, 71,174,248,242,203, 47, 87,181,109,219,246, 93, 66, 72,
- 51,  0, 47,  1, 88,236, 65,222,162,119,170,171,255,111,150,213,106,251,194,104,156, 94, 79,222,228,105,138,215,191,121,118,222,
- 11,130, 83,167, 78,225,208,161, 67,248,242,203, 47,107,  0,188,204,243,246,153, 16,147, 73, 66,127,255, 29,157, 84, 42, 18, 85,
- 90, 42,  0, 64,151, 45, 91,134,173, 91,183,254,161,253,173,190, 71,175, 33, 15, 95,253, 65, 32, 72,192,144,230, 37,229,250,181,
- 95,231,158,123,249,151, 98,109,190,209, 70,206,224,250, 57, 72,190,121, 10,239,142,168, 70,193,155, 67,241,161,172,  6,161,223,
- 61, 13,104, 47,162,134, 74,142, 58, 52,175,  6,112, 35,170,255,215,223,182,224,245,215,191,194, 93, 45,250,227,248,193, 95,177,
- 75,253, 59,100,241,125,145, 48,210,222,209,168, 64,  8,179, 15,241, 17,137,131,122,225,157,255,123, 31, 59,142, 86,161, 89,215,
- 62,120,224,129,137,216,185,247, 91,108,219,105,143,178,100,108, 22,  4,137, 60,143,115,148,181,193,198,218,173, 25, 56,172, 25,
-179,217,140,218,218, 90, 24,141, 70,232, 13, 70, 24, 13,122, 24, 13,122, 24, 76,181, 48,155,106, 27,118,127, 25,155,163,178,198,
-134, 42, 35,139, 42, 35,107,255, 92,205,162, 70,111, 69,141,193, 10,157,214,134,114,173,  5,229, 58, 11,202,203, 45,184,126,221,
-140,171,215, 45, 30, 21,128, 27,238,127,151,107,230,220, 55,  2, 10,  1, 33,160,245,162,254, 41,241, 78,182, 47,206,124, 17,189,
-227,123, 59,183, 85,171, 85, 78,143,192,129,237,  7,112,170,248, 20,175,100, 79, 44,107,255,173,236,236,236,253,148,210,126,147,
- 39, 79,158,217,173, 91,183,214,  0, 24,150,101,131, 44, 22, 75,132,213,106,109,225, 70,  1, 96, 61,184,254, 23,127,250,233,167,
-247, 79,158, 60, 25,221, 90,183,230, 53,117,213, 24,136,218,180,145,  2,192,144, 94,189,100,222,206,237,209,174,157, 44, 61, 61,
- 29,199,139,139,171,190,217,181, 11, 39, 79,158,116, 90,253, 61,123,246,132,227,152,249,155, 93,187, 80, 92, 92,140, 83,  5,  5,
- 70,111, 50,111, 69, 12,  0,  0, 58,122,244,232,167, 92, 73,159,251, 63, 54, 54,150,151, 59, 23,  0, 10, 79,158, 45,176, 90,173,
- 48,155, 77,208, 94, 45,195,181,203, 87,112,253,202, 85, 92,191,114, 21,218,178,107,168, 40, 47,135, 73,175,183,199,207, 84, 84,
- 96,144, 92,238,173, 13,173,139,211, 63, 22, 46, 78,255, 88,  8,160, 10,  0, 59,108,240,221, 55,157,228, 18, 23,192, 27, 39,142,
-100, 75, 75,207, 22,168,  7, 12,189,113, 13,231,206, 28,148, 86, 92, 43, 82, 55,166,127,144, 41,186, 58,150,191, 63, 56,173,213,
-163,100,246, 61,160,231,126, 67,155,207,143, 32,116,229, 97, 92,158,218, 21,177, 59,202, 64, 68, 65, 16, 18, 64,200,120, 87, 64,
-159,126,230, 25,242,218,251,239,224,185,  5,243, 97, 97,109, 56,121,190, 16, 51, 30,155, 14,177, 68,130,239,191,219, 12, 88,108,
- 48,213,154,176,175,224, 32,140,198, 26,164, 38, 39,231, 20, 20, 20, 80, 15,132, 72, 38, 77,154, 36, 27, 55,110, 28,  8, 33,216,
-189,123,247, 77, 46,253, 23, 95,228, 31, 39,212,178,101, 75, 92,186,116,  9,  0,132, 25, 25, 25,184,118,237, 26,250,247,239,143,
-240,240,112, 48, 12,131,252,252,124, 48, 12,  3, 66,  8, 46, 93,186,132,150, 45, 91,122,149,169, 84, 42,223, 53,155,205,163,148,
- 74,229,  6, 23,178,126,108,228,200,145,233,179,103,207,142,200,200,200,144, 16, 66, 24,  0,223,  2, 88,160, 84, 42,175,122,145,
-247,175, 67, 22,203,144,250,242,166, 45,252,102,227,163,211,159, 38,247,207,201,128,230,208,  9,164,167,167,179, 85, 85, 85, 41,
- 74,165,242, 60,143, 41, 68,  0, 96,239,106,222, 60,188,211,149, 43,184,215, 96, 64,123,145, 40, 52, 84, 32, 96, 74, 75, 75,111,
-138,197,249,163,148,  0,238,143,215, 20,  0,128,179, 95, 31, 60,247,140, 86,111, 58, 12,123,224, 86,251,220,194,107,153,163,122,
-181, 93, 36, 60,119, 40, 18, 95, 62, 14,  4,133,  2, 38, 61, 64, 41, 44,  2,201,213,125,199, 47,127,  1,160,193,236, 75,235,214,
-126, 38,155, 62, 99,166, 26,  0,244,172,  5,103, 42, 74,  0,216,112, 87,139,110,144,201,238, 70,219, 86,237, 80, 94, 89,101,247,
- 21,152,173,184, 92,161, 71,111, 15, 55,213,177,115, 60, 46,150,228, 58,222, 76, 33, 18,  7,216, 99,  0,118, 28,181, 96,231,214,
-108, 92,189,126,  9, 45,195,237, 43,  9,194,197, 34,220, 61,196,243,122, 80, 51,132, 16,179, 86,216, 32,  0, 75,  8, 24, 27, 11,
- 88,172,176,137,132,  0, 97,192,189,147, 44,133, 61, 87,128,  7, 60, 60,237, 37,242,221,127, 23,208, 16, 49,133, 80,228,226, 97,
-176,  0, 86, 10,212,154,  1,155,201,  6, 66,  8,136,152,192,106,  3,244, 38, 96, 86,242,191,137,187, 84,142, 54, 23, 13,141,101,
- 88, 16,135,251,223,174, 20, 16,216, 88,  6,140,192,110,245, 51,  0,168,128,  2,148,159, 23,192,149,252,221,109, 31,216,126,160,
-155,215, 41,  9,155, 13, 38,147,  9,147, 39, 79,238,155,157,157,189, 28,192,192,236,236,236, 29,217,217,217,251, 38, 79,158,252,
- 76,247,238,221, 45,132,144,150, 31,126,248,225,174,151, 94,122,105,134, 86,171,205,241,160,124, 58,251,228,130,  5, 11, 22, 47,
- 88,176,  0, 59,118,236,128,254,234,205,239,114,183,214,173,113,238,220, 57,  0, 80,243, 73, 12,212, 80,210, 31, 81,155, 54,210,
- 79, 63,253, 84, 77, 41,197,144,158, 61,101,131,121,172, 44,232,223,187,183,134, 48,204,248,147, 63,253,212, 21, 64, 16,128,143,
-184,213,  0, 61,218,183,199,252,249,243,113,224,192,129,165, 49, 49, 49, 57,253,162,162,188,198, 40,184,203,  3,224,111, 12,128,
- 43,184, 60,  0,113,113, 73, 63,229,229,149, 29, 80, 40, 20, 98,199, 52,193,112,  0,185,124,147,  0,117, 29,208,231, 21,227,229,
- 43,227, 88,171,173,151,190,178, 18,149,215,175,129, 16,  6,148,178,168,173,173,  5,165, 20,148, 82,156, 59,241, 59, 44,102, 19,
-238, 26, 18,235,173, 13, 93,199,156,112,  0,204,253,178,209,236,253,178,209,117,130,254, 28, 83,  4,188,113,242,151,111,164,151,
-206, 22,168,  1,160,107,151, 46,248,190,158, 23,160,117,231,193, 50,220, 70, 12,249,161, 12,  5,247,  1,  3, 99,229, 40,123,122,
- 56,218,125,118, 16,167,181,122, 68,136,  9,202,181, 58,  8,  9,241,234,  1,224, 48,115,230,204, 58,103,110,217,178,133,222, 63,
-225, 62,108,221,188, 21, 27, 55,110,196, 27,139, 94,195, 46,205, 30,  8,132,  2, 68,117,140, 26, 93, 89,233,121,233,114, 98, 98,
-162, 38, 49, 49,145,236,216,177, 67, 58,110,220,184, 58,177,  0,187,119,239,198,153, 51,103,106,149, 74,101,123, 62,215,214,181,
-107, 87, 20, 21, 21,161, 79,159, 62,214,121,243,230,137,215,175, 95,143,176,176, 48,156, 60,121,242, 38,207,107, 81, 81, 17,186,
-242,124,206, 74,229,141,196,115, 10,133,226,241,123,238,185,231,173,199, 30,123, 44,172,160,160,160,121,109,109,237, 63,131,131,
-131, 31, 48, 26,141, 31, 40,149,202,239,121,202,251,197, 85,222,  3,207,174, 95,115,239,216, 73,228,223, 42,128,116,120, 16,239,
-174,120,133,106, 11, 79,166, 40,149,202, 44,111,178, 92,188,108,164,218, 98,169, 16,  7,  5,161,133, 88,140, 96,155,205,164,183,
-217,108,183,131,252,249,162,142,  2, 32,121, 76,121, 92,251,181,226,180,228, 49, 37, 55,165, 89,114,236,107,197, 15,213,181, 86,
-253,176,187, 90,221, 31, 25, 34,184, 71, 96,170, 13,181, 82,166,186,188,218,156,151,123,230,202,206, 82,173, 33, 71,242,152,242,
- 50, 86,174,116,251,  3, 53,250,214,154,180,167,231,200,  0,168, 89,  1, 55,205, 39,192,153,170,203,120,253,153, 20, 24, 12, 38,
- 84, 25,237, 49,  0,102, 38,  8, 99, 18, 61,167,217,125,109, 81, 50,217,177,109,136,253,229,182,113,150,179, 21,137,253,  9,166,
- 61,181, 12, 33, 33, 65,104, 17, 44,145,  1, 80, 23, 30, 59, 34,139,239,231, 57, 33,136,144, 90, 97, 38,118, 37,  0,132,192, 70,
-169, 93, 17,224, 18, 54, 16,  6, 66,150,133,149, 91,118,224, 69,  9,168, 48,134,195,104, 42,135, 88,200, 56,211,156, 89, 89,192,
- 98,161,176, 88, 41,106,140, 44,136,128,192,  6,  2, 11,123,195,117,239,150, 96, 89,  6, 12,177,129,216,  8, 40, 67,157,238,127,
-210,128,241,204, 73,122,238,121, 25, 89,185,242,164, 71, 11,239,247,220,223, 27,219,119,204,148, 82, 24,141, 70,244,239,223,255,
-114,116,116,244,164,243,231,207,247,216,184,113, 99, 62,128,135,178,179,179, 31,114, 61,249,253,247,223,215,188,244,210, 75, 50,
-173, 86,235,141, 32,156, 13,146,150,150,214,224, 73,143, 62,241,  4,  0,223, 18,  3,113, 89,247,234, 99,104,239,222, 62, 45, 43,
-236,215,179,231, 46, 87, 79, 70,122,122,250, 39, 19, 39, 78,180,158, 58,117, 74, 88, 92, 92,140,174, 45, 91,230, 70,133,132,240,
- 10, 80,188, 21,121,  0,234,145,251,213,156,156, 28,215, 24,143,163, 14, 69,128,111,198, 64,125,112,251,118,143,158,220,179, 55,
- 55, 60, 52,180, 69,149,174,  2, 86,171, 21,212,241, 30,232,174,150,161, 74,167,  3,165,148,143,245,111,127, 89,111,196,156, 48,
-142,229,128,140, 99,217,159, 51, 49, 80,225,249,243,252,149,  0,195,175,210,139,133,249, 78, 43,255,251, 44,251,242,191,214,209,
- 35,100,  3, 98, 39,106,110,223,240, 74,111, 86,  2,240, 57,  6,166,189,142, 43, 44,139,  1,171,243,145,159,216, 22,125,183, 94,
-133,144,  0,205, 69,254,173,152,157, 56,113, 34,217,171,217, 75,199, 36,140,197,230, 77,223,225,237,165,239, 99, 97,101, 37, 40,
-203, 98,195,134, 77, 40, 45, 45,125,  0,128, 87, 31,180, 59, 69,  0,  0, 38, 77,154,244, 11,128,106, 62,215, 18, 31, 31, 79, 46,
- 93,186, 68,143, 28, 57, 34, 30, 60,120, 48,198,142, 29, 11,181, 90,141,206,157, 59,195,100, 50, 97,244,232,209,160,148,178, 71,
-142, 28, 97, 68, 34,145,207, 25,  1, 21, 10, 69,159,176,176,176,229, 83,167, 78, 21,157, 56,113,162,133,201,100,106, 40, 48,144,
-175,188, 65, 81,  3,167,172, 25, 56,106, 42,249, 34,  7,168, 50,  2,230,115, 59, 88,109,161,186,126, 96,160, 39,101,130, 83,  2,
-132,218,202, 74,171,216, 98,129, 65, 44,134,208,158,245,135,253,163,123, 29,151,  7,192,213,242,119,183,207,173, 43,213,133,252,
-185,237,223,139,191, 86,148, 20, 95,175,201,  5,208,222,241,242,154,  0,148,  2, 40,146, 60,166,244,234,226, 28, 60,224, 65,205,
-241,223, 74,100, 54,218, 76,237,250,114,212,232,171, 32, 16,134,  1, 76,  8,254,245,  1,255, 20,147,137, 19,250,145,119,230, 60,
- 32,  5, 99, 80,187, 54,111,179,102, 97,176, 89,116,  0,213,163,248, 96, 38,153, 57, 45,209,171, 44, 11,  4,  0,165,118,162,134,
-  0, 98,234, 80,  4, 28,228,111,207,  1,  8,128,231,218,205,228,212, 87, 73,230,199,111, 80,171, 69, 11,161, 99, 97, 47,165, 20,
- 54, 43, 69,173,  5,168,170,182,194,  2, 10, 43,101, 32, 20, 17, 44,121,235,147,  6,239,123,246,108,123,144,214,154,213,103, 40,
-177,216,173,127, 10,128, 82,  2, 80,135,197, 64,  5, 32,  2, 22, 44, 43,196, 11, 11,198,241,106,195,217,111,207,150,157, 63,123,
-222, 19,  1,139, 96, 95,170,225,137,157, 88,  0, 48,153, 76,208,233,116,186,176,176, 48,196,198,198,254, 58,116,232,208,160,107,
-215,174,225,236,217,179,246,229, 97, 44, 43,221,180,105,147,218,161,  4,168,121, 40,  1,150,164,196,196,164,174,253,251,219,238,
-233,213, 75,239,232,163, 38,212, 93, 17,137,164, 68,251,179,237,202, 35, 41,208,139, 47,190, 40,  3,128, 33, 61,123,222,116, 44,
-118,192,128, 70, 17, 68,255,222,189, 63, 99, 24,198,118,242,167,159, 66,219,182,109,123,189,223,240,225,107,110,167, 70,239,134,
-212,245,177,177,177,174,209,214,206,117,172, 62, 40,  1, 39,  6,141, 29, 51,108,243,127,190,216, 20,221,173,107, 31,147,169, 22,
- 54,139, 21, 44,203,162,121, 68,  4, 42,181, 90, 12,146,203,101, 60,172,127,  0,168,120,243,133,103,219,  0, 48, 23,158, 63, 47,
-230,230,255, 15, 29,249, 13,247,203, 70,179,139,211, 63,246,150, 28,200,137,152,246, 58,122,242,212, 73,217,222,157,223,215,113,
-241,143, 25,255,144,140,105, 17,223,168,231,218, 80,128,159,251,253,252, 57,108,200, 15,101,192, 15,207, 56,183,239,250,254,198,
- 18,224, 74,139,255,235,195,199, 72,199,144,175, 74,190,186,111,220,132,196,237, 79, 62, 62,107,255,221,  3,250,223,187,249,251,
- 45,200,253,229, 48, 82, 83, 83,183,173,108,192, 64,243,162,  8,204,250,246,219,111,255,243,237,183,223,198, 37, 38, 38,242,190,
-184,113,227,198,141,217,181,107,215,222,173, 91,183, 34, 58, 58, 26,  9,  9,  9,  8, 11, 11, 59, 93, 89, 89, 25,115,252,248,113,
- 20, 21, 21, 49, 34,145,  8,227,198,141,147,251,122,159,142,192,192,165, 91,182,108,105, 48, 48,208, 71,121, 63, 43, 20,138,247,
-190,203,126,240, 21, 99,212, 12, 24,127,122,149,189,180,111,201,227,190,202,115, 40,  1,181,197,101,101,162, 23, 78,159,190,104,
- 51, 24,152, 95, 25, 70,212, 78, 32,184,162, 80, 40,110,203, 20,128,187,108,128,222,166,  0,220, 66,242,152, 82, 15,224, 55,199,
-159, 95,120,252,241,103, 52,105,105, 47,201, 50,148,111,171,163,186,244,  0, 96,130, 40, 72,130,139,151,171, 48,122,226, 76,226,
-187,188,  7, 53,119,245,138,193,234, 85,223,  0,108, 49,  0, 33,172,181, 70, 68,181, 15,147,117,110, 97,229,255,242,219, 88,  8,
- 25, 22, 22, 34,132,136, 90,111, 40,  2,176,  2,212,  6,190,129, 97,174, 72,125,246, 13,  2,  0,139, 95,158, 67, 69, 66,187,181,
-111,101,237, 46,243,138,106, 10,155, 21, 16,  8, 89,124,246, 41, 63,165,231,137,100,123,106,228, 85, 95,156,162,224,114,194, 51,
-  0, 75,236,238,254,249, 11, 30,240,233, 34, 43,107, 42, 53, 17,109, 35, 26,219,191, 24,192,190,138,194,104, 52,194,102,179,161,
-170,170, 10,  2,129,  0, 54,155, 13,237,218,181,131,197, 98,129, 82,169, 84,215,243,  4,168,189,213, 12, 24,212,191,127, 54,  0,
- 52, 69,198, 63,  0,136, 36, 68,  3,  0,145,  3,  6,220, 18, 51,175,111,207,158, 25,141, 17,240,194,226,197,117, 86, 73, 44,120,
-227,141, 58,158,  1, 95,230,254,221,144,185,222,211,106,  0, 31,210,  1,159,124,112,246,172,126,  0,  4, 39,115,114, 44,181,  6,
- 35, 88,155, 13,189, 99, 99,101,237, 99,250,160,235,128, 62,252,222, 57, 74,166,238,252, 97,155,115,115,120,159,104,231,231,157,
- 63,108,187,105,219, 83,104,252,233,203, 17,132,105, 17,143,177,227,137,236,196,201,179,184, 92,124, 84, 13,  0,123,119,126,175,
-110,219,249,172,172,255,176,127,248,172,  4, 76,153, 50,  5,190,166,247,181, 17,207,121,183, 75, 38,181,195, 15,151,106,111,249,
-128, 63,115,230,204, 31,  0, 48,  5,  5,  5,236,158,188, 28,180,108,213, 18,141,169,207,145,152,152,248, 69, 98, 98,226, 87,240,
-158,222,185, 14,154, 55,111,174,126,244,209, 71, 73,110,110, 46, 61,123,246, 44,242,243,243, 81, 93, 93, 29,211, 20,181,  0, 28,
-100,251,127, 10,133, 66,148,155,155,219,223,108, 54,191,234, 58,151,239,167,188, 69, 10,197, 63, 68, 97,221,191,154, 95,121,118,
-215,140, 70,200,179,174, 63,116,232,  1,  0,  9,  0,126,  6,203, 86,  3,184, 58,109,225, 55, 72, 13,123,  4,153,149,127,140, 18,
-192,173,  2,112,183,223, 47,  5,192,215,169,132,  6, 93, 85,143, 60,161,217,182,243, 12,121,120, 66,  8,109, 19,213,  9,218,106,
- 43, 70, 79,120,220,239,142, 16,127, 79, 47, 18,127,207, 43, 80, 40, 94,167,192, 85, 68, 52, 23,162,115, 36,235,211, 75, 63,228,
-159, 11,110, 89,150,176, 55,223, 91, 73,  0, 96,238,188,103,168,217,104,  1, 11,251,178,185,229,159, 46,247,235, 55, 83,102,217,
-107,  6,172,250,207, 73,202, 82,  1, 94,126,233,161,219,153,225, 76,236,234,198, 54,153, 76, 48,155,205, 78, 34,227,  8, 44, 80,
- 37,208,139, 11,210,135,244,195,126,194,188,112, 97, 82,144,195,131,210,216, 20,100, 20,128,181,215,232,209,117,174,185,107,251,
-118,188,  5,  4,177, 38,205, 19, 19,125, 54,252, 80,191, 20,112, 29,251,187, 69,156,166,239,208, 56,244, 29,138, 70,183,165,183,
-194, 62,245,117, 96, 43,  9,130,145,241,188, 34,245,108,181, 21, 49,205,249, 12,145, 77,210, 21,232,144, 33, 67,154,178, 79, 89,
-252,253, 98,124,124, 60,241,150,136,173, 17,164,253,174, 66,161,248,206, 53, 54,160,145,242,254,165, 80, 40,214,185,198,  6,248,
- 33,195,  2,160,  2, 64,189,184,129,107,127, 24,249,123, 34,123,183, 61,110,224,192,129,119,106,249,200,  0,254, 68,232,209,163,
-  7, 10, 11, 11,  3, 13, 17, 64,  0,  1,  4,240, 39,  1, 19,104,130,  0,154,  2,  1,242, 15, 32,128,  0,  2,  8, 40,  0,  1,  4,
- 16, 64,  0,  1,  4, 16, 64, 64,  1,  8, 32,128,  0,  2,  8, 32,128,  0,  2, 10, 64,  0,  1,  4, 16, 64,  0,  1,  4,112,219, 81,
- 39, 52,117,206,156, 57,126, 71,143,186,203,100, 23,144, 23,144, 23,144,119,103,200, 83, 40, 20, 84,169,108,120,217,105,160,253,
-  2,242,  2,242,254, 90,242,124, 86,  0,184,129,194, 87, 33,158,  6,150,166,150, 23,192,157,  9,111,  4, 19,192,157,249, 28,124,
- 60, 63, 20,192, 61,251,247,239, 95, 34, 16,  8,134,  7,  5,  5,193, 96, 48, 28,188,247,222,123, 23,  1,200,  7, 96,184, 19,218,
- 64,165, 82, 73,179,178,178,212,127,197,113,229,216,177, 99,200,207,207,247,122, 94, 94, 94, 30, 61,118,236, 24, 50, 51, 51, 73,
-191,126,253, 26, 45,143,195,208,161, 67,225, 73, 94,  0,127, 98, 15,  0,  7, 95,210,147,242, 73,148,227, 78, 94, 67,229, 97,253,
- 73,188,243, 87, 31,208,249,158, 59,126,252,120,217, 35,143, 60,162,225, 43, 51, 42,234,230,210,203,165,165,165,117,182,147,146,
-146, 32,151,203,  9, 31,121,183, 82,  9, 24, 63,126, 60,  5,128,157, 59,119,146, 59, 65,158, 94,175, 31,187,105,211, 38,213,233,
-211,167,  1,  0,209,209,209, 15,166,164,164,108,241,247,249,186,246,123, 74,169,243,253,224,246,115,239, 10, 33,  4, 25, 25, 25,
-196,147,242,204,247, 57,248,248,188,250, 28, 59,118,108, 83, 85, 85, 85,175, 46, 93,186,224,250,245,235,168,173,173,  5,128,225,
-155, 54,109, 82,135,134,134,158, 76, 76, 76,124, 24,128,199, 82,146, 35, 70,140,240,201, 32, 56,112,224,128, 12, 60, 83, 61,115,
-200,202,202, 82, 39, 37, 37,201,228,114,185,198,215,231,145,154,154,234,211,245, 77,153, 50,133,247,251,193,161, 75, 23,123,  5,
-220,234,234,106,152, 76, 38,174, 63,241,122,223,242,243,243,241,223,255,122,206, 80,107, 50,153,232,240,225,195,209,187,119,111,
-172, 93,187,182,204,100, 50,117,110,104, 93,120,126,126, 62,102,204,152,193,235, 94,175, 94,189,138, 37, 75,150,224, 78,206,109,
- 31,192, 13,212, 79,  6,116, 43, 19,  1,  5,172,216, 91,136,239, 51,188,167, 52,126,120,206, 14,159,100,170,213, 55, 12,164,211,
-167, 79, 35, 52, 52,212, 57,  8,185,180,  7, 31,107,139,214,223,174, 63,128,169, 84, 42,154,149,149,229,183,  5,182,110,221, 58,
-233,248,241,227, 27,148,223, 24,164,165,165,209, 81,163, 70,201,166, 79,159,238, 19, 89,108,218,180, 73,213,166, 77, 27,204,156,
- 57, 19, 58,157,142, 77, 79, 79,223,172,211,233,166, 69, 68, 68,248,148, 69,140, 16,130, 31,126,248,193,185,157,152,152,136, 29,
- 59,118,120,220,246,134,250, 74,128, 66,161,160,177,177,177,200,204,204,164, 92, 98, 38, 95,201,191,178,178, 50,183,123,247,238,
- 45,  0, 64, 34,145, 32, 56, 56, 24,101,101,101,168,168,168, 64, 88, 88, 24,202,202,202,122,237,216,177, 35, 63, 49, 49,177, 39,
-128, 43,158,132,245,235,215, 15, 73, 73, 73,136,142,190,145,245,111,233,210,165,117,206, 89,184,112, 33,103,201,170,167, 79,159,
-238,243,243,246,135,252, 57,172, 88,177,162,161, 67,206, 90,  5,254, 34, 52, 52, 20, 39, 78,156,128, 72, 36,130,217,108,198,142,
- 29, 59, 80, 88, 88,136,151, 95,126,217, 39, 57, 87,235, 21,201,122,240,193,  7,  5,  0,228, 63,254,248,227,142,209,163, 71, 95,
-125,248,225,135,219,170, 84, 42,  8,  4,130,214,225,225,225,  2, 95,100, 53,132,243,231,207,  7, 72,226, 79, 74,254,220, 62,175,
-181,  0,254,172, 88,181,106,149, 52, 37, 37, 69,211, 88, 57,127, 22, 87,118,212,144,119,110, 88,237,  5,175,250, 37, 67,167,211,
-193, 96, 48, 56, 45,144,204,204, 76, 87, 75,136,175,181,117,211,182, 92, 46,199,238,221,187, 41, 33,228,166,227,254,224,199, 31,
-127, 84,191,248,226,139,200,206,206,198,228,201,147,155,164,253,118,238,220, 73,246,236,217, 67, 41,165,200,201,201, 81,231,228,
-228,248,164,160,156, 62,125, 26, 51,103,206,100,  1, 48, 98,177,152,137,137,137, 65,122,122,250,122,  0,235,163,163,163, 39,164,
-164,164,108,231, 35,231, 86, 20,  3,226,148,128,204,204, 76,202,165,  1,230,254, 87, 40, 20, 52, 41, 41,201,151,123, 13,213,233,
-116,155, 36, 18, 73, 11,  0,120,250,233,167, 81, 91, 91,139,140,140, 12,  4,  7,  7, 59,203,102, 11,  4,  2, 84, 86, 86,182,  0,
-144, 14,224, 31,158,  4,114,228, 94, 84, 84,116,211,190,166, 64, 82, 82,146,204,113,159, 50,127, 21,129,231,159,127,222,249,121,
-249,242,229,220, 71,166,222,126,222, 10,  1,231, 53,121,245,213, 87, 17, 26, 26,138,236,236,108,140, 30, 61,218, 47,242,175,143,
-145, 35, 71,  2,246, 44,141,255,124,252,241,199,209,163, 71,143,182, 59,118,236, 64,121,121, 57, 87,114,215,236,229, 93,104,234,
-238, 39,157, 48, 97,130,122,219,182,109,238,188, 55,210, 49, 99,198,168,  9, 33,216,179,103, 79,192,221,123,139,201, 63,117,225,
-251,  0,128,204,165, 47,185, 85,  2,254, 16,  5, 32, 51, 51,211,221,131,166, 13,237,247,231, 55, 14, 29, 58,164,  6, 32,107,172,
- 18, 48, 99,198,140,191,205,124,182,193, 96,184,201,234,247,135,104, 56, 98,153, 60,121, 50, 18, 18, 18,  8,  0,100,103,103, 55,
-201, 53,174, 91,183, 78,234,176,232, 72, 89, 89,153, 52, 43, 43, 75, 93, 86, 86, 38,245,213, 98,119,135,177, 99,199,146,177, 99,
-199, 98,221,186,117,210,156,156, 28,245,186,117,235,124,146,171,211,233,172, 17, 17, 17,226, 77,155, 54,193,225, 13,168,213,233,
-116, 76,122,122,250, 54,157, 78, 55, 46, 34, 34, 98,247,237,124,190, 28,233,187,246,101,133, 66, 65, 57, 37,141, 39,238, 41, 44,
- 44,236,213,191,127,127,204,154, 53, 11,149,149,149, 40, 47, 47,135, 72, 36,130, 80, 40,132, 80, 40,132, 72, 36, 66,112,112, 48,
-180, 90, 45, 84, 42,213,116,185, 92,254,172, 55,161, 69, 69, 69,117,148, 67, 78,  1,224, 60,  1,177,177,177,190, 92,163, 59,235,
- 95,150,149,149,165,110,140,231,201,  5,214,  6,198, 74,222,222,128,243,231,207, 35, 39, 39,  7, 19, 38, 76, 64,151, 46, 93,208,
-170, 85, 43,228,228,228,224,229,151, 95,118,122,223,  4,  2,129,207, 23, 54,114,228, 72, 44, 90,180,  8, 75,150, 44,105,159,146,
-146, 50,245,177,199, 30, 67, 66, 66,  2,  0, 64, 32, 16,204,108,217,178,229, 22,165, 82,105,241, 84, 12,104,221,186,117,188,188,
-  0,165,165,165,152, 54,109, 26, 63,  3, 37, 42, 10,169,169,169,234,162,162, 34,168, 84, 42,174,253,165,169,169,169,106, 78,129,
- 14,224,214,130, 35,127,238, 51,167,  4,252,225, 30,128,134,230,177,253,  9, 16,188,213, 74,192,253,247,223,223,104, 79,128, 47,
-247,229,203,111, 60,250,204, 78,108,250,100,124,147,180, 21,247,  2, 54, 84,169,234,224,193,131,141, 86, 12,154,226,249,254,248,
-227,143,106,206,234,159, 62,125,186,230,199, 31,127, 68,155, 54,109,212,104,162,196,233,156,220,156,156, 28,228,228,228,120,117,
- 55,235,245,250,251, 55,109,218,180, 13,  0,210,211,211,197,209,209,209, 72, 73, 73,225, 14, 75,126,251,205, 94, 47, 43, 61, 61,
-125, 87,116,116,244,195, 41, 41, 41, 94,235,147, 39, 38, 38,214,137,137,185,239,190,251,234,120,  6,248,184,253,221, 40,221,212,
- 93,255,226,158,139,235,116,128, 39,236,216,177, 99, 73, 76, 76, 12,  0,224,204,153, 51,160,148,226,212,169, 83,206,186, 15, 66,
-161, 16,132, 16,216,108, 54, 24, 12,  6,124,251,237,183,144,203,229, 94,171, 46,185,146,127, 82, 82,146, 91,229,197,117,138,192,
- 31, 37, 64, 46,151, 19,133, 66, 65, 27,235, 13,104,138,113,210, 98,177, 96,240,224,193,208,104, 52, 24, 50,100,  8,244,122,189,
-115,106, 71,163,209, 96,252,248,241,176,114, 37,200,125,179,252,177,100,201,146, 14, 41, 41, 41, 23,191,248,226, 11,231,177, 14,
- 29, 58, 96,217,178,101,255,229, 75,216, 77, 12,205,225,195,135, 17, 27, 27,139,232,232,104, 12, 30, 60,152, 30, 57,114, 68,198,
-145,127, 81, 81, 17, 52, 26, 13,159, 24,149,161,  0,158,  1,240, 79,165, 82,105,243,112,222,  4,  0, 81,  0,190, 85, 42,149,215,
-  2,212,255,  7,118,108, 62,248, 35,131,  0,155, 66,  9,232,218,181,107,163, 60,  1,220, 32,187,118,237, 90,183,199,183,111,223,
-142,181,107,215,250,101,153,228,157,235,131,184,110, 39,252,118,251,115,112,157,243, 87,169, 84,144,203,229, 78,183,255,193,131,
-  7,209,169, 83,167, 38, 81,250, 26, 99,125,113,214,255,245,235,215,157,117,230,165, 82,169,172, 41,189,  0, 28, 70,143, 30, 45,
-203,201,201, 81,123, 59,111,211,166, 77,219,184,185,127,189, 94,143,165, 75,151,162,166,166,  6, 34,145,  8, 65, 65, 65, 56,119,
-238, 28,222,121,231, 29,232,116, 58,164,167,167,127,167,211,233,198, 68, 68, 68,168,189,144,108, 29,178,247, 22, 19,208, 20,138,
-231,225,195,135,235,156,223, 80,144, 88,100,100,228,112,147,201,  4,171,213,138,131,  7, 15, 66, 32, 16,192,108, 54,195,104, 52,
-130,101, 89,231,123,108,177, 88, 96, 50,153,184,119,218,107,152,120, 67, 46,255,133, 11, 23, 58,189,  0,209,209,209, 40, 43, 43,
-107,180, 34,202,173, 10,240, 33,118, 68, 11, 32,210,221,  1,151,233,  0,159,144,158,158,142, 23, 95,124, 17,131,  6, 13,114,122,
- 64,184,244,217,131,  6, 13,194,169, 83,167,208,166, 77, 27,159,100,238,219,183, 15, 35, 71,142,236,146,146,146,114,158, 35,127,
-199,248, 25,181, 97,195,134, 75,245,  3,122,249, 42, 20, 13,253,150,143,222, 39,114,248,240, 97,105,106,106,170,122,200,144, 33,
- 24, 50,100,136, 26,  0, 78,157, 58,133,156,156, 28,190,207,225, 23,  0,193,  0,214, 43, 20,138,105,238,148,  0,133, 66,241, 12,
-128,143, 29,155,139, 20, 10, 69, 47,165,210,123,137,250,191, 50,184,106,128,153, 75, 95,186,105, 10,224, 47, 27,  3,112, 39, 42,
-  1, 51,102,204,160,139, 22, 45,186,201, 21,232, 15,249, 63,250, 76,211,206,211,233,245,250,155,130,252, 56,171, 95, 36, 18,225,
-202,149, 43,183,149,252, 93,173,127, 87,203,109,218,180,105, 26,141, 70,211,228, 94,  0, 95, 60, 39, 51,103,206, 52,  0,  8,  9,
- 13, 13,197,107,175,189,  6,145, 72,228, 60,158,156,156, 12,  0,136,136,136,192,196,137, 19,177,127,255,254,189, 19, 39, 78,252,
- 67,174,211,181,189, 93,231,255,221, 33, 54, 54,182, 78,165,198,134,214, 17,155,205,102,104,181, 90,212,214,214, 34, 44, 44, 12,
- 65, 65, 65,176, 90,173,160,148,194,102,179,193,108, 54,195, 98,177,192,102,179,185, 42,244,215, 61, 93,103, 81, 81, 81, 29,235,
-190,254,116, 64,253,  0,193,198, 66, 46,151,107,124,140, 69,145, 52,116,160,129,216,  0,175,120,231,157,119, 48, 97,194,  4,116,
-237,218, 21, 33, 33, 33,144, 74,165,208,106,181,  8, 13, 13,133, 78,167,195,234,213,171,193, 48,190,197, 23,142, 28, 57,178, 99,
- 74, 74,202,249,121,243,230, 97,243,230,205,120,232,161,135,  0,160,221,190,125,251,174,250,211, 78, 14,133,  2,220,152,197,141,
- 85,190,146,191,171, 39, 96,195,134, 13,178,169, 83,167,170,  1, 96,195,134, 13,178,202,202, 74,141, 15,253,217,172, 80, 40,102,
-  0, 88,235, 65,  9, 72,112,249,220, 25, 64,127,216,151,164,  6,224, 66,252, 13,225, 47,153,  9,112,216,176, 97,178,166,  8,  8,
-244,215, 74,119, 29,144,151, 44, 89,210,104,242,231, 48,120,208, 64,236,217,171,198,186,189, 33, 78,165, 32,239, 92,159, 70,221,
- 99,108,108, 44,138,138,138,144,157,157,141, 78,157, 58, 97,205,154, 53,126, 88, 93, 84,202,125, 74, 75, 75,107, 18,242,231,172,
-255,178,178, 50, 89,253, 99,163, 70, 43, 88,140, 99,  0,  0, 32,  0, 73, 68, 65, 84,141,146,101,103,103, 59,207,105, 10,228,228,
-228,168,249,122,159,116, 58,221,239,176,207, 11,179, 27, 54,108,192,234,213,171,  1,  0,235,215,175,135, 78,167,227, 78,179,158,
- 58,117, 10,173, 91,183,190, 45,239,128,107,180,191, 59,229,140,111,153,230,162,162,162,131, 54,155, 13, 58,157, 14,215,175, 95,
-119,  6,142, 26, 12,  6,212,212,212,160,170,170, 10,149,149,149, 48, 26,141, 48,153, 76,176,217,108,  0,144,235, 73,102,125,114,
-119, 23, 72, 90,127, 85,  0, 95,168, 84, 42,105,253,123, 86,169, 84,190,246,147,144,166,126, 30,107,214,172,129, 84, 42, 69, 72,
- 72,  8, 78,156, 56,  1,141, 70,131,208,208, 80,188,254,250,235,216,191,127, 63, 94,126,249,101,159, 20,128,145, 35, 71,182, 75,
- 73, 73,185, 48,109,218, 52,124,243,205, 55, 28,249,119,  0,112,213,147, 37,207, 71,  9, 88,178,100, 73, 83,144, 63,  0, 72, 57,
-242,  7,128,169, 83,167,170, 71,143, 30, 77,125, 28, 67,205,  0,184,117,138,235, 21, 10, 69,253, 64,137, 51, 46,159, 75,  0, 28,
- 13,208,190,203, 56,176,240,253, 58,177,  0,245,241,151,  9,  2,108,106,242,119,172,119,109,180,229,198, 77,  7,204,152, 49,195,
-111,242,127,244,153,157, 24, 60,232,134,235,102,211, 55,223, 98,211, 55,246,207,123,246,170,129, 49, 50,  0,190, 45,  3, 84, 40,
- 20,136,141,141,  5, 96, 15,  6, 60,124,248, 48,118,239,182,199,172, 29, 61,122, 20,163, 71,143,246, 65, 26,209,  0, 55,  2,255,
- 26, 27,169,191,110,221, 58,169, 59,235,191, 62,154,202, 11,192, 41, 18, 82,169, 84,230,237,220,232,232,232,113,233,233,233,187,
- 38, 78,156,136, 83,167, 78,225,244,233,211,120,231,157,119,172,  0,132,  6,131,  1,233,233,233,112, 28, 19, 22, 23, 23,227,241,
-199, 31,247, 42,243, 86,196,  0,112,150,116, 86, 86,150,211,139,197, 17, 35,247,220,249, 32, 38, 38,166,192, 96, 48, 12, 55,155,
-205,184,118,237, 26,130,130,130, 32, 20, 10,157, 30,  0,189, 94, 15,131,193,  0,147,201,132,202,202, 74,110, 62,255,162, 39,153,
- 28,185,115,211,  0,177,177,177,168,239,173,112, 23, 23,192,135,252,185, 28,  0,245,247, 53,166,127,112, 86,191, 27,139,223,202,
-119, 12, 45, 44, 44,196,169, 83,167, 96, 48, 24, 16, 31, 31, 15,131,193,128,172,172, 44, 76,157, 58, 21,155, 55,111,134, 64, 32,
-224,173,  0,196,196,196,116,228,200, 63, 63, 63, 31,111,188,241,  6,  0,116,158, 49, 99,198,229,181,107,215,146,125,251,246, 53,
-106, 12,229, 60,  1,141, 33,255,216,216, 88,202,245,179, 35, 71,142,160,160,160, 64,150,154,154,170,238,217,179, 39, 68, 34, 17,
-117,  9, 12,244,219, 19,160, 80, 40,230,  2,152,  0, 96, 50,128, 54,176,199,  0,252,173,221,255,192,141, 85,  0,238,130,  0,111,
-203, 42,128, 63, 42,  8,240, 78, 35,255,250, 74, 64, 99, 44,127, 79,219,123,246,170,253,121, 65,111,152, 59, 33, 33,232,221,187,
-119,157,227,135, 14, 29,242, 73,222,228,201,147,157, 10, 64,118,118, 54,178,179,179,235,172, 10,240,229,254,215,172, 89,163,  6,
-128, 29, 59,118,184, 37,207,233,211,167,107,214,172, 89,  3,128,223, 18,166,134,146,254,112,138,  6,165, 20,163, 71,143,150, 77,
-155, 54,205,107,223, 73, 73, 73,217,173,213,106,199, 30, 56,112, 96, 79, 76, 76, 12, 78,159, 62, 13,157, 78, 39,140,136,136, 64,
- 74, 74, 10,180, 90,109,241,129,  3,  7,186,196,196,196, 96,230,204,153, 94,239,215, 93, 30,  0,127, 99,  0,234,191, 91, 74,165,
-146,200,229,114,168, 84, 42, 90,127, 90,134,239,243,136,139,139,123, 69,163,209, 60,103,179,217, 80, 85, 85,  5,139,197,226, 84,
- 86,106,107,107, 65, 41,173, 19, 24, 40,151,203, 31,115, 16, 35,111,200,229,114,200,229,242, 58,203,  2,125,157,  2,112, 37,122,
-185, 92,174,169, 63,182,184, 42,  5, 77,  8,222,227, 39,183,212,239,133, 23, 94,128, 70,163,129, 76, 38, 67, 97, 97, 33,154, 53,
-107,134,146,146, 18,222, 10,192,161, 67,135, 72, 74, 74,202,133,199, 31,127, 28,251,246,237,195,235,175,191, 14,  0, 81, 51,102,
-204,184,212, 20,228,239,170,  4, 52,198,242,231,198,151,162,162, 34, 20, 20, 20, 16,135, 33, 40, 75, 77, 77, 85, 71, 71, 71, 67,
- 42,149, 82, 62,129,128,245,148,128,105,  0,214, 59,148,128,131,  0, 20,  0,164, 74,165,242, 10,  2,104,186, 14,220,212,217,248,
-220,  5,252, 44, 93,186,180,193,253,183,147,252,103,204,152,113, 75, 82,134, 54, 70,230,133,139,222,251,119,112,176,111, 94, 75,
- 79,243,195,254, 64, 46,151,203, 18, 18, 18, 52,123,246,236,161, 27, 55,110,172,163,  8,212, 39, 37,190, 50,211,210,210, 26,212,
-108,184,164, 36,190, 36,  6,106, 72,225,148,201,100,188,200,159, 67,100,100,164,115, 94,255,196,137, 19,255, 72, 79, 79,255, 47,
-231, 17, 40, 46, 46,238,242,234,171,175,202,  8, 33,188,228,221,138, 60,  0,245,219,217,221,252,183, 15, 74,169,126,244,232,209,
-139,183,111,223,254,166,213,106, 69, 69, 69,133, 51,  6,  0,  0,174, 93,187,134,138,138, 10, 80, 74, 57,171,221,167,201,118,110,
-254,191,254,178,191,250,113,  2,124,201,223,245, 57,223,105, 75,121, 57, 37,224,165,151, 94, 66, 78, 78, 14, 38, 78,156,136,247,
-222,123, 15, 11, 22, 44,128, 80, 40,132, 68, 34,241,246, 92,  9,165,148,157, 53,107, 22,254,251,223,255, 98,213,170, 85,  0,208,
-105,223,190,125,151, 28, 22,187, 95,157,201,101,218,170,201, 80, 90, 90, 10, 55,121,  0, 52,153,153,153,178, 49, 99,198,168,253,
- 89,242,232,176,250,167,  1,216, 10, 96, 46,128,184,  0,249, 55, 12,119, 65,128,188, 20,  0, 95,146,114,248, 75,216, 77,141,166,
- 32,255, 59,113,208,152, 59,119,174,236,228,201,147, 77, 42,211, 97, 13,169,155, 82, 38, 71,120,220,218,122,  0,206,100, 64, 44,
-203, 98,211,166, 77,188,149,128, 23, 95,124,145,187,206,155, 98,  0, 24,134,  1,203,178,248,215,191,254,165,230, 75,158,158,228,
- 53,118, 37, 65, 74, 74,202,255,180, 90,237,181,  3,  7, 14,236,224,107,245,223,106,111, 91,253,246,117,231, 98,247, 69,  9, 32,
-132,188, 53, 97,194,132,236,181,107,215, 30, 23,139,197,224, 86,  5,176, 44,139,240,240,112,232,116, 58, 46,133,109,  8,  0, 27,
- 95,131,192, 53,248,239,240,225,195,144,203,229,117,198, 19,111,227, 80, 81, 81, 17, 45, 42, 42,146,213,119,241, 55,114,201, 31,
-128,  6,221,253,214,229,203,151, 75,  0,152, 97,143,159,226,254,124, 82,  2, 92, 19,255, 60,245,212, 83,206,207, 85, 85, 85, 94,
- 95,179,184,184, 56,210,183,111, 95,250,213, 87, 95, 61,188,126,253,250,239, 57,178, 93,191,126, 61,124,141,250,231,112,233,210,
- 37,103, 74,226, 38,130,102,219,182,109, 13,245, 41,205,222,189,123,125,170, 85,225,225,240,101,119,217, 74,255,238, 53, 73,184,
- 85,  0,238,136,159,215, 42,128,166, 38,245,134,228,221, 41,202,195,157,220,113,250,244,233,163,233,211,167, 79,147,202,116, 12,
-142,183,252, 94, 93,221,255,245, 95,234,134,150,157, 57,174,143,207,181, 17, 31,238,247,150,222,107,100,100,228,206,198, 68,250,
- 55,101, 12,128,187, 62,236,201,219,227, 67,159, 63, 49, 99,198,140,102,187,118,237,122,183,164,164,228, 57,163,209,  8,155,205,
-134,129,  3,  7, 98,200,144, 33,233,114,185,124, 33, 31,242,  7,128,188,188, 60,231,103,215, 88,147,188,188,188,155,182, 61, 33,
- 58, 58,154, 56,188,  4, 50,  0,106, 78,153,112,153, 10,240,249,153, 76,153, 50,165,161, 67, 66,151,241, 82,124, 59,198, 21,165,
- 82,201, 30, 59,118, 12, 31,127,252, 49,  1,192, 43, 41,207,179,207,122,206,201, 52,116,232, 80, 76,154, 52,137,247, 53,120,147,
- 23,192,157,167,  4, 52, 68,254,110, 21,128,166, 38,193, 64,133,184,  0,220,245,  1,127,203, 87,254, 29,218,230, 14,254, 13,253,
-184,113,227,230,194,238,126,245, 11,  7, 14, 28, 32,211,167, 79,191, 37, 10,173,191,153,  3,255, 72,101,177,177,232,215,175, 95,
-147, 22,227,105,106,121,127,  7,163,236,207,164,  4,120,181,162,  6, 14, 28, 24, 24,136,  3,  8, 32,128,  0,  2,  8,224,111,  6,
- 38,208,  4,  1,  4, 16, 64,  0,  1,  4, 16, 80,  0,  2,  8, 32,128,  0,  2,  8, 32,128,128,  2, 16, 64,  0,  1,  4, 16,192,159,
- 16, 86,  0,108,160, 25,  2,240,  4, 97,160,  9,  2,  8, 32,128,  0,  2, 99,123,  0,127,243, 78, 50,103,206, 28,191, 35, 46,221,
- 69,117,123,146,231,109,253,177,175,242,154,250,250,  2,242,  2,242,254,238,242,126,126,165,216,239,129,101,208,187, 93,112,171,
-229, 29,126,217,127,121,177,239,221, 44, 47, 45, 45,141,  0,  0, 33, 68,106,177, 88,112,238,220, 57,181,217,108,134, 80, 40,196,
-197,139, 23,241, 88, 88, 87,236, 44, 40,128,241,238, 78,136,139,139,147,  9,  4,  2, 80, 74, 53,  0,144,145,145,113,203,159,  7,
-119,125,174, 32,132,244,  1,208,230,248,241,227,219, 58,116,232,192,104,181, 90, 73,135, 14, 29,222,  9, 14, 14, 94,  9,224,146,
- 99, 57, 41,147,145,145, 97,243, 32,175,185,195, 91, 96, 32,132, 80,  0,184,112,236,127,159, 43, 70,150,164,172, 43,136, 57, 39,
-108, 51, 46,174, 89,243, 22, 53,  0, 40,165, 84,  8, 32, 34, 35, 35,227, 66,224,125,187,179,229,221, 82, 45,145,111,182, 45, 95,
-179,191,249,147, 50,183, 98,245, 55, 82, 97,100,152,250,236,233, 51,178,187,130,154, 33,244,217, 25,154, 59, 73,203,106, 40, 31,
-121, 96,137,203,237,199,230,205,155,165,219,183,111, 87,167,191, 98,223,254,110,223, 72,204,152, 49,131,215,115,217,151,123, 80,
-202, 16,162, 62,117,242, 36,116, 58, 29,186,116,233,130,102,205,155, 35, 49, 97, 28,239,231,186,123,247,238, 58, 47,110,118,118,
-182,199, 90, 10,217,217,217,126,247, 27,174, 80, 83, 70, 70, 70,227,250, 93,146,214,241,129,  2, 32, 64, 86,164,255,178, 98,151,
-  3,209, 79,216, 63, 23,173,  6, 14,207,111,252, 67,157,124,189,238,245,101,183,226,245, 53, 66,  8,213,235,245,178, 93,187,118,
-169,139,138,138,144, 36,106,137,118,157, 90,163, 86,111, 68,176,193,138, 17, 11,158,196,168,137, 83,177,245,139, 12,108,217,179,
- 71, 61,110,220, 56,217, 29,208,133, 79,219,108,182,246, 69, 69, 69,236,128,  1,  3,196, 49, 49, 49, 56,114,228,200, 43,181,181,
-181, 19,122,244,232, 33, 39,132,104, 41,165,222,166,  2,170, 93, 55,172, 86, 43,243,107,193,207, 61, 58,206, 26,132,127, 13,237,
-219, 58,111,215,  7, 27, 55, 29,149,254,210,163,223,152,247, 28,242, 46, 58, 20,  6, 54,224,105,248,155,185,137,124,205,223,239,
- 75, 30,124, 95,201,223,182,110,155, 52,190,117, 71, 53,137,138, 70, 97, 77,  5,218,119,232,170,182,176, 54,156,252,100, 13,202,
-186,180,150, 13,157,120, 63, 47, 69,224,176, 90, 65,123,117,231,182,  4,248,118, 23,139,125, 63, 81,164, 78,  3,122,117,  7,230,
- 47,105, 28,113,115,  5, 74, 26,155,157,204,157, 50,209, 84,114, 27,131,212,212, 84,138,197,  4,228,173,134,207,161,148,  2,139,
-  9,166,252,158,116,199,172,181,190, 65,254,212, 65,254,163,176,127,255,126,204,152, 49,195,235,119,239, 30,176,139,246,233, 51,
-  4, 89, 89,151,113, 40,215,158,176,230,244,201, 83,  0,128,217,255,252,134,158, 58, 51, 89, 22, 42,225,247, 92, 18, 18, 18,216,
-221,187,119, 51,217,217,217,216,187,119,175,199, 66, 76,254,164, 80,245,244,222,166, 41, 20, 52,195, 15,133,130, 75, 23,222,232,
- 84,198,209, 79,212, 45,182,211, 20, 10,128, 75, 59, 57,170, 19,242,194,217,179,103,161,217,184, 81,253,150,124, 10,  6,206,120,
- 10,226,182, 17,128,208,145,236,143,165,  0, 43,  2,107,162,184,255,137, 84,148,124,244, 62, 14, 30, 60,168, 30, 62,124,184,140,
-243,  2,220, 38,216, 24,134,105,211,170, 85, 43,104, 52, 26,225,128,  1,  3, 48,116,232, 80,230,202,149, 43,131,126,253,245,215,
- 99,119,223,125,247, 96, 66,200, 21,  7, 89, 51, 60,219,174,217,216, 49,  9,209,239, 45,219,204, 44, 76, 62,218, 34, 46,113,142,
- 44,110,152,106,228,130,143, 47, 62, 16,115,207,204, 88, 66, 72, 53,236, 49,  6, 76, 67,253,204, 53,177,149,183,126,212,104,133,
- 52,128, 58,168,159,  0,168, 62,252, 42,  6,228, 58,128, 12,156,217, 31,115, 70, 60,195,128,103,229,190,250, 74,128, 66,161,160,
-177,177,177,200,204,204,164,174,101, 75,125, 34,214,156,195,210,233,131,226,213, 98, 27, 11, 27, 40,130, 43, 66,112,229,218, 53,
- 92,169,174, 68,183,160,102, 48, 21, 94, 82, 31,218,178, 93, 54,140,135, 18,208,171, 59,112,242, 44,  3, 74, 37,176,145, 32, 60,
-156, 96,193,164,113, 70,220,136,161,105,124,170,132,198,146, 52, 71,252, 11, 23, 46, 68, 65, 65,  1,  0, 96,219, 73, 17,106, 45,
- 22,181,226,159, 67,124, 82,  4,124, 81,226, 28, 41, 94, 61, 63,151,197,246,195,177,177,177, 13,231,111, 95,236,223, 59,190,245,
-179,203,210, 45,191,190,225, 84,120, 38,244, 95, 44,123,240,153, 14,141, 30,112, 55,111,222, 44,221,182,109,155,154, 97, 24,188,
-240, 46,156,213,207,248,212,193,136,136,248, 81, 26, 55, 44, 13,192, 22,140, 28,249, 81,157, 99,211,167,  3,247,223, 15,220,143,
-108,245,242,143,192, 75,  9,224,200, 95,163,177,159, 58,117,234, 84,103, 97, 37, 95,  8,204,147,229,207,165,100,118,189,191,180,
- 52,255,200,191,201, 16,187, 12,  0,176, 98,197,138, 27, 10,192,224,116,224,200, 11,183,229,114,246,238,221,139,149,147, 82,209,
-109, 76,  2, 32, 48,129,136, 24, 16, 33,  3, 34, 16,129, 82,  2, 86,111,  5,181,217, 64,205, 54, 60,249,196, 83,120,234,245,185,
- 56,219,182,173,186,123,247,238,183,211, 19, 64, 10, 10, 10,226, 59,117,234, 36, 46, 42, 42, 66, 78, 78, 14, 78,158, 60,137,132,
-132,  4,196,199,199,183, 95,181,106,213,219, 83,166, 76,121,210,  7,  5, 64,176,127,207,215, 95, 62, 50,208,208,246,112,181,  0,
-211, 23,215,224,222, 65, 31,226,153,121, 83,133, 31, 44,172,232,182,240,131,181,211,163,  7, 77, 87,162,129, 52,200,174,132,238,
- 58,166,167,165,165, 81,119,251,155,186, 32, 92,  0,183,192,  3,224,250,144,214,237, 88, 91,209,253,174,238,225,138,183,158,100,
-231,140,120,198,151,106, 78, 36, 51, 51,147,114,105, 73,185,255, 21, 10,  5, 77, 74, 74,242,205,170,222,113, 80, 58, 62,166,175,
- 90, 92,107, 69,240,  7, 47,194,106, 48, 67,242,194, 18,132,137, 37,168, 21, 25,161,175, 53, 34, 24,  4,166, 11,101,234,202,202,
- 74, 89, 88, 88,152,199, 65,248,228, 89, 32,115, 61, 11,192,224,248,  3, 70,222,195, 96,210, 56,  2,215, 64,218,212,105, 64,230,
-122, 63, 60,166, 73, 73, 50,199,125,250,101,173,115,228,207, 17, 63,  0, 40,247, 91, 96, 52,235,  1,  0, 99, 23,238, 70,214,210,
-  4, 53,  0,222,242,207,190,127, 22, 34, 82,120,163, 35,144, 82,144, 86,189, 92,182,203,208,250,159,252, 82,132,146,183,236,228,
-239,169,198, 60, 81,100, 81,251, 57,252,172,255, 35,219, 44,210,204,205,207,170, 41, 40,222,155,247, 29,134, 73, 99,176,238,179,
-125,248,207,174, 52,245, 54,  5,197,156,127,188, 33, 27, 56,178,189, 95,138, 64, 77,177,130,142, 25,  0,100,125,117, 28,148, 82,
- 52,111,115,183,147,252, 87,174, 92,233,241,250,244,181, 42,105,106, 82,123, 53,240, 41,128,239,112,232, 16, 48,108,216,141,227,
-111,191,125,227,243,243,207,101,171, 51,254,211, 83,198,176,157, 60, 94, 39, 71,254,163, 71,143,  6,203,178,248,228,147, 79,154,
-236,  5, 87, 40, 20, 78,242,175,171, 20, 40,104, 70,134,231,119,142,153,162,171,163,254, 18,199, 63,108,146,155,243,136,227, 68,
- 98,255, 48, 96,192,205,115,236,204, 84,157,211, 43, 15,  0, 44,155,140,121,243,230, 57,143,207,155, 55, 15, 43, 86,172,  0,211,
- 99,214,141, 95,117,156,239, 78,158,112,170,251,235,179, 90,221,156,199,227,250,106,107,107,209,174, 75, 87,128, 53,131,  9,  2,
-136, 80,  0,107,117, 37,106,139,206,225,218,197, 82,116, 28, 46,  5, 17,135,131, 88,204,128,128,193,210, 57, 11,144,144,249,  6,
-230,207,159,223,164,131,178,183, 84,217, 46,100, 75, 40,165,225, 70,163,113,120,100,100, 36, 78,157, 58,  5,150,101,113,238,220,
- 57,172, 94,189, 26,189,123,247, 70, 84, 84,212, 76,  0, 79,214, 35,107,182, 33,242,166,148,182,234,194, 28,146,182,239,156, 40,
-174,200, 57,138, 74, 93, 16,254,187,213,138,237,121,255,195,115, 73,193, 66,161,129,141,  5,166, 55, 88,  7,225, 86, 20,183, 10,
-192, 55, 52,212,119,220,121,  6,132,124,137,159, 82, 10,217, 43,163,145,153,163, 12, 79,133,  2,191,124,117, 20, 24,225,124,173,
-120,129, 35,125,131, 97, 45,  0,130,218,218, 85,136,140, 84, 33, 43, 43, 11,190,164,241, 28, 26,212, 66,221,166,214,  6,201,226,
-167, 96,187,174,133,245,210,117,  8,197, 34,132, 16,  1, 66,137,  0,161,  2, 33, 34, 69, 18,232,170, 43,112,121,239, 65,117,216,
-164,251, 60, 14,116,238, 72,125,223, 79,172, 67,  1,  0,150, 45, 34,160,  4,176,135,199,248,222,193, 29,164, 44,203,202,202, 82,
-103,101,101,249, 53,133,224, 74,254, 16, 10, 80,116,217, 62,248,149, 92,173, 69,231,182, 18,244, 72,222,130,172,213, 19,213,124,
-221,235, 34, 82,  8, 33, 41,133,128, 92,135,141,182, 66, 80, 27,130,208,105,151,192,178, 90,212,214,102,193, 86,240, 47,223, 60,
-185, 60, 42,183,249, 82,226, 85,185,249, 25,117,124,228,171,248,228,187, 89,104,198,116,  6,  0, 60,245,108, 79, 12, 24, 26,141,
-181,159,230, 96,229,255,222, 84, 43, 71,250,231, 58, 36,  4, 80, 60,127,204, 57,232,221,123,239,189,216,183,111,159, 87,242,  7,
-128, 25,211, 68,106, 96, 47,128, 99,168,184,218, 12, 61, 58,  3,159,127, 94,  3,181, 26,232,209,  3,136,142,182,139,168,184,218,
-204,254, 50,246,255, 93,253,219,175,157,136, 39,242,223,187,119, 47, 88,150,117,146,244,134, 13, 27, 26, 77, 32,174,219,245,201,
- 31,  0,188,145, 63,  0,100, 40,149,132,  2, 82,  2,104, 82, 83, 83, 27,236,248,172,203,160,175,204,204,148, 17,  2,172,252,108,
-229, 77, 49, 47, 43, 51,148,174,254, 21, 41,165, 84,253,225,135, 31, 58,119,124,248,225,135, 88,177, 98,  5, 50, 50, 50,234, 86,
-145, 35,144,186,147,151, 97, 79, 97, 43,163,148,106,158,124,242,201,  6,175,207,234,226, 69,201,252,252,115, 25, 33, 64,198,202,
- 12,181, 59,242, 18, 54,111, 14,136,  4,176, 25, 42,240,251,246, 61, 88,187, 49, 27,159, 93, 58,  7,  0,200,127,179,  5,122,140,
-186, 31,166,146, 11, 56,254,235, 97, 28, 61,119, 26,149, 87,174,224,216,177, 99, 77, 86, 88,107,245,234,213, 82,126,125,152,132,
- 81, 74,123, 21, 20, 20,124,240,218,107,175,245,253,224,131, 15,196,102,179, 25,  2,129,  0,205,155, 55,135, 94,175, 71,126,126,
- 62,162,163,163,185,186,  5,158,172,255, 80, 66,  8, 75, 41,141,172,184,120,224,167, 55,191, 44,137,252, 98, 94,  7,104,245, 98,
-136,133, 12, 58, 70, 72,112,229,186, 25,138,127, 91, 49, 96, 72,108,104,103, 47,158,132,180,180, 52,202, 41,  2,174,125,177,161,
-207,  1,220,122,112,228, 95, 95, 57, 96,188, 13, 34, 92,189,239, 58,110,206,196, 25, 62, 95, 64,102,102, 38,181,147,255, 58, 39,
-249, 75,126, 58, 15,195,206,187,234, 28,247,106,185, 42,215, 73,195,180,213, 96,197, 66,152, 15, 31,135,233,247, 34,212,238,218,
-  7, 24, 77, 16, 83,138, 16,  8, 32,  4,129,137,181, 66,107,170,197,103,187,183,122,149,185,108,145,221,186,119,133,125,155, 51,
- 87, 40, 78,157,161,152,191,196,255, 62, 43,151,203, 53,174,110, 47,149, 74,197,235, 69, 87,169, 84,206,218,218, 28, 30, 91,113,
- 17,123, 14,235, 80,114,181,214,169,  4, 20, 94, 52,  2,242,141, 80,169, 84,188,220,145, 66, 98,175, 28, 38,170, 62,138,208,208,
- 51,  8,146, 84,131,101,181,176, 88, 14, 67, 32,136,134, 89, 95,126,219, 58,235,158,111,143, 73,  1, 82,135,252, 47,159,162, 24,
- 60, 81,128,103,223, 73,192,189,  9,125,  1, 80,199,121,190, 97,221,186,117,244,133,119,  9,154,181,238, 15, 10, 32,113,210, 28,
-236,223,191,159,215,119, 89,230,  2,109,211,230, 55, 39,249, 87,151,219, 75, 48, 15, 24, 96, 39,127,174, 16,160,253, 88, 48,170,
-203,131, 17, 25,114,217,163,204,201,147, 39, 67, 38,147, 97,204,152, 49,152, 58,117, 42,  4,  2,193, 77,127,174,251,249,194,221,
-123,235,151,178,228, 66,196,132, 16,231, 95, 67,251,  8,160,  1,133,166,  1, 89, 55,222,175,212, 84,181, 59,203,121,222,188,121,
- 72, 77, 77,173, 75,168, 13,200,251, 78,169,196,177, 99,199,212,132, 16, 41,128, 58,109,230,244,103,215,219,231,233,250,196,148,
-130,  9,  9,130,229, 74, 49,148,175,190,138,213,250, 10,232, 70,199, 57,143,127,241,191,213,120, 99,193,108,196,204,127, 12,111,
- 29,221,139,141,186,115, 72,120,240, 65, 68, 71, 71,251, 60,  5,176,122,245,106,169, 66,161,160,171, 86,173,170,211,135,243,242,
-242,212,158,166,161,  8, 33, 34, 66,200,144,163, 71,143,150,228,228,228,104, 94,120,225,133,184, 79, 62,249, 68, 82, 83, 83,227,
- 44,211, 92, 91, 91,139,102,205,154, 21, 78,153, 50,165,231,136, 17, 35, 58,123, 81, 36, 24, 66, 72,151,163,185,155,202, 78,239,
-156,127,126,254,203,233,237,183, 44,238,128,223, 75,133,168,172, 17,128, 37, 64,121,141, 25,180,101,247,218,231, 95, 89,210,247,
-129,135,255,225,117, 58, 33, 35, 35,131,112, 99,157, 82,169,244,250, 57,128,219, 67,254,110, 61,  0,174,196,207,103,156,241,197,
- 18,185,225,106, 91,229,214, 59, 80, 39,206,160,  1, 55, 70,223, 86,109,213, 90,106,129,184, 92, 11,201,119,123, 65,132, 12, 80,
-107,  6,173,214,131, 88,173, 16,  1,176, 81, 22,181, 54, 43,170,173,102,128,245, 62,135,202,  5,249, 45, 91,212,240, 48,104, 15,
- 18,108,252,128,170, 84, 42,  9,231,210,231, 99,173,223,100,253,  3,248,250,153,246,117,182,135,188, 84,  4, 17,189, 14, 11,105,
-133,172,172,172,189,124,189,  0,146, 26, 53, 34,223,250, 31,174,189,144,134,235,218, 96,116,176, 28,135,205, 86,  4,  0, 40,254,
-165,221,109,235,176, 27,119,124,172,158, 61, 78, 89,135,252, 57,196, 69,188,138,225,125, 39, 35, 62,242, 56, 54,238,120, 71, 61,
-118, 18,255, 65,100,237,218,181,244,199, 31,127, 68,121,249, 88,180,108,185,  7,205, 90,245,  3,165, 20, 12,195,240, 10, 68, 42,
- 41,  1,138,138,142,113, 19,  9,128,164,  6, 90, 61, 48,116,168,125, 79, 97, 33,240,233,167, 64,117, 21,160,175,  1,106,244, 64,
-104, 68, 21,175,107,107,104,174,255,236,217,179,  0,128,119,223,125, 23,  0, 16, 19, 19,211,100,110,102,215, 62,201,231, 59,115,
-231,206,133,171,197, 94,159,184,125,128, 20,184, 49,247,239, 10,206, 11,224, 56, 71,227, 73,200,172,168, 24,156, 62,126,  2,165,
- 17, 17,106,134, 97,240,220,115,207,225,163,143, 62,242,251,250, 70,154,194, 65,217, 26,204,126,119, 17,250, 79,158, 12,229,187,
-239,130, 97,110,240,156,178,240,216, 13, 15,225,190,125,216,189,123, 55,206,157, 59,231,115, 16,224,234,213,171,165,185,185,185,
-106,  0,200,207,207, 87, 51, 12, 35, 75, 78, 78,214,172, 90,181, 74, 74, 41, 69,124,124,188,204,104, 52,170, 27, 80,236, 44,121,
-121,121,253,103,204,152,209,162, 91,183,110,216,190,125,187,161,178,178, 82,104, 52, 26,237,222, 14,199,252,199,248,241,227, 99,
-  8, 33,193,148, 82,163, 27, 49,140,139, 60,166,232,212, 47, 43,222,248, 87, 74,179,150, 61,178,240,115,214, 19,248,237,  2, 65,
-201, 85, 33, 64, 25,152,204, 22,104,105,203,210,167,103, 61, 21, 71,  8, 41,165, 77,160, 85,242,137,179,  9,224,143, 65,131, 83,
-  0, 57, 57, 57, 55,237,171, 40,213,249, 76,118,174, 30,  0,251, 20,128,189,255, 72,126, 58,143,160, 99,165,176,133,219,173,168,
-250,115,200, 13,173,107, 60,113,177,  4,134,160, 96, 68, 91,173,232, 24,220, 12, 33, 34, 49,136,197,  2,176, 20, 86,155, 13,213,
- 54, 51, 12, 54, 43, 76,212,  6, 27, 40,168, 15,157,109,254,146, 27, 74,128, 61, 46,224,  6,233, 47, 91, 36, 64,250, 34,130, 23,
-150, 88, 27,221,232,114,185, 92,195,149, 46,229,131,133, 89,246,118, 95,154, 20,225, 36,124,167, 43,159, 94,135,  8,128,144,234,
-240,213,236,  8,235, 99, 42,126,113, 29,162,171, 63,193,  6,187,155,250,  3, 97, 24, 30,187, 90,140,130,127,119, 68,104,187,222,
-168, 44, 45,197,149,243,151,110,107,199, 28, 48, 52, 26,122, 71,119, 51,  4,159, 64,136,177, 15,190,121,211,226, 60, 62, 66,222,
- 23,185, 27,125,179,252, 39,141,250, 17,223,125, 39, 71,120,174, 10,203, 23,  1,207, 47,161, 24, 53,106, 20,239,101,127, 93, 59,
-118, 34,221,187,215,213,  2,183,110,181,  7,254,173, 91,  7,244,232, 65,177, 98,  5,193, 91,111,213,216, 21,  4,  0, 61,122, 70,
-224,133,231,249, 93, 35,103,165, 78,158, 60, 25, 27, 54,108,168, 99,201, 38, 38, 38, 54, 72,110,254, 42,162, 62,122,240,100, 43,
- 86,172, 80, 55,164,  0, 44, 91,182, 12,153,153,153,188, 44,225, 39,159,124, 82,205, 69,254,187,195,243,207, 63,143,229,203,151,
-171, 51, 51, 51, 61, 94,227,143, 39, 74,240,202, 91, 11, 48,107,241,191,240,178,217,140, 15, 63,252,176,193, 54, 90,182,108, 25,
- 84, 42, 21,  8, 33,210,134,  8,123, 84,159,206, 88,245,197,167,136,157, 62, 29,111,190,249,166, 71,165, 97,222,188,121, 88,182,
-108, 25, 62,255,252,115,141,175,109,159,155,155,171,230,130,229, 20, 10,  5,205,203,203, 83, 39, 39, 39,147, 67,135, 14,169,  9,
- 33, 72, 78, 78,214,172, 92,185,178,193,239, 27, 12,134,240,173, 91,183, 98,236,216,177, 40, 44, 44, 12,209,235,245,176, 88, 44,
- 96, 24,  6,102,179, 25, 73, 73, 73,196, 65,238, 70, 62,142, 45,147,201, 36, 62,188,105, 58, 70, 61,242, 22,118,230,156,197,185,
-203,  2, 84,233, 25,  8,132, 64,169, 62, 24,207,189,180, 40, 30,192, 69,190,220,207,197,157,  0,252,166,  3,  2,184, 61,214, 63,
-220,185,113, 56,215,140, 84, 42,133, 84, 42,197,175,191,254,234,252, 43,250,169, 24,149,198, 74,180, 28,234,251,186, 95,142,220,
- 67, 66,102, 64,242,211,121,136,138,203, 65,  9,129,120, 86,121,157,227, 94,137, 75, 44,128,141,  2, 23,245, 21, 40,169,212,226,
- 90,149, 14,149,181,181,208,153,141,184,102, 50,226,114,173,  1,165,181, 53,208, 90, 76,208,177, 22,152, 89,239,217, 48, 71,222,
-227,102,192,115,137, 11,152, 61,181, 25, 40,196,160,190,149,  1,119,186,240,235,119,118,190,238,127,167,229,121,181, 22,123, 14,
-235,234, 16, 63, 71,254, 65,108, 49,130,216, 98,188, 49, 94,136,146,146, 18, 51, 95,153,155,206,177,104,157,158,225,220, 62,167,
-183,225,226,217, 82,156, 58,112, 28, 87,206, 87,220,246,142,187,238, 51,187,  2, 90, 85, 70, 17, 98,236,  3,233, 44, 33, 30, 89,
- 44,114,254,165,111,156, 14,  2,194,123, 64,122,232,222, 28, 60, 49, 95,142,136,188, 61, 32,132,224,251,  3,246, 71,192,151,252,
- 57,196,244,234, 89, 79,177,  0, 62,249,  4, 56,115,198,238,  9,120,243, 77,234,116,191, 83, 74, 17, 17, 17,225,125,  4,118,244,
- 81,155,205,  6,155,205,134,119,223,125, 23,103,207,158,197,233,211,167,113,250,244,105,168, 84, 42, 44, 88,176,  0, 37, 37, 37,
-183,243,145,104, 26,178,164,231,206,157,203, 89,117,188,200,144, 16,226,214,250,231,224,233,152, 43,246,  5, 85,128, 48,205,240,
-159, 87,150,160,217, 86, 21, 82, 83, 83,225, 90,106, 88,209,163, 31,230,198, 14, 71, 72, 72,  8, 70,141, 26,133,215, 94,123, 13,
- 42,149, 74,173,211,233,220,190,127, 95,148,158,198,229,190,125, 16, 21, 21, 37, 99, 89,182, 65,111,  7,231,169,240,215,243,226,
- 26, 41, 31, 31, 31, 47,227,136, 18,  0,226,226,226,100, 94,218,110,204,168, 81,163, 90,148,148,148, 96,223,190,125,184,235,174,
-187, 32, 20, 10,157,202, 98, 84, 84, 20,223,233,  8,214, 33,143,116,239, 53,104, 97,230,174,112,252,182,125, 49, 70,198,247, 70,
-168,132, 65,104,136, 13,193, 65, 38,220,247,208, 20, 22,128,182,190,174,234, 77,185,228,238,143,207,116, 64,  0,183, 15,140,167,
-135,168, 84, 42,155,207,157, 59, 23,115,231,206,  5,  0,243,219,105,111,195, 82,102, 69,112,176,196,175,100, 36, 73, 73,246,240,
-225,144,241,103, 64,  5, 12, 94,251,198,224,180,254,249, 34, 36, 42, 74,102,109, 22,  2, 29,181,225,132, 94,135, 99,149,229, 56,
- 94,117, 29,199,171,180, 56,161,215,226,140, 65,135,114, 83, 45,106,172, 86, 92, 50,232,157,191,233,  9,147,198, 17, 44, 91, 36,
-192,178, 69,  2, 80,  8, 64,  9,131,212,105,  4, 79, 78, 19, 99,214,212,214,232,222,189, 45, 88,136,  0,248,118,203,156,171, 63,
- 41, 41, 73, 86,127,159, 15,109, 38, 43,188,104, 87,228, 11,222,183,  7,209,237,124, 49,204,238,190,161, 58,  8,168, 30, 38,198,
- 30,209,172,213,106, 67,146,146,146,124, 42,138, 30, 27, 27, 11,149, 74,133,117, 53,122, 24,205, 12,158, 88,255, 31,148, 73,130,
- 97, 52,223,190, 50, 17, 19,  7,188, 33,203,213, 46,193,186,255,222, 48,241,191,121,211,130,184,136, 87,111, 40,148, 15,124, 42,
-203, 80,102,240,202, 45,177,252, 85, 32,121,254, 88,132,231,169, 32,251,247,104, 48, 19,  0,141, 70,227, 87, 31,238,210,165,110,
-244,248,152, 49, 64,120, 56, 16, 29, 13, 12, 27,208, 28, 18,177,  0,  2,230,134, 88, 73,112,176,215,  1,153, 97, 24,231, 92,255,
-217,179,103, 17, 19, 19, 83,231,239,173,183,222,194, 91,111,189,133, 75,151,248,123,101,220,205,215,187, 34, 45,205,119, 11, 44,
- 51, 51, 83,182,124,249,114,183,132,205,215,250,119,113, 61,223, 20,167,192,109,179, 44,191, 20,246,102, 66,192, 26, 76, 16,181,
-235,  2,197, 59,239, 32, 57, 52, 28,225,154, 92,231,241, 89,255, 72,198, 27, 31,252,  7,133,203,190,198,235,253,199, 96, 74, 68,
- 55,236,222,188, 25, 69, 69, 69,110,223,191,135,211, 20,232,219,175,159,140, 11,106,228, 20, 50,215,233, 25,119,251, 60, 88, 95,
- 52, 45, 45,141,114,129,125,220,124,191, 43,201, 39, 39, 39,107,226,226,226,100,156,235, 63, 57, 57, 89,227,165,221,114, 68, 34,
-209, 93, 15, 63,252,240,217,202,202, 74,232,116, 58,  4,  7,  7,163,117,235,214,  8, 15, 15, 71,120,120,184,183,198, 99,235,201,
-179,  5,  5,  5, 25, 30, 77,251, 72,182,250,167, 33, 56,127,161, 10,109,195,  4,136,239, 73,112,119, 55,138,208, 22, 45, 42,  0,
-216, 60,240, 70,160,222,192,159,212,250,  7,188, 47,  3,172, 81, 42,149, 65,  0, 66, 21, 10,133, 83, 11,236, 56,186,131, 95,154,
-175, 82,169, 36,114,185, 28, 42,149,138,138,103,101,213,113, 69,242,205,  3,208,242,193,177,154,242,172,237, 48, 88, 77,168,210,
- 27,112,214, 98,129,136,181, 59,234, 43, 45,181, 96, 41,  5,  5,176,253,234, 57,232,173, 22,  0,224, 49, 48, 17,204, 95, 82,183,
-143,219,167,  2, 88,216, 96,194,239,103,170,177,106, 67,149, 79,247,235, 74,244,114,185, 92, 83,223, 11,224,170, 20,120,130, 92,
- 46,215,100, 41,166, 64, 52,246, 51,  0,209, 40, 47,191, 17,156, 39,102, 47,195,204,180,199,211,253, 79,227,242,101,251, 64,172,
- 84, 42,247,240,145,155,246, 77,102, 29,197, 43, 43, 43, 11,220,164,196,250,163,  7,125, 90,149,209,212,120,224,169,246,154, 45,
- 10,138,  3,170,227,  0,128,225,125,237,153,241,254, 53,111, 49, 14, 30,239,139, 15, 54, 78,135,114,235, 83,106,229, 68,126,  4,
-254,196,124, 57, 34, 35, 85,174,134, 44,180, 90, 57, 40,205,114,184, 42, 41,178,178,146,120,201,154,252,200,163,100,247,206, 93,
- 20,176,187,254,101, 50,130,235, 23,194,160,215, 73, 96,172, 18, 99,253, 26,130,185,115, 41,138,203,170, 49, 44, 62, 14,211,167,
- 78,227,101, 21,219,108, 54,231,124,191, 74,101,191, 86, 87,194, 47, 43, 43, 67, 89, 89,153,207,238,125,133, 66, 65, 25,134,185,
-137, 84, 51, 50,148,196,143, 36, 64, 26, 74,105,157, 88,  0, 23,143,  0,111, 87,184,171,107,191,126,244,190, 55,183,127,125, 37,
-199, 90, 93, 13, 81,171, 72,  8, 66,154,161,239,163,147,241,214,184,  4,188,194, 45,219, 27, 52, 24, 54, 99, 45, 68, 45,219,162,
-127,156, 20, 93, 59,118,195, 71,191,231,162, 95,191,126,178,159,126,250,233, 38, 37, 32, 77,161,  0, 64,212,  0,240, 84, 90,154,
-115,233,160,181, 30,217, 11,133,  2,128,222, 88,168, 72,  0, 12,112, 51,200, 14, 28, 56,144, 80, 74,157, 46,254,252,252,124,167,
-139,223,245, 60,199,182, 87,242,119, 24,236,175,134,135,135,247,141,139,139,235,126,242,228, 73, 28, 57,114,  4, 54,155, 13,161,
-161,161, 48, 24, 12,101,145,145,145,231,125, 49,250,  8, 33, 76,219,182,109,119, 63,244,208, 67,109,243,246,231, 99, 69,214,110,
-180, 32, 98,244,108,107,194,153,235,161,184,183,167,229, 28,  0, 11,167,160, 57, 20, 74,155,167,103,226, 58,214,  5,166,  0,238,
-108,240,153, 47, 54,  3, 48,187, 18,245,197,156, 75,192,116,223,201,223,149,108,220, 13, 90,124,149,128, 42,173, 78,102,  9,145,
-168, 43, 25, 22, 87,106,107,  0,139,  5, 54, 74, 65,  0,252, 94, 83,129, 82, 67, 21, 40,165, 92, 18, 27, 30,  3, 19, 69,234, 52,
-130,204,245, 55,250,228,201,179, 64,175,238, 86,  8,160,111, 20,249,187,118,118,127, 93, 94, 73, 73, 73,178,172,172,167,212, 64,
-  1,180, 90,173,185,164,164, 68,184, 52,  1,204,194,221,163, 48,175,223, 65,167, 21,198, 87,169,112,231,117,169,191,205,145, 16,
- 95,107, 14,139,  9,134,100, 22, 81,192,253,114, 63,103, 38, 64, 21, 40,159, 32,197,180,137,159,201,148, 91,158, 86,231,110,164,
-136,143, 60,142, 17,242,190,216,191,251, 56,242,116,239,128,128, 64, 49,241, 83,222,247, 26, 25,169,  2, 33,  4,147, 38, 77,194,
-231,159, 87,129, 51,138,237,255, 83, 71, 27,103,213, 25,144, 60, 76,193, 98,244, 24,153, 44,103,175, 90, 61,102, 12, 96,190,210,
-  9, 23, 42,130,192, 58,102, 91,219,235,219,226,197,212,106,236,206,235,137,230, 29,123,242,186, 70,142,248, 47, 94,188,  8,  0,
-184,114,229,138,211, 51,112,245,234, 85,231,192,234, 15,148, 74, 37,225, 18,  1,213,159,195,205, 80, 42,  9,159,124,  0,174,248,
-252,243,207,235,196,  2, 44, 95,190,220,103,235,191, 62, 97,248, 11,137, 68,130, 43,197,231,209,173,123, 15,176, 86, 19,136,213,
-  6, 97,243, 22,104, 62,120,  8,154, 13,186,  7,172,222, 10,155,193,  4,106,181,  1, 54, 22, 11, 87,126,128,169,211,167, 66, 34,
-145,184,149,103, 93, 31,193,235,119,221,157, 23,251,158,251,115,227,227,227,101,121,121,121,106,110, 12, 24, 49, 98,132,219,182,
-226, 65,254, 32,132,176,  0,118,244,236,217,115,208,199, 31,127,108,190,118,237, 90,109, 66, 66,194, 67,  5,  5,  5,175, 27, 12,
-134,242, 86,173, 90, 41,250,244,233,163,245,161,237, 69,  0, 58,199, 13, 27,214, 58,109, 86, 26,206, 93, 60,167,125,124, 86,218,
-200, 67,187,215,164, 95,174,214, 14, 31, 50, 58,129,109,219, 49,230, 17, 55, 94,  3,214,211, 88,224,202, 21, 13, 37,255,  9, 36,
-  2,250,243, 40,  0, 13, 90, 23,254,144, 63, 71, 54, 92, 78,  0,127,148,128,110,138, 25, 26,  0,164, 84,185,154, 34, 88,  2, 29,
-181,194,108,181,130,165, 44, 90,134,133,225,162,190,146, 95,  6, 59,  7,220, 45,239,187, 17,  3,224, 91, 38, 54,119, 46,254,198,
-166,235,117,124,119,226,144, 33, 67,182, 44, 92,184, 80, 28, 25, 25,201, 94,190,124, 25,243,250, 93,174, 67,254,190,252,134,187,
-246,247, 27,142, 44,127,245,147, 60,185, 59,135, 47,  6, 61, 32,208,100, 60,144, 65, 54,127,114, 73,186,237,232,155,234,220,141,
-  0,  1,193,196,  1,111,200, 30,120,138,127,  2, 32,174, 47,217,  9,190,202, 49, 72,  1,238,120,103,117,186,221,121, 18,218, 57,
-131,  0, 13, 23,215,152, 62,117,154,102,250,212,105,164, 92,247,177,212, 86, 93,173, 38,  2,192, 80, 27, 12, 82,109,133,144, 17,
-194,192, 72,100,227,166,204,134,144, 18,175,215,153,144,144, 64,238,186,235, 46,122,171,222, 63,187,181,159, 65,210,210,210,168,
-107, 68,187,171, 39,192, 71,113, 26,206,242,119, 81, 40, 52,183, 99,240, 26, 51,102, 12,158,222,152,137,183,170, 43, 48,112,244,
-189, 96,218, 70,216,175,201, 66,237,169,123, 33,  2, 17,  8, 65,196,  2,124,158,177, 12, 45,198, 14, 65,247,238,221,255,208,212,
-189,156,117,159,155,155,171, 30, 54,108,152,108,230,204,153,141,250,237,179,103,207,202,247,236,217, 83, 44, 16,  8, 54,143, 28,
- 57,242,109,134, 97,174,197,197,197,229, 56, 45, 25, 23,143, 18, 33,  4,238,158,185,139, 39, 64,117,228,200,145,161, 95,173, 94,
-195,136,  5, 65, 23, 38, 63, 54,121,  0,195, 48,186,123,239,159, 61,  1, 64,152,131,248,171,  1, 80,171,213,234,148, 87, 79,105,
- 11,148,148,191,  3,193,199,253,239,151,  2,208, 20, 10,131, 39,242,241,101,128,147, 10,122,251,182,  0,  0, 32,  0, 73, 68, 65,
- 84, 41,146,137,106,183, 74,202,158, 42, 84,235, 77,102, 88,109, 54,116, 31, 58, 24, 49,214, 97, 62,145, 97, 83,  6,163,112, 73,
-127,  0,168, 57, 79,135,203, 84,  0,105,132,220,173,114,185, 92,168, 82,169,230, 47, 93,186,244,223, 46,202,197, 24,165, 82,233,
- 83, 34, 18,135,167,160,201,146,151, 76,249, 61,201,209,142, 13,223,223, 20,149,202, 47, 77,255,193,103, 58,104, 30, 68,227,159,
-143,157,220,  9,158,152, 63,198,153,167,156, 27,199, 86,167,239, 65,104,231, 12, 18,218, 57,201, 39,153,225, 45,158,213, 28, 40,
-  6, 97,153, 11, 82,163,193, 94,  7, 32, 84, 34,215,132, 69,193,167, 21,163, 46,253, 79,228,208, 56,155,124, 94,149, 83,  2,154,
- 66,150, 35, 22, 64,205,125,110,172, 60,127, 87,150,117,239,222, 29,237,158,123, 78,182, 98,215, 46,117,209,219,223, 33, 73,212,
- 18,225,142,226, 61, 70,131, 21,115, 23,188, 12, 65, 72, 36,182,175, 81,226,215, 86,  4,227, 26,145,183,223,102,179,194,215, 24,
-160,250, 74,  0, 31, 43,223, 75, 59,145,211,167, 79, 95,163,148,166,247,234,213,235,203,242,242,114,189, 80, 40,132,213,106,165,
- 45, 91,182,116,122, 84,244,122, 61,196, 98,177,211,139,228, 65,222,168,252,252,124,176, 86,130,225, 35,  6,188,113,241,226, 69,
-157, 86,171, 69,100,100, 36,219,177, 99, 71, 29,247,108, 42, 43, 43, 33,145, 72, 64,  8, 65, 80, 80, 16, 47,163,143, 83, 18,234,
-127,174,239, 21, 13,224, 79,230,  1,184, 85, 74,129,223,196,152, 32,215, 32, 65,126, 71, 69,147, 58,148,  0,114, 11,230,209,109,
-114,185,252,255,228,114,249,255, 53,197,245, 53,225,253,146,166, 56,231, 86,194,110,213,  3,142, 20,251,245,142, 37, 53, 74, 54,
-195,118,210,132, 74, 58, 53,197,101, 90,110,101, 27, 52, 97,209, 21,141, 47,115,245, 94,148,  9,191,229, 80, 74, 73, 72, 72,  8,
- 38, 77,154,  4, 71,249, 94,148,184,148,239, 61,176,103,183,179,124,239,216,184,177,112, 40,189, 13,254,222,231,186,247,200,147,
- 17, 47,223, 76, 76, 60,171,  9,242, 80,  2, 26,141,123,238,185,199,100,181, 90,115,  0,232, 89,150,165,102,179,125,225,207,181,
-107,215,  0,  0,205,154,217,151,246,114,251, 69, 34,145,199,246,123,224,129,  7, 56, 25,187, 88,150, 69,120,120, 56, 88,150,117,
-174, 56,113,172, 98, 33,181,181,181, 20,  0,196, 98, 49,  8, 33,204, 31, 49,182,  7,224, 63,248,164,146,  6,  0, 50,112,224,192,
-128, 38, 22, 64,  0,  1,  4,240,231,129, 21, 64, 45,  0, 73, 19, 27,113,222, 10,  6,241,174, 40, 24,192,159,  3,129,135, 25, 64,
-  0,  1,  4,240,231,130, 16, 64, 51, 30,228,111,128, 61,136,187,169,248,128, 69, 96,217,223, 95,174, 35,  5, 16, 64,  0,  1,  4,
-240,215, 67, 72,128, 47,  2,  8,120,  0,  2,  8, 32,128,  0,  2,  8, 32,128,128,  2, 16, 64,  0,  1,  4, 16, 64,  0,127,119,212,
-113,233,204,153, 51,199,239,  8, 78,119,197,123,238,116,121,209,131,131, 16, 28,116,  5, 34,113,  5, 88,214,190, 44, 76, 32, 96,
-192, 16,129,253,127,134,128, 16,  6,148,  8,237,107, 96, 97,197,150,109, 34, 80, 74, 17,201,180,132,143,215, 23,  4,160, 21,236,
-  1, 60,213,176, 47,247,178,192, 49,167,246,103,108,191,128,188,128,188,128,188,128,188,128,188, 59, 83,158,207, 10,192,223, 13,
- 63,238, 63,131,161, 67, 44,136,  8,  7,180, 58,130,159,127,149, 64,200,  8,113,255,120, 27,118,171, 91,131, 16,  6,132, 97, 32,
-105, 14,140, 25, 90,  1, 64,136,123,227, 41,242, 11,132,118, 26,231,  1,245,193,253, 20,  0, 68,212,130, 97, 35,199, 20,159,254,
-237, 39, 83, 89, 85,109,140,205, 80, 11,185, 92, 30, 14,160, 50,160,135,254,185,145,253,205,127,165, 61,186,119, 83, 95,187, 86,
-219,168,132, 79,127, 34, 72, 83, 83, 83, 93,243,  0, 52,234,158, 83, 83, 83,253, 78,  7, 28, 64,  0,  1, 52,145,  7,128,195,154,
-175,190,224,173, 77, 60, 49,115,150,215,151,181,169,229, 53, 37,242, 11, 68, 72, 76,176,225,215,223,130, 33, 22,  9, 33, 20,  8,
- 33, 18, 81,  4,  9, 44,128,176, 57,132, 48, 98,104, 95, 43, 36,226, 32, 80,  0,237,219,  2, 15,222,207, 98,207,102,126,228,127,
-230,247,211,184,171, 79,119,116,136, 10,199,197,226,147, 93,194,218,117, 67,171, 14, 54,252,240,253,247, 80,169, 84, 21,183,123,
-125,188, 74,165,186, 63, 43, 43,107, 27,183,157,148,148,244,128, 92, 46,223, 22,120, 53,188,227,183, 95, 85,212, 90,123, 92, 54,
-237,193,238,106,150, 45, 71,101,  7,163,250,228,177,141,168, 49,181,199,144,216,145,127, 89, 18, 75, 77, 77, 85,207,155, 55, 15,
-132, 16, 94,101,123,249,128, 75, 22,211,  4,229,230,  3,104,164,  2,230, 17,148, 34,243,243,207, 27,124,222, 92,130, 31,215,108,
-129, 92, 13,  1,151, 90,  2,206,231,236, 90, 25, 49,128,166,  5,151, 13,144,131,187,220,  0,119,148,  7,128,193, 31,219, 15,238,
- 31,103,  1,133,  0, 66,129,  8,195,135, 17,180,105,205, 64, 40,100, 16, 36, 18,160, 87, 12,131,226, 11, 86, 12,141,101,208, 50,
- 82,130, 31,246,182,  0,  0,  8,168, 17,246, 84,216, 54,175,228,255, 91, 65,  1,186,118,232,136,223,114,243,112,200,108,129,238,
-186, 14,226,160,230,232, 61,104,  4,  6,140, 24,  7,245,150, 44,  0,252,114,227,223,  2,226, 31,147,149,149,181,103,225,194,133,
- 40, 40, 40,224, 58, 76,  5,128,231,102,207,158,189, 53, 41, 41, 73, 46,151,203,247,252,229, 94,138,159, 85, 52, 72,168,133,144,
- 49,163,182,214,134, 74,125, 48,238, 29, 53,197,167,246,223,152,253,149,180, 69,176, 22,255,152, 58, 24, 93,187, 60,168,110,209,
- 34, 12, 22,171, 21,215,174, 93, 71,219,146, 11, 40, 60, 91,132,131,  7,180,116,248,136,135,252,122,174,153,153,153,212,101,112,
-190,211,  6, 71, 41,112,163, 28,174,163, 58,160, 20,183, 41, 29,240, 31,248,190,208, 77,155, 54,221, 92, 79,225,182,145, 23,149,
- 18, 16,208, 38,104,119, 90,242, 13,200,161,217,174, 28,239,200,146,233,168,134,228,130,217, 25,122, 12,157,250,177, 71, 69,238,
-135, 31,126,112,110, 39, 38, 38, 98,199,142, 29, 30,183,  3,184,245,228,239,186,207, 85, 17,240,168,  0, 28,216,127,  8, 35,238,
- 29,246,135, 93, 52,235, 67,254, 84,215, 84,146,254,102,159, 98,132,  2,232,180, 66,180,107, 35, 66,187, 54, 98,212,212,136, 32,
- 17,  9, 97, 19,  6, 97,112,127,130,129,119, 11,192, 16,145, 61,  5,166, 72, 12, 17, 99,  2,145,136, 97, 53,  0, 86,232, 61,146,
-255,254,189,123,208,173,125,107, 28,251,245, 24, 22,189,253, 70,157,235, 91,242,230,187,148, 17, 16, 12,142, 29,140, 31,118,236,
-241,169,242, 30,203,178,210,130,130,  2,245,153, 51,103, 16, 28, 28,140,224,224, 96, 89, 98, 98,162,198,199,193, 76,150,149,149,
-181,135, 35,126,151,206, 17, 14, 96,220,127,254,243,159,235,179,103,207, 86,  1, 72,144,203,229,170, 59,177,131,175, 90,181, 74,
-154,146,146,194,251,190,191,222,176, 70,218, 47,166,185,186, 75,251, 90,132,181,  8,  2,195,132,192,104,180,162, 92,107, 68,142,
-106,  5,149,180, 24,140, 97, 67, 71,241,234, 71, 34, 92,193,164,  7,238, 86,247,237,219, 27,151,175,232,112,248,231, 35,168,169,
-209, 35, 44,172, 57,162,163,187,128, 17,136, 96,179,149,224,231, 95,246,211, 65,  3,239,253, 75, 89, 55,169,169,169,234,231,159,
-127,222,185, 61,111,222, 60, 44, 95,190, 92,253,185,  7,171,208, 39, 50,186, 67, 61,  0, 14, 37,157,102,103,103,195, 93, 97,165,
- 63, 18,174, 86,182, 82,153, 33,163,180,113, 74,  0,211,229, 81, 39,121,231,191,215,204,173, 25,214, 46,156, 65, 84, 36,243,167,
-125,126,127, 87,184,146,189, 59,165,192,171,  7,224,192,254, 67,  0,208,104, 69, 96,255,115,133, 30,143,223,251, 81, 15,191,  7,
- 11, 66,136, 95,213,246, 84,154, 54, 16,  9, 69,232,212,161,  6,213,213, 34, 28, 62,214,  9,  2,129,  0,  2, 34,128, 88,100, 69,
-223, 30,  6,244,236, 33,  0,  1,  3,177, 40,  8, 98,  1, 65,236,221,102, 68, 70,176, 88,247,165,103,217,189,187,181, 69,241,217,
-178,155,200, 31,  0, 22, 45,126,133,188,251,246,191,105,251,248,187, 17, 17,222,156,247,245, 26,141, 70,233,242,229,203,213,197,
-197,197,117,244, 13,147,201,132,135, 30,226,111,109,102,101,101,237,117, 37,127, 55,104,149,158,158, 94,241,194, 11, 47,236,190,
-221, 83, 20, 13,145,255,161, 67,135,212, 41, 41, 41,188,175, 45, 38, 58, 82, 29,213,182, 10,173, 90,134,162, 99, 84, 59,132,132,
-134,160,184,184, 20, 54, 27,139,168, 14,205,113,252,247, 92,172, 62, 85, 40, 77,126,124,150,199,193,244,232,209,253,244,145,137,
-189,209,185,115, 71,156,248,189, 24,135, 15,255,142,107,215,171, 65, 41, 16, 17, 17, 12,131,161,  6,131,  6,245, 69, 69, 69, 37,
- 74, 15,255,140,175,254,119, 90, 58,243, 31,252, 21,149, 59, 28, 82,192, 94,124,138,195,135, 31,126,200,109,251,228,  5, 72, 77,
- 77,165,174, 46, 97, 87, 11,210,213, 37,221, 20,211, 11,111,191,253, 54,237,212,169, 83,163,115,241,203,229,114, 66,  8,161, 27,
- 55,110,244,152, 99,159, 67, 90, 90, 26,117,231, 33, 88,189,122,181,148, 43, 14,228, 78,137, 85, 40, 20,180,161, 84,174,174,245,
- 28, 40,165, 80, 40,210,212,141,241, 66,212,151, 55,244,229, 26,252,244, 94,179, 58,196, 31,192,159,211,250,175,223,135, 26, 53,
-  5,208, 88, 69,224,222,143,122, 52,168,  4,248, 67,254, 28,114,114,114, 80, 90, 90, 10,  0,136,138,138,162,190, 40,  1,  2,106,
-132,144,216, 32, 22,137,240,243,177,214, 16,  8,133,104, 46,210,219,227,  0,154, 49, 40, 45,109,142,187,251,178, 32,132, 32,233,
- 65, 43, 40,203,  0, 36,200,238,120, 67,117,131,114, 13, 21, 23,112, 69, 91,131, 23, 94,127,189,193,107,169,168,212, 66,119,237,
-138, 67, 22,111,226,174, 79,254,  0,128,237,219,183,195,102,179, 73, 31,121,228, 17,175,  3,156, 74,165, 26, 83,191,244, 47,215,
- 97, 42, 43,235,196, 35,134, 47, 94,188, 24, 42,149,106,236,157, 52, 21,192,145,191, 47,223,249,122,195, 26,233,221, 49, 38,  4,
-  7,135, 67, 18, 36, 70,183,110, 93,209,169,107, 87, 84, 85,105,160,213,214, 64, 44, 22, 32, 50, 66,  2, 97,112,184,199, 92,241,
-  0, 32,164,165,104,222,172, 37, 12, 70, 43,142, 29, 43,196,165, 43,149,184,124,165,  6, 70,147,  4,157,163,172,144,  4,  9, 80,
-120,186,  8,119,117,239,142, 75,151,171, 96,180,182,240, 42,211, 65,116,212,219,126, 95,167,  3, 26,146,233,143, 44,206,250,159,
- 55,111,222, 77,251,159,127,254,121,191, 98,  1,220,145,104,253,185,227,166,242, 42,228,230,230,170,209,200,130, 60,123,246,236,
-161, 89, 89, 89, 72, 74, 74,130,187,233,  0, 62,158, 42,142,252,  1, 32, 63, 63, 95,205, 48, 76,157,107, 90,189,122,181,148,143,
-209, 19, 31, 31, 47,227,228, 52,133,199,101,227,243,161,152,178, 92,239,150,248,163, 34, 25,199, 40,197,239,241, 38, 38, 38,214,
-241,146,220,119,223,125,117,218, 42,224,246,191,115,224,115, 12, 64, 83,121,  4,154, 18,133,133,118,197,162,180,180,212, 39, 37,
- 64, 40, 20, 66, 36, 16, 65, 36, 34, 24, 53,  2, 48,232, 77, 56,119, 86, 12,145, 80,  4,161, 77,136,184, 97, 20, 98,145,  8,  2,
-  1,  3, 80,  2,173, 14,248,233,136, 16, 44,203,  2,184,214,160,220, 35, 63,159, 69, 77, 77,195, 25, 56,223, 95,188,152,  6,  5,
- 73, 96, 52, 86,194,198, 90,121,223,231,145, 35, 71, 26, 86, 58, 12,  6, 94, 68, 83,223,245,239, 78, 51,220,178,101,139,235,249,
-170,219,225,  5,112,231,226,119, 37,255,248,248,120,222, 85,232, 58, 70,181, 85, 51,204,  5, 88,109, 44,204, 22, 43,174, 93,215,
- 66, 36,150,192,100,178,192, 98,181,193,106,101, 97,181, 81, 84,232,174,123,149, 37, 22,233, 33,  9,238,136,242,242, 74, 84, 85,
- 27,160,213, 25,209,162,229,  0, 12,191,251,110,228, 31,216,129, 14,102, 43, 42,171, 42,209,179,103,119,  4,137,133,208, 87,107,
-255, 42, 99,133,148, 82,234,156,251,119,197,138, 21, 43,252,138,  5,152, 55,111, 94, 29,111, 66,253, 99,124, 21,  0,123,169,103,
-206,162,141,196,216,177, 99,235,244, 87,206, 64, 40, 41, 41, 81,171, 84, 42,191, 10, 83,169, 84, 42, 39,249,115,211,  1,155, 54,
-109,242, 74,174,245, 61, 85,185,185,185,106, 46,240, 77,161, 80,208,188,188, 60,117,114,114,178,243,120, 94, 94,158,154, 16,207,
-151, 23, 31, 31, 47,115, 45, 51,156,150,150, 70, 61,181,149,183,241, 48, 41, 41,  9,147,227, 85,216,  0, 96,234,114, 61,238,121,
-185,198, 99,219, 15,157,234,185,173,234,207,241,123,139,  9,  8,224,214,123,  3, 26,242,  0,252,161,254, 29,119,150,126, 99,172,
-255,122, 22, 43, 10, 11, 11,177, 98,197, 10,222,165, 38,  5,  2, 33,226,134,178, 16, 48, 66,252, 84, 32,193,169, 66,  9, 38,140,
-  7, 30,184, 15,152,152, 72,208,190,173, 24, 18,113, 16, 36,226, 32,  4, 75,130, 16,213, 62,  8, 18,177,  4, 18,177,231,146,152,
-175, 45,122,149, 44,125,239, 45,210,208, 64,210,189, 91, 23,132,133,135, 66,194,154, 81, 99,176,252,225,157, 98,255,254,253,123,
-246,239,223, 95,135,240, 93,255,  0,160,188,188, 28, 19, 39, 78,188,109, 86,126,126,126,190,218,213, 26,226,246,  1,192,176, 97,
-195,124,178,228,108, 54, 64,111,176, 64,175, 55,163,170,202,132,171, 87,117,184,116,233, 58,170,171, 77,168,169,177,160,166,198,
- 12,189,222,130,202, 10,239, 43, 50, 77, 38, 43,106,107,109,176, 88,204,104,222, 92,140, 78, 81, 45, 16, 18, 26, 10,  0,136,238,
-222, 21, 29, 59,180, 64, 88, 11,  9, 40,181,193, 98,101, 97, 50,233,255, 18,  3, 73,106,106,170,122,254,252,249, 30,201,156, 91,
- 26,200,211, 59, 33,115, 40, 13,110,177,124,249,114,124,254,249,231, 62,151, 26,182,187,197, 21,212,245,143, 35,212,210,210, 82,
-100,101,101,249, 92,138,118,207,158, 61, 52, 59, 59,219,149,252, 33,151,203,201,228,201,147, 61,126,111,206,156, 57, 32,132, 56,
-173,250, 85,171, 86, 73,  1, 32, 46, 46, 78,230,170,196,186, 30,167,148, 58,143,243,184,219, 58, 86,188, 59,197,193,155, 50,  1,
-  0,173, 90,181,  2,113,177, 30, 26, 43, 47,128, 59,143,252,221,109,251,229,  1,184,147, 44,255, 27,  3,188, 13,  2,129,192,231,
-239,141, 24,202,162, 77,235, 32, 84, 85,  9, 17, 36,180, 34, 72, 44,128,230,144, 24, 19,100, 34,136, 69, 34, 84, 85,137,112,160,
- 32, 20, 45, 36,  4, 12,195, 32, 81,110,198, 67, 19, 40, 24,134,226,157, 95,124,191, 78,149, 74, 69,  5, 33, 18,104, 69,173, 16,
- 98,185,136, 51,165, 20, 99,164,163,120,127,127,208,160, 65, 56,120,240,160,219, 99, 33, 33, 33,188,  7, 75,157, 78, 55,214, 49,
-240, 32, 57, 57,217,185,191,188,188,220,249, 57, 57, 57, 25,101,101,101,183,229,121,166,164,164,104,242,243,243,145,155,155,171,
-102, 89, 86,198, 48, 12, 56,203,191,161,121, 83, 79, 40,185,112, 73,214,186,133, 65, 29, 36, 22,192,108, 97, 81,107,186,136, 11,
- 23,203,161,213, 85, 65,171, 53,160, 92,107, 68,185,214,136,240,200,174, 94,101, 93,189, 78,113,229,234,117,244,238,221, 29, 21,
- 58, 29, 68, 66,  6, 85,213, 23,161,175, 96,209,231, 46, 61,218,182,110,141,144,144, 16,  4,  5,  5,227,242,149,106, 16, 65,  4,
- 95,130, 37, 46,228,216, 36,171,  0,154,122,  5, 65, 67,214, 58, 80, 39, 22,128, 47, 52,  0, 48,119,238,220,155,188, 10, 46,211,
- 12, 26,127,174,115,202,148, 41,117, 44,216,172,172, 44, 39,121, 61,250,232,163, 72, 72, 72, 32,124, 19,167,184,177,252,157,168,
-239,105,168,143,129,  3,  7, 18, 74,169,211,202,207,207,207, 87, 19, 66,156,165,129,147,147,147, 53,185,185,185,200,205,205, 85,
- 39, 39, 39,147, 67,135, 14, 57,143,175, 92,185,178, 65,185,185,185,185,106,134, 33,178,188, 60,251, 59, 49,103,206, 28,252,242,
-203,207, 50,142,194,243,242,242,212,220,253,243, 81, 38, 86,174, 92,137, 79,101, 17,152,186,194,  0,192, 62, 29,224,138,169, 43,
- 12,206,246, 76,145,137,  2,204,250,103, 81,218, 23,190, 95, 87,233, 94,250, 18,126,249,229, 23,254,171,  0,110,  5,241,187,198,
-  2, 52,198,250,175,107,201,215, 37,255,196,196, 68, 40, 20, 10,175, 83,  1,173, 90,  9,192, 16,  1, 90,183, 18,160, 71,119,138,
- 75,151,132, 96,  4,  4, 34,161, 16, 34,161,  8,191, 29, 13, 69,100,168,  8,  2,129,  0, 35,134,217, 16, 28, 28,  4,150,165,  0,
-181,249, 69,254,205,218,118,194,213, 26, 10,253, 25, 13,132, 68,128, 23, 23, 47, 34, 62, 14,108,178, 11, 23, 46,168, 47, 92,184,
-112,211,253, 78,154, 52,137,215, 96,153,148,148,148, 80, 94, 94,190,155, 35,121,  0,152, 56,113, 34, 86,175, 94,237, 60,167,170,
-170, 10,101,101,101,216,186,117, 43,146,146,146,198,220,142,206, 27, 23, 23, 39,203,205,205, 85,231,231,231,171,185, 96,177,184,
-184, 56,191,230,112,103,254, 35,229,255,217,251,242,240,166,170,252,253,247,220,236, 93,105, 75, 41, 75,217,165,130,108,  5, 42,
- 32,107,  2,  5, 20,176, 34,180,200, 38, 95,100,102, 26, 24, 87, 96, 20, 69,231,231,204,168, 40, 46,128, 35, 35,180,140,138, 11,
- 21,105, 21, 44, 88,  4, 10,  9,139,136,149,138,128, 44,178,148,181,133,174,105,211, 52,123,238,249,253,145,222,152,134,180,185,
- 73,195, 58,247,125,158, 60, 77,238,189,249, 52,247,220,115,206,251,217,206,231,104, 55,124,153,  9, 90,172,135,209,100,131, 78,
-102,  6,133, 14,102,179, 29,122,189,  5,101, 21, 70,148, 92, 53, 96,184,170,163, 79, 89, 38,107, 75, 20,157, 47, 71,151,206, 29,
-208,185,115, 60, 42, 43, 43, 16,213,194,129,110,221, 34,209, 42,182, 11,228, 10,  5,170,171, 13, 40,252,229, 20,174, 20,235,209,
- 58,190,231, 29, 59,129, 80,128, 18,  2, 21,199,165,238,164,218,212,186,125, 90,159, 44,120,189,249,136,  6,171,202, 50, 51, 51,
- 85, 43, 87,174,212,120, 42,  0,203,151, 47,231, 10, 12, 53, 41,143, 82, 74,  9, 33, 68,173,142,114,251, 77,244, 58, 98,206,206,
-118,134,  8, 82, 83, 83,121,185,255, 27,134, 20,118,121, 37,127,190,120,224,129,  7, 84,  7, 15, 30,212,112, 94,135,161, 67,135,
-170,188,157,231,146,241,124, 17, 54, 23, 91,255,225,135,  3, 26, 66,  8,  8, 33, 72, 76,236,171, 74, 76, 76,212,186, 41,  8,245,
-215,  2,190,198, 11, 39,143,153,170,  3, 39, 47,109, 84,167,  6, 15,106,234,138, 19, 46,121,124, 32,228,  0,220, 57,240,169,  0,
-220,142, 22, 63,135,105,211,166, 53,235,251, 12,195, 64, 36,114,190,122, 36, 48,232,215,219,  1,153, 84,238, 84,  0, 36, 18, 12,
- 25,  4,200,100,128, 68, 36, 67,203,150,114,136, 68,117,112, 56, 88,176,172,255,110,123, 99,213, 53,200,227,187,227,124,254, 23,
-136, 21, 51,120,252,229, 37,126, 79, 40, 10,133, 66,187,100,201, 18, 85,115,150,  1, 38, 39, 39,231,171,213,106, 60,245,212, 83,
-174, 99,156,165,175,215,235, 97, 52, 26, 49,119,238, 92,  0,192,135, 31,126,136,140,140, 12,205,173,120,182,115,230,204,209,178,
- 44,171,226, 44,255,129,  3,  7, 54, 43,129, 43,190,227,189, 56,116,112, 59, 90,181, 12, 65, 72,136,179,219, 91, 44, 14,232,107,
-173,168,210,153,208,190,115, 79, 12, 27, 50,210,231, 51, 25, 63,126, 10,217,177,237, 19,122,176,224, 56,134, 15,237,139,142, 29,
- 59,194,102, 53,163, 95, 98, 31,132, 70, 70,226, 98,209, 37, 20,151, 84,227,135, 31, 79, 66, 87, 27,137, 71, 31, 24,121,199,250,
- 76,231,207, 83,  3,128,  6, 32,152,175, 86,187,  8,156,245, 32,125,134, 33, 78,109,161,158,151,  9,128,190, 94,226,141,243,212,
-106, 10, 10,183, 76, 21,130,244,244,244,  6, 94,128,103,159,125, 22,132, 16,204,155,167,214,112,236, 15,  2,244,237,155,232,141,
-188, 92,238,120, 95, 36,199,151,252, 61,145,154,154,138,209,163, 71,171,154,211,143, 81, 31,171, 31, 52,104,144,106,246,236,217,
-218,198,206,187,197,246, 27,  5,151, 59,192, 41, 95,206, 48,  2,209,122, 42, 21,124,127,159,167,188,141, 11,194,156,141, 46,143,
-115, 93,179,113,193, 37,151, 66,176,253, 72,211,115,159,183, 58,  0, 66, 14,192, 29,170,  0, 12, 25, 58,240,134,196,124,130,101,
-249,187,119,164, 64, 80,165, 35,104, 19,199,184, 74,254,238,216,229,140,239,203,100,114,200,164, 50, 60,252, 16,129, 92, 38,133,
- 66, 78, 80, 85, 41, 66, 65, 97, 56, 28,172,  3,237,227,253,139,235,230,231,231,211,106,163,  9,186, 67,121,232,214, 94,130,223,
-138,  3,143, 11, 51, 12,163, 29, 56,112, 32, 25, 56,112, 96,192, 50,210,210,210, 84,171, 86,173,210,112,110,254,202,202,202,199,
-  6, 13, 26,100,216,185,115,231,119,143, 60,242,200,216,202,202, 74,242,248,227,143,111, 79, 75, 75, 83,221,202,206, 89,239,234,
- 87,185,189, 15,188,207, 57,201,157,158, 62,117,  2, 37, 69, 23,193, 48,  4, 14,  7,133, 92, 17,141,132, 30,189,240,232,164, 52,
-222, 29,189,164,156, 85, 85, 85,150,104,204,102, 59,122,247,234,130,118,109, 91,226,210,229, 82,232,142,157,195,239,167, 47, 97,
-215,238,163,184, 88, 76,241,231,191, 60, 29,208,224,185, 93,138,255,176, 95, 69,  5,124, 93,191,165, 60,229,157,251,  4, 43, 87,
-174,116, 41,  0, 43, 87,174,  4,138,214, 93,119,173, 55,121,141,120,  5,174,155,179,154, 91,172,135, 16,210,172,190,199,145,124,
- 99,228,238,235,188, 55,175,130,199,119,189,201,227,255,156, 47,126,141,156,149,179,157,115,195,168, 14, 13,200, 31,  0,210,198,
-223,239,124,163,251,213,167,  2, 32,212,  1,184,125,144,185,236,197,235,194,  0,126, 41,  0,183,115,194, 71,160,197,127,220,113,
-232, 23, 25,228, 82, 41, 30, 30, 79,192, 16,130,129, 73,118, 28,251, 77,  1,134, 56, 99,254,213,213, 12,218,182, 22,129, 33, 82,
- 28, 57, 38,133, 92,  6, 88,109, 86, 92,188,164,240,139,252,207,157, 62,140, 65,163, 39, 66,220,114, 16,206,157, 46,128,248, 90,
- 14, 94,120,254, 37,250,246, 59,111,222,146,  6,174,175, 87,175, 74, 74, 74,210, 44, 94,188, 24,189,122,245, 42,211,233,116, 72,
- 74, 74, 82,233,116, 58, 60,243,204, 51,154,180,180,180,219,162,174,125,115,137,223, 83,  9, 24, 54,100, 36,214,125,254,145,178,
- 77,235, 54,154,208,208, 80, 94, 86,255,117, 19,236,236, 63,105,  1,144,245, 95,100,208, 19,191,255,132, 54,113, 97,144,203, 37,
- 48, 24,172, 40,190,170,  7, 17,183,199,159,255, 50, 91,200,150,226,131, 95, 22,  1, 93,159, 64,131,229,133,133, 11,155, 67,214,
-205,254, 73,243,230, 69,187, 41, 18,193, 33, 52, 95,164,236, 15,105, 55,183,158,129,183, 54, 75,123, 64,230,188, 87,211, 85,231,
- 75,192, 29,139,196,196, 68, 87,194, 95,230,178, 23,175, 59,231, 83,  1,  8,118, 61,254,155, 93,223,223,175,206, 15,  2,157,142,
- 32,164, 53, 65, 76, 52, 65, 82,127, 27,228, 82, 17,100, 82, 27, 98,162,229,245,147,  0,193,224, 36,  7, 10,126,145, 56,189,  5,
- 60, 39,153,252,252,124,218,243,222,  8, 44,122,246, 95, 48, 73,227,241, 77,126, 49,186, 38, 56, 45,247,176,159,183, 98,209,223,
- 94,162,239,189,123,235,148,128,228,228,100,146,159,159,175, 92,182,108,153,198,221, 59, 16, 12,229,234,118, 70,125,177,159,102,
-223,227,204, 89,106,178,255,192, 30, 90, 94, 89, 14,211, 53, 35,228,242, 24,196,119,238, 19,144, 82,113,167,193, 89, 14, 59, 72,
-183, 89,180, 14,174, 21,  1, 69,159,222,242,123,243,149,220,119,183, 97,236,196,199,252,178,220,125,249, 30,133, 28,128,219, 75,
-  9,104,140,252,125,122,  0,254, 23, 64,225,204,234, 39, 12,  5,  5, 69,116, 11,138, 61,251,197,144, 75, 37,144, 73,197, 72, 25,
- 79, 65, 41,139,168, 24, 59,236, 14,  2,150,117,212, 79,126,190,209,167,147,  1, 19,166,164,193, 32,238,134, 86, 97,161,152,241,
-104, 52,178, 54, 29,115, 41,  1, 54,199, 55,183,252,254, 57, 69, 64, 24, 50,129,123, 21,238,214,123,203,212,189, 69,210,163, 94,
-188,158, 25,178,163,  3,149,135,244,168, 23,175, 63, 81,184,176, 89, 86,191,128,230, 33,245,201, 85, 65,235,195,119,187,241,112,
-167, 41,  1, 62, 13,224,196,196, 68, 33,104, 35, 64,128,  0,  1,  2,  4,252,143, 65, 40,244, 44, 64,128,  0,  1,  2,  4,  8, 10,
-128,  0,  1,  2,  4,  8, 16, 32, 64, 80,  0,  4,  8, 16, 32, 64,128,  0,  1,130,  2, 32, 64,128,  0,  1,  2,  4,  8,184, 59,208,
- 96, 21,192,252,249,243,  3,206,224,244, 86, 91, 59,216,242,102,206,157,231,243,123,117, 85,215, 92,239, 67,163, 91,187,222,175,
-255,120,205,117,215,198,170,254,236, 83,222,206, 21,127, 84,204, 27,179, 96,149,235,125,185,230,191,  8,228,247, 53,134, 64,127,
- 95, 99,240,246,251, 38, 61,174,246,249,189, 67,154,239,208,169, 83, 39, 92,184,112,  1, 73,170,  9,174,227,155, 63,207,184,225,
-237,247,231,171, 87,155,236, 47, 22,177, 88,185,168,184,216,181,100,113, 85, 92,156,235,250,255,182,105,115,195,251,159,167,188,
-220,220, 92,101, 94, 94, 94,131, 74,137,227,199,143, 87,165,164,164,104,111,197,248, 56,124,248,112,192,242,250,245,235,119,163,
-127, 31,153, 63,127, 62,110,231,249,229, 86,200,203,202,202,154,222,187,119,239,172, 99,199,142, 77,153, 49, 99,198, 55,205,149,
-231,190,209,145,123, 70,254,221,218,126,130,188,198,229,249,173,  0,120,194,110,183, 43,205,102, 51,136, 72,  2, 66,  8, 28,118,
- 27,164, 18, 49,100, 50,153,182,185,154,135,221,110, 87,  2,128, 88, 44,110,150,172,186,170,107,  8,141,110,237, 34,254,214,237,
- 59,  1,  0,174, 93,190, 16,144,188,157, 43,158,194,152,  5,171, 92,196,245,159,220,  2,  0,192,147, 41,  3,113, 55,226,144,230,
- 59, 36,169, 38,224,144,230, 59,  0,192,132,212,153,  0,128, 11, 23,110,125,251,253,187,180, 84,121, 26,208, 36,  0,170,211,128,
-115, 15,245,197, 47,  0,  0,  6, 46,123,251,150,182,155, 86,171,165,121,121,121, 48,155,205, 13,142,203,229,114, 77, 68, 68,  4,
-148, 74,229,109,185, 28,138, 16, 50,236,222,206,237, 62,165, 14,135,241,244,165,107, 47, 81, 74,183, 10,118, 80, 19, 74,167,197,
- 50,234,240,225,195, 17, 37, 37, 37,173,163,163,163, 91, 12, 24, 48,160, 56, 60, 60,252,243, 64,229,101,101,101,141,158, 49, 99,
-198,158,172,172,172, 63,  3,136,156,246,196,188,185,  0,216, 99,199,142,205,  6,176, 25,  0,235,143, 60,110,207, 19,142,248,155,
- 51,222, 60,119, 73, 12,214,146,190,198,148, 18,  1,183,153,  7,192, 29,250, 90,131,178, 77,194,253,154,145,189,187, 35, 68, 38,
-  1,165, 20, 14,  7,197,111,103, 46,226,252,209,125, 42,133, 76,  2,145, 72, 20, 16,121,135,201, 47, 40,123,118, 43,210,252,118,
-186,139,170,206,210, 41, 96,226,  7,  0, 69,100, 12,234,170,174,185,136,191, 41,143,  0, 31, 75,117,224,204, 23,177,115,197, 83,
-174,129,212,216,117, 77,173,177,244,252,159, 82,169, 20,128,179, 76, 38,203, 58,199,183,195,225,112,253,126, 70, 36,225,109, 69,
-  3, 64,155, 86,206, 82,157, 86,125, 53, 44,118, 59,  0,192, 96,119,202,235, 60,246, 79,184,167,103, 63, 94,196, 15,  0,125,135,
-140,198, 33,205,119, 46,226,111,236,186,155,217,126,  0,240, 84,105, 41,  5,128,113,161,161,216, 94, 87,167,225,136, 31,  0,126,
-223,177,243,186,235, 18,219,180,225,245, 59,107, 66, 43,148,133, 21, 63,163,248,210, 17,116,235, 56, 24,131,229, 74,191,251,112,
-110,110,238, 35,219,182,109,227,200,223, 14,192, 12, 32,  4,  0,107, 54,155,197, 10,133,  2,122,189, 94,233,205, 19,112,139,201,
- 63,238,254,196,222,219,182,127,185, 38,172,174,248, 36,134,165,205,207, 34,132,204,166,148,110,190,221, 38,166,252,252,124,218,
-156,250, 20,124, 54,  3,107, 10, 54,155, 77, 89, 80, 80,160, 57,126,252,184,235, 88, 69, 69,  5, 78,159, 62,141, 54,109,218,124,
-166, 84, 42, 85,225,225,225,124,159, 47,147,149,149,245, 79,  0, 15, 12, 27, 55, 73,145,149,149, 21, 55,237,137,121,225,  0, 28,
-  0,184,142,123,111,253,117, 35,248,222, 31, 55,222,212,106, 53,109,108,188,113,215,249, 26,111,106,181,154,238,253,177,  0, 34,
-145, 24, 14,135, 29, 53,181,  6,204,152,242,  8,125,247,221,119,155, 69,216,158, 74, 69,115,159,139,  0,223,240,182,237, 47,  7,
- 94,149,  0,235, 76, 86,229,232,148, 25,154,246,173, 34, 17, 34, 23,131,101, 89, 56, 88, 64, 44, 34,136,142,236,142,158,221, 58,
-104,242,183,127,167,114,216,234,148,254, 42,  1, 86,171, 85,217,163,231,121, 77,223,238,231, 33, 98, 28, 26,237,161,118, 42,169,
- 68,226,151,140,186,170,107, 80, 68,198, 32, 50, 34, 28,  0, 92,127,189, 93,215,186,125, 39,159,222,128,157, 43,158,194,192,153,
- 47,226,255, 30,155, 12,  0,174,191,222,174,251, 79,110,129, 95,218,181, 72, 36, 66,124,124, 60, 68, 34, 17,172, 86, 43,234,234,
-234,224,112, 56,160,211,233,  2,122,184, 97, 98, 17, 62, 94,185,  9,178, 72,160,244,  2,240,179,161, 24,229,215,206,226,243, 21,
- 47,249,101,245,247, 29, 50, 26,241,109,157, 33,146,120, 47,228,223,169, 83, 39, 87, 56,  0,  0,174, 92,185, 18,148,246,227, 83,
- 92,245,169,210, 82, 58, 46, 52, 20,175, 61,245, 36,  0,224, 53, 55,226,255,226,244,233,134,228,239, 71,181,214, 61, 23,190, 80,
-118,124, 66,172,121,177,195, 44, 88,216,100,200, 88,138,147, 21,187,240,201, 59, 27, 85,169,125, 50,248,246, 65,113, 94, 94,222,
-102,147,201,132,117,235,214,153,231,204,153, 35,  7, 16,  6,128, 93,183,110,157,117,206,156, 57, 98,147,201,  4,185, 92,174, 73,
- 73, 73,105,214, 68,247,205, 55,223, 40,119,236,216,161,105,110, 45,123, 87,223,145, 50,255,239,131,215, 94, 80,180, 56,241, 37,
- 20,191,239,198, 63, 70, 69,133, 63,179,165,252, 95,245,150,231,109, 69,254, 27, 55,110,132, 78, 55,134,102,103,167,249,125,239,
- 31,127,252,177,178, 57,100, 83, 87, 87,167,204,205,205,213,212,214,214,122, 61,127,245,234, 85,228,228,228,104,122,244,232,161,
- 26, 60,120,176,175,126, 67,178,178,178, 62, 31, 54,110,210,212,211,135, 15,136,227,219,182,182, 79,123, 98, 94,131,121,119,247,
-119,223,160,119,239,222,221,179,178,178, 30,234,221,187,119, 46,  0,236,223,191,191, 73, 82,229, 51,222,212,106, 53,  5, 33,128,
-143, 42,127,107,214,172,161,215,202, 42,112,248,183, 19,174, 99,102,179,  5,111,127,144,105, 80,207,153, 46, 16,246, 93,140,235,
-146,  0,107,107,107,149,195,198, 62,170,233,222, 33,  6, 50,  9,  3,150,101,113,237,218, 53, 28, 59,114, 24, 86, 59, 11,150,165,
-136,137, 12,193,216,135, 38,106, 76, 22,187,223,255, 80, 38, 41, 67,215, 14,215,  0, 17,193,125,221, 46, 67, 38, 46,245,219,242,
-119, 39,255,235, 44, 60,125, 45,174, 93,190,  0, 69,100, 76,163, 94,129,166,200,203, 19,159,126,245, 13,158, 76, 25,136,129, 51,
- 95,108,212,170,245,  6,169, 84, 10,145, 72,132,136,136,  8, 20, 21, 21, 65,167,211, 57, 21,169,  0,201,191, 77,171, 56,132,137,
- 69,120,244,233,215,241,208,140, 33,216,250, 91, 49,174,153,208,108,242,247,196,149,146,107, 56,126,232,  7,196, 70, 69, 56,201,
- 95, 44, 10, 74,251, 61, 56,229,255,  0,  0, 81, 98,137, 95,228, 15,  0,127, 95,245, 31,252,125,213,127, 92,228,191,189,174, 14,
-207,143,157,232, 60, 25, 43,229,117,223,159, 94,124, 75,249,151, 69, 15,104,158,232,248, 87, 72,152, 48,132, 34,  4, 12, 68,104,
- 23, 55, 20, 79,189,182, 80, 83,212,118,  5, 47, 53, 66,171,213,218,  0,224,211, 79, 63, 53,  2,144,115,219, 40,175, 91,183,142,
-  5, 16,226,190,173,178, 86,171, 13, 40, 46,103, 52, 26,149,254, 28,231, 97,249, 15,187,191,127,162, 49,251,155, 77,234,126,189,
- 18, 68,117, 39,118,225, 66, 89, 45,174, 86, 27,193, 82, 26, 80, 34,112,122,122, 58, 77, 75,203,166,235,215,175, 15,106, 33, 49,
- 55,242, 71,116,116,126, 64, 50, 10, 10, 10, 52, 25, 25, 25,132, 16,226, 82,  6,252,252, 13,215,145,255,161, 67,135, 48, 99,198,
- 12,119, 15,  1, 78,157, 58,165, 49, 26,141, 77,110,152,149,149,149,245,212,176,113,147, 38,190,177,100,129, 56, 59, 59, 27,255,
-253,224, 93,113,189,199,200, 69,254,217,217,217, 88,181,106, 21,122,247,238,157,235,107,188,121,146,127, 99,227,237,161,161,245,
- 94,192,240, 80,159,242,222,251, 96,181,139,252,203, 42, 42, 81, 86, 81,137,154, 90,  3, 36, 18,113,216,234,117, 95,154, 61,173,
-120,  1,119,  6, 18, 19, 19,175,123, 53,169,  0, 56, 28, 14, 26,211,169, 15, 58,181,110,  1,179,205,  1, 66,128,237,219,191,199,
-103,159,174,195,209, 35, 71,240,252,194,231, 32, 18, 49, 96, 29, 44, 34, 66,100,232,212,103,152,198,100, 50,241, 30, 96, 54,155,
- 77,217,179,219, 69, 77, 68,152, 17, 31,127, 90,  6,134, 80, 12,236,253,187,198,102,179,249, 53, 72,189,145, 63, 71,252,166,154,
-202,  6, 10, 66,141,190,214,167, 60,111,131,137, 27, 72,  5,235,223,106, 64,112,159,126,197,175,124,111,215,174, 93, 17, 19, 19,
-  3,189, 94, 15,169, 84, 10,134, 97, 96, 50,153,160,211,233, 32, 18,137,184,137,153,247, 61,127,189,121, 19,158, 91,185,  3,155,
- 62,120,  5,109, 90,197, 33, 36, 52, 26,151, 29,197,248,124,197, 75,  8,171,159, 52, 68, 60,229,121, 35,127,142,248,107, 74,206,
-161,123,124, 43,212, 26,205,144,133,200,  0,135,195,103, 62,128,175,246,123,105,237, 86, 28,255,229, 71,244,234,114, 31,106, 28,
-190,149, 70,142,252,127,223,177, 19,127, 95,245, 31,215,241,237,117,117,216, 94, 87,135, 34,245, 63,177,227,196, 81,244, 28,216,
-  5,168,244,189, 53,115,214,153,101,202,249,207,140,214,196,134,246,128,137,214,  2,150, 50, 72, 45, 85,176, 56,106, 97,102, 77,
- 96,165, 97,104, 55, 60,  9, 57,191, 46,245, 53,209,145, 13, 27, 54,192,108, 54, 67,173, 86,135,168,213,106,192, 25,  2,128, 90,
-173, 70,253,231,122, 11,202,140, 13, 27, 54,248, 61,104, 79,157, 58,165, 92,184,112,161,230,253,247,223,167,132, 16, 13,  0,236,
-219,183,143, 46, 93,186,148,190,242,202, 43,  1,109,205, 28, 46, 99,214,253,231,197, 39, 20,227,218, 89, 68,  7, 78, 93,195,214,
- 11, 12, 94,220, 86,106,249,167,214, 80, 83,103,195,255,  5, 34, 83,167, 27,115, 35, 45,127, 68, 71,231, 99,230,204,153,126,239,
- 70,233, 78,248,107,214,172, 33,220,118,210,124,113,224,192,  1,101,105, 41, 63,163,196,106,181,226,216,177, 99,187,155,234, 47,
-  0,148,241,109, 91, 75,211,210,210,  0,  0,133,133,133,216,253,221, 55,242, 43, 37,215, 88,142,252,  1, 32, 45, 45,205, 53,222,
-142, 29, 59,182,162, 57,227,237,237, 57, 19,241,219,185,203,104,221,165, 13, 80,103,228,125,239,101, 21,149,176,217,236,245,115,
-181, 29, 54,155, 29,151, 47, 94,144, 55,231,153,122,122, 15,  4,111,194,237,133,  6,174, 40,139,197,130,126,221,187,107, 66, 20,
- 18,176, 44,133,131,  5,126,216,183, 31,255,124,237,117,176, 20, 56,115,246, 44,142, 30,249, 21,189,122,245,133, 72, 68,112,111,
-151,120, 20,253, 98,135,130,231,230,120, 82,113, 25, 18, 58,149,  0, 98,130,203, 87,109,128,152,160, 79,247,139, 40, 56, 86,  6,
-138,118,  1,221,128,187,123,223,155,103,192, 84, 83,217, 96, 53,128, 47,184,187,247,189,105,218,  5,235,223,194,152,  5,171,188,
-102,177,187,195,110,183, 35, 36, 36,  4, 12,195, 32, 42, 42, 10, 70,163, 17,117,117,206,109,128, 99, 99, 99, 81, 89, 89,233,215,
-  6, 28,102, 29, 48, 80,161,192,243, 31,236,195,152,190,192,197,195,192,207,245,231,158,255, 96, 31,254,189, 64,  5,  7,235,240,
-187,253,142, 31,250,193,245,126,244,128,238, 16,135, 51,216,174, 61,129,126,221,219, 35, 34, 76,134, 79,115,242,145,164,154,128,
- 43, 94, 86,  1,248,106,191,220, 19, 20,184, 10,164,140, 38, 88,187,181,  8, 49, 81,157, 49,121, 40,225,213,126,156,187,127,123,
-221, 31, 91, 39,211,127,172,  0,218,213,128,252,229, 85,208,127,190,  6, 48, 38,144,130,165, 88, 21, 23, 71,254,219, 68, 32,160,
-235,148, 48, 77,199, 22,  3,160,119, 24, 96,209,157,197,231,151,178,176, 63, 69,135,251,254,172,194,216,167,195,160,136,186, 23,
-114,113, 20,196, 41, 53,248,249,155,159,233,253, 73,247, 55, 54, 73,185,254,  7,195, 48,160,148, 90,235,149,104, 51,195, 48, 70,
- 74,105, 52,156, 73, 92,  1, 47,175,237,222,189,187,118,236,216,177,170,202,202, 74,205,246,237,219,157,138,207,246,237,232,209,
-163,  7,186,119,239, 30,208,246,204,181, 22,246,153,185,127,255,247,150,119, 38,180,102,168,185,  6,127, 89,127,218,102,183,217,
- 86, 89, 28, 88, 74, 41,173, 10, 68,230,164, 73,214, 27, 78,254, 35, 70,140,208,250, 43,167,160,160,160, 65,200,132,243,  2,240,
-221, 85,210,225,112,248,165, 48,156, 63,127, 30,131,  6, 13,106,172,191,200,  1,220,  7, 64, 60,106,194,228,234,162,162,162, 22,
-133,102, 28,210,109,  0,  0, 32,  0, 73, 68, 65, 84,133,133,200,206,206,198,128,162, 34,166,176,176, 16,  0, 48, 96,192,  0, 60,
- 56, 50,  9, 17, 97, 50,172,250,100, 83,217,140, 25, 51,150,172, 94,189,122,129,191,227,237,234,230,183, 16,222, 83,142,176,110,
-207, 97,227, 91,127, 70,223, 94,173,113,239,196,215,145,145,145, 65,154,202, 18,175,209,215, 66, 46,151,  1,  0, 36, 18, 49,140,
- 70,115, 80,159,173, 64,250,183,  6,126,111,  6,196,178, 44, 66,100, 82, 88,237, 20, 12,  1, 24,  2,188,250,175,215,225, 96,129,
-186, 58,  3,174, 93,187,138,184,184,214,160,148,133,221, 14,200, 37, 98,136, 36,252, 92,176,118,187, 93,121, 95,215, 43,154,150,
- 81,122,128, 16,167,110, 76,  0, 66, 40,250,247, 60,163,249,233,104,156,202,223, 21,  1,156,117,223, 88, 72,128,143,245,239,169,
- 69, 55, 70,252,254, 88,255,128, 51, 97,168, 85,171, 86,144,201,100, 46,151, 33,151,248, 23, 25, 25,  9,137, 68,130,203,151, 47,
- 67,194, 83,222, 39,249,123,240,231,137, 35,193,153, 55,167,237, 78,247, 63,  0, 40, 19,128,136,215, 53, 88,240,183, 33,136,242,
-227,126,175,148, 56,147, 21, 59,180,138,134,206, 98,129, 56, 66,  4,115,185, 17, 96, 24,180,233, 24,143, 29,187,127, 14,168,253,
-254,111,209, 27, 56,255,195, 46,136,175,  1,213,113, 64,  8,195, 96,112,167,206, 24, 53, 50,142,151, 28,207, 88,255, 23,143,253,
- 25, 95, 91,126,  7,238, 49,  3, 63,137,129, 48, 49,240,240,  0,196, 63,204,207,120,237,218, 46, 26, 86,107, 21, 36,118, 27, 62,
-191,148,133, 31,231, 68, 98,196,163,143,160,123,171, 30,170,223,118,104, 53,253,210,234, 32,177,214,193,222,157, 69,121, 41,191,
-164,209,122,229,205, 60,103,206,156, 48,  0, 58, 74,169,  4,  0,230,204,153,211,236,218, 26,147, 39, 79,214,238,223,191, 95,117,
-242,228, 73, 77, 72, 72,  8, 66, 66, 66, 48,115,230,204,128, 38, 81, 66, 72,235,137, 19, 39,174,253,219,223,254,198, 60,191,224,
- 25,182, 23,123,150,177, 88,109,117, 86,  7,253,155, 63,114,210,211,211,169, 78, 55,  6,147, 38, 89, 49,115,230, 76, 18,232,239,
-185,145,228,239,205,221,191,102,205, 26,162, 86,171,233,220,185,115,121,253, 94,131,193,208,192,237,239,142,133, 11, 23, 98,225,
- 66,231,166, 69, 73, 73, 73,238,215,203, 26, 17,215, 22, 64,167,122,165, 48,228,193, 41,179,204, 93,186,116,145,103,103,103,131,
- 35,255,180,180, 52,196,181,105,227, 62,222,182,194, 45, 68,192,103,188,165, 63, 60,  2,  7, 75,202, 16,222, 55, 28,197,219,207,
-  1,114, 25,166, 60, 61, 27,209,241, 19,121,206,205, 14, 20, 95, 45,181, 75, 36, 98, 49,231,  1,  0,128,203, 23, 47, 52,235,185,
- 54, 22, 58, 16, 20,130, 91,167, 16,120, 42,  1,140, 55, 19,135, 82, 10,150,  2, 14,214,169,  4, 16,  2,124,243,117, 14, 30,157,
-156,138,150,177,173, 92, 19, 32,245, 99,175,108, 17, 83,134,158,247, 92,118,125,238,211, 43,196,229, 36,235,127, 95, 17, 68, 76,
-153,223, 55,228,233,238,247,118,222, 31,235,223,211,221,239,237,188,251, 90,246,166,160,215,235, 81, 91, 91, 11,139,197,  2,150,
-101, 81, 94, 94,238,114,255, 27,141, 70, 24, 12,  6,191, 66,  0,155, 62,120,  5,218,223,128,154, 11,128,205,  4,252,123,177,202,
-229,254,255,229, 48,240,235,213, 31, 32,242,179,253,106, 74,206, 33, 58, 50, 20, 49,209,161,184, 55,161,  7,138,206,151,227,116,
-113, 37, 58,196, 68,194, 82, 90,134,179,103,206, 54,168,  5,192,167,253,134, 40, 31,193, 48,213,116,108,218,178, 17,154,189, 27,
-145,181,124, 17,166, 44, 90,138,163, 54,160,188,178,140, 87,251,185,199,250,159, 24, 50,  8, 51,239,235,136,141,155,118,227,232,
-209, 11, 88,126,172, 16, 27,198,204,  6, 62, 58,128,226,226,242,  6,181,  0, 26, 67,188, 89,  6,135,181,  2, 86,107, 13,  0, 32,
-174, 93,123,116,239,209, 67,165, 87, 56,115, 49, 76,172, 17,140,165, 14,138, 58, 17, 74,175, 94,243, 69,168, 78,143,140,217, 12,
-179,217, 44,  7, 96,  5, 16,110, 54,155, 35, 60,151,  4,  6, 10,163,209,168,220,187,119,175,166, 71,143, 30,152, 53,107,150,170,
-162,162,  2,219,183,111,231, 61,216,  8, 33,195,100, 50,153, 33, 60, 60,220, 62,102,204,152,171,139, 23, 47,110,187,100,201,146,
-162,159, 15, 31, 29,191,225,184,229,148,141,133,223,251,177,222,  8,151,127, 48,201,223,211,250,231,114, 20,220,189,  0,124,100,
- 72, 36,127,168,228,203,151, 47,119,189,188,125,  6, 92, 43,124, 26,123, 54,210,250, 23,  3, 64, 92, 83,114,206,171, 59,157, 27,
-111,135,127, 57,124,126,198,140, 25,233,254,140,183,225,247,223,139,228,161,  9,120,227, 95,239,226,189,149,121,248,127, 95,236,
-198,188, 81, 73,184,246,109, 30,106,116,122,159,100,155,145,145, 65,210, 82, 30,132,205,102, 63,108,179,217,237,238, 10,  0,  0,
- 44,125,245,165,128,  9, 91, 32,250, 91, 11,111,177,127, 79,175, 64,  3,  5,128, 97, 24,212, 24,140, 16, 49,  4,118,187,  3, 44,
-165,176,179,206, 36,210, 35,191, 30,198,168,209,227,156,110, 50, 74, 33, 98, 68,168, 53, 90, 97,183, 90,124,107,152, 14,135,178,
-115,187,171,154,216,232, 26,151,150, 49,100, 96,152,115,216, 16,  2, 66, 40,250,245, 56,171,177, 59, 28, 74,190, 55,199, 89,247,
- 77, 37,  3,  6,100,189, 54,145, 92,227, 15,162,162,162, 80, 94, 94, 14,153, 76,134,218,218, 90,196,198,198,186,146,  2,205,102,
- 51,170,171,171,253, 82,  0,210,223,216,128,127, 47, 86, 33,178, 19,160,253, 13,120,102,153,  6, 97, 98, 17, 38, 63,251, 38,174,
-176,215,176,126,249, 11, 16, 49,252,229,113,214,255,128,  1,  9,136,237,210,  9,173, 98, 91, 66,202, 16,216,  9, 69,121,157,  9,
-186, 90,115, 64,237,247,222, 91,155, 49,169, 71,103, 68, 68,196, 32, 36,182, 45,108, 85, 58, 28,222,250, 37,170,171, 46,  5,212,
-137, 63,126,235, 41, 96, 65, 50,196,118, 43, 58,213,  1,101, 34, 61,254,125,245,103, 64, 26,193, 91,198, 47, 91, 14,170, 42, 24,
- 19, 46, 73,141, 72,186, 71,133,251,102,135,161, 40, 74,171,137,141, 61,172,105, 63,184,  8, 53, 76, 45, 44,212,  4,227, 23, 44,
-228, 97,225,124, 44,127,247,  9,158, 91,  5, 32, 13,214,192,253,254,251,239,  1,  0, 51,103,206, 84,117,239,222, 93,251,232,163,
-143,186, 44, 70, 62,228, 31, 27, 27,187,109,237,218,181,161, 25, 25, 25,162,  5, 11, 22,224,185,231,158,163,  7, 14, 28, 24, 76,
- 41,221,110,180,209, 30,148,210,159,252,183,230,162, 26,117,251,  7,154, 16, 24, 76,242,247, 36,120,119,133,101,205,154, 53,164,
-160,160,128,151,107,255,202,149, 43,  7,184,247, 89, 89, 89,174,151,231, 49, 14,209,209,209,  0,208,216, 36,120,  5, 64, 53,  0,
-230, 74,201, 53,252,248,227,143,174,152,255,128,  1,  3,  0,  0,217,217,217,248, 42, 55, 15,186, 90,179, 17,192, 82, 56,151,  6,
-242, 30,111,223,110,250,  7,198, 45,126, 26,227,199,143, 70, 75,153,  8,181,132, 98,251,233,203,248,241,183, 98,191,136,122,254,
-156,233,247, 23,157, 61, 43,190,124,241,  2,184,215,210, 87, 95,106,210,146, 23,112,123, 19,191,231, 49,111,104, 16,  2,144,201,
-100, 56,115,226,168,170, 83,219,104,141, 66, 34,134,195,193,130, 16,  2, 66,128,116,245,147,160,148,133,163,190, 30,128,209,108,
-198,201,211, 69,144, 74,125, 59,177,237,182, 42,244,187,239,188,251, 44,138,191, 46, 56,143,175,191,232,230,210,157,147,122,157,
-195,193, 35, 61, 32, 22,197,250,101,253,123, 35,126, 83, 77, 37,  0,  4,100,253,123, 27,104,  5,235,223,  2,  0,222,214, 63,224,
- 92,231,223,186,117,107, 88, 44, 22,148,150,150,194,225,112,160,101,203,150,168,172,172, 68,203,150, 45,235,219,149, 63, 97,151,
- 95, 59,139, 87, 94,215,160,230,  2,240,206,162,225, 48,216, 29, 88,184, 44, 27,239, 47, 78,195,162,229, 91, 33, 38,  4,126,240,
- 63,106, 74,206,161, 77,203, 22,144, 64,  2,  7,  8,174,158, 63,142,139,101, 53,232, 26, 27,141,111,127, 57,128,147, 39,224,183,
-245, 63,101,238, 66, 72,162,  1, 70,  4,172,203, 59,143,175, 63,124, 30,115,223,202,192,194,135,251,226,201,209, 29,253,106,191,
-237,117,117,120, 47,101, 42, 80, 45,  7,136,  4,120,239, 93,164,254,188, 15, 59, 70,207,  7,121,243,105,144,131, 47,240,178,254,
-  1,224,215,171, 49, 24,100,170,129, 65, 33,130, 81, 46, 71,215, 41, 18, 88,168,  9, 53,140,  4,118, 36,128, 58,140,176, 85, 92,
-197, 15, 31,212, 96,230,140,174,183,100,208, 22, 22, 22,210,122, 98, 32,147, 39, 79,214, 58,125, 99, 78, 12, 31, 62,156, 12, 31,
- 62,156, 15,249, 15,109,219,182,237,247,111,190,249,102,232,153, 51,103, 32,145, 72, 16, 17, 17,129,163, 71,143,218, 40,165,229,
-205,249,125, 77,173,201, 15,196, 59, 16, 76,242,247,180,254,157,196,122,253,242, 65, 62,185,  0,105,105,105,103,190,250,234,171,
- 33,118, 59,191, 21, 78,114,185,124,110, 19,167,107,  1,156,  7, 48,224,244,225,  3,112,143,249,255,117,238, 84,124,223,165, 11,
-184,112,192,182, 46, 93, 66,102,204,152,241,137, 63,227,237,177,228, 65,136,100,163, 96,132,  4, 95,175,120, 26, 31,110,253, 21,
-207, 63, 56, 12,115,150,103, 33,117,233,231,126, 89,224,238,197,132,188, 29, 19,214,239,223,157,104,224,  1, 16,137, 68,164,250,
-234, 89,156,187, 92,  9,177, 68,  4,187,131,133,205,238,192, 47,191, 20,226,179,207, 62,129,213, 65, 97,115,176,144,138, 25,148,
-233, 12, 40, 62,249,163, 74,161, 80,104,125, 16,161,178, 71,215,139,127, 88,255,206,169, 10, 95,127,145,224,156,227, 24, 10, 48,
- 20, 12,195, 98,112,223,147, 26,  7, 15, 47,128, 55,235,223,125, 21, 64,104,116,107,191,200,223,155,245,239,158, 85, 59,102,193,
- 42,191,200,203, 57, 41,234, 96, 48, 24, 32,145, 72, 92,214, 63,203,178,174,191,254, 42,  0,159,175,120,  9,191, 20,239, 65, 88,
-107,103,210, 95,184, 88,132,242,107,103, 17, 33,147,160,186,234, 10, 68, 12,129,152,225, 23,126,230,172,255,246,209,225, 56, 81,
-116, 30,118,171, 21, 50,177, 20,  6,131, 25,223,106, 14, 32, 73, 53,193, 47,242,231,218,239,145,167, 94,195,250,127,191, 15, 35,
- 11,180,239, 26,143,223,142, 31,196,194,135,251,  6,212,126,  0,176,176,107, 18,182,156,217, 13,212,216,  1,121, 75,236, 44, 56,
-  1,242,230,211, 88, 21, 23, 71,248,146, 63,  0,204,232,182, 88,251,195,206,  2,192, 90, 11,  3,169,133,142, 49,160, 70,108,131,
-205,161,135,204,108,132,188,228, 60, 54, 44, 57,131, 78,137,  9,104, 34,  1,176,  1, 20,110,153,175,114,185, 28,114,185,220,235,
- 57,190, 88,187,118, 45,214,174, 93,219,172,193, 28, 30, 30,254,204,217,179,103, 67, 35, 34, 34,160, 80, 40, 16, 29, 29,141,242,
-242,114, 16, 66,140,193,156, 52, 56,139, 63, 63, 63,159,  2,206,132, 64,127,146,  2,131, 77,254, 31,127,252,177,146,250, 94,235,
-206,107, 69, 64,104,104,104,186, 88, 44, 62,231,121,124,249,242,229, 13, 44,127,  0,232,216,177, 35,146,147,147,215,249,178,127,
-174,148, 92,107,144,237,255,202,223, 23, 64, 38,150, 34, 46, 46, 14,220,234,128,250,243,161,254,140,183, 63, 43,251,224,185,119,
-223, 71,109,105, 25, 98, 35, 90,225,248,137, 75,152,179, 60, 11, 25, 25, 25, 36, 16,178,230,190,231,254,125,119, 57,130, 39,224,
-206,192,175,191,254,218,100, 49,160, 70, 61,  0,245,147,136,182, 80,187, 89, 69,105,138,166, 83,219, 24,132,135,200,112, 95,175,
- 68,220,215,179, 47,196, 12, 96, 48, 57,112,233,106, 21, 10,180,223,169,194, 66, 67,124,254,131, 58,163, 17,  9, 29,175,194,108,
-145,131,114, 70, 13,  5, 20,114, 51, 40,  5,170,170,101,  0,  1,194, 67,237,232,157,112,  1,251, 14,245, 67,120,120, 56,111,235,
-223,221,226, 87, 68,198, 64, 66,109,128,253,143,249,206, 33,246,253, 27,221,173,127,119,139,159, 59,118,246,248, 97,215,181,124,
-170,236,185, 43,  1,  0,208,186,181, 83, 25,169,170,170, 66, 68, 68,132,203,253,239,143,  2,192, 41,  1,192,155,152,159, 54, 18,
-248,247, 62,124,248,242,  4,164, 46,122, 31, 89,111, 61,  9, 49, 33,144,202,248,173,216,225,172,255, 19,151,202,112, 79,251,150,
-248,232,191, 27,208,169, 83, 39, 68,182,237,138,190,109,187,194,102,249,195,253, 47,225, 33,147,179,254, 95,159, 59, 26,207,188,
-186, 14,237,187,144,102,181, 31,103,253,143,221,244, 49,118,204,156, 14, 18, 63, 24,128,179, 42, 32,224, 44, 17,204, 93,251, 76,
- 92, 28, 47,226,232, 99,121,129,100,189,187, 76,217,117,114,173,166, 83,183, 94,208, 43,128,243,184,136,218, 11,229, 40, 95,234,
-128, 65, 23,143,  5,179, 23,241,126, 32,171, 87,175, 38, 10,133,130,154, 76, 38,184, 89,158, 84,161, 80, 96,245,234,213,126,148,
- 39, 10, 30,106,107,107,223,121,242,201, 39, 83,214,174, 93, 43,143,140,140,132, 70,163,193,202,149, 43,245, 86,171,245,193, 96,
-254, 31,206,226,231,150,203,249,155, 16,152,156,156, 76,116,186, 49, 52, 24,228, 15,  0, 28,177,243, 33, 40, 30, 21,  6,173,179,
-103,207, 30,188,113,227,198,163,117,117,117,109,108, 54,231, 50, 83, 79,242,191,239,190,251, 48,120,240,224,137, 60,158,179,184,
-166,228, 28,222,248,199, 43,248,102,203, 54,140, 27,214, 31,187,242, 15, 58, 13,152,182, 93, 17,217,182, 43,  6, 20, 21,225,193,
- 41,179, 42, 46, 85, 26,199,118,136,  9,201,225,107,253, 63,151,185,  5, 75,254, 52, 22,109, 91, 43, 93,202,  5,119,143,124, 60,
- 55,129,120,  7,  4, 79,192,157,171, 20,240, 82,  0,  0, 32, 34, 60, 76,251,139,118,179,234,124,252,189,232,210,173,135, 38, 34,
- 84,  1,150,  2, 38,139, 21, 69, 69, 69, 40, 47,250, 85, 21, 30, 22, 10,134, 97,124, 14, 92,133, 92,142,141,223,143, 84,113, 25,
-240, 77,186, 35, 24,  6,161,161,252,173, 39,110,  9, 96,104,116,107,176, 14,155,147,252,235, 97, 35, 18,159, 37,118, 61,193, 45,
-169, 25,179, 96, 85,  3,210, 10,132,252,221,149,  0,247,194, 63, 85, 85, 85,190, 31,128, 15, 37,224,115,183, 85,194,107,151,254,
-245,143, 15, 54,  3,194,120,202,105, 31, 29,142,141,135,126,197,111,167,126, 71,146,106, 66,  3,210,247,135,252, 57, 60,242,212,
-107,248,186,127, 40,158,122,180,123, 80,218,111, 97,215, 36, 44,202,221,  8,242,198,171,216, 22, 55,  8, 43, 13,191, 53, 56, 63,
- 57,178,  5,226,229,254,237, 73, 49,163,219, 98,237,182,220, 28, 92,209,157, 67,121,229, 85,148,158, 14,131,200, 17,129,161,125,
-134, 67, 53, 91,117, 75, 39,181, 96, 84,251,163,148, 30, 34,132,140, 33,132,236,124,255,253,247,229,147, 38, 77,210, 27,141,198,
-177,129,196,252,155, 66, 48,150,  0,170,213, 81, 65, 33,127, 79, 43, 53, 72,168,152, 58,117,106,215,218,218,218, 55, 10, 11, 11,
- 23, 20, 23, 23,163,174,174, 14, 82,169, 20,109,218,180, 65,108,108,236,164,254,253,251,127,203, 83,214, 73,  0,  3,218, 71,135,
-227,129,  7, 30,192,175,103,138,209,178,115,207,  6,227,237,193, 41,179,140,  0, 62,224, 67,254, 28,254,172,236,131, 49,249, 63,
- 97,230,171,159, 97,196,136, 17,136,139,139,243,170,104,  5,171, 65, 56, 37,192,159,182,110, 76, 33, 19,148,136, 91, 71,250,188,
- 74,  1,  3, 64, 68, 68,132,214, 82,117, 89,249,139,246,180, 10,112,102,210, 82, 74, 33,147,201, 16, 25,193,187,  6, 54, 36, 18,
-137, 54, 82, 34,  9,250,205,113,174,126,145,221,  8,216,141,174, 12,120,142,248,253, 93,139,197,185,250,207, 30, 63,140,179,199,
- 15, 35, 54, 54, 22,229,229,229,  1, 17,127,100,108, 91, 88,121, 36, 71,242,197,204,215, 62,199,129,125,218,160,201,187,112,225,
-130,107,183, 63,155,197,124, 29,249,251, 67,252, 28,102,247, 15, 13, 90,251,  1,  0, 89,241,130,139,248, 57,242, 63, 95, 87,167,
-154, 28,217,  2, 15,243,180,250,189,225,161,206,169,  4,157,235, 63,  4,144,216,190,102,205, 26,194, 85,251, 91,189,122, 53,113,
-175,252,183,110,221, 58,178,122,245,106,215,251, 53,107,214,220,244, 65, 79, 41,221, 79,  8, 25,145,147,147,179, 80,175,215,175,
-160,148, 22,  4,251,127,  4, 99,  9, 96, 48,201,233,  6,193, 20, 30, 30,190, 80,169, 84, 46,108,166,156,253,199,142, 29, 27, 10,
-160,115,203,206, 61,141, 54,139, 57,164,126,188,233,  1,212,  0, 56,217, 33, 38,228, 49, 56,147,  5,121, 99,204, 43,107,111, 10,
-241, 55, 71,209, 18, 72,254,214, 32, 49, 49,145, 23,249,251, 52, 64,197, 98,177,214,151, 59,254,102,131,139,237,115,196,143,102,
- 18, 63, 23,155,174, 41,187,130,154,178, 43,136,141,141,109,150,197, 15,  0,118,  7,235,183,247,161, 41,148, 85,213,  4,252, 91,
- 60,193,197,246,131, 69,252,193,110, 63, 46,182,191,197, 96,160,238, 86,127, 63,177,164, 89,196,255,191,  4, 74,233,207,  0,166,
- 11, 45,113,235, 49, 99,198,140, 12,  0,159, 93,170, 52, 26,109, 22,179,123, 60, 50,162, 67, 76, 72, 20,252,220,253,143, 35, 85,
-119, 55,255, 29,164, 84,  9,184,137, 74,  0, 47, 67, 43, 49, 49, 81, 72,236, 16, 32, 64,128,  0,  1,  2,254,199,192,  8, 77, 32,
- 64,128,  0,  1,  2,  4,  8, 10,128,  0,  1,  2,  4,  8, 16, 32, 64, 80,  0,  4,  8, 16, 32, 64,128,  0,  1,130,  2, 32, 64,128,
-  0,  1,  2,  4,  8,184, 43,208, 96, 21,192,252,249,243,  3,206, 34,245,182,221,228,237, 46,239,240,225,195,  1,203,235,215,175,
-223, 13,151, 23,236,251,109,217, 50, 49, 96,121, 21, 21,191,222,234,231, 75,234, 21, 86, 22, 94,138,175,220,137,253,239,102,201,
-171, 47, 76,196,212,183, 33,  5, 64,231,207,159,207, 10,237, 39,200,187,147,228,101,102,102,138,211,211,211,237,  0,240,209, 71,
- 31,209,110,221,186, 97,196,136, 17, 68,104, 63,239,242,252, 86,  0,238,  6, 52,183,200,196,212,169, 83,149,  0,220, 75,134,170,
- 54,110,220,168, 21,116,197, 91,131,154,154,154,199,143, 29, 59,214, 87, 36, 18, 45,146,201,100, 48, 26,141, 47, 12, 27, 54,236,
- 93,  4,161,210, 30,165,212,239,106,140,119, 34,230,207,159, 79,193,115,147, 25,  1,183, 14,185,185,185,202,148,148, 20,109,128,
-223, 85,229,229,229,237, 14, 70, 65,169,122,121,143,229,229,229,109, 88,179,102, 77, 52,156,123, 26, 56,112, 11,170, 91,186,131,
- 35,255,189,123,247,210,159,126,250,  9, 73, 73, 73, 24, 49, 98,132,208,113,130,229,  1,184,211,145,159,159,175,108,206,247,167,
- 78,157,170,220,184,113,163,102,234,212,169,238,135, 53, 83,167, 78, 13, 88,  9,224, 20,138,236,236,108,174, 84,167, 95,178,210,
-211,211,169,159,255,175,201,245,192, 59,119,126,226,175, 60,149, 78, 23,122, 43, 20, 32,242,219,111,191,189,163,215,235,255,212,
-177, 99,199, 22, 21, 21, 21,168,223,110,247,237,175,191,254,250,237,208,208,208, 81, 15, 62,248,160,166, 89,255, 32,  0,242, 87,
-171,231,251, 61,  9,102,100,172, 38, 55, 79, 94,211,229,112, 27,219,244,133,239,248,218,184,113,163,  6,175, 18,144,127,121, 87,
-168,240, 42,193,212,147,105,126,183,235,184,113,227, 40,  0,108,223,190, 61, 40,  4,198,109,  5,172, 86, 71,  5,125,125,124,110,
-110,174, 50, 47, 47, 79,227, 15,217,254,229, 47,233,148, 82,231,214,234,222,240,240,195, 19, 85,121,121,121,154,148,148, 20, 18,
- 64, 63, 30,181,109,219,182, 93, 35, 71,142,196,188,121,243,104, 86, 86,214, 24,189, 94,159,239,207,111,243,162, 52, 98,218, 16,
- 41,212,243,212, 85, 47,124,177,248,219,183,166,191,245,  8,119,110,237,218,204, 38,127,227,172, 89,179, 40,  0,132,134, 54,190,
-181, 65, 93, 93, 29,  0, 96,206,156, 57,  1, 61,159, 83,135, 84,200,207, 60,130,228,244, 76,154,158,158, 46,212, 63,224,  1,174,
- 56,144,123,141,  0,177,143,  1,239,181,110, 54,143,122,218,183, 10,205, 34,  4,119,242,223,184,113, 35,153, 58,117, 42,117,147,
-235,247,253,114, 10,  5, 71, 52,245, 27,126,248,175, 80,100, 71,251,241, 95,147,125, 94, 81,247,240, 95,249,139,243,115, 95,155,
-198,  8,200, 79,175, 12,169,169,169,249,170, 87,175, 94, 83,  0, 48,148, 82, 40, 20, 10,148,149,149,161,186,186, 26,145,145,145,
- 40, 43, 43,219,253,253,247,223,171, 30,124,240, 65,191,148,147,252,252,124,202,109,204, 66,  8,193,148, 41, 83,144,156,156,172,
- 34,132,240,150,147,155,187,217,245, 62, 37,101,146,207,207,190, 96, 58,240,212, 31,205, 61,100, 85,131,207,158,199, 20, 67,124,
-111,170,196,109, 39,236,142,189,123,247, 98,233,210,165,215, 61,139, 47,190,248,130,242,108, 55,101,118,118,182,  6,175,146,122,
-130, 77,187,126,226,126,149, 52,219, 66,188,141,231,150,  6,150,118, 70, 70,134,138, 82,138,245,235,215,211,253,251,247,163, 79,
-159, 62, 62,191,123,160,145,154,140,155,178, 23, 33, 47, 47, 79,195,178, 44, 50, 51, 51,225,107, 91,101, 66,136,146, 82,234,234,
-175,223,126,251,109,  8, 33,  4,211,167, 79, 47,  5, 16, 55, 99,198,140,157,107,214,172, 97,252,177,216,223,221,249,174,235,253,
-181,237, 87, 65,  8, 65,214,179, 33,  0,  8,222,153,245,246, 35, 45, 91,182,  4,  0,124,249,105, 22,230,141,156,199, 75,230,128,
-  1,  3,208,165, 75,151,160,180,123,102,102, 38,147,158,158,206,126,244,209, 71,244,167,159,126, 66,233,233, 78, 64, 69,148,192,
-234,126,146,191, 39,152,166, 38,242,236,236,108,100,102,102, 82,111, 19,104, 32, 59, 67, 53,215, 66,247, 37,207,205,202, 14,216,
- 40,220,184,113, 35,217,184,113, 35,225,148,  0,  0,170,230, 40, 20,132, 16,164,165,165,129, 82, 74,220,126,155,223,138, 10,153,
-170,115,189,248, 28,247,133,176,173,171, 93, 47, 62,199,253, 33,127, 74, 41,184,221,217,124,237,210,230,173, 79,234,116,186,207,
- 34, 35, 35,167,  0, 96,230,206,157,139,153, 51,103, 66, 42,149, 66,161, 80, 64, 46,151,131, 16,  2,145, 72,132,154,154, 26,222,
-237,152,147,147,163, 84,171,213, 52, 39, 39,  7,110,207,  4, 95,127,253, 53,230,205,155,167,201,201,201, 81,222,142,  3,215,155,
- 66,112, 43, 60,107,217,217,217,154,140,140, 12,242,216,169,169, 94, 45,124,181, 90, 77,167,158, 76, 83,121,243, 12,248,194,188,
-121,243,232,243,207, 63,143,206,157, 59,  7,229,247,206,155, 55,143,170,213, 81,136,137,217, 21,212,118,216,188,121,243,232,252,
-252,252,221,125,251,246, 37, 31,126,248,161,150, 35,255,230, 96, 83,246, 34,172, 88,177,  2, 44,203, 98,209,162, 69,224, 35,211,
-157,252,  1, 96,219,182,109, 91,234, 93,225, 81,211,167, 79,183,143, 28, 57, 18,106,181,154,229,107,180,120,142,209,149, 43, 87,
-226,177,  7,156,182, 97,214,179, 10, 76, 27, 34,197, 11,227,158,231,125, 79,161,161,161, 24, 49, 98,  4,210,211,211, 73,114,114,
-178,215, 23,119, 13, 95,101, 47, 61, 61,157,  5,156,219,172,  3, 64, 68, 72,133,192,234,205, 36,255, 38, 21,  0,142,172, 10, 11,
- 11, 93,101, 39,221,173, 39,127,137,214,101, 65,  4,121, 82,242,162, 12,168,130,217,120, 27, 55,110,212,  4, 65,134, 75,161, 72,
- 75, 75, 83,113,109,120, 55,193,157,252,  1,160,184,184,216,117,238,202,149, 43,188, 21,198,154,154,154, 55,141, 70,227, 44,134,
- 97,152, 25, 51,102,160,166,166,  6, 37, 37, 37,144, 72, 36, 16,139,197, 16,139,197,144, 72, 36, 80, 40, 20, 48,153, 76, 94, 75,
-162,122,153,224,148, 59,119,238,212, 16, 66,144,154,154,138, 53,107,214,144,228,228,100,146,145,145, 65, 82, 83, 83,185,254,163,
- 17,166,138,166,201,191,190, 45, 85,220, 36,238,254,236,211,210,210, 84,201,201,201, 90, 32,176,146,180,201,201,201,100,205,154,
- 53, 36, 59, 59, 27,148,210,160, 40, 99, 47,189,244, 18,178,179,179,121,245, 17, 95,248,230,155,111,198, 28, 58,116, 40,191, 83,
-167, 78, 48, 24, 12, 52, 52, 52,148,238,219,183, 15,128, 43,201, 50, 32,242, 95,190,124, 57,  8, 33, 96, 24,  6,135, 14, 29,  2,
- 39,211, 15,143,196, 35,132, 16, 76,155, 54,205, 94,127,200, 58,125,250,116,189, 82,169,196,188,121,243,216,111,191,253,214,231,
-189,187,135,194,174,109,191, 10, 16, 96,253, 51,127, 84, 45,206,122, 54,  4,211,135,202,176,248,193, 23,120,255, 46, 62,150, 63,
-159,107,246,238,221, 75, 51, 51, 51, 93,175, 67,135, 14,193,112,105,  0, 96, 53,129,132,217,145,255,250, 73,184,159,231, 94,194,
-200,109, 72,254,233,139,223,242,122, 94,220,212,128, 44, 42, 42,162,133,133,133,200,206,206,  6,247,158,115,237,248, 51,200,111,
- 52,249,187, 91,213,220, 36,116,187,194, 61, 36,112,183,129, 82,138,226,226, 98, 92,187,118,205,117,204,243,179, 15,136,126,252,
-241,199,241,  9,  9,  9, 16,137, 68, 56,123,246, 44, 40,165,248,253,247,223, 97,181, 90, 65,  8,129, 88, 44,  6, 33,  4, 14,135,
-  3, 70,163, 17,155, 54,109, 66,114,114,211, 97,143, 93,187,118,105,  0, 32, 53, 53,245,186,126, 91,255,153,114, 68,193,167, 95,
-123,186,245,125,125,230, 99,229,115,104, 44, 28,192,199,245,239,101,242,108,118,146,148, 43,230,239,166,192,113, 10, 44, 23,243,
-207,119, 35,255, 64,172,117, 78,  9,227,200,104,215,174, 93,154, 64,195,  0,156,188,110,221,186, 93, 71,110,129, 96,245,234,213,
- 56,121,242, 36,141,141,141, 69,187,118,237, 92,219, 62, 95,184,112,  1, 34,145,  8,255,249,207,127,  2,250,  7, 35,135, 58,183,
- 47, 99, 89, 22,127,251,219,223,176,114,229, 74,236,219,183, 15,132, 16, 60,156,242, 23, 92,188,192,111,  3,199,109,219,182,109,
-174,127,198,102, 56, 87,200,176,  0, 48,125,250,244,106,  0, 45,242,242,242, 64,  8,225,173, 80, 57,173,255,235,247, 49,113,134,
-  3,128, 47,179, 14, 35,183, 38,247,166,121,203, 78,157, 58,133, 67,135, 14, 53, 56,230,168, 62, 15,187,141,  5, 72, 45, 90, 60,
-104,195, 33,143,205,174,147,146,146,  4,230,231, 65,254, 77, 42,  0,245,110, 23,194, 89,253, 28,249,123,141,253,249, 65,214, 77,
- 89,130,124,226,196,190,228,121,158,191, 85, 59, 82, 77,157, 58,213, 61,214, 76,189,157,231, 60,  3,205, 34,221,141,193,141,131,
- 25, 38,206, 15,200,242,111,108,178,141,143,143,191,238,218, 38,158, 73,139,232,232,232, 94, 22,139,  5, 85, 85, 85, 56,112,224,
-  0, 68, 34, 17,172, 86, 43, 76, 38, 19, 88,150,117,237, 74,105,179,217, 96,177, 88,120,133, 24,184,231,208, 88,191, 77, 78, 78,
- 38, 57, 57, 57, 52, 59, 59,219,167, 50,225,180,186,110, 76, 14,128, 98,200,170,235,136,158,251, 28,136, 34, 48, 98,196,136,230,
- 43,  1, 30, 49,255,252,252,124,165,139,236,255,136,249,  7,148, 35,227,161,132,  1,112,238,182,168, 86,171, 41,159,231,192,215,
- 11, 80,159,251,224,119,110,  1,183,179, 99,187,118,237, 16, 17, 17, 65, 60,149,221, 94,189,122,  5,108,249, 83, 74, 97,183,219,
- 93,199,134, 13, 27,134,125,251,246, 97,207, 15, 14,188,187,140, 95,140, 61, 55, 55,119, 92,125,236,255,  4,128,150,  0,220, 55,
- 27, 42,  1,208,  2,  0,242,242,242, 52,125,251,246,245, 41,175, 97,236,223,139,167,160,254, 47, 95,121,193, 64,122,122, 58, 73,
- 74, 74,162,154,207, 98, 97,175,254, 21,132,173,  6, 28,206,157, 86, 25,145, 29,250,125, 12, 36, 82, 49, 44,142, 22, 56,120,161,
- 47, 94, 89,174,195,161, 67,135,136,183,101,213,  2,252, 84,  0, 60, 61,  1,254, 90,254, 69, 69, 69, 52,152,238,110, 95,242,234,
-195, 18, 65,243, 52,100,102,102,146,244,244,244,128,190,235,249, 59, 51, 50, 50, 12,106,181, 58,172,177,243,129,194, 61,246, 31,
- 12,101,192, 61,246,207, 87, 25,152, 57,115, 38, 66, 67, 67, 17, 22, 22,134,240,240,112, 68, 70, 70,178, 81, 81, 81, 76, 94, 94,
- 30, 30,127,252,113,215,117,114,185, 28, 99,199,142,133, 90,173,166,141,236, 86, 21, 99,181, 90, 81, 85, 85,  5,179,217,140,200,
-200, 72,200,100, 50,216,237,118, 80, 74,225,112, 56, 96,181, 90, 97,179,217,224,112, 56,252,202, 47,240, 21,178, 74, 77, 77,197,
-237, 16,154,241,149, 16,232, 47, 56, 37, 32,224,254,245,175,198,219,110,234,201,180,250,188,155,192,100,123, 90,255,238,138,100,
- 32,201,128,158,214,127, 83,138, 41, 95,242, 23,137, 68, 52, 34, 34,  2,112, 38,212, 17,  0,212,102,179,161,166,166,  6,173, 90,
-181, 10,232,190, 57, 99, 74, 44, 22, 99,193,130,  5, 56,116,232, 16,254,136,251,243,239,211,223,127,255,253,247,195,135, 15,  7,
-128,112, 56,195,185, 70,  0,216,176, 97, 67,171, 61,123,246, 68, 80, 74, 93,202, 54,159,117,226, 43,223, 95,137,105,131,175,183,
-254,103,254,219,136, 13,  7,108,160,148,162,223,140,126,152, 55,114, 30,  9,116,221,121,160, 74,128,106,118, 38,253,126,101, 71,
-136, 13,122,192,238,252,215, 44,  0,169, 24, 40,190,214,  2,187, 47, 13,112,100,126, 89, 46, 58,116,232, 16, 73, 74, 74,146,227,
-127, 28,124,172,127,128, 71, 37,192,252,252,124,151,235,223, 61, 31,128, 15,186,116,233, 66,210,210,210,130, 22,147,231, 33, 47,
-224,248,250,212,169, 83,169,231, 43, 63, 63,159,229, 86,  5,184,173,  8,  8,180, 19,135,221,205, 29, 46, 51, 51, 19,203,151, 47,
-111,208,175, 56,242, 79, 73, 73, 65, 74, 74, 10,  0, 96,207,158, 61, 77,137,137, 46, 42, 42, 50, 59, 28, 14,232,116, 58, 84, 84,
- 84, 64,167,211,193,104, 52,194,104, 52,194, 96, 48, 64,175,215,163,166,166,  6, 38,147,  9, 22,139,197,149, 20,212, 36,137, 17,
-130,156,156, 28,191, 20,182, 59, 25,123,247,238,109,240,114,199,169, 83,167,148,238,159,249,196,156, 61, 99,254,158,150,123,115,
-178,246,189,125,119,205,154, 53, 36, 39, 39, 39,168,185,  0, 57, 57, 57,188,231, 46,142,252, 25,134,161,245,253,203,229,250,103,
- 89, 22,165,165,165,232,214,173, 27,153, 63,127,190,223,191,229,229,197, 35,177,103,207, 30,176, 95,181,  0,165, 20, 43, 86,172,
-112, 61,163,189,  7,120,231,237, 33, 55, 55,119, 18,  0, 76,159, 62,189,184, 94,  1,176,124,249,229,250, 86,243,231,207,111,181,
-103,207, 30, 60,244,208, 67, 99,252, 89,166,120,109,251, 85, 16, 16,172,119,179,254,103,188,111,132,104, 90, 13,190, 60, 96,197,
-115,207, 61,135,101,223,191,125, 43,230, 21, 17,167,  4, 60,248,156, 29,212, 20,  9,232,  1,232,  1, 81, 45,160, 47,  5,182, 29,
-110,131,204, 47,203, 69,245,222,  2,113,122,122,186, 89, 32,127,223,228,239,211,  3,144,153,153,217, 32,238,239,158, 15,192,119,
-237,101,189,187, 80,197,185,229,155,235,146,247, 38,143,115,251, 39, 39, 39,107,131,181,132, 40, 57, 57,249,183,252,252,252, 94,
-183,227,  3,230,172,254, 96,185,255, 57,171,223, 95,247, 63,135,245,235,215,187,222,255,243,159,255,196, 39,159,124,  2,  0, 86,
-  0, 82,142,248,  1, 96,236,216,177,190, 20,  0, 83, 66, 66,  2,140, 70, 35,172, 86, 43,202,203,203, 33,147,201, 32, 22,139, 93,
- 30,128,186,186, 58, 24,141, 70, 88, 44, 22,212,212,212, 96,202,148, 41, 62, 21, 76,206,186,111,106, 89, 43,119, 29, 31,220,200,
- 28,128, 64,206,123,130, 91,238,231, 13, 43, 86,172,208, 44, 88,176, 64,213,189,123,119,237,173,236,195,141, 89,255,238,240, 39,
- 23,160, 49,235, 63, 80,203,159, 97, 24,202,178, 44,  1,240, 15,174,107, 59, 28,142, 87, 67, 67, 67, 17, 31, 31, 31,208, 28,243,
-202,139, 35,161,213,106, 65,114, 98,  0,  0, 59, 94,  9,199,216,215,107, 49, 98,196,  8,188,177,108,143, 95,133,169,182,109,219,
-182,105,228,200,145,  0, 80,190, 97, 67, 86,187, 61,123,246,181,160,132, 98,252, 67,227, 83, 82, 82, 82,182,248, 51,157,  0,206,
-216,255,180, 33,146,134, 22, 63, 40, 22, 60,183,  0,113, 99, 91,223,178,130, 89,233,233,233, 13, 52,124, 90, 11,200,172,  0, 75,
-  9,236, 14, 10, 25,  5,226, 20,140,251,245,118,  8,112,242,247,178, 23, 27, 85, 16, 56, 15,172,152,143,229, 63, 96,192,128,235,
-242,  1,252,113,209,121,146,118, 16,200,217, 83,158,230,  6,116,188, 94,249,249,249, 65,147,119,183, 38,254,113,133,101, 56, 55,
-113,118,118, 54,158,120,226,  9,  0,144,114,215,184,159,171,159,180, 26,195,241,193,131,  7, 63,174,213,106,179, 29, 14,  7,244,
-122, 61,108, 54,155, 43,238,111, 54,155, 93, 75, 12,185,196,192,177, 99,199,106,121,244, 23,146,157,157, 77,235,189,  0, 13,250,
-109,126,126, 62,119, 28,201,201,201,188,188, 85, 55, 59,  7,192, 51, 44,224,235,121, 52,117, 94,173, 86,211, 21, 43, 86,104, 30,
-123,236, 49,124,245,213, 87,  1, 61,115,207,229,183,220,231,141, 27, 55,106,210,139,213,152,234,195,210, 30, 55,110, 28, 61,127,
-254, 60,190,255,254,251, 70,219,251,252,249,243,  0,128,237,219,183,251,252, 61,105,105,217, 52, 45,109, 52,198,140, 41, 66, 81,
- 81,145,215,236,242,202,202,209,  0,116, 80,171, 27,159,183, 56,242,183, 90,173, 84, 42,149,114,215,252,163, 94, 33,120,245,226,
-197,139,232,216,177, 99, 64,150, 63,195, 16,167,194,206,145,255, 81, 59, 62,209, 88,  1,  0,111, 44,219,227,247, 28,193,141,137,
-249,243,231, 39, 82, 74, 49, 97,226,132, 41, 15, 79,124,248,155, 64,166,166, 73,143, 62,114,130, 16,114, 31,165,128,104, 90, 13,
- 40,165, 88,176,112,  1, 90,143,109,243, 71,224, 35,112,112,236, 76,209,140, 74,130,153,153,153,116,227,139,109, 17, 86,121, 30,
-231,244,241,232, 44, 43,  7, 66,227, 32,174, 43, 69, 68, 93, 37,128, 86, 46,143,129,167,210, 32, 32,  0, 15,128,251,114, 63, 15,
- 87, 31,205,206,206,  6,223,132, 41, 79,210, 14,214, 15,119,151, 23,132,245,255,  2,154,  9,119, 23,186, 59,  9,113,245, 36, 60,
-207, 53, 18, 67,180,  3,248,122,228,200,145, 79,231,229,229,125, 96,183,219, 81, 93, 93,237,202,  1,  0,128,242,242,114, 84, 87,
- 87,131, 82, 10,127,194, 75, 99,198,140, 81,237,220,185, 83,147,157,157,141,156,156, 28,234, 25,243, 31, 51,102,140, 95,197,128,
-110,  4, 76,  7,158,242,155,240,189, 17,124, 83, 74, 64, 70, 70,  6,153, 55,111, 30, 13,132,252, 27, 36,  0,186, 61,119,183,164,
- 64,127,189,  0,141, 42,238, 23, 46, 92,112, 41,104,124, 13, 13,247, 80,229,245,247,205,111,174,170,169,169,161,145,145,145,238,
-228,255,170,197, 98, 65, 73, 73,  9, 58,119,238, 28, 16,249,171,213,106,202,126, 21,133, 29, 71,157,198,233, 58,141, 21, 27, 14,
- 88, 65, 41,197,190, 31,  3,143, 44,238,221,187, 23, 15, 61,244,144, 42,208,242,193, 28, 65,179, 44, 43,  1,128,175,126,180,225,
-185,231,158, 67,235,113,109, 60,252,  3,254,129,171,242, 55, 98,196,  8, 10,120, 95,238,231, 86,  9,144,247,243,237,200,212,  1,
-177,137,120,124,109, 13,128, 56,103, 27, 60,217, 18, 29,196,151,241,122,114, 25, 62,213,104,132,170,128,104, 88,233,207,211,242,
-247, 60, 47,110,106,162,200,204,204,164,222,150, 77,249, 19,  2,240, 66,218, 65,131,135,188,160,174,255,247, 40,  7,236, 55,210,
-210,210,192, 35, 97,145, 55, 26,115,247,  7, 26,  6,104,204,221, 31, 72, 24,192,189,188,172, 39,249, 52,117,174,177, 91, 37,132,
-172,154, 48, 97,194,154,245,235,215,219,164, 82, 41, 44, 22, 11,236,118, 59, 88,150, 69,139, 22, 45,160,211,233,144,230,231,210,
-179,212,212, 84,109,106,106, 42,217,185,115, 39,205,201,201, 65,118,118, 54,184,186,  0,183,115,229,185, 96, 99,247,238,221,116,
-194,132,  9,216,186,117,107,179,201,223,147,228,242,157, 10,153, 79,111,220,243,207, 63,127,157,113,225,137, 23, 94,120,129,242,
- 77,242, 84,171,163,124,202, 83,171,249,197,255, 21, 10, 87,233, 75, 74, 41,133,209,104, 68, 73, 73, 73,192, 49,255,  6,158,143,
-215,107, 27,124,110, 14,249,127,248,225,135,193,234,179,108,238,183, 91,186,185, 87,  2, 12, 22,154, 82,200,214,173, 91,231,151,
-245,175, 78,237, 90,242,241,105,180,205,200, 57,  7,119,238, 25,241,159, 76,186,123,222,189, 56, 83,170,192,153, 51,103,160, 82,
-169, 32, 32,  8, 30,  0,  0,104,140,228,111, 71, 45,235,118, 91,255, 31,140, 37,126,127, 40, 34,201, 65,251, 93, 83,167, 78, 85,
-249, 91,222,215,  7, 49, 80,119,133,198, 91,162,149,231, 57,158,132,107,159, 57,115, 38,217,177, 99,135,242,210,165, 75, 26,147,
-201,  4,135,195,129,251,238,187, 79,149,148,148, 20,240,243, 30, 51,102, 12, 25, 51,102, 12, 55,195,  7, 20,154,185,209, 57,  0,
-190, 62,243,177, 56,235,179,195, 27, 18,142,159, 69,102,184, 54,194,171,132,230, 35,237, 58,123, 48, 61, 61,157,166, 23,171, 65,
- 26, 22,  2, 34,  0,112,230,204, 25,218,196, 88,245,217,232,163, 71,143, 38,126,140,125, 18,140,107,  0,160,170,170, 10, 10,133,
-130, 18, 66,208,177, 99, 71, 16, 66, 72,183,110,221,208, 92,242,103, 30,211,129, 16,130,148, 71,156,171,138,  8, 33,174,229,126,
-156, 59,255, 22,129, 29, 48,171,127, 80,  5,206,153, 51,135, 83,254,195,234,189,122,118, 56,221,255,172,219, 53,126,221,112, 70,
-206,185,182,238,220,195,185,250,211,211,211,137,122,195, 61,135,103,  0,  0, 32,  0, 73, 68, 65, 84,151,134,158, 57,115, 70, 96,
-243, 96, 43,  0,119, 10,130,177,214, 63, 88,132,125,  3, 20,155,160,254,174, 96,111,236,115,163,173,231,250, 24,191,215,255, 97,
-181, 90, 33, 18,137, 32, 18,137,110, 98, 95, 91, 77,110,111,121,141,143,133, 89,179,102,249, 47,240,213, 63,246,177,200,206,206,
-110, 48,105,167, 23,171,221, 45,111,237,221, 48,151,180,110,221,154,252, 49, 86,156,201,182,205, 37,127,231, 51,105,106, 43,160,
-235,177,122,245, 79, 55, 77, 35,152, 55,114, 30,185,217,115,130,159,243, 70, 40,156, 57, 69, 54, 55,229,211, 21,231, 87,169, 84,
- 68,176,252,125,195, 91,104,128, 36, 38, 38, 10,  5, 19,  4,  8, 16, 32, 64,128,128,255, 49, 48, 66, 19,  8, 16, 32, 64,128,  0,
-  1,130,  2, 32, 64,128,  0,  1,  2,  4,  8, 16, 20,  0,  1,  2,  4,  8, 16, 32, 64,128,160,  0,  8, 16, 32, 64,128,  0,  1,  2,
-238, 10, 52, 88,  5, 48,127,254,252,128,179, 65,189, 21,118, 17,228,  9,242,  4,121, 55, 79,222,146, 37, 75, 26,106,247, 12,227,
- 90,230,232,190,212,140,171,166,232,190,244,204, 91,249,224,176,176, 48,200,229,114,215,247, 25,134,113,173,184,112,151,199,109,
-204,196,178,206, 85, 94,220,102, 57,194,243,245, 71, 30, 81,138,196, 50, 80,214, 14,150,181,107,  3,145, 71, 41, 85, 29, 57,114,
- 68,156,152,152,152, 15,143,170,123,  1,202, 83, 30, 57,114,  4,137,137,137, 90, 97,188,221,121,242,252, 86,  0,254, 23,241,242,
-203,  5, 13, 26,238,141, 55,  6,146,219, 74, 94,193,203, 20,  0,222, 24,248,  6,113,127, 31,168, 60,174, 82,156, 90,173, 70, 70,
- 70, 70, 83,215, 53,121,222, 93, 30,220,150,233,113,223,113,255,190, 90,173,118,157,227, 43,247,127, 17,140,181, 78, 89,254,219,
-  1,140,136, 42,215,180,179, 95,198,105,218, 25,135,234,162, 85, 17,  9,131, 32, 13, 13,215,250,250,254,254,253,251, 49,108,216,
- 48, 23,241,115,132, 77,  8,185,142,176, 89,150,117,189, 46, 94,188,232, 85,222, 47,191,252,130,  1,  3,  6, 64,161, 80, 64, 44,
- 22, 67, 36, 18, 53,144,201,145,190,195,225,112,189, 44, 22, 11, 10, 11, 11,113,207, 61,247,220,141,143,136, 56,121,145, 42,127,
-255,253,119,156, 57,115, 70,211,162, 69, 11, 12, 31, 62,188, 89, 99,156, 16, 70, 41,147, 71,163, 69,212,189,154, 58, 67,177,202,
- 80,123, 89,233,175, 12,150,101,149, 57, 57, 57,187, 79,159, 62,141,173, 91,183, 66,161, 80, 96,209,162, 69, 34,184,173,189, 15,
- 64,158,166,232,220, 89,236,220,177, 29, 82,153, 12,207, 61,183, 96, 20,165, 84, 35,140,212,187,212,  3,112, 39, 33, 39, 39,199,
-167,198,147,154,154,234,115, 96,114,  4,237, 73,220,129, 34,216,242,130, 13,183,202,124,188, 38, 45, 62,165,101,249,202,171, 87,
-  4,154, 85, 93,156,171, 42,232,254,255,239,248, 81, 72,169,242,196,254, 29,136, 56,255,163,198,104,180,192, 54,136,129, 34,158,
-160,219,165,163,184, 63,156,106,116,229, 63,227,215,144,217,170, 10,210,174, 73, 37,224,196,137, 19, 16,137, 68, 24, 62,124, 56,
-196, 98,177,235,197, 41,  4,156,213,111,183,219,225,112, 56, 96,179,217,112,241,226, 69,236,222,189,219,171, 60,163,209,136,195,
-135, 15, 99,240,224,193,144, 74,165,144, 72, 36, 13,100,178, 44, 11,187,221, 14,187,221, 14,155,205,  6,147,201,132,195,135, 15,
-195, 96, 48,220, 22,250, 84,125, 63, 99,240, 71, 33,154,128, 57,122,201,146, 37,172,199,220,130,218,218, 90,196,196,196,  4,180,
-  0,125,201,146, 37, 13,126,207,231, 89,133, 80, 40, 90, 65, 36,146,106, 12,181,151,253,150, 89, 80, 80,  0,131,193,128,193,131,
-  7, 95, 76, 78, 78,110, 83, 89, 89,137, 29, 59,118, 56,162,163,163,145,148,148,212,228, 24,153, 51,110,244,117,109,115,236,212,
- 41,104,195, 67,176,112,197,191, 46,247,235,223,171,253,213, 43,101,216,145,167,221,221,169, 87,191,100,189,190,102,151, 64,157,
-183, 63,184,210,191,238,240,172,  5, 32,110,106,146,229, 38, 87, 95,159,111,  5,249,255,245,175,127,109,242, 26,157, 78,135, 47,
-191,252,146,242, 81,  2, 56,178,110,174,181,126, 35,228,185, 91,254,205,181,254,221, 72,152,  0,160,106,181,218,231,198, 49, 60,
-201,154,112,196,206, 89,251,238,150,191, 59,213,241,237, 51,110,158, 10,234, 94, 78, 24,  0,170,170,156,149, 17,163,163,243,239,
-138,129,122,225,167,124,220,115, 89,163,185,108,100, 49,249, 30, 17,238,141,181,131,141,166,144, 68,139, 80, 91, 41,133,162,214,
-132, 30, 71, 86,105, 10, 19,230,169,140, 33, 29,181,141, 91,146,  4, 39, 79,158,132, 84, 42,197,168, 81,163, 92,164, 45,145, 72,
-192, 48, 12, 40,165,176,217,108,176,219,237,176, 88, 44,184,124,249, 50, 52, 26, 77,163, 91, 42, 51, 12,  3,155,205,134, 35, 71,
-142, 96,248,240,225, 80, 40, 20,144,201,100, 46,121,156,  2, 96,177, 88, 96, 48, 24,112,236,216, 49,152,205,102,191, 10, 51,105,
-181, 90,165, 72, 36,210,212,214,214, 66, 42,149,162,172,172,236,169,201,147, 39,215,202,229,242,207,  3, 33,109,173, 86, 59, 85,
- 36, 18,125,229, 38,239,244,228,201,147,127,151,203,229,169,112,238, 80,233,183, 37,252,202, 43,175,104,150, 46, 93, 90,134,250,
- 29,103,150, 44, 89,130, 19, 39, 78,160, 85,171, 86,141,214, 93,247, 69,254, 31,207,157,139,241,253,250,  1,  0, 90, 63,253, 52,
- 20, 33,113, 48,232, 47, 65, 95,115, 78, 69,169, 67,235,175,204, 62,125,250,160,172,172, 12,251,247,239,239,200, 48, 12,142, 29,
- 59,134,232,232,104,236,221,187, 23, 86,171,213,103, 59, 86,190,185,176,193,231, 48,171, 13,109,237,102, 60,247,252,171,237, 87,
-188,251, 79,188,243,238,135,104,199, 56,240,225,187,203,243, 71, 77,155, 33,176,235, 29, 72,254,220,113, 94,123,  1,  0,215,215,
-255,246,245,249,102, 34,152, 59,245,221,  9,112, 87,  2,154,233,  1,224,  8,150,  0,160,159, 60,250,153, 87, 66,126, 98,211,108,
-222,100, 93,239,218, 39, 94, 38,108,247,239,187, 20,  4, 62, 33,  0,238,127,123,254,245,244,  0,220,233, 48, 87, 87, 40, 71, 88,
- 14,107,202, 68, 14,220, 19,  9,116,236, 64, 33,234, 35,133,184, 75, 23, 72, 45,102, 88,126,184, 12, 75,141, 24, 34, 86,  2,115,
-254,231, 26,102,252,179, 42, 86,236, 61, 28,192,185,231,207,158, 61,139,168,168, 40,168, 84, 42,200,229,114, 72,165, 82,136,197,
- 98,151,213,111, 54,155, 81, 82, 82,130, 61,123,246,128, 97, 24, 48, 12,131,166,228, 57, 28, 14, 28, 63,126, 28,195,134, 13, 67,
- 68, 68,  4,228,114, 57, 68, 34, 17,236,118, 59,172, 86, 43,244,122, 61,126,254,249,103, 88, 44, 22,136,197, 98, 87, 46,128, 47,
-124,241,197, 23, 74,131,193,160, 57,127,254, 60,244,122, 61,164, 82, 41, 90,183,110,189,106,223,190,125, 24, 50,100,136, 56, 52,
- 52,244, 19,127,148,128, 47,190,248,226, 81,131,193,240,149,135,188,132,125,251,246, 37, 12, 25, 50,228,203,208,208,208, 84,190,
-242, 88,150, 85, 90,173, 86, 84, 85, 85,105,220, 60, 10,  0,128,165, 75,151, 22, 47, 89,178,164, 93,106,106,234, 40,185, 92,238,
-215,252,199,136,164, 74,207, 99,215, 62,248,  0,173, 39,197,227,157,119,222, 87,217,108,117,  1,205,167,251,247,239,215,252,244,
-211, 79,120,241,197, 23,245, 34,145, 40, 66, 46,151, 99,200,144, 33,208,104, 52,200,203,203, 67,187,118,237,252,240,119, 16,124,
-113,246, 42,190, 62, 83,140,220,111, 63,133, 72, 68,176,240,233,199,217,190,173, 91, 50,153,207,189,138,181,254,202, 19,112, 75,
-200,223, 83, 57,245,166, 20,  4,188, 10,224, 86,111,111,219,165, 75, 23,149,175,215,205,182,214,111,132,188, 96, 88,253,141,225,
-147, 71, 63, 35, 79,108,154, 77,189,145, 63,248,135,  8, 26, 88,250, 85, 85,201, 46, 11, 29,127,108,  1,234,183,219,191, 41,162,
-143,142,206, 15,200,250,183,219,237,202,159,127,254,153, 54,118,204,243, 92, 99,112,191,222,110,183, 43, 61,207,121, 30,107, 10,
- 85,199,127,209,148, 20,235,209, 42, 92,140, 46,225, 20,226,150, 44,196, 15, 60,136,208,190,159, 67,209,255, 61,200, 34, 21,144,
- 26, 76, 48, 26, 29,232, 32, 50, 98,239,250,198,149, 39,134, 97, 32, 22,139, 33,145, 72,112,230,204, 25, 28, 59,118, 12, 17, 17,
- 17,136,137,137, 65, 76, 76, 12, 90,182,108,137, 22, 45, 90,160,166,166,  6,123,247,238,133, 72, 36,114,197,246,189,129, 59, 47,
-149, 74,225,112, 56,112,250,244,105,132,132,132,160,101,203,150,104,213,170, 21, 98, 99, 99, 17, 22, 22,134,211,167, 79,195,102,
-179,185, 66,  4,141, 41, 20,158,150,127,105,105,169,230,220,185,115,232,220,185, 51,198,141, 27,135,129,  3,  7,194,104, 52, 98,
-247,238,221, 56,114,228,200, 71,102,179,153,119,237, 98,173, 86,171, 42, 45, 43,255,166,232,106, 13,194,239, 25,140,132,113,127,
- 66,187,129, 41,208, 89, 24,236,204,223,133, 35, 71,142, 76, 54,155,205,127,225, 75,254,122,189, 30, 71,143, 30,213,236,223,191,
- 31,125,250,244,193,146, 37, 75, 90,162, 62,158,190,100,201,146,118,  0,224, 15,249, 51, 34,169, 50, 52,172,173, 50, 58,166,151,
-102,253,134,163,152,251,241,199,200, 59,124, 24,121,135, 15,163,245,211, 79,  3,  0,108,182,186, 61,129,140,227,188,188, 60,154,
-155,155,139, 41, 83,166, 92, 12, 15, 15,103, 66, 66, 66, 10, 11, 10, 10,176,127,255,126, 84, 84, 84, 32, 33, 33,193, 47,121,239,
- 31, 62,131,119, 15,254,134,181,239,190,116, 84, 44, 50,129,113,212,226,237,149, 31, 51, 95,237, 45, 68,  9, 35,198,189,247,222,
- 43,176,236, 93,  2, 38, 80,130,191,133,155, 87,220, 24, 11,251,229,  2, 26,204,184,125,176,229,221, 72, 69,224,137, 77,179,169,
-251,171, 49,175,128, 47,175,194,117,228,214, 80, 25,240,215, 83, 65, 26, 59,238,233, 21,224,131,218,218, 90,229,174, 93,187, 52,
-  5,  5,  5,141, 30,115, 63,215, 20,220,175,223,181,107,151,166,182,182, 86,233,126,206,243, 88, 83,136, 48, 87, 34,239,146, 25,
-219,206,179,184,172, 35, 40, 45,  7, 24,113, 36, 24, 18,  3, 98,150,161,174,148,224,232, 37, 22,199, 46,153, 81, 89,107, 67,239,
-104,153,134,143,  2, 32,147,201,112,238,220, 57,156, 58,117, 10,209,209,209,136,138,138, 66, 84, 84, 20,140, 70, 35,246,239,223,
- 15,137, 68,  2,169, 84,218,228, 94, 10,156,119,128, 83,  2, 40,165, 40, 42, 42, 66,116,116, 52,226,227,227, 17, 27, 27,139,162,
-162, 34, 56, 28, 14,200,100, 50, 72,165,210,  6, 43, 15,188, 77, 43,220,155,242,242,114,205,149, 43, 87,208,179,103, 79, 60,248,
-224,131,152, 56,113,162,106,226,196,137,170,225,195,135,195,225,112,224,199, 31,127, 68, 81, 81,209, 96,  0,188,226,  9,229,229,
-229,187, 75,171,106, 16,221,181, 47, 18,146,231,160,231,132,249,232, 49, 97, 30, 58, 62,240, 40,172, 84,196,201,227,245,124,235,
-115, 31, 52,103,206,156,225,238, 85, 85, 79,252,204,146, 37, 75,176,116,233, 82, 44, 93,186,244,148,103, 94, 64, 99, 16,137,229,
-202,168,232, 30,154,214,237,134,105,162, 98,122,128, 48, 98,124,244,137,  6,115, 63,254, 24,115, 63,254, 24, 75,151, 46, 69,121,
-121, 57,248,202,243,176,252,233,150, 45, 91, 48,100,200, 16,244,239,223,191, 35,  0,249,174, 93,187,  6, 92,184,112,  1,199,143,
- 31,135,201,100,194,132,  9, 19, 70,241,149,151,245,251,101,188,247,243, 41,172,121,227,249,170,248,123, 59,246, 49, 26,116,200,
-250,102, 23,142, 30,251, 29,123,191,219,137,154,107,165,152, 48, 97,124, 50,  4,220,182, 72, 76, 76,108,212,250,231,149,  3,144,
-145,145, 65,242,243,243,149,124, 63,223,201,  8,166,165,126, 35,228,  1,193,115,255, 55,106,133,186,197,212,253, 37,127,206, 11,
-224,110,157,  7,  3,190,146, 15,253,129, 86,171, 85,150,148,148,104,184,205, 93, 26, 59, 22,  8,206,158, 61,139,202,202, 74, 77,
-219,182,109, 85, 74,165, 82,219,216,177, 70,137,171,226, 50, 14, 92, 53, 97, 66, 72,  8,246, 93,102,209,182,191, 12,157, 45,133,
-208,157,248, 43, 54,189,125, 20,236,133, 26, 24,172, 20,197,181, 14, 40,196, 12,236, 53,215, 16,217,132,210,238,174,  4,200,229,
-114, 92,188,120, 17,167, 78,157, 66,207,158, 61,161,211,233,112,240,224, 65, 87, 44,223, 87,188,158, 16,226,242,  2,112,242, 40,
-165,184,124,249, 50,122,247,238,141,252,252,124,176, 44, 11,185, 92, 14,137, 68,226, 90, 37,192,199,  3,112,233,210, 37,152,205,
-102, 12, 24, 48,  0,241,241,241, 42,145, 72,132,136,136,  8, 12, 26, 52, 72,117,240,224, 65,205,165, 75,151,160,215,235,143,129,
-167,203,254,210,165, 75, 96, 25, 41,218, 37, 38,163, 69,124,  2, 24,145,  4,138,136, 88,116, 24, 52,  1, 23, 15,230,162, 94,222,
-  5, 95,114, 40,165,202,234,234,106, 77,113,113, 49, 58,116,232,128,161, 67,135,170, 68, 34,145,118,216,176, 97,100,201,146, 37,
-116,240,224,193,246,250,121, 51, 33, 50, 50, 18,245, 10,138,163, 41,153,114,121, 12, 98, 98,251,194,106,169, 65, 69,229, 97, 88,
- 44,186,209, 54,155, 97, 32,128, 55,  7, 15, 30, 12,  0, 40,189,118, 13,245,242, 36,112,219,244,166, 41,252,242,203, 47,169,235,
-215,175,199,204,153, 51, 49,108,216, 48,  0, 96,119,236,216, 33,206,203,203,195,220,185,115,199,246,233,211,103,167, 63,125,249,
-180,222,136,197,123,126,197, 91,127, 83, 99,248,196,228,232, 58, 67,  5, 54,126,179,  7, 25, 31,125,141,109, 11,231,160, 75,217,
- 21, 44,211, 95, 67,116,116,140,144,  4,120,135,192,221,237,239, 45, 95,165,209, 28,  0,207,216,190,175,207,119, 35,130,189,  4,
- 47, 80,188,126,255,235, 42, 66,200,109,217,222, 30, 75,253, 26,228,  1,120, 42,  3,193, 92,254,199, 87, 57,200,205,205, 85,150,
-150,150,106,172, 86,107,147,199,154,  3,157, 78,135,186,186, 58,141, 94,175, 87,121, 59,150,146,146,210,232,179, 59, 82,101, 66,
-141,149,197,145,114, 59, 74,170,237,136, 59, 40, 70,159,141,103,113,241,194,113,252,254,147, 21,118,177,  8, 86, 22, 48, 91, 41,
-116,148, 69,108, 20,109,146,176,221,151,255,113, 25,251,165,165,165,232,216,177, 35, 46, 92,184,224,114,249,139,197, 98,215,245,
-254,134,243,220,107,  8,112,127,111, 80, 72,176, 26,205,203,222,191,206, 24,247,117,  1,203,178,168,171,171,115, 78,142, 98,177,
- 74, 36, 18,105, 61, 60, 73,226,220,220, 92,164,164,164, 48,139, 23, 47, 46, 93,182,108,153,125,241,226,197, 77,222, 60, 33, 78,
-133,200,100, 44,133,161,246,178,202,225, 48,107,  1,236,  5,240,102,109,109, 45,114,115,115, 93,202,228, 61,247,220, 99,245, 37,
-175,190,127,165,228,228,228,100, 79,152, 48,193, 69,254, 63,252,240,  3,179,121,243,102, 40,149,202,137,254,146,255, 85,163,  5,
-143,231, 29,196,115, 83, 39, 32,245,241, 41, 48,154,245,216,148,171,197,202, 15,179,240,217,216,251,209,165,236,138,192,166,119,
-129, 50,224,169,  4,220,148, 74,128,106,181,154,186,199,116,125,125, 22,112,221,196,126, 67,201, 63,208,152, 58, 71,252,158,217,
-254, 30,174,127, 82,255,242,122,109, 99,253,197, 87,191,224,219, 95, 82, 82, 82,180,221,186,117, 83, 69, 69, 69, 53,121,172, 57,
-136,138,138, 66,183,110,221, 26, 16,189,183, 99,222, 96,114, 68,192, 70,128, 67, 21, 22,148, 57, 28,216, 85,100,198,198,108, 51,
-118, 95,137,197, 89,105, 36,174,212,216,112,185,150, 69,157, 29, 48,218, 41,100, 49,173,125, 18, 51,183,190,223,225,112,192,110,
-183, 35, 38, 38,  6, 97, 97, 97,232,216,177, 35,108, 54,155,235,184,183,130, 64,158,242,184,245,253,118,187, 29, 38,147,  9,148,
- 82,180,111,223, 30,197,197,197,104,211,166, 13,196, 98, 49, 44, 22, 11,172, 86,171,235,255,242,  9, 15,118,232,208,  1,114,185,
- 28,133,133,133,184,114,229,138,198,225,112, 64,175,215,147,159,126,250, 73, 99, 48, 24,208,161, 67,  7, 68, 68, 68, 60,200,119,
-142,234,208,161,  3, 24,214,138,226,195,249,168,190,114, 26,172,195,  6,147,190, 28,151,126,250, 14,214, 58, 29, 39,175, 19, 31,
-229,134, 67, 76, 76,140,134,101, 89,151,167,115,233,210,165,228,248,241,227,168, 39,109, 22, 64,156,183,130, 71,158,176,219, 77,
-176,219, 12, 80,132,182,134, 92, 17, 13,128, 40,  1,216,151, 46, 93, 26,227, 38, 15,107,215,174,229, 10, 40,121,189,231,202,202,
- 74,250,217,103,159,209,140,140, 12,250,175,127,253,235,219,148,148, 20, 76,156, 56,145,243,  6,232,183,108,217,130,212,212,212,
-148,169, 83,167,126,199,167,205, 42, 43, 43,233,231,159,127, 78,167,253,245, 41,140,202,217,131,191,205,158,140,103, 94,152, 15,
-179,213,128,243,231, 46, 35, 35, 99, 35, 54, 63, 60,  4,202,246,173,  2, 30, 27,155, 55,111, 22,230,245, 91,  8,207,112,128,103,
- 34,224, 77, 45,  5,236, 25, 54,240,245,249,166, 89,250,141,196,234, 61,173,125,190,214,127, 99,242, 10, 94,126,153, 22,188,252,
-135, 59,223,243,179, 47, 79, 68,176,228,185,131,115,249,127,242,232,103, 36, 16,247,127, 70, 70,134,203,178,111, 44,222,207, 29,
-119,191,214, 23,124,229, 15,248, 19, 30, 80, 42,149,218,135, 31,126, 88,229, 94,156,198,219,177, 64,112,207, 61,247,224,225,135,
- 31,110,224,234,247,118,172,209,239,119,187,  7,221, 66, 69,  8, 39,128,141, 82,156,212, 89,177,254,172,  5, 95, 30, 40,193,207,
-231,170, 80, 98,  2, 42,205, 14,156, 51, 80, 92,181, 80, 24,172, 54, 85, 83,228,197, 45,205,179, 90,173, 48,153, 76,104,211,166,
- 13,122,245,234, 85,175,232, 69, 99,224,192,129, 46,194,230, 72,187, 49,194,230,  8,221,102,179,193,106,181,130, 16,130,174, 93,
-187,162,186,186, 26,151, 47, 95, 70, 85, 85, 21, 58,117,234,  4,134, 97, 96,181, 90, 97,177, 88, 92,223,241,133,216,216, 88, 85,
-124,124, 60,142, 31, 63,142,239,191,255, 30, 91,183,110,213,108,221,186,117,247,190,125,251, 32, 18,137,240,192,  3, 15,160, 75,
-151, 46, 38,240, 44,100, 19, 27, 27,155, 18, 23, 29,137,202,162, 95,241,251,206, 79,112,252,187,213, 56,249, 93,  6, 46,254,184,
- 25, 50,134,229,228, 21,251,146, 35, 22,139,181,113,113,113,170,136,136,  8, 28, 57,114,  4, 87,174, 92,209, 24,141, 70,165,187,
- 34, 80,239,  9, 96,214,175, 95,143,158, 61,123,250,252,109, 86, 75, 13,106,170,207, 66, 34,  9, 69,139,232,238,154,208,176,118,
-144, 72, 66,149,132, 48,131,185,107,194,171,243,161,249,236, 25,140,233,110,224,148,230,235,240,221,119,223, 65,161, 80,160,103,
-207,158,232,212,169, 19,234,195,  7,118,157, 78,103,200,201,201,105,145,152,152,152, 50,106,212,168, 45,124,251,110, 94,222,119,
-136,136,  8,195,136,145,131,140,137,253,251,224,209,191,206,133,145,216, 81, 94, 86,133,121, 79,191,134,101, 73,247,160,127,171,
-192,149,228,205,155, 55,211,183,223,126, 91, 80,  2,110, 19, 69,192, 27,110,155,189,  0,110,245,170,130, 64,  8,216, 95, 12,124,
-195,169, 64,184, 19, 53,119,236,102,201,115,183,194,159,216, 52, 27, 79,108,154,221,224,189,251, 49,190, 22,187,187, 39,193,155,
- 71,161,185,121,  1,238,158,  0,207,191,124, 17, 30, 30,174, 29, 61,122,180,106,224,192,129,141, 30,115, 63,215,100,187,187, 93,
- 63,122,244,104, 85,120,248, 31,203,242,188, 29,107,210, 58,148,133,170,122,183,105,137,161, 49, 50,220, 31, 37, 69, 91, 57,  3,
- 25,165,144, 91,236,232, 16, 38,134,142, 82,252,102,176,227,116,157, 29,237, 90,197,160,211,253, 35, 27,149,197, 89,253,220, 82,
-191, 14, 29, 58,160,111,223,190,208,233,116,168,174,174, 70,117,117, 53,194,195,195, 49,120,240, 96, 88,173, 86, 87, 77,128,198,
-  8,155, 83, 38,108, 54, 27,  8, 33, 72, 72, 72,128,201,100, 66,121,121, 57,202,202,202, 80, 94, 94,142,186,186, 58, 36, 36, 36,
- 64, 44, 22,187,228, 53, 86, 87,192, 83, 41,139,139,139, 83,117,237,218, 21,231,207,159,199,246,237,219, 81, 80, 80,128,144,144,
- 16,140, 26, 53, 10,125,251,246,253, 78, 46,151, 47,  4,207, 16,128, 82,169,220, 18,215, 42,118, 86,215, 54, 45, 96, 56,247, 19,
- 78,111,255,  8,197,  5,223, 34, 74,230, 64,242,232, 81,232,219,183,239, 28,185, 92,158,203, 71, 86, 68, 68,  4,250,247,239, 15,
- 74, 41, 14, 28, 56,128,194,194, 66, 77,113,113,177,166,170,170, 74,185,100,201, 18, 21, 87, 57, 49, 41, 41,  9,123,247,238,245,
- 41,143,101,109,218, 26,221, 89, 85, 85,249, 49,200,228,209,104,221,246,  1, 77,108,235,129,154,240,136, 78,223,189,243,238,191,
- 31,230,228,125,249,108,  8, 54,252, 96, 65, 99, 74,207,233,211,167,209,178,101, 75, 12, 27, 54,140,189,255,254,251, 97, 52, 26,
- 81, 87, 87,135, 85,171, 86,133,117,239,222,125,210,180,105,211,182,248, 51, 38,126,255,253, 52, 58,118,136,199,180,105, 41, 33,
-175,188,252, 28, 42,107,107, 80, 81, 89,129,244,103, 94,195,107,143,142,198,232, 14,113,205, 34,255,149, 43, 87,162, 87,175, 94,
-248,224,131, 15,  4, 37,224, 38,226,215, 95,127,109,180, 14,192,117, 10,239,237, 66,240,254,172, 42, 72, 77, 77, 37,193,170,  4,
-232, 11,158,133,120,130,161,  4,  4,131,252,  3,149,215, 88,169, 94, 79,203,220,159,146,189, 30, 74,130,171, 40, 80,115,238,203,
- 93,105,112,183,246,  3, 89,  1,224,110,221,221,127,255,253,164,177, 99,158,231, 26, 67, 83,215,243,149,193,225,  1,229, 40,109,
-145,152,194, 94,144,135, 11, 53, 64, 24,145,160, 99, 24,131, 98,  7,129, 72, 38,198,222, 50,  7,204, 44, 16, 43, 19,161,107,210,
-  8,200,187, 37,105,155, 82,  0,108, 54, 27, 68, 34, 17, 58,119,238,140,254,253,251, 67,175,215,195,108, 54,187,214,231, 91,173,
- 86, 68, 71, 71, 99,216,176, 97,216,178,101,139, 43, 36,224, 13, 14,135,195,149,213,223,163, 71, 15,212,187,233, 97, 54,155, 93,
-227,153,243, 36,244,232,209,  3, 85, 85, 85, 48, 24, 12, 77,141,229,  6, 39,102,205,154,165,213,106,181,163,122,246,236,185,219,
-173,112, 79,245,240,225,195,119,203,229,242,153,  0,204,254,180,229,172, 89,179,214,107,181, 90,125,207,158, 61,115,221,228, 85,
- 12, 31, 62,124,149, 92, 46,255,148,175, 28,134, 97,180,109,219,182, 85,141, 27, 55, 14,231,207,159,215,156, 58,117, 10,151, 46,
- 93, 66,120,120,184,166, 69,139, 22, 24, 51,102, 12,254,251,223,255, 34, 41, 41,137,247,111,179,219,141,218,106,221,239, 42,179,
-185, 10, 45,162, 18, 52, 97,225,237, 17, 30,209,  1,117,181,197, 91,222, 90,246, 17,166, 79, 75,198,151,207,134,120,109, 39, 14,
-227,199,143, 71, 94, 94, 30,174, 92,185,194, 84, 85, 85,193,108, 54, 99,239,222,189,226,122,165, 83,239,239,120,152, 48, 97, 60,
- 54,109,218,  2,125,117, 37,174,148, 92,197,179, 79,206,182, 62,255,226, 82,233,163,163,134, 96,152, 69, 15, 72,  2,163,135,205,
-155, 55,211,127,252,227, 31,174,114,208, 93,187,118,197,219,111,191,141, 23, 94,120,129, 78,154, 52,233,206,175,220,121,135, 42,
-  5,183, 76,  1,184, 17,171, 10,130, 65,238, 28, 42, 42, 62,194,203,  5,223, 54, 89,109,207,159,228,191,138,138,143, 80,240,242,
- 31,242,220,137,217,211,101,207,135,180, 43, 62,170, 64,193,183, 47,  7, 77, 94, 48,193,199, 67,192,237,  1,224, 79,127,249, 95,
- 26,156,157,134,168, 84, 71, 45,118, 77,249,238, 93,144,216, 77, 56, 90, 75,145, 95,107,135,148, 16,196, 80, 10, 85,155, 22,136,
-106, 29,171,138, 31,164,244, 97,105, 58, 61,  0,157, 58,117,194,192,129,  3, 97, 50,153, 96,179,217, 32,149, 74, 93,132,205, 89,
-233,177,177,177, 24, 58,116, 40,182,111,223,222,164,  7, 64, 44, 22,163,111,223,190, 32,132,192,104, 52,186,188, 11,156,210,206,
- 85, 23,100, 89, 22,189,123,247,198,193,131,  7,225, 79,114,165, 82,169,212,224,143, 60,145, 48, 56,171,237, 93,  2,207, 76,120,
-111,158,  0, 55, 89,209,  0,170,  0,248, 93,155,152, 97, 24,109,139, 22, 45,208,187,119,111,149, 68, 34,225,150, 63,106,  0,160,
-184,184, 24, 15, 61,244, 16,150, 47, 95,238,151, 76,135,195,162,173, 51, 20, 43,173,214, 26,149, 66,127, 65, 19,209,162, 43, 66,
-194,218, 34, 36,172, 45,118,236, 42,  5, 25,221,180,197, 61,100,200, 16, 34,149, 74,105, 85, 85, 21,198,143, 31,111,141,137,137,
-145,178, 44,139, 75,151, 46,  1,  1, 36, 75, 62,240,192, 16, 34,147,201,104,196,137, 66, 60,249,228,159, 16,159,208, 77,250,246,
-115,127, 98,215,125,248, 41,179, 74,100, 14,168, 47,111,222,188,153, 46, 94,188, 24, 45, 90,180, 64, 73, 73,  9, 20, 10,  5, 88,
-150, 69,104,104, 40,222,120,227, 13,188,252,242,203,130, 18,112,131,145,152,152,216,168, 23,128,215, 50,192, 27,129,219,121, 85,
- 65, 83,132, 19,136,245,223,152, 60, 79, 75,157,115,221,251, 34,237, 96,203,115,247,  4,  4,122,190, 41,175,130,231,230, 63,254,
-202,251, 95,  3,195, 48,218,196,209,227, 72, 85,157, 73, 25,105,183,104, 68, 23,139,112,143,237, 42,194, 99,226, 48,164,119,119,
-196,180,107,169,138, 76, 28,233,115,124, 80, 74,209,185,115,103, 12, 27, 54,204, 21,143, 23,137, 68,176, 88, 44,174,210,189,238,
- 97,130,246,237,219, 99,232,208,161,208,106,189,139, 86, 40, 20, 72, 76, 76,132, 88, 44,134,213,106,117,125,207,125,233,160,251,
- 70, 64, 12,195,160, 95,191,126, 40, 44, 44, 12,164, 25, 40,128,218,250, 87, 48, 96,  8,132,248,189,121,141,122,245,234,197,229,
- 81, 16,150,101,149, 70,163, 17, 22,139,  5,221,187,119,199,138, 21, 43,252,220, 28,135,106,109,214, 90,216,172,  6,149,201, 84,
- 14,153, 44, 10, 18,105,184,134, 97,196,248, 98,253,119,170, 89, 51, 39, 52, 41,175,190,174, 63,121,239,189,247, 88,147,201,  4,
-  0, 72, 72, 72,240,171,252,178, 59,250,247, 31, 64, 68,247,223,255,208,220,127,188,151,231,148, 71,153,132,132,123,145, 48,105,
-210, 44,177, 88,188, 62, 16,153,203,150, 45, 19,  6,245,109,162,  4, 52, 69,254, 55, 85,  1,184, 83, 17,204,101,127,158,196,220,
- 92,107, 61, 88,242,154, 99,113,187, 19, 59,247,222,195,101, 47,116, 34,158, 24,149, 50, 73, 91,111,189, 98, 68,  0,223, 79, 75,
- 75, 67, 84, 84,148, 43,195,159,101, 89,151, 11,159,243,  0,112, 73,127,220,142,128, 93,187,118,  5, 33,  4, 27, 54,108,184, 78,
-222,202,149, 43,145,157,157,237,186,214,225,112,248,220, 14, 88, 42,149, 34, 41, 41,  9,124,178,227,239, 84,101, 45, 44, 44, 12,
- 97, 97, 97,136,137,137,105,198,216,225, 20,129, 90, 48,140, 24,206,116, 44, 86,195, 83, 30, 93,180,104, 17,169,127,158,148, 97,
-152,102,205, 35, 14,  7,187,109,193,130,  5,  4,  0,195,178,172,131, 97, 24,  5,252, 12,191,112, 16,172,251,219, 75,  9,240,  5,
-146,152,152, 40, 36,103,  8, 16, 32, 64,128,  0,  1,255, 99, 96,132, 38, 16, 32, 64,128,  0,  1,  2,  4,  5, 64,128,  0,  1,  2,
-  4,  8, 16, 32, 40,  0,  2,  4,  8, 16, 32, 64,128,  0, 65,  1, 16, 32, 64,128,  0,  1,  2,  4,220, 21,104,176, 10, 96,254,252,
-249,  1,103,112,174, 94,189,250,186,100, 66, 65,158, 32, 79,144,119,247,201, 83,171,213,244,145, 73,106,124,187, 57,  3, 25, 25,
- 25, 12,188,172, 65, 23,218, 79,144,247,198, 27,111,184,174,121,249,229,151,137,208,126, 55, 87,158,223, 10,  0, 55,184, 27,187,
- 56,144, 37, 47,119,178,188, 64,100,222,238,247,235,  5, 82,  0, 17,  0, 66,234,251,  3, 11,160,  2, 65, 88, 67, 29, 76,112,237,
- 16,140,123,246,214,166,183,170,248, 80,109,237,255,111,239,202,195,154,184,214,247, 59, 73,  8,  1, 65, 22, 17, 17,149, 42, 32,
-138,184, 32,238, 90,149, 88,144,130,128, 91,209,254,106,123,107, 55,162,183,215,122, 91, 84,172,116,177, 11,173,120,181,155,183,
-173,161,183, 85,219,122,111, 43,181,130, 59,149, 26, 92,170, 86,197, 21,180, 42,224, 86, 65,169,202, 78, 66,150, 57,191, 63,194,
- 96,  8, 89,102,146, 32,216,206,251, 60, 60,  9, 39,147, 47, 51,231,204,156,247,253,190,115,206,119,106, 35, 15, 29, 58,164,216,
-183,111, 31,  0, 96,226,196,137, 24, 59,118, 44,235, 84,194,237,209, 14, 83,167,201, 16, 23, 27,161,  5,100, 34,153, 76, 70,255,
-213, 18, 55,241,176,142,244,244,116,146,144, 16,212,226,127,107, 34,128, 71, 59, 71,  0, 24,144, 77,173, 55,128,160,102,217,190,
-111,186,169, 14,194,158,221,255, 28,109,207,212,245,218,115,205, 29,253,122, 25,226, 47, 58,115, 96, 93, 81,209,233, 71,252,122,
-  4,117,171,174,214,192,195,195,  9, 55,111,148,208, 97, 97, 67,238,134, 13, 30, 63, 18,192,101, 46,  6, 79, 28,254,140,148,150,
- 92, 68,201, 21, 21,174,151, 19,244,234, 78, 33,168,183,  4,129, 65, 33,136, 24,243,247, 14,241,240,155, 18, 18,204, 94,  3,237,
- 65,100,103,207,158, 85,132,135,239,198,218,181, 13,200,207,  7,222,124,243, 39, 92,191,126, 93,225,231,231,  7,137, 68,130,178,
-178, 50,233,244,233,211,225,  8, 65,112,224,192,  1, 82, 93, 93, 45,141,142,142,134,179,179,179, 45,246,  4,  0, 16, 23, 27, 65,
- 39, 39, 39,139,128, 76,228,100,235, 31, 21, 56,118,219, 94, 30,127,  2,168,213,169,200,205, 77, 70, 76, 76, 38, 18, 18, 50,154,
- 35,  2,188, 16,184, 63,224, 19,  1,113,128, 33,217, 83, 20, 64,127,239,245,167,189, 86,141,186,254,169,220,221,223, 47, 11, 14,
-238,219,127,198,180,137,232,213,163, 51, 60, 61,156, 81, 89,165,194,141,242, 94,130, 75,165,149, 62,219,183,126,165,136,121,116,
-246,106, 39,113,167, 53,214,236,157, 59,187, 47,242,242,197,237, 10, 33,106, 48,123, 10, 48,110, 24, 16,244, 16, 80,124,133,224,
-224,113, 37,118, 42, 78, 99,199,230,197,164, 79, 72,188,116,192, 32,235, 25,237,218, 42,218, 97, 46,138, 32,151,203,169,246, 18,
-  1,119,239,222,197, 75, 47, 53,160,107, 87, 32, 41,  9, 88,177,162, 14, 39, 79,158,132, 86,171,133, 68, 34,129,175,175,175, 98,
-251,246,237,232,219,183,175,116,248,240,225,249, 28, 59,128,200,194,194, 66,116,235,214, 77, 17, 29, 29, 77,125,251,237,183,  0,
-160,200,203,203,195, 19, 79, 60,129,145, 35, 71,114,189, 86, 49,  0,236,220,117, 66,  0,100,210,250, 87,189,134,230,123, 16, 30,
-134,222, 62,  0,204,156,185, 25,185,185,250,215,228,228, 18, 48, 17,  1, 62, 26,112,127,137,223,176,188,221, 82,  1,119,116,144,
- 77, 94,205, 34,224,207, 76,254,  0, 68,123,114, 55,189, 38,157, 16, 17, 50, 98,104,119, 80,148, 62,171, 27, 77, 19,116,118,115,
- 70,167, 32, 49,122,247,242, 64, 15, 63,183,135,246,228,110,122, 45, 46,225,153, 44,  0, 55, 45, 25,188,124,113,187, 98,252,176,
- 26,252,243, 25, 64, 40,212, 11, 40,141, 22,232,228, 10,132,  6,  3,163,195,129,237,138, 26, 28, 57,189, 93, 49, 96,208, 68,155,
- 30,124, 71, 13,  1,152,251, 62, 35,  2,238,119, 99,120,123,123, 99,251,118, 23,244,234,165, 68,126, 62, 80, 89, 41, 66,112,112,
- 48,130,131,131, 81, 87, 87,135,210,210, 82,228,231,231,163,166,166, 70,209,175, 95, 63,214, 67,  3, 63,254,248, 99,164, 82,169,
- 84,136,197, 98, 84, 86,182,140,100, 41,149, 74,124,249,229,151, 40, 45, 45, 37,143, 63,254, 56,151,250,164,  1, 32, 39, 91, 14,
- 64, 38,208,191,218,142, 99,199,142, 53,215, 55,179,137,146,169, 50, 54,247,133, 97,219,178, 45,179,234, 20, 16, 18,137, 11, 23,
- 48,178,174, 78,209,229,198, 13,252,238,235,139, 19,157, 59, 75,157,  6, 12,  0,161,168,124, 91,175,153,235,134, 81,108,108,176,
- 45,107,107,123,134,161,255,228,228, 92, 36, 36,  4, 53,191, 50, 72, 72,  8,226, 69,192,125,128, 49,217, 51,251,  3, 24,150,243,
-171,  0,140, 31,250, 63,249,245, 21,157, 57,176, 34, 56, 56, 56,100,100, 68,247, 22,229,  2,  1,  5,177, 88,  8, 23,137,  8, 78,
- 78,  2,  4,245,241, 66, 80, 80,176,111,209,153,  3,219, 45,  9,197, 19,135, 63, 35, 66,212,224,229,103,  1, 85, 35,112,249, 58,
- 80, 89, 13, 84,213,  0,255,221, 10, 44, 88, 14, 44, 91,  5,140,141,  0,  4,164,  6, 39, 14,127,198,123,139,  6, 24, 52,104,144,
- 52, 39, 39, 20,190,190,192, 19, 79,136,224,231, 55,  2, 19, 39, 78,148, 38, 36, 36, 80,241,241,241,210,152,152, 24,116,235,214,
- 13, 39, 78,156,192,247,223,127,175,248,233,167,159, 34, 27, 27, 27, 35, 45,217,252,246,219,111, 35, 27, 27, 27, 21, 78, 78, 78,
- 22,127, 91,161, 80, 96,211,166, 77,145,108, 72,118,255,254,253,  4,128, 90, 46,151,139,239,137,128,123,100,186,127,255,126,194,
- 85, 64, 29, 61,122,180,249,207, 82,153, 45,162,142,109,153, 37,242, 15,252,237, 55,197,244, 83,167, 20,189, 46, 22, 67, 92, 83,
-131,238, 23,127, 67,228,145,195,138,174,167, 79, 43, 64, 72,164, 45,237,125,244,232, 81, 28, 59,118,140, 20, 22, 22, 70,218,122,
-207, 48, 54,216,148,177,181,103, 76,244,108,202,172,129, 33,125,230, 85,157, 16,204, 63,240,247,137,248,217,164,  1,126, 96, 35,
-  0,109,233,169,145, 54, 60, 63, 71,133,152, 25,251,230,126,199,210,111, 20,157, 59, 29, 59,107,134,180,153,244, 77, 65,226, 44,
- 66, 85,117, 35, 66,130,188,145,181, 69, 17, 20, 54,120,188,135, 57,123,165, 37, 23, 49,123,138,254,253,238,253,192,167,223,  0,
-147,199,  3,113,145,192,111,197,192,201, 34,  2, 23,  9,133,161, 97, 64,204, 68,224,199,220,139,136, 24,227, 56,207,221,150,186,
-107,163, 57, 21, 54,193,221,221, 61,191,174, 78, 63,223,242,137, 39,158,192,184,113,227, 40,195,207,238,222,189, 43, 13, 13, 21,
- 41, 18, 19,  1,138, 58,142,138,138,  6,197,239,191,  7, 89, 10,255, 69, 82, 20,165, 96,187, 57, 76, 69, 69,133,194,154,238,157,
- 51,103, 14, 54,110,220,136,141, 27, 55,146, 57,115,230,180,104,139,253,251,247,147,141, 27, 55, 54, 31,215, 81,250,  3,182,101,
-230,208, 88, 88,136, 62,  5,  5, 80, 11,  4,112,162,  0, 45, 77, 64,107,116,160,181, 90,116, 61,176, 31,197,132,160,243,208,161,
- 54, 19,184,171,171,171,226,248,241,227,210,185,115,231,230,219,106,  3, 64, 11,143,220, 84,153, 45,209,  5,123,201,223, 28,209,
-231, 26, 69,  2,120,180, 63, 76, 10,  0,115,147,223,108, 33, 28,107,132,200,213,222,253, 30,163,181,101,198,184,165, 73,133,182,
-216, 51,245, 29, 27, 39, 46,138,252,252,131,  6,248,251,185,129, 16,224,192,225,235,104, 80,234,119, 93,141, 24,226,135,174, 93,
- 92,112,253, 70, 45, 93,124,185, 82, 32, 18,  9,208, 55,208, 11,254,254,193,158,208,111,209,106, 18, 37, 87, 84, 24, 55, 12,104,
-212,  0,187,246,  1,138,195,  4,254,221, 40,  4,  6,  0,143, 60, 12,244, 15,162, 32, 18,234,183, 22, 31, 29, 14,252, 75,174, 98,
- 85,223,134, 33,121, 54,239,217, 40, 94,195,177,126,195,122,119,228, 10,  3, 91,208,180,157, 43,  6, 15, 30, 44, 53,254, 76, 40,
- 20, 42,  6, 12,168,192,178,101,122,121,250,222,123, 23,113,229, 74,152, 89, 91, 42,149,202,170,231,111,136, 43, 87,174, 88, 61,
-102,194,132,  9,212,132,  9, 19,154,201,126,227,198,141,196, 88, 32, 76,152, 48,161, 93,234,174, 45,188,127,  0,232,123,251,142,
- 66,173,209, 64, 32, 16,128,  8,133,160,105, 26, 26,154,  6,173,211, 65,167,163,209,179,188, 92, 81, 51,116,168,205,215,220,208,
-208,  0,  0,138, 99,199,142,129,162, 40,206,243, 59,218, 66,  4, 56,202,243,207, 77,206, 69, 76,102, 12,102,110,  6,146,115,245,
-239,115,147,115,155,197,129,120, 91, 49,207,188,247, 17,134,115,  2, 88,205,  1, 48,183, 10,192,214,213,  1,230, 60, 46, 91, 60,
- 49, 75,162,193, 86,129, 98,233,186,141,191,203,214,139, 48, 55,169,208, 22,123,150,190,195,252, 14,  5,128,222,100,117,238,  2,
-173,159,237,239, 12,  0,184, 94, 86,  3,165, 82, 11,  0,  8, 14,244, 66,215, 46, 46, 56, 93, 84, 33,184,112,233, 46, 36, 18, 33,
-130,250,120,162,178, 90, 13,  0,102, 13, 95, 47, 39,  8,122, 72,255,251,143, 78,  0,194,  7, 80,112, 22,  3, 90,173, 62, 18,224,
-233, 14,148, 94,  3, 98, 38,  0, 15,245,212, 31,223,158, 48, 36,125, 91,198,133, 59, 58, 42, 42, 42,218, 44,138,210, 68,242,205,
- 30,127,123,147,191, 33, 50, 50, 50, 72,106,106, 42,101,235,231,198,112, 42, 41, 70,163, 70, 13, 74, 40,130,142, 16, 80,  0,180,
- 58, 26, 26, 45, 13,162,211,129,186,116,  1, 64,156,221,231, 93, 88, 88,  8, 31, 31, 31, 69,117,117,181,212,195,195,195,102, 17,
- 96,173,236,126,145,127, 90, 90, 26,149,158,158, 78,102,110,110, 41,  8,  0, 32, 38, 51,  6,226,109,197,216,182,173,164,121, 37,
-  0, 51, 97,208,219,219,155,103,234,251, 76,254,102,  5, 64, 71,135, 37, 66,180,133, 96,237, 89,226,104,209,110, 27,175, 38,160,
-102, 85,114,253, 13,202,195,195,  9,149, 85, 42,248,120,187, 34, 41,177, 63,180, 58, 26,206,206, 66,  8,  5,  2, 16, 66, 16, 63,
- 57,  8, 83,162,131, 64, 81,192,157, 74, 37, 60, 60,156,  0,224,174, 57,131,189,186, 83, 40,185, 74,189,136,105, 47,  0,  0, 32,
-  0, 73, 68, 65, 84,208, 63,  8,152, 52, 70,223,235,252, 86, 12, 12,238, 15,120,117,  6, 98, 35,  1,154,  6, 68, 66,224,226,101,
-253,241,108,219,150,203,123, 91, 19, 97, 88, 19,164,109, 13,154,166, 35,123,244,232,129,146,146, 18,236,223,191, 95, 49,126,252,
-120,169,155,155, 27,  4,  2, 65, 62,  0,232,116, 58,233,185,115,190,138,183,222,186,  1,138,162, 80, 81, 17,130,144,144,222,184,
-120,241,162, 57,123, 38,203, 55,109,218,212, 58,138, 68,  8,102,207,158,205,233,154, 13, 69, 64, 71, 34,127, 71,136,  4, 67,220,
-237,217,  3,226,223, 46,128, 56,  1, 98,154,232, 39,182,234,180, 80, 19, 29, 26,180, 90, 40,131,251, 59,228,220,  7, 14, 28,  8,
-138,162,108, 34,127,  0, 24, 57,114, 36, 70,140, 24, 65, 29, 61,122,148, 88, 42,179,134,166,136, 65, 11,194, 55, 85,198,  5,201,
-185,247,136, 31, 64, 43,207,159,153, 48,184,109, 91,  9,207,212,237, 64,254, 15,172,  0,104,107, 65,225, 40, 66, 32,  4, 16,204,
-174,108, 51, 17,192,172, 92, 16,204,170,100,227,253,  3,128,232,230,141,146,219,215,111,244,244,241,241,118,197,  7,159, 31,195,
-132,177,189, 16, 49,184, 27, 40, 39,170,121, 69, 64,211,214,241,184,126,163, 22, 55,111,148, 92,  6, 96,214,173, 12,234, 45,193,
- 47,  5, 74,244, 15,  2,124,134,  1, 75,231,  3, 11,231,  2, 30,238,250,176,255, 91,159,  0,203, 23,234,143,253,165, 64,127,188,
-173,  4,237, 40, 79,189, 35,229,  2, 56,119,238, 28, 36, 18,125,157,236,216,177,  3,215,174, 93, 83,244,235,215, 79, 58,105,210,
- 36,212,214,214, 70,122,123,123, 43, 14, 30,212, 34, 63, 31, 24, 49, 98, 56,  2,  2,  2,164, 61,123,246,  4,  0,133, 41,123,157,
- 58,117,130, 90,173,102,245,219, 90,173,246,129,127,118, 13,201,159,141, 16, 96, 43,  2, 74,186,250, 74,157,207,156, 81,208,132,
-160,147, 64,  4,161,144,130,150,232,208,160,209,160, 86,173, 70,153,191,191,212,199,142,243,118,117,117,  5, 69, 81,210, 17, 35,
- 70,228,219,106,131, 33,122,107,101,247, 91,  4,164,165,165, 81,201, 77,158,189, 49,249, 27,122,255, 60,218,151,252,121,  1,112,
- 63, 60,188, 54, 94, 82,216, 44,  2,216,  9, 13,109, 88,216,144,178,226,203,149, 62, 67,194,124,177,116,225,104,172,255,223, 89,
-184, 72, 68,  8, 31,232, 11,138,162, 12, 60, 73,130,226,203,149,  8, 11, 27, 82,  8,160,214,156,193,192,160, 16,236,216,123, 26,
-115,103,  2,164, 20, 24, 61,  3,  8,236,  5,108,204, 49, 56,104, 33,160,211,  1, 59,246,234,143,111, 47, 88,138, 20,181,215, 50,
-192,187,119,239, 42, 66, 67, 47, 99,221, 58,  0,208,225,237,183,207,224,228,201,  6, 69, 67, 67,  3,106,107,107, 81, 90, 90,138,
- 91,183,110, 33, 34, 34,  2,179,103,207,182,186, 12,144, 16, 34,165,105, 90, 33, 16, 88, 95,224,195,  8, 15,174, 96,134,  0, 54,
-110,220,136,  9, 19, 38,180,235,243,149,154,154, 74, 49,196,111,109,  8,192,218, 49,134,240, 26, 58, 20,119,212,106,232, 20,249,
- 80,139,157,224, 70, 68, 80,209, 52,170,213,106,212, 78,122,  4, 62,195,134,217, 24, 21,164, 48, 98,196,  8,155,199,253, 13,109,
- 24, 18,189,169, 50,123, 68,192,177, 99,199, 44,150,177,129, 41,242,103, 60,127,  0,252,132,192,118, 38,127, 94,  0, 60,224,104,
- 30,255,103, 63, 12,160, 11, 27, 60,126,210,246,173, 95, 29,252,181,192,189,255,168, 97,254,136,141, 10,196,238,159, 75,177,227,
- 39,253,195,249, 90,202, 88,208, 52,193,175,  5,101, 40, 41, 41,190, 26,159,248,236, 63,  0,104,204, 25,140, 24,243,119,106,199,
-230,197,228,195,175,244, 75,  1,215,190,171, 95,250, 23, 53, 78,191, 20,240,195,215,245,228,255,225, 87,128, 14,157,109,206,  8,
-104,175,103,110, 45,130,208, 94,171,  0,234,235,235, 49,116,168, 10, 35, 70,232,255, 31, 62,156, 96,247,238, 82, 92,188,120,145,
- 73,  4,132,200,200, 72,244,237,219,151, 85, 14,128,201,147, 39,231,103,103,103, 91,141,  2,104,181, 90,120,122,122, 74,185,158,
-111,211,114,192,230,149,  1,251,247,239, 39,182, 14,  3,140, 28, 57,146, 85, 25, 23, 17, 96,237, 56,214, 70,  5,130,124,245,168,
- 81,210,243, 78, 78,232, 85, 94,174,112,187,118, 13,170, 62,125,112,197,215, 87,234, 29, 17,  1, 52, 13,209,216, 64,176,142, 32,
-233, 86, 54, 76,149,177,173, 75,227,227, 24,194,183, 86,102, 11,140, 73,159,137,  8,216, 59,132,199,163, 53,216, 76,140,230,  5,
- 64, 27,122,230, 29,244, 55,238,196, 60, 58,251,163,220,221,223, 47,254,189,188, 54, 40,184,143, 23,166, 76, 14,130,151,167,  4,
-149, 85, 42,156, 60,123, 11,197,151, 43, 81, 82, 82,124, 40,230,209,217, 63,  2,184,110,205, 96,159,144,120,233,129,130,237,138,
- 67,  5, 53,152, 50,  9,248,226,125,125, 38,192,146,171,192,151,155,244,158,191, 14,157,209, 39, 36, 94,106,235,181,218, 51,  4,
-192,150,252,219, 99, 14, 64,121,121,185,212,203,203, 71,113,252,248, 31,  0,128,139, 23, 59, 99,196,136,  1,232,210,165, 11, 36,
- 18,  9,202,203,203,165,241,241,241,156, 82,  1,247,238,221, 91,122,225,194,  5,133, 97, 68,199,152,252,131,131,131, 49,114,228,
- 72, 78, 36,198,172,  2, 48, 24,251,103, 38,  4,218, 36,  2, 76, 17,161,173,228,104,141,220, 57,145,191,129,  8,232, 50,124, 56,
- 26,  0,170,161,169,200,222,169,106,246,146, 63,151,122, 99,251, 91,142,182,199,150,252,213,  9,193,  0, 63,254,127, 95, 34,  1,
-230,132,  1,167,101,128,182, 78,150,227,186, 12,208, 86,123,182,218,116,244,249, 89,170, 39, 71,157,159, 61, 19, 23,157,196,157,
-228,241,137,207,126, 87,116,230,192,103, 91,114,246,  5,250,245,  8, 26,109,176, 23,192,145,176,176, 33, 71,227, 19,159, 93,  6,
-160,158,141,189,  1,131, 38,230, 15, 24, 52,145, 58,113,248, 51,242,253,142,139,120,239,211,142,183, 23, 64, 71, 36,127,  0,120,
-252,241,199,113,250,244,105, 60,243,204,241,166,  8,192,112,204,154, 53, 68,234,234,234,154,111,171,205,240,240,240,252,240,240,
-112,106,235,214,173,145,181,181,181, 10,161, 80,  8,129, 64,  0,173, 86, 11,177, 88, 12, 55, 55, 55,169,  3,200,223, 33, 34,128,
-199,159, 19,105,105,105, 84,122,114, 58,241, 95,224, 47, 69,111,211,199,148, 37,231, 42,248,249,  0,237, 11, 17,219,142,210,209,
- 29,111, 91,216,179,229,183, 30,228,235,181, 19,213, 97,131,199, 63, 25, 54,120, 60,147, 49,198, 13,128, 15,128,114,  0, 74, 52,
-165,125,229,130,136, 49,127,167,108, 73,242,211,214,245,208,145,242, 74, 24,195,213,213, 53,127,204,152, 49,212,152, 49,142,175,
-184,196,196,196,124, 56, 40,185, 37, 51,238,111, 76,242, 19, 38, 76,160, 54,110,220, 72, 58,194,124,  0, 30, 29, 79,  4, 88, 62,
-  0, 60,249,183,  1,216,102,  1,  4,  0, 42, 60, 60,156, 31,123,225,193,131,  7, 15, 30, 60,254, 98,224,247,  2,224,193,131,  7,
- 15, 30, 60,120,  1,192,131,  7, 15, 30, 60,120,240,224,  5,  0, 15, 30, 60,120,240,224,193,131, 23,  0, 60,120,240,224,193,131,
-  7,143, 63,  7, 90,172,  2,152, 63,127,190,205,179, 50, 77, 37,114,224,237,181,141, 61, 54,155,216,180,167,189,188,188,188, 72,
-  0,138,172,172, 44,135,216,219,187,119,111, 36, 77,211, 14,179,199,223,127,237,102,111, 54,128, 77,109,124,126, 78,  0, 36,208,
- 39,173, 81, 65,191,154,133,192, 40,137, 13,223, 30,188,189, 63,187, 61,206,  2,192, 26, 57,152,  3,151,165, 84,142,182,119, 63,
-145,156, 84, 77, 32, 22, 35,115,163, 11,171,243,203,203,203,139,204,202,202, 82, 56,234,122, 13,237,173, 94,189, 90,154,146,146,
-162,176,101,123, 97, 83,246, 10, 63,237,140,129, 47,214,192, 30,123, 12,166,141,216,169, 56,125, 65,  7,  0,200,204,204, 36,201,
-201,201,118,181,103, 72,183,239,161,212,122,195,197,197,  5, 89, 89, 89, 36, 41, 41,169,163,220, 31, 93,231,189,146,242,205,218,
- 15, 86, 63,  5,224, 15,  7,216, 11,152,255,210,203, 95,124,254,201,135, 79,154,177,231,  4, 64, 11,203, 25,217,156,160,207,220,
-216,117,225,194,151,191,249,248,227, 15,159,130,126, 51, 39, 26, 14,200,228,102,252, 28,115,188, 55, 14,183, 85, 67, 80, 20, 21,
- 39, 16,  8,  6,  8,  4,130, 72,138,162, 66,  0,184,170,213,234, 92,161, 80,232, 73,211,116,  5, 33,228,117,  0,119, 28, 89,  7,
- 60,120,152,194, 83, 37, 37,228,155,160, 32,135,245, 81,201, 50, 25,201,108, 35, 78, 20, 89,123,200,  9, 33,150, 30, 58,206, 29,
-134,163,236,113,245, 96, 29,137, 61,123,246, 88,237, 68, 24,114, 77, 77, 77,133,175,175,175,201, 12,120, 41, 41, 41, 10,182,191,
-201,216, 99,136,255,200,145, 35,205, 66,192, 30,123,244,185, 55, 32, 24,240, 54,190,222,171, 79, 29, 75,159,123,163,249, 24,193,
-128,183, 57,213, 75,231,154, 87,  8, 77,128,239,118,235,109,197, 78,116, 66, 88,112, 17, 50, 51, 51,  9,  0,112, 21,  2,213,218,
-239, 34,171,174,220,129,146,154,168,168,111,236,132,216,152, 42,244,240,163,112,252,248, 33, 82, 83,163,194,164, 73,147,218, 85,
-  8,204, 95,184,240, 37,208,244,228,249, 11, 23,190,244,249,199, 31,191,110,183,189,  5, 11, 95, 32, 52, 29, 61,127,193,194,151,
- 62, 95, 99,210,158,134,133, 25, 13,  0,106,193,130,133, 47,209,180,110,242,130,  5, 11, 95, 90, 99,218,150,  0, 54,228,122,176,
- 19,106,195,251,239,135, 31,126, 80,204,152, 49, 67, 58,121,242,228,124,123,140, 10,133,194, 88,145, 72, 52, 65, 36, 18, 61, 46,
- 20, 10,189,  4,  2,129, 91, 70, 70,134, 96,241,226,197,207,234,116, 58,104,245,120, 92,167,211, 37,  0,248,165, 73,  4,168,155,
-250,191, 54, 31,  6,221,177, 99,  7, 97,219,223,197,197,197,113,186,167,119,238,220, 73,236,249, 62, 15,199,195,101,229, 74, 64,
- 46,119,152, 61,229,146, 37,118,125,159,201,  8,200,105, 59, 96, 54,228, 63,108,216, 48, 20, 20, 20,112,242,248, 45,145, 60, 27,
-123,166,236,167,166,166,162,180,180, 20, 89, 89, 89, 14,221,214, 53, 57, 33,147,192, 37,  4,153,155, 34, 41,  0,200,204,242,160,
-184,144,255,234,213,171,165, 21, 21, 21, 10,115,228,159,154,154,138,140,140, 12, 78,228, 15,  0, 73, 73, 73, 24, 61,122,180,116,
-244,232,209,118,217, 99,200,158,121, 93,241, 14, 90,144,255,146,153, 18,172,220,172, 98, 85, 87, 30,202, 20, 50, 48, 68,136,122,
- 37,193, 43, 79, 73,112,164, 72, 11,101, 61, 65,131, 26,144,134, 23,161,232,162,142, 83, 52,160,244,250,135,164,234,102, 39,184,
-119, 22,195,175,187, 27,186,118, 11,198,213, 18, 53,122, 15,208,192, 73, 82,129,188, 45,183,177,101,203, 22, 50,125,250,244,118,
-233,240,100, 50,153,179, 79,143, 30, 11,191, 61,114,148,138,237,215,247, 37,153, 76,246,174, 92, 46,111,180,199, 94, 87,191, 30,
- 11,191,219,123,132,138, 14,239,103,151, 61,153, 76, 38,246,243,235,190,240, 39,197,  1,106,248,144, 48,115,182,232,118,168,182,
-230,237,  7,179,178,178, 20,  9,  9,  9,216,188,121,179, 98,242,228,201,173,218, 48, 34, 34,130,188,245,214, 91, 72, 72, 72,176,
-216,190, 34,145,104,146, 88, 44, 30, 40, 22,139, 23,136,197, 98,215,235,215,175,163,111,223,190, 16, 10,133,112,119,119, 71,113,
-113, 49,220,220,220, 68,199,142, 29,243, 60,124,248,240,129, 23, 95,124,177, 55,128,171,  0,196,230,234, 32, 57, 57,185,149,179,
- 98,216,111, 49,229, 20, 69, 33, 51, 51,211,234,253,183,117,235, 86,179, 54, 12,203,  9, 33,136,139,139,227, 84,161, 57, 57, 57,
-118,125,191, 45,113,234,212,169,200,240,240,240,124, 71,216,186,117,235, 22,161,105, 26, 16, 84, 65,221,168,130,216, 89,  2,208,
-158, 16,  8,  4,232,214,173, 27, 53,216, 56,114,105, 33, 25,206,195, 15, 63, 76, 54,111,222, 12,115,246,102,206,156,137,131,  7,
- 15, 82,182,158, 31,  0,148,223, 58, 79, 12,207,207,158,107,183, 37,154, 96, 46, 13, 48, 43,  1,192,150,252,217, 34, 53, 53,213,
-234, 49,108,136,203, 28,249,175, 88,177,  2, 75,151, 46,109, 81,110,171,  8, 72, 30,150, 73,208, 37,  4,153, 63, 69, 82,134, 30,
-127,116,116, 52,  5,  0,204,107,113,113, 49, 97, 67,214,150,200,191, 41, 50, 96,213,107,103,194,244,134, 30,190,241,208,130, 45,
-246, 44,121,248, 75,102,178,223, 41,206, 71,249, 10,233,251,144, 16, 46,206, 20, 30,242, 23,226,118, 37, 13,141, 86,136, 59, 85,
-  4,213,117,  4,197,191,211,128,  0,240,113, 61,131,188,188,188,200,168,168, 40,139,157,194,213,107, 31, 68,134,  6,  7,225,240,
-205, 91,232, 19,208, 21,  3,  7,  7, 66,232,236,141,135,250, 84,162, 82,169, 66,197, 77, 29,126,191,165,130,171,168, 20,121,121,
-238, 86,237,181, 17,230, 60,181,120,177,184,180,187, 63,156,135, 13, 23,168, 14,236,159,  3,224, 43, 27,236, 48,158,248,156,167,
- 95, 90, 36,254, 93,236,  7,183,144,  8, 65, 77,225, 65, 91,237,  1,192,156, 23, 23,190, 44,134,179, 59,250,244, 11, 19, 92, 56,
-123,194, 30, 91,142,  4,205, 60, 35, 20, 69, 65, 34,145, 72,  1, 40,140,239,137, 97,195,134,177, 34,127,  0,112,114,114,242,148,
- 72, 36,115,111,223,190,237, 26, 18, 18,130,161, 67,135, 66, 36, 18,225,147, 79, 62,129, 78,167,195,160, 65,131,240,227,143, 63,
-226,216,177, 99, 56,115,230, 12,132, 66,225,103, 58,157,110,170, 37,155, 83,167, 78,109,238,231,172,245,131,108,  8, 87, 46,151,
- 75,253,252,252, 20,132, 16,139, 14,208,205,155, 55, 57,239,149,193,216,182,245,251, 12, 81,159, 63,127,222, 98,191, 17, 26, 26,
- 42,229, 74,230,231,207,159, 87, 84, 87, 87,195,195,195, 67,106,143, 16, 56,113,242, 16,121,235,157,249,232,212,201,165,213,103,
-245,245, 74,228,252,120, 26,103,228,114,106, 74,247,238,228,122, 98,162,249,190,253,192,106,125, 99, 30, 88,141,238,147,226, 33,
-137, 24, 14, 93, 72, 88,203,240,217,119, 27,224,245,254,116, 12, 48, 24, 42, 82, 62,250, 60, 62,183,114,126,203,210,230,193,187,
-139,171,190,224,141,143,144,178,232, 25,  0,192,221, 59, 13,120, 47,125, 45,137, 24, 58,214,102, 17,224,232, 33,  5,139,  2,128,
-241,216,173,121,234, 29,  5,165,165,165, 88,186,116,169, 77,  2,194, 18,244,158,126, 50,181,103,207, 30,146,149, 57, 18, 16, 43,
-  9,155,177,127, 83,100,109, 76,202,150,134,  5,204,193, 80, 80, 28, 57,114, 68, 49,122,244,232, 22,161,127,174,246,254,187,216,
-205,108,231, 54,103, 85, 61,107, 59, 52, 77, 71, 58,187, 82, 16,  8,  0, 87, 23,160,170,134, 70, 35, 33,232,228, 66, 65, 69,  3,
-202, 70,130,158, 93,  5,160,181,192,165,235, 58,148,150,150, 42, 96, 33, 61,237,185,162, 31, 34,  7, 14,236,175, 16,139,  9, 94,
-152, 59, 10, 58, 29,193,205, 10, 53,174,221,168,  2,156,174,195,197,171, 17,229, 21, 87, 32, 16, 87,227,220,185, 42,120,120, 89,
-182,215, 86,112,246,246,126,227,241,191,253,205,249, 53, 26,240, 90,154,230,118,235,244,169,215,109, 36, 89,  2,  0, 18, 15,239,
- 55,254,239,201,191, 57,175,186,172, 67,207,217,169,110, 23, 74,207,152,178,103,117, 71, 54,153, 76,134,206, 30,158,111,204,121,
-242, 41,231, 51,215, 42,145,248, 68,178,219,191,223, 73,177,245,220,204, 70,242,204,149, 91, 17,222, 58,230, 25,137,143,143, 71,
- 84, 84, 84,126, 86, 86, 22,148, 74,101,115, 27, 50,158,127,124,124, 60,171, 54,117,118,118, 30, 91, 95, 95,223, 63, 52, 52, 20,
- 82,169, 20, 41, 41, 41,120,238,185,231,244,157,185, 70,131,245,235,215,163,160,160,  0, 39, 78,156,192,247,223,127, 15,165, 82,
- 25, 76,211,116,172, 37,155, 83,166, 76,113,232,253,180, 99,199, 14, 86, 67,115, 20, 69, 41,184,134,240, 13,109,219,242,253,166,
-208,112,126,117,117, 53,202,202,202, 76,126,238,239,239, 15, 91,  9,188,172,172, 12,101,101,101,118,  9,129, 51,167, 47,226,155,
- 13,219, 49,126,252, 88,132, 13,234,209, 92, 94,116,246,  6, 14, 28, 56,132, 31, 55,255, 76,178, 94,125, 21,215, 19, 19,225, 50,
-110, 28,148,191,252, 98,210, 78,230,248, 20, 10,  0, 46,109, 88, 67,  6, 87,236,198, 83,123,183, 67, 23, 18,  6,229,162,229,  0,
-  0,151, 85,203,225,118,177,  8,139, 75,197,232,251,244,130,123,245, 88,127,239, 57,181,116,126, 81,209,227, 90,157, 95,222,158,
- 95,112,230,244, 69, 68, 12, 29,107,243,253, 99,203,144,130, 97,184,223, 82, 52, 64,196,213, 99,119, 52,209,218,139,172,172, 44,
-187,190,159,156, 41, 35,232, 14,100, 38,232, 59,174,204,130,228, 22, 97,126,189,199, 95, 77,140, 35,  1,108,201,186,162,162,162,
-  5, 57,219, 66,214,108,193,136, 14,153, 76, 70,172,229,131,182,228,217, 48, 96,194,255,230,236, 17, 66,200,237,115,175,160,123,
- 83,232,191, 89, 49,235,  8, 84,106, 64,211, 84,166,209, 18, 16,129,254,253,217, 51,  5,204, 42,  1,147,112,119,175, 86,212, 43,
-  5,240,241,246, 68,213,221,  6, 84, 85, 87,225,200,241,155,184,113,139, 64,220,169,  1, 61,130,235,160,108,184,141,190,131, 53,
-232, 29,218,136,239,191, 40,192,238,221,187, 35,239,227, 45, 39,144,201,100, 81, 51, 95, 72,238, 86,230,225,133, 18, 45,224, 18,
- 53, 25,  2,175, 46, 62, 50,153,108,178, 92, 46,255,201,128,172,157, 96, 48,238,109,174,223,151,201,100,209, 73,115, 95,232,246,
-135,192,  3, 87,235, 52,240,140,136,130,200,221,203,216, 30,192,110,  2, 91,204,180,233, 51,186, 17,161, 51,170,235, 27, 49,112,
-216, 24,184,117,246, 48,101,171, 93,192,120,255, 20, 69, 97,219,182,109, 36, 62, 62, 30,219,183,111,135,139,139, 75,100,106,106,
-170,130, 11,249,  3,112,174,170,170,122, 90,163,209,  8, 92, 93, 93, 49, 97,194,  4,172, 90,181, 10, 78, 78, 78,144,201,100,216,
-176, 97,  3, 10, 10, 10,112,228,200, 17,252,252,243,207, 56,123,246, 44,124,124,124,124,180, 90,237, 67,176, 50,  4,146,156,156,
- 76,172, 13,  1,124,241,197, 23,172,206,179, 45,135,  0,182,110,221,234,144, 33,  0, 15, 15, 15,105, 89, 89,153,194,220,103,246,
-182,187, 45, 66, 64, 90, 82, 66,238,172, 92,137, 15,  0,224,240, 97,220,157, 25,135,213, 67, 66,154, 67,246, 97,  3,  6, 96,214,
-236, 41,232, 93,121, 27,215, 19, 19,209,101,201, 18, 40,130,130,168,193,191,252, 98,241, 57, 17, 75, 31, 70, 72,108, 36, 22, 47,
-121, 23,255, 66, 17, 86,143,158,132,129, 35, 70, 33,248,110, 41,214,123, 14, 69,169,199, 45, 12,146, 72,136, 74,165, 98,213,190,
-210, 73, 67,240,212,211,241, 56,250,235, 89,236,206,253,  9,111,  2, 88,189,106, 29,194,  6, 12,192, 83, 79,199,163, 65,121,  7,
- 18, 14,246,140, 97,239, 28,  0, 78, 17,128,  7,  9,114,185,156,114,196,172,117,134,220,179,150, 94,  6,132, 98, 36, 79,238, 13,
-120,246, 70,102,211,130, 37,182, 99,255,142,134,225,181, 49,147,254, 12, 61,127, 99, 48,115,  3,204, 77,  6,180,101, 39,194,141,
-139, 58,153,141,  8,184,215,164,224,138,154,224,230,109, 26,128,  0,110,174,250, 16,167, 70, 75,160,106,  4, 84,106, 64,213,  8,
-168, 53,128, 74,  9,168, 27,239, 69, 73, 76,  9, 10, 55,237, 43,228,198,181,  0,244,234,227,  6,226, 36,194,109,165, 18,138,125,
-215,113,174,248,  6,238,222,173, 67,216, 48, 29,234, 85, 90,168, 26,117, 80, 54,208,184,121, 13, 80,214,  3, 91,182,108, 81,112,
-217,  0,195,206, 54,161,133,158,158,111, 60,243,234,171,146,239, 13, 40,196,235,213, 52,183,187, 75, 23,189, 14,224, 39,  3,178,
- 86,179, 48, 73, 68,110,158,111, 60,247,242, 82,201,174, 27,186,230,194,158,143, 47,117,187,250,229,171,134,246, 88, 69,  1, 92,
-221,220, 95,127,233,149, 69,146,146,178,123,187, 69, 38, 60,145,236,246, 93,230,106, 83,182, 56, 61,107,166,238, 37,142,207, 26,
- 97,188,127,137, 68, 34,141,138,138,202,103,150,140, 42,149, 74, 69, 65, 65,  1, 21, 31, 31,207,214,150, 22, 64, 48,  0, 58, 60,
- 60,156,150, 72, 36,130, 13, 27, 54,224,217,103,159,197,251,239,191, 15, 66,  8,126,253,245, 87,236,219,183, 15,103,206,156, 65,
-117,117, 53,250,246,237,139,154,154, 26, 87,129, 64,224,107,205,248,180,105,211,204,138,100,102,104, 96,202,148, 41,156,194,244,
- 29,117,  8,192, 82, 20,192, 30,239,223, 94, 33, 80, 89, 85,213,252,222, 55,109, 30,  6,166,205,199,120,163, 99, 46, 63,250, 28,
-122,238, 63,142,146, 69, 47,224, 87,127,127,184,  0, 56, 35,151, 83, 48,177, 44, 78,169, 84,146,158, 61, 59,227,234, 53, 32, 44,
- 34, 20, 88,249, 26, 94,254,114, 11,230,  6,157,198,144,198, 98, 44,190, 37,198, 59, 27,151,225,253,244,207,113,230,236, 65,244,
-234, 25, 70, 92, 92,204, 71,125, 13,237,121,119,113,197,163,113,163,240,104,220, 40,188, 69,127,  4,117,227, 82,156, 60,  9,156,
- 60,  9, 28, 56, 16,143,127,175,185,136,184,184, 88, 18, 16,240, 16,130,130,190,225,196, 79,121, 15,191,134,146,131, 34, 43,125,
-247,231,127, 13,  1, 32,147,201, 72, 82, 82,146,148, 25, 51, 52, 22,  1,134, 29, 18, 51, 30,111,235,124,  0,134,244,163,163,163,
- 41,253, 48,128, 24,153, 27,239,239,245, 50,179,254,163,162,162,168,188,188, 60, 98, 45, 26, 98,109,217,161, 37, 66,231, 58, 28,
-240,244,171,245,240,239, 38,192, 19,  9, 98,168, 26,  1, 15,119, 10,  2,170,201,235,  7,129,170,  1,168, 87, 19,212, 43,  9,234,
- 85,  4, 52,  1,  4, 22,230, 92, 63,189,176, 30,131,134,148,194,175,255, 93,236,217, 85,129,187,119, 85,  8, 31, 83,131,193,222,
-117,128, 83, 35, 84, 13, 52, 42,110, 16,212,215, 83,208,106, 41,120,251, 80,  0,117,223,231,178,133, 13, 29, 50,100,184, 87, 64,
-  0, 14,233, 12,196,203, 19, 79,226,110,106,202, 48,153, 76, 54, 64, 46,151,159,227,112, 63,135,142, 24, 55,113,120, 23,255,  0,
- 28, 63,218, 60, 71, 14, 93,165,255,135,171, 95, 44, 53,101,207,210, 86,216,  3,198,141, 27, 63,220,223,191, 39,206,157,184,220,
- 92, 62,238,145, 41,248,159,124, 21,231,115,107,  3, 52,159, 59,243,252, 50,195,  0, 12,182,111,223,222,106,254,145,137,185,  0,
- 76,163,  7,  3, 56,181,100,201,146,177, 34,145,200,237,235,175,191,198,186,117,235,240,204, 51,207, 96,197,138, 21,160, 40, 10,
- 87,174, 92,129, 82,169, 68,106,106, 42,180, 90, 45,230,205,155, 71, 83, 20,101,245,  1,112,228,108,250,142, 62,  4, 96, 41, 10,
-224,  8,239,223, 86,108,216,176,  1,127, 75,158,133,234,170, 70, 32,125, 45,234, 15, 28, 71,167,241,195,155, 63,175, 72, 95,139,
- 34,103,103, 80,255,120, 30,  3,103, 63,138,195,235,119, 97,240,224, 17,102,237, 93,186, 84,136, 49,227, 98, 81, 88,228,133,181,
-159,101, 97,252,248,177,120,231,211,101,120, 43,106, 14,190,  5,208,255,169,103,177,246,179, 44,136,197, 94,152, 58,109, 56,190,
-230, 96,239,227, 15, 54, 97, 68,252, 32,188, 59,104, 21, 10,167,184,193, 43,225,199, 22,199,250,184, 74,112, 52, 95,129,128,191,
-205,229, 92, 15,  7, 15,138,176,114,165,139, 21,  1,247, 23,138,  0, 24,143, 35,155, 35,248,166,227, 88, 35,179, 64, 63, 67, 93,
- 79,252,151,144,245,201,101,232, 87,  1,180, 20,  5,108,134,  1, 28, 29,214,207,203,203, 35,134,222, 63, 19, 17, 48,252, 63, 41,
- 41,  9, 76,178, 28,115,137, 33,184,144, 63,179, 10,192,156, 61,173, 14,168,111, 32,104, 84,235, 39,251, 53,170,  9, 68,206,247,
- 62, 83, 53,  0, 74, 13,193,157,187,  4,127, 84, 18,156, 56,167,  5, 77,  3, 73, 73, 73,210, 75,151, 46,181,106, 27,173, 22, 40,
-187,174,198,245,146, 74, 28, 60, 92,  9, 66, 40,156,251,141, 70,252, 19, 90,136, 69,  4,127,220,  2, 14,254,  4,212,212, 16, 16,
- 26,120,120, 18,  5,137,  4,136,141,157,138,171, 87,175,178,186,166,236,245, 50, 50,109,174,237,171, 68,  4,110,157, 95,125, 97,
- 69,134, 83, 14, 17,180, 96, 98, 31,103,103, 56,253, 99,161,211,149, 53, 31, 45,  3,240, 36, 91,123, 66, 23,183,101,243, 95, 95,
-225,244, 83, 25,105, 97,175, 75, 39,103, 12,156,253,162,211,185, 77,159, 24,219, 51, 27,  1,144,184,116, 90,182,244,141,229, 78,
-151,111, 86,183, 56,160,179,123, 39, 76,127,226, 25,167,156,255,126,197,233,220,218, 42,106,103,170, 44, 34, 34,130,156, 56,113,
-  2,219,182,109,107,245,157,132,132,  4,147, 77,  1,160, 16,192,169,213,171, 87, 15,241,244,244,116, 99,194,224, 95,125,245, 21,
-158,125,246, 89,172, 91,183,174,217,139, 95,189,122, 53,170,170,170, 80, 83, 83, 83,215,208,208, 80,218, 20, 65, 16, 91, 58,215,
- 23, 94,120,129, 24,135,232, 25,239,159,109,248,255, 65, 25,  2, 48, 21,  5,112,180,247,207,216,100, 59,  4,112,110,204, 24, 80,
- 47,204,134, 39,  0, 50,105, 24, 26, 78, 20,162, 62,125,237,189,122, 75,158,133,190, 79,205,130, 68,162,191,254,162,162, 98,139,
-132, 93, 84, 84, 12,  0,136,141,211,139,136,130,227,103,240,237, 55,223,193,117,212, 72, 52,104,180, 80, 67,141,  9, 19,135,182,
- 56,158,173,189,235, 58, 53,158,232,246, 34,232, 19,141, 72,250,215, 36,136, 31, 59,130,  1, 97,  3, 16, 54, 48,184,249,252, 82,
- 23,175, 65, 80,144,144,245,125,243,200,255, 61, 18,117, 14,231,246,224,127,223, 80,214,166,  0,124,254, 57,218, 38, 17, 80, 71,
- 68, 65, 65,129,213,217,228,121,121,121,145,172,151, 20, 58,119, 66, 86,239,253,128,182,128,160, 79, 39, 36,167,247, 65,102,126,
- 60,  5,100,146,123,130, 32,218,230, 97,  0,227,165,128,230,150,  6,154,235, 44,101, 50, 89, 51,249, 27, 79,  0,100, 66,234, 76,
-153,165,  8,128,161, 61, 71,117,230, 59,119,238,140,188, 81,190, 75, 65,119,165, 33, 16,  1, 78,  2,253,253,173,161,  9,180, 90,
-160,182,150, 64,173,  1,180, 26,189, 40,152, 58, 77, 31,189,185,116,233,146, 89,123,141,183,119, 42,194,194,104, 28,216,167,  3,
- 37,  0,254,184, 73, 65,226,  2,236,219, 13,168,149, 20, 40,  2, 12,142,112, 66,217, 53, 26, 19, 39, 78, 65, 92, 92, 28,197, 38,
- 19, 86,246,122, 25, 89,249, 34,176,228, 83,219, 69,  0,161,117, 49,186, 46, 62,130, 93,244, 61, 22,234,  6,192,143,  2,148,195,
-134,137, 46,107,117, 49,156,236, 17, 58,  6,238,222,  2,197, 77, 93,179,189,174, 18,192, 71, 66,193,117,208, 48, 81,209,119,116,
-140, 57, 47,218,148,173, 78,238,158,130,171,183,170,154,136,  5,112,119,113,134,187,171, 24, 17,225, 67, 69, 91,190, 37, 49,237,
-252,232,154,172,115,102,214,127,124,124,124,243, 61,202, 68,239,102,206,156,105,201,  3,173,  3,112,249,228,201,147,117,227,199,
-143,239, 10,131, 53,253, 95,125,245, 85, 51,201,106, 52, 26,232,116, 58, 92,186,116,  9, 93,187,118,189, 77,211, 52, 43,181, 56,
-109,218, 52,179, 67,  0, 92,136,246, 65, 24,  2, 48, 21,  5,112,164,247,207,133,248, 25,116,247,247,196, 23, 95,236, 69, 98,194,
- 24,116, 27, 22,  6, 12, 11,  3,245,194,236,150,162, 23,192,173,155, 74,108,221,118, 24,221,253, 61,217,219,243,115,193,176,225,
-125, 49,108,120,223, 86,199,113,181, 55, 97, 70, 40,210, 38,126,  2,186, 80, 79,254,207, 45,126,218, 38,123,198,120,213,253,213,
- 61,239,215,190, 31, 93,142,242, 54,123, 32,237, 18,  0,  5,  5,  5,247, 61,107, 31,227,229, 50, 68, 23, 21, 21, 69,153, 32,127,
-194,132, 21,147,146,146,108,250, 29,195, 85,  0, 76, 25, 87,207,223,120,  2, 96, 19,154,203, 82, 82, 82, 20, 73, 73, 73,172, 31,
- 50, 67,242, 55, 53, 39,128,171, 61,107, 88,185, 89,  5,107,246,226,226,226,242,151,165,110,197, 35,163,157, 64,  3,208,168,105,
- 56,139,245,213, 84, 91, 79,208,168, 33,208,234,128,130, 66, 29,116, 52,129,181, 37,123,113,113,113,249,111,188,182, 21, 19, 35,
-133,152, 62, 71,136,186, 90,130,218,106,160,190,150, 66,159,190,  4, 58, 13,  5,145, 64,130,170,187, 52,202,126, 87, 99,209,203,
-236, 38,140,101,175,151,145,143, 22,  2, 33,  1,192,154, 87,128,  5, 31,216, 38,  2, 72, 67,253,140,127, 12, 27,186,211, 47,103,
-167,155,215,184,135,209, 13, 64, 55, 10,208, 29, 58,136,188,167,159,172,211, 52,212, 79,231, 98,143, 86, 53, 76,127, 33,106,248,
-174,208,183,178,221,124,  7,143,133,143, 51,133,174, 18, 10,202,243,191, 96,235,107,115,235, 52,202,  6,214,246, 26, 85,202,233,
-113,143,140,223,149,146,254,153,219,128, 33,195,224,238, 42,134,187,139, 51, 74,206,157,194, 27,169, 47,213, 41, 57,216,178,197,
-147,103,115,185,166,200,127,249,242,229,173,194,252, 63,252,240,131, 34, 33, 33,  1,102,146,  4, 49, 68,175,  6,112,170, 95,191,
-126, 37, 42,149,170,135, 80, 40,148,184,186,234,151, 98,109,222,188, 25, 51,103,206,132, 82,169,132, 74,165, 66, 99, 99, 35,220,
-220,220, 84, 58,157, 46,135, 16,114,147,205,201, 58,106, 53,192,131, 50,  4, 96, 24,  5, 96,222,183,  7,241, 51,232,211,199, 15,
-175,166, 37, 99,247,174, 95,145,189,229,  4,156,197,157,241,123,217,189, 17,172,158,254,  3,208,168,174, 65,196,176,254,248,240,
-163,100,188,159,254, 57, 39,123,190,190, 30, 40, 58, 87,212,252,121,216,128, 48, 84, 84, 84,115,178, 55,101,225,116,204, 20, 60,
-137,198,194, 58,140, 94, 48, 16,244, 96,  9,190,248,226,251,230,243,171,174,174,198,216,135, 67, 89,217, 51, 70, 84,102, 20,245,
- 51,126,110, 83, 62,181, 89,  0,180,  5,249,179,177, 25, 21, 21, 69,101,101,101,145, 38,111, 23, 89, 89, 89,196,112, 89,162,177,
-215,111, 74, 32,180,142,195, 82,128, 88,  0,184,  8,  1, 55, 17,208, 88,139,172,247,157,  0,151,163, 36,249,177, 62,128,139, 55,
- 50,191,225,238,245, 91,154,237,207,144, 53,219, 53,236,198,228,111, 60, 39,128,171, 61,182,228,207,198,222,123, 25,107,169, 87,
- 22,206, 35, 18,  9, 64,211,192,160,126,194,123,237,113, 86,  7,141,142, 64, 71, 11, 49, 99,198, 12, 86,226,228,237,119,215, 82,
-139, 22,205, 35, 90, 45,160,214, 16,232,180,128,128,  2, 34,167,  0,181, 85, 20,126, 59,173,132, 82, 37, 64, 98,194, 12,214, 97,
-255,229,207,  1,193, 61,245,255,  7,245,  0,108,141,  4,200,229,242, 35, 50,153, 44,246,230,212,184, 93,  1, 91,119,186,  5,140,
-123, 24,154, 67,  7,241, 99, 66, 92,157,186,182, 54, 86, 46,151, 31,228,104,239,160, 76, 38,139, 61,255,230,180, 93,254,255,202,
-113,235, 49, 98, 28,234,207, 31,194,198,127, 76,173,107,108,224,102,143,177,181, 58,237,239,187,222,249,248, 75,183,209, 99,198,
-162,184,232, 20, 94, 74,126,178,174,161,174,142,243,185,181, 53,204, 37,251,145,201,100, 36, 62, 62,158,205,106,  0,161,167,167,
-231, 41,165, 82,249,109,105,105,105,239, 33, 67,134,  4,106,181, 90,145,147,147, 19,114,114,114, 16, 29, 29, 13,149, 74,133,134,
-134,  6, 92,186,116,169,198,203,203,107,175, 82,169,252,154,166,233,122,176,204,  0,200, 36,  5, 98, 66,236, 92, 66,255, 15,218,
- 16,128, 97, 20,192, 17,237,107, 75,238,  0, 83,120, 52,118, 20, 30,141, 29,213,244,159,253, 26,182,165,189,105,246,137, 59,207,
- 31,208,120,186, 14, 79,127, 54,  5,239,236, 93,102,247,185, 41,159, 81, 18, 47,173, 23, 84,223,168,238,139, 99,109,147,  0,104,
- 15,207,223,216,251, 48, 12, 99,155, 11,245, 59,242, 28,185,140,253, 59,154,252, 13,196,142, 97, 34, 32, 70,  4, 41,154, 34, 29,
-156,236, 89,155, 11,192,213,222,  7, 31,175,165,100, 50, 25, 17,  8,128,131,  5,250,177,126,102,194,159,126,220,127,  6, 39,123,
-171, 86,173,165,230,205,111,202, 73, 33,208,219, 56,186, 31,168,175,163, 65,104, 32, 49,113, 10, 98, 98, 98,172,182, 71,246,122,
- 25, 73,125, 18,240,116,  3,202,110,  3, 46,206,  0, 77,128, 78, 18, 32, 93,  6,164,201,109, 18,  1,  7,101, 50, 89,108, 65, 98,
-220, 46,143,229,111,187,229, 47,127,163,174,209,  6,242, 55,182,151,191,100,234, 46,151,127,188,233,150,251,239,183, 56,147,191,
-161,173, 23, 95,124, 49,238,141,127,190,176,115, 65, 74,170,219,103, 31,102, 48,228,127,218,196,179,175,229, 98,219,218,208, 17,
-215,231,205, 20,249,207,155, 55,143, 48, 43,  1,182,109,219, 70, 40,138,178, 36,  4,220,212,106,117,157, 64, 32,200,243,247,247,
-239, 89, 91, 91,251,226,241,227,199,187, 15, 29, 58,148,214,106,181, 13,213,213,213,183, 78,159, 62,125,165, 79,159, 62, 37, 93,
-186,116, 41, 85, 42,149,155,181, 90,237, 45, 66,  8,107,  1,192, 36,  5, 50,136, 10,216,210,190,210, 54,236, 11, 29,110,219, 81,
-227,254,246,218, 81, 41,133, 14, 61,222,209,246,170, 42,  5,200,208,202, 16,120,216, 15,179, 63,181, 46, 76,170, 42,  5,120, 40,
-192,242, 49,247,147,252,205, 10,  0,107,107,253,185, 62,232,108,115,  7,112,177, 43,151,203, 41,115,155,237,112, 33,175,204,100,
-185, 62,204,127, 17,192, 69,227, 79,171,155,254, 46,195,134,235, 85, 56,138, 92, 13,235, 69, 38,147, 17, 38,207, 64, 74, 74,138,
- 77, 43, 28,140,237,109, 92,212,169, 89, 20,216, 35,154,140,219,132,153,240,103,107, 84, 98,237,231, 45,237,213,213,232, 59,224,
-196,196, 68,110,247,223,183, 14,125,102, 52,134,164,189,111,249,155, 27, 26,107,107,159,182,215,187,102,236,253,244,217, 91, 27,
- 84, 13,181,115,229,114,249, 33, 91,109,125,250,233,167,  7,100, 50, 89,236,103, 31,173,220, 80, 87, 87,103,238,220,180,184,255,
-104,209,163, 26,147,127, 94, 94, 94, 36, 33,  4,219,183,111, 55, 60,198,146,189,107,106,181,218,153, 16, 82, 75,211,180, 92,173,
- 86,255, 26, 16, 16,224, 83, 85, 85, 69,189,254,250,235, 53,213,213,213,119,122,244,232, 81, 91, 87, 87, 87,175, 86,171,107, 52,
- 26, 77,163, 78,167, 83,114, 57, 97,  7, 13,  3,228,183, 97,157,230,227, 79,138,126,253,  6, 83,111,190,150, 73,102, 61, 30,141,
-176,129,125,204, 30, 87, 84,120, 25,155,190,219,131,126,253,  6, 83,247,211,222,144, 33, 67,168,212, 69,114, 50,235,241,104,203,
- 14,243,241, 82,108,250,110, 15,134, 12, 25, 98,245, 94,186,159,228,111, 82,  0, 56,218,179,111,203, 72, 65, 84, 84, 84, 62,171,
- 16,191, 21, 56,114, 86,255,253,136,140,112,217,244,199, 17,209,  0,174,109, 98,184,172,203,222, 33,  9, 99,123, 92,201,223,158,
- 25,255,108, 72, 27, 64, 80, 71,180,231,232,115,115,208,189, 77,  1,  0, 69, 81, 68, 32, 16,128,249, 99, 66,216, 83,166, 76, 65,
-108,108, 44,104,154,  6, 77,211, 32,132, 88,251, 61, 74,171,213,186, 18, 66,116, 52, 77, 55,106, 52,154,253, 66,161,144, 18,  8,
-  4,206,  0,156,105,154,134, 78,167, 19,106,181, 90,177, 86,171,237,174,211,233,206, 27,124,183,205, 55,  1,226,225, 24, 17,112,
-165, 84, 69,118,239,220,130,107, 21, 53,240,243,106,104,254,236,102,165, 43,  2,124, 59,163,127,255,254, 86,201,186,173,236, 13,
- 25, 50,132,186, 89,214, 72,214,124,180,  3,197,191,223,110,101, 47,184,167, 15,  2,  3,  3, 89,145,127, 91,193, 82,142, 20, 42,
- 60, 60,156,223, 30,147,  7, 15, 30, 15, 42, 26, 12,  8,157, 54,112,108, 68,  6,229,229,  0, 60,160,159, 52,206, 19, 63, 15, 30,
-230, 34,  0, 60,120,240,224,241,  0, 65,210, 36,  2,104,  3,226, 23,224,222, 16,135,  8, 64,247,166,247, 52, 95, 93, 60,120,240,
-  2,128,  7, 15, 30,127, 14,  8,  0,184, 25,252,207, 16,191,216,128,244,233,166,227,120,239,159,  7, 15, 94,  0,240,224,193,227,
- 47,210,167,241,164,207,131,135,  5,245,204,131,  7, 15, 30, 60,120,240,248, 43,171,229,249,243,231, 27,110,164, 67, 12,103,216,
-203,100, 50, 98,180,209,206,181,168,168,168,230, 85,141,166, 82,177, 26,218,227,138, 63,163, 61,227,101,139,134,245,201,215, 31,
-223, 30, 29,221, 94,122,122,122,243, 49,105,105,105,148, 13,246,  0, 51,233,128,249,251,217,186, 77,254,249,229,237,113,177,199,
- 89,  0,112, 68, 87, 54,  7, 49,187,247, 57, 74,177, 24, 39, 35, 49,181, 27,160,169, 99,218, 67, 93, 49,  4,147,148,148, 36,101,
-136,134,201,  0,102, 41, 39,248,253,196,246,237,219, 35,183,109,219,214, 76,130, 83,166, 76,145, 38, 38, 38,230,255, 25,213,174,
-169,246, 56,127, 94,191, 50, 44, 52, 52,180, 93,207, 77, 38,147,145,169,211,100,200,201,150,155,188,103,119,238, 58, 65,114,178,
-229, 22,239,229,157,187, 78, 88,236,  4,226, 98, 35,108,190,233,210,211,211, 73, 66, 66, 80,139,255,173,137,  0,107,168,173,171,
-141,220,250,211, 86,  4,134,  5, 42, 64,  1,231, 79,158,147,142,  9, 31,139,208,126,161,156,238,191, 67,135, 14,181,186,238,177,
- 99,199, 82,224,193,131, 71,155,  9,  0, 49,219,  3, 71,143, 30,205,217,184,169,205, 98, 24,152, 34, 81,227,141, 54,216, 18,173,
- 45, 27,227,176, 17, 20,140,221,212,212, 84,100,100,100, 40,204,237, 45,206, 28,103,105,173,166,241, 57,246,232,211, 11,  0,112,
- 75,165,130, 86,217,168, 47,172,170,  1,160,223,251,128, 75,110,  4, 67,242,  7,244,185,197,185,172,181,151,201,100, 68, 64,233,
-179,235, 49,175,128,136, 87,212,158,  0,  0, 14,255, 73, 68, 65, 84,229,247,159,175,189,255,130,204,184, 61, 24,226,183,181, 61,
- 28, 41, 42, 25,242,143,139,141, 80,  1, 50, 73, 78,182,220,230,223, 96,  4,132,105,  1, 32,183,235, 60,213,234, 84,228,230, 38,
- 35, 38, 38, 19,  9,  9, 25,205, 17,  1, 91,132,192,193,162,131,228,161,161,189,240,161,124, 21,188, 92,189, 64,107,117, 80,145,
- 70,197,238, 95,127,138,217,187,239,103, 50, 54,112,156, 84, 34,145, 88, 21,  2,135, 14, 29, 34, 77,145,133, 86, 30, 17, 47,  2,
-120,252,149,113,234,212,169, 22,255,155,234,211,236, 17,  0,156,230, 15,152,218,197,206, 17, 32, 64,164,221, 54,  8,123, 13,192,
-198,115,151,201,100, 36, 53, 53, 21, 43, 86,172,  0,128,230, 87, 83,199, 89,219, 33,172, 21, 60, 59,227, 76,233,119,112, 65, 79,
-232,240, 11, 42,254,115,  2,167, 75,238, 96,198,138,117,237,118,163,157, 57, 91,136,193,131,  6,130, 38, 64, 97,161,254, 61,112,
-239,189, 97, 57,205,178,170, 13,115,176, 91, 66,102,102, 38,197,182, 61,230,206,157, 11,  0,205,175, 38,201,159,162,  0, 11,247,
-131, 76, 38, 35,143, 60,178, 11, 50, 89,172, 67, 69, 64, 92,108, 68, 67,114,114,178, 43,144,137,156,108,110,196,110,232,225,219,
- 75,242,230,188,127,  0,152, 57,115, 51,114,115,245,175,201,201, 37, 96, 34,  2, 92,162,  1,132,144, 72,197,133,189,138, 23,255,
- 49, 31,195,187, 14,133,139,135,  7,136, 90, 11,154,232, 32, 20,137, 17, 28, 21,156,251,219,176, 11, 88,145,153,161, 24,229, 51,
- 90,234,234,234,106, 85,  4,220,190,125,187,197,255, 83,198,119,194,168,133,191,224,241, 12, 85,139,134,156, 52,105,146,205,237,
-149,157,157, 77,166, 77,155,230,176,246,118,180,189, 54, 38,146, 72,123,211,250,158, 58,117, 42,178,137,132,108,181, 51,248,149,
- 87, 94, 41,175,175,175, 15,  0, 48, 25,250, 77, 56, 67,  1,156,130,126, 83, 40,  0,216, 40,151,203,127,227,169,191, 53,249, 51,
-101,198, 34,160,133,  0, 40, 45, 45, 37,165,165,165,  0,128,192,192, 64, 24,110, 54,  3,160,197,255,166, 62, 55,135,138,138, 10,
- 69, 86, 86, 22,235, 72,128,241, 94,247,150, 72,152,106, 74,133,105, 76,162, 92, 67,236,153,153,153, 86,143,201,203,203, 99, 69,
-254, 73, 73, 73,102, 73,127,233,210,165,200,200,200,128,161, 64, 96,131, 30,125,122,225, 70,101, 53,126,156, 55, 19, 93,168,113,
- 40,249, 98, 17,  2,167,  7, 98, 79, 59,147, 63,128,102,194,  7,128,129,  3,  7,182, 40,103, 34,  3,134,229,142,246,236, 45, 17,
- 49,211, 30,230, 72,127,253,250,245,200,200,200, 64,236,184,161,216,245,203, 73,192,189, 19, 80, 83,119,223,235,112,231,174, 19,
-174, 64, 38,118,238, 58,225, 16,123,211,106,150, 89,124, 54,179, 59,191,199,234,  1, 49, 12,253, 39, 39,231, 34, 33, 33,168,249,
-149, 65, 66, 66, 16,107, 17,240,197,255,190,192,251,159,190,139,241,125, 35,161,107,108,132, 86,167,  5, 37,162,  0,  8, 65, 64,
-227,214, 31,101,  8,237,218, 31,203,230, 45,195,187, 43,223, 85, 60, 50,208,122, 52,203,184,179,155,226,191,222, 36,225,239,221,
-187,151,216, 34,  2,178,179,179,201,206,215,119, 33,238, 29, 56,132,180,179,179,179,201,202,149, 43,177,100,201,146, 14, 45,  2,
- 78,157, 58, 21, 89, 93, 93,173, 40, 43, 43, 67,120,120,184, 93,231, 89, 93, 93,173,184,215,101,219,244,156,151,  2,152, 11,224,
- 36,128,175,  1, 68,  3,120, 20,192,223, 13,  4,192,237, 63, 41,159, 83,176,176, 13,184, 69, 71, 42, 85,207, 49,153, 25, 75, 77,
-126,222, 66,  0,  4,  6,  6, 82,129,129,129,205,100,111, 24, 74,206,202,202,106,241,191,241,231,151, 46, 93, 50,123,130,140,168,
- 72, 73, 73, 81,164,166,166,194,120,163, 28,227,205,115,178,178,178,204,134, 96, 77,117,246,198,101,237,185, 81, 17,  0,108,218,
-180,201, 44,241,  3,104, 65,254, 75,151, 46,101,101,243,247,210,107,168,223,242,  6,220,158,253, 24, 61,250,244, 66,183, 46, 46,
- 40,221, 82,170, 39,127,207,206,250, 33,  0, 39, 33,231,115, 77, 72, 72,144, 26, 14,  3, 36, 36, 36,112,142,210,208,  4,  8,232,
-  4,252,251, 73,224,249,245, 64, 87, 87,224,124,149,233,242,162, 74,142,119,190, 25, 33,199, 37,106,243,246,219,111,155, 37,126,
-  0, 88, 57, 55, 30,107,118, 31,129, 95, 96,119,220,188,122,203,170,247, 15,  0,108,162,  0, 92,194,248,122, 15, 95,102,210,211,
-103,198,246,185,222,215, 43,255,107,190,142, 66,230,193,134,123, 37,168,197,171, 58, 33, 24,226,109,197,172,191,223,160,108,192,
-184,217, 99, 21,163,187,143, 66, 99,125, 61, 68,206,206, 16,137,238,117, 65,165,197,197,216,154,147,115,227,217,103,230,246,232,
-237, 28,128,161, 19,195,163,126,205,253, 53,114,212,240, 81,156,188,198,244,157,115,177,111,223, 62, 60,246, 88,203,242, 73,147,
- 38, 81, 92, 69,  0, 67,254,232,253, 33,118,190,254,178,221, 34, 32, 59, 59,155,124,244,209, 71,  8,  9,  9,193,154, 53,107,176,
- 96,193,130, 14, 39,  2, 12,137,223, 81,246, 24, 91,118, 68, 19,164,  0, 38,  2, 88, 79,  8,169,163, 40,202, 15,192,  5,  0, 87,
-229,114,185, 22,127,110, 16,142,245,221,130,252,153,247,153, 25, 75, 91, 69,  1,238, 75, 30,128,172,172, 44,102,236, 21,165,165,
-165,240,245,245,109, 37, 16,152,178,138,138, 10, 86,121,238,173, 77,  6,228,210, 97,206,154, 53,171,237,164,155,  1,129,153,242,
-250, 51, 50, 50, 32,151,203, 41,107,179, 56,149,184,134,186,233,163, 64,220, 23,  1, 81,175,163, 14,255,  3,254,163,247, 22, 73,
-214, 34, 56,253,109, 13,180, 90,238,137,206,226,227,227,243, 89,108,187,106, 57,194,243, 21,240,214, 90,160, 87, 79,224,214,118,
- 49, 54,124,169,198,220,239,204,151,115,186,243,137, 99, 51, 85, 27, 78,246, 43,207, 94,  1,247, 48,  9,220,250,254, 19,155, 86,
- 60,143, 33,  3,253,208, 47,254, 93, 86,237,193,230,254,100, 59, 84,192,220,187,134,228, 47,151,203, 41,102,226,159, 77, 68,211,
-249, 61,202, 22,146, 55,  5,117, 66,176,201,242, 92,163, 72,128, 53,148, 87,148, 99,114,210,100,184,119,246,130,142,210,226,192,
-190,253,168,173,171, 67, 66, 98, 34,254,168,168,192, 15,155,127,196,115,207,204,237,225, 44,113,134,128, 56, 33, 38, 34, 38,239,
-130, 98,141, 77, 94, 99,101,101,165,221,215,109, 72,254,  0,236, 22,  1,217,217,217,100,249,242,229,  8, 14,214,215,103, 80, 80,
- 16, 58, 82, 36,192,209,196,111,194,251,103,222,219,114,173,  3,154,136,208,137,162, 40, 87,  0, 97,  0,206,  1,232, 33,147,201,
-106,  0, 84,201,229,114, 62,173, 61, 71,220,183, 68, 64,190,190,190,210,164,164,164, 86, 67,  1, 71,142, 28, 81, 52,109,246,194,
-121,142,128,185,201,128,150, 60, 71,115,  2,165, 45,192,120,247,230,194,253,108,189,127,  0,216,253,234,114, 36,188,255,  1,180,
- 81,227, 32,  2,224,118,184, 24,123, 74,238,  0,  0,180, 81, 11,160, 57,235,  3,170,235,223, 57,147, 20,219, 40,139, 37,220,153,
-246, 63, 44,120,230, 58, 46,206, 91,130,250,159,213,240,243,177, 92,238,136,  8,128, 45,226, 96,253,250,245,122, 53,156, 48,  1,
- 71,202, 42,224, 62,196, 29, 55,114, 75,  0,137, 51,102, 46,248, 27,188,123,198,183,219,131,104,110,214,191,163,162, 90,150, 86,
-  8, 88, 91, 29,144,155,156,139,152,204, 24,204,220, 12, 36,231,234,223,231, 38,231,114,142,  2,212,169,106,225,227,210,  5, 90,
- 85,  3,136,128, 96,196,200,145,216,178,101,139,234,163, 15, 62,144,208,132, 96,206,147,115,224,221,197, 27, 13,117,117,208,234,
-180,112,119,234, 12,141, 64, 99,211,245, 86, 85, 85,181, 88, 29,192,117, 66, 96, 43,242,103, 96,163,  8,200,206,206, 38,169,169,
-169, 24, 57,114,100,139,242,129,  3,  7, 34, 61, 61, 29,105,105,105,237, 38,  2,218,138,248,141,189,127,  0, 40, 43, 43,179, 53,
- 10,240, 43,244,227,253, 53,208,135,254, 39,  3,184,  4, 96, 48,128, 28,  0,235,208,180, 83,167,165,238,  4, 54,134,210,255, 18,
-  2,192,152, 16,152, 61,231,217,124,110,105,214, 52,  3,102,120,129,153, 16,200,204, 13, 96,162,  3,129,129,129, 10,102,184,160,
-189, 58, 94, 71,194,218, 88, 63,227,253,179,177, 53, 99,237,102,144,196, 62,184, 53, 38,  2, 93, 48, 14, 46, 51,215, 64, 91,254,
-  7,224,217, 25,162, 59,255,195,246,143, 10,  0,161,144,243,181,219,178, 10,194, 24,167, 95,249, 63, 12, 15,  7,  2, 23, 20, 34,
-204,237, 25, 92,120, 40,  9,248,247, 18,179,229,237, 21,  1,200,200,200,192,248, 17,253, 16, 53, 46,  4,  9,131,150, 96,245, 71,
-159,227, 92,193, 13,204,155, 52, 28, 55,115,118,162,186,178,198, 33,247,131,169,161,  2,107,207,135, 37,111,223, 81,247,168, 57,
-251,150, 38, 14,166,165,165, 81,233,233,233,100,230,230,150,130,  0,  0, 98, 50, 99, 32,222, 86,140,109,219, 74,154, 87,  2, 48,
- 19,  6,189,189,189, 77,246,191, 52, 77, 67, 71,  3,132,214,194,217, 69,130, 39,159,122, 74,242,214,155,111,162, 91,183,110,116,
- 15, 63, 63,129,170,190, 14, 58,  2, 16, 90,  7,154,182, 30,209, 26, 59,118, 44,245,195, 15, 63,144, 59,119,238,160,166,166,166,
-133,112, 52, 92, 29,192,101, 85, 64,118,118, 54, 89,253,124, 17, 32,  9,  6,110,126,218,250,  0, 73, 48, 86, 63, 95,132,148,255,
-176, 19,  1,217,217,217,100,234,212,169,210,129,  3,  7, 42,238,220,185,211,234,243,128,128,  0, 76,157, 58, 85,250, 32, 77, 12,
-180,197,251,183, 39, 10, 32,151,203,243, 13,158,175,238,  0, 78,  3,152, 46,151,203,185,108,101,202,147,191, 37,  1, 96,148,232,
-199, 90, 34,160, 22,159, 91, 10,153, 38, 37, 37,153,140,  2, 48,100,239,235,235, 43, 77, 77, 77, 85, 48, 99,178, 73, 73, 73, 22,
-151,  1, 90,242, 14,185, 78,254,107,171,101,128,140,119,111,105, 50, 32, 23,148,252, 43, 25, 78, 51,215, 64, 89,118, 17,162,195,
-107,160,217,188,  0, 84,220, 42,108,253,251, 99,184,186,245, 50, 18, 86,126, 13,136,218, 39,179,243,146, 44, 32,119,229, 22,132,
- 93,141,  1,110,215, 99,113,244, 18,139,229,142,136,  0,216,234,253,231,108, 89, 14, 97,143,  1,112, 67,  8,174,237,203, 68, 45,
- 69,112,244,226,117, 68, 21,222, 96,217,238,215,154,255,159, 53, 75,222,130,236,  1,224,231,159, 99, 77, 30,103,233,249,176, 22,
-234,119,196,178, 67, 71,172, 16, 72,206,189, 71,252,  0, 90,121,254,204,132,193,109,219, 74, 76,126,223,221,197, 29,101,213,101,
- 24,217,123, 20,148,141, 42, 64,169,130, 86,173,193,178,212, 84, 80,  2,  8, 26,234,235, 64,211, 58,104,117,  4,206, 34, 39,252,
- 81,247,  7,156,116,214, 87, 27, 63,246,216, 99,205,117,115,232,208, 33,194,244, 55,134,171,  3,202,203,203, 89, 95,231,180,105,
-211,168,148,255,128,172,126,190,  8,161,125, 90,255,254,249,203,106,164,252, 39, 12,108,201,122,218,180,105, 84,118,118, 54, 25,
- 57,114, 36,  2,  2,  2, 90,125, 94, 88, 88,136,156,156, 28, 69,123,145,127,147, 55, 78,181,229,216,191, 33,236,136,  2, 48,152,
- 12,253,228,239, 70,158,194, 29, 40,  0,218, 10,140,231, 15,  0,163, 71,143,150,102,101,101, 41,152,208,191, 25,113, 32,189,116,
-233,146,130, 43,  9,219,218, 73, 58,122, 25,160,161,247,111,138,248, 25,161,195,229,124, 79,151,220,129,230,236, 91,184,133, 95,
-224, 23,183, 10,168,174, 65, 73,230, 34,  4,205,255, 16, 55,215, 45,  2,156, 68,128,160,125, 50, 59, 95,171,  7, 66,125,167,179,
- 46,111,143,  8, 64, 70, 70, 70,221,236,168, 81,229, 30,180, 87,175,  6, 56, 73, 54,127,184,  0,159,109, 63,133,197,143, 62,140,
-185, 31,252, 23,143,189,247, 77,187, 76, 30,101,  4,104, 83, 30,  0,202, 94,113,106, 79,168,223, 82, 20, 32,185,201,179, 55, 38,
-127, 67,239,223, 26,252,125,253,177,251, 64, 46,198,246, 26, 11,215, 78,110,160,105,  2,  1,209,130,166, 40, 16, 66,160, 35,128,
-150, 38,208,106,181, 80, 86,215, 99,199,177, 29, 16,235,196,156, 39,165, 26,175, 10, 72, 91, 48, 14, 83,252, 75,145,121,140,189,
- 13,115, 34,128, 43,249, 27,218, 75, 75, 75, 35, 43, 87,174, 68,247,238,221,239,  9,251,146, 18,100,100,100,160, 35,120,254,142,
- 22,  2,166,188,127,123,162,  0, 77,207, 68, 36,128,135,  0,188,246, 23,152,252,  7,  0, 66,  0,186,  7, 90,  0, 24,207,250, 79,
- 74, 74,106, 30,119, 55, 20,  7,134,239,237,241,224,109,233,200, 29,181, 12,208,156,247,111, 43,241, 51,152,177, 98, 29,126,  4,
-240,232,251, 83, 64,178, 22,129,154,181, 26,167, 75,238,128,242,246, 66,241,239, 53,122,239, 95, 40,108,151, 59,212,220,122,127,
-123,242,  0,176, 17, 92,108,197,193,250,245,235,213,  0,106,159,143, 28, 92,243,207, 85, 31,171, 95, 93,150,170,234,218,217,247,
- 78,209,185,107,221,230,158,251,175, 91,123,175, 26, 49, 71,206,134, 67, 52,220, 87, 20,152,250, 13,251, 34,  0,166,200,159,241,
-252,  1, 88,157, 16, 40,145, 72,168,115, 91,207, 39, 42,198,229,231, 36, 13,122, 12, 53,170, 26, 80,  2, 64,159, 82,132,134, 78,
- 71, 64,107,181,232,228,236,142, 67,213, 39,113,233,112, 49,162, 35,162,243,237,174,220,146, 23,  0,112, 95,  6,216, 66,  4,116,
-191,134,243,229,  1, 54,145,191,161,189, 37, 75,150,144, 53,107,214,192,211,211, 19,119,238,220,193,242,229,203,209,209,194,254,
-142, 16,  2,230,188,127, 91,162,  0, 50,153,172, 27,  0,191,166, 27,101, 40,128, 20,  0, 37,127, 17, 39, 93,215,150,198,239, 75,
- 30,  0,115, 17,129,213,171, 87, 75,141,133, 66, 82, 82,146,130,171, 61, 67, 34,232,  8, 41,118, 13,189,127,227,229,127,165,165,
-165, 45,234,141, 75,214, 62, 70,  4, 76,127,255, 43,144,205,128,207, 92, 57,242,255,249, 24, 30,206,216,  8, 56, 57,161,147, 68,
-220, 46,215,107,184,198,223,212,123, 27,243,  0,104,  1,  8,154,218, 86, 96,103,123,220,154, 29, 53,170,236,159,153,219,250, 44,
-123,110,114,103,127,191, 72, 53,128, 51, 73, 73, 73, 30,  0,220,108,109,143,123, 36, 29, 75, 30,121,100,151, 65,248,159,219,247,
- 45,121,240,134,233,129,217, 10,137,182, 72,  6,100, 14,198,164,207, 68,  4,204, 13,121, 60, 61,235,233,173,219,254,187, 13,186,
-217,218, 51, 19,123, 77, 28,220,197,189, 11, 84, 26, 21,  8, 33, 16,139,196,168, 82, 54,224,200,239, 63, 99,253,183, 27, 32, 29,
- 32,117, 72,226,176,244,157,115,177, 97,195,  6, 44, 90,196, 61,  7,192, 61, 17,  0,187,200,223,208,222,130,  5, 11,152, 60,  0,
-232,200, 99,254,134, 66,192,150,239,218,155, 59,192,240, 49,128,126,189,191, 10,192, 43,  0,142,201,229,114, 29,120,152,171,123,
-156, 58,117, 10,153, 25, 75, 91,229,  1,176,152,  8,168,173,242,  0,152,138,  8,152, 35,122, 91,162,  0,246,162,173,150,  1, 50,
- 98, 68, 46,151, 35, 47, 47,143, 46, 45, 45, 53, 36, 50,105, 84, 84, 20,103,239,102,198,138,117,128, 65,226,159,137,203,214, 54,
-191,175,111,135,155,173,173,188,103,138,162, 62,  2,112, 23,250,229, 63, 79,218,105,238,230,243,145,131, 27,163,243,126,237, 60,
-231,205,175, 33,151,203,197,121,121,121,221,209, 50,157,181, 77,237,209,214,145,  0,107,249,253,173,161, 45,134,  4,204,145,191,
- 58, 33, 24,216,102,221, 49,147, 14,158, 68,237,251,225,  0, 57, 28,112,  4,227, 70,141, 67, 15,247, 30,  0, 77,240,135,234, 14,
- 14,157, 56,132,155, 69, 55, 49, 41,116,146,212,217,217,185,221,219,195, 80,  4, 56,138,172,153, 72,192,131, 50,225,207,222, 44,
-128, 14,232, 99, 50,  1,100,130,  7,103,152, 75,  0,100, 82,  0,180, 21, 82, 82, 82, 76,146,189,225, 78,108, 70, 80,176, 89, 85,
-224, 40,175,191, 45,150,  1, 54,205,240,215,230,229,229,137,154,134, 14, 24,242,159, 20, 21, 21,197, 41,202,209,180,153,146,194,
-209,231,104,110,140,217,209,185,238, 57,194, 25,128, 72, 46,151,191,110, 16,  2,123,202, 94,155,209,175,125, 81, 32,151,203, 39,
-228,229,229, 33, 47, 47, 79,  5, 64,210,244,103, 55,241, 51, 81,  0, 91,235,204, 26,201, 79,157, 38,107,113, 28, 87,226,118,196,
-144, 64, 90, 90, 26,149,158,156, 78,252, 23,248, 75,209,219,244, 49,101,201,185, 10,182,243,  1, 70,134,141,164, 26, 26, 26, 34,
-215,189,191, 14,  1,193, 15, 41,  0,224, 66,225,111,210,248,232,  4,132,134,135,218,220, 30, 99,199,142,165, 54,111,222,220,106,
- 85,128, 70,163,177,235,  6,114, 52, 89,255,217,102,251,119,  0,240, 75,252, 76, 68,  1,140,203, 88, 11,  0,107,158, 56, 91, 79,
-221,214, 78,145,109, 34, 22,123,137,202,209, 68,199,216,203,203,203, 35,121,121,121, 34,195,250, 10, 12, 12,180,233,183,154,  8,
-202,225, 29, 70, 71, 24,251, 54,  1,119,  0,117,250,132,252, 20,  5,192,  5,214,215,247,178,105,143, 43,121,121,121,204,186,178,
-154,192,192,192,174,129,129,129,206, 29,161, 46,237,245,196,173,217,118,212,144,128, 85,114, 79,227,118,143,186,186,186,230,207,
-154, 58,155,233,188, 49, 58,108,180, 67,206,115,230,204,153, 60,185,254,249,201,222,144,195, 52, 14, 38,127,  9,244,195, 13, 15,
-188,  8,176, 90,145,225,225,225,188,106,226,193,131,  7, 15, 30, 60,254, 98, 16,240, 85,192,131,  7, 15, 30, 60,120,240,  2,128,
-  7, 15, 30, 60,120,240,224,241, 23,192,255,  3,211,238,250, 72,118, 88, 93,170,  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,  0,  0,  0,  1,  0,  8,  6,  0,  0,  0,197,144,206,103,  0,  0,  0,  6, 98, 75, 71, 68,
+  0,255,  0,255,  0,255,160,189,167,147,  0,  0,  0,  9,112, 72, 89,115,  0,  0, 11, 19,  0,  0, 11, 19,  1,  0,154,156, 24,  0,
+  0,  0,  7,116, 73, 77, 69,  7,216,  7, 26, 14,  5,  6, 33,183, 35,115,  0,  0, 32,  0, 73, 68, 65, 84,120,218,236,125,121, 92,
+ 84, 85,255,255,251,220,217,217, 23,  1, 21,133,193,125, 95,201, 37, 55, 40, 49, 51,205, 52,192,212, 36,219,196,210,180,178,180,
+111,249, 60,233, 79,159, 12,148,202,212,132,158, 74,179,210, 18,151,180, 92, 18,116, 80, 83, 82,209, 92,202,  5, 69,  1, 65,145,
+101, 86,102,187,115,231,222,223, 31, 51,131,  3,  2,179,128, 73, 61,243,126,113, 95,195, 93,230, 51,231,158,237,253,249,124,206,
+231,156, 67,250,245,235,199,193,  3, 15, 60,240,192,  3, 15, 60,248,159,  2,229,201,  2, 15, 60,240,192,  3, 15, 60,248,223,193,
+153,223,179,  1,  0,196,227,  1,240,192,  3, 15, 60,240,192,  3,143,  7,192,  3, 15, 60,240,192,  3, 15, 60,240, 40,  0, 30,120,
+224,129,  7, 30,120,224,129, 71,  1,240,192,  3, 15, 60,240,192,  3, 15,254, 17,224,219,159,156, 61,123,150,184, 43,168,190, 88,
+  2,143, 60,143,188,134,144,145,145,193,173, 95,191,254,129,165,111,234,212,169,220,150, 45, 91,136,167, 60,254,214,242,208,  4,
+121,240,228,159, 71,222, 63, 89,158,203, 10,192,255, 56,234,102, 32,105,201,233, 76, 79, 79,199,236,217,179,137,167,216,220, 47,
+227,184,184,184,154,243,172,172,172,127, 68, 94, 78,124, 42,185,209,142, 96,215,143, 25,255,232, 58, 35,  9,220,  9,177,161, 19,
+162, 64,163, 26,251,144,175, 95,220,146,235,162,167,253,122,208,114, 60,  0,127, 69,101,157, 56,113, 98,204,174, 93,187,100,118,
+231,177,187,118,237,202,105, 17, 45,146,179,244,157,132,180,216,118,201, 21, 22, 22,  2,  0,164, 82,233,223,169, 19,113, 90, 59,
+157, 58,117,170,211,207,110,217,178,197, 21, 69,141,219,186,117,107,205,201,206,157, 59, 17, 23, 23, 87,235,254,131, 82,  2,242,
+242,242, 56,  0,136,142,142, 38,205,241,220,174, 31, 51,238,107,249,133, 71,181,  7,  0,220, 49, 24,192,232,141,150,139, 74, 53,
+  0, 32, 33, 33,  1,153,153,153, 13,166,111, 96,193, 64,174,243,237,206, 46,253,248,247,195,191,119,162, 92, 36,  8,124,245,  2,
+ 12,187,118, 66,161,152,  4,  5,128,  1,146,149, 88, 44, 57,141,246, 98,160,194, 80,128,197,250, 68,151,126, 55, 33, 33, 33, 38,
+ 51, 51, 83, 86,231, 90,108,102,102,102, 78, 11,107, 91,205, 82,111,255, 38,239,219,236,104, 19, 44, 34, 62,  2,127, 98, 20, 11,
+ 57,163, 82, 79, 85,235,213,172,214,104,250,159,152, 29,231, 80,  1,176, 18,182,237,179,169, 21,129,219,181,107, 23,150,110, 93,
+ 14,159,246,254,168,190,169,194,251,137,139,101, 45,220,226,110, 73, 32, 82,169,148, 43, 44, 44, 68, 97, 97, 33,246,239,223,143,
+217,179,103,183, 84, 37,192,214,128, 72, 70, 70,134, 32, 57, 57,217,148,154,154,122, 10,  0, 22, 46, 92,248, 80, 99, 95,156, 52,
+105, 82,205,255, 12, 99,  6,109, 50,130, 54,210,160,105,203,193, 48, 12, 22, 46, 92,232, 82, 90,236,201,191, 62, 88,149,  1,238,
+ 65,122,  2, 92, 81,126, 30,152,133, 31,224,135,243,215,191,135,  4,237, 96,198, 49,148,127,113,  6,231, 10,170, 48,249,195, 13,
+ 78,125,189,243,237,206, 78, 18,186,  5,207,252,250,140,195, 60,145,140, 91,140,160,137, 47,162,244,245,  1,128, 94, 81,115,253,
+140,254,109,156,  1,  0, 61, 48, 82,146,128,131,129,167, 17,  0, 96,160, 98,160, 83,117, 38, 51, 51,243,158,139,118,  4, 73, 90,
+ 80, 27,107,142, 62,224,239,240,190,205,138, 97,125,250,145,103,195,163,248,202,136, 86,188,208,238,225, 20,159,132, 18,157, 74,
+197,138, 17,102,166,250,183, 51, 63, 55, 97,140,217, 73, 81,183, 92,248,217,182, 78, 60,179,192,  5,121,105,247, 85,  1,216,181,
+107,151,108,235,191,222, 69,226,178, 15,100, 77,172,  4,156,141,248,  1,160, 82, 87,  5,  4,  3,255,119,112,  9,212,215, 21, 88,
+247,242,234,150, 70,100, 13,117, 60, 15, 58,141, 53, 74,192,216,177, 99, 81, 88, 88,  8,169, 84,218,226,242, 78, 38,179,244, 27,
+177,177,177, 28,  0, 42, 35, 35, 35, 60, 57, 57,185, 52, 53, 53,245,180,179, 66, 24,134,  1, 77,155,106,136,223,158,252,243,242,
+242, 16, 29, 29,237, 82,162, 18, 19, 19,237,201, 22, 89, 89, 89,117, 21,128,230,168, 43, 46,151, 67,116,116, 52,153, 58,117, 42,
+ 55,102,204,152,123,238, 29, 56,112,192,230,233,176,121, 61,156,150,223,156,195,  1,225, 81,237, 81,170, 80, 97,199,236,167, 17,
+ 76,134,161,224,191,111,161,195,164, 14,200,114,129,252,107, 50,203,234,106, 35,205,224,106, 11,223,122, 12,186,162,106,148, 38,
+ 71, 53,250,220,  5,113, 54,150,246,190,131, 21, 23,222,107,106,121, 54,  7,233, 54,167, 12, 52,179,172,251,241,190,205,130,164,
+164, 36, 47,  0, 15,  3,240,177,187,172,  4,112,126,211,166, 77,114,103,229,124,178,254, 19,138,174, 52, 10,104,163, 65,172,128,
+ 73, 44, 16,240,249,106,131,152, 18, 10,245, 44,207,207,155,161, 37, 38, 19,191,236,150,241,235, 47, 54, 26,158,123,105,166,217,
+153,247, 86, 42,149,255,177,253,159,159,159, 95,233,237,237, 77,105,181, 90,214,254,153, 65,131,  6,125,220,204,196,190,160,169,
+121,202,119,100,253, 95,186,116,  9,157,125,252,236,189,  1,238,120,  1,106,200,191, 82, 87,133, 21,143, 46,169,185,241,252,174,
+ 87,129, 80, 96, 82,106, 34,118, 46,220,234, 74, 37,107,172,115,107,114, 69,189,121,243, 38,  0,160,125,251,246,181,254,135, 11,
+238,236,102, 84, 68, 72, 67, 74,128,201,196,216,226,  1,154,197, 10,104,134,188,180, 39,127,  0, 32,201,201,201,  0,112, 43, 35,
+ 35, 35, 48, 57, 57, 89,225, 52,249,155, 76,160,105, 35,140, 52, 13, 83, 29,242,231, 88,215,138, 33, 49, 49, 17,121,121,121,119,
+ 91, 87, 90, 26,226,227,227,107,206,183,109,219,214,100,101,199, 78,225,105,114,253,179, 39,254,169, 83,167,162,127,255,254, 54,
+  5,192, 85,143, 64,179, 84,194,146,235,197,208,238,252, 55,124, 94, 88,141,240,168,246,  8, 11,150,224,250,206,235, 22,242, 15,
+240,179, 12,  1,  8,120,206,105,176,205, 52,198,214,229,226, 53,220,124,127, 57,244,153, 27, 27,247, 16, 72, 36, 48, 24, 12, 40,
+ 40, 40, 64,185,225, 10,186, 32,188,193,103,173,110,240,198,234, 62,177,181, 19,235,179, 57,110,180, 47, 98,215,174, 57, 55,219,
+ 25,105,132,184,157,174,131,245,189,111,124,124, 60, 71,  8,177, 13,229, 52,229,125,109,109,153,227,243,249, 77, 42,243,164,164,
+ 36,127,  0,147, 14, 30, 60,248,111,150,101,141,118,117,137,207,227,241,188,147,146,146, 94,218,180,105,211, 94,135,140,185,104,
+  1,191,242, 86,133, 88, 32, 16,121, 83,124,226,199,241, 68, 94, 44,143,199,103,  9,  5,150,240,205, 28,143,103,228,177,196,160,
+229,153,117,222, 66,  1,249,226,216, 94,195,220,148,153, 44,138, 29,167, 81,161, 80,168,117, 58, 29,  3,  0, 90,173,150,125,247,
+221,119,107,  8,255,131, 15, 62,120,163,169,245,125,244,232,209,179,109,255,103,103,103,167, 55, 71, 27,162, 28, 89,255,203,167,
+196,195, 80, 81,129,183,122,118,131,253,216,189,211, 86,200,196,137, 49,  0,106,145,255,196,137, 19, 99,  1,144,137, 19, 39,198,
+110,152,248,153,197,179,216,181, 85,173,231,157,193,194,117,249, 88,184, 46, 31,115, 86, 93,194,115,203,254,192,228,255, 59,219,
+244,142,174,164,196, 41,197,224,175, 34,127,235,152, 63,215,128, 39,  0, 38,154,198,224, 65,131,154, 67,201,224,182,110,221,138,
+173, 91,183, 66, 38,147,213, 28, 46, 42, 60,156, 76, 38, 67,108,108,108, 13,249,219,223, 76, 78, 78, 86, 58,211, 49, 49,140,217,
+ 98,249, 27, 45,174,255,186,228,111, 54,155,161,213,107, 93,122, 65,155,199,160,174,215, 96,219,182,109,216,182,109, 91, 45,101,
+192,165,247,205,169,221, 31, 90,207,155,164, 36,218,200,127,234,212,169, 72, 77, 77,173, 33,127,  1, 95,224, 42,249,219, 58,240,
+134, 14,167,161, 71, 49,170, 39, 13,  6,151,249, 22, 74,174, 23,131,155,212,253,110, 38,100,190,  5,126,155, 16, 32, 32,224, 47,
+213,140,181,149,  5,208,103,110,  4,199,113,184,112,225,  2, 70,142, 28,  9,137, 68, 82,139,248,  3,  3,  3,161,215,235,161,215,
+235, 81, 90, 90,138,105,250,121,248, 34,240,245,  6,101, 58,233,242, 38,117,158,117,149,184,155,203, 88, 33, 13,144,191,211,117,
+176,238,251,198,199,199,115,219,182,109, 67,102,102, 38, 18, 18, 18,184,166,190,175,149,252,193, 48,140,219,109, 34, 41, 41, 73,
+ 12,224,229,236,236,236,119,151, 45, 91,118,130, 16, 34,181, 29,  0,218,  5,  7,  7,123, 29, 58,116,104,125, 82, 82,210,200,198,
+228,124,150,190,158,199, 35,  2, 17,205,112,126, 70,163, 41,212,204,178,237,204, 44, 27,101, 38, 36,  2, 60, 94, 48, 33, 36,  0,
+132,231,199,114,  8,226,104, 54, 64,173, 55,121,135,250, 49, 60,106,144,198,169, 50,210,233,116, 76, 93,171,191,165,131,106,140,
+184,187,116,233,130,206, 62,126,208,149,221,198,227,253,  7,184, 76,208, 54, 37, 98,233,214,229,  0, 80, 67,254, 54, 47,194,174,
+ 93,187,114,108, 74, 64,137,250, 22,  6, 44, 28,226,146,146,161,213,155,161,213,155,113,187,202,136,210, 10,  3,110,222, 49,184,
+ 69,124,182,198,226,136,252, 31, 20, 26, 81,  2, 96,160,141, 48, 24, 12, 77, 17,207,201,100, 50,216,198,200, 67, 66, 66,236,173,
+ 89,184,208,153,212,178,132, 27,113, 37, 58,236,244,104,147,209, 98,249, 27,105,208,166,218,228,111, 50,153,160,213,106,161, 81,
+107, 30,116,177,112, 91,183,102,214,126, 37,203, 31,172,215,221,234,240,236,201,223, 70,252, 20, 69, 65, 44, 22,195,219,199,171,
+ 73,  9,158,248, 84, 50,215,208,225,232,187,251,255,111,  9,130, 49, 12,204,232,215,  0,  0, 62,185,215,112,174,160,202,210,201,
+143,126, 13,166, 11, 75,129,202, 42,215, 50,208, 10,119,223,199, 27,149,  0,128,141, 27, 55, 98,215,174, 93, 88,185,114, 37, 78,
+158, 60,  9,163,209,136,242,242,114,155, 85, 86,243,124,120,120, 56,244,  0,120,184,241, 64,234, 75, 35,245,158, 52, 65,105, 36,
+141,120,240, 92,150,105,239,  9,171, 47, 38,192, 29,242,  7,  0,119,149,128,164,164,164,214, 86,242,159,245,245,215, 95, 95, 92,
+188,120,241, 83,155, 55,111, 70,151, 46, 93,  0,  0,145,145,145, 80,169, 84,162,165, 75,151,158, 62,116,232,208,183, 73, 73, 73,
+210,  6,115,137,229,  8, 88, 70,108, 54, 51, 65,102,198,220,206,100, 54,117,226, 81,164,173,144, 79,  9,196,  2,158,158,239, 37,
+ 84,122,251,242,212, 60, 49,199,136,121, 60,111, 62, 67,251,221, 56,243,187,104, 70,200, 39, 14,211,157,159,159, 95,169,213,106,
+217,250,220,252,125,251,246,189, 66,211,116,179, 85,164,190,125,251, 54,155, 44,126, 99,196,253,223, 89, 47,222, 37,219,146,155,
+120,171,103, 55,172,178, 16,180, 75, 90,171,205,250,183,145,126,157,223,169, 57, 15,238,221,218,165,196, 87,235,205,208,232, 24,
+168,181, 12, 84,213, 12,148, 26,198,245, 86, 89, 79,228,191,189,149,111,255,255,245,235,215,161, 84, 42,255,178, 30, 35, 61, 61,
+ 29, 82,169, 20,182,160,191, 58, 99,253, 92,122,122, 58, 12,122,125, 83, 20,  0,110,195,134, 13, 40, 41, 45,133,128,199, 67, 88,
+235,214,181,200,255,209, 71, 31,197,193,131,  7,157,237,156, 72,108,108,108, 93, 37,160,150, 39,195,217, 88,  5,218, 72,131, 54,
+ 26, 97, 50,209, 96, 24,115, 13,249, 27,141, 70,232,116, 58, 84, 87, 87, 67,163,113, 93,  1,176, 31,  2,176,193, 93,203,127,107,
+230, 86,128,  3, 42,173, 68, 99, 29,212,  6,225, 56,139, 18,144,153,137, 68,139,  5,229, 82, 91,169, 75,254,  2,129,  0, 34,145,
+  8, 98,177, 24, 98,177,184,201,117,170,161, 33,129,250,230,197,219, 99,114,250,118,112, 79, 70,225,206,208,  1,  8,198, 48, 72,
+158, 94,  3,230,118,  5, 16,224,  7,126,213, 22,252,252,201,105,128,199,115, 41, 45, 77, 29, 10,208,242, 44,125,202,138, 21, 43,
+ 80, 81, 81,129,245,235,215,163,111,223,190, 88,182,108, 25,  6, 12, 24,  0,189, 94, 95,215, 66,179,169,212,127, 53,241, 59, 75,
+208,238, 14,  7, 52,164, 72,184, 44,199, 58,139,163,166,109,184, 59, 52,102, 79,254, 53,100, 99, 85,  2, 92, 28, 14,240, 61,127,
+254,252,167,175,188,242,202,145,222,189,123,251,  1,192,146, 37, 75,144,159,159, 15,  0, 24, 50,100,  8,118,236,216,129,225,195,
+135,123, 79,155, 54,173, 32, 39, 39, 39,251,249,231,159,159,246,251,239,191,223,147,179, 65,193, 65,236,245,235,  5, 76,142,236,
+224,190, 78,157, 58,231, 68, 69, 74, 47,242,124, 37,229, 60, 34,212, 82, 34,129,142, 18,123,105,104, 62,143,  6,103,226,177, 98,
+147,175,166,180,202,231,228,161,179,131, 90,  5,134,237,112,168,140,218,141,249,239,220,185,243,185, 73,147, 38,125,109,115,251,
+171,213,106, 74, 40, 20, 54,185, 34,217,220,254,217,217,217,247,215,  3, 96,179,242,163, 59,118,134,161,162,  2,218, 18, 11,  9,
+142,180, 90,135,174,122,  1,174,255,113,237, 30,217,245,157, 87, 93, 40,115, 41,241, 77, 37,127,123,226,231, 56,206, 54,198, 95,
+  3,147,201, 84,115, 40,149, 74,104,181, 90,200,229,242,191,172,231,176,205,243,223,191,127,127, 93, 79,  0,151,158,158,142, 62,
+125,250,192, 96,208,215,116,116,233,233,233, 46,185,235,215,125,182, 14, 38,147,  9,237,194,195, 97, 50,155, 27, 34,127, 87, 58,
+ 18, 82,143,235,191,102,234, 98, 99,158,140,123, 20,  0,218, 84, 67,254,167, 78,158,130, 78,175,135, 70,163,129, 74,165,130, 82,
+169,172,101,217,185, 10,219, 48, 64, 19,198,253, 81, 85, 89,133,170,170, 74, 84, 86,201, 81, 89, 85,133,170,170, 42, 84, 85, 90,
+ 44,210,110,221,187, 67,110,253,223, 85,235, 31,  0,250,247,239,127,215,234,247,246,134,143,143, 47,124,125,124,161,209,104, 98,
+155, 72,254,110, 15,  7, 20,172,156,  5,193,211,107, 16,140, 97,224,231,174,129,105,251,107, 64,128, 31,118,191, 26,143,162,221,
+ 55, 48, 33,117, 19,192,255,139,151, 21, 49, 20, 65, 18, 46,129, 86,171,133,193, 96,128, 78,167, 67,110,110, 46, 62,252,240,195,
+122, 31,247,242,178,121, 80,174,185, 67,222,238, 90,213,246,249, 75,156, 60,111,138,146,225,106,155,173, 37, 39, 51, 51,147, 36,
+ 36, 36,216,200,223,109,207,  4,159,207, 39, 12,195,212, 85, 10,224,106, 44,192,166, 77,155,174, 38, 36, 36,244,221,188,121,243,
+200,163, 71,143,250,142, 30, 61,250,164,141,252,173,  6, 36, 68, 34, 17, 87, 84, 84, 36,216,183,111, 95,215,192,192,192, 83,195,
+134, 13, 43,168, 79,214, 51, 83,158, 97, 59, 71,117,209, 12, 25, 50, 36,254,226,197, 63, 31, 81,107, 53,173, 57,198,196,128,130,
+137, 49, 82, 70,163,209,168, 87,163, 76,205, 26, 13,154,210,226, 50,230,231, 61,123, 83, 90,  5,135,148,211,180,206,161,249, 94,
+159,245,175, 80, 40,248,  0,224,231,231,215, 98,135,  5,168,134,172,255,173,255,122,215,162, 53,151,221,174,117,207,213, 88,128,
+137, 19, 39,198,174,123,121, 53,  0, 75,192,223,174, 93,187,100, 54,210,183,173,  9, 16,247,205, 83,  0,128, 51,169,191,217,226,
+  3,254, 42,212, 84,198,146,146,146, 26,107,223, 70,250,118,133, 11,141, 70,  3,131,193, 96,215,137,252,117,105,156, 61,219, 18,
+251, 97, 98, 24, 92,188,120, 17,191,159, 57,131,190,125,250,194, 96, 48, 64,175, 55,192,160,215,227,219,111,190,129,237, 57,103,
+ 26,122, 90, 90, 26,122,116,239,  1,147,201,132,171, 87,175,130, 49,209, 40, 45, 41,109,214, 60,181,157, 91,215, 44,176,173, 93,
+224,216,  3, 96, 50,130, 49, 91,220,254, 39, 78,252,  6,173, 94,139,106,141, 26, 42,149, 10, 10,165, 18, 10,133,188, 73,138,152,
+205, 19,224,166,245, 15,  0, 56,114,228,  8, 52, 26, 13, 52, 26,181,245, 83,131, 86,193,193,232,214,189, 59, 46, 95,186,132,195,
+ 71,142,184, 44,211,102,253,243,249,  2,120,121,121,193,199,199,  7,190, 62, 62,240,241,241,130, 92, 33,143, 77, 78, 78,206,113,
+170,205, 53,193,213,223, 16,206, 21, 84,193,116, 97, 41,170,112, 12,100,220, 42,144, 97,255, 70,193,202, 89,120, 50,245,107,136,
+  5, 20, 32,224, 91, 14,119, 88,199,205,161,128,210,241,159, 33,104,203,120,232,116, 58,  4,  5,  5, 65,161, 80, 64,161, 80,224,
+248,241,227,184,125,251,118,141,155,184,230,249,210, 82,188, 26, 40, 65, 43,175,138,198, 44,224, 88,123, 82, 77, 72, 72,136,177,
+187, 23, 83,231, 94,172,139,237,130,107,132,192,155, 99, 70,129,203,150,127,125,239,155,153,153, 73,182,109,219, 70,154,248,190,
+181,148,  0,119,200,223,134,247,222,123,239,252, 83, 79, 61, 53,109,197,138, 21, 93,207,157, 59, 55, 76, 34,145,240,158,124,242,
+ 73, 34, 18,137,192,178, 44, 25, 55,110,220,249,249,243,231,247,233,213,171,215,238,151, 94,122,233,185,151, 94,122,169,193,177,
+168,228, 57,201,236,159,151,174,158,234,213,187,207,179,167, 78,158,156,188,123,207, 79, 31,228,157, 60,217,250, 98,254,101,241,
+213,210,  2,238,219,213, 63, 72, 86,164,173,236,145,189,103, 79, 90,167,142,157,126,246,  9,243, 62,178,105,211, 38,179,179, 57,
+ 58,122,244,104,156, 58,117,170, 95,122,122,250, 82,131,193, 32, 88,182,108,217, 71,187,119,239,158, 90, 90, 90,250,151, 19,135,
+ 83,101,212,208,141,224, 27,133,144,  3, 53,214,191, 13, 35, 67, 66,176, 10,151,157,183, 58,172, 46,254,203,167, 47, 34,160,107,
+ 43,196,125,243, 20,118,205,248, 81,102,211,222,108,228,111,179,254, 93,153,101,176, 99, 69,191,230, 97, 88, 66,112,233,210, 37,
+216, 42,107, 93,247,178, 64, 32,128, 64, 32, 64, 69, 69,  5,198,141, 27,247, 32,202,137, 72,165, 82, 46, 61, 61, 29,131,  6, 13,
+130,193,104,132,222,160,135,193, 26,220,164, 55, 88,134,  1,214,174, 93,139,185,115,231, 58,234, 76,184,212,212, 84,152,205,102,
+156, 62,125,  6,  2,190,197,109,219,185,115,103,220, 40, 44, 68,105,105, 41,182,108,249, 30, 83,167, 62,  3,  0, 92, 29, 79, 64,
+131, 29, 80, 70, 70,134, 16,  0,147,156,156,204,214,103,  1,185, 50, 85,209,102,249,231,230,230, 66, 91,173,171, 81,192,212, 26,
+ 53,212,106, 21,212,106,247,134,  0,236,173,255,169, 83,167,214,120,  0, 92, 85,  4,166, 78,157, 90,235, 60, 74, 42, 69,183,238,
+150,160,184,203,151, 46,225,134,213,227, 49,117,234, 84,151,163,246,135, 62, 60, 20, 34,161,  8, 18,137,  4, 98,177, 24, 34,145,
+  8,101,101,101, 78,147,191,157,181,223,172, 21,112,242,135, 27,176,  3,192,216, 21, 79,128,203,124, 11, 36, 49, 13,231, 10,170,
+ 64,130,  2,113,173, 68,109,177,254, 93, 28,  2,176,107,127,196,166,  8,216,159, 59,132, 94, 15,240, 44,198,222, 93,247,190,133,
+232, 77, 38, 19,190,248,226, 11,140, 28,121, 55, 46,236,224,204,112,160, 92,135,174,123, 21,232, 23, 18, 89,175,200,122,162,220,
+237,135, 60,101, 14,158,117,150,176, 73, 19, 60, 10,141,121, 35, 92, 86, 36,238,247,251, 90,149,128, 38,207,  2, 88,177, 98,197,
+150,121,243,230,133,156, 61,127, 62, 81,175,215,247,145,201, 14, 73, 68, 98, 17,159, 34, 20, 14, 29, 58,228,219,163, 71,143, 77,
+  9,  9,  9,255,158, 60,121,178, 67,107, 61,231,208,  1,118,194, 83, 19, 14,247,237,219,127, 33,205, 24,199, 94,203,191,250,  1,
+ 91, 88,192,  0,224,196,160, 76,189, 59,117,205, 12, 13, 13,217,203,227, 11,191,253,207,226, 20,250,147,101, 31, 59, 44,165, 65,
+131,  6,125, 60,122,244,104,  0, 64, 69, 69,  5,178,179,179,253,190,250,234,171, 15,  0,224,212,169, 83,131,122,246,236,185,255,
+111,161,  0,216, 22,254,121,244,219,205,142, 44,123, 87,166,  4,146,157, 11,183,114,  3, 22, 14, 65,112,239,214, 53,164, 95,227,
+ 78,189, 80,134, 51,169,191,185,234,182,106,174, 57,169,  4,  0,215,189,123,119, 92,184,112,161, 22,177, 40,149,202,  2,  0, 29,
+ 93,212,230,239,167, 39,224,158,223,252,246,155,111, 97, 48, 24, 96,164,141,160,105, 26,169,169,169,141, 45,146,195,165,166,166,
+214,156,176,172, 25, 98,137, 15,244,122,  3, 46, 93,188,  8,190, 64,  0, 19, 77,195,203,219, 11, 91,182,108,  1,143,199, 67, 98,
+ 98, 34, 30,125,244, 81,174,170,170,225,  0,175,212,212,212,253,201,201,201,116, 70, 70, 70,168, 45,111,234,172,  3,224,146,107,
+115,225,194,133, 56,118,236, 24,170,171,171, 81,173,213, 66,163, 86, 91,201, 95, 13,141, 90,131,106, 77, 53,180,118, 29,190, 51,
+121, 23, 29, 29,205,229,229,229,213, 88,255,245, 77,  3,116,118, 17, 32,235, 92,252, 90,101, 97, 35,125,219,216,163, 43,171, 20,
+218, 86,248,  3,  0, 31, 47, 31,136, 37, 98,104, 52,154, 88,219,208,142, 27,228,127, 95,230,107,219,148,128, 73, 43,190,  2,183,
+ 29,104, 53, 51,  3, 57,175,199, 99,120,202,119,128, 64,  0,111,113,211,198, 57,235, 42,  2,  0, 48,245,216, 84,  7,223,186,131,
+222,251,189, 80,246,147, 14,138,229,119,175,154, 76, 38,140, 24, 49,  2,  0, 16, 30, 40,193,175, 25,237,177,242,195,155,248,236,
+140,222,145, 69,108, 63, 45, 14, 13,253,111,247,108,142, 27,125, 86,115,205,173,111,142, 49,255,251,249,190, 53, 74, 64,115,212,
+191, 79, 63,253,244,211,231,103, 62,191,239,161,129,209,131, 52,106,117, 16, 99,102,140, 97, 97, 97, 21,225,225,225,101,106,181,
+250,220,228,201,147,157,238, 20,126,250,241, 39, 22,192,150,103,167,191,152, 59,108,248,240, 31, 37, 18,137, 63,  1,199, 18, 66,
+192,178,156, 74,175, 85,200,174,156, 47,214,120,139,132, 78,245,243, 54,242,  7, 44,129,212,117,  3,245, 62,252,240,195,127,255,
+ 45, 20,  0, 43,169, 59, 44,176, 93,187,118,185, 92, 89,207,164,254,198,  1,128, 77, 17,176, 35,254,230, 36,116,183, 27, 82,239,
+222,189,113,234,212, 41, 84, 84,212,184,  8, 59,  2,128,141,252,102,204,152,241,160,203,171, 86, 30,165,167,167,115,207,206,120,
+ 22,107,215,174,179,142,153, 51, 88,184,112, 97,163,211,151, 92, 92, 65,207, 98, 57, 29, 60,232,104,179,137,238,169,169,169, 87,
+147,147,147,203, 51, 50, 50,120,201,201,201, 53,  1,129,214,105,129, 78,119,116, 54,139,121,216,176, 97,205,158,119,209,209,209,
+156,189, 21,111, 31,  3,224,198, 10,128,  4,  0,183,101,203,150,123,172,124,171,135,192,229,250,188,101,203, 22,226,170,199,192,
+ 25, 52,230,250,119, 85, 89,152,252,225,  6,192,110,225,159, 81,239,222,157,142,172,109,174,130,178,243,  0, 56, 90,  9,176,116,
+ 88, 41, 74,  1, 12, 88, 25,136,229,167,187, 32,  4, 64, 69,129, 22,157, 58,117,178,144,198,242, 64, 60,246, 80,  8,162, 30,203,
+119,214, 34,118,122,120,211,250, 44,113,183,191,105,166, 62,175, 73,178,254,162,247,109, 54,108,216,184,225, 42,128,171,205, 37,
+239,219,239,190, 44, 68, 51, 68,133, 54,103, 96,158, 21, 11,254,138,252,252,171, 55,  3, 34, 19, 39, 78,140,217,149,218, 34,247,
+  2, 32,  0,184,135, 30,122,  8,123,247,238, 53, 88, 73,159,  5,224,117,159, 60, 15, 77,134, 45, 72,112,238,220, 57,156,213,242,
+127, 32,105, 91,184,112, 97,100,125,110, 73,187,105,132,174, 88, 59,228, 62,151,113, 77,122,154,186,236,111, 67,171,242,185, 74,
+226,142,214,246,111, 14, 52,101, 72, 96,209,162, 69,184,126,253,122,179,165,197,153,229,125, 93,197,153,183, 21, 56,  3, 75, 96,
+232,200,  4,  9,126, 57,209,  5, 97, 94, 62,248, 51,239, 14,186, 58, 73,254, 78,212,191,150,186, 28, 46,185, 79,223,245, 44,207,
+238, 28,218, 54,179,188,180,191, 42,225,127,249,110,128,117, 61, 12,110,120, 18,238,187, 18, 48,110,220, 56,241,223,172,  2,186,
+101,217, 55,215,111,103,100,100,216, 86,168, 97,146,147,147,155, 58,149,201,131,230, 39,255, 38,149, 69, 74, 74, 74,179,148,101,
+ 70, 70,  6, 63,121,120,242,125,175, 23, 71, 50,245, 56,146,153,223,226,219,172,167,102,122,240,192, 43,161,187,251,  8,123,224,
+129,  7, 30,120,224,129,  7,127, 95, 80,158, 44,240,192,  3, 15, 60,240,192,  3,143,  2,224,129,  7, 30,120,224,129,  7, 30,120,
+ 20,  0, 15, 60,240,192,  3, 15, 60,240,192,163,  0,120,224,129,  7, 30,120,224,129,  7,255,  8,212,154,  5,112,246,236, 89,183,
+ 35, 83,235, 11, 38,244,200,243,200,243,200,243,200,115, 82, 94,163,211, 68, 91,128, 60, 79,249,122,228,213,194, 43,175,188,210,
+ 14,128,  2,128,208,186,213,121,139, 74,159,199,  3,224,129,  7, 30,192,223,223,159,242,247,247, 39,254,254,254,  2,  0,188,150,
+150, 62,219,190,243,118,251,207, 55, 21,245,173,143,239, 65, 11,194, 19, 79, 60, 17,243, 15,120, 13,219,218, 87,146,191,235, 11,
+120, 20,128,127, 56,154,176,221,186,203,136,139,139,139,177,118,186, 53,135,245,218, 63, 82, 94, 11,  7,137, 12, 11, 35,  0,160,
+ 82,169, 88,149, 74,197,169, 84, 42, 19,  0,179, 59,194, 94,126,172,119,201,172,177,189, 39,  2,192,172,177,189,191,121,249,177,
+222,235,  0, 96,225,164,135,200,194,167,163,  5, 47,143,233,229,214,154, 34,246, 75,209,102,102,102,214,218,124,167, 41,228,111,
+ 87,239,155,115,173,253,166,202,108, 14,121,220,125, 80,108,254, 82, 69,233,137, 39,158,136,217,187,119,175,236, 31,208,198, 12,
+176, 44, 22,119, 95,121,180, 77,176,136,234,220, 58,148, 31, 33,109, 71,133,  5,  4, 11,189, 69,130,102,251, 61, 62,254, 25,160,
+172, 90,152,222, 90, 32, 30,216, 41,  0, 78,236,173, 98,  4, 32,106,234, 79,101,101,101, 33, 45, 45,173,214,242,127, 11, 22, 44,
+176, 53,116,226,142, 60,246,135,192,218,  5, 61, 37,171,165,200,107,241, 69, 31,229, 45,225,162, 58, 72,  1,  0,101, 52, 51,189,
+181,144,255,157,237,230,101,117,181,168,172,178,146,118, 70,208, 75, 99,122,229,155,205, 92,248,195, 67, 91,249,117,237, 58,236,
+128, 72, 68, 21,205, 73, 25,244,159,255,146, 11,184,163,210, 61, 33,224,147,159,  0,114, 17, 64, 79, 87, 19, 89,119, 41,218, 38,
+ 46, 55, 91,139,252,237,234,190,187, 75,229, 18, 23,175,223,119,121,  9,  9,  9,182, 53,250, 29,190, 83, 66, 66,  2,151,153,153,
+ 73, 92,200, 59,210, 12,114,156, 34,127,150,101, 65,  8,193,200,145, 35,185, 35, 71,142, 16, 23,203, 88,  8,192,212, 28,233,  9,
+ 10, 10,154, 37,151,203, 63,119,243,235,126,  0,148,104,190, 85,176,107, 97, 88,159,126,212,179,225, 81, 98,101, 68, 43, 97,104,
+247,112, 62,159,132, 82, 58,149,138, 17, 35,140,166,250,183,163,159,155, 48,134,110,234,111, 56,171, 73,132,  0,120,220,250,217,
+210,224,  7,224, 41,  0,233,214, 79,191,102,146,251,125, 75,179,176,221, 42, 96,202, 97, 17, 15,178, 54,168,208,166,144,205,252,
+249,243,239, 33,127,  0, 72, 75, 75,139,157, 63,127,190,203, 86,206,198,215,188,239, 33,107,  0, 96,127,  8,196,198,215,188, 31,
+168,188,212,212,212, 24,138,162,184,103,158,185,187,164,237, 43,175,188, 18,  3,128,139,136,136,224,218,181,107,199,  5,  7,  7,
+115, 79, 63,253,180, 83, 50, 55,164,126, 20,115,156, 26,194, 45,141,142,175,177,126,215, 45, 93, 23, 51, 15,171,185, 57, 17, 27,
+184, 25,237,182,114,227,131,247,115,131, 58, 44,115,202, 58,238,208, 46,172,117, 76,  7, 41,247,218,156, 25,198,229,111,189,200,
+ 45,124, 97, 26, 90, 11,249,223,189, 59,251, 89,172,124,227,101,110,217,220, 23,216,110,126, 62, 70,  0,104,221, 58,152,111, 45,
+255,122,113,102,231,211,157,195,195,189,  2,158,153, 18,153, 54,113, 82,123,  1,203,177,210,144, 86, 34,239,143, 95, 63,145, 54,
+239,169,126,223, 62,254, 88,155,200,136,  8,239,226,127, 47,238,237,238, 54,153,246, 27, 69,185,180,105,148,  3,203, 31,205,224,
+  9,104,113, 30,128,204,204, 76,146,144,144, 80,243,189,132,132,  4,174,190,161, 19, 43,105, 59,173, 84, 52,148, 14, 59, 57, 77,
+238,232,236,201,127,193,130,  5, 24, 57,114, 36,247,235,175,191,186, 35,138,110, 70,227,181, 44, 40, 40,104,146,155,223, 13,183,
+ 26,156, 82,  0, 72, 74, 74,138, 76, 74, 74,218,147,148,148,148,107,119,236, 76, 74, 74,114,105, 27,229, 79,214,127,194, 79, 93,
+150,226,247,248,147,147,194, 21,  3,123,118,224,183, 13,239,168, 54,136, 59, 86,155,245,237,137,159,119, 91, 58,204, 20,198,148,
+221, 10,248,250,139,141, 66, 23,121,220, 45,  5,160, 61,128,111,  0,196, 91, 63,219,183, 32,126, 11,  6,176,197,170,156, 28,  7,
+ 48,214,122, 30,220, 12,178,167,192,137,241,210,150,174,  0, 56,129, 33,  0,174,  0,136,114,199,186,177,185,208, 35, 34, 34, 98,
+237,173,126, 59,203,191,230,158, 51,238,118,219, 51, 73,195,133,118, 86,186,  2,212, 20, 69,205,185,237,222,131,144,  7,  0, 39,
+ 78,156,144,137,197, 98,228,230,230,222,163,108, 21, 23, 23,147,146,146, 18, 50,100,200,144,216, 61,123,246, 56,149,135,173, 79,
+ 92,148,113, 98,  1,250, 84,  8,107, 89,195,132,226,176,174,248,121,242, 77, 73, 34,145,142,189, 16,203,220, 26,239,208,109, 26,
+211, 65,202, 69,  8, 37,183,223,124,117,186,177,157,143, 80,168,186,120,140,120,149,159,199,188, 17,157,209, 54, 64,130,242, 51,
+ 71,201,157,211,199,168,  5,179,102,208, 49, 29,164, 92, 55, 47, 95,147,181, 67,173, 23,173, 90,  9, 71,  9,133,148,248,248,241,
+219,243, 79,157,188,213, 61,172, 93,  7, 83, 64,171,118,196,215, 23, 94, 29,162,188,162,130,130, 68,157, 88,142, 51,254,124,178,
+ 92,251,  0,235, 48,103,111,241,219, 14, 55,149,  0,174,158,207,186, 71,125,207,253, 85,242,106,148,  0,185,124, 52, 50, 50, 20,
+104, 10,249, 55,166, 84,212,145,211, 36, 15,192, 19, 79, 60, 17,179,103,207, 30, 25, 33,  4, 20, 69, 33, 47, 47, 15, 71,143, 30,
+117, 75,150,217,108, 62,111,245,  0, 52, 71, 60,139, 68, 46,151,239, 12, 10, 10,122,218,141,239,218, 60,206,154,164,164,164, 94,
+  0, 14, 28, 60,120,112, 92, 86, 86,214, 16,219,145,157,157,253,148, 76, 38, 59,148,148,148,228,212,144,199,130, 69, 11,196,149,
+183, 42,130,245,156, 49,130,227,147,110,156, 72,212,157, 21,  8,187,179,132,234,204, 18,126, 39,134,199,139,100, 89, 18,174, 37,
+230, 80, 70, 72,  5,126,113,108,175, 88,252,100,232,125, 85,  0, 62,  1,112, 16,192, 60,235,231, 39, 77,200,236, 64,  0, 75,  0,
+236,177, 86,244, 61,214,243, 64, 55,229, 29,  1,176, 23, 64, 50,128,245,  0,222,176,202, 60,210,196, 74,225,111,253,244,110,  6,
+ 11, 27, 86, 11,107, 73, 99,150,214,  3,196, 67,  0,142,  1,104,109, 85,158,158,117,229,203, 89, 89, 89, 50,123,203,127,193,130,
+  5,178,180,180,180,216,180,180,180, 88,123, 37, 32, 45, 45, 45, 54, 43, 43, 75,230,140, 60,123, 75,157,154,162,192,213,189, 51,
+112,117,239,140, 90,164,205,254, 16,  8,119,229,217, 44, 77,119,228,165,167,167,199, 28, 63,126, 28,211,167, 79, 71,113,113, 49,
+146,147,147, 99,234,123, 70, 44, 22,203,218,180,105,227, 48,255, 50,210,211, 99,218, 28,255,  3, 37,211,135, 65, 88,172,194,231,
+ 75, 62,142,169,109, 28,  3,233,233, 25, 49,  2, 67,132, 44,168,141,222, 33,249,207,122,105, 10,253,175,249, 51, 56, 97,209, 25,
+ 97,224,157, 11,228,194,109, 53,194, 67,188,241,112,143, 48,180, 85, 94,193,117,141, 30,124,150, 67,  0,225,  9,254,239,197,233,
+220,107,175,188,112, 37,166,131,180, 65,210, 81, 40, 53, 65,131,  6,249,164,245, 30,242,184,201, 55,168,163,200, 39, 32,148,149,
+248,120, 27,131, 90,  5, 27, 66,194,219,243, 21,114,141, 72,173, 98,160, 80, 25, 93,113, 99,199, 56, 67,156, 78,198,  3,220, 99,
+249,215,167,148,187,160,  4,144,122, 62,235, 30,245, 61,231,148, 60,110,107,224, 61,135,139,242, 26,202,211, 38,145,118, 93,165,
+ 34, 35, 67,129,230, 34,127,138,162,184,125,251,246,201, 88,150,197,235,175,191, 14, 66,  8,142, 30, 61, 10,203,214,187, 44,113,
+ 67, 30,104,154,254, 29,  0,211, 12,158,  0, 57,  0,200,229,242,237, 65, 65, 65,177, 46,126,151, 15,  0, 51,103,206, 20,  1,200,
+202,206,206,238,178,108,217, 50,166,174, 18, 26, 28, 28,140, 67,135, 14,197, 36, 37, 37, 57,212,202,120, 68,224, 71, 51, 92, 91,
+163,209,212,197,204,178,189,204, 44, 59,192, 76, 72, 47,240,120,237,  9, 33,109, 64,120, 97, 44,135,  8,142,102,219,169,245,166,
+144, 80, 63, 70, 72, 13,210,220, 55,  5, 32,220,106,241,175,132,101,156, 99,165,245, 60,220,141,223,154,  1,160,216, 90,153, 22,
+  1,  8,178,126, 18,235,117, 87,247,218,253, 55,128,107,  0,214,  1, 16,192, 50,134,205,  0,248,204,122,189, 41,251, 47,143,  4,
+ 80,  1, 96, 84, 51,145,236, 11,  0,222,183,126,182, 52,244,  4,240, 35,128, 71,173,158,148,158,238, 10,178,145,191, 61,233,219,
+ 43,  1, 46, 87, 78, 43,249,219, 80, 87,  9,112, 71, 94,157,206,140,184, 42,239,240,225,195,160,105, 26,  3,  7, 14,140,237,214,
+173, 27, 10, 11, 11,107,222,143,101, 89, 72,165, 82,110,241,226,197,178,227,199,143, 99,220,184,113, 14, 59, 20, 67,238, 41, 80,
+ 52,  3,229, 64,105,172,177, 91, 48,174,109, 56,124,151,180, 88, 14,115,164, 27,184,195,139,131,101, 55,142,251, 35,238,249,171,
+142, 59, 40,138, 87, 93,113, 33,151, 45, 83, 26, 80, 85, 77,115,241,253, 34, 56,127,137, 16,183,148, 90, 84,168,244, 72,236, 31,
+193, 81,132,112,191,253,180, 31,170, 35, 39,184, 51, 59,127, 46,106, 76, 92,238,239,109,231,132,132,250,117,108, 27, 17,197,120,
+ 73,216,142, 35, 31, 79,244,233, 48, 48,121,124,235, 46, 79,198,  5,181,141,238, 43,175,110, 29,111,162, 77,166,235,  5, 90,167,
+134,222,172,  4,229, 84,157,200,204,204,148, 57,152, 25, 80,239, 61, 39, 98, 94,254, 17,179,  3,146,147,  3,145,156,124, 87,185,
+181, 17,119,115,144,118, 61, 10,140,219,150, 63,199,113, 48,153,238, 14,217, 15, 31, 62,220,214, 94,220,149,109, 18,  8,  4, 38,
+150,101,143, 91, 61,  1, 77, 81,  2,106,134, 62,229,114,185, 44, 40, 40, 40,217,133,239, 22, 38, 38, 38,250, 29, 62,124,120, 69,
+118,118,118,235,175,191,254,154, 93,188,120, 49,127,243,230,205,232,210,165, 11,  0, 32, 50, 50, 18, 42,149, 10, 75,151, 46, 53,
+ 31, 58,116, 40, 62, 41, 41,233,213, 70, 37,178,140,191,217,204, 68,154, 25,115, 79,147,217,212,159, 71,145, 40, 33,159, 18,137,
+  5, 60, 53,223, 75,120,219,219,151,119,135, 39,230,140, 98, 30, 47,136,207,208,109,110,156,249,221,119, 70,200, 39,110,199,189,
+ 57, 82,  0, 30,179, 90,135,246, 56,102,189,238, 10,166,  1,120, 29,150,177,146,247,  1,252,  1,203,252,201, 63,172,231, 82,235,
+253,105, 78,202,243,  2, 48, 11, 64,146,245,220,104,119,192,122,125, 22,238,221,202,215, 89, 76,  1,240,149,245,179,169,120, 30,
+192, 28,107,158,205,177,158,183, 20,116,178,186,176,126,  6, 48, 23,192,108,  0, 49,240,160, 65,148,150,150,202,  6, 15, 30,140,
+217,179,103,231, 12, 30, 60, 24, 39, 78,156,192,250,245,235, 99, 90,183,110, 45,163, 40, 10,133,133,133,164,178,178,146,188,246,
+218,107,177, 71,142, 28,145,189,244,210, 75,141,146,205,208, 27,183,100,101,131,187, 35,121,246,236,156, 63,195,204,177, 61, 85,
+ 65,178,140,245, 25, 49, 22,237,  4, 88, 87,248, 60,217, 82, 25, 79, 70,190, 86, 26,123, 52, 83, 42,139,125,120,101,131,229, 83,
+ 66, 51,171, 62,255,124,115,208,246,243,165, 55, 55,159, 41, 86,110, 56,126, 93,123,163,204,192, 81, 28,  5,131,206,140,138, 10,
+ 26,121,197, 10,243,174,194, 82,205,158, 91,101,202, 29, 69, 37,151,143,149,149,143,185,105, 52,125,212,144, 76,191,192,240,118,
+250,106, 69,219, 30,209,143, 80, 52,137, 28, 89,122,249, 71,125, 96,144,183,164, 67,247,126, 21, 28, 83,113,158,240,252, 66, 88,
+150,229,221,185,163,119,198,139, 87,215, 53, 93,159, 27,188, 86,148,187, 19,227,207,164,174,165,111, 59,238,  7,161,181, 20, 52,
+ 22,148,103,231,206,111, 18,154, 67, 78,117,117,181, 12,  0,248,124, 62,222,122,235, 45,228,229,229,193,205,113,127,123, 24,  1,
+ 24,141, 70,163,177,180,180, 52, 11, 77, 11,  8,212,212,114,  7,200,229, 25, 65, 65, 65, 19,156,245, 20, 27, 12,134,254, 11, 23,
+ 46,124,242,149, 87, 94,225,122,247,238, 77,  0, 96,201,146, 37,200,207,183,236, 70, 57,100,200, 16,176, 44,139,225,195,135, 83,
+211,166, 77,227, 46, 95,190,188,238,249,231,159,127,222,203,171,126,106, 98, 89,206,144,115,240,224,182,194,194,235,207,155, 77,
+230, 48,158, 64, 98,224, 17,177,138, 18,  9, 85,148,216,171,156, 22,120, 85,130, 18,221,102,197,102,131, 70, 85,213, 74,182,251,
+236,123,230, 83,191,187, 29,247,230, 72,  1, 24,  3,224, 80,157,107,135,172,215,157,  5, 15,192,187,  0, 18,  1, 84, 53,240, 76,
+149,245,254,187,112,110, 92,103, 26,128,  3,  0, 84, 13,220, 87, 89,239, 79,115, 35, 79, 30,129, 37,134,224, 67,235,231, 35, 77,
+168, 92,241, 86,175,201, 16,107,122,134, 88,207,227, 93,148, 19,  8, 32,192,137,195,213,161,148,161,  0,157, 16, 39,240,  0,  0,
+ 32,  0, 73, 68, 65, 84, 78,226,110,  4,112,145,213,211,227, 86,156, 71, 93,139,191,174, 71,192, 85,176, 63,  4,162,243,184,111,
+106,206, 59,143,251,166,222, 64, 62, 87,228,213, 33, 19,206, 21,121,107,215,174,229,242,242,242,112,250,244,105,180,107,215,142,
+251,229,151, 95,160, 86,171,113,233,210,165,123, 44,218,119,223,125, 55,167, 71,143, 30,177, 91,183,110,109, 80,222, 23,107,215,
+114,237,243, 46, 32,244,116, 62,100,237,198,113,189,175, 48, 50, 74,109,130,249, 82,245, 61,207,190,249,238,139, 57, 17,209,167,
+ 99,139,254,152,210,160,245,124,173,164,228,237, 18,154, 89, 85, 81,169,151,210,122,115, 96,254, 45,181,207,158,203,165, 85,198,
+200,190,232, 17, 26,  4,  0,216,115,246, 14,191,160,172,218, 15, 64, 96, 25,109,232,113,211,104, 74, 40, 40, 45,125,187, 33,153,
+163,198, 39, 82,221, 70,126,208,155,209,254, 81, 28,209,125,180, 68, 32, 48,211,215,254,200, 82,150, 22, 95,186, 83, 94,252, 91,
+177, 90, 94, 10, 80, 20,145,107,104,255, 89,137,253, 29,213, 27, 82,135, 84,234,115,171,215, 10,  4,180, 62,255, 87, 69,227,255,
+237, 96,111,245,215,245,  8,184,235, 85,  8, 10,202,110,178, 28,  0, 24, 57,114, 36,119,248,240, 97,176, 63,  4,128,227, 56,124,
+252,241,199, 56,114,228,136, 77, 81,115,187, 12, 20, 10,133,145, 16, 50,226,212,169, 83,134,240,240,240,184, 38,122,117,  2,  0,
+203,108,  0,235,231, 12,  0,108, 80, 80,144, 51,134,154,106,247,238,221,165,251,247,239,255,106,243,230,205,228,232,209,163,100,
+244,232,209,156,141,252,  1,203,118,247, 34,145,  8, 69, 69, 69,216,183,111, 31,  9, 12, 12,100,134, 13, 27,246, 43,203,214,111,
+180,119,142,234,114,123,200,144, 33,179, 46, 94,252, 51, 66,173,213,132,113,140,201,  4, 10, 70,198, 72, 85, 27,141, 70,165, 26,
+101,183, 88,163,225, 78,105,113,153,241,231, 61,123,215,180, 10, 14, 41,162,105, 93,181,187,121,201,175,167, 97,216, 10,166,181,
+245, 56, 92, 71, 81, 56, 12, 96,  1,128,182,  0,202, 28,100, 62,129, 37,118,224, 56,128, 27, 14, 20,142, 27,214,231,230,161,225,
+ 56,  3, 91,250, 38,  3, 72,113, 32,239,107, 88,134, 24,190,114,144, 62,251,138, 40,133, 37,206, 97, 32,  0, 53,128,247,  0,156,
+  6,208, 17, 64,161, 19, 46, 68,123,121,207,  0,120,209, 74,178,122,107, 90,245,214,243,116, 88,226,  1,190,119, 66,222, 12,  0,
+175, 56, 89,193,  9, 44,177, 16,223, 56, 72,223, 42,  0,190,176,196, 58,236,182,166, 77,108,213,164,255,  0, 48,216,234, 17,248,
+ 21,119,227, 53,234, 69, 92, 92, 92,172, 61,209,219, 43,  1,117, 99,  3,226,226,226, 98,179,178,178, 26,125,129,184,184,184, 88,
+106,202,221,113,123,246,135, 64, 80, 86, 37,160,238, 88,190,219,242,166, 40, 56,119,228,157, 61,123, 22, 17, 17, 17,184,124,249,
+114, 77,157, 25, 54,108, 24,151,155,155,139,241,227,199,223,235,166,242,242,146,137,197, 98,168,213,234,122,229, 73,207,158,133,
+ 50,162, 13,250, 93, 62, 81, 35,239, 77,191,199, 98,162,114, 85, 50,106,188,248, 30,197,169, 56,159,134, 72,108,178,212,204,134,
+149,128,133,104,215,238, 55,  0, 67, 56,112, 60,220,168,120, 67,199, 48, 96, 12, 22,231,216,197,138, 10,220, 48,208,155,248,132,
+104, 64,136,169,160,180,116, 91, 99,249,215, 86,218,109, 33,128,212,252,163,243, 11,197, 97,147, 21,165,101,226,118,101, 37,167,
+196, 16,  4,117, 42, 44, 50,135, 87,149,221,132, 80, 40,  8,237, 25,230, 61, 77,169, 49,125, 11,224,166, 35,203,213, 58,247,223,
+225, 48, 64, 66, 66, 66,108,102,102,102,142,203,236, 94,103,  8,224, 31, 16,168,219,100,175,128,139,223,231,154, 42,111,212,168,
+145,156, 76,150,  3,178,205, 18,143,125, 96,177, 47,198, 44,215, 96,228,200,145,112,113,218,223, 61,176,141,213, 63,252,240,195,
+186,102, 80,232, 20, 65, 65, 65,211,237,140, 83,163, 92, 46,223,227,228,119, 25,  0,229,187,118,237,146, 61,245,212, 83,209, 43,
+ 86,172,232, 99, 54,155,137, 68, 34, 65, 92, 92, 28,126,249,229, 23,176, 44,139,113,227,198,113,243,231,207, 39,253,250,245, 51,
+ 78,158, 60, 57, 50, 33, 33,225, 78,191,126,253,234, 87,192,230, 36, 51, 49,143,140,217,212,171,119, 31,255, 83, 39, 79,174,252,
+157,207,239,213, 33,178,195,151,126,193, 33, 37,130, 16, 49,119,120,223,161, 64,185,162,106, 68,120, 80,200,251, 93,186,116, 57,
+236, 19,230,189,254,147,101,159,211, 13,201,115, 85,  1,224,  1,136,  6, 48, 12,192, 50,  0,175, 89, 43,131,119, 29,242,251,  6,
+150,113,246,127,193, 50, 36,144,215,136,135,225, 33,171,245,235,140, 59,254,184,213,187, 64, 53, 34, 47,  4, 64,164,149,152, 27,
+147,121,218,250, 92, 40, 44,227,249, 13,201, 19, 90, 45,231, 36, 88,166, 17, 62,  3, 32,223, 42, 59,223,122,190, 25,150,113,242,
+ 77,176, 12, 93,208, 14,228, 77,  1,240,  5,128,110, 86, 37,201, 62,157,183, 97,  9, 90,188,108,125,246,  7,  7,242, 94,135,101,
+118,131,206,137,252,243,  2,176, 31,192,119, 14,202,227,105,  0,255,177,126,254,110,151, 62,129,181, 44, 51,  1,172,  1,176,220,
+122,255,118, 67, 63,152,149,149,149,  3,  0,197,197,197, 50, 91,180,127, 93,171,191,184,184, 88,102,255,108, 99,176, 61,179,233,
+ 87,186, 38, 58,191,174,149,190,233, 87, 26, 15, 66, 94,110,110, 46, 70,140, 24,129,203,151, 47,223, 37,113,169, 52,118,235,214,
+173,178, 14, 29, 58,196,178, 44, 43,139,140,140,228, 88,150,133, 94,175,199,207, 63,255,140,232,232,232,216,125,251,246,213, 43,
+175,107,110, 46,190, 15, 14,173,149, 87,221,231,142,129,118,229, 77,224,209, 80,112, 44, 48, 39,242, 43,174,154,245,129, 92,239,
+  7,121,126, 16,250,142,216, 29,123,105, 71,227,110,246,107, 37, 37,219,  1,108,239, 24,209,182, 43,128, 55,140,102, 22,219,206,
+ 23, 98, 68,152,101,184,147,112,156, 70,195, 48,203,202,203,203,239, 56, 65,166, 43, 57,142,243,206,191, 44,127, 86,121,122,107,
+171,242,219,114,148,223,209,128,207,175,242,174, 86,112, 80,170,205, 92,104,136, 48,128,207, 98,146,222,104,254,126,217,235, 15,
+  7,252,235,147,227, 74,  7, 68,147,227, 68,167, 77, 92,137,100,191,  7,163,173,158,151,236, 68, 87,191,105,243,134, 57,138,202,
+183,127,142, 56, 43,143, 36, 42,208, 68,121,247, 88,236,153,153,153, 24, 56,112, 96, 75,210, 69,184,156, 57, 23,  0, 27,249,159,
+103,176, 65,102,105, 99, 77, 37,127, 91,221,224,241,120, 33,124, 62,191,252,248,241,227, 95, 62,252,240,195,238,174,243,  0,  0,
+ 17,114,185,124,157, 85,177,152, 34,151,203,127,176,125, 58,227, 84,  4, 80, 13,160,114,197,138, 21,125,231,205,155, 87,122,246,
+252,249, 54,122,189,158,200,100,135, 32, 18,139, 64, 17, 10,135, 14, 29, 34, 61,122,244,208, 37, 36, 36, 12,158, 60,121,178,195,
+ 54,151,115,232,  0, 51,225,169,  9,107,250,246,237,223,129,102,140,143, 95,203,191,250, 34, 91, 88,240,  2,  0,136, 65,113,189,
+ 59,117, 61, 21, 26, 26,146,195,227, 11,223,254,207,226,148,234, 79,150,125,236,118, 70,214,167,  0,188, 97,213,134,198,  3,184,
+  4,192,167,158,239,237,181, 90,236,241,176,204, 35, 79,106,196,253,223, 25,150,232,114,103, 20,128, 42,235,243,188, 70,228,197,
+  0,184,234,164,188,171,214,231,119, 52, 34,111, 22,128,153,  0, 46,  0,152,111,125, 47,123,217, 50,171,245, 63,199,106, 13,111,
+180, 90,217, 13,201,155, 97,205,143,126, 86, 47, 66,125,233, 84, 91,239,219, 60,  1, 27, 27,145,247,181,181, 83,240,114,178,243,
+250,218, 65,254,125,100,245,108, 28,176, 42, 53,168, 35,251, 23,  0, 61,172,101,145,111, 85,164, 28,186,118, 87,175, 94,205,  1,
+144, 53,211, 66, 64,100,230, 26, 45, 55,115,141,182,158,133,123,220, 10,114,106, 22,121,127,254,249, 39,249,243,207, 63,107, 93,
+251,238,187,239,114,  0,144, 31,126,248,  1,  0, 72, 81, 81,237,152,186,134,200, 31,  0,218,255,249, 39,  1,106,203,123,249,131,
+  5, 22,114,252,208,154,166,186, 33,122, 59, 92,232,133,205, 92, 33,248,  0,175, 26, 53,228,111,101,245, 59, 98,177,216,169, 69,
+ 68, 56,142, 35,132,144, 37, 11, 19,123,122,133,181,139,156,192,194,171,115, 73,113, 25,207,100, 80,114,173, 67,125,136,143,183,
+128, 48, 38, 22, 10, 37,205, 16,  9,145,168, 52, 76,167, 70, 12,130,134,234,108,221,255, 31,164,139,222,126, 56,162, 33, 98,225,
+224,222, 44,128,230,144, 87,175,197,222,161, 67,  7,156, 62,125,186, 69,144, 63,251, 67, 32, 14,156,103,  0,  0, 27,101, 52,190,
+ 63, 78,219,188, 48,164,185,202,199,108, 54, 87,  1,192,128,  1,  3,154,180, 32,144,141,252,173,168,180,126, 58,187,192,142,208,
+106,152,157,  1,128, 79, 63,253, 52,252,249,153,207, 47,122,104, 96,244, 12,141, 90,237,207,152, 25, 83, 88, 88,216,157,240,240,
+240,171,106,181,122,249,228,201,147,243,157, 77,215, 79, 63,254,196,  0,120,237,217,233, 47, 14, 31, 54,124,248,120,137, 68,210,
+138,128, 51, 91,102, 78,112, 85,122,173, 98,221,149,243,197,183,189, 69,194, 38, 45,124, 87, 87,  1, 48,195, 18,164,230,204, 56,
+252, 41,235, 97, 70,195,203,139,154, 97,137,168,119,118,190,166, 12, 64,182,  3,121,187, 96,  9, 90,115,  6,207, 58,145,190,207,
+  1,124,233,168,239,  7,240,170,221,119, 26,147,247,141,213, 99,224,  8,133, 86,203,222,153,244,185, 50,223,245,115,  7,242, 30,
+117, 66,158,205,219,176,209,154, 55,206, 44, 31, 75,226,226,226, 98,234, 70,253, 91,221,234, 57,238, 52,244,184,184,184, 24,187,
+149,250, 90,154,188, 22,143,235,165,183,141, 84,187,118, 27, 95, 89,153, 62,211,118,141, 22, 80,223, 25,116,236,254,178,226, 98,
+141, 83,153, 70,  8,247,159, 89, 67,200,123,159,255,182,240,231, 53,161, 59, 79,156,188, 61, 59,196,159,125,146, 10,242, 11,224,
+ 56,128, 16,206,104,100,216, 50, 22,168,164,141,108, 64,233,109,189, 75,171,147, 89,221,252,178, 58,231, 45, 37, 11, 91,220, 74,
+128,127, 23, 60,182, 92,115,191,223,145,  5,208, 70, 44, 22,223, 30, 48, 96,192,163,103,206,156,105,178, 64,185, 92,126, 48, 40,
+ 40,104,166, 92, 46,223,232,130,  2,192, 88, 61,167,  0,128, 13, 27, 55,164,192, 50, 60,221, 44,248,246,187, 47,127,133,101, 40,
+246,190,160, 62,  5,192,224,142,214,215, 72, 33, 25, 61,242,254,177,242,106,193, 74,164,164,206, 53,183, 43,103, 75,151,247,119,
+128, 92,167,123,  1,240, 50,  1,  8, 97,193,149, 26, 12,244,230,178,178,138,115,214,142,203, 41,188,247,249,111,220,143, 31,141,
+ 37,227, 95,219,159, 11, 32, 55, 97,112,215, 55,130,130, 68,139,248, 60,194,221,174, 50, 92,185, 77, 51,155, 36,  2, 74, 44,225,
+243,120, 38,134, 21,187,146,190,204,204,204, 28,219,242,182,214, 79,183,148,177,123,166,254,217,185,254,157,152, 22,216, 88,189,
+ 39, 46, 92,255,171,229,221, 55,197,167, 41, 74, 24, 53, 69,  1, 66,  8,158,156, 56,171,222, 62,100,215,143, 25,205,245,174,101,
+  0, 72,115,144,191,157, 18,176,209,133,199,  3,173,237, 72,251,119,237, 31,248,245, 84,196,230,140,152,241,200,251,103,203,243,
+160,165, 43,  0,114, 57, 39,151,203,103, 53, 85,206, 83,111,238,231,  0,224,217,145, 61,200,183, 71, 46,126,172,231,230,172,121,
+109,234,241, 30,180,150, 68,  5,  9,248,173, 64,136,206, 71,194,175,232,213,205, 47,127,219,  1,215,100, 91, 93,217, 77, 89,111,
+254,126,145,231,223,197,  3, 64, 90,146,215, 36, 35, 35,157, 75, 78,158, 77,118,253,152,241, 79,111, 94,225, 86,131,217, 23,150,
+ 61,  1,254,118, 32,238,238, 35,236,129,  7, 30,252, 13, 53,126, 30,224, 37, 34, 96, 89, 14, 32,  4,213,122, 79,243,247,192,131,
+255,217,254,192,147,  5, 30,120,240,191,  3,198, 12,168,117, 78, 47, 59,239,129,  7, 30,252,131, 65,121,178,192,  3, 15, 60,240,
+192,  3, 15, 60, 10,128,  7, 30,120,224,129,  7, 30,120,224, 81,  0, 60,240,192,  3, 15, 60,240,192,131,127, 34,106,197,  0,156,
+ 61,123,214,237,104,212,250,130,  9,235,147, 55,254,145,232,152, 94,125, 58,201,218,180, 11,143,213,232,181,178,195,178,220,216,
+172, 67,231,114,220,149,215,123,240,152,152,126,125,  6,203,238,148,150,194, 91,226,141,155, 37,  5,177,121, 39,246,186, 45,175,
+185,223,119,238, 52, 42,102,200,224, 14, 50,137, 55, 15,124, 30,  5, 34, 38,120,114,234, 69,226,174,188,228,255,151, 27,243,208,
+224,135,100,254, 62, 60,128, 15, 36, 12,174,127,142,211,131,122, 95,143,188, 22, 43,175,209,169,102, 45,253,125, 59, 12,120,154,
+243, 99, 11,238,107,250,126,127,183,200,237,142,180,255,  7,145,247, 92,251,184, 85,169,219,242,222,168,188,119,195, 85, 79,125,
+254, 75,228,241, 81,207, 20, 89, 87,228,197,198,198, 70, 25, 12,  6, 69,110,110,174,242, 65,190,175,203, 10, 64, 67, 88, 29,131,
+206,  0, 58,192,178, 78, 64,193,252, 28,220,112,246,  7,198, 12,239, 16, 67,192, 34, 36, 32,  8,185,135,207,200,222,153, 59,  3,
+195, 70, 15,  3,163,213,201,122,116, 27,  9,150,133,108,222,139, 15,199,246,239,223,  7,215,174, 21, 65,165,212, 98,237,198, 35,
+ 57, 13,201, 27, 56,226,153, 24, 14,  4,145,157, 58,200,146,223, 92,142, 23,158,121, 12,223,252,247, 51,  0, 98,236, 61, 87,  2,
+138,130,108,245,146,197,200,207,191,  2,169, 52, 18, 34,  9, 31,183, 74,242, 99,161,171, 63,201,139, 30,235,203,  9,133, 66, 72,
+ 36, 18, 20, 20, 20,160,109,168, 31, 90,241,125,208, 54, 34,  0,129, 18,127,120, 19, 51, 40,138,  2,199,154,161, 19,241,161,186,
+163,194,164,255,102, 57, 44,168,212,133,125, 56, 95,137, 10,126,  1, 66,248,120,243, 33,148, 80,224,243,  0, 74,200, 71,206,207,
+209,156,137,227, 33,110,194,  9,167, 11,188,247, 83,171, 99,194,195,195,209,174, 99, 59,153,222, 96,  4, 37,146,  0, 38, 96, 78,
+218,169, 24,189, 78,139,175,254, 21,147,243,  0, 21,201,150, 54,143,249,127, 25,174,150,133,211,207, 39,188,179,200, 27,192, 67,
+173, 37, 94,255, 41, 45, 45,237, 38, 16,139,192,122,121,125,  8, 96,125,230,135, 41,213, 45, 37,  3,162,122,140,138,185,113,241,
+112,125,123, 13,252, 35,234,104, 70, 70,  6,249,102,211,166,203, 34,161, 80,194,178,172,191,183,143,143,207,132, 39,159,244,  2,
+ 64, 39, 39, 39,115, 45, 52,205, 20,  0, 36, 39, 39,179,205, 32,206,207,223,223,127, 65,215,174, 93, 39,139, 68,162,118, 37, 37,
+ 37, 37,165,165,165, 39,105,154,254,  0, 64,129, 27,242,  2,  2,  3,  3,151, 63,242,200, 35,143,135,133,133, 73, 79,157, 58,117,
+231,194,133, 11,199, 13,  6,195, 82, 88, 86,136,117, 26,163, 70,141, 74,141,136,136,120,219,219,219, 27,190,190,190,167, 15, 28,
+ 56, 16,253,183,241,  0, 52, 64,254, 60,111, 17,255,161, 25,195, 59,174, 98, 57,206,112,244,202,157, 79, 87,199,168, 14,204,207,
+193, 69, 71,223,149,223, 62,200, 25,171,229, 48, 85, 43,193, 55, 83,248,227,226, 21, 60,247,220,252,154,251, 20,  5,252,150,187,
+ 17,173, 34,194,101,108,181, 26, 52, 75,112,232, 80,110,236,218,141, 71, 26,144, 24,201,157, 62,113, 17,196,203, 15,103, 46, 22,
+227,220,197,231,241,213,247,191,212,220,101, 89, 96,236,208,161, 64,117, 25,  0, 95, 20, 92,184,  4, 65,171,  0, 12, 27,210, 75,
+166,212, 53,162,179, 16, 10, 32, 20,250,245, 25,128,214,222, 66,180,109, 37,134, 95,112, 16,  2, 69,190,  8, 20,243, 32,224,241,
+ 96, 50,155,161,100, 88,156,170,116,188,220,230,210, 87,219,115, 18,158,  2,126, 94, 94,  8,105, 21, 12, 63, 63, 47,112,148, 25,
+ 12, 91, 13, 51,204,240,241,241, 66,171,214,237, 80,112,185, 11,215,177,219, 55,141,118, 74,253,227,215,112,254,190,222,240, 15,
+  8, 68, 72,171, 96,104,181, 90,  8, 69, 98,  8, 12,150,197,249,162,164,145, 50,185, 66,137, 71, 94,220, 24, 91, 92,114, 11,138,
+178, 34, 84,157,203,112,164, 12, 56,221, 73,140,158, 57, 58, 54,123, 99,118,142, 19,178,238,171, 18, 80, 88, 88,200,  1,128, 84,
+ 42, 37, 45, 69, 94,120,120,248,115, 52, 77,111,  4,128,201,177,177, 84,198,214,173,238,116,190,150, 53, 82,237, 28, 57, 28,199,
+129, 16, 82,243,105,187,102,123,206,193, 78,106,174,172, 39,239, 10,249,247,240, 54, 49,219,125,  3,252,187,  1,128, 80, 34,  6,
+173, 55,128,213,234, 82,143, 31, 57,188, 36,225,157, 69,221, 51, 63, 76, 41,118, 36,231,211,119,231,114, 86, 11,139,129,101,  8,
+146,181,246, 67,245,246, 69,125, 71, 61,142, 81,143, 61,225, 82, 25,221,184,120, 88,214,169, 87, 76,236,181, 63,114, 92, 87,138,
+ 19,228, 46, 61,158,152,152,136,173,  9,217,141, 62, 19,155, 93,123, 43,146, 30,  1,150, 87, 45, 55,176,208, 51,150,114,213, 90,
+ 63, 51,  6,  7,160,139,175,160, 81,121,171, 86,173,202,121,247,245,183, 66, 39, 78,158,228, 99, 48,232,177,250,227,143,168,181,
+107,215, 26,230,206,157, 27, 14,224, 86,115,183,189, 73,147, 38,141,222,185,115,103,150,171, 74,212,204,153, 51,185,194,194, 66,
+ 84, 85, 85, 97,197,138, 21,240,245,245, 69, 76, 76, 12,164, 82, 41, 54,110,220,232,110,187, 27, 57, 96,192,128, 77,111,190,249,
+230,181,174, 93,187,110,236,223,191,255,165, 59,119,238,180,203,205,205, 29,240,194, 11, 47,236, 81,171,213,169,176,108,  0,231,
+ 44, 98, 39, 79,158,156,153,146,146, 18,108, 50,153, 32,145, 72,224,237,237,221, 70,171,213, 62, 61,113,226,196,  9,231,207,159,
+159, 11,224,191,206, 10,139,136,136,104,187,104,209, 34,228,229,229,113, 26,141, 38,160,206,109, 30,156, 91, 85,181, 89,112,246,
+236,217,186, 94,  2,231, 20,128,213, 49,104, 15,203, 14,120, 60,  0,102,173,145,185,153,123,181,252,147,161,157, 67,231, 63,210,
+163,205,146,214,254,146,182,171, 81,182,  5,192,149,249, 57, 13,111, 82, 99,172,150,163,117,167, 71,177,252,237,201,216,104,199,
+ 73,135,143,167, 67,171, 51, 98,220,232,249,120,120,216, 76, 60,147,248,  8, 36, 18, 17,104, 51,  3,141,142,150, 53, 92,201,138,
+  0, 26,152, 60,125, 61, 94,126,115,118,205,213,177, 15,199, 64, 44, 22,225,199, 67,191, 96,239,177, 92,108,218,240, 25, 12,122,
+ 35,132, 60, 62,124,188,132,208, 86,149,196, 42, 75, 80,239,238, 99, 28,199,  1, 28,107, 57, 40, 22, 28,199,193, 72,139, 44,221,
+147,  8,224,104, 51,204, 60,192, 12, 51,204, 52, 11,198,220,184,  2,187,240, 69, 41, 23,232,199,192,207,215, 27,225,237,162,208,
+173,119, 39,248,250, 72,160,170,174, 64, 89, 69, 25, 20,170, 59, 48, 25,  8,188,188,188, 16, 18, 50, 12,149,229, 33, 92,171,208,
+143,234,119,227,143, 92,204, 49,122, 29,244,124, 64, 40, 22, 66,175, 19,130,214,  9, 97, 16,139,192, 39, 12, 56,240, 96,208, 87,
+ 67,175,211,160, 93,187,182, 50, 33,143, 15, 57,212,  8,165,167,163,238, 26,243,117,177,114,211, 74,135, 21,232,237,164,183, 27,
+239, 43, 19, 18,106,237,239,158,144,144, 48, 48, 40, 40, 40,159, 16, 98,224, 56,142, 31, 24, 24,232, 85, 80, 80, 16,108, 93,221,
+173,173,187, 21,121,238,220,185, 83,237,126, 35,198,221,213,226,234,101, 75, 66,184, 57,115,230,196,174, 93,187,214, 37,153,225,
+225,225,201,131,  6, 13,250, 96,120,191,126, 48,137, 68, 72, 75, 75, 99,103, 79,153, 18,151,254,195, 15,217, 46,254, 62, 86, 45,
+ 89, 82,115,190,224,253,247,145,182,116,105,163,231,206,136,173, 67,238,156,117,179, 24,110,244,232, 14, 61,  1, 92, 79, 73,201,
+212,187, 72,254,185,189,123,246,244,179,181, 25,111,177,  4,183, 43,202,161, 86, 40, 49, 96,208, 96,175,159,191,218,144,157,240,
+206,162,158,153, 31,166, 56, 90,155,157,153,247,193, 90,254,179, 79, 79,224,119,150, 74, 89,171, 18,128,247,211,214,212, 86,162,
+ 23,188,  6,  0,120,247,245,185,110,109, 39,237, 22,249,219,144, 25,228,194,195,163, 93, 18,237,205, 39, 56,183,244, 69, 16,191,
+ 86, 48, 95, 63,  7,227,245, 63,145, 47,215, 34,122, 95,185, 83,223,239, 63, 96,192,209, 89,211,146, 34,147, 94,122, 33, 32,243,
+187,239, 89,169, 84, 74, 45, 79, 73,133,239,146,229,248,241,199, 31, 75, 51, 50, 50,168,230,242,  2, 76,154, 52, 41,110,231,206,
+157,  7,118,238,220,105, 59, 31, 99,251,223,129,130, 18,115,224,192,  1, 89, 81, 81, 17, 58,118,236,136, 17, 35, 70,192,223,223,
+ 31, 74,165, 18,183,110,221,194,141, 27, 55, 48,102,204, 24,110,204,152, 49,177,111,189,245,150, 43,229, 52,233,145, 71, 30, 89,
+189,106,213,170, 45,253,251,247, 95, 77,  8,185,101,215,143,147,248,248,120, 31,  0,185,214,195, 41,121,115,231,206,221, 54,103,
+206, 28,234,244,233,211, 32,132, 32, 56, 56,184,230,216,183,111,159,112,200,144, 33,159,221,188,121,243,132, 35, 65,147, 39, 79,
+ 38, 59,118,236,224,138,138,138, 34,242,243,243,113,253,250,117,162, 82,169, 58,  2,224, 79,156, 56,209,188,107,215, 46,238, 65,
+146,191,237, 90, 93, 37,128, 95, 15,249,  7, 71, 71,  5, 39,245,139, 12,154, 78,  8, 17,112, 28,103, 98, 45,  7,109, 54, 25,244,
+ 66,138,109,219,187,181,248,237, 86,126, 29, 59,237, 60,117,227,251,213, 49,236,209,249, 57, 13,239, 22,  7,  8,209,163,123, 87,
+ 80, 84, 14,242,149, 85,  0, 46, 65, 85,122, 21,  2,177,  8,187,246,124, 10, 93,165, 25,211,159,127,  3, 44, 11, 60, 57, 97, 40,
+204,124, 31,135, 47,151,159,127,  9, 44, 11,140,235, 75,172,188, 18,  9,131,145, 70,252,216, 49, 16,  7, 80,216,180,121, 63, 40,
+ 10,216,246,253, 70,148, 94,255, 51,118,223,150, 85, 57, 13,109,151,200,114,  0,203,178, 96, 89, 22,102,179, 25, 70,  1,  7, 19,
+ 49,129,166,105,232,188, 12,  0, 43,  6,197,153, 97, 22,114,168,166, 13,208,170, 85,141,166, 45,196,199,  8, 62, 95,130,224,224,
+ 96,116,234,212,  9, 97,173,  7,  3, 60, 10,102,243,105, 80,156, 18,  6, 45,  3, 51,171, 69,217, 45, 57, 66,130, 43, 17, 28, 48,
+ 12, 31,174,250, 57,230,251,111,239,149, 37, 49, 48,224,140,149,128, 65,  4,154, 50, 65, 43,228,163, 90, 34,  0, 95, 32,  4, 88,
+111, 16, 30, 65,181, 86,  7, 69, 89, 17, 10, 78, 31,131,188,184, 24, 44,203,130,226,120,110, 85,154,175,214,223, 85,156, 95,120,
+229,  5,199,253,100,237,213,199, 12,153,153,153,139,222,124,243,205,217,197,197,197, 20, 33, 36, 36, 35, 35,227,123, 88, 54,119,
+242,114,183, 34,207, 74, 72, 16,172, 91,183,110,243,157, 59,119,176,109,219, 54, 68,119,237,202,107,142,  6, 34,149, 74, 73, 98,
+ 98, 98, 12,199,113,178,181,107,215,186,188, 97, 17, 77,211,233,195,173,117, 74, 40, 20,162, 75,151, 46,216,126,232, 80, 86, 72,
+ 72,  8, 42, 42, 42,156,150,115, 31,183,170, 37,  3,  7, 14,228,108, 27,196,216,125,254, 57,106,212,168,210, 69,139, 18,252, 83,
+ 82, 28,175, 30,151,240,206, 34,111,111, 19,179,189,119,207,158,126, 60,138,194,171,207, 78,135,222, 96, 68,218,151, 95,194, 75,
+ 34,129,193, 96,128, 65,175, 71,223,254,253, 58,255,242,221,119,115,208,240, 86,222, 53,125,206,210,  5,175,177,  0,168,171,133,
+133, 84, 93,194,175,219, 60,221,121,241,246,221, 70,198,222,188,124,132,139,123,242,197,216,172,221, 95,186,165,  8,216,239,218,
+199,109, 13,116,120,221, 17,122,  4,240, 81, 84,109,198,225,184, 16,  8,230,103, 64, 61, 61, 10,252,192, 80,151,200, 63, 49, 49,
+177,204,164,213,221,122,233,213,217,237,223,121, 99, 33,214,110, 72,191, 56,104,192,128, 14,233,107,210,189, 94, 95,248, 22,190,
+ 27, 58, 24,155, 55,111,158,  1,203,174,165, 77, 33,254,152,157, 59,119,202,108,100,159,145,145, 81,  0,203, 54,237,  7,157, 81,
+  0, 14, 28, 56, 32, 11,  9,  9, 65,255,254,253, 25,138,162,248, 22,239, 44, 11,129, 64,128,160,160, 32,180,110,221, 26, 55,110,
+220,192,129,  3,  7,100, 46,180,185,132,241,227,199,127,180,106,213,170, 53, 93,187,118, 93, 79,  8, 97,  1,124,  6,224, 49,  0,
+ 71,  8, 33, 75, 97,217, 95,229, 45,  0, 75,157,145,183,106,238,220, 31,134, 39, 36,144,221,187,119,131,207,231, 67, 38,147,225,
+220,185,115,232,212,169, 19,150, 45, 91,134, 94,189,122, 97,246,236,217,252,247,222,123,111,149, 35, 97, 59,118,236,224,  0,192,
+203,203,235,118, 64, 64,  0,196, 98, 49,132, 66, 97, 53,  0,198,129,199,238,190,145,255,172, 69, 31,214, 92,251, 60,229,157,122,
+149,128,250,102,  1, 80,124, 30,197,103, 88, 78,163, 55, 49,183,  8, 33, 34, 31, 17,175,143,159, 16,209,146,158,163, 58, 34,246,
+101,160,219,  8,180,241,230, 38,205, 24, 22,245, 78,144,159, 87,220,234, 24,248, 55,156, 28, 22, 60,158,173,207,246,  3,208, 14,
+254,225,227,161, 55, 27,176, 62, 99,  3,190,217,188, 13, 99, 98,135,  1,  0,116, 58,128,199,111, 88,148,196,171, 43,  0,192,108,
+182, 87,164,202,  0,228,130,226,137,144,244,220,139,136, 79, 76,196,207,123, 44, 68,230,229, 13,104,171,111, 55,154, 89, 38,240,
+106,200,223,196,152, 97, 84,155,160, 83,234,160, 52,209,144,235,104, 40,140, 26, 40, 53,213, 80,148,107, 32, 87, 26, 32,175,110,
+120,  9,245, 87,159,233,192, 17, 66,192,227, 17, 16, 74,  4,179,153,  3,163, 43,134, 86,121, 21,165,101, 42,200, 21,213, 80,105,
+204,144, 43, 12, 40, 41, 41,195,197,203,103,161, 84,157,197,224,  1,  3, 27,220, 27,157,  7,128,210, 24,160,191,118, 11, 85,127,
+ 92, 66, 85,113, 17,212, 42, 57,212, 42, 57,138, 46,158,198,241,204,175,144,187,117, 19, 42,174, 93,131,153,102, 45,173,137,247,
+151, 13,  3, 18,235, 65,199,199,199,119, 95,190,124,249,155,109,218,180,209,110,219,182,173, 79,102,102,230, 79,  0,250, 91, 11,
+221,237,  5,167,132, 97, 97, 11,  0, 96, 72,175, 94,152, 51,103, 78,249,169,203,151,179, 31,234,214, 45,166, 57, 18,191,117,235,
+214, 28,  0,100,238, 92,139,149, 57,119,238, 92,151,228,154, 68, 34,  0,192,246,237,219, 17, 26, 26,138,119,230,206,197,130,  5,
+ 11, 16, 18, 18,210, 34,198, 97,109,164,159,145,145, 81,115,  0,192,225,195,135,195,  1, 76,112, 82,204, 67,  1,129,129,221,120,
+ 20,133,231,227,227,161, 84,169, 81,114,251, 22,  4,  2, 62,248,124,203, 33, 16,  8, 32,146,120,161,163, 84,250,113,255,209,163,
+157,178,216,175, 22, 22,226,219,237, 63,213, 28, 54,188,159,182,  6,239,167,173,193, 94,217, 97,151,223,119,116,194,123, 49,  0,
+112,243,242,145,156,209, 22,242,151,161,133,172,118,116,254,235, 79, 80,254,242,  0,140,202,170, 64,143,  0, 62,120,126, 65, 96,
+ 20,229,136,222, 87, 14,111,190,133, 31,120, 14,230,100,221,184,118,173,234,243,140,255,118,253,250,191, 95,227,211, 47, 63, 43,
+250,108,213, 71,239,191,249,218,188,  9,203, 63, 88, 14,137,175, 55, 70, 12, 25,134, 83, 39, 79,125,253,108,210,179,110,191,179,
+141,252,109,231,187,119,239,198, 67, 15, 61,212, 17,192,116,103,221,254, 38,147,  9,  3,  6, 12, 96,205,102, 51, 95,165, 82,193,
+104, 52,194,104, 52,226,242,229,203,144,201,100, 56,118,236, 24,218,180,105,  3,147,201,132,153, 51,103, 58,147,214,169,137,137,
+137,159, 76,158, 60,217,111,253,250,245,126,132, 16, 33,128,195,  0, 84,  0,  6,  0,248,201, 78,241, 60,  8,160,151, 35,121, 59,
+223,124,243,135,  9,125,251,146,239,226,227, 81,250,251,239,248,232,163,143,216,159,127,254,249,255,221,188,121, 51, 84, 38,147,
+189,188,104,209, 34,152, 76, 38, 12, 27, 54, 12,222,222,222, 67,157,205,191,128,128,128,202,214,173, 91,195,199,199,135,243,246,
+246,190,105,205,195,  7, 94,  7,237,149,129, 70, 61,  0,243,115, 80,177, 26, 21,233,191, 93,171,200,138,142, 10,142, 29, 40, 13,
+178,172, 35, 62,126, 25,126,243, 25,131,131,127,148, 99,104,207, 64, 60, 34,253, 25,190,191,124,208,127,108, 63,233,244,205, 71,
+ 46,254, 81,159,240, 54,157, 19,  8,199,149,112, 19,159,155,143,  5,175,125,  6, 64, 14,203,178,201, 70, 68,118, 29,  0,177,136,
+ 15,189,214,  8,208, 22,  5,193,215,215, 23,229,242,  6,247,203,134, 94,119,133,  0,224, 46,254,246, 37, 40,106,109, 45, 35,129,
+213,255,  9,131,209,  4,137,143, 24, 16, 90, 20,  4,141, 90,141,161, 67,135,226,200, 79,223, 53,108,142,176, 52, 88,150, 15,134,
+ 97, 96, 52, 26, 81,205,231,129, 79, 83,192,109, 53, 24, 47,  6,102, 33, 11, 78,192,131,142,199,  7,163,213, 65,105,108, 56,214,
+201,215, 71, 11,134, 33, 48,210,102, 40, 85,106,228, 95, 43, 70,201,237, 74,232,105, 19,212,213,114, 84,107,148, 48,152,105, 16,
+ 62,129, 86,167,130, 90,119,  3, 69,165, 42, 84,105, 26,222, 75,194,108,167,165, 49, 42, 45, 74,206, 94,194,157, 75, 55,160,214,
+ 92,131, 70,169,  4,  7, 62,  4, 60,  2,142,  8, 64, 81, 22,175,175, 43,234,230,219, 73,111, 59, 53, 28,224,  0,119,  0,220, 89,
+188,120,177, 30,  0, 22, 45, 90,116, 42, 37, 37,197,219,154,116,  3,128, 98,119,  5,175, 91,183,110, 69,124,124, 60,  0, 32, 42,
+ 36, 36,212, 58, 38,206,107,206,198, 97,115,255, 91, 61,  1, 14,179, 47, 60, 60,124, 52, 77,211, 72, 75, 75,195,211, 79, 63,141,
+201, 99,198,220,237,232,207,159,183,120,130, 66, 66, 56,103,227,  2, 22,188,255,126,205,152, 63,  0,188,181,100, 73, 45,207,128,
+147,110,255, 90,176, 89,255, 54,210,183, 33, 35, 35,  3,201,201,201,200,206,190,254, 45,128,239, 28,118,104,124,254,127, 12,180,
+ 17, 60, 30, 15,151,175, 23,128,227, 56, 92,204,191, 10,154, 54,129,  2,  1,159,207,  7, 33,  4,172,217, 12,189, 86,135,171,191,
+253,118,200,137, 60,164,236, 73,255,217,167, 39,216, 91,252, 20,  0,156, 56,115, 30,157,163, 34, 93,154,166,156,157,249,159, 26,
+107, 63,219, 98,249,219,134, 66,184,199, 39,189, 24,187,111,167,123,222,128,102,129,252, 54,132, 17, 93, 80, 62, 71, 12,209, 35,
+ 83, 97,206,219, 15,179,218, 18,111, 80, 62,231, 97, 68,102,228,194,204, 54, 94, 85,186,118,238,218,214,203,203,219,235,211, 47,
+214, 25, 98, 71,141, 18, 14, 30, 58,228,187,  3,123,127,121,252,242,181,124,128,229, 32, 22,137, 48,108,224, 48,236,217,189,  7,
+ 99,199,142,229,246,239,223,239,116, 87, 80,215,234, 63,112,224,  0,174, 95,191, 78,  3, 16,158, 60,121,146,158, 61,123,246,180,
+140,140,140,103, 29,201, 41, 44, 44, 68,199,142, 29,  1,128, 42, 44, 44,196,185,115,231, 16, 25, 25,137,168,168, 40, 40, 20, 10,
+228,229,229,161, 67,135, 14,  8, 13, 13, 69,100,100, 36, 10, 11, 11, 27,175, 40, 20,149,148,152,152,248,193,200,145, 35,125, 78,
+157, 58,229,199, 48,204, 75, 18,137,100,162, 94,175, 95,  5,203,214,231,176, 42,  0,107, 96,217,157,143, 70, 35,211,219,  5,  2,
+ 65, 82,230,188,121, 27, 31, 14,  9, 33, 21, 11, 23, 98, 40,203, 98,205,238,221, 92,169, 78,247, 34,238,110,203,190,241,226,197,
+139,235, 25,134,225,251,248,248, 32, 60, 60,220,199,100, 50, 65, 32, 16, 56,122,125,175,210,210,210,174, 55,111,222,132, 86,171,
+ 37, 10,133,162, 59,159,207,143, 99, 24,166,197,238, 56, 86,223, 16, 64, 24,128,142,147,162, 35, 94,109, 31,236, 61, 29, 38, 61,
+208, 53, 14,103, 66, 38,225,145,185, 95, 65, 95,169,  4,207,207, 23,178,213, 73, 24,209,227, 55,  4,157,207, 26,  9, 32,162,161,
+ 31,232,228,215, 14,127,156,223, 97,231,112,208,  2, 48, 89, 14,147, 17,124,150,  7,202, 74,226, 59,127,116,188,139,200,254, 11,
+ 28,198,246,239, 85,199,  8,229,  3, 16,  0,  2, 49, 24, 98,134,213, 14,198,148,233,243,  0, 64,150,242,238,220,  6, 27,130,153,
+229,192,176, 20, 40,134,  1, 69, 27,161,163, 44,117, 71,207,227,193,155,209, 67,173,231, 64,  4,  4,102,179, 25, 58, 51, 80,174,
+109,120,183, 83,134,102, 97, 16,240,192,234, 24, 48,172, 10,154,106, 19,120, 68,  0, 35, 99,  2,205,209, 96, 76, 52, 32,100, 65,
+ 17,128,136, 88,168,244,102,148, 85,232,160, 53, 50,245, 26,201, 20, 49,215, 12, 26, 17,114,119, 72,215,100,208, 67, 37,151,131,
+ 34, 60,240,249, 28,192,241,193, 35,238,155, 58, 87,138,174,208, 93, 35,187, 10,157,113,251, 55,164,155,193,110, 15,237,148,148,
+148,  9,  0,110, 46, 90,180,168,191,191,191,127,128, 74,165, 42, 74, 73,113,125,135,204,185,115,231,190,176,110,221, 58,180,110,
+221,218,254,154,114,205,154, 53,217, 15,117,235, 54,250,212,229,203,  7,155,171, 33,204,157, 59, 55,214,110, 40,160, 49,242,143,
+ 25, 52,104, 80,248,240,126,253, 64,124,125,145,146,146,130,133, 11, 23, 66, 32, 16,192,164, 80,192,223,223, 31,239,204,157, 91,
+ 19, 23,144,156,152,232, 80,  9,168, 59,198,239, 40, 38,160,177, 17,133,186,214,191,  3,239,128,195, 42,163,144,203,187,249,248,
+250,162, 82,161,128,236,196,  9,240, 41, 30,140, 38, 19,116,122, 61, 88,150,173, 81, 92, 24, 19, 13,218,104,116,102, 72,131,  5,
+ 64, 89,135,  1, 88,187,138,111,176, 94,199,251,105,107,132,  0,208, 89, 42, 45,191, 81,191,109,225,146,151,170, 93,199,232,152,
+125, 59,191,116,197,221,220,112,  6,187,224,246,175,229,150,221,250, 95,244,123,238, 13,136,162,250, 88,250,138,202,219,200,151,
+ 91, 20,127,209,208,241, 40, 54, 51,240, 90,219,248, 80,179, 90,173, 14, 16, 73,196,232, 20, 21, 37,190, 81,114,179, 77, 85, 69,
+ 21,166, 60, 59, 93,182,247, 96, 22, 86,127,152,182,109,231,222,221,241,157,163, 58, 35,233,233, 25,200, 61,115, 12, 99,199,140,
+225,246, 31, 56,224,240,157,237,173,254,  3,  7, 14, 32, 46, 46,206,166, 44, 10,111,221,186,133,217,179,103, 11,  1,192,153,216,
+130,170,170, 42,140, 24, 49,  2,102,179, 25,133,133,133, 56,118,236, 24,122,244,232,  1,127,127,127,180,111,223, 30,253,250,245,
+  3, 69, 81,160, 40, 10,109,218,180,113, 84, 79,123,244,234,213,235,147,161, 67,135,242,206,159, 63,239,103, 54,155,203,182,111,
+223,174,214,235,245, 41,  0,236,  7, 77, 95,125,252,241,199,139,247,238,221, 27, 69,  8,185,141,134,119,180,237,159, 60,124,248,
+198,193,124, 62,169,248,224,  3,112, 38, 19,100, 60, 30,155,171,211,205,132,101, 27,119, 27, 94, 89,188,120, 49,159,162, 40,200,
+229,114, 92,191,126,189,188, 87,175, 94,161,206,148,115,120,120,120,144,153,227,160,215,233,112,241,226, 69, 48, 12,211,162,103,
+158,240,235,144,127,231, 48,127,201,240,199,251,134,207,246,147,  8,  6, 49,102, 86,193,231,204,126,  8,104,195,187,173, 52, 64,
+ 95,169,  2,132,124,152,149, 26,148, 40,104, 32, 56,  2, 20, 75,139, 27,115,241, 94, 83,171,209, 37,192, 15,140, 17,184,150,243,
+ 45, 58,197, 60, 86, 99,192,153,104, 19,  4,160, 80,109,176,236, 80, 59, 54,102,  0, 36,193,225, 88,181,241,167,  6, 19, 60,182,
+ 55,193,222,115, 28,  4, 98, 64, 24,241, 24,232,226,163, 53, 94,  0,129, 80,  4, 19, 12,240,145, 88,118, 36,221,189,119, 11,254,
+ 56,153,211,168, 75,146,101, 89,  8,105, 61, 76, 16,130,162, 24,192, 96,233,216, 76, 38, 19,140,  6,  1,120,124,  1, 96,  0, 56,
+214, 50, 68, 16, 41,141,  2,114,235,159, 81,160, 51,176,224,241,  8, 76,140,  9,  6, 35, 11,181,198, 82, 15, 77, 44,  7,218,200,
+  2,124,128, 39,224,129, 47,  6,136,222, 12,150, 48, 96,161,135, 70, 15, 88,118,150,108, 28,102,  0, 20, 11,112,  4,160, 40, 22,
+132,240,192,114,  4, 20,101, 53,156, 88, 10, 44, 69,129,176,206, 25,200,118, 65,126,194, 38,214, 35,111,  0, 33,139, 22, 45, 42,
+ 79, 73, 73,137,  5,240,212,162, 69,139,198,164,164,164,104,  1, 84,185,229,178, 74, 72, 16,174, 91,183,238,203,248,248,120, 72,
+ 91,181,170,185, 46,109,213, 42,192,234,  5,  8,121, 16, 13,134,166,105,153,109,236,159,211,104,240,175,127,253, 11,198,170, 42,
+216, 34,223, 58, 89,149, 21,129,209,136,  9, 19, 38,148,151,150,151, 79,115,198,210,110,198, 33,153, 90, 30,128, 70, 60,  4, 56,
+125,250, 52,169, 79,121,168,165,212, 26,105, 40,105, 57, 12,  6,  3,  2,252,253, 33, 22,138, 96, 50, 51,224, 56, 14,102,179, 25,
+ 52, 77,195,100, 50,129,101,204,206,198, 51,176, 87, 11, 11,169,206, 82,169,205, 34, 96,175, 22, 22, 82,223,110,255, 73,108,239,
+ 17,232, 44,149, 42,155,203,125, 95, 82,144,215,108,150,191,187, 49,  0,163,178, 42, 80, 46,221,  6, 97, 68, 23,144,168, 62,136,
+220,240, 59, 42, 13, 44,188,249,  4,244,175, 63,226,202,245, 27,112,180,107,177,158,161,113, 58,247, 36, 62, 89,245, 49, 30,142,
+ 25,142,197,255,111,  9,126,217,247, 11,190,219,244, 13,134,142, 28, 30,223, 94, 26,  1,190,151,  0,  7,143, 30,196,230,175,191,
+193,142, 31,183, 67, 40, 22,115,187,119,239,110,116,125,136,157, 59,119,214, 34,126, 27,148, 74,215, 55,184,211,104, 52,240,247,
+247, 63,  1, 96,176, 84,103, 60,227,177,  0,  0, 32,  0, 73, 68, 65, 84, 42,197,192,129,  3,193,227, 89,134, 89, 35, 35, 35, 33,
+ 18,137,160, 82,169, 32,149, 74,225,235,235, 91,164,209,104, 34, 27, 17,119,241,252,249,243, 43,118,236,216, 49,174,115,231,206,
+221,182,111,223, 94,173, 80, 40,150,  2,216,108,175,191,140, 26, 53,234,205, 13, 27, 54,108,  5, 80, 14, 32,  1,192,111,  0,250,
+214, 35,239,247,181, 50,217,138,128,188,188,119,159, 97, 24,124, 12,176, 95, 86, 87,207,168, 35,239,169,121,243,230,125, 60,107,
+214, 44,220,184,113,  3,123,246,236,  1,195, 48,135,  0, 60,227,196,235, 83,  1, 60, 94,149, 15, 77, 67,251,251,239, 92,  8,203,
+106,174,  1,154,191,186,143,234,215,175, 31,206,158, 61, 91, 51,238,223,104,130,235,156,119,152, 20, 29,177,220, 79, 34, 24, 84,
+161, 54,252,114,252,106, 69, 10,120, 34,224,202, 81, 60, 42,229,240,127,175, 77,192,192,158, 82,204, 75,126, 28, 79,118,164,129,
+ 11,  7,192,  9, 36, 12, 26, 13,214, 81, 34, 95, 89, 12,190,  8, 24,251,228, 27,216,252,233,135, 22, 99, 81,103,132, 89, 15,252,
+ 40, 59,139,236, 83,150, 25,133,237, 34,162, 64,241, 29,147,215,184,190,  4, 38,  3,176,123,207,126, 68,143,121,205, 98,253, 67,
+  0,158,  4, 72, 28,159,128,113, 35, 39, 90, 26,126, 81,  1, 24,  3,221,184, 70,207,113, 96,136,133,224,141,180, 37,248,207,104,
+208, 67,167,211,161,186,186, 26, 26,181, 10, 26,141,  6,106, 77, 53, 12,213,213,208,235,245, 13, 87,254,106,  2,189,193, 12,189,
+193, 12,173,206,  4, 77,181, 17, 10,141, 17, 74, 53, 13,149,198,  4,165,210,242, 41,175, 98, 32, 87, 48,144,171, 24, 84,202,105,
+220,169,108, 56,141, 20,199,193, 12,128,152,  9,  8,197,130, 35, 28,192,113,224, 56, 30,204,236,221,226, 99,173,189,135,171,190,
+241,238, 67,187,227,216,222, 99,248,229,208, 47, 53, 74,193,149,162, 43,174,214,185,112,  0, 29, 83, 83, 83,207,  1, 88,251,206,
+ 59,239,188,222,161, 67,  7, 38, 35, 35,131,164,165,165,185,172,  1,207, 74, 72, 32,194,176,176,157,  0, 16, 22, 22,118,207,253,
+ 57,115,230, 48,121, 87,174,108,105,174, 88,  0,155,251,223,217,125,227,109, 99,255,  0,240,195, 15, 63,224, 90, 89, 25,  0,224,
+231,156,156, 90,247,174, 92,185, 18, 26, 18, 18,162,120, 16,138,202,232,209, 29,108,243,174,107, 93,183,157,219,238, 59,244,105,
+250,249, 94,102,205,102,168,229, 10, 84, 86, 86,162, 74,169,128, 86,167,131, 86,167,131,166,186, 26, 90,149, 26, 26,165, 18,  6,
+189, 14,180,193,  0,150,113, 24,232, 76,117,150, 74,109,125,  6, 11,128,182, 31, 14,  0,128,111,183,255,132,247,211,214,  4,  0,
+  8,115,185, 34,118,140,142,169,171, 56, 68,245, 24, 21,131,  7,140,219, 83,164,136,220,240, 59, 72, 84, 31, 24, 15,111, 67,209,
+243,253,225,205, 39, 56, 26, 23,  2, 70, 85,129,232,253,229,224, 59,168,126, 89, 89, 89,228,229,249,175,224,218,149, 43,200,205,
+ 57, 10,127, 95,127, 76,157, 50, 21,  1,193, 65, 56,115, 50, 15, 62, 66, 49,188,189,189,209, 70,218, 22, 91,190,223,130,119,222,
+123, 23,213, 74,247,119,169, 29, 48, 96,128,203,223,241,245,245,133, 74,165, 26, 76, 81, 20,221,190,125,123, 12, 26, 52,  8, 61,
+123,246, 68,171, 86,173, 32, 22,139, 33,149, 74,209,183,111, 95,  4,  4,  4, 64,163,209, 68,250,250,250, 58, 18,185,242,240,225,
+195, 89,155, 54,109, 18, 40, 20,138,197,117,200, 58, 97,196,136, 17,159,108,216,176,225,171,176,176,176, 15,  8, 33, 62,  0,222,
+  1,208,152,155,236,189,229, 26,205,202, 23, 25,198,252,165, 94, 63,173,142,188,248,103,146,255,189,227,181,215, 23,240,174, 92,
+185,130, 19, 39, 78, 96,195,134, 13,213,  0,254,207,201,215,167,188,140, 70, 49,119,233, 18,218,103,103,147,240,210, 82, 30, 30,
+ 80, 12, 74,221,160,247,134,130,224,235,118,  2, 34, 30, 69,124,139,171,180,223,109,201,189,241,127,103,139,228, 39,245,102,114,
+ 13,149, 55, 32,222,241, 42, 62, 24,166, 65,222,210, 65, 88, 29, 91, 13,239, 31,231,  0,242, 18, 84,115,226, 11, 86,205,171,  1,
+220,141,234, 63,119,254, 39,252,251,223,155,208,201,175, 55,254, 60,126, 14,  7,100,151, 16, 59,180, 39,226, 70, 88, 42, 26,199,
+227,131,118, 97,162,196,216,254,221,176,124,229,135,216,127, 65, 13, 31,105, 15,140, 31, 63,  1,191, 28,218,137, 61,191,108,177,
+188,156,217,  4,145,160,241,126,142, 99,205, 48,179, 22,107,  6, 86,107,134,166,105, 24, 12,  6,232,245,122,104,117,122,232,117,
+ 90,232,117, 90,232,140,  6,208, 70, 67,195,238, 47,189, 47, 84,213,102,168,245, 44,212,122,214,242,191,134, 69,181,150, 65,181,
+142,129, 66,110, 70,149,220,132, 42,133,  9, 85, 85, 38, 84, 86,210,184, 83,105,106, 84,  1,184,235,254,191,215, 84,227,243, 56,
+240,  8,  1, 87, 39,234,159, 35,142,235,220,219, 73,111,163,251,208,238, 53,231,217, 27,179,107, 60,  2,199,246, 30,195,149,162,
+ 43, 55, 92,169,112,219,182,109,251,149,227,184, 94,241,241,241, 73, 81, 81, 81, 33,  0, 40,150,101, 69, 38,147, 41,112,254,252,
+249,126, 13,184,130,235,133, 48, 44,236,253,117,235,214,141,139,143,143, 71, 84, 72,136, 83, 67, 87, 77,116,255,199,  0, 64,116,
+183,110, 14,  3,216, 58,183,110, 29,155,150,150,134, 63,139,138,212, 59, 14, 28,192,229,203,151,107,172,254,174, 93,187,194,122,
+143,222,113,224,  0,138,138,138,112, 37, 47, 79,239, 72,230,130,247,223,199, 91, 75,150,212,184,247,109,255,219,206,109,255,187,
+ 18, 11,144,146,146,201,141, 26, 53,234, 85,123,210,183,125, 14, 28, 56, 16, 41, 41,153, 78,117, 76, 87, 47, 23,228, 49, 12,  3,
+154, 54, 66,126,167, 28, 21,183,203, 80, 89,118,  7,149,101,119, 32, 47,175,128,178,170, 10, 70,173,214, 18, 63,163, 84,194,137,
+ 32, 64,230,253,180, 53,252,247,211,214,240,  1,168,  1,176,131,  7,244,185,231, 33,187,184,  0,167,209,182, 99,116, 76,105, 65,
+158,172,239,160,187,105,232,216,255,201, 24,101,197,117, 89, 83,234,  7, 73, 84,212,178,252,221, 65,190, 92,139,226,151, 30,  2,
+119,227, 60, 66,255,123,  6,222,235, 79,227,246, 20, 41,  6,238, 47,  7, 17,136,192, 39,  0,159,114,172,128,158,191,112,129,252,
+235,195,229,152,247,214,155, 48,177,102, 92, 46,188,138,233, 83,167, 65, 40, 22, 99,215,143,187,  1,147, 25, 70,131, 17, 71,243,
+142, 67,175,175,198,172,153, 51, 15,191,252,242,203,141,149, 53,153, 52,105, 82,236,152, 49, 99, 64,  8, 65, 86, 86,214, 61, 46,
+253,183,223,126,219,233,247, 12, 14, 14,198,173, 91,183,  0,128,159,158,158,142,138,138, 10,244,238,221, 27,  1,  1,  1,160, 40,
+ 10, 39, 79,158,  4, 69, 81, 32,132,224,214,173, 91,  8, 14, 14,118, 70,236,  7, 52, 77,143,  4,240,131,221,181,169, 35, 70,140,
+ 72,123,233,165,151,  2,211,211,211,197,132, 16, 10,192, 78, 88,102,  1,220,113, 32,111,225,  9,147, 41,186,174,188,103, 22,237,
+216,250,244,180, 57,100,220, 43,233,200, 57,113, 17,105,105,105,172, 90,173,126,  1,150,217,  5, 78,121,183, 58,249,250,  6,180,
+ 47, 43,195,112,157, 14,109,  4,  2,111,111, 30,239,129, 45,183,223,175, 95,191,154,195,169, 33,  0,  0,  5, 91,142,223,152, 43,
+215, 26, 79,  3,200,  7,208, 38,247,106,197,231, 35,187,133,189,199,191,113, 34,  8, 27,102,  0, 34,111,192,168,  5, 56, 14, 38,
+158,248,206,209, 63,111,127,137, 70, 86, 95,218,252,221,103,177,211,166, 39,201,  0, 64,203,154,112, 77, 89, 12,192,140, 78,126,
+ 81,136,141,237,131,176, 86,255,159,189, 47, 15,107,234,218,222,126,247,201, 64,  0, 21,193, 89,180, 42, 86,212,170,117,192,138,
+168,149, 68,209, 90,173, 29,190, 26,181,245,218,250,211,150,160,246, 58,117, 64, 91,123,237, 96,171,222,123, 81, 59, 74,236,112,
+181,189,245,170,193,218, 58,213,  1, 77, 80, 17, 65,180, 90, 71, 64, 80, 17, 20, 81, 18,166,  4,200,180,191, 63,146, 19,  3,  4,
+114, 18, 80,180, 61,239,243,228,225, 76, 89,236,236,189,207, 94,239, 90,123,237,181,219,163,168,164,212,230, 43, 48,154,113,179,
+ 88, 95,239,143,234,244, 72,  4,242,114,237,203, 60,137, 16,227,250,219, 98,  0,246,158, 53, 97,223,174,  4,220,186,115,  3,173,
+ 90,218, 86, 18,180, 20,139,240,248,224,  1, 80,255, 82,143, 75, 23, 66,136,173,102, 88, 32,128,149, 16, 48, 22, 43, 96, 50,195,
+ 34, 18,  2,132,  1,251, 78, 90, 41,108,185,  2,234,193,111,234, 43,228,233, 17,205,169,159,152, 66, 40,114,242, 48,152,  0, 51,
+  5, 42,141,128,165,202,  2, 66,  8,136,152,192,108,  1,244, 85, 64, 90, 74,  9, 25, 48,160, 51,117,233,242,103,123, 22, 99,  5,
+177,187,255,109,164,128,192, 98,101,192,  8,236, 43,  5,  0, 80,  1,  5, 40, 55, 47,128,179,242,119,117,158,188, 39,185, 27,215,
+142, 54,105,210,164, 62,  9,  9,  9,107,  0, 12, 72, 72, 72,216,155,144,144,112,100,210,164, 73,111,116,239,222,221, 68,  8,105,
+245,217,103,159,237, 95,188,120,241,180,149, 43, 87, 38,213, 67, 62, 89,235, 95,248,214, 91,111, 45,123,235,173,183,176,119,239,
+ 94,232,111,213,126,151,187,181,105,131, 43, 87,174,  0,128,154, 75, 34,159,186,146,254,188,241,198, 27,210,175,190,250, 74,253,
+229,151, 95, 98,112,207,158,178, 19, 23, 47,186,117, 21, 31, 59,123, 86, 51,188,127,255,167, 46,157, 56,209, 21,128, 15,128,207,
+ 77, 62, 62, 16, 85, 85,161, 71,135, 14, 88,180,104, 17,146,147,147, 87,133,134,134, 38, 37, 39, 39, 31,204,203,203,115, 67,238,
+106,231,  1,104, 64, 12, 64, 53, 30,152,148,148, 68, 98, 99,229, 39,142, 31, 47, 76, 86, 40, 20, 98,  0,136,141,149, 15, 91,181,
+ 74,149,  2,142, 73,128,186,246,127,236,221,138,155,  5, 99,173,102, 75, 47,125, 73,  9, 74,238,220,  6, 33, 12, 40,181,162,178,
+178, 18,148, 82, 80, 74,113,229,194, 69,152,140, 85,248, 61, 49,209, 93, 29, 58,143, 57, 45,  1, 48,227,101,145,214,241,178, 72,
+ 56, 47, 11,180, 79, 17,112, 70,167, 30, 67,164,121, 89,105,106,  0,232,218,165, 11,206,164,217,120,114,246,239, 59,  0,  0,109,
+ 30, 25, 36,187,157,123,170,201, 60,  0,131,127, 43, 68,250,211,192,128,176, 40, 20,206, 29,134,246, 95, 31, 67,166, 86,143, 64,
+ 49, 65,145, 86,  7, 33, 33,110, 61,  0,142,119, 51, 57,185,218,147,221,187,119,167,227, 39, 60,141, 93, 59,118, 97,235,214,173,
+248,224,189,247,177, 95,115, 16,  2,161,  0,193,157,130, 35, 75, 74,234, 95,186,188,125,251,118,141,157,  8, 72,199,142, 29, 91,
+ 45, 22,224,192,129,  3,184,124,249,114,165, 82,169,236, 80,211,155,228,178,191,116,237,138,156,156, 28, 60,246,216, 99,230,  5,
+ 11, 22,136, 55,111,222,140,128,128,  0, 92,186,116,169,150,231, 53, 39, 39,  7, 93,185,183,179,115,226,185,233, 79, 60,241,196,
+ 71, 47,189,244, 82, 64,122,122,122,243,202,202,202,255,243,245,245,125,198, 30, 24,248, 43, 71,121,206, 11,229,167, 63,243,247,
+205, 27, 71,140,126,129,252, 51, 17, 32, 29,159,197,167,107,223,165,218,172, 75, 51,  1,168, 60,104,102, 82,102, 50, 21,139,125,
+124,208, 66, 44,134,175,197, 82,165,175,190,100,237,129, 67, 53,  2, 48, 95,131,243,159, 73,171, 50,231,107, 28, 83,154,185,159,
+ 73,139,127, 43,171, 52,235,195, 31,109, 61, 62,200, 79,240,132,160,170,210,223, 76,153,178,162, 50,227,241,148,203,  5,251,242,
+181,134,164,249, 26,220,172,139,100, 76,251,219, 82,205,225, 99, 41, 50,  0,106,171,128,157,230, 19,224,114,233, 77,252,227,141,
+153, 48, 24,170, 80, 90, 97,139,  1, 48, 50, 62,216,178,189,254, 52,187,121,185, 41,228,133,103,255,110, 83,150, 22,214,114, 54,
+ 99, 92, 63,130,169,115, 86,195,207,207,  7, 45,124, 37, 50,  0,234,172,115,167,100, 27,190,216, 94,239,128, 36,164,102, 24,137,
+141,  4,128, 16, 88, 40,181, 17,  1,179,125,185, 31, 97, 32,180, 90, 97,182,  7,  7,186, 35,  1,197, 21, 45, 81, 81, 85,  4,177,
+144,113,164, 57, 51, 91,  1,147,137,194,100,166, 40,175,176,130,  8,  8, 44, 32, 48, 89,239,186,238, 93,193, 98,101,192, 16, 11,
+136,133,128, 50,212,225,254, 39,117, 24,207,172,164,243,151, 54, 19,119,185,161, 47,166, 92,108,104,223,113,184, 45,250,245,235,
+119, 51, 36, 36,228,133,171, 87,175,246,216,186,117,107, 26,128,231, 18, 18, 18,158,115,126,120,229,202,149,154,197,139, 23,203,
+ 86,174, 92,233, 78, 65, 56, 42, 36, 38, 38,166,206,135, 94,124,245, 85,155, 15,208,179,196, 64,180,134,219, 31,  0, 48,164,119,
+111, 89, 26,  7,229,239, 24,128,207,156,113, 68,171, 14,235,215,207, 26, 23, 23,247,229,196,137, 19,205, 25, 25, 25,194,107,215,
+174,161,107,171, 86, 41,187,118,237,226, 20,160,120,143,242,  0, 56, 43,247, 91, 73, 73, 73,206, 49, 30,103,157,234,217, 45,  9,
+ 80,173, 92,165,151, 47,142,125,241,210,193, 67, 41, 45,253,253, 91,148,234,138, 97, 54,155, 65,237,239,129,238, 86, 33, 74,117,
+ 58, 80, 74, 49, 48, 42, 74,246,123,162,219, 60, 72,102,220,141, 57, 97,236,203,  1,153,240, 65,143, 99,188, 44,210,177, 10, 32,
+235,234, 85,206, 36, 32,106,194, 75,210,196,221,255,115, 88,249,191,170,190, 83,  3, 64,155,144,225,178,219, 57,201, 26,  0,104,
+ 26,229, 79,107,147,  0,124,131,  1, 49,255, 64,129,213,138,254, 27,210,144, 54,174, 29,250,236,186,  5, 33,  1,154,139,188, 51,
+ 22,119,237,218, 69,166,188, 52,133,142, 26, 51, 26, 59,182,253,130,143, 87,173, 68,108, 73,  9,168,213,138, 45, 91,182, 33, 63,
+ 63,255, 25,  0,187,220,201,113, 69,  4,  0,224,133, 23, 94, 56, 13,142,115,217, 27, 54,108, 32, 99,199,142,165,167, 78,157, 18,
+ 15, 26, 52,  8,163, 71,143,134, 90,173,198, 35,143, 60,130,170,170, 42, 68, 70, 70,130, 82,106, 61,117,234, 20, 35, 18,137,188,
+201,  8,248, 88, 64, 64,192,154, 41, 83,166,136, 46, 92,184,208,162,170,170,170,174,192, 64,174, 24, 24, 60, 96,242,198,  1, 35,
+167,144,239,146,128,210, 10,192,120,101,175, 85,155,165,158,129,234,129,129,156,244,169,182,164,196, 44, 54,153, 96, 16,139, 33,
+ 52,155,221, 76,143,223, 27,176,121,  0,156, 45,127, 87,215, 92,186, 82,157,148, 63,123,126,241, 51,105,121,238,181, 59,229, 41,
+  0, 58,216, 95,222, 42,  0,249,  0,114,230,107,224,214,197,169,252,122,183,102,196,136,126, 50, 11,109,166,118,126, 57,202,245,
+165,182,117,255,140, 31,178,203, 64,214,126,189,137,211, 15,220,190,227, 11,114, 91,155, 35,  5, 99, 80, 59, 87,111,179,102,  1,
+176,152,116,  0,213, 99, 92, 63,110, 19,186, 38,  8,  0, 74,109,138, 26,  2,136,169,157,  8,216,149,191, 45,  7, 32,  0,142, 68,
+ 46,229,228,117, 18,214,183,  3, 53,155,180, 16,218,189, 63,148, 82, 88,204, 20,149, 38,160,180,204, 12, 19, 40,204,148,129, 80,
+ 68,112,231,150,169,206,114,158, 56,177,138,  0,192,176,136,183, 41, 49,217,172,127, 10,128, 82,  2, 80,187,197, 64,  5, 32,  2,
+ 43,172, 86, 33, 50,179,182,113,250,205,175,125,252,154,236,106,246,213,250, 20,176,  8,182,165, 26,245,105, 39, 71,205, 47, 91,
+182,140,245,143,158,177, 91,197,119, 21,245,139, 47, 74,183,109,219,166,182,147,  0,181, 59, 18,176, 94,165, 50,253,126,246,172,
+188,107,191,126,150, 39,122,245,210,219,251,104, 21,106,100,209,146,143, 27,103,179, 56,250,245,115, 63,221,241,246,219, 50,  0,
+ 24,220,179,103,173,123,233, 25, 25,154,180,139,222,147,161,126,189,123,127,205, 48,140,229,210,137, 19,254,237,218,181,187,147,
+156,151,183,209,157,213,127, 31,180,142,115, 63,208,219,  3,254,216,169,129,242, 26,109,205,133,  4, 92,144, 47,142, 13,223,241,
+237,119,219, 66,186,117,125,172,170,170, 18, 22,147, 25, 86,171, 21,205,  3,  3, 81,162,213,178,202,159, 11,137, 42,254,240,205,
+191,183,  5, 96,204,186,122, 85,204,206,255,167,158,250,  3,227,101,145,214,101,113, 95,184, 75, 14,228,192,156,121,177,244, 82,
+198, 37,153,179,242,  7,128, 81, 79, 61, 39, 59,180,239, 87,205,237,156,100,239, 43,177,142,  0, 63,215,215,185,235,176,193,191,
+ 21,  2,191,189,225, 56,127,244,215,  2,199,113,137,201,123, 99,113,203,255,182,144,225,195,135, 63, 61,118,194,184, 61,175, 79,
+159,117,244,241,254,253, 70,236,248,117, 39, 82, 78,159,196,201,147, 39,119,215,231,  6,174,135,  8,204,218,190,125,251,183,219,
+183,111, 31,186,125,251,118,206,133, 27, 59,118,236,168,253,251,247, 31,218,181,107, 23, 66, 66, 66, 48,102,204, 24,  4,  4,  4,
+100,150,148,148,132,158, 63,127, 30, 57, 57, 57,140, 72, 36,194,216,177, 99,163,246,239,223,239,233, 79,189, 80, 82, 82,178,106,
+231,206,157,245,  5,  6,122,130,223,243, 79,111, 93,241, 75,194,179,239, 86,  4, 79, 67,197,137,165,214, 27, 71, 62,153,238,165,
+188,202,107,133,133,162, 55, 51, 51,243, 44,  6,  3,115,134, 97, 68,237,  5,130,130,130, 38,114,  2,184,202,  6,232,110, 10,192,
+ 37,230,107,160,  7,240,135,253,227, 21,142, 30, 61,171,137,137, 89, 44,139, 87,126,172, 14,238,210,  3, 64, 21, 68, 62, 18,228,
+221, 44,197,166, 93,201,196,115,121,187, 53, 51, 94, 91,136, 13,223,255, 12, 88,175,  1, 16,194, 92, 89,129,224, 14,  1,178, 79,
+222,158,197,217,154,131,197, 10, 33, 99,133,137,  8, 33,162,230,187, 68,  0,102,128, 90,192, 53, 48,204, 25, 39,207,221, 36,  0,
+208, 62,136,161, 34,161,205,218, 55, 91,109,  9,140,138,203, 40, 44,102, 64, 32,180,194, 98,230, 54,114, 28, 75,249, 23,  1,128,
+240, 33,139, 40,216,156,240, 12, 96, 37, 54,119,127, 70,214, 78,143, 10,249,237,251,223,106, 26,161,127,113, 50, 87, 88,229,239,
+228,  9,112,187, 28,235,196,165, 75,  9, 39,106,184, 12,235,121,214,237, 51,141,153, 58,184, 22,185,181, 45,241,139,183,217,214,
+103,189,146,209,200,121,  0,106,214,173,222,205, 82, 43, 78,125, 71,181,114,213, 37,249,226,216,190,  0,  4,151,146,146, 76,149,
+134, 10, 88, 45, 22,244, 14, 11,147,117,  8,125, 12, 39,126,219,201,173,142, 41,153,178,239,183,221,142,211, 97,143,133, 56,142,
+247,253,182,187,214,121,125,161,241, 95,127,110, 35,200,163,159,122, 94,118,225, 82, 54,110, 94, 59,171,  6,128, 67,251,126, 85,
+183,123,164,175,236, 86,238, 57,143,219,125,242,228,201,240, 52,189,175,133,248,212,123, 63,247,133,246,248,237, 70,229, 61, 31,
+240,147,147,147,127, 83, 42,149, 76,122,122,186,245,224,241, 36,180,106,221,170,230, 74, 15,143,176,125,251,246,239,148, 74,229,
+ 15, 10,133,194,228,201,247,222,122,235, 45, 53,  0, 50, 99,198, 12,154,157,157,141,180,180, 52,148,149,149,133, 54,111,222, 28,
+173, 90,181,114,236,  5,224,133,242,103,241,175,164,164, 36, 81, 74, 74, 74, 63,163,209,184, 20,213,231,242,189,193,123,231,182,
+252, 77, 20,208,253,135, 69, 37,217,251,167, 53, 64,158,121,115,106,234, 51,  0,198,  0,248, 29, 86,107, 25,220,199, 35, 52, 58,
+216, 85,  0,174,174,123, 69,  0,220, 14,130, 74,165,112,221,186,117,238, 93, 85,251,142,105, 58,117, 29, 77,110,229,165,208,182,
+193,157,161, 45, 51, 99,211,142,163, 94,119,208, 13,223,174,177,127,183, 29,  5,110, 33,176,185, 16,159, 44,121,221,163,151,254,
+155,227, 89,247,108,157,102,129,214, 74,  0, 64,226, 43,162,198, 10, 19,172,  0,252,252,252, 96, 48, 27,136,197,236,185,188,212,
+ 52,219,158,  1,225, 79, 44,164, 86, 42,192,213, 43,123,154,114,141, 41,215,165,131,252, 46,129, 28,234,199, 89,225, 55,242,180,
+128, 49, 54, 86,238,  3,192,178,106,149,170, 65,166,136,106,229, 42,118, 35, 31, 71,155,102,159,243,108,157,254,188, 21, 95,120,
+ 69,198,106,110,  5,236,140,131,251,126,209,212,236,107,183,114,189,203, 31,224,110, 99,159,154, 28,216, 76,124, 80,193,212,191,
+ 34, 53,187,204,140,208,230,194,251,242,170,216,215,234, 55,218, 59,231,169,242,175, 54, 62,123,191,225, 15, 23,124,106, 52, 26,
+127,  1,220,111, 74,199, 17,239,148,100,239,223,132,234,177,  1,158,194,  4,160, 24,158,197, 13,220, 51, 18,192,105,240,241,118,
+ 31, 97, 30, 60,156,209,163, 71, 15,100,101,101,241, 21,193,131,  7, 15, 30, 15,  9, 24,190, 10,120, 52,  6,120,229,207,131,  7,
+ 15, 30, 60,  1,224,193,131,  7, 15, 30, 60,120,240,  4,128,  7, 15, 30, 60,120,240,224,193, 19,  0, 30, 60,120,240,224,193,131,
+ 71,147,163, 90,104,234,233,211,167,189,142,218,116, 21, 76,200,203,227,229,241,242, 30, 24,121,245, 70,135,243,245,199,203,227,
+229,253,185,228,121, 76,  0,156,  6, 10, 79,225,110,224,105, 76,121, 60, 30, 76, 80,190,221, 30,202,118,224,252,188, 82,169,244,
+  7,240,196,209,163, 71, 63, 17,  8,  4,195,124,124,124, 96, 48, 24,142,141, 24, 49,226, 61,  0,105, 10,133,194,240, 32, 84,128,
+ 61, 59,164,250,175, 60,174, 80, 74,233,185,115,231,208,175, 95, 63,254,157,228,225, 17,  1,240,104, 29, 50,151, 68, 57,174,228,
+ 57, 39, 62,241, 84,222, 95,112, 64,231,132,167,158,122, 74,182,111,223, 62, 13, 87,153,193,193,193,181,110,228,231,231,215, 28,
+ 76,161, 82,169,  8,199, 50,222, 51, 18, 80, 87, 62,255,166,146,183,122,245,234,209,219,182,109, 75,204,204,204,  4,  0,132,132,
+132, 60,155,154,154,186,211,219,246,117,238,247,148, 82,199,251,193, 94,103,223, 21,251,117,226,134, 60,115,109,  7, 79,148,255,
+ 99,231,206,157,219, 86, 90, 90,218,171, 75,151, 46,184,115,231, 14, 42, 43, 43,  1, 96,216,182,109,219,212,254,254,254,151,148,
+ 74,229,243, 10,133,162,222,173, 36,207,157, 59,231,145, 65,144,156,156, 44, 83, 40, 20, 26, 79,190,163, 82,169,212,114,185, 92,
+230, 77,  2, 40,234, 97, 18,134,201,147, 39,123,242,126,  0,  0,186,116,177,237,128, 91, 86, 86,134,170, 42, 91, 26,116,189, 94,
+239,201,251, 86, 47,206,158, 61, 75,135, 13, 27,134,222,189,123,195,199,199,167,176,170,170,234, 17,126, 24,253,235,161,102, 50,
+160,123,150,  8,136,183, 98,239, 45,126,141, 31,231,246,153,231,103,239,245, 72,166, 90,125,215, 64,202,204,204,132,191,191,191,
+ 99, 16, 98,193,101,243, 15,185, 92, 78, 85, 42, 85,205,115, 82,199, 51, 94,213,109,100,228,221,237, 92, 93,201,111,  8,  8, 33,
+116,228,200,145,178,164,164, 36,143,148,197,182,109,219, 18,219,182,109,139, 87, 94,121,  5, 58,157,206, 26, 23, 23,183, 99,229,
+202,149, 83, 23, 47, 94,188,197,195,255,143,223,126,251,205,113, 62,110,220, 56,236,221,187,183,222,115, 46, 98,107,244,101, 26,
+ 22, 22,  6,  0,212, 41, 51,156, 71,202,191,164,164, 36,165,123,247,238, 45,  0, 64, 34,145,192,215,215, 23,133,133,133, 40, 46,
+ 46, 70, 64, 64,  0, 10, 11, 11,123,237,221,187, 55, 77,169, 84,246, 84, 40, 20,  5,245,201,235,219,183, 47,228,114, 57, 66, 66,
+238,102,253, 91,181,106, 85,181,103, 98, 99, 99,  1,  0,199,143, 31, 87,123,211,111, 26,146,253,113,237,218,181,117,221,114,236,
+ 85,224, 45,252,253,253,113,225,194,  5,136, 68, 34, 24,141, 70,236,221,187, 23, 89, 89, 89, 88,178,100, 73,131,250,113, 96, 96,
+160,  0, 64,212,225,195,135,247, 70, 70, 70,222,122,254,249,231,219, 37, 38, 38, 66, 32, 16,180,105,217,178,165,  0, 60,254,210,
+202,159,189, 86,147,  4,252,105,130,  0,195,195,195,165,247,219,226,110, 74,  4, 15, 94,238,248,120, 11,157, 78,231,176,248,245,
+122, 61,214,175, 95,239,248,120, 48,208,186, 60,159, 52,105, 18,149,203,229, 20,  0,173,249,140,167, 56,124,248,176,250,237,183,
+223, 70,183,110,221, 26,173,254,186,118,237, 74,222,121,231, 29, 80, 74,145,148,148,164,246,180,221, 51, 51, 51, 49,110,220, 56,
+ 43,  0,136,197, 98, 38, 52, 52, 20,113,113,113,155,219,180,105, 67,195,195,195,199,123, 96,113,222,171, 46, 66,194,194,194, 40,
+251,187, 78,158, 60,201,238,  7,192,182, 11,103,183,191, 78,167,219, 38, 22,139, 91,  0,192,220,185,115, 49,109,218, 52,136,197,
+ 98,248,250,250, 66, 34,145,128, 16,  2,129, 64,128,146,146,146, 22,  0,226,148, 74,101,189,178, 99, 99, 99, 17, 18, 18,130,156,
+156, 28,199, 39, 54, 54,182,218,167, 33,144,203,229, 50,251,239,244,122, 76, 88,184,112,161,227,227, 60, 94,214,184,206,121,163,
+151, 46, 93,186,192,223,223, 31, 75,151, 46,133,191,191, 63,118,236,216,129,138,138,138, 70, 81,254,246,119,153,234,116,186,255,
+155, 62,125, 58,122,244,232,209,110,239,222,189,184,117,235, 22,174, 95,191,142,226,226, 98,227,253, 28,155,148, 74,165, 52, 47,
+ 47,143, 42,149, 74,169,171,123, 89, 89, 89,244,242,229,203,124,  2,186,251,160,252,163, 99, 87, 34, 58,118,101,157,196,224,190,
+ 16,  0,226,  2,245, 93,247,  6,169,169,169,234,198, 32,  1,211,166, 77,123,104, 72, 64, 67, 97, 48, 24,106, 89,253,222, 52, 47,
+171, 76, 38, 77,154,228,176,242, 19, 18, 18,208, 80,197,239,108,253,171, 84, 42, 50,114,228, 72,153, 74,165,170,230, 17,104,  8,
+182,110,221, 74,  0,144,200,200, 72, 89, 77, 79,  3,199, 65,215,108,247,  6,160,109,219,182, 88,190,124,121,229,155,111,190,105,
+204,201,201,217,189,114,229,202, 49, 77,221,190, 78,123,  0, 16,231,118,242,176, 93,158,200,202,202,234,  5,  0,179,102,205, 66,
+ 73, 73,  9,110,220,184,  1,145, 72,  4,161, 80,  8,161, 80,  8,145, 72,  4, 95, 95, 95, 84, 84, 84, 32, 49, 49,241,101,  0,129,
+238,132,230,228,228, 64,165, 82, 57, 62,206,158,128, 85,171, 86, 33, 49, 49,209,235,223,173, 82,169, 52,246, 41,  0,117, 35,189,
+203,117, 37,238,230, 60,126, 94,189,122, 21,187,119,239,198,242,229,203,209,165, 75, 23,180,110,221, 26, 73, 73, 73, 88,178,100,
+  9,252,253,253,  1,  0,  2, 65,131, 12,245, 14, 51,103,206,156,242,175,127,253, 11,169,169,169,184,113,227,  6,204,102,243, 43,
+173, 90,181, 10,  4, 96,186,223,125, 47, 56, 56, 24,209,209,209,234,236,236,108,234,172,252,163,163,163,213,143, 62,250, 40, 30,
+240, 93,114,255, 20,112, 86,252,206,199, 77,225,  1,160, 46, 62,245, 93,111, 50, 18, 48,126,252,248,198, 32,  1,212,131, 15,103,
+188,248,198,190, 70,107,144,204,204, 76,232,245,250, 58,221,252,199,142, 29,107, 12, 98,208, 96, 28, 62,124, 88,109, 39, 22, 72,
+ 74, 74,210, 16, 66,208,182,109, 91,117, 99,118, 78,214,253,111,247,  4,212,139,213,171, 87,143, 31, 62,124, 56,  5,128,184,184,
+ 56,241,247,223,127,143, 87, 94,121,133,117,205, 75,254,248,227, 15,177,253,222,254,240,240,240,231,184,252,255,113,227,198,225,
+233,167,159,118,184,247,217, 99,246,156, 61,230,232,254,  7,  0,216,173,127, 87,237, 64,106,220,175, 23,123,247,238,253,164,117,
+235,214,  0,128,203,151, 47, 35, 55, 55, 23,167, 78,157,130,209,104,  4, 33,  4, 66,161, 16,132, 16, 88, 44, 22, 24, 12,  6,108,
+223,190, 29,  0,250,123,226, 57,146,203,229, 46,201, 75, 78, 78, 78,131, 72,128,211,111,111,144, 55,  0,141, 48, 85,106, 50,153,
+ 48,104,208, 32,104, 52, 26, 92,189,122, 21,131,  7, 15,118,220,211,104, 52,  8, 10, 10,114, 16,  1, 47,208,113,230,204,153,121,
+223,125,247, 29,162,162,108, 27, 25,117,236,216, 17, 22,139,229, 71,216,114,211,223, 87, 40, 20, 10, 13, 75, 62, 67, 66, 66,112,
+226,196,  9,202, 42,127,150,252,245,236,217,147,203,248, 48,  4,192, 15,176,237,121, 86, 31, 38,  0,136,  6,208,134, 87,251,247,
+185, 99,115,210,134,247, 49,  8,208, 78,  2,100,169,169,169, 26,111,101,116,237,218, 21,211,166, 77,195, 79, 63,253,228,109, 76,
+  0,  1, 64,127,250,233, 39,151, 55,247,236,217,  3,251, 61,143,101, 31,191,242, 24,134,118,187,128,252,244,165, 13,170, 39,231,
+ 57,255,196,196, 68, 68, 69, 69, 33, 58, 58,218,161,252, 59,119,238,220, 24,164,175, 65, 68, 32, 50, 50, 82,122,248,240, 97,220,
+185,115, 71,198, 94,147, 74,165, 50,149, 74,165,142,140,140,148,122, 58,111,239,230,127,201,184, 16,128,109,219,182,237,102,231,
+254,245,122, 61, 86,173, 90,133,242,242,114,136, 68, 34,248,248,248,224,202,149, 43, 88,190,124, 57,116, 58, 29,226,226,226,126,
+ 89,185,114,229,168,197,139, 23,171,221, 40,217,106,100,192, 93, 76,  0,135, 58,135,155, 29,  0, 29,211,  1,238,126,111, 80, 80,
+208,176,170,170, 42,152,205,102, 28, 59,118, 12,  2,129,  0, 70,163, 17, 21, 21, 21,176, 90,173,142,247,216,100, 50,161,170,170,
+138,125,167,251,186,147, 91,151,155, 63, 54, 54,214, 17, 15, 16, 18, 18,130,194,194,194,  6, 19, 81,167, 85,  1, 92,251,162, 22,
+ 64,144,171, 27,107,214,172,241,170, 16,113,113,113,120,251,237,183, 49,112,224, 64,135,  7,132, 77,159, 61,112,224, 64,100,100,
+100,160,109,219,182,222,136,238, 50,115,230,204,171,223,125,247,157,243,248, 25,124,227,198,141, 27, 77,169, 88,  6, 15, 30, 76,
+ 88,165, 63,120,240, 96, 12, 30, 60, 88, 13,  0, 25, 25, 25,232,213,171, 23,215,118, 56, 13,192, 23,192,102,  0, 83, 81, 99, 75,
+112, 59,222,  0,240,133,253,248, 61,  0,189,  0,247, 91,212,255,153,193,238,  6,184,126,213, 98,135,229,191,126,213, 98,199,189,
+251, 78,  0,238, 55, 30, 20, 18, 48,109,218, 52,250,222,123,239,213,114,  5,122,163,252, 27,211,250,  7,224,210,250,103,173,126,
+145, 72,132,130,130,130, 38, 85,254,206,214,191,115, 64,151, 90,173,118,246,  2,220,247,128,205,204,204, 76,188,242,202, 43,  6,
+  0,126,254,254,254,120,255,253,247, 33, 18,137, 28,247,103,204,152,  1,  0,  8, 12, 12,196,196,137, 19,113,244,232,209, 67,247,
+177,156,196,217,  3, 80, 31,  9,  8, 11, 11,171,185, 85,172, 75, 50, 96, 52, 26,161,213,106, 81, 89, 89,137,128,128,  0,248,248,
+248,192,108, 54,131, 82, 10,139,197,  2,163,209,  8,147,201,  4,139,197,226, 76,232,239,212, 87,200,156,156,156,106,  1,128,236,
+116,128,179, 71,192,249,126, 67,225, 69, 64,160,164,174, 27,206, 49,  1,158,144,129,229,203,151, 99,194,132,  9,232,218,181, 43,
+252,252,252, 32,149, 74,161,213,106,225,239,239, 15,157, 78,135, 13, 27, 54,128, 97, 60,118,200,118,154, 57,115,230,213,  5, 11,
+ 22, 96,199,142, 29,120,238,185,231,  0,160, 61,154, 96, 11,218,186, 60,  1,  1,  1,  1,178, 41, 83,166,168,  1, 96,203,150, 45,
+178,169, 83,167,122,210, 22, 70,  0,211,  0,252, 84, 15,  9,112,158,106,123,  4, 64, 63,  0,105,188,109,143,106,138,191, 46,252,
+ 41, 51,  1, 54, 84,249,179,240,214, 74,119, 30,144, 63,249,228,147,  6, 43,127, 22,131,  6, 14,192,193, 67,106,108, 58,228,231,
+ 32,  5,199,175, 60,214,160,223, 24, 22, 22,134,156,156, 28, 36, 36, 36,160,115,231,206,216,184,113,163,199, 86,151, 82, 25, 47,
+117,242,224, 52,138,242,103,231,227, 11, 11, 11,101, 53,239,141, 28, 57, 82,150,144,144,208,104,177,  0,128,205,253,207,213,251,
+164,211,233, 46,194, 54, 47,108,221,178,101, 11, 54,108,216,  0,  0,216,188,121, 51,116, 58, 29,251,152, 57, 35, 35,  3,109,218,
+ 52,141, 87,178, 70,180,127, 45,114,198,117,159,248,156,156,156, 99, 22,139,  5, 58,157, 14,119,238,220,129, 78,167,131,193, 96,
+128,193, 96, 64,121,121, 57, 74, 75, 75, 81, 82, 82,130,138,138, 10, 84, 85, 85,177,115,187, 41,245,201,172,169,220, 93,  5,146,
+214, 92, 21,192, 21,118, 87, 63,117,113,205, 19,248, 53,118,123,108,220,184, 17, 82,169, 20,126,126,126,184,112,225,  2, 52, 26,
+ 13,252,253,253,241,143,127,252,  3, 71,143, 30,197,146, 37, 75, 60, 37,  0,237,103,206,156,121,125,234,212,169,248,249,231,159,
+ 89,229,223,241, 65, 81,254,182,113, 65, 41,101,149, 63,  0, 76,153, 50, 69,125,233,210, 37, 79,167, 86, 89, 18,  0, 59,  9,168,
+ 57, 29,112,217,233, 56, 23,192, 89, 94,237,223, 69,205, 32,192, 38, 33,  0,247, 35,  8,176,177,149,191, 93,113, 55,134,229, 70,
+ 62,249,228,147,  6, 41,255, 23,223,216,135, 65,  3,239,186,110,182,253,188,221,225, 17, 56,120, 72,237, 21,  9, 80, 40, 20,176,
+ 47, 13,131,193, 96,192,129,  3,  7,176,124,185,109, 69,193,217,179,103, 97, 54,155, 61,144, 21,163,  1,108,129,127,148, 82, 54,
+ 24,176, 65,202,159,181,254,235,115,243, 55, 86, 44,  0, 75, 36,164, 82,169,204,221,179, 33, 33, 33, 99,227,226,226,194, 82, 83,
+ 83,133, 63,252,240,  3,115,233,210, 37,204,152, 49,195,204,214, 99, 92, 92, 28, 82, 83, 83,241,195, 15, 63,  8,175, 93,187,134,
+240,240,112,183, 50,239, 69, 12,  0,107, 73,215, 32,  1,148, 37,125, 92, 17, 26, 26,154,110, 54,155, 97, 52, 26,113,251,246,109,
+ 20, 20, 20,224,214,173, 91,184,117,235, 22,110,223,190, 13,173, 86, 11,131,193,128,170,170, 42,148,148,148,176,255, 51,175, 62,
+153,108,160,159, 51,  9,173,167,236, 30, 41,127, 54,  7, 64,205,107, 13,233, 31, 46, 86,  3, 56, 72, 30, 87, 25, 89, 89, 89,200,
+200,200,128,193, 96, 64, 68, 68,  4,250,247,239,143,141, 27, 55,226,221,119,223,133, 88, 44,134, 64, 32,128, 80,200,217, 33,219,
+105,230,204,153, 55,167, 78,157,138,180,180, 52,124,240,193,  7,172,245,123, 19, 15,200, 50,230,244,244,116,202,206,249,159, 58,
+117, 10,235,215,175,151,  1, 64,207,158, 61,225, 28, 24,216, 64, 18, 48, 31,182,249,255, 73,  0,230,  0,  8,199, 95,220,253, 15,
+220,141,244,119, 21,  4, 88,115, 21,192,253,154,  2,160, 30, 94,255,179, 40,127,  7,  9,104,192, 84, 66, 53,229,239,234,252,224,
+ 33,207,199, 55,231, 65,215,207,207, 15,189,123,247,174,118, 63, 53, 53,213, 35,121,147, 38, 77, 66, 66, 66,  2, 88, 34,  0,128,
+218,175,121,188,238,124,227,198,141,106,  0,216,187,119,175,204, 85,196,122, 82, 82,146,230,234,213,171, 46,173, 71, 87,168, 43,
+233, 15, 75, 52,146,146,146, 16, 25, 25, 41, 83,171,213,110,251, 78,106,106,234,129, 21, 43, 86,140, 78, 78, 78, 62, 24, 26, 26,
+138,204,204, 76,232,116, 58, 97, 96, 96, 32,102,206,156,  9,173, 86,123, 45, 57, 57,185, 75,104,104, 40,146,147,147, 73, 76, 76,
+140, 59,114, 92,107,206,191,  1, 49,  0,213,222, 45, 54, 95,130, 61,119,130,195, 51,227, 52,255,239,182, 61,134, 14, 29,250,174,
+ 70,163,153,103,177, 88, 80, 90, 90, 10,147,201,228,152,247,175,172,172,  4,165, 20,148, 82,100,100,100,192,104, 52, 34, 42, 42,
+234, 37,133, 66, 97,118,149,116,164, 46, 68, 69, 69, 33, 42, 42,170, 90,208,159,167, 83,  0,206,138,222,238,242,167,206,253,195,
+190, 42,160,177,199, 53,206,227, 39,187,212,239,205, 55,223,132, 70,163,129, 76, 38, 67, 86, 86, 22,154, 53,107,134,220,220, 92,
+  8,  4,  2,174, 30,  0, 50,115,230,204,235,211,167, 79,199,145, 35, 71,240,143,127,252,  3,  0,130,  1,220,192,221,252, 15, 77,
+110,249,179,227, 75, 78, 78, 14,194,194,194,216,126, 38,139,142,142, 86,135,132,132, 32, 35, 35,131,114, 12,  4,116, 38,  1, 83,
+237,  4, 96, 51,128, 99,  0, 20,  0,164,  0, 10,192,163,241, 58,112, 99,103,227,115, 21,240,179,106,213,170, 58,175, 55,165,242,
+183,175,  0,184, 23, 44,218,107,153,215,243,220,247,111, 95, 95,207,188,150,238,130,196, 60, 69, 84, 84,148, 44, 33, 33, 65, 51,
+121,242,100,186,117,235,214,106, 68,160,  6,225,227, 92, 15, 49, 49, 49,110,153,141,135,137,129,104, 13, 34, 97, 27,149,100, 50,
+ 78,202,223,105, 48,119,204,235,135,135,135,255, 45, 46, 46,238,199,137, 19, 39, 34, 35, 35,  3,215,174, 93,235,178,116,233, 82,
+ 89, 76, 76, 12, 39,121,247, 40, 15, 64,181,122,174, 67,241,113,202, 24,168, 80, 40,244,241,241,241,203,246,236,217,243,161,217,
+108, 70,113,113,177, 35,  6,  0,  0,110,223,190,141,226,226, 98, 80, 74, 89,171,221, 35, 45,203,206,255,135,133,133, 57, 34,216,
+217,235, 92, 73,128, 11, 43,191,214, 52,212, 61, 80,254, 30,131, 37,  1,139, 23, 47, 70, 82, 82, 18, 38, 78,156,136, 21, 43, 86,
+224,173,183,222,130, 80, 40,132, 68, 34,113, 59,134, 80, 74,173,179,102,205,194,143, 63,254,136,239,191,255, 30,  0, 58,219,149,
+127,163, 27, 84, 13, 65,126,126, 62,118,239,222, 93, 45,139,163,253, 88, 54,106,212, 40,181,151, 75, 30, 45,118, 18,176,203,110,
+253, 15,229,149,127,221,112, 21,  4,200,137,  0,120,146,136,195, 91,133,221,216,104, 12,229,223, 80, 69,125, 47, 48,127,254,124,
+217,165, 75,151, 26, 85,166,221, 69,218,168, 75,233, 88,133,103, 95, 91,207,122,  5, 40, 33,  4, 86,171, 21,219,182,109,227, 76,
+  2,222,126,251,109,182,156,181, 98,  0, 24,134,129,213,106,197, 59,239,188,163,230,170, 60,235,147,151,148,148,164,113,206,138,
+232, 69,191,251,239,138, 21, 43,110, 39, 39, 39,239,229,106,245,223,  7,104, 62, 28, 93,  0,  0, 32,  0, 73, 68, 65, 84,111, 27,
+169,233,237,169,131,240,113, 34,  1, 49, 49, 49, 31, 41,149,202,132,159,126,250,233,188, 88, 44,  6,187, 42,192,106,181,162,101,
+203,150,208,233,116,144,203,229,136,138,138,242, 83, 40, 20,110, 23,120,179,227,139,115,240,223,201,147, 39, 17, 21, 21, 85,109,
+ 60,113, 55, 14,197,198,198,210,156,156, 28, 89, 77, 23,191,183,105,128,157,225, 34,192,207, 12,192,188,102,205, 26,137,221, 26,
+101,156, 62, 30,145,  0,231,196, 63,115,230,204,113, 28,151,150,150,186, 29,155,  8, 33,100,230,204,153,244,135, 31,126,120, 30,
+192,175, 15,162,226,177, 43,122,226,233, 61, 46,164,189,  6,110, 62, 12, 99,248,253,  6,187, 10,192,149,226,231,180, 10,160,177,
+149,122, 93,242, 30, 20,242,240, 32,119,156,207, 62,251, 76,211,216, 50,107,172,145,190,103,168,225,254,231,250, 82,115,205,133,
+ 78, 60,248,189,247,244,183, 46, 89,178,100, 95, 67,234,115,220,184,113,213,150,197, 62,253,244,211,213, 60,  3, 30,206,253, 19,
+ 15,189, 61,156,202,173, 80, 40, 46, 40,149,202,102,251,247,239,255, 52, 55, 55,119, 94, 69, 69,  5, 44, 22, 11,  6, 12, 24,128,
+193,131,  7,199, 69, 69, 69,197,114, 81,254,  0,112,252,248,113,199,113,100,100,100,181,235, 53,207,221,140, 43,196,153,208,178,
+100,194, 30,  7,224, 85,187, 79,158, 60,185,174, 91, 66,167,241, 82,124,175,198, 21, 55,158, 10, 43,  0,124,255,253,247,252,134,
+ 41, 60, 56,147,128,186,148,127, 93,  4,160,177, 59, 23,223, 89,121, 16, 15,153,253, 95,174,110,156, 21,254, 61,152, 22,104,148,
+119, 80,161, 80,232, 97,115,189,206,103,175, 93,188,120,145,139,226,114,160,111,223,190,141, 62, 30,184, 34,180,222,186,252,239,
+ 53, 89,228,193,235,143,251, 73,  2,220, 86,174,183,251,  8,243,224,193,131,  7, 15, 30, 60, 30, 94, 48,124, 21,240,224,193,131,
+  7, 15, 30, 60,  1,224,193,131,  7, 15, 30, 60,120,240,  4,128,  7, 15, 30, 60,120, 60,132, 48,195,131,237,138,121,252, 53, 33,
+228,171,128,  7, 15, 30, 60,248,177,157,199, 95,188,147,156, 62,125,218,235,136, 75, 87,193,132,110,228,213,187,254,216, 11,121,
+141, 93, 62, 94, 30, 47,239, 47, 45,239,247,119,175,121, 61,176, 12,252,180, 11,238,181,188,147, 75,188,151, 23,182,162,182, 60,
+182,254,148, 74,165,212,100, 50,225,202,149, 43,106,163,209,  8,161, 80,136,188,188, 60,188, 20,208, 21,251,210,211, 81,241,120,
+103, 12, 29, 58, 84, 38, 16,  8,216,117,237, 77,214,190, 74,165,242, 49,  0,109,207,159, 63,191,187, 99,199,142,140, 86,171,149,
+116,236,216,113,185,175,175,239, 58,133, 66,113,  3,  0,226,227,227,153,248,248,120, 75, 93,242,226,227,227,155,219,189,  5,134,
+152,152, 24, 10,  0, 75,255,254,228, 55,138, 39,115,103,110, 74, 15,189, 34,108, 59,118,104,179,230, 45,202,  1, 80, 74,169, 16,
+ 64, 96,124,124,252,117,254,125,123,176,229,221,107,150,200,117,211, 23, 79, 83,224,122,156, 50,119, 85,196, 83, 82, 97, 80,128,
+ 58, 59,243,178,236, 81,159,102, 88,116,238,176,230, 65, 98, 89,245,228, 35,231,151,184, 52, 49, 38, 76,152, 32,221,179,103,143,
+ 58,238, 93,219,249, 47, 71,158,196,225,195,135, 57,181,203,223,102,188, 42,101,  8, 81,103, 92,186,  4,157, 78,135, 46, 93,186,
+160, 89,243,230,216,158,176,141,115,187, 78,154, 52,169,218,139,155,144,144, 80,239, 94, 10,246,236,138, 94,245, 27,118,163, 38,
+ 74,105,195,250,157, 92, 91,253, 85, 85,  5,121, 47, 43,108, 13, 16,242,170,237, 56,103,  3,112,114, 81,195, 27,117,210,157,234,
+229, 75,104,205,233,107, 74,165,146,234,245,122,217,246,237,219,213, 57, 57, 57,144,139, 90,161,125,231, 54,168,212, 87,192,215,
+ 96,198,240,183, 94,199,200,137, 83,176,235,187,120,236, 60,120, 80, 61,118,236, 88,217,  3,208,133, 51, 45, 22, 75,135,156,156,
+ 28,107,255,254,253,197,161,161,161, 56,117,234,212,187,149,149,149, 19,148, 74,101,148, 66,161,208,198,196,196, 88,235, 91, 18,
+ 22, 19, 19, 83,230,124,254,213, 87, 95, 49,123,255, 27,219,163,211,172,129,120,103, 72,159, 54,199,247,255,123,235,182,179,210,
+211, 61,250,142, 90, 65,  8,209, 42, 20,138,188,  1,  3,  6, 88,237,164,129,247, 52,252,197,220, 68,158, 50, 13, 78,217,198,188,
+ 81,254, 95, 71, 62, 43,141,104,211, 73, 77, 64,145, 85, 94,140, 14, 29,187,170, 77, 86, 11,150,244, 27,134,194, 46,109,100,223,
+237,250,149, 19, 17,136,158, 10,218,171, 59,123, 38,192,246,253, 86, 28, 57, 65, 17, 61, 21,232,213, 29, 88,244, 73,195, 20, 55,
+187, 65, 73, 67,179,147,185, 34, 19,141, 37,183, 33,160,148, 82, 44, 35, 32, 31,213,251, 12,176,140, 96,242, 69,249,  3,179,214,
+250,174,242,167,118,229, 63, 18, 71,143, 30,229,244,221,148,227, 47, 82,179,169, 23, 84,170,155, 72, 77,177, 37,172,201,188,148,
+  1,  0,216,189,155,208,140,203,147,100,139,230,115,107,151, 49, 99,198, 88, 15, 28, 56,192, 36, 36, 36,224,208,161, 67,213,146,
+225,212,132,151, 41, 84, 29,205,228,162, 35, 83,234,  5,161, 96,211,133, 55, 56,103, 65,200,171,142,141,118,214,172, 89,211, 56,
+  4,192,169,158,236,187, 19,114, 66,118,118, 54, 52, 91,183,170, 63,138,154,140,  1,211,230, 64,220, 46, 16, 16,218,147,253, 89,
+ 41, 96, 21,193, 90, 69, 49,254,213,104,228,126,190, 18,199,142, 29, 83, 43,149,202,106,233,110,155,  0, 22,134, 97,218,182,110,
+221, 26, 26,141, 70,216,191,127,127, 12, 25, 50,132, 41, 40, 40, 24,120,230,204,153,115, 74,165,114,144, 66,161, 40,176, 43,107,
+134, 99,221, 53, 27, 61,106, 76,200,138,213, 59,152,216, 25,103, 91, 12, 29, 55, 91, 54, 52, 60,241,201,183,190,200,123, 38,244,
+137, 87,194,  0,148,193, 22, 99,192,212,165, 31,156, 19, 91,185,235, 71, 13, 38,164, 60,106,122, 18,220,121, 11, 28,199,158,  4,
+  1, 82,182,113,  7,188,210, 15, 74,165,146,241, 64, 17,214,220,164,130,134,133,133, 33, 44, 44,204,235, 60,241,202,151,163,165,
+ 47, 15,140, 80,247,236, 16,140,238, 29,130,241,120,155,142,  8,246,109,  6,137, 21,232,230,211, 12,  1, 89, 55,212, 51,159,121,
+ 78,202, 69, 86,175,238,192,165,108,  6, 23, 47,251,225, 92,118, 11, 60, 63,198, 31,171,223, 19,160, 87,119,210,104, 70,122, 67,
+149, 52,187,205,105, 72, 72,136, 58, 61, 61, 29,233,233,233,248,240,191,103,240,232,248, 88, 53,  0,234,225,150,167,148,235, 71,
+ 46,151,187,127,139,151,217,234, 40, 44, 44, 12,114,185,220,229,135,125,198, 83, 76,236,255,129,212,185, 60, 19,250, 45,147, 54,
+ 70,123, 76,152, 48, 65,186,123,247,110, 53, 33,  4,111,126, 74,240,203,145,145, 56,114,228,  8,167,239,110,221, 58, 77, 58, 52,
+ 60,  6, 35, 70,220,196,231,159,127, 94,237,222,203, 47,  3,227,199,  3, 11,231, 37,168, 87,127,198,173, 77, 88,229,175,209,104,
+192, 48, 12,166, 76,153,  2,129, 64,208, 16,101, 95,203,242,119, 53, 32, 19,226,157,242,111, 52,132,173,  6,  0,172, 93,187, 22,
+107,215,174,181, 93, 27, 20,215,100,197, 57,116,232, 16,190,122, 33, 26,131,159,147, 67,216, 42,  8, 68, 36,  0, 35, 18, 64, 32,
+ 17,131,241,149,  0,160,160, 22, 51,168,209,136,215, 95,157,131,210,131,233,200,206,206, 86, 43,149, 74, 41,154, 14, 36, 61, 61,
+ 61,162,115,231,206, 98,171,213,138,164,164, 36,236,216,177,  3,  1,  1,  1,136,136,136,232,176,101,203,150,143,237,207,113, 10,
+  8, 84, 42,149,130,163,  7,255,247,159, 71,252,242,218,233,203,  4,120,121, 89, 57,190,252,247,103, 64,243,190,194,127,199,182,
+237,150,125,234,167,151,157,116,  7, 83,  7, 49, 36, 78, 74,157,216, 46, 19,199,177,243,245,123,180, 23,  6,143, 70,246,  0, 56,
+ 90,105,211,222,159,138,187, 63,218,189,165,226,163,215,173, 30,106, 71, 18, 22, 22, 70,217,180,164, 78,233, 73,169,167,105, 59,
+149, 47,188, 42,125,170,243,163,106,113,165, 25,190,255,126, 27,102,131, 17,146, 55, 63, 65,128, 88,130, 74, 81,  5,244,149, 21,
+240,  5, 65,213,245, 66,245, 63,255,249, 79,217, 59,239,188, 83,175,242,189,148, 13,172,223,108,  5, 96,176,127,128, 39,159, 96,
+240,194, 88, 82,237,189,137,158, 10,172,223,236,149,242,150,169, 84, 42,234,173,181,206, 90,253,233,233,233,119,235,224,168,  9,
+ 21, 70, 61,  0, 96,116,236,  1,168, 86,141,241,200,203,144,189, 50, 27, 34,146,117,183, 35,144,124,144,214,189,156,206, 11,209,
+230,255, 94,224,214,176, 31, 57,242,205,147,186,210,206, 18, 59,233, 59,121,146, 91, 59, 43,158,253, 82,186,126,199,223,213, 59,
+207,124,128, 21, 11,126, 65,184, 52, 20,155,190, 62,130,111,247,219, 54,  8,154,253,183, 15,100,235,254,251,129, 87,164, 42,238,
+ 93, 80, 96, 55, 84, 63,156,  7,165, 20,205,219, 62,142, 35, 71,142,192,190,111, 65,189,229, 91,253,153, 92, 42,151,183, 82,  3,
+ 95,  1,248,  5,169,169, 64,120,248,221,251, 31,127,124,247,120,225,188,  4,181,175,223, 82,217,236,215,151,215, 91, 78, 86,249,
+ 71, 70, 70,194,106,181,226,203, 47,191,108, 84,  7, 13,  0, 88,173,214,218,202,159,214,255,254, 50,147,117,213, 94,126,118,  8,
+183,202, 93, 60,231,240,243,217, 14,250,247,175, 61,199,206, 76,209, 85,163,249, 86,235, 12, 44, 88,176,192,113,127,193,130,  5,
+ 88,187,118, 45,152, 30,179,238,254, 87,251,243,174,228,  9,167,184, 46, 95,205,157,172,133, 83,184,149,175,178,178, 18,237,187,
+116,  5,172, 70, 48, 62,  0, 17, 10, 96, 46, 43, 65,101,206, 21,220,206,203, 71,167, 97, 82, 16,113, 75, 16,147, 17, 16, 48, 88,
+ 53,251, 45,140, 89,255,  1, 22, 45, 90,212,216,227, 50, 39,173,168, 84, 42,  9,165,180,101, 69, 69,197,176,160,160, 32,100,100,
+100,192,106,181,226,202,149, 43,216,176, 97,  3,122,247,238,141,224,224,224, 87,  0,188, 94, 67, 89,215,233, 13,160,148,182,238,
+194,164, 74, 59, 60, 50, 78, 92,156,116, 22, 37, 58, 31,252,184,203,140, 61,199,255,139,121,114, 95,161,208, 96, 13,179,199, 20,
+184, 36,  0,188, 66,111,122,212, 53,221,227,202, 51,192,112,232,136,236,188, 33,164, 75, 70, 98,125,146,178,101,246,229,108,156,
+254,225, 44,148, 74,165, 71,214,  3,171, 28, 12,134,159, 96, 48,108,130, 86, 27,197, 90,199, 30,253,192, 33, 62, 45,212,109, 43,
+ 45,144, 44,155,  3,203, 29, 45,204,151,175, 66, 40, 22,193,143,  8,224, 79,  4,240, 23,  8, 17, 36,146,128,150,233,113,243,208,
+ 49,183, 59,189,184, 82,234, 71, 78, 88, 29,239,225,234,247,  8,226,150, 18,187, 71,192, 59,235,223,174,156,213,240, 34,  5,110,
+ 77,229, 15,161,  0, 57, 55,203,113,179,200,136,212, 11,182, 13, 68,122,204,216,  9, 79,246, 61, 23,145, 44,  8, 73, 62,124,152,
+ 51,182,191,109,  9,  2, 95,190,129,128,169,231,224,243,252, 50, 32,216,223, 51, 79, 46,135,157,219, 60,217,226, 85,185,227, 13,
+245,208,160,247,112,242,240, 21,252,191, 73, 19, 17,220,186, 39,230,252,253, 53,124,177,116, 63,134,  6, 46,197,186,255,126,232,
+245, 14, 62,132,  0, 49,139,206, 57, 44,150, 17, 35, 70,216, 21,146,213,109,  3, 79,155, 42, 82,  3,135,  0,252,130,226, 91,205,
+208,227,145,102,248,230, 27,155,229,191,108, 25, 16, 18, 98, 19, 81,124,171, 25,138,111, 53,195,128,126, 23,213,238,148,255,161,
+ 67,135, 96,181, 90, 29, 74,122,203,150, 45,176, 88, 44, 30,185,175,235,241,240,212, 82,254,182,247,217, 61,121,167,  0, 89,167,
+ 84,202, 88, 75,205, 74, 41,172,214,218,221,151,189,110,165, 20,235,226,227,101,241,182,239,184,252,159, 20, 32,148,130,196,199,
+ 43,101,148, 82,124,246,217,103,142,251,236,113,124,124,188,140, 82,219,115, 20, 32,117,201,139, 87, 42, 97,191, 71, 44, 22, 11,
+204, 22, 11,204,230,218,117,198, 94, 55, 91, 44,248,122,221, 58,217,186,248,248, 58,202, 71, 33,108,222, 28, 16,  9, 96, 49,148,
+227,252,182,  4,252,227, 53,  5, 58,189,161,192,192,149, 31,225,202,239,167, 32,240,149,192, 84,116, 11,103,143,107,176,243,200,
+ 62,148, 20, 20,224,220,185,115,141,182,177, 86, 68, 68,  4, 39,111,130, 82,169, 12,160,148, 14, 73, 79, 79,255,245,253,247,223,
+239,115,254,252,121,177,209,104,132, 64, 32, 64,243,230,205, 97, 54,155,145,150,150,  6, 66,136,216,221, 88, 31, 31, 31,239,175,
+ 84, 42,125,227,227,227,131,139,243,146,127,255,240, 63,185, 65,127, 28,217,  5,173,158,129, 88,200,160, 83,160,  4, 37,119,196,
+ 80,252,211,140,179,119,  6,250,187,211, 27,246, 88, 19,234,220, 23,237,196,160,214,117, 94, 93,223, 31,176,202,191, 38, 57, 96,
+220,177, 80,118,191,239,106,110,206,113,211, 60,247,246,217,221,253,  6,195, 38,  0,  4,149,149,223, 67,114,226, 42, 12,251, 30,
+173,118,223, 29,222, 25, 20, 41, 13,208,150,193, 42, 22,194,120,242, 60,170, 46,230,160,114,255, 17,160,162, 10, 98, 74,225,  7,
+  1,132, 32,168,178,154,161,173,170,196,215,  7,118,185,149,185,250, 61,155,117,239, 12,219, 57,107,174, 80,100, 92,166, 88,244,
+137,247,253,181, 70,190,114,206, 46,123,185, 92,238,216, 91,155,197, 75,107,243,112,240,164, 14,185,183, 42,  1,  0,185,183, 42,
+145,149, 87,  1, 68,109,101, 55, 70,113,239,250, 33,249, 54, 34, 80,118, 22,254,254,151,225, 35, 41,131,213,170,133,201,116, 18,
+  2, 65,  8,140,250,162, 38,235,172,147,199,253, 93, 10, 16,124,249,203, 44, 52, 99, 30,  1,  0,220,204,160, 24, 52, 81,128,191,
+ 47, 31,131, 17, 99,250,  0,160,246,231, 60, 67,100,100, 36,125,243, 83,130,102,109,250,129,  2, 24,247,194,108,206,243,254,235,
+190, 89, 74,219,182,253,  3,192, 57, 20,223,106,134,178, 34,219, 22,204,253,251,  3, 61,122,  0,175,188,114, 87,249,151, 21,249,
+162,172,200, 23, 65,126, 55,235,149, 57,105,210, 36,200,100, 50,140, 26, 53,170,154,235,223,249,227,205,148,128,171,247,214, 27,
+196, 56,205,111, 19, 66, 28,159,186,174,197, 40, 20, 26, 69,180,251, 57,241,232,232,104,181, 43,203,121,193,130,  5,136,142,142,
+174,166, 80,235,146,247,139, 82,137,115,231,206, 57, 92,240,206,117,198,162,230,181,217, 49, 49,154, 24,133,235,173,154,197,148,
+130,241,243,129,169,224, 26,148, 75,151, 98,131,190, 24,186,200,161,142,251,223,253,119,  3, 62,120,235, 53,132, 46,122,  9, 31,
+157, 61,132,173,186, 43, 24,243,236,179,  8,  9,  9,241, 56, 24,208,174,232,105,120,120,120,181, 62,124,252,248,113,117,125,219,
+177, 43,149, 74,145, 82,169, 28,124,246,236,217,220,164,164, 36,205,155,111,190, 57,244,203, 47,191,148,148,151,151, 59,182,105,
+174,172,172, 68,179,102,205,178, 38, 79,158,220,115,248,240,225,143,184, 33, 18, 12, 33,164,203,217,148,109,133,153,251, 22, 93,
+ 93,180, 36,174,195,206,101, 29,113, 49, 95,136,146,114,  1,172,  4, 40, 42, 55,130,182,234, 94,185,240,221, 79,250, 60,243,252,
+223, 94,135,155,120,  2,187,251,191,154,171,223,205, 49,143, 38, 80,254,117, 77,  1, 80,174,174, 28,133, 66,225,238, 33, 90,211,
+250,183,185,218,190,175,203, 59,224,246,159,246,105,221, 78,173,165, 38,136,139,180,144,252,114,  8, 68,200,  0,149, 70,208, 50,
+ 61,136,217, 12, 17,  0, 11,181,162,210, 98, 70,153,217,  8, 88,221, 91, 81,108,144,223,234,247,234,228,180,176,  5,  9, 54, 10,
+ 97, 37, 78,129,124,110, 95,128, 90,214, 63,128,255,189,209,161,218,249,224,197, 57, 16,209, 59, 48,145,214, 80,169, 84,135,184,
+190, 88,146,114, 53,130, 62,250, 47,110,191, 25,131, 59, 90, 95,116, 52,157,135,197,146,  3,  0,184,118,186,125,147,117,216,173,
+123,191, 80,191, 54, 86, 89, 77,249,179, 24, 26,184, 20,195,250, 76, 66, 68,208,121,108,221,187, 92,237,201, 32, 50,114,228, 72,
+154,148,148,132,162,162,209,104,213,234, 32,154,181,238, 11, 74, 41, 24,134,225, 20,136,148,155, 11,228,228,156,179,159,149,  3,
+146,114,104,245,192,144, 33,182, 43, 89, 89,192, 87, 95,  1,101,165,128,190, 28, 40,215,  3,254,129,165,156,202, 86,151,181,159,
+157,157, 13,  0,248,244,211, 79,  1,  0,161,161,161,247,194,205,204,169, 14,231,207,159, 95,205, 98,175,169,184, 57,123,119,236,
+ 10,219, 49,239,239,132,207, 62,251, 12,107,215,174,133, 82,169,148,186, 11,174,155, 21, 28,138,204,243, 23,144, 31, 24,168,102,
+ 24,  6,243,230,205,171, 21,147,225, 73,249,158,172,106,  9,106, 45,199,107,159,190,135,126,147, 38, 65,249,233,167, 96,152,187,
+122, 78,153,117,238,174,135,240,200, 17, 28, 56,112,  0, 87,174, 92,145, 41, 20, 10, 13,151,141, 87,156,149,127, 74, 74,138, 26,
+  0,210,210,210,212, 17, 17, 17,178,148,148, 20, 77,120,120,184, 52, 53, 53, 21, 17, 17, 17,178,138,138, 10,117, 29, 99,174,105,
+198,140, 25,253,166, 77,155,214,162, 91,183,110,216,179,103,143,161,164,164, 68, 88, 81, 81, 97,243,118,216,231, 63,182,111,223,
+ 30, 58,110,220, 56, 95,133, 66, 81,225, 66, 12,227,164,172,153,156,140,211,107, 63,120,103,102,179, 86, 61, 84,248, 93,245, 42,
+254,184, 78,144,123, 75,  8, 80,  6, 85, 70, 19,180,180, 85,254,220, 89,115,134, 18, 66,242,217, 49,223,147,223,235,194, 67,192,
+ 79, 21, 60, 32,168,147,197, 37, 37, 37,213,250, 20,231,235, 80,156,175,243,168,173,217,207, 93, 43,214,214,240,146, 19, 87,225,
+115, 46, 31,194, 60, 29,235,  1,168,246,124, 93,  2, 47,228,229,226,196,157, 27, 56,127, 37,  7,183,174, 92, 69,233,213, 60,148,
+ 93,207,135,217, 80,  1,147,201,140, 50,139, 17,  6,139, 25, 85,212,  2, 11, 40, 40,225, 78, 50,157,163,253, 47,101,219,206, 23,
+125,194, 90,254, 12,226,222,107,156, 21, 47,158,198,  1,196,170,116,136, 85,233,170, 41,124,246, 19, 17,155,  6, 17,189,  3, 33,
+213,225,127,179, 44,102,206, 83,  0,183, 78,192,162,111,  6,  0,248,183, 48,  0, 85,183,174, 33,253,159, 29,144,249,211,  4,156,
+248,231,  0,100,101,220,104,210,142,217,127, 72,  8,244, 58, 64,175,  3, 12,190, 23,  0,  0, 63,127,104,194, 59, 11,150,  1,  0,
+134, 71,245,241,216,242,127, 97,228, 97,104,181, 81,  8, 60,126, 16,107,222,179,145,220,145, 35, 71,114,114,253,  3,192,138,143,
+151,147,238,221,  1,231,207,165, 75, 54,247, 63,  0,244,232, 65,177,118, 45,208,165,103, 57, 30, 27,122, 27, 67, 70,223,198,243,
+ 47,153, 56,151,209,217,226,103,207, 67, 67, 67, 17, 26, 26,138,121,243,230, 53,118, 21,187,125,215,156,177,126,253,122,153, 43,
+133,237,240,162,173, 94,141,245,235,215,115,178,132, 95,127,253,117, 53, 27,249,239, 10, 11, 23, 46,172,229,  5,112,133,195, 23,
+114, 49,115,214, 92,156,220,180,  9, 75,150, 44,169,147,156,176,229, 59,120,240, 32,234, 11,216, 27,249,216, 35,248,254,187,175,
+ 16,246,242,203, 88,177, 98,  5,234, 43,227,130,  5, 11, 48,122,244,104,120,179,  2, 32, 37, 37, 69,237, 20, 44,135,227,199,143,
+171,  1, 32, 53, 53, 85, 77,  8, 65, 74, 74, 74,189, 50, 13,  6, 67,203, 93,187,118,225,194,133, 11,200,202,202,242,211,235,245,
+ 48,153,108,253,204,104, 52, 98,239,222,189,196, 78, 22, 42, 56, 20,199, 90, 85, 85, 37, 62,185,237,101, 84,102,126,129,125, 73,
+217,184,114, 83,128, 82, 61,  3, 11,  5,242,245,190,152,187,232,189,136,152,152,152, 60, 14,  6,159,131, 87,176, 75, 78, 57, 78,
+  7,240,104,  2,235,191, 46,  2, 64,  0, 16,169, 84, 10,169, 84,138, 51,103,206, 56, 62, 57, 39,174,161,164,162,  4,173,134,120,
+190,238,247,228,201,147,  4,  0,252,252,166, 65,114,226, 42, 68,215,138, 64,  9,129,120, 86, 81,181,251,110, 21,151, 88,  0, 11,
+  5,242,244,197,200, 45,209,226,118,169, 14, 37,149,149,208, 25, 43,112,187,170,  2, 55, 43, 13,200,175, 44,135,214, 84,  5,157,
+213,  4,163,213,125,240,235,147, 79,184, 24,240,156,226,  2, 94,155,210, 12, 20, 98, 80,143,183,  1,191, 27,189,239,226, 26,103,
+228,222,170,196,193,147, 58, 12, 94,156, 83,189, 46,232, 29,248, 88,175,193,199,122, 13, 31, 60, 37, 68,110,110,174,145,171,204,
+109, 87,172,104, 19, 23,239, 56,191,162,183, 32, 47, 59, 31, 25,201,231, 81,112,181,184,201, 59,238,166,175,147,  0,  0,165,133,
+ 20,126, 21,143, 65, 58, 75,136,255,183, 76,228,248,196,109,125, 25,132,187,241, 79,159, 27,145,132, 87, 23,217,148, 63, 33,  4,
+191, 38,219,154,128,235,154,127, 22,161,189,122, 86, 47,231, 38,224,203, 47,129,203,151,109,158,128, 15, 63,164, 14,247, 59,165,
+ 20,129,129,129,238, 71, 96,123, 31,101,231,253, 63,253,244, 83,100,103,103, 35, 51, 51, 19,153,153,153, 72, 76, 76,196, 91,111,
+189,133,220,220,220, 38,107, 15, 86,209,185,178,164,231,207,159, 15, 66,  8,103,101, 72,  8, 65,125,100,162,190,123,206, 56,226,
+ 83, 12,194, 52,195,183,239,126,130,102,187, 18, 17, 29, 29,141,151, 89, 54,  6, 64,209,163, 47,230,135, 13,131,159,159, 31, 70,
+142, 28,137,247,223,127, 31,137,137,137,234, 21, 43, 86,184,124,255,190,203,207,196,205, 62,143, 33, 56, 56, 88,102,181, 90,235,
+ 37, 20,245,221,227,160, 28, 29, 30,167,136,136,  8,153,147,162,196,208,161, 67,101,110,188, 39,163, 70,142, 28,217, 34, 55, 55,
+ 23, 71,142, 28,193,163,143, 62, 10,161, 80,232,152,226,  8, 14, 14,230, 58, 29, 97,181,255, 95,210,189,215,192,216,245,251, 91,
+226,143, 61,203,240,100, 68,111,248, 75, 24,248,251, 89,224,235, 83,133,167,159,155,108,  5,160,117,254, 98,124,124,188,187,185,
+ 40,199, 42,  0,142,211,  1, 60, 30, 52, 15,  0,  0,162, 84, 42,155,207,159, 63, 31,243,231,207,  7,  0,227,199, 49, 31,195, 84,
+104,134,175,175,  4,222, 52,158, 92,110, 11, 31,246,123,234, 50,168,128,193,251, 63, 27,156,173,127, 78,240, 11, 14,150,153,155,
+249, 65, 71, 45,184,160,215,225, 92, 73, 17,206,151,222,193,249, 82, 45, 46,232,181,184,108,208,161,168,170, 18,229,102, 51,110,
+ 24,244,142,255, 89, 31, 94, 24, 75,176,250, 61,  1, 86,191, 39,  0,133,  0,148, 48,136,158, 74,240,250, 84, 49,102, 77,105,131,
+238,221,219,193, 10,145,199, 63,153,117,245, 59,207,203,215,147, 20,168, 46, 25,178,172, 60, 27,145, 79, 95,105, 11,162,219,247,
+118,  0,  0, 64, 72,117, 16, 80, 61,170, 24, 91, 68,179, 86,171,245,147,203,229, 81,158,148, 49, 44, 44, 12,137,137,137,216, 84,
+174, 71,133,145,193,171,155,191, 69,161,196, 23, 21,198,166,219, 38, 98, 98,255, 15,100, 41,218, 79,176,233,199,173,142,107, 63,
+127,104,194,208,192,165,142,243,232,103,190,146, 81,112, 90, 63, 76,215, 44,  5,102, 44, 26,141,150,199, 19, 33,251,103, 36,152,
+  9,128, 70,163,241,170, 15,119,233, 82, 61,122,124,212, 40,160,101, 75, 32, 36,  4,  8,239,223, 28, 18,177,  0,  2,230,174, 88,
+137,175,175,219,  1,153, 97, 24,135,229,159,157,157,237,176,250,217,207, 71, 31,125,132,143, 62,250,  8, 55,110,112,247,202,184,
+154,175,175,126,223,115,235,107,253,250,245,178, 53,107,214,184, 84,216, 92,173,127, 39,215,115,173, 56,  5,246,220,106,229,150,
+194,222, 72,  8,172,134, 42,136,218,119,129, 98,249,114,204,240,111,137,150,154, 20,199,253, 89,127,155,129, 15,254,253, 45,178,
+ 86,255, 15,255,232, 55, 10,147,  3,187,225,192,142, 29,200,201,201,113,249,254, 61, 31,163, 64,159,190,125,101, 86,123,153, 88,
+ 66,230, 60, 61,227,234, 90, 93,152, 61,123, 54, 37,132, 80, 54,176,143,157,239,119, 86,242, 41, 41, 41,154,161, 67,135,202, 40,
+165, 96,167,  2,220,212, 91,146, 72, 36,122,244,249,231,159,207, 46, 41, 41,129, 78,167,131,175,175, 47,218,180,105,131,150, 45,
+ 91,162,101,203,150,238, 42,207, 90,131,216, 89,124,124,124, 12, 47,198,124, 46,219,112, 98, 48,174, 94, 47, 69,187,  0,  1, 34,
+122, 18, 60,222,141,194,191, 69,139, 98,  0,150,122,244,  6,191,223,192, 67,106,253,  3,110,150,  1, 42, 20,138,114,165, 82,233,
+  3,192, 95,161, 80, 56, 88, 96,167,200,142, 94, 49, 95,118,169,159, 92, 46,167,226, 89,142,200,127,226, 52,255,239,118, 64,126,
+119,247, 86,205,167, 81,207,193, 96,174, 66,169,222,128,108,147,  9, 34,171,237,203, 37,166, 74, 88, 41,  5,  5,176,231,214, 21,
+232,205, 38,  0,224, 48, 48, 17, 44,250,164,122, 31,183,197,  3, 88, 97, 65, 21, 46, 94, 46,195,247, 91, 74, 61,250,177,206,138,
+222,238,242,167,246, 99,135, 98,231,178,250,193,246, 93, 21, 68,163,191,  6, 16,130,162,162,187,193,121, 98,235, 77, 24,153, 14,
+152,219, 47, 19, 55,111, 58, 44,167,131, 92,202, 23,243,243,250,106,196, 75,165, 82,129, 45,205,230,179,199, 16, 21, 21,213,100,
+ 29,119,231, 25,219,242,190,228,196,243,  0,128, 97,125,108,153,241,222, 89,176, 12,199,206,247,193,191,183,190, 12,229,174, 57,
+156,231,255, 95, 93, 20,133,160,160, 68,251,153,198, 78,150,162, 64,169,205, 26,  3, 40,130,130, 18, 57,201, 58,176,111,191, 35,
+167,197,203, 47,  3, 50, 25,193,157,235,  1,208,235, 36,168, 40, 21, 99,243, 70,130,249,243, 41,174, 21,150, 33, 60, 98, 40,146,
+ 14,169, 57, 89,197, 22,139,197, 49,223,159,152,104, 43,171,179,194, 47, 44, 44, 68, 97, 97, 33,103,253,239,164, 48, 40,195, 48,
+181,148, 42,165, 32,158, 38,  1, 82, 40, 20,154,215, 95,127,189, 90, 44,  0,235, 17,240,196, 21, 78,156, 88,137,181,198,178,  2,
+ 66,184,207,217, 17, 66, 96, 46, 43,131,168,117, 16,  4,126,205,208,231,197, 73,248,104,236, 24,188,203, 46,219, 27, 56,  8,150,
+138, 74,136, 90,181, 67,191,161, 82,116,237,212, 13,159, 95, 76, 65,223,190,125,101, 39, 78,156,168, 69,  2, 98, 20, 10,  0, 68,
+ 13,  0,115, 98, 98, 28, 75,  7,205, 53,148,189, 80, 40,  0,232,221,133,138,117, 21,120,221,186,117,  4,  0,181,187,248, 73, 90,
+ 90,154, 75, 23,127, 74, 74,138,134,139,242,143,143,143, 39,132,144,165, 45, 91,182,236, 51,116,232,208,238,151, 46, 93,194,169,
+ 83,167, 96,177, 88,224,239,239, 15,131,193, 80, 24, 20, 20,116,213, 19,163, 79,169, 84, 50,237,218,181, 59,240,220,115,207,181,
+ 59,126, 52, 13,107, 85,  7,208,130,136,209,179, 93, 21, 46,223,241,199,136,158,166, 43,  0,106,206, 99, 89,234,107, 19,231,140,
+ 83,132, 16,231,211,154,121, 95,120, 52, 49,132, 28, 94,122, 35,  0,163,211,160, 66,243,146, 60,158, 31,174,166,220,235, 80,124,
+156, 51,  6,150,106,117, 50,147,159, 68, 93,194, 88, 81, 80, 89, 14,152, 76,176,216,215, 53, 93, 44, 47, 70,190,161, 20,148, 82,
+216,243, 11,104,184, 20, 47,122, 42,193,250,205,119,251,228,165,108,160, 87,119, 51,  4,208, 55, 72,249,215,232,236,238,234,160,
+ 78, 47,128, 74, 53, 71, 13,164, 67,171,213, 26,115,115,115,133,171,198,128,137, 61, 48, 18, 11,250, 30,115, 88, 97, 92, 73,133,
+ 43,175, 75,205,115, 86,  9,113,181,230,176,140, 96,176,125, 37,135,171,229,126, 91,183,110,181,101,  2,148,203, 41,151,156, 15,
+ 49, 19,191,150, 41,119,206, 85,167,108,165,136,  8, 58,143,225, 81,125,112,244,192,121, 28,215, 45,  7,  1,129, 98,226, 87,178,
+248,157,115, 57,149, 47, 40, 40, 17,132, 16,188,240,194, 11,248,230,155, 82,176, 42,198,246,151,178,132,128, 86,183,236,239,212,
+ 41, 47,114,148, 76,150,116, 72,173, 30, 53, 10, 48, 22,116,198,245, 98, 31, 88,237,179,173, 29,244,237,240,118,116, 25, 14, 28,
+239,137,230,157,122,202,216, 44,129,245,129, 85,252,121,121,121,  0,128,130,130,  2,135,103,224,214,173, 91,142,129,213, 75, 16,
+ 39,183,115,205,151,146,112,201,  7,224,140,111,190,249, 70,182,118,237, 90, 53, 75,  0,214,172, 89,227,177,245, 95, 83, 97,120,
+ 11,137, 68,130,130,107, 87,209,173,123, 15, 88,205, 85, 32,102, 11,132,205, 91,160,249,160,193,104, 54,240,  9, 88,245,102, 88,
+ 12, 85,160,102, 11, 96,177, 34,118,221,191, 49,229,229, 41,144, 72, 36, 46,229,153, 55,  7,114,250,191,174,158, 11, 91,225,250,
+217,136,136,  8,153,157,  0, 80, 74, 41,134, 15, 31, 46, 75, 78, 78,174,245,156, 59,229,111,175, 43, 43,128,189, 61,123,246, 28,
+248,197, 23, 95, 24,111,223,190, 93, 57,102,204,152,231,210,211,211,255, 97, 48, 24,138, 90,183,110,173,248,252,243,207,181, 92,
+235, 79,169, 84,138,  0, 60, 50, 52, 60,188, 77,204,172, 24, 92,201,187,162,157, 62, 43,230,201,212,  3, 27,227,110,150,105,135,
+ 13,142, 28, 99,109,215, 41,244,255,213,180,242,235, 75, 45,108,239, 99,196,137,127, 18, 23, 58,160,230, 49,143,  7,149,  0,212,
+103, 93,120,163,252, 89,101, 83, 71,194, 24, 78, 36, 96,229,169,195, 26,  0,100,234,160,  8, 10, 95,  9,116,212, 12,163,217, 12,
+ 43,181,162, 85, 64,  0,242,244, 37,240, 36,185,144,171,229,125,119, 99,  0, 60, 91,139,237,202,197,223,208,116,189,246, 60,  2,
+ 19,  7, 15, 30,188, 51, 54, 54, 86, 28, 20, 20,100,189,121,243, 38, 22,244,189, 89, 83,249,115,254, 31,117, 37,236,241, 10,246,
+ 44,127, 46,146, 60,213,122,134, 43,226,119,206,209,  0, 32, 19,250, 45,147,238, 62,251,161, 58,101, 43, 64, 64, 48,177,255,  7,
+178,157,103, 62,208,112, 85,254,108, 95, 42, 42, 26, 77,129, 82,214,250,133, 43,189,179, 33,238, 32,219, 31, 72,125,155,107,216,
+173,122, 82,164,235, 43,181,148,149,169,137,  0, 48, 84,250,130,148,153, 33,100,132, 48, 48, 18,217,216,201,175, 97,110,116,140,
+219,246, 72, 72, 72, 32,  9,  9,  9,244, 30,190,127,160,148, 18, 66,  8,117,142,104,119,246,  4,120, 34, 75,161, 80,104,162,163,
+163,177, 96,193,  2,  7,161,104,170, 84,184,163, 70,141,194,220,173,235,241, 81, 89, 49,  6, 68,142,  0,211, 46,208, 86, 38, 19,
+181,165,238,133,  8, 68, 32,  4, 17, 11,240, 77,252,106,180, 24, 61, 24,221,187,119,247, 56,106,191, 33,112,178,238,213,225,225,
+225,178,228,228,228,  6,213, 85,118,118,118,212,193,131,  7,175,  9,  4,130, 29, 79, 62,249,228,199,115,230,204,185,189,110,221,
+186, 36,192, 54,229,224,129, 40,  6, 64,226,169, 83,167,134,252,176, 97, 35, 35, 22,248, 92,159,244,210,164,254,115,231,206,213,
+125,253,245,215, 19,  0,  4,216, 21,127, 25,187, 65, 16, 23,143,  2,143,  7,  3, 92,220,255,222, 18,128,  6, 19,  6, 55,202,135,
+243,128,180,249, 84, 10,145, 79,146, 75,173, 25, 89,106,125,149, 17,102,139,  5,221,135, 12, 66,168, 57,220, 83,133,219,104,193,
+ 40,108,210, 31,  0,106,214, 26,183,199,  1, 52, 40,  7,190, 74,165,218,165, 84, 42,133,137,137,137,139, 86,173, 90,245, 79, 39,
+114, 49,202,249,127,113,245, 40,  0,104,180,228, 37,147, 47,178,113, 22,117,255,190,201, 23,229, 94, 49,253,221,103, 63,212,176,
+237, 67, 65,177,243,204,  7, 94,149,209,166,220,  9, 94, 93, 52,234,174,217, 75,238,222, 91,244,137,231,249,200, 99,223, 62,167,
+137,  5,200,186,111,150, 74, 43, 12,182,125,  0,238,230,255,143,241,248, 29,177, 91,100, 22,133, 66,209,232,243,170, 44,  9,104,
+ 12, 89,246, 88,  0, 53,123,220,  8,101,243,234,123,221,187,119, 71,251,121,243,100,107,247,239, 87,231,124,252, 11,228,162, 86,
+104,105,223,188,167,194, 96,198,252,183,150, 64,224, 23,132, 61, 27,149, 56,211,154, 96,236,176, 97, 94,231,237,183, 88,204, 94,
+ 15, 19, 92, 93,252, 28,200, 23,121,254,249,231,111, 83, 74,227,122,245,234,245,159,162,162, 34,189, 23,138,223,185,222, 71,166,
+165,165,193,106, 38, 24, 54,188,255,  7,115,231,206,213,  1,192,156, 57,115,172,  0,116, 13,105, 82, 39,143, 83,181, 99, 23, 94,
+ 81, 30, 15,153,  7,224,158,144,  2,175, 21, 99, 66,181,  4, 59, 72,203,206,104,242, 74,173,145,244,135,189,214, 96,185, 10,133,
+194,  2,224, 95,246,143,215,114, 93,149,175,129,191,151, 52,198, 51,247, 18, 54,  5, 79,177,232,147,196, 70,151,237, 46,213,175,
+  7,237,107,186,151,117,208, 88,155,174, 40, 20, 10,141, 66,161,104, 20, 89,164,  1,115,  0,108, 25,148, 74, 37,236,219,247, 34,
+215,105,251,222,228,131,  7, 28,219,247,142, 30, 58, 26,118,210, 91,231,255, 19, 76,209, 17,203,150,192,218,138,137,227,110,130,
+238, 72, 64, 99,212,215, 19, 79, 60, 81,101, 54,155,147,  0,232,223,127,255,253,  6, 41,209,152,152, 24,242,254,251,239, 83,163,
+209,  8,  0,251,235,122,110,229,202,149,100,241,226,197,142,255,101, 79,  5, 92,239,216, 94, 51,184,147,199,253,  5, 87, 15, 23,
+241,118, 31, 97, 30, 60,120,240,224,209, 36, 48,  3,168,  4, 32,105,100, 35,206,221,142,129,156,119, 20,228,241,112,128,111, 76,
+ 30, 60,120,240,120,184, 32,  4,208,140,131,242, 55,192, 22,192,221, 88,250,192, 10,126,217,223,159,174, 35,241,224,193,131,  7,
+143, 63, 31,252,120,125,193,131,247,  0,240,224,193,131,  7, 15, 30, 60,120,  2,192,131,  7, 15, 30, 60,120,252,213, 81,205,165,
+115,250,244,105,175, 35,114, 93,  5, 19, 62,232,242, 66,  6,249,192,215,167,  0, 34,113, 49,172, 86,219,178, 48,129,128,  1, 67,
+  4,182,191, 12,  1, 33, 12, 40, 17,130, 16,  2,  6,102,236,220, 45,  2,165, 20, 65, 76, 43,120, 82, 62,123, 70,197,214,176,  5,
+240,148,193,150, 96,192,196, 46,249,122, 24,235,143,151,199,203,227,229,241,242,120,121, 15,166, 60,222,  3,224,  6,135,143, 94,
+134,174, 68,  7,147,137,226,246, 29,130,125,137,190,216,127,192, 31, 12, 17,225,128,186, 61,246, 31,234,128,253,234, 14, 56,114,
+162, 13,132, 16,130,129,  4, 35, 34, 24,248,136,125, 56,255,143,169,175, 78,167, 83, 95,157, 78,143, 38,171, 43, 77, 12, 73, 62,
+127, 46,253,176,250,216, 81,125, 98, 98, 98, 37,128,230, 60,  7,125,248, 49,230,169, 17,210, 57,115,166, 83, 79, 55,121,122, 88,
+161, 84, 42,165,212,142,250,118,215,227, 10, 90,  3,124,143,226,193,163,  9, 60,  0, 44,134, 13, 31,194,249, 37, 60,150,156,230,
+150,181, 52,182,188,198, 68, 90,186,  8,227,198, 88,112,230, 15, 95,136, 69, 66,  8,  5, 66,136, 68, 20, 62,  2, 19, 32,108, 14,
+ 33, 42, 48,164,143, 25, 18,177, 15, 40,128, 14,237,128,103,199, 91,113,112,  7, 55,229,127,249, 98, 38, 30,125,172, 59, 58,  6,
+183, 68,222,181, 75, 93,  2,218,119, 67,235,142, 22,252,246,235,175, 72, 76, 76, 44, 70, 19,239,136, 37,151,203,199,171, 84,170,
+221, 78,231,207, 56,159,243,168, 27,115,231,200,169,185,242,188,108, 72, 88,160,218,106, 45, 66, 73,199, 10,117,167,246,163, 81,
+ 94,213,  1,223,172,255,239,159,118,167,179,232,232,104,245,130,  5, 11, 64,  8,193,154, 53,107,212,141,145, 19,128, 77,  7,192,
+235,255,251, 15,143, 72, 23,165, 32, 12, 83, 95,123, 83,231,246,100,219,244,110,242,173,234,237,236,188, 51, 34,143,198,  5,155,
+ 13,208,201, 75,192,141,  0, 52, 21,152,251,172, 11,199,143, 53,129, 66,  0,161, 64,132, 97,225,  4,109,219, 48, 16, 10, 25,248,
+136,  4,232, 21,202,224,218,117, 51,134,132, 49,104, 21, 36,193,111,135, 90,  0,  0,  4,180,  2,148, 90,225, 46, 69,240,212, 87,
+167,211, 63,210,211,209,181, 99, 39,252,145,114, 28,169, 70, 19,116,119,116, 16,251, 52, 71,239,129,195,209,127,248, 88,168,119,
+170, 32,231,152, 27,255, 30, 40,254, 81, 42,149,234, 96, 72, 72,  8,210,211,211,217, 14, 83, 12, 96,158, 74,165,218, 37,151,203,
+163, 84, 42,213,193, 63,219, 75, 49, 59, 70, 78,125,132, 90,  8, 25, 35, 42, 43, 45, 40,209,251,226,199,159, 14,122, 84,255,163,
+199, 12,151,182,240,213, 98,212,112, 49,186,118,121, 86,221,162, 69,  0, 76,102, 51,110,223,190,131,118,185,215,145,149,157,131,
+ 87, 95, 25, 79, 55,254,176,199,171,118, 13,179,239,169,  0,112,223, 38,251,126, 90,255,192,221,237,112,215,172, 89,  3,165, 82,
+ 41,109,170,116,192,247,241,125,161,219,182,109,171,189,159, 66, 19, 41, 47,165, 50, 94, 74, 64, 16,221,  8,245, 78,115,127,  6,
+ 73,125,205, 89,199,219,179,100, 58,246,189,114,224,181,120,189, 91, 34,247,219,111,191, 57,206,199,141, 27,135,189,123,247,214,
+123,206,227,222, 43,127,231,107,206, 68,160, 94,  2,144,124, 52, 21,195, 71,132,223,183, 66, 91, 61,203, 14,233,252,176, 87, 47,
+ 33, 35, 20, 64,167, 21,162,125, 91, 17,218,183, 21,163,188, 92,  4,137, 72,  8,139,208,  7,131,250, 17, 12,120, 92,  0,134,136,
+ 64,  8,129,143, 72, 12, 17, 83,  5, 34, 17,195,108,  0,204,208,215,171,252,143, 30, 58,136,110, 29,218,224,220,153,115,200, 45,
+188,121,183,124,101,229,144,156, 63, 65, 25,  1,193,160,176, 65,248,109,175,103, 58,118,221,186,117,210,244,244,116,245,229,203,
+151,225,235,235, 11, 95, 95, 95,217,246,237,219, 53, 30, 14,102, 50,149, 74,117,144, 85,252, 78,157,163, 37,128,177,223,151, 57,
+221, 86,  0,  0, 32,  0, 73, 68, 65, 84,126,251,237,157,215, 94,123, 45, 81, 46,151,143, 81,169, 84,137, 15, 98,  7, 15, 15, 15,
+151,166,166,166,114,254,221,210, 81,195,164,125, 67,155,171, 59,117, 40, 68, 64, 11, 31, 48,140, 31, 42, 42,204, 40,210, 86,224,
+101,121,111, 42,105, 49,  8,223,127,247, 19,167,126, 36, 66,  1, 94,120,230,113,117,159, 62,189,113,179, 64,135,147,191,159, 66,
+121,185, 30,  1,  1,205, 17, 18,210,  5,140, 64,  4,139, 37, 23, 49,179,167,211,248,117, 63,254,169,172,155,232,232,104,245,194,
+133, 11, 29,231, 11, 22, 44,104, 52, 47,192,131,236,  1, 80,169, 84, 68, 46,151,211,132,132,  4,184,218, 88,233,126, 27,237, 10,
+ 69, 12,  8, 33, 88,191, 94, 41,139,142,110, 24,  9, 96,186,188,232, 80,222,105, 43,154,185, 28, 76,219,183,100, 16, 28,196, 60,
+180,237,247, 87,133,179,178,119, 69, 10,220,122,  0,146,143,166,  2, 64,131,137,192,209,121, 89,245,222, 31,241,121, 15,175,  7,
+ 11,167, 28,231, 30, 13, 66,137,154,182, 16,  9, 69,232,220,177, 28,101,101, 34,156, 60,215, 25,  2,129,  0,  2, 34,128, 88,100,
+ 70,159, 30,  6,244,236, 33,  0,  1,  3,177,200,  7, 98,  1, 65,216,227, 70,  4,  5, 90,177,233, 63,245,203,238,221,173, 29,174,
+101, 23, 86, 87,254,118,228,222,184, 70,  8, 35,164, 29, 34, 30, 71, 96,203,230, 40,214,221,225, 84,222,181,107,215, 74, 87,174,
+ 92,169,190,118,237,154,243,101,245,248,241,227,177,103, 15,119,107, 83,165, 82, 29,114, 86,254, 46,208, 58, 46, 46,174,248,205,
+ 55,223, 60,128, 38,158,162,168, 71,249,171, 61, 41, 91,104, 72,144, 58,184, 93, 41, 90,183,242, 71,167,224,246,240,243,247,195,
+181,107,249,176, 88,172,  8,238,216, 28,231, 47,166, 32, 98,196, 16,105,202,209,180,122,  7,211, 55,222,152, 78, 31, 15,213,225,
+145, 71, 58,225,194,197,107, 56,121,242, 34,110,223, 41,  3,165, 64, 96,160, 47, 12,134,114, 12, 28,216,  7,197,197, 37,200, 63,
+249, 59,134, 63, 25, 46, 77, 62,194,157,168, 60,200, 96,173,127,251,182,211, 96, 61,  1,107,215,174,245,216, 11,192, 78,247,215,
+204,  4,236, 98, 59,217,  6,247,191, 78,157, 58,209,206,157, 59, 55, 56, 23,191, 74,165, 34,147, 39, 79,166, 91,183,110,  5,187,
+177, 82,125, 10,207,190, 21,110,173,242, 71, 68, 68, 72,217,205,129,234, 32,177,212,141, 76,199,255, 86, 40, 98,212, 13,121, 71,
+107,202, 27,178,164, 28, 39, 86, 52,171,166,248,121, 60,156,214,127, 77,151,127,131,166,  0, 26, 74,  4, 70,124,222,163, 78, 18,
+224,141,242,103,145,148,148,132,252,252,124,  0, 64,112,112, 48,245,228,101, 16,208, 10,  8,137,  5, 98,145,  8,191,159,107,  3,
+129, 80,136,230, 34,189, 45, 14,160, 25,131,252,252,230,120,188,143, 21,132, 16,200,159, 53,131, 90, 25,128,248,128,128,194, 22,
+200,239, 26,134,226,235, 40,208,150, 35, 51, 63,191,206,178, 20,151,104,161,187, 93, 96,151,197,121,  0,170,169,252,  1,  0,123,
+246,236,193, 83, 79, 61, 37,221,183,111,159,219,  1, 78, 46,151,143,202,201,201,113,217, 97, 74, 74, 74,156, 47,183, 92,182,108,
+ 25, 46, 92,184, 48,250, 65,154, 10,112, 82,254,156, 33, 29, 53, 76, 42, 17,222,132,175,111, 75, 72,124,196,232,214,173, 43, 58,
+119,237,138,210, 82, 13,180,218,114,136,197,  2,  4,  5, 74, 32,244,109,233,118, 48, 21,210,124, 52,111,214, 10,134, 10, 51,206,
+157,203,194,141,130, 18,220, 44, 40, 71, 69,149,  4,143,  4,155, 33,241, 17, 32, 43, 51,  7,143,118,239,142, 27, 55, 75, 81, 97,
+110,193,105,128,118,118,251,215,117,221,211,233,128,186,100,122, 35,139,181,254, 23, 44, 88, 80,235,250,194,133, 11,189,242,  2,
+184,218,157,176,230,220,113, 99,121, 21, 82, 82, 82,212, 13,221,144,103,242,228,201, 84,165, 82, 65, 46,151,195,213,116,  0, 23,
+ 79, 21,171,252,  1, 32, 45, 45,173, 86,153,236,247,221, 26, 61,236, 14,131,141,229,113,217,186,208, 31,147,215,232, 93, 42,254,
+224, 32,198, 62, 74,113,107,222,113,227,198, 85,243,146, 60,253,244,211,213,234,138,119,251, 63, 56,240, 56,  6,160,177, 60,  2,
+141,137,172, 44, 27,177,200,207,207,247,136,  4,  8,133, 66,136,  4, 34,136, 68,  4, 35,135,  3,  6,125, 21,174,100,139, 33, 18,
+138, 32,180,  8, 49, 52,156, 66, 44, 18, 65, 32, 96,  0, 74,160,213,  1, 39, 78,  9, 97,181, 90,  1,220,174, 83,238,169,223,179,
+ 81, 94, 94,119,  6,206,110,237,219, 83,189,153,160,162,162,  4, 22,171,153,243,239, 60,117,234, 84,221,164,195, 96,224,164,104,
+106,186,254, 93, 49,195,157, 59,119, 58, 63,159,216, 20, 94,  0, 87, 46,126,103,229,111, 31,  0,185, 89,128,193,237,212, 12,115,
+ 29,102,139, 21, 70,147, 25,183,239,104, 33, 18, 75, 80, 85,101,130,201,108,129,217,108,133,217, 66, 57,121, 98,196, 34, 61, 36,
+190,157, 80, 84, 84,130,210, 50,  3,180,186, 10,180,104,213, 31,195, 30,127, 28,105,201,123,209,209,104, 70, 73,105,  9,122,246,
+236, 14, 31,177, 16,250, 50,237,159, 98,160,176, 71,254, 59,230,254,107,120,166,188,138,  5, 88,176, 96, 65, 53,111, 66,205,123,
+ 92,  9,128, 86, 27,229,120, 48, 38, 38,  8, 91,183,110,173,214, 95, 89,  3, 33, 55, 55,215,235, 93, 57,229,114, 57,221,186,117,
+171, 99,155,241,186, 98,  2,106, 42,215,154,158,170,148,148, 20, 53, 27,248, 70, 41,165,199,143, 31,175,118,255,248,241,227,106,
+119, 78, 15,150, 52,176, 36,192,217,138,175,203,208,119,243,219, 48, 41, 34, 17, 91,  0, 76, 89,163,199, 19, 75,202, 27, 68,190,
+106,206,241,187,139,  9,224,113,239,189,  1,117,121,  0,238,171,127,199,149,165,223, 16,235,191,134,197,138,172,172, 44,118, 64,
+225,212,123,  5,  2, 33,134, 14,177, 66,192,  8,113, 34, 93,130,140, 44,  9, 38, 60,  5, 60,243, 52, 48,113, 28, 65,135,118, 98,
+ 72,196, 62,144,136,125,224, 43,241, 65,112,  7, 31, 72,196, 18, 72,220, 44,  3,204,203,189, 78,138,181,183, 72, 93,  3, 73,247,
+110, 93, 16,208,210, 31, 18,171, 17,229,  6,211,125,239, 20, 71,143, 30, 61,120,244,232,209,106, 10,223,249,  3,  0, 69, 69, 69,
+152, 56,113, 98,147, 89,249,118,235, 72, 90,243,154,253,216, 35, 75,206, 98,  1,244,  6, 19,244,122, 35, 74, 75,171,112,235,150,
+ 14, 55,110,220, 65, 89, 89, 21,202,203, 77, 40, 47, 55, 66,175, 55,161,164,184,196,173,172,170, 42, 51, 42, 43, 45, 48,153,140,
+104,222, 92,140,206,193, 45,224,231,239, 15,  0,  8,233,222, 21,157, 58,182, 64, 64, 11,  9, 40,181,192,100,182,162,170, 74,255,
+167, 24, 72,162,163,163,213,139, 22, 45,170, 87,153, 71, 71, 71,115,182, 72,237, 91, 10,215,121,127,205,154, 53,248,230,155,111,
+ 60,222,106,216,105,219, 89,199,135, 85,168,249,249,249,236,238,153, 30,105,183,201,147, 39,211,132,132,  4, 56,147,  7,149, 74,
+ 69, 38, 77,154, 84,239,247,102,207,158, 13, 66,  8,216,126, 28, 30, 30, 46,  5,128,161, 67,135,202, 88, 69,206, 90,253,236,125,
+ 74,169,227, 62,135, 95, 91,205,138,119, 69, 28,184,204,160,180,110,221, 26,196,137, 37, 52, 84, 30,143,  7, 79,249,187, 58,247,
+202,  3,240, 32, 89,254,119,  7,120, 11,  4,  2,129,199,223, 27, 62,196,138,182,109,124, 80, 90, 42,132,143,208, 12, 31,177,  0,
+154, 84, 49, 38,200, 68, 16,139, 68, 40, 45, 21, 33, 57,221, 31, 45, 36,  4, 12,195, 96, 92,148, 17,207, 77,160, 96, 24,138,229,
+167, 61, 47,167, 92, 46,167,  2, 63,  9,180,162,214,240, 51,229,225,114, 62,197, 40,233, 72,206, 91,250, 14, 28, 56, 16,199,142,
+ 29,115,121,207,207,207,143,243, 96,169,211,233, 70,  3,192,134, 13, 27, 48, 99,198, 12,199,245,162,162, 34,199,241,140, 25, 51,
+ 80, 88, 88,216, 36,237,153,154,154,170, 33,132,128,157, 39,101, 24,  6,172,187,179,158,121,211, 58,145,123,253,134,172, 77, 11,
+131,218, 71, 44,128,209,100, 69,101, 85, 30,174,231, 21, 65,171, 43,133, 86,107, 64,145,182,  2, 69,218, 10,180, 12,234, 10, 32,
+187, 94, 89,183,238, 80, 20,220,186,131,222,189,187,163, 88,167,131, 72,200,160,180, 44, 15,250, 98, 43, 30,123, 84,143,118,109,
+218,192,207,207, 15, 62, 62,190,184, 89, 80,  6, 34,  8,228, 84, 70,103,151,124, 99,173,  2,104,236, 21,  4,117, 89,235,192,221,
+ 88,  0,174, 80, 40, 20,154,232,232,104,204,159, 63,191,150, 87,129,157,102,240,118,101,193,228,201,147,171, 89,176,236,251, 69,
+  8,193,139, 47,190,136,132,132,  4,194,149,  4,212,180,252,157,239,213,244, 52,212,196,186,117,235,  8,  0,135,149,159,150,150,
+166,182,247,107,141,221, 27,192,254, 85,  3, 32,169,169,169,142,251,245,109,231,154,146,146,162, 30, 62,124,152,236,216, 49,219,
+ 59, 49,123,246,108,156, 62,253,187,140, 85,225,199,143, 31, 87,179,191,127,232,208,161,110, 61,101,235,214,173,195, 87,178, 64,
+ 76, 89,107,176,253,174,133,254,213,238, 79, 89,107,112,212,231, 76,153,  8,223, 29, 50,130,199, 67, 64,218, 99, 87, 86, 39,221,
+171, 22,227,244,233,211,220, 87,  1,220, 11,197,239, 28, 11,208, 16,235,191,186, 37, 95, 93,249,219,221, 76,110,167,  2, 90,183,
+ 22,128, 33,  2,180,105, 45, 64,143,238, 20, 55,110,  8,193,  8,  8, 68, 66, 33, 68, 66, 17,254, 56,235,143, 32,127, 17,  4,  2,
+  1,134,135, 91,224,235,235,  3,171,149,  2,212,226,149,242,111,214,174, 51,110,149, 83,232, 47,107, 32, 36,  2, 92,190,145, 75,
+ 46,115, 84,254,246,129, 77,118,253,250,117,245,245,235,215, 93,253, 94, 13,199,114,140, 41, 42, 42, 58,192, 42,121,  0,152, 56,
+113, 34, 54,108,216,224,120,166,180,180, 20,133,133,133,216,181,107, 23,187, 92,240,190,119, 94,251,192,165, 78, 75, 75, 83,179,
+193, 98,246,107, 30, 43,133,228, 35,169, 26,153, 52, 12, 52,191, 20,134, 10, 19,116, 62,149,160,208,161,178,210,140,210,210, 42,
+ 20,222, 49,224,198,205,114, 60, 41,235,  2, 32,185, 94, 89, 21,198,214,200,185,114, 27, 33,221, 30, 65,183,110,157, 80, 84,116,
+  7,129, 45, 45,232,209, 35,  0,109,219,132, 64,226,235,139,226,226,114,156, 60,117,  9,121,249,165,104,223,169,207, 67, 59,128,
+196, 43,149,148, 16,200, 88, 93,234,172, 84,235, 91,183, 31,175, 84, 74,227,215,173,227,228,  5, 88,187,118,173,186, 38,  1, 88,
+189,122, 53,214,175, 95, 47,115, 39, 47, 62, 62,158,198,196,196, 16,133, 34,208,169, 76,212,149, 98,166,  0, 48,105,210, 36, 78,
+238,127,231, 41,133, 86,173, 18,224,237,180,  1,107,229,219,  9,  0,165,148, 98,248,240,225,178,228,228,228, 58,239,187, 83,216,
+236,220,122,114,242, 49, 53, 33,  4,132, 16, 12, 24,208, 95,182,110,221, 58, 77,237,103,239,146, 12,119,242,152,201, 58,176,242,
+228,163,186, 86,227, 71,147,215, 92,112,200,227,  2, 62,  6,224,225,129, 91,  2,240, 32, 90,252, 44,166, 78,157,218,160,239, 51,
+ 12,  3,129,192,246,233, 29,202, 96, 96, 63, 11,124,196, 18, 27,  1, 16,137, 48, 44, 28,240,241,  1, 68,  2, 31,180,110, 45,129,
+ 64,160,135,197, 98,133,213,234,185,219,222,160, 45,128,164, 83, 47, 92, 73,252, 47,218,  8, 25, 28,205,189,230,241,128,178, 96,
+193,  2,205,186,117,235,100, 13, 89,  6,200, 46,235,123,227,141, 55, 28,215, 88, 75,191,180,180, 20,  6,131,  1, 51,103,206,  4,
+  0,124,253,245,215,  0,160,110,138,182, 77, 73, 73,209,216,173,125, 53,  0, 12, 25, 50,164, 65,  1, 92,157,186,244, 68,250,241,
+125,104,219,218, 15,126,126,182,110, 95, 85,101, 65,105,153, 17, 90, 93,  5, 58,119,235,131, 31, 55,110,114,219, 38,191,254,186,
+159,188,248,252, 80,122, 60,237, 60,158, 28,222, 31, 93,186,116,129,201, 88,137,129,  3, 30,135,127, 64,  0,174,229,228, 34,255,
+ 70, 49,146, 83, 46, 66, 87, 22,128,189, 27, 54, 61,180, 62,211,217, 49, 10,123,251, 19,204, 86, 40, 28,203,194,173, 53,148, 62,
+195, 16,128, 58, 84,  6,157,173, 80,160,191, 11, 11,150, 16, 80, 56,209,242,152,152, 24,212,244,  2,204,159, 63, 31,132, 16,196,
+196, 40,212,118,125,142,217, 49, 10,244,239, 95, 91, 94, 76, 76,140,195, 29,239, 78,201,113, 85,254, 53, 49,105,210, 36,140, 30,
+ 61, 90,230, 45,  9,118,158,171, 15, 15, 15,151, 37, 39, 39,107,234,186,207, 37, 72,209,190,170,128,178,228, 43, 34, 34, 66,166,
+ 80,196,104,106,146, 14, 39,249,240, 68,222,214,133,205,108,167,146,118,119, 61, 29, 11,115, 29,132, 96,223,153,250,199, 62, 87,
+121,  0,248, 24,128,135,148,  0, 12, 27, 62,228,158,204,249, 52,150,229,239,220,145,188,129, 86, 71,208,161, 29,  3, 66, 24, 16,
+134,193,254,131,182,249,125, 31, 31,  9,124,196, 62,152,248, 52,129,196, 71, 12, 95,  9,129,182, 72,128,180,147,205, 97,177, 90,
+208,185,147,103,243,186,114,185,156,222,200,187,  2, 93,250, 30,244,232, 44,194,185,124,239,231,133,103,207,158,173, 65,  3,131,
+242,228,114,185,236,203, 47,191, 84,179,110,254,162,162,162, 41,225,225,225,229,  7, 14, 28,216,253,220,115,207,141, 45, 42, 42,
+ 34,211,167, 79,223,103,207, 23,208,100,157, 51, 53, 53, 85, 19, 30, 30, 46, 99,143, 27, 34,235,199,141,155,200,244, 87, 95,166,
+153,151, 46,224, 70,206, 53, 48, 12,129,197, 66, 33,241, 13, 66,104,239,190,216,251, 91, 34,231, 58,189,113,219, 42,211, 22,221,
+ 80, 87, 86,154,209,175,111,  8,130, 59,182, 70,238,245, 91,208,157,205, 70, 70,102, 46, 14, 30,250,  3,215,242, 41, 78,164,159,
+243,170,157, 30,148,228, 63,214, 45,129, 94, 63, 55,240, 83,142,242,178,255,131,181,107,215, 58,  8,192,218,181,107,129,156, 13,
+181,158,117, 37,143, 43, 40,165,164, 33,253, 56, 38, 38,166, 65,125,207, 73,201,107,188,185,239,202,171,224,252, 93, 87,242, 60,
+106,231,107,219,144,176,246, 21,219,216, 48,234,145,106,202, 31,  0,228,227,159,176, 29,232, 78,187, 37,  0,124, 30,128,  7,  7,
+235, 87, 45,174, 53, 13,224, 17,  1,120,192,  3, 62, 26, 92,184,244, 83, 62,144,136,197,152, 56,158,128, 33,  4, 67,  6,155,113,
+246,156, 47, 24, 98,155,243, 47, 46,102,208,177,189,  0, 12, 17,227,204, 89, 49, 36, 62,128,209,100,196,181, 92, 95,143,148,127,
+118,230,239,  8, 31,253, 12,132,173,195,145,157,153,  6, 97, 65,  2,  2, 90,  4,209,146, 82,109,147, 84,176, 74,165,210,200,229,
+114,217,224,193,131,213,177,177,177,232,219,183,111,161, 78,167,195,224,193,131,101, 58,157, 14,243,230,205, 83,219,149,191,166,
+169, 27,185,161,138,191, 38,  9,  0,128,136, 17, 67,164, 29,218,119, 80,251,251,251,227,199,141,155,200,185,243,217,158, 13,232,
+201,105, 26,  0,196,130,214,244, 66, 70, 42, 58,180,107,  6,137, 68,132,242,114, 35,242,111,150,130,  8, 59,227, 68,122, 50, 31,
+ 45,197,  5,167,222,  4,186,255, 31,170, 45, 47, 60,185,168, 73,139, 20, 19, 19,228,148,182,182,113, 20,154, 59,165,236,137,210,
+110,104, 62,  3, 87,227,188, 60,194,199,246, 91, 43,110,218, 62, 60, 30, 90, 12, 24, 48,192, 17,240,183,126,213,226, 90,247,220,
+ 18,128,198,206,199,127,191,243,251,123,198, 34,  8,116, 58,  2,191,246,  4,173,130,  8,  6, 15, 50, 65, 34, 22,192, 71,108, 66,
+171, 32,137,125, 16, 32, 24, 58,216,130,180, 83, 34,155,183,128, 35, 49,146,203,229,180, 79,207, 22,120,115,254, 71,168, 16,119,
+194,207,137,249,232, 30, 58,  4,  0,208,236,196, 46,100,230,130,150,151, 53, 29,  9,  0, 64,114,114,114,164,171, 86,173, 82, 59,
+123,  7,  0,144,166,180,252,239, 53,236,201,126, 26, 92,239,135,143,156, 34,211, 95,125,153,222, 46,186,141,138,  2,  3, 36,146,
+ 86,232,212,237,113, 78, 83,  9, 15, 59,108,233,176, 27,233,103,230,108,128, 99, 69, 64,206,198, 38,255,109,238,130,251,254,108,
+ 24,251,204,148, 70,181,220,249, 24,128,  7,139,  4,212,165,252,221,122,  0,254, 10,160,176, 69,245, 19,134,130,130, 34,168, 37,
+ 69,210, 81, 33, 36, 98, 17,124,196, 66, 60, 59,158,130, 82, 43,  2, 91,153, 97,182, 16, 88,173, 22,251,224,231, 30,143,119, 45,
+199,132, 23,229, 40, 23,246, 64,219,102,254,120,249,133, 32,108,218,126,214, 65,  2, 76,150,159,113,246, 82,211,174, 19,103,137,
+128,211, 57,255,246,120,225, 85,248, 51,130, 76,214, 17,186, 53,176,182,102, 80,  5,121, 37,111,189,110, 37,162,  3, 23,215,190,
+113,114, 81,147, 91,253,127,101, 28,248,195,212,152,125,152,216,  8, 34,117, 34,139,252,180, 64, 83,145,  0,183,141,229,237, 62,
+194, 60,120,240,224,193,131,  7,143,135, 23,124,162,103, 30, 60,120,240,224,193,131, 39,  0, 60,120,240,224,193,131,  7, 15,158,
+  0,240,224,193,131,  7, 15, 30, 60,120,  2,192,131,  7, 15, 30, 60,120,240,248,115,160,218, 42,128,211,167, 79,123, 29, 13,234,
+ 42,152,176,177,229, 77,155, 25,227,246,123,122,109,129,227,216, 63,168,189,227,248,167,239,227,107, 61,219, 70,246,154, 91,121,
+  7,214,220,205,152, 55,102,225,151,142,227,219,234,111,225, 77,249,234,130,183,229,171, 11,174,202,247,252,116,133,219,239,165,
+171,119,163,107,215,174,184,122,245, 42,  6,203, 38, 56,174,255,242,163,242,158,215,159,187,254, 18, 23, 28, 44,125, 51, 63,223,
+ 57, 51, 33,185,159,253,175,166,188,  9, 19, 38, 72,247,236,217, 83, 45, 83,226,248,241,227,101,187,119,239,214, 52,197,251,241,
+ 32,203,107,136,172, 63,115,253, 69, 70, 70,190,212,175, 95,191, 77,103,207,158,125, 49, 41, 41,233,231, 70, 40, 31,125, 80,222,
+ 15, 94, 94,211,202,243,152,  0,212,196, 87, 95,125, 37,173,172,172,  4, 17,136, 64,  8,129,197,108,130, 88, 36,196,188,121,243,
+ 52, 13,101, 30, 95,125,245,149, 20,  0,230,206,157,219, 32, 89,122,109,  1,252,131,218, 59, 20,127,251,206, 93,  1,  0,  5,215,
+175,122, 37,239,192,154, 55, 48,102,225,151, 14,197,245,213,142, 52,  0,192,220,103,135,252, 41, 25, 96,186,122, 55,  6,203, 38,
+ 32, 93,189,219,166,212, 38, 77,  3,  0, 92,189,218,244,245, 23, 10, 72, 51,  1,117, 40, 32,203,  4,212,111,230,231, 35, 45,246,
+ 29,  0,192,144, 85,255,108,210,122,123,233,165,151,232,230,205,155, 81, 89, 89, 89,237,186, 68, 34, 81,191,244,210, 75,248,223,
+255,254,247,160, 46, 15, 28,209,179, 91,240, 70,106,177, 24, 50,115, 11,150,  0,216,197,219, 65,117,227,243,207, 63, 31,245,251,
+239,191,183,184,113,227, 70,251,160,160,160,255,207,222,151,199, 55, 81,117,239, 63,147,164, 89,186,175,148,125, 43, 84, 86, 41,
+ 20, 17, 89, 19,161, 32, 22, 80,150,162,165,250,138,  8, 13,168, 40, 32,138,246,245,251,115, 71, 80,164, 40,107, 64,  4, 94, 41,
+ 91,225, 69, 89, 10,133, 66, 74,217,180, 82,160,236,150, 82, 74, 23,150,238,107,246,204,253,253,209, 76, 76, 67,218, 76,210,176,
+190,243,124, 62,243, 73,102,201,201,204,157,123,239,115,206,185,231,158,235, 27, 30, 30, 94, 56,111,222,188, 95,157,149, 55,116,
+232,208, 97,147, 39, 79, 62,186,121,243,230,105,  0,124, 94,125,115,198, 84,  0,244,133, 11, 23,254,165, 80, 40,126,147,203,229,
+180,131, 34,153,228,202,196,  5,253,149, 53,137,184,170, 14,147,251, 32,147,131,171, 61,  0,150,248,126,241, 15, 82,159, 54, 61,
+149, 67,123,118,129,187,200, 13,132, 16, 24,141,  4, 23,175,221,196, 15,241, 63,202, 36, 34, 55,188,253,246,219, 78,145,119,194,
+198, 79,164,221, 59,167, 41, 47,102,117,148, 57,123,227, 12,225, 75,124,  2, 80, 91,118,199, 76,252,141,121,  4,216, 88,170,253,
+ 98, 62,198,161,248,119,205, 13,169,161,235, 26,155, 99,105,253,159, 66,161,176,174, 21, 16,  2,154,174,107,223, 70,163,209,124,
+255, 60,190, 27,107, 43, 26,  0, 90, 52,171, 75,213,169,171,170,128,214, 96,  0,  0,212, 24,234,228,117, 24,241, 22, 58,117,239,
+205,138,248,  1,160,215,128, 97, 56,173,220,103, 38,254,134,174,123,144,229,199,116, 26, 89,  0, 70,122,120, 32,185,182, 86,201,
+ 16, 63,  0,252,125,240, 80, 99,157, 86,163,248,110,211, 55,210,140,146,191, 80,152,151,137,206,237,250, 99,253,251, 91, 28,174,
+195,145,145,145, 47,109,219,182,141, 33,127,  3,  0, 13,  0,119,  0,180, 70,163, 17, 72, 36, 18, 68, 70, 70, 74,109,121,  2, 30,
+ 50,130,159,  9,235,185, 63,121,203,106,207,218,194, 43, 24, 20, 53,115,243,205,114,253,191,  0,252,246,168,117, 76, 81, 81, 81,
+196,217,  5,120,172,136,209, 41, 44, 95,190, 92,154,158,158,174,220,184,241,159,196, 68, 37, 37, 37,200,202,202,194,232,209,163,
+255, 35,149, 74,101,243,230,205, 99,245,126, 21, 10,  5,111,243,230,205, 95,  0,120,110,208,200,151, 37,155, 55,111, 14,126,245,
+205, 25, 94,  0,140,  0, 90,152, 46,123, 10,  0,111,232,208,161, 67,128,123,151, 58,111,136, 84,251,197,124,140,244,132,133,164,
+161,246,230, 64,251, 32,105,167,210,193,231, 11, 96, 52, 26, 80, 89, 93,131,201, 19, 94, 34,213,213,213, 77, 37,108,226,202,247,
+194,193, 62,108, 45,251,107,225, 41,176,175,  0, 44, 89,186, 76, 42,125,113,162,178, 77, 51, 31,184,139,  5,160,105, 26, 70, 26,
+ 16,240, 41,248,251,116, 65,247,206,109,149, 41,201,251,100, 43, 87,174,148, 58,170,  4, 44, 91,182, 76,218, 53,228,132,178, 87,
+151, 27,224,243,140,202,101,203,151,203,102,189,251,174, 67, 50,106,203,238, 64,226, 19,  0, 31,111, 47,  0, 48,127,218,186,174,
+121,155,246,118,189,  1,135,226,223, 69,191,152,143,241,198, 43,227,  1,192,252,105,235,186, 21,187,211, 29,210,174,249,124, 62,
+ 90,183,110, 13, 62,159, 15,157, 78,135,218,218, 90, 24,141, 70,148,151,151, 59,245,114, 61,  5,124,252,178,116, 23, 68, 62,192,
+221, 92,224,175,154, 66, 20,223,201,198,175,241,159, 56,100,245,247, 26, 48, 12,173, 91,214, 13,145,180,182, 65,254,237,219,183,
+ 55, 15,  7,  0, 64, 65, 65,129, 75,202,143,101,114, 85, 50,210,195,  3, 95,189,251, 14,  0,224, 43, 11,226,223,148,149, 85,191,
+ 51,113, 32, 91,235,228, 79,  6, 75,203,251,165, 40, 63,110,251, 26,180,244,112,136,104,130,136,151,140, 88,255,253,118,217,161,
+ 21, 96,219,153, 11,102,204,152,241,155, 90,173,198,134, 13, 27, 52, 83,166, 76, 17,  3,240,  4, 64,111,216,176, 65, 55,101,202,
+ 20,129, 90,173,134, 88, 44, 86, 54,181,163, 27, 57,114,164,244,224,193,131, 74,211,130, 45, 77,134,167,144,247,255,150,125,245,
+145,196,247,242, 22, 72,254, 62,130,207,159,247,243,122,111, 79,241,151,213, 58,242, 72, 41,  0,204, 18,188,229,229, 17,196,223,
+ 63,197,225,103,127,246,217,103,165,127,254,249,167,211,100,179,100,201, 18,233,142, 29, 59,148,213,213,213, 54,207,223,190,125,
+ 27, 59,118,236, 80,190,249,230,155,178,245,235,215,167,218,169, 47,212,230,205,155,127, 29, 52,242,229, 73, 89,103, 79, 10, 90,
+183,108,110,120,245,205, 25,245,250,221, 35,251,254,139,158, 61,123,118,217,188,121,243,168,158, 61,123,238,  6,128,227,199,143,
+ 55,218, 62,216,180,183,186,246, 65,  1,118, 18,241,244,238,221,155,236, 79, 62,132,179, 23, 47,155,143,105, 52, 90,124,183,108,
+ 77,205,204, 41,209, 28, 97, 63,193,184, 39,  8,112,241,226,197,210, 65, 35,198, 41,187,180, 13,128,200,141,  7,154,166,113,231,
+206, 29, 92,200, 60, 11,157,129,  6, 77, 19,  4,248,184, 99,196,168,209, 74,181,214,224,240, 31,138,220,138, 16,210,246, 14,192,
+167,208,173,115, 62, 68,130,187, 14, 91,254,150,228,111,141,202,170,106,220,201,207,133,196, 39,160, 65,175, 64, 99,228,101,141,
+141,219,254,139,119,198,246, 67,191,152,143,209,136,150,125, 15,132, 66, 33,248,124, 62,188,189,189,145,147,147,131,242,242,242,
+ 58, 69,202, 73,242,111,209, 44, 24,158,  2, 62,198,205,250, 26,163, 38, 15,192,222,139,133,184,163, 70,147,201,223, 26,  5,183,
+238,224,210,233, 19,  8,242,243,174, 35,127,  1,223, 37,229,247,194,132, 55,  0,  0,126,  2, 55,135,200, 31,  0,254,111,249, 10,
+252,223,242, 21,102,242, 79,174,173,197,135, 35, 70,215,157, 12, 18,178,122,238,  1,113, 29,164,211, 63,120, 78,249,102,187,183,
+225,198,243,132,  7,220,193,  3, 31,173,130,  7,226,221,175,230, 42,231,239,233,194, 74,141, 72, 77, 77,213,  3,192,198,141, 27,
+ 85,  0,196,204, 50,202, 27, 54,108,160,  1,184, 91, 46,171, 28, 29, 29,237,212,184, 92,124,124,188,212,145,227, 44, 48,168,111,
+239, 94,170,196,255,238,146,247,238, 17,202,175,189,124, 24,185, 69,213,184, 93,161,  2, 77,136, 83,129,192,132, 16, 82, 86, 54,
+156, 12, 25, 50,196,165,137,196, 44,200, 31,254,254, 41, 78,201, 72, 79, 79, 87,  2,160, 40,138,194,179,207, 62,235,112,153,165,
+164,164,220, 67,254,167, 79,159,198,228,201,147,205,251,122,189, 30, 87,175, 94, 85,198,199,199, 55,234,197,220,188,121,243,187,
+131, 70,190, 60,250,155,184, 57,130,196,196, 68,252,188,108,177,192,228, 49, 50,147,127, 98, 98, 34,150, 47, 95,142,158, 61,123,
+238,182,215,222,172,201,191,161,246, 54,106,160,201, 11,232,229, 97, 87,222, 15,203, 86,153,201,191,168,164, 20, 69, 37,165,168,
+172,174,129,155,155,192,115,213,134, 45, 26,184,106, 65,  4, 14, 15, 20, 97, 97, 97,247,108,141, 42,  0, 43, 87,174, 36,  1,237,
+159, 70,251,230,190,208,232,141,160, 40, 32, 57,249,  0,254,179,113,  3,206,103,102,226,195,185,179,193,231,243, 64, 27,105,120,
+187,139,208,254,233, 65,202,165, 75,151,178,110, 96,203,151, 47,151,118,239,124, 83,233,237,169,194, 47, 27,139,192,163,  8,250,
+245,252, 91,185,124,249,114,135, 26,169, 45,242,103,136, 95, 93, 89, 90, 79, 65,168,172,170,182, 43,207, 86, 99, 98, 26, 82,122,
+194,194,122,  4,183,113,219,127, 89,221, 99, 72, 72,  8,  2,  2,  2, 80, 85, 85,  5,161, 80,  8, 30,143,  7,181, 90,141,242,242,
+114,240,249,117,141,220,145,197,150,118,254,182, 11,179,151, 30,196,174,101,159,162, 69,179, 96,184,123,248, 35,223, 88,136, 95,
+227, 63,129,167,169,211,224,179,148,103,139,252, 25,226,175,188,117, 29, 93, 90, 55, 67,181, 74,  3,145,187,  8, 48, 26,237,198,
+  3,216, 43,191, 79,214,238,197,165, 51,167,208,163, 99, 55, 84, 26,237, 43,141, 12,249,255,125,240, 16,254,111,249, 10,243,241,
+228,218, 90, 36,215,214, 34, 71,254,  5, 14, 94, 62,143,238,253, 58,  2,165,246,151,102, 30, 58,175,163,116,230,123,195,148, 65,
+ 30, 93,161, 38,213,128,182,  8, 66,109, 25,180,198,106,104,104, 53,104,161, 39, 90, 13,238,139,136,153,237,136, 61,107,142, 25,
+247,151,203,229,238,114,185, 28,168, 27,  2,128, 92, 46,135,105,223,100, 65,105,176,117,235, 86,135, 27,237,156, 57,115,164,115,
+231,206, 85,118,235,214,141, 80, 20,165,  4,128,215, 94,123,141,180,107,215,142,124,250,233,167, 78, 45,205,236, 37,226,109, 88,
+241,241,155,146,145,173,180,252,147, 87,239, 96,111, 46, 15, 31,239,191,171,253, 34,181,166,178, 86,143, 55,156,145, 89, 94, 30,
+113, 63, 45,127,248,251,167, 32, 38, 38,198,225, 33, 66, 75,194, 39,132, 80,204,114,210,108,241,198, 27,111, 72,239,222,101,103,
+148,232,116, 58, 92,184,112,225, 72, 99,245,  5,128,180,117,203,230,194,168,168, 40,  0, 64, 70, 70,  6,142,236,251,175,184,224,
+214, 29,154, 33,127,211,179,155,219,219,133, 11, 23,226,155,210,222,190,155, 50, 26, 23,175,231,163,121,199, 22, 64,173,138,245,
+179, 23,149,148, 66,175, 55,152, 20, 28,  3,244,122,  3,242,111,230,138,155,248, 90, 41, 59,251, 28, 30, 34,234,185,162,180, 90,
+ 45,122,119,233,162,116,151,184,129,166,  9,140, 52,112,226,216,113,124,241,213,215,160,  9,112, 45, 59, 27,231, 51,207,161, 71,
+143, 94,224,243, 41, 60,213,177, 53,114,206,176,247,  2,  8,  5, 69,  8,109,127, 11, 16, 80,200,191,173,  7,  4, 20,158,238,114,
+ 19,233, 23,138,156,126,  0, 75,247,190, 45,207,128,186,178,180,222,108,  0,123,176,116,239,219,210,180,211, 19, 22, 34, 98,206,
+114,155, 81,236,150, 48, 24, 12,112,119,119,  7,143,199,131,159,159, 31, 84, 42, 21,106,107,235,150,  1, 14, 10, 10, 66,105,105,
+169, 67, 57,178, 53,229, 64, 63,137,  4, 31, 46, 59,134,136, 94,192,205,179,192, 95,166,115, 31, 46, 59,134,159,230,200, 96,164,
+141, 14,151,223,165,211, 39,204,223,135,133,119,129,192,139,135,228,212,203,232,221,165, 13,188, 61, 69,216,184, 35,  5,125,101,
+145, 40,176, 49, 11,192, 94,249,237,190, 76,128,219,192,216, 97, 20,214,238,205, 65,128, 95,  7,140, 31, 72,177, 42, 63,198,221,
+159, 92,251,207,210,201,228,243,120,160, 85, 37,168,233,159,129,124,241, 21,192, 83,131, 74, 95,192,116, 42, 13, 22,102,200,  4,
+ 79,101, 59,223,112, 84, 25,107,160, 45,207,198,175,121,155,113,124,108, 57,186, 77,147, 97,196, 44, 79, 72,252,158,130, 88,224,
+  7,193,216, 74, 76, 51, 76, 35, 63,175,253,217,102, 39, 37,151,203,  9,163,180,241,120, 60, 16, 66,116, 38, 37, 90,195,227,241,
+ 84,132, 16,127,  0, 52,154, 48,189, 54, 62, 62, 62,117,228,200,145,178,210,210, 82,101,114,114,114,157,226,147,156,140,174, 93,
+187,162, 75,151, 46, 50,230,152, 35,168,214,210,239, 77,253,191,159,246,124, 31,217,156, 71, 52,149,152,158,144,165, 55,232,245,
+203,181, 70, 44,  0,224,212, 98, 20, 47,191,172,187,239,228,159,144,144,144,234,140,245,111, 57,100, 66, 81, 20,250,245,235, 39,
+101,187,170,164,209,104,116, 72, 97,184,113,227,  6, 20, 10,  5,181,106,213, 42, 91,167,197,  0,186,  1, 16, 60, 31, 57,190, 34,
+ 39, 39,199, 55, 35, 35,  3,137,137,137,  8,207,201,225,101,100,100,  0,  0,194,195,195,241,194,208,190,240,246, 20, 97,249,250,
+ 93, 69,147, 39, 79,142, 91,181,106,213, 28, 71,219,219,237,223, 22,194,171,187, 24,158,157,103, 99,251,194,105,232,213,163, 57,
+158, 26,253,181,221,246, 81, 89, 85, 13,177, 88,  4,  0,112,115, 19, 64,165,210,184,154,103, 56,210,127,  8, 96,179, 24, 80,189,
+142,138,166,105,184,139,132,208, 25,  8,104,  2,240, 40,224,179, 47,191,134,145,  6,106,106,106,112,231,206,109,  4,  7, 55,  7,
+ 33, 52, 12,  6, 35,196,110,  2,240,221,216,185, 96, 87,172, 88, 33,237,220,190, 64, 25,232, 87, 85, 87, 29, 76, 27, 69, 17,244,
+233,126, 77,201,204, 10,112,  4,140,117,207,184,251,173,201,159,141,245,111,173, 69, 51,196,191, 98,119,250, 61,228,207,214,250,
+  7,234,  2,134, 68, 34, 17,124,124,124,204, 46, 67, 38,240,207,199,199,  7,205,155, 55,135,193,192, 94,121, 90,159,114, 20, 62,
+237,  1,105,104,221,126,150,161,206,253, 15,212, 29,251,244,107, 37, 42,116,142, 13,201, 20,220,170, 11, 86,108,219,204, 31, 94,
+ 62, 30, 16,120,243,161, 41, 81,  3, 60, 30, 90,180,107,141, 19,153,185, 78,149,223, 27, 31,124,131, 33,253,159,135,224, 14, 80,
+ 19, 12,184,243,120,232,223,190,  3,228, 99,131, 89,201,177, 30,235,223,244,202, 52,140,123,121, 48,208, 73,  3,156, 23,  0,158,
+  2, 96, 76, 56, 90,175, 94,203,206, 27,211,202, 31, 58, 93, 25, 40,109, 41,126,205,219,140, 83, 83,124, 48,100,220, 20, 12,106,
+246,130,236,226, 65,  3, 12,116, 45,220,116,181, 48,116,161, 81,124,151, 93,208,168, 73,121,211, 76,153, 50,133,  7,160,156,152,
+ 86,136, 50,237, 55,  9,201,201,201,169, 93,187,118,149,185,187,187, 35, 48, 48, 16,238,238,238, 72, 75, 75,163,146,147,147, 83,
+157, 16,215,124,244,232,209,107, 87,172,249,133,247, 89,106, 13,189,227,100, 54,180, 58,125,173,198,136,121,142,144,191,181,203,
+ 63, 45, 45,141, 98,182, 71,133,252,109,185,251, 29,245,  2,212,212,212,152,191,159, 62,125,218,188,  1,192,220,185,115,235,237,
+ 91, 92, 47,106, 64, 92, 75,  0,237, 77, 74,161,251, 11, 19, 94,211, 88,122,  2, 24,203,255,185,129,  3, 45,219,219, 94,185, 92,
+174,113,164,189,197,142, 25,130,167,195,187,192,171,151, 23, 10, 15,231,  1, 98, 17, 38,204,250, 23,250,189,254, 19,171,103, 54,
+ 24,140, 40,188,125,215,192, 88,254, 12,242,111,230, 54,245,213,146,  6, 54, 14,143,128, 66,  0, 91,150, 10, 49,117,110, 52,  1,
+140,116,157, 18, 64, 81,192,127,119,238,192,184,241, 19, 17, 24,212,204,220,  1, 18,  7,222, 37,159, 87,132,238,157,242,205,251,
+ 79,247,112, 55,235,134,125,186,229,128,207,115,220, 11, 96,237,238,183,117,222, 17,235,223,218,221,111,235,188,229, 92,246,198,
+ 80, 85, 85,133,234,234,106,104,181, 90,208, 52,141,226,226, 98,179,251, 95,165, 82,161,166,166,198,161, 33,128, 93,203, 62, 69,
+234, 69,160, 50, 23,208,171,129,159,230,203,204,238,255, 51,103,129,115,183, 79,128,239, 96,249, 85,222,186, 14,127, 31, 15,  4,
+248,123,224,169,208,174,200,185, 81,140,172,194, 82,180, 13,240,129,246,110, 17,178,175,101,215,203,  5,192,166,252,  6, 72, 95,
+194, 32, 89, 52,118,237,217, 14,101,218,118,108, 94,242,  1, 38,124,176,  0,231,245, 64,113,105, 17,171,242,179, 28,235,127,115,
+192,179,136,233,214, 14,219,119, 29,193,249,243,185, 88,114, 33,  3, 91, 35,254,  5,172, 59,137,194,194, 98, 86,214, 69,107,141,
+  8, 70, 93,  9,116,186,186,200,234,224, 86,109,208,165,107, 87, 89,149,164, 46, 22, 67, 77,171,192,211,214, 66, 82,203,199,221,
+219,141, 43,  0,204, 59,211,104, 52,208,104, 52, 98,  0, 58,  0, 94, 26,141,198,219,122, 74, 96, 19,188,  0,210,180,180, 52,101,
+215,174, 93,241,218,107,175,201, 74, 74, 74, 48,126,252,120, 71, 58,206, 65, 66,161,176,198,211,211,211, 16, 17, 17,113,123,254,
+252,249, 45,227,226,226,114,254, 58,123,254,197,173,151,180, 87,245, 52, 28, 94,143,245,126,184,252, 93, 73,254,214,214, 63,163,
+176, 48,239,140,109, 44,128,155,219, 63, 49, 42, 75,150, 44, 49,111,182,246,  1,243, 12,159,134,222,141,208,180,241,  0,  8, 42,
+111, 93,183,233, 78,103,218,219,217, 51,103,111, 76,158, 60, 57,214,145,246, 54,248,153,167, 48,124, 96, 40,190,249,114, 49,126,
+ 88,154,132,255,183,233,  8,102, 60,223, 23,119,126, 79, 66,101,121, 21,155,246, 65, 69,141,125,  1,122,189,225,172, 94,111, 48,
+ 88, 42,  0,  0,176,224,179, 79,154, 98,193,115,150,255, 67,132,173,177,127,107, 37,160,158,  2,192,227,241, 80, 89,163,  2,159,
+ 71,193, 96, 48,130, 38,  4,  6,186, 46,136, 52,243,220, 89, 60, 63,108,100,157,155,140, 16,240,121,124, 84,171,116, 48,232,180,
+246,173,255,149, 43,165, 29, 90,221, 86,  6,249, 87,154,181,140,  1,253, 60, 77, 49,186, 20, 40,138,160,119,215,108,229,138,149,
+ 43, 89,123,  1, 24,235,190,177, 96, 64,167,172,215, 70,130,107, 28,129,159,159, 31,138,139,139, 33, 18,137, 80, 93, 93,141,160,
+160, 32,115, 80,160, 70,163, 65, 69, 69,133, 67, 10, 64,236, 55, 91,241,211,124, 25,124,218,  3,169, 23,129,247, 22, 41,225, 41,
+224, 99,252,251,223,162,128,190,131,132, 37, 31,129,207, 99, 47,143,177,254,195,195, 67, 17,212,177, 61,154,  5,  5, 66,200,163,
+ 96,160,  8,138,107,213, 40,175,214, 56, 85,126, 63, 44,252, 13, 47,119,237,  0,111,239,  0,184,  7,181,132,190,172, 28,103,247,
+110, 65, 69, 89,158, 83,149,248,151,133,239,  2,115,134, 67, 96,208,161,125, 45, 80,196,175,194, 79,183,255,  2,132,222,172,101,
+156,217,243,135,172,132,167, 70,158, 80,133,190,157,100,232,246, 47, 79,228,248,165, 42,131,130,206, 42,219,244,207, 65, 37,175,
+ 26, 90,162,134,106, 19, 13,177,167, 23, 27,203,223,178,131,103,102,  1,  8, 93,213,112, 15, 28, 56,  0,  0,136,137,137,145,197,
+199,199,167,142, 27, 55,206,108, 49,178, 33,255,160,160,160,253,107,215,174,245, 80, 40, 20,252, 57,115,230, 96,246,236,217,228,
+228,201,147,253,  1, 36,171, 13,232, 10,224, 79, 71,239, 73, 46,247,107,208,237,239,108, 64,160, 43,201,223,154,224, 45, 21, 22,
+ 66,  8,101, 10, 12,180,223, 46, 10, 10, 78, 50,223, 55,111,222,108,222,172,143, 49,240,247,247,135, 92, 46,111,168, 19, 44,  0,
+ 80,  1,128, 87,112,235, 14, 78,157, 58,101, 30,243, 15, 15, 15,  7, 80,183,252,246,182,221, 73, 40,175,214,168,  0, 44,144,203,
+229, 70, 71,218,219,239,187, 62,199,200,249,179,240,226,139,195, 16, 40,226,163,154, 34, 72,206,202,199,169,139,133, 14, 17,245,
+204, 41,209,207,228,100,103, 11,242,111,230,130,217, 76,228, 15,206,106,127, 60,137,223,250,152, 45,212,139,  1, 16,137, 68,184,
+118,249,188,172,125, 75,127,165,196, 77,  0,163,145,  6, 69, 81,160, 40, 32, 86,254, 14,  8,161, 97, 52,229,  3, 80,105, 52,184,
+146,149,  3,161,208,110, 84, 55, 12,250, 50,244,238,118,195,178,199,192,219,115,110, 96,231,166,206,230,170,213,183,199,117,252,
+145,217,213, 97,235,223, 22,241,171, 43,158,218, 92,106,  0,  0, 32,  0, 73, 68, 65, 84, 75,  1,192, 41,235,223, 86, 67, 75, 79,
+ 88,  8,  0,172,173,127,160,110,158,127,243,230,205,161,213,106,113,247,238, 93, 24,141, 70,  4,  6,  6,162,180,180, 20,129,129,
+129,166,114,101, 79,216,197,119,178,241,233,215, 74, 84,230,  2,223,127, 48, 24, 53,  6, 35,230, 46, 74,196,143,243,163,240,193,
+146,189, 16, 80, 20, 28,224,127, 84,222,186,142, 22,129,190,112,131, 27,140,160,112,251,198, 37,220, 44,170, 68, 72,144, 63,126,
+ 63,115, 18, 87, 46,195, 97,235,127,194,212,185,112,243,  7,120,124, 96, 67,210, 13,236, 92,249, 33,166, 46, 84, 96,238,152, 94,
+120,103, 88, 59,135,202, 47,185,182, 22, 63,140,157,  4, 84,136,  1,202, 13,248, 97, 49, 38,254,117, 12,  7,135,205,  4,245,237,
+ 44, 80,127,124,196,218,194, 56,119, 59,  0,207,170, 43, 81, 35,225, 67, 37, 22, 35,100,130, 27,180, 68,141, 74,158, 27, 12,  8,
+  5, 49,170,160, 47,185,141, 19,203, 42, 17, 51, 57,  4,169, 74,229,  3,111,180,177,177,177,  4,  0,214,172, 89,195,184,250,169,
+ 57,115,234,134,129, 55,109,218,196,246,205, 14,108,217,178,229,129,111,191,253,214,227,218,181,107,112,115,115,131,183,183, 55,
+206,159, 63,175,  7, 80,220,148,251,107,108, 78,190, 51,222,  1, 87,146,191,181,245, 95, 71,204,247, 78, 31, 52, 77, 15, 76,181,
+115, 95,215,182,109,219, 54,128,237,240,156, 88, 44,158,218,176,210, 36,175, 30, 58,116,232, 13,  0,225, 89,103, 79,194,114,204,
+255,237,169,147,112,160, 99, 71, 36, 38, 38, 34, 35, 35,  3,251, 59,118,116,159, 60,121,242,250,163, 71,143,178,110,111,175, 12,
+127, 22, 62,180, 31, 84,112,195,206,248, 89, 88,185,247, 28, 62,124, 97, 16,166, 44,217,140,137, 11,126,117,212,  2,167, 22,124,
+246,137,173, 68, 64,196, 66,  9,224, 44,250, 39, 12,245, 60,  0,111,191,253, 54, 85,113, 59, 27,215,243, 75, 33,112,227,195, 96,
+164,161, 55, 24,113,230, 76,  6,254,243,159,245,208, 25,  9,244, 70, 26, 66,  1, 15, 69,229, 53, 40,188,114, 74, 54,123,246,236,
+ 70, 27,212,202,149, 43,165, 93, 67,110,254, 99,253,155,234,213,206, 77,161,117,245,137, 71,  0, 30,  1,143, 71,163,127,175, 43,
+202,149, 44,188,  0,182,172,127,203, 89,  0, 30,254,205, 29, 34,127, 91,214,191,101, 84,109,196,156,229, 14,145, 87, 93,167, 88,
+142,154,154, 26,184,185,185,153,173,127,154,166,205,159,142, 42,  0,191,198,127,130, 51,133, 71,225,217,188, 46,232,207, 75,192,
+ 71,241,157,108,120,139,220, 80, 81, 86,  0, 62,143,130,128,199,110,248,153,177,254,219,248,123,225,114,206, 13, 24,116, 58,136,
+  4, 66,212,212,104,240,187,242, 36,250,202, 34, 29, 34,127,166,252, 94,122,247, 43, 36,252,244, 35, 84, 52,208, 38,164, 53, 46,
+ 94,250,  3,115,199,244,114,170,252,  0, 96,110, 72, 95,236,185,118,  4,168, 52,  0,226, 64, 28, 74,191, 12,234,219, 89, 76,199,
+196,186,240,142, 46,206, 73, 61,113, 40, 29,208, 85,163,134,170, 70, 57,175,  6,149,  2, 61,244,198, 42,136, 52, 42,136,111,221,
+192,214,184,107,104, 31, 22,138,134,  2,  0,173, 33,145, 72, 44, 73,  0, 98,177,216,230, 57,182, 88,187,118, 45,214,174, 93,219,
+164,198,236,229,229,245, 94,118,118,182,135,183,183, 55, 36, 18,  9,252,253,253, 81, 92, 92, 12,138,162, 84,174,236, 52, 24,139,
+ 63, 42, 42,138,  0,117,  1,129,142,  4,  5,186,154,252,159,125,246, 89,169,189,128, 90,182,177,  0, 30, 30, 30,177,  2,129,224,
+186,245,241, 37, 75,150,212,179,252,  1,160, 93,187,118, 24, 62,124,248,  6,123,246, 79,193,173, 59,245,162,253, 63,253,191, 57,
+ 16,  9,132,  8, 14, 14,  6, 19, 19, 96, 58,239,225, 72,123,155, 38,125, 26,179, 23,255,136,234,187, 69,  8,242,110,134, 75,151,
+243, 48,101,201,102,135,219,135, 21,225, 83, 86,191,183,148,195,121,  2, 30,  3,156, 59,119,174,209,100, 64, 13,122,  0,  0, 96,
+222,188,121,169,223, 47,166,100,132,140, 85,182,111, 25,  0, 47,119, 17,186,245,  8, 67,183,238,189, 32,224,  1, 53,106, 35,242,
+110,151, 33, 61,117,159,204,211,195,221,238, 31,212,170, 84,  8,109,119, 27, 26,173,216,148,181,165,174, 26, 73,196, 26, 16,  2,
+148, 85,136,  0, 10,240,242, 48,160,103,104, 46,142,157,182,159,197,206,210,250,183,180,248, 37, 62,  1,112, 35,122,192,240, 79,
+127,103, 20,216,191, 71, 75,235,223,210,226,103,142,101, 95, 58,107,190,150, 77,150, 61, 75, 37,  0,  0,154, 55,175, 83, 70,202,
+202,202,224,237,237,109,118,255, 59,162,  0, 48, 74,  0,240, 45,102, 70, 13,  5,126, 58,134,149,255,142,196,196, 15,126,196,230,
+133,239, 64, 64, 81, 16,138,216,205,216, 97,172,255,203,121, 69,232,212, 38, 16,235,126,222,138,246,237,219,195,167,101,  8,122,
+181, 12,129, 94,251,143,251,223,141,133, 76,198,250,255,122,234, 48,188,247,217,  6,180,233, 72, 53,169,252, 24,235,127,196,174,
+ 95,112, 48, 38, 26, 84,235,254,  0,234,178,  2,  2,192,141,218, 90,179,146,152,  5,118,  9,124, 86, 76,185, 78, 13,157, 71,164,
+ 33,227,171,149,237, 59,247, 64,149,  4,184,129,155,168,206, 45, 70,241,  2, 35,106,202, 91,227,234,137, 44,214, 47,132,166,105,
+ 74, 34,145, 16,181, 90, 13, 11,203,147, 72, 36, 18,208, 52, 77, 61,140,206,178,186,186,250,251,119,222,121,103,236,218,181,107,
+197, 62, 62, 62, 80, 42,149, 88,186,116,105,149, 78,167,123,193,149,255,195, 88,252,204,116, 57, 71,  3,  1, 19, 19, 19, 41, 83,
+146,159, 38,147, 63,  0, 88, 16,187,221, 50,183,151, 97, 80, 46,151,235, 20, 10, 69,255,237,219,183,159,175,173,173,109,161,215,
+215, 77, 51,181, 38,255,110,221,186,161,127,255,254,163,229,114,185,189,255, 20, 84,222,186,142,111, 62,255, 20,255,221,179, 31,
+ 35,  7,245,193,225,148, 63,234, 12,152,150, 33,240,105, 25,130,240,156, 28,188, 48,225,181,146,188, 82,213,  8,  0, 59,216, 90,
+255,179,215,236, 65,220, 91, 35,208,178,185,212,172, 92, 88,151, 67, 19,179, 41,114,158,128, 39, 72, 41, 96,165,  0,  0,192,135,
+243, 62, 72,253,254,123, 90,118,163,245, 83,232,216,185,171,210,219, 67,  2,154,  0,106,173, 14, 57, 57, 57, 40,206, 57, 39,243,
+242,244,192,204,153, 51,237, 54, 92,137, 88,140,237,  7,134,202,152,  8,248, 70,221, 17, 60, 30, 60, 60,216, 91, 79,204, 20, 64,
+ 15,255,230,160,141,250, 58,242, 55, 65, 79,185,217, 77,177,107, 13,102, 74, 77,196,156,229,245, 72,203, 25,242,183, 84,  2, 44,
+ 19,255,148,149,149,217,127,  1,118,148,128, 95, 45,102,  9,175, 93,240,246, 63, 59,250, 26,120,178,148,211,198,223, 11,219, 79,
+159,195,197,171,127,163,175, 44,178, 30,233, 59, 66,254, 12, 94,122,247, 43,236,236,227,129,119,199,117,113, 73,249,205, 13,233,
+139, 15,118,111,  7,245,205,103,216, 31,252, 44,150,214, 92,172,119,126,188,143, 47, 22, 86, 86, 56, 68, 28, 71, 23,231,164,250,
+  9, 34, 80, 80,126, 29,197,165,183,113, 55,203, 19,124,163, 55,  6, 62, 61, 24, 91, 79,108,125,168,157,154,139,178,253,157, 94,
+191,126,125,  4, 69, 81,135,126,252,241, 71,241,203, 47,191, 92,165, 82,169, 70,192,137, 49,255,198,224,138, 41,128,114,185,159,
+ 75,200,223,134,149,106, 79,249, 96,113,111,242, 18,133, 66, 17, 82, 93, 93,253, 77, 70, 70,198,156,194,194, 66,212,214,214, 66,
+ 40, 20,162, 69,139, 22,  8, 10, 10,122, 89,161, 80,252,254,235,175,172,150,  4,184,  2, 32,188,141,191, 23,158,123,238, 57,156,
+187, 86,136,192, 14,221,235,181,183, 23, 38,188,166,  2,176,236,155,184, 57, 59,216, 62,199, 52,233,211,136, 72,249, 19, 49,159,
+253,  7, 67,134, 12, 65,112,112,176, 77, 69,203,133,175,157,114,130,252, 73, 35,199, 57, 37,226, 33,144, 62,171, 84,192,  0,240,
+225,135, 31,166,174, 88,177, 66,122, 38, 53, 75,  6,212, 69,210, 18, 66, 32, 18,137,240,209,135,243, 88, 55,218,119, 29, 76,243,
+203, 22,140,171,159,111, 80,  1,  6,149, 57,  2,158, 33,126, 71,231, 98, 49,174,254,236, 75,103,145,125,233, 44,130,130,130, 80,
+ 92, 92,236, 20,241,251,  4,181,132,142, 69,112, 36, 91,196,124,245, 43, 78, 30,115, 93, 49,230,230,230,154, 87,251,211,107, 53,
+247,144,191, 35,196,207,224, 95,125, 60, 92, 86,126,  0, 64,197,127,100, 38,126,134,252,111,212,214,202,198,251,248, 34, 25, 72,
+ 93, 88, 89,225,212,179,255,182,240,144, 69,199,163,  6,  0,108,189,196, 62, 97, 15, 33,132, 18,137, 68,102, 47,  0,243, 29,  0,
+ 68, 34, 17,101,235,251,  3,198,241, 95,126,249,101,200,142, 29, 59,230, 86, 85, 85,197,  3, 72,119,245, 31,184, 98,234,159,139,
+201,201,229,144,203,229,106,  0,115, 77, 91,147,222,199,133, 11, 23,  6,  2,232, 16,216,161,187, 74,175,213,184,155,218, 91, 21,
+128, 74,  0, 87,218,  6,184,191, 34,151,203, 29,170,208, 17,159,174,125, 80,196,239,148,162,229,228,245, 28, 92,128,176,176, 48,
+ 86,228,111,215,  0,109,234, 74,125,247,  3,204,216, 62, 67,252,104, 34,241, 51, 99,211,149, 69,  5,168, 44, 42, 64, 80, 80, 80,
+147, 44,126,  0, 48, 24,105,135,189, 15,141,161,168,172,210,233,123,177,  6, 51,182,239, 42,226,191, 15,229, 71,  1,192, 72, 15,
+ 15, 98,105,245,247, 22,184, 53,137,248,255,199,240, 87, 85, 85, 85, 52, 87, 12, 15, 31, 71,143, 30, 85, 40, 20,138,255,228,149,
+170, 84,122,173,198,114, 60,210,187,109,128,187,159, 19,171,255, 81, 64,221, 80,198,227,166, 84,113,120,176, 74,  0,171,202,228,
+236, 58,194, 28, 56,112,224,192,129,  3,135,199, 23, 60,174,  8, 56,112,224,192,129,  3,  7, 78,  1,224,192,129,  3,  7, 14, 28,
+ 56,112, 10,  0,  7, 14, 28, 56,112,224,192,129, 83,  0, 56,112,224,192,129,  3,  7, 14, 79,  4,234,205,  2, 56,119,238,156,211,
+ 81,164,182,130,  9, 57,121,156, 60, 87,201, 51,173,173,206,  3, 64,219, 74,190,194,149, 95,195,242,194,194,194,152,178, 99,230,
+114,147,115,231,206,209, 92,249,113,242, 30, 39,121,225,225,225,130,140,140, 12,  3,  0,244,235,215,143,116,238,220, 25,  9,  9,
+  9, 20, 87,126,182,229, 57,172,  0, 60, 33,104, 82,146,137,168,168, 40, 41,  0,203,148,161,178,196,196,196, 84, 78, 87,124, 56,
+248,238,187,239, 94,191,112,225, 66,175, 83,167, 78,125, 32, 18,137,160, 82,169, 62, 82, 40, 20,139, 89,100, 96,227,240, 79,199,
+ 66,  0, 24,185,146,120,180, 17, 25, 25, 41,221,183,111, 95,170,147,191,149, 37, 37, 37, 29,113, 81, 66, 41, 68, 70, 70,190,146,
+148,148,180,117,245,234,213,254,  0,170,  1, 24, 31,118,155, 99,200, 63, 38, 38,134,108,218,180,  9,125,251,246,229, 42, 77, 19,
+241, 68, 13,  1,152,200,187, 73,191,223,190,125,187,117,190,112,101, 83,228, 70, 69, 69, 73, 77,115,118, 73, 84, 84, 20,113, 84,
+ 22,113, 16,182,230,  7, 55, 81,158,244, 97,188, 75,133, 66, 65,205,154, 53,107,241,165, 75,151,126,106,215,174,221,  7, 98,177,
+ 24, 90,173, 22,  0,190,219,185,115, 39, 61,110,220, 56,217, 67,106, 50,196,241,237, 65,202,107,112, 13,118,203,181,216,157, 90,
+159, 61, 42, 42, 74, 74,  8, 33,228,255,217,150,205,156,179, 87,  7,109, 33, 55, 55,151,228,230,230,186,140, 96,202,202,134,215,
+ 91,175,192,213, 68, 77, 81,148, 67,114,105,154, 16,163,145, 16,154,182,189, 69, 70, 70, 74,147,146,146,156, 90,133,106,205,154,
+ 53,207,239,223,191,255,200,208,161, 67, 65, 81, 20,217,178,101,203,112, 71,239,205,122,219,191,127,255,214, 87,  7,  8, 33,159,
+ 33, 47,187,238,153,179, 99,250,244, 88,154, 57,103, 79, 94,109,109, 45,169,173,173,109,180, 30, 50,215, 56,251,126,174,158,150,
+ 33,101, 77, 38,194,195,195, 57, 67,128,189, 33,112, 79,130, 32,129,157,  6,111, 51,111,182,189,124,218, 15, 17, 77, 90,198,109,
+251,246,237,202, 73,147, 38,  1,168, 75,170, 97, 81, 57,149,206,120, 21, 24,133,130,201,249,111, 74, 67,170,140,138,138,114,204,
+171,144,232,239,192,191,218,111,251,181, 99,222,102, 47,206,241,117,109, 26,106,144,172,203, 79,161, 80, 80,149,149,149,219,122,
+244,232, 49,  1,  0,143, 16,  2,137, 68,130,162,162, 34, 84, 84, 84,192,199,199,  7, 69, 69, 69, 71,198,141, 27, 39,219,181,107,
+ 87,170,131,239,132, 48,233, 96, 41,138,194,132,  9, 19, 48,124,248,112,217,140, 25, 51, 88,203,217,189,251, 55,243,247,177, 99,
+ 95,182,187,111, 15,234,147,239,254, 83,220,  3,150,215,219,183, 62, 38, 25, 96,127, 81, 37,102, 57, 97, 75,164,165,165, 97,193,
+130,  5,247,188,139,193,131,  7,147, 99,199,142,177,170,203,137,137,137, 74,124, 70, 49,251,247, 38,158,249,140,106,114,103,252,
+  8,247, 45,245, 44,109,133, 66, 33,139,141,141,197,144, 33, 67,200,241,227,199, 89,253,246,100,  3, 57, 25,119, 37,126,128,164,
+164, 36, 37,179, 72,216,144, 33, 67, 72, 85, 85, 85, 99,132, 47,141,141,141, 53,215,215,223,127,255,221,157,162, 40, 68, 71, 71,
+223,  5, 16, 60,121,242,228, 67, 10,133,130,231,136,197,190,248,208, 98,243,247, 59,201,183, 65, 81, 20, 54,191,239, 14,128,194,
+247,175,125,247, 82, 96, 96, 32,  0, 96,203,198,205,172,203, 42, 60, 60, 28, 29, 59,118,116, 73,185,135,135,135,243, 50, 50, 50,
+232,126,253,250,145, 77,155, 54,225,110, 86,123,160,196,143, 99,117,  7,200,223, 81, 15,  0, 73, 76, 76,188, 71,195,178,232, 64,
+137, 19,141,219,165,214,164,181,188,196,196, 68,203,  5, 49, 28,  6, 69, 81, 84, 98, 98, 34,197,116, 64,166, 79,167, 45, 77,134,
+252, 77,247, 68, 89,220,155,195,138, 10, 53,169,220,188,177, 57,110, 15,158,123, 87,153, 55, 54,199, 29, 33,127, 66,  8,152,213,
+217,  8,113,172,154, 40, 20, 10, 94,121,121,249,127,124,124,124, 38,  0,224, 77,157, 58, 21, 49, 49, 49, 16, 10,133,144, 72, 36,
+ 16,139,197,160, 40, 10,124, 62, 31,149,149,149,172,203, 49, 34, 34, 66, 10,128,236,216,177,  3,204, 59, 33,132, 96,231,206,157,
+152, 49, 99,134,210,116,254,145,131, 45,133,224, 97,120,214, 18, 19, 19,149,  0,168, 87,174, 78,194,164, 43, 54,219, 24,153,116,
+ 37, 74, 70,125,233, 84,187, 35, 31,126,248, 33, 58,116,232,224,146,251,165, 40,138,200,229,126,  8,  8, 56,236,210,114, 24, 53,
+106,212,176,148,148,148, 35,132, 16, 42, 54, 54, 54,213, 17,242,111,  8,187, 18, 63, 64,124,124, 60,104,154,198,  7, 31,124,192,
+ 74,161,176, 36,127,  0,216,191,127,255,158, 33, 67,134,  0,128, 95,116,116,180, 97,232,208,161,144,203,229,180, 41,110,134,141,
+151,177,222,254,210,165, 75,241,202,115,117,182,225,230,247, 37,120,117,128, 16, 31,141,252,144,245, 51,121,120,120, 96,200,144,
+ 33,200,200,200, 48,247,167,214, 27,115, 13, 91,101, 47, 35, 35,131,  6,234,150, 89,  7,  0,111,247, 18,142,213,155, 72,254,141,
+ 42,  0, 12, 89,101,100,100,152,211, 78, 90, 90, 79,142, 18,173, 69, 39,226,234, 78,201, 90, 25,112,169,107,216,198,144,128,195,
+176, 84, 40, 76,214,255,147, 88,207,136,101,103, 82, 88, 88,104, 62, 81, 80, 80,192, 90, 97,172,172,172,252, 86,165, 82,189,198,
+227,241,120,147, 39, 79, 70,101,101, 37,110,221,186,  5, 55, 55, 55,  8,  4,  2,  8,  4,  2,184,185,185, 65, 34,145, 64,173, 86,
+131,141, 11,113,245,234,213,210, 67,135, 14, 41, 41,138,194,196,137, 19, 65,  8, 97,148, 60,106,226,196,137,  0,128,148,148, 20,
+ 37,215, 85, 52, 78,254,166,247, 43,179, 84,146,153,119,111,233,213,114,198,130, 79, 76, 76,164, 76,239,  5,171, 87,175,118,137,
+ 50,246,201, 39,159, 48, 70, 65,147, 61, 19, 35, 71,142,140, 56,125,250,116, 74,251,246,237,209,169, 83, 39, 50,112,224, 64,179,
+231,196,180,250,163, 83,228,191,100,201, 18, 80, 20,  5, 30,143,135,211,167, 79,131,141, 55,198,202, 35,241, 18, 69, 81,120,245,
+213, 87, 13,166, 67,186,232,232,232, 42,169, 84,138, 25, 51,102,208, 47,190,248,162,221,103,183, 92,149,244, 78,242,109,128,  2,
+ 18,222,251, 39,107,241,230,247,221, 17, 61, 80,132,249, 47,124,196,250,190,216, 88,254,108,174,137,137,137, 33,225,225,225,230,
+237,244,233,211,168,201, 11,  7,116,106, 80,158,  6,164,124,125,  5,150,231,153,141,107,185,245,201, 63,118,254, 66,155,231,  5,
+141, 53,200,240,240,112,146,145,145,  1,198, 19,192, 16, 87,120,120,184, 67,141,252,126,147,191,165, 85,253,168,  7,236, 89, 14,
+  9, 60,113, 26,  0, 33, 40, 44, 44,196,157, 59,119,204,199,172,247,237, 88,255,252,  3,  7, 14,188, 24, 26, 26, 10, 62,159,143,
+236,236,108, 16, 66,240,247,223,127, 67,167,211,129,162, 40,  8,  4,  2, 80, 20,  5,163,209,  8,149, 74,133, 93,187,118,217,149,
+123,248,240, 97, 37,  0, 76,156, 56,241,158,122,203, 12,245, 48, 68,193,166, 94, 91,187,245,237,237,179,177,242, 25, 52, 52, 28,
+192,198,245,111,141,180,180, 52,152, 44,195,166, 41,192,159, 81,160,190,172, 83,224, 44,149, 87, 66,  8,240, 25,133, 73, 87,162,
+156, 14,148,165, 40,138,152,222,139,153,140, 76,239,139,106,138,188,206,157, 59,223, 67,110,206, 66, 36, 18,145, 75,151, 46,161,
+184,184,152, 42, 46, 46, 70, 88, 88, 24,201,205,205,  5,159,207,135,193, 96,112,234, 15,134, 14,228, 51,202,  3,230,205,155,135,
+165, 75,151,226,216,177, 99,160, 40, 10, 99,198, 78,199,205, 92,118, 11, 56,238,223,191,255, 55,211, 59,214,  0,160, 77, 27,162,
+163,163, 43,  0,248, 38, 37, 37, 33, 50, 50, 82,106,169,144, 55,134, 58,235,255,222,117, 76,234,134,  3,128, 45,155,207, 58, 36,
+175,169,184,122,245, 42, 78,159, 62, 93,239,152,177,226,  6, 12,122, 26,160,170,225,251,130, 30,167,173, 22,187,230,130,  3,217,
+145,127,163, 30,  0,147,245, 79, 89,122,  2, 24,203, 63, 35, 35,163, 41,228,111, 47, 64,201, 41,121, 22,158,  9, 41,156,  8,112,
+186, 15,150, 19,177,232,124,204,247,195, 28,115, 85,112, 18,217,238,103,222, 92,129,154,209, 51,205,155,  3,150, 63, 97, 58,219,
+214,173, 91,163,111,223,190,230, 70,200,236, 91, 95,219,  0,124,253,253,253,123,104,181, 90,148,149,149,225,228,201,147, 72, 79,
+ 79, 71,113,113, 49,212,106, 53,152, 49, 82, 66,  8,244,122, 61,180, 90, 45,171, 33,  6,166,110, 52, 68,238,137,137,137, 20, 69,
+ 81, 96,235,153,217,189,251, 55,243,198,102,223, 30,212, 39,223,173, 71,244,204,102,185,111,121, 13, 91, 12, 25, 50,  4,105,105,
+105, 77,171, 16, 22, 99,254,168, 27,198,146,153,200,153, 98,206,161,137,177, 55,150,239,133,241,  2,184, 10,174,240,  2,180,106,
+213, 10,  5,  5,  5,148,181,178,235, 44,249,239, 74,252,192, 92,135, 25, 12, 26, 52,  8,  0,112,244,  4,251,201, 26,145,145,145,
+ 35, 77, 99,255,151,  1,168, 76,253, 57,179,153,181,110,182,193,133,245,199,254,109, 40, 87, 14,202,115,  5, 50, 50, 50,168,190,
+125,251,162,250,242, 40,148,159,108,129,138,227, 18,144,242, 10,160,  6,224,169, 12,168, 58,198,131,250, 79, 33, 42, 78, 54,195,
+129,205, 17,232,219,183,175, 67,252,244,191, 14,  1,155,198,201,120,  2, 28,181,252,231,207,159, 79, 22, 45, 90,228,178,155,181,
+ 39,207,212, 73,185,172,114,178, 29, 67,107,140,116, 44,100,213,200,229,114,207,134,206, 59, 11,203,177,127, 87, 40,  1,150, 99,
+255,108,149,128,152,152, 24,120,120,120,192,211,211, 19, 94, 94, 94,240,241,241,161,253,252,252,120, 73, 73, 73,120,253,245,215,
+205,215,137,197, 98,140, 24, 49,  2,141, 40,  1,  1, 58,157, 14,101,101,101,208,104, 52,240,241,241,129, 72, 36,130,193, 96,  0,
+ 33,  4, 70,163, 17, 58,157, 14,122,189, 30, 70,163,209,161,248,  2, 83,208, 90,131,231, 45,173,208,135,  9,123,  1,129,142,162,
+169, 74,  0,245,101,195,195,125,147,174, 68,153,200,213, 73,217, 86,214,191,197,113, 76,156, 56,209,225, 96, 64,107,235,223, 82,
+158,179,  8, 15, 15, 39, 70,163, 17, 97, 97, 97,228,220,185,115, 84, 88, 88, 24,209,235,245,168,172,172,108, 10,169,213,117,190,
+  2,  1,230,204,153,131,211,167, 79,227,159,113,127,246,117,250,192,129,  3,  7,  6, 15, 30, 12,  0, 94, 38,210, 87,  1,192,214,
+173, 91,155, 29, 61,122,212,219,212, 62, 40,211,167, 93,193, 75,127, 92,138, 87,251,223,107,253,199,252,164,194,214,147,122, 16,
+ 66,208,123,114,111,156,221,124,150,122,144,198, 85, 70, 70,  6, 37,251, 87, 56, 57,176,180, 29,  4, 53, 85,128,161,238,175,105,
+  0, 66,  1, 80,120,199, 23, 71,242,194,141,107,182, 20,243, 51, 50, 50,168,240,240,112, 49, 19, 43,192, 89,255, 11, 27,189,206,
+238, 52,192,168,168, 40,194, 84, 88,203,120,  0, 54, 88,180,104, 17, 99, 49,184,  4, 44,228, 57, 61,190,110,154,162, 87,111, 75,
+ 73, 73,161,153, 89,  1, 77,181,216, 99, 99, 99, 61,159,228, 10,183,102,205, 26, 44, 89,178,164, 94,189, 98,200,127,236,216,177,
+ 24, 59,118,108,157,133,115,244,104, 99, 98,252,115,114,114, 52, 70,163, 17,229,229,229, 40, 41, 41, 65,121,121, 57, 84, 42, 21,
+ 84, 42, 21,106,106,106, 80, 85, 85,133,202,202, 74,168,213,106,104,181, 90,176,105,232, 20, 69, 97,199,142, 29, 14, 41,108,143,
+ 51,210,210,210,234,109,150,152, 51,103,142,212,114,159,205,152,179,141, 49,255,122,150,123, 83,162,246,109,253,150, 16, 66,237,
+216,177,195,165,177,  0, 59,118,236,112,184, 13,247,233,211,135, 24,141, 70,115,130,150,176,176, 48, 66,211, 52,238,222,189,139,
+218,218, 90,167,158,249,223,243,135,226,232,209,163,160,183,249,130, 16,130,248,248,120,243, 59, 74, 59, 73,131,237,200, 71,100,
+100,228,203,  0, 16, 29, 29, 93,104, 82,  0,180, 91,182, 36, 52,155, 57,115,102,179,163, 71,143, 98,212,168, 81, 17,142,228,  4,
+184,147,124, 27, 20, 40, 36, 88, 88,255,147,127, 84,129,255,106, 37,182,156,212, 97,246,236,217, 88,116,224,187,  7, 94,151,195,
+195,195,249,140, 18,240,194,108,  3,136,218,  7,168,  2, 80,  5,240,171,129,170,187,192,254,179, 45, 96, 65,254,130,140,140, 12,
+ 13, 71,254,246,201,223,174,  7,192,122,220,223, 50, 30,128,173,155, 37, 49, 49, 49,213, 20, 32,164,180,242, 36, 57,219, 97,220,
+ 35,143, 25, 22, 48,141, 67,186,196,253, 51,124,248,240,139, 41, 41, 41, 61, 30,197, 23,204, 88,253,174,114,251, 51, 86,191,  3,
+110,255,122, 72, 72, 72, 48,127,255,226,139, 47,176,126,253,122,  0,208,  1, 16, 50,196, 15,  0, 35, 70,140,176,167,  0,168, 67,
+ 67, 67,161, 82,169,160,211,233, 80, 92, 92, 12,145, 72,  4,129, 64, 96,246,  0,212,214,214, 66,165, 82, 65,171,213,162,178,178,
+ 18, 19, 38, 76,144,237,220,185,179,209,251, 99,172, 76, 59,211, 90, 49,113,226, 68,187,138, 66,157, 66,115,255, 98,  0,156, 57,
+111, 13,139,233,126,247, 32, 62, 62, 94, 57,103,206, 28, 89,124,124,124,234, 67,173,195, 13, 88,255,150,112, 36, 22,160, 33,235,
+223, 89,244,233,211,135,156, 57,115,134, 10, 11, 11,251,156,169,218, 70,163,241, 51, 15, 15, 15,148,148,148, 56,213,199,124,250,
+241, 80,164,166,166,130,218, 17,  0,  0, 56,248,169, 23, 70,124, 93,141, 33, 67,134,224,155, 69, 71, 65,  8, 97,237,173,216,191,
+127,255,174,161, 67,135,  2, 64,241,214,173,155, 91, 29, 61,122,204,151, 80,  4, 47,142,122,113,236,190,125,251,246,236,219,183,
+207, 33, 47,231,210,165, 75,241,234,  0,183,250, 22, 63,  8,230,204,158,131,224, 17,205,241,176,226,150, 50, 50, 50,234,105,248,
+164, 26, 16,233,  0,154, 80, 48, 24,  9, 68,  4,  8,150,240, 44,175, 55,128, 67,157, 81,182,232,227,  6, 21,132,176,176,176,198,
+ 21,  0,203,136,127, 19,249,155,131,165, 24, 79,  0, 91,205,223,  6,105, 55,  9, 54,228,185,124, 76, 42, 54, 54,182, 71, 74, 74,
+138, 43, 59,188, 39,181,158, 81,168,139,  2, 55, 91,210,111,190,249, 38,  0,  8, 45,234,146,249,156,169,211,106,  8,151,250,247,
+239,255,122,106,106,106,162,209,104, 68, 85, 85, 21,244,122,189,121,220, 95,163,209,152,167, 24, 50,129,129, 59,119,238, 76,101,
+ 81, 95, 40,152,166,  0, 90,215,219,168,168, 40,194,144,254,240,225,195,101,108, 20,128,251,149,  7,192,114,236,223,146,252,173,
+135,  5, 88,188,143,198, 64,226,227,227,149,175,188,242, 10,182,109,219,230,172,183, 76,106,233, 57, 97,246,153,128,193, 73, 87,
+162,200,181,107,215, 26,252, 61,147,240,231,192,129,  3, 13,122,236,110,220,184,193,218, 51, 83, 86, 54,156,  0, 64, 68, 68, 14,
+114,114,114,108, 70,151,151,150, 14,  3, 80, 14,192,126,191,213,173, 91, 55,114,230,204, 25,202,212, 89,126, 14,  0, 60, 30,239,
+179,155, 55,111,162,188,188,220,169,134,204,227, 81,117, 10, 59, 67,254,231, 13, 88,175,212,  1,  0,190, 89,116,212,225, 62,130,
+105, 19, 51,103,206, 12, 35,132, 32,114,116,228,132,189,123,246,254,151, 45,241, 91,138,122,121,220, 75,151, 41,138,234, 70,  8,
+192,127,181, 18,132, 16,204,153, 59,  7,205, 71,180,104, 98, 94,213,186,105,189, 76,189,107, 74, 38,193,240,240,112,178,253,227,
+150,240, 44,189,129,235, 85,173,209, 65, 84, 12,120,  4, 67, 80,123, 23,222,181,165,  0,154,153, 61,  6,214, 74,  3,  7, 39, 60,
+  0,150,211,253,172,166,177,145,196,196, 68,135, 93,166, 22,164,237,146, 27,183,148,199,204,255,127, 66,167,215, 61, 22,176, 42,
+251,122, 83,196, 26, 56,119, 79,103, 32,151,203, 13, 10,133, 98,231,208,161, 67,103, 37, 37, 37, 45, 51, 24, 12,168,168,168, 48,
+199,  0,  0, 64,113,113, 49, 42, 42, 42, 64,  8,129, 35,245, 41, 34, 34, 66,118,232,208, 33,101, 98, 98, 98, 61,235,147,249,125,
+ 68, 68,132, 67,201,128,238,  7,212, 39,223,117,134,240,239, 33,120, 59, 93, 54, 69, 81, 20,113,134,252, 77,158,182, 84, 91,109,
+ 17,  0, 44,130,  2, 89, 97,198,140, 25, 74, 22,255, 73, 28,152, 43, 94,239,179, 62, 17,177, 75,142,215,161, 67,  7,114,249,242,
+101,198,229,255, 57,128,207,180, 90, 45,174, 95,191,142,202,202, 74,103,169,144,208,219,252,112,240,124,157,113,186, 65,169,195,
+214,147, 58, 16, 66,112,236,148,243, 35,139,105,105,105, 24, 53,106,148,108,223,190,125,169,123,247,236,117, 86, 12,143,166,105,
+ 55,  0,216,118, 74,143,217,179,103,163,249,200, 22,236,213, 73, 27,168,173,173,  5,  0,228,228,228,144, 53,107,214,152, 21, 50,
+203, 88,146, 13, 27, 54, 88,246, 15,172,254,165, 29,175, 22,  8, 10,195,235,107, 43,  1,  4,215,149,193, 59,129,104, 43,200,199,
+215,195,139,176,177,243,171,100,235,214,173,255,243,  1,128,140,117,111,203,242,183, 62,223,216, 16,  0,101, 26,  2,184,103,218,
+148, 35, 67,  0, 54, 59, 10,215,145,142,165, 60,151,206,255,103,198,254,157,133, 61,133,196, 81,133,165, 33,119,191,179,195,  0,
+ 13,185,251,157, 28,  6,176, 12, 10,162, 28, 56,  7, 27, 74,  0,  1,176, 92,161, 80,172, 78, 72, 72,208, 11,133, 66,104,181, 90,
+ 24, 12,  6,208, 52, 13, 95, 95, 95,148,151,151,195,209,108,138,135, 14, 29, 74, 69,221,188,127,178, 99,199, 14,152, 20,  1,243,
+212,192, 67,135, 14,253, 79,116, 14,175,188,242, 10,169,173,173,197,222,189,123, 29,173,207, 82, 59,229, 77, 38, 93,137,146,177,
+241,198,125,248,225,135,247, 24, 23,214,248,232,163,143,  8,219, 32, 79,185,220,207,174, 60,185,220,143,149, 48,137, 68,194,116,
+146,132, 16,  2,149, 74,133, 91,183,110, 57, 61,230,111,137,145, 95, 87,215,219,111, 10,249, 27,141, 70, 10,  0,156,176,248,173,
+ 65,239,254,125, 79,103,203, 76,128,174, 66, 99, 10,153,133,  2,192,202,250,151, 79, 12,185,245, 75, 22, 90, 42,118, 92,175, 23,
+229, 63,100, 69, 56, 57, 50,227, 41, 92,187, 43, 65, 99, 94, 39, 14, 14,122,  0, 76, 47,142,114,228,248, 67,182, 64, 83, 31,177,
+251,161, 28,176,152,237, 40, 34,195, 93,118, 95,147, 38, 77,146, 57,145,222,183, 81, 11,205,134,  5,218,152,117,202, 42,104, 76,
+ 46,151, 27,  0, 80, 19, 38, 76,144,230,229,229, 41,213,106, 53,140, 70, 35,186,117,235, 38,235,219,183,175,211,239,123,199,142,
+ 29,150, 83,206,156,242, 26,221,239, 24,  0,123,251,108,244, 69, 83,116,120,125,194, 57,118,204, 97,183,191,105,174, 63,153,116,
+229, 94,  5,142, 16, 66,152, 28,  1, 22, 10,153, 57, 96,206,217,182,  1,  0,219,183,111,167, 92,213,214,216, 94,  3,  0,101,101,
+101,232,208,161,  3,169,170,170, 66,187,118,237,144,153,153,233,146,190,142,247, 74, 57, 40,138,194,216,151, 98, 25, 55, 12, 22,
+ 47,154, 97,254,238,104,198, 76, 87, 65, 46,151,211,171,143,174,118,169,204, 41, 83,166,152,188, 46, 10, 79,  0,  6,211, 70,228,
+114, 57,109,113,141, 67, 15,172,216,113,189,165, 37,247, 48,174,254,140,140, 12, 74,126,248, 85,194,145,255,125, 80,  0, 30, 35,
+ 52,185,145, 62,170,249,199, 93,125, 95,247,193, 11,115, 95,203,205, 52,198,111,254,143, 43, 87,174, 60,228, 55, 66, 83,143,182,
+188,186,178,114, 52,163, 92,131,248,172,222, 58, 22,196,214, 57,147,229,157,250, 36,116, 36,119,238,220, 49,191,143,156,156, 28,
+151,189, 19,133, 98, 53,145,203,103, 80,191,255,166, 96,245,  3,103,151,119,117,  6,166,105,125, 46,239, 19, 26, 83,174, 29,236,
+ 55, 60, 80, 23, 83,164,183, 48, 66,205,227,252,156,219, 31,108,235,212,189, 21,243, 65, 86, 52, 14, 28, 56,112,224,192,129,195,
+163,  1, 30, 87,  4, 28, 56,112,224,192,129,  3,167,  0,112,224,192,129,  3,  7, 14, 28, 56,  5,128,  3,  7, 14, 28, 56,112,224,
+192, 41,  0, 28, 56,112,224,192,129,  3,135, 39,  2,245,102,  1, 48, 57,175,157,129,173, 96, 66, 78, 30, 39,143,147,247,224,228,
+197,197,197,213,215,238,121, 60,115,118, 57,203,169,102, 76, 54, 69,203,169,103,182,210,  7,123,122,122, 66, 44, 22,155,127,207,
+227,241,192,231,243,239,145,199, 44,204, 68,211,117,179,188, 26, 90, 44,135,123,191, 13, 67,161, 88, 35,229, 11, 68, 32,180,  1,
+211,167,191,149,234,140,188,213,171, 87,203, 50, 51, 51,  5, 97, 97, 97, 41,214, 89,247,156,148, 39,205,204,204,196,170, 85,171,
+ 82,185,246,246,248,201,115, 88,  1,248, 95, 68, 96,224, 91,245, 10,174,164,100, 29,245, 72,201,123, 43,144,  0, 64,201,186, 18,
+202,242,123, 19, 68, 54, 49,185,231,125,151,247, 63,139,181,203,150, 72,139, 47,158,196, 16,191, 98,101, 43, 67, 62,178, 72,  7,
+156,174,245,151,121,135, 62,139, 89,115,231,165,218,251,253,241,227,199, 49,104,208, 32, 51,241, 51,132, 77, 81,212, 61,132, 77,
+211,180,121,187,121,243,166, 77,121,103,206,156, 65,120,120, 56, 36, 18,  9,  4,  2,  1,248,124,126, 61,153, 12,233, 27,141, 70,
+243,166,213,106,145,145,145,129, 78,157, 58, 61,113,239, 71,161, 80, 80,114,185,156,172, 94,189, 90,250,247,223,127,227,218,181,
+107, 74, 95, 95, 95,108,218,180,169, 73,245,127,205,154,181, 82,145,216, 31,190,126, 79, 41,107,107, 10,101,107,214,252, 44, 93,
+185,210,177,220, 15,171, 86,173,146, 38, 38, 38, 30,201,202,202,194,222,189,123, 17, 26, 26,138, 15, 62,248,128,111, 57,247,222,
+  9,121,202,156,235,217,232, 20,210, 17, 66,145,  8,179,103,207,121, 62, 54, 54, 86,201,181,212, 39,212,  3,240, 56, 33, 34, 34,
+194,174,198,115,232,208, 33,187, 13,147, 33,104,107,226,118, 22,174,150,119, 31, 64, 57, 72,218,118, 83,203,186, 88, 30,155,223,
+ 91,255,255,227, 77, 44,171, 87, 75, 47, 31, 63,136,188,173,223, 43, 85, 42, 45,244,207,242, 32,105, 77,161,115,222,121, 60,227,
+ 69,148,229,197,127,161,229,234,255, 39,155, 48,227,203, 70,149,128,203,151, 47,131,207,231, 99,240,224,193, 16,  8,  4,230,141,
+ 81,  8, 24,171,223, 96, 48,192,104, 52, 66,175,215,227,230,205,155, 56,114,228,136, 77,121, 42,149, 10,103,207,158, 69,255,254,
+253, 33, 20, 10,225,230,230, 86, 79, 38, 77,211, 48, 24, 12, 48, 24, 12,208,235,245, 80,171,213, 56,123,246, 44,106,106,106, 30,
+  5,178,230,153,234,  6, 15,128,161, 41,121,232, 21, 10,  5, 21, 23, 23, 71,199,197,197, 33, 32, 32,  0,255,254,247,191, 49,113,
+226, 68, 84, 87, 87, 35, 32, 32,192,169, 12,164,  1,  1,  1,230,251,249,228,147,143,241,235,230, 12, 72, 36,205,192,231, 11,149,
+ 53,213,249, 14,203, 76, 79, 79, 71, 77, 77, 13,250,247,239,127,115,248,240,225, 45, 74, 75, 75,113,240,224, 65,227,244,233,211,
+177,118,237,218, 70,219,136, 54, 55,251,158,178,185,112,245, 42, 82,189,220, 49, 55,254,203,252,222,125,122,180,185, 93, 80,132,
+131, 73,169, 71,182,108,217, 58, 60, 58,250,213,195, 28,117, 62,250, 96, 82,255, 90,121, 10, 88, 41,  0,214,169, 91,237,237, 63,
+112,242,127,251,237,183, 27,189,166,188,188, 28,  0,  8, 27, 37,128, 33,235,166, 90,235,247, 67,158,165,229,239,  2,235,223, 81,
+210,102, 75,214,174,150,103,121,173,229, 39,  0,160,172,172, 46, 51,162,191,127,202, 19,209, 80,115,255, 76, 65,167,124,165, 50,
+ 95, 69, 99,124, 39, 62,158, 10, 50,128,246, 39,112,243,231,163,186, 84,  8, 73,181, 26, 93, 51,151, 43,127,141,143,147,189, 62,
+103, 65,131, 74,  0, 69, 81,184,114,229, 10,132, 66, 33,158,127,254,121, 51,105,187,185,185,129,199,227,129, 16,  2,189, 94, 15,
+131,193,  0,173, 86,139,252,252,124, 40,149,202,  6,151, 84,230,241,120,208,235,245,200,204,204,196,224,193,131, 33,145, 72, 32,
+ 18,137,204,242, 24,  5, 64,171,213,162,166,166,  6, 23, 46, 92,128, 70,163, 49, 15, 19,176, 65,116,116,180,148,207,231, 43,171,
+171,171, 33, 20, 10, 81, 84, 84,244,238,248,241,227,171,197, 98,241,175,206,144,118,116,116,244, 36, 62,159,191, 45, 41, 41,137,
+145,151, 53,126,252,248,191, 21, 10,197, 68,185, 92,174,115,198, 18,142,139,139, 83, 46, 88,176,160,  8,166, 21,103,226,226,226,
+112,249,242,101, 52,107,214, 12, 97, 97, 97,216,184,113,163,195,228,255,203,212,169,120,177,119,111,  0, 64,243, 89,179, 32,113,
+ 15, 70, 77, 85, 30,170, 42,175,203, 98, 99,167,165, 54,148,207,189, 33, 60,253,244,211, 40, 42, 42,194,241,227,199,219,241,120,
+ 60, 92,184,112,  1,254,254,254, 72, 75, 75,195, 27,111,188, 65, 50, 51, 51, 27,253,125,233,183,115,235,237,123,234,244,104,105,
+208, 96,246,135,159,181,137, 95,252,  5,190, 95,188, 18,173,120, 70,172, 92,188, 36,229,141, 55,222,128, 61,121, 28, 30, 61,242,
+103,142,179, 93, 11,224,158,252,223,246,246, 31, 36, 92,185, 82,223,227,  0, 75, 37,224,  1,121,  2, 28,181,212, 41, 59,214,185,
+ 51,242,108,125, 62, 81,137,171,126, 92,244,141, 52, 52,243, 23,101, 17,223,136, 78, 62, 64,187,182,  4,252,167,133, 16,116,236,
+  8,161, 86,  3,237,137,124,104, 43,  5,224,211,110,208,164,252,170, 92,187, 98,177,108,250, 59,182,135,  3, 24,247,124,118,118,
+ 54,252,252,252, 32,147,201, 32, 22,139, 33, 20, 10, 33, 16,  8,204, 86,191, 70,163,193,173, 91,183,112,244,232, 81,240,120, 60,
+240,120, 60, 52, 38,207,104, 52,226,210,165, 75, 24, 52,104, 16,188,189,189, 33, 22,139,193,231,243, 97, 48, 24,160,211,233, 80,
+ 85, 85,133,191,254,250, 11, 90,173, 22,  2,129,192, 28, 11, 96, 15,131,  7, 15,150, 94,189,122, 85,121,227,198, 13, 84, 85, 85,
+ 65, 40, 20,162,121,243,230,203,143, 29, 59,134,  1,  3,  6,  8, 20, 10,197,122, 71,148,128,193,131,  7,143,187,122,245,234, 54,
+ 43,121,161,199,142, 29, 11, 29, 48, 96,192, 22,147, 18,192, 74,222,170, 85,171,164, 58,157, 14,119,238,220, 97, 92,222,230, 66,
+ 90,176, 96, 65, 97, 92, 92, 92,171,137, 19, 39, 62,255,254,251,239, 59,212,255,173,253,121,189,244,227,249,243,234, 29,187,179,
+108, 25,154,191,220, 26,223,127,255,163,108,234,212,215,156,234, 79,143, 31, 63,174,252,243,207, 63,241,241,199, 31, 87,241,249,
+124,111,177, 88,140,  1,  3,  6, 64,169, 84, 34, 41, 41,  9,173, 90,181,114,160,229, 81,216,148,125, 27, 59,175, 21, 98,247,239,
+ 27,193,231, 83,152, 59,235,117,186, 87,243, 64,222,154,217,159, 97,173,163,242, 56, 60, 20,242,183, 86, 34,109, 41,  5, 78,207,
+  2,120,216,203,219,118,236,216, 81,102,111,123,208,214,250,253,144,231, 66,171,159, 45,105, 59, 67,214,176,180,206, 25, 11,221,
+ 36,135, 56, 41,175,193,142,218,223, 63,197, 41,235,127,197,138, 21,210,105,211,166,145,134,142, 89,159,107,  8,150,215,175, 88,
+177, 66,106,125,206,250, 88,163,229,117,233,140,242, 86, 97, 21,154,121,  9,208,209,139, 64, 16, 72, 67,240,220, 11,240,232,245,
+ 43, 36,125,126,128,200, 71,  2, 97,141, 26, 42,149, 17,109,249, 42,164, 37, 52,156, 74,150,199,227, 65, 32, 16,192,205,205, 13,
+215,174, 93,195,133, 11, 23,224,237,237,141,128,128,  0,  4,  4,  4, 32, 48, 48, 16,190,172,156,122,115,  0,  0, 32,  0, 73, 68,
+ 65, 84,190,190,168,172,172, 68, 90, 90, 26,248,124,190,121,108,223, 22,152,243, 66,161, 16, 70,163, 17, 89, 89, 89,112,119,119,
+ 71, 96, 96, 32,154, 53,107,134,160,160, 32,120,122,122, 34, 43, 43, 11,122,189,222, 60, 68,208,144, 66, 97,109,249,223,189,123,
+ 87,121,253,250,117,116,232,208,  1, 35, 71,142, 68,191,126,253,160, 82,169,112,228,200, 17,100,102,102,174,211,104, 52,175, 57,
+ 96,249,203,238, 22, 21,255, 55,231,118, 37,188, 58,245, 71,232,200,183,208,170,223, 88,148,107,121, 56,148,114, 24,153,153,153,
+227, 53, 26,205,116,182,228, 95, 85, 85,133,243,231,207, 43,143, 31, 63,142,167,159,126, 26,113,113,113,129,  0,104,147,  7,160,
+ 21,  0,136,197, 98,214,100,189,246,231,245,210, 77,  9,123,164,254,  1, 61,148,  9, 91,207, 99,234, 47,191, 32,233,236, 89, 36,
+157, 61,139,230,179,102,  1,  0,244,250,218,163,206,180,185,151, 94,122,137,236,222,189, 27, 19, 38, 76,184,233,229,229,197,115,
+119,119,207, 72, 79, 79,199,241,227,199, 81, 82, 82,130,208,208, 80,199,148,210,179,215,176,248,143,139, 88,187,248,147,243,  2,
+190, 26, 60, 99, 53,190, 91,250, 11,111, 91, 90,  6,110,241,  4,120,234,169,167, 56,150,125, 66, 32,112,150,224, 31,214,226, 21,
+247,205,194,254,223, 86,  4,238,203,184,122, 19, 93,245,148,157,227, 14, 41, 21,139, 23, 47,150, 30, 62,124, 88,153,157,157,221,
+224,177,244,244,116, 86,178,152,235,210,211,211, 81, 86, 86,166, 92,188,120,177,108,222,188, 58,171,220,214,177,198,224,173, 41,
+ 69, 82,158,  6,173,202,249,232,237, 77, 33,168, 24,232, 36,240,  1,143, 10,  0,209,220, 69,237, 93, 10,151,242,104,220,169,213,
+ 64,192,227,161,167,191, 72,217,208,115, 91, 42,  0, 34,145,  8,215,175, 95, 71,171, 86,173, 16, 17, 17,  1, 62,159, 15,154,166,
+ 81, 90, 90,138,227,199,143,195,205,205, 13, 66,161, 16, 58,157,174, 65,  5,128,241, 14, 48, 74,  0, 33,  4, 57, 57, 57,232,212,
+169, 19,124,124,124, 80, 83, 83,131,179,103,207,194,104, 52, 66, 36, 18, 65,171,213, 66,171,213, 54,216,119, 48, 65,116,  0, 80,
+ 92, 92,172, 44, 40, 40, 64,175, 94,189, 32,149, 74,209,186,117,107, 89,109,109, 45,130,130,130,148, 41, 41, 41, 56,117,234, 20,
+124,125,125,251, 43, 20,138,205,114,185,220,238,250,238,197,197,197, 71,238,150, 85,194, 63,180, 63, 58, 14,126,  5,190,173, 67,
+161,173,173, 64,222,159,251,112,237,240, 70, 70, 30,171,247,107,138,125, 80,222,186,117, 11,193,193,193, 16,139,197,178,243,231,
+207, 43,227,226,226,120, 38, 15,  0,  0, 92,141,139,139,163,217,212,193,159,215,109,148,250,250, 61,165,244,245,127, 10, 60,158,
+ 27,244,250, 90,172, 91,175,196,212, 55,101,140, 71,  1,211,167, 79, 71, 80, 80, 16,237,104,219,123,253,245,215, 73, 66, 66,  2,
+  6, 15, 30,140, 62,125,250,180,  3, 96, 56,124,248,112,120,110,110, 46, 36, 18,  9, 36, 18,  9, 34, 35, 35,159,223,190,125,251,
+ 17, 54,242, 54,255,157,143, 31,254,186,138,159, 23,206, 47,107,253, 84,187,167,107,107,202,241,251,254,191,112,254,194,223,240,
+ 37, 52,132,119,238, 34,242,221,152,225,219,182,109,255,223,114,193, 62, 70,176, 53,124,212,144, 87,160, 33, 85,157,154, 56,113,
+162,165,  5, 77, 69, 69, 69, 53,182,255,216,162,164,100, 29,101,185, 61,106,242,128,251,226,254,111,204,106,111,210, 61, 59,107,
+157, 59,226,  1,112, 20,209,209,209,210, 61,123,246,212, 35,127, 91,199,156, 65,118,118, 54,246,236,217,163,140,142,142,150, 54,
+118,172, 65,226, 42,201,199,201,219,106,168,140, 52,142,229,211,184, 99, 16,192,168,205, 64,249,229,183,177,113, 86, 44,246, 30,
+172,196,133, 82,130,115,197,  6, 92, 42, 53,160,244,214,157, 70,189,114,150, 74,128, 88, 44,198,205,155, 55,113,245,234, 85,  0,
+117,113, 49,127,252,241, 71,189,177,252,198,198,235, 41,138, 50,123,  1, 24,121,132, 16,228,231,231,163,109,219,182,184,117,235,
+ 22,104,154,134, 88, 44, 54,203,106,108, 72,193, 18,121,121,121,208,104, 52,  8, 15, 15, 71,235,214,173,101,124, 62, 31,222,222,
+222,120,246,217,103,101,158,158,158,200,203,203, 67, 85, 85,213,  5,182,245, 32, 47, 47, 15, 52, 79,136, 86, 97,195,225,219, 58,
+ 20, 60,190, 27, 36,222, 65,104,251,108, 36,132, 30,126,140,188, 92,123,114, 86,175, 94, 45,173,168,168, 80, 22, 22, 22,162, 77,
+155, 54,144,201,100,178, 95,127,253, 53,181,180,180,148,  2,128,254,253,251, 27, 76,151,134,250,248,248, 64,161, 80,216, 13,120,
+ 16,139,  3, 16, 16,212, 11, 70,131, 22, 69,183,211,113,167,240,248,176,146,226,179,159,152,228,  1,  0,238,222,185,  3,147, 60,
+ 55,182,117, 79, 46,151, 79, 76, 72, 72, 64, 76, 76, 12, 38, 79,158, 12,  0,244,193,131,  7,  5,123,246,236,193,212,169, 83, 71,
+156, 57,115,134, 58,113,226,  4, 21, 23, 23,199, 42,114, 63,171, 74,133,249, 71,207,225,219, 15, 98, 49,120,244,112,127, 35, 49,
+ 96,251,127,143,226,167,229,191, 98,255,156, 55,176,182, 87, 91,180,245, 17,224,147, 79,226,184, 32,192,199,  4,231,206,157,107,
+144,252, 27,245,  0, 88,143,237,219,219,127, 18,113, 31,166,224, 57,133,175,159,249, 90, 54, 99,198,140,199,161,188,235, 13, 41,
+220,231, 32, 61, 86,239, 33, 50, 50, 82,122,237,218, 53,165, 78,167,107,244, 88, 83, 80, 94, 94,142,218,218, 90,101,100,100,164,
+ 44, 63, 63,255,158, 99,251,246,237,107,240,221,101,150,169, 81,169,163,145, 89,108,192,173, 10,  3,130,255, 16,224,233,237,217,
+184,153,123,  9,127,255,169,131, 65,192,135,142,  6, 52, 58,130,114, 66, 35,168,145,101,237,153,233,126,204,216, 61, 19,177,127,
+247,238, 93,180,107,215, 14,185,185,185,102,151,191, 64, 32, 48, 95,239,232,112,158,101, 14,  1,230,243, 62, 13,  9, 86,192,181,
+ 49, 31,118,201,154,166,105,212,214,214,214,117,142,  2,129,236,237,183,223,174,247,238,170,171,171,  5,187,119,239,198,216,177,
+ 99,121,243,231,207,191,187,104,209, 34,131,189,186, 72, 81,117, 10,145, 90,117, 23, 53,213,249,178,105,211,222, 72, 85, 40, 20,
+105,  0,190,173,174,174,198,238,221,187,205,138, 99,167, 78,157,116,108,234,246,194,133, 11,199,126,255,253,247,137,145,145,145,
+ 24, 52,104, 16,  0,208, 39, 78,156,224,253,246,219,111,144, 74,165,163, 87,172, 88,113,200,145,130,185,173,210,226,245,164, 63,
+ 48,123, 82, 36, 38,190, 62,  1, 42, 77, 21,118,237, 78,197,210,149,155,241,159, 17,207,160, 99, 81,  1,199,166, 79,128, 50,192,
+214,  3,224,106, 16,171,134,108,111,159,131,  5,238, 55,249,187,208,106,111,200,163,224,236,248,127, 99,245,130, 85,125,217,183,
+111, 95,106,231,206,157,101,126,126,126,141, 30,107, 10,252,252,252,208,185,115,231,122, 68,111,235,152, 45,168,141,222,208, 83,
+192,233, 18, 45,138,140, 70, 28,206,209, 96,123,162,  6, 71, 10,130,144, 45,244, 65, 65,165, 30,249,213, 52,106, 13,128,202, 64,
+ 32, 10,104,110,151,152,153,249,253, 70,163, 17,  6,131,  1,  1,  1,  1,240,244,244, 68,187,118,237,160,215,235,205,199,109, 37,
+  4,178,150,199,204,239, 55, 24, 12, 80,171,213, 32,132,160, 77,155, 54, 40, 44, 44, 68,139, 22, 45, 32, 16,  8,160,213,106,161,
+211,233,204,255,203,102,120,176,109,219,182, 16,139,197,200,200,200, 64, 65, 65,129,210,104, 52,162,170,170,138,250,243,207, 63,
+149, 53, 53, 53,104,219,182, 45,188,189,189, 95, 96,219, 71,181,109,219, 22, 60, 90,135,194,179, 41,168, 40,200,  2,109,212, 67,
+ 93, 85,140,188, 63,247, 65, 87, 91,206,200,107,207, 70,185, 97, 16, 16, 16,160, 92,181,106,149,217,139, 83, 90, 90, 74, 93,186,
+116,  9, 38,210,166,  1,  4,219, 74,120,100, 13,131, 65, 13,131,190,  6, 18,143,230, 16, 75,252,161, 80,172,145,202,229,114,195,
+130,  5, 11,  2, 44,228, 97,237,218,181,168,172,172,100,166, 48,222,131,  5, 11, 22,144,129,  3,  7,146, 62,125,250,144, 47,191,
+252,242,247,177, 99,199, 98,244,232,209,  0,128, 51,103,206, 84,237,217,179,  7, 19, 39, 78, 28,123,248,240,225,125,108,202,108,
+193,130,  5,100,208,160, 65,228,213,183,223,197,243, 59,142, 98,222,191,198,227,189,143,102, 66,163,171,193,141,235,249, 80, 40,
+182,227,183, 49,  3, 32,109,211,204,233,182, 49,106,212, 40,174, 95,127,136,  8, 11, 11,171, 71,250,214,129,128, 15, 52, 21,112,
+ 84, 84,148,212,145,253,  7,102,233, 55, 48,103,223,218,218,103,107,253, 55, 36,239,173,192, 64,242, 86,224, 63,238,124,235,125,
+123,158,  8, 87,201,107,192,146,118,134,168,239, 27,172,148,  8,167, 61,  0,  0,176,101,203,150,212, 49, 99,198,200, 44,147,211,
+216, 58,230, 12, 58,117,234,132, 49, 99,198,200,182,108,217,146,218,216,177,  6,127,223,185, 19, 58,123,240,225, 69,  1,122, 66,
+112,165, 92,135,132,108, 45,182,156,188,133,191,174,151,225,150, 26, 40,213, 24,113,189,134,224,182,150,160, 70,167,151, 53, 70,
+ 94,204,212, 60,157, 78,  7,181, 90,141, 22, 45, 90,160, 71,143, 30, 38, 69,207, 31,253,250,245, 51, 19, 54, 67,218, 13, 17, 54,
+ 67,232,122,189, 30, 58,157, 14, 20, 69, 33, 36, 36,  4, 21, 21, 21,200,207,207, 71, 89, 89, 25,218,183,111, 15, 30,143,  7,157,
+ 78,  7,173, 86,107,254,141, 61,  4,  5,  5,201, 90,183,110,141, 75,151, 46,225,192,129,  3,216,187,119,175,114,239,222,189, 71,
+142, 29, 59,  6, 62,159,143,231,158,123, 14, 29, 59,118, 84,195, 20,120,199, 66,222,216, 96,127, 31,148,230,156,195,223,135,214,
+227,210,190, 85,184,178, 79,129,155,167,126,131,136, 71, 51,242, 10,237,201,121,231,157,119, 82,131,131,131,101,222,222,222,200,
+204,204, 68, 65, 65,129, 50, 62, 62, 94,106,169,  8,152, 60,  1,188,132,132,  4,116,239,222,221,238,189,233,180,149,168,172,200,
+134,155,155,  7,124,253,187, 40, 61, 60, 91,225,151, 95, 54, 73, 41,138,215,159,185,198,171, 34,  5,202,255,188,135,136, 46, 53,
+ 13,214,237,125,251,246, 65, 34,145,160,123,247,238,104,223,190, 61, 51,124, 96, 40, 47, 47,175,217,177, 99,135,111, 88, 88,216,
+216,109,219,182,237, 97, 91,119,147,146,246,193,219,219, 19, 67,134, 62,171, 10,235,243, 52,198,189, 61, 21, 42,202,128,226,162,
+ 50,204,152,245, 21, 22,245,237,132, 62,205,156, 87,146, 71,141, 26, 69,190,251,238, 59, 78,  9,120, 68, 20,  1, 91,120,100,214,
+  2,120,216,179, 10,156, 33, 96, 71,177,174,164, 78,129,176, 36,106,230,216,163, 32,239, 81,245, 40, 88,121,  2,136, 35, 30,  0,
+  6,243,230,205, 75, 29, 54,108,152,172, 95,191,126, 13, 30,179, 60,215, 24, 44,175, 31, 54,108, 88,189, 96, 63, 91,199, 26,181,
+ 14, 69, 30,178,158, 45,  2, 49, 48, 64,132,103,252,132,104, 41,230, 65, 68,  8,196, 90,  3,218,122, 10, 80, 78,  8, 46,214, 24,
+144, 85,107, 64,171,102,  1,104,255,204,208,  6,101, 49, 86, 63, 51,213,175,109,219,182,232,213,171, 23,202,203,203, 81, 81, 81,
+129,138,138, 10,120,121,121,161,127,255,254,208,233,116,230,156,  0, 13, 17, 54,163, 76,232,245,122, 80, 20,133,208,208, 80,168,
+213,106, 20, 23, 23,163,168,168,  8,197,197,197,168,173,173, 69,104,104, 40,  4,  2,129, 89, 94, 67,121,  5,172,149,178,224,224,
+ 96, 89, 72, 72,  8,110,220,184,129,228,228,100,164,167,167,195,221,221, 29,207, 63,255, 60,122,245,234,181, 79, 44, 22,207,101,
+ 59,109,111,203,150, 45,123,130,155,  5,189, 22,210,194, 23, 53,215,255, 68, 86,242, 58, 20,166,255, 14, 63,145, 17,195,135, 61,
+143, 94,189,122, 77,121,255,253,247,119,179,145,229,237,237,141, 62,125,250,128, 16,130,147, 39, 79, 34, 35, 35, 67, 89, 88, 88,
+168,252,246,219,111,165,113,113,113, 50, 38,115, 98,223,190,125,145,150,150,102, 87,222,244,233, 83, 83, 43,203,179,101,101,197,
+ 23, 32, 18,251,163,121,203,231,148, 65,205,251, 41,189,188,219,239,251,126,241, 79, 99, 24,121, 91,222,119,199,214, 19, 90, 52,
+164,244,100,101,101, 33, 48, 48, 16,131,  6, 13,162,159,121,230, 25,168, 84, 42,212,214,214, 98,249,242,229,158, 93,186,116,121,
+ 89,169, 84,238,113,164, 77,252,253,119, 22,218,181,109,141, 87, 95, 29,235,254,233,191,103,163,180,186, 18, 37,165, 37,136,125,
+239, 43,124, 53,110, 24,134,181, 13,110, 18,249, 47, 93,186, 20, 61,122,244,192,178,101,203, 56, 37,224,  1,194,114,220,223, 30,
+ 30, 88, 38, 64, 87,206, 42, 48, 37,247,113, 73, 38, 64,123,176, 78,196,227, 10, 37,192,149,100,237,106,121,174,120,213,112, 65,
+122, 96, 43,  5,130,106,192, 99,225, 16,222,121,231,157, 84,235,223, 89, 30,251,249,231,159, 89,201,100,174,179,117, 61, 91, 25,
+ 12, 54,108,217,150, 58,255,245, 73, 48,164, 39, 33,183, 18,240,164,220,208,206,147,135, 66, 35,  5,190, 72,128,180, 34, 35, 52,
+ 52, 16, 36,226, 35,164,239, 16,188,191,120,109,106, 99, 10,128, 94,175,  7,159,207, 71,135, 14, 29,208,167, 79, 31, 84, 85, 85,
+ 65,163,209,152,231,231,235,116, 58,248,251,251, 99,208,160, 65,216,179,103,143,121, 72,192, 22,140, 70,163, 57,139, 96,215,174,
+ 93, 97,114,211, 67,163,209,152,219, 51,227, 73,232,218,181, 43,202,202,202, 80, 83, 83,211, 96, 91,182, 38,243, 99,199,142,165,
+ 70, 71, 71, 63,223,189,123,247, 35, 22,137,128, 42,  6, 15, 30,124, 68, 44, 22,199,200,229,114,141, 35,101,121,236,216,177,132,
+232,232,232,170,238,221,187,239,182,144, 87, 50,120,240,224,229,239,191,255, 62,235,108, 61, 51,103,206, 76, 93,181,106,149,108,
+228,200,145,184,113,227,134,242,234,213,171,200,203,203,131,151,151,151,210,215,215, 23, 17, 17, 17,248,249,231,159,209,183,111,
+ 95,214,247,246,214, 91,175,167,254,252,243,  6,153, 70, 83,  6, 95,191, 80,165,167, 87, 27,120,121,183, 69,109,117,225,158,133,
+139,214, 33,250,213,225,216,242,190,187,185,156,108, 89,108, 47,190,248, 34,146,146,146, 80, 80, 80,192, 43, 43, 43,131, 70,163,
+ 65, 90, 90,154,192,164,116, 86,157, 56,113,194,161,246, 16, 25,249, 34,118,237,218,131,170,138, 82, 20,220,186,141,247,223,249,
+151,238,195,143, 23,  8,199, 61, 63,  0,131,180, 85,128,155,115,244, 48,106,212, 40,242,249,231,159,155,211, 65,135,132,132,224,
+187,239,190,  3,  0,178,127,255,126, 46,109,248, 67, 82, 10, 30,166,  2, 64, 77,156, 56,209,210,133, 70, 89,185,251, 41, 71,221,
+255,174, 32,119, 51,201,151,172,131,189,108,123,142,  4,255,149,148,172,131,165, 43,222,146,152,173, 93,246,108, 72,187,100, 93,
+137, 75,229, 61,  6,248,159,234, 36,218, 15,144,201,206,107, 13,202,226, 35,135,225,102, 80,227,124, 53, 65, 74,181,  1, 66,138,
+ 66,  0, 33,144,181,240,133, 95,243, 32, 89,235,103,165,192,134,109,118, 61,  0,237,219,183, 71,191,126,253,160, 86,171,161,215,
+235, 33, 20, 10,205,132,205, 88,233, 65, 65, 65, 24, 56,112, 32,146,147,147, 27,245,  0,  8,  4,  2,244,234,213, 11, 20, 69, 65,
+165, 82,153,189, 11,140,210,206,100, 23,164,105, 26, 61,123,246,196, 31,127,252,  1, 71,130, 43,183,108,217,162,  4, 64, 41, 20,
+ 10, 10,128, 39,234,178,237,229,201,229,114,189, 51,101,185,101,203,150, 61, 38,121,158,  0,252,  1,148,201,229,114,135,115, 19,
+207,156, 57, 51, 21,  0, 86,172, 88, 33,115,115,115, 67, 78, 78, 14,252,253,253,149,  0, 80, 88, 88,136, 81,163, 70, 97,201,146,
+ 37, 14,201,156, 54,109, 74,170, 66,177, 70,170,211, 85,202, 36, 85,185, 74,111,223, 16,184,123,182,132,187,103, 75, 28, 60,124,
+ 23,212,176,198, 45,238,141, 27, 55, 82,211,167, 79, 39,101,101,101,120,241,197, 23,117,  1,  1,  1, 66,154,166,145,151,151,231,
+176, 71, 12,  0, 54,108,216, 72,201,229,177,196,251,114,  6,222,121,231, 45,180, 14,237, 44,252,110,246, 91,244,134,149, 27,121,
+203,249, 26,167,234,242,168, 81,163,200,252,249,243,225,235,235,139, 91,183,110, 65, 34,145,128,166,105,120,120,120,224,155,111,
+190,225,148,128,  7,128,176,176,176,  6,189,  0,108, 83,  1,187, 28,143,248,172,  2,170,100, 93,137,205, 19, 78, 90,255,212,186,
+146,123,229, 89, 91,234,140,235,158,  5,105,187, 90, 30,135, 71,  8, 38,178,161, 94,137, 28, 37,245, 49,104,149,252,155, 57,232,
+164,191, 13,175,128, 96, 12,232,217,  5,  1,173,  2,101, 31,173,218,156,186, 53,125,166, 93, 47, 90,135, 14, 29, 48,104,208, 32,
+243,120, 60,159,207,135, 86,171, 53,167,238,181, 28, 38,104,211,166, 13,  6, 14, 28,136,212, 84,219, 77, 79, 34,145, 32, 44, 44,
+ 12,  2,129,  0, 58,157,206,252, 59,203,169,131,150, 11,  1,241,120, 60,244,238,221, 27, 25, 25, 25, 14,151,129,201, 59, 80,109,
+218,154, 12, 19,233, 55,121, 81,  2,147,135,200,220, 14, 87,173, 90, 37, 85,169, 84,208,106,181,232,210,165, 11,226,227,227,149,
+142,221, 87,108, 42,  0, 40, 20,107,100,106,117, 49, 68, 34, 63,184,  9,189,148, 60,158,  0,155, 18,246,201, 94,139,137,108, 84,
+222,218,181,107, 41,133, 66, 65,253,240,195, 15,180, 90,173,  6,  0,132,134,134, 58,148,126,217, 18, 10,197, 26,234,231,159,215,
+142,154,250,249, 15, 73,117,242,  8, 47, 52,244, 41,132,190,252,242,107,239,188,243, 78,130, 51, 50, 23, 45, 90,196, 53,234, 71,
+ 68,  9,104,140,252, 31,168,  2,240,184,194,149,211,254,172,137,185,169, 68,237, 66,121,174, 86, 24, 56,  5,196,  9,108,219,183,
+ 63,181, 94,217, 85,229,225,216,141, 60,214,191,143,138,138,130,159,159,159, 57,194,159,166,105,179, 11,159,241,  0, 48, 65,127,
+204,138,128, 33, 33, 33,160, 40, 10, 91,183,110,189, 71,222,210,165, 75,145,152,152,104,190,214,104, 52,218, 93, 14, 88, 40, 20,
+162,111,223,190, 96, 19, 29,255, 24, 43,107, 77,174,235,140, 34, 80, 71,234,235, 80, 23,142, 69, 43,217,200, 51, 41, 75, 20,  0,
+172, 90,181,138,204,156, 57,147, 58,124,216,249,169,249,211,166, 77,223,111,242,154,240,104,154, 54,242,120, 60,137,163,195, 47,
+ 12, 56,235,254,209, 82,  2,236,118,212,206,174, 35,204,129,  3,  7, 14, 28, 56,112,120,124,193,227,138,128,  3,  7, 14, 28, 56,
+112,224, 20,  0, 14, 28, 56,112,224,192,129,  3,167,  0,112,224,192,129,  3,  7, 14, 28, 56,  5,128,  3,  7, 14, 28, 56,112,224,
+240, 68,160,222, 44,128,115,231,206, 57, 29,193,105, 43,152,144,147,199,201,227,228, 61,145,242,200, 75, 47,203,241,251,111, 10,
+ 40, 20, 10,158,173,108,125, 92,249,113,242,218,182,109,107,190, 38, 47, 47,143,226,202,239,193,202,115, 88,  1, 96, 26,119, 35,
+215, 59,115,131,143,179, 60,103,100, 62,234,207, 91, 15, 10,133, 66,  8,192, 27,128,187,169, 62,208,  0, 74,156, 73,158,114,159,
+ 65, 92,245,204, 13,148,233, 67,153,190,180,120,241, 98,233,201,147, 39,149, 71,143, 30,  5,  0, 12, 29, 58, 20,  3,  6, 12, 96,
+157, 74,248, 97,188,135,151, 94,150,227,197, 81,125, 12,128, 92, 32,151,203,105,112,211, 62, 57, 88,161,109,219,182,100,204,152,
+ 16,243,254,158, 61, 32,246,148,  0, 14, 15,217,  3, 96,110,225,219,239, 93,  0,130,154, 84,222,148,255,161,156, 32,222,  7, 38,
+207,214,243, 54,241,153, 31,233,231,101,136,255,210,249, 99,235,183,111, 89, 62,172,121,171,144,224,202, 74, 61,124,124,220,112,
+167,240, 58,221,189,123,175, 50,133, 66,209, 79, 46,151,223,112, 68,166,124, 74, 47,146,115, 61, 11,215,115, 53,200,191, 77,208,
+166,  5,133,144,246, 98,116, 12,  9,133, 98, 67,230,163,210,248,109, 41, 18,204, 90,  3, 15,252, 30, 47, 92,184,160, 12, 11, 59,
+128,213,171, 85, 72, 77,  5, 62,251,236, 32,242,243,243,149, 99,198,140,129, 88, 44,198,173, 91,183,100,227,198,141,131, 43, 20,
+130,215, 94,123,141, 84, 86, 86,202, 34, 34, 34,240,222,123,239,165, 58, 81,103,120,114,185, 28, 47,142,234, 67,199,198,198, 10,
+128, 53,248,253, 55, 64,161, 80, 80,108,115,246,115,248,223,129, 78, 55, 31,201,201,177, 24, 57,114, 13,198,140, 89,132, 61,123,
+234,218, 30,167,  8, 60, 24,112,137,128, 28, 97, 88, 11,178,167, 40,128,222,230,247,196, 62,235,242,101, 75, 94,223,187,251,151,
+184, 78,157, 58,119, 25,255,242, 80,180,105,229, 13, 95, 31, 17,202, 43, 52, 40,188,221,134,119, 45,167, 60,112,239,238, 95,148,
+203,151, 45,249,225,221, 89,115,151,217,147,247,254,187,147,165, 55,178,246, 42,139,110,101,226,149, 72, 96, 96, 56, 16,210, 14,
+200,206, 37, 56,126, 90,141, 36,101, 38,198,142,240, 38, 29, 66, 71,203,126, 92,190,217, 89, 34,115,165,229, 79,217,144,253, 80,
+148,128,178,178, 50,188,247,158, 10, 65, 65, 64, 84, 20,176,112, 97, 13,206,158, 61, 11,131,193,  0,177, 88,140,102,205,154, 41,
+247,238,221,139,233,211,167,203,214,174, 93,235, 80,217,205,156, 57, 83,122,241,226, 69,  4,  7,  7, 43,119,236,216, 65,109,218,
+180,  9,  0,148, 41, 41, 41,120,235,173,183,176,110,221, 58, 71,159, 85,  8,  0, 73,251,207,240,128, 53,116,221,231,189, 57,254,
+ 57,112,214, 63,  0, 76,152,176, 19,201,201,117,159,177,177,215,193,120,  4, 56,111,192,131, 37,126,203,227,214, 74,  0, 23,  4,
+104,195, 11,240, 36,147,191, 66,161, 16, 28, 74,222,254,169,108, 72,159, 46,227, 35, 67,209,171,123, 51,  4,248, 73, 64,129,130,
+183,167,  8,161, 33,254,136, 24,218, 30, 67,  7,245,110,119, 40,121,251,167, 10,133,162,185, 61,153, 55,178,246, 42,  7,135, 87,
+ 97,251,114, 96,106, 20,208,197,228,249,243,112,  7,186,118,  2,190,156,  3,244,239, 85,133, 27, 89,123,149, 77,121, 69, 77,245,
+122,216, 81, 36, 30, 74,135,228,239,239,143,189,123, 37, 40, 46,  6, 18, 19,129,242,114,  1, 58,117,234,132,209,163, 71, 51,203,
+189, 34, 53, 53, 21, 25, 25, 25,202,197,139, 23, 75,217,202, 29, 57,114,164,244,210,165, 75, 74,161, 80,168, 44, 47,175,239,201,
+ 82,171,213, 88,183,110, 29,100, 50,153,163,229, 73,  3,192,239,191, 41,144,180,255, 12,239,247,223, 20, 77,122,246,105,211,166,
+ 17,102,107,236, 24,203,122, 65,156, 56,214, 40,214,172, 94, 45, 93, 51,103,142,244,220,244,233, 36,255,197, 23,201,169, 41, 83,
+200,138,247,222,147,174, 89,189, 90,218,148,103,110,106,157,177, 37,131,237,177,251, 45,143,113,253,143, 25, 19,130,216,216,228,
+122,159, 12,198,140,  9,169, 23, 31,192,225,254, 32, 44, 44,172,222,102, 75, 57,224, 20,128, 71,129,  5, 30, 32, 46,157, 63,182,
+176, 83,167, 78,161,253,250,180,168, 95, 17,120, 20,132, 66, 62, 36, 98,  1,220,220,120,  8,233,224,135,144,144, 78,205, 46,157,
+ 63,182, 87,161, 80, 52,232, 41,146, 79,233, 69,248,168,194,156,169,128, 70, 11,220,200,  7,202, 43,129,138, 42, 96,243,110, 96,
+214,231, 64,220, 98, 96, 64, 31,128, 71,170, 32,159,210,139,107,248, 22,232,217,179,167,236,247,223,187,162, 89, 51, 96,242,100,
+  1,154, 55,127,  6, 67,135, 14,149,237,221,187,151, 26, 61,122,180,108,228,200,145,  8, 14, 14,198,153, 51,103,176,109,219, 54,
+229,132,  9, 19,164, 63,253,244, 83,163,  4, 52,120,240, 96,169, 86,171, 85,186,185,185, 53,250,223, 74,165, 18,195,134, 13, 99,
+ 67,102, 36, 38, 38,134,200,229,114,157, 41,102,  4, 22,228, 79,  1, 64, 76, 76,140,195, 10, 90,122,122,186,121,107,236,152,147,
+205,150,106, 74,243, 94,179,122,181,180,227,213,171,202,113,231,206, 41,219,100,101, 67, 88, 85,133, 22, 89, 87, 33,253,227,148,
+ 50, 40, 51, 83,169,112, 82,  9, 72, 79, 79,199,180,105,211,200,172, 89,179,156, 86, 34, 24, 25,108,142,177,149,103, 77,244,108,
+142,217,  3, 67,250,204,167,110, 76, 39,174,193, 63, 64,226,103,131,199, 85,  1, 32, 54, 54,151,  9,190,143,247, 71, 92,124,155,
+196,209,178,184,116, 57,115, 84,104,136,191,153,244,109, 45,211, 44, 22,  9, 96, 48,208,  8, 13,241,199,165,203,153, 33,  0,124,
+ 26,146,151,115, 61, 11,145,207,215,125, 63,144,  6,188,245, 49,176,122, 51,112,235, 46,112, 53, 27, 56,123,137, 32,229,  4,112,
+248, 36, 48,114,104,221,245, 77,208,205,168,251,248,138, 31,138, 98, 50,111,222,188,212,154,154,186,120,203,201,147, 39,227,212,
+169, 83,148, 66,161, 72,101,206,149,149,149,201,186,118, 21, 96,250,116,160,119,239,211, 48, 26,175, 42, 11, 10, 10, 26,244,164,
+204,156, 57, 83, 74, 81,148,146,237,226, 48, 69, 69, 69,118,189, 50, 49, 49, 49, 72, 72, 72,  0,  0,146,150,150,166,179,120, 23,
+ 20, 67,252,  9,  9,  9,136,137,137,121,152,253,129,179,199,108, 66,123,241, 34, 58,252,249,167,105, 17, 36, 29, 12, 52, 13, 90,
+111,  4,173, 55, 32,232, 88, 26,170, 88,174,183,222, 16,225,254,245,215, 95,202,231,158,123,238,190, 43,  1,206,120, 23,154, 74,
+254,186, 49,157,108,110,201,177,201, 28, 59, 63, 98,176,105,217, 53, 18,252, 70,156, 52,156,137, 11,229, 81,143, 64,231,210,232,
+ 61,216,  9, 42, 36,174, 40, 63,103,  2, 23, 21, 10,133, 32, 45,109,127,183,150,205, 61, 65,  8,112,236, 84, 62, 84,234,186, 85,
+ 87,251,244,106,142,160,  0,  9,242, 11,171,233,236, 27,229, 60,129,128,135,206, 29,253,208,178,101, 39, 95,212, 45,209,106, 19,
+215,115, 53, 24, 24, 14,104,245,192,254,163,128,242, 20, 65,203, 96, 10, 29,219,  2,195,  6,  1, 93, 66, 40,  8,248,117, 75,139,
+247, 15,  3,190, 87,104,216,150, 55,229,224,119,182, 74,  4,193,189,177,  0,228, 33,213, 45,  0, 96,150,115,197,211, 79, 63, 45,
+179, 62,199,231,243,149,221,186, 21, 33, 46,174,238, 54, 23, 44,200, 66,110,110,247,  6,101,105, 52, 26,187,150,191, 37,114,115,
+115,237, 94,147,144,144, 96,182,242, 25, 69,192,226, 28,163, 32, 80,166,115,143,130,211,142,106,106,191,209,185,164, 84,169,211,
+235,193,227,241, 64,248,124,208, 52, 13, 61, 77,131, 54, 26, 97, 52,210,104,125,251,182,178, 41,245, 69,165, 82,  1,128,114,218,
+180,105,160, 40,202,225,248, 14, 75,194,255,249,231,159,169,198,142, 61, 72,242,  7,128,228,216,100,140, 92, 51, 18, 19,118,  2,
+177,201,117,223, 25,242,215,141,233,  4,225,158,108,142,121, 31, 32, 44,221,254,172,150,  3,110,104, 22, 64, 19,102,  7, 52, 20,
+197,238, 76,116, 59,177,211,185, 59,173, 52, 52, 64,170,148, 51, 86, 68, 35, 65,133,206,200,107,240, 55,204,255, 80,  0,232,237,
+118, 99, 23,232,186,104,127, 17,  0, 32,255, 86, 21,212,106,  3,  0,160, 83, 71, 63,  4,  5, 72,144,121,169,136,247,247,181, 50,
+136,197,124,132,116,240, 69,121,165, 14,  0, 26, 20,156,127,155, 32,164, 93,221,255,191, 48,  4,  8,235, 70, 65, 36,  4, 12,  6,
+ 96,196, 96,192,215, 11,200,201,  3, 70, 14,  1,218,181,174,187,254, 33,131,178,242,158, 60, 44,197,242,190,160,168,168,200,161,
+118, 88, 93,205,126,245,221,132,132,  4,202, 66,  9,176,244, 14, 60,244,178,235,216,177, 35,201,201,201,161,156, 61,111, 13,183,
+235,217,208,234,117,160,248,  2, 24,  9,  1,  5,192, 96,164,161, 55,208, 32, 70, 35,168,107,127,187,228,190, 47, 94,188,136,192,
+192, 64,229,119,223,125, 39,251,232,163,143,156, 86,  2,172,135, 81, 28, 37,110, 87,145,127, 94, 94, 30,213,182,109, 91, 50, 97,
+103,125,133,  0,  0, 70,174, 25,  9,225,158,108,236,217,115,221, 60, 19,128,139,  5,120,120,228,223,160,  2,240, 24,160, 49, 18,
+117,152, 96,155, 56,197,177, 97,185,247,121, 54,  1, 53,169,220,209,255,160,124,124,220, 80, 94,161, 65,160,191, 59,162,198,118,
+129,193, 72, 67, 36,226,131,207,227,129, 16,130,209, 35, 66, 16, 25, 17,  2,138,  2, 74,203,213,240,241,113,  3,128,178,134,  4,
+182,105, 65,225,250, 77,130, 46, 33,192,243,207,213, 21,246,213,108,224,233, 46,128,159, 55, 48, 74, 10,208, 52, 32,224,  3, 89,
+ 55,234,174,207,201, 39,108,223,173, 35,223,155,218,145, 60,148,105,128,171, 86,173,146, 46, 94,188, 24,215,175, 95, 71, 90, 90,
+154,242,251,239,191,151,121,122,122,154,151,157, 53, 26,141,178,203,151,155, 41,191,248,162, 16, 20, 69,161,168, 40, 20,161,161,
+237,145,149,101,123, 40,133,166,105,155,199,135, 13, 27,118,175, 23,137, 16, 28, 57,114,196,161,103,182, 84,  2, 30, 37,242,119,
+133,146, 96,137,178,214,173, 32,188,250, 55,136, 27, 32,164,  9, 40, 10,208,255,255,246,190, 60, 46,170,170,255,255,125,  7, 24,
+  6, 24, 20, 92, 17,141,  4,151, 82,220,113, 65,205, 98,204,109, 68,192,141,236, 41, 11,211, 98,228, 41,179, 82,193, 44,205,122,
+234,167,240,104,242,100,153, 99,110,244,109,209, 70, 52,196, 13,163,134, 30, 77,173,196, 45,151, 82,193,196, 68, 36, 81,182, 97,
+134, 89,238,249,253, 49,115,241, 50,204,114,239,204, 32,214,115,223,175,215,188,102,230,220, 59,159, 57,247,156,123,207,251,243,
+249,156,207,249, 28,147, 17,122, 98, 66,157,209,  8,109,247,135,129,243,191,186, 93,247, 62,125,250,128,162, 40,151,200, 31,  0,
+134, 14, 29,138,141, 27, 55, 82,253,250,245, 35,142,202,156, 97,227,198,141,148, 53,225,219, 42,227,131,228,188,187,196, 15,160,
+137,229,207,  4, 12,230,230, 22,  9, 76,221,  2,228, 15,  8, 65,128,108, 18,177,126,185,109, 21, 18,  2,136,102,220,105,182, 74,
+147,175,130,205,255,193, 93,129,241, 46,187, 94,116,235,218,117,179,213,247,254,199, 63,227,212,217,114, 24, 12, 52,104,154, 88,
+148, 22,170, 33, 54,224,218,245, 26,148, 93, 47,186,  2,192,174, 89,217,173,171,  4, 63, 20,154, 63,183,139,  2, 78,158,  3,146,
+255,  1,116,127,208,236,246,127,247, 67, 64,236,  3,136, 68,192, 15,133,230,243,221, 32,104, 79,199, 80, 88,247,247, 61,183, 70,
+206,159, 63, 15,137,196,220, 38,123,247,238,197,231,159,127,174, 46, 40, 48,115,193,170, 85,171, 98,218,180,105,163,190,112,193,
+136, 79, 62,  1, 78,158, 28, 12, 47,175,135,101, 93,186,116,145,217,147, 23, 16, 16,192,249,191,141, 70,227, 95,254,193,101,147,
+127, 68, 68,  4,177,247,226,171, 44, 20,181,239, 32,187,163,175, 71,181, 94, 15,173,222,128,122,163, 17,  6, 98, 66,157,193,128,
+ 26,189, 30,165,161,161, 50,119,234,237,239,239,143,128,128,  0,217,198,141, 27, 41, 87,220,255,108,162,119, 86,198, 71,  9, 24,
+ 58,116,168,211, 50, 46, 94,  0,123,228,207,182,254,  5,180, 44,249, 11, 10,192, 61, 64,115, 47, 41, 36, 95,  5,131,128,179,162,
+ 97,140,140,236, 95,122,249,202, 29,208, 52,193,226,249,209,184,120,249, 54, 46, 92,172,  0, 69,161, 81, 64, 32, 77, 19, 92,190,
+114,  7,145,145,253,207,  2,176,235, 39,142,232,214, 19,123,191,  3, 76, 38,128, 20,  3,234,163, 64,238,183,128,252, 57, 64,246,
+ 20, 80,112,204,124,158,201,  4,236,253,206,124,126, 11,194,214,252, 63, 60,161,236,185,138,219,183,111,171,123,245,186,130,159,
+126,  2,142, 30, 53,161, 75,151, 51, 56,121,242,164, 58, 46, 46,142,236,217,179, 71,157,151,151,135,155, 55,111, 98,208,160, 65,
+152, 49, 99,134, 44, 59, 59,187,192, 81, 18, 31, 66,136,204,158, 23,192, 26,140,226,193, 23,204, 20, 64, 11,205,249, 55,  2,219,
+162, 47, 46, 46,166,236,189,108,157,239,  8,193,  3,  7,162, 98,212,163,184,173,213,225,142,161, 30, 58,163, 17,181,  6, 19,170,
+244,122,212,140,126, 28,237,162,162, 92,244, 10, 82, 24, 58,116, 40,250,246,237, 43, 59,122,244,104,129, 59, 50,216, 68,111,171,
+204, 29, 37,128, 61, 22,216, 42,227,  2, 91,228,207, 88,254,214,153,  2,  5,220,123,242, 23, 20,128,191,186,219,226,137, 59,188,
+166,  1, 20, 10,133, 41,178,223,168,209, 69, 69,151,127,253,177,176, 20, 52, 77, 32, 31, 19,129, 51,231,202,241,222,251, 71,241,
+238,234, 35, 13,228,255, 99, 97, 41,138,138, 46, 95,141,236, 55,234, 37,133, 66, 97,176, 39, 83,185,245, 52,101, 66, 43,172,217,
+108, 38,249,245,239,  2,159,238,  4,100,209,192,192,222, 64,193,151,230,242, 53,155,  1, 19, 90,185,147, 17,208,221, 85,  0,196,
+137,156, 22,153,139,212,104, 52,232,219, 87,135, 33, 67,128, 33, 67,128,193,131,  9,138,139,139,145,155,155,139, 99,199,204,218,
+ 83, 76, 76, 12,162,162,162, 56,165,  7,206,206,206, 46,224, 66,236, 70,163, 17,129,129,129,188,173, 88, 75,212,127, 67,196, 63,
+243,221, 85, 11,150,121, 57, 42,227,163,  4,120,226, 60,  0, 80,164,164, 20,232,135, 13,147, 93, 24, 55, 86, 86,246,208, 67, 40,
+243,241, 65,217,195, 15,227,226,248,241, 50,211,240,104,153,194, 50, 69,195, 23, 67,134, 12,129, 59, 86, 63, 91,134,179, 50,174,
+109,104,203,234, 31, 50,100,136,211, 50, 87,192,228,  8,184,155, 20, 72,240,  8, 52, 23,184, 44,  5, 20, 50,  1, 54,163,101,126,
+ 63,254,135, 66,161,168,248,112,237,251,153,121,  7,182, 47,250,227, 70, 77,183,238,225,193,136, 29,215, 13,193, 65, 18,220,169,
+212,225,228, 47, 55,113,249,202, 29, 20, 21, 93, 62, 50,126,194,140,157,  0,174, 57,147, 25,222,115,146,236, 80,225, 30,245,145,
+194,106,196,142,  6, 62, 89, 97,206,  4, 88,116, 21,216,244,149,217,242, 55,161, 21,194,123, 78,146,225,224, 23,158, 32,112, 79,
+255,182,197, 86,  1,220,184,113, 67, 22, 28,220, 78,125,252,248,159,  0,128,139, 23, 91, 97,200,144,222,104,219,182, 45, 36, 18,
+  9,110,220,184, 33,155, 52,105, 18,175, 84,192, 93,187,118,149,253,246,219,111,106,123, 22,155,209,104, 68,247,238,221,177,105,
+211, 38, 94, 36,100, 61,247,207,250, 78, 92,137,  5,176,101,173,186,106,193, 58, 35,119, 62,228,207, 86,  2, 26,221, 23,103,206,
+184,221,223,238, 90,232,124,218,141,235,127,121, 90,158, 35,242,103, 67, 31,215, 29, 16,230,255,239,137, 39,192,158, 98,192,107,
+ 25,160, 27,193,114,158, 94,123, 77, 92, 60,118, 79,234,231,164,157, 60, 82, 63,119,  2, 23, 95,154,247,154, 82,169, 84,110, 59,
+119,230,208,186, 93, 57,223, 71,132,116,238, 22,205,218, 11,224, 88,100,100,255,159, 38,197,207, 94,162, 80, 40, 52, 92,228, 89,
+210,251, 82,138, 89,253,201,246,189, 23,241,255, 62,178,179, 23,128,235,228,239, 17,135,201,253, 70,254,  0,240,228,147, 79,226,
+244,233,211,120,238,185,227,  0,128,193,131,  7,227,137, 39,250,203, 94,125,245,213,  6,114,254,225,135, 31,120,201,252,248,227,
+143, 11,  0, 80,177,177,177, 49, 53, 53, 53,106, 47, 47, 47,136, 68, 34, 24,141, 70,136,197, 98, 72,165, 82,153,187,228, 15,192,
+ 35, 74,128,128,191, 39, 74, 74, 74,168,188,228, 60, 18, 58, 47, 84,134,174,182,207, 41, 77,206, 83, 11,214,127,203,194,155,199,
+ 64,233,233,129,183, 57,228, 81,247,121,253,238,  7,121,140, 39,160, 74,169, 84,206,140,236, 55,138,201, 24, 35,  5,208, 14,192,
+ 13,  0, 90,203, 46,111,188, 96,237,222, 47,190, 70, 80,124, 77, 11, 28, 58,221,210,237,112, 63,229,149,104,  4, 11,209, 55,212,
+225,236,217,179, 30,147,189,119,239,222,  2, 79, 93, 31,107,222,159,178, 42,167, 96, 73,  4, 36, 64,128,181, 18, 80,178,168,  4,
+247,235,179,247,119,  5,215, 44,128,  0, 64,185,186,143,176,  0,  1,  2,  4,  8, 16, 32,224,175, 11, 33,  8, 80,128,  0,  1,  2,
+  4,  8, 16, 20,  0,  1,  2,  4,  8, 16, 32, 64,128,160,  0,  8, 16, 32, 64,128,  0,  1,  2,  4,  5, 64,128,  0,  1,  2,  4,  8,
+ 16,240,247, 64,163, 85,  0,167, 78,157,114, 57, 42,211, 86, 48,161, 32,175,217,228, 57,221,196,166, 37,229, 37, 38, 38,198,  0,
+ 80,171, 84, 42,143,200,155, 49, 99, 70, 12, 77,211, 30,147, 39,220,127, 45, 35, 47, 37, 37,101,134, 66,161,248,170, 57,235,167,
+ 84, 42,125,  0, 72, 44,247,180, 14,  0, 13,128, 40, 20, 10, 34,244,135, 32,239,127, 73,158,167, 60,  0,132,195,139, 15, 60, 45,
+239,158,129,220,206, 32,164, 54,147,115,253, 44, 68,232,177,235,101,201,195,234,213,171,101, 14,218,147,183,188,179, 31,181,130,
+187,242, 24, 76, 30,178, 79, 29,222, 42, 23,  0, 16, 21, 21,229,118,127,246,236,184, 29, 15,182,255, 22,126,126,126, 24, 51,102,
+204,125,115,127, 40,149,202,246, 84,128,244,128, 82,169,108,239, 33,121, 97, 34, 95,255, 60,123,242,148, 74,165,143, 82,169,164,
+156,200,240, 97,234, 38,145,248, 31, 80, 42,149,237,149, 74,165,151,179,223,185,242, 56,184,112,111, 28,109,174,190,216,176, 97,
+195,196,141, 27, 55, 46,244,241,241,217, 37, 22,139, 11,197, 98,241,175,  0,148, 94, 94, 94, 42,138,162,214, 41,149,202,118,205,
+208,  6,  2,  4, 52, 65, 93,106, 42,241,240,131,214,108, 99,158,179, 76,128,132, 16,251,255,205, 51, 55, 52,177,  8,244,148, 60,
+ 94, 22,172, 39, 49,125,250,116,114,249,242,101,167,228,170, 82,169,212,105,105,105,232,208,161,131,205,148,171, 11, 22, 44, 80,
+243, 33,  4, 22,160,106,  0,  0, 32,  0, 73, 68, 65, 84,107,149, 74,165, 94,189,122,181,108,193,130,  5,234, 99,199,142,169,173,
+ 20,  1,151,228,209,231,151, 65,212,251, 29,124,250,157, 30,  0, 64,159, 95,118, 87, 59,236,253, 14,175,118,249,242,223,  1,132,
+ 38,192,182,  3,102, 89,242,199,124, 16,217,253, 28,  0,179, 18, 80, 88, 88,200,171,111, 50, 62,146,197, 84,254, 94,129, 90,125,
+176, 90, 83, 31,  0,249,248, 74,116, 14,161, 16, 30,158, 68,170,171,117,216,190,125,123,139, 14,232, 41,243,231,191, 12,154, 30,
+151, 50,127,254,203,  0,150,186, 45,111,222,252, 23,  8, 77,143, 77,153,103, 91,158,163,148,204,236,115,148, 74, 37, 53,111,222,
+252,151,105,218, 52,110,222,188,249, 47,235,245,186,165, 54, 20,  5,145, 43,185, 30,220,132,158,125,255,237,216,177, 67, 61,117,
+234, 84, 89,118,118,118,129, 59, 66, 55,110,220, 40,247,246,246,126,212,219,219,251, 73, 47, 47,175, 96,145, 72, 36, 77, 79, 79,
+ 23, 45, 90,180,104,182,201,100,130,209,140, 39, 77, 38, 83,156, 82,169,252,193,226, 13,208, 91,198,191,102,159,  6,141,143,143,
+ 39, 92,199,187,156,156, 28, 94,247,116, 66, 66,  2,113,231,247,  2, 60, 15,191,140, 12,143,202,211,166,166,  2,110,200,100, 50,
+  2,242,221, 14,216, 41,249, 71, 69, 69,161,176,176,144, 15, 57, 59, 36,121,142,242,154,200, 79, 75, 75, 67,113,113, 49, 44, 46,
+ 98,143,109,235, 74, 74,163,  8,252,122,130, 10,254,146,  2,  0,170, 77, 42, 53,125,250,116,167,218, 24,155,172,203,203,203,213,
+246,200, 63, 45, 45, 13,233,233,233,188,200,223,242, 29,209,209,209,178,232,232,104,183,228, 49,100,207,188,175,252, 23, 26,145,
+127,234, 52,  9, 50,178,117,156,218,106, 91,166,148,244,  9, 23, 65,163, 37,120,237, 25,  9,142,157, 51, 66,171, 33,168,211,  3,
+178,  1,231,112,238,162,  9, 81, 81, 81,132,171, 18,144,246,230,195,164,232,100, 53,  2, 91,137, 17,210, 73,138,246, 29,187,227,
+106,145, 30, 93,123, 27,224, 35, 41, 71,254,174, 91,152, 48, 97,  2, 57,112,224, 64, 75, 13,120,190,109,218,182,157,255,217,177,
+159, 40,249, 67, 61, 94,  6,240, 46,128,122,119,228,181,109,211,118,254,182,239,142, 81, 99,  7, 60,228,150, 60,133, 66, 33, 14,
+  9,233, 52,255,160,250, 16, 53,184,127,164, 77, 89, 45, 64,254,  0,208,176,253,160, 74,165, 82,199,197,197, 33, 59, 59, 91,109,
+235,121,253,249,231,159,201,219,111,191,141, 61,123,246, 56,236,223, 77,155, 54,141, 22,139,197,125,196, 98,241, 60,177, 88,236,
+127,237,218, 53,244,232,209,  3, 94, 94, 94,  8, 12, 12,196,229,203,151, 33,149, 74,189,127,254,249,231,160,163, 71,143, 30,122,
+241,197, 23,187,  2,184, 10, 64, 12,243,244,128,221,129,143, 61,254,177,199, 45,166,156,162, 40, 80, 28,172,150,221,187,119,219,
+149,193, 46,119, 52,222,218, 67, 78, 78,142, 91,191,111, 86,  5, 57, 37, 37,198,146,149,210,109,188,243,206, 59,132,166,105, 64,
+ 84,  9,125,189, 14, 98, 95,  9, 64,  7, 65, 36, 18, 97,217,178,101,212, 81, 43,158, 73,113, 32,235,220,185,115, 36, 59, 59, 27,
+246,228, 77,155, 54, 13,145,145,145,148,171,245,195,178, 76, 44,127,231, 21,194,174,159, 59,215,238,159,145,193,251,247,246,210,
+  0,115, 85,  0, 56,145, 63, 87,164,165,165, 57, 61,135, 11,113,217, 35,255,149, 43, 87, 98,241,226,197,214, 74,135, 75,141, 78,
+142, 71, 17,180,237,  9, 42,252, 75,138,109,241,239,216,177,131,  2,  0,230,221,222,156,139, 53, 89, 59, 34,127,139,103,192,169,
+213,174, 82,169,212,214, 22, 62, 83,198,110, 99,190,242, 28, 89,248,169,211,184,239, 20,151,157, 25, 64,122, 60, 40,130,159, 47,
+133,  7, 67,189,112,235, 14, 13,131,209, 11, 21,149,  4, 85,181,  4,151,255,160,  1, 17,208,206,255, 12,211, 62, 14,  7,133, 37,
+111, 60, 20,211,179, 91,  4,142,150,221, 68,120, 88,123,244,233, 23,  1, 47,223, 54,120, 48,252, 14,238,104,117, 40, 47, 51,225,
+143,155, 58,248,123, 23,115,146,215, 76,120,250,153, 69,139,196,197,157, 66,225, 27, 53, 88,164, 59,244,223,167,  1,108,230, 43,
+132,101,137, 63,157,244,242, 66,241, 31,226, 16, 72,123, 14, 18, 85,159, 61,236,146, 60,166,110, 47,206,127, 85, 12,223, 64,132,
+ 63, 20, 41,250,237,151, 19,238,200,242, 36,104,150,245, 15,137, 68, 34,  3,160,182,238,195,227,199,143,115, 34,127,  0,240,241,
+241,  9,146, 72, 36,179,110,221,186,229,223,179,103, 79, 12, 28, 56, 16,222,222,222,248,224,131, 15, 96, 50,153,208,183,111, 95,
+236,220,185, 19, 63,255,252, 51,206,156, 57,  3, 47, 47,175,117, 74,165, 50,225,227,143, 63,118,100, 85, 55,140,115,158,240, 88,
+ 42,149, 74, 89, 72, 72,136,154, 16,226,240, 55,101,101,101, 50,133, 66,193,247,254,145,133,132,132,168, 93,253, 61, 67,212, 23,
+ 46, 92,112, 56,110,244,234,213, 75,198,151,204, 47, 92,184,160,126,234,169,167,208,186,117,107,153, 59,138,128, 98,110, 18, 73,
+ 78, 25,135,128,  0,191, 38,199, 52, 26, 45,150, 45, 91,134,225,  0,245,199,238,221,228, 90,124,188,253,177,125,102, 79,115,103,
+174,152,130, 78,163, 39, 65, 50,104, 48, 76, 61, 35, 27,157, 99,216,150,133,224, 21, 83,238,158, 11, 64, 59,225,121,140, 88,245,
+133,195,250, 37, 61, 55, 22,109,218,250,155, 11,150,101, 98,193,194,231,  0,  0,183, 43,234,112,189,180,136, 40,215,103,185,172,
+  4,212,165,166, 18, 87,148,  0, 87, 21,  0,194,197, 82,191, 95, 80, 92, 92,140,197,139, 23,187,170, 64,216,197,244,233,211,  9,
+ 21,186,131,154, 62, 61,156,168, 54, 12,  5,182, 62, 66, 40,233, 43, 78, 59,193, 22, 89, 91,147,178,163,105,  1,123, 96, 43, 20,
+199,142, 29, 83, 71, 71, 71, 55,114,253,243,149,247,197, 34,169,221,193,237,233, 85, 26,206,114, 62,254,248,227, 24, 95,175, 69,
+ 16,137,  0,127, 63,160,178,154, 70, 61, 33,  8,240,163,160,163,  1,109, 61, 65,151,246, 34,208, 70,224,210, 53, 19,138,139,139,
+213,142,148,179,249, 47,143,141,  9,127,208, 95, 45, 22, 19,188, 48,107, 24, 76, 38,130,178,114, 61, 74,174, 87,  2, 62,215,224,
+ 23, 92,143, 27,229,191, 67, 36,174,194,249,243,149,104, 29,236, 88, 94,243,153,255,109,150, 61,249,236,179,190,111,210, 64,240,
+226, 55,164, 55, 79,159, 90, 74, 87, 87,187, 66,178,  4,  0, 36,173,219, 44,251,199,204,103,125, 87, 93, 49,161,203,140, 52,233,
+111,197,103,150,154,234, 26,203, 83, 42,149,148,117, 48,155, 45,180,106, 29,180,236,233,153,207,248,158, 41,185,131,248,167,146,
+165, 31,254,107,193, 82,109,157,198, 93,  5,128,235,126, 25,142,250,194,196, 60, 35,147, 38, 77,  2, 67,250, 90,173,182,161, 15,
+ 25,203, 63, 55, 55,151, 83,159,250,250,250,142,208,104, 52, 15,247,234,213, 11, 50,153, 12, 11, 22, 44,192,156, 57,115,204,131,
+185,193,128,173, 91,183,162,176,176, 16, 39, 78,156,192,246,237,219,161,213,106,187,211, 52, 45,119, 98,177,123,244,126,218,187,
+119, 47,167,169, 57,138,162,120,223,203,108,217,174,252,222,242, 12, 23, 60,245,212, 83, 40, 45, 45,181,121, 60, 52, 52, 20,174,
+ 18,120,105,105, 41, 74, 75, 75,221, 82,  4,206,156,190,136,255,203,218,131, 81,163, 70, 32,178,111,231,187,150,252, 47,215,113,
+232,208, 17, 12, 31, 62,156,168, 94,127, 29,215,226,227,225, 55,114, 36,180,118,246,206,160, 62,187, 72,  1,192,194, 17,125, 72,
+191,242,  3,120,230,187, 61, 48,245,140,132,118,225,114,  0,128,223,170,229,144, 94, 60,135, 69,197, 98,172, 58,114,246,110, 59,
+126,150,234, 48,200,142,169,223,152,177, 35,155,212, 47,255,155, 31,112,230,244, 69,183,238, 31, 87,166, 20,216,238,126, 71,222,
+  0,111,190, 22,187,167,137,214, 93, 88,220,254,174,143,106, 81, 32,232,  4, 80,123,204, 15, 14, 53,184,144,154, 62, 61,188,161,
+179,119,236,216, 65, 97,195, 80, 98,237,  9,224, 74,214,229,229,229,141,200,217, 21,178,230, 10,150,210,225,148, 36,184,184, 11,
+ 89,238,127,155, 39,175, 95,191,158,252,121,238, 85,116,234,233,  5,141,246,238, 41, 90, 19,129, 78, 15, 24, 44,101,  6, 35,  1,
+ 17,153, 63,255,114,166, 16,137,137,137, 49,151, 46, 93,178,249,159,129,129, 85,106,141, 86,132,118,109,130, 80,121,187, 14,149,
+ 85,149, 56,118,188, 12,215,111, 18,136,  3,234,208,185,123, 45,180,117,183,208,163,159,  1, 93,123,213, 99,251, 39,133,152, 50,
+101, 74,204,149, 43, 87,238,201,253,102,177,216,199, 76,154, 54,189, 99,105,235, 96, 20, 25,  1,191, 49,227, 32, 10,110,219,142,
+174,174, 30,  7,224, 32, 67,214,  0,124, 20, 10,133,222,217,184, 15, 96,108,220,148,105, 29,255, 20,181,198,213, 90,  3,130,  6,
+141,129,119, 96,112, 59, 83,221, 93,121,  0,192,133,252,  1,140,159, 60,101,106, 71,226,229,139, 42, 77, 61,250, 68, 13,135,180,
+ 85,235,118,218, 58, 77, 35, 89, 45,  5,198,250,167, 40, 10,147, 38, 77, 34,  0,176,103,207, 30, 36, 38, 38,198,164,165,165,169,
+249,144,191, 82,169,244,173,172,172, 76, 50, 24, 12, 34,127,127,127, 60,250,232,163, 88,181,106, 21,124,124,124,160, 80, 40,144,
+149,149,133,194,194, 66, 28, 59,118, 12,223,126,251, 45,126,249,229, 23,180,107,215,174,157,209,104,124, 16,118,220,255,108, 23,
+168,179, 41,  0,145, 72,196,169,158,205, 57,  5,176,123,247,110,143, 76,  1,180,110,221, 90, 86, 90, 90,170,182,119,204,221,126,
+119, 69, 17,184,152,154, 74, 42, 50, 50,128,163, 71,129,163, 71,113,123,218, 68,172,238,223,179,193,101, 31,217,187, 55,158,152,
+ 17,139,174,119,110,225, 90,124, 60,218,166,166,162,103, 70, 70,147,233,  0,107,136,101,143,160,167, 60,  6,139, 82,223,197,191,
+113, 14,171,163, 71,163,207,144, 97,232,126,187, 24, 91,131,  6,162,184,245, 77,100,101,101,145,164,164, 36, 78,253, 43, 27,221,
+ 31,207, 36, 77,194, 79, 63,254,130,  3,121,  7,241, 22,128,213,171,182, 32,178,119,111, 60,147, 52,  9,117,218, 10,204,157, 59,
+151,179, 60,107,184, 27,  3,192,215,  3,240, 87,  2,101,135,156,120, 55,244,244,233,211,137,106,241, 21,192, 75, 12,  4,249,  0,
+ 65, 93, 65,237,176,  8,227, 56,247,223, 12, 32,108,171, 31,  0,216,150,191,141,193, 21,209,209,209, 50,  7,193,128,188,175,225,
+243,133,  1,118, 61,  2,129,213, 11,240,187,158,160,236, 22, 13, 64,  4,169,191,217,197,105, 48, 18,232,234,  1,157, 30,208,213,
+  3,122,  3,160,211,  2,250,250,187, 94, 18, 91,  1, 41,159,127, 20, 64,242,143,213,224,129,112, 41,136,143, 55,110,105,181, 80,
+127,127, 13,231, 47, 95,199,237,219,181,136,140, 50, 65,163, 51, 66, 87,111,130,182,142, 70, 89,  9,160,213,  0,187,118,237, 82,
+243,217,  0,195, 29, 40, 20, 10,218, 43, 40,104,217,115,175,191, 46,217,206,162,144,224,215,223,144,222, 94,188,112,169,169,178,
+242, 32,139,172,245, 92,250,216, 91, 26,180,108,206,171,139, 37,251,175,155, 26, 10,187, 60,185, 88,122,117,211,235, 75,141,181,
+149,  7,249,120,  1,252,165,129, 75, 95,126,109,161,164,168,244,238,110,145,113, 79, 37, 75,183,109, 88,189,180,174,182,230,160,
+155,207,154,173,123,137,207,179, 70, 24,235, 95, 34,145,200, 84, 42, 85,  1,179,100, 84,171,213,170,  7, 15, 30,204, 71,150, 17,
+ 64,119,  0,244,128,  1,  3,104,137, 68, 34,202,202,202,194,236,217,179,177, 98,197, 10, 16, 66,240,227,143, 63,226,251,239,191,
+199,153, 51,103, 80, 85, 85,133, 30, 61,122,160,186,186,218, 95, 36, 18,117,112, 38,124,242,228,201,118,  9,213,217,212,128, 61,
+ 55,253,253, 58,  5,224,200, 11,224,142,245,239,174, 34,112,167,178,178,225,115,135, 55,230,162,207, 27, 41, 24,101,117,206,149,
+  9,115,208,229,191,199, 81,180,240,  5,252, 24, 26, 10,  0, 24, 14, 80,  3,108,140,117,153,153,153,164, 75,151, 86, 56,113,242,
+ 39, 68, 14,234,  5,100,188,137, 87, 55,237,194,172,110,167,209,191,254, 50, 22,221, 20,227, 95,159, 47,193,138,247, 62,198,153,
+ 95, 14, 35, 51, 51,147,188,242,138,125,175, 47, 91, 94,155,182,254,152, 48,113, 24, 38, 76, 28,134,183,233, 76,232,235, 23,227,
+228, 73,224,228, 73,224,208,161, 73,248,112,237, 69, 60,249,228,  5, 18, 22,246, 32, 50, 50,252,121,241, 83,254, 35,111, 34, 21,
+203, 29,222,112,  7, 15,142,248,159, 81,  0, 72, 98, 98,162,140, 53,103,104,173,  4, 80,108,107,195,226,146,119, 73,243, 98, 72,
+127,199,142, 29,148,106,195, 80, 64, 44,  6,181, 99,199, 61,189, 88, 38,234, 95,165, 82, 81,137,137,137,196,153, 55,196, 58, 54,
+128, 15,161,219,130,163,115,147, 94,215, 32,180,163,  8, 79,197,137,161,171,  7, 90,  7, 82, 16, 81, 22,171, 31,  4,186, 58, 64,
+163, 39,208,104,  9, 52, 58,  2,154,  0, 34,  7, 49,215, 73,243, 53,232,219,191, 24, 33, 15,223,198, 55,251,203,113,251,182, 14,
+  3,134, 87,163, 95,155, 90,192,167, 30,186, 58, 26,229,215,  9, 52, 26, 10, 70, 35,133, 54,237, 40,128,186,231,177,108,145,  3,
+251,247, 31, 28, 28, 22,134, 35,119,249, 26,210,167,102,226,118,218,130, 40,  0,189,  1,156,231,161, 80,244, 26, 50,242,177,193,
+109, 67,195,112,252,167,134, 24, 57,180,151,253,  3, 87, 63, 89,220, 68,158, 19, 47, 64,239,129,253,  7, 12, 14, 13,237,130,243,
+ 39,238,122, 68, 70, 62, 30,139, 47,149,171,120,215,173, 57, 21, 90,230,249,181,142,223,136,139,139,107, 18,127,100, 35, 22,128,
+233,244,238,  0, 78,165,166,166,142,240,246,246,150,126,250,233,167,216,178,101, 11,158,123,238, 57,172, 92,185, 18, 20, 69,225,
+247,223,127,135, 86,171, 69, 90, 90, 26,140, 70, 35,230,206,157, 75, 83, 20,229,244,  1,240,100, 52,253,253, 62,  5,224,200, 11,
+224,  9,235,223, 85,100,101,101,225,217,228, 39, 80, 85, 89, 15,188,183, 30,154, 67,199, 17, 48,106,112,195,241,242,247,214,227,
+156,175, 47,168,151,158, 71,159, 25, 19,112,116,235,126,135,242, 46, 93, 58,139,225, 35,229, 56,123, 46, 24,235,215,169, 48,106,
+212,  8,252,235,163, 37,120,123,204,211,248, 12,192,195,207,204,198,250,117, 42,136,197,193, 72,152, 60, 24,159,242,144,247,159,
+247,191,194,144, 73,125,241,110,223, 85, 56, 27, 43, 69,112,220,206, 70,231,182,243,151,224,167,  2, 53,194,158,157,197,187, 29,
+ 14, 31,246, 70, 70,134,159,195,115, 92,181,127,254,146, 30,  0, 27,243,200,148,131,243,184,155, 56,131,205, 17,234,211,167,119,
+ 38,192, 37,168, 62,184,  2,248,245,108,240,  4, 48, 74,  1,151,105,  0, 79,129,177,230, 19, 19, 19,  9,219,250,103, 60,  2,236,
+239,137,137,137, 96, 37,203, 33,124,  9,221, 26,172, 85,  0, 54,229, 25, 77,128,166,142,160, 94,111, 14,246,171,215, 19,120,251,
+222, 61,166,171,  3,180,  6,130,138,219,  4,127,222, 33, 56,113,222,  8,154,  6, 18, 19, 19,101,151, 46, 93,106,210, 55, 70, 35,
+ 80,122, 77,143,107, 69,119,112,248,232, 29, 16, 66,225,252,175, 52, 38, 61,101,132,216,155,224,207,155,192,225,131, 64,117, 53,
+  1,161,129, 71, 70, 83,144, 72,  0,185, 60,  1, 87,175, 94,229,116, 77,242,225, 32,251,143,186, 62, 72,138,164,173, 94,127, 97,
+101,186, 79, 14, 17, 53,106,144,118,190,190,240,121,105,190,207,239,107, 51,151,232,171,171,103,114,149,231,229, 39, 93,146,178,
+116,165,207,193, 82,210, 72, 94,219,  0, 95,244,153,241,162,207,249,175, 62, 88,162,215,212,206,228,226,  1,144,248,  5, 44, 89,
+188,108,185,207,149,178,170, 70,178, 90,  5,  6, 96,202, 83,207,249,228,124,177,121,137, 70,163,153,217,194,143, 47,181,103,207,
+158, 38,101,111,189,245, 22,217,179,103, 15,114,115,115, 57,119,  5,128,179,  0, 78,173, 94,189,186,127, 80, 80,144,148,113,131,
+111,222,188, 25,179,103,207,198,150, 45, 91, 26, 44,245,213,171, 87,163,178,178, 18,213,213,213,181,117,117,117,197, 22, 15,130,
+216,209, 31,208, 52, 77,172, 93,244,140,245,207,213,253,207,184,233,217,114,172,221,245,247,195, 20,128, 45, 47,128,167,173,127,
+ 70, 38,215, 41,128,243,195,135,131,122, 97,  6,130,  0,144,209, 81,168, 59,113, 22,154,247,214,223,109,183,228, 39,208,227,153,
+ 39, 32,145,152,175,255,220, 57,199, 75,179,153,227,242,137,102, 37,162,240,248, 25,124,246,127,219,224, 63,108, 40,234, 12, 70,
+232,161,199,163,143, 13,108,114, 62, 23,121,215, 76,122, 60,213,241, 69,208, 39,234,145,248,239,209, 16, 79, 63,134,222,145,189,
+ 17,217,167,123, 67,253,210, 22,173, 69, 70,198, 63, 57,223, 55,151,171, 47,143, 57,143,243,223,196,183,226,226, 49,112, 45, 17,
+208, 95, 82,  1, 40, 44, 44,116, 26,253,109, 57,206, 77,160,111,  0, 84, 93,255, 11,124, 20, 78, 16, 30,  0,116,171,  7,245, 80,
+ 46,133, 15,162, 26,230,254,221,153,  6,176, 94, 10,104,111,105,160,  3,183,107,  3,249, 91,  7,  0, 50, 46,117,166,204,137,  7,
+128,178,182,196,220, 29,204, 31,121, 44, 62,230,250,141,253,106,186, 61, 13,145, 55,224, 99, 25, 23, 13, 52,129,209,  8,212,212,
+ 16,232, 13,128,209, 96, 86, 10, 18, 38,155,189, 55,118, 92,246, 84,244,240,248,152,250, 91,251,212,145,145, 52, 14,125,111,  2,
+ 37,  2,254, 44,163, 32,241,  3,190, 63,  0,232,181, 20, 40,  2,244, 27,228,131,210, 18, 26,143, 61, 22,139,156,156, 28, 78,219,
+ 90,203,135,131,100,188,104,190,126, 87,149,  0, 66,155,198,155,218,182, 19,237,167,239,178, 80, 71,  0, 33, 20,160,141,138,242,
+190, 98, 52,141,231, 37,143,208,227, 17,216, 70,164, 46, 51, 53,200,107, 47,  1,218, 73, 40,248,247,141,242, 62,183,141, 30,111,
+229, 49, 32,142,100,  5,  4,  6,137,174,222,172,180, 16, 11, 16,232,231,139, 64,127, 49,  6, 13, 24,232,189,235, 51, 50,190,133,
+ 31, 93,155,109,206, 68,253,179,207, 97,188,119,211,166, 77,147,101,103,103,219,147, 87, 11,224,202,201,147, 39,107, 71,141, 26,
+213, 30,172, 53,253,155, 55,111,110, 32, 68,131,193,  0,147,201,132, 75,151, 46,161,125,251,246,183,104,154,230,164, 45, 78,158,
+ 60,217,158,165,238,146,155,254,126,158,  2,176,229,  5,240,164,245,207,135,248, 25,116, 10, 13,194, 39,159,124,135,248,184,225,
+232, 24, 21,  9, 68, 69,130,122, 97, 70, 99,165, 23,192,205, 50, 45,118,231, 30, 69,167,208, 32,238,242, 66,252, 16, 53,184,  7,
+162,  6,247,104,114, 30, 95,121,143, 78,237,133, 55, 30,251,  0,244, 89, 51,249,207, 89,148,228,146, 60,107,188, 30,248,250, 55,
+ 43,106, 86,140,109,206,  7,210, 45,  5,192,178,102,255,158, 70, 96, 51, 86,174, 74,165, 98, 44, 94,202,198, 57,132, 33,127,150,
+ 85,204, 11,236, 85,  0, 76, 25, 95,203,223, 58,  0,208,130,134,178,  5, 11, 22,168, 45,211, 25,156,228,177,201,223, 86, 76,  0,
+ 95,121,206,144,145,173,131, 51,121, 57, 57, 57,  5,109,131, 40, 60, 30,237,  3, 26,128, 65, 79,195, 87,108,110,166, 26, 13, 65,
+189,129,192,104,  2, 10,207,154, 96,162,  9,156, 45,217,203,201,201, 41,232,216,158,194, 99, 49, 94,152,242,180, 23,106,107,  8,
+106,170,  0, 77, 13,133,240, 30,  4, 38,  3,  5,111,145,  4,149,183,105,148,254,161,199,165, 95,185,  5,140,201,135,131,100,206,
+  7,122,134,  1,107, 95,  3,230,189,239,154, 18, 64,234, 52, 83, 95,138, 26,184, 47, 36,103,159, 52,120,228, 35,232,  8,160, 35,
+  5,152,142, 28, 70,126,210,204, 90, 67,157,102, 10, 31,121,180,174,110,202, 11, 99,  6,239,239,245,246,215,210, 14,253, 70,160,
+157, 47,133,246, 18, 10,218, 11, 63, 96,247,155,179,106, 13,218, 58,206,242,234,117,218, 41, 19, 31, 31,181,127,193,123,235,164,
+189,251, 71, 33,208, 95,140, 64, 63, 95, 20,157, 63,133,101,105, 47,215,106,121,200,114,149,204,157, 93,174, 45,242, 95,190,124,
+121, 19, 55,255,142, 29, 59,152, 60,  1,  5,118,172,127,192, 28, 99,113,234,161,135, 30, 42,210,233,116,157,189,188,188, 36,254,
+254,230,165, 88,217,217,217,152, 54,109, 26,180, 90, 45,116, 58, 29,234,235,235, 33,149, 74,117, 38,147, 41,135, 16, 82,198,209,
+186,246,200,216,246, 87,153,  2, 96,123,  1,152,207, 45, 65,252, 12,194,195, 67,240,250, 27,201, 56,176,255, 71,124,189,235,  4,
+124,197,173,240, 71,233,221, 25,172, 46,161,189, 81,175,175,198,160,168,135,177, 38, 51, 25, 43,222,251,152,151,188, 14, 29, 90,
+227,220,249,115, 13,199, 35,123, 71,162,188,188,138,151,188,216,249, 83, 48, 77, 52, 19,245,103,107, 17, 61,175, 15,232,126, 18,
+124,242,201,246,134,250, 85, 85, 85, 97,196, 35,189, 56,201,179,134,138, 82, 81, 42,168,208,156,112, 89,  1,104, 14,242,231, 34,
+211, 66,248,196,242, 25,  0,  8,123, 89, 98, 97, 97, 97, 35,194,183,165, 32, 52,245,195, 82,128, 88,  4,248,121,  1, 82,111,160,
+190,  6,170, 21, 62, 64,230, 28,  2,191, 54,128, 95, 27,222,115,255,118,200, 31, 54,200,154,211,131, 97, 77,254,214, 49,  1,124,
+229,241, 32,127,167,242, 42, 42,  9,181,183,192, 64, 36, 18,128,166,129,190, 15,121,221,237,143, 95, 76, 48,152,  8, 76,180, 23,
+166, 78,157,202, 73, 57,185,249, 39,161,246, 31, 48, 17,163, 17,208, 27,  8, 76, 70, 64, 68,  1, 49,177, 64, 77, 37,133, 95, 79,
+107,161,213,137, 16, 31, 55, 21, 59,119,238,228, 68,254,203,231,  0,221,187,152,191,119,235, 12,184,234,  9, 80, 42,149,199, 20,
+ 10,133,188, 44, 97,226,254,176,221,251,164, 97, 35, 31,129,225,200, 97,236,140,155, 88,171,175,169,145,  3, 56,204,179,169, 15,
+155,180, 53,242, 11,111, 77,222, 31,250,239, 28,105,231, 33, 35,161,185,112,  4,159,191,148, 80, 91, 95,199, 91,222, 97,157,182,
+ 78,190,250,141,127,238,255,215,127, 54, 73,163,135,143,192,229,115,167,240,114,242,204,218,186,218, 90, 87,234,214,172,112,144,
+236,135,196,198,198,114, 89, 13,224, 21, 20, 20,116, 74,171,213,126, 86, 92, 92,220,181,127,255,254, 17, 70,163,209,219,199,199,
+  7, 57, 57, 57, 24, 59,118, 44,116, 58, 29,234,234,234,112,233,210,165,234,224,224,224,239,180, 90,237,167, 52, 77,107,192, 49,
+  3, 32, 59, 32,129,175,235,255,175, 54,  5,192,246,  2,120, 66,142, 43,185,  3,108, 97,130,124, 24, 38,200,135, 89,190,185,175,
+195, 54,150, 55,217, 61,229, 46,104,  7,234, 79,215, 34,105, 93, 44,254,245,221, 18,183,235,150,169,207, 36,193,198, 96, 36,249,
+ 39,221, 19,195,218, 37,  5,160, 37, 44,127, 27,214,  7,177,170,143,167,172, 20,187, 30,  1,174, 30,  0, 79,147, 63,163,236, 88,
+185,247,  9,187,140,175, 60,103,177,  0,124,229,105,116,132,210,232, 64, 68, 34,224,112,161,121,174,159,  9,248, 51,207,251, 79,
+229, 37,175,166,134, 80,148,101,154,157, 18,153,101,252,244, 95, 64, 83, 75,131,208, 64,124,124, 44,118,238,220,233,180, 63,228,
+195, 65,210,102,  2, 65, 82,160,244, 22,224,231, 11,208,  4,  8,144,  0,239, 41, 92, 83,  2,  0, 28,166,107,106,228,133,241, 19,
+247,183, 94,254,142,180, 96,249,178,218,122,215,200,191,145, 18, 80,144,154,176,223,239,165,183,164,121, 31,190,237, 10,249, 55,
+200, 50, 26,244, 19,151,189,242,194,190,121, 11,210,164,235,214,164,215,214,213,214,202,149, 74,229,105,182,123, 88,169, 84,122,
+ 43, 20, 10, 35, 95,  7,136, 39,189,  2,182,200,159,162, 40, 18, 27, 27, 11,  0,152, 52,105, 18,161, 40,202,145, 34, 32,213,235,
+245,181, 34,145, 40, 63, 52, 52,180, 75, 77, 77,205,139,199,143, 31,239, 52,112,224, 64,218,104, 52,214, 85, 85, 85,221, 60,125,
+250,244,239,225,225,225, 69,109,219,182, 45,214,106,181,217, 70,163,241,102,114,114,178,102,192,128,  1,156, 20,  0, 38, 41,144,
+ 59, 80, 42,149,156,  9,213,149, 41,  0,119,126,111,207, 11,224,137, 49,211, 93, 57, 58,173,151, 71,207,247,180,188,202, 59, 34,
+164, 27, 21,136, 56, 26,130, 25, 31, 57, 87, 76, 42,239, 56,191,229,238, 37,249,219, 85,  0, 56,172,245,231, 85, 65, 30,185,  3,
+248,200,165, 88, 81,254, 46,147, 23, 85,  8,106,122,248,  4,130,139,  0,154,228,107,168,178,188,248,173, 49,183, 92,175,218, 83,
+228,106,213, 46,132,201, 51, 96,  9, 16,164, 88,222, 16,151,228,125,190, 48,128,173, 20,184, 34,175, 65,238,180,105,119,251,132,
+  9,248, 83,169, 84,  5,174,200, 35,116,227, 62,174,173,  6, 98, 99, 99,177,119,239, 94,138,177,170, 56,245,199,103,158,123, 96,
+ 88,249,248, 15, 27,106,106,228,223, 47,127, 43,171,190,166, 38,201,  3,214,245, 97,125, 93,141,252,224,186,183,179,116,117, 53,
+179,148, 74,229, 17, 87,  7,115,163,209,120,200,104,172,149,175,203,204,200,170,173,173, 77,  2,112,216, 90,150, 11,228,239,  9,
+ 52, 26, 81,173,201,159,137,219, 97,  7,  9,198,197,197, 57,146, 87,162,215,235,125,  9, 33, 53, 52, 77, 43,245,122,253,143, 97,
+ 97, 97,237, 42, 43, 43,169,165, 75,151, 86, 87, 85, 85, 85,116,238,220,185,166,182,182, 86,163,215,235,171, 13,  6, 67,253,243,
+207, 63,175,229,105, 97, 83, 30,184,103, 10,154,171, 65,155, 83,118, 75,227,253,247, 63,162,  0,144, 39,158, 28,139,200, 62,225,
+118,207, 59,119,246, 10,190,218,246, 13,115,254, 61,147,183,110,221,186,  6,121, 14, 13,230,227,197,248,106,219, 55,204,249, 14,
+113, 47,201,223,158,  2,224,233, 10, 52,219,  5, 89, 72,148,178,101, 45,243,129,135,163,250,185,100, 11,116,235, 15,248,108,250,
+227,  9,111,128, 11,125, 98,247,187,187,242,246,238,221,203,171,175,220,137,248,231, 66,218,186,154,234,110,158,148,167,173,173,
+233,230, 33, 75,238,112,109, 77, 77,183,251,236, 89,166,  0, 96,195,134, 13, 68, 36, 18,129,121,177, 93,216,114,185, 28, 52, 77,
+131,166,105, 36, 39, 39, 83, 78, 86,  5, 80, 70,163,209,159, 16, 98,162,105,186,222, 96, 48,252,215,203,203,139, 18,137, 68,190,
+  0,124,105,154,134,201,100,242, 50, 26,141, 98,163,209,216,233,249,231,159,191,192,250,109,179,111,  2, 36,192, 51, 74,192,208,
+161,163,200,129,125,187, 80, 82, 94,141,144,224,186,134, 99,101,119,252, 17,214,161, 21, 30,126,248, 97,167,100,221, 92,242,214,
+173, 91, 71, 61,250,232,163,100,109,230, 94, 92,254,227, 86, 19,121,221,187,180, 67, 68, 68,  4, 39,242,111, 46, 56,202,145, 66,
+185,186,143,176,  0,  1,  2,  4,220,  7,168, 99, 17, 58,205, 50,108,188, 89,229, 55,  0,180,134, 57,104, 92, 32,126,  1,  2, 28,
+120,  0,  4,  8, 16, 32,224,175,  2,137, 69,  9,160, 89,196, 47,194,221,157,  7,189,  1,116,178,124,166,133,230, 18, 32, 64, 80,
+  0,  4,  8, 16,240,247,128,  8,128,148,245,157, 33,126, 49,139,244,105,203,121,130,245, 47, 64,128,160,  0,  8, 16, 32,224,127,
+100, 76, 19, 72, 95,128,  0,  7,218,179,  0,  1,  2,  4,  8, 16, 32,224,127, 89, 91, 62,117,234, 20,123, 35, 29, 98,149, 68,135,
+160,241, 70, 59, 37, 42,149, 42,140,249,110, 43,152,144, 45,143, 47,254,142,242,108, 44, 91,164,132,246, 19,250,227,175, 34, 47,
+ 44, 44,172,225,156,146,146, 18,138,175,188,148,148, 20, 40, 20, 10, 74,184,255, 92,147, 41, 60,191,130, 60, 62,242,120, 43,  0,
+ 60,209,158,227,121, 36, 49, 49,145,119,102, 41,123,251,197,163,105, 50, 18, 91,187,  1,218, 58,231,158,131, 33, 24,203, 90,120,
+181, 74,165,106,200,214,197, 55,159,120,115, 33, 46, 46, 46, 38, 55, 55,183,129,  4, 99, 99, 99,101,123,247,238, 45,248, 59,106,
+187,182,250,227,194,  5,243,202,176, 94,189,122,181,116,245, 72,194,100,  5,114,190, 86,218,188,103, 19, 38, 43,136,229,152,221,
+ 27, 39, 97,178,195,157,  2,145,243,181,210,229,155, 46, 44, 44,140,196,197,221, 93, 85,152,155, 11,226, 76,  9,112,134, 85,171,
+ 87,197,236, 62,184, 27, 17,145, 17,106, 80,192,133,147,231,101,195,  7,140, 64,230,251,153,188,238,191,164,164,164, 38,215,157,
+149,149, 69, 65,128,  0,  1,205,166,  0,136,185,158, 24, 29, 29,205, 91,184,  3,  5,192, 38,137, 90,111,180,193,131,104, 93,209,
+156,184, 12, 46, 68,165, 82, 33, 45, 45, 13,233,233,233,106,  7,105, 58,185,252,127,163,115, 58,135, 63,  0,  0,184,169,211,193,
+168,173, 55, 23, 86, 86, 51, 36,199, 45,253,113,195, 64,158,219, 40,167,128, 37,183, 56,175, 61,222, 69,148, 57,187, 30,243, 14,
+ 56,253,220, 18,131,115,163,254, 96,136,223,141,254,240,228, 53,144,132,201, 10, 76,148, 15,210,  1, 10,137,133,232, 93,250, 15,
+150,  2,225,113,232,245,105,200,203, 75,198,248,241, 27, 16, 23,151,142,220, 92,115, 91,185,162,  8, 60,243,242, 51,164,178,205,
+109,172, 81,174, 66,176,127, 48,104,163,  9, 58, 82,175, 62,240,227,193,241, 51, 76, 79,144, 17, 17, 35,101,243,231,207,119,170,
+  8, 36, 37, 37,145,148,148, 20,155,109, 42, 40,  1,  2,238,  5,226,227,227, 27,198,140, 57,115,230, 96,211,166, 77,141,184,103,
+246,236,217,141, 54,167,114,150, 92,202,153, 60,174, 91, 85,159, 58,117,202,218, 75,224, 81,  5,128, 87,252,128,173, 93,236, 60,
+129,245, 74,101,204, 92, 55,147,166,240,201,161,205,209,114, 39,105,105,105, 88,185,114, 37,  0, 52,188,219,254,107,194,207, 27,
+ 16,212, 10,103,138,183,193, 15, 93, 96,194, 15, 40,223,120,  2,167,139, 42, 48,117,229,150, 22,123,  0,206,252,114, 22,253,250,
+246,  1, 77,128,179,103,205,159,129,187,159,217,229, 52,225,220, 39,132, 99,127, 80, 92,251, 99,214,172, 89,  0,208,240,110,147,
+216, 41, 10,112,252,215,228,241,199,247,227,219,111,229, 30, 85,  2, 38,202,  7,213, 37, 39, 39,251,  3, 27,144,243,181,107,196,
+238,142,133,239,204,250,  7,128,105,211,178,145,151,103,126, 79, 78, 46,  2,227, 17,224,227, 13, 88,191,126,125,140,250,183,239,
+212, 47,164,204,198,224,246,  3,225,215,186, 53,136,222,  8,154,152,224,229, 45, 70,247, 49,221,243,126,141,250, 13, 43, 55,164,
+171,215,172, 89, 35,123,245,213, 87,157, 42,  1,183,110,221,106,244, 61,118, 84,  0,134,205,255,  1, 58,221,140, 70, 29,185,125,
+251,118,151,219, 71, 46,151,147,253,251,247,123,172,125, 61, 45,175, 57,145,146,146, 18,227,110, 90,223,148,148,148, 24,192,245,
+244,192, 74,165,178,223,107,175,189,118, 67,163,209,132,  1, 24,  7,243, 38,156,189,  0,156,130,121, 83, 40,  0,248, 28,192,175,
+247,186,125,216,123, 61,204,153, 51,  7,185,185,185,141, 56,101,246,236,217,224,147,185,212,153,188,134,231, 61, 39,135, 36, 36,
+ 36, 80, 92,200,159, 41,179, 86,  2, 26, 41,  0,105,105,105,164,184,184, 24,  0, 16, 17, 17,  1,246,102, 51, 42,149,170,209,119,
+235,227,142, 44,246,242,242,114,181, 74,165,226,236,  9,176,222,235,222, 17,  9,207,181,164,194,180,230,  1,190, 46,246, 13, 27,
+ 54, 56, 61, 39, 63, 63,159, 19,119, 37, 38, 38,218, 37,253,197,139, 23, 35, 61, 61, 29,108,  5,129, 11, 58,135, 63,128,235,119,
+170,176,115,238, 52,180,165, 70,162,232,147,133,136,152, 18,129,111, 90,152,252,  1, 52, 16, 62,  0,244,233,211,167, 81, 57,227,
+ 25, 96,151,123,218,178,119, 66,196, 36, 49, 49,209, 46,233,111,221,186, 21,233,233,233,144,143, 28,136,253, 63,156,  4,  2,  3,
+128,234,218,123,222,134,251,246,159,240,  7, 54, 96,223,254, 19, 30,145,119,243,223,109, 29,106, 49, 29, 23, 85,112,122, 64,216,
+174,255,228,228, 60,196,197,117,107,120,103, 16, 23,215,141,179, 18,240,201,151,159, 96,197, 71,239, 98, 84,143, 24,152,234,235,
+ 97, 52, 25, 65,121, 83,  0,188, 64, 64,227,230,159,165,232,213,254, 97, 44,153,187,  4,239,102,188,203,201, 27,101, 61,216,197,
+134,110,181, 73,248, 51,102,204, 32,174, 40,  1,114,185,156,236, 91,186, 31, 19,225, 25,210,150,203,229, 36, 35, 35,  3,  0,238,
+107, 37, 32, 37, 37, 37,166,170,170,138,241,150,185, 85,207,170,170, 42,102, 76,119, 73,142, 66,161, 40,  6, 48, 11,192, 73,  0,
+159,  2, 24, 11, 96,  2,128,127,178, 20,128, 91, 45,209, 78,236,237,158,  1,224,235,175,155,106,240, 95,127,253, 53,  8, 33,152,
+ 60,121, 50,197, 87,222,250,245,235,101,236,177, 46, 36, 36,196, 46,241, 91, 35, 57,205,204, 49, 27,210, 23,219, 60,222, 72,  1,
+ 72, 79, 79,119, 24,  4,200,254,110,125,220, 81, 16,  2,163, 84, 44, 88,176, 64,157,150,150,  6,235,141,114,172, 55,207, 81,169,
+ 84,142,210, 23, 82, 28,202, 90,244,161,250,234,171,175,236, 18,191, 69,209,106, 32,255,197,139, 23,115,146,249, 71,113,  9, 52,
+187,150, 65, 58,251, 63,232, 28,254,  0, 58,182,245, 67,241,174, 98, 51,249,  7,181, 50, 79,  1,248,120,241,174,107, 92, 92,156,
+140, 61, 13, 96,249,206, 75,  6, 77,128,176,  0,224,195,153,192,243, 91,129,246,254,192,133, 74,219,229,231,238,240,171,159, 61,
+ 69,142,143,215,230,157,119,222,177, 75,252,  0,144, 49,107, 18,214, 30, 56,134,144,136, 78, 40,187,122,211,169,245, 15,  0, 28,
+189,  0,156,189,  4,102, 11, 95, 97,211,210,231, 50,255,111, 11, 25, 95,120, 54,201, 39, 67,250,204,187, 62,174, 59,196,185,151,
+ 57,255,190, 78, 91,135,145, 51, 70,168,163, 59, 13, 67,189, 70,  3,111, 95, 95,120,123,223, 29,130,138, 47, 95,198,238,156,156,
+235,179,159,155,213,185,171,111, 24,  6, 62, 54, 96,140, 84, 23, 24,179,249,147,205,188,172,198,247,246,205,194,247,223,127, 15,
+160,113,221,182,111,223, 78,241, 85,  2, 24,242, 71,215, 53,216,183,244, 85,183,149,  0,185, 92, 78, 50, 51, 51,209,179,103, 79,
+172, 93,187, 22,243,230,205,187,239,148,  0, 43,226,247,136, 60, 70,150, 27,222,  4, 25,128,199,  0,108,  5, 80, 11, 32,  4,192,
+111,  0,174,226,110,238,135, 22,129,245,118,207,108,183,189,181, 11, 63, 33, 33,129, 56,115,225,239,219,183,175,209,148,241,238,
+221,187, 11,216, 86, 63, 87,133,152, 33,127,230,243,134,244,197, 77,188,  0,247, 36, 15,  0,107,238, 21,197,197,197,232,208,161,
+ 67, 19,  5,129, 41, 43, 47, 47,231,154,231,222, 89, 48, 32,231,  1,243,137, 39,158,104,182,107,103, 19,152, 45,171,223, 66, 66,
+182,234,222,  8, 90,148,160,118,202, 48,144,192,133,192,152,165,168,197,151,192,198, 19, 22,205,108, 33,124,158, 93, 11,163,145,
+127,162,179,220,220,220,  2,118, 59,241, 37,127,  0, 40,223, 12,188,189, 30,120,160, 11,112,115,143, 24, 89,155,244,152,181,205,
+126, 57, 47,243,158,120,150,196,216,193,126, 55,190, 94,137,192, 72,  9,164, 61, 94,193, 87, 43,159, 71,255, 62, 33,120,104,210,
+187,156,250,131, 75,213,121, 76, 21, 80,  0,136, 21,249, 83, 12,241,187, 50,175,207,213,194,231,  2,125, 92,119,155,229,121, 86,
+158,  0,103,184, 81,126,  3,227, 18,199, 33,176, 85, 48, 76,148, 17,135,190,255, 47,106,106,107, 17, 23, 31,143, 63,203,203,177,
+ 35,123, 39,230, 60, 55,171,179,175,196, 23, 34,226,131,241,131,198,231,255,166, 94,235,146, 66,127,231,206, 29,183,175,155, 77,
+254,  0,220, 86,  2,228,114, 57, 89,190,124, 57,186,119, 55,183,103,183,110,221,112, 63,121,  2, 60, 77,252, 54,172,127,230,179,
+ 43,215,218,219,242, 76,250,  0,240,  7, 16,  9,224, 60,128,206,  0,170,  1, 84,122,224,153,117,  9,214,219, 61,207,153, 51,167,
+161,140,113,225, 51, 99, 25, 23,207,180,189,233,  2, 54,249,115, 81,  4,184,224,158, 37,  2,234,208,161,131, 44, 49, 49,177,201,
+ 84,128,101,111,123,  0,224, 29, 35, 96, 47, 24,208,145,229,104, 79, 65,105, 14, 48,214,189, 61,119, 63, 87,235, 31,  0, 14,188,
+190, 28,113, 43,222,135,113,204, 72,120,  3,144, 30,189,140,111,138, 42,  0,  0,198, 49,243, 96,248,165, 29,168,246,255,228, 77,
+ 82, 60,188, 44,118, 81, 49,249, 75,204,123,238, 26, 46,206, 77,133,230, 91, 61, 66,218, 57, 46,247,132,  7,192, 21,229, 96,235,
+214,173,102,109, 56,238, 81, 28, 43, 45, 71, 96,255, 64, 92,207, 43,  2, 36,190,152, 54,239, 89,180,233, 50,169, 37,199, 95,123,
+ 81,255, 30,241,106, 57, 90, 33,224, 44,118, 32, 47, 57, 15,227, 55,140,199,180,108, 32, 57,207,252, 57, 47, 57,143,183, 23,160,
+ 86, 87,131,118,126,109, 97,212,213,129,136,  8,134, 12, 29,138, 93,187,118,233, 50,223,127, 95, 66, 19,130,167,103, 62,141, 54,
+109,219,160,174,182, 22, 70,147, 17,129, 62,173, 96, 16, 25, 92,186,222,202,202,202, 70,171,  3,248,  6,  4, 54, 33,127,  6, 46,
+ 42,  1,114,185,156,164,165,165, 97,232,208,161,141,202,251,244,233,131,247,222,123,175, 69,149,128,230, 34,126,107,235, 31,  0,
+ 74, 75, 75, 93,245,  2,252,  8,243,124,127, 53,204,174,255,113,  0, 46,  1,232,  7, 32,  7,192, 22,  0, 14,111, 22,165, 82, 73,
+ 41, 20, 10,143, 43,  9,108,151, 61, 43, 80,175,225, 56,123, 74,160,172,172, 44,198,217, 70, 95,132, 16,138, 33,120,182,171, 63,
+ 33, 33,193,102,185, 39, 21,  0, 98, 69,138,132,231,113,137,167,193, 38,  0,  0,  8, 86, 73, 68, 65, 84,135,136,136,136,104, 32,
+253,232,232,104, 25, 19, 27,192,120,  7, 34, 34, 34,212,204,116, 65, 75, 13,188,158,132,179,185,126,150,245,239, 20, 83,215,103,
+131,196,135,227,230,240, 65,104,139,145,240,155,182, 22,198, 27,127,  2, 65,173,224, 93,241, 37,246,100, 22,  2, 94, 94,174, 92,
+187,219, 15,196,233,215,254,129,193,  3,128,136,121,103, 17, 41,125, 14,191, 61,152,  8,124,152,106,183,188,165, 60,  0,233,233,
+233, 24, 53,228, 33,140, 25,217, 19,113,125, 83,177, 58,243, 99,156, 47,188,142,185,163,  7,163, 44,103, 31,170,238, 84,123,234,
+126,176, 53, 85,224,148,160,217,132,239, 73,242,183, 35,147, 19, 74, 74, 74,168,176,176, 48, 50, 45,187,177, 66,  0,  0,227, 55,
+140,135, 56,247, 50,114,115,139, 26, 86,  2,176,115,  5,216,186,221,104,154,134,137,  6,  8,109,132,175,159,  4, 51,159,121, 70,
+242,246, 91,111,161, 99,199,142,116,231,144, 16,145, 78, 83, 11, 19,  1,  8,109,  2, 77, 59,247,104,101,101,101, 81, 99,199,142,
+ 37, 21, 21, 21,168,174,174,110,164, 56, 90,173, 14,224,188, 42, 64, 46,151,147,213,207,159,  3, 36,221,129,178,143,154,158, 32,
+233,142,213,207,159,  3, 56, 42,  1,114,185,156, 36, 36, 36,200,250,244,233,163,174,168,168,104,114, 60, 44, 44, 12,  9,  9,  9,
+ 50,220,231, 49,  1,238, 90,255,110,122,  1,216, 10, 67, 39,  0,167,  1, 76,  1,192,121, 43,211,230, 32,127,192,241, 20,128, 13,
+ 99,166,192,217,181,199,199,199, 19,230,247,241,241,241,196, 90,222,166, 77,155, 16, 31, 31, 79,248,174, 10,224,162,  0,240, 73,
+  4,100,235,184, 77, 36, 38, 38,218,244,  2, 48,100,223,161, 67,  7, 89, 90, 90,154,154,153,147, 77, 76, 76,116, 24, 84,232,200,
+ 58,116, 97,125,125,179, 44,  3,100,172,123, 71,193,128,124, 80,244,239,100,248, 76, 91, 11,109,233, 69,120, 31, 93, 11, 67,246,
+ 60, 80, 19, 87, 97,247, 63,167,227,234,238, 43,136,203,248, 20,240,110,153,204,206,169, 42, 32, 47, 99, 23, 34,175,142,  7,110,
+105,176,104,108,170,195,114, 79,120,  0, 92,181,254,115,118, 45,135, 87,231,222,144,162, 39, 74,190,223,128, 26,138,224,167,139,
+215, 48,230,236,117, 78,213,249,246, 91,185, 93,178,  7,  0,203,113,155,231,113, 37,127, 59,247,168, 91,196,224,137, 21,  2,201,
+121,119,137, 31, 64, 19,203,159,  9, 24,204,205, 45,178,249,251, 64,191, 64,148, 86,149, 98,104,215, 97,208,214,235,  0,173, 14,
+ 70,189,  1, 75,210,210, 64,137, 32,170,211,212,130,166, 77, 48,154,  8,124,189,125,240,103,237,159,240, 49, 57, 95,109,252,205,
+ 55,223, 52, 92, 91, 82, 82, 18, 97,198, 27,246,234,128, 27, 55,110,112,190, 78, 51,  9,155,149,128, 94,225, 77,255,255,194, 21,
+ 61, 22,108,140,  4, 87,178,182,156, 71,134, 14, 29,138,176,176,176, 38,199,207,158, 61,139,156,156, 28,117, 75,145,191,197, 26,
+167, 24, 79, 64,105,105,105,179, 88,255, 30,240,  2, 48, 24,103, 33,210,250,251, 65,201,113, 52,  5,192, 46,231, 59,  5,224,169,
+ 41,  5, 62, 10, 64,179,128,177,252,  1, 32, 58, 58, 90,166, 82,169,212,140,235,223,142,114, 32,187,116,233,146,179, 88,  0,138,
+ 99,153, 71,173, 76,174, 13,206, 88,255,182,136,159, 81,116,248,212,247,116, 81,  5, 12,191,188,141,155,248,  1, 33, 19, 87,  1,
+ 85,213, 40,218,176, 16,221, 82,214,160,108,203, 66,192,199, 27, 16,181, 76,102,231, 18, 13,208,171,195, 20,206,229, 45,225,  1,
+ 72, 79, 79,175,157, 49,102,216,141,214,116,240,  3,117,240,145,100,175,153,135,117,123, 78, 97,209,132, 71, 48,235,253, 47, 48,
+253,255,253, 95,179,122,131, 28, 93, 98,206,215, 74, 88,146,  0, 81,238, 42,167,238,184,250, 29,121,  1,146,243,242,136, 45,242,
+103, 91,255,206, 16,218, 33, 20,  7, 14,229, 97,196,  3, 35,224, 31, 32,  5, 77, 19,136,136, 17, 52, 69,129, 16,  2, 19,  1,140,
+ 52,129,209,104,132,182, 74,131,189, 63,239,133,216, 36,230,189,116,216,122, 85,192, 27,243, 70, 34, 54,180, 24,212, 65,238, 50,
+236, 41,  1,124,201,223, 90,  9,200,200,200, 64,167, 78,157,238, 42,246, 69, 69, 72, 79, 79,199,253, 96,249,123, 90, 17,176,101,
+253,187,233,  5,  0,128, 24,  0, 15,  2,120, 19, 45, 28,252,199, 64,169, 84, 54,186, 71,203,202,202,160, 84, 42, 29,121, 34,156,
+202, 99, 79, 41,148,149,149,197, 40,149, 74, 10,  0, 41, 43, 43,163,214,175, 95, 79, 88,222, 91, 74,225,198, 50,248,123,162,  0,
+ 88, 71,253, 91,146,213, 52, 81, 14,216,159,221,180,224,121,223, 88, 30, 92,  6,104,211,250,119,149,248, 25, 76, 93,185,  5, 59,
+  1, 76, 88, 17, 11,162, 90,  8,234,137,213, 56, 93, 84,  1,170, 77, 48, 46,255, 81,109,182,254,249, 79,  1,120,  4,246,214,251,
+187,147,  7,128,139,194,197, 85, 57,216,186,117,171, 30, 64,205,243, 49,253,170, 95, 89,245, 31,253,235, 75,210,116,237, 91,117,
+168, 56,119,190,164,227,172,243, 95, 72,209,194,171, 70, 28,144, 51,123,138,134,231,138,  2,207,195, 22,249, 51,150, 63,  0,167,
+  1,129,243,231,207,167, 70, 60, 62, 34, 94, 61,178, 32, 39,177,239,116, 84,235,170, 65,137,  0,115, 74, 17, 26, 38, 19,  1,109,
+ 52, 34,192, 55, 16, 71,170, 78,226,210,209,203,216,161,220, 81,224,118,197,139, 94,  0,192,127, 25, 96, 35, 37,160, 83,  9, 46,
+220,  8,115,137,252,173,149,128,181,107,215, 34, 40, 40,  8, 21, 21, 21, 88,190,124, 57,238, 55,183,191, 39, 20,  1,123,214,191,
+139, 94,128,142, 48, 71,253,139,  0, 12,  4,176,  0, 64,209,253,210, 94, 10,203, 82,116, 79,193,122, 74, 97,247,238,221,223, 55,
+ 87,221,239, 73, 30,  0,123, 30,129,213,171, 87,203,172, 21,133,196,196, 68, 53,223,139, 96, 19,193,253,144, 98,151,109,253, 91,
+ 47,255,179,180, 47,187, 93, 57, 87,152, 81,  2,166,172,216, 12,146, 13,180,155,165, 68,193, 43,211,241, 72,250,231,128,143, 15,
+  2, 36,226, 22,185, 94,246, 26,127, 91,159, 93,204,  3, 96,  4, 32,178,244,173,200,205,254,184, 57, 99,204,176,210, 87, 54,228,
+134, 47,153, 51,174, 85,104, 72,140, 30,192,153,196,196,196,214, 48,111, 37,235, 82,127, 48,183,220,183,223,202,153,136,127, 87,
+148, 59,202,153,  5,207,135,208,155, 43, 25,144, 61, 88,147, 62,227, 17,104,211,166,141, 77,237,236,200,183, 71,118,135, 61,252,
+  0, 76, 51,140,103, 30,123,224,177,126,109,  3,219, 66,103,208,129, 16,  2,177,183, 24,149,218, 58, 28,251,227, 91,108,253, 44,
+ 11,178,222, 50,217, 14,236,112,187,142,239,237,155,133,172,172, 44, 92,186,196, 63,  7,192, 93, 37,  0,110,145, 63, 91,222,188,
+121,243, 72, 70, 70,  6, 82, 83, 83,113, 63,207,249,179, 21,129,130,130,  2,151,126,235,232, 28, 30, 50, 19, 96, 94,239,175,  3,
+240, 26,128,159,  1,152,240, 55,133,245, 20,  0, 95, 12, 24, 48,  0,167, 78,157,194,134,244,197, 77,242,  0, 56, 76,  4,212, 92,
+121,  0,108,121,  4,236, 17,189,139, 94,  0,183,208, 92,203,  0,153, 14, 84, 42,149,200,207,207,167,139,139,139,217, 68, 38, 83,
+169, 84,188, 53,199,169, 43,183,  0,172,196, 63,143, 45, 89,223,240, 89,211, 50,247,171,211,187,148, 38, 46,181, 93, 38,128,219,
+ 48, 47,255,153,233,102, 29,203,158,143,233, 87, 63, 54,255,199, 86, 79,191,245, 41,148, 74,165, 56, 63, 63,191, 19, 26,167,179,
+118,169, 63,154,219, 19,224, 44,191,191,211,145,179, 25,166,  4,236,145,191, 62,174, 59,144,235,220, 48,219,246,209,118, 42,192,
+ 75, 74,142,134, 29,195,200, 97, 35,209, 57,176, 51, 64, 19,252,169,171,192,145, 19, 71, 80,118,174, 12,163,123,141,150,189,252,
+242,203, 45,222, 31,108, 37,192, 83,100,205,120,  2,254, 42,  1,127,238,102,  1,244,  0, 54, 88, 94,255, 19,176,158, 82,112,199,
+197,111, 47,  1,144, 77,  5,160,185,176, 96,193,  2,155,100,111,181, 19, 27, 27,106,  7,137,128,236, 18,173,171,104,142,101,128,
+233,233,233, 80, 42,149,198,252,252,124,111,203,212,  1, 67,254,163, 29, 92,183, 77, 88, 54, 83, 82, 55, 67,215, 16,  7,229, 84,
+ 11,221,252,190,150,251,114,169,165,200,164, 80, 40,158,113, 83,172,239,216, 55, 63, 41, 84, 42,149,143,230,231,231, 35, 63, 63,
+ 95,  7, 64, 98,121,121,130,248, 41,119, 82,  3, 59, 35,249,132,201,138, 70,253,197,151,184, 61, 49, 37, 80, 82, 82, 66,229, 37,
+231,145,208,121,161, 50,116,181,125, 78,105,114,158,154,107, 60,192,166, 15, 54, 81,107,214,172,137,217,178, 98, 11,194,186, 63,
+168,  6,128,223,206,254, 42,155, 52, 54, 14,153, 31,103, 22,108,195, 54,151,234,153,149,149, 69,141, 27, 55,174,201,170,  0,131,
+193,224,214,245,123,154,172,255,110,209,254,247,  1,105, 82,205, 21,229,127,175,225,137, 41,  5,198, 11, 96, 93,198, 89,  1,112,
+102,137,243,176,212, 93,189,209, 73, 51,203,247,212,239,109,202, 75, 76, 76, 36,249,249,249,222,236,246, 98,123, 88,120, 42, 40,
+  5,205, 68,200,247,227, 32, 20,  8,160,214,156,144,159,162,  0,248,193,201,250, 94,142,253,241,123,126,126, 62,179,174,172, 58,
+ 34, 34,162,125,122,122,186,239,253,208,150,205,233,182,247,164,236,146,146, 18,170,100, 81,137,199,218,128,149,231,191,225,119,
+ 71,190, 59,234,118, 61, 15, 30, 60, 40,144,235,223,156,236,217, 28,166, 80, 40, 12,158, 36,127,165, 82, 41, 81, 40, 20,186,191,
+122, 59,113, 49,162, 41, 87,247, 17, 22, 32, 64,128,  0,  1,  2,  4,252,117, 33, 18,154, 64,128,  0,  1,  2,  4,  8, 16, 20,  0,
+  1,  2,  4,  8, 16, 32, 64,192,255,  0,254, 63, 77, 57, 32,181,169,121,  6,251,  0,  0,  0,  0, 73, 69, 78, 68,174, 66, 96,130,
   0};
 
diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index 99d03d46e34..ee591125056 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -87,6 +87,36 @@
 #include "blendef.h" 
 #include "winlay.h"
 
+/***********************/ /*
+
+Notes on word-wrap
+--
+All word-wrap functions follow the algorithm below to maintain consistency.
+	line		The line to wrap
+	view_width	The maximum number of characters displayable in the region
+				This equals region_width/font_width for the region
+	wrap_chars	Characters that allow wrapping. This equals [' ', '\t', '-']
+
+def wrap(line, view_width, wrap_chars):
+	draw_start = 0
+	draw_end = view_width
+	tab_offset = 0
+	pos = 0
+	for c in line:
+		if pos-draw_start+tab_offset >= view_width:
+			print line[draw_start:draw_end]
+			draw_start = draw_end
+			draw_end += view_width
+			tab_offset = 0
+		elif c in wrap_chars:
+			draw_end = pos+1
+			if c == '\t':
+				tab_offset += tab_size-(pos-draw_start)%tab_size
+		pos += 1
+	print line[draw_start:]
+
+*/ /***********************/
+
 #define TEXTXLOC		38
 
 #define SUGG_LIST_SIZE	7
@@ -656,34 +686,92 @@ static void set_cursor_to_pos (SpaceText *st, int x, int y, int sel)
 	if(!sel) txt_pop_sel(text);
 }
 
+static int get_wrap_width(SpaceText *st) {
+	int x, max;
+	x= st->showlinenrs ? TXT_OFFSET + TEXTXLOC : TXT_OFFSET;
+	max= (curarea->winrct.xmax-curarea->winrct.xmin-x)/spacetext_get_fontwidth(st);
+	return max>8 ? max : 8;
+}
+
+/* Returns the number of wrap points (or additional lines) in the given string */
+static int get_wrap_points(SpaceText *st, char *line) {
+	int start, end, taboffs, i, max, count;
+	
+	if (!st->wordwrap) return 0;
+
+	end= max= get_wrap_width(st);
+	count= taboffs= start= 0;
+
+	for (i=0; line[i]!='\0'; i++) {
+		if (i-start+taboffs>=max) {
+			count++;
+			start= end;
+			end += max;
+			taboffs= 0;
+		} else if (line[i]==' ' || line[i]=='\t' || line[i]=='-') {
+			end = i+1;
+			if (line[i]=='\t')
+				taboffs += st->tabnumber-(i-start)%st->tabnumber;
+		}
+	}
+	return count;
+}
+
+/* Sets (offl, offc) to transform (line, curs) combination to its wrapped position */
+static void wrap_offset(SpaceText *st, TextLine *linein, int cursin, int *offl, int *offc) {
+	Text *text;
+	TextLine *linep;
+	int i, start, end, taboffs, max;
+
+	if (!st->text) return;
+	if (!st->wordwrap) return;
+
+	text= st->text;
+
+	/* Move pointer to first visible line (top) */
+	linep= text->lines.first;
+	i= st->top;
+	while (i>0 && linep) {
+		linep= linep->next;
+		i--;
+	}
+
+	/* Calculate line offset for earlier lines */
+	end= max= get_wrap_width(st);
+	taboffs= start= 0;
+	*offl= 0;
+
+	while (linep) {
+		*offc= 0;
+		for (i=0; linep->line[i]!='\0'; i++) {
+			if (i-start+taboffs>=max) {
+				(*offl)++;
+				*offc -= end-start;
+				start= end;
+				end += max;
+				taboffs= 0;
+			} else if (linep->line[i]==' ' || linep->line[i]=='\t' || linep->line[i]=='-') {
+				end = i+1;
+				if (linep==linein && i >= cursin)
+					break;
+				else if (linep->line[i]=='\t')
+					taboffs += st->tabnumber-(i-start)%st->tabnumber;
+			}
+		}
+		if (linep==linein) break;
+		linep= linep->next;
+	}
+}
+
 static void draw_cursor(SpaceText *st) {
 	int h, x, i, w;
 	Text *text= st->text;
 	TextLine *linef, *linel;
-	int charf, charl;
+	int charf, charl, offl, offc;
 	char ch[2];
 	
-	if (text->curl==text->sell && text->curc==text->selc) {
-		x= text_draw(st, text->curl->line, st->left, text->curc, 0, 0, 0, NULL);
-
-		if (x) {
-			h= txt_get_span(text->lines.first, text->curl) - st->top;
-
-			if (st->overwrite) {
-				ch[0]= (unsigned char) text->curl->line[text->curc];
-				if (ch[0]=='\0') ch[0]=' ';
-				ch[1]= '\0';
-				w= BMF_GetStringWidth(spacetext_get_font(st), ch);
-				BIF_ThemeColor(TH_SHADE2);
-				glRecti(x, curarea->winy-st->lheight*(h)-2, x+w, curarea->winy-st->lheight*(h+1)-2);
-				BIF_ThemeColor(TH_HILITE);
-				glRecti(x, curarea->winy-st->lheight*(h+1)-3, x+w, curarea->winy-st->lheight*(h+1)-1);
-			} else {
-				BIF_ThemeColor(TH_HILITE);
-				glRecti(x-1, curarea->winy-st->lheight*(h)-2, x+1, curarea->winy-st->lheight*(h+1)-2);
-			}
-		}
-	} else {
+	/* Draw the selection */
+	if (text->curl!=text->sell || text->curc!=text->selc) {
 		int span= txt_get_span(text->curl, text->sell);
 		
 		if (span<0) {
@@ -710,7 +798,7 @@ static void draw_cursor(SpaceText *st) {
 			}
 		}
 	
-			/* Walk to the beginning of visible text */
+		/* Walk to the beginning of visible text */
 		h= txt_get_span(text->lines.first, linef) - st->top;
 		while (h++<-1 && linef!=linel) linef= linef->next;
 	
@@ -749,6 +837,30 @@ static void draw_cursor(SpaceText *st) {
 
 	}
 
+	/* Draw the cursor itself */
+	x= text_draw(st, text->curl->line, st->left, text->curc, 0, 0, 0, NULL);
+	
+	if (x) {
+		offl= offc= 0;
+		if (st->wordwrap) wrap_offset(st, text->curl, text->curc, &offl, &offc);
+		x += offc*spacetext_get_fontwidth(st);
+		h= txt_get_span(text->lines.first, text->curl) - st->top + offl;
+
+		if (st->overwrite) {
+			ch[0]= (unsigned char) text->curl->line[text->curc];
+			if (ch[0]=='\0') ch[0]=' ';
+			ch[1]= '\0';
+			w= BMF_GetStringWidth(spacetext_get_font(st), ch);
+			BIF_ThemeColor(TH_SHADE2);
+			glRecti(x, curarea->winy-st->lheight*(h)-2, x+w, curarea->winy-st->lheight*(h+1)-2);
+			BIF_ThemeColor(TH_HILITE);
+			glRecti(x, curarea->winy-st->lheight*(h+1)-3, x+w, curarea->winy-st->lheight*(h+1)-1);
+		} else {
+			BIF_ThemeColor(TH_HILITE);
+			glRecti(x-1, curarea->winy-st->lheight*(h)-2, x+1, curarea->winy-st->lheight*(h+1)-2);
+		}
+	}
+
 	do_brackets();
 	BIF_ThemeColor(TH_TEXT);
 }
@@ -929,9 +1041,12 @@ static void do_textscroll(SpaceText *st, int mode)
 			
 			if (delta[0] || delta[1]) {
 				screen_skip(st, delta[1]);
-				st->left+= delta[0];
-				if (st->left<0) st->left= 0;
-				
+				if (st->wordwrap) {
+					st->left= 0;
+				} else {
+					st->left+= delta[0];
+					if (st->left<0) st->left= 0;
+				}
 				scrarea_do_windraw(curarea);
 				screen_swapbuffers();
 				
@@ -1240,9 +1355,9 @@ void drawtextspace(ScrArea *sa, void *spacedata)
 {
 	SpaceText *st= curarea->spacedata.first;
 	Text *text;
-	int i;
+	int i, a, x, y, max, offs, len;
 	TextLine *tmp;
-	char linenr[12];
+	char linenr[12], *wrapbuf;
 	float col[3];
 	int linecount = 0;
 
@@ -1285,7 +1400,12 @@ void drawtextspace(ScrArea *sa, void *spacedata)
 			get_format_string(st);
 		}
 	}
-	
+
+	y= curarea->winy-st->lheight;
+	x= st->showlinenrs ? TXT_OFFSET + TEXTXLOC : TXT_OFFSET;
+	max= get_wrap_width(st);
+	wrapbuf= MEM_mallocN(max+1, "wrapbuffer");
+
 	for (i=0; i<st->viewlines && tmp; i++, tmp= tmp->next) {
 		if(st->showlinenrs) {
 			/*Change the color of the current line the cursor is on*/
@@ -1296,17 +1416,41 @@ void drawtextspace(ScrArea *sa, void *spacedata)
 			}
 			if(((float)(i + linecount + 1)/10000.0) < 1.0) {
 				sprintf(linenr, "%4d", i + linecount + 1);
-				glRasterPos2i(TXT_OFFSET - 7, curarea->winy-st->lheight*(i+1));
+				glRasterPos2i(TXT_OFFSET - 7, y);
 			} else {
 				sprintf(linenr, "%5d", i + linecount + 1);
-				glRasterPos2i(TXT_OFFSET - 11, curarea->winy-st->lheight*(i+1));
+				glRasterPos2i(TXT_OFFSET - 11, y);
 			}
 			BIF_ThemeColor(TH_TEXT);
 			BMF_DrawString(spacetext_get_font(st), linenr);
-			text_draw(st, tmp->line, st->left, 0, 1, TXT_OFFSET + TEXTXLOC, curarea->winy-st->lheight*(i+1), tmp->format);
-		} else
-			text_draw(st, tmp->line, st->left, 0, 1, TXT_OFFSET, curarea->winy-st->lheight*(i+1), tmp->format);
+		}
+		if (st->wordwrap) {
+			int start, end, taboffs;
+			offs= 0;
+			len= tmp->len;
+			taboffs= start= 0; end= max;
+			for (a=0; a<len; a++) {
+				if (a-start+taboffs>=max) {
+					strncpy(wrapbuf, tmp->line+start, end-start);
+					wrapbuf[end-start]= '\0';
+					text_draw(st, wrapbuf, st->left, 0, 1, x, y, tmp->format+start);
+					y -= st->lheight;
+					start= end;
+					end += max;
+					taboffs= 0;
+				} else if (tmp->line[a]==' ' || tmp->line[a]=='\t' || tmp->line[a]=='-') {
+					if (tmp->line[a]=='\t')
+						taboffs += st->tabnumber-(a-start)%st->tabnumber;
+					end = a+1;
+				}
+			}
+			text_draw(st, tmp->line+start, st->left, 0, 1, x, y, tmp->format+start);
+		} else {
+			text_draw(st, tmp->line, st->left, 0, 1, x, y, tmp->format);
+		}
+		y -= st->lheight;
 	}
+	MEM_freeN(wrapbuf);
 
 	draw_textscroll(st);
 	draw_documentation(st);
@@ -1330,10 +1474,14 @@ void pop_space_text (SpaceText *st)
 		st->top= i - st->viewlines/2;
 	}
 	
-	x= text_draw(st, st->text->curl->line, st->left, st->text->curc, 0, 0, 0, NULL);
+	if (st->wordwrap) {
+		st->left= 0;
+	} else {
+		x= text_draw(st, st->text->curl->line, st->left, st->text->curc, 0, 0, 0, NULL);
 
-	if (x==0 || x>curarea->winx) {
-		st->left= st->text->curc-0.5*(curarea->winx)/spacetext_get_fontwidth(st);
+		if (x==0 || x>curarea->winx) {
+			st->left= st->text->curc-0.5*(curarea->winx)/spacetext_get_fontwidth(st);
+		}
 	}
 
 	if (st->top < 0) st->top= 0;
diff --git a/source/blender/src/header_text.c b/source/blender/src/header_text.c
index 49f14784927..ad9d906011d 100644
--- a/source/blender/src/header_text.c
+++ b/source/blender/src/header_text.c
@@ -206,6 +206,10 @@ void do_text_buttons(unsigned short event)
 		allqueue(REDRAWTEXT, 0);
 		allqueue(REDRAWHEADERS, 0);
 		break;
+	case B_WORDWRAP:
+		allqueue(REDRAWTEXT, 0);
+		allqueue(REDRAWHEADERS, 0);
+		break;
 	}
 }
 
@@ -846,8 +850,8 @@ void text_buttons(void)
 	else uiDefIconBut(block, BUT,B_FULL, ICON_FULLSCREEN,	xco,0,XIC,YIC, 0, 0, 0, 0, 0, "Makes current window full screen (CTRL+Down arrow)");
 		
 	uiDefIconButI(block, ICONTOG, B_TEXTLINENUM, ICON_LONGDISPLAY, xco+=XIC,0,XIC,YIC, &st->showlinenrs, 0, 0, 0, 0, "Displays line numbers");
-
 	uiDefIconButI(block, ICONTOG, B_SYNTAX, ICON_SYNTAX, xco+=XIC,0,XIC,YIC, &st->showsyntax, 0, 0, 0, 0, "Enables Syntax Highlighting");
+	uiDefIconButI(block, ICONTOG, B_WORDWRAP, ICON_WORDWRAP, xco+=XIC,0,XIC,YIC, &st->wordwrap, 0, 0, 0, 0, "Enables word wrap");
 	uiBlockEndAlign(block);
 	
 	/* STD TEXT BUTTONS */
diff --git a/source/blender/src/space.c b/source/blender/src/space.c
index 1dc4f5e6b9b..454d50bd208 100644
--- a/source/blender/src/space.c
+++ b/source/blender/src/space.c
@@ -6039,6 +6039,7 @@ static void init_textspace(ScrArea *sa)
 	st->tabnumber = 4;
 	st->showsyntax= 0;
 	st->overwrite= 0;
+	st->wordwrap= 0;
 	st->currtab_set = 0;
 	
 	st->top= 0;

From 13364bf2085097a8183c65242b3aba8f7d5c163b Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Sat, 26 Jul 2008 19:32:47 +0000
Subject: [PATCH 144/252] soc-2008-mxcurioni: completed implementing
 ViewEdgeIterator and ChainingIterator. Updated UnaryPredicate{0D,1D}

---
 .../freestyle/intern/python/BPy_Iterator.cpp  |  19 ++
 .../intern/python/BPy_UnaryPredicate0D.cpp    |  15 +-
 .../intern/python/BPy_UnaryPredicate1D.cpp    |  11 +-
 .../python/Iterator/BPy_AdjacencyIterator.cpp |   8 +-
 .../python/Iterator/BPy_AdjacencyIterator.h   |   2 +-
 .../Iterator/BPy_ChainPredicateIterator.cpp   | 165 ++++++++++++++++
 .../Iterator/BPy_ChainPredicateIterator.h     |  33 ++++
 ...or.cpp => BPy_ChainSilhouetteIterator.cpp} |   0
 .../python/Iterator/BPy_ChainingIterator.cpp  | 182 ++++++++++++++++++
 .../python/Iterator/BPy_ChainingIterator.h    |  33 ++++
 .../BPy_ChainingSilhouetteIterator.cpp        |   0
 .../python/Iterator/BPy_ViewEdgeIterator.cpp  |  88 +++++++--
 12 files changed, 532 insertions(+), 24 deletions(-)
 create mode 100644 source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp
 create mode 100644 source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.h
 rename source/blender/freestyle/intern/python/Iterator/{BPy_ChainingPredicateIterator.cpp => BPy_ChainSilhouetteIterator.cpp} (100%)
 create mode 100644 source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.h
 delete mode 100644 source/blender/freestyle/intern/python/Iterator/BPy_ChainingSilhouetteIterator.cpp

diff --git a/source/blender/freestyle/intern/python/BPy_Iterator.cpp b/source/blender/freestyle/intern/python/BPy_Iterator.cpp
index 6a613c5f5ab..f3612b1bd52 100644
--- a/source/blender/freestyle/intern/python/BPy_Iterator.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Iterator.cpp
@@ -8,6 +8,10 @@
 #include "Iterator/BPy_SVertexIterator.h"
 #include "Iterator/BPy_orientedViewEdgeIterator.h"
 #include "Iterator/BPy_ViewEdgeIterator.h"
+#include "Iterator/BPy_ChainingIterator.h"
+// #include "Iterator/BPy_ChainPredicateIterator.h"
+// #include "Iterator/BPy_ChainSilhouetteIterator.h"
+
 
 	
 #ifdef __cplusplus
@@ -167,6 +171,21 @@ PyMODINIT_FUNC Iterator_Init( PyObject *module )
 	Py_INCREF( &ViewEdgeIterator_Type );
 	PyModule_AddObject(module, "ViewEdgeIterator", (PyObject *)&ViewEdgeIterator_Type);
 	
+	if( PyType_Ready( &ChainingIterator_Type ) < 0 )
+		return;
+	Py_INCREF( &ChainingIterator_Type );
+	PyModule_AddObject(module, "ChainingIterator", (PyObject *)&ChainingIterator_Type);
+	
+	// if( PyType_Ready( &ChainPredicateIterator_Type ) < 0 )
+	// 	return;
+	// Py_INCREF( &ChainPredicateIterator_Type );
+	// PyModule_AddObject(module, "ChainPredicateIterator", (PyObject *)&ChainPredicateIterator_Type);
+	// 
+	// if( PyType_Ready( &ChainSilhouetteIterator_Type ) < 0 )
+	// 	return;
+	// Py_INCREF( &ChainSilhouetteIterator_Type );
+	// PyModule_AddObject(module, "ChainSilhouetteIterator", (PyObject *)&ChainSilhouetteIterator_Type);
+	
 	
 }
 
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp
index 29ea68c01ca..3e5168e7da1 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp
@@ -1,6 +1,7 @@
 #include "BPy_UnaryPredicate0D.h"
 
 #include "BPy_Convert.h"
+#include "Iterator/BPy_Interface0DIterator.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -124,6 +125,7 @@ PyMODINIT_FUNC UnaryPredicate0D_Init( PyObject *module )
 
 int UnaryPredicate0D___init__(BPy_UnaryPredicate0D *self, PyObject *args, PyObject *kwds)
 {
+	self->up0D = new UnaryPredicate0D();
 	return 0;
 }
 
@@ -147,15 +149,18 @@ PyObject * UnaryPredicate0D_getName( BPy_UnaryPredicate0D *self, PyObject *args)
 
 PyObject * UnaryPredicate0D___call__( BPy_UnaryPredicate0D *self, PyObject *args)
 {
-	PyObject *l;
+	PyObject *py_if0D_it;
 
-	if( !PyArg_ParseTuple(args, "O", &l) ) {
+	if(!( PyArg_ParseTuple(args, "O", &py_if0D_it) && BPy_Interface0DIterator_Check(py_if0D_it) )) {
 		cout << "ERROR: UnaryPredicate0D___call__ " << endl;		
 		return NULL;
 	}
-	
-	//TBD
-	
+
+	Interface0DIterator *if0D_it = ((BPy_Interface0DIterator *) py_if0D_it)->if0D_it;
+
+	if( if0D_it )
+		return PyBool_from_bool( self->up0D->operator()(*if0D_it) );
+
 	Py_RETURN_NONE;
 }
 
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp
index b00422a0aab..54731d75d7b 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp
@@ -1,6 +1,7 @@
 #include "BPy_UnaryPredicate1D.h"
 
 #include "BPy_Convert.h"
+#include "BPy_Interface1D.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -124,6 +125,7 @@ PyMODINIT_FUNC UnaryPredicate1D_Init( PyObject *module )
 
 int UnaryPredicate1D___init__(BPy_UnaryPredicate1D *self, PyObject *args, PyObject *kwds)
 {
+	self->up1D = new UnaryPredicate1D();
 	return 0;
 }
 
@@ -147,14 +149,17 @@ PyObject * UnaryPredicate1D_getName( BPy_UnaryPredicate1D *self, PyObject *args)
 
 PyObject * UnaryPredicate1D___call__( BPy_UnaryPredicate1D *self, PyObject *args)
 {
-	PyObject *l;
+	PyObject *py_if1D;
 
-	if( !PyArg_ParseTuple(args, "O", &l) ) {
+	if(!( PyArg_ParseTuple(args, "O", &py_if1D) && BPy_Interface1D_Check(py_if1D) )) {
 		cout << "ERROR: UnaryPredicate1D___call__ " << endl;		
 		return NULL;
 	}
 	
-	//TBD
+	Interface1D *if1D = ((BPy_Interface1D *) py_if1D)->if1D;
+	
+	if( if1D )
+		return PyBool_from_bool( self->up1D->operator()(*if1D) );
 	
 	Py_RETURN_NONE;
 }
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp
index cc7ce17f4cf..e40f129d3d8 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp
@@ -115,22 +115,22 @@ int AdjacencyIterator___init__(BPy_AdjacencyIterator *self, PyObject *args )
 	    return -1;
 
 	if( !obj1 && !obj2 && !obj3 ){
-		self->ai = new AdjacencyIterator();
+		self->a_it = new AdjacencyIterator();
 		
 	} else if( BPy_AdjacencyIterator_Check(obj1) ) {
-		self->ai = new AdjacencyIterator(*( ((BPy_AdjacencyIterator *) obj1)->ai ));
+		self->a_it = new AdjacencyIterator(*( ((BPy_AdjacencyIterator *) obj1)->a_it ));
 	
 	} else if( BPy_ViewVertex_Check(obj1) ) {
 		bool restrictToSelection = ( obj2 && PyBool_Check(obj2) ) ? bool_from_PyBool(obj2) : true;
 		bool restrictToUnvisited = ( obj3 && PyBool_Check(obj3) ) ? bool_from_PyBool(obj3) : true;
 		
-		self->ai = new AdjacencyIterator( ((BPy_ViewVertex *) obj1)->vv, restrictToSelection, restrictToUnvisited );
+		self->a_it = new AdjacencyIterator( ((BPy_ViewVertex *) obj1)->vv, restrictToSelection, restrictToUnvisited );
 			
 	} else {
 		return -1;
 	}
 
-	self->py_it.it = self->ai;
+	self->py_it.it = self->a_it;
 	return 0;
 
 }
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.h
index 91319ff9c92..de0178f7725 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.h
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.h
@@ -20,7 +20,7 @@ extern PyTypeObject AdjacencyIterator_Type;
 /*---------------------------Python BPy_AdjacencyIterator structure definition----------*/
 typedef struct {
 	BPy_Iterator py_it;
-	AdjacencyIterator *ai;
+	AdjacencyIterator *a_it;
 } BPy_AdjacencyIterator;
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp
new file mode 100644
index 00000000000..00c77148396
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp
@@ -0,0 +1,165 @@
+#include "BPy_ChainPredicateIterator.h"
+
+#include "../BPy_Convert.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for ChainPredicateIterator instance  -----------*/
+static int ChainPredicateIterator___init__(BPy_ChainPredicateIterator *self, PyObject *args);
+
+static PyObject * ChainPredicateIterator_traverse( BPy_ViewEdgeIterator *self, PyObject *args );
+
+
+/*----------------------ChainPredicateIterator instance definitions ----------------------------*/
+static PyMethodDef BPy_ChainPredicateIterator_methods[] = {
+
+	{"traverse", ( PyCFunction ) ChainPredicateIterator_traverse, METH_VARARGS, "(AdjacencyIterator ai) This method iterates over the potential next ViewEdges and returns the one that will be followed next. Returns the next ViewEdge to follow or 0 when the end of the chain is reached. "},
+
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_ChainPredicateIterator type definition ------------------------------*/
+
+PyTypeObject ChainPredicateIterator_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"ChainPredicateIterator",				/* tp_name */
+	sizeof( BPy_ChainPredicateIterator ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_ChainPredicateIterator_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&ChainingIterator_Type,				/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)ChainPredicateIterator___init__,                       	/* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+// ChainPredicateIterator (bool iRestrictToSelection=true, bool iRestrictToUnvisited=true, ViewEdge *begin=NULL, bool orientation=true)
+//  	ChainPredicateIterator (UnaryPredicate1D &upred, BinaryPredicate1D &bpred, bool iRestrictToSelection=true, bool iRestrictToUnvisited=true, ViewEdge *begin=NULL, bool orientation=true)
+//  	ChainPredicateIterator (const ChainPredicateIterator &brother)
+
+int ChainPredicateIterator___init__(BPy_ChainPredicateIterator *self, PyObject *args )
+{	
+	PyObject *obj1 = 0, *obj2 = 0, *obj3 = 0, *obj4 = 0;
+
+	if (!( PyArg_ParseTuple(args, "O|OOOOO", &obj1, &obj2, &obj3, &obj4) ))
+	    return -1;
+
+	if( obj1 && BPy_ChainPredicateIterator_Check(obj1)  ) {
+		self->c_it = new ChainPredicateIterator(*( ((BPy_ChainPredicateIterator *) obj1)->c_it ));
+	
+	} else 	if( obj1 && BPy_ChainPredicateIterator_Check(obj1)  ) {
+			self->c_it = new ChainPredicateIterator(*( ((BPy_ChainPredicateIterator *) obj1)->c_it ));
+	
+	} else {
+		bool restrictToSelection = ( obj1 && PyBool_Check(obj1) ) ? bool_from_PyBool(obj1) : true;
+		bool restrictToUnvisited = ( obj2 && PyBool_Check(obj2) ) ? bool_from_PyBool(obj2) : true;
+		ViewEdge *begin = ( obj3 && BPy_ViewEdge_Check(obj3) ) ? ((BPy_ViewEdge *) obj3)->ve : 0;
+		bool orientation = ( obj4 && PyBool_Check(obj4) ) ? bool_from_PyBool(obj4) : true;
+		
+		self->c_it = new ChainPredicateIterator( restrictToSelection, restrictToUnvisited, begin, orientation);	
+	}
+	
+	self->py_ve_it.ve_it = self->c_it;
+	self->py_ve_it.py_it.it = self->c_it;
+	
+	return 0;
+}
+
+//virtual ViewEdge * 	traverse (const AdjacencyIterator &it)
+PyObject *ChainPredicateIterator_traverse( BPy_ViewEdgeIterator *self, PyObject *args ) {
+	PyObject *py_a_it;
+
+	if(!( PyArg_ParseTuple(args, "O", &py_a_it) && BPy_AdjacencyIterator_Check(py_a_it) )) {
+		cout << "ERROR: ChainPredicateIterator_traverse" << endl;
+		Py_RETURN_NONE;
+	}
+	
+	if( ((BPy_AdjacencyIterator *) py_a_it)->a_it )
+		self->ve_it->traverse(*( ((BPy_AdjacencyIterator *) py_a_it)->a_it ));
+		
+	Py_RETURN_NONE;
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.h
new file mode 100644
index 00000000000..7fa0a3e2703
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.h
@@ -0,0 +1,33 @@
+#ifndef FREESTYLE_PYTHON_CHAINPREDICATEITERATOR_H
+#define FREESTYLE_PYTHON_CHAINPREDICATEITERATOR_H
+
+
+#include "../../view_map/ChainingIterators.h"
+
+#include "BPy_ChainPredicateIterator.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject ChainPredicateIterator_Type;
+
+#define BPy_ChainPredicateIterator_Check(v)	(( (PyObject *) v)->ob_type == &ChainPredicateIterator_Type)
+
+/*---------------------------Python BPy_ChainPredicateIterator structure definition----------*/
+typedef struct {
+	ChainingIterator py_c_it;
+	ChainPredicateIterator *cp_it;
+} BPy_ChainPredicateIterator;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_CHAINPREDICATEITERATOR_H */
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingPredicateIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/Iterator/BPy_ChainingPredicateIterator.cpp
rename to source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp
index e69de29bb2d..c695e92ec70 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp
@@ -0,0 +1,182 @@
+#include "BPy_ChainingIterator.h"
+
+#include "../BPy_Convert.h"
+#include "../Interface0D/BPy_ViewVertex.h"
+#include "../Interface1D/BPy_ViewEdge.h"
+#include "BPy_AdjacencyIterator.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for ChainingIterator instance  -----------*/
+static int ChainingIterator___init__(BPy_ChainingIterator *self, PyObject *args);
+static PyObject * ChainingIterator_init( BPy_ChainingIterator *self );
+static PyObject * ChainingIterator_traverse( BPy_ChainingIterator *self, PyObject *args );
+static PyObject * ChainingIterator_getVertex( BPy_ChainingIterator *self );
+static PyObject * ChainingIterator_isIncrementing( BPy_ChainingIterator *self );
+
+/*----------------------ChainingIterator instance definitions ----------------------------*/
+static PyMethodDef BPy_ChainingIterator_methods[] = {
+	{"init", ( PyCFunction ) ChainingIterator_init, METH_NOARGS, "() Inits the iterator context. This method is called each time a new chain is started. It can be used to reset some history information that you might want to keep."},
+	{"traverse", ( PyCFunction ) ChainingIterator_traverse, METH_VARARGS, "(AdjacencyIterator ai) This method iterates over the potential next ViewEdges and returns the one that will be followed next. Returns the next ViewEdge to follow or 0 when the end of the chain is reached. "},
+	{"getVertex", ( PyCFunction ) ChainingIterator_getVertex, METH_NOARGS, "() Returns the vertex which is the next crossing "},
+	{"isIncrementing", ( PyCFunction ) ChainingIterator_isIncrementing, METH_NOARGS, "() Returns true if the current iteration is an incrementation."},
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_ChainingIterator type definition ------------------------------*/
+
+PyTypeObject ChainingIterator_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"ChainingIterator",				/* tp_name */
+	sizeof( BPy_ChainingIterator ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_ChainingIterator_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&ViewEdgeIterator_Type,				/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)ChainingIterator___init__,                       	/* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int ChainingIterator___init__(BPy_ChainingIterator *self, PyObject *args )
+{	
+	PyObject *obj1 = 0, *obj2 = 0, *obj3 = 0, *obj4 = 0;
+
+	if (!( PyArg_ParseTuple(args, "O|OOO", &obj1, &obj2, &obj3, &obj4) ))
+	    return -1;
+
+	if( obj1 && BPy_ChainingIterator_Check(obj1)  ) {
+		self->c_it = new ChainingIterator(*( ((BPy_ChainingIterator *) obj1)->c_it ));
+	
+	} else {
+		bool restrictToSelection = ( obj1 && PyBool_Check(obj1) ) ? bool_from_PyBool(obj1) : true;
+		bool restrictToUnvisited = ( obj2 && PyBool_Check(obj2) ) ? bool_from_PyBool(obj2) : true;
+		ViewEdge *begin = ( obj3 && BPy_ViewEdge_Check(obj3) ) ? ((BPy_ViewEdge *) obj3)->ve : 0;
+		bool orientation = ( obj4 && PyBool_Check(obj4) ) ? bool_from_PyBool(obj4) : true;
+		
+		self->c_it = new ChainingIterator( restrictToSelection, restrictToUnvisited, begin, orientation);	
+	}
+	
+	self->py_ve_it.ve_it = self->c_it;
+	self->py_ve_it.py_it.it = self->c_it;
+	
+	return 0;
+}
+
+PyObject *ChainingIterator_init( BPy_ChainingIterator *self ) {
+	self->c_it->init();
+	
+	Py_RETURN_NONE;
+}
+
+PyObject *ChainingIterator_traverse( BPy_ChainingIterator *self, PyObject *args ) {
+	PyObject *py_a_it;
+
+	if(!( PyArg_ParseTuple(args, "O", &py_a_it) && BPy_AdjacencyIterator_Check(py_a_it) )) {
+		cout << "ERROR: ChainingIterator_traverse" << endl;
+		Py_RETURN_NONE;
+	}
+	
+	if( ((BPy_AdjacencyIterator *) py_a_it)->a_it )
+		self->c_it->traverse(*( ((BPy_AdjacencyIterator *) py_a_it)->a_it ));
+		
+	Py_RETURN_NONE;
+}
+
+
+PyObject *ChainingIterator_getVertex( BPy_ChainingIterator *self ) {
+	if( self->c_it->getVertex() )
+		return BPy_ViewVertex_from_ViewVertex_ptr( self->c_it->getVertex()  );
+		
+	Py_RETURN_NONE;
+}
+
+PyObject *ChainingIterator_isIncrementing( BPy_ChainingIterator *self ) {
+	return PyBool_from_bool( self->c_it->isIncrementing() );
+}
+
+
+
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.h
new file mode 100644
index 00000000000..2994f381c1d
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.h
@@ -0,0 +1,33 @@
+#ifndef FREESTYLE_PYTHON_CHAININGITERATOR_H
+#define FREESTYLE_PYTHON_CHAININGITERATOR_H
+
+
+#include "../../stroke/ChainingIterators.h"
+
+#include "BPy_ViewEdgeIterator.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject ChainingIterator_Type;
+
+#define BPy_ChainingIterator_Check(v)	(( (PyObject *) v)->ob_type == &ChainingIterator_Type)
+
+/*---------------------------Python BPy_ChainingIterator structure definition----------*/
+typedef struct {
+	BPy_ViewEdgeIterator py_ve_it;
+	ChainingIterator *c_it;
+} BPy_ChainingIterator;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_CHAININGITERATOR_H */
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingSilhouetteIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingSilhouetteIterator.cpp
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp
index 2256d374c0c..add10cd1522 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp
@@ -3,6 +3,7 @@
 #include "../BPy_Convert.h"
 #include "../Interface1D/BPy_ViewEdge.h"
 
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -12,8 +13,23 @@ extern "C" {
 /*---------------  Python API function prototypes for ViewEdgeIterator instance  -----------*/
 static int ViewEdgeIterator___init__(BPy_ViewEdgeIterator *self, PyObject *args);
 
+static PyObject * ViewEdgeIterator_getCurrentEdge( BPy_ViewEdgeIterator *self );
+static PyObject * ViewEdgeIterator_setCurrentEdge( BPy_ViewEdgeIterator *self, PyObject *args );
+static PyObject * ViewEdgeIterator_getBegin( BPy_ViewEdgeIterator *self );
+static PyObject * ViewEdgeIterator_setBegin( BPy_ViewEdgeIterator *self, PyObject *args );
+static PyObject * ViewEdgeIterator_getOrientation( BPy_ViewEdgeIterator *self );
+static PyObject * ViewEdgeIterator_setOrientation( BPy_ViewEdgeIterator *self, PyObject *args );
+static PyObject * ViewEdgeIterator_changeOrientation( BPy_ViewEdgeIterator *self );
+
 /*----------------------ViewEdgeIterator instance definitions ----------------------------*/
 static PyMethodDef BPy_ViewEdgeIterator_methods[] = {
+	{"getCurrentEdge", ( PyCFunction ) ViewEdgeIterator_getCurrentEdge, METH_NOARGS, "() Returns the current pointed ViewEdge."},
+	{"setCurrentEdge", ( PyCFunction ) ViewEdgeIterator_setCurrentEdge, METH_VARARGS, "(ViewEdge ve) Sets the current pointed ViewEdge. "},	
+	{"getBegin", ( PyCFunction ) ViewEdgeIterator_getBegin, METH_NOARGS, "() Returns the first ViewEdge used for the iteration."},
+	{"setBegin", ( PyCFunction ) ViewEdgeIterator_setBegin, METH_VARARGS, "(ViewEdge ve) Sets the first ViewEdge used for the iteration."},
+	{"getOrientation", ( PyCFunction ) ViewEdgeIterator_getOrientation, METH_NOARGS, "() Gets the orientation of the pointed ViewEdge in the iteration. "},
+	{"setOrientation", ( PyCFunction ) ViewEdgeIterator_setOrientation, METH_VARARGS, "(bool b) Sets the orientation of the pointed ViewEdge in the iteration. "},
+	{"changeOrientation", ( PyCFunction ) ViewEdgeIterator_changeOrientation, METH_NOARGS, "() Changes the current orientation."},
 	{NULL, NULL, 0, NULL}
 };
 
@@ -102,9 +118,6 @@ PyTypeObject ViewEdgeIterator_Type = {
 	NULL
 };
 
-//-------------------MODULE INITIALIZATION--------------------------------
-
-
 //------------------------INSTANCE METHODS ----------------------------------
 
 int ViewEdgeIterator___init__(BPy_ViewEdgeIterator *self, PyObject *args )
@@ -131,18 +144,71 @@ int ViewEdgeIterator___init__(BPy_ViewEdgeIterator *self, PyObject *args )
 }
 
 
+PyObject *ViewEdgeIterator_getCurrentEdge( BPy_ViewEdgeIterator *self ) {
+	if( self->ve_it->getCurrentEdge() )
+		return BPy_ViewEdge_from_ViewEdge(*( self->ve_it->getCurrentEdge()  ));
+		
+	Py_RETURN_NONE;
+}
 
-// ViewEdge * 	getCurrentEdge ()
-// void 	setCurrentEdge (ViewEdge *edge)
-// ViewEdge * 	getBegin ()
-// bool 	getOrientation () const
+PyObject *ViewEdgeIterator_setCurrentEdge( BPy_ViewEdgeIterator *self, PyObject *args ) {
+	PyObject *py_ve;
+
+	if(!( PyArg_ParseTuple(args, "O", &py_ve) && BPy_ViewEdge_Check(py_ve) )) {
+		cout << "ERROR: ViewEdgeIterator_setCurrentEdge" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->ve_it->setCurrentEdge( ((BPy_ViewEdge *) py_ve)->ve );
+		
+	Py_RETURN_NONE;
+}
 
 
+PyObject *ViewEdgeIterator_getBegin( BPy_ViewEdgeIterator *self ) {
+	if( self->ve_it->getBegin() )
+		return BPy_ViewEdge_from_ViewEdge(*( self->ve_it->getBegin()  ));
+		
+	Py_RETURN_NONE;
+}
+
+PyObject *ViewEdgeIterator_setBegin( BPy_ViewEdgeIterator *self, PyObject *args ) {
+	PyObject *py_ve;
+
+	if(!( PyArg_ParseTuple(args, "O", &py_ve) && BPy_ViewEdge_Check(py_ve) )) {
+		cout << "ERROR: ViewEdgeIterator_setBegin" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->ve_it->setBegin( ((BPy_ViewEdge *) py_ve)->ve );
+		
+	Py_RETURN_NONE;
+}
+
+PyObject *ViewEdgeIterator_getOrientation( BPy_ViewEdgeIterator *self ) {
+	return PyBool_from_bool( self->ve_it->getOrientation() );
+}
+
+PyObject *ViewEdgeIterator_setOrientation( BPy_ViewEdgeIterator *self, PyObject *args ) {
+	PyObject *py_b;
+
+	if(!( PyArg_ParseTuple(args, "O", &py_b) && PyBool_Check(py_b) )) {
+		cout << "ERROR: ViewEdgeIterator_setOrientation" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->ve_it->setOrientation( bool_from_PyBool(py_b) );
+		
+	Py_RETURN_NONE;
+}
+
+PyObject *ViewEdgeIterator_changeOrientation( BPy_ViewEdgeIterator *self ) {
+	self->ve_it->changeOrientation();
+	
+	Py_RETURN_NONE;
+}
+
 
-// void 	setCurrentEdge (ViewEdge *edge)
-// void 	setBegin (ViewEdge *begin)
-// void 	setOrientation (bool orientation)
-// void 	changeOrientation ()
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 

From 6531d859ba4f61d6741b0e06bff07d07b3231910 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Sat, 26 Jul 2008 20:02:10 +0000
Subject: [PATCH 145/252] TextPlugin update: Converted try-except blocks to use
 try-catch-else to allow better error tracking. Commented the descriptor
 classes and improved variable support for basic types (string, list, etc.)

---
 release/scripts/bpymodules/BPyTextPlugin.py | 60 +++++++++++++--------
 release/scripts/textplugin_functiondocs.py  |  3 +-
 release/scripts/textplugin_imports.py       |  6 +--
 release/scripts/textplugin_membersuggest.py | 39 ++++++++++----
 release/scripts/textplugin_outliner.py      |  3 +-
 release/scripts/textplugin_suggest.py       |  3 +-
 6 files changed, 76 insertions(+), 38 deletions(-)

diff --git a/release/scripts/bpymodules/BPyTextPlugin.py b/release/scripts/bpymodules/BPyTextPlugin.py
index e39d67aacee..5143229f829 100644
--- a/release/scripts/bpymodules/BPyTextPlugin.py
+++ b/release/scripts/bpymodules/BPyTextPlugin.py
@@ -2,9 +2,15 @@ import bpy, sys
 import __builtin__, tokenize
 from Blender.sys import time
 from tokenize import generate_tokens, TokenError, \
-		COMMENT, DEDENT, INDENT, NAME, NEWLINE, NL
+		COMMENT, DEDENT, INDENT, NAME, NEWLINE, NL, STRING
 
 class ScriptDesc():
+	"""Describes a script through lists of further descriptor objects (classes,
+	defs, vars) and dictionaries to built-in types (imports). If a script has
+	not been fully parsed, its incomplete flag will be set. The time of the last
+	parse is held by the time field and the name of the text object from which
+	it was parsed, the name field.
+	"""
 	
 	def __init__(self, name, imports, classes, defs, vars, incomplete=False):
 		self.name = name
@@ -19,6 +25,10 @@ class ScriptDesc():
 		self.time = time()
 
 class ClassDesc():
+	"""Describes a class through lists of further descriptor objects (defs and
+	vars). The name of the class is held by the name field and the line on
+	which it is defined is held in lineno.
+	"""
 	
 	def __init__(self, name, defs, vars, lineno):
 		self.name = name
@@ -27,6 +37,9 @@ class ClassDesc():
 		self.lineno = lineno
 
 class FunctionDesc():
+	"""Describes a function through its name and list of parameters (name,
+	params) and the line on which it is defined (lineno).
+	"""
 	
 	def __init__(self, name, params, lineno):
 		self.name = name
@@ -34,6 +47,10 @@ class FunctionDesc():
 		self.lineno = lineno
 
 class VarDesc():
+	"""Describes a variable through its name and type (if ascertainable) and the
+	line on which it is defined (lineno). If no type can be determined, type
+	will equal None.
+	"""
 	
 	def __init__(self, name, type, lineno):
 		self.name = name
@@ -47,7 +64,7 @@ CTX_SINGLE_QUOTE = 1
 CTX_DOUBLE_QUOTE = 2
 CTX_COMMENT = 3
 
-# Special period constants
+# Special time period constants
 AUTO = -1
 
 # Python keywords
@@ -84,20 +101,15 @@ def get_cached_descriptor(txt, period=AUTO):
 			r = r << 1
 		period = r
 	
-	key = hash(txt)
 	parse = True
+	key = hash(txt)
 	if _parse_cache.has_key(key):
 		desc = _parse_cache[key]
 		if desc.time >= time() - period:
 			parse = desc.incomplete
 	
 	if parse:
-		try:
-			desc = parse_text(txt)
-		except:
-			if _parse_cache.has_key(key):
-				del _parse_cache[key]
-			desc = NoneScriptDesc
+		desc = parse_text(txt)
 	
 	return desc
 
@@ -138,8 +150,14 @@ def parse_text(txt):
 	prev_string = ''
 	incomplete = False
 	
-	try:
-	 for type, string, start, end, line in tokens:
+	while True:
+		try:
+			type, string, start, end, line = tokens.next()
+		except StopIteration:
+			break
+		except TokenError:
+			incomplete = True
+			break
 		
 		# Skip all comments and line joining characters
 		if type == COMMENT or type == NL:
@@ -215,14 +233,16 @@ def parse_text(txt):
 						module = get_module(imp_from +'.'+ imp_name)
 					else:
 						module = get_module(imp_name)
-					imports[imp_symb] = module
 				except (ImportError, ValueError, AttributeError, TypeError):
 					# Try importing name as an attribute of the parent
 					try:
 						module = __import__(imp_from, globals(), locals(), [imp_name])
-						imports[imp_symb] = getattr(module, imp_name)
 					except (ImportError, ValueError, AttributeError, TypeError):
 						pass
+					else:
+						imports[imp_symb] = getattr(module, imp_name)
+				else:
+					imports[imp_symb] = module
 			
 			# More to import from the same module?
 			if string == ',':
@@ -337,8 +357,8 @@ def parse_text(txt):
 				if string == '[':
 					close = line.find(']', end[1])
 					var_type = list
-				elif string == '"' or string == '"':
-					close = line.find(string, end[1])
+				elif type == STRING:
+					close = end[1]
 					var_type = str
 				elif string == '(':
 					close = line.find(')', end[1])
@@ -389,9 +409,9 @@ def parse_text(txt):
 					var_name = var_accum.keys()[0]
 					var_type = None
 					if string == '[': var_type = list
-					elif string == '"' or string == '"': var_type = string
+					elif type == STRING: var_type = str
 					elif string == '(': var_type = tuple
-					elif string == 'dict': var_type = dict
+					elif string == '{': var_type = dict
 					vars[var_name] = VarDesc(var_name, var_type, start[0])
 				var3_step = 0
 		
@@ -402,12 +422,6 @@ def parse_text(txt):
 		prev_type = type
 		prev_string = string
 	
-	 # end:for
-	
-	except TokenError:
-		incomplete = True
-		pass
-	
 	desc = ScriptDesc(txt.name, imports, classes, defs, vars, incomplete)
 	desc.set_time()
 	
diff --git a/release/scripts/textplugin_functiondocs.py b/release/scripts/textplugin_functiondocs.py
index acb1fdd6141..7456f7236da 100644
--- a/release/scripts/textplugin_functiondocs.py
+++ b/release/scripts/textplugin_functiondocs.py
@@ -11,9 +11,10 @@ Tooltip: 'Attempts to display documentation about the function preceding the cur
 try:
 	import bpy
 	from BPyTextPlugin import *
-	OK = True
 except ImportError:
 	OK = False
+else:
+	OK = True
 
 def main():
 	txt = bpy.data.texts.active
diff --git a/release/scripts/textplugin_imports.py b/release/scripts/textplugin_imports.py
index dd98ab7a26e..16d27ac1004 100644
--- a/release/scripts/textplugin_imports.py
+++ b/release/scripts/textplugin_imports.py
@@ -8,13 +8,13 @@ Tooltip: 'Lists modules when import or from is typed'
 """
 
 # Only run if we have the required modules
-OK = False
 try:
 	import bpy, sys
 	from BPyTextPlugin import *
-	OK = True
 except ImportError:
-	pass
+	OK = False
+else:
+	OK = True
 
 def main():
 	txt = bpy.data.texts.active
diff --git a/release/scripts/textplugin_membersuggest.py b/release/scripts/textplugin_membersuggest.py
index a1cb510826f..63ade4b660b 100644
--- a/release/scripts/textplugin_membersuggest.py
+++ b/release/scripts/textplugin_membersuggest.py
@@ -11,9 +11,10 @@ Tooltip: 'Lists members of the object preceding the cursor in the current text s
 try:
 	import bpy
 	from BPyTextPlugin import *
-	OK = True
 except ImportError:
 	OK = False
+else:
+	OK = True
 
 def main():
 	txt = bpy.data.texts.active
@@ -36,7 +37,25 @@ def main():
 	
 	# Identify the root (root.sub.sub.)
 	obj = None
-	if imports.has_key(pre[0]):
+	if pre[0] == '':
+		i = c - len('.'.join(pre)) - 1
+		if i >= 0:
+			if line[i] == '"' or line[i] == "'":
+				obj = str
+			elif line[i] == '}':
+				obj = dict
+			elif line[i] == ']': # Could be array elem x[y] or list [y]
+				i = line.rfind('[', 0, i) - 1
+				while i >= 0:
+					if line[i].isalnum() or line[i] == '_':
+						break
+					elif line[i] != ' ' and line[i] != '\t':
+						i = -1
+						break
+					i -= 1
+				if i < 0: 
+					obj = list
+	elif imports.has_key(pre[0]):
 		obj = imports[pre[0]]
 	elif builtins.has_key(pre[0]):
 		obj = builtins[pre[0]]
@@ -58,22 +77,24 @@ def main():
 	
 	try:
 		attr = obj.__dict__.keys()
-		if not attr:
-			attr = dir(obj)
 	except AttributeError:
 		attr = dir(obj)
+	else:
+		if not attr:
+			attr = dir(obj)
 	
-	list = []
+	items = []
 	for k in attr:
 		try:
 			v = getattr(obj, k)
-			list.append((k, type_char(v)))
 		except (AttributeError, TypeError): # Some attributes are not readable
 			pass
+		else:
+			items.append((k, type_char(v)))
 	
-	if list != []:
-		list.sort(cmp = suggest_cmp)
-		txt.suggest(list, pre[-1])
+	if items != []:
+		items.sort(cmp = suggest_cmp)
+		txt.suggest(items, pre[-1])
 
 # Check we are running as a script and not imported as a module
 if __name__ == "__main__" and OK:
diff --git a/release/scripts/textplugin_outliner.py b/release/scripts/textplugin_outliner.py
index 6dbb86e3b67..0dbdb624dc5 100644
--- a/release/scripts/textplugin_outliner.py
+++ b/release/scripts/textplugin_outliner.py
@@ -12,9 +12,10 @@ try:
 	import bpy
 	from BPyTextPlugin import *
 	from Blender import Draw
-	OK = True
 except ImportError:
 	OK = False
+else:
+	OK = True
 
 def make_menu(items, eventoffs):
 	n = len(items)
diff --git a/release/scripts/textplugin_suggest.py b/release/scripts/textplugin_suggest.py
index f39e2db1f7f..c2a12ac15f5 100644
--- a/release/scripts/textplugin_suggest.py
+++ b/release/scripts/textplugin_suggest.py
@@ -11,9 +11,10 @@ Tooltip: 'Performs suggestions based on the context of the cursor'
 try:
 	import bpy
 	from BPyTextPlugin import *
-	OK = True
 except ImportError:
 	OK = False
+else:
+	OK = True
 
 def check_membersuggest(line, c):
 	pos = line.rfind('.', 0, c)

From 5718639a79b51241f348eb241d2379ade06cd787 Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Sat, 26 Jul 2008 20:05:55 +0000
Subject: [PATCH 146/252] soc-2008-mxcurioni: implemented (but did not test)
 ChainPredicateIterator and ChainSilhouetteIterator

---
 source/blender/freestyle/SConscript           |   7 +
 .../freestyle/intern/python/BPy_Iterator.cpp  |  22 +--
 .../Iterator/BPy_ChainPredicateIterator.cpp   |  55 +++----
 .../Iterator/BPy_ChainPredicateIterator.h     |   6 +-
 .../Iterator/BPy_ChainSilhouetteIterator.cpp  | 141 ++++++++++++++++++
 .../Iterator/BPy_ChainSilhouetteIterator.h    |  33 ++++
 6 files changed, 217 insertions(+), 47 deletions(-)
 create mode 100644 source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.h

diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript
index 6bbf5c9ca4b..684c398c8bc 100644
--- a/source/blender/freestyle/SConscript
+++ b/source/blender/freestyle/SConscript
@@ -65,6 +65,7 @@ python_sources = [
 					prefix + '/BPy_BBox.cpp',
 					prefix + '/BPy_BinaryPredicate0D.cpp',
 					prefix + '/BPy_BinaryPredicate1D.cpp',
+					prefix + '/BPy_FrsMaterial.cpp',
 					prefix + '/BPy_Id.cpp',
 					prefix + '/BPy_IntegrationType.cpp',
 					prefix + '/BPy_Interface0D.cpp',
@@ -76,7 +77,10 @@ python_sources = [
 						prefix + '/Interface0D/ViewVertex/BPy_TVertex.cpp',
 					prefix + '/BPy_Interface1D.cpp',
 						prefix + '/Interface1D/BPy_Curve.cpp',
+						prefix + '/Interface1D/Curve/BPy_Chain.cpp',
 						prefix + '/Interface1D/BPy_FEdge.cpp',
+						prefix + '/Interface1D/FEdge/BPy_FEdgeSharp.cpp',
+						prefix + '/Interface1D/FEdge/BPy_FEdgeSmooth.cpp',
 						prefix + '/Interface1D/BPy_Stroke.cpp',
 						prefix + '/Interface1D/BPy_ViewEdge.cpp',
 					prefix + '/BPy_Iterator.cpp',
@@ -87,6 +91,9 @@ python_sources = [
 						prefix + '/Iterator/BPy_SVertexIterator.cpp',
 						prefix + '/Iterator/BPy_orientedViewEdgeIterator.cpp',
 						prefix + '/Iterator/BPy_ViewEdgeIterator.cpp',
+						prefix + '/Iterator/BPy_ChainingIterator.cpp',
+						prefix + '/Iterator/BPy_ChainPredicateIterator.cpp',
+						prefix + '/Iterator/BPy_ChainSilhouetteIterator.cpp',
 					prefix + '/BPy_MediumType.cpp',
 					prefix + '/BPy_Nature.cpp',
 					prefix + '/BPy_SShape.cpp',
diff --git a/source/blender/freestyle/intern/python/BPy_Iterator.cpp b/source/blender/freestyle/intern/python/BPy_Iterator.cpp
index f3612b1bd52..b946e0a9a9a 100644
--- a/source/blender/freestyle/intern/python/BPy_Iterator.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Iterator.cpp
@@ -9,8 +9,8 @@
 #include "Iterator/BPy_orientedViewEdgeIterator.h"
 #include "Iterator/BPy_ViewEdgeIterator.h"
 #include "Iterator/BPy_ChainingIterator.h"
-// #include "Iterator/BPy_ChainPredicateIterator.h"
-// #include "Iterator/BPy_ChainSilhouetteIterator.h"
+#include "Iterator/BPy_ChainPredicateIterator.h"
+#include "Iterator/BPy_ChainSilhouetteIterator.h"
 
 
 	
@@ -176,15 +176,15 @@ PyMODINIT_FUNC Iterator_Init( PyObject *module )
 	Py_INCREF( &ChainingIterator_Type );
 	PyModule_AddObject(module, "ChainingIterator", (PyObject *)&ChainingIterator_Type);
 	
-	// if( PyType_Ready( &ChainPredicateIterator_Type ) < 0 )
-	// 	return;
-	// Py_INCREF( &ChainPredicateIterator_Type );
-	// PyModule_AddObject(module, "ChainPredicateIterator", (PyObject *)&ChainPredicateIterator_Type);
-	// 
-	// if( PyType_Ready( &ChainSilhouetteIterator_Type ) < 0 )
-	// 	return;
-	// Py_INCREF( &ChainSilhouetteIterator_Type );
-	// PyModule_AddObject(module, "ChainSilhouetteIterator", (PyObject *)&ChainSilhouetteIterator_Type);
+	if( PyType_Ready( &ChainPredicateIterator_Type ) < 0 )
+		return;
+	Py_INCREF( &ChainPredicateIterator_Type );
+	PyModule_AddObject(module, "ChainPredicateIterator", (PyObject *)&ChainPredicateIterator_Type);
+	
+	if( PyType_Ready( &ChainSilhouetteIterator_Type ) < 0 )
+		return;
+	Py_INCREF( &ChainSilhouetteIterator_Type );
+	PyModule_AddObject(module, "ChainSilhouetteIterator", (PyObject *)&ChainSilhouetteIterator_Type);
 	
 	
 }
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp
index 00c77148396..c5ff61e239f 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp
@@ -1,7 +1,9 @@
 #include "BPy_ChainPredicateIterator.h"
 
 #include "../BPy_Convert.h"
-
+#include "../BPy_BinaryPredicate1D.h"
+#include "../Interface1D/BPy_ViewEdge.h"
+#include "../BPy_UnaryPredicate1D.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -12,14 +14,9 @@ extern "C" {
 /*---------------  Python API function prototypes for ChainPredicateIterator instance  -----------*/
 static int ChainPredicateIterator___init__(BPy_ChainPredicateIterator *self, PyObject *args);
 
-static PyObject * ChainPredicateIterator_traverse( BPy_ViewEdgeIterator *self, PyObject *args );
-
-
 /*----------------------ChainPredicateIterator instance definitions ----------------------------*/
 static PyMethodDef BPy_ChainPredicateIterator_methods[] = {
 
-	{"traverse", ( PyCFunction ) ChainPredicateIterator_traverse, METH_VARARGS, "(AdjacencyIterator ai) This method iterates over the potential next ViewEdges and returns the one that will be followed next. Returns the next ViewEdge to follow or 0 when the end of the chain is reached. "},
-
 	{NULL, NULL, 0, NULL}
 };
 
@@ -110,22 +107,27 @@ PyTypeObject ChainPredicateIterator_Type = {
 
 //------------------------INSTANCE METHODS ----------------------------------
 
-// ChainPredicateIterator (bool iRestrictToSelection=true, bool iRestrictToUnvisited=true, ViewEdge *begin=NULL, bool orientation=true)
-//  	ChainPredicateIterator (UnaryPredicate1D &upred, BinaryPredicate1D &bpred, bool iRestrictToSelection=true, bool iRestrictToUnvisited=true, ViewEdge *begin=NULL, bool orientation=true)
-//  	ChainPredicateIterator (const ChainPredicateIterator &brother)
-
 int ChainPredicateIterator___init__(BPy_ChainPredicateIterator *self, PyObject *args )
 {	
-	PyObject *obj1 = 0, *obj2 = 0, *obj3 = 0, *obj4 = 0;
+	PyObject *obj1 = 0, *obj2 = 0, *obj3 = 0, *obj4 = 0, *obj5 = 0, *obj6 = 0;
 
-	if (!( PyArg_ParseTuple(args, "O|OOOOO", &obj1, &obj2, &obj3, &obj4) ))
+	if (!( PyArg_ParseTuple(args, "O|OOOOO", &obj1, &obj2, &obj3, &obj4, &obj5, &obj6) ))
 	    return -1;
 
-	if( obj1 && BPy_ChainPredicateIterator_Check(obj1)  ) {
-		self->c_it = new ChainPredicateIterator(*( ((BPy_ChainPredicateIterator *) obj1)->c_it ));
+	if( obj1 && BPy_ChainPredicateIterator_Check(obj1)  ) { 
+		self->cp_it = new ChainPredicateIterator(*( ((BPy_ChainPredicateIterator *) obj1)->cp_it ));
 	
-	} else 	if( obj1 && BPy_ChainPredicateIterator_Check(obj1)  ) {
-			self->c_it = new ChainPredicateIterator(*( ((BPy_ChainPredicateIterator *) obj1)->c_it ));
+	} else if( 	obj1 && BPy_UnaryPredicate1D_Check(obj1) && ((BPy_UnaryPredicate1D *) obj1)->up1D &&
+	  			obj2 && BPy_BinaryPredicate1D_Check(obj2) && ((BPy_BinaryPredicate1D *) obj2)->bp1D	) {
+				
+		UnaryPredicate1D *up1D = ((BPy_UnaryPredicate1D *) obj1)->up1D;
+		BinaryPredicate1D *bp1D = ((BPy_BinaryPredicate1D *) obj2)->bp1D;
+		bool restrictToSelection = ( obj3 && PyBool_Check(obj3) ) ? bool_from_PyBool(obj3) : true;
+		bool restrictToUnvisited = ( obj4 && PyBool_Check(obj4) ) ? bool_from_PyBool(obj4) : true;
+		ViewEdge *begin = ( obj5 && BPy_ViewEdge_Check(obj5) ) ? ((BPy_ViewEdge *) obj5)->ve : 0;
+		bool orientation = ( obj6 && PyBool_Check(obj6) ) ? bool_from_PyBool(obj6) : true;
+	
+		self->cp_it = new ChainPredicateIterator( *up1D, *bp1D, restrictToSelection, restrictToUnvisited, begin, orientation);
 	
 	} else {
 		bool restrictToSelection = ( obj1 && PyBool_Check(obj1) ) ? bool_from_PyBool(obj1) : true;
@@ -133,28 +135,15 @@ int ChainPredicateIterator___init__(BPy_ChainPredicateIterator *self, PyObject *
 		ViewEdge *begin = ( obj3 && BPy_ViewEdge_Check(obj3) ) ? ((BPy_ViewEdge *) obj3)->ve : 0;
 		bool orientation = ( obj4 && PyBool_Check(obj4) ) ? bool_from_PyBool(obj4) : true;
 		
-		self->c_it = new ChainPredicateIterator( restrictToSelection, restrictToUnvisited, begin, orientation);	
+		self->cp_it = new ChainPredicateIterator( restrictToSelection, restrictToUnvisited, begin, orientation);	
 	}
 	
-	self->py_ve_it.ve_it = self->c_it;
-	self->py_ve_it.py_it.it = self->c_it;
+	self->py_c_it.c_it = self->cp_it;
+	self->py_c_it.py_ve_it.ve_it = self->cp_it;
+	self->py_c_it.py_ve_it.py_it.it = self->cp_it;
 	
 	return 0;
-}
-
-//virtual ViewEdge * 	traverse (const AdjacencyIterator &it)
-PyObject *ChainPredicateIterator_traverse( BPy_ViewEdgeIterator *self, PyObject *args ) {
-	PyObject *py_a_it;
-
-	if(!( PyArg_ParseTuple(args, "O", &py_a_it) && BPy_AdjacencyIterator_Check(py_a_it) )) {
-		cout << "ERROR: ChainPredicateIterator_traverse" << endl;
-		Py_RETURN_NONE;
-	}
 	
-	if( ((BPy_AdjacencyIterator *) py_a_it)->a_it )
-		self->ve_it->traverse(*( ((BPy_AdjacencyIterator *) py_a_it)->a_it ));
-		
-	Py_RETURN_NONE;
 }
 
 
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.h
index 7fa0a3e2703..c5d32fb01f3 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.h
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.h
@@ -2,9 +2,9 @@
 #define FREESTYLE_PYTHON_CHAINPREDICATEITERATOR_H
 
 
-#include "../../view_map/ChainingIterators.h"
+#include "../../stroke/ChainingIterators.h"
 
-#include "BPy_ChainPredicateIterator.h"
+#include "BPy_ChainingIterator.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -20,7 +20,7 @@ extern PyTypeObject ChainPredicateIterator_Type;
 
 /*---------------------------Python BPy_ChainPredicateIterator structure definition----------*/
 typedef struct {
-	ChainingIterator py_c_it;
+	BPy_ChainingIterator py_c_it;
 	ChainPredicateIterator *cp_it;
 } BPy_ChainPredicateIterator;
 
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp
index e69de29bb2d..75526507493 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp
@@ -0,0 +1,141 @@
+#include "BPy_ChainSilhouetteIterator.h"
+
+#include "../BPy_Convert.h"
+#include "../Interface1D/BPy_ViewEdge.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for ChainSilhouetteIterator instance  -----------*/
+static int ChainSilhouetteIterator___init__(BPy_ChainSilhouetteIterator *self, PyObject *args);
+
+/*----------------------ChainSilhouetteIterator instance definitions ----------------------------*/
+static PyMethodDef BPy_ChainSilhouetteIterator_methods[] = {
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_ChainSilhouetteIterator type definition ------------------------------*/
+
+PyTypeObject ChainSilhouetteIterator_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"ChainSilhouetteIterator",				/* tp_name */
+	sizeof( BPy_ChainSilhouetteIterator ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_ChainSilhouetteIterator_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&ChainingIterator_Type,				/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)ChainSilhouetteIterator___init__,                       	/* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+// ChainSilhouetteIterator (bool iRestrictToSelection=true, ViewEdge *begin=NULL, bool orientation=true)
+//  	ChainSilhouetteIterator (const ChainSilhouetteIterator &brother)
+
+int ChainSilhouetteIterator___init__(BPy_ChainSilhouetteIterator *self, PyObject *args )
+{	
+	PyObject *obj1 = 0, *obj2 = 0, *obj3 = 0;
+
+	if (!( PyArg_ParseTuple(args, "O|OO", &obj1, &obj2, &obj3) ))
+	    return -1;
+
+	if( obj1 && BPy_ChainSilhouetteIterator_Check(obj1)  ) { 
+		self->cs_it = new ChainSilhouetteIterator(*( ((BPy_ChainSilhouetteIterator *) obj1)->cs_it ));
+	
+	} else {
+		bool restrictToSelection = ( obj1 && PyBool_Check(obj1) ) ? bool_from_PyBool(obj1) : true;
+		ViewEdge *begin = ( obj2 && BPy_ViewEdge_Check(obj2) ) ? ((BPy_ViewEdge *) obj2)->ve : 0;
+		bool orientation = ( obj3 && PyBool_Check(obj3) ) ? bool_from_PyBool(obj3) : true;
+		
+		self->cs_it = new ChainSilhouetteIterator( restrictToSelection, begin, orientation);	
+	}
+	
+	self->py_c_it.c_it = self->cs_it;
+	self->py_c_it.py_ve_it.ve_it = self->cs_it;
+	self->py_c_it.py_ve_it.py_it.it = self->cs_it;
+	
+	return 0;
+	
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.h
new file mode 100644
index 00000000000..7e6feb00910
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.h
@@ -0,0 +1,33 @@
+#ifndef FREESTYLE_PYTHON_CHAINSILHOUETTEITERATOR_H
+#define FREESTYLE_PYTHON_CHAINSILHOUETTEITERATOR_H
+
+
+#include "../../stroke/ChainingIterators.h"
+
+#include "BPy_ChainingIterator.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject ChainSilhouetteIterator_Type;
+
+#define BPy_ChainSilhouetteIterator_Check(v)	(( (PyObject *) v)->ob_type == &ChainSilhouetteIterator_Type)
+
+/*---------------------------Python BPy_ChainSilhouetteIterator structure definition----------*/
+typedef struct {
+	BPy_ChainingIterator py_c_it;
+	ChainSilhouetteIterator *cs_it;
+} BPy_ChainSilhouetteIterator;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_CHAINSILHOUETTEITERATOR_H */

From 0c64c49d2f930aed4ef310c2331bc3df0932cbe2 Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Sat, 26 Jul 2008 21:47:39 +0000
Subject: [PATCH 147/252] soc-2008-mxcurioni: added (but did not test) ViewMap
 and Noise classes. Updated ViewShape class accordingly

---
 source/blender/freestyle/SConscript           |   2 +
 .../intern/app_blender/Controller.cpp         |   4 +-
 .../freestyle/intern/python/BPy_Freestyle.cpp |   9 +-
 .../freestyle/intern/python/BPy_Noise.cpp     | 267 +++++++++++++---
 .../freestyle/intern/python/BPy_Noise.h       |  36 +++
 .../freestyle/intern/python/BPy_ViewMap.cpp   | 299 ++++++++++++------
 .../freestyle/intern/python/BPy_ViewMap.h     |  34 ++
 .../freestyle/intern/python/BPy_ViewShape.cpp |  22 +-
 .../freestyle/intern/view_map/ViewMap.cpp     |   4 +-
 .../freestyle/intern/view_map/ViewMap.h       |   4 +-
 10 files changed, 530 insertions(+), 151 deletions(-)
 create mode 100644 source/blender/freestyle/intern/python/BPy_Noise.h
 create mode 100644 source/blender/freestyle/intern/python/BPy_ViewMap.h

diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript
index 684c398c8bc..88d4763affa 100644
--- a/source/blender/freestyle/SConscript
+++ b/source/blender/freestyle/SConscript
@@ -96,6 +96,7 @@ python_sources = [
 						prefix + '/Iterator/BPy_ChainSilhouetteIterator.cpp',
 					prefix + '/BPy_MediumType.cpp',
 					prefix + '/BPy_Nature.cpp',
+					prefix + '/BPy_Noise.cpp',
 					prefix + '/BPy_SShape.cpp',
 					prefix + '/BPy_StrokeAttribute.cpp',
 					prefix + '/BPy_StrokeShader.cpp',
@@ -103,6 +104,7 @@ python_sources = [
 					prefix + '/BPy_UnaryFunction1D.cpp',
 					prefix + '/BPy_UnaryPredicate0D.cpp',
 					prefix + '/BPy_UnaryPredicate1D.cpp',
+					prefix + '/BPy_ViewMap.cpp',
 					prefix + '/BPy_ViewShape.cpp'
 				]
 
diff --git a/source/blender/freestyle/intern/app_blender/Controller.cpp b/source/blender/freestyle/intern/app_blender/Controller.cpp
index e2cc25c4b10..ff6ca96e657 100755
--- a/source/blender/freestyle/intern/app_blender/Controller.cpp
+++ b/source/blender/freestyle/intern/app_blender/Controller.cpp
@@ -930,7 +930,7 @@ FEdge* Controller::SelectFEdge(real x, real y)
   if (!_ViewMap)
     return NULL;
 
-  FEdge *fedge = (FEdge*)_ViewMap->GetClosestFEdge(x,y);
+  FEdge *fedge = (FEdge*)_ViewMap->getClosestFEdge(x,y);
   //ViewEdge *selection = fedge->viewedge();
   _pView->setSelectedFEdge(fedge);
   _Canvas->setSelectedFEdge(fedge);
@@ -942,7 +942,7 @@ ViewEdge* Controller::SelectViewEdge(real x, real y)
   if (!_ViewMap)
     return NULL;
 
-  FEdge *fedge = (FEdge*)_ViewMap->GetClosestFEdge(x,y);
+  FEdge *fedge = (FEdge*)_ViewMap->getClosestFEdge(x,y);
   ViewEdge *selection = fedge->viewedge();
   _pView->setSelectedFEdge(fedge);
   _Canvas->setSelectedFEdge(fedge);
diff --git a/source/blender/freestyle/intern/python/BPy_Freestyle.cpp b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
index 13164d0a153..ed35a85068b 100644
--- a/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
@@ -7,11 +7,11 @@
 #include "BPy_Id.h"
 #include "BPy_IntegrationType.h"
 #include "BPy_Interface0D.h"
-#include "BPy_Iterator.h"
-#include "Interface0D/BPy_CurvePoint.h"
 #include "BPy_Interface1D.h"
+#include "BPy_Iterator.h"
 #include "BPy_MediumType.h"
 #include "BPy_Nature.h"
+#include "BPy_Noise.h"
 #include "BPy_SShape.h"
 #include "BPy_StrokeAttribute.h"
 #include "BPy_StrokeShader.h"
@@ -19,6 +19,7 @@
 #include "BPy_UnaryFunction1D.h"
 #include "BPy_UnaryPredicate0D.h"
 #include "BPy_UnaryPredicate1D.h"
+#include "BPy_ViewMap.h"
 #include "BPy_ViewShape.h"
 
 
@@ -151,6 +152,7 @@ PyObject *Freestyle_Init( void )
 	Interface0D_Init( module );
 	Interface1D_Init( module );
 	Iterator_Init( module );
+	Noise_Init( module );
 	SShape_Init( module );
 	StrokeAttribute_Init( module );
 	StrokeShader_Init( module );
@@ -158,8 +160,9 @@ PyObject *Freestyle_Init( void )
 	UnaryFunction1D_Init( module );
 	UnaryPredicate0D_Init( module );
 	UnaryPredicate1D_Init( module );
+	ViewMap_Init( module );
 	ViewShape_Init( module );
-	
+
 	return module;
 }
 
diff --git a/source/blender/freestyle/intern/python/BPy_Noise.cpp b/source/blender/freestyle/intern/python/BPy_Noise.cpp
index 8e6b7aa5022..f8d5d6b066d 100644
--- a/source/blender/freestyle/intern/python/BPy_Noise.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Noise.cpp
@@ -1,48 +1,239 @@
- PyObject *_wrap_Noise_turbulence1__SWIG_0(PyObject *self , PyObject *args) {
+#include "BPy_Noise.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for Noise instance  -----------*/
+static int Noise___init__(BPy_Noise *self, PyObject *args, PyObject *kwds);
+static void Noise___dealloc__(BPy_Noise *self);
+static PyObject * Noise___repr__(BPy_Noise *self);
+
+static PyObject * Noise_turbulence1( BPy_Noise *self, PyObject *args);
+static PyObject * Noise_turbulence2( BPy_Noise *self, PyObject *args);
+static PyObject * Noise_turbulence3( BPy_Noise *self, PyObject *args);
+static PyObject * Noise_smoothNoise1( BPy_Noise *self, PyObject *args);
+static PyObject * Noise_smoothNoise2( BPy_Noise *self, PyObject *args);
+static PyObject * Noise_smoothNoise3( BPy_Noise *self, PyObject *args);
+
+/*----------------------Noise instance definitions ----------------------------*/
+static PyMethodDef BPy_Noise_methods[] = {
+	{"turbulence1", ( PyCFunction ) Noise_turbulence1, METH_VARARGS, "(float arg, float freq, float amp, unsigned oct=4)）Returns a noise value for a 1D element"},
+	{"turbulence2", ( PyCFunction ) Noise_turbulence2, METH_VARARGS, "([x, y], float freq, float amp, unsigned oct=4)））Returns a noise value for a 2D element"},
+	{"turbulence3", ( PyCFunction ) Noise_turbulence3, METH_VARARGS, "([x, y, z], float freq, float amp, unsigned oct=4)））Returns a noise value for a 3D element"},
+	{"smoothNoise1", ( PyCFunction ) Noise_smoothNoise1, METH_VARARGS, "(float arg)）Returns a smooth noise value for a 1D element "},
+	{"smoothNoise2", ( PyCFunction ) Noise_smoothNoise2, METH_VARARGS, "([x, y])）Returns a smooth noise value for a 2D element "},
+	{"smoothNoise3", ( PyCFunction ) Noise_smoothNoise3, METH_VARARGS, "([x, y, z)）Returns a smooth noise value for a 3D element "},
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_Noise type definition ------------------------------*/
+
+PyTypeObject Noise_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"Noise",				/* tp_name */
+	sizeof( BPy_Noise ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	(destructor)Noise___dealloc__,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	(reprfunc)Noise___repr__,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_Noise_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	NULL,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)Noise___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	PyType_GenericNew,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+PyMODINIT_FUNC Noise_Init( PyObject *module )
+{
+	if( module == NULL )
+		return;
+
+	if( PyType_Ready( &Noise_Type ) < 0 )
+		return;
+
+	Py_INCREF( &Noise_Type );
+	PyModule_AddObject(module, "Noise", (PyObject *)&Noise_Type);
+}
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int Noise___init__(BPy_Noise *self, PyObject *args, PyObject *kwds)
+{
+	self->n = new Noise();
+	return 0;
+}
+
+void Noise___dealloc__(BPy_Noise* self)
+{
+	delete self->n;
+    self->ob_type->tp_free((PyObject*)self);
 }
 
 
- PyObject *_wrap_Noise_turbulence1__SWIG_1(PyObject *self , PyObject *args) {
+PyObject * Noise___repr__(BPy_Noise* self)
+{
+    return PyString_FromFormat("Noise - address: %p", self->n );
 }
 
 
- PyObject *_wrap_Noise_turbulence1(PyObject *self, PyObject *args) {
+PyObject * Noise_turbulence1( BPy_Noise *self , PyObject *args) {
+	float f1, f2, f3;
+	unsigned int i;
+
+	if(!( PyArg_ParseTuple(args, "fff|I", &f1, &f2, &f3, &i) )) {
+		cout << "ERROR: Noise_turbulence1" << endl;
+		Py_RETURN_NONE;
+	}
+
+	return PyFloat_FromDouble( self->n->turbulence1(f1, f2, f3, i) );
+}
+
+PyObject * Noise_turbulence2( BPy_Noise *self , PyObject *args) {
+	PyObject *obj1;
+	float f2, f3;
+	unsigned int i;
+
+	if(!( PyArg_ParseTuple(args, "Off|I", &obj1, &f2, &f3, &i) && PyList_Check(obj1) && PyList_Size(obj1) > 1 )) {
+		cout << "ERROR: Noise_turbulence2" << endl;
+		Py_RETURN_NONE;
+	}
+
+	Vec2f v( PyFloat_AsDouble(PyList_GetItem(obj1, 0)), PyFloat_AsDouble(PyList_GetItem(obj1, 1)) );
+	
+	return PyFloat_FromDouble( self->n->turbulence2(v, f2, f3, i) );
+}
+
+PyObject * Noise_turbulence3( BPy_Noise *self , PyObject *args) {
+	PyObject *obj1;
+	float f2, f3;
+	unsigned int i;
+
+	if(!( PyArg_ParseTuple(args, "Off|I", &obj1, &f2, &f3, &i) && PyList_Check(obj1) && PyList_Size(obj1) > 2 )) {
+		cout << "ERROR: Noise_turbulence3" << endl;
+		Py_RETURN_NONE;
+	}
+
+	Vec3f v( PyFloat_AsDouble(PyList_GetItem(obj1, 0)),
+			 PyFloat_AsDouble(PyList_GetItem(obj1, 1)),
+			 PyFloat_AsDouble(PyList_GetItem(obj1, 2)) );
+	
+	return PyFloat_FromDouble( self->n->turbulence3(v, f2, f3, i) );
+}
+
+PyObject * Noise_smoothNoise1( BPy_Noise *self , PyObject *args) {
+	float f;
+
+	if(!( PyArg_ParseTuple(args, "f", &f) )) {
+		cout << "ERROR: Noise_smoothNoise1" << endl;
+		Py_RETURN_NONE;
+	}
+
+	return PyFloat_FromDouble( self->n->smoothNoise1(f) );
+}
+
+PyObject * Noise_smoothNoise2( BPy_Noise *self , PyObject *args) {
+	PyObject *obj;
+
+	if(!( PyArg_ParseTuple(args, "O", &obj) && PyList_Check(obj) && PyList_Size(obj) > 1 )) {
+		cout << "ERROR: Noise_smoothNoise2" << endl;
+		Py_RETURN_NONE;
+	}
+
+	Vec2f v( PyFloat_AsDouble(PyList_GetItem(obj, 0)), PyFloat_AsDouble(PyList_GetItem(obj, 1)) );
+	
+	return PyFloat_FromDouble( self->n->smoothNoise2(v) );
+}
+
+PyObject * Noise_smoothNoise3( BPy_Noise *self , PyObject *args) {
+	PyObject *obj;
+
+	if(!( PyArg_ParseTuple(args, "O", &obj) && PyList_Check(obj) && PyList_Size(obj) > 2 )) {
+		cout << "ERROR: Noise_smoothNoise3" << endl;
+		Py_RETURN_NONE;
+	}
+
+	Vec3f v( PyFloat_AsDouble(PyList_GetItem(obj, 0)),
+			 PyFloat_AsDouble(PyList_GetItem(obj, 1)),
+			 PyFloat_AsDouble(PyList_GetItem(obj, 2)) );
+	
+	return PyFloat_FromDouble( self->n->smoothNoise3(v) );
 }
 
 
- PyObject *_wrap_Noise_turbulence2__SWIG_0(PyObject *self , PyObject *args) {
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_Noise_turbulence2__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Noise_turbulence2(PyObject *self, PyObject *args) {
-}
-
-
- PyObject *_wrap_Noise_turbulence3__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Noise_turbulence3__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Noise_turbulence3(PyObject *self, PyObject *args) {
-}
-
-
- PyObject *_wrap_Noise_smoothNoise1(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Noise_smoothNoise2(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Noise_smoothNoise3(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/BPy_Noise.h b/source/blender/freestyle/intern/python/BPy_Noise.h
new file mode 100644
index 00000000000..b9b66d34e94
--- /dev/null
+++ b/source/blender/freestyle/intern/python/BPy_Noise.h
@@ -0,0 +1,36 @@
+#ifndef FREESTYLE_PYTHON_NOISE_H
+#define FREESTYLE_PYTHON_NOISE_H
+
+#include "../geometry/Noise.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject Noise_Type;
+
+#define BPy_Noise_Check(v)	(( (PyObject *) v)->ob_type == &Noise_Type)
+
+/*---------------------------Python BPy_Noise structure definition----------*/
+typedef struct {
+	PyObject_HEAD
+	Noise *n;
+} BPy_Noise;
+
+/*---------------------------Python BPy_Noise visible prototypes-----------*/
+
+PyMODINIT_FUNC Noise_Init( PyObject *module );
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* FREESTYLE_PYTHON_NOISE_H */
diff --git a/source/blender/freestyle/intern/python/BPy_ViewMap.cpp b/source/blender/freestyle/intern/python/BPy_ViewMap.cpp
index 24a986b3885..e8633770c8c 100644
--- a/source/blender/freestyle/intern/python/BPy_ViewMap.cpp
+++ b/source/blender/freestyle/intern/python/BPy_ViewMap.cpp
@@ -1,104 +1,203 @@
- PyObject *_wrap_ViewMap_userdata_set(PyObject *self , PyObject *args) {
+#include "BPy_ViewMap.h"
+
+#include "BPy_Convert.h"
+#include "BPy_BBox.h"
+#include "Interface1D/BPy_FEdge.h"
+#include "Interface1D/BPy_ViewEdge.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for ViewMap instance  -----------*/
+static int ViewMap___init__(BPy_ViewMap *self, PyObject *args, PyObject *kwds);
+static void ViewMap___dealloc__(BPy_ViewMap *self);
+static PyObject * ViewMap___repr__(BPy_ViewMap* self);
+
+static PyObject * ViewMap_getClosestViewEdge( BPy_ViewMap *self , PyObject *args);
+static PyObject * ViewMap_getClosestFEdge( BPy_ViewMap *self , PyObject *args);
+static PyObject * ViewMap_getScene3dBBox( BPy_ViewMap *self , PyObject *args);
+static PyObject * ViewMap_setScene3dBBox( BPy_ViewMap *self , PyObject *args);
+
+/*---------------------- BPy_ViewShape instance definitions ----------------------------*/
+static PyMethodDef BPy_ViewMap_methods[] = {
+	{"getClosestViewEdge", ( PyCFunction ) ViewMap_getClosestViewEdge, METH_VARARGS, "(double x, double y) Gets the viewedge the nearest to the 2D position specified as argument "},	
+	{"getClosestFEdge", ( PyCFunction ) ViewMap_getClosestFEdge, METH_VARARGS, "(double x, double y) Gets the Fedge the nearest to the 2D position specified as argument "},
+	{"getScene3dBBox", ( PyCFunction ) ViewMap_getScene3dBBox, METH_NOARGS, "() Returns the scene 3D bounding box. "},
+	{"setScene3dBBox", ( PyCFunction ) ViewMap_setScene3dBBox, METH_VARARGS, "(BBox bb) Sets the scene 3D bounding box."},
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_ViewMap type definition ------------------------------*/
+
+PyTypeObject ViewMap_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"ViewMap",						/* tp_name */
+	sizeof( BPy_ViewMap ),			/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	(destructor)ViewMap___dealloc__,	/* tp_dealloc */
+	NULL,                       /* printfunc tp_print; */
+	NULL,                       /* getattrfunc tp_getattr; */
+	NULL,                       /* setattrfunc tp_setattr; */
+	NULL,						/* tp_compare */
+	(reprfunc)ViewMap___repr__,				/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_ViewMap_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	NULL,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)ViewMap___init__,           /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	PyType_GenericNew,						/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+PyMODINIT_FUNC ViewMap_Init( PyObject *module )
+{
+	if( module == NULL )
+		return;
+
+	if( PyType_Ready( &ViewMap_Type ) < 0 )
+		return;
+
+	Py_INCREF( &ViewMap_Type );
+	PyModule_AddObject(module, "ViewMap", (PyObject *)&ViewMap_Type);
+}
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int ViewMap___init__(BPy_ViewMap *self, PyObject *args, PyObject *kwds)
+{
+	self->vm = new ViewMap();
+    return 0;
+}
+
+void ViewMap___dealloc__(BPy_ViewMap *self)
+{
+	delete self->vm;
+    self->ob_type->tp_free((PyObject*)self);
+}
+
+PyObject * ViewMap___repr__(BPy_ViewMap *self)
+{
+    return PyString_FromFormat("ViewMap - address: %p", self->vm );
+}
+
+PyObject * ViewMap_getClosestViewEdge( BPy_ViewMap *self , PyObject *args) {
+	double x, y;
+
+	if(!( PyArg_ParseTuple(args, "dd", &x, &y) )) {
+		cout << "ERROR: ViewMap_getClosestFEdge" << endl;
+		Py_RETURN_NONE;
+	}
+
+	ViewEdge *ve = const_cast<ViewEdge *>( self->vm->getClosestViewEdge(x,y) );
+	if( ve )
+		return BPy_ViewEdge_from_ViewEdge(*ve);
+
+	Py_RETURN_NONE;
+}
+
+PyObject * ViewMap_getClosestFEdge( BPy_ViewMap *self , PyObject *args) {
+	double x, y;
+
+	if(!( PyArg_ParseTuple(args, "dd", &x, &y) )) {
+		cout << "ERROR: ViewMap_getClosestFEdge" << endl;
+		Py_RETURN_NONE;
+	}
+
+	FEdge *fe = const_cast<FEdge *>( self->vm->getClosestFEdge(x,y) );
+	if( fe )
+		return BPy_FEdge_from_FEdge(*fe);
+
+	Py_RETURN_NONE;
+}
+
+PyObject * ViewMap_getScene3dBBox( BPy_ViewMap *self , PyObject *args) {
+	BBox<Vec3r> bb( self->vm->getScene3dBBox() );
+	return BPy_BBox_from_BBox( bb );
+}
+
+PyObject * ViewMap_setScene3dBBox( BPy_ViewMap *self , PyObject *args) {
+	PyObject *py_bb = 0;
+
+	if(!( PyArg_ParseTuple(args, "O", &py_bb) && BPy_BBox_Check(py_bb) )) {
+		cout << "ERROR: ViewMap_setScene3dBBox" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->vm->setScene3dBBox(*( ((BPy_BBox *) py_bb)->bb ));
+
+	Py_RETURN_NONE;
 }
 
 
- PyObject *_wrap_ViewMap_userdata_get(PyObject *self , PyObject *args) {
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_new_ViewMap(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_ViewMap(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewMap_GetClosestViewEdge(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewMap_GetClosestFEdge(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewMap_getInstance(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewMap_ViewShapes(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewMap_ViewEdges(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewMap_ViewVertices(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewMap_FEdges(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewMap_SVertices(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewMap_viewedges_begin(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewMap_viewedges_end(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewMap_viewedges_size(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewMap_viewShape(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewMap_shapeIdToIndexMap(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewMap_getScene3dBBox(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewMap_AddViewShape(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewMap_AddViewEdge(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewMap_AddViewVertex(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewMap_AddFEdge(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewMap_AddSVertex(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewMap_setScene3dBBox(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewMap_CreateTVertex(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ViewMap_InsertViewVertex(PyObject *self , PyObject *args) {
-}
-
-
+#endif
\ No newline at end of file
diff --git a/source/blender/freestyle/intern/python/BPy_ViewMap.h b/source/blender/freestyle/intern/python/BPy_ViewMap.h
new file mode 100644
index 00000000000..841b5d46f07
--- /dev/null
+++ b/source/blender/freestyle/intern/python/BPy_ViewMap.h
@@ -0,0 +1,34 @@
+#ifndef FREESTYLE_PYTHON_VIEWMAP_H
+#define FREESTYLE_PYTHON_VIEWMAP_H
+
+#include "../view_map/ViewMap.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject ViewMap_Type;
+
+#define BPy_ViewMap_Check(v)	(( (PyObject *) v)->ob_type == &ViewMap_Type)
+
+/*---------------------------Python BPy_ViewMap structure definition----------*/
+typedef struct {
+	PyObject_HEAD
+	ViewMap *vm;
+} BPy_ViewMap;
+
+/*---------------------------Python BPy_ViewMap visible prototypes-----------*/
+
+PyMODINIT_FUNC ViewMap_Init( PyObject *module );
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_VIEWMAP_H */
diff --git a/source/blender/freestyle/intern/python/BPy_ViewShape.cpp b/source/blender/freestyle/intern/python/BPy_ViewShape.cpp
index 3ac2c02a274..a87859491b4 100644
--- a/source/blender/freestyle/intern/python/BPy_ViewShape.cpp
+++ b/source/blender/freestyle/intern/python/BPy_ViewShape.cpp
@@ -16,12 +16,27 @@ static int ViewShape___init__(BPy_ViewShape *self, PyObject *args, PyObject *kwd
 static void ViewShape___dealloc__(BPy_ViewShape *self);
 static PyObject * ViewShape___repr__(BPy_ViewShape* self);
 
+static PyObject * ViewShape_sshape( BPy_ViewShape *self );
+static PyObject * ViewShape_vertices( BPy_ViewShape *self );
+static PyObject * ViewShape_edges( BPy_ViewShape *self );
+static PyObject * ViewShape_getId( BPy_ViewShape *self );
+static PyObject * ViewShape_setSShape( BPy_ViewShape *self , PyObject *args);
+static PyObject * ViewShape_setVertices( BPy_ViewShape *self , PyObject *args);
+static PyObject * ViewShape_setEdges( BPy_ViewShape *self , PyObject *args);
+static PyObject * ViewShape_AddEdge( BPy_ViewShape *self , PyObject *args);
+static PyObject * ViewShape_AddVertex( BPy_ViewShape *self , PyObject *args);
 
 /*---------------------- BPy_ViewShape instance definitions ----------------------------*/
 static PyMethodDef BPy_ViewShape_methods[] = {
-	//{"AddEdge", ( PyCFunction ) ViewShape_AddEdge, METH_VARARGS, "（FEdge fe ）Adds a FEdge to the list of FEdges. "},
-
-	
+	{"sshape", ( PyCFunction ) ViewShape_sshape, METH_NOARGS, "() Returns the SShape on top of which this ViewShape is built. "},
+	{"vertices", ( PyCFunction ) ViewShape_vertices, METH_NOARGS, "() Returns the list of ViewVertex contained in this ViewShape."},
+	{"edges", ( PyCFunction ) ViewShape_edges, METH_NOARGS, "() Returns the list of ViewEdge contained in this ViewShape. "},
+	{"getId", ( PyCFunction ) ViewShape_getId, METH_NOARGS, "() Returns the ViewShape id. "},
+	{"setSShape", ( PyCFunction ) ViewShape_setSShape, METH_VARARGS, "(SShape ss) Sets the SShape on top of which the ViewShape is built. "},
+	{"setVertices", ( PyCFunction ) ViewShape_setVertices, METH_VARARGS, "([<ViewVertex>]) Sets the list of ViewVertex contained in this ViewShape."},
+	{"setEdges", ( PyCFunction ) ViewShape_setEdges, METH_VARARGS, "([<ViewEdge>]) Sets the list of ViewEdge contained in this ViewShape."},
+	{"AddEdge", ( PyCFunction ) ViewShape_AddEdge, METH_VARARGS, "(ViewEdge ve) Adds a ViewEdge to the list "},
+	{"AddVertex", ( PyCFunction ) ViewShape_AddVertex, METH_VARARGS, "(ViewVertex ve) Adds a ViewVertex to the list. "},
 	{NULL, NULL, 0, NULL}
 };
 
@@ -231,7 +246,6 @@ PyObject * ViewShape_setVertices( BPy_ViewShape *self , PyObject *args) {
 	Py_RETURN_NONE;
 }
 
-//void 	SetEdges (const vector< ViewEdge * > &iEdges)
 PyObject * ViewShape_setEdges( BPy_ViewShape *self , PyObject *args) {
 	PyObject *list = 0;
 	PyObject *tmp;
diff --git a/source/blender/freestyle/intern/view_map/ViewMap.cpp b/source/blender/freestyle/intern/view_map/ViewMap.cpp
index e0ae2ca373e..87624669204 100755
--- a/source/blender/freestyle/intern/view_map/ViewMap.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewMap.cpp
@@ -69,7 +69,7 @@ void  ViewMap::AddViewShape(ViewShape *iVShape) {
     _shapeIdToIndex[iVShape->getId().getFirst()] = _VShapes.size(); 
     _VShapes.push_back(iVShape);
 }
-const FEdge * ViewMap::GetClosestFEdge(real x, real y) const
+const FEdge * ViewMap::getClosestFEdge(real x, real y) const
 {
   // find the closest of this candidates:
   real minDist = DBL_MAX;
@@ -94,7 +94,7 @@ const FEdge * ViewMap::GetClosestFEdge(real x, real y) const
   return winner;
 }
 
-const ViewEdge * ViewMap::GetClosestViewEdge(real x, real y) const
+const ViewEdge * ViewMap::getClosestViewEdge(real x, real y) const
 {
   // find the closest of this candidates:
   real minDist = DBL_MAX;
diff --git a/source/blender/freestyle/intern/view_map/ViewMap.h b/source/blender/freestyle/intern/view_map/ViewMap.h
index e4b0d915ada..3f6be25312a 100755
--- a/source/blender/freestyle/intern/view_map/ViewMap.h
+++ b/source/blender/freestyle/intern/view_map/ViewMap.h
@@ -99,12 +99,12 @@ public:
   /*! Gets the viewedge the nearest to the 
    *  2D position specified as argument
    */
-  const ViewEdge * GetClosestViewEdge(real x, real y) const ;
+  const ViewEdge * getClosestViewEdge(real x, real y) const ;
 
   /*! Gets the Fedge the nearest to the 
    *  2D position specified as argument
    */
-  const FEdge * GetClosestFEdge(real x, real y) const ;
+  const FEdge * getClosestFEdge(real x, real y) const ;
 
   /* accessors */
   /*! The ViewMap is a singleton class. This static method

From 6872ff71d5374397601eeb5d720faadb4fccecbc Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Sat, 26 Jul 2008 22:25:26 +0000
Subject: [PATCH 148/252] Oops, forgot to reset counters for each line when
 calculating wrap.

---
 source/blender/src/drawtext.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index ee591125056..9b7a7bbfb7d 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -737,11 +737,12 @@ static void wrap_offset(SpaceText *st, TextLine *linein, int cursin, int *offl,
 	}
 
 	/* Calculate line offset for earlier lines */
-	end= max= get_wrap_width(st);
-	taboffs= start= 0;
+	max= get_wrap_width(st);
 	*offl= 0;
 
 	while (linep) {
+		taboffs= start= 0;
+		end= max;
 		*offc= 0;
 		for (i=0; linep->line[i]!='\0'; i++) {
 			if (i-start+taboffs>=max) {

From 01a6d44b07efb349397fef4a4cfb4ee19bc6751d Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Sat, 26 Jul 2008 22:37:05 +0000
Subject: [PATCH 149/252] Undo Fix: Down arrow on last line sent cursor to end
 (right) but undo sent it up. Similar for up arrow on first line. Undo was
 then off by a line.

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

diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c
index 4291150f443..d2100535ecc 100644
--- a/source/blender/blenkernel/intern/text.c
+++ b/source/blender/blenkernel/intern/text.c
@@ -628,8 +628,7 @@ void txt_move_up(Text *text, short sel)
 			if(!undoing) txt_undo_add_op(text, sel?UNDO_SUP:UNDO_CUP);
 		}
 	} else {
-		*charp= 0;
-		if(!undoing) txt_undo_add_op(text, sel?UNDO_SUP:UNDO_CUP);
+		txt_move_bol(text, sel);
 	}
 
 	if(!sel) txt_pop_sel(text);
@@ -654,8 +653,7 @@ void txt_move_down(Text *text, short sel)
 		} else
 			if(!undoing) txt_undo_add_op(text, sel?UNDO_SDOWN:UNDO_CDOWN);	
 	} else {
-		*charp= (*linep)->len;
-		if(!undoing) txt_undo_add_op(text, sel?UNDO_SDOWN:UNDO_CDOWN);
+		txt_move_eol(text, sel);
 	}
 
 	if(!sel) txt_pop_sel(text);

From 995fdd9fcd382869cb5c87517c5aef5aeb08dd7a Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Sun, 27 Jul 2008 03:40:37 +0000
Subject: [PATCH 150/252] soc-2008-mxcurioni: implemented and tested unary
 predicates. The good news is that My approach seems to works (even though it
 is not fully testable as it needs Freestyle to be running). I will now port
 the 80 predicate subclasses left.

In this commit, UnaryPredicate0DDouble and its subclasses DensityF0D and LocalAverageDepthF0D are implemented and integrated in the API.
---
 .../intern/python/BPy_UnaryFunction0D.cpp     |  47 +----
 .../intern/python/BPy_UnaryFunction0D.h       |   1 -
 .../BPy_UnaryFunction0DDouble.cpp             | 178 +++++++++++++++++-
 .../BPy_UnaryFunction0DDouble.h               |  34 ++++
 .../UnaryFunction0D_double/BPy_DensityF0D.cpp | 122 +++++++++++-
 .../UnaryFunction0D_double/BPy_DensityF0D.h   |  30 +++
 .../BPy_LocalAverageDepthF0D.cpp              | 122 +++++++++++-
 .../BPy_LocalAverageDepthF0D.h                |  30 +++
 8 files changed, 501 insertions(+), 63 deletions(-)
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_LocalAverageDepthF0D.h

diff --git a/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp
index dda236a0989..01783bf0f7f 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp
@@ -1,6 +1,6 @@
 #include "BPy_UnaryFunction0D.h"
 
-#include "BPy_Convert.h"
+#include "UnaryFunction0D/BPy_UnaryFunction0DDouble.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -9,17 +9,11 @@ extern "C" {
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 /*---------------  Python API function prototypes for UnaryFunction0D instance  -----------*/
-static int UnaryFunction0D___init__(BPy_UnaryFunction0D *self, PyObject *args, PyObject *kwds);
 static void UnaryFunction0D___dealloc__(BPy_UnaryFunction0D *self);
 static PyObject * UnaryFunction0D___repr__(BPy_UnaryFunction0D *self);
 
-static PyObject * UnaryFunction0D_getName( BPy_UnaryFunction0D *self, PyObject *args);
-static PyObject * UnaryFunction0D___call__( BPy_UnaryFunction0D *self, PyObject *args);
-
 /*----------------------UnaryFunction0D instance definitions ----------------------------*/
 static PyMethodDef BPy_UnaryFunction0D_methods[] = {
-	{"getName", ( PyCFunction ) UnaryFunction0D_getName, METH_NOARGS, ""},
-	{"__call__", ( PyCFunction ) UnaryFunction0D___call__, METH_VARARGS, "" },
 	{NULL, NULL, 0, NULL}
 };
 
@@ -89,7 +83,7 @@ PyTypeObject UnaryFunction0D_Type = {
 	NULL,							/* descrgetfunc tp_descr_get; */
 	NULL,							/* descrsetfunc tp_descr_set; */
 	0,                          	/* long tp_dictoffset; */
-	(initproc)UnaryFunction0D___init__, /* initproc tp_init; */
+	NULL, /* initproc tp_init; */
 	NULL,							/* allocfunc tp_alloc; */
 	PyType_GenericNew,		/* newfunc tp_new; */
 	
@@ -118,54 +112,23 @@ PyMODINIT_FUNC UnaryFunction0D_Init( PyObject *module )
 		return;
 	Py_INCREF( &UnaryFunction0D_Type );
 	PyModule_AddObject(module, "UnaryFunction0D", (PyObject *)&UnaryFunction0D_Type);
+
+	UnaryFunction0DDouble_Init( module );
 }
 
 //------------------------INSTANCE METHODS ----------------------------------
 
-int UnaryFunction0D___init__(BPy_UnaryFunction0D *self, PyObject *args, PyObject *kwds)
-{
-	return 0;
-}
-
 void UnaryFunction0D___dealloc__(BPy_UnaryFunction0D* self)
 {
-	//delete self->uf0D;
     self->ob_type->tp_free((PyObject*)self);
 }
 
 
 PyObject * UnaryFunction0D___repr__(BPy_UnaryFunction0D* self)
 {
-    return PyString_FromFormat("type: %s - address: %p", ((UnaryFunction0D<void> *) self->uf0D)->getName().c_str(), self->uf0D );
+    return PyString_FromString("UnaryFunction0D");
 }
 
-
-PyObject * UnaryFunction0D_getName( BPy_UnaryFunction0D *self, PyObject *args)
-{
-	return PyString_FromString( ((UnaryFunction0D<void> *) self->uf0D)->getName().c_str() );
-}
-
-PyObject * UnaryFunction0D___call__( BPy_UnaryFunction0D *self, PyObject *args)
-{
-	PyObject *l;
-
-	if( !PyArg_ParseTuple(args, "O", &l) ) {
-		cout << "ERROR: UnaryFunction0D___call__ " << endl;		
-		return NULL;
-	}
-	
-	// pb: operator() is called on Interface0DIterator while we have a list
-	// solutions:
-	// 1)reconvert back to iterator ?
-	// 2) adapt interface0d to have t(), u() functions
-	
-	// b = self->bp0D->operator()( *(obj1->uf0D) );
-	// return PyBool_from_bool( b );
-	
-	Py_RETURN_NONE;
-}
-
-
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h
index 8f1935871ca..e4854c58b45 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h
+++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h
@@ -18,7 +18,6 @@ extern PyTypeObject UnaryFunction0D_Type;
 /*---------------------------Python BPy_UnaryFunction0D structure definition----------*/
 typedef struct {
 	PyObject_HEAD
-	void *uf0D;
 } BPy_UnaryFunction0D;
 
 /*---------------------------Python BPy_UnaryFunction0D visible prototypes-----------*/
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp
index df286794dd3..770efb49073 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp
@@ -1,12 +1,182 @@
- PyObject *_wrap_UnaryFunction0DDouble_getName(PyObject *self , PyObject *args) {
+#include "BPy_UnaryFunction0DDouble.h"
+
+#include "../BPy_Convert.h"
+#include "../Iterator/BPy_Interface0DIterator.h"
+
+#include "UnaryFunction0D_double/BPy_DensityF0D.h"
+#include "UnaryFunction0D_double/BPy_LocalAverageDepthF0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for UnaryFunction0DDouble instance  -----------*/
+static int UnaryFunction0DDouble___init__(BPy_UnaryFunction0DDouble* self);
+static void UnaryFunction0DDouble___dealloc__(BPy_UnaryFunction0DDouble* self);
+static PyObject * UnaryFunction0DDouble___repr__(BPy_UnaryFunction0DDouble* self);
+
+static PyObject * UnaryFunction0DDouble_getName( BPy_UnaryFunction0DDouble *self);
+static PyObject * UnaryFunction0DDouble___call__( BPy_UnaryFunction0DDouble *self, PyObject *args);
+
+/*----------------------UnaryFunction0DDouble instance definitions ----------------------------*/
+static PyMethodDef BPy_UnaryFunction0DDouble_methods[] = {
+	{"getName", ( PyCFunction ) UnaryFunction0DDouble_getName, METH_NOARGS, "（ ）Returns the string of the name of the unary 0D function."},
+	{"__call__", ( PyCFunction ) UnaryFunction0DDouble___call__, METH_VARARGS, "（Interface0DIterator it ）Executes the operator ()	on the iterator it pointing onto the point at which we wish to evaluate the function." },
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_UnaryFunction0DDouble type definition ------------------------------*/
+
+PyTypeObject UnaryFunction0DDouble_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"UnaryFunction0DDouble",				/* tp_name */
+	sizeof( BPy_UnaryFunction0DDouble ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	(destructor)UnaryFunction0DDouble___dealloc__,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	(reprfunc)UnaryFunction0DDouble___repr__,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_UnaryFunction0DDouble_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction0D_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)UnaryFunction0DDouble___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+
+PyMODINIT_FUNC UnaryFunction0DDouble_Init( PyObject *module ) {
+
+	if( module == NULL )
+		return;
+
+	if( PyType_Ready( &UnaryFunction0DDouble_Type ) < 0 )
+		return;
+	Py_INCREF( &UnaryFunction0DDouble_Type );
+	PyModule_AddObject(module, "UnaryFunction0DDouble", (PyObject *)&UnaryFunction0DDouble_Type);
+	
+	if( PyType_Ready( &DensityF0D_Type ) < 0 )
+		return;
+	Py_INCREF( &DensityF0D_Type );
+	PyModule_AddObject(module, "DensityF0D", (PyObject *)&DensityF0D_Type);
+	
+	if( PyType_Ready( &LocalAverageDepthF0D_Type ) < 0 )
+		return;
+	Py_INCREF( &LocalAverageDepthF0D_Type );
+	PyModule_AddObject(module, "LocalAverageDepthF0D", (PyObject *)&LocalAverageDepthF0D_Type);
+		
+}
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int UnaryFunction0DDouble___init__(BPy_UnaryFunction0DDouble* self)
+{
+	self->uf0D_double = new UnaryFunction0D<double>();
+	return 0;
+}
+
+void UnaryFunction0DDouble___dealloc__(BPy_UnaryFunction0DDouble* self)
+{
+	delete self->uf0D_double;
+	UnaryFunction0D_Type.tp_dealloc((PyObject*)self);
 }
 
 
- PyObject *_wrap_UnaryFunction0DDouble___call__(PyObject *self , PyObject *args) {
+PyObject * UnaryFunction0DDouble___repr__(BPy_UnaryFunction0DDouble* self)
+{
+	return PyString_FromFormat("type: %s - address: %p", self->uf0D_double->getName().c_str(), self->uf0D_double );
 }
 
-
- PyObject *_wrap_disown_UnaryFunction0DDouble(PyObject *self , PyObject *args) {
+PyObject * UnaryFunction0DDouble_getName( BPy_UnaryFunction0DDouble *self )
+{
+	return PyString_FromString( self->uf0D_double->getName().c_str() );
 }
 
+PyObject * UnaryFunction0DDouble___call__( BPy_UnaryFunction0DDouble *self, PyObject *args)
+{
+	PyObject *obj;
 
+	if( !PyArg_ParseTuple(args, "O", &obj) && BPy_Interface0DIterator_Check(obj) ) {
+		cout << "ERROR: UnaryFunction0DDouble___call__ " << endl;		
+		return NULL;
+	}
+	
+	double d = self->uf0D_double->operator()(*( ((BPy_Interface0DIterator *) obj)->if0D_it ));
+	return PyFloat_FromDouble( d );
+
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.h
new file mode 100644
index 00000000000..2f0cb828419
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.h
@@ -0,0 +1,34 @@
+#ifndef FREESTYLE_PYTHON_UNARYFUNCTION0DDOUBLE_H
+#define FREESTYLE_PYTHON_UNARYFUNCTION0DDOUBLE_H
+
+#include "../BPy_UnaryFunction0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject UnaryFunction0DDouble_Type;
+
+#define BPy_UnaryFunction0DDouble_Check(v)	(( (PyObject *) v)->ob_type == &UnaryFunction0DDouble_Type)
+
+/*---------------------------Python BPy_UnaryFunction0DDouble structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction0D py_uf0D;
+	UnaryFunction0D<double> *uf0D_double;
+} BPy_UnaryFunction0DDouble;
+
+/*---------------------------Python BPy_UnaryFunction0DDouble visible prototypes-----------*/
+PyMODINIT_FUNC UnaryFunction0DDouble_Init( PyObject *module );
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_UNARYFUNCTION0DDOUBLE_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.cpp
index 50986360f2c..dd335d03fa8 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.cpp
@@ -1,12 +1,118 @@
- PyObject *_wrap_DensityF0D_getName(PyObject *self , PyObject *args) {
+#include "BPy_DensityF0D.h"
+
+#include "../../../stroke/AdvancedFunctions0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for DensityF0D instance  -----------*/
+	static int DensityF0D___init__(BPy_DensityF0D* self, PyObject *args);
+
+/*-----------------------BPy_DensityF0D type definition ------------------------------*/
+
+PyTypeObject DensityF0D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"DensityF0D",				/* tp_name */
+	sizeof( BPy_DensityF0D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction0DDouble_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)DensityF0D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int DensityF0D___init__( BPy_DensityF0D* self, PyObject *args)
+{
+	double d = 2;
+
+	if( !PyArg_ParseTuple(args, "|d", &d) ) {
+		cout << "ERROR: DensityF0D___init__" << endl;		
+		return -1;
+	}
+	
+	self->py_uf0D_double.uf0D_double = new Functions0D::DensityF0D(d);
+	return 0;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_DensityF0D___call__(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_delete_DensityF0D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.h
new file mode 100644
index 00000000000..3b113a0e636
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_DENSITYF0D_H
+#define FREESTYLE_PYTHON_DENSITYF0D_H
+
+#include "../BPy_UnaryFunction0DDouble.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject DensityF0D_Type;
+
+#define BPy_DensityF0D_Check(v)	(( (PyObject *) v)->ob_type == &DensityF0D_Type)
+
+/*---------------------------Python BPy_DensityF0D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction0DDouble py_uf0D_double;
+} BPy_DensityF0D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_DENSITYF0D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_LocalAverageDepthF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_LocalAverageDepthF0D.cpp
index 0738f2cf6dc..3a9c516cd17 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_LocalAverageDepthF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_LocalAverageDepthF0D.cpp
@@ -1,12 +1,118 @@
- PyObject *_wrap_LocalAverageDepthF0D_getName(PyObject *self , PyObject *args) {
+#include "BPy_LocalAverageDepthF0D.h"
+
+#include "../../../stroke/AdvancedFunctions0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for LocalAverageDepthF0D instance  -----------*/
+	static int LocalAverageDepthF0D___init__(BPy_LocalAverageDepthF0D* self, PyObject *args);
+
+/*-----------------------BPy_LocalAverageDepthF0D type definition ------------------------------*/
+
+PyTypeObject LocalAverageDepthF0D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"LocalAverageDepthF0D",				/* tp_name */
+	sizeof( BPy_LocalAverageDepthF0D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction0DDouble_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)LocalAverageDepthF0D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int LocalAverageDepthF0D___init__( BPy_LocalAverageDepthF0D* self, PyObject *args)
+{
+	double d = 5.0;
+
+	if( !PyArg_ParseTuple(args, "|d", &d) ) {
+		cout << "ERROR: LocalAverageDepthF0D___init__" << endl;		
+		return -1;
+	}
+	
+	self->py_uf0D_double.uf0D_double = new Functions0D::LocalAverageDepthF0D(d);
+	return 0;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_LocalAverageDepthF0D___call__(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_delete_LocalAverageDepthF0D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_LocalAverageDepthF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_LocalAverageDepthF0D.h
new file mode 100644
index 00000000000..6f84891fc1d
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_LocalAverageDepthF0D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_LOCALAVERAGEDEPTHF0D_H
+#define FREESTYLE_PYTHON_LOCALAVERAGEDEPTHF0D_H
+
+#include "../BPy_UnaryFunction0DDouble.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject LocalAverageDepthF0D_Type;
+
+#define BPy_LocalAverageDepthF0D_Check(v)	(( (PyObject *) v)->ob_type == &LocalAverageDepthF0D_Type)
+
+/*---------------------------Python BPy_LocalAverageDepthF0D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction0DDouble py_uf0D_double;
+} BPy_LocalAverageDepthF0D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_LOCALAVERAGEDEPTHF0D_H */

From 0cc6f9db3d70e443fa0162ab5bfddc55865ea70c Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Sun, 27 Jul 2008 06:57:46 +0000
Subject: [PATCH 151/252] soc-2008-mxcurioni: ported ALL 0D unary functions,
 representing 34 new classes. I will do the same for the 1D unary functions.

---
 source/blender/freestyle/SConscript           |  36 ++++
 .../intern/python/BPy_UnaryFunction0D.cpp     |  19 ++
 .../BPy_UnaryFunction0DDouble.cpp             |  49 +++++
 .../BPy_UnaryFunction0DEdgeNature.cpp         | 176 +++++++++++++++
 .../BPy_UnaryFunction0DEdgeNature.h           |  36 ++++
 .../BPy_UnaryFunction0DFloat.cpp              | 201 +++++++++++++++++-
 .../BPy_UnaryFunction0DFloat.h                |  34 +++
 .../UnaryFunction0D/BPy_UnaryFunction0DId.cpp | 171 ++++++++++++++-
 .../UnaryFunction0D/BPy_UnaryFunction0DId.h   |  36 ++++
 .../BPy_UnaryFunction0DMaterial.cpp           | 176 +++++++++++++++
 .../BPy_UnaryFunction0DMaterial.h             |  36 ++++
 .../BPy_UnaryFunction0DUnsigned.cpp           | 172 ++++++++++++++-
 .../BPy_UnaryFunction0DUnsigned.h             |  34 +++
 .../BPy_UnaryFunction0DVec2f.cpp              | 178 +++++++++++++++-
 .../BPy_UnaryFunction0DVec2f.h                |  37 ++++
 .../BPy_UnaryFunction0DVec3f.cpp              | 172 ++++++++++++++-
 .../BPy_UnaryFunction0DVec3f.h                |  37 ++++
 .../BPy_UnaryFunction0DVectorViewShape.cpp    | 177 ++++++++++++++-
 .../BPy_UnaryFunction0DVectorViewShape.h      |  37 ++++
 .../BPy_UnaryFunction0DViewShape.cpp          | 178 +++++++++++++++-
 .../BPy_UnaryFunction0DViewShape.h            |  36 ++++
 .../UnaryFunction0D_Id/BPy_ShapeIdF0D.cpp     | 119 +++++++++--
 .../UnaryFunction0D_Id/BPy_ShapeIdF0D.h       |  30 +++
 .../BPy_MaterialF0D.cpp                       | 119 +++++++++--
 .../BPy_MaterialF0D.h                         |  30 +++
 .../BPy_CurveNatureF0D.cpp                    | 119 +++++++++--
 .../BPy_CurveNatureF0D.h                      |  30 +++
 .../UnaryFunction0D_Vec2f/BPy_Normal2DF0D.cpp | 119 +++++++++--
 .../UnaryFunction0D_Vec2f/BPy_Normal2DF0D.h   |  30 +++
 .../BPy_VertexOrientation2DF0D.cpp            | 119 +++++++++--
 .../BPy_VertexOrientation2DF0D.h              |  30 +++
 .../BPy_VertexOrientation3DF0D.cpp            | 119 +++++++++--
 .../BPy_VertexOrientation3DF0D.h              |  30 +++
 .../BPy_GetOccludeeF0D.cpp                    | 119 +++++++++--
 .../BPy_GetOccludeeF0D.h                      |  30 +++
 .../BPy_GetShapeF0D.cpp                       | 119 +++++++++--
 .../BPy_GetShapeF0D.h                         |  30 +++
 .../BPy_Curvature2DAngleF0D.cpp               | 111 ++++++++++
 .../BPy_Curvature2DAngleF0D.h                 |  30 +++
 .../BPy_GetProjectedXF0D.cpp                  | 111 ++++++++++
 .../BPy_GetProjectedXF0D.h                    |  30 +++
 .../BPy_GetProjectedYF0D.cpp                  | 111 ++++++++++
 .../BPy_GetProjectedYF0D.h                    |  30 +++
 .../BPy_GetProjectedZF0D.cpp                  | 111 ++++++++++
 .../BPy_GetProjectedZF0D.h                    |  30 +++
 .../UnaryFunction0D_double/BPy_GetXF0D.cpp    | 111 ++++++++++
 .../UnaryFunction0D_double/BPy_GetXF0D.h      |  30 +++
 .../UnaryFunction0D_double/BPy_GetYF0D.cpp    | 111 ++++++++++
 .../UnaryFunction0D_double/BPy_GetYF0D.h      |  30 +++
 .../UnaryFunction0D_double/BPy_GetZF0D.cpp    | 111 ++++++++++
 .../UnaryFunction0D_double/BPy_GetZF0D.h      |  30 +++
 .../BPy_ZDiscontinuityF0D.cpp                 | 111 ++++++++++
 .../BPy_ZDiscontinuityF0D.h                   |  30 +++
 .../BPy_GetCurvilinearAbscissaF0D.cpp         | 119 +++++++++--
 .../BPy_GetCurvilinearAbscissaF0D.h           |  30 +++
 .../BPy_GetParameterF0D.cpp                   | 119 +++++++++--
 .../BPy_GetParameterF0D.h                     |  30 +++
 .../BPy_GetViewMapGradientNormF0D.cpp         | 122 ++++++++++-
 .../BPy_GetViewMapGradientNormF0D.h           |  30 +++
 .../BPy_ReadCompleteViewMapPixelF0D.cpp       | 122 ++++++++++-
 .../BPy_ReadCompleteViewMapPixelF0D.h         |  30 +++
 .../BPy_ReadMapPixelF0D.cpp                   | 123 ++++++++++-
 .../BPy_ReadMapPixelF0D.h                     |  30 +++
 .../BPy_ReadSteerableViewMapPixelF0D.cpp      | 123 ++++++++++-
 .../BPy_ReadSteerableViewMapPixelF0D.h        |  30 +++
 .../BPy_Curvature2DAngleF0D.cpp               |  16 --
 .../BPy_GetProjectedXF0D.cpp                  |  16 --
 .../BPy_GetProjectedYF0D.cpp                  |  16 --
 .../BPy_GetProjectedZF0D.cpp                  |  16 --
 .../UnaryFunction0D_real/BPy_GetXF0D.cpp      |  16 --
 .../UnaryFunction0D_real/BPy_GetYF0D.cpp      |  16 --
 .../UnaryFunction0D_real/BPy_GetZF0D.cpp      |  16 --
 .../BPy_ZDiscontinuityF0D.cpp                 |  16 --
 .../BPy_QuantitativeInvisibilityF0D.cpp       | 119 +++++++++--
 .../BPy_QuantitativeInvisibilityF0D.h         |  30 +++
 .../BPy_GetOccludersF0D.cpp                   | 119 +++++++++--
 .../BPy_GetOccludersF0D.h                     |  30 +++
 77 files changed, 5354 insertions(+), 328 deletions(-)
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/BPy_ShapeIdF0D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_Curvature2DAngleF0D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_Curvature2DAngleF0D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedXF0D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedXF0D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedYF0D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedYF0D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedZF0D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedZF0D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetXF0D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetXF0D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetYF0D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetYF0D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetZF0D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetZF0D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetParameterF0D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadMapPixelF0D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.h
 delete mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_Curvature2DAngleF0D.cpp
 delete mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetProjectedXF0D.cpp
 delete mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetProjectedYF0D.cpp
 delete mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetProjectedZF0D.cpp
 delete mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetXF0D.cpp
 delete mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetYF0D.cpp
 delete mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetZF0D.cpp
 delete mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_ZDiscontinuityF0D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.h

diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript
index 88d4763affa..3ee1a79ce0c 100644
--- a/source/blender/freestyle/SConscript
+++ b/source/blender/freestyle/SConscript
@@ -101,6 +101,42 @@ python_sources = [
 					prefix + '/BPy_StrokeAttribute.cpp',
 					prefix + '/BPy_StrokeShader.cpp',
 					prefix + '/BPy_UnaryFunction0D.cpp',
+						prefix + '/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp',
+							prefix + '/UnaryFunction0D/UnaryFunction0D_double/BPy_Curvature2DAngleF0D.cpp',
+							prefix + '/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.cpp',
+							prefix + '/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedXF0D.cpp',
+							prefix + '/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedYF0D.cpp',
+							prefix + '/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedZF0D.cpp',
+							prefix + '/UnaryFunction0D/UnaryFunction0D_double/BPy_GetXF0D.cpp',
+							prefix + '/UnaryFunction0D/UnaryFunction0D_double/BPy_GetYF0D.cpp',
+							prefix + '/UnaryFunction0D/UnaryFunction0D_double/BPy_GetZF0D.cpp',
+							prefix + '/UnaryFunction0D/UnaryFunction0D_double/BPy_LocalAverageDepthF0D.cpp',
+							prefix + '/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.cpp',
+						prefix + '/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.cpp',
+							prefix + '/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.cpp',
+						prefix + '/UnaryFunction0D/BPy_UnaryFunction0DFloat.cpp',
+							prefix + '/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.cpp',
+							prefix + '/UnaryFunction0D/UnaryFunction0D_float/BPy_GetParameterF0D.cpp',
+							prefix + '/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.cpp',
+							prefix + '/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.cpp',
+							prefix + '/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadMapPixelF0D.cpp',
+							prefix + '/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.cpp',
+						prefix + '/UnaryFunction0D/BPy_UnaryFunction0DId.cpp',
+							prefix + '/UnaryFunction0D/UnaryFunction0D_Id/BPy_ShapeIdF0D.cpp',
+						prefix + '/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp',
+							prefix + '/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp',
+						prefix + '/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.cpp',
+							prefix + '/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.cpp',
+						prefix + '/UnaryFunction0D/BPy_UnaryFunction0DVec2f.cpp',
+							prefix + '/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.cpp',
+							prefix + '/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.cpp',
+						prefix + '/UnaryFunction0D/BPy_UnaryFunction0DVec3f.cpp',
+							prefix + '/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.cpp',
+						prefix + '/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp',
+							prefix + '/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.cpp',
+						prefix + '/UnaryFunction0D/BPy_UnaryFunction0DViewShape.cpp',
+							prefix + '/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.cpp',
+							prefix + '/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.cpp',
 					prefix + '/BPy_UnaryFunction1D.cpp',
 					prefix + '/BPy_UnaryPredicate0D.cpp',
 					prefix + '/BPy_UnaryPredicate1D.cpp',
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp
index 01783bf0f7f..122c6cc678c 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp
@@ -1,6 +1,16 @@
 #include "BPy_UnaryFunction0D.h"
 
 #include "UnaryFunction0D/BPy_UnaryFunction0DDouble.h"
+#include "UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.h"
+#include "UnaryFunction0D/BPy_UnaryFunction0DFloat.h"
+#include "UnaryFunction0D/BPy_UnaryFunction0DId.h"
+#include "UnaryFunction0D/BPy_UnaryFunction0DMaterial.h"
+#include "UnaryFunction0D/BPy_UnaryFunction0DUnsigned.h"
+#include "UnaryFunction0D/BPy_UnaryFunction0DVec2f.h"
+#include "UnaryFunction0D/BPy_UnaryFunction0DVec3f.h"
+#include "UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.h"
+#include "UnaryFunction0D/BPy_UnaryFunction0DViewShape.h"
+
 
 #ifdef __cplusplus
 extern "C" {
@@ -114,6 +124,15 @@ PyMODINIT_FUNC UnaryFunction0D_Init( PyObject *module )
 	PyModule_AddObject(module, "UnaryFunction0D", (PyObject *)&UnaryFunction0D_Type);
 
 	UnaryFunction0DDouble_Init( module );
+	UnaryFunction0DEdgeNature_Init( module );
+	UnaryFunction0DFloat_Init( module );
+	UnaryFunction0DId_Init( module );
+	UnaryFunction0DMaterial_Init( module );
+	UnaryFunction0DUnsigned_Init( module );
+	UnaryFunction0DVec2f_Init( module );
+	UnaryFunction0DVec3f_Init( module );
+	UnaryFunction0DVectorViewShape_Init( module );
+	UnaryFunction0DViewShape_Init( module );
 }
 
 //------------------------INSTANCE METHODS ----------------------------------
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp
index 770efb49073..e7ac46122b6 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp
@@ -3,8 +3,16 @@
 #include "../BPy_Convert.h"
 #include "../Iterator/BPy_Interface0DIterator.h"
 
+#include "UnaryFunction0D_double/BPy_Curvature2DAngleF0D.h"
 #include "UnaryFunction0D_double/BPy_DensityF0D.h"
+#include "UnaryFunction0D_double/BPy_GetProjectedXF0D.h"
+#include "UnaryFunction0D_double/BPy_GetProjectedYF0D.h"
+#include "UnaryFunction0D_double/BPy_GetProjectedZF0D.h"
+#include "UnaryFunction0D_double/BPy_GetXF0D.h"
+#include "UnaryFunction0D_double/BPy_GetYF0D.h"
+#include "UnaryFunction0D_double/BPy_GetZF0D.h"
 #include "UnaryFunction0D_double/BPy_LocalAverageDepthF0D.h"
+#include "UnaryFunction0D_double/BPy_ZDiscontinuityF0D.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -133,6 +141,47 @@ PyMODINIT_FUNC UnaryFunction0DDouble_Init( PyObject *module ) {
 		return;
 	Py_INCREF( &LocalAverageDepthF0D_Type );
 	PyModule_AddObject(module, "LocalAverageDepthF0D", (PyObject *)&LocalAverageDepthF0D_Type);
+	
+	if( PyType_Ready( &Curvature2DAngleF0D_Type ) < 0 )
+		return;
+	Py_INCREF( &Curvature2DAngleF0D_Type );
+	PyModule_AddObject(module, "Curvature2DAngleF0D", (PyObject *)&Curvature2DAngleF0D_Type);
+	
+	if( PyType_Ready( &GetProjectedXF0D_Type ) < 0 )
+		return;
+	Py_INCREF( &GetProjectedXF0D_Type );
+	PyModule_AddObject(module, "GetProjectedXF0D", (PyObject *)&GetProjectedXF0D_Type);
+	
+	if( PyType_Ready( &GetProjectedYF0D_Type ) < 0 )
+		return;
+	Py_INCREF( &GetProjectedYF0D_Type );
+	PyModule_AddObject(module, "GetProjectedYF0D", (PyObject *)&GetProjectedYF0D_Type);
+	
+	if( PyType_Ready( &GetProjectedZF0D_Type ) < 0 )
+		return;
+	Py_INCREF( &GetProjectedZF0D_Type );
+	PyModule_AddObject(module, "GetProjectedZF0D", (PyObject *)&GetProjectedZF0D_Type);
+		
+	if( PyType_Ready( &GetXF0D_Type ) < 0 )
+		return;
+	Py_INCREF( &GetXF0D_Type );
+	PyModule_AddObject(module, "GetXF0D", (PyObject *)&GetXF0D_Type);
+	
+	if( PyType_Ready( &GetYF0D_Type ) < 0 )
+		return;
+	Py_INCREF( &GetYF0D_Type );
+	PyModule_AddObject(module, "GetYF0D", (PyObject *)&GetYF0D_Type);
+	
+	if( PyType_Ready( &GetZF0D_Type ) < 0 )
+		return;
+	Py_INCREF( &GetZF0D_Type );
+	PyModule_AddObject(module, "GetZF0D", (PyObject *)&GetZF0D_Type);
+	
+	if( PyType_Ready( &ZDiscontinuityF0D_Type ) < 0 )
+		return;
+	Py_INCREF( &ZDiscontinuityF0D_Type );
+	PyModule_AddObject(module, "ZDiscontinuityF0D", (PyObject *)&ZDiscontinuityF0D_Type);
+
 		
 }
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.cpp
new file mode 100644
index 00000000000..3dfcb74cddd
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.cpp
@@ -0,0 +1,176 @@
+#include "BPy_UnaryFunction0DEdgeNature.h"
+
+#include "../BPy_Convert.h"
+#include "../Iterator/BPy_Interface0DIterator.h"
+
+#include "UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for UnaryFunction0DEdgeNature instance  -----------*/
+static int UnaryFunction0DEdgeNature___init__(BPy_UnaryFunction0DEdgeNature* self);
+static void UnaryFunction0DEdgeNature___dealloc__(BPy_UnaryFunction0DEdgeNature* self);
+static PyObject * UnaryFunction0DEdgeNature___repr__(BPy_UnaryFunction0DEdgeNature* self);
+
+static PyObject * UnaryFunction0DEdgeNature_getName( BPy_UnaryFunction0DEdgeNature *self);
+static PyObject * UnaryFunction0DEdgeNature___call__( BPy_UnaryFunction0DEdgeNature *self, PyObject *args);
+
+/*----------------------UnaryFunction0DEdgeNature instance definitions ----------------------------*/
+static PyMethodDef BPy_UnaryFunction0DEdgeNature_methods[] = {
+	{"getName", ( PyCFunction ) UnaryFunction0DEdgeNature_getName, METH_NOARGS, "（ ）Returns the string of the name of the unary 0D function."},
+	{"__call__", ( PyCFunction ) UnaryFunction0DEdgeNature___call__, METH_VARARGS, "（Interface0DIterator it ）Executes the operator ()	on the iterator it pointing onto the point at which we wish to evaluate the function." },
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_UnaryFunction0DEdgeNature type definition ------------------------------*/
+
+PyTypeObject UnaryFunction0DEdgeNature_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"UnaryFunction0DEdgeNature",				/* tp_name */
+	sizeof( BPy_UnaryFunction0DEdgeNature ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	(destructor)UnaryFunction0DEdgeNature___dealloc__,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	(reprfunc)UnaryFunction0DEdgeNature___repr__,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_UnaryFunction0DEdgeNature_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction0D_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)UnaryFunction0DEdgeNature___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+
+PyMODINIT_FUNC UnaryFunction0DEdgeNature_Init( PyObject *module ) {
+
+	if( module == NULL )
+		return;
+
+	if( PyType_Ready( &UnaryFunction0DEdgeNature_Type ) < 0 )
+		return;
+	Py_INCREF( &UnaryFunction0DEdgeNature_Type );
+	PyModule_AddObject(module, "UnaryFunction0DEdgeNature", (PyObject *)&UnaryFunction0DEdgeNature_Type);
+	
+	if( PyType_Ready( &CurveNatureF0D_Type ) < 0 )
+		return;
+	Py_INCREF( &CurveNatureF0D_Type );
+	PyModule_AddObject(module, "CurveNatureF0D", (PyObject *)&CurveNatureF0D_Type);
+		
+}
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int UnaryFunction0DEdgeNature___init__(BPy_UnaryFunction0DEdgeNature* self)
+{
+	self->uf0D_edgenature = new UnaryFunction0D<Nature::EdgeNature>();
+	return 0;
+}
+
+void UnaryFunction0DEdgeNature___dealloc__(BPy_UnaryFunction0DEdgeNature* self)
+{
+	delete self->uf0D_edgenature;
+	UnaryFunction0D_Type.tp_dealloc((PyObject*)self);
+}
+
+
+PyObject * UnaryFunction0DEdgeNature___repr__(BPy_UnaryFunction0DEdgeNature* self)
+{
+	return PyString_FromFormat("type: %s - address: %p", self->uf0D_edgenature->getName().c_str(), self->uf0D_edgenature );
+}
+
+PyObject * UnaryFunction0DEdgeNature_getName( BPy_UnaryFunction0DEdgeNature *self )
+{
+	return PyString_FromString( self->uf0D_edgenature->getName().c_str() );
+}
+
+PyObject * UnaryFunction0DEdgeNature___call__( BPy_UnaryFunction0DEdgeNature *self, PyObject *args)
+{
+	PyObject *obj;
+
+	if( !PyArg_ParseTuple(args, "O", &obj) && BPy_Interface0DIterator_Check(obj) ) {
+		cout << "ERROR: UnaryFunction0DEdgeNature___call__ " << endl;		
+		return NULL;
+	}
+	
+	Nature::EdgeNature n = self->uf0D_edgenature->operator()(*( ((BPy_Interface0DIterator *) obj)->if0D_it ));
+	return BPy_Nature_from_Nature( n );
+
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.h
new file mode 100644
index 00000000000..2aacd343ab1
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.h
@@ -0,0 +1,36 @@
+#ifndef FREESTYLE_PYTHON_UNARYFUNCTION0DEDGENATURE_H
+#define FREESTYLE_PYTHON_UNARYFUNCTION0DEDGENATURE_H
+
+#include "../BPy_UnaryFunction0D.h"
+
+#include "../../winged_edge/Nature.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject UnaryFunction0DEdgeNature_Type;
+
+#define BPy_UnaryFunction0DEdgeNature_Check(v)	(( (PyObject *) v)->ob_type == &UnaryFunction0DEdgeNature_Type)
+
+/*---------------------------Python BPy_UnaryFunction0DEdgeNature structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction0D py_uf0D;
+	UnaryFunction0D<Nature::EdgeNature> *uf0D_edgenature;
+} BPy_UnaryFunction0DEdgeNature;
+
+/*---------------------------Python BPy_UnaryFunction0DEdgeNature visible prototypes-----------*/
+PyMODINIT_FUNC UnaryFunction0DEdgeNature_Init( PyObject *module );
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_UNARYFUNCTION0DEDGENATURE_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.cpp
index ccb89d91ecf..2c11eb92ed5 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.cpp
@@ -1,12 +1,205 @@
- PyObject *_wrap_UnaryFunction0DFloat_getName(PyObject *self , PyObject *args) {
+#include "BPy_UnaryFunction0DFloat.h"
+
+#include "../BPy_Convert.h"
+#include "../Iterator/BPy_Interface0DIterator.h"
+
+#include "UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.h"
+#include "UnaryFunction0D_float/BPy_GetParameterF0D.h"
+#include "UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.h"
+#include "UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.h"
+#include "UnaryFunction0D_float/BPy_ReadMapPixelF0D.h"
+#include "UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for UnaryFunction0DFloat instance  -----------*/
+static int UnaryFunction0DFloat___init__(BPy_UnaryFunction0DFloat* self);
+static void UnaryFunction0DFloat___dealloc__(BPy_UnaryFunction0DFloat* self);
+static PyObject * UnaryFunction0DFloat___repr__(BPy_UnaryFunction0DFloat* self);
+
+static PyObject * UnaryFunction0DFloat_getName( BPy_UnaryFunction0DFloat *self);
+static PyObject * UnaryFunction0DFloat___call__( BPy_UnaryFunction0DFloat *self, PyObject *args);
+
+/*----------------------UnaryFunction0DFloat instance definitions ----------------------------*/
+static PyMethodDef BPy_UnaryFunction0DFloat_methods[] = {
+	{"getName", ( PyCFunction ) UnaryFunction0DFloat_getName, METH_NOARGS, "（ ）Returns the string of the name of the unary 0D function."},
+	{"__call__", ( PyCFunction ) UnaryFunction0DFloat___call__, METH_VARARGS, "（Interface0DIterator it ）Executes the operator ()	on the iterator it pointing onto the point at which we wish to evaluate the function." },
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_UnaryFunction0DFloat type definition ------------------------------*/
+
+PyTypeObject UnaryFunction0DFloat_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"UnaryFunction0DFloat",				/* tp_name */
+	sizeof( BPy_UnaryFunction0DFloat ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	(destructor)UnaryFunction0DFloat___dealloc__,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	(reprfunc)UnaryFunction0DFloat___repr__,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_UnaryFunction0DFloat_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction0D_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)UnaryFunction0DFloat___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+
+PyMODINIT_FUNC UnaryFunction0DFloat_Init( PyObject *module ) {
+
+	if( module == NULL )
+		return;
+
+	if( PyType_Ready( &UnaryFunction0DFloat_Type ) < 0 )
+		return;
+	Py_INCREF( &UnaryFunction0DFloat_Type );
+	PyModule_AddObject(module, "UnaryFunction0DFloat", (PyObject *)&UnaryFunction0DFloat_Type);
+	
+	if( PyType_Ready( &GetCurvilinearAbscissaF0D_Type ) < 0 )
+		return;
+	Py_INCREF( &GetCurvilinearAbscissaF0D_Type );
+	PyModule_AddObject(module, "GetCurvilinearAbscissaF0D", (PyObject *)&GetCurvilinearAbscissaF0D_Type);
+	
+	if( PyType_Ready( &GetParameterF0D_Type ) < 0 )
+		return;
+	Py_INCREF( &GetParameterF0D_Type );
+	PyModule_AddObject(module, "GetParameterF0D", (PyObject *)&GetParameterF0D_Type);
+		
+	if( PyType_Ready( &GetViewMapGradientNormF0D_Type ) < 0 )
+		return;
+	Py_INCREF( &GetViewMapGradientNormF0D_Type );
+	PyModule_AddObject(module, "GetViewMapGradientNormF0D", (PyObject *)&GetViewMapGradientNormF0D_Type);
+	
+	if( PyType_Ready( &ReadCompleteViewMapPixelF0D_Type ) < 0 )
+		return;
+	Py_INCREF( &ReadCompleteViewMapPixelF0D_Type );
+	PyModule_AddObject(module, "ReadCompleteViewMapPixelF0D", (PyObject *)&ReadCompleteViewMapPixelF0D_Type);
+	
+	if( PyType_Ready( &ReadMapPixelF0D_Type ) < 0 )
+		return;
+	Py_INCREF( &ReadMapPixelF0D_Type );
+	PyModule_AddObject(module, "ReadMapPixelF0D", (PyObject *)&ReadMapPixelF0D_Type);
+	
+	if( PyType_Ready( &ReadSteerableViewMapPixelF0D_Type ) < 0 )
+		return;
+	Py_INCREF( &ReadSteerableViewMapPixelF0D_Type );
+	PyModule_AddObject(module, "ReadSteerableViewMapPixelF0D", (PyObject *)&ReadSteerableViewMapPixelF0D_Type);
+}
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int UnaryFunction0DFloat___init__(BPy_UnaryFunction0DFloat* self)
+{
+	self->uf0D_float = new UnaryFunction0D<float>();
+	return 0;
+}
+
+void UnaryFunction0DFloat___dealloc__(BPy_UnaryFunction0DFloat* self)
+{
+	delete self->uf0D_float;
+	UnaryFunction0D_Type.tp_dealloc((PyObject*)self);
 }
 
 
- PyObject *_wrap_UnaryFunction0DFloat___call__(PyObject *self , PyObject *args) {
+PyObject * UnaryFunction0DFloat___repr__(BPy_UnaryFunction0DFloat* self)
+{
+	return PyString_FromFormat("type: %s - address: %p", self->uf0D_float->getName().c_str(), self->uf0D_float );
 }
 
-
- PyObject *_wrap_disown_UnaryFunction0DFloat(PyObject *self , PyObject *args) {
+PyObject * UnaryFunction0DFloat_getName( BPy_UnaryFunction0DFloat *self )
+{
+	return PyString_FromString( self->uf0D_float->getName().c_str() );
 }
 
+PyObject * UnaryFunction0DFloat___call__( BPy_UnaryFunction0DFloat *self, PyObject *args)
+{
+	PyObject *obj;
 
+	if( !PyArg_ParseTuple(args, "O", &obj) && BPy_Interface0DIterator_Check(obj) ) {
+		cout << "ERROR: UnaryFunction0DFloat___call__ " << endl;		
+		return NULL;
+	}
+	
+	float f = self->uf0D_float->operator()(*( ((BPy_Interface0DIterator *) obj)->if0D_it ));
+	return PyFloat_FromDouble( f );
+
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.h
new file mode 100644
index 00000000000..46183228af6
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.h
@@ -0,0 +1,34 @@
+#ifndef FREESTYLE_PYTHON_UNARYFUNCTION0DFLOAT_H
+#define FREESTYLE_PYTHON_UNARYFUNCTION0DFLOAT_H
+
+#include "../BPy_UnaryFunction0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject UnaryFunction0DFloat_Type;
+
+#define BPy_UnaryFunction0DFloat_Check(v)	(( (PyObject *) v)->ob_type == &UnaryFunction0DFloat_Type)
+
+/*---------------------------Python BPy_UnaryFunction0DFloat structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction0D py_uf0D;
+	UnaryFunction0D<float> *uf0D_float;
+} BPy_UnaryFunction0DFloat;
+
+/*---------------------------Python BPy_UnaryFunction0DFloat visible prototypes-----------*/
+PyMODINIT_FUNC UnaryFunction0DFloat_Init( PyObject *module );
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_UNARYFUNCTION0DFLOAT_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.cpp
index b854b3ccaa4..2d6cbf09be1 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.cpp
@@ -1,12 +1,175 @@
- PyObject *_wrap_UnaryFunction0DId_getName(PyObject *self , PyObject *args) {
+#include "BPy_UnaryFunction0DId.h"
+
+#include "../BPy_Convert.h"
+#include "../Iterator/BPy_Interface0DIterator.h"
+
+#include "UnaryFunction0D_Id/BPy_ShapeIdF0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for UnaryFunction0DId instance  -----------*/
+static int UnaryFunction0DId___init__(BPy_UnaryFunction0DId* self);
+static void UnaryFunction0DId___dealloc__(BPy_UnaryFunction0DId* self);
+static PyObject * UnaryFunction0DId___repr__(BPy_UnaryFunction0DId* self);
+
+static PyObject * UnaryFunction0DId_getName( BPy_UnaryFunction0DId *self);
+static PyObject * UnaryFunction0DId___call__( BPy_UnaryFunction0DId *self, PyObject *args);
+
+/*----------------------UnaryFunction0DId instance definitions ----------------------------*/
+static PyMethodDef BPy_UnaryFunction0DId_methods[] = {
+	{"getName", ( PyCFunction ) UnaryFunction0DId_getName, METH_NOARGS, "（ ）Returns the string of the name of the unary 0D function."},
+	{"__call__", ( PyCFunction ) UnaryFunction0DId___call__, METH_VARARGS, "（Interface0DIterator it ）Executes the operator ()	on the iterator it pointing onto the point at which we wish to evaluate the function." },
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_UnaryFunction0DId type definition ------------------------------*/
+
+PyTypeObject UnaryFunction0DId_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"UnaryFunction0DId",				/* tp_name */
+	sizeof( BPy_UnaryFunction0DId ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	(destructor)UnaryFunction0DId___dealloc__,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	(reprfunc)UnaryFunction0DId___repr__,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_UnaryFunction0DId_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction0D_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)UnaryFunction0DId___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+
+PyMODINIT_FUNC UnaryFunction0DId_Init( PyObject *module ) {
+
+	if( module == NULL )
+		return;
+
+	if( PyType_Ready( &UnaryFunction0DId_Type ) < 0 )
+		return;
+	Py_INCREF( &UnaryFunction0DId_Type );
+	PyModule_AddObject(module, "UnaryFunction0DId", (PyObject *)&UnaryFunction0DId_Type);
+	
+	if( PyType_Ready( &ShapeIdF0D_Type ) < 0 )
+		return;
+	Py_INCREF( &ShapeIdF0D_Type );
+	PyModule_AddObject(module, "ShapeIdF0D", (PyObject *)&ShapeIdF0D_Type);
+		
+}
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int UnaryFunction0DId___init__(BPy_UnaryFunction0DId* self)
+{
+	self->uf0D_id = new UnaryFunction0D<Id>();
+	return 0;
+}
+
+void UnaryFunction0DId___dealloc__(BPy_UnaryFunction0DId* self)
+{
+	delete self->uf0D_id;
+	UnaryFunction0D_Type.tp_dealloc((PyObject*)self);
 }
 
 
- PyObject *_wrap_UnaryFunction0DId___call__(PyObject *self , PyObject *args) {
+PyObject * UnaryFunction0DId___repr__(BPy_UnaryFunction0DId* self)
+{
+	return PyString_FromFormat("type: %s - address: %p", self->uf0D_id->getName().c_str(), self->uf0D_id );
 }
 
-
- PyObject *_wrap_disown_UnaryFunction0DId(PyObject *self , PyObject *args) {
+PyObject * UnaryFunction0DId_getName( BPy_UnaryFunction0DId *self )
+{
+	return PyString_FromString( self->uf0D_id->getName().c_str() );
 }
 
+PyObject * UnaryFunction0DId___call__( BPy_UnaryFunction0DId *self, PyObject *args)
+{
+	PyObject *obj;
 
+	if( !PyArg_ParseTuple(args, "O", &obj) && BPy_Interface0DIterator_Check(obj) ) {
+		cout << "ERROR: UnaryFunction0DId___call__ " << endl;		
+		return NULL;
+	}
+	
+	Id id( self->uf0D_id->operator()(*( ((BPy_Interface0DIterator *) obj)->if0D_it )) );
+	return BPy_Id_from_Id( id );
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.h
new file mode 100644
index 00000000000..b1b87058bc8
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.h
@@ -0,0 +1,36 @@
+#ifndef FREESTYLE_PYTHON_UNARYFUNCTION0DID_H
+#define FREESTYLE_PYTHON_UNARYFUNCTION0DID_H
+
+#include "../BPy_UnaryFunction0D.h"
+
+#include "../../system/Id.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject UnaryFunction0DId_Type;
+
+#define BPy_UnaryFunction0DId_Check(v)	(( (PyObject *) v)->ob_type == &UnaryFunction0DId_Type)
+
+/*---------------------------Python BPy_UnaryFunction0DId structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction0D py_uf0D;
+	UnaryFunction0D<Id> *uf0D_id;
+} BPy_UnaryFunction0DId;
+
+/*---------------------------Python BPy_UnaryFunction0DId visible prototypes-----------*/
+PyMODINIT_FUNC UnaryFunction0DId_Init( PyObject *module );
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_UNARYFUNCTION0DID_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp
new file mode 100644
index 00000000000..733acce6ab8
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp
@@ -0,0 +1,176 @@
+#include "BPy_UnaryFunction0DMaterial.h"
+
+#include "../BPy_Convert.h"
+#include "../Iterator/BPy_Interface0DIterator.h"
+
+#include "UnaryFunction0D_Material/BPy_MaterialF0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for UnaryFunction0DMaterial instance  -----------*/
+static int UnaryFunction0DMaterial___init__(BPy_UnaryFunction0DMaterial* self);
+static void UnaryFunction0DMaterial___dealloc__(BPy_UnaryFunction0DMaterial* self);
+static PyObject * UnaryFunction0DMaterial___repr__(BPy_UnaryFunction0DMaterial* self);
+
+static PyObject * UnaryFunction0DMaterial_getName( BPy_UnaryFunction0DMaterial *self);
+static PyObject * UnaryFunction0DMaterial___call__( BPy_UnaryFunction0DMaterial *self, PyObject *args);
+
+/*----------------------UnaryFunction0DMaterial instance definitions ----------------------------*/
+static PyMethodDef BPy_UnaryFunction0DMaterial_methods[] = {
+	{"getName", ( PyCFunction ) UnaryFunction0DMaterial_getName, METH_NOARGS, "（ ）Returns the string of the name of the unary 0D function."},
+	{"__call__", ( PyCFunction ) UnaryFunction0DMaterial___call__, METH_VARARGS, "（Interface0DIterator it ）Executes the operator ()	on the iterator it pointing onto the point at which we wish to evaluate the function." },
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_UnaryFunction0DMaterial type definition ------------------------------*/
+
+PyTypeObject UnaryFunction0DMaterial_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"UnaryFunction0DMaterial",				/* tp_name */
+	sizeof( BPy_UnaryFunction0DMaterial ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	(destructor)UnaryFunction0DMaterial___dealloc__,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	(reprfunc)UnaryFunction0DMaterial___repr__,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_UnaryFunction0DMaterial_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction0D_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)UnaryFunction0DMaterial___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+
+PyMODINIT_FUNC UnaryFunction0DMaterial_Init( PyObject *module ) {
+
+	if( module == NULL )
+		return;
+
+	if( PyType_Ready( &UnaryFunction0DMaterial_Type ) < 0 )
+		return;
+	Py_INCREF( &UnaryFunction0DMaterial_Type );
+	PyModule_AddObject(module, "UnaryFunction0DMaterial", (PyObject *)&UnaryFunction0DMaterial_Type);
+	
+	if( PyType_Ready( &MaterialF0D_Type ) < 0 )
+		return;
+	Py_INCREF( &MaterialF0D_Type );
+	PyModule_AddObject(module, "MaterialF0D", (PyObject *)&MaterialF0D_Type);
+		
+}
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int UnaryFunction0DMaterial___init__(BPy_UnaryFunction0DMaterial* self)
+{
+	self->uf0D_material = new UnaryFunction0D<Material>();
+	return 0;
+}
+
+void UnaryFunction0DMaterial___dealloc__(BPy_UnaryFunction0DMaterial* self)
+{
+	delete self->uf0D_material;
+	UnaryFunction0D_Type.tp_dealloc((PyObject*)self);
+}
+
+
+PyObject * UnaryFunction0DMaterial___repr__(BPy_UnaryFunction0DMaterial* self)
+{
+	return PyString_FromFormat("type: %s - address: %p", self->uf0D_material->getName().c_str(), self->uf0D_material );
+}
+
+PyObject * UnaryFunction0DMaterial_getName( BPy_UnaryFunction0DMaterial *self )
+{
+	return PyString_FromString( self->uf0D_material->getName().c_str() );
+}
+
+PyObject * UnaryFunction0DMaterial___call__( BPy_UnaryFunction0DMaterial *self, PyObject *args)
+{
+	PyObject *obj;
+
+	if( !PyArg_ParseTuple(args, "O", &obj) && BPy_Interface0DIterator_Check(obj) ) {
+		cout << "ERROR: UnaryFunction0DMaterial___call__ " << endl;		
+		return NULL;
+	}
+	
+	Material m( self->uf0D_material->operator()(*( ((BPy_Interface0DIterator *) obj)->if0D_it )) );
+	return BPy_FrsMaterial_from_Material( m );
+
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.h
new file mode 100644
index 00000000000..d8baa3d98f4
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.h
@@ -0,0 +1,36 @@
+#ifndef FREESTYLE_PYTHON_UNARYFUNCTION0DMATERIAL_H
+#define FREESTYLE_PYTHON_UNARYFUNCTION0DMATERIAL_H
+
+#include "../BPy_UnaryFunction0D.h"
+
+#include "../../scene_graph/Material.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject UnaryFunction0DMaterial_Type;
+
+#define BPy_UnaryFunction0DMaterial_Check(v)	(( (PyObject *) v)->ob_type == &UnaryFunction0DMaterial_Type)
+
+/*---------------------------Python BPy_UnaryFunction0DMaterial structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction0D py_uf0D;
+	UnaryFunction0D<Material> *uf0D_material;
+} BPy_UnaryFunction0DMaterial;
+
+/*---------------------------Python BPy_UnaryFunction0DMaterial visible prototypes-----------*/
+PyMODINIT_FUNC UnaryFunction0DMaterial_Init( PyObject *module );
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_UNARYFUNCTION0DMATERIAL_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.cpp
index 425d1cdabf5..a7d8e9f42a7 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.cpp
@@ -1,12 +1,176 @@
- PyObject *_wrap_UnaryFunction0DUnsigned_getName(PyObject *self , PyObject *args) {
+#include "BPy_UnaryFunction0DUnsigned.h"
+
+#include "../BPy_Convert.h"
+#include "../Iterator/BPy_Interface0DIterator.h"
+
+#include "UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for UnaryFunction0DUnsigned instance  -----------*/
+static int UnaryFunction0DUnsigned___init__(BPy_UnaryFunction0DUnsigned* self);
+static void UnaryFunction0DUnsigned___dealloc__(BPy_UnaryFunction0DUnsigned* self);
+static PyObject * UnaryFunction0DUnsigned___repr__(BPy_UnaryFunction0DUnsigned* self);
+
+static PyObject * UnaryFunction0DUnsigned_getName( BPy_UnaryFunction0DUnsigned *self);
+static PyObject * UnaryFunction0DUnsigned___call__( BPy_UnaryFunction0DUnsigned *self, PyObject *args);
+
+/*----------------------UnaryFunction0DUnsigned instance definitions ----------------------------*/
+static PyMethodDef BPy_UnaryFunction0DUnsigned_methods[] = {
+	{"getName", ( PyCFunction ) UnaryFunction0DUnsigned_getName, METH_NOARGS, "（ ）Returns the string of the name of the unary 0D function."},
+	{"__call__", ( PyCFunction ) UnaryFunction0DUnsigned___call__, METH_VARARGS, "（Interface0DIterator it ）Executes the operator ()	on the iterator it pointing onto the point at which we wish to evaluate the function." },
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_UnaryFunction0DUnsigned type definition ------------------------------*/
+
+PyTypeObject UnaryFunction0DUnsigned_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"UnaryFunction0DUnsigned",				/* tp_name */
+	sizeof( BPy_UnaryFunction0DUnsigned ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	(destructor)UnaryFunction0DUnsigned___dealloc__,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	(reprfunc)UnaryFunction0DUnsigned___repr__,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_UnaryFunction0DUnsigned_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction0D_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)UnaryFunction0DUnsigned___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+
+PyMODINIT_FUNC UnaryFunction0DUnsigned_Init( PyObject *module ) {
+
+	if( module == NULL )
+		return;
+
+	if( PyType_Ready( &UnaryFunction0DUnsigned_Type ) < 0 )
+		return;
+	Py_INCREF( &UnaryFunction0DUnsigned_Type );
+	PyModule_AddObject(module, "UnaryFunction0DUnsigned", (PyObject *)&UnaryFunction0DUnsigned_Type);
+	
+	if( PyType_Ready( &QuantitativeInvisibilityF0D_Type ) < 0 )
+		return;
+	Py_INCREF( &QuantitativeInvisibilityF0D_Type );
+	PyModule_AddObject(module, "QuantitativeInvisibilityF0D", (PyObject *)&QuantitativeInvisibilityF0D_Type);
+			
+}
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int UnaryFunction0DUnsigned___init__(BPy_UnaryFunction0DUnsigned* self)
+{
+	self->uf0D_unsigned = new UnaryFunction0D<unsigned int>();
+	return 0;
+}
+
+void UnaryFunction0DUnsigned___dealloc__(BPy_UnaryFunction0DUnsigned* self)
+{
+	delete self->uf0D_unsigned;
+	UnaryFunction0D_Type.tp_dealloc((PyObject*)self);
 }
 
 
- PyObject *_wrap_UnaryFunction0DUnsigned___call__(PyObject *self , PyObject *args) {
+PyObject * UnaryFunction0DUnsigned___repr__(BPy_UnaryFunction0DUnsigned* self)
+{
+	return PyString_FromFormat("type: %s - address: %p", self->uf0D_unsigned->getName().c_str(), self->uf0D_unsigned );
 }
 
-
- PyObject *_wrap_disown_UnaryFunction0DUnsigned(PyObject *self , PyObject *args) {
+PyObject * UnaryFunction0DUnsigned_getName( BPy_UnaryFunction0DUnsigned *self )
+{
+	return PyString_FromString( self->uf0D_unsigned->getName().c_str() );
 }
 
+PyObject * UnaryFunction0DUnsigned___call__( BPy_UnaryFunction0DUnsigned *self, PyObject *args)
+{
+	PyObject *obj;
 
+	if( !PyArg_ParseTuple(args, "O", &obj) && BPy_Interface0DIterator_Check(obj) ) {
+		cout << "ERROR: UnaryFunction0DUnsigned___call__ " << endl;		
+		return NULL;
+	}
+	
+	unsigned int i = self->uf0D_unsigned->operator()(*( ((BPy_Interface0DIterator *) obj)->if0D_it ));
+	return PyInt_FromLong( i );
+
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.h
new file mode 100644
index 00000000000..f79739b7a34
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.h
@@ -0,0 +1,34 @@
+#ifndef FREESTYLE_PYTHON_UNARYFUNCTION0DUNSIGNED_H
+#define FREESTYLE_PYTHON_UNARYFUNCTION0DUNSIGNED_H
+
+#include "../BPy_UnaryFunction0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject UnaryFunction0DUnsigned_Type;
+
+#define BPy_UnaryFunction0DUnsigned_Check(v)	(( (PyObject *) v)->ob_type == &UnaryFunction0DUnsigned_Type)
+
+/*---------------------------Python BPy_UnaryFunction0DUnsigned structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction0D py_uf0D;
+	UnaryFunction0D<unsigned int> *uf0D_unsigned;
+} BPy_UnaryFunction0DUnsigned;
+
+/*---------------------------Python BPy_UnaryFunction0DUnsigned visible prototypes-----------*/
+PyMODINIT_FUNC UnaryFunction0DUnsigned_Init( PyObject *module );
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_UNARYFUNCTION0DUNSIGNED_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.cpp
index 828d39b6de7..fb7fc4f19fe 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.cpp
@@ -1,12 +1,182 @@
- PyObject *_wrap_UnaryFunction0DVec2f_getName(PyObject *self , PyObject *args) {
+#include "BPy_UnaryFunction0DVec2f.h"
+
+#include "../BPy_Convert.h"
+#include "../Iterator/BPy_Interface0DIterator.h"
+
+#include "UnaryFunction0D_Vec2f/BPy_Normal2DF0D.h"
+#include "UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for UnaryFunction0DVec2f instance  -----------*/
+static int UnaryFunction0DVec2f___init__(BPy_UnaryFunction0DVec2f* self);
+static void UnaryFunction0DVec2f___dealloc__(BPy_UnaryFunction0DVec2f* self);
+static PyObject * UnaryFunction0DVec2f___repr__(BPy_UnaryFunction0DVec2f* self);
+
+static PyObject * UnaryFunction0DVec2f_getName( BPy_UnaryFunction0DVec2f *self);
+static PyObject * UnaryFunction0DVec2f___call__( BPy_UnaryFunction0DVec2f *self, PyObject *args);
+
+/*----------------------UnaryFunction0DVec2f instance definitions ----------------------------*/
+static PyMethodDef BPy_UnaryFunction0DVec2f_methods[] = {
+	{"getName", ( PyCFunction ) UnaryFunction0DVec2f_getName, METH_NOARGS, "（ ）Returns the string of the name of the unary 0D function."},
+	{"__call__", ( PyCFunction ) UnaryFunction0DVec2f___call__, METH_VARARGS, "（Interface0DIterator it ）Executes the operator ()	on the iterator it pointing onto the point at which we wish to evaluate the function." },
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_UnaryFunction0DVec2f type definition ------------------------------*/
+
+PyTypeObject UnaryFunction0DVec2f_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"UnaryFunction0DVec2f",				/* tp_name */
+	sizeof( BPy_UnaryFunction0DVec2f ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	(destructor)UnaryFunction0DVec2f___dealloc__,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	(reprfunc)UnaryFunction0DVec2f___repr__,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_UnaryFunction0DVec2f_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction0D_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)UnaryFunction0DVec2f___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+
+PyMODINIT_FUNC UnaryFunction0DVec2f_Init( PyObject *module ) {
+
+	if( module == NULL )
+		return;
+
+	if( PyType_Ready( &UnaryFunction0DVec2f_Type ) < 0 )
+		return;
+	Py_INCREF( &UnaryFunction0DVec2f_Type );
+	PyModule_AddObject(module, "UnaryFunction0DVec2f", (PyObject *)&UnaryFunction0DVec2f_Type);
+	
+	if( PyType_Ready( &Normal2DF0D_Type ) < 0 )
+		return;
+	Py_INCREF( &Normal2DF0D_Type );
+	PyModule_AddObject(module, "Normal2DF0D", (PyObject *)&Normal2DF0D_Type);
+	
+	if( PyType_Ready( &VertexOrientation2DF0D_Type ) < 0 )
+		return;
+	Py_INCREF( &VertexOrientation2DF0D_Type );
+	PyModule_AddObject(module, "VertexOrientation2DF0D", (PyObject *)&VertexOrientation2DF0D_Type);
+		
+}
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int UnaryFunction0DVec2f___init__(BPy_UnaryFunction0DVec2f* self)
+{
+	self->uf0D_vec2f = new UnaryFunction0D<Vec2f>();
+	return 0;
+}
+
+void UnaryFunction0DVec2f___dealloc__(BPy_UnaryFunction0DVec2f* self)
+{
+	delete self->uf0D_vec2f;
+	UnaryFunction0D_Type.tp_dealloc((PyObject*)self);
 }
 
 
- PyObject *_wrap_UnaryFunction0DVec2f___call__(PyObject *self , PyObject *args) {
+PyObject * UnaryFunction0DVec2f___repr__(BPy_UnaryFunction0DVec2f* self)
+{
+	return PyString_FromFormat("type: %s - address: %p", self->uf0D_vec2f->getName().c_str(), self->uf0D_vec2f );
 }
 
-
- PyObject *_wrap_disown_UnaryFunction0DVec2f(PyObject *self , PyObject *args) {
+PyObject * UnaryFunction0DVec2f_getName( BPy_UnaryFunction0DVec2f *self )
+{
+	return PyString_FromString( self->uf0D_vec2f->getName().c_str() );
 }
 
+PyObject * UnaryFunction0DVec2f___call__( BPy_UnaryFunction0DVec2f *self, PyObject *args)
+{
+	PyObject *obj;
 
+	if( !PyArg_ParseTuple(args, "O", &obj) && BPy_Interface0DIterator_Check(obj) ) {
+		cout << "ERROR: UnaryFunction0DVec2f___call__ " << endl;		
+		return NULL;
+	}
+	
+	Vec2f v( self->uf0D_vec2f->operator()(*( ((BPy_Interface0DIterator *) obj)->if0D_it )) );
+	return Vector_from_Vec2f( v );
+
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.h
new file mode 100644
index 00000000000..a52edd1461a
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.h
@@ -0,0 +1,37 @@
+#ifndef FREESTYLE_PYTHON_UNARYFUNCTION0DVEC2F_H
+#define FREESTYLE_PYTHON_UNARYFUNCTION0DVEC2F_H
+
+#include "../BPy_UnaryFunction0D.h"
+
+#include "../../geometry/Geom.h"
+using namespace Geometry;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject UnaryFunction0DVec2f_Type;
+
+#define BPy_UnaryFunction0DVec2f_Check(v)	(( (PyObject *) v)->ob_type == &UnaryFunction0DVec2f_Type)
+
+/*---------------------------Python BPy_UnaryFunction0DVec2f structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction0D py_uf0D;
+	UnaryFunction0D<Vec2f> *uf0D_vec2f;
+} BPy_UnaryFunction0DVec2f;
+
+/*---------------------------Python BPy_UnaryFunction0DVec2f visible prototypes-----------*/
+PyMODINIT_FUNC UnaryFunction0DVec2f_Init( PyObject *module );
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_UNARYFUNCTION0DVEC2F_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.cpp
index b6a6d0264bc..d0412d7c7d0 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.cpp
@@ -1,12 +1,176 @@
- PyObject *_wrap_UnaryFunction0DVec3f_getName(PyObject *self , PyObject *args) {
+#include "BPy_UnaryFunction0DVec3f.h"
+
+#include "../BPy_Convert.h"
+#include "../Iterator/BPy_Interface0DIterator.h"
+
+#include "UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for UnaryFunction0DVec3f instance  -----------*/
+static int UnaryFunction0DVec3f___init__(BPy_UnaryFunction0DVec3f* self);
+static void UnaryFunction0DVec3f___dealloc__(BPy_UnaryFunction0DVec3f* self);
+static PyObject * UnaryFunction0DVec3f___repr__(BPy_UnaryFunction0DVec3f* self);
+
+static PyObject * UnaryFunction0DVec3f_getName( BPy_UnaryFunction0DVec3f *self);
+static PyObject * UnaryFunction0DVec3f___call__( BPy_UnaryFunction0DVec3f *self, PyObject *args);
+
+/*----------------------UnaryFunction0DVec3f instance definitions ----------------------------*/
+static PyMethodDef BPy_UnaryFunction0DVec3f_methods[] = {
+	{"getName", ( PyCFunction ) UnaryFunction0DVec3f_getName, METH_NOARGS, "（ ）Returns the string of the name of the unary 0D function."},
+	{"__call__", ( PyCFunction ) UnaryFunction0DVec3f___call__, METH_VARARGS, "（Interface0DIterator it ）Executes the operator ()	on the iterator it pointing onto the point at which we wish to evaluate the function." },
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_UnaryFunction0DVec3f type definition ------------------------------*/
+
+PyTypeObject UnaryFunction0DVec3f_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"UnaryFunction0DVec3f",				/* tp_name */
+	sizeof( BPy_UnaryFunction0DVec3f ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	(destructor)UnaryFunction0DVec3f___dealloc__,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	(reprfunc)UnaryFunction0DVec3f___repr__,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_UnaryFunction0DVec3f_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction0D_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)UnaryFunction0DVec3f___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+
+PyMODINIT_FUNC UnaryFunction0DVec3f_Init( PyObject *module ) {
+
+	if( module == NULL )
+		return;
+
+	if( PyType_Ready( &UnaryFunction0DVec3f_Type ) < 0 )
+		return;
+	Py_INCREF( &UnaryFunction0DVec3f_Type );
+	PyModule_AddObject(module, "UnaryFunction0DVec3f", (PyObject *)&UnaryFunction0DVec3f_Type);
+	
+	if( PyType_Ready( &VertexOrientation3DF0D_Type ) < 0 )
+		return;
+	Py_INCREF( &VertexOrientation3DF0D_Type );
+	PyModule_AddObject(module, "VertexOrientation3DF0D", (PyObject *)&VertexOrientation3DF0D_Type);
+		
+}
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int UnaryFunction0DVec3f___init__(BPy_UnaryFunction0DVec3f* self)
+{
+	self->uf0D_vec3f = new UnaryFunction0D<Vec3f>();
+	return 0;
+}
+
+void UnaryFunction0DVec3f___dealloc__(BPy_UnaryFunction0DVec3f* self)
+{
+	delete self->uf0D_vec3f;
+	UnaryFunction0D_Type.tp_dealloc((PyObject*)self);
 }
 
 
- PyObject *_wrap_UnaryFunction0DVec3f___call__(PyObject *self , PyObject *args) {
+PyObject * UnaryFunction0DVec3f___repr__(BPy_UnaryFunction0DVec3f* self)
+{
+	return PyString_FromFormat("type: %s - address: %p", self->uf0D_vec3f->getName().c_str(), self->uf0D_vec3f );
 }
 
-
- PyObject *_wrap_disown_UnaryFunction0DVec3f(PyObject *self , PyObject *args) {
+PyObject * UnaryFunction0DVec3f_getName( BPy_UnaryFunction0DVec3f *self )
+{
+	return PyString_FromString( self->uf0D_vec3f->getName().c_str() );
 }
 
+PyObject * UnaryFunction0DVec3f___call__( BPy_UnaryFunction0DVec3f *self, PyObject *args)
+{
+	PyObject *obj;
 
+	if( !PyArg_ParseTuple(args, "O", &obj) && BPy_Interface0DIterator_Check(obj) ) {
+		cout << "ERROR: UnaryFunction0DVec3f___call__ " << endl;		
+		return NULL;
+	}
+	
+	Vec3f v( self->uf0D_vec3f->operator()(*( ((BPy_Interface0DIterator *) obj)->if0D_it )) );
+	return Vector_from_Vec3f( v );
+
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.h
new file mode 100644
index 00000000000..b0e598c05cd
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.h
@@ -0,0 +1,37 @@
+#ifndef FREESTYLE_PYTHON_UNARYFUNCTION0DVEC3F_H
+#define FREESTYLE_PYTHON_UNARYFUNCTION0DVEC3F_H
+
+#include "../BPy_UnaryFunction0D.h"
+
+#include "../../geometry/Geom.h"
+using namespace Geometry;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject UnaryFunction0DVec3f_Type;
+
+#define BPy_UnaryFunction0DVec3f_Check(v)	(( (PyObject *) v)->ob_type == &UnaryFunction0DVec3f_Type)
+
+/*---------------------------Python BPy_UnaryFunction0DVec3f structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction0D py_uf0D;
+	UnaryFunction0D<Vec3f> *uf0D_vec3f;
+} BPy_UnaryFunction0DVec3f;
+
+/*---------------------------Python BPy_UnaryFunction0DVec3f visible prototypes-----------*/
+PyMODINIT_FUNC UnaryFunction0DVec3f_Init( PyObject *module );
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_UNARYFUNCTION0DVEC3F_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp
index f9736680ab8..f7c520b1492 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp
@@ -1,8 +1,181 @@
- PyObject *_wrap_UnaryFunction0DVectorViewShape_getName(PyObject *self , PyObject *args) {
+#include "BPy_UnaryFunction0DVectorViewShape.h"
+
+#include "../BPy_Convert.h"
+#include "../Iterator/BPy_Interface0DIterator.h"
+
+#include "UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for UnaryFunction0DVectorViewShape instance  -----------*/
+static int UnaryFunction0DVectorViewShape___init__(BPy_UnaryFunction0DVectorViewShape* self);
+static void UnaryFunction0DVectorViewShape___dealloc__(BPy_UnaryFunction0DVectorViewShape* self);
+static PyObject * UnaryFunction0DVectorViewShape___repr__(BPy_UnaryFunction0DVectorViewShape* self);
+
+static PyObject * UnaryFunction0DVectorViewShape_getName( BPy_UnaryFunction0DVectorViewShape *self);
+static PyObject * UnaryFunction0DVectorViewShape___call__( BPy_UnaryFunction0DVectorViewShape *self, PyObject *args);
+
+/*----------------------UnaryFunction0DVectorViewShape instance definitions ----------------------------*/
+static PyMethodDef BPy_UnaryFunction0DVectorViewShape_methods[] = {
+	{"getName", ( PyCFunction ) UnaryFunction0DVectorViewShape_getName, METH_NOARGS, "（ ）Returns the string of the name of the unary 0D function."},
+	{"__call__", ( PyCFunction ) UnaryFunction0DVectorViewShape___call__, METH_VARARGS, "（Interface0DIterator it ）Executes the operator ()	on the iterator it pointing onto the point at which we wish to evaluate the function." },
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_UnaryFunction0DVectorViewShape type definition ------------------------------*/
+
+PyTypeObject UnaryFunction0DVectorViewShape_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"UnaryFunction0DVectorViewShape",				/* tp_name */
+	sizeof( BPy_UnaryFunction0DVectorViewShape ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	(destructor)UnaryFunction0DVectorViewShape___dealloc__,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	(reprfunc)UnaryFunction0DVectorViewShape___repr__,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_UnaryFunction0DVectorViewShape_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction0D_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)UnaryFunction0DVectorViewShape___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+
+PyMODINIT_FUNC UnaryFunction0DVectorViewShape_Init( PyObject *module ) {
+
+	if( module == NULL )
+		return;
+
+	if( PyType_Ready( &UnaryFunction0DVectorViewShape_Type ) < 0 )
+		return;
+	Py_INCREF( &UnaryFunction0DVectorViewShape_Type );
+	PyModule_AddObject(module, "UnaryFunction0DVectorViewShape", (PyObject *)&UnaryFunction0DVectorViewShape_Type);
+	
+	if( PyType_Ready( &GetOccludersF0D_Type ) < 0 )
+		return;
+	Py_INCREF( &GetOccludersF0D_Type );
+	PyModule_AddObject(module, "GetOccludersF0D", (PyObject *)&GetOccludersF0D_Type);
+	
+}
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int UnaryFunction0DVectorViewShape___init__(BPy_UnaryFunction0DVectorViewShape* self)
+{
+	self->uf0D_vectorviewshape = new UnaryFunction0D< std::vector<ViewShape*> >();
+	return 0;
+}
+
+void UnaryFunction0DVectorViewShape___dealloc__(BPy_UnaryFunction0DVectorViewShape* self)
+{
+	delete self->uf0D_vectorviewshape;
+	UnaryFunction0D_Type.tp_dealloc((PyObject*)self);
 }
 
 
- PyObject *_wrap_UnaryFunction0DVectorViewShape___call__(PyObject *self , PyObject *args) {
+PyObject * UnaryFunction0DVectorViewShape___repr__(BPy_UnaryFunction0DVectorViewShape* self)
+{
+	return PyString_FromFormat("type: %s - address: %p", self->uf0D_vectorviewshape->getName().c_str(), self->uf0D_vectorviewshape );
 }
 
+PyObject * UnaryFunction0DVectorViewShape_getName( BPy_UnaryFunction0DVectorViewShape *self )
+{
+	return PyString_FromString( self->uf0D_vectorviewshape->getName().c_str() );
+}
 
+PyObject * UnaryFunction0DVectorViewShape___call__( BPy_UnaryFunction0DVectorViewShape *self, PyObject *args)
+{
+	PyObject *obj;
+
+	if( !PyArg_ParseTuple(args, "O", &obj) && BPy_Interface0DIterator_Check(obj) ) {
+		cout << "ERROR: UnaryFunction0DVectorViewShape___call__ " << endl;		
+		return NULL;
+	}
+	
+	
+	std::vector<ViewShape*> vs( self->uf0D_vectorviewshape->operator()(*( ((BPy_Interface0DIterator *) obj)->if0D_it )) );
+	PyObject *list = PyList_New(NULL);
+	
+	for( int i = 0; i < vs.size(); i++)
+		PyList_Append(list, BPy_ViewShape_from_ViewShape(*( vs[i] )) );
+	
+	return list;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.h
new file mode 100644
index 00000000000..88daae11b68
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.h
@@ -0,0 +1,37 @@
+#ifndef FREESTYLE_PYTHON_UNARYFUNCTION0DVECTORVIEWSHAPE_H
+#define FREESTYLE_PYTHON_UNARYFUNCTION0DVECTORVIEWSHAPE_H
+
+#include "../BPy_UnaryFunction0D.h"
+
+#include <vector>
+#include "../../view_map/ViewMap.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject UnaryFunction0DVectorViewShape_Type;
+
+#define BPy_UnaryFunction0DVectorViewShape_Check(v)	(( (PyObject *) v)->ob_type == &UnaryFunction0DVectorViewShape_Type)
+
+/*---------------------------Python BPy_UnaryFunction0DVectorViewShape structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction0D py_uf0D;
+	UnaryFunction0D< std::vector<ViewShape*> > *uf0D_vectorviewshape;
+} BPy_UnaryFunction0DVectorViewShape;
+
+/*---------------------------Python BPy_UnaryFunction0DVectorViewShape visible prototypes-----------*/
+PyMODINIT_FUNC UnaryFunction0DVectorViewShape_Init( PyObject *module );
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_UNARYFUNCTION0DVECTORVIEWSHAPE_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.cpp
index 3dddb333a55..eb2fceb3f06 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.cpp
@@ -1,8 +1,182 @@
- PyObject *_wrap_UnaryFunction0DViewShape_getName(PyObject *self , PyObject *args) {
+#include "BPy_UnaryFunction0DViewShape.h"
+
+#include "../BPy_Convert.h"
+#include "../Iterator/BPy_Interface0DIterator.h"
+
+#include "UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.h"
+#include "UnaryFunction0D_ViewShape/BPy_GetShapeF0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for UnaryFunction0DViewShape instance  -----------*/
+static int UnaryFunction0DViewShape___init__(BPy_UnaryFunction0DViewShape* self);
+static void UnaryFunction0DViewShape___dealloc__(BPy_UnaryFunction0DViewShape* self);
+static PyObject * UnaryFunction0DViewShape___repr__(BPy_UnaryFunction0DViewShape* self);
+
+static PyObject * UnaryFunction0DViewShape_getName( BPy_UnaryFunction0DViewShape *self);
+static PyObject * UnaryFunction0DViewShape___call__( BPy_UnaryFunction0DViewShape *self, PyObject *args);
+
+/*----------------------UnaryFunction0DViewShape instance definitions ----------------------------*/
+static PyMethodDef BPy_UnaryFunction0DViewShape_methods[] = {
+	{"getName", ( PyCFunction ) UnaryFunction0DViewShape_getName, METH_NOARGS, "（ ）Returns the string of the name of the unary 0D function."},
+	{"__call__", ( PyCFunction ) UnaryFunction0DViewShape___call__, METH_VARARGS, "（Interface0DIterator it ）Executes the operator ()	on the iterator it pointing onto the point at which we wish to evaluate the function." },
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_UnaryFunction0DViewShape type definition ------------------------------*/
+
+PyTypeObject UnaryFunction0DViewShape_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"UnaryFunction0DViewShape",				/* tp_name */
+	sizeof( BPy_UnaryFunction0DViewShape ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	(destructor)UnaryFunction0DViewShape___dealloc__,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	(reprfunc)UnaryFunction0DViewShape___repr__,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_UnaryFunction0DViewShape_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction0D_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)UnaryFunction0DViewShape___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+
+PyMODINIT_FUNC UnaryFunction0DViewShape_Init( PyObject *module ) {
+
+	if( module == NULL )
+		return;
+
+	if( PyType_Ready( &UnaryFunction0DViewShape_Type ) < 0 )
+		return;
+	Py_INCREF( &UnaryFunction0DViewShape_Type );
+	PyModule_AddObject(module, "UnaryFunction0DViewShape", (PyObject *)&UnaryFunction0DViewShape_Type);
+
+	if( PyType_Ready( &GetOccludeeF0D_Type ) < 0 )
+		return;
+	Py_INCREF( &GetOccludeeF0D_Type );
+	PyModule_AddObject(module, "GetOccludeeF0D", (PyObject *)&GetOccludeeF0D_Type);
+	
+	if( PyType_Ready( &GetShapeF0D_Type ) < 0 )
+		return;
+	Py_INCREF( &GetShapeF0D_Type );
+	PyModule_AddObject(module, "GetShapeF0D", (PyObject *)&GetShapeF0D_Type);
+		
+}
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int UnaryFunction0DViewShape___init__(BPy_UnaryFunction0DViewShape* self)
+{
+	self->uf0D_viewshape = new UnaryFunction0D<ViewShape*>();
+	return 0;
+}
+
+void UnaryFunction0DViewShape___dealloc__(BPy_UnaryFunction0DViewShape* self)
+{
+	delete self->uf0D_viewshape;
+	UnaryFunction0D_Type.tp_dealloc((PyObject*)self);
 }
 
 
- PyObject *_wrap_UnaryFunction0DViewShape___call__(PyObject *self , PyObject *args) {
+PyObject * UnaryFunction0DViewShape___repr__(BPy_UnaryFunction0DViewShape* self)
+{
+	return PyString_FromFormat("type: %s - address: %p", self->uf0D_viewshape->getName().c_str(), self->uf0D_viewshape );
 }
 
+PyObject * UnaryFunction0DViewShape_getName( BPy_UnaryFunction0DViewShape *self )
+{
+	return PyString_FromString( self->uf0D_viewshape->getName().c_str() );
+}
 
+PyObject * UnaryFunction0DViewShape___call__( BPy_UnaryFunction0DViewShape *self, PyObject *args)
+{
+	PyObject *obj;
+
+	if( !PyArg_ParseTuple(args, "O", &obj) && BPy_Interface0DIterator_Check(obj) ) {
+		cout << "ERROR: UnaryFunction0DViewShape___call__ " << endl;		
+		return NULL;
+	}
+	
+	ViewShape *vs = self->uf0D_viewshape->operator()(*( ((BPy_Interface0DIterator *) obj)->if0D_it ));
+	return BPy_ViewShape_from_ViewShape( *vs );
+
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.h
new file mode 100644
index 00000000000..01057333a3e
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.h
@@ -0,0 +1,36 @@
+#ifndef FREESTYLE_PYTHON_UNARYFUNCTION0DVIEWSHAPE_H
+#define FREESTYLE_PYTHON_UNARYFUNCTION0DVIEWSHAPE_H
+
+#include "../BPy_UnaryFunction0D.h"
+
+#include "../../view_map/ViewMap.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject UnaryFunction0DViewShape_Type;
+
+#define BPy_UnaryFunction0DViewShape_Check(v)	(( (PyObject *) v)->ob_type == &UnaryFunction0DViewShape_Type)
+
+/*---------------------------Python BPy_UnaryFunction0DViewShape structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction0D py_uf0D;
+	UnaryFunction0D<ViewShape*> *uf0D_viewshape;
+} BPy_UnaryFunction0DViewShape;
+
+/*---------------------------Python BPy_UnaryFunction0DViewShape visible prototypes-----------*/
+PyMODINIT_FUNC UnaryFunction0DViewShape_Init( PyObject *module );
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_UNARYFUNCTION0DVIEWSHAPE_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/BPy_ShapeIdF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/BPy_ShapeIdF0D.cpp
index 58fa20b8e95..2ca5f7899f9 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/BPy_ShapeIdF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/BPy_ShapeIdF0D.cpp
@@ -1,16 +1,111 @@
- PyObject *_wrap_ShapeIdF0D_getName(PyObject *self , PyObject *args) {
+#include "BPy_ShapeIdF0D.h"
+
+#include "../../../view_map/Functions0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for ShapeIdF0D instance  -----------*/
+	static int ShapeIdF0D___init__(BPy_ShapeIdF0D* self);
+
+/*-----------------------BPy_ShapeIdF0D type definition ------------------------------*/
+
+PyTypeObject ShapeIdF0D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"ShapeIdF0D",				/* tp_name */
+	sizeof( BPy_ShapeIdF0D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction0DId_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)ShapeIdF0D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int ShapeIdF0D___init__( BPy_ShapeIdF0D* self )
+{
+	self->py_uf0D_id.uf0D_id = new Functions0D::ShapeIdF0D();
+	return 0;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_ShapeIdF0D___call__(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_new_ShapeIdF0D(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_ShapeIdF0D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/BPy_ShapeIdF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/BPy_ShapeIdF0D.h
new file mode 100644
index 00000000000..25d4bd76a1b
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/BPy_ShapeIdF0D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_SHAPEIDF0D_H
+#define FREESTYLE_PYTHON_SHAPEIDF0D_H
+
+#include "../BPy_UnaryFunction0DId.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject ShapeIdF0D_Type;
+
+#define BPy_ShapeIdF0D_Check(v)	(( (PyObject *) v)->ob_type == &ShapeIdF0D_Type)
+
+/*---------------------------Python BPy_ShapeIdF0D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction0DId py_uf0D_id;
+} BPy_ShapeIdF0D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_SHAPEIDF0D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp
index 167a68b8977..d28fc2f4363 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp
@@ -1,16 +1,111 @@
- PyObject *_wrap_MaterialF0D_getName(PyObject *self , PyObject *args) {
+#include "BPy_MaterialF0D.h"
+
+#include "../../../view_map/Functions0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for MaterialF0D instance  -----------*/
+	static int MaterialF0D___init__(BPy_MaterialF0D* self);
+
+/*-----------------------BPy_MaterialF0D type definition ------------------------------*/
+
+PyTypeObject MaterialF0D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"MaterialF0D",				/* tp_name */
+	sizeof( BPy_MaterialF0D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction0DMaterial_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)MaterialF0D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int MaterialF0D___init__( BPy_MaterialF0D* self )
+{
+	self->py_uf0D_material.uf0D_material = new Functions0D::MaterialF0D();
+	return 0;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_MaterialF0D___call__(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_new_MaterialF0D(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_MaterialF0D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.h
new file mode 100644
index 00000000000..4a3af1b9ff6
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_MATERIALF0D_H
+#define FREESTYLE_PYTHON_MATERIALF0D_H
+
+#include "../BPy_UnaryFunction0DMaterial.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject MaterialF0D_Type;
+
+#define BPy_MaterialF0D_Check(v)	(( (PyObject *) v)->ob_type == &MaterialF0D_Type)
+
+/*---------------------------Python BPy_MaterialF0D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction0DMaterial py_uf0D_material;
+} BPy_MaterialF0D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_MATERIALF0D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.cpp
index 1b155757589..449a4234548 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.cpp
@@ -1,16 +1,111 @@
- PyObject *_wrap_CurveNatureF0D_getName(PyObject *self , PyObject *args) {
+#include "BPy_CurveNatureF0D.h"
+
+#include "../../../view_map/Functions0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for CurveNatureF0D instance  -----------*/
+	static int CurveNatureF0D___init__(BPy_CurveNatureF0D* self);
+
+/*-----------------------BPy_CurveNatureF0D type definition ------------------------------*/
+
+PyTypeObject CurveNatureF0D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"CurveNatureF0D",				/* tp_name */
+	sizeof( BPy_CurveNatureF0D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction0DEdgeNature_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)CurveNatureF0D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int CurveNatureF0D___init__( BPy_CurveNatureF0D* self )
+{
+	self->py_uf0D_edgenature.uf0D_edgenature = new Functions0D::CurveNatureF0D();
+	return 0;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_CurveNatureF0D___call__(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_new_CurveNatureF0D(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_CurveNatureF0D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.h
new file mode 100644
index 00000000000..62494f3dbaa
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_CURVENATUREF0D_H
+#define FREESTYLE_PYTHON_CURVENATUREF0D_H
+
+#include "../BPy_UnaryFunction0DEdgeNature.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject CurveNatureF0D_Type;
+
+#define BPy_CurveNatureF0D_Check(v)	(( (PyObject *) v)->ob_type == &CurveNatureF0D_Type)
+
+/*---------------------------Python BPy_CurveNatureF0D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction0DEdgeNature py_uf0D_edgenature;
+} BPy_CurveNatureF0D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_CURVENATUREF0D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.cpp
index 99f892529ab..141dd3274a4 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.cpp
@@ -1,16 +1,111 @@
- PyObject *_wrap_Normal2DF0D_getName(PyObject *self , PyObject *args) {
+#include "BPy_Normal2DF0D.h"
+
+#include "../../../view_map/Functions0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for Normal2DF0D instance  -----------*/
+	static int Normal2DF0D___init__(BPy_Normal2DF0D* self);
+
+/*-----------------------BPy_Normal2DF0D type definition ------------------------------*/
+
+PyTypeObject Normal2DF0D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"Normal2DF0D",				/* tp_name */
+	sizeof( BPy_Normal2DF0D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction0DVec2f_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)Normal2DF0D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int Normal2DF0D___init__( BPy_Normal2DF0D* self )
+{
+	self->py_uf0D_vec2f.uf0D_vec2f = new Functions0D::Normal2DF0D();
+	return 0;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_Normal2DF0D___call__(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_new_Normal2DF0D(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_Normal2DF0D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.h
new file mode 100644
index 00000000000..1482ffae5f2
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_NORMAL2DF0D_H
+#define FREESTYLE_PYTHON_NORMAL2DF0D_H
+
+#include "../BPy_UnaryFunction0DVec2f.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject Normal2DF0D_Type;
+
+#define BPy_Normal2DF0D_Check(v)	(( (PyObject *) v)->ob_type == &Normal2DF0D_Type)
+
+/*---------------------------Python BPy_Normal2DF0D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction0DVec2f py_uf0D_vec2f;
+} BPy_Normal2DF0D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_NORMAL2DF0D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.cpp
index bf7fbfe2550..2637ae17f2b 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.cpp
@@ -1,16 +1,111 @@
- PyObject *_wrap_VertexOrientation2DF0D_getName(PyObject *self , PyObject *args) {
+#include "BPy_VertexOrientation2DF0D.h"
+
+#include "../../../view_map/Functions0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for VertexOrientation2DF0D instance  -----------*/
+	static int VertexOrientation2DF0D___init__(BPy_VertexOrientation2DF0D* self);
+
+/*-----------------------BPy_VertexOrientation2DF0D type definition ------------------------------*/
+
+PyTypeObject VertexOrientation2DF0D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"VertexOrientation2DF0D",				/* tp_name */
+	sizeof( BPy_VertexOrientation2DF0D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction0DVec2f_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)VertexOrientation2DF0D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int VertexOrientation2DF0D___init__( BPy_VertexOrientation2DF0D* self )
+{
+	self->py_uf0D_vec2f.uf0D_vec2f = new Functions0D::VertexOrientation2DF0D();
+	return 0;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_VertexOrientation2DF0D___call__(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_new_VertexOrientation2DF0D(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_VertexOrientation2DF0D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.h
new file mode 100644
index 00000000000..c6ace665481
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_VERTEXORIENTATION2DF0D_H
+#define FREESTYLE_PYTHON_VERTEXORIENTATION2DF0D_H
+
+#include "../BPy_UnaryFunction0DVec2f.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject VertexOrientation2DF0D_Type;
+
+#define BPy_VertexOrientation2DF0D_Check(v)	(( (PyObject *) v)->ob_type == &VertexOrientation2DF0D_Type)
+
+/*---------------------------Python BPy_VertexOrientation2DF0D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction0DVec2f py_uf0D_vec2f;
+} BPy_VertexOrientation2DF0D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_VERTEXORIENTATION2DF0D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.cpp
index 32d5ac529fa..2c7eba1900a 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.cpp
@@ -1,16 +1,111 @@
- PyObject *_wrap_VertexOrientation3DF0D_getName(PyObject *self , PyObject *args) {
+#include "BPy_VertexOrientation3DF0D.h"
+
+#include "../../../view_map/Functions0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for VertexOrientation3DF0D instance  -----------*/
+	static int VertexOrientation3DF0D___init__(BPy_VertexOrientation3DF0D* self);
+
+/*-----------------------BPy_VertexOrientation3DF0D type definition ------------------------------*/
+
+PyTypeObject VertexOrientation3DF0D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"VertexOrientation3DF0D",				/* tp_name */
+	sizeof( BPy_VertexOrientation3DF0D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction0DVec3f_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)VertexOrientation3DF0D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int VertexOrientation3DF0D___init__( BPy_VertexOrientation3DF0D* self )
+{
+	self->py_uf0D_vec3f.uf0D_vec3f = new Functions0D::VertexOrientation3DF0D();
+	return 0;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_VertexOrientation3DF0D___call__(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_new_VertexOrientation3DF0D(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_VertexOrientation3DF0D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.h
new file mode 100644
index 00000000000..6a916362bb7
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_VERTEXORIENTATION3DF0D_H
+#define FREESTYLE_PYTHON_VERTEXORIENTATION3DF0D_H
+
+#include "../BPy_UnaryFunction0DVec3f.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject VertexOrientation3DF0D_Type;
+
+#define BPy_VertexOrientation3DF0D_Check(v)	(( (PyObject *) v)->ob_type == &VertexOrientation3DF0D_Type)
+
+/*---------------------------Python BPy_VertexOrientation3DF0D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction0DVec3f py_uf0D_vec3f;
+} BPy_VertexOrientation3DF0D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_VERTEXORIENTATION3DF0D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.cpp
index 2dc779a3fdb..cc36d377768 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.cpp
@@ -1,16 +1,111 @@
- PyObject *_wrap_GetOccludeeF0D_getName(PyObject *self , PyObject *args) {
+#include "BPy_GetOccludeeF0D.h"
+
+#include "../../../view_map/Functions0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for GetOccludeeF0D instance  -----------*/
+	static int GetOccludeeF0D___init__(BPy_GetOccludeeF0D* self);
+
+/*-----------------------BPy_GetOccludeeF0D type definition ------------------------------*/
+
+PyTypeObject GetOccludeeF0D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"GetOccludeeF0D",				/* tp_name */
+	sizeof( BPy_GetOccludeeF0D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction0DViewShape_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)GetOccludeeF0D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int GetOccludeeF0D___init__( BPy_GetOccludeeF0D* self )
+{
+	self->py_uf0D_viewshape.uf0D_viewshape = new Functions0D::GetOccludeeF0D();
+	return 0;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_GetOccludeeF0D___call__(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_new_GetOccludeeF0D(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_GetOccludeeF0D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.h
new file mode 100644
index 00000000000..2ba71a6637e
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_GETOCCLUDEEF0D_H
+#define FREESTYLE_PYTHON_GETOCCLUDEEF0D_H
+
+#include "../BPy_UnaryFunction0DViewShape.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject GetOccludeeF0D_Type;
+
+#define BPy_GetOccludeeF0D_Check(v)	(( (PyObject *) v)->ob_type == &GetOccludeeF0D_Type)
+
+/*---------------------------Python BPy_GetOccludeeF0D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction0DViewShape py_uf0D_viewshape;
+} BPy_GetOccludeeF0D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_GETOCCLUDEEF0D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.cpp
index 92ec79efec5..2bd4bbae039 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.cpp
@@ -1,16 +1,111 @@
- PyObject *_wrap_GetShapeF0D_getName(PyObject *self , PyObject *args) {
+#include "BPy_GetShapeF0D.h"
+
+#include "../../../view_map/Functions0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for GetShapeF0D instance  -----------*/
+	static int GetShapeF0D___init__(BPy_GetShapeF0D* self);
+
+/*-----------------------BPy_GetShapeF0D type definition ------------------------------*/
+
+PyTypeObject GetShapeF0D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"GetShapeF0D",				/* tp_name */
+	sizeof( BPy_GetShapeF0D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction0DViewShape_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)GetShapeF0D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int GetShapeF0D___init__( BPy_GetShapeF0D* self )
+{
+	self->py_uf0D_viewshape.uf0D_viewshape = new Functions0D::GetShapeF0D();
+	return 0;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_GetShapeF0D___call__(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_new_GetShapeF0D(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_GetShapeF0D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.h
new file mode 100644
index 00000000000..6e97bd9a690
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_GETSHAPEF0D_H
+#define FREESTYLE_PYTHON_GETSHAPEF0D_H
+
+#include "../BPy_UnaryFunction0DViewShape.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject GetShapeF0D_Type;
+
+#define BPy_GetShapeF0D_Check(v)	(( (PyObject *) v)->ob_type == &GetShapeF0D_Type)
+
+/*---------------------------Python BPy_GetShapeF0D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction0DViewShape py_uf0D_viewshape;
+} BPy_GetShapeF0D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_GETSHAPEF0D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_Curvature2DAngleF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_Curvature2DAngleF0D.cpp
new file mode 100644
index 00000000000..70bf4d677e6
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_Curvature2DAngleF0D.cpp
@@ -0,0 +1,111 @@
+#include "BPy_Curvature2DAngleF0D.h"
+
+#include "../../../view_map/Functions0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for Curvature2DAngleF0D instance  -----------*/
+	static int Curvature2DAngleF0D___init__(BPy_Curvature2DAngleF0D* self);
+
+/*-----------------------BPy_Curvature2DAngleF0D type definition ------------------------------*/
+
+PyTypeObject Curvature2DAngleF0D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"Curvature2DAngleF0D",				/* tp_name */
+	sizeof( BPy_Curvature2DAngleF0D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction0DDouble_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)Curvature2DAngleF0D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int Curvature2DAngleF0D___init__( BPy_Curvature2DAngleF0D* self )
+{
+	self->py_uf0D_double.uf0D_double = new Functions0D::Curvature2DAngleF0D();
+	return 0;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_Curvature2DAngleF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_Curvature2DAngleF0D.h
new file mode 100644
index 00000000000..1146369320a
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_Curvature2DAngleF0D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_CURVATURE2DANGLEF0D_H
+#define FREESTYLE_PYTHON_CURVATURE2DANGLEF0D_H
+
+#include "../BPy_UnaryFunction0DDouble.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject Curvature2DAngleF0D_Type;
+
+#define BPy_Curvature2DAngleF0D_Check(v)	(( (PyObject *) v)->ob_type == &Curvature2DAngleF0D_Type)
+
+/*---------------------------Python BPy_Curvature2DAngleF0D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction0DDouble py_uf0D_double;
+} BPy_Curvature2DAngleF0D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_CURVATURE2DANGLEF0D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedXF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedXF0D.cpp
new file mode 100644
index 00000000000..7bc2e368fb5
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedXF0D.cpp
@@ -0,0 +1,111 @@
+#include "BPy_GetProjectedXF0D.h"
+
+#include "../../../view_map/Functions0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for GetProjectedXF0D instance  -----------*/
+	static int GetProjectedXF0D___init__(BPy_GetProjectedXF0D* self);
+
+/*-----------------------BPy_GetProjectedXF0D type definition ------------------------------*/
+
+PyTypeObject GetProjectedXF0D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"GetProjectedXF0D",				/* tp_name */
+	sizeof( BPy_GetProjectedXF0D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction0DDouble_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)GetProjectedXF0D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int GetProjectedXF0D___init__( BPy_GetProjectedXF0D* self )
+{
+	self->py_uf0D_double.uf0D_double = new Functions0D::GetProjectedXF0D();
+	return 0;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedXF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedXF0D.h
new file mode 100644
index 00000000000..dcf6648cd6d
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedXF0D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_GETPROJECTEDXF0D_H
+#define FREESTYLE_PYTHON_GETPROJECTEDXF0D_H
+
+#include "../BPy_UnaryFunction0DDouble.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject GetProjectedXF0D_Type;
+
+#define BPy_GetProjectedXF0D_Check(v)	(( (PyObject *) v)->ob_type == &GetProjectedXF0D_Type)
+
+/*---------------------------Python BPy_GetProjectedXF0D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction0DDouble py_uf0D_double;
+} BPy_GetProjectedXF0D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_GETPROJECTEDXF0D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedYF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedYF0D.cpp
new file mode 100644
index 00000000000..b0a4f1d82db
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedYF0D.cpp
@@ -0,0 +1,111 @@
+#include "BPy_GetProjectedYF0D.h"
+
+#include "../../../view_map/Functions0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for GetProjectedYF0D instance  -----------*/
+	static int GetProjectedYF0D___init__(BPy_GetProjectedYF0D* self);
+
+/*-----------------------BPy_GetProjectedYF0D type definition ------------------------------*/
+
+PyTypeObject GetProjectedYF0D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"GetProjectedYF0D",				/* tp_name */
+	sizeof( BPy_GetProjectedYF0D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction0DDouble_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)GetProjectedYF0D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int GetProjectedYF0D___init__( BPy_GetProjectedYF0D* self )
+{
+	self->py_uf0D_double.uf0D_double = new Functions0D::GetProjectedYF0D();
+	return 0;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedYF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedYF0D.h
new file mode 100644
index 00000000000..ea7d5a5ab76
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedYF0D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_GETPROJECTEDYF0D_H
+#define FREESTYLE_PYTHON_GETPROJECTEDYF0D_H
+
+#include "../BPy_UnaryFunction0DDouble.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject GetProjectedYF0D_Type;
+
+#define BPy_GetProjectedYF0D_Check(v)	(( (PyObject *) v)->ob_type == &GetProjectedYF0D_Type)
+
+/*---------------------------Python BPy_GetProjectedYF0D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction0DDouble py_uf0D_double;
+} BPy_GetProjectedYF0D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_GETPROJECTEDYF0D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedZF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedZF0D.cpp
new file mode 100644
index 00000000000..b452a32e987
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedZF0D.cpp
@@ -0,0 +1,111 @@
+#include "BPy_GetProjectedZF0D.h"
+
+#include "../../../view_map/Functions0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for GetProjectedZF0D instance  -----------*/
+	static int GetProjectedZF0D___init__(BPy_GetProjectedZF0D* self);
+
+/*-----------------------BPy_GetProjectedZF0D type definition ------------------------------*/
+
+PyTypeObject GetProjectedZF0D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"GetProjectedZF0D",				/* tp_name */
+	sizeof( BPy_GetProjectedZF0D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction0DDouble_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)GetProjectedZF0D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int GetProjectedZF0D___init__( BPy_GetProjectedZF0D* self )
+{
+	self->py_uf0D_double.uf0D_double = new Functions0D::GetProjectedZF0D();
+	return 0;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedZF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedZF0D.h
new file mode 100644
index 00000000000..c3cd9cb8c19
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedZF0D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_GETPROJECTEDZF0D_H
+#define FREESTYLE_PYTHON_GETPROJECTEDZF0D_H
+
+#include "../BPy_UnaryFunction0DDouble.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject GetProjectedZF0D_Type;
+
+#define BPy_GetProjectedZF0D_Check(v)	(( (PyObject *) v)->ob_type == &GetProjectedZF0D_Type)
+
+/*---------------------------Python BPy_GetProjectedZF0D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction0DDouble py_uf0D_double;
+} BPy_GetProjectedZF0D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_GETPROJECTEDZF0D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetXF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetXF0D.cpp
new file mode 100644
index 00000000000..b5ac0a0b08c
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetXF0D.cpp
@@ -0,0 +1,111 @@
+#include "BPy_GetXF0D.h"
+
+#include "../../../view_map/Functions0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for GetXF0D instance  -----------*/
+	static int GetXF0D___init__(BPy_GetXF0D* self);
+
+/*-----------------------BPy_GetXF0D type definition ------------------------------*/
+
+PyTypeObject GetXF0D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"GetXF0D",				/* tp_name */
+	sizeof( BPy_GetXF0D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction0DDouble_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)GetXF0D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int GetXF0D___init__( BPy_GetXF0D* self )
+{
+	self->py_uf0D_double.uf0D_double = new Functions0D::GetXF0D();
+	return 0;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetXF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetXF0D.h
new file mode 100644
index 00000000000..6164a46f252
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetXF0D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_GETXF0D_H
+#define FREESTYLE_PYTHON_GETXF0D_H
+
+#include "../BPy_UnaryFunction0DDouble.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject GetXF0D_Type;
+
+#define BPy_GetXF0D_Check(v)	(( (PyObject *) v)->ob_type == &GetXF0D_Type)
+
+/*---------------------------Python BPy_GetXF0D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction0DDouble py_uf0D_double;
+} BPy_GetXF0D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_GETXF0D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetYF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetYF0D.cpp
new file mode 100644
index 00000000000..45bb5450fbd
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetYF0D.cpp
@@ -0,0 +1,111 @@
+#include "BPy_GetYF0D.h"
+
+#include "../../../view_map/Functions0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for GetYF0D instance  -----------*/
+	static int GetYF0D___init__(BPy_GetYF0D* self);
+
+/*-----------------------BPy_GetYF0D type definition ------------------------------*/
+
+PyTypeObject GetYF0D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"GetYF0D",				/* tp_name */
+	sizeof( BPy_GetYF0D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction0DDouble_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)GetYF0D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int GetYF0D___init__( BPy_GetYF0D* self )
+{
+	self->py_uf0D_double.uf0D_double = new Functions0D::GetYF0D();
+	return 0;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetYF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetYF0D.h
new file mode 100644
index 00000000000..f85e2c5976a
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetYF0D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_GETYF0D_H
+#define FREESTYLE_PYTHON_GETYF0D_H
+
+#include "../BPy_UnaryFunction0DDouble.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject GetYF0D_Type;
+
+#define BPy_GetYF0D_Check(v)	(( (PyObject *) v)->ob_type == &GetYF0D_Type)
+
+/*---------------------------Python BPy_GetYF0D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction0DDouble py_uf0D_double;
+} BPy_GetYF0D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_GETYF0D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetZF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetZF0D.cpp
new file mode 100644
index 00000000000..83605b1b356
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetZF0D.cpp
@@ -0,0 +1,111 @@
+#include "BPy_GetZF0D.h"
+
+#include "../../../view_map/Functions0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for GetZF0D instance  -----------*/
+	static int GetZF0D___init__(BPy_GetZF0D* self);
+
+/*-----------------------BPy_GetZF0D type definition ------------------------------*/
+
+PyTypeObject GetZF0D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"GetZF0D",				/* tp_name */
+	sizeof( BPy_GetZF0D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction0DDouble_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)GetZF0D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int GetZF0D___init__( BPy_GetZF0D* self )
+{
+	self->py_uf0D_double.uf0D_double = new Functions0D::GetZF0D();
+	return 0;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetZF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetZF0D.h
new file mode 100644
index 00000000000..c7bed2ebda8
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetZF0D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_GETZF0D_H
+#define FREESTYLE_PYTHON_GETZF0D_H
+
+#include "../BPy_UnaryFunction0DDouble.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject GetZF0D_Type;
+
+#define BPy_GetZF0D_Check(v)	(( (PyObject *) v)->ob_type == &GetZF0D_Type)
+
+/*---------------------------Python BPy_GetZF0D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction0DDouble py_uf0D_double;
+} BPy_GetZF0D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_GETZF0D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.cpp
new file mode 100644
index 00000000000..0d6222c8a9a
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.cpp
@@ -0,0 +1,111 @@
+#include "BPy_ZDiscontinuityF0D.h"
+
+#include "../../../view_map/Functions0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for ZDiscontinuityF0D instance  -----------*/
+	static int ZDiscontinuityF0D___init__(BPy_ZDiscontinuityF0D* self);
+
+/*-----------------------BPy_ZDiscontinuityF0D type definition ------------------------------*/
+
+PyTypeObject ZDiscontinuityF0D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"ZDiscontinuityF0D",				/* tp_name */
+	sizeof( BPy_ZDiscontinuityF0D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction0DDouble_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)ZDiscontinuityF0D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int ZDiscontinuityF0D___init__( BPy_ZDiscontinuityF0D* self )
+{
+	self->py_uf0D_double.uf0D_double = new Functions0D::ZDiscontinuityF0D();
+	return 0;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.h
new file mode 100644
index 00000000000..21f854d96c9
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_ZDISCONTINUITYF0D_H
+#define FREESTYLE_PYTHON_ZDISCONTINUITYF0D_H
+
+#include "../BPy_UnaryFunction0DDouble.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject ZDiscontinuityF0D_Type;
+
+#define BPy_ZDiscontinuityF0D_Check(v)	(( (PyObject *) v)->ob_type == &ZDiscontinuityF0D_Type)
+
+/*---------------------------Python BPy_ZDiscontinuityF0D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction0DDouble py_uf0D_double;
+} BPy_ZDiscontinuityF0D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_ZDISCONTINUITYF0D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.cpp
index 359e3186905..0a0702cf1b8 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.cpp
@@ -1,16 +1,111 @@
- PyObject *_wrap_GetCurvilinearAbscissaF0D_getName(PyObject *self , PyObject *args) {
+#include "BPy_GetCurvilinearAbscissaF0D.h"
+
+#include "../../../view_map/Functions0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for GetCurvilinearAbscissaF0D instance  -----------*/
+	static int GetCurvilinearAbscissaF0D___init__(BPy_GetCurvilinearAbscissaF0D* self);
+
+/*-----------------------BPy_GetCurvilinearAbscissaF0D type definition ------------------------------*/
+
+PyTypeObject GetCurvilinearAbscissaF0D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"GetCurvilinearAbscissaF0D",				/* tp_name */
+	sizeof( BPy_GetCurvilinearAbscissaF0D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction0DFloat_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)GetCurvilinearAbscissaF0D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int GetCurvilinearAbscissaF0D___init__( BPy_GetCurvilinearAbscissaF0D* self )
+{
+	self->py_uf0D_float.uf0D_float = new Functions0D::GetCurvilinearAbscissaF0D();
+	return 0;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_GetCurvilinearAbscissaF0D___call__(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_new_GetCurvilinearAbscissaF0D(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_GetCurvilinearAbscissaF0D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.h
new file mode 100644
index 00000000000..f36371dfee5
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_GETCURVILINEARABSCISSAF0D_H
+#define FREESTYLE_PYTHON_GETCURVILINEARABSCISSAF0D_H
+
+#include "../BPy_UnaryFunction0DFloat.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject GetCurvilinearAbscissaF0D_Type;
+
+#define BPy_GetCurvilinearAbscissaF0D_Check(v)	(( (PyObject *) v)->ob_type == &GetCurvilinearAbscissaF0D_Type)
+
+/*---------------------------Python BPy_GetCurvilinearAbscissaF0D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction0DFloat py_uf0D_float;
+} BPy_GetCurvilinearAbscissaF0D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_GETCURVILINEARABSCISSAF0D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetParameterF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetParameterF0D.cpp
index 71b7ac85a7f..eab08495810 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetParameterF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetParameterF0D.cpp
@@ -1,16 +1,111 @@
- PyObject *_wrap_GetParameterF0D_getName(PyObject *self , PyObject *args) {
+#include "BPy_GetParameterF0D.h"
+
+#include "../../../view_map/Functions0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for GetParameterF0D instance  -----------*/
+	static int GetParameterF0D___init__(BPy_GetParameterF0D* self);
+
+/*-----------------------BPy_GetParameterF0D type definition ------------------------------*/
+
+PyTypeObject GetParameterF0D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"GetParameterF0D",				/* tp_name */
+	sizeof( BPy_GetParameterF0D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction0DFloat_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)GetParameterF0D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int GetParameterF0D___init__( BPy_GetParameterF0D* self )
+{
+	self->py_uf0D_float.uf0D_float = new Functions0D::GetParameterF0D();
+	return 0;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_GetParameterF0D___call__(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_new_GetParameterF0D(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_GetParameterF0D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetParameterF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetParameterF0D.h
new file mode 100644
index 00000000000..77a08de4b07
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetParameterF0D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_GETPARAMETERF0D_H
+#define FREESTYLE_PYTHON_GETPARAMETERF0D_H
+
+#include "../BPy_UnaryFunction0DFloat.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject GetParameterF0D_Type;
+
+#define BPy_GetParameterF0D_Check(v)	(( (PyObject *) v)->ob_type == &GetParameterF0D_Type)
+
+/*---------------------------Python BPy_GetParameterF0D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction0DFloat py_uf0D_float;
+} BPy_GetParameterF0D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_GETPARAMETERF0D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.cpp
index 8def0ea948f..796abed5298 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.cpp
@@ -1,12 +1,118 @@
- PyObject *_wrap_GetViewMapGradientNormF0D_getName(PyObject *self , PyObject *args) {
+#include "BPy_GetViewMapGradientNormF0D.h"
+
+#include "../../../stroke/AdvancedFunctions0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for GetViewMapGradientNormF0D instance  -----------*/
+	static int GetViewMapGradientNormF0D___init__(BPy_GetViewMapGradientNormF0D* self, PyObject *args);
+
+/*-----------------------BPy_GetViewMapGradientNormF0D type definition ------------------------------*/
+
+PyTypeObject GetViewMapGradientNormF0D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"GetViewMapGradientNormF0D",				/* tp_name */
+	sizeof( BPy_GetViewMapGradientNormF0D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction0DFloat_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)GetViewMapGradientNormF0D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int GetViewMapGradientNormF0D___init__( BPy_GetViewMapGradientNormF0D* self, PyObject *args)
+{
+	int i;
+
+	if( !PyArg_ParseTuple(args, "i", &i) ) {
+		cout << "ERROR: GetViewMapGradientNormF0D___init__" << endl;		
+		return -1;
+	}
+	
+	self->py_uf0D_float.uf0D_float = new Functions0D::GetViewMapGradientNormF0D(i);
+	return 0;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_GetViewMapGradientNormF0D___call__(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_delete_GetViewMapGradientNormF0D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.h
new file mode 100644
index 00000000000..aa626703aff
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_GETVIEWMAPGRADIENTNORMF0D_H
+#define FREESTYLE_PYTHON_GETVIEWMAPGRADIENTNORMF0D_H
+
+#include "../BPy_UnaryFunction0DFloat.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject GetViewMapGradientNormF0D_Type;
+
+#define BPy_GetViewMapGradientNormF0D_Check(v)	(( (PyObject *) v)->ob_type == &GetViewMapGradientNormF0D_Type)
+
+/*---------------------------Python BPy_GetViewMapGradientNormF0D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction0DFloat py_uf0D_float;
+} BPy_GetViewMapGradientNormF0D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_GETVIEWMAPGRADIENTNORMF0D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.cpp
index 74fdf60dffc..0ca3cdffb78 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.cpp
@@ -1,12 +1,118 @@
- PyObject *_wrap_ReadCompleteViewMapPixelF0D_getName(PyObject *self , PyObject *args) {
+#include "BPy_ReadCompleteViewMapPixelF0D.h"
+
+#include "../../../stroke/AdvancedFunctions0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for ReadCompleteViewMapPixelF0D instance  -----------*/
+	static int ReadCompleteViewMapPixelF0D___init__(BPy_ReadCompleteViewMapPixelF0D* self, PyObject *args);
+
+/*-----------------------BPy_ReadCompleteViewMapPixelF0D type definition ------------------------------*/
+
+PyTypeObject ReadCompleteViewMapPixelF0D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"ReadCompleteViewMapPixelF0D",				/* tp_name */
+	sizeof( BPy_ReadCompleteViewMapPixelF0D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction0DFloat_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)ReadCompleteViewMapPixelF0D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int ReadCompleteViewMapPixelF0D___init__( BPy_ReadCompleteViewMapPixelF0D* self, PyObject *args)
+{
+	int i;
+
+	if( !PyArg_ParseTuple(args, "i", &i) ) {
+		cout << "ERROR: ReadCompleteViewMapPixelF0D___init__" << endl;		
+		return -1;
+	}
+	
+	self->py_uf0D_float.uf0D_float = new Functions0D::ReadCompleteViewMapPixelF0D(i);
+	return 0;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_ReadCompleteViewMapPixelF0D___call__(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_delete_ReadCompleteViewMapPixelF0D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.h
new file mode 100644
index 00000000000..5a4d90e821d
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_READCOMPLETEVIEWMAPPIXELF0D_H
+#define FREESTYLE_PYTHON_READCOMPLETEVIEWMAPPIXELF0D_H
+
+#include "../BPy_UnaryFunction0DFloat.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject ReadCompleteViewMapPixelF0D_Type;
+
+#define BPy_ReadCompleteViewMapPixelF0D_Check(v)	(( (PyObject *) v)->ob_type == &ReadCompleteViewMapPixelF0D_Type)
+
+/*---------------------------Python BPy_ReadCompleteViewMapPixelF0D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction0DFloat py_uf0D_float;
+} BPy_ReadCompleteViewMapPixelF0D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_READCOMPLETEVIEWMAPPIXELF0D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadMapPixelF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadMapPixelF0D.cpp
index cb2bdd4c60a..216ac3da8da 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadMapPixelF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadMapPixelF0D.cpp
@@ -1,12 +1,119 @@
- PyObject *_wrap_ReadMapPixelF0D_getName(PyObject *self , PyObject *args) {
+#include "BPy_ReadMapPixelF0D.h"
+
+#include "../../../stroke/AdvancedFunctions0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for ReadMapPixelF0D instance  -----------*/
+	static int ReadMapPixelF0D___init__(BPy_ReadMapPixelF0D* self, PyObject *args);
+
+/*-----------------------BPy_ReadMapPixelF0D type definition ------------------------------*/
+
+PyTypeObject ReadMapPixelF0D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"ReadMapPixelF0D",				/* tp_name */
+	sizeof( BPy_ReadMapPixelF0D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction0DFloat_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)ReadMapPixelF0D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int ReadMapPixelF0D___init__( BPy_ReadMapPixelF0D* self, PyObject *args)
+{
+	const char *s;
+	int i;
+
+	if( !PyArg_ParseTuple(args, "si", &s, &i) ) {
+		cout << "ERROR: ReadMapPixelF0D___init__" << endl;		
+		return -1;
+	}
+	
+	self->py_uf0D_float.uf0D_float = new Functions0D::ReadMapPixelF0D(s,i);
+	return 0;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_ReadMapPixelF0D___call__(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_delete_ReadMapPixelF0D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadMapPixelF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadMapPixelF0D.h
new file mode 100644
index 00000000000..e010bd3495a
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadMapPixelF0D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_READMAPPIXELF0D_H
+#define FREESTYLE_PYTHON_READMAPPIXELF0D_H
+
+#include "../BPy_UnaryFunction0DFloat.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject ReadMapPixelF0D_Type;
+
+#define BPy_ReadMapPixelF0D_Check(v)	(( (PyObject *) v)->ob_type == &ReadMapPixelF0D_Type)
+
+/*---------------------------Python BPy_ReadMapPixelF0D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction0DFloat py_uf0D_float;
+} BPy_ReadMapPixelF0D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_READMAPPIXELF0D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.cpp
index dc32cf290a0..114ffa6aab0 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.cpp
@@ -1,12 +1,119 @@
- PyObject *_wrap_ReadSteerableViewMapPixelF0D_getName(PyObject *self , PyObject *args) {
+#include "BPy_ReadSteerableViewMapPixelF0D.h"
+
+#include "../../../stroke/AdvancedFunctions0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for ReadSteerableViewMapPixelF0D instance  -----------*/
+	static int ReadSteerableViewMapPixelF0D___init__(BPy_ReadSteerableViewMapPixelF0D* self, PyObject *args);
+
+/*-----------------------BPy_ReadSteerableViewMapPixelF0D type definition ------------------------------*/
+
+PyTypeObject ReadSteerableViewMapPixelF0D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"ReadSteerableViewMapPixelF0D",				/* tp_name */
+	sizeof( BPy_ReadSteerableViewMapPixelF0D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction0DFloat_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)ReadSteerableViewMapPixelF0D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int ReadSteerableViewMapPixelF0D___init__( BPy_ReadSteerableViewMapPixelF0D* self, PyObject *args)
+{
+	unsigned int u;
+	int i;
+
+	if( !PyArg_ParseTuple(args, "Ii", &u, &i) ) {
+		cout << "ERROR: ReadSteerableViewMapPixelF0D___init__" << endl;		
+		return -1;
+	}
+	
+	self->py_uf0D_float.uf0D_float = new Functions0D::ReadSteerableViewMapPixelF0D(u,i);
+	return 0;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_ReadSteerableViewMapPixelF0D___call__(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_delete_ReadSteerableViewMapPixelF0D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.h
new file mode 100644
index 00000000000..cc0c3a93f0e
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_READSTEERABLEVIEWMAPPIXELF0D_H
+#define FREESTYLE_PYTHON_READSTEERABLEVIEWMAPPIXELF0D_H
+
+#include "../BPy_UnaryFunction0DFloat.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject ReadSteerableViewMapPixelF0D_Type;
+
+#define BPy_ReadSteerableViewMapPixelF0D_Check(v)	(( (PyObject *) v)->ob_type == &ReadSteerableViewMapPixelF0D_Type)
+
+/*---------------------------Python BPy_ReadSteerableViewMapPixelF0D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction0DFloat py_uf0D_float;
+} BPy_ReadSteerableViewMapPixelF0D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_READSTEERABLEVIEWMAPPIXELF0D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_Curvature2DAngleF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_Curvature2DAngleF0D.cpp
deleted file mode 100644
index f91642ad7c1..00000000000
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_Curvature2DAngleF0D.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
- PyObject *_wrap_Curvature2DAngleF0D_getName(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Curvature2DAngleF0D___call__(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_Curvature2DAngleF0D(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_Curvature2DAngleF0D(PyObject *self , PyObject *args) {
-}
-
-
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetProjectedXF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetProjectedXF0D.cpp
deleted file mode 100644
index f99666cdd65..00000000000
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetProjectedXF0D.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
- PyObject *_wrap_GetProjectedXF0D_getName(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_GetProjectedXF0D___call__(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_GetProjectedXF0D(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_GetProjectedXF0D(PyObject *self , PyObject *args) {
-}
-
-
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetProjectedYF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetProjectedYF0D.cpp
deleted file mode 100644
index 44eb1d44bf2..00000000000
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetProjectedYF0D.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
- PyObject *_wrap_GetProjectedYF0D_getName(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_GetProjectedYF0D___call__(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_GetProjectedYF0D(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_GetProjectedYF0D(PyObject *self , PyObject *args) {
-}
-
-
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetProjectedZF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetProjectedZF0D.cpp
deleted file mode 100644
index 0257328973b..00000000000
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetProjectedZF0D.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
- PyObject *_wrap_GetProjectedZF0D_getName(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_GetProjectedZF0D___call__(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_GetProjectedZF0D(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_GetProjectedZF0D(PyObject *self , PyObject *args) {
-}
-
-
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetXF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetXF0D.cpp
deleted file mode 100644
index 6bc16ad36d1..00000000000
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetXF0D.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
- PyObject *_wrap_GetXF0D_getName(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_GetXF0D___call__(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_GetXF0D(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_GetXF0D(PyObject *self , PyObject *args) {
-}
-
-
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetYF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetYF0D.cpp
deleted file mode 100644
index c2651fc59be..00000000000
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetYF0D.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
- PyObject *_wrap_GetYF0D_getName(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_GetYF0D___call__(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_GetYF0D(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_GetYF0D(PyObject *self , PyObject *args) {
-}
-
-
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetZF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetZF0D.cpp
deleted file mode 100644
index e3f1f56a932..00000000000
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_GetZF0D.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
- PyObject *_wrap_GetZF0D_getName(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_GetZF0D___call__(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_GetZF0D(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_GetZF0D(PyObject *self , PyObject *args) {
-}
-
-
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_ZDiscontinuityF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_ZDiscontinuityF0D.cpp
deleted file mode 100644
index c72e020066a..00000000000
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/BPy_ZDiscontinuityF0D.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
- PyObject *_wrap_ZDiscontinuityF0D_getName(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ZDiscontinuityF0D___call__(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_ZDiscontinuityF0D(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_ZDiscontinuityF0D(PyObject *self , PyObject *args) {
-}
-
-
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.cpp
index 15e3114b81a..a81822f08ac 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.cpp
@@ -1,16 +1,111 @@
- PyObject *_wrap_QuantitativeInvisibilityF0D_getName(PyObject *self , PyObject *args) {
+#include "BPy_QuantitativeInvisibilityF0D.h"
+
+#include "../../../view_map/Functions0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for QuantitativeInvisibilityF0D instance  -----------*/
+	static int QuantitativeInvisibilityF0D___init__(BPy_QuantitativeInvisibilityF0D* self);
+
+/*-----------------------BPy_QuantitativeInvisibilityF0D type definition ------------------------------*/
+
+PyTypeObject QuantitativeInvisibilityF0D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"QuantitativeInvisibilityF0D",				/* tp_name */
+	sizeof( BPy_QuantitativeInvisibilityF0D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction0DUnsigned_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)QuantitativeInvisibilityF0D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int QuantitativeInvisibilityF0D___init__( BPy_QuantitativeInvisibilityF0D* self )
+{
+	self->py_uf0D_unsigned.uf0D_unsigned = new Functions0D::QuantitativeInvisibilityF0D();
+	return 0;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_QuantitativeInvisibilityF0D___call__(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_new_QuantitativeInvisibilityF0D(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_QuantitativeInvisibilityF0D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.h
new file mode 100644
index 00000000000..02706b48bd5
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_QUANTITATIVEINVISIBILITYF0D_H
+#define FREESTYLE_PYTHON_QUANTITATIVEINVISIBILITYF0D_H
+
+#include "../BPy_UnaryFunction0DUnsigned.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject QuantitativeInvisibilityF0D_Type;
+
+#define BPy_QuantitativeInvisibilityF0D_Check(v)	(( (PyObject *) v)->ob_type == &QuantitativeInvisibilityF0D_Type)
+
+/*---------------------------Python BPy_QuantitativeInvisibilityF0D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction0DUnsigned py_uf0D_unsigned;
+} BPy_QuantitativeInvisibilityF0D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_QUANTITATIVEINVISIBILITYF0D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.cpp
index 95de61007c1..6d7b903a37f 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.cpp
@@ -1,16 +1,111 @@
- PyObject *_wrap_GetOccludersF0D_getName(PyObject *self , PyObject *args) {
+#include "BPy_GetOccludersF0D.h"
+
+#include "../../../view_map/Functions0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for GetOccludersF0D instance  -----------*/
+	static int GetOccludersF0D___init__(BPy_GetOccludersF0D* self);
+
+/*-----------------------BPy_GetOccludersF0D type definition ------------------------------*/
+
+PyTypeObject GetOccludersF0D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"GetOccludersF0D",				/* tp_name */
+	sizeof( BPy_GetOccludersF0D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction0DVectorViewShape_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)GetOccludersF0D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int GetOccludersF0D___init__( BPy_GetOccludersF0D* self )
+{
+	self->py_uf0D_vectorviewshape.uf0D_vectorviewshape = new Functions0D::GetOccludersF0D();
+	return 0;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_GetOccludersF0D___call__(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_new_GetOccludersF0D(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_GetOccludersF0D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.h
new file mode 100644
index 00000000000..3d4108124f0
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_GETOCCLUDERSF0D_H
+#define FREESTYLE_PYTHON_GETOCCLUDERSF0D_H
+
+#include "../BPy_UnaryFunction0DVectorViewShape.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject GetOccludersF0D_Type;
+
+#define BPy_GetOccludersF0D_Check(v)	(( (PyObject *) v)->ob_type == &GetOccludersF0D_Type)
+
+/*---------------------------Python BPy_GetOccludersF0D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction0DVectorViewShape py_uf0D_vectorviewshape;
+} BPy_GetOccludersF0D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_GETOCCLUDERSF0D_H */

From 2b2df54aefa61e249d21b09c2f6ca0b82be7bed4 Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Sun, 27 Jul 2008 11:27:59 +0000
Subject: [PATCH 152/252] soc-2008-mxcurioni: ported ALL 1D unary functions,
 representing 32 new classes.

---
 source/blender/freestyle/SConscript           |  33 ++
 .../freestyle/intern/python/BPy_Convert.cpp   |  16 +
 .../freestyle/intern/python/BPy_Convert.h     |   3 +
 .../intern/python/BPy_UnaryFunction1D.cpp     |  66 ++--
 .../intern/python/BPy_UnaryFunction1D.h       |   1 -
 .../BPy_UnaryFunction0DVectorViewShape.cpp    |   2 +-
 .../BPy_UnaryFunction1DDouble.cpp             | 291 +++++++++++++++++-
 .../BPy_UnaryFunction1DDouble.h               |  34 ++
 .../BPy_UnaryFunction1DEdgeNature.cpp         | 209 +++++++++++++
 .../BPy_UnaryFunction1DEdgeNature.h           |  36 +++
 .../BPy_UnaryFunction1DFloat.cpp              | 194 +++++++++++-
 .../BPy_UnaryFunction1DFloat.h                |  34 ++
 .../BPy_UnaryFunction1DUnsigned.cpp           | 201 +++++++++++-
 .../BPy_UnaryFunction1DUnsigned.h             |  34 ++
 .../BPy_UnaryFunction1DVec2f.cpp              | 207 ++++++++++++-
 .../BPy_UnaryFunction1DVec2f.h                |  37 +++
 .../BPy_UnaryFunction1DVec3f.cpp              | 201 +++++++++++-
 .../BPy_UnaryFunction1DVec3f.h                |  37 +++
 .../BPy_UnaryFunction1DVectorViewShape.cpp    | 222 ++++++++++++-
 .../BPy_UnaryFunction1DVectorViewShape.h      |  37 +++
 .../BPy_UnaryFunction1DVoid.cpp               | 224 ++++++++++++++
 .../UnaryFunction1D/BPy_UnaryFunction1DVoid.h |  34 ++
 .../BPy_CurveNatureF1D.cpp                    | 127 +++++++-
 .../BPy_CurveNatureF1D.h                      |  30 ++
 .../UnaryFunction1D_Vec2f/BPy_Normal2DF1D.cpp | 126 +++++++-
 .../UnaryFunction1D_Vec2f/BPy_Normal2DF1D.h   |  30 ++
 .../BPy_Orientation2DF1D.cpp                  | 127 +++++++-
 .../BPy_Orientation2DF1D.h                    |  30 ++
 .../BPy_Orientation3DF1D.cpp                  | 128 +++++++-
 .../BPy_Orientation3DF1D.h                    |  30 ++
 .../BPy_Curvature2DAngleF1D.cpp               | 121 ++++++++
 .../BPy_Curvature2DAngleF1D.h                 |  30 ++
 .../UnaryFunction1D_double/BPy_DensityF1D.cpp | 124 +++++++-
 .../UnaryFunction1D_double/BPy_DensityF1D.h   |  30 ++
 .../BPy_GetCompleteViewMapDensityF1D.cpp      | 128 +++++++-
 .../BPy_GetCompleteViewMapDensityF1D.h        |  30 ++
 .../BPy_GetDirectionalViewMapDensityF1D.cpp   | 128 +++++++-
 .../BPy_GetDirectionalViewMapDensityF1D.h     |  30 ++
 .../BPy_GetProjectedXF1D.cpp                  | 122 ++++++++
 .../BPy_GetProjectedXF1D.h                    |  30 ++
 .../BPy_GetProjectedYF1D.cpp                  | 121 ++++++++
 .../BPy_GetProjectedYF1D.h                    |  30 ++
 .../BPy_GetProjectedZF1D.cpp                  | 121 ++++++++
 .../BPy_GetProjectedZF1D.h                    |  30 ++
 .../BPy_GetSteerableViewMapDensityF1D.cpp     | 124 ++++++++
 .../BPy_GetSteerableViewMapDensityF1D.h       |  30 ++
 .../BPy_GetViewMapGradientNormF1D.cpp         | 124 ++++++++
 .../BPy_GetViewMapGradientNormF1D.h           |  30 ++
 .../UnaryFunction1D_double/BPy_GetXF1D.cpp    | 122 ++++++++
 .../UnaryFunction1D_double/BPy_GetXF1D.h      |  30 ++
 .../UnaryFunction1D_double/BPy_GetYF1D.cpp    | 120 ++++++++
 .../UnaryFunction1D_double/BPy_GetYF1D.h      |  30 ++
 .../UnaryFunction1D_double/BPy_GetZF1D.cpp    | 121 ++++++++
 .../UnaryFunction1D_double/BPy_GetZF1D.h      |  30 ++
 .../BPy_LocalAverageDepthF1D.cpp              | 127 +++++++-
 .../BPy_LocalAverageDepthF1D.h                |  30 ++
 .../BPy_ZDiscontinuityF1D.cpp                 | 122 ++++++++
 .../BPy_ZDiscontinuityF1D.h                   |  30 ++
 .../BPy_Curvature2DAngleF1D.cpp               |  12 -
 .../BPy_GetProjectedXF1D.cpp                  |  12 -
 .../BPy_GetProjectedYF1D.cpp                  |  12 -
 .../BPy_GetProjectedZF1D.cpp                  |  12 -
 .../BPy_GetSteerableViewMapDensityF1D.cpp     |   8 -
 .../BPy_GetViewMapGradientNormF1D.cpp         |  12 -
 .../UnaryFunction1D_real/BPy_GetXF1D.cpp      |  12 -
 .../UnaryFunction1D_real/BPy_GetYF1D.cpp      |  12 -
 .../UnaryFunction1D_real/BPy_GetZF1D.cpp      |  12 -
 .../BPy_ZDiscontinuityF1D.cpp                 |  12 -
 .../BPy_QuantitativeInvisibilityF1D.cpp       |  12 -
 .../BPy_QuantitativeInvisibilityF1D.cpp       | 122 ++++++++
 .../BPy_QuantitativeInvisibilityF1D.h         |  30 ++
 .../BPy_GetOccludeeF1D.cpp                    | 117 ++++++-
 .../BPy_GetOccludeeF1D.h                      |  30 ++
 .../BPy_GetOccludersF1D.cpp                   | 117 ++++++-
 .../BPy_GetOccludersF1D.h                     |  30 ++
 .../BPy_GetShapeF1D.cpp                       | 117 ++++++-
 .../BPy_GetShapeF1D.h                         |  30 ++
 .../BPy_ChainingTimeStampF1D.cpp              | 121 +++++++-
 .../BPy_ChainingTimeStampF1D.h                |  30 ++
 .../BPy_IncrementChainingTimeStampF1D.cpp     | 121 +++++++-
 .../BPy_IncrementChainingTimeStampF1D.h       |  30 ++
 .../UnaryFunction1D_void/BPy_TimeStampF1D.cpp | 121 +++++++-
 .../UnaryFunction1D_void/BPy_TimeStampF1D.h   |  30 ++
 83 files changed, 5761 insertions(+), 339 deletions(-)
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Normal2DF1D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_Curvature2DAngleF1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_Curvature2DAngleF1D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_DensityF1D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedXF1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedXF1D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedYF1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedYF1D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedZF1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedZF1D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetSteerableViewMapDensityF1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetSteerableViewMapDensityF1D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetViewMapGradientNormF1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetViewMapGradientNormF1D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetXF1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetXF1D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetYF1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetYF1D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetZF1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetZF1D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_LocalAverageDepthF1D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.h
 delete mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_Curvature2DAngleF1D.cpp
 delete mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetProjectedXF1D.cpp
 delete mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetProjectedYF1D.cpp
 delete mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetProjectedZF1D.cpp
 delete mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetSteerableViewMapDensityF1D.cpp
 delete mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetViewMapGradientNormF1D.cpp
 delete mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetXF1D.cpp
 delete mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetYF1D.cpp
 delete mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetZF1D.cpp
 delete mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_ZDiscontinuityF1D.cpp
 delete mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned/BPy_QuantitativeInvisibilityF1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.h

diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript
index 3ee1a79ce0c..3abce0d3ec1 100644
--- a/source/blender/freestyle/SConscript
+++ b/source/blender/freestyle/SConscript
@@ -138,6 +138,39 @@ python_sources = [
 							prefix + '/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.cpp',
 							prefix + '/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.cpp',
 					prefix + '/BPy_UnaryFunction1D.cpp',
+							prefix + '/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp',
+								prefix + '/UnaryFunction1D/UnaryFunction1D_double/BPy_Curvature2DAngleF1D.cpp',
+								prefix + '/UnaryFunction1D/UnaryFunction1D_double/BPy_DensityF1D.cpp',
+								prefix + '/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.cpp',
+								prefix + '/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.cpp',
+								prefix + '/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedXF1D.cpp',
+								prefix + '/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedYF1D.cpp',
+								prefix + '/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedZF1D.cpp',
+								prefix + '/UnaryFunction1D/UnaryFunction1D_double/BPy_GetSteerableViewMapDensityF1D.cpp',
+								prefix + '/UnaryFunction1D/UnaryFunction1D_double/BPy_GetViewMapGradientNormF1D.cpp',
+								prefix + '/UnaryFunction1D/UnaryFunction1D_double/BPy_GetXF1D.cpp',
+								prefix + '/UnaryFunction1D/UnaryFunction1D_double/BPy_GetYF1D.cpp',
+								prefix + '/UnaryFunction1D/UnaryFunction1D_double/BPy_GetZF1D.cpp',
+								prefix + '/UnaryFunction1D/UnaryFunction1D_double/BPy_LocalAverageDepthF1D.cpp',
+								prefix + '/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.cpp',
+							prefix + '/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp',
+									prefix + '/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.cpp',
+							prefix + '/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp',
+							prefix + '/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp',
+								prefix + '/UnaryFunction1D/UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.cpp',
+							prefix + '/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp',
+								prefix + '/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Normal2DF1D.cpp',
+								prefix + '/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.cpp',
+							prefix + '/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp',
+								prefix + '/UnaryFunction1D/UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.cpp',
+							prefix + '/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp',
+								prefix + '/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.cpp',
+								prefix + '/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.cpp',
+								prefix + '/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.cpp',
+							prefix + '/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp',
+								prefix + '/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.cpp',
+								prefix + '/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.cpp',
+								prefix + '/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.cpp',
 					prefix + '/BPy_UnaryPredicate0D.cpp',
 					prefix + '/BPy_UnaryPredicate1D.cpp',
 					prefix + '/BPy_ViewMap.cpp',
diff --git a/source/blender/freestyle/intern/python/BPy_Convert.cpp b/source/blender/freestyle/intern/python/BPy_Convert.cpp
index 4d66b46420a..d7b8bfa6cce 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Convert.cpp
@@ -189,6 +189,22 @@ PyObject * BPy_FrsMaterial_from_Material( Material& m ){
 	return py_m;
 }
 
+PyObject * BPy_IntegrationType_from_IntegrationType( int i ) {
+	PyObject *py_it = IntegrationType_Type.tp_new( &IntegrationType_Type, 0, 0 );
+
+	PyObject *args = PyTuple_New(1);
+	PyTuple_SetItem( args, 0, PyInt_FromLong(i) );
+	IntegrationType_Type.tp_init( py_it, args, 0 );
+	Py_DECREF(args);
+
+	return py_it;
+}
+
+IntegrationType IntegrationType_from_BPy_IntegrationType( PyObject* obj ) {
+	return static_cast<IntegrationType>( PyInt_AsLong(obj) );
+}
+
+
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/source/blender/freestyle/intern/python/BPy_Convert.h b/source/blender/freestyle/intern/python/BPy_Convert.h
index 9bf535ead6a..4d318fcbc1d 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.h
+++ b/source/blender/freestyle/intern/python/BPy_Convert.h
@@ -58,10 +58,13 @@ PyObject * Vector_from_Vec2f( Vec2f& v );
 PyObject * Vector_from_Vec3f( Vec3f& v );
 PyObject * Vector_from_Vec3r( Vec3r& v );
 
+IntegrationType IntegrationType_from_BPy_IntegrationType( PyObject* obj );
+
 PyObject * BPy_BBox_from_BBox( BBox< Vec3r > &bb );
 PyObject * BPy_FEdge_from_FEdge( FEdge& fe );
 PyObject * BPy_Id_from_Id( Id& id );
 PyObject * BPy_Interface0D_from_Interface0D( Interface0D& if0D );
+PyObject * BPy_IntegrationType_from_IntegrationType( int i );
 PyObject * BPy_FrsMaterial_from_Material( Material& m );
 PyObject * BPy_Nature_from_Nature( unsigned short n );
 PyObject * BPy_MediumType_from_MediumType( int n );
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp
index 70f6feb02d3..9ab0ce41fb3 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp
@@ -1,6 +1,13 @@
 #include "BPy_UnaryFunction1D.h"
 
-#include "BPy_Convert.h"
+#include "UnaryFunction1D/BPy_UnaryFunction1DDouble.h"
+#include "UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.h"
+#include "UnaryFunction1D/BPy_UnaryFunction1DFloat.h"
+#include "UnaryFunction1D/BPy_UnaryFunction1DUnsigned.h"
+#include "UnaryFunction1D/BPy_UnaryFunction1DVec2f.h"
+#include "UnaryFunction1D/BPy_UnaryFunction1DVec3f.h"
+#include "UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.h"
+
 
 #ifdef __cplusplus
 extern "C" {
@@ -9,17 +16,11 @@ extern "C" {
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 /*---------------  Python API function prototypes for UnaryFunction1D instance  -----------*/
-static int UnaryFunction1D___init__(BPy_UnaryFunction1D *self, PyObject *args, PyObject *kwds);
 static void UnaryFunction1D___dealloc__(BPy_UnaryFunction1D *self);
 static PyObject * UnaryFunction1D___repr__(BPy_UnaryFunction1D *self);
 
-static PyObject * UnaryFunction1D_getName( BPy_UnaryFunction1D *self, PyObject *args);
-static PyObject * UnaryFunction1D___call__( BPy_UnaryFunction1D *self, PyObject *args);
-
 /*----------------------UnaryFunction1D instance definitions ----------------------------*/
 static PyMethodDef BPy_UnaryFunction1D_methods[] = {
-	{"getName", ( PyCFunction ) UnaryFunction1D_getName, METH_NOARGS, ""},
-	{"__call__", ( PyCFunction ) UnaryFunction1D___call__, METH_VARARGS, "" },
 	{NULL, NULL, 0, NULL}
 };
 
@@ -73,7 +74,7 @@ PyTypeObject UnaryFunction1D_Type = {
 	NULL,                       /* richcmpfunc tp_richcompare; */
 
   /***  weak reference enabler ***/
-	NULL,                          /* long tp_weaklistoffset; */
+	0,                          /* long tp_weaklistoffset; */
 
   /*** Added in release 2.2 ***/
 	/*   Iterators */
@@ -88,8 +89,8 @@ PyTypeObject UnaryFunction1D_Type = {
 	NULL,							/* PyObject *tp_dict; */
 	NULL,							/* descrgetfunc tp_descr_get; */
 	NULL,							/* descrsetfunc tp_descr_set; */
-	NULL,                          	/* long tp_dictoffset; */
-	(initproc)UnaryFunction1D___init__, /* initproc tp_init; */
+	0,                          	/* long tp_dictoffset; */
+	NULL, /* initproc tp_init; */
 	NULL,							/* allocfunc tp_alloc; */
 	PyType_GenericNew,		/* newfunc tp_new; */
 	
@@ -118,56 +119,29 @@ PyMODINIT_FUNC UnaryFunction1D_Init( PyObject *module )
 		return;
 	Py_INCREF( &UnaryFunction1D_Type );
 	PyModule_AddObject(module, "UnaryFunction1D", (PyObject *)&UnaryFunction1D_Type);
+
+	UnaryFunction1DDouble_Init( module );
+	UnaryFunction1DEdgeNature_Init( module );
+	UnaryFunction1DFloat_Init( module );
+	UnaryFunction1DUnsigned_Init( module );
+	UnaryFunction1DVec2f_Init( module );
+	UnaryFunction1DVec3f_Init( module );
+	UnaryFunction1DVectorViewShape_Init( module );
 }
 
 //------------------------INSTANCE METHODS ----------------------------------
 
-int UnaryFunction1D___init__(BPy_UnaryFunction1D *self, PyObject *args, PyObject *kwds)
-{
-	return 0;
-}
-
 void UnaryFunction1D___dealloc__(BPy_UnaryFunction1D* self)
 {
-	//delete self->uf1D;
     self->ob_type->tp_free((PyObject*)self);
 }
 
 
 PyObject * UnaryFunction1D___repr__(BPy_UnaryFunction1D* self)
 {
-    return PyString_FromFormat("type: %s - address: %p", ((UnaryFunction1D<void> *) self->uf1D)->getName().c_str(), self->uf1D );
+    return PyString_FromString("UnaryFunction1D");
 }
 
-
-PyObject * UnaryFunction1D_getName( BPy_UnaryFunction1D *self, PyObject *args)
-{
-	return PyString_FromString( ((UnaryFunction1D<void> *) self->uf1D)->getName().c_str() );
-}
-
-PyObject * UnaryFunction1D___call__( BPy_UnaryFunction1D *self, PyObject *args)
-{
-	PyObject *l;
-
-	if( !PyArg_ParseTuple(args, "O", &l) ) {
-		cout << "ERROR: UnaryFunction1D___call__ " << endl;		
-		return NULL;
-	}
-	
-	// pb: operator() is called on Interface0DIterator while we have a list
-	// solutions:
-	// 1)reconvert back to iterator ?
-	// 2) adapt interface0d to have t(), u() functions
-	
-	// b = self->bp0D->operator()( *(obj1->uf0D) );
-	// return PyBool_from_bool( b );
-	
-	Py_RETURN_NONE;
-}
-
-// void 	setIntegrationType (IntegrationType integration)
-// IntegrationType 	getIntegrationType () const
-
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h
index 4c509f50b85..21cece45fa4 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h
+++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h
@@ -18,7 +18,6 @@ extern PyTypeObject UnaryFunction1D_Type;
 /*---------------------------Python BPy_UnaryFunction1D structure definition----------*/
 typedef struct {
 	PyObject_HEAD
- 	void *uf1D;
 } BPy_UnaryFunction1D;
 
 /*---------------------------Python BPy_UnaryFunction1D visible prototypes-----------*/
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp
index f7c520b1492..02aef4e28cf 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp
@@ -168,7 +168,7 @@ PyObject * UnaryFunction0DVectorViewShape___call__( BPy_UnaryFunction0DVectorVie
 	std::vector<ViewShape*> vs( self->uf0D_vectorviewshape->operator()(*( ((BPy_Interface0DIterator *) obj)->if0D_it )) );
 	PyObject *list = PyList_New(NULL);
 	
-	for( int i = 0; i < vs.size(); i++)
+	for( unsigned int i = 0; i < vs.size(); i++)
 		PyList_Append(list, BPy_ViewShape_from_ViewShape(*( vs[i] )) );
 	
 	return list;
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp
index ad7c6627799..5b6aed936b9 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp
@@ -1,20 +1,285 @@
- PyObject *_wrap_UnaryFunction1DDouble_getName(PyObject *self , PyObject *args) {
+#include "BPy_UnaryFunction1DDouble.h"
+
+#include "../BPy_Convert.h"
+#include "../BPy_Interface1D.h"
+#include "../BPy_IntegrationType.h"
+
+#include "UnaryFunction1D_double/BPy_Curvature2DAngleF1D.h"
+#include "UnaryFunction1D_double/BPy_DensityF1D.h"
+#include "UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.h"
+#include "UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.h"
+#include "UnaryFunction1D_double/BPy_GetProjectedXF1D.h"
+#include "UnaryFunction1D_double/BPy_GetProjectedYF1D.h"
+#include "UnaryFunction1D_double/BPy_GetProjectedZF1D.h"
+#include "UnaryFunction1D_double/BPy_GetSteerableViewMapDensityF1D.h"
+#include "UnaryFunction1D_double/BPy_GetViewMapGradientNormF1D.h"
+#include "UnaryFunction1D_double/BPy_GetXF1D.h"
+#include "UnaryFunction1D_double/BPy_GetYF1D.h"
+#include "UnaryFunction1D_double/BPy_GetZF1D.h"
+#include "UnaryFunction1D_double/BPy_LocalAverageDepthF1D.h"
+#include "UnaryFunction1D_double/BPy_ZDiscontinuityF1D.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for UnaryFunction1DDouble instance  -----------*/
+static int UnaryFunction1DDouble___init__(BPy_UnaryFunction1DDouble* self, PyObject *args);
+static void UnaryFunction1DDouble___dealloc__(BPy_UnaryFunction1DDouble* self);
+static PyObject * UnaryFunction1DDouble___repr__(BPy_UnaryFunction1DDouble* self);
+
+static PyObject * UnaryFunction1DDouble_getName( BPy_UnaryFunction1DDouble *self);
+static PyObject * UnaryFunction1DDouble___call__( BPy_UnaryFunction1DDouble *self, PyObject *args);
+static PyObject * UnaryFunction1DDouble_setIntegrationType(BPy_UnaryFunction1DDouble* self, PyObject *args);
+static PyObject * UnaryFunction1DDouble_getIntegrationType(BPy_UnaryFunction1DDouble* self);
+
+/*----------------------UnaryFunction1DDouble instance definitions ----------------------------*/
+static PyMethodDef BPy_UnaryFunction1DDouble_methods[] = {
+	{"getName", ( PyCFunction ) UnaryFunction1DDouble_getName, METH_NOARGS, "（ ）Returns the string of the name of the unary 1D function."},
+	{"__call__", ( PyCFunction ) UnaryFunction1DDouble___call__, METH_VARARGS, "（Interface1D if1D ）Builds a UnaryFunction1D from an integration type. " },
+	{"setIntegrationType", ( PyCFunction ) UnaryFunction1DDouble_setIntegrationType, METH_VARARGS, "（IntegrationType i ）Sets the integration method" },
+	{"getIntegrationType", ( PyCFunction ) UnaryFunction1DDouble_getIntegrationType, METH_NOARGS, "() Returns the integration method." },
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_UnaryFunction1DDouble type definition ------------------------------*/
+
+PyTypeObject UnaryFunction1DDouble_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"UnaryFunction1DDouble",				/* tp_name */
+	sizeof( BPy_UnaryFunction1DDouble ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	(destructor)UnaryFunction1DDouble___dealloc__,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	(reprfunc)UnaryFunction1DDouble___repr__,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_UnaryFunction1DDouble_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction1D_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)UnaryFunction1DDouble___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+
+PyMODINIT_FUNC UnaryFunction1DDouble_Init( PyObject *module ) {
+
+	if( module == NULL )
+		return;
+
+	if( PyType_Ready( &UnaryFunction1DDouble_Type ) < 0 )
+		return;
+	Py_INCREF( &UnaryFunction1DDouble_Type );
+	PyModule_AddObject(module, "UnaryFunction1DDouble", (PyObject *)&UnaryFunction1DDouble_Type);
+
+	if( PyType_Ready( &DensityF1D_Type ) < 0 )
+		return;
+	Py_INCREF( &DensityF1D_Type );
+	PyModule_AddObject(module, "DensityF1D", (PyObject *)&DensityF1D_Type);
+
+	if( PyType_Ready( &GetCompleteViewMapDensityF1D_Type ) < 0 )
+		return;
+	Py_INCREF( &GetCompleteViewMapDensityF1D_Type );
+	PyModule_AddObject(module, "GetCompleteViewMapDensityF1D", (PyObject *)&GetCompleteViewMapDensityF1D_Type);
+
+	if( PyType_Ready( &GetDirectionalViewMapDensityF1D_Type ) < 0 )
+		return;
+	Py_INCREF( &GetDirectionalViewMapDensityF1D_Type );
+	PyModule_AddObject(module, "GetDirectionalViewMapDensityF1D", (PyObject *)&GetDirectionalViewMapDensityF1D_Type);
+
+	if( PyType_Ready( &GetProjectedXF1D_Type ) < 0 )
+		return;
+	Py_INCREF( &GetProjectedXF1D_Type );
+	PyModule_AddObject(module, "GetProjectedXF1D", (PyObject *)&GetProjectedXF1D_Type);
+
+	if( PyType_Ready( &GetProjectedYF1D_Type ) < 0 )
+		return;
+	Py_INCREF( &GetProjectedYF1D_Type );
+	PyModule_AddObject(module, "GetProjectedYF1D", (PyObject *)&GetProjectedYF1D_Type);
+	
+	if( PyType_Ready( &GetProjectedZF1D_Type ) < 0 )
+		return;
+	Py_INCREF( &GetProjectedZF1D_Type );
+	PyModule_AddObject(module, "GetProjectedZF1D", (PyObject *)&GetProjectedZF1D_Type);
+
+	if( PyType_Ready( &GetSteerableViewMapDensityF1D_Type ) < 0 )
+		return;
+	Py_INCREF( &GetSteerableViewMapDensityF1D_Type );
+	PyModule_AddObject(module, "GetSteerableViewMapDensityF1D", (PyObject *)&GetSteerableViewMapDensityF1D_Type);
+
+	if( PyType_Ready( &GetViewMapGradientNormF1D_Type ) < 0 )
+		return;
+	Py_INCREF( &GetViewMapGradientNormF1D_Type );
+	PyModule_AddObject(module, "GetViewMapGradientNormF1D", (PyObject *)&GetViewMapGradientNormF1D_Type);
+
+	if( PyType_Ready( &GetXF1D_Type ) < 0 )
+		return;
+	Py_INCREF( &GetXF1D_Type );
+	PyModule_AddObject(module, "GetXF1D", (PyObject *)&GetXF1D_Type);
+
+	if( PyType_Ready( &GetYF1D_Type ) < 0 )
+		return;
+	Py_INCREF( &GetYF1D_Type );
+	PyModule_AddObject(module, "GetYF1D", (PyObject *)&GetYF1D_Type);
+
+	if( PyType_Ready( &GetZF1D_Type ) < 0 )
+		return;
+	Py_INCREF( &GetZF1D_Type );
+	PyModule_AddObject(module, "GetZF1D", (PyObject *)&GetZF1D_Type);
+
+	if( PyType_Ready( &LocalAverageDepthF1D_Type ) < 0 )
+		return;
+	Py_INCREF( &LocalAverageDepthF1D_Type );
+	PyModule_AddObject(module, "LocalAverageDepthF1D", (PyObject *)&LocalAverageDepthF1D_Type);
+
+	if( PyType_Ready( &ZDiscontinuityF1D_Type ) < 0 )
+		return;
+	Py_INCREF( &ZDiscontinuityF1D_Type );
+	PyModule_AddObject(module, "ZDiscontinuityF1D", (PyObject *)&ZDiscontinuityF1D_Type);
+		
+}
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int UnaryFunction1DDouble___init__(BPy_UnaryFunction1DDouble* self, PyObject *args)
+{
+	PyObject *obj;
+
+	if( !PyArg_ParseTuple(args, "|O", &obj) && BPy_IntegrationType_Check(obj) ) {
+		cout << "ERROR: UnaryFunction1DDouble___init__ " << endl;		
+		return -1;
+	}
+	
+	if( !obj )
+		self->uf1D_double = new UnaryFunction1D<double>();
+	else {
+		self->uf1D_double = new UnaryFunction1D<double>( IntegrationType_from_BPy_IntegrationType(obj) );
+	}
+	
+	return 0;
+}
+
+void UnaryFunction1DDouble___dealloc__(BPy_UnaryFunction1DDouble* self)
+{
+	delete self->uf1D_double;
+	UnaryFunction1D_Type.tp_dealloc((PyObject*)self);
 }
 
 
- PyObject *_wrap_UnaryFunction1DDouble___call__(PyObject *self , PyObject *args) {
+PyObject * UnaryFunction1DDouble___repr__(BPy_UnaryFunction1DDouble* self)
+{
+	return PyString_FromFormat("type: %s - address: %p", self->uf1D_double->getName().c_str(), self->uf1D_double );
+}
+
+PyObject * UnaryFunction1DDouble_getName( BPy_UnaryFunction1DDouble *self )
+{
+	return PyString_FromString( self->uf1D_double->getName().c_str() );
+}
+
+PyObject * UnaryFunction1DDouble___call__( BPy_UnaryFunction1DDouble *self, PyObject *args)
+{
+	PyObject *obj;
+
+	if( !PyArg_ParseTuple(args, "O", &obj) && BPy_Interface1D_Check(obj) ) {
+		cout << "ERROR: UnaryFunction1DDouble___call__ " << endl;		
+		return NULL;
+	}
+	
+	double d = self->uf1D_double->operator()(*( ((BPy_Interface1D *) obj)->if1D ));
+	return PyFloat_FromDouble( d );
+
+}
+
+PyObject * UnaryFunction1DDouble_setIntegrationType(BPy_UnaryFunction1DDouble* self, PyObject *args)
+{
+	PyObject *obj;
+
+	if( !PyArg_ParseTuple(args, "O", &obj) && BPy_IntegrationType_Check(obj) ) {
+		cout << "ERROR: UnaryFunction1DDouble_setIntegrationType " << endl;		
+		Py_RETURN_NONE;
+	}
+	
+	self->uf1D_double->setIntegrationType( IntegrationType_from_BPy_IntegrationType(obj) );
+	Py_RETURN_NONE;
+}
+
+PyObject * UnaryFunction1DDouble_getIntegrationType(BPy_UnaryFunction1DDouble* self) {
+	return BPy_IntegrationType_from_IntegrationType( self->uf1D_double->getIntegrationType() );
 }
 
 
- PyObject *_wrap_UnaryFunction1DDouble_setIntegrationType(PyObject *self , PyObject *args) {
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_UnaryFunction1DDouble_getIntegrationType(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_disown_UnaryFunction1DDouble(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.h b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.h
new file mode 100644
index 00000000000..7b6e9430498
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.h
@@ -0,0 +1,34 @@
+#ifndef FREESTYLE_PYTHON_UNARYFUNCTION1DDOUBLE_H
+#define FREESTYLE_PYTHON_UNARYFUNCTION1DDOUBLE_H
+
+#include "../BPy_UnaryFunction1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject UnaryFunction1DDouble_Type;
+
+#define BPy_UnaryFunction1DDouble_Check(v)	(( (PyObject *) v)->ob_type == &UnaryFunction1DDouble_Type)
+
+/*---------------------------Python BPy_UnaryFunction1DDouble structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction1D py_uf1D;
+	UnaryFunction1D<double> *uf1D_double;
+} BPy_UnaryFunction1DDouble;
+
+/*---------------------------Python BPy_UnaryFunction1DDouble visible prototypes-----------*/
+PyMODINIT_FUNC UnaryFunction1DDouble_Init( PyObject *module );
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_UNARYFUNCTION1DDOUBLE_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp
new file mode 100644
index 00000000000..d4d7f642494
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp
@@ -0,0 +1,209 @@
+#include "BPy_UnaryFunction1DEdgeNature.h"
+
+#include "../BPy_Convert.h"
+#include "../BPy_Interface1D.h"
+#include "../BPy_IntegrationType.h"
+
+#include "UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for UnaryFunction1DEdgeNature instance  -----------*/
+static int UnaryFunction1DEdgeNature___init__(BPy_UnaryFunction1DEdgeNature* self, PyObject *args);
+static void UnaryFunction1DEdgeNature___dealloc__(BPy_UnaryFunction1DEdgeNature* self);
+static PyObject * UnaryFunction1DEdgeNature___repr__(BPy_UnaryFunction1DEdgeNature* self);
+
+static PyObject * UnaryFunction1DEdgeNature_getName( BPy_UnaryFunction1DEdgeNature *self);
+static PyObject * UnaryFunction1DEdgeNature___call__( BPy_UnaryFunction1DEdgeNature *self, PyObject *args);
+static PyObject * UnaryFunction1DEdgeNature_setIntegrationType(BPy_UnaryFunction1DEdgeNature* self, PyObject *args);
+static PyObject * UnaryFunction1DEdgeNature_getIntegrationType(BPy_UnaryFunction1DEdgeNature* self);
+
+/*----------------------UnaryFunction1DEdgeNature instance definitions ----------------------------*/
+static PyMethodDef BPy_UnaryFunction1DEdgeNature_methods[] = {
+	{"getName", ( PyCFunction ) UnaryFunction1DEdgeNature_getName, METH_NOARGS, "（ ）Returns the string of the name of the unary 1D function."},
+	{"__call__", ( PyCFunction ) UnaryFunction1DEdgeNature___call__, METH_VARARGS, "（Interface1D if1D ）Builds a UnaryFunction1D from an integration type. " },
+	{"setIntegrationType", ( PyCFunction ) UnaryFunction1DEdgeNature_setIntegrationType, METH_VARARGS, "（IntegrationType i ）Sets the integration method" },
+	{"getIntegrationType", ( PyCFunction ) UnaryFunction1DEdgeNature_getIntegrationType, METH_NOARGS, "() Returns the integration method." },
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_UnaryFunction1DEdgeNature type definition ------------------------------*/
+
+PyTypeObject UnaryFunction1DEdgeNature_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"UnaryFunction1DEdgeNature",				/* tp_name */
+	sizeof( BPy_UnaryFunction1DEdgeNature ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	(destructor)UnaryFunction1DEdgeNature___dealloc__,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	(reprfunc)UnaryFunction1DEdgeNature___repr__,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_UnaryFunction1DEdgeNature_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction1D_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)UnaryFunction1DEdgeNature___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+
+PyMODINIT_FUNC UnaryFunction1DEdgeNature_Init( PyObject *module ) {
+
+	if( module == NULL )
+		return;
+
+	if( PyType_Ready( &UnaryFunction1DEdgeNature_Type ) < 0 )
+		return;
+	Py_INCREF( &UnaryFunction1DEdgeNature_Type );
+	PyModule_AddObject(module, "UnaryFunction1DEdgeNature", (PyObject *)&UnaryFunction1DEdgeNature_Type);
+	
+	if( PyType_Ready( &CurveNatureF1D_Type ) < 0 )
+		return;
+	Py_INCREF( &CurveNatureF1D_Type );
+	PyModule_AddObject(module, "CurveNatureF1D", (PyObject *)&CurveNatureF1D_Type);
+		
+}
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int UnaryFunction1DEdgeNature___init__(BPy_UnaryFunction1DEdgeNature* self, PyObject *args)
+{
+	PyObject *obj;
+
+	if( !PyArg_ParseTuple(args, "|O", &obj) && BPy_IntegrationType_Check(obj) ) {
+		cout << "ERROR: UnaryFunction1DEdgeNature___init__ " << endl;		
+		return -1;
+	}
+	
+	if( !obj )
+		self->uf1D_edgenature = new UnaryFunction1D<Nature::EdgeNature>();
+	else {
+		self->uf1D_edgenature = new UnaryFunction1D<Nature::EdgeNature>( IntegrationType_from_BPy_IntegrationType(obj) );
+	}
+	
+	return 0;
+}
+void UnaryFunction1DEdgeNature___dealloc__(BPy_UnaryFunction1DEdgeNature* self)
+{
+	delete self->uf1D_edgenature;
+	UnaryFunction1D_Type.tp_dealloc((PyObject*)self);
+}
+
+
+PyObject * UnaryFunction1DEdgeNature___repr__(BPy_UnaryFunction1DEdgeNature* self)
+{
+	return PyString_FromFormat("type: %s - address: %p", self->uf1D_edgenature->getName().c_str(), self->uf1D_edgenature );
+}
+
+PyObject * UnaryFunction1DEdgeNature_getName( BPy_UnaryFunction1DEdgeNature *self )
+{
+	return PyString_FromString( self->uf1D_edgenature->getName().c_str() );
+}
+
+PyObject * UnaryFunction1DEdgeNature___call__( BPy_UnaryFunction1DEdgeNature *self, PyObject *args)
+{
+	PyObject *obj;
+
+	if( !PyArg_ParseTuple(args, "O", &obj) && BPy_Interface1D_Check(obj) ) {
+		cout << "ERROR: UnaryFunction1DEdgeNature___call__ " << endl;		
+		return NULL;
+	}
+	
+	Nature::EdgeNature n = self->uf1D_edgenature->operator()(*( ((BPy_Interface1D *) obj)->if1D ));
+	return BPy_Nature_from_Nature( n );
+
+}
+
+PyObject * UnaryFunction1DEdgeNature_setIntegrationType(BPy_UnaryFunction1DEdgeNature* self, PyObject *args)
+{
+	PyObject *obj;
+
+	if( !PyArg_ParseTuple(args, "O", &obj) && BPy_IntegrationType_Check(obj) ) {
+		cout << "ERROR: UnaryFunction1DEdgeNature_setIntegrationType " << endl;		
+		Py_RETURN_NONE;
+	}
+	
+	self->uf1D_edgenature->setIntegrationType( IntegrationType_from_BPy_IntegrationType(obj) );
+	Py_RETURN_NONE;
+}
+
+PyObject * UnaryFunction1DEdgeNature_getIntegrationType(BPy_UnaryFunction1DEdgeNature* self) {
+	return BPy_IntegrationType_from_IntegrationType( self->uf1D_edgenature->getIntegrationType() );
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.h b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.h
new file mode 100644
index 00000000000..9e899916a95
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.h
@@ -0,0 +1,36 @@
+#ifndef FREESTYLE_PYTHON_UNARYFUNCTION1DEDGENATURE_H
+#define FREESTYLE_PYTHON_UNARYFUNCTION1DEDGENATURE_H
+
+#include "../BPy_UnaryFunction1D.h"
+
+#include "../../winged_edge/Nature.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject UnaryFunction1DEdgeNature_Type;
+
+#define BPy_UnaryFunction1DEdgeNature_Check(v)	(( (PyObject *) v)->ob_type == &UnaryFunction1DEdgeNature_Type)
+
+/*---------------------------Python BPy_UnaryFunction1DEdgeNature structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction1D py_uf1D;
+	UnaryFunction1D<Nature::EdgeNature> *uf1D_edgenature;
+} BPy_UnaryFunction1DEdgeNature;
+
+/*---------------------------Python BPy_UnaryFunction1DEdgeNature visible prototypes-----------*/
+PyMODINIT_FUNC UnaryFunction1DEdgeNature_Init( PyObject *module );
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_UNARYFUNCTION1DEDGENATURE_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp
index cb572980f8f..f4c8a9e53ce 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp
@@ -1,20 +1,202 @@
- PyObject *_wrap_UnaryFunction1DFloat_getName(PyObject *self , PyObject *args) {
+#include "BPy_UnaryFunction1DFloat.h"
+
+#include "../BPy_Convert.h"
+#include "../BPy_Interface1D.h"
+#include "../BPy_IntegrationType.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for UnaryFunction1DFloat instance  -----------*/
+static int UnaryFunction1DFloat___init__(BPy_UnaryFunction1DFloat* self, PyObject *args);
+static void UnaryFunction1DFloat___dealloc__(BPy_UnaryFunction1DFloat* self);
+static PyObject * UnaryFunction1DFloat___repr__(BPy_UnaryFunction1DFloat* self);
+
+static PyObject * UnaryFunction1DFloat_getName( BPy_UnaryFunction1DFloat *self);
+static PyObject * UnaryFunction1DFloat___call__( BPy_UnaryFunction1DFloat *self, PyObject *args);
+static PyObject * UnaryFunction1DFloat_setIntegrationType(BPy_UnaryFunction1DFloat* self, PyObject *args);
+static PyObject * UnaryFunction1DFloat_getIntegrationType(BPy_UnaryFunction1DFloat* self);
+
+/*----------------------UnaryFunction1DFloat instance definitions ----------------------------*/
+static PyMethodDef BPy_UnaryFunction1DFloat_methods[] = {
+	{"getName", ( PyCFunction ) UnaryFunction1DFloat_getName, METH_NOARGS, "（ ）Returns the string of the name of the unary 1D function."},
+	{"__call__", ( PyCFunction ) UnaryFunction1DFloat___call__, METH_VARARGS, "（Interface1D if1D ）Builds a UnaryFunction1D from an integration type. " },
+	{"setIntegrationType", ( PyCFunction ) UnaryFunction1DFloat_setIntegrationType, METH_VARARGS, "（IntegrationType i ）Sets the integration method" },
+	{"getIntegrationType", ( PyCFunction ) UnaryFunction1DFloat_getIntegrationType, METH_NOARGS, "() Returns the integration method." },
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_UnaryFunction1DFloat type definition ------------------------------*/
+
+PyTypeObject UnaryFunction1DFloat_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"UnaryFunction1DFloat",				/* tp_name */
+	sizeof( BPy_UnaryFunction1DFloat ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	(destructor)UnaryFunction1DFloat___dealloc__,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	(reprfunc)UnaryFunction1DFloat___repr__,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_UnaryFunction1DFloat_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction1D_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)UnaryFunction1DFloat___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+
+PyMODINIT_FUNC UnaryFunction1DFloat_Init( PyObject *module ) {
+
+	if( module == NULL )
+		return;
+
+	if( PyType_Ready( &UnaryFunction1DFloat_Type ) < 0 )
+		return;
+	Py_INCREF( &UnaryFunction1DFloat_Type );
+	PyModule_AddObject(module, "UnaryFunction1DFloat", (PyObject *)&UnaryFunction1DFloat_Type);
+		
+}
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int UnaryFunction1DFloat___init__(BPy_UnaryFunction1DFloat* self, PyObject *args)
+{
+	PyObject *obj;
+
+	if( !PyArg_ParseTuple(args, "|O", &obj) && BPy_IntegrationType_Check(obj) ) {
+		cout << "ERROR: UnaryFunction1DFloat___init__ " << endl;		
+		return -1;
+	}
+	
+	if( !obj )
+		self->uf1D_float = new UnaryFunction1D<float>();
+	else {
+		self->uf1D_float = new UnaryFunction1D<float>( IntegrationType_from_BPy_IntegrationType(obj) );
+	}
+	
+	return 0;
+}
+void UnaryFunction1DFloat___dealloc__(BPy_UnaryFunction1DFloat* self)
+{
+	delete self->uf1D_float;
+	UnaryFunction1D_Type.tp_dealloc((PyObject*)self);
 }
 
 
- PyObject *_wrap_UnaryFunction1DFloat___call__(PyObject *self , PyObject *args) {
+PyObject * UnaryFunction1DFloat___repr__(BPy_UnaryFunction1DFloat* self)
+{
+	return PyString_FromFormat("type: %s - address: %p", self->uf1D_float->getName().c_str(), self->uf1D_float );
 }
 
-
- PyObject *_wrap_UnaryFunction1DFloat_setIntegrationType(PyObject *self , PyObject *args) {
+PyObject * UnaryFunction1DFloat_getName( BPy_UnaryFunction1DFloat *self )
+{
+	return PyString_FromString( self->uf1D_float->getName().c_str() );
 }
 
+PyObject * UnaryFunction1DFloat___call__( BPy_UnaryFunction1DFloat *self, PyObject *args)
+{
+	PyObject *obj;
+
+	if( !PyArg_ParseTuple(args, "O", &obj) && BPy_Interface1D_Check(obj) ) {
+		cout << "ERROR: UnaryFunction1DFloat___call__ " << endl;		
+		return NULL;
+	}
+	
+	float f = self->uf1D_float->operator()(*( ((BPy_Interface1D *) obj)->if1D ));
+	return PyFloat_FromDouble( f );
 
- PyObject *_wrap_UnaryFunction1DFloat_getIntegrationType(PyObject *self , PyObject *args) {
 }
 
+PyObject * UnaryFunction1DFloat_setIntegrationType(BPy_UnaryFunction1DFloat* self, PyObject *args)
+{
+	PyObject *obj;
 
- PyObject *_wrap_disown_UnaryFunction1DFloat(PyObject *self , PyObject *args) {
+	if( !PyArg_ParseTuple(args, "O", &obj) && BPy_IntegrationType_Check(obj) ) {
+		cout << "ERROR: UnaryFunction1DFloat_setIntegrationType " << endl;		
+		Py_RETURN_NONE;
+	}
+	
+	self->uf1D_float->setIntegrationType( IntegrationType_from_BPy_IntegrationType(obj) );
+	Py_RETURN_NONE;
 }
 
+PyObject * UnaryFunction1DFloat_getIntegrationType(BPy_UnaryFunction1DFloat* self) {
+	return BPy_IntegrationType_from_IntegrationType( self->uf1D_float->getIntegrationType() );
+}
 
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.h b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.h
new file mode 100644
index 00000000000..f454ab664ed
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.h
@@ -0,0 +1,34 @@
+#ifndef FREESTYLE_PYTHON_UNARYFUNCTION1DFLOAT_H
+#define FREESTYLE_PYTHON_UNARYFUNCTION1DFLOAT_H
+
+#include "../BPy_UnaryFunction1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject UnaryFunction1DFloat_Type;
+
+#define BPy_UnaryFunction1DFloat_Check(v)	(( (PyObject *) v)->ob_type == &UnaryFunction1DFloat_Type)
+
+/*---------------------------Python BPy_UnaryFunction1DFloat structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction1D py_uf1D;
+	UnaryFunction1D<float> *uf1D_float;
+} BPy_UnaryFunction1DFloat;
+
+/*---------------------------Python BPy_UnaryFunction1DFloat visible prototypes-----------*/
+PyMODINIT_FUNC UnaryFunction1DFloat_Init( PyObject *module );
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_UNARYFUNCTION1DFLOAT_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp
index eb230a2d49f..ef75f3bad5b 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp
@@ -1,20 +1,209 @@
- PyObject *_wrap_UnaryFunction1DUnsigned_getName(PyObject *self , PyObject *args) {
+#include "BPy_UnaryFunction1DUnsigned.h"
+
+#include "../BPy_Convert.h"
+#include "../BPy_Interface1D.h"
+#include "../BPy_IntegrationType.h"
+
+#include "UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for UnaryFunction1DUnsigned instance  -----------*/
+static int UnaryFunction1DUnsigned___init__(BPy_UnaryFunction1DUnsigned* self, PyObject *args);
+static void UnaryFunction1DUnsigned___dealloc__(BPy_UnaryFunction1DUnsigned* self);
+static PyObject * UnaryFunction1DUnsigned___repr__(BPy_UnaryFunction1DUnsigned* self);
+
+static PyObject * UnaryFunction1DUnsigned_getName( BPy_UnaryFunction1DUnsigned *self);
+static PyObject * UnaryFunction1DUnsigned___call__( BPy_UnaryFunction1DUnsigned *self, PyObject *args);
+static PyObject * UnaryFunction1DUnsigned_setIntegrationType(BPy_UnaryFunction1DUnsigned* self, PyObject *args);
+static PyObject * UnaryFunction1DUnsigned_getIntegrationType(BPy_UnaryFunction1DUnsigned* self);
+
+/*----------------------UnaryFunction1DUnsigned instance definitions ----------------------------*/
+static PyMethodDef BPy_UnaryFunction1DUnsigned_methods[] = {
+	{"getName", ( PyCFunction ) UnaryFunction1DUnsigned_getName, METH_NOARGS, "（ ）Returns the string of the name of the unary 1D function."},
+	{"__call__", ( PyCFunction ) UnaryFunction1DUnsigned___call__, METH_VARARGS, "（Interface1D if1D ）Builds a UnaryFunction1D from an integration type. " },
+	{"setIntegrationType", ( PyCFunction ) UnaryFunction1DUnsigned_setIntegrationType, METH_VARARGS, "（IntegrationType i ）Sets the integration method" },
+	{"getIntegrationType", ( PyCFunction ) UnaryFunction1DUnsigned_getIntegrationType, METH_NOARGS, "() Returns the integration method." },
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_UnaryFunction1DUnsigned type definition ------------------------------*/
+
+PyTypeObject UnaryFunction1DUnsigned_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"UnaryFunction1DUnsigned",				/* tp_name */
+	sizeof( BPy_UnaryFunction1DUnsigned ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	(destructor)UnaryFunction1DUnsigned___dealloc__,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	(reprfunc)UnaryFunction1DUnsigned___repr__,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_UnaryFunction1DUnsigned_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction1D_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)UnaryFunction1DUnsigned___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+
+PyMODINIT_FUNC UnaryFunction1DUnsigned_Init( PyObject *module ) {
+
+	if( module == NULL )
+		return;
+
+	if( PyType_Ready( &UnaryFunction1DUnsigned_Type ) < 0 )
+		return;
+	Py_INCREF( &UnaryFunction1DUnsigned_Type );
+	PyModule_AddObject(module, "UnaryFunction1DUnsigned", (PyObject *)&UnaryFunction1DUnsigned_Type);
+	
+	if( PyType_Ready( &QuantitativeInvisibilityF1D_Type ) < 0 )
+		return;
+	Py_INCREF( &QuantitativeInvisibilityF1D_Type );
+	PyModule_AddObject(module, "QuantitativeInvisibilityF1D", (PyObject *)&QuantitativeInvisibilityF1D_Type);
+			
+}
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int UnaryFunction1DUnsigned___init__(BPy_UnaryFunction1DUnsigned* self, PyObject *args)
+{
+	PyObject *obj;
+
+	if( !PyArg_ParseTuple(args, "|O", &obj) && BPy_IntegrationType_Check(obj) ) {
+		cout << "ERROR: UnaryFunction1DUnsigned___init__ " << endl;		
+		return -1;
+	}
+	
+	if( !obj )
+		self->uf1D_unsigned = new UnaryFunction1D<unsigned int>();
+	else {
+		self->uf1D_unsigned = new UnaryFunction1D<unsigned int>( IntegrationType_from_BPy_IntegrationType(obj) );
+	}
+	
+	return 0;
+}
+void UnaryFunction1DUnsigned___dealloc__(BPy_UnaryFunction1DUnsigned* self)
+{
+	delete self->uf1D_unsigned;
+	UnaryFunction1D_Type.tp_dealloc((PyObject*)self);
 }
 
 
- PyObject *_wrap_UnaryFunction1DUnsigned___call__(PyObject *self , PyObject *args) {
+PyObject * UnaryFunction1DUnsigned___repr__(BPy_UnaryFunction1DUnsigned* self)
+{
+	return PyString_FromFormat("type: %s - address: %p", self->uf1D_unsigned->getName().c_str(), self->uf1D_unsigned );
 }
 
-
- PyObject *_wrap_UnaryFunction1DUnsigned_setIntegrationType(PyObject *self , PyObject *args) {
+PyObject * UnaryFunction1DUnsigned_getName( BPy_UnaryFunction1DUnsigned *self )
+{
+	return PyString_FromString( self->uf1D_unsigned->getName().c_str() );
 }
 
+PyObject * UnaryFunction1DUnsigned___call__( BPy_UnaryFunction1DUnsigned *self, PyObject *args)
+{
+	PyObject *obj;
+
+	if( !PyArg_ParseTuple(args, "O", &obj) && BPy_Interface1D_Check(obj) ) {
+		cout << "ERROR: UnaryFunction1DUnsigned___call__ " << endl;		
+		return NULL;
+	}
+	
+	unsigned int i = self->uf1D_unsigned->operator()(*( ((BPy_Interface1D *) obj)->if1D ));
+	return PyInt_FromLong( i );
 
- PyObject *_wrap_UnaryFunction1DUnsigned_getIntegrationType(PyObject *self , PyObject *args) {
 }
 
+PyObject * UnaryFunction1DUnsigned_setIntegrationType(BPy_UnaryFunction1DUnsigned* self, PyObject *args)
+{
+	PyObject *obj;
 
- PyObject *_wrap_disown_UnaryFunction1DUnsigned(PyObject *self , PyObject *args) {
+	if( !PyArg_ParseTuple(args, "O", &obj) && BPy_IntegrationType_Check(obj) ) {
+		cout << "ERROR: UnaryFunction1DUnsigned_setIntegrationType " << endl;		
+		Py_RETURN_NONE;
+	}
+	
+	self->uf1D_unsigned->setIntegrationType( IntegrationType_from_BPy_IntegrationType(obj) );
+	Py_RETURN_NONE;
 }
 
+PyObject * UnaryFunction1DUnsigned_getIntegrationType(BPy_UnaryFunction1DUnsigned* self) {
+	return BPy_IntegrationType_from_IntegrationType( self->uf1D_unsigned->getIntegrationType() );
+}
 
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.h b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.h
new file mode 100644
index 00000000000..0df50d9a999
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.h
@@ -0,0 +1,34 @@
+#ifndef FREESTYLE_PYTHON_UNARYFUNCTION1DUNSIGNED_H
+#define FREESTYLE_PYTHON_UNARYFUNCTION1DUNSIGNED_H
+
+#include "../BPy_UnaryFunction1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject UnaryFunction1DUnsigned_Type;
+
+#define BPy_UnaryFunction1DUnsigned_Check(v)	(( (PyObject *) v)->ob_type == &UnaryFunction1DUnsigned_Type)
+
+/*---------------------------Python BPy_UnaryFunction1DUnsigned structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction1D py_uf1D;
+	UnaryFunction1D<unsigned int> *uf1D_unsigned;
+} BPy_UnaryFunction1DUnsigned;
+
+/*---------------------------Python BPy_UnaryFunction1DUnsigned visible prototypes-----------*/
+PyMODINIT_FUNC UnaryFunction1DUnsigned_Init( PyObject *module );
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_UNARYFUNCTION1DUNSIGNED_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp
index 64fb6ef6ed7..e0fa12c66e6 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp
@@ -1,20 +1,215 @@
- PyObject *_wrap_UnaryFunction1DVec2f_getName(PyObject *self , PyObject *args) {
+#include "BPy_UnaryFunction1DVec2f.h"
+
+#include "../BPy_Convert.h"
+#include "../BPy_Interface1D.h"
+#include "../BPy_IntegrationType.h"
+
+#include "UnaryFunction1D_Vec2f/BPy_Normal2DF1D.h"
+#include "UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for UnaryFunction1DVec2f instance  -----------*/
+static int UnaryFunction1DVec2f___init__(BPy_UnaryFunction1DVec2f* self, PyObject *args);
+static void UnaryFunction1DVec2f___dealloc__(BPy_UnaryFunction1DVec2f* self);
+static PyObject * UnaryFunction1DVec2f___repr__(BPy_UnaryFunction1DVec2f* self);
+
+static PyObject * UnaryFunction1DVec2f_getName( BPy_UnaryFunction1DVec2f *self);
+static PyObject * UnaryFunction1DVec2f___call__( BPy_UnaryFunction1DVec2f *self, PyObject *args);
+static PyObject * UnaryFunction1DVec2f_setIntegrationType(BPy_UnaryFunction1DVec2f* self, PyObject *args);
+static PyObject * UnaryFunction1DVec2f_getIntegrationType(BPy_UnaryFunction1DVec2f* self);
+
+/*----------------------UnaryFunction1DVec2f instance definitions ----------------------------*/
+static PyMethodDef BPy_UnaryFunction1DVec2f_methods[] = {
+	{"getName", ( PyCFunction ) UnaryFunction1DVec2f_getName, METH_NOARGS, "（ ）Returns the string of the name of the unary 1D function."},
+	{"__call__", ( PyCFunction ) UnaryFunction1DVec2f___call__, METH_VARARGS, "（Interface1D if1D ）Builds a UnaryFunction1D from an integration type. " },
+	{"setIntegrationType", ( PyCFunction ) UnaryFunction1DVec2f_setIntegrationType, METH_VARARGS, "（IntegrationType i ）Sets the integration method" },
+	{"getIntegrationType", ( PyCFunction ) UnaryFunction1DVec2f_getIntegrationType, METH_NOARGS, "() Returns the integration method." },
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_UnaryFunction1DVec2f type definition ------------------------------*/
+
+PyTypeObject UnaryFunction1DVec2f_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"UnaryFunction1DVec2f",				/* tp_name */
+	sizeof( BPy_UnaryFunction1DVec2f ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	(destructor)UnaryFunction1DVec2f___dealloc__,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	(reprfunc)UnaryFunction1DVec2f___repr__,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_UnaryFunction1DVec2f_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction1D_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)UnaryFunction1DVec2f___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+
+PyMODINIT_FUNC UnaryFunction1DVec2f_Init( PyObject *module ) {
+
+	if( module == NULL )
+		return;
+
+	if( PyType_Ready( &UnaryFunction1DVec2f_Type ) < 0 )
+		return;
+	Py_INCREF( &UnaryFunction1DVec2f_Type );
+	PyModule_AddObject(module, "UnaryFunction1DVec2f", (PyObject *)&UnaryFunction1DVec2f_Type);
+	
+	if( PyType_Ready( &Normal2DF1D_Type ) < 0 )
+		return;
+	Py_INCREF( &Normal2DF1D_Type );
+	PyModule_AddObject(module, "Normal2DF1D", (PyObject *)&Normal2DF1D_Type);
+	
+	if( PyType_Ready( &Orientation2DF1D_Type ) < 0 )
+		return;
+	Py_INCREF( &Orientation2DF1D_Type );
+	PyModule_AddObject(module, "Orientation2DF1D", (PyObject *)&Orientation2DF1D_Type);
+		
+}
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int UnaryFunction1DVec2f___init__(BPy_UnaryFunction1DVec2f* self, PyObject *args)
+{
+	PyObject *obj;
+
+	if( !PyArg_ParseTuple(args, "|O", &obj) && BPy_IntegrationType_Check(obj) ) {
+		cout << "ERROR: UnaryFunction1DVec2f___init__ " << endl;		
+		return -1;
+	}
+	
+	if( !obj )
+		self->uf1D_vec2f = new UnaryFunction1D<Vec2f>();
+	else {
+		self->uf1D_vec2f = new UnaryFunction1D<Vec2f>( IntegrationType_from_BPy_IntegrationType(obj) );
+	}
+	
+	return 0;
+}
+void UnaryFunction1DVec2f___dealloc__(BPy_UnaryFunction1DVec2f* self)
+{
+	delete self->uf1D_vec2f;
+	UnaryFunction1D_Type.tp_dealloc((PyObject*)self);
 }
 
 
- PyObject *_wrap_UnaryFunction1DVec2f___call__(PyObject *self , PyObject *args) {
+PyObject * UnaryFunction1DVec2f___repr__(BPy_UnaryFunction1DVec2f* self)
+{
+	return PyString_FromFormat("type: %s - address: %p", self->uf1D_vec2f->getName().c_str(), self->uf1D_vec2f );
 }
 
-
- PyObject *_wrap_UnaryFunction1DVec2f_setIntegrationType(PyObject *self , PyObject *args) {
+PyObject * UnaryFunction1DVec2f_getName( BPy_UnaryFunction1DVec2f *self )
+{
+	return PyString_FromString( self->uf1D_vec2f->getName().c_str() );
 }
 
+PyObject * UnaryFunction1DVec2f___call__( BPy_UnaryFunction1DVec2f *self, PyObject *args)
+{
+	PyObject *obj;
+
+	if( !PyArg_ParseTuple(args, "O", &obj) && BPy_Interface1D_Check(obj) ) {
+		cout << "ERROR: UnaryFunction1DVec2f___call__ " << endl;		
+		return NULL;
+	}
+	
+	Vec2f v( self->uf1D_vec2f->operator()(*( ((BPy_Interface1D *) obj)->if1D )) );
+	return Vector_from_Vec2f( v );
 
- PyObject *_wrap_UnaryFunction1DVec2f_getIntegrationType(PyObject *self , PyObject *args) {
 }
 
+PyObject * UnaryFunction1DVec2f_setIntegrationType(BPy_UnaryFunction1DVec2f* self, PyObject *args)
+{
+	PyObject *obj;
 
- PyObject *_wrap_disown_UnaryFunction1DVec2f(PyObject *self , PyObject *args) {
+	if( !PyArg_ParseTuple(args, "O", &obj) && BPy_IntegrationType_Check(obj) ) {
+		cout << "ERROR: UnaryFunction1DVec2f_setIntegrationType " << endl;		
+		Py_RETURN_NONE;
+	}
+	
+	self->uf1D_vec2f->setIntegrationType( IntegrationType_from_BPy_IntegrationType(obj) );
+	Py_RETURN_NONE;
 }
 
+PyObject * UnaryFunction1DVec2f_getIntegrationType(BPy_UnaryFunction1DVec2f* self) {
+	return BPy_IntegrationType_from_IntegrationType( self->uf1D_vec2f->getIntegrationType() );
+}
 
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.h b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.h
new file mode 100644
index 00000000000..098992e6631
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.h
@@ -0,0 +1,37 @@
+#ifndef FREESTYLE_PYTHON_UNARYFUNCTION1DVEC2F_H
+#define FREESTYLE_PYTHON_UNARYFUNCTION1DVEC2F_H
+
+#include "../BPy_UnaryFunction1D.h"
+
+#include "../../geometry/Geom.h"
+using namespace Geometry;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject UnaryFunction1DVec2f_Type;
+
+#define BPy_UnaryFunction1DVec2f_Check(v)	(( (PyObject *) v)->ob_type == &UnaryFunction1DVec2f_Type)
+
+/*---------------------------Python BPy_UnaryFunction1DVec2f structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction1D py_uf1D;
+	UnaryFunction1D<Vec2f> *uf1D_vec2f;
+} BPy_UnaryFunction1DVec2f;
+
+/*---------------------------Python BPy_UnaryFunction1DVec2f visible prototypes-----------*/
+PyMODINIT_FUNC UnaryFunction1DVec2f_Init( PyObject *module );
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_UNARYFUNCTION1DVEC2F_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp
index d7b360eb10e..3a3c7d4e835 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp
@@ -1,20 +1,209 @@
- PyObject *_wrap_UnaryFunction1DVec3f_getName(PyObject *self , PyObject *args) {
+#include "BPy_UnaryFunction1DVec3f.h"
+
+#include "../BPy_Convert.h"
+#include "../BPy_Interface1D.h"
+#include "../BPy_IntegrationType.h"
+
+#include "UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for UnaryFunction1DVec3f instance  -----------*/
+static int UnaryFunction1DVec3f___init__(BPy_UnaryFunction1DVec3f* self, PyObject *args);
+static void UnaryFunction1DVec3f___dealloc__(BPy_UnaryFunction1DVec3f* self);
+static PyObject * UnaryFunction1DVec3f___repr__(BPy_UnaryFunction1DVec3f* self);
+
+static PyObject * UnaryFunction1DVec3f_getName( BPy_UnaryFunction1DVec3f *self);
+static PyObject * UnaryFunction1DVec3f___call__( BPy_UnaryFunction1DVec3f *self, PyObject *args);
+static PyObject * UnaryFunction1DVec3f_setIntegrationType(BPy_UnaryFunction1DVec3f* self, PyObject *args);
+static PyObject * UnaryFunction1DVec3f_getIntegrationType(BPy_UnaryFunction1DVec3f* self);
+
+/*----------------------UnaryFunction1DVec3f instance definitions ----------------------------*/
+static PyMethodDef BPy_UnaryFunction1DVec3f_methods[] = {
+	{"getName", ( PyCFunction ) UnaryFunction1DVec3f_getName, METH_NOARGS, "（ ）Returns the string of the name of the unary 1D function."},
+	{"__call__", ( PyCFunction ) UnaryFunction1DVec3f___call__, METH_VARARGS, "（Interface1D if1D ）Builds a UnaryFunction1D from an integration type. " },
+	{"setIntegrationType", ( PyCFunction ) UnaryFunction1DVec3f_setIntegrationType, METH_VARARGS, "（IntegrationType i ）Sets the integration method" },
+	{"getIntegrationType", ( PyCFunction ) UnaryFunction1DVec3f_getIntegrationType, METH_NOARGS, "() Returns the integration method." },
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_UnaryFunction1DVec3f type definition ------------------------------*/
+
+PyTypeObject UnaryFunction1DVec3f_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"UnaryFunction1DVec3f",				/* tp_name */
+	sizeof( BPy_UnaryFunction1DVec3f ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	(destructor)UnaryFunction1DVec3f___dealloc__,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	(reprfunc)UnaryFunction1DVec3f___repr__,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_UnaryFunction1DVec3f_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction1D_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)UnaryFunction1DVec3f___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+
+PyMODINIT_FUNC UnaryFunction1DVec3f_Init( PyObject *module ) {
+
+	if( module == NULL )
+		return;
+
+	if( PyType_Ready( &UnaryFunction1DVec3f_Type ) < 0 )
+		return;
+	Py_INCREF( &UnaryFunction1DVec3f_Type );
+	PyModule_AddObject(module, "UnaryFunction1DVec3f", (PyObject *)&UnaryFunction1DVec3f_Type);
+	
+	if( PyType_Ready( &Orientation3DF1D_Type ) < 0 )
+		return;
+	Py_INCREF( &Orientation3DF1D_Type );
+	PyModule_AddObject(module, "Orientation3DF1D", (PyObject *)&Orientation3DF1D_Type);
+		
+}
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int UnaryFunction1DVec3f___init__(BPy_UnaryFunction1DVec3f* self, PyObject *args)
+{
+	PyObject *obj;
+
+	if( !PyArg_ParseTuple(args, "|O", &obj) && BPy_IntegrationType_Check(obj) ) {
+		cout << "ERROR: UnaryFunction1DVec3f___init__ " << endl;		
+		return -1;
+	}
+	
+	if( !obj )
+		self->uf1D_vec3f = new UnaryFunction1D<Vec3f>();
+	else {
+		self->uf1D_vec3f = new UnaryFunction1D<Vec3f>( IntegrationType_from_BPy_IntegrationType(obj) );
+	}
+	
+	return 0;
+}
+void UnaryFunction1DVec3f___dealloc__(BPy_UnaryFunction1DVec3f* self)
+{
+	delete self->uf1D_vec3f;
+	UnaryFunction1D_Type.tp_dealloc((PyObject*)self);
 }
 
 
- PyObject *_wrap_UnaryFunction1DVec3f___call__(PyObject *self , PyObject *args) {
+PyObject * UnaryFunction1DVec3f___repr__(BPy_UnaryFunction1DVec3f* self)
+{
+	return PyString_FromFormat("type: %s - address: %p", self->uf1D_vec3f->getName().c_str(), self->uf1D_vec3f );
 }
 
-
- PyObject *_wrap_UnaryFunction1DVec3f_setIntegrationType(PyObject *self , PyObject *args) {
+PyObject * UnaryFunction1DVec3f_getName( BPy_UnaryFunction1DVec3f *self )
+{
+	return PyString_FromString( self->uf1D_vec3f->getName().c_str() );
 }
 
+PyObject * UnaryFunction1DVec3f___call__( BPy_UnaryFunction1DVec3f *self, PyObject *args)
+{
+	PyObject *obj;
+
+	if( !PyArg_ParseTuple(args, "O", &obj) && BPy_Interface1D_Check(obj) ) {
+		cout << "ERROR: UnaryFunction1DVec3f___call__ " << endl;		
+		return NULL;
+	}
+	
+	Vec3f v( self->uf1D_vec3f->operator()(*( ((BPy_Interface1D *) obj)->if1D )) );
+	return Vector_from_Vec3f( v );
 
- PyObject *_wrap_UnaryFunction1DVec3f_getIntegrationType(PyObject *self , PyObject *args) {
 }
 
+PyObject * UnaryFunction1DVec3f_setIntegrationType(BPy_UnaryFunction1DVec3f* self, PyObject *args)
+{
+	PyObject *obj;
 
- PyObject *_wrap_disown_UnaryFunction1DVec3f(PyObject *self , PyObject *args) {
+	if( !PyArg_ParseTuple(args, "O", &obj) && BPy_IntegrationType_Check(obj) ) {
+		cout << "ERROR: UnaryFunction1DVec3f_setIntegrationType " << endl;		
+		Py_RETURN_NONE;
+	}
+	
+	self->uf1D_vec3f->setIntegrationType( IntegrationType_from_BPy_IntegrationType(obj) );
+	Py_RETURN_NONE;
 }
 
+PyObject * UnaryFunction1DVec3f_getIntegrationType(BPy_UnaryFunction1DVec3f* self) {
+	return BPy_IntegrationType_from_IntegrationType( self->uf1D_vec3f->getIntegrationType() );
+}
 
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.h b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.h
new file mode 100644
index 00000000000..3829fa12b62
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.h
@@ -0,0 +1,37 @@
+#ifndef FREESTYLE_PYTHON_UNARYFUNCTION1DVEC3F_H
+#define FREESTYLE_PYTHON_UNARYFUNCTION1DVEC3F_H
+
+#include "../BPy_UnaryFunction1D.h"
+
+#include "../../geometry/Geom.h"
+using namespace Geometry;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject UnaryFunction1DVec3f_Type;
+
+#define BPy_UnaryFunction1DVec3f_Check(v)	(( (PyObject *) v)->ob_type == &UnaryFunction1DVec3f_Type)
+
+/*---------------------------Python BPy_UnaryFunction1DVec3f structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction1D py_uf1D;
+	UnaryFunction1D<Vec3f> *uf1D_vec3f;
+} BPy_UnaryFunction1DVec3f;
+
+/*---------------------------Python BPy_UnaryFunction1DVec3f visible prototypes-----------*/
+PyMODINIT_FUNC UnaryFunction1DVec3f_Init( PyObject *module );
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_UNARYFUNCTION1DVEC3F_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp
index 1fe16797593..c0b25403706 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp
@@ -1,16 +1,228 @@
- PyObject *_wrap_UnaryFunction1DVectorViewShape_getName(PyObject *self , PyObject *args) {
+#include "BPy_UnaryFunction1DVectorViewShape.h"
+
+#include "../BPy_Convert.h"
+#include "../BPy_Interface1D.h"
+#include "../BPy_IntegrationType.h"
+
+#include "UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.h"
+#include "UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.h"
+#include "UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for UnaryFunction1DVectorViewShape instance  -----------*/
+static int UnaryFunction1DVectorViewShape___init__(BPy_UnaryFunction1DVectorViewShape* self, PyObject *args);
+static void UnaryFunction1DVectorViewShape___dealloc__(BPy_UnaryFunction1DVectorViewShape* self);
+static PyObject * UnaryFunction1DVectorViewShape___repr__(BPy_UnaryFunction1DVectorViewShape* self);
+
+static PyObject * UnaryFunction1DVectorViewShape_getName( BPy_UnaryFunction1DVectorViewShape *self);
+static PyObject * UnaryFunction1DVectorViewShape___call__( BPy_UnaryFunction1DVectorViewShape *self, PyObject *args);
+static PyObject * UnaryFunction1DVectorViewShape_setIntegrationType(BPy_UnaryFunction1DVectorViewShape* self, PyObject *args);
+static PyObject * UnaryFunction1DVectorViewShape_getIntegrationType(BPy_UnaryFunction1DVectorViewShape* self);
+
+/*----------------------UnaryFunction1DVectorViewShape instance definitions ----------------------------*/
+static PyMethodDef BPy_UnaryFunction1DVectorViewShape_methods[] = {
+	{"getName", ( PyCFunction ) UnaryFunction1DVectorViewShape_getName, METH_NOARGS, "（ ）Returns the string of the name of the unary 1D function."},
+	{"__call__", ( PyCFunction ) UnaryFunction1DVectorViewShape___call__, METH_VARARGS, "（Interface1D if1D ）Builds a UnaryFunction1D from an integration type. " },
+	{"setIntegrationType", ( PyCFunction ) UnaryFunction1DVectorViewShape_setIntegrationType, METH_VARARGS, "（IntegrationType i ）Sets the integration method" },
+	{"getIntegrationType", ( PyCFunction ) UnaryFunction1DVectorViewShape_getIntegrationType, METH_NOARGS, "() Returns the integration method." },
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_UnaryFunction1DVectorViewShape type definition ------------------------------*/
+
+PyTypeObject UnaryFunction1DVectorViewShape_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"UnaryFunction1DVectorViewShape",				/* tp_name */
+	sizeof( BPy_UnaryFunction1DVectorViewShape ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	(destructor)UnaryFunction1DVectorViewShape___dealloc__,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	(reprfunc)UnaryFunction1DVectorViewShape___repr__,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_UnaryFunction1DVectorViewShape_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction1D_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)UnaryFunction1DVectorViewShape___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+
+PyMODINIT_FUNC UnaryFunction1DVectorViewShape_Init( PyObject *module ) {
+
+	if( module == NULL )
+		return;
+
+	if( PyType_Ready( &UnaryFunction1DVectorViewShape_Type ) < 0 )
+		return;
+	Py_INCREF( &UnaryFunction1DVectorViewShape_Type );
+	PyModule_AddObject(module, "UnaryFunction1DVectorViewShape", (PyObject *)&UnaryFunction1DVectorViewShape_Type);
+	
+	if( PyType_Ready( &GetOccludeeF1D_Type ) < 0 )
+		return;
+	Py_INCREF( &GetOccludeeF1D_Type );
+	PyModule_AddObject(module, "GetOccludeeF1D", (PyObject *)&GetOccludeeF1D_Type);
+
+	if( PyType_Ready( &GetOccludersF1D_Type ) < 0 )
+		return;
+	Py_INCREF( &GetOccludersF1D_Type );
+	PyModule_AddObject(module, "GetOccludersF1D", (PyObject *)&GetOccludersF1D_Type);
+	
+	if( PyType_Ready( &GetShapeF1D_Type ) < 0 )
+		return;
+	Py_INCREF( &GetShapeF1D_Type );
+	PyModule_AddObject(module, "GetShapeF1D", (PyObject *)&GetShapeF1D_Type);
+	
 }
 
 
- PyObject *_wrap_UnaryFunction1DVectorViewShape___call__(PyObject *self , PyObject *args) {
+//------------------------INSTANCE METHODS ----------------------------------
+
+int UnaryFunction1DVectorViewShape___init__(BPy_UnaryFunction1DVectorViewShape* self, PyObject *args)
+{
+	PyObject *obj;
+
+	if( !PyArg_ParseTuple(args, "|O", &obj) && BPy_IntegrationType_Check(obj) ) {
+		cout << "ERROR: UnaryFunction1DVectorViewShape___init__ " << endl;		
+		return -1;
+	}
+	
+	if( !obj )
+		self->uf1D_vectorviewshape = new UnaryFunction1D< std::vector<ViewShape*> >();
+	else {
+		self->uf1D_vectorviewshape = new UnaryFunction1D< std::vector<ViewShape*> >( IntegrationType_from_BPy_IntegrationType(obj) );
+	}
+	
+	return 0;
+}
+
+void UnaryFunction1DVectorViewShape___dealloc__(BPy_UnaryFunction1DVectorViewShape* self)
+{
+	delete self->uf1D_vectorviewshape;
+	UnaryFunction1D_Type.tp_dealloc((PyObject*)self);
 }
 
 
- PyObject *_wrap_UnaryFunction1DVectorViewShape_setIntegrationType(PyObject *self , PyObject *args) {
+PyObject * UnaryFunction1DVectorViewShape___repr__(BPy_UnaryFunction1DVectorViewShape* self)
+{
+	return PyString_FromFormat("type: %s - address: %p", self->uf1D_vectorviewshape->getName().c_str(), self->uf1D_vectorviewshape );
 }
 
-
- PyObject *_wrap_UnaryFunction1DVectorViewShape_getIntegrationType(PyObject *self , PyObject *args) {
+PyObject * UnaryFunction1DVectorViewShape_getName( BPy_UnaryFunction1DVectorViewShape *self )
+{
+	return PyString_FromString( self->uf1D_vectorviewshape->getName().c_str() );
 }
 
+PyObject * UnaryFunction1DVectorViewShape___call__( BPy_UnaryFunction1DVectorViewShape *self, PyObject *args)
+{
+	PyObject *obj;
 
+	if( !PyArg_ParseTuple(args, "O", &obj) && BPy_Interface1D_Check(obj) ) {
+		cout << "ERROR: UnaryFunction1DVectorViewShape___call__ " << endl;		
+		return NULL;
+	}
+	
+	
+	std::vector<ViewShape*> vs( self->uf1D_vectorviewshape->operator()(*( ((BPy_Interface1D *) obj)->if1D )) );
+	PyObject *list = PyList_New(NULL);
+	
+	for( unsigned int i = 0; i < vs.size(); i++)
+		PyList_Append(list, BPy_ViewShape_from_ViewShape(*( vs[i] )) );
+	
+	return list;
+}
+
+PyObject * UnaryFunction1DVectorViewShape_setIntegrationType(BPy_UnaryFunction1DVectorViewShape* self, PyObject *args)
+{
+	PyObject *obj;
+
+	if( !PyArg_ParseTuple(args, "O", &obj) && BPy_IntegrationType_Check(obj) ) {
+		cout << "ERROR: UnaryFunction1DVectorViewShape_setIntegrationType " << endl;		
+		Py_RETURN_NONE;
+	}
+	
+	self->uf1D_vectorviewshape->setIntegrationType( IntegrationType_from_BPy_IntegrationType(obj) );
+	Py_RETURN_NONE;
+}
+
+PyObject * UnaryFunction1DVectorViewShape_getIntegrationType(BPy_UnaryFunction1DVectorViewShape* self) {
+	return BPy_IntegrationType_from_IntegrationType( self->uf1D_vectorviewshape->getIntegrationType() );
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.h b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.h
new file mode 100644
index 00000000000..cdde1926c86
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.h
@@ -0,0 +1,37 @@
+#ifndef FREESTYLE_PYTHON_UNARYFUNCTION1DVECTORVIEWSHAPE_H
+#define FREESTYLE_PYTHON_UNARYFUNCTION1DVECTORVIEWSHAPE_H
+
+#include "../BPy_UnaryFunction1D.h"
+
+#include <vector>
+#include "../../view_map/ViewMap.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject UnaryFunction1DVectorViewShape_Type;
+
+#define BPy_UnaryFunction1DVectorViewShape_Check(v)	(( (PyObject *) v)->ob_type == &UnaryFunction1DVectorViewShape_Type)
+
+/*---------------------------Python BPy_UnaryFunction1DVectorViewShape structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction1D py_uf1D;
+	UnaryFunction1D< std::vector<ViewShape*> > *uf1D_vectorviewshape;
+} BPy_UnaryFunction1DVectorViewShape;
+
+/*---------------------------Python BPy_UnaryFunction1DVectorViewShape visible prototypes-----------*/
+PyMODINIT_FUNC UnaryFunction1DVectorViewShape_Init( PyObject *module );
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_UNARYFUNCTION1DVECTORVIEWSHAPE_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp
new file mode 100644
index 00000000000..99cc6838997
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp
@@ -0,0 +1,224 @@
+#include "BPy_UnaryFunction1DVoid.h"
+
+#include "../BPy_Convert.h"
+#include "../BPy_Interface1D.h"
+#include "../BPy_IntegrationType.h"
+
+#include "UnaryFunction1D_void/BPy_ChainingTimeStampF1D.h"
+#include "UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.h"
+#include "UnaryFunction1D_void/BPy_TimeStampF1D.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for UnaryFunction1DVoid instance  -----------*/
+static int UnaryFunction1DVoid___init__(BPy_UnaryFunction1DVoid* self, PyObject *args);
+static void UnaryFunction1DVoid___dealloc__(BPy_UnaryFunction1DVoid* self);
+static PyObject * UnaryFunction1DVoid___repr__(BPy_UnaryFunction1DVoid* self);
+
+static PyObject * UnaryFunction1DVoid_getName( BPy_UnaryFunction1DVoid *self);
+static PyObject * UnaryFunction1DVoid___call__( BPy_UnaryFunction1DVoid *self, PyObject *args);
+
+static PyObject * UnaryFunction1DVoid_setIntegrationType(BPy_UnaryFunction1DVoid* self, PyObject *args);
+static PyObject * UnaryFunction1DVoid_getIntegrationType(BPy_UnaryFunction1DVoid* self);
+
+/*----------------------UnaryFunction1DVoid instance definitions ----------------------------*/
+static PyMethodDef BPy_UnaryFunction1DVoid_methods[] = {
+	{"getName", ( PyCFunction ) UnaryFunction1DVoid_getName, METH_NOARGS, "（ ）Returns the string of the name of the unary 1D function."},
+	{"__call__", ( PyCFunction ) UnaryFunction1DVoid___call__, METH_VARARGS, "（Interface1D if1D ）Builds a UnaryFunction1D from an integration type. " },
+	{"setIntegrationType", ( PyCFunction ) UnaryFunction1DVoid_setIntegrationType, METH_VARARGS, "（IntegrationType i ）Sets the integration method" },
+	{"getIntegrationType", ( PyCFunction ) UnaryFunction1DVoid_getIntegrationType, METH_NOARGS, "() Returns the integration method." },
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_UnaryFunction1DVoid type definition ------------------------------*/
+
+PyTypeObject UnaryFunction1DVoid_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"UnaryFunction1DVoid",				/* tp_name */
+	sizeof( BPy_UnaryFunction1DVoid ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	(destructor)UnaryFunction1DVoid___dealloc__,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	(reprfunc)UnaryFunction1DVoid___repr__,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_UnaryFunction1DVoid_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction1D_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)UnaryFunction1DVoid___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+
+PyMODINIT_FUNC UnaryFunction1DVoid_Init( PyObject *module ) {
+
+	if( module == NULL )
+		return;
+
+	if( PyType_Ready( &UnaryFunction1DVoid_Type ) < 0 )
+		return;
+	Py_INCREF( &UnaryFunction1DVoid_Type );
+	PyModule_AddObject(module, "UnaryFunction1DVoid", (PyObject *)&UnaryFunction1DVoid_Type);
+	
+	if( PyType_Ready( &ChainingTimeStampF1D_Type ) < 0 )
+		return;
+	Py_INCREF( &ChainingTimeStampF1D_Type );
+	PyModule_AddObject(module, "ChainingTimeStampF1D", (PyObject *)&ChainingTimeStampF1D_Type);
+	
+	if( PyType_Ready( &IncrementChainingTimeStampF1D_Type ) < 0 )
+		return;
+	Py_INCREF( &IncrementChainingTimeStampF1D_Type );
+	PyModule_AddObject(module, "IncrementChainingTimeStampF1D", (PyObject *)&IncrementChainingTimeStampF1D_Type);
+	
+	if( PyType_Ready( &TimeStampF1D_Type ) < 0 )
+		return;
+	Py_INCREF( &TimeStampF1D_Type );
+	PyModule_AddObject(module, "TimeStampF1D", (PyObject *)&TimeStampF1D_Type);
+	
+}
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int UnaryFunction1DVoid___init__(BPy_UnaryFunction1DVoid* self, PyObject *args)
+{
+	PyObject *obj;
+
+	if( !PyArg_ParseTuple(args, "|O", &obj) && BPy_IntegrationType_Check(obj) ) {
+		cout << "ERROR: UnaryFunction1DVoid___init__ " << endl;		
+		return -1;
+	}
+	
+	if( !obj )
+		self->uf1D_void = new UnaryFunction1D<void>();
+	else {
+		self->uf1D_void = new UnaryFunction1D<void>( IntegrationType_from_BPy_IntegrationType(obj) );
+	}
+	
+	return 0;
+}
+
+void UnaryFunction1DVoid___dealloc__(BPy_UnaryFunction1DVoid* self)
+{
+	delete self->uf1D_void;
+	UnaryFunction1D_Type.tp_dealloc((PyObject*)self);
+}
+
+
+PyObject * UnaryFunction1DVoid___repr__(BPy_UnaryFunction1DVoid* self)
+{
+	return PyString_FromFormat("type: %s - address: %p", self->uf1D_void->getName().c_str(), self->uf1D_void );
+}
+
+PyObject * UnaryFunction1DVoid_getName( BPy_UnaryFunction1DVoid *self )
+{
+	return PyString_FromString( self->uf1D_void->getName().c_str() );
+}
+
+PyObject * UnaryFunction1DVoid___call__( BPy_UnaryFunction1DVoid *self, PyObject *args)
+{
+	PyObject *obj;
+
+	if( !PyArg_ParseTuple(args, "O", &obj) && BPy_Interface1D_Check(obj) ) {
+		cout << "ERROR: UnaryFunction1DVoid___call__ " << endl;		
+		return NULL;
+	}
+	
+	self->uf1D_void->operator()(*( ((BPy_Interface1D *) obj)->if1D ));
+	Py_RETURN_NONE;
+}
+
+PyObject * UnaryFunction1DVoid_setIntegrationType(BPy_UnaryFunction1DVoid* self, PyObject *args)
+{
+	PyObject *obj;
+
+	if( !PyArg_ParseTuple(args, "O", &obj) && BPy_IntegrationType_Check(obj) ) {
+		cout << "ERROR: UnaryFunction1DVoid_setIntegrationType " << endl;		
+		Py_RETURN_NONE;
+	}
+	
+	self->uf1D_void->setIntegrationType( IntegrationType_from_BPy_IntegrationType(obj) );
+	Py_RETURN_NONE;
+}
+
+PyObject * UnaryFunction1DVoid_getIntegrationType(BPy_UnaryFunction1DVoid* self) {
+	return BPy_IntegrationType_from_IntegrationType( self->uf1D_void->getIntegrationType() );
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.h b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.h
new file mode 100644
index 00000000000..68d9c61569c
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.h
@@ -0,0 +1,34 @@
+#ifndef FREESTYLE_PYTHON_UNARYFUNCTION1DVOID_H
+#define FREESTYLE_PYTHON_UNARYFUNCTION1DVOID_H
+
+#include "../BPy_UnaryFunction1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject UnaryFunction1DVoid_Type;
+
+#define BPy_UnaryFunction1DVoid_Check(v)	(( (PyObject *) v)->ob_type == &UnaryFunction1DVoid_Type)
+
+/*---------------------------Python BPy_UnaryFunction1DVoid structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction1D py_uf1D;
+	UnaryFunction1D<void> *uf1D_void;
+} BPy_UnaryFunction1DVoid;
+
+/*---------------------------Python BPy_UnaryFunction1DVoid visible prototypes-----------*/
+PyMODINIT_FUNC UnaryFunction1DVoid_Init( PyObject *module );
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_UNARYFUNCTION1DVOID_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.cpp
index 94d180e6cc8..a6a6d69de30 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.cpp
@@ -1,12 +1,123 @@
- PyObject *_wrap_CurveNatureF1D_getName(PyObject *self , PyObject *args) {
+#include "BPy_CurveNatureF1D.h"
+
+#include "../../../view_map/Functions1D.h"
+#include "../../BPy_Convert.h"
+#include "../../BPy_IntegrationType.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for CurveNatureF1D instance  -----------*/
+	static int CurveNatureF1D___init__( BPy_CurveNatureF1D* self, PyObject *args);
+
+/*-----------------------BPy_CurveNatureF1D type definition ------------------------------*/
+
+PyTypeObject CurveNatureF1D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"CurveNatureF1D",				/* tp_name */
+	sizeof( BPy_CurveNatureF1D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction1DEdgeNature_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)CurveNatureF1D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int CurveNatureF1D___init__( BPy_CurveNatureF1D* self, PyObject *args)
+{
+	PyObject *obj = 0;
+
+	if( !PyArg_ParseTuple(args, "|O", &obj) ) {
+		cout << "ERROR: CurveNatureF1D___init__" << endl;		
+		return -1;
+	}
+	
+	IntegrationType t = ( obj && BPy_IntegrationType_Check(obj) ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
+	self->py_uf1D_edgenature.uf1D_edgenature = new Functions1D::CurveNatureF1D(t);
+	return 0;
+
 }
 
 
- PyObject *_wrap_CurveNatureF1D___call__(PyObject *self , PyObject *args) {
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_delete_CurveNatureF1D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.h
new file mode 100644
index 00000000000..7e9344dddda
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_CURVENATUREF1D_H
+#define FREESTYLE_PYTHON_CURVENATUREF1D_H
+
+#include "../BPy_UnaryFunction1DEdgeNature.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject CurveNatureF1D_Type;
+
+#define BPy_CurveNatureF1D_Check(v)	(( (PyObject *) v)->ob_type == &CurveNatureF1D_Type)
+
+/*---------------------------Python BPy_CurveNatureF1D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction1DEdgeNature py_uf1D_edgenature;
+} BPy_CurveNatureF1D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_CURVENATUREF1D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Normal2DF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Normal2DF1D.cpp
index 81e5a18cb2c..e8421277bf2 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Normal2DF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Normal2DF1D.cpp
@@ -1,12 +1,122 @@
- PyObject *_wrap_Normal2DF1D_getName(PyObject *self , PyObject *args) {
+#include "BPy_Normal2DF1D.h"
+
+#include "../../../view_map/Functions1D.h"
+#include "../../BPy_Convert.h"
+#include "../../BPy_IntegrationType.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for Normal2DF1D instance  -----------*/
+	static int Normal2DF1D___init__( BPy_Normal2DF1D* self, PyObject *args);
+
+/*-----------------------BPy_Normal2DF1D type definition ------------------------------*/
+
+PyTypeObject Normal2DF1D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"Normal2DF1D",				/* tp_name */
+	sizeof( BPy_Normal2DF1D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction1DVec2f_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)Normal2DF1D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int Normal2DF1D___init__( BPy_Normal2DF1D* self, PyObject *args)
+{
+	PyObject *obj = 0;
+
+	if( !PyArg_ParseTuple(args, "|O", &obj) ) {
+		cout << "ERROR: Normal2DF1D___init__" << endl;		
+		return -1;
+	}
+
+	IntegrationType t = ( obj && BPy_IntegrationType_Check(obj) ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
+	self->py_uf1D_vec2f.uf1D_vec2f = new Functions1D::Normal2DF1D(t);
+	return 0;
+
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_Normal2DF1D___call__(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_delete_Normal2DF1D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Normal2DF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Normal2DF1D.h
new file mode 100644
index 00000000000..70bfb0adb12
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Normal2DF1D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_NORMAL2DF1D_H
+#define FREESTYLE_PYTHON_NORMAL2DF1D_H
+
+#include "../BPy_UnaryFunction1DVec2f.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject Normal2DF1D_Type;
+
+#define BPy_Normal2DF1D_Check(v)	(( (PyObject *) v)->ob_type == &Normal2DF1D_Type)
+
+/*---------------------------Python BPy_Normal2DF1D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction1DVec2f py_uf1D_vec2f;
+} BPy_Normal2DF1D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_NORMAL2DF1D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.cpp
index 2d6cfed8575..b6e69b80bce 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.cpp
@@ -1,12 +1,123 @@
- PyObject *_wrap_Orientation2DF1D_getName(PyObject *self , PyObject *args) {
+#include "BPy_Orientation2DF1D.h"
+
+#include "../../../view_map/Functions1D.h"
+#include "../../BPy_Convert.h"
+#include "../../BPy_IntegrationType.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for Orientation2DF1D instance  -----------*/
+	static int Orientation2DF1D___init__( BPy_Orientation2DF1D* self, PyObject *args);
+
+/*-----------------------BPy_Orientation2DF1D type definition ------------------------------*/
+
+PyTypeObject Orientation2DF1D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"Orientation2DF1D",				/* tp_name */
+	sizeof( BPy_Orientation2DF1D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction1DVec2f_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)Orientation2DF1D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int Orientation2DF1D___init__( BPy_Orientation2DF1D* self, PyObject *args)
+{
+	PyObject *obj = 0;
+
+	if( !PyArg_ParseTuple(args, "|O", &obj) ) {
+		cout << "ERROR: Orientation2DF1D___init__" << endl;		
+		return -1;
+	}
+
+	IntegrationType t = ( obj && BPy_IntegrationType_Check(obj) ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
+	self->py_uf1D_vec2f.uf1D_vec2f = new Functions1D::Orientation2DF1D(t);
+	return 0;
+
 }
 
 
- PyObject *_wrap_Orientation2DF1D___call__(PyObject *self , PyObject *args) {
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_delete_Orientation2DF1D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.h
new file mode 100644
index 00000000000..bcae5fc220f
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_ORIENTATION2DF1D_H
+#define FREESTYLE_PYTHON_ORIENTATION2DF1D_H
+
+#include "../BPy_UnaryFunction1DVec2f.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject Orientation2DF1D_Type;
+
+#define BPy_Orientation2DF1D_Check(v)	(( (PyObject *) v)->ob_type == &Orientation2DF1D_Type)
+
+/*---------------------------Python BPy_Orientation2DF1D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction1DVec2f py_uf1D_vec2f;
+} BPy_Orientation2DF1D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_ORIENTATION2DF1D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.cpp
index f416f2ace03..5501a875683 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.cpp
@@ -1,12 +1,124 @@
- PyObject *_wrap_Orientation3DF1D_getName(PyObject *self , PyObject *args) {
+#include "BPy_Orientation3DF1D.h"
+
+#include "../../../view_map/Functions1D.h"
+#include "../../BPy_Convert.h"
+#include "../../BPy_IntegrationType.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for Orientation3DF1D instance  -----------*/
+	static int Orientation3DF1D___init__( BPy_Orientation3DF1D* self, PyObject *args);
+
+/*-----------------------BPy_Orientation3DF1D type definition ------------------------------*/
+
+PyTypeObject Orientation3DF1D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"Orientation3DF1D",				/* tp_name */
+	sizeof( BPy_Orientation3DF1D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction1DVec3f_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)Orientation3DF1D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int Orientation3DF1D___init__( BPy_Orientation3DF1D* self, PyObject *args)
+{
+	PyObject *obj = 0;
+
+	if( !PyArg_ParseTuple(args, "|O", &obj) ) {
+		cout << "ERROR: Orientation3DF1D___init__" << endl;		
+		return -1;
+	}
+
+	IntegrationType t = ( obj && BPy_IntegrationType_Check(obj) ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
+	self->py_uf1D_vec3f.uf1D_vec3f = new Functions1D::Orientation3DF1D(t);
+	return 0;
+
 }
 
 
- PyObject *_wrap_Orientation3DF1D___call__(PyObject *self , PyObject *args) {
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_delete_Orientation3DF1D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.h
new file mode 100644
index 00000000000..a868c04ce15
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_ORIENTATION3DF1D_H
+#define FREESTYLE_PYTHON_ORIENTATION3DF1D_H
+
+#include "../BPy_UnaryFunction1DVec3f.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject Orientation3DF1D_Type;
+
+#define BPy_Orientation3DF1D_Check(v)	(( (PyObject *) v)->ob_type == &Orientation3DF1D_Type)
+
+/*---------------------------Python BPy_Orientation3DF1D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction1DVec3f py_uf1D_vec3f;
+} BPy_Orientation3DF1D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_ORIENTATION3DF1D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_Curvature2DAngleF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_Curvature2DAngleF1D.cpp
new file mode 100644
index 00000000000..ae4a6c7f33d
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_Curvature2DAngleF1D.cpp
@@ -0,0 +1,121 @@
+#include "BPy_Curvature2DAngleF1D.h"
+
+#include "../../../view_map/Functions1D.h"
+#include "../../BPy_Convert.h"
+#include "../../BPy_IntegrationType.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for Curvature2DAngleF1D instance  -----------*/
+static int Curvature2DAngleF1D___init__(BPy_Curvature2DAngleF1D* self, PyObject *args);
+
+/*-----------------------BPy_Curvature2DAngleF1D type definition ------------------------------*/
+
+PyTypeObject Curvature2DAngleF1D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"Curvature2DAngleF1D",				/* tp_name */
+	sizeof( BPy_Curvature2DAngleF1D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction1DDouble_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)Curvature2DAngleF1D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int Curvature2DAngleF1D___init__( BPy_Curvature2DAngleF1D* self, PyObject *args)
+{
+	PyObject *obj = 0;
+
+	if( !PyArg_ParseTuple(args, "|O", &obj) ) {
+		cout << "ERROR: Curvature2DAngleF1D___init__ " << endl;		
+		return -1;
+	}
+	
+	IntegrationType t = ( obj && BPy_IntegrationType_Check(obj) ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
+	self->py_uf1D_double.uf1D_double = new Functions1D::Curvature2DAngleF1D(t);
+	return 0;
+
+}
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_Curvature2DAngleF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_Curvature2DAngleF1D.h
new file mode 100644
index 00000000000..838bb229844
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_Curvature2DAngleF1D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_CURVATURE2DANGLEF1D_H
+#define FREESTYLE_PYTHON_CURVATURE2DANGLEF1D_H
+
+#include "../BPy_UnaryFunction1DDouble.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject Curvature2DAngleF1D_Type;
+
+#define BPy_Curvature2DAngleF1D_Check(v)	(( (PyObject *) v)->ob_type == &Curvature2DAngleF1D_Type)
+
+/*---------------------------Python BPy_Curvature2DAngleF1D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction1DDouble py_uf1D_double;
+} BPy_Curvature2DAngleF1D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_CURVATURE2DANGLEF1D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_DensityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_DensityF1D.cpp
index 861a94b7cd3..b6b3262d1cc 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_DensityF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_DensityF1D.cpp
@@ -1,8 +1,124 @@
- PyObject *_wrap_DensityF1D_getName(PyObject *self , PyObject *args) {
+#include "BPy_DensityF1D.h"
+
+#include "../../../stroke/AdvancedFunctions1D.h"
+#include "../../BPy_Convert.h"
+#include "../../BPy_IntegrationType.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for DensityF1D instance  -----------*/
+	static int DensityF1D___init__(BPy_DensityF1D* self, PyObject *args);
+
+/*-----------------------BPy_DensityF1D type definition ------------------------------*/
+
+PyTypeObject DensityF1D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"DensityF1D",				/* tp_name */
+	sizeof( BPy_DensityF1D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction1DDouble_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)DensityF1D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int DensityF1D___init__( BPy_DensityF1D* self, PyObject *args)
+{
+	PyObject *obj = 0;
+	double d = 2.0;
+	float f = 2.0;
+
+	if( !PyArg_ParseTuple(args, "|dOf", &d, &obj, &f) ) {
+		cout << "ERROR: DensityF1D___init__ " << endl;		
+		return -1;
+	}
+	
+	IntegrationType t = ( obj && BPy_IntegrationType_Check(obj) ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
+	self->py_uf1D_double.uf1D_double = new Functions1D::DensityF1D(d,t,f);
+	return 0;
+
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_DensityF1D___call__(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_DensityF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_DensityF1D.h
new file mode 100644
index 00000000000..c7839b86d4d
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_DensityF1D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_DENSITYF1D_H
+#define FREESTYLE_PYTHON_DENSITYF1D_H
+
+#include "../BPy_UnaryFunction1DDouble.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject DensityF1D_Type;
+
+#define BPy_DensityF1D_Check(v)	(( (PyObject *) v)->ob_type == &DensityF1D_Type)
+
+/*---------------------------Python BPy_DensityF1D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction1DDouble py_uf1D_double;
+} BPy_DensityF1D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_DENSITYF1D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.cpp
index c8220604cb8..e9d47e1d945 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.cpp
@@ -1,12 +1,124 @@
- PyObject *_wrap_GetCompleteViewMapDensityF1D_getName(PyObject *self , PyObject *args) {
+#include "BPy_GetCompleteViewMapDensityF1D.h"
+
+#include "../../../stroke/AdvancedFunctions1D.h"
+#include "../../BPy_Convert.h"
+#include "../../BPy_IntegrationType.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for GetCompleteViewMapDensityF1D instance  -----------*/
+	static int GetCompleteViewMapDensityF1D___init__(BPy_GetCompleteViewMapDensityF1D* self, PyObject *args);
+
+/*-----------------------BPy_GetCompleteViewMapDensityF1D type definition ------------------------------*/
+
+PyTypeObject GetCompleteViewMapDensityF1D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"GetCompleteViewMapDensityF1D",				/* tp_name */
+	sizeof( BPy_GetCompleteViewMapDensityF1D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction1DDouble_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)GetCompleteViewMapDensityF1D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int GetCompleteViewMapDensityF1D___init__( BPy_GetCompleteViewMapDensityF1D* self, PyObject *args)
+{
+	PyObject *obj = 0;
+	unsigned i;
+	float f = 2.0;
+
+	if( !PyArg_ParseTuple(args, "i|Of", &i, &obj, &f) ) {
+		cout << "ERROR: GetCompleteViewMapDensityF1D___init__ " << endl;		
+		return -1;
+	}
+	
+	IntegrationType t = ( obj && BPy_IntegrationType_Check(obj) ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
+	self->py_uf1D_double.uf1D_double = new Functions1D::GetCompleteViewMapDensityF1D(i,t,f);
+	return 0;
+
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_GetCompleteViewMapDensityF1D___call__(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_delete_GetCompleteViewMapDensityF1D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.h
new file mode 100644
index 00000000000..5106930be75
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_GETCOMPLETEVIEWMAPDENSITYF1D_H
+#define FREESTYLE_PYTHON_GETCOMPLETEVIEWMAPDENSITYF1D_H
+
+#include "../BPy_UnaryFunction1DDouble.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject GetCompleteViewMapDensityF1D_Type;
+
+#define BPy_GetCompleteViewMapDensityF1D_Check(v)	(( (PyObject *) v)->ob_type == &GetCompleteViewMapDensityF1D_Type)
+
+/*---------------------------Python BPy_GetCompleteViewMapDensityF1D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction1DDouble py_uf1D_double;
+} BPy_GetCompleteViewMapDensityF1D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_GETCOMPLETEVIEWMAPDENSITYF1D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.cpp
index b7c4e40fd82..7691cda9a30 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.cpp
@@ -1,12 +1,124 @@
- PyObject *_wrap_GetDirectionalViewMapDensityF1D_getName(PyObject *self , PyObject *args) {
+#include "BPy_GetDirectionalViewMapDensityF1D.h"
+
+#include "../../../stroke/AdvancedFunctions1D.h"
+#include "../../BPy_Convert.h"
+#include "../../BPy_IntegrationType.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for GetDirectionalViewMapDensityF1D instance  -----------*/
+	static int GetDirectionalViewMapDensityF1D___init__(BPy_GetDirectionalViewMapDensityF1D* self, PyObject *args);
+
+/*-----------------------BPy_GetDirectionalViewMapDensityF1D type definition ------------------------------*/
+
+PyTypeObject GetDirectionalViewMapDensityF1D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"GetDirectionalViewMapDensityF1D",				/* tp_name */
+	sizeof( BPy_GetDirectionalViewMapDensityF1D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction1DDouble_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)GetDirectionalViewMapDensityF1D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int GetDirectionalViewMapDensityF1D___init__( BPy_GetDirectionalViewMapDensityF1D* self, PyObject *args)
+{
+	PyObject *obj = 0;
+	unsigned int u1, u2;
+	float f = 2.0;
+
+	if( !PyArg_ParseTuple(args, "II|Of", &u1, &u2, &obj, &f) ) {
+		cout << "ERROR: GetDirectionalViewMapDensityF1D___init__ " << endl;		
+		return -1;
+	}
+	
+	IntegrationType t = ( obj && BPy_IntegrationType_Check(obj) ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
+	self->py_uf1D_double.uf1D_double = new Functions1D::GetDirectionalViewMapDensityF1D(u1, u2, t, f);
+	return 0;
+
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_GetDirectionalViewMapDensityF1D___call__(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_delete_GetDirectionalViewMapDensityF1D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.h
new file mode 100644
index 00000000000..a2c3572694f
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_GETDIRECTIONALVIEWMAPDENSITYF1D_H
+#define FREESTYLE_PYTHON_GETDIRECTIONALVIEWMAPDENSITYF1D_H
+
+#include "../BPy_UnaryFunction1DDouble.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject GetDirectionalViewMapDensityF1D_Type;
+
+#define BPy_GetDirectionalViewMapDensityF1D_Check(v)	(( (PyObject *) v)->ob_type == &GetDirectionalViewMapDensityF1D_Type)
+
+/*---------------------------Python BPy_GetDirectionalViewMapDensityF1D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction1DDouble py_uf1D_double;
+} BPy_GetDirectionalViewMapDensityF1D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_GETDIRECTIONALVIEWMAPDENSITYF1D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedXF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedXF1D.cpp
new file mode 100644
index 00000000000..9832053f11b
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedXF1D.cpp
@@ -0,0 +1,122 @@
+#include "BPy_GetProjectedXF1D.h"
+
+#include "../../../view_map/Functions1D.h"
+#include "../../BPy_Convert.h"
+#include "../../BPy_IntegrationType.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for GetProjectedXF1D instance  -----------*/
+	static int GetProjectedXF1D___init__(BPy_GetProjectedXF1D* self, PyObject *args );
+
+/*-----------------------BPy_GetProjectedXF1D type definition ------------------------------*/
+
+PyTypeObject GetProjectedXF1D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"GetProjectedXF1D",				/* tp_name */
+	sizeof( BPy_GetProjectedXF1D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction1DDouble_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)GetProjectedXF1D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int GetProjectedXF1D___init__( BPy_GetProjectedXF1D* self, PyObject *args )
+{
+	PyObject *obj = 0;
+
+	if( !PyArg_ParseTuple(args, "|O", &obj) ) {
+		cout << "ERROR: GetProjectedXF1D___init__ " << endl;		
+		return -1;
+	}
+	
+	IntegrationType t = ( obj && BPy_IntegrationType_Check(obj) ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
+	self->py_uf1D_double.uf1D_double = new Functions1D::GetProjectedXF1D(t);
+	return 0;
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedXF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedXF1D.h
new file mode 100644
index 00000000000..26350df2013
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedXF1D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_GETPROJECTEDXF1D_H
+#define FREESTYLE_PYTHON_GETPROJECTEDXF1D_H
+
+#include "../BPy_UnaryFunction1DDouble.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject GetProjectedXF1D_Type;
+
+#define BPy_GetProjectedXF1D_Check(v)	(( (PyObject *) v)->ob_type == &GetProjectedXF1D_Type)
+
+/*---------------------------Python BPy_GetProjectedXF1D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction1DDouble py_uf1D_double;
+} BPy_GetProjectedXF1D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_GETPROJECTEDXF1D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedYF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedYF1D.cpp
new file mode 100644
index 00000000000..83b7c82691d
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedYF1D.cpp
@@ -0,0 +1,121 @@
+#include "BPy_GetProjectedYF1D.h"
+
+#include "../../../view_map/Functions1D.h"
+#include "../../BPy_Convert.h"
+#include "../../BPy_IntegrationType.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for GetProjectedYF1D instance  -----------*/
+	static int GetProjectedYF1D___init__(BPy_GetProjectedYF1D* self, PyObject *args );
+
+/*-----------------------BPy_GetProjectedYF1D type definition ------------------------------*/
+
+PyTypeObject GetProjectedYF1D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"GetProjectedYF1D",				/* tp_name */
+	sizeof( BPy_GetProjectedYF1D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction1DDouble_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)GetProjectedYF1D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int GetProjectedYF1D___init__( BPy_GetProjectedYF1D* self, PyObject *args )
+{
+	PyObject *obj = 0;
+
+	if( !PyArg_ParseTuple(args, "|O", &obj) ) {
+		cout << "ERROR: GetProjectedYF1D___init__ " << endl;		
+		return -1;
+	}
+	
+	IntegrationType t = ( obj && BPy_IntegrationType_Check(obj) ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
+	self->py_uf1D_double.uf1D_double = new Functions1D::GetProjectedYF1D(t);
+	return 0;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedYF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedYF1D.h
new file mode 100644
index 00000000000..86602d9619c
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedYF1D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_GETPROJECTEDYF1D_H
+#define FREESTYLE_PYTHON_GETPROJECTEDYF1D_H
+
+#include "../BPy_UnaryFunction1DDouble.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject GetProjectedYF1D_Type;
+
+#define BPy_GetProjectedYF1D_Check(v)	(( (PyObject *) v)->ob_type == &GetProjectedYF1D_Type)
+
+/*---------------------------Python BPy_GetProjectedYF1D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction1DDouble py_uf1D_double;
+} BPy_GetProjectedYF1D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_GETPROJECTEDYF1D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedZF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedZF1D.cpp
new file mode 100644
index 00000000000..78f8dccc4c7
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedZF1D.cpp
@@ -0,0 +1,121 @@
+#include "BPy_GetProjectedZF1D.h"
+
+#include "../../../view_map/Functions1D.h"
+#include "../../BPy_Convert.h"
+#include "../../BPy_IntegrationType.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for GetProjectedZF1D instance  -----------*/
+	static int GetProjectedZF1D___init__(BPy_GetProjectedZF1D* self, PyObject *args );
+
+/*-----------------------BPy_GetProjectedZF1D type definition ------------------------------*/
+
+PyTypeObject GetProjectedZF1D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"GetProjectedZF1D",				/* tp_name */
+	sizeof( BPy_GetProjectedZF1D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction1DDouble_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)GetProjectedZF1D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int GetProjectedZF1D___init__( BPy_GetProjectedZF1D* self, PyObject *args )
+{
+	PyObject *obj = 0;
+
+	if( !PyArg_ParseTuple(args, "|O", &obj) ) {
+		cout << "ERROR: GetProjectedZF1D___init__ " << endl;		
+		return -1;
+	}
+	
+	IntegrationType t = ( obj && BPy_IntegrationType_Check(obj) ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
+	self->py_uf1D_double.uf1D_double = new Functions1D::GetProjectedZF1D(t);
+	return 0;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedZF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedZF1D.h
new file mode 100644
index 00000000000..9f2a4bc1a3e
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedZF1D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_GETPROJECTEDZF1D_H
+#define FREESTYLE_PYTHON_GETPROJECTEDZF1D_H
+
+#include "../BPy_UnaryFunction1DDouble.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject GetProjectedZF1D_Type;
+
+#define BPy_GetProjectedZF1D_Check(v)	(( (PyObject *) v)->ob_type == &GetProjectedZF1D_Type)
+
+/*---------------------------Python BPy_GetProjectedZF1D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction1DDouble py_uf1D_double;
+} BPy_GetProjectedZF1D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_GETPROJECTEDZF1D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetSteerableViewMapDensityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetSteerableViewMapDensityF1D.cpp
new file mode 100644
index 00000000000..3960cc91456
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetSteerableViewMapDensityF1D.cpp
@@ -0,0 +1,124 @@
+#include "BPy_GetSteerableViewMapDensityF1D.h"
+
+#include "../../../stroke/AdvancedFunctions1D.h"
+#include "../../BPy_Convert.h"
+#include "../../BPy_IntegrationType.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for GetSteerableViewMapDensityF1D instance  -----------*/
+	static int GetSteerableViewMapDensityF1D___init__(BPy_GetSteerableViewMapDensityF1D* self, PyObject *args);
+
+/*-----------------------BPy_GetSteerableViewMapDensityF1D type definition ------------------------------*/
+
+PyTypeObject GetSteerableViewMapDensityF1D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"GetSteerableViewMapDensityF1D",				/* tp_name */
+	sizeof( BPy_GetSteerableViewMapDensityF1D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction1DDouble_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)GetSteerableViewMapDensityF1D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int GetSteerableViewMapDensityF1D___init__( BPy_GetSteerableViewMapDensityF1D* self, PyObject *args)
+{
+	PyObject *obj = 0;
+	int i;
+	float f = 2.0;
+
+	if( !PyArg_ParseTuple(args, "i|Of", &i, &obj, &f) ) {
+		cout << "ERROR: GetSteerableViewMapDensityF1D___init__ " << endl;		
+		return -1;
+	}
+	
+	IntegrationType t = ( obj && BPy_IntegrationType_Check(obj) ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
+	self->py_uf1D_double.uf1D_double = new Functions1D::GetSteerableViewMapDensityF1D(i,t,f);
+	return 0;
+
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetSteerableViewMapDensityF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetSteerableViewMapDensityF1D.h
new file mode 100644
index 00000000000..fa9942a55a1
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetSteerableViewMapDensityF1D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_GETSTEERABLEVIEWMAPDENSITYF1D_H
+#define FREESTYLE_PYTHON_GETSTEERABLEVIEWMAPDENSITYF1D_H
+
+#include "../BPy_UnaryFunction1DDouble.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject GetSteerableViewMapDensityF1D_Type;
+
+#define BPy_GetSteerableViewMapDensityF1D_Check(v)	(( (PyObject *) v)->ob_type == &GetSteerableViewMapDensityF1D_Type)
+
+/*---------------------------Python BPy_GetSteerableViewMapDensityF1D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction1DDouble py_uf1D_double;
+} BPy_GetSteerableViewMapDensityF1D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_GETSTEERABLEVIEWMAPDENSITYF1D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetViewMapGradientNormF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetViewMapGradientNormF1D.cpp
new file mode 100644
index 00000000000..6549e0bf2ce
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetViewMapGradientNormF1D.cpp
@@ -0,0 +1,124 @@
+#include "BPy_GetViewMapGradientNormF1D.h"
+
+#include "../../../stroke/AdvancedFunctions1D.h"
+#include "../../BPy_Convert.h"
+#include "../../BPy_IntegrationType.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for GetViewMapGradientNormF1D instance  -----------*/
+	static int GetViewMapGradientNormF1D___init__(BPy_GetViewMapGradientNormF1D* self, PyObject *args);
+
+/*-----------------------BPy_GetViewMapGradientNormF1D type definition ------------------------------*/
+
+PyTypeObject GetViewMapGradientNormF1D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"GetViewMapGradientNormF1D",				/* tp_name */
+	sizeof( BPy_GetViewMapGradientNormF1D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction1DDouble_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)GetViewMapGradientNormF1D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int GetViewMapGradientNormF1D___init__( BPy_GetViewMapGradientNormF1D* self, PyObject *args)
+{
+	PyObject *obj = 0;
+	int i;
+	float f = 2.0;
+
+	if( !PyArg_ParseTuple(args, "i|Of", &i, &obj, &f) ) {
+		cout << "ERROR: GetViewMapGradientNormF1D___init__ " << endl;		
+		return -1;
+	}
+	
+	IntegrationType t = ( obj && BPy_IntegrationType_Check(obj) ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
+	self->py_uf1D_double.uf1D_double = new Functions1D::GetViewMapGradientNormF1D(i,t,f);
+	return 0;
+
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetViewMapGradientNormF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetViewMapGradientNormF1D.h
new file mode 100644
index 00000000000..5fcb88d5a29
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetViewMapGradientNormF1D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_GETVIEWMAPGRADIENTNORMF1D_H
+#define FREESTYLE_PYTHON_GETVIEWMAPGRADIENTNORMF1D_H
+
+#include "../BPy_UnaryFunction1DDouble.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject GetViewMapGradientNormF1D_Type;
+
+#define BPy_GetViewMapGradientNormF1D_Check(v)	(( (PyObject *) v)->ob_type == &GetViewMapGradientNormF1D_Type)
+
+/*---------------------------Python BPy_GetViewMapGradientNormF1D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction1DDouble py_uf1D_double;
+} BPy_GetViewMapGradientNormF1D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_GETVIEWMAPGRADIENTNORMF1D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetXF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetXF1D.cpp
new file mode 100644
index 00000000000..d7c4c82639d
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetXF1D.cpp
@@ -0,0 +1,122 @@
+#include "BPy_GetXF1D.h"
+
+#include "../../../view_map/Functions1D.h"
+#include "../../BPy_Convert.h"
+#include "../../BPy_IntegrationType.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for GetXF1D instance  -----------*/
+	static int GetXF1D___init__(BPy_GetXF1D* self, PyObject *args );
+
+/*-----------------------BPy_GetXF1D type definition ------------------------------*/
+
+PyTypeObject GetXF1D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"GetXF1D",				/* tp_name */
+	sizeof( BPy_GetXF1D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction1DDouble_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)GetXF1D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int GetXF1D___init__( BPy_GetXF1D* self, PyObject *args )
+{
+	PyObject *obj = 0;
+
+	if( !PyArg_ParseTuple(args, "|O", &obj) ) {
+		cout << "ERROR: GetXF1D___init__ " << endl;		
+		return -1;
+	}
+	
+	IntegrationType t = ( obj && BPy_IntegrationType_Check(obj) ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
+	self->py_uf1D_double.uf1D_double = new Functions1D::GetXF1D(t);
+	return 0;
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetXF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetXF1D.h
new file mode 100644
index 00000000000..ad39a5a9b10
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetXF1D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_GETXF1D_H
+#define FREESTYLE_PYTHON_GETXF1D_H
+
+#include "../BPy_UnaryFunction1DDouble.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject GetXF1D_Type;
+
+#define BPy_GetXF1D_Check(v)	(( (PyObject *) v)->ob_type == &GetXF1D_Type)
+
+/*---------------------------Python BPy_GetXF1D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction1DDouble py_uf1D_double;
+} BPy_GetXF1D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_GETXF1D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetYF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetYF1D.cpp
new file mode 100644
index 00000000000..cb4cf1c01b1
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetYF1D.cpp
@@ -0,0 +1,120 @@
+#include "BPy_GetYF1D.h"
+
+#include "../../../view_map/Functions1D.h"
+#include "../../BPy_Convert.h"
+#include "../../BPy_IntegrationType.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for GetYF1D instance  -----------*/
+	static int GetYF1D___init__(BPy_GetYF1D* self, PyObject *args );
+
+/*-----------------------BPy_GetYF1D type definition ------------------------------*/
+
+PyTypeObject GetYF1D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"GetYF1D",				/* tp_name */
+	sizeof( BPy_GetYF1D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction1DDouble_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)GetYF1D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int GetYF1D___init__( BPy_GetYF1D* self, PyObject *args )
+{
+	PyObject *obj = 0;
+
+	if( !PyArg_ParseTuple(args, "|O", &obj) ) {
+		cout << "ERROR: GetYF1D___init__ " << endl;		
+		return -1;
+	}
+	
+	IntegrationType t = ( obj && BPy_IntegrationType_Check(obj) ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
+	self->py_uf1D_double.uf1D_double = new Functions1D::GetYF1D(t);
+	return 0;
+}
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetYF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetYF1D.h
new file mode 100644
index 00000000000..6fc7da72752
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetYF1D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_GETYF1D_H
+#define FREESTYLE_PYTHON_GETYF1D_H
+
+#include "../BPy_UnaryFunction1DDouble.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject GetYF1D_Type;
+
+#define BPy_GetYF1D_Check(v)	(( (PyObject *) v)->ob_type == &GetYF1D_Type)
+
+/*---------------------------Python BPy_GetYF1D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction1DDouble py_uf1D_double;
+} BPy_GetYF1D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_GETYF1D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetZF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetZF1D.cpp
new file mode 100644
index 00000000000..02a6a9aaa5d
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetZF1D.cpp
@@ -0,0 +1,121 @@
+#include "BPy_GetZF1D.h"
+
+#include "../../../view_map/Functions1D.h"
+#include "../../BPy_Convert.h"
+#include "../../BPy_IntegrationType.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for GetZF1D instance  -----------*/
+	static int GetZF1D___init__(BPy_GetZF1D* self, PyObject *args );
+
+/*-----------------------BPy_GetZF1D type definition ------------------------------*/
+
+PyTypeObject GetZF1D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"GetZF1D",				/* tp_name */
+	sizeof( BPy_GetZF1D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction1DDouble_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)GetZF1D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int GetZF1D___init__( BPy_GetZF1D* self, PyObject *args )
+{
+	PyObject *obj = 0;
+
+	if( !PyArg_ParseTuple(args, "|O", &obj) ) {
+		cout << "ERROR: GetZF1D___init__ " << endl;		
+		return -1;
+	}
+	
+	IntegrationType t = ( obj && BPy_IntegrationType_Check(obj) ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
+	self->py_uf1D_double.uf1D_double = new Functions1D::GetZF1D(t);
+	return 0;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetZF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetZF1D.h
new file mode 100644
index 00000000000..71e57faa7ef
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetZF1D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_GETZF1D_H
+#define FREESTYLE_PYTHON_GETZF1D_H
+
+#include "../BPy_UnaryFunction1DDouble.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject GetZF1D_Type;
+
+#define BPy_GetZF1D_Check(v)	(( (PyObject *) v)->ob_type == &GetZF1D_Type)
+
+/*---------------------------Python BPy_GetZF1D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction1DDouble py_uf1D_double;
+} BPy_GetZF1D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_GETZF1D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_LocalAverageDepthF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_LocalAverageDepthF1D.cpp
index 6b9c687e9e0..9623b9d6fc6 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_LocalAverageDepthF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_LocalAverageDepthF1D.cpp
@@ -1,12 +1,121 @@
- PyObject *_wrap_LocalAverageDepthF1D_getName(PyObject *self , PyObject *args) {
+#include "BPy_LocalAverageDepthF1D.h"
+
+#include "../../../stroke/AdvancedFunctions1D.h"
+#include "../../BPy_Convert.h"
+#include "../../BPy_IntegrationType.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for LocalAverageDepthF1D instance  -----------*/
+	static int LocalAverageDepthF1D___init__(BPy_LocalAverageDepthF1D* self, PyObject *args);
+
+/*-----------------------BPy_LocalAverageDepthF1D type definition ------------------------------*/
+
+PyTypeObject LocalAverageDepthF1D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"LocalAverageDepthF1D",				/* tp_name */
+	sizeof( BPy_LocalAverageDepthF1D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction1DDouble_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)LocalAverageDepthF1D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int LocalAverageDepthF1D___init__( BPy_LocalAverageDepthF1D* self, PyObject *args)
+{
+	PyObject *obj = 0;
+	double d;
+
+	if( !PyArg_ParseTuple(args, "d|O", &d, &obj) ) {
+		cout << "ERROR: LocalAverageDepthF1D___init__ " << endl;		
+		return -1;
+	}
+	
+	IntegrationType t = ( obj && BPy_IntegrationType_Check(obj) ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
+	self->py_uf1D_double.uf1D_double = new Functions1D::LocalAverageDepthF1D(d,t);
+	return 0;
 }
+///////////////////////////////////////////////////////////////////////////////////////////
 
-
- PyObject *_wrap_LocalAverageDepthF1D___call__(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_delete_LocalAverageDepthF1D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_LocalAverageDepthF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_LocalAverageDepthF1D.h
new file mode 100644
index 00000000000..cb9902cc38f
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_LocalAverageDepthF1D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_LOCALAVERAGEDEPTHF1D_H
+#define FREESTYLE_PYTHON_LOCALAVERAGEDEPTHF1D_H
+
+#include "../BPy_UnaryFunction1DDouble.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject LocalAverageDepthF1D_Type;
+
+#define BPy_LocalAverageDepthF1D_Check(v)	(( (PyObject *) v)->ob_type == &LocalAverageDepthF1D_Type)
+
+/*---------------------------Python BPy_LocalAverageDepthF1D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction1DDouble py_uf1D_double;
+} BPy_LocalAverageDepthF1D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_LOCALAVERAGEDEPTHF1D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.cpp
new file mode 100644
index 00000000000..17ddcda299a
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.cpp
@@ -0,0 +1,122 @@
+#include "BPy_ZDiscontinuityF1D.h"
+
+#include "../../../view_map/Functions1D.h"
+#include "../../BPy_Convert.h"
+#include "../../BPy_IntegrationType.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for ZDiscontinuityF1D instance  -----------*/
+	static int ZDiscontinuityF1D___init__(BPy_ZDiscontinuityF1D* self, PyObject *args );
+
+/*-----------------------BPy_ZDiscontinuityF1D type definition ------------------------------*/
+
+PyTypeObject ZDiscontinuityF1D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"ZDiscontinuityF1D",				/* tp_name */
+	sizeof( BPy_ZDiscontinuityF1D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction1DDouble_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)ZDiscontinuityF1D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int ZDiscontinuityF1D___init__( BPy_ZDiscontinuityF1D* self, PyObject *args )
+{
+	PyObject *obj = 0;
+
+	if( !PyArg_ParseTuple(args, "|O", &obj) ) {
+		cout << "ERROR: ZDiscontinuityF1D___init__ " << endl;		
+		return -1;
+	}
+	
+	IntegrationType t = ( obj && BPy_IntegrationType_Check(obj) ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
+	self->py_uf1D_double.uf1D_double = new Functions1D::ZDiscontinuityF1D(t);
+	return 0;
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.h
new file mode 100644
index 00000000000..66524e5c16a
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_ZDISCONTINUITYF1D_H
+#define FREESTYLE_PYTHON_ZDISCONTINUITYF1D_H
+
+#include "../BPy_UnaryFunction1DDouble.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject ZDiscontinuityF1D_Type;
+
+#define BPy_ZDiscontinuityF1D_Check(v)	(( (PyObject *) v)->ob_type == &ZDiscontinuityF1D_Type)
+
+/*---------------------------Python BPy_ZDiscontinuityF1D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction1DDouble py_uf1D_double;
+} BPy_ZDiscontinuityF1D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_ZDISCONTINUITYF1D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_Curvature2DAngleF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_Curvature2DAngleF1D.cpp
deleted file mode 100644
index d2057990944..00000000000
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_Curvature2DAngleF1D.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
- PyObject *_wrap_Curvature2DAngleF1D_getName(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Curvature2DAngleF1D___call__(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_Curvature2DAngleF1D(PyObject *self , PyObject *args) {
-}
-
-
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetProjectedXF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetProjectedXF1D.cpp
deleted file mode 100644
index d7c8ace1bb2..00000000000
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetProjectedXF1D.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
- PyObject *_wrap_GetProjectedXF1D_getName(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_GetProjectedXF1D___call__(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_GetProjectedXF1D(PyObject *self , PyObject *args) {
-}
-
-
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetProjectedYF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetProjectedYF1D.cpp
deleted file mode 100644
index e567e07ba5a..00000000000
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetProjectedYF1D.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
- PyObject *_wrap_GetProjectedYF1D_getName(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_GetProjectedYF1D___call__(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_GetProjectedYF1D(PyObject *self , PyObject *args) {
-}
-
-
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetProjectedZF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetProjectedZF1D.cpp
deleted file mode 100644
index b20ee1443e7..00000000000
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetProjectedZF1D.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
- PyObject *_wrap_GetProjectedZF1D_getName(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_GetProjectedZF1D___call__(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_GetProjectedZF1D(PyObject *self , PyObject *args) {
-}
-
-
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetSteerableViewMapDensityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetSteerableViewMapDensityF1D.cpp
deleted file mode 100644
index 21df4596b5e..00000000000
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetSteerableViewMapDensityF1D.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
- PyObject *_wrap_GetSteerableViewMapDensityF1D_getName(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_GetSteerableViewMapDensityF1D___call__(PyObject *self , PyObject *args) {
-}
-
-
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetViewMapGradientNormF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetViewMapGradientNormF1D.cpp
deleted file mode 100644
index bd5425450e8..00000000000
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetViewMapGradientNormF1D.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
- PyObject *_wrap_GetViewMapGradientNormF1D_getName(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_GetViewMapGradientNormF1D___call__(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_GetViewMapGradientNormF1D(PyObject *self , PyObject *args) {
-}
-
-
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetXF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetXF1D.cpp
deleted file mode 100644
index 73b4df64df6..00000000000
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetXF1D.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
- PyObject *_wrap_GetXF1D_getName(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_GetXF1D___call__(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_GetXF1D(PyObject *self , PyObject *args) {
-}
-
-
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetYF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetYF1D.cpp
deleted file mode 100644
index 36a1ffed9c6..00000000000
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetYF1D.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
- PyObject *_wrap_GetYF1D_getName(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_GetYF1D___call__(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_GetYF1D(PyObject *self , PyObject *args) {
-}
-
-
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetZF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetZF1D.cpp
deleted file mode 100644
index ad0fc844a1c..00000000000
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_GetZF1D.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
- PyObject *_wrap_GetZF1D_getName(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_GetZF1D___call__(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_GetZF1D(PyObject *self , PyObject *args) {
-}
-
-
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_ZDiscontinuityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_ZDiscontinuityF1D.cpp
deleted file mode 100644
index 886607f7ca9..00000000000
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/BPy_ZDiscontinuityF1D.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
- PyObject *_wrap_ZDiscontinuityF1D_getName(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_ZDiscontinuityF1D___call__(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_ZDiscontinuityF1D(PyObject *self , PyObject *args) {
-}
-
-
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned/BPy_QuantitativeInvisibilityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned/BPy_QuantitativeInvisibilityF1D.cpp
deleted file mode 100644
index 436b617886b..00000000000
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned/BPy_QuantitativeInvisibilityF1D.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
- PyObject *_wrap_QuantitativeInvisibilityF1D_getName(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_QuantitativeInvisibilityF1D___call__(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_QuantitativeInvisibilityF1D(PyObject *self , PyObject *args) {
-}
-
-
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.cpp
new file mode 100644
index 00000000000..f6d466b61fa
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.cpp
@@ -0,0 +1,122 @@
+#include "BPy_QuantitativeInvisibilityF1D.h"
+
+#include "../../../view_map/Functions1D.h"
+#include "../../BPy_Convert.h"
+#include "../../BPy_IntegrationType.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for QuantitativeInvisibilityF1D instance  -----------*/
+	static int QuantitativeInvisibilityF1D___init__(BPy_QuantitativeInvisibilityF1D* self, PyObject *args);
+
+/*-----------------------BPy_QuantitativeInvisibilityF1D type definition ------------------------------*/
+
+PyTypeObject QuantitativeInvisibilityF1D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"QuantitativeInvisibilityF1D",				/* tp_name */
+	sizeof( BPy_QuantitativeInvisibilityF1D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction1DUnsigned_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)QuantitativeInvisibilityF1D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int QuantitativeInvisibilityF1D___init__( BPy_QuantitativeInvisibilityF1D* self, PyObject *args)
+{
+	PyObject *obj = 0;
+
+	if( !PyArg_ParseTuple(args, "|O", &obj) ) {
+		cout << "ERROR: QuantitativeInvisibilityF1D___init__" << endl;		
+		return -1;
+	}
+
+	IntegrationType t = ( obj && BPy_IntegrationType_Check(obj) ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
+	self->py_uf1D_unsigned.uf1D_unsigned = new Functions1D::QuantitativeInvisibilityF1D(t);
+	return 0;
+
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.h
new file mode 100644
index 00000000000..8b8e793582f
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_QUANTITATIVEINVISIBILITYF1D_H
+#define FREESTYLE_PYTHON_QUANTITATIVEINVISIBILITYF1D_H
+
+#include "../BPy_UnaryFunction1DUnsigned.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject QuantitativeInvisibilityF1D_Type;
+
+#define BPy_QuantitativeInvisibilityF1D_Check(v)	(( (PyObject *) v)->ob_type == &QuantitativeInvisibilityF1D_Type)
+
+/*---------------------------Python BPy_QuantitativeInvisibilityF1D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction1DUnsigned py_uf1D_unsigned;
+} BPy_QuantitativeInvisibilityF1D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_QUANTITATIVEINVISIBILITYF1D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.cpp
index 7df4ea835ca..b4a5c7180b6 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.cpp
@@ -1,12 +1,113 @@
- PyObject *_wrap_GetOccludeeF1D_getName(PyObject *self , PyObject *args) {
+#include "BPy_GetOccludeeF1D.h"
+
+#include "../../../view_map/Functions1D.h"
+#include "../../BPy_Convert.h"
+#include "../../BPy_IntegrationType.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for GetOccludeeF1D instance  -----------*/
+	static int GetOccludeeF1D___init__(BPy_GetOccludeeF1D* self);
+
+/*-----------------------BPy_GetOccludeeF1D type definition ------------------------------*/
+
+PyTypeObject GetOccludeeF1D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"GetOccludeeF1D",				/* tp_name */
+	sizeof( BPy_GetOccludeeF1D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction1DVectorViewShape_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)GetOccludeeF1D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int GetOccludeeF1D___init__( BPy_GetOccludeeF1D* self )
+{
+	self->py_uf1D_vectorviewshape.uf1D_vectorviewshape = new Functions1D::GetOccludeeF1D();
+	return 0;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_GetOccludeeF1D___call__(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_delete_GetOccludeeF1D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.h
new file mode 100644
index 00000000000..0377214cb70
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_GETOCCLUDEEF1D_H
+#define FREESTYLE_PYTHON_GETOCCLUDEEF1D_H
+
+#include "../BPy_UnaryFunction1DVectorViewShape.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject GetOccludeeF1D_Type;
+
+#define BPy_GetOccludeeF1D_Check(v)	(( (PyObject *) v)->ob_type == &GetOccludeeF1D_Type)
+
+/*---------------------------Python BPy_GetOccludeeF1D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction1DVectorViewShape py_uf1D_vectorviewshape;
+} BPy_GetOccludeeF1D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_GETOCCLUDEEF1D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.cpp
index 26c14fc4a81..d5e057117f5 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.cpp
@@ -1,12 +1,113 @@
- PyObject *_wrap_GetOccludersF1D_getName(PyObject *self , PyObject *args) {
+#include "BPy_GetOccludersF1D.h"
+
+#include "../../../view_map/Functions1D.h"
+#include "../../BPy_Convert.h"
+#include "../../BPy_IntegrationType.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for GetOccludersF1D instance  -----------*/
+	static int GetOccludersF1D___init__(BPy_GetOccludersF1D* self);
+
+/*-----------------------BPy_GetOccludersF1D type definition ------------------------------*/
+
+PyTypeObject GetOccludersF1D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"GetOccludersF1D",				/* tp_name */
+	sizeof( BPy_GetOccludersF1D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction1DVectorViewShape_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)GetOccludersF1D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int GetOccludersF1D___init__( BPy_GetOccludersF1D* self )
+{
+	self->py_uf1D_vectorviewshape.uf1D_vectorviewshape = new Functions1D::GetOccludersF1D();
+	return 0;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_GetOccludersF1D___call__(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_delete_GetOccludersF1D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.h
new file mode 100644
index 00000000000..76031c5a811
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_GETOCCLUDERSF1D_H
+#define FREESTYLE_PYTHON_GETOCCLUDERSF1D_H
+
+#include "../BPy_UnaryFunction1DVectorViewShape.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject GetOccludersF1D_Type;
+
+#define BPy_GetOccludersF1D_Check(v)	(( (PyObject *) v)->ob_type == &GetOccludersF1D_Type)
+
+/*---------------------------Python BPy_GetOccludersF1D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction1DVectorViewShape py_uf1D_vectorviewshape;
+} BPy_GetOccludersF1D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_GETOCCLUDERSF1D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.cpp
index e1fd19d5d3b..2349b36fa3d 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.cpp
@@ -1,12 +1,113 @@
- PyObject *_wrap_GetShapeF1D_getName(PyObject *self , PyObject *args) {
+#include "BPy_GetShapeF1D.h"
+
+#include "../../../view_map/Functions1D.h"
+#include "../../BPy_Convert.h"
+#include "../../BPy_IntegrationType.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for GetShapeF1D instance  -----------*/
+	static int GetShapeF1D___init__(BPy_GetShapeF1D* self);
+
+/*-----------------------BPy_GetShapeF1D type definition ------------------------------*/
+
+PyTypeObject GetShapeF1D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"GetShapeF1D",				/* tp_name */
+	sizeof( BPy_GetShapeF1D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction1DVectorViewShape_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)GetShapeF1D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int GetShapeF1D___init__( BPy_GetShapeF1D* self )
+{
+	self->py_uf1D_vectorviewshape.uf1D_vectorviewshape = new Functions1D::GetShapeF1D();
+	return 0;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_GetShapeF1D___call__(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_delete_GetShapeF1D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.h
new file mode 100644
index 00000000000..3505e6688b0
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_GETSHAPEF1D_H
+#define FREESTYLE_PYTHON_GETSHAPEF1D_H
+
+#include "../BPy_UnaryFunction1DVectorViewShape.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject GetShapeF1D_Type;
+
+#define BPy_GetShapeF1D_Check(v)	(( (PyObject *) v)->ob_type == &GetShapeF1D_Type)
+
+/*---------------------------Python BPy_GetShapeF1D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction1DVectorViewShape py_uf1D_vectorviewshape;
+} BPy_GetShapeF1D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_GETSHAPEF1D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.cpp
index daf3c773267..4ea90ad9f0d 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.cpp
@@ -1,16 +1,113 @@
- PyObject *_wrap_ChainingTimeStampF1D_getName(PyObject *self , PyObject *args) {
+#include "BPy_ChainingTimeStampF1D.h"
+
+#include "../../../view_map/Functions1D.h"
+#include "../../BPy_Convert.h"
+#include "../../BPy_IntegrationType.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for ChainingTimeStampF1D instance  -----------*/
+	static int ChainingTimeStampF1D___init__(BPy_ChainingTimeStampF1D* self);
+
+/*-----------------------BPy_ChainingTimeStampF1D type definition ------------------------------*/
+
+PyTypeObject ChainingTimeStampF1D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"ChainingTimeStampF1D",				/* tp_name */
+	sizeof( BPy_ChainingTimeStampF1D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction1DVoid_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)ChainingTimeStampF1D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int ChainingTimeStampF1D___init__( BPy_ChainingTimeStampF1D* self )
+{
+	self->py_uf1D_void.uf1D_void = new Functions1D::ChainingTimeStampF1D();
+	return 0;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_ChainingTimeStampF1D___call__(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_new_ChainingTimeStampF1D(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_ChainingTimeStampF1D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.h
new file mode 100644
index 00000000000..e52e037e986
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_CHAININGTIMESTAMPF1D_H
+#define FREESTYLE_PYTHON_CHAININGTIMESTAMPF1D_H
+
+#include "../BPy_UnaryFunction1DVoid.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject ChainingTimeStampF1D_Type;
+
+#define BPy_ChainingTimeStampF1D_Check(v)	(( (PyObject *) v)->ob_type == &ChainingTimeStampF1D_Type)
+
+/*---------------------------Python BPy_ChainingTimeStampF1D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction1DVoid py_uf1D_void;
+} BPy_ChainingTimeStampF1D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_CHAININGTIMESTAMPF1D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.cpp
index 291d180a3fe..509a1e34195 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.cpp
@@ -1,16 +1,113 @@
- PyObject *_wrap_IncrementChainingTimeStampF1D_getName(PyObject *self , PyObject *args) {
+#include "BPy_IncrementChainingTimeStampF1D.h"
+
+#include "../../../view_map/Functions1D.h"
+#include "../../BPy_Convert.h"
+#include "../../BPy_IntegrationType.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for IncrementChainingTimeStampF1D instance  -----------*/
+	static int IncrementChainingTimeStampF1D___init__(BPy_IncrementChainingTimeStampF1D* self);
+
+/*-----------------------BPy_IncrementChainingTimeStampF1D type definition ------------------------------*/
+
+PyTypeObject IncrementChainingTimeStampF1D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"IncrementChainingTimeStampF1D",				/* tp_name */
+	sizeof( BPy_IncrementChainingTimeStampF1D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction1DVoid_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)IncrementChainingTimeStampF1D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int IncrementChainingTimeStampF1D___init__( BPy_IncrementChainingTimeStampF1D* self )
+{
+	self->py_uf1D_void.uf1D_void = new Functions1D::IncrementChainingTimeStampF1D();
+	return 0;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_IncrementChainingTimeStampF1D___call__(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_new_IncrementChainingTimeStampF1D(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_IncrementChainingTimeStampF1D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.h
new file mode 100644
index 00000000000..82236dd0b79
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_INCREMENTCHAININGTIMESTAMPF1D_H
+#define FREESTYLE_PYTHON_INCREMENTCHAININGTIMESTAMPF1D_H
+
+#include "../BPy_UnaryFunction1DVoid.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject IncrementChainingTimeStampF1D_Type;
+
+#define BPy_IncrementChainingTimeStampF1D_Check(v)	(( (PyObject *) v)->ob_type == &IncrementChainingTimeStampF1D_Type)
+
+/*---------------------------Python BPy_IncrementChainingTimeStampF1D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction1DVoid py_uf1D_void;
+} BPy_IncrementChainingTimeStampF1D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_INCREMENTCHAININGTIMESTAMPF1D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.cpp
index 8df3b712a30..516f6cada60 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.cpp
@@ -1,16 +1,113 @@
- PyObject *_wrap_TimeStampF1D_getName(PyObject *self , PyObject *args) {
+#include "BPy_TimeStampF1D.h"
+
+#include "../../../view_map/Functions1D.h"
+#include "../../BPy_Convert.h"
+#include "../../BPy_IntegrationType.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for TimeStampF1D instance  -----------*/
+	static int TimeStampF1D___init__(BPy_TimeStampF1D* self);
+
+/*-----------------------BPy_TimeStampF1D type definition ------------------------------*/
+
+PyTypeObject TimeStampF1D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"TimeStampF1D",				/* tp_name */
+	sizeof( BPy_TimeStampF1D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryFunction1DVoid_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)TimeStampF1D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int TimeStampF1D___init__( BPy_TimeStampF1D* self )
+{
+	self->py_uf1D_void.uf1D_void = new Functions1D::TimeStampF1D();
+	return 0;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_TimeStampF1D___call__(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_new_TimeStampF1D(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_TimeStampF1D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.h
new file mode 100644
index 00000000000..f1f91d2cd6e
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.h
@@ -0,0 +1,30 @@
+#ifndef FREESTYLE_PYTHON_TIMESTAMPF1D_H
+#define FREESTYLE_PYTHON_TIMESTAMPF1D_H
+
+#include "../BPy_UnaryFunction1DVoid.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject TimeStampF1D_Type;
+
+#define BPy_TimeStampF1D_Check(v)	(( (PyObject *) v)->ob_type == &TimeStampF1D_Type)
+
+/*---------------------------Python BPy_TimeStampF1D structure definition----------*/
+typedef struct {
+	BPy_UnaryFunction1DVoid py_uf1D_void;
+} BPy_TimeStampF1D;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_CHAININGTIMESTAMPF1D_H */

From 362e4f763f7c4c6d61ee75fec0db567f5bbe2a22 Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Sun, 27 Jul 2008 13:40:33 +0000
Subject: [PATCH 153/252] soc-2008-mxcurioni: implemented and integrated all 21
 original stroke shaders.

---
 source/blender/freestyle/SConscript           |  21 +++
 .../freestyle/intern/python/BPy_Convert.cpp   |   3 +
 .../freestyle/intern/python/BPy_Convert.h     |   1 +
 .../intern/python/BPy_StrokeShader.cpp        | 129 +++++++++++++++++-
 .../BPy_BackboneStretcherShader.cpp           | 119 +++++++++++++++-
 .../BPy_BackboneStretcherShader.h             |  31 +++++
 .../StrokeShader/BPy_BezierCurveShader.cpp    | 120 +++++++++++++++-
 .../StrokeShader/BPy_BezierCurveShader.h      |  31 +++++
 .../StrokeShader/BPy_CalligraphicShader.cpp   | 122 ++++++++++++++++-
 .../StrokeShader/BPy_CalligraphicShader.h     |  31 +++++
 .../StrokeShader/BPy_ColorNoiseShader.cpp     | 119 +++++++++++++++-
 .../StrokeShader/BPy_ColorNoiseShader.h       |  31 +++++
 .../BPy_ColorVariationPatternShader.cpp       | 121 +++++++++++++++-
 .../BPy_ColorVariationPatternShader.h         |  31 +++++
 .../StrokeShader/BPy_ConstantColorShader.cpp  | 124 +++++++++++++++--
 .../StrokeShader/BPy_ConstantColorShader.h    |  31 +++++
 .../BPy_ConstantThicknessShader.cpp           | 119 +++++++++++++++-
 .../BPy_ConstantThicknessShader.h             |  31 +++++
 ...y_ConstrainedIncreasingThicknessShader.cpp | 118 +++++++++++++++-
 ...BPy_ConstrainedIncreasingThicknessShader.h |  31 +++++
 .../StrokeShader/BPy_GuidingLinesShader.cpp   | 120 +++++++++++++++-
 .../StrokeShader/BPy_GuidingLinesShader.h     |  31 +++++
 .../BPy_IncreasingColorShader.cpp             | 119 +++++++++++++++-
 .../StrokeShader/BPy_IncreasingColorShader.h  |  31 +++++
 .../BPy_IncreasingThicknessShader.cpp         | 117 +++++++++++++++-
 .../BPy_IncreasingThicknessShader.h           |  31 +++++
 .../BPy_PolygonalizationShader.cpp            | 119 +++++++++++++++-
 .../StrokeShader/BPy_PolygonalizationShader.h |  31 +++++
 .../StrokeShader/BPy_SamplingShader.cpp       | 119 +++++++++++++++-
 .../python/StrokeShader/BPy_SamplingShader.h  |  31 +++++
 .../StrokeShader/BPy_SpatialNoiseShader.cpp   | 122 ++++++++++++++++-
 .../StrokeShader/BPy_SpatialNoiseShader.h     |  31 +++++
 .../StrokeShader/BPy_StrokeTextureShader.cpp  | 125 ++++++++++++++++-
 .../StrokeShader/BPy_StrokeTextureShader.h    |  31 +++++
 .../BPy_TextureAssignerShader.cpp             | 119 +++++++++++++++-
 .../StrokeShader/BPy_TextureAssignerShader.h  |  31 +++++
 .../StrokeShader/BPy_ThicknessNoiseShader.cpp | 119 +++++++++++++++-
 .../StrokeShader/BPy_ThicknessNoiseShader.h   |  31 +++++
 .../BPy_ThicknessVariationPatternShader.cpp   | 121 +++++++++++++++-
 .../BPy_ThicknessVariationPatternShader.h     |  31 +++++
 .../StrokeShader/BPy_TipRemoverShader.cpp     | 117 +++++++++++++++-
 .../StrokeShader/BPy_TipRemoverShader.h       |  31 +++++
 .../python/StrokeShader/BPy_fstreamShader.cpp | 118 +++++++++++++++-
 .../python/StrokeShader/BPy_fstreamShader.h   |  31 +++++
 .../python/StrokeShader/BPy_streamShader.cpp  | 116 ++++++++++++++--
 .../python/StrokeShader/BPy_streamShader.h    |  31 +++++
 .../freestyle/intern/swig/ModuleWrapper.cpp   |  52 +++----
 source/blender/freestyle/python/Freestyle.py  |   8 +-
 48 files changed, 3275 insertions(+), 103 deletions(-)
 create mode 100644 source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.h
 create mode 100644 source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.h
 create mode 100644 source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.h
 create mode 100644 source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.h
 create mode 100644 source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.h
 create mode 100644 source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.h
 create mode 100644 source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.h
 create mode 100644 source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.h
 create mode 100644 source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.h
 create mode 100644 source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.h
 create mode 100644 source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.h
 create mode 100644 source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.h
 create mode 100644 source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.h
 create mode 100644 source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.h
 create mode 100644 source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.h
 create mode 100644 source/blender/freestyle/intern/python/StrokeShader/BPy_TextureAssignerShader.h
 create mode 100644 source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.h
 create mode 100644 source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.h
 create mode 100644 source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.h
 create mode 100644 source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.h
 create mode 100644 source/blender/freestyle/intern/python/StrokeShader/BPy_streamShader.h

diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript
index 3abce0d3ec1..6423cce6593 100644
--- a/source/blender/freestyle/SConscript
+++ b/source/blender/freestyle/SConscript
@@ -100,6 +100,27 @@ python_sources = [
 					prefix + '/BPy_SShape.cpp',
 					prefix + '/BPy_StrokeAttribute.cpp',
 					prefix + '/BPy_StrokeShader.cpp',
+						prefix + '/StrokeShader/BPy_BackboneStretcherShader.cpp',
+						prefix + '/StrokeShader/BPy_BezierCurveShader.cpp',
+						prefix + '/StrokeShader/BPy_CalligraphicShader.cpp',
+						prefix + '/StrokeShader/BPy_ColorNoiseShader.cpp',
+						prefix + '/StrokeShader/BPy_ColorVariationPatternShader.cpp',
+						prefix + '/StrokeShader/BPy_ConstantColorShader.cpp',
+						prefix + '/StrokeShader/BPy_ConstantThicknessShader.cpp',
+						prefix + '/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.cpp',
+						prefix + '/StrokeShader/BPy_fstreamShader.cpp',
+						prefix + '/StrokeShader/BPy_GuidingLinesShader.cpp',
+						prefix + '/StrokeShader/BPy_IncreasingColorShader.cpp',
+						prefix + '/StrokeShader/BPy_IncreasingThicknessShader.cpp',
+						prefix + '/StrokeShader/BPy_PolygonalizationShader.cpp',
+						prefix + '/StrokeShader/BPy_SamplingShader.cpp',
+						prefix + '/StrokeShader/BPy_SpatialNoiseShader.cpp',
+						prefix + '/StrokeShader/BPy_streamShader.cpp',
+						prefix + '/StrokeShader/BPy_StrokeTextureShader.cpp',
+						prefix + '/StrokeShader/BPy_TextureAssignerShader.cpp',
+						prefix + '/StrokeShader/BPy_ThicknessNoiseShader.cpp',
+						prefix + '/StrokeShader/BPy_ThicknessVariationPatternShader.cpp',
+						prefix + '/StrokeShader/BPy_TipRemoverShader.cpp',
 					prefix + '/BPy_UnaryFunction0D.cpp',
 						prefix + '/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp',
 							prefix + '/UnaryFunction0D/UnaryFunction0D_double/BPy_Curvature2DAngleF0D.cpp',
diff --git a/source/blender/freestyle/intern/python/BPy_Convert.cpp b/source/blender/freestyle/intern/python/BPy_Convert.cpp
index d7b8bfa6cce..042d4b7bef0 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Convert.cpp
@@ -204,6 +204,9 @@ IntegrationType IntegrationType_from_BPy_IntegrationType( PyObject* obj ) {
 	return static_cast<IntegrationType>( PyInt_AsLong(obj) );
 }
 
+Stroke::MediumType MediumType_from_BPy_MediumType( PyObject* obj ) {
+	return static_cast<Stroke::MediumType>( PyInt_AsLong(obj) );
+}
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/BPy_Convert.h b/source/blender/freestyle/intern/python/BPy_Convert.h
index 4d318fcbc1d..b43f7bab291 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.h
+++ b/source/blender/freestyle/intern/python/BPy_Convert.h
@@ -59,6 +59,7 @@ PyObject * Vector_from_Vec3f( Vec3f& v );
 PyObject * Vector_from_Vec3r( Vec3r& v );
 
 IntegrationType IntegrationType_from_BPy_IntegrationType( PyObject* obj );
+Stroke::MediumType MediumType_from_BPy_MediumType( PyObject* obj );
 
 PyObject * BPy_BBox_from_BBox( BBox< Vec3r > &bb );
 PyObject * BPy_FEdge_from_FEdge( FEdge& fe );
diff --git a/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp b/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp
index cdca779dafb..a6d2ae1e512 100644
--- a/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp
+++ b/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp
@@ -3,6 +3,28 @@
 #include "BPy_Convert.h"
 #include "Interface1D/BPy_Stroke.h"
 
+#include "StrokeShader/BPy_BackboneStretcherShader.h"
+#include "StrokeShader/BPy_BezierCurveShader.h"
+#include "StrokeShader/BPy_CalligraphicShader.h"
+#include "StrokeShader/BPy_ColorNoiseShader.h"
+#include "StrokeShader/BPy_ColorVariationPatternShader.h"
+#include "StrokeShader/BPy_ConstantColorShader.h"
+#include "StrokeShader/BPy_ConstantThicknessShader.h"
+#include "StrokeShader/BPy_ConstrainedIncreasingThicknessShader.h"
+#include "StrokeShader/BPy_fstreamShader.h"
+#include "StrokeShader/BPy_GuidingLinesShader.h"
+#include "StrokeShader/BPy_IncreasingColorShader.h"
+#include "StrokeShader/BPy_IncreasingThicknessShader.h"
+#include "StrokeShader/BPy_PolygonalizationShader.h"
+#include "StrokeShader/BPy_SamplingShader.h"
+#include "StrokeShader/BPy_SpatialNoiseShader.h"
+#include "StrokeShader/BPy_streamShader.h"
+#include "StrokeShader/BPy_StrokeTextureShader.h"
+#include "StrokeShader/BPy_TextureAssignerShader.h"
+#include "StrokeShader/BPy_ThicknessNoiseShader.h"
+#include "StrokeShader/BPy_ThicknessVariationPatternShader.h"
+#include "StrokeShader/BPy_TipRemoverShader.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -117,9 +139,114 @@ PyMODINIT_FUNC StrokeShader_Init( PyObject *module )
 
 	if( PyType_Ready( &StrokeShader_Type ) < 0 )
 		return;
-
 	Py_INCREF( &StrokeShader_Type );
 	PyModule_AddObject(module, "StrokeShader", (PyObject *)&StrokeShader_Type);
+
+	if( PyType_Ready( &BackboneStretcherShader_Type ) < 0 )
+		return;
+	Py_INCREF( &BackboneStretcherShader_Type );
+	PyModule_AddObject(module, "BackboneStretcherShader", (PyObject *)&BackboneStretcherShader_Type);
+
+	if( PyType_Ready( &BezierCurveShader_Type ) < 0 )
+		return;
+	Py_INCREF( &BezierCurveShader_Type );
+	PyModule_AddObject(module, "BezierCurveShader", (PyObject *)&BezierCurveShader_Type);
+
+	if( PyType_Ready( &CalligraphicShader_Type ) < 0 )
+		return;
+	Py_INCREF( &CalligraphicShader_Type );
+	PyModule_AddObject(module, "CalligraphicShader", (PyObject *)&CalligraphicShader_Type);
+
+	if( PyType_Ready( &ColorNoiseShader_Type ) < 0 )
+		return;
+	Py_INCREF( &ColorNoiseShader_Type );
+	PyModule_AddObject(module, "ColorNoiseShader", (PyObject *)&ColorNoiseShader_Type);
+
+	if( PyType_Ready( &ColorVariationPatternShader_Type ) < 0 )
+		return;
+	Py_INCREF( &ColorVariationPatternShader_Type );
+	PyModule_AddObject(module, "ColorVariationPatternShader", (PyObject *)&ColorVariationPatternShader_Type);
+
+	if( PyType_Ready( &ConstantColorShader_Type ) < 0 )
+		return;
+	Py_INCREF( &ConstantColorShader_Type );
+	PyModule_AddObject(module, "ConstantColorShader", (PyObject *)&ConstantColorShader_Type);
+
+	if( PyType_Ready( &ConstantThicknessShader_Type ) < 0 )
+		return;
+	Py_INCREF( &ConstantThicknessShader_Type );
+	PyModule_AddObject(module, "ConstantThicknessShader", (PyObject *)&ConstantThicknessShader_Type);
+
+	if( PyType_Ready( &ConstrainedIncreasingThicknessShader_Type ) < 0 )
+		return;
+	Py_INCREF( &ConstrainedIncreasingThicknessShader_Type );
+	PyModule_AddObject(module, "ConstrainedIncreasingThicknessShader", (PyObject *)&ConstrainedIncreasingThicknessShader_Type);
+
+	if( PyType_Ready( &fstreamShader_Type ) < 0 )
+		return;
+	Py_INCREF( &fstreamShader_Type );
+	PyModule_AddObject(module, "fstreamShader", (PyObject *)&fstreamShader_Type);
+
+	if( PyType_Ready( &GuidingLinesShader_Type ) < 0 )
+		return;
+	Py_INCREF( &GuidingLinesShader_Type );
+	PyModule_AddObject(module, "GuidingLinesShader", (PyObject *)&GuidingLinesShader_Type);
+
+	if( PyType_Ready( &IncreasingColorShader_Type ) < 0 )
+		return;
+	Py_INCREF( &IncreasingColorShader_Type );
+	PyModule_AddObject(module, "IncreasingColorShader", (PyObject *)&IncreasingColorShader_Type);
+
+	if( PyType_Ready( &IncreasingThicknessShader_Type ) < 0 )
+		return;
+	Py_INCREF( &IncreasingThicknessShader_Type );
+	PyModule_AddObject(module, "IncreasingThicknessShader", (PyObject *)&IncreasingThicknessShader_Type);
+
+	if( PyType_Ready( &PolygonalizationShader_Type ) < 0 )
+		return;
+	Py_INCREF( &PolygonalizationShader_Type );
+	PyModule_AddObject(module, "PolygonalizationShader", (PyObject *)&PolygonalizationShader_Type);
+
+	if( PyType_Ready( &SamplingShader_Type ) < 0 )
+		return;
+	Py_INCREF( &SamplingShader_Type );
+	PyModule_AddObject(module, "SamplingShader", (PyObject *)&SamplingShader_Type);
+
+	if( PyType_Ready( &SpatialNoiseShader_Type ) < 0 )
+		return;
+	Py_INCREF( &SpatialNoiseShader_Type );
+	PyModule_AddObject(module, "SpatialNoiseShader", (PyObject *)&SpatialNoiseShader_Type);
+
+	if( PyType_Ready( &streamShader_Type ) < 0 )
+		return;
+	Py_INCREF( &streamShader_Type );
+	PyModule_AddObject(module, "streamShader", (PyObject *)&streamShader_Type);
+
+	if( PyType_Ready( &StrokeTextureShader_Type ) < 0 )
+		return;
+	Py_INCREF( &StrokeTextureShader_Type );
+	PyModule_AddObject(module, "StrokeTextureShader", (PyObject *)&StrokeTextureShader_Type);
+
+	if( PyType_Ready( &TextureAssignerShader_Type ) < 0 )
+		return;
+	Py_INCREF( &TextureAssignerShader_Type );
+	PyModule_AddObject(module, "TextureAssignerShader", (PyObject *)&TextureAssignerShader_Type);
+
+	if( PyType_Ready( &ThicknessNoiseShader_Type ) < 0 )
+		return;
+	Py_INCREF( &ThicknessNoiseShader_Type );
+	PyModule_AddObject(module, "ThicknessNoiseShader", (PyObject *)&ThicknessNoiseShader_Type);
+
+	if( PyType_Ready( &ThicknessVariationPatternShader_Type ) < 0 )
+		return;
+	Py_INCREF( &ThicknessVariationPatternShader_Type );
+	PyModule_AddObject(module, "ThicknessVariationPatternShader", (PyObject *)&ThicknessVariationPatternShader_Type);
+
+	if( PyType_Ready( &TipRemoverShader_Type ) < 0 )
+		return;
+	Py_INCREF( &TipRemoverShader_Type );
+	PyModule_AddObject(module, "TipRemoverShader", (PyObject *)&TipRemoverShader_Type);
+	
 }
 
 //------------------------INSTANCE METHODS ----------------------------------
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.cpp
index 96fd31e982e..6b5fe67f345 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.cpp
@@ -1,8 +1,119 @@
- PyObject *_wrap_BackboneStretcherShader_shade(PyObject *self , PyObject *args) {
+#include "BPy_BackboneStretcherShader.h"
+
+#include "../../stroke/BasicStrokeShaders.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for BackboneStretcherShader instance  -----------*/
+	static int BackboneStretcherShader___init__( BPy_BackboneStretcherShader* self, PyObject *args);
+
+/*-----------------------BPy_BackboneStretcherShader type definition ------------------------------*/
+
+PyTypeObject BackboneStretcherShader_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"BackboneStretcherShader",				/* tp_name */
+	sizeof( BPy_BackboneStretcherShader ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&StrokeShader_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)BackboneStretcherShader___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int BackboneStretcherShader___init__( BPy_BackboneStretcherShader* self, PyObject *args)
+{
+	float f = 2.0;
+
+	if(!( PyArg_ParseTuple(args, "|f", &f) )) {
+		cout << "ERROR: BackboneStretcherShader___init__" << endl;		
+		return -1;
+	}
+
+	self->py_ss.ss = new StrokeShaders::BackboneStretcherShader(f);
+	return 0;
+
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_delete_BackboneStretcherShader(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.h
new file mode 100644
index 00000000000..161bdb5db40
--- /dev/null
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.h
@@ -0,0 +1,31 @@
+#ifndef FREESTYLE_PYTHON_BACKBONESTRETCHERSHADER_H
+#define FREESTYLE_PYTHON_BACKBONESTRETCHERSHADER_H
+
+#include "../BPy_StrokeShader.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject BackboneStretcherShader_Type;
+
+#define BPy_BackboneStretcherShader_Check(v)	(( (PyObject *) v)->ob_type == &BackboneStretcherShader_Type)
+
+/*---------------------------Python BPy_BackboneStretcherShader structure definition----------*/
+typedef struct {
+	BPy_StrokeShader py_ss;
+} BPy_BackboneStretcherShader;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* FREESTYLE_PYTHON_BACKBONESTRETCHERSHADER_H */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.cpp
index a4d476bb2d6..3ddda4256be 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.cpp
@@ -1,8 +1,118 @@
- PyObject *_wrap_BezierCurveShader_shade(PyObject *self , PyObject *args) {
+#include "BPy_BezierCurveShader.h"
+
+#include "../../stroke/BasicStrokeShaders.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for BezierCurveShader instance  -----------*/
+	static int BezierCurveShader___init__( BPy_BezierCurveShader* self, PyObject *args);
+
+/*-----------------------BPy_BezierCurveShader type definition ------------------------------*/
+
+PyTypeObject BezierCurveShader_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"BezierCurveShader",				/* tp_name */
+	sizeof( BPy_BezierCurveShader ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&StrokeShader_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)BezierCurveShader___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int BezierCurveShader___init__( BPy_BezierCurveShader* self, PyObject *args)
+{
+	float f = 4.0;
+
+	if(!( PyArg_ParseTuple(args, "|f", &f) )) {
+		cout << "ERROR: BezierCurveShader___init__" << endl;		
+		return -1;
+	}
+
+	self->py_ss.ss = new StrokeShaders::BezierCurveShader(f);
+	return 0;
+
 }
+///////////////////////////////////////////////////////////////////////////////////////////
 
-
- PyObject *_wrap_delete_BezierCurveShader(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.h
new file mode 100644
index 00000000000..56443ca26ad
--- /dev/null
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.h
@@ -0,0 +1,31 @@
+#ifndef FREESTYLE_PYTHON_BEZIERCURVESHADER_H
+#define FREESTYLE_PYTHON_BEZIERCURVESHADER_H
+
+#include "../BPy_StrokeShader.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject BezierCurveShader_Type;
+
+#define BPy_BezierCurveShader_Check(v)	(( (PyObject *) v)->ob_type == &BezierCurveShader_Type)
+
+/*---------------------------Python BPy_BezierCurveShader structure definition----------*/
+typedef struct {
+	BPy_StrokeShader py_ss;
+} BPy_BezierCurveShader;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* FREESTYLE_PYTHON_BEZIERCURVESHADER_H */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.cpp
index 2f7a422d311..d20fbeab1ec 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.cpp
@@ -1,4 +1,124 @@
- PyObject *_wrap_CalligraphicShader_shade(PyObject *self , PyObject *args) {
+#include "BPy_CalligraphicShader.h"
+
+#include "../../stroke/AdvancedStrokeShaders.h"
+#include "../BPy_Convert.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for CalligraphicShader instance  -----------*/
+	static int CalligraphicShader___init__( BPy_CalligraphicShader* self, PyObject *args);
+
+/*-----------------------BPy_CalligraphicShader type definition ------------------------------*/
+
+PyTypeObject CalligraphicShader_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"CalligraphicShader",				/* tp_name */
+	sizeof( BPy_CalligraphicShader ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&StrokeShader_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)CalligraphicShader___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int CalligraphicShader___init__( BPy_CalligraphicShader* self, PyObject *args)
+{
+	double d1, d2;
+	PyObject *obj3 = 0, *obj4 = 0;
+	
+
+	if(!( PyArg_ParseTuple(args, "ddOO", &d1, &d2, &obj3, &obj4) 
+		&& PyList_Check(obj3) && PyList_Size(obj3) > 1 && PyBool_Check(obj4) )) {
+		cout << "ERROR: CalligraphicShader___init__" << endl;		
+		return -1;
+	}
+
+	Vec2f v( PyFloat_AsDouble(PyList_GetItem(obj3,0)), PyFloat_AsDouble(PyList_GetItem(obj3,1)) );
+	self->py_ss.ss = new CalligraphicShader(d1, d2, v, bool_from_PyBool(obj4) );
+	return 0;
+
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.h
new file mode 100644
index 00000000000..d3a4782c794
--- /dev/null
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.h
@@ -0,0 +1,31 @@
+#ifndef FREESTYLE_PYTHON_CALLIGRAPHICSHADER_H
+#define FREESTYLE_PYTHON_CALLIGRAPHICSHADER_H
+
+#include "../BPy_StrokeShader.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject CalligraphicShader_Type;
+
+#define BPy_CalligraphicShader_Check(v)	(( (PyObject *) v)->ob_type == &CalligraphicShader_Type)
+
+/*---------------------------Python BPy_CalligraphicShader structure definition----------*/
+typedef struct {
+	BPy_StrokeShader py_ss;
+} BPy_CalligraphicShader;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* FREESTYLE_PYTHON_CALLIGRAPHICSHADER_H */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.cpp
index 1b52e33fd8f..df0389a5226 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.cpp
@@ -1,8 +1,119 @@
- PyObject *_wrap_ColorNoiseShader_shade(PyObject *self , PyObject *args) {
+#include "BPy_ColorNoiseShader.h"
+
+#include "../../stroke/BasicStrokeShaders.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for ColorNoiseShader instance  -----------*/
+	static int ColorNoiseShader___init__( BPy_ColorNoiseShader* self, PyObject *args);
+
+/*-----------------------BPy_ColorNoiseShader type definition ------------------------------*/
+
+PyTypeObject ColorNoiseShader_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"ColorNoiseShader",				/* tp_name */
+	sizeof( BPy_ColorNoiseShader ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&StrokeShader_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)ColorNoiseShader___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int ColorNoiseShader___init__( BPy_ColorNoiseShader* self, PyObject *args)
+{
+	float f1, f2;
+
+	if(!( PyArg_ParseTuple(args, "ff", &f1, &f2) )) {
+		cout << "ERROR: ColorNoiseShader___init__" << endl;		
+		return -1;
+	}
+
+	self->py_ss.ss = new StrokeShaders::ColorNoiseShader(f1, f2);
+	return 0;
+
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_delete_ColorNoiseShader(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.h
new file mode 100644
index 00000000000..e4ad2c0e1af
--- /dev/null
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.h
@@ -0,0 +1,31 @@
+#ifndef FREESTYLE_PYTHON_COLORNOISESHADER_H
+#define FREESTYLE_PYTHON_COLORNOISESHADER_H
+
+#include "../BPy_StrokeShader.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject ColorNoiseShader_Type;
+
+#define BPy_ColorNoiseShader_Check(v)	(( (PyObject *) v)->ob_type == &ColorNoiseShader_Type)
+
+/*---------------------------Python BPy_ColorNoiseShader structure definition----------*/
+typedef struct {
+	BPy_StrokeShader py_ss;
+} BPy_ColorNoiseShader;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* FREESTYLE_PYTHON_COLORNOISESHADER_H */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.cpp
index 7529c869939..380c760d0c0 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.cpp
@@ -1,4 +1,123 @@
- PyObject *_wrap_ColorVariationPatternShader_shade(PyObject *self , PyObject *args) {
+#include "BPy_ColorVariationPatternShader.h"
+
+#include "../../stroke/BasicStrokeShaders.h"
+#include "../BPy_Convert.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for ColorVariationPatternShader instance  -----------*/
+	static int ColorVariationPatternShader___init__( BPy_ColorVariationPatternShader* self, PyObject *args);
+
+/*-----------------------BPy_ColorVariationPatternShader type definition ------------------------------*/
+
+PyTypeObject ColorVariationPatternShader_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"ColorVariationPatternShader",				/* tp_name */
+	sizeof( BPy_ColorVariationPatternShader ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&StrokeShader_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)ColorVariationPatternShader___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int ColorVariationPatternShader___init__( BPy_ColorVariationPatternShader* self, PyObject *args)
+{
+	const char *s;
+	PyObject *obj = 0;
+	
+
+	if(!( PyArg_ParseTuple(args, "s|O", &s, &obj) )) {
+		cout << "ERROR: ColorVariationPatternShader___init__" << endl;		
+		return -1;
+	}
+
+	bool b = (obj && PyBool_Check(obj)) ? bool_from_PyBool(obj) : true;
+	self->py_ss.ss = new StrokeShaders::ColorVariationPatternShader(s,b);
+	return 0;
+
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.h
new file mode 100644
index 00000000000..12f7bbca151
--- /dev/null
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.h
@@ -0,0 +1,31 @@
+#ifndef FREESTYLE_PYTHON_COLORVARIATIONPATTERNSHADER_H
+#define FREESTYLE_PYTHON_COLORVARIATIONPATTERNSHADER_H
+
+#include "../BPy_StrokeShader.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject ColorVariationPatternShader_Type;
+
+#define BPy_ColorVariationPatternShader_Check(v)	(( (PyObject *) v)->ob_type == &ColorVariationPatternShader_Type)
+
+/*---------------------------Python BPy_ColorVariationPatternShader structure definition----------*/
+typedef struct {
+	BPy_StrokeShader py_ss;
+} BPy_ColorVariationPatternShader;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* FREESTYLE_PYTHON_COLORVARIATIONPATTERNSHADER_H */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.cpp
index e636331c57c..a9430fa8000 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.cpp
@@ -1,12 +1,120 @@
- PyObject *_wrap_ConstantColorShader_getName(PyObject *self , PyObject *args) {
+#include "BPy_ConstantColorShader.h"
+
+#include "../../stroke/BasicStrokeShaders.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for ConstantColorShader instance  -----------*/
+	static int ConstantColorShader___init__( BPy_ConstantColorShader* self, PyObject *args);
+
+/*-----------------------BPy_ConstantColorShader type definition ------------------------------*/
+
+PyTypeObject ConstantColorShader_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"ConstantColorShader",				/* tp_name */
+	sizeof( BPy_ConstantColorShader ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&StrokeShader_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)ConstantColorShader___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int ConstantColorShader___init__( BPy_ConstantColorShader* self, PyObject *args)
+{
+	float f1, f2, f3, f4 = 1.0;
+	
+
+	if(!( PyArg_ParseTuple(args, "fff|f", &f1, &f2, &f3, &f4) )) {
+		cout << "ERROR: ConstantColorShader___init__" << endl;		
+		return -1;
+	}
+
+	self->py_ss.ss = new StrokeShaders::ConstantColorShader(f1, f2, f3, f4);
+	return 0;
+
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_ConstantColorShader_shade(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_delete_ConstantColorShader(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.h
new file mode 100644
index 00000000000..0f3ae177d15
--- /dev/null
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.h
@@ -0,0 +1,31 @@
+#ifndef FREESTYLE_PYTHON_CONSTANTCOLORSHADER_H
+#define FREESTYLE_PYTHON_CONSTANTCOLORSHADER_H
+
+#include "../BPy_StrokeShader.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject ConstantColorShader_Type;
+
+#define BPy_ConstantColorShader_Check(v)	(( (PyObject *) v)->ob_type == &ConstantColorShader_Type)
+
+/*---------------------------Python BPy_ConstantColorShader structure definition----------*/
+typedef struct {
+	BPy_StrokeShader py_ss;
+} BPy_ConstantColorShader;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* FREESTYLE_PYTHON_CONSTANTCOLORSHADER_H */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.cpp
index 1840ef71f6d..a3440295767 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.cpp
@@ -1,8 +1,119 @@
- PyObject *_wrap_ConstantThicknessShader_getName(PyObject *self , PyObject *args) {
+#include "BPy_ConstantThicknessShader.h"
+
+#include "../../stroke/BasicStrokeShaders.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for ConstantThicknessShader instance  -----------*/
+	static int ConstantThicknessShader___init__( BPy_ConstantThicknessShader* self, PyObject *args);
+
+/*-----------------------BPy_ConstantThicknessShader type definition ------------------------------*/
+
+PyTypeObject ConstantThicknessShader_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"ConstantThicknessShader",				/* tp_name */
+	sizeof( BPy_ConstantThicknessShader ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&StrokeShader_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)ConstantThicknessShader___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int ConstantThicknessShader___init__( BPy_ConstantThicknessShader* self, PyObject *args)
+{
+	float f;
+
+	if(!( PyArg_ParseTuple(args, "|f", &f)  )) {
+		cout << "ERROR: ConstantThicknessShader___init__" << endl;		
+		return -1;
+	}
+
+	self->py_ss.ss = new StrokeShaders::ConstantThicknessShader(f);
+	return 0;
+
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_ConstantThicknessShader_shade(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.h
new file mode 100644
index 00000000000..d8cb7239fd9
--- /dev/null
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.h
@@ -0,0 +1,31 @@
+#ifndef FREESTYLE_PYTHON_CONSTANTTHICKNESSSHADER_H
+#define FREESTYLE_PYTHON_CONSTANTTHICKNESSSHADER_H
+
+#include "../BPy_StrokeShader.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject ConstantThicknessShader_Type;
+
+#define BPy_ConstantThicknessShader_Check(v)	(( (PyObject *) v)->ob_type == &ConstantThicknessShader_Type)
+
+/*---------------------------Python BPy_ConstantThicknessShader structure definition----------*/
+typedef struct {
+	BPy_StrokeShader py_ss;
+} BPy_ConstantThicknessShader;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* FREESTYLE_PYTHON_CONSTANTTHICKNESSSHADER_H */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.cpp
index 41eb1c94d17..aed3911648d 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.cpp
@@ -1,4 +1,120 @@
- PyObject *_wrap_ConstrainedIncreasingThicknessShader_shade(PyObject *self , PyObject *args) {
+#include "BPy_ConstrainedIncreasingThicknessShader.h"
+
+#include "../../stroke/BasicStrokeShaders.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for ConstrainedIncreasingThicknessShader instance  -----------*/
+	static int ConstrainedIncreasingThicknessShader___init__( BPy_ConstrainedIncreasingThicknessShader* self, PyObject *args);
+
+/*-----------------------BPy_ConstrainedIncreasingThicknessShader type definition ------------------------------*/
+
+PyTypeObject ConstrainedIncreasingThicknessShader_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"ConstrainedIncreasingThicknessShader",				/* tp_name */
+	sizeof( BPy_ConstrainedIncreasingThicknessShader ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&StrokeShader_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)ConstrainedIncreasingThicknessShader___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int ConstrainedIncreasingThicknessShader___init__( BPy_ConstrainedIncreasingThicknessShader* self, PyObject *args)
+{
+	float f1, f2, f3;
+	
+
+	if(!( PyArg_ParseTuple(args, "fff", &f1, &f2, &f3) )) {
+		cout << "ERROR: ConstrainedIncreasingThicknessShader___init__" << endl;		
+		return -1;
+	}
+
+	self->py_ss.ss = new StrokeShaders::ConstrainedIncreasingThicknessShader(f1, f2, f3);
+	return 0;
+
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.h
new file mode 100644
index 00000000000..f712706d2ee
--- /dev/null
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.h
@@ -0,0 +1,31 @@
+#ifndef FREESTYLE_PYTHON_CONSTRAINEDINCREASINGTHICKNESSSHADER_H
+#define FREESTYLE_PYTHON_CONSTRAINEDINCREASINGTHICKNESSSHADER_H
+
+#include "../BPy_StrokeShader.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject ConstrainedIncreasingThicknessShader_Type;
+
+#define BPy_ConstrainedIncreasingThicknessShader_Check(v)	(( (PyObject *) v)->ob_type == &ConstrainedIncreasingThicknessShader_Type)
+
+/*---------------------------Python BPy_ConstrainedIncreasingThicknessShader structure definition----------*/
+typedef struct {
+	BPy_StrokeShader py_ss;
+} BPy_ConstrainedIncreasingThicknessShader;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* FREESTYLE_PYTHON_CONSTRAINEDINCREASINGTHICKNESSSHADER_H */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.cpp
index 633523af330..585c03e988a 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.cpp
@@ -1,8 +1,120 @@
- PyObject *_wrap_GuidingLinesShader_shade(PyObject *self , PyObject *args) {
+#include "BPy_GuidingLinesShader.h"
+
+#include "../../stroke/BasicStrokeShaders.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for GuidingLinesShader instance  -----------*/
+	static int GuidingLinesShader___init__( BPy_GuidingLinesShader* self, PyObject *args);
+
+/*-----------------------BPy_GuidingLinesShader type definition ------------------------------*/
+
+PyTypeObject GuidingLinesShader_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"GuidingLinesShader",				/* tp_name */
+	sizeof( BPy_GuidingLinesShader ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&StrokeShader_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)GuidingLinesShader___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int GuidingLinesShader___init__( BPy_GuidingLinesShader* self, PyObject *args)
+{
+	float f;
+
+	if(!( PyArg_ParseTuple(args, "f", &f) )) {
+		cout << "ERROR: GuidingLinesShader___init__" << endl;		
+		return -1;
+	}
+
+	self->py_ss.ss = new StrokeShaders::GuidingLinesShader(f);
+	return 0;
+
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_delete_GuidingLinesShader(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
+#endif
+	
\ No newline at end of file
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.h
new file mode 100644
index 00000000000..2cf032e24ae
--- /dev/null
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.h
@@ -0,0 +1,31 @@
+#ifndef FREESTYLE_PYTHON_GUIDINGLINESSHADER_H
+#define FREESTYLE_PYTHON_GUIDINGLINESSHADER_H
+
+#include "../BPy_StrokeShader.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject GuidingLinesShader_Type;
+
+#define BPy_GuidingLinesShader_Check(v)	(( (PyObject *) v)->ob_type == &GuidingLinesShader_Type)
+
+/*---------------------------Python BPy_GuidingLinesShader structure definition----------*/
+typedef struct {
+	BPy_StrokeShader py_ss;
+} BPy_GuidingLinesShader;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* FREESTYLE_PYTHON_GUIDINGLINESSHADER_H */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.cpp
index 2fbb74f3768..b6cb615368e 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.cpp
@@ -1,8 +1,119 @@
- PyObject *_wrap_IncreasingColorShader_shade(PyObject *self , PyObject *args) {
+#include "BPy_IncreasingColorShader.h"
+
+#include "../../stroke/BasicStrokeShaders.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for IncreasingColorShader instance  -----------*/
+	static int IncreasingColorShader___init__( BPy_IncreasingColorShader* self, PyObject *args);
+
+/*-----------------------BPy_IncreasingColorShader type definition ------------------------------*/
+
+PyTypeObject IncreasingColorShader_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"IncreasingColorShader",				/* tp_name */
+	sizeof( BPy_IncreasingColorShader ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&StrokeShader_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)IncreasingColorShader___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int IncreasingColorShader___init__( BPy_IncreasingColorShader* self, PyObject *args)
+{
+	float f1, f2, f3, f4, f5, f6, f7, f8;
+
+	if(!( PyArg_ParseTuple(args, "ffffffff", &f1, &f2, &f3, &f4, &f5, &f6, &f7, &f8) )) {
+		cout << "ERROR: IncreasingColorShader___init__" << endl;		
+		return -1;
+	}
+
+	self->py_ss.ss = new StrokeShaders::IncreasingColorShader(f1, f2, f3, f4, f5, f6, f7, f8);
+	return 0;
+
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_delete_IncreasingColorShader(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.h
new file mode 100644
index 00000000000..4ef7f3f239d
--- /dev/null
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.h
@@ -0,0 +1,31 @@
+#ifndef FREESTYLE_PYTHON_INCREASINGCOLORSHADER_H
+#define FREESTYLE_PYTHON_INCREASINGCOLORSHADER_H
+
+#include "../BPy_StrokeShader.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject IncreasingColorShader_Type;
+
+#define BPy_IncreasingColorShader_Check(v)	(( (PyObject *) v)->ob_type == &IncreasingColorShader_Type)
+
+/*---------------------------Python BPy_IncreasingColorShader structure definition----------*/
+typedef struct {
+	BPy_StrokeShader py_ss;
+} BPy_IncreasingColorShader;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* FREESTYLE_PYTHON_INCREASINGCOLORSHADER_H */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.cpp
index 4d97f43841d..0dc3fedde11 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.cpp
@@ -1,4 +1,119 @@
- PyObject *_wrap_IncreasingThicknessShader_shade(PyObject *self , PyObject *args) {
+#include "BPy_IncreasingThicknessShader.h"
+
+#include "../../stroke/BasicStrokeShaders.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for IncreasingThicknessShader instance  -----------*/
+	static int IncreasingThicknessShader___init__( BPy_IncreasingThicknessShader* self, PyObject *args);
+
+/*-----------------------BPy_IncreasingThicknessShader type definition ------------------------------*/
+
+PyTypeObject IncreasingThicknessShader_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"IncreasingThicknessShader",				/* tp_name */
+	sizeof( BPy_IncreasingThicknessShader ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&StrokeShader_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)IncreasingThicknessShader___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int IncreasingThicknessShader___init__( BPy_IncreasingThicknessShader* self, PyObject *args)
+{
+	float f1, f2;
+
+	if(!( PyArg_ParseTuple(args, "ff", &f1, &f2) )) {
+		cout << "ERROR: IncreasingThicknessShader___init__" << endl;		
+		return -1;
+	}
+
+	self->py_ss.ss = new StrokeShaders::IncreasingThicknessShader(f1, f2);
+	return 0;
+
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.h
new file mode 100644
index 00000000000..ae4f37835cc
--- /dev/null
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.h
@@ -0,0 +1,31 @@
+#ifndef FREESTYLE_PYTHON_INCREASINGTHICKNESSSHADER_H
+#define FREESTYLE_PYTHON_INCREASINGTHICKNESSSHADER_H
+
+#include "../BPy_StrokeShader.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject IncreasingThicknessShader_Type;
+
+#define BPy_IncreasingThicknessShader_Check(v)	(( (PyObject *) v)->ob_type == &IncreasingThicknessShader_Type)
+
+/*---------------------------Python BPy_IncreasingThicknessShader structure definition----------*/
+typedef struct {
+	BPy_StrokeShader py_ss;
+} BPy_IncreasingThicknessShader;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* FREESTYLE_PYTHON_INCREASINGTHICKNESSSHADER_H */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.cpp
index 098330d37bd..5f4ff5f8d04 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.cpp
@@ -1,8 +1,119 @@
- PyObject *_wrap_PolygonalizationShader_shade(PyObject *self , PyObject *args) {
+#include "BPy_PolygonalizationShader.h"
+
+#include "../../stroke/BasicStrokeShaders.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for PolygonalizationShader instance  -----------*/
+	static int PolygonalizationShader___init__( BPy_PolygonalizationShader* self, PyObject *args);
+
+/*-----------------------BPy_PolygonalizationShader type definition ------------------------------*/
+
+PyTypeObject PolygonalizationShader_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"PolygonalizationShader",				/* tp_name */
+	sizeof( BPy_PolygonalizationShader ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&StrokeShader_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)PolygonalizationShader___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int PolygonalizationShader___init__( BPy_PolygonalizationShader* self, PyObject *args)
+{
+	float f;
+
+	if(!( PyArg_ParseTuple(args, "f", &f) )) {
+		cout << "ERROR: PolygonalizationShader___init__" << endl;		
+		return -1;
+	}
+
+	self->py_ss.ss = new StrokeShaders::PolygonalizationShader(f);
+	return 0;
+
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_delete_PolygonalizationShader(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.h
new file mode 100644
index 00000000000..7cc2e94e2cc
--- /dev/null
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.h
@@ -0,0 +1,31 @@
+#ifndef FREESTYLE_PYTHON_POLYGONALIZATIONSHADER_H
+#define FREESTYLE_PYTHON_POLYGONALIZATIONSHADER_H
+
+#include "../BPy_StrokeShader.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject PolygonalizationShader_Type;
+
+#define BPy_PolygonalizationShader_Check(v)	(( (PyObject *) v)->ob_type == &PolygonalizationShader_Type)
+
+/*---------------------------Python BPy_PolygonalizationShader structure definition----------*/
+typedef struct {
+	BPy_StrokeShader py_ss;
+} BPy_PolygonalizationShader;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* FREESTYLE_PYTHON_POLYGONALIZATIONSHADER_H */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.cpp
index 3a42bda3b08..a87de11f095 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.cpp
@@ -1,8 +1,119 @@
- PyObject *_wrap_SamplingShader_shade(PyObject *self , PyObject *args) {
+#include "BPy_SamplingShader.h"
+
+#include "../../stroke/BasicStrokeShaders.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for SamplingShader instance  -----------*/
+	static int SamplingShader___init__( BPy_SamplingShader* self, PyObject *args);
+
+/*-----------------------BPy_SamplingShader type definition ------------------------------*/
+
+PyTypeObject SamplingShader_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"SamplingShader",				/* tp_name */
+	sizeof( BPy_SamplingShader ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&StrokeShader_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)SamplingShader___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int SamplingShader___init__( BPy_SamplingShader* self, PyObject *args)
+{
+	float f;
+
+	if(!( PyArg_ParseTuple(args, "f", &f) )) {
+		cout << "ERROR: SamplingShader___init__" << endl;		
+		return -1;
+	}
+
+	self->py_ss.ss = new StrokeShaders::SamplingShader(f);
+	return 0;
+
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_delete_SamplingShader(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.h
new file mode 100644
index 00000000000..763bee23168
--- /dev/null
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.h
@@ -0,0 +1,31 @@
+#ifndef FREESTYLE_PYTHON_SAMPLINGSHADER_H
+#define FREESTYLE_PYTHON_SAMPLINGSHADER_H
+
+#include "../BPy_StrokeShader.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject SamplingShader_Type;
+
+#define BPy_SamplingShader_Check(v)	(( (PyObject *) v)->ob_type == &SamplingShader_Type)
+
+/*---------------------------Python BPy_SamplingShader structure definition----------*/
+typedef struct {
+	BPy_StrokeShader py_ss;
+} BPy_SamplingShader;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* FREESTYLE_PYTHON_SAMPLINGSHADER_H */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.cpp
index ff90e7f973c..272884e1645 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.cpp
@@ -1,4 +1,124 @@
- PyObject *_wrap_SpatialNoiseShader_shade(PyObject *self , PyObject *args) {
+#include "BPy_SpatialNoiseShader.h"
+
+#include "../../stroke/AdvancedStrokeShaders.h"
+#include "../BPy_Convert.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for SpatialNoiseShader instance  -----------*/
+	static int SpatialNoiseShader___init__( BPy_SpatialNoiseShader* self, PyObject *args);
+
+/*-----------------------BPy_SpatialNoiseShader type definition ------------------------------*/
+
+PyTypeObject SpatialNoiseShader_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"SpatialNoiseShader",				/* tp_name */
+	sizeof( BPy_SpatialNoiseShader ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&StrokeShader_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)SpatialNoiseShader___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int SpatialNoiseShader___init__( BPy_SpatialNoiseShader* self, PyObject *args)
+{
+	float f1, f2;
+	int i3;
+	PyObject *obj4 = 0, *obj5 = 0;
+	
+
+	if(!( PyArg_ParseTuple(args, "ffiOO", &f1, &f2, &i3, &obj4, &obj5)
+		&& PyList_Check(obj4) && PyBool_Check(obj5) )) {
+		cout << "ERROR: SpatialNoiseShader___init__" << endl;		
+		return -1;
+	}
+
+	self->py_ss.ss = new SpatialNoiseShader(f1, f2, i3, bool_from_PyBool(obj4), bool_from_PyBool(obj5) );
+	return 0;
+
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.h
new file mode 100644
index 00000000000..ac232502881
--- /dev/null
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.h
@@ -0,0 +1,31 @@
+#ifndef FREESTYLE_PYTHON_SPATIALNOISESHADER_H
+#define FREESTYLE_PYTHON_SPATIALNOISESHADER_H
+
+#include "../BPy_StrokeShader.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject SpatialNoiseShader_Type;
+
+#define BPy_SpatialNoiseShader_Check(v)	(( (PyObject *) v)->ob_type == &SpatialNoiseShader_Type)
+
+/*---------------------------Python BPy_SpatialNoiseShader structure definition----------*/
+typedef struct {
+	BPy_StrokeShader py_ss;
+} BPy_SpatialNoiseShader;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* FREESTYLE_PYTHON_SPATIALNOISESHADER_H */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.cpp
index 90636eb5aee..4d5a56db24b 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.cpp
@@ -1,8 +1,125 @@
- PyObject *_wrap_StrokeTextureShader_shade(PyObject *self , PyObject *args) {
+#include "BPy_StrokeTextureShader.h"
+
+#include "../../stroke/BasicStrokeShaders.h"
+#include "../BPy_Convert.h"
+#include "../BPy_MediumType.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for StrokeTextureShader instance  -----------*/
+	static int StrokeTextureShader___init__( BPy_StrokeTextureShader* self, PyObject *args);
+
+/*-----------------------BPy_StrokeTextureShader type definition ------------------------------*/
+
+PyTypeObject StrokeTextureShader_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"StrokeTextureShader",				/* tp_name */
+	sizeof( BPy_StrokeTextureShader ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&StrokeShader_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)StrokeTextureShader___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int StrokeTextureShader___init__( BPy_StrokeTextureShader* self, PyObject *args)
+{
+	const char *s1;
+	PyObject *obj2 = 0, *obj3 = 0;
+	
+	if(!( PyArg_ParseTuple(args, "s|00", &s1, &obj2, &obj3) )) {
+		cout << "ERROR: StrokeTextureShader___init__" << endl;		
+		return -1;
+	}
+
+	Stroke::MediumType mt = (obj2 && BPy_MediumType_Check(obj2)) ? MediumType_from_BPy_MediumType(obj2) : Stroke::OPAQUE_MEDIUM; 
+	bool b = (obj3 && PyBool_Check(obj3)) ? bool_from_PyBool(obj3) : true;
+	
+	self->py_ss.ss = new StrokeShaders::StrokeTextureShader(s1,mt,b);
+	return 0;
+
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_delete_StrokeTextureShader(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.h
new file mode 100644
index 00000000000..d60ba3080ab
--- /dev/null
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.h
@@ -0,0 +1,31 @@
+#ifndef FREESTYLE_PYTHON_STROKETEXTURESHADER_H
+#define FREESTYLE_PYTHON_STROKETEXTURESHADER_H
+
+#include "../BPy_StrokeShader.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject StrokeTextureShader_Type;
+
+#define BPy_StrokeTextureShader_Check(v)	(( (PyObject *) v)->ob_type == &StrokeTextureShader_Type)
+
+/*---------------------------Python BPy_StrokeTextureShader structure definition----------*/
+typedef struct {
+	BPy_StrokeShader py_ss;
+} BPy_StrokeTextureShader;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* FREESTYLE_PYTHON_STROKETEXTURESHADER_H */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_TextureAssignerShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_TextureAssignerShader.cpp
index 9a308d60ac3..1d19be78d03 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_TextureAssignerShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_TextureAssignerShader.cpp
@@ -1,8 +1,119 @@
- PyObject *_wrap_TextureAssignerShader_shade(PyObject *self , PyObject *args) {
+#include "BPy_TextureAssignerShader.h"
+
+#include "../../stroke/BasicStrokeShaders.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for TextureAssignerShader instance  -----------*/
+	static int TextureAssignerShader___init__( BPy_TextureAssignerShader* self, PyObject *args);
+
+/*-----------------------BPy_TextureAssignerShader type definition ------------------------------*/
+
+PyTypeObject TextureAssignerShader_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"TextureAssignerShader",				/* tp_name */
+	sizeof( BPy_TextureAssignerShader ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&StrokeShader_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)TextureAssignerShader___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int TextureAssignerShader___init__( BPy_TextureAssignerShader* self, PyObject *args)
+{
+	int i;
+
+	if(!( PyArg_ParseTuple(args, "i", &i) )) {
+		cout << "ERROR: TextureAssignerShader___init__" << endl;		
+		return -1;
+	}
+
+	self->py_ss.ss = new StrokeShaders::TextureAssignerShader(i);
+	return 0;
+
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_delete_TextureAssignerShader(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_TextureAssignerShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_TextureAssignerShader.h
new file mode 100644
index 00000000000..658f3f4ec8d
--- /dev/null
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_TextureAssignerShader.h
@@ -0,0 +1,31 @@
+#ifndef FREESTYLE_PYTHON_TEXTUREASSIGNERSHADER_H
+#define FREESTYLE_PYTHON_TEXTUREASSIGNERSHADER_H
+
+#include "../BPy_StrokeShader.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject TextureAssignerShader_Type;
+
+#define BPy_TextureAssignerShader_Check(v)	(( (PyObject *) v)->ob_type == &TextureAssignerShader_Type)
+
+/*---------------------------Python BPy_TextureAssignerShader structure definition----------*/
+typedef struct {
+	BPy_StrokeShader py_ss;
+} BPy_TextureAssignerShader;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* FREESTYLE_PYTHON_TEXTUREASSIGNERSHADER_H */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.cpp
index 0c69aa5cfc1..57810bb9cac 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.cpp
@@ -1,8 +1,119 @@
- PyObject *_wrap_ThicknessNoiseShader_shade(PyObject *self , PyObject *args) {
+#include "BPy_ThicknessNoiseShader.h"
+
+#include "../../stroke/BasicStrokeShaders.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for ThicknessNoiseShader instance  -----------*/
+	static int ThicknessNoiseShader___init__( BPy_ThicknessNoiseShader* self, PyObject *args);
+
+/*-----------------------BPy_ThicknessNoiseShader type definition ------------------------------*/
+
+PyTypeObject ThicknessNoiseShader_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"ThicknessNoiseShader",				/* tp_name */
+	sizeof( BPy_ThicknessNoiseShader ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&StrokeShader_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)ThicknessNoiseShader___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int ThicknessNoiseShader___init__( BPy_ThicknessNoiseShader* self, PyObject *args)
+{
+	float f1, f2;
+	
+	if(!( PyArg_ParseTuple(args, "ff", &f1, &f2) )) {
+		cout << "ERROR: ThicknessNoiseShader___init__" << endl;		
+		return -1;
+	}
+
+	self->py_ss.ss = new StrokeShaders::ThicknessNoiseShader(f1, f2);
+	return 0;
+
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_delete_ThicknessNoiseShader(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.h
new file mode 100644
index 00000000000..8a0437715f4
--- /dev/null
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.h
@@ -0,0 +1,31 @@
+#ifndef FREESTYLE_PYTHON_THICKNESSNOISESHADER_H
+#define FREESTYLE_PYTHON_THICKNESSNOISESHADER_H
+
+#include "../BPy_StrokeShader.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject ThicknessNoiseShader_Type;
+
+#define BPy_ThicknessNoiseShader_Check(v)	(( (PyObject *) v)->ob_type == &ThicknessNoiseShader_Type)
+
+/*---------------------------Python BPy_ThicknessNoiseShader structure definition----------*/
+typedef struct {
+	BPy_StrokeShader py_ss;
+} BPy_ThicknessNoiseShader;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* FREESTYLE_PYTHON_THICKNESSNOISESHADER_H */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.cpp
index 02326259be8..d7f49b60fa5 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.cpp
@@ -1,4 +1,123 @@
- PyObject *_wrap_ThicknessVariationPatternShader_shade(PyObject *self , PyObject *args) {
+#include "BPy_ThicknessVariationPatternShader.h"
+
+#include "../../stroke/BasicStrokeShaders.h"
+#include "../BPy_Convert.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for ThicknessVariationPatternShader instance  -----------*/
+	static int ThicknessVariationPatternShader___init__( BPy_ThicknessVariationPatternShader* self, PyObject *args);
+
+/*-----------------------BPy_ThicknessVariationPatternShader type definition ------------------------------*/
+
+PyTypeObject ThicknessVariationPatternShader_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"ThicknessVariationPatternShader",				/* tp_name */
+	sizeof( BPy_ThicknessVariationPatternShader ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&StrokeShader_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)ThicknessVariationPatternShader___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int ThicknessVariationPatternShader___init__( BPy_ThicknessVariationPatternShader* self, PyObject *args)
+{
+	const char *s1;
+	float f2 = 1.0, f3 = 5.0;
+	PyObject *obj4 = 0;
+
+	if(!( PyArg_ParseTuple(args, "s|ffO", &s1, &f2, &f3, &obj4) )) {
+		cout << "ERROR: ThicknessVariationPatternShader___init__" << endl;		
+		return -1;
+	}
+
+	bool b = (obj4 && PyBool_Check(obj4)) ? bool_from_PyBool(obj4) : true;
+	self->py_ss.ss = new StrokeShaders::ThicknessVariationPatternShader(s1, f2, f3, b);
+	return 0;
+
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.h
new file mode 100644
index 00000000000..4c850bdb50f
--- /dev/null
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.h
@@ -0,0 +1,31 @@
+#ifndef FREESTYLE_PYTHON_THICKNESSVARIATIONPATTERNSHADER_H
+#define FREESTYLE_PYTHON_THICKNESSVARIATIONPATTERNSHADER_H
+
+#include "../BPy_StrokeShader.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject ThicknessVariationPatternShader_Type;
+
+#define BPy_ThicknessVariationPatternShader_Check(v)	(( (PyObject *) v)->ob_type == &ThicknessVariationPatternShader_Type)
+
+/*---------------------------Python BPy_ThicknessVariationPatternShader structure definition----------*/
+typedef struct {
+	BPy_StrokeShader py_ss;
+} BPy_ThicknessVariationPatternShader;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* FREESTYLE_PYTHON_THICKNESSVARIATIONPATTERNSHADER_H */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.cpp
index 4a202ddd6ee..1151b33789d 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.cpp
@@ -1,4 +1,119 @@
- PyObject *_wrap_TipRemoverShader_shade(PyObject *self , PyObject *args) {
+#include "BPy_TipRemoverShader.h"
+
+#include "../../stroke/BasicStrokeShaders.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for TipRemoverShader instance  -----------*/
+	static int TipRemoverShader___init__( BPy_TipRemoverShader* self, PyObject *args);
+
+/*-----------------------BPy_TipRemoverShader type definition ------------------------------*/
+
+PyTypeObject TipRemoverShader_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"TipRemoverShader",				/* tp_name */
+	sizeof( BPy_TipRemoverShader ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&StrokeShader_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)TipRemoverShader___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int TipRemoverShader___init__( BPy_TipRemoverShader* self, PyObject *args)
+{
+	double d;
+
+	if(!( PyArg_ParseTuple(args, "d", &d) )) {
+		cout << "ERROR: TipRemoverShader___init__" << endl;		
+		return -1;
+	}
+
+	self->py_ss.ss = new StrokeShaders::TipRemoverShader(d);
+	return 0;
+
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.h
new file mode 100644
index 00000000000..1ca4594d8d5
--- /dev/null
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.h
@@ -0,0 +1,31 @@
+#ifndef FREESTYLE_PYTHON_TIPREMOVERSHADER_H
+#define FREESTYLE_PYTHON_TIPREMOVERSHADER_H
+
+#include "../BPy_StrokeShader.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject TipRemoverShader_Type;
+
+#define BPy_TipRemoverShader_Check(v)	(( (PyObject *) v)->ob_type == &TipRemoverShader_Type)
+
+/*---------------------------Python BPy_TipRemoverShader structure definition----------*/
+typedef struct {
+	BPy_StrokeShader py_ss;
+} BPy_TipRemoverShader;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* FREESTYLE_PYTHON_TIPREMOVERSHADER_H */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.cpp
index dc19cde3871..71d3df5c3d8 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.cpp
@@ -1,8 +1,118 @@
- PyObject *_wrap_fstreamShader_getName(PyObject *self , PyObject *args) {
+#include "BPy_fstreamShader.h"
+
+#include "../../stroke/AdvancedStrokeShaders.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for fstreamShader instance  -----------*/
+	static int fstreamShader___init__( BPy_fstreamShader* self, PyObject *args);
+
+/*-----------------------BPy_fstreamShader type definition ------------------------------*/
+
+PyTypeObject fstreamShader_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"fstreamShader",				/* tp_name */
+	sizeof( BPy_fstreamShader ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&StrokeShader_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)fstreamShader___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int fstreamShader___init__( BPy_fstreamShader* self, PyObject *args)
+{
+	const char *s;
+
+	if(!( PyArg_ParseTuple(args, "s", &s)  )) {
+		cout << "ERROR: fstreamShader___init__" << endl;		
+		return -1;
+	}
+	self->py_ss.ss = new StrokeShaders::fstreamShader(s);
+	return 0;
+
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_fstreamShader_shade(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.h
new file mode 100644
index 00000000000..02cf0daff18
--- /dev/null
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.h
@@ -0,0 +1,31 @@
+#ifndef FREESTYLE_PYTHON_FSTREAMSHADER_H
+#define FREESTYLE_PYTHON_FSTREAMSHADER_H
+
+#include "../BPy_StrokeShader.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject fstreamShader_Type;
+
+#define BPy_fstreamShader_Check(v)	(( (PyObject *) v)->ob_type == &fstreamShader_Type)
+
+/*---------------------------Python BPy_fstreamShader structure definition----------*/
+typedef struct {
+	BPy_StrokeShader py_ss;
+} BPy_fstreamShader;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* FREESTYLE_PYTHON_FSTREAMSHADER_H */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_streamShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_streamShader.cpp
index aa3250f858c..f756654aceb 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_streamShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_streamShader.cpp
@@ -1,12 +1,112 @@
- PyObject *_wrap_streamShader_getName(PyObject *self , PyObject *args) {
+#include "BPy_streamShader.h"
+
+#include "../../stroke/BasicStrokeShaders.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for streamShader instance  -----------*/
+	static int streamShader___init__( BPy_streamShader* self);
+
+/*-----------------------BPy_streamShader type definition ------------------------------*/
+
+PyTypeObject streamShader_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"streamShader",				/* tp_name */
+	sizeof( BPy_streamShader ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&StrokeShader_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)streamShader___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int streamShader___init__( BPy_streamShader* self)
+{
+	self->py_ss.ss = new StrokeShaders::streamShader();
+	return 0;
+
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_streamShader_shade(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_new_streamShader(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_streamShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_streamShader.h
new file mode 100644
index 00000000000..ae34cb44798
--- /dev/null
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_streamShader.h
@@ -0,0 +1,31 @@
+#ifndef FREESTYLE_PYTHON_STREAMSHADER_H
+#define FREESTYLE_PYTHON_STREAMSHADER_H
+
+#include "../BPy_StrokeShader.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject streamShader_Type;
+
+#define BPy_streamShader_Check(v)	(( (PyObject *) v)->ob_type == &streamShader_Type)
+
+/*---------------------------Python BPy_streamShader structure definition----------*/
+typedef struct {
+	BPy_StrokeShader py_ss;
+} BPy_streamShader;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* FREESTYLE_PYTHON_STREAMSHADER_H */
diff --git a/source/blender/freestyle/intern/swig/ModuleWrapper.cpp b/source/blender/freestyle/intern/swig/ModuleWrapper.cpp
index 67672d3a2ac..829705350a7 100755
--- a/source/blender/freestyle/intern/swig/ModuleWrapper.cpp
+++ b/source/blender/freestyle/intern/swig/ModuleWrapper.cpp
@@ -47350,7 +47350,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_GetClosestViewEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewMap_getClosestViewEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewMap *arg1 = (ViewMap *) 0 ;
   real arg2 ;
@@ -47366,25 +47366,25 @@ SWIGINTERN PyObject *_wrap_ViewMap_GetClosestViewEdge(PyObject *SWIGUNUSEDPARM(s
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:ViewMap_GetClosestViewEdge",&obj0,&obj1,&obj2)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OOO:ViewMap_getClosestViewEdge",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewMap, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewMap_GetClosestViewEdge" "', argument " "1"" of type '" "ViewMap const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewMap_getClosestViewEdge" "', argument " "1"" of type '" "ViewMap const *""'"); 
   }
   arg1 = reinterpret_cast< ViewMap * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewMap_GetClosestViewEdge" "', argument " "2"" of type '" "real""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewMap_getClosestViewEdge" "', argument " "2"" of type '" "real""'");
   } 
   arg2 = static_cast< real >(val2);
   ecode3 = SWIG_AsVal_double(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewMap_GetClosestViewEdge" "', argument " "3"" of type '" "real""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewMap_getClosestViewEdge" "', argument " "3"" of type '" "real""'");
   } 
   arg3 = static_cast< real >(val3);
   {
     try {
-      result = (ViewEdge *)((ViewMap const *)arg1)->GetClosestViewEdge(arg2,arg3);
+      result = (ViewEdge *)((ViewMap const *)arg1)->getClosestViewEdge(arg2,arg3);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -47400,7 +47400,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_GetClosestFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_ViewMap_getClosestFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   ViewMap *arg1 = (ViewMap *) 0 ;
   real arg2 ;
@@ -47416,25 +47416,25 @@ SWIGINTERN PyObject *_wrap_ViewMap_GetClosestFEdge(PyObject *SWIGUNUSEDPARM(self
   PyObject * obj1 = 0 ;
   PyObject * obj2 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OOO:ViewMap_GetClosestFEdge",&obj0,&obj1,&obj2)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OOO:ViewMap_getClosestFEdge",&obj0,&obj1,&obj2)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_ViewMap, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewMap_GetClosestFEdge" "', argument " "1"" of type '" "ViewMap const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ViewMap_getClosestFEdge" "', argument " "1"" of type '" "ViewMap const *""'"); 
   }
   arg1 = reinterpret_cast< ViewMap * >(argp1);
   ecode2 = SWIG_AsVal_double(obj1, &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewMap_GetClosestFEdge" "', argument " "2"" of type '" "real""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ViewMap_getClosestFEdge" "', argument " "2"" of type '" "real""'");
   } 
   arg2 = static_cast< real >(val2);
   ecode3 = SWIG_AsVal_double(obj2, &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewMap_GetClosestFEdge" "', argument " "3"" of type '" "real""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ViewMap_getClosestFEdge" "', argument " "3"" of type '" "real""'");
   } 
   arg3 = static_cast< real >(val3);
   {
     try {
-      result = (FEdge *)((ViewMap const *)arg1)->GetClosestFEdge(arg2,arg3);
+      result = (FEdge *)((ViewMap const *)arg1)->getClosestFEdge(arg2,arg3);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -49638,7 +49638,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_setFrontVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_TVertex_setFrontSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   TVertex *arg1 = (TVertex *) 0 ;
   SVertex *arg2 = (SVertex *) 0 ;
@@ -49649,20 +49649,20 @@ SWIGINTERN PyObject *_wrap_TVertex_setFrontVertex(PyObject *SWIGUNUSEDPARM(self)
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:TVertex_setFrontVertex",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:TVertex_setFrontSVertex",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_setFrontVertex" "', argument " "1"" of type '" "TVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_setFrontSVertex" "', argument " "1"" of type '" "TVertex *""'"); 
   }
   arg1 = reinterpret_cast< TVertex * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_SVertex, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TVertex_setFrontVertex" "', argument " "2"" of type '" "SVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TVertex_setFrontSVertex" "', argument " "2"" of type '" "SVertex *""'"); 
   }
   arg2 = reinterpret_cast< SVertex * >(argp2);
   {
     try {
-      (arg1)->setFrontVertex(arg2);
+      (arg1)->setFrontSVertex(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -50333,7 +50333,7 @@ fail:
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_GetSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_TVertex_getSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   TVertex *arg1 = (TVertex *) 0 ;
   FEdge *arg2 = (FEdge *) 0 ;
@@ -50345,20 +50345,20 @@ SWIGINTERN PyObject *_wrap_TVertex_GetSVertex(PyObject *SWIGUNUSEDPARM(self), Py
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   
-  if (!PyArg_ParseTuple(args,(char *)"OO:TVertex_GetSVertex",&obj0,&obj1)) SWIG_fail;
+  if (!PyArg_ParseTuple(args,(char *)"OO:TVertex_getSVertex",&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_TVertex, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_GetSVertex" "', argument " "1"" of type '" "TVertex *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TVertex_getSVertex" "', argument " "1"" of type '" "TVertex *""'"); 
   }
   arg1 = reinterpret_cast< TVertex * >(argp1);
   res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_FEdge, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TVertex_GetSVertex" "', argument " "2"" of type '" "FEdge *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "TVertex_getSVertex" "', argument " "2"" of type '" "FEdge *""'"); 
   }
   arg2 = reinterpret_cast< FEdge * >(argp2);
   {
     try {
-      result = (SVertex *)(arg1)->GetSVertex(arg2);
+      result = (SVertex *)(arg1)->getSVertex(arg2);
     }
     //    catch (Swig::DirectorTypeMismatch&) {
     //      cout << "Warning: return type mismatch" << endl;
@@ -107608,8 +107608,8 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"ViewMap_userdata_get", _wrap_ViewMap_userdata_get, METH_VARARGS, NULL},
 	 { (char *)"new_ViewMap", _wrap_new_ViewMap, METH_VARARGS, NULL},
 	 { (char *)"delete_ViewMap", _wrap_delete_ViewMap, METH_VARARGS, NULL},
-	 { (char *)"ViewMap_GetClosestViewEdge", _wrap_ViewMap_GetClosestViewEdge, METH_VARARGS, NULL},
-	 { (char *)"ViewMap_GetClosestFEdge", _wrap_ViewMap_GetClosestFEdge, METH_VARARGS, NULL},
+	 { (char *)"ViewMap_getClosestViewEdge", _wrap_ViewMap_getClosestViewEdge, METH_VARARGS, NULL},
+	 { (char *)"ViewMap_getClosestFEdge", _wrap_ViewMap_getClosestFEdge, METH_VARARGS, NULL},
 	 { (char *)"ViewMap_getInstance", _wrap_ViewMap_getInstance, METH_VARARGS, NULL},
 	 { (char *)"ViewMap_ViewShapes", _wrap_ViewMap_ViewShapes, METH_VARARGS, NULL},
 	 { (char *)"ViewMap_ViewEdges", _wrap_ViewMap_ViewEdges, METH_VARARGS, NULL},
@@ -107664,14 +107664,14 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"TVertex_frontEdgeB", _wrap_TVertex_frontEdgeB, METH_VARARGS, NULL},
 	 { (char *)"TVertex_backEdgeA", _wrap_TVertex_backEdgeA, METH_VARARGS, NULL},
 	 { (char *)"TVertex_backEdgeB", _wrap_TVertex_backEdgeB, METH_VARARGS, NULL},
-	 { (char *)"TVertex_setFrontVertex", _wrap_TVertex_setFrontVertex, METH_VARARGS, NULL},
+	 { (char *)"TVertex_setFrontSVertex", _wrap_TVertex_setFrontSVertex, METH_VARARGS, NULL},
 	 { (char *)"TVertex_setBackSVertex", _wrap_TVertex_setBackSVertex, METH_VARARGS, NULL},
 	 { (char *)"TVertex_setFrontEdgeA", _wrap_TVertex_setFrontEdgeA, METH_VARARGS, NULL},
 	 { (char *)"TVertex_setFrontEdgeB", _wrap_TVertex_setFrontEdgeB, METH_VARARGS, NULL},
 	 { (char *)"TVertex_setBackEdgeA", _wrap_TVertex_setBackEdgeA, METH_VARARGS, NULL},
 	 { (char *)"TVertex_setBackEdgeB", _wrap_TVertex_setBackEdgeB, METH_VARARGS, NULL},
 	 { (char *)"TVertex_setId", _wrap_TVertex_setId, METH_VARARGS, NULL},
-	 { (char *)"TVertex_GetSVertex", _wrap_TVertex_GetSVertex, METH_VARARGS, NULL},
+	 { (char *)"TVertex_getSVertex", _wrap_TVertex_getSVertex, METH_VARARGS, NULL},
 	 { (char *)"TVertex_Replace", _wrap_TVertex_Replace, METH_VARARGS, NULL},
 	 { (char *)"TVertex_mate", _wrap_TVertex_mate, METH_VARARGS, NULL},
 	 { (char *)"TVertex_edges_end", _wrap_TVertex_edges_end, METH_VARARGS, NULL},
diff --git a/source/blender/freestyle/python/Freestyle.py b/source/blender/freestyle/python/Freestyle.py
index 079eb01eb31..9db78a050e0 100755
--- a/source/blender/freestyle/python/Freestyle.py
+++ b/source/blender/freestyle/python/Freestyle.py
@@ -1403,8 +1403,8 @@ class ViewMap(_object):
         except: self.this = this
     __swig_destroy__ = _Freestyle.delete_ViewMap
     __del__ = lambda self : None;
-    def GetClosestViewEdge(*args): return _Freestyle.ViewMap_GetClosestViewEdge(*args)
-    def GetClosestFEdge(*args): return _Freestyle.ViewMap_GetClosestFEdge(*args)
+    def getClosestViewEdge(*args): return _Freestyle.ViewMap_getClosestViewEdge(*args)
+    def getClosestFEdge(*args): return _Freestyle.ViewMap_getClosestFEdge(*args)
     __swig_getmethods__["getInstance"] = lambda x: _Freestyle.ViewMap_getInstance
     if _newclass:getInstance = staticmethod(_Freestyle.ViewMap_getInstance)
     def ViewShapes(*args): return _Freestyle.ViewMap_ViewShapes(*args)
@@ -1487,14 +1487,14 @@ class TVertex(ViewVertex):
     def frontEdgeB(*args): return _Freestyle.TVertex_frontEdgeB(*args)
     def backEdgeA(*args): return _Freestyle.TVertex_backEdgeA(*args)
     def backEdgeB(*args): return _Freestyle.TVertex_backEdgeB(*args)
-    def setFrontVertex(*args): return _Freestyle.TVertex_setFrontVertex(*args)
+    def setFrontSVertex(*args): return _Freestyle.TVertex_setFrontSVertex(*args)
     def setBackSVertex(*args): return _Freestyle.TVertex_setBackSVertex(*args)
     def setFrontEdgeA(*args): return _Freestyle.TVertex_setFrontEdgeA(*args)
     def setFrontEdgeB(*args): return _Freestyle.TVertex_setFrontEdgeB(*args)
     def setBackEdgeA(*args): return _Freestyle.TVertex_setBackEdgeA(*args)
     def setBackEdgeB(*args): return _Freestyle.TVertex_setBackEdgeB(*args)
     def setId(*args): return _Freestyle.TVertex_setId(*args)
-    def GetSVertex(*args): return _Freestyle.TVertex_GetSVertex(*args)
+    def getSVertex(*args): return _Freestyle.TVertex_getSVertex(*args)
     def Replace(*args): return _Freestyle.TVertex_Replace(*args)
     def mate(*args): return _Freestyle.TVertex_mate(*args)
     def edges_end(*args): return _Freestyle.TVertex_edges_end(*args)

From f45aca0447e09c5c36bba31f5de48d6554cdc4f9 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Mon, 28 Jul 2008 11:05:35 +0000
Subject: [PATCH 154/252] Complete rewrite of syntax highlighting and
 formatting. Some improvements:  - Takes less than half the time to format a
 full document  - Where possible only the required lines are re-parsed when
 text is changed (was the whole file, for every key press!)  - Memory is
 allocated in one place only (there were all sorts of problems here)  - Should
 be easily extensible for other scripting languages  - Lots of comments to
 make it very easy to follow / change  - def and class are now properly
 coloured. They had a theme colour but the checks didn't work.

---
 source/blender/blenkernel/intern/text.c  |  53 +-
 source/blender/include/BIF_drawtext.h    |   3 +-
 source/blender/makesdna/DNA_text_types.h |   8 +
 source/blender/src/drawtext.c            | 709 +++++++++--------------
 source/blender/src/header_text.c         |  16 +-
 5 files changed, 300 insertions(+), 489 deletions(-)

diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c
index d2100535ecc..49e9a40bbb9 100644
--- a/source/blender/blenkernel/intern/text.c
+++ b/source/blender/blenkernel/intern/text.c
@@ -175,7 +175,7 @@ Text *add_empty_text(char *name)
 
 	tmp= (TextLine*) MEM_mallocN(sizeof(TextLine), "textline");
 	tmp->line= (char*) MEM_mallocN(1, "textline_string");
-	tmp->format= (char*) MEM_mallocN(2, "Syntax_format");
+	tmp->format= NULL;
 	
 	tmp->line[0]=0;
 	tmp->len= 0;
@@ -271,7 +271,7 @@ int reopen_text(Text *text)
 		if (buffer[i]=='\n') {
 			tmp= (TextLine*) MEM_mallocN(sizeof(TextLine), "textline");
 			tmp->line= (char*) MEM_mallocN(llen+1, "textline_string");
-			tmp->format= (char*) MEM_mallocN(llen+2, "Syntax_format");
+			tmp->format= NULL;
 			
 			if(llen) memcpy(tmp->line, &buffer[i-llen], llen);
 			tmp->line[llen]=0;
@@ -291,7 +291,7 @@ int reopen_text(Text *text)
 	if (llen!=0 || text->nlines==0) {
 		tmp= (TextLine*) MEM_mallocN(sizeof(TextLine), "textline");
 		tmp->line= (char*) MEM_mallocN(llen+1, "textline_string");
-		tmp->format= (char*) MEM_mallocN(llen+2, "Syntax_format");
+		tmp->format= NULL;
 		
 		if(llen) memcpy(tmp->line, &buffer[i-llen], llen);
 
@@ -367,7 +367,7 @@ Text *add_text(char *file)
 		if (buffer[i]=='\n') {
 			tmp= (TextLine*) MEM_mallocN(sizeof(TextLine), "textline");
 			tmp->line= (char*) MEM_mallocN(llen+1, "textline_string");
-			tmp->format= (char*) MEM_mallocN(llen+2, "Syntax_format");
+			tmp->format= NULL;
 			
 			if(llen) memcpy(tmp->line, &buffer[i-llen], llen);
 			tmp->line[llen]=0;
@@ -387,7 +387,7 @@ Text *add_text(char *file)
 	if (llen!=0 || ta->nlines==0) {
 		tmp= (TextLine*) MEM_mallocN(sizeof(TextLine), "textline");
 		tmp->line= (char*) MEM_mallocN(llen+1, "textline_string");
-		tmp->format= (char*) MEM_mallocN(llen+2, "Syntax_format");
+		tmp->format= NULL;
 		
 		if(llen) memcpy(tmp->line, &buffer[i-llen], llen);
 
@@ -430,7 +430,7 @@ Text *copy_text(Text *ta)
 	while (line) {
 		tmp= (TextLine*) MEM_mallocN(sizeof(TextLine), "textline");
 		tmp->line= MEM_mallocN(line->len+1, "textline_string");
-		tmp->format= MEM_mallocN(line->len+2, "Syntax_format");
+		tmp->format= NULL;
 		
 		strcpy(tmp->line, line->line);
 
@@ -451,14 +451,14 @@ Text *copy_text(Text *ta)
 /* Editing utility functions */
 /*****************************/
 
-static void make_new_line (TextLine *line, char *newline, char *newformat) 
+static void make_new_line (TextLine *line, char *newline) 
 {
 	if (line->line) MEM_freeN(line->line);
 	if (line->format) MEM_freeN(line->format);
 	
 	line->line= newline;
 	line->len= strlen(newline);
-	line->format= newformat;
+	line->format= NULL;
 }
 
 static TextLine *txt_new_line(char *str)
@@ -469,7 +469,7 @@ static TextLine *txt_new_line(char *str)
 	
 	tmp= (TextLine *) MEM_mallocN(sizeof(TextLine), "textline");
 	tmp->line= MEM_mallocN(strlen(str)+1, "textline_string");
-	tmp->format= MEM_mallocN(strlen(str)+2, "Syntax_format");
+	tmp->format= NULL;
 	
 	strcpy(tmp->line, str);
 	
@@ -487,7 +487,7 @@ static TextLine *txt_new_linen(char *str, int n)
 	
 	tmp= (TextLine *) MEM_mallocN(sizeof(TextLine), "textline");
 	tmp->line= MEM_mallocN(n+1, "textline_string");
-	tmp->format= MEM_mallocN(n+2, "Syntax_format");
+	tmp->format= NULL;
 	
 	BLI_strncpy(tmp->line, str, n+1);
 	
@@ -948,7 +948,7 @@ int txt_has_sel(Text *text)
 static void txt_delete_sel (Text *text)
 {
 	TextLine *tmpl;
-	char *buf, *format;
+	char *buf;
 	
 	if (!text) return;
 	if (!text->curl) return;
@@ -965,13 +965,12 @@ static void txt_delete_sel (Text *text)
 	}
 
 	buf= MEM_mallocN(text->curc+(text->sell->len - text->selc)+1, "textline_string");
-	format= MEM_mallocN(text->curc+(text->sell->len - text->selc)+2, "Syntax_format");
 	
 	strncpy(buf, text->curl->line, text->curc);
 	strcpy(buf+text->curc, text->sell->line + text->selc);
 	buf[text->curc+(text->sell->len - text->selc)]=0;
 
-	make_new_line(text->curl, buf, format);
+	make_new_line(text->curl, buf);
 	
 	tmpl= text->sell;
 	while (tmpl != text->curl) {
@@ -2045,7 +2044,7 @@ void txt_do_redo(Text *text)
 void txt_split_curline (Text *text) 
 {
 	TextLine *ins;
-	char *left, *right, *fleft, *fright;
+	char *left, *right;
 	
 	if (!text) return;
 	if (!text->curl) return;
@@ -2055,12 +2054,10 @@ void txt_split_curline (Text *text)
 	/* Make the two half strings */
 
 	left= MEM_mallocN(text->curc+1, "textline_string");
-	fleft= MEM_mallocN(text->curc+2, "Syntax_format");
 	if (text->curc) memcpy(left, text->curl->line, text->curc);
 	left[text->curc]=0;
 	
 	right= MEM_mallocN(text->curl->len - text->curc+1, "textline_string");
-	fright= MEM_mallocN(text->curl->len - text->curc+2, "Syntax_format");
 	if (text->curl->len - text->curc) memcpy(right, text->curl->line+text->curc, text->curl->len-text->curc);
 	right[text->curl->len - text->curc]=0;
 
@@ -2071,11 +2068,11 @@ void txt_split_curline (Text *text)
 	
 	ins= MEM_mallocN(sizeof(TextLine), "textline");
 	ins->line= left;
-	ins->format= fleft;
+	ins->format= NULL;
 	ins->len= text->curc;
 	
 	text->curl->line= right;
-	text->curl->format= fright;
+	text->curl->format= NULL;
 	text->curl->len= text->curl->len - text->curc;
 	
 	BLI_insertlinkbefore(&text->lines, text->curl, ins);	
@@ -2107,19 +2104,18 @@ static void txt_delete_line (Text *text, TextLine *line)
 
 static void txt_combine_lines (Text *text, TextLine *linea, TextLine *lineb)
 {
-	char *tmp, *format;
+	char *tmp;
 	
 	if (!text) return;
 	
 	if(!linea || !lineb) return;
 	
 	tmp= MEM_mallocN(linea->len+lineb->len+1, "textline_string");
-	format= MEM_mallocN(linea->len+lineb->len+1, "Syntax_format");
 	
 	strcpy(tmp, linea->line);
 	strcat(tmp, lineb->line);
 
-	make_new_line(linea, tmp, format);
+	make_new_line(linea, tmp);
 	
 	txt_delete_line(text, lineb); 
 	
@@ -2217,7 +2213,7 @@ void txt_backspace_word (Text *text)
 int txt_add_char (Text *text, char add) 
 {
 	int len;
-	char *tmp, *format;
+	char *tmp;
 	
 	if (!text) return 0;
 	if (!text->curl) return 0;
@@ -2230,7 +2226,6 @@ int txt_add_char (Text *text, char add)
 	txt_delete_sel(text);
 	
 	tmp= MEM_mallocN(text->curl->len+2, "textline_string");
-	format= MEM_mallocN(text->curl->len+4, "Syntax_format");
 	
 	if(text->curc) memcpy(tmp, text->curl->line, text->curc);
 	tmp[text->curc]= add;
@@ -2238,7 +2233,7 @@ int txt_add_char (Text *text, char add)
 	len= text->curl->len - text->curc;
 	if(len>0) memcpy(tmp+text->curc+1, text->curl->line+text->curc, len);
 	tmp[text->curl->len+1]=0;
-	make_new_line(text->curl, tmp, format);
+	make_new_line(text->curl, tmp);
 		
 	text->curc++;
 
@@ -2282,7 +2277,7 @@ int txt_replace_char (Text *text, char add)
 void indent(Text *text)
 {
 	int len, num;
-	char *tmp, *format;
+	char *tmp;
 	char add = '\t';
 	
 	if (!text) return;
@@ -2293,7 +2288,6 @@ void indent(Text *text)
 	while (TRUE)
 	{
 		tmp= MEM_mallocN(text->curl->len+2, "textline_string");
-		format= MEM_mallocN(text->curl->len+3, "Syntax_format");
 		
 		text->curc = 0; 
 		if(text->curc) memcpy(tmp, text->curl->line, text->curc);
@@ -2303,7 +2297,7 @@ void indent(Text *text)
 		if(len>0) memcpy(tmp+text->curc+1, text->curl->line+text->curc, len);
 		tmp[text->curl->len+1]=0;
 
-		make_new_line(text->curl, tmp, format);
+		make_new_line(text->curl, tmp);
 			
 		text->curc++;
 		
@@ -2384,7 +2378,7 @@ void unindent(Text *text)
 void comment(Text *text)
 {
 	int len, num;
-	char *tmp, *format;
+	char *tmp;
 	char add = '#';
 	
 	if (!text) return;
@@ -2395,7 +2389,6 @@ void comment(Text *text)
 	while (TRUE)
 	{
 		tmp= MEM_mallocN(text->curl->len+2, "textline_string");
-		format = MEM_mallocN(text->curl->len+3, "Syntax_format");
 		
 		text->curc = 0; 
 		if(text->curc) memcpy(tmp, text->curl->line, text->curc);
@@ -2405,7 +2398,7 @@ void comment(Text *text)
 		if(len>0) memcpy(tmp+text->curc+1, text->curl->line+text->curc, len);
 		tmp[text->curl->len+1]=0;
 
-		make_new_line(text->curl, tmp, format);
+		make_new_line(text->curl, tmp);
 			
 		text->curc++;
 		
diff --git a/source/blender/include/BIF_drawtext.h b/source/blender/include/BIF_drawtext.h
index 19f9d50e774..9f0b98435c5 100644
--- a/source/blender/include/BIF_drawtext.h
+++ b/source/blender/include/BIF_drawtext.h
@@ -45,7 +45,8 @@ void add_text_fs(char *file);
 void free_txt_data(void);
 void pop_space_text(struct SpaceText *st);
 
-void get_format_string(struct SpaceText *st);
+void txt_format_text(struct SpaceText *st);
+void txt_format_line(struct SpaceText *st, struct TextLine *line, int do_next);
 void do_brackets(void);
 
 #endif
diff --git a/source/blender/makesdna/DNA_text_types.h b/source/blender/makesdna/DNA_text_types.h
index fc2a28ea320..bec4e0062f9 100644
--- a/source/blender/makesdna/DNA_text_types.h
+++ b/source/blender/makesdna/DNA_text_types.h
@@ -76,4 +76,12 @@ typedef struct Text {
 #define TXT_READONLY            0x0100
 #define TXT_FOLLOW              0x0200 /* always follow cursor (console) */
 
+/* format continuation flags */
+#define TXT_NOCONT				0x00 /* no continuation */
+#define TXT_SNGQUOTSTR			0x01 /* single quotes */
+#define TXT_DBLQUOTSTR			0x02 /* double quotes */
+#define TXT_TRISTR				0x04 /* triplets of quotes: """ or ''' */
+#define TXT_SNGTRISTR			0x05 /*(TXT_TRISTR | TXT_SNGQUOTSTR)*/
+#define TXT_DBLTRISTR			0x06 /*(TXT_TRISTR | TXT_DBLQUOTSTR)*/
+
 #endif
diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index 9b7a7bbfb7d..02656c8d440 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -134,10 +134,10 @@ void winqreadtextspace(struct ScrArea *sa, void *spacedata, struct BWinEvent *ev
 void txt_copy_selectbuffer (Text *text);
 void do_brackets();
 
-void get_selection_buffer(Text *text);
-int check_bracket(char *string);
-static int check_delim(char *string);
-static int check_numbers(char *string);
+static void get_selection_buffer(Text *text);
+static int check_bracket(char ch);
+static int check_delim(char ch);
+static int check_digit(char ch);
 static int check_builtinfuncs(char *string);
 static int check_specialvars(char *string);
 static int check_identifier(char ch);
@@ -237,349 +237,203 @@ static int render_string (SpaceText *st, char *in) {
 	return r;
 }
 
-void get_format_string(SpaceText *st) 
+static int find_builtinfunc(char *string)
 {
-	Text *text = st->text;
-	TextLine *tmp;
-	char *in_line;
-	char format[2000], check[200], other[2];
-	unsigned char c;
-	int spot, letter, tabs, mem_amount;
-	size_t a, b, len;
-	
-	if(!text) return;
-	tmp = text->lines.first;
-	
-	while(tmp) {
-		in_line = tmp->line;
-		
-		len = strlen(in_line);
-		/* weak code... but we dont want crashes (ton) */
-		if(len>2000-1) {
-			if (tmp->format) MEM_freeN(tmp->format);
-			tmp->format= NULL;
-		}
-		else {
-			
-			spot = 0;
-			tabs = 0;
-			//see how many tabs we have
-			for(a = 0; a <len; a++) {
-				c = (unsigned char) in_line[a];
-				if(c == '\t') {
-					tabs++;
-				}
+	int a, i;
+	char builtinfuncs[][11] = {"and", "as", "assert", "break", "class", "continue", "def",
+								"del", "elif", "else", "except", "exec", "finally",
+								"for", "from", "global", "if", "import", "in",
+								"is", "lambda", "not", "or", "pass", "print",
+								"raise", "return", "try", "while", "yield"};
+	for (a=0; a<30; a++) {
+		i = 0;
+		while (1) {
+			if (builtinfuncs[a][i]=='\0') {
+				if (check_identifier(string[i]))
+					i = -1;
+				break;
+			} else if (string[i]!=builtinfuncs[a][i]) {
+				i = -1;
+				break;
 			}
-			//calculate the amount of MEM_mallocN we neen
-			mem_amount = (((tabs*st->tabnumber)-tabs)+2)+len; // +2 for good measure
-			if (tmp->format) MEM_freeN(tmp->format);
-			tmp->format = MEM_mallocN(mem_amount, "Syntax_format");
-			
-			for (a = 0; a < len; a++) {
-				c = (unsigned char) in_line[a];
-
-				check[0] = c;
-				check[1] = '\0';
-
-				if (check_delim(check))
-				{
-					switch (c) {
-						case '\"':
-							if(in_line[a] == '\"' && in_line[a+1] == '\"' && in_line[a+2] == '\"') { 
-								format[spot] = format[spot+1] = format[spot+2] = 'l';
-								spot +=3;
-								a += 3;
-								while(in_line[a] != '\"' || in_line[a-1] != '\"' || in_line[a-2] != '\"') {
-									c = (unsigned char) in_line[a];
-									if(a >= len) {
-										format[spot] = '\0';
-										memcpy(tmp->format, format, strlen(format));
-										if(!(tmp= tmp->next)) {
-											return;
-										} else {
-											in_line = tmp->line;
-											len = strlen(in_line);
-											tabs = 0;
-											for(b = 0; b <len; b++) {
-												c = (unsigned char) in_line[b];
-												if(c == '\t') {
-													tabs++;
-												}
-											}
-											mem_amount = (((tabs*st->tabnumber)-tabs)+2)+len;
-											if (tmp->format) MEM_freeN(tmp->format);
-											tmp->format = MEM_mallocN(mem_amount, "Syntax_format");
-											a = 0; spot = 0;
-										}
-									} else {
-										if(c == '\t' || c == ' ') {
-											if(c == '\t') {
-												for(b = st->tabnumber-(spot%st->tabnumber); b > 0; b--) {
-													format[spot] = ' ';
-													spot++;
-												}
-												a++;
-											} else {
-												format[spot] = ' ';
-												a++; spot++;
-										}
-										} else {
-											format[spot] = 'l';
-											a++; spot++;
-										}
-									}
-								}
-								format[spot] = 'l';
-								spot++;
-							} else {
-								format[spot] = 'l';
-								a++; spot++;
-								while(in_line[a] != '\"') {
-									c = (unsigned char) in_line[a];
-									if(a >= len) {
-										format[spot] = '\0';
-										memcpy(tmp->format, format, strlen(format));
-										if(!(tmp= tmp->next)) {
-											return;
-										} else {
-											in_line = tmp->line;
-											len = strlen(in_line);
-											for(b = 0; b <len; b++) {
-												c = (unsigned char) in_line[b];
-												if(c == '\t') {
-													tabs++;
-												}
-											}
-											//calculate the amount of MEM_mallocN we neen
-											mem_amount = (((tabs*st->tabnumber)-tabs)+2)+len;
-											if (tmp->format) MEM_freeN(tmp->format);
-											tmp->format = MEM_mallocN(mem_amount, "Syntax_format");
-											a = 0; spot = 0;
-										}
-									}
-									if(c == '\t' || c == ' ') {
-										if(c == '\t') {
-											for(b = st->tabnumber-(spot%st->tabnumber); b > 0; b--) {
-												format[spot] = ' ';
-												spot++;
-											}
-											a++;
-										} else {
-											format[spot] = ' ';
-											a++; spot++;
-										}
-									} else {
-										format[spot] = 'l';
-										a++; spot++;
-									}
-								}
-								format[spot] = 'l';
-								spot++;
-							}
-							break;
-						case '\'':
-							if(in_line[a] == '\'' && in_line[a+1] == '\'' && in_line[a+2] == '\'') { 
-								format[spot] = format[spot+1] = format[spot+2] = 'l';
-								spot +=3;
-								a += 3;
-								while(in_line[a] != '\'' || in_line[a-1] != '\'' || in_line[a-2] != '\'') {
-									c = (unsigned char) in_line[a];
-									if(a >= len) {
-										format[spot] = '\0';
-										memcpy(tmp->format, format, strlen(format));
-										if(!(tmp= tmp->next)) {
-											return;
-										} else {
-											in_line = tmp->line;
-											len = strlen(in_line);
-											tabs = 0;
-											for(b = 0; b <len; b++) {
-												c = (unsigned char) in_line[b];
-												if(c == '\t') {
-													tabs++;
-												}
-											}
-											mem_amount = (((tabs*st->tabnumber)-tabs)+2)+len;
-											if (tmp->format) MEM_freeN(tmp->format);
-											tmp->format = MEM_mallocN(mem_amount, "Syntax_format");
-											a = 0; spot = 0;
-										}
-									} else {
-										if(c == '\t' || c == ' ') {
-											if(c == '\t') {
-												for(b = st->tabnumber-(spot%st->tabnumber); b > 0; b--) {
-													format[spot] = ' ';
-													spot++;
-												}
-												a++;
-											} else {
-												format[spot] = ' ';
-												a++; spot++;
-											}
-										} else {
-											format[spot] = 'l';
-											a++; spot++;
-										}
-									}
-								}
-								format[spot] = 'l';
-								spot++;
-							} else {
-								format[spot] = 'l';
-								a++; spot++;
-								while(in_line[a] != '\'') {
-									c = (unsigned char) in_line[a];
-									if(a >= len) {
-										format[spot] = '\0';
-										memcpy(tmp->format, format, strlen(format));
-										if(!(tmp= tmp->next)) {
-											return;
-										} else {
-											in_line = tmp->line;
-											len = strlen(in_line);
-											for(b = 0; b <len; b++) {
-												c = (unsigned char) in_line[b];
-												if(c == '\t') {
-													tabs++;
-												}
-											}
-											//calculate the amount of MEM_mallocN we neen
-											mem_amount = (((tabs*st->tabnumber)-tabs)+2)+len;
-											if (tmp->format) MEM_freeN(tmp->format);
-											tmp->format = MEM_mallocN(mem_amount, "Syntax_format");
-											a = 0; spot = 0;
-										}
-									}
-									if(c == '\t' || c == ' ') {
-										if(c == '\t') {
-											for(b = st->tabnumber-(spot%st->tabnumber); b > 0; b--) {
-												format[spot] = ' ';
-												spot++;
-											}
-											a++;
-										} else {
-											format[spot] = ' ';
-											a++; spot++;
-										}
-									} else {
-										format[spot] = 'l';
-										a++; spot++;
-									}
-								}
-								format[spot] = 'l';
-								spot++;
-							}
-							break;
-						case '#':
-							while(a<len) {
-								c = (unsigned char) in_line[a];
-								if(c == '\t' || c == ' ') {
-									if(c == '\t') {
-										for(b = st->tabnumber-(spot%st->tabnumber); b > 0; b--) {
-											format[spot] = '#';
-											spot++;
-										}
-										a++;
-									} else {
-										format[spot] = '#';
-										a++; spot++;
-									}
-								} else {
-									format[spot] = '#';
-									a++; spot++;
-								}
-							}
-							break;
-						case ' ':
-							format[spot] = ' ';
-							spot++;
-							break;
-						case '\t':
-							for(b = st->tabnumber-(spot%st->tabnumber); b > 0; b--) {
-								format[spot] = ' ';
-								spot++;
-							}
-							break;
-						default:
-							format[spot] = 'q';
-							spot++;
-							 
-							break;
-					}
-				} else if (check_numbers(check)) {
-					while (a < len) {
-						c = (unsigned char) in_line[a];
-						other[0] = c;
-						other[1] = '\0';
-						if (check_delim(other) && c != '.') {
-							a--; break;
-						} else {
-							format[spot] = 'n';
-							a++; spot++;
-						}
-					}
-				} else {
-					letter = 0;
-					while (a < len) {
-						c = (unsigned char) in_line[a];
-						other[0] = c;
-						other[1] = '\0';
-						if (check_delim(other)) {
-							a--; 
-							break;
-						} else {
-							check[letter] = (unsigned char) in_line[a];
-							letter++; 
-							a++;
-						}
-					}
-					check[letter] = '\0';
-					if (check_builtinfuncs(check)) {
-						for (b = 0; b < strlen(check); b++) {
-							format[spot] = 'b'; 
-							spot++;
-						}
-					} else if (check_specialvars(check)) { /*If TRUE then color and color next word*/
-						for (b = 0; b < strlen(check); b++) {
-							format[spot] = 'b';
-							spot++;
-						}
-						a++;
-						format[spot] = 'q';
-						spot++; a++;
-						letter = 0;
-						while (a < len) {
-							c = (unsigned char) in_line[a];
-							other[0] = c;
-							other[1] = '\0';
-							if (check_delim(other)) {
-								a--; 
-								break;
-							} else {
-								check[letter] = (unsigned char) in_line[a];
-								letter++; 
-								a++;
-							}
-						}
-						check[letter] = '\0';
-						for (b = 0; b < strlen(check); b++) {
-							format[spot] = 'v';
-							spot++;
-						}
-					}else {
-						for (b = 0; b < strlen(check); b++) {
-							format[spot] = 'q';
-							spot++;
-						}
-					}
-				}
-			}
-			format[spot] = '\0';
-			memcpy(tmp->format, format, strlen(format));
+			i++;
 		}
-		
-		tmp = tmp->next;
+		if (i>0) break;
 	}
+	return i;
+}
+
+static int find_specialvar(char *string) 
+{
+	int i = 0;
+	if (string[0]=='d' && string[1]=='e' && string[2]=='f')
+		i = 3;
+	else if (string[0]=='c' && string[1]=='l' && string[2]=='a' && string[3]=='s' && string[4]=='s')
+		i = 5;
+	if (i==0 || check_identifier(string[i]))
+		return -1;
+	return i;
+}
+
+static void print_format(SpaceText *st, TextLine *line) {
+	int i, a;
+	char *s, *f;
+	s = line->line;
+	f = line->format;
+	for (a=0; *s; s++) {
+		if (*s == '\t') {
+			for (i=st->tabnumber-(a%st->tabnumber); i>0; i--)
+				printf(" "), f++, a++;
+		} else
+			printf("%c", *s), f++, a++;
+	}
+	printf("\n%s [%#x]\n", line->format, (int) (f[strlen(f)+1]));
+}
+
+/* Ensures the format string for the given line is long enough, reallocating as needed */
+static int check_format_len(TextLine *line, unsigned int len) {
+	if (line->format) {
+		if (strlen(line->format) < len) {
+			MEM_freeN(line->format);
+			line->format = MEM_mallocN(len+2, "SyntaxFormat");
+			if (!line->format) return 0;
+		}
+	} else {
+		line->format = MEM_mallocN(len+2, "SyntaxFormat");
+		if (!line->format) return 0;
+	}
+	return 1;
+}
+
+/* Formats the specified line and if allowed and needed will move on to the
+ * next line. The format string contains the following characters:
+ *		'_'		Whitespace
+ *		'#'		Comment text
+ *		'!'		Punctuation and other symbols
+ *		'n'		Numerals
+ *		'l'		String letters
+ *		'v'		Special variables (class, def)
+ *		'b'		Built-in names (print, for, etc.)
+ *		'q'		Other text (identifiers, etc.)
+ * It is terminated with a null-terminator '\0' followed by a continuation
+ * flag indicating whether the line is part of a multi-line string.
+ */
+void txt_format_line(SpaceText *st, TextLine *line, int do_next) {
+	char *str, *fmt, orig, cont, find, prev = ' ';
+	int len, i;
+
+	/* Get continuation from previous line */
+	if (line->prev && (fmt=line->prev->format)) {
+		cont = fmt[strlen(fmt)+1]; /* Just after the null-terminator */
+	} else cont = 0;
+
+	/* Get original continuation from this line */
+	if (fmt=line->format) {
+		orig = fmt[strlen(fmt)+1]; /* Just after the null-terminator */
+	} else orig = 0xFF;
+
+	render_string(st, line->line);
+	str = temp_char_buf;
+	len = strlen(str);
+	if (!check_format_len(line, len)) return;
+	fmt = line->format;
+
+	while (*str) {
+		/* Handle escape sequences by skipping both \ and next char */
+		if (*str == '\\') {
+			*fmt = prev; fmt++; str++;
+			if (*str == '\0') break;
+			*fmt = prev; fmt++; str++;
+			continue;
+		}
+		/* Handle continuations */
+		else if (cont) {
+			/* Triple strings ("""...""" or '''...''') */
+			if (cont & TXT_TRISTR) {
+				find = (cont & TXT_DBLQUOTSTR) ? '"' : '\'';
+				if (*str==find && *(str+1)==find && *(str+2)==find) {
+					*fmt = 'l'; fmt++; str++;
+					*fmt = 'l'; fmt++; str++;
+					cont = 0;
+				}
+			/* Handle other strings */
+			} else {
+				find = (cont & TXT_DBLQUOTSTR) ? '"' : '\'';
+				if (*str == find) cont = 0;
+			}
+			*fmt = 'l';
+		}
+		/* Not in a string... */
+		else {
+			/* Deal with comments first */
+			if (prev == '#' || *str == '#')
+				*fmt = '#';
+			/* Strings */
+			else if (*str == '"' || *str == '\'') {
+				find = *str;
+				cont = (*str== '"') ? TXT_DBLQUOTSTR : TXT_SNGQUOTSTR;
+				if (*(str+1) == find && *(str+2) == find) {
+					*fmt = 'l'; fmt++; str++;
+					*fmt = 'l'; fmt++; str++;
+					cont |= TXT_TRISTR;
+				}
+				*fmt = 'l';
+			}
+			/* Whitespace (all ws. has been converted to spaces) */
+			else if (*str == ' ')
+				*fmt = '_';
+			/* Numbers (digits not part of an identifier and periods followed by digits) */
+			else if ((prev != 'q' && check_digit(*str)) || (*str == '.' && check_digit(*(str+1))))
+				*fmt = 'n';
+			/* Punctuation */
+			else if (check_delim(*str))
+				*fmt = '!';
+			/* Identifiers and other text (no previous ws. or delims. so text continues) */
+			else if (prev == 'q')
+				*fmt = 'q';
+			/* Not ws, a digit, punct, or continuing text. Must be new, check for special words */
+			else {
+				/* Special vars(v) or built-in keywords(b) */
+				if ((i=find_specialvar(str)) != -1)
+					prev = 'v';
+				else if ((i=find_builtinfunc(str)) != -1)
+					prev = 'b';
+				if (i>0) {
+					while (i>1) {
+						*fmt = prev; *fmt++; *str++;
+						i--;
+					}
+					*fmt = prev;
+				} else
+					*fmt = 'q';
+			}
+		}
+		prev = *fmt;
+		fmt++;
+		str++;
+	}
+
+	/* Terminate and add continuation char */
+	*fmt = '\0'; fmt++;
+	*fmt = cont;
+
+	/* Debugging */
+	//print_format(st, line);
+
+	/* If continuation has changed and we're allowed, process the next line */
+	if (cont!=orig && do_next && line->next) {
+		txt_format_line(st, line->next, do_next);
+	}
+}
+
+void txt_format_text(SpaceText *st) 
+{
+	TextLine *linep;
+
+	if (!st->text) return;
+
+	for (linep=st->text->lines.first; linep; linep=linep->next)
+		txt_format_line(st, linep, 0);
 }
 
 static int text_draw(SpaceText *st, char *str, int cshift, int maxwidth, int draw, int x, int y, char *format) {
@@ -606,24 +460,27 @@ static int text_draw(SpaceText *st, char *str, int cshift, int maxwidth, int dra
 				out[0] = (unsigned char) in[a]; 
 				out[1] = '\0';
 				switch (format[a]) {
-					case 'l':
-						BIF_ThemeColor(TH_SYNTAX_L);
+					case '_': /* Whitespace */
 						break;
-					case 'b':
-						BIF_ThemeColor(TH_SYNTAX_B);
+					case '!': /* Symbols */
+						BIF_ThemeColorBlend(TH_TEXT, TH_BACK, 0.5f);
 						break;
-					case '#':
+					case '#': /* Comments */
 						BIF_ThemeColor(TH_SYNTAX_C);
 						break;
-					case 'v': 
-						BIF_ThemeColor(TH_SYNTAX_V);
-						break;
-					case 'n':
+					case 'n': /* Numerals */
 						BIF_ThemeColor(TH_SYNTAX_N);
 						break;
-					case 'q':
-						BIF_ThemeColor(TH_TEXT);
+					case 'l': /* Strings */
+						BIF_ThemeColor(TH_SYNTAX_L);
 						break;
+					case 'v': /* Specials: class, def */
+						BIF_ThemeColor(TH_SYNTAX_V);
+						break;
+					case 'b': /* Keywords: for, print, etc. */
+						BIF_ThemeColor(TH_SYNTAX_B);
+						break;
+					case 'q': /* Other text (identifiers) */
 					default:
 						BIF_ThemeColor(TH_TEXT);
 						break;
@@ -1395,12 +1252,6 @@ void drawtextspace(ScrArea *sa, void *spacedata)
 		tmp= tmp->next;
 		linecount++;
 	}
-	
-	if(st->showsyntax) {
-		if (tmp && !tmp->format) {
-			get_format_string(st);
-		}
-	}
 
 	y= curarea->winy-st->lheight;
 	x= st->showlinenrs ? TXT_OFFSET + TEXTXLOC : TXT_OFFSET;
@@ -1408,6 +1259,9 @@ void drawtextspace(ScrArea *sa, void *spacedata)
 	wrapbuf= MEM_mallocN(max+1, "wrapbuffer");
 
 	for (i=0; i<st->viewlines && tmp; i++, tmp= tmp->next) {
+		if (st->showsyntax && !tmp->format) {
+			txt_format_line(st, tmp, 0);
+		}
 		if(st->showlinenrs) {
 			/*Change the color of the current line the cursor is on*/
 			if(tmp == text->curl) { 
@@ -1502,7 +1356,7 @@ void add_text_fs(char *file) /* bad but cant pass an as arg here */
 
 	st->top= 0;
 
-	if (st->showsyntax) get_format_string(st);
+	if (st->showsyntax) txt_format_text(st);
 	allqueue(REDRAWTEXT, 0);
 	allqueue(REDRAWHEADERS, 0);	
 }
@@ -1913,7 +1767,7 @@ void txt_find_panel(SpaceText *st, int again, int flags)
 				tmp= txt_sel_to_buf(text);
 				if (strcmp(buf, tmp)==0) { /* Searching for same thing? */
 					txt_insert_buf(text, repbuf);
-					if (st->showsyntax) get_format_string(st);
+					if (st->showsyntax) txt_format_line(st, text->curl, 1);
 				}
 				MEM_freeN(tmp);
 				tmp= NULL;
@@ -2229,13 +2083,13 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			error_libdata();
 
 		} else if ((st->overwrite && txt_replace_char(text, ascii)) || txt_add_char(text, ascii)) {
-			if (st->showsyntax) get_format_string(st);
+			if (st->showsyntax) txt_format_line(st, text->curl, 1);
 			pop_space_text(st);
 			do_draw= 1;
 			if (tools & TOOL_SUGG_LIST) {
 				if ((ascii != '_' && ascii != '*' && ispunct(ascii)) || check_whitespace(ascii)) {
 					confirm_suggestion(text, 1);
-					if (st->showsyntax) get_format_string(st);
+					if (st->showsyntax) txt_format_line(st, text->curl, 1);
 				} else {
 					tools_update |= TOOL_SUGG_LIST;
 				}
@@ -2280,11 +2134,11 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 				txt_order_cursors(text);
 				uncomment(text);
 				do_draw = 1;
-				if (st->showsyntax) get_format_string(st);
+				if (st->showsyntax) txt_format_text(st);
 				break;
 			} else if (G.qual == LR_CTRLKEY) {
 				txt_delete_char(text);
-				if (st->showsyntax) get_format_string(st);
+				if (st->showsyntax) txt_format_line(st, text->curl, 1);
 				do_draw= 1;
 				pop_space_text(st);
 			}
@@ -2313,7 +2167,7 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 					}
 					//txt_paste(text);
 					txt_paste_clipboard(text);
-					if (st->showsyntax) get_format_string(st);
+					if (st->showsyntax) txt_format_text(st);
 					do_draw= 1;
 					break;
 				case 3:
@@ -2409,7 +2263,7 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 				if (okee("Reopen text")) {
 					if (!reopen_text(text))
 						error("Could not reopen file");
-				if (st->showsyntax) get_format_string(st);
+					if (st->showsyntax) txt_format_text(st);
 				}
 				do_draw= 1;	
 			}
@@ -2453,7 +2307,7 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			}
 			if (G.qual == LR_ALTKEY) {
 				txt_do_undo(text);
-				if (st->showsyntax) get_format_string(st);
+				if (st->showsyntax) txt_format_text(st);
 				do_draw= 1;
 			}
 			break; /* BREAK U */
@@ -2491,7 +2345,7 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 					txt_paste_clipboard(text);
 				else
 					txt_paste_clipboard(text);
-				if (st->showsyntax) get_format_string(st);
+				if (st->showsyntax) txt_format_text(st);
 				do_draw= 1;	
 				pop_space_text(st);
 			}
@@ -2503,7 +2357,7 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 					break;
 				}
 				txt_cut_sel(text);
-				if (st->showsyntax) get_format_string(st);
+				if (st->showsyntax) txt_format_text(st);
 				do_draw= 1;	
 				pop_space_text(st);
 			}
@@ -2515,7 +2369,7 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 				} else {
 					txt_do_undo(text);
 				}
-				if (st->showsyntax) get_format_string(st);
+				if (st->showsyntax) txt_format_text(st);
 				do_draw= 1;
 			}
 			break;
@@ -2534,17 +2388,18 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 				if (txt_has_sel(text)) {
 					txt_order_cursors(text);
 					unindent(text);
-					
+					if (st->showsyntax) txt_format_text(st);
 				}
 			} else {
 				if ( txt_has_sel(text)) {
 					txt_order_cursors(text);
 					indent(text);
+					if (st->showsyntax) txt_format_text(st);
 				} else {
 					txt_add_char(text, '\t');
+					if (st->showsyntax) txt_format_line(st, text->curl, 1);
 				}
 			}
-			if (st->showsyntax) get_format_string(st);
 			pop_space_text(st);
 			do_draw= 1;
 			st->currtab_set = setcurr_tab(text);
@@ -2556,7 +2411,7 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			}
 			if (tools & TOOL_SUGG_LIST) {
 				confirm_suggestion(text, 0);
-				if (st->showsyntax) get_format_string(st);
+				if (st->showsyntax) txt_format_line(st, text->curl, 1);
 				break;
 			}
 			//double check tabs before splitting the line
@@ -2572,7 +2427,10 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 					}
 				}
 			}
-			if (st->showsyntax) get_format_string(st);
+			if (st->showsyntax) {
+				if (text->curl->prev) txt_format_line(st, text->curl->prev, 0);
+				txt_format_line(st, text->curl, 1);
+			}
 			do_draw= 1;
 			pop_space_text(st);
 			break;
@@ -2595,7 +2453,7 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 				txt_backspace_char(text);
 			}
 			set_tabs(text);
-			if (st->showsyntax) get_format_string(st);
+			if (st->showsyntax) txt_format_line(st, text->curl, 1);
 			do_draw= 1;
 			pop_space_text(st);
 			break;
@@ -2609,7 +2467,7 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			} else {
 				txt_delete_char(text);
 			}
-			if (st->showsyntax) get_format_string(st);
+			if (st->showsyntax) txt_format_line(st, text->curl, 1);
 			do_draw= 1;
 			pop_space_text(st);
 			st->currtab_set = setcurr_tab(text);
@@ -2772,7 +2630,7 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 				switch (pupmenu("External File Modified with Local Changes %t|Load external changes (overwrite local) %x0|Save local changes (overwrite external) %x1|Make text internal %x2")) {
 				case 0:
 					reopen_text(text);
-					if (st->showsyntax) get_format_string(st);
+					if (st->showsyntax) txt_format_text(st);
 					do_draw= 1;
 					break;
 				case 1:
@@ -2790,7 +2648,7 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 				switch (pupmenu("External File Modified %t|Reload from disk %x0|Make text internal %x1")) {
 				case 0:
 					reopen_text(text);
-					if (st->showsyntax) get_format_string(st);
+					if (st->showsyntax) txt_format_text(st);
 					do_draw= 1;
 					break;
 				case 1:
@@ -2851,7 +2709,7 @@ void do_brackets(void)
 	SpaceText *st = curarea->spacedata.first;
 	Text *text = st->text;
 	TextLine *tmp, *start;
-	char test[2];
+	char test;
 	int d, pos, open, x, y, x2, y2, h=0;
 	
 	if(!text) return;
@@ -2859,14 +2717,12 @@ void do_brackets(void)
 	tmp = text->curl;
 	start = text->curl;
 
-	test[0] = (unsigned char) tmp->line[text->curc];
-	test[1] = '\0';
+	test = (unsigned char) tmp->line[text->curc];
 	
 	d = check_bracket(test);
 	if (!d) /*  If not pri char */
 	{
-		test[0] = (unsigned char) tmp->line[text->curc-1];
-		test[1] = '\0';
+		test = (unsigned char) tmp->line[text->curc-1];
 		d = check_bracket(test);
 		if(!d) {
 			return; /*If the current char or prev is not a bracket then return*/
@@ -2896,8 +2752,7 @@ void do_brackets(void)
 		open = 1; 
 		while ( tmp ) {
 			while (pos <= tmp->len) {
-				test[0] = (unsigned char) tmp->line[pos];
-				test[1] = '\0';
+				test = (unsigned char) tmp->line[pos];
 				if(check_bracket(test) == d) {
 					open++;
 				} else if (check_bracket(test) == d+3) {
@@ -2923,8 +2778,7 @@ void do_brackets(void)
 		open = 1; 
 		while ( tmp ) {
 			while (pos >= 0) {
-				test[0] = (unsigned char) tmp->line[pos];
-				test[1] = '\0';
+				test = (unsigned char) tmp->line[pos];
 				if(check_bracket(test) == d) {
 					open++;
 				} else if (check_bracket(test) == d-3) {
@@ -2952,73 +2806,33 @@ void do_brackets(void)
 	
 }
 
-int check_bracket(char *string)
+static int check_bracket(char ch)
 {
-	int number, a = 0;
-	char other[][3] = {"(", "[", "{", ")", "]", "}"};
+	int a;
+	char brackets[] = "([{)]}";
 	
-	number = 6;
-	
-	while(a < number) {
-		if(strcmp(other[a], string) == 0)
-		{
-			return a+1;
-		}
-		a++;
-	}
-	return 0;
-}
-
-static int check_builtinfuncs(char *string) 
-{
-	int number = 30, a = 0;
-	
-	char builtinfuncs[][11] = {"and", "as", "assert", "break", "class", "continue", "def",
-								"del", "elif", "else", "except", "exec", "finally",
-								"for", "from", "global", "if", "import", "in",
-								"is", "lambda", "not", "or", "pass", "print",
-								"raise", "return", "try", "while", "yield"};
-
-	for( a = 0; a < number; a++) {
-		if(!strcmp(builtinfuncs[a], string))
-			return 1;
-	}
-	return 0;
-}
-
-static int check_specialvars(char *string) 
-{
-	int number = 2, a = 0;
-	char specialvars[][7] = {"def", "class"};
-	
-	for( a = 0; a < number; a++) {
-		if(!strcmp(specialvars[a], string))
+	for (a=0; a<6; a++) {
+		if(ch==brackets[a])
 			return a+1;
 	}
 	return 0;
 }
 
-static int check_delim(char *string) 
+static int check_delim(char ch) 
 {
-	int number = 28, a = 0;
-	char other[][3] = {"(", ")", ":", "\"", "\'", " ", "~", "!", "%", "^", "&", "*", "-", "+", "=", "[", "]", "{", "}", ";", "/", "<", ">", "|", ".", "#", "\t", ","};
+	int a;
+	char delims[] = "():\"\' ~!%^&*-+=[]{};/<>|.#\t,";
 	
-	for( a = 0; a < number; a++) {
-		if(!strcmp(other[a], string))
+	for (a=0; a<28; a++) {
+		if (ch==delims[a])
 			return 1;
 	}
 	return 0;
 }
 
-static int check_numbers(char *string)
-{
-	int number = 10, a = 0;
-	char other[][2] = {"0", "1", "2", "3", "4", "5", "6", "7", "8", "9"};
-	
-	for( a = 0; a < number; a++) {
-		if(!strcmp(other[a], string))
-			return 1;
-	}
+static int check_digit(char ch) {
+	if (ch < '0') return 0;
+	if (ch <= '9') return 1;
 	return 0;
 }
 
@@ -3042,7 +2856,7 @@ void convert_tabs (struct SpaceText *st, int tab)
 {
 	Text *text = st->text;
 	TextLine *tmp;
-	char *check_line, *new_line, *format;
+	char *check_line, *new_line;
 	int extra, number; //unknown for now
 	size_t a, j;
 	
@@ -3054,7 +2868,6 @@ void convert_tabs (struct SpaceText *st, int tab)
 	while(tmp) {
 		check_line = tmp->line;
 		new_line = MEM_mallocN(render_string(st, check_line)+1, "Converted_Line");
-		format = MEM_mallocN(render_string(st, check_line)+1, "Converted_Syntax_format");
 		j = 0;
 		for (a=0; a < strlen(check_line); a++) { //foreach char in line
 			if(check_line[a] == '\t') { //checking for tabs
@@ -3081,7 +2894,7 @@ void convert_tabs (struct SpaceText *st, int tab)
 		
 		tmp->line = new_line;
 		tmp->len = strlen(new_line);
-		tmp->format = format;
+		tmp->format = NULL;
 		tmp = tmp->next;
 	}
 	
@@ -3109,7 +2922,6 @@ void convert_tabs (struct SpaceText *st, int tab)
 			
 			if ( extra > 0 ) { //got tabs make malloc and do what you have to do
 				new_line = MEM_mallocN(strlen(check_line)-(((st->tabnumber*extra)-extra)-1), "Converted_Line");
-				format = MEM_mallocN(strlen(check_line)-(((st->tabnumber*extra)-extra)-1), "Converted_Syntax_format");
 				extra = 0; //reuse vars
 				for (a = 0; a < strlen(check_line); a++) {
 					number = 0;
@@ -3137,12 +2949,11 @@ void convert_tabs (struct SpaceText *st, int tab)
 				
 				tmp->line = new_line;
 				tmp->len = strlen(new_line);
-				tmp->format = format;
+				tmp->format = NULL;
 			}
 			tmp = tmp->next;
 		}
 	}
 
-	if (st->showsyntax)
-		get_format_string(st);
+	if (st->showsyntax) txt_format_text(st);
 }
diff --git a/source/blender/src/header_text.c b/source/blender/src/header_text.c
index ad9d906011d..2d3c1e116e6 100644
--- a/source/blender/src/header_text.c
+++ b/source/blender/src/header_text.c
@@ -129,7 +129,7 @@ void do_text_buttons(unsigned short event)
 				st->top= 0;
 				
 				pop_space_text(st);
-				if (st->showsyntax) get_format_string(st);
+				if (st->showsyntax) txt_format_text(st);
 				allqueue(REDRAWTEXT, 0);
 				allqueue(REDRAWHEADERS, 0);
 			}
@@ -195,14 +195,12 @@ void do_text_buttons(unsigned short event)
 
 		break;
 	case B_TAB_NUMBERS:
-		if (st->showsyntax) get_format_string(st);
+		if (st->showsyntax) txt_format_text(st);
 		allqueue(REDRAWTEXT, 0);
 		allqueue(REDRAWHEADERS, 0);
 		break;
 	case B_SYNTAX:
-		if (st->showsyntax) {
-			get_format_string(st);
-		}
+		if (st->showsyntax) txt_format_text(st);
 		allqueue(REDRAWTEXT, 0);
 		allqueue(REDRAWHEADERS, 0);
 		break;
@@ -304,7 +302,7 @@ static void do_text_filemenu(void *arg, int event)
 				if (!reopen_text(text)) {
 					error("Could not reopen file");
 				}
-			if (st->showsyntax) get_format_string(st);
+				if (st->showsyntax) txt_format_text(st);
 			}
 		break;
 	case 5:
@@ -399,7 +397,7 @@ static void do_text_editmenu(void *arg, int event)
 			break;
 		}
 		txt_paste_clipboard(text);
-		if (st->showsyntax) get_format_string(st);
+		if (st->showsyntax) txt_format_text(st);
 		break;
 	case 6:
 		txt_print_cutbuffer();
@@ -538,7 +536,7 @@ static void do_text_formatmenu(void *arg, int event)
 		if ( txt_has_sel(text)) {
 			txt_order_cursors(text);
 			comment(text);
-			if (st->showsyntax) get_format_string(st);
+			if (st->showsyntax) txt_format_text(st);
 			break;
 		}
 		break;
@@ -550,7 +548,7 @@ static void do_text_formatmenu(void *arg, int event)
 		if ( txt_has_sel(text)) {
 			txt_order_cursors(text);
 			uncomment(text);
-			if (st->showsyntax) get_format_string(st);
+			if (st->showsyntax) txt_format_text(st);
 			break;
 		}
 		break;

From 12f0fb1a42b54c5053a8cd0b0937ef1054283094 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Mon, 28 Jul 2008 11:54:13 +0000
Subject: [PATCH 155/252] Draw cursor at the leading edge of selection (as in
 other apps.) and hide cursor swapping from the user.

---
 source/blender/blenkernel/intern/text.c | 14 ++++++++++----
 source/blender/src/drawtext.c           | 10 +++++-----
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c
index 49e9a40bbb9..67beb4e4397 100644
--- a/source/blender/blenkernel/intern/text.c
+++ b/source/blender/blenkernel/intern/text.c
@@ -1712,7 +1712,6 @@ void txt_do_undo(Text *text)
 
 		case UNDO_SWAP:
 			txt_curs_swap(text);
-			txt_do_undo(text); /* swaps should appear transparent */
 			break;
 
 		case UNDO_DBLOCK:
@@ -1829,9 +1828,16 @@ void txt_do_undo(Text *text)
 	}
 
 	/* next undo step may need evaluating */
-	if (text->undo_pos>=0 && text->undo_buf[text->undo_pos] == UNDO_STO) {
-		txt_do_undo(text);
-		txt_do_redo(text); /* selections need restoring */
+	if (text->undo_pos>=0) {
+		switch (text->undo_buf[text->undo_pos]) {
+			case UNDO_STO:
+				txt_do_undo(text);
+				txt_do_redo(text); /* selections need restoring */
+				break;
+			case UNDO_SWAP:
+				txt_do_undo(text); /* swaps should appear transparent */
+				break;
+		}
 	}
 	
 	undoing= 0;	
diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index 02656c8d440..07c9b960e61 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -695,17 +695,17 @@ static void draw_cursor(SpaceText *st) {
 
 	}
 
-	/* Draw the cursor itself */
-	x= text_draw(st, text->curl->line, st->left, text->curc, 0, 0, 0, NULL);
+	/* Draw the cursor itself (we draw the sel. cursor as this is the leading edge) */
+	x= text_draw(st, text->sell->line, st->left, text->selc, 0, 0, 0, NULL);
 	
 	if (x) {
 		offl= offc= 0;
-		if (st->wordwrap) wrap_offset(st, text->curl, text->curc, &offl, &offc);
+		if (st->wordwrap) wrap_offset(st, text->sell, text->selc, &offl, &offc);
 		x += offc*spacetext_get_fontwidth(st);
-		h= txt_get_span(text->lines.first, text->curl) - st->top + offl;
+		h= txt_get_span(text->lines.first, text->sell) - st->top + offl;
 
 		if (st->overwrite) {
-			ch[0]= (unsigned char) text->curl->line[text->curc];
+			ch[0]= (unsigned char) text->sell->line[text->selc];
 			if (ch[0]=='\0') ch[0]=' ';
 			ch[1]= '\0';
 			w= BMF_GetStringWidth(spacetext_get_font(st), ch);

From c566867de91c66f889c0146ebe24fbbffb21e356 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Mon, 28 Jul 2008 15:03:58 +0000
Subject: [PATCH 156/252] Add automatic weight probagation between islands
 without any selected vertex. Makes it easier to do multi part meshes.

---
 source/blender/src/reeb.c | 236 ++++++++++++++++++++++++--------------
 1 file changed, 150 insertions(+), 86 deletions(-)

diff --git a/source/blender/src/reeb.c b/source/blender/src/reeb.c
index 0a3f81de8e6..728dc2d7996 100644
--- a/source/blender/src/reeb.c
+++ b/source/blender/src/reeb.c
@@ -2681,6 +2681,98 @@ EditEdge * NextEdgeForVert(EditMesh *em, EditVert *v)
 	return e;
 }
 
+void shortestPathsFromVert(EditMesh *em, EditVert *starting_vert, EditEdge **edges)
+{
+	EditVert *current_eve = NULL;
+	EditEdge *eed = NULL;
+	EditEdge *select_eed = NULL;
+	float	 current_weight = 0;
+	int 	 next_edge_index = 0;
+	int		 selected_edge_index = 0;
+	
+	current_eve = starting_vert;
+
+	/* Initialize edge flag */
+	for(eed= em->edges.first; eed; eed= eed->next)
+	{
+		eed->f1 = 0;
+	}
+	
+	do {
+		int i;
+		
+		current_eve->f1 = 1; /* mark vertex as selected */
+		
+		/* Add all new edges connected to current_eve to the list */
+		NextEdgeForVert(NULL, NULL); // Reset next edge
+		for(eed = NextEdgeForVert(em, current_eve); eed; eed = NextEdgeForVert(em, current_eve))
+		{ 
+			if (eed->f1 == 0)
+			{
+				edges[next_edge_index] = eed;
+				eed->f1 = 1;
+				next_edge_index++;
+			}
+		}
+		
+		/* Find next shortest edge */
+		select_eed = NULL;
+		for(i = 0; i < next_edge_index; i++)
+		{
+			eed = edges[i];
+			
+			if (eed->f1 != 2 && (eed->v1->f1 == 0 || eed->v2->f1 == 0)) /* eed is not selected yet and leads to a new node */
+			{
+				float new_weight = 0;
+				if (eed->v1->f1 == 1)
+				{
+					new_weight = eed->v1->tmp.fp + eed->tmp.fp;
+				}
+				else
+				{
+					new_weight = eed->v2->tmp.fp + eed->tmp.fp;
+				}
+				
+				if (select_eed == NULL || new_weight < current_weight) /* no selected edge or current smaller than selected */
+				{
+					current_weight = new_weight;
+					select_eed = eed;
+					selected_edge_index = i;
+				}
+			}
+			else
+			{
+				/* edge shouldn't be in list. Decrement next index and insert last edge in this place and reset iteration*/
+				next_edge_index--;
+				edges[i] = edges[next_edge_index];
+				i--;
+			}
+		}
+		
+		if (select_eed != NULL)
+		{
+			select_eed->f1 = 2;
+			
+			/* decrement next index and swap selected with last edge in list */
+			next_edge_index--;
+			edges[selected_edge_index] = edges[next_edge_index];
+			
+			if (select_eed->v1->f1 == 0) /* v1 is the new vertex */
+			{
+				current_eve = select_eed->v1;
+			}
+			else /* otherwise, it's v2 */
+			{
+				current_eve = select_eed->v2;
+			}				
+			current_eve->tmp.fp = current_weight;
+		}
+		
+	} while (select_eed != NULL);
+	
+	printf("\n");
+}
+
 int weightFromDistance(EditMesh *em)
 {
 	EditVert *eve;
@@ -2716,99 +2808,71 @@ int weightFromDistance(EditMesh *em)
 	}
 	else
 	{
-		EditVert *eve, *current_eve = NULL;
+		EditVert *eve;
+		EditEdge *eed;
+		EditEdge **edges;
+		int allDone = 0;
+	
+		/* Allocate scratch array for edges */
+		edges = MEM_callocN(totedge * sizeof(EditEdge*), "Edges");
+
+		/* Calculate edge weight */
+		for(eed = em->edges.first; eed; eed= eed->next)
+		{
+			eed->tmp.fp = VecLenf(eed->v1->co, eed->v2->co);
+		}
+
 		/* Apply dijkstra spf for each selected vert */
 		for(eve = em->verts.first; eve; eve = eve->next)
 		{
 			if (eve->f & SELECT)
 			{
-				current_eve = eve;
-				eve->f1 = 1;
-				
-				{
-					EditEdge *eed = NULL;
-					EditEdge *select_eed = NULL;
-					EditEdge **edges = NULL;
-					float	 currentWeight = 0;
-					int 	 eIndex = 0;
-					
-					edges = MEM_callocN(totedge * sizeof(EditEdge*), "Edges");
-					
-					/* Calculate edge weight and initialize edge flag */
-					for(eed= em->edges.first; eed; eed= eed->next)
-					{
-						eed->tmp.fp = VecLenf(eed->v1->co, eed->v2->co);
-						eed->f1 = 0;
-					}
-					
-					do {
-						int i;
-						
-						current_eve->f1 = 1; /* mark vertex as selected */
-						
-						/* Add all new edges connected to current_eve to the list */
-						NextEdgeForVert(NULL, NULL); // Reset next edge
-						for(eed = NextEdgeForVert(em, current_eve); eed; eed = NextEdgeForVert(em, current_eve))
-						{ 
-							if (eed->f1 == 0)
-							{
-								edges[eIndex] = eed;
-								eed->f1 = 1;
-								eIndex++;
-							}
-						}
-						
-						/* Find next shortest edge */
-						select_eed = NULL;
-						for(i = 0; i < eIndex; i++)
-						{
-							eed = edges[i];
-							
-							if (eed->f1 != 2 && (eed->v1->f1 == 0 || eed->v2->f1 == 0)) /* eed is not selected yet and leads to a new node */
-							{
-								float newWeight = 0;
-								if (eed->v1->f1 == 1)
-								{
-									newWeight = eed->v1->tmp.fp + eed->tmp.fp;
-								}
-								else
-								{
-									newWeight = eed->v2->tmp.fp + eed->tmp.fp;
-								}
-								
-								if (select_eed == NULL || newWeight < currentWeight) /* no selected edge or current smaller than selected */
-								{
-									currentWeight = newWeight;
-									select_eed = eed;
-								}
-							}
-						}
-						
-						if (select_eed != NULL)
-						{
-							select_eed->f1 = 2;
-							
-							if (select_eed->v1->f1 == 0) /* v1 is the new vertex */
-							{
-								current_eve = select_eed->v1;
-							}
-							else /* otherwise, it's v2 */
-							{
-								current_eve = select_eed->v2;
-							}				
-							current_eve->tmp.fp = currentWeight;
-						}
-						
-					printf("\redge %i / %i", eIndex, totedge);
-						
-					} while (select_eed != NULL);
-					
-					MEM_freeN(edges);
-					
-					printf("\n");
-				}
+				shortestPathsFromVert(em, eve, edges);				
 			}
 		}
+		
+		/* connect unselected islands */
+		while (allDone == 0)
+		{
+			EditVert *selected_eve = NULL;
+			float selected_weight = 0;
+			float min_distance = FLT_MAX;
+			
+			allDone = 1;
+			
+			for (eve = em->verts.first; eve; eve = eve->next)
+			{
+				if (eve->f1 != 1)
+				{
+					EditVert *closest_eve;
+					
+					for (closest_eve = em->verts.first; closest_eve; closest_eve = closest_eve->next)
+					{
+						/* vertex is already processed and distance is smaller than current minimum */
+						if (closest_eve->f1 == 1)
+						{
+							float distance = VecLenf(closest_eve->co, eve->co);
+							if (distance < min_distance)
+							{
+								min_distance = distance;
+								selected_eve = eve;
+								selected_weight = closest_eve->tmp.fp;
+							}
+						}
+					}
+				}
+			}
+			
+			if (selected_eve)
+			{
+				allDone = 0;
+
+				selected_eve->tmp.fp = selected_weight + min_distance;
+				shortestPathsFromVert(em, selected_eve, edges);
+			}
+		}
+		
+		MEM_freeN(edges);
 	}
 
 	for(eve = em->verts.first; eve && vCount == 0; eve = eve->next)

From fd327cb393b9aee8354b6df324386a3c30516469 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Mon, 28 Jul 2008 15:47:46 +0000
Subject: [PATCH 157/252] Word wrap fix: formatting and cursor positioning was
 not working correctly for wrapped lines containing tabs, or lines with no
 breaks.

---
 source/blender/src/drawtext.c | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index 07c9b960e61..725766b1222 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -97,7 +97,7 @@ All word-wrap functions follow the algorithm below to maintain consistency.
 				This equals region_width/font_width for the region
 	wrap_chars	Characters that allow wrapping. This equals [' ', '\t', '-']
 
-def wrap(line, view_width, wrap_chars):
+def wrap(line, view_width, wrap_chars, tab_size):
 	draw_start = 0
 	draw_end = view_width
 	tab_offset = 0
@@ -111,7 +111,7 @@ def wrap(line, view_width, wrap_chars):
 		elif c in wrap_chars:
 			draw_end = pos+1
 			if c == '\t':
-				tab_offset += tab_size-(pos-draw_start)%tab_size
+				tab_offset += tab_size-(pos-draw_start+tab_offset+1)%tab_size
 		pos += 1
 	print line[draw_start:]
 
@@ -574,7 +574,7 @@ static int get_wrap_points(SpaceText *st, char *line) {
 	return count;
 }
 
-/* Sets (offl, offc) to transform (line, curs) combination to its wrapped position */
+/* Sets (offl, offc) for transforming (line, curs) to its wrapped position */
 static void wrap_offset(SpaceText *st, TextLine *linein, int cursin, int *offl, int *offc) {
 	Text *text;
 	TextLine *linep;
@@ -603,8 +603,10 @@ static void wrap_offset(SpaceText *st, TextLine *linein, int cursin, int *offl,
 		*offc= 0;
 		for (i=0; linep->line[i]!='\0'; i++) {
 			if (i-start+taboffs>=max) {
+				if (end-start==max && linep==linein && i >= cursin)
+					break;
 				(*offl)++;
-				*offc -= end-start;
+				*offc -= end-start+taboffs;
 				start= end;
 				end += max;
 				taboffs= 0;
@@ -613,7 +615,7 @@ static void wrap_offset(SpaceText *st, TextLine *linein, int cursin, int *offl,
 				if (linep==linein && i >= cursin)
 					break;
 				else if (linep->line[i]=='\t')
-					taboffs += st->tabnumber-(i-start)%st->tabnumber;
+					taboffs += st->tabnumber-(i-start+taboffs+1)%st->tabnumber;
 			}
 		}
 		if (linep==linein) break;
@@ -1213,7 +1215,7 @@ void drawtextspace(ScrArea *sa, void *spacedata)
 {
 	SpaceText *st= curarea->spacedata.first;
 	Text *text;
-	int i, a, x, y, max, offs, len;
+	int i, a, x, y, max, len;
 	TextLine *tmp;
 	char linenr[12], *wrapbuf;
 	float col[3];
@@ -1258,7 +1260,7 @@ void drawtextspace(ScrArea *sa, void *spacedata)
 	max= get_wrap_width(st);
 	wrapbuf= MEM_mallocN(max+1, "wrapbuffer");
 
-	for (i=0; i<st->viewlines && tmp; i++, tmp= tmp->next) {
+	for (i=0; y>0 && i<st->viewlines && tmp; i++, tmp= tmp->next) {
 		if (st->showsyntax && !tmp->format) {
 			txt_format_line(st, tmp, 0);
 		}
@@ -1280,26 +1282,27 @@ void drawtextspace(ScrArea *sa, void *spacedata)
 			BMF_DrawString(spacetext_get_font(st), linenr);
 		}
 		if (st->wordwrap) {
-			int start, end, taboffs;
-			offs= 0;
+			int start, end, taboffs, fmtoffs;
 			len= tmp->len;
-			taboffs= start= 0; end= max;
+			fmtoffs= taboffs= start= 0;
+			end= max;
 			for (a=0; a<len; a++) {
 				if (a-start+taboffs>=max) {
 					strncpy(wrapbuf, tmp->line+start, end-start);
 					wrapbuf[end-start]= '\0';
-					text_draw(st, wrapbuf, st->left, 0, 1, x, y, tmp->format+start);
+					text_draw(st, wrapbuf, st->left, 0, 1, x, y, tmp->format+start+fmtoffs);
 					y -= st->lheight;
 					start= end;
 					end += max;
+					fmtoffs += taboffs;
 					taboffs= 0;
 				} else if (tmp->line[a]==' ' || tmp->line[a]=='\t' || tmp->line[a]=='-') {
 					if (tmp->line[a]=='\t')
-						taboffs += st->tabnumber-(a-start)%st->tabnumber;
+						taboffs += st->tabnumber-(a-start+taboffs+1)%st->tabnumber;
 					end = a+1;
 				}
 			}
-			text_draw(st, tmp->line+start, st->left, 0, 1, x, y, tmp->format+start);
+			text_draw(st, tmp->line+start, st->left, 0, 1, x, y, tmp->format+start+fmtoffs);
 		} else {
 			text_draw(st, tmp->line, st->left, 0, 1, x, y, tmp->format);
 		}

From e4677c409dcad94e96b2ae765422f91e0b0dd9fd Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Mon, 28 Jul 2008 22:53:42 +0000
Subject: [PATCH 158/252]  soc-2008-mxcurioni: add all predicate subclasses(
 BinaryPredicate1D, UnaryPredicate{0D,1D} ).

There is just one more class remaining to port (and probably the most important): Operators. After that, I'll be able to test whether Freestyle functions well without SWIG.
---
 .../intern/python/BPy_BinaryPredicate1D.cpp   |  34 ++++-
 .../intern/python/BPy_EdgeModifier.cpp        |   0
 .../intern/python/BPy_UnaryPredicate0D.cpp    |  21 ++-
 .../intern/python/BPy_UnaryPredicate1D.cpp    |  55 ++++++++
 .../BinaryPredicate1D/BPy_FalseBP1D.cpp       | 117 ++++++++++++++--
 .../python/BinaryPredicate1D/BPy_FalseBP1D.h  |  29 ++++
 .../BinaryPredicate1D/BPy_Length2DBP1D.cpp    | 117 ++++++++++++++--
 .../BinaryPredicate1D/BPy_Length2DBP1D.h      |  29 ++++
 .../BinaryPredicate1D/BPy_SameShapeIdBP1D.cpp | 117 ++++++++++++++--
 .../BinaryPredicate1D/BPy_SameShapeIdBP1D.h   |  29 ++++
 .../python/BinaryPredicate1D/BPy_TrueBP1D.cpp | 117 ++++++++++++++--
 .../python/BinaryPredicate1D/BPy_TrueBP1D.h   |  29 ++++
 .../BPy_ViewMapGradientNormBP1D.cpp           | 129 ++++++++++++++++--
 .../BPy_ViewMapGradientNormBP1D.h             |  29 ++++
 .../EdgeModifier/BPy_TimestampModifier.cpp    |   0
 .../python/UnaryPredicate0D/BPy_FalseUP0D.cpp | 113 +++++++++++++--
 .../python/UnaryPredicate0D/BPy_FalseUP0D.h   |  29 ++++
 .../python/UnaryPredicate0D/BPy_TrueUP0D.cpp  | 113 +++++++++++++--
 .../python/UnaryPredicate0D/BPy_TrueUP0D.h    |  29 ++++
 .../UnaryPredicate1D/BPy_ContourUP1D.cpp      | 117 ++++++++++++++--
 .../python/UnaryPredicate1D/BPy_ContourUP1D.h |  29 ++++
 .../BPy_DensityLowerThanUP1D.cpp              | 122 +++++++++++++++--
 .../BPy_DensityLowerThanUP1D.h                |  29 ++++
 .../BPy_EqualToChainingTimeStampUP1D.cpp      | 120 ++++++++++++++--
 .../BPy_EqualToChainingTimeStampUP1D.h        |  29 ++++
 .../BPy_EqualToTimeStampUP1D.cpp              | 120 ++++++++++++++--
 .../BPy_EqualToTimeStampUP1D.h                |  29 ++++
 .../BPy_ExternalContourUP1D.cpp               | 117 ++++++++++++++--
 .../BPy_ExternalContourUP1D.h                 |  29 ++++
 .../python/UnaryPredicate1D/BPy_FalseUP1D.cpp | 113 +++++++++++++--
 .../python/UnaryPredicate1D/BPy_FalseUP1D.h   |  29 ++++
 .../BPy_QuantitativeInvisibilityUP1D.cpp      | 120 ++++++++++++++--
 .../BPy_QuantitativeInvisibilityUP1D.h        |  29 ++++
 .../python/UnaryPredicate1D/BPy_ShapeUP1D.cpp | 120 ++++++++++++++--
 .../python/UnaryPredicate1D/BPy_ShapeUP1D.h   |  29 ++++
 .../python/UnaryPredicate1D/BPy_TrueUP1D.cpp  | 113 +++++++++++++--
 .../python/UnaryPredicate1D/BPy_TrueUP1D.h    |  29 ++++
 37 files changed, 2302 insertions(+), 157 deletions(-)
 delete mode 100644 source/blender/freestyle/intern/python/BPy_EdgeModifier.cpp
 create mode 100644 source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.h
 create mode 100644 source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.h
 create mode 100644 source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.h
 create mode 100644 source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.h
 create mode 100644 source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.h
 delete mode 100644 source/blender/freestyle/intern/python/EdgeModifier/BPy_TimestampModifier.cpp
 create mode 100644 source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_FalseUP0D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_TrueUP0D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.h
 create mode 100644 source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.h

diff --git a/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp
index 9dd2bd19204..545807fc277 100644
--- a/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp
@@ -3,6 +3,12 @@
 #include "BPy_Convert.h"
 #include "BPy_Interface1D.h"
 
+#include "BinaryPredicate1D/BPy_FalseBP1D.h"
+#include "BinaryPredicate1D/BPy_Length2DBP1D.h"
+#include "BinaryPredicate1D/BPy_SameShapeIdBP1D.h"
+#include "BinaryPredicate1D/BPy_TrueBP1D.h"
+#include "BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -116,9 +122,35 @@ PyMODINIT_FUNC BinaryPredicate1D_Init( PyObject *module )
 
 	if( PyType_Ready( &BinaryPredicate1D_Type ) < 0 )
 		return;
-
 	Py_INCREF( &BinaryPredicate1D_Type );
 	PyModule_AddObject(module, "BinaryPredicate1D", (PyObject *)&BinaryPredicate1D_Type);
+	
+	if( PyType_Ready( &FalseBP1D_Type ) < 0 )
+		return;
+	Py_INCREF( &FalseBP1D_Type );
+	PyModule_AddObject(module, "FalseBP1D", (PyObject *)&FalseBP1D_Type);
+	
+	if( PyType_Ready( &Length2DBP1D_Type ) < 0 )
+		return;
+	Py_INCREF( &Length2DBP1D_Type );
+	PyModule_AddObject(module, "Length2DBP1D", (PyObject *)&Length2DBP1D_Type);
+	
+	if( PyType_Ready( &SameShapeIdBP1D_Type ) < 0 )
+		return;
+	Py_INCREF( &SameShapeIdBP1D_Type );
+	PyModule_AddObject(module, "SameShapeIdBP1D", (PyObject *)&SameShapeIdBP1D_Type);
+	
+	if( PyType_Ready( &TrueBP1D_Type ) < 0 )
+		return;
+	Py_INCREF( &TrueBP1D_Type );
+	PyModule_AddObject(module, "TrueBP1D", (PyObject *)&TrueBP1D_Type);
+	
+	if( PyType_Ready( &ViewMapGradientNormBP1D_Type ) < 0 )
+		return;
+	Py_INCREF( &ViewMapGradientNormBP1D_Type );
+	PyModule_AddObject(module, "ViewMapGradientNormBP1D", (PyObject *)&ViewMapGradientNormBP1D_Type);
+	
+	
 }
 
 
diff --git a/source/blender/freestyle/intern/python/BPy_EdgeModifier.cpp b/source/blender/freestyle/intern/python/BPy_EdgeModifier.cpp
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp
index 3e5168e7da1..4fef63eae9b 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp
@@ -2,6 +2,8 @@
 
 #include "BPy_Convert.h"
 #include "Iterator/BPy_Interface0DIterator.h"
+#include "UnaryPredicate0D/BPy_FalseUP0D.h"
+#include "UnaryPredicate0D/BPy_TrueUP0D.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -14,13 +16,13 @@ static int UnaryPredicate0D___init__(BPy_UnaryPredicate0D *self, PyObject *args,
 static void UnaryPredicate0D___dealloc__(BPy_UnaryPredicate0D *self);
 static PyObject * UnaryPredicate0D___repr__(BPy_UnaryPredicate0D *self);
 
-static PyObject * UnaryPredicate0D_getName( BPy_UnaryPredicate0D *self, PyObject *args);
+static PyObject * UnaryPredicate0D_getName( BPy_UnaryPredicate0D *self );
 static PyObject * UnaryPredicate0D___call__( BPy_UnaryPredicate0D *self, PyObject *args);
 
 /*----------------------UnaryPredicate0D instance definitions ----------------------------*/
 static PyMethodDef BPy_UnaryPredicate0D_methods[] = {
-	{"getName", ( PyCFunction ) UnaryPredicate0D_getName, METH_NOARGS, ""},
-	{"__call__", ( PyCFunction ) UnaryPredicate0D___call__, METH_VARARGS, "" },
+	{"getName", ( PyCFunction ) UnaryPredicate0D_getName, METH_NOARGS, "Returns the string of the name of the UnaryPredicate0D."},
+	{"__call__", ( PyCFunction ) UnaryPredicate0D___call__, METH_VARARGS, "The () operator. Must be overload by inherited classes." },
 	{NULL, NULL, 0, NULL}
 };
 
@@ -119,6 +121,17 @@ PyMODINIT_FUNC UnaryPredicate0D_Init( PyObject *module )
 		return;
 	Py_INCREF( &UnaryPredicate0D_Type );
 	PyModule_AddObject(module, "UnaryPredicate0D", (PyObject *)&UnaryPredicate0D_Type);
+	
+	if( PyType_Ready( &FalseUP0D_Type ) < 0 )
+		return;
+	Py_INCREF( &FalseUP0D_Type );
+	PyModule_AddObject(module, "FalseUP0D", (PyObject *)&FalseUP0D_Type);
+	
+	if( PyType_Ready( &TrueUP0D_Type ) < 0 )
+		return;
+	Py_INCREF( &TrueUP0D_Type );
+	PyModule_AddObject(module, "TrueUP0D", (PyObject *)&TrueUP0D_Type);
+	
 }
 
 //------------------------INSTANCE METHODS ----------------------------------
@@ -142,7 +155,7 @@ PyObject * UnaryPredicate0D___repr__(BPy_UnaryPredicate0D* self)
 }
 
 
-PyObject * UnaryPredicate0D_getName( BPy_UnaryPredicate0D *self, PyObject *args)
+PyObject * UnaryPredicate0D_getName( BPy_UnaryPredicate0D *self )
 {
 	return PyString_FromString( self->up0D->getName().c_str() );
 }
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp
index 54731d75d7b..a13de77bbe9 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp
@@ -3,6 +3,16 @@
 #include "BPy_Convert.h"
 #include "BPy_Interface1D.h"
 
+#include "UnaryPredicate1D/BPy_ContourUP1D.h"
+#include "UnaryPredicate1D/BPy_DensityLowerThanUP1D.h"
+#include "UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.h"
+#include "UnaryPredicate1D/BPy_EqualToTimeStampUP1D.h"
+#include "UnaryPredicate1D/BPy_ExternalContourUP1D.h"
+#include "UnaryPredicate1D/BPy_FalseUP1D.h"
+#include "UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.h"
+#include "UnaryPredicate1D/BPy_ShapeUP1D.h"
+#include "UnaryPredicate1D/BPy_TrueUP1D.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -119,6 +129,51 @@ PyMODINIT_FUNC UnaryPredicate1D_Init( PyObject *module )
 		return;
 	Py_INCREF( &UnaryPredicate1D_Type );
 	PyModule_AddObject(module, "UnaryPredicate1D", (PyObject *)&UnaryPredicate1D_Type);
+	
+	if( PyType_Ready( &ContourUP1D_Type ) < 0 )
+		return;
+	Py_INCREF( &ContourUP1D_Type );
+	PyModule_AddObject(module, "ContourUP1D", (PyObject *)&ContourUP1D_Type);
+	
+	if( PyType_Ready( &DensityLowerThanUP1D_Type ) < 0 )
+		return;
+	Py_INCREF( &DensityLowerThanUP1D_Type );
+	PyModule_AddObject(module, "DensityLowerThanUP1D", (PyObject *)&DensityLowerThanUP1D_Type);
+	
+	if( PyType_Ready( &EqualToChainingTimeStampUP1D_Type ) < 0 )
+		return;
+	Py_INCREF( &EqualToChainingTimeStampUP1D_Type );
+	PyModule_AddObject(module, "EqualToChainingTimeStampUP1D", (PyObject *)&EqualToChainingTimeStampUP1D_Type);
+
+	if( PyType_Ready( &EqualToTimeStampUP1D_Type ) < 0 )
+		return;
+	Py_INCREF( &EqualToTimeStampUP1D_Type );
+	PyModule_AddObject(module, "EqualToTimeStampUP1D", (PyObject *)&EqualToTimeStampUP1D_Type);
+	
+	if( PyType_Ready( &ExternalContourUP1D_Type ) < 0 )
+		return;
+	Py_INCREF( &ExternalContourUP1D_Type );
+	PyModule_AddObject(module, "ExternalContourUP1D", (PyObject *)&ExternalContourUP1D_Type);
+	
+	if( PyType_Ready( &FalseUP1D_Type ) < 0 )
+		return;
+	Py_INCREF( &FalseUP1D_Type );
+	PyModule_AddObject(module, "FalseUP1D", (PyObject *)&FalseUP1D_Type);
+	
+	if( PyType_Ready( &QuantitativeInvisibilityUP1D_Type ) < 0 )
+		return;
+	Py_INCREF( &QuantitativeInvisibilityUP1D_Type );
+	PyModule_AddObject(module, "QuantitativeInvisibilityUP1D", (PyObject *)&QuantitativeInvisibilityUP1D_Type);
+	
+	if( PyType_Ready( &ShapeUP1D_Type ) < 0 )
+		return;
+	Py_INCREF( &ShapeUP1D_Type );
+	PyModule_AddObject(module, "ShapeUP1D", (PyObject *)&ShapeUP1D_Type);
+	
+	if( PyType_Ready( &TrueUP1D_Type ) < 0 )
+		return;
+	Py_INCREF( &TrueUP1D_Type );
+	PyModule_AddObject(module, "TrueUP1D", (PyObject *)&TrueUP1D_Type);
 }
 
 //------------------------INSTANCE METHODS ----------------------------------
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.cpp
index 1f1a1ec840b..dc127051da7 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.cpp
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.cpp
@@ -1,16 +1,109 @@
- PyObject *_wrap_FalseBP1D_getName(PyObject *self , PyObject *args) {
+#include "BPy_FalseBP1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for FalseBP1D instance  -----------*/
+	static int FalseBP1D___init__(BPy_FalseBP1D* self);
+
+/*-----------------------BPy_FalseBP1D type definition ------------------------------*/
+
+PyTypeObject FalseBP1D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"FalseBP1D",				/* tp_name */
+	sizeof( BPy_FalseBP1D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&BinaryPredicate1D_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)FalseBP1D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int FalseBP1D___init__( BPy_FalseBP1D* self )
+{
+	self->py_bp1D.bp1D = new Predicates1D::FalseBP1D();
+	return 0;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_FalseBP1D___call__(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_new_FalseBP1D(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_FalseBP1D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.h b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.h
new file mode 100644
index 00000000000..7e090fc92d3
--- /dev/null
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.h
@@ -0,0 +1,29 @@
+#ifndef FREESTYLE_PYTHON_FALSEBP1D_H
+#define FREESTYLE_PYTHON_FALSEBP1D_H
+
+#include "../BPy_BinaryPredicate1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject FalseBP1D_Type;
+
+#define BPy_FalseBP1D_Check(v)	(( (PyObject *) v)->ob_type == &FalseBP1D_Type)
+
+/*---------------------------Python BPy_FalseBP1D structure definition----------*/
+typedef struct {
+	BPy_BinaryPredicate1D py_bp1D;
+} BPy_FalseBP1D;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_FALSEBP1D_H */
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.cpp
index 402e59c3f29..4c1e62dc4c1 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.cpp
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.cpp
@@ -1,16 +1,109 @@
- PyObject *_wrap_Length2DBP1D_getName(PyObject *self , PyObject *args) {
+#include "BPy_Length2DBP1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for Length2DBP1D instance  -----------*/
+	static int Length2DBP1D___init__(BPy_Length2DBP1D* self);
+
+/*-----------------------BPy_Length2DBP1D type definition ------------------------------*/
+
+PyTypeObject Length2DBP1D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"Length2DBP1D",				/* tp_name */
+	sizeof( BPy_Length2DBP1D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&BinaryPredicate1D_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)Length2DBP1D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int Length2DBP1D___init__( BPy_Length2DBP1D* self )
+{
+	self->py_bp1D.bp1D = new Predicates1D::Length2DBP1D();
+	return 0;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_Length2DBP1D___call__(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_new_Length2DBP1D(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_Length2DBP1D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.h b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.h
new file mode 100644
index 00000000000..e499067d05e
--- /dev/null
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.h
@@ -0,0 +1,29 @@
+#ifndef FREESTYLE_PYTHON_LENGTH2DBP1D_H
+#define FREESTYLE_PYTHON_LENGTH2DBP1D_H
+
+#include "../BPy_BinaryPredicate1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject Length2DBP1D_Type;
+
+#define BPy_Length2DBP1D_Check(v)	(( (PyObject *) v)->ob_type == &Length2DBP1D_Type)
+
+/*---------------------------Python BPy_Length2DBP1D structure definition----------*/
+typedef struct {
+	BPy_BinaryPredicate1D py_bp1D;
+} BPy_Length2DBP1D;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_LENGTH2DBP1D_H */
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.cpp
index d980750bb33..82d047eba22 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.cpp
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.cpp
@@ -1,16 +1,109 @@
- PyObject *_wrap_SameShapeIdBP1D_getName(PyObject *self , PyObject *args) {
+#include "BPy_SameShapeIdBP1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for SameShapeIdBP1D instance  -----------*/
+	static int SameShapeIdBP1D___init__(BPy_SameShapeIdBP1D* self);
+
+/*-----------------------BPy_SameShapeIdBP1D type definition ------------------------------*/
+
+PyTypeObject SameShapeIdBP1D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"SameShapeIdBP1D",				/* tp_name */
+	sizeof( BPy_SameShapeIdBP1D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&BinaryPredicate1D_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)SameShapeIdBP1D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int SameShapeIdBP1D___init__( BPy_SameShapeIdBP1D* self )
+{
+	self->py_bp1D.bp1D = new Predicates1D::SameShapeIdBP1D();
+	return 0;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_SameShapeIdBP1D___call__(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_new_SameShapeIdBP1D(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_SameShapeIdBP1D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.h b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.h
new file mode 100644
index 00000000000..31e47040bcb
--- /dev/null
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.h
@@ -0,0 +1,29 @@
+#ifndef FREESTYLE_PYTHON_SAMESHAPEIDBP1D_H
+#define FREESTYLE_PYTHON_SAMESHAPEIDBP1D_H
+
+#include "../BPy_BinaryPredicate1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject SameShapeIdBP1D_Type;
+
+#define BPy_SameShapeIdBP1D_Check(v)	(( (PyObject *) v)->ob_type == &SameShapeIdBP1D_Type)
+
+/*---------------------------Python BPy_SameShapeIdBP1D structure definition----------*/
+typedef struct {
+	BPy_BinaryPredicate1D py_bp1D;
+} BPy_SameShapeIdBP1D;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_SAMESHAPEIDBP1D_H */
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.cpp
index 2afd2e163ea..02bbc20e66c 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.cpp
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.cpp
@@ -1,16 +1,109 @@
- PyObject *_wrap_TrueBP1D_getName(PyObject *self , PyObject *args) {
+#include "BPy_TrueBP1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for TrueBP1D instance  -----------*/
+	static int TrueBP1D___init__(BPy_TrueBP1D* self);
+
+/*-----------------------BPy_TrueBP1D type definition ------------------------------*/
+
+PyTypeObject TrueBP1D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"TrueBP1D",				/* tp_name */
+	sizeof( BPy_TrueBP1D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&BinaryPredicate1D_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)TrueBP1D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int TrueBP1D___init__( BPy_TrueBP1D* self )
+{
+	self->py_bp1D.bp1D = new Predicates1D::TrueBP1D();
+	return 0;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_TrueBP1D___call__(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_new_TrueBP1D(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_TrueBP1D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.h b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.h
new file mode 100644
index 00000000000..a975fe0b662
--- /dev/null
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.h
@@ -0,0 +1,29 @@
+#ifndef FREESTYLE_PYTHON_TRUEBP1D_H
+#define FREESTYLE_PYTHON_TRUEBP1D_H
+
+#include "../BPy_BinaryPredicate1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject TrueBP1D_Type;
+
+#define BPy_TrueBP1D_Check(v)	(( (PyObject *) v)->ob_type == &TrueBP1D_Type)
+
+/*---------------------------Python BPy_TrueBP1D structure definition----------*/
+typedef struct {
+	BPy_BinaryPredicate1D py_bp1D;
+} BPy_TrueBP1D;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_TRUEBP1D_H */
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.cpp
index 873acd93149..c565daed2e2 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.cpp
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.cpp
@@ -1,12 +1,125 @@
- PyObject *_wrap_ViewMapGradientNormBP1D_getName(PyObject *self , PyObject *args) {
+#include "BPy_ViewMapGradientNormBP1D.h"
+
+#include "../BPy_Convert.h"
+#include "../BPy_IntegrationType.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for ViewMapGradientNormBP1D instance  -----------*/
+	static int ViewMapGradientNormBP1D___init__(BPy_ViewMapGradientNormBP1D* self, PyObject *args );
+
+/*-----------------------BPy_ViewMapGradientNormBP1D type definition ------------------------------*/
+
+PyTypeObject ViewMapGradientNormBP1D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"ViewMapGradientNormBP1D",				/* tp_name */
+	sizeof( BPy_ViewMapGradientNormBP1D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&BinaryPredicate1D_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)ViewMapGradientNormBP1D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+//ViewMapGradientNormBP1D(int level, IntegrationType iType=MEAN, float sampling=2.0) 
+
+
+int ViewMapGradientNormBP1D___init__( BPy_ViewMapGradientNormBP1D* self, PyObject *args )
+{
+	int i;
+	PyObject *obj;
+	float f = 2.0;
+
+	if(!( PyArg_ParseTuple(args, "i|Of", &i, &obj) )) {
+		cout << "ERROR: ViewMapGradientNormBP1D___init__" << endl;		
+		return -1;
+	}
+	
+	IntegrationType t = ( obj && BPy_IntegrationType_Check(obj) ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
+	self->py_bp1D.bp1D = new Predicates1D::ViewMapGradientNormBP1D(i,t,f);
+	return 0;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_ViewMapGradientNormBP1D___call__(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_delete_ViewMapGradientNormBP1D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.h b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.h
new file mode 100644
index 00000000000..16fe71dee07
--- /dev/null
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.h
@@ -0,0 +1,29 @@
+#ifndef FREESTYLE_PYTHON_VIEWMAPGRADIENTNORMBP1D_H
+#define FREESTYLE_PYTHON_VIEWMAPGRADIENTNORMBP1D_H
+
+#include "../BPy_BinaryPredicate1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject ViewMapGradientNormBP1D_Type;
+
+#define BPy_ViewMapGradientNormBP1D_Check(v)	(( (PyObject *) v)->ob_type == &ViewMapGradientNormBP1D_Type)
+
+/*---------------------------Python BPy_ViewMapGradientNormBP1D structure definition----------*/
+typedef struct {
+	BPy_BinaryPredicate1D py_bp1D;
+} BPy_ViewMapGradientNormBP1D;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_VIEWMAPGRADIENTNORMBP1D_H */
diff --git a/source/blender/freestyle/intern/python/EdgeModifier/BPy_TimestampModifier.cpp b/source/blender/freestyle/intern/python/EdgeModifier/BPy_TimestampModifier.cpp
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_FalseUP0D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_FalseUP0D.cpp
index 53930660f3f..f4d48d4d36d 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_FalseUP0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_FalseUP0D.cpp
@@ -1,12 +1,109 @@
- PyObject *_wrap_FalseUP0D_getName(PyObject *self , PyObject *args) {
+#include "BPy_FalseUP0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for FalseUP0D instance  -----------*/
+	static int FalseUP0D___init__(BPy_FalseUP0D* self);
+
+/*-----------------------BPy_FalseUP0D type definition ------------------------------*/
+
+PyTypeObject FalseUP0D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"FalseUP0D",				/* tp_name */
+	sizeof( BPy_FalseUP0D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryPredicate0D_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)FalseUP0D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int FalseUP0D___init__( BPy_FalseUP0D* self )
+{
+	self->py_up0D.up0D = new Predicates0D::FalseUP0D();
+	return 0;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_FalseUP0D___call__(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_delete_FalseUP0D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_FalseUP0D.h b/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_FalseUP0D.h
new file mode 100644
index 00000000000..1cc043791c3
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_FalseUP0D.h
@@ -0,0 +1,29 @@
+#ifndef FREESTYLE_PYTHON_FALSEUP0D_H
+#define FREESTYLE_PYTHON_FALSEUP0D_H
+
+#include "../BPy_UnaryPredicate0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject FalseUP0D_Type;
+
+#define BPy_FalseUP0D_Check(v)	(( (PyObject *) v)->ob_type == &FalseUP0D_Type)
+
+/*---------------------------Python BPy_FalseUP0D structure definition----------*/
+typedef struct {
+	BPy_UnaryPredicate0D py_up0D;
+} BPy_FalseUP0D;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_FALSEUP0D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_TrueUP0D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_TrueUP0D.cpp
index 776e49b5d77..d0946157987 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_TrueUP0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_TrueUP0D.cpp
@@ -1,12 +1,109 @@
- PyObject *_wrap_TrueUP0D_getName(PyObject *self , PyObject *args) {
+#include "BPy_TrueUP0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for TrueUP0D instance  -----------*/
+	static int TrueUP0D___init__(BPy_TrueUP0D* self);
+
+/*-----------------------BPy_TrueUP0D type definition ------------------------------*/
+
+PyTypeObject TrueUP0D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"TrueUP0D",				/* tp_name */
+	sizeof( BPy_TrueUP0D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryPredicate0D_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)TrueUP0D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int TrueUP0D___init__( BPy_TrueUP0D* self )
+{
+	self->py_up0D.up0D = new Predicates0D::TrueUP0D();
+	return 0;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_TrueUP0D___call__(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_delete_TrueUP0D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_TrueUP0D.h b/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_TrueUP0D.h
new file mode 100644
index 00000000000..a05bff86a90
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_TrueUP0D.h
@@ -0,0 +1,29 @@
+#ifndef FREESTYLE_PYTHON_TRUEUP0D_H
+#define FREESTYLE_PYTHON_TRUEUP0D_H
+
+#include "../BPy_UnaryPredicate0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject TrueUP0D_Type;
+
+#define BPy_TrueUP0D_Check(v)	(( (PyObject *) v)->ob_type == &TrueUP0D_Type)
+
+/*---------------------------Python BPy_TrueUP0D structure definition----------*/
+typedef struct {
+	BPy_UnaryPredicate0D py_up0D;
+} BPy_TrueUP0D;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_TRUEUP0D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.cpp
index 89ba9f3f683..347cf2f56ee 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.cpp
@@ -1,16 +1,109 @@
- PyObject *_wrap_ContourUP1D_getName(PyObject *self , PyObject *args) {
+#include "BPy_ContourUP1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for ContourUP1D instance  -----------*/
+	static int ContourUP1D___init__(BPy_ContourUP1D* self);
+
+/*-----------------------BPy_ContourUP1D type definition ------------------------------*/
+
+PyTypeObject ContourUP1D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"ContourUP1D",				/* tp_name */
+	sizeof( BPy_ContourUP1D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryPredicate1D_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)ContourUP1D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int ContourUP1D___init__( BPy_ContourUP1D* self )
+{
+	self->py_up1D.up1D = new Predicates1D::ContourUP1D();
+	return 0;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_ContourUP1D___call__(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_new_ContourUP1D(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_ContourUP1D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.h
new file mode 100644
index 00000000000..30d71a0cd2c
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.h
@@ -0,0 +1,29 @@
+#ifndef FREESTYLE_PYTHON_CONTOURUP1D_H
+#define FREESTYLE_PYTHON_CONTOURUP1D_H
+
+#include "../BPy_UnaryPredicate1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject ContourUP1D_Type;
+
+#define BPy_ContourUP1D_Check(v)	(( (PyObject *) v)->ob_type == &ContourUP1D_Type)
+
+/*---------------------------Python BPy_ContourUP1D structure definition----------*/
+typedef struct {
+	BPy_UnaryPredicate1D py_up1D;
+} BPy_ContourUP1D;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_CONTOURUP1D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.cpp
index 664d73d59c1..04ee0903acd 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.cpp
@@ -1,12 +1,118 @@
- PyObject *_wrap_DensityLowerThanUP1D_getName(PyObject *self , PyObject *args) {
+#include "BPy_DensityLowerThanUP1D.h"
+
+#include "../../stroke/AdvancedPredicates1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for DensityLowerThanUP1D instance  -----------*/
+	static int DensityLowerThanUP1D___init__(BPy_DensityLowerThanUP1D* self, PyObject *args);
+
+/*-----------------------BPy_DensityLowerThanUP1D type definition ------------------------------*/
+
+PyTypeObject DensityLowerThanUP1D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"DensityLowerThanUP1D",				/* tp_name */
+	sizeof( BPy_DensityLowerThanUP1D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryPredicate1D_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)DensityLowerThanUP1D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int DensityLowerThanUP1D___init__( BPy_DensityLowerThanUP1D* self, PyObject *args )
+{
+	double d1, d2 = 2.0;
+
+	if( !PyArg_ParseTuple(args, "d|d", &d1, &d2) ) {
+		cout << "ERROR: DensityLowerThanUP1D___init__" << endl;		
+		return -1;
+	}
+	
+	self->py_up1D.up1D = new Predicates1D::DensityLowerThanUP1D(d1,d2);
+	return 0;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_DensityLowerThanUP1D___call__(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_delete_DensityLowerThanUP1D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.h
new file mode 100644
index 00000000000..a6e6fdcd81f
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.h
@@ -0,0 +1,29 @@
+#ifndef FREESTYLE_PYTHON_DENSITYLOWERTHANUP1D_H
+#define FREESTYLE_PYTHON_DENSITYLOWERTHANUP1D_H
+
+#include "../BPy_UnaryPredicate1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject DensityLowerThanUP1D_Type;
+
+#define BPy_DensityLowerThanUP1D_Check(v)	(( (PyObject *) v)->ob_type == &DensityLowerThanUP1D_Type)
+
+/*---------------------------Python BPy_DensityLowerThanUP1D structure definition----------*/
+typedef struct {
+	BPy_UnaryPredicate1D py_up1D;
+} BPy_DensityLowerThanUP1D;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_DENSITYLOWERTHANUP1D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.cpp
index 7cd9c17a99b..84ce5d39fab 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.cpp
@@ -1,12 +1,116 @@
- PyObject *_wrap_EqualToChainingTimeStampUP1D_getName(PyObject *self , PyObject *args) {
+#include "BPy_EqualToChainingTimeStampUP1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for EqualToChainingTimeStampUP1D instance  -----------*/
+	static int EqualToChainingTimeStampUP1D___init__(BPy_EqualToChainingTimeStampUP1D* self, PyObject *args );
+
+/*-----------------------BPy_EqualToChainingTimeStampUP1D type definition ------------------------------*/
+
+PyTypeObject EqualToChainingTimeStampUP1D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"EqualToChainingTimeStampUP1D",				/* tp_name */
+	sizeof( BPy_EqualToChainingTimeStampUP1D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryPredicate1D_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)EqualToChainingTimeStampUP1D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int EqualToChainingTimeStampUP1D___init__( BPy_EqualToChainingTimeStampUP1D* self, PyObject *args )
+{
+	unsigned u;
+
+	if( !PyArg_ParseTuple(args, "I", &u) ) {
+		cout << "ERROR: EqualToChainingTimeStampUP1D___init__" << endl;		
+		return -1;
+	}
+	
+	self->py_up1D.up1D = new Predicates1D::EqualToChainingTimeStampUP1D(u);
+	return 0;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_EqualToChainingTimeStampUP1D___call__(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_delete_EqualToChainingTimeStampUP1D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.h
new file mode 100644
index 00000000000..fa8d67d0ec6
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.h
@@ -0,0 +1,29 @@
+#ifndef FREESTYLE_PYTHON_EQUALTOCHAININGTIMESTAMPUP1D_H
+#define FREESTYLE_PYTHON_EQUALTOCHAININGTIMESTAMPUP1D_H
+
+#include "../BPy_UnaryPredicate1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject EqualToChainingTimeStampUP1D_Type;
+
+#define BPy_EqualToChainingTimeStampUP1D_Check(v)	(( (PyObject *) v)->ob_type == &EqualToChainingTimeStampUP1D_Type)
+
+/*---------------------------Python BPy_EqualToChainingTimeStampUP1D structure definition----------*/
+typedef struct {
+	BPy_UnaryPredicate1D py_up1D;
+} BPy_EqualToChainingTimeStampUP1D;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_EQUALTOCHAININGTIMESTAMPUP1D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.cpp
index d6925dd2b44..2d248257893 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.cpp
@@ -1,12 +1,116 @@
- PyObject *_wrap_EqualToTimeStampUP1D_getName(PyObject *self , PyObject *args) {
+#include "BPy_EqualToTimeStampUP1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for EqualToTimeStampUP1D instance  -----------*/
+	static int EqualToTimeStampUP1D___init__(BPy_EqualToTimeStampUP1D* self, PyObject *args );
+
+/*-----------------------BPy_EqualToTimeStampUP1D type definition ------------------------------*/
+
+PyTypeObject EqualToTimeStampUP1D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"EqualToTimeStampUP1D",				/* tp_name */
+	sizeof( BPy_EqualToTimeStampUP1D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryPredicate1D_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)EqualToTimeStampUP1D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int EqualToTimeStampUP1D___init__( BPy_EqualToTimeStampUP1D* self, PyObject *args )
+{
+	unsigned u;
+
+	if( !PyArg_ParseTuple(args, "I", &u) ) {
+		cout << "ERROR: EqualToTimeStampUP1D___init__" << endl;		
+		return -1;
+	}
+	
+	self->py_up1D.up1D = new Predicates1D::EqualToTimeStampUP1D(u);
+	return 0;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_EqualToTimeStampUP1D___call__(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_delete_EqualToTimeStampUP1D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.h
new file mode 100644
index 00000000000..6de9927d7ad
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.h
@@ -0,0 +1,29 @@
+#ifndef FREESTYLE_PYTHON_EQUALTOTIMESTAMPUP1D_H
+#define FREESTYLE_PYTHON_EQUALTOTIMESTAMPUP1D_H
+
+#include "../BPy_UnaryPredicate1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject EqualToTimeStampUP1D_Type;
+
+#define BPy_EqualToTimeStampUP1D_Check(v)	(( (PyObject *) v)->ob_type == &EqualToTimeStampUP1D_Type)
+
+/*---------------------------Python BPy_EqualToTimeStampUP1D structure definition----------*/
+typedef struct {
+	BPy_UnaryPredicate1D py_up1D;
+} BPy_EqualToTimeStampUP1D;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_EQUALTOTIMESTAMPUP1D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.cpp
index 9107f0fe326..e3708d43a2c 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.cpp
@@ -1,16 +1,109 @@
- PyObject *_wrap_ExternalContourUP1D_getName(PyObject *self , PyObject *args) {
+#include "BPy_ExternalContourUP1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for ExternalContourUP1D instance  -----------*/
+	static int ExternalContourUP1D___init__(BPy_ExternalContourUP1D* self);
+
+/*-----------------------BPy_ExternalContourUP1D type definition ------------------------------*/
+
+PyTypeObject ExternalContourUP1D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"ExternalContourUP1D",				/* tp_name */
+	sizeof( BPy_ExternalContourUP1D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryPredicate1D_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)ExternalContourUP1D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int ExternalContourUP1D___init__( BPy_ExternalContourUP1D* self )
+{
+	self->py_up1D.up1D = new Predicates1D::ExternalContourUP1D();
+	return 0;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_ExternalContourUP1D___call__(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_new_ExternalContourUP1D(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_ExternalContourUP1D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.h
new file mode 100644
index 00000000000..0d35f05bc7b
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.h
@@ -0,0 +1,29 @@
+#ifndef FREESTYLE_PYTHON_EXTERNALCONTOURUP1D_H
+#define FREESTYLE_PYTHON_EXTERNALCONTOURUP1D_H
+
+#include "../BPy_UnaryPredicate1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject ExternalContourUP1D_Type;
+
+#define BPy_ExternalContourUP1D_Check(v)	(( (PyObject *) v)->ob_type == &ExternalContourUP1D_Type)
+
+/*---------------------------Python BPy_ExternalContourUP1D structure definition----------*/
+typedef struct {
+	BPy_UnaryPredicate1D py_up1D;
+} BPy_ExternalContourUP1D;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_EXTERNALCONTOURUP1D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.cpp
index 6164463a3af..4ad54138002 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.cpp
@@ -1,12 +1,109 @@
- PyObject *_wrap_FalseUP1D_getName(PyObject *self , PyObject *args) {
+#include "BPy_FalseUP1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for FalseUP1D instance  -----------*/
+	static int FalseUP1D___init__(BPy_FalseUP1D* self);
+
+/*-----------------------BPy_FalseUP1D type definition ------------------------------*/
+
+PyTypeObject FalseUP1D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"FalseUP1D",				/* tp_name */
+	sizeof( BPy_FalseUP1D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryPredicate1D_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)FalseUP1D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int FalseUP1D___init__( BPy_FalseUP1D* self )
+{
+	self->py_up1D.up1D = new Predicates1D::FalseUP1D();
+	return 0;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_FalseUP1D___call__(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_delete_FalseUP1D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.h
new file mode 100644
index 00000000000..c406a926526
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.h
@@ -0,0 +1,29 @@
+#ifndef FREESTYLE_PYTHON_FALSEUP1D_H
+#define FREESTYLE_PYTHON_FALSEUP1D_H
+
+#include "../BPy_UnaryPredicate1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject FalseUP1D_Type;
+
+#define BPy_FalseUP1D_Check(v)	(( (PyObject *) v)->ob_type == &FalseUP1D_Type)
+
+/*---------------------------Python BPy_FalseUP1D structure definition----------*/
+typedef struct {
+	BPy_UnaryPredicate1D py_up1D;
+} BPy_FalseUP1D;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_FALSEUP1D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.cpp
index fc538008446..000760b5b00 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.cpp
@@ -1,12 +1,116 @@
- PyObject *_wrap_QuantitativeInvisibilityUP1D_getName(PyObject *self , PyObject *args) {
+#include "BPy_QuantitativeInvisibilityUP1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for QuantitativeInvisibilityUP1D instance  -----------*/
+	static int QuantitativeInvisibilityUP1D___init__(BPy_QuantitativeInvisibilityUP1D* self, PyObject *args );
+
+/*-----------------------BPy_QuantitativeInvisibilityUP1D type definition ------------------------------*/
+
+PyTypeObject QuantitativeInvisibilityUP1D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"QuantitativeInvisibilityUP1D",				/* tp_name */
+	sizeof( BPy_QuantitativeInvisibilityUP1D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryPredicate1D_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)QuantitativeInvisibilityUP1D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int QuantitativeInvisibilityUP1D___init__( BPy_QuantitativeInvisibilityUP1D* self, PyObject *args )
+{
+	int i = 0;
+
+	if( !PyArg_ParseTuple(args, "|i", &i) ) {
+		cout << "ERROR: QuantitativeInvisibilityUP1D___init__" << endl;		
+		return -1;
+	}
+	
+	self->py_up1D.up1D = new Predicates1D::QuantitativeInvisibilityUP1D(i);
+	return 0;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_QuantitativeInvisibilityUP1D___call__(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_delete_QuantitativeInvisibilityUP1D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.h
new file mode 100644
index 00000000000..676bfc00715
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.h
@@ -0,0 +1,29 @@
+#ifndef FREESTYLE_PYTHON_QUANTITATIVEINVISIBILITYUP1D_H
+#define FREESTYLE_PYTHON_QUANTITATIVEINVISIBILITYUP1D_H
+
+#include "../BPy_UnaryPredicate1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject QuantitativeInvisibilityUP1D_Type;
+
+#define BPy_QuantitativeInvisibilityUP1D_Check(v)	(( (PyObject *) v)->ob_type == &QuantitativeInvisibilityUP1D_Type)
+
+/*---------------------------Python BPy_QuantitativeInvisibilityUP1D structure definition----------*/
+typedef struct {
+	BPy_UnaryPredicate1D py_up1D;
+} BPy_QuantitativeInvisibilityUP1D;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_QUANTITATIVEINVISIBILITYUP1D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.cpp
index 4ec5cc13b3a..9e5312275bf 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.cpp
@@ -1,12 +1,116 @@
- PyObject *_wrap_ShapeUP1D_getName(PyObject *self , PyObject *args) {
+#include "BPy_ShapeUP1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for ShapeUP1D instance  -----------*/
+	static int ShapeUP1D___init__(BPy_ShapeUP1D* self, PyObject *args );
+
+/*-----------------------BPy_ShapeUP1D type definition ------------------------------*/
+
+PyTypeObject ShapeUP1D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"ShapeUP1D",				/* tp_name */
+	sizeof( BPy_ShapeUP1D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryPredicate1D_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)ShapeUP1D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int ShapeUP1D___init__( BPy_ShapeUP1D* self, PyObject *args )
+{
+	unsigned u1, u2 = 0;
+
+	if( !PyArg_ParseTuple(args, "II", &u1, &u2) ) {
+		cout << "ERROR: ShapeUP1D___init__" << endl;		
+		return -1;
+	}
+
+	self->py_up1D.up1D = new Predicates1D::ShapeUP1D(u1,u2);
+	return 0;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_ShapeUP1D___call__(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_delete_ShapeUP1D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.h
new file mode 100644
index 00000000000..0da88d959bc
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.h
@@ -0,0 +1,29 @@
+#ifndef FREESTYLE_PYTHON_SHAPEUP1D_H
+#define FREESTYLE_PYTHON_SHAPEUP1D_H
+
+#include "../BPy_UnaryPredicate1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject ShapeUP1D_Type;
+
+#define BPy_ShapeUP1D_Check(v)	(( (PyObject *) v)->ob_type == &ShapeUP1D_Type)
+
+/*---------------------------Python BPy_ShapeUP1D structure definition----------*/
+typedef struct {
+	BPy_UnaryPredicate1D py_up1D;
+} BPy_ShapeUP1D;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_SHAPEUP1D_H */
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.cpp
index 7c8e0a6239d..a496a85f756 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.cpp
@@ -1,12 +1,109 @@
- PyObject *_wrap_TrueUP1D_getName(PyObject *self , PyObject *args) {
+#include "BPy_TrueUP1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for TrueUP1D instance  -----------*/
+	static int TrueUP1D___init__(BPy_TrueUP1D* self);
+
+/*-----------------------BPy_TrueUP1D type definition ------------------------------*/
+
+PyTypeObject TrueUP1D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"TrueUP1D",				/* tp_name */
+	sizeof( BPy_TrueUP1D ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,										/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&UnaryPredicate1D_Type,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)TrueUP1D___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,				/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int TrueUP1D___init__( BPy_TrueUP1D* self )
+{
+	self->py_up1D.up1D = new Predicates1D::TrueUP1D();
+	return 0;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
- PyObject *_wrap_TrueUP1D___call__(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
-
-
- PyObject *_wrap_delete_TrueUP1D(PyObject *self , PyObject *args) {
-}
-
-
+#endif
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.h
new file mode 100644
index 00000000000..b30b7232076
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.h
@@ -0,0 +1,29 @@
+#ifndef FREESTYLE_PYTHON_TRUEUP1D_H
+#define FREESTYLE_PYTHON_TRUEUP1D_H
+
+#include "../BPy_UnaryPredicate1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject TrueUP1D_Type;
+
+#define BPy_TrueUP1D_Check(v)	(( (PyObject *) v)->ob_type == &TrueUP1D_Type)
+
+/*---------------------------Python BPy_TrueUP1D structure definition----------*/
+typedef struct {
+	BPy_UnaryPredicate1D py_up1D;
+} BPy_TrueUP1D;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_TRUEUP1D_H */

From db6388e0f2b1e03ff280615fb96b93c565c9b22a Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Tue, 29 Jul 2008 05:45:16 +0000
Subject: [PATCH 159/252] soc-2008-mxcurioni: finished porting the Freestyle
 API. All of the original classes, except EdgeModifier and TimestampModifier
 (which aren't even ported via SWIG), are available under the
 Blender.Freestyle module. Testing of the porting will now begin to make sure
 the SWIG-less system works as the original.

Quite a few modifications were made to finish the API:
- Freestyle's SConscript was modified to catch all files within the intern/python directory, allowing integration of future shaders implemented in C++.
- the Operators class was ported, with a special care of making its methods static (using the METH_STATIC flag in the tp_methods method definitions)
- all of the type-checking functions [ BPy_[class name]_Check(obj) ] were changed to allow subclasses to be seen as that type too: instead on looking at the ob_type value, the PyObject_IsInstance function is used.
- all of the iterators can now retrieve the object pointed to by the operator, using the getObject() method. A directedViewEdge pair is returned as a list of the two elements in the pair.
- all of the style modules were copied to a style_modules_blender/ folder and were modified to use Freestyle as a Blender's submodule. IntegrationType and MediumType was also integrated (for example, changing MEAN to IntegrationType.MEAN).

Testing now begins. If everything works correctly, I'll move on to lib3ds removal right away.
---
 source/blender/freestyle/SConscript           |  145 +-
 .../freestyle/intern/python/BPy_BBox.h        |    2 +-
 .../intern/python/BPy_BinaryPredicate0D.h     |    2 +-
 .../intern/python/BPy_BinaryPredicate1D.h     |    2 +-
 .../freestyle/intern/python/BPy_Convert.cpp   |  134 +-
 .../freestyle/intern/python/BPy_Convert.h     |   30 +-
 .../freestyle/intern/python/BPy_Freestyle.cpp |    2 +
 .../freestyle/intern/python/BPy_Freestyle.h   |    2 +-
 .../freestyle/intern/python/BPy_FrsMaterial.h |    2 +-
 .../blender/freestyle/intern/python/BPy_Id.h  |    2 +-
 .../intern/python/BPy_IntegrationType.h       |    2 +-
 .../freestyle/intern/python/BPy_Interface0D.h |    2 +-
 .../freestyle/intern/python/BPy_Interface1D.h |    2 +-
 .../freestyle/intern/python/BPy_Iterator.cpp  |    6 +
 .../freestyle/intern/python/BPy_Iterator.h    |    2 +-
 .../freestyle/intern/python/BPy_MediumType.h  |    2 +-
 .../freestyle/intern/python/BPy_Nature.h      |    2 +-
 .../freestyle/intern/python/BPy_Noise.h       |    2 +-
 .../freestyle/intern/python/BPy_Operators.cpp |  299 +++-
 .../freestyle/intern/python/BPy_Operators.h   |   34 +
 .../freestyle/intern/python/BPy_SShape.h      |    2 +-
 .../intern/python/BPy_StrokeAttribute.h       |    2 +-
 .../intern/python/BPy_StrokeShader.h          |    2 +-
 .../intern/python/BPy_UnaryFunction0D.h       |    2 +-
 .../intern/python/BPy_UnaryFunction1D.h       |    2 +-
 .../intern/python/BPy_UnaryPredicate0D.h      |    2 +-
 .../intern/python/BPy_UnaryPredicate1D.h      |    2 +-
 .../freestyle/intern/python/BPy_ViewMap.h     |    2 +-
 .../freestyle/intern/python/BPy_ViewShape.h   |    2 +-
 .../python/BinaryPredicate1D/BPy_FalseBP1D.h  |    2 +-
 .../BinaryPredicate1D/BPy_Length2DBP1D.h      |    2 +-
 .../BinaryPredicate1D/BPy_SameShapeIdBP1D.h   |    2 +-
 .../python/BinaryPredicate1D/BPy_TrueBP1D.h   |    2 +-
 .../BPy_ViewMapGradientNormBP1D.h             |    2 +-
 .../python/Interface0D/BPy_CurvePoint.h       |    2 +-
 .../intern/python/Interface0D/BPy_SVertex.h   |    2 +-
 .../python/Interface0D/BPy_ViewVertex.h       |    2 +-
 .../Interface0D/CurvePoint/BPy_StrokeVertex.h |    2 +-
 .../Interface0D/ViewVertex/BPy_NonTVertex.h   |    2 +-
 .../Interface0D/ViewVertex/BPy_TVertex.h      |    2 +-
 .../intern/python/Interface1D/BPy_Curve.h     |    2 +-
 .../intern/python/Interface1D/BPy_FEdge.h     |    2 +-
 .../intern/python/Interface1D/BPy_ViewEdge.h  |    2 +-
 .../python/Interface1D/Curve/BPy_Chain.h      |    2 +-
 .../python/Interface1D/FEdge/BPy_FEdgeSharp.h |    2 +-
 .../Interface1D/FEdge/BPy_FEdgeSmooth.h       |    2 +-
 .../python/Iterator/BPy_AdjacencyIterator.cpp |   13 +
 .../python/Iterator/BPy_AdjacencyIterator.h   |    2 +-
 .../Iterator/BPy_ChainPredicateIterator.h     |    2 +-
 .../Iterator/BPy_ChainSilhouetteIterator.h    |    2 +-
 .../python/Iterator/BPy_ChainingIterator.cpp  |   10 +
 .../python/Iterator/BPy_ChainingIterator.h    |    2 +-
 .../Iterator/BPy_CurvePointIterator.cpp       |    7 +
 .../python/Iterator/BPy_CurvePointIterator.h  |    2 +-
 .../Iterator/BPy_Interface0DIterator.cpp      |   10 +
 .../python/Iterator/BPy_Interface0DIterator.h |    2 +-
 .../python/Iterator/BPy_SVertexIterator.cpp   |    9 +
 .../python/Iterator/BPy_SVertexIterator.h     |    2 +-
 .../Iterator/BPy_StrokeVertexIterator.cpp     |    9 +
 .../Iterator/BPy_StrokeVertexIterator.h       |    2 +-
 .../python/Iterator/BPy_ViewEdgeIterator.cpp  |   12 +
 .../python/Iterator/BPy_ViewEdgeIterator.h    |    2 +-
 .../Iterator/BPy_orientedViewEdgeIterator.cpp |   13 +-
 .../Iterator/BPy_orientedViewEdgeIterator.h   |    2 +-
 .../BPy_BackboneStretcherShader.h             |    2 +-
 .../StrokeShader/BPy_BezierCurveShader.h      |    2 +-
 .../StrokeShader/BPy_CalligraphicShader.h     |    2 +-
 .../StrokeShader/BPy_ColorNoiseShader.h       |    2 +-
 .../BPy_ColorVariationPatternShader.h         |    2 +-
 .../StrokeShader/BPy_ConstantColorShader.h    |    2 +-
 .../BPy_ConstantThicknessShader.h             |    2 +-
 ...BPy_ConstrainedIncreasingThicknessShader.h |    2 +-
 .../StrokeShader/BPy_GuidingLinesShader.h     |    2 +-
 .../StrokeShader/BPy_IncreasingColorShader.h  |    2 +-
 .../BPy_IncreasingThicknessShader.h           |    2 +-
 .../StrokeShader/BPy_PolygonalizationShader.h |    2 +-
 .../python/StrokeShader/BPy_SamplingShader.h  |    2 +-
 .../StrokeShader/BPy_SpatialNoiseShader.h     |    2 +-
 .../StrokeShader/BPy_StrokeTextureShader.h    |    2 +-
 .../StrokeShader/BPy_TextureAssignerShader.h  |    2 +-
 .../StrokeShader/BPy_ThicknessNoiseShader.h   |    2 +-
 .../BPy_ThicknessVariationPatternShader.h     |    2 +-
 .../StrokeShader/BPy_TipRemoverShader.h       |    2 +-
 .../python/StrokeShader/BPy_fstreamShader.h   |    2 +-
 .../python/StrokeShader/BPy_streamShader.h    |    2 +-
 .../BPy_UnaryFunction0DDouble.h               |    2 +-
 .../BPy_UnaryFunction0DEdgeNature.h           |    2 +-
 .../BPy_UnaryFunction0DFloat.h                |    2 +-
 .../UnaryFunction0D/BPy_UnaryFunction0DId.h   |    2 +-
 .../BPy_UnaryFunction0DMaterial.h             |    2 +-
 .../BPy_UnaryFunction0DUnsigned.h             |    2 +-
 .../BPy_UnaryFunction0DVec2f.h                |    2 +-
 .../BPy_UnaryFunction0DVec3f.h                |    2 +-
 .../BPy_UnaryFunction0DVectorViewShape.h      |    2 +-
 .../BPy_UnaryFunction0DViewShape.h            |    2 +-
 .../UnaryFunction0D_Id/BPy_ShapeIdF0D.h       |    2 +-
 .../BPy_MaterialF0D.h                         |    2 +-
 .../BPy_CurveNatureF0D.h                      |    2 +-
 .../UnaryFunction0D_Vec2f/BPy_Normal2DF0D.h   |    2 +-
 .../BPy_VertexOrientation2DF0D.h              |    2 +-
 .../BPy_VertexOrientation3DF0D.h              |    2 +-
 .../BPy_GetOccludeeF0D.h                      |    2 +-
 .../BPy_GetShapeF0D.h                         |    2 +-
 .../BPy_Curvature2DAngleF0D.h                 |    2 +-
 .../UnaryFunction0D_double/BPy_DensityF0D.h   |    2 +-
 .../BPy_GetProjectedXF0D.h                    |    2 +-
 .../BPy_GetProjectedYF0D.h                    |    2 +-
 .../BPy_GetProjectedZF0D.h                    |    2 +-
 .../UnaryFunction0D_double/BPy_GetXF0D.h      |    2 +-
 .../UnaryFunction0D_double/BPy_GetYF0D.h      |    2 +-
 .../UnaryFunction0D_double/BPy_GetZF0D.h      |    2 +-
 .../BPy_LocalAverageDepthF0D.h                |    2 +-
 .../BPy_ZDiscontinuityF0D.h                   |    2 +-
 .../BPy_GetCurvilinearAbscissaF0D.h           |    2 +-
 .../BPy_GetParameterF0D.h                     |    2 +-
 .../BPy_GetViewMapGradientNormF0D.h           |    2 +-
 .../BPy_ReadCompleteViewMapPixelF0D.h         |    2 +-
 .../BPy_ReadMapPixelF0D.h                     |    2 +-
 .../BPy_ReadSteerableViewMapPixelF0D.h        |    2 +-
 .../BPy_QuantitativeInvisibilityF0D.h         |    2 +-
 .../BPy_GetOccludersF0D.h                     |    2 +-
 .../BPy_UnaryFunction1DDouble.h               |    2 +-
 .../BPy_UnaryFunction1DEdgeNature.h           |    2 +-
 .../BPy_UnaryFunction1DFloat.h                |    2 +-
 .../BPy_UnaryFunction1DUnsigned.h             |    2 +-
 .../BPy_UnaryFunction1DVec2f.h                |    2 +-
 .../BPy_UnaryFunction1DVec3f.h                |    2 +-
 .../BPy_UnaryFunction1DVectorViewShape.h      |    2 +-
 .../UnaryFunction1D/BPy_UnaryFunction1DVoid.h |    2 +-
 .../BPy_CurveNatureF1D.h                      |    2 +-
 .../UnaryFunction1D_Vec2f/BPy_Normal2DF1D.h   |    2 +-
 .../BPy_Orientation2DF1D.h                    |    2 +-
 .../BPy_Orientation3DF1D.h                    |    2 +-
 .../BPy_Curvature2DAngleF1D.h                 |    2 +-
 .../UnaryFunction1D_double/BPy_DensityF1D.h   |    2 +-
 .../BPy_GetCompleteViewMapDensityF1D.h        |    2 +-
 .../BPy_GetDirectionalViewMapDensityF1D.h     |    2 +-
 .../BPy_GetProjectedXF1D.h                    |    2 +-
 .../BPy_GetProjectedYF1D.h                    |    2 +-
 .../BPy_GetProjectedZF1D.h                    |    2 +-
 .../BPy_GetSteerableViewMapDensityF1D.h       |    3 +-
 .../BPy_GetViewMapGradientNormF1D.h           |    2 +-
 .../UnaryFunction1D_double/BPy_GetXF1D.h      |    2 +-
 .../UnaryFunction1D_double/BPy_GetYF1D.h      |    2 +-
 .../UnaryFunction1D_double/BPy_GetZF1D.h      |    2 +-
 .../BPy_LocalAverageDepthF1D.h                |    2 +-
 .../BPy_ZDiscontinuityF1D.h                   |    2 +-
 .../BPy_QuantitativeInvisibilityF1D.h         |    2 +-
 .../BPy_GetOccludeeF1D.h                      |    2 +-
 .../BPy_GetOccludersF1D.h                     |    2 +-
 .../BPy_GetShapeF1D.h                         |    2 +-
 .../BPy_ChainingTimeStampF1D.h                |    2 +-
 .../BPy_IncrementChainingTimeStampF1D.h       |    2 +-
 .../UnaryFunction1D_void/BPy_TimeStampF1D.h   |    2 +-
 .../python/UnaryPredicate0D/BPy_FalseUP0D.h   |    2 +-
 .../python/UnaryPredicate0D/BPy_TrueUP0D.h    |    2 +-
 .../python/UnaryPredicate1D/BPy_ContourUP1D.h |    2 +-
 .../BPy_DensityLowerThanUP1D.h                |    2 +-
 .../BPy_EqualToChainingTimeStampUP1D.h        |    2 +-
 .../BPy_EqualToTimeStampUP1D.h                |    2 +-
 .../BPy_ExternalContourUP1D.h                 |    2 +-
 .../python/UnaryPredicate1D/BPy_FalseUP1D.h   |    2 +-
 .../BPy_QuantitativeInvisibilityUP1D.h        |    2 +-
 .../python/UnaryPredicate1D/BPy_ShapeUP1D.h   |    2 +-
 .../python/UnaryPredicate1D/BPy_TrueUP1D.h    |    2 +-
 .../ChainingIterators.py                      |  731 ++++++++++
 .../style_modules_blender/Functions0D.py      |   81 ++
 .../style_modules_blender/Functions1D.py      |   45 +
 .../style_modules_blender/PredicatesB1D.py    |   70 +
 .../style_modules_blender/PredicatesU0D.py    |  103 ++
 .../style_modules_blender/PredicatesU1D.py    |  381 +++++
 .../anisotropic_diffusion.py                  |   75 +
 .../apriori_and_causal_density.py             |   45 +
 .../style_modules_blender/apriori_density.py  |   43 +
 .../backbone_stretcher.py                     |   36 +
 .../blueprint_circles.py                      |   46 +
 .../blueprint_ellipses.py                     |   46 +
 .../blueprint_squares.py                      |   45 +
 .../style_modules_blender/cartoon.py          |   42 +
 .../style_modules_blender/contour.py          |   42 +
 .../style_modules_blender/curvature2d.py      |   60 +
 .../style_modules_blender/external_contour.py |   43 +
 .../external_contour_sketchy.py               |   48 +
 .../external_contour_smooth.py                |   44 +
 .../style_modules_blender/extra-lines.sml     |    3 +
 .../style_modules_blender/haloing.py          |   50 +
 .../ignore_small_occlusions.py                |   41 +
 .../style_modules_blender/invisible_lines.py  |   42 +
 .../japanese_bigbrush.py                      |   59 +
 .../logical_operators.py                      |   36 +
 .../long_anisotropically_dense.py             |   81 ++
 .../multiple_parameterization.py              |   51 +
 .../freestyle/style_modules_blender/nature.py |   43 +
 .../style_modules_blender/near_lines.py       |   44 +
 .../occluded_by_specific_object.py            |   45 +
 .../style_modules_blender/polygonalize.py     |   40 +
 .../freestyle/style_modules_blender/qi0.py    |   41 +
 .../qi0_not_external_contour.py               |   43 +
 .../freestyle/style_modules_blender/qi1.py    |   42 +
 .../freestyle/style_modules_blender/qi2.py    |   42 +
 .../sequentialsplit_sketchy.py                |   68 +
 .../style_modules_blender/shaders.py          | 1288 +++++++++++++++++
 .../sketchy_multiple_parameterization.py      |   48 +
 .../sketchy_topology_broken.py                |   89 ++
 .../sketchy_topology_preserved.py             |   49 +
 .../split_at_highest_2d_curvatures.py         |   40 +
 .../split_at_tvertices.py                     |   42 +
 .../style_modules_blender/stroke_texture.py   |   43 +
 .../style_modules_blender/suggestive.py       |   43 +
 .../thickness_fof_depth_discontinuity.py      |   62 +
 .../style_modules_blender/tipremover.py       |   42 +
 .../style_modules_blender/tvertex_remover.py  |   42 +
 .../uniformpruning_zsort.py                   |   40 +
 .../freestyle/style_modules_blender/vector.py |  241 +++
 214 files changed, 5549 insertions(+), 351 deletions(-)
 create mode 100644 source/blender/freestyle/intern/python/BPy_Operators.h
 create mode 100755 source/blender/freestyle/style_modules_blender/ChainingIterators.py
 create mode 100755 source/blender/freestyle/style_modules_blender/Functions0D.py
 create mode 100755 source/blender/freestyle/style_modules_blender/Functions1D.py
 create mode 100755 source/blender/freestyle/style_modules_blender/PredicatesB1D.py
 create mode 100755 source/blender/freestyle/style_modules_blender/PredicatesU0D.py
 create mode 100755 source/blender/freestyle/style_modules_blender/PredicatesU1D.py
 create mode 100755 source/blender/freestyle/style_modules_blender/anisotropic_diffusion.py
 create mode 100755 source/blender/freestyle/style_modules_blender/apriori_and_causal_density.py
 create mode 100755 source/blender/freestyle/style_modules_blender/apriori_density.py
 create mode 100755 source/blender/freestyle/style_modules_blender/backbone_stretcher.py
 create mode 100755 source/blender/freestyle/style_modules_blender/blueprint_circles.py
 create mode 100755 source/blender/freestyle/style_modules_blender/blueprint_ellipses.py
 create mode 100755 source/blender/freestyle/style_modules_blender/blueprint_squares.py
 create mode 100755 source/blender/freestyle/style_modules_blender/cartoon.py
 create mode 100755 source/blender/freestyle/style_modules_blender/contour.py
 create mode 100755 source/blender/freestyle/style_modules_blender/curvature2d.py
 create mode 100755 source/blender/freestyle/style_modules_blender/external_contour.py
 create mode 100755 source/blender/freestyle/style_modules_blender/external_contour_sketchy.py
 create mode 100755 source/blender/freestyle/style_modules_blender/external_contour_smooth.py
 create mode 100755 source/blender/freestyle/style_modules_blender/extra-lines.sml
 create mode 100755 source/blender/freestyle/style_modules_blender/haloing.py
 create mode 100755 source/blender/freestyle/style_modules_blender/ignore_small_occlusions.py
 create mode 100755 source/blender/freestyle/style_modules_blender/invisible_lines.py
 create mode 100755 source/blender/freestyle/style_modules_blender/japanese_bigbrush.py
 create mode 100755 source/blender/freestyle/style_modules_blender/logical_operators.py
 create mode 100755 source/blender/freestyle/style_modules_blender/long_anisotropically_dense.py
 create mode 100755 source/blender/freestyle/style_modules_blender/multiple_parameterization.py
 create mode 100755 source/blender/freestyle/style_modules_blender/nature.py
 create mode 100755 source/blender/freestyle/style_modules_blender/near_lines.py
 create mode 100755 source/blender/freestyle/style_modules_blender/occluded_by_specific_object.py
 create mode 100755 source/blender/freestyle/style_modules_blender/polygonalize.py
 create mode 100755 source/blender/freestyle/style_modules_blender/qi0.py
 create mode 100755 source/blender/freestyle/style_modules_blender/qi0_not_external_contour.py
 create mode 100755 source/blender/freestyle/style_modules_blender/qi1.py
 create mode 100755 source/blender/freestyle/style_modules_blender/qi2.py
 create mode 100755 source/blender/freestyle/style_modules_blender/sequentialsplit_sketchy.py
 create mode 100755 source/blender/freestyle/style_modules_blender/shaders.py
 create mode 100755 source/blender/freestyle/style_modules_blender/sketchy_multiple_parameterization.py
 create mode 100755 source/blender/freestyle/style_modules_blender/sketchy_topology_broken.py
 create mode 100755 source/blender/freestyle/style_modules_blender/sketchy_topology_preserved.py
 create mode 100755 source/blender/freestyle/style_modules_blender/split_at_highest_2d_curvatures.py
 create mode 100755 source/blender/freestyle/style_modules_blender/split_at_tvertices.py
 create mode 100755 source/blender/freestyle/style_modules_blender/stroke_texture.py
 create mode 100755 source/blender/freestyle/style_modules_blender/suggestive.py
 create mode 100755 source/blender/freestyle/style_modules_blender/thickness_fof_depth_discontinuity.py
 create mode 100755 source/blender/freestyle/style_modules_blender/tipremover.py
 create mode 100755 source/blender/freestyle/style_modules_blender/tvertex_remover.py
 create mode 100755 source/blender/freestyle/style_modules_blender/uniformpruning_zsort.py
 create mode 100755 source/blender/freestyle/style_modules_blender/vector.py

diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript
index 6423cce6593..f74479a8309 100644
--- a/source/blender/freestyle/SConscript
+++ b/source/blender/freestyle/SConscript
@@ -9,7 +9,7 @@ incs = ''
 incs += '../blenkernel ../blenlib ../imbuf ../makesdna ../python '
 incs += '../render/extern/include ../render/intern/include ../include ../src'
 incs += ' #/extern/freestyle/lib3ds' 
-incs += ' ' + env['BF_PYTHON_INC']
+incs += ' ' + env['BF_PYTHON_INC']	
 incs += ' ' + env['BF_LIB3DS_INC']
 incs += ' ' + env['BF_PNG_INC']
 
@@ -58,145 +58,10 @@ app_sources = env.Glob(prefix + '/*.cpp')
 
 #	Python
 prefix = 'intern/python'
-# python_sources = env.Glob(prefix + '/*.cpp')
-python_sources = [
-					prefix + '/BPy_Freestyle.cpp',
-					prefix + '/BPy_Convert.cpp',
-					prefix + '/BPy_BBox.cpp',
-					prefix + '/BPy_BinaryPredicate0D.cpp',
-					prefix + '/BPy_BinaryPredicate1D.cpp',
-					prefix + '/BPy_FrsMaterial.cpp',
-					prefix + '/BPy_Id.cpp',
-					prefix + '/BPy_IntegrationType.cpp',
-					prefix + '/BPy_Interface0D.cpp',
-						prefix + '/Interface0D/BPy_CurvePoint.cpp',
-						prefix + '/Interface0D/CurvePoint/BPy_StrokeVertex.cpp',
-						prefix + '/Interface0D/BPy_SVertex.cpp',
-						prefix + '/Interface0D/BPy_ViewVertex.cpp',
-						prefix + '/Interface0D/ViewVertex/BPy_NonTVertex.cpp',
-						prefix + '/Interface0D/ViewVertex/BPy_TVertex.cpp',
-					prefix + '/BPy_Interface1D.cpp',
-						prefix + '/Interface1D/BPy_Curve.cpp',
-						prefix + '/Interface1D/Curve/BPy_Chain.cpp',
-						prefix + '/Interface1D/BPy_FEdge.cpp',
-						prefix + '/Interface1D/FEdge/BPy_FEdgeSharp.cpp',
-						prefix + '/Interface1D/FEdge/BPy_FEdgeSmooth.cpp',
-						prefix + '/Interface1D/BPy_Stroke.cpp',
-						prefix + '/Interface1D/BPy_ViewEdge.cpp',
-					prefix + '/BPy_Iterator.cpp',
-						prefix + '/Iterator/BPy_AdjacencyIterator.cpp',
-						prefix + '/Iterator/BPy_Interface0DIterator.cpp',
-						prefix + '/Iterator/BPy_CurvePointIterator.cpp',
-						prefix + '/Iterator/BPy_StrokeVertexIterator.cpp',
-						prefix + '/Iterator/BPy_SVertexIterator.cpp',
-						prefix + '/Iterator/BPy_orientedViewEdgeIterator.cpp',
-						prefix + '/Iterator/BPy_ViewEdgeIterator.cpp',
-						prefix + '/Iterator/BPy_ChainingIterator.cpp',
-						prefix + '/Iterator/BPy_ChainPredicateIterator.cpp',
-						prefix + '/Iterator/BPy_ChainSilhouetteIterator.cpp',
-					prefix + '/BPy_MediumType.cpp',
-					prefix + '/BPy_Nature.cpp',
-					prefix + '/BPy_Noise.cpp',
-					prefix + '/BPy_SShape.cpp',
-					prefix + '/BPy_StrokeAttribute.cpp',
-					prefix + '/BPy_StrokeShader.cpp',
-						prefix + '/StrokeShader/BPy_BackboneStretcherShader.cpp',
-						prefix + '/StrokeShader/BPy_BezierCurveShader.cpp',
-						prefix + '/StrokeShader/BPy_CalligraphicShader.cpp',
-						prefix + '/StrokeShader/BPy_ColorNoiseShader.cpp',
-						prefix + '/StrokeShader/BPy_ColorVariationPatternShader.cpp',
-						prefix + '/StrokeShader/BPy_ConstantColorShader.cpp',
-						prefix + '/StrokeShader/BPy_ConstantThicknessShader.cpp',
-						prefix + '/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.cpp',
-						prefix + '/StrokeShader/BPy_fstreamShader.cpp',
-						prefix + '/StrokeShader/BPy_GuidingLinesShader.cpp',
-						prefix + '/StrokeShader/BPy_IncreasingColorShader.cpp',
-						prefix + '/StrokeShader/BPy_IncreasingThicknessShader.cpp',
-						prefix + '/StrokeShader/BPy_PolygonalizationShader.cpp',
-						prefix + '/StrokeShader/BPy_SamplingShader.cpp',
-						prefix + '/StrokeShader/BPy_SpatialNoiseShader.cpp',
-						prefix + '/StrokeShader/BPy_streamShader.cpp',
-						prefix + '/StrokeShader/BPy_StrokeTextureShader.cpp',
-						prefix + '/StrokeShader/BPy_TextureAssignerShader.cpp',
-						prefix + '/StrokeShader/BPy_ThicknessNoiseShader.cpp',
-						prefix + '/StrokeShader/BPy_ThicknessVariationPatternShader.cpp',
-						prefix + '/StrokeShader/BPy_TipRemoverShader.cpp',
-					prefix + '/BPy_UnaryFunction0D.cpp',
-						prefix + '/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_double/BPy_Curvature2DAngleF0D.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedXF0D.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedYF0D.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedZF0D.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_double/BPy_GetXF0D.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_double/BPy_GetYF0D.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_double/BPy_GetZF0D.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_double/BPy_LocalAverageDepthF0D.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.cpp',
-						prefix + '/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.cpp',
-						prefix + '/UnaryFunction0D/BPy_UnaryFunction0DFloat.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_float/BPy_GetParameterF0D.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadMapPixelF0D.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.cpp',
-						prefix + '/UnaryFunction0D/BPy_UnaryFunction0DId.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_Id/BPy_ShapeIdF0D.cpp',
-						prefix + '/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp',
-						prefix + '/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.cpp',
-						prefix + '/UnaryFunction0D/BPy_UnaryFunction0DVec2f.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.cpp',
-						prefix + '/UnaryFunction0D/BPy_UnaryFunction0DVec3f.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.cpp',
-						prefix + '/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.cpp',
-						prefix + '/UnaryFunction0D/BPy_UnaryFunction0DViewShape.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.cpp',
-					prefix + '/BPy_UnaryFunction1D.cpp',
-							prefix + '/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_double/BPy_Curvature2DAngleF1D.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_double/BPy_DensityF1D.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedXF1D.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedYF1D.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedZF1D.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_double/BPy_GetSteerableViewMapDensityF1D.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_double/BPy_GetViewMapGradientNormF1D.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_double/BPy_GetXF1D.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_double/BPy_GetYF1D.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_double/BPy_GetZF1D.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_double/BPy_LocalAverageDepthF1D.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.cpp',
-							prefix + '/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp',
-									prefix + '/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.cpp',
-							prefix + '/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp',
-							prefix + '/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.cpp',
-							prefix + '/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Normal2DF1D.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.cpp',
-							prefix + '/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.cpp',
-							prefix + '/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.cpp',
-							prefix + '/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.cpp',
-					prefix + '/BPy_UnaryPredicate0D.cpp',
-					prefix + '/BPy_UnaryPredicate1D.cpp',
-					prefix + '/BPy_ViewMap.cpp',
-					prefix + '/BPy_ViewShape.cpp'
-				]
+python_sources =  env.Glob(prefix + '/*.cpp') \
+				+ env.Glob(prefix + '/*/*.cpp') \
+				+ env.Glob(prefix + '/*/*/*.cpp') \
+				+ env.Glob(prefix + '/*/*/*/*.cpp')
 
 sources = 	system_sources + image_sources + geometry_sources + scene_graph_sources \
 		  +	winged_edge_sources + view_map_sources + stroke_sources + rendering_sources \
diff --git a/source/blender/freestyle/intern/python/BPy_BBox.h b/source/blender/freestyle/intern/python/BPy_BBox.h
index 88bba3301bb..90fbc565b33 100644
--- a/source/blender/freestyle/intern/python/BPy_BBox.h
+++ b/source/blender/freestyle/intern/python/BPy_BBox.h
@@ -15,7 +15,7 @@ extern "C" {
 
 extern PyTypeObject BBox_Type;
 
-#define BPy_BBox_Check(v)	(( (PyObject *) v)->ob_type == &BBox_Type)
+#define BPy_BBox_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &BBox_Type)  )
 
 /*---------------------------Python BPy_BBox structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h
index dd192877675..8b92fbe4e35 100644
--- a/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h
+++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject BinaryPredicate0D_Type;
 
-#define BPy_BinaryPredicate0D_Check(v)	(( (PyObject *) v)->ob_type == &BinaryPredicate0D_Type)
+#define BPy_BinaryPredicate0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &BinaryPredicate0D_Type)  )
 
 /*---------------------------Python BPy_BinaryPredicate0D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h
index 035e2b6cb17..66f5e2fd4df 100644
--- a/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h
+++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject BinaryPredicate1D_Type;
 
-#define BPy_BinaryPredicate1D_Check(v)	(( (PyObject *) v)->ob_type == &BinaryPredicate1D_Type)
+#define BPy_BinaryPredicate1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &BinaryPredicate1D_Type)  )
 
 /*---------------------------Python BPy_BinaryPredicate1D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/BPy_Convert.cpp b/source/blender/freestyle/intern/python/BPy_Convert.cpp
index 042d4b7bef0..b541babd752 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Convert.cpp
@@ -5,20 +5,29 @@
 #include "BPy_Id.h"
 #include "BPy_IntegrationType.h"
 #include "BPy_Interface0D.h"
+#include "Interface0D/BPy_CurvePoint.cpp"
 #include "Interface0D/CurvePoint/BPy_StrokeVertex.h"
 #include "Interface0D/BPy_SVertex.h"
 #include "Interface0D/BPy_ViewVertex.h"
 #include "Interface1D/BPy_FEdge.h"
 #include "Interface1D/BPy_ViewEdge.h"
-#include "Iterator/BPy_Interface0DIterator.h"
-#include "Iterator/BPy_orientedViewEdgeIterator.h"
-#include "Iterator/BPy_StrokeVertexIterator.h"
 #include "BPy_Nature.h"
 #include "BPy_MediumType.h"
 #include "BPy_SShape.h"
 #include "BPy_StrokeAttribute.h"
 #include "BPy_ViewShape.h"
 
+#include "Iterator/BPy_AdjacencyIterator.h"
+#include "Iterator/BPy_ChainPredicateIterator.h"
+#include "Iterator/BPy_ChainSilhouetteIterator.h"
+#include "Iterator/BPy_ChainingIterator.h"
+#include "Iterator/BPy_CurvePointIterator.h"
+#include "Iterator/BPy_Interface0DIterator.h"
+#include "Iterator/BPy_SVertexIterator.h"
+#include "Iterator/BPy_StrokeVertexIterator.h"
+#include "Iterator/BPy_ViewEdgeIterator.h"
+#include "Iterator/BPy_orientedViewEdgeIterator.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -161,27 +170,6 @@ PyObject * BPy_ViewShape_from_ViewShape( ViewShape& vs ) {
 	return py_vs;
 }
 
-PyObject * BPy_orientedViewEdgeIterator_from_orientedViewEdgeIterator( ViewVertexInternal::orientedViewEdgeIterator& ove_it ) {
-	PyObject *py_ove_it = orientedViewEdgeIterator_Type.tp_new( &orientedViewEdgeIterator_Type, 0, 0 );
-	((BPy_orientedViewEdgeIterator *) py_ove_it)->ove_it = new ViewVertexInternal::orientedViewEdgeIterator( ove_it );
-
-	return py_ove_it;
-}
-
-PyObject * BPy_Interface0DIterator_from_Interface0DIterator( Interface0DIterator& if0D_it ) {
-	PyObject *py_if0D_it = Interface0DIterator_Type.tp_new( &Interface0DIterator_Type, 0, 0 );
-	((BPy_Interface0DIterator *) py_if0D_it)->if0D_it = new Interface0DIterator( if0D_it );
-
-	return py_if0D_it;
-}
-
-PyObject * BPy_StrokeVertexIterator_from_StrokeVertexIterator( StrokeInternal::StrokeVertexIterator& sv_it) {
-	PyObject *py_sv_it = StrokeVertexIterator_Type.tp_new( &StrokeVertexIterator_Type, 0, 0 );
-	((BPy_StrokeVertexIterator*) py_sv_it)->sv_it = new StrokeInternal::StrokeVertexIterator( sv_it );
-
-	return py_sv_it;
-}
-
 PyObject * BPy_FrsMaterial_from_Material( Material& m ){
 	PyObject *py_m = FrsMaterial_Type.tp_new( &FrsMaterial_Type, 0, 0 );
 	((BPy_FrsMaterial*) py_m)->m = new Material( m );
@@ -200,6 +188,27 @@ PyObject * BPy_IntegrationType_from_IntegrationType( int i ) {
 	return py_it;
 }
 
+PyObject * BPy_CurvePoint_from_CurvePoint( CurvePoint& cp ) {
+	PyObject *py_cp = CurvePoint_Type.tp_new( &CurvePoint_Type, 0, 0 );
+	((BPy_CurvePoint*) py_cp)->cp = new CurvePoint( cp );
+
+	return py_cp;
+}
+
+PyObject * BPy_directedViewEdge_from_directedViewEdge( ViewVertex::directedViewEdge& dve ) {
+	PyObject *py_dve = PyList_New(2);
+	
+	PyList_SetItem(	py_dve, 0, BPy_ViewEdge_from_ViewEdge(*(dve.first)) );
+	PyList_SetItem(	py_dve, 1, PyBool_from_bool(dve.second) );
+	
+	return py_dve;
+}
+
+
+//==============================
+// Constants
+//==============================
+
 IntegrationType IntegrationType_from_BPy_IntegrationType( PyObject* obj ) {
 	return static_cast<IntegrationType>( PyInt_AsLong(obj) );
 }
@@ -208,6 +217,83 @@ Stroke::MediumType MediumType_from_BPy_MediumType( PyObject* obj ) {
 	return static_cast<Stroke::MediumType>( PyInt_AsLong(obj) );
 }
 
+//==============================
+// Iterators
+//==============================
+
+PyObject * BPy_AdjacencyIterator_from_AdjacencyIterator( AdjacencyIterator& a_it ) {
+	PyObject *py_a_it = AdjacencyIterator_Type.tp_new( &AdjacencyIterator_Type, 0, 0 );
+	((BPy_AdjacencyIterator *) py_a_it)->a_it = new AdjacencyIterator( a_it );
+
+	return py_a_it;
+}
+
+PyObject * BPy_Interface0DIterator_from_Interface0DIterator( Interface0DIterator& if0D_it ) {
+	PyObject *py_if0D_it = Interface0DIterator_Type.tp_new( &Interface0DIterator_Type, 0, 0 );
+	((BPy_Interface0DIterator *) py_if0D_it)->if0D_it = new Interface0DIterator( if0D_it );
+
+	return py_if0D_it;
+}
+
+PyObject * BPy_CurvePointIterator_from_CurvePointIterator( CurveInternal::CurvePointIterator& cp_it ) {
+	PyObject *py_cp_it = CurvePointIterator_Type.tp_new( &CurvePointIterator_Type, 0, 0 );
+	((BPy_CurvePointIterator*) py_cp_it)->cp_it = new CurveInternal::CurvePointIterator( cp_it );
+
+	return py_cp_it;
+}
+
+PyObject * BPy_StrokeVertexIterator_from_StrokeVertexIterator( StrokeInternal::StrokeVertexIterator& sv_it) {
+	PyObject *py_sv_it = StrokeVertexIterator_Type.tp_new( &StrokeVertexIterator_Type, 0, 0 );
+	((BPy_StrokeVertexIterator*) py_sv_it)->sv_it = new StrokeInternal::StrokeVertexIterator( sv_it );
+
+	return py_sv_it;
+}
+
+PyObject * BPy_SVertexIterator_from_SVertexIterator( ViewEdgeInternal::SVertexIterator& sv_it ) {
+	PyObject *py_sv_it = SVertexIterator_Type.tp_new( &SVertexIterator_Type, 0, 0 );
+	((BPy_SVertexIterator*) py_sv_it)->sv_it = new ViewEdgeInternal::SVertexIterator( sv_it );
+
+	return py_sv_it;
+}
+
+PyObject * BPy_orientedViewEdgeIterator_from_orientedViewEdgeIterator( ViewVertexInternal::orientedViewEdgeIterator& ove_it ) {
+	PyObject *py_ove_it = orientedViewEdgeIterator_Type.tp_new( &orientedViewEdgeIterator_Type, 0, 0 );
+	((BPy_orientedViewEdgeIterator *) py_ove_it)->ove_it = new ViewVertexInternal::orientedViewEdgeIterator( ove_it );
+
+	return py_ove_it;
+}
+
+PyObject * BPy_ViewEdgeIterator_from_ViewEdgeIterator( ViewEdgeInternal::ViewEdgeIterator& ve_it )  {
+	PyObject *py_ve_it = ViewEdgeIterator_Type.tp_new( &ViewEdgeIterator_Type, 0, 0 );
+	((BPy_ViewEdgeIterator*) py_ve_it)->ve_it = new ViewEdgeInternal::ViewEdgeIterator( ve_it );
+
+	return py_ve_it;
+}
+
+PyObject * BPy_ChainingIterator_from_ChainingIterator( ChainingIterator& c_it ) {
+	PyObject *py_c_it = ChainingIterator_Type.tp_new( &ChainingIterator_Type, 0, 0 );
+	((BPy_ChainingIterator*) py_c_it)->c_it = new ChainingIterator( c_it );
+
+	return py_c_it;
+}
+
+PyObject * BPy_ChainPredicateIterator_from_ChainPredicateIterator( ChainPredicateIterator& cp_it ) {
+	PyObject *py_cp_it = ChainPredicateIterator_Type.tp_new( &ChainPredicateIterator_Type, 0, 0 );
+	((BPy_ChainPredicateIterator*) py_cp_it)->cp_it = new ChainPredicateIterator( cp_it );
+
+	return py_cp_it;
+}
+
+PyObject * BPy_ChainSilhouetteIterator_from_ChainSilhouetteIterator( ChainSilhouetteIterator& cs_it ) {
+	PyObject *py_cs_it = ChainSilhouetteIterator_Type.tp_new( &ChainSilhouetteIterator_Type, 0, 0 );
+	((BPy_ChainSilhouetteIterator*) py_cs_it)->cs_it = new ChainSilhouetteIterator( cs_it );
+
+	return py_cs_it;
+}
+
+
+
+
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/source/blender/freestyle/intern/python/BPy_Convert.h b/source/blender/freestyle/intern/python/BPy_Convert.h
index b43f7bab291..5b613b3c4c3 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.h
+++ b/source/blender/freestyle/intern/python/BPy_Convert.h
@@ -26,20 +26,24 @@ using namespace Geometry;
 // NonTVertex, TVertex, ViewEdge, ViewMap, ViewShape, ViewVertex
 #include "../view_map/ViewMap.h"
 
+// CurvePoint, Curve
+#include "../stroke/Curve.h"
+
+//====== ITERATORS
+
+// AdjacencyIterator, ChainingIterator, ChainSilhouetteIterator, ChainPredicateIterator
+#include "../stroke/ChainingIterators.h"
+
 // ViewVertexInternal::orientedViewEdgeIterator
 // ViewEdgeInternal::SVertexIterator
 // ViewEdgeInternal::ViewEdgeIterator
 #include "../view_map/ViewMapIterators.h"
-//#####################    IMPORTANT   #####################
-//  Do not use the following namespaces within this file :
-//   - ViewVertexInternal 
-//   - ViewEdgeInternal
-//##########################################################
 
 // StrokeInternal::StrokeVertexIterator
 #include "../stroke/StrokeIterators.h"
 
-
+// CurveInternal::CurvePointIterator
+#include "../stroke/CurveIterators.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -62,6 +66,8 @@ IntegrationType IntegrationType_from_BPy_IntegrationType( PyObject* obj );
 Stroke::MediumType MediumType_from_BPy_MediumType( PyObject* obj );
 
 PyObject * BPy_BBox_from_BBox( BBox< Vec3r > &bb );
+PyObject * BPy_CurvePoint_from_CurvePoint( CurvePoint& cp );
+PyObject * BPy_directedViewEdge_from_directedViewEdge( ViewVertex::directedViewEdge& dve );
 PyObject * BPy_FEdge_from_FEdge( FEdge& fe );
 PyObject * BPy_Id_from_Id( Id& id );
 PyObject * BPy_Interface0D_from_Interface0D( Interface0D& if0D );
@@ -77,9 +83,19 @@ PyObject * BPy_ViewVertex_from_ViewVertex_ptr( ViewVertex *vv );
 PyObject * BPy_ViewEdge_from_ViewEdge( ViewEdge& ve );
 PyObject * BPy_ViewShape_from_ViewShape( ViewShape& vs );
 
+PyObject * BPy_AdjacencyIterator_from_AdjacencyIterator( AdjacencyIterator& a_it );
 PyObject * BPy_Interface0DIterator_from_Interface0DIterator( Interface0DIterator& if0D_it );
-PyObject * BPy_orientedViewEdgeIterator_from_orientedViewEdgeIterator( ViewVertexInternal::orientedViewEdgeIterator& ove_it );
+PyObject * BPy_CurvePointIterator_from_CurvePointIterator( CurveInternal::CurvePointIterator& cp_it );
 PyObject * BPy_StrokeVertexIterator_from_StrokeVertexIterator( StrokeInternal::StrokeVertexIterator& sv_it);
+PyObject * BPy_SVertexIterator_from_SVertexIterator( ViewEdgeInternal::SVertexIterator& sv_it );
+PyObject * BPy_orientedViewEdgeIterator_from_orientedViewEdgeIterator( ViewVertexInternal::orientedViewEdgeIterator& ove_it );
+PyObject * BPy_ViewEdgeIterator_from_ViewEdgeIterator( ViewEdgeInternal::ViewEdgeIterator& ve_it );
+PyObject * BPy_ChainingIterator_from_ChainingIterator( ChainingIterator& c_it );
+PyObject * BPy_ChainPredicateIterator_from_ChainPredicateIterator( ChainPredicateIterator& cp_it );
+PyObject * BPy_ChainSilhouetteIterator_from_ChainSilhouetteIterator( ChainSilhouetteIterator& cs_it );
+
+
+   
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/source/blender/freestyle/intern/python/BPy_Freestyle.cpp b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
index ed35a85068b..85a2783102e 100644
--- a/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
@@ -11,6 +11,7 @@
 #include "BPy_Iterator.h"
 #include "BPy_MediumType.h"
 #include "BPy_Nature.h"
+#include "BPy_Operators.h"
 #include "BPy_Noise.h"
 #include "BPy_SShape.h"
 #include "BPy_StrokeAttribute.h"
@@ -152,6 +153,7 @@ PyObject *Freestyle_Init( void )
 	Interface0D_Init( module );
 	Interface1D_Init( module );
 	Iterator_Init( module );
+	Operators_Init( module );
 	Noise_Init( module );
 	SShape_Init( module );
 	StrokeAttribute_Init( module );
diff --git a/source/blender/freestyle/intern/python/BPy_Freestyle.h b/source/blender/freestyle/intern/python/BPy_Freestyle.h
index 9cdef4df2d2..4990a2e685d 100644
--- a/source/blender/freestyle/intern/python/BPy_Freestyle.h
+++ b/source/blender/freestyle/intern/python/BPy_Freestyle.h
@@ -11,7 +11,7 @@ extern "C" {
 
 extern PyTypeObject Freestyle_Type;
 
-#define BPy_Freestyle_Check(v)	(( (PyObject *) v)->ob_type == &Freestyle_Type)
+#define BPy_Freestyle_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Freestyle_Type)  )
 
 /*---------------------------Python BPy_Freestyle structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/BPy_FrsMaterial.h b/source/blender/freestyle/intern/python/BPy_FrsMaterial.h
index 90ed6805974..cb1aa20bb21 100644
--- a/source/blender/freestyle/intern/python/BPy_FrsMaterial.h
+++ b/source/blender/freestyle/intern/python/BPy_FrsMaterial.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject FrsMaterial_Type;
 
-#define BPy_FrsMaterial_Check(v)	(( (PyObject *) v)->ob_type == &FrsMaterial_Type)
+#define BPy_FrsMaterial_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &FrsMaterial_Type)  )
 
 /*---------------------------Python BPy_FrsMaterial structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/BPy_Id.h b/source/blender/freestyle/intern/python/BPy_Id.h
index d5e90a0a3e5..fd9446618b8 100644
--- a/source/blender/freestyle/intern/python/BPy_Id.h
+++ b/source/blender/freestyle/intern/python/BPy_Id.h
@@ -16,7 +16,7 @@ extern "C" {
 
 extern PyTypeObject Id_Type;
 
-#define BPy_Id_Check(v)	(( (PyObject *) v)->ob_type == &Id_Type)
+#define BPy_Id_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Id_Type)  )
 
 /*---------------------------Python BPy_Id structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/BPy_IntegrationType.h b/source/blender/freestyle/intern/python/BPy_IntegrationType.h
index ab212ac6560..a31fe959996 100644
--- a/source/blender/freestyle/intern/python/BPy_IntegrationType.h
+++ b/source/blender/freestyle/intern/python/BPy_IntegrationType.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject IntegrationType_Type;
 
-#define BPy_IntegrationType_Check(v)	(( (PyObject *) v)->ob_type == &IntegrationType_Type)
+#define BPy_IntegrationType_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &IntegrationType_Type)  )
 
 /*---------------------------Python BPy_IntegrationType structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/BPy_Interface0D.h b/source/blender/freestyle/intern/python/BPy_Interface0D.h
index aaecc6dad94..a55deb80a6f 100644
--- a/source/blender/freestyle/intern/python/BPy_Interface0D.h
+++ b/source/blender/freestyle/intern/python/BPy_Interface0D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject Interface0D_Type;
 
-#define BPy_Interface0D_Check(v)	(( (PyObject *) v)->ob_type == &Interface0D_Type)
+#define BPy_Interface0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Interface0D_Type)  )
 
 /*---------------------------Python BPy_Interface0D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/BPy_Interface1D.h b/source/blender/freestyle/intern/python/BPy_Interface1D.h
index c49a8c130b0..14971bf88f5 100644
--- a/source/blender/freestyle/intern/python/BPy_Interface1D.h
+++ b/source/blender/freestyle/intern/python/BPy_Interface1D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject Interface1D_Type;
 
-#define BPy_Interface1D_Check(v)	(( (PyObject *) v)->ob_type == &Interface1D_Type)
+#define BPy_Interface1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Interface1D_Type)  )
 
 /*---------------------------Python BPy_Interface1D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/BPy_Iterator.cpp b/source/blender/freestyle/intern/python/BPy_Iterator.cpp
index b946e0a9a9a..cf6d8ed4877 100644
--- a/source/blender/freestyle/intern/python/BPy_Iterator.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Iterator.cpp
@@ -227,6 +227,12 @@ PyObject * Iterator_isEnd(BPy_Iterator* self) {
 	return PyBool_from_bool( self->it->isEnd() );
 }
 
+//%rename(getObject) Interface0DIterator::operator*
+PyObject * Iterator_getObject(BPy_Iterator* self) {
+	return PyBool_from_bool( self->it->isEnd() );
+}
+
+
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/BPy_Iterator.h b/source/blender/freestyle/intern/python/BPy_Iterator.h
index 0f92c3b7f28..bad39806163 100644
--- a/source/blender/freestyle/intern/python/BPy_Iterator.h
+++ b/source/blender/freestyle/intern/python/BPy_Iterator.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject Iterator_Type;
 
-#define BPy_Iterator_Check(v)	(( (PyObject *) v)->ob_type == &Iterator_Type)
+#define BPy_Iterator_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Iterator_Type)  )
 
 /*---------------------------Python BPy_Iterator structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/BPy_MediumType.h b/source/blender/freestyle/intern/python/BPy_MediumType.h
index d56594e0f68..9b4ff5a2fd9 100644
--- a/source/blender/freestyle/intern/python/BPy_MediumType.h
+++ b/source/blender/freestyle/intern/python/BPy_MediumType.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject MediumType_Type;
 
-#define BPy_MediumType_Check(v)	(( (PyObject *) v)->ob_type == &MediumType_Type)
+#define BPy_MediumType_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &MediumType_Type)  )
 
 /*---------------------------Python BPy_MediumType structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/BPy_Nature.h b/source/blender/freestyle/intern/python/BPy_Nature.h
index 7473869158f..493a4f78599 100644
--- a/source/blender/freestyle/intern/python/BPy_Nature.h
+++ b/source/blender/freestyle/intern/python/BPy_Nature.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject Nature_Type;
 
-#define BPy_Nature_Check(v)	(( (PyObject *) v)->ob_type == &Nature_Type)
+#define BPy_Nature_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Nature_Type)  )
 
 /*---------------------------Python BPy_Nature structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/BPy_Noise.h b/source/blender/freestyle/intern/python/BPy_Noise.h
index b9b66d34e94..5dc8a1a4bd1 100644
--- a/source/blender/freestyle/intern/python/BPy_Noise.h
+++ b/source/blender/freestyle/intern/python/BPy_Noise.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject Noise_Type;
 
-#define BPy_Noise_Check(v)	(( (PyObject *) v)->ob_type == &Noise_Type)
+#define BPy_Noise_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Noise_Type)  )
 
 /*---------------------------Python BPy_Noise structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/BPy_Operators.cpp b/source/blender/freestyle/intern/python/BPy_Operators.cpp
index efae258d5ee..2d883363998 100644
--- a/source/blender/freestyle/intern/python/BPy_Operators.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Operators.cpp
@@ -1,57 +1,304 @@
-PyObject *Operators_select(PyObject *self , PyObject *args) {
+#include "BPy_Operators.h"
+
+#include "BPy_BinaryPredicate1D.h"
+#include "BPy_UnaryPredicate0D.h"
+#include "BPy_UnaryPredicate1D.h"
+#include "UnaryFunction0D/BPy_UnaryFunction0DDouble.h"
+#include "UnaryFunction1D/BPy_UnaryFunction1DVoid.h"
+#include "Iterator/BPy_ViewEdgeIterator.h"
+#include "Iterator/BPy_ChainingIterator.h"
+#include "BPy_StrokeShader.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for Operators instance  -----------*/
+static void Operators___dealloc__(BPy_Operators *self);
+
+static PyObject * Operators_select(BPy_Operators* self, PyObject *args);
+
+/*----------------------Operators instance definitions ----------------------------*/
+static PyMethodDef BPy_Operators_methods[] = {
+	{"select", ( PyCFunction ) Operators_select, METH_VARARGS | METH_STATIC, "（UnaryPredicate1D up1D ）Selects the ViewEdges of the ViewMap verifying a specified condition. "},
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_Operators type definition ------------------------------*/
+
+PyTypeObject Operators_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"Operators",				/* tp_name */
+	sizeof( BPy_Operators ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	(destructor)Operators___dealloc__,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Operatorss */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_Operators_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	NULL,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	NULL,                       	/* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	PyType_GenericNew,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+PyMODINIT_FUNC Operators_Init( PyObject *module )
+{	
+	if( module == NULL )
+		return;
+
+	if( PyType_Ready( &Operators_Type ) < 0 )
+		return;
+	Py_INCREF( &Operators_Type );
+	PyModule_AddObject(module, "Operators", (PyObject *)&Operators_Type);	
+	
 }
 
+//------------------------INSTANCE METHODS ----------------------------------
 
-PyObject *Operators_chain(PyObject *self, PyObject *args) {
+void Operators___dealloc__(BPy_Operators* self)
+{
+    self->ob_type->tp_free((PyObject*)self);
 }
 
+PyObject * Operators_select(BPy_Operators* self, PyObject *args)
+{
+	PyObject *obj = 0;
 
-PyObject *Operators_bidirectionalChain(PyObject *self, PyObject *args) {
+	if(!( 	PyArg_ParseTuple(args, "O", &obj) && 
+			BPy_UnaryPredicate1D_Check(obj) && ((BPy_UnaryPredicate1D *) obj)->up1D )) {
+		cout << "ERROR: Operators_select" << endl;
+		Py_RETURN_NONE;
+	}
+
+	Operators::select(*( ((BPy_UnaryPredicate1D *) obj)->up1D ));
+
+	Py_RETURN_NONE;
 }
 
+PyObject * Operators_chain(BPy_Operators* self, PyObject *args)
+{
+	PyObject *obj1 = 0, *obj2 = 0, *obj3 = 0;
 
-PyObject *Operators_sequentialSplit(PyObject *self, PyObject *args) {
+	if(!( 	PyArg_ParseTuple(args, "OO|O", &obj1, &obj2, &obj3) && 
+			BPy_ViewEdgeIterator_Check(obj1) && ((BPy_ViewEdgeIterator *) obj1)->ve_it &&
+			BPy_UnaryPredicate1D_Check(obj2) && ((BPy_UnaryPredicate1D *) obj2)->up1D )) {
+		cout << "ERROR: Operators_chain" << endl;
+		Py_RETURN_NONE;
+	}
+
+	if( !obj3 ) {
+		
+		Operators::chain( 	*( ((BPy_ViewEdgeIterator *) obj1)->ve_it ),
+							*( ((BPy_UnaryPredicate1D *) obj2)->up1D )  );
+							
+	} else if( BPy_UnaryFunction1DVoid_Check(obj3) && ((BPy_UnaryFunction1DVoid *) obj3)->uf1D_void ) {
+		
+		Operators::chain( 	*( ((BPy_ViewEdgeIterator *) obj1)->ve_it ),
+							*( ((BPy_UnaryPredicate1D *) obj2)->up1D ),
+							*( ((BPy_UnaryFunction1DVoid *) obj3)->uf1D_void )  );
+		
+	}
+	
+	Py_RETURN_NONE;
 }
 
+PyObject * Operators_bidirectionalChain(BPy_Operators* self, PyObject *args)
+{
+	PyObject *obj1 = 0, *obj2 = 0;
 
-PyObject *Operators_recursiveSplit(PyObject *self, PyObject *args) {
+	if(!( 	PyArg_ParseTuple(args, "O|O", &obj1, &obj2) && 
+			BPy_ChainingIterator_Check(obj1) && ((BPy_ChainingIterator *) obj1)->c_it )) {
+		cout << "ERROR: Operators_bidirectionalChain" << endl;
+		Py_RETURN_NONE;
+	}
+
+	if( !obj2 ) {
+
+		Operators::bidirectionalChain( 	*( ((BPy_ChainingIterator *) obj1)->c_it ) );
+							
+	} else if( BPy_UnaryPredicate1D_Check(obj2) && ((BPy_UnaryPredicate1D *) obj2)->up1D ) {
+		
+		Operators::bidirectionalChain( 	*( ((BPy_ChainingIterator *) obj1)->c_it ),
+										*( ((BPy_UnaryPredicate1D *) obj2)->up1D )  );
+		
+	}
+	
+	Py_RETURN_NONE;
 }
 
+PyObject * Operators_sequentialSplit(BPy_Operators* self, PyObject *args)
+{
+	PyObject *obj1 = 0, *obj2 = 0;
+	float f3 = 0.0;
 
-PyObject *Operators_sort(PyObject *self , PyObject *args) {
+	if(!( 	PyArg_ParseTuple(args, "O|Of", &obj1, &obj2, &f3) && 
+			BPy_UnaryPredicate0D_Check(obj1) && ((BPy_UnaryPredicate0D *) obj1)->up0D )) {
+		cout << "ERROR: Operators_sequentialSplit" << endl;
+		Py_RETURN_NONE;
+	}
+
+	if( obj2 && BPy_UnaryPredicate0D_Check(obj2) ) {
+		
+		Operators::sequentialSplit( 	*( ((BPy_UnaryPredicate0D *) obj1)->up0D ),
+										*( ((BPy_UnaryPredicate0D *) obj2)->up0D ),
+										f3 );
+			
+	} else {
+		
+		float f = ( obj2 && PyFloat_Check(obj2) ) ? PyFloat_AsDouble(obj2) : 0.0;
+		
+		Operators::sequentialSplit( *( ((BPy_UnaryPredicate0D *) obj1)->up0D ), f );
+		
+	}
+	
+	Py_RETURN_NONE;
 }
 
+PyObject * Operators_recursiveSplit(BPy_Operators* self, PyObject *args)
+{
+	PyObject *obj1 = 0, *obj2 = 0, *obj3 = 0;
+	float f4 = 0.0;
 
-PyObject *Operators_create(PyObject *self , PyObject *args) {
+	if(!( 	PyArg_ParseTuple(args, "OO|Of", &obj1, &obj2, &obj3, &f4) && 
+			BPy_UnaryFunction0DDouble_Check(obj1) && ((BPy_UnaryFunction0DDouble *) obj1)->uf0D_double )) {
+		cout << "ERROR: Operators_recursiveSplit" << endl;
+		Py_RETURN_NONE;
+	}
+	
+	if( BPy_UnaryPredicate1D_Check(obj2) && ((BPy_UnaryPredicate1D *) obj2)->up1D ) {
+		
+		float f = ( obj3 && PyFloat_Check(obj3) ) ? PyFloat_AsDouble(obj3) : 0.0;
+		
+		Operators::recursiveSplit( 	*( ((BPy_UnaryFunction0DDouble *) obj1)->uf0D_double ),
+									*( ((BPy_UnaryPredicate1D *) obj2)->up1D ),
+									f );
+	
+	} else if(	BPy_UnaryPredicate0D_Check(obj2) && ((BPy_UnaryPredicate0D *) obj2)->up0D &&
+				BPy_UnaryPredicate1D_Check(obj3) && ((BPy_UnaryPredicate1D *) obj3)->up1D    ) {
+		
+		Operators::recursiveSplit( 	*( ((BPy_UnaryFunction0DDouble *) obj1)->uf0D_double ),
+									*( ((BPy_UnaryPredicate0D *) obj2)->up0D ),
+									*( ((BPy_UnaryPredicate1D *) obj3)->up1D ),
+									f4 );
+
+	}
+	
+	Py_RETURN_NONE;
 }
 
+PyObject * Operators_sort(BPy_Operators* self, PyObject *args)
+{
+	PyObject *obj = 0;
 
-PyObject *Operators_getViewEdgeFromIndex(PyObject *self , PyObject *args) {
+	if(!( 	PyArg_ParseTuple(args, "O", &obj) && 
+			BPy_BinaryPredicate1D_Check(obj) && ((BPy_BinaryPredicate1D *) obj)->bp1D )) {
+		cout << "ERROR: Operators_sort" << endl;
+		Py_RETURN_NONE;
+	}
 
+	Operators::sort(*( ((BPy_BinaryPredicate1D *) obj)->bp1D ));
+
+	Py_RETURN_NONE;
 }
 
+PyObject * Operators_create(BPy_Operators* self, PyObject *args)
+{
+	PyObject *obj1 = 0, *obj2 = 0;
 
-PyObject *Operators_getChainFromIndex(PyObject *self , PyObject *args) {
+	if(!( 	PyArg_ParseTuple(args, "OO", &obj1, &obj2) && 
+			BPy_UnaryPredicate1D_Check(obj1) && ((BPy_UnaryPredicate1D *) obj1)->up1D &&
+			PyList_Check(obj2) && PyList_Size(obj2) > 0   )) {
+		cout << "ERROR: Operators_create" << endl;
+		Py_RETURN_NONE;
+	}
+
+	vector<StrokeShader *> shaders;
+	for( int i = 0; i < PyList_Size(obj2); i++) {
+		PyObject *py_ss = PyList_GetItem(obj2,i);
+		if( BPy_StrokeShader_Check(py_ss) )
+		 shaders.push_back( ((BPy_StrokeShader *) py_ss)->ss );
+	}
+	
+	Operators::create( *( ((BPy_UnaryPredicate1D *) obj1)->up1D ), shaders);
+
+	Py_RETURN_NONE;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
-PyObject *Operators_getStrokeFromIndex(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Operators_getViewEdgesSize(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Operators_getChainsSize(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *Operators_getStrokesSize(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *delete_Operators(PyObject *self , PyObject *args) {
+#ifdef __cplusplus
 }
+#endif
 
 
diff --git a/source/blender/freestyle/intern/python/BPy_Operators.h b/source/blender/freestyle/intern/python/BPy_Operators.h
new file mode 100644
index 00000000000..0af40551cf8
--- /dev/null
+++ b/source/blender/freestyle/intern/python/BPy_Operators.h
@@ -0,0 +1,34 @@
+#ifndef FREESTYLE_PYTHON_OPERATORS_H
+#define FREESTYLE_PYTHON_OPERATORS_H
+
+#include "../stroke/Operators.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject Operators_Type;
+
+#define BPy_Operators_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Operators_Type)  )
+
+/*---------------------------Python BPy_Operators structure definition----------*/
+typedef struct {
+	PyObject_HEAD
+} BPy_Operators;
+
+/*---------------------------Python BPy_Operators visible prototypes-----------*/
+
+PyMODINIT_FUNC Operators_Init( PyObject *module );
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_OPERATORS_H */
diff --git a/source/blender/freestyle/intern/python/BPy_SShape.h b/source/blender/freestyle/intern/python/BPy_SShape.h
index 2064b6c4b64..5ca4d9abefe 100644
--- a/source/blender/freestyle/intern/python/BPy_SShape.h
+++ b/source/blender/freestyle/intern/python/BPy_SShape.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject SShape_Type;
 
-#define BPy_SShape_Check(v)	(( (PyObject *) v)->ob_type == &SShape_Type)
+#define BPy_SShape_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &SShape_Type)  )
 
 /*---------------------------Python BPy_SShape structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.h b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.h
index a0828e4f668..a2100c3b0f6 100644
--- a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.h
+++ b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject StrokeAttribute_Type;
 
-#define BPy_StrokeAttribute_Check(v)	(( (PyObject *) v)->ob_type == &StrokeAttribute_Type)
+#define BPy_StrokeAttribute_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &StrokeAttribute_Type)  )
 
 /*---------------------------Python BPy_StrokeAttribute structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/BPy_StrokeShader.h b/source/blender/freestyle/intern/python/BPy_StrokeShader.h
index 091eaa50383..5ee89a35875 100644
--- a/source/blender/freestyle/intern/python/BPy_StrokeShader.h
+++ b/source/blender/freestyle/intern/python/BPy_StrokeShader.h
@@ -18,7 +18,7 @@ extern "C" {
 
 extern PyTypeObject StrokeShader_Type;
 
-#define BPy_StrokeShader_Check(v)	(( (PyObject *) v)->ob_type == &StrokeShader_Type)
+#define BPy_StrokeShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &StrokeShader_Type)  )
 
 /*---------------------------Python BPy_StrokeShader structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h
index e4854c58b45..0ab0bfbdc2e 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h
+++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject UnaryFunction0D_Type;
 
-#define BPy_UnaryFunction0D_Check(v)	(( (PyObject *) v)->ob_type == &UnaryFunction0D_Type)
+#define BPy_UnaryFunction0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction0D_Type)  )
 
 /*---------------------------Python BPy_UnaryFunction0D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h
index 21cece45fa4..f33fcf48da4 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h
+++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject UnaryFunction1D_Type;
 
-#define BPy_UnaryFunction1D_Check(v)	(( (PyObject *) v)->ob_type == &UnaryFunction1D_Type)
+#define BPy_UnaryFunction1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction1D_Type)  )
 
 /*---------------------------Python BPy_UnaryFunction1D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h
index 1f72ba5e86b..c242a71d1a3 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h
+++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject UnaryPredicate0D_Type;
 
-#define BPy_UnaryPredicate0D_Check(v)	(( (PyObject *) v)->ob_type == &UnaryPredicate0D_Type)
+#define BPy_UnaryPredicate0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryPredicate0D_Type)  )
 
 /*---------------------------Python BPy_UnaryPredicate0D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h
index 509d81f6937..ac5451d3b0e 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h
+++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject UnaryPredicate1D_Type;
 
-#define BPy_UnaryPredicate1D_Check(v)	(( (PyObject *) v)->ob_type == &UnaryPredicate1D_Type)
+#define BPy_UnaryPredicate1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryPredicate1D_Type)  )
 
 /*---------------------------Python BPy_UnaryPredicate1D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/BPy_ViewMap.h b/source/blender/freestyle/intern/python/BPy_ViewMap.h
index 841b5d46f07..f76f09a4c75 100644
--- a/source/blender/freestyle/intern/python/BPy_ViewMap.h
+++ b/source/blender/freestyle/intern/python/BPy_ViewMap.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject ViewMap_Type;
 
-#define BPy_ViewMap_Check(v)	(( (PyObject *) v)->ob_type == &ViewMap_Type)
+#define BPy_ViewMap_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ViewMap_Type)  )
 
 /*---------------------------Python BPy_ViewMap structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/BPy_ViewShape.h b/source/blender/freestyle/intern/python/BPy_ViewShape.h
index 20490cd71aa..a7d01c098d2 100644
--- a/source/blender/freestyle/intern/python/BPy_ViewShape.h
+++ b/source/blender/freestyle/intern/python/BPy_ViewShape.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject ViewShape_Type;
 
-#define BPy_ViewShape_Check(v)	(( (PyObject *) v)->ob_type == &ViewShape_Type)
+#define BPy_ViewShape_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ViewShape_Type)  )
 
 /*---------------------------Python BPy_ViewShape structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.h b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.h
index 7e090fc92d3..a8d4aad88aa 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.h
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject FalseBP1D_Type;
 
-#define BPy_FalseBP1D_Check(v)	(( (PyObject *) v)->ob_type == &FalseBP1D_Type)
+#define BPy_FalseBP1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &FalseBP1D_Type)  )
 
 /*---------------------------Python BPy_FalseBP1D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.h b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.h
index e499067d05e..d5bce5b150d 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.h
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject Length2DBP1D_Type;
 
-#define BPy_Length2DBP1D_Check(v)	(( (PyObject *) v)->ob_type == &Length2DBP1D_Type)
+#define BPy_Length2DBP1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Length2DBP1D_Type)  )
 
 /*---------------------------Python BPy_Length2DBP1D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.h b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.h
index 31e47040bcb..71065d4ceeb 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.h
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject SameShapeIdBP1D_Type;
 
-#define BPy_SameShapeIdBP1D_Check(v)	(( (PyObject *) v)->ob_type == &SameShapeIdBP1D_Type)
+#define BPy_SameShapeIdBP1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &SameShapeIdBP1D_Type)  )
 
 /*---------------------------Python BPy_SameShapeIdBP1D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.h b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.h
index a975fe0b662..7d809e1fe65 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.h
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject TrueBP1D_Type;
 
-#define BPy_TrueBP1D_Check(v)	(( (PyObject *) v)->ob_type == &TrueBP1D_Type)
+#define BPy_TrueBP1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &TrueBP1D_Type)  )
 
 /*---------------------------Python BPy_TrueBP1D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.h b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.h
index 16fe71dee07..23d27e118a9 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.h
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject ViewMapGradientNormBP1D_Type;
 
-#define BPy_ViewMapGradientNormBP1D_Check(v)	(( (PyObject *) v)->ob_type == &ViewMapGradientNormBP1D_Type)
+#define BPy_ViewMapGradientNormBP1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ViewMapGradientNormBP1D_Type)  )
 
 /*---------------------------Python BPy_ViewMapGradientNormBP1D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.h b/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.h
index c2a8023b745..b4c22645503 100644
--- a/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.h
+++ b/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.h
@@ -14,7 +14,7 @@ extern "C" {
 
 extern PyTypeObject CurvePoint_Type;
 
-#define BPy_CurvePoint_Check(v)	(( (PyObject *) v)->ob_type == &CurvePoint_Type)
+#define BPy_CurvePoint_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &CurvePoint_Type)  )
 
 /*---------------------------Python BPy_CurvePoint structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.h b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.h
index 95b7d833d65..7d310f2b7dc 100644
--- a/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.h
+++ b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.h
@@ -15,7 +15,7 @@ extern "C" {
 
 extern PyTypeObject SVertex_Type;
 
-#define BPy_SVertex_Check(v)	(( (PyObject *) v)->ob_type == &SVertex_Type)
+#define BPy_SVertex_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &SVertex_Type)  )
 
 /*---------------------------Python BPy_SVertex structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.h b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.h
index 592a46186c2..26c06b50d71 100644
--- a/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.h
+++ b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.h
@@ -14,7 +14,7 @@ extern "C" {
 
 extern PyTypeObject ViewVertex_Type;
 
-#define BPy_ViewVertex_Check(v)	(( (PyObject *) v)->ob_type == &ViewVertex_Type)
+#define BPy_ViewVertex_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ViewVertex_Type)  )
 
 /*---------------------------Python BPy_ViewVertex structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.h b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.h
index f1c54ed0041..2a84e2480f0 100644
--- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.h
+++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.h
@@ -14,7 +14,7 @@ extern "C" {
 
 extern PyTypeObject StrokeVertex_Type;
 
-#define BPy_StrokeVertex_Check(v)	(( (PyObject *) v)->ob_type == &StrokeVertex_Type)
+#define BPy_StrokeVertex_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &StrokeVertex_Type)  )
 
 /*---------------------------Python BPy_StrokeVertex structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.h b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.h
index 13b520d81db..071194d2d42 100644
--- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.h
+++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.h
@@ -14,7 +14,7 @@ extern "C" {
 
 extern PyTypeObject NonTVertex_Type;
 
-#define BPy_NonTVertex_Check(v)	(( (PyObject *) v)->ob_type == &NonTVertex_Type)
+#define BPy_NonTVertex_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &NonTVertex_Type)  )
 
 /*---------------------------Python BPy_NonTVertex structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.h b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.h
index a4f564446ef..12fe5c0cb43 100644
--- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.h
+++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.h
@@ -14,7 +14,7 @@ extern "C" {
 
 extern PyTypeObject TVertex_Type;
 
-#define BPy_TVertex_Check(v)	(( (PyObject *) v)->ob_type == &TVertex_Type)
+#define BPy_TVertex_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &TVertex_Type)  )
 
 /*---------------------------Python BPy_TVertex structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_Curve.h b/source/blender/freestyle/intern/python/Interface1D/BPy_Curve.h
index fd19612261a..fd29a7bf4f1 100644
--- a/source/blender/freestyle/intern/python/Interface1D/BPy_Curve.h
+++ b/source/blender/freestyle/intern/python/Interface1D/BPy_Curve.h
@@ -14,7 +14,7 @@ extern "C" {
 
 extern PyTypeObject Curve_Type;
 
-#define BPy_Curve_Check(v)	(( (PyObject *) v)->ob_type == &Curve_Type)
+#define BPy_Curve_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Curve_Type)  )
 
 /*---------------------------Python BPy_Curve structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.h b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.h
index c54dbee98b7..9d13145aaf2 100644
--- a/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.h
+++ b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.h
@@ -14,7 +14,7 @@ extern "C" {
 
 extern PyTypeObject FEdge_Type;
 
-#define BPy_FEdge_Check(v)	(( (PyObject *) v)->ob_type == &FEdge_Type)
+#define BPy_FEdge_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &FEdge_Type)  )
 
 /*---------------------------Python BPy_FEdge structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.h b/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.h
index a7e7455b764..ead377377e8 100644
--- a/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.h
+++ b/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.h
@@ -15,7 +15,7 @@ extern "C" {
 
 extern PyTypeObject ViewEdge_Type;
 
-#define BPy_ViewEdge_Check(v)	(( (PyObject *) v)->ob_type == &ViewEdge_Type)
+#define BPy_ViewEdge_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ViewEdge_Type)  )
 
 /*---------------------------Python BPy_ViewEdge structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.h b/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.h
index eaf80033098..ade70c47f25 100644
--- a/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.h
+++ b/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.h
@@ -14,7 +14,7 @@ extern "C" {
 
 extern PyTypeObject Chain_Type;
 
-#define BPy_Chain_Check(v)	(( (PyObject *) v)->ob_type == &Chain_Type)
+#define BPy_Chain_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Chain_Type)  )
 
 /*---------------------------Python BPy_Chain structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.h b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.h
index d08ef006941..84b01e27c21 100644
--- a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.h
+++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.h
@@ -14,7 +14,7 @@ extern "C" {
 
 extern PyTypeObject FEdgeSharp_Type;
 
-#define BPy_FEdgeSharp_Check(v)	(( (PyObject *) v)->ob_type == &FEdgeSharp_Type)
+#define BPy_FEdgeSharp_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &FEdgeSharp_Type)  )
 
 /*---------------------------Python BPy_FEdgeSharp structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.h b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.h
index 6b26f65d81c..d7b44bb1da7 100644
--- a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.h
+++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.h
@@ -14,7 +14,7 @@ extern "C" {
 
 extern PyTypeObject FEdgeSmooth_Type;
 
-#define BPy_FEdgeSmooth_Check(v)	(( (PyObject *) v)->ob_type == &FEdgeSmooth_Type)
+#define BPy_FEdgeSmooth_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &FEdgeSmooth_Type)  )
 
 /*---------------------------Python BPy_FEdgeSmooth structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp
index e40f129d3d8..13c8382c3a2 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp
@@ -12,8 +12,11 @@ extern "C" {
 /*---------------  Python API function prototypes for AdjacencyIterator instance  -----------*/
 static int AdjacencyIterator___init__(BPy_AdjacencyIterator *self, PyObject *args);
 
+static PyObject * AdjacencyIterator_getObject(BPy_AdjacencyIterator *self);
+
 /*----------------------AdjacencyIterator instance definitions ----------------------------*/
 static PyMethodDef BPy_AdjacencyIterator_methods[] = {
+	{"getObject", ( PyCFunction ) AdjacencyIterator_getObject, METH_NOARGS, "() Get object referenced by the iterator"},
 	{NULL, NULL, 0, NULL}
 };
 
@@ -135,6 +138,16 @@ int AdjacencyIterator___init__(BPy_AdjacencyIterator *self, PyObject *args )
 
 }
 
+PyObject * AdjacencyIterator_getObject(BPy_AdjacencyIterator *self) {
+	
+	ViewEdge *ve = self->a_it->operator*();
+	if( ve )
+		return BPy_ViewEdge_from_ViewEdge( *ve );
+
+	Py_RETURN_NONE;
+}
+
+
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.h
index de0178f7725..733a9f2fcab 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.h
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.h
@@ -15,7 +15,7 @@ extern "C" {
 
 extern PyTypeObject AdjacencyIterator_Type;
 
-#define BPy_AdjacencyIterator_Check(v)	(( (PyObject *) v)->ob_type == &AdjacencyIterator_Type)
+#define BPy_AdjacencyIterator_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &AdjacencyIterator_Type)  )
 
 /*---------------------------Python BPy_AdjacencyIterator structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.h
index c5d32fb01f3..39a794b27f7 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.h
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.h
@@ -16,7 +16,7 @@ extern "C" {
 
 extern PyTypeObject ChainPredicateIterator_Type;
 
-#define BPy_ChainPredicateIterator_Check(v)	(( (PyObject *) v)->ob_type == &ChainPredicateIterator_Type)
+#define BPy_ChainPredicateIterator_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ChainPredicateIterator_Type)  )
 
 /*---------------------------Python BPy_ChainPredicateIterator structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.h
index 7e6feb00910..912d397d279 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.h
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.h
@@ -16,7 +16,7 @@ extern "C" {
 
 extern PyTypeObject ChainSilhouetteIterator_Type;
 
-#define BPy_ChainSilhouetteIterator_Check(v)	(( (PyObject *) v)->ob_type == &ChainSilhouetteIterator_Type)
+#define BPy_ChainSilhouetteIterator_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ChainSilhouetteIterator_Type)  )
 
 /*---------------------------Python BPy_ChainSilhouetteIterator structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp
index c695e92ec70..525b0697fa7 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp
@@ -18,12 +18,15 @@ static PyObject * ChainingIterator_traverse( BPy_ChainingIterator *self, PyObjec
 static PyObject * ChainingIterator_getVertex( BPy_ChainingIterator *self );
 static PyObject * ChainingIterator_isIncrementing( BPy_ChainingIterator *self );
 
+static PyObject * ChainingIterator_getObject( BPy_ChainingIterator *self);
+
 /*----------------------ChainingIterator instance definitions ----------------------------*/
 static PyMethodDef BPy_ChainingIterator_methods[] = {
 	{"init", ( PyCFunction ) ChainingIterator_init, METH_NOARGS, "() Inits the iterator context. This method is called each time a new chain is started. It can be used to reset some history information that you might want to keep."},
 	{"traverse", ( PyCFunction ) ChainingIterator_traverse, METH_VARARGS, "(AdjacencyIterator ai) This method iterates over the potential next ViewEdges and returns the one that will be followed next. Returns the next ViewEdge to follow or 0 when the end of the chain is reached. "},
 	{"getVertex", ( PyCFunction ) ChainingIterator_getVertex, METH_NOARGS, "() Returns the vertex which is the next crossing "},
 	{"isIncrementing", ( PyCFunction ) ChainingIterator_isIncrementing, METH_NOARGS, "() Returns true if the current iteration is an incrementation."},
+	{"getObject", ( PyCFunction ) ChainingIterator_getObject, METH_NOARGS, "() Get object referenced by the iterator"},
 	{NULL, NULL, 0, NULL}
 };
 
@@ -171,7 +174,14 @@ PyObject *ChainingIterator_isIncrementing( BPy_ChainingIterator *self ) {
 	return PyBool_from_bool( self->c_it->isIncrementing() );
 }
 
+PyObject * ChainingIterator_getObject( BPy_ChainingIterator *self) {
+	
+	ViewEdge *ve = self->c_it->operator*();
+	if( ve )
+		return BPy_ViewEdge_from_ViewEdge( *ve );
 
+	Py_RETURN_NONE;
+}
 
 
 
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.h
index 2994f381c1d..2a00aa8072f 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.h
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.h
@@ -16,7 +16,7 @@ extern "C" {
 
 extern PyTypeObject ChainingIterator_Type;
 
-#define BPy_ChainingIterator_Check(v)	(( (PyObject *) v)->ob_type == &ChainingIterator_Type)
+#define BPy_ChainingIterator_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ChainingIterator_Type)  )
 
 /*---------------------------Python BPy_ChainingIterator structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp
index 1f830261739..c02bd0a00fc 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp
@@ -1,5 +1,6 @@
 #include "BPy_CurvePointIterator.h"
 
+#include "../BPy_Convert.h"
 #include "BPy_Interface0DIterator.h"
 
 #ifdef __cplusplus
@@ -14,12 +15,14 @@ static PyObject * CurvePointIterator_t( BPy_CurvePointIterator *self );
 static PyObject * CurvePointIterator_u( BPy_CurvePointIterator *self );
 static PyObject * CurvePointIterator_castToInterface0DIterator( BPy_CurvePointIterator *self );
 
+static PyObject * CurvePointIterator_getObject(BPy_CurvePointIterator *self);
 
 /*----------------------CurvePointIterator instance definitions ----------------------------*/
 static PyMethodDef BPy_CurvePointIterator_methods[] = {
 	{"t", ( PyCFunction ) CurvePointIterator_t, METH_NOARGS, "（ ）Returns the curvilinear abscissa."},
 	{"u", ( PyCFunction ) CurvePointIterator_u, METH_NOARGS, "（ ）Returns the point parameter in the curve 0<=u<=1."},
 	{"castToInterface0DIterator", ( PyCFunction ) CurvePointIterator_castToInterface0DIterator, METH_NOARGS, "() Casts this CurvePointIterator into an Interface0DIterator. Useful for any call to a function of the type UnaryFunction0D."},
+	{"getObject", ( PyCFunction ) CurvePointIterator_getObject, METH_NOARGS, "() Get object referenced by the iterator"},
 	{NULL, NULL, 0, NULL}
 };
 
@@ -153,6 +156,10 @@ PyObject * CurvePointIterator_castToInterface0DIterator( BPy_CurvePointIterator
 	return py_if0D_it;
 }
 
+PyObject * CurvePointIterator_getObject(BPy_CurvePointIterator *self) {
+	return BPy_CurvePoint_from_CurvePoint( self->cp_it->operator*() );
+}
+
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.h
index e8f082216de..ad04c7208bb 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.h
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.h
@@ -15,7 +15,7 @@ extern "C" {
 
 extern PyTypeObject CurvePointIterator_Type;
 
-#define BPy_CurvePointIterator_Check(v)	(( (PyObject *) v)->ob_type == &CurvePointIterator_Type)
+#define BPy_CurvePointIterator_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &CurvePointIterator_Type)  )
 
 /*---------------------------Python BPy_CurvePointIterator structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp
index c88ba7773ab..92c3a7dfc38 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp
@@ -1,5 +1,7 @@
 #include "BPy_Interface0DIterator.h"
 
+#include "../BPy_Convert.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -12,10 +14,13 @@ static int Interface0DIterator___init__(BPy_Interface0DIterator *self, PyObject
 static PyObject * Interface0DIterator_t( BPy_Interface0DIterator *self );
 static PyObject * Interface0DIterator_u( BPy_Interface0DIterator *self );
 
+static PyObject * Interface0DIterator_getObject(BPy_Interface0DIterator *self);
+
 /*----------------------Interface0DIterator instance definitions ----------------------------*/
 static PyMethodDef BPy_Interface0DIterator_methods[] = {
 	{"t", ( PyCFunction ) Interface0DIterator_t, METH_NOARGS, "（ ）Returns the curvilinear abscissa."},
 	{"u", ( PyCFunction ) Interface0DIterator_u, METH_NOARGS, "（ ）Returns the point parameter in the curve 0<=u<=1."},
+	{"getObject", ( PyCFunction ) Interface0DIterator_getObject, METH_NOARGS, "() Get object referenced by the iterator"},
 	{NULL, NULL, 0, NULL}
 };
 
@@ -130,6 +135,11 @@ PyObject * Interface0DIterator_u( BPy_Interface0DIterator *self ) {
 	return PyFloat_FromDouble( self->if0D_it->u() );
 }
 
+PyObject * Interface0DIterator_getObject(BPy_Interface0DIterator *self) {
+	return BPy_Interface0D_from_Interface0D( self->if0D_it->operator*() );
+}
+
+
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.h
index 16edb2c3d68..c829d3d9d31 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.h
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.h
@@ -15,7 +15,7 @@ extern "C" {
 
 extern PyTypeObject Interface0DIterator_Type;
 
-#define BPy_Interface0DIterator_Check(v)	(( (PyObject *) v)->ob_type == &Interface0DIterator_Type)
+#define BPy_Interface0DIterator_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Interface0DIterator_Type)  )
 
 /*---------------------------Python BPy_Interface0DIterator structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp
index 649447f1db6..383480b8a9d 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp
@@ -1,5 +1,6 @@
 #include "BPy_SVertexIterator.h"
 
+#include "../BPy_Convert.h"
 #include "../Interface0D/BPy_SVertex.h"
 #include "../Interface1D/BPy_FEdge.h"
 
@@ -15,10 +16,13 @@ static int SVertexIterator___init__(BPy_SVertexIterator *self, PyObject *args);
 static PyObject * SVertexIterator_t( BPy_SVertexIterator *self );
 static PyObject * SVertexIterator_u( BPy_SVertexIterator *self );
 
+static PyObject * SVertexIterator_getObject( BPy_SVertexIterator *self);
+
 /*----------------------SVertexIterator instance definitions ----------------------------*/
 static PyMethodDef BPy_SVertexIterator_methods[] = {
 	{"t", ( PyCFunction ) SVertexIterator_t, METH_NOARGS, "（ ）Returns the curvilinear abscissa."},
 	{"u", ( PyCFunction ) SVertexIterator_u, METH_NOARGS, "（ ）Returns the point parameter in the curve 0<=u<=1."},
+	{"getObject", ( PyCFunction ) SVertexIterator_getObject, METH_NOARGS, "() Get object referenced by the iterator"},
 	{NULL, NULL, 0, NULL}
 };
 
@@ -155,6 +159,11 @@ PyObject * SVertexIterator_u( BPy_SVertexIterator *self ) {
 	return PyFloat_FromDouble( self->sv_it->u() );
 }
 
+PyObject * SVertexIterator_getObject( BPy_SVertexIterator *self) {
+	return BPy_SVertex_from_SVertex( self->sv_it->operator*() );
+}
+
+
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.h
index ba6fbf020d0..b40f4d36420 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.h
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.h
@@ -16,7 +16,7 @@ extern "C" {
 
 extern PyTypeObject SVertexIterator_Type;
 
-#define BPy_SVertexIterator_Check(v)	(( (PyObject *) v)->ob_type == &SVertexIterator_Type)
+#define BPy_SVertexIterator_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &SVertexIterator_Type)  )
 
 /*---------------------------Python BPy_SVertexIterator structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp
index 1f04be635c5..0b1554a1cb7 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp
@@ -1,5 +1,6 @@
 #include "BPy_StrokeVertexIterator.h"
 
+#include "../BPy_Convert.h"
 #include "BPy_Interface0DIterator.h"
 
 #ifdef __cplusplus
@@ -14,11 +15,15 @@ static PyObject * StrokeVertexIterator_t( BPy_StrokeVertexIterator *self );
 static PyObject * StrokeVertexIterator_u( BPy_StrokeVertexIterator *self );
 static PyObject * StrokeVertexIterator_castToInterface0DIterator( BPy_StrokeVertexIterator *self );
 
+static PyObject * StrokeVertexIterator_getObject( BPy_StrokeVertexIterator *self);
+
+
 /*----------------------StrokeVertexIterator instance definitions ----------------------------*/
 static PyMethodDef BPy_StrokeVertexIterator_methods[] = {
 	{"t", ( PyCFunction ) StrokeVertexIterator_t, METH_NOARGS, "（ ）Returns the curvilinear abscissa."},
 	{"u", ( PyCFunction ) StrokeVertexIterator_u, METH_NOARGS, "（ ）Returns the point parameter in the curve 0<=u<=1."},
 	{"castToInterface0DIterator", ( PyCFunction ) StrokeVertexIterator_castToInterface0DIterator, METH_NOARGS, "() Casts this StrokeVertexIterator into an Interface0DIterator. Useful for any call to a function of the type UnaryFunction0D."},
+	{"getObject", ( PyCFunction ) StrokeVertexIterator_getObject, METH_NOARGS, "() Get object referenced by the iterator"},
 	{NULL, NULL, 0, NULL}
 };
 
@@ -149,6 +154,10 @@ PyObject * StrokeVertexIterator_castToInterface0DIterator( BPy_StrokeVertexItera
 	return py_if0D_it;
 }
 
+PyObject * StrokeVertexIterator_getObject( BPy_StrokeVertexIterator *self) {
+	return BPy_StrokeVertex_from_StrokeVertex( self->sv_it->operator*() );
+}
+
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.h
index 488a1efea3d..9e95fc0a401 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.h
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.h
@@ -15,7 +15,7 @@ extern "C" {
 
 extern PyTypeObject StrokeVertexIterator_Type;
 
-#define BPy_StrokeVertexIterator_Check(v)	(( (PyObject *) v)->ob_type == &StrokeVertexIterator_Type)
+#define BPy_StrokeVertexIterator_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &StrokeVertexIterator_Type)  )
 
 /*---------------------------Python BPy_StrokeVertexIterator structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp
index add10cd1522..1f3e3c05d91 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp
@@ -21,6 +21,9 @@ static PyObject * ViewEdgeIterator_getOrientation( BPy_ViewEdgeIterator *self );
 static PyObject * ViewEdgeIterator_setOrientation( BPy_ViewEdgeIterator *self, PyObject *args );
 static PyObject * ViewEdgeIterator_changeOrientation( BPy_ViewEdgeIterator *self );
 
+static PyObject * ViewEdgeIterator_getObject(BPy_ViewEdgeIterator *self);
+
+
 /*----------------------ViewEdgeIterator instance definitions ----------------------------*/
 static PyMethodDef BPy_ViewEdgeIterator_methods[] = {
 	{"getCurrentEdge", ( PyCFunction ) ViewEdgeIterator_getCurrentEdge, METH_NOARGS, "() Returns the current pointed ViewEdge."},
@@ -30,6 +33,7 @@ static PyMethodDef BPy_ViewEdgeIterator_methods[] = {
 	{"getOrientation", ( PyCFunction ) ViewEdgeIterator_getOrientation, METH_NOARGS, "() Gets the orientation of the pointed ViewEdge in the iteration. "},
 	{"setOrientation", ( PyCFunction ) ViewEdgeIterator_setOrientation, METH_VARARGS, "(bool b) Sets the orientation of the pointed ViewEdge in the iteration. "},
 	{"changeOrientation", ( PyCFunction ) ViewEdgeIterator_changeOrientation, METH_NOARGS, "() Changes the current orientation."},
+	{"getObject", ( PyCFunction ) ViewEdgeIterator_getObject, METH_NOARGS, "() Get object referenced by the iterator"},
 	{NULL, NULL, 0, NULL}
 };
 
@@ -208,6 +212,14 @@ PyObject *ViewEdgeIterator_changeOrientation( BPy_ViewEdgeIterator *self ) {
 	Py_RETURN_NONE;
 }
 
+PyObject * ViewEdgeIterator_getObject( BPy_ViewEdgeIterator *self) {
+
+	ViewEdge *ve = self->ve_it->operator*();
+	if( ve )
+		return BPy_ViewEdge_from_ViewEdge( *ve );
+
+	Py_RETURN_NONE;
+}
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.h
index a86547c5937..dce90efc8cf 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.h
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.h
@@ -16,7 +16,7 @@ extern "C" {
 
 extern PyTypeObject ViewEdgeIterator_Type;
 
-#define BPy_ViewEdgeIterator_Check(v)	(( (PyObject *) v)->ob_type == &ViewEdgeIterator_Type)
+#define BPy_ViewEdgeIterator_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ViewEdgeIterator_Type)  )
 
 /*---------------------------Python BPy_ViewEdgeIterator structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp
index ec6850c3b96..0937e04e3a7 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp
@@ -1,5 +1,7 @@
 #include "BPy_orientedViewEdgeIterator.h"
 
+#include "../BPy_Convert.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -9,8 +11,12 @@ extern "C" {
 /*---------------  Python API function prototypes for orientedViewEdgeIterator instance  -----------*/
 static int orientedViewEdgeIterator___init__(BPy_orientedViewEdgeIterator *self, PyObject *args);
 
+static PyObject * orientedViewEdgeIterator_getObject(BPy_orientedViewEdgeIterator *self);
+
+
 /*----------------------orientedViewEdgeIterator instance definitions ----------------------------*/
 static PyMethodDef BPy_orientedViewEdgeIterator_methods[] = {
+	{"getObject", ( PyCFunction ) orientedViewEdgeIterator_getObject, METH_NOARGS, "() Get object referenced by the iterator"},
 	{NULL, NULL, 0, NULL}
 };
 
@@ -99,9 +105,6 @@ PyTypeObject orientedViewEdgeIterator_Type = {
 	NULL
 };
 
-//-------------------MODULE INITIALIZATION--------------------------------
-
-
 //------------------------INSTANCE METHODS ----------------------------------
 
 int orientedViewEdgeIterator___init__(BPy_orientedViewEdgeIterator *self, PyObject *args )
@@ -121,6 +124,10 @@ int orientedViewEdgeIterator___init__(BPy_orientedViewEdgeIterator *self, PyObje
 	return 0;
 }
 
+PyObject * orientedViewEdgeIterator_getObject( BPy_orientedViewEdgeIterator *self) {
+	return BPy_directedViewEdge_from_directedViewEdge( self->ove_it->operator*() );
+}
+
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.h
index 1c8a25258b7..973d0f2b728 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.h
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.h
@@ -16,7 +16,7 @@ extern "C" {
 
 extern PyTypeObject orientedViewEdgeIterator_Type;
 
-#define BPy_orientedViewEdgeIterator_Check(v)	(( (PyObject *) v)->ob_type == &orientedViewEdgeIterator_Type)
+#define BPy_orientedViewEdgeIterator_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &orientedViewEdgeIterator_Type)  )
 
 /*---------------------------Python BPy_orientedViewEdgeIterator structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.h
index 161bdb5db40..35a74c0bda2 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject BackboneStretcherShader_Type;
 
-#define BPy_BackboneStretcherShader_Check(v)	(( (PyObject *) v)->ob_type == &BackboneStretcherShader_Type)
+#define BPy_BackboneStretcherShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &BackboneStretcherShader_Type)  )
 
 /*---------------------------Python BPy_BackboneStretcherShader structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.h
index 56443ca26ad..b94ef88acea 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject BezierCurveShader_Type;
 
-#define BPy_BezierCurveShader_Check(v)	(( (PyObject *) v)->ob_type == &BezierCurveShader_Type)
+#define BPy_BezierCurveShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &BezierCurveShader_Type)  )
 
 /*---------------------------Python BPy_BezierCurveShader structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.h
index d3a4782c794..c573b0184ad 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject CalligraphicShader_Type;
 
-#define BPy_CalligraphicShader_Check(v)	(( (PyObject *) v)->ob_type == &CalligraphicShader_Type)
+#define BPy_CalligraphicShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &CalligraphicShader_Type)
 
 /*---------------------------Python BPy_CalligraphicShader structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.h
index e4ad2c0e1af..694b847565e 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject ColorNoiseShader_Type;
 
-#define BPy_ColorNoiseShader_Check(v)	(( (PyObject *) v)->ob_type == &ColorNoiseShader_Type)
+#define BPy_ColorNoiseShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ColorNoiseShader_Type)  )
 
 /*---------------------------Python BPy_ColorNoiseShader structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.h
index 12f7bbca151..b1898ebfecf 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject ColorVariationPatternShader_Type;
 
-#define BPy_ColorVariationPatternShader_Check(v)	(( (PyObject *) v)->ob_type == &ColorVariationPatternShader_Type)
+#define BPy_ColorVariationPatternShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ColorVariationPatternShader_Type)  )
 
 /*---------------------------Python BPy_ColorVariationPatternShader structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.h
index 0f3ae177d15..30a09d852fd 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject ConstantColorShader_Type;
 
-#define BPy_ConstantColorShader_Check(v)	(( (PyObject *) v)->ob_type == &ConstantColorShader_Type)
+#define BPy_ConstantColorShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ConstantColorShader_Type)  )
 
 /*---------------------------Python BPy_ConstantColorShader structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.h
index d8cb7239fd9..bb7f3c0f622 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject ConstantThicknessShader_Type;
 
-#define BPy_ConstantThicknessShader_Check(v)	(( (PyObject *) v)->ob_type == &ConstantThicknessShader_Type)
+#define BPy_ConstantThicknessShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ConstantThicknessShader_Type)  )
 
 /*---------------------------Python BPy_ConstantThicknessShader structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.h
index f712706d2ee..38a8aa2bfe0 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject ConstrainedIncreasingThicknessShader_Type;
 
-#define BPy_ConstrainedIncreasingThicknessShader_Check(v)	(( (PyObject *) v)->ob_type == &ConstrainedIncreasingThicknessShader_Type)
+#define BPy_ConstrainedIncreasingThicknessShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ConstrainedIncreasingThicknessShader_Type)  )
 
 /*---------------------------Python BPy_ConstrainedIncreasingThicknessShader structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.h
index 2cf032e24ae..e25704c33ba 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject GuidingLinesShader_Type;
 
-#define BPy_GuidingLinesShader_Check(v)	(( (PyObject *) v)->ob_type == &GuidingLinesShader_Type)
+#define BPy_GuidingLinesShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GuidingLinesShader_Type)  )
 
 /*---------------------------Python BPy_GuidingLinesShader structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.h
index 4ef7f3f239d..9bc82e98098 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject IncreasingColorShader_Type;
 
-#define BPy_IncreasingColorShader_Check(v)	(( (PyObject *) v)->ob_type == &IncreasingColorShader_Type)
+#define BPy_IncreasingColorShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &IncreasingColorShader_Type)  )
 
 /*---------------------------Python BPy_IncreasingColorShader structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.h
index ae4f37835cc..33d883b1860 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject IncreasingThicknessShader_Type;
 
-#define BPy_IncreasingThicknessShader_Check(v)	(( (PyObject *) v)->ob_type == &IncreasingThicknessShader_Type)
+#define BPy_IncreasingThicknessShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &IncreasingThicknessShader_Type)  )
 
 /*---------------------------Python BPy_IncreasingThicknessShader structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.h
index 7cc2e94e2cc..85bcc00e869 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject PolygonalizationShader_Type;
 
-#define BPy_PolygonalizationShader_Check(v)	(( (PyObject *) v)->ob_type == &PolygonalizationShader_Type)
+#define BPy_PolygonalizationShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &PolygonalizationShader_Type)  )
 
 /*---------------------------Python BPy_PolygonalizationShader structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.h
index 763bee23168..dfc6efb3319 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject SamplingShader_Type;
 
-#define BPy_SamplingShader_Check(v)	(( (PyObject *) v)->ob_type == &SamplingShader_Type)
+#define BPy_SamplingShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &SamplingShader_Type)  )
 
 /*---------------------------Python BPy_SamplingShader structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.h
index ac232502881..46e1c12385d 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject SpatialNoiseShader_Type;
 
-#define BPy_SpatialNoiseShader_Check(v)	(( (PyObject *) v)->ob_type == &SpatialNoiseShader_Type)
+#define BPy_SpatialNoiseShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &SpatialNoiseShader_Type)  )
 
 /*---------------------------Python BPy_SpatialNoiseShader structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.h
index d60ba3080ab..c65506f2f14 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject StrokeTextureShader_Type;
 
-#define BPy_StrokeTextureShader_Check(v)	(( (PyObject *) v)->ob_type == &StrokeTextureShader_Type)
+#define BPy_StrokeTextureShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &StrokeTextureShader_Type)  )
 
 /*---------------------------Python BPy_StrokeTextureShader structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_TextureAssignerShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_TextureAssignerShader.h
index 658f3f4ec8d..9cffc1c1662 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_TextureAssignerShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_TextureAssignerShader.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject TextureAssignerShader_Type;
 
-#define BPy_TextureAssignerShader_Check(v)	(( (PyObject *) v)->ob_type == &TextureAssignerShader_Type)
+#define BPy_TextureAssignerShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &TextureAssignerShader_Type)  )
 
 /*---------------------------Python BPy_TextureAssignerShader structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.h
index 8a0437715f4..c3ef101683e 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject ThicknessNoiseShader_Type;
 
-#define BPy_ThicknessNoiseShader_Check(v)	(( (PyObject *) v)->ob_type == &ThicknessNoiseShader_Type)
+#define BPy_ThicknessNoiseShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ThicknessNoiseShader_Type)  )
 
 /*---------------------------Python BPy_ThicknessNoiseShader structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.h
index 4c850bdb50f..302c9e005ae 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject ThicknessVariationPatternShader_Type;
 
-#define BPy_ThicknessVariationPatternShader_Check(v)	(( (PyObject *) v)->ob_type == &ThicknessVariationPatternShader_Type)
+#define BPy_ThicknessVariationPatternShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ThicknessVariationPatternShader_Type)  )
 
 /*---------------------------Python BPy_ThicknessVariationPatternShader structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.h
index 1ca4594d8d5..a1b2e3988bc 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject TipRemoverShader_Type;
 
-#define BPy_TipRemoverShader_Check(v)	(( (PyObject *) v)->ob_type == &TipRemoverShader_Type)
+#define BPy_TipRemoverShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &TipRemoverShader_Type)  )
 
 /*---------------------------Python BPy_TipRemoverShader structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.h
index 02cf0daff18..843d50505db 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject fstreamShader_Type;
 
-#define BPy_fstreamShader_Check(v)	(( (PyObject *) v)->ob_type == &fstreamShader_Type)
+#define BPy_fstreamShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &fstreamShader_Type)  )
 
 /*---------------------------Python BPy_fstreamShader structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_streamShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_streamShader.h
index ae34cb44798..38056d5fa59 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_streamShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_streamShader.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject streamShader_Type;
 
-#define BPy_streamShader_Check(v)	(( (PyObject *) v)->ob_type == &streamShader_Type)
+#define BPy_streamShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &streamShader_Type)  )
 
 /*---------------------------Python BPy_streamShader structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.h
index 2f0cb828419..6aadc3be4ac 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject UnaryFunction0DDouble_Type;
 
-#define BPy_UnaryFunction0DDouble_Check(v)	(( (PyObject *) v)->ob_type == &UnaryFunction0DDouble_Type)
+#define BPy_UnaryFunction0DDouble_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction0DDouble_Type)  )
 
 /*---------------------------Python BPy_UnaryFunction0DDouble structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.h
index 2aacd343ab1..30e16835482 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.h
@@ -15,7 +15,7 @@ extern "C" {
 
 extern PyTypeObject UnaryFunction0DEdgeNature_Type;
 
-#define BPy_UnaryFunction0DEdgeNature_Check(v)	(( (PyObject *) v)->ob_type == &UnaryFunction0DEdgeNature_Type)
+#define BPy_UnaryFunction0DEdgeNature_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction0DEdgeNature_Type)  )
 
 /*---------------------------Python BPy_UnaryFunction0DEdgeNature structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.h
index 46183228af6..7662a118a09 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject UnaryFunction0DFloat_Type;
 
-#define BPy_UnaryFunction0DFloat_Check(v)	(( (PyObject *) v)->ob_type == &UnaryFunction0DFloat_Type)
+#define BPy_UnaryFunction0DFloat_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction0DFloat_Type)  )
 
 /*---------------------------Python BPy_UnaryFunction0DFloat structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.h
index b1b87058bc8..ee15c63d8f0 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.h
@@ -15,7 +15,7 @@ extern "C" {
 
 extern PyTypeObject UnaryFunction0DId_Type;
 
-#define BPy_UnaryFunction0DId_Check(v)	(( (PyObject *) v)->ob_type == &UnaryFunction0DId_Type)
+#define BPy_UnaryFunction0DId_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction0DId_Type)  )
 
 /*---------------------------Python BPy_UnaryFunction0DId structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.h
index d8baa3d98f4..5e932213128 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.h
@@ -15,7 +15,7 @@ extern "C" {
 
 extern PyTypeObject UnaryFunction0DMaterial_Type;
 
-#define BPy_UnaryFunction0DMaterial_Check(v)	(( (PyObject *) v)->ob_type == &UnaryFunction0DMaterial_Type)
+#define BPy_UnaryFunction0DMaterial_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction0DMaterial_Type)  )
 
 /*---------------------------Python BPy_UnaryFunction0DMaterial structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.h
index f79739b7a34..e6b7351ae07 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject UnaryFunction0DUnsigned_Type;
 
-#define BPy_UnaryFunction0DUnsigned_Check(v)	(( (PyObject *) v)->ob_type == &UnaryFunction0DUnsigned_Type)
+#define BPy_UnaryFunction0DUnsigned_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction0DUnsigned_Type)  )
 
 /*---------------------------Python BPy_UnaryFunction0DUnsigned structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.h
index a52edd1461a..82c9845e08b 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.h
@@ -16,7 +16,7 @@ extern "C" {
 
 extern PyTypeObject UnaryFunction0DVec2f_Type;
 
-#define BPy_UnaryFunction0DVec2f_Check(v)	(( (PyObject *) v)->ob_type == &UnaryFunction0DVec2f_Type)
+#define BPy_UnaryFunction0DVec2f_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction0DVec2f_Type)  )
 
 /*---------------------------Python BPy_UnaryFunction0DVec2f structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.h
index b0e598c05cd..7bd2b81dad6 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.h
@@ -16,7 +16,7 @@ extern "C" {
 
 extern PyTypeObject UnaryFunction0DVec3f_Type;
 
-#define BPy_UnaryFunction0DVec3f_Check(v)	(( (PyObject *) v)->ob_type == &UnaryFunction0DVec3f_Type)
+#define BPy_UnaryFunction0DVec3f_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction0DVec3f_Type)  )
 
 /*---------------------------Python BPy_UnaryFunction0DVec3f structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.h
index 88daae11b68..9d9f7b9deda 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.h
@@ -16,7 +16,7 @@ extern "C" {
 
 extern PyTypeObject UnaryFunction0DVectorViewShape_Type;
 
-#define BPy_UnaryFunction0DVectorViewShape_Check(v)	(( (PyObject *) v)->ob_type == &UnaryFunction0DVectorViewShape_Type)
+#define BPy_UnaryFunction0DVectorViewShape_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction0DVectorViewShape_Type)  )
 
 /*---------------------------Python BPy_UnaryFunction0DVectorViewShape structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.h
index 01057333a3e..e0bb3989506 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.h
@@ -15,7 +15,7 @@ extern "C" {
 
 extern PyTypeObject UnaryFunction0DViewShape_Type;
 
-#define BPy_UnaryFunction0DViewShape_Check(v)	(( (PyObject *) v)->ob_type == &UnaryFunction0DViewShape_Type)
+#define BPy_UnaryFunction0DViewShape_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction0DViewShape_Type)  )
 
 /*---------------------------Python BPy_UnaryFunction0DViewShape structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/BPy_ShapeIdF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/BPy_ShapeIdF0D.h
index 25d4bd76a1b..11995bb4e88 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/BPy_ShapeIdF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/BPy_ShapeIdF0D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject ShapeIdF0D_Type;
 
-#define BPy_ShapeIdF0D_Check(v)	(( (PyObject *) v)->ob_type == &ShapeIdF0D_Type)
+#define BPy_ShapeIdF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ShapeIdF0D_Type)  )
 
 /*---------------------------Python BPy_ShapeIdF0D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.h
index 4a3af1b9ff6..1ae30484ba5 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject MaterialF0D_Type;
 
-#define BPy_MaterialF0D_Check(v)	(( (PyObject *) v)->ob_type == &MaterialF0D_Type)
+#define BPy_MaterialF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &MaterialF0D_Type)  )
 
 /*---------------------------Python BPy_MaterialF0D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.h
index 62494f3dbaa..63b3050c474 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject CurveNatureF0D_Type;
 
-#define BPy_CurveNatureF0D_Check(v)	(( (PyObject *) v)->ob_type == &CurveNatureF0D_Type)
+#define BPy_CurveNatureF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &CurveNatureF0D_Type)  )
 
 /*---------------------------Python BPy_CurveNatureF0D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.h
index 1482ffae5f2..0b3be2df428 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject Normal2DF0D_Type;
 
-#define BPy_Normal2DF0D_Check(v)	(( (PyObject *) v)->ob_type == &Normal2DF0D_Type)
+#define BPy_Normal2DF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Normal2DF0D_Type)  )
 
 /*---------------------------Python BPy_Normal2DF0D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.h
index c6ace665481..1cce9b592ba 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject VertexOrientation2DF0D_Type;
 
-#define BPy_VertexOrientation2DF0D_Check(v)	(( (PyObject *) v)->ob_type == &VertexOrientation2DF0D_Type)
+#define BPy_VertexOrientation2DF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &VertexOrientation2DF0D_Type)  )
 
 /*---------------------------Python BPy_VertexOrientation2DF0D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.h
index 6a916362bb7..80cac529f0b 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject VertexOrientation3DF0D_Type;
 
-#define BPy_VertexOrientation3DF0D_Check(v)	(( (PyObject *) v)->ob_type == &VertexOrientation3DF0D_Type)
+#define BPy_VertexOrientation3DF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &VertexOrientation3DF0D_Type)  )
 
 /*---------------------------Python BPy_VertexOrientation3DF0D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.h
index 2ba71a6637e..fd4f7d92bbb 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject GetOccludeeF0D_Type;
 
-#define BPy_GetOccludeeF0D_Check(v)	(( (PyObject *) v)->ob_type == &GetOccludeeF0D_Type)
+#define BPy_GetOccludeeF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetOccludeeF0D_Type)  )
 
 /*---------------------------Python BPy_GetOccludeeF0D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.h
index 6e97bd9a690..040c753968d 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject GetShapeF0D_Type;
 
-#define BPy_GetShapeF0D_Check(v)	(( (PyObject *) v)->ob_type == &GetShapeF0D_Type)
+#define BPy_GetShapeF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetShapeF0D_Type)  )
 
 /*---------------------------Python BPy_GetShapeF0D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_Curvature2DAngleF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_Curvature2DAngleF0D.h
index 1146369320a..810ba04db8a 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_Curvature2DAngleF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_Curvature2DAngleF0D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject Curvature2DAngleF0D_Type;
 
-#define BPy_Curvature2DAngleF0D_Check(v)	(( (PyObject *) v)->ob_type == &Curvature2DAngleF0D_Type)
+#define BPy_Curvature2DAngleF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Curvature2DAngleF0D_Type)  )
 
 /*---------------------------Python BPy_Curvature2DAngleF0D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.h
index 3b113a0e636..17ea95a771c 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject DensityF0D_Type;
 
-#define BPy_DensityF0D_Check(v)	(( (PyObject *) v)->ob_type == &DensityF0D_Type)
+#define BPy_DensityF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &DensityF0D_Type)  )
 
 /*---------------------------Python BPy_DensityF0D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedXF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedXF0D.h
index dcf6648cd6d..da73623cbf0 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedXF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedXF0D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject GetProjectedXF0D_Type;
 
-#define BPy_GetProjectedXF0D_Check(v)	(( (PyObject *) v)->ob_type == &GetProjectedXF0D_Type)
+#define BPy_GetProjectedXF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetProjectedXF0D_Type)  )
 
 /*---------------------------Python BPy_GetProjectedXF0D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedYF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedYF0D.h
index ea7d5a5ab76..3a26e093747 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedYF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedYF0D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject GetProjectedYF0D_Type;
 
-#define BPy_GetProjectedYF0D_Check(v)	(( (PyObject *) v)->ob_type == &GetProjectedYF0D_Type)
+#define BPy_GetProjectedYF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetProjectedYF0D_Type)  )
 
 /*---------------------------Python BPy_GetProjectedYF0D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedZF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedZF0D.h
index c3cd9cb8c19..aa41b70c660 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedZF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedZF0D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject GetProjectedZF0D_Type;
 
-#define BPy_GetProjectedZF0D_Check(v)	(( (PyObject *) v)->ob_type == &GetProjectedZF0D_Type)
+#define BPy_GetProjectedZF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetProjectedZF0D_Type)  )
 
 /*---------------------------Python BPy_GetProjectedZF0D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetXF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetXF0D.h
index 6164a46f252..69e9a892f4a 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetXF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetXF0D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject GetXF0D_Type;
 
-#define BPy_GetXF0D_Check(v)	(( (PyObject *) v)->ob_type == &GetXF0D_Type)
+#define BPy_GetXF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetXF0D_Type)  )
 
 /*---------------------------Python BPy_GetXF0D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetYF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetYF0D.h
index f85e2c5976a..0601f38585f 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetYF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetYF0D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject GetYF0D_Type;
 
-#define BPy_GetYF0D_Check(v)	(( (PyObject *) v)->ob_type == &GetYF0D_Type)
+#define BPy_GetYF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetYF0D_Type)  )
 
 /*---------------------------Python BPy_GetYF0D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetZF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetZF0D.h
index c7bed2ebda8..eac52426600 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetZF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetZF0D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject GetZF0D_Type;
 
-#define BPy_GetZF0D_Check(v)	(( (PyObject *) v)->ob_type == &GetZF0D_Type)
+#define BPy_GetZF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetZF0D_Type)  )
 
 /*---------------------------Python BPy_GetZF0D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_LocalAverageDepthF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_LocalAverageDepthF0D.h
index 6f84891fc1d..7385e1d24c1 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_LocalAverageDepthF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_LocalAverageDepthF0D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject LocalAverageDepthF0D_Type;
 
-#define BPy_LocalAverageDepthF0D_Check(v)	(( (PyObject *) v)->ob_type == &LocalAverageDepthF0D_Type)
+#define BPy_LocalAverageDepthF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &LocalAverageDepthF0D_Type)  )
 
 /*---------------------------Python BPy_LocalAverageDepthF0D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.h
index 21f854d96c9..a26ba4fdbd6 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject ZDiscontinuityF0D_Type;
 
-#define BPy_ZDiscontinuityF0D_Check(v)	(( (PyObject *) v)->ob_type == &ZDiscontinuityF0D_Type)
+#define BPy_ZDiscontinuityF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ZDiscontinuityF0D_Type)  )
 
 /*---------------------------Python BPy_ZDiscontinuityF0D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.h
index f36371dfee5..0cb56fcec70 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject GetCurvilinearAbscissaF0D_Type;
 
-#define BPy_GetCurvilinearAbscissaF0D_Check(v)	(( (PyObject *) v)->ob_type == &GetCurvilinearAbscissaF0D_Type)
+#define BPy_GetCurvilinearAbscissaF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetCurvilinearAbscissaF0D_Type)  )
 
 /*---------------------------Python BPy_GetCurvilinearAbscissaF0D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetParameterF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetParameterF0D.h
index 77a08de4b07..4817e5cec86 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetParameterF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetParameterF0D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject GetParameterF0D_Type;
 
-#define BPy_GetParameterF0D_Check(v)	(( (PyObject *) v)->ob_type == &GetParameterF0D_Type)
+#define BPy_GetParameterF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetParameterF0D_Type)  )
 
 /*---------------------------Python BPy_GetParameterF0D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.h
index aa626703aff..c072ba7f408 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject GetViewMapGradientNormF0D_Type;
 
-#define BPy_GetViewMapGradientNormF0D_Check(v)	(( (PyObject *) v)->ob_type == &GetViewMapGradientNormF0D_Type)
+#define BPy_GetViewMapGradientNormF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetViewMapGradientNormF0D_Type)  )
 
 /*---------------------------Python BPy_GetViewMapGradientNormF0D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.h
index 5a4d90e821d..6a10e6c06a4 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject ReadCompleteViewMapPixelF0D_Type;
 
-#define BPy_ReadCompleteViewMapPixelF0D_Check(v)	(( (PyObject *) v)->ob_type == &ReadCompleteViewMapPixelF0D_Type)
+#define BPy_ReadCompleteViewMapPixelF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ReadCompleteViewMapPixelF0D_Type)  )
 
 /*---------------------------Python BPy_ReadCompleteViewMapPixelF0D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadMapPixelF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadMapPixelF0D.h
index e010bd3495a..9aed0cd82bf 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadMapPixelF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadMapPixelF0D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject ReadMapPixelF0D_Type;
 
-#define BPy_ReadMapPixelF0D_Check(v)	(( (PyObject *) v)->ob_type == &ReadMapPixelF0D_Type)
+#define BPy_ReadMapPixelF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ReadMapPixelF0D_Type)  )
 
 /*---------------------------Python BPy_ReadMapPixelF0D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.h
index cc0c3a93f0e..a881a10f72d 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject ReadSteerableViewMapPixelF0D_Type;
 
-#define BPy_ReadSteerableViewMapPixelF0D_Check(v)	(( (PyObject *) v)->ob_type == &ReadSteerableViewMapPixelF0D_Type)
+#define BPy_ReadSteerableViewMapPixelF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ReadSteerableViewMapPixelF0D_Type)  )
 
 /*---------------------------Python BPy_ReadSteerableViewMapPixelF0D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.h
index 02706b48bd5..39b73343608 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject QuantitativeInvisibilityF0D_Type;
 
-#define BPy_QuantitativeInvisibilityF0D_Check(v)	(( (PyObject *) v)->ob_type == &QuantitativeInvisibilityF0D_Type)
+#define BPy_QuantitativeInvisibilityF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &QuantitativeInvisibilityF0D_Type)  )
 
 /*---------------------------Python BPy_QuantitativeInvisibilityF0D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.h
index 3d4108124f0..0e92158a2e7 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject GetOccludersF0D_Type;
 
-#define BPy_GetOccludersF0D_Check(v)	(( (PyObject *) v)->ob_type == &GetOccludersF0D_Type)
+#define BPy_GetOccludersF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetOccludersF0D_Type)  )
 
 /*---------------------------Python BPy_GetOccludersF0D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.h b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.h
index 7b6e9430498..81533dc21aa 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject UnaryFunction1DDouble_Type;
 
-#define BPy_UnaryFunction1DDouble_Check(v)	(( (PyObject *) v)->ob_type == &UnaryFunction1DDouble_Type)
+#define BPy_UnaryFunction1DDouble_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction1DDouble_Type)  )
 
 /*---------------------------Python BPy_UnaryFunction1DDouble structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.h b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.h
index 9e899916a95..afa65511560 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.h
@@ -15,7 +15,7 @@ extern "C" {
 
 extern PyTypeObject UnaryFunction1DEdgeNature_Type;
 
-#define BPy_UnaryFunction1DEdgeNature_Check(v)	(( (PyObject *) v)->ob_type == &UnaryFunction1DEdgeNature_Type)
+#define BPy_UnaryFunction1DEdgeNature_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction1DEdgeNature_Type)  )
 
 /*---------------------------Python BPy_UnaryFunction1DEdgeNature structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.h b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.h
index f454ab664ed..b144a95afe3 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject UnaryFunction1DFloat_Type;
 
-#define BPy_UnaryFunction1DFloat_Check(v)	(( (PyObject *) v)->ob_type == &UnaryFunction1DFloat_Type)
+#define BPy_UnaryFunction1DFloat_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction1DFloat_Type)  )
 
 /*---------------------------Python BPy_UnaryFunction1DFloat structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.h b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.h
index 0df50d9a999..5904f0ad267 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject UnaryFunction1DUnsigned_Type;
 
-#define BPy_UnaryFunction1DUnsigned_Check(v)	(( (PyObject *) v)->ob_type == &UnaryFunction1DUnsigned_Type)
+#define BPy_UnaryFunction1DUnsigned_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction1DUnsigned_Type)  )
 
 /*---------------------------Python BPy_UnaryFunction1DUnsigned structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.h b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.h
index 098992e6631..9d369a646a1 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.h
@@ -16,7 +16,7 @@ extern "C" {
 
 extern PyTypeObject UnaryFunction1DVec2f_Type;
 
-#define BPy_UnaryFunction1DVec2f_Check(v)	(( (PyObject *) v)->ob_type == &UnaryFunction1DVec2f_Type)
+#define BPy_UnaryFunction1DVec2f_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction1DVec2f_Type)  )
 
 /*---------------------------Python BPy_UnaryFunction1DVec2f structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.h b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.h
index 3829fa12b62..a79b173f0a9 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.h
@@ -16,7 +16,7 @@ extern "C" {
 
 extern PyTypeObject UnaryFunction1DVec3f_Type;
 
-#define BPy_UnaryFunction1DVec3f_Check(v)	(( (PyObject *) v)->ob_type == &UnaryFunction1DVec3f_Type)
+#define BPy_UnaryFunction1DVec3f_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction1DVec3f_Type)  )
 
 /*---------------------------Python BPy_UnaryFunction1DVec3f structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.h b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.h
index cdde1926c86..492129c2b9a 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.h
@@ -16,7 +16,7 @@ extern "C" {
 
 extern PyTypeObject UnaryFunction1DVectorViewShape_Type;
 
-#define BPy_UnaryFunction1DVectorViewShape_Check(v)	(( (PyObject *) v)->ob_type == &UnaryFunction1DVectorViewShape_Type)
+#define BPy_UnaryFunction1DVectorViewShape_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction1DVectorViewShape_Type)  )
 
 /*---------------------------Python BPy_UnaryFunction1DVectorViewShape structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.h b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.h
index 68d9c61569c..3e8ad431ec4 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject UnaryFunction1DVoid_Type;
 
-#define BPy_UnaryFunction1DVoid_Check(v)	(( (PyObject *) v)->ob_type == &UnaryFunction1DVoid_Type)
+#define BPy_UnaryFunction1DVoid_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction1DVoid_Type)  )
 
 /*---------------------------Python BPy_UnaryFunction1DVoid structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.h
index 7e9344dddda..852f8937954 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject CurveNatureF1D_Type;
 
-#define BPy_CurveNatureF1D_Check(v)	(( (PyObject *) v)->ob_type == &CurveNatureF1D_Type)
+#define BPy_CurveNatureF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &CurveNatureF1D_Type)  )
 
 /*---------------------------Python BPy_CurveNatureF1D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Normal2DF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Normal2DF1D.h
index 70bfb0adb12..32078558d0c 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Normal2DF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Normal2DF1D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject Normal2DF1D_Type;
 
-#define BPy_Normal2DF1D_Check(v)	(( (PyObject *) v)->ob_type == &Normal2DF1D_Type)
+#define BPy_Normal2DF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Normal2DF1D_Type)  )
 
 /*---------------------------Python BPy_Normal2DF1D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.h
index bcae5fc220f..189ab04db4f 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject Orientation2DF1D_Type;
 
-#define BPy_Orientation2DF1D_Check(v)	(( (PyObject *) v)->ob_type == &Orientation2DF1D_Type)
+#define BPy_Orientation2DF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Orientation2DF1D_Type)  )
 
 /*---------------------------Python BPy_Orientation2DF1D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.h
index a868c04ce15..b69baf106f4 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject Orientation3DF1D_Type;
 
-#define BPy_Orientation3DF1D_Check(v)	(( (PyObject *) v)->ob_type == &Orientation3DF1D_Type)
+#define BPy_Orientation3DF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Orientation3DF1D_Type)  )
 
 /*---------------------------Python BPy_Orientation3DF1D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_Curvature2DAngleF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_Curvature2DAngleF1D.h
index 838bb229844..1603a7dc4ea 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_Curvature2DAngleF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_Curvature2DAngleF1D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject Curvature2DAngleF1D_Type;
 
-#define BPy_Curvature2DAngleF1D_Check(v)	(( (PyObject *) v)->ob_type == &Curvature2DAngleF1D_Type)
+#define BPy_Curvature2DAngleF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Curvature2DAngleF1D_Type)  )
 
 /*---------------------------Python BPy_Curvature2DAngleF1D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_DensityF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_DensityF1D.h
index c7839b86d4d..36426536b36 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_DensityF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_DensityF1D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject DensityF1D_Type;
 
-#define BPy_DensityF1D_Check(v)	(( (PyObject *) v)->ob_type == &DensityF1D_Type)
+#define BPy_DensityF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &DensityF1D_Type)  )
 
 /*---------------------------Python BPy_DensityF1D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.h
index 5106930be75..5963b820348 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject GetCompleteViewMapDensityF1D_Type;
 
-#define BPy_GetCompleteViewMapDensityF1D_Check(v)	(( (PyObject *) v)->ob_type == &GetCompleteViewMapDensityF1D_Type)
+#define BPy_GetCompleteViewMapDensityF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetCompleteViewMapDensityF1D_Type)  )
 
 /*---------------------------Python BPy_GetCompleteViewMapDensityF1D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.h
index a2c3572694f..0e2d7ec2718 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject GetDirectionalViewMapDensityF1D_Type;
 
-#define BPy_GetDirectionalViewMapDensityF1D_Check(v)	(( (PyObject *) v)->ob_type == &GetDirectionalViewMapDensityF1D_Type)
+#define BPy_GetDirectionalViewMapDensityF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetDirectionalViewMapDensityF1D_Type)  )
 
 /*---------------------------Python BPy_GetDirectionalViewMapDensityF1D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedXF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedXF1D.h
index 26350df2013..d799fb7b334 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedXF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedXF1D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject GetProjectedXF1D_Type;
 
-#define BPy_GetProjectedXF1D_Check(v)	(( (PyObject *) v)->ob_type == &GetProjectedXF1D_Type)
+#define BPy_GetProjectedXF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetProjectedXF1D_Type)  )
 
 /*---------------------------Python BPy_GetProjectedXF1D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedYF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedYF1D.h
index 86602d9619c..1b7fe6c6b5f 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedYF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedYF1D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject GetProjectedYF1D_Type;
 
-#define BPy_GetProjectedYF1D_Check(v)	(( (PyObject *) v)->ob_type == &GetProjectedYF1D_Type)
+#define BPy_GetProjectedYF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetProjectedYF1D_Type)  )
 
 /*---------------------------Python BPy_GetProjectedYF1D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedZF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedZF1D.h
index 9f2a4bc1a3e..a87ac6f8c5e 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedZF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedZF1D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject GetProjectedZF1D_Type;
 
-#define BPy_GetProjectedZF1D_Check(v)	(( (PyObject *) v)->ob_type == &GetProjectedZF1D_Type)
+#define BPy_GetProjectedZF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetProjectedZF1D_Type)  )
 
 /*---------------------------Python BPy_GetProjectedZF1D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetSteerableViewMapDensityF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetSteerableViewMapDensityF1D.h
index fa9942a55a1..29880c7e9a7 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetSteerableViewMapDensityF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetSteerableViewMapDensityF1D.h
@@ -13,8 +13,7 @@ extern "C" {
 
 extern PyTypeObject GetSteerableViewMapDensityF1D_Type;
 
-#define BPy_GetSteerableViewMapDensityF1D_Check(v)	(( (PyObject *) v)->ob_type == &GetSteerableViewMapDensityF1D_Type)
-
+#define BPy_GetSteerableViewMapDensityF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetSteerableViewMapDensityF1D_Type)  )
 /*---------------------------Python BPy_GetSteerableViewMapDensityF1D structure definition----------*/
 typedef struct {
 	BPy_UnaryFunction1DDouble py_uf1D_double;
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetViewMapGradientNormF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetViewMapGradientNormF1D.h
index 5fcb88d5a29..4f07629870f 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetViewMapGradientNormF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetViewMapGradientNormF1D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject GetViewMapGradientNormF1D_Type;
 
-#define BPy_GetViewMapGradientNormF1D_Check(v)	(( (PyObject *) v)->ob_type == &GetViewMapGradientNormF1D_Type)
+#define BPy_GetViewMapGradientNormF1D_Check(v)	( ((PyObject *) v)->ob_type == PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetViewMapGradientNormF1D_Type)  )
 
 /*---------------------------Python BPy_GetViewMapGradientNormF1D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetXF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetXF1D.h
index ad39a5a9b10..5eae107daae 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetXF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetXF1D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject GetXF1D_Type;
 
-#define BPy_GetXF1D_Check(v)	(( (PyObject *) v)->ob_type == &GetXF1D_Type)
+#define BPy_GetXF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetXF1D_Type)  )
 
 /*---------------------------Python BPy_GetXF1D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetYF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetYF1D.h
index 6fc7da72752..5864c245776 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetYF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetYF1D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject GetYF1D_Type;
 
-#define BPy_GetYF1D_Check(v)	(( (PyObject *) v)->ob_type == &GetYF1D_Type)
+#define BPy_GetYF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetYF1D_Type)  )
 
 /*---------------------------Python BPy_GetYF1D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetZF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetZF1D.h
index 71e57faa7ef..4b91a567eef 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetZF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetZF1D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject GetZF1D_Type;
 
-#define BPy_GetZF1D_Check(v)	(( (PyObject *) v)->ob_type == &GetZF1D_Type)
+#define BPy_GetZF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetZF1D_Type)  )
 
 /*---------------------------Python BPy_GetZF1D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_LocalAverageDepthF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_LocalAverageDepthF1D.h
index cb9902cc38f..627d10b6414 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_LocalAverageDepthF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_LocalAverageDepthF1D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject LocalAverageDepthF1D_Type;
 
-#define BPy_LocalAverageDepthF1D_Check(v)	(( (PyObject *) v)->ob_type == &LocalAverageDepthF1D_Type)
+#define BPy_LocalAverageDepthF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &LocalAverageDepthF1D_Type)  )
 
 /*---------------------------Python BPy_LocalAverageDepthF1D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.h
index 66524e5c16a..e6b4be556d7 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject ZDiscontinuityF1D_Type;
 
-#define BPy_ZDiscontinuityF1D_Check(v)	(( (PyObject *) v)->ob_type == &ZDiscontinuityF1D_Type)
+#define BPy_ZDiscontinuityF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ZDiscontinuityF1D_Type)  )
 
 /*---------------------------Python BPy_ZDiscontinuityF1D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.h
index 8b8e793582f..5bcf5fcc0a2 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject QuantitativeInvisibilityF1D_Type;
 
-#define BPy_QuantitativeInvisibilityF1D_Check(v)	(( (PyObject *) v)->ob_type == &QuantitativeInvisibilityF1D_Type)
+#define BPy_QuantitativeInvisibilityF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &QuantitativeInvisibilityF1D_Type)  )
 
 /*---------------------------Python BPy_QuantitativeInvisibilityF1D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.h
index 0377214cb70..c8d5e99a6a7 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject GetOccludeeF1D_Type;
 
-#define BPy_GetOccludeeF1D_Check(v)	(( (PyObject *) v)->ob_type == &GetOccludeeF1D_Type)
+#define BPy_GetOccludeeF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetOccludeeF1D_Type)  )
 
 /*---------------------------Python BPy_GetOccludeeF1D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.h
index 76031c5a811..ad39ad25c3d 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject GetOccludersF1D_Type;
 
-#define BPy_GetOccludersF1D_Check(v)	(( (PyObject *) v)->ob_type == &GetOccludersF1D_Type)
+#define BPy_GetOccludersF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetOccludersF1D_Type)  )
 
 /*---------------------------Python BPy_GetOccludersF1D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.h
index 3505e6688b0..39d1268c03f 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject GetShapeF1D_Type;
 
-#define BPy_GetShapeF1D_Check(v)	(( (PyObject *) v)->ob_type == &GetShapeF1D_Type)
+#define BPy_GetShapeF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetShapeF1D_Type)  )
 
 /*---------------------------Python BPy_GetShapeF1D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.h
index e52e037e986..6855ddaf14b 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject ChainingTimeStampF1D_Type;
 
-#define BPy_ChainingTimeStampF1D_Check(v)	(( (PyObject *) v)->ob_type == &ChainingTimeStampF1D_Type)
+#define BPy_ChainingTimeStampF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ChainingTimeStampF1D_Type)  )
 
 /*---------------------------Python BPy_ChainingTimeStampF1D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.h
index 82236dd0b79..a1d5714ab63 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject IncrementChainingTimeStampF1D_Type;
 
-#define BPy_IncrementChainingTimeStampF1D_Check(v)	(( (PyObject *) v)->ob_type == &IncrementChainingTimeStampF1D_Type)
+#define BPy_IncrementChainingTimeStampF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &IncrementChainingTimeStampF1D_Type)  )
 
 /*---------------------------Python BPy_IncrementChainingTimeStampF1D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.h
index f1f91d2cd6e..d9bee247c09 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject TimeStampF1D_Type;
 
-#define BPy_TimeStampF1D_Check(v)	(( (PyObject *) v)->ob_type == &TimeStampF1D_Type)
+#define BPy_TimeStampF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &TimeStampF1D_Type)  )
 
 /*---------------------------Python BPy_TimeStampF1D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_FalseUP0D.h b/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_FalseUP0D.h
index 1cc043791c3..399941d442d 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_FalseUP0D.h
+++ b/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_FalseUP0D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject FalseUP0D_Type;
 
-#define BPy_FalseUP0D_Check(v)	(( (PyObject *) v)->ob_type == &FalseUP0D_Type)
+#define BPy_FalseUP0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &FalseUP0D_Type)  )
 
 /*---------------------------Python BPy_FalseUP0D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_TrueUP0D.h b/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_TrueUP0D.h
index a05bff86a90..24976aaa5c9 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_TrueUP0D.h
+++ b/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_TrueUP0D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject TrueUP0D_Type;
 
-#define BPy_TrueUP0D_Check(v)	(( (PyObject *) v)->ob_type == &TrueUP0D_Type)
+#define BPy_TrueUP0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &TrueUP0D_Type)  )
 
 /*---------------------------Python BPy_TrueUP0D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.h
index 30d71a0cd2c..a24261a60de 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.h
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject ContourUP1D_Type;
 
-#define BPy_ContourUP1D_Check(v)	(( (PyObject *) v)->ob_type == &ContourUP1D_Type)
+#define BPy_ContourUP1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ContourUP1D_Type)  )
 
 /*---------------------------Python BPy_ContourUP1D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.h
index a6e6fdcd81f..2862b060a0a 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.h
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject DensityLowerThanUP1D_Type;
 
-#define BPy_DensityLowerThanUP1D_Check(v)	(( (PyObject *) v)->ob_type == &DensityLowerThanUP1D_Type)
+#define BPy_DensityLowerThanUP1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &DensityLowerThanUP1D_Type)  )
 
 /*---------------------------Python BPy_DensityLowerThanUP1D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.h
index fa8d67d0ec6..39423423b8e 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.h
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject EqualToChainingTimeStampUP1D_Type;
 
-#define BPy_EqualToChainingTimeStampUP1D_Check(v)	(( (PyObject *) v)->ob_type == &EqualToChainingTimeStampUP1D_Type)
+#define BPy_EqualToChainingTimeStampUP1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &EqualToChainingTimeStampUP1D_Type)  )
 
 /*---------------------------Python BPy_EqualToChainingTimeStampUP1D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.h
index 6de9927d7ad..538dc400dc2 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.h
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject EqualToTimeStampUP1D_Type;
 
-#define BPy_EqualToTimeStampUP1D_Check(v)	(( (PyObject *) v)->ob_type == &EqualToTimeStampUP1D_Type)
+#define BPy_EqualToTimeStampUP1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &EqualToTimeStampUP1D_Type)  )
 
 /*---------------------------Python BPy_EqualToTimeStampUP1D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.h
index 0d35f05bc7b..31300f04dfe 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.h
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject ExternalContourUP1D_Type;
 
-#define BPy_ExternalContourUP1D_Check(v)	(( (PyObject *) v)->ob_type == &ExternalContourUP1D_Type)
+#define BPy_ExternalContourUP1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ExternalContourUP1D_Type)  )
 
 /*---------------------------Python BPy_ExternalContourUP1D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.h
index c406a926526..273e4962db9 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.h
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject FalseUP1D_Type;
 
-#define BPy_FalseUP1D_Check(v)	(( (PyObject *) v)->ob_type == &FalseUP1D_Type)
+#define BPy_FalseUP1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &FalseUP1D_Type)  )
 
 /*---------------------------Python BPy_FalseUP1D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.h
index 676bfc00715..f120ecb9778 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.h
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject QuantitativeInvisibilityUP1D_Type;
 
-#define BPy_QuantitativeInvisibilityUP1D_Check(v)	(( (PyObject *) v)->ob_type == &QuantitativeInvisibilityUP1D_Type)
+#define BPy_QuantitativeInvisibilityUP1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &QuantitativeInvisibilityUP1D_Type)  )
 
 /*---------------------------Python BPy_QuantitativeInvisibilityUP1D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.h
index 0da88d959bc..ce6d0276edd 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.h
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject ShapeUP1D_Type;
 
-#define BPy_ShapeUP1D_Check(v)	(( (PyObject *) v)->ob_type == &ShapeUP1D_Type)
+#define BPy_ShapeUP1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ShapeUP1D_Type)  )
 
 /*---------------------------Python BPy_ShapeUP1D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.h
index b30b7232076..5a01ad42d2a 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.h
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.h
@@ -13,7 +13,7 @@ extern "C" {
 
 extern PyTypeObject TrueUP1D_Type;
 
-#define BPy_TrueUP1D_Check(v)	(( (PyObject *) v)->ob_type == &TrueUP1D_Type)
+#define BPy_TrueUP1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &TrueUP1D_Type)  )
 
 /*---------------------------Python BPy_TrueUP1D structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/style_modules_blender/ChainingIterators.py b/source/blender/freestyle/style_modules_blender/ChainingIterators.py
new file mode 100755
index 00000000000..3fe57797113
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/ChainingIterators.py
@@ -0,0 +1,731 @@
+#
+#  Filename : ChainingIterators.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Chaining Iterators to be used with chaining operators
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Blender.Freestyle import *
+
+## the natural chaining iterator
+## It follows the edges of same nature following the topology of
+## objects with  preseance on silhouettes, then borders, 
+## then suggestive contours, then everything else. It doesn't chain the same ViewEdge twice
+## You can specify whether to stay in the selection or not.
+class pyChainSilhouetteIterator(ChainingIterator):
+	def __init__(self, stayInSelection=1):
+		ChainingIterator.__init__(self, stayInSelection, 1,None,1)
+	def getExactTypeName(self):
+		return "pyChainSilhouetteIterator"
+	def traverse(self, iter):
+		winner = None
+		it = AdjacencyIterator(iter)
+		nextVertex = self.getVertex()
+		if(nextVertex.getNature() & T_VERTEX != 0):
+			tvertex = nextVertex.castToTVertex()
+			mateVE = tvertex.mate(self.getCurrentEdge())
+			while(it.isEnd() == 0):
+				ve = it.getObject()
+				if(ve.getId() == mateVE.getId() ):
+					winner = ve
+					break
+				it.increment()
+		else:
+			## case of NonTVertex
+			natures = [SILHOUETTE,BORDER,CREASE,SUGGESTIVE_CONTOUR,VALLEY,RIDGE]
+			for i in range(len(natures)):
+				currentNature = self.getCurrentEdge().getNature()
+				if(natures[i] & currentNature):
+					count=0
+					while(it.isEnd() == 0):
+						visitNext = 0
+						oNature = it.getObject().getNature()
+						if(oNature & natures[i] != 0):
+							if(natures[i] != oNature):
+								for j in range(i):
+									if(natures[j] & oNature != 0):
+										visitNext = 1
+										break
+								if(visitNext != 0):
+									break	 
+							count = count+1
+							winner = it.getObject()
+						it.increment()
+					if(count != 1):
+						winner = None
+					break
+		return winner
+
+## the natural chaining iterator
+## It follows the edges of same nature on the same
+## objects with  preseance on silhouettes, then borders, 
+## then suggestive contours, then everything else. It doesn't chain the same ViewEdge twice
+## You can specify whether to stay in the selection or not.
+## You can specify whether to chain iterate over edges that were 
+## already visited or not.
+class pyChainSilhouetteGenericIterator(ChainingIterator):
+	def __init__(self, stayInSelection=1, stayInUnvisited=1):
+		ChainingIterator.__init__(self, stayInSelection, stayInUnvisited,None,1)
+	def getExactTypeName(self):
+		return "pyChainSilhouetteGenericIterator"
+	def traverse(self, iter):
+		winner = None
+		it = AdjacencyIterator(iter)
+		nextVertex = self.getVertex()
+		if(nextVertex.getNature() & T_VERTEX != 0):
+			tvertex = nextVertex.castToTVertex()
+			mateVE = tvertex.mate(self.getCurrentEdge())
+			while(it.isEnd() == 0):
+				ve = it.getObject()
+				if(ve.getId() == mateVE.getId() ):
+					winner = ve
+					break
+				it.increment()
+		else:
+			## case of NonTVertex
+			natures = [SILHOUETTE,BORDER,CREASE,SUGGESTIVE_CONTOUR,VALLEY,RIDGE]
+			for i in range(len(natures)):
+				currentNature = self.getCurrentEdge().getNature()
+				if(natures[i] & currentNature):
+					count=0
+					while(it.isEnd() == 0):
+						visitNext = 0
+						oNature = it.getObject().getNature()
+						ve = it.getObject()
+						if(ve.getId() == self.getCurrentEdge().getId()):
+							it.increment()
+							continue
+						if(oNature & natures[i] != 0):
+							if(natures[i] != oNature):
+								for j in range(i):
+									if(natures[j] & oNature != 0):
+										visitNext = 1
+										break
+								if(visitNext != 0):
+									break	 
+							count = count+1
+							winner = ve
+						it.increment()
+					if(count != 1):
+						winner = None
+					break
+		return winner
+			
+class pyExternalContourChainingIterator(ChainingIterator):
+	def __init__(self):
+		ChainingIterator.__init__(self, 0, 1,None,1)
+		self._isExternalContour = ExternalContourUP1D()
+		
+	def getExactTypeName(self):
+		return "pyExternalContourIterator"
+	
+	def init(self):
+		self._nEdges = 0
+		self._isInSelection = 1
+
+	def checkViewEdge(self, ve, orientation):
+		if(orientation != 0):
+			vertex = ve.B()
+		else:
+			vertex = ve.A()
+		it = AdjacencyIterator(vertex,1,1)
+		while(it.isEnd() == 0):
+			ave = it.getObject()
+			if(self._isExternalContour(ave)):
+				return 1
+			it.increment()
+		print "pyExternlContourChainingIterator : didn't find next edge"
+		return 0
+	def traverse(self, iter):
+		winner = None
+		it = AdjacencyIterator(iter)
+		while(it.isEnd() == 0):
+			ve = it.getObject()
+			if(self._isExternalContour(ve)):
+				if (ve.getTimeStamp() == GetTimeStampCF()):
+					winner = ve
+			it.increment()
+		
+		self._nEdges = self._nEdges+1
+		if(winner == None):
+			orient = 1
+			it = AdjacencyIterator(iter)
+			while(it.isEnd() == 0):
+				ve = it.getObject()
+				if(it.isIncoming() != 0):
+					orient = 0
+				good = self.checkViewEdge(ve,orient)
+				if(good != 0):
+					winner = ve
+				it.increment()
+		return winner
+
+## the natural chaining iterator
+## with a sketchy multiple touch
+class pySketchyChainSilhouetteIterator(ChainingIterator):
+	def __init__(self, nRounds=3,stayInSelection=1):
+		ChainingIterator.__init__(self, stayInSelection, 0,None,1)
+		self._timeStamp = GetTimeStampCF()+nRounds
+		self._nRounds = nRounds
+	def getExactTypeName(self):
+		return "pySketchyChainSilhouetteIterator"
+	def init(self):
+		self._timeStamp = GetTimeStampCF()+self._nRounds
+	def traverse(self, iter):
+		winner = None
+		it = AdjacencyIterator(iter)
+		nextVertex = self.getVertex()
+		if(nextVertex.getNature() & T_VERTEX != 0):
+			tvertex = nextVertex.castToTVertex()
+			mateVE = tvertex.mate(self.getCurrentEdge())
+			while(it.isEnd() == 0):
+				ve = it.getObject()
+				if(ve.getId() == mateVE.getId() ):
+					winner = ve
+					break
+				it.increment()
+		else:
+			## case of NonTVertex
+			natures = [SILHOUETTE,BORDER,CREASE,SUGGESTIVE_CONTOUR,VALLEY,RIDGE]
+			for i in range(len(natures)):
+				currentNature = self.getCurrentEdge().getNature()
+				if(natures[i] & currentNature):
+					count=0
+					while(it.isEnd() == 0):
+						visitNext = 0
+						oNature = it.getObject().getNature()
+						ve = it.getObject()
+						if(ve.getId() == self.getCurrentEdge().getId()):
+							it.increment()
+							continue
+						if(oNature & natures[i] != 0):
+							if(natures[i] != oNature):
+								for j in range(i):
+									if(natures[j] & oNature != 0):
+										visitNext = 1
+										break
+								if(visitNext != 0):
+									break	 
+							count = count+1
+							winner = ve
+						it.increment()
+					if(count != 1):
+						winner = None
+					break
+		if(winner == None):
+			winner = self.getCurrentEdge()
+		if(winner.getChainingTimeStamp() == self._timeStamp):
+			winner = None
+		return winner
+
+
+# Chaining iterator designed for sketchy style.
+# can chain several times the same ViewEdge
+# in order to produce multiple strokes per ViewEdge.
+class pySketchyChainingIterator(ChainingIterator):
+	def __init__(self, nRounds=3, stayInSelection=1):
+		ChainingIterator.__init__(self, stayInSelection, 0,None,1)
+		self._timeStamp = GetTimeStampCF()+nRounds
+		self._nRounds = nRounds
+	def getExactTypeName(self):
+		return "pySketchyChainingIterator"
+
+	def init(self):
+		self._timeStamp = GetTimeStampCF()+self._nRounds
+
+	def traverse(self, iter):
+		winner = None
+		it = AdjacencyIterator(iter)
+		while(it.isEnd() == 0):
+			ve = it.getObject()
+			if(ve.getId() == self.getCurrentEdge().getId()):
+				it.increment()
+				continue
+			winner = ve
+			it.increment()
+		if(winner == None):
+			winner = self.getCurrentEdge()
+		if(winner.getChainingTimeStamp() == self._timeStamp):
+			return None
+		return winner
+
+
+## Chaining iterator that fills small occlusions
+## 	percent
+##		The max length of the occluded part 
+##		expressed in % of the total chain length
+class pyFillOcclusionsRelativeChainingIterator(ChainingIterator):
+	def __init__(self, percent):
+		ChainingIterator.__init__(self, 0, 1,None,1)
+		self._length = 0
+		self._percent = float(percent)
+	def getExactTypeName(self):
+		return "pyFillOcclusionsChainingIterator"
+	def init(self):
+		# each time we're evaluating a chain length 
+		# we try to do it once. Thus we reinit 
+		# the chain length here:
+		self._length = 0
+	def traverse(self, iter):
+		winner = None
+		winnerOrientation = 0
+		print self.getCurrentEdge().getId().getFirst(), self.getCurrentEdge().getId().getSecond()
+		it = AdjacencyIterator(iter)
+		nextVertex = self.getVertex()
+		if(nextVertex.getNature() & T_VERTEX != 0):
+			tvertex = nextVertex.castToTVertex()
+			mateVE = tvertex.mate(self.getCurrentEdge())
+			while(it.isEnd() == 0):
+				ve = it.getObject()
+				if(ve.getId() == mateVE.getId() ):
+					winner = ve
+					if(it.isIncoming() == 0):
+						winnerOrientation = 1
+					else:
+						winnerOrientation = 0
+                                        break
+				it.increment()
+		else:
+			## case of NonTVertex
+			natures = [SILHOUETTE,BORDER,CREASE,SUGGESTIVE_CONTOUR,VALLEY,RIDGE]
+			for nat in natures:
+				if(self.getCurrentEdge().getNature() & nat != 0):
+					count=0
+					while(it.isEnd() == 0):
+						ve = it.getObject()
+						if(ve.getNature() & nat != 0):
+							count = count+1
+							winner = ve
+							if(it.isIncoming() == 0):
+								winnerOrientation = 1
+							else:
+								winnerOrientation = 0
+						it.increment()
+					if(count != 1):
+						winner = None
+					break
+		if(winner != None):
+			# check whether this edge was part of the selection
+			if(winner.getTimeStamp() != GetTimeStampCF()):
+				#print "---", winner.getId().getFirst(), winner.getId().getSecond()
+				# if not, let's check whether it's short enough with
+				# respect to the chain made without staying in the selection
+				#------------------------------------------------------------
+				# Did we compute the prospective chain length already ?
+				if(self._length == 0):
+					#if not, let's do it
+					_it = pyChainSilhouetteGenericIterator(0,0)
+					_it.setBegin(winner)
+					_it.setCurrentEdge(winner)
+					_it.setOrientation(winnerOrientation)
+					_it.init()
+					while(_it.isEnd() == 0):
+						ve = _it.getObject()
+						#print "--------", ve.getId().getFirst(), ve.getId().getSecond()
+						self._length = self._length + ve.getLength2D()
+						_it.increment()
+						if(_it.isBegin() != 0):
+							break;
+					_it.setBegin(winner)
+					_it.setCurrentEdge(winner)
+					_it.setOrientation(winnerOrientation)
+					if(_it.isBegin() == 0):
+						_it.decrement()
+						while ((_it.isEnd() == 0) and (_it.isBegin() == 0)):
+							ve = _it.getObject()
+							#print "--------", ve.getId().getFirst(), ve.getId().getSecond()
+							self._length = self._length + ve.getLength2D()
+							_it.decrement()
+
+				# let's do the comparison:
+				# nw let's compute the length of this connex non selected part:
+				connexl = 0
+				_cit = pyChainSilhouetteGenericIterator(0,0)
+				_cit.setBegin(winner)
+				_cit.setCurrentEdge(winner)
+				_cit.setOrientation(winnerOrientation)
+				_cit.init()
+				while((_cit.isEnd() == 0) and (_cit.getObject().getTimeStamp() != GetTimeStampCF())):
+					ve = _cit.getObject()
+					#print "-------- --------", ve.getId().getFirst(), ve.getId().getSecond()
+					connexl = connexl + ve.getLength2D()
+					_cit.increment()
+				if(connexl > self._percent * self._length):
+					winner = None
+		return winner
+
+## Chaining iterator that fills small occlusions
+## 	size
+##		The max length of the occluded part 
+##		expressed in pixels
+class pyFillOcclusionsAbsoluteChainingIterator(ChainingIterator):
+	def __init__(self, length):
+		ChainingIterator.__init__(self, 0, 1,None,1)
+		self._length = float(length)
+	def getExactTypeName(self):
+		return "pySmallFillOcclusionsChainingIterator"
+	def traverse(self, iter):
+		winner = None
+		winnerOrientation = 0
+		#print self.getCurrentEdge().getId().getFirst(), self.getCurrentEdge().getId().getSecond()
+		it = AdjacencyIterator(iter)
+		nextVertex = self.getVertex()
+		if(nextVertex.getNature() & T_VERTEX != 0):
+			tvertex = nextVertex.castToTVertex()
+			mateVE = tvertex.mate(self.getCurrentEdge())
+			while(it.isEnd() == 0):
+				ve = it.getObject()
+				if(ve.getId() == mateVE.getId() ):
+					winner = ve
+					if(it.isIncoming() == 0):
+						winnerOrientation = 1
+					else:
+						winnerOrientation = 0
+                                        break
+				it.increment()
+		else:
+			## case of NonTVertex
+			natures = [SILHOUETTE,BORDER,CREASE,SUGGESTIVE_CONTOUR,VALLEY,RIDGE]
+			for nat in natures:
+				if(self.getCurrentEdge().getNature() & nat != 0):
+					count=0
+					while(it.isEnd() == 0):
+						ve = it.getObject()
+						if(ve.getNature() & nat != 0):
+							count = count+1
+							winner = ve
+							if(it.isIncoming() == 0):
+								winnerOrientation = 1
+							else:
+								winnerOrientation = 0
+						it.increment()
+					if(count != 1):
+						winner = None
+					break
+		if(winner != None):
+			# check whether this edge was part of the selection
+			if(winner.getTimeStamp() != GetTimeStampCF()):
+				#print "---", winner.getId().getFirst(), winner.getId().getSecond()
+				# nw let's compute the length of this connex non selected part:
+				connexl = 0
+				_cit = pyChainSilhouetteGenericIterator(0,0)
+				_cit.setBegin(winner)
+				_cit.setCurrentEdge(winner)
+				_cit.setOrientation(winnerOrientation)
+				_cit.init()
+				while((_cit.isEnd() == 0) and (_cit.getObject().getTimeStamp() != GetTimeStampCF())):
+					ve = _cit.getObject()
+					#print "-------- --------", ve.getId().getFirst(), ve.getId().getSecond()
+					connexl = connexl + ve.getLength2D()
+					_cit.increment()
+				if(connexl > self._length):
+					winner = None
+		return winner
+
+
+## Chaining iterator that fills small occlusions
+## 	percent
+##		The max length of the occluded part 
+##		expressed in % of the total chain length
+class pyFillOcclusionsAbsoluteAndRelativeChainingIterator(ChainingIterator):
+	def __init__(self, percent, l):
+		ChainingIterator.__init__(self, 0, 1,None,1)
+		self._length = 0
+		self._absLength = l
+		self._percent = float(percent)
+	def getExactTypeName(self):
+		return "pyFillOcclusionsChainingIterator"
+	def init(self):
+		# each time we're evaluating a chain length 
+		# we try to do it once. Thus we reinit 
+		# the chain length here:
+		self._length = 0
+	def traverse(self, iter):
+		winner = None
+		winnerOrientation = 0
+		print self.getCurrentEdge().getId().getFirst(), self.getCurrentEdge().getId().getSecond()
+		it = AdjacencyIterator(iter)
+		nextVertex = self.getVertex()
+		if(nextVertex.getNature() & T_VERTEX != 0):
+			tvertex = nextVertex.castToTVertex()
+			mateVE = tvertex.mate(self.getCurrentEdge())
+			while(it.isEnd() == 0):
+				ve = it.getObject()
+				if(ve.getId() == mateVE.getId() ):
+					winner = ve
+					if(it.isIncoming() == 0):
+						winnerOrientation = 1
+					else:
+						winnerOrientation = 0
+                                        break
+				it.increment()
+		else:
+			## case of NonTVertex
+			natures = [SILHOUETTE,BORDER,CREASE,SUGGESTIVE_CONTOUR,VALLEY,RIDGE]
+			for nat in natures:
+				if(self.getCurrentEdge().getNature() & nat != 0):
+					count=0
+					while(it.isEnd() == 0):
+						ve = it.getObject()
+						if(ve.getNature() & nat != 0):
+							count = count+1
+							winner = ve
+							if(it.isIncoming() == 0):
+								winnerOrientation = 1
+							else:
+								winnerOrientation = 0
+						it.increment()
+					if(count != 1):
+						winner = None
+					break
+		if(winner != None):
+			# check whether this edge was part of the selection
+			if(winner.getTimeStamp() != GetTimeStampCF()):
+				#print "---", winner.getId().getFirst(), winner.getId().getSecond()
+				# if not, let's check whether it's short enough with
+				# respect to the chain made without staying in the selection
+				#------------------------------------------------------------
+				# Did we compute the prospective chain length already ?
+				if(self._length == 0):
+					#if not, let's do it
+					_it = pyChainSilhouetteGenericIterator(0,0)
+					_it.setBegin(winner)
+					_it.setCurrentEdge(winner)
+					_it.setOrientation(winnerOrientation)
+					_it.init()
+					while(_it.isEnd() == 0):
+						ve = _it.getObject()
+						#print "--------", ve.getId().getFirst(), ve.getId().getSecond()
+						self._length = self._length + ve.getLength2D()
+						_it.increment()
+						if(_it.isBegin() != 0):
+							break;
+					_it.setBegin(winner)
+					_it.setCurrentEdge(winner)
+					_it.setOrientation(winnerOrientation)
+					if(_it.isBegin() == 0):
+						_it.decrement()
+						while ((_it.isEnd() == 0) and (_it.isBegin() == 0)):
+							ve = _it.getObject()
+							#print "--------", ve.getId().getFirst(), ve.getId().getSecond()
+							self._length = self._length + ve.getLength2D()
+							_it.decrement()
+
+				# let's do the comparison:
+				# nw let's compute the length of this connex non selected part:
+				connexl = 0
+				_cit = pyChainSilhouetteGenericIterator(0,0)
+				_cit.setBegin(winner)
+				_cit.setCurrentEdge(winner)
+				_cit.setOrientation(winnerOrientation)
+				_cit.init()
+				while((_cit.isEnd() == 0) and (_cit.getObject().getTimeStamp() != GetTimeStampCF())):
+					ve = _cit.getObject()
+					#print "-------- --------", ve.getId().getFirst(), ve.getId().getSecond()
+					connexl = connexl + ve.getLength2D()
+					_cit.increment()
+				if((connexl > self._percent * self._length) or (connexl > self._absLength)):
+					winner = None
+		return winner
+
+## Chaining iterator that fills small occlusions without caring about the 
+## actual selection
+## 	percent
+##		The max length of the occluded part 
+##		expressed in % of the total chain length
+class pyFillQi0AbsoluteAndRelativeChainingIterator(ChainingIterator):
+	def __init__(self, percent, l):
+		ChainingIterator.__init__(self, 0, 1,None,1)
+		self._length = 0
+		self._absLength = l
+		self._percent = float(percent)
+	def getExactTypeName(self):
+		return "pyFillOcclusionsChainingIterator"
+	def init(self):
+		# each time we're evaluating a chain length 
+		# we try to do it once. Thus we reinit 
+		# the chain length here:
+		self._length = 0
+	def traverse(self, iter):
+		winner = None
+		winnerOrientation = 0
+		print self.getCurrentEdge().getId().getFirst(), self.getCurrentEdge().getId().getSecond()
+		it = AdjacencyIterator(iter)
+		nextVertex = self.getVertex()
+		if(nextVertex.getNature() & T_VERTEX != 0):
+			tvertex = nextVertex.castToTVertex()
+			mateVE = tvertex.mate(self.getCurrentEdge())
+			while(it.isEnd() == 0):
+				ve = it.getObject()
+				if(ve.getId() == mateVE.getId() ):
+					winner = ve
+					if(it.isIncoming() == 0):
+						winnerOrientation = 1
+					else:
+						winnerOrientation = 0
+                                        break
+				it.increment()
+		else:
+			## case of NonTVertex
+			natures = [SILHOUETTE,BORDER,CREASE,SUGGESTIVE_CONTOUR,VALLEY,RIDGE]
+			for nat in natures:
+				if(self.getCurrentEdge().getNature() & nat != 0):
+					count=0
+					while(it.isEnd() == 0):
+						ve = it.getObject()
+						if(ve.getNature() & nat != 0):
+							count = count+1
+							winner = ve
+							if(it.isIncoming() == 0):
+								winnerOrientation = 1
+							else:
+								winnerOrientation = 0
+						it.increment()
+					if(count != 1):
+						winner = None
+					break
+		if(winner != None):
+			# check whether this edge was part of the selection
+			if(winner.qi() != 0):
+				#print "---", winner.getId().getFirst(), winner.getId().getSecond()
+				# if not, let's check whether it's short enough with
+				# respect to the chain made without staying in the selection
+				#------------------------------------------------------------
+				# Did we compute the prospective chain length already ?
+				if(self._length == 0):
+					#if not, let's do it
+					_it = pyChainSilhouetteGenericIterator(0,0)
+					_it.setBegin(winner)
+					_it.setCurrentEdge(winner)
+					_it.setOrientation(winnerOrientation)
+					_it.init()
+					while(_it.isEnd() == 0):
+						ve = _it.getObject()
+						#print "--------", ve.getId().getFirst(), ve.getId().getSecond()
+						self._length = self._length + ve.getLength2D()
+						_it.increment()
+						if(_it.isBegin() != 0):
+							break;
+					_it.setBegin(winner)
+					_it.setCurrentEdge(winner)
+					_it.setOrientation(winnerOrientation)
+					if(_it.isBegin() == 0):
+						_it.decrement()
+						while ((_it.isEnd() == 0) and (_it.isBegin() == 0)):
+							ve = _it.getObject()
+							#print "--------", ve.getId().getFirst(), ve.getId().getSecond()
+							self._length = self._length + ve.getLength2D()
+							_it.decrement()
+
+				# let's do the comparison:
+				# nw let's compute the length of this connex non selected part:
+				connexl = 0
+				_cit = pyChainSilhouetteGenericIterator(0,0)
+				_cit.setBegin(winner)
+				_cit.setCurrentEdge(winner)
+				_cit.setOrientation(winnerOrientation)
+				_cit.init()
+				while((_cit.isEnd() == 0) and (_cit.getObject().qi() != 0)):
+					ve = _cit.getObject()
+					#print "-------- --------", ve.getId().getFirst(), ve.getId().getSecond()
+					connexl = connexl + ve.getLength2D()
+					_cit.increment()
+				if((connexl > self._percent * self._length) or (connexl > self._absLength)):
+					winner = None
+		return winner
+
+
+## the natural chaining iterator
+## It follows the edges of same nature on the same
+## objects with  preseance on silhouettes, then borders, 
+## then suggestive contours, then everything else. It doesn't chain the same ViewEdge twice
+## You can specify whether to stay in the selection or not.
+class pyNoIdChainSilhouetteIterator(ChainingIterator):
+	def __init__(self, stayInSelection=1):
+		ChainingIterator.__init__(self, stayInSelection, 1,None,1)
+	def getExactTypeName(self):
+		return "pyChainSilhouetteIterator"
+	def traverse(self, iter):
+		winner = None
+		it = AdjacencyIterator(iter)
+		nextVertex = self.getVertex()
+		if(nextVertex.getNature() & T_VERTEX != 0):
+			tvertex = nextVertex.castToTVertex()
+			mateVE = tvertex.mate(self.getCurrentEdge())
+			while(it.isEnd() == 0):
+				ve = it.getObject()
+				feB = self.getCurrentEdge().fedgeB()
+				feA = ve.fedgeA()
+				vB = feB.vertexB()
+				vA = feA.vertexA()
+				if vA.getId().getFirst() == vB.getId().getFirst():
+					winner = ve
+					break
+				feA = self.getCurrentEdge().fedgeA()
+				feB = ve.fedgeB()
+				vB = feB.vertexB()
+				vA = feA.vertexA()
+				if vA.getId().getFirst() == vB.getId().getFirst():
+					winner = ve
+					break
+				feA = self.getCurrentEdge().fedgeB()
+				feB = ve.fedgeB()
+				vB = feB.vertexB()
+				vA = feA.vertexB()
+				if vA.getId().getFirst() == vB.getId().getFirst():
+					winner = ve
+					break
+				feA = self.getCurrentEdge().fedgeA()
+				feB = ve.fedgeA()
+				vB = feB.vertexA()
+				vA = feA.vertexA()
+				if vA.getId().getFirst() == vB.getId().getFirst():
+					winner = ve
+					break
+				it.increment()
+		else:
+			## case of NonTVertex
+			natures = [SILHOUETTE,BORDER,CREASE,SUGGESTIVE_CONTOUR,VALLEY,RIDGE]
+			for i in range(len(natures)):
+				currentNature = self.getCurrentEdge().getNature()
+				if(natures[i] & currentNature):
+					count=0
+					while(it.isEnd() == 0):
+						visitNext = 0
+						oNature = it.getObject().getNature()
+						if(oNature & natures[i] != 0):
+							if(natures[i] != oNature):
+								for j in range(i):
+									if(natures[j] & oNature != 0):
+										visitNext = 1
+										break
+								if(visitNext != 0):
+									break	 
+							count = count+1
+							winner = it.getObject()
+						it.increment()
+					if(count != 1):
+						winner = None
+					break
+		return winner
+
diff --git a/source/blender/freestyle/style_modules_blender/Functions0D.py b/source/blender/freestyle/style_modules_blender/Functions0D.py
new file mode 100755
index 00000000000..62855648d1f
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/Functions0D.py
@@ -0,0 +1,81 @@
+from Blender.Freestyle import *
+
+
+class pyInverseCurvature2DAngleF0D(UnaryFunction0DDouble):
+	def getName(self):
+		return "InverseCurvature2DAngleF0D"
+
+	def __call__(self, inter):
+		func = Curvature2DAngleF0D()
+		c = func(inter)
+		return (3.1415 - c)
+
+class pyCurvilinearLengthF0D(UnaryFunction0DDouble):
+	def getName(self):
+		return "CurvilinearLengthF0D"
+
+	def __call__(self, inter):
+		i0d = inter.getObject()
+		s = i0d.getExactTypeName()
+		if (string.find(s, "CurvePoint") == -1):
+			print "CurvilinearLengthF0D: not implemented yet for %s" % (s)
+			return -1
+		cp = castToCurvePoint(i0d)
+		return cp.t2d()
+
+## estimate anisotropy of density
+class pyDensityAnisotropyF0D(UnaryFunction0DDouble):
+	def __init__(self,level):
+		UnaryFunction0DDouble.__init__(self)
+		self.IsoDensity = ReadCompleteViewMapPixelF0D(level)
+		self.d0Density = ReadSteerableViewMapPixelF0D(0, level)
+		self.d1Density = ReadSteerableViewMapPixelF0D(1, level)
+		self.d2Density = ReadSteerableViewMapPixelF0D(2, level)
+		self.d3Density = ReadSteerableViewMapPixelF0D(3, level)
+	def getName(self):
+		return "pyDensityAnisotropyF0D"
+	def __call__(self, inter):
+		c_iso = self.IsoDensity(inter) 
+		c_0 = self.d0Density(inter) 
+		c_1 = self.d1Density(inter) 
+		c_2 = self.d2Density(inter) 
+		c_3 = self.d3Density(inter) 
+		cMax = max( max(c_0,c_1), max(c_2,c_3))
+		cMin = min( min(c_0,c_1), min(c_2,c_3))
+		if ( c_iso == 0 ):
+			v = 0
+		else:
+			v = (cMax-cMin)/c_iso
+		return (v)
+
+## Returns the gradient vector for a pixel 
+## 	l
+##	  the level at which one wants to compute the gradient
+class pyViewMapGradientVectorF0D(UnaryFunction0DVec2f):
+	def __init__(self, l):
+		UnaryFunction0DVec2f.__init__(self)
+		self._l = l
+		self._step = pow(2,self._l)
+	def getName(self):
+		return "pyViewMapGradientVectorF0D"
+	def __call__(self, iter):
+		p = iter.getObject().getPoint2D()
+		gx = ReadCompleteViewMapPixelCF(self._l, int(p.x()+self._step), int(p.y()))- ReadCompleteViewMapPixelCF(self._l, int(p.x()), int(p.y()))
+		gy = ReadCompleteViewMapPixelCF(self._l, int(p.x()), int(p.y()+self._step))- ReadCompleteViewMapPixelCF(self._l, int(p.x()), int(p.y()))
+		return Vec2f(gx, gy)
+
+class pyViewMapGradientNormF0D(UnaryFunction0DDouble):
+	def __init__(self, l):
+		UnaryFunction0DDouble.__init__(self)
+		self._l = l
+		self._step = pow(2,self._l)
+	def getName(self):
+		return "pyViewMapGradientNormF0D"
+	def __call__(self, iter):
+		p = iter.getObject().getPoint2D()
+		gx = ReadCompleteViewMapPixelCF(self._l, int(p.x()+self._step), int(p.y()))- ReadCompleteViewMapPixelCF(self._l, int(p.x()), int(p.y()))
+		gy = ReadCompleteViewMapPixelCF(self._l, int(p.x()), int(p.y()+self._step))- ReadCompleteViewMapPixelCF(self._l, int(p.x()), int(p.y()))
+		grad = Vec2f(gx, gy)
+		return grad.norm()
+
+
diff --git a/source/blender/freestyle/style_modules_blender/Functions1D.py b/source/blender/freestyle/style_modules_blender/Functions1D.py
new file mode 100755
index 00000000000..d3474ffc9eb
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/Functions1D.py
@@ -0,0 +1,45 @@
+from Blender.Freestyle import *
+from Functions0D import *
+import string 
+
+class pyGetInverseProjectedZF1D(UnaryFunction1DDouble):
+	def getName(self):
+		return "pyGetInverseProjectedZF1D"
+
+	def __call__(self, inter):
+		func = GetProjectedZF1D()
+		z = func(inter)
+		return (1.0 - z)
+
+class pyGetSquareInverseProjectedZF1D(UnaryFunction1DDouble):
+	def getName(self):
+		return "pyGetInverseProjectedZF1D"
+
+	def __call__(self, inter):
+		func = GetProjectedZF1D()
+		z = func(inter)
+		return (1.0 - z*z)
+
+class pyDensityAnisotropyF1D(UnaryFunction1DDouble):
+	def __init__(self,level,  integrationType=IntegrationType.MEAN, sampling=2.0):
+		UnaryFunction1DDouble.__init__(self, integrationType)
+		self._func = pyDensityAnisotropyF0D(level)
+		self._integration = integrationType
+		self._sampling = sampling
+	def getName(self):
+		return "pyDensityAnisotropyF1D"
+	def __call__(self, inter):
+		v =  integrateDouble(self._func, inter.pointsBegin(self._sampling), inter.pointsEnd(self._sampling), self._integration)
+		return v
+
+class pyViewMapGradientNormF1D(UnaryFunction1DDouble):
+	def __init__(self,l, integrationType, sampling=2.0):
+		UnaryFunction1DDouble.__init__(self, integrationType)
+		self._func = pyViewMapGradientNormF0D(l)
+		self._integration = integrationType
+		self._sampling = sampling
+	def getName(self):
+		return "pyViewMapGradientNormF1D"
+	def __call__(self, inter):
+		v =  integrateDouble(self._func, inter.pointsBegin(self._sampling), inter.pointsEnd(self._sampling), self._integration)
+		return v
diff --git a/source/blender/freestyle/style_modules_blender/PredicatesB1D.py b/source/blender/freestyle/style_modules_blender/PredicatesB1D.py
new file mode 100755
index 00000000000..21d90f96644
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/PredicatesB1D.py
@@ -0,0 +1,70 @@
+from Blender.Freestyle import *
+from Functions1D import *
+from random import *
+
+class pyZBP1D(BinaryPredicate1D):
+	def getName(self):
+		return "pyZBP1D"
+
+ 	def __call__(self, i1, i2):
+		func = GetZF1D()
+		return (func(i1) > func(i2))
+
+class pyZDiscontinuityBP1D(BinaryPredicate1D):
+	def __init__(self, iType = IntegrationType.MEAN):
+		BinaryPredicate1D.__init__(self)
+		self._GetZDiscontinuity = ZDiscontinuityF1D(iType)
+
+	def getName(self):
+		return "pyZDiscontinuityBP1D"
+
+ 	def __call__(self, i1, i2):
+		return (self._GetZDiscontinuity(i1) > self._GetZDiscontinuity(i2))
+
+class pyLengthBP1D(BinaryPredicate1D):
+	def getName(self):
+		return "LengthBP1D"
+
+ 	def __call__(self, i1, i2):
+		return (i1.getLength2D() > i2.getLength2D())
+
+class pySilhouetteFirstBP1D(BinaryPredicate1D):
+	def getName(self):
+		return "SilhouetteFirstBP1D"
+
+ 	def __call__(self, inter1, inter2):
+		bpred = SameShapeIdBP1D()
+		if (bpred(inter1, inter2) != 1):
+			return 0
+		if (inter1.getNature() & SILHOUETTE):
+			return (inter2.getNature() & SILHOUETTE)
+		return (inter1.getNature() == inter2.getNature())
+
+class pyNatureBP1D(BinaryPredicate1D):
+	def getName(self):
+		return "NatureBP1D"
+
+ 	def __call__(self, inter1, inter2):
+		return (inter1.getNature() & inter2.getNature())
+
+class pyViewMapGradientNormBP1D(BinaryPredicate1D):
+	def __init__(self,l, sampling=2.0):
+		BinaryPredicate1D.__init__(self)
+		self._GetGradient = pyViewMapGradientNormF1D(l, IntegrationType.MEAN)
+	def getName(self):
+		return "pyViewMapGradientNormBP1D"
+	def __call__(self, i1,i2):
+		print "compare gradient"
+		return (self._GetGradient(i1) > self._GetGradient(i2))
+
+class pyShuffleBP1D(BinaryPredicate1D):
+	def __init__(self):
+		BinaryPredicate1D.__init__(self)
+		seed(1)
+	def getName(self):
+		return "pyNearAndContourFirstBP1D"
+
+ 	def __call__(self, inter1, inter2):
+		r1 = uniform(0,1)
+		r2 = uniform(0,1)
+		return (r1<r2)
diff --git a/source/blender/freestyle/style_modules_blender/PredicatesU0D.py b/source/blender/freestyle/style_modules_blender/PredicatesU0D.py
new file mode 100755
index 00000000000..8432dea3274
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/PredicatesU0D.py
@@ -0,0 +1,103 @@
+from Blender.Freestyle import *
+from Functions0D import *
+
+class pyHigherCurvature2DAngleUP0D(UnaryPredicate0D):
+	def __init__(self,a):
+		UnaryPredicate0D.__init__(self)
+		self._a = a
+			
+	def getName(self):
+		return "HigherCurvature2DAngleUP0D"
+
+	def __call__(self, inter):
+		func = Curvature2DAngleF0D()
+		a = func(inter)
+		return ( a > self._a)
+
+class pyUEqualsUP0D(UnaryPredicate0D):
+	def __init__(self,u, w):
+		UnaryPredicate0D.__init__(self)
+		self._u = u
+		self._w = w
+			
+	def getName(self):
+		return "UEqualsUP0D"
+
+	def __call__(self, inter):
+		func = pyCurvilinearLengthF0D()
+		u = func(inter)
+		return ( ( u > (self._u-self._w) ) and ( u < (self._u+self._w) ) )
+
+class pyVertexNatureUP0D(UnaryPredicate0D):
+	def __init__(self,nature):
+		UnaryPredicate0D.__init__(self)
+		self._nature = nature
+			
+	def getName(self):
+		return "pyVertexNatureUP0D"
+
+	def __call__(self, inter):
+		v = inter.getObject()
+		nat = v.getNature()
+		if(nat & self._nature):
+			return 1;
+		return 0
+
+## check whether an Interface0DIterator
+## is a TVertex and is the one that is 
+## hidden (inferred from the context)
+class pyBackTVertexUP0D(UnaryPredicate0D):
+	def __init__(self):
+		UnaryPredicate0D.__init__(self)
+		self._getQI = QuantitativeInvisibilityF0D()
+	def getName(self):
+		return "pyBackTVertexUP0D"
+	def __call__(self, iter):
+		v = iter.getObject()
+		nat = v.getNature()
+		if(nat & T_VERTEX == 0):
+			return 0
+		next = iter
+		if(next.isEnd()):
+			return 0
+		if(self._getQI(next) != 0):
+			return 1
+		return 0
+
+class pyParameterUP0DGoodOne(UnaryPredicate0D):
+	def __init__(self,pmin,pmax):
+		UnaryPredicate0D.__init__(self)
+		self._m = pmin
+		self._M = pmax
+		#self.getCurvilinearAbscissa = GetCurvilinearAbscissaF0D()
+
+	def getName(self):
+		return "pyCurvilinearAbscissaHigherThanUP0D"
+
+	def __call__(self, inter):
+		#s = self.getCurvilinearAbscissa(inter)
+		u = inter.u()
+		#print u
+		return ((u>=self._m) and (u<=self._M))
+
+class pyParameterUP0D(UnaryPredicate0D):
+	def __init__(self,pmin,pmax):
+		UnaryPredicate0D.__init__(self)
+		self._m = pmin
+		self._M = pmax
+		#self.getCurvilinearAbscissa = GetCurvilinearAbscissaF0D()
+
+	def getName(self):
+		return "pyCurvilinearAbscissaHigherThanUP0D"
+
+	def __call__(self, inter):
+		func = Curvature2DAngleF0D()
+		c = func(inter)
+		b1 = (c>0.1)
+		#s = self.getCurvilinearAbscissa(inter)
+		u = inter.u()
+		#print u
+		b = ((u>=self._m) and (u<=self._M))
+		return b and b1
+
+
diff --git a/source/blender/freestyle/style_modules_blender/PredicatesU1D.py b/source/blender/freestyle/style_modules_blender/PredicatesU1D.py
new file mode 100755
index 00000000000..3dad3519300
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/PredicatesU1D.py
@@ -0,0 +1,381 @@
+from Blender.Freestyle import *
+from Functions1D import *
+
+count = 0
+class pyNFirstUP1D(UnaryPredicate1D):
+	def __init__(self, n):
+		UnaryPredicate1D.__init__(self)
+		self.__n = n
+	def __call__(self, inter):
+		global count
+		count = count + 1
+		if count <= self.__n:
+			return 1
+		return 0
+
+class pyHigherLengthUP1D(UnaryPredicate1D):
+	def __init__(self,l):
+		UnaryPredicate1D.__init__(self)
+		self._l = l
+			
+	def getName(self):
+		return "HigherLengthUP1D"
+
+	def __call__(self, inter):
+		return (inter.getLength2D() > self._l)
+
+class pyNatureUP1D(UnaryPredicate1D):
+	def __init__(self,nature):
+		UnaryPredicate1D.__init__(self)
+		self._nature = nature
+		self._getNature = CurveNatureF1D()
+			
+	def getName(self):
+		return "pyNatureUP1D"
+
+	def __call__(self, inter):
+		if(self._getNature(inter) & self._nature):
+			return 1
+		return 0
+
+class pyHigherNumberOfTurnsUP1D(UnaryPredicate1D):
+	def __init__(self,n,a):
+		UnaryPredicate1D.__init__(self)
+		self._n = n
+		self._a = a
+
+	def getName(self):
+		return "HigherNumberOfTurnsUP1D"
+
+	def __call__(self, inter):
+		count = 0
+		func = Curvature2DAngleF0D()
+		it = inter.verticesBegin()
+		while(it.isEnd() == 0):
+			if(func(it) > self._a):
+				count = count+1
+			if(count > self._n):
+				return 1
+			it.increment()
+		return 0
+
+class pyDensityUP1D(UnaryPredicate1D):
+	def __init__(self,wsize,threshold, integration = IntegrationType.MEAN, sampling=2.0):
+		UnaryPredicate1D.__init__(self)
+		self._wsize = wsize
+		self._threshold = threshold
+		self._integration = integration
+		self._func = DensityF1D(self._wsize, self._integration, sampling)
+			
+	def getName(self):
+		return "pyDensityUP1D"
+
+	def __call__(self, inter):
+		if(self._func(inter) < self._threshold):
+			return 1
+		return 0
+
+class pyLowSteerableViewMapDensityUP1D(UnaryPredicate1D):
+	def __init__(self,threshold, level,integration = IntegrationType.MEAN):
+		UnaryPredicate1D.__init__(self)
+		self._threshold = threshold
+		self._level = level
+		self._integration = integration
+			
+	def getName(self):
+		return "pyLowSteerableViewMapDensityUP1D"
+
+	def __call__(self, inter):
+		func = GetSteerableViewMapDensityF1D(self._level, self._integration)
+		v = func(inter)
+		print v
+		if(v < self._threshold):
+			return 1
+		return 0
+
+class pyLowDirectionalViewMapDensityUP1D(UnaryPredicate1D):
+	def __init__(self,threshold, orientation, level,integration = IntegrationType.MEAN):
+		UnaryPredicate1D.__init__(self)
+		self._threshold = threshold
+		self._orientation = orientation
+		self._level = level
+		self._integration = integration
+			
+	def getName(self):
+		return "pyLowDirectionalViewMapDensityUP1D"
+
+	def __call__(self, inter):
+		func = GetDirectionalViewMapDensityF1D(self._orientation, self._level, self._integration)
+		v = func(inter)
+		#print v
+		if(v < self._threshold):
+			return 1
+		return 0
+
+class pyHighSteerableViewMapDensityUP1D(UnaryPredicate1D):
+	def __init__(self,threshold, level,integration = IntegrationType.MEAN):
+		UnaryPredicate1D.__init__(self)
+		self._threshold = threshold
+		self._level = level
+		self._integration = integration
+		self._func = GetSteerableViewMapDensityF1D(self._level, self._integration)	
+	def getName(self):
+		return "pyHighSteerableViewMapDensityUP1D"
+
+	def __call__(self, inter):
+		
+		v = self._func(inter)
+		if(v > self._threshold):
+			return 1
+		return 0
+
+class pyHighDirectionalViewMapDensityUP1D(UnaryPredicate1D):
+	def __init__(self,threshold, orientation, level,integration = IntegrationType.MEAN, sampling=2.0):
+		UnaryPredicate1D.__init__(self)
+		self._threshold = threshold
+		self._orientation = orientation
+		self._level = level
+		self._integration = integration
+		self._sampling = sampling		
+	def getName(self):
+		return "pyLowDirectionalViewMapDensityUP1D"
+
+	def __call__(self, inter):
+		func = GetDirectionalViewMapDensityF1D(self._orientation, self._level, self._integration, self._sampling)
+		v = func(inter)
+		if(v > self._threshold):
+			return 1
+		return 0
+
+class pyHighViewMapDensityUP1D(UnaryPredicate1D):
+	def __init__(self,threshold, level,integration = IntegrationType.MEAN, sampling=2.0):
+		UnaryPredicate1D.__init__(self)
+		self._threshold = threshold
+		self._level = level
+		self._integration = integration
+		self._sampling = sampling
+		self._func = GetCompleteViewMapDensityF1D(self._level, self._integration, self._sampling) # 2.0 is the smpling
+			
+	def getName(self):
+		return "pyHighViewMapDensityUP1D"
+
+	def __call__(self, inter):
+		#print "toto"
+		#print func.getName()
+		#print inter.getExactTypeName()
+		v= self._func(inter)
+		if(v > self._threshold):
+			return 1
+		return 0
+
+class pyDensityFunctorUP1D(UnaryPredicate1D):
+	def __init__(self,wsize,threshold, functor, funcmin=0.0, funcmax=1.0, integration = IntegrationType.MEAN):
+		UnaryPredicate1D.__init__(self)
+		self._wsize = wsize
+		self._threshold = float(threshold)
+		self._functor = functor
+		self._funcmin = float(funcmin)
+		self._funcmax = float(funcmax)
+		self._integration = integration
+			
+	def getName(self):
+		return "pyDensityFunctorUP1D"
+
+	def __call__(self, inter):
+		func = DensityF1D(self._wsize, self._integration)
+		res = self._functor(inter)
+		k = (res-self._funcmin)/(self._funcmax-self._funcmin)
+		if(func(inter) < self._threshold*k):
+			return 1
+		return 0
+
+class pyZSmallerUP1D(UnaryPredicate1D):
+	def __init__(self,z, integration=IntegrationType.MEAN):
+		UnaryPredicate1D.__init__(self)
+		self._z = z
+		self._integration = integration
+	def getName(self):
+		return "pyZSmallerUP1D"
+
+	def __call__(self, inter):
+		func = GetProjectedZF1D(self._integration)
+		if(func(inter) < self._z):
+			return 1
+		return 0
+
+class pyIsOccludedByUP1D(UnaryPredicate1D):
+	def __init__(self,id):
+		UnaryPredicate1D.__init__(self)
+		self._id = id
+	def getName(self):
+		return "pyIsOccludedByUP1D"
+	def __call__(self, inter):
+		func = GetShapeF1D()
+		shapes = func(inter)
+		for s in shapes:
+			if(s.getId() == self._id):
+				return 0
+		it = inter.verticesBegin()
+		itlast = inter.verticesEnd()
+		itlast.decrement()
+		v =  it.getObject()
+		vlast = itlast.getObject()
+		tvertex = v.castToTVertex()
+		if(tvertex != None):
+			#print "TVertex: [ ", tvertex.getId().getFirst(), ",",  tvertex.getId().getSecond()," ]"
+			eit = tvertex.edgesBegin()
+			while(eit.isEnd() == 0):
+				ve = eit.getObject().first
+				if(ve.shape_id() == self._id):
+					return 1
+				#print "-------", ve.getId().getFirst(), "-", ve.getId().getSecond()
+				eit.increment()
+		tvertex = vlast.castToTVertex()
+		if(tvertex != None):
+			#print "TVertex: [ ", tvertex.getId().getFirst(), ",",  tvertex.getId().getSecond()," ]"
+			eit = tvertex.edgesBegin()
+			while(eit.isEnd() == 0):
+				ve = eit.getObject().first
+				if(ve.shape_id() == self._id):
+					return 1
+				#print "-------", ve.getId().getFirst(), "-", ve.getId().getSecond()
+				eit.increment()
+		return 0
+
+class pyIsInOccludersListUP1D(UnaryPredicate1D):
+	def __init__(self,id):
+		UnaryPredicate1D.__init__(self)
+		self._id = id
+	def getName(self):
+		return "pyIsInOccludersListUP1D"
+	def __call__(self, inter):
+		func = GetOccludersF1D()
+		occluders = func(inter)
+		for a in occluders:
+			if(a.getId() == self._id):
+				return 1
+		return 0
+
+class pyIsOccludedByItselfUP1D(UnaryPredicate1D):
+	def __init__(self):
+		UnaryPredicate1D.__init__(self)
+		self.__func1 = GetOccludersF1D()
+		self.__func2 = GetShapeF1D()
+	def getName(self):
+		return "pyIsOccludedByItselfUP1D"
+	def __call__(self, inter):
+		lst1 = self.__func1(inter)
+		lst2 = self.__func2(inter)
+		for vs1 in lst1:
+			for vs2 in lst2:
+				if vs1.getId() == vs2.getId():
+					return 1
+		return 0
+
+class pyIsOccludedByIdListUP1D(UnaryPredicate1D):
+	def __init__(self, idlist):
+		UnaryPredicate1D.__init__(self)
+		self._idlist = idlist
+		self.__func1 = GetOccludersF1D()
+	def getName(self):
+		return "pyIsOccludedByIdListUP1D"
+	def __call__(self, inter):
+		lst1 = self.__func1(inter)
+		for vs1 in lst1:
+			for id in self._idlist:
+				if vs1.getId() == id:
+					return 1
+		return 0
+
+class pyShapeIdListUP1D(UnaryPredicate1D):
+	def __init__(self,idlist):
+		UnaryPredicate1D.__init__(self)
+		self._idlist = idlist
+		self._funcs = []
+		for id in idlist :
+			self._funcs.append(ShapeUP1D(id.getFirst(), id.getSecond()))
+		
+	def getName(self):
+		return "pyShapeIdUP1D"
+	def __call__(self, inter):
+		for func in self._funcs :
+			if(func(inter) == 1) :
+				return 1
+		return 0
+
+## deprecated
+class pyShapeIdUP1D(UnaryPredicate1D):
+	def __init__(self,id):
+		UnaryPredicate1D.__init__(self)
+		self._id = id
+	def getName(self):
+		return "pyShapeIdUP1D"
+	def __call__(self, inter):
+		func = GetShapeF1D()
+		shapes = func(inter)
+		for a in shapes:
+			if(a.getId() == self._id):
+				return 1
+		return 0
+
+class pyHighDensityAnisotropyUP1D(UnaryPredicate1D):
+	def __init__(self,threshold, level, sampling=2.0):
+		UnaryPredicate1D.__init__(self)
+		self._l = threshold
+		self.func = pyDensityAnisotropyF1D(level, IntegrationType.MEAN, sampling)
+	def getName(self):
+		return "pyHighDensityAnisotropyUP1D"
+	def __call__(self, inter):
+		return (self.func(inter) > self._l)
+
+class pyHighViewMapGradientNormUP1D(UnaryPredicate1D):
+	def __init__(self,threshold, l, sampling=2.0):
+		UnaryPredicate1D.__init__(self)
+		self._threshold = threshold
+		self._GetGradient = pyViewMapGradientNormF1D(l, IntegrationType.MEAN)
+	def getName(self):
+		return "pyHighViewMapGradientNormUP1D"
+	def __call__(self, inter):
+		gn = self._GetGradient(inter)
+		#print gn
+		return (gn > self._threshold)
+
+class pyDensityVariableSigmaUP1D(UnaryPredicate1D):
+	def __init__(self,functor, sigmaMin,sigmaMax, lmin, lmax, tmin, tmax, integration = IntegrationType.MEAN, sampling=2.0):
+		UnaryPredicate1D.__init__(self)
+		self._functor = functor
+		self._sigmaMin = float(sigmaMin)
+		self._sigmaMax = float(sigmaMax)
+		self._lmin = float(lmin)
+		self._lmax = float(lmax)
+		self._tmin = tmin
+		self._tmax = tmax
+		self._integration = integration
+		self._sampling = sampling
+			
+	def getName(self):
+		return "pyDensityUP1D"
+
+	def __call__(self, inter):
+		sigma = (self._sigmaMax-self._sigmaMin)/(self._lmax-self._lmin)*(self._functor(inter)-self._lmin) + self._sigmaMin
+		t = (self._tmax-self._tmin)/(self._lmax-self._lmin)*(self._functor(inter)-self._lmin) + self._tmin
+		if(sigma<self._sigmaMin):
+			sigma = self._sigmaMin
+		self._func = DensityF1D(sigma, self._integration, self._sampling)
+		d = self._func(inter)
+		if(d<t):
+			return 1
+		return 0
+
+class pyClosedCurveUP1D(UnaryPredicate1D):
+	def __call__(self, inter):
+		it = inter.verticesBegin()
+		itlast = inter.verticesEnd()
+		itlast.decrement()	
+		vlast = itlast.getObject()
+		v = it.getObject()
+		print v.getId().getFirst(), v.getId().getSecond()
+		print vlast.getId().getFirst(), vlast.getId().getSecond()
+		if(v.getId() == vlast.getId()):
+			return 1
+		return 0
diff --git a/source/blender/freestyle/style_modules_blender/anisotropic_diffusion.py b/source/blender/freestyle/style_modules_blender/anisotropic_diffusion.py
new file mode 100755
index 00000000000..31e5579719d
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/anisotropic_diffusion.py
@@ -0,0 +1,75 @@
+#
+#  Filename : anisotropic_diffusion.py
+#  Author   : Fredo Durand
+#  Date     : 12/08/2004
+#  Purpose  : Smoothes lines using an anisotropic diffusion scheme
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Blender.Freestyle import *
+from logical_operators import *
+from PredicatesB1D import *
+from shaders import *
+from vector import *
+from PredicatesU0D import *
+from math import *
+
+## thickness modifiers
+
+normalInfo=Normal2DF0D()
+curvatureInfo=Curvature2DAngleF0D()
+
+def edgestopping(x, sigma): 
+	return exp(- x*x/(2*sigma*sigma))
+
+class pyDiffusion2Shader(StrokeShader):
+	def __init__(self, lambda1, nbIter):
+		StrokeShader.__init__(self)
+		self._lambda = lambda1
+		self._nbIter = nbIter
+	def getName(self):
+		return "pyDiffusionShader"
+	def shade(self, stroke):
+		for i in range (1, self._nbIter):
+			it = stroke.strokeVerticesBegin()
+			while it.isEnd() == 0:
+				v=it.getObject()
+				p1 = v.getPoint()
+				p2 = normalInfo(it.castToInterface0DIterator())*self._lambda*curvatureInfo(it.castToInterface0DIterator())
+				v.setPoint(p1+p2)
+				it.increment()
+
+upred = AndUP1D(QuantitativeInvisibilityUP1D(0), ExternalContourUP1D())
+Operators.select( upred )
+bpred = TrueBP1D();
+Operators.bidirectionalChain(ChainPredicateIterator(upred, bpred), NotUP1D(upred) )
+shaders_list = 	[
+		ConstantThicknessShader(4),
+		StrokeTextureShader("smoothAlpha.bmp", Stroke.OPAQUE_MEDIUM, 0),
+		SamplingShader(2),
+		pyDiffusion2Shader(-0.03, 30), 
+		IncreasingColorShader(1.0,0.0,0.0,1, 0, 1, 0, 1)
+		]
+Operators.create(TrueUP1D(), shaders_list)
+
+
+
diff --git a/source/blender/freestyle/style_modules_blender/apriori_and_causal_density.py b/source/blender/freestyle/style_modules_blender/apriori_and_causal_density.py
new file mode 100755
index 00000000000..6e16ee52ec5
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/apriori_and_causal_density.py
@@ -0,0 +1,45 @@
+#
+#  Filename : apriori_and_causal_density.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Selects the lines with high a priori density and 
+#             subjects them to the causal density so as to avoid 
+#             cluttering
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+
+from Blender.Freestyle import *
+from logical_operators import *
+from PredicatesB1D import *
+from PredicatesU1D import *
+from shaders import *
+
+Operators.select(AndUP1D(QuantitativeInvisibilityUP1D(0), pyHighViewMapDensityUP1D(0.3,4) ) )
+bpred = TrueBP1D()
+upred = AndUP1D(QuantitativeInvisibilityUP1D(0), pyHighViewMapDensityUP1D(0.3,4))
+Operators.bidirectionalChain(ChainPredicateIterator(upred, bpred), NotUP1D(QuantitativeInvisibilityUP1D(0)))
+shaders_list = 	[
+		ConstantThicknessShader(2), 
+		ConstantColorShader(0.0, 0.0, 0.0,1)
+		]
+Operators.create(pyDensityUP1D(1,0.1, IntegrationType.MEAN), shaders_list)
diff --git a/source/blender/freestyle/style_modules_blender/apriori_density.py b/source/blender/freestyle/style_modules_blender/apriori_density.py
new file mode 100755
index 00000000000..fe033f7c23d
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/apriori_density.py
@@ -0,0 +1,43 @@
+#
+#  Filename : apriori_density.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Draws lines having a high a priori density
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+
+from Blender.Freestyle import *
+from logical_operators import *
+from PredicatesB1D import *
+from PredicatesU1D import *
+from shaders import *
+
+Operators.select(AndUP1D(QuantitativeInvisibilityUP1D(0), pyHighViewMapDensityUP1D(0.1,5)))
+bpred = TrueBP1D()
+upred = AndUP1D(QuantitativeInvisibilityUP1D(0), pyHighViewMapDensityUP1D(0.0007,5))
+Operators.bidirectionalChain(ChainPredicateIterator(upred, bpred), NotUP1D(QuantitativeInvisibilityUP1D(0)))
+shaders_list = 	[
+		ConstantThicknessShader(2), 
+		ConstantColorShader(0.0, 0.0, 0.0,1)
+		]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/source/blender/freestyle/style_modules_blender/backbone_stretcher.py b/source/blender/freestyle/style_modules_blender/backbone_stretcher.py
new file mode 100755
index 00000000000..fc659bd4c56
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/backbone_stretcher.py
@@ -0,0 +1,36 @@
+#
+#  Filename : backbone_stretcher.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Stretches the geometry of visible lines
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Blender.Freestyle import *
+from logical_operators import *
+from PredicatesB1D import *
+from shaders import *
+
+Operators.select(QuantitativeInvisibilityUP1D(0))
+Operators.bidirectionalChain(ChainSilhouetteIterator(), NotUP1D(QuantitativeInvisibilityUP1D(0)))
+shaders_list = [TextureAssignerShader(4), ConstantColorShader(0.5, 0.5, 0.5), BackboneStretcherShader(20)]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/source/blender/freestyle/style_modules_blender/blueprint_circles.py b/source/blender/freestyle/style_modules_blender/blueprint_circles.py
new file mode 100755
index 00000000000..3f5efe643ba
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/blueprint_circles.py
@@ -0,0 +1,46 @@
+#
+#  Filename : blueprint_circles.py
+#  Author   : Emmanuel Turquin
+#  Date     : 04/08/2005
+#  Purpose  : Produces a blueprint using circular contour strokes
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Blender.Freestyle import *
+from logical_operators import *
+from PredicatesB1D import *
+from PredicatesU1D import *
+from shaders import *
+
+upred = AndUP1D(QuantitativeInvisibilityUP1D(0), ContourUP1D())
+bpred = SameShapeIdBP1D()
+Operators.select(upred)
+Operators.bidirectionalChain(ChainPredicateIterator(upred,bpred), NotUP1D(upred))
+Operators.select(pyHigherLengthUP1D(200))
+shaders_list = [
+		ConstantThicknessShader(5),
+                pyBluePrintCirclesShader(3),
+		pyPerlinNoise1DShader(0.1, 15, 8),
+		TextureAssignerShader(4),
+		IncreasingColorShader(0.8, 0.8, 0.3, 0.4, 0.3, 0.3, 0.3, 0.1)
+               ]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/source/blender/freestyle/style_modules_blender/blueprint_ellipses.py b/source/blender/freestyle/style_modules_blender/blueprint_ellipses.py
new file mode 100755
index 00000000000..df996ec6e26
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/blueprint_ellipses.py
@@ -0,0 +1,46 @@
+#
+#  Filename : blueprint_ellipses.py
+#  Author   : Emmanuel Turquin
+#  Date     : 04/08/2005
+#  Purpose  : Produces a blueprint using elliptic contour strokes
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Blender.Freestyle import *
+from logical_operators import *
+from PredicatesB1D import *
+from PredicatesU1D import *
+from shaders import *
+
+upred = AndUP1D(QuantitativeInvisibilityUP1D(0), ContourUP1D())
+bpred = SameShapeIdBP1D()
+Operators.select(upred)
+Operators.bidirectionalChain(ChainPredicateIterator(upred,bpred), NotUP1D(upred))
+Operators.select(pyHigherLengthUP1D(200))
+shaders_list = [
+		ConstantThicknessShader(5),
+                pyBluePrintEllipsesShader(3),
+		pyPerlinNoise1DShader(0.1, 10, 8),
+		TextureAssignerShader(4),
+		IncreasingColorShader(0.6, 0.3, 0.3, 0.7, 0.3, 0.3, 0.3, 0.1)
+               ]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/source/blender/freestyle/style_modules_blender/blueprint_squares.py b/source/blender/freestyle/style_modules_blender/blueprint_squares.py
new file mode 100755
index 00000000000..315aca8858d
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/blueprint_squares.py
@@ -0,0 +1,45 @@
+#  Filename : blueprint_squares.py
+#  Author   : Emmanuel Turquin
+#  Date     : 04/08/2005
+#  Purpose  : Produces a blueprint using square contour strokes
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+from Blender.Freestyle import *
+from logical_operators import *
+from PredicatesB1D import *
+from PredicatesU1D import *
+from shaders import *
+
+upred = AndUP1D(QuantitativeInvisibilityUP1D(0), ContourUP1D())
+bpred = SameShapeIdBP1D()
+Operators.select(upred)
+Operators.bidirectionalChain(ChainPredicateIterator(upred,bpred), NotUP1D(upred))
+Operators.select(pyHigherLengthUP1D(200))
+shaders_list = [
+		ConstantThicknessShader(8),
+                pyBluePrintSquaresShader(2, 20),
+		pyPerlinNoise1DShader(0.07, 10, 8),
+		TextureAssignerShader(4),
+		IncreasingColorShader(0.6, 0.3, 0.3, 0.7, 0.6, 0.3, 0.3, 0.3),
+		ConstantThicknessShader(4)
+               ]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/source/blender/freestyle/style_modules_blender/cartoon.py b/source/blender/freestyle/style_modules_blender/cartoon.py
new file mode 100755
index 00000000000..0c77f30fc9c
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/cartoon.py
@@ -0,0 +1,42 @@
+#
+#  Filename : cartoon.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Draws colored lines. The color is automatically 
+#             infered from each object's material in a cartoon-like
+#             fashion.
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Blender.Freestyle import *
+from logical_operators import *
+from PredicatesB1D import *
+from shaders import *
+
+Operators.select(QuantitativeInvisibilityUP1D(0))
+Operators.bidirectionalChain(ChainSilhouetteIterator(), NotUP1D(QuantitativeInvisibilityUP1D(0)))
+shaders_list = 	[
+		BezierCurveShader(3),
+		ConstantThicknessShader(4), 
+		pyMaterialColorShader(0.8)
+		]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/source/blender/freestyle/style_modules_blender/contour.py b/source/blender/freestyle/style_modules_blender/contour.py
new file mode 100755
index 00000000000..1ee89693033
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/contour.py
@@ -0,0 +1,42 @@
+#
+#  Filename : contour.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Draws each object's visible contour
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Blender.Freestyle import *
+from logical_operators import *
+from PredicatesB1D import *
+from PredicatesU1D import *
+from shaders import *
+
+Operators.select(AndUP1D(QuantitativeInvisibilityUP1D(0), ContourUP1D() ) )
+bpred = SameShapeIdBP1D();
+upred = AndUP1D(QuantitativeInvisibilityUP1D(0), ContourUP1D())
+Operators.bidirectionalChain(ChainPredicateIterator(upred, bpred), NotUP1D(QuantitativeInvisibilityUP1D(0)))
+shaders_list =	 [
+		ConstantThicknessShader(5.0),
+		IncreasingColorShader(0.8,0,0,1,0.1,0,0,1)
+		]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/source/blender/freestyle/style_modules_blender/curvature2d.py b/source/blender/freestyle/style_modules_blender/curvature2d.py
new file mode 100755
index 00000000000..377ac97f5a1
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/curvature2d.py
@@ -0,0 +1,60 @@
+#
+#  Filename : curvature2d.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : The stroke points are colored in gray levels and depending
+#             on the 2d curvature value
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Blender.Freestyle import *
+from logical_operators import *
+from PredicatesB1D import *
+from shaders import *
+
+class py2DCurvatureColorShader(StrokeShader):
+	def getName(self):
+		return "py2DCurvatureColorShader"
+
+	def shade(self, stroke):
+		it = stroke.strokeVerticesBegin()
+		it_end = stroke.strokeVerticesEnd()
+		func = Curvature2DAngleF0D()
+		while it.isEnd() == 0:
+			it0D = it.castToInterface0DIterator()
+			sv = it.getObject()
+			att = sv.attribute()
+			c = func(it0D)
+			if (c<0):
+ 				print "negative 2D curvature"
+			color = 10.0 * c/3.1415
+			att.setColor(color,color,color);
+			it.increment()
+
+Operators.select(QuantitativeInvisibilityUP1D(0))
+Operators.bidirectionalChain(ChainSilhouetteIterator(), NotUP1D(QuantitativeInvisibilityUP1D(0)))
+shaders_list = 	[
+		StrokeTextureShader("smoothAlpha.bmp", Stroke.OPAQUE_MEDIUM, 0),
+		ConstantThicknessShader(5),
+		py2DCurvatureColorShader()
+		]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/source/blender/freestyle/style_modules_blender/external_contour.py b/source/blender/freestyle/style_modules_blender/external_contour.py
new file mode 100755
index 00000000000..80e54dd8f70
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/external_contour.py
@@ -0,0 +1,43 @@
+#
+#  Filename : external_contour.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Draws the external contour of the scene
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Blender.Freestyle import *
+from logical_operators import *
+from PredicatesB1D import *
+from PredicatesU1D import *
+from ChainingIterators import *
+from shaders import *
+
+upred = AndUP1D(QuantitativeInvisibilityUP1D(0), ExternalContourUP1D())
+Operators.select(upred )
+bpred = TrueBP1D();
+Operators.bidirectionalChain(ChainPredicateIterator(upred, bpred), NotUP1D(upred))
+shaders_list = 	[
+		ConstantThicknessShader(3),
+		ConstantColorShader(0.0, 0.0, 0.0,1)
+		]
+Operators.create(TrueUP1D(), shaders_list)
\ No newline at end of file
diff --git a/source/blender/freestyle/style_modules_blender/external_contour_sketchy.py b/source/blender/freestyle/style_modules_blender/external_contour_sketchy.py
new file mode 100755
index 00000000000..64d9b1bd90f
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/external_contour_sketchy.py
@@ -0,0 +1,48 @@
+#
+#  Filename : external_contour_sketchy.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Draws the external contour of the scene using a sketchy 
+#             chaining iterator (in particular each ViewEdge can be drawn 
+#             several times
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+
+from Blender.Freestyle import *
+from logical_operators import *
+from ChainingIterators import *
+from shaders import *
+
+
+upred = AndUP1D(QuantitativeInvisibilityUP1D(0), ExternalContourUP1D()) 
+Operators.select(upred)
+Operators.bidirectionalChain(pySketchyChainingIterator(), NotUP1D(upred))
+shaders_list = 	[
+		SamplingShader(4),
+		SpatialNoiseShader(10, 150, 2, 1, 1), 
+		IncreasingThicknessShader(4, 10), 
+		SmoothingShader(400, 0.1, 0, 0.2, 0, 0, 0, 1),
+		IncreasingColorShader(1,0,0,1,0,1,0,1),
+		TextureAssignerShader(4)
+		]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/source/blender/freestyle/style_modules_blender/external_contour_smooth.py b/source/blender/freestyle/style_modules_blender/external_contour_smooth.py
new file mode 100755
index 00000000000..405d17f564c
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/external_contour_smooth.py
@@ -0,0 +1,44 @@
+#
+#  Filename : external_contour_smooth.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Draws a smooth external contour
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+from Blender.Freestyle import *
+from logical_operators import *
+from PredicatesB1D import *
+from PredicatesU1D import *
+from shaders import *
+from ChainingIterators import *
+
+upred = AndUP1D(QuantitativeInvisibilityUP1D(0), ExternalContourUP1D())
+Operators.select(upred)
+bpred = TrueBP1D();
+Operators.bidirectionalChain(ChainPredicateIterator(upred, bpred), NotUP1D(upred))
+shaders_list = 	[
+		SamplingShader(2),
+		IncreasingThicknessShader(4,20), 
+		IncreasingColorShader(1.0, 0.0, 0.5,1, 0.5,1, 0.3, 1),
+		SmoothingShader(100, 0.05, 0, 0.2, 0, 0, 0, 1)
+		]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/source/blender/freestyle/style_modules_blender/extra-lines.sml b/source/blender/freestyle/style_modules_blender/extra-lines.sml
new file mode 100755
index 00000000000..c63cd40945d
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/extra-lines.sml
@@ -0,0 +1,3 @@
+1suggestive.py
+1ridges.py
+1nor_suggestive_or_ridges.py
diff --git a/source/blender/freestyle/style_modules_blender/haloing.py b/source/blender/freestyle/style_modules_blender/haloing.py
new file mode 100755
index 00000000000..b7713ca2b88
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/haloing.py
@@ -0,0 +1,50 @@
+#
+#  Filename : haloing.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : This style module selects the lines that 
+#             are connected (in the image) to a specific 
+#             object and trims them in order to produce
+#             a haloing effect around the target shape
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Blender.Freestyle import *
+from logical_operators import *
+from PredicatesU1D import *
+from PredicatesB1D import *
+from shaders import *
+
+# id corresponds to the id of the target object 
+# (accessed by SHIFT+click)
+id = Id(3,0)
+upred = AndUP1D(QuantitativeInvisibilityUP1D(0) , pyIsOccludedByUP1D(id))
+Operators.select(upred)
+Operators.bidirectionalChain(ChainSilhouetteIterator(), NotUP1D(upred))
+shaders_list = 	[
+		IncreasingThicknessShader(3, 5), 
+		IncreasingColorShader(1,0,0, 1,0,1,0,1),
+		SamplingShader(1.0),
+		pyTVertexRemoverShader(),
+		TipRemoverShader(3.0)
+		]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/source/blender/freestyle/style_modules_blender/ignore_small_occlusions.py b/source/blender/freestyle/style_modules_blender/ignore_small_occlusions.py
new file mode 100755
index 00000000000..6fa7d2413f0
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/ignore_small_occlusions.py
@@ -0,0 +1,41 @@
+#
+#  Filename : ignore_small_oclusions.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : The strokes are drawn through small occlusions
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Blender.Freestyle import *
+from logical_operators import *
+from ChainingIterators import *
+from shaders import *
+
+Operators.select(QuantitativeInvisibilityUP1D(0))
+#Operators.bidirectionalChain(pyFillOcclusionsChainingIterator(0.1))
+Operators.bidirectionalChain(pyFillOcclusionsAbsoluteChainingIterator(12))
+shaders_list = 	[
+		SamplingShader(5.0),
+		ConstantThicknessShader(3), 
+		ConstantColorShader(0.0,0.0,0.0),
+		]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/source/blender/freestyle/style_modules_blender/invisible_lines.py b/source/blender/freestyle/style_modules_blender/invisible_lines.py
new file mode 100755
index 00000000000..ddaf3e4de9d
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/invisible_lines.py
@@ -0,0 +1,42 @@
+#
+#  Filename : invisible_lines.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Draws all lines whose Quantitative Invisibility 
+#             is different from 0
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Blender.Freestyle import *
+from logical_operators import *
+from ChainingIterators import *
+from shaders import *
+
+upred = NotUP1D(QuantitativeInvisibilityUP1D(0))
+Operators.select(upred)
+Operators.bidirectionalChain(ChainSilhouetteIterator(), NotUP1D(upred))
+shaders_list = 	[
+		SamplingShader(5.0),
+		ConstantThicknessShader(3.0), 
+		ConstantColorShader(0.7,0.7,0.7)
+		]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/source/blender/freestyle/style_modules_blender/japanese_bigbrush.py b/source/blender/freestyle/style_modules_blender/japanese_bigbrush.py
new file mode 100755
index 00000000000..74885b50562
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/japanese_bigbrush.py
@@ -0,0 +1,59 @@
+#
+#  Filename : japanese_bigbrush.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Simulates a big brush fr oriental painting
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Blender.Freestyle import *
+from logical_operators import *
+from PredicatesU1D import *
+from PredicatesB1D import *
+from Functions0D import *
+from shaders import *
+
+
+Operators.select(QuantitativeInvisibilityUP1D(0))
+Operators.bidirectionalChain(ChainSilhouetteIterator(),NotUP1D(QuantitativeInvisibilityUP1D(0)))
+## Splits strokes at points of highest 2D curavture 
+## when there are too many abrupt turns in it
+func = pyInverseCurvature2DAngleF0D()
+Operators.recursiveSplit(func,  pyParameterUP0D(0.2,0.8), NotUP1D(pyHigherNumberOfTurnsUP1D(3, 0.5)), 2)
+## Keeps only long enough strokes
+Operators.select(pyHigherLengthUP1D(100))
+## Sorts so as to draw the longest strokes first
+## (this will be done using the causal density)
+Operators.sort(pyLengthBP1D())
+shaders_list = 	[
+		pySamplingShader(10),
+		BezierCurveShader(30),
+		SamplingShader(50),
+		pyNonLinearVaryingThicknessShader(4,25, 0.6),
+		TextureAssignerShader(6),
+		ConstantColorShader(0.2, 0.2, 0.2,1.0),
+		TipRemoverShader(10)
+		]
+## Use the causal density to avoid cluttering
+Operators.create(pyDensityUP1D(8,0.4, IntegrationType.MEAN), shaders_list)
+
+
diff --git a/source/blender/freestyle/style_modules_blender/logical_operators.py b/source/blender/freestyle/style_modules_blender/logical_operators.py
new file mode 100755
index 00000000000..33466ed5a33
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/logical_operators.py
@@ -0,0 +1,36 @@
+from Blender.Freestyle import *
+
+class AndUP1D(UnaryPredicate1D):
+    def __init__(self, pred1, pred2):
+        UnaryPredicate1D.__init__(self)
+        self.__pred1 = pred1
+        self.__pred2 = pred2
+
+    def getName(self):
+        return "AndUP1D"
+
+    def __call__(self, inter):
+        return self.__pred1(inter) and self.__pred2(inter)
+    
+class OrUP1D(UnaryPredicate1D):
+    def __init__(self, pred1, pred2):
+        UnaryPredicate1D.__init__(self)
+        self.__pred1 = pred1
+        self.__pred2 = pred2
+
+    def getName(self):
+        return "OrUP1D"
+
+    def __call__(self, inter):
+        return self.__pred1(inter) or self.__pred2(inter)
+
+class NotUP1D(UnaryPredicate1D):
+	def __init__(self, pred):
+		UnaryPredicate1D.__init__(self)
+		self.__pred = pred
+
+	def getName(self):
+ 		return "NotUP1D"
+
+	def __call__(self, inter):
+		return self.__pred(inter) == 0
diff --git a/source/blender/freestyle/style_modules_blender/long_anisotropically_dense.py b/source/blender/freestyle/style_modules_blender/long_anisotropically_dense.py
new file mode 100755
index 00000000000..64b77092c4f
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/long_anisotropically_dense.py
@@ -0,0 +1,81 @@
+#
+#  Filename : long_anisotropically_dense.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Selects the lines that are long and have a high anisotropic 
+#             a priori density and uses causal density 
+#             to draw without cluttering. Ideally, half of the
+#             selected lines are culled using the causal density.
+#
+#             ********************* WARNING *************************************
+#             ******** The Directional a priori density maps must          ****** 
+#             ******** have been computed prior to using this style module ******
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Blender.Freestyle import *
+from logical_operators import *
+from PredicatesU1D import *
+from PredicatesU0D import *
+from PredicatesB1D import *
+from Functions0D import *
+from Functions1D import *
+from shaders import *
+
+## custom density predicate
+class pyDensityUP1D(UnaryPredicate1D):
+	def __init__(self,wsize,threshold, integration = IntegrationType.MEAN, sampling=2.0):
+ 		UnaryPredicate1D.__init__(self)
+		self._wsize = wsize
+		self._threshold = threshold
+		self._integration = integration
+		self._func = DensityF1D(self._wsize, self._integration, sampling)
+		self._func2 = DensityF1D(self._wsize, IntegrationType.MAX, sampling)
+   
+	def getName(self):
+		return "pyDensityUP1D"
+
+	def __call__(self, inter):
+		c = self._func(inter)
+		m = self._func2(inter)
+		if(c < self._threshold):
+			return 1
+		if( m > 4* c ):
+			if ( c < 1.5*self._threshold ):
+				return 1
+		return 0
+
+Operators.select(QuantitativeInvisibilityUP1D(0))
+Operators.bidirectionalChain(ChainSilhouetteIterator(),NotUP1D(QuantitativeInvisibilityUP1D(0)))
+Operators.select(pyHigherLengthUP1D(40))
+## selects lines having a high anisotropic a priori density
+Operators.select(pyHighDensityAnisotropyUP1D(0.3,4))
+Operators.sort(pyLengthBP1D())
+shaders_list =  [
+	SamplingShader(2.0),
+	ConstantThicknessShader(2),
+	ConstantColorShader(0.2,0.2,0.25,1), 
+			]
+## uniform culling
+Operators.create(pyDensityUP1D(3.0,2.0e-2, IntegrationType.MEAN, 0.1), shaders_list)
+
+ 
diff --git a/source/blender/freestyle/style_modules_blender/multiple_parameterization.py b/source/blender/freestyle/style_modules_blender/multiple_parameterization.py
new file mode 100755
index 00000000000..76565424080
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/multiple_parameterization.py
@@ -0,0 +1,51 @@
+#
+#  Filename : multiple_parameterization.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : The thickness and the color of the strokes vary continuously 
+#             independently from occlusions although only
+#             visible lines are actually drawn. This is equivalent
+#             to assigning the thickness using a parameterization covering
+#             the complete silhouette (visible+invisible) and drawing
+#             the strokes using a second parameterization that only
+#             covers the visible portions.
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Blender.Freestyle import *
+from logical_operators import *
+from ChainingIterators import *
+from shaders import *
+
+Operators.select(QuantitativeInvisibilityUP1D(0))
+## Chain following the same nature, but without the restriction
+## of staying inside the selection (0).
+Operators.bidirectionalChain(ChainSilhouetteIterator(0))
+shaders_list = 	[
+		SamplingShader(20),
+		IncreasingThicknessShader(1.5, 30), 
+		ConstantColorShader(0.0,0.0,0.0),
+		IncreasingColorShader(1,0,0,1,0,1,0,1),
+		TextureAssignerShader(-1),
+		pyHLRShader() ## this shader draws only visible portions
+		]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/source/blender/freestyle/style_modules_blender/nature.py b/source/blender/freestyle/style_modules_blender/nature.py
new file mode 100755
index 00000000000..b3441ea2b23
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/nature.py
@@ -0,0 +1,43 @@
+#
+#  Filename : nature.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Uses the NatureUP1D predicate to select the lines
+#             of a given type (among SILHOUETTE, CREASE, SUGGESTIVE_CONTOURS,
+#             BORDERS).
+#             The suggestive contours must have been enabled in the 
+#             options dialog to appear in the View Map.
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Blender.Freestyle import *
+from logical_operators import *
+from PredicatesB1D import *
+from shaders import *
+
+Operators.select(pyNatureUP1D(SILHOUETTE))
+Operators.bidirectionalChain(ChainSilhouetteIterator(),NotUP1D( pyNatureUP1D( SILHOUETTE) ) )
+shaders_list = 	[
+		IncreasingThicknessShader(3, 10), 
+		IncreasingColorShader(0.0,0.0,0.0, 1, 0.8,0,0,1)
+		]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/source/blender/freestyle/style_modules_blender/near_lines.py b/source/blender/freestyle/style_modules_blender/near_lines.py
new file mode 100755
index 00000000000..1e9e278643a
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/near_lines.py
@@ -0,0 +1,44 @@
+#
+#  Filename : near_lines.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Draws the lines that are "closer" than a threshold 
+#             (between 0 and 1)
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+
+from Blender.Freestyle import *
+from logical_operators import *
+from PredicatesB1D import *
+from PredicatesU1D import *
+from shaders import *
+
+upred = AndUP1D(QuantitativeInvisibilityUP1D(0), pyZSmallerUP1D(0.5, IntegrationType.MEAN)) 
+Operators.select(upred)
+Operators.bidirectionalChain(ChainSilhouetteIterator(), NotUP1D(upred))
+shaders_list = 	[
+		TextureAssignerShader(-1),
+		ConstantThicknessShader(5), 
+		ConstantColorShader(0.0, 0.0, 0.0)
+		]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/source/blender/freestyle/style_modules_blender/occluded_by_specific_object.py b/source/blender/freestyle/style_modules_blender/occluded_by_specific_object.py
new file mode 100755
index 00000000000..21e778aee79
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/occluded_by_specific_object.py
@@ -0,0 +1,45 @@
+#
+#  Filename : occluded_by_specific_object.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Draws only the lines that are occluded by a given object
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Blender.Freestyle import *
+from logical_operators import *
+from PredicatesU1D import *
+from shaders import *
+
+## the id of the occluder (use SHIFT+click on the ViewMap to
+## retrieve ids)
+id = Id(3,0)
+upred = AndUP1D(NotUP1D(QuantitativeInvisibilityUP1D(0)),
+pyIsInOccludersListUP1D(id))
+Operators.select(upred)
+Operators.bidirectionalChain(ChainSilhouetteIterator(), NotUP1D(upred))
+shaders_list = 	[
+		SamplingShader(5),
+		ConstantThicknessShader(3), 
+		ConstantColorShader(0.3,0.3,0.3,1)
+		]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/source/blender/freestyle/style_modules_blender/polygonalize.py b/source/blender/freestyle/style_modules_blender/polygonalize.py
new file mode 100755
index 00000000000..beb48f812f7
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/polygonalize.py
@@ -0,0 +1,40 @@
+#
+#  Filename : polygonalize.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Make the strokes more "polygonal"
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+from Blender.Freestyle import *
+from logical_operators import *
+from ChainingIterators import *
+from shaders import *
+
+Operators.select(QuantitativeInvisibilityUP1D(0))
+Operators.bidirectionalChain(ChainSilhouetteIterator(),NotUP1D(QuantitativeInvisibilityUP1D(0)))
+shaders_list = 	[
+		SamplingShader(2.0),
+		ConstantThicknessShader(3), 
+		ConstantColorShader(0.0,0.0,0.0),
+		PolygonalizationShader(8)
+		]
+Operators.create(TrueUP1D(), shaders_list)
\ No newline at end of file
diff --git a/source/blender/freestyle/style_modules_blender/qi0.py b/source/blender/freestyle/style_modules_blender/qi0.py
new file mode 100755
index 00000000000..246cda79607
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/qi0.py
@@ -0,0 +1,41 @@
+#
+#  Filename : qi0.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Draws the visible lines (chaining follows same nature lines)
+#             (most basic style module)
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Blender.Freestyle import *
+from logical_operators import *
+from ChainingIterators import *
+from shaders import *
+
+Operators.select(QuantitativeInvisibilityUP1D(0))
+Operators.bidirectionalChain(ChainSilhouetteIterator(), NotUP1D(QuantitativeInvisibilityUP1D(0)))
+shaders_list = 	[
+		SamplingShader(5.0),
+		ConstantThicknessShader(4.0), 
+		ConstantColorShader(0.0,0.0,0.0)
+		]
+Operators.create(TrueUP1D(), shaders_list)
\ No newline at end of file
diff --git a/source/blender/freestyle/style_modules_blender/qi0_not_external_contour.py b/source/blender/freestyle/style_modules_blender/qi0_not_external_contour.py
new file mode 100755
index 00000000000..8cc5bf4c63d
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/qi0_not_external_contour.py
@@ -0,0 +1,43 @@
+#
+#  Filename : qi0_not_external_contour.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Draws the visible lines (chaining follows same nature lines)
+#             that do not belong to the external contour of the scene
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Blender.Freestyle import *
+from logical_operators import *
+
+upred = AndUP1D(QuantitativeInvisibilityUP1D(0), ExternalContourUP1D())
+Operators.select(upred)
+Operators.bidirectionalChain(ChainSilhouetteIterator(), NotUP1D(upred))
+shaders_list = 	[
+		SamplingShader(4),
+		SpatialNoiseShader(4, 150, 2, 1, 1), 
+		IncreasingThicknessShader(2, 5), 
+		BackboneStretcherShader(20),
+		IncreasingColorShader(1,0,0,1,0,1,0,1),
+		TextureAssignerShader(4)
+		]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/source/blender/freestyle/style_modules_blender/qi1.py b/source/blender/freestyle/style_modules_blender/qi1.py
new file mode 100755
index 00000000000..0125fd71ea8
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/qi1.py
@@ -0,0 +1,42 @@
+#
+#  Filename : qi1.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Draws lines hidden by one surface.
+#             *** Quantitative Invisibility must have been 
+#             enabled in the options dialog to use this style module ****
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Blender.Freestyle import *
+from logical_operators import *
+from PredicatesB1D import *
+from shaders import *
+
+Operators.select(QuantitativeInvisibilityUP1D(1))
+Operators.bidirectionalChain(ChainSilhouetteIterator(), NotUP1D(QuantitativeInvisibilityUP1D(1)))
+shaders_list = 	[
+		SamplingShader(5.0),
+		ConstantThicknessShader(3), 
+		ConstantColorShader(0.5,0.5,0.5, 1)
+		]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/source/blender/freestyle/style_modules_blender/qi2.py b/source/blender/freestyle/style_modules_blender/qi2.py
new file mode 100755
index 00000000000..9bb356c0810
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/qi2.py
@@ -0,0 +1,42 @@
+#
+#  Filename : qi2.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Draws lines hidden by two surfaces.
+#             *** Quantitative Invisibility must have been 
+#             enabled in the options dialog to use this style module ****
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Blender.Freestyle import *
+from logical_operators import *
+from PredicatesB1D import *
+from shaders import *
+
+Operators.select(QuantitativeInvisibilityUP1D(2))
+Operators.bidirectionalChain(ChainSilhouetteIterator(), NotUP1D(QuantitativeInvisibilityUP1D(2)))
+shaders_list = 	[
+		SamplingShader(10),
+		ConstantThicknessShader(1.5), 
+		ConstantColorShader(0.7,0.7,0.7, 1)
+		]
+Operators.create(TrueUP1D(), shaders_list)
\ No newline at end of file
diff --git a/source/blender/freestyle/style_modules_blender/sequentialsplit_sketchy.py b/source/blender/freestyle/style_modules_blender/sequentialsplit_sketchy.py
new file mode 100755
index 00000000000..c9d73a57c46
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/sequentialsplit_sketchy.py
@@ -0,0 +1,68 @@
+#
+#  Filename : sequentialsplit_sketchy.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Use the sequential split with two different
+#             predicates to specify respectively the starting and
+#             the stopping extremities for strokes 
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Blender.Freestyle import *
+from logical_operators import *
+from PredicatesU1D import *
+from PredicatesU0D import *
+from Functions0D import *
+
+## Predicate to tell whether a TVertex
+## corresponds to a change from 0 to 1 or not.
+class pyBackTVertexUP0D(UnaryPredicate0D):
+	def __init__(self):
+		UnaryPredicate0D.__init__(self)
+		self._getQI = QuantitativeInvisibilityF0D()
+	def getName(self):
+		return "pyBackTVertexUP0D"
+	def __call__(self, iter):
+		v = iter.getObject()
+		nat = v.getNature()
+		if(nat & T_VERTEX == 0):
+			return 0
+		if(self._getQI(iter) != 0):
+			return 1
+		return 0
+
+
+upred = QuantitativeInvisibilityUP1D(0)
+Operators.select(upred)
+Operators.bidirectionalChain(ChainSilhouetteIterator(), NotUP1D(upred))
+## starting and stopping predicates:
+start = pyVertexNatureUP0D(NON_T_VERTEX)
+stop = pyBackTVertexUP0D()
+Operators.sequentialSplit(start, stop, 10)
+shaders_list = [
+		SpatialNoiseShader(7, 120, 2, 1, 1), 
+		IncreasingThicknessShader(5, 8), 
+		ConstantColorShader(0.2, 0.2, 0.2, 1), 
+		TextureAssignerShader(4)
+		]
+Operators.create(TrueUP1D(), shaders_list)
+
diff --git a/source/blender/freestyle/style_modules_blender/shaders.py b/source/blender/freestyle/style_modules_blender/shaders.py
new file mode 100755
index 00000000000..ee45324e186
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/shaders.py
@@ -0,0 +1,1288 @@
+from Blender.Freestyle import *
+from PredicatesU0D import *
+from PredicatesB1D import *
+from PredicatesU1D import *
+from logical_operators import *
+from ChainingIterators import *
+from random import *
+from math import *
+from vector import *
+
+## thickness modifiers
+######################
+
+class pyDepthDiscontinuityThicknessShader(StrokeShader):
+	def __init__(self, min, max):
+		StrokeShader.__init__(self)
+		self.__min = float(min)
+		self.__max = float(max)
+		self.__func = ZDiscontinuityF0D()
+	def getName(self):
+		return "pyDepthDiscontinuityThicknessShader"
+	def shade(self, stroke):
+		it = stroke.strokeVerticesBegin()
+		z_min=0.0
+		z_max=1.0
+		a = (self.__max - self.__min)/(z_max-z_min)
+		b = (self.__min*z_max-self.__max*z_min)/(z_max-z_min)
+		it = stroke.strokeVerticesBegin()
+		while it.isEnd() == 0:
+			z = self.__func(it.castToInterface0DIterator())
+			thickness = a*z+b
+			it.getObject().attribute().setThickness(thickness, thickness)
+			it.increment()
+
+class pyConstantThicknessShader(StrokeShader):
+	def __init__(self, thickness):
+		StrokeShader.__init__(self)
+		self._thickness = thickness
+
+	def getName(self):
+		return "pyConstantThicknessShader"
+	def shade(self, stroke):
+		it = stroke.strokeVerticesBegin()
+		it_end = stroke.strokeVerticesEnd()
+		while it.isEnd() == 0:
+			att = it.getObject().attribute()
+			t = self._thickness/2.0
+			att.setThickness(t, t)
+			it.increment()
+
+class pyFXSThicknessShader(StrokeShader):
+	def __init__(self, thickness):
+		StrokeShader.__init__(self)
+		self._thickness = thickness
+
+	def getName(self):
+		return "pyFXSThicknessShader"
+	def shade(self, stroke):
+		it = stroke.strokeVerticesBegin()
+		it_end = stroke.strokeVerticesEnd()
+		while it.isEnd() == 0:
+			att = it.getObject().attribute()
+			t = self._thickness/2.0
+			att.setThickness(t, t)
+			it.increment()
+
+class pyFXSVaryingThicknessWithDensityShader(StrokeShader):
+	def __init__(self, wsize, threshold_min, threshold_max, thicknessMin, thicknessMax):
+		StrokeShader.__init__(self)
+		self.wsize= wsize
+		self.threshold_min= threshold_min
+		self.threshold_max= threshold_max
+		self._thicknessMin = thicknessMin
+		self._thicknessMax = thicknessMax
+
+	def getName(self):
+		return "pyVaryingThicknessWithDensityShader"
+	def shade(self, stroke):
+		n = stroke.strokeVerticesSize()
+		i = 0
+		it = stroke.strokeVerticesBegin()
+		it_end = stroke.strokeVerticesEnd()
+		func = DensityF0D(self.wsize)
+		while it.isEnd() == 0:
+			att = it.getObject().attribute()
+			toto = it.castToInterface0DIterator()
+			c= func(toto)
+			if (c < self.threshold_min ):
+				c = self.threshold_min
+			if (c > self.threshold_max ):
+				c = self.threshold_max
+##			t = (c - self.threshold_min)/(self.threshold_max - self.threshold_min)*(self._thicknessMax-self._thicknessMin) + self._thicknessMin
+			t = (self.threshold_max - c  )/(self.threshold_max - self.threshold_min)*(self._thicknessMax-self._thicknessMin) + self._thicknessMin
+			att.setThickness(t/2.0, t/2.0)
+			i = i+1
+			it.increment()
+class pyIncreasingThicknessShader(StrokeShader):
+	def __init__(self, thicknessMin, thicknessMax):
+		StrokeShader.__init__(self)
+		self._thicknessMin = thicknessMin
+		self._thicknessMax = thicknessMax
+
+	def getName(self):
+		return "pyIncreasingThicknessShader"
+	def shade(self, stroke):
+		n = stroke.strokeVerticesSize()
+		i = 0
+		it = stroke.strokeVerticesBegin()
+		it_end = stroke.strokeVerticesEnd()
+		while it.isEnd() == 0:
+			att = it.getObject().attribute()
+			c = float(i)/float(n)
+			if(i < float(n)/2.0):
+				t = (1.0 - c)*self._thicknessMin + c * self._thicknessMax
+			else:
+				t = (1.0 - c)*self._thicknessMax + c * self._thicknessMin
+			att.setThickness(t/2.0, t/2.0)
+			i = i+1
+			it.increment()
+
+class pyConstrainedIncreasingThicknessShader(StrokeShader):
+	def __init__(self, thicknessMin, thicknessMax, ratio):
+		StrokeShader.__init__(self)
+		self._thicknessMin = thicknessMin
+		self._thicknessMax = thicknessMax
+		self._ratio = ratio
+
+	def getName(self):
+		return "pyConstrainedIncreasingThicknessShader"
+	def shade(self, stroke):
+		slength = stroke.getLength2D()
+		tmp = self._ratio*slength
+		maxT = 0.0
+		if(tmp < self._thicknessMax):
+			maxT = tmp
+		else:
+			maxT = self._thicknessMax
+		n = stroke.strokeVerticesSize()
+		i = 0
+		it = stroke.strokeVerticesBegin()
+		it_end = stroke.strokeVerticesEnd()
+		while it.isEnd() == 0:
+			att = it.getObject().attribute()
+			c = float(i)/float(n)
+			if(i < float(n)/2.0):
+				t = (1.0 - c)*self._thicknessMin + c * maxT
+			else:
+				t = (1.0 - c)*maxT + c * self._thicknessMin
+			att.setThickness(t/2.0, t/2.0)
+			if(i == n-1):
+				att.setThickness(self._thicknessMin/2.0, self._thicknessMin/2.0)
+			i = i+1
+			it.increment()
+
+class pyDecreasingThicknessShader(StrokeShader):
+	def __init__(self, thicknessMax, thicknessMin):
+		StrokeShader.__init__(self)
+		self._thicknessMin = thicknessMin
+		self._thicknessMax = thicknessMax
+
+	def getName(self):
+		return "pyDecreasingThicknessShader"
+	def shade(self, stroke):
+		l = stroke.getLength2D()
+		tMax = self._thicknessMax
+		if(self._thicknessMax > 0.33*l):
+			tMax = 0.33*l
+		tMin = self._thicknessMin
+		if(self._thicknessMin > 0.1*l):
+			tMin = 0.1*l
+		n = stroke.strokeVerticesSize()
+		i = 0
+		it = stroke.strokeVerticesBegin()
+		it_end = stroke.strokeVerticesEnd()
+		while it.isEnd() == 0:
+			att = it.getObject().attribute()
+			c = float(i)/float(n)
+			t = (1.0 - c)*tMax +c*tMin
+			att.setThickness(t/2.0, t/2.0)
+			i = i+1
+			it.increment()
+
+def smoothC( a, exp ):
+	c = pow(float(a),exp)*pow(2.0,exp)
+	return c
+
+class pyNonLinearVaryingThicknessShader(StrokeShader):
+	def __init__(self, thicknessExtremity, thicknessMiddle, exponent):
+		StrokeShader.__init__(self)
+		self._thicknessMin = thicknessMiddle
+		self._thicknessMax = thicknessExtremity
+		self._exponent = exponent
+
+	def getName(self):
+		return "pyNonLinearVaryingThicknessShader"
+	def shade(self, stroke):
+		n = stroke.strokeVerticesSize()
+		i = 0
+		it = stroke.strokeVerticesBegin()
+		it_end = stroke.strokeVerticesEnd()
+		while it.isEnd() == 0:
+			att = it.getObject().attribute()
+			if(i < float(n)/2.0):
+				c = float(i)/float(n)
+			else:
+				c = float(n-i)/float(n)
+			c = smoothC(c, self._exponent)
+			t = (1.0 - c)*self._thicknessMax + c * self._thicknessMin
+			att.setThickness(t/2.0, t/2.0)
+			i = i+1
+			it.increment()
+
+## Spherical linear interpolation (cos)
+class pySLERPThicknessShader(StrokeShader):
+	def __init__(self, thicknessMin, thicknessMax, omega=1.2):
+		StrokeShader.__init__(self)
+		self._thicknessMin = thicknessMin
+		self._thicknessMax = thicknessMax
+		self._omega = omega
+
+	def getName(self):
+		return "pySLERPThicknessShader"
+	def shade(self, stroke):
+		slength = stroke.getLength2D()
+		tmp = 0.33*slength
+		maxT = self._thicknessMax
+		if(tmp < self._thicknessMax):
+			maxT = tmp
+		
+		n = stroke.strokeVerticesSize()
+		i = 0
+		it = stroke.strokeVerticesBegin()
+		it_end = stroke.strokeVerticesEnd()
+		while it.isEnd() == 0:
+			att = it.getObject().attribute()
+			c = float(i)/float(n)
+			if(i < float(n)/2.0):
+				t = sin((1-c)*self._omega)/sinh(self._omega)*self._thicknessMin + sin(c*self._omega)/sinh(self._omega) * maxT
+			else:
+				t = sin((1-c)*self._omega)/sinh(self._omega)*maxT + sin(c*self._omega)/sinh(self._omega) * self._thicknessMin
+			att.setThickness(t/2.0, t/2.0)
+			i = i+1
+			it.increment()
+
+class pyTVertexThickenerShader(StrokeShader): ## FIXME
+	def __init__(self, a=1.5, n=3):
+		StrokeShader.__init__(self)
+		self._a = a
+		self._n = n
+
+	def getName(self):
+		return "pyTVertexThickenerShader"
+
+	def shade(self, stroke):
+		it = stroke.strokeVerticesBegin()
+		predTVertex = pyVertexNatureUP0D(T_VERTEX)
+		while it.isEnd() == 0:
+			if(predTVertex(it) == 1):
+				it2 = StrokeVertexIterator(it)
+				it2.increment()
+				if not(it.isBegin() or it2.isEnd()):
+					it.increment()
+					continue
+				n = self._n
+				a = self._a
+				if(it.isBegin()):
+					it3 = StrokeVertexIterator(it)
+					count = 0
+					while (it3.isEnd() == 0 and count < n):
+						att = it3.getObject().attribute()
+						tr = att.getThicknessR();
+						tl = att.getThicknessL();
+						r = (a-1.0)/float(n-1)*(float(n)/float(count+1) - 1) + 1
+						#r = (1.0-a)/float(n-1)*count + a
+						att.setThickness(r*tr, r*tl)	
+						it3.increment()
+						count = count + 1
+				if(it2.isEnd()):
+					it4 = StrokeVertexIterator(it)
+					count = 0
+					while (it4.isBegin() == 0 and count < n):
+						att = it4.getObject().attribute()
+						tr = att.getThicknessR();
+						tl = att.getThicknessL();
+						r = (a-1.0)/float(n-1)*(float(n)/float(count+1) - 1) + 1
+						#r = (1.0-a)/float(n-1)*count + a
+						att.setThickness(r*tr, r*tl)	
+						it4.decrement()
+						count = count + 1
+					if ((it4.isBegin() == 1)):
+						att = it4.getObject().attribute()
+						tr = att.getThicknessR();
+						tl = att.getThicknessL();
+						r = (a-1.0)/float(n-1)*(float(n)/float(count+1) - 1) + 1
+						#r = (1.0-a)/float(n-1)*count + a
+						att.setThickness(r*tr, r*tl)	
+			it.increment()
+
+class pyImportance2DThicknessShader(StrokeShader):
+	def __init__(self, x, y, w, kmin, kmax):
+		StrokeShader.__init__(self)
+		self._x = x
+		self._y = y
+		self._w = float(w)
+		self._kmin = float(kmin)
+		self._kmax = float(kmax)
+
+	def getName(self):
+		return "pyImportanceThicknessShader"
+	def shade(self, stroke):
+		origin = Vec2(self._x, self._y)
+		it = stroke.strokeVerticesBegin()
+		while it.isEnd() == 0:
+			v = it.getObject()
+			p = Vec2(v.getProjectedX(), v.getProjectedY())
+			d = (p-origin).length()
+			if(d>self._w):
+				k = self._kmin
+			else:
+				k = (self._kmax*(self._w-d) + self._kmin*d)/self._w
+			att = v.attribute()
+			tr = att.getThicknessR()
+			tl = att.getThicknessL()
+			att.setThickness(k*tr/2.0, k*tl/2.0)
+			it.increment()
+
+class pyImportance3DThicknessShader(StrokeShader):
+	def __init__(self, x, y, z, w, kmin, kmax):
+		StrokeShader.__init__(self)
+		self._x = x
+		self._y = y
+		self._z = z
+		self._w = float(w)
+		self._kmin = float(kmin)
+		self._kmax = float(kmax)
+
+	def getName(self):
+		return "pyImportance3DThicknessShader"
+	def shade(self, stroke):
+		origin = Vec3(self._x, self._y, self._z)
+		it = stroke.strokeVerticesBegin()
+		while it.isEnd() == 0:
+			v = it.getObject()
+			p = Vec3(v.getX(), v.getY(), v.getZ())
+			d = (p-origin).length()
+			if(d>self._w):
+				k = self._kmin
+			else:
+				k = (self._kmax*(self._w-d) + self._kmin*d)/self._w
+			att = v.attribute()
+			tr = att.getThicknessR()
+			tl = att.getThicknessL()
+			att.setThickness(k*tr/2.0, k*tl/2.0)
+			it.increment()
+
+class pyZDependingThicknessShader(StrokeShader):
+	def __init__(self, min, max):
+		StrokeShader.__init__(self)
+		self.__min = min
+		self.__max = max
+		self.__func = GetProjectedZF0D()
+	def getName(self):
+		return "pyZDependingThicknessShader"
+	def shade(self, stroke):
+		it = stroke.strokeVerticesBegin()
+		z_min = 1
+		z_max = 0
+		while it.isEnd() == 0:
+			z = self.__func(it.castToInterface0DIterator())
+			if z < z_min:
+				z_min = z
+			elif z > z_max:
+				z_max = z
+			it.increment()
+		z_diff = 1 / (z_max - z_min)
+		it = stroke.strokeVerticesBegin()
+		while it.isEnd() == 0:
+			z = (self.__func(it.castToInterface0DIterator()) - z_min) * z_diff
+			thickness = (1 - z) * self.__max + z * self.__min
+			it.getObject().attribute().setThickness(thickness, thickness)
+			it.increment()
+
+
+## color modifiers
+##################
+
+class pyConstantColorShader(StrokeShader):
+	def __init__(self,r,g,b, a = 1):
+		StrokeShader.__init__(self)
+		self._r = r
+		self._g = g
+		self._b = b
+		self._a = a
+	def getName(self):
+		return "pyConstantColorShader"
+	def shade(self, stroke):
+		it = stroke.strokeVerticesBegin()
+		it_end = stroke.strokeVerticesEnd()
+		while it.isEnd() == 0:
+			att = it.getObject().attribute()
+			att.setColor(self._r, self._g, self._b)
+			att.setAlpha(self._a)
+			it.increment()
+
+#c1->c2
+class pyIncreasingColorShader(StrokeShader):
+	def __init__(self,r1,g1,b1,a1, r2,g2,b2,a2):
+		StrokeShader.__init__(self)
+		self._c1 = [r1,g1,b1,a1]
+		self._c2 = [r2,g2,b2,a2]
+	def getName(self):
+		return "pyIncreasingColorShader"
+	def shade(self, stroke):
+		n = stroke.strokeVerticesSize() - 1
+		inc = 0
+		it = stroke.strokeVerticesBegin()
+		it_end = stroke.strokeVerticesEnd()
+		while it.isEnd() == 0:
+			att = it.getObject().attribute()
+			c = float(inc)/float(n)
+
+			att.setColor(  (1-c)*self._c1[0] + c*self._c2[0], 
+				      (1-c)*self._c1[1] + c*self._c2[1],
+			                    (1-c)*self._c1[2] + c*self._c2[2],)
+			att.setAlpha((1-c)*self._c1[3] + c*self._c2[3],)
+			inc = inc+1
+			it.increment()
+
+# c1->c2->c1
+class pyInterpolateColorShader(StrokeShader):
+	def __init__(self,r1,g1,b1,a1, r2,g2,b2,a2):
+		StrokeShader.__init__(self)
+		self._c1 = [r1,g1,b1,a1]
+		self._c2 = [r2,g2,b2,a2]
+	def getName(self):
+		return "pyInterpolateColorShader"
+	def shade(self, stroke):
+		n = stroke.strokeVerticesSize() - 1
+		inc = 0
+		it = stroke.strokeVerticesBegin()
+		it_end = stroke.strokeVerticesEnd()
+		while it.isEnd() == 0:
+			att = it.getObject().attribute()
+			u = float(inc)/float(n)
+			c = 1-2*(fabs(u-0.5))
+			att.setColor(  (1-c)*self._c1[0] + c*self._c2[0], 
+				      (1-c)*self._c1[1] + c*self._c2[1],
+			                    (1-c)*self._c1[2] + c*self._c2[2],)
+			att.setAlpha((1-c)*self._c1[3] + c*self._c2[3],)
+			inc = inc+1
+			it.increment()
+
+class pyMaterialColorShader(StrokeShader):
+	def __init__(self, threshold=50):
+		StrokeShader.__init__(self)
+		self._threshold = threshold
+
+	def getName(self):
+		return "pyMaterialColorShader"
+
+	def shade(self, stroke):
+		it = stroke.strokeVerticesBegin()
+		it_end = stroke.strokeVerticesEnd()
+		func = MaterialF0D()
+		xn = 0.312713
+		yn = 0.329016
+		Yn = 1.0
+		un = 4.* xn/ ( -2.*xn + 12.*yn + 3. )
+		vn= 9.* yn/ ( -2.*xn + 12.*yn +3. )	
+		while it.isEnd() == 0:
+			toto = it.castToInterface0DIterator()
+			mat = func(toto)
+			
+			r = mat.diffuseR()
+			g = mat.diffuseG()
+			b = mat.diffuseB()
+
+			X = 0.412453*r + 0.35758 *g + 0.180423*b
+			Y = 0.212671*r + 0.71516 *g + 0.072169*b
+			Z = 0.019334*r + 0.119193*g + 0.950227*b
+
+			if((X == 0) and (Y == 0) and (Z == 0)):
+				X = 0.01
+				Y = 0.01
+				Z = 0.01
+			u = 4.*X / (X + 15.*Y + 3.*Z)
+			v = 9.*Y / (X + 15.*Y + 3.*Z)
+			
+			L= 116. * math.pow((Y/Yn),(1./3.)) -16
+			U = 13. * L * (u - un)
+			V = 13. * L * (v - vn)
+			
+			if (L > self._threshold):
+				L = L/1.3
+				U = U+10
+			else:
+				L = L +2.5*(100-L)/5.
+				U = U/3.0
+				V = V/3.0				
+			u = U / (13. * L) + un
+			v = V / (13. * L) + vn
+			
+			Y = Yn * math.pow( ((L+16.)/116.), 3.)
+			X = -9. * Y * u / ((u - 4.)* v - u * v)
+			Z = (9. * Y - 15*v*Y - v*X) /( 3. * v)
+			
+			r = 3.240479 * X - 1.53715 * Y - 0.498535 * Z
+			g = -0.969256 * X + 1.875991 * Y + 0.041556 * Z
+			b = 0.055648 * X - 0.204043 * Y + 1.057311 * Z
+
+			att = it.getObject().attribute()
+			att.setColor(r, g, b)
+			it.increment()
+
+class pyRandomColorShader(StrokeShader):
+	def getName(self):
+		return "pyRandomColorShader"
+	def __init__(self, s=1):
+		StrokeShader.__init__(self)
+		seed(s)
+	def shade(self, stroke):
+		## pick a random color
+		c0 = float(uniform(15,75))/100.0
+		c1 = float(uniform(15,75))/100.0
+		c2 = float(uniform(15,75))/100.0
+		print c0, c1, c2
+		it = stroke.strokeVerticesBegin()
+		while(it.isEnd() == 0):
+			it.getObject().attribute().setColor(c0,c1,c2)
+			it.increment()
+
+class py2DCurvatureColorShader(StrokeShader):
+	def getName(self):
+		return "py2DCurvatureColorShader"
+
+	def shade(self, stroke):
+		it = stroke.strokeVerticesBegin()
+		it_end = stroke.strokeVerticesEnd()
+		func = Curvature2DAngleF0D()
+		while it.isEnd() == 0:
+			toto = it.castToInterface0DIterator()
+			sv = it.getObject()
+			att = sv.attribute()
+			c = func(toto)
+			if (c<0):
+ 				print "negative 2D curvature"
+			color = 10.0 * c/3.1415
+			print color
+			att.setColor(color,color,color);
+			it.increment()
+
+class pyTimeColorShader(StrokeShader):
+	def __init__(self, step=0.01):
+		StrokeShader.__init__(self)
+		self._t = 0
+		self._step = step
+	def shade(self, stroke):
+		c = self._t*1.0
+		it = stroke.strokeVerticesBegin()
+		it_end = stroke.strokeVerticesEnd()
+		while it.isEnd() == 0:
+			att = it.getObject().attribute()
+			att.setColor(c,c,c)
+			it.increment()
+		self._t = self._t+self._step
+
+## geometry modifiers
+
+class pySamplingShader(StrokeShader):
+	def __init__(self, sampling):
+		StrokeShader.__init__(self)
+		self._sampling = sampling
+	def getName(self):
+		return "pySamplingShader"
+	def shade(self, stroke):
+		stroke.Resample(float(self._sampling)) 
+
+class pyBackboneStretcherShader(StrokeShader):
+	def __init__(self, l):
+		StrokeShader.__init__(self)
+		self._l = l
+	def getName(self):
+		return "pyBackboneStretcherShader"
+	def shade(self, stroke):
+		it0 = stroke.strokeVerticesBegin()
+		it1 = StrokeVertexIterator(it0)
+		it1.increment()
+		itn = stroke.strokeVerticesEnd()
+		itn.decrement()
+		itn_1 = StrokeVertexIterator(itn)
+		itn_1.decrement()
+		v0 = it0.getObject()
+		v1 = it1.getObject()
+		vn_1 = itn_1.getObject()
+		vn = itn.getObject()
+		p0 = Vec2f(v0.getProjectedX(), v0.getProjectedY())
+		pn = Vec2f(vn.getProjectedX(), vn.getProjectedY())
+		p1 = Vec2f(v1.getProjectedX(), v1.getProjectedY())
+		pn_1 = Vec2f(vn_1.getProjectedX(), vn_1.getProjectedY())
+		d1 = p0-p1
+		d1 = d1/d1.norm()
+		dn = pn-pn_1
+		dn = dn/dn.norm()
+		newFirst = p0+d1*float(self._l)
+		newLast = pn+dn*float(self._l)
+		v0.setPoint(newFirst)
+		vn.setPoint(newLast)
+		
+class pyLengthDependingBackboneStretcherShader(StrokeShader):
+	def __init__(self, l):
+		StrokeShader.__init__(self)
+		self._l = l
+	def getName(self):
+		return "pyBackboneStretcherShader"
+	def shade(self, stroke):
+		l = stroke.getLength2D()
+		stretch = self._l*l 
+		it0 = stroke.strokeVerticesBegin()
+		it1 = StrokeVertexIterator(it0)
+		it1.increment()
+		itn = stroke.strokeVerticesEnd()
+		itn.decrement()
+		itn_1 = StrokeVertexIterator(itn)
+		itn_1.decrement()
+		v0 = it0.getObject()
+		v1 = it1.getObject()
+		vn_1 = itn_1.getObject()
+		vn = itn.getObject()
+		p0 = Vec2f(v0.getProjectedX(), v0.getProjectedY())
+		pn = Vec2f(vn.getProjectedX(), vn.getProjectedY())
+		p1 = Vec2f(v1.getProjectedX(), v1.getProjectedY())
+		pn_1 = Vec2f(vn_1.getProjectedX(), vn_1.getProjectedY())
+		d1 = p0-p1
+		d1 = d1/d1.norm()
+		dn = pn-pn_1
+		dn = dn/dn.norm()
+		newFirst = p0+d1*float(stretch)
+		newLast = pn+dn*float(stretch)
+		v0.setPoint(newFirst)
+		vn.setPoint(newLast)
+
+
+## Shader to replace a stroke by its corresponding tangent
+class pyGuidingLineShader(StrokeShader):
+	def getName(self):
+		return "pyGuidingLineShader"
+	## shading method
+	def shade(self, stroke):
+		it = stroke.strokeVerticesBegin() 	## get the first vertex
+		itlast = stroke.strokeVerticesEnd() 	## 
+		itlast.decrement()			## get the last one
+		t = itlast.getObject().getPoint() - it.getObject().getPoint()	## tangent direction
+		itmiddle = StrokeVertexIterator(it)	## 
+		while(itmiddle.getObject().u()<0.5):	## look for the stroke middle vertex
+			itmiddle.increment()		##
+		it = StrokeVertexIterator(itmiddle)	
+		it.increment()
+		while(it.isEnd() == 0):			## position all the vertices along the tangent for the right part
+			it.getObject().setPoint(itmiddle.getObject().getPoint() \
+			+t*(it.getObject().u()-itmiddle.getObject().u()))
+			it.increment()
+		it = StrokeVertexIterator(itmiddle)
+		it.decrement()
+		while(it.isBegin() == 0):		## position all the vertices along the tangent for the left part
+			it.getObject().setPoint(itmiddle.getObject().getPoint() \
+			-t*(itmiddle.getObject().u()-it.getObject().u()))
+			it.decrement()
+		it.getObject().setPoint(itmiddle.getObject().getPoint()-t*(itmiddle.getObject().u())) ## first vertex
+
+
+class pyBackboneStretcherNoCuspShader(StrokeShader):
+	def __init__(self, l):
+		StrokeShader.__init__(self)
+		self._l = l
+	def getName(self):
+		return "pyBackboneStretcherNoCuspShader"
+	def shade(self, stroke):
+		it0 = stroke.strokeVerticesBegin()
+		it1 = StrokeVertexIterator(it0)
+		it1.increment()
+		itn = stroke.strokeVerticesEnd()
+		itn.decrement()
+		itn_1 = StrokeVertexIterator(itn)
+		itn_1.decrement()
+		v0 = it0.getObject()
+		v1 = it1.getObject()
+		if((v0.getNature() & CUSP == 0) and (v1.getNature() & CUSP == 0)):
+			p0 = v0.getPoint()
+			p1 = v1.getPoint()
+			d1 = p0-p1
+			d1 = d1/d1.norm()
+			newFirst = p0+d1*float(self._l)
+			v0.setPoint(newFirst)
+		vn_1 = itn_1.getObject()
+		vn = itn.getObject()
+		if((vn.getNature() & CUSP == 0) and (vn_1.getNature() & CUSP == 0)):
+			pn = vn.getPoint()
+			pn_1 = vn_1.getPoint()
+			dn = pn-pn_1
+			dn = dn/dn.norm()
+			newLast = pn+dn*float(self._l)	
+			vn.setPoint(newLast)
+
+normalInfo=Normal2DF0D()
+curvatureInfo=Curvature2DAngleF0D()
+
+def edgestopping(x, sigma): 
+	return exp(- x*x/(2*sigma*sigma))
+
+class pyDiffusion2Shader(StrokeShader):
+	def __init__(self, lambda1, nbIter):
+		StrokeShader.__init__(self)
+		self._lambda = lambda1
+		self._nbIter = nbIter
+		self._normalInfo = Normal2DF0D()
+		self._curvatureInfo = Curvature2DAngleF0D()
+	def getName(self):
+		return "pyDiffusionShader"
+	def shade(self, stroke):
+		for i in range (1, self._nbIter):
+			it = stroke.strokeVerticesBegin()
+			while it.isEnd() == 0:
+				v=it.getObject()
+				p1 = v.getPoint()
+				p2 = self._normalInfo(it.castToInterface0DIterator())*self._lambda*self._curvatureInfo(it.castToInterface0DIterator())
+				v.setPoint(p1+p2)
+				it.increment()
+
+class pyTipRemoverShader(StrokeShader):
+	def __init__(self, l):
+		StrokeShader.__init__(self)
+		self._l = l
+	def getName(self):
+		return "pyTipRemoverShader"
+	def shade(self, stroke):
+		originalSize = stroke.strokeVerticesSize()
+		if(originalSize<4):
+			return
+		verticesToRemove = []
+		oldAttributes = []
+		it = stroke.strokeVerticesBegin()
+		while(it.isEnd() == 0):
+			v = it.getObject()
+			if((v.curvilinearAbscissa() < self._l) or (v.strokeLength()-v.curvilinearAbscissa() < self._l)):
+				verticesToRemove.append(v)
+			oldAttributes.append(StrokeAttribute(v.attribute()))
+			it.increment()
+		if(originalSize-len(verticesToRemove) < 2):
+			return
+		for sv in verticesToRemove:
+			stroke.RemoveVertex(sv)
+		stroke.Resample(originalSize)
+		if(stroke.strokeVerticesSize() != originalSize):
+			print "pyTipRemover: Warning: resampling problem"
+		it = stroke.strokeVerticesBegin()
+		for a in oldAttributes:
+			if(it.isEnd() == 1):
+				break
+			v = it.getObject()
+			v.setAttribute(a)
+			it.increment()
+
+class pyTVertexRemoverShader(StrokeShader):
+	def getName(self):
+		return "pyTVertexRemoverShader"
+	def shade(self, stroke):
+		if(stroke.strokeVerticesSize() <= 3 ):
+			return
+ 		predTVertex = pyVertexNatureUP0D(T_VERTEX)
+		it = stroke.strokeVerticesBegin()
+		itlast = stroke.strokeVerticesEnd()
+		itlast.decrement()
+		if(predTVertex(it) == 1):
+ 			stroke.RemoveVertex(it.getObject())
+		if(predTVertex(itlast) == 1):
+ 			stroke.RemoveVertex(itlast.getObject())
+
+class pyExtremitiesOrientationShader(StrokeShader):
+	def __init__(self, x1,y1,x2=0,y2=0):
+		StrokeShader.__init__(self)
+		self._v1 = Vec2(x1,y1)
+		self._v2 = Vec2(x2,y2)
+	def getName(self):
+		return "pyExtremitiesOrientationShader"
+	def shade(self, stroke):
+		print self._v1.x(),self._v1.y()
+		stroke.setBeginningOrientation(self._v1.x(),self._v1.y())
+		stroke.setEndingOrientation(self._v2.x(),self._v2.y())
+
+class pyHLRShader(StrokeShader):
+	def getName(self):
+		return "pyHLRShader"
+	def shade(self, stroke):
+		originalSize = stroke.strokeVerticesSize()
+		if(originalSize<4):
+			return
+		it = stroke.strokeVerticesBegin()
+		invisible = 0
+		it2 = StrokeVertexIterator(it)
+		it2.increment()
+		fe = getFEdge(it.getObject(), it2.getObject())
+		if(fe.qi() != 0):
+			invisible = 1
+		while(it2.isEnd() == 0):
+			v = it.getObject()
+			vnext = it2.getObject()
+			if(v.getNature() & VIEW_VERTEX):
+				#if(v.getNature() & T_VERTEX):
+				fe = getFEdge(v,vnext)
+				qi = fe.qi()
+				if(qi != 0):
+					invisible = 1
+				else:
+					invisible = 0
+			if(invisible == 1):		
+				v.attribute().setVisible(0)
+			it.increment()
+			it2.increment()
+
+class pyTVertexOrientationShader(StrokeShader):
+	def __init__(self):
+		StrokeShader.__init__(self)
+		self._Get2dDirection = Orientation2DF1D()
+	def getName(self):
+		return "pyTVertexOrientationShader"
+	## finds the TVertex orientation from the TVertex and 
+	## the previous or next edge
+	def findOrientation(self, tv, ve):
+		mateVE = tv.mate(ve)
+		if((ve.qi() != 0) or (mateVE.qi() != 0)):
+			ait = AdjacencyIterator(tv,1,0)
+			winner = None
+			incoming = 1
+			while(ait.isEnd() == 0):
+				ave = ait.getObject()
+				if((ave.getId() != ve.getId()) and (ave.getId() != mateVE.getId())):
+					winner = ait.getObject()
+					if(ait.isIncoming() == 0):
+						incoming = 0
+						break
+				ait.increment()
+			if(winner != None):
+				if(incoming != 0):
+					direction = self._Get2dDirection(winner.fedgeB())
+				else:
+					direction = self._Get2dDirection(winner.fedgeA())
+				return direction
+	def shade(self, stroke):
+		it = stroke.strokeVerticesBegin()
+		it2 = StrokeVertexIterator(it)
+		it2.increment()
+		## case where the first vertex is a TVertex
+		v = it.getObject() 
+		if(v.getNature() & T_VERTEX):
+			tv = v.castToTVertex()
+			ve = getFEdge(v, it2.getObject()).viewedge()
+			if(tv != None):			
+				dir = self.findOrientation(tv, ve)
+				#print dir.x(), dir.y()
+				v.attribute().setAttributeVec2f("orientation", dir)
+		while(it2.isEnd() == 0):
+			vprevious = it.getObject()
+			v = it2.getObject()
+			if(v.getNature() & T_VERTEX):
+				tv = v.castToTVertex()
+				ve = getFEdge(vprevious, v).viewedge()
+				if(tv != None):	
+					dir = self.findOrientation(tv, ve)
+					#print dir.x(), dir.y()
+					v.attribute().setAttributeVec2f("orientation", dir)			
+			it.increment()
+			it2.increment()
+		## case where the last vertex is a TVertex
+		v = it.getObject() 
+		if(v.getNature() & T_VERTEX):
+			itPrevious = StrokeVertexIterator(it)
+			itPrevious.decrement()
+			tv = v.castToTVertex()
+			ve = getFEdge(itPrevious.getObject(), v).viewedge()
+			if(tv != None):			
+				dir = self.findOrientation(tv, ve)
+				#print dir.x(), dir.y()
+				v.attribute().setAttributeVec2f("orientation", dir)
+
+class pySinusDisplacementShader(StrokeShader):
+	def __init__(self, f, a):
+		StrokeShader.__init__(self)
+		self._f = f
+		self._a = a
+		self._getNormal = Normal2DF0D()
+
+	def getName(self):
+		return "pySinusDisplacementShader"
+	def shade(self, stroke):
+		it = stroke.strokeVerticesBegin()
+		while it.isEnd() == 0:
+			v = it.getObject()
+			#print self._getNormal.getName()
+			n = self._getNormal(it.castToInterface0DIterator())
+			p = v.getPoint()
+			u = v.u()
+			a = self._a*(1-2*(fabs(u-0.5)))
+			n = n*a*cos(self._f*u*6.28)
+			#print n.x(), n.y()
+			v.setPoint(p+n)
+			#v.setPoint(v.getPoint()+n*a*cos(f*v.u()))
+			it.increment()
+
+class pyPerlinNoise1DShader(StrokeShader):
+	def __init__(self, freq = 10, amp = 10, oct = 4):
+		StrokeShader.__init__(self)
+		self.__noise = Noise()
+		self.__freq = freq
+		self.__amp = amp
+		self.__oct = oct
+	def getName(self):
+		return "pyPerlinNoise1DShader"
+	def shade(self, stroke):
+		i = randint(0, 50)
+		it = stroke.strokeVerticesBegin()
+		while it.isEnd() == 0:
+			v = it.getObject()
+			nres = self.__noise.turbulence1(i, self.__freq, self.__amp, self.__oct)
+			v.setPoint(v.getProjectedX() + nres, v.getProjectedY() + nres)
+			i = i+1
+			it.increment()
+
+class pyPerlinNoise2DShader(StrokeShader):
+	def __init__(self, freq = 10, amp = 10, oct = 4):
+		StrokeShader.__init__(self)
+		self.__noise = Noise()
+		self.__freq = freq
+		self.__amp = amp
+		self.__oct = oct
+	def getName(self):
+		return "pyPerlinNoise2DShader"
+	def shade(self, stroke):
+		it = stroke.strokeVerticesBegin()
+		while it.isEnd() == 0:
+			v = it.getObject()
+			vec = Vec2f(v.getProjectedX(), v.getProjectedY())
+			nres = self.__noise.turbulence2(vec, self.__freq, self.__amp, self.__oct)
+			v.setPoint(v.getProjectedX() + nres, v.getProjectedY() + nres)
+			it.increment()
+
+class pyBluePrintCirclesShader(StrokeShader):
+	def __init__(self, turns = 1):
+		StrokeShader.__init__(self)
+		self.__turns = turns
+	def getName(self):
+		return "pyBluePrintCirclesShader"
+	def shade(self, stroke):
+		p_min = Vec2f(10000, 10000)
+		p_max = Vec2f(0, 0)
+		it = stroke.strokeVerticesBegin()
+		while it.isEnd() == 0:
+			p = it.getObject().getPoint()
+			if (p.x() < p_min.x()):
+				p_min.setX(p.x())
+			if (p.x() > p_max.x()):
+				p_max.setX(p.x())
+			if (p.y() < p_min.y()):
+				p_min.setY(p.y())
+			if (p.y() > p_max.y()):
+				p_max.setY(p.y())
+			it.increment()
+		stroke.Resample(32 * self.__turns)
+		sv_nb = stroke.strokeVerticesSize()
+#		print "min  :", p_min.x(), p_min.y() # DEBUG
+#		print "mean :", p_sum.x(), p_sum.y() # DEBUG
+#		print "max  :", p_max.x(), p_max.y() # DEBUG
+#		print "----------------------" # DEBUG
+#######################################################	
+		sv_nb = sv_nb / self.__turns
+		center = (p_min + p_max) / 2
+		radius = (center.x() - p_min.x() + center.y() - p_min.y()) / 2
+		p_new = Vec2f()
+#######################################################
+		it = stroke.strokeVerticesBegin()
+		for j in range(self.__turns):
+			radius = radius + randint(-3, 3)
+			center_x = center.x() + randint(-5, 5)
+			center_y = center.y() + randint(-5, 5)
+			center.setX(center_x)
+			center.setY(center_y)
+			i = 0
+			while i < sv_nb:
+				p_new.setX(center.x() + radius * cos(2 * pi * float(i) / float(sv_nb - 1)))
+   				p_new.setY(center.y() + radius * sin(2 * pi * float(i) / float(sv_nb - 1)))
+				it.getObject().setPoint(p_new.x(), p_new.y())
+				i = i + 1
+				it.increment()
+		while it.isEnd() == 0:
+			stroke.RemoveVertex(it.getObject())
+			it.increment()
+
+
+class pyBluePrintEllipsesShader(StrokeShader):
+	def __init__(self, turns = 1):
+		StrokeShader.__init__(self)
+		self.__turns = turns
+	def getName(self):
+		return "pyBluePrintEllipsesShader"
+	def shade(self, stroke):
+		p_min = Vec2f(10000, 10000)
+		p_max = Vec2f(0, 0)
+		it = stroke.strokeVerticesBegin()
+		while it.isEnd() == 0:
+			p = it.getObject().getPoint()
+			if (p.x() < p_min.x()):
+				p_min.setX(p.x())
+			if (p.x() > p_max.x()):
+				p_max.setX(p.x())
+			if (p.y() < p_min.y()):
+				p_min.setY(p.y())
+			if (p.y() > p_max.y()):
+				p_max.setY(p.y())
+			it.increment()
+		stroke.Resample(32 * self.__turns)
+		sv_nb = stroke.strokeVerticesSize()
+#		print "min  :", p_min.x(), p_min.y() # DEBUG
+#		print "mean :", p_sum.x(), p_sum.y() # DEBUG
+#		print "max  :", p_max.x(), p_max.y() # DEBUG
+#		print "----------------------" # DEBUG
+#######################################################	
+		sv_nb = sv_nb / self.__turns
+		center = (p_min + p_max) / 2
+		radius_x = center.x() - p_min.x()
+		radius_y = center.y() - p_min.y()
+		p_new = Vec2f()
+#######################################################
+		it = stroke.strokeVerticesBegin()
+		for j in range(self.__turns):
+			radius_x = radius_x + randint(-3, 3)
+			radius_y = radius_y + randint(-3, 3)
+			center_x = center.x() + randint(-5, 5)
+			center_y = center.y() + randint(-5, 5)
+			center.setX(center_x)
+			center.setY(center_y)
+			i = 0
+			while i < sv_nb:
+				p_new.setX(center.x() + radius_x * cos(2 * pi * float(i) / float(sv_nb - 1)))
+   				p_new.setY(center.y() + radius_y * sin(2 * pi * float(i) / float(sv_nb - 1)))
+				it.getObject().setPoint(p_new.x(), p_new.y())
+				i = i + 1
+				it.increment()
+		while it.isEnd() == 0:
+			stroke.RemoveVertex(it.getObject())
+			it.increment()
+
+
+class pyBluePrintSquaresShader(StrokeShader):
+	def __init__(self, turns = 1, bb_len = 10):
+		StrokeShader.__init__(self)
+		self.__turns = turns
+		self.__bb_len = bb_len
+	def getName(self):
+		return "pyBluePrintSquaresShader"
+	def shade(self, stroke):
+		p_min = Vec2f(10000, 10000)
+		p_max = Vec2f(0, 0)
+		it = stroke.strokeVerticesBegin()
+		while it.isEnd() == 0:
+			p = it.getObject().getPoint()
+			if (p.x() < p_min.x()):
+				p_min.setX(p.x())
+			if (p.x() > p_max.x()):
+				p_max.setX(p.x())
+			if (p.y() < p_min.y()):
+				p_min.setY(p.y())
+			if (p.y() > p_max.y()):
+				p_max.setY(p.y())
+			it.increment()
+		stroke.Resample(32 * self.__turns)
+		sv_nb = stroke.strokeVerticesSize()
+#######################################################	
+		sv_nb = sv_nb / self.__turns
+		first = sv_nb / 4
+		second = 2 * first
+		third = 3 * first
+		fourth = sv_nb
+		vec_first = Vec2f(p_max.x() - p_min.x() + 2 * self.__bb_len, 0)
+		vec_second = Vec2f(0, p_max.y() - p_min.y() + 2 * self.__bb_len)
+		vec_third = vec_first * -1
+		vec_fourth = vec_second * -1
+		p_first = Vec2f(p_min.x() - self.__bb_len, p_min.y())
+		p_second = Vec2f(p_max.x(), p_min.y() - self.__bb_len)
+		p_third = Vec2f(p_max.x() + self.__bb_len, p_max.y())
+		p_fourth = Vec2f(p_min.x(), p_max.y() + self.__bb_len)
+#######################################################
+		it = stroke.strokeVerticesBegin()
+		visible = 1
+		for j in range(self.__turns):
+			i = 0
+			while i < sv_nb:
+				if i < first:
+					p_new = p_first + vec_first * float(i)/float(first - 1)
+					if i == first - 1:
+						visible = 0
+				elif i < second:
+					p_new = p_second + vec_second * float(i - first)/float(second - first - 1)
+					if i == second - 1:
+						visible = 0
+				elif i < third:
+					p_new = p_third + vec_third * float(i - second)/float(third - second - 1)
+					if i == third - 1:
+						visible = 0
+				else:
+					p_new = p_fourth + vec_fourth * float(i - third)/float(fourth - third - 1)
+					if i == fourth - 1:
+						visible = 0
+				it.getObject().setPoint(p_new.x(), p_new.y())
+				it.getObject().attribute().setVisible(visible)
+				if visible == 0:
+					visible = 1
+				i = i + 1
+				it.increment()
+		while it.isEnd() == 0:
+			stroke.RemoveVertex(it.getObject())
+			it.increment()
+
+
+class pyBluePrintDirectedSquaresShader(StrokeShader):
+	def __init__(self, turns = 1, bb_len = 10, mult = 1):
+		StrokeShader.__init__(self)
+		self.__mult = mult
+		self.__turns = turns
+		self.__bb_len = 1 + float(bb_len) / 100
+	def getName(self):
+		return "pyBluePrintDirectedSquaresShader"
+	def shade(self, stroke):
+		stroke.Resample(32 * self.__turns)
+		p_mean = Vec2f(0, 0)
+		p_min = Vec2f(10000, 10000)
+		p_max = Vec2f(0, 0)
+		it = stroke.strokeVerticesBegin()
+		while it.isEnd() == 0:
+			p = it.getObject().getPoint()
+			p_mean = p_mean + p
+## 			if (p.x() < p_min.x()):
+## 				p_min.setX(p.x())
+## 			if (p.x() > p_max.x()):
+## 				p_max.setX(p.x())
+## 			if (p.y() < p_min.y()):
+## 				p_min.setY(p.y())
+## 			if (p.y() > p_max.y()):
+## 				p_max.setY(p.y())
+			it.increment()
+		sv_nb = stroke.strokeVerticesSize()
+		p_mean = p_mean / sv_nb
+		p_var_xx = 0
+		p_var_yy = 0
+		p_var_xy = 0
+		it = stroke.strokeVerticesBegin()
+		while it.isEnd() == 0:
+			p = it.getObject().getPoint()
+			p_var_xx = p_var_xx + pow(p.x() - p_mean.x(), 2)
+			p_var_yy = p_var_yy + pow(p.y() - p_mean.y(), 2)
+			p_var_xy = p_var_xy + (p.x() - p_mean.x()) * (p.y() - p_mean.y())
+			it.increment()
+		p_var_xx = p_var_xx / sv_nb
+		p_var_yy = p_var_yy / sv_nb
+		p_var_xy = p_var_xy / sv_nb
+##		print p_var_xx, p_var_yy, p_var_xy
+		trace = p_var_xx + p_var_yy
+		det = p_var_xx * p_var_yy - p_var_xy * p_var_xy
+		sqrt_coeff = sqrt(trace * trace - 4 * det)
+		lambda1 = (trace + sqrt_coeff) / 2
+		lambda2 = (trace - sqrt_coeff) / 2
+##		print lambda1, lambda2
+		theta = atan(2 * p_var_xy / (p_var_xx - p_var_yy)) / 2
+##		print theta
+		if p_var_yy > p_var_xx:
+			e1 = Vec2f(cos(theta + pi / 2), sin(theta + pi / 2)) * sqrt(lambda1) * self.__mult
+			e2 = Vec2f(cos(theta + pi), sin(theta + pi)) *  sqrt(lambda2) * self.__mult
+		else:
+			e1 = Vec2f(cos(theta), sin(theta)) * sqrt(lambda1) * self.__mult
+			e2 = Vec2f(cos(theta + pi / 2), sin(theta + pi / 2)) * sqrt(lambda2) * self.__mult
+#######################################################	
+		sv_nb = sv_nb / self.__turns
+		first = sv_nb / 4
+		second = 2 * first
+		third = 3 * first
+		fourth = sv_nb
+		bb_len1 = self.__bb_len
+		bb_len2 = 1 + (bb_len1 - 1) * sqrt(lambda1 / lambda2)
+		p_first = p_mean - e1 - e2 * bb_len2
+		p_second = p_mean - e1 * bb_len1 + e2
+		p_third = p_mean + e1 + e2 * bb_len2
+		p_fourth = p_mean + e1 * bb_len1 - e2
+		vec_first = e2 * bb_len2 * 2
+		vec_second = e1 * bb_len1 * 2
+		vec_third = vec_first * -1
+		vec_fourth = vec_second * -1
+#######################################################
+		it = stroke.strokeVerticesBegin()
+		visible = 1
+		for j in range(self.__turns):
+			i = 0
+			while i < sv_nb:
+				if i < first:
+					p_new = p_first + vec_first * float(i)/float(first - 1)
+					if i == first - 1:
+						visible = 0
+				elif i < second:
+					p_new = p_second + vec_second * float(i - first)/float(second - first - 1)
+					if i == second - 1:
+						visible = 0
+				elif i < third:
+					p_new = p_third + vec_third * float(i - second)/float(third - second - 1)
+					if i == third - 1:
+						visible = 0
+				else:
+					p_new = p_fourth + vec_fourth * float(i - third)/float(fourth - third - 1)
+					if i == fourth - 1:
+						visible = 0
+				it.getObject().setPoint(p_new.x(), p_new.y())
+				it.getObject().attribute().setVisible(visible)
+				if visible == 0:
+					visible = 1
+				i = i + 1
+				it.increment()
+		while it.isEnd() == 0:
+			stroke.RemoveVertex(it.getObject())
+			it.increment()
+
+class pyModulateAlphaShader(StrokeShader):
+	def __init__(self, min = 0, max = 1):
+		StrokeShader.__init__(self)
+		self.__min = min
+		self.__max = max
+	def getName(self):
+		return "pyModulateAlphaShader"
+	def shade(self, stroke):
+		it = stroke.strokeVerticesBegin()
+		while it.isEnd() == 0:
+			alpha = it.getObject().attribute().getAlpha()
+			p = it.getObject().getPoint()
+			alpha = alpha * p.y() / 400
+			if alpha < self.__min:
+				alpha = self.__min
+			elif alpha > self.__max:
+				alpha = self.__max
+			it.getObject().attribute().setAlpha(alpha)
+			it.increment()
+
+
+## various
+class pyDummyShader(StrokeShader):
+	def getName(self):
+		return "pyDummyShader"
+	def shade(self, stroke):
+		it = stroke.strokeVerticesBegin()
+		it_end = stroke.strokeVerticesEnd()
+		while it.isEnd() == 0:
+			toto = it.castToInterface0DIterator()
+			att = it.getObject().attribute()
+			att.setColor(0.3, 0.4, 0.4)
+			att.setThickness(0, 5)
+			it.increment()
+
+class pyDebugShader(StrokeShader):
+	def getName(self):
+		return "pyDebugShader"
+
+ 	def shade(self, stroke):
+		fe = GetSelectedFEdgeCF()
+		id1=fe.vertexA().getId()
+		id2=fe.vertexB().getId()
+		#print id1.getFirst(), id1.getSecond()
+		#print id2.getFirst(), id2.getSecond()
+		it = stroke.strokeVerticesBegin()
+		found = 0
+		foundfirst = 0
+		foundsecond = 0
+		while it.isEnd() == 0:
+			cp = it.getObject()
+			if((cp.A().getId() == id1) or (cp.B().getId() == id1)):
+				foundfirst = 1
+			if((cp.A().getId() == id2) or (cp.B().getId() == id2)):
+				foundsecond = 1
+			if((foundfirst != 0) and (foundsecond != 0)):
+				found = 1
+				break
+			it.increment()
+		if(found != 0):
+			print "The selected Stroke id is: ", stroke.getId().getFirst(), stroke.getId().getSecond()
+
diff --git a/source/blender/freestyle/style_modules_blender/sketchy_multiple_parameterization.py b/source/blender/freestyle/style_modules_blender/sketchy_multiple_parameterization.py
new file mode 100755
index 00000000000..1df58a75999
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/sketchy_multiple_parameterization.py
@@ -0,0 +1,48 @@
+#
+#  Filename : sketchy_multiple_parameterization.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Builds sketchy strokes whose topology relies on a 
+#             parameterization that covers the complete lines (visible+invisible)
+#             whereas only the visible portions are actually drawn
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Blender.Freestyle import *
+from logical_operators import *
+from ChainingIterators import *
+from shaders import *
+
+
+Operators.select(QuantitativeInvisibilityUP1D(0))
+## 0: don't restrict to selection
+Operators.bidirectionalChain(pySketchyChainSilhouetteIterator(3,0))
+shaders_list = 	[
+		SamplingShader(2),
+		SpatialNoiseShader(15, 120, 2, 1, 1), 
+		IncreasingThicknessShader(5, 30), 
+		SmoothingShader(100, 0.05, 0, 0.2, 0, 0, 0, 1),
+		IncreasingColorShader(0,0.2,0,1,0.2,0.7,0.2,1),
+		TextureAssignerShader(6),
+		pyHLRShader()
+		]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/source/blender/freestyle/style_modules_blender/sketchy_topology_broken.py b/source/blender/freestyle/style_modules_blender/sketchy_topology_broken.py
new file mode 100755
index 00000000000..ebad839a3ab
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/sketchy_topology_broken.py
@@ -0,0 +1,89 @@
+#
+#  Filename : sketchy_topology_broken.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : The topology of the strokes is, first, built
+#             independantly from the 3D topology of objects, 
+#             and, second, so as to chain several times the same ViewEdge.
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Blender.Freestyle import *
+from logical_operators import *
+from ChainingIterators import *
+from shaders import *
+
+## Backbone stretcher that leaves cusps intact to avoid cracks
+class pyBackboneStretcherNoCuspShader(StrokeShader):
+	def __init__(self, l):
+		StrokeShader.__init__(self)
+		self._l = l
+	def getName(self):
+		return "pyBackboneStretcherNoCuspShader"
+	def shade(self, stroke):
+		it0 = stroke.strokeVerticesBegin()
+		it1 = StrokeVertexIterator(it0)
+		it1.increment()
+		itn = stroke.strokeVerticesEnd()
+		itn.decrement()
+		itn_1 = StrokeVertexIterator(itn)
+		itn_1.decrement()
+		v0 = it0.getObject()
+		v1 = it1.getObject()
+		if((v0.getNature() & CUSP == 0) and (v1.getNature() & CUSP == 0)):
+			p0 = v0.getPoint()
+			p1 = v1.getPoint()
+			d1 = p0-p1
+			d1 = d1/d1.norm()
+			newFirst = p0+d1*float(self._l)
+			v0.setPoint(newFirst)
+		else:
+			print "got a v0 cusp"
+		vn_1 = itn_1.getObject()
+		vn = itn.getObject()
+		if((vn.getNature() & CUSP == 0) and (vn_1.getNature() & CUSP == 0)):
+			pn = vn.getPoint()
+			pn_1 = vn_1.getPoint()
+			dn = pn-pn_1
+			dn = dn/dn.norm()
+			newLast = pn+dn*float(self._l)	
+			vn.setPoint(newLast)
+		else:
+			print "got a vn cusp"
+
+
+Operators.select(QuantitativeInvisibilityUP1D(0))
+## Chain 3 times each ViewEdge indpendantly from the 
+## initial objects topology
+Operators.bidirectionalChain(pySketchyChainingIterator(3))
+shaders_list = 	[
+		SamplingShader(4),
+		SpatialNoiseShader(6, 120, 2, 1, 1), 
+		IncreasingThicknessShader(4, 10), 
+		SmoothingShader(100, 0.1, 0, 0.2, 0, 0, 0, 1),
+		pyBackboneStretcherNoCuspShader(20),
+		#ConstantColorShader(0.0,0.0,0.0)
+		IncreasingColorShader(0.2,0.2,0.2,1,0.5,0.5,0.5,1),
+		#IncreasingColorShader(1,0,0,1,0,1,0,1),
+		TextureAssignerShader(4)
+		]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/source/blender/freestyle/style_modules_blender/sketchy_topology_preserved.py b/source/blender/freestyle/style_modules_blender/sketchy_topology_preserved.py
new file mode 100755
index 00000000000..3085a5f2f7f
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/sketchy_topology_preserved.py
@@ -0,0 +1,49 @@
+#
+#  Filename : sketchy_topology_preserved.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : The topology of the strokes is built
+#             so as to chain several times the same ViewEdge.
+#             The topology of the objects is preserved
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Blender.Freestyle import *
+from logical_operators import *
+from ChainingIterators import *
+from PredicatesU1D import *
+from shaders import *
+
+upred = QuantitativeInvisibilityUP1D(0)
+Operators.select(upred)
+Operators.bidirectionalChain(pySketchyChainSilhouetteIterator(3,1))
+shaders_list = 	[
+		SamplingShader(4),
+		SpatialNoiseShader(20, 220, 2, 1, 1), 
+		IncreasingThicknessShader(4, 8), 
+		SmoothingShader(300, 0.05, 0, 0.2, 0, 0, 0, 0.5),
+		ConstantColorShader(0.6,0.2,0.0),
+		TextureAssignerShader(4),
+		]
+
+Operators.create(TrueUP1D(), shaders_list)
+
diff --git a/source/blender/freestyle/style_modules_blender/split_at_highest_2d_curvatures.py b/source/blender/freestyle/style_modules_blender/split_at_highest_2d_curvatures.py
new file mode 100755
index 00000000000..e7da0fa2690
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/split_at_highest_2d_curvatures.py
@@ -0,0 +1,40 @@
+#
+#  Filename : split_at_highest_2d_curvature.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Draws the visible lines (chaining follows same nature lines)
+#             (most basic style module)
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Blender.Freestyle import *
+from logical_operators import *
+from PredicatesU1D import *
+from Functions0D import *
+
+Operators.select(QuantitativeInvisibilityUP1D(0))
+Operators.bidirectionalChain(ChainSilhouetteIterator(), NotUP1D(QuantitativeInvisibilityUP1D(0)))
+func = pyInverseCurvature2DAngleF0D()
+Operators.recursiveSplit(func,  pyParameterUP0D(0.4,0.6), NotUP1D(pyHigherLengthUP1D(100)), 2)
+shaders_list = [ConstantThicknessShader(10), IncreasingColorShader(1,0,0,1,0,1,0,1), TextureAssignerShader(3)]
+Operators.create(TrueUP1D(), shaders_list)
+
diff --git a/source/blender/freestyle/style_modules_blender/split_at_tvertices.py b/source/blender/freestyle/style_modules_blender/split_at_tvertices.py
new file mode 100755
index 00000000000..acda7e3c0ea
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/split_at_tvertices.py
@@ -0,0 +1,42 @@
+#
+#  Filename : split_at_tvertices.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Draws strokes that starts and stops at Tvertices (visible or not)
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Blender.Freestyle import *
+from logical_operators import *
+from PredicatesU1D import *
+from PredicatesU0D import *
+from Functions0D import *
+
+Operators.select(QuantitativeInvisibilityUP1D(0))
+Operators.bidirectionalChain(ChainSilhouetteIterator(), NotUP1D(QuantitativeInvisibilityUP1D(0)))
+start = pyVertexNatureUP0D(T_VERTEX)
+## use the same predicate to decide where to start and where to stop 
+## the strokes:
+Operators.sequentialSplit(start, start, 10)
+shaders_list = [ConstantThicknessShader(5), IncreasingColorShader(1,0,0,1,0,1,0,1), TextureAssignerShader(3)]
+Operators.create(TrueUP1D(), shaders_list)
+
diff --git a/source/blender/freestyle/style_modules_blender/stroke_texture.py b/source/blender/freestyle/style_modules_blender/stroke_texture.py
new file mode 100755
index 00000000000..41b5371fbfb
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/stroke_texture.py
@@ -0,0 +1,43 @@
+#
+#  Filename : stroke_texture.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Draws textured strokes (illustrate the StrokeTextureShader shader)
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Blender.Freestyle import *
+from logical_operators import *
+from PredicatesB1D import *
+from shaders import *
+from ChainingIterators import *
+
+Operators.select(QuantitativeInvisibilityUP1D(0))
+Operators.bidirectionalChain(ChainSilhouetteIterator(), NotUP1D(QuantitativeInvisibilityUP1D(0)))
+shaders_list = 	[
+		SamplingShader(3),
+		BezierCurveShader(4),
+		StrokeTextureShader("washbrushAlpha.bmp", Stroke.DRY_MEDIUM, 1),
+		ConstantThicknessShader(40),
+		ConstantColorShader(0,0,0,1),
+		]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/source/blender/freestyle/style_modules_blender/suggestive.py b/source/blender/freestyle/style_modules_blender/suggestive.py
new file mode 100755
index 00000000000..3bc06e62fa7
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/suggestive.py
@@ -0,0 +1,43 @@
+#
+#  Filename : suggestive.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Draws the suggestive contours.
+#             ***** The suggestive contours must be enabled
+#             in the options dialog *****
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Blender.Freestyle import *
+from logical_operators import *
+from PredicatesB1D import *
+from PredicatesU1D import *
+from shaders import *
+
+upred = AndUP1D(pyNatureUP1D(SUGGESTIVE_CONTOUR), QuantitativeInvisibilityUP1D(0))
+Operators.select(upred)
+Operators.bidirectionalChain(ChainSilhouetteIterator(), NotUP1D(upred))
+shaders_list = 	[
+		IncreasingThicknessShader(1, 3), 
+		ConstantColorShader(0.2,0.2,0.2, 1)
+		]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/source/blender/freestyle/style_modules_blender/thickness_fof_depth_discontinuity.py b/source/blender/freestyle/style_modules_blender/thickness_fof_depth_discontinuity.py
new file mode 100755
index 00000000000..7814f2cac6c
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/thickness_fof_depth_discontinuity.py
@@ -0,0 +1,62 @@
+#
+#  Filename : thickness_fof_depth_discontinuity.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Assigns to strokes a thickness that depends on the depth discontinuity
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+from Blender.Freestyle import *
+from logical_operators import *
+from ChainingIterators import *
+from shaders import *
+
+class pyDepthDiscontinuityThicknessShader(StrokeShader):
+	def __init__(self, min, max):
+		StrokeShader.__init__(self)
+		self.__min = float(min)
+		self.__max = float(max)
+		self.__func = ZDiscontinuityF0D()
+	def getName(self):
+		return "pyDepthDiscontinuityThicknessShader"
+	def shade(self, stroke):
+		it = stroke.strokeVerticesBegin()
+		z_min=0.0
+		z_max=1.0
+		a = (self.__max - self.__min)/(z_max-z_min)
+		b = (self.__min*z_max-self.__max*z_min)/(z_max-z_min)
+		it = stroke.strokeVerticesBegin()
+		while it.isEnd() == 0:
+			z = self.__func(it.castToInterface0DIterator())
+			thickness = a*z+b
+			it.getObject().attribute().setThickness(thickness, thickness)
+			it.increment()
+
+Operators.select(QuantitativeInvisibilityUP1D(0))
+Operators.bidirectionalChain(ChainSilhouetteIterator(), NotUP1D(QuantitativeInvisibilityUP1D(0)))
+shaders_list = 	[
+		SamplingShader(1),
+		ConstantThicknessShader(3), 
+		ConstantColorShader(0.0,0.0,0.0),
+		pyDepthDiscontinuityThicknessShader(0.8, 6)
+		]
+Operators.create(TrueUP1D(), shaders_list)
\ No newline at end of file
diff --git a/source/blender/freestyle/style_modules_blender/tipremover.py b/source/blender/freestyle/style_modules_blender/tipremover.py
new file mode 100755
index 00000000000..1d044e369c4
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/tipremover.py
@@ -0,0 +1,42 @@
+#
+#  Filename : tipremover.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Removes strokes extremities
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+
+from Blender.Freestyle import *
+from logical_operators import *
+from ChainingIterators import *
+from shaders import *
+
+Operators.select(QuantitativeInvisibilityUP1D(0))
+Operators.bidirectionalChain(ChainSilhouetteIterator(), NotUP1D(QuantitativeInvisibilityUP1D(0)))
+shaders_list = 	[
+		SamplingShader(5),
+		ConstantThicknessShader(3), 
+		ConstantColorShader(0,0,0),
+		TipRemoverShader(20)
+		]
+Operators.create(TrueUP1D(), shaders_list)
\ No newline at end of file
diff --git a/source/blender/freestyle/style_modules_blender/tvertex_remover.py b/source/blender/freestyle/style_modules_blender/tvertex_remover.py
new file mode 100755
index 00000000000..d474ca087f8
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/tvertex_remover.py
@@ -0,0 +1,42 @@
+#
+#  Filename : tvertex_remover.py
+#  Author   : Stephane Grabli
+#  Date     : 04/08/2005
+#  Purpose  : Removes TVertices
+#
+#############################################################################  
+#
+#  Copyright (C) : Please refer to the COPYRIGHT file distributed 
+#  with this source distribution. 
+#
+#  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.
+#
+#############################################################################
+
+
+from Blender.Freestyle import *
+from logical_operators import *
+from PredicatesB1D import *
+from shaders import *
+
+Operators.select(QuantitativeInvisibilityUP1D(0))
+Operators.bidirectionalChain(ChainSilhouetteIterator(), NotUP1D(QuantitativeInvisibilityUP1D(0)))
+shaders_list = 	[
+		IncreasingThicknessShader(3, 5), 
+		ConstantColorShader(0.2,0.2,0.2, 1),
+		SamplingShader(10.0),
+		pyTVertexRemoverShader()
+		]
+Operators.create(TrueUP1D(), shaders_list)
diff --git a/source/blender/freestyle/style_modules_blender/uniformpruning_zsort.py b/source/blender/freestyle/style_modules_blender/uniformpruning_zsort.py
new file mode 100755
index 00000000000..044ec0cbb80
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/uniformpruning_zsort.py
@@ -0,0 +1,40 @@
+from Blender.Freestyle import *
+from logical_operators import *
+from PredicatesU1D import *
+from PredicatesU0D import *
+from PredicatesB1D import *
+from Functions0D import *
+from Functions1D import *
+from shaders import *
+
+class pyDensityUP1D(UnaryPredicate1D):
+	def __init__(self,wsize,threshold, integration = IntegrationType.MEAN, sampling=2.0):
+		UnaryPredicate1D.__init__(self)
+		self._wsize = wsize
+		self._threshold = threshold
+		self._integration = integration
+		self._func = DensityF1D(self._wsize, self._integration, sampling)
+			
+	def getName(self):
+		return "pyDensityUP1D"
+
+	def __call__(self, inter):
+		d = self._func(inter)
+		print "For Chain ", inter.getId().getFirst(), inter.getId().getSecond(), "density is ", d
+		if(d < self._threshold):
+			return 1
+		return 0
+
+Operators.select(QuantitativeInvisibilityUP1D(0))
+Operators.bidirectionalChain(ChainSilhouetteIterator())
+#Operators.sequentialSplit(pyVertexNatureUP0D(VIEW_VERTEX), 2)
+Operators.sort(pyZBP1D())
+shaders_list = 	[
+		StrokeTextureShader("smoothAlpha.bmp", Stroke.OPAQUE_MEDIUM, 0),
+		ConstantThicknessShader(3), 
+		SamplingShader(5.0),
+		ConstantColorShader(0,0,0,1)
+		]
+Operators.create(pyDensityUP1D(2,0.05, IntegrationType.MEAN,4), shaders_list)
+#Operators.create(pyDensityFunctorUP1D(8,0.03, pyGetInverseProjectedZF1D(), 0,1, IntegrationType.MEAN), shaders_list)
+
diff --git a/source/blender/freestyle/style_modules_blender/vector.py b/source/blender/freestyle/style_modules_blender/vector.py
new file mode 100755
index 00000000000..039f262546b
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/vector.py
@@ -0,0 +1,241 @@
+# This module defines 3d geometrical vectors with the standard
+# operations on them.
+#
+# Written by: Konrad Hinsen 
+# Last revision: 1996-1-26
+#
+
+"""This module defines three-dimensional geometrical vectors. Vectors support
+the usual mathematical operations (v1, v2: vectors, s: scalar): 
+  v1+v2		  addition
+  v1-v2		  subtraction
+  v1*v2		  scalar product
+  s*v1		  multiplication with a scalar
+  v1/s		  division by a scalar
+  v1.cross(v2)	  cross product
+  v1.length()	  length
+  v1.normal()	  normal vector in direction of v1
+  v1.angle(v2)	  angle between two vectors
+  v1.x(), v1[0]	  first element
+  v1.y(), v1[1]	  second element
+  v1.z(), v1[2]	  third element
+
+The module offers the following items for export:
+  Vec3D(x,y,z)	  the constructor for vectors
+  isVector(x)	  a type check function
+  ex, ey, ez	  unit vectors along the x-, y-, and z-axes (predefined constants)
+
+Note: vector elements can be any kind of numbers on which the operations
+addition, subtraction, multiplication, division, comparison, sqrt, and acos
+are defined. Integer elements are treated as floating point elements.
+"""
+
+import math, types
+
+class Vec3:
+
+    isVec3 = 1
+
+    def __init__(self, x=0., y=0., z=0.):
+	self.data = [x,y,z]
+
+    def __repr__(self):
+	return 'Vec3(%s,%s,%s)' % (`self.data[0]`,\
+				     `self.data[1]`,`self.data[2]`)
+
+    def __str__(self):
+	return `self.data`
+
+    def __add__(self, other):
+	return Vec3(self.data[0]+other.data[0],\
+		      self.data[1]+other.data[1],self.data[2]+other.data[2])
+    __radd__ = __add__
+
+    def __neg__(self):
+	return Vec3(-self.data[0], -self.data[1], -self.data[2])
+
+    def __sub__(self, other):
+	return Vec3(self.data[0]-other.data[0],\
+		      self.data[1]-other.data[1],self.data[2]-other.data[2])
+
+    def __rsub__(self, other):
+	return Vec3(other.data[0]-self.data[0],\
+		      other.data[1]-self.data[1],other.data[2]-self.data[2])
+
+    def __mul__(self, other):
+	if isVec3(other):
+	    return reduce(lambda a,b: a+b,
+			  map(lambda a,b: a*b, self.data, other.data))
+	else:
+	    return Vec3(self.data[0]*other, self.data[1]*other,
+			  self.data[2]*other)
+
+    def __rmul__(self, other):
+	if isVec3(other):
+	    return reduce(lambda a,b: a+b,
+			  map(lambda a,b: a*b, self.data, other.data))
+	else:
+	    return Vec3(other*self.data[0], other*self.data[1],
+			  other*self.data[2])
+
+    def __div__(self, other):
+	if isVec3(other):
+	    raise TypeError, "Can't divide by a vector"
+	else:
+	    return Vec3(_div(self.data[0],other), _div(self.data[1],other),
+			  _div(self.data[2],other))
+	    
+    def __rdiv__(self, other):
+	raise TypeError, "Can't divide by a vector"
+
+    def __cmp__(self, other):
+	return cmp(self.data[0],other.data[0]) \
+	       or cmp(self.data[1],other.data[1]) \
+	       or cmp(self.data[2],other.data[2])
+
+    def __getitem__(self, index):
+	return self.data[index]
+
+    def x(self):
+	return self.data[0]
+    def y(self):
+	return self.data[1]
+    def z(self):
+	return self.data[2]
+
+    def length(self):
+	return math.sqrt(self*self)
+
+    def normal(self):
+	len = self.length()
+	if len == 0:
+	    raise ZeroDivisionError, "Can't normalize a zero-length vector"
+	return self/len
+
+    def cross(self, other):
+	if not isVec3(other):
+	    raise TypeError, "Cross product with non-vector"
+	return Vec3(self.data[1]*other.data[2]-self.data[2]*other.data[1],
+		      self.data[2]*other.data[0]-self.data[0]*other.data[2],
+		      self.data[0]*other.data[1]-self.data[1]*other.data[0])
+
+    def angle(self, other):
+	if not isVec3(other):
+	    raise TypeError, "Angle between vector and non-vector"
+	cosa = (self*other)/(self.length()*other.length())
+	cosa = max(-1.,min(1.,cosa))
+	return math.acos(cosa)
+
+
+class Vec2:
+
+    isVec2 = 1
+
+    def __init__(self, x=0., y=0.):
+	self.data = [x,y]
+
+    def __repr__(self):
+	return 'Vec2(%s,%s,%s)' % (`self.data[0]`,\
+				     `self.data[1]`)
+
+    def __str__(self):
+	return `self.data`
+
+    def __add__(self, other):
+	return Vec2(self.data[0]+other.data[0],\
+		      self.data[1]+other.data[1])
+    __radd__ = __add__
+
+    def __neg__(self):
+	return Vec2(-self.data[0], -self.data[1])
+
+    def __sub__(self, other):
+	return Vec2(self.data[0]-other.data[0],\
+		      self.data[1]-other.data[1])
+
+    def __rsub__(self, other):
+	return Vec2(other.data[0]-self.data[0],\
+		      other.data[1]-self.data[1])
+
+    def __mul__(self, other):
+	if isVec2(other):
+	    return reduce(lambda a,b: a+b,
+			  map(lambda a,b: a*b, self.data, other.data))
+	else:
+	    return Vec2(self.data[0]*other, self.data[1]*other)
+
+    def __rmul__(self, other):
+	if isVec2(other):
+	    return reduce(lambda a,b: a+b,
+			  map(lambda a,b: a*b, self.data, other.data))
+	else:
+	    return Vec2(other*self.data[0], other*self.data[1])
+
+    def __div__(self, other):
+	if isVec2(other):
+	    raise TypeError, "Can't divide by a vector"
+	else:
+	    return Vec2(_div(self.data[0],other), _div(self.data[1],other))
+	    
+    def __rdiv__(self, other):
+	raise TypeError, "Can't divide by a vector"
+
+    def __cmp__(self, other):
+	return cmp(self.data[0],other.data[0]) \
+	       or cmp(self.data[1],other.data[1])
+
+    def __getitem__(self, index):
+	return self.data[index]
+
+    def x(self):
+	return self.data[0]
+    def y(self):
+	return self.data[1]
+
+    def length(self):
+	return math.sqrt(self*self)
+
+    def normal(self):
+	len = self.length()
+	if len == 0:
+	    raise ZeroDivisionError, "Can't normalize a zero-length vector"
+	return self/len
+
+    #def cross(self, other):
+#	if not isVec2(other):
+#	    raise TypeError, "Cross product with non-vector"
+#	return Vec2(self.data[1]*other.data[2]-self.data[2]*other.data[1],
+#		      self.data[2]*other.data[0]-self.data[0]*other.data[2],
+#		      self.data[0]*other.data[1]-self.data[1]*other.data[0])
+
+    def angle(self, other):
+	if not isVec2(other):
+	    raise TypeError, "Angle between vector and non-vector"
+	cosa = (self*other)/(self.length()*other.length())
+	cosa = max(-1.,min(1.,cosa))
+	return math.acos(cosa)
+
+
+
+# Type check
+
+def isVec3(x):
+    return hasattr(x,'isVec3')
+
+def isVec2(x):
+    return hasattr(x,'isVec2')
+
+# "Correct" division for arbitrary number types
+
+def _div(a,b):
+    if type(a) == types.IntType and type(b) == types.IntType:
+	return float(a)/float(b)
+    else:
+	return a/b
+
+
+# Some useful constants
+
+ex = Vec3(1.,0.,0.)
+ey = Vec3(0.,1.,0.)
+ez = Vec3(0.,0.,1.)

From 725915615a0044962f1f3b3971d942e70bf2eb6f Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Tue, 29 Jul 2008 10:42:10 +0000
Subject: [PATCH 160/252] soc-2008-mxcurioni: SWIG replacement is effective and
 the native Freestyle API renders a correct result for the test style module
 'contour.py'. More testing needs to be done to make sure my work was correct.

To make it work, I had to:
- update Operators to include all of its methods in the Python API
- redefine the Freestyle modules as local classes, allowing predicates to support the __call__ method (I found out that Python does not allow modules to be callable). The API is defined in the new freestyle_init.py  file.
- remove all references to former Python Freestyle API (located in source/blender/freestyle/python/, under the Freestyle.py file) and replace it with the new API file.
- normalize all constants related to the Nature class
- redefine the logical_operators.py file so that AndUP1D, OrUP1D and NotUP1D would be subclasses of a UnaryPredicate1D subclass having a operator() implementation. Using UnaryPredicate1D as a superclass would somehow prevent calls to the operator(). For the time being, I chose ContourUP1D (even though it does not really matter which subclass it is, since the __call__ method is redefined in all of these classes). I will implement this classes in C++ to get rid of the problem altogether.
- turn off a few classes that somehow are not well recognized (Noise, Curve...). I will reenable them later once I understand what's going on.
---
 .../freestyle/intern/python/BPy_Operators.cpp | 25 ++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/source/blender/freestyle/intern/python/BPy_Operators.cpp b/source/blender/freestyle/intern/python/BPy_Operators.cpp
index 2d883363998..b0a8e7e3bd2 100644
--- a/source/blender/freestyle/intern/python/BPy_Operators.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Operators.cpp
@@ -19,10 +19,33 @@ extern "C" {
 static void Operators___dealloc__(BPy_Operators *self);
 
 static PyObject * Operators_select(BPy_Operators* self, PyObject *args);
+static PyObject * Operators_bidirectionalChain(BPy_Operators* self, PyObject *args);
+static PyObject * Operators_sequentialSplit(BPy_Operators* self, PyObject *args);
+static PyObject * Operators_recursiveSplit(BPy_Operators* self, PyObject *args);
+static PyObject * Operators_sort(BPy_Operators* self, PyObject *args);
+static PyObject * Operators_create(BPy_Operators* self, PyObject *args);
 
 /*----------------------Operators instance definitions ----------------------------*/
 static PyMethodDef BPy_Operators_methods[] = {
-	{"select", ( PyCFunction ) Operators_select, METH_VARARGS | METH_STATIC, "（UnaryPredicate1D up1D ）Selects the ViewEdges of the ViewMap verifying a specified condition. "},
+	{"select", ( PyCFunction ) Operators_select, METH_VARARGS | METH_STATIC, 
+	"select operator"},
+	
+	{"bidirectionalChain", ( PyCFunction ) Operators_bidirectionalChain, METH_VARARGS | METH_STATIC,
+	 "select operator"},
+	
+	{"sequentialSplit", ( PyCFunction ) Operators_sequentialSplit, METH_VARARGS | METH_STATIC,
+	 "select operator"},
+	
+	{"recursiveSplit", ( PyCFunction ) Operators_recursiveSplit, METH_VARARGS | METH_STATIC, 
+	"select operator"},
+	
+	{"sort", ( PyCFunction ) Operators_sort, METH_VARARGS | METH_STATIC, 
+	"select operator"},
+	
+	{"create", ( PyCFunction ) Operators_create, METH_VARARGS | METH_STATIC, 
+	"select operator"},
+	
+		
 	{NULL, NULL, 0, NULL}
 };
 

From 4fa17fc69c2680351caf6eda758a6169a143e08d Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Tue, 29 Jul 2008 10:45:06 +0000
Subject: [PATCH 161/252] soc-2008-mxcurioni: SWIG replacement is effective and
 the native Freestyle API renders a correct result for the test style module
 'contour.py'. More testing needs to be done to make sure my work was correct.

To make it work, I had to:
- update Operators to include all of its methods in the Python API
- redefine the Freestyle modules as local classes, allowing predicates to support the __call__ method (I found out that Python does not allow modules to be callable). The API is defined in the new freestyle_init.py  file.
- remove all references to former Python Freestyle API (located in source/blender/freestyle/python/, under the Freestyle.py file) and replace it with the new API file.
- normalize all constants related to the Nature class
- redefine the logical_operators.py file so that AndUP1D, OrUP1D and NotUP1D would be subclasses of a UnaryPredicate1D subclass having a operator() implementation. Using UnaryPredicate1D as a superclass would somehow prevent calls to the operator(). For the time being, I chose ContourUP1D (even though it does not really matter which subclass it is, since the __call__ method is redefined in all of these classes). I will implement this classes in C++ to get rid of the problem altogether.
- turn off a few classes that somehow are not well recognized (Noise, Curve...). I will reenable them later once I understand what's going on.
---
 .../intern/app_blender/AppConfig.cpp          |    2 +-
 .../freestyle/intern/app_blender/api.cpp      |    2 +-
 source/blender/freestyle/python/Freestyle.py  | 4972 -----------------
 .../ChainingIterators.py                      |   34 +-
 .../style_modules_blender/Functions0D.py      |    2 +-
 .../style_modules_blender/Functions1D.py      |    2 +-
 .../style_modules_blender/PredicatesB1D.py    |    6 +-
 .../style_modules_blender/PredicatesU0D.py    |    4 +-
 .../style_modules_blender/PredicatesU1D.py    |    2 +-
 .../anisotropic_diffusion.py                  |    2 +-
 .../apriori_and_causal_density.py             |    2 +-
 .../style_modules_blender/apriori_density.py  |    2 +-
 .../backbone_stretcher.py                     |    2 +-
 .../blueprint_circles.py                      |    2 +-
 .../blueprint_ellipses.py                     |    2 +-
 .../blueprint_squares.py                      |    2 +-
 .../style_modules_blender/cartoon.py          |    2 +-
 .../style_modules_blender/contour.py          |    2 +-
 .../style_modules_blender/curvature2d.py      |    2 +-
 .../style_modules_blender/external_contour.py |    2 +-
 .../external_contour_sketchy.py               |    2 +-
 .../external_contour_smooth.py                |    2 +-
 .../style_modules_blender/freestyle_init.py   |  455 ++
 .../style_modules_blender/haloing.py          |    2 +-
 .../ignore_small_occlusions.py                |    2 +-
 .../style_modules_blender/invisible_lines.py  |    2 +-
 .../japanese_bigbrush.py                      |    2 +-
 .../logical_operators.py                      |   14 +-
 .../long_anisotropically_dense.py             |    2 +-
 .../multiple_parameterization.py              |    2 +-
 .../freestyle/style_modules_blender/nature.py |   10 +-
 .../style_modules_blender/near_lines.py       |    2 +-
 .../occluded_by_specific_object.py            |    2 +-
 .../style_modules_blender/polygonalize.py     |    2 +-
 .../freestyle/style_modules_blender/qi0.py    |    2 +-
 .../qi0_not_external_contour.py               |    2 +-
 .../freestyle/style_modules_blender/qi1.py    |    2 +-
 .../freestyle/style_modules_blender/qi2.py    |    2 +-
 .../sequentialsplit_sketchy.py                |    6 +-
 .../style_modules_blender/shaders.py          |   20 +-
 .../sketchy_multiple_parameterization.py      |    2 +-
 .../sketchy_topology_broken.py                |    6 +-
 .../sketchy_topology_preserved.py             |    2 +-
 .../split_at_highest_2d_curvatures.py         |    2 +-
 .../split_at_tvertices.py                     |    4 +-
 .../style_modules_blender/stroke_texture.py   |    2 +-
 .../style_modules_blender/suggestive.py       |    4 +-
 .../thickness_fof_depth_discontinuity.py      |    2 +-
 .../style_modules_blender/tipremover.py       |    2 +-
 .../style_modules_blender/tvertex_remover.py  |    2 +-
 .../uniformpruning_zsort.py                   |    4 +-
 51 files changed, 549 insertions(+), 5066 deletions(-)
 delete mode 100755 source/blender/freestyle/python/Freestyle.py
 create mode 100644 source/blender/freestyle/style_modules_blender/freestyle_init.py

diff --git a/source/blender/freestyle/intern/app_blender/AppConfig.cpp b/source/blender/freestyle/intern/app_blender/AppConfig.cpp
index 37d139f54e3..0919259bb74 100755
--- a/source/blender/freestyle/intern/app_blender/AppConfig.cpp
+++ b/source/blender/freestyle/intern/app_blender/AppConfig.cpp
@@ -61,7 +61,7 @@ namespace Config{
               string(PATH_SEP.c_str()) +
               _ProjectDir +
 				string(DIR_SEP.c_str()) +
-              "style_modules" +
+              "style_modules_blender" +
               string(DIR_SEP.c_str()) ;
     if (getenv("PYTHONPATH")) {
       _PythonPath += string(PATH_SEP.c_str()) + string(getenv("PYTHONPATH"));
diff --git a/source/blender/freestyle/intern/app_blender/api.cpp b/source/blender/freestyle/intern/app_blender/api.cpp
index 27b8d578e2f..890c5097a63 100644
--- a/source/blender/freestyle/intern/app_blender/api.cpp
+++ b/source/blender/freestyle/intern/app_blender/api.cpp
@@ -114,7 +114,7 @@ extern "C" {
 		
 		// add style module
 		string style_module = pathconfig->getProjectDir() + 
-								Config::DIR_SEP + "style_modules" + 
+								Config::DIR_SEP + "style_modules_blender" + 
 								Config::DIR_SEP + "contour.py";
 		controller->InsertStyleModule( 0, const_cast<char *>(style_module.c_str()) 	 );
 		controller->toggleLayer(0, true);
diff --git a/source/blender/freestyle/python/Freestyle.py b/source/blender/freestyle/python/Freestyle.py
deleted file mode 100755
index 9db78a050e0..00000000000
--- a/source/blender/freestyle/python/Freestyle.py
+++ /dev/null
@@ -1,4972 +0,0 @@
-# This file was automatically generated by SWIG (http://www.swig.org).
-# Version 1.3.35
-#
-# Don't modify this file, modify the SWIG interface instead.
-# This file is compatible with both classic and new-style classes.
-
-import _Freestyle
-import new
-new_instancemethod = new.instancemethod
-try:
-    _swig_property = property
-except NameError:
-    pass # Python < 2.2 doesn't have 'property'.
-def _swig_setattr_nondynamic(self,class_type,name,value,static=1):
-    if (name == "thisown"): return self.this.own(value)
-    if (name == "this"):
-        if type(value).__name__ == 'PySwigObject':
-            self.__dict__[name] = value
-            return
-    method = class_type.__swig_setmethods__.get(name,None)
-    if method: return method(self,value)
-    if (not static) or hasattr(self,name):
-        self.__dict__[name] = value
-    else:
-        raise AttributeError("You cannot add attributes to %s" % self)
-
-def _swig_setattr(self,class_type,name,value):
-    return _swig_setattr_nondynamic(self,class_type,name,value,0)
-
-def _swig_getattr(self,class_type,name):
-    if (name == "thisown"): return self.this.own()
-    method = class_type.__swig_getmethods__.get(name,None)
-    if method: return method(self)
-    raise AttributeError,name
-
-def _swig_repr(self):
-    try: strthis = "proxy of " + self.this.__repr__()
-    except: strthis = ""
-    return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
-
-import types
-try:
-    _object = types.ObjectType
-    _newclass = 1
-except AttributeError:
-    class _object : pass
-    _newclass = 0
-del types
-
-
-try:
-    import weakref
-    weakref_proxy = weakref.proxy
-except:
-    weakref_proxy = lambda x: x
-
-
-class PySwigIterator(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, PySwigIterator, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, PySwigIterator, name)
-    def __init__(self, *args, **kwargs): raise AttributeError, "No constructor defined"
-    __repr__ = _swig_repr
-    __swig_destroy__ = _Freestyle.delete_PySwigIterator
-    __del__ = lambda self : None;
-    def value(*args): return _Freestyle.PySwigIterator_value(*args)
-    def incr(*args): return _Freestyle.PySwigIterator_incr(*args)
-    def decr(*args): return _Freestyle.PySwigIterator_decr(*args)
-    def distance(*args): return _Freestyle.PySwigIterator_distance(*args)
-    def equal(*args): return _Freestyle.PySwigIterator_equal(*args)
-    def copy(*args): return _Freestyle.PySwigIterator_copy(*args)
-    def next(*args): return _Freestyle.PySwigIterator_next(*args)
-    def previous(*args): return _Freestyle.PySwigIterator_previous(*args)
-    def advance(*args): return _Freestyle.PySwigIterator_advance(*args)
-    def __eq__(*args): return _Freestyle.PySwigIterator___eq__(*args)
-    def __ne__(*args): return _Freestyle.PySwigIterator___ne__(*args)
-    def __iadd__(*args): return _Freestyle.PySwigIterator___iadd__(*args)
-    def __isub__(*args): return _Freestyle.PySwigIterator___isub__(*args)
-    def __add__(*args): return _Freestyle.PySwigIterator___add__(*args)
-    def __sub__(*args): return _Freestyle.PySwigIterator___sub__(*args)
-    def __iter__(self): return self
-PySwigIterator_swigregister = _Freestyle.PySwigIterator_swigregister
-PySwigIterator_swigregister(PySwigIterator)
-
-class vectorInt(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, vectorInt, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, vectorInt, name)
-    __repr__ = _swig_repr
-    def iterator(*args): return _Freestyle.vectorInt_iterator(*args)
-    def __iter__(self): return self.iterator()
-    def __nonzero__(*args): return _Freestyle.vectorInt___nonzero__(*args)
-    def __len__(*args): return _Freestyle.vectorInt___len__(*args)
-    def pop(*args): return _Freestyle.vectorInt_pop(*args)
-    def __getslice__(*args): return _Freestyle.vectorInt___getslice__(*args)
-    def __setslice__(*args): return _Freestyle.vectorInt___setslice__(*args)
-    def __delslice__(*args): return _Freestyle.vectorInt___delslice__(*args)
-    def __delitem__(*args): return _Freestyle.vectorInt___delitem__(*args)
-    def __getitem__(*args): return _Freestyle.vectorInt___getitem__(*args)
-    def __setitem__(*args): return _Freestyle.vectorInt___setitem__(*args)
-    def append(*args): return _Freestyle.vectorInt_append(*args)
-    def empty(*args): return _Freestyle.vectorInt_empty(*args)
-    def size(*args): return _Freestyle.vectorInt_size(*args)
-    def clear(*args): return _Freestyle.vectorInt_clear(*args)
-    def swap(*args): return _Freestyle.vectorInt_swap(*args)
-    def get_allocator(*args): return _Freestyle.vectorInt_get_allocator(*args)
-    def begin(*args): return _Freestyle.vectorInt_begin(*args)
-    def end(*args): return _Freestyle.vectorInt_end(*args)
-    def rbegin(*args): return _Freestyle.vectorInt_rbegin(*args)
-    def rend(*args): return _Freestyle.vectorInt_rend(*args)
-    def pop_back(*args): return _Freestyle.vectorInt_pop_back(*args)
-    def erase(*args): return _Freestyle.vectorInt_erase(*args)
-    def __init__(self, *args): 
-        this = _Freestyle.new_vectorInt(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def push_back(*args): return _Freestyle.vectorInt_push_back(*args)
-    def front(*args): return _Freestyle.vectorInt_front(*args)
-    def back(*args): return _Freestyle.vectorInt_back(*args)
-    def assign(*args): return _Freestyle.vectorInt_assign(*args)
-    def resize(*args): return _Freestyle.vectorInt_resize(*args)
-    def insert(*args): return _Freestyle.vectorInt_insert(*args)
-    def reserve(*args): return _Freestyle.vectorInt_reserve(*args)
-    def capacity(*args): return _Freestyle.vectorInt_capacity(*args)
-    __swig_destroy__ = _Freestyle.delete_vectorInt
-    __del__ = lambda self : None;
-vectorInt_swigregister = _Freestyle.vectorInt_swigregister
-vectorInt_swigregister(vectorInt)
-
-class Id(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Id, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, Id, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_Id(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def getFirst(*args): return _Freestyle.Id_getFirst(*args)
-    def getSecond(*args): return _Freestyle.Id_getSecond(*args)
-    def setFirst(*args): return _Freestyle.Id_setFirst(*args)
-    def setSecond(*args): return _Freestyle.Id_setSecond(*args)
-    def __eq__(*args): return _Freestyle.Id___eq__(*args)
-    def __ne__(*args): return _Freestyle.Id___ne__(*args)
-    def __lt__(*args): return _Freestyle.Id___lt__(*args)
-    __swig_destroy__ = _Freestyle.delete_Id
-    __del__ = lambda self : None;
-Id_swigregister = _Freestyle.Id_swigregister
-Id_swigregister(Id)
-
-class Vec_2u(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Vec_2u, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, Vec_2u, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_Vec_2u(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_Vec_2u
-    __del__ = lambda self : None;
-    __swig_getmethods__["dim"] = lambda x: _Freestyle.Vec_2u_dim
-    if _newclass:dim = staticmethod(_Freestyle.Vec_2u_dim)
-    def norm(*args): return _Freestyle.Vec_2u_norm(*args)
-    def squareNorm(*args): return _Freestyle.Vec_2u_squareNorm(*args)
-    def normalize(*args): return _Freestyle.Vec_2u_normalize(*args)
-    def normalizeSafe(*args): return _Freestyle.Vec_2u_normalizeSafe(*args)
-    def __add__(*args): return _Freestyle.Vec_2u___add__(*args)
-    def __sub__(*args): return _Freestyle.Vec_2u___sub__(*args)
-    def __div__(*args): return _Freestyle.Vec_2u___div__(*args)
-    def __mul__(*args): return _Freestyle.Vec_2u___mul__(*args)
-    def __eq__(*args): return _Freestyle.Vec_2u___eq__(*args)
-    def __ne__(*args): return _Freestyle.Vec_2u___ne__(*args)
-    def __lt__(*args): return _Freestyle.Vec_2u___lt__(*args)
-    def __gt__(*args): return _Freestyle.Vec_2u___gt__(*args)
-Vec_2u_swigregister = _Freestyle.Vec_2u_swigregister
-Vec_2u_swigregister(Vec_2u)
-Vec_2u_dim = _Freestyle.Vec_2u_dim
-
-class Vec_2i(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Vec_2i, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, Vec_2i, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_Vec_2i(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_Vec_2i
-    __del__ = lambda self : None;
-    __swig_getmethods__["dim"] = lambda x: _Freestyle.Vec_2i_dim
-    if _newclass:dim = staticmethod(_Freestyle.Vec_2i_dim)
-    def norm(*args): return _Freestyle.Vec_2i_norm(*args)
-    def squareNorm(*args): return _Freestyle.Vec_2i_squareNorm(*args)
-    def normalize(*args): return _Freestyle.Vec_2i_normalize(*args)
-    def normalizeSafe(*args): return _Freestyle.Vec_2i_normalizeSafe(*args)
-    def __add__(*args): return _Freestyle.Vec_2i___add__(*args)
-    def __sub__(*args): return _Freestyle.Vec_2i___sub__(*args)
-    def __div__(*args): return _Freestyle.Vec_2i___div__(*args)
-    def __mul__(*args): return _Freestyle.Vec_2i___mul__(*args)
-    def __eq__(*args): return _Freestyle.Vec_2i___eq__(*args)
-    def __ne__(*args): return _Freestyle.Vec_2i___ne__(*args)
-    def __lt__(*args): return _Freestyle.Vec_2i___lt__(*args)
-    def __gt__(*args): return _Freestyle.Vec_2i___gt__(*args)
-Vec_2i_swigregister = _Freestyle.Vec_2i_swigregister
-Vec_2i_swigregister(Vec_2i)
-Vec_2i_dim = _Freestyle.Vec_2i_dim
-
-class Vec_2d(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Vec_2d, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, Vec_2d, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_Vec_2d(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_Vec_2d
-    __del__ = lambda self : None;
-    __swig_getmethods__["dim"] = lambda x: _Freestyle.Vec_2d_dim
-    if _newclass:dim = staticmethod(_Freestyle.Vec_2d_dim)
-    def norm(*args): return _Freestyle.Vec_2d_norm(*args)
-    def squareNorm(*args): return _Freestyle.Vec_2d_squareNorm(*args)
-    def normalize(*args): return _Freestyle.Vec_2d_normalize(*args)
-    def normalizeSafe(*args): return _Freestyle.Vec_2d_normalizeSafe(*args)
-    def __add__(*args): return _Freestyle.Vec_2d___add__(*args)
-    def __sub__(*args): return _Freestyle.Vec_2d___sub__(*args)
-    def __div__(*args): return _Freestyle.Vec_2d___div__(*args)
-    def __mul__(*args): return _Freestyle.Vec_2d___mul__(*args)
-    def __eq__(*args): return _Freestyle.Vec_2d___eq__(*args)
-    def __ne__(*args): return _Freestyle.Vec_2d___ne__(*args)
-    def __lt__(*args): return _Freestyle.Vec_2d___lt__(*args)
-    def __gt__(*args): return _Freestyle.Vec_2d___gt__(*args)
-Vec_2d_swigregister = _Freestyle.Vec_2d_swigregister
-Vec_2d_swigregister(Vec_2d)
-Vec_2d_dim = _Freestyle.Vec_2d_dim
-
-class Vec_2f(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Vec_2f, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, Vec_2f, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_Vec_2f(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_Vec_2f
-    __del__ = lambda self : None;
-    __swig_getmethods__["dim"] = lambda x: _Freestyle.Vec_2f_dim
-    if _newclass:dim = staticmethod(_Freestyle.Vec_2f_dim)
-    def norm(*args): return _Freestyle.Vec_2f_norm(*args)
-    def squareNorm(*args): return _Freestyle.Vec_2f_squareNorm(*args)
-    def normalize(*args): return _Freestyle.Vec_2f_normalize(*args)
-    def normalizeSafe(*args): return _Freestyle.Vec_2f_normalizeSafe(*args)
-    def __add__(*args): return _Freestyle.Vec_2f___add__(*args)
-    def __sub__(*args): return _Freestyle.Vec_2f___sub__(*args)
-    def __div__(*args): return _Freestyle.Vec_2f___div__(*args)
-    def __mul__(*args): return _Freestyle.Vec_2f___mul__(*args)
-    def __eq__(*args): return _Freestyle.Vec_2f___eq__(*args)
-    def __ne__(*args): return _Freestyle.Vec_2f___ne__(*args)
-    def __lt__(*args): return _Freestyle.Vec_2f___lt__(*args)
-    def __gt__(*args): return _Freestyle.Vec_2f___gt__(*args)
-Vec_2f_swigregister = _Freestyle.Vec_2f_swigregister
-Vec_2f_swigregister(Vec_2f)
-Vec_2f_dim = _Freestyle.Vec_2f_dim
-
-class Vec2u(Vec_2u):
-    __swig_setmethods__ = {}
-    for _s in [Vec_2u]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Vec2u, name, value)
-    __swig_getmethods__ = {}
-    for _s in [Vec_2u]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, Vec2u, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_Vec2u(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def x(*args): return _Freestyle.Vec2u_x(*args)
-    def y(*args): return _Freestyle.Vec2u_y(*args)
-    def setX(*args): return _Freestyle.Vec2u_setX(*args)
-    def setY(*args): return _Freestyle.Vec2u_setY(*args)
-    def __add__(*args): return _Freestyle.Vec2u___add__(*args)
-    def __sub__(*args): return _Freestyle.Vec2u___sub__(*args)
-    def __div__(*args): return _Freestyle.Vec2u___div__(*args)
-    def __mul__(*args): return _Freestyle.Vec2u___mul__(*args)
-    __swig_destroy__ = _Freestyle.delete_Vec2u
-    __del__ = lambda self : None;
-Vec2u_swigregister = _Freestyle.Vec2u_swigregister
-Vec2u_swigregister(Vec2u)
-
-class Vec2i(Vec_2i):
-    __swig_setmethods__ = {}
-    for _s in [Vec_2i]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Vec2i, name, value)
-    __swig_getmethods__ = {}
-    for _s in [Vec_2i]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, Vec2i, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_Vec2i(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def x(*args): return _Freestyle.Vec2i_x(*args)
-    def y(*args): return _Freestyle.Vec2i_y(*args)
-    def setX(*args): return _Freestyle.Vec2i_setX(*args)
-    def setY(*args): return _Freestyle.Vec2i_setY(*args)
-    def __add__(*args): return _Freestyle.Vec2i___add__(*args)
-    def __sub__(*args): return _Freestyle.Vec2i___sub__(*args)
-    def __div__(*args): return _Freestyle.Vec2i___div__(*args)
-    def __mul__(*args): return _Freestyle.Vec2i___mul__(*args)
-    __swig_destroy__ = _Freestyle.delete_Vec2i
-    __del__ = lambda self : None;
-Vec2i_swigregister = _Freestyle.Vec2i_swigregister
-Vec2i_swigregister(Vec2i)
-
-class Vec2f(Vec_2f):
-    __swig_setmethods__ = {}
-    for _s in [Vec_2f]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Vec2f, name, value)
-    __swig_getmethods__ = {}
-    for _s in [Vec_2f]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, Vec2f, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_Vec2f(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def x(*args): return _Freestyle.Vec2f_x(*args)
-    def y(*args): return _Freestyle.Vec2f_y(*args)
-    def setX(*args): return _Freestyle.Vec2f_setX(*args)
-    def setY(*args): return _Freestyle.Vec2f_setY(*args)
-    def __add__(*args): return _Freestyle.Vec2f___add__(*args)
-    def __sub__(*args): return _Freestyle.Vec2f___sub__(*args)
-    def __div__(*args): return _Freestyle.Vec2f___div__(*args)
-    def __mul__(*args): return _Freestyle.Vec2f___mul__(*args)
-    __swig_destroy__ = _Freestyle.delete_Vec2f
-    __del__ = lambda self : None;
-Vec2f_swigregister = _Freestyle.Vec2f_swigregister
-Vec2f_swigregister(Vec2f)
-
-class Vec2d(Vec_2d):
-    __swig_setmethods__ = {}
-    for _s in [Vec_2d]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Vec2d, name, value)
-    __swig_getmethods__ = {}
-    for _s in [Vec_2d]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, Vec2d, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_Vec2d(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def x(*args): return _Freestyle.Vec2d_x(*args)
-    def y(*args): return _Freestyle.Vec2d_y(*args)
-    def setX(*args): return _Freestyle.Vec2d_setX(*args)
-    def setY(*args): return _Freestyle.Vec2d_setY(*args)
-    def __add__(*args): return _Freestyle.Vec2d___add__(*args)
-    def __sub__(*args): return _Freestyle.Vec2d___sub__(*args)
-    def __div__(*args): return _Freestyle.Vec2d___div__(*args)
-    def __mul__(*args): return _Freestyle.Vec2d___mul__(*args)
-    __swig_destroy__ = _Freestyle.delete_Vec2d
-    __del__ = lambda self : None;
-Vec2d_swigregister = _Freestyle.Vec2d_swigregister
-Vec2d_swigregister(Vec2d)
-
-class Vec_3u(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Vec_3u, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, Vec_3u, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_Vec_3u(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_Vec_3u
-    __del__ = lambda self : None;
-    __swig_getmethods__["dim"] = lambda x: _Freestyle.Vec_3u_dim
-    if _newclass:dim = staticmethod(_Freestyle.Vec_3u_dim)
-    def norm(*args): return _Freestyle.Vec_3u_norm(*args)
-    def squareNorm(*args): return _Freestyle.Vec_3u_squareNorm(*args)
-    def normalize(*args): return _Freestyle.Vec_3u_normalize(*args)
-    def normalizeSafe(*args): return _Freestyle.Vec_3u_normalizeSafe(*args)
-    def __add__(*args): return _Freestyle.Vec_3u___add__(*args)
-    def __sub__(*args): return _Freestyle.Vec_3u___sub__(*args)
-    def __div__(*args): return _Freestyle.Vec_3u___div__(*args)
-    def __mul__(*args): return _Freestyle.Vec_3u___mul__(*args)
-    def __eq__(*args): return _Freestyle.Vec_3u___eq__(*args)
-    def __ne__(*args): return _Freestyle.Vec_3u___ne__(*args)
-    def __lt__(*args): return _Freestyle.Vec_3u___lt__(*args)
-    def __gt__(*args): return _Freestyle.Vec_3u___gt__(*args)
-Vec_3u_swigregister = _Freestyle.Vec_3u_swigregister
-Vec_3u_swigregister(Vec_3u)
-Vec_3u_dim = _Freestyle.Vec_3u_dim
-
-class Vec_3i(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Vec_3i, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, Vec_3i, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_Vec_3i(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_Vec_3i
-    __del__ = lambda self : None;
-    __swig_getmethods__["dim"] = lambda x: _Freestyle.Vec_3i_dim
-    if _newclass:dim = staticmethod(_Freestyle.Vec_3i_dim)
-    def norm(*args): return _Freestyle.Vec_3i_norm(*args)
-    def squareNorm(*args): return _Freestyle.Vec_3i_squareNorm(*args)
-    def normalize(*args): return _Freestyle.Vec_3i_normalize(*args)
-    def normalizeSafe(*args): return _Freestyle.Vec_3i_normalizeSafe(*args)
-    def __add__(*args): return _Freestyle.Vec_3i___add__(*args)
-    def __sub__(*args): return _Freestyle.Vec_3i___sub__(*args)
-    def __div__(*args): return _Freestyle.Vec_3i___div__(*args)
-    def __mul__(*args): return _Freestyle.Vec_3i___mul__(*args)
-    def __eq__(*args): return _Freestyle.Vec_3i___eq__(*args)
-    def __ne__(*args): return _Freestyle.Vec_3i___ne__(*args)
-    def __lt__(*args): return _Freestyle.Vec_3i___lt__(*args)
-    def __gt__(*args): return _Freestyle.Vec_3i___gt__(*args)
-Vec_3i_swigregister = _Freestyle.Vec_3i_swigregister
-Vec_3i_swigregister(Vec_3i)
-Vec_3i_dim = _Freestyle.Vec_3i_dim
-
-class Vec_3d(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Vec_3d, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, Vec_3d, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_Vec_3d(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_Vec_3d
-    __del__ = lambda self : None;
-    __swig_getmethods__["dim"] = lambda x: _Freestyle.Vec_3d_dim
-    if _newclass:dim = staticmethod(_Freestyle.Vec_3d_dim)
-    def norm(*args): return _Freestyle.Vec_3d_norm(*args)
-    def squareNorm(*args): return _Freestyle.Vec_3d_squareNorm(*args)
-    def normalize(*args): return _Freestyle.Vec_3d_normalize(*args)
-    def normalizeSafe(*args): return _Freestyle.Vec_3d_normalizeSafe(*args)
-    def __add__(*args): return _Freestyle.Vec_3d___add__(*args)
-    def __sub__(*args): return _Freestyle.Vec_3d___sub__(*args)
-    def __div__(*args): return _Freestyle.Vec_3d___div__(*args)
-    def __mul__(*args): return _Freestyle.Vec_3d___mul__(*args)
-    def __eq__(*args): return _Freestyle.Vec_3d___eq__(*args)
-    def __ne__(*args): return _Freestyle.Vec_3d___ne__(*args)
-    def __lt__(*args): return _Freestyle.Vec_3d___lt__(*args)
-    def __gt__(*args): return _Freestyle.Vec_3d___gt__(*args)
-Vec_3d_swigregister = _Freestyle.Vec_3d_swigregister
-Vec_3d_swigregister(Vec_3d)
-Vec_3d_dim = _Freestyle.Vec_3d_dim
-
-class Vec_3f(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Vec_3f, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, Vec_3f, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_Vec_3f(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_Vec_3f
-    __del__ = lambda self : None;
-    __swig_getmethods__["dim"] = lambda x: _Freestyle.Vec_3f_dim
-    if _newclass:dim = staticmethod(_Freestyle.Vec_3f_dim)
-    def norm(*args): return _Freestyle.Vec_3f_norm(*args)
-    def squareNorm(*args): return _Freestyle.Vec_3f_squareNorm(*args)
-    def normalize(*args): return _Freestyle.Vec_3f_normalize(*args)
-    def normalizeSafe(*args): return _Freestyle.Vec_3f_normalizeSafe(*args)
-    def __add__(*args): return _Freestyle.Vec_3f___add__(*args)
-    def __sub__(*args): return _Freestyle.Vec_3f___sub__(*args)
-    def __div__(*args): return _Freestyle.Vec_3f___div__(*args)
-    def __mul__(*args): return _Freestyle.Vec_3f___mul__(*args)
-    def __eq__(*args): return _Freestyle.Vec_3f___eq__(*args)
-    def __ne__(*args): return _Freestyle.Vec_3f___ne__(*args)
-    def __lt__(*args): return _Freestyle.Vec_3f___lt__(*args)
-    def __gt__(*args): return _Freestyle.Vec_3f___gt__(*args)
-Vec_3f_swigregister = _Freestyle.Vec_3f_swigregister
-Vec_3f_swigregister(Vec_3f)
-Vec_3f_dim = _Freestyle.Vec_3f_dim
-
-class Vec3u(Vec_3u):
-    __swig_setmethods__ = {}
-    for _s in [Vec_3u]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Vec3u, name, value)
-    __swig_getmethods__ = {}
-    for _s in [Vec_3u]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, Vec3u, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_Vec3u(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def x(*args): return _Freestyle.Vec3u_x(*args)
-    def y(*args): return _Freestyle.Vec3u_y(*args)
-    def z(*args): return _Freestyle.Vec3u_z(*args)
-    def setX(*args): return _Freestyle.Vec3u_setX(*args)
-    def setY(*args): return _Freestyle.Vec3u_setY(*args)
-    def setZ(*args): return _Freestyle.Vec3u_setZ(*args)
-    def __add__(*args): return _Freestyle.Vec3u___add__(*args)
-    def __sub__(*args): return _Freestyle.Vec3u___sub__(*args)
-    def __div__(*args): return _Freestyle.Vec3u___div__(*args)
-    def __mul__(*args): return _Freestyle.Vec3u___mul__(*args)
-    def __xor__(*args): return _Freestyle.Vec3u___xor__(*args)
-    __swig_destroy__ = _Freestyle.delete_Vec3u
-    __del__ = lambda self : None;
-Vec3u_swigregister = _Freestyle.Vec3u_swigregister
-Vec3u_swigregister(Vec3u)
-
-class Vec3i(Vec_3i):
-    __swig_setmethods__ = {}
-    for _s in [Vec_3i]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Vec3i, name, value)
-    __swig_getmethods__ = {}
-    for _s in [Vec_3i]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, Vec3i, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_Vec3i(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def x(*args): return _Freestyle.Vec3i_x(*args)
-    def y(*args): return _Freestyle.Vec3i_y(*args)
-    def z(*args): return _Freestyle.Vec3i_z(*args)
-    def setX(*args): return _Freestyle.Vec3i_setX(*args)
-    def setY(*args): return _Freestyle.Vec3i_setY(*args)
-    def setZ(*args): return _Freestyle.Vec3i_setZ(*args)
-    def __add__(*args): return _Freestyle.Vec3i___add__(*args)
-    def __sub__(*args): return _Freestyle.Vec3i___sub__(*args)
-    def __div__(*args): return _Freestyle.Vec3i___div__(*args)
-    def __mul__(*args): return _Freestyle.Vec3i___mul__(*args)
-    def __xor__(*args): return _Freestyle.Vec3i___xor__(*args)
-    __swig_destroy__ = _Freestyle.delete_Vec3i
-    __del__ = lambda self : None;
-Vec3i_swigregister = _Freestyle.Vec3i_swigregister
-Vec3i_swigregister(Vec3i)
-
-class Vec3f(Vec_3f):
-    __swig_setmethods__ = {}
-    for _s in [Vec_3f]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Vec3f, name, value)
-    __swig_getmethods__ = {}
-    for _s in [Vec_3f]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, Vec3f, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_Vec3f(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def x(*args): return _Freestyle.Vec3f_x(*args)
-    def y(*args): return _Freestyle.Vec3f_y(*args)
-    def z(*args): return _Freestyle.Vec3f_z(*args)
-    def setX(*args): return _Freestyle.Vec3f_setX(*args)
-    def setY(*args): return _Freestyle.Vec3f_setY(*args)
-    def setZ(*args): return _Freestyle.Vec3f_setZ(*args)
-    def __add__(*args): return _Freestyle.Vec3f___add__(*args)
-    def __sub__(*args): return _Freestyle.Vec3f___sub__(*args)
-    def __div__(*args): return _Freestyle.Vec3f___div__(*args)
-    def __mul__(*args): return _Freestyle.Vec3f___mul__(*args)
-    def __xor__(*args): return _Freestyle.Vec3f___xor__(*args)
-    __swig_destroy__ = _Freestyle.delete_Vec3f
-    __del__ = lambda self : None;
-Vec3f_swigregister = _Freestyle.Vec3f_swigregister
-Vec3f_swigregister(Vec3f)
-
-class Vec3d(Vec_3d):
-    __swig_setmethods__ = {}
-    for _s in [Vec_3d]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Vec3d, name, value)
-    __swig_getmethods__ = {}
-    for _s in [Vec_3d]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, Vec3d, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_Vec3d(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def x(*args): return _Freestyle.Vec3d_x(*args)
-    def y(*args): return _Freestyle.Vec3d_y(*args)
-    def z(*args): return _Freestyle.Vec3d_z(*args)
-    def setX(*args): return _Freestyle.Vec3d_setX(*args)
-    def setY(*args): return _Freestyle.Vec3d_setY(*args)
-    def setZ(*args): return _Freestyle.Vec3d_setZ(*args)
-    def __add__(*args): return _Freestyle.Vec3d___add__(*args)
-    def __sub__(*args): return _Freestyle.Vec3d___sub__(*args)
-    def __div__(*args): return _Freestyle.Vec3d___div__(*args)
-    def __mul__(*args): return _Freestyle.Vec3d___mul__(*args)
-    def __xor__(*args): return _Freestyle.Vec3d___xor__(*args)
-    __swig_destroy__ = _Freestyle.delete_Vec3d
-    __del__ = lambda self : None;
-Vec3d_swigregister = _Freestyle.Vec3d_swigregister
-Vec3d_swigregister(Vec3d)
-
-_Noise_B_ = _Freestyle._Noise_B_
-class Noise(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Noise, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, Noise, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_Noise(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_Noise
-    __del__ = lambda self : None;
-    def turbulence1(*args): return _Freestyle.Noise_turbulence1(*args)
-    def turbulence2(*args): return _Freestyle.Noise_turbulence2(*args)
-    def turbulence3(*args): return _Freestyle.Noise_turbulence3(*args)
-    def smoothNoise1(*args): return _Freestyle.Noise_smoothNoise1(*args)
-    def smoothNoise2(*args): return _Freestyle.Noise_smoothNoise2(*args)
-    def smoothNoise3(*args): return _Freestyle.Noise_smoothNoise3(*args)
-Noise_swigregister = _Freestyle.Noise_swigregister
-Noise_swigregister(Noise)
-
-class Material(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Material, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, Material, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_Material(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_Material
-    __del__ = lambda self : None;
-    def diffuse(*args): return _Freestyle.Material_diffuse(*args)
-    def diffuseR(*args): return _Freestyle.Material_diffuseR(*args)
-    def diffuseG(*args): return _Freestyle.Material_diffuseG(*args)
-    def diffuseB(*args): return _Freestyle.Material_diffuseB(*args)
-    def diffuseA(*args): return _Freestyle.Material_diffuseA(*args)
-    def specular(*args): return _Freestyle.Material_specular(*args)
-    def specularR(*args): return _Freestyle.Material_specularR(*args)
-    def specularG(*args): return _Freestyle.Material_specularG(*args)
-    def specularB(*args): return _Freestyle.Material_specularB(*args)
-    def specularA(*args): return _Freestyle.Material_specularA(*args)
-    def ambient(*args): return _Freestyle.Material_ambient(*args)
-    def ambientR(*args): return _Freestyle.Material_ambientR(*args)
-    def ambientG(*args): return _Freestyle.Material_ambientG(*args)
-    def ambientB(*args): return _Freestyle.Material_ambientB(*args)
-    def ambientA(*args): return _Freestyle.Material_ambientA(*args)
-    def emission(*args): return _Freestyle.Material_emission(*args)
-    def emissionR(*args): return _Freestyle.Material_emissionR(*args)
-    def emissionG(*args): return _Freestyle.Material_emissionG(*args)
-    def emissionB(*args): return _Freestyle.Material_emissionB(*args)
-    def emissionA(*args): return _Freestyle.Material_emissionA(*args)
-    def shininess(*args): return _Freestyle.Material_shininess(*args)
-    def setDiffuse(*args): return _Freestyle.Material_setDiffuse(*args)
-    def setSpecular(*args): return _Freestyle.Material_setSpecular(*args)
-    def setAmbient(*args): return _Freestyle.Material_setAmbient(*args)
-    def setEmission(*args): return _Freestyle.Material_setEmission(*args)
-    def setShininess(*args): return _Freestyle.Material_setShininess(*args)
-    def __ne__(*args): return _Freestyle.Material___ne__(*args)
-    def __eq__(*args): return _Freestyle.Material___eq__(*args)
-Material_swigregister = _Freestyle.Material_swigregister
-Material_swigregister(Material)
-
-class Interface0D(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Interface0D, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, Interface0D, name)
-    __repr__ = _swig_repr
-    __swig_destroy__ = _Freestyle.delete_Interface0D
-    __del__ = lambda self : None;
-    def getExactTypeName(*args): return _Freestyle.Interface0D_getExactTypeName(*args)
-    def getX(*args): return _Freestyle.Interface0D_getX(*args)
-    def getY(*args): return _Freestyle.Interface0D_getY(*args)
-    def getZ(*args): return _Freestyle.Interface0D_getZ(*args)
-    def getPoint3D(*args): return _Freestyle.Interface0D_getPoint3D(*args)
-    def getProjectedX(*args): return _Freestyle.Interface0D_getProjectedX(*args)
-    def getProjectedY(*args): return _Freestyle.Interface0D_getProjectedY(*args)
-    def getProjectedZ(*args): return _Freestyle.Interface0D_getProjectedZ(*args)
-    def getPoint2D(*args): return _Freestyle.Interface0D_getPoint2D(*args)
-    def getFEdge(*args): return _Freestyle.Interface0D_getFEdge(*args)
-    def getId(*args): return _Freestyle.Interface0D_getId(*args)
-    def getNature(*args): return _Freestyle.Interface0D_getNature(*args)
-    def castToSVertex(*args): return _Freestyle.Interface0D_castToSVertex(*args)
-    def castToViewVertex(*args): return _Freestyle.Interface0D_castToViewVertex(*args)
-    def castToNonTVertex(*args): return _Freestyle.Interface0D_castToNonTVertex(*args)
-    def castToTVertex(*args): return _Freestyle.Interface0D_castToTVertex(*args)
-    def __init__(self, *args): 
-        this = _Freestyle.new_Interface0D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-Interface0D_swigregister = _Freestyle.Interface0D_swigregister
-Interface0D_swigregister(Interface0D)
-cvar = _Freestyle.cvar
-POINT = cvar.POINT
-S_VERTEX = cvar.S_VERTEX
-VIEW_VERTEX = cvar.VIEW_VERTEX
-NON_T_VERTEX = cvar.NON_T_VERTEX
-T_VERTEX = cvar.T_VERTEX
-CUSP = cvar.CUSP
-NO_FEATURE = cvar.NO_FEATURE
-SILHOUETTE = cvar.SILHOUETTE
-BORDER = cvar.BORDER
-CREASE = cvar.CREASE
-RIDGE = cvar.RIDGE
-VALLEY = cvar.VALLEY
-SUGGESTIVE_CONTOUR = cvar.SUGGESTIVE_CONTOUR
-
-class Interface0DIteratorNested(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Interface0DIteratorNested, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, Interface0DIteratorNested, name)
-    def __init__(self, *args, **kwargs): raise AttributeError, "No constructor defined"
-    __repr__ = _swig_repr
-    __swig_destroy__ = _Freestyle.delete_Interface0DIteratorNested
-    __del__ = lambda self : None;
-    def getExactTypeName(*args): return _Freestyle.Interface0DIteratorNested_getExactTypeName(*args)
-    def getObject(*args): return _Freestyle.Interface0DIteratorNested_getObject(*args)
-    def __deref__(*args): return _Freestyle.Interface0DIteratorNested___deref__(*args)
-    def increment(*args): return _Freestyle.Interface0DIteratorNested_increment(*args)
-    def decrement(*args): return _Freestyle.Interface0DIteratorNested_decrement(*args)
-    def isBegin(*args): return _Freestyle.Interface0DIteratorNested_isBegin(*args)
-    def isEnd(*args): return _Freestyle.Interface0DIteratorNested_isEnd(*args)
-    def __eq__(*args): return _Freestyle.Interface0DIteratorNested___eq__(*args)
-    def __ne__(*args): return _Freestyle.Interface0DIteratorNested___ne__(*args)
-    def t(*args): return _Freestyle.Interface0DIteratorNested_t(*args)
-    def u(*args): return _Freestyle.Interface0DIteratorNested_u(*args)
-    def copy(*args): return _Freestyle.Interface0DIteratorNested_copy(*args)
-    def getX(*args): return _Freestyle.Interface0DIteratorNested_getX(*args)
-    def getY(*args): return _Freestyle.Interface0DIteratorNested_getY(*args)
-    def getZ(*args): return _Freestyle.Interface0DIteratorNested_getZ(*args)
-    def getPoint3D(*args): return _Freestyle.Interface0DIteratorNested_getPoint3D(*args)
-    def getProjectedX(*args): return _Freestyle.Interface0DIteratorNested_getProjectedX(*args)
-    def getProjectedY(*args): return _Freestyle.Interface0DIteratorNested_getProjectedY(*args)
-    def getProjectedZ(*args): return _Freestyle.Interface0DIteratorNested_getProjectedZ(*args)
-    def getPoint2D(*args): return _Freestyle.Interface0DIteratorNested_getPoint2D(*args)
-    def getFEdge(*args): return _Freestyle.Interface0DIteratorNested_getFEdge(*args)
-    def getId(*args): return _Freestyle.Interface0DIteratorNested_getId(*args)
-    def getNature(*args): return _Freestyle.Interface0DIteratorNested_getNature(*args)
-    def castToSVertex(*args): return _Freestyle.Interface0DIteratorNested_castToSVertex(*args)
-    def castToViewVertex(*args): return _Freestyle.Interface0DIteratorNested_castToViewVertex(*args)
-    def castToNonTVertex(*args): return _Freestyle.Interface0DIteratorNested_castToNonTVertex(*args)
-    def castToTVertex(*args): return _Freestyle.Interface0DIteratorNested_castToTVertex(*args)
-Interface0DIteratorNested_swigregister = _Freestyle.Interface0DIteratorNested_swigregister
-Interface0DIteratorNested_swigregister(Interface0DIteratorNested)
-
-class Interface0DIterator(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Interface0DIterator, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, Interface0DIterator, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_Interface0DIterator(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_Interface0DIterator
-    __del__ = lambda self : None;
-    def getExactTypeName(*args): return _Freestyle.Interface0DIterator_getExactTypeName(*args)
-    def getObject(*args): return _Freestyle.Interface0DIterator_getObject(*args)
-    def __deref__(*args): return _Freestyle.Interface0DIterator___deref__(*args)
-    def increment(*args): return _Freestyle.Interface0DIterator_increment(*args)
-    def decrement(*args): return _Freestyle.Interface0DIterator_decrement(*args)
-    def isBegin(*args): return _Freestyle.Interface0DIterator_isBegin(*args)
-    def isEnd(*args): return _Freestyle.Interface0DIterator_isEnd(*args)
-    def __eq__(*args): return _Freestyle.Interface0DIterator___eq__(*args)
-    def __ne__(*args): return _Freestyle.Interface0DIterator___ne__(*args)
-    def t(*args): return _Freestyle.Interface0DIterator_t(*args)
-    def u(*args): return _Freestyle.Interface0DIterator_u(*args)
-    def getX(*args): return _Freestyle.Interface0DIterator_getX(*args)
-    def getY(*args): return _Freestyle.Interface0DIterator_getY(*args)
-    def getZ(*args): return _Freestyle.Interface0DIterator_getZ(*args)
-    def getPoint3D(*args): return _Freestyle.Interface0DIterator_getPoint3D(*args)
-    def getProjectedX(*args): return _Freestyle.Interface0DIterator_getProjectedX(*args)
-    def getProjectedY(*args): return _Freestyle.Interface0DIterator_getProjectedY(*args)
-    def getProjectedZ(*args): return _Freestyle.Interface0DIterator_getProjectedZ(*args)
-    def getPoint2D(*args): return _Freestyle.Interface0DIterator_getPoint2D(*args)
-    def getFEdge(*args): return _Freestyle.Interface0DIterator_getFEdge(*args)
-    def getId(*args): return _Freestyle.Interface0DIterator_getId(*args)
-    def getNature(*args): return _Freestyle.Interface0DIterator_getNature(*args)
-    def castToSVertex(*args): return _Freestyle.Interface0DIterator_castToSVertex(*args)
-    def castToViewVertex(*args): return _Freestyle.Interface0DIterator_castToViewVertex(*args)
-    def castToNonTVertex(*args): return _Freestyle.Interface0DIterator_castToNonTVertex(*args)
-    def castToTVertex(*args): return _Freestyle.Interface0DIterator_castToTVertex(*args)
-Interface0DIterator_swigregister = _Freestyle.Interface0DIterator_swigregister
-Interface0DIterator_swigregister(Interface0DIterator)
-
-MEAN = _Freestyle.MEAN
-MIN = _Freestyle.MIN
-MAX = _Freestyle.MAX
-FIRST = _Freestyle.FIRST
-LAST = _Freestyle.LAST
-class Interface1D(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Interface1D, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, Interface1D, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_Interface1D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_Interface1D
-    __del__ = lambda self : None;
-    def getExactTypeName(*args): return _Freestyle.Interface1D_getExactTypeName(*args)
-    def verticesBegin(*args): return _Freestyle.Interface1D_verticesBegin(*args)
-    def verticesEnd(*args): return _Freestyle.Interface1D_verticesEnd(*args)
-    def pointsBegin(*args): return _Freestyle.Interface1D_pointsBegin(*args)
-    def pointsEnd(*args): return _Freestyle.Interface1D_pointsEnd(*args)
-    def getLength2D(*args): return _Freestyle.Interface1D_getLength2D(*args)
-    def getId(*args): return _Freestyle.Interface1D_getId(*args)
-    def getNature(*args): return _Freestyle.Interface1D_getNature(*args)
-    def getTimeStamp(*args): return _Freestyle.Interface1D_getTimeStamp(*args)
-    def setTimeStamp(*args): return _Freestyle.Interface1D_setTimeStamp(*args)
-Interface1D_swigregister = _Freestyle.Interface1D_swigregister
-Interface1D_swigregister(Interface1D)
-
-class SVertex(Interface0D):
-    __swig_setmethods__ = {}
-    for _s in [Interface0D]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, SVertex, name, value)
-    __swig_getmethods__ = {}
-    for _s in [Interface0D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, SVertex, name)
-    __repr__ = _swig_repr
-    def getExactTypeName(*args): return _Freestyle.SVertex_getExactTypeName(*args)
-    def getX(*args): return _Freestyle.SVertex_getX(*args)
-    def getY(*args): return _Freestyle.SVertex_getY(*args)
-    def getZ(*args): return _Freestyle.SVertex_getZ(*args)
-    def getPoint3D(*args): return _Freestyle.SVertex_getPoint3D(*args)
-    def getProjectedX(*args): return _Freestyle.SVertex_getProjectedX(*args)
-    def getProjectedY(*args): return _Freestyle.SVertex_getProjectedY(*args)
-    def getProjectedZ(*args): return _Freestyle.SVertex_getProjectedZ(*args)
-    def getPoint2D(*args): return _Freestyle.SVertex_getPoint2D(*args)
-    def getFEdge(*args): return _Freestyle.SVertex_getFEdge(*args)
-    def getId(*args): return _Freestyle.SVertex_getId(*args)
-    def getNature(*args): return _Freestyle.SVertex_getNature(*args)
-    def castToSVertex(*args): return _Freestyle.SVertex_castToSVertex(*args)
-    def castToViewVertex(*args): return _Freestyle.SVertex_castToViewVertex(*args)
-    def castToNonTVertex(*args): return _Freestyle.SVertex_castToNonTVertex(*args)
-    def castToTVertex(*args): return _Freestyle.SVertex_castToTVertex(*args)
-    __swig_setmethods__["userdata"] = _Freestyle.SVertex_userdata_set
-    __swig_getmethods__["userdata"] = _Freestyle.SVertex_userdata_get
-    if _newclass:userdata = _swig_property(_Freestyle.SVertex_userdata_get, _Freestyle.SVertex_userdata_set)
-    def __init__(self, *args): 
-        this = _Freestyle.new_SVertex(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_SVertex
-    __del__ = lambda self : None;
-    def duplicate(*args): return _Freestyle.SVertex_duplicate(*args)
-    def __eq__(*args): return _Freestyle.SVertex___eq__(*args)
-    def point3D(*args): return _Freestyle.SVertex_point3D(*args)
-    def point2D(*args): return _Freestyle.SVertex_point2D(*args)
-    def normals(*args): return _Freestyle.SVertex_normals(*args)
-    def normalsSize(*args): return _Freestyle.SVertex_normalsSize(*args)
-    def fedges(*args): return _Freestyle.SVertex_fedges(*args)
-    def fedges_begin(*args): return _Freestyle.SVertex_fedges_begin(*args)
-    def fedges_end(*args): return _Freestyle.SVertex_fedges_end(*args)
-    def z(*args): return _Freestyle.SVertex_z(*args)
-    def viewvertex(*args): return _Freestyle.SVertex_viewvertex(*args)
-    def setPoint3D(*args): return _Freestyle.SVertex_setPoint3D(*args)
-    def setPoint2D(*args): return _Freestyle.SVertex_setPoint2D(*args)
-    def AddNormal(*args): return _Freestyle.SVertex_AddNormal(*args)
-    def setCurvatureInfo(*args): return _Freestyle.SVertex_setCurvatureInfo(*args)
-    def getCurvatureInfo(*args): return _Freestyle.SVertex_getCurvatureInfo(*args)
-    def setCurvatureFredo(*args): return _Freestyle.SVertex_setCurvatureFredo(*args)
-    def setDirectionFredo(*args): return _Freestyle.SVertex_setDirectionFredo(*args)
-    def curvatureFredo(*args): return _Freestyle.SVertex_curvatureFredo(*args)
-    def directionFredo(*args): return _Freestyle.SVertex_directionFredo(*args)
-    def setId(*args): return _Freestyle.SVertex_setId(*args)
-    def setFEdges(*args): return _Freestyle.SVertex_setFEdges(*args)
-    def setShape(*args): return _Freestyle.SVertex_setShape(*args)
-    def setViewVertex(*args): return _Freestyle.SVertex_setViewVertex(*args)
-    def AddFEdge(*args): return _Freestyle.SVertex_AddFEdge(*args)
-    def Replace(*args): return _Freestyle.SVertex_Replace(*args)
-    def fedge(*args): return _Freestyle.SVertex_fedge(*args)
-    def point2d(*args): return _Freestyle.SVertex_point2d(*args)
-    def point3d(*args): return _Freestyle.SVertex_point3d(*args)
-    def normal(*args): return _Freestyle.SVertex_normal(*args)
-    def shape_id(*args): return _Freestyle.SVertex_shape_id(*args)
-    def shape(*args): return _Freestyle.SVertex_shape(*args)
-    def shape_importance(*args): return _Freestyle.SVertex_shape_importance(*args)
-    def qi(*args): return _Freestyle.SVertex_qi(*args)
-    def occluders_begin(*args): return _Freestyle.SVertex_occluders_begin(*args)
-    def occluders_end(*args): return _Freestyle.SVertex_occluders_end(*args)
-    def occluders_empty(*args): return _Freestyle.SVertex_occluders_empty(*args)
-    def occluders_size(*args): return _Freestyle.SVertex_occluders_size(*args)
-    def occludee(*args): return _Freestyle.SVertex_occludee(*args)
-    def occluded_shape(*args): return _Freestyle.SVertex_occluded_shape(*args)
-    def occludee_empty(*args): return _Freestyle.SVertex_occludee_empty(*args)
-    def z_discontinuity(*args): return _Freestyle.SVertex_z_discontinuity(*args)
-SVertex_swigregister = _Freestyle.SVertex_swigregister
-SVertex_swigregister(SVertex)
-integrateUnsigned = _Freestyle.integrateUnsigned
-integrateFloat = _Freestyle.integrateFloat
-integrateDouble = _Freestyle.integrateDouble
-
-class FEdge(Interface1D):
-    __swig_setmethods__ = {}
-    for _s in [Interface1D]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FEdge, name, value)
-    __swig_getmethods__ = {}
-    for _s in [Interface1D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FEdge, name)
-    __repr__ = _swig_repr
-    def getExactTypeName(*args): return _Freestyle.FEdge_getExactTypeName(*args)
-    def getLength2D(*args): return _Freestyle.FEdge_getLength2D(*args)
-    def getId(*args): return _Freestyle.FEdge_getId(*args)
-    __swig_setmethods__["userdata"] = _Freestyle.FEdge_userdata_set
-    __swig_getmethods__["userdata"] = _Freestyle.FEdge_userdata_get
-    if _newclass:userdata = _swig_property(_Freestyle.FEdge_userdata_get, _Freestyle.FEdge_userdata_set)
-    def __init__(self, *args): 
-        this = _Freestyle.new_FEdge(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_FEdge
-    __del__ = lambda self : None;
-    def duplicate(*args): return _Freestyle.FEdge_duplicate(*args)
-    def vertexA(*args): return _Freestyle.FEdge_vertexA(*args)
-    def vertexB(*args): return _Freestyle.FEdge_vertexB(*args)
-    def getNature(*args): return _Freestyle.FEdge_getNature(*args)
-    def nextEdge(*args): return _Freestyle.FEdge_nextEdge(*args)
-    def previousEdge(*args): return _Freestyle.FEdge_previousEdge(*args)
-    def invisibility(*args): return _Freestyle.FEdge_invisibility(*args)
-    def viewedge(*args): return _Freestyle.FEdge_viewedge(*args)
-    def center3d(*args): return _Freestyle.FEdge_center3d(*args)
-    def center2d(*args): return _Freestyle.FEdge_center2d(*args)
-    def aFace(*args): return _Freestyle.FEdge_aFace(*args)
-    def getOccludeeIntersection(*args): return _Freestyle.FEdge_getOccludeeIntersection(*args)
-    def getOccludeeEmpty(*args): return _Freestyle.FEdge_getOccludeeEmpty(*args)
-    def isSmooth(*args): return _Freestyle.FEdge_isSmooth(*args)
-    def setVertexA(*args): return _Freestyle.FEdge_setVertexA(*args)
-    def setVertexB(*args): return _Freestyle.FEdge_setVertexB(*args)
-    def setId(*args): return _Freestyle.FEdge_setId(*args)
-    def setNextEdge(*args): return _Freestyle.FEdge_setNextEdge(*args)
-    def setPreviousEdge(*args): return _Freestyle.FEdge_setPreviousEdge(*args)
-    def setNature(*args): return _Freestyle.FEdge_setNature(*args)
-    def setViewEdge(*args): return _Freestyle.FEdge_setViewEdge(*args)
-    def setaFace(*args): return _Freestyle.FEdge_setaFace(*args)
-    def setOccludeeIntersection(*args): return _Freestyle.FEdge_setOccludeeIntersection(*args)
-    def setOccludeeEmpty(*args): return _Freestyle.FEdge_setOccludeeEmpty(*args)
-    def setSmooth(*args): return _Freestyle.FEdge_setSmooth(*args)
-    __swig_getmethods__["CommonVertex"] = lambda x: _Freestyle.FEdge_CommonVertex
-    if _newclass:CommonVertex = staticmethod(_Freestyle.FEdge_CommonVertex)
-    def min2d(*args): return _Freestyle.FEdge_min2d(*args)
-    def max2d(*args): return _Freestyle.FEdge_max2d(*args)
-    def shape_id(*args): return _Freestyle.FEdge_shape_id(*args)
-    def shape(*args): return _Freestyle.FEdge_shape(*args)
-    def shape_importance(*args): return _Freestyle.FEdge_shape_importance(*args)
-    def qi(*args): return _Freestyle.FEdge_qi(*args)
-    def occluders_begin(*args): return _Freestyle.FEdge_occluders_begin(*args)
-    def occluders_end(*args): return _Freestyle.FEdge_occluders_end(*args)
-    def occluders_empty(*args): return _Freestyle.FEdge_occluders_empty(*args)
-    def occluders_size(*args): return _Freestyle.FEdge_occluders_size(*args)
-    def occludee(*args): return _Freestyle.FEdge_occludee(*args)
-    def occluded_shape(*args): return _Freestyle.FEdge_occluded_shape(*args)
-    def occludee_empty(*args): return _Freestyle.FEdge_occludee_empty(*args)
-    def z_discontinuity(*args): return _Freestyle.FEdge_z_discontinuity(*args)
-    def viewedge_nature(*args): return _Freestyle.FEdge_viewedge_nature(*args)
-    def orientation2d(*args): return _Freestyle.FEdge_orientation2d(*args)
-    def orientation3d(*args): return _Freestyle.FEdge_orientation3d(*args)
-    def verticesBegin(*args): return _Freestyle.FEdge_verticesBegin(*args)
-    def verticesEnd(*args): return _Freestyle.FEdge_verticesEnd(*args)
-    def pointsBegin(*args): return _Freestyle.FEdge_pointsBegin(*args)
-    def pointsEnd(*args): return _Freestyle.FEdge_pointsEnd(*args)
-FEdge_swigregister = _Freestyle.FEdge_swigregister
-FEdge_swigregister(FEdge)
-FEdge_CommonVertex = _Freestyle.FEdge_CommonVertex
-
-class FEdgeSVertexIterator(Interface0DIteratorNested):
-    __swig_setmethods__ = {}
-    for _s in [Interface0DIteratorNested]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FEdgeSVertexIterator, name, value)
-    __swig_getmethods__ = {}
-    for _s in [Interface0DIteratorNested]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FEdgeSVertexIterator, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_FEdgeSVertexIterator(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def getExactTypeName(*args): return _Freestyle.FEdgeSVertexIterator_getExactTypeName(*args)
-    def getObject(*args): return _Freestyle.FEdgeSVertexIterator_getObject(*args)
-    def __deref__(*args): return _Freestyle.FEdgeSVertexIterator___deref__(*args)
-    def increment(*args): return _Freestyle.FEdgeSVertexIterator_increment(*args)
-    def decrement(*args): return _Freestyle.FEdgeSVertexIterator_decrement(*args)
-    def isBegin(*args): return _Freestyle.FEdgeSVertexIterator_isBegin(*args)
-    def isEnd(*args): return _Freestyle.FEdgeSVertexIterator_isEnd(*args)
-    def __eq__(*args): return _Freestyle.FEdgeSVertexIterator___eq__(*args)
-    def t(*args): return _Freestyle.FEdgeSVertexIterator_t(*args)
-    def u(*args): return _Freestyle.FEdgeSVertexIterator_u(*args)
-    def copy(*args): return _Freestyle.FEdgeSVertexIterator_copy(*args)
-    __swig_destroy__ = _Freestyle.delete_FEdgeSVertexIterator
-    __del__ = lambda self : None;
-    def getX(*args): return _Freestyle.FEdgeSVertexIterator_getX(*args)
-    def getY(*args): return _Freestyle.FEdgeSVertexIterator_getY(*args)
-    def getZ(*args): return _Freestyle.FEdgeSVertexIterator_getZ(*args)
-    def getPoint3D(*args): return _Freestyle.FEdgeSVertexIterator_getPoint3D(*args)
-    def getProjectedX(*args): return _Freestyle.FEdgeSVertexIterator_getProjectedX(*args)
-    def getProjectedY(*args): return _Freestyle.FEdgeSVertexIterator_getProjectedY(*args)
-    def getProjectedZ(*args): return _Freestyle.FEdgeSVertexIterator_getProjectedZ(*args)
-    def getPoint2D(*args): return _Freestyle.FEdgeSVertexIterator_getPoint2D(*args)
-    def getFEdge(*args): return _Freestyle.FEdgeSVertexIterator_getFEdge(*args)
-    def getId(*args): return _Freestyle.FEdgeSVertexIterator_getId(*args)
-    def getNature(*args): return _Freestyle.FEdgeSVertexIterator_getNature(*args)
-    def castToSVertex(*args): return _Freestyle.FEdgeSVertexIterator_castToSVertex(*args)
-    def castToViewVertex(*args): return _Freestyle.FEdgeSVertexIterator_castToViewVertex(*args)
-    def castToNonTVertex(*args): return _Freestyle.FEdgeSVertexIterator_castToNonTVertex(*args)
-    def castToTVertex(*args): return _Freestyle.FEdgeSVertexIterator_castToTVertex(*args)
-    __swig_setmethods__["userdata"] = _Freestyle.FEdgeSVertexIterator_userdata_set
-    __swig_getmethods__["userdata"] = _Freestyle.FEdgeSVertexIterator_userdata_get
-    if _newclass:userdata = _swig_property(_Freestyle.FEdgeSVertexIterator_userdata_get, _Freestyle.FEdgeSVertexIterator_userdata_set)
-    def duplicate(*args): return _Freestyle.FEdgeSVertexIterator_duplicate(*args)
-    def point3D(*args): return _Freestyle.FEdgeSVertexIterator_point3D(*args)
-    def point2D(*args): return _Freestyle.FEdgeSVertexIterator_point2D(*args)
-    def normals(*args): return _Freestyle.FEdgeSVertexIterator_normals(*args)
-    def normalsSize(*args): return _Freestyle.FEdgeSVertexIterator_normalsSize(*args)
-    def fedges(*args): return _Freestyle.FEdgeSVertexIterator_fedges(*args)
-    def fedges_begin(*args): return _Freestyle.FEdgeSVertexIterator_fedges_begin(*args)
-    def fedges_end(*args): return _Freestyle.FEdgeSVertexIterator_fedges_end(*args)
-    def shape(*args): return _Freestyle.FEdgeSVertexIterator_shape(*args)
-    def z(*args): return _Freestyle.FEdgeSVertexIterator_z(*args)
-    def viewvertex(*args): return _Freestyle.FEdgeSVertexIterator_viewvertex(*args)
-    def setPoint3D(*args): return _Freestyle.FEdgeSVertexIterator_setPoint3D(*args)
-    def setPoint2D(*args): return _Freestyle.FEdgeSVertexIterator_setPoint2D(*args)
-    def AddNormal(*args): return _Freestyle.FEdgeSVertexIterator_AddNormal(*args)
-    def setCurvatureInfo(*args): return _Freestyle.FEdgeSVertexIterator_setCurvatureInfo(*args)
-    def getCurvatureInfo(*args): return _Freestyle.FEdgeSVertexIterator_getCurvatureInfo(*args)
-    def setCurvatureFredo(*args): return _Freestyle.FEdgeSVertexIterator_setCurvatureFredo(*args)
-    def setDirectionFredo(*args): return _Freestyle.FEdgeSVertexIterator_setDirectionFredo(*args)
-    def curvatureFredo(*args): return _Freestyle.FEdgeSVertexIterator_curvatureFredo(*args)
-    def directionFredo(*args): return _Freestyle.FEdgeSVertexIterator_directionFredo(*args)
-    def setId(*args): return _Freestyle.FEdgeSVertexIterator_setId(*args)
-    def setFEdges(*args): return _Freestyle.FEdgeSVertexIterator_setFEdges(*args)
-    def setShape(*args): return _Freestyle.FEdgeSVertexIterator_setShape(*args)
-    def setViewVertex(*args): return _Freestyle.FEdgeSVertexIterator_setViewVertex(*args)
-    def AddFEdge(*args): return _Freestyle.FEdgeSVertexIterator_AddFEdge(*args)
-    def Replace(*args): return _Freestyle.FEdgeSVertexIterator_Replace(*args)
-    def fedge(*args): return _Freestyle.FEdgeSVertexIterator_fedge(*args)
-    def point2d(*args): return _Freestyle.FEdgeSVertexIterator_point2d(*args)
-    def point3d(*args): return _Freestyle.FEdgeSVertexIterator_point3d(*args)
-    def normal(*args): return _Freestyle.FEdgeSVertexIterator_normal(*args)
-    def shape_id(*args): return _Freestyle.FEdgeSVertexIterator_shape_id(*args)
-    def shape_importance(*args): return _Freestyle.FEdgeSVertexIterator_shape_importance(*args)
-    def qi(*args): return _Freestyle.FEdgeSVertexIterator_qi(*args)
-    def occluders_begin(*args): return _Freestyle.FEdgeSVertexIterator_occluders_begin(*args)
-    def occluders_end(*args): return _Freestyle.FEdgeSVertexIterator_occluders_end(*args)
-    def occluders_empty(*args): return _Freestyle.FEdgeSVertexIterator_occluders_empty(*args)
-    def occluders_size(*args): return _Freestyle.FEdgeSVertexIterator_occluders_size(*args)
-    def occludee(*args): return _Freestyle.FEdgeSVertexIterator_occludee(*args)
-    def occluded_shape(*args): return _Freestyle.FEdgeSVertexIterator_occluded_shape(*args)
-    def occludee_empty(*args): return _Freestyle.FEdgeSVertexIterator_occludee_empty(*args)
-    def z_discontinuity(*args): return _Freestyle.FEdgeSVertexIterator_z_discontinuity(*args)
-FEdgeSVertexIterator_swigregister = _Freestyle.FEdgeSVertexIterator_swigregister
-FEdgeSVertexIterator_swigregister(FEdgeSVertexIterator)
-
-class FEdgeSharp(FEdge):
-    __swig_setmethods__ = {}
-    for _s in [FEdge]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FEdgeSharp, name, value)
-    __swig_getmethods__ = {}
-    for _s in [FEdge]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FEdgeSharp, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_FEdgeSharp(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_FEdgeSharp
-    __del__ = lambda self : None;
-    def duplicate(*args): return _Freestyle.FEdgeSharp_duplicate(*args)
-    def normalA(*args): return _Freestyle.FEdgeSharp_normalA(*args)
-    def normalB(*args): return _Freestyle.FEdgeSharp_normalB(*args)
-    def aMaterialIndex(*args): return _Freestyle.FEdgeSharp_aMaterialIndex(*args)
-    def aMaterial(*args): return _Freestyle.FEdgeSharp_aMaterial(*args)
-    def bMaterialIndex(*args): return _Freestyle.FEdgeSharp_bMaterialIndex(*args)
-    def bMaterial(*args): return _Freestyle.FEdgeSharp_bMaterial(*args)
-    def setNormalA(*args): return _Freestyle.FEdgeSharp_setNormalA(*args)
-    def setNormalB(*args): return _Freestyle.FEdgeSharp_setNormalB(*args)
-    def setaMaterialIndex(*args): return _Freestyle.FEdgeSharp_setaMaterialIndex(*args)
-    def setbMaterialIndex(*args): return _Freestyle.FEdgeSharp_setbMaterialIndex(*args)
-FEdgeSharp_swigregister = _Freestyle.FEdgeSharp_swigregister
-FEdgeSharp_swigregister(FEdgeSharp)
-
-class FEdgeSmooth(FEdge):
-    __swig_setmethods__ = {}
-    for _s in [FEdge]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FEdgeSmooth, name, value)
-    __swig_getmethods__ = {}
-    for _s in [FEdge]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FEdgeSmooth, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_FEdgeSmooth(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_FEdgeSmooth
-    __del__ = lambda self : None;
-    def duplicate(*args): return _Freestyle.FEdgeSmooth_duplicate(*args)
-    def face(*args): return _Freestyle.FEdgeSmooth_face(*args)
-    def normal(*args): return _Freestyle.FEdgeSmooth_normal(*args)
-    def materialIndex(*args): return _Freestyle.FEdgeSmooth_materialIndex(*args)
-    def material(*args): return _Freestyle.FEdgeSmooth_material(*args)
-    def setFace(*args): return _Freestyle.FEdgeSmooth_setFace(*args)
-    def setNormal(*args): return _Freestyle.FEdgeSmooth_setNormal(*args)
-    def setMaterialIndex(*args): return _Freestyle.FEdgeSmooth_setMaterialIndex(*args)
-FEdgeSmooth_swigregister = _Freestyle.FEdgeSmooth_swigregister
-FEdgeSmooth_swigregister(FEdgeSmooth)
-
-class SShape(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, SShape, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, SShape, name)
-    __repr__ = _swig_repr
-    __swig_setmethods__["userdata"] = _Freestyle.SShape_userdata_set
-    __swig_getmethods__["userdata"] = _Freestyle.SShape_userdata_get
-    if _newclass:userdata = _swig_property(_Freestyle.SShape_userdata_get, _Freestyle.SShape_userdata_set)
-    def __init__(self, *args): 
-        this = _Freestyle.new_SShape(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def duplicate(*args): return _Freestyle.SShape_duplicate(*args)
-    __swig_destroy__ = _Freestyle.delete_SShape
-    __del__ = lambda self : None;
-    def AddEdge(*args): return _Freestyle.SShape_AddEdge(*args)
-    def AddNewVertex(*args): return _Freestyle.SShape_AddNewVertex(*args)
-    def AddChain(*args): return _Freestyle.SShape_AddChain(*args)
-    def CreateSVertex(*args): return _Freestyle.SShape_CreateSVertex(*args)
-    def SplitEdge(*args): return _Freestyle.SShape_SplitEdge(*args)
-    def SplitEdgeIn2(*args): return _Freestyle.SShape_SplitEdgeIn2(*args)
-    def setBBox(*args): return _Freestyle.SShape_setBBox(*args)
-    def ComputeBBox(*args): return _Freestyle.SShape_ComputeBBox(*args)
-    def RemoveEdgeFromChain(*args): return _Freestyle.SShape_RemoveEdgeFromChain(*args)
-    def RemoveEdge(*args): return _Freestyle.SShape_RemoveEdge(*args)
-    def getVertexList(*args): return _Freestyle.SShape_getVertexList(*args)
-    def getEdgeList(*args): return _Freestyle.SShape_getEdgeList(*args)
-    def getChains(*args): return _Freestyle.SShape_getChains(*args)
-    def bbox(*args): return _Freestyle.SShape_bbox(*args)
-    def material(*args): return _Freestyle.SShape_material(*args)
-    def materials(*args): return _Freestyle.SShape_materials(*args)
-    def viewShape(*args): return _Freestyle.SShape_viewShape(*args)
-    def importance(*args): return _Freestyle.SShape_importance(*args)
-    def getId(*args): return _Freestyle.SShape_getId(*args)
-    def setId(*args): return _Freestyle.SShape_setId(*args)
-    def setMaterials(*args): return _Freestyle.SShape_setMaterials(*args)
-    def setViewShape(*args): return _Freestyle.SShape_setViewShape(*args)
-    def setImportance(*args): return _Freestyle.SShape_setImportance(*args)
-SShape_swigregister = _Freestyle.SShape_swigregister
-SShape_swigregister(SShape)
-
-class ViewShapesContainer(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ViewShapesContainer, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, ViewShapesContainer, name)
-    __repr__ = _swig_repr
-    def iterator(*args): return _Freestyle.ViewShapesContainer_iterator(*args)
-    def __iter__(self): return self.iterator()
-    def __nonzero__(*args): return _Freestyle.ViewShapesContainer___nonzero__(*args)
-    def __len__(*args): return _Freestyle.ViewShapesContainer___len__(*args)
-    def pop(*args): return _Freestyle.ViewShapesContainer_pop(*args)
-    def __getslice__(*args): return _Freestyle.ViewShapesContainer___getslice__(*args)
-    def __setslice__(*args): return _Freestyle.ViewShapesContainer___setslice__(*args)
-    def __delslice__(*args): return _Freestyle.ViewShapesContainer___delslice__(*args)
-    def __delitem__(*args): return _Freestyle.ViewShapesContainer___delitem__(*args)
-    def __getitem__(*args): return _Freestyle.ViewShapesContainer___getitem__(*args)
-    def __setitem__(*args): return _Freestyle.ViewShapesContainer___setitem__(*args)
-    def append(*args): return _Freestyle.ViewShapesContainer_append(*args)
-    def empty(*args): return _Freestyle.ViewShapesContainer_empty(*args)
-    def size(*args): return _Freestyle.ViewShapesContainer_size(*args)
-    def clear(*args): return _Freestyle.ViewShapesContainer_clear(*args)
-    def swap(*args): return _Freestyle.ViewShapesContainer_swap(*args)
-    def get_allocator(*args): return _Freestyle.ViewShapesContainer_get_allocator(*args)
-    def begin(*args): return _Freestyle.ViewShapesContainer_begin(*args)
-    def end(*args): return _Freestyle.ViewShapesContainer_end(*args)
-    def rbegin(*args): return _Freestyle.ViewShapesContainer_rbegin(*args)
-    def rend(*args): return _Freestyle.ViewShapesContainer_rend(*args)
-    def pop_back(*args): return _Freestyle.ViewShapesContainer_pop_back(*args)
-    def erase(*args): return _Freestyle.ViewShapesContainer_erase(*args)
-    def __init__(self, *args): 
-        this = _Freestyle.new_ViewShapesContainer(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def push_back(*args): return _Freestyle.ViewShapesContainer_push_back(*args)
-    def front(*args): return _Freestyle.ViewShapesContainer_front(*args)
-    def back(*args): return _Freestyle.ViewShapesContainer_back(*args)
-    def assign(*args): return _Freestyle.ViewShapesContainer_assign(*args)
-    def resize(*args): return _Freestyle.ViewShapesContainer_resize(*args)
-    def insert(*args): return _Freestyle.ViewShapesContainer_insert(*args)
-    def reserve(*args): return _Freestyle.ViewShapesContainer_reserve(*args)
-    def capacity(*args): return _Freestyle.ViewShapesContainer_capacity(*args)
-    __swig_destroy__ = _Freestyle.delete_ViewShapesContainer
-    __del__ = lambda self : None;
-ViewShapesContainer_swigregister = _Freestyle.ViewShapesContainer_swigregister
-ViewShapesContainer_swigregister(ViewShapesContainer)
-
-class ViewEdgesContainer(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ViewEdgesContainer, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, ViewEdgesContainer, name)
-    __repr__ = _swig_repr
-    def iterator(*args): return _Freestyle.ViewEdgesContainer_iterator(*args)
-    def __iter__(self): return self.iterator()
-    def __nonzero__(*args): return _Freestyle.ViewEdgesContainer___nonzero__(*args)
-    def __len__(*args): return _Freestyle.ViewEdgesContainer___len__(*args)
-    def pop(*args): return _Freestyle.ViewEdgesContainer_pop(*args)
-    def __getslice__(*args): return _Freestyle.ViewEdgesContainer___getslice__(*args)
-    def __setslice__(*args): return _Freestyle.ViewEdgesContainer___setslice__(*args)
-    def __delslice__(*args): return _Freestyle.ViewEdgesContainer___delslice__(*args)
-    def __delitem__(*args): return _Freestyle.ViewEdgesContainer___delitem__(*args)
-    def __getitem__(*args): return _Freestyle.ViewEdgesContainer___getitem__(*args)
-    def __setitem__(*args): return _Freestyle.ViewEdgesContainer___setitem__(*args)
-    def append(*args): return _Freestyle.ViewEdgesContainer_append(*args)
-    def empty(*args): return _Freestyle.ViewEdgesContainer_empty(*args)
-    def size(*args): return _Freestyle.ViewEdgesContainer_size(*args)
-    def clear(*args): return _Freestyle.ViewEdgesContainer_clear(*args)
-    def swap(*args): return _Freestyle.ViewEdgesContainer_swap(*args)
-    def get_allocator(*args): return _Freestyle.ViewEdgesContainer_get_allocator(*args)
-    def begin(*args): return _Freestyle.ViewEdgesContainer_begin(*args)
-    def end(*args): return _Freestyle.ViewEdgesContainer_end(*args)
-    def rbegin(*args): return _Freestyle.ViewEdgesContainer_rbegin(*args)
-    def rend(*args): return _Freestyle.ViewEdgesContainer_rend(*args)
-    def pop_back(*args): return _Freestyle.ViewEdgesContainer_pop_back(*args)
-    def erase(*args): return _Freestyle.ViewEdgesContainer_erase(*args)
-    def __init__(self, *args): 
-        this = _Freestyle.new_ViewEdgesContainer(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def push_back(*args): return _Freestyle.ViewEdgesContainer_push_back(*args)
-    def front(*args): return _Freestyle.ViewEdgesContainer_front(*args)
-    def back(*args): return _Freestyle.ViewEdgesContainer_back(*args)
-    def assign(*args): return _Freestyle.ViewEdgesContainer_assign(*args)
-    def resize(*args): return _Freestyle.ViewEdgesContainer_resize(*args)
-    def insert(*args): return _Freestyle.ViewEdgesContainer_insert(*args)
-    def reserve(*args): return _Freestyle.ViewEdgesContainer_reserve(*args)
-    def capacity(*args): return _Freestyle.ViewEdgesContainer_capacity(*args)
-    __swig_destroy__ = _Freestyle.delete_ViewEdgesContainer
-    __del__ = lambda self : None;
-ViewEdgesContainer_swigregister = _Freestyle.ViewEdgesContainer_swigregister
-ViewEdgesContainer_swigregister(ViewEdgesContainer)
-
-class FEdgesContainer(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FEdgesContainer, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, FEdgesContainer, name)
-    __repr__ = _swig_repr
-    def iterator(*args): return _Freestyle.FEdgesContainer_iterator(*args)
-    def __iter__(self): return self.iterator()
-    def __nonzero__(*args): return _Freestyle.FEdgesContainer___nonzero__(*args)
-    def __len__(*args): return _Freestyle.FEdgesContainer___len__(*args)
-    def pop(*args): return _Freestyle.FEdgesContainer_pop(*args)
-    def __getslice__(*args): return _Freestyle.FEdgesContainer___getslice__(*args)
-    def __setslice__(*args): return _Freestyle.FEdgesContainer___setslice__(*args)
-    def __delslice__(*args): return _Freestyle.FEdgesContainer___delslice__(*args)
-    def __delitem__(*args): return _Freestyle.FEdgesContainer___delitem__(*args)
-    def __getitem__(*args): return _Freestyle.FEdgesContainer___getitem__(*args)
-    def __setitem__(*args): return _Freestyle.FEdgesContainer___setitem__(*args)
-    def append(*args): return _Freestyle.FEdgesContainer_append(*args)
-    def empty(*args): return _Freestyle.FEdgesContainer_empty(*args)
-    def size(*args): return _Freestyle.FEdgesContainer_size(*args)
-    def clear(*args): return _Freestyle.FEdgesContainer_clear(*args)
-    def swap(*args): return _Freestyle.FEdgesContainer_swap(*args)
-    def get_allocator(*args): return _Freestyle.FEdgesContainer_get_allocator(*args)
-    def begin(*args): return _Freestyle.FEdgesContainer_begin(*args)
-    def end(*args): return _Freestyle.FEdgesContainer_end(*args)
-    def rbegin(*args): return _Freestyle.FEdgesContainer_rbegin(*args)
-    def rend(*args): return _Freestyle.FEdgesContainer_rend(*args)
-    def pop_back(*args): return _Freestyle.FEdgesContainer_pop_back(*args)
-    def erase(*args): return _Freestyle.FEdgesContainer_erase(*args)
-    def __init__(self, *args): 
-        this = _Freestyle.new_FEdgesContainer(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def push_back(*args): return _Freestyle.FEdgesContainer_push_back(*args)
-    def front(*args): return _Freestyle.FEdgesContainer_front(*args)
-    def back(*args): return _Freestyle.FEdgesContainer_back(*args)
-    def assign(*args): return _Freestyle.FEdgesContainer_assign(*args)
-    def resize(*args): return _Freestyle.FEdgesContainer_resize(*args)
-    def insert(*args): return _Freestyle.FEdgesContainer_insert(*args)
-    def reserve(*args): return _Freestyle.FEdgesContainer_reserve(*args)
-    def capacity(*args): return _Freestyle.FEdgesContainer_capacity(*args)
-    __swig_destroy__ = _Freestyle.delete_FEdgesContainer
-    __del__ = lambda self : None;
-FEdgesContainer_swigregister = _Freestyle.FEdgesContainer_swigregister
-FEdgesContainer_swigregister(FEdgesContainer)
-
-class ViewVerticesContainer(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ViewVerticesContainer, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, ViewVerticesContainer, name)
-    __repr__ = _swig_repr
-    def iterator(*args): return _Freestyle.ViewVerticesContainer_iterator(*args)
-    def __iter__(self): return self.iterator()
-    def __nonzero__(*args): return _Freestyle.ViewVerticesContainer___nonzero__(*args)
-    def __len__(*args): return _Freestyle.ViewVerticesContainer___len__(*args)
-    def pop(*args): return _Freestyle.ViewVerticesContainer_pop(*args)
-    def __getslice__(*args): return _Freestyle.ViewVerticesContainer___getslice__(*args)
-    def __setslice__(*args): return _Freestyle.ViewVerticesContainer___setslice__(*args)
-    def __delslice__(*args): return _Freestyle.ViewVerticesContainer___delslice__(*args)
-    def __delitem__(*args): return _Freestyle.ViewVerticesContainer___delitem__(*args)
-    def __getitem__(*args): return _Freestyle.ViewVerticesContainer___getitem__(*args)
-    def __setitem__(*args): return _Freestyle.ViewVerticesContainer___setitem__(*args)
-    def append(*args): return _Freestyle.ViewVerticesContainer_append(*args)
-    def empty(*args): return _Freestyle.ViewVerticesContainer_empty(*args)
-    def size(*args): return _Freestyle.ViewVerticesContainer_size(*args)
-    def clear(*args): return _Freestyle.ViewVerticesContainer_clear(*args)
-    def swap(*args): return _Freestyle.ViewVerticesContainer_swap(*args)
-    def get_allocator(*args): return _Freestyle.ViewVerticesContainer_get_allocator(*args)
-    def begin(*args): return _Freestyle.ViewVerticesContainer_begin(*args)
-    def end(*args): return _Freestyle.ViewVerticesContainer_end(*args)
-    def rbegin(*args): return _Freestyle.ViewVerticesContainer_rbegin(*args)
-    def rend(*args): return _Freestyle.ViewVerticesContainer_rend(*args)
-    def pop_back(*args): return _Freestyle.ViewVerticesContainer_pop_back(*args)
-    def erase(*args): return _Freestyle.ViewVerticesContainer_erase(*args)
-    def __init__(self, *args): 
-        this = _Freestyle.new_ViewVerticesContainer(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def push_back(*args): return _Freestyle.ViewVerticesContainer_push_back(*args)
-    def front(*args): return _Freestyle.ViewVerticesContainer_front(*args)
-    def back(*args): return _Freestyle.ViewVerticesContainer_back(*args)
-    def assign(*args): return _Freestyle.ViewVerticesContainer_assign(*args)
-    def resize(*args): return _Freestyle.ViewVerticesContainer_resize(*args)
-    def insert(*args): return _Freestyle.ViewVerticesContainer_insert(*args)
-    def reserve(*args): return _Freestyle.ViewVerticesContainer_reserve(*args)
-    def capacity(*args): return _Freestyle.ViewVerticesContainer_capacity(*args)
-    __swig_destroy__ = _Freestyle.delete_ViewVerticesContainer
-    __del__ = lambda self : None;
-ViewVerticesContainer_swigregister = _Freestyle.ViewVerticesContainer_swigregister
-ViewVerticesContainer_swigregister(ViewVerticesContainer)
-
-class SVerticesContainer(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, SVerticesContainer, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, SVerticesContainer, name)
-    __repr__ = _swig_repr
-    def iterator(*args): return _Freestyle.SVerticesContainer_iterator(*args)
-    def __iter__(self): return self.iterator()
-    def __nonzero__(*args): return _Freestyle.SVerticesContainer___nonzero__(*args)
-    def __len__(*args): return _Freestyle.SVerticesContainer___len__(*args)
-    def pop(*args): return _Freestyle.SVerticesContainer_pop(*args)
-    def __getslice__(*args): return _Freestyle.SVerticesContainer___getslice__(*args)
-    def __setslice__(*args): return _Freestyle.SVerticesContainer___setslice__(*args)
-    def __delslice__(*args): return _Freestyle.SVerticesContainer___delslice__(*args)
-    def __delitem__(*args): return _Freestyle.SVerticesContainer___delitem__(*args)
-    def __getitem__(*args): return _Freestyle.SVerticesContainer___getitem__(*args)
-    def __setitem__(*args): return _Freestyle.SVerticesContainer___setitem__(*args)
-    def append(*args): return _Freestyle.SVerticesContainer_append(*args)
-    def empty(*args): return _Freestyle.SVerticesContainer_empty(*args)
-    def size(*args): return _Freestyle.SVerticesContainer_size(*args)
-    def clear(*args): return _Freestyle.SVerticesContainer_clear(*args)
-    def swap(*args): return _Freestyle.SVerticesContainer_swap(*args)
-    def get_allocator(*args): return _Freestyle.SVerticesContainer_get_allocator(*args)
-    def begin(*args): return _Freestyle.SVerticesContainer_begin(*args)
-    def end(*args): return _Freestyle.SVerticesContainer_end(*args)
-    def rbegin(*args): return _Freestyle.SVerticesContainer_rbegin(*args)
-    def rend(*args): return _Freestyle.SVerticesContainer_rend(*args)
-    def pop_back(*args): return _Freestyle.SVerticesContainer_pop_back(*args)
-    def erase(*args): return _Freestyle.SVerticesContainer_erase(*args)
-    def __init__(self, *args): 
-        this = _Freestyle.new_SVerticesContainer(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def push_back(*args): return _Freestyle.SVerticesContainer_push_back(*args)
-    def front(*args): return _Freestyle.SVerticesContainer_front(*args)
-    def back(*args): return _Freestyle.SVerticesContainer_back(*args)
-    def assign(*args): return _Freestyle.SVerticesContainer_assign(*args)
-    def resize(*args): return _Freestyle.SVerticesContainer_resize(*args)
-    def insert(*args): return _Freestyle.SVerticesContainer_insert(*args)
-    def reserve(*args): return _Freestyle.SVerticesContainer_reserve(*args)
-    def capacity(*args): return _Freestyle.SVerticesContainer_capacity(*args)
-    __swig_destroy__ = _Freestyle.delete_SVerticesContainer
-    __del__ = lambda self : None;
-SVerticesContainer_swigregister = _Freestyle.SVerticesContainer_swigregister
-SVerticesContainer_swigregister(SVerticesContainer)
-
-class ViewMap(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ViewMap, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, ViewMap, name)
-    __repr__ = _swig_repr
-    __swig_setmethods__["userdata"] = _Freestyle.ViewMap_userdata_set
-    __swig_getmethods__["userdata"] = _Freestyle.ViewMap_userdata_get
-    if _newclass:userdata = _swig_property(_Freestyle.ViewMap_userdata_get, _Freestyle.ViewMap_userdata_set)
-    def __init__(self, *args): 
-        this = _Freestyle.new_ViewMap(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_ViewMap
-    __del__ = lambda self : None;
-    def getClosestViewEdge(*args): return _Freestyle.ViewMap_getClosestViewEdge(*args)
-    def getClosestFEdge(*args): return _Freestyle.ViewMap_getClosestFEdge(*args)
-    __swig_getmethods__["getInstance"] = lambda x: _Freestyle.ViewMap_getInstance
-    if _newclass:getInstance = staticmethod(_Freestyle.ViewMap_getInstance)
-    def ViewShapes(*args): return _Freestyle.ViewMap_ViewShapes(*args)
-    def ViewEdges(*args): return _Freestyle.ViewMap_ViewEdges(*args)
-    def ViewVertices(*args): return _Freestyle.ViewMap_ViewVertices(*args)
-    def FEdges(*args): return _Freestyle.ViewMap_FEdges(*args)
-    def SVertices(*args): return _Freestyle.ViewMap_SVertices(*args)
-    def viewedges_begin(*args): return _Freestyle.ViewMap_viewedges_begin(*args)
-    def viewedges_end(*args): return _Freestyle.ViewMap_viewedges_end(*args)
-    def viewedges_size(*args): return _Freestyle.ViewMap_viewedges_size(*args)
-    def viewShape(*args): return _Freestyle.ViewMap_viewShape(*args)
-    def shapeIdToIndexMap(*args): return _Freestyle.ViewMap_shapeIdToIndexMap(*args)
-    def getScene3dBBox(*args): return _Freestyle.ViewMap_getScene3dBBox(*args)
-    def AddViewShape(*args): return _Freestyle.ViewMap_AddViewShape(*args)
-    def AddViewEdge(*args): return _Freestyle.ViewMap_AddViewEdge(*args)
-    def AddViewVertex(*args): return _Freestyle.ViewMap_AddViewVertex(*args)
-    def AddFEdge(*args): return _Freestyle.ViewMap_AddFEdge(*args)
-    def AddSVertex(*args): return _Freestyle.ViewMap_AddSVertex(*args)
-    def setScene3dBBox(*args): return _Freestyle.ViewMap_setScene3dBBox(*args)
-    def CreateTVertex(*args): return _Freestyle.ViewMap_CreateTVertex(*args)
-    def InsertViewVertex(*args): return _Freestyle.ViewMap_InsertViewVertex(*args)
-ViewMap_swigregister = _Freestyle.ViewMap_swigregister
-ViewMap_swigregister(ViewMap)
-ViewMap_getInstance = _Freestyle.ViewMap_getInstance
-
-class ViewVertex(Interface0D):
-    __swig_setmethods__ = {}
-    for _s in [Interface0D]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ViewVertex, name, value)
-    __swig_getmethods__ = {}
-    for _s in [Interface0D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, ViewVertex, name)
-    def __init__(self, *args, **kwargs): raise AttributeError, "No constructor defined"
-    __repr__ = _swig_repr
-    def getExactTypeName(*args): return _Freestyle.ViewVertex_getExactTypeName(*args)
-    __swig_setmethods__["userdata"] = _Freestyle.ViewVertex_userdata_set
-    __swig_getmethods__["userdata"] = _Freestyle.ViewVertex_userdata_get
-    if _newclass:userdata = _swig_property(_Freestyle.ViewVertex_userdata_get, _Freestyle.ViewVertex_userdata_set)
-    __swig_destroy__ = _Freestyle.delete_ViewVertex
-    __del__ = lambda self : None;
-    def getNature(*args): return _Freestyle.ViewVertex_getNature(*args)
-    def setNature(*args): return _Freestyle.ViewVertex_setNature(*args)
-    def Replace(*args): return _Freestyle.ViewVertex_Replace(*args)
-    def edges_begin(*args): return _Freestyle.ViewVertex_edges_begin(*args)
-    def edges_end(*args): return _Freestyle.ViewVertex_edges_end(*args)
-    def edges_iterator(*args): return _Freestyle.ViewVertex_edges_iterator(*args)
-    def edgesBegin(*args): return _Freestyle.ViewVertex_edgesBegin(*args)
-    def edgesEnd(*args): return _Freestyle.ViewVertex_edgesEnd(*args)
-    def edgesIterator(*args): return _Freestyle.ViewVertex_edgesIterator(*args)
-ViewVertex_swigregister = _Freestyle.ViewVertex_swigregister
-ViewVertex_swigregister(ViewVertex)
-
-class TVertex(ViewVertex):
-    __swig_setmethods__ = {}
-    for _s in [ViewVertex]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, TVertex, name, value)
-    __swig_getmethods__ = {}
-    for _s in [ViewVertex]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, TVertex, name)
-    __repr__ = _swig_repr
-    def getExactTypeName(*args): return _Freestyle.TVertex_getExactTypeName(*args)
-    def getX(*args): return _Freestyle.TVertex_getX(*args)
-    def getY(*args): return _Freestyle.TVertex_getY(*args)
-    def getZ(*args): return _Freestyle.TVertex_getZ(*args)
-    def getPoint3D(*args): return _Freestyle.TVertex_getPoint3D(*args)
-    def getProjectedX(*args): return _Freestyle.TVertex_getProjectedX(*args)
-    def getProjectedY(*args): return _Freestyle.TVertex_getProjectedY(*args)
-    def getProjectedZ(*args): return _Freestyle.TVertex_getProjectedZ(*args)
-    def getPoint2D(*args): return _Freestyle.TVertex_getPoint2D(*args)
-    def getId(*args): return _Freestyle.TVertex_getId(*args)
-    def castToViewVertex(*args): return _Freestyle.TVertex_castToViewVertex(*args)
-    def castToTVertex(*args): return _Freestyle.TVertex_castToTVertex(*args)
-    def __init__(self, *args): 
-        this = _Freestyle.new_TVertex(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def frontSVertex(*args): return _Freestyle.TVertex_frontSVertex(*args)
-    def backSVertex(*args): return _Freestyle.TVertex_backSVertex(*args)
-    def frontEdgeA(*args): return _Freestyle.TVertex_frontEdgeA(*args)
-    def frontEdgeB(*args): return _Freestyle.TVertex_frontEdgeB(*args)
-    def backEdgeA(*args): return _Freestyle.TVertex_backEdgeA(*args)
-    def backEdgeB(*args): return _Freestyle.TVertex_backEdgeB(*args)
-    def setFrontSVertex(*args): return _Freestyle.TVertex_setFrontSVertex(*args)
-    def setBackSVertex(*args): return _Freestyle.TVertex_setBackSVertex(*args)
-    def setFrontEdgeA(*args): return _Freestyle.TVertex_setFrontEdgeA(*args)
-    def setFrontEdgeB(*args): return _Freestyle.TVertex_setFrontEdgeB(*args)
-    def setBackEdgeA(*args): return _Freestyle.TVertex_setBackEdgeA(*args)
-    def setBackEdgeB(*args): return _Freestyle.TVertex_setBackEdgeB(*args)
-    def setId(*args): return _Freestyle.TVertex_setId(*args)
-    def getSVertex(*args): return _Freestyle.TVertex_getSVertex(*args)
-    def Replace(*args): return _Freestyle.TVertex_Replace(*args)
-    def mate(*args): return _Freestyle.TVertex_mate(*args)
-    def edges_end(*args): return _Freestyle.TVertex_edges_end(*args)
-    def edgesBegin(*args): return _Freestyle.TVertex_edgesBegin(*args)
-    def edgesEnd(*args): return _Freestyle.TVertex_edgesEnd(*args)
-    def edgesIterator(*args): return _Freestyle.TVertex_edgesIterator(*args)
-    __swig_destroy__ = _Freestyle.delete_TVertex
-    __del__ = lambda self : None;
-TVertex_swigregister = _Freestyle.TVertex_swigregister
-TVertex_swigregister(TVertex)
-
-class NonTVertex(ViewVertex):
-    __swig_setmethods__ = {}
-    for _s in [ViewVertex]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, NonTVertex, name, value)
-    __swig_getmethods__ = {}
-    for _s in [ViewVertex]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, NonTVertex, name)
-    __repr__ = _swig_repr
-    def getExactTypeName(*args): return _Freestyle.NonTVertex_getExactTypeName(*args)
-    def getX(*args): return _Freestyle.NonTVertex_getX(*args)
-    def getY(*args): return _Freestyle.NonTVertex_getY(*args)
-    def getZ(*args): return _Freestyle.NonTVertex_getZ(*args)
-    def getPoint3D(*args): return _Freestyle.NonTVertex_getPoint3D(*args)
-    def getProjectedX(*args): return _Freestyle.NonTVertex_getProjectedX(*args)
-    def getProjectedY(*args): return _Freestyle.NonTVertex_getProjectedY(*args)
-    def getProjectedZ(*args): return _Freestyle.NonTVertex_getProjectedZ(*args)
-    def getPoint2D(*args): return _Freestyle.NonTVertex_getPoint2D(*args)
-    def getId(*args): return _Freestyle.NonTVertex_getId(*args)
-    def castToSVertex(*args): return _Freestyle.NonTVertex_castToSVertex(*args)
-    def castToViewVertex(*args): return _Freestyle.NonTVertex_castToViewVertex(*args)
-    def castToNonTVertex(*args): return _Freestyle.NonTVertex_castToNonTVertex(*args)
-    def __init__(self, *args): 
-        this = _Freestyle.new_NonTVertex(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_NonTVertex
-    __del__ = lambda self : None;
-    def svertex(*args): return _Freestyle.NonTVertex_svertex(*args)
-    def viewedges(*args): return _Freestyle.NonTVertex_viewedges(*args)
-    def setSVertex(*args): return _Freestyle.NonTVertex_setSVertex(*args)
-    def setViewEdges(*args): return _Freestyle.NonTVertex_setViewEdges(*args)
-    def AddIncomingViewEdge(*args): return _Freestyle.NonTVertex_AddIncomingViewEdge(*args)
-    def AddOutgoingViewEdge(*args): return _Freestyle.NonTVertex_AddOutgoingViewEdge(*args)
-    def AddViewEdge(*args): return _Freestyle.NonTVertex_AddViewEdge(*args)
-    def Replace(*args): return _Freestyle.NonTVertex_Replace(*args)
-    def edges_end(*args): return _Freestyle.NonTVertex_edges_end(*args)
-    def edgesBegin(*args): return _Freestyle.NonTVertex_edgesBegin(*args)
-    def edgesEnd(*args): return _Freestyle.NonTVertex_edgesEnd(*args)
-    def edgesIterator(*args): return _Freestyle.NonTVertex_edgesIterator(*args)
-NonTVertex_swigregister = _Freestyle.NonTVertex_swigregister
-NonTVertex_swigregister(NonTVertex)
-
-class ViewEdge(Interface1D):
-    __swig_setmethods__ = {}
-    for _s in [Interface1D]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ViewEdge, name, value)
-    __swig_getmethods__ = {}
-    for _s in [Interface1D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, ViewEdge, name)
-    __repr__ = _swig_repr
-    def getExactTypeName(*args): return _Freestyle.ViewEdge_getExactTypeName(*args)
-    def getId(*args): return _Freestyle.ViewEdge_getId(*args)
-    def getNature(*args): return _Freestyle.ViewEdge_getNature(*args)
-    __swig_setmethods__["userdata"] = _Freestyle.ViewEdge_userdata_set
-    __swig_getmethods__["userdata"] = _Freestyle.ViewEdge_userdata_get
-    if _newclass:userdata = _swig_property(_Freestyle.ViewEdge_userdata_get, _Freestyle.ViewEdge_userdata_set)
-    def __init__(self, *args): 
-        this = _Freestyle.new_ViewEdge(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def duplicate(*args): return _Freestyle.ViewEdge_duplicate(*args)
-    __swig_destroy__ = _Freestyle.delete_ViewEdge
-    __del__ = lambda self : None;
-    def A(*args): return _Freestyle.ViewEdge_A(*args)
-    def B(*args): return _Freestyle.ViewEdge_B(*args)
-    def fedgeA(*args): return _Freestyle.ViewEdge_fedgeA(*args)
-    def fedgeB(*args): return _Freestyle.ViewEdge_fedgeB(*args)
-    def viewShape(*args): return _Freestyle.ViewEdge_viewShape(*args)
-    def isClosed(*args): return _Freestyle.ViewEdge_isClosed(*args)
-    def getChainingTimeStamp(*args): return _Freestyle.ViewEdge_getChainingTimeStamp(*args)
-    def aShape(*args): return _Freestyle.ViewEdge_aShape(*args)
-    def bShape(*args): return _Freestyle.ViewEdge_bShape(*args)
-    def occluders(*args): return _Freestyle.ViewEdge_occluders(*args)
-    def splittingId(*args): return _Freestyle.ViewEdge_splittingId(*args)
-    def setA(*args): return _Freestyle.ViewEdge_setA(*args)
-    def setB(*args): return _Freestyle.ViewEdge_setB(*args)
-    def setNature(*args): return _Freestyle.ViewEdge_setNature(*args)
-    def setFEdgeA(*args): return _Freestyle.ViewEdge_setFEdgeA(*args)
-    def setFEdgeB(*args): return _Freestyle.ViewEdge_setFEdgeB(*args)
-    def setShape(*args): return _Freestyle.ViewEdge_setShape(*args)
-    def setId(*args): return _Freestyle.ViewEdge_setId(*args)
-    def UpdateFEdges(*args): return _Freestyle.ViewEdge_UpdateFEdges(*args)
-    def setaShape(*args): return _Freestyle.ViewEdge_setaShape(*args)
-    def setQI(*args): return _Freestyle.ViewEdge_setQI(*args)
-    def setChainingTimeStamp(*args): return _Freestyle.ViewEdge_setChainingTimeStamp(*args)
-    def AddOccluder(*args): return _Freestyle.ViewEdge_AddOccluder(*args)
-    def setSplittingId(*args): return _Freestyle.ViewEdge_setSplittingId(*args)
-    def intersect_2d_area(*args): return _Freestyle.ViewEdge_intersect_2d_area(*args)
-    def include_in_2d_area(*args): return _Freestyle.ViewEdge_include_in_2d_area(*args)
-    def getLength2D(*args): return _Freestyle.ViewEdge_getLength2D(*args)
-    def qi(*args): return _Freestyle.ViewEdge_qi(*args)
-    def occluders_begin(*args): return _Freestyle.ViewEdge_occluders_begin(*args)
-    def occluders_end(*args): return _Freestyle.ViewEdge_occluders_end(*args)
-    def occluders_size(*args): return _Freestyle.ViewEdge_occluders_size(*args)
-    def occluders_empty(*args): return _Freestyle.ViewEdge_occluders_empty(*args)
-    def occludee(*args): return _Freestyle.ViewEdge_occludee(*args)
-    def occluded_shape(*args): return _Freestyle.ViewEdge_occluded_shape(*args)
-    def occludee_empty(*args): return _Freestyle.ViewEdge_occludee_empty(*args)
-    def shape_id(*args): return _Freestyle.ViewEdge_shape_id(*args)
-    def shape(*args): return _Freestyle.ViewEdge_shape(*args)
-    def shape_importance(*args): return _Freestyle.ViewEdge_shape_importance(*args)
-    def verticesBegin(*args): return _Freestyle.ViewEdge_verticesBegin(*args)
-    def verticesEnd(*args): return _Freestyle.ViewEdge_verticesEnd(*args)
-    def pointsBegin(*args): return _Freestyle.ViewEdge_pointsBegin(*args)
-    def pointsEnd(*args): return _Freestyle.ViewEdge_pointsEnd(*args)
-ViewEdge_swigregister = _Freestyle.ViewEdge_swigregister
-ViewEdge_swigregister(ViewEdge)
-
-class ViewShape(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ViewShape, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, ViewShape, name)
-    __repr__ = _swig_repr
-    __swig_setmethods__["userdata"] = _Freestyle.ViewShape_userdata_set
-    __swig_getmethods__["userdata"] = _Freestyle.ViewShape_userdata_get
-    if _newclass:userdata = _swig_property(_Freestyle.ViewShape_userdata_get, _Freestyle.ViewShape_userdata_set)
-    def __init__(self, *args): 
-        this = _Freestyle.new_ViewShape(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def duplicate(*args): return _Freestyle.ViewShape_duplicate(*args)
-    __swig_destroy__ = _Freestyle.delete_ViewShape
-    __del__ = lambda self : None;
-    def SplitEdge(*args): return _Freestyle.ViewShape_SplitEdge(*args)
-    def sshape(*args): return _Freestyle.ViewShape_sshape(*args)
-    def vertices(*args): return _Freestyle.ViewShape_vertices(*args)
-    def edges(*args): return _Freestyle.ViewShape_edges(*args)
-    def getId(*args): return _Freestyle.ViewShape_getId(*args)
-    def setSShape(*args): return _Freestyle.ViewShape_setSShape(*args)
-    def setVertices(*args): return _Freestyle.ViewShape_setVertices(*args)
-    def setEdges(*args): return _Freestyle.ViewShape_setEdges(*args)
-    def AddVertex(*args): return _Freestyle.ViewShape_AddVertex(*args)
-    def AddEdge(*args): return _Freestyle.ViewShape_AddEdge(*args)
-    def RemoveEdge(*args): return _Freestyle.ViewShape_RemoveEdge(*args)
-    def RemoveVertex(*args): return _Freestyle.ViewShape_RemoveVertex(*args)
-ViewShape_swigregister = _Freestyle.ViewShape_swigregister
-ViewShape_swigregister(ViewShape)
-
-class ViewVertexOrientedViewEdgeIterator(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ViewVertexOrientedViewEdgeIterator, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, ViewVertexOrientedViewEdgeIterator, name)
-    __repr__ = _swig_repr
-    __swig_destroy__ = _Freestyle.delete_ViewVertexOrientedViewEdgeIterator
-    __del__ = lambda self : None;
-    def __init__(self, *args): 
-        this = _Freestyle.new_ViewVertexOrientedViewEdgeIterator(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def isBegin(*args): return _Freestyle.ViewVertexOrientedViewEdgeIterator_isBegin(*args)
-    def isEnd(*args): return _Freestyle.ViewVertexOrientedViewEdgeIterator_isEnd(*args)
-    def __ne__(*args): return _Freestyle.ViewVertexOrientedViewEdgeIterator___ne__(*args)
-    def __eq__(*args): return _Freestyle.ViewVertexOrientedViewEdgeIterator___eq__(*args)
-    def getObject(*args): return _Freestyle.ViewVertexOrientedViewEdgeIterator_getObject(*args)
-    def __deref__(*args): return _Freestyle.ViewVertexOrientedViewEdgeIterator___deref__(*args)
-    def increment(*args): return _Freestyle.ViewVertexOrientedViewEdgeIterator_increment(*args)
-ViewVertexOrientedViewEdgeIterator_swigregister = _Freestyle.ViewVertexOrientedViewEdgeIterator_swigregister
-ViewVertexOrientedViewEdgeIterator_swigregister(ViewVertexOrientedViewEdgeIterator)
-
-class ViewEdgeSVertexIterator(Interface0DIteratorNested):
-    __swig_setmethods__ = {}
-    for _s in [Interface0DIteratorNested]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ViewEdgeSVertexIterator, name, value)
-    __swig_getmethods__ = {}
-    for _s in [Interface0DIteratorNested]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, ViewEdgeSVertexIterator, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_ViewEdgeSVertexIterator(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_ViewEdgeSVertexIterator
-    __del__ = lambda self : None;
-    def getExactTypeName(*args): return _Freestyle.ViewEdgeSVertexIterator_getExactTypeName(*args)
-    def getObject(*args): return _Freestyle.ViewEdgeSVertexIterator_getObject(*args)
-    def __deref__(*args): return _Freestyle.ViewEdgeSVertexIterator___deref__(*args)
-    def increment(*args): return _Freestyle.ViewEdgeSVertexIterator_increment(*args)
-    def decrement(*args): return _Freestyle.ViewEdgeSVertexIterator_decrement(*args)
-    def isBegin(*args): return _Freestyle.ViewEdgeSVertexIterator_isBegin(*args)
-    def isEnd(*args): return _Freestyle.ViewEdgeSVertexIterator_isEnd(*args)
-    def t(*args): return _Freestyle.ViewEdgeSVertexIterator_t(*args)
-    def u(*args): return _Freestyle.ViewEdgeSVertexIterator_u(*args)
-    def __eq__(*args): return _Freestyle.ViewEdgeSVertexIterator___eq__(*args)
-    def copy(*args): return _Freestyle.ViewEdgeSVertexIterator_copy(*args)
-    def getX(*args): return _Freestyle.ViewEdgeSVertexIterator_getX(*args)
-    def getY(*args): return _Freestyle.ViewEdgeSVertexIterator_getY(*args)
-    def getZ(*args): return _Freestyle.ViewEdgeSVertexIterator_getZ(*args)
-    def getPoint3D(*args): return _Freestyle.ViewEdgeSVertexIterator_getPoint3D(*args)
-    def getProjectedX(*args): return _Freestyle.ViewEdgeSVertexIterator_getProjectedX(*args)
-    def getProjectedY(*args): return _Freestyle.ViewEdgeSVertexIterator_getProjectedY(*args)
-    def getProjectedZ(*args): return _Freestyle.ViewEdgeSVertexIterator_getProjectedZ(*args)
-    def getPoint2D(*args): return _Freestyle.ViewEdgeSVertexIterator_getPoint2D(*args)
-    def getFEdge(*args): return _Freestyle.ViewEdgeSVertexIterator_getFEdge(*args)
-    def getId(*args): return _Freestyle.ViewEdgeSVertexIterator_getId(*args)
-    def getNature(*args): return _Freestyle.ViewEdgeSVertexIterator_getNature(*args)
-    def castToSVertex(*args): return _Freestyle.ViewEdgeSVertexIterator_castToSVertex(*args)
-    def castToViewVertex(*args): return _Freestyle.ViewEdgeSVertexIterator_castToViewVertex(*args)
-    def castToNonTVertex(*args): return _Freestyle.ViewEdgeSVertexIterator_castToNonTVertex(*args)
-    def castToTVertex(*args): return _Freestyle.ViewEdgeSVertexIterator_castToTVertex(*args)
-    __swig_setmethods__["userdata"] = _Freestyle.ViewEdgeSVertexIterator_userdata_set
-    __swig_getmethods__["userdata"] = _Freestyle.ViewEdgeSVertexIterator_userdata_get
-    if _newclass:userdata = _swig_property(_Freestyle.ViewEdgeSVertexIterator_userdata_get, _Freestyle.ViewEdgeSVertexIterator_userdata_set)
-    def duplicate(*args): return _Freestyle.ViewEdgeSVertexIterator_duplicate(*args)
-    def point3D(*args): return _Freestyle.ViewEdgeSVertexIterator_point3D(*args)
-    def point2D(*args): return _Freestyle.ViewEdgeSVertexIterator_point2D(*args)
-    def normals(*args): return _Freestyle.ViewEdgeSVertexIterator_normals(*args)
-    def normalsSize(*args): return _Freestyle.ViewEdgeSVertexIterator_normalsSize(*args)
-    def fedges(*args): return _Freestyle.ViewEdgeSVertexIterator_fedges(*args)
-    def fedges_begin(*args): return _Freestyle.ViewEdgeSVertexIterator_fedges_begin(*args)
-    def fedges_end(*args): return _Freestyle.ViewEdgeSVertexIterator_fedges_end(*args)
-    def shape(*args): return _Freestyle.ViewEdgeSVertexIterator_shape(*args)
-    def z(*args): return _Freestyle.ViewEdgeSVertexIterator_z(*args)
-    def viewvertex(*args): return _Freestyle.ViewEdgeSVertexIterator_viewvertex(*args)
-    def setPoint3D(*args): return _Freestyle.ViewEdgeSVertexIterator_setPoint3D(*args)
-    def setPoint2D(*args): return _Freestyle.ViewEdgeSVertexIterator_setPoint2D(*args)
-    def AddNormal(*args): return _Freestyle.ViewEdgeSVertexIterator_AddNormal(*args)
-    def setCurvatureInfo(*args): return _Freestyle.ViewEdgeSVertexIterator_setCurvatureInfo(*args)
-    def getCurvatureInfo(*args): return _Freestyle.ViewEdgeSVertexIterator_getCurvatureInfo(*args)
-    def setCurvatureFredo(*args): return _Freestyle.ViewEdgeSVertexIterator_setCurvatureFredo(*args)
-    def setDirectionFredo(*args): return _Freestyle.ViewEdgeSVertexIterator_setDirectionFredo(*args)
-    def curvatureFredo(*args): return _Freestyle.ViewEdgeSVertexIterator_curvatureFredo(*args)
-    def directionFredo(*args): return _Freestyle.ViewEdgeSVertexIterator_directionFredo(*args)
-    def setId(*args): return _Freestyle.ViewEdgeSVertexIterator_setId(*args)
-    def setFEdges(*args): return _Freestyle.ViewEdgeSVertexIterator_setFEdges(*args)
-    def setShape(*args): return _Freestyle.ViewEdgeSVertexIterator_setShape(*args)
-    def setViewVertex(*args): return _Freestyle.ViewEdgeSVertexIterator_setViewVertex(*args)
-    def AddFEdge(*args): return _Freestyle.ViewEdgeSVertexIterator_AddFEdge(*args)
-    def Replace(*args): return _Freestyle.ViewEdgeSVertexIterator_Replace(*args)
-    def fedge(*args): return _Freestyle.ViewEdgeSVertexIterator_fedge(*args)
-    def point2d(*args): return _Freestyle.ViewEdgeSVertexIterator_point2d(*args)
-    def point3d(*args): return _Freestyle.ViewEdgeSVertexIterator_point3d(*args)
-    def normal(*args): return _Freestyle.ViewEdgeSVertexIterator_normal(*args)
-    def shape_id(*args): return _Freestyle.ViewEdgeSVertexIterator_shape_id(*args)
-    def shape_importance(*args): return _Freestyle.ViewEdgeSVertexIterator_shape_importance(*args)
-    def qi(*args): return _Freestyle.ViewEdgeSVertexIterator_qi(*args)
-    def occluders_begin(*args): return _Freestyle.ViewEdgeSVertexIterator_occluders_begin(*args)
-    def occluders_end(*args): return _Freestyle.ViewEdgeSVertexIterator_occluders_end(*args)
-    def occluders_empty(*args): return _Freestyle.ViewEdgeSVertexIterator_occluders_empty(*args)
-    def occluders_size(*args): return _Freestyle.ViewEdgeSVertexIterator_occluders_size(*args)
-    def occludee(*args): return _Freestyle.ViewEdgeSVertexIterator_occludee(*args)
-    def occluded_shape(*args): return _Freestyle.ViewEdgeSVertexIterator_occluded_shape(*args)
-    def occludee_empty(*args): return _Freestyle.ViewEdgeSVertexIterator_occludee_empty(*args)
-    def z_discontinuity(*args): return _Freestyle.ViewEdgeSVertexIterator_z_discontinuity(*args)
-ViewEdgeSVertexIterator_swigregister = _Freestyle.ViewEdgeSVertexIterator_swigregister
-ViewEdgeSVertexIterator_swigregister(ViewEdgeSVertexIterator)
-
-class ViewEdgeViewEdgeIterator(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ViewEdgeViewEdgeIterator, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, ViewEdgeViewEdgeIterator, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        if self.__class__ == ViewEdgeViewEdgeIterator:
-            args = (None,) + args
-        else:
-            args = (self,) + args
-        this = _Freestyle.new_ViewEdgeViewEdgeIterator(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_ViewEdgeViewEdgeIterator
-    __del__ = lambda self : None;
-    def getExactTypeName(*args): return _Freestyle.ViewEdgeViewEdgeIterator_getExactTypeName(*args)
-    def getCurrentEdge(*args): return _Freestyle.ViewEdgeViewEdgeIterator_getCurrentEdge(*args)
-    def setCurrentEdge(*args): return _Freestyle.ViewEdgeViewEdgeIterator_setCurrentEdge(*args)
-    def getBegin(*args): return _Freestyle.ViewEdgeViewEdgeIterator_getBegin(*args)
-    def setBegin(*args): return _Freestyle.ViewEdgeViewEdgeIterator_setBegin(*args)
-    def getOrientation(*args): return _Freestyle.ViewEdgeViewEdgeIterator_getOrientation(*args)
-    def setOrientation(*args): return _Freestyle.ViewEdgeViewEdgeIterator_setOrientation(*args)
-    def changeOrientation(*args): return _Freestyle.ViewEdgeViewEdgeIterator_changeOrientation(*args)
-    def getObject(*args): return _Freestyle.ViewEdgeViewEdgeIterator_getObject(*args)
-    def __deref__(*args): return _Freestyle.ViewEdgeViewEdgeIterator___deref__(*args)
-    def increment(*args): return _Freestyle.ViewEdgeViewEdgeIterator_increment(*args)
-    def decrement(*args): return _Freestyle.ViewEdgeViewEdgeIterator_decrement(*args)
-    def isBegin(*args): return _Freestyle.ViewEdgeViewEdgeIterator_isBegin(*args)
-    def isEnd(*args): return _Freestyle.ViewEdgeViewEdgeIterator_isEnd(*args)
-    def __eq__(*args): return _Freestyle.ViewEdgeViewEdgeIterator___eq__(*args)
-    def __ne__(*args): return _Freestyle.ViewEdgeViewEdgeIterator___ne__(*args)
-    def getId(*args): return _Freestyle.ViewEdgeViewEdgeIterator_getId(*args)
-    def getNature(*args): return _Freestyle.ViewEdgeViewEdgeIterator_getNature(*args)
-    __swig_setmethods__["userdata"] = _Freestyle.ViewEdgeViewEdgeIterator_userdata_set
-    __swig_getmethods__["userdata"] = _Freestyle.ViewEdgeViewEdgeIterator_userdata_get
-    if _newclass:userdata = _swig_property(_Freestyle.ViewEdgeViewEdgeIterator_userdata_get, _Freestyle.ViewEdgeViewEdgeIterator_userdata_set)
-    def duplicate(*args): return _Freestyle.ViewEdgeViewEdgeIterator_duplicate(*args)
-    def A(*args): return _Freestyle.ViewEdgeViewEdgeIterator_A(*args)
-    def B(*args): return _Freestyle.ViewEdgeViewEdgeIterator_B(*args)
-    def fedgeA(*args): return _Freestyle.ViewEdgeViewEdgeIterator_fedgeA(*args)
-    def fedgeB(*args): return _Freestyle.ViewEdgeViewEdgeIterator_fedgeB(*args)
-    def viewShape(*args): return _Freestyle.ViewEdgeViewEdgeIterator_viewShape(*args)
-    def aShape(*args): return _Freestyle.ViewEdgeViewEdgeIterator_aShape(*args)
-    def isClosed(*args): return _Freestyle.ViewEdgeViewEdgeIterator_isClosed(*args)
-    def getChainingTimeStamp(*args): return _Freestyle.ViewEdgeViewEdgeIterator_getChainingTimeStamp(*args)
-    def bShape(*args): return _Freestyle.ViewEdgeViewEdgeIterator_bShape(*args)
-    def occluders(*args): return _Freestyle.ViewEdgeViewEdgeIterator_occluders(*args)
-    def splittingId(*args): return _Freestyle.ViewEdgeViewEdgeIterator_splittingId(*args)
-    def setA(*args): return _Freestyle.ViewEdgeViewEdgeIterator_setA(*args)
-    def setB(*args): return _Freestyle.ViewEdgeViewEdgeIterator_setB(*args)
-    def setNature(*args): return _Freestyle.ViewEdgeViewEdgeIterator_setNature(*args)
-    def setFEdgeA(*args): return _Freestyle.ViewEdgeViewEdgeIterator_setFEdgeA(*args)
-    def setFEdgeB(*args): return _Freestyle.ViewEdgeViewEdgeIterator_setFEdgeB(*args)
-    def setShape(*args): return _Freestyle.ViewEdgeViewEdgeIterator_setShape(*args)
-    def setId(*args): return _Freestyle.ViewEdgeViewEdgeIterator_setId(*args)
-    def UpdateFEdges(*args): return _Freestyle.ViewEdgeViewEdgeIterator_UpdateFEdges(*args)
-    def setaShape(*args): return _Freestyle.ViewEdgeViewEdgeIterator_setaShape(*args)
-    def setQI(*args): return _Freestyle.ViewEdgeViewEdgeIterator_setQI(*args)
-    def setChainingTimeStamp(*args): return _Freestyle.ViewEdgeViewEdgeIterator_setChainingTimeStamp(*args)
-    def AddOccluder(*args): return _Freestyle.ViewEdgeViewEdgeIterator_AddOccluder(*args)
-    def setSplittingId(*args): return _Freestyle.ViewEdgeViewEdgeIterator_setSplittingId(*args)
-    def intersect_2d_area(*args): return _Freestyle.ViewEdgeViewEdgeIterator_intersect_2d_area(*args)
-    def include_in_2d_area(*args): return _Freestyle.ViewEdgeViewEdgeIterator_include_in_2d_area(*args)
-    def getLength2D(*args): return _Freestyle.ViewEdgeViewEdgeIterator_getLength2D(*args)
-    def qi(*args): return _Freestyle.ViewEdgeViewEdgeIterator_qi(*args)
-    def occluders_begin(*args): return _Freestyle.ViewEdgeViewEdgeIterator_occluders_begin(*args)
-    def occluders_end(*args): return _Freestyle.ViewEdgeViewEdgeIterator_occluders_end(*args)
-    def occluders_size(*args): return _Freestyle.ViewEdgeViewEdgeIterator_occluders_size(*args)
-    def occluders_empty(*args): return _Freestyle.ViewEdgeViewEdgeIterator_occluders_empty(*args)
-    def occludee(*args): return _Freestyle.ViewEdgeViewEdgeIterator_occludee(*args)
-    def occluded_shape(*args): return _Freestyle.ViewEdgeViewEdgeIterator_occluded_shape(*args)
-    def occludee_empty(*args): return _Freestyle.ViewEdgeViewEdgeIterator_occludee_empty(*args)
-    def shape_id(*args): return _Freestyle.ViewEdgeViewEdgeIterator_shape_id(*args)
-    def shape(*args): return _Freestyle.ViewEdgeViewEdgeIterator_shape(*args)
-    def shape_importance(*args): return _Freestyle.ViewEdgeViewEdgeIterator_shape_importance(*args)
-    def verticesBegin(*args): return _Freestyle.ViewEdgeViewEdgeIterator_verticesBegin(*args)
-    def verticesEnd(*args): return _Freestyle.ViewEdgeViewEdgeIterator_verticesEnd(*args)
-    def pointsBegin(*args): return _Freestyle.ViewEdgeViewEdgeIterator_pointsBegin(*args)
-    def pointsEnd(*args): return _Freestyle.ViewEdgeViewEdgeIterator_pointsEnd(*args)
-    def getTimeStamp(*args): return _Freestyle.ViewEdgeViewEdgeIterator_getTimeStamp(*args)
-    def setTimeStamp(*args): return _Freestyle.ViewEdgeViewEdgeIterator_setTimeStamp(*args)
-    def __disown__(self):
-        self.this.disown()
-        _Freestyle.disown_ViewEdgeViewEdgeIterator(self)
-        return weakref_proxy(self)
-ViewEdgeViewEdgeIterator_swigregister = _Freestyle.ViewEdgeViewEdgeIterator_swigregister
-ViewEdgeViewEdgeIterator_swigregister(ViewEdgeViewEdgeIterator)
-
-class UnaryFunction0DVoid(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, UnaryFunction0DVoid, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, UnaryFunction0DVoid, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        if self.__class__ == UnaryFunction0DVoid:
-            args = (None,) + args
-        else:
-            args = (self,) + args
-        this = _Freestyle.new_UnaryFunction0DVoid(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_UnaryFunction0DVoid
-    __del__ = lambda self : None;
-    def getName(*args): return _Freestyle.UnaryFunction0DVoid_getName(*args)
-    def __call__(*args): return _Freestyle.UnaryFunction0DVoid___call__(*args)
-    def __disown__(self):
-        self.this.disown()
-        _Freestyle.disown_UnaryFunction0DVoid(self)
-        return weakref_proxy(self)
-UnaryFunction0DVoid_swigregister = _Freestyle.UnaryFunction0DVoid_swigregister
-UnaryFunction0DVoid_swigregister(UnaryFunction0DVoid)
-
-class UnaryFunction0DUnsigned(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, UnaryFunction0DUnsigned, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, UnaryFunction0DUnsigned, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        if self.__class__ == UnaryFunction0DUnsigned:
-            args = (None,) + args
-        else:
-            args = (self,) + args
-        this = _Freestyle.new_UnaryFunction0DUnsigned(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_UnaryFunction0DUnsigned
-    __del__ = lambda self : None;
-    def getName(*args): return _Freestyle.UnaryFunction0DUnsigned_getName(*args)
-    def __call__(*args): return _Freestyle.UnaryFunction0DUnsigned___call__(*args)
-    def __disown__(self):
-        self.this.disown()
-        _Freestyle.disown_UnaryFunction0DUnsigned(self)
-        return weakref_proxy(self)
-UnaryFunction0DUnsigned_swigregister = _Freestyle.UnaryFunction0DUnsigned_swigregister
-UnaryFunction0DUnsigned_swigregister(UnaryFunction0DUnsigned)
-
-class UnaryFunction0DFloat(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, UnaryFunction0DFloat, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, UnaryFunction0DFloat, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        if self.__class__ == UnaryFunction0DFloat:
-            args = (None,) + args
-        else:
-            args = (self,) + args
-        this = _Freestyle.new_UnaryFunction0DFloat(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_UnaryFunction0DFloat
-    __del__ = lambda self : None;
-    def getName(*args): return _Freestyle.UnaryFunction0DFloat_getName(*args)
-    def __call__(*args): return _Freestyle.UnaryFunction0DFloat___call__(*args)
-    def __disown__(self):
-        self.this.disown()
-        _Freestyle.disown_UnaryFunction0DFloat(self)
-        return weakref_proxy(self)
-UnaryFunction0DFloat_swigregister = _Freestyle.UnaryFunction0DFloat_swigregister
-UnaryFunction0DFloat_swigregister(UnaryFunction0DFloat)
-
-class UnaryFunction0DDouble(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, UnaryFunction0DDouble, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, UnaryFunction0DDouble, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        if self.__class__ == UnaryFunction0DDouble:
-            args = (None,) + args
-        else:
-            args = (self,) + args
-        this = _Freestyle.new_UnaryFunction0DDouble(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_UnaryFunction0DDouble
-    __del__ = lambda self : None;
-    def getName(*args): return _Freestyle.UnaryFunction0DDouble_getName(*args)
-    def __call__(*args): return _Freestyle.UnaryFunction0DDouble___call__(*args)
-    def __disown__(self):
-        self.this.disown()
-        _Freestyle.disown_UnaryFunction0DDouble(self)
-        return weakref_proxy(self)
-UnaryFunction0DDouble_swigregister = _Freestyle.UnaryFunction0DDouble_swigregister
-UnaryFunction0DDouble_swigregister(UnaryFunction0DDouble)
-
-class UnaryFunction0DVec2f(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, UnaryFunction0DVec2f, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, UnaryFunction0DVec2f, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        if self.__class__ == UnaryFunction0DVec2f:
-            args = (None,) + args
-        else:
-            args = (self,) + args
-        this = _Freestyle.new_UnaryFunction0DVec2f(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_UnaryFunction0DVec2f
-    __del__ = lambda self : None;
-    def getName(*args): return _Freestyle.UnaryFunction0DVec2f_getName(*args)
-    def __call__(*args): return _Freestyle.UnaryFunction0DVec2f___call__(*args)
-    def __disown__(self):
-        self.this.disown()
-        _Freestyle.disown_UnaryFunction0DVec2f(self)
-        return weakref_proxy(self)
-UnaryFunction0DVec2f_swigregister = _Freestyle.UnaryFunction0DVec2f_swigregister
-UnaryFunction0DVec2f_swigregister(UnaryFunction0DVec2f)
-
-class UnaryFunction0DVec3f(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, UnaryFunction0DVec3f, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, UnaryFunction0DVec3f, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        if self.__class__ == UnaryFunction0DVec3f:
-            args = (None,) + args
-        else:
-            args = (self,) + args
-        this = _Freestyle.new_UnaryFunction0DVec3f(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_UnaryFunction0DVec3f
-    __del__ = lambda self : None;
-    def getName(*args): return _Freestyle.UnaryFunction0DVec3f_getName(*args)
-    def __call__(*args): return _Freestyle.UnaryFunction0DVec3f___call__(*args)
-    def __disown__(self):
-        self.this.disown()
-        _Freestyle.disown_UnaryFunction0DVec3f(self)
-        return weakref_proxy(self)
-UnaryFunction0DVec3f_swigregister = _Freestyle.UnaryFunction0DVec3f_swigregister
-UnaryFunction0DVec3f_swigregister(UnaryFunction0DVec3f)
-
-class UnaryFunction0DId(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, UnaryFunction0DId, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, UnaryFunction0DId, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        if self.__class__ == UnaryFunction0DId:
-            args = (None,) + args
-        else:
-            args = (self,) + args
-        this = _Freestyle.new_UnaryFunction0DId(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_UnaryFunction0DId
-    __del__ = lambda self : None;
-    def getName(*args): return _Freestyle.UnaryFunction0DId_getName(*args)
-    def __call__(*args): return _Freestyle.UnaryFunction0DId___call__(*args)
-    def __disown__(self):
-        self.this.disown()
-        _Freestyle.disown_UnaryFunction0DId(self)
-        return weakref_proxy(self)
-UnaryFunction0DId_swigregister = _Freestyle.UnaryFunction0DId_swigregister
-UnaryFunction0DId_swigregister(UnaryFunction0DId)
-
-class UnaryFunction0DViewShape(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, UnaryFunction0DViewShape, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, UnaryFunction0DViewShape, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_UnaryFunction0DViewShape(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_UnaryFunction0DViewShape
-    __del__ = lambda self : None;
-    def getName(*args): return _Freestyle.UnaryFunction0DViewShape_getName(*args)
-    def __call__(*args): return _Freestyle.UnaryFunction0DViewShape___call__(*args)
-UnaryFunction0DViewShape_swigregister = _Freestyle.UnaryFunction0DViewShape_swigregister
-UnaryFunction0DViewShape_swigregister(UnaryFunction0DViewShape)
-
-class UnaryFunction0DVectorViewShape(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, UnaryFunction0DVectorViewShape, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, UnaryFunction0DVectorViewShape, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_UnaryFunction0DVectorViewShape(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_UnaryFunction0DVectorViewShape
-    __del__ = lambda self : None;
-    def getName(*args): return _Freestyle.UnaryFunction0DVectorViewShape_getName(*args)
-    def __call__(*args): return _Freestyle.UnaryFunction0DVectorViewShape___call__(*args)
-UnaryFunction0DVectorViewShape_swigregister = _Freestyle.UnaryFunction0DVectorViewShape_swigregister
-UnaryFunction0DVectorViewShape_swigregister(UnaryFunction0DVectorViewShape)
-
-class GetXF0D(UnaryFunction0DDouble):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction0DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, GetXF0D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction0DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, GetXF0D, name)
-    __repr__ = _swig_repr
-    def getName(*args): return _Freestyle.GetXF0D_getName(*args)
-    def __call__(*args): return _Freestyle.GetXF0D___call__(*args)
-    def __init__(self, *args): 
-        this = _Freestyle.new_GetXF0D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_GetXF0D
-    __del__ = lambda self : None;
-GetXF0D_swigregister = _Freestyle.GetXF0D_swigregister
-GetXF0D_swigregister(GetXF0D)
-
-class GetYF0D(UnaryFunction0DDouble):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction0DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, GetYF0D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction0DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, GetYF0D, name)
-    __repr__ = _swig_repr
-    def getName(*args): return _Freestyle.GetYF0D_getName(*args)
-    def __call__(*args): return _Freestyle.GetYF0D___call__(*args)
-    def __init__(self, *args): 
-        this = _Freestyle.new_GetYF0D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_GetYF0D
-    __del__ = lambda self : None;
-GetYF0D_swigregister = _Freestyle.GetYF0D_swigregister
-GetYF0D_swigregister(GetYF0D)
-
-class GetZF0D(UnaryFunction0DDouble):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction0DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, GetZF0D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction0DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, GetZF0D, name)
-    __repr__ = _swig_repr
-    def getName(*args): return _Freestyle.GetZF0D_getName(*args)
-    def __call__(*args): return _Freestyle.GetZF0D___call__(*args)
-    def __init__(self, *args): 
-        this = _Freestyle.new_GetZF0D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_GetZF0D
-    __del__ = lambda self : None;
-GetZF0D_swigregister = _Freestyle.GetZF0D_swigregister
-GetZF0D_swigregister(GetZF0D)
-
-class GetProjectedXF0D(UnaryFunction0DDouble):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction0DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, GetProjectedXF0D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction0DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, GetProjectedXF0D, name)
-    __repr__ = _swig_repr
-    def getName(*args): return _Freestyle.GetProjectedXF0D_getName(*args)
-    def __call__(*args): return _Freestyle.GetProjectedXF0D___call__(*args)
-    def __init__(self, *args): 
-        this = _Freestyle.new_GetProjectedXF0D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_GetProjectedXF0D
-    __del__ = lambda self : None;
-GetProjectedXF0D_swigregister = _Freestyle.GetProjectedXF0D_swigregister
-GetProjectedXF0D_swigregister(GetProjectedXF0D)
-
-class GetProjectedYF0D(UnaryFunction0DDouble):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction0DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, GetProjectedYF0D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction0DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, GetProjectedYF0D, name)
-    __repr__ = _swig_repr
-    def getName(*args): return _Freestyle.GetProjectedYF0D_getName(*args)
-    def __call__(*args): return _Freestyle.GetProjectedYF0D___call__(*args)
-    def __init__(self, *args): 
-        this = _Freestyle.new_GetProjectedYF0D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_GetProjectedYF0D
-    __del__ = lambda self : None;
-GetProjectedYF0D_swigregister = _Freestyle.GetProjectedYF0D_swigregister
-GetProjectedYF0D_swigregister(GetProjectedYF0D)
-
-class GetProjectedZF0D(UnaryFunction0DDouble):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction0DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, GetProjectedZF0D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction0DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, GetProjectedZF0D, name)
-    __repr__ = _swig_repr
-    def getName(*args): return _Freestyle.GetProjectedZF0D_getName(*args)
-    def __call__(*args): return _Freestyle.GetProjectedZF0D___call__(*args)
-    def __init__(self, *args): 
-        this = _Freestyle.new_GetProjectedZF0D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_GetProjectedZF0D
-    __del__ = lambda self : None;
-GetProjectedZF0D_swigregister = _Freestyle.GetProjectedZF0D_swigregister
-GetProjectedZF0D_swigregister(GetProjectedZF0D)
-
-class GetCurvilinearAbscissaF0D(UnaryFunction0DFloat):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction0DFloat]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, GetCurvilinearAbscissaF0D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction0DFloat]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, GetCurvilinearAbscissaF0D, name)
-    __repr__ = _swig_repr
-    def getName(*args): return _Freestyle.GetCurvilinearAbscissaF0D_getName(*args)
-    def __call__(*args): return _Freestyle.GetCurvilinearAbscissaF0D___call__(*args)
-    def __init__(self, *args): 
-        this = _Freestyle.new_GetCurvilinearAbscissaF0D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_GetCurvilinearAbscissaF0D
-    __del__ = lambda self : None;
-GetCurvilinearAbscissaF0D_swigregister = _Freestyle.GetCurvilinearAbscissaF0D_swigregister
-GetCurvilinearAbscissaF0D_swigregister(GetCurvilinearAbscissaF0D)
-
-class GetParameterF0D(UnaryFunction0DFloat):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction0DFloat]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, GetParameterF0D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction0DFloat]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, GetParameterF0D, name)
-    __repr__ = _swig_repr
-    def getName(*args): return _Freestyle.GetParameterF0D_getName(*args)
-    def __call__(*args): return _Freestyle.GetParameterF0D___call__(*args)
-    def __init__(self, *args): 
-        this = _Freestyle.new_GetParameterF0D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_GetParameterF0D
-    __del__ = lambda self : None;
-GetParameterF0D_swigregister = _Freestyle.GetParameterF0D_swigregister
-GetParameterF0D_swigregister(GetParameterF0D)
-
-class VertexOrientation2DF0D(UnaryFunction0DVec2f):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction0DVec2f]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, VertexOrientation2DF0D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction0DVec2f]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, VertexOrientation2DF0D, name)
-    __repr__ = _swig_repr
-    def getName(*args): return _Freestyle.VertexOrientation2DF0D_getName(*args)
-    def __call__(*args): return _Freestyle.VertexOrientation2DF0D___call__(*args)
-    def __init__(self, *args): 
-        this = _Freestyle.new_VertexOrientation2DF0D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_VertexOrientation2DF0D
-    __del__ = lambda self : None;
-VertexOrientation2DF0D_swigregister = _Freestyle.VertexOrientation2DF0D_swigregister
-VertexOrientation2DF0D_swigregister(VertexOrientation2DF0D)
-
-class VertexOrientation3DF0D(UnaryFunction0DVec3f):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction0DVec3f]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, VertexOrientation3DF0D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction0DVec3f]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, VertexOrientation3DF0D, name)
-    __repr__ = _swig_repr
-    def getName(*args): return _Freestyle.VertexOrientation3DF0D_getName(*args)
-    def __call__(*args): return _Freestyle.VertexOrientation3DF0D___call__(*args)
-    def __init__(self, *args): 
-        this = _Freestyle.new_VertexOrientation3DF0D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_VertexOrientation3DF0D
-    __del__ = lambda self : None;
-VertexOrientation3DF0D_swigregister = _Freestyle.VertexOrientation3DF0D_swigregister
-VertexOrientation3DF0D_swigregister(VertexOrientation3DF0D)
-
-class Curvature2DAngleF0D(UnaryFunction0DDouble):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction0DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Curvature2DAngleF0D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction0DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, Curvature2DAngleF0D, name)
-    __repr__ = _swig_repr
-    def getName(*args): return _Freestyle.Curvature2DAngleF0D_getName(*args)
-    def __call__(*args): return _Freestyle.Curvature2DAngleF0D___call__(*args)
-    def __init__(self, *args): 
-        this = _Freestyle.new_Curvature2DAngleF0D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_Curvature2DAngleF0D
-    __del__ = lambda self : None;
-Curvature2DAngleF0D_swigregister = _Freestyle.Curvature2DAngleF0D_swigregister
-Curvature2DAngleF0D_swigregister(Curvature2DAngleF0D)
-
-class ZDiscontinuityF0D(UnaryFunction0DDouble):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction0DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ZDiscontinuityF0D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction0DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, ZDiscontinuityF0D, name)
-    __repr__ = _swig_repr
-    def getName(*args): return _Freestyle.ZDiscontinuityF0D_getName(*args)
-    def __call__(*args): return _Freestyle.ZDiscontinuityF0D___call__(*args)
-    def __init__(self, *args): 
-        this = _Freestyle.new_ZDiscontinuityF0D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_ZDiscontinuityF0D
-    __del__ = lambda self : None;
-ZDiscontinuityF0D_swigregister = _Freestyle.ZDiscontinuityF0D_swigregister
-ZDiscontinuityF0D_swigregister(ZDiscontinuityF0D)
-
-class Normal2DF0D(UnaryFunction0DVec2f):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction0DVec2f]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Normal2DF0D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction0DVec2f]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, Normal2DF0D, name)
-    __repr__ = _swig_repr
-    def getName(*args): return _Freestyle.Normal2DF0D_getName(*args)
-    def __call__(*args): return _Freestyle.Normal2DF0D___call__(*args)
-    def __init__(self, *args): 
-        this = _Freestyle.new_Normal2DF0D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_Normal2DF0D
-    __del__ = lambda self : None;
-Normal2DF0D_swigregister = _Freestyle.Normal2DF0D_swigregister
-Normal2DF0D_swigregister(Normal2DF0D)
-
-class MaterialF0D(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, MaterialF0D, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, MaterialF0D, name)
-    __repr__ = _swig_repr
-    def getName(*args): return _Freestyle.MaterialF0D_getName(*args)
-    def __call__(*args): return _Freestyle.MaterialF0D___call__(*args)
-    def __init__(self, *args): 
-        this = _Freestyle.new_MaterialF0D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_MaterialF0D
-    __del__ = lambda self : None;
-MaterialF0D_swigregister = _Freestyle.MaterialF0D_swigregister
-MaterialF0D_swigregister(MaterialF0D)
-
-class ShapeIdF0D(UnaryFunction0DId):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction0DId]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ShapeIdF0D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction0DId]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, ShapeIdF0D, name)
-    __repr__ = _swig_repr
-    def getName(*args): return _Freestyle.ShapeIdF0D_getName(*args)
-    def __call__(*args): return _Freestyle.ShapeIdF0D___call__(*args)
-    def __init__(self, *args): 
-        this = _Freestyle.new_ShapeIdF0D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_ShapeIdF0D
-    __del__ = lambda self : None;
-ShapeIdF0D_swigregister = _Freestyle.ShapeIdF0D_swigregister
-ShapeIdF0D_swigregister(ShapeIdF0D)
-
-class QuantitativeInvisibilityF0D(UnaryFunction0DUnsigned):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction0DUnsigned]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, QuantitativeInvisibilityF0D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction0DUnsigned]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, QuantitativeInvisibilityF0D, name)
-    __repr__ = _swig_repr
-    def getName(*args): return _Freestyle.QuantitativeInvisibilityF0D_getName(*args)
-    def __call__(*args): return _Freestyle.QuantitativeInvisibilityF0D___call__(*args)
-    def __init__(self, *args): 
-        this = _Freestyle.new_QuantitativeInvisibilityF0D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_QuantitativeInvisibilityF0D
-    __del__ = lambda self : None;
-QuantitativeInvisibilityF0D_swigregister = _Freestyle.QuantitativeInvisibilityF0D_swigregister
-QuantitativeInvisibilityF0D_swigregister(QuantitativeInvisibilityF0D)
-
-class CurveNatureF0D(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CurveNatureF0D, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CurveNatureF0D, name)
-    __repr__ = _swig_repr
-    def getName(*args): return _Freestyle.CurveNatureF0D_getName(*args)
-    def __call__(*args): return _Freestyle.CurveNatureF0D___call__(*args)
-    def __init__(self, *args): 
-        this = _Freestyle.new_CurveNatureF0D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_CurveNatureF0D
-    __del__ = lambda self : None;
-CurveNatureF0D_swigregister = _Freestyle.CurveNatureF0D_swigregister
-CurveNatureF0D_swigregister(CurveNatureF0D)
-
-class GetShapeF0D(UnaryFunction0DViewShape):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction0DViewShape]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, GetShapeF0D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction0DViewShape]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, GetShapeF0D, name)
-    __repr__ = _swig_repr
-    def getName(*args): return _Freestyle.GetShapeF0D_getName(*args)
-    def __call__(*args): return _Freestyle.GetShapeF0D___call__(*args)
-    def __init__(self, *args): 
-        this = _Freestyle.new_GetShapeF0D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_GetShapeF0D
-    __del__ = lambda self : None;
-GetShapeF0D_swigregister = _Freestyle.GetShapeF0D_swigregister
-GetShapeF0D_swigregister(GetShapeF0D)
-
-class GetOccludersF0D(UnaryFunction0DVectorViewShape):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction0DVectorViewShape]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, GetOccludersF0D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction0DVectorViewShape]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, GetOccludersF0D, name)
-    __repr__ = _swig_repr
-    def getName(*args): return _Freestyle.GetOccludersF0D_getName(*args)
-    def __call__(*args): return _Freestyle.GetOccludersF0D___call__(*args)
-    def __init__(self, *args): 
-        this = _Freestyle.new_GetOccludersF0D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_GetOccludersF0D
-    __del__ = lambda self : None;
-GetOccludersF0D_swigregister = _Freestyle.GetOccludersF0D_swigregister
-GetOccludersF0D_swigregister(GetOccludersF0D)
-
-class GetOccludeeF0D(UnaryFunction0DViewShape):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction0DViewShape]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, GetOccludeeF0D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction0DViewShape]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, GetOccludeeF0D, name)
-    __repr__ = _swig_repr
-    def getName(*args): return _Freestyle.GetOccludeeF0D_getName(*args)
-    def __call__(*args): return _Freestyle.GetOccludeeF0D___call__(*args)
-    def __init__(self, *args): 
-        this = _Freestyle.new_GetOccludeeF0D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_GetOccludeeF0D
-    __del__ = lambda self : None;
-GetOccludeeF0D_swigregister = _Freestyle.GetOccludeeF0D_swigregister
-GetOccludeeF0D_swigregister(GetOccludeeF0D)
-
-getFEdge = _Freestyle.getFEdge
-class UnaryFunction1DVoid(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, UnaryFunction1DVoid, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, UnaryFunction1DVoid, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        if self.__class__ == UnaryFunction1DVoid:
-            args = (None,) + args
-        else:
-            args = (self,) + args
-        this = _Freestyle.new_UnaryFunction1DVoid(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_UnaryFunction1DVoid
-    __del__ = lambda self : None;
-    def getName(*args): return _Freestyle.UnaryFunction1DVoid_getName(*args)
-    def __call__(*args): return _Freestyle.UnaryFunction1DVoid___call__(*args)
-    def setIntegrationType(*args): return _Freestyle.UnaryFunction1DVoid_setIntegrationType(*args)
-    def getIntegrationType(*args): return _Freestyle.UnaryFunction1DVoid_getIntegrationType(*args)
-    def __disown__(self):
-        self.this.disown()
-        _Freestyle.disown_UnaryFunction1DVoid(self)
-        return weakref_proxy(self)
-UnaryFunction1DVoid_swigregister = _Freestyle.UnaryFunction1DVoid_swigregister
-UnaryFunction1DVoid_swigregister(UnaryFunction1DVoid)
-
-class UnaryFunction1DUnsigned(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, UnaryFunction1DUnsigned, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, UnaryFunction1DUnsigned, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        if self.__class__ == UnaryFunction1DUnsigned:
-            args = (None,) + args
-        else:
-            args = (self,) + args
-        this = _Freestyle.new_UnaryFunction1DUnsigned(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_UnaryFunction1DUnsigned
-    __del__ = lambda self : None;
-    def getName(*args): return _Freestyle.UnaryFunction1DUnsigned_getName(*args)
-    def __call__(*args): return _Freestyle.UnaryFunction1DUnsigned___call__(*args)
-    def setIntegrationType(*args): return _Freestyle.UnaryFunction1DUnsigned_setIntegrationType(*args)
-    def getIntegrationType(*args): return _Freestyle.UnaryFunction1DUnsigned_getIntegrationType(*args)
-    def __disown__(self):
-        self.this.disown()
-        _Freestyle.disown_UnaryFunction1DUnsigned(self)
-        return weakref_proxy(self)
-UnaryFunction1DUnsigned_swigregister = _Freestyle.UnaryFunction1DUnsigned_swigregister
-UnaryFunction1DUnsigned_swigregister(UnaryFunction1DUnsigned)
-
-class UnaryFunction1DFloat(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, UnaryFunction1DFloat, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, UnaryFunction1DFloat, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        if self.__class__ == UnaryFunction1DFloat:
-            args = (None,) + args
-        else:
-            args = (self,) + args
-        this = _Freestyle.new_UnaryFunction1DFloat(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_UnaryFunction1DFloat
-    __del__ = lambda self : None;
-    def getName(*args): return _Freestyle.UnaryFunction1DFloat_getName(*args)
-    def __call__(*args): return _Freestyle.UnaryFunction1DFloat___call__(*args)
-    def setIntegrationType(*args): return _Freestyle.UnaryFunction1DFloat_setIntegrationType(*args)
-    def getIntegrationType(*args): return _Freestyle.UnaryFunction1DFloat_getIntegrationType(*args)
-    def __disown__(self):
-        self.this.disown()
-        _Freestyle.disown_UnaryFunction1DFloat(self)
-        return weakref_proxy(self)
-UnaryFunction1DFloat_swigregister = _Freestyle.UnaryFunction1DFloat_swigregister
-UnaryFunction1DFloat_swigregister(UnaryFunction1DFloat)
-
-class UnaryFunction1DDouble(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, UnaryFunction1DDouble, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, UnaryFunction1DDouble, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        if self.__class__ == UnaryFunction1DDouble:
-            args = (None,) + args
-        else:
-            args = (self,) + args
-        this = _Freestyle.new_UnaryFunction1DDouble(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_UnaryFunction1DDouble
-    __del__ = lambda self : None;
-    def getName(*args): return _Freestyle.UnaryFunction1DDouble_getName(*args)
-    def __call__(*args): return _Freestyle.UnaryFunction1DDouble___call__(*args)
-    def setIntegrationType(*args): return _Freestyle.UnaryFunction1DDouble_setIntegrationType(*args)
-    def getIntegrationType(*args): return _Freestyle.UnaryFunction1DDouble_getIntegrationType(*args)
-    def __disown__(self):
-        self.this.disown()
-        _Freestyle.disown_UnaryFunction1DDouble(self)
-        return weakref_proxy(self)
-UnaryFunction1DDouble_swigregister = _Freestyle.UnaryFunction1DDouble_swigregister
-UnaryFunction1DDouble_swigregister(UnaryFunction1DDouble)
-
-class UnaryFunction1DVec2f(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, UnaryFunction1DVec2f, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, UnaryFunction1DVec2f, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        if self.__class__ == UnaryFunction1DVec2f:
-            args = (None,) + args
-        else:
-            args = (self,) + args
-        this = _Freestyle.new_UnaryFunction1DVec2f(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_UnaryFunction1DVec2f
-    __del__ = lambda self : None;
-    def getName(*args): return _Freestyle.UnaryFunction1DVec2f_getName(*args)
-    def __call__(*args): return _Freestyle.UnaryFunction1DVec2f___call__(*args)
-    def setIntegrationType(*args): return _Freestyle.UnaryFunction1DVec2f_setIntegrationType(*args)
-    def getIntegrationType(*args): return _Freestyle.UnaryFunction1DVec2f_getIntegrationType(*args)
-    def __disown__(self):
-        self.this.disown()
-        _Freestyle.disown_UnaryFunction1DVec2f(self)
-        return weakref_proxy(self)
-UnaryFunction1DVec2f_swigregister = _Freestyle.UnaryFunction1DVec2f_swigregister
-UnaryFunction1DVec2f_swigregister(UnaryFunction1DVec2f)
-
-class UnaryFunction1DVec3f(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, UnaryFunction1DVec3f, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, UnaryFunction1DVec3f, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        if self.__class__ == UnaryFunction1DVec3f:
-            args = (None,) + args
-        else:
-            args = (self,) + args
-        this = _Freestyle.new_UnaryFunction1DVec3f(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_UnaryFunction1DVec3f
-    __del__ = lambda self : None;
-    def getName(*args): return _Freestyle.UnaryFunction1DVec3f_getName(*args)
-    def __call__(*args): return _Freestyle.UnaryFunction1DVec3f___call__(*args)
-    def setIntegrationType(*args): return _Freestyle.UnaryFunction1DVec3f_setIntegrationType(*args)
-    def getIntegrationType(*args): return _Freestyle.UnaryFunction1DVec3f_getIntegrationType(*args)
-    def __disown__(self):
-        self.this.disown()
-        _Freestyle.disown_UnaryFunction1DVec3f(self)
-        return weakref_proxy(self)
-UnaryFunction1DVec3f_swigregister = _Freestyle.UnaryFunction1DVec3f_swigregister
-UnaryFunction1DVec3f_swigregister(UnaryFunction1DVec3f)
-
-class UnaryFunction1DVectorViewShape(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, UnaryFunction1DVectorViewShape, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, UnaryFunction1DVectorViewShape, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_UnaryFunction1DVectorViewShape(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_UnaryFunction1DVectorViewShape
-    __del__ = lambda self : None;
-    def getName(*args): return _Freestyle.UnaryFunction1DVectorViewShape_getName(*args)
-    def __call__(*args): return _Freestyle.UnaryFunction1DVectorViewShape___call__(*args)
-    def setIntegrationType(*args): return _Freestyle.UnaryFunction1DVectorViewShape_setIntegrationType(*args)
-    def getIntegrationType(*args): return _Freestyle.UnaryFunction1DVectorViewShape_getIntegrationType(*args)
-UnaryFunction1DVectorViewShape_swigregister = _Freestyle.UnaryFunction1DVectorViewShape_swigregister
-UnaryFunction1DVectorViewShape_swigregister(UnaryFunction1DVectorViewShape)
-
-class GetXF1D(UnaryFunction1DDouble):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction1DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, GetXF1D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction1DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, GetXF1D, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_GetXF1D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def getName(*args): return _Freestyle.GetXF1D_getName(*args)
-    def __call__(*args): return _Freestyle.GetXF1D___call__(*args)
-    __swig_destroy__ = _Freestyle.delete_GetXF1D
-    __del__ = lambda self : None;
-GetXF1D_swigregister = _Freestyle.GetXF1D_swigregister
-GetXF1D_swigregister(GetXF1D)
-
-class GetYF1D(UnaryFunction1DDouble):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction1DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, GetYF1D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction1DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, GetYF1D, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_GetYF1D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def getName(*args): return _Freestyle.GetYF1D_getName(*args)
-    def __call__(*args): return _Freestyle.GetYF1D___call__(*args)
-    __swig_destroy__ = _Freestyle.delete_GetYF1D
-    __del__ = lambda self : None;
-GetYF1D_swigregister = _Freestyle.GetYF1D_swigregister
-GetYF1D_swigregister(GetYF1D)
-
-class GetZF1D(UnaryFunction1DDouble):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction1DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, GetZF1D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction1DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, GetZF1D, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_GetZF1D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def getName(*args): return _Freestyle.GetZF1D_getName(*args)
-    def __call__(*args): return _Freestyle.GetZF1D___call__(*args)
-    __swig_destroy__ = _Freestyle.delete_GetZF1D
-    __del__ = lambda self : None;
-GetZF1D_swigregister = _Freestyle.GetZF1D_swigregister
-GetZF1D_swigregister(GetZF1D)
-
-class GetProjectedXF1D(UnaryFunction1DDouble):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction1DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, GetProjectedXF1D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction1DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, GetProjectedXF1D, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_GetProjectedXF1D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def getName(*args): return _Freestyle.GetProjectedXF1D_getName(*args)
-    def __call__(*args): return _Freestyle.GetProjectedXF1D___call__(*args)
-    __swig_destroy__ = _Freestyle.delete_GetProjectedXF1D
-    __del__ = lambda self : None;
-GetProjectedXF1D_swigregister = _Freestyle.GetProjectedXF1D_swigregister
-GetProjectedXF1D_swigregister(GetProjectedXF1D)
-
-class GetProjectedYF1D(UnaryFunction1DDouble):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction1DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, GetProjectedYF1D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction1DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, GetProjectedYF1D, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_GetProjectedYF1D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def getName(*args): return _Freestyle.GetProjectedYF1D_getName(*args)
-    def __call__(*args): return _Freestyle.GetProjectedYF1D___call__(*args)
-    __swig_destroy__ = _Freestyle.delete_GetProjectedYF1D
-    __del__ = lambda self : None;
-GetProjectedYF1D_swigregister = _Freestyle.GetProjectedYF1D_swigregister
-GetProjectedYF1D_swigregister(GetProjectedYF1D)
-
-class GetProjectedZF1D(UnaryFunction1DDouble):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction1DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, GetProjectedZF1D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction1DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, GetProjectedZF1D, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_GetProjectedZF1D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def getName(*args): return _Freestyle.GetProjectedZF1D_getName(*args)
-    def __call__(*args): return _Freestyle.GetProjectedZF1D___call__(*args)
-    __swig_destroy__ = _Freestyle.delete_GetProjectedZF1D
-    __del__ = lambda self : None;
-GetProjectedZF1D_swigregister = _Freestyle.GetProjectedZF1D_swigregister
-GetProjectedZF1D_swigregister(GetProjectedZF1D)
-
-class Orientation2DF1D(UnaryFunction1DVec2f):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction1DVec2f]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Orientation2DF1D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction1DVec2f]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, Orientation2DF1D, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_Orientation2DF1D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def getName(*args): return _Freestyle.Orientation2DF1D_getName(*args)
-    def __call__(*args): return _Freestyle.Orientation2DF1D___call__(*args)
-    __swig_destroy__ = _Freestyle.delete_Orientation2DF1D
-    __del__ = lambda self : None;
-Orientation2DF1D_swigregister = _Freestyle.Orientation2DF1D_swigregister
-Orientation2DF1D_swigregister(Orientation2DF1D)
-
-class Orientation3DF1D(UnaryFunction1DVec3f):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction1DVec3f]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Orientation3DF1D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction1DVec3f]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, Orientation3DF1D, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_Orientation3DF1D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def getName(*args): return _Freestyle.Orientation3DF1D_getName(*args)
-    def __call__(*args): return _Freestyle.Orientation3DF1D___call__(*args)
-    __swig_destroy__ = _Freestyle.delete_Orientation3DF1D
-    __del__ = lambda self : None;
-Orientation3DF1D_swigregister = _Freestyle.Orientation3DF1D_swigregister
-Orientation3DF1D_swigregister(Orientation3DF1D)
-
-class ZDiscontinuityF1D(UnaryFunction1DDouble):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction1DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ZDiscontinuityF1D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction1DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, ZDiscontinuityF1D, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_ZDiscontinuityF1D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def getName(*args): return _Freestyle.ZDiscontinuityF1D_getName(*args)
-    def __call__(*args): return _Freestyle.ZDiscontinuityF1D___call__(*args)
-    __swig_destroy__ = _Freestyle.delete_ZDiscontinuityF1D
-    __del__ = lambda self : None;
-ZDiscontinuityF1D_swigregister = _Freestyle.ZDiscontinuityF1D_swigregister
-ZDiscontinuityF1D_swigregister(ZDiscontinuityF1D)
-
-class QuantitativeInvisibilityF1D(UnaryFunction1DUnsigned):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction1DUnsigned]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, QuantitativeInvisibilityF1D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction1DUnsigned]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, QuantitativeInvisibilityF1D, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_QuantitativeInvisibilityF1D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def getName(*args): return _Freestyle.QuantitativeInvisibilityF1D_getName(*args)
-    def __call__(*args): return _Freestyle.QuantitativeInvisibilityF1D___call__(*args)
-    __swig_destroy__ = _Freestyle.delete_QuantitativeInvisibilityF1D
-    __del__ = lambda self : None;
-QuantitativeInvisibilityF1D_swigregister = _Freestyle.QuantitativeInvisibilityF1D_swigregister
-QuantitativeInvisibilityF1D_swigregister(QuantitativeInvisibilityF1D)
-
-class CurveNatureF1D(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CurveNatureF1D, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, CurveNatureF1D, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_CurveNatureF1D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def getName(*args): return _Freestyle.CurveNatureF1D_getName(*args)
-    def __call__(*args): return _Freestyle.CurveNatureF1D___call__(*args)
-    __swig_destroy__ = _Freestyle.delete_CurveNatureF1D
-    __del__ = lambda self : None;
-CurveNatureF1D_swigregister = _Freestyle.CurveNatureF1D_swigregister
-CurveNatureF1D_swigregister(CurveNatureF1D)
-
-class TimeStampF1D(UnaryFunction1DVoid):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction1DVoid]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, TimeStampF1D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction1DVoid]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, TimeStampF1D, name)
-    __repr__ = _swig_repr
-    def getName(*args): return _Freestyle.TimeStampF1D_getName(*args)
-    def __call__(*args): return _Freestyle.TimeStampF1D___call__(*args)
-    def __init__(self, *args): 
-        this = _Freestyle.new_TimeStampF1D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_TimeStampF1D
-    __del__ = lambda self : None;
-TimeStampF1D_swigregister = _Freestyle.TimeStampF1D_swigregister
-TimeStampF1D_swigregister(TimeStampF1D)
-
-class IncrementChainingTimeStampF1D(UnaryFunction1DVoid):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction1DVoid]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IncrementChainingTimeStampF1D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction1DVoid]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, IncrementChainingTimeStampF1D, name)
-    __repr__ = _swig_repr
-    def getName(*args): return _Freestyle.IncrementChainingTimeStampF1D_getName(*args)
-    def __call__(*args): return _Freestyle.IncrementChainingTimeStampF1D___call__(*args)
-    def __init__(self, *args): 
-        this = _Freestyle.new_IncrementChainingTimeStampF1D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_IncrementChainingTimeStampF1D
-    __del__ = lambda self : None;
-IncrementChainingTimeStampF1D_swigregister = _Freestyle.IncrementChainingTimeStampF1D_swigregister
-IncrementChainingTimeStampF1D_swigregister(IncrementChainingTimeStampF1D)
-
-class ChainingTimeStampF1D(UnaryFunction1DVoid):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction1DVoid]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ChainingTimeStampF1D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction1DVoid]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, ChainingTimeStampF1D, name)
-    __repr__ = _swig_repr
-    def getName(*args): return _Freestyle.ChainingTimeStampF1D_getName(*args)
-    def __call__(*args): return _Freestyle.ChainingTimeStampF1D___call__(*args)
-    def __init__(self, *args): 
-        this = _Freestyle.new_ChainingTimeStampF1D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_ChainingTimeStampF1D
-    __del__ = lambda self : None;
-ChainingTimeStampF1D_swigregister = _Freestyle.ChainingTimeStampF1D_swigregister
-ChainingTimeStampF1D_swigregister(ChainingTimeStampF1D)
-
-class Curvature2DAngleF1D(UnaryFunction1DDouble):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction1DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Curvature2DAngleF1D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction1DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, Curvature2DAngleF1D, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_Curvature2DAngleF1D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def getName(*args): return _Freestyle.Curvature2DAngleF1D_getName(*args)
-    def __call__(*args): return _Freestyle.Curvature2DAngleF1D___call__(*args)
-    __swig_destroy__ = _Freestyle.delete_Curvature2DAngleF1D
-    __del__ = lambda self : None;
-Curvature2DAngleF1D_swigregister = _Freestyle.Curvature2DAngleF1D_swigregister
-Curvature2DAngleF1D_swigregister(Curvature2DAngleF1D)
-
-class Normal2DF1D(UnaryFunction1DVec2f):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction1DVec2f]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Normal2DF1D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction1DVec2f]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, Normal2DF1D, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_Normal2DF1D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def getName(*args): return _Freestyle.Normal2DF1D_getName(*args)
-    def __call__(*args): return _Freestyle.Normal2DF1D___call__(*args)
-    __swig_destroy__ = _Freestyle.delete_Normal2DF1D
-    __del__ = lambda self : None;
-Normal2DF1D_swigregister = _Freestyle.Normal2DF1D_swigregister
-Normal2DF1D_swigregister(Normal2DF1D)
-
-class GetShapeF1D(UnaryFunction1DVectorViewShape):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction1DVectorViewShape]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, GetShapeF1D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction1DVectorViewShape]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, GetShapeF1D, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_GetShapeF1D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def getName(*args): return _Freestyle.GetShapeF1D_getName(*args)
-    def __call__(*args): return _Freestyle.GetShapeF1D___call__(*args)
-    __swig_destroy__ = _Freestyle.delete_GetShapeF1D
-    __del__ = lambda self : None;
-GetShapeF1D_swigregister = _Freestyle.GetShapeF1D_swigregister
-GetShapeF1D_swigregister(GetShapeF1D)
-
-class GetOccludersF1D(UnaryFunction1DVectorViewShape):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction1DVectorViewShape]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, GetOccludersF1D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction1DVectorViewShape]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, GetOccludersF1D, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_GetOccludersF1D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def getName(*args): return _Freestyle.GetOccludersF1D_getName(*args)
-    def __call__(*args): return _Freestyle.GetOccludersF1D___call__(*args)
-    __swig_destroy__ = _Freestyle.delete_GetOccludersF1D
-    __del__ = lambda self : None;
-GetOccludersF1D_swigregister = _Freestyle.GetOccludersF1D_swigregister
-GetOccludersF1D_swigregister(GetOccludersF1D)
-
-class GetOccludeeF1D(UnaryFunction1DVectorViewShape):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction1DVectorViewShape]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, GetOccludeeF1D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction1DVectorViewShape]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, GetOccludeeF1D, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_GetOccludeeF1D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def getName(*args): return _Freestyle.GetOccludeeF1D_getName(*args)
-    def __call__(*args): return _Freestyle.GetOccludeeF1D___call__(*args)
-    __swig_destroy__ = _Freestyle.delete_GetOccludeeF1D
-    __del__ = lambda self : None;
-GetOccludeeF1D_swigregister = _Freestyle.GetOccludeeF1D_swigregister
-GetOccludeeF1D_swigregister(GetOccludeeF1D)
-
-class Module(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Module, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, Module, name)
-    __repr__ = _swig_repr
-    __swig_getmethods__["setAlwaysRefresh"] = lambda x: _Freestyle.Module_setAlwaysRefresh
-    if _newclass:setAlwaysRefresh = staticmethod(_Freestyle.Module_setAlwaysRefresh)
-    __swig_getmethods__["setCausal"] = lambda x: _Freestyle.Module_setCausal
-    if _newclass:setCausal = staticmethod(_Freestyle.Module_setCausal)
-    __swig_getmethods__["setDrawable"] = lambda x: _Freestyle.Module_setDrawable
-    if _newclass:setDrawable = staticmethod(_Freestyle.Module_setDrawable)
-    __swig_getmethods__["getAlwaysRefresh"] = lambda x: _Freestyle.Module_getAlwaysRefresh
-    if _newclass:getAlwaysRefresh = staticmethod(_Freestyle.Module_getAlwaysRefresh)
-    __swig_getmethods__["getCausal"] = lambda x: _Freestyle.Module_getCausal
-    if _newclass:getCausal = staticmethod(_Freestyle.Module_getCausal)
-    __swig_getmethods__["getDrawable"] = lambda x: _Freestyle.Module_getDrawable
-    if _newclass:getDrawable = staticmethod(_Freestyle.Module_getDrawable)
-    def __init__(self, *args): 
-        this = _Freestyle.new_Module(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_Module
-    __del__ = lambda self : None;
-Module_swigregister = _Freestyle.Module_swigregister
-Module_swigregister(Module)
-Module_setAlwaysRefresh = _Freestyle.Module_setAlwaysRefresh
-Module_setCausal = _Freestyle.Module_setCausal
-Module_setDrawable = _Freestyle.Module_setDrawable
-Module_getAlwaysRefresh = _Freestyle.Module_getAlwaysRefresh
-Module_getCausal = _Freestyle.Module_getCausal
-Module_getDrawable = _Freestyle.Module_getDrawable
-
-class DensityF0D(UnaryFunction0DDouble):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction0DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, DensityF0D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction0DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, DensityF0D, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_DensityF0D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def getName(*args): return _Freestyle.DensityF0D_getName(*args)
-    def __call__(*args): return _Freestyle.DensityF0D___call__(*args)
-    __swig_destroy__ = _Freestyle.delete_DensityF0D
-    __del__ = lambda self : None;
-DensityF0D_swigregister = _Freestyle.DensityF0D_swigregister
-DensityF0D_swigregister(DensityF0D)
-
-class LocalAverageDepthF0D(UnaryFunction0DDouble):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction0DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, LocalAverageDepthF0D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction0DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, LocalAverageDepthF0D, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_LocalAverageDepthF0D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def getName(*args): return _Freestyle.LocalAverageDepthF0D_getName(*args)
-    def __call__(*args): return _Freestyle.LocalAverageDepthF0D___call__(*args)
-    __swig_destroy__ = _Freestyle.delete_LocalAverageDepthF0D
-    __del__ = lambda self : None;
-LocalAverageDepthF0D_swigregister = _Freestyle.LocalAverageDepthF0D_swigregister
-LocalAverageDepthF0D_swigregister(LocalAverageDepthF0D)
-
-class ReadMapPixelF0D(UnaryFunction0DFloat):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction0DFloat]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ReadMapPixelF0D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction0DFloat]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, ReadMapPixelF0D, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_ReadMapPixelF0D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def getName(*args): return _Freestyle.ReadMapPixelF0D_getName(*args)
-    def __call__(*args): return _Freestyle.ReadMapPixelF0D___call__(*args)
-    __swig_destroy__ = _Freestyle.delete_ReadMapPixelF0D
-    __del__ = lambda self : None;
-ReadMapPixelF0D_swigregister = _Freestyle.ReadMapPixelF0D_swigregister
-ReadMapPixelF0D_swigregister(ReadMapPixelF0D)
-
-class ReadSteerableViewMapPixelF0D(UnaryFunction0DFloat):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction0DFloat]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ReadSteerableViewMapPixelF0D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction0DFloat]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, ReadSteerableViewMapPixelF0D, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_ReadSteerableViewMapPixelF0D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def getName(*args): return _Freestyle.ReadSteerableViewMapPixelF0D_getName(*args)
-    def __call__(*args): return _Freestyle.ReadSteerableViewMapPixelF0D___call__(*args)
-    __swig_destroy__ = _Freestyle.delete_ReadSteerableViewMapPixelF0D
-    __del__ = lambda self : None;
-ReadSteerableViewMapPixelF0D_swigregister = _Freestyle.ReadSteerableViewMapPixelF0D_swigregister
-ReadSteerableViewMapPixelF0D_swigregister(ReadSteerableViewMapPixelF0D)
-
-class ReadCompleteViewMapPixelF0D(UnaryFunction0DFloat):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction0DFloat]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ReadCompleteViewMapPixelF0D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction0DFloat]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, ReadCompleteViewMapPixelF0D, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_ReadCompleteViewMapPixelF0D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def getName(*args): return _Freestyle.ReadCompleteViewMapPixelF0D_getName(*args)
-    def __call__(*args): return _Freestyle.ReadCompleteViewMapPixelF0D___call__(*args)
-    __swig_destroy__ = _Freestyle.delete_ReadCompleteViewMapPixelF0D
-    __del__ = lambda self : None;
-ReadCompleteViewMapPixelF0D_swigregister = _Freestyle.ReadCompleteViewMapPixelF0D_swigregister
-ReadCompleteViewMapPixelF0D_swigregister(ReadCompleteViewMapPixelF0D)
-
-class GetViewMapGradientNormF0D(UnaryFunction0DFloat):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction0DFloat]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, GetViewMapGradientNormF0D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction0DFloat]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, GetViewMapGradientNormF0D, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_GetViewMapGradientNormF0D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def getName(*args): return _Freestyle.GetViewMapGradientNormF0D_getName(*args)
-    def __call__(*args): return _Freestyle.GetViewMapGradientNormF0D___call__(*args)
-    __swig_destroy__ = _Freestyle.delete_GetViewMapGradientNormF0D
-    __del__ = lambda self : None;
-GetViewMapGradientNormF0D_swigregister = _Freestyle.GetViewMapGradientNormF0D_swigregister
-GetViewMapGradientNormF0D_swigregister(GetViewMapGradientNormF0D)
-
-class DensityF1D(UnaryFunction1DDouble):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction1DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, DensityF1D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction1DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, DensityF1D, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_DensityF1D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_DensityF1D
-    __del__ = lambda self : None;
-    def getName(*args): return _Freestyle.DensityF1D_getName(*args)
-    def __call__(*args): return _Freestyle.DensityF1D___call__(*args)
-DensityF1D_swigregister = _Freestyle.DensityF1D_swigregister
-DensityF1D_swigregister(DensityF1D)
-
-class LocalAverageDepthF1D(UnaryFunction1DDouble):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction1DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, LocalAverageDepthF1D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction1DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, LocalAverageDepthF1D, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_LocalAverageDepthF1D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def getName(*args): return _Freestyle.LocalAverageDepthF1D_getName(*args)
-    def __call__(*args): return _Freestyle.LocalAverageDepthF1D___call__(*args)
-    __swig_destroy__ = _Freestyle.delete_LocalAverageDepthF1D
-    __del__ = lambda self : None;
-LocalAverageDepthF1D_swigregister = _Freestyle.LocalAverageDepthF1D_swigregister
-LocalAverageDepthF1D_swigregister(LocalAverageDepthF1D)
-
-class GetCompleteViewMapDensityF1D(UnaryFunction1DDouble):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction1DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, GetCompleteViewMapDensityF1D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction1DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, GetCompleteViewMapDensityF1D, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_GetCompleteViewMapDensityF1D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def getName(*args): return _Freestyle.GetCompleteViewMapDensityF1D_getName(*args)
-    def __call__(*args): return _Freestyle.GetCompleteViewMapDensityF1D___call__(*args)
-    __swig_destroy__ = _Freestyle.delete_GetCompleteViewMapDensityF1D
-    __del__ = lambda self : None;
-GetCompleteViewMapDensityF1D_swigregister = _Freestyle.GetCompleteViewMapDensityF1D_swigregister
-GetCompleteViewMapDensityF1D_swigregister(GetCompleteViewMapDensityF1D)
-
-class GetDirectionalViewMapDensityF1D(UnaryFunction1DDouble):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction1DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, GetDirectionalViewMapDensityF1D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction1DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, GetDirectionalViewMapDensityF1D, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_GetDirectionalViewMapDensityF1D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def getName(*args): return _Freestyle.GetDirectionalViewMapDensityF1D_getName(*args)
-    def __call__(*args): return _Freestyle.GetDirectionalViewMapDensityF1D___call__(*args)
-    __swig_destroy__ = _Freestyle.delete_GetDirectionalViewMapDensityF1D
-    __del__ = lambda self : None;
-GetDirectionalViewMapDensityF1D_swigregister = _Freestyle.GetDirectionalViewMapDensityF1D_swigregister
-GetDirectionalViewMapDensityF1D_swigregister(GetDirectionalViewMapDensityF1D)
-
-class GetSteerableViewMapDensityF1D(UnaryFunction1DDouble):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction1DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, GetSteerableViewMapDensityF1D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction1DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, GetSteerableViewMapDensityF1D, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_GetSteerableViewMapDensityF1D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_GetSteerableViewMapDensityF1D
-    __del__ = lambda self : None;
-    def getName(*args): return _Freestyle.GetSteerableViewMapDensityF1D_getName(*args)
-    def __call__(*args): return _Freestyle.GetSteerableViewMapDensityF1D___call__(*args)
-GetSteerableViewMapDensityF1D_swigregister = _Freestyle.GetSteerableViewMapDensityF1D_swigregister
-GetSteerableViewMapDensityF1D_swigregister(GetSteerableViewMapDensityF1D)
-
-class GetViewMapGradientNormF1D(UnaryFunction1DDouble):
-    __swig_setmethods__ = {}
-    for _s in [UnaryFunction1DDouble]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, GetViewMapGradientNormF1D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryFunction1DDouble]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, GetViewMapGradientNormF1D, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_GetViewMapGradientNormF1D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def getName(*args): return _Freestyle.GetViewMapGradientNormF1D_getName(*args)
-    def __call__(*args): return _Freestyle.GetViewMapGradientNormF1D___call__(*args)
-    __swig_destroy__ = _Freestyle.delete_GetViewMapGradientNormF1D
-    __del__ = lambda self : None;
-GetViewMapGradientNormF1D_swigregister = _Freestyle.GetViewMapGradientNormF1D_swigregister
-GetViewMapGradientNormF1D_swigregister(GetViewMapGradientNormF1D)
-
-GetTimeStampCF = _Freestyle.GetTimeStampCF
-GetCanvasWidthCF = _Freestyle.GetCanvasWidthCF
-GetCanvasHeightCF = _Freestyle.GetCanvasHeightCF
-ReadMapPixelCF = _Freestyle.ReadMapPixelCF
-ReadCompleteViewMapPixelCF = _Freestyle.ReadCompleteViewMapPixelCF
-ReadDirectionalViewMapPixelCF = _Freestyle.ReadDirectionalViewMapPixelCF
-GetSelectedFEdgeCF = _Freestyle.GetSelectedFEdgeCF
-class AdjacencyIterator(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, AdjacencyIterator, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, AdjacencyIterator, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_AdjacencyIterator(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_AdjacencyIterator
-    __del__ = lambda self : None;
-    def getExactTypeName(*args): return _Freestyle.AdjacencyIterator_getExactTypeName(*args)
-    def isEnd(*args): return _Freestyle.AdjacencyIterator_isEnd(*args)
-    def isBegin(*args): return _Freestyle.AdjacencyIterator_isBegin(*args)
-    def isIncoming(*args): return _Freestyle.AdjacencyIterator_isIncoming(*args)
-    def getObject(*args): return _Freestyle.AdjacencyIterator_getObject(*args)
-    def __deref__(*args): return _Freestyle.AdjacencyIterator___deref__(*args)
-    def increment(*args): return _Freestyle.AdjacencyIterator_increment(*args)
-    def decrement(*args): return _Freestyle.AdjacencyIterator_decrement(*args)
-    def getId(*args): return _Freestyle.AdjacencyIterator_getId(*args)
-    def getNature(*args): return _Freestyle.AdjacencyIterator_getNature(*args)
-    __swig_setmethods__["userdata"] = _Freestyle.AdjacencyIterator_userdata_set
-    __swig_getmethods__["userdata"] = _Freestyle.AdjacencyIterator_userdata_get
-    if _newclass:userdata = _swig_property(_Freestyle.AdjacencyIterator_userdata_get, _Freestyle.AdjacencyIterator_userdata_set)
-    def duplicate(*args): return _Freestyle.AdjacencyIterator_duplicate(*args)
-    def A(*args): return _Freestyle.AdjacencyIterator_A(*args)
-    def B(*args): return _Freestyle.AdjacencyIterator_B(*args)
-    def fedgeA(*args): return _Freestyle.AdjacencyIterator_fedgeA(*args)
-    def fedgeB(*args): return _Freestyle.AdjacencyIterator_fedgeB(*args)
-    def viewShape(*args): return _Freestyle.AdjacencyIterator_viewShape(*args)
-    def aShape(*args): return _Freestyle.AdjacencyIterator_aShape(*args)
-    def isClosed(*args): return _Freestyle.AdjacencyIterator_isClosed(*args)
-    def getChainingTimeStamp(*args): return _Freestyle.AdjacencyIterator_getChainingTimeStamp(*args)
-    def bShape(*args): return _Freestyle.AdjacencyIterator_bShape(*args)
-    def occluders(*args): return _Freestyle.AdjacencyIterator_occluders(*args)
-    def splittingId(*args): return _Freestyle.AdjacencyIterator_splittingId(*args)
-    def setA(*args): return _Freestyle.AdjacencyIterator_setA(*args)
-    def setB(*args): return _Freestyle.AdjacencyIterator_setB(*args)
-    def setNature(*args): return _Freestyle.AdjacencyIterator_setNature(*args)
-    def setFEdgeA(*args): return _Freestyle.AdjacencyIterator_setFEdgeA(*args)
-    def setFEdgeB(*args): return _Freestyle.AdjacencyIterator_setFEdgeB(*args)
-    def setShape(*args): return _Freestyle.AdjacencyIterator_setShape(*args)
-    def setId(*args): return _Freestyle.AdjacencyIterator_setId(*args)
-    def UpdateFEdges(*args): return _Freestyle.AdjacencyIterator_UpdateFEdges(*args)
-    def setaShape(*args): return _Freestyle.AdjacencyIterator_setaShape(*args)
-    def setQI(*args): return _Freestyle.AdjacencyIterator_setQI(*args)
-    def setChainingTimeStamp(*args): return _Freestyle.AdjacencyIterator_setChainingTimeStamp(*args)
-    def AddOccluder(*args): return _Freestyle.AdjacencyIterator_AddOccluder(*args)
-    def setSplittingId(*args): return _Freestyle.AdjacencyIterator_setSplittingId(*args)
-    def intersect_2d_area(*args): return _Freestyle.AdjacencyIterator_intersect_2d_area(*args)
-    def include_in_2d_area(*args): return _Freestyle.AdjacencyIterator_include_in_2d_area(*args)
-    def getLength2D(*args): return _Freestyle.AdjacencyIterator_getLength2D(*args)
-    def qi(*args): return _Freestyle.AdjacencyIterator_qi(*args)
-    def occluders_begin(*args): return _Freestyle.AdjacencyIterator_occluders_begin(*args)
-    def occluders_end(*args): return _Freestyle.AdjacencyIterator_occluders_end(*args)
-    def occluders_size(*args): return _Freestyle.AdjacencyIterator_occluders_size(*args)
-    def occluders_empty(*args): return _Freestyle.AdjacencyIterator_occluders_empty(*args)
-    def occludee(*args): return _Freestyle.AdjacencyIterator_occludee(*args)
-    def occluded_shape(*args): return _Freestyle.AdjacencyIterator_occluded_shape(*args)
-    def occludee_empty(*args): return _Freestyle.AdjacencyIterator_occludee_empty(*args)
-    def shape_id(*args): return _Freestyle.AdjacencyIterator_shape_id(*args)
-    def shape(*args): return _Freestyle.AdjacencyIterator_shape(*args)
-    def shape_importance(*args): return _Freestyle.AdjacencyIterator_shape_importance(*args)
-    def verticesBegin(*args): return _Freestyle.AdjacencyIterator_verticesBegin(*args)
-    def verticesEnd(*args): return _Freestyle.AdjacencyIterator_verticesEnd(*args)
-    def pointsBegin(*args): return _Freestyle.AdjacencyIterator_pointsBegin(*args)
-    def pointsEnd(*args): return _Freestyle.AdjacencyIterator_pointsEnd(*args)
-    def getTimeStamp(*args): return _Freestyle.AdjacencyIterator_getTimeStamp(*args)
-    def setTimeStamp(*args): return _Freestyle.AdjacencyIterator_setTimeStamp(*args)
-AdjacencyIterator_swigregister = _Freestyle.AdjacencyIterator_swigregister
-AdjacencyIterator_swigregister(AdjacencyIterator)
-LoadMapCF = _Freestyle.LoadMapCF
-
-class ChainingIterator(ViewEdgeViewEdgeIterator):
-    __swig_setmethods__ = {}
-    for _s in [ViewEdgeViewEdgeIterator]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ChainingIterator, name, value)
-    __swig_getmethods__ = {}
-    for _s in [ViewEdgeViewEdgeIterator]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, ChainingIterator, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        if self.__class__ == ChainingIterator:
-            args = (None,) + args
-        else:
-            args = (self,) + args
-        this = _Freestyle.new_ChainingIterator(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def getExactTypeName(*args): return _Freestyle.ChainingIterator_getExactTypeName(*args)
-    def init(*args): return _Freestyle.ChainingIterator_init(*args)
-    def traverse(*args): return _Freestyle.ChainingIterator_traverse(*args)
-    def getVertex(*args): return _Freestyle.ChainingIterator_getVertex(*args)
-    def isIncrementing(*args): return _Freestyle.ChainingIterator_isIncrementing(*args)
-    def increment(*args): return _Freestyle.ChainingIterator_increment(*args)
-    def decrement(*args): return _Freestyle.ChainingIterator_decrement(*args)
-    __swig_destroy__ = _Freestyle.delete_ChainingIterator
-    __del__ = lambda self : None;
-    def __disown__(self):
-        self.this.disown()
-        _Freestyle.disown_ChainingIterator(self)
-        return weakref_proxy(self)
-ChainingIterator_swigregister = _Freestyle.ChainingIterator_swigregister
-ChainingIterator_swigregister(ChainingIterator)
-
-class ChainSilhouetteIterator(ChainingIterator):
-    __swig_setmethods__ = {}
-    for _s in [ChainingIterator]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ChainSilhouetteIterator, name, value)
-    __swig_getmethods__ = {}
-    for _s in [ChainingIterator]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, ChainSilhouetteIterator, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        if self.__class__ == ChainSilhouetteIterator:
-            args = (None,) + args
-        else:
-            args = (self,) + args
-        this = _Freestyle.new_ChainSilhouetteIterator(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def getExactTypeName(*args): return _Freestyle.ChainSilhouetteIterator_getExactTypeName(*args)
-    def traverse(*args): return _Freestyle.ChainSilhouetteIterator_traverse(*args)
-    __swig_destroy__ = _Freestyle.delete_ChainSilhouetteIterator
-    __del__ = lambda self : None;
-    def __disown__(self):
-        self.this.disown()
-        _Freestyle.disown_ChainSilhouetteIterator(self)
-        return weakref_proxy(self)
-ChainSilhouetteIterator_swigregister = _Freestyle.ChainSilhouetteIterator_swigregister
-ChainSilhouetteIterator_swigregister(ChainSilhouetteIterator)
-
-class ChainPredicateIterator(ChainingIterator):
-    __swig_setmethods__ = {}
-    for _s in [ChainingIterator]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ChainPredicateIterator, name, value)
-    __swig_getmethods__ = {}
-    for _s in [ChainingIterator]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, ChainPredicateIterator, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        if self.__class__ == ChainPredicateIterator:
-            args = (None,) + args
-        else:
-            args = (self,) + args
-        this = _Freestyle.new_ChainPredicateIterator(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_ChainPredicateIterator
-    __del__ = lambda self : None;
-    def getExactTypeName(*args): return _Freestyle.ChainPredicateIterator_getExactTypeName(*args)
-    def traverse(*args): return _Freestyle.ChainPredicateIterator_traverse(*args)
-    def __disown__(self):
-        self.this.disown()
-        _Freestyle.disown_ChainPredicateIterator(self)
-        return weakref_proxy(self)
-ChainPredicateIterator_swigregister = _Freestyle.ChainPredicateIterator_swigregister
-ChainPredicateIterator_swigregister(ChainPredicateIterator)
-
-class UnaryPredicate0D(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, UnaryPredicate0D, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, UnaryPredicate0D, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        if self.__class__ == UnaryPredicate0D:
-            args = (None,) + args
-        else:
-            args = (self,) + args
-        this = _Freestyle.new_UnaryPredicate0D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_UnaryPredicate0D
-    __del__ = lambda self : None;
-    def getName(*args): return _Freestyle.UnaryPredicate0D_getName(*args)
-    def __call__(*args): return _Freestyle.UnaryPredicate0D___call__(*args)
-    def __disown__(self):
-        self.this.disown()
-        _Freestyle.disown_UnaryPredicate0D(self)
-        return weakref_proxy(self)
-UnaryPredicate0D_swigregister = _Freestyle.UnaryPredicate0D_swigregister
-UnaryPredicate0D_swigregister(UnaryPredicate0D)
-
-class BinaryPredicate0D(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, BinaryPredicate0D, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, BinaryPredicate0D, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_BinaryPredicate0D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_BinaryPredicate0D
-    __del__ = lambda self : None;
-    def getName(*args): return _Freestyle.BinaryPredicate0D_getName(*args)
-    def __call__(*args): return _Freestyle.BinaryPredicate0D___call__(*args)
-BinaryPredicate0D_swigregister = _Freestyle.BinaryPredicate0D_swigregister
-BinaryPredicate0D_swigregister(BinaryPredicate0D)
-
-class TrueUP0D(UnaryPredicate0D):
-    __swig_setmethods__ = {}
-    for _s in [UnaryPredicate0D]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, TrueUP0D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryPredicate0D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, TrueUP0D, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_TrueUP0D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def getName(*args): return _Freestyle.TrueUP0D_getName(*args)
-    def __call__(*args): return _Freestyle.TrueUP0D___call__(*args)
-    __swig_destroy__ = _Freestyle.delete_TrueUP0D
-    __del__ = lambda self : None;
-TrueUP0D_swigregister = _Freestyle.TrueUP0D_swigregister
-TrueUP0D_swigregister(TrueUP0D)
-
-class FalseUP0D(UnaryPredicate0D):
-    __swig_setmethods__ = {}
-    for _s in [UnaryPredicate0D]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FalseUP0D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryPredicate0D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FalseUP0D, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_FalseUP0D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def getName(*args): return _Freestyle.FalseUP0D_getName(*args)
-    def __call__(*args): return _Freestyle.FalseUP0D___call__(*args)
-    __swig_destroy__ = _Freestyle.delete_FalseUP0D
-    __del__ = lambda self : None;
-FalseUP0D_swigregister = _Freestyle.FalseUP0D_swigregister
-FalseUP0D_swigregister(FalseUP0D)
-
-class UnaryPredicate1D(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, UnaryPredicate1D, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, UnaryPredicate1D, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        if self.__class__ == UnaryPredicate1D:
-            args = (None,) + args
-        else:
-            args = (self,) + args
-        this = _Freestyle.new_UnaryPredicate1D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_UnaryPredicate1D
-    __del__ = lambda self : None;
-    def getName(*args): return _Freestyle.UnaryPredicate1D_getName(*args)
-    def __call__(*args): return _Freestyle.UnaryPredicate1D___call__(*args)
-    def __disown__(self):
-        self.this.disown()
-        _Freestyle.disown_UnaryPredicate1D(self)
-        return weakref_proxy(self)
-UnaryPredicate1D_swigregister = _Freestyle.UnaryPredicate1D_swigregister
-UnaryPredicate1D_swigregister(UnaryPredicate1D)
-
-class BinaryPredicate1D(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, BinaryPredicate1D, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, BinaryPredicate1D, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        if self.__class__ == BinaryPredicate1D:
-            args = (None,) + args
-        else:
-            args = (self,) + args
-        this = _Freestyle.new_BinaryPredicate1D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_BinaryPredicate1D
-    __del__ = lambda self : None;
-    def getName(*args): return _Freestyle.BinaryPredicate1D_getName(*args)
-    def __call__(*args): return _Freestyle.BinaryPredicate1D___call__(*args)
-    def __disown__(self):
-        self.this.disown()
-        _Freestyle.disown_BinaryPredicate1D(self)
-        return weakref_proxy(self)
-BinaryPredicate1D_swigregister = _Freestyle.BinaryPredicate1D_swigregister
-BinaryPredicate1D_swigregister(BinaryPredicate1D)
-
-class TrueUP1D(UnaryPredicate1D):
-    __swig_setmethods__ = {}
-    for _s in [UnaryPredicate1D]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, TrueUP1D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryPredicate1D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, TrueUP1D, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_TrueUP1D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def getName(*args): return _Freestyle.TrueUP1D_getName(*args)
-    def __call__(*args): return _Freestyle.TrueUP1D___call__(*args)
-    __swig_destroy__ = _Freestyle.delete_TrueUP1D
-    __del__ = lambda self : None;
-TrueUP1D_swigregister = _Freestyle.TrueUP1D_swigregister
-TrueUP1D_swigregister(TrueUP1D)
-
-class FalseUP1D(UnaryPredicate1D):
-    __swig_setmethods__ = {}
-    for _s in [UnaryPredicate1D]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FalseUP1D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryPredicate1D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FalseUP1D, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_FalseUP1D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def getName(*args): return _Freestyle.FalseUP1D_getName(*args)
-    def __call__(*args): return _Freestyle.FalseUP1D___call__(*args)
-    __swig_destroy__ = _Freestyle.delete_FalseUP1D
-    __del__ = lambda self : None;
-FalseUP1D_swigregister = _Freestyle.FalseUP1D_swigregister
-FalseUP1D_swigregister(FalseUP1D)
-
-class QuantitativeInvisibilityUP1D(UnaryPredicate1D):
-    __swig_setmethods__ = {}
-    for _s in [UnaryPredicate1D]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, QuantitativeInvisibilityUP1D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryPredicate1D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, QuantitativeInvisibilityUP1D, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_QuantitativeInvisibilityUP1D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def getName(*args): return _Freestyle.QuantitativeInvisibilityUP1D_getName(*args)
-    def __call__(*args): return _Freestyle.QuantitativeInvisibilityUP1D___call__(*args)
-    __swig_destroy__ = _Freestyle.delete_QuantitativeInvisibilityUP1D
-    __del__ = lambda self : None;
-QuantitativeInvisibilityUP1D_swigregister = _Freestyle.QuantitativeInvisibilityUP1D_swigregister
-QuantitativeInvisibilityUP1D_swigregister(QuantitativeInvisibilityUP1D)
-
-class ContourUP1D(UnaryPredicate1D):
-    __swig_setmethods__ = {}
-    for _s in [UnaryPredicate1D]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ContourUP1D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryPredicate1D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, ContourUP1D, name)
-    __repr__ = _swig_repr
-    def getName(*args): return _Freestyle.ContourUP1D_getName(*args)
-    def __call__(*args): return _Freestyle.ContourUP1D___call__(*args)
-    def __init__(self, *args): 
-        this = _Freestyle.new_ContourUP1D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_ContourUP1D
-    __del__ = lambda self : None;
-ContourUP1D_swigregister = _Freestyle.ContourUP1D_swigregister
-ContourUP1D_swigregister(ContourUP1D)
-
-class ExternalContourUP1D(UnaryPredicate1D):
-    __swig_setmethods__ = {}
-    for _s in [UnaryPredicate1D]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ExternalContourUP1D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryPredicate1D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, ExternalContourUP1D, name)
-    __repr__ = _swig_repr
-    def getName(*args): return _Freestyle.ExternalContourUP1D_getName(*args)
-    def __call__(*args): return _Freestyle.ExternalContourUP1D___call__(*args)
-    def __init__(self, *args): 
-        this = _Freestyle.new_ExternalContourUP1D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_ExternalContourUP1D
-    __del__ = lambda self : None;
-ExternalContourUP1D_swigregister = _Freestyle.ExternalContourUP1D_swigregister
-ExternalContourUP1D_swigregister(ExternalContourUP1D)
-
-class EqualToTimeStampUP1D(UnaryPredicate1D):
-    __swig_setmethods__ = {}
-    for _s in [UnaryPredicate1D]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, EqualToTimeStampUP1D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryPredicate1D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, EqualToTimeStampUP1D, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_EqualToTimeStampUP1D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def getName(*args): return _Freestyle.EqualToTimeStampUP1D_getName(*args)
-    def __call__(*args): return _Freestyle.EqualToTimeStampUP1D___call__(*args)
-    __swig_destroy__ = _Freestyle.delete_EqualToTimeStampUP1D
-    __del__ = lambda self : None;
-EqualToTimeStampUP1D_swigregister = _Freestyle.EqualToTimeStampUP1D_swigregister
-EqualToTimeStampUP1D_swigregister(EqualToTimeStampUP1D)
-
-class EqualToChainingTimeStampUP1D(UnaryPredicate1D):
-    __swig_setmethods__ = {}
-    for _s in [UnaryPredicate1D]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, EqualToChainingTimeStampUP1D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryPredicate1D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, EqualToChainingTimeStampUP1D, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_EqualToChainingTimeStampUP1D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def getName(*args): return _Freestyle.EqualToChainingTimeStampUP1D_getName(*args)
-    def __call__(*args): return _Freestyle.EqualToChainingTimeStampUP1D___call__(*args)
-    __swig_destroy__ = _Freestyle.delete_EqualToChainingTimeStampUP1D
-    __del__ = lambda self : None;
-EqualToChainingTimeStampUP1D_swigregister = _Freestyle.EqualToChainingTimeStampUP1D_swigregister
-EqualToChainingTimeStampUP1D_swigregister(EqualToChainingTimeStampUP1D)
-
-class ShapeUP1D(UnaryPredicate1D):
-    __swig_setmethods__ = {}
-    for _s in [UnaryPredicate1D]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ShapeUP1D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryPredicate1D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, ShapeUP1D, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_ShapeUP1D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def getName(*args): return _Freestyle.ShapeUP1D_getName(*args)
-    def __call__(*args): return _Freestyle.ShapeUP1D___call__(*args)
-    __swig_destroy__ = _Freestyle.delete_ShapeUP1D
-    __del__ = lambda self : None;
-ShapeUP1D_swigregister = _Freestyle.ShapeUP1D_swigregister
-ShapeUP1D_swigregister(ShapeUP1D)
-
-class TrueBP1D(BinaryPredicate1D):
-    __swig_setmethods__ = {}
-    for _s in [BinaryPredicate1D]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, TrueBP1D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [BinaryPredicate1D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, TrueBP1D, name)
-    __repr__ = _swig_repr
-    def getName(*args): return _Freestyle.TrueBP1D_getName(*args)
-    def __call__(*args): return _Freestyle.TrueBP1D___call__(*args)
-    def __init__(self, *args): 
-        this = _Freestyle.new_TrueBP1D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_TrueBP1D
-    __del__ = lambda self : None;
-TrueBP1D_swigregister = _Freestyle.TrueBP1D_swigregister
-TrueBP1D_swigregister(TrueBP1D)
-
-class FalseBP1D(BinaryPredicate1D):
-    __swig_setmethods__ = {}
-    for _s in [BinaryPredicate1D]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, FalseBP1D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [BinaryPredicate1D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, FalseBP1D, name)
-    __repr__ = _swig_repr
-    def getName(*args): return _Freestyle.FalseBP1D_getName(*args)
-    def __call__(*args): return _Freestyle.FalseBP1D___call__(*args)
-    def __init__(self, *args): 
-        this = _Freestyle.new_FalseBP1D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_FalseBP1D
-    __del__ = lambda self : None;
-FalseBP1D_swigregister = _Freestyle.FalseBP1D_swigregister
-FalseBP1D_swigregister(FalseBP1D)
-
-class Length2DBP1D(BinaryPredicate1D):
-    __swig_setmethods__ = {}
-    for _s in [BinaryPredicate1D]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Length2DBP1D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [BinaryPredicate1D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, Length2DBP1D, name)
-    __repr__ = _swig_repr
-    def getName(*args): return _Freestyle.Length2DBP1D_getName(*args)
-    def __call__(*args): return _Freestyle.Length2DBP1D___call__(*args)
-    def __init__(self, *args): 
-        this = _Freestyle.new_Length2DBP1D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_Length2DBP1D
-    __del__ = lambda self : None;
-Length2DBP1D_swigregister = _Freestyle.Length2DBP1D_swigregister
-Length2DBP1D_swigregister(Length2DBP1D)
-
-class SameShapeIdBP1D(BinaryPredicate1D):
-    __swig_setmethods__ = {}
-    for _s in [BinaryPredicate1D]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, SameShapeIdBP1D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [BinaryPredicate1D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, SameShapeIdBP1D, name)
-    __repr__ = _swig_repr
-    def getName(*args): return _Freestyle.SameShapeIdBP1D_getName(*args)
-    def __call__(*args): return _Freestyle.SameShapeIdBP1D___call__(*args)
-    def __init__(self, *args): 
-        this = _Freestyle.new_SameShapeIdBP1D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_SameShapeIdBP1D
-    __del__ = lambda self : None;
-SameShapeIdBP1D_swigregister = _Freestyle.SameShapeIdBP1D_swigregister
-SameShapeIdBP1D_swigregister(SameShapeIdBP1D)
-
-class ViewMapGradientNormBP1D(BinaryPredicate1D):
-    __swig_setmethods__ = {}
-    for _s in [BinaryPredicate1D]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ViewMapGradientNormBP1D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [BinaryPredicate1D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, ViewMapGradientNormBP1D, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_ViewMapGradientNormBP1D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def getName(*args): return _Freestyle.ViewMapGradientNormBP1D_getName(*args)
-    def __call__(*args): return _Freestyle.ViewMapGradientNormBP1D___call__(*args)
-    __swig_destroy__ = _Freestyle.delete_ViewMapGradientNormBP1D
-    __del__ = lambda self : None;
-ViewMapGradientNormBP1D_swigregister = _Freestyle.ViewMapGradientNormBP1D_swigregister
-ViewMapGradientNormBP1D_swigregister(ViewMapGradientNormBP1D)
-
-class DensityLowerThanUP1D(UnaryPredicate1D):
-    __swig_setmethods__ = {}
-    for _s in [UnaryPredicate1D]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, DensityLowerThanUP1D, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UnaryPredicate1D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, DensityLowerThanUP1D, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_DensityLowerThanUP1D(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def getName(*args): return _Freestyle.DensityLowerThanUP1D_getName(*args)
-    def __call__(*args): return _Freestyle.DensityLowerThanUP1D___call__(*args)
-    __swig_destroy__ = _Freestyle.delete_DensityLowerThanUP1D
-    __del__ = lambda self : None;
-DensityLowerThanUP1D_swigregister = _Freestyle.DensityLowerThanUP1D_swigregister
-DensityLowerThanUP1D_swigregister(DensityLowerThanUP1D)
-
-class CurvePointIterator(Interface0DIteratorNested):
-    __swig_setmethods__ = {}
-    for _s in [Interface0DIteratorNested]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CurvePointIterator, name, value)
-    __swig_getmethods__ = {}
-    for _s in [Interface0DIteratorNested]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, CurvePointIterator, name)
-    __repr__ = _swig_repr
-    __swig_setmethods__["_CurvilinearLength"] = _Freestyle.CurvePointIterator__CurvilinearLength_set
-    __swig_getmethods__["_CurvilinearLength"] = _Freestyle.CurvePointIterator__CurvilinearLength_get
-    if _newclass:_CurvilinearLength = _swig_property(_Freestyle.CurvePointIterator__CurvilinearLength_get, _Freestyle.CurvePointIterator__CurvilinearLength_set)
-    __swig_setmethods__["_step"] = _Freestyle.CurvePointIterator__step_set
-    __swig_getmethods__["_step"] = _Freestyle.CurvePointIterator__step_get
-    if _newclass:_step = _swig_property(_Freestyle.CurvePointIterator__step_get, _Freestyle.CurvePointIterator__step_set)
-    __swig_setmethods__["__A"] = _Freestyle.CurvePointIterator___A_set
-    __swig_getmethods__["__A"] = _Freestyle.CurvePointIterator___A_get
-    if _newclass:__A = _swig_property(_Freestyle.CurvePointIterator___A_get, _Freestyle.CurvePointIterator___A_set)
-    __swig_setmethods__["__B"] = _Freestyle.CurvePointIterator___B_set
-    __swig_getmethods__["__B"] = _Freestyle.CurvePointIterator___B_get
-    if _newclass:__B = _swig_property(_Freestyle.CurvePointIterator___B_get, _Freestyle.CurvePointIterator___B_set)
-    __swig_setmethods__["_begin"] = _Freestyle.CurvePointIterator__begin_set
-    __swig_getmethods__["_begin"] = _Freestyle.CurvePointIterator__begin_get
-    if _newclass:_begin = _swig_property(_Freestyle.CurvePointIterator__begin_get, _Freestyle.CurvePointIterator__begin_set)
-    __swig_setmethods__["_end"] = _Freestyle.CurvePointIterator__end_set
-    __swig_getmethods__["_end"] = _Freestyle.CurvePointIterator__end_get
-    if _newclass:_end = _swig_property(_Freestyle.CurvePointIterator__end_get, _Freestyle.CurvePointIterator__end_set)
-    __swig_setmethods__["_n"] = _Freestyle.CurvePointIterator__n_set
-    __swig_getmethods__["_n"] = _Freestyle.CurvePointIterator__n_get
-    if _newclass:_n = _swig_property(_Freestyle.CurvePointIterator__n_get, _Freestyle.CurvePointIterator__n_set)
-    __swig_setmethods__["_currentn"] = _Freestyle.CurvePointIterator__currentn_set
-    __swig_getmethods__["_currentn"] = _Freestyle.CurvePointIterator__currentn_get
-    if _newclass:_currentn = _swig_property(_Freestyle.CurvePointIterator__currentn_get, _Freestyle.CurvePointIterator__currentn_set)
-    __swig_setmethods__["_t"] = _Freestyle.CurvePointIterator__t_set
-    __swig_getmethods__["_t"] = _Freestyle.CurvePointIterator__t_get
-    if _newclass:_t = _swig_property(_Freestyle.CurvePointIterator__t_get, _Freestyle.CurvePointIterator__t_set)
-    __swig_setmethods__["_Point"] = _Freestyle.CurvePointIterator__Point_set
-    __swig_getmethods__["_Point"] = _Freestyle.CurvePointIterator__Point_get
-    if _newclass:_Point = _swig_property(_Freestyle.CurvePointIterator__Point_get, _Freestyle.CurvePointIterator__Point_set)
-    __swig_setmethods__["_CurveLength"] = _Freestyle.CurvePointIterator__CurveLength_set
-    __swig_getmethods__["_CurveLength"] = _Freestyle.CurvePointIterator__CurveLength_get
-    if _newclass:_CurveLength = _swig_property(_Freestyle.CurvePointIterator__CurveLength_get, _Freestyle.CurvePointIterator__CurveLength_set)
-    def __init__(self, *args): 
-        this = _Freestyle.new_CurvePointIterator(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_CurvePointIterator
-    __del__ = lambda self : None;
-    def copy(*args): return _Freestyle.CurvePointIterator_copy(*args)
-    def castToInterface0DIterator(*args): return _Freestyle.CurvePointIterator_castToInterface0DIterator(*args)
-    def getExactTypeName(*args): return _Freestyle.CurvePointIterator_getExactTypeName(*args)
-    def __eq__(*args): return _Freestyle.CurvePointIterator___eq__(*args)
-    def getObject(*args): return _Freestyle.CurvePointIterator_getObject(*args)
-    def __deref__(*args): return _Freestyle.CurvePointIterator___deref__(*args)
-    def isBegin(*args): return _Freestyle.CurvePointIterator_isBegin(*args)
-    def isEnd(*args): return _Freestyle.CurvePointIterator_isEnd(*args)
-    def increment(*args): return _Freestyle.CurvePointIterator_increment(*args)
-    def decrement(*args): return _Freestyle.CurvePointIterator_decrement(*args)
-    def t(*args): return _Freestyle.CurvePointIterator_t(*args)
-    def u(*args): return _Freestyle.CurvePointIterator_u(*args)
-    def getX(*args): return _Freestyle.CurvePointIterator_getX(*args)
-    def getY(*args): return _Freestyle.CurvePointIterator_getY(*args)
-    def getZ(*args): return _Freestyle.CurvePointIterator_getZ(*args)
-    def getPoint3D(*args): return _Freestyle.CurvePointIterator_getPoint3D(*args)
-    def getProjectedX(*args): return _Freestyle.CurvePointIterator_getProjectedX(*args)
-    def getProjectedY(*args): return _Freestyle.CurvePointIterator_getProjectedY(*args)
-    def getProjectedZ(*args): return _Freestyle.CurvePointIterator_getProjectedZ(*args)
-    def getPoint2D(*args): return _Freestyle.CurvePointIterator_getPoint2D(*args)
-    def getFEdge(*args): return _Freestyle.CurvePointIterator_getFEdge(*args)
-    def getId(*args): return _Freestyle.CurvePointIterator_getId(*args)
-    def getNature(*args): return _Freestyle.CurvePointIterator_getNature(*args)
-    def castToSVertex(*args): return _Freestyle.CurvePointIterator_castToSVertex(*args)
-    def castToViewVertex(*args): return _Freestyle.CurvePointIterator_castToViewVertex(*args)
-    def castToNonTVertex(*args): return _Freestyle.CurvePointIterator_castToNonTVertex(*args)
-    def castToTVertex(*args): return _Freestyle.CurvePointIterator_castToTVertex(*args)
-    def A(*args): return _Freestyle.CurvePointIterator_A(*args)
-    def B(*args): return _Freestyle.CurvePointIterator_B(*args)
-    def t2d(*args): return _Freestyle.CurvePointIterator_t2d(*args)
-    def setA(*args): return _Freestyle.CurvePointIterator_setA(*args)
-    def setB(*args): return _Freestyle.CurvePointIterator_setB(*args)
-    def setT2d(*args): return _Freestyle.CurvePointIterator_setT2d(*args)
-    def fedge(*args): return _Freestyle.CurvePointIterator_fedge(*args)
-    def point2d(*args): return _Freestyle.CurvePointIterator_point2d(*args)
-    def point3d(*args): return _Freestyle.CurvePointIterator_point3d(*args)
-    def normal(*args): return _Freestyle.CurvePointIterator_normal(*args)
-    def shape(*args): return _Freestyle.CurvePointIterator_shape(*args)
-    def occluders_begin(*args): return _Freestyle.CurvePointIterator_occluders_begin(*args)
-    def occluders_end(*args): return _Freestyle.CurvePointIterator_occluders_end(*args)
-    def occluders_empty(*args): return _Freestyle.CurvePointIterator_occluders_empty(*args)
-    def occluders_size(*args): return _Freestyle.CurvePointIterator_occluders_size(*args)
-    def occludee(*args): return _Freestyle.CurvePointIterator_occludee(*args)
-    def occluded_shape(*args): return _Freestyle.CurvePointIterator_occluded_shape(*args)
-    def occludee_empty(*args): return _Freestyle.CurvePointIterator_occludee_empty(*args)
-    def z_discontinuity(*args): return _Freestyle.CurvePointIterator_z_discontinuity(*args)
-    def curvatureFredo(*args): return _Freestyle.CurvePointIterator_curvatureFredo(*args)
-    def directionFredo(*args): return _Freestyle.CurvePointIterator_directionFredo(*args)
-CurvePointIterator_swigregister = _Freestyle.CurvePointIterator_swigregister
-CurvePointIterator_swigregister(CurvePointIterator)
-
-class CurvePoint(Interface0D):
-    __swig_setmethods__ = {}
-    for _s in [Interface0D]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CurvePoint, name, value)
-    __swig_getmethods__ = {}
-    for _s in [Interface0D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, CurvePoint, name)
-    __repr__ = _swig_repr
-    def getExactTypeName(*args): return _Freestyle.CurvePoint_getExactTypeName(*args)
-    def getX(*args): return _Freestyle.CurvePoint_getX(*args)
-    def getY(*args): return _Freestyle.CurvePoint_getY(*args)
-    def getZ(*args): return _Freestyle.CurvePoint_getZ(*args)
-    def getPoint3D(*args): return _Freestyle.CurvePoint_getPoint3D(*args)
-    def getProjectedX(*args): return _Freestyle.CurvePoint_getProjectedX(*args)
-    def getProjectedY(*args): return _Freestyle.CurvePoint_getProjectedY(*args)
-    def getProjectedZ(*args): return _Freestyle.CurvePoint_getProjectedZ(*args)
-    def getPoint2D(*args): return _Freestyle.CurvePoint_getPoint2D(*args)
-    def getFEdge(*args): return _Freestyle.CurvePoint_getFEdge(*args)
-    def getId(*args): return _Freestyle.CurvePoint_getId(*args)
-    def getNature(*args): return _Freestyle.CurvePoint_getNature(*args)
-    def castToSVertex(*args): return _Freestyle.CurvePoint_castToSVertex(*args)
-    def castToViewVertex(*args): return _Freestyle.CurvePoint_castToViewVertex(*args)
-    def castToNonTVertex(*args): return _Freestyle.CurvePoint_castToNonTVertex(*args)
-    def castToTVertex(*args): return _Freestyle.CurvePoint_castToTVertex(*args)
-    def __init__(self, *args): 
-        this = _Freestyle.new_CurvePoint(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_CurvePoint
-    __del__ = lambda self : None;
-    def __eq__(*args): return _Freestyle.CurvePoint___eq__(*args)
-    def A(*args): return _Freestyle.CurvePoint_A(*args)
-    def B(*args): return _Freestyle.CurvePoint_B(*args)
-    def t2d(*args): return _Freestyle.CurvePoint_t2d(*args)
-    def setA(*args): return _Freestyle.CurvePoint_setA(*args)
-    def setB(*args): return _Freestyle.CurvePoint_setB(*args)
-    def setT2d(*args): return _Freestyle.CurvePoint_setT2d(*args)
-    def fedge(*args): return _Freestyle.CurvePoint_fedge(*args)
-    def point2d(*args): return _Freestyle.CurvePoint_point2d(*args)
-    def point3d(*args): return _Freestyle.CurvePoint_point3d(*args)
-    def normal(*args): return _Freestyle.CurvePoint_normal(*args)
-    def shape(*args): return _Freestyle.CurvePoint_shape(*args)
-    def occluders_begin(*args): return _Freestyle.CurvePoint_occluders_begin(*args)
-    def occluders_end(*args): return _Freestyle.CurvePoint_occluders_end(*args)
-    def occluders_empty(*args): return _Freestyle.CurvePoint_occluders_empty(*args)
-    def occluders_size(*args): return _Freestyle.CurvePoint_occluders_size(*args)
-    def occludee(*args): return _Freestyle.CurvePoint_occludee(*args)
-    def occluded_shape(*args): return _Freestyle.CurvePoint_occluded_shape(*args)
-    def occludee_empty(*args): return _Freestyle.CurvePoint_occludee_empty(*args)
-    def z_discontinuity(*args): return _Freestyle.CurvePoint_z_discontinuity(*args)
-    def curvatureFredo(*args): return _Freestyle.CurvePoint_curvatureFredo(*args)
-    def directionFredo(*args): return _Freestyle.CurvePoint_directionFredo(*args)
-CurvePoint_swigregister = _Freestyle.CurvePoint_swigregister
-CurvePoint_swigregister(CurvePoint)
-
-class Curve(Interface1D):
-    __swig_setmethods__ = {}
-    for _s in [Interface1D]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Curve, name, value)
-    __swig_getmethods__ = {}
-    for _s in [Interface1D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, Curve, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_Curve(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_Curve
-    __del__ = lambda self : None;
-    def computeCurvatureAndOrientation(*args): return _Freestyle.Curve_computeCurvatureAndOrientation(*args)
-    def push_vertex_back(*args): return _Freestyle.Curve_push_vertex_back(*args)
-    def push_vertex_front(*args): return _Freestyle.Curve_push_vertex_front(*args)
-    def empty(*args): return _Freestyle.Curve_empty(*args)
-    def getLength2D(*args): return _Freestyle.Curve_getLength2D(*args)
-    def getId(*args): return _Freestyle.Curve_getId(*args)
-    def nSegments(*args): return _Freestyle.Curve_nSegments(*args)
-    def setId(*args): return _Freestyle.Curve_setId(*args)
-    def curvePointsBegin(*args): return _Freestyle.Curve_curvePointsBegin(*args)
-    def curvePointsEnd(*args): return _Freestyle.Curve_curvePointsEnd(*args)
-    def curveVerticesBegin(*args): return _Freestyle.Curve_curveVerticesBegin(*args)
-    def curveVerticesEnd(*args): return _Freestyle.Curve_curveVerticesEnd(*args)
-    def verticesBegin(*args): return _Freestyle.Curve_verticesBegin(*args)
-    def verticesEnd(*args): return _Freestyle.Curve_verticesEnd(*args)
-    def pointsBegin(*args): return _Freestyle.Curve_pointsBegin(*args)
-    def pointsEnd(*args): return _Freestyle.Curve_pointsEnd(*args)
-Curve_swigregister = _Freestyle.Curve_swigregister
-Curve_swigregister(Curve)
-
-class StrokeVertexIterator(Interface0DIteratorNested):
-    __swig_setmethods__ = {}
-    for _s in [Interface0DIteratorNested]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, StrokeVertexIterator, name, value)
-    __swig_getmethods__ = {}
-    for _s in [Interface0DIteratorNested]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, StrokeVertexIterator, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_StrokeVertexIterator(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_StrokeVertexIterator
-    __del__ = lambda self : None;
-    def castToInterface0DIterator(*args): return _Freestyle.StrokeVertexIterator_castToInterface0DIterator(*args)
-    def getExactTypeName(*args): return _Freestyle.StrokeVertexIterator_getExactTypeName(*args)
-    def getObject(*args): return _Freestyle.StrokeVertexIterator_getObject(*args)
-    def __deref__(*args): return _Freestyle.StrokeVertexIterator___deref__(*args)
-    def increment(*args): return _Freestyle.StrokeVertexIterator_increment(*args)
-    def decrement(*args): return _Freestyle.StrokeVertexIterator_decrement(*args)
-    def isBegin(*args): return _Freestyle.StrokeVertexIterator_isBegin(*args)
-    def isEnd(*args): return _Freestyle.StrokeVertexIterator_isEnd(*args)
-    def __eq__(*args): return _Freestyle.StrokeVertexIterator___eq__(*args)
-    def t(*args): return _Freestyle.StrokeVertexIterator_t(*args)
-    def u(*args): return _Freestyle.StrokeVertexIterator_u(*args)
-    def copy(*args): return _Freestyle.StrokeVertexIterator_copy(*args)
-    def getIt(*args): return _Freestyle.StrokeVertexIterator_getIt(*args)
-    def x(*args): return _Freestyle.StrokeVertexIterator_x(*args)
-    def y(*args): return _Freestyle.StrokeVertexIterator_y(*args)
-    def getPoint(*args): return _Freestyle.StrokeVertexIterator_getPoint(*args)
-    def attribute(*args): return _Freestyle.StrokeVertexIterator_attribute(*args)
-    def curvilinearAbscissa(*args): return _Freestyle.StrokeVertexIterator_curvilinearAbscissa(*args)
-    def strokeLength(*args): return _Freestyle.StrokeVertexIterator_strokeLength(*args)
-    def setX(*args): return _Freestyle.StrokeVertexIterator_setX(*args)
-    def setY(*args): return _Freestyle.StrokeVertexIterator_setY(*args)
-    def setPoint(*args): return _Freestyle.StrokeVertexIterator_setPoint(*args)
-    def setAttribute(*args): return _Freestyle.StrokeVertexIterator_setAttribute(*args)
-    def setCurvilinearAbscissa(*args): return _Freestyle.StrokeVertexIterator_setCurvilinearAbscissa(*args)
-    def setStrokeLength(*args): return _Freestyle.StrokeVertexIterator_setStrokeLength(*args)
-    def getX(*args): return _Freestyle.StrokeVertexIterator_getX(*args)
-    def getY(*args): return _Freestyle.StrokeVertexIterator_getY(*args)
-    def getZ(*args): return _Freestyle.StrokeVertexIterator_getZ(*args)
-    def getPoint3D(*args): return _Freestyle.StrokeVertexIterator_getPoint3D(*args)
-    def getProjectedX(*args): return _Freestyle.StrokeVertexIterator_getProjectedX(*args)
-    def getProjectedY(*args): return _Freestyle.StrokeVertexIterator_getProjectedY(*args)
-    def getProjectedZ(*args): return _Freestyle.StrokeVertexIterator_getProjectedZ(*args)
-    def getPoint2D(*args): return _Freestyle.StrokeVertexIterator_getPoint2D(*args)
-    def getFEdge(*args): return _Freestyle.StrokeVertexIterator_getFEdge(*args)
-    def getId(*args): return _Freestyle.StrokeVertexIterator_getId(*args)
-    def getNature(*args): return _Freestyle.StrokeVertexIterator_getNature(*args)
-    def castToSVertex(*args): return _Freestyle.StrokeVertexIterator_castToSVertex(*args)
-    def castToViewVertex(*args): return _Freestyle.StrokeVertexIterator_castToViewVertex(*args)
-    def castToNonTVertex(*args): return _Freestyle.StrokeVertexIterator_castToNonTVertex(*args)
-    def castToTVertex(*args): return _Freestyle.StrokeVertexIterator_castToTVertex(*args)
-    def A(*args): return _Freestyle.StrokeVertexIterator_A(*args)
-    def B(*args): return _Freestyle.StrokeVertexIterator_B(*args)
-    def t2d(*args): return _Freestyle.StrokeVertexIterator_t2d(*args)
-    def setA(*args): return _Freestyle.StrokeVertexIterator_setA(*args)
-    def setB(*args): return _Freestyle.StrokeVertexIterator_setB(*args)
-    def setT2d(*args): return _Freestyle.StrokeVertexIterator_setT2d(*args)
-    def fedge(*args): return _Freestyle.StrokeVertexIterator_fedge(*args)
-    def point2d(*args): return _Freestyle.StrokeVertexIterator_point2d(*args)
-    def point3d(*args): return _Freestyle.StrokeVertexIterator_point3d(*args)
-    def normal(*args): return _Freestyle.StrokeVertexIterator_normal(*args)
-    def shape(*args): return _Freestyle.StrokeVertexIterator_shape(*args)
-    def occluders_begin(*args): return _Freestyle.StrokeVertexIterator_occluders_begin(*args)
-    def occluders_end(*args): return _Freestyle.StrokeVertexIterator_occluders_end(*args)
-    def occluders_empty(*args): return _Freestyle.StrokeVertexIterator_occluders_empty(*args)
-    def occluders_size(*args): return _Freestyle.StrokeVertexIterator_occluders_size(*args)
-    def occludee(*args): return _Freestyle.StrokeVertexIterator_occludee(*args)
-    def occluded_shape(*args): return _Freestyle.StrokeVertexIterator_occluded_shape(*args)
-    def occludee_empty(*args): return _Freestyle.StrokeVertexIterator_occludee_empty(*args)
-    def z_discontinuity(*args): return _Freestyle.StrokeVertexIterator_z_discontinuity(*args)
-    def curvatureFredo(*args): return _Freestyle.StrokeVertexIterator_curvatureFredo(*args)
-    def directionFredo(*args): return _Freestyle.StrokeVertexIterator_directionFredo(*args)
-StrokeVertexIterator_swigregister = _Freestyle.StrokeVertexIterator_swigregister
-StrokeVertexIterator_swigregister(StrokeVertexIterator)
-
-class StrokeAttribute(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, StrokeAttribute, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, StrokeAttribute, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_StrokeAttribute(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_StrokeAttribute
-    __del__ = lambda self : None;
-    def getColor(*args): return _Freestyle.StrokeAttribute_getColor(*args)
-    def getColorR(*args): return _Freestyle.StrokeAttribute_getColorR(*args)
-    def getColorG(*args): return _Freestyle.StrokeAttribute_getColorG(*args)
-    def getColorB(*args): return _Freestyle.StrokeAttribute_getColorB(*args)
-    def getColorRGB(*args): return _Freestyle.StrokeAttribute_getColorRGB(*args)
-    def getAlpha(*args): return _Freestyle.StrokeAttribute_getAlpha(*args)
-    def getThickness(*args): return _Freestyle.StrokeAttribute_getThickness(*args)
-    def getThicknessR(*args): return _Freestyle.StrokeAttribute_getThicknessR(*args)
-    def getThicknessL(*args): return _Freestyle.StrokeAttribute_getThicknessL(*args)
-    def getThicknessRL(*args): return _Freestyle.StrokeAttribute_getThicknessRL(*args)
-    def isVisible(*args): return _Freestyle.StrokeAttribute_isVisible(*args)
-    def getAttributeReal(*args): return _Freestyle.StrokeAttribute_getAttributeReal(*args)
-    def getAttributeVec2f(*args): return _Freestyle.StrokeAttribute_getAttributeVec2f(*args)
-    def getAttributeVec3f(*args): return _Freestyle.StrokeAttribute_getAttributeVec3f(*args)
-    def isAttributeAvailableReal(*args): return _Freestyle.StrokeAttribute_isAttributeAvailableReal(*args)
-    def isAttributeAvailableVec2f(*args): return _Freestyle.StrokeAttribute_isAttributeAvailableVec2f(*args)
-    def isAttributeAvailableVec3f(*args): return _Freestyle.StrokeAttribute_isAttributeAvailableVec3f(*args)
-    def setColor(*args): return _Freestyle.StrokeAttribute_setColor(*args)
-    def setAlpha(*args): return _Freestyle.StrokeAttribute_setAlpha(*args)
-    def setThickness(*args): return _Freestyle.StrokeAttribute_setThickness(*args)
-    def setVisible(*args): return _Freestyle.StrokeAttribute_setVisible(*args)
-    def setAttributeReal(*args): return _Freestyle.StrokeAttribute_setAttributeReal(*args)
-    def setAttributeVec2f(*args): return _Freestyle.StrokeAttribute_setAttributeVec2f(*args)
-    def setAttributeVec3f(*args): return _Freestyle.StrokeAttribute_setAttributeVec3f(*args)
-StrokeAttribute_swigregister = _Freestyle.StrokeAttribute_swigregister
-StrokeAttribute_swigregister(StrokeAttribute)
-
-class StrokeVertex(CurvePoint):
-    __swig_setmethods__ = {}
-    for _s in [CurvePoint]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, StrokeVertex, name, value)
-    __swig_getmethods__ = {}
-    for _s in [CurvePoint]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, StrokeVertex, name)
-    __repr__ = _swig_repr
-    def getExactTypeName(*args): return _Freestyle.StrokeVertex_getExactTypeName(*args)
-    def __init__(self, *args): 
-        this = _Freestyle.new_StrokeVertex(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_StrokeVertex
-    __del__ = lambda self : None;
-    def x(*args): return _Freestyle.StrokeVertex_x(*args)
-    def y(*args): return _Freestyle.StrokeVertex_y(*args)
-    def getPoint(*args): return _Freestyle.StrokeVertex_getPoint(*args)
-    def attribute(*args): return _Freestyle.StrokeVertex_attribute(*args)
-    def curvilinearAbscissa(*args): return _Freestyle.StrokeVertex_curvilinearAbscissa(*args)
-    def strokeLength(*args): return _Freestyle.StrokeVertex_strokeLength(*args)
-    def u(*args): return _Freestyle.StrokeVertex_u(*args)
-    def setX(*args): return _Freestyle.StrokeVertex_setX(*args)
-    def setY(*args): return _Freestyle.StrokeVertex_setY(*args)
-    def setPoint(*args): return _Freestyle.StrokeVertex_setPoint(*args)
-    def setAttribute(*args): return _Freestyle.StrokeVertex_setAttribute(*args)
-    def setCurvilinearAbscissa(*args): return _Freestyle.StrokeVertex_setCurvilinearAbscissa(*args)
-    def setStrokeLength(*args): return _Freestyle.StrokeVertex_setStrokeLength(*args)
-StrokeVertex_swigregister = _Freestyle.StrokeVertex_swigregister
-StrokeVertex_swigregister(StrokeVertex)
-
-class Stroke(Interface1D):
-    __swig_setmethods__ = {}
-    for _s in [Interface1D]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Stroke, name, value)
-    __swig_getmethods__ = {}
-    for _s in [Interface1D]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, Stroke, name)
-    __repr__ = _swig_repr
-    def getExactTypeName(*args): return _Freestyle.Stroke_getExactTypeName(*args)
-    def getId(*args): return _Freestyle.Stroke_getId(*args)
-    DRY_MEDIUM = _Freestyle.Stroke_DRY_MEDIUM
-    HUMID_MEDIUM = _Freestyle.Stroke_HUMID_MEDIUM
-    OPAQUE_MEDIUM = _Freestyle.Stroke_OPAQUE_MEDIUM
-    def __init__(self, *args): 
-        this = _Freestyle.new_Stroke(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_Stroke
-    __del__ = lambda self : None;
-    def ComputeSampling(*args): return _Freestyle.Stroke_ComputeSampling(*args)
-    def Resample(*args): return _Freestyle.Stroke_Resample(*args)
-    def RemoveVertex(*args): return _Freestyle.Stroke_RemoveVertex(*args)
-    def InsertVertex(*args): return _Freestyle.Stroke_InsertVertex(*args)
-    def Render(*args): return _Freestyle.Stroke_Render(*args)
-    def RenderBasic(*args): return _Freestyle.Stroke_RenderBasic(*args)
-    def getLength2D(*args): return _Freestyle.Stroke_getLength2D(*args)
-    def getMediumType(*args): return _Freestyle.Stroke_getMediumType(*args)
-    def getTextureId(*args): return _Freestyle.Stroke_getTextureId(*args)
-    def hasTips(*args): return _Freestyle.Stroke_hasTips(*args)
-    def vertices_size(*args): return _Freestyle.Stroke_vertices_size(*args)
-    def viewedges_begin(*args): return _Freestyle.Stroke_viewedges_begin(*args)
-    def viewedges_end(*args): return _Freestyle.Stroke_viewedges_end(*args)
-    def viewedges_size(*args): return _Freestyle.Stroke_viewedges_size(*args)
-    def getBeginningOrientation(*args): return _Freestyle.Stroke_getBeginningOrientation(*args)
-    def getBeginningOrientationX(*args): return _Freestyle.Stroke_getBeginningOrientationX(*args)
-    def getBeginningOrientationY(*args): return _Freestyle.Stroke_getBeginningOrientationY(*args)
-    def getEndingOrientation(*args): return _Freestyle.Stroke_getEndingOrientation(*args)
-    def getEndingOrientationX(*args): return _Freestyle.Stroke_getEndingOrientationX(*args)
-    def getEndingOrientationY(*args): return _Freestyle.Stroke_getEndingOrientationY(*args)
-    def setId(*args): return _Freestyle.Stroke_setId(*args)
-    def setLength(*args): return _Freestyle.Stroke_setLength(*args)
-    def setMediumType(*args): return _Freestyle.Stroke_setMediumType(*args)
-    def setTextureId(*args): return _Freestyle.Stroke_setTextureId(*args)
-    def setTips(*args): return _Freestyle.Stroke_setTips(*args)
-    def push_back(*args): return _Freestyle.Stroke_push_back(*args)
-    def push_front(*args): return _Freestyle.Stroke_push_front(*args)
-    def AddViewEdge(*args): return _Freestyle.Stroke_AddViewEdge(*args)
-    def setBeginningOrientation(*args): return _Freestyle.Stroke_setBeginningOrientation(*args)
-    def setEndingOrientation(*args): return _Freestyle.Stroke_setEndingOrientation(*args)
-    def strokeVerticesBegin(*args): return _Freestyle.Stroke_strokeVerticesBegin(*args)
-    def strokeVerticesEnd(*args): return _Freestyle.Stroke_strokeVerticesEnd(*args)
-    def strokeVerticesSize(*args): return _Freestyle.Stroke_strokeVerticesSize(*args)
-    def verticesBegin(*args): return _Freestyle.Stroke_verticesBegin(*args)
-    def verticesEnd(*args): return _Freestyle.Stroke_verticesEnd(*args)
-    def pointsBegin(*args): return _Freestyle.Stroke_pointsBegin(*args)
-    def pointsEnd(*args): return _Freestyle.Stroke_pointsEnd(*args)
-Stroke_swigregister = _Freestyle.Stroke_swigregister
-Stroke_swigregister(Stroke)
-
-class ShadersContainer(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ShadersContainer, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, ShadersContainer, name)
-    __repr__ = _swig_repr
-    def iterator(*args): return _Freestyle.ShadersContainer_iterator(*args)
-    def __iter__(self): return self.iterator()
-    def __nonzero__(*args): return _Freestyle.ShadersContainer___nonzero__(*args)
-    def __len__(*args): return _Freestyle.ShadersContainer___len__(*args)
-    def pop(*args): return _Freestyle.ShadersContainer_pop(*args)
-    def __getslice__(*args): return _Freestyle.ShadersContainer___getslice__(*args)
-    def __setslice__(*args): return _Freestyle.ShadersContainer___setslice__(*args)
-    def __delslice__(*args): return _Freestyle.ShadersContainer___delslice__(*args)
-    def __delitem__(*args): return _Freestyle.ShadersContainer___delitem__(*args)
-    def __getitem__(*args): return _Freestyle.ShadersContainer___getitem__(*args)
-    def __setitem__(*args): return _Freestyle.ShadersContainer___setitem__(*args)
-    def append(*args): return _Freestyle.ShadersContainer_append(*args)
-    def empty(*args): return _Freestyle.ShadersContainer_empty(*args)
-    def size(*args): return _Freestyle.ShadersContainer_size(*args)
-    def clear(*args): return _Freestyle.ShadersContainer_clear(*args)
-    def swap(*args): return _Freestyle.ShadersContainer_swap(*args)
-    def get_allocator(*args): return _Freestyle.ShadersContainer_get_allocator(*args)
-    def begin(*args): return _Freestyle.ShadersContainer_begin(*args)
-    def end(*args): return _Freestyle.ShadersContainer_end(*args)
-    def rbegin(*args): return _Freestyle.ShadersContainer_rbegin(*args)
-    def rend(*args): return _Freestyle.ShadersContainer_rend(*args)
-    def pop_back(*args): return _Freestyle.ShadersContainer_pop_back(*args)
-    def erase(*args): return _Freestyle.ShadersContainer_erase(*args)
-    def __init__(self, *args): 
-        this = _Freestyle.new_ShadersContainer(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def push_back(*args): return _Freestyle.ShadersContainer_push_back(*args)
-    def front(*args): return _Freestyle.ShadersContainer_front(*args)
-    def back(*args): return _Freestyle.ShadersContainer_back(*args)
-    def assign(*args): return _Freestyle.ShadersContainer_assign(*args)
-    def resize(*args): return _Freestyle.ShadersContainer_resize(*args)
-    def insert(*args): return _Freestyle.ShadersContainer_insert(*args)
-    def reserve(*args): return _Freestyle.ShadersContainer_reserve(*args)
-    def capacity(*args): return _Freestyle.ShadersContainer_capacity(*args)
-    __swig_destroy__ = _Freestyle.delete_ShadersContainer
-    __del__ = lambda self : None;
-ShadersContainer_swigregister = _Freestyle.ShadersContainer_swigregister
-ShadersContainer_swigregister(ShadersContainer)
-
-class StrokeShader(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, StrokeShader, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, StrokeShader, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        if self.__class__ == StrokeShader:
-            args = (None,) + args
-        else:
-            args = (self,) + args
-        this = _Freestyle.new_StrokeShader(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_StrokeShader
-    __del__ = lambda self : None;
-    def getName(*args): return _Freestyle.StrokeShader_getName(*args)
-    def shade(*args): return _Freestyle.StrokeShader_shade(*args)
-    def __disown__(self):
-        self.this.disown()
-        _Freestyle.disown_StrokeShader(self)
-        return weakref_proxy(self)
-StrokeShader_swigregister = _Freestyle.StrokeShader_swigregister
-StrokeShader_swigregister(StrokeShader)
-
-class ConstantThicknessShader(StrokeShader):
-    __swig_setmethods__ = {}
-    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ConstantThicknessShader, name, value)
-    __swig_getmethods__ = {}
-    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, ConstantThicknessShader, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_ConstantThicknessShader(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_ConstantThicknessShader
-    __del__ = lambda self : None;
-    def getName(*args): return _Freestyle.ConstantThicknessShader_getName(*args)
-    def shade(*args): return _Freestyle.ConstantThicknessShader_shade(*args)
-ConstantThicknessShader_swigregister = _Freestyle.ConstantThicknessShader_swigregister
-ConstantThicknessShader_swigregister(ConstantThicknessShader)
-
-class ConstantExternThicknessShader(StrokeShader):
-    __swig_setmethods__ = {}
-    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ConstantExternThicknessShader, name, value)
-    __swig_getmethods__ = {}
-    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, ConstantExternThicknessShader, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_ConstantExternThicknessShader(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_ConstantExternThicknessShader
-    __del__ = lambda self : None;
-    def getName(*args): return _Freestyle.ConstantExternThicknessShader_getName(*args)
-    def shade(*args): return _Freestyle.ConstantExternThicknessShader_shade(*args)
-ConstantExternThicknessShader_swigregister = _Freestyle.ConstantExternThicknessShader_swigregister
-ConstantExternThicknessShader_swigregister(ConstantExternThicknessShader)
-
-class IncreasingThicknessShader(StrokeShader):
-    __swig_setmethods__ = {}
-    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IncreasingThicknessShader, name, value)
-    __swig_getmethods__ = {}
-    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, IncreasingThicknessShader, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_IncreasingThicknessShader(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_IncreasingThicknessShader
-    __del__ = lambda self : None;
-    def shade(*args): return _Freestyle.IncreasingThicknessShader_shade(*args)
-IncreasingThicknessShader_swigregister = _Freestyle.IncreasingThicknessShader_swigregister
-IncreasingThicknessShader_swigregister(IncreasingThicknessShader)
-
-class ConstrainedIncreasingThicknessShader(StrokeShader):
-    __swig_setmethods__ = {}
-    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ConstrainedIncreasingThicknessShader, name, value)
-    __swig_getmethods__ = {}
-    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, ConstrainedIncreasingThicknessShader, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_ConstrainedIncreasingThicknessShader(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_ConstrainedIncreasingThicknessShader
-    __del__ = lambda self : None;
-    def shade(*args): return _Freestyle.ConstrainedIncreasingThicknessShader_shade(*args)
-ConstrainedIncreasingThicknessShader_swigregister = _Freestyle.ConstrainedIncreasingThicknessShader_swigregister
-ConstrainedIncreasingThicknessShader_swigregister(ConstrainedIncreasingThicknessShader)
-
-class LengthDependingThicknessShader(StrokeShader):
-    __swig_setmethods__ = {}
-    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, LengthDependingThicknessShader, name, value)
-    __swig_getmethods__ = {}
-    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, LengthDependingThicknessShader, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_LengthDependingThicknessShader(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_LengthDependingThicknessShader
-    __del__ = lambda self : None;
-    def shade(*args): return _Freestyle.LengthDependingThicknessShader_shade(*args)
-LengthDependingThicknessShader_swigregister = _Freestyle.LengthDependingThicknessShader_swigregister
-LengthDependingThicknessShader_swigregister(LengthDependingThicknessShader)
-
-class ThicknessVariationPatternShader(StrokeShader):
-    __swig_setmethods__ = {}
-    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ThicknessVariationPatternShader, name, value)
-    __swig_getmethods__ = {}
-    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, ThicknessVariationPatternShader, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_ThicknessVariationPatternShader(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_ThicknessVariationPatternShader
-    __del__ = lambda self : None;
-    def shade(*args): return _Freestyle.ThicknessVariationPatternShader_shade(*args)
-ThicknessVariationPatternShader_swigregister = _Freestyle.ThicknessVariationPatternShader_swigregister
-ThicknessVariationPatternShader_swigregister(ThicknessVariationPatternShader)
-
-class ThicknessNoiseShader(StrokeShader):
-    __swig_setmethods__ = {}
-    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ThicknessNoiseShader, name, value)
-    __swig_getmethods__ = {}
-    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, ThicknessNoiseShader, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_ThicknessNoiseShader(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def shade(*args): return _Freestyle.ThicknessNoiseShader_shade(*args)
-    __swig_destroy__ = _Freestyle.delete_ThicknessNoiseShader
-    __del__ = lambda self : None;
-ThicknessNoiseShader_swigregister = _Freestyle.ThicknessNoiseShader_swigregister
-ThicknessNoiseShader_swigregister(ThicknessNoiseShader)
-
-class ConstantColorShader(StrokeShader):
-    __swig_setmethods__ = {}
-    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ConstantColorShader, name, value)
-    __swig_getmethods__ = {}
-    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, ConstantColorShader, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_ConstantColorShader(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def getName(*args): return _Freestyle.ConstantColorShader_getName(*args)
-    def shade(*args): return _Freestyle.ConstantColorShader_shade(*args)
-    __swig_destroy__ = _Freestyle.delete_ConstantColorShader
-    __del__ = lambda self : None;
-ConstantColorShader_swigregister = _Freestyle.ConstantColorShader_swigregister
-ConstantColorShader_swigregister(ConstantColorShader)
-
-class IncreasingColorShader(StrokeShader):
-    __swig_setmethods__ = {}
-    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, IncreasingColorShader, name, value)
-    __swig_getmethods__ = {}
-    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, IncreasingColorShader, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_IncreasingColorShader(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def shade(*args): return _Freestyle.IncreasingColorShader_shade(*args)
-    __swig_destroy__ = _Freestyle.delete_IncreasingColorShader
-    __del__ = lambda self : None;
-IncreasingColorShader_swigregister = _Freestyle.IncreasingColorShader_swigregister
-IncreasingColorShader_swigregister(IncreasingColorShader)
-
-class ColorVariationPatternShader(StrokeShader):
-    __swig_setmethods__ = {}
-    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ColorVariationPatternShader, name, value)
-    __swig_getmethods__ = {}
-    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, ColorVariationPatternShader, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_ColorVariationPatternShader(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_ColorVariationPatternShader
-    __del__ = lambda self : None;
-    def shade(*args): return _Freestyle.ColorVariationPatternShader_shade(*args)
-ColorVariationPatternShader_swigregister = _Freestyle.ColorVariationPatternShader_swigregister
-ColorVariationPatternShader_swigregister(ColorVariationPatternShader)
-
-class MaterialColorShader(StrokeShader):
-    __swig_setmethods__ = {}
-    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, MaterialColorShader, name, value)
-    __swig_getmethods__ = {}
-    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, MaterialColorShader, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_MaterialColorShader(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def shade(*args): return _Freestyle.MaterialColorShader_shade(*args)
-    __swig_destroy__ = _Freestyle.delete_MaterialColorShader
-    __del__ = lambda self : None;
-MaterialColorShader_swigregister = _Freestyle.MaterialColorShader_swigregister
-MaterialColorShader_swigregister(MaterialColorShader)
-
-class CalligraphicColorShader(StrokeShader):
-    __swig_setmethods__ = {}
-    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CalligraphicColorShader, name, value)
-    __swig_getmethods__ = {}
-    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, CalligraphicColorShader, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_CalligraphicColorShader(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def shade(*args): return _Freestyle.CalligraphicColorShader_shade(*args)
-    __swig_destroy__ = _Freestyle.delete_CalligraphicColorShader
-    __del__ = lambda self : None;
-CalligraphicColorShader_swigregister = _Freestyle.CalligraphicColorShader_swigregister
-CalligraphicColorShader_swigregister(CalligraphicColorShader)
-
-class ColorNoiseShader(StrokeShader):
-    __swig_setmethods__ = {}
-    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ColorNoiseShader, name, value)
-    __swig_getmethods__ = {}
-    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, ColorNoiseShader, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_ColorNoiseShader(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def shade(*args): return _Freestyle.ColorNoiseShader_shade(*args)
-    __swig_destroy__ = _Freestyle.delete_ColorNoiseShader
-    __del__ = lambda self : None;
-ColorNoiseShader_swigregister = _Freestyle.ColorNoiseShader_swigregister
-ColorNoiseShader_swigregister(ColorNoiseShader)
-
-class TextureAssignerShader(StrokeShader):
-    __swig_setmethods__ = {}
-    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, TextureAssignerShader, name, value)
-    __swig_getmethods__ = {}
-    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, TextureAssignerShader, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_TextureAssignerShader(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def shade(*args): return _Freestyle.TextureAssignerShader_shade(*args)
-    __swig_destroy__ = _Freestyle.delete_TextureAssignerShader
-    __del__ = lambda self : None;
-TextureAssignerShader_swigregister = _Freestyle.TextureAssignerShader_swigregister
-TextureAssignerShader_swigregister(TextureAssignerShader)
-
-class StrokeTextureShader(StrokeShader):
-    __swig_setmethods__ = {}
-    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, StrokeTextureShader, name, value)
-    __swig_getmethods__ = {}
-    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, StrokeTextureShader, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_StrokeTextureShader(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def shade(*args): return _Freestyle.StrokeTextureShader_shade(*args)
-    __swig_destroy__ = _Freestyle.delete_StrokeTextureShader
-    __del__ = lambda self : None;
-StrokeTextureShader_swigregister = _Freestyle.StrokeTextureShader_swigregister
-StrokeTextureShader_swigregister(StrokeTextureShader)
-
-class BackboneStretcherShader(StrokeShader):
-    __swig_setmethods__ = {}
-    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, BackboneStretcherShader, name, value)
-    __swig_getmethods__ = {}
-    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, BackboneStretcherShader, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_BackboneStretcherShader(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def shade(*args): return _Freestyle.BackboneStretcherShader_shade(*args)
-    __swig_destroy__ = _Freestyle.delete_BackboneStretcherShader
-    __del__ = lambda self : None;
-BackboneStretcherShader_swigregister = _Freestyle.BackboneStretcherShader_swigregister
-BackboneStretcherShader_swigregister(BackboneStretcherShader)
-
-class SamplingShader(StrokeShader):
-    __swig_setmethods__ = {}
-    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, SamplingShader, name, value)
-    __swig_getmethods__ = {}
-    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, SamplingShader, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_SamplingShader(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def shade(*args): return _Freestyle.SamplingShader_shade(*args)
-    __swig_destroy__ = _Freestyle.delete_SamplingShader
-    __del__ = lambda self : None;
-SamplingShader_swigregister = _Freestyle.SamplingShader_swigregister
-SamplingShader_swigregister(SamplingShader)
-
-class ExternalContourStretcherShader(StrokeShader):
-    __swig_setmethods__ = {}
-    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ExternalContourStretcherShader, name, value)
-    __swig_getmethods__ = {}
-    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, ExternalContourStretcherShader, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_ExternalContourStretcherShader(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def shade(*args): return _Freestyle.ExternalContourStretcherShader_shade(*args)
-    __swig_destroy__ = _Freestyle.delete_ExternalContourStretcherShader
-    __del__ = lambda self : None;
-ExternalContourStretcherShader_swigregister = _Freestyle.ExternalContourStretcherShader_swigregister
-ExternalContourStretcherShader_swigregister(ExternalContourStretcherShader)
-
-class BSplineShader(StrokeShader):
-    __swig_setmethods__ = {}
-    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, BSplineShader, name, value)
-    __swig_getmethods__ = {}
-    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, BSplineShader, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_BSplineShader(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def shade(*args): return _Freestyle.BSplineShader_shade(*args)
-    __swig_destroy__ = _Freestyle.delete_BSplineShader
-    __del__ = lambda self : None;
-BSplineShader_swigregister = _Freestyle.BSplineShader_swigregister
-BSplineShader_swigregister(BSplineShader)
-
-class BezierCurveShader(StrokeShader):
-    __swig_setmethods__ = {}
-    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, BezierCurveShader, name, value)
-    __swig_getmethods__ = {}
-    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, BezierCurveShader, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_BezierCurveShader(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def shade(*args): return _Freestyle.BezierCurveShader_shade(*args)
-    __swig_destroy__ = _Freestyle.delete_BezierCurveShader
-    __del__ = lambda self : None;
-BezierCurveShader_swigregister = _Freestyle.BezierCurveShader_swigregister
-BezierCurveShader_swigregister(BezierCurveShader)
-
-class InflateShader(StrokeShader):
-    __swig_setmethods__ = {}
-    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, InflateShader, name, value)
-    __swig_getmethods__ = {}
-    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, InflateShader, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_InflateShader(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def shade(*args): return _Freestyle.InflateShader_shade(*args)
-    __swig_destroy__ = _Freestyle.delete_InflateShader
-    __del__ = lambda self : None;
-InflateShader_swigregister = _Freestyle.InflateShader_swigregister
-InflateShader_swigregister(InflateShader)
-
-class PolygonalizationShader(StrokeShader):
-    __swig_setmethods__ = {}
-    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, PolygonalizationShader, name, value)
-    __swig_getmethods__ = {}
-    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, PolygonalizationShader, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_PolygonalizationShader(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def shade(*args): return _Freestyle.PolygonalizationShader_shade(*args)
-    __swig_destroy__ = _Freestyle.delete_PolygonalizationShader
-    __del__ = lambda self : None;
-PolygonalizationShader_swigregister = _Freestyle.PolygonalizationShader_swigregister
-PolygonalizationShader_swigregister(PolygonalizationShader)
-
-class GuidingLinesShader(StrokeShader):
-    __swig_setmethods__ = {}
-    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, GuidingLinesShader, name, value)
-    __swig_getmethods__ = {}
-    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, GuidingLinesShader, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_GuidingLinesShader(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    def shade(*args): return _Freestyle.GuidingLinesShader_shade(*args)
-    __swig_destroy__ = _Freestyle.delete_GuidingLinesShader
-    __del__ = lambda self : None;
-GuidingLinesShader_swigregister = _Freestyle.GuidingLinesShader_swigregister
-GuidingLinesShader_swigregister(GuidingLinesShader)
-
-class TipRemoverShader(StrokeShader):
-    __swig_setmethods__ = {}
-    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, TipRemoverShader, name, value)
-    __swig_getmethods__ = {}
-    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, TipRemoverShader, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_TipRemoverShader(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_TipRemoverShader
-    __del__ = lambda self : None;
-    def shade(*args): return _Freestyle.TipRemoverShader_shade(*args)
-TipRemoverShader_swigregister = _Freestyle.TipRemoverShader_swigregister
-TipRemoverShader_swigregister(TipRemoverShader)
-
-class streamShader(StrokeShader):
-    __swig_setmethods__ = {}
-    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, streamShader, name, value)
-    __swig_getmethods__ = {}
-    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, streamShader, name)
-    __repr__ = _swig_repr
-    __swig_destroy__ = _Freestyle.delete_streamShader
-    __del__ = lambda self : None;
-    def getName(*args): return _Freestyle.streamShader_getName(*args)
-    def shade(*args): return _Freestyle.streamShader_shade(*args)
-    def __init__(self, *args): 
-        this = _Freestyle.new_streamShader(*args)
-        try: self.this.append(this)
-        except: self.this = this
-streamShader_swigregister = _Freestyle.streamShader_swigregister
-streamShader_swigregister(streamShader)
-
-class fstreamShader(StrokeShader):
-    __swig_setmethods__ = {}
-    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, fstreamShader, name, value)
-    __swig_getmethods__ = {}
-    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, fstreamShader, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_fstreamShader(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_fstreamShader
-    __del__ = lambda self : None;
-    def getName(*args): return _Freestyle.fstreamShader_getName(*args)
-    def shade(*args): return _Freestyle.fstreamShader_shade(*args)
-fstreamShader_swigregister = _Freestyle.fstreamShader_swigregister
-fstreamShader_swigregister(fstreamShader)
-
-class CalligraphicShader(StrokeShader):
-    __swig_setmethods__ = {}
-    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, CalligraphicShader, name, value)
-    __swig_getmethods__ = {}
-    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, CalligraphicShader, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_CalligraphicShader(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_CalligraphicShader
-    __del__ = lambda self : None;
-    def shade(*args): return _Freestyle.CalligraphicShader_shade(*args)
-CalligraphicShader_swigregister = _Freestyle.CalligraphicShader_swigregister
-CalligraphicShader_swigregister(CalligraphicShader)
-
-class SpatialNoiseShader(StrokeShader):
-    __swig_setmethods__ = {}
-    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, SpatialNoiseShader, name, value)
-    __swig_getmethods__ = {}
-    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, SpatialNoiseShader, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_SpatialNoiseShader(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_SpatialNoiseShader
-    __del__ = lambda self : None;
-    def shade(*args): return _Freestyle.SpatialNoiseShader_shade(*args)
-SpatialNoiseShader_swigregister = _Freestyle.SpatialNoiseShader_swigregister
-SpatialNoiseShader_swigregister(SpatialNoiseShader)
-
-class SmoothingShader(StrokeShader):
-    __swig_setmethods__ = {}
-    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, SmoothingShader, name, value)
-    __swig_getmethods__ = {}
-    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, SmoothingShader, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_SmoothingShader(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_SmoothingShader
-    __del__ = lambda self : None;
-    def shade(*args): return _Freestyle.SmoothingShader_shade(*args)
-SmoothingShader_swigregister = _Freestyle.SmoothingShader_swigregister
-SmoothingShader_swigregister(SmoothingShader)
-
-class Smoother(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Smoother, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, Smoother, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_Smoother(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_Smoother
-    __del__ = lambda self : None;
-    def smooth(*args): return _Freestyle.Smoother_smooth(*args)
-    def computeCurvature(*args): return _Freestyle.Smoother_computeCurvature(*args)
-Smoother_swigregister = _Freestyle.Smoother_swigregister
-Smoother_swigregister(Smoother)
-
-class Omitter(Smoother):
-    __swig_setmethods__ = {}
-    for _s in [Smoother]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Omitter, name, value)
-    __swig_getmethods__ = {}
-    for _s in [Smoother]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, Omitter, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_Omitter(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_Omitter
-    __del__ = lambda self : None;
-    def omit(*args): return _Freestyle.Omitter_omit(*args)
-Omitter_swigregister = _Freestyle.Omitter_swigregister
-Omitter_swigregister(Omitter)
-
-class OmissionShader(StrokeShader):
-    __swig_setmethods__ = {}
-    for _s in [StrokeShader]: __swig_setmethods__.update(getattr(_s,'__swig_setmethods__',{}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, OmissionShader, name, value)
-    __swig_getmethods__ = {}
-    for _s in [StrokeShader]: __swig_getmethods__.update(getattr(_s,'__swig_getmethods__',{}))
-    __getattr__ = lambda self, name: _swig_getattr(self, OmissionShader, name)
-    __repr__ = _swig_repr
-    def __init__(self, *args): 
-        this = _Freestyle.new_OmissionShader(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_OmissionShader
-    __del__ = lambda self : None;
-    def shade(*args): return _Freestyle.OmissionShader_shade(*args)
-OmissionShader_swigregister = _Freestyle.OmissionShader_swigregister
-OmissionShader_swigregister(OmissionShader)
-
-class Operators(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Operators, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, Operators, name)
-    def __init__(self, *args, **kwargs): raise AttributeError, "No constructor defined"
-    __repr__ = _swig_repr
-    __swig_getmethods__["select"] = lambda x: _Freestyle.Operators_select
-    if _newclass:select = staticmethod(_Freestyle.Operators_select)
-    __swig_getmethods__["chain"] = lambda x: _Freestyle.Operators_chain
-    if _newclass:chain = staticmethod(_Freestyle.Operators_chain)
-    __swig_getmethods__["bidirectionalChain"] = lambda x: _Freestyle.Operators_bidirectionalChain
-    if _newclass:bidirectionalChain = staticmethod(_Freestyle.Operators_bidirectionalChain)
-    __swig_getmethods__["sequentialSplit"] = lambda x: _Freestyle.Operators_sequentialSplit
-    if _newclass:sequentialSplit = staticmethod(_Freestyle.Operators_sequentialSplit)
-    __swig_getmethods__["recursiveSplit"] = lambda x: _Freestyle.Operators_recursiveSplit
-    if _newclass:recursiveSplit = staticmethod(_Freestyle.Operators_recursiveSplit)
-    __swig_getmethods__["sort"] = lambda x: _Freestyle.Operators_sort
-    if _newclass:sort = staticmethod(_Freestyle.Operators_sort)
-    __swig_getmethods__["create"] = lambda x: _Freestyle.Operators_create
-    if _newclass:create = staticmethod(_Freestyle.Operators_create)
-    __swig_getmethods__["getViewEdgeFromIndex"] = lambda x: _Freestyle.Operators_getViewEdgeFromIndex
-    if _newclass:getViewEdgeFromIndex = staticmethod(_Freestyle.Operators_getViewEdgeFromIndex)
-    __swig_getmethods__["getChainFromIndex"] = lambda x: _Freestyle.Operators_getChainFromIndex
-    if _newclass:getChainFromIndex = staticmethod(_Freestyle.Operators_getChainFromIndex)
-    __swig_getmethods__["getStrokeFromIndex"] = lambda x: _Freestyle.Operators_getStrokeFromIndex
-    if _newclass:getStrokeFromIndex = staticmethod(_Freestyle.Operators_getStrokeFromIndex)
-    __swig_getmethods__["getViewEdgesSize"] = lambda x: _Freestyle.Operators_getViewEdgesSize
-    if _newclass:getViewEdgesSize = staticmethod(_Freestyle.Operators_getViewEdgesSize)
-    __swig_getmethods__["getChainsSize"] = lambda x: _Freestyle.Operators_getChainsSize
-    if _newclass:getChainsSize = staticmethod(_Freestyle.Operators_getChainsSize)
-    __swig_getmethods__["getStrokesSize"] = lambda x: _Freestyle.Operators_getStrokesSize
-    if _newclass:getStrokesSize = staticmethod(_Freestyle.Operators_getStrokesSize)
-    __swig_destroy__ = _Freestyle.delete_Operators
-    __del__ = lambda self : None;
-Operators_swigregister = _Freestyle.Operators_swigregister
-Operators_swigregister(Operators)
-Operators_select = _Freestyle.Operators_select
-Operators_chain = _Freestyle.Operators_chain
-Operators_bidirectionalChain = _Freestyle.Operators_bidirectionalChain
-Operators_sequentialSplit = _Freestyle.Operators_sequentialSplit
-Operators_recursiveSplit = _Freestyle.Operators_recursiveSplit
-Operators_sort = _Freestyle.Operators_sort
-Operators_create = _Freestyle.Operators_create
-Operators_getViewEdgeFromIndex = _Freestyle.Operators_getViewEdgeFromIndex
-Operators_getChainFromIndex = _Freestyle.Operators_getChainFromIndex
-Operators_getStrokeFromIndex = _Freestyle.Operators_getStrokeFromIndex
-Operators_getViewEdgesSize = _Freestyle.Operators_getViewEdgesSize
-Operators_getChainsSize = _Freestyle.Operators_getChainsSize
-Operators_getStrokesSize = _Freestyle.Operators_getStrokesSize
-
-class ltstr(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, ltstr, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, ltstr, name)
-    __repr__ = _swig_repr
-    def __call__(*args): return _Freestyle.ltstr___call__(*args)
-    def __init__(self, *args): 
-        this = _Freestyle.new_ltstr(*args)
-        try: self.this.append(this)
-        except: self.this = this
-    __swig_destroy__ = _Freestyle.delete_ltstr
-    __del__ = lambda self : None;
-ltstr_swigregister = _Freestyle.ltstr_swigregister
-ltstr_swigregister(ltstr)
-
-class Canvas(_object):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, Canvas, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, Canvas, name)
-    def __init__(self, *args, **kwargs): raise AttributeError, "No constructor defined"
-    __repr__ = _swig_repr
-    __swig_getmethods__["getInstance"] = lambda x: _Freestyle.Canvas_getInstance
-    if _newclass:getInstance = staticmethod(_Freestyle.Canvas_getInstance)
-    NB_STEERABLE_VIEWMAP = _Freestyle.Canvas_NB_STEERABLE_VIEWMAP
-    __swig_destroy__ = _Freestyle.delete_Canvas
-    __del__ = lambda self : None;
-    def preDraw(*args): return _Freestyle.Canvas_preDraw(*args)
-    def Draw(*args): return _Freestyle.Canvas_Draw(*args)
-    def postDraw(*args): return _Freestyle.Canvas_postDraw(*args)
-    def Render(*args): return _Freestyle.Canvas_Render(*args)
-    def RenderBasic(*args): return _Freestyle.Canvas_RenderBasic(*args)
-    def RenderStroke(*args): return _Freestyle.Canvas_RenderStroke(*args)
-    def init(*args): return _Freestyle.Canvas_init(*args)
-    def Clear(*args): return _Freestyle.Canvas_Clear(*args)
-    def Erase(*args): return _Freestyle.Canvas_Erase(*args)
-    def readColorPixels(*args): return _Freestyle.Canvas_readColorPixels(*args)
-    def readDepthPixels(*args): return _Freestyle.Canvas_readDepthPixels(*args)
-    def update(*args): return _Freestyle.Canvas_update(*args)
-    def isEmpty(*args): return _Freestyle.Canvas_isEmpty(*args)
-    def loadMap(*args): return _Freestyle.Canvas_loadMap(*args)
-    def readMapPixel(*args): return _Freestyle.Canvas_readMapPixel(*args)
-    def loadSteerableViewMap(*args): return _Freestyle.Canvas_loadSteerableViewMap(*args)
-    def getSteerableViewMap(*args): return _Freestyle.Canvas_getSteerableViewMap(*args)
-    def selectedFEdge(*args): return _Freestyle.Canvas_selectedFEdge(*args)
-    def width(*args): return _Freestyle.Canvas_width(*args)
-    def height(*args): return _Freestyle.Canvas_height(*args)
-    def currentPaperTextureIndex(*args): return _Freestyle.Canvas_currentPaperTextureIndex(*args)
-    def scene3DBBox(*args): return _Freestyle.Canvas_scene3DBBox(*args)
-    def renderer(*args): return _Freestyle.Canvas_renderer(*args)
-    def getCurrentStyleModule(*args): return _Freestyle.Canvas_getCurrentStyleModule(*args)
-    def getRecordFlag(*args): return _Freestyle.Canvas_getRecordFlag(*args)
-    def setSelectedFEdge(*args): return _Freestyle.Canvas_setSelectedFEdge(*args)
-    def InsertStyleModule(*args): return _Freestyle.Canvas_InsertStyleModule(*args)
-    def RemoveStyleModule(*args): return _Freestyle.Canvas_RemoveStyleModule(*args)
-    def SwapStyleModules(*args): return _Freestyle.Canvas_SwapStyleModules(*args)
-    def ReplaceStyleModule(*args): return _Freestyle.Canvas_ReplaceStyleModule(*args)
-    def setVisible(*args): return _Freestyle.Canvas_setVisible(*args)
-    def AddLayer(*args): return _Freestyle.Canvas_AddLayer(*args)
-    def setCurrentPaperTextureIndex(*args): return _Freestyle.Canvas_setCurrentPaperTextureIndex(*args)
-    def changePaperTexture(*args): return _Freestyle.Canvas_changePaperTexture(*args)
-    def togglePaperTexture(*args): return _Freestyle.Canvas_togglePaperTexture(*args)
-    def resetModified(*args): return _Freestyle.Canvas_resetModified(*args)
-    def causalStyleModules(*args): return _Freestyle.Canvas_causalStyleModules(*args)
-    def setModified(*args): return _Freestyle.Canvas_setModified(*args)
-Canvas_swigregister = _Freestyle.Canvas_swigregister
-Canvas_swigregister(Canvas)
-Canvas_getInstance = _Freestyle.Canvas_getInstance
-
-castToSVertex = _Freestyle.castToSVertex
-castToViewVertex = _Freestyle.castToViewVertex
-castToTVertex = _Freestyle.castToTVertex
-castToCurvePoint = _Freestyle.castToCurvePoint
-castToStrokeVertex = _Freestyle.castToStrokeVertex
-castToNonTVertex = _Freestyle.castToNonTVertex
-castToFEdge = _Freestyle.castToFEdge
-castToViewEdge = _Freestyle.castToViewEdge
-castToStroke = _Freestyle.castToStroke
-castToChain = _Freestyle.castToChain
-
-
diff --git a/source/blender/freestyle/style_modules_blender/ChainingIterators.py b/source/blender/freestyle/style_modules_blender/ChainingIterators.py
index 3fe57797113..9e4d467d1db 100755
--- a/source/blender/freestyle/style_modules_blender/ChainingIterators.py
+++ b/source/blender/freestyle/style_modules_blender/ChainingIterators.py
@@ -25,7 +25,7 @@
 #
 #############################################################################
 
-from Blender.Freestyle import *
+from freestyle_init import *
 
 ## the natural chaining iterator
 ## It follows the edges of same nature following the topology of
@@ -41,7 +41,7 @@ class pyChainSilhouetteIterator(ChainingIterator):
 		winner = None
 		it = AdjacencyIterator(iter)
 		nextVertex = self.getVertex()
-		if(nextVertex.getNature() & T_VERTEX != 0):
+		if(nextVertex.getNature() & Nature.T_VERTEX != 0):
 			tvertex = nextVertex.castToTVertex()
 			mateVE = tvertex.mate(self.getCurrentEdge())
 			while(it.isEnd() == 0):
@@ -52,7 +52,7 @@ class pyChainSilhouetteIterator(ChainingIterator):
 				it.increment()
 		else:
 			## case of NonTVertex
-			natures = [SILHOUETTE,BORDER,CREASE,SUGGESTIVE_CONTOUR,VALLEY,RIDGE]
+			natures = [Nature.SILHOUETTE,Nature.BORDER,Nature.CREASE,Nature.SUGGESTIVE_CONTOUR,Nature.VALLEY,Nature.RIDGE]
 			for i in range(len(natures)):
 				currentNature = self.getCurrentEdge().getNature()
 				if(natures[i] & currentNature):
@@ -92,7 +92,7 @@ class pyChainSilhouetteGenericIterator(ChainingIterator):
 		winner = None
 		it = AdjacencyIterator(iter)
 		nextVertex = self.getVertex()
-		if(nextVertex.getNature() & T_VERTEX != 0):
+		if(nextVertex.getNature() & Nature.T_VERTEX != 0):
 			tvertex = nextVertex.castToTVertex()
 			mateVE = tvertex.mate(self.getCurrentEdge())
 			while(it.isEnd() == 0):
@@ -103,7 +103,7 @@ class pyChainSilhouetteGenericIterator(ChainingIterator):
 				it.increment()
 		else:
 			## case of NonTVertex
-			natures = [SILHOUETTE,BORDER,CREASE,SUGGESTIVE_CONTOUR,VALLEY,RIDGE]
+			natures = [Nature.SILHOUETTE,Nature.BORDER,Nature.CREASE,Nature.SUGGESTIVE_CONTOUR,Nature.VALLEY,Nature.RIDGE]
 			for i in range(len(natures)):
 				currentNature = self.getCurrentEdge().getNature()
 				if(natures[i] & currentNature):
@@ -195,7 +195,7 @@ class pySketchyChainSilhouetteIterator(ChainingIterator):
 		winner = None
 		it = AdjacencyIterator(iter)
 		nextVertex = self.getVertex()
-		if(nextVertex.getNature() & T_VERTEX != 0):
+		if(nextVertex.getNature() & Nature.T_VERTEX != 0):
 			tvertex = nextVertex.castToTVertex()
 			mateVE = tvertex.mate(self.getCurrentEdge())
 			while(it.isEnd() == 0):
@@ -206,7 +206,7 @@ class pySketchyChainSilhouetteIterator(ChainingIterator):
 				it.increment()
 		else:
 			## case of NonTVertex
-			natures = [SILHOUETTE,BORDER,CREASE,SUGGESTIVE_CONTOUR,VALLEY,RIDGE]
+			natures = [Nature.SILHOUETTE,Nature.BORDER,Nature.CREASE,Nature.SUGGESTIVE_CONTOUR,Nature.VALLEY,Nature.RIDGE]
 			for i in range(len(natures)):
 				currentNature = self.getCurrentEdge().getNature()
 				if(natures[i] & currentNature):
@@ -292,7 +292,7 @@ class pyFillOcclusionsRelativeChainingIterator(ChainingIterator):
 		print self.getCurrentEdge().getId().getFirst(), self.getCurrentEdge().getId().getSecond()
 		it = AdjacencyIterator(iter)
 		nextVertex = self.getVertex()
-		if(nextVertex.getNature() & T_VERTEX != 0):
+		if(nextVertex.getNature() & Nature.T_VERTEX != 0):
 			tvertex = nextVertex.castToTVertex()
 			mateVE = tvertex.mate(self.getCurrentEdge())
 			while(it.isEnd() == 0):
@@ -307,7 +307,7 @@ class pyFillOcclusionsRelativeChainingIterator(ChainingIterator):
 				it.increment()
 		else:
 			## case of NonTVertex
-			natures = [SILHOUETTE,BORDER,CREASE,SUGGESTIVE_CONTOUR,VALLEY,RIDGE]
+			natures = [Nature.SILHOUETTE,Nature.BORDER,Nature.CREASE,Nature.SUGGESTIVE_CONTOUR,Nature.VALLEY,Nature.RIDGE]
 			for nat in natures:
 				if(self.getCurrentEdge().getNature() & nat != 0):
 					count=0
@@ -390,7 +390,7 @@ class pyFillOcclusionsAbsoluteChainingIterator(ChainingIterator):
 		#print self.getCurrentEdge().getId().getFirst(), self.getCurrentEdge().getId().getSecond()
 		it = AdjacencyIterator(iter)
 		nextVertex = self.getVertex()
-		if(nextVertex.getNature() & T_VERTEX != 0):
+		if(nextVertex.getNature() & Nature.T_VERTEX != 0):
 			tvertex = nextVertex.castToTVertex()
 			mateVE = tvertex.mate(self.getCurrentEdge())
 			while(it.isEnd() == 0):
@@ -405,7 +405,7 @@ class pyFillOcclusionsAbsoluteChainingIterator(ChainingIterator):
 				it.increment()
 		else:
 			## case of NonTVertex
-			natures = [SILHOUETTE,BORDER,CREASE,SUGGESTIVE_CONTOUR,VALLEY,RIDGE]
+			natures = [Nature.SILHOUETTE,Nature.BORDER,Nature.CREASE,Nature.SUGGESTIVE_CONTOUR,Nature.VALLEY,Nature.RIDGE]
 			for nat in natures:
 				if(self.getCurrentEdge().getNature() & nat != 0):
 					count=0
@@ -466,7 +466,7 @@ class pyFillOcclusionsAbsoluteAndRelativeChainingIterator(ChainingIterator):
 		print self.getCurrentEdge().getId().getFirst(), self.getCurrentEdge().getId().getSecond()
 		it = AdjacencyIterator(iter)
 		nextVertex = self.getVertex()
-		if(nextVertex.getNature() & T_VERTEX != 0):
+		if(nextVertex.getNature() & Nature.T_VERTEX != 0):
 			tvertex = nextVertex.castToTVertex()
 			mateVE = tvertex.mate(self.getCurrentEdge())
 			while(it.isEnd() == 0):
@@ -481,7 +481,7 @@ class pyFillOcclusionsAbsoluteAndRelativeChainingIterator(ChainingIterator):
 				it.increment()
 		else:
 			## case of NonTVertex
-			natures = [SILHOUETTE,BORDER,CREASE,SUGGESTIVE_CONTOUR,VALLEY,RIDGE]
+			natures = [Nature.SILHOUETTE,Nature.BORDER,Nature.CREASE,Nature.SUGGESTIVE_CONTOUR,Nature.VALLEY,Nature.RIDGE]
 			for nat in natures:
 				if(self.getCurrentEdge().getNature() & nat != 0):
 					count=0
@@ -572,7 +572,7 @@ class pyFillQi0AbsoluteAndRelativeChainingIterator(ChainingIterator):
 		print self.getCurrentEdge().getId().getFirst(), self.getCurrentEdge().getId().getSecond()
 		it = AdjacencyIterator(iter)
 		nextVertex = self.getVertex()
-		if(nextVertex.getNature() & T_VERTEX != 0):
+		if(nextVertex.getNature() & Nature.T_VERTEX != 0):
 			tvertex = nextVertex.castToTVertex()
 			mateVE = tvertex.mate(self.getCurrentEdge())
 			while(it.isEnd() == 0):
@@ -587,7 +587,7 @@ class pyFillQi0AbsoluteAndRelativeChainingIterator(ChainingIterator):
 				it.increment()
 		else:
 			## case of NonTVertex
-			natures = [SILHOUETTE,BORDER,CREASE,SUGGESTIVE_CONTOUR,VALLEY,RIDGE]
+			natures = [Nature.SILHOUETTE,Nature.BORDER,Nature.CREASE,Nature.SUGGESTIVE_CONTOUR,Nature.VALLEY,Nature.RIDGE]
 			for nat in natures:
 				if(self.getCurrentEdge().getNature() & nat != 0):
 					count=0
@@ -669,7 +669,7 @@ class pyNoIdChainSilhouetteIterator(ChainingIterator):
 		winner = None
 		it = AdjacencyIterator(iter)
 		nextVertex = self.getVertex()
-		if(nextVertex.getNature() & T_VERTEX != 0):
+		if(nextVertex.getNature() & Nature.T_VERTEX != 0):
 			tvertex = nextVertex.castToTVertex()
 			mateVE = tvertex.mate(self.getCurrentEdge())
 			while(it.isEnd() == 0):
@@ -705,7 +705,7 @@ class pyNoIdChainSilhouetteIterator(ChainingIterator):
 				it.increment()
 		else:
 			## case of NonTVertex
-			natures = [SILHOUETTE,BORDER,CREASE,SUGGESTIVE_CONTOUR,VALLEY,RIDGE]
+			natures = [Nature.SILHOUETTE,Nature.BORDER,Nature.CREASE,Nature.SUGGESTIVE_CONTOUR,Nature.VALLEY,Nature.RIDGE]
 			for i in range(len(natures)):
 				currentNature = self.getCurrentEdge().getNature()
 				if(natures[i] & currentNature):
diff --git a/source/blender/freestyle/style_modules_blender/Functions0D.py b/source/blender/freestyle/style_modules_blender/Functions0D.py
index 62855648d1f..f5ff106c340 100755
--- a/source/blender/freestyle/style_modules_blender/Functions0D.py
+++ b/source/blender/freestyle/style_modules_blender/Functions0D.py
@@ -1,4 +1,4 @@
-from Blender.Freestyle import *
+from freestyle_init import *
 
 
 class pyInverseCurvature2DAngleF0D(UnaryFunction0DDouble):
diff --git a/source/blender/freestyle/style_modules_blender/Functions1D.py b/source/blender/freestyle/style_modules_blender/Functions1D.py
index d3474ffc9eb..308486bc6a7 100755
--- a/source/blender/freestyle/style_modules_blender/Functions1D.py
+++ b/source/blender/freestyle/style_modules_blender/Functions1D.py
@@ -1,4 +1,4 @@
-from Blender.Freestyle import *
+from freestyle_init import *
 from Functions0D import *
 import string 
 
diff --git a/source/blender/freestyle/style_modules_blender/PredicatesB1D.py b/source/blender/freestyle/style_modules_blender/PredicatesB1D.py
index 21d90f96644..d4c1cace3fe 100755
--- a/source/blender/freestyle/style_modules_blender/PredicatesB1D.py
+++ b/source/blender/freestyle/style_modules_blender/PredicatesB1D.py
@@ -1,4 +1,4 @@
-from Blender.Freestyle import *
+from freestyle_init import *
 from Functions1D import *
 from random import *
 
@@ -36,8 +36,8 @@ class pySilhouetteFirstBP1D(BinaryPredicate1D):
 		bpred = SameShapeIdBP1D()
 		if (bpred(inter1, inter2) != 1):
 			return 0
-		if (inter1.getNature() & SILHOUETTE):
-			return (inter2.getNature() & SILHOUETTE)
+		if (inter1.getNature() & Nature.SILHOUETTE):
+			return (inter2.getNature() & Nature.SILHOUETTE)
 		return (inter1.getNature() == inter2.getNature())
 
 class pyNatureBP1D(BinaryPredicate1D):
diff --git a/source/blender/freestyle/style_modules_blender/PredicatesU0D.py b/source/blender/freestyle/style_modules_blender/PredicatesU0D.py
index 8432dea3274..42cde5c222f 100755
--- a/source/blender/freestyle/style_modules_blender/PredicatesU0D.py
+++ b/source/blender/freestyle/style_modules_blender/PredicatesU0D.py
@@ -1,4 +1,4 @@
-from Blender.Freestyle import *
+from freestyle_init import *
 from Functions0D import *
 
 class pyHigherCurvature2DAngleUP0D(UnaryPredicate0D):
@@ -55,7 +55,7 @@ class pyBackTVertexUP0D(UnaryPredicate0D):
 	def __call__(self, iter):
 		v = iter.getObject()
 		nat = v.getNature()
-		if(nat & T_VERTEX == 0):
+		if(nat & Nature.T_VERTEX == 0):
 			return 0
 		next = iter
 		if(next.isEnd()):
diff --git a/source/blender/freestyle/style_modules_blender/PredicatesU1D.py b/source/blender/freestyle/style_modules_blender/PredicatesU1D.py
index 3dad3519300..5d1b594a109 100755
--- a/source/blender/freestyle/style_modules_blender/PredicatesU1D.py
+++ b/source/blender/freestyle/style_modules_blender/PredicatesU1D.py
@@ -1,4 +1,4 @@
-from Blender.Freestyle import *
+from freestyle_init import *
 from Functions1D import *
 
 count = 0
diff --git a/source/blender/freestyle/style_modules_blender/anisotropic_diffusion.py b/source/blender/freestyle/style_modules_blender/anisotropic_diffusion.py
index 31e5579719d..2f8739329b9 100755
--- a/source/blender/freestyle/style_modules_blender/anisotropic_diffusion.py
+++ b/source/blender/freestyle/style_modules_blender/anisotropic_diffusion.py
@@ -25,7 +25,7 @@
 #
 #############################################################################
 
-from Blender.Freestyle import *
+from freestyle_init import *
 from logical_operators import *
 from PredicatesB1D import *
 from shaders import *
diff --git a/source/blender/freestyle/style_modules_blender/apriori_and_causal_density.py b/source/blender/freestyle/style_modules_blender/apriori_and_causal_density.py
index 6e16ee52ec5..9f866a37581 100755
--- a/source/blender/freestyle/style_modules_blender/apriori_and_causal_density.py
+++ b/source/blender/freestyle/style_modules_blender/apriori_and_causal_density.py
@@ -28,7 +28,7 @@
 #############################################################################
 
 
-from Blender.Freestyle import *
+from freestyle_init import *
 from logical_operators import *
 from PredicatesB1D import *
 from PredicatesU1D import *
diff --git a/source/blender/freestyle/style_modules_blender/apriori_density.py b/source/blender/freestyle/style_modules_blender/apriori_density.py
index fe033f7c23d..5ff6c58e77f 100755
--- a/source/blender/freestyle/style_modules_blender/apriori_density.py
+++ b/source/blender/freestyle/style_modules_blender/apriori_density.py
@@ -26,7 +26,7 @@
 #############################################################################
 
 
-from Blender.Freestyle import *
+from freestyle_init import *
 from logical_operators import *
 from PredicatesB1D import *
 from PredicatesU1D import *
diff --git a/source/blender/freestyle/style_modules_blender/backbone_stretcher.py b/source/blender/freestyle/style_modules_blender/backbone_stretcher.py
index fc659bd4c56..8a6b9d71a66 100755
--- a/source/blender/freestyle/style_modules_blender/backbone_stretcher.py
+++ b/source/blender/freestyle/style_modules_blender/backbone_stretcher.py
@@ -25,7 +25,7 @@
 #
 #############################################################################
 
-from Blender.Freestyle import *
+from freestyle_init import *
 from logical_operators import *
 from PredicatesB1D import *
 from shaders import *
diff --git a/source/blender/freestyle/style_modules_blender/blueprint_circles.py b/source/blender/freestyle/style_modules_blender/blueprint_circles.py
index 3f5efe643ba..7f3a7564cfe 100755
--- a/source/blender/freestyle/style_modules_blender/blueprint_circles.py
+++ b/source/blender/freestyle/style_modules_blender/blueprint_circles.py
@@ -25,7 +25,7 @@
 #
 #############################################################################
 
-from Blender.Freestyle import *
+from freestyle_init import *
 from logical_operators import *
 from PredicatesB1D import *
 from PredicatesU1D import *
diff --git a/source/blender/freestyle/style_modules_blender/blueprint_ellipses.py b/source/blender/freestyle/style_modules_blender/blueprint_ellipses.py
index df996ec6e26..a5cfe4ec30b 100755
--- a/source/blender/freestyle/style_modules_blender/blueprint_ellipses.py
+++ b/source/blender/freestyle/style_modules_blender/blueprint_ellipses.py
@@ -25,7 +25,7 @@
 #
 #############################################################################
 
-from Blender.Freestyle import *
+from freestyle_init import *
 from logical_operators import *
 from PredicatesB1D import *
 from PredicatesU1D import *
diff --git a/source/blender/freestyle/style_modules_blender/blueprint_squares.py b/source/blender/freestyle/style_modules_blender/blueprint_squares.py
index 315aca8858d..7798acc7d47 100755
--- a/source/blender/freestyle/style_modules_blender/blueprint_squares.py
+++ b/source/blender/freestyle/style_modules_blender/blueprint_squares.py
@@ -23,7 +23,7 @@
 #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 #############################################################################
-from Blender.Freestyle import *
+from freestyle_init import *
 from logical_operators import *
 from PredicatesB1D import *
 from PredicatesU1D import *
diff --git a/source/blender/freestyle/style_modules_blender/cartoon.py b/source/blender/freestyle/style_modules_blender/cartoon.py
index 0c77f30fc9c..6ace7e0585a 100755
--- a/source/blender/freestyle/style_modules_blender/cartoon.py
+++ b/source/blender/freestyle/style_modules_blender/cartoon.py
@@ -27,7 +27,7 @@
 #
 #############################################################################
 
-from Blender.Freestyle import *
+from freestyle_init import *
 from logical_operators import *
 from PredicatesB1D import *
 from shaders import *
diff --git a/source/blender/freestyle/style_modules_blender/contour.py b/source/blender/freestyle/style_modules_blender/contour.py
index 1ee89693033..ddf186d27ce 100755
--- a/source/blender/freestyle/style_modules_blender/contour.py
+++ b/source/blender/freestyle/style_modules_blender/contour.py
@@ -25,7 +25,7 @@
 #
 #############################################################################
 
-from Blender.Freestyle import *
+import freestyle_init
 from logical_operators import *
 from PredicatesB1D import *
 from PredicatesU1D import *
diff --git a/source/blender/freestyle/style_modules_blender/curvature2d.py b/source/blender/freestyle/style_modules_blender/curvature2d.py
index 377ac97f5a1..f699e2186ef 100755
--- a/source/blender/freestyle/style_modules_blender/curvature2d.py
+++ b/source/blender/freestyle/style_modules_blender/curvature2d.py
@@ -26,7 +26,7 @@
 #
 #############################################################################
 
-from Blender.Freestyle import *
+from freestyle_init import *
 from logical_operators import *
 from PredicatesB1D import *
 from shaders import *
diff --git a/source/blender/freestyle/style_modules_blender/external_contour.py b/source/blender/freestyle/style_modules_blender/external_contour.py
index 80e54dd8f70..2a39b79a410 100755
--- a/source/blender/freestyle/style_modules_blender/external_contour.py
+++ b/source/blender/freestyle/style_modules_blender/external_contour.py
@@ -25,7 +25,7 @@
 #
 #############################################################################
 
-from Blender.Freestyle import *
+from freestyle_init import *
 from logical_operators import *
 from PredicatesB1D import *
 from PredicatesU1D import *
diff --git a/source/blender/freestyle/style_modules_blender/external_contour_sketchy.py b/source/blender/freestyle/style_modules_blender/external_contour_sketchy.py
index 64d9b1bd90f..8a4c570b279 100755
--- a/source/blender/freestyle/style_modules_blender/external_contour_sketchy.py
+++ b/source/blender/freestyle/style_modules_blender/external_contour_sketchy.py
@@ -28,7 +28,7 @@
 #############################################################################
 
 
-from Blender.Freestyle import *
+from freestyle_init import *
 from logical_operators import *
 from ChainingIterators import *
 from shaders import *
diff --git a/source/blender/freestyle/style_modules_blender/external_contour_smooth.py b/source/blender/freestyle/style_modules_blender/external_contour_smooth.py
index 405d17f564c..201dc271388 100755
--- a/source/blender/freestyle/style_modules_blender/external_contour_smooth.py
+++ b/source/blender/freestyle/style_modules_blender/external_contour_smooth.py
@@ -24,7 +24,7 @@
 #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 #############################################################################
-from Blender.Freestyle import *
+from freestyle_init import *
 from logical_operators import *
 from PredicatesB1D import *
 from PredicatesU1D import *
diff --git a/source/blender/freestyle/style_modules_blender/freestyle_init.py b/source/blender/freestyle/style_modules_blender/freestyle_init.py
new file mode 100644
index 00000000000..5cc3448ca4d
--- /dev/null
+++ b/source/blender/freestyle/style_modules_blender/freestyle_init.py
@@ -0,0 +1,455 @@
+import Blender.Freestyle
+
+class BBox(Blender.Freestyle.BBox):
+	pass
+
+class BinaryPredicate0D(Blender.Freestyle.BinaryPredicate0D):
+	pass
+
+class BinaryPredicate1D(Blender.Freestyle.BinaryPredicate1D):
+	pass
+
+class FrsMaterial(Blender.Freestyle.FrsMaterial):
+	pass
+
+class Id(Blender.Freestyle.Id):
+	pass
+
+class IntegrationType(Blender.Freestyle.IntegrationType):
+	pass
+
+class Interface0D(Blender.Freestyle.Interface0D):
+	pass
+
+class Interface1D(Blender.Freestyle.Interface1D):
+	pass
+
+class Iterator(Blender.Freestyle.Iterator):
+	pass
+
+class MediumType(Blender.Freestyle.MediumType):
+	pass
+
+class Nature(Blender.Freestyle.Nature):
+	pass
+
+# class Noise(Blender.Freestyle.Noise):
+# 	pass
+
+class Operators(Blender.Freestyle.Operators):
+	pass
+
+class SShape(Blender.Freestyle.SShape):
+	pass
+
+class StrokeAttribute(Blender.Freestyle.StrokeAttribute):
+	pass
+
+class StrokeShader(Blender.Freestyle.StrokeShader):
+	pass
+
+class UnaryFunction0D(Blender.Freestyle.UnaryFunction0D):
+	pass
+
+class UnaryFunction1D(Blender.Freestyle.UnaryFunction1D):
+	pass
+
+class UnaryPredicate0D(Blender.Freestyle.UnaryPredicate0D):
+	pass
+
+class UnaryPredicate1D(Blender.Freestyle.UnaryPredicate1D):
+	def __call__(*args): return Blender.Freestyle.UnaryPredicate1D.__call__(*args)
+
+class ViewMap(Blender.Freestyle.ViewMap):
+	pass
+
+class ViewShape(Blender.Freestyle.ViewShape):
+	pass
+
+class FalseBP1D(Blender.Freestyle.FalseBP1D):
+	def __call__(*args): return Blender.Freestyle.FalseBP1D.__call__(*args)
+
+class Length2DBP1D(Blender.Freestyle.Length2DBP1D):
+	def __call__(*args): return Blender.Freestyle.Length2DBP1D.__call__(*args)
+
+class SameShapeIdBP1D(Blender.Freestyle.SameShapeIdBP1D):
+	def __call__(*args): return Blender.Freestyle.SameShapeIdBP1D.__call__(*args)
+
+class TrueBP1D(Blender.Freestyle.TrueBP1D):
+	def __call__(*args): return Blender.Freestyle.TrueBP1D.__call__(*args)
+
+class ViewMapGradientNormBP1D(Blender.Freestyle.ViewMapGradientNormBP1D):
+	def __call__(*args): return Blender.Freestyle.ViewMapGradientNormBP1D.__call__(*args)
+
+class CurvePoint(Blender.Freestyle.CurvePoint):
+	pass
+
+class SVertex(Blender.Freestyle.SVertex):
+	pass
+
+class ViewVertex(Blender.Freestyle.ViewVertex):
+	pass
+
+# class Curve(Blender.Freestyle.Curve):
+# 	pass
+
+class FEdge(Blender.Freestyle.FEdge):
+	pass
+
+class Stroke(Blender.Freestyle.Stroke):
+	pass
+
+class ViewEdge(Blender.Freestyle.ViewEdge):
+	pass
+
+class AdjacencyIterator(Blender.Freestyle.AdjacencyIterator):
+	pass
+
+class ChainingIterator(Blender.Freestyle.ChainingIterator):
+	pass
+
+class ChainPredicateIterator(Blender.Freestyle.ChainPredicateIterator):
+	pass
+
+class ChainSilhouetteIterator(Blender.Freestyle.ChainSilhouetteIterator):
+	pass
+
+class CurvePointIterator(Blender.Freestyle.CurvePointIterator):
+	pass
+
+class Interface0DIterator(Blender.Freestyle.Interface0DIterator):
+	pass
+
+class orientedViewEdgeIterator(Blender.Freestyle.orientedViewEdgeIterator):
+	pass
+
+class StrokeVertexIterator(Blender.Freestyle.StrokeVertexIterator):
+	pass
+
+class SVertexIterator(Blender.Freestyle.SVertexIterator):
+	pass
+
+class ViewEdgeIterator(Blender.Freestyle.ViewEdgeIterator):
+	pass
+
+class BackboneStretcherShader(Blender.Freestyle.BackboneStretcherShader):
+	pass
+
+class BezierCurveShader(Blender.Freestyle.BezierCurveShader):
+	pass
+
+class CalligraphicShader(Blender.Freestyle.CalligraphicShader):
+	pass
+
+class ColorNoiseShader(Blender.Freestyle.ColorNoiseShader):
+	pass
+
+class ColorVariationPatternShader(Blender.Freestyle.ColorVariationPatternShader):
+	pass
+
+class ConstantColorShader(Blender.Freestyle.ConstantColorShader):
+	pass
+
+class ConstantThicknessShader(Blender.Freestyle.ConstantThicknessShader):
+	pass
+
+class ConstrainedIncreasingThicknessShader(Blender.Freestyle.ConstrainedIncreasingThicknessShader):
+	pass
+
+class fstreamShader(Blender.Freestyle.fstreamShader):
+	pass
+
+class GuidingLinesShader(Blender.Freestyle.GuidingLinesShader):
+	pass
+
+class IncreasingColorShader(Blender.Freestyle.IncreasingColorShader):
+	pass
+
+class IncreasingThicknessShader(Blender.Freestyle.IncreasingThicknessShader):
+	pass
+
+class PolygonalizationShader(Blender.Freestyle.PolygonalizationShader):
+	pass
+
+class SamplingShader(Blender.Freestyle.SamplingShader):
+	pass
+
+class SpatialNoiseShader(Blender.Freestyle.SpatialNoiseShader):
+	pass
+
+class streamShader(Blender.Freestyle.streamShader):
+	pass
+
+class StrokeTextureShader(Blender.Freestyle.StrokeTextureShader):
+	pass
+
+class TextureAssignerShader(Blender.Freestyle.TextureAssignerShader):
+	pass
+
+class ThicknessNoiseShader(Blender.Freestyle.ThicknessNoiseShader):
+	pass
+
+class ThicknessVariationPatternShader(Blender.Freestyle.ThicknessVariationPatternShader):
+	pass
+
+class TipRemoverShader(Blender.Freestyle.TipRemoverShader):
+	pass
+
+class UnaryFunction0DDouble(Blender.Freestyle.UnaryFunction0DDouble):
+	pass
+
+class UnaryFunction0DEdgeNature(Blender.Freestyle.UnaryFunction0DEdgeNature):
+	pass
+
+class UnaryFunction0DFloat(Blender.Freestyle.UnaryFunction0DFloat):
+	pass
+
+class UnaryFunction0DId(Blender.Freestyle.UnaryFunction0DId):
+	pass
+
+class UnaryFunction0DMaterial(Blender.Freestyle.UnaryFunction0DMaterial):
+	pass
+
+class UnaryFunction0DUnsigned(Blender.Freestyle.UnaryFunction0DUnsigned):
+	pass
+
+class UnaryFunction0DVec2f(Blender.Freestyle.UnaryFunction0DVec2f):
+	pass
+
+class UnaryFunction0DVec3f(Blender.Freestyle.UnaryFunction0DVec3f):
+	pass
+
+class UnaryFunction0DVectorViewShape(Blender.Freestyle.UnaryFunction0DVectorViewShape):
+	pass
+
+class UnaryFunction0DViewShape(Blender.Freestyle.UnaryFunction0DViewShape):
+	pass
+
+class UnaryFunction1DDouble(Blender.Freestyle.UnaryFunction1DDouble):
+	pass
+
+class UnaryFunction1DEdgeNature(Blender.Freestyle.UnaryFunction1DEdgeNature):
+	pass
+
+class UnaryFunction1DFloat(Blender.Freestyle.UnaryFunction1DFloat):
+	pass
+
+class UnaryFunction1DUnsigned(Blender.Freestyle.UnaryFunction1DUnsigned):
+	pass
+
+class UnaryFunction1DVec2f(Blender.Freestyle.UnaryFunction1DVec2f):
+	pass
+
+class UnaryFunction1DVec3f(Blender.Freestyle.UnaryFunction1DVec3f):
+	pass
+
+class UnaryFunction1DVectorViewShape(Blender.Freestyle.UnaryFunction1DVectorViewShape):
+	pass
+
+# class UnaryFunction1DVoid(Blender.Freestyle.UnaryFunction1DVoid):
+# 	pass
+
+class FalseUP0D(Blender.Freestyle.FalseUP0D):
+	def __call__(*args): return Blender.Freestyle.FalseUP0D.__call__(*args)
+
+class TrueUP0D(Blender.Freestyle.TrueUP0D):
+	def __call__(*args): return Blender.Freestyle.TrueUP0D.__call__(*args)
+
+class ContourUP1D(Blender.Freestyle.ContourUP1D):
+	def __call__(*args): return Blender.Freestyle.ContourUP1D.__call__(*args)
+
+class DensityLowerThanUP1D(Blender.Freestyle.DensityLowerThanUP1D):
+	def __call__(*args): return Blender.Freestyle.DensityLowerThanUP1D.__call__(*args)
+
+class EqualToChainingTimeStampUP1D(Blender.Freestyle.EqualToChainingTimeStampUP1D):
+	def __call__(*args): return Blender.Freestyle.EqualToChainingTimeStampUP1D.__call__(*args)
+
+class EqualToTimeStampUP1D(Blender.Freestyle.EqualToTimeStampUP1D):
+	def __call__(*args): return Blender.Freestyle.EqualToTimeStampUP1D.__call__(*args)
+
+class ExternalContourUP1D(Blender.Freestyle.ExternalContourUP1D):
+	def __call__(*args): return Blender.Freestyle.ExternalContourUP1D.__call__(*args)
+
+class FalseUP1D(Blender.Freestyle.FalseUP1D):
+	def __call__(*args): return Blender.Freestyle.FalseUP1D.__call__(*args)
+
+class QuantitativeInvisibilityUP1D(Blender.Freestyle.QuantitativeInvisibilityUP1D):
+	def __call__(*args): return Blender.Freestyle.QuantitativeInvisibilityUP1D.__call__(*args)
+
+class ShapeUP1D(Blender.Freestyle.ShapeUP1D):
+	def __call__(*args): return Blender.Freestyle.ShapeUP1D.__call__(*args)
+
+class TrueUP1D(Blender.Freestyle.TrueUP1D):
+	def __call__(*args): return Blender.Freestyle.TrueUP1D.__call__(*args)
+
+class StrokeVertex(Blender.Freestyle.StrokeVertex):
+	pass
+
+class NonTVertex(Blender.Freestyle.NonTVertex):
+	pass
+
+class TVertex(Blender.Freestyle.TVertex):
+	pass
+
+class Chain(Blender.Freestyle.Chain):
+	pass
+
+class FEdgeSharp(Blender.Freestyle.FEdgeSharp):
+	pass
+
+class FEdgeSmooth(Blender.Freestyle.FEdgeSmooth):
+	pass
+
+class Curvature2DAngleF0D(Blender.Freestyle.Curvature2DAngleF0D):
+	def __call__(*args): return Blender.Freestyle.Curvature2DAngleF0D.__call__(*args)
+
+class DensityF0D(Blender.Freestyle.DensityF0D):
+	def __call__(*args): return Blender.Freestyle.DensityF0D.__call__(*args)
+
+class GetProjectedXF0D(Blender.Freestyle.GetProjectedXF0D):
+	def __call__(*args): return Blender.Freestyle.GetProjectedXF0D.__call__(*args)
+
+class GetProjectedYF0D(Blender.Freestyle.GetProjectedYF0D):
+	def __call__(*args): return Blender.Freestyle.GetProjectedYF0D.__call__(*args)
+
+class GetProjectedZF0D(Blender.Freestyle.GetProjectedZF0D):
+	def __call__(*args): return Blender.Freestyle.GetProjectedZF0D.__call__(*args)
+
+class GetXF0D(Blender.Freestyle.GetXF0D):
+	def __call__(*args): return Blender.Freestyle.GetXF0D.__call__(*args)
+
+class GetYF0D(Blender.Freestyle.GetYF0D):
+	def __call__(*args): return Blender.Freestyle.GetYF0D.__call__(*args)
+
+class GetZF0D(Blender.Freestyle.GetZF0D):
+	def __call__(*args): return Blender.Freestyle.GetZF0D.__call__(*args)
+
+class LocalAverageDepthF0D(Blender.Freestyle.LocalAverageDepthF0D):
+	def __call__(*args): return Blender.Freestyle.LocalAverageDepthF0D.__call__(*args)
+
+class ZDiscontinuityF0D(Blender.Freestyle.ZDiscontinuityF0D):
+	def __call__(*args): return Blender.Freestyle.ZDiscontinuityF0D.__call__(*args)
+
+class GetCurvilinearAbscissaF0D(Blender.Freestyle.GetCurvilinearAbscissaF0D):
+	def __call__(*args): return Blender.Freestyle.GetCurvilinearAbscissaF0D.__call__(*args)
+
+class GetParameterF0D(Blender.Freestyle.GetParameterF0D):
+	def __call__(*args): return Blender.Freestyle.GetParameterF0D.__call__(*args)
+
+class GetViewMapGradientNormF0D(Blender.Freestyle.GetViewMapGradientNormF0D):
+	def __call__(*args): return Blender.Freestyle.GetViewMapGradientNormF0D.__call__(*args)
+
+class ReadCompleteViewMapPixelF0D(Blender.Freestyle.ReadCompleteViewMapPixelF0D):
+	def __call__(*args): return Blender.Freestyle.ReadCompleteViewMapPixelF0D.__call__(*args)
+
+class ReadMapPixelF0D(Blender.Freestyle.ReadMapPixelF0D):
+	def __call__(*args): return Blender.Freestyle.ReadMapPixelF0D.__call__(*args)
+
+class ReadSteerableViewMapPixelF0D(Blender.Freestyle.ReadSteerableViewMapPixelF0D):
+	def __call__(*args): return Blender.Freestyle.ReadSteerableViewMapPixelF0D.__call__(*args)
+
+class ShapeIdF0D(Blender.Freestyle.ShapeIdF0D):
+	def __call__(*args): return Blender.Freestyle.ShapeIdF0D.__call__(*args)
+
+class MaterialF0D(Blender.Freestyle.MaterialF0D):
+	def __call__(*args): return Blender.Freestyle.MaterialF0D.__call__(*args)
+
+class CurveNatureF0D(Blender.Freestyle.CurveNatureF0D):
+	def __call__(*args): return Blender.Freestyle.CurveNatureF0D.__call__(*args)
+
+class QuantitativeInvisibilityF0D(Blender.Freestyle.QuantitativeInvisibilityF0D):
+	def __call__(*args): return Blender.Freestyle.QuantitativeInvisibilityF0D.__call__(*args)
+
+class Normal2DF0D(Blender.Freestyle.Normal2DF0D):
+	def __call__(*args): return Blender.Freestyle.Normal2DF0D.__call__(*args)
+
+class VertexOrientation2DF0D(Blender.Freestyle.VertexOrientation2DF0D):
+	def __call__(*args): return Blender.Freestyle.VertexOrientation2DF0D.__call__(*args)
+
+class VertexOrientation3DF0D(Blender.Freestyle.VertexOrientation3DF0D):
+	def __call__(*args): return Blender.Freestyle.VertexOrientation3DF0D.__call__(*args)
+
+class GetOccludersF0D(Blender.Freestyle.GetOccludersF0D):
+	def __call__(*args): return Blender.Freestyle.GetOccludersF0D.__call__(*args)
+
+class GetOccludeeF0D(Blender.Freestyle.GetOccludeeF0D):
+	def __call__(*args): return Blender.Freestyle.GetOccludeeF0D.__call__(*args)
+
+class GetShapeF0D(Blender.Freestyle.GetShapeF0D):
+	def __call__(*args): return Blender.Freestyle.GetShapeF0D.__call__(*args)
+
+# class Curvature2DAngleF1D(Blender.Freestyle.Curvature2DAngleF1D):
+# 	def __call__(*args): return Blender.Freestyle.Curvature2DAngleF1D.__call__(*args)
+
+class DensityF1D(Blender.Freestyle.DensityF1D):
+	def __call__(*args): return Blender.Freestyle.DensityF1D.__call__(*args)
+
+class GetCompleteViewMapDensityF1D(Blender.Freestyle.GetCompleteViewMapDensityF1D):
+	def __call__(*args): return Blender.Freestyle.GetCompleteViewMapDensityF1D.__call__(*args)
+
+class GetDirectionalViewMapDensityF1D(Blender.Freestyle.GetDirectionalViewMapDensityF1D):
+	def __call__(*args): return Blender.Freestyle.GetDirectionalViewMapDensityF1D.__call__(*args)
+
+class GetProjectedXF1D(Blender.Freestyle.GetProjectedXF1D):
+	def __call__(*args): return Blender.Freestyle.GetProjectedXF1D.__call__(*args)
+
+class GetProjectedYF1D(Blender.Freestyle.GetProjectedYF1D):
+	def __call__(*args): return Blender.Freestyle.GetProjectedYF1D.__call__(*args)
+
+class GetProjectedZF1D(Blender.Freestyle.GetProjectedZF1D):
+	def __call__(*args): return Blender.Freestyle.GetProjectedZF1D.__call__(*args)
+
+class GetSteerableViewMapDensityF1D(Blender.Freestyle.GetSteerableViewMapDensityF1D):
+	def __call__(*args): return Blender.Freestyle.GetSteerableViewMapDensityF1D.__call__(*args)
+
+class GetViewMapGradientNormF1D(Blender.Freestyle.GetViewMapGradientNormF1D):
+	def __call__(*args): return Blender.Freestyle.GetViewMapGradientNormF1D.__call__(*args)
+
+class GetXF1D(Blender.Freestyle.GetXF1D):
+	def __call__(*args): return Blender.Freestyle.GetXF1D.__call__(*args)
+
+class GetYF1D(Blender.Freestyle.GetYF1D):
+	def __call__(*args): return Blender.Freestyle.GetYF1D.__call__(*args)
+
+class GetZF1D(Blender.Freestyle.GetZF1D):
+	def __call__(*args): return Blender.Freestyle.GetZF1D.__call__(*args)
+
+class LocalAverageDepthF1D(Blender.Freestyle.LocalAverageDepthF1D):
+	def __call__(*args): return Blender.Freestyle.LocalAverageDepthF1D.__call__(*args)
+
+class ZDiscontinuityF1D(Blender.Freestyle.ZDiscontinuityF1D):
+	def __call__(*args): return Blender.Freestyle.ZDiscontinuityF1D.__call__(*args)
+
+class CurveNatureF1D(Blender.Freestyle.CurveNatureF1D):
+	def __call__(*args): return Blender.Freestyle.CurveNatureF1D.__call__(*args)
+
+class QuantitativeInvisibilityF1D(Blender.Freestyle.QuantitativeInvisibilityF1D):
+	def __call__(*args): return Blender.Freestyle.QuantitativeInvisibilityF1D.__call__(*args)
+
+class Normal2DF1D(Blender.Freestyle.Normal2DF1D):
+	def __call__(*args): return Blender.Freestyle.Normal2DF1D.__call__(*args)
+
+class Orientation2DF1D(Blender.Freestyle.Orientation2DF1D):
+	def __call__(*args): return Blender.Freestyle.Orientation2DF1D.__call__(*args)
+
+class Orientation3DF1D(Blender.Freestyle.Orientation3DF1D):
+	def __call__(*args): return Blender.Freestyle.Orientation3DF1D.__call__(*args)
+
+class GetOccludeeF1D(Blender.Freestyle.GetOccludeeF1D):
+	def __call__(*args): return Blender.Freestyle.GetOccludeeF1D.__call__(*args)
+
+class GetOccludersF1D(Blender.Freestyle.GetOccludersF1D):
+	def __call__(*args): return Blender.Freestyle.GetOccludersF1D.__call__(*args)
+
+class GetShapeF1D(Blender.Freestyle.GetShapeF1D):
+	def __call__(*args): return Blender.Freestyle.GetShapeF1D.__call__(*args)
+
+# class ChainingTimeStampF1D(Blender.Freestyle.ChainingTimeStampF1D):
+# 	def __call__(*args): return Blender.Freestyle.ChainingTimeStampF1D.__call__(*args)
+
+# class IncrementChainingTimeStampF1D(Blender.Freestyle.IncrementChainingTimeStampF1D):
+# 	def __call__(*args): return Blender.Freestyle.IncrementChainingTimeStampF1D.__call__(*args)
+
+# class TimeStampF1D(Blender.Freestyle.TimeStampF1D):
+# 	def __call__(*args): return Blender.Freestyle.TimeStampF1D.__call__(*args)
+
diff --git a/source/blender/freestyle/style_modules_blender/haloing.py b/source/blender/freestyle/style_modules_blender/haloing.py
index b7713ca2b88..afa46173d54 100755
--- a/source/blender/freestyle/style_modules_blender/haloing.py
+++ b/source/blender/freestyle/style_modules_blender/haloing.py
@@ -28,7 +28,7 @@
 #
 #############################################################################
 
-from Blender.Freestyle import *
+from freestyle_init import *
 from logical_operators import *
 from PredicatesU1D import *
 from PredicatesB1D import *
diff --git a/source/blender/freestyle/style_modules_blender/ignore_small_occlusions.py b/source/blender/freestyle/style_modules_blender/ignore_small_occlusions.py
index 6fa7d2413f0..ff6efa89ade 100755
--- a/source/blender/freestyle/style_modules_blender/ignore_small_occlusions.py
+++ b/source/blender/freestyle/style_modules_blender/ignore_small_occlusions.py
@@ -25,7 +25,7 @@
 #
 #############################################################################
 
-from Blender.Freestyle import *
+from freestyle_init import *
 from logical_operators import *
 from ChainingIterators import *
 from shaders import *
diff --git a/source/blender/freestyle/style_modules_blender/invisible_lines.py b/source/blender/freestyle/style_modules_blender/invisible_lines.py
index ddaf3e4de9d..ea509463bfd 100755
--- a/source/blender/freestyle/style_modules_blender/invisible_lines.py
+++ b/source/blender/freestyle/style_modules_blender/invisible_lines.py
@@ -26,7 +26,7 @@
 #
 #############################################################################
 
-from Blender.Freestyle import *
+from freestyle_init import *
 from logical_operators import *
 from ChainingIterators import *
 from shaders import *
diff --git a/source/blender/freestyle/style_modules_blender/japanese_bigbrush.py b/source/blender/freestyle/style_modules_blender/japanese_bigbrush.py
index 74885b50562..b41c6d7df17 100755
--- a/source/blender/freestyle/style_modules_blender/japanese_bigbrush.py
+++ b/source/blender/freestyle/style_modules_blender/japanese_bigbrush.py
@@ -25,7 +25,7 @@
 #
 #############################################################################
 
-from Blender.Freestyle import *
+from freestyle_init import *
 from logical_operators import *
 from PredicatesU1D import *
 from PredicatesB1D import *
diff --git a/source/blender/freestyle/style_modules_blender/logical_operators.py b/source/blender/freestyle/style_modules_blender/logical_operators.py
index 33466ed5a33..75b486ef470 100755
--- a/source/blender/freestyle/style_modules_blender/logical_operators.py
+++ b/source/blender/freestyle/style_modules_blender/logical_operators.py
@@ -1,8 +1,8 @@
-from Blender.Freestyle import *
+from freestyle_init import *
 
-class AndUP1D(UnaryPredicate1D):
+class AndUP1D(ContourUP1D):
     def __init__(self, pred1, pred2):
-        UnaryPredicate1D.__init__(self)
+        ContourUP1D.__init__(self)
         self.__pred1 = pred1
         self.__pred2 = pred2
 
@@ -12,9 +12,9 @@ class AndUP1D(UnaryPredicate1D):
     def __call__(self, inter):
         return self.__pred1(inter) and self.__pred2(inter)
     
-class OrUP1D(UnaryPredicate1D):
+class OrUP1D(ContourUP1D):
     def __init__(self, pred1, pred2):
-        UnaryPredicate1D.__init__(self)
+        ContourUP1D.__init__(self)
         self.__pred1 = pred1
         self.__pred2 = pred2
 
@@ -24,9 +24,9 @@ class OrUP1D(UnaryPredicate1D):
     def __call__(self, inter):
         return self.__pred1(inter) or self.__pred2(inter)
 
-class NotUP1D(UnaryPredicate1D):
+class NotUP1D(ContourUP1D):
 	def __init__(self, pred):
-		UnaryPredicate1D.__init__(self)
+		ContourUP1D.__init__(self)
 		self.__pred = pred
 
 	def getName(self):
diff --git a/source/blender/freestyle/style_modules_blender/long_anisotropically_dense.py b/source/blender/freestyle/style_modules_blender/long_anisotropically_dense.py
index 64b77092c4f..52bb2dd1170 100755
--- a/source/blender/freestyle/style_modules_blender/long_anisotropically_dense.py
+++ b/source/blender/freestyle/style_modules_blender/long_anisotropically_dense.py
@@ -32,7 +32,7 @@
 #
 #############################################################################
 
-from Blender.Freestyle import *
+from freestyle_init import *
 from logical_operators import *
 from PredicatesU1D import *
 from PredicatesU0D import *
diff --git a/source/blender/freestyle/style_modules_blender/multiple_parameterization.py b/source/blender/freestyle/style_modules_blender/multiple_parameterization.py
index 76565424080..3f0409db5fa 100755
--- a/source/blender/freestyle/style_modules_blender/multiple_parameterization.py
+++ b/source/blender/freestyle/style_modules_blender/multiple_parameterization.py
@@ -31,7 +31,7 @@
 #
 #############################################################################
 
-from Blender.Freestyle import *
+from freestyle_init import *
 from logical_operators import *
 from ChainingIterators import *
 from shaders import *
diff --git a/source/blender/freestyle/style_modules_blender/nature.py b/source/blender/freestyle/style_modules_blender/nature.py
index b3441ea2b23..b5481a8e519 100755
--- a/source/blender/freestyle/style_modules_blender/nature.py
+++ b/source/blender/freestyle/style_modules_blender/nature.py
@@ -3,8 +3,8 @@
 #  Author   : Stephane Grabli
 #  Date     : 04/08/2005
 #  Purpose  : Uses the NatureUP1D predicate to select the lines
-#             of a given type (among SILHOUETTE, CREASE, SUGGESTIVE_CONTOURS,
-#             BORDERS).
+#             of a given type (among Nature.SILHOUETTE, Nature.CREASE, Nature.SUGGESTIVE_CONTOURS,
+#             Nature.BORDERS).
 #             The suggestive contours must have been enabled in the 
 #             options dialog to appear in the View Map.
 #
@@ -29,13 +29,13 @@
 #
 #############################################################################
 
-from Blender.Freestyle import *
+from freestyle_init import *
 from logical_operators import *
 from PredicatesB1D import *
 from shaders import *
 
-Operators.select(pyNatureUP1D(SILHOUETTE))
-Operators.bidirectionalChain(ChainSilhouetteIterator(),NotUP1D( pyNatureUP1D( SILHOUETTE) ) )
+Operators.select(pyNatureUP1D(Nature.SILHOUETTE))
+Operators.bidirectionalChain(ChainSilhouetteIterator(),NotUP1D( pyNatureUP1D( Nature.SILHOUETTE) ) )
 shaders_list = 	[
 		IncreasingThicknessShader(3, 10), 
 		IncreasingColorShader(0.0,0.0,0.0, 1, 0.8,0,0,1)
diff --git a/source/blender/freestyle/style_modules_blender/near_lines.py b/source/blender/freestyle/style_modules_blender/near_lines.py
index 1e9e278643a..565bca1fe1f 100755
--- a/source/blender/freestyle/style_modules_blender/near_lines.py
+++ b/source/blender/freestyle/style_modules_blender/near_lines.py
@@ -27,7 +27,7 @@
 #############################################################################
 
 
-from Blender.Freestyle import *
+from freestyle_init import *
 from logical_operators import *
 from PredicatesB1D import *
 from PredicatesU1D import *
diff --git a/source/blender/freestyle/style_modules_blender/occluded_by_specific_object.py b/source/blender/freestyle/style_modules_blender/occluded_by_specific_object.py
index 21e778aee79..09ce39d5dd6 100755
--- a/source/blender/freestyle/style_modules_blender/occluded_by_specific_object.py
+++ b/source/blender/freestyle/style_modules_blender/occluded_by_specific_object.py
@@ -25,7 +25,7 @@
 #
 #############################################################################
 
-from Blender.Freestyle import *
+from freestyle_init import *
 from logical_operators import *
 from PredicatesU1D import *
 from shaders import *
diff --git a/source/blender/freestyle/style_modules_blender/polygonalize.py b/source/blender/freestyle/style_modules_blender/polygonalize.py
index beb48f812f7..4446c4c1dcc 100755
--- a/source/blender/freestyle/style_modules_blender/polygonalize.py
+++ b/source/blender/freestyle/style_modules_blender/polygonalize.py
@@ -24,7 +24,7 @@
 #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 #############################################################################
-from Blender.Freestyle import *
+from freestyle_init import *
 from logical_operators import *
 from ChainingIterators import *
 from shaders import *
diff --git a/source/blender/freestyle/style_modules_blender/qi0.py b/source/blender/freestyle/style_modules_blender/qi0.py
index 246cda79607..d35d23cb7c3 100755
--- a/source/blender/freestyle/style_modules_blender/qi0.py
+++ b/source/blender/freestyle/style_modules_blender/qi0.py
@@ -26,7 +26,7 @@
 #
 #############################################################################
 
-from Blender.Freestyle import *
+from freestyle_init import *
 from logical_operators import *
 from ChainingIterators import *
 from shaders import *
diff --git a/source/blender/freestyle/style_modules_blender/qi0_not_external_contour.py b/source/blender/freestyle/style_modules_blender/qi0_not_external_contour.py
index 8cc5bf4c63d..c1151f2c231 100755
--- a/source/blender/freestyle/style_modules_blender/qi0_not_external_contour.py
+++ b/source/blender/freestyle/style_modules_blender/qi0_not_external_contour.py
@@ -26,7 +26,7 @@
 #
 #############################################################################
 
-from Blender.Freestyle import *
+from freestyle_init import *
 from logical_operators import *
 
 upred = AndUP1D(QuantitativeInvisibilityUP1D(0), ExternalContourUP1D())
diff --git a/source/blender/freestyle/style_modules_blender/qi1.py b/source/blender/freestyle/style_modules_blender/qi1.py
index 0125fd71ea8..8d248376138 100755
--- a/source/blender/freestyle/style_modules_blender/qi1.py
+++ b/source/blender/freestyle/style_modules_blender/qi1.py
@@ -27,7 +27,7 @@
 #
 #############################################################################
 
-from Blender.Freestyle import *
+from freestyle_init import *
 from logical_operators import *
 from PredicatesB1D import *
 from shaders import *
diff --git a/source/blender/freestyle/style_modules_blender/qi2.py b/source/blender/freestyle/style_modules_blender/qi2.py
index 9bb356c0810..ba5e97b6982 100755
--- a/source/blender/freestyle/style_modules_blender/qi2.py
+++ b/source/blender/freestyle/style_modules_blender/qi2.py
@@ -27,7 +27,7 @@
 #
 #############################################################################
 
-from Blender.Freestyle import *
+from freestyle_init import *
 from logical_operators import *
 from PredicatesB1D import *
 from shaders import *
diff --git a/source/blender/freestyle/style_modules_blender/sequentialsplit_sketchy.py b/source/blender/freestyle/style_modules_blender/sequentialsplit_sketchy.py
index c9d73a57c46..c371ed48d64 100755
--- a/source/blender/freestyle/style_modules_blender/sequentialsplit_sketchy.py
+++ b/source/blender/freestyle/style_modules_blender/sequentialsplit_sketchy.py
@@ -27,7 +27,7 @@
 #
 #############################################################################
 
-from Blender.Freestyle import *
+from freestyle_init import *
 from logical_operators import *
 from PredicatesU1D import *
 from PredicatesU0D import *
@@ -44,7 +44,7 @@ class pyBackTVertexUP0D(UnaryPredicate0D):
 	def __call__(self, iter):
 		v = iter.getObject()
 		nat = v.getNature()
-		if(nat & T_VERTEX == 0):
+		if(nat & Nature.T_VERTEX == 0):
 			return 0
 		if(self._getQI(iter) != 0):
 			return 1
@@ -55,7 +55,7 @@ upred = QuantitativeInvisibilityUP1D(0)
 Operators.select(upred)
 Operators.bidirectionalChain(ChainSilhouetteIterator(), NotUP1D(upred))
 ## starting and stopping predicates:
-start = pyVertexNatureUP0D(NON_T_VERTEX)
+start = pyVertexNatureUP0D(Nature.NON_Nature.T_VERTEX)
 stop = pyBackTVertexUP0D()
 Operators.sequentialSplit(start, stop, 10)
 shaders_list = [
diff --git a/source/blender/freestyle/style_modules_blender/shaders.py b/source/blender/freestyle/style_modules_blender/shaders.py
index ee45324e186..bed23adff5f 100755
--- a/source/blender/freestyle/style_modules_blender/shaders.py
+++ b/source/blender/freestyle/style_modules_blender/shaders.py
@@ -1,4 +1,4 @@
-from Blender.Freestyle import *
+from freestyle_init import *
 from PredicatesU0D import *
 from PredicatesB1D import *
 from PredicatesU1D import *
@@ -253,7 +253,7 @@ class pyTVertexThickenerShader(StrokeShader): ## FIXME
 
 	def shade(self, stroke):
 		it = stroke.strokeVerticesBegin()
-		predTVertex = pyVertexNatureUP0D(T_VERTEX)
+		predTVertex = pyVertexNatureUP0D(Nature.T_VERTEX)
 		while it.isEnd() == 0:
 			if(predTVertex(it) == 1):
 				it2 = StrokeVertexIterator(it)
@@ -684,7 +684,7 @@ class pyBackboneStretcherNoCuspShader(StrokeShader):
 		itn_1.decrement()
 		v0 = it0.getObject()
 		v1 = it1.getObject()
-		if((v0.getNature() & CUSP == 0) and (v1.getNature() & CUSP == 0)):
+		if((v0.getNature() & Nature.CUSP == 0) and (v1.getNature() & Nature.CUSP == 0)):
 			p0 = v0.getPoint()
 			p1 = v1.getPoint()
 			d1 = p0-p1
@@ -693,7 +693,7 @@ class pyBackboneStretcherNoCuspShader(StrokeShader):
 			v0.setPoint(newFirst)
 		vn_1 = itn_1.getObject()
 		vn = itn.getObject()
-		if((vn.getNature() & CUSP == 0) and (vn_1.getNature() & CUSP == 0)):
+		if((vn.getNature() & Nature.CUSP == 0) and (vn_1.getNature() & Nature.CUSP == 0)):
 			pn = vn.getPoint()
 			pn_1 = vn_1.getPoint()
 			dn = pn-pn_1
@@ -766,7 +766,7 @@ class pyTVertexRemoverShader(StrokeShader):
 	def shade(self, stroke):
 		if(stroke.strokeVerticesSize() <= 3 ):
 			return
- 		predTVertex = pyVertexNatureUP0D(T_VERTEX)
+ 		predTVertex = pyVertexNatureUP0D(Nature.T_VERTEX)
 		it = stroke.strokeVerticesBegin()
 		itlast = stroke.strokeVerticesEnd()
 		itlast.decrement()
@@ -804,8 +804,8 @@ class pyHLRShader(StrokeShader):
 		while(it2.isEnd() == 0):
 			v = it.getObject()
 			vnext = it2.getObject()
-			if(v.getNature() & VIEW_VERTEX):
-				#if(v.getNature() & T_VERTEX):
+			if(v.getNature() & Nature.VIEW_VERTEX):
+				#if(v.getNature() & Nature.T_VERTEX):
 				fe = getFEdge(v,vnext)
 				qi = fe.qi()
 				if(qi != 0):
@@ -851,7 +851,7 @@ class pyTVertexOrientationShader(StrokeShader):
 		it2.increment()
 		## case where the first vertex is a TVertex
 		v = it.getObject() 
-		if(v.getNature() & T_VERTEX):
+		if(v.getNature() & Nature.T_VERTEX):
 			tv = v.castToTVertex()
 			ve = getFEdge(v, it2.getObject()).viewedge()
 			if(tv != None):			
@@ -861,7 +861,7 @@ class pyTVertexOrientationShader(StrokeShader):
 		while(it2.isEnd() == 0):
 			vprevious = it.getObject()
 			v = it2.getObject()
-			if(v.getNature() & T_VERTEX):
+			if(v.getNature() & Nature.T_VERTEX):
 				tv = v.castToTVertex()
 				ve = getFEdge(vprevious, v).viewedge()
 				if(tv != None):	
@@ -872,7 +872,7 @@ class pyTVertexOrientationShader(StrokeShader):
 			it2.increment()
 		## case where the last vertex is a TVertex
 		v = it.getObject() 
-		if(v.getNature() & T_VERTEX):
+		if(v.getNature() & Nature.T_VERTEX):
 			itPrevious = StrokeVertexIterator(it)
 			itPrevious.decrement()
 			tv = v.castToTVertex()
diff --git a/source/blender/freestyle/style_modules_blender/sketchy_multiple_parameterization.py b/source/blender/freestyle/style_modules_blender/sketchy_multiple_parameterization.py
index 1df58a75999..163c891fa90 100755
--- a/source/blender/freestyle/style_modules_blender/sketchy_multiple_parameterization.py
+++ b/source/blender/freestyle/style_modules_blender/sketchy_multiple_parameterization.py
@@ -27,7 +27,7 @@
 #
 #############################################################################
 
-from Blender.Freestyle import *
+from freestyle_init import *
 from logical_operators import *
 from ChainingIterators import *
 from shaders import *
diff --git a/source/blender/freestyle/style_modules_blender/sketchy_topology_broken.py b/source/blender/freestyle/style_modules_blender/sketchy_topology_broken.py
index ebad839a3ab..5c151cfe837 100755
--- a/source/blender/freestyle/style_modules_blender/sketchy_topology_broken.py
+++ b/source/blender/freestyle/style_modules_blender/sketchy_topology_broken.py
@@ -27,7 +27,7 @@
 #
 #############################################################################
 
-from Blender.Freestyle import *
+from freestyle_init import *
 from logical_operators import *
 from ChainingIterators import *
 from shaders import *
@@ -49,7 +49,7 @@ class pyBackboneStretcherNoCuspShader(StrokeShader):
 		itn_1.decrement()
 		v0 = it0.getObject()
 		v1 = it1.getObject()
-		if((v0.getNature() & CUSP == 0) and (v1.getNature() & CUSP == 0)):
+		if((v0.getNature() & Nature.CUSP == 0) and (v1.getNature() & Nature.CUSP == 0)):
 			p0 = v0.getPoint()
 			p1 = v1.getPoint()
 			d1 = p0-p1
@@ -60,7 +60,7 @@ class pyBackboneStretcherNoCuspShader(StrokeShader):
 			print "got a v0 cusp"
 		vn_1 = itn_1.getObject()
 		vn = itn.getObject()
-		if((vn.getNature() & CUSP == 0) and (vn_1.getNature() & CUSP == 0)):
+		if((vn.getNature() & Nature.CUSP == 0) and (vn_1.getNature() & Nature.CUSP == 0)):
 			pn = vn.getPoint()
 			pn_1 = vn_1.getPoint()
 			dn = pn-pn_1
diff --git a/source/blender/freestyle/style_modules_blender/sketchy_topology_preserved.py b/source/blender/freestyle/style_modules_blender/sketchy_topology_preserved.py
index 3085a5f2f7f..85e11af38b9 100755
--- a/source/blender/freestyle/style_modules_blender/sketchy_topology_preserved.py
+++ b/source/blender/freestyle/style_modules_blender/sketchy_topology_preserved.py
@@ -27,7 +27,7 @@
 #
 #############################################################################
 
-from Blender.Freestyle import *
+from freestyle_init import *
 from logical_operators import *
 from ChainingIterators import *
 from PredicatesU1D import *
diff --git a/source/blender/freestyle/style_modules_blender/split_at_highest_2d_curvatures.py b/source/blender/freestyle/style_modules_blender/split_at_highest_2d_curvatures.py
index e7da0fa2690..f780137ef05 100755
--- a/source/blender/freestyle/style_modules_blender/split_at_highest_2d_curvatures.py
+++ b/source/blender/freestyle/style_modules_blender/split_at_highest_2d_curvatures.py
@@ -26,7 +26,7 @@
 #
 #############################################################################
 
-from Blender.Freestyle import *
+from freestyle_init import *
 from logical_operators import *
 from PredicatesU1D import *
 from Functions0D import *
diff --git a/source/blender/freestyle/style_modules_blender/split_at_tvertices.py b/source/blender/freestyle/style_modules_blender/split_at_tvertices.py
index acda7e3c0ea..78f781dd290 100755
--- a/source/blender/freestyle/style_modules_blender/split_at_tvertices.py
+++ b/source/blender/freestyle/style_modules_blender/split_at_tvertices.py
@@ -25,7 +25,7 @@
 #
 #############################################################################
 
-from Blender.Freestyle import *
+from freestyle_init import *
 from logical_operators import *
 from PredicatesU1D import *
 from PredicatesU0D import *
@@ -33,7 +33,7 @@ from Functions0D import *
 
 Operators.select(QuantitativeInvisibilityUP1D(0))
 Operators.bidirectionalChain(ChainSilhouetteIterator(), NotUP1D(QuantitativeInvisibilityUP1D(0)))
-start = pyVertexNatureUP0D(T_VERTEX)
+start = pyVertexNatureUP0D(Nature.T_VERTEX)
 ## use the same predicate to decide where to start and where to stop 
 ## the strokes:
 Operators.sequentialSplit(start, start, 10)
diff --git a/source/blender/freestyle/style_modules_blender/stroke_texture.py b/source/blender/freestyle/style_modules_blender/stroke_texture.py
index 41b5371fbfb..afebbe30a90 100755
--- a/source/blender/freestyle/style_modules_blender/stroke_texture.py
+++ b/source/blender/freestyle/style_modules_blender/stroke_texture.py
@@ -25,7 +25,7 @@
 #
 #############################################################################
 
-from Blender.Freestyle import *
+from freestyle_init import *
 from logical_operators import *
 from PredicatesB1D import *
 from shaders import *
diff --git a/source/blender/freestyle/style_modules_blender/suggestive.py b/source/blender/freestyle/style_modules_blender/suggestive.py
index 3bc06e62fa7..39d8515ed6c 100755
--- a/source/blender/freestyle/style_modules_blender/suggestive.py
+++ b/source/blender/freestyle/style_modules_blender/suggestive.py
@@ -27,13 +27,13 @@
 #
 #############################################################################
 
-from Blender.Freestyle import *
+from freestyle_init import *
 from logical_operators import *
 from PredicatesB1D import *
 from PredicatesU1D import *
 from shaders import *
 
-upred = AndUP1D(pyNatureUP1D(SUGGESTIVE_CONTOUR), QuantitativeInvisibilityUP1D(0))
+upred = AndUP1D(pyNatureUP1D(Nature.SUGGESTIVE_CONTOUR), QuantitativeInvisibilityUP1D(0))
 Operators.select(upred)
 Operators.bidirectionalChain(ChainSilhouetteIterator(), NotUP1D(upred))
 shaders_list = 	[
diff --git a/source/blender/freestyle/style_modules_blender/thickness_fof_depth_discontinuity.py b/source/blender/freestyle/style_modules_blender/thickness_fof_depth_discontinuity.py
index 7814f2cac6c..21f6c7bdf35 100755
--- a/source/blender/freestyle/style_modules_blender/thickness_fof_depth_discontinuity.py
+++ b/source/blender/freestyle/style_modules_blender/thickness_fof_depth_discontinuity.py
@@ -25,7 +25,7 @@
 #
 #############################################################################
 
-from Blender.Freestyle import *
+from freestyle_init import *
 from logical_operators import *
 from ChainingIterators import *
 from shaders import *
diff --git a/source/blender/freestyle/style_modules_blender/tipremover.py b/source/blender/freestyle/style_modules_blender/tipremover.py
index 1d044e369c4..3e495b7d332 100755
--- a/source/blender/freestyle/style_modules_blender/tipremover.py
+++ b/source/blender/freestyle/style_modules_blender/tipremover.py
@@ -26,7 +26,7 @@
 #############################################################################
 
 
-from Blender.Freestyle import *
+from freestyle_init import *
 from logical_operators import *
 from ChainingIterators import *
 from shaders import *
diff --git a/source/blender/freestyle/style_modules_blender/tvertex_remover.py b/source/blender/freestyle/style_modules_blender/tvertex_remover.py
index d474ca087f8..c328f4c98ec 100755
--- a/source/blender/freestyle/style_modules_blender/tvertex_remover.py
+++ b/source/blender/freestyle/style_modules_blender/tvertex_remover.py
@@ -26,7 +26,7 @@
 #############################################################################
 
 
-from Blender.Freestyle import *
+from freestyle_init import *
 from logical_operators import *
 from PredicatesB1D import *
 from shaders import *
diff --git a/source/blender/freestyle/style_modules_blender/uniformpruning_zsort.py b/source/blender/freestyle/style_modules_blender/uniformpruning_zsort.py
index 044ec0cbb80..4b1a8bef9df 100755
--- a/source/blender/freestyle/style_modules_blender/uniformpruning_zsort.py
+++ b/source/blender/freestyle/style_modules_blender/uniformpruning_zsort.py
@@ -1,4 +1,4 @@
-from Blender.Freestyle import *
+from freestyle_init import *
 from logical_operators import *
 from PredicatesU1D import *
 from PredicatesU0D import *
@@ -27,7 +27,7 @@ class pyDensityUP1D(UnaryPredicate1D):
 
 Operators.select(QuantitativeInvisibilityUP1D(0))
 Operators.bidirectionalChain(ChainSilhouetteIterator())
-#Operators.sequentialSplit(pyVertexNatureUP0D(VIEW_VERTEX), 2)
+#Operators.sequentialSplit(pyVertexNatureUP0D(Nature.VIEW_VERTEX), 2)
 Operators.sort(pyZBP1D())
 shaders_list = 	[
 		StrokeTextureShader("smoothAlpha.bmp", Stroke.OPAQUE_MEDIUM, 0),

From 7d5eaa674b70b13af3c67b2209fdfe32b6168e45 Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Tue, 29 Jul 2008 11:19:30 +0000
Subject: [PATCH 162/252] soc-2008-mxcurioni: corrected problems in API with
 UnaryFunction1DVoid subclasses and Curvature2DAngleF1D. Understood that Curve
 and Noise classes cannot be defined in Freestyle's API because they are
 already given by Blender's API. Will rename to FrsCurve and FrsNoise and
 change the corresponding style modules.

---
 .../intern/python/BPy_UnaryFunction1D.cpp     |  3 ++-
 .../BPy_UnaryFunction1DDouble.cpp             |  5 +++++
 .../style_modules_blender/freestyle_init.py   | 20 +++++++++----------
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp
index 9ab0ce41fb3..10db0d93140 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp
@@ -7,7 +7,7 @@
 #include "UnaryFunction1D/BPy_UnaryFunction1DVec2f.h"
 #include "UnaryFunction1D/BPy_UnaryFunction1DVec3f.h"
 #include "UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.h"
-
+#include "UnaryFunction1D/BPy_UnaryFunction1DVoid.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -127,6 +127,7 @@ PyMODINIT_FUNC UnaryFunction1D_Init( PyObject *module )
 	UnaryFunction1DVec2f_Init( module );
 	UnaryFunction1DVec3f_Init( module );
 	UnaryFunction1DVectorViewShape_Init( module );
+	UnaryFunction1DVoid_Init( module );
 }
 
 //------------------------INSTANCE METHODS ----------------------------------
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp
index 5b6aed936b9..887d1273e60 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp
@@ -147,6 +147,11 @@ PyMODINIT_FUNC UnaryFunction1DDouble_Init( PyObject *module ) {
 	Py_INCREF( &DensityF1D_Type );
 	PyModule_AddObject(module, "DensityF1D", (PyObject *)&DensityF1D_Type);
 
+	if( PyType_Ready( &Curvature2DAngleF1D_Type ) < 0 )
+		return;
+	Py_INCREF( &Curvature2DAngleF1D_Type );
+	PyModule_AddObject(module, "Curvature2DAngleF1D", (PyObject *)&Curvature2DAngleF1D_Type);
+
 	if( PyType_Ready( &GetCompleteViewMapDensityF1D_Type ) < 0 )
 		return;
 	Py_INCREF( &GetCompleteViewMapDensityF1D_Type );
diff --git a/source/blender/freestyle/style_modules_blender/freestyle_init.py b/source/blender/freestyle/style_modules_blender/freestyle_init.py
index 5cc3448ca4d..8c45629bade 100644
--- a/source/blender/freestyle/style_modules_blender/freestyle_init.py
+++ b/source/blender/freestyle/style_modules_blender/freestyle_init.py
@@ -246,8 +246,8 @@ class UnaryFunction1DVec3f(Blender.Freestyle.UnaryFunction1DVec3f):
 class UnaryFunction1DVectorViewShape(Blender.Freestyle.UnaryFunction1DVectorViewShape):
 	pass
 
-# class UnaryFunction1DVoid(Blender.Freestyle.UnaryFunction1DVoid):
-# 	pass
+class UnaryFunction1DVoid(Blender.Freestyle.UnaryFunction1DVoid):
+	pass
 
 class FalseUP0D(Blender.Freestyle.FalseUP0D):
 	def __call__(*args): return Blender.Freestyle.FalseUP0D.__call__(*args)
@@ -378,8 +378,8 @@ class GetOccludeeF0D(Blender.Freestyle.GetOccludeeF0D):
 class GetShapeF0D(Blender.Freestyle.GetShapeF0D):
 	def __call__(*args): return Blender.Freestyle.GetShapeF0D.__call__(*args)
 
-# class Curvature2DAngleF1D(Blender.Freestyle.Curvature2DAngleF1D):
-# 	def __call__(*args): return Blender.Freestyle.Curvature2DAngleF1D.__call__(*args)
+class Curvature2DAngleF1D(Blender.Freestyle.Curvature2DAngleF1D):
+	def __call__(*args): return Blender.Freestyle.Curvature2DAngleF1D.__call__(*args)
 
 class DensityF1D(Blender.Freestyle.DensityF1D):
 	def __call__(*args): return Blender.Freestyle.DensityF1D.__call__(*args)
@@ -444,12 +444,12 @@ class GetOccludersF1D(Blender.Freestyle.GetOccludersF1D):
 class GetShapeF1D(Blender.Freestyle.GetShapeF1D):
 	def __call__(*args): return Blender.Freestyle.GetShapeF1D.__call__(*args)
 
-# class ChainingTimeStampF1D(Blender.Freestyle.ChainingTimeStampF1D):
-# 	def __call__(*args): return Blender.Freestyle.ChainingTimeStampF1D.__call__(*args)
+class ChainingTimeStampF1D(Blender.Freestyle.ChainingTimeStampF1D):
+	def __call__(*args): return Blender.Freestyle.ChainingTimeStampF1D.__call__(*args)
 
-# class IncrementChainingTimeStampF1D(Blender.Freestyle.IncrementChainingTimeStampF1D):
-# 	def __call__(*args): return Blender.Freestyle.IncrementChainingTimeStampF1D.__call__(*args)
+class IncrementChainingTimeStampF1D(Blender.Freestyle.IncrementChainingTimeStampF1D):
+	def __call__(*args): return Blender.Freestyle.IncrementChainingTimeStampF1D.__call__(*args)
 
-# class TimeStampF1D(Blender.Freestyle.TimeStampF1D):
-# 	def __call__(*args): return Blender.Freestyle.TimeStampF1D.__call__(*args)
+class TimeStampF1D(Blender.Freestyle.TimeStampF1D):
+	def __call__(*args): return Blender.Freestyle.TimeStampF1D.__call__(*args)
 

From b204eeca7d27867c229fd0b95714f6cecebda5fc Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Tue, 29 Jul 2008 11:37:11 +0000
Subject: [PATCH 163/252] Selections now draw correctly when word-wrapped.

---
 source/blender/src/drawtext.c | 139 ++++++++++++++--------------------
 1 file changed, 56 insertions(+), 83 deletions(-)

diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index 725766b1222..0286c6f9a64 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -580,6 +580,7 @@ static void wrap_offset(SpaceText *st, TextLine *linein, int cursin, int *offl,
 	TextLine *linep;
 	int i, start, end, taboffs, max;
 
+	*offl= *offc= 0;
 	if (!st->text) return;
 	if (!st->wordwrap) return;
 
@@ -593,9 +594,7 @@ static void wrap_offset(SpaceText *st, TextLine *linein, int cursin, int *offl,
 		i--;
 	}
 
-	/* Calculate line offset for earlier lines */
 	max= get_wrap_width(st);
-	*offl= 0;
 
 	while (linep) {
 		taboffs= start= 0;
@@ -623,102 +622,76 @@ static void wrap_offset(SpaceText *st, TextLine *linein, int cursin, int *offl,
 	}
 }
 
+static int get_char_pos(SpaceText *st, char *line, int cur) {
+	int a=0, i;
+	for (i=0; i<cur && line[i]; i++) {
+		if (line[i]=='\t')
+			a += st->tabnumber-a%st->tabnumber;
+		else
+			a++;
+	}
+	return a;
+}
+
 static void draw_cursor(SpaceText *st) {
-	int h, x, i, w;
 	Text *text= st->text;
 	TextLine *linef, *linel;
-	int charf, charl, offl, offc;
-	char ch[2];
+	int vcurl, vcurc, vsell, vselc, offl, offc, x, y, w, i;
 	
 	/* Draw the selection */
 	if (text->curl!=text->sell || text->curc!=text->selc) {
-		int span= txt_get_span(text->curl, text->sell);
-		
-		if (span<0) {
-			linef= text->sell;
-			charf= text->selc;
-			
-			linel= text->curl;
-			charl= text->curc;
-		} else if (span>0) {
-			linef= text->curl;
-			charf= text->curc;
-	
-			linel= text->sell;		
-			charl= text->selc;
-		} else {
-			linef= linel= text->curl;
-			
-			if (text->curc<text->selc) {
-				charf= text->curc;
-				charl= text->selc;
-			} else {
-				charf= text->selc;
-				charl= text->curc;
-			}
-		}
-	
-		/* Walk to the beginning of visible text */
-		h= txt_get_span(text->lines.first, linef) - st->top;
-		while (h++<-1 && linef!=linel) linef= linef->next;
-	
-		x= text_draw(st, linef->line, st->left, charf, 0, 0, 0, NULL);
 
+		/* Convert all to view space character coordinates */
+		wrap_offset(st, text->curl, text->curc, &offl, &offc);
+		vcurl = txt_get_span(text->lines.first, text->curl) - st->top + offl;
+		vcurc = get_char_pos(st, text->curl->line, text->curc) + offc;
+		wrap_offset(st, text->sell, text->selc, &offl, &offc);
+		vsell = txt_get_span(text->lines.first, text->sell) - st->top + offl;
+		vselc = get_char_pos(st, text->sell->line, text->selc) + offc;
+		
 		BIF_ThemeColor(TH_SHADE2);
+		x= st->showlinenrs ? TXT_OFFSET + TEXTXLOC : TXT_OFFSET;
+		y= curarea->winy-2;
 
-		if(st->showlinenrs) {
-			if (!x) x= TXT_OFFSET + TEXTXLOC -4;
+		if (vcurl==vsell) {
+			y -= vcurl*st->lheight;
+			if (vcurc < vselc)
+				glRecti(x+vcurc*spacetext_get_fontwidth(st), y, x+vselc*spacetext_get_fontwidth(st), y-st->lheight);
+			else
+				glRecti(x+vselc*spacetext_get_fontwidth(st), y, x+vcurc*spacetext_get_fontwidth(st), y-st->lheight);
 		} else {
-			if (!x) x= TXT_OFFSET - 4;
+			int froml, fromc, tol, toc;
+			if (vcurl < vsell) {
+				froml= vcurl; tol= vsell;
+				fromc= vcurc; toc= vselc;
+			} else {
+				froml= vsell; tol= vcurl;
+				fromc= vselc; toc= vcurc;
+			}
+			y -= froml*st->lheight;
+			glRecti(x+fromc*spacetext_get_fontwidth(st), y, curarea->winx, y-st->lheight); y-=st->lheight;
+			for (i=froml+1; i<tol; i++)
+				glRecti(x-4, y, curarea->winx, y-st->lheight),  y-=st->lheight;
+			glRecti(x-4, y, x+toc*spacetext_get_fontwidth(st), y-st->lheight);  y-=st->lheight;
 		}
-		
-		while (linef && linef != linel) {
-			h= txt_get_span(text->lines.first, linef) - st->top;
-			if (h>st->viewlines) break;
-			
-			glRecti(x, curarea->winy-st->lheight*(h)-2, curarea->winx, curarea->winy-st->lheight*(h+1)-2);
-			if(st->showlinenrs)
-				glRecti(TXT_OFFSET+TEXTXLOC-4, curarea->winy-st->lheight*(h+1)-2, TXT_OFFSET+TEXTXLOC, curarea->winy-st->lheight*(h+2)-2);
-			else
-				glRecti(TXT_OFFSET-4, curarea->winy-st->lheight*(h+1)-2, TXT_OFFSET, curarea->winy-st->lheight*(h+2)-2);
-
-			if(st->showlinenrs)
-				x= TXT_OFFSET + TEXTXLOC;
-			else
-				x= TXT_OFFSET;
-			
-			linef= linef->next;
-		}
-		
-		h= txt_get_span(text->lines.first, linef) - st->top;
-
-		i= text_draw(st, linel->line, st->left, charl, 0, 0, 0, NULL);
-		if(i) glRecti(x, curarea->winy-st->lheight*(h)-2, i, curarea->winy-st->lheight*(h+1)-2);
-
+	} else {
+		wrap_offset(st, text->sell, text->selc, &offl, &offc);
+		vsell = txt_get_span(text->lines.first, text->sell) - st->top + offl;
+		vselc = get_char_pos(st, text->sell->line, text->selc) + offc;
 	}
 
 	/* Draw the cursor itself (we draw the sel. cursor as this is the leading edge) */
-	x= text_draw(st, text->sell->line, st->left, text->selc, 0, 0, 0, NULL);
+	x= st->showlinenrs ? TXT_OFFSET + TEXTXLOC : TXT_OFFSET;
+	x += vselc*spacetext_get_fontwidth(st);
+	y= curarea->winy-2 - vsell*st->lheight;
 	
-	if (x) {
-		offl= offc= 0;
-		if (st->wordwrap) wrap_offset(st, text->sell, text->selc, &offl, &offc);
-		x += offc*spacetext_get_fontwidth(st);
-		h= txt_get_span(text->lines.first, text->sell) - st->top + offl;
-
-		if (st->overwrite) {
-			ch[0]= (unsigned char) text->sell->line[text->selc];
-			if (ch[0]=='\0') ch[0]=' ';
-			ch[1]= '\0';
-			w= BMF_GetStringWidth(spacetext_get_font(st), ch);
-			BIF_ThemeColor(TH_SHADE2);
-			glRecti(x, curarea->winy-st->lheight*(h)-2, x+w, curarea->winy-st->lheight*(h+1)-2);
-			BIF_ThemeColor(TH_HILITE);
-			glRecti(x, curarea->winy-st->lheight*(h+1)-3, x+w, curarea->winy-st->lheight*(h+1)-1);
-		} else {
-			BIF_ThemeColor(TH_HILITE);
-			glRecti(x-1, curarea->winy-st->lheight*(h)-2, x+1, curarea->winy-st->lheight*(h+1)-2);
-		}
+	if (st->overwrite) {
+		w= BMF_GetCharacterWidth(spacetext_get_font(st), text->sell->line[text->selc]);
+		BIF_ThemeColor(TH_HILITE);
+		glRecti(x, y-st->lheight-1, x+w, y-st->lheight+1);
+	} else {
+		BIF_ThemeColor(TH_HILITE);
+		glRecti(x-1, y, x+1, y-st->lheight);
 	}
 
 	do_brackets();

From 2efd74138c832a2cf8b356ee03f707930068f013 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Tue, 29 Jul 2008 20:20:24 +0000
Subject: [PATCH 164/252] Bug fixes:

Retag subgraphs when merging, to prevent loops
Mark missing up link in multi resolution as NULL
Ignore hidden vertices when propagating weight between islands
---
 source/blender/blenlib/BLI_graph.h    |  1 +
 source/blender/blenlib/intern/graph.c | 13 ++++++++
 source/blender/src/reeb.c             | 45 ++++++++++++++-------------
 3 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/source/blender/blenlib/BLI_graph.h b/source/blender/blenlib/BLI_graph.h
index be5d1f5d10c..66cf2a22842 100644
--- a/source/blender/blenlib/BLI_graph.h
+++ b/source/blender/blenlib/BLI_graph.h
@@ -80,6 +80,7 @@ void BLI_rebuildAdjacencyListForNode(BGraph* rg, BNode *node);
 void BLI_freeAdjacencyList(BGraph *rg);
 
 int BLI_FlagSubgraphs(BGraph *graph);
+void BLI_ReflagSubgraph(BGraph *graph, int old_subgraph, int new_subgraph);
 
 #define SHAPE_RADIX 10 /* each shape level is encoded this base */
 
diff --git a/source/blender/blenlib/intern/graph.c b/source/blender/blenlib/intern/graph.c
index abdf2969e49..aa899042a58 100644
--- a/source/blender/blenlib/intern/graph.c
+++ b/source/blender/blenlib/intern/graph.c
@@ -275,6 +275,19 @@ int BLI_FlagSubgraphs(BGraph *graph)
 	return subgraph;
 }
 
+void BLI_ReflagSubgraph(BGraph *graph, int old_subgraph, int new_subgraph)
+{
+	BNode *node;
+
+	for (node = graph->nodes.first; node; node = node->next)
+	{
+		if (node->flag == old_subgraph)
+		{
+			node->flag = new_subgraph;
+		}
+	}
+}
+
 /*************************************** CYCLE DETECTION ***********************************************/
 
 int detectCycle(BNode *node, BArc *src_arc)
diff --git a/source/blender/src/reeb.c b/source/blender/src/reeb.c
index 728dc2d7996..be5f754d5f0 100644
--- a/source/blender/src/reeb.c
+++ b/source/blender/src/reeb.c
@@ -350,7 +350,8 @@ void printArc(ReebArc *arc)
 {
 	ReebEdge *edge;
 	ReebNode *head = (ReebNode*)arc->head;
-	printf("arc: (%i)%f -> (%i)%f\n", head->index, head->weight, head->index, head->weight);
+	ReebNode *tail = (ReebNode*)arc->tail;
+	printf("arc: (%i) %f -> (%i) %f\n", head->index, head->weight, tail->index, tail->weight);
 	
 	for(edge = arc->edges.first; edge ; edge = edge->next)
 	{
@@ -499,7 +500,7 @@ void verifyFaces(ReebGraph *rg)
 #endif
 }
 
-void verifyMultiResolutionLinks(ReebGraph *rg)
+void verifyMultiResolutionLinks(ReebGraph *rg, int level)
 {
 #ifdef DEBUG_REEB
 	ReebGraph *lower_rg = rg->link_up;
@@ -512,12 +513,16 @@ void verifyMultiResolutionLinks(ReebGraph *rg)
 		{
 			if (BLI_findindex(&lower_rg->arcs, arc->link_up) == -1)
 			{
-				printf("missing arc %p\n", arc->link_up);
+				printf("missing arc %p for level %i\n", arc->link_up, level);
+				printf("Source arc was ---\n");
+				printArc(arc);
+
+				arc->link_up = NULL;
 			}
 		}
 		
 		
-		verifyMultiResolutionLinks(lower_rg);
+		verifyMultiResolutionLinks(lower_rg, level + 1);
 	}
 #endif
 }
@@ -1160,7 +1165,9 @@ int joinSubgraphsEnds(ReebGraph *rg, float threshold, int nb_subgraphs)
 					
 
 					if (merging)
-					{					
+					{
+						BLI_ReflagSubgraph((BGraph*)rg, end_node->flag, subgraph);
+											
 						resizeArcBuckets(start_arc);
 						fillArcEmptyBuckets(start_arc);
 						
@@ -1334,7 +1341,7 @@ void filterNullReebGraph(ReebGraph *rg)
 			
 			blend = (float)newNode->degree / (float)(newNode->degree + removedNode->degree); // blending factors
 			
-			VecLerpf(newNode->p, newNode->p, removedNode->p, blend);
+			VecLerpf(newNode->p, removedNode->p, newNode->p, blend);
 			
 			filterArc(rg, newNode, removedNode, arc, 0);
 
@@ -1440,9 +1447,6 @@ int filterExternalReebGraph(ReebGraph *rg, float threshold)
 			if (middleNode->degree == 2)
 			{
 				continue;
-//				removedNode = middleNode;
-//
-//				filterArc(rg, terminalNode, removedNode, arc, 1);
 			}
 			// Otherwise, just plain remove of the arc
 			else
@@ -1463,9 +1467,6 @@ int filterExternalReebGraph(ReebGraph *rg, float threshold)
 			value = 1;
 		}
 	}
-
-	/* join on normal nodes */	
-	removeNormalNodes(rg);
 	
 	return value;
 }
@@ -1690,19 +1691,19 @@ void filterGraph(ReebGraph *rg, short options, float threshold_internal, float t
 	{
 		done = 0; /* no work done yet */
 		
-		if (options & SKGEN_FILTER_EXTERNAL)
-		{
-//			done |= filterExternalReebGraph(rg, threshold_external * rg->resolution);
-			done |= filterExternalReebGraph(rg, threshold_external);
-			verifyNodeDegree(rg);
-		}
-	
 		if (options & SKGEN_FILTER_INTERNAL)
 		{
 //			done |= filterInternalReebGraph(rg, threshold_internal * rg->resolution);
 			done |= filterInternalReebGraph(rg, threshold_internal);
 			verifyNodeDegree(rg);
 		}
+
+		if (options & SKGEN_FILTER_EXTERNAL)
+		{
+//			done |= filterExternalReebGraph(rg, threshold_external * rg->resolution);
+			done |= filterExternalReebGraph(rg, threshold_external);
+			verifyNodeDegree(rg);
+		}
 	}
 
 	if (options & SKGEN_FILTER_SMART)
@@ -2842,10 +2843,12 @@ int weightFromDistance(EditMesh *em)
 			
 			for (eve = em->verts.first; eve; eve = eve->next)
 			{
-				if (eve->f1 != 1)
+				/* for every vertex visible that hasn't been processed yet */
+				if (eve->h == 0 && eve->f1 != 1)
 				{
 					EditVert *closest_eve;
 					
+					/* find the closest processed vertex */
 					for (closest_eve = em->verts.first; closest_eve; closest_eve = closest_eve->next)
 					{
 						/* vertex is already processed and distance is smaller than current minimum */
@@ -3292,7 +3295,7 @@ ReebGraph *BIF_ReebGraphMultiFromEditMesh(void)
 		relinkNodes(previous, rgi);
 	}
 	
-	verifyMultiResolutionLinks(rg);
+	verifyMultiResolutionLinks(rg, 0);
 
 	return rg;
 }

From 140a8b740d202843d51f9b29f619daac68f1622e Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Wed, 30 Jul 2008 00:05:19 +0000
Subject: [PATCH 165/252] Bracket matching now works with word-wrap. Mouse
 selection and scrolling to do.

---
 source/blender/include/BIF_drawtext.h |   1 -
 source/blender/src/drawtext.c         | 192 ++++++++++++--------------
 2 files changed, 92 insertions(+), 101 deletions(-)

diff --git a/source/blender/include/BIF_drawtext.h b/source/blender/include/BIF_drawtext.h
index 9f0b98435c5..bc4d5e3f9c8 100644
--- a/source/blender/include/BIF_drawtext.h
+++ b/source/blender/include/BIF_drawtext.h
@@ -47,7 +47,6 @@ void pop_space_text(struct SpaceText *st);
 
 void txt_format_text(struct SpaceText *st);
 void txt_format_line(struct SpaceText *st, struct TextLine *line, int do_next);
-void do_brackets(void);
 
 #endif
 
diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index 0286c6f9a64..e09b502343a 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -132,7 +132,7 @@ def wrap(line, view_width, wrap_chars, tab_size):
 void drawtextspace(ScrArea *sa, void *spacedata);
 void winqreadtextspace(struct ScrArea *sa, void *spacedata, struct BWinEvent *evt);
 void txt_copy_selectbuffer (Text *text);
-void do_brackets();
+void draw_brackets(SpaceText *st);
 
 static void get_selection_buffer(Text *text);
 static int check_bracket(char ch);
@@ -635,7 +635,6 @@ static int get_char_pos(SpaceText *st, char *line, int cur) {
 
 static void draw_cursor(SpaceText *st) {
 	Text *text= st->text;
-	TextLine *linef, *linel;
 	int vcurl, vcurc, vsell, vselc, offl, offc, x, y, w, i;
 	
 	/* Draw the selection */
@@ -651,7 +650,7 @@ static void draw_cursor(SpaceText *st) {
 		
 		BIF_ThemeColor(TH_SHADE2);
 		x= st->showlinenrs ? TXT_OFFSET + TEXTXLOC : TXT_OFFSET;
-		y= curarea->winy-2;
+		y= curarea->winy-3;
 
 		if (vcurl==vsell) {
 			y -= vcurl*st->lheight;
@@ -683,7 +682,7 @@ static void draw_cursor(SpaceText *st) {
 	/* Draw the cursor itself (we draw the sel. cursor as this is the leading edge) */
 	x= st->showlinenrs ? TXT_OFFSET + TEXTXLOC : TXT_OFFSET;
 	x += vselc*spacetext_get_fontwidth(st);
-	y= curarea->winy-2 - vsell*st->lheight;
+	y= curarea->winy-3 - vsell*st->lheight;
 	
 	if (st->overwrite) {
 		w= BMF_GetCharacterWidth(spacetext_get_font(st), text->sell->line[text->selc]);
@@ -693,9 +692,6 @@ static void draw_cursor(SpaceText *st) {
 		BIF_ThemeColor(TH_HILITE);
 		glRecti(x-1, y, x+1, y-st->lheight);
 	}
-
-	do_brackets();
-	BIF_ThemeColor(TH_TEXT);
 }
 
 static void calc_text_rcts(SpaceText *st)
@@ -1218,8 +1214,6 @@ void drawtextspace(ScrArea *sa, void *spacedata)
 		glRecti(23,  0, (st->lheight==15)?63:59,  curarea->winy - 2);
 	}
 
-	BIF_ThemeColor(TH_TEXT);
-
 	draw_cursor(st);
 
 	tmp= text->lines.first;
@@ -1282,6 +1276,8 @@ void drawtextspace(ScrArea *sa, void *spacedata)
 		y -= st->lheight;
 	}
 	MEM_freeN(wrapbuf);
+	
+	draw_brackets(st);
 
 	draw_textscroll(st);
 	draw_documentation(st);
@@ -2680,116 +2676,112 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 	}
 }
 
-void do_brackets(void) 
+void draw_brackets(SpaceText *st)
 {
-	SpaceText *st = curarea->spacedata.first;
+	char ch;
+	int b, c, startc, endc, find, stack;
+	int viewc, viewl, offl, offc, x, y;
+	TextLine *startl, *endl, *linep;
 	Text *text = st->text;
-	TextLine *tmp, *start;
-	char test;
-	int d, pos, open, x, y, x2, y2, h=0;
-	
-	if(!text) return;
-	
-	tmp = text->curl;
-	start = text->curl;
 
-	test = (unsigned char) tmp->line[text->curc];
+	if (!text || !text->curl) return;
+
+	startl= text->curl;
+	startc= text->curc;
+	b= check_bracket(startl->line[startc]);
+	if (b==0 && startc>0) b = check_bracket(startl->line[--startc]);
+	if (b==0) return;
 	
-	d = check_bracket(test);
-	if (!d) /*  If not pri char */
-	{
-		test = (unsigned char) tmp->line[text->curc-1];
-		d = check_bracket(test);
-		if(!d) {
-			return; /*If the current char or prev is not a bracket then return*/
-		} else { /* current char */
-			h= txt_get_span(text->lines.first, start) - st->top;
-			x = text_draw(st, start->line, st->left, text->curc-1, 0, 0, 0, NULL);
-			y = text_draw(st, start->line, st->left, text->curc, 0, 0, 0, NULL);
-			if (d < 4) {
-				pos = text->curc;
-			} else {
-				pos = text->curc-2;
+	linep= startl;
+	c= startc;
+	endl= NULL;
+	endc= -1;
+	find= -b;
+	stack= 0;
+
+	/* Opening bracket, search forward for close */
+	if (b>0) {
+		c++;
+		while (linep) {
+			while (c<linep->len) {
+				b= check_bracket(linep->line[c]);
+				if (b==find) {
+					if (stack==0) {
+						endl= linep;
+						endc= c;
+						break;
+					}
+					stack--;
+				} else if (b==-find) {
+					stack++;
+				}
+				c++;
 			}
-		}
-	} else { /* is pri char */
-		h= txt_get_span(text->lines.first, start) - st->top;
-		x = text_draw(st, start->line, st->left, text->curc, 0, 0, 0, NULL);
-		y = text_draw(st, start->line, st->left, text->curc+1, 0, 0, 0, NULL);
-		if (d < 4) {
-			pos = text->curc+1;
-		} else {
-			pos = text->curc-1;
+			if (endl) break;
+			linep= linep->next;
+			c= 0;
 		}
 	}
-	
-	if (d < 4) /*reading forward*/
-	{
-		open = 1; 
-		while ( tmp ) {
-			while (pos <= tmp->len) {
-				test = (unsigned char) tmp->line[pos];
-				if(check_bracket(test) == d) {
-					open++;
-				} else if (check_bracket(test) == d+3) {
-					open--;
-					if (open == 0) {
-						BIF_ThemeColorBlend(TH_BACK, TH_SHADE2, 0.5);
-						glRecti(x, curarea->winy-st->lheight*(h)-2, y, curarea->winy-st->lheight*(h+1)-2);
-
-						h= txt_get_span(text->lines.first, tmp) - st->top;
-						x2= text_draw(st, tmp->line, st->left, pos, 0, 0, 0, NULL);
-						y2= text_draw(st, tmp->line, st->left, pos+1, 0, 0, 0, NULL);
-						glRecti(x2, curarea->winy-st->lheight*(h)-2, y2, curarea->winy-st->lheight*(h+1)-2);
-						BIF_ThemeColor(TH_TEXT);
-						return;
+	/* Closing bracket, search backward for open */
+	else {
+		c--;
+		while (linep) {
+			while (c>=0) {
+				b= check_bracket(linep->line[c]);
+				if (b==find) {
+					if (stack==0) {
+						endl= linep;
+						endc= c;
+						break;
 					}
+					stack--;
+				} else if (b==-find) {
+					stack++;
 				}
-				pos++;
-			}
-			tmp = tmp->next;
-			pos = 0;
-		}
-	} else { /*  reading back */
-		open = 1; 
-		while ( tmp ) {
-			while (pos >= 0) {
-				test = (unsigned char) tmp->line[pos];
-				if(check_bracket(test) == d) {
-					open++;
-				} else if (check_bracket(test) == d-3) {
-					open--;
-					if (open == 0) {
-						BIF_ThemeColorBlend(TH_BACK, TH_SHADE2, 0.5);
-						glRecti(x, curarea->winy-st->lheight*(h)-2, y, curarea->winy-st->lheight*(h+1)-2);
-
-						h= txt_get_span(text->lines.first, tmp) - st->top;
-						x2= text_draw(st, tmp->line, st->left, pos, 0, 0, 0, NULL);
-						y2= text_draw(st, tmp->line, st->left, pos+1, 0, 0, 0, NULL);
-						glRecti(x2, curarea->winy-st->lheight*(h)-2, y2, curarea->winy-st->lheight*(h+1)-2);
-						BIF_ThemeColor(TH_TEXT);
-						return;
-					}
-				}
-				pos--;
-			}
-			tmp = tmp->prev;
-			if (tmp) {
-				pos = tmp->len;
+				c--;
 			}
+			if (endl) break;
+			linep= linep->prev;
+			if (linep) c= linep->len-1;
 		}
 	}
-	
+
+	if (!endl || endc==-1) return;
+
+	BIF_ThemeColor(TH_HILITE);	
+	x= st->showlinenrs ? TXT_OFFSET + TEXTXLOC : TXT_OFFSET;
+	y= curarea->winy - st->lheight;
+
+	ch= startl->line[startc];
+	wrap_offset(st, startl, startc, &offl, &offc);
+	viewc= get_char_pos(st, startl->line, startc) + offc;
+	viewl= txt_get_span(text->lines.first, startl) + offl;
+	glRasterPos2i(x+viewc*spacetext_get_fontwidth(st), y-viewl*st->lheight);
+	BMF_DrawCharacter(spacetext_get_font(st), ch);
+	glRasterPos2i(x+viewc*spacetext_get_fontwidth(st)+1, y-viewl*st->lheight);
+	BMF_DrawCharacter(spacetext_get_font(st), ch);
+
+	ch= endl->line[endc];
+	wrap_offset(st, endl, endc, &offl, &offc);
+	viewc= get_char_pos(st, endl->line, endc) + offc;
+	viewl= txt_get_span(text->lines.first, endl) + offl;
+	glRasterPos2i(x+viewc*spacetext_get_fontwidth(st), y-viewl*st->lheight);
+	BMF_DrawCharacter(spacetext_get_font(st), ch);
+	glRasterPos2i(x+viewc*spacetext_get_fontwidth(st)+1, y-viewl*st->lheight);
+	BMF_DrawCharacter(spacetext_get_font(st), ch);
 }
 
 static int check_bracket(char ch)
 {
 	int a;
-	char brackets[] = "([{)]}";
+	char opens[] = "([{";
+	char close[] = ")]}";
 	
-	for (a=0; a<6; a++) {
-		if(ch==brackets[a])
+	for (a=0; a<3; a++) {
+		if(ch==opens[a])
 			return a+1;
+		else if (ch==close[a])
+			return -(a+1);
 	}
 	return 0;
 }

From a482f644242456ad6ddf0306e1b37d8855342103 Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Wed, 30 Jul 2008 01:51:40 +0000
Subject: [PATCH 166/252] =?UTF-8?q?soc-2008-mxcurioni:=20Tested=20SWIG-les?=
 =?UTF-8?q?s=20environment=20more=20and=20understood=20why=20the=20former?=
 =?UTF-8?q?=20predicate=20methods=20were=20not=20working.=20As=20St=C3=A9p?=
 =?UTF-8?q?hane=20had=20mentioned=20a=20few=20months=20ago,=20Freestyle=20?=
 =?UTF-8?q?uses=20SWIG=20directors=20to=20provide=20cross-language=20polym?=
 =?UTF-8?q?orphism.=20The=20API=20and=20the=20system=20I=20had=20provided?=
 =?UTF-8?q?=20did=20not=20support=20that=20feature=20and=20only=20implemen?=
 =?UTF-8?q?tations=20in=20C++=20were=20supported.=20To=20correct=20the=20p?=
 =?UTF-8?q?roblem,=20after=20researching=20how=20directors=20are=20impleme?=
 =?UTF-8?q?nted=20in=20SWIG,=20I=20provided=20the=20same=20functionality.?=
 =?UTF-8?q?=20So=20far,=20I=20only=20provided=20the=20code=20for=20the=20U?=
 =?UTF-8?q?naryPredicate1D=20class=20and=20it=20works.=20The=20implementat?=
 =?UTF-8?q?ion=20is=20in=20intern/python/Director.cpp=20and=20Operators.cp?=
 =?UTF-8?q?p.=20I=20will=20port=20the=20remaining=20directors=20tonight=20?=
 =?UTF-8?q?and=20continue=20to=20test=20it.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

To prevent strokes from piling up after each render,  I clear the canvas at each render now (as it should have been all along)
---
 .../freestyle/intern/app_blender/api.cpp      |  1 +
 .../freestyle/intern/python/BPy_Convert.cpp   |  9 +++++
 .../freestyle/intern/python/BPy_Convert.h     |  4 +++
 .../freestyle/intern/python/BPy_Operators.cpp |  6 +++-
 .../intern/python/BPy_UnaryPredicate1D.cpp    |  2 +-
 .../freestyle/intern/python/Director.cpp      | 12 +++++++
 .../freestyle/intern/python/Director.h        | 34 +++++++++++++++++++
 .../Iterator/BPy_ChainSilhouetteIterator.cpp  |  2 +-
 .../freestyle/intern/stroke/Predicates1D.h    | 21 ++++++++++--
 .../style_modules_blender/freestyle_init.py   |  6 ++--
 .../logical_operators.py                      | 12 +++----
 11 files changed, 94 insertions(+), 15 deletions(-)
 create mode 100644 source/blender/freestyle/intern/python/Director.cpp
 create mode 100644 source/blender/freestyle/intern/python/Director.h

diff --git a/source/blender/freestyle/intern/app_blender/api.cpp b/source/blender/freestyle/intern/app_blender/api.cpp
index 890c5097a63..7f5135a2655 100644
--- a/source/blender/freestyle/intern/app_blender/api.cpp
+++ b/source/blender/freestyle/intern/app_blender/api.cpp
@@ -42,6 +42,7 @@ extern "C" {
 		if( view == NULL )
 			view = new AppGLWidget;
 		
+		controller->Clear();
 		controller->setView(view);
 	}
 
diff --git a/source/blender/freestyle/intern/python/BPy_Convert.cpp b/source/blender/freestyle/intern/python/BPy_Convert.cpp
index b541babd752..d7b6fa8bd33 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Convert.cpp
@@ -9,6 +9,7 @@
 #include "Interface0D/CurvePoint/BPy_StrokeVertex.h"
 #include "Interface0D/BPy_SVertex.h"
 #include "Interface0D/BPy_ViewVertex.h"
+#include "BPy_Interface1D.h"
 #include "Interface1D/BPy_FEdge.h"
 #include "Interface1D/BPy_ViewEdge.h"
 #include "BPy_Nature.h"
@@ -79,6 +80,14 @@ PyObject * BPy_Interface0D_from_Interface0D( Interface0D& if0D ) {
 	return py_if0D;
 }
 
+PyObject * BPy_Interface1D_from_Interface1D( Interface1D& if1D ) {
+	PyObject *py_if1D =  Interface1D_Type.tp_new( &Interface1D_Type, 0, 0 );
+	((BPy_Interface1D *) py_if1D)->if1D = &if1D;
+
+	return py_if1D;
+}
+
+
 PyObject * BPy_SVertex_from_SVertex( SVertex& sv ) {
 	PyObject *py_sv = SVertex_Type.tp_new( &SVertex_Type, 0, 0 );
 	((BPy_SVertex *) py_sv)->sv = new SVertex( sv );
diff --git a/source/blender/freestyle/intern/python/BPy_Convert.h b/source/blender/freestyle/intern/python/BPy_Convert.h
index 5b613b3c4c3..9e743f4b233 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.h
+++ b/source/blender/freestyle/intern/python/BPy_Convert.h
@@ -17,6 +17,9 @@ using namespace Geometry;
 // Interface0D, Interface0DIteratorNested, Interface0DIterator
 #include "../view_map/Interface0D.h"
 
+// Interface1D
+#include "../view_map/Interface1D.h"
+
 // Material
 #include "../scene_graph/Material.h"
 
@@ -71,6 +74,7 @@ PyObject * BPy_directedViewEdge_from_directedViewEdge( ViewVertex::directedViewE
 PyObject * BPy_FEdge_from_FEdge( FEdge& fe );
 PyObject * BPy_Id_from_Id( Id& id );
 PyObject * BPy_Interface0D_from_Interface0D( Interface0D& if0D );
+PyObject * BPy_Interface1D_from_Interface1D( Interface1D& if1D );
 PyObject * BPy_IntegrationType_from_IntegrationType( int i );
 PyObject * BPy_FrsMaterial_from_Material( Material& m );
 PyObject * BPy_Nature_from_Nature( unsigned short n );
diff --git a/source/blender/freestyle/intern/python/BPy_Operators.cpp b/source/blender/freestyle/intern/python/BPy_Operators.cpp
index b0a8e7e3bd2..850b4cb5bad 100644
--- a/source/blender/freestyle/intern/python/BPy_Operators.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Operators.cpp
@@ -164,7 +164,11 @@ PyObject * Operators_select(BPy_Operators* self, PyObject *args)
 		Py_RETURN_NONE;
 	}
 
-	Operators::select(*( ((BPy_UnaryPredicate1D *) obj)->up1D ));
+	UnaryPredicate1D *up1D = ((BPy_UnaryPredicate1D *) obj)->up1D;
+	if( PyObject_HasAttrString( obj, "__call__") )
+		up1D->setPythonObject( obj );
+	
+	Operators::select(*up1D);
 
 	Py_RETURN_NONE;
 }
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp
index a13de77bbe9..14eb041c480 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp
@@ -215,7 +215,7 @@ PyObject * UnaryPredicate1D___call__( BPy_UnaryPredicate1D *self, PyObject *args
 	
 	if( if1D )
 		return PyBool_from_bool( self->up1D->operator()(*if1D) );
-	
+		
 	Py_RETURN_NONE;
 }
 
diff --git a/source/blender/freestyle/intern/python/Director.cpp b/source/blender/freestyle/intern/python/Director.cpp
new file mode 100644
index 00000000000..6acdc665a0c
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Director.cpp
@@ -0,0 +1,12 @@
+#include "Director.h"
+
+#include "BPy_Convert.h"
+
+bool director_BPy_UnaryPredicate1D___call__( PyObject *py_up1D, Interface1D& if1D) {
+	cout << "Polymorphism works" << endl;
+
+	PyObject *method = PyObject_GetAttrString( py_up1D, "__call__");
+	PyObject *result = PyObject_CallFunction(method, "O", BPy_Interface1D_from_Interface1D(if1D) );
+
+	return bool_from_PyBool(result);
+}
diff --git a/source/blender/freestyle/intern/python/Director.h b/source/blender/freestyle/intern/python/Director.h
new file mode 100644
index 00000000000..7114b124ffb
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Director.h
@@ -0,0 +1,34 @@
+#ifndef  FREESTYLE_PYTHON_DIRECTOR
+# define FREESTYLE_PYTHON_DIRECTOR
+
+#include "../view_map/Interface1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+//   SWIG directors
+// ----------------------------
+//   ViewEdgeInternal::ViewEdgeIterator;
+//   ChainingIterator;
+//   ChainSilhouetteIterator;
+//   ChainPredicateIterator;
+//   UnaryPredicate0D;
+//   UnaryPredicate1D;
+//   BinaryPredicate1D;
+//   StrokeShader;
+
+bool director_BPy_UnaryPredicate1D___call__( PyObject *py_up1D, Interface1D& if1D);
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif // FREESTYLE_PYTHON_DIRECTOR
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp
index 75526507493..4bfaab92a8e 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp
@@ -111,7 +111,7 @@ int ChainSilhouetteIterator___init__(BPy_ChainSilhouetteIterator *self, PyObject
 {	
 	PyObject *obj1 = 0, *obj2 = 0, *obj3 = 0;
 
-	if (!( PyArg_ParseTuple(args, "O|OO", &obj1, &obj2, &obj3) ))
+	if (!( PyArg_ParseTuple(args, "|OOO", &obj1, &obj2, &obj3) ))
 	    return -1;
 
 	if( obj1 && BPy_ChainSilhouetteIterator_Check(obj1)  ) { 
diff --git a/source/blender/freestyle/intern/stroke/Predicates1D.h b/source/blender/freestyle/intern/stroke/Predicates1D.h
index cf9a3283ae4..98148361bb7 100755
--- a/source/blender/freestyle/intern/stroke/Predicates1D.h
+++ b/source/blender/freestyle/intern/stroke/Predicates1D.h
@@ -36,6 +36,8 @@
 # include "../view_map/Functions1D.h"
 # include "AdvancedFunctions1D.h"
 
+# include  "../python/Director.h"
+
 //
 // UnaryPredicate1D (base class for predicates in 1D)
 //
@@ -52,8 +54,13 @@
 class UnaryPredicate1D
 {
 public:
+	
+	PyObject *py_up1D;
+	
   /*! Default constructor. */
-  UnaryPredicate1D() {}
+  UnaryPredicate1D() { 
+	py_up1D = 0;
+  }
   /*! Destructor. */
   virtual ~UnaryPredicate1D() {}
   /*! Returns the string of the name
@@ -71,9 +78,17 @@ public:
    *    false otherwise.
    */
   virtual bool operator()(Interface1D& inter) {
-    cerr << "Warning: operator() not implemented" << endl;
-    return false;
+	
+	if( py_up1D ) {
+		return director_BPy_UnaryPredicate1D___call__(py_up1D, inter);
+	} else {
+		cerr << "Warning: operator() not implemented" << endl;
+	    return false;
+	}
   }
+
+	inline void setPythonObject(PyObject *_py_up1D) { py_up1D = _py_up1D; }
+
 };
 
 
diff --git a/source/blender/freestyle/style_modules_blender/freestyle_init.py b/source/blender/freestyle/style_modules_blender/freestyle_init.py
index 8c45629bade..06b8f933114 100644
--- a/source/blender/freestyle/style_modules_blender/freestyle_init.py
+++ b/source/blender/freestyle/style_modules_blender/freestyle_init.py
@@ -49,16 +49,16 @@ class StrokeShader(Blender.Freestyle.StrokeShader):
 	pass
 
 class UnaryFunction0D(Blender.Freestyle.UnaryFunction0D):
-	pass
+	def __call__(*args): return Blender.Freestyle.UnaryFunction0D.__call__(*args)
 
 class UnaryFunction1D(Blender.Freestyle.UnaryFunction1D):
-	pass
+	def __call__(*args): return Blender.Freestyle.UnaryFunction1D.__call__(*args)
 
 class UnaryPredicate0D(Blender.Freestyle.UnaryPredicate0D):
 	pass
 
 class UnaryPredicate1D(Blender.Freestyle.UnaryPredicate1D):
-	def __call__(*args): return Blender.Freestyle.UnaryPredicate1D.__call__(*args)
+	pass
 
 class ViewMap(Blender.Freestyle.ViewMap):
 	pass
diff --git a/source/blender/freestyle/style_modules_blender/logical_operators.py b/source/blender/freestyle/style_modules_blender/logical_operators.py
index 75b486ef470..0ecf6623697 100755
--- a/source/blender/freestyle/style_modules_blender/logical_operators.py
+++ b/source/blender/freestyle/style_modules_blender/logical_operators.py
@@ -1,8 +1,8 @@
 from freestyle_init import *
 
-class AndUP1D(ContourUP1D):
+class AndUP1D(UnaryPredicate1D):
     def __init__(self, pred1, pred2):
-        ContourUP1D.__init__(self)
+        UnaryPredicate1D.__init__(self)
         self.__pred1 = pred1
         self.__pred2 = pred2
 
@@ -12,9 +12,9 @@ class AndUP1D(ContourUP1D):
     def __call__(self, inter):
         return self.__pred1(inter) and self.__pred2(inter)
     
-class OrUP1D(ContourUP1D):
+class OrUP1D(UnaryPredicate1D):
     def __init__(self, pred1, pred2):
-        ContourUP1D.__init__(self)
+        UnaryPredicate1D.__init__(self)
         self.__pred1 = pred1
         self.__pred2 = pred2
 
@@ -24,9 +24,9 @@ class OrUP1D(ContourUP1D):
     def __call__(self, inter):
         return self.__pred1(inter) or self.__pred2(inter)
 
-class NotUP1D(ContourUP1D):
+class NotUP1D(UnaryPredicate1D):
 	def __init__(self, pred):
-		ContourUP1D.__init__(self)
+		UnaryPredicate1D.__init__(self)
 		self.__pred = pred
 
 	def getName(self):

From 9667af9cfd9a7a866cd4c30e3734b9459e966419 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Wed, 30 Jul 2008 11:27:04 +0000
Subject: [PATCH 167/252] Oops, forgot about horizontal/vertical scrolling.
 Cursor, selections and brackets should now draw correctly when scrolled.

---
 source/blender/src/drawtext.c | 68 ++++++++++++++++++++---------------
 1 file changed, 39 insertions(+), 29 deletions(-)

diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index e09b502343a..d664ded08c5 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -635,7 +635,8 @@ static int get_char_pos(SpaceText *st, char *line, int cur) {
 
 static void draw_cursor(SpaceText *st) {
 	Text *text= st->text;
-	int vcurl, vcurc, vsell, vselc, offl, offc, x, y, w, i;
+	int vcurl, vcurc, vsell, vselc, hidden=0;
+	int offl, offc, x, y, w, i;
 	
 	/* Draw the selection */
 	if (text->curl!=text->sell || text->curc!=text->selc) {
@@ -643,10 +644,13 @@ static void draw_cursor(SpaceText *st) {
 		/* Convert all to view space character coordinates */
 		wrap_offset(st, text->curl, text->curc, &offl, &offc);
 		vcurl = txt_get_span(text->lines.first, text->curl) - st->top + offl;
-		vcurc = get_char_pos(st, text->curl->line, text->curc) + offc;
+		vcurc = get_char_pos(st, text->curl->line, text->curc) - st->left + offc;
 		wrap_offset(st, text->sell, text->selc, &offl, &offc);
 		vsell = txt_get_span(text->lines.first, text->sell) - st->top + offl;
-		vselc = get_char_pos(st, text->sell->line, text->selc) + offc;
+		vselc = get_char_pos(st, text->sell->line, text->selc) - st->left + offc;
+
+		if (vcurc<0) vcurc=0;
+		if (vselc<0) vselc=0, hidden=1;
 		
 		BIF_ThemeColor(TH_SHADE2);
 		x= st->showlinenrs ? TXT_OFFSET + TEXTXLOC : TXT_OFFSET;
@@ -676,21 +680,24 @@ static void draw_cursor(SpaceText *st) {
 	} else {
 		wrap_offset(st, text->sell, text->selc, &offl, &offc);
 		vsell = txt_get_span(text->lines.first, text->sell) - st->top + offl;
-		vselc = get_char_pos(st, text->sell->line, text->selc) + offc;
+		vselc = get_char_pos(st, text->sell->line, text->selc) - st->left + offc;
+		if (vselc<0) vselc=0, hidden=1;
 	}
 
-	/* Draw the cursor itself (we draw the sel. cursor as this is the leading edge) */
-	x= st->showlinenrs ? TXT_OFFSET + TEXTXLOC : TXT_OFFSET;
-	x += vselc*spacetext_get_fontwidth(st);
-	y= curarea->winy-3 - vsell*st->lheight;
-	
-	if (st->overwrite) {
-		w= BMF_GetCharacterWidth(spacetext_get_font(st), text->sell->line[text->selc]);
-		BIF_ThemeColor(TH_HILITE);
-		glRecti(x, y-st->lheight-1, x+w, y-st->lheight+1);
-	} else {
-		BIF_ThemeColor(TH_HILITE);
-		glRecti(x-1, y, x+1, y-st->lheight);
+	if (!hidden) {
+		/* Draw the cursor itself (we draw the sel. cursor as this is the leading edge) */
+		x= st->showlinenrs ? TXT_OFFSET + TEXTXLOC : TXT_OFFSET;
+		x += vselc*spacetext_get_fontwidth(st);
+		y= curarea->winy-3 - vsell*st->lheight;
+		
+		if (st->overwrite) {
+			w= BMF_GetCharacterWidth(spacetext_get_font(st), text->sell->line[text->selc]);
+			BIF_ThemeColor(TH_HILITE);
+			glRecti(x, y-st->lheight-1, x+w, y-st->lheight+1);
+		} else {
+			BIF_ThemeColor(TH_HILITE);
+			glRecti(x-1, y, x+1, y-st->lheight);
+		}
 	}
 }
 
@@ -2754,21 +2761,24 @@ void draw_brackets(SpaceText *st)
 
 	ch= startl->line[startc];
 	wrap_offset(st, startl, startc, &offl, &offc);
-	viewc= get_char_pos(st, startl->line, startc) + offc;
-	viewl= txt_get_span(text->lines.first, startl) + offl;
-	glRasterPos2i(x+viewc*spacetext_get_fontwidth(st), y-viewl*st->lheight);
-	BMF_DrawCharacter(spacetext_get_font(st), ch);
-	glRasterPos2i(x+viewc*spacetext_get_fontwidth(st)+1, y-viewl*st->lheight);
-	BMF_DrawCharacter(spacetext_get_font(st), ch);
-
+	viewc= get_char_pos(st, startl->line, startc) - st->left + offc;
+	if (viewc >= 0){
+		viewl= txt_get_span(text->lines.first, startl) - st->top + offl;
+		glRasterPos2i(x+viewc*spacetext_get_fontwidth(st), y-viewl*st->lheight);
+		BMF_DrawCharacter(spacetext_get_font(st), ch);
+		glRasterPos2i(x+viewc*spacetext_get_fontwidth(st)+1, y-viewl*st->lheight);
+		BMF_DrawCharacter(spacetext_get_font(st), ch);
+	}
 	ch= endl->line[endc];
 	wrap_offset(st, endl, endc, &offl, &offc);
-	viewc= get_char_pos(st, endl->line, endc) + offc;
-	viewl= txt_get_span(text->lines.first, endl) + offl;
-	glRasterPos2i(x+viewc*spacetext_get_fontwidth(st), y-viewl*st->lheight);
-	BMF_DrawCharacter(spacetext_get_font(st), ch);
-	glRasterPos2i(x+viewc*spacetext_get_fontwidth(st)+1, y-viewl*st->lheight);
-	BMF_DrawCharacter(spacetext_get_font(st), ch);
+	viewc= get_char_pos(st, endl->line, endc) - st->left + offc;
+	if (viewc >= 0) {
+		viewl= txt_get_span(text->lines.first, endl) - st->top + offl;
+		glRasterPos2i(x+viewc*spacetext_get_fontwidth(st), y-viewl*st->lheight);
+		BMF_DrawCharacter(spacetext_get_font(st), ch);
+		glRasterPos2i(x+viewc*spacetext_get_fontwidth(st)+1, y-viewl*st->lheight);
+		BMF_DrawCharacter(spacetext_get_font(st), ch);
+	}
 }
 
 static int check_bracket(char ch)

From 409d0eac7c13360faaab59329f8e64cea40052bd Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Wed, 30 Jul 2008 18:10:21 +0000
Subject: [PATCH 168/252] Merge subgraph with closest node, not just first node
 under threshold.

---
 source/blender/src/reeb.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/source/blender/src/reeb.c b/source/blender/src/reeb.c
index be5f754d5f0..25107706c7b 100644
--- a/source/blender/src/reeb.c
+++ b/source/blender/src/reeb.c
@@ -1130,14 +1130,25 @@ int joinSubgraphsEnds(ReebGraph *rg, float threshold, int nb_subgraphs)
 			
 			if (start_node->flag == subgraph && start_node->degree == 1)
 			{
+				ReebNode *min_node = NULL;
+				float min_distance = FLT_MAX;
+				
 				for (end_node = rg->nodes.first; end_node; end_node = end_node->next)
 				{
-					if (end_node->flag != subgraph && VecLenf(start_node->p, end_node->p) < threshold)
+					if (end_node->flag != subgraph)
 					{
-						break;
+						float distance = VecLenf(start_node->p, end_node->p);
+						
+						if (distance < threshold && distance < min_distance)
+						{
+							min_distance = distance;
+							min_node = end_node;
+						}
 					}
 				}
 				
+				end_node = min_node;
+				
 				if (end_node)
 				{
 					ReebArc *start_arc, *end_arc;

From 3010f2b753f2397256861816504b8e7d697632db Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Thu, 31 Jul 2008 08:50:12 +0000
Subject: [PATCH 169/252] soc-2008-mxcurioni: the native Python system now
 supports cross-language polymorphism for the following classes:
 BinaryPredicate0D (__call__), BinaryPredicate1D (__call__), UnaryPredicate0D
 (__call__), UnaryPredicate1D (__call__), StrokeShader (shade),
 ChainingIterator (init, traverse).

Other methods could easily be supported in the future. The method now works as planned for the contour style. For style modules with Python shaders, there still is a problem that I will fix right away.
---
 .../intern/python/BPy_BinaryPredicate0D.cpp   |   2 +
 .../intern/python/BPy_BinaryPredicate1D.cpp   |   1 +
 .../freestyle/intern/python/BPy_Convert.cpp   |   9 ++
 .../freestyle/intern/python/BPy_Convert.h     |   1 +
 .../freestyle/intern/python/BPy_Operators.cpp |  26 ++--
 .../intern/python/BPy_StrokeShader.cpp        |   1 +
 .../intern/python/BPy_UnaryFunction0D.h       |   1 +
 .../intern/python/BPy_UnaryFunction1D.h       |   1 +
 .../intern/python/BPy_UnaryPredicate0D.cpp    |   1 +
 .../intern/python/BPy_UnaryPredicate1D.cpp    |   1 +
 .../freestyle/intern/python/Director.cpp      |  82 ++++++++++-
 .../freestyle/intern/python/Director.h        |  67 ++++++---
 .../python/Iterator/BPy_ChainingIterator.cpp  |   2 +
 .../intern/stroke/ChainingIterators.h         |  38 ++++-
 .../freestyle/intern/stroke/Predicates0D.h    |  34 ++++-
 .../freestyle/intern/stroke/Predicates1D.h    |  31 ++--
 .../blender/freestyle/intern/stroke/Stroke.h  |   1 +
 .../freestyle/intern/stroke/StrokeShader.h    |  15 +-
 .../freestyle/intern/view_map/Functions0D.h   |   2 +-
 .../freestyle/intern/view_map/Functions1D.h   |   2 +-
 .../style_modules_blender/freestyle_init.py   | 138 +++++++++---------
 21 files changed, 325 insertions(+), 131 deletions(-)

diff --git a/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp
index 9c3247b30b8..bcd98a42189 100644
--- a/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.cpp
@@ -127,6 +127,8 @@ PyMODINIT_FUNC BinaryPredicate0D_Init( PyObject *module )
 int BinaryPredicate0D___init__(BPy_BinaryPredicate0D *self, PyObject *args, PyObject *kwds)
 {
 	self->bp0D = new BinaryPredicate0D();
+	self->bp0D->py_bp0D = (PyObject *) self;
+	
 	return 0;
 }
 
diff --git a/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp
index 545807fc277..9f7e0359ec8 100644
--- a/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.cpp
@@ -159,6 +159,7 @@ PyMODINIT_FUNC BinaryPredicate1D_Init( PyObject *module )
 int BinaryPredicate1D___init__(BPy_BinaryPredicate1D *self, PyObject *args, PyObject *kwds)
 {
 	self->bp1D = new BinaryPredicate1D();
+	self->bp1D->py_bp1D = (PyObject *) self;	
 	return 0;
 }
 
diff --git a/source/blender/freestyle/intern/python/BPy_Convert.cpp b/source/blender/freestyle/intern/python/BPy_Convert.cpp
index d7b6fa8bd33..0b136b7702f 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Convert.cpp
@@ -11,6 +11,7 @@
 #include "Interface0D/BPy_ViewVertex.h"
 #include "BPy_Interface1D.h"
 #include "Interface1D/BPy_FEdge.h"
+#include "Interface1D/BPy_Stroke.h"
 #include "Interface1D/BPy_ViewEdge.h"
 #include "BPy_Nature.h"
 #include "BPy_MediumType.h"
@@ -115,6 +116,14 @@ PyObject * BPy_Nature_from_Nature( unsigned short n ) {
 	return py_n;
 }
 
+PyObject * BPy_Stroke_from_Stroke( Stroke& s ) {
+	PyObject *py_s = Stroke_Type.tp_new( &Stroke_Type, 0, 0 );
+	((BPy_Stroke *) py_s)->s = new Stroke( s );
+	((BPy_Stroke *) py_s)->py_if1D.if1D = ((BPy_Stroke *) py_s)->s;
+
+	return py_s;
+}
+
 PyObject * BPy_StrokeAttribute_from_StrokeAttribute( StrokeAttribute& sa ) {
 	PyObject *py_sa = StrokeAttribute_Type.tp_new( &StrokeAttribute_Type, 0, 0 );
 	((BPy_StrokeAttribute *) py_sa)->sa = new StrokeAttribute( sa );
diff --git a/source/blender/freestyle/intern/python/BPy_Convert.h b/source/blender/freestyle/intern/python/BPy_Convert.h
index 9e743f4b233..4bfaf4c1e17 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.h
+++ b/source/blender/freestyle/intern/python/BPy_Convert.h
@@ -80,6 +80,7 @@ PyObject * BPy_FrsMaterial_from_Material( Material& m );
 PyObject * BPy_Nature_from_Nature( unsigned short n );
 PyObject * BPy_MediumType_from_MediumType( int n );
 PyObject * BPy_SShape_from_SShape( SShape& ss );
+PyObject * BPy_Stroke_from_Stroke( Stroke& s );
 PyObject * BPy_StrokeAttribute_from_StrokeAttribute( StrokeAttribute& sa );
 PyObject * BPy_StrokeVertex_from_StrokeVertex( StrokeVertex& sv );
 PyObject * BPy_SVertex_from_SVertex( SVertex& sv );
diff --git a/source/blender/freestyle/intern/python/BPy_Operators.cpp b/source/blender/freestyle/intern/python/BPy_Operators.cpp
index 850b4cb5bad..ab64f5bc6eb 100644
--- a/source/blender/freestyle/intern/python/BPy_Operators.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Operators.cpp
@@ -164,21 +164,19 @@ PyObject * Operators_select(BPy_Operators* self, PyObject *args)
 		Py_RETURN_NONE;
 	}
 
-	UnaryPredicate1D *up1D = ((BPy_UnaryPredicate1D *) obj)->up1D;
-	if( PyObject_HasAttrString( obj, "__call__") )
-		up1D->setPythonObject( obj );
-	
-	Operators::select(*up1D);
+	Operators::select(*( ((BPy_UnaryPredicate1D *) obj)->up1D ));
 
 	Py_RETURN_NONE;
 }
 
+// CHANGE: first parameter is a chaining iterator, not just a view
+
 PyObject * Operators_chain(BPy_Operators* self, PyObject *args)
 {
 	PyObject *obj1 = 0, *obj2 = 0, *obj3 = 0;
 
 	if(!( 	PyArg_ParseTuple(args, "OO|O", &obj1, &obj2, &obj3) && 
-			BPy_ViewEdgeIterator_Check(obj1) && ((BPy_ViewEdgeIterator *) obj1)->ve_it &&
+			BPy_ChainingIterator_Check(obj1) && ((BPy_ChainingIterator *) obj1)->c_it &&
 			BPy_UnaryPredicate1D_Check(obj2) && ((BPy_UnaryPredicate1D *) obj2)->up1D )) {
 		cout << "ERROR: Operators_chain" << endl;
 		Py_RETURN_NONE;
@@ -186,12 +184,13 @@ PyObject * Operators_chain(BPy_Operators* self, PyObject *args)
 
 	if( !obj3 ) {
 		
-		Operators::chain( 	*( ((BPy_ViewEdgeIterator *) obj1)->ve_it ),
+		Operators::chain( 	*( ((BPy_ChainingIterator *) obj1)->c_it ),
 							*( ((BPy_UnaryPredicate1D *) obj2)->up1D )  );
 							
 	} else if( BPy_UnaryFunction1DVoid_Check(obj3) && ((BPy_UnaryFunction1DVoid *) obj3)->uf1D_void ) {
 		
-		Operators::chain( 	*( ((BPy_ViewEdgeIterator *) obj1)->ve_it ),
+		
+		Operators::chain( 	*( ((BPy_ChainingIterator *) obj1)->c_it ),
 							*( ((BPy_UnaryPredicate1D *) obj2)->up1D ),
 							*( ((BPy_UnaryFunction1DVoid *) obj3)->uf1D_void )  );
 		
@@ -209,7 +208,7 @@ PyObject * Operators_bidirectionalChain(BPy_Operators* self, PyObject *args)
 		cout << "ERROR: Operators_bidirectionalChain" << endl;
 		Py_RETURN_NONE;
 	}
-
+	
 	if( !obj2 ) {
 
 		Operators::bidirectionalChain( 	*( ((BPy_ChainingIterator *) obj1)->c_it ) );
@@ -234,7 +233,7 @@ PyObject * Operators_sequentialSplit(BPy_Operators* self, PyObject *args)
 		cout << "ERROR: Operators_sequentialSplit" << endl;
 		Py_RETURN_NONE;
 	}
-
+	
 	if( obj2 && BPy_UnaryPredicate0D_Check(obj2) ) {
 		
 		Operators::sequentialSplit( 	*( ((BPy_UnaryPredicate0D *) obj1)->up0D ),
@@ -266,7 +265,7 @@ PyObject * Operators_recursiveSplit(BPy_Operators* self, PyObject *args)
 	if( BPy_UnaryPredicate1D_Check(obj2) && ((BPy_UnaryPredicate1D *) obj2)->up1D ) {
 		
 		float f = ( obj3 && PyFloat_Check(obj3) ) ? PyFloat_AsDouble(obj3) : 0.0;
-		
+				
 		Operators::recursiveSplit( 	*( ((BPy_UnaryFunction0DDouble *) obj1)->uf0D_double ),
 									*( ((BPy_UnaryPredicate1D *) obj2)->up1D ),
 									f );
@@ -313,8 +312,9 @@ PyObject * Operators_create(BPy_Operators* self, PyObject *args)
 	vector<StrokeShader *> shaders;
 	for( int i = 0; i < PyList_Size(obj2); i++) {
 		PyObject *py_ss = PyList_GetItem(obj2,i);
-		if( BPy_StrokeShader_Check(py_ss) )
-		 shaders.push_back( ((BPy_StrokeShader *) py_ss)->ss );
+		
+		if( BPy_StrokeShader_Check(py_ss) )	
+			shaders.push_back( ((BPy_StrokeShader *) py_ss)->ss );
 	}
 	
 	Operators::create( *( ((BPy_UnaryPredicate1D *) obj1)->up1D ), shaders);
diff --git a/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp b/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp
index a6d2ae1e512..3b756b40d9b 100644
--- a/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp
+++ b/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp
@@ -254,6 +254,7 @@ PyMODINIT_FUNC StrokeShader_Init( PyObject *module )
 int StrokeShader___init__(BPy_StrokeShader *self, PyObject *args, PyObject *kwds)
 {
 	self->ss = new StrokeShader();
+	self->ss->py_ss = (PyObject *) self;
 	return 0;
 }
 
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h
index 0ab0bfbdc2e..d95230ecccd 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h
+++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h
@@ -18,6 +18,7 @@ extern PyTypeObject UnaryFunction0D_Type;
 /*---------------------------Python BPy_UnaryFunction0D structure definition----------*/
 typedef struct {
 	PyObject_HEAD
+	PyObject *py_uf0D;
 } BPy_UnaryFunction0D;
 
 /*---------------------------Python BPy_UnaryFunction0D visible prototypes-----------*/
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h
index f33fcf48da4..571ef8a5d25 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h
+++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h
@@ -18,6 +18,7 @@ extern PyTypeObject UnaryFunction1D_Type;
 /*---------------------------Python BPy_UnaryFunction1D structure definition----------*/
 typedef struct {
 	PyObject_HEAD
+	PyObject *py_uf1D;
 } BPy_UnaryFunction1D;
 
 /*---------------------------Python BPy_UnaryFunction1D visible prototypes-----------*/
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp
index 4fef63eae9b..db708c7830b 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.cpp
@@ -139,6 +139,7 @@ PyMODINIT_FUNC UnaryPredicate0D_Init( PyObject *module )
 int UnaryPredicate0D___init__(BPy_UnaryPredicate0D *self, PyObject *args, PyObject *kwds)
 {
 	self->up0D = new UnaryPredicate0D();
+	self->up0D->py_up0D = (PyObject *) self;
 	return 0;
 }
 
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp
index 14eb041c480..f2b2c7b9b53 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.cpp
@@ -181,6 +181,7 @@ PyMODINIT_FUNC UnaryPredicate1D_Init( PyObject *module )
 int UnaryPredicate1D___init__(BPy_UnaryPredicate1D *self, PyObject *args, PyObject *kwds)
 {
 	self->up1D = new UnaryPredicate1D();
+	self->up1D->py_up1D = (PyObject *) self;
 	return 0;
 }
 
diff --git a/source/blender/freestyle/intern/python/Director.cpp b/source/blender/freestyle/intern/python/Director.cpp
index 6acdc665a0c..d3aff4a65f2 100644
--- a/source/blender/freestyle/intern/python/Director.cpp
+++ b/source/blender/freestyle/intern/python/Director.cpp
@@ -2,11 +2,85 @@
 
 #include "BPy_Convert.h"
 
-bool director_BPy_UnaryPredicate1D___call__( PyObject *py_up1D, Interface1D& if1D) {
-	cout << "Polymorphism works" << endl;
+#include "BPy_BinaryPredicate0D.h"
+#include "BPy_BinaryPredicate1D.h"
+#include "BPy_UnaryFunction0D.h"
+#include "BPy_UnaryFunction1D.h"
+#include "BPy_UnaryPredicate0D.h"
+#include "BPy_UnaryPredicate1D.h"
+#include "BPy_StrokeShader.h"
+#include "Iterator/BPy_ChainingIterator.h"
+#include "Interface1D/BPy_Stroke.h"
+#include "Interface1D/BPy_ViewEdge.h"
 
-	PyObject *method = PyObject_GetAttrString( py_up1D, "__call__");
-	PyObject *result = PyObject_CallFunction(method, "O", BPy_Interface1D_from_Interface1D(if1D) );
+//   BinaryPredicate0D: __call__
+bool Director_BPy_BinaryPredicate0D___call__( PyObject *obj, Interface0D& i1, Interface0D& i2) {
+	PyObject *result = PyObject_CallMethod( obj, "__call__", "OO", BPy_Interface0D_from_Interface0D(i1), BPy_Interface0D_from_Interface0D(i2) );
+	
+	return bool_from_PyBool(result);
+}
+
+
+//   BinaryPredicate1D: __call__
+bool Director_BPy_BinaryPredicate1D___call__( PyObject *obj, Interface1D& i1, Interface1D& i2) {
+	PyObject *result = PyObject_CallMethod( obj, "__call__", "OO", BPy_Interface1D_from_Interface1D(i1), BPy_Interface1D_from_Interface1D(i2) );
+	
+	return bool_from_PyBool(result);
+}
+
+
+//   UnaryPredicate0D: __call__
+bool Director_BPy_UnaryPredicate0D___call__( PyObject *obj, Interface0DIterator& if0D_it) {
+	PyObject *result = PyObject_CallMethod( obj, "__call__", "O", BPy_Interface0DIterator_from_Interface0DIterator(if0D_it) );
 
 	return bool_from_PyBool(result);
 }
+
+
+//   UnaryPredicate1D: __call__
+bool Director_BPy_UnaryPredicate1D___call__( PyObject *obj, Interface1D& if1D) {
+	PyObject *result = PyObject_CallMethod( obj, "__call__", "O", BPy_Interface1D_from_Interface1D(if1D) );
+
+	return bool_from_PyBool(result);
+}
+
+
+//   StrokeShader: shade
+void Director_BPy_StrokeShader_shade( PyObject *obj, Stroke& s) {
+	PyObject_CallMethod( obj, "shade", "O", BPy_Stroke_from_Stroke(s) );
+}
+
+//   ChainingIterator: init, traverse
+void Director_BPy_ChainingIterator_init( PyObject *obj ) {
+	PyObject_CallMethod( obj, "init", "", 0 );
+}
+
+ViewEdge * Director_BPy_ChainingIterator_traverse( PyObject *obj, AdjacencyIterator& a_it ) {
+	PyObject *result = PyObject_CallMethod( obj, "traverse", "O", BPy_AdjacencyIterator_from_AdjacencyIterator(a_it) );
+
+	return ((BPy_ViewEdge *) result)->ve;
+}
+
+
+// BPy_UnaryFunction{0D,1D}: __call__
+// BPy_UnaryFunction0DDouble
+// BPy_UnaryFunction0DEdgeNature
+// BPy_UnaryFunction0DFloat
+// BPy_UnaryFunction0DId
+// BPy_UnaryFunction0DMaterial
+// BPy_UnaryFunction0DUnsigned
+// BPy_UnaryFunction0DVec2f
+// BPy_UnaryFunction0DVec3f
+// BPy_UnaryFunction0DVectorViewShape
+// BPy_UnaryFunction0DViewShape
+
+// BPy_UnaryFunction1DDouble
+// BPy_UnaryFunction1DEdgeNature
+// BPy_UnaryFunction1DFloat
+// BPy_UnaryFunction1DUnsigned
+// BPy_UnaryFunction1DVec2f
+// BPy_UnaryFunction1DVec3f
+// BPy_UnaryFunction1DVectorViewShape
+// BPy_UnaryFunction1DVoid
+
+
diff --git a/source/blender/freestyle/intern/python/Director.h b/source/blender/freestyle/intern/python/Director.h
index 7114b124ffb..95ab16047a8 100644
--- a/source/blender/freestyle/intern/python/Director.h
+++ b/source/blender/freestyle/intern/python/Director.h
@@ -1,34 +1,65 @@
 #ifndef  FREESTYLE_PYTHON_DIRECTOR
 # define FREESTYLE_PYTHON_DIRECTOR
 
-#include "../view_map/Interface1D.h"
+class Interface0D;
+class Interface1D;
+class Interface0DIterator;
+class Stroke;
+class AdjacencyIterator;
+class ViewEdge;
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-///////////////////////////////////////////////////////////////////////////////////////////
-
 #include <Python.h>
 
-//   SWIG directors
-// ----------------------------
-//   ViewEdgeInternal::ViewEdgeIterator;
-//   ChainingIterator;
-//   ChainSilhouetteIterator;
-//   ChainPredicateIterator;
-//   UnaryPredicate0D;
-//   UnaryPredicate1D;
-//   BinaryPredicate1D;
-//   StrokeShader;
-
-bool director_BPy_UnaryPredicate1D___call__( PyObject *py_up1D, Interface1D& if1D);
-
-///////////////////////////////////////////////////////////////////////////////////////////
-
 #ifdef __cplusplus
 }
 #endif
 
+//   BinaryPredicate0D: __call__
+bool Director_BPy_BinaryPredicate0D___call__( PyObject *obj, Interface0D& i1, Interface0D& i2);
+
+//   BinaryPredicate1D: __call__
+bool Director_BPy_BinaryPredicate1D___call__( PyObject *obj, Interface1D& i1, Interface1D& i2);
+
+//   UnaryPredicate0D: __call__
+bool Director_BPy_UnaryPredicate0D___call__( PyObject *obj, Interface0DIterator& if0D_it);
+	
+//   UnaryPredicate1D: __call__
+bool Director_BPy_UnaryPredicate1D___call__( PyObject *obj, Interface1D& if1D);
+
+//   StrokeShader: shade
+void Director_BPy_StrokeShader_shade( PyObject *obj, Stroke& s);
+
+//   ChainingIterator: init, traverse
+void Director_BPy_ChainingIterator_init( PyObject *obj );
+ViewEdge * Director_BPy_ChainingIterator_traverse( PyObject *obj, AdjacencyIterator& a_it );
+
+// BPy_UnaryFunction0DDouble
+double Director_BPy_UnaryFunction0DDouble___call__( PyObject *obj, Interface0DIterator& if0D_it);
+// BPy_UnaryFunction0DEdgeNature
+// BPy_UnaryFunction0DFloat
+// BPy_UnaryFunction0DId
+// BPy_UnaryFunction0DMaterial
+// BPy_UnaryFunction0DUnsigned
+// BPy_UnaryFunction0DVec2f
+// BPy_UnaryFunction0DVec3f
+// BPy_UnaryFunction0DVectorViewShape
+// BPy_UnaryFunction0DViewShape
+
+// BPy_UnaryFunction1DDouble
+// BPy_UnaryFunction1DEdgeNature
+// BPy_UnaryFunction1DFloat
+// BPy_UnaryFunction1DUnsigned
+// BPy_UnaryFunction1DVec2f
+// BPy_UnaryFunction1DVec3f
+// BPy_UnaryFunction1DVectorViewShape
+// BPy_UnaryFunction1DVoid
+void Director_BPy_UnaryFunction1DVoid___call__( PyObject *obj, Interface1D& if1D);
+
+
+
 
 #endif // FREESTYLE_PYTHON_DIRECTOR
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp
index 525b0697fa7..f33fe0e17bc 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp
@@ -139,6 +139,8 @@ int ChainingIterator___init__(BPy_ChainingIterator *self, PyObject *args )
 	self->py_ve_it.ve_it = self->c_it;
 	self->py_ve_it.py_it.it = self->c_it;
 	
+	self->c_it->py_c_it = (PyObject *) self;
+	
 	return 0;
 }
 
diff --git a/source/blender/freestyle/intern/stroke/ChainingIterators.h b/source/blender/freestyle/intern/stroke/ChainingIterators.h
index b01c895d89a..1f33f99db67 100755
--- a/source/blender/freestyle/intern/stroke/ChainingIterators.h
+++ b/source/blender/freestyle/intern/stroke/ChainingIterators.h
@@ -36,6 +36,8 @@
 
 #include "../system/Iterator.h" //soc 
 
+# include  "../python/Director.h"
+
 //using namespace ViewEdgeInternal;
 
 //
@@ -135,6 +137,9 @@ protected:
   bool _increment; //true if we're currently incrementing, false when decrementing
   
 public:
+	
+	PyObject *py_c_it;
+	
   /*! Builds a Chaining Iterator from the first ViewEdge used for iteration
    *  and its orientation.
    *  \param iRestrictToSelection
@@ -154,6 +159,7 @@ public:
     _restrictToSelection = iRestrictToSelection;
     _restrictToUnvisited = iRestrictToUnvisited;
     _increment = true;
+	py_c_it = 0;
   }
 
   /*! Copy constructor */
@@ -162,6 +168,7 @@ public:
     _restrictToSelection = brother._restrictToSelection;
     _restrictToUnvisited = brother._restrictToUnvisited;
     _increment = brother._increment;
+	py_c_it = brother.py_c_it;
   }
 
   /*! Returns the string "ChainingIterator" */
@@ -176,7 +183,16 @@ public:
    *  history information that you 
    *  might want to keep.  
    */
-  virtual void init(){}
+  virtual void init() {
+	string name( py_c_it ? PyString_AsString(PyObject_CallMethod(py_c_it, "getExactTypeName", "")) : getExactTypeName() );
+	
+	if( py_c_it && PyObject_HasAttrString(py_c_it, "init") ) {
+		Director_BPy_ChainingIterator_init( py_c_it );
+	} else {
+		cerr << "Warning: " << name << " method init() not implemented" << endl;
+	}
+	
+  }
   
   /*! This method iterates over the potential next 
    *  ViewEdges and returns the one that will be 
@@ -190,10 +206,16 @@ public:
    *    rules by only iterating over the valid ViewEdges.
    */
   virtual ViewEdge * traverse(const AdjacencyIterator &it){
-    cerr << "Warning: the traverse method was not defined" << endl;
-    return 0;
+	string name( py_c_it ? PyString_AsString(PyObject_CallMethod(py_c_it, "getExactTypeName", "")) : getExactTypeName() );
+	
+	if( py_c_it && PyObject_HasAttrString(py_c_it, "traverse") ) {
+		return Director_BPy_ChainingIterator_traverse(py_c_it, const_cast<AdjacencyIterator &>(it) );
+	} else {
+	    cerr << "Warning: the " << name << " traverse method was not defined" << endl;
+	    return 0;
+	}
   }
-  
+
   /* accessors */
   /*! Returns true if the orientation of the current ViewEdge 
    *  corresponds to its natural orientation
@@ -274,6 +296,8 @@ public:
    */
   virtual ViewEdge * traverse(const AdjacencyIterator& it);
 
+	/*! Inits the iterator context */ 
+	virtual void init() {}
 };
 
 //
@@ -368,7 +392,11 @@ public:
    *  followed next.
    *  When reaching the end of a chain, 0 is returned.
    */
-  virtual ViewEdge * traverse(const AdjacencyIterator &it); 
+  virtual ViewEdge * traverse(const AdjacencyIterator &it);
+
+	/*! Inits the iterator context */ 
+	virtual void init() {}
+ 
 };
 
 #endif // CHAININGITERATORS_H
diff --git a/source/blender/freestyle/intern/stroke/Predicates0D.h b/source/blender/freestyle/intern/stroke/Predicates0D.h
index 4c2dfacdf98..0318c1742ec 100755
--- a/source/blender/freestyle/intern/stroke/Predicates0D.h
+++ b/source/blender/freestyle/intern/stroke/Predicates0D.h
@@ -32,6 +32,8 @@
 
 # include "../view_map/Functions0D.h"
 
+# include  "../python/Director.h"
+
 //
 // UnaryPredicate0D (base class for predicates in 0D)
 //
@@ -48,8 +50,11 @@
 class UnaryPredicate0D
 {
 public:
+	
+	PyObject *py_up0D;
+	
   /*! Default constructor. */
-  UnaryPredicate0D() {}
+	UnaryPredicate0D() { py_up0D = 0; }
   /*! Destructor. */
   virtual ~UnaryPredicate0D() {}
   /*! Returns the string of the name
@@ -68,9 +73,16 @@ public:
    *    false otherwise.
    */
   virtual bool operator()(Interface0DIterator& it) {
-    cerr << "Warning: operator() not implemented" << endl;
-    return false;
+	string name( py_up0D ? PyString_AsString(PyObject_CallMethod(py_up0D, "getName", "")) : getName() );
+	
+	if( py_up0D && PyObject_HasAttrString(py_up0D, "__call__") ) {
+		return Director_BPy_UnaryPredicate0D___call__(py_up0D, it);
+	} else {
+		cerr << "Warning: " << name << " operator() not implemented" << endl;
+		return false;
+	}
   }
+
 };
 
 
@@ -88,8 +100,11 @@ public:
 class BinaryPredicate0D
 {
 public:
+	
+		PyObject *py_bp0D;
+	
   /*! Default constructor. */
-  BinaryPredicate0D() {}
+		BinaryPredicate0D() { py_bp0D = 0; }
   /*! Destructor. */
   virtual ~BinaryPredicate0D() {}
   /*! Returns the string of the name of the
@@ -108,9 +123,16 @@ public:
    *  \return true or false.
    */
   virtual bool operator()(Interface0D& inter1, Interface0D& inter2) {
-    cerr << "Warning: operator() not implemented" << endl;
-    return false;
+	string name( py_bp0D ? PyString_AsString(PyObject_CallMethod(py_bp0D, "getName", "")) : getName() );
+
+	if( py_bp0D && PyObject_HasAttrString(py_bp0D, "__call__") ) {
+		return Director_BPy_BinaryPredicate0D___call__(py_bp0D, inter1, inter2);
+	} else {
+		cerr << "Warning: " << name << " operator() not implemented" << endl;
+		return false;
+	}
   }
+
 };
 
 
diff --git a/source/blender/freestyle/intern/stroke/Predicates1D.h b/source/blender/freestyle/intern/stroke/Predicates1D.h
index 98148361bb7..8c6f5a9bfa4 100755
--- a/source/blender/freestyle/intern/stroke/Predicates1D.h
+++ b/source/blender/freestyle/intern/stroke/Predicates1D.h
@@ -58,9 +58,7 @@ public:
 	PyObject *py_up1D;
 	
   /*! Default constructor. */
-  UnaryPredicate1D() { 
-	py_up1D = 0;
-  }
+  UnaryPredicate1D() { py_up1D = 0; }
   /*! Destructor. */
   virtual ~UnaryPredicate1D() {}
   /*! Returns the string of the name
@@ -78,17 +76,16 @@ public:
    *    false otherwise.
    */
   virtual bool operator()(Interface1D& inter) {
+	string name( py_up1D ? PyString_AsString(PyObject_CallMethod(py_up1D, "getName", "")) : getName() );
 	
-	if( py_up1D ) {
-		return director_BPy_UnaryPredicate1D___call__(py_up1D, inter);
+	if( py_up1D && PyObject_HasAttrString(py_up1D, "__call__")) {
+		return Director_BPy_UnaryPredicate1D___call__(py_up1D, inter);
 	} else {
-		cerr << "Warning: operator() not implemented" << endl;
-	    return false;
+		cerr << "Warning: " << name << " operator() not implemented" << endl;
+		return false;
 	}
   }
 
-	inline void setPythonObject(PyObject *_py_up1D) { py_up1D = _py_up1D; }
-
 };
 
 
@@ -106,8 +103,11 @@ public:
 class BinaryPredicate1D
 {
 public:
+	
+		PyObject *py_bp1D;
+	
   /*! Default constructor. */
-  BinaryPredicate1D() {}
+		BinaryPredicate1D() { py_bp1D = 0; }
   /*! Destructor. */
   virtual ~BinaryPredicate1D() {}
   /*! Returns the string of the name of the
@@ -125,9 +125,16 @@ public:
    *  \return true or false.
    */
   virtual bool operator()(Interface1D& inter1, Interface1D& inter2) {
-    cerr << "Warning: operator() not implemented" << endl;
-    return false;
+	string name( py_bp1D ? PyString_AsString(PyObject_CallMethod(py_bp1D, "getName", "")) : getName() );
+	
+	if( py_bp1D && py_bp1D && PyObject_HasAttrString(py_bp1D, "__call__") ) {
+		return Director_BPy_BinaryPredicate1D___call__(py_bp1D, inter1, inter2);
+	} else {
+		cerr << "Warning: " << name << " operator() not implemented" << endl;
+		return false;
+	}
   }
+
 };
 
 
diff --git a/source/blender/freestyle/intern/stroke/Stroke.h b/source/blender/freestyle/intern/stroke/Stroke.h
index 8e4e5e24a2c..3df57341e5f 100755
--- a/source/blender/freestyle/intern/stroke/Stroke.h
+++ b/source/blender/freestyle/intern/stroke/Stroke.h
@@ -38,6 +38,7 @@
 # include "../view_map/Interface1D.h"
 # include "../system/StringUtils.h"
 
+
 //
 //  StrokeAttribute
 //
diff --git a/source/blender/freestyle/intern/stroke/StrokeShader.h b/source/blender/freestyle/intern/stroke/StrokeShader.h
index fa1289f6e0f..f92895564d8 100755
--- a/source/blender/freestyle/intern/stroke/StrokeShader.h
+++ b/source/blender/freestyle/intern/stroke/StrokeShader.h
@@ -33,6 +33,8 @@
 # include <iostream>
 # include <vector>
 
+# include  "../python/Director.h"
+
 //
 //  StrokeShader base class
 //
@@ -69,8 +71,11 @@ class Stroke;
 class LIB_STROKE_EXPORT StrokeShader
 {
 public:
+	
+	PyObject *py_ss;
+	
   /*! Default constructor. */
-  StrokeShader() {}
+	StrokeShader() { py_ss = 0; }
   /*! Destructor. */
   virtual ~StrokeShader() {}
   /*! Returns the string corresponding to the
@@ -111,7 +116,13 @@ public:
    *    as Color, Thickness, Geometry...)
    */
   virtual void shade(Stroke& ioStroke) const {
-    cerr << "Warning: method shade() not implemented" << endl;
+	string name( py_ss ? PyString_AsString(PyObject_CallMethod(py_ss, "getName", "")) : getName() );
+	
+	if( py_ss && PyObject_HasAttrString(py_ss, "shade") ) {
+		return Director_BPy_StrokeShader_shade(py_ss, ioStroke);
+	} else {
+		cerr << "Warning: " << name << " method shade() not implemented" << endl;
+	}
   }
 
 };
diff --git a/source/blender/freestyle/intern/view_map/Functions0D.h b/source/blender/freestyle/intern/view_map/Functions0D.h
index 3160546da2f..1ad35da8d91 100755
--- a/source/blender/freestyle/intern/view_map/Functions0D.h
+++ b/source/blender/freestyle/intern/view_map/Functions0D.h
@@ -90,7 +90,7 @@ public:
    *  \return the result of the function of type T.
    */
   virtual T operator()(Interface0DIterator& iter) {
-    cerr << "Warning: operator() not implemented" << endl;
+    cerr << "Warning: UnaryFunction0D operator() not implemented" << endl;
     return T();
   }
 };
diff --git a/source/blender/freestyle/intern/view_map/Functions1D.h b/source/blender/freestyle/intern/view_map/Functions1D.h
index c92d12ff330..072733b985d 100755
--- a/source/blender/freestyle/intern/view_map/Functions1D.h
+++ b/source/blender/freestyle/intern/view_map/Functions1D.h
@@ -92,7 +92,7 @@ public:
    *  \return the result of the function of type T.
    */
   virtual T operator()(Interface1D& inter) {
-    cerr << "Warning: operator() not implemented" << endl;
+    cerr << "Warning: UnaryFunction1D operator() not implemented" << endl;
     return T(0);
   }
   /*! Sets the integration method */
diff --git a/source/blender/freestyle/style_modules_blender/freestyle_init.py b/source/blender/freestyle/style_modules_blender/freestyle_init.py
index 06b8f933114..e4ad8a9f769 100644
--- a/source/blender/freestyle/style_modules_blender/freestyle_init.py
+++ b/source/blender/freestyle/style_modules_blender/freestyle_init.py
@@ -49,10 +49,10 @@ class StrokeShader(Blender.Freestyle.StrokeShader):
 	pass
 
 class UnaryFunction0D(Blender.Freestyle.UnaryFunction0D):
-	def __call__(*args): return Blender.Freestyle.UnaryFunction0D.__call__(*args)
+	pass
 
 class UnaryFunction1D(Blender.Freestyle.UnaryFunction1D):
-	def __call__(*args): return Blender.Freestyle.UnaryFunction1D.__call__(*args)
+	pass
 
 class UnaryPredicate0D(Blender.Freestyle.UnaryPredicate0D):
 	pass
@@ -67,19 +67,19 @@ class ViewShape(Blender.Freestyle.ViewShape):
 	pass
 
 class FalseBP1D(Blender.Freestyle.FalseBP1D):
-	def __call__(*args): return Blender.Freestyle.FalseBP1D.__call__(*args)
+	pass
 
 class Length2DBP1D(Blender.Freestyle.Length2DBP1D):
-	def __call__(*args): return Blender.Freestyle.Length2DBP1D.__call__(*args)
+	pass
 
 class SameShapeIdBP1D(Blender.Freestyle.SameShapeIdBP1D):
-	def __call__(*args): return Blender.Freestyle.SameShapeIdBP1D.__call__(*args)
+	pass
 
 class TrueBP1D(Blender.Freestyle.TrueBP1D):
-	def __call__(*args): return Blender.Freestyle.TrueBP1D.__call__(*args)
+	pass
 
 class ViewMapGradientNormBP1D(Blender.Freestyle.ViewMapGradientNormBP1D):
-	def __call__(*args): return Blender.Freestyle.ViewMapGradientNormBP1D.__call__(*args)
+	pass
 
 class CurvePoint(Blender.Freestyle.CurvePoint):
 	pass
@@ -250,37 +250,37 @@ class UnaryFunction1DVoid(Blender.Freestyle.UnaryFunction1DVoid):
 	pass
 
 class FalseUP0D(Blender.Freestyle.FalseUP0D):
-	def __call__(*args): return Blender.Freestyle.FalseUP0D.__call__(*args)
+	pass
 
 class TrueUP0D(Blender.Freestyle.TrueUP0D):
-	def __call__(*args): return Blender.Freestyle.TrueUP0D.__call__(*args)
+	pass
 
 class ContourUP1D(Blender.Freestyle.ContourUP1D):
-	def __call__(*args): return Blender.Freestyle.ContourUP1D.__call__(*args)
+	pass
 
 class DensityLowerThanUP1D(Blender.Freestyle.DensityLowerThanUP1D):
-	def __call__(*args): return Blender.Freestyle.DensityLowerThanUP1D.__call__(*args)
+	pass
 
 class EqualToChainingTimeStampUP1D(Blender.Freestyle.EqualToChainingTimeStampUP1D):
-	def __call__(*args): return Blender.Freestyle.EqualToChainingTimeStampUP1D.__call__(*args)
+	pass
 
 class EqualToTimeStampUP1D(Blender.Freestyle.EqualToTimeStampUP1D):
-	def __call__(*args): return Blender.Freestyle.EqualToTimeStampUP1D.__call__(*args)
+	pass
 
 class ExternalContourUP1D(Blender.Freestyle.ExternalContourUP1D):
-	def __call__(*args): return Blender.Freestyle.ExternalContourUP1D.__call__(*args)
+	pass
 
 class FalseUP1D(Blender.Freestyle.FalseUP1D):
-	def __call__(*args): return Blender.Freestyle.FalseUP1D.__call__(*args)
+	pass
 
 class QuantitativeInvisibilityUP1D(Blender.Freestyle.QuantitativeInvisibilityUP1D):
-	def __call__(*args): return Blender.Freestyle.QuantitativeInvisibilityUP1D.__call__(*args)
+	pass
 
 class ShapeUP1D(Blender.Freestyle.ShapeUP1D):
-	def __call__(*args): return Blender.Freestyle.ShapeUP1D.__call__(*args)
+	pass
 
 class TrueUP1D(Blender.Freestyle.TrueUP1D):
-	def __call__(*args): return Blender.Freestyle.TrueUP1D.__call__(*args)
+	pass
 
 class StrokeVertex(Blender.Freestyle.StrokeVertex):
 	pass
@@ -301,155 +301,155 @@ class FEdgeSmooth(Blender.Freestyle.FEdgeSmooth):
 	pass
 
 class Curvature2DAngleF0D(Blender.Freestyle.Curvature2DAngleF0D):
-	def __call__(*args): return Blender.Freestyle.Curvature2DAngleF0D.__call__(*args)
+	pass
 
 class DensityF0D(Blender.Freestyle.DensityF0D):
-	def __call__(*args): return Blender.Freestyle.DensityF0D.__call__(*args)
+	pass
 
 class GetProjectedXF0D(Blender.Freestyle.GetProjectedXF0D):
-	def __call__(*args): return Blender.Freestyle.GetProjectedXF0D.__call__(*args)
+	pass
 
 class GetProjectedYF0D(Blender.Freestyle.GetProjectedYF0D):
-	def __call__(*args): return Blender.Freestyle.GetProjectedYF0D.__call__(*args)
+	pass
 
 class GetProjectedZF0D(Blender.Freestyle.GetProjectedZF0D):
-	def __call__(*args): return Blender.Freestyle.GetProjectedZF0D.__call__(*args)
+	pass
 
 class GetXF0D(Blender.Freestyle.GetXF0D):
-	def __call__(*args): return Blender.Freestyle.GetXF0D.__call__(*args)
+	pass
 
 class GetYF0D(Blender.Freestyle.GetYF0D):
-	def __call__(*args): return Blender.Freestyle.GetYF0D.__call__(*args)
+	pass
 
 class GetZF0D(Blender.Freestyle.GetZF0D):
-	def __call__(*args): return Blender.Freestyle.GetZF0D.__call__(*args)
+	pass
 
 class LocalAverageDepthF0D(Blender.Freestyle.LocalAverageDepthF0D):
-	def __call__(*args): return Blender.Freestyle.LocalAverageDepthF0D.__call__(*args)
+	pass
 
 class ZDiscontinuityF0D(Blender.Freestyle.ZDiscontinuityF0D):
-	def __call__(*args): return Blender.Freestyle.ZDiscontinuityF0D.__call__(*args)
+	pass
 
 class GetCurvilinearAbscissaF0D(Blender.Freestyle.GetCurvilinearAbscissaF0D):
-	def __call__(*args): return Blender.Freestyle.GetCurvilinearAbscissaF0D.__call__(*args)
+	pass
 
 class GetParameterF0D(Blender.Freestyle.GetParameterF0D):
-	def __call__(*args): return Blender.Freestyle.GetParameterF0D.__call__(*args)
+	pass
 
 class GetViewMapGradientNormF0D(Blender.Freestyle.GetViewMapGradientNormF0D):
-	def __call__(*args): return Blender.Freestyle.GetViewMapGradientNormF0D.__call__(*args)
+	pass
 
 class ReadCompleteViewMapPixelF0D(Blender.Freestyle.ReadCompleteViewMapPixelF0D):
-	def __call__(*args): return Blender.Freestyle.ReadCompleteViewMapPixelF0D.__call__(*args)
+	pass
 
 class ReadMapPixelF0D(Blender.Freestyle.ReadMapPixelF0D):
-	def __call__(*args): return Blender.Freestyle.ReadMapPixelF0D.__call__(*args)
+	pass
 
 class ReadSteerableViewMapPixelF0D(Blender.Freestyle.ReadSteerableViewMapPixelF0D):
-	def __call__(*args): return Blender.Freestyle.ReadSteerableViewMapPixelF0D.__call__(*args)
+	pass
 
 class ShapeIdF0D(Blender.Freestyle.ShapeIdF0D):
-	def __call__(*args): return Blender.Freestyle.ShapeIdF0D.__call__(*args)
+	pass
 
 class MaterialF0D(Blender.Freestyle.MaterialF0D):
-	def __call__(*args): return Blender.Freestyle.MaterialF0D.__call__(*args)
+	pass
 
 class CurveNatureF0D(Blender.Freestyle.CurveNatureF0D):
-	def __call__(*args): return Blender.Freestyle.CurveNatureF0D.__call__(*args)
+	pass
 
 class QuantitativeInvisibilityF0D(Blender.Freestyle.QuantitativeInvisibilityF0D):
-	def __call__(*args): return Blender.Freestyle.QuantitativeInvisibilityF0D.__call__(*args)
+	pass
 
 class Normal2DF0D(Blender.Freestyle.Normal2DF0D):
-	def __call__(*args): return Blender.Freestyle.Normal2DF0D.__call__(*args)
+	pass
 
 class VertexOrientation2DF0D(Blender.Freestyle.VertexOrientation2DF0D):
-	def __call__(*args): return Blender.Freestyle.VertexOrientation2DF0D.__call__(*args)
+	pass
 
 class VertexOrientation3DF0D(Blender.Freestyle.VertexOrientation3DF0D):
-	def __call__(*args): return Blender.Freestyle.VertexOrientation3DF0D.__call__(*args)
+	pass
 
 class GetOccludersF0D(Blender.Freestyle.GetOccludersF0D):
-	def __call__(*args): return Blender.Freestyle.GetOccludersF0D.__call__(*args)
+	pass
 
 class GetOccludeeF0D(Blender.Freestyle.GetOccludeeF0D):
-	def __call__(*args): return Blender.Freestyle.GetOccludeeF0D.__call__(*args)
+	pass
 
 class GetShapeF0D(Blender.Freestyle.GetShapeF0D):
-	def __call__(*args): return Blender.Freestyle.GetShapeF0D.__call__(*args)
+	pass
 
 class Curvature2DAngleF1D(Blender.Freestyle.Curvature2DAngleF1D):
-	def __call__(*args): return Blender.Freestyle.Curvature2DAngleF1D.__call__(*args)
+	pass
 
 class DensityF1D(Blender.Freestyle.DensityF1D):
-	def __call__(*args): return Blender.Freestyle.DensityF1D.__call__(*args)
+	pass
 
 class GetCompleteViewMapDensityF1D(Blender.Freestyle.GetCompleteViewMapDensityF1D):
-	def __call__(*args): return Blender.Freestyle.GetCompleteViewMapDensityF1D.__call__(*args)
+	pass
 
 class GetDirectionalViewMapDensityF1D(Blender.Freestyle.GetDirectionalViewMapDensityF1D):
-	def __call__(*args): return Blender.Freestyle.GetDirectionalViewMapDensityF1D.__call__(*args)
+	pass
 
 class GetProjectedXF1D(Blender.Freestyle.GetProjectedXF1D):
-	def __call__(*args): return Blender.Freestyle.GetProjectedXF1D.__call__(*args)
+	pass
 
 class GetProjectedYF1D(Blender.Freestyle.GetProjectedYF1D):
-	def __call__(*args): return Blender.Freestyle.GetProjectedYF1D.__call__(*args)
+	pass
 
 class GetProjectedZF1D(Blender.Freestyle.GetProjectedZF1D):
-	def __call__(*args): return Blender.Freestyle.GetProjectedZF1D.__call__(*args)
+	pass
 
 class GetSteerableViewMapDensityF1D(Blender.Freestyle.GetSteerableViewMapDensityF1D):
-	def __call__(*args): return Blender.Freestyle.GetSteerableViewMapDensityF1D.__call__(*args)
+	pass
 
 class GetViewMapGradientNormF1D(Blender.Freestyle.GetViewMapGradientNormF1D):
-	def __call__(*args): return Blender.Freestyle.GetViewMapGradientNormF1D.__call__(*args)
+	pass
 
 class GetXF1D(Blender.Freestyle.GetXF1D):
-	def __call__(*args): return Blender.Freestyle.GetXF1D.__call__(*args)
+	pass
 
 class GetYF1D(Blender.Freestyle.GetYF1D):
-	def __call__(*args): return Blender.Freestyle.GetYF1D.__call__(*args)
+	pass
 
 class GetZF1D(Blender.Freestyle.GetZF1D):
-	def __call__(*args): return Blender.Freestyle.GetZF1D.__call__(*args)
+	pass
 
 class LocalAverageDepthF1D(Blender.Freestyle.LocalAverageDepthF1D):
-	def __call__(*args): return Blender.Freestyle.LocalAverageDepthF1D.__call__(*args)
+	pass
 
 class ZDiscontinuityF1D(Blender.Freestyle.ZDiscontinuityF1D):
-	def __call__(*args): return Blender.Freestyle.ZDiscontinuityF1D.__call__(*args)
+	pass
 
 class CurveNatureF1D(Blender.Freestyle.CurveNatureF1D):
-	def __call__(*args): return Blender.Freestyle.CurveNatureF1D.__call__(*args)
+	pass
 
 class QuantitativeInvisibilityF1D(Blender.Freestyle.QuantitativeInvisibilityF1D):
-	def __call__(*args): return Blender.Freestyle.QuantitativeInvisibilityF1D.__call__(*args)
+	pass
 
 class Normal2DF1D(Blender.Freestyle.Normal2DF1D):
-	def __call__(*args): return Blender.Freestyle.Normal2DF1D.__call__(*args)
+	pass
 
 class Orientation2DF1D(Blender.Freestyle.Orientation2DF1D):
-	def __call__(*args): return Blender.Freestyle.Orientation2DF1D.__call__(*args)
+	pass
 
 class Orientation3DF1D(Blender.Freestyle.Orientation3DF1D):
-	def __call__(*args): return Blender.Freestyle.Orientation3DF1D.__call__(*args)
+	pass
 
 class GetOccludeeF1D(Blender.Freestyle.GetOccludeeF1D):
-	def __call__(*args): return Blender.Freestyle.GetOccludeeF1D.__call__(*args)
+	pass
 
 class GetOccludersF1D(Blender.Freestyle.GetOccludersF1D):
-	def __call__(*args): return Blender.Freestyle.GetOccludersF1D.__call__(*args)
+	pass
 
 class GetShapeF1D(Blender.Freestyle.GetShapeF1D):
-	def __call__(*args): return Blender.Freestyle.GetShapeF1D.__call__(*args)
+	pass
 
 class ChainingTimeStampF1D(Blender.Freestyle.ChainingTimeStampF1D):
-	def __call__(*args): return Blender.Freestyle.ChainingTimeStampF1D.__call__(*args)
+	pass
 
 class IncrementChainingTimeStampF1D(Blender.Freestyle.IncrementChainingTimeStampF1D):
-	def __call__(*args): return Blender.Freestyle.IncrementChainingTimeStampF1D.__call__(*args)
+	pass
 
 class TimeStampF1D(Blender.Freestyle.TimeStampF1D):
-	def __call__(*args): return Blender.Freestyle.TimeStampF1D.__call__(*args)
+	pass
 

From f09f89d5dcbc5532eeda9f54f0e1163373491083 Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Thu, 31 Jul 2008 11:20:30 +0000
Subject: [PATCH 170/252] soc-2008-mxcurioni: added a Freestyle panel to select
 a style at run-time, by specifying its pathname. By default, it is loaded
 with the contour.py path.

---
 source/blender/blenkernel/intern/scene.c      |  1 +
 source/blender/freestyle/FRS_freestyle.h      |  3 ++
 .../freestyle/intern/app_blender/api.cpp      | 17 +++++---
 source/blender/include/butspace.h             |  3 ++
 source/blender/src/SConscript                 |  2 +-
 source/blender/src/buttons_scene.c            | 43 +++++++++++++++++++
 6 files changed, 62 insertions(+), 7 deletions(-)

diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 2898dca767c..089a80a9fea 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -271,6 +271,7 @@ Scene *add_scene(char *name)
 	strcpy(sce->r.backbuf, "//backbuf");
 	strcpy(sce->r.pic, U.renderdir);
 
+
 	BLI_init_rctf(&sce->r.safety, 0.1f, 0.9f, 0.1f, 0.9f);
 	sce->r.osa= 8;
 
diff --git a/source/blender/freestyle/FRS_freestyle.h b/source/blender/freestyle/FRS_freestyle.h
index 060ccf6961a..20ff6b72231 100644
--- a/source/blender/freestyle/FRS_freestyle.h
+++ b/source/blender/freestyle/FRS_freestyle.h
@@ -5,6 +5,9 @@
 extern "C" {
 #endif	
 	
+	extern char style_module[255];
+	
+	void FRS_initialize();
 	void FRS_prepare(Render* re);
 	void FRS_execute(Render* re, int render_in_layer);
 
diff --git a/source/blender/freestyle/intern/app_blender/api.cpp b/source/blender/freestyle/intern/app_blender/api.cpp
index 7f5135a2655..a6490324fbf 100644
--- a/source/blender/freestyle/intern/app_blender/api.cpp
+++ b/source/blender/freestyle/intern/app_blender/api.cpp
@@ -30,7 +30,8 @@ extern "C" {
 	static Controller *controller = NULL;
 	static AppGLWidget *view = NULL;
 
-	
+	char style_module[255] = "";
+
 	void FRS_initialize(){
 		
 		if( pathconfig == NULL )
@@ -42,8 +43,14 @@ extern "C" {
 		if( view == NULL )
 			view = new AppGLWidget;
 		
-		controller->Clear();
 		controller->setView(view);
+		controller->Clear();
+		
+		if( strlen(style_module) == 0 ){
+			string path( pathconfig->getProjectDir() +  Config::DIR_SEP + "style_modules_blender" + Config::DIR_SEP + "contour.py" );
+			strcpy( style_module, path.c_str() );
+		}
+		
 	}
 
 
@@ -114,10 +121,8 @@ extern "C" {
 		}
 		
 		// add style module
-		string style_module = pathconfig->getProjectDir() + 
-								Config::DIR_SEP + "style_modules_blender" + 
-								Config::DIR_SEP + "contour.py";
-		controller->InsertStyleModule( 0, const_cast<char *>(style_module.c_str()) 	 );
+		cout << "Module: " << style_module << endl;
+		controller->InsertStyleModule( 0, style_module );
 		controller->toggleLayer(0, true);
 		
 		// compute view map
diff --git a/source/blender/include/butspace.h b/source/blender/include/butspace.h
index c0542e3f34c..68bc1fff774 100644
--- a/source/blender/include/butspace.h
+++ b/source/blender/include/butspace.h
@@ -318,6 +318,8 @@ void curvemap_buttons(struct uiBlock *block, struct CurveMapping *cumap, char la
 #define B_FS_PIC		1601
 #define B_FS_BACKBUF	1602
 
+#define B_FS_FRS 1603
+
 #define B_FS_FTYPE		1604 /* FTYPE is no more */
 #define B_DORENDER		1605
 #define B_DOANIM		1606
@@ -372,6 +374,7 @@ void curvemap_buttons(struct uiBlock *block, struct CurveMapping *cumap, char la
 #define B_SEQ_BUT_RELOAD_FILE   1696
 #define B_SEQ_BUT_REBUILD_PROXY 1697
 #define B_SEQ_SEL_PROXY_DIR     1698
+
 /* *********************** */
 #define B_ARMATUREBUTS		1800
 #define	B_POSE			1701
diff --git a/source/blender/src/SConscript b/source/blender/src/SConscript
index 229cc87ef37..a7a960beac9 100644
--- a/source/blender/src/SConscript
+++ b/source/blender/src/SConscript
@@ -27,7 +27,7 @@ incs += ' #/intern/decimation/extern ../blenloader ../python'
 incs += ' ../../kernel/gen_system #/intern/SoundSystem ../readstreamglue ../nodes'
 incs += ' ../quicktime #/intern/elbeem/extern'
 incs += ' #/intern/ghost #/intern/opennl/extern #/extern/glew/include'
-
+incs += ' ../freestyle'
 
 incs += ' ' + env['BF_PYTHON_INC']
 incs += ' ' + env['BF_SDL_INC']
diff --git a/source/blender/src/buttons_scene.c b/source/blender/src/buttons_scene.c
index 8b35f90ea9d..6edf3ebf168 100644
--- a/source/blender/src/buttons_scene.c
+++ b/source/blender/src/buttons_scene.c
@@ -120,6 +120,8 @@ extern void makeffmpegstring(char* string);
 
 #endif
 
+#include "FRS_freestyle.h"
+
 /* here the calls for scene buttons
    - render
    - world
@@ -1362,6 +1364,15 @@ static void backbuf_pic(char *name)
 	BIF_undo_push("Change background picture");
 }
 
+static void freestyle_module(char *name)
+{
+	strcpy(style_module, name);
+	allqueue(REDRAWBUTSSCENE, 0);
+	BIF_undo_push("Change style module");
+}
+
+
+
 static void run_playanim(char *file) 
 {
 	extern char bprogname[];	/* usiblender.c */
@@ -1463,6 +1474,13 @@ void do_render_panels(unsigned short event)
 			activate_fileselect(FILE_SPECIAL, "SELECT BACKBUF PICTURE", G.scene->r.backbuf, backbuf_pic);
 		break;
 	
+	case B_FS_FRS:
+		sa= closest_bigger_area();
+		areawinset(sa->win);
+		activate_fileselect(FILE_SPECIAL, "SELECT STYLE MODULE", style_module, freestyle_module);
+		break;
+		
+	
 	case B_PR_PAL:
 		G.scene->r.xsch= 720;
 		G.scene->r.ysch= 576;
@@ -3235,6 +3253,26 @@ static void render_panel_yafrayGlobal()
 }
 #endif /* disable yafray stuff */
 
+static void render_panel_freestyle()
+{
+	uiBlock *block;
+
+	if( strlen(style_module) == 0 )
+		FRS_initialize();
+
+	block= uiNewBlock(&curarea->uiblocks, "render_panel_freestyle", UI_EMBOSS, UI_HELV, curarea->win);
+	uiNewPanelTabbed("Render", "Render");
+	if(uiNewPanel(curarea, block, "Freestyle", "Render", 320, 0, 318, 204)==0) return;
+
+	// label to force a boundbox for buttons not to be centered
+	uiBlockBeginAlign(block);
+	uiDefIconBut(block, BUT, B_FS_FRS, ICON_FILESEL, 10, 190, 20, 20, 0, 0, 0, 0, 0, "Open Fileselect to get style module");
+	uiDefBut(block, TEX,0,"", 31, 190, 279, 20, style_module, 0.0,79.0, 0, 0, "Style module path name");
+	uiBlockEndAlign(block);
+
+
+}
+
 static void layer_copy_func(void *lay_v, void *lay_p)
 {
 	unsigned int *lay= lay_p;
@@ -3453,6 +3491,11 @@ void render_panels()
 	}
 #endif
 
+	if (G.scene->r.renderer==R_FREESTYLE) {
+		render_panel_freestyle();
+	}
+
+
 }
 
 /* --------------------------------------------- */

From 726982be295ec497827926b336b933d5d3868052 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Thu, 31 Jul 2008 11:54:17 +0000
Subject: [PATCH 171/252] Word wrap fix: There were cases where the brackets,
 cursor and selections (which all use the same function) weren't lining up
 with the drawn text (which uses its own function). This fix simplifies the
 algorithm and hopefully now makes it work for all cases.

---
 source/blender/src/drawtext.c | 205 ++++++++++++++++++++--------------
 1 file changed, 121 insertions(+), 84 deletions(-)

diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index d664ded08c5..f4f8ebf3158 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -100,18 +100,15 @@ All word-wrap functions follow the algorithm below to maintain consistency.
 def wrap(line, view_width, wrap_chars, tab_size):
 	draw_start = 0
 	draw_end = view_width
-	tab_offset = 0
 	pos = 0
 	for c in line:
-		if pos-draw_start+tab_offset >= view_width:
+		if pos-draw_start >= view_width:
 			print line[draw_start:draw_end]
 			draw_start = draw_end
 			draw_end += view_width
 			tab_offset = 0
 		elif c in wrap_chars:
 			draw_end = pos+1
-			if c == '\t':
-				tab_offset += tab_size-(pos-draw_start+tab_offset+1)%tab_size
 		pos += 1
 	print line[draw_start:]
 
@@ -436,7 +433,78 @@ void txt_format_text(SpaceText *st)
 		txt_format_line(st, linep, 0);
 }
 
-static int text_draw(SpaceText *st, char *str, int cshift, int maxwidth, int draw, int x, int y, char *format) {
+static void format_draw_color(char formatchar) {
+	switch (formatchar) {
+		case '_': /* Whitespace */
+			break;
+		case '!': /* Symbols */
+			BIF_ThemeColorBlend(TH_TEXT, TH_BACK, 0.5f);
+			break;
+		case '#': /* Comments */
+			BIF_ThemeColor(TH_SYNTAX_C);
+			break;
+		case 'n': /* Numerals */
+			BIF_ThemeColor(TH_SYNTAX_N);
+			break;
+		case 'l': /* Strings */
+			BIF_ThemeColor(TH_SYNTAX_L);
+			break;
+		case 'v': /* Specials: class, def */
+			BIF_ThemeColor(TH_SYNTAX_V);
+			break;
+		case 'b': /* Keywords: for, print, etc. */
+			BIF_ThemeColor(TH_SYNTAX_B);
+			break;
+		case 'q': /* Other text (identifiers) */
+		default:
+			BIF_ThemeColor(TH_TEXT);
+			break;
+	}
+}
+
+static int text_draw_wrapped(SpaceText *st, char *str, int x, int y, int w, char *format)
+{
+	int basex, i, a, len, start, end, max, lines;
+	
+	len= render_string(st, str);
+	str= temp_char_buf;
+	max= w/spacetext_get_fontwidth(st);
+	if (max<8) max= 8;
+	basex= x;
+
+	lines= 1;
+	start= 0;
+	end= max;
+	for (i=0; i<len; i++) {
+		if (i-start >= max) {
+			/* Draw the visible portion of text on the overshot line */
+			for (a=start; a<end; a++) {
+				if (st->showsyntax && format) format_draw_color(format[a]);
+				glRasterPos2i(x, y);
+				BMF_DrawCharacter(spacetext_get_font(st), str[a]);
+				x += BMF_GetCharacterWidth(spacetext_get_font(st), str[a]);
+			}
+			y -= st->lheight;
+			x= basex;
+			lines++;
+			start= end;
+			end += max;
+		} else if (str[i]==' ' || str[i]=='-') {
+			end = i+1;
+		}
+	}
+	/* Draw the remaining text */
+	for (a=start; a<len; a++) {
+		if (st->showsyntax && format) format_draw_color(format[a]);
+		glRasterPos2i(x, y);
+		BMF_DrawCharacter(spacetext_get_font(st), str[a]);
+		x += BMF_GetCharacterWidth(spacetext_get_font(st), str[a]);
+	}
+	return lines;
+}
+
+static int text_draw(SpaceText *st, char *str, int cshift, int maxwidth, int draw, int x, int y, char *format)
+{
 	int r=0, w= 0;
 	char *in;
 	int *acc;
@@ -451,43 +519,15 @@ static int text_draw(SpaceText *st, char *str, int cshift, int maxwidth, int dra
 	if (draw) {
 		if(st->showsyntax && format) {
 			int amount, a;
-			char out[2];
 			format = format+cshift;
 		
 			amount = strlen(in);
 			
 			for(a = 0; a < amount; a++) {
-				out[0] = (unsigned char) in[a]; 
-				out[1] = '\0';
-				switch (format[a]) {
-					case '_': /* Whitespace */
-						break;
-					case '!': /* Symbols */
-						BIF_ThemeColorBlend(TH_TEXT, TH_BACK, 0.5f);
-						break;
-					case '#': /* Comments */
-						BIF_ThemeColor(TH_SYNTAX_C);
-						break;
-					case 'n': /* Numerals */
-						BIF_ThemeColor(TH_SYNTAX_N);
-						break;
-					case 'l': /* Strings */
-						BIF_ThemeColor(TH_SYNTAX_L);
-						break;
-					case 'v': /* Specials: class, def */
-						BIF_ThemeColor(TH_SYNTAX_V);
-						break;
-					case 'b': /* Keywords: for, print, etc. */
-						BIF_ThemeColor(TH_SYNTAX_B);
-						break;
-					case 'q': /* Other text (identifiers) */
-					default:
-						BIF_ThemeColor(TH_TEXT);
-						break;
-				}
+				format_draw_color(format[a]);
 				glRasterPos2i(x, y);
-				BMF_DrawString(spacetext_get_font(st), out);
-				x = x+BMF_GetStringWidth(spacetext_get_font(st), out);
+				BMF_DrawCharacter(spacetext_get_font(st), in[a]);
+				x = x+BMF_GetCharacterWidth(spacetext_get_font(st), in[a]);
 			}
 		} else {
 			glRasterPos2i(x, y);
@@ -546,7 +586,7 @@ static void set_cursor_to_pos (SpaceText *st, int x, int y, int sel)
 static int get_wrap_width(SpaceText *st) {
 	int x, max;
 	x= st->showlinenrs ? TXT_OFFSET + TEXTXLOC : TXT_OFFSET;
-	max= (curarea->winrct.xmax-curarea->winrct.xmin-x)/spacetext_get_fontwidth(st);
+	max= (curarea->winx-x)/spacetext_get_fontwidth(st);
 	return max>8 ? max : 8;
 }
 
@@ -578,9 +618,11 @@ static int get_wrap_points(SpaceText *st, char *line) {
 static void wrap_offset(SpaceText *st, TextLine *linein, int cursin, int *offl, int *offc) {
 	Text *text;
 	TextLine *linep;
-	int i, start, end, taboffs, max;
+	int i, j, start, end, chars, max, chop;
+	char ch;
 
 	*offl= *offc= 0;
+
 	if (!st->text) return;
 	if (!st->wordwrap) return;
 
@@ -590,6 +632,7 @@ static void wrap_offset(SpaceText *st, TextLine *linein, int cursin, int *offl,
 	linep= text->lines.first;
 	i= st->top;
 	while (i>0 && linep) {
+		if (linep == linein) return; /* Line before top */
 		linep= linep->next;
 		i--;
 	}
@@ -597,24 +640,38 @@ static void wrap_offset(SpaceText *st, TextLine *linein, int cursin, int *offl,
 	max= get_wrap_width(st);
 
 	while (linep) {
-		taboffs= start= 0;
+		start= 0;
 		end= max;
+		chop= 1;
+		chars= 0;
 		*offc= 0;
-		for (i=0; linep->line[i]!='\0'; i++) {
-			if (i-start+taboffs>=max) {
-				if (end-start==max && linep==linein && i >= cursin)
-					break;
-				(*offl)++;
-				*offc -= end-start+taboffs;
-				start= end;
-				end += max;
-				taboffs= 0;
-			} else if (linep->line[i]==' ' || linep->line[i]=='\t' || linep->line[i]=='-') {
-				end = i+1;
-				if (linep==linein && i >= cursin)
-					break;
-				else if (linep->line[i]=='\t')
-					taboffs += st->tabnumber-(i-start+taboffs+1)%st->tabnumber;
+		for (i=0, j=0; linep->line[j]!='\0'; j++) {
+
+			/* Mimic replacement of tabs */
+			ch= linep->line[j];
+			if (ch=='\t') {
+				chars= st->tabnumber-i%st->tabnumber;
+				if (linep==linein && i<cursin) cursin += chars-1;
+				ch= ' ';
+			} else
+				chars= 1;
+
+			while (chars--) {
+				if (i-start>=max) {
+					if (chop && linep==linein && i >= cursin)
+						return;
+					(*offl)++;
+					*offc -= end-start;
+					start= end;
+					end += max;
+					chop= 1;
+				} else if (ch==' ' || ch=='-') {
+					end = i+1;
+					chop= 0;
+					if (linep==linein && i >= cursin)
+						return;
+				}
+				i++;
 			}
 		}
 		if (linep==linein) break;
@@ -654,7 +711,7 @@ static void draw_cursor(SpaceText *st) {
 		
 		BIF_ThemeColor(TH_SHADE2);
 		x= st->showlinenrs ? TXT_OFFSET + TEXTXLOC : TXT_OFFSET;
-		y= curarea->winy-3;
+		y= curarea->winy-2;
 
 		if (vcurl==vsell) {
 			y -= vcurl*st->lheight;
@@ -688,10 +745,12 @@ static void draw_cursor(SpaceText *st) {
 		/* Draw the cursor itself (we draw the sel. cursor as this is the leading edge) */
 		x= st->showlinenrs ? TXT_OFFSET + TEXTXLOC : TXT_OFFSET;
 		x += vselc*spacetext_get_fontwidth(st);
-		y= curarea->winy-3 - vsell*st->lheight;
+		y= curarea->winy-2 - vsell*st->lheight;
 		
 		if (st->overwrite) {
-			w= BMF_GetCharacterWidth(spacetext_get_font(st), text->sell->line[text->selc]);
+			char ch= text->sell->line[text->selc];
+			if (!ch) ch= ' ';
+			w= BMF_GetCharacterWidth(spacetext_get_font(st), ch);
 			BIF_ThemeColor(TH_HILITE);
 			glRecti(x, y-st->lheight-1, x+w, y-st->lheight+1);
 		} else {
@@ -1191,9 +1250,9 @@ void drawtextspace(ScrArea *sa, void *spacedata)
 {
 	SpaceText *st= curarea->spacedata.first;
 	Text *text;
-	int i, a, x, y, max, len;
+	int i, x, y;
 	TextLine *tmp;
-	char linenr[12], *wrapbuf;
+	char linenr[12];
 	float col[3];
 	int linecount = 0;
 
@@ -1231,8 +1290,6 @@ void drawtextspace(ScrArea *sa, void *spacedata)
 
 	y= curarea->winy-st->lheight;
 	x= st->showlinenrs ? TXT_OFFSET + TEXTXLOC : TXT_OFFSET;
-	max= get_wrap_width(st);
-	wrapbuf= MEM_mallocN(max+1, "wrapbuffer");
 
 	for (i=0; y>0 && i<st->viewlines && tmp; i++, tmp= tmp->next) {
 		if (st->showsyntax && !tmp->format) {
@@ -1256,33 +1313,13 @@ void drawtextspace(ScrArea *sa, void *spacedata)
 			BMF_DrawString(spacetext_get_font(st), linenr);
 		}
 		if (st->wordwrap) {
-			int start, end, taboffs, fmtoffs;
-			len= tmp->len;
-			fmtoffs= taboffs= start= 0;
-			end= max;
-			for (a=0; a<len; a++) {
-				if (a-start+taboffs>=max) {
-					strncpy(wrapbuf, tmp->line+start, end-start);
-					wrapbuf[end-start]= '\0';
-					text_draw(st, wrapbuf, st->left, 0, 1, x, y, tmp->format+start+fmtoffs);
-					y -= st->lheight;
-					start= end;
-					end += max;
-					fmtoffs += taboffs;
-					taboffs= 0;
-				} else if (tmp->line[a]==' ' || tmp->line[a]=='\t' || tmp->line[a]=='-') {
-					if (tmp->line[a]=='\t')
-						taboffs += st->tabnumber-(a-start+taboffs+1)%st->tabnumber;
-					end = a+1;
-				}
-			}
-			text_draw(st, tmp->line+start, st->left, 0, 1, x, y, tmp->format+start+fmtoffs);
+			int lines = text_draw_wrapped(st, tmp->line, x, y, curarea->winx-x, tmp->format);
+			y -= lines*st->lheight;
 		} else {
 			text_draw(st, tmp->line, st->left, 0, 1, x, y, tmp->format);
+			y -= st->lheight;
 		}
-		y -= st->lheight;
 	}
-	MEM_freeN(wrapbuf);
 	
 	draw_brackets(st);
 

From 6a6c23ecd8af6b1216975ad87b1602f618a7a5fd Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Thu, 31 Jul 2008 11:59:06 +0000
Subject: [PATCH 172/252] soc-2008-mxcurioni: moved namespace collision
 resolution to the freestyle_init.py (for Curve, Material and Noise)

---
 .../freestyle/intern/python/BPy_Convert.cpp   |   8 +-
 .../freestyle/intern/python/BPy_Convert.h     |   2 +-
 .../freestyle/intern/python/BPy_Freestyle.cpp |   4 +-
 .../intern/python/BPy_FrsMaterial.cpp         | 407 ------------------
 .../freestyle/intern/python/BPy_Material.cpp  | 407 ++++++++++++++++++
 .../{BPy_FrsMaterial.h => BPy_Material.h}     |  12 +-
 .../Interface1D/FEdge/BPy_FEdgeSharp.cpp      |   4 +-
 .../Interface1D/FEdge/BPy_FEdgeSmooth.cpp     |   2 +-
 .../BPy_UnaryFunction0DMaterial.cpp           |   2 +-
 9 files changed, 424 insertions(+), 424 deletions(-)
 delete mode 100644 source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
 create mode 100644 source/blender/freestyle/intern/python/BPy_Material.cpp
 rename source/blender/freestyle/intern/python/{BPy_FrsMaterial.h => BPy_Material.h} (55%)

diff --git a/source/blender/freestyle/intern/python/BPy_Convert.cpp b/source/blender/freestyle/intern/python/BPy_Convert.cpp
index 0b136b7702f..13e4f332c32 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Convert.cpp
@@ -1,7 +1,7 @@
 #include "BPy_Convert.h"
 
 #include "BPy_BBox.h"
-#include "BPy_FrsMaterial.h"
+#include "BPy_Material.h"
 #include "BPy_Id.h"
 #include "BPy_IntegrationType.h"
 #include "BPy_Interface0D.h"
@@ -188,9 +188,9 @@ PyObject * BPy_ViewShape_from_ViewShape( ViewShape& vs ) {
 	return py_vs;
 }
 
-PyObject * BPy_FrsMaterial_from_Material( Material& m ){
-	PyObject *py_m = FrsMaterial_Type.tp_new( &FrsMaterial_Type, 0, 0 );
-	((BPy_FrsMaterial*) py_m)->m = new Material( m );
+PyObject * BPy_Material_from_Material( Material& m ){
+	PyObject *py_m = Material_Type.tp_new( &Material_Type, 0, 0 );
+	((BPy_Material*) py_m)->m = new Material( m );
 
 	return py_m;
 }
diff --git a/source/blender/freestyle/intern/python/BPy_Convert.h b/source/blender/freestyle/intern/python/BPy_Convert.h
index 4bfaf4c1e17..54999b44f67 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.h
+++ b/source/blender/freestyle/intern/python/BPy_Convert.h
@@ -76,7 +76,7 @@ PyObject * BPy_Id_from_Id( Id& id );
 PyObject * BPy_Interface0D_from_Interface0D( Interface0D& if0D );
 PyObject * BPy_Interface1D_from_Interface1D( Interface1D& if1D );
 PyObject * BPy_IntegrationType_from_IntegrationType( int i );
-PyObject * BPy_FrsMaterial_from_Material( Material& m );
+PyObject * BPy_Material_from_Material( Material& m );
 PyObject * BPy_Nature_from_Nature( unsigned short n );
 PyObject * BPy_MediumType_from_MediumType( int n );
 PyObject * BPy_SShape_from_SShape( SShape& ss );
diff --git a/source/blender/freestyle/intern/python/BPy_Freestyle.cpp b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
index 85a2783102e..6348d30577c 100644
--- a/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
@@ -3,7 +3,7 @@
 #include "BPy_BBox.h"
 #include "BPy_BinaryPredicate0D.h"
 #include "BPy_BinaryPredicate1D.h"
-#include "BPy_FrsMaterial.h"
+#include "BPy_Material.h"
 #include "BPy_Id.h"
 #include "BPy_IntegrationType.h"
 #include "BPy_Interface0D.h"
@@ -147,7 +147,7 @@ PyObject *Freestyle_Init( void )
 	BBox_Init( module );
 	BinaryPredicate0D_Init( module );
 	BinaryPredicate1D_Init( module );
-	FrsMaterial_Init( module );
+	Material_Init( module );
 	Id_Init( module );
 	IntegrationType_Init( module );
 	Interface0D_Init( module );
diff --git a/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp b/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
deleted file mode 100644
index 052583e4621..00000000000
--- a/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
+++ /dev/null
@@ -1,407 +0,0 @@
-#include "BPy_FrsMaterial.h"
-
-#include "BPy_Convert.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-///////////////////////////////////////////////////////////////////////////////////////////
-
-/*---------------  Python API function prototypes for FrsMaterial instance  -----------*/
-static int FrsMaterial___init__(BPy_FrsMaterial *self, PyObject *args, PyObject *kwds);
-static void FrsMaterial___dealloc__(BPy_FrsMaterial *self);
-static PyObject * FrsMaterial___repr__(BPy_FrsMaterial *self);
-
-static PyObject * FrsMaterial_diffuse( BPy_FrsMaterial* self);
-static PyObject * FrsMaterial_diffuseR( BPy_FrsMaterial* self);
-static PyObject * FrsMaterial_diffuseG( BPy_FrsMaterial* self) ;
-static PyObject * FrsMaterial_diffuseB( BPy_FrsMaterial* self) ;
-static PyObject * FrsMaterial_diffuseA( BPy_FrsMaterial* self);
-static PyObject * FrsMaterial_specular( BPy_FrsMaterial* self);
-static PyObject * FrsMaterial_specularR( BPy_FrsMaterial* self);
-static PyObject * FrsMaterial_specularG( BPy_FrsMaterial* self);
-static PyObject * FrsMaterial_specularB( BPy_FrsMaterial* self) ;
-static PyObject * FrsMaterial_specularA( BPy_FrsMaterial* self) ;
-static PyObject * FrsMaterial_ambient( BPy_FrsMaterial* self) ;
-static PyObject * FrsMaterial_ambientR( BPy_FrsMaterial* self);
-static PyObject * FrsMaterial_ambientG( BPy_FrsMaterial* self);
-static PyObject * FrsMaterial_ambientB( BPy_FrsMaterial* self);
-static PyObject * FrsMaterial_ambientA( BPy_FrsMaterial* self);
-static PyObject * FrsMaterial_emission( BPy_FrsMaterial* self);
-static PyObject * FrsMaterial_emissionR( BPy_FrsMaterial* self);
-static PyObject * FrsMaterial_emissionG( BPy_FrsMaterial* self) ;
-static PyObject * FrsMaterial_emissionB( BPy_FrsMaterial* self);
-static PyObject * FrsMaterial_emissionA( BPy_FrsMaterial* self);
-static PyObject * FrsMaterial_shininess( BPy_FrsMaterial* self);
-static PyObject * FrsMaterial_setDiffuse( BPy_FrsMaterial *self, PyObject *args );
-static PyObject * FrsMaterial_setSpecular( BPy_FrsMaterial *self, PyObject *args );
-static PyObject * FrsMaterial_setAmbient( BPy_FrsMaterial *self, PyObject *args );
-static PyObject * FrsMaterial_setEmission( BPy_FrsMaterial *self, PyObject *args );
-static PyObject * FrsMaterial_setShininess( BPy_FrsMaterial *self, PyObject *args );
-
-/*----------------------FrsMaterial instance definitions ----------------------------*/
-static PyMethodDef BPy_FrsMaterial_methods[] = {
-	{"diffuse", ( PyCFunction ) FrsMaterial_diffuse, METH_NOARGS, "() Returns the diffuse color as a 4 float array"},
-	{"diffuseR", ( PyCFunction ) FrsMaterial_diffuseR, METH_NOARGS, "() Returns the red component of the diffuse color "},
-	{"diffuseG", ( PyCFunction ) FrsMaterial_diffuseG, METH_NOARGS, "() Returns the green component of the diffuse color "},
-	{"diffuseB", ( PyCFunction ) FrsMaterial_diffuseB, METH_NOARGS, "() Returns the blue component of the diffuse color "},
-	{"diffuseA", ( PyCFunction ) FrsMaterial_diffuseA, METH_NOARGS, "() Returns the alpha component of the diffuse color "},
-	{"specular", ( PyCFunction ) FrsMaterial_specular, METH_NOARGS, "() Returns the specular color as a 4 float array"},
-	{"specularR", ( PyCFunction ) FrsMaterial_specularR, METH_NOARGS, "() Returns the red component of the specular color "},
-	{"specularG", ( PyCFunction ) FrsMaterial_specularG, METH_NOARGS, "() Returns the green component of the specular color "},
-	{"specularB", ( PyCFunction ) FrsMaterial_specularB, METH_NOARGS, "() Returns the blue component of the specular color "},
-	{"specularA", ( PyCFunction ) FrsMaterial_specularA, METH_NOARGS, "() Returns the alpha component of the specular color "},
-	{"ambient", ( PyCFunction ) FrsMaterial_ambient, METH_NOARGS, "() Returns the ambient color as a 4 float array"},
-	{"ambientR", ( PyCFunction ) FrsMaterial_ambientR, METH_NOARGS, "() Returns the red component of the ambient color "},
-	{"ambientG", ( PyCFunction ) FrsMaterial_ambientG, METH_NOARGS, "() Returns the green component of the ambient color "},
-	{"ambientB", ( PyCFunction ) FrsMaterial_ambientB, METH_NOARGS, "() Returns the blue component of the ambient color "},
-	{"ambientA", ( PyCFunction ) FrsMaterial_ambientA, METH_NOARGS, "() Returns the alpha component of the ambient color "},
-	{"emission", ( PyCFunction ) FrsMaterial_emission, METH_NOARGS, "() Returns the emission color as a 4 float array"},
-	{"emissionR", ( PyCFunction ) FrsMaterial_emissionR, METH_NOARGS, "() Returns the red component of the emission color "},
-	{"emissionG", ( PyCFunction ) FrsMaterial_emissionG, METH_NOARGS, "() Returns the green component of the emission color "},
-	{"emissionB", ( PyCFunction ) FrsMaterial_emissionB, METH_NOARGS, "() Returns the blue component of the emission color "},
-	{"emissionA", ( PyCFunction ) FrsMaterial_emissionA, METH_NOARGS, "() Returns the alpha component of the emission color "},
-	{"shininess", ( PyCFunction ) FrsMaterial_shininess, METH_NOARGS, "() Returns the shininess coefficient "},
-	{"setDiffuse", ( PyCFunction ) FrsMaterial_setDiffuse, METH_NOARGS, "(float r, float g, float b, float a) Sets the diffuse color"},
-	{"setSpecular", ( PyCFunction ) FrsMaterial_setSpecular, METH_NOARGS, "(float r, float g, float b, float a) Sets the specular color"},
-	{"setAmbient", ( PyCFunction ) FrsMaterial_setAmbient, METH_NOARGS, "(float r, float g, float b, float a) Sets the ambient color"},
-	{"setEmission", ( PyCFunction ) FrsMaterial_setEmission, METH_NOARGS, "(float r, float g, float b, float a) Sets the emission color"},
-	{"setShininess", ( PyCFunction ) FrsMaterial_setShininess, METH_NOARGS, "(float r, float g, float b, float a) Sets the shininess color"},
-	{NULL, NULL, 0, NULL}
-};
-
-/*-----------------------BPy_FrsMaterial type definition ------------------------------*/
-
-PyTypeObject FrsMaterial_Type = {
-	PyObject_HEAD_INIT( NULL ) 
-	0,							/* ob_size */
-	"FrsMaterial",				/* tp_name */
-	sizeof( BPy_FrsMaterial ),	/* tp_basicsize */
-	0,							/* tp_itemsize */
-	
-	/* methods */
-	(destructor)FrsMaterial___dealloc__,	/* tp_dealloc */
-	NULL,                       				/* printfunc tp_print; */
-	NULL,                       				/* getattrfunc tp_getattr; */
-	NULL,                       				/* setattrfunc tp_setattr; */
-	NULL,										/* tp_compare */
-	(reprfunc)FrsMaterial___repr__,					/* tp_repr */
-
-	/* Method suites for standard classes */
-
-	NULL,                       /* PyNumberMethods *tp_as_number; */
-	NULL,                       /* PySequenceMethods *tp_as_sequence; */
-	NULL,                       /* PyMappingMethods *tp_as_mapping; */
-
-	/* More standard operations (here for binary compatibility) */
-
-	NULL,						/* hashfunc tp_hash; */
-	NULL,                       /* ternaryfunc tp_call; */
-	NULL,                       /* reprfunc tp_str; */
-	NULL,                       /* getattrofunc tp_getattro; */
-	NULL,                       /* setattrofunc tp_setattro; */
-
-	/* Functions to access object as input/output buffer */
-	NULL,                       /* PyBufferProcs *tp_as_buffer; */
-
-  /*** Flags to define presence of optional/expanded features ***/
-	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
-
-	NULL,                       /*  char *tp_doc;  Documentation string */
-  /*** Assigned meaning in release 2.0 ***/
-	/* call function for all accessible objects */
-	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; */
-
-  /***  weak reference enabler ***/
-	0,                          /* long tp_weaklistoffset; */
-
-  /*** Added in release 2.2 ***/
-	/*   Iterators */
-	NULL,                       /* getiterfunc tp_iter; */
-	NULL,                       /* iternextfunc tp_iternext; */
-
-  /*** Attribute descriptor and subclassing stuff ***/
-	BPy_FrsMaterial_methods,	/* struct PyMethodDef *tp_methods; */
-	NULL,                       	/* struct PyMemberDef *tp_members; */
-	NULL,         					/* struct PyGetSetDef *tp_getset; */
-	NULL,							/* struct _typeobject *tp_base; */
-	NULL,							/* PyObject *tp_dict; */
-	NULL,							/* descrgetfunc tp_descr_get; */
-	NULL,							/* descrsetfunc tp_descr_set; */
-	0,                          	/* long tp_dictoffset; */
-	(initproc)FrsMaterial___init__, /* initproc tp_init; */
-	NULL,							/* allocfunc tp_alloc; */
-	PyType_GenericNew,		/* newfunc tp_new; */
-	
-	/*  Low-level free-memory routine */
-	NULL,                       /* freefunc tp_free;  */
-	
-	/* For PyObject_IS_GC */
-	NULL,                       /* inquiry tp_is_gc;  */
-	NULL,                       /* PyObject *tp_bases; */
-	
-	/* method resolution order */
-	NULL,                       /* PyObject *tp_mro;  */
-	NULL,                       /* PyObject *tp_cache; */
-	NULL,                       /* PyObject *tp_subclasses; */
-	NULL,                       /* PyObject *tp_weaklist; */
-	NULL
-};
-
-//-------------------MODULE INITIALIZATION--------------------------------
-PyMODINIT_FUNC FrsMaterial_Init( PyObject *module )
-{
-	if( module == NULL )
-		return;
-
-	if( PyType_Ready( &FrsMaterial_Type ) < 0 )
-		return;
-
-	Py_INCREF( &FrsMaterial_Type );
-	PyModule_AddObject(module, "FrsMaterial", (PyObject *)&FrsMaterial_Type);
-}
-
-//------------------------INSTANCE METHODS ----------------------------------
-
-int FrsMaterial___init__(BPy_FrsMaterial *self, PyObject *args, PyObject *kwds)
-{
-	PyObject *obj1 = 0;
-	float f1 = 0, f2 = 0., f3 = 0., f4 = 0., f5 = 0.;
-
-    if (! PyArg_ParseTuple(args, "|Offff", &obj1, &f2, &f3, &f4, &f5) )
-        return -1;
-
-	if( !obj1 ){
-		self->m = new Material();
-
-	} else if( BPy_FrsMaterial_Check(obj1) ) {
-		if( ((BPy_FrsMaterial *) obj1)->m )
-			self->m = new Material(*( ((BPy_FrsMaterial *) obj1)->m ));
-		else
-			return -1;
-
-	} else if( PyFloat_Check(obj1) ) {
-		f1 = PyFloat_AsDouble(obj1);
-		self->m = new Material(&f1, &f2, &f3, &f4, f5);
-
-	} else {
-		return -1;
-	}
-
-	return 0;
-}
-
-void FrsMaterial___dealloc__( BPy_FrsMaterial* self)
-{
-	delete self->m;
-    self->ob_type->tp_free((PyObject*)self);
-}
-
-
-PyObject * FrsMaterial___repr__( BPy_FrsMaterial* self)
-{
-    return PyString_FromFormat("FrsMaterial - address: %p", self->m );
-}
-
-PyObject * FrsMaterial_diffuse( BPy_FrsMaterial* self) {
-	PyObject *tmp;
-	
-	const float *diffuse = self->m->diffuse();
-	PyObject *py_diffuse = PyList_New(4);
-	
-	tmp = PyFloat_FromDouble( diffuse[0] ); PyList_SetItem( py_diffuse, 0, tmp); Py_DECREF(tmp);
-	tmp = PyFloat_FromDouble( diffuse[1] ); PyList_SetItem( py_diffuse, 1, tmp); Py_DECREF(tmp);
-	tmp = PyFloat_FromDouble( diffuse[2] ); PyList_SetItem( py_diffuse, 2, tmp); Py_DECREF(tmp);
-	tmp = PyFloat_FromDouble( diffuse[3] ); PyList_SetItem( py_diffuse, 3, tmp); Py_DECREF(tmp);
-	
-	return py_diffuse;
-}
-
-PyObject * FrsMaterial_diffuseR( BPy_FrsMaterial* self) {
-	return PyFloat_FromDouble( self->m->diffuseR() );
-}
-
-PyObject * FrsMaterial_diffuseG( BPy_FrsMaterial* self) {
-	return PyFloat_FromDouble( self->m->diffuseG() );
-}
-
-PyObject * FrsMaterial_diffuseB( BPy_FrsMaterial* self) {
-	return PyFloat_FromDouble( self->m->diffuseB() );
-}
-
-PyObject * FrsMaterial_diffuseA( BPy_FrsMaterial* self) {
-	return PyFloat_FromDouble( self->m->diffuseA() );
-}
-
-PyObject * FrsMaterial_specular( BPy_FrsMaterial* self) {
-	PyObject *tmp;
-	
-	const float *specular = self->m->specular();
-	PyObject *py_specular = PyList_New(4);
-	
-	tmp = PyFloat_FromDouble( specular[0] ); PyList_SetItem( py_specular, 0, tmp); Py_DECREF(tmp);
-	tmp = PyFloat_FromDouble( specular[1] ); PyList_SetItem( py_specular, 1, tmp); Py_DECREF(tmp);
-	tmp = PyFloat_FromDouble( specular[2] ); PyList_SetItem( py_specular, 2, tmp); Py_DECREF(tmp);
-	tmp = PyFloat_FromDouble( specular[3] ); PyList_SetItem( py_specular, 3, tmp); Py_DECREF(tmp);
-	
-	return py_specular;
-}
-
-PyObject * FrsMaterial_specularR( BPy_FrsMaterial* self) {
-	return PyFloat_FromDouble( self->m->specularR() );
-}
-
-PyObject * FrsMaterial_specularG( BPy_FrsMaterial* self) {
-	return PyFloat_FromDouble( self->m->specularG() );
-}
-
-PyObject * FrsMaterial_specularB( BPy_FrsMaterial* self) {
-	return PyFloat_FromDouble( self->m->specularB() );
-}
-
-PyObject * FrsMaterial_specularA( BPy_FrsMaterial* self) {
-	return PyFloat_FromDouble( self->m->specularA() );
-}
-
-PyObject * FrsMaterial_ambient( BPy_FrsMaterial* self) {
-	PyObject *tmp;
-	
-	const float *ambient = self->m->ambient();
-	PyObject *py_ambient = PyList_New(4);
-	
-	tmp = PyFloat_FromDouble( ambient[0] ); PyList_SetItem(	py_ambient, 0, tmp); Py_DECREF(tmp);
-	tmp = PyFloat_FromDouble( ambient[1] ); PyList_SetItem(	py_ambient, 1, tmp); Py_DECREF(tmp);
-	tmp = PyFloat_FromDouble( ambient[2] ); PyList_SetItem(	py_ambient, 2, tmp); Py_DECREF(tmp);
-	tmp = PyFloat_FromDouble( ambient[3] ); PyList_SetItem(	py_ambient, 3, tmp); Py_DECREF(tmp);
-	
-	return py_ambient;
-}
-
-PyObject * FrsMaterial_ambientR( BPy_FrsMaterial* self) {
-	return PyFloat_FromDouble( self->m->ambientR() );
-}
-
-PyObject * FrsMaterial_ambientG( BPy_FrsMaterial* self) {
-	return PyFloat_FromDouble( self->m->ambientG() );
-}
-
-PyObject * FrsMaterial_ambientB( BPy_FrsMaterial* self) {
-	return PyFloat_FromDouble( self->m->ambientB() );
-}
-
-PyObject * FrsMaterial_ambientA( BPy_FrsMaterial* self) {
-	return PyFloat_FromDouble( self->m->ambientA() );
-}
-
-PyObject * FrsMaterial_emission( BPy_FrsMaterial* self) {
-	PyObject *tmp;
-	
-	const float *emission = self->m->emission();
-	PyObject *py_emission = PyList_New(4);
-	
-	tmp = PyFloat_FromDouble( emission[0] ); PyList_SetItem( py_emission, 0, tmp); Py_DECREF(tmp);
-	tmp = PyFloat_FromDouble( emission[1] ); PyList_SetItem( py_emission, 1, tmp); Py_DECREF(tmp);
-	tmp = PyFloat_FromDouble( emission[2] ); PyList_SetItem( py_emission, 2, tmp); Py_DECREF(tmp);
-	tmp = PyFloat_FromDouble( emission[3] ); PyList_SetItem( py_emission, 3, tmp); Py_DECREF(tmp);
-	
-	return py_emission;
-}
-
-PyObject * FrsMaterial_emissionR( BPy_FrsMaterial* self) {
-	return PyFloat_FromDouble( self->m->emissionR() );
-}
-
-PyObject * FrsMaterial_emissionG( BPy_FrsMaterial* self) {
-	return PyFloat_FromDouble( self->m->emissionG() );
-}
-
-PyObject * FrsMaterial_emissionB( BPy_FrsMaterial* self) {
-	return PyFloat_FromDouble( self->m->emissionB() );
-}
-
-PyObject * FrsMaterial_emissionA( BPy_FrsMaterial* self) {
-	return PyFloat_FromDouble( self->m->emissionA() );
-}
-
-PyObject * FrsMaterial_shininess( BPy_FrsMaterial* self) {
-	return PyFloat_FromDouble( self->m->shininess() );
-}
-
-PyObject * FrsMaterial_setDiffuse( BPy_FrsMaterial *self, PyObject *args ) {
-	float f1, f2, f3, f4;
-
-	if(!( PyArg_ParseTuple(args, "ffff", &f1, &f2, &f3, &f4)  )) {
-		cout << "ERROR: FrsMaterial_setDiffuse" << endl;
-		Py_RETURN_NONE;
-	}
-
-	self->m->setDiffuse(f1, f2, f3, f4);
-
-	Py_RETURN_NONE;
-}
- 
-PyObject * FrsMaterial_setSpecular( BPy_FrsMaterial *self, PyObject *args ) {
-	float f1, f2, f3, f4;
-
-	if(!( PyArg_ParseTuple(args, "ffff", &f1, &f2, &f3, &f4)  )) {
-		cout << "ERROR: FrsMaterial_setSpecular" << endl;
-		Py_RETURN_NONE;
-	}
-
-	self->m->setSpecular(f1, f2, f3, f4);
-
-	Py_RETURN_NONE;
-}
-
-PyObject * FrsMaterial_setAmbient( BPy_FrsMaterial *self, PyObject *args ) {
-	float f1, f2, f3, f4;
-
-	if(!( PyArg_ParseTuple(args, "ffff", &f1, &f2, &f3, &f4)  )) {
-		cout << "ERROR: FrsMaterial_setAmbient" << endl;
-		Py_RETURN_NONE;
-	}
-
-	self->m->setAmbient(f1, f2, f3, f4);
-
-	Py_RETURN_NONE;
-}
-
-PyObject * FrsMaterial_setEmission( BPy_FrsMaterial *self, PyObject *args ) {
-	float f1, f2, f3, f4;
-
-	if(!( PyArg_ParseTuple(args, "ffff", &f1, &f2, &f3, &f4)  )) {
-		cout << "ERROR: FrsMaterial_setEmission" << endl;
-		Py_RETURN_NONE;
-	}
-
-	self->m->setEmission(f1, f2, f3, f4);
-
-	Py_RETURN_NONE;
-}
-
-PyObject * FrsMaterial_setShininess( BPy_FrsMaterial *self, PyObject *args ) {
-	float f;
-
-	if(!( PyArg_ParseTuple(args, "f", &f)  )) {
-		cout << "ERROR: FrsMaterial_setShininess" << endl;
-		Py_RETURN_NONE;
-	}
-
-	self->m->setShininess(f);
-
-	Py_RETURN_NONE;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/source/blender/freestyle/intern/python/BPy_Material.cpp b/source/blender/freestyle/intern/python/BPy_Material.cpp
new file mode 100644
index 00000000000..7f871c34c3c
--- /dev/null
+++ b/source/blender/freestyle/intern/python/BPy_Material.cpp
@@ -0,0 +1,407 @@
+#include "BPy_Material.h"
+
+#include "BPy_Convert.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for Material instance  -----------*/
+static int Material___init__(BPy_Material *self, PyObject *args, PyObject *kwds);
+static void Material___dealloc__(BPy_Material *self);
+static PyObject * Material___repr__(BPy_Material *self);
+
+static PyObject * Material_diffuse( BPy_Material* self);
+static PyObject * Material_diffuseR( BPy_Material* self);
+static PyObject * Material_diffuseG( BPy_Material* self) ;
+static PyObject * Material_diffuseB( BPy_Material* self) ;
+static PyObject * Material_diffuseA( BPy_Material* self);
+static PyObject * Material_specular( BPy_Material* self);
+static PyObject * Material_specularR( BPy_Material* self);
+static PyObject * Material_specularG( BPy_Material* self);
+static PyObject * Material_specularB( BPy_Material* self) ;
+static PyObject * Material_specularA( BPy_Material* self) ;
+static PyObject * Material_ambient( BPy_Material* self) ;
+static PyObject * Material_ambientR( BPy_Material* self);
+static PyObject * Material_ambientG( BPy_Material* self);
+static PyObject * Material_ambientB( BPy_Material* self);
+static PyObject * Material_ambientA( BPy_Material* self);
+static PyObject * Material_emission( BPy_Material* self);
+static PyObject * Material_emissionR( BPy_Material* self);
+static PyObject * Material_emissionG( BPy_Material* self) ;
+static PyObject * Material_emissionB( BPy_Material* self);
+static PyObject * Material_emissionA( BPy_Material* self);
+static PyObject * Material_shininess( BPy_Material* self);
+static PyObject * Material_setDiffuse( BPy_Material *self, PyObject *args );
+static PyObject * Material_setSpecular( BPy_Material *self, PyObject *args );
+static PyObject * Material_setAmbient( BPy_Material *self, PyObject *args );
+static PyObject * Material_setEmission( BPy_Material *self, PyObject *args );
+static PyObject * Material_setShininess( BPy_Material *self, PyObject *args );
+
+/*----------------------Material instance definitions ----------------------------*/
+static PyMethodDef BPy_Material_methods[] = {
+	{"diffuse", ( PyCFunction ) Material_diffuse, METH_NOARGS, "() Returns the diffuse color as a 4 float array"},
+	{"diffuseR", ( PyCFunction ) Material_diffuseR, METH_NOARGS, "() Returns the red component of the diffuse color "},
+	{"diffuseG", ( PyCFunction ) Material_diffuseG, METH_NOARGS, "() Returns the green component of the diffuse color "},
+	{"diffuseB", ( PyCFunction ) Material_diffuseB, METH_NOARGS, "() Returns the blue component of the diffuse color "},
+	{"diffuseA", ( PyCFunction ) Material_diffuseA, METH_NOARGS, "() Returns the alpha component of the diffuse color "},
+	{"specular", ( PyCFunction ) Material_specular, METH_NOARGS, "() Returns the specular color as a 4 float array"},
+	{"specularR", ( PyCFunction ) Material_specularR, METH_NOARGS, "() Returns the red component of the specular color "},
+	{"specularG", ( PyCFunction ) Material_specularG, METH_NOARGS, "() Returns the green component of the specular color "},
+	{"specularB", ( PyCFunction ) Material_specularB, METH_NOARGS, "() Returns the blue component of the specular color "},
+	{"specularA", ( PyCFunction ) Material_specularA, METH_NOARGS, "() Returns the alpha component of the specular color "},
+	{"ambient", ( PyCFunction ) Material_ambient, METH_NOARGS, "() Returns the ambient color as a 4 float array"},
+	{"ambientR", ( PyCFunction ) Material_ambientR, METH_NOARGS, "() Returns the red component of the ambient color "},
+	{"ambientG", ( PyCFunction ) Material_ambientG, METH_NOARGS, "() Returns the green component of the ambient color "},
+	{"ambientB", ( PyCFunction ) Material_ambientB, METH_NOARGS, "() Returns the blue component of the ambient color "},
+	{"ambientA", ( PyCFunction ) Material_ambientA, METH_NOARGS, "() Returns the alpha component of the ambient color "},
+	{"emission", ( PyCFunction ) Material_emission, METH_NOARGS, "() Returns the emission color as a 4 float array"},
+	{"emissionR", ( PyCFunction ) Material_emissionR, METH_NOARGS, "() Returns the red component of the emission color "},
+	{"emissionG", ( PyCFunction ) Material_emissionG, METH_NOARGS, "() Returns the green component of the emission color "},
+	{"emissionB", ( PyCFunction ) Material_emissionB, METH_NOARGS, "() Returns the blue component of the emission color "},
+	{"emissionA", ( PyCFunction ) Material_emissionA, METH_NOARGS, "() Returns the alpha component of the emission color "},
+	{"shininess", ( PyCFunction ) Material_shininess, METH_NOARGS, "() Returns the shininess coefficient "},
+	{"setDiffuse", ( PyCFunction ) Material_setDiffuse, METH_NOARGS, "(float r, float g, float b, float a) Sets the diffuse color"},
+	{"setSpecular", ( PyCFunction ) Material_setSpecular, METH_NOARGS, "(float r, float g, float b, float a) Sets the specular color"},
+	{"setAmbient", ( PyCFunction ) Material_setAmbient, METH_NOARGS, "(float r, float g, float b, float a) Sets the ambient color"},
+	{"setEmission", ( PyCFunction ) Material_setEmission, METH_NOARGS, "(float r, float g, float b, float a) Sets the emission color"},
+	{"setShininess", ( PyCFunction ) Material_setShininess, METH_NOARGS, "(float r, float g, float b, float a) Sets the shininess color"},
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_Material type definition ------------------------------*/
+
+PyTypeObject Material_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"Material",				/* tp_name */
+	sizeof( BPy_Material ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	(destructor)Material___dealloc__,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	(reprfunc)Material___repr__,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	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; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_Material_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	NULL,							/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)Material___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	PyType_GenericNew,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+PyMODINIT_FUNC Material_Init( PyObject *module )
+{
+	if( module == NULL )
+		return;
+
+	if( PyType_Ready( &Material_Type ) < 0 )
+		return;
+
+	Py_INCREF( &Material_Type );
+	PyModule_AddObject(module, "Material", (PyObject *)&Material_Type);
+}
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int Material___init__(BPy_Material *self, PyObject *args, PyObject *kwds)
+{
+	PyObject *obj1 = 0;
+	float f1 = 0, f2 = 0., f3 = 0., f4 = 0., f5 = 0.;
+
+    if (! PyArg_ParseTuple(args, "|Offff", &obj1, &f2, &f3, &f4, &f5) )
+        return -1;
+
+	if( !obj1 ){
+		self->m = new Material();
+
+	} else if( BPy_Material_Check(obj1) ) {
+		if( ((BPy_Material *) obj1)->m )
+			self->m = new Material(*( ((BPy_Material *) obj1)->m ));
+		else
+			return -1;
+
+	} else if( PyFloat_Check(obj1) ) {
+		f1 = PyFloat_AsDouble(obj1);
+		self->m = new Material(&f1, &f2, &f3, &f4, f5);
+
+	} else {
+		return -1;
+	}
+
+	return 0;
+}
+
+void Material___dealloc__( BPy_Material* self)
+{
+	delete self->m;
+    self->ob_type->tp_free((PyObject*)self);
+}
+
+
+PyObject * Material___repr__( BPy_Material* self)
+{
+    return PyString_FromFormat("Material - address: %p", self->m );
+}
+
+PyObject * Material_diffuse( BPy_Material* self) {
+	PyObject *tmp;
+	
+	const float *diffuse = self->m->diffuse();
+	PyObject *py_diffuse = PyList_New(4);
+	
+	tmp = PyFloat_FromDouble( diffuse[0] ); PyList_SetItem( py_diffuse, 0, tmp); Py_DECREF(tmp);
+	tmp = PyFloat_FromDouble( diffuse[1] ); PyList_SetItem( py_diffuse, 1, tmp); Py_DECREF(tmp);
+	tmp = PyFloat_FromDouble( diffuse[2] ); PyList_SetItem( py_diffuse, 2, tmp); Py_DECREF(tmp);
+	tmp = PyFloat_FromDouble( diffuse[3] ); PyList_SetItem( py_diffuse, 3, tmp); Py_DECREF(tmp);
+	
+	return py_diffuse;
+}
+
+PyObject * Material_diffuseR( BPy_Material* self) {
+	return PyFloat_FromDouble( self->m->diffuseR() );
+}
+
+PyObject * Material_diffuseG( BPy_Material* self) {
+	return PyFloat_FromDouble( self->m->diffuseG() );
+}
+
+PyObject * Material_diffuseB( BPy_Material* self) {
+	return PyFloat_FromDouble( self->m->diffuseB() );
+}
+
+PyObject * Material_diffuseA( BPy_Material* self) {
+	return PyFloat_FromDouble( self->m->diffuseA() );
+}
+
+PyObject * Material_specular( BPy_Material* self) {
+	PyObject *tmp;
+	
+	const float *specular = self->m->specular();
+	PyObject *py_specular = PyList_New(4);
+	
+	tmp = PyFloat_FromDouble( specular[0] ); PyList_SetItem( py_specular, 0, tmp); Py_DECREF(tmp);
+	tmp = PyFloat_FromDouble( specular[1] ); PyList_SetItem( py_specular, 1, tmp); Py_DECREF(tmp);
+	tmp = PyFloat_FromDouble( specular[2] ); PyList_SetItem( py_specular, 2, tmp); Py_DECREF(tmp);
+	tmp = PyFloat_FromDouble( specular[3] ); PyList_SetItem( py_specular, 3, tmp); Py_DECREF(tmp);
+	
+	return py_specular;
+}
+
+PyObject * Material_specularR( BPy_Material* self) {
+	return PyFloat_FromDouble( self->m->specularR() );
+}
+
+PyObject * Material_specularG( BPy_Material* self) {
+	return PyFloat_FromDouble( self->m->specularG() );
+}
+
+PyObject * Material_specularB( BPy_Material* self) {
+	return PyFloat_FromDouble( self->m->specularB() );
+}
+
+PyObject * Material_specularA( BPy_Material* self) {
+	return PyFloat_FromDouble( self->m->specularA() );
+}
+
+PyObject * Material_ambient( BPy_Material* self) {
+	PyObject *tmp;
+	
+	const float *ambient = self->m->ambient();
+	PyObject *py_ambient = PyList_New(4);
+	
+	tmp = PyFloat_FromDouble( ambient[0] ); PyList_SetItem(	py_ambient, 0, tmp); Py_DECREF(tmp);
+	tmp = PyFloat_FromDouble( ambient[1] ); PyList_SetItem(	py_ambient, 1, tmp); Py_DECREF(tmp);
+	tmp = PyFloat_FromDouble( ambient[2] ); PyList_SetItem(	py_ambient, 2, tmp); Py_DECREF(tmp);
+	tmp = PyFloat_FromDouble( ambient[3] ); PyList_SetItem(	py_ambient, 3, tmp); Py_DECREF(tmp);
+	
+	return py_ambient;
+}
+
+PyObject * Material_ambientR( BPy_Material* self) {
+	return PyFloat_FromDouble( self->m->ambientR() );
+}
+
+PyObject * Material_ambientG( BPy_Material* self) {
+	return PyFloat_FromDouble( self->m->ambientG() );
+}
+
+PyObject * Material_ambientB( BPy_Material* self) {
+	return PyFloat_FromDouble( self->m->ambientB() );
+}
+
+PyObject * Material_ambientA( BPy_Material* self) {
+	return PyFloat_FromDouble( self->m->ambientA() );
+}
+
+PyObject * Material_emission( BPy_Material* self) {
+	PyObject *tmp;
+	
+	const float *emission = self->m->emission();
+	PyObject *py_emission = PyList_New(4);
+	
+	tmp = PyFloat_FromDouble( emission[0] ); PyList_SetItem( py_emission, 0, tmp); Py_DECREF(tmp);
+	tmp = PyFloat_FromDouble( emission[1] ); PyList_SetItem( py_emission, 1, tmp); Py_DECREF(tmp);
+	tmp = PyFloat_FromDouble( emission[2] ); PyList_SetItem( py_emission, 2, tmp); Py_DECREF(tmp);
+	tmp = PyFloat_FromDouble( emission[3] ); PyList_SetItem( py_emission, 3, tmp); Py_DECREF(tmp);
+	
+	return py_emission;
+}
+
+PyObject * Material_emissionR( BPy_Material* self) {
+	return PyFloat_FromDouble( self->m->emissionR() );
+}
+
+PyObject * Material_emissionG( BPy_Material* self) {
+	return PyFloat_FromDouble( self->m->emissionG() );
+}
+
+PyObject * Material_emissionB( BPy_Material* self) {
+	return PyFloat_FromDouble( self->m->emissionB() );
+}
+
+PyObject * Material_emissionA( BPy_Material* self) {
+	return PyFloat_FromDouble( self->m->emissionA() );
+}
+
+PyObject * Material_shininess( BPy_Material* self) {
+	return PyFloat_FromDouble( self->m->shininess() );
+}
+
+PyObject * Material_setDiffuse( BPy_Material *self, PyObject *args ) {
+	float f1, f2, f3, f4;
+
+	if(!( PyArg_ParseTuple(args, "ffff", &f1, &f2, &f3, &f4)  )) {
+		cout << "ERROR: Material_setDiffuse" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->m->setDiffuse(f1, f2, f3, f4);
+
+	Py_RETURN_NONE;
+}
+ 
+PyObject * Material_setSpecular( BPy_Material *self, PyObject *args ) {
+	float f1, f2, f3, f4;
+
+	if(!( PyArg_ParseTuple(args, "ffff", &f1, &f2, &f3, &f4)  )) {
+		cout << "ERROR: Material_setSpecular" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->m->setSpecular(f1, f2, f3, f4);
+
+	Py_RETURN_NONE;
+}
+
+PyObject * Material_setAmbient( BPy_Material *self, PyObject *args ) {
+	float f1, f2, f3, f4;
+
+	if(!( PyArg_ParseTuple(args, "ffff", &f1, &f2, &f3, &f4)  )) {
+		cout << "ERROR: Material_setAmbient" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->m->setAmbient(f1, f2, f3, f4);
+
+	Py_RETURN_NONE;
+}
+
+PyObject * Material_setEmission( BPy_Material *self, PyObject *args ) {
+	float f1, f2, f3, f4;
+
+	if(!( PyArg_ParseTuple(args, "ffff", &f1, &f2, &f3, &f4)  )) {
+		cout << "ERROR: Material_setEmission" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->m->setEmission(f1, f2, f3, f4);
+
+	Py_RETURN_NONE;
+}
+
+PyObject * Material_setShininess( BPy_Material *self, PyObject *args ) {
+	float f;
+
+	if(!( PyArg_ParseTuple(args, "f", &f)  )) {
+		cout << "ERROR: Material_setShininess" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->m->setShininess(f);
+
+	Py_RETURN_NONE;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/BPy_FrsMaterial.h b/source/blender/freestyle/intern/python/BPy_Material.h
similarity index 55%
rename from source/blender/freestyle/intern/python/BPy_FrsMaterial.h
rename to source/blender/freestyle/intern/python/BPy_Material.h
index cb1aa20bb21..e1c31864b63 100644
--- a/source/blender/freestyle/intern/python/BPy_FrsMaterial.h
+++ b/source/blender/freestyle/intern/python/BPy_Material.h
@@ -11,19 +11,19 @@ extern "C" {
 
 #include <Python.h>
 
-extern PyTypeObject FrsMaterial_Type;
+extern PyTypeObject Material_Type;
 
-#define BPy_FrsMaterial_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &FrsMaterial_Type)  )
+#define BPy_Material_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Material_Type)  )
 
-/*---------------------------Python BPy_FrsMaterial structure definition----------*/
+/*---------------------------Python BPy_Material structure definition----------*/
 typedef struct {
 	PyObject_HEAD
 	Material *m;
-} BPy_FrsMaterial;
+} BPy_Material;
 
-/*---------------------------Python BPy_FrsMaterial visible prototypes-----------*/
+/*---------------------------Python BPy_Material visible prototypes-----------*/
 
-PyMODINIT_FUNC FrsMaterial_Init( PyObject *module );
+PyMODINIT_FUNC Material_Init( PyObject *module );
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
index 22a4dbc378e..8911cc7f290 100644
--- a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
@@ -175,12 +175,12 @@ PyObject * FEdgeSharp_bMaterialIndex( BPy_FEdgeSharp *self ) {
 
 PyObject * FEdgeSharp_aMaterial( BPy_FEdgeSharp *self ) {
 	Material m( self->fes->aMaterial() );
-	return BPy_FrsMaterial_from_Material(m);
+	return BPy_Material_from_Material(m);
 }
 
 PyObject * FEdgeSharp_bMaterial( BPy_FEdgeSharp *self ) {
 	Material m( self->fes->aMaterial() );
-	return BPy_FrsMaterial_from_Material(m);
+	return BPy_Material_from_Material(m);
 }
 
 PyObject * FEdgeSharp_setNormalA( BPy_FEdgeSharp *self, PyObject *args ) {
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp
index 6a11b6c1e98..52b501e0746 100644
--- a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp
@@ -158,7 +158,7 @@ PyObject * FEdgeSmooth_materialIndex( BPy_FEdgeSmooth *self ) {
 
 PyObject * FEdgeSmooth_material( BPy_FEdgeSmooth *self ) {
 	Material m( self->fes->material() );
-	return BPy_FrsMaterial_from_Material(m);
+	return BPy_Material_from_Material(m);
 }
 
 PyObject * FEdgeSmooth_setNormal( BPy_FEdgeSmooth *self, PyObject *args ) {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp
index 733acce6ab8..f524eb25352 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp
@@ -165,7 +165,7 @@ PyObject * UnaryFunction0DMaterial___call__( BPy_UnaryFunction0DMaterial *self,
 	}
 	
 	Material m( self->uf0D_material->operator()(*( ((BPy_Interface0DIterator *) obj)->if0D_it )) );
-	return BPy_FrsMaterial_from_Material( m );
+	return BPy_Material_from_Material( m );
 
 }
 

From baf20b803feed2f354511971284421c628a59848 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Thu, 31 Jul 2008 17:54:21 +0000
Subject: [PATCH 173/252] Selected two closest nodes when joining subgraphs,
 not just closest on one side with first on other side. (helps get good result
 out of high joining threshold)

---
 source/blender/src/reeb.c | 107 ++++++++++++++++++++------------------
 1 file changed, 55 insertions(+), 52 deletions(-)

diff --git a/source/blender/src/reeb.c b/source/blender/src/reeb.c
index 25107706c7b..e03168025b1 100644
--- a/source/blender/src/reeb.c
+++ b/source/blender/src/reeb.c
@@ -1122,16 +1122,14 @@ int joinSubgraphsEnds(ReebGraph *rg, float threshold, int nb_subgraphs)
 	
 	for (subgraph = 1; subgraph <= nb_subgraphs; subgraph++)
 	{
-		ReebNode *start_node, *end_node, *next_node;
+		ReebNode *start_node, *end_node;
+		ReebNode *min_node_start, *min_node_end = NULL;
+		float min_distance = FLT_MAX;
 		
-		for (start_node = rg->nodes.first; start_node; start_node = next_node)
+		for (start_node = rg->nodes.first; start_node; start_node = start_node->next)
 		{
-			next_node = start_node->next;
-			
 			if (start_node->flag == subgraph && start_node->degree == 1)
 			{
-				ReebNode *min_node = NULL;
-				float min_distance = FLT_MAX;
 				
 				for (end_node = rg->nodes.first; end_node; end_node = end_node->next)
 				{
@@ -1142,57 +1140,58 @@ int joinSubgraphsEnds(ReebGraph *rg, float threshold, int nb_subgraphs)
 						if (distance < threshold && distance < min_distance)
 						{
 							min_distance = distance;
-							min_node = end_node;
+							min_node_end = end_node;
+							min_node_start = start_node;
 						}
 					}
 				}
-				
-				end_node = min_node;
-				
-				if (end_node)
-				{
-					ReebArc *start_arc, *end_arc;
-					int merging = 0;
-					
-					start_arc = start_node->arcs[0];
-					end_arc = end_node->arcs[0];
-					
-					if (start_arc->tail == start_node)
-					{
-						reweightSubgraph(rg, end_node, start_node->weight);
-						
-						start_arc->tail = end_node;
-						
-						merging = 1;
-					}
-					else if (start_arc->head == start_node)
-					{
-						reweightSubgraph(rg, start_node, end_node->weight);
-
-						start_arc->head = end_node;
-
-						merging = 1;
-					}
-					
-
-					if (merging)
-					{
-						BLI_ReflagSubgraph((BGraph*)rg, end_node->flag, subgraph);
-											
-						resizeArcBuckets(start_arc);
-						fillArcEmptyBuckets(start_arc);
-						
-						NodeDegreeIncrement(rg, end_node);
-						BLI_rebuildAdjacencyListForNode((BGraph*)rg, (BNode*)end_node);
-						
-						BLI_removeNode((BGraph*)rg, (BNode*)start_node);
-					}
-					
-					joined = 1;
-					break;
-				}
 			}
 		}
+		
+		end_node = min_node_end;
+		start_node = min_node_start;
+		
+		if (end_node && start_node)
+		{
+			ReebArc *start_arc, *end_arc;
+			int merging = 0;
+			
+			start_arc = start_node->arcs[0];
+			end_arc = end_node->arcs[0];
+			
+			if (start_arc->tail == start_node)
+			{
+				reweightSubgraph(rg, end_node, start_node->weight);
+				
+				start_arc->tail = end_node;
+				
+				merging = 1;
+			}
+			else if (start_arc->head == start_node)
+			{
+				reweightSubgraph(rg, start_node, end_node->weight);
+
+				start_arc->head = end_node;
+
+				merging = 1;
+			}
+			
+
+			if (merging)
+			{
+				BLI_ReflagSubgraph((BGraph*)rg, end_node->flag, subgraph);
+									
+				resizeArcBuckets(start_arc);
+				fillArcEmptyBuckets(start_arc);
+				
+				NodeDegreeIncrement(rg, end_node);
+				BLI_rebuildAdjacencyListForNode((BGraph*)rg, (BNode*)end_node);
+				
+				BLI_removeNode((BGraph*)rg, (BNode*)start_node);
+			}
+			
+			joined = 1;
+		}		
 	}
 	
 	return joined;
@@ -1205,6 +1204,10 @@ int joinSubgraphs(ReebGraph *rg, float threshold)
 	
 	BLI_buildAdjacencyList((BGraph*)rg);
 	
+	
+	/* sort nodes before flagging subgraphs to make sure root node is subgraph 0 */
+	sortNodes(rg);
+	
 	nb_subgraphs = BLI_FlagSubgraphs((BGraph*)rg);
 	
 	if (nb_subgraphs > 1)

From 2c4a1bf3819a8f9aa027c7231cef9ade8762bea7 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Thu, 31 Jul 2008 18:16:01 +0000
Subject: [PATCH 174/252] Accidentally removed too many BIF_ThemeColors
 resulting in funny colours for non-syntax-highlighted text.

---
 source/blender/src/drawtext.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index f4f8ebf3158..3cd552c563b 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -92,12 +92,12 @@
 Notes on word-wrap
 --
 All word-wrap functions follow the algorithm below to maintain consistency.
-	line		The line to wrap
+	line		The line to wrap (tabs converted to spaces)
 	view_width	The maximum number of characters displayable in the region
 				This equals region_width/font_width for the region
 	wrap_chars	Characters that allow wrapping. This equals [' ', '\t', '-']
 
-def wrap(line, view_width, wrap_chars, tab_size):
+def wrap(line, view_width, wrap_chars):
 	draw_start = 0
 	draw_end = view_width
 	pos = 0
@@ -106,7 +106,6 @@ def wrap(line, view_width, wrap_chars, tab_size):
 			print line[draw_start:draw_end]
 			draw_start = draw_end
 			draw_end += view_width
-			tab_offset = 0
 		elif c in wrap_chars:
 			draw_end = pos+1
 		pos += 1
@@ -1291,6 +1290,7 @@ void drawtextspace(ScrArea *sa, void *spacedata)
 	y= curarea->winy-st->lheight;
 	x= st->showlinenrs ? TXT_OFFSET + TEXTXLOC : TXT_OFFSET;
 
+	BIF_ThemeColor(TH_TEXT);
 	for (i=0; y>0 && i<st->viewlines && tmp; i++, tmp= tmp->next) {
 		if (st->showsyntax && !tmp->format) {
 			txt_format_line(st, tmp, 0);

From 149f3688a4663dbaf890f6f5e5a41c35ce6d5e56 Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Fri, 1 Aug 2008 02:15:25 +0000
Subject: [PATCH 175/252] soc-2008-mxcurioni: moved Curve to FrsCurve, fixed
 bugs with some style modules having with strokes without a representation and
 iterators not being correctly routed. For example, the cartoon style module
 should work now.

---
 .../freestyle/intern/python/BPy_Convert.cpp   | 35 ++++---
 .../freestyle/intern/python/BPy_Freestyle.cpp |  4 +-
 .../{BPy_Noise.cpp => BPy_FrsNoise.cpp}       | 94 +++++++++----------
 .../freestyle/intern/python/BPy_FrsNoise.h    | 36 +++++++
 .../intern/python/BPy_Interface1D.cpp         |  8 +-
 .../freestyle/intern/python/BPy_Iterator.cpp  |  3 -
 .../freestyle/intern/python/BPy_Noise.h       | 36 -------
 .../freestyle/intern/python/Director.cpp      | 23 ++++-
 .../freestyle/intern/python/Director.h        |  7 +-
 .../{BPy_Curve.cpp => BPy_FrsCurve.cpp}       | 82 ++++++++--------
 .../{BPy_Curve.h => BPy_FrsCurve.h}           | 14 +--
 .../python/Interface1D/Curve/BPy_Chain.cpp    |  2 +-
 .../python/Interface1D/Curve/BPy_Chain.h      |  4 +-
 .../python/Iterator/BPy_AdjacencyIterator.cpp |  1 +
 .../Iterator/BPy_ChainPredicateIterator.cpp   |  1 +
 .../Iterator/BPy_Interface0DIterator.cpp      |  2 +-
 .../python/Iterator/BPy_ViewEdgeIterator.cpp  |  2 +-
 17 files changed, 195 insertions(+), 159 deletions(-)
 rename source/blender/freestyle/intern/python/{BPy_Noise.cpp => BPy_FrsNoise.cpp} (60%)
 create mode 100644 source/blender/freestyle/intern/python/BPy_FrsNoise.h
 delete mode 100644 source/blender/freestyle/intern/python/BPy_Noise.h
 rename source/blender/freestyle/intern/python/Interface1D/{BPy_Curve.cpp => BPy_FrsCurve.cpp} (60%)
 rename source/blender/freestyle/intern/python/Interface1D/{BPy_Curve.h => BPy_FrsCurve.h} (53%)

diff --git a/source/blender/freestyle/intern/python/BPy_Convert.cpp b/source/blender/freestyle/intern/python/BPy_Convert.cpp
index 13e4f332c32..53a4e171e74 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Convert.cpp
@@ -30,6 +30,8 @@
 #include "Iterator/BPy_ViewEdgeIterator.h"
 #include "Iterator/BPy_orientedViewEdgeIterator.h"
 
+#include "../stroke/StrokeRep.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -242,6 +244,7 @@ Stroke::MediumType MediumType_from_BPy_MediumType( PyObject* obj ) {
 PyObject * BPy_AdjacencyIterator_from_AdjacencyIterator( AdjacencyIterator& a_it ) {
 	PyObject *py_a_it = AdjacencyIterator_Type.tp_new( &AdjacencyIterator_Type, 0, 0 );
 	((BPy_AdjacencyIterator *) py_a_it)->a_it = new AdjacencyIterator( a_it );
+	((BPy_AdjacencyIterator *) py_a_it)->py_it.it = ((BPy_AdjacencyIterator *) py_a_it)->a_it;
 
 	return py_a_it;
 }
@@ -249,62 +252,72 @@ PyObject * BPy_AdjacencyIterator_from_AdjacencyIterator( AdjacencyIterator& a_it
 PyObject * BPy_Interface0DIterator_from_Interface0DIterator( Interface0DIterator& if0D_it ) {
 	PyObject *py_if0D_it = Interface0DIterator_Type.tp_new( &Interface0DIterator_Type, 0, 0 );
 	((BPy_Interface0DIterator *) py_if0D_it)->if0D_it = new Interface0DIterator( if0D_it );
+	((BPy_Interface0DIterator *) py_if0D_it)->py_it.it = ((BPy_Interface0DIterator *) py_if0D_it)->if0D_it;
 
 	return py_if0D_it;
 }
 
 PyObject * BPy_CurvePointIterator_from_CurvePointIterator( CurveInternal::CurvePointIterator& cp_it ) {
 	PyObject *py_cp_it = CurvePointIterator_Type.tp_new( &CurvePointIterator_Type, 0, 0 );
-	((BPy_CurvePointIterator*) py_cp_it)->cp_it = new CurveInternal::CurvePointIterator( cp_it );
+	((BPy_CurvePointIterator *) py_cp_it)->cp_it = new CurveInternal::CurvePointIterator( cp_it );
+	((BPy_CurvePointIterator *) py_cp_it)->py_it.it = ((BPy_CurvePointIterator *) py_cp_it)->cp_it;
 
 	return py_cp_it;
 }
 
 PyObject * BPy_StrokeVertexIterator_from_StrokeVertexIterator( StrokeInternal::StrokeVertexIterator& sv_it) {
 	PyObject *py_sv_it = StrokeVertexIterator_Type.tp_new( &StrokeVertexIterator_Type, 0, 0 );
-	((BPy_StrokeVertexIterator*) py_sv_it)->sv_it = new StrokeInternal::StrokeVertexIterator( sv_it );
+	((BPy_StrokeVertexIterator *) py_sv_it)->sv_it = new StrokeInternal::StrokeVertexIterator( sv_it );
+	((BPy_StrokeVertexIterator *) py_sv_it)->py_it.it = ((BPy_StrokeVertexIterator *) py_sv_it)->sv_it;
 
 	return py_sv_it;
 }
 
 PyObject * BPy_SVertexIterator_from_SVertexIterator( ViewEdgeInternal::SVertexIterator& sv_it ) {
 	PyObject *py_sv_it = SVertexIterator_Type.tp_new( &SVertexIterator_Type, 0, 0 );
-	((BPy_SVertexIterator*) py_sv_it)->sv_it = new ViewEdgeInternal::SVertexIterator( sv_it );
-
+	((BPy_SVertexIterator *) py_sv_it)->sv_it = new ViewEdgeInternal::SVertexIterator( sv_it );
+	((BPy_SVertexIterator *) py_sv_it)->py_it.it = ((BPy_SVertexIterator *) py_sv_it)->sv_it;
+	
 	return py_sv_it;
 }
 
+
 PyObject * BPy_orientedViewEdgeIterator_from_orientedViewEdgeIterator( ViewVertexInternal::orientedViewEdgeIterator& ove_it ) {
 	PyObject *py_ove_it = orientedViewEdgeIterator_Type.tp_new( &orientedViewEdgeIterator_Type, 0, 0 );
 	((BPy_orientedViewEdgeIterator *) py_ove_it)->ove_it = new ViewVertexInternal::orientedViewEdgeIterator( ove_it );
-
+	((BPy_orientedViewEdgeIterator *) py_ove_it)->py_it.it = ((BPy_orientedViewEdgeIterator *) py_ove_it)->ove_it;
+	
 	return py_ove_it;
 }
 
 PyObject * BPy_ViewEdgeIterator_from_ViewEdgeIterator( ViewEdgeInternal::ViewEdgeIterator& ve_it )  {
 	PyObject *py_ve_it = ViewEdgeIterator_Type.tp_new( &ViewEdgeIterator_Type, 0, 0 );
-	((BPy_ViewEdgeIterator*) py_ve_it)->ve_it = new ViewEdgeInternal::ViewEdgeIterator( ve_it );
-
+	((BPy_ViewEdgeIterator *) py_ve_it)->ve_it = new ViewEdgeInternal::ViewEdgeIterator( ve_it );
+	((BPy_ViewEdgeIterator *) py_ve_it)->py_it.it =	((BPy_ViewEdgeIterator *) py_ve_it)->ve_it;
+	
 	return py_ve_it;
 }
 
 PyObject * BPy_ChainingIterator_from_ChainingIterator( ChainingIterator& c_it ) {
 	PyObject *py_c_it = ChainingIterator_Type.tp_new( &ChainingIterator_Type, 0, 0 );
-	((BPy_ChainingIterator*) py_c_it)->c_it = new ChainingIterator( c_it );
-
+	((BPy_ChainingIterator *) py_c_it)->c_it = new ChainingIterator( c_it );
+	((BPy_ChainingIterator *) py_c_it)->py_ve_it.py_it.it = ((BPy_ChainingIterator *) py_c_it)->c_it;
+	
 	return py_c_it;
 }
 
 PyObject * BPy_ChainPredicateIterator_from_ChainPredicateIterator( ChainPredicateIterator& cp_it ) {
 	PyObject *py_cp_it = ChainPredicateIterator_Type.tp_new( &ChainPredicateIterator_Type, 0, 0 );
-	((BPy_ChainPredicateIterator*) py_cp_it)->cp_it = new ChainPredicateIterator( cp_it );
+	((BPy_ChainPredicateIterator *) py_cp_it)->cp_it = new ChainPredicateIterator( cp_it );
+	((BPy_ChainPredicateIterator *) py_cp_it)->py_c_it.py_ve_it.py_it.it = ((BPy_ChainPredicateIterator *) py_cp_it)->cp_it;
 
 	return py_cp_it;
 }
 
 PyObject * BPy_ChainSilhouetteIterator_from_ChainSilhouetteIterator( ChainSilhouetteIterator& cs_it ) {
 	PyObject *py_cs_it = ChainSilhouetteIterator_Type.tp_new( &ChainSilhouetteIterator_Type, 0, 0 );
-	((BPy_ChainSilhouetteIterator*) py_cs_it)->cs_it = new ChainSilhouetteIterator( cs_it );
+	((BPy_ChainSilhouetteIterator *) py_cs_it)->cs_it = new ChainSilhouetteIterator( cs_it );
+	((BPy_ChainSilhouetteIterator *) py_cs_it)->py_c_it.py_ve_it.py_it.it = ((BPy_ChainSilhouetteIterator *) py_cs_it)->cs_it;
 
 	return py_cs_it;
 }
diff --git a/source/blender/freestyle/intern/python/BPy_Freestyle.cpp b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
index 6348d30577c..b4170dc4f92 100644
--- a/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
@@ -4,6 +4,7 @@
 #include "BPy_BinaryPredicate0D.h"
 #include "BPy_BinaryPredicate1D.h"
 #include "BPy_Material.h"
+#include "BPy_FrsNoise.h"
 #include "BPy_Id.h"
 #include "BPy_IntegrationType.h"
 #include "BPy_Interface0D.h"
@@ -12,7 +13,6 @@
 #include "BPy_MediumType.h"
 #include "BPy_Nature.h"
 #include "BPy_Operators.h"
-#include "BPy_Noise.h"
 #include "BPy_SShape.h"
 #include "BPy_StrokeAttribute.h"
 #include "BPy_StrokeShader.h"
@@ -148,13 +148,13 @@ PyObject *Freestyle_Init( void )
 	BinaryPredicate0D_Init( module );
 	BinaryPredicate1D_Init( module );
 	Material_Init( module );
+	FrsNoise_Init( module );
 	Id_Init( module );
 	IntegrationType_Init( module );
 	Interface0D_Init( module );
 	Interface1D_Init( module );
 	Iterator_Init( module );
 	Operators_Init( module );
-	Noise_Init( module );
 	SShape_Init( module );
 	StrokeAttribute_Init( module );
 	StrokeShader_Init( module );
diff --git a/source/blender/freestyle/intern/python/BPy_Noise.cpp b/source/blender/freestyle/intern/python/BPy_FrsNoise.cpp
similarity index 60%
rename from source/blender/freestyle/intern/python/BPy_Noise.cpp
rename to source/blender/freestyle/intern/python/BPy_FrsNoise.cpp
index f8d5d6b066d..a9989b13c6d 100644
--- a/source/blender/freestyle/intern/python/BPy_Noise.cpp
+++ b/source/blender/freestyle/intern/python/BPy_FrsNoise.cpp
@@ -1,4 +1,4 @@
-#include "BPy_Noise.h"
+#include "BPy_FrsNoise.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -6,45 +6,45 @@ extern "C" {
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-/*---------------  Python API function prototypes for Noise instance  -----------*/
-static int Noise___init__(BPy_Noise *self, PyObject *args, PyObject *kwds);
-static void Noise___dealloc__(BPy_Noise *self);
-static PyObject * Noise___repr__(BPy_Noise *self);
+/*---------------  Python API function prototypes for FrsNoise instance  -----------*/
+static int FrsNoise___init__(BPy_FrsNoise *self, PyObject *args, PyObject *kwds);
+static void FrsNoise___dealloc__(BPy_FrsNoise *self);
+static PyObject * FrsNoise___repr__(BPy_FrsNoise *self);
 
-static PyObject * Noise_turbulence1( BPy_Noise *self, PyObject *args);
-static PyObject * Noise_turbulence2( BPy_Noise *self, PyObject *args);
-static PyObject * Noise_turbulence3( BPy_Noise *self, PyObject *args);
-static PyObject * Noise_smoothNoise1( BPy_Noise *self, PyObject *args);
-static PyObject * Noise_smoothNoise2( BPy_Noise *self, PyObject *args);
-static PyObject * Noise_smoothNoise3( BPy_Noise *self, PyObject *args);
+static PyObject * FrsNoise_turbulence1( BPy_FrsNoise *self, PyObject *args);
+static PyObject * FrsNoise_turbulence2( BPy_FrsNoise *self, PyObject *args);
+static PyObject * FrsNoise_turbulence3( BPy_FrsNoise *self, PyObject *args);
+static PyObject * FrsNoise_smoothNoise1( BPy_FrsNoise *self, PyObject *args);
+static PyObject * FrsNoise_smoothNoise2( BPy_FrsNoise *self, PyObject *args);
+static PyObject * FrsNoise_smoothNoise3( BPy_FrsNoise *self, PyObject *args);
 
-/*----------------------Noise instance definitions ----------------------------*/
-static PyMethodDef BPy_Noise_methods[] = {
-	{"turbulence1", ( PyCFunction ) Noise_turbulence1, METH_VARARGS, "(float arg, float freq, float amp, unsigned oct=4)）Returns a noise value for a 1D element"},
-	{"turbulence2", ( PyCFunction ) Noise_turbulence2, METH_VARARGS, "([x, y], float freq, float amp, unsigned oct=4)））Returns a noise value for a 2D element"},
-	{"turbulence3", ( PyCFunction ) Noise_turbulence3, METH_VARARGS, "([x, y, z], float freq, float amp, unsigned oct=4)））Returns a noise value for a 3D element"},
-	{"smoothNoise1", ( PyCFunction ) Noise_smoothNoise1, METH_VARARGS, "(float arg)）Returns a smooth noise value for a 1D element "},
-	{"smoothNoise2", ( PyCFunction ) Noise_smoothNoise2, METH_VARARGS, "([x, y])）Returns a smooth noise value for a 2D element "},
-	{"smoothNoise3", ( PyCFunction ) Noise_smoothNoise3, METH_VARARGS, "([x, y, z)）Returns a smooth noise value for a 3D element "},
+/*----------------------FrsNoise instance definitions ----------------------------*/
+static PyMethodDef BPy_FrsNoise_methods[] = {
+	{"turbulence1", ( PyCFunction ) FrsNoise_turbulence1, METH_VARARGS, "(float arg, float freq, float amp, unsigned oct=4)）Returns a noise value for a 1D element"},
+	{"turbulence2", ( PyCFunction ) FrsNoise_turbulence2, METH_VARARGS, "([x, y], float freq, float amp, unsigned oct=4)））Returns a noise value for a 2D element"},
+	{"turbulence3", ( PyCFunction ) FrsNoise_turbulence3, METH_VARARGS, "([x, y, z], float freq, float amp, unsigned oct=4)））Returns a noise value for a 3D element"},
+	{"smoothNoise1", ( PyCFunction ) FrsNoise_smoothNoise1, METH_VARARGS, "(float arg)）Returns a smooth noise value for a 1D element "},
+	{"smoothNoise2", ( PyCFunction ) FrsNoise_smoothNoise2, METH_VARARGS, "([x, y])）Returns a smooth noise value for a 2D element "},
+	{"smoothNoise3", ( PyCFunction ) FrsNoise_smoothNoise3, METH_VARARGS, "([x, y, z)）Returns a smooth noise value for a 3D element "},
 	{NULL, NULL, 0, NULL}
 };
 
-/*-----------------------BPy_Noise type definition ------------------------------*/
+/*-----------------------BPy_FrsNoise type definition ------------------------------*/
 
-PyTypeObject Noise_Type = {
+PyTypeObject FrsNoise_Type = {
 	PyObject_HEAD_INIT( NULL ) 
 	0,							/* ob_size */
-	"Noise",				/* tp_name */
-	sizeof( BPy_Noise ),	/* tp_basicsize */
+	"FrsNoise",				/* tp_name */
+	sizeof( BPy_FrsNoise ),	/* tp_basicsize */
 	0,							/* tp_itemsize */
 	
 	/* methods */
-	(destructor)Noise___dealloc__,	/* tp_dealloc */
+	(destructor)FrsNoise___dealloc__,	/* tp_dealloc */
 	NULL,                       				/* printfunc tp_print; */
 	NULL,                       				/* getattrfunc tp_getattr; */
 	NULL,                       				/* setattrfunc tp_setattr; */
 	NULL,										/* tp_compare */
-	(reprfunc)Noise___repr__,					/* tp_repr */
+	(reprfunc)FrsNoise___repr__,					/* tp_repr */
 
 	/* Method suites for standard classes */
 
@@ -87,7 +87,7 @@ PyTypeObject Noise_Type = {
 	NULL,                       /* iternextfunc tp_iternext; */
 
   /*** Attribute descriptor and subclassing stuff ***/
-	BPy_Noise_methods,	/* struct PyMethodDef *tp_methods; */
+	BPy_FrsNoise_methods,	/* struct PyMethodDef *tp_methods; */
 	NULL,                       	/* struct PyMemberDef *tp_members; */
 	NULL,         					/* struct PyGetSetDef *tp_getset; */
 	NULL,							/* struct _typeobject *tp_base; */
@@ -95,7 +95,7 @@ PyTypeObject Noise_Type = {
 	NULL,							/* descrgetfunc tp_descr_get; */
 	NULL,							/* descrsetfunc tp_descr_set; */
 	0,                          	/* long tp_dictoffset; */
-	(initproc)Noise___init__, /* initproc tp_init; */
+	(initproc)FrsNoise___init__, /* initproc tp_init; */
 	NULL,							/* allocfunc tp_alloc; */
 	PyType_GenericNew,		/* newfunc tp_new; */
 	
@@ -115,58 +115,58 @@ PyTypeObject Noise_Type = {
 };
 
 //-------------------MODULE INITIALIZATION--------------------------------
-PyMODINIT_FUNC Noise_Init( PyObject *module )
+PyMODINIT_FUNC FrsNoise_Init( PyObject *module )
 {
 	if( module == NULL )
 		return;
 
-	if( PyType_Ready( &Noise_Type ) < 0 )
+	if( PyType_Ready( &FrsNoise_Type ) < 0 )
 		return;
 
-	Py_INCREF( &Noise_Type );
-	PyModule_AddObject(module, "Noise", (PyObject *)&Noise_Type);
+	Py_INCREF( &FrsNoise_Type );
+	PyModule_AddObject(module, "FrsNoise", (PyObject *)&FrsNoise_Type);
 }
 
 //------------------------INSTANCE METHODS ----------------------------------
 
-int Noise___init__(BPy_Noise *self, PyObject *args, PyObject *kwds)
+int FrsNoise___init__(BPy_FrsNoise *self, PyObject *args, PyObject *kwds)
 {
 	self->n = new Noise();
 	return 0;
 }
 
-void Noise___dealloc__(BPy_Noise* self)
+void FrsNoise___dealloc__(BPy_FrsNoise* self)
 {
 	delete self->n;
     self->ob_type->tp_free((PyObject*)self);
 }
 
 
-PyObject * Noise___repr__(BPy_Noise* self)
+PyObject * FrsNoise___repr__(BPy_FrsNoise* self)
 {
-    return PyString_FromFormat("Noise - address: %p", self->n );
+    return PyString_FromFormat("FrsNoise - address: %p", self->n );
 }
 
 
-PyObject * Noise_turbulence1( BPy_Noise *self , PyObject *args) {
+PyObject * FrsNoise_turbulence1( BPy_FrsNoise *self , PyObject *args) {
 	float f1, f2, f3;
 	unsigned int i;
 
 	if(!( PyArg_ParseTuple(args, "fff|I", &f1, &f2, &f3, &i) )) {
-		cout << "ERROR: Noise_turbulence1" << endl;
+		cout << "ERROR: FrsNoise_turbulence1" << endl;
 		Py_RETURN_NONE;
 	}
 
 	return PyFloat_FromDouble( self->n->turbulence1(f1, f2, f3, i) );
 }
 
-PyObject * Noise_turbulence2( BPy_Noise *self , PyObject *args) {
+PyObject * FrsNoise_turbulence2( BPy_FrsNoise *self , PyObject *args) {
 	PyObject *obj1;
 	float f2, f3;
 	unsigned int i;
 
 	if(!( PyArg_ParseTuple(args, "Off|I", &obj1, &f2, &f3, &i) && PyList_Check(obj1) && PyList_Size(obj1) > 1 )) {
-		cout << "ERROR: Noise_turbulence2" << endl;
+		cout << "ERROR: FrsNoise_turbulence2" << endl;
 		Py_RETURN_NONE;
 	}
 
@@ -175,13 +175,13 @@ PyObject * Noise_turbulence2( BPy_Noise *self , PyObject *args) {
 	return PyFloat_FromDouble( self->n->turbulence2(v, f2, f3, i) );
 }
 
-PyObject * Noise_turbulence3( BPy_Noise *self , PyObject *args) {
+PyObject * FrsNoise_turbulence3( BPy_FrsNoise *self , PyObject *args) {
 	PyObject *obj1;
 	float f2, f3;
 	unsigned int i;
 
 	if(!( PyArg_ParseTuple(args, "Off|I", &obj1, &f2, &f3, &i) && PyList_Check(obj1) && PyList_Size(obj1) > 2 )) {
-		cout << "ERROR: Noise_turbulence3" << endl;
+		cout << "ERROR: FrsNoise_turbulence3" << endl;
 		Py_RETURN_NONE;
 	}
 
@@ -192,22 +192,22 @@ PyObject * Noise_turbulence3( BPy_Noise *self , PyObject *args) {
 	return PyFloat_FromDouble( self->n->turbulence3(v, f2, f3, i) );
 }
 
-PyObject * Noise_smoothNoise1( BPy_Noise *self , PyObject *args) {
+PyObject * FrsNoise_smoothNoise1( BPy_FrsNoise *self , PyObject *args) {
 	float f;
 
 	if(!( PyArg_ParseTuple(args, "f", &f) )) {
-		cout << "ERROR: Noise_smoothNoise1" << endl;
+		cout << "ERROR: FrsNoise_smoothNoise1" << endl;
 		Py_RETURN_NONE;
 	}
 
 	return PyFloat_FromDouble( self->n->smoothNoise1(f) );
 }
 
-PyObject * Noise_smoothNoise2( BPy_Noise *self , PyObject *args) {
+PyObject * FrsNoise_smoothNoise2( BPy_FrsNoise *self , PyObject *args) {
 	PyObject *obj;
 
 	if(!( PyArg_ParseTuple(args, "O", &obj) && PyList_Check(obj) && PyList_Size(obj) > 1 )) {
-		cout << "ERROR: Noise_smoothNoise2" << endl;
+		cout << "ERROR: FrsNoise_smoothNoise2" << endl;
 		Py_RETURN_NONE;
 	}
 
@@ -216,11 +216,11 @@ PyObject * Noise_smoothNoise2( BPy_Noise *self , PyObject *args) {
 	return PyFloat_FromDouble( self->n->smoothNoise2(v) );
 }
 
-PyObject * Noise_smoothNoise3( BPy_Noise *self , PyObject *args) {
+PyObject * FrsNoise_smoothNoise3( BPy_FrsNoise *self , PyObject *args) {
 	PyObject *obj;
 
 	if(!( PyArg_ParseTuple(args, "O", &obj) && PyList_Check(obj) && PyList_Size(obj) > 2 )) {
-		cout << "ERROR: Noise_smoothNoise3" << endl;
+		cout << "ERROR: FrsNoise_smoothNoise3" << endl;
 		Py_RETURN_NONE;
 	}
 
diff --git a/source/blender/freestyle/intern/python/BPy_FrsNoise.h b/source/blender/freestyle/intern/python/BPy_FrsNoise.h
new file mode 100644
index 00000000000..d0215fda9af
--- /dev/null
+++ b/source/blender/freestyle/intern/python/BPy_FrsNoise.h
@@ -0,0 +1,36 @@
+#ifndef FREESTYLE_PYTHON_FRSNOISE_H
+#define FREESTYLE_PYTHON_FRSNOISE_H
+
+#include "../geometry/Noise.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject FrsNoise_Type;
+
+#define BPy_FrsNoise_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &FrsNoise_Type)  )
+
+/*---------------------------Python BPy_FrsNoise structure definition----------*/
+typedef struct {
+	PyObject_HEAD
+	Noise *n;
+} BPy_FrsNoise;
+
+/*---------------------------Python BPy_FrsNoise visible prototypes-----------*/
+
+PyMODINIT_FUNC FrsNoise_Init( PyObject *module );
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* FREESTYLE_PYTHON_FRSNOISE_H */
diff --git a/source/blender/freestyle/intern/python/BPy_Interface1D.cpp b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
index 509dfb23894..3db9531da4b 100644
--- a/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
@@ -1,7 +1,7 @@
 #include "BPy_Interface1D.h"
 
 #include "BPy_Convert.h"
-#include "Interface1D/BPy_Curve.h"
+#include "Interface1D/BPy_FrsCurve.h"
 #include "Interface1D/Curve/BPy_Chain.h"
 #include "Interface1D/BPy_FEdge.h"
 #include "Interface1D/FEdge/BPy_FEdgeSharp.h"
@@ -142,10 +142,10 @@ PyMODINIT_FUNC Interface1D_Init( PyObject *module )
 	Py_INCREF( &Interface1D_Type );
 	PyModule_AddObject(module, "Interface1D", (PyObject *)&Interface1D_Type);
 	
-	if( PyType_Ready( &Curve_Type ) < 0 )
+	if( PyType_Ready( &FrsCurve_Type ) < 0 )
 		return;
-	Py_INCREF( &Curve_Type );
-	PyModule_AddObject(module, "Curve", (PyObject *)&Curve_Type);
+	Py_INCREF( &FrsCurve_Type );
+	PyModule_AddObject(module, "FrsCurve", (PyObject *)&FrsCurve_Type);
 
 	if( PyType_Ready( &Chain_Type ) < 0 )
 		return;
diff --git a/source/blender/freestyle/intern/python/BPy_Iterator.cpp b/source/blender/freestyle/intern/python/BPy_Iterator.cpp
index cf6d8ed4877..23dd68e0aa8 100644
--- a/source/blender/freestyle/intern/python/BPy_Iterator.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Iterator.cpp
@@ -227,14 +227,11 @@ PyObject * Iterator_isEnd(BPy_Iterator* self) {
 	return PyBool_from_bool( self->it->isEnd() );
 }
 
-//%rename(getObject) Interface0DIterator::operator*
 PyObject * Iterator_getObject(BPy_Iterator* self) {
 	return PyBool_from_bool( self->it->isEnd() );
 }
 
 
-
-
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/BPy_Noise.h b/source/blender/freestyle/intern/python/BPy_Noise.h
deleted file mode 100644
index 5dc8a1a4bd1..00000000000
--- a/source/blender/freestyle/intern/python/BPy_Noise.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef FREESTYLE_PYTHON_NOISE_H
-#define FREESTYLE_PYTHON_NOISE_H
-
-#include "../geometry/Noise.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-///////////////////////////////////////////////////////////////////////////////////////////
-
-#include <Python.h>
-
-extern PyTypeObject Noise_Type;
-
-#define BPy_Noise_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Noise_Type)  )
-
-/*---------------------------Python BPy_Noise structure definition----------*/
-typedef struct {
-	PyObject_HEAD
-	Noise *n;
-} BPy_Noise;
-
-/*---------------------------Python BPy_Noise visible prototypes-----------*/
-
-PyMODINIT_FUNC Noise_Init( PyObject *module );
-
-
-///////////////////////////////////////////////////////////////////////////////////////////
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif /* FREESTYLE_PYTHON_NOISE_H */
diff --git a/source/blender/freestyle/intern/python/Director.cpp b/source/blender/freestyle/intern/python/Director.cpp
index d3aff4a65f2..42677919ca5 100644
--- a/source/blender/freestyle/intern/python/Director.cpp
+++ b/source/blender/freestyle/intern/python/Director.cpp
@@ -61,7 +61,6 @@ ViewEdge * Director_BPy_ChainingIterator_traverse( PyObject *obj, AdjacencyItera
 	return ((BPy_ViewEdge *) result)->ve;
 }
 
-
 // BPy_UnaryFunction{0D,1D}: __call__
 // BPy_UnaryFunction0DDouble
 // BPy_UnaryFunction0DEdgeNature
@@ -83,4 +82,26 @@ ViewEdge * Director_BPy_ChainingIterator_traverse( PyObject *obj, AdjacencyItera
 // BPy_UnaryFunction1DVectorViewShape
 // BPy_UnaryFunction1DVoid
 
+// BPy_Iterator: increment, decrement, isBegin, isEnd
+void Director_BPy_Iterator_increment( PyObject *obj ) {
+	PyObject_CallMethod( obj, "increment", "", 0 );
+}
+
+void Director_BPy_Iterator_decrement( PyObject *obj ) {
+	PyObject_CallMethod( obj, "decrement", "", 0 );
+}
+
+bool Director_BPy_Iterator_isBegin( PyObject *obj ) {
+	PyObject *result = PyObject_CallMethod( obj, "isBegin", "", 0 );
+
+	return bool_from_PyBool(result);
+}
+
+bool Director_BPy_Iterator_isEnd( PyObject *obj ) {
+	PyObject *result = PyObject_CallMethod( obj, "isEnd", "", 0 );
+
+	return bool_from_PyBool(result);
+}
+
+
 
diff --git a/source/blender/freestyle/intern/python/Director.h b/source/blender/freestyle/intern/python/Director.h
index 95ab16047a8..2a67be237f5 100644
--- a/source/blender/freestyle/intern/python/Director.h
+++ b/source/blender/freestyle/intern/python/Director.h
@@ -59,7 +59,10 @@ double Director_BPy_UnaryFunction0DDouble___call__( PyObject *obj, Interface0DIt
 // BPy_UnaryFunction1DVoid
 void Director_BPy_UnaryFunction1DVoid___call__( PyObject *obj, Interface1D& if1D);
 
-
-
+// BPy_Iterator: increment, decrement, isBegin, isEnd
+void Director_BPy_Iterator_increment( PyObject *obj );
+void Director_BPy_Iterator_decrement( PyObject *obj );
+bool Director_BPy_Iterator_isBegin( PyObject *obj );
+bool Director_BPy_Iterator_isEnd( PyObject *obj );
 
 #endif // FREESTYLE_PYTHON_DIRECTOR
diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_Curve.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp
similarity index 60%
rename from source/blender/freestyle/intern/python/Interface1D/BPy_Curve.cpp
rename to source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp
index b0f043a6525..1506092511a 100644
--- a/source/blender/freestyle/intern/python/Interface1D/BPy_Curve.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp
@@ -1,4 +1,4 @@
-#include "BPy_Curve.h"
+#include "BPy_FrsCurve.h"
 
 #include "../BPy_Convert.h"
 #include "../BPy_Id.h"
@@ -11,38 +11,38 @@ extern "C" {
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-/*---------------  Python API function prototypes for Curve instance  -----------*/
-static int Curve___init__(BPy_Curve *self, PyObject *args, PyObject *kwds);
-static PyObject * Curve_push_vertex_back( BPy_Curve *self, PyObject *args );
-static PyObject * Curve_push_vertex_front( BPy_Curve *self, PyObject *args );
-static PyObject * Curve_empty( BPy_Curve *self );
-static PyObject * Curve_nSegments( BPy_Curve *self );
+/*---------------  Python API function prototypes for FrsCurve instance  -----------*/
+static int FrsCurve___init__(BPy_FrsCurve *self, PyObject *args, PyObject *kwds);
+static PyObject * FrsCurve_push_vertex_back( BPy_FrsCurve *self, PyObject *args );
+static PyObject * FrsCurve_push_vertex_front( BPy_FrsCurve *self, PyObject *args );
+static PyObject * FrsCurve_empty( BPy_FrsCurve *self );
+static PyObject * FrsCurve_nSegments( BPy_FrsCurve *self );
 // point_iterator 	points_begin (float step=0)
-static PyObject * Curve_verticesBegin( BPy_Curve *self );
-static PyObject * Curve_verticesEnd( BPy_Curve *self );
-static PyObject * Curve_pointsBegin( BPy_Curve *self, PyObject *args );
-static PyObject * Curve_pointsEnd( BPy_Curve *self, PyObject *args );
+static PyObject * FrsCurve_verticesBegin( BPy_FrsCurve *self );
+static PyObject * FrsCurve_verticesEnd( BPy_FrsCurve *self );
+static PyObject * FrsCurve_pointsBegin( BPy_FrsCurve *self, PyObject *args );
+static PyObject * FrsCurve_pointsEnd( BPy_FrsCurve *self, PyObject *args );
 
-/*----------------------Curve instance definitions ----------------------------*/
-static PyMethodDef BPy_Curve_methods[] = {	
-	{"push_vertex_back", ( PyCFunction ) Curve_push_vertex_back, METH_VARARGS, "(CurvePoint cp | SVertex sv) Adds a single vertex at the front of the Curve."},
-	{"push_vertex_front", ( PyCFunction ) Curve_push_vertex_front, METH_VARARGS, "(CurvePoint cp | SVertex sv) Adds a single vertex at the end of the Curve."},
-	{"empty", ( PyCFunction ) Curve_empty, METH_NOARGS, "() Returns true is the Curve doesn't have any Vertex yet."},
-	{"nSegments", ( PyCFunction ) Curve_nSegments, METH_NOARGS, "() Returns the number of segments in the oplyline constituing the Curve."},
-	{"verticesBegin", ( PyCFunction ) Curve_verticesBegin, METH_NOARGS, "() Returns an Interface0DIterator pointing onto the first vertex of the Curve and that can iterate over the vertices of the Curve."},
-	{"verticesEnd", ( PyCFunction ) Curve_verticesEnd, METH_NOARGS, "() Returns an Interface0DIterator pointing after the last vertex of the Curve and that can iterate over the vertices of the Curve."},
-	{"pointsBegin", ( PyCFunction ) Curve_pointsBegin, METH_VARARGS, "(float t=0) Returns an Interface0DIterator pointing onto the first point of the Curve and that can iterate over the points of the Curve at any resolution t. At each iteration a virtual temporary CurvePoint is created."},
-	{"pointsEnd", ( PyCFunction ) Curve_pointsEnd, METH_VARARGS, "(float t=0) Returns an Interface0DIterator pointing after the last point of the Curve and that can iterate over the points of the Curve at any resolution t. At each iteration a virtual temporary CurvePoint is created."},
+/*----------------------FrsCurve instance definitions ----------------------------*/
+static PyMethodDef BPy_FrsCurve_methods[] = {	
+	{"push_vertex_back", ( PyCFunction ) FrsCurve_push_vertex_back, METH_VARARGS, "(CurvePoint cp | SVertex sv) Adds a single vertex at the front of the Curve."},
+	{"push_vertex_front", ( PyCFunction ) FrsCurve_push_vertex_front, METH_VARARGS, "(CurvePoint cp | SVertex sv) Adds a single vertex at the end of the Curve."},
+	{"empty", ( PyCFunction ) FrsCurve_empty, METH_NOARGS, "() Returns true is the Curve doesn't have any Vertex yet."},
+	{"nSegments", ( PyCFunction ) FrsCurve_nSegments, METH_NOARGS, "() Returns the number of segments in the oplyline constituing the Curve."},
+	{"verticesBegin", ( PyCFunction ) FrsCurve_verticesBegin, METH_NOARGS, "() Returns an Interface0DIterator pointing onto the first vertex of the Curve and that can iterate over the vertices of the Curve."},
+	{"verticesEnd", ( PyCFunction ) FrsCurve_verticesEnd, METH_NOARGS, "() Returns an Interface0DIterator pointing after the last vertex of the Curve and that can iterate over the vertices of the Curve."},
+	{"pointsBegin", ( PyCFunction ) FrsCurve_pointsBegin, METH_VARARGS, "(float t=0) Returns an Interface0DIterator pointing onto the first point of the Curve and that can iterate over the points of the Curve at any resolution t. At each iteration a virtual temporary CurvePoint is created."},
+	{"pointsEnd", ( PyCFunction ) FrsCurve_pointsEnd, METH_VARARGS, "(float t=0) Returns an Interface0DIterator pointing after the last point of the Curve and that can iterate over the points of the Curve at any resolution t. At each iteration a virtual temporary CurvePoint is created."},
 	{NULL, NULL, 0, NULL}
 };
 
-/*-----------------------BPy_Curve type definition ------------------------------*/
+/*-----------------------BPy_FrsCurve type definition ------------------------------*/
 
-PyTypeObject Curve_Type = {
+PyTypeObject FrsCurve_Type = {
 	PyObject_HEAD_INIT( NULL ) 
 	0,							/* ob_size */
-	"Curve",				/* tp_name */
-	sizeof( BPy_Curve ),	/* tp_basicsize */
+	"FrsCurve",				/* tp_name */
+	sizeof( BPy_FrsCurve ),	/* tp_basicsize */
 	0,							/* tp_itemsize */
 	
 	/* methods */
@@ -94,7 +94,7 @@ PyTypeObject Curve_Type = {
 	NULL,                       /* iternextfunc tp_iternext; */
 
   /*** Attribute descriptor and subclassing stuff ***/
-	BPy_Curve_methods,	/* struct PyMethodDef *tp_methods; */
+	BPy_FrsCurve_methods,	/* struct PyMethodDef *tp_methods; */
 	NULL,                       	/* struct PyMemberDef *tp_members; */
 	NULL,         					/* struct PyGetSetDef *tp_getset; */
 	&Interface1D_Type,				/* struct _typeobject *tp_base; */
@@ -102,7 +102,7 @@ PyTypeObject Curve_Type = {
 	NULL,							/* descrgetfunc tp_descr_get; */
 	NULL,							/* descrsetfunc tp_descr_set; */
 	0,                          	/* long tp_dictoffset; */
-	(initproc)Curve___init__,                       	/* initproc tp_init; */
+	(initproc)FrsCurve___init__,                       	/* initproc tp_init; */
 	NULL,							/* allocfunc tp_alloc; */
 	NULL,		/* newfunc tp_new; */
 	
@@ -126,7 +126,7 @@ PyTypeObject Curve_Type = {
 
 //------------------------INSTANCE METHODS ----------------------------------
 	
-int Curve___init__(BPy_Curve *self, PyObject *args, PyObject *kwds)
+int FrsCurve___init__(BPy_FrsCurve *self, PyObject *args, PyObject *kwds)
 {
 
 	PyObject *obj = 0;
@@ -137,9 +137,9 @@ int Curve___init__(BPy_Curve *self, PyObject *args, PyObject *kwds)
 	if( !obj ){
 		self->c = new Curve();
 		
-	} else if( BPy_Curve_Check(obj) ) {
-		if( ((BPy_Curve *) obj)->c )
-			self->c = new Curve(*( ((BPy_Curve *) obj)->c ));
+	} else if( BPy_FrsCurve_Check(obj) ) {
+		if( ((BPy_FrsCurve *) obj)->c )
+			self->c = new Curve(*( ((BPy_FrsCurve *) obj)->c ));
 		else
 			return -1;
 		
@@ -159,11 +159,11 @@ int Curve___init__(BPy_Curve *self, PyObject *args, PyObject *kwds)
 }
 
 
-PyObject * Curve_push_vertex_back( BPy_Curve *self, PyObject *args ) {
+PyObject * FrsCurve_push_vertex_back( BPy_FrsCurve *self, PyObject *args ) {
 	PyObject *obj;
 
 	if(!( PyArg_ParseTuple(args, "O", &obj) )) {
-		cout << "ERROR: Curve_push_vertex_back" << endl;
+		cout << "ERROR: FrsCurve_push_vertex_back" << endl;
 		Py_RETURN_NONE;
 	}
 
@@ -176,11 +176,11 @@ PyObject * Curve_push_vertex_back( BPy_Curve *self, PyObject *args ) {
 	Py_RETURN_NONE;
 }
 
-PyObject * Curve_push_vertex_front( BPy_Curve *self, PyObject *args ) {
+PyObject * FrsCurve_push_vertex_front( BPy_FrsCurve *self, PyObject *args ) {
 		PyObject *obj;
 
 		if(!( PyArg_ParseTuple(args, "O", &obj) )) {
-			cout << "ERROR: Curve_push_vertex_front" << endl;
+			cout << "ERROR: FrsCurve_push_vertex_front" << endl;
 			Py_RETURN_NONE;
 		}
 
@@ -193,11 +193,11 @@ PyObject * Curve_push_vertex_front( BPy_Curve *self, PyObject *args ) {
 		Py_RETURN_NONE;
 	}
 
-PyObject * Curve_empty( BPy_Curve *self ) {
+PyObject * FrsCurve_empty( BPy_FrsCurve *self ) {
 	return PyBool_from_bool( self->c->empty() );
 }
 
-PyObject * Curve_nSegments( BPy_Curve *self ) {
+PyObject * FrsCurve_nSegments( BPy_FrsCurve *self ) {
 	return PyInt_FromLong( self->c->nSegments() );
 }
 
@@ -205,18 +205,18 @@ PyObject * Curve_nSegments( BPy_Curve *self ) {
 // not implemented
 
 
-PyObject * Curve_verticesBegin( BPy_Curve *self ) {
+PyObject * FrsCurve_verticesBegin( BPy_FrsCurve *self ) {
 	Interface0DIterator if0D_it( self->c->verticesBegin() );
 	return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it );
 }
 
-PyObject * Curve_verticesEnd( BPy_Curve *self ) {
+PyObject * FrsCurve_verticesEnd( BPy_FrsCurve *self ) {
 	Interface0DIterator if0D_it( self->c->verticesEnd() );
 	return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it );
 }
 
 
-PyObject * Curve_pointsBegin( BPy_Curve *self, PyObject *args ) {
+PyObject * FrsCurve_pointsBegin( BPy_FrsCurve *self, PyObject *args ) {
 	float f = 0;
 
 	if(!( PyArg_ParseTuple(args, "|f", &f)  )) {
@@ -228,7 +228,7 @@ PyObject * Curve_pointsBegin( BPy_Curve *self, PyObject *args ) {
 	return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it );
 }
 
-PyObject * Curve_pointsEnd( BPy_Curve *self, PyObject *args ) {
+PyObject * FrsCurve_pointsEnd( BPy_FrsCurve *self, PyObject *args ) {
 	float f = 0;
 
 	if(!( PyArg_ParseTuple(args, "|f", &f)  )) {
diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_Curve.h b/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.h
similarity index 53%
rename from source/blender/freestyle/intern/python/Interface1D/BPy_Curve.h
rename to source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.h
index fd29a7bf4f1..0829cf0ebf5 100644
--- a/source/blender/freestyle/intern/python/Interface1D/BPy_Curve.h
+++ b/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.h
@@ -1,5 +1,5 @@
-#ifndef FREESTYLE_PYTHON_CURVE_H
-#define FREESTYLE_PYTHON_CURVE_H
+#ifndef FREESTYLE_PYTHON_FRSCURVE_H
+#define FREESTYLE_PYTHON_FRSCURVE_H
 
 #include "../BPy_Interface1D.h"
 #include "../../stroke/Curve.h"
@@ -12,15 +12,15 @@ extern "C" {
 
 #include <Python.h>
 
-extern PyTypeObject Curve_Type;
+extern PyTypeObject FrsCurve_Type;
 
-#define BPy_Curve_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Curve_Type)  )
+#define BPy_FrsCurve_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &FrsCurve_Type)  )
 
-/*---------------------------Python BPy_Curve structure definition----------*/
+/*---------------------------Python BPy_FrsCurve structure definition----------*/
 typedef struct {
 	BPy_Interface1D py_if1D;
 	Curve *c;
-} BPy_Curve;
+} BPy_FrsCurve;
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
@@ -28,4 +28,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_CURVE_H */
+#endif /* FREESTYLE_PYTHON_FRSCURVE_H */
diff --git a/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.cpp b/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.cpp
index 8b6240986b9..7116c574c76 100644
--- a/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.cpp
@@ -84,7 +84,7 @@ PyTypeObject Chain_Type = {
 	BPy_Chain_methods,	/* struct PyMethodDef *tp_methods; */
 	NULL,                       	/* struct PyMemberDef *tp_members; */
 	NULL,         					/* struct PyGetSetDef *tp_getset; */
-	&Curve_Type,				/* struct _typeobject *tp_base; */
+	&FrsCurve_Type,				/* struct _typeobject *tp_base; */
 	NULL,							/* PyObject *tp_dict; */
 	NULL,							/* descrgetfunc tp_descr_get; */
 	NULL,							/* descrsetfunc tp_descr_set; */
diff --git a/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.h b/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.h
index ade70c47f25..19f325ef513 100644
--- a/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.h
+++ b/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.h
@@ -1,7 +1,7 @@
 #ifndef FREESTYLE_PYTHON_CHAIN_H
 #define FREESTYLE_PYTHON_CHAIN_H
 
-#include "../BPy_Curve.h"
+#include "../BPy_FrsCurve.h"
 #include "../../../stroke/Chain.h"
 
 #ifdef __cplusplus
@@ -18,7 +18,7 @@ extern PyTypeObject Chain_Type;
 
 /*---------------------------Python BPy_Chain structure definition----------*/
 typedef struct {
-	BPy_Curve py_c;
+	BPy_FrsCurve py_c;
 	Chain *c;
 } BPy_Chain;
 
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp
index 13c8382c3a2..139db9dd73f 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp
@@ -134,6 +134,7 @@ int AdjacencyIterator___init__(BPy_AdjacencyIterator *self, PyObject *args )
 	}
 
 	self->py_it.it = self->a_it;
+	
 	return 0;
 
 }
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp
index c5ff61e239f..3d41e4b66c1 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp
@@ -142,6 +142,7 @@ int ChainPredicateIterator___init__(BPy_ChainPredicateIterator *self, PyObject *
 	self->py_c_it.py_ve_it.ve_it = self->cp_it;
 	self->py_c_it.py_ve_it.py_it.it = self->cp_it;
 	
+	
 	return 0;
 	
 }
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp
index 92c3a7dfc38..1b3a37b5518 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp
@@ -123,8 +123,8 @@ int Interface0DIterator___init__(BPy_Interface0DIterator *self, PyObject *args )
 
 	self->if0D_it = new Interface0DIterator(*( ((BPy_Interface0DIterator *) obj)->if0D_it ));
 	self->py_it.it = self->if0D_it;
+	
 	return 0;
-
 }
 
 PyObject * Interface0DIterator_t( BPy_Interface0DIterator *self ) {
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp
index 1f3e3c05d91..0547c173249 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp
@@ -143,7 +143,7 @@ int ViewEdgeIterator___init__(BPy_ViewEdgeIterator *self, PyObject *args )
 	}
 		
 	self->py_it.it = self->ve_it;
-	
+
 	return 0;
 }
 

From 4580fd1415d92ed882744e2617f5ac05e895452f Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Fri, 1 Aug 2008 02:16:36 +0000
Subject: [PATCH 176/252] soc-2008-mxcurioni: clean-up #1

---
 .../intern/python/{BPy_Material.cpp => BPy_FrsMaterial.cpp}       | 0
 .../freestyle/intern/python/{BPy_Material.h => BPy_FrsMaterial.h} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename source/blender/freestyle/intern/python/{BPy_Material.cpp => BPy_FrsMaterial.cpp} (100%)
 rename source/blender/freestyle/intern/python/{BPy_Material.h => BPy_FrsMaterial.h} (100%)

diff --git a/source/blender/freestyle/intern/python/BPy_Material.cpp b/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
similarity index 100%
rename from source/blender/freestyle/intern/python/BPy_Material.cpp
rename to source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
diff --git a/source/blender/freestyle/intern/python/BPy_Material.h b/source/blender/freestyle/intern/python/BPy_FrsMaterial.h
similarity index 100%
rename from source/blender/freestyle/intern/python/BPy_Material.h
rename to source/blender/freestyle/intern/python/BPy_FrsMaterial.h

From c324f0cbc72b47182ba3d7fd1bbd280fcebe3283 Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Fri, 1 Aug 2008 02:25:21 +0000
Subject: [PATCH 177/252] soc-2008-mxcurioni: clean-up #2

---
 .../freestyle/intern/python/BPy_Convert.cpp   |   8 +-
 .../freestyle/intern/python/BPy_Convert.h     |   2 +-
 .../freestyle/intern/python/BPy_Freestyle.cpp |   4 +-
 .../intern/python/BPy_FrsMaterial.cpp         | 218 +++++++++---------
 .../freestyle/intern/python/BPy_FrsMaterial.h |  18 +-
 .../Interface1D/FEdge/BPy_FEdgeSharp.cpp      |   4 +-
 .../Interface1D/FEdge/BPy_FEdgeSmooth.cpp     |   2 +-
 .../BPy_UnaryFunction0DMaterial.cpp           |   2 +-
 .../freestyle/intern/stroke/Stroke.cpp        |   4 +-
 .../freestyle/intern/system/Iterator.h        |  11 +-
 .../style_modules_blender/freestyle_init.py   |   8 +-
 .../style_modules_blender/shaders.py          |   4 +-
 12 files changed, 144 insertions(+), 141 deletions(-)

diff --git a/source/blender/freestyle/intern/python/BPy_Convert.cpp b/source/blender/freestyle/intern/python/BPy_Convert.cpp
index 53a4e171e74..e7d98440683 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Convert.cpp
@@ -1,7 +1,7 @@
 #include "BPy_Convert.h"
 
 #include "BPy_BBox.h"
-#include "BPy_Material.h"
+#include "BPy_FrsMaterial.h"
 #include "BPy_Id.h"
 #include "BPy_IntegrationType.h"
 #include "BPy_Interface0D.h"
@@ -190,9 +190,9 @@ PyObject * BPy_ViewShape_from_ViewShape( ViewShape& vs ) {
 	return py_vs;
 }
 
-PyObject * BPy_Material_from_Material( Material& m ){
-	PyObject *py_m = Material_Type.tp_new( &Material_Type, 0, 0 );
-	((BPy_Material*) py_m)->m = new Material( m );
+PyObject * BPy_FrsMaterial_from_Material( Material& m ){
+	PyObject *py_m = FrsMaterial_Type.tp_new( &FrsMaterial_Type, 0, 0 );
+	((BPy_FrsMaterial*) py_m)->m = new Material( m );
 
 	return py_m;
 }
diff --git a/source/blender/freestyle/intern/python/BPy_Convert.h b/source/blender/freestyle/intern/python/BPy_Convert.h
index 54999b44f67..4bfaf4c1e17 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.h
+++ b/source/blender/freestyle/intern/python/BPy_Convert.h
@@ -76,7 +76,7 @@ PyObject * BPy_Id_from_Id( Id& id );
 PyObject * BPy_Interface0D_from_Interface0D( Interface0D& if0D );
 PyObject * BPy_Interface1D_from_Interface1D( Interface1D& if1D );
 PyObject * BPy_IntegrationType_from_IntegrationType( int i );
-PyObject * BPy_Material_from_Material( Material& m );
+PyObject * BPy_FrsMaterial_from_Material( Material& m );
 PyObject * BPy_Nature_from_Nature( unsigned short n );
 PyObject * BPy_MediumType_from_MediumType( int n );
 PyObject * BPy_SShape_from_SShape( SShape& ss );
diff --git a/source/blender/freestyle/intern/python/BPy_Freestyle.cpp b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
index b4170dc4f92..8c55fdc3fd0 100644
--- a/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
@@ -3,7 +3,7 @@
 #include "BPy_BBox.h"
 #include "BPy_BinaryPredicate0D.h"
 #include "BPy_BinaryPredicate1D.h"
-#include "BPy_Material.h"
+#include "BPy_FrsMaterial.h"
 #include "BPy_FrsNoise.h"
 #include "BPy_Id.h"
 #include "BPy_IntegrationType.h"
@@ -147,7 +147,7 @@ PyObject *Freestyle_Init( void )
 	BBox_Init( module );
 	BinaryPredicate0D_Init( module );
 	BinaryPredicate1D_Init( module );
-	Material_Init( module );
+	FrsMaterial_Init( module );
 	FrsNoise_Init( module );
 	Id_Init( module );
 	IntegrationType_Init( module );
diff --git a/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp b/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
index 7f871c34c3c..052583e4621 100644
--- a/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
+++ b/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
@@ -1,4 +1,4 @@
-#include "BPy_Material.h"
+#include "BPy_FrsMaterial.h"
 
 #include "BPy_Convert.h"
 
@@ -8,85 +8,85 @@ extern "C" {
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-/*---------------  Python API function prototypes for Material instance  -----------*/
-static int Material___init__(BPy_Material *self, PyObject *args, PyObject *kwds);
-static void Material___dealloc__(BPy_Material *self);
-static PyObject * Material___repr__(BPy_Material *self);
+/*---------------  Python API function prototypes for FrsMaterial instance  -----------*/
+static int FrsMaterial___init__(BPy_FrsMaterial *self, PyObject *args, PyObject *kwds);
+static void FrsMaterial___dealloc__(BPy_FrsMaterial *self);
+static PyObject * FrsMaterial___repr__(BPy_FrsMaterial *self);
 
-static PyObject * Material_diffuse( BPy_Material* self);
-static PyObject * Material_diffuseR( BPy_Material* self);
-static PyObject * Material_diffuseG( BPy_Material* self) ;
-static PyObject * Material_diffuseB( BPy_Material* self) ;
-static PyObject * Material_diffuseA( BPy_Material* self);
-static PyObject * Material_specular( BPy_Material* self);
-static PyObject * Material_specularR( BPy_Material* self);
-static PyObject * Material_specularG( BPy_Material* self);
-static PyObject * Material_specularB( BPy_Material* self) ;
-static PyObject * Material_specularA( BPy_Material* self) ;
-static PyObject * Material_ambient( BPy_Material* self) ;
-static PyObject * Material_ambientR( BPy_Material* self);
-static PyObject * Material_ambientG( BPy_Material* self);
-static PyObject * Material_ambientB( BPy_Material* self);
-static PyObject * Material_ambientA( BPy_Material* self);
-static PyObject * Material_emission( BPy_Material* self);
-static PyObject * Material_emissionR( BPy_Material* self);
-static PyObject * Material_emissionG( BPy_Material* self) ;
-static PyObject * Material_emissionB( BPy_Material* self);
-static PyObject * Material_emissionA( BPy_Material* self);
-static PyObject * Material_shininess( BPy_Material* self);
-static PyObject * Material_setDiffuse( BPy_Material *self, PyObject *args );
-static PyObject * Material_setSpecular( BPy_Material *self, PyObject *args );
-static PyObject * Material_setAmbient( BPy_Material *self, PyObject *args );
-static PyObject * Material_setEmission( BPy_Material *self, PyObject *args );
-static PyObject * Material_setShininess( BPy_Material *self, PyObject *args );
+static PyObject * FrsMaterial_diffuse( BPy_FrsMaterial* self);
+static PyObject * FrsMaterial_diffuseR( BPy_FrsMaterial* self);
+static PyObject * FrsMaterial_diffuseG( BPy_FrsMaterial* self) ;
+static PyObject * FrsMaterial_diffuseB( BPy_FrsMaterial* self) ;
+static PyObject * FrsMaterial_diffuseA( BPy_FrsMaterial* self);
+static PyObject * FrsMaterial_specular( BPy_FrsMaterial* self);
+static PyObject * FrsMaterial_specularR( BPy_FrsMaterial* self);
+static PyObject * FrsMaterial_specularG( BPy_FrsMaterial* self);
+static PyObject * FrsMaterial_specularB( BPy_FrsMaterial* self) ;
+static PyObject * FrsMaterial_specularA( BPy_FrsMaterial* self) ;
+static PyObject * FrsMaterial_ambient( BPy_FrsMaterial* self) ;
+static PyObject * FrsMaterial_ambientR( BPy_FrsMaterial* self);
+static PyObject * FrsMaterial_ambientG( BPy_FrsMaterial* self);
+static PyObject * FrsMaterial_ambientB( BPy_FrsMaterial* self);
+static PyObject * FrsMaterial_ambientA( BPy_FrsMaterial* self);
+static PyObject * FrsMaterial_emission( BPy_FrsMaterial* self);
+static PyObject * FrsMaterial_emissionR( BPy_FrsMaterial* self);
+static PyObject * FrsMaterial_emissionG( BPy_FrsMaterial* self) ;
+static PyObject * FrsMaterial_emissionB( BPy_FrsMaterial* self);
+static PyObject * FrsMaterial_emissionA( BPy_FrsMaterial* self);
+static PyObject * FrsMaterial_shininess( BPy_FrsMaterial* self);
+static PyObject * FrsMaterial_setDiffuse( BPy_FrsMaterial *self, PyObject *args );
+static PyObject * FrsMaterial_setSpecular( BPy_FrsMaterial *self, PyObject *args );
+static PyObject * FrsMaterial_setAmbient( BPy_FrsMaterial *self, PyObject *args );
+static PyObject * FrsMaterial_setEmission( BPy_FrsMaterial *self, PyObject *args );
+static PyObject * FrsMaterial_setShininess( BPy_FrsMaterial *self, PyObject *args );
 
-/*----------------------Material instance definitions ----------------------------*/
-static PyMethodDef BPy_Material_methods[] = {
-	{"diffuse", ( PyCFunction ) Material_diffuse, METH_NOARGS, "() Returns the diffuse color as a 4 float array"},
-	{"diffuseR", ( PyCFunction ) Material_diffuseR, METH_NOARGS, "() Returns the red component of the diffuse color "},
-	{"diffuseG", ( PyCFunction ) Material_diffuseG, METH_NOARGS, "() Returns the green component of the diffuse color "},
-	{"diffuseB", ( PyCFunction ) Material_diffuseB, METH_NOARGS, "() Returns the blue component of the diffuse color "},
-	{"diffuseA", ( PyCFunction ) Material_diffuseA, METH_NOARGS, "() Returns the alpha component of the diffuse color "},
-	{"specular", ( PyCFunction ) Material_specular, METH_NOARGS, "() Returns the specular color as a 4 float array"},
-	{"specularR", ( PyCFunction ) Material_specularR, METH_NOARGS, "() Returns the red component of the specular color "},
-	{"specularG", ( PyCFunction ) Material_specularG, METH_NOARGS, "() Returns the green component of the specular color "},
-	{"specularB", ( PyCFunction ) Material_specularB, METH_NOARGS, "() Returns the blue component of the specular color "},
-	{"specularA", ( PyCFunction ) Material_specularA, METH_NOARGS, "() Returns the alpha component of the specular color "},
-	{"ambient", ( PyCFunction ) Material_ambient, METH_NOARGS, "() Returns the ambient color as a 4 float array"},
-	{"ambientR", ( PyCFunction ) Material_ambientR, METH_NOARGS, "() Returns the red component of the ambient color "},
-	{"ambientG", ( PyCFunction ) Material_ambientG, METH_NOARGS, "() Returns the green component of the ambient color "},
-	{"ambientB", ( PyCFunction ) Material_ambientB, METH_NOARGS, "() Returns the blue component of the ambient color "},
-	{"ambientA", ( PyCFunction ) Material_ambientA, METH_NOARGS, "() Returns the alpha component of the ambient color "},
-	{"emission", ( PyCFunction ) Material_emission, METH_NOARGS, "() Returns the emission color as a 4 float array"},
-	{"emissionR", ( PyCFunction ) Material_emissionR, METH_NOARGS, "() Returns the red component of the emission color "},
-	{"emissionG", ( PyCFunction ) Material_emissionG, METH_NOARGS, "() Returns the green component of the emission color "},
-	{"emissionB", ( PyCFunction ) Material_emissionB, METH_NOARGS, "() Returns the blue component of the emission color "},
-	{"emissionA", ( PyCFunction ) Material_emissionA, METH_NOARGS, "() Returns the alpha component of the emission color "},
-	{"shininess", ( PyCFunction ) Material_shininess, METH_NOARGS, "() Returns the shininess coefficient "},
-	{"setDiffuse", ( PyCFunction ) Material_setDiffuse, METH_NOARGS, "(float r, float g, float b, float a) Sets the diffuse color"},
-	{"setSpecular", ( PyCFunction ) Material_setSpecular, METH_NOARGS, "(float r, float g, float b, float a) Sets the specular color"},
-	{"setAmbient", ( PyCFunction ) Material_setAmbient, METH_NOARGS, "(float r, float g, float b, float a) Sets the ambient color"},
-	{"setEmission", ( PyCFunction ) Material_setEmission, METH_NOARGS, "(float r, float g, float b, float a) Sets the emission color"},
-	{"setShininess", ( PyCFunction ) Material_setShininess, METH_NOARGS, "(float r, float g, float b, float a) Sets the shininess color"},
+/*----------------------FrsMaterial instance definitions ----------------------------*/
+static PyMethodDef BPy_FrsMaterial_methods[] = {
+	{"diffuse", ( PyCFunction ) FrsMaterial_diffuse, METH_NOARGS, "() Returns the diffuse color as a 4 float array"},
+	{"diffuseR", ( PyCFunction ) FrsMaterial_diffuseR, METH_NOARGS, "() Returns the red component of the diffuse color "},
+	{"diffuseG", ( PyCFunction ) FrsMaterial_diffuseG, METH_NOARGS, "() Returns the green component of the diffuse color "},
+	{"diffuseB", ( PyCFunction ) FrsMaterial_diffuseB, METH_NOARGS, "() Returns the blue component of the diffuse color "},
+	{"diffuseA", ( PyCFunction ) FrsMaterial_diffuseA, METH_NOARGS, "() Returns the alpha component of the diffuse color "},
+	{"specular", ( PyCFunction ) FrsMaterial_specular, METH_NOARGS, "() Returns the specular color as a 4 float array"},
+	{"specularR", ( PyCFunction ) FrsMaterial_specularR, METH_NOARGS, "() Returns the red component of the specular color "},
+	{"specularG", ( PyCFunction ) FrsMaterial_specularG, METH_NOARGS, "() Returns the green component of the specular color "},
+	{"specularB", ( PyCFunction ) FrsMaterial_specularB, METH_NOARGS, "() Returns the blue component of the specular color "},
+	{"specularA", ( PyCFunction ) FrsMaterial_specularA, METH_NOARGS, "() Returns the alpha component of the specular color "},
+	{"ambient", ( PyCFunction ) FrsMaterial_ambient, METH_NOARGS, "() Returns the ambient color as a 4 float array"},
+	{"ambientR", ( PyCFunction ) FrsMaterial_ambientR, METH_NOARGS, "() Returns the red component of the ambient color "},
+	{"ambientG", ( PyCFunction ) FrsMaterial_ambientG, METH_NOARGS, "() Returns the green component of the ambient color "},
+	{"ambientB", ( PyCFunction ) FrsMaterial_ambientB, METH_NOARGS, "() Returns the blue component of the ambient color "},
+	{"ambientA", ( PyCFunction ) FrsMaterial_ambientA, METH_NOARGS, "() Returns the alpha component of the ambient color "},
+	{"emission", ( PyCFunction ) FrsMaterial_emission, METH_NOARGS, "() Returns the emission color as a 4 float array"},
+	{"emissionR", ( PyCFunction ) FrsMaterial_emissionR, METH_NOARGS, "() Returns the red component of the emission color "},
+	{"emissionG", ( PyCFunction ) FrsMaterial_emissionG, METH_NOARGS, "() Returns the green component of the emission color "},
+	{"emissionB", ( PyCFunction ) FrsMaterial_emissionB, METH_NOARGS, "() Returns the blue component of the emission color "},
+	{"emissionA", ( PyCFunction ) FrsMaterial_emissionA, METH_NOARGS, "() Returns the alpha component of the emission color "},
+	{"shininess", ( PyCFunction ) FrsMaterial_shininess, METH_NOARGS, "() Returns the shininess coefficient "},
+	{"setDiffuse", ( PyCFunction ) FrsMaterial_setDiffuse, METH_NOARGS, "(float r, float g, float b, float a) Sets the diffuse color"},
+	{"setSpecular", ( PyCFunction ) FrsMaterial_setSpecular, METH_NOARGS, "(float r, float g, float b, float a) Sets the specular color"},
+	{"setAmbient", ( PyCFunction ) FrsMaterial_setAmbient, METH_NOARGS, "(float r, float g, float b, float a) Sets the ambient color"},
+	{"setEmission", ( PyCFunction ) FrsMaterial_setEmission, METH_NOARGS, "(float r, float g, float b, float a) Sets the emission color"},
+	{"setShininess", ( PyCFunction ) FrsMaterial_setShininess, METH_NOARGS, "(float r, float g, float b, float a) Sets the shininess color"},
 	{NULL, NULL, 0, NULL}
 };
 
-/*-----------------------BPy_Material type definition ------------------------------*/
+/*-----------------------BPy_FrsMaterial type definition ------------------------------*/
 
-PyTypeObject Material_Type = {
+PyTypeObject FrsMaterial_Type = {
 	PyObject_HEAD_INIT( NULL ) 
 	0,							/* ob_size */
-	"Material",				/* tp_name */
-	sizeof( BPy_Material ),	/* tp_basicsize */
+	"FrsMaterial",				/* tp_name */
+	sizeof( BPy_FrsMaterial ),	/* tp_basicsize */
 	0,							/* tp_itemsize */
 	
 	/* methods */
-	(destructor)Material___dealloc__,	/* tp_dealloc */
+	(destructor)FrsMaterial___dealloc__,	/* tp_dealloc */
 	NULL,                       				/* printfunc tp_print; */
 	NULL,                       				/* getattrfunc tp_getattr; */
 	NULL,                       				/* setattrfunc tp_setattr; */
 	NULL,										/* tp_compare */
-	(reprfunc)Material___repr__,					/* tp_repr */
+	(reprfunc)FrsMaterial___repr__,					/* tp_repr */
 
 	/* Method suites for standard classes */
 
@@ -129,7 +129,7 @@ PyTypeObject Material_Type = {
 	NULL,                       /* iternextfunc tp_iternext; */
 
   /*** Attribute descriptor and subclassing stuff ***/
-	BPy_Material_methods,	/* struct PyMethodDef *tp_methods; */
+	BPy_FrsMaterial_methods,	/* struct PyMethodDef *tp_methods; */
 	NULL,                       	/* struct PyMemberDef *tp_members; */
 	NULL,         					/* struct PyGetSetDef *tp_getset; */
 	NULL,							/* struct _typeobject *tp_base; */
@@ -137,7 +137,7 @@ PyTypeObject Material_Type = {
 	NULL,							/* descrgetfunc tp_descr_get; */
 	NULL,							/* descrsetfunc tp_descr_set; */
 	0,                          	/* long tp_dictoffset; */
-	(initproc)Material___init__, /* initproc tp_init; */
+	(initproc)FrsMaterial___init__, /* initproc tp_init; */
 	NULL,							/* allocfunc tp_alloc; */
 	PyType_GenericNew,		/* newfunc tp_new; */
 	
@@ -157,21 +157,21 @@ PyTypeObject Material_Type = {
 };
 
 //-------------------MODULE INITIALIZATION--------------------------------
-PyMODINIT_FUNC Material_Init( PyObject *module )
+PyMODINIT_FUNC FrsMaterial_Init( PyObject *module )
 {
 	if( module == NULL )
 		return;
 
-	if( PyType_Ready( &Material_Type ) < 0 )
+	if( PyType_Ready( &FrsMaterial_Type ) < 0 )
 		return;
 
-	Py_INCREF( &Material_Type );
-	PyModule_AddObject(module, "Material", (PyObject *)&Material_Type);
+	Py_INCREF( &FrsMaterial_Type );
+	PyModule_AddObject(module, "FrsMaterial", (PyObject *)&FrsMaterial_Type);
 }
 
 //------------------------INSTANCE METHODS ----------------------------------
 
-int Material___init__(BPy_Material *self, PyObject *args, PyObject *kwds)
+int FrsMaterial___init__(BPy_FrsMaterial *self, PyObject *args, PyObject *kwds)
 {
 	PyObject *obj1 = 0;
 	float f1 = 0, f2 = 0., f3 = 0., f4 = 0., f5 = 0.;
@@ -182,9 +182,9 @@ int Material___init__(BPy_Material *self, PyObject *args, PyObject *kwds)
 	if( !obj1 ){
 		self->m = new Material();
 
-	} else if( BPy_Material_Check(obj1) ) {
-		if( ((BPy_Material *) obj1)->m )
-			self->m = new Material(*( ((BPy_Material *) obj1)->m ));
+	} else if( BPy_FrsMaterial_Check(obj1) ) {
+		if( ((BPy_FrsMaterial *) obj1)->m )
+			self->m = new Material(*( ((BPy_FrsMaterial *) obj1)->m ));
 		else
 			return -1;
 
@@ -199,19 +199,19 @@ int Material___init__(BPy_Material *self, PyObject *args, PyObject *kwds)
 	return 0;
 }
 
-void Material___dealloc__( BPy_Material* self)
+void FrsMaterial___dealloc__( BPy_FrsMaterial* self)
 {
 	delete self->m;
     self->ob_type->tp_free((PyObject*)self);
 }
 
 
-PyObject * Material___repr__( BPy_Material* self)
+PyObject * FrsMaterial___repr__( BPy_FrsMaterial* self)
 {
-    return PyString_FromFormat("Material - address: %p", self->m );
+    return PyString_FromFormat("FrsMaterial - address: %p", self->m );
 }
 
-PyObject * Material_diffuse( BPy_Material* self) {
+PyObject * FrsMaterial_diffuse( BPy_FrsMaterial* self) {
 	PyObject *tmp;
 	
 	const float *diffuse = self->m->diffuse();
@@ -225,23 +225,23 @@ PyObject * Material_diffuse( BPy_Material* self) {
 	return py_diffuse;
 }
 
-PyObject * Material_diffuseR( BPy_Material* self) {
+PyObject * FrsMaterial_diffuseR( BPy_FrsMaterial* self) {
 	return PyFloat_FromDouble( self->m->diffuseR() );
 }
 
-PyObject * Material_diffuseG( BPy_Material* self) {
+PyObject * FrsMaterial_diffuseG( BPy_FrsMaterial* self) {
 	return PyFloat_FromDouble( self->m->diffuseG() );
 }
 
-PyObject * Material_diffuseB( BPy_Material* self) {
+PyObject * FrsMaterial_diffuseB( BPy_FrsMaterial* self) {
 	return PyFloat_FromDouble( self->m->diffuseB() );
 }
 
-PyObject * Material_diffuseA( BPy_Material* self) {
+PyObject * FrsMaterial_diffuseA( BPy_FrsMaterial* self) {
 	return PyFloat_FromDouble( self->m->diffuseA() );
 }
 
-PyObject * Material_specular( BPy_Material* self) {
+PyObject * FrsMaterial_specular( BPy_FrsMaterial* self) {
 	PyObject *tmp;
 	
 	const float *specular = self->m->specular();
@@ -255,23 +255,23 @@ PyObject * Material_specular( BPy_Material* self) {
 	return py_specular;
 }
 
-PyObject * Material_specularR( BPy_Material* self) {
+PyObject * FrsMaterial_specularR( BPy_FrsMaterial* self) {
 	return PyFloat_FromDouble( self->m->specularR() );
 }
 
-PyObject * Material_specularG( BPy_Material* self) {
+PyObject * FrsMaterial_specularG( BPy_FrsMaterial* self) {
 	return PyFloat_FromDouble( self->m->specularG() );
 }
 
-PyObject * Material_specularB( BPy_Material* self) {
+PyObject * FrsMaterial_specularB( BPy_FrsMaterial* self) {
 	return PyFloat_FromDouble( self->m->specularB() );
 }
 
-PyObject * Material_specularA( BPy_Material* self) {
+PyObject * FrsMaterial_specularA( BPy_FrsMaterial* self) {
 	return PyFloat_FromDouble( self->m->specularA() );
 }
 
-PyObject * Material_ambient( BPy_Material* self) {
+PyObject * FrsMaterial_ambient( BPy_FrsMaterial* self) {
 	PyObject *tmp;
 	
 	const float *ambient = self->m->ambient();
@@ -285,23 +285,23 @@ PyObject * Material_ambient( BPy_Material* self) {
 	return py_ambient;
 }
 
-PyObject * Material_ambientR( BPy_Material* self) {
+PyObject * FrsMaterial_ambientR( BPy_FrsMaterial* self) {
 	return PyFloat_FromDouble( self->m->ambientR() );
 }
 
-PyObject * Material_ambientG( BPy_Material* self) {
+PyObject * FrsMaterial_ambientG( BPy_FrsMaterial* self) {
 	return PyFloat_FromDouble( self->m->ambientG() );
 }
 
-PyObject * Material_ambientB( BPy_Material* self) {
+PyObject * FrsMaterial_ambientB( BPy_FrsMaterial* self) {
 	return PyFloat_FromDouble( self->m->ambientB() );
 }
 
-PyObject * Material_ambientA( BPy_Material* self) {
+PyObject * FrsMaterial_ambientA( BPy_FrsMaterial* self) {
 	return PyFloat_FromDouble( self->m->ambientA() );
 }
 
-PyObject * Material_emission( BPy_Material* self) {
+PyObject * FrsMaterial_emission( BPy_FrsMaterial* self) {
 	PyObject *tmp;
 	
 	const float *emission = self->m->emission();
@@ -315,31 +315,31 @@ PyObject * Material_emission( BPy_Material* self) {
 	return py_emission;
 }
 
-PyObject * Material_emissionR( BPy_Material* self) {
+PyObject * FrsMaterial_emissionR( BPy_FrsMaterial* self) {
 	return PyFloat_FromDouble( self->m->emissionR() );
 }
 
-PyObject * Material_emissionG( BPy_Material* self) {
+PyObject * FrsMaterial_emissionG( BPy_FrsMaterial* self) {
 	return PyFloat_FromDouble( self->m->emissionG() );
 }
 
-PyObject * Material_emissionB( BPy_Material* self) {
+PyObject * FrsMaterial_emissionB( BPy_FrsMaterial* self) {
 	return PyFloat_FromDouble( self->m->emissionB() );
 }
 
-PyObject * Material_emissionA( BPy_Material* self) {
+PyObject * FrsMaterial_emissionA( BPy_FrsMaterial* self) {
 	return PyFloat_FromDouble( self->m->emissionA() );
 }
 
-PyObject * Material_shininess( BPy_Material* self) {
+PyObject * FrsMaterial_shininess( BPy_FrsMaterial* self) {
 	return PyFloat_FromDouble( self->m->shininess() );
 }
 
-PyObject * Material_setDiffuse( BPy_Material *self, PyObject *args ) {
+PyObject * FrsMaterial_setDiffuse( BPy_FrsMaterial *self, PyObject *args ) {
 	float f1, f2, f3, f4;
 
 	if(!( PyArg_ParseTuple(args, "ffff", &f1, &f2, &f3, &f4)  )) {
-		cout << "ERROR: Material_setDiffuse" << endl;
+		cout << "ERROR: FrsMaterial_setDiffuse" << endl;
 		Py_RETURN_NONE;
 	}
 
@@ -348,11 +348,11 @@ PyObject * Material_setDiffuse( BPy_Material *self, PyObject *args ) {
 	Py_RETURN_NONE;
 }
  
-PyObject * Material_setSpecular( BPy_Material *self, PyObject *args ) {
+PyObject * FrsMaterial_setSpecular( BPy_FrsMaterial *self, PyObject *args ) {
 	float f1, f2, f3, f4;
 
 	if(!( PyArg_ParseTuple(args, "ffff", &f1, &f2, &f3, &f4)  )) {
-		cout << "ERROR: Material_setSpecular" << endl;
+		cout << "ERROR: FrsMaterial_setSpecular" << endl;
 		Py_RETURN_NONE;
 	}
 
@@ -361,11 +361,11 @@ PyObject * Material_setSpecular( BPy_Material *self, PyObject *args ) {
 	Py_RETURN_NONE;
 }
 
-PyObject * Material_setAmbient( BPy_Material *self, PyObject *args ) {
+PyObject * FrsMaterial_setAmbient( BPy_FrsMaterial *self, PyObject *args ) {
 	float f1, f2, f3, f4;
 
 	if(!( PyArg_ParseTuple(args, "ffff", &f1, &f2, &f3, &f4)  )) {
-		cout << "ERROR: Material_setAmbient" << endl;
+		cout << "ERROR: FrsMaterial_setAmbient" << endl;
 		Py_RETURN_NONE;
 	}
 
@@ -374,11 +374,11 @@ PyObject * Material_setAmbient( BPy_Material *self, PyObject *args ) {
 	Py_RETURN_NONE;
 }
 
-PyObject * Material_setEmission( BPy_Material *self, PyObject *args ) {
+PyObject * FrsMaterial_setEmission( BPy_FrsMaterial *self, PyObject *args ) {
 	float f1, f2, f3, f4;
 
 	if(!( PyArg_ParseTuple(args, "ffff", &f1, &f2, &f3, &f4)  )) {
-		cout << "ERROR: Material_setEmission" << endl;
+		cout << "ERROR: FrsMaterial_setEmission" << endl;
 		Py_RETURN_NONE;
 	}
 
@@ -387,11 +387,11 @@ PyObject * Material_setEmission( BPy_Material *self, PyObject *args ) {
 	Py_RETURN_NONE;
 }
 
-PyObject * Material_setShininess( BPy_Material *self, PyObject *args ) {
+PyObject * FrsMaterial_setShininess( BPy_FrsMaterial *self, PyObject *args ) {
 	float f;
 
 	if(!( PyArg_ParseTuple(args, "f", &f)  )) {
-		cout << "ERROR: Material_setShininess" << endl;
+		cout << "ERROR: FrsMaterial_setShininess" << endl;
 		Py_RETURN_NONE;
 	}
 
diff --git a/source/blender/freestyle/intern/python/BPy_FrsMaterial.h b/source/blender/freestyle/intern/python/BPy_FrsMaterial.h
index e1c31864b63..b25ddfc77bc 100644
--- a/source/blender/freestyle/intern/python/BPy_FrsMaterial.h
+++ b/source/blender/freestyle/intern/python/BPy_FrsMaterial.h
@@ -1,5 +1,5 @@
-#ifndef FREESTYLE_PYTHON_MATERIAL_H
-#define FREESTYLE_PYTHON_MATERIAL_H
+#ifndef FREESTYLE_PYTHON_FRSMATERIAL_H
+#define FREESTYLE_PYTHON_FRSMATERIAL_H
 
 #include "../scene_graph/Material.h"
 
@@ -11,19 +11,19 @@ extern "C" {
 
 #include <Python.h>
 
-extern PyTypeObject Material_Type;
+extern PyTypeObject FrsMaterial_Type;
 
-#define BPy_Material_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Material_Type)  )
+#define BPy_FrsMaterial_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &FrsMaterial_Type)  )
 
-/*---------------------------Python BPy_Material structure definition----------*/
+/*---------------------------Python BPy_FrsMaterial structure definition----------*/
 typedef struct {
 	PyObject_HEAD
 	Material *m;
-} BPy_Material;
+} BPy_FrsMaterial;
 
-/*---------------------------Python BPy_Material visible prototypes-----------*/
+/*---------------------------Python BPy_FrsMaterial visible prototypes-----------*/
 
-PyMODINIT_FUNC Material_Init( PyObject *module );
+PyMODINIT_FUNC FrsMaterial_Init( PyObject *module );
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////
@@ -33,4 +33,4 @@ PyMODINIT_FUNC Material_Init( PyObject *module );
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_MATERIAL_H */
+#endif /* FREESTYLE_PYTHON_FRSMATERIAL_H */
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
index 8911cc7f290..22a4dbc378e 100644
--- a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
@@ -175,12 +175,12 @@ PyObject * FEdgeSharp_bMaterialIndex( BPy_FEdgeSharp *self ) {
 
 PyObject * FEdgeSharp_aMaterial( BPy_FEdgeSharp *self ) {
 	Material m( self->fes->aMaterial() );
-	return BPy_Material_from_Material(m);
+	return BPy_FrsMaterial_from_Material(m);
 }
 
 PyObject * FEdgeSharp_bMaterial( BPy_FEdgeSharp *self ) {
 	Material m( self->fes->aMaterial() );
-	return BPy_Material_from_Material(m);
+	return BPy_FrsMaterial_from_Material(m);
 }
 
 PyObject * FEdgeSharp_setNormalA( BPy_FEdgeSharp *self, PyObject *args ) {
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp
index 52b501e0746..6a11b6c1e98 100644
--- a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp
@@ -158,7 +158,7 @@ PyObject * FEdgeSmooth_materialIndex( BPy_FEdgeSmooth *self ) {
 
 PyObject * FEdgeSmooth_material( BPy_FEdgeSmooth *self ) {
 	Material m( self->fes->material() );
-	return BPy_Material_from_Material(m);
+	return BPy_FrsMaterial_from_Material(m);
 }
 
 PyObject * FEdgeSmooth_setNormal( BPy_FEdgeSmooth *self, PyObject *args ) {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp
index f524eb25352..733acce6ab8 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp
@@ -165,7 +165,7 @@ PyObject * UnaryFunction0DMaterial___call__( BPy_UnaryFunction0DMaterial *self,
 	}
 	
 	Material m( self->uf0D_material->operator()(*( ((BPy_Interface0DIterator *) obj)->if0D_it )) );
-	return BPy_Material_from_Material( m );
+	return BPy_FrsMaterial_from_Material( m );
 
 }
 
diff --git a/source/blender/freestyle/intern/stroke/Stroke.cpp b/source/blender/freestyle/intern/stroke/Stroke.cpp
index c6b52358264..b1d6e466215 100755
--- a/source/blender/freestyle/intern/stroke/Stroke.cpp
+++ b/source/blender/freestyle/intern/stroke/Stroke.cpp
@@ -404,7 +404,9 @@ Stroke::Stroke(const Stroke& iBrother)
   _mediumType = iBrother._mediumType;
   _textureId = iBrother._textureId;
   _tips = iBrother._tips;
-  _rep = new StrokeRep(*(iBrother._rep));
+  
+	if(iBrother._rep) 
+		_rep = new StrokeRep(*(iBrother._rep));
 }
 
 Stroke::~Stroke()
diff --git a/source/blender/freestyle/intern/system/Iterator.h b/source/blender/freestyle/intern/system/Iterator.h
index 10862d7c8da..d4d9d0aa02c 100644
--- a/source/blender/freestyle/intern/system/Iterator.h
+++ b/source/blender/freestyle/intern/system/Iterator.h
@@ -5,6 +5,7 @@
 #include <string>
 using namespace std;
 
+
 class Iterator
 {
 public:
@@ -16,20 +17,20 @@ public:
   }
 
   virtual void increment() {
-	cerr << "Warning: method increment() not implemented" << endl;
+	cerr << "Warning: increment() not implemented" << endl;
   }
 
   virtual void decrement() {
-	cerr << "Warning: method decrement() not implemented" << endl;
+	cerr << "Warning: decrement() not implemented" << endl;
   }
 
   virtual bool isBegin() const {
-	cerr << "Warning: method isBegin() not implemented" << endl;
+	cerr << "Warning: isBegin() not implemented" << endl;
 	return false;
-  }
+  }	
 
   virtual bool isEnd() const {
-	cerr << "Warning: method isEnd() not implemented" << endl;
+	cerr << "Warning:  isEnd() not implemented" << endl;
 	return false;
   }
 
diff --git a/source/blender/freestyle/style_modules_blender/freestyle_init.py b/source/blender/freestyle/style_modules_blender/freestyle_init.py
index e4ad8a9f769..ba641bd0e3b 100644
--- a/source/blender/freestyle/style_modules_blender/freestyle_init.py
+++ b/source/blender/freestyle/style_modules_blender/freestyle_init.py
@@ -33,8 +33,8 @@ class MediumType(Blender.Freestyle.MediumType):
 class Nature(Blender.Freestyle.Nature):
 	pass
 
-# class Noise(Blender.Freestyle.Noise):
-# 	pass
+class FrsNoise(Blender.Freestyle.FrsNoise):
+	pass
 
 class Operators(Blender.Freestyle.Operators):
 	pass
@@ -90,8 +90,8 @@ class SVertex(Blender.Freestyle.SVertex):
 class ViewVertex(Blender.Freestyle.ViewVertex):
 	pass
 
-# class Curve(Blender.Freestyle.Curve):
-# 	pass
+class FrsCurve(Blender.Freestyle.FrsCurve):
+	pass
 
 class FEdge(Blender.Freestyle.FEdge):
 	pass
diff --git a/source/blender/freestyle/style_modules_blender/shaders.py b/source/blender/freestyle/style_modules_blender/shaders.py
index bed23adff5f..610e1d2a943 100755
--- a/source/blender/freestyle/style_modules_blender/shaders.py
+++ b/source/blender/freestyle/style_modules_blender/shaders.py
@@ -909,7 +909,7 @@ class pySinusDisplacementShader(StrokeShader):
 class pyPerlinNoise1DShader(StrokeShader):
 	def __init__(self, freq = 10, amp = 10, oct = 4):
 		StrokeShader.__init__(self)
-		self.__noise = Noise()
+		self.__noise = FrsNoise()
 		self.__freq = freq
 		self.__amp = amp
 		self.__oct = oct
@@ -928,7 +928,7 @@ class pyPerlinNoise1DShader(StrokeShader):
 class pyPerlinNoise2DShader(StrokeShader):
 	def __init__(self, freq = 10, amp = 10, oct = 4):
 		StrokeShader.__init__(self)
-		self.__noise = Noise()
+		self.__noise = FrsNoise()
 		self.__freq = freq
 		self.__amp = amp
 		self.__oct = oct

From b767d406ad933dd9354757eb228f63dfc59c1c57 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Fri, 1 Aug 2008 13:00:53 +0000
Subject: [PATCH 178/252] Mouse cursor positioning and selections now work with
 word-wrapped text. It's not the best solution but it does the job for now. I
 wanted to get a working version committed before I improve/break it.

---
 source/blender/src/drawtext.c | 114 ++++++++++++++++++++++++++++++----
 1 file changed, 101 insertions(+), 13 deletions(-)

diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index 3cd552c563b..335062cb055 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -139,6 +139,9 @@ static int check_specialvars(char *string);
 static int check_identifier(char ch);
 static int check_whitespace(char ch);
 
+static int get_wrap_width(SpaceText *st);
+static int get_wrap_points(SpaceText *st, char *line);
+
 static void get_suggest_prefix(Text *text);
 static void confirm_suggestion(Text *text, int skipleft);
 
@@ -558,14 +561,6 @@ static void set_cursor_to_pos (SpaceText *st, int x, int y, int sel)
 	else { linep= &text->curl; charp= &text->curc; }
 	
 	y= (curarea->winy - y)/st->lheight;
-	
-	y-= txt_get_span(text->lines.first, *linep) - st->top;
-	
-	if (y>0) {
-		while (y-- != 0) if((*linep)->next) *linep= (*linep)->next;
-	} else if (y<0) {
-		while (y++ != 0) if((*linep)->prev) *linep= (*linep)->prev;
-	}
 
 	if(st->showlinenrs)
 		x-= TXT_OFFSET+TEXTXLOC;
@@ -575,10 +570,103 @@ static void set_cursor_to_pos (SpaceText *st, int x, int y, int sel)
 	if (x<0) x= 0;
 	x = (x/spacetext_get_fontwidth(st)) + st->left;
 	
-	w= render_string(st, (*linep)->line);
-	if(x<w) *charp= temp_char_accum[x];
-	else *charp= (*linep)->len;
-	
+	if (st->wordwrap) {
+		int i, j, endj, curs, max, chop, start, end, chars, loop;
+		char ch;
+
+		/* Point to first visible line */
+		*linep= text->lines.first;
+		for (i=0; i<st->top && (*linep)->next; i++) *linep= (*linep)->next;
+
+		max= get_wrap_width(st);
+
+		loop= 1;
+		while (loop && *linep) {
+			start= 0;
+			end= max;
+			chop= 1;
+			chars= 0;
+			curs= 0;
+			for (i=0, j=0; loop; j++) {
+
+				/* Mimic replacement of tabs */
+				ch= (*linep)->line[j];
+				if (ch=='\t') {
+					chars= st->tabnumber-i%st->tabnumber;
+					ch= ' ';
+				} else
+					chars= 1;
+
+				while (chars--) {
+					/* Gone too far, go back to last wrap point */
+					if (y<0) {
+						*charp= endj;
+						loop= 0;
+						break;
+					/* Exactly at the cursor, done */
+					} else if (y==0 && i-start==x) {
+						*charp= curs= j;
+						loop= 0;
+						break;
+					/* Prepare curs for next wrap */
+					} else if (i-end==x) {
+						curs= j;
+					}
+					if (i-start>=max) {
+						if (chop) endj= j;
+						y--;
+						start= end;
+						end += max;
+						chop= 1;
+						if (y==0 && i-start>=x) {
+							*charp= curs;
+							loop= 0;
+							break;
+						}
+					} else if (ch==' ' || ch=='-' || ch=='\0') {
+						if (y==0 && i-start>=x) {
+							*charp= curs;
+							loop= 0;
+							break;
+						}
+						end = i+1;
+						endj = j;
+						chop= 0;
+					}
+					i++;
+				}
+				if (ch=='\0') break;
+			}
+			if (!loop || y<0) break;
+
+			if (!(*linep)->next) {
+				*charp= (*linep)->len;
+				break;
+			}
+			
+			/* On correct line but didn't meet cursor, must be at end */
+			if (y==0) {
+				*charp= (*linep)->len;
+				break;
+			}
+			*linep= (*linep)->next;
+			y--;
+		}
+
+	} else {
+		y-= txt_get_span(text->lines.first, *linep) - st->top;
+		
+		if (y>0) {
+			while (y-- != 0) if((*linep)->next) *linep= (*linep)->next;
+		} else if (y<0) {
+			while (y++ != 0) if((*linep)->prev) *linep= (*linep)->prev;
+		}
+
+		
+		w= render_string(st, (*linep)->line);
+		if(x<w) *charp= temp_char_accum[x];
+		else *charp= (*linep)->len;
+	}
 	if(!sel) txt_pop_sel(text);
 }
 
@@ -1000,7 +1088,7 @@ static void do_selection(SpaceText *st, int selecting)
 
 			scrarea_do_windraw(curarea);
 			screen_swapbuffers();
-		} else if (mval[0]<0 || mval[0]>curarea->winx) {
+		} else if (!st->wordwrap && (mval[0]<0 || mval[0]>curarea->winx)) {
 			if (mval[0]>curarea->winx) st->left++;
 			else if (mval[0]<0 && st->left>0) st->left--;
 			

From 2568b3d4868ee00f02ee5f66c5fc8d6d7e16ca3b Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Fri, 1 Aug 2008 20:01:01 +0000
Subject: [PATCH 179/252] Draw embeding points in blue, easy to visualize long
 stretches without embedings.

---
 source/blender/src/reeb.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/source/blender/src/reeb.c b/source/blender/src/reeb.c
index e03168025b1..2c51c1e27c4 100644
--- a/source/blender/src/reeb.c
+++ b/source/blender/src/reeb.c
@@ -3432,8 +3432,6 @@ void REEB_draw()
 		char text[128];
 		char *s = text;
 		
-		initArcIterator(&iter, arc, arc->head);
-		
 		if (arc->symmetry_level == 1)
 		{
 			glColor3f(1, 0, 0);
@@ -3455,6 +3453,7 @@ void REEB_draw()
 			
 			if (arc->bcount)
 			{
+				initArcIterator(&iter, arc, arc->head);
 				for (bucket = nextBucket(&iter); bucket; bucket = nextBucket(&iter))
 				{
 					glVertex3fv(bucket->p);
@@ -3469,6 +3468,16 @@ void REEB_draw()
 		glBegin(GL_POINTS);
 			glVertex3fv(arc->head->p);
 			glVertex3fv(arc->tail->p);
+			
+			glColor3f(0.5f, 0.5f, 1);				
+			if (arc->bcount)
+			{
+				initArcIterator(&iter, arc, arc->head);
+				for (bucket = nextBucket(&iter); bucket; bucket = nextBucket(&iter))
+				{
+					glVertex3fv(bucket->p);
+				}
+			}
 		glEnd();
 		
 		VecLerpf(vec, arc->head->p, arc->tail->p, 0.5f);

From ede6c42dc230812eb60b640c745715e6b61ad4db Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Fri, 1 Aug 2008 20:29:42 +0000
Subject: [PATCH 180/252] Fix problem with long stretches without embedding
 between head/tail nodes and the actual start and end of embedding bucket.

Instead of having to muck around in the generating and retargetting code to deal with those cases, just fill dummy buckets with interpolations.
---
 source/blender/src/reeb.c | 67 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)

diff --git a/source/blender/src/reeb.c b/source/blender/src/reeb.c
index 2c51c1e27c4..a4d2887ae04 100644
--- a/source/blender/src/reeb.c
+++ b/source/blender/src/reeb.c
@@ -737,6 +737,71 @@ void fillArcEmptyBuckets(ReebArc *arc)
 	}
 }
 
+static void ExtendArcBuckets(ReebArc *arc)
+{
+	ReebArcIterator iter;
+	EmbedBucket *previous, *bucket, *last_bucket, *first_bucket;
+	float average_length = 0, length;
+	int padding_head = 0, padding_tail = 0;
+	
+	initArcIterator(&iter, arc, arc->head);
+	
+	for (	previous = nextBucket(&iter), bucket = nextBucket(&iter);
+			bucket;
+			previous = bucket, bucket = nextBucket(&iter)
+		)
+	{
+		average_length += VecLenf(previous->p, bucket->p);
+	}
+	average_length /= (arc->bcount - 1);
+	
+	first_bucket = arc->buckets;
+	last_bucket = arc->buckets + (arc->bcount - 1);
+	
+	length = VecLenf(first_bucket->p, arc->head->p);
+	if (length > 2 * average_length)
+	{
+		padding_head = (int)floor(length / average_length);
+	}
+
+	length = VecLenf(last_bucket->p, arc->tail->p);
+	if (length > 2 * average_length)
+	{
+		padding_tail = (int)floor(length / average_length);
+	}
+	
+	if (padding_head + padding_tail > 0)
+	{
+		EmbedBucket *old_buckets = arc->buckets;
+		
+		arc->buckets = MEM_callocN(sizeof(EmbedBucket) * (padding_head + arc->bcount + padding_tail), "embed bucket");
+		memcpy(arc->buckets + padding_head, old_buckets, arc->bcount * sizeof(EmbedBucket));
+		
+		arc->bcount = padding_head + arc->bcount + padding_tail;
+	}
+	
+	if (padding_head > 0)
+	{
+		interpolateBuckets(arc, arc->head->p, first_bucket->p, 0, padding_head);
+	}
+	
+	if (padding_tail > 0)
+	{
+		interpolateBuckets(arc, last_bucket->p, arc->tail->p, arc->bcount - padding_tail, arc->bcount - 1);
+	}
+}
+
+/* CALL THIS ONLY AFTER FILTERING, SINCE IT MESSES UP WEIGHT DISTRIBUTION */
+void extendGraphBuckets(ReebGraph *rg)
+{
+	ReebArc *arc;
+	
+	for (arc = rg->arcs.first; arc; arc = arc->next)
+	{
+		ExtendArcBuckets(arc);
+	}
+}
+
 /**************************************** LENGTH CALCULATIONS ****************************************/
 
 void calculateArcLength(ReebArc *arc)
@@ -1749,6 +1814,8 @@ void finalizeGraph(ReebGraph *rg, char passes, char method)
 	{
 		postprocessGraph(rg, method);
 	}
+	
+	extendGraphBuckets(rg);
 }
 
 /************************************** WEIGHT SPREADING ***********************************************/

From 7565990db264dbb7771744cea0a1c87b3e11fc3f Mon Sep 17 00:00:00 2001
From: Maxime Curioni <maxime.curioni@gmail.com>
Date: Fri, 1 Aug 2008 21:55:58 +0000
Subject: [PATCH 181/252] soc-2008-mxcurioni: made considerable changes to
 support cross-language polymorphism for UnaryFunction0D, Interface0D,
 Interface1D. Add to change UnaryFunction1D<void> to static
 UnaryFunction1D_void. Resolved namespace collision on the Image class
 (changed to FrsImage). There is greater support for style modules but
 somehow, some do not show anything yet (japanese_bigbrush being an example).

---
 source/blender/freestyle/intern/image/Image.h |  44 ++++----
 .../freestyle/intern/python/BPy_Convert.cpp   |  61 ++++++++---
 .../freestyle/intern/python/BPy_Convert.h     |  25 ++++-
 .../intern/python/BPy_Interface1D.cpp         |  45 ++++++++
 .../freestyle/intern/python/Director.cpp      | 103 ++++++++++++++++--
 .../freestyle/intern/python/Director.h        |  32 ++----
 .../BPy_UnaryFunction0DDouble.cpp             |   6 +-
 .../BPy_UnaryFunction0DEdgeNature.cpp         |   1 +
 .../BPy_UnaryFunction0DFloat.cpp              |   1 +
 .../UnaryFunction0D/BPy_UnaryFunction0DId.cpp |   1 +
 .../BPy_UnaryFunction0DMaterial.cpp           |   1 +
 .../BPy_UnaryFunction0DUnsigned.cpp           |   1 +
 .../BPy_UnaryFunction0DVec2f.cpp              |   1 +
 .../BPy_UnaryFunction0DVec3f.cpp              |   1 +
 .../BPy_UnaryFunction0DVectorViewShape.cpp    |   1 +
 .../BPy_UnaryFunction0DViewShape.cpp          |   1 +
 .../BPy_UnaryFunction1DDouble.cpp             |   2 +
 .../BPy_UnaryFunction1DEdgeNature.cpp         |   2 +
 .../BPy_UnaryFunction1DFloat.cpp              |   2 +
 .../BPy_UnaryFunction1DUnsigned.cpp           |   2 +
 .../BPy_UnaryFunction1DVec2f.cpp              |   2 +
 .../BPy_UnaryFunction1DVec3f.cpp              |   2 +
 .../BPy_UnaryFunction1DVectorViewShape.cpp    |   2 +
 .../BPy_UnaryFunction1DVoid.cpp               |   6 +-
 .../UnaryFunction1D/BPy_UnaryFunction1DVoid.h |   2 +-
 .../freestyle/intern/stroke/Operators.cpp     |   4 +-
 .../freestyle/intern/stroke/Operators.h       |   2 +-
 .../freestyle/intern/stroke/Predicates1D.h    |   2 +-
 .../freestyle/intern/stroke/Stroke.cpp        |   6 +-
 .../freestyle/intern/view_map/Functions0D.h   |  19 +++-
 .../freestyle/intern/view_map/Functions1D.h   |  70 ++++++++----
 .../freestyle/intern/view_map/Interface1D.h   |  46 ++++++--
 32 files changed, 379 insertions(+), 117 deletions(-)

diff --git a/source/blender/freestyle/intern/image/Image.h b/source/blender/freestyle/intern/image/Image.h
index 83d6785e32f..e1e47c0ec43 100755
--- a/source/blender/freestyle/intern/image/Image.h
+++ b/source/blender/freestyle/intern/image/Image.h
@@ -44,12 +44,12 @@
  *  size w*h, and access these pixels using x,y coordinates 
  *  specified in the whole image coordinate system.
  */
-class Image
+class FrsImage
 {
  public:
 
    /*! Default constructor */
-  Image() {
+  FrsImage() {
     _storedWidth = 0;
     _storedHeight = 0;
     _width = 0;
@@ -59,7 +59,7 @@ class Image
   }
 
   /*! Copy constructor */
-  Image(const Image& brother) {
+  FrsImage(const FrsImage& brother) {
     _storedWidth = brother._storedWidth;
     _storedHeight = brother._storedHeight;
     _width = brother._width;
@@ -68,10 +68,10 @@ class Image
     _Oy = brother._Oy;
   }
 
-  /*! Builds an image from its width and height.
+  /*! Builds an FrsImage from its width and height.
    *  The memory is allocated consequently.
    */
-  Image(unsigned w, unsigned h) {
+  FrsImage(unsigned w, unsigned h) {
     _width = w;
     _height = h;
     _storedWidth = w;
@@ -98,7 +98,7 @@ class Image
    *    The x-abscissa of the origin of the rectangle that will actually 
    *    be stored.
    */
-  Image(unsigned w, unsigned h, unsigned sw, unsigned sh, unsigned ox, unsigned oy) {
+  FrsImage(unsigned w, unsigned h, unsigned sw, unsigned sh, unsigned ox, unsigned oy) {
     _width = w;
     _height = h;
     _storedWidth = sw;
@@ -108,7 +108,7 @@ class Image
   }
 
   /*! Operator= */
-  Image& operator=(const Image& brother) {
+  FrsImage& operator=(const FrsImage& brother) {
     _width = brother._width;
     _height = brother._height;
     _storedWidth = brother._storedWidth;
@@ -119,7 +119,7 @@ class Image
   }
 
   /*! Destructor */
-  virtual ~Image() {}
+  virtual ~FrsImage() {}
 
   /*! Returns the width of the complete image */
   inline unsigned width() const {
@@ -181,24 +181,24 @@ class Image
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-class RGBImage : public Image
+class RGBImage : public FrsImage
 {
  public:
 
-  RGBImage() : Image() {
+  RGBImage() : FrsImage() {
     _rgb = 0;
   }
 
-  RGBImage(const RGBImage& brother) : Image(brother) {
+  RGBImage(const RGBImage& brother) : FrsImage(brother) {
     _rgb = new float[3 * _storedWidth * _storedHeight];
     memcpy(_rgb, brother._rgb, 3 * _storedWidth * _storedHeight * sizeof(float));
   }
 
-  RGBImage(unsigned w, unsigned h) : Image(w, h) {
+  RGBImage(unsigned w, unsigned h) : FrsImage(w, h) {
     _rgb = new float[3 * _width * _height];
   }
 
-  RGBImage(float* rgb, unsigned w, unsigned h) : Image(w, h) {
+  RGBImage(float* rgb, unsigned w, unsigned h) : FrsImage(w, h) {
     _rgb = new float[3 * _width * _height];
     memcpy(_rgb, rgb, 3 * _width * _height * sizeof(float));
   }
@@ -218,13 +218,13 @@ class RGBImage : public Image
    *  \param sh
    *    The height of the part of the image we want to store and work on
    */
-  RGBImage(float* rgb, unsigned w, unsigned h, unsigned sw, unsigned sh, unsigned ox, unsigned oy) : Image(w, h, sw, sh, ox, oy) {
+  RGBImage(float* rgb, unsigned w, unsigned h, unsigned sw, unsigned sh, unsigned ox, unsigned oy) : FrsImage(w, h, sw, sh, ox, oy) {
     _rgb = new float[3 * _storedWidth * _storedHeight];
     memcpy(_rgb, rgb, 3 * _storedWidth * _storedHeight * sizeof(float));
   }
 
   RGBImage& operator=(const RGBImage& brother) {
-    dynamic_cast<Image&>(*this) = brother;
+    dynamic_cast<FrsImage&>(*this) = brother;
     _rgb = new float[3 * _storedWidth * _storedHeight];
     memcpy(_rgb, brother._rgb, 3 * _storedWidth * _storedHeight * sizeof(float));
     return* this;
@@ -296,25 +296,25 @@ class RGBImage : public Image
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-class GrayImage : public Image
+class GrayImage : public FrsImage
 {
  public:
 
-  GrayImage() : Image() {
+  GrayImage() : FrsImage() {
     _lvl = 0;
   }
 
-  GrayImage(const GrayImage& brother) : Image(brother) {
+  GrayImage(const GrayImage& brother) : FrsImage(brother) {
     _lvl = new float[_storedWidth*_storedHeight];
     memcpy(_lvl, brother._lvl, _storedWidth*_storedHeight*sizeof(*_lvl));
   }
 
   /*! Builds an empty gray image */
-  GrayImage(unsigned w, unsigned h) : Image(w, h) {
+  GrayImage(unsigned w, unsigned h) : FrsImage(w, h) {
     _lvl = new float[_width*_height];
   }
 
-  GrayImage(float* lvl, unsigned w, unsigned h) : Image(w, h) {
+  GrayImage(float* lvl, unsigned w, unsigned h) : FrsImage(w, h) {
     _lvl = new float[_width*_height];
     memcpy(_lvl, lvl, _width*_height*sizeof(*_lvl));
   }
@@ -334,13 +334,13 @@ class GrayImage : public Image
    *  \param sh
    *    The height of the part of the image we want to store and work on
    */
-  GrayImage(float* lvl, unsigned w, unsigned h, unsigned sw, unsigned sh, unsigned ox, unsigned oy) : Image(w, h, sw, sh, ox, oy) {
+  GrayImage(float* lvl, unsigned w, unsigned h, unsigned sw, unsigned sh, unsigned ox, unsigned oy) : FrsImage(w, h, sw, sh, ox, oy) {
     _lvl = new float[_storedWidth*_storedHeight];
     memcpy(_lvl, lvl, _storedWidth*_storedHeight*sizeof(float));
   }
 
   GrayImage& operator=(const GrayImage& brother) {
-    dynamic_cast<Image&>(*this) = brother;
+    dynamic_cast<FrsImage&>(*this) = brother;
     _lvl = new float[_storedWidth * _storedHeight];
     memcpy(_lvl, brother._lvl, _storedWidth * _storedHeight * sizeof(float));
   return *this;
diff --git a/source/blender/freestyle/intern/python/BPy_Convert.cpp b/source/blender/freestyle/intern/python/BPy_Convert.cpp
index e7d98440683..a1c26aaf622 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Convert.cpp
@@ -39,14 +39,15 @@ extern "C" {
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
+//==============================
+// C++ => Python
+//==============================
+
 
 PyObject * PyBool_from_bool( bool b ){
 	return PyBool_FromLong( b ? 1 : 0);
 }
 
-bool bool_from_PyBool( PyObject *b ) {
-	return b == Py_True;
-}
 
 PyObject * Vector_from_Vec2f( Vec2f& vec ) {
 	float vec_data[2]; // because vec->_coord is protected
@@ -224,19 +225,6 @@ PyObject * BPy_directedViewEdge_from_directedViewEdge( ViewVertex::directedViewE
 	return py_dve;
 }
 
-
-//==============================
-// Constants
-//==============================
-
-IntegrationType IntegrationType_from_BPy_IntegrationType( PyObject* obj ) {
-	return static_cast<IntegrationType>( PyInt_AsLong(obj) );
-}
-
-Stroke::MediumType MediumType_from_BPy_MediumType( PyObject* obj ) {
-	return static_cast<Stroke::MediumType>( PyInt_AsLong(obj) );
-}
-
 //==============================
 // Iterators
 //==============================
@@ -323,7 +311,48 @@ PyObject * BPy_ChainSilhouetteIterator_from_ChainSilhouetteIterator( ChainSilhou
 }
 
 
+//==============================
+// Python => C++
+//==============================
 
+bool bool_from_PyBool( PyObject *b ) {
+	return b == Py_True;
+}
+
+IntegrationType IntegrationType_from_BPy_IntegrationType( PyObject* obj ) {
+	return static_cast<IntegrationType>( PyInt_AsLong(obj) );
+}
+
+Stroke::MediumType MediumType_from_BPy_MediumType( PyObject* obj ) {
+	return static_cast<Stroke::MediumType>( PyInt_AsLong(obj) );
+}
+
+Nature::EdgeNature EdgeNature_from_BPy_Nature( PyObject* obj ) {
+	return static_cast<Nature::EdgeNature>( PyInt_AsLong(obj) );
+}
+
+Vec2f * Vec2f_ptr_from_Vector( PyObject* obj ) {
+	float x = PyFloat_AsDouble( PyObject_GetAttrString(obj,"x") );
+	float y = PyFloat_AsDouble( PyObject_GetAttrString(obj,"y") );
+	
+	return new Vec2f(x,y);
+}
+
+Vec3f * Vec3f_ptr_from_Vector( PyObject* obj ) {
+	float x = PyFloat_AsDouble( PyObject_GetAttrString(obj,"x") );
+	float y = PyFloat_AsDouble( PyObject_GetAttrString(obj,"y") );
+	float z = PyFloat_AsDouble( PyObject_GetAttrString(obj,"z") );
+	
+	return new Vec3f(x,y,z);
+}
+
+Vec3r * Vec3r_ptr_from_Vector( PyObject* obj ) {
+	double x = PyFloat_AsDouble( PyObject_GetAttrString(obj,"x") );
+	double y = PyFloat_AsDouble( PyObject_GetAttrString(obj,"y") );
+	double z = PyFloat_AsDouble( PyObject_GetAttrString(obj,"z") );
+	
+	return new Vec3r(x,y,z);
+}
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/BPy_Convert.h b/source/blender/freestyle/intern/python/BPy_Convert.h
index 4bfaf4c1e17..5bfdef56278 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.h
+++ b/source/blender/freestyle/intern/python/BPy_Convert.h
@@ -23,6 +23,9 @@ using namespace Geometry;
 // Material
 #include "../scene_graph/Material.h"
 
+// Nature::VertexNature, Nature::EdgeNature
+#include "../winged_edge/Nature.h"
+
 // Stroke, StrokeAttribute, StrokeVertex
 #include "../stroke/Stroke.h"
 
@@ -58,16 +61,15 @@ extern "C" {
 #include "api2_2x/vector.h"
 #include "api2_2x/gen_utils.h"
 
-PyObject * PyBool_from_bool( bool b );
-bool bool_from_PyBool( PyObject *b );
+//==============================
+// C++ => Python
+//==============================
 
+PyObject * PyBool_from_bool( bool b );
 PyObject * Vector_from_Vec2f( Vec2f& v );
 PyObject * Vector_from_Vec3f( Vec3f& v );
 PyObject * Vector_from_Vec3r( Vec3r& v );
 
-IntegrationType IntegrationType_from_BPy_IntegrationType( PyObject* obj );
-Stroke::MediumType MediumType_from_BPy_MediumType( PyObject* obj );
-
 PyObject * BPy_BBox_from_BBox( BBox< Vec3r > &bb );
 PyObject * BPy_CurvePoint_from_CurvePoint( CurvePoint& cp );
 PyObject * BPy_directedViewEdge_from_directedViewEdge( ViewVertex::directedViewEdge& dve );
@@ -99,8 +101,19 @@ PyObject * BPy_ChainingIterator_from_ChainingIterator( ChainingIterator& c_it );
 PyObject * BPy_ChainPredicateIterator_from_ChainPredicateIterator( ChainPredicateIterator& cp_it );
 PyObject * BPy_ChainSilhouetteIterator_from_ChainSilhouetteIterator( ChainSilhouetteIterator& cs_it );
 
+//==============================
+// Python => C++
+//==============================
+
+bool bool_from_PyBool( PyObject *b );
+IntegrationType IntegrationType_from_BPy_IntegrationType( PyObject* obj );
+Stroke::MediumType MediumType_from_BPy_MediumType( PyObject* obj );
+Nature::EdgeNature EdgeNature_from_BPy_Nature( PyObject* obj );
+Vec2f * Vec2f_ptr_from_Vector( PyObject* obj );
+Vec3f * Vec3f_ptr_from_Vector( PyObject* obj );
+Vec3r * Vec3r_ptr_from_Vector( PyObject* obj );
+
 
-   
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/source/blender/freestyle/intern/python/BPy_Interface1D.cpp b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
index 3db9531da4b..8d2549ebf2c 100644
--- a/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
@@ -30,6 +30,10 @@ static PyObject *Interface1D_getId( BPy_Interface1D *self );
 static PyObject *Interface1D_getNature( BPy_Interface1D *self );
 static PyObject *Interface1D_getTimeStamp( BPy_Interface1D *self );
 static PyObject *Interface1D_setTimeStamp( BPy_Interface1D *self, PyObject *args);
+static PyObject * Interface1D_verticesBegin( BPy_Interface1D *self );
+static PyObject * Interface1D_verticesEnd( BPy_Interface1D *self );
+static PyObject * Interface1D_pointsBegin( BPy_Interface1D *self, PyObject *args );
+static PyObject * Interface1D_pointsEnd( BPy_Interface1D *self, PyObject *args );
 
 /*----------------------Interface1D instance definitions ----------------------------*/
 static PyMethodDef BPy_Interface1D_methods[] = {
@@ -41,6 +45,11 @@ static PyMethodDef BPy_Interface1D_methods[] = {
 	{"getNature", ( PyCFunction ) Interface1D_getNature, METH_NOARGS, "Returns the nature of the 1D element"},
 	{"getTimeStamp", ( PyCFunction ) Interface1D_getTimeStamp, METH_NOARGS, "Returns the time stamp of the 1D element. Mainly used for selection"},
 	{"setTimeStamp", ( PyCFunction ) Interface1D_setTimeStamp, METH_VARARGS, "Sets the time stamp for the 1D element"},
+	{"verticesBegin", ( PyCFunction ) Interface1D_verticesBegin, METH_NOARGS, ""},
+	{"verticesEnd", ( PyCFunction ) Interface1D_verticesEnd, METH_NOARGS, ""},
+	{"pointsBegin", ( PyCFunction ) Interface1D_pointsBegin, METH_VARARGS, ""},
+	{"pointsEnd", ( PyCFunction ) Interface1D_pointsEnd, METH_VARARGS, ""},
+
 	{NULL, NULL, 0, NULL}
 };
 
@@ -189,6 +198,7 @@ PyMODINIT_FUNC Interface1D_Init( PyObject *module )
 int Interface1D___init__(BPy_Interface1D *self, PyObject *args, PyObject *kwds)
 {
 	self->if1D = new Interface1D();
+	self->if1D->py_if1D = (PyObject *) self;
 	return 0;
 }
 
@@ -245,6 +255,41 @@ PyObject *Interface1D_setTimeStamp( BPy_Interface1D *self, PyObject *args) {
 	Py_RETURN_NONE;
 }
 
+PyObject * Interface1D_verticesBegin( BPy_Interface1D *self ) {
+	Interface0DIterator if0D_it( self->if1D->verticesBegin() );
+	return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it );
+}
+
+PyObject * Interface1D_verticesEnd( BPy_Interface1D *self ) {
+	Interface0DIterator if0D_it( self->if1D->verticesEnd() );
+	return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it );
+}
+
+
+PyObject * Interface1D_pointsBegin( BPy_Interface1D *self, PyObject *args ) {
+	float f = 0;
+
+	if(!( PyArg_ParseTuple(args, "|f", &f)  )) {
+		cout << "ERROR: Interface1D_pointsBegin" << endl;
+		Py_RETURN_NONE;
+	}
+	
+	Interface0DIterator if0D_it( self->if1D->pointsBegin(f) );
+	return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it );
+}
+
+PyObject * Interface1D_pointsEnd( BPy_Interface1D *self, PyObject *args ) {
+	float f = 0;
+
+	if(!( PyArg_ParseTuple(args, "|f", &f)  )) {
+		cout << "ERROR: Interface1D_pointsEnd" << endl;
+		Py_RETURN_NONE;
+	}
+	
+	Interface0DIterator if0D_it( self->if1D->pointsEnd(f) );
+	return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it );
+}
+
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 #ifdef __cplusplus
diff --git a/source/blender/freestyle/intern/python/Director.cpp b/source/blender/freestyle/intern/python/Director.cpp
index 42677919ca5..b3188554c09 100644
--- a/source/blender/freestyle/intern/python/Director.cpp
+++ b/source/blender/freestyle/intern/python/Director.cpp
@@ -4,14 +4,29 @@
 
 #include "BPy_BinaryPredicate0D.h"
 #include "BPy_BinaryPredicate1D.h"
+#include "BPy_FrsMaterial.h"
+#include "BPy_Id.h"
 #include "BPy_UnaryFunction0D.h"
 #include "BPy_UnaryFunction1D.h"
 #include "BPy_UnaryPredicate0D.h"
 #include "BPy_UnaryPredicate1D.h"
 #include "BPy_StrokeShader.h"
 #include "Iterator/BPy_ChainingIterator.h"
+#include "Iterator/BPy_Interface0DIterator.h"
 #include "Interface1D/BPy_Stroke.h"
 #include "Interface1D/BPy_ViewEdge.h"
+#include "BPy_ViewShape.h"
+
+#include "UnaryFunction0D/BPy_UnaryFunction0DDouble.h"
+#include "UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.h"
+#include "UnaryFunction0D/BPy_UnaryFunction0DFloat.h"
+#include "UnaryFunction0D/BPy_UnaryFunction0DId.h"
+#include "UnaryFunction0D/BPy_UnaryFunction0DMaterial.h"
+#include "UnaryFunction0D/BPy_UnaryFunction0DUnsigned.h"
+#include "UnaryFunction0D/BPy_UnaryFunction0DVec2f.h"
+#include "UnaryFunction0D/BPy_UnaryFunction0DVec3f.h"
+#include "UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.h"
+#include "UnaryFunction0D/BPy_UnaryFunction0DViewShape.h"
 
 //   BinaryPredicate0D: __call__
 bool Director_BPy_BinaryPredicate0D___call__( PyObject *obj, Interface0D& i1, Interface0D& i2) {
@@ -61,17 +76,58 @@ ViewEdge * Director_BPy_ChainingIterator_traverse( PyObject *obj, AdjacencyItera
 	return ((BPy_ViewEdge *) result)->ve;
 }
 
+
 // BPy_UnaryFunction{0D,1D}: __call__
-// BPy_UnaryFunction0DDouble
-// BPy_UnaryFunction0DEdgeNature
-// BPy_UnaryFunction0DFloat
-// BPy_UnaryFunction0DId
-// BPy_UnaryFunction0DMaterial
-// BPy_UnaryFunction0DUnsigned
-// BPy_UnaryFunction0DVec2f
-// BPy_UnaryFunction0DVec3f
-// BPy_UnaryFunction0DVectorViewShape
-// BPy_UnaryFunction0DViewShape
+void Director_BPy_UnaryFunction0D___call__( void *uf0D, PyObject *obj, Interface0DIterator& if0D_it) {
+
+	PyObject *result = PyObject_CallMethod( obj, "__call__", "O", BPy_Interface0DIterator_from_Interface0DIterator(if0D_it) );
+	
+	if( BPy_UnaryFunction0DDouble_Check(obj) ) {	
+		((UnaryFunction0D<double> *) uf0D)->result = PyFloat_AsDouble(result);
+
+	} else if ( BPy_UnaryFunction0DEdgeNature_Check(obj) ) {
+		((UnaryFunction0D<Nature::EdgeNature> *) uf0D)->result = EdgeNature_from_BPy_Nature(result);
+	
+	} else if ( BPy_UnaryFunction0DFloat_Check(obj) ) {
+
+		((UnaryFunction0D<float> *) uf0D)->result = PyFloat_AsDouble(result);
+	
+	} else if ( BPy_UnaryFunction0DId_Check(obj) ) {
+		((UnaryFunction0D<Id> *) uf0D)->result = *( ((BPy_Id *) result)->id );
+	
+	} else if ( BPy_UnaryFunction0DMaterial_Check(obj) ) {
+		((UnaryFunction0D<Material> *) uf0D)->result = *( ((BPy_FrsMaterial *) result)->m );
+	
+	} else if ( BPy_UnaryFunction0DUnsigned_Check(obj) ) {
+		((UnaryFunction0D<unsigned> *) uf0D)->result = PyInt_AsLong(result);
+	
+	} else if ( BPy_UnaryFunction0DVec2f_Check(obj) ) {
+		Vec2f *v = Vec2f_ptr_from_Vector( result );
+		((UnaryFunction0D<Vec2f> *) uf0D)->result = *v;
+		delete v; 
+	
+	} else if ( BPy_UnaryFunction0DVec3f_Check(obj) ) {
+		Vec3f *v = Vec3f_ptr_from_Vector( result );
+		((UnaryFunction0D<Vec3f> *) uf0D)->result = *v;
+		delete v;
+	
+	} else if ( BPy_UnaryFunction0DVectorViewShape_Check(obj) ) {
+		vector<ViewShape*> vec;
+		for( int i = 0; i < PyList_Size(result); i++) {
+			ViewShape *b = ( (BPy_ViewShape *) PyList_GetItem(result, i) )->vs;
+			vec.push_back( b );
+		}
+			
+		((UnaryFunction0D< vector<ViewShape*> > *) uf0D)->result = vec;
+	
+	} else if ( BPy_UnaryFunction0DViewShape_Check(obj) ) {
+		((UnaryFunction0D<ViewShape*> *) uf0D)->result = ((BPy_ViewShape *) result)->vs;
+	
+	}	
+
+}
+
+void Director_BPy_UnaryFunction1D___call__( void *uf1D, PyObject *obj, Interface1D& if1D) {
 
 // BPy_UnaryFunction1DDouble
 // BPy_UnaryFunction1DEdgeNature
@@ -82,6 +138,10 @@ ViewEdge * Director_BPy_ChainingIterator_traverse( PyObject *obj, AdjacencyItera
 // BPy_UnaryFunction1DVectorViewShape
 // BPy_UnaryFunction1DVoid
 
+
+}
+
+
 // BPy_Iterator: increment, decrement, isBegin, isEnd
 void Director_BPy_Iterator_increment( PyObject *obj ) {
 	PyObject_CallMethod( obj, "increment", "", 0 );
@@ -103,5 +163,28 @@ bool Director_BPy_Iterator_isEnd( PyObject *obj ) {
 	return bool_from_PyBool(result);
 }
 
+// BPy_Interface1D: verticesBegin, verticesEnd, pointsBegin, pointsEnd
+Interface0DIterator Director_BPy_Interface1D_verticesBegin( PyObject *obj ){
+	PyObject *result = PyObject_CallMethod( obj, "verticesBegin", "", 0 );
 
+	return *( ((BPy_Interface0DIterator *) result)->if0D_it );
+}
+
+Interface0DIterator Director_BPy_Interface1D_verticesEnd( PyObject *obj ){
+	PyObject *result =  PyObject_CallMethod( obj, "verticesEnd", "", 0 );
+
+	return *( ((BPy_Interface0DIterator *) result)->if0D_it );
+}
+
+Interface0DIterator Director_BPy_Interface1D_pointsBegin( PyObject *obj ){
+	PyObject *result =  PyObject_CallMethod( obj, "pointsBegin", "", 0 );
+
+	return *( ((BPy_Interface0DIterator *) result)->if0D_it );
+}
+
+Interface0DIterator Director_BPy_Interface1D_pointsEnd( PyObject *obj ){
+	PyObject *result =  PyObject_CallMethod( obj, "pointsEnd", "", 0 );
+
+	return *( ((BPy_Interface0DIterator *) result)->if0D_it );
+}
 
diff --git a/source/blender/freestyle/intern/python/Director.h b/source/blender/freestyle/intern/python/Director.h
index 2a67be237f5..27afa3bbe3e 100644
--- a/source/blender/freestyle/intern/python/Director.h
+++ b/source/blender/freestyle/intern/python/Director.h
@@ -37,27 +37,9 @@ void Director_BPy_StrokeShader_shade( PyObject *obj, Stroke& s);
 void Director_BPy_ChainingIterator_init( PyObject *obj );
 ViewEdge * Director_BPy_ChainingIterator_traverse( PyObject *obj, AdjacencyIterator& a_it );
 
-// BPy_UnaryFunction0DDouble
-double Director_BPy_UnaryFunction0DDouble___call__( PyObject *obj, Interface0DIterator& if0D_it);
-// BPy_UnaryFunction0DEdgeNature
-// BPy_UnaryFunction0DFloat
-// BPy_UnaryFunction0DId
-// BPy_UnaryFunction0DMaterial
-// BPy_UnaryFunction0DUnsigned
-// BPy_UnaryFunction0DVec2f
-// BPy_UnaryFunction0DVec3f
-// BPy_UnaryFunction0DVectorViewShape
-// BPy_UnaryFunction0DViewShape
-
-// BPy_UnaryFunction1DDouble
-// BPy_UnaryFunction1DEdgeNature
-// BPy_UnaryFunction1DFloat
-// BPy_UnaryFunction1DUnsigned
-// BPy_UnaryFunction1DVec2f
-// BPy_UnaryFunction1DVec3f
-// BPy_UnaryFunction1DVectorViewShape
-// BPy_UnaryFunction1DVoid
-void Director_BPy_UnaryFunction1DVoid___call__( PyObject *obj, Interface1D& if1D);
+// BPy_UnaryFunction{0D,1D}: __call__
+void Director_BPy_UnaryFunction0D___call__( void *uf0D, PyObject *obj, Interface0DIterator& if0D_it);
+void Director_BPy_UnaryFunction1D___call__( void *uf1D, PyObject *obj, Interface1D& if1D);
 
 // BPy_Iterator: increment, decrement, isBegin, isEnd
 void Director_BPy_Iterator_increment( PyObject *obj );
@@ -65,4 +47,12 @@ void Director_BPy_Iterator_decrement( PyObject *obj );
 bool Director_BPy_Iterator_isBegin( PyObject *obj );
 bool Director_BPy_Iterator_isEnd( PyObject *obj );
 
+// BPy_Interface1D: verticesBegin, verticesEnd, pointsBegin, pointsEnd
+Interface0DIterator Director_BPy_Interface1D_verticesBegin( PyObject *obj );
+Interface0DIterator Director_BPy_Interface1D_verticesEnd( PyObject *obj );
+Interface0DIterator Director_BPy_Interface1D_pointsBegin( PyObject *obj );
+Interface0DIterator Director_BPy_Interface1D_pointsEnd( PyObject *obj );
+
+
+
 #endif // FREESTYLE_PYTHON_DIRECTOR
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp
index e7ac46122b6..45f5c297b8a 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp
@@ -14,6 +14,8 @@
 #include "UnaryFunction0D_double/BPy_LocalAverageDepthF0D.h"
 #include "UnaryFunction0D_double/BPy_ZDiscontinuityF0D.h"
 
+#include "../Director.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -190,6 +192,7 @@ PyMODINIT_FUNC UnaryFunction0DDouble_Init( PyObject *module ) {
 int UnaryFunction0DDouble___init__(BPy_UnaryFunction0DDouble* self)
 {
 	self->uf0D_double = new UnaryFunction0D<double>();
+	self->uf0D_double->py_uf0D = (PyObject *)self;
 	return 0;
 }
 
@@ -219,7 +222,8 @@ PyObject * UnaryFunction0DDouble___call__( BPy_UnaryFunction0DDouble *self, PyOb
 		return NULL;
 	}
 	
-	double d = self->uf0D_double->operator()(*( ((BPy_Interface0DIterator *) obj)->if0D_it ));
+	double d = self->uf0D_double->operator()(*( ((BPy_Interface0DIterator *) obj)->if0D_it));
+		
 	return PyFloat_FromDouble( d );
 
 }
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.cpp
index 3dfcb74cddd..79f8ff1f648 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.cpp
@@ -135,6 +135,7 @@ PyMODINIT_FUNC UnaryFunction0DEdgeNature_Init( PyObject *module ) {
 int UnaryFunction0DEdgeNature___init__(BPy_UnaryFunction0DEdgeNature* self)
 {
 	self->uf0D_edgenature = new UnaryFunction0D<Nature::EdgeNature>();
+	self->uf0D_edgenature->py_uf0D = (PyObject *)self;
 	return 0;
 }
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.cpp
index 2c11eb92ed5..bff5fa962c1 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.cpp
@@ -164,6 +164,7 @@ PyMODINIT_FUNC UnaryFunction0DFloat_Init( PyObject *module ) {
 int UnaryFunction0DFloat___init__(BPy_UnaryFunction0DFloat* self)
 {
 	self->uf0D_float = new UnaryFunction0D<float>();
+	self->uf0D_float->py_uf0D = (PyObject *)self;
 	return 0;
 }
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.cpp
index 2d6cbf09be1..6e21f5f687e 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.cpp
@@ -135,6 +135,7 @@ PyMODINIT_FUNC UnaryFunction0DId_Init( PyObject *module ) {
 int UnaryFunction0DId___init__(BPy_UnaryFunction0DId* self)
 {
 	self->uf0D_id = new UnaryFunction0D<Id>();
+	self->uf0D_id->py_uf0D = (PyObject *)self;
 	return 0;
 }
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp
index 733acce6ab8..2aef794617a 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp
@@ -135,6 +135,7 @@ PyMODINIT_FUNC UnaryFunction0DMaterial_Init( PyObject *module ) {
 int UnaryFunction0DMaterial___init__(BPy_UnaryFunction0DMaterial* self)
 {
 	self->uf0D_material = new UnaryFunction0D<Material>();
+	self->uf0D_material->py_uf0D = (PyObject *)self;
 	return 0;
 }
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.cpp
index a7d8e9f42a7..2d33419032b 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.cpp
@@ -135,6 +135,7 @@ PyMODINIT_FUNC UnaryFunction0DUnsigned_Init( PyObject *module ) {
 int UnaryFunction0DUnsigned___init__(BPy_UnaryFunction0DUnsigned* self)
 {
 	self->uf0D_unsigned = new UnaryFunction0D<unsigned int>();
+	self->uf0D_unsigned->py_uf0D = (PyObject *)self;
 	return 0;
 }
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.cpp
index fb7fc4f19fe..3eedf16c575 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.cpp
@@ -141,6 +141,7 @@ PyMODINIT_FUNC UnaryFunction0DVec2f_Init( PyObject *module ) {
 int UnaryFunction0DVec2f___init__(BPy_UnaryFunction0DVec2f* self)
 {
 	self->uf0D_vec2f = new UnaryFunction0D<Vec2f>();
+	self->uf0D_vec2f->py_uf0D = (PyObject *)self;
 	return 0;
 }
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.cpp
index d0412d7c7d0..aa77d17b18b 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.cpp
@@ -135,6 +135,7 @@ PyMODINIT_FUNC UnaryFunction0DVec3f_Init( PyObject *module ) {
 int UnaryFunction0DVec3f___init__(BPy_UnaryFunction0DVec3f* self)
 {
 	self->uf0D_vec3f = new UnaryFunction0D<Vec3f>();
+	self->uf0D_vec3f->py_uf0D = (PyObject *)self;
 	return 0;
 }
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp
index 02aef4e28cf..93bea5c114e 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp
@@ -135,6 +135,7 @@ PyMODINIT_FUNC UnaryFunction0DVectorViewShape_Init( PyObject *module ) {
 int UnaryFunction0DVectorViewShape___init__(BPy_UnaryFunction0DVectorViewShape* self)
 {
 	self->uf0D_vectorviewshape = new UnaryFunction0D< std::vector<ViewShape*> >();
+	self->uf0D_vectorviewshape->py_uf0D = (PyObject *)self;
 	return 0;
 }
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.cpp
index eb2fceb3f06..a9714e0b2c6 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.cpp
@@ -141,6 +141,7 @@ PyMODINIT_FUNC UnaryFunction0DViewShape_Init( PyObject *module ) {
 int UnaryFunction0DViewShape___init__(BPy_UnaryFunction0DViewShape* self)
 {
 	self->uf0D_viewshape = new UnaryFunction0D<ViewShape*>();
+	self->uf0D_viewshape->py_uf0D = (PyObject *)self;
 	return 0;
 }
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp
index 887d1273e60..c3fc04c8b1e 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp
@@ -231,6 +231,8 @@ int UnaryFunction1DDouble___init__(BPy_UnaryFunction1DDouble* self, PyObject *ar
 		self->uf1D_double = new UnaryFunction1D<double>( IntegrationType_from_BPy_IntegrationType(obj) );
 	}
 	
+	self->uf1D_double->py_uf1D = (PyObject *)self;
+	
 	return 0;
 }
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp
index d4d7f642494..78d63020062 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp
@@ -152,6 +152,8 @@ int UnaryFunction1DEdgeNature___init__(BPy_UnaryFunction1DEdgeNature* self, PyOb
 		self->uf1D_edgenature = new UnaryFunction1D<Nature::EdgeNature>( IntegrationType_from_BPy_IntegrationType(obj) );
 	}
 	
+	self->uf1D_edgenature->py_uf1D = (PyObject *)self;
+	
 	return 0;
 }
 void UnaryFunction1DEdgeNature___dealloc__(BPy_UnaryFunction1DEdgeNature* self)
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp
index f4c8a9e53ce..a424d7862a6 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp
@@ -145,6 +145,8 @@ int UnaryFunction1DFloat___init__(BPy_UnaryFunction1DFloat* self, PyObject *args
 		self->uf1D_float = new UnaryFunction1D<float>( IntegrationType_from_BPy_IntegrationType(obj) );
 	}
 	
+	self->uf1D_float->py_uf1D = (PyObject *)self;
+	
 	return 0;
 }
 void UnaryFunction1DFloat___dealloc__(BPy_UnaryFunction1DFloat* self)
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp
index ef75f3bad5b..297116d2112 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp
@@ -152,6 +152,8 @@ int UnaryFunction1DUnsigned___init__(BPy_UnaryFunction1DUnsigned* self, PyObject
 		self->uf1D_unsigned = new UnaryFunction1D<unsigned int>( IntegrationType_from_BPy_IntegrationType(obj) );
 	}
 	
+	self->uf1D_unsigned->py_uf1D = (PyObject *)self;
+	
 	return 0;
 }
 void UnaryFunction1DUnsigned___dealloc__(BPy_UnaryFunction1DUnsigned* self)
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp
index e0fa12c66e6..1d3f1c708b5 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp
@@ -158,6 +158,8 @@ int UnaryFunction1DVec2f___init__(BPy_UnaryFunction1DVec2f* self, PyObject *args
 		self->uf1D_vec2f = new UnaryFunction1D<Vec2f>( IntegrationType_from_BPy_IntegrationType(obj) );
 	}
 	
+	self->uf1D_vec2f->py_uf1D = (PyObject *)self;
+	
 	return 0;
 }
 void UnaryFunction1DVec2f___dealloc__(BPy_UnaryFunction1DVec2f* self)
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp
index 3a3c7d4e835..1b4c7b281d3 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp
@@ -152,6 +152,8 @@ int UnaryFunction1DVec3f___init__(BPy_UnaryFunction1DVec3f* self, PyObject *args
 		self->uf1D_vec3f = new UnaryFunction1D<Vec3f>( IntegrationType_from_BPy_IntegrationType(obj) );
 	}
 	
+	self->uf1D_vec3f->py_uf1D = (PyObject *)self;
+	
 	return 0;
 }
 void UnaryFunction1DVec3f___dealloc__(BPy_UnaryFunction1DVec3f* self)
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp
index c0b25403706..36f5fc442bf 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp
@@ -165,6 +165,8 @@ int UnaryFunction1DVectorViewShape___init__(BPy_UnaryFunction1DVectorViewShape*
 		self->uf1D_vectorviewshape = new UnaryFunction1D< std::vector<ViewShape*> >( IntegrationType_from_BPy_IntegrationType(obj) );
 	}
 	
+	self->uf1D_vectorviewshape->py_uf1D = (PyObject *)self;
+	
 	return 0;
 }
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp
index 99cc6838997..9d5178a299d 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp
@@ -161,11 +161,13 @@ int UnaryFunction1DVoid___init__(BPy_UnaryFunction1DVoid* self, PyObject *args)
 	}
 	
 	if( !obj )
-		self->uf1D_void = new UnaryFunction1D<void>();
+		self->uf1D_void = new UnaryFunction1D_void();
 	else {
-		self->uf1D_void = new UnaryFunction1D<void>( IntegrationType_from_BPy_IntegrationType(obj) );
+		self->uf1D_void = new UnaryFunction1D_void( IntegrationType_from_BPy_IntegrationType(obj) );
 	}
 	
+	self->uf1D_void->py_uf1D = (PyObject *)self;
+	
 	return 0;
 }
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.h b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.h
index 3e8ad431ec4..34615bb4b27 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.h
@@ -18,7 +18,7 @@ extern PyTypeObject UnaryFunction1DVoid_Type;
 /*---------------------------Python BPy_UnaryFunction1DVoid structure definition----------*/
 typedef struct {
 	BPy_UnaryFunction1D py_uf1D;
-	UnaryFunction1D<void> *uf1D_void;
+	UnaryFunction1D_void *uf1D_void;
 } BPy_UnaryFunction1DVoid;
 
 /*---------------------------Python BPy_UnaryFunction1DVoid visible prototypes-----------*/
diff --git a/source/blender/freestyle/intern/stroke/Operators.cpp b/source/blender/freestyle/intern/stroke/Operators.cpp
index fe1ac27b04e..39914cbef1a 100755
--- a/source/blender/freestyle/intern/stroke/Operators.cpp
+++ b/source/blender/freestyle/intern/stroke/Operators.cpp
@@ -65,7 +65,7 @@ void Operators::select(UnaryPredicate1D& pred) {
 
 void Operators::chain(ViewEdgeInternal::ViewEdgeIterator& it,
 		      UnaryPredicate1D& pred,
-		      UnaryFunction1D<void>& modifier) {
+		      UnaryFunction1D_void& modifier) {
   if (_current_view_edges_set.empty())
     return;
 
@@ -137,7 +137,7 @@ void Operators::chain(ViewEdgeInternal::ViewEdgeIterator& it,
 
 //void Operators::bidirectionalChain(ViewEdgeIterator& it,
 //				   UnaryPredicate1D& pred,
-//				   UnaryFunction1D<void>& modifier) {
+//				   UnaryFunction1D_void& modifier) {
 //  if (_current_view_edges_set.empty())
 //    return;
 //
diff --git a/source/blender/freestyle/intern/stroke/Operators.h b/source/blender/freestyle/intern/stroke/Operators.h
index 96ecd0aa75b..804ee4d7056 100755
--- a/source/blender/freestyle/intern/stroke/Operators.h
+++ b/source/blender/freestyle/intern/stroke/Operators.h
@@ -85,7 +85,7 @@ public:
    */
   static void chain(ViewEdgeInternal::ViewEdgeIterator& it,
 		    UnaryPredicate1D& pred,
-		    UnaryFunction1D<void>& modifier);
+		    UnaryFunction1D_void& modifier);
 
   /*! Builds a set of chains from the current set of ViewEdges.
    *  Each ViewEdge of the current list starts a new chain. The chaining
diff --git a/source/blender/freestyle/intern/stroke/Predicates1D.h b/source/blender/freestyle/intern/stroke/Predicates1D.h
index 8c6f5a9bfa4..014d5a1130e 100755
--- a/source/blender/freestyle/intern/stroke/Predicates1D.h
+++ b/source/blender/freestyle/intern/stroke/Predicates1D.h
@@ -127,7 +127,7 @@ public:
   virtual bool operator()(Interface1D& inter1, Interface1D& inter2) {
 	string name( py_bp1D ? PyString_AsString(PyObject_CallMethod(py_bp1D, "getName", "")) : getName() );
 	
-	if( py_bp1D && py_bp1D && PyObject_HasAttrString(py_bp1D, "__call__") ) {
+	if( py_bp1D && PyObject_HasAttrString(py_bp1D, "__call__") ) {
 		return Director_BPy_BinaryPredicate1D___call__(py_bp1D, inter1, inter2);
 	} else {
 		cerr << "Warning: " << name << " operator() not implemented" << endl;
diff --git a/source/blender/freestyle/intern/stroke/Stroke.cpp b/source/blender/freestyle/intern/stroke/Stroke.cpp
index b1d6e466215..a1277611a90 100755
--- a/source/blender/freestyle/intern/stroke/Stroke.cpp
+++ b/source/blender/freestyle/intern/stroke/Stroke.cpp
@@ -404,9 +404,11 @@ Stroke::Stroke(const Stroke& iBrother)
   _mediumType = iBrother._mediumType;
   _textureId = iBrother._textureId;
   _tips = iBrother._tips;
-  
-	if(iBrother._rep) 
+
+	if( iBrother._rep )
 		_rep = new StrokeRep(*(iBrother._rep));
+	else
+		_rep = new StrokeRep(this);
 }
 
 Stroke::~Stroke()
diff --git a/source/blender/freestyle/intern/view_map/Functions0D.h b/source/blender/freestyle/intern/view_map/Functions0D.h
index 1ad35da8d91..9543e8c34a6 100755
--- a/source/blender/freestyle/intern/view_map/Functions0D.h
+++ b/source/blender/freestyle/intern/view_map/Functions0D.h
@@ -43,6 +43,8 @@ class SShape;
 
 using namespace Geometry;
 
+#include "../python/Director.h"
+
 //
 // UnaryFunction0D (base class for functions in 0D)
 //
@@ -70,12 +72,15 @@ class /*LIB_VIEW_MAP_EXPORT*/ UnaryFunction0D
 {
 public:
 
+	T result;
+	PyObject *py_uf0D;
+
   /*! The type of the value
    *  returned by the functor.
    */
   typedef T ReturnedValueType;
   /*! Default constructor. */
-  UnaryFunction0D() {}
+UnaryFunction0D() { py_uf0D  = 0;}
   /*! Destructor; */
   virtual ~UnaryFunction0D() {}
   /*! Returns the string "UnaryFunction0D" */
@@ -90,9 +95,17 @@ public:
    *  \return the result of the function of type T.
    */
   virtual T operator()(Interface0DIterator& iter) {
-    cerr << "Warning: UnaryFunction0D operator() not implemented" << endl;
-    return T();
+	string name( py_uf0D ? PyString_AsString(PyObject_CallMethod(py_uf0D, "getName", "")) : getName() );
+	
+	if( py_uf0D && PyObject_HasAttrString(py_uf0D, "__call__") ) {
+		Director_BPy_UnaryFunction0D___call__( this, py_uf0D, iter);
+		return result;
+	} else {
+		cerr << "Warning: " << name << " operator() not implemented" << endl;
+	    return T();
+	}
   }
+
 };
 
 # ifdef SWIG
diff --git a/source/blender/freestyle/intern/view_map/Functions1D.h b/source/blender/freestyle/intern/view_map/Functions1D.h
index 072733b985d..c4f8b9f7607 100755
--- a/source/blender/freestyle/intern/view_map/Functions1D.h
+++ b/source/blender/freestyle/intern/view_map/Functions1D.h
@@ -36,6 +36,9 @@
 # include "Functions0D.h"
 # include "Interface1D.h"
 # include "../system/FreestyleConfig.h"
+
+#include "../python/Director.h"
+
 //
 // UnaryFunction1D (base class for functions in 1D)
 //
@@ -62,6 +65,10 @@ template <class T>
 class /*LIB_VIEW_MAP_EXPORT*/ UnaryFunction1D
 {
 public:
+
+	T result;
+	PyObject *py_uf1D;
+
   /*! The type of the value
    *  returned by the functor.
    */
@@ -92,9 +99,17 @@ public:
    *  \return the result of the function of type T.
    */
   virtual T operator()(Interface1D& inter) {
-    cerr << "Warning: UnaryFunction1D operator() not implemented" << endl;
-    return T(0);
+	string name( py_uf1D ? PyString_AsString(PyObject_CallMethod(py_uf1D, "getName", "")) : getName() );
+
+	if( py_uf1D && PyObject_HasAttrString(py_uf1D, "__call__") ) {
+		Director_BPy_UnaryFunction1D___call__( this, py_uf1D, inter);
+		return result;
+	} else {
+		cerr << "Warning: " << name << " operator() not implemented" << endl;
+	    return T(0);
+	}
   }
+	
   /*! Sets the integration method */
   void setIntegrationType(IntegrationType integration) {
     _integration = integration;
@@ -109,22 +124,37 @@ protected:
   IntegrationType _integration;
 };
 
-# ifdef SWIG
-%feature("director")			UnaryFunction1D<void>;
-%feature("director")			UnaryFunction1D<unsigned>;
-%feature("director")			UnaryFunction1D<float>;
-%feature("director")			UnaryFunction1D<double>;
-%feature("director")			UnaryFunction1D<Vec2f>;
-%feature("director")			UnaryFunction1D<Vec3f>;
 
-%template(UnaryFunction1DVoid)		UnaryFunction1D<void>;
-%template(UnaryFunction1DUnsigned)	UnaryFunction1D<unsigned>;
-%template(UnaryFunction1DFloat)		UnaryFunction1D<float>;
-%template(UnaryFunction1DDouble)	UnaryFunction1D<double>;
-%template(UnaryFunction1DVec2f)		UnaryFunction1D<Vec2f>;
-%template(UnaryFunction1DVec3f)		UnaryFunction1D<Vec3f>;
-%template(UnaryFunction1DVectorViewShape)		UnaryFunction1D<std::vector<ViewShape*> >;
-# endif // SWIG
+class  UnaryFunction1D_void
+{
+public:
+
+	PyObject *py_uf1D;
+
+	UnaryFunction1D_void(){_integration = MEAN;}
+	UnaryFunction1D_void(IntegrationType iType){_integration = iType;}
+	virtual ~UnaryFunction1D_void() {}
+	
+	virtual string getName() const {
+		return "UnaryFunction1D_void";
+	}
+	
+	void operator()(Interface1D& inter) {
+		string name( py_uf1D ? PyString_AsString(PyObject_CallMethod(py_uf1D, "getName", "")) : getName() );
+
+		if( py_uf1D && PyObject_HasAttrString(py_uf1D, "__call__") ) {
+			Director_BPy_UnaryFunction1D___call__( this, py_uf1D, inter);
+		} else {
+			cerr << "Warning: " << name << " operator() not implemented" << endl;
+		}
+	  }
+	
+	void setIntegrationType(IntegrationType integration) { _integration = integration; }
+	IntegrationType getIntegrationType() const { return _integration; }
+	
+	protected:
+		IntegrationType _integration;
+};
 
 
 //
@@ -385,7 +415,7 @@ namespace Functions1D {
 
   // TimeStampF1D
 /*! Returns the time stamp of the Interface1D. */
-  class LIB_VIEW_MAP_EXPORT TimeStampF1D : public UnaryFunction1D<void>
+  class LIB_VIEW_MAP_EXPORT TimeStampF1D : public UnaryFunction1D_void
   {
   public:
     /*! Returns the string "TimeStampF1D"*/
@@ -398,7 +428,7 @@ namespace Functions1D {
 
   // IncrementChainingTimeStampF1D
 /*! Increments the chaining time stamp of the Interface1D. */
-  class LIB_VIEW_MAP_EXPORT IncrementChainingTimeStampF1D : public UnaryFunction1D<void>
+  class LIB_VIEW_MAP_EXPORT IncrementChainingTimeStampF1D : public UnaryFunction1D_void
   {
   public:
     /*! Returns the string "IncrementChainingTimeStampF1D"*/
@@ -411,7 +441,7 @@ namespace Functions1D {
 
   // ChainingTimeStampF1D
 /*! Sets the chaining time stamp of the Interface1D. */
-  class LIB_VIEW_MAP_EXPORT ChainingTimeStampF1D : public UnaryFunction1D<void>
+  class LIB_VIEW_MAP_EXPORT ChainingTimeStampF1D : public UnaryFunction1D_void
   {
   public:
     /*! Returns the string "ChainingTimeStampF1D"*/
diff --git a/source/blender/freestyle/intern/view_map/Interface1D.h b/source/blender/freestyle/intern/view_map/Interface1D.h
index 8c75afc73df..55a2aece91c 100755
--- a/source/blender/freestyle/intern/view_map/Interface1D.h
+++ b/source/blender/freestyle/intern/view_map/Interface1D.h
@@ -38,6 +38,8 @@
 # include "../winged_edge/Nature.h"
 # include "Functions0D.h"
 
+#include "../python/Director.h"
+
 using namespace std;
 /*! \file Interface1D.h
  *  Interface1D and related tools definitions
@@ -125,8 +127,10 @@ class Interface1D
 {
 public:
 
+	PyObject *py_if1D;
+
   /*! Default constructor */
-  Interface1D() {_timeStamp=0;}
+	Interface1D() {_timeStamp=0; py_if1D = 0; }
    virtual ~Interface1D() {}; //soc
 
   /*! Returns the string "Interface1D" .*/
@@ -140,16 +144,28 @@ public:
    *  pointing to the first vertex.
    */
   virtual Interface0DIterator verticesBegin() {
-	    cerr << "Warning: method verticesBegin() not implemented" << endl;
-	    return Interface0DIterator();
+		string name( py_if1D ? PyString_AsString(PyObject_CallMethod(py_if1D, "getExactTypeName", "")) : getExactTypeName() );
+
+		if( py_if1D && PyObject_HasAttrString(py_if1D, "verticesBegin") ) {
+			return Director_BPy_Interface1D_verticesBegin(py_if1D);
+		} else {
+			cerr << "Warning: " << name << " verticesBegin() not implemented" << endl;
+			return Interface0DIterator();
+		}
   }
 	
   /*! Returns an iterator over the Interface1D vertices,
    *  pointing after the last vertex.
    */
   virtual Interface0DIterator verticesEnd(){
-	    cerr << "Warning: method verticesEnd() not implemented" << endl;
-	    return Interface0DIterator();
+		string name( py_if1D ? PyString_AsString(PyObject_CallMethod(py_if1D, "getExactTypeName", "")) : getExactTypeName() );
+
+		if( py_if1D && PyObject_HasAttrString(py_if1D, "verticesEnd") ) {
+			return Director_BPy_Interface1D_verticesEnd(py_if1D);
+		} else {
+			cerr << "Warning: " << name << " verticesEnd() not implemented" << endl;
+			return Interface0DIterator();
+		}
   }
 
   /*! Returns an iterator over the Interface1D points,
@@ -162,8 +178,14 @@ public:
    *    this 1D element.
    */
   virtual Interface0DIterator pointsBegin(float t=0.f) {
-	    cerr << "Warning: method pointsBegin() not implemented" << endl;
-	    return Interface0DIterator();
+		string name( py_if1D ? PyString_AsString(PyObject_CallMethod(py_if1D, "getExactTypeName", "")) : getExactTypeName() );
+
+		if( py_if1D && PyObject_HasAttrString(py_if1D, "pointsBegin") ) {
+			return Director_BPy_Interface1D_pointsBegin(py_if1D);
+		} else {
+			cerr << "Warning: " << name << " pointsBegin() not implemented" << endl;
+			return Interface0DIterator();
+		}
   }
 
   /*! Returns an iterator over the Interface1D points,
@@ -176,8 +198,14 @@ public:
    *    this 1D element.
    */
   virtual Interface0DIterator pointsEnd(float t=0.f) {
-	    cerr << "Warning: method pointsEnd() not implemented" << endl;
-	    return Interface0DIterator();
+		string name( py_if1D ? PyString_AsString(PyObject_CallMethod(py_if1D, "getExactTypeName", "")) : getExactTypeName() );
+
+		if( py_if1D && PyObject_HasAttrString(py_if1D, "pointsEnd") ) {
+			return Director_BPy_Interface1D_pointsEnd(py_if1D);
+		} else {
+			cerr << "Warning: " << name << " pointsEnd() not implemented" << endl;
+			return Interface0DIterator();
+		}
   }
 
   // Data access methods

From d4b646103a6cae433d58bf7e2f4953f81358835b Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Mon, 4 Aug 2008 19:12:42 +0000
Subject: [PATCH 182/252] Option to hide embedding dots on display Merge
 internal and external filtering in a single loop (solve problems caused by
 order of filtering) Made graph length calculations work on cyclic graphs (it
 unrolls them)

---
 source/blender/blenlib/BLI_graph.h        |   2 +-
 source/blender/blenlib/intern/graph.c     |  50 ++++----
 source/blender/makesdna/DNA_scene_types.h |   1 +
 source/blender/src/buttons_editing.c      |   9 +-
 source/blender/src/reeb.c                 | 149 +++++++++-------------
 5 files changed, 94 insertions(+), 117 deletions(-)

diff --git a/source/blender/blenlib/BLI_graph.h b/source/blender/blenlib/BLI_graph.h
index 66cf2a22842..89f21b919e2 100644
--- a/source/blender/blenlib/BLI_graph.h
+++ b/source/blender/blenlib/BLI_graph.h
@@ -85,7 +85,7 @@ void BLI_ReflagSubgraph(BGraph *graph, int old_subgraph, int new_subgraph);
 #define SHAPE_RADIX 10 /* each shape level is encoded this base */
 
 int BLI_subtreeShape(BNode *node, BArc *rootArc, int include_root);
-float BLI_subtreeLength(BNode *node, BArc *rootArc);
+float BLI_subtreeLength(BNode *node);
 void BLI_calcGraphLength(BGraph *graph);
 
 void BLI_replaceNode(BGraph *graph, BNode *node_src, BNode *node_replaced);
diff --git a/source/blender/blenlib/intern/graph.c b/source/blender/blenlib/intern/graph.c
index aa899042a58..80d770e1034 100644
--- a/source/blender/blenlib/intern/graph.c
+++ b/source/blender/blenlib/intern/graph.c
@@ -397,57 +397,53 @@ int BLI_subtreeShape(BNode *node, BArc *rootArc, int include_root)
 	}
 }
 
-float BLI_subtreeLength(BNode *node, BArc *rootArc)
+float BLI_subtreeLength(BNode *node)
 {
 	float length = 0;
 	int i;
 
+	node->flag = 0; /* flag node as visited */
+
 	for(i = 0; i < node->degree; i++)
 	{
 		BArc *arc = node->arcs[i];
+		BNode *other_node = BLI_otherNode(arc, node);
 		
-		/* don't go back on the root arc */
-		if (arc != rootArc)
+		if (other_node->flag != 0)
 		{
-			length = MAX2(length, BLI_subtreeLength(BLI_otherNode(arc, node), arc));
+			float subgraph_length = arc->length + BLI_subtreeLength(other_node); 
+			length = MAX2(length, subgraph_length);
 		}
 	}
 	
-	if (rootArc)
-	{
-		length += rootArc->length;
-	}
-	
 	return length;
 }
 
 void BLI_calcGraphLength(BGraph *graph)
 {
-	if (BLI_isGraphCyclic(graph) == 0)
+	float length = 0;
+	int nb_subgraphs;
+	int i;
+	
+	nb_subgraphs = BLI_FlagSubgraphs(graph);
+	
+	for (i = 1; i <= nb_subgraphs; i++)
 	{
-		float length = 0;
-		int nb_subgraphs;
-		int i;
+		BNode *node;
 		
-		nb_subgraphs = BLI_FlagSubgraphs(graph);
-		
-		for (i = 1; i <= nb_subgraphs; i++)
+		for (node = graph->nodes.first; node; node = node->next)
 		{
-			BNode *node;
-			
-			for (node = graph->nodes.first; node; node = node->next)
+			/* start on an external node  of the subgraph */
+			if (node->flag == i && node->degree == 1)
 			{
-				/* start on an external node  of the subgraph */
-				if (node->flag == i && node->degree == 1)
-				{
-					length = MAX2(length, BLI_subtreeLength(node, NULL));
-					break;
-				}
+				float subgraph_length = BLI_subtreeLength(node);
+				length = MAX2(length, subgraph_length);
+				break;
 			}
 		}
-		
-		graph->length = length;
 	}
+	
+	graph->length = length;
 }
 
 /********************************* SYMMETRY DETECTION **************************************************/
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index e7376534e27..55d5a68662a 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -849,6 +849,7 @@ typedef struct Scene {
 #define SKGEN_DISP_LENGTH		(1 << 10)
 #define SKGEN_DISP_WEIGHT		(1 << 11)
 #define SKGEN_DISP_ORIG			(1 << 12)
+#define SKGEN_DISP_EMBED		(1 << 13)
 
 #define	SKGEN_SUB_LENGTH		0
 #define	SKGEN_SUB_ANGLE			1
diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c
index 50c9b50c3b8..517ae2b76ca 100644
--- a/source/blender/src/buttons_editing.c
+++ b/source/blender/src/buttons_editing.c
@@ -5046,9 +5046,12 @@ static void editing_panel_mesh_skgen_display(Object *ob, Mesh *me)
 	
 	skgen_graph_block(block);
 
-	uiDefButBitS(block, TOG, SKGEN_DISP_LENGTH, REDRAWVIEW3D,	"Length",			1025, 40, 83,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,		"Show Length");
-	uiDefButBitS(block, TOG, SKGEN_DISP_WEIGHT, REDRAWVIEW3D,	"Weight",			1108, 40, 83,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,		"Show Weight");
-	uiDefButBitS(block, TOG, SKGEN_DISP_ORIG, REDRAWVIEW3D,		"Original",			1191, 40, 84,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,		"Show Original Graph");
+	uiBlockBeginAlign(block);
+	uiDefButBitS(block, TOG, SKGEN_DISP_LENGTH, REDRAWVIEW3D,	"Length",			1025, 40, 63,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,		"Show Length");
+	uiDefButBitS(block, TOG, SKGEN_DISP_WEIGHT, REDRAWVIEW3D,	"Weight",			1088, 40, 63,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,		"Show Weight");
+	uiDefButBitS(block, TOG, SKGEN_DISP_EMBED, REDRAWVIEW3D,	"Embed",			1151, 40, 62,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,		"Show Arc Embedings");
+	uiDefButBitS(block, TOG, SKGEN_DISP_ORIG, REDRAWVIEW3D,		"Original",			1213, 40, 62,19, &G.scene->toolsettings->skgen_options, 0, 0, 0, 0,		"Show Original Graph");
+	uiBlockEndAlign(block);
 
 	uiDefButC(block, NUM, REDRAWVIEW3D, 						"Level:",			1025, 20, 125,19, &G.scene->toolsettings->skgen_multi_level, 0, REEB_MAX_MULTI_LEVEL, 1, 0,"Specify the level to draw");
 }
diff --git a/source/blender/src/reeb.c b/source/blender/src/reeb.c
index a4d2887ae04..d601ec2ab76 100644
--- a/source/blender/src/reeb.c
+++ b/source/blender/src/reeb.c
@@ -744,6 +744,11 @@ static void ExtendArcBuckets(ReebArc *arc)
 	float average_length = 0, length;
 	int padding_head = 0, padding_tail = 0;
 	
+	if (arc->bcount == 0)
+	{
+		return; /* failsafe, shouldn't happen */
+	}
+	
 	initArcIterator(&iter, arc, arc->head);
 	
 	for (	previous = nextBucket(&iter), bucket = nextBucket(&iter);
@@ -778,6 +783,8 @@ static void ExtendArcBuckets(ReebArc *arc)
 		memcpy(arc->buckets + padding_head, old_buckets, arc->bcount * sizeof(EmbedBucket));
 		
 		arc->bcount = padding_head + arc->bcount + padding_tail;
+		
+		MEM_freeN(old_buckets);
 	}
 	
 	if (padding_head > 0)
@@ -1437,41 +1444,27 @@ void filterNullReebGraph(ReebGraph *rg)
 	}
 }
 
-int filterInternalReebGraph(ReebGraph *rg, float threshold)
+int filterInternalExternalReebGraph(ReebGraph *rg, float threshold_internal, float threshold_external)
 {
 	ReebArc *arc = NULL, *nextArc = NULL;
 	int value = 0;
 	
 	BLI_sortlist(&rg->arcs, compareArcs);
 
-	arc = rg->arcs.first;
-	while(arc)
+	
+	for (arc = rg->arcs.first; arc; arc = nextArc)
 	{
 		nextArc = arc->next;
 
 		// Only collapse non-terminal arcs that are shorter than threshold
-		if (arc->head->degree > 1 && arc->tail->degree > 1 && (lengthArc(arc) < threshold))
+		if (threshold_internal > 0 && arc->head->degree > 1 && arc->tail->degree > 1 && (lengthArc(arc) < threshold_internal))
 		{
 			ReebNode *newNode = NULL;
 			ReebNode *removedNode = NULL;
 			
-#if 0 // Old method
-			/* Keep the node with the highestn number of connected arcs */
-			if (arc->head->degree >= arc->tail->degree)
-			{
-				newNode = arc->head;
-				removedNode = arc->tail;
-			}
-			else
-			{
-				newNode = arc->tail;
-				removedNode = arc->head;
-			}
-#else
 			/* Always remove lower node, so arcs don't flip */
 			newNode = arc->head;
 			removedNode = arc->tail;
-#endif
 			
 			filterArc(rg, newNode, removedNode, arc, 1);
 
@@ -1485,26 +1478,8 @@ int filterInternalReebGraph(ReebGraph *rg, float threshold)
 			value = 1;
 		}
 		
-		arc = nextArc;
-	}
-	
-	return value;
-}
-
-int filterExternalReebGraph(ReebGraph *rg, float threshold)
-{
-	ReebArc *arc = NULL, *nextArc = NULL;
-	int value = 0;
-	
-	BLI_sortlist(&rg->arcs, compareArcs);
-
-	
-	for (arc = rg->arcs.first; arc; arc = nextArc)
-	{
-		nextArc = arc->next;
-
 		// Only collapse terminal arcs that are shorter than threshold
-		if ((arc->head->degree == 1 || arc->tail->degree == 1) && (lengthArc(arc) < threshold))
+		else if (threshold_external > 0 && (arc->head->degree == 1 || arc->tail->degree == 1) && (lengthArc(arc) < threshold_external))
 		{
 			ReebNode *terminalNode = NULL;
 			ReebNode *middleNode = NULL;
@@ -1552,32 +1527,28 @@ int filterExternalReebGraph(ReebGraph *rg, float threshold)
 
 int filterCyclesReebGraph(ReebGraph *rg, float distance_threshold)
 {
+	ReebArc *arc1, *arc2;
+	ReebArc *next2;
 	int filtered = 0;
 	
-	if (BLI_isGraphCyclic((BGraph*)rg))
+	for (arc1 = rg->arcs.first; arc1; arc1 = arc1->next)
 	{
-		ReebArc *arc1, *arc2;
-		ReebArc *next2;
-		
-		for (arc1 = rg->arcs.first; arc1; arc1 = arc1->next)
+		for (arc2 = arc1->next; arc2; arc2 = next2)
 		{
-			for (arc2 = rg->arcs.first; arc2; arc2 = next2)
+			next2 = arc2->next;
+			if (arc1 != arc2 && arc1->head == arc2->head && arc1->tail == arc2->tail)
 			{
-				next2 = arc2->next;
-				if (arc1 != arc2 && arc1->head == arc2->head && arc1->tail == arc2->tail)
-				{
-					mergeArcEdges(rg, arc1, arc2, MERGE_APPEND);
-					mergeArcFaces(rg, arc1, arc2);
-					mergeArcBuckets(arc1, arc2, arc1->head->weight, arc1->tail->weight);
+				mergeArcEdges(rg, arc1, arc2, MERGE_APPEND);
+				mergeArcFaces(rg, arc1, arc2);
+				mergeArcBuckets(arc1, arc2, arc1->head->weight, arc1->tail->weight);
 
-					NodeDegreeDecrement(rg, arc1->head);
-					NodeDegreeDecrement(rg, arc1->tail);
+				NodeDegreeDecrement(rg, arc1->head);
+				NodeDegreeDecrement(rg, arc1->tail);
 
-					BLI_remlink(&rg->arcs, arc2);
-					REEB_freeArc((BArc*)arc2);
-					
-					filtered = 1;
-				}
+				BLI_remlink(&rg->arcs, arc2);
+				REEB_freeArc((BArc*)arc2);
+				
+				filtered = 1;
 			}
 		}
 	}
@@ -1765,22 +1736,24 @@ void filterGraph(ReebGraph *rg, short options, float threshold_internal, float t
 
 	verifyNodeDegree(rg);
 
-	/* filter until there's nothing more to do */
-	while (done == 1)
+	if ((options & SKGEN_FILTER_EXTERNAL) == 0)
 	{
-		done = 0; /* no work done yet */
-		
-		if (options & SKGEN_FILTER_INTERNAL)
-		{
-//			done |= filterInternalReebGraph(rg, threshold_internal * rg->resolution);
-			done |= filterInternalReebGraph(rg, threshold_internal);
-			verifyNodeDegree(rg);
-		}
+		threshold_external = 0;
+	}
 
-		if (options & SKGEN_FILTER_EXTERNAL)
+	if ((options & SKGEN_FILTER_INTERNAL) == 0)
+	{
+		threshold_internal = 0;
+	}
+
+	if (threshold_internal > 0 || threshold_external > 0)
+	{ 
+		/* filter until there's nothing more to do */
+		while (done == 1)
 		{
-//			done |= filterExternalReebGraph(rg, threshold_external * rg->resolution);
-			done |= filterExternalReebGraph(rg, threshold_external);
+			done = 0; /* no work done yet */
+			
+			done = filterInternalExternalReebGraph(rg, threshold_internal, threshold_external);
 			verifyNodeDegree(rg);
 		}
 	}
@@ -1788,7 +1761,6 @@ void filterGraph(ReebGraph *rg, short options, float threshold_internal, float t
 	if (options & SKGEN_FILTER_SMART)
 	{
 		filterSmartReebGraph(rg, 0.5);
-		BLI_buildAdjacencyList((BGraph*)rg);
 		filterCyclesReebGraph(rg, 0.5);
 	}
 	
@@ -3338,6 +3310,8 @@ ReebGraph *BIF_ReebGraphMultiFromEditMesh(void)
 	
 	joinSubgraphs(rg, 1.0);
 	
+	BLI_buildAdjacencyList((BGraph*)rg);
+	
 	/* calc length before copy, so we have same length on all levels */
 	BLI_calcGraphLength((BGraph*)rg);
 
@@ -3351,8 +3325,8 @@ ReebGraph *BIF_ReebGraphMultiFromEditMesh(void)
 		/* don't filter last level */
 		if (rgi->link_up)
 		{
-			float internal_threshold = rg->length * G.scene->toolsettings->skgen_threshold_internal * (i / (float)nb_levels);
-			float external_threshold = rg->length * G.scene->toolsettings->skgen_threshold_external * (i / (float)nb_levels);
+			float internal_threshold;
+			float external_threshold;
 
 			/* filter internal progressively in second half only*/
 			if (i > nb_levels / 2)
@@ -3530,22 +3504,25 @@ void REEB_draw()
 			glVertex3fv(arc->tail->p);
 		glEnd();
 
-
-		glColor3f(1, 1, 1);				
-		glBegin(GL_POINTS);
-			glVertex3fv(arc->head->p);
-			glVertex3fv(arc->tail->p);
-			
-			glColor3f(0.5f, 0.5f, 1);				
-			if (arc->bcount)
-			{
-				initArcIterator(&iter, arc, arc->head);
-				for (bucket = nextBucket(&iter); bucket; bucket = nextBucket(&iter))
+		
+		if (G.scene->toolsettings->skgen_options & SKGEN_DISP_EMBED)
+		{
+			glColor3f(1, 1, 1);				
+			glBegin(GL_POINTS);
+				glVertex3fv(arc->head->p);
+				glVertex3fv(arc->tail->p);
+				
+				glColor3f(0.5f, 0.5f, 1);				
+				if (arc->bcount)
 				{
-					glVertex3fv(bucket->p);
+					initArcIterator(&iter, arc, arc->head);
+					for (bucket = nextBucket(&iter); bucket; bucket = nextBucket(&iter))
+					{
+						glVertex3fv(bucket->p);
+					}
 				}
-			}
-		glEnd();
+			glEnd();
+		}
 		
 		VecLerpf(vec, arc->head->p, arc->tail->p, 0.5f);
 		

From 53e535dfcf9637e3aa3327dd3bf2793a67756868 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Mon, 4 Aug 2008 23:01:47 +0000
Subject: [PATCH 183/252] Text Markers: multiple, coloured selections within a
 Text object with group relationships. They allow portions of text to be
 edited as one and enable quick jumping between and editing of different
 areas.

Flags control the behaviour and grouping of markers. At present, Ctrl+M places a marker with TMARK_EDITALL set for testing purposes.

I have also split the text area event handler into separate methods for marker handling and the existing text tools. This makes the events system much easier to follow as it was getting a little hairy.
---
 source/blender/blenkernel/BKE_text.h         |  13 +
 source/blender/blenkernel/intern/text.c      | 275 +++++++++-
 source/blender/blenloader/intern/readfile.c  |   1 +
 source/blender/blenloader/intern/writefile.c |  10 +
 source/blender/makesdna/DNA_text_types.h     |   8 +-
 source/blender/src/drawtext.c                | 546 +++++++++++++------
 6 files changed, 668 insertions(+), 185 deletions(-)

diff --git a/source/blender/blenkernel/BKE_text.h b/source/blender/blenkernel/BKE_text.h
index abdf32c8ea5..de54b6413ae 100644
--- a/source/blender/blenkernel/BKE_text.h
+++ b/source/blender/blenkernel/BKE_text.h
@@ -100,6 +100,15 @@ int	setcurr_tab		(struct Text *text);
 void	convert_tabs		(struct SpaceText *st, int tab);
 void	txt_copy_clipboard	(struct Text *text);
 void	txt_paste_clipboard	(struct Text *text);
+
+void	txt_add_marker						(struct Text *text, struct TextLine *line, int start, int end, char clr[4], int flags);
+void	txt_clear_marker_region				(struct Text *text, struct TextLine *line, int start, int end, int flags);
+void	txt_clear_markers					(struct Text *text, int flags);
+struct TextMarker	*txt_find_marker		(struct Text *text, struct TextLine *line, int curs, int flags);
+struct TextMarker	*txt_find_marker_region	(struct Text *text, struct TextLine *line, int start, int end, int flags);
+struct TextMarker	*txt_prev_marker		(struct Text *text, struct TextMarker *marker);
+struct TextMarker	*txt_next_marker		(struct Text *text, struct TextMarker *marker);
+
 /* Undo opcodes */
 
 /* Simple main cursor movement */
@@ -146,6 +155,10 @@ void	txt_paste_clipboard	(struct Text *text);
 #define TXT_FIND_ALLTEXTS 0x02
 #define TXT_FIND_WRAP 0x04
 
+/* Marker flags */
+#define TMARK_TEMP		0x01	/* Remove on non-editing events, don't save */
+#define TMARK_EDITALL	0x02	/* Edit all markers of the same group as one */
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c
index 67beb4e4397..611eed3999e 100644
--- a/source/blender/blenkernel/intern/text.c
+++ b/source/blender/blenkernel/intern/text.c
@@ -148,6 +148,7 @@ void free_text(Text *text)
 	}
 	
 	BLI_freelistN(&text->lines);
+	BLI_freelistN(&text->markers);
 
 	if(text->name) MEM_freeN(text->name);
 	MEM_freeN(text->undo_buf);
@@ -172,6 +173,7 @@ Text *add_empty_text(char *name)
 	ta->flags= TXT_ISDIRTY | TXT_ISTMP | TXT_ISMEM;
 
 	ta->lines.first= ta->lines.last= NULL;
+	ta->markers.first= ta->markers.last= NULL;
 
 	tmp= (TextLine*) MEM_mallocN(sizeof(TextLine), "textline");
 	tmp->line= (char*) MEM_mallocN(1, "textline_string");
@@ -334,6 +336,7 @@ Text *add_text(char *file)
 	ta->id.us= 1;
 
 	ta->lines.first= ta->lines.last= NULL;
+	ta->markers.first= ta->markers.last= NULL;
 	ta->curl= ta->sell= NULL;
 
 /* 	ta->flags= TXT_ISTMP | TXT_ISEXT; */
@@ -421,6 +424,7 @@ Text *copy_text(Text *ta)
 	tan->flags = ta->flags | TXT_ISDIRTY | TXT_ISTMP;
 	
 	tan->lines.first= tan->lines.last= NULL;
+	tan->markers.first= tan->markers.last= NULL;
 	tan->curl= tan->sell= NULL;
 	
 	tan->nlines= ta->nlines;
@@ -948,7 +952,9 @@ int txt_has_sel(Text *text)
 static void txt_delete_sel (Text *text)
 {
 	TextLine *tmpl;
+	TextMarker *mrk;
 	char *buf;
+	int move, lineno;
 	
 	if (!text) return;
 	if (!text->curl) return;
@@ -966,6 +972,23 @@ static void txt_delete_sel (Text *text)
 
 	buf= MEM_mallocN(text->curc+(text->sell->len - text->selc)+1, "textline_string");
 	
+	if (text->curl != text->sell) {
+		txt_clear_marker_region(text, text->curl, text->curc, text->curl->len, 0);
+		move= txt_get_span(text->curl, text->sell);
+	} else
+		move= 0;
+
+	mrk= txt_find_marker_region(text, text->sell, text->selc-1, text->sell->len, 0);
+	if (mrk) {
+		lineno= mrk->lineno;
+		do {
+			mrk->lineno -= move;
+			if (mrk->start > text->curc) mrk->start -= text->selc - text->curc;
+			mrk->end -= text->selc - text->curc;
+			mrk= mrk->next;
+		} while (mrk && mrk->lineno==lineno);
+	}
+
 	strncpy(buf, text->curl->line, text->curc);
 	strcpy(buf+text->curc, text->sell->line + text->selc);
 	buf[text->curc+(text->sell->len - text->selc)]=0;
@@ -2050,12 +2073,29 @@ void txt_do_redo(Text *text)
 void txt_split_curline (Text *text) 
 {
 	TextLine *ins;
+	TextMarker *mrk;
 	char *left, *right;
+	int lineno= -1;
 	
 	if (!text) return;
 	if (!text->curl) return;
 
-	txt_delete_sel(text);	
+	txt_delete_sel(text);
+
+	/* Move markers */
+
+	lineno= txt_get_span(text->lines.first, text->curl);
+	mrk= text->markers.first;
+	while (mrk) {
+		if (mrk->lineno==lineno && mrk->start>text->curc) {
+			mrk->lineno++;
+			mrk->start -= text->curc;
+			mrk->end -= text->curc;
+		} else if (mrk->lineno > lineno) {
+			mrk->lineno++;
+		}
+		mrk= mrk->next;
+	}
 
 	/* Make the two half strings */
 
@@ -2094,9 +2134,23 @@ void txt_split_curline (Text *text)
 
 static void txt_delete_line (Text *text, TextLine *line) 
 {
+	TextMarker *mrk=NULL, *nxt;
+	int lineno= -1;
+
 	if (!text) return;
 	if (!text->curl) return;
 
+	lineno= txt_get_span(text->lines.first, line);
+	mrk= text->markers.first;
+	while (mrk) {
+		nxt= mrk->next;
+		if (mrk->lineno==lineno)
+			BLI_freelinkN(&text->markers, mrk);
+		else if (mrk->lineno > lineno)
+			mrk->lineno--;
+		mrk= nxt;
+	}
+
 	BLI_remlink (&text->lines, line);
 	
 	if (line->line) MEM_freeN(line->line);
@@ -2111,10 +2165,25 @@ static void txt_delete_line (Text *text, TextLine *line)
 static void txt_combine_lines (Text *text, TextLine *linea, TextLine *lineb)
 {
 	char *tmp;
+	TextMarker *mrk= NULL;
+	int lineno=-1;
 	
 	if (!text) return;
 	
 	if(!linea || !lineb) return;
+
+	mrk= txt_find_marker_region(text, lineb, 0, lineb->len, 0);
+	if (mrk) {
+		lineno= mrk->lineno;
+		do {
+			mrk->lineno--;
+			mrk->start += linea->len;
+			mrk->end += linea->len;
+			mrk= mrk->next;
+		} while (mrk && mrk->lineno==lineno);
+	}
+	if (lineno==-1) lineno= txt_get_span(text->lines.first, lineb);
+	if (!mrk) mrk= text->markers.first;
 	
 	tmp= MEM_mallocN(linea->len+lineb->len+1, "textline_string");
 	
@@ -2123,7 +2192,7 @@ static void txt_combine_lines (Text *text, TextLine *linea, TextLine *lineb)
 
 	make_new_line(linea, tmp);
 	
-	txt_delete_line(text, lineb); 
+	txt_delete_line(text, lineb);
 	
 	txt_make_dirty(text);
 	txt_clean_text(text);
@@ -2137,8 +2206,8 @@ void txt_delete_char (Text *text)
 	if (!text->curl) return;
 
 	if (txt_has_sel(text)) { /* deleting a selection */
-	  txt_delete_sel(text);
-	  return;
+		txt_delete_sel(text);
+		return;
 	}
 	else if (text->curc== text->curl->len) { /* Appending two lines */
 		if (text->curl->next) {
@@ -2147,6 +2216,25 @@ void txt_delete_char (Text *text)
 		}
 	} else { /* Just deleting a char */
 		int i= text->curc;
+
+		TextMarker *mrk= txt_find_marker_region(text, text->curl, i-1, text->curl->len, 0);
+		if (mrk) {
+			int lineno= mrk->lineno;
+			if (mrk->end==i) {
+				if ((mrk->flags & TMARK_TEMP) && !(mrk->flags & TMARK_EDITALL)) {
+					txt_clear_markers(text, mrk->flags);
+				} else {
+					TextMarker *nxt= mrk->next;
+					BLI_freelinkN(&text->markers, mrk);
+				}
+				return;
+			}
+			do {
+				if (mrk->start>i) mrk->start--;
+				mrk->end--;
+				mrk= mrk->next;
+			} while (mrk && mrk->lineno==lineno);
+		}
 		
 		c= text->curl->line[i];
 		while(i< text->curl->len) {
@@ -2178,8 +2266,8 @@ void txt_backspace_char (Text *text)
 	if (!text->curl) return;
 	
 	if (txt_has_sel(text)) { /* deleting a selection */
-	  txt_delete_sel(text);
-	  return;
+		txt_delete_sel(text);
+		return;
 	}
 	else if (text->curc==0) { /* Appending two lines */
 		if (!text->curl->prev) return;
@@ -2189,19 +2277,38 @@ void txt_backspace_char (Text *text)
 		
 		txt_combine_lines(text, text->curl, text->curl->next);
 		txt_pop_sel(text);
-	} 
+	}
 	else { /* Just backspacing a char */
-	  int i= text->curc-1;
+		int i= text->curc-1;
+
+		TextMarker *mrk= txt_find_marker_region(text, text->curl, i, text->curl->len, 0);
+		if (mrk) {
+			int lineno= mrk->lineno;
+			if (mrk->start==i+1) {
+				if ((mrk->flags & TMARK_TEMP) && !(mrk->flags & TMARK_EDITALL)) {
+					txt_clear_markers(text, mrk->flags);
+				} else {
+					TextMarker *nxt= mrk->next;
+					BLI_freelinkN(&text->markers, mrk);
+				}
+				return;
+			}
+			do {
+				if (mrk->start>i) mrk->start--;
+				mrk->end--;
+				mrk= mrk->next;
+			} while (mrk && mrk->lineno==lineno);
+		}
 		
-	  c= text->curl->line[i];
-	  while(i< text->curl->len) {
-	    text->curl->line[i]= text->curl->line[i+1];
-	    i++;
-	  }
-	  text->curl->len--;
-	  text->curc--;
-		
-	  txt_pop_sel(text);
+		c= text->curl->line[i];
+		while(i< text->curl->len) {
+			text->curl->line[i]= text->curl->line[i+1];
+			i++;
+		}
+		text->curl->len--;
+		text->curc--;
+
+		txt_pop_sel(text);
 	}
 
 	txt_make_dirty(text);
@@ -2218,8 +2325,9 @@ void txt_backspace_word (Text *text)
 
 int txt_add_char (Text *text, char add) 
 {
-	int len;
+	int len, lineno;
 	char *tmp;
+	TextMarker *mrk;
 	
 	if (!text) return 0;
 	if (!text->curl) return 0;
@@ -2231,6 +2339,16 @@ int txt_add_char (Text *text, char add)
 	
 	txt_delete_sel(text);
 	
+	mrk= txt_find_marker_region(text, text->curl, text->curc-1, text->curl->len, 0);
+	if (mrk) {
+		lineno= mrk->lineno;
+		do {
+			if (mrk->start>text->curc) mrk->start++;
+			mrk->end++;
+			mrk= mrk->next;
+		} while (mrk && mrk->lineno==lineno);
+	}
+	
 	tmp= MEM_mallocN(text->curl->len+2, "textline_string");
 	
 	if(text->curc) memcpy(tmp, text->curl->line, text->curc);
@@ -2535,3 +2653,124 @@ int setcurr_tab (Text *text)
 	return i;
 }
 
+/*********************************/
+/* Text marker utility functions */
+/*********************************/
+
+/* Creates and adds a marker to the list maintaining sorted order */
+void txt_add_marker(Text *text, TextLine *line, int start, int end, char clr[4], int flags) {
+	TextMarker *tmp, *marker;
+
+	marker= MEM_mallocN(sizeof(TextMarker), "text_marker");
+	
+	marker->lineno= txt_get_span(text->lines.first, line);
+	marker->start= MIN2(start, end);
+	marker->end= MAX2(start, end);
+	marker->flags= flags;
+
+	marker->clr[0]= clr[0];
+	marker->clr[1]= clr[1];
+	marker->clr[2]= clr[2];
+	marker->clr[3]= clr[3];
+
+	for (tmp=text->markers.last; tmp; tmp=tmp->prev)
+		if (tmp->lineno < marker->lineno || (tmp->lineno==marker->lineno && tmp->start < marker->start))
+			break;
+
+	if (tmp) BLI_insertlinkafter(&text->markers, tmp, marker);
+	else BLI_addhead(&text->markers, marker);
+}
+
+/* Returns the first matching marker on the specified line between two points
+   If flags is zero, all markers will be searched */
+TextMarker *txt_find_marker_region(Text *text, TextLine *line, int start, int end, int flags) {
+	TextMarker *marker, *next;
+	int lineno= txt_get_span(text->lines.first, line);
+	
+	for (marker=text->markers.first; marker; marker=next) {
+		next= marker->next;
+
+		if (flags && marker->flags != flags) continue;
+		else if (marker->lineno < lineno) continue;
+		else if (marker->lineno > lineno) break;
+
+		if ((marker->start==marker->end && start<=marker->start && marker->start<=end) ||
+				(marker->start<end && marker->end>start))
+			return marker;
+	}
+	return NULL;
+}
+
+/* Clears all matching markers on the specified line between two points
+   If flags is zero, all markers will be cleared */
+void txt_clear_marker_region(Text *text, TextLine *line, int start, int end, int flags) {
+	TextMarker *marker, *next;
+	int lineno= txt_get_span(text->lines.first, line);
+	
+	for (marker=text->markers.first; marker; marker=next) {
+		next= marker->next;
+
+		if (flags && marker->flags != flags) continue;
+		else if (marker->lineno < lineno) continue;
+		else if (marker->lineno > lineno) break;
+
+		if ((marker->start==marker->end && start<=marker->start && marker->start<=end) ||
+				(marker->start<end && marker->end>start))
+			BLI_freelinkN(&text->markers, marker);
+	}
+}
+
+/* Clears all markers with matching flags (useful for clearing temporary markers) */
+void txt_clear_markers(Text *text, int flags) {
+	TextMarker *marker, *next;
+	
+	for (marker=text->markers.first; marker; marker=next) {
+		next= marker->next;
+
+		if (marker->flags == flags)
+			BLI_freelinkN(&text->markers, marker);
+	}
+}
+
+/* Finds the marker at the specified line and cursor position with matching flags.
+   If flags is zero, all markers will be searched */
+TextMarker *txt_find_marker(Text *text, TextLine *line, int curs, int flags) {
+	TextMarker *marker;
+	int lineno= txt_get_span(text->lines.first, line);
+	
+	for (marker=text->markers.first; marker; marker=marker->next) {
+		if (flags && marker->flags != flags) continue;
+		else if (marker->lineno < lineno) continue;
+		else if (marker->lineno > lineno) break;
+
+		if (marker->start <= curs && curs <= marker->end)
+			return marker;
+	}
+	return NULL;
+}
+
+/* Finds the previous marker with matching flags. If no other marker is found, the
+   same one will be returned */
+TextMarker *txt_prev_marker(Text *text, TextMarker *marker) {
+	TextMarker *tmp= marker;
+	while (tmp) {
+		if (tmp->prev) tmp= tmp->prev;
+		else tmp= text->markers.last;
+		if (tmp->flags == marker->flags)
+			return tmp;
+	}
+	return NULL; /* Only if marker==NULL */
+}
+
+/* Finds the next marker with matching flags. If no other marker is found, the
+   same one will be returned */
+TextMarker *txt_next_marker(Text *text, TextMarker *marker) {
+	TextMarker *tmp= marker;
+	while (tmp) {
+		if (tmp->next) tmp= tmp->next;
+		else tmp= text->markers.first;
+		if (tmp->flags == marker->flags)
+			return tmp;
+	}
+	return NULL; /* Only if marker==NULL */
+}
\ No newline at end of file
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index ad19cde3c9b..29fd314236b 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -2273,6 +2273,7 @@ static void direct_link_text(FileData *fd, Text *text)
 */
 
 	link_list(fd, &text->lines);
+	link_list(fd, &text->markers);
 
 	text->curl= newdataadr(fd, text->curl);
 	text->sell= newdataadr(fd, text->sell);
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 3a70438dd13..3af7d3f7c25 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -1845,6 +1845,7 @@ static void write_texts(WriteData *wd, ListBase *idbase)
 {
 	Text *text;
 	TextLine *tmp;
+	TextMarker *mrk;
 
 	text= idbase->first;
 	while(text) {
@@ -1868,7 +1869,16 @@ static void write_texts(WriteData *wd, ListBase *idbase)
 				writedata(wd, DATA, tmp->len+1, tmp->line);
 				tmp= tmp->next;
 			}
+
+			/* write markers */
+			mrk= text->markers.first;
+			while (mrk) {
+				writestruct(wd, DATA, "TextMarker", 1, mrk);
+				mrk= mrk->next;
+			}
 		}
+
+
 		text= text->id.next;
 	}
 
diff --git a/source/blender/makesdna/DNA_text_types.h b/source/blender/makesdna/DNA_text_types.h
index bec4e0062f9..41ea0b23323 100644
--- a/source/blender/makesdna/DNA_text_types.h
+++ b/source/blender/makesdna/DNA_text_types.h
@@ -42,6 +42,12 @@ typedef struct TextLine {
 	int len, blen;
 } TextLine;
 
+typedef struct TextMarker {
+	struct TextMarker *next, *prev;
+	int lineno, start, end, flags;
+	char clr[4], pad[4];
+} TextMarker;
+
 typedef struct Text {
 	ID id;
 	
@@ -52,12 +58,12 @@ typedef struct Text {
 	ListBase lines;
 	TextLine *curl, *sell;
 	int curc, selc;
+	ListBase markers;
 	
 	char *undo_buf;
 	int undo_pos, undo_len;
 	
 	void *compiled;
-
 	double mtime;
 } Text;
 
diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index 335062cb055..a05133f47bd 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -123,6 +123,9 @@ def wrap(line, view_width, wrap_chars):
 #define TOOL_SUGG_LIST	0x01
 #define TOOL_DOCUMENT	0x02
 
+#define TMARK_GRP_CUSTOM	0x00010000	/* Lower 2 bytes used for flags */
+#define TMARK_GRP_FINDALL	0x00020000	/* Upper 2 bytes used for group */
+
 /* forward declarations */
 
 void drawtextspace(ScrArea *sa, void *spacedata);
@@ -141,7 +144,6 @@ static int check_whitespace(char ch);
 
 static int get_wrap_width(SpaceText *st);
 static int get_wrap_points(SpaceText *st, char *line);
-
 static void get_suggest_prefix(Text *text);
 static void confirm_suggestion(Text *text, int skipleft);
 
@@ -777,6 +779,77 @@ static int get_char_pos(SpaceText *st, char *line, int cur) {
 	return a;
 }
 
+static void draw_markers(SpaceText *st) {
+	Text *text= st->text;
+	TextMarker *marker, *next;
+	TextLine *top, *bottom, *line;
+	int offl, offc, i, cy, x1, x2, y1, y2, x, y;
+
+	for (i=st->top, top= text->lines.first; top->next && i>0; i--) top= top->next;
+	for (i=st->viewlines-1, bottom=top; bottom->next && i>0; i--) bottom= bottom->next;
+	
+	for (marker= text->markers.first; marker; marker= next) {
+		next= marker->next;
+		for (cy= 0, line= top; line; cy++, line= line->next) {
+			if (cy+st->top==marker->lineno) {
+				/* Remove broken markers */
+				if (marker->end>line->len || marker->start>marker->end) {
+					BLI_freelinkN(&text->markers, marker);
+					break;
+				}
+
+				wrap_offset(st, line, marker->start, &offl, &offc);
+				x1= get_char_pos(st, line->line, marker->start) - st->left + offc;
+				y1= cy + offl;
+				wrap_offset(st, line, marker->end, &offl, &offc);
+				x2= get_char_pos(st, line->line, marker->end) - st->left + offc;
+				y2= cy + offl;
+
+				glColor3ub(marker->clr[0], marker->clr[1], marker->clr[2]);
+				x= st->showlinenrs ? TXT_OFFSET + TEXTXLOC : TXT_OFFSET;
+				y= curarea->winy-3;
+
+				if (y1==y2) {
+					y -= y1*st->lheight;
+					glBegin(GL_LINE_LOOP);
+					glVertex2i(x+x2*spacetext_get_fontwidth(st), y);
+					glVertex2i(x+x1*spacetext_get_fontwidth(st)-1, y);
+					glVertex2i(x+x1*spacetext_get_fontwidth(st)-1, y-st->lheight);
+					glVertex2i(x+x2*spacetext_get_fontwidth(st), y-st->lheight);
+					glEnd();
+				} else {
+					y -= y1*st->lheight;
+					glBegin(GL_LINE_STRIP);
+					glVertex2i(curarea->winx, y);
+					glVertex2i(x+x1*spacetext_get_fontwidth(st)-1, y);
+					glVertex2i(x+x1*spacetext_get_fontwidth(st)-1, y-st->lheight);
+					glVertex2i(curarea->winx, y-st->lheight);
+					glEnd();
+					y-=st->lheight;
+					for (i=y1+1; i<y2; i++) {
+						glBegin(GL_LINES);
+						glVertex2i(x, y);
+						glVertex2i(curarea->winx, y);
+						glVertex2i(x, y-st->lheight);
+						glVertex2i(curarea->winx, y-st->lheight);
+						glEnd();
+						y-=st->lheight;
+					}
+					glBegin(GL_LINE_STRIP);
+					glVertex2i(x, y);
+					glVertex2i(x+x2*spacetext_get_fontwidth(st), y);
+					glVertex2i(x+x2*spacetext_get_fontwidth(st), y-st->lheight);
+					glVertex2i(x, y-st->lheight);
+					glEnd();
+				}
+
+				break;
+			}
+			if (line==bottom) break;
+		}
+	}
+}
+
 static void draw_cursor(SpaceText *st) {
 	Text *text= st->text;
 	int vcurl, vcurc, vsell, vselc, hidden=0;
@@ -1410,6 +1483,7 @@ void drawtextspace(ScrArea *sa, void *spacedata)
 	}
 	
 	draw_brackets(st);
+	draw_markers(st);
 
 	draw_textscroll(st);
 	draw_documentation(st);
@@ -2032,6 +2106,277 @@ static void confirm_suggestion(Text *text, int skipleft) {
 	texttool_text_clear();
 }
 
+static short do_texttools(SpaceText *st, char ascii, unsigned short evnt, short val) {
+	int draw=0, swallow=0, tools=0, tools_cancel=0, tools_update=0, scroll=1;
+	if (!texttool_text_is_active(st->text)) return 0;
+	if (!st->text || st->text->id.lib) return 0;
+
+	if (st->showsyntax && texttool_text_is_active(st->text)) {
+		if (texttool_suggest_first()) tools |= TOOL_SUGG_LIST;
+		if (texttool_docs_get()) tools |= TOOL_DOCUMENT;
+	}
+
+	if (ascii) {
+		if (tools & TOOL_SUGG_LIST) {
+			if ((ascii != '_' && ascii != '*' && ispunct(ascii)) || check_whitespace(ascii)) {
+				confirm_suggestion(st->text, 0);
+				if (st->showsyntax) txt_format_line(st, st->text->curl, 1);
+			} else if ((st->overwrite && txt_replace_char(st->text, ascii)) || txt_add_char(st->text, ascii)) {
+				tools_update |= TOOL_SUGG_LIST;
+				swallow= 1;
+				draw= 1;
+			}
+		}
+		tools_cancel |= TOOL_DOCUMENT;
+
+	} else if (val) {
+		switch (evnt) {
+			case LEFTMOUSE:
+				if (do_suggest_select(st)) swallow= 1;
+				else tools_cancel |= TOOL_SUGG_LIST | TOOL_DOCUMENT;
+				draw= 1;
+				break;
+			case MIDDLEMOUSE:
+				if (do_suggest_select(st)) {
+					confirm_suggestion(st->text, 0);
+					if (st->showsyntax) txt_format_line(st, st->text->curl, 1);
+					swallow= 1;
+				} else
+					tools_cancel |= TOOL_SUGG_LIST | TOOL_DOCUMENT;
+				draw= 1;
+				break;
+			case ESCKEY:
+				swallow= 1;
+				if (tools & TOOL_SUGG_LIST)
+					tools_cancel |= TOOL_SUGG_LIST;
+				else if (tools & TOOL_DOCUMENT)
+					tools_cancel |= TOOL_DOCUMENT;
+				else
+					swallow= 0;
+				break;
+			case RETKEY:
+				if (tools & TOOL_SUGG_LIST) {
+					confirm_suggestion(st->text, 0);
+					if (st->showsyntax) txt_format_line(st, st->text->curl, 1);
+					swallow= 1;
+					draw= 1;
+				}
+				tools_cancel |= TOOL_DOCUMENT;
+				break;
+			case BACKSPACEKEY:
+				if (tools & TOOL_SUGG_LIST) {
+					if (G.qual) tools_cancel |= TOOL_SUGG_LIST;
+					else {
+						/* Work out which char we are about to delete */
+						if (st->text->curl && st->text->curc > 0) {
+							char ch= st->text->curl->line[st->text->curc-1];
+							if ((ch=='_' || !ispunct(ch)) && !check_whitespace(ch))
+								tools_update |= TOOL_SUGG_LIST;
+							else
+								tools_cancel |= TOOL_SUGG_LIST;
+						}
+					}
+				}
+				tools_cancel |= TOOL_DOCUMENT;
+				break;
+			case PAGEDOWNKEY:
+				scroll= SUGG_LIST_SIZE-1;
+			case WHEELDOWNMOUSE:
+			case DOWNARROWKEY:
+				if (tools & TOOL_DOCUMENT) {
+					doc_scroll++;
+					swallow= 1;
+					draw= 1;
+					break;
+				} else if (tools & TOOL_SUGG_LIST) {
+					SuggItem *sel = texttool_suggest_selected();
+					if (!sel) {
+						texttool_suggest_select(texttool_suggest_first());
+					} else while (sel && sel!=texttool_suggest_last() && sel->next && scroll--) {
+						texttool_suggest_select(sel->next);
+						sel= sel->next;
+					}
+					swallow= 1;
+					draw= 1;
+					break;
+				}
+			case PAGEUPKEY:
+				scroll= SUGG_LIST_SIZE-1;
+			case WHEELUPMOUSE:
+			case UPARROWKEY:
+				if (tools & TOOL_DOCUMENT) {
+					if (doc_scroll>0) doc_scroll--;
+					swallow= 1;
+					draw= 1;
+					break;
+				} else if (tools & TOOL_SUGG_LIST) {
+					SuggItem *sel = texttool_suggest_selected();
+					while (sel && sel!=texttool_suggest_first() && sel->prev && scroll--) {
+						texttool_suggest_select(sel->prev);
+						sel= sel->prev;
+					}
+					swallow= 1;
+					draw= 1;
+					break;
+				}
+			default:
+				if (G.qual!=0 && G.qual!=LR_SHIFTKEY)
+					tools_cancel |= TOOL_SUGG_LIST | TOOL_DOCUMENT;
+		}
+	}
+
+	if (tools & TOOL_SUGG_LIST) {
+		if (tools_update & TOOL_SUGG_LIST) {
+			get_suggest_prefix(st->text);
+		} else if (tools_cancel & TOOL_SUGG_LIST) {
+			texttool_suggest_clear();
+		}
+		draw= 1;
+	}
+	if (tools & TOOL_DOCUMENT) {
+		if (tools_cancel & TOOL_DOCUMENT) {
+			texttool_docs_clear();
+			doc_scroll= 0;
+		}
+		draw= 1;
+	}
+
+	if (draw) {
+		ScrArea *sa;
+		
+		for (sa= G.curscreen->areabase.first; sa; sa= sa->next) {
+			SpaceText *st= sa->spacedata.first;
+			
+			if (st && st->spacetype==SPACE_TEXT) {
+				scrarea_queue_redraw(sa);
+			}
+		}
+	}
+
+	return swallow;
+}
+
+static short do_markers(SpaceText *st, char ascii, unsigned short evnt, short val) {
+	Text *text;
+	TextMarker *marker, *mrk, *nxt;
+	int c, s, draw=0, swallow=0;
+
+	text= st->text;
+	if (!text || text->curl != text->sell) return 0;
+
+	marker= txt_find_marker(text, text->curl, text->curc, 0);
+	if (!marker || text->id.lib) return 0;
+
+	if (ascii) {
+		if (marker->flags & TMARK_EDITALL) {
+			c= text->curc-marker->start;
+			s= text->selc-marker->start;
+			if (s<0 || s>marker->end-marker->start) return 0;
+			
+			mrk= txt_next_marker(text, marker);
+			while (mrk) {
+				txt_move_to(text, mrk->lineno, mrk->start+c, 0);
+				if (s!=c) txt_move_to(text, mrk->lineno, mrk->start+s, 1);
+				if (st->overwrite) {
+					if (txt_replace_char(text, ascii))
+						if (st->showsyntax) txt_format_line(st, text->curl, 1);
+				} else {
+					if (txt_add_char(text, ascii)) {
+						if (st->showsyntax) txt_format_line(st, text->curl, 1);
+					}
+				}
+
+				if (mrk==marker) break;
+				mrk=txt_next_marker(text, mrk);
+			}
+			swallow= 1;
+			draw= 1;
+		}
+	} else if (val) {
+		switch(evnt) {
+			case BACKSPACEKEY:
+				if (marker->flags & TMARK_EDITALL) {
+					c= text->curc-marker->start;
+					s= text->selc-marker->start;
+					if (s<0 || s>marker->end-marker->start) return 0;
+					
+					mrk= txt_next_marker(text, marker);
+					while (mrk) {
+						nxt= txt_next_marker(text, mrk); /* mrk may become invalid */
+						txt_move_to(text, mrk->lineno, mrk->start+c, 0);
+						if (s!=c) txt_move_to(text, mrk->lineno, mrk->start+s, 1);
+						txt_backspace_char(text);
+						if (st->showsyntax) txt_format_line(st, text->curl, 1);
+						if (mrk==marker) break;
+						mrk= nxt;
+					}
+					swallow= 1;
+					draw= 1;
+				}
+				break;
+			case DELKEY:
+				if (marker->flags & TMARK_EDITALL) {
+					c= text->curc-marker->start;
+					s= text->selc-marker->start;
+					if (s<0 || s>marker->end-marker->start) return 0;
+					
+					mrk= txt_next_marker(text, marker);
+					while (mrk) {
+						nxt= txt_next_marker(text, mrk); /* mrk may become invalid */
+						txt_move_to(text, mrk->lineno, mrk->start+c, 0);
+						if (s!=c) txt_move_to(text, mrk->lineno, mrk->start+s, 1);
+						txt_delete_char(text);
+						if (st->showsyntax) txt_format_line(st, text->curl, 1);
+						if (mrk==marker) break;
+						mrk= nxt;
+					}
+					swallow= 1;
+					draw= 1;
+				}
+				break;
+			case TABKEY:
+				marker= (G.qual & LR_SHIFTKEY) ? txt_prev_marker(text, marker) : txt_next_marker(text, marker);
+				txt_move_to(text, marker->lineno, marker->start, 0);
+				txt_move_to(text, marker->lineno, marker->end, 1);
+				pop_space_text(st);
+				swallow= 1;
+				draw= 1;
+				break;
+
+			/* Events that should clear markers */
+			case RETKEY:
+			case ESCKEY:
+				if (marker->flags & (TMARK_EDITALL | TMARK_TEMP))
+					txt_clear_markers(text, marker->flags);
+				else
+					BLI_freelinkN(&text->markers, marker);
+				swallow= 1;
+				draw= 1;
+				break;
+			case RIGHTMOUSE: /* Marker context menu? */
+			case LEFTMOUSE:
+				break;
+
+			default:
+				if (G.qual!=0 && G.qual!=LR_SHIFTKEY)
+					swallow= 1; /* Swallow all other shortcut events */
+		}
+	}
+	
+	if (draw) {
+		ScrArea *sa;
+		
+		for (sa= G.curscreen->areabase.first; sa; sa= sa->next) {
+			SpaceText *st= sa->spacedata.first;
+			
+			if (st && st->spacetype==SPACE_TEXT) {
+				scrarea_queue_redraw(sa);
+			}
+		}
+	}
+	return swallow;
+}
+
 void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 {
 	unsigned short event= evt->event;
@@ -2040,7 +2385,6 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 	SpaceText *st= curarea->spacedata.first;
 	Text *text;
 	int do_draw=0, p;
-	int tools=0, tools_cancel=0, tools_update=0; /* Bitmasks for operations */
 	
 	if (st==NULL || st->spacetype != SPACE_TEXT) return;
 	
@@ -2104,10 +2448,8 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 		return;
 	}
 
-	if (st->showsyntax && texttool_text_is_active(text)) {
-		if (texttool_suggest_first()) tools |= TOOL_SUGG_LIST;
-		if (texttool_docs_get()) tools |= TOOL_DOCUMENT;
-	}
+	if (st->showsyntax && do_texttools(st, ascii, event, val)) return;
+	if (do_markers(st, ascii, event, val)) return;
 	
 	if (event==LEFTMOUSE) {
 		if (val) {
@@ -2118,9 +2460,6 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			
 			if (mval[0]>2 && mval[0]<20 && mval[1]>2 && mval[1]<curarea->winy-2) {
 				do_textscroll(st, 2);
-				tools_cancel |= TOOL_SUGG_LIST | TOOL_DOCUMENT;
-			} else if (do_suggest_select(st)) {
-				do_draw= 1;
 			} else {
 				do_selection(st, G.qual&LR_SHIFTKEY);
 				if (txt_has_sel(text)) {
@@ -2129,24 +2468,16 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 					MEM_freeN(buffer);
 				}
 				do_draw= 1;
-				tools_cancel |= TOOL_SUGG_LIST | TOOL_DOCUMENT;
 			}
 		}
 	} else if (event==MIDDLEMOUSE) {
 		if (val) {
-			if (do_suggest_select(st)) {
-				confirm_suggestion(text, 0);
+			if (U.uiflag & USER_MMB_PASTE) {
+				do_selection(st, G.qual&LR_SHIFTKEY);
+				get_selection_buffer(text);
 				do_draw= 1;
 			} else {
-				if (U.uiflag & USER_MMB_PASTE) {
-					do_selection(st, G.qual&LR_SHIFTKEY);
-					get_selection_buffer(text);
-					do_draw= 1;
-					tools_cancel |= TOOL_SUGG_LIST | TOOL_DOCUMENT;
-				} else {
-					do_textscroll(st, 1);
-					tools_cancel |= TOOL_SUGG_LIST;
-				}
+				do_textscroll(st, 1);
 			}
 		}
 	} else if (event==RIGHTMOUSE) {
@@ -2180,33 +2511,16 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 				default:
 					break;
 			}
-			tools_cancel |= TOOL_SUGG_LIST | TOOL_DOCUMENT;
 		}
 	} else if (ascii) {
 		if (text && text->id.lib) {
 			error_libdata();
-
 		} else if ((st->overwrite && txt_replace_char(text, ascii)) || txt_add_char(text, ascii)) {
 			if (st->showsyntax) txt_format_line(st, text->curl, 1);
 			pop_space_text(st);
 			do_draw= 1;
-			if (tools & TOOL_SUGG_LIST) {
-				if ((ascii != '_' && ascii != '*' && ispunct(ascii)) || check_whitespace(ascii)) {
-					confirm_suggestion(text, 1);
-					if (st->showsyntax) txt_format_line(st, text->curl, 1);
-				} else {
-					tools_update |= TOOL_SUGG_LIST;
-				}
-			}
-			tools_cancel |= TOOL_DOCUMENT;
 		}
 	} else if (val) {
-
-		/* Cases that require tools not to be cancelled must explicitly say so.
-		 * The default case does this to prevent window/mousemove events
-		 * from cancelling. */
-		tools_cancel |= TOOL_SUGG_LIST | TOOL_DOCUMENT;
-
 		switch (event) {
 		case AKEY:
 			if (G.qual & LR_ALTKEY) {
@@ -2334,6 +2648,16 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			if (G.qual == LR_ALTKEY) {
 				txt_export_to_object(text);
 				do_draw= 1;	
+			} else if ((G.qual & LR_CTRLKEY) && text->sell==text->curl) {
+				int a= text->curc < text->selc ? text->curc : text->selc;
+				int b= text->curc < text->selc ? text->selc : text->curc;
+
+				/* Don't allow overlapping markers */
+				txt_clear_marker_region(text, text->curl, a, b, TMARK_GRP_CUSTOM);
+				if (!(G.qual & LR_ALTKEY)) {
+					txt_add_marker(text, text->curl, a, b, "\xFF\xC0\xFF\xFF", TMARK_GRP_CUSTOM | TMARK_EDITALL);
+					do_draw= 1;
+				}
 			}
 			break; /* BREAK M */
 		case NKEY:
@@ -2477,31 +2801,26 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 				do_draw= 1;
 			}
 			break;
-		case ESCKEY:
-			/* To allow ESC to close one tool at a time we remove all others from the cancel list */
-			if (tools & TOOL_DOCUMENT) {
-				tools_cancel &= ~TOOL_SUGG_LIST;
-			}
-			break;
 		case TABKEY:
 			if (text && text->id.lib) {
 				error_libdata();
 				break;
-			}
-			if (G.qual & LR_SHIFTKEY) {
-				if (txt_has_sel(text)) {
-					txt_order_cursors(text);
-					unindent(text);
-					if (st->showsyntax) txt_format_text(st);
-				}
 			} else {
-				if ( txt_has_sel(text)) {
-					txt_order_cursors(text);
-					indent(text);
-					if (st->showsyntax) txt_format_text(st);
+				if (G.qual & LR_SHIFTKEY) {
+					if (txt_has_sel(text)) {
+						txt_order_cursors(text);
+						unindent(text);
+						if (st->showsyntax) txt_format_text(st);
+					}
 				} else {
-					txt_add_char(text, '\t');
-					if (st->showsyntax) txt_format_line(st, text->curl, 1);
+					if ( txt_has_sel(text)) {
+						txt_order_cursors(text);
+						indent(text);
+						if (st->showsyntax) txt_format_text(st);
+					} else {
+						txt_add_char(text, '\t');
+						if (st->showsyntax) txt_format_line(st, text->curl, 1);
+					}
 				}
 			}
 			pop_space_text(st);
@@ -2513,11 +2832,6 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 				error_libdata();
 				break;
 			}
-			if (tools & TOOL_SUGG_LIST) {
-				confirm_suggestion(text, 0);
-				if (st->showsyntax) txt_format_line(st, text->curl, 1);
-				break;
-			}
 			//double check tabs before splitting the line
 			st->currtab_set = setcurr_tab(text);
 			txt_split_curline(text);
@@ -2545,15 +2859,7 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			}
 			if (G.qual & (LR_ALTKEY | LR_CTRLKEY)) {
 				txt_backspace_word(text);
-				tools_cancel |= TOOL_SUGG_LIST;
 			} else {
-				/* Work out which char we are about to delete */
-				if (text && text->curl && text->curc > 0) {
-					char ch= text->curl->line[text->curc-1];
-					if (!ispunct(ch) && !check_whitespace(ch)) {
-						tools_update |= TOOL_SUGG_LIST;
-					}
-				}
 				txt_backspace_char(text);
 			}
 			set_tabs(text);
@@ -2579,23 +2885,8 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 		case INSERTKEY:
 			st->overwrite= !st->overwrite;
 			do_draw= 1;
-			tools_cancel = 0;
 			break;
 		case DOWNARROWKEY:
-			if (tools & TOOL_DOCUMENT) {
-				doc_scroll++;
-				tools_cancel &= ~(TOOL_SUGG_LIST | TOOL_DOCUMENT);
-				break;
-			} else if (tools & TOOL_SUGG_LIST) {
-				SuggItem *sel = texttool_suggest_selected();
-				if (!sel) {
-					texttool_suggest_select(texttool_suggest_first());
-				} else if (sel!=texttool_suggest_last() && sel->next) {
-					texttool_suggest_select(sel->next);
-				}
-				tools_cancel &= ~TOOL_SUGG_LIST;
-				break;
-			}
 			txt_move_down(text, G.qual & LR_SHIFTKEY);
 			set_tabs(text);
 			do_draw= 1;
@@ -2624,48 +2915,17 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			pop_space_text(st);
 			break;
 		case UPARROWKEY:
-			if (tools & TOOL_DOCUMENT) {
-				if (doc_scroll) doc_scroll--;
-				tools_cancel &= ~(TOOL_SUGG_LIST | TOOL_DOCUMENT);
-				break;
-			} else if (tools & TOOL_SUGG_LIST) {
-				SuggItem *sel = texttool_suggest_selected();
-				if (sel && sel!=texttool_suggest_first() && sel->prev)
-					texttool_suggest_select(sel->prev);
-				tools_cancel &= ~TOOL_SUGG_LIST;
-				break;
-			}
 			txt_move_up(text, G.qual & LR_SHIFTKEY);
 			set_tabs(text);
 			do_draw= 1;
 			pop_space_text(st);
 			break;
 		case PAGEDOWNKEY:
-			if (tools & TOOL_SUGG_LIST) {
-				int i;
-				SuggItem *sel = texttool_suggest_selected();
-				if (!sel)
-					sel = texttool_suggest_first();
-				for (i=0; i<SUGG_LIST_SIZE-1 && sel && sel!=texttool_suggest_last() && sel->next; i++, sel=sel->next)
-					texttool_suggest_select(sel->next);
-				tools_cancel &= ~TOOL_SUGG_LIST;
-				break;
-			} else {
-				screen_skip(st, st->viewlines);
-			}
+			screen_skip(st, st->viewlines);
 			do_draw= 1;
 			break;
 		case PAGEUPKEY:
-			if (tools & TOOL_SUGG_LIST) {
-				int i;
-				SuggItem *sel = texttool_suggest_selected();
-				for (i=0; i<SUGG_LIST_SIZE-1 && sel && sel!=texttool_suggest_first() && sel->prev; i++, sel=sel->prev)
-					texttool_suggest_select(sel->prev);
-				tools_cancel &= ~TOOL_SUGG_LIST;
-				break;
-			} else {
-				screen_skip(st, -st->viewlines);
-			}
+			screen_skip(st, -st->viewlines);
 			do_draw= 1;
 			break;
 		case HOMEKEY:
@@ -2679,43 +2939,13 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			pop_space_text(st);
 			break;
 		case WHEELUPMOUSE:
-			if (tools & TOOL_DOCUMENT) {
-				if (doc_scroll) doc_scroll--;
-				tools_cancel &= ~(TOOL_SUGG_LIST | TOOL_DOCUMENT);
-				break;
-			} else if (tools & TOOL_SUGG_LIST) {
-				SuggItem *sel = texttool_suggest_selected();
-				if (sel && sel!=texttool_suggest_first() && sel->prev)
-					texttool_suggest_select(sel->prev);
-				tools_cancel &= ~TOOL_SUGG_LIST;
-			} else {
-				screen_skip(st, -U.wheellinescroll);
-				tools_cancel &= ~TOOL_DOCUMENT;
-			}
+			screen_skip(st, -U.wheellinescroll);
 			do_draw= 1;
 			break;
 		case WHEELDOWNMOUSE:
-			if (tools & TOOL_DOCUMENT) {
-				doc_scroll++;
-				tools_cancel &= ~(TOOL_SUGG_LIST | TOOL_DOCUMENT);
-				break;
-			} else if (tools & TOOL_SUGG_LIST) {
-				SuggItem *sel = texttool_suggest_selected();
-				if (!sel) {
-					texttool_suggest_select(texttool_suggest_first());
-				} else if (sel && sel!=texttool_suggest_last() && sel->next) {
-					texttool_suggest_select(sel->next);
-				}
-				tools_cancel &= ~TOOL_SUGG_LIST;
-			} else {
-				screen_skip(st, U.wheellinescroll);
-				tools_cancel &= ~TOOL_DOCUMENT;
-			}
+			screen_skip(st, U.wheellinescroll);
 			do_draw= 1;
 			break;
-		default:
-			/* We don't want all sorts of events closing the suggestions box */
-			tools_cancel &= ~TOOL_SUGG_LIST & ~TOOL_DOCUMENT;
 		}
 	}
 
@@ -2779,22 +3009,6 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 		}
 	}
 
-	if (tools & TOOL_SUGG_LIST) {
-		if (tools_update & TOOL_SUGG_LIST) {
-			get_suggest_prefix(text);
-		} else if (tools_cancel & TOOL_SUGG_LIST) {
-			texttool_suggest_clear();
-		}
-		do_draw= 1;
-	}
-	if (tools & TOOL_DOCUMENT) {
-		if (tools_cancel & TOOL_DOCUMENT) {
-			texttool_docs_clear();
-			doc_scroll= 0;
-		}
-		do_draw= 1;
-	}
-
 	if (do_draw) {
 		ScrArea *sa;
 		

From 06c3dee92b4cf85a1f7042787216133653bbffad Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Tue, 5 Aug 2008 17:43:03 +0000
Subject: [PATCH 184/252] Find and Replace now support "Mark All" which marks
 all occurrences of a string and allows them to be edited from one instance.
 Improvements have also been made to the UI allowing better control over which
 occurrences to replace.

---
 source/blender/blenkernel/BKE_text.h |   8 +-
 source/blender/src/drawtext.c        | 251 ++++++++++++---------------
 source/blender/src/header_text.c     |  13 +-
 3 files changed, 123 insertions(+), 149 deletions(-)

diff --git a/source/blender/blenkernel/BKE_text.h b/source/blender/blenkernel/BKE_text.h
index de54b6413ae..5a49e8bed9b 100644
--- a/source/blender/blenkernel/BKE_text.h
+++ b/source/blender/blenkernel/BKE_text.h
@@ -151,9 +151,11 @@ struct TextMarker	*txt_next_marker		(struct Text *text, struct TextMarker *marke
 #define UNDO_UNCOMMENT		035
 
 /* Find and replace flags */
-#define TXT_FIND_REPLACE 0x01
-#define TXT_FIND_ALLTEXTS 0x02
-#define TXT_FIND_WRAP 0x04
+#define TXT_FIND_REPLACE	0x01
+#define TXT_FIND_ALLTEXTS	0x02
+#define TXT_FIND_WRAP		0x04
+#define TXT_FIND_MARKALL	0x08
+#define TXT_FIND_KEEP		0x10
 
 /* Marker flags */
 #define TMARK_TEMP		0x01	/* Remove on non-editing events, don't save */
diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index a05133f47bd..951e71e1f81 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -77,6 +77,7 @@
 #include "BIF_space.h"
 #include "BIF_mywindow.h"
 #include "BIF_resources.h"
+#include "BIF_mainqueue.h"
 
 #include "BSE_filesel.h"
 
@@ -147,9 +148,10 @@ static int get_wrap_points(SpaceText *st, char *line);
 static void get_suggest_prefix(Text *text);
 static void confirm_suggestion(Text *text, int skipleft);
 
-static int last_txt_find_flags= 0;
-static void *last_txt_find_string= NULL;
-static void *last_txt_repl_string= NULL;
+#define TXT_MAXFINDSTR 255
+static int last_find_flags= TXT_FIND_WRAP | TXT_FIND_KEEP;
+static char *last_find_string= NULL;
+static char *last_repl_string= NULL;
 
 static int doc_scroll= 0;
 static double last_check_time= 0;
@@ -213,8 +215,8 @@ static void temp_char_write(char c, int accum) {
 void free_txt_data(void) {
 	txt_free_cut_buffer();
 	
-	if (last_txt_find_string) MEM_freeN(last_txt_find_string);
-	if (last_txt_repl_string) MEM_freeN(last_txt_repl_string);
+	if (last_find_string) MEM_freeN(last_find_string);
+	if (last_repl_string) MEM_freeN(last_repl_string);
 	if (temp_char_buf) MEM_freeN(temp_char_buf);
 	if (temp_char_accum) MEM_freeN(temp_char_accum);	
 }
@@ -1852,15 +1854,13 @@ void txt_copy_clipboard(Text *text) {
 	}
 }
 
-static short find_and_replace_popup(char *findvar, char *replvar, int *flags, short min, short max)
+static short find_and_replace_popup(short focus)
 {
 	uiBlock *block;
 	ListBase listb={0, 0};
 	short x1,y1;
 	short ret=0;
 	char *editfindvar=NULL, *editreplvar=NULL; /* dont edit the original text, incase we cancel the popup */
-	
-	if(min>max) min= max;
 
 	block= uiNewBlock(&listb, "button", UI_EMBOSS, UI_HELV, G.curscreen->mainwin);
 	uiBlockSetFlag(block, UI_BLOCK_LOOP|UI_BLOCK_REDRAW|UI_BLOCK_RET_1|UI_BLOCK_ENTER_OK);
@@ -1868,25 +1868,28 @@ static short find_and_replace_popup(char *findvar, char *replvar, int *flags, sh
 	x1= curarea->winrct.xmax - 240;
 	y1= curarea->winrct.ymin;
 	
-	editfindvar = MEM_callocN(max+1, "findvar");
-	editreplvar = MEM_callocN(max+1, "replvar");
-	BLI_strncpy(editfindvar, findvar, max);
-	BLI_strncpy(editreplvar, replvar, max);
+	editfindvar = MEM_callocN(TXT_MAXFINDSTR+1, "findvar");
+	editreplvar = MEM_callocN(TXT_MAXFINDSTR+1, "replvar");
+	BLI_strncpy(editfindvar, last_find_string, TXT_MAXFINDSTR);
+	BLI_strncpy(editreplvar, last_repl_string, TXT_MAXFINDSTR);
 	
-	uiDefButC(block, TEX, 0, "Find: ", x1+5,y1+85,225,20, editfindvar,(float)min,(float)max, 0, 0, "");
-	uiDefButC(block, TEX, 0, "Replace: ", x1+5,y1+60,225,20, editreplvar,(float)min,(float)max, 0, 0, "");
-	uiDefButBitI(block, TOG, TXT_FIND_REPLACE, 0, "Replace", x1+5,y1+35,55,20, flags, 0, 0, 0, 0, "Replace previous item found");
-	uiDefButBitI(block, TOG, TXT_FIND_ALLTEXTS, 0, "All Texts", x1+60,y1+35,55,20, flags, 0, 0, 0, 0, "Search all texts");
-	uiDefButBitI(block, TOG, TXT_FIND_WRAP, 0, "Wrap", x1+115,y1+35,55,20, flags, 0, 0, 0, 0, "Wrap search around current text");
-	uiDefBut(block, BUT, 3, "Replace/Find", x1+125,y1+10,105,20, NULL, 0, 0, 0, 0, "");
+	uiDefButC(block, TEX, 1, "Find: ", x1+5,y1+85,225,20, editfindvar, 0,(float)TXT_MAXFINDSTR, 0, 0, "");
+	uiDefButC(block, TEX, 2, "Replace: ", x1+5,y1+60,225,20, editreplvar, 0,(float)TXT_MAXFINDSTR, 0, 0, "");
+	uiDefButBitI(block, TOG, TXT_FIND_WRAP,    3,"Wrap",        x1+  5,y1+35,60,20,&last_find_flags,0,0,0,0,"Wrap search around current text");
+	uiDefButBitI(block, TOG, TXT_FIND_ALLTEXTS,4,"All Texts",   x1+ 65,y1+35,70,20,&last_find_flags,0,0,0,0,"Search all texts");
+	uiDefButBitI(block, TOG, TXT_FIND_KEEP,    5,"Keep Visible",x1+135,y1+35,95,20,&last_find_flags,0,0,0,0,"Keep the find panel visible");
+	uiDefBut(block, BUT, 6, "Replace/Find", x1+  5,y1+10,90,20, NULL, 0, 0, 0, 0, "Replace then find next");
+	uiDefBut(block, BUT, 7, "Find",         x1+ 95,y1+10,60,20, NULL, 0, 0, 0, 0, "Find next");
+	uiDefBut(block, BUT, 8, "Mark All",     x1+155,y1+10,75,20, NULL, 0, 0, 0, 0, "Find and mark all");
 
 	uiBoundsBlock(block, 5);
 	
+	if (focus) mainqenter_ext(BUT_ACTIVATE, focus, 0);
 	ret= uiDoBlocks(&listb, 0, 0);
 
 	if(ret==UI_RETURN_OK) {
-		BLI_strncpy(findvar, editfindvar, max);
-		BLI_strncpy(replvar, editreplvar, max);
+		BLI_strncpy(last_find_string, editfindvar, TXT_MAXFINDSTR);
+		BLI_strncpy(last_repl_string, editreplvar, TXT_MAXFINDSTR);
 		MEM_freeN(editfindvar);
 		MEM_freeN(editreplvar);
 		return 1;
@@ -1897,123 +1900,114 @@ static short find_and_replace_popup(char *findvar, char *replvar, int *flags, sh
 	
 }
 
+static void do_find_and_replace_popup(SpaceText *st, short val) {
+	last_find_flags &= ~TXT_FIND_REPLACE & ~TXT_FIND_MARKALL;
+	switch (val) {
+		case -1: case 0: return;
+		case 1: case 2: break;
+		/* Toggles */
+		case 3: if (last_find_flags & TXT_FIND_WRAP) last_find_flags &= ~TXT_FIND_ALLTEXTS; break;
+		case 4: if (last_find_flags & TXT_FIND_ALLTEXTS) last_find_flags &= ~TXT_FIND_WRAP; break;
+		case 5: break;
+		/* Buttons */
+		case 6: last_find_flags |= TXT_FIND_REPLACE;
+		case 7: break;
+		case 8: last_find_flags |= TXT_FIND_MARKALL;
+	}
+	if (val>5) {
+		txt_find_panel(st, 1, last_find_flags);
+		scrarea_do_windraw(curarea);
+		screen_swapbuffers();
+		if (!(last_find_flags & TXT_FIND_MARKALL) && (last_find_flags & TXT_FIND_KEEP))
+			find_and_replace_popup(0);
+	} else {
+		find_and_replace_popup(0);
+	}
+}
+
 /*
  * again==0 always show find panel
  * again==1 find text again (no panel) If first find, panel shown anyway
- * flags:
+ * flags (used to initialize UI if again==0):
  *   TXT_FIND_REPLACE  replace last found occurrence before searching again
  *   TXT_FIND_ALLTEXTS search through all texts (off wraps current text)
  */
 void txt_find_panel(SpaceText *st, int again, int flags)
 {
-	Text *text, *start;
-	char *tmp= NULL;
-	char buf[256], repbuf[256];
-	int searched, skip, noswitch;
-
-	text= start= st->text;
+	Text *start, *text;
+	char *tmp;
+	
+	start= NULL; /* Set on first switch */
+	text= st->text;
 	if (!text) return;
-	if (again) {
-		if (!last_txt_find_string) again= 0; /* Can't search again */
-		if (!last_txt_repl_string && (flags & TXT_FIND_REPLACE)) again= 0;
+
+	if (!last_find_string) {
+		last_find_string= MEM_mallocN(TXT_MAXFINDSTR+1, "find_string");
+		last_find_string[0]= '\0';
+		again= 0;
+	}
+	if (!last_repl_string) {
+		last_repl_string= MEM_mallocN(TXT_MAXFINDSTR+1, "replace_string");
+		last_repl_string[0]= '\0';
+		if (flags & TXT_FIND_REPLACE) again= 0;
+	}
+	
+	if (txt_has_sel(text)) {
+		tmp= txt_sel_to_buf(text);
+		strncpy(last_find_string, tmp, TXT_MAXFINDSTR);
+		MEM_freeN(tmp);
 	}
 
-	if (!again) {
-		/* Populate tmp with selected text, or the last searched string */
-		if (txt_has_sel(text))
-			tmp= txt_sel_to_buf(text);
-		else if (last_txt_find_string)
-			tmp= BLI_strdup(last_txt_find_string);
-
-		if (tmp && strlen(tmp) < sizeof(buf)-1)strcpy(buf, tmp);
-		else buf[0]= 0;
-		if (tmp) { MEM_freeN(tmp); tmp= NULL; }
-
-		if (last_txt_repl_string) strcpy(repbuf, last_txt_repl_string);
-		else repbuf[0]= 0;
-
-		searched= skip= noswitch= 0;
-		while (skip || find_and_replace_popup(buf, repbuf, &flags, 0, sizeof(buf)-1) && buf[0]) {
-			skip= 0;
-
-			/* Allow us to detect when to go to the next text */
-			if (flags & TXT_FIND_ALLTEXTS)
-				flags &= ~TXT_FIND_WRAP;
-
-			/* Replace selection first */
-			if ((flags & TXT_FIND_REPLACE) && txt_has_sel(text)) {
+	if (again) {
+		int first= 1;
+		do {
+			if (first && (flags & TXT_FIND_MARKALL))
+				txt_clear_markers(text, TMARK_EDITALL | TMARK_GRP_FINDALL);
+			first= 0;
+			
+			/* Replace current */
+			if ((flags & (TXT_FIND_REPLACE | TXT_FIND_MARKALL)) && txt_has_sel(text)) {
 				tmp= txt_sel_to_buf(text);
-				if (strcmp(buf, tmp)==0) { /* Searching for same thing? */
-					txt_insert_buf(text, repbuf);
-					if (st->showsyntax) txt_format_line(st, text->curl, 1);
+				if (strcmp(last_find_string, tmp)==0) {
+					if (flags & TXT_FIND_REPLACE) {
+						txt_insert_buf(text, last_repl_string);
+						if (st->showsyntax) txt_format_line(st, text->curl, 1);
+					} else {
+						char clr[4];
+						BIF_GetThemeColor4ubv(TH_SHADE2, clr);
+						if (txt_find_marker(text, text->curl, text->selc, TMARK_EDITALL | TMARK_GRP_FINDALL)) {
+							if (tmp) MEM_freeN(tmp), tmp=NULL;
+							break;
+						}
+						txt_add_marker(text, text->curl, text->curc, text->selc, clr, TMARK_EDITALL | TMARK_GRP_FINDALL);
+					}
 				}
 				MEM_freeN(tmp);
 				tmp= NULL;
 			}
 
-			/* Now find the next occurrence */
-			searched= 1;
-			if (txt_find_string(text, buf, flags&TXT_FIND_WRAP)) {
-				pop_space_text(st);
-			} else if ((flags & TXT_FIND_ALLTEXTS) && !noswitch) {
-				if (text->id.next) text= st->text= text->id.next;
-				else text= st->text= G.main->text.first;
-				
-				/* Finish at end of this text if we've been round once */
-				if (text==start)
-					noswitch= 1;
-				
-				txt_move_toline(text, 0, 0);
-				pop_space_text(st);
-				skip= 1; /* Skip panel so we immediately search the next text */
-			} else {
-				okee("Text not found: %s", buf);
-				break;
-			}
-			
-			/* Redraw */
-			scrarea_do_windraw(curarea);
-			screen_swapbuffers();
-		}
-
-		/* Store last search details */
-		if (searched) {
-			last_txt_find_flags= flags;
-			if (last_txt_find_string)
-				MEM_freeN(last_txt_find_string);
-			last_txt_find_string= BLI_strdup(buf);
-			if (last_txt_repl_string)
-				MEM_freeN(last_txt_repl_string);
-			last_txt_repl_string= BLI_strdup(repbuf);
-		}
-	} else {
-		if (strlen(last_txt_find_string) < sizeof(buf)-1) {
-
-			/* Replace current */
-			if ((flags & TXT_FIND_REPLACE) && last_txt_repl_string && txt_has_sel(text)) {
-				tmp= txt_sel_to_buf(text);
-				if (strcmp(last_txt_find_string, tmp)==0)
-					txt_insert_buf(text, last_txt_repl_string);
-				MEM_freeN(tmp);
-				tmp= NULL;
-			}
-
 			/* Find next */
-			if (flags & TXT_FIND_ALLTEXTS)
-				flags &= ~TXT_FIND_WRAP;
-			if (txt_find_string(text, last_txt_find_string, flags & TXT_FIND_WRAP)) {
+			if (txt_find_string(text, last_find_string, flags & TXT_FIND_WRAP)) {
 				pop_space_text(st);
-			} else if (flags & flags&TXT_FIND_ALLTEXTS) {
+			} else if (flags & TXT_FIND_ALLTEXTS) {
+				if (text==start) break;
+				if (!start) start= text;
 				if (text->id.next)
 					text= st->text= text->id.next;
 				else
 					text= st->text= G.main->text.first;
 				txt_move_toline(text, 0, 0);
 				pop_space_text(st);
+				first= 1;
 			} else {
-				okee("Text not found: %s", last_txt_find_string);
+				okee("Text not found: %s", last_find_string);
+				break;
 			}
-		}
+		} while (flags & TXT_FIND_MARKALL);
+	}
+	else {
+		last_find_flags= flags;
+		find_and_replace_popup(1);
 	}
 }
 
@@ -2356,6 +2350,9 @@ static short do_markers(SpaceText *st, char ascii, unsigned short evnt, short va
 			case RIGHTMOUSE: /* Marker context menu? */
 			case LEFTMOUSE:
 				break;
+			case FKEY: /* Allow find */
+				if (G.qual & LR_SHIFTKEY) swallow= 1;
+				break;
 
 			default:
 				if (G.qual!=0 && G.qual!=LR_SHIFTKEY)
@@ -2451,7 +2448,10 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 	if (st->showsyntax && do_texttools(st, ascii, event, val)) return;
 	if (do_markers(st, ascii, event, val)) return;
 	
-	if (event==LEFTMOUSE) {
+	if (event==UI_BUT_EVENT) {
+		do_find_and_replace_popup(st, val);
+		return;
+	} else if (event==LEFTMOUSE) {
 		if (val) {
 			short mval[2];
 			char *buffer;
@@ -2620,22 +2620,12 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 					break;
 				}
 			}
-			else if (G.qual == LR_ALTKEY) {
-				txt_find_panel(st, 0, last_txt_find_flags & ~TXT_FIND_REPLACE);
+			else if (G.qual == LR_ALTKEY || G.qual == LR_CTRLKEY) {
+				txt_find_panel(st, 0, last_find_flags);
 				do_draw= 1;
 			}
 			else if (G.qual == (LR_ALTKEY|LR_CTRLKEY)) {
-				txt_find_panel(st, 1, last_txt_find_flags & ~TXT_FIND_REPLACE);
-				do_draw= 1;
-			}
-			break; /* BREAK F */
-		case HKEY:
-			if (G.qual == LR_ALTKEY) {
-				txt_find_panel(st, 0, last_txt_find_flags | TXT_FIND_REPLACE);
-				do_draw= 1;
-			}
-			else if (G.qual == (LR_ALTKEY|LR_CTRLKEY)) {
-				txt_find_panel(st, 1, last_txt_find_flags | TXT_FIND_REPLACE);
+				txt_find_panel(st, 1, last_find_flags & ~TXT_FIND_REPLACE & ~TXT_FIND_MARKALL);
 				do_draw= 1;
 			}
 			break; /* BREAK F */
@@ -2647,17 +2637,7 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 		case MKEY:
 			if (G.qual == LR_ALTKEY) {
 				txt_export_to_object(text);
-				do_draw= 1;	
-			} else if ((G.qual & LR_CTRLKEY) && text->sell==text->curl) {
-				int a= text->curc < text->selc ? text->curc : text->selc;
-				int b= text->curc < text->selc ? text->selc : text->curc;
-
-				/* Don't allow overlapping markers */
-				txt_clear_marker_region(text, text->curl, a, b, TMARK_GRP_CUSTOM);
-				if (!(G.qual & LR_ALTKEY)) {
-					txt_add_marker(text, text->curl, a, b, "\xFF\xC0\xFF\xFF", TMARK_GRP_CUSTOM | TMARK_EDITALL);
-					do_draw= 1;
-				}
+				do_draw= 1;
 			}
 			break; /* BREAK M */
 		case NKEY:
@@ -2667,7 +2647,6 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			
 				allqueue(REDRAWTEXT, 0);
 				allqueue(REDRAWHEADERS, 0);
-
 			}
 			break; /* BREAK N */
 		case OKEY:
diff --git a/source/blender/src/header_text.c b/source/blender/src/header_text.c
index 2d3c1e116e6..16344c35b82 100644
--- a/source/blender/src/header_text.c
+++ b/source/blender/src/header_text.c
@@ -205,6 +205,7 @@ void do_text_buttons(unsigned short event)
 		allqueue(REDRAWHEADERS, 0);
 		break;
 	case B_WORDWRAP:
+		st->left= 0;
 		allqueue(REDRAWTEXT, 0);
 		allqueue(REDRAWHEADERS, 0);
 		break;
@@ -406,17 +407,11 @@ static void do_text_editmenu(void *arg, int event)
 		jumptoline_interactive(st);
 		break;
 	case 8:
-		txt_find_panel(st, 0, TXT_FIND_WRAP);
+		txt_find_panel(st, 0, TXT_FIND_WRAP | TXT_FIND_KEEP);
 		break;
 	case 9:
 		txt_find_panel(st, 1, TXT_FIND_WRAP);
 		break;
-	case 10:
-		txt_find_panel(st, 0, TXT_FIND_WRAP | TXT_FIND_REPLACE);
-		break;
-	case 11:
-		txt_find_panel(st, 1, TXT_FIND_WRAP | TXT_FIND_REPLACE);
-		break;
 	default:
 		break;
 	}
@@ -715,10 +710,8 @@ static uiBlock *text_editmenu(void *arg_unused)
 	uiDefIconTextBlockBut(block, text_editmenu_selectmenu, NULL, ICON_RIGHTARROW_THIN, "Select|Alt Shift S   ", 0, yco-=20, 120, 19, "");
 	uiDefBut(block, SEPR, 0, "",        0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Jump...|Alt J", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 7, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Find...|Alt F", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 8, "");
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Find And Replace...|Alt F", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 8, "");
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Find Again|Alt Ctrl F", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 9, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Replace...|Alt H", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 10, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Replace Again|Alt Ctrl H", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 11, "");
 	uiDefBut(block, SEPR, 0, "",        0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
 	uiDefIconTextBlockBut(block, text_editmenu_to3dmenu, NULL, ICON_RIGHTARROW_THIN, "Text to 3d Object", 0, yco-=20, 120, 19, "");
 	

From 799ba2c3517df4df6c8ddbd508af85fec77167df Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Tue, 5 Aug 2008 23:23:31 +0000
Subject: [PATCH 185/252] Added a Python interface to the marker system with a
 few additional functions for modifying text selections in general. Tweaked
 some of the events and drawing code and added a template completion script
 along the lines of gedit's snippets.

---
 release/scripts/textplugin_templates.py | 114 +++++++++++++++++++++
 source/blender/blenkernel/intern/text.c |   2 +-
 source/blender/python/api2_2x/Text.c    | 129 +++++++++++++++++++++++-
 source/blender/src/drawtext.c           |  53 ++++++----
 4 files changed, 274 insertions(+), 24 deletions(-)
 create mode 100644 release/scripts/textplugin_templates.py

diff --git a/release/scripts/textplugin_templates.py b/release/scripts/textplugin_templates.py
new file mode 100644
index 00000000000..e0e7746abca
--- /dev/null
+++ b/release/scripts/textplugin_templates.py
@@ -0,0 +1,114 @@
+#!BPY
+"""
+Name: 'Templates'
+Blender: 246
+Group: 'TextPlugin'
+Shortcut: 'Tab'
+Tooltip: 'Completes templates based on the text preceding the cursor'
+"""
+
+# Only run if we have the required modules
+try:
+	import bpy
+	from BPyTextPlugin import *
+	from Blender import Text
+except ImportError:
+	OK = False
+else:
+	OK = True
+
+templates = {
+	'ie':
+		'if ${1:cond}:\n'
+		'\t${2}\n'
+		'else:\n'
+		'\t${3}\n',
+	'iei':
+		'if ${1:cond}:\n'
+		'\t${2}\n'
+		'elif:\n'
+		'\t${3}\n'
+		'else:\n'
+		'\t${4}\n',
+	'def':
+		'def ${1:name}(${2:params}):\n'
+		'\t"""(${2}) - ${3:comment}"""\n'
+		'\t${4}',
+	'cls':
+		'class ${1:name}(${2:parent}):\n'
+		'\t"""${3:docs}"""\n'
+		'\t\n'
+		'\tdef __init__(self, ${4:params}):\n'
+		'\t\t"""Creates a new ${1}"""\n'
+		'\t\t${5}'
+}
+
+def main():
+	txt = bpy.data.texts.active
+	if not txt:
+		return
+	
+	line, c = current_line(txt)
+	indent=0
+	while indent<len(line) and (line[indent]==' ' or line[indent]=='\t'):
+		indent += 1
+	
+	# Check we are in a normal context
+	if get_context(txt) != CTX_NORMAL:
+		return
+	
+	targets = get_targets(line, c-1);
+	if len(targets) != 1: return
+	
+	color = (0, 192, 32)
+	
+	for trigger, template in templates.items():
+		if trigger != targets[0]: continue
+		inserts = {}
+		txt.delete(-len(trigger)-1)
+		y, x = txt.getCursorPos()
+		first = None
+		
+		# Insert template text and parse for insertion points
+		count = len(template); i = 0
+		while i < count:
+			if i<count-1 and template[i]=='$' and template[i+1]=='{':
+				i += 2
+				e = template.find('}', i)
+				item = template[i:e].split(':')
+				if len(item)<2: item.append('')
+				if not inserts.has_key(item[0]):
+					inserts[item[0]] = (item[1], [(x, y)])
+				else:
+					inserts[item[0]][1].append((x, y))
+					item[1] = inserts[item[0]][0]
+				if not first: first = (item[1], x, y)
+				txt.insert(item[1])
+				x += len(item[1])
+				i = e
+			else:
+				txt.insert(template[i])
+				if template[i] == '\n':
+					txt.insert(line[:indent])
+					y += 1
+					x = indent
+				else:
+					x += 1
+			i += 1
+		
+		# Insert markers at insertion points
+		for id, (text, points) in inserts.items():
+			for x, y in points:
+				txt.setCursorPos(y, x)
+				txt.setSelectPos(y, x+len(text))
+				txt.markSelection(hash(text)+int(id), color, Text.TMARK_TEMP | Text.TMARK_EDITALL)
+		if first:
+			text, x, y = first
+			txt.setCursorPos(y, x)
+			txt.setSelectPos(y, x+len(text))
+		break
+		
+
+# Check we are running as a script and not imported as a module
+if __name__ == "__main__" and OK:
+	main()
diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c
index 611eed3999e..47f8fc708c2 100644
--- a/source/blender/blenkernel/intern/text.c
+++ b/source/blender/blenkernel/intern/text.c
@@ -2773,4 +2773,4 @@ TextMarker *txt_next_marker(Text *text, TextMarker *marker) {
 			return tmp;
 	}
 	return NULL; /* Only if marker==NULL */
-}
\ No newline at end of file
+}
diff --git a/source/blender/python/api2_2x/Text.c b/source/blender/python/api2_2x/Text.c
index ae847d26f2d..0f0abda04e1 100644
--- a/source/blender/python/api2_2x/Text.c
+++ b/source/blender/python/api2_2x/Text.c
@@ -98,10 +98,14 @@ static PyObject *Text_reset( BPy_Text * self );
 static PyObject *Text_readline( BPy_Text * self );
 static PyObject *Text_write( BPy_Text * self, PyObject * value );
 static PyObject *Text_insert( BPy_Text * self, PyObject * value );
+static PyObject *Text_delete( BPy_Text * self, PyObject * value );
 static PyObject *Text_set( BPy_Text * self, PyObject * args );
 static PyObject *Text_asLines( BPy_Text * self );
 static PyObject *Text_getCursorPos( BPy_Text * self );
 static PyObject *Text_setCursorPos( BPy_Text * self, PyObject * args );
+static PyObject *Text_getSelectPos( BPy_Text * self );
+static PyObject *Text_setSelectPos( BPy_Text * self, PyObject * args );
+static PyObject *Text_markSelection( BPy_Text * self, PyObject * args );
 static PyObject *Text_suggest( BPy_Text * self, PyObject * args );
 static PyObject *Text_showDocs( BPy_Text * self, PyObject * args );
 
@@ -128,6 +132,8 @@ static PyMethodDef BPy_Text_methods[] = {
 	 "(line) - Append string 'str' to Text buffer"},
 	{"insert", ( PyCFunction ) Text_insert, METH_O,
 	 "(line) - Insert string 'str' to Text buffer at cursor location"},
+	{"delete", ( PyCFunction ) Text_delete, METH_O,
+	 "(chars) - Deletes a number of characters to the left (chars<0) or right (chars>0)"},
 	{"set", ( PyCFunction ) Text_set, METH_VARARGS,
 	 "(name, val) - Set attribute 'name' to value 'val'"},
 	{"asLines", ( PyCFunction ) Text_asLines, METH_NOARGS,
@@ -136,6 +142,12 @@ static PyMethodDef BPy_Text_methods[] = {
 	 "() - Return cursor position as (row, col) tuple"},
 	{"setCursorPos", ( PyCFunction ) Text_setCursorPos, METH_VARARGS,
 	 "(row, col) - Set the cursor position to (row, col)"},
+	{"getSelectPos", ( PyCFunction ) Text_getSelectPos, METH_NOARGS,
+	 "() - Return the selection cursor position as (row, col) tuple"},
+	{"setSelectPos", ( PyCFunction ) Text_setSelectPos, METH_VARARGS,
+	 "(row, col) - Set the selection cursor position to (row, col)"},
+	{"markSelection", ( PyCFunction ) Text_markSelection, METH_VARARGS,
+	 "(group, (r, g, b), flags) - Places a marker over the current selection. Group: number > 0, flags: TMARK_TEMP, TMARK_EDITALL, etc."},
 	{"suggest", ( PyCFunction ) Text_suggest, METH_VARARGS,
 	 "(list, prefix='') - Presents a list of suggestions. List is of strings, or tuples. Tuples must be of the form (name, type) where type is one of 'm', 'v', 'f', 'k' for module, variable, function and keyword respectively or '?' for other types"},
 	{"showDocs", ( PyCFunction ) Text_showDocs, METH_VARARGS,
@@ -327,7 +339,7 @@ static PyObject *M_Text_unlink( PyObject * self, PyObject * args )
 /*****************************************************************************/
 PyObject *Text_Init( void )
 {
-	PyObject *submodule;
+	PyObject *submodule, *dict;
 
 	if( PyType_Ready( &Text_Type ) < 0 )
 		return NULL;
@@ -335,6 +347,19 @@ PyObject *Text_Init( void )
 	submodule =
 		Py_InitModule3( "Blender.Text", M_Text_methods, M_Text_doc );
 
+	dict = PyModule_GetDict( submodule );
+	
+#define EXPP_ADDCONST(x) \
+	EXPP_dict_set_item_str(dict, #x, PyInt_FromLong(x))
+
+	/* So, for example:
+	 * EXPP_ADDCONST(LEFTMOUSE) becomes
+	 * EXPP_dict_set_item_str(dict, "LEFTMOUSE", PyInt_FromLong(LEFTMOUSE)) 
+	 */
+
+	EXPP_ADDCONST( TMARK_TEMP );
+	EXPP_ADDCONST( TMARK_EDITALL );
+
 	return ( submodule );
 }
 
@@ -483,6 +508,33 @@ static PyObject *Text_insert( BPy_Text * self, PyObject * value )
 	Py_RETURN_NONE;
 }
 
+static PyObject *Text_delete( BPy_Text * self, PyObject * value )
+{
+	int num = PyInt_AsLong(value);
+	int oldstate;
+
+	if( !self->text )
+		return EXPP_ReturnPyObjError( PyExc_RuntimeError,
+					      "This object isn't linked to a Blender Text Object" );
+
+	if( !num )
+		return EXPP_ReturnPyObjError( PyExc_TypeError,
+					      "expected non-zero int argument" );
+
+	oldstate = txt_get_undostate(  );
+	while (num<0) {
+		txt_backspace_char(self->text);
+		num++;
+	}
+	while (num>0) {
+		txt_delete_char(self->text);
+		num--;
+	}
+	txt_set_undostate( oldstate );
+
+	Py_RETURN_NONE;
+}
+
 static PyObject *Text_set( BPy_Text * self, PyObject * args )
 {
 	int ival;
@@ -549,7 +601,6 @@ static PyObject *Text_getCursorPos( BPy_Text * self )
 static PyObject *Text_setCursorPos( BPy_Text * self, PyObject * args )
 {
 	int row, col;
-	int oldstate;
 	SpaceText *st;
 
 	if (!self->text)
@@ -559,12 +610,10 @@ static PyObject *Text_setCursorPos( BPy_Text * self, PyObject * args )
 	if (!PyArg_ParseTuple(args, "ii", &row, &col))
 		return EXPP_ReturnPyObjError(PyExc_TypeError,
 					      "expected two ints as arguments.");
+	if (row<0) row=0;
 	if (col<0) col=0;
-	if (col>self->text->curl->len) col=self->text->curl->len;
 
-	oldstate = txt_get_undostate();
 	txt_move_to(self->text, row, col, 0);
-	txt_set_undostate(oldstate);
 
 	if (curarea->spacetype == SPACE_TEXT && (st=curarea->spacedata.first))
 		pop_space_text(st);
@@ -572,6 +621,76 @@ static PyObject *Text_setCursorPos( BPy_Text * self, PyObject * args )
 	Py_RETURN_NONE;
 }
 
+static PyObject *Text_getSelectPos( BPy_Text * self )
+{
+	Text *text;
+	TextLine *linep;
+	int row, col;
+
+	text = self->text;
+	if( !text )
+		return EXPP_ReturnPyObjError( PyExc_RuntimeError,
+					      "This object isn't linked to a Blender Text Object" );
+
+	for (row=0,linep=text->lines.first; linep!=text->sell; linep=linep->next)
+		row++;
+	col= text->selc;
+
+	return Py_BuildValue( "ii", row, col );
+}
+
+static PyObject *Text_setSelectPos( BPy_Text * self, PyObject * args )
+{
+	int row, col;
+	SpaceText *st;
+
+	if (!self->text)
+		return EXPP_ReturnPyObjError(PyExc_RuntimeError,
+					      "This object isn't linked to a Blender Text Object");
+
+	if (!PyArg_ParseTuple(args, "ii", &row, &col))
+		return EXPP_ReturnPyObjError(PyExc_TypeError,
+					      "expected two ints as arguments.");
+	if (row<0) row=0;
+	if (col<0) col=0;
+
+	txt_move_to(self->text, row, col, 1);
+
+	if (curarea->spacetype == SPACE_TEXT && (st=curarea->spacedata.first))
+		pop_space_text(st);
+
+	Py_RETURN_NONE;
+}
+
+static PyObject *Text_markSelection( BPy_Text * self, PyObject * args )
+{
+	int group = 0, flags = 0,r, g, b;
+	Text *text;
+	char clr[4];
+
+	text = self->text;
+	if (!text)
+		return EXPP_ReturnPyObjError(PyExc_RuntimeError,
+					      "This object isn't linked to a Blender Text Object");
+
+	if (!PyArg_ParseTuple(args, "i(iii)i", &group, &r, &g, &b, &flags))
+		return EXPP_ReturnPyObjError(PyExc_TypeError,
+					      "expected int, 3-tuple of ints and int as arguments.");
+
+	if (text->curl != text->sell)
+		return EXPP_ReturnPyObjError(PyExc_RuntimeError,
+					      "Cannot mark multi-line selection.");
+
+	clr[0] = (char) (r&0xFF);
+	clr[1] = (char) (g&0xFF);
+	clr[2] = (char) (b&0xFF);
+	clr[3] = 255;
+
+	txt_add_marker(text, text->curl, text->curc, text->selc, clr, ((group+2)<<16)|flags);
+	
+	Py_RETURN_NONE;
+}
+
 static PyObject *Text_suggest( BPy_Text * self, PyObject * args )
 {
 	PyObject *item = NULL, *tup1 = NULL, *tup2 = NULL;
diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index 951e71e1f81..5a96a2548d7 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -814,17 +814,17 @@ static void draw_markers(SpaceText *st) {
 				if (y1==y2) {
 					y -= y1*st->lheight;
 					glBegin(GL_LINE_LOOP);
-					glVertex2i(x+x2*spacetext_get_fontwidth(st), y);
-					glVertex2i(x+x1*spacetext_get_fontwidth(st)-1, y);
-					glVertex2i(x+x1*spacetext_get_fontwidth(st)-1, y-st->lheight);
-					glVertex2i(x+x2*spacetext_get_fontwidth(st), y-st->lheight);
+					glVertex2i(x+x2*spacetext_get_fontwidth(st)+1, y);
+					glVertex2i(x+x1*spacetext_get_fontwidth(st)-2, y);
+					glVertex2i(x+x1*spacetext_get_fontwidth(st)-2, y-st->lheight);
+					glVertex2i(x+x2*spacetext_get_fontwidth(st)+1, y-st->lheight);
 					glEnd();
 				} else {
 					y -= y1*st->lheight;
 					glBegin(GL_LINE_STRIP);
 					glVertex2i(curarea->winx, y);
-					glVertex2i(x+x1*spacetext_get_fontwidth(st)-1, y);
-					glVertex2i(x+x1*spacetext_get_fontwidth(st)-1, y-st->lheight);
+					glVertex2i(x+x1*spacetext_get_fontwidth(st)-2, y);
+					glVertex2i(x+x1*spacetext_get_fontwidth(st)-2, y-st->lheight);
 					glVertex2i(curarea->winx, y-st->lheight);
 					glEnd();
 					y-=st->lheight;
@@ -839,8 +839,8 @@ static void draw_markers(SpaceText *st) {
 					}
 					glBegin(GL_LINE_STRIP);
 					glVertex2i(x, y);
-					glVertex2i(x+x2*spacetext_get_fontwidth(st), y);
-					glVertex2i(x+x2*spacetext_get_fontwidth(st), y-st->lheight);
+					glVertex2i(x+x2*spacetext_get_fontwidth(st)+1, y);
+					glVertex2i(x+x2*spacetext_get_fontwidth(st)+1, y-st->lheight);
 					glVertex2i(x, y-st->lheight);
 					glEnd();
 				}
@@ -2329,10 +2329,23 @@ static short do_markers(SpaceText *st, char ascii, unsigned short evnt, short va
 				}
 				break;
 			case TABKEY:
-				marker= (G.qual & LR_SHIFTKEY) ? txt_prev_marker(text, marker) : txt_next_marker(text, marker);
-				txt_move_to(text, marker->lineno, marker->start, 0);
-				txt_move_to(text, marker->lineno, marker->end, 1);
-				pop_space_text(st);
+				if (G.qual & LR_SHIFTKEY) {
+					nxt= marker->prev;
+					if (!nxt) nxt= text->markers.last;
+				} else {
+					nxt= marker->next;
+					if (!nxt) nxt= text->markers.first;
+				}
+				if (marker->flags & TMARK_TEMP) {
+					if (nxt==marker) nxt= NULL;
+					BLI_freelinkN(&text->markers, marker);
+				}
+				mrk= nxt;
+				if (mrk) {
+					txt_move_to(text, mrk->lineno, mrk->start, 0);
+					txt_move_to(text, mrk->lineno, mrk->end, 1);
+					pop_space_text(st);
+				}
 				swallow= 1;
 				draw= 1;
 				break;
@@ -2707,7 +2720,7 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			}
 			break; /* BREAK S */
 		case UKEY:
-			txt_print_undo(text); //debug buffer in console
+			//txt_print_undo(text); //debug buffer in console
 			if (G.qual == (LR_ALTKEY|LR_SHIFTKEY)) {
 				txt_do_redo(text);
 				do_draw= 1;
@@ -2785,17 +2798,21 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 				error_libdata();
 				break;
 			} else {
-				if (G.qual & LR_SHIFTKEY) {
-					if (txt_has_sel(text)) {
+				if (txt_has_sel(text)) {
+					if (G.qual & LR_SHIFTKEY) {
 						txt_order_cursors(text);
 						unindent(text);
 						if (st->showsyntax) txt_format_text(st);
-					}
-				} else {
-					if ( txt_has_sel(text)) {
+					} else {
 						txt_order_cursors(text);
 						indent(text);
 						if (st->showsyntax) txt_format_text(st);
+					}
+				} else {
+					TextMarker *mrk= txt_find_marker_region(text, text->curl, 0, text->curl->len, 0);
+					if (mrk) {
+						txt_move_to(text, mrk->lineno, mrk->start, 0);
+						txt_move_to(text, mrk->lineno, mrk->end, 1);
 					} else {
 						txt_add_char(text, '\t');
 						if (st->showsyntax) txt_format_line(st, text->curl, 1);

From 6c0f4660ed60ea8dd46519e3367ee5c0efdcf4f8 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Wed, 6 Aug 2008 13:46:44 +0000
Subject: [PATCH 186/252] Various UI drawing and event tweaks to make markers
 feel more natural and avoid getting in the way. If there is a marker under
 the cursor, ESC will remove it and others in its group. Otherwise all
 temporary markers are removed. Tab finds/cycles/removes temp. markers, cycles
 non-temp. markers (under cursor) and behaves normally in all other cases.

---
 release/scripts/textplugin_templates.py |  5 +-
 source/blender/blenkernel/BKE_text.h    |  2 +
 source/blender/blenkernel/intern/text.c | 76 +++++++++++++++++++------
 source/blender/src/drawtext.c           | 59 +++++++++++++------
 4 files changed, 105 insertions(+), 37 deletions(-)

diff --git a/release/scripts/textplugin_templates.py b/release/scripts/textplugin_templates.py
index e0e7746abca..0cd772f863e 100644
--- a/release/scripts/textplugin_templates.py
+++ b/release/scripts/textplugin_templates.py
@@ -48,9 +48,10 @@ def main():
 	if not txt:
 		return
 	
-	line, c = current_line(txt)
+	row, c = txt.getCursorPos()
+	line = txt.asLines()[row]
 	indent=0
-	while indent<len(line) and (line[indent]==' ' or line[indent]=='\t'):
+	while indent<c and (line[indent]==' ' or line[indent]=='\t'):
 		indent += 1
 	
 	# Check we are in a normal context
diff --git a/source/blender/blenkernel/BKE_text.h b/source/blender/blenkernel/BKE_text.h
index 5a49e8bed9b..a092a991344 100644
--- a/source/blender/blenkernel/BKE_text.h
+++ b/source/blender/blenkernel/BKE_text.h
@@ -108,6 +108,8 @@ struct TextMarker	*txt_find_marker		(struct Text *text, struct TextLine *line, i
 struct TextMarker	*txt_find_marker_region	(struct Text *text, struct TextLine *line, int start, int end, int flags);
 struct TextMarker	*txt_prev_marker		(struct Text *text, struct TextMarker *marker);
 struct TextMarker	*txt_next_marker		(struct Text *text, struct TextMarker *marker);
+struct TextMarker	*txt_prev_marker_color	(struct Text *text, struct TextMarker *marker);
+struct TextMarker	*txt_next_marker_color	(struct Text *text, struct TextMarker *marker);
 
 /* Undo opcodes */
 
diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c
index 47f8fc708c2..bcaf7bbc0ac 100644
--- a/source/blender/blenkernel/intern/text.c
+++ b/source/blender/blenkernel/intern/text.c
@@ -83,12 +83,19 @@ The st->top determines at what line the top of the text is displayed.
 If the user moves the cursor the st containing that cursor should
 be popped ... other st's retain their own top location.
 
-*/ /***************/
+Markers
+--
+The mrk->flags define the behaviour and relationships between markers. The
+upper two bytes are used to hold a group ID, the lower two are normal flags. If
+TMARK_EDITALL is set the group ID defines which other markers should be edited.
 
+The mrk->clr field is used to visually group markers where the flags may not
+match. A template system, for example, may allow editing of repeating tokens
+(in one group) but include other marked positions (in another group) all in the
+same template with the same colour.
 
-/****************/ /*
-	Undo
-
+Undo
+--
 Undo/Redo works by storing
 events in a queue, and a pointer
 to the current position in the
@@ -2657,6 +2664,13 @@ int setcurr_tab (Text *text)
 /* Text marker utility functions */
 /*********************************/
 
+static int color_match(TextMarker *a, TextMarker *b) {
+	return (a->clr[0]==b->clr[0] &&
+			a->clr[1]==b->clr[1] &&
+			a->clr[2]==b->clr[2] &&
+			a->clr[3]==b->clr[3]);
+}
+
 /* Creates and adds a marker to the list maintaining sorted order */
 void txt_add_marker(Text *text, TextLine *line, int start, int end, char clr[4], int flags) {
 	TextMarker *tmp, *marker;
@@ -2681,8 +2695,9 @@ void txt_add_marker(Text *text, TextLine *line, int start, int end, char clr[4],
 	else BLI_addhead(&text->markers, marker);
 }
 
-/* Returns the first matching marker on the specified line between two points
-   If flags is zero, all markers will be searched */
+/* Returns the first matching marker on the specified line between two points,
+   with at least the specified flags set. If flags is zero, all markers will be
+   searched */
 TextMarker *txt_find_marker_region(Text *text, TextLine *line, int start, int end, int flags) {
 	TextMarker *marker, *next;
 	int lineno= txt_get_span(text->lines.first, line);
@@ -2690,7 +2705,7 @@ TextMarker *txt_find_marker_region(Text *text, TextLine *line, int start, int en
 	for (marker=text->markers.first; marker; marker=next) {
 		next= marker->next;
 
-		if (flags && marker->flags != flags) continue;
+		if ((marker->flags & flags) != flags) continue;
 		else if (marker->lineno < lineno) continue;
 		else if (marker->lineno > lineno) break;
 
@@ -2701,8 +2716,8 @@ TextMarker *txt_find_marker_region(Text *text, TextLine *line, int start, int en
 	return NULL;
 }
 
-/* Clears all matching markers on the specified line between two points
-   If flags is zero, all markers will be cleared */
+/* Clears all markers on the specified line between two points with at least
+   the specified flags set. If flags is zero, all markers will be cleared */
 void txt_clear_marker_region(Text *text, TextLine *line, int start, int end, int flags) {
 	TextMarker *marker, *next;
 	int lineno= txt_get_span(text->lines.first, line);
@@ -2710,7 +2725,7 @@ void txt_clear_marker_region(Text *text, TextLine *line, int start, int end, int
 	for (marker=text->markers.first; marker; marker=next) {
 		next= marker->next;
 
-		if (flags && marker->flags != flags) continue;
+		if ((marker->flags & flags) != flags) continue;
 		else if (marker->lineno < lineno) continue;
 		else if (marker->lineno > lineno) break;
 
@@ -2720,26 +2735,27 @@ void txt_clear_marker_region(Text *text, TextLine *line, int start, int end, int
 	}
 }
 
-/* Clears all markers with matching flags (useful for clearing temporary markers) */
+/* Clears all markers with at least the specified flags set (useful for
+   clearing temporary markers) */
 void txt_clear_markers(Text *text, int flags) {
 	TextMarker *marker, *next;
 	
 	for (marker=text->markers.first; marker; marker=next) {
 		next= marker->next;
 
-		if (marker->flags == flags)
+		if ((marker->flags & flags) == flags)
 			BLI_freelinkN(&text->markers, marker);
 	}
 }
 
-/* Finds the marker at the specified line and cursor position with matching flags.
-   If flags is zero, all markers will be searched */
+/* Finds the marker at the specified line and cursor position with at least the
+   specified flags set. If flags is zero, all markers will be searched */
 TextMarker *txt_find_marker(Text *text, TextLine *line, int curs, int flags) {
 	TextMarker *marker;
 	int lineno= txt_get_span(text->lines.first, line);
 	
 	for (marker=text->markers.first; marker; marker=marker->next) {
-		if (flags && marker->flags != flags) continue;
+		if ((marker->flags & flags) != flags) continue;
 		else if (marker->lineno < lineno) continue;
 		else if (marker->lineno > lineno) break;
 
@@ -2749,8 +2765,8 @@ TextMarker *txt_find_marker(Text *text, TextLine *line, int curs, int flags) {
 	return NULL;
 }
 
-/* Finds the previous marker with matching flags. If no other marker is found, the
-   same one will be returned */
+/* Finds the previous marker with matching flags. If no other marker is found,
+   the same one will be returned */
 TextMarker *txt_prev_marker(Text *text, TextMarker *marker) {
 	TextMarker *tmp= marker;
 	while (tmp) {
@@ -2774,3 +2790,29 @@ TextMarker *txt_next_marker(Text *text, TextMarker *marker) {
 	}
 	return NULL; /* Only if marker==NULL */
 }
+
+/* Finds the previous marker with matching colour. If no other marker is found,
+   the same one will be returned */
+TextMarker *txt_prev_marker_color(Text *text, TextMarker *marker) {
+	TextMarker *tmp= marker;
+	while (tmp) {
+		if (tmp->prev) tmp= tmp->prev;
+		else tmp= text->markers.last;
+		if (color_match(tmp, marker))
+			return tmp;
+	}
+	return NULL; /* Only if marker==NULL */
+}
+
+/* Finds the next marker with matching colour. If no other marker is found, the
+   same one will be returned */
+TextMarker *txt_next_marker_color(Text *text, TextMarker *marker) {
+	TextMarker *tmp= marker;
+	while (tmp) {
+		if (tmp->next) tmp= tmp->next;
+		else tmp= text->markers.first;
+		if (color_match(tmp, marker))
+			return tmp;
+	}
+	return NULL; /* Only if marker==NULL */
+}
diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index 5a96a2548d7..78ccbbfc1b6 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -878,9 +878,9 @@ static void draw_cursor(SpaceText *st) {
 		if (vcurl==vsell) {
 			y -= vcurl*st->lheight;
 			if (vcurc < vselc)
-				glRecti(x+vcurc*spacetext_get_fontwidth(st), y, x+vselc*spacetext_get_fontwidth(st), y-st->lheight);
+				glRecti(x+vcurc*spacetext_get_fontwidth(st)-1, y, x+vselc*spacetext_get_fontwidth(st), y-st->lheight);
 			else
-				glRecti(x+vselc*spacetext_get_fontwidth(st), y, x+vcurc*spacetext_get_fontwidth(st), y-st->lheight);
+				glRecti(x+vselc*spacetext_get_fontwidth(st)-1, y, x+vcurc*spacetext_get_fontwidth(st), y-st->lheight);
 		} else {
 			int froml, fromc, tol, toc;
 			if (vcurl < vsell) {
@@ -891,7 +891,7 @@ static void draw_cursor(SpaceText *st) {
 				fromc= vselc; toc= vcurc;
 			}
 			y -= froml*st->lheight;
-			glRecti(x+fromc*spacetext_get_fontwidth(st), y, curarea->winx, y-st->lheight); y-=st->lheight;
+			glRecti(x+fromc*spacetext_get_fontwidth(st)-1, y, curarea->winx, y-st->lheight); y-=st->lheight;
 			for (i=froml+1; i<tol; i++)
 				glRecti(x-4, y, curarea->winx, y-st->lheight),  y-=st->lheight;
 			glRecti(x-4, y, x+toc*spacetext_get_fontwidth(st), y-st->lheight);  y-=st->lheight;
@@ -1446,6 +1446,7 @@ void drawtextspace(ScrArea *sa, void *spacedata)
 
 	tmp= text->lines.first;
 	for (i= 0; i<st->top && tmp; i++) {
+		if (st->showsyntax && !tmp->format) txt_format_line(st, tmp, 0);
 		tmp= tmp->next;
 		linecount++;
 	}
@@ -1504,7 +1505,7 @@ void pop_space_text (SpaceText *st)
 	if(!st->text) return;
 	if(!st->text->curl) return;
 		
-	i= txt_get_span(st->text->lines.first, st->text->curl);
+	i= txt_get_span(st->text->lines.first, st->text->sell);
 	if (st->top+st->viewlines <= i || st->top > i) {
 		st->top= i - st->viewlines/2;
 	}
@@ -1512,7 +1513,7 @@ void pop_space_text (SpaceText *st)
 	if (st->wordwrap) {
 		st->left= 0;
 	} else {
-		x= text_draw(st, st->text->curl->line, st->left, st->text->curc, 0, 0, 0, NULL);
+		x= text_draw(st, st->text->sell->line, st->left, st->text->selc, 0, 0, 0, NULL);
 
 		if (x==0 || x>curarea->winx) {
 			st->left= st->text->curc-0.5*(curarea->winx)/spacetext_get_fontwidth(st);
@@ -1962,7 +1963,7 @@ void txt_find_panel(SpaceText *st, int again, int flags)
 		int first= 1;
 		do {
 			if (first && (flags & TXT_FIND_MARKALL))
-				txt_clear_markers(text, TMARK_EDITALL | TMARK_GRP_FINDALL);
+				txt_clear_markers(text, TMARK_GRP_FINDALL);
 			first= 0;
 			
 			/* Replace current */
@@ -1975,11 +1976,11 @@ void txt_find_panel(SpaceText *st, int again, int flags)
 					} else {
 						char clr[4];
 						BIF_GetThemeColor4ubv(TH_SHADE2, clr);
-						if (txt_find_marker(text, text->curl, text->selc, TMARK_EDITALL | TMARK_GRP_FINDALL)) {
+						if (txt_find_marker(text, text->curl, text->selc, TMARK_GRP_FINDALL)) {
 							if (tmp) MEM_freeN(tmp), tmp=NULL;
 							break;
 						}
-						txt_add_marker(text, text->curl, text->curc, text->selc, clr, TMARK_EDITALL | TMARK_GRP_FINDALL);
+						txt_add_marker(text, text->curl, text->curc, text->selc, clr, TMARK_GRP_FINDALL | TMARK_EDITALL);
 					}
 				}
 				MEM_freeN(tmp);
@@ -2256,10 +2257,33 @@ static short do_markers(SpaceText *st, char ascii, unsigned short evnt, short va
 	int c, s, draw=0, swallow=0;
 
 	text= st->text;
-	if (!text || text->curl != text->sell) return 0;
+	if (!text || text->id.lib || text->curl != text->sell) return 0;
 
 	marker= txt_find_marker(text, text->curl, text->curc, 0);
-	if (!marker || text->id.lib) return 0;
+	if (!marker) {
+		/* Find the next temporary marker */
+		if (evnt==TABKEY) {
+			int lineno= txt_get_span(text->lines.first, text->curl);
+			TextMarker *mrk= text->markers.first;
+			while (mrk) {
+				if (!marker && (mrk->flags & TMARK_TEMP)) marker= mrk;
+				if ((mrk->flags & TMARK_TEMP) && (mrk->lineno > lineno || (mrk->lineno==lineno && mrk->end > text->curc))) {
+					marker= mrk;
+					break;
+				}
+				mrk= mrk->next;
+			}
+			if (marker) {
+				txt_move_to(text, marker->lineno, marker->start, 0);
+				txt_move_to(text, marker->lineno, marker->end, 1);
+				pop_space_text(st);
+				evnt= ascii= val= 0;
+				draw= 1;
+				swallow= 1;
+			}
+		}
+		if (!swallow) return 0;
+	}
 
 	if (ascii) {
 		if (marker->flags & TMARK_EDITALL) {
@@ -2351,6 +2375,8 @@ static short do_markers(SpaceText *st, char ascii, unsigned short evnt, short va
 				break;
 
 			/* Events that should clear markers */
+			case UKEY: if (!(G.qual & LR_ALTKEY)) break;
+			case ZKEY: if (evnt==ZKEY && !(G.qual & LR_CTRLKEY)) break;
 			case RETKEY:
 			case ESCKEY:
 				if (marker->flags & (TMARK_EDITALL | TMARK_TEMP))
@@ -2809,14 +2835,8 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 						if (st->showsyntax) txt_format_text(st);
 					}
 				} else {
-					TextMarker *mrk= txt_find_marker_region(text, text->curl, 0, text->curl->len, 0);
-					if (mrk) {
-						txt_move_to(text, mrk->lineno, mrk->start, 0);
-						txt_move_to(text, mrk->lineno, mrk->end, 1);
-					} else {
-						txt_add_char(text, '\t');
-						if (st->showsyntax) txt_format_line(st, text->curl, 1);
-					}
+					txt_add_char(text, '\t');
+					if (st->showsyntax) txt_format_line(st, text->curl, 1);
 				}
 			}
 			pop_space_text(st);
@@ -2848,6 +2868,9 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			do_draw= 1;
 			pop_space_text(st);
 			break;
+		case ESCKEY:
+			txt_clear_markers(text, TMARK_TEMP);
+			break;
 		case BACKSPACEKEY:
 			if (text && text->id.lib) {
 				error_libdata();

From a37938ea3cd99bf4d7a03bc09a15a5b0027362c8 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Thu, 7 Aug 2008 14:21:43 +0000
Subject: [PATCH 187/252] Word-wrap support for up and down arrows between
 lines, and home/end keys for a wrapped line segment.

---
 source/blender/src/drawtext.c | 142 +++++++++++++++++++++++++++++++---
 1 file changed, 133 insertions(+), 9 deletions(-)

diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index 78ccbbfc1b6..2ab8d030f17 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -2046,6 +2046,126 @@ static void set_tabs(Text *text)
 	st->currtab_set = setcurr_tab(text);
 }
 
+static void wrap_move_bol(SpaceText *st, short sel) {
+	int offl, offc, lin;
+	Text *text= st->text;
+
+	lin= txt_get_span(text->lines.first, text->sell);
+	wrap_offset(st, text->sell, text->selc, &offl, &offc);
+
+	if (sel) {
+		txt_undo_add_toop(text, UNDO_STO, lin, text->selc, lin, -offc);
+		text->selc= -offc;
+	} else {
+		txt_undo_add_toop(text, UNDO_CTO, lin, text->curc, lin, -offc);
+		text->curc= -offc;
+		txt_pop_sel(text);
+	}
+}
+
+static void wrap_move_eol(SpaceText *st, short sel) {
+	int offl, offc, lin, startl, c;
+	Text *text= st->text;
+
+	lin= txt_get_span(text->lines.first, text->sell);
+	wrap_offset(st, text->sell, text->selc, &offl, &offc);
+	startl= offl;
+	c= text->selc;
+	while (offl==startl && text->sell->line[c]!='\0') {
+		c++;
+		wrap_offset(st, text->sell, c, &offl, &offc);
+	} if (offl!=startl) c--;
+
+	if (sel) {
+		txt_undo_add_toop(text, UNDO_STO, lin, text->selc, lin, c);
+		text->selc= c;
+	} else {
+		txt_undo_add_toop(text, UNDO_CTO, lin, text->curc, lin, c);
+		text->curc= c;
+		txt_pop_sel(text);
+	}
+}
+
+static void wrap_move_up(SpaceText *st, short sel) {
+	int offl, offl_1, offc, fromline, toline, c, target;
+	Text *text= st->text;
+
+	wrap_offset(st, text->sell, 0, &offl_1, &offc);
+	wrap_offset(st, text->sell, text->selc, &offl, &offc);
+	fromline= toline= txt_get_span(text->lines.first, text->sell);
+	target= text->selc + offc;
+
+	if (offl==offl_1) {
+		if (!text->sell->prev) {
+			txt_move_bol(text, sel);
+			return;
+		}
+		toline--;
+		c= text->sell->prev->len; /* End of prev. line */
+		wrap_offset(st, text->sell->prev, c, &offl, &offc);
+		c= -offc+target;
+	} else {
+		c= -offc-1; /* End of prev. line */
+		wrap_offset(st, text->sell, c, &offl, &offc);
+		c= -offc+target;
+	}
+	if (c<0) c=0;
+
+	if (sel) {
+		txt_undo_add_toop(text, UNDO_STO, fromline, text->selc, toline, c);
+		if (toline<fromline) text->sell= text->sell->prev;
+		if (c>text->sell->len) c= text->sell->len;
+		text->selc= c;
+	} else {
+		txt_undo_add_toop(text, UNDO_CTO, fromline, text->curc, toline, c);
+		if (toline<fromline) text->curl= text->curl->prev;
+		if (c>text->curl->len) c= text->curl->len;
+		text->curc= c;
+		txt_pop_sel(text);
+	}
+}
+
+static void wrap_move_down(SpaceText *st, short sel) {
+	int offl, startoff, offc, fromline, toline, c, target;
+	Text *text= st->text;
+
+	wrap_offset(st, text->sell, text->selc, &offl, &offc);
+	fromline= toline= txt_get_span(text->lines.first, text->sell);
+	target= text->selc + offc;
+	startoff= offl;
+	c= text->selc;
+	while (offl==startoff && text->sell->line[c]!='\0') {
+		c++;
+		wrap_offset(st, text->sell, c, &offl, &offc);
+	}
+
+	if (text->sell->line[c]=='\0') {
+		if (!text->sell->next) {
+			txt_move_eol(text, sel);
+			return;
+		}
+		toline++;
+		c= target;
+	} else {
+		c += target;
+		if (c > text->sell->len) c= text->sell->len;
+	}
+	if (c<0) c=0;
+
+	if (sel) {
+		txt_undo_add_toop(text, UNDO_STO, fromline, text->selc, toline, c);
+		if (toline>fromline) text->sell= text->sell->next;
+		if (c>text->sell->len) c= text->sell->len;
+		text->selc= c;
+	} else {
+		txt_undo_add_toop(text, UNDO_CTO, fromline, text->curc, toline, c);
+		if (toline>fromline) text->curl= text->curl->next;
+		if (c>text->curl->len) c= text->curl->len;
+		text->curc= c;
+		txt_pop_sel(text);
+	}
+}
+
 static void get_suggest_prefix(Text *text) {
 	int i, len;
 	char *line, tmp[256];
@@ -2905,12 +3025,6 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			st->overwrite= !st->overwrite;
 			do_draw= 1;
 			break;
-		case DOWNARROWKEY:
-			txt_move_down(text, G.qual & LR_SHIFTKEY);
-			set_tabs(text);
-			do_draw= 1;
-			pop_space_text(st);
-			break;
 		case LEFTARROWKEY:
 			if (G.qual & LR_COMMANDKEY)
 				txt_move_bol(text, G.qual & LR_SHIFTKEY);
@@ -2934,7 +3048,15 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			pop_space_text(st);
 			break;
 		case UPARROWKEY:
-			txt_move_up(text, G.qual & LR_SHIFTKEY);
+			if (st->wordwrap) wrap_move_up(st, G.qual & LR_SHIFTKEY);
+			else txt_move_up(text, G.qual & LR_SHIFTKEY);
+			set_tabs(text);
+			do_draw= 1;
+			pop_space_text(st);
+			break;
+		case DOWNARROWKEY:
+			if (st->wordwrap) wrap_move_down(st, G.qual & LR_SHIFTKEY);
+			else txt_move_down(text, G.qual & LR_SHIFTKEY);
 			set_tabs(text);
 			do_draw= 1;
 			pop_space_text(st);
@@ -2948,12 +3070,14 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			do_draw= 1;
 			break;
 		case HOMEKEY:
-			txt_move_bol(text, G.qual & LR_SHIFTKEY);
+			if (st->wordwrap) wrap_move_bol(st, G.qual & LR_SHIFTKEY);
+			else txt_move_bol(text, G.qual & LR_SHIFTKEY);
 			do_draw= 1;
 			pop_space_text(st);
 			break;
 		case ENDKEY:
-			txt_move_eol(text, G.qual & LR_SHIFTKEY);
+			if (st->wordwrap) wrap_move_eol(st, G.qual & LR_SHIFTKEY);
+			else txt_move_eol(text, G.qual & LR_SHIFTKEY);
 			do_draw= 1;
 			pop_space_text(st);
 			break;

From a821c8af1e91bf27e52c0d1bc8991ecfaf981c28 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Thu, 7 Aug 2008 22:15:54 +0000
Subject: [PATCH 188/252] Typing digits over the line numbers jumps to that
 line (from mindrones' wishlist)

---
 source/blender/src/drawtext.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index 2ab8d030f17..f8df4aa91d2 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -155,6 +155,8 @@ static char *last_repl_string= NULL;
 
 static int doc_scroll= 0;
 static double last_check_time= 0;
+static int jump_to= 0;
+static double last_jump= 0;
 
 static BMF_Font *spacetext_get_font(SpaceText *st) {
 	static BMF_Font *scr12= NULL;
@@ -2674,8 +2676,20 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 	} else if (ascii) {
 		if (text && text->id.lib) {
 			error_libdata();
-		} else if ((st->overwrite && txt_replace_char(text, ascii)) || txt_add_char(text, ascii)) {
-			if (st->showsyntax) txt_format_line(st, text->curl, 1);
+		} else {
+			short mval[2];
+			getmouseco_areawin(mval);
+			if (st->showlinenrs && mval[0]>2 && mval[0]<60 && mval[1]>2 && mval[1]<curarea->winy-2) {
+				if (ascii>='0' && ascii<='9') {
+					double time = PIL_check_seconds_timer();
+					if (last_jump < time-1) jump_to= 0;
+					jump_to *= 10; jump_to += (int)(ascii-'0');
+					txt_move_toline(text, jump_to-1, 0);
+					last_jump= time;
+				}
+			} else if ((st->overwrite && txt_replace_char(text, ascii)) || txt_add_char(text, ascii)) {
+				if (st->showsyntax) txt_format_line(st, text->curl, 1);
+			}
 			pop_space_text(st);
 			do_draw= 1;
 		}

From d42891975b4b7c8a02c59c0567f68ce24e41f3e3 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Fri, 8 Aug 2008 15:54:04 +0000
Subject: [PATCH 189/252] Typing 'from a import b' threw an error if b was not
 found. Accidentally moved this out of the try block in an earlier tidy-up.

---
 release/scripts/bpymodules/BPyTextPlugin.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/release/scripts/bpymodules/BPyTextPlugin.py b/release/scripts/bpymodules/BPyTextPlugin.py
index 5143229f829..870194880b3 100644
--- a/release/scripts/bpymodules/BPyTextPlugin.py
+++ b/release/scripts/bpymodules/BPyTextPlugin.py
@@ -237,10 +237,9 @@ def parse_text(txt):
 					# Try importing name as an attribute of the parent
 					try:
 						module = __import__(imp_from, globals(), locals(), [imp_name])
+						imports[imp_symb] = getattr(module, imp_name)
 					except (ImportError, ValueError, AttributeError, TypeError):
 						pass
-					else:
-						imports[imp_symb] = getattr(module, imp_name)
 				else:
 					imports[imp_symb] = module
 			

From e9c92144d1e811e08a7d376d58c5d73236215974 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Fri, 8 Aug 2008 16:49:14 +0000
Subject: [PATCH 190/252] Clipboard operations added to text editor RMB menu.

---
 source/blender/src/drawtext.c | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index f8df4aa91d2..7ad5aa59202 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -2643,7 +2643,10 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 		}
 	} else if (event==RIGHTMOUSE) {
 		if (val) {
-			p= pupmenu("File %t|New %x0|Open... %x1|Save %x2|Save As...%x3|Execute Script%x4");
+			if (txt_has_sel(text))
+				p= pupmenu("Text %t|Cut%x10|Copy%x11|Paste%x12|New %x0|Open... %x1|Save %x2|Save As...%x3|Execute Script%x4");
+			else
+				p= pupmenu("Text %t|Paste%x12|New %x0|Open... %x1|Save %x2|Save As...%x3|Execute Script%x4");
 
 			switch(p) {
 				case 0:
@@ -2669,7 +2672,28 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 					run_python_script(st);
 					do_draw= 1;
 					break;
-				default:
+				case 10:
+					if (text && text->id.lib) {
+						error_libdata();
+						break;
+					}
+					txt_copy_clipboard(text);
+					txt_cut_sel(text);
+					pop_space_text(st);
+					do_draw= 1;
+					break;
+				case 11:
+					//txt_copy_sel(text);
+					txt_copy_clipboard(text);
+					break;
+				case 12:
+					if (text && text->id.lib) {
+						error_libdata();
+						break;
+					}
+					txt_paste_clipboard(text);
+					if (st->showsyntax) txt_format_text(st);
+					do_draw= 1;
 					break;
 			}
 		}

From 4d83ce920a4631a9a0f769131c2f6fef76559e16 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Fri, 8 Aug 2008 20:30:55 +0000
Subject: [PATCH 191/252] Improvements to the suggestion and doc listing events
 (when to update and when to remove).

---
 source/blender/src/drawtext.c | 96 +++++++++++++++++++----------------
 1 file changed, 52 insertions(+), 44 deletions(-)

diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index 7ad5aa59202..ccb5767d7e7 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -145,7 +145,7 @@ static int check_whitespace(char ch);
 
 static int get_wrap_width(SpaceText *st);
 static int get_wrap_points(SpaceText *st, char *line);
-static void get_suggest_prefix(Text *text);
+static void get_suggest_prefix(Text *text, int offset);
 static void confirm_suggestion(Text *text, int skipleft);
 
 #define TXT_MAXFINDSTR 255
@@ -2168,7 +2168,7 @@ static void wrap_move_down(SpaceText *st, short sel) {
 	}
 }
 
-static void get_suggest_prefix(Text *text) {
+static void get_suggest_prefix(Text *text, int offset) {
 	int i, len;
 	char *line, tmp[256];
 
@@ -2176,11 +2176,11 @@ static void get_suggest_prefix(Text *text) {
 	if (!texttool_text_is_active(text)) return;
 
 	line= text->curl->line;
-	for (i=text->curc-1; i>=0; i--)
+	for (i=text->curc-1+offset; i>=0; i--)
 		if (!check_identifier(line[i]))
 			break;
 	i++;
-	len= text->curc-i;
+	len= text->curc-i+offset;
 	if (len > 255) {
 		printf("Suggestion prefix too long\n");
 		len = 255;
@@ -2224,7 +2224,7 @@ static void confirm_suggestion(Text *text, int skipleft) {
 }
 
 static short do_texttools(SpaceText *st, char ascii, unsigned short evnt, short val) {
-	int draw=0, swallow=0, tools=0, tools_cancel=0, tools_update=0, scroll=1;
+	int draw=0, tools=0, swallow=0, scroll=1;
 	if (!texttool_text_is_active(st->text)) return 0;
 	if (!st->text || st->text->id.lib) return 0;
 
@@ -2239,18 +2239,22 @@ static short do_texttools(SpaceText *st, char ascii, unsigned short evnt, short
 				confirm_suggestion(st->text, 0);
 				if (st->showsyntax) txt_format_line(st, st->text->curl, 1);
 			} else if ((st->overwrite && txt_replace_char(st->text, ascii)) || txt_add_char(st->text, ascii)) {
-				tools_update |= TOOL_SUGG_LIST;
+				get_suggest_prefix(st->text, 0);
 				swallow= 1;
 				draw= 1;
 			}
 		}
-		tools_cancel |= TOOL_DOCUMENT;
+		if (tools & TOOL_DOCUMENT) texttool_docs_clear(), doc_scroll= 0, draw= 1;
 
-	} else if (val) {
+	} else if (val==1) {
 		switch (evnt) {
 			case LEFTMOUSE:
-				if (do_suggest_select(st)) swallow= 1;
-				else tools_cancel |= TOOL_SUGG_LIST | TOOL_DOCUMENT;
+				if (do_suggest_select(st))
+					swallow= 1;
+				else {
+					if (tools & TOOL_SUGG_LIST) texttool_suggest_clear();
+					if (tools & TOOL_DOCUMENT) texttool_docs_clear(), doc_scroll= 0;
+				}
 				draw= 1;
 				break;
 			case MIDDLEMOUSE:
@@ -2258,18 +2262,17 @@ static short do_texttools(SpaceText *st, char ascii, unsigned short evnt, short
 					confirm_suggestion(st->text, 0);
 					if (st->showsyntax) txt_format_line(st, st->text->curl, 1);
 					swallow= 1;
-				} else
-					tools_cancel |= TOOL_SUGG_LIST | TOOL_DOCUMENT;
+				} else {
+					if (tools & TOOL_SUGG_LIST) texttool_suggest_clear();
+					if (tools & TOOL_DOCUMENT) texttool_docs_clear(), doc_scroll= 0;
+				}
 				draw= 1;
 				break;
 			case ESCKEY:
-				swallow= 1;
-				if (tools & TOOL_SUGG_LIST)
-					tools_cancel |= TOOL_SUGG_LIST;
-				else if (tools & TOOL_DOCUMENT)
-					tools_cancel |= TOOL_DOCUMENT;
-				else
-					swallow= 0;
+				draw= swallow= 1;
+				if (tools & TOOL_SUGG_LIST) texttool_suggest_clear();
+				else if (tools & TOOL_DOCUMENT) texttool_docs_clear(), doc_scroll= 0;
+				else draw= swallow= 0;
 				break;
 			case RETKEY:
 				if (tools & TOOL_SUGG_LIST) {
@@ -2278,23 +2281,44 @@ static short do_texttools(SpaceText *st, char ascii, unsigned short evnt, short
 					swallow= 1;
 					draw= 1;
 				}
-				tools_cancel |= TOOL_DOCUMENT;
+				if (tools & TOOL_DOCUMENT) texttool_docs_clear(), doc_scroll= 0, draw= 1;
 				break;
+			case LEFTARROWKEY:
 			case BACKSPACEKEY:
 				if (tools & TOOL_SUGG_LIST) {
-					if (G.qual) tools_cancel |= TOOL_SUGG_LIST;
+					if (G.qual)
+						texttool_suggest_clear();
 					else {
-						/* Work out which char we are about to delete */
+						/* Work out which char we are about to delete/pass */
 						if (st->text->curl && st->text->curc > 0) {
 							char ch= st->text->curl->line[st->text->curc-1];
 							if ((ch=='_' || !ispunct(ch)) && !check_whitespace(ch))
-								tools_update |= TOOL_SUGG_LIST;
+								get_suggest_prefix(st->text, -1);
 							else
-								tools_cancel |= TOOL_SUGG_LIST;
-						}
+								texttool_suggest_clear();
+						} else
+							texttool_suggest_clear();
 					}
 				}
-				tools_cancel |= TOOL_DOCUMENT;
+				if (tools & TOOL_DOCUMENT) texttool_docs_clear(), doc_scroll= 0;
+				break;
+			case RIGHTARROWKEY:
+				if (tools & TOOL_SUGG_LIST) {
+					if (G.qual)
+						texttool_suggest_clear();
+					else {
+						/* Work out which char we are about to pass */
+						if (st->text->curl && st->text->curc < st->text->curl->len) {
+							char ch= st->text->curl->line[st->text->curc+1];
+							if ((ch=='_' || !ispunct(ch)) && !check_whitespace(ch))
+								get_suggest_prefix(st->text, 1);
+							else
+								texttool_suggest_clear();
+						} else
+							texttool_suggest_clear();
+					}
+				}
+				if (tools & TOOL_DOCUMENT) texttool_docs_clear(), doc_scroll= 0;
 				break;
 			case PAGEDOWNKEY:
 				scroll= SUGG_LIST_SIZE-1;
@@ -2337,27 +2361,11 @@ static short do_texttools(SpaceText *st, char ascii, unsigned short evnt, short
 					break;
 				}
 			default:
-				if (G.qual!=0 && G.qual!=LR_SHIFTKEY)
-					tools_cancel |= TOOL_SUGG_LIST | TOOL_DOCUMENT;
+				if (tools & TOOL_SUGG_LIST) texttool_suggest_clear(), draw= 1;
+				if (tools & TOOL_DOCUMENT) texttool_docs_clear(), doc_scroll= 0, draw= 1;
 		}
 	}
 
-	if (tools & TOOL_SUGG_LIST) {
-		if (tools_update & TOOL_SUGG_LIST) {
-			get_suggest_prefix(st->text);
-		} else if (tools_cancel & TOOL_SUGG_LIST) {
-			texttool_suggest_clear();
-		}
-		draw= 1;
-	}
-	if (tools & TOOL_DOCUMENT) {
-		if (tools_cancel & TOOL_DOCUMENT) {
-			texttool_docs_clear();
-			doc_scroll= 0;
-		}
-		draw= 1;
-	}
-
 	if (draw) {
 		ScrArea *sa;
 		

From d7f64d43dd4b6fc89c7c02395b5c0143e63a0d0c Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Fri, 8 Aug 2008 23:14:32 +0000
Subject: [PATCH 192/252] Whole word ops. now treat symbols differently to
 whitespace allowing better control over cursor movements (solves mindrones'
 request).

---
 source/blender/blenkernel/intern/text.c | 53 ++++++++++++++-----------
 1 file changed, 30 insertions(+), 23 deletions(-)

diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c
index bcaf7bbc0ac..12a9fda367e 100644
--- a/source/blender/blenkernel/intern/text.c
+++ b/source/blender/blenkernel/intern/text.c
@@ -126,7 +126,6 @@ static void txt_pop_last(Text *text);
 static void txt_undo_add_op(Text *text, int op);
 static void txt_undo_add_block(Text *text, int op, char *buf);
 static void txt_delete_line(Text *text, TextLine *line);
-static int txt_word_boundary(char ch);
 
 /***/
 
@@ -575,15 +574,17 @@ static void txt_make_dirty (Text *text)
 	if (text->compiled) BPY_free_compiled_text(text);
 }
 
-static int txt_word_boundary (char ch)
+/* 0:whitespace, 1:punct, 2:alphanumeric */
+static short txt_char_type (char ch)
 {
-	if (ch < '0') return TRUE;
-	if (ch <= '9') return FALSE;
-	if (ch < 'A') return TRUE;
-	if (ch <= 'Z') return FALSE;
-	if (ch < 'a') return TRUE;
-	if (ch <= 'z') return FALSE;
-	return TRUE;
+	if (ch <= ' ') return 0;
+	if (ch <= '/') return 1;
+	if (ch <= '9') return 2;
+	if (ch <= '@') return 1;
+	if (ch <= 'Z') return 2;
+	if (ch <= '`') return 1;
+	if (ch <= 'z') return 2;
+	return 1;
 }
 
 /****************************/
@@ -723,7 +724,7 @@ void txt_move_right(Text *text, short sel)
 void txt_jump_left(Text *text, short sel)
 {
 	TextLine **linep, *oldl;
-	int *charp, oldc, count=-1;
+	int *charp, oldc, count, i;
 	unsigned char oldu;
 
 	if (!text) return;
@@ -736,14 +737,16 @@ void txt_jump_left(Text *text, short sel)
 	oldu= undoing;
 	undoing= 1; /* Don't push individual moves to undo stack */
 
-	do {
-		txt_move_left(text, sel);
-		count++;
-	} while (*charp>0 && *charp<(*linep)->len && txt_word_boundary((*linep)->line[*charp-1]));
-	if (!count) {
-		while (*charp>0 && *charp<(*linep)->len && !txt_word_boundary((*linep)->line[*charp-1]))
-			txt_move_left(text, sel);
+	count= 0;
+	for (i=0; i<3; i++) {
+		if (count < 2) {
+			while (*charp>0 && txt_char_type((*linep)->line[*charp-1])==i) {
+				txt_move_left(text, sel);
+				count++;
+			}
+		}
 	}
+	if (count==0) txt_move_left(text, sel);
 
 	undoing= oldu;
 	if(!undoing) txt_undo_add_toop(text, sel?UNDO_STO:UNDO_CTO, txt_get_span(text->lines.first, oldl), oldc, txt_get_span(text->lines.first, *linep), (unsigned short)*charp);
@@ -752,7 +755,7 @@ void txt_jump_left(Text *text, short sel)
 void txt_jump_right(Text *text, short sel)
 {
 	TextLine **linep, *oldl;
-	int *charp, oldc;
+	int *charp, oldc, count, i;
 	unsigned char oldu;
 
 	if (!text) return;
@@ -765,12 +768,16 @@ void txt_jump_right(Text *text, short sel)
 	oldu= undoing;
 	undoing= 1; /* Don't push individual moves to undo stack */
 
-	do {
-		txt_move_right(text, sel);
-	} while (*charp>0 && *charp<(*linep)->len && !txt_word_boundary((*linep)->line[*charp]));
-	while (*charp>0 && *charp<(*linep)->len && txt_word_boundary((*linep)->line[*charp])) {
-		txt_move_right(text, sel);
+	count= 0;
+	for (i=0; i<3; i++) {
+		if (count < 2) {
+			while (*charp<(*linep)->len && txt_char_type((*linep)->line[*charp])==i) {
+				txt_move_right(text, sel);
+				count++;
+			}
+		}
 	}
+	if (count==0) txt_move_right(text, sel);
 
 	undoing= oldu;
 	if(!undoing) txt_undo_add_toop(text, sel?UNDO_STO:UNDO_CTO, txt_get_span(text->lines.first, oldl), oldc, txt_get_span(text->lines.first, *linep), (unsigned short)*charp);

From ed972db1a3a2aa7f340e4382b4f0094681b34ed3 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Sat, 9 Aug 2008 10:12:59 +0000
Subject: [PATCH 193/252] Merge from trunk: 15912:16031

---
 CMakeLists.txt                                |    6 +-
 SConstruct                                    |    9 +-
 config/linux2-config.py                       |    2 +-
 intern/boolop/SConscript                      |    2 +-
 intern/boolop/intern/BOP_Interface.cpp        |    2 +-
 intern/boolop/make/msvc_7_0/boolop.vcproj     |    9 +
 intern/bsp/SConscript                         |    2 +-
 .../blender/BPY_python/BPY_python.vcproj      |  108 ++
 projectfiles_vc7/blender/blender.sln          |    9 +-
 .../blender/blenkernel/BKE_blenkernel.vcproj  |    6 +
 .../gameengine/ketsji/KX_ketsji.vcproj        |    9 +-
 .../PHY_Physics/PHY_Sumo/PHY_Sumo.vcproj      |    1 +
 release/scripts/flt_export.py                 |   29 +-
 release/scripts/flt_palettemanager.py         |  149 ++-
 release/scripts/import_dxf.py                 |  918 ++++++++------
 release/scripts/weightpaint_clean.py          |    7 +-
 source/blender/blenkernel/BKE_bvhutils.h      |   98 ++
 source/blender/blenkernel/BKE_texture.h       |    1 +
 .../blenkernel/bad_level_call_stubs/stubs.c   |    4 +
 source/blender/blenkernel/intern/anim.c       |   12 +-
 source/blender/blenkernel/intern/bvhutils.c   |  433 +++++++
 source/blender/blenkernel/intern/collision.c  |  221 ++--
 source/blender/blenkernel/intern/customdata.c |   24 +-
 source/blender/blenkernel/intern/modifier.c   |   39 +-
 source/blender/blenkernel/intern/particle.c   |    3 +
 .../blenkernel/intern/particle_system.c       |   18 +-
 source/blender/blenkernel/intern/texture.c    |   18 +
 source/blender/blenlib/BLI_kdopbvh.h          |   36 +
 source/blender/blenlib/intern/BLI_kdopbvh.c   | 1066 ++++++++++++-----
 source/blender/blenlib/intern/boxpack2d.c     |   10 +-
 source/blender/imbuf/intern/anim.c            |   15 +-
 source/blender/include/BIF_editarmature.h     |    7 +-
 source/blender/include/BIF_editmesh.h         |    2 +-
 source/blender/include/BIF_poseobject.h       |    2 +
 source/blender/include/butspace.h             |    2 +-
 source/blender/python/BPY_interface.c         |   64 +-
 source/blender/python/api2_2x/Blender.c       |    2 +-
 source/blender/python/api2_2x/Constraint.c    |   29 +-
 source/blender/python/api2_2x/Material.c      |   12 +-
 source/blender/python/api2_2x/Mathutils.c     |    8 +-
 source/blender/python/api2_2x/Mathutils.h     |    2 +-
 source/blender/python/api2_2x/doc/Render.py   |    4 +-
 .../render/intern/source/convertblender.c     |   14 +-
 source/blender/src/buttons_editing.c          |   88 +-
 source/blender/src/buttons_object.c           |    3 +-
 source/blender/src/buttons_scene.c            |   11 +-
 source/blender/src/drawgpencil.c              |  330 +++--
 source/blender/src/drawseq.c                  |   24 +-
 source/blender/src/editarmature.c             |  164 +--
 source/blender/src/editimasel.c               |    6 +
 source/blender/src/editmesh_mods.c            |  703 ++++++-----
 source/blender/src/editseq.c                  |    1 +
 source/blender/src/header_info.c              |   49 +-
 source/blender/src/header_view3d.c            |   81 +-
 source/blender/src/poselib.c                  |    7 +-
 source/blender/src/poseobject.c               |   61 +
 source/blender/src/space.c                    |   17 +-
 source/blender/src/toolbox.c                  |    9 +-
 .../BlenderRoutines/BL_KetsjiEmbedStart.cpp   |    3 +-
 .../Converter/BL_BlenderDataConversion.cpp    |   12 +-
 source/gameengine/Converter/KX_IpoConvert.cpp |    9 +-
 .../GamePlayer/common/windows/GPW_Canvas.h    |    2 +-
 .../GamePlayer/ghost/GPG_Application.cpp      |    8 +-
 source/gameengine/Ketsji/CMakeLists.txt       |   14 +-
 source/gameengine/Ketsji/KX_GameObject.cpp    |   81 +-
 source/gameengine/Ketsji/KX_GameObject.h      |    1 +
 source/gameengine/Ketsji/KX_PythonInit.cpp    |   13 +-
 source/gameengine/Ketsji/KX_PythonInit.h      |    1 +
 source/gameengine/Ketsji/KX_RadarSensor.cpp   |   14 +-
 .../Ketsji/KX_TouchEventManager.cpp           |   12 +-
 source/gameengine/Ketsji/SConscript           |   16 +-
 .../Physics/Bullet/CcdPhysicsController.cpp   |    5 +-
 .../Physics/Bullet/CcdPhysicsController.h     |    9 +-
 .../Physics/Bullet/CcdPhysicsEnvironment.cpp  |   42 +-
 .../Physics/Bullet/CcdPhysicsEnvironment.h    |    5 +-
 source/gameengine/PyDoc/KX_GameObject.py      |   10 +
 76 files changed, 3666 insertions(+), 1559 deletions(-)
 create mode 100644 source/blender/blenkernel/BKE_bvhutils.h
 create mode 100644 source/blender/blenkernel/intern/bvhutils.c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5a23e77d9f8..0ea26750ec1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -183,9 +183,9 @@ IF(UNIX)
   SET(LLIBS "-lXi -lutil -lc -lm -lpthread -lstdc++")
 
   IF(WITH_OPENMP)
-    SET(LLIBS "${LLIBS} -lgomp ")
-    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp ")
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp ")
+    SET(LLIBS "${LLIBS} -lgomp")
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp")
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
   ENDIF(WITH_OPENMP)
 
 
diff --git a/SConstruct b/SConstruct
index 869ba6454c8..4c3bbf8fad7 100644
--- a/SConstruct
+++ b/SConstruct
@@ -184,15 +184,16 @@ if env['WITH_BF_OPENMP'] == 1:
                 env['CPPFLAGS'].append('/openmp')
                 env['CXXFLAGS'].append('/openmp')
         else:
-            if env['CC'] == 'icc':
+            if env['CC'][-3:] == 'icc': # to be able to handle CC=/opt/bla/icc case
                 env.Append(LINKFLAGS=['-openmp', '-static-intel'])
                 env['CCFLAGS'].append('-openmp')
                 env['CPPFLAGS'].append('-openmp')
                 env['CXXFLAGS'].append('-openmp')
             else:
-                env['CCFLAGS'].append('-fopenmp')
-                env['CPPFLAGS'].append('-fopenmp')
-                env['CXXFLAGS'].append('-fopenmp')
+                env.Append(CCFLAGS=['-fopenmp']) 
+                env.Append(CPPFLAGS=['-fopenmp'])
+                env.Append(CXXFLAGS=['-fopenmp'])
+                # env.Append(LINKFLAGS=['-fprofile-generate'])
 
 #check for additional debug libnames
 
diff --git a/config/linux2-config.py b/config/linux2-config.py
index 6bde0664fe5..fe4325361a8 100644
--- a/config/linux2-config.py
+++ b/config/linux2-config.py
@@ -139,7 +139,7 @@ BF_OPENJPEG_LIB = ''
 BF_OPENJPEG_INC = '${BF_OPENJPEG}/include'
 BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
 
-WITH_BF_REDCODE = 'true'  
+WITH_BF_REDCODE = 'false'  
 BF_REDCODE = '#extern/libredcode'
 BF_REDCODE_LIB = ''
 # Uncomment the following two lines to use system's ffmpeg
diff --git a/intern/boolop/SConscript b/intern/boolop/SConscript
index a3f3c0b6433..bec263f251f 100644
--- a/intern/boolop/SConscript
+++ b/intern/boolop/SConscript
@@ -8,7 +8,7 @@ incs += ' ../../source/blender/makesdna ../../intern/guardedalloc'
 incs += ' ../../source/blender/blenlib'
 
 if (env['OURPLATFORM'] == 'win32-mingw'):
-    env.BlenderLib ('blender_bop', sources, Split(incs) , [], libtype=['common','intern'], priority = [5,50] )
+    env.BlenderLib ('blender_bop', sources, Split(incs) , [], libtype=['common','intern'], priority = [30,85] )
 else:
     env.BlenderLib ('blender_bop', sources, Split(incs) , [], libtype='common', priority = 5 )
 
diff --git a/intern/boolop/intern/BOP_Interface.cpp b/intern/boolop/intern/BOP_Interface.cpp
index 898ca708204..c6bcb4a74ce 100644
--- a/intern/boolop/intern/BOP_Interface.cpp
+++ b/intern/boolop/intern/BOP_Interface.cpp
@@ -37,7 +37,7 @@
 #include "BOP_Chrono.h"
 
 #if defined(BOP_ORIG_MERGE) && defined(BOP_NEW_MERGE) 
-#include "../../source/blender/blenkernel/BKE_global.h"
+#include "../../../source/blender/blenkernel/BKE_global.h"
 #endif
 
 BoolOpState BOP_intersectionBoolOp(BOP_Mesh*  meshC,
diff --git a/intern/boolop/make/msvc_7_0/boolop.vcproj b/intern/boolop/make/msvc_7_0/boolop.vcproj
index 7ae417e42d5..6e6d6abeb43 100644
--- a/intern/boolop/make/msvc_7_0/boolop.vcproj
+++ b/intern/boolop/make/msvc_7_0/boolop.vcproj
@@ -278,6 +278,9 @@ ECHO Done
 				<File
 					RelativePath="..\..\intern\BOP_Merge.cpp">
 				</File>
+				<File
+					RelativePath="..\..\intern\BOP_Merge2.cpp">
+				</File>
 				<File
 					RelativePath="..\..\intern\BOP_Mesh.cpp">
 				</File>
@@ -330,9 +333,15 @@ ECHO Done
 				<File
 					RelativePath="..\..\intern\BOP_Merge.h">
 				</File>
+				<File
+					RelativePath="..\..\intern\BOP_Merge2.h">
+				</File>
 				<File
 					RelativePath="..\..\intern\BOP_Mesh.h">
 				</File>
+				<File
+					RelativePath="..\..\intern\BOP_Misc.h">
+				</File>
 				<File
 					RelativePath="..\..\intern\BOP_Segment.h">
 				</File>
diff --git a/intern/bsp/SConscript b/intern/bsp/SConscript
index 88d2529ae59..39f278625a9 100644
--- a/intern/bsp/SConscript
+++ b/intern/bsp/SConscript
@@ -6,7 +6,7 @@ sources = env.Glob('intern/*.cpp')
 incs = 'intern ../container ../moto/include ../memutil'
 
 if (env['OURPLATFORM'] == 'win32-mingw'):
-    env.BlenderLib ('blender_BSP', sources, Split(incs), [], libtype=['common','intern'], priority=[26,26] )
+    env.BlenderLib ('blender_BSP', sources, Split(incs), [], libtype=['common','intern'], priority=[26,69] )
 else:
     env.BlenderLib ('blender_BSP', sources, Split(incs), [], libtype='core', priority=26 )
 
diff --git a/projectfiles_vc7/blender/BPY_python/BPY_python.vcproj b/projectfiles_vc7/blender/BPY_python/BPY_python.vcproj
index a31b9130db3..97f70a26db4 100644
--- a/projectfiles_vc7/blender/BPY_python/BPY_python.vcproj
+++ b/projectfiles_vc7/blender/BPY_python/BPY_python.vcproj
@@ -118,6 +118,114 @@
 			<Tool
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
+		<Configuration
+			Name="BlenderPlayer Debug|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\bsp\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\iksolver\include;..\..\..\..\build\msvc_7\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"
+				PreprocessorDefinitions="_DEBUG,WIN32,_LIB;WITH_FFMPEG"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				DisableLanguageExtensions="FALSE"
+				DefaultCharIsUnsigned="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile="..\..\..\..\build\msvc_7\source\blender\python\debug\BPY_python.pch"
+				AssemblerListingLocation="..\..\..\..\build\msvc_7\source\blender\python\debug\"
+				ObjectFile="..\..\..\..\build\msvc_7\source\blender\python\debug\"
+				ProgramDataBaseFileName="..\..\..\..\build\msvc_7\source\blender\python\debug\"
+				WarningLevel="4"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="3"
+				CompileAs="0"
+				DisableSpecificWarnings="4100"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\..\..\..\build\msvc_7\libs\debug\BPY_python.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="BlenderPlayer Release|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\bsp\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\iksolver\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\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;..\..\..\..\lib\windows\ffmpeg\include"
+				PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
+				StringPooling="TRUE"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="TRUE"
+				DefaultCharIsUnsigned="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile="..\..\..\..\build\msvc_7\source\blender\python\BPY_python.pch"
+				AssemblerListingLocation="..\..\..\..\build\msvc_7\source\blender\python\"
+				ObjectFile="..\..\..\..\build\msvc_7\source\blender\python\"
+				ProgramDataBaseFileName="..\..\..\..\build\msvc_7\source\blender\python\"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="FALSE"
+				CompileAs="0"
+				DisableSpecificWarnings="4100"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\..\..\..\build\msvc_7\libs\BPY_python.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>
diff --git a/projectfiles_vc7/blender/blender.sln b/projectfiles_vc7/blender/blender.sln
index 60c2d8f2d4c..1b069fa4677 100644
--- a/projectfiles_vc7/blender/blender.sln
+++ b/projectfiles_vc7/blender/blender.sln
@@ -152,6 +152,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GP_ghost", "..\gameengine\g
 		{E109F1A5-FDD3-4F56-A1C4-96867EEA4C5B} = {E109F1A5-FDD3-4F56-A1C4-96867EEA4C5B}
 		{727F90AC-ABE6-40BF-8937-C2F2F1D13DEA} = {727F90AC-ABE6-40BF-8937-C2F2F1D13DEA}
 		{E90C7BC2-CF30-4A60-A8F2-0050D592E358} = {E90C7BC2-CF30-4A60-A8F2-0050D592E358}
+		{5A2EA6DC-1A53-4E87-9166-52870CE3B4EA} = {5A2EA6DC-1A53-4E87-9166-52870CE3B4EA}
 		{32CC75E2-EE85-45E6-8E3D-513F58464F43} = {32CC75E2-EE85-45E6-8E3D-513F58464F43}
 		{9A307EE5-CD77-47BC-BD87-62508C7E19D8} = {9A307EE5-CD77-47BC-BD87-62508C7E19D8}
 		{AB590CED-F71F-4A17-A89B-18583ECD633D} = {AB590CED-F71F-4A17-A89B-18583ECD633D}
@@ -248,6 +249,8 @@ Global
 		Debug = Debug
 		Release = Release
 	EndGlobalSection
+	GlobalSection(ProjectDependencies) = postSolution
+	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
 		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.3D Plugin Debug.ActiveCfg = Blender Debug|Win32
 		{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.3D Plugin Release.ActiveCfg = Blender Release|Win32
@@ -387,8 +390,10 @@ Global
 		{5A2EA6DC-1A53-4E87-9166-52870CE3B4EA}.Blender Debug.Build.0 = Blender Debug|Win32
 		{5A2EA6DC-1A53-4E87-9166-52870CE3B4EA}.Blender Release.ActiveCfg = Blender Release|Win32
 		{5A2EA6DC-1A53-4E87-9166-52870CE3B4EA}.Blender Release.Build.0 = Blender Release|Win32
-		{5A2EA6DC-1A53-4E87-9166-52870CE3B4EA}.BlenderPlayer Debug.ActiveCfg = Blender Debug|Win32
-		{5A2EA6DC-1A53-4E87-9166-52870CE3B4EA}.BlenderPlayer Release.ActiveCfg = Blender Release|Win32
+		{5A2EA6DC-1A53-4E87-9166-52870CE3B4EA}.BlenderPlayer Debug.ActiveCfg = BlenderPlayer Debug|Win32
+		{5A2EA6DC-1A53-4E87-9166-52870CE3B4EA}.BlenderPlayer Debug.Build.0 = BlenderPlayer Debug|Win32
+		{5A2EA6DC-1A53-4E87-9166-52870CE3B4EA}.BlenderPlayer Release.ActiveCfg = BlenderPlayer Release|Win32
+		{5A2EA6DC-1A53-4E87-9166-52870CE3B4EA}.BlenderPlayer Release.Build.0 = BlenderPlayer Release|Win32
 		{5A2EA6DC-1A53-4E87-9166-52870CE3B4EA}.Debug.ActiveCfg = Blender Debug|Win32
 		{5A2EA6DC-1A53-4E87-9166-52870CE3B4EA}.Debug.Build.0 = Blender Debug|Win32
 		{5A2EA6DC-1A53-4E87-9166-52870CE3B4EA}.Release.ActiveCfg = Blender Release|Win32
diff --git a/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj b/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
index 8efff1742b0..0ea3503a289 100644
--- a/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
+++ b/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
@@ -365,6 +365,9 @@
 			<File
 				RelativePath="..\..\..\source\blender\blenkernel\intern\brush.c">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\blenkernel\intern\bvhutils.c">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\blenkernel\intern\CCGSubSurf.c">
 			</File>
@@ -576,6 +579,9 @@
 			<File
 				RelativePath="..\..\..\source\blender\blenkernel\BKE_brush.h">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\blenkernel\BKE_bvhutils.h">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\blenkernel\BKE_cdderivedmesh.h">
 			</File>
diff --git a/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj b/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
index 9d5a9f55074..c046d434cb3 100644
--- a/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
+++ b/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
@@ -126,7 +126,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\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"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\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"
 				PreprocessorDefinitions="JANCODEPANCO;WIN32;_LIB;EXP_PYTHON_EMBEDDING;_DEBUG;USE_SUMO_SOLID;WITH_GLEXT"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -179,7 +179,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\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"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\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"
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;USE_SUMO_SOLID;WITH_GLEXT"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -232,11 +232,12 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\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"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\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"
 				PreprocessorDefinitions="JANCODEPANCO;WIN32;_LIB;EXP_PYTHON_EMBEDDING;_DEBUG;USE_SUMO_SOLID;WITH_GLEXT"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				DefaultCharIsUnsigned="TRUE"
+				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderFile="..\..\..\..\build\msvc_7\source\gameengine\ketsji\debug\KX_ketsji.pch"
 				AssemblerListingLocation="..\..\..\..\build\msvc_7\source\gameengine\ketsji\debug\"
@@ -284,7 +285,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\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"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\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"
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;USE_SUMO_SOLID;WITH_GLEXT"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
diff --git a/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Sumo/PHY_Sumo.vcproj b/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Sumo/PHY_Sumo.vcproj
index a8d6e77cd58..33806e32d65 100644
--- a/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Sumo/PHY_Sumo.vcproj
+++ b/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Sumo/PHY_Sumo.vcproj
@@ -171,6 +171,7 @@
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
+				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderFile="..\..\..\..\..\..\build\msvc_7\source\gameengine\physics\sumo\debug\PHY_Sumo.pch"
 				AssemblerListingLocation="..\..\..\..\..\..\build\msvc_7\source\gameengine\physics\sumo\debug\"
diff --git a/release/scripts/flt_export.py b/release/scripts/flt_export.py
index 2b9db74c770..c099c8e62d1 100644
--- a/release/scripts/flt_export.py
+++ b/release/scripts/flt_export.py
@@ -525,8 +525,8 @@ class FaceDesc:
 	def __init__(self):
 		self.vertex_index_lst = []
 		self.mface = None
-		self.texture_index = -1
-		self.material_index = -1
+		self.texture_index = 65535
+		self.material_index = 65535
 		self.color_index = 127
 		self.renderstyle = 0
 		self.twoside = 0
@@ -979,8 +979,14 @@ class FLTNode(Node):
 			self.header.fw.write_char(0)                                    # Reserved
 			self.header.fw.write_char(alpha)                                    # Template
 			self.header.fw.write_short(-1)                                  # Detail tex pat index
-			self.header.fw.write_short(face_desc.texture_index)             # Tex pattern index
-			self.header.fw.write_short(face_desc.material_index)            # material index
+			if face_desc.texture_index == -1:
+				self.header.fw.write_ushort(65535)
+			else:
+				self.header.fw.write_ushort(face_desc.texture_index)	# Tex pattern index
+			if face_desc.material_index == -1:
+				self.header.fw.write_ushort(65535)
+			else:
+				self.header.fw.write_ushort(face_desc.material_index)		# material index
 			self.header.fw.write_short(0)                                   # SMC code
 			self.header.fw.write_short(0)                                   # Feature 					code
 			self.header.fw.write_int(0)                                     # IR material code
@@ -1015,7 +1021,10 @@ class FLTNode(Node):
 				self.header.fw.write_ushort(8 + (mtex * 8))		# Length
 				self.header.fw.write_uint(uvmask)								# UV mask
 				for i in xrange(mtex):
-					self.header.fw.write_ushort(face_desc.images[i])			# Tex pattern index
+					if face_desc.images[i] == -1:
+						self.header.fw.write_ushort(65535)
+					else:
+						self.header.fw.write_ushort(face_desc.images[i])			# Tex pattern index
 					self.header.fw.write_ushort(0)								# Tex effect
 					self.header.fw.write_ushort(0)								# Tex Mapping index
 					self.header.fw.write_ushort(0)								# Tex data. User defined
@@ -1070,7 +1079,7 @@ class FLTNode(Node):
 
                 if self.opcode == 63 and options.state['externalspath']:
 				try:
-					exportdict['3t200!filename'] = os.path.join(options.state['externalspath'],self.object.DupGroup.name+'.flt')
+					exportdict['3t200!filename'] = os.path.join(options.state['externalspath'],self.object.DupGroup.name+'.flt').replace("\\", "/")
 					self.header.xrefnames.append(self.object.DupGroup.name)
 				except:
 					pass
@@ -1092,7 +1101,7 @@ class FLTNode(Node):
 				write_prop(self.header.fw,ftype,self.object.properties['FLT']['EXT'][propname],length)
 			#write extension data
 			for i in xrange(datalen):
-				self.header.fw.write_char(self.object.properties['FLT']['EXT']['data'][i])
+				self.header.fw.write_uchar(struct.unpack('>B', struct.pack('>B', self.object.properties['FLT']['EXT']['data'][i]))[0])
 			self.write_pop_extension()
 
 
@@ -1180,8 +1189,8 @@ class Database(Node):
 			desc = self.GRR.request_vertex_desc(i)
 			self.fw.write_short(70)                         # Vertex with color normal and uv opcode.
 			self.fw.write_ushort(64)                        # Length of record
-			self.fw.write_ushort(0)							# Color name index
-			self.fw.write_short(0x20000000)					# Flags
+			self.fw.write_ushort(0)				# Color name index
+			self.fw.write_short(1 << 14)			# Frozen Normal
 			self.fw.write_double(desc.x)
 			self.fw.write_double(desc.y)
 			self.fw.write_double(desc.z)
@@ -1245,7 +1254,7 @@ class Database(Node):
 			cpalette = defaultp.pal
 		count = len(cpalette)
 		for i in xrange(count):
-			color = struct.unpack('>BBBB',struct.pack('>I',cpalette[i]))
+			color = struct.unpack('>BBBB',struct.pack('>i',cpalette[i]))
 			self.fw.write_uchar(color[3])               # alpha
 			self.fw.write_uchar(color[2])               # b
 			self.fw.write_uchar(color[1])               # g
diff --git a/release/scripts/flt_palettemanager.py b/release/scripts/flt_palettemanager.py
index 6edaf2974ab..c2f1380a6fa 100644
--- a/release/scripts/flt_palettemanager.py
+++ b/release/scripts/flt_palettemanager.py
@@ -25,7 +25,7 @@ http://wiki.blender.org/index.php/Scripts/Manual/FLTools
 """
 
 # --------------------------------------------------------------------------
-# flt_palettemanager.py version 0.1 2005/04/08
+# flt_palettemanager.py version 1.0 2005/04/08
 # --------------------------------------------------------------------------
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
@@ -55,6 +55,75 @@ import flt_properties
 import flt_defaultp as defaultp
 from flt_properties import *
 
+def RGBtoHSV( r, g, b):
+	minc = min( r, g, b )
+	maxc = max( r, g, b )
+	v = maxc				
+
+	delta = maxc - minc
+
+	if( max != 0 ):
+		s = delta / maxc		
+	else:
+		s = 0
+		h = -1
+		return (h,s,v)
+
+	if( r == maxc ):
+		h = ( g - b ) / delta		
+	elif( g == maxc ):
+		h = 2 + ( b - r ) / delta
+	else:
+		h = 4 + ( r - g ) / delta
+
+	h *= 60
+	if( h < 0 ):
+		h += 360
+
+	return(h,s,v)
+
+def HSVtoRGB(h,s,v):
+
+	if( s == 0 ):
+		return (v,v,v)
+	
+
+	h /= 60
+	i = math.floor( h)
+	f = h - i
+	p = v * ( 1 - s )
+	q = v * ( 1 - s * f )
+	t = v * ( 1 - s * ( 1 - f ) )
+
+	if i == 0:
+		r = v
+		g = t
+		b = p
+	elif i == 1:
+		r = q
+		g = v
+		b = p
+
+	elif i== 2:
+		r = p
+		g = v
+		b = t
+	elif i==3:
+		r = p
+		g = q
+		b = v
+	elif i==4:
+		r = t
+		g = p
+		b = v
+
+	else:
+		r = v
+		g = p
+		b = q
+	
+	return(r,g,b)
+
 
 palette_size = 12
 palette_x = 0
@@ -68,6 +137,14 @@ cinc = 1.0 / 1024.0
 cstep = 0.0
 picker = None
 ptt = ""
+
+
+ts1=None
+ts2=None
+ts3=None
+ts4=None
+ts5=None
+
 for i in xrange(1024):
 	colors.append([cstep,cstep,cstep])
 	cstep = cstep + cinc
@@ -128,7 +205,7 @@ def event(evt,val):
                         Draw.Redraw(1)
 	
 	#copy current color and intensity to selected faces.
-	elif evt == Draw.CKEY:
+	elif evt == Draw.VKEY:
 		
 		if Blender.Window.EditMode():
 			Blender.Window.EditMode(0)
@@ -136,7 +213,7 @@ def event(evt,val):
 		state = update_state()
 		
 		#retrieve color from palette
-		color = struct.unpack('>BBBB',struct.pack('>I',colors[curswatch]))
+		color = struct.unpack('>BBBB',struct.pack('>i',colors[curswatch]))
 		actmesh = state["activeMesh"]
 		if actmesh: 
 			if(Blender.Window.GetKeyQualifiers() != Blender.Window.Qual["CTRL"]):
@@ -182,7 +259,7 @@ def event(evt,val):
 			Blender.Window.RedrawAll()
 	
 	#grab color and intensity from active face
-	elif evt == Draw.VKEY:
+	elif evt == Draw.CKEY:
 		if Blender.Window.EditMode():
 			Blender.Window.EditMode(0)
 			editmode = 1
@@ -211,6 +288,23 @@ def event(evt,val):
 			Blender.Window.EditMode(1)
 		
 		Blender.Window.RedrawAll()
+		
+	elif evt == Draw.GKEY:
+		if Blender.Window.EditMode():
+			Blender.Window.EditMode(0)
+			editmode =1
+		state = update_state()
+		
+		actmesh = state["activeMesh"]
+		activeFace = state["activeFace"]
+		
+		if activeFace and "FLT_COL" in actmesh.faces.properties:
+			(index,intensity) = unpack_face_index(activeFace.getProperty("FLT_COL"))
+			for face in actmesh.faces:
+				(index2, intensity2) = unpack_face_index(face.getProperty("FLT_COL"))
+				if index == index2:
+					face.sel = 1
+				
 			
 	elif evt == Draw.ESCKEY:
 		Draw.Exit()
@@ -225,11 +319,11 @@ def update_all():
 	for object in state["activeScene"].objects:
 		if object.type == "Mesh":
 			mesh = object.getData(mesh=True)
-			if 'FLT_COL' in mesh.faces.properties:
+			if 'FLT_COL' in mesh.faces.properties and "FLT_Fcol" in mesh.getColorLayerNames():
 				mesh.activeColorLayer = "FLT_Fcol"
 				for face in mesh.faces:
 					(index,intensity) = unpack_face_index(face.getProperty('FLT_COL'))
-					color = struct.unpack('>BBBB',struct.pack('>I',colors[index]))
+					color = struct.unpack('>BBBB',struct.pack('>i',colors[index]))
 					#update the vertex colors for this face
 					for col in face.col:
 						col.r = int(color[0] * intensity)
@@ -284,8 +378,13 @@ def draw_palette():
 	global colors
 	global curint
 	global curswatch
-        global picker
-
+	global picker
+	global ts1
+	global ts2
+	global ts3
+	global ts4
+	global ts5
+	
 	state = update_state()
 	init_pal()
 
@@ -297,7 +396,7 @@ def draw_palette():
 	for x in xrange(32):
 		ypos = palette_y
 		for y in xrange(32):
-			color = struct.unpack('>BBBB',struct.pack('>I',colors[cid]))
+			color = struct.unpack('>BBBB',struct.pack('>i',colors[cid]))
 			glColor3f(color[0]/255.0,color[1]/255.0,color[2]/255.0)
 			glBegin(GL_POLYGON)
 			glVertex2i(xpos,ypos)
@@ -328,7 +427,7 @@ def draw_palette():
 		xpos = xpos + ssize
 	
 	#draw intensity gradient
-	color = struct.unpack('>BBBB',struct.pack('>I',colors[curswatch]))
+	color = struct.unpack('>BBBB',struct.pack('>i',colors[curswatch]))
 	color = [color[0]/255.0,color[1]/255.0,color[2]/255.0]
 	colsteps = [color[0]/255.0,color[1]/255.0,color[2]/255.0]
 	stripwidth = (palette_size * 32.0) / 256
@@ -355,15 +454,15 @@ def draw_palette():
 	xpos = ((palette_size*32) * (1.0 - curint)) + palette_x
 	glColor3f(1.0,1.0,1.0)
 	glBegin(GL_LINE_LOOP)
-	glVertex2i(xpos-6,grady-1)
-	glVertex2i(xpos+6,grady-1)
-	glVertex2i(xpos+6,grady+palette_size+1)
-	glVertex2i(xpos-6,grady+palette_size+1)
+	glVertex2i(int(xpos-6),int(grady-1))
+	glVertex2i(int(xpos+6),int(grady-1))
+	glVertex2i(int(xpos+6),int(grady+palette_size+1))
+	glVertex2i(int(xpos-6),int(grady+palette_size+1))
 	#glVertex2i(xpos-6,grady+7)
 	glEnd()
 
 	#draw color picker
-	color = struct.unpack('>BBBB',struct.pack('>I',colors[curswatch]))
+	color = struct.unpack('>BBBB',struct.pack('>i',colors[curswatch]))
 	pickcol = (color[0]/255.0,color[1]/255.0,color[2]/255.0)
 	picker = Blender.Draw.ColorPicker(1,highlight[0][0]+1,highlight[0][1]+1,ssize-2,ssize-2,pickcol,ptt)
 
@@ -377,6 +476,24 @@ def draw_palette():
 	glVertex2i(highlight[0][0],highlight[0][1])
 	glEnd()			
 
+	#draw text string explanations
+	xpos = palette_size*32+20
+	ypos = palette_size*32+10
+	glRasterPos2d(xpos,ypos)
+	ts1	= Blender.Draw.Text("FLT Palette Manager V 1.0")
+	ypos = ypos - 20
+	glRasterPos2d(xpos,ypos)
+	ts3 = Blender.Draw.Text("CKEY - Copy Active Face Color*")
+	ypos = ypos - 20
+	glRasterPos2d(xpos,ypos)
+	ts2 = Blender.Draw.Text("VKEY - Paste Color to Selected Faces")
+	ypos = ypos - 20
+	glRasterPos2d(xpos,ypos)
+	ts4 = Blender.Draw.Text("GKEY - Select Faces With Same Color")
+	ypos = ypos - 15
+	glRasterPos2d(xpos,ypos)
+	ts5 = Blender.Draw.Text("(*Requires mesh with UV coordinates)", 'small')
+
 def gui():
 	glClearColor(0.5,0.5,0.5,1.0)
 	glClear(GL_COLOR_BUFFER_BIT)
@@ -385,4 +502,4 @@ def gui():
 
 init_pal()
 Draw.Register(gui,event,but_event)
-	
+	
\ No newline at end of file
diff --git a/release/scripts/import_dxf.py b/release/scripts/import_dxf.py
index ce7df610d98..bb0119a9a81 100644
--- a/release/scripts/import_dxf.py
+++ b/release/scripts/import_dxf.py
@@ -2,15 +2,15 @@
 
 """
 Name: 'Autodesk DXF (.dxf)'
-Blender: 244
+Blender: 246
 Group: 'Import'
 Tooltip: 'Import for DXF geometry data (Drawing eXchange Format).'
 """
 __author__ = 'Kitsu(Ed Blake) & migius(Remigiusz Fiedler)'
-__version__ = '1.0.12 - 2008.06.05 by migius'
+__version__ = '1.12 - 2008.08.03 by migius'
 __url__ = ["http://blenderartists.org/forum/showthread.php?t=84319",
 	 "http://wiki.blender.org/index.php/Scripts/Manual/Import/DXF-3D"]
-__email__ = ["Kitsune_e(at)yahoo.com", "migius(at)4d-vectors.de"]
+__email__ = ["migius(at)4d-vectors.de","Kitsune_e(at)yahoo.com"]
 __bpydoc__ = """\
 This script imports objects from DXF (2d/3d) into Blender.
 
@@ -19,7 +19,7 @@ Supported DXF format versions: from (r2.5) r12 up to 2008.
 Enhanced features are:
 - configurable object filtering and geometry manipulation,
 - configurable material pre-processing,
-- DXF-data analyze and raporting.
+- DXF-code analyze and reporting.
 
 Supported DXF r12 objects:
 LINE,
@@ -41,10 +41,10 @@ XREF (External Reference).
 
 Supported DXF>r12 objects:
 ELLIPSE,
-LWPOLYLINE (LightWeight Polylines),
-(wip v1.0.12) SPLINE,
-(wip v1.0.13) MLINE,
-(wip v1.0.13) MTEXT
+LWPOLYLINE (LightWeight Polyline),
+SPLINE,
+(wip v1.13) MLINE,
+(wip v1.13) MTEXT
 
 Unsupported objects:
 DXF r12: DIMENSION.
@@ -60,7 +60,7 @@ Supported layout modes:
 Supported scene definition objescts produced with AVE_RENDER:
 scene: selection of lights assigned to the camera,
 lights: DIRECT, OVERHEAD, SH_SPOT,
-(wip v1.0.13 import of AVE_RENDER material definitions)
+(wip v1.13 import of AVE_RENDER material definitions)
 
 Hierarchy:
 Entire DXF BLOCK hierarchy is preserved after import into Blender
@@ -73,7 +73,7 @@ thickness,
 width,
 color,
 layer,
-(wip v1.0.12: XDATA, grouped status)
+(wip v1.13: XDATA, grouped status)
 It is recommended to use DXF-object properties for assign Blender materials.
 
 Notes:
@@ -88,7 +88,7 @@ in creating new objects in scene database - probably a database management probl
 
 """
 History:
- v1.0 - 2008.01. by migius
+ v1.0 - 2007/2008 by migius
  planned tasks:
  -- (to see more, search for "--todo--" in script code)
  -- command-line-mode/batch-mode
@@ -109,9 +109,22 @@ History:
  -- bug: Registry recall from hd_cache ?? only win32 bug??
  -- support DXF-definitions of scene, lights and cameras
  -- support ortho mode for VIEWs and VPORTs as cameras 
- -- add support for SPLINEs
 
- v1.0.12: 2008.06.05 by migius
+
+ v1.12 - 2008.08.03 by migius
+ c2 warningfix: relocating of globals: layersmap, oblist 
+ c2 modif UI: buttons newScene+targetLayer moved to start panel
+ v1.12 - 2008.07.04 by migius
+ c1 added control Curve's OrderU parameter
+ c1 modif UI: preset buttons X-2D-3D moved to start panel
+ b6 added handling exception of not registered LAYERs (Hammer-HL-editor DXF output)
+ b5 rebuild UI: global preset 2D for Curve-Import
+ b5 added UI-options: PL-MESH N+N plmesh_flip and normals_out 
+ b5 added support for SPLINEs, added control OrderU parameter
+ b5 rewrote draw module for NURBS_curve and Bezier_curve
+ v1.12 - 2008.06.22 by migius
+ b4 change versioning system 1.0.12 -> 1.12
+ b4 print at start version-info to console
  b3 bugfix: ob.name conflict with existing meshes (different ob.name/mesh.name)
  v1.0.12: 2008.05.24 by migius
  b2 added support for LWPOLYLINEs
@@ -310,16 +323,16 @@ except ImportError:
 	#print 'psyco not imported'
 	pass
 
-print '\n\n\n\n'
-print 'DXF-Importer  *** start ***'   #---------------------
+#try: Curve.orderU
+
+print '\n\n\n'
+print 'DXF-Importer v%s *** start ***' %(__version__)   #---------------------
 
 SCENE = None
 WORLDX = Mathutils.Vector((1,0,0))
 WORLDY = Mathutils.Vector((1,1,0))
 WORLDZ = Mathutils.Vector((0,0,1))
 
-oblist = [] #to be sure, it is an empty list
-
 G_SCALE = 1.0	   #(0.0001-1000) global scaling factor for all dxf data
 G_ORIGIN_X = 0.0   #global translation-vector (x,y,z) in DXF units
 G_ORIGIN_Y = 0.0
@@ -335,12 +348,15 @@ MIN_WIDTH = MIN_DIST * 10.0  #minimal width by forced width
 TRIM_LIMIT = 3.0	 #limit for triming of polylines-wide-segments (values:0.0 - 5.0)
 ELEVATION = 0.0 #standard elevation = coordinate Z
 
-TARGET_LAYER = 3	#target blender_layer
-GROUP_BYLAYER = 0   #(0/1) all entities from same layer import into one blender-group
-cur_COUNTER = 0  #counter for progress_bar
-M_OBJ = False
 BYBLOCK = 0
 BYLAYER = 256
+TARGET_LAYER = 3	#target blender_layer
+GROUP_BYLAYER = 0   #(0/1) all entities from same layer import into one blender-group
+LAYER_DEF_NAME = 'AAAA' #default layer name
+LAYER_DEF_COLOR = 4 #default layer color
+E_M = 0
+LAB = "*) parts under construction"
+M_OBJ = 0
 
 FILENAME_MAX = 180	#max length of path+file_name string  (FILE_MAXDIR + FILE_MAXFILE)
 MAX_NAMELENGTH = 17   #max_effective_obnamelength in blender =21=17+(.001)
@@ -366,27 +382,27 @@ class View:  #-----------------------------------------------------------------
 
 		self.type = obj.type
 		self.name = obj.get_type(2)[0]
-		self.data = obj.data[:]
+#		self.data = obj.data[:]
 
 
-		self.centerX = getit(obj.data, 10, 0.0) #view center pointX (in DCS)
-		self.centerY = getit(obj.data, 20, 0.0) #view center pointY (in DCS)
+		self.centerX = getit(obj, 10, 0.0) #view center pointX (in DCS)
+		self.centerY = getit(obj, 20, 0.0) #view center pointY (in DCS)
 		self.height = obj.get_type(40)[0] #view height (in DCS)
 		self.width = obj.get_type(41)[0] #view width (in DCS)
 
 		self.dir = [0,0,0]
-		self.dir[0] = getit(obj.data, 11, 0.0) #view directionX from target (in WCS)
-		self.dir[1] = getit(obj.data, 21, 0.0) #
-		self.dir[2] = getit(obj.data, 31, 0.0) #
+		self.dir[0] = getit(obj, 11, 0.0) #view directionX from target (in WCS)
+		self.dir[1] = getit(obj, 21, 0.0) #
+		self.dir[2] = getit(obj, 31, 0.0) #
 
 		self.target = [0,0,0]
-		self.target[0] = getit(obj.data, 12, 0.0) #target pointX(in WCS)
-		self.target[1] = getit(obj.data, 22, 0.0) #
-		self.target[2] = getit(obj.data, 32, 0.0) #
+		self.target[0] = getit(obj, 12, 0.0) #target pointX(in WCS)
+		self.target[1] = getit(obj, 22, 0.0) #
+		self.target[2] = getit(obj, 32, 0.0) #
 
 		self.length = obj.get_type(42)[0] #Lens length
-		self.clip_front = getit(obj.data, 43) #Front clipping plane (offset from target point)
-		self.clip_back = getit(obj.data, 44) #Back clipping plane (offset from target point)
+		self.clip_front = getit(obj, 43) #Front clipping plane (offset from target point)
+		self.clip_back = getit(obj, 44) #Back clipping plane (offset from target point)
 		self.twist  = obj.get_type(50)[0] #view twist angle in degrees
 
 		self.flags = getit(obj, 70, 0)
@@ -450,28 +466,28 @@ class Vport:  #-----------------------------------------------------------------
 
 		self.type = obj.type
 		self.name = obj.get_type(2)[0]
-		self.data = obj.data[:]
+#		self.data = obj.data[:]
 		#print 'deb:vport name, data:', self.name #-------
 		#print 'deb:vport data:', self.data #-------
 
 		self.height = obj.get_type(40)[0] #vport height (in DCS)
-		self.centerX = getit(obj.data, 12, 0.0) #vport center pointX (in DCS)
-		self.centerY = getit(obj.data, 22, 0.0) #vport center pointY (in DCS)
+		self.centerX = getit(obj, 12, 0.0) #vport center pointX (in DCS)
+		self.centerY = getit(obj, 22, 0.0) #vport center pointY (in DCS)
 		self.width = self.height * obj.get_type(41)[0] #vport aspect ratio - width (in DCS)
 
 		self.dir = [0,0,0]
-		self.dir[0] = getit(obj.data, 16, 0.0) #vport directionX from target (in WCS)
-		self.dir[1] = getit(obj.data, 26, 0.0) #
-		self.dir[2] = getit(obj.data, 36, 0.0) #
+		self.dir[0] = getit(obj, 16, 0.0) #vport directionX from target (in WCS)
+		self.dir[1] = getit(obj, 26, 0.0) #
+		self.dir[2] = getit(obj, 36, 0.0) #
 
 		self.target = [0,0,0]
-		self.target[0] = getit(obj.data, 17, 0.0) #target pointX(in WCS)
-		self.target[1] = getit(obj.data, 27, 0.0) #
-		self.target[2] = getit(obj.data, 37, 0.0) #
+		self.target[0] = getit(obj, 17, 0.0) #target pointX(in WCS)
+		self.target[1] = getit(obj, 27, 0.0) #
+		self.target[2] = getit(obj, 37, 0.0) #
 
 		self.length = obj.get_type(42)[0] #Lens length
-		self.clip_front = getit(obj.data, 43) #Front clipping plane (offset from target point)
-		self.clip_back = getit(obj.data, 44) #Back clipping plane (offset from target point)
+		self.clip_front = getit(obj, 43) #Front clipping plane (offset from target point)
+		self.clip_back = getit(obj, 44) #Back clipping plane (offset from target point)
 		self.twist  = obj.get_type(51)[0] #view twist angle
 
 		self.flags = getit(obj, 70, 0)
@@ -528,29 +544,36 @@ class Layer:  #-----------------------------------------------------------------
 	"""Class for objects representing dxf LAYERs.
 	"""
 	def __init__(self, obj, name=None, color=None, frozen=None):
-		"""Expects an object of type layer as input.
+		"""Expects an dxfobject of type layer as input.
+			if no dxfobject - creates surogate layer with default parameters
 		"""
-		self.type = obj.type
-		self.data = obj.data[:]
 
-		if name:
-			self.name = name
-			#self.bfname = name  #--todo---see layernamesmap in f_getLayersmap ---
-		else:
-			self.name = obj.get_type(2)[0] #layer name of object
-
-		if color:
-			self.color = color
-		else:
-			self.color = obj.get_type(62)[0]  #color of object
-
-		if frozen:
-			self.frozen = frozen
-		else:
-			self.flags = obj.get_type(70)[0]
-			self.frozen = self.flags & 1
+		if obj==None:
+			self.type = 'layer'
+			if name: self.name = name
+			else: self.name = LAYER_DEF_NAME
 
+			if color: self.color = color
+			else: self.color = LAYER_DEF_COLOR
 
+			if frozen!=None: self.frozen = frozen
+			else: self.frozen = 0
+		else:	
+			if obj.type=='layer':
+				self.type = obj.type
+				#self.data = obj.data[:]
+				if name: self.name = name
+					#self.bfname = name  #--todo---see layernamesmap in f_getLayersmap ---
+				else: self.name = obj.get_type(2)[0] #layer name of object
+		
+				if color: self.color = color
+				else: self.color = obj.get_type(62)[0]  #color of object
+		
+				if frozen!=None: self.frozen = frozen
+				else:
+					self.flags = obj.get_type(70)[0]
+					self.frozen = self.flags & 1
+	
 	def __repr__(self):
 		return "%s: name - %s, color - %s" %(self.__class__.__name__, self.name, self.color)
 
@@ -615,15 +638,15 @@ class Solid:  #-----------------------------------------------------------------
 			raise TypeError, "Wrong type \'%s\' for solid/trace object!" %obj.type
 
 		self.type = obj.type
-		self.data = obj.data[:]
+#		self.data = obj.data[:]
 
 		self.space = getit(obj, 67, 0)
 		self.thic =  getit(obj, 39, 0)
 		self.color_index = getit(obj, 62, BYLAYER)
 
-		self.layer = getit(obj.data, 8, None)
-		self.extrusion = get_extrusion(obj.data)
-		self.points = self.get_points(obj.data)
+		self.layer = getit(obj, 8, None)
+		self.extrusion = get_extrusion(obj)
+		self.points = self.get_points(obj)
 
 
 
@@ -736,16 +759,16 @@ class Line:  #-----------------------------------------------------------------
 		if not obj.type == 'line':
 			raise TypeError, "Wrong type \'%s\' for line object!" %obj.type
 		self.type = obj.type
-		self.data = obj.data[:]
+#		self.data = obj.data[:]
 
 		self.space = getit(obj, 67, 0)
 		self.thic =  getit(obj, 39, 0)
 		#print 'deb:self.thic: ', self.thic #---------------------
 		self.color_index = getit(obj, 62, BYLAYER)
 
-		self.layer = getit(obj.data, 8, None)
-		self.extrusion = get_extrusion(obj.data)
-		self.points = self.get_points(obj.data)
+		self.layer = getit(obj, 8, None)
+		self.extrusion = get_extrusion(obj)
+		self.points = self.get_points(obj)
 
 
 	def get_points(self, data):
@@ -883,16 +906,16 @@ class Point:  #-----------------------------------------------------------------
 		if not obj.type == 'point':
 			raise TypeError, "Wrong type %s for point object!" %obj.type
 		self.type = obj.type
-		self.data = obj.data[:]
+#		self.data = obj.data[:]
 
 		self.space = getit(obj, 67, 0)
 		self.thic =  getit(obj, 39, 0)
 		#print 'deb:self.thic: ', self.thic #---------------------
 		self.color_index = getit(obj, 62, BYLAYER)
 
-		self.layer = getit(obj.data, 8, None)
-		self.extrusion = get_extrusion(obj.data)
-		self.points = self.get_points(obj.data)
+		self.layer = getit(obj, 8, None)
+		self.extrusion = get_extrusion(obj)
+		self.points = self.get_points(obj)
 
 
 	def get_points(self, data):
@@ -922,7 +945,7 @@ class Point:  #-----------------------------------------------------------------
 		thic = settings.var['thick_min']
 		if thic < settings.var['dist_min']: thic = settings.var['dist_min']
 
-		if True: #--todo--  points_as in [1,3,4,5]:
+		if points_as in [1,3,4,5]:
 			if True: # points_as in [1,5]: # as 'empty'
 				c = 'Empty'
 			elif points_as == 3: # as 'thin sphere'
@@ -969,11 +992,8 @@ class Polyline:  #--------------------------------------------------------------
 		if not obj.type == 'polyline':
 			raise TypeError, "Wrong type %s for polyline object!" %obj.type
 		self.type = obj.type
-		self.data = obj.data[:]
-		#print 'deb:polyline.obj.data[:]:\n', obj.data[:] #------------------------
-		self.points = []
+#		self.data = obj.data[:]
 
-		# optional data (with defaults)
 		self.space = getit(obj, 67, 0)
 		self.elevation =  getit(obj, 30, 0)
 		#print 'deb:elevation: ', self.elevation #---------------
@@ -983,7 +1003,7 @@ class Polyline:  #--------------------------------------------------------------
 		self.flags = getit(obj, 70, 0)
 		self.closed = self.flags & 1   # closed in the M direction
 		self.curved = self.flags & 2   # Bezier-curve-fit vertices have been added
-		self.spline = self.flags & 4   # Bspline-fit vertices have been added
+		self.spline = self.flags & 4   # NURBS-curve-fit vertices have been added
 		self.poly3d = self.flags & 8   # 3D-polyline
 		self.plmesh = self.flags & 16  # 3D-polygon mesh
 		self.closeN = self.flags & 32  # closed in the N direction
@@ -1002,18 +1022,18 @@ class Polyline:  #--------------------------------------------------------------
 		self.vectorsN =  getit(obj, 72, None) # PolyMesh: expansion in M-direction / PolyFace: number of faces
 		#self.resolM =  getit(obj, 73, None) # resolution of surface in M direction
 		#self.resolN =  getit(obj, 74, None) # resolution of surface in N direction
-		self.curvetyp =  getit(obj, 75, 0) # type of curve/surface: 0=None/5=Quadric/6=Cubic/8=Bezier
-		self.curvNormal = False
-		self.curvQBspline = False
-		self.curvCBspline = False
+		self.curvNoFitted = False
+		self.curvQuadrati = False
+		self.curvCubicBsp = False
 		self.curvBezier = False
-		if   self.curvetyp == 0: self.curvNormal = True
-		elif self.curvetyp == 5: self.curvQBspline = True
-		elif self.curvetyp == 6: self.curvCBspline = True
-		elif self.curvetyp == 8: self.curvBezier = True
+		curvetype =  getit(obj, 75, 0) # type of curve/surface: 0=None/5=Quadric/6=Cubic/8=Bezier
+		if   curvetype == 0: self.curvNoFitted = True
+		elif curvetype == 5: self.curvQuadrati = True
+		elif curvetype == 6: self.curvCubicBsp = True
+		elif curvetype == 8: self.curvBezier = True
 
-		self.layer = getit(obj.data, 8, None)
-		self.extrusion = get_extrusion(obj.data)
+		self.layer = getit(obj, 8, None)
+		self.extrusion = get_extrusion(obj)
 
 		self.points = []  #list with vertices coordinats
 		self.faces  = []  #list with vertices assigment to faces
@@ -1026,9 +1046,65 @@ class Polyline:  #--------------------------------------------------------------
 
 
 
+	def doubles_out(self, settings, d_points):
+		"""routine to sort out of double.vertices-----------------------------
+		"""
+		minimal_dist =  settings.var['dist_min'] * 0.1
+		dv_count = 0
+		temp_points = []
+		for i in xrange(len(d_points)-1):
+			point = d_points[i]
+			point2 = d_points[i+1]
+			#print 'deb:double.vertex p1,p2', point, point2 #------------------------
+			delta = Mathutils.Vector(point2.loc) - Mathutils.Vector(point.loc)
+			if delta.length > minimal_dist:
+				 temp_points.append(point)
+			else:
+				dv_count+=1
+		#print 'deb:drawPoly2d double.vertex sort out! count=', dv_count #------------------------
+		temp_points.append(d_points[-1])  #------ incl. last vertex -------------
+		#if self.closed: temp_points.append(d_points[1])  #------ loop start vertex -------------
+		d_points = temp_points   #-----vertex.list without "double.vertices"
+		#print 'deb:drawPoly2d d_pointsList =after DV-outsorting=====:\n ', d_points #------------------------
+		return d_points
+
+
+	def tribles_out(self, settings, d_points):
+		"""routine to sort out of three_in_place.vertices-----------------------------
+		"""
+		minimal_dist = settings.var['dist_min'] * 0.1
+		dv_count = 0
+		temp_points = []
+		for i in xrange(len(d_points)-2):
+			point1 = d_points[i]
+			point2 = d_points[i+1]
+			point3 = d_points[i+2]
+			#print 'deb:double.vertex p1,p2', point, point2 #------------------------
+			delta12 = Mathutils.Vector(point2.loc) - Mathutils.Vector(point1.loc)
+			delta23 = Mathutils.Vector(point3.loc) - Mathutils.Vector(point2.loc)
+			if delta12.length < minimal_dist and delta23.length < minimal_dist:
+				dv_count+=1
+			else:
+				temp_points.append(point1)
+		#print 'deb:drawPoly2d double.vertex sort out! count=', dv_count #------------------------
+		point1 = d_points[-2]
+		point2 = d_points[-1]
+		delta12 = Mathutils.Vector(point2.loc) - Mathutils.Vector(point1.loc)
+		if delta12.length > minimal_dist:
+			temp_points.append(d_points[-2])  #------ incl. 2last vertex -------------
+		temp_points.append(d_points[-1])  #------ incl. 1last vertex -------------
+		#if self.closed: temp_points.append(d_points[1])  #------ loop start vertex -------------
+		d_points = temp_points   #-----vertex.list without "double.vertices"
+		#print 'deb:drawPoly2d d_pointsList =after DV-outsorting=====:\n ', d_points #------------------------
+		return d_points
+
+
 	def draw(self, settings):   #-------------%%%% DRAW POLYLINE %%%---------------
 		"""for POLYLINE: generate Blender_geometry.
 		"""
+		#print 'deb:drawPOLYLINE.START:----------------' #------------------------
+		#print 'deb:POLYLINEdraw self.pltype:', self.pltype #------------------------
+		#print 'deb:POLYLINEdraw self.points:\n', self.points #------------------------
 		ob = []
 		#---- 3dPolyFace - mesh with free topology
 		if self.pltype=='plface' and settings.drawTypes['plmesh']:
@@ -1036,22 +1112,30 @@ class Polyline:  #--------------------------------------------------------------
 		#---- 3dPolyMesh - mesh with ortogonal topology
 		elif self.pltype=='plmesh' and settings.drawTypes['plmesh']:
 			ob = self.drawPlMesh(settings)
+
 		#---- 2dPolyline - plane polyline with arc/wide/thic segments
 		elif self.pltype=='poly2d' and settings.drawTypes['polyline']:
-			if settings.var['plines_as'] == 5: # and self.spline:
+			if settings.var['plines_as'] in [5,6]: # and self.spline:
 				ob = self.drawPolyCurve(settings)
 			else:
 				ob = self.drawPoly2d(settings)
+
 		#---- 3dPolyline - non-plane polyline (thin segments = without arc/wide/thic)
 		elif self.pltype=='poly3d' and settings.drawTypes['pline3']:
-			if settings.var['plines3_as'] == 5: # and self.spline:
+			if settings.var['plines3_as'] in [5,6]: # and self.spline:
+				ob = self.drawPolyCurve(settings)
+			else:
+				ob = self.drawPoly2d(settings)
+
+		#---- Spline - curved polyline (thin segments = without arc/wide/thic)
+		elif self.pltype=='spline' and settings.drawTypes['spline']:
+			if settings.var['splines_as'] in [5,6]:
 				ob = self.drawPolyCurve(settings)
 			else:
 				ob = self.drawPoly2d(settings)
 		return ob
 
 
-
 	def drawPlFace(self, settings):  #---- 3dPolyFace - mesh with free topology
 		"""Generate the geometery of polyface.
 		"""
@@ -1065,6 +1149,10 @@ class Polyline:  #--------------------------------------------------------------
 			else:
 				points.append(point.loc)
 
+		if settings.var['plmesh_flip']:  # ----------------------
+			for face in faces:
+				face.reverse()
+				face = [face[-1]] + face[:-1]
 
 		#print 'deb:drawPlFace: len of points_list:\n', len(points)  #-----------------------
 		#print 'deb:drawPlFace: len of faces_list:\n', len(faces)  #-----------------------
@@ -1076,6 +1164,10 @@ class Polyline:  #--------------------------------------------------------------
 		ob = SCENE.objects.new(me) # create a new mesh_object
 		me.verts.extend(points) # add vertices to mesh
 		me.faces.extend(faces)   # add faces to the mesh
+		if settings.var['normals_out']:  # ----------------------
+			#me.flipNormals()
+			me.recalcNormals(0)
+			#me.update()
 		#print 'deb:drawPlFace: len of me.faces:\n', len(me.faces)  #-----------------------
 
 		if settings.var['meshSmooth_on']:  # ----------------------
@@ -1123,7 +1215,10 @@ class Polyline:  #--------------------------------------------------------------
 		ob = SCENE.objects.new(me) # create a new mesh_object
 		me.verts.extend([point.loc for point in self.points]) # add vertices to mesh
 		me.faces.extend(faces)   # add faces to the mesh
-
+		if settings.var['normals_out']:  # ----------------------
+			#me.flipNormals()
+			me.recalcNormals(0)
+			#me.update()
 		if settings.var['meshSmooth_on']:  # ----------------------
 			for i in xrange(len(faces)):
 				me.faces[i].smooth = True
@@ -1142,9 +1237,9 @@ class Polyline:  #--------------------------------------------------------------
 			#print 'deb:drawPoly2d exit, cause POLYLINE has less than 2 vertices' #---------
 			return
 
-		if self.spline: pline_typ = 'ps'	# Polyline-nurbSpline
-		elif self.curved: pline_typ = 'pc'  # Polyline-bezierCurve
-		else: pline_typ = 'pl'			  # Polyline
+		if self.spline: pline_typ = 'ps'	# Polyline-NURBSpline
+		elif self.curved: pline_typ = 'pc'	# Polyline-BezierCurve
+		else: pline_typ = 'pl'				# Polyline classic
 		obname = '%s_%s' %(pline_typ, self.layer)  # create object_name from layer name
 		obname = obname[:MAX_NAMELENGTH]
 		d_points = []
@@ -1160,6 +1255,10 @@ class Polyline:  #--------------------------------------------------------------
 					point.loc[2] = self.elevation
 				d_points.append(point)
 
+		#d_points = self.tribles_out(settings, d_points)
+		#d_points = self.doubles_out(settings, d_points)
+		#print 'deb:drawPolyCurve d_pointsList =after DV-outsorting=====:\n ', d_points #------------------------
+
 		thic = set_thick(self.thic, settings)
 		if thic != 0.0:   #hack: Blender<2.45 curve-extrusion
 			LocZ = d_points[0].loc[2]
@@ -1173,12 +1272,14 @@ class Polyline:  #--------------------------------------------------------------
 		pline = Curve.New(obname)   # create new curve data
 		#pline.setResolu(24) #--todo-----						
 
-		if self.spline:  # NURBSplines-----OK-----
+		if False: #old self.spline:  # NURBSplines-----OK-----
 			#print 'deb:polyline2dCurve.draw self.spline!' #---------------
 			weight1 = 0.5
 			weight2 = 1.0
-			# generate middlepoints except start/end-segments ---
-			if self.curvQBspline:
+			if self.curvQuadrati:
+				# Bezier-curve form simulated in NURBS-curve
+				# generate middlepoints except start/end-segments ---
+				#print 'deb:polyline2dCurve.draw extraQBspline!' #---------------
 				temp_points = []
 				point = d_points[0].loc
 				point.append(weight1)
@@ -1231,7 +1332,27 @@ class Polyline:  #--------------------------------------------------------------
 			else:
 				curve.flagU = 0 # Set curve not cyclic=open
 
-		elif  self.curved:  #--Bezier-curves---OK-------
+		if self.spline:  # NURBSplines-----OK-----
+			#print 'deb:polyline2dCurve.draw self.spline!' #---------------
+			nurbs_points = []
+			for d in d_points:
+				pkt = d.loc
+				pkt.append(d.weight)
+				nurbs_points.append(pkt)
+			firstpoint = nurbs_points[0]
+			curve = pline.appendNurb(firstpoint)
+			curve.setType(4) # set curvetype NURBS
+			for point in nurbs_points[1:]:
+				curve.append(point)
+			if self.closed:
+				curve.flagU = 1+0 # Set curve cyclic=close and uni
+			else:
+				curve.flagU = 0+2 # Set curve not cyclic=open
+			try: curve.orderU = 5 # works only with >2.46svn080625
+			except AttributeError: pass
+			#print 'deb: dir(curve):', dir(curve) #----------------
+
+		elif  False: #orig self.curved:  #--Bezier-curves---OK-------
 			#print 'deb:polyline2dCurve.draw self.curved!' #---------------
 			curve = pline.appendNurb(BezTriple.New(d_points[0]))
 			for p in d_points[1:]:
@@ -1245,7 +1366,45 @@ class Polyline:  #--------------------------------------------------------------
 				curve[0].handleTypes = [FREE, ALIGN]   #remi--todo-----
 				curve[-1].handleTypes = [ALIGN, FREE]   #remi--todo-----
 
-		else:	#--straight line- and arc-segments----OK------
+		elif  self.curved:  #--SPLINE as Bezier-curves---wip------
+			#print 'deb:polyline2dCurve.draw self.curved!' #---------------
+			begtangent, endtangent = None, None
+			if d_points[0].tangent:
+				begtangent = d_points[0]
+				d_points = d_points[1:]
+			if d_points[-1].tangent:
+				endtangent = d_points[-1]
+				d_points = d_points[:-1]
+			curve = pline.appendNurb(BezTriple.New(d_points[0]))
+			for p in d_points[1:]:
+				curve.append(BezTriple.New(p))
+			for point in curve:
+				point.handleTypes = [AUTO, AUTO]
+			#curve.setType(1) #Bezier curve
+			if self.closed:
+				curve.flagU = 5 #1 # Set curve cyclic=close
+			else:
+				curve.flagU = 4 #0 # Set curve not cyclic=open
+				if begtangent:
+					#print 'deb:polyline2dCurve.draw curve[0].vec:', curve[0].vec #-----
+					#print 'deb:polyline2dCurve.draw begtangent:', begtangent #-----
+					p0h1,p0,p0h2 = curve[0].vec 
+					p0h1 = [p0h1[i]+begtangent[i] for i in range(3)]
+					curve.__setitem__(0,BezTriple.New(p0h1+p0+p0h2))
+				curve[0].handleTypes = [FREE, ALIGN]   #remi--todo-----
+				if endtangent:
+					#print 'deb:polyline2dCurve.draw curve[-1].vec:', curve[-1].vec #-----
+					#print 'deb:polyline2dCurve.draw endtangent:', endtangent #-----
+					p0h1,p0,p0h2 = curve[-1].vec 
+					p0h2 = [p0h2[i]+endtangent[i] for i in range(3)]
+					#print 'deb:drawPlineCurve: p0h2:', p0h2 #----------
+					curve.__setitem__(-1,BezTriple.New(p0h1+p0+p0h2))
+					#print 'deb:polyline2dCurve.draw curve[-1].vec:', curve[-1].vec #-----
+				curve[-1].handleTypes = [ALIGN, FREE]   #remi--todo-----
+
+
+
+		else:	#-- only straight line- and arc-segments----OK------
 			#print 'deb:polyline2dCurve.draw curve:', curve #-----
 			points = []
 			arc_res = settings.var['curve_arc']
@@ -1403,8 +1562,10 @@ class Polyline:  #--------------------------------------------------------------
 		#print 'deb:drawPoly2d len of d_pointsList ====== ', len(d_points) #------------------------
 		#print 'deb:drawPoly2d d_pointsList ======:\n ', d_points #------------------------
 
+		d_points = self.doubles_out(settings, d_points)
+		#print 'deb:drawPolyCurve d_pointsList =after DV-outsorting=====:\n ', d_points #------------------------
 
-		# routine to sort out of "double.vertices" ------------------------------------
+		"""# routine to sort out of "double.vertices" ------------------------------------
 		minimal_dist =  settings.var['dist_min'] * 0.1
 		temp_points = []
 		for i in xrange(len(d_points)-1):
@@ -1419,6 +1580,7 @@ class Polyline:  #--------------------------------------------------------------
 		#if self.closed: temp_points.append(d_points[1])  #------ loop start vertex -------------
 		d_points = temp_points   #-----vertex.list without "double.vertices"
 		#print 'deb:drawPoly2d d_pointsList =after DV-outsorting=====:\n ', d_points #------------------------
+		"""
 
 		#print 'deb:drawPoly2d len of d_pointsList ====== ', len(d_points) #------------------------
 		if len(d_points) < 2:  #if too few vertex, then return
@@ -1836,12 +1998,16 @@ class Vertex(object):  #--------------------------------------------------------
 		self.swidth = None #0
 		self.ewidth = None #0
 		self.bulge = 0
+		self.tangent = False
+		self.weight =  1.0
 		if obj is not None:
 			if not obj.type == 'vertex':
 				raise TypeError, "Wrong type %s for vertex object!" %obj.type
 			self.type = obj.type
-			self.data = obj.data[:]
-			self.get_props(obj.data)
+#			self.data = obj.data[:]
+			self.get_props(obj)
+		else:
+			pass
 		#print 'deb:Vertex.init.END:----------------' #------------------------
 
 
@@ -1862,18 +2028,22 @@ class Vertex(object):  #--------------------------------------------------------
 
 		self.flags  = getit(data, 70, 0) # flags
 		self.curved = self.flags&1   # Bezier-curve-fit:additional-vertex
-		self.curv_t = self.flags&2   # Bezier-curve-fit:tangent exists
-		self.spline = self.flags&8   # Bspline-fit:additional-vertex
-		self.splin2 = self.flags&16  # Bspline-fit:control-vertex
+		self.curved_t = self.flags&2   # Bezier-curve-fit:tangent exists
+		self.spline = self.flags&8   # NURBSpline-fit:additional-vertex
+		self.spline_c = self.flags&16  # NURBSpline-fit:control-vertex
 		self.poly3d = self.flags&32  # polyline3d:control-vertex
 		self.plmesh = self.flags&64  # polymesh3d:control-vertex
 		self.plface = self.flags&128 # polyface
 
 		# if PolyFace.Vertex with Face_definition
-		if self.curv_t:
-			self.curv_tangent =  getit(data, 50, None) # curve_tangent
+		if self.curved_t:
+			self.curve_tangent =  getit(data, 50, None) # curve_tangent
+			if not self.curve_tangent==None:
+				self.tangent = True
+		#elif self.spline_c: # NURBSpline:control-vertex
+		#	self.weight =  getit(data, 41, 1.0) # weight od control point
 
-		if self.plface and not self.plmesh:
+		elif self.plface and not self.plmesh:
 			v1 = getit(data, 71, 0) # polyface:Face.vertex 1.
 			v2 = getit(data, 72, 0) # polyface:Face.vertex 2.
 			v3 = getit(data, 73, 0) # polyface:Face.vertex 3.
@@ -1938,8 +2108,7 @@ class Vertex(object):  #--------------------------------------------------------
 class Spline(Polyline):  #-----------------------------------------------------------------
 	"""Class for objects representing dxf SPLINEs.
 	"""
-	def __init__(self, obj):
-		"""Expects an entity object of type spline as input.
+	"""Expects an entity object of type spline as input.
 100 - Subclass marker (AcDbSpline)
 210,220, 230  - Normal vector (omitted if the spline is nonplanar) X,Y,Z values of normal vector
 70 - Spline flag (bit coded):
@@ -1963,12 +2132,13 @@ class Spline(Polyline):  #------------------------------------------------------
 DXF: X value; APP: 3D point, Y and Z values of control points (in WCS) (one entry per control point)
 11,21, 31 - Fit points (in WCS) one entry per fit point.
  X,Y,Z values of fit points (in WCS) (one entry per fit point)
-		"""
+	"""
+	def __init__(self, obj):
 		#print 'deb:Spline.START:----------------' #------------------------
 		if not obj.type == 'spline':
 			raise TypeError, "Wrong type %s for spline object!" %obj.type
 		self.type = obj.type
-		self.data = obj.data[:]
+#		self.data = obj.data[:]
 
 		# required data
 		self.num_points = obj.get_type(73)[0]
@@ -1992,30 +2162,42 @@ DXF: X value; APP: 3D point, Y and Z values of control points (in WCS) (one entr
 		self.planar = self.flags & 8   # Planar
 		self.linear = self.flags & 16  # Linear (and Planar)
 
-		self.degree = getit(obj, 71, 0) # Degree of the spline curve
-		self.curvNormal = False
-		self.curvQBspline = False
-		self.curvCBspline = False
+		self.curvNoFitted = False
+		self.curvQuadrati = False
+		self.curvCubicBsp = False
 		self.curvBezier = False
-		if   self.degree == 0: self.curvNormal = True
-		elif self.degree == 1: self.curvQBspline = True
-		elif self.degree == 2: self.curvCBspline = True
+		self.degree = getit(obj, 71, 0) # Degree of the spline curve
+		if   self.degree == 0: self.curvNoFitted = True
+		elif self.degree == 1: self.curvQuadrati = True
+		elif self.degree == 2: self.curvCubicBsp = True
 		#elif self.degree == 3: self.curvBezier = True
-		elif self.degree == 3: self.spline = True
+		#elif self.degree == 3: self.spline = True
 	
-		self.num_knots = getit(obj, 72, 0) # Number of knots
-		self.num_contr = getit(obj, 73, 0) # Number of control points
-		self.num_fitpk = getit(obj, 74, 0) # Number of fit points (if any)
+		self.knotpk_len = getit(obj, 72, 0) # Number of knots
+		self.ctrlpk_len = getit(obj, 73, 0) # Number of control points
+		self.fit_pk_len = getit(obj, 74, 0) # Number of fit points (if any)
 
-		self.layer = getit(obj.data, 8, None)
-		self.extrusion = get_extrusion(obj.data)
+		#print 'deb:Spline self.fit_pk_len=', self.fit_pk_len #------------------------
+		#self.fit_pk_len = 0 # temp for debug
+		if self.fit_pk_len and 'spline_as'==5:
+			self.spline = False
+			self.curved = True
+		else:
+			self.spline = True
+			self.curved = False
+
+		self.knotpk_tol = getit(obj, 42, 0.0000001) # Knot tolerance (default = 0.0000001)
+		self.ctrlpk_tol = getit(obj, 43, 0.0000001) # Control-point tolerance (default = 0.0000001)
+		self.fit_pk_tol = getit(obj, 44, 0.0000000001) # Fit tolerance (default = 0.0000000001)
+
+		self.layer = getit(obj, 8, None)
+		self.extrusion = get_extrusion(obj)
+
+		self.pltype = 'spline'   # spline is a 2D- or 3D-polyline
 
 		self.points = self.get_points(obj.data)
-
-		if self.planar: self.pltype = 'poly2d'
-		else: self.pltype = 'poly3d'
-		self.curved = False
-		#self.curved = False
+		#self.knots_val = self.get_knots_val(obj.data) # 40 - Knot value (one entry per knot)
+		#self.knots_wgh = self.get_knots_wgh(obj.data) # 41 - Weight (default 1)
 
 		#print 'deb:Spline obj.data:\n', obj.data #------------------------
 		#print 'deb:Spline self.points:\n', self.points #------------------------
@@ -2032,61 +2214,70 @@ DXF: X value; APP: 3D point, Y and Z values of control points (in WCS) (one entr
 		20:yvalue
 		for each vert
 		"""
-		num = self.num_contr
 		point = None
 		points = []
+		pointend = None
 		#point = Vertex()
-		for item in data:
-			#print 'deb:Spline item:', item #------------------------
-			if item[0] == 10:   # control point
-				if point: points.append(point)
-				point = Vertex()
-				point.curved = True
-				point.x = item[1]
-			elif item[0] == 20: # 20 = y
-				point.y = item[1]
-			elif item[0] == 30: # 30 = z
-				point.z = item[1]
+		if self.spline: # NURBSpline definition
+			for item in data:
+				#print 'deb:Spline.get_points spilne_item:', item #------------------------
+				if item[0] == 10:   # control point
+					if point: points.append(point)
+					point = Vertex()
+					point.curved = True
+					point.x = item[1]
+				elif item[0] == 20: # 20 = y
+					point.y = item[1]
+				elif item[0] == 30: # 30 = z
+					point.z = item[1]
+				elif item[0] == 41: # 41 = weight
+					point.weight = item[1]
+					#print 'deb:Spline.get_points control point:', point #------------------------
 
-			elif item[0] == 11:   # fit point
-				if point: points.append(point)
-				point = Vertex()
-				point.curved = True
-				point.x = item[1]
-			elif item[0] == 21: # 20 = y
-				point.y = item[1]
-			elif item[0] == 31: # 30 = z
-				point.z = item[1]
+		elif self.curved: # Bezier definition
+			for item in data:
+				#print 'deb:Spline.get_points curved_item:', item #------------------------
+				if item[0] == 11:   # fit point
+					if point: points.append(point)
+					point = Vertex()
+					point.tangent = False
+					point.x = item[1]
+				elif item[0] == 21: # 20 = y
+					point.y = item[1]
+				elif item[0] == 31: # 30 = z
+					point.z = item[1]
+					#print 'deb:Spline.get_points fit point:', point #------------------------
 
-			elif item[0] == 12:   # start tangent
-				if point: points.append(point)
-				point = Vertex()
-				point.curved = True
-				point.x = item[1]
-			elif item[0] == 22: # = y
-				point.y = item[1]
-			elif item[0] == 32: # = z
-				point.z = item[1]
+				elif item[0] == 12:   # start tangent
+					if point: points.append(point)
+					point = Vertex()
+					point.tangent = True
+					point.x = item[1]
+				elif item[0] == 22: # = y
+					point.y = item[1]
+				elif item[0] == 32: # = z
+					point.z = item[1]
+					#print 'deb:Spline.get_points fit begtangent:', point #------------------------
 
-			elif item[0] == 13:   # end tangent
-				if point: points.append(point)
-				point = Vertex()
-				point.curved = True
-				point.x = item[1]
-			elif item[0] == 23: # 20 = y
-				point.y = item[1]
-			elif item[0] == 33: # 30 = z
-				point.z = item[1]
+				elif item[0] == 13:   # end tangent
+					if point: points.append(point)
+					pointend = Vertex()
+					pointend.tangent = True
+					pointend.x = item[1]
+				elif item[0] == 23: # 20 = y
+					pointend.y = item[1]
+				elif item[0] == 33: # 30 = z
+					pointend.z = item[1]
+					#print 'deb:Spline.get_points fit endtangent:', pointend #------------------------
 		points.append(point)
+		if self.curved and pointend:
+			points.append(pointend)
 		#print 'deb:Spline points:\n', points #------------------------
 		return points
 
-
-
 	def __repr__(self):
 		return "%s: layer - %s, points - %s" %(self.__class__.__name__, self.layer, self.points)
 
-
 	
 
 class LWpolyline(Polyline):  #-------------------------------------------------------------
@@ -2099,7 +2290,7 @@ class LWpolyline(Polyline):  #--------------------------------------------------
 		if not obj.type == 'lwpolyline':
 			raise TypeError, "Wrong type %s for polyline object!" %obj.type
 		self.type = obj.type
-		self.data = obj.data[:]
+#		self.data = obj.data[:]
 
 		# required data
 		self.num_points = obj.get_type(90)[0]
@@ -2118,8 +2309,8 @@ class LWpolyline(Polyline):  #--------------------------------------------------
 		self.flags = getit(obj, 70, 0)
 		self.closed = self.flags&1 # byte coded, 1 = closed, 128 = plinegen
 
-		self.layer = getit(obj.data, 8, None)
-		self.extrusion = get_extrusion(obj.data)
+		self.layer = getit(obj, 8, None)
+		self.extrusion = get_extrusion(obj)
 
 		self.points = self.get_points(obj.data)
 
@@ -2167,72 +2358,10 @@ class LWpolyline(Polyline):  #--------------------------------------------------
 		return points
 
 
-
 	def __repr__(self):
 		return "%s: layer - %s, points - %s" %(self.__class__.__name__, self.layer, self.points)
 
 
-	def draw_old(self, settings):
-		"""for LWPOLYLINE: generate Blender_geometry.
-		"""
-		#print 'deb:LWpolyline.draw.START:----------------' #------------------------
-		points = []
-		obname = 'lw_%s' %self.layer  # create object name from layer name
-		obname = obname[:MAX_NAMELENGTH]
-		#settings.var['curves_on'] == True
-		#print 'deb:index_len: ', len(self.points) #------------------
-		for i, point in enumerate(self.points):
-			#print 'deb:index: ', i #------------------
-			if not point.bulge:
-				points.append(point.loc)
-			elif point.bulge and not self.closed and i == len(self.points)-1:
-				points.append(point.loc)
-			elif point.bulge:	 #
-				if i == len(self.points)-1:
-					point2 = self.points[0]
-				else:
-					point2 = self.points[i+1]
-				arc_res = settings.var['arc_res']/sqrt(settings.var['arc_rad'])
-				verts, center = calcBulge(point, point2, arc_res)
-#			   if i == len(self.points)-1:
-#				   if self.closed:
-#					   verts.pop() #remove last(=first) vertex
-#			   else:
-#				   verts.pop() #remove last vertex, because this point will be writen as the next vertex
-				points.extend(verts)
-
-		thic = self.thic
-		if settings.var['thick_force'] and thic == 0: thic = settings.var['thick_min']
-		if settings.var['thick_on'] and thic != 0:
-			len1 = len(points)
-			points.extend([[point[0], point[1], point[2]+thic] for point in points])
-			faces = []
-			#print 'deb:len1:', len1  #-----------------------
-			faces = [[num, num+1, num+len1+1, num+len1] for num in xrange(len1 - 1)]
-			if self.closed:
-				faces.append([len1-1, 0, len1, 2*len1-1])
-			#print 'deb:faces_list:\n', faces  #-----------------------
-			me = Mesh.New(obname)		  # create a new mesh
-			ob = SCENE.objects.new(me) # create a new mesh_object
-			me.verts.extend(points) # add vertices to mesh
-			me.faces.extend(faces)   # add faces to the mesh
-		else:
-			edges = [[num, num+1] for num in xrange(len(points)-1)]
-			if self.closed:
-				edges.append([len(points)-1, 0])
-			#print 'deb:edges_list:\n', edges  #-----------------------
-			me = Mesh.New(obname)		  # create a new mesh
-			ob = SCENE.objects.new(me) # create a new mesh_object
-			me.verts.extend(points) # add vertices to mesh
-			me.edges.extend(edges)   # add edges to the mesh
-
-		ob.LocZ = self.elevation
-		transform(self.extrusion, 0, ob)
-
-		#print 'deb:LWpolyline.draw.END:----------------' #------------------------
-		return ob
-
-
 class Text:  #-----------------------------------------------------------------
 	"""Class for objects representing dxf TEXT.
 	"""
@@ -2242,7 +2371,7 @@ class Text:  #-----------------------------------------------------------------
 		if not obj.type == 'text':
 			raise TypeError, "Wrong type %s for text object!" %obj.type
 		self.type = obj.type
-		self.data = obj.data[:]
+#		self.data = obj.data[:]
 
 		# required data
 		self.height = 1.7 * obj.get_type(40)[0]  #text.height
@@ -2274,14 +2403,13 @@ class Text:  #-----------------------------------------------------------------
 		#3=aligned, 4=middle, 5=fit
 		self.halignment = getit(obj, 72, 0)
 
-		self.layer = getit(obj.data, 8, None)
-		self.loc1, self.loc2 = self.get_loc(obj.data)
+		self.layer = getit(obj, 8, None)
+		self.loc1, self.loc2 = self.get_loc(obj)
 		if self.loc2[0] != None and self.halignment != 5: 
 			self.loc = self.loc2
 		else:
 			self.loc = self.loc1
-		self.extrusion = get_extrusion(obj.data)
-
+		self.extrusion = get_extrusion(obj)
 
 
 	def get_loc(self, data):
@@ -2390,13 +2518,13 @@ class Mtext:  #-----------------------------------------------------------------
 		if not obj.type == 'mtext':
 			raise TypeError, "Wrong type %s for mtext object!" %obj.type
 		self.type = obj.type
-		self.data = obj.data[:]
+#		self.data = obj.data[:]
 
 		# required data
 		self.height = obj.get_type(40)[0]
 		self.width = obj.get_type(41)[0]
 		self.alignment = obj.get_type(71)[0] # alignment 1=TL, 2=TC, 3=TR, 4=ML, 5=MC, 6=MR, 7=BL, 8=BC, 9=BR
-		self.value = self.get_text(obj.data) # The text string value
+		self.value = self.get_text(obj) # The text string value
 
 		# optional data (with defaults)
 		self.space = getit(obj, 67, 0)
@@ -2406,9 +2534,9 @@ class Mtext:  #-----------------------------------------------------------------
 		self.width_factor = getit(obj, 42, 1) # Scaling factor along local x axis
 		self.line_space = getit(obj, 44, 1) # percentage of default
 
-		self.layer = getit(obj.data, 8, None)
-		self.loc = self.get_loc(obj.data)
-		self.extrusion = get_extrusion(obj.data)
+		self.layer = getit(obj, 8, None)
+		self.loc = self.get_loc(obj)
+		self.extrusion = get_extrusion(obj)
 
 
 	def get_text(self, data):
@@ -2487,7 +2615,7 @@ class Circle:  #----------------------------------------------------------------
 		if not obj.type == 'circle':
 			raise TypeError, "Wrong type %s for circle object!" %obj.type
 		self.type = obj.type
-		self.data = obj.data[:]
+#		self.data = obj.data[:]
 
 		# required data
 		self.radius = obj.get_type(40)[0]
@@ -2497,9 +2625,9 @@ class Circle:  #----------------------------------------------------------------
 		self.thic =  getit(obj, 39, 0)
 		self.color_index = getit(obj, 62, BYLAYER)
 
-		self.layer = getit(obj.data, 8, None)
-		self.loc = self.get_loc(obj.data)
-		self.extrusion = get_extrusion(obj.data)
+		self.layer = getit(obj, 8, None)
+		self.loc = self.get_loc(obj)
+		self.extrusion = get_extrusion(obj)
 
 
 
@@ -2700,7 +2828,7 @@ class Arc:  #-----------------------------------------------------------------
 		if not obj.type == 'arc':
 			raise TypeError, "Wrong type %s for arc object!" %obj.type
 		self.type = obj.type
-		self.data = obj.data[:]
+#		self.data = obj.data[:]
 
 		# required data
 		self.radius = obj.get_type(40)[0]
@@ -2712,9 +2840,9 @@ class Arc:  #-----------------------------------------------------------------
 		self.thic =  getit(obj, 39, 0)
 		self.color_index = getit(obj, 62, BYLAYER)
 
-		self.layer = getit(obj.data, 8, None)
-		self.loc = self.get_loc(obj.data)
-		self.extrusion = get_extrusion(obj.data)
+		self.layer = getit(obj, 8, None)
+		self.loc = self.get_loc(obj)
+		self.extrusion = get_extrusion(obj)
 		#print 'deb:Arc__init__: center, radius, start, end:\n', self.loc, self.radius, self.start_angle, self.end_angle  #---------
 
 
@@ -2898,7 +3026,7 @@ class BlockRecord:  #-----------------------------------------------------------
 		if not obj.type == 'block_record':
 			raise TypeError, "Wrong type %s for block_record object!" %obj.type
 		self.type = obj.type
-		self.data = obj.data[:]
+#		self.data = obj.data[:]
 
 		# required data
 		self.name =  getit(obj, 2, None)
@@ -2954,8 +3082,8 @@ class Block:  #-----------------------------------------------------------------
 		self.entities = dxfObject('block_contents') #creates empty entities_container for this block
 		self.entities.data = objectify([ent for ent in obj.data if type(ent) != list])
 
-		self.layer = getit(obj.data, 8, None)
-		self.loc = self.get_loc(obj.data)
+		self.layer = getit(obj, 8, None)
+		self.loc = self.get_loc(obj)
 
 		#print 'deb:Block %s data:\n%s' %(self.name, self.data) #------------
 		#print 'deb:Block %s self.entities.data:\n%s' %(self.name, self.entities.data) #------------
@@ -2999,11 +3127,11 @@ class Insert:  #----------------------------------------------------------------
 		self.space = getit(obj, 67, 0)
 		self.color_index = getit(obj, 62, BYLAYER)
 
-		self.layer = getit(obj.data, 8, None)
-		self.loc = self.get_loc(obj.data)
-		self.scale = self.get_scale(obj.data)
-		self.rows, self.columns = self.get_array(obj.data)
-		self.extrusion = get_extrusion(obj.data)
+		self.layer = getit(obj, 8, None)
+		self.loc = self.get_loc(obj)
+		self.scale = self.get_scale(obj)
+		self.rows, self.columns = self.get_array(obj)
+		self.extrusion = get_extrusion(obj)
 
 		#self.flags = getit(obj.data, 66, 0) #
 		#self.attrib = self.flags & 1
@@ -3205,7 +3333,7 @@ class Ellipse:  #---------------------------------------------------------------
 		if not obj.type == 'ellipse':
 			raise TypeError, "Wrong type %s for ellipse object!" %obj.type
 		self.type = obj.type
-		self.data = obj.data[:]
+#		self.data = obj.data[:]
 
 		# required data
 		self.ratio = obj.get_type(40)[0] # Ratio of minor axis to major axis
@@ -3217,10 +3345,10 @@ class Ellipse:  #---------------------------------------------------------------
 		self.thic =  getit(obj, 39, 0.0)
 		self.color_index = getit(obj, 62, BYLAYER)
 
-		self.layer = getit(obj.data, 8, None)
-		self.loc = self.get_loc(obj.data)
-		self.major = self.get_major(obj.data)
-		self.extrusion = get_extrusion(obj.data)
+		self.layer = getit(obj, 8, None)
+		self.loc = self.get_loc(obj)
+		self.major = self.get_major(obj)
+		self.extrusion = get_extrusion(obj)
 
 
 	def get_loc(self, data):
@@ -3468,14 +3596,14 @@ class Face:  #-----------------------------------------------------------------
 		if not obj.type == '3dface':
 			raise TypeError, "Wrong type %s for 3dface object!" %obj.type
 		self.type = obj.type
-		self.data = obj.data[:]
+#		self.data = obj.data[:]
 
 		# optional data (with defaults)
 		self.space = getit(obj, 67, 0)
 		self.color_index = getit(obj, 62, BYLAYER)
 
-		self.layer = getit(obj.data, 8, None)
-		self.points = self.get_points(obj.data)
+		self.layer = getit(obj, 8, None)
+		self.points = self.get_points(obj)
 
 
 	def get_points(self, data):
@@ -3582,11 +3710,11 @@ type_map = {
 	'point':Point,
 	'3dface':Face,
 	'line':Line,
-#   'mline':MLine,
+#	'mline':MLine,
 	'polyline':Polyline,
 	'lwpolyline':LWpolyline,
 	'spline':Spline,
-#   'region':Region,
+#	'region':Region,
 	'trace':Solid,
 	'solid':Solid,
 	'text':Text,
@@ -3623,12 +3751,12 @@ def objectify(data):  #---------------------------------------------------------
 				if item.type == 'vertex':
 					#print 'deb:objectify gosub Vertex--------' #-------------
 					v = Vertex(item)
-					if pline.spline: # if Bspline-curve
+					if pline.spline: # if NURBSpline-curve
 						# then for Blender-mesh  filter only additional_vertices
 						# OR
 						# then for Blender-curve filter only spline_control_vertices
-						if (v.spline and not curves_on) or (curves_on and v.splin2): #correct for real NURBS-import
-						#if (v.spline and not curves_on) or (curves_on and not v.splin2): #fake for Bezier-emulation of NURBS-import
+						if (v.spline and not curves_on) or (curves_on and v.spline_c): #correct for real NURBS-import
+						#if (v.spline and not curves_on) or (curves_on and not v.spline_c): #fake for Bezier-emulation of NURBS-import
 							pline.points.append(v)
 					elif pline.curved:  # if Bezier-curve
 						# then for Blender-mesh filter only curve_additional_vertices
@@ -3685,7 +3813,7 @@ class MatColors:  #-------------------------------------------------------------
 	the material.
 	"""
 
-	def __init__(self, layersmap):
+	def __init__(self):
 		"""Expects a map - a dictionary mapping layer names to layers.
 		"""
 		#self.layersmap = layersmap  # a dictionary of layername:layerobject
@@ -3709,8 +3837,9 @@ class MatColors:  #-------------------------------------------------------------
 				#layer = Layer(name=color, color=256, frozen=False)
 				#layersmap[color] = layer
 				#color = 0
-			if layersmap: color = layersmap[color].color
-		if color == 256:  # color 0 = BYLAYER
+			if color in layersmap.keys():
+				color = layersmap[color].color
+		if color == 256:  # color 256 = BYLAYER
 			#--todo-- should looking for color of LAYER
 			#if layersmap: color = layersmap[color].color
 			color = 3
@@ -3749,7 +3878,7 @@ class MatLayers:  #-------------------------------------------------------------
 	the material.
 	"""
 
-	def __init__(self, layersmap):
+	def __init__(self):
 		"""Expects a map - a dictionary mapping layer names to layers.
 		"""
 		#self.layersmap = layersmap  # a dictionary of layername:layer
@@ -3896,6 +4025,11 @@ class Settings:  #--------------------------------------------------------------
 						   '0'
 						  ]
 
+		self.var['groupFilter_on'] = False   #deb:remi------------
+		self.acceptedLayers = ['3',
+						   '0'
+						  ]
+
 		#self.var['blockFilter_on'] = 0   #deb:remi------------
 		self.acceptedBlocks = ['WALL_1871',
 						   'BOX02'
@@ -3953,8 +4087,8 @@ class Settings:  #--------------------------------------------------------------
 		if self.var['optimization'] == 0: self.var['one_mesh_on'] = 0
 		# The section:tables may be partialy or completely missing.
 		self.layersTable = False
-		self.colMaterials = MatColors({}) #A container for dxf-color based materials
-		self.layMaterials = MatLayers({}) #A container for dxf-layer based materials
+		self.colMaterials = MatColors() #A container for dxf-color based materials
+		self.layMaterials = MatLayers() #A container for dxf-layer based materials
 		#self.collayMaterials = MatColLayers({}) #A container for dxf-color+layer based materials
 		global layersmap, layernamesmap
 		layersmap, layernamesmap = {}, {}
@@ -3974,8 +4108,8 @@ class Settings:  #--------------------------------------------------------------
 			if layers: #----------------------------------
 				# Read the layers table and get the layer colors
 				layersmap, layernamesmap = getLayersmap(layers)
-				self.colMaterials = MatColors(layersmap)
-				self.layMaterials = MatLayers(layersmap)
+				#self.colMaterials = MatColors()
+				#self.layMaterials = MatLayers()
 			else:
 				self.write("File contains no table:layers!")
 
@@ -4441,19 +4575,20 @@ def rotXY_Vec(rotation, vec):  #------------------------------------------------
 
 
 
-def getLayersmap(layers):  #------------------------------------------------------
+def getLayersmap(dxflayers):  #------------------------------------------------------
 	"""Build two dictionaries: 1.layername:layer object, and 2.layername:layername_short
+	gets set of layers from TABLES SECTION LAYERS
 	"""
 	layersmap = {}
 	layernamesmap = {}
-	for item in layers.data:
+	for item in dxflayers.data:
 		if type(item) != list and item.type == 'layer':
 			layersmap[item.name] = item
 			layername_short = item.name[:MAX_NAMELENGTH-1]
 			i = 0  #sufix for layernames cause Blender-objectnames-limits
 			while layername_short in layernamesmap.keys():
 				i += 1
-				suffix = str(i)
+				suffix = str(i) #--todo--set zero-leading number format
 				layername_short = layername_short[:-2] + suffix
 			layernamesmap[item.name] = layername_short
 
@@ -4546,6 +4681,7 @@ def drawer(_type, entities, settings, block_def):  #----------------------------
 
 	If 'block_def': the entities are to be added to the Blender 'group'.
 	"""
+	global layersmap, layersmapshort
 	#print 'deb:drawer _type, entities:\n ', _type, entities  #-----------------------
 
 	if entities:
@@ -4579,6 +4715,21 @@ def drawer(_type, entities, settings, block_def):  #----------------------------
 			#entities = [entity for entity in entities if entity.layer[0] in ['M','3','0'] and not entity.layer.endswith('H')]
 			entities = [entity for entity in entities if entity.layer in settings.acceptedLayers]
 
+		# patch for incomplete layer table in HL2-DXF-files 
+		if layersmap:
+			for entity in entities:
+				oblayer = entity.layer
+				if oblayer not in layersmap.keys():
+					layer_obj = Layer(None, name=oblayer)
+					layersmap[oblayer] = layer_obj
+					layername_short = oblayer[:MAX_NAMELENGTH-1]
+					i = 0  #sufix for layernames cause Blender-objectnames-limits
+					while layername_short in layernamesmap.keys():
+						i += 1
+						suffix = str(i) #--todo--set zero-leading number format
+						layername_short = layername_short[:-2] + suffix
+					layernamesmap[oblayer] = layername_short
+
 		# filtering only objects on not-frozen layers
 		if layersmap and not settings.var['layFrozen_on']:
 			entities = [entity for entity in entities if not layersmap[entity.layer].frozen]
@@ -4785,7 +4936,7 @@ def setMaterial_from(entity, ob, settings, block_def):  #-----------------------
 			mat = settings.colMaterials(entity.color_index)
 
 	elif settings.var['material_from'] == 2: # 2= material from layer_name
-		mat = settings.layMaterials(layername = entity.layer)
+		mat = settings.layMaterials(layername=entity.layer)
 
 	elif settings.var['material_from'] == 3: # 3= material from layer+color
 		mat = settings.layMaterials(layername=entity.layer, color=entity.color_index)
@@ -5104,7 +5255,7 @@ EVENT_HELP = 9
 EVENT_PRESETCURV = 10
 EVENT_PRESETS = 11
 EVENT_DXF_DIR = 12
-EVENT_DXF_NAME = 13
+#         = 13
 EVENT_LIST = 14
 EVENT_ORIGIN = 15
 EVENT_SCALE = 16
@@ -5119,12 +5270,12 @@ GUI_B = {}  # GUI-buttons dictionary for drawingTypes
 # settings default, initialize ------------------------
 
 points_as_menu  = "convert to: %t|empty %x1|mesh.vertex %x2|thin sphere %x3|thin box %x4|*curve.vertex %x5"
-lines_as_menu   = "convert to: %t|*edge %x1|mesh %x2|*thin cylinder %x3|thin box %x4|curve %x5"
+lines_as_menu   = "convert to: %t|*edge %x1|mesh %x2|*thin cylinder %x3|thin box %x4|Bezier-curve %x5|NURBS-curve %x6"
 mlines_as_menu  = "convert to: %t|*edge %x1|*mesh %x2|*thin cylinder %x3|*thin box %x|*curve %x5"
-plines_as_menu  = "convert to: %t|*edge %x1|mesh %x2|*thin cylinder %x3|*thin box %x4|curve %x5"
-splines_as_menu  = "convert to: %t|*edge %x1|mesh %x2|*thin cylinder %x3|*thin box %x4|curve %x5"
-plines3_as_menu = "convert to: %t|*edge %x1|mesh %x2|*thin cylinder %x3|*thin box %x4|curve %x5"
-plmesh_as_menu  = "convert to: %t|*edge %x1|mesh %x2"
+plines_as_menu  = "convert to: %t|*edge %x1|mesh %x2|*thin cylinder %x3|*thin box %x4|Bezier-curve %x5|NURBS-curve %x6"
+splines_as_menu = "convert to: %t|mesh %x2|*thin cylinder %x3|*thin box %x4|Bezier-curve %x5|NURBS-curve %x6"
+plines3_as_menu = "convert to: %t|*edge %x1|mesh %x2|*thin cylinder %x3|*thin box %x4|Bezier-curve %x5|NURBS-curve %x6"
+plmesh_as_menu  = "convert to: %t|*edge %x1|mesh %x2|NURBS-surface %x6"
 solids_as_menu  = "convert to: %t|*edge %x1|mesh %x2"
 blocks_as_menu  = "convert to: %t|dupliGroup %x1|*real.Group %x2|*exploded %x3"
 texts_as_menu   = "convert to: %t|text %x1|*mesh %x2|*curve %x5"
@@ -5166,6 +5317,9 @@ keywords_org = {
 	'xref_on' : 1,
 	'block_nn': 0,
 	'blockFilter_on': 0,
+	'layerFilter_on': 0,
+	'colorFilter_on': 0,
+	'groupFilter_on': 0,
 	'newScene_on' : 1,
 	'target_layer' : TARGET_LAYER,
 	'group_bylayer_on' : GROUP_BYLAYER,
@@ -5187,7 +5341,6 @@ keywords_org = {
 	'dist_force': 0,
 	'material_on': 1,
 	'material_from': 2,
-	'pl_3d'  : 1,
 	'fill_on'	: 1,
 	'meshSmooth_on': 1,
 	'curve_res' : CURV_RESOLUTION,
@@ -5197,6 +5350,8 @@ keywords_org = {
 	'thin_res'  : THIN_RESOLUTION,
 	'pl_trim_max' : TRIM_LIMIT,
 	'pl_trim_on': 1,
+	'plmesh_flip': 0,
+	'normals_out': 0,
 	'paper_space_on': 0,
 	'layFrozen_on': 0,
 	'Z_force_on': 0,
@@ -5205,7 +5360,7 @@ keywords_org = {
 	'lines_as'  : 2,
 	'mlines_as' : 2,
 	'plines_as' : 2,
-	'splines_as' : 2,
+	'splines_as' : 5,
 	'plines3_as': 2,
 	'plmesh_as' : 2,
 	'solids_as' : 2,
@@ -5221,7 +5376,7 @@ drawTypes_org = {
 	'ellipse': 1,
 	'mline' : 0,
 	'polyline': 1,
-	'spline': 0,
+	'spline': 1,
 	'plmesh': 1,
 	'pline3': 1,
 	'lwpolyline': 1,
@@ -5244,6 +5399,9 @@ for k, v in drawTypes_org.iteritems():
 	GUI_B[k] = Draw.Create(v)
 #print 'deb:init GUI_A: ', GUI_A #---------------
 #print 'deb:init GUI_B: ', GUI_B #---------------
+
+model_space_on = Draw.Create(1)
+
 # initialize settings-object controls how dxf entities are drawn
 settings = Settings(keywords_org, drawTypes_org)
 
@@ -5397,12 +5555,13 @@ def resetDefaultConfig():  #-----------------------------------------------
 	updateConfig(keywords_org, drawTypes_org)
 
 
-def presetConfig_curv():  #-----------------------------------------------
+def presetConfig_curv(activate):  #-----------------------------------------------
 	"""Sets settings/config/materials for curve representation.
 
 	"""
 	global GUI_A
-	if GUI_A['curves_on'].val == 1:
+	if activate:
+		GUI_A['curves_on'].val = 1
 		GUI_A['points_as'].val = 5
 		GUI_A['lines_as'].val  = 5
 		GUI_A['mlines_as'].val = 5
@@ -5410,11 +5569,12 @@ def presetConfig_curv():  #-----------------------------------------------
 		GUI_A['splines_as'].val = 5
 		GUI_A['plines3_as'].val = 5
 	else:
+		GUI_A['curves_on'].val = 0
 		GUI_A['points_as'].val = 2
 		GUI_A['lines_as'].val  = 2
 		GUI_A['mlines_as'].val = 2
 		GUI_A['plines_as'].val = 2
-		GUI_A['splines_as'].val = 2
+		GUI_A['splines_as'].val = 6
 		GUI_A['plines3_as'].val = 2
 
 	
@@ -5422,7 +5582,7 @@ def resetDefaultConfig_2D():  #-----------------------------------------------
 	"""Sets settings/config/materials to defaults 2D.
 
 	"""
-#	presetConfig_curv()
+	presetConfig_curv(1)
 	keywords2d = {
 		'views_on' : 0,
 		'cams_on'  : 0,
@@ -5434,7 +5594,6 @@ def resetDefaultConfig_2D():  #-----------------------------------------------
 		'width_force': 0,
 		'dist_on'   : 1,
 		'dist_force': 0,
-		'pl_3d'  : 0,
 		'fill_on'	: 0,
 		'pl_trim_on': 1,
 		'Z_force_on': 0,
@@ -5452,9 +5611,9 @@ def resetDefaultConfig_2D():  #-----------------------------------------------
 		'ellipse': 1,
 		'mline' : 0,
 		'polyline': 1,
-		'spline': 0,
+		'spline': 1,
 		'plmesh': 0,
-		'pline3': 0,
+		'pline3': 1,
 		'lwpolyline': 1,
 		'text'  : 1,
 		'mtext' : 0,
@@ -5472,8 +5631,11 @@ def resetDefaultConfig_3D():  #-----------------------------------------------
 	"""Sets settings/config/materials to defaults 3D.
 
 	"""
-#	presetConfig_curv()
+	presetConfig_curv(0)
 	keywords3d = {
+#		'views_on' : 1,
+#		'cams_on'  : 1,
+#		'lights_on' : 1,
 		'vGroup_on' : 1,
 		'thick_on'  : 1,
 		'thick_force': 0,
@@ -5481,7 +5643,6 @@ def resetDefaultConfig_3D():  #-----------------------------------------------
 		'width_force': 0,
 		'dist_on'   : 1,
 		'dist_force': 0,
-		'pl_3d'  : 0,
 		'fill_on'	: 1,
 		'pl_trim_on': 1,
 		'Z_force_on': 0,
@@ -5499,11 +5660,11 @@ def resetDefaultConfig_3D():  #-----------------------------------------------
 		'ellipse': 1,
 		'mline' : 0,
 		'polyline': 1,
-		'spline': 0,
+		'spline': 1,
 		'plmesh': 1,
 		'pline3': 1,
 		'lwpolyline': 1,
-		'text'  : 1,
+		'text'  : 0,
 		'mtext' : 0,
 		'block' : 1,
 		'insert': 1,
@@ -5557,6 +5718,7 @@ def draw_UI():  #---------------------------------------------------------------
 	"""
 	global GUI_A, GUI_B #__version__
 	global user_preset, iniFileName, dxfFileName, config_UI, g_scale_as
+	global model_space_on
 
 	# This is for easy layout changes
 	but_0c = 70  #button 1.column width
@@ -5567,8 +5729,8 @@ def draw_UI():  #---------------------------------------------------------------
 	butt_margin = 10
 	menu_w = (3 * butt_margin) + but_0c + but_1c + but_2c + but_3c  #menu width
 
-	simple_menu_h = 80
-	extend_menu_h = 370
+	simple_menu_h = 100
+	extend_menu_h = 350
 	y = simple_menu_h		 # y is menu upper.y
 	if config_UI.val: y += extend_menu_h
 	x = 20 #menu left.x
@@ -5584,7 +5746,7 @@ def draw_UI():  #---------------------------------------------------------------
 
 	y += 30
 	colorbox(x, y+20, x+menu_w+menu_margin*2, menu_margin)
-	Draw.Label("DXF-Importer  ver." + __version__, but0c, y, menu_w, 20)
+	Draw.Label("DXF-Importer  v" + __version__, but0c, y, menu_w, 20)
 
 	if config_UI.val:
 		b0, b0_ = but0c, but_0c + butt_margin
@@ -5645,25 +5807,23 @@ def draw_UI():  #---------------------------------------------------------------
 		y -= 10
 		y -= 20
 		Draw.BeginAlign()
-		GUI_B['plmesh'] = Draw.Toggle('POLY-MESH/FACE', EVENT_NONE, b0, y, b0_+b1_, 20, GUI_B['plmesh'].val, "support dxf-POLYMESH/POLYFACE on/off")
+		GUI_B['plmesh'] = Draw.Toggle('PL-MESH/FACE', EVENT_NONE, b0, y, b0_+b1_-40, 20, GUI_B['plmesh'].val, "support dxf-POLYMESH/POLYFACE on/off")
 #		GUI_A['plmesh_as'] = Draw.Menu(plmesh_as_menu, EVENT_NONE, but1c, y, but_1c, 20, GUI_A['plmesh_as'].val, "select target Blender-object")
+		GUI_A['plmesh_flip'] = Draw.Toggle('N', EVENT_NONE, b1+b1_-40, y, 20, 20, GUI_A['plmesh_flip'].val, "flip DXF normals on/off")
+		GUI_A['normals_out'] = Draw.Toggle('N', EVENT_NONE, b1+b1_-20, y, 20, 20, GUI_A['normals_out'].val, "force Blender normals to outside on/off")
 		Draw.EndAlign()
 
 		y -= 20
-		Draw.BeginAlign()
 		GUI_B['solid'] = Draw.Toggle('SOLID', EVENT_NONE, b0, y, b0_, 20, GUI_B['solid'].val, "support dxf-SOLID and TRACE on/off")
 		GUI_B['face'] = Draw.Toggle('3DFACE', EVENT_NONE, b1, y, b1_, 20, GUI_B['face'].val, "support dxf-3DFACE on/off")
 #		GUI_A['solids_as'] = Draw.Menu(solids_as_menu, EVENT_NONE, but3c, y, but_3c, 20, GUI_A['solids_as'].val, "select target Blender-object")
-		Draw.EndAlign()
 		#print 'deb:support solid, trace', GUI_B['trace'].val, GUI_B['solid'].val # ------------
 
 
 		y -= 20
-		Draw.BeginAlign()
 		GUI_B['text'] = Draw.Toggle('TEXT', EVENT_NONE, b0, y, b0_, 20, GUI_B['text'].val, "support dxf-TEXT on/off")
 		GUI_B['mtext'] = Draw.Toggle('*MTEXT', EVENT_NONE, b1, y, b1_, 20, GUI_B['mtext'].val, "(*wip)support dxf-MTEXT on/off")
 #		GUI_A['texts_as'] = Draw.Menu(texts_as_menu, EVENT_NONE, but3c, y, but_3c, 20, GUI_A['texts_as'].val, "select target Blender-object")
-		Draw.EndAlign()
 
 		y -= 20
 		Draw.BeginAlign()
@@ -5671,13 +5831,14 @@ def draw_UI():  #---------------------------------------------------------------
 		GUI_B['insert'].val = GUI_B['block'].val
 		if GUI_B['block'].val:
 			GUI_A['block_nn'] = Draw.Toggle('n', EVENT_NONE, b1-30, y, 15, 20, GUI_A['block_nn'].val, "support hatch/noname BLOCKs *X... on/off")
-			GUI_A['blockFilter_on'] = Draw.Toggle('F', EVENT_NONE, b1-15, y, 15, 20, GUI_A['blockFilter_on'].val, "(*wip) support name filtering of BLOCKs on/off")
-			GUI_A['xref_on'] = Draw.Toggle('Xref', EVENT_NONE, b1, y, 20, 20, GUI_A['xref_on'].val, "support place holder for XREF-BLOCKs on/off")
+			GUI_A['xref_on'] = Draw.Toggle('Xref', EVENT_NONE, b1-15, y, 35, 20, GUI_A['xref_on'].val, "support for XREF-BLOCKs (place holders) on/off")
 			GUI_A['blocks_as'] = Draw.Menu(blocks_as_menu, EVENT_NONE, b1+20, y, b1_-20, 20, GUI_A['blocks_as'].val, "select target representation for imported BLOCKs")
 		Draw.EndAlign()
 
 
 		y -= 20
+		y -= 20
+		
 		Draw.BeginAlign()
 		GUI_A['views_on'] = Draw.Toggle('views', EVENT_NONE, b0, y, b0_-25, 20, GUI_A['views_on'].val, "imports VIEWs and VIEWPORTs as cameras on/off")
 		GUI_A['cams_on'] = Draw.Toggle('*cams', EVENT_NONE, b1-25, y, b1_-25, 20, GUI_A['cams_on'].val, "(*wip) support ASHADE cameras on/off")
@@ -5688,19 +5849,28 @@ def draw_UI():  #---------------------------------------------------------------
 		if y < y_down: y_down = y
 		# -----end supported objects--------------------------------------
 
-		b0, b0_ = but0c, but_0c + butt_margin
-		b1, b1_ = but1c, but_1c
-
 		y_top = y_down
 		y = y_top
 		y -= 10
 		y -= 20
+		but_ = menu_w / 6
+		b0 = but0c + (menu_w - but_*6)/2
 		Draw.BeginAlign()
-		GUI_A['material_on'] = Draw.Toggle('material', EVENT_REDRAW, b0, y, b0_-20, 20, GUI_A['material_on'].val, "support for material assignment on/off")
-		if GUI_A['material_on'].val:
-			GUI_A['material_from'] = Draw.Menu(material_from_menu,   EVENT_NONE, b1-20, y, b1_+20, 20, GUI_A['material_from'].val, "material assignment from?")
+		GUI_A['paper_space_on'] = Draw.Toggle('paper', EVENT_NONE, b0+but_*0, y, but_, 20, GUI_A['paper_space_on'].val, "import only from Paper-Space on/off")
+		GUI_A['layFrozen_on'] = Draw.Toggle ('frozen', EVENT_NONE, b0+but_*1, y, but_, 20, GUI_A['layFrozen_on'].val, "import also from frozen LAYERs on/off")
+		GUI_A['layerFilter_on'] = Draw.Toggle('layer', EVENT_NONE, b0+but_*2, y, but_, 20, GUI_A['layerFilter_on'].val, "(*wip) LAYER filtering on/off")
+		GUI_A['colorFilter_on'] = Draw.Toggle('color', EVENT_NONE, b0+but_*3, y, but_, 20, GUI_A['colorFilter_on'].val, "(*wip) COLOR filtering on/off")
+		GUI_A['groupFilter_on'] = Draw.Toggle('group', EVENT_NONE, b0+but_*4, y, but_, 20, GUI_A['groupFilter_on'].val, "(*wip) GROUP filtering on/off")
+		GUI_A['blockFilter_on'] = Draw.Toggle('block', EVENT_NONE, b0+but_*5, y, but_, 20, GUI_A['blockFilter_on'].val, "(*wip) BLOCK filtering on/off")
+		#GUI_A['dummy_on'] = Draw.Toggle('-', EVENT_NONE, but3c, y, but_3c, 20, GUI_A['dummy_on'].val, "dummy on/off")
 		Draw.EndAlign()
 
+		# -----end filters--------------------------------------
+
+		b0, b0_ = but0c, but_0c + butt_margin
+		b1, b1_ = but1c, but_1c
+
+		y -= 10
 		y -= 20
 		Draw.BeginAlign()
 		GUI_A['g_origin_on'] = Draw.Toggle('glob.reLoc', EVENT_REDRAW, b0, y, b0_, 20, GUI_A['g_origin_on'].val, "global relocate all DXF objects on/off")
@@ -5750,9 +5920,9 @@ def draw_UI():  #---------------------------------------------------------------
 		y -= 10
 		y -= 20
 		Draw.BeginAlign()
-		GUI_A['meshSmooth_on'] = Draw.Toggle('smooth', EVENT_NONE, b0, y, b0_-20, 20, GUI_A['meshSmooth_on'].val, "mesh smooth for circles/arcsegments on/off")
-		GUI_A['pl_trim_on'] = Draw.Toggle('trim', EVENT_NONE, b1-20, y, 32, 20, GUI_A['pl_trim_on'].val, "intersection of POLYLINE-wide-segments on/off")
-		GUI_A['pl_trim_max'] = Draw.Number('', EVENT_NONE, b1+12, y,  b1_-12, 20, GUI_A['pl_trim_max'].val, 0, 5, "limit for intersection of POLYLINE-wide-segments: 0.0-5.0")
+		GUI_A['meshSmooth_on'] = Draw.Toggle('smooth', EVENT_NONE, b0, y, b0_-20, 20, GUI_A['meshSmooth_on'].val, "mesh smooth for circles/arc-segments on/off")
+		GUI_A['pl_trim_on'] = Draw.Toggle('trim', EVENT_NONE, b1-20, y, 32, 20, GUI_A['pl_trim_on'].val, "clean intersection of POLYLINE-wide-segments on/off")
+		GUI_A['pl_trim_max'] = Draw.Number('', EVENT_NONE, b1+12, y,  b1_-12, 20, GUI_A['pl_trim_max'].val, 0, 5, "threshold intersection of POLYLINE-wide-segments: 0.0-5.0")
 		Draw.EndAlign()
 
 		y -= 20
@@ -5765,21 +5935,21 @@ def draw_UI():  #---------------------------------------------------------------
 
 		y -= 20
 		Draw.BeginAlign()
-		GUI_A['curves_on'] = Draw.Toggle('to Curves', EVENT_PRESETCURV, b0, y, b0_, 20, GUI_A['curves_on'].val, "import into curves instead into meshes on/off")
-		GUI_A['curve_arc'] = Draw.Number('', EVENT_NONE, b1, y, b1_/2, 20, GUI_A['curve_arc'].val, 3, 32, "Bezier circle: amount of segments: 3-32")
-		GUI_A['curve_res'] = Draw.Number('', EVENT_NONE, b1+b1_/2, y,  b1_/2, 20, GUI_A['curve_res'].val, 1, 128, "Set the Curve's U-resolution value: 1-128")
+		GUI_A['curve_arc'] = Draw.Number('', EVENT_NONE, b0, y, b0_/2, 20, GUI_A['curve_arc'].val, 3, 32, "Bezier circle: amount of segments: 3-32")
+		GUI_A['curve_res'] = Draw.Number('', EVENT_NONE, b0+b0_/2, y,  b0_/2, 20, GUI_A['curve_res'].val, 1, 128, "Set the Curve's U-resolution value: 1-128")
+		GUI_A['curves_on'] = Draw.Toggle('to Curves', EVENT_PRESETCURV, b1, y, b1_, 20, GUI_A['curves_on'].val, "set Curve as target object type on/off")
 		Draw.EndAlign()
 
 		y -= 20
-		GUI_A['group_bylayer_on'] = Draw.Toggle('Lay', EVENT_NONE, b0, y, 30, 20, GUI_A['group_bylayer_on'].val, "grouping entities from the same layer on/off")
-		GUI_A['vGroup_on'] = Draw.Toggle('vGroups', EVENT_NONE, b0+30, y, b1_-10, 20, GUI_A['vGroup_on'].val, "support Blender-VertexGroups on/off")
+		GUI_A['group_bylayer_on'] = Draw.Toggle('Layer', EVENT_NONE, b0, y, 30, 20, GUI_A['group_bylayer_on'].val, "DXF-entities group by layer on/off")
+		GUI_A['vGroup_on'] = Draw.Toggle('vGroups', EVENT_NONE, b0+30, y, b1_-10, 20, GUI_A['vGroup_on'].val, "sort faces into VertexGroups on/off")
 		GUI_A['one_mesh_on'] = Draw.Toggle('oneMesh', EVENT_NONE, b1+10, y, b1_-10, 20, GUI_A['one_mesh_on'].val, "draw DXF-entities into one mesh-object. Recommended for big DXF-files. on/off")
 
 		y -= 30
 		Draw.BeginAlign()
-		GUI_A['paper_space_on'] = Draw.Toggle('paper space', EVENT_NONE, b0, y, b0_+20, 20, GUI_A['paper_space_on'].val, "import only layout (paper space) on/off")
-		GUI_A['layFrozen_on'] = Draw.Toggle('frozen', EVENT_NONE, b1+20, y, b1_-20, 20, GUI_A['layFrozen_on'].val, "import also from frozen layers on/off")
-		#GUI_A['dummy_on'] = Draw.Toggle('-', EVENT_NONE, but3c, y, but_3c, 20, GUI_A['dummy_on'].val, "dummy on/off")
+		GUI_A['material_on'] = Draw.Toggle('material', EVENT_REDRAW, b0, y, b0_-20, 20, GUI_A['material_on'].val, "support for material assignment on/off")
+		if GUI_A['material_on'].val:
+			GUI_A['material_from'] = Draw.Menu(material_from_menu,   EVENT_NONE, b1-20, y, b1_+20, 20, GUI_A['material_from'].val, "material assignment from?")
 		Draw.EndAlign()
 
 		y_down = y
@@ -5821,8 +5991,9 @@ def draw_UI():  #---------------------------------------------------------------
 		Draw.EndAlign()
 
 		y -= 30
-		GUI_A['newScene_on'] = Draw.Toggle('newScene', EVENT_NONE, b0, y, b0_, 20, GUI_A['newScene_on'].val, "creates new Blender-Scene for each import on/off")
-		GUI_A['target_layer'] = Draw.Number('layer', EVENT_NONE, b1, y, b1_, 20, GUI_A['target_layer'].val, 1, 18, "imports into this Blender-layer (<19> reserved for block_definitions)")
+		but, but_ = but2c, 25
+		Draw.BeginAlign()
+		Draw.EndAlign()
 
 		if y < y_down: y_down = y
 		# -----end options --------------------------------------
@@ -5835,45 +6006,60 @@ def draw_UI():  #---------------------------------------------------------------
 		y -= 30
 		Draw.BeginAlign()
 		Draw.PushButton('INI file >', EVENT_CHOOSE_INI, but0c, y, but_0c, 20, 'Select INI-file from project directory')
-		iniFileName = Draw.String(' :', EVENT_NONE, but1c, y, menu_w-but_0c-butt_margin, 20, iniFileName.val, FILENAME_MAX, "write here the name of the INI-file")
+		iniFileName = Draw.String(' :', EVENT_NONE, but1c, y, menu_w-but_1c-60, 20, iniFileName.val, FILENAME_MAX, "write here the name of the INI-file")
+		but = but4c-60
+		Draw.PushButton('#', EVENT_PRESETS, but, y, 20, 20, "toggle Preset-INI-files")
+		Draw.PushButton('L', EVENT_LOAD_INI, but+20, y, 20, 20, 'Loads configuration from ini-file: %s' % iniFileName.val)
+		Draw.PushButton('S', EVENT_SAVE_INI, but+40, y, 20, 20, 'Saves configuration to ini-file: %s' % iniFileName.val)
 		Draw.EndAlign()
 
-		y -= 20
-		Draw.BeginAlign()
-		Draw.PushButton('#', EVENT_PRESETS, but0c, y, 20, 20, "tipist for Preset-INI-files")
-		Draw.PushButton('Load', EVENT_LOAD_INI, but0c+20, y, but_0c-20, 20, '.Loads configuration from ini-file: %s' % iniFileName.val)
-		Draw.PushButton('Save', EVENT_SAVE_INI, but1c, y, but_1c-20, 20, 'Saves configuration to ini-file: %s' % iniFileName.val)
-		Draw.EndAlign()
-		but_ = (but_2c+but_3c)/4
-		but = but2c
-		Draw.PushButton('reset', EVENT_RESET, but, y, but_, 20, "reset configuration to defaults")
-		Draw.PushButton('2D', EVENT_PRESET2D, but+but_, y, but_, 20, 'set configuration for 2D import')
-		Draw.PushButton('3D', EVENT_PRESET3D, but+but_*2, y, but_, 20, 'set configuration for 3D import')
-		GUI_A['optimization'] = Draw.Number('', EVENT_NONE, but4c-35, y, 35, 20, GUI_A['optimization'].val, 0, 3, "Optimization Level: 0=Debug/directDrawing, 1=Verbose, 2=ProgressBar, 3=silentMode/fastest")
 
+	b0, b0_ = but2c, but_2c + butt_margin
+	b1, b1_ = but3c, but_3c
 
 	y =	simple_menu_h
+	bm = butt_margin/2
+
+	#y -= 10
 	Draw.BeginAlign()
 	Draw.PushButton('DXFfile >', EVENT_CHOOSE_DXF, but0c, y, but_0c, 20, 'Select DXF-file from project directory')
 	dxfFileName = Draw.String(' :', EVENT_NONE, but1c, y, but_1c+but_2c+but_3c-20, 20, dxfFileName.val, FILENAME_MAX, "type the name of DXF-file or type *.dxf for multi-import")
-	Draw.PushButton('*.*', EVENT_DXF_DIR, but3c+but_3c-20, y, 20, 20, 'Set asterisk * as filter')
+	Draw.PushButton('*.*', EVENT_DXF_DIR, but3c+but_3c-20, y, 20, 20, 'import all dxf files from this directory')
 	Draw.EndAlign()
 
-
-	y -= 50
+	y -= 30
+	config_UI = Draw.Toggle('CONFIG', EVENT_REDRAW, but0c, y, but_0c+bm, 20, config_UI.val, 'Advanced configuration on/off' )
 	Draw.BeginAlign()
-	Draw.PushButton('EXIT', EVENT_EXIT, but0c, y, but_0c, 40, '' )
-	Draw.PushButton('HELP', EVENT_HELP, but1c, y, but_1c-20, 20, 'calls BlenderWiki for Manual, Updates and Support.')
-	Draw.PushButton('?', EVENT_LIST, but1c+but_1c-20, y, 20, 20, 'DXF analyze tool: print listing of LAYERs and BLOCKs into the text file .INF')
-	Draw.PushButton('START IMPORT', EVENT_START, but2c, y, but_2c+but_3c+butt_margin, 40, 'Start the import procedure')
+	but, but_ = but1c, but_1c+bm
+	but_ /= 3
+	Draw.PushButton('X', EVENT_RESET, but, y, 15, 20, "reset configuration to defaults")
+	Draw.PushButton('2D', EVENT_PRESET2D, but+but_, y, but_, 20, 'set configuration for 2D import')
+	Draw.PushButton('3D', EVENT_PRESET3D, but+(but_*2), y, but_, 20, 'set configuration for 3D import')
 	Draw.EndAlign()
 
-	config_UI = Draw.Toggle('CONFIG', EVENT_REDRAW, but1c-butt_margin/2, y+20, but_1c+butt_margin, 20, config_UI.val, 'Advanced configuration on/off' )
+	Draw.BeginAlign()
+	GUI_A['newScene_on'] = Draw.Toggle('newScene', EVENT_NONE, but2c, y, but_2c, 20, GUI_A['newScene_on'].val, "create new Scene for each imported dxf file on/off")
+	GUI_A['target_layer'] = Draw.Number('layer', EVENT_NONE, but3c, y, but_3c, 20, GUI_A['target_layer'].val, 1, 18, "target Blender-layer (<19> reserved for block_definitions)")
+	Draw.EndAlign()
+
+	y -= 40
+	Draw.PushButton('EXIT', EVENT_EXIT, but0c, y, but_0c+bm, 20, '' )
+	Draw.PushButton('HELP', EVENT_HELP, but1c, y, but_1c+bm, 20, 'calls DXF-Importer Manual Page on Wiki.Blender.org')
+	Draw.BeginAlign()
+	GUI_A['optimization'] = Draw.Number('', EVENT_NONE, but2c, y+20, 40, 20, GUI_A['optimization'].val, 0, 3, "Optimization Level: 0=Debug/directDrawing, 1=Verbose, 2=ProgressBar, 3=SilentMode")
+	Draw.EndAlign()
+	Draw.BeginAlign()
+	Draw.PushButton('TEST', EVENT_LIST, but2c, y, 40, 20, 'DXF-Analyze-Tool: reads data from selected dxf file and writes report in project_directory/dxf_blendname.INF')
+	Draw.PushButton('START IMPORT', EVENT_START, but2c+40, y, but_2c-40+but_3c+butt_margin, 40, 'Start the import process. For Cancel go to console and hit Ctrl-C')
+	Draw.EndAlign()
+
+
+
 
 	y -= 20
 	Draw.BeginAlign()
 	Draw.Label(' ', but0c-menu_margin, y, menu_margin, 20)
-	Draw.Label("*) parts under construction", but0c, y, menu_w, 20)
+	Draw.Label(LAB, but0c, y, menu_w, 20)
 	Draw.Label(' ', but0c+menu_w, y, menu_margin, 20)
 	Draw.EndAlign()
 
@@ -5930,7 +6116,7 @@ def bevent(evt):
 		resetDefaultConfig_3D()
 		Draw.Redraw()
 	elif (evt==EVENT_PRESETCURV):
-		presetConfig_curv()
+		presetConfig_curv(GUI_A['curves_on'].val)
 		Draw.Redraw()
 	elif (evt==EVENT_PRESETS):
 		user_preset += 1
@@ -5974,11 +6160,6 @@ http://wiki.blender.org/index.php?title=Scripts/Manual/Import/DXF-3D')
 #		update_RegistryKey('dxfFileName', dxfFileName.val)
 		GUI_A['newScene_on'].val = 1
 		Draw.Redraw()
-#	elif (evt==EVENT_DXF_NAME):
-#		dirname == Blender.sys.dirname(Blender.Get('filename'))
-#		update_RegistryKey('DirName', dirname)
-#		#print 'deb:EVENT_DXF_NAME dxfFileName.val:', dxfFileName.val #--------------
-#		update_RegistryKey('dxfFileName', dxfFileName.val)
 	elif (evt==EVENT_CHOOSE_DXF):
 		filename = '' # '*.dxf'
 		if dxfFileName.val:	filename = dxfFileName.val
@@ -5986,6 +6167,7 @@ http://wiki.blender.org/index.php?title=Scripts/Manual/Import/DXF-3D')
 	elif (evt==EVENT_START):
 		dxfFile = dxfFileName.val
 		#print 'deb: dxfFile file: ', dxfFile #----------------------
+		if E_M: dxfFileName.val, dxfFile = e_mode(dxfFile) #evaluation mode
 		update_RegistryKey('dxfFileName', dxfFileName.val)
 		if dxfFile.lower().endswith('*.dxf'):
 			if Draw.PupMenu('DXF importer:  OK?|will import all DXF-files from:|%s' % dxfFile) == 1:
diff --git a/release/scripts/weightpaint_clean.py b/release/scripts/weightpaint_clean.py
index ba1896f011e..ca2184bade4 100644
--- a/release/scripts/weightpaint_clean.py
+++ b/release/scripts/weightpaint_clean.py
@@ -25,7 +25,7 @@ It removes very low weighted verts from the current group with a weight option.
 # 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
@@ -51,13 +51,14 @@ def weightClean(me, PREF_THRESH, PREF_KEEP_SINGLE, PREF_OTHER_GROUPS):
 		for wd in vWeightDict:
 			l = len(wd)
 			if not PREF_KEEP_SINGLE or l > 1:
+				# cant use iteritems because the dict is having items removed
 				for group in wd.keys():
 					w= wd[group]
 					if w <= PREF_THRESH:
 						# small weight, remove.
 						del wd[group]
 						rem_count +=1
-					l-=1
+						l-=1
 					
 					if PREF_KEEP_SINGLE and l == 1:
 						break
@@ -117,4 +118,4 @@ def main():
 	Draw.PupMenu('Removed %i verts from groups' % rem_count)
 	
 if __name__=='__main__':
-	main()
\ No newline at end of file
+	main()
diff --git a/source/blender/blenkernel/BKE_bvhutils.h b/source/blender/blenkernel/BKE_bvhutils.h
new file mode 100644
index 00000000000..dd9ea61f24b
--- /dev/null
+++ b/source/blender/blenkernel/BKE_bvhutils.h
@@ -0,0 +1,98 @@
+/**
+ *
+ * $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 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): André Pinto
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+#ifndef BKE_BVHUTILS_H
+#define BKE_BVHUTILS_H
+
+#include "BLI_kdopbvh.h"
+
+/*
+ * This header encapsulates necessary code to buld a BVH
+ */
+
+struct DerivedMesh;
+struct MVert;
+struct MFace;
+
+/*
+ * struct that kepts basic information about a BVHTree build from a mesh
+ */
+typedef struct BVHTreeFromMesh
+{
+	struct BVHTree *tree;
+
+	/* default callbacks to bvh nearest and raycast */
+	BVHTree_NearestPointCallback nearest_callback;
+	BVHTree_RayCastCallback      raycast_callback;
+
+	/* Mesh represented on this BVHTree */
+	struct DerivedMesh *mesh; 
+
+	/* Vertex array, so that callbacks have instante access to data */
+	struct MVert *vert;
+	struct MFace *face;
+
+	/* radius for raycast */
+	float sphere_radius;
+
+} BVHTreeFromMesh;
+
+/*
+ * Builds a bvh tree where nodes are the vertexs of the given mesh.
+ * Configures BVHTreeFromMesh.
+ *
+ * The tree is build in mesh space coordinates, this means special care must be made on queries
+ * so that the coordinates and rays are first translated on the mesh local coordinates.
+ * Reason for this is that later bvh_from_mesh_* might use a cache system and so it becames possible to reuse
+ * a BVHTree.
+ * 
+ * free_bvhtree_from_mesh should be called when the tree is no longer needed.
+ */
+void bvhtree_from_mesh_verts(struct BVHTreeFromMesh *data, struct DerivedMesh *mesh, float epsilon, int tree_type, int axis);
+
+/*
+ * Builds a bvh tree where nodes are the faces of the given mesh.
+ * Configures BVHTreeFromMesh.
+ *
+ * The tree is build in mesh space coordinates, this means special care must be made on queries
+ * so that the coordinates and rays are first translated on the mesh local coordinates.
+ * Reason for this is that later bvh_from_mesh_* might use a cache system and so it becames possible to reuse
+ * a BVHTree.
+ * 
+ * free_bvhtree_from_mesh should be called when the tree is no longer needed.
+ */
+void bvhtree_from_mesh_faces(struct BVHTreeFromMesh *data, struct DerivedMesh *mesh, float epsilon, int tree_type, int axis);
+
+/*
+ * Frees data allocated by a call to bvhtree_from_mesh_*.
+ */
+void free_bvhtree_from_mesh(struct BVHTreeFromMesh *data);
+
+#endif
+
diff --git a/source/blender/blenkernel/BKE_texture.h b/source/blender/blenkernel/BKE_texture.h
index fade0f8cbaa..c162a04e055 100644
--- a/source/blender/blenkernel/BKE_texture.h
+++ b/source/blender/blenkernel/BKE_texture.h
@@ -73,6 +73,7 @@ void    BKE_free_envmap(struct EnvMap *env);
 struct EnvMap *BKE_add_envmap(void);
 struct EnvMap *BKE_copy_envmap(struct EnvMap *env);
 
+int     BKE_texture_dependsOnTime(const struct Tex *texture);
 
 #endif
 
diff --git a/source/blender/blenkernel/bad_level_call_stubs/stubs.c b/source/blender/blenkernel/bad_level_call_stubs/stubs.c
index 3ad11a61de3..561d8d7c2a6 100644
--- a/source/blender/blenkernel/bad_level_call_stubs/stubs.c
+++ b/source/blender/blenkernel/bad_level_call_stubs/stubs.c
@@ -117,10 +117,14 @@ float BPY_pydriver_eval(struct IpoDriver *driver)
 {
 	return 0;
 }
+
+/*
 int EXPP_dict_set_item_str(struct PyObject *dict, char *key, struct PyObject *value)
 {
 	return 0;
 }
+*/
+
 void Node_SetStack(struct BPy_Node *self, struct bNodeStack **stack, int type){}
 void InitNode(struct BPy_Node *self, struct bNode *node){}
 void Node_SetShi(struct BPy_Node *self, struct ShadeInput *shi){}
diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c
index 1f8dd74a6eb..1592c3e5504 100644
--- a/source/blender/blenkernel/intern/anim.c
+++ b/source/blender/blenkernel/intern/anim.c
@@ -734,9 +734,8 @@ static void new_particle_duplilist(ListBase *lb, ID *id, Object *par, float par_
 	ParticleCacheKey *cache;
 	ParticleSystemModifierData *psmd;
 	float ctime, pa_time, scale = 1.0f;
-	float tmat[4][4], mat[4][4], obrotmat[4][4], pamat[4][4], size=0.0;
+	float tmat[4][4], mat[4][4], pamat[4][4], size=0.0;
 	float (*obmat)[4], (*oldobmat)[4];
-	float xvec[3] = {-1.0, 0.0, 0.0}, q[4];
 	int lay, a, b, k, step_nbr = 0, counter, hair = 0;
 	int totpart, totchild, totgroup=0, pa_num;
 
@@ -898,14 +897,7 @@ static void new_particle_duplilist(ListBase *lb, ID *id, Object *par, float par_
 					/* to give ipos in object correct offset */
 					where_is_object_time(ob, ctime-pa_time);
 					
-					if(!hair) {
-						vectoquat(xvec, ob->trackflag, ob->upflag, q);
-						QuatToMat4(q, obrotmat);
-						obrotmat[3][3]= 1.0f;
-						Mat4MulMat4(mat, obrotmat, pamat);
-					}
-					else
-						Mat4CpyMat4(mat, pamat);
+					Mat4CpyMat4(mat, pamat);
 
 					Mat4MulMat4(tmat, obmat, mat);
 					Mat4MulFloat3((float *)tmat, size*scale);
diff --git a/source/blender/blenkernel/intern/bvhutils.c b/source/blender/blenkernel/intern/bvhutils.c
new file mode 100644
index 00000000000..10e92b8b705
--- /dev/null
+++ b/source/blender/blenkernel/intern/bvhutils.c
@@ -0,0 +1,433 @@
+/**
+ *
+ * $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): André Pinto.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+#include <stdio.h>
+#include <string.h>
+#include <math.h>
+
+#include "BKE_bvhutils.h"
+
+#include "DNA_object_types.h"
+#include "DNA_modifier_types.h"
+#include "DNA_meshdata_types.h"
+
+#include "BKE_DerivedMesh.h"
+#include "BKE_utildefines.h"
+#include "BKE_deform.h"
+#include "BKE_cdderivedmesh.h"
+#include "BKE_displist.h"
+#include "BKE_global.h"
+
+#include "BLI_arithb.h"
+
+/* Math stuff for ray casting on mesh faces and for nearest surface */
+
+static float nearest_point_in_tri_surface(const float *point, const float *v0, const float *v1, const float *v2, float *nearest);
+
+#define ISECT_EPSILON 1e-6
+static float ray_tri_intersection(const BVHTreeRay *ray, const float m_dist, const float *v0, const float *v1, const float *v2)
+{
+	float dist;
+
+	if(RayIntersectsTriangle((float*)ray->origin, (float*)ray->direction, (float*)v0, (float*)v1, (float*)v2, &dist, NULL))
+		return dist;
+
+	return FLT_MAX;
+}
+
+static float sphereray_tri_intersection(const BVHTreeRay *ray, float radius, const float m_dist, const float *v0, const float *v1, const float *v2)
+{
+	
+	float idist;
+	float p1[3];
+	float plane_normal[3], hit_point[3];
+
+	CalcNormFloat((float*)v0, (float*)v1, (float*)v2, plane_normal);
+
+	VECADDFAC( p1, ray->origin, ray->direction, m_dist);
+	if(SweepingSphereIntersectsTriangleUV((float*)ray->origin, p1, radius, (float*)v0, (float*)v1, (float*)v2, &idist, hit_point))
+	{
+		return idist * m_dist;
+	}
+
+	return FLT_MAX;
+}
+
+/*
+ * This calculates the distance from point to the plane
+ * Distance is negative if point is on the back side of plane
+ */
+static float point_plane_distance(const float *point, const float *plane_point, const float *plane_normal)
+{
+	float pp[3];
+	VECSUB(pp, point, plane_point);
+	return INPR(pp, plane_normal);
+}
+static float choose_nearest(const float v0[2], const float v1[2], const float point[2], float closest[2])
+{
+	float d[2][2], sdist[2];
+	VECSUB2D(d[0], v0, point);
+	VECSUB2D(d[1], v1, point);
+
+	sdist[0] = d[0][0]*d[0][0] + d[0][1]*d[0][1];
+	sdist[1] = d[1][0]*d[1][0] + d[1][1]*d[1][1];
+
+	if(sdist[0] < sdist[1])
+	{
+		if(closest)
+			VECCOPY2D(closest, v0);
+		return sdist[0];
+	}
+	else
+	{
+		if(closest)
+			VECCOPY2D(closest, v1);
+		return sdist[1];
+	}
+}
+/*
+ * calculates the closest point between point-tri (2D)
+ * returns that tri must be right-handed
+ * Returns square distance
+ */
+static float closest_point_in_tri2D(const float point[2], /*const*/ float tri[3][2], float closest[2])
+{
+	float edge_di[2];
+	float v_point[2];
+	float proj[2];					//point projected over edge-dir, edge-normal (witouth normalized edge)
+	const float *v0 = tri[2], *v1;
+	float edge_slen, d;				//edge squared length
+	int i;
+	const float *nearest_vertex = NULL;
+
+
+	//for each edge
+	for(i=0, v0=tri[2], v1=tri[0]; i < 3; v0=tri[i++], v1=tri[i])
+	{
+		VECSUB2D(edge_di,    v1, v0);
+		VECSUB2D(v_point, point, v0);
+
+		proj[1] =  v_point[0]*edge_di[1] - v_point[1]*edge_di[0];	//dot product with edge normal
+
+		//point inside this edge
+		if(proj[1] < 0)
+			continue;
+
+		proj[0] = v_point[0]*edge_di[0] + v_point[1]*edge_di[1];
+
+		//closest to this edge is v0
+		if(proj[0] < 0)
+		{
+			if(nearest_vertex == NULL || nearest_vertex == v0)
+				nearest_vertex = v0;
+			else
+			{
+				//choose nearest
+				return choose_nearest(nearest_vertex, v0, point, closest);
+			}
+			i++;	//We can skip next edge
+			continue;
+		}
+
+		edge_slen = edge_di[0]*edge_di[0] + edge_di[1]*edge_di[1];	//squared edge len
+		//closest to this edge is v1
+		if(proj[0] > edge_slen)
+		{
+			if(nearest_vertex == NULL || nearest_vertex == v1)
+				nearest_vertex = v1;
+			else
+			{
+				return choose_nearest(nearest_vertex, v1, point, closest);
+			}
+			continue;
+		}
+
+		//nearest is on this edge
+		d= proj[1] / edge_slen;
+		closest[0] = point[0] - edge_di[1] * d;
+		closest[1] = point[1] + edge_di[0] * d;
+
+		return proj[1]*proj[1]/edge_slen;
+	}
+
+	if(nearest_vertex)
+	{
+		VECSUB2D(v_point, nearest_vertex, point);
+		VECCOPY2D(closest, nearest_vertex);
+		return v_point[0]*v_point[0] + v_point[1]*v_point[1];
+	}
+	else
+	{
+		VECCOPY(closest, point);	//point is already inside
+		return 0.0f;
+	}
+}
+
+/*
+ * Returns the square of the minimum distance between the point and a triangle surface
+ * If nearest is not NULL the nearest surface point is written on it
+ */
+static float nearest_point_in_tri_surface(const float *point, const float *v0, const float *v1, const float *v2, float *nearest)
+{
+	//Lets solve the 2D problem (closest point-tri)
+	float normal_dist, plane_sdist, plane_offset;
+	float du[3], dv[3], dw[3];	//orthogonal axis (du=(v0->v1), dw=plane normal)
+
+	float p_2d[2], tri_2d[3][2], nearest_2d[2];
+
+	CalcNormFloat((float*)v0, (float*)v1, (float*)v2, dw);
+
+	//point-plane distance and calculate axis
+	normal_dist = point_plane_distance(point, v0, dw);
+
+	// OPTIMIZATION
+	//	if we are only interested in nearest distance if its closer than some distance already found
+	//  we can:
+	//		if(normal_dist*normal_dist >= best_dist_so_far) return FLOAT_MAX;
+	//
+
+	VECSUB(du, v1, v0);
+	Normalize(du);
+	Crossf(dv, dw, du);
+	plane_offset = INPR(v0, dw);
+
+	//project stuff to 2d
+	tri_2d[0][0] = INPR(du, v0);
+	tri_2d[0][1] = INPR(dv, v0);
+
+	tri_2d[1][0] = INPR(du, v1);
+	tri_2d[1][1] = INPR(dv, v1);
+
+	tri_2d[2][0] = INPR(du, v2);
+	tri_2d[2][1] = INPR(dv, v2);
+
+	p_2d[0] = INPR(du, point);
+	p_2d[1] = INPR(dv, point);
+
+	//we always have a right-handed tri
+	//this should always happen because of the way normal is calculated
+	plane_sdist = closest_point_in_tri2D(p_2d, tri_2d, nearest_2d);
+
+	//project back to 3d
+	if(nearest)
+	{
+		nearest[0] = du[0]*nearest_2d[0] + dv[0] * nearest_2d[1] + dw[0] * plane_offset;
+		nearest[1] = du[1]*nearest_2d[0] + dv[1] * nearest_2d[1] + dw[1] * plane_offset;
+		nearest[2] = du[2]*nearest_2d[0] + dv[2] * nearest_2d[1] + dw[2] * plane_offset;
+	}
+
+	return plane_sdist + normal_dist*normal_dist;
+}
+
+
+/*
+ * BVH from meshs callbacks
+ */
+
+// Callback to bvh tree nearest point. The tree must bust have been built using bvhtree_from_mesh_faces.
+// userdata must be a BVHMeshCallbackUserdata built from the same mesh as the tree.
+static void mesh_faces_nearest_point(void *userdata, int index, const float *co, BVHTreeNearest *nearest)
+{
+	const BVHTreeFromMesh *data = (BVHTreeFromMesh*) userdata;
+	MVert *vert	= data->vert;
+	MFace *face = data->face + index;
+
+	float *t0, *t1, *t2, *t3;
+	t0 = vert[ face->v1 ].co;
+	t1 = vert[ face->v2 ].co;
+	t2 = vert[ face->v3 ].co;
+	t3 = face->v4 ? vert[ face->v4].co : NULL;
+
+	
+	do
+	{	
+		float nearest_tmp[3], dist;
+		float vec[3][3];
+		
+		// only insert valid triangles / quads with area > 0
+		VECSUB(vec[0], t2, t1);
+		VECSUB(vec[1], t0, t1);
+		Crossf(vec[2], vec[0], vec[1]);
+		if(INPR(vec[2], vec[2]) >= FLT_EPSILON)
+		{
+			dist = nearest_point_in_tri_surface(co,t0, t1, t2, nearest_tmp);
+			if(dist < nearest->dist)
+			{
+				nearest->index = index;
+				nearest->dist = dist;
+				VECCOPY(nearest->co, nearest_tmp);
+				CalcNormFloat((float*)t0, (float*)t1, (float*)t2, nearest->no); //TODO.. (interpolate normals from the vertexs coordinates?
+			}
+		}
+
+		t1 = t2;
+		t2 = t3;
+		t3 = NULL;
+
+	} while(t2);
+}
+
+// Callback to bvh tree raycast. The tree must bust have been built using bvhtree_from_mesh_faces.
+// userdata must be a BVHMeshCallbackUserdata built from the same mesh as the tree.
+static void mesh_faces_spherecast(void *userdata, int index, const BVHTreeRay *ray, BVHTreeRayHit *hit)
+{
+	const BVHTreeFromMesh *data = (BVHTreeFromMesh*) userdata;
+	MVert *vert	= data->vert;
+	MFace *face = data->face + index;
+
+	float *t0, *t1, *t2, *t3;
+	t0 = vert[ face->v1 ].co;
+	t1 = vert[ face->v2 ].co;
+	t2 = vert[ face->v3 ].co;
+	t3 = face->v4 ? vert[ face->v4].co : NULL;
+
+	
+	do
+	{	
+		float dist;
+		if(data->sphere_radius == 0.0f)
+			dist = ray_tri_intersection(ray, hit->dist, t0, t1, t2);
+		else
+			dist = sphereray_tri_intersection(ray, data->sphere_radius, hit->dist, t0, t1, t2);
+
+		if(dist >= 0 && dist < hit->dist)
+		{
+			hit->index = index;
+			hit->dist = dist;
+			VECADDFAC(hit->co, ray->origin, ray->direction, dist);
+
+			CalcNormFloat(t0, t1, t2, hit->no);
+		}
+
+		t1 = t2;
+		t2 = t3;
+		t3 = NULL;
+
+	} while(t2);
+}
+
+/*
+ * BVH builders
+ */
+// Builds a bvh tree.. where nodes are the vertexs of the given mesh
+void bvhtree_from_mesh_verts(BVHTreeFromMesh *data, DerivedMesh *mesh, float epsilon, int tree_type, int axis)
+{
+	int i;
+	int numVerts= mesh->getNumVerts(mesh);
+	MVert *vert	= mesh->getVertDataArray(mesh, CD_MVERT);
+	BVHTree *tree = NULL;
+
+	memset(data, 0, sizeof(*data));
+
+	if(vert == NULL)
+	{
+		printf("bvhtree cant be build: cant get a vertex array");
+		return;
+	}
+
+	tree = BLI_bvhtree_new(numVerts, epsilon, tree_type, axis);
+	if(tree != NULL)
+	{
+		for(i = 0; i < numVerts; i++)
+			BLI_bvhtree_insert(tree, i, vert[i].co, 1);
+
+		BLI_bvhtree_balance(tree);
+
+		data->tree = tree;
+
+		//a NULL nearest callback works fine
+		//remeber the min distance to point is the same as the min distance to BV of point
+		data->nearest_callback = NULL;
+		data->raycast_callback = NULL;
+
+		data->mesh = mesh;
+		data->vert = mesh->getVertDataArray(mesh, CD_MVERT);
+		data->face = mesh->getFaceDataArray(mesh, CD_MFACE);
+
+		data->sphere_radius = epsilon;
+	}
+}
+
+// Builds a bvh tree.. where nodes are the faces of the given mesh.
+void bvhtree_from_mesh_faces(BVHTreeFromMesh *data, DerivedMesh *mesh, float epsilon, int tree_type, int axis)
+{
+	int i;
+	int numFaces= mesh->getNumFaces(mesh);
+	MVert *vert	= mesh->getVertDataArray(mesh, CD_MVERT);
+	MFace *face = mesh->getFaceDataArray(mesh, CD_MFACE);
+	BVHTree *tree = NULL;
+
+	memset(data, 0, sizeof(*data));
+
+	if(vert == NULL && face == NULL)
+	{
+		printf("bvhtree cant be build: cant get a vertex/face array");
+		return;
+	}
+
+	/* Create a bvh-tree of the given target */
+	tree = BLI_bvhtree_new(numFaces, epsilon, tree_type, axis);
+	if(tree != NULL)
+	{
+		for(i = 0; i < numFaces; i++)
+		{
+			float co[4][3];
+			VECCOPY(co[0], vert[ face[i].v1 ].co);
+			VECCOPY(co[1], vert[ face[i].v2 ].co);
+			VECCOPY(co[2], vert[ face[i].v3 ].co);
+			if(face[i].v4)
+				VECCOPY(co[3], vert[ face[i].v4 ].co);
+			
+			BLI_bvhtree_insert(tree, i, co[0], face[i].v4 ? 4 : 3);
+		}
+		BLI_bvhtree_balance(tree);
+
+		data->tree = tree;
+		data->nearest_callback = mesh_faces_nearest_point;
+		data->raycast_callback = mesh_faces_spherecast;
+
+		data->mesh = mesh;
+		data->vert = mesh->getVertDataArray(mesh, CD_MVERT);
+		data->face = mesh->getFaceDataArray(mesh, CD_MFACE);
+
+		data->sphere_radius = epsilon;
+	}
+}
+
+// Frees data allocated by a call to bvhtree_from_mesh_*.
+void free_bvhtree_from_mesh(struct BVHTreeFromMesh *data)
+{
+	if(data->tree)
+	{
+		BLI_bvhtree_free(data->tree);
+		memset( data, 0, sizeof(data) );
+	}
+}
+
+
diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c
index 5b3cec25772..cfcab54058d 100644
--- a/source/blender/blenkernel/intern/collision.c
+++ b/source/blender/blenkernel/intern/collision.c
@@ -1291,116 +1291,6 @@ int cloth_collision_moving ( ClothModifierData *clmd, CollisionModifierData *col
 	return 1;
 }
 
-int cloth_do_selfcollisions(ClothModifierData * clmd)
-{	
-	int ret2 = 0, l;
-	Cloth *cloth = clmd->clothObject;
-	
-	if ( clmd->clothObject->bvhselftree )
-	{
-		for(l = 0; l < clmd->coll_parms->self_loop_count; l++)
-		{
-			BVHTreeOverlap *overlap = NULL;
-			ClothVertex *verts = clmd->clothObject->verts; // needed for openMP
-			int k;
-			int ret = 0, result = 0;
-			
-			// search for overlapping collision pairs 
-			overlap = BLI_bvhtree_overlap ( cloth->bvhselftree, cloth->bvhselftree, &result );
-	
-// #pragma omp parallel for private(k, i, j) schedule(static)
-			for ( k = 0; k < result; k++ )
-			{
-				float temp[3];
-				float length = 0;
-				float mindistance;
-				int i, j;
-	
-				i = overlap[k].indexA;
-				j = overlap[k].indexB;
-	
-				mindistance = clmd->coll_parms->selfepsilon* ( cloth->verts[i].avg_spring_len + cloth->verts[j].avg_spring_len );
-	
-				if ( clmd->sim_parms->flags & CLOTH_SIMSETTINGS_FLAG_GOAL )
-				{
-					if ( ( cloth->verts [i].flags & CLOTH_VERT_FLAG_PINNED )
-					&& ( cloth->verts [j].flags & CLOTH_VERT_FLAG_PINNED ) )
-					{
-						continue;
-					}
-				}
-	
-				VECSUB ( temp, verts[i].tx, verts[j].tx );
-	
-				if ( ( ABS ( temp[0] ) > mindistance ) || ( ABS ( temp[1] ) > mindistance ) || ( ABS ( temp[2] ) > mindistance ) ) continue;
-	
-				// check for adjacent points (i must be smaller j)
-				if ( BLI_edgehash_haskey ( cloth->edgehash, MIN2(i, j), MAX2(i, j) ) )
-				{
-					continue;
-				}
-	
-				length = Normalize ( temp );
-	
-				if ( length < mindistance )
-				{
-					float correction = mindistance - length;
-	
-					if ( cloth->verts [i].flags & CLOTH_VERT_FLAG_PINNED )
-					{
-						VecMulf ( temp, -correction );
-						VECADD ( verts[j].tx, verts[j].tx, temp );
-					}
-					else if ( cloth->verts [j].flags & CLOTH_VERT_FLAG_PINNED )
-					{
-						VecMulf ( temp, correction );
-						VECADD ( verts[i].tx, verts[i].tx, temp );
-					}
-					else
-					{
-						VecMulf ( temp, -correction*0.5 );
-						VECADD ( verts[j].tx, verts[j].tx, temp );
-	
-						VECSUB ( verts[i].tx, verts[i].tx, temp );
-					}
-					ret = 1;
-					ret2 += ret;
-				}
-				else
-				{
-					// check for approximated time collisions
-				}
-			}
-	
-			if ( overlap )
-				MEM_freeN ( overlap );
-		
-			if(!ret)
-				break;
-			
-		}
-		////////////////////////////////////////////////////////////
-	
-		////////////////////////////////////////////////////////////
-		// SELFCOLLISIONS: update velocities
-		////////////////////////////////////////////////////////////
-		if ( ret2 )
-		{
-			int i; 
-			ClothVertex *verts = clmd->clothObject->verts; // needed for openMP
-			
-			for ( i = 0; i < cloth->numverts; i++ )
-			{
-				if ( ! ( verts [i].flags & CLOTH_VERT_FLAG_PINNED ) )
-				{
-					VECSUB ( verts[i].tv, verts[i].tx, verts[i].txold );
-				}
-			}
-		}
-		////////////////////////////////////////////////////////////
-	}
-	return ret2;
-}
 
 // return all collision objects in scene
 // collision object will exclude self 
@@ -1547,7 +1437,7 @@ int cloth_bvh_objcollision ( Object *ob, ClothModifierData * clmd, float step, f
 {
 	Cloth *cloth=NULL;
 	BVHTree *cloth_bvh=NULL;
-	int i=0, numfaces = 0, numverts = 0;
+	int i=0, numfaces = 0, numverts = 0, k, l, j;
 	int rounds = 0; // result counts applied collisions; ic is for debug output;
 	ClothVertex *verts = NULL;
 	int ret = 0, ret2 = 0;
@@ -1647,21 +1537,122 @@ int cloth_bvh_objcollision ( Object *ob, ClothModifierData * clmd, float step, f
 			VECADD ( verts[i].tx, verts[i].txold, verts[i].tv );
 		}
 		////////////////////////////////////////////////////////////
-
+		
 		
 		////////////////////////////////////////////////////////////
 		// Test on *simple* selfcollisions
 		////////////////////////////////////////////////////////////
 		if ( clmd->coll_parms->flags & CLOTH_COLLSETTINGS_FLAG_SELF )
 		{
-			ret2 += cloth_do_selfcollisions(clmd);
+			for(l = 0; l < clmd->coll_parms->self_loop_count; l++)
+			{
+				// TODO: add coll quality rounds again
+				BVHTreeOverlap *overlap = NULL;
+				int result = 0;
+	
+				// collisions = 1;
+				verts = cloth->verts; // needed for openMP
+	
+				numfaces = clmd->clothObject->numfaces;
+				numverts = clmd->clothObject->numverts;
+	
+				verts = cloth->verts;
+	
+				if ( cloth->bvhselftree )
+				{
+					// search for overlapping collision pairs 
+					overlap = BLI_bvhtree_overlap ( cloth->bvhselftree, cloth->bvhselftree, &result );
+	
+	// #pragma omp parallel for private(k, i, j) schedule(static)
+					for ( k = 0; k < result; k++ )
+					{
+						float temp[3];
+						float length = 0;
+						float mindistance;
+	
+						i = overlap[k].indexA;
+						j = overlap[k].indexB;
+	
+						mindistance = clmd->coll_parms->selfepsilon* ( cloth->verts[i].avg_spring_len + cloth->verts[j].avg_spring_len );
+	
+						if ( clmd->sim_parms->flags & CLOTH_SIMSETTINGS_FLAG_GOAL )
+						{
+							if ( ( cloth->verts [i].flags & CLOTH_VERT_FLAG_PINNED )
+										&& ( cloth->verts [j].flags & CLOTH_VERT_FLAG_PINNED ) )
+							{
+								continue;
+							}
+						}
+	
+						VECSUB ( temp, verts[i].tx, verts[j].tx );
+	
+						if ( ( ABS ( temp[0] ) > mindistance ) || ( ABS ( temp[1] ) > mindistance ) || ( ABS ( temp[2] ) > mindistance ) ) continue;
+	
+						// check for adjacent points (i must be smaller j)
+						if ( BLI_edgehash_haskey ( cloth->edgehash, MIN2(i, j), MAX2(i, j) ) )
+						{
+							continue;
+						}
+	
+						length = Normalize ( temp );
+	
+						if ( length < mindistance )
+						{
+							float correction = mindistance - length;
+	
+							if ( cloth->verts [i].flags & CLOTH_VERT_FLAG_PINNED )
+							{
+								VecMulf ( temp, -correction );
+								VECADD ( verts[j].tx, verts[j].tx, temp );
+							}
+							else if ( cloth->verts [j].flags & CLOTH_VERT_FLAG_PINNED )
+							{
+								VecMulf ( temp, correction );
+								VECADD ( verts[i].tx, verts[i].tx, temp );
+							}
+							else
+							{
+								VecMulf ( temp, -correction*0.5 );
+								VECADD ( verts[j].tx, verts[j].tx, temp );
+	
+								VECSUB ( verts[i].tx, verts[i].tx, temp );
+							}
+							ret = 1;
+							ret2 += ret;
+						}
+						else
+						{
+							// check for approximated time collisions
+						}
+					}
+	
+					if ( overlap )
+						MEM_freeN ( overlap );
+	
+				}
+			}
+			////////////////////////////////////////////////////////////
+
+			////////////////////////////////////////////////////////////
+			// SELFCOLLISIONS: update velocities
+			////////////////////////////////////////////////////////////
+			if ( ret2 )
+			{
+				for ( i = 0; i < cloth->numverts; i++ )
+				{
+					if ( ! ( verts [i].flags & CLOTH_VERT_FLAG_PINNED ) )
+					{
+						VECSUB ( verts[i].tv, verts[i].tx, verts[i].txold );
+					}
+				}
+			}
+			////////////////////////////////////////////////////////////
 		}
-		////////////////////////////////////////////////////////////
 	}
 	while ( ret2 && ( clmd->coll_parms->loop_count>rounds ) );
 	
 	if(collobjs)
-		+		MEM_freeN(collobjs);
+		MEM_freeN(collobjs);
 
 	return MIN2 ( ret, 1 );
 }
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index 9012adb09b7..2c1f6bb84c1 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -265,14 +265,34 @@ static void layerSwap_tface(void *data, int *corner_indices)
 {
 	MTFace *tf = data;
 	float uv[4][2];
+	const static short pin_flags[4] =
+	    { TF_PIN1, TF_PIN2, TF_PIN3, TF_PIN4 };
+	const static char sel_flags[4] =
+	    { TF_SEL1, TF_SEL2, TF_SEL3, TF_SEL4 };
+	short unwrap = tf->unwrap & ~(TF_PIN1 | TF_PIN2 | TF_PIN3 | TF_PIN4);
+	char flag = tf->flag & ~(TF_SEL1 | TF_SEL2 | TF_SEL3 | TF_SEL4);
 	int j;
 
 	for(j = 0; j < 4; ++j) {
-		uv[j][0] = tf->uv[corner_indices[j]][0];
-		uv[j][1] = tf->uv[corner_indices[j]][1];
+		int source_index = corner_indices[j];
+
+		uv[j][0] = tf->uv[source_index][0];
+		uv[j][1] = tf->uv[source_index][1];
+
+		// swap pinning flags around
+		if(tf->unwrap & pin_flags[source_index]) {
+			unwrap |= pin_flags[j];
+		}
+
+		// swap selection flags around
+		if(tf->flag & sel_flags[source_index]) {
+			flag |= sel_flags[j];
+		}
 	}
 
 	memcpy(tf->uv, uv, sizeof(tf->uv));
+	tf->unwrap = unwrap;
+	tf->flag = flag;
 }
 
 static void layerDefault_tface(void *data, int count)
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index f13f8ef0298..1dc76296c28 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -97,6 +97,7 @@
 #include "BKE_material.h"
 #include "BKE_particle.h"
 #include "BKE_pointcache.h"
+#include "BKE_texture.h"
 #include "BKE_utildefines.h"
 #include "depsgraph_private.h"
 #include "BKE_bmesh.h"
@@ -1130,8 +1131,18 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd,
 				  mface[numFaces].v1 = vert_map[mface[numFaces].v1];
 				  mface[numFaces].v2 = vert_map[mface[numFaces].v2];
 				  mface[numFaces].v3 = vert_map[mface[numFaces].v3];
-				  if(mface[numFaces].v4)
+				  if(mface[numFaces].v4) {
 					  mface[numFaces].v4 = vert_map[mface[numFaces].v4];
+
+					  test_index_face(&mface[numFaces], &result->faceData,
+					                  numFaces, 4);
+				  }
+				  else
+				  {
+					  test_index_face(&mface[numFaces], &result->faceData,
+					                  numFaces, 3);
+				  }
+
 				  origindex[numFaces] = ORIGINDEX_NONE;
 
 				  numFaces++;
@@ -1221,8 +1232,17 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd,
 				  mface[numFaces].v1 = vert_map[mface[numFaces].v1];
 				  mface[numFaces].v2 = vert_map[mface[numFaces].v2];
 				  mface[numFaces].v3 = vert_map[mface[numFaces].v3];
-				  if(mface[numFaces].v4)
+				  if(mface[numFaces].v4) {
 					  mface[numFaces].v4 = vert_map[mface[numFaces].v4];
+
+					  test_index_face(&mface[numFaces], &result->faceData,
+					                  numFaces, 4);
+				  }
+				  else
+				  {
+					  test_index_face(&mface[numFaces], &result->faceData,
+					                  numFaces, 3);
+				  }
 				  origindex[numFaces] = ORIGINDEX_NONE;
 
 				  numFaces++;
@@ -2980,6 +3000,20 @@ CustomDataMask displaceModifier_requiredDataMask(ModifierData *md)
 	return dataMask;
 }
 
+static int displaceModifier_dependsOnTime(ModifierData *md)
+{
+	DisplaceModifierData *dmd = (DisplaceModifierData *)md;
+
+	if(dmd->texture)
+	{
+		return BKE_texture_dependsOnTime(dmd->texture);
+	}
+	else
+	{
+		return 0;
+	}
+}
+
 static void displaceModifier_foreachObjectLink(ModifierData *md, Object *ob,
 					       ObjectWalkFunc walk, void *userData)
 {
@@ -7335,6 +7369,7 @@ ModifierTypeInfo *modifierType_getInfo(ModifierType type)
 		mti->initData = displaceModifier_initData;
 		mti->copyData = displaceModifier_copyData;
 		mti->requiredDataMask = displaceModifier_requiredDataMask;
+		mti->dependsOnTime = displaceModifier_dependsOnTime;
 		mti->foreachObjectLink = displaceModifier_foreachObjectLink;
 		mti->foreachIDLink = displaceModifier_foreachIDLink;
 		mti->updateDepgraph = displaceModifier_updateDepgraph;
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index 24a3d348ae7..643f90637ad 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -3744,6 +3744,9 @@ int psys_get_particle_state(Object *ob, ParticleSystem *psys, int p, ParticleKey
 			
 			/* TODO: pa_clump vgroup */
 			do_clump(state,key1,t,part->clumpfac,part->clumppow,1.0);
+
+			if(psys->lattice)
+				calc_latt_deform(state->co,1.0f);
 		}
 		else{
 			if (pa) { /* TODO PARTICLE - should this ever be NULL? - Campbell */
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index 7dca87d5c13..d1c0cdec71d 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -4653,7 +4653,7 @@ static void system_step(Object *ob, ParticleSystem *psys, ParticleSystemModifier
 	PTCacheID pid;
 	int totpart, oldtotpart, totchild, oldtotchild, p;
 	float disp, *vg_vel= 0, *vg_tan= 0, *vg_rot= 0, *vg_size= 0;
-	int init= 0, distr= 0, alloc= 0, usecache= 0;
+	int init= 0, distr= 0, alloc= 0, usecache= 0, only_children_changed= 0;
 	int framenr, framedelta, startframe, endframe;
 
 	part= psys->part;
@@ -4720,6 +4720,7 @@ static void system_step(Object *ob, ParticleSystem *psys, ParticleSystemModifier
 	totchild = get_psys_tot_child(psys);
 
 	if(oldtotpart != totpart || (psys->part->childtype && oldtotchild != totchild)) {
+		only_children_changed = (oldtotpart == totpart);
 		realloc_particles(ob, psys, totpart);
 		alloc = 1;
 		distr= 1;
@@ -4740,14 +4741,17 @@ static void system_step(Object *ob, ParticleSystem *psys, ParticleSystemModifier
 
 			if((psys->part->type == PART_HAIR) && !(psys->flag & PSYS_HAIR_DONE))
 			/* don't generate children while growing hair - waste of time */
-			psys_free_children(psys);
-		else if(get_psys_tot_child(psys))
-			distribute_particles(ob, psys, PART_FROM_CHILD);
+				psys_free_children(psys);
+			else if(get_psys_tot_child(psys))
+				distribute_particles(ob, psys, PART_FROM_CHILD);
 		}
-		initialize_all_particles(ob, psys, psmd);
 
-		if(alloc)
-			reset_all_particles(ob, psys, psmd, 0.0, cfra, oldtotpart);
+		if(only_children_changed==0) {
+			initialize_all_particles(ob, psys, psmd);
+
+			if(alloc)
+				reset_all_particles(ob, psys, psmd, 0.0, cfra, oldtotpart);
+		}
 
 		/* flag for possible explode modifiers after this system */
 		psmd->flag |= eParticleSystemFlag_Pars;
diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c
index ad139220785..936381c85cc 100644
--- a/source/blender/blenkernel/intern/texture.c
+++ b/source/blender/blenkernel/intern/texture.c
@@ -545,6 +545,8 @@ Tex *copy_texture(Tex *tex)
 	if(texn->type==TEX_IMAGE) id_us_plus((ID *)texn->ima);
 	else texn->ima= 0;
 	
+	id_us_plus((ID *)texn->ipo);
+	
 	if(texn->plugin) {
 		texn->plugin= MEM_dupallocN(texn->plugin);
 		open_plugin_tex(texn->plugin);
@@ -845,3 +847,19 @@ void BKE_free_envmap(EnvMap *env)
 }
 
 /* ------------------------------------------------------------------------- */
+int BKE_texture_dependsOnTime(const struct Tex *texture)
+{
+	if(texture->plugin) {
+		// assume all plugins depend on time
+		return 1;
+	} else if(	texture->ima && 
+			ELEM(texture->ima->source, IMA_SRC_SEQUENCE, IMA_SRC_MOVIE)) {
+		return 1;
+	} else if(texture->ipo) {
+		// assume any ipo means the texture is animated
+		return 1;
+	}
+	return 0;
+}
+
+/* ------------------------------------------------------------------------- */
diff --git a/source/blender/blenlib/BLI_kdopbvh.h b/source/blender/blenlib/BLI_kdopbvh.h
index b81ff0ee66f..6d9a17efebf 100644
--- a/source/blender/blenlib/BLI_kdopbvh.h
+++ b/source/blender/blenlib/BLI_kdopbvh.h
@@ -1,4 +1,6 @@
 /**
+ *
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
@@ -40,6 +42,35 @@ typedef struct BVHTreeOverlap {
 	int indexB;
 } BVHTreeOverlap;
 
+typedef struct BVHTreeNearest
+{
+	int index;			/* the index of the nearest found (untouched if none is found within a dist radius from the given coordinates) */
+	float co[3];		/* nearest coordinates (untouched it none is found within a dist radius from the given coordinates) */
+	float no[3];		/* normal at nearest coordinates (untouched it none is found within a dist radius from the given coordinates) */
+	float dist;			/* squared distance to search arround */
+} BVHTreeNearest;
+
+typedef struct BVHTreeRay
+{
+	float origin[3];	/* ray origin */
+	float direction[3];	/* ray direction */
+} BVHTreeRay;
+
+typedef struct BVHTreeRayHit
+{
+	int index;			/* index of the tree node (untouched if no hit is found) */
+	float co[3];		/* coordinates of the hit point */
+	float no[3];		/* normal on hit point */
+	float dist;			/* distance to the hit point */
+} BVHTreeRayHit;
+
+/* callback must update nearest in case it finds a nearest result */
+typedef void (*BVHTree_NearestPointCallback) (void *userdata, int index, const float *co, BVHTreeNearest *nearest);
+
+/* 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);
+
+
 BVHTree *BLI_bvhtree_new(int maxsize, float epsilon, char tree_type, char axis);
 void BLI_bvhtree_free(BVHTree *tree);
 
@@ -56,5 +87,10 @@ BVHTreeOverlap *BLI_bvhtree_overlap(BVHTree *tree1, BVHTree *tree2, int *result)
 
 float BLI_bvhtree_getepsilon(BVHTree *tree);
 
+/* find nearest node to the given coordinates (if nearest is given it will only search nodes where square distance is smaller than nearest->dist) */
+int BLI_bvhtree_find_nearest(BVHTree *tree, const float *co, BVHTreeNearest *nearest, BVHTree_NearestPointCallback callback, void *userdata);
+
+int BLI_bvhtree_ray_cast(BVHTree *tree, const float *co, const float *dir, BVHTreeRayHit *hit, BVHTree_RayCastCallback 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 a97b9ca6672..9671551a7f1 100644
--- a/source/blender/blenlib/intern/BLI_kdopbvh.c
+++ b/source/blender/blenlib/intern/BLI_kdopbvh.c
@@ -28,8 +28,9 @@
 
 #include "math.h"
 #include <stdio.h>
-#include <stdlib.h> 
+#include <stdlib.h>
 #include <string.h>
+#include <assert.h>
 
 #include "MEM_guardedalloc.h"
 
@@ -42,15 +43,17 @@
 #include <omp.h>
 #endif
 
+
+
+#define MAX_TREETYPE 32
+
 typedef struct BVHNode
 {
-	struct BVHNode **children; // max 8 children
-	struct BVHNode *parent; // needed for bottom - top update
-	float *bv; // Bounding volume of all nodes, max 13 axis
-	int index; /* face, edge, vertex index */
-	char totnode; // how many nodes are used, used for speedup
-	char traversed;  // how many nodes already traversed until this level?
-	char main_axis;
+	struct BVHNode **children;
+	float *bv;		// Bounding volume of all nodes, max 13 axis
+	int index;		// face, edge, vertex index
+	char totnode;	// how many nodes are used, used for speedup
+	char main_axis;	// Axis used to split this node
 } BVHNode;
 
 struct BVHTree
@@ -72,8 +75,34 @@ typedef struct BVHOverlapData
 	BVHTree *tree1, *tree2; 
 	BVHTreeOverlap *overlap; 
 	int i, max_overlap; /* i is number of overlaps */
+	int start_axis, stop_axis;
 } BVHOverlapData;
-////////////////////////////////////////
+
+typedef struct BVHNearestData
+{
+	BVHTree *tree;
+	float	*co;
+	BVHTree_NearestPointCallback callback;
+	void	*userdata;
+	float proj[13];			//coordinates projection over axis
+	BVHTreeNearest nearest;
+
+} BVHNearestData;
+
+typedef struct BVHRayCastData
+{
+	BVHTree *tree;
+
+	BVHTree_RayCastCallback callback;
+	void	*userdata;
+
+
+	BVHTreeRay    ray;
+	float ray_dot_axis[13];
+
+	BVHTreeRayHit hit;
+} BVHRayCastData;
+////////////////////////////////////////m
 
 
 ////////////////////////////////////////////////////////////////////////
@@ -244,7 +273,7 @@ int partition_nth_element(BVHNode **a, int _begin, int _end, int n, int axis){
 	int begin = _begin, end = _end, cut;
 	while(end-begin > 3)
 	{
-		cut = bvh_partition(a, begin, end, bvh_medianof3(a, begin, (begin+end)/2, end-1, axis), axis ); 
+		cut = bvh_partition(a, begin, end, bvh_medianof3(a, begin, (begin+end)/2, end-1, axis), axis );
 		if(cut <= n)
 			begin = cut;
 		else
@@ -255,124 +284,15 @@ int partition_nth_element(BVHNode **a, int _begin, int _end, int n, int axis){
 	return n;
 }
 
-
 //////////////////////////////////////////////////////////////////////////////////////////////////////
 
-void BLI_bvhtree_free(BVHTree *tree)
-{	
-	if(tree)
-	{
-		MEM_freeN(tree->nodes);
-		MEM_freeN(tree->nodearray);
-		MEM_freeN(tree->nodebv);
-		MEM_freeN(tree->nodechild);
-		MEM_freeN(tree);
-	}
-}
-
-BVHTree *BLI_bvhtree_new(int maxsize, float epsilon, char tree_type, char axis)
-{
-	BVHTree *tree;
-	int numbranches=0, i;
-	
-	// only support up to octree
-	if(tree_type > 8)
-		return NULL;
-
-	tree = (BVHTree *)MEM_callocN(sizeof(BVHTree), "BVHTree");
-	
-	if(tree)
-	{
-		tree->epsilon = epsilon;
-		tree->tree_type = tree_type; 
-		tree->axis = axis;
-		
-		if(axis == 26)
-		{
-			tree->start_axis = 0;
-			tree->stop_axis = 13;
-		}
-		else if(axis == 18)
-		{
-			tree->start_axis = 7;
-			tree->stop_axis = 13;
-		}
-		else if(axis == 14)
-		{
-			tree->start_axis = 0;
-			tree->stop_axis = 7;
-		}
-		else if(axis == 8) // AABB
-		{
-			tree->start_axis = 0;
-			tree->stop_axis = 4;
-		}
-		else if(axis == 6) // OBB
-		{
-			tree->start_axis = 0;
-			tree->stop_axis = 3;
-		}
-		else
-		{
-			MEM_freeN(tree);
-			return NULL;
-		}
-
-
-		// calculate max number of branches, our bvh kdop is "almost perfect"
-		for(i = 1; i <= (int)ceil((float)((float)log(maxsize)/(float)log(tree_type))); i++)
-			numbranches += (pow(tree_type, i) / tree_type);
-		
-		tree->nodes = (BVHNode **)MEM_callocN(sizeof(BVHNode *)*(numbranches+maxsize + tree_type), "BVHNodes");
-		
-		if(!tree->nodes)
-		{
-			MEM_freeN(tree);
-			return NULL;
-		}
-		
-		tree->nodebv = (float*)MEM_callocN(sizeof(float)* axis * (numbranches+maxsize + tree_type), "BVHNodeBV");
-		if(!tree->nodebv)
-		{
-			MEM_freeN(tree->nodes);
-			MEM_freeN(tree);
-		}
-
-		tree->nodechild = (BVHNode**)MEM_callocN(sizeof(BVHNode*) * tree_type * (numbranches+maxsize + tree_type), "BVHNodeBV");
-		if(!tree->nodechild)
-		{
-			MEM_freeN(tree->nodebv);
-			MEM_freeN(tree->nodes);
-			MEM_freeN(tree);
-		}
-
-		tree->nodearray = (BVHNode *)MEM_callocN(sizeof(BVHNode)*(numbranches+maxsize + tree_type), "BVHNodeArray");
-		
-		if(!tree->nodearray)
-		{
-			MEM_freeN(tree->nodechild);
-			MEM_freeN(tree->nodebv);
-			MEM_freeN(tree->nodes);
-			MEM_freeN(tree);
-			return NULL;
-		}
-
-		//link the dynamic bv and child links
-		for(i=0; i< numbranches+maxsize + tree_type; i++)
-		{
-			tree->nodearray[i].bv = tree->nodebv + i * axis;
-			tree->nodearray[i].children = tree->nodechild + i * tree_type;
-		}
-		
-	}
-
-	return tree;
-}
-
-
+/*
+ * BVHTree bounding volumes functions
+ */
 static void create_kdop_hull(BVHTree *tree, BVHNode *node, float *co, int numpoints, int moving)
 {
 	float newminmax;
+	float *bv = node->bv;
 	int i, k;
 	
 	// don't init boudings for the moving case
@@ -380,8 +300,8 @@ static void create_kdop_hull(BVHTree *tree, BVHNode *node, float *co, int numpoi
 	{
 		for (i = tree->start_axis; i < tree->stop_axis; i++)
 		{
-			node->bv[2*i] = FLT_MAX;
-			node->bv[2*i + 1] = -FLT_MAX;
+			bv[2*i] = FLT_MAX;
+			bv[2*i + 1] = -FLT_MAX;
 		}
 	}
 	
@@ -391,10 +311,10 @@ static void create_kdop_hull(BVHTree *tree, BVHNode *node, float *co, int numpoi
 		for (i = tree->start_axis; i < tree->stop_axis; i++)
 		{
 			newminmax = INPR(&co[k * 3], KDOP_AXES[i]);
-			if (newminmax < node->bv[2 * i])
-				node->bv[2 * i] = newminmax;
-			if (newminmax > node->bv[(2 * i) + 1])
-				node->bv[(2 * i) + 1] = newminmax;
+			if (newminmax < bv[2 * i])
+				bv[2 * i] = newminmax;
+			if (newminmax > bv[(2 * i) + 1])
+				bv[(2 * i) + 1] = newminmax;
 		}
 	}
 }
@@ -405,6 +325,7 @@ static void refit_kdop_hull(BVHTree *tree, BVHNode *node, int start, int end)
 	float newmin,newmax;
 	int i, j;
 	float *bv = node->bv;
+
 	
 	for (i = tree->start_axis; i < tree->stop_axis; i++)
 	{
@@ -426,37 +347,7 @@ static void refit_kdop_hull(BVHTree *tree, BVHNode *node, int start, int end)
 				bv[(2 * i) + 1] = newmax;
 		}
 	}
-}
 
-int BLI_bvhtree_insert(BVHTree *tree, int index, float *co, int numpoints)
-{
-	BVHNode *node= NULL;
-	int i;
-	
-	// 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))
-		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);
-	
-	// 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->index= index;
-	
-	return 1;
 }
 
 // only supports x,y,z axis in the moment
@@ -484,46 +375,76 @@ static char get_largest_axis(float *bv)
 	}
 }
 
-static void bvh_div_nodes(BVHTree *tree, BVHNode *node, int start, int end, char lastaxis)
+// bottom-up update of bvh node BV
+// join the children on the parent BV
+static void node_join(BVHTree *tree, BVHNode *node)
 {
-	char laxis;
-	int i, tend;
-	BVHNode *tnode;
-	int slice = (end-start+tree->tree_type-1)/tree->tree_type;	//division rounded up
+	int i, j;
 	
-	// Determine which axis to split along
-	laxis = get_largest_axis(node->bv);
-	
-	// split nodes along longest axis
-	for (i=0; start < end; start += slice, i++) //i counts the current child
-	{	
-		tend = start + slice;
-		
-		if(tend > end) tend = end;
-		
-		if(tend-start == 1)	// ok, we have 1 left for this node
-		{
-			node->children[i] = tree->nodes[start];
-			node->children[i]->parent = node;
-		}
-		else
-		{
-			tnode = node->children[i] = tree->nodes[tree->totleaf  + tree->totbranch] = &(tree->nodearray[tree->totbranch + tree->totleaf]);
-			tree->totbranch++;
-			tnode->parent = node;
-			
-			if(tend != end)
-				partition_nth_element(tree->nodes, start, end, tend, laxis);
-			refit_kdop_hull(tree, tnode, start, tend);
-			bvh_div_nodes(tree, tnode, start, tend, laxis);
-		}
-		node->totnode++;
+	for (i = tree->start_axis; i < tree->stop_axis; i++)
+	{
+		node->bv[2*i] = FLT_MAX;
+		node->bv[2*i + 1] = -FLT_MAX;
 	}
 	
-	return;
+	for (i = 0; i < tree->tree_type; 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)]) 
+					node->bv[(2 * j)] = node->children[i]->bv[(2 * j)];
+				
+				// 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];
+			}
+		}
+		else
+			break;
+	}
+}
+
+/*
+ * Debug and information functions
+ */
+static void bvhtree_print_tree(BVHTree *tree, BVHNode *node, int depth)
+{
+	int i;
+	for(i=0; i<depth; i++) printf(" ");
+	printf(" - %d (%d): ", node->index, node - tree->nodearray);
+	for(i=2*tree->start_axis; i<2*tree->stop_axis; i++)
+		printf("%.3f ", node->bv[i]);
+	printf("\n");
+
+	for(i=0; i<tree->tree_type; i++)
+		if(node->children[i])
+			bvhtree_print_tree(tree, node->children[i], depth+1);
+}
+
+static void bvhtree_info(BVHTree *tree)
+{
+	printf("BVHTree info\n");
+	printf("tree_type = %d, axis = %d, epsilon = %f\n", tree->tree_type, tree->axis, tree->epsilon);
+	printf("nodes = %d, branches = %d, leafs = %d\n", tree->totbranch + tree->totleaf,  tree->totbranch, tree->totleaf);
+	printf("Memory per node = %dbytes\n", sizeof(BVHNode) + sizeof(BVHNode*)*tree->tree_type + sizeof(float)*tree->axis);
+	printf("BV memory = %dbytes\n", MEM_allocN_len(tree->nodebv));
+
+	printf("Total memory = %dbytes\n", sizeof(BVHTree)
+		+ MEM_allocN_len(tree->nodes)
+		+ MEM_allocN_len(tree->nodearray)
+		+ MEM_allocN_len(tree->nodechild)
+		+ MEM_allocN_len(tree->nodebv)
+		);
+
+//	bvhtree_print_tree(tree, tree->nodes[tree->totleaf], 0);
 }
 
 #if 0
+
+
 static void verify_tree(BVHTree *tree)
 {
 	int i, j, check = 0;
@@ -571,29 +492,445 @@ static void verify_tree(BVHTree *tree)
 	printf("branches: %d, leafs: %d, total: %d\n", tree->totbranch, tree->totleaf, tree->totbranch + tree->totleaf);
 }
 #endif
-	
-void BLI_bvhtree_balance(BVHTree *tree)
+
+//Helper data and structures to build a min-leaf generalized implicit tree
+//This code can be easily reduced (basicly this is only method to calculate pow(k, n) in O(1).. and stuff like that)
+typedef struct BVHBuildHelper
 {
-	BVHNode *node;
-	
-	if(tree->totleaf == 0)
-		return;
-	
-	// create root node
-	node = tree->nodes[tree->totleaf] = &(tree->nodearray[tree->totleaf]);
-	tree->totbranch++;
-	
-	// refit root bvh node
-	refit_kdop_hull(tree, tree->nodes[tree->totleaf], 0, tree->totleaf);
-	// create + balance tree
-	bvh_div_nodes(tree, tree->nodes[tree->totleaf], 0, tree->totleaf, 0);
-	
-	// verify_tree(tree);
+	int tree_type;				//
+	int totleafs;				//
+
+	int leafs_per_child  [32];	//Min number of leafs that are archievable from a node at depth N
+	int branches_on_level[32];	//Number of nodes at depth N (tree_type^N)
+
+	int remain_leafs;			//Number of leafs that are placed on the level that is not 100% filled
+
+} BVHBuildHelper;
+
+static void build_implicit_tree_helper(BVHTree *tree, BVHBuildHelper *data)
+{
+	int depth = 0;
+	int remain;
+	int nnodes;
+
+	data->totleafs = tree->totleaf;
+	data->tree_type= tree->tree_type;
+
+	//Calculate the smallest tree_type^n such that tree_type^n >= num_leafs
+	for(
+		data->leafs_per_child[0] = 1;
+		data->leafs_per_child[0] <  data->totleafs;
+		data->leafs_per_child[0] *= data->tree_type
+	);
+
+	data->branches_on_level[0] = 1;
+
+	//We could stop the loop first (but I am lazy to find out when)
+	for(depth = 1; depth < 32; depth++)
+	{
+		data->branches_on_level[depth] = data->branches_on_level[depth-1] * data->tree_type;
+		data->leafs_per_child  [depth] = data->leafs_per_child  [depth-1] / data->tree_type;
+	}
+
+	remain = data->totleafs - data->leafs_per_child[1];
+	nnodes = (remain + data->tree_type - 2) / (data->tree_type - 1);
+	data->remain_leafs = remain + nnodes;
 }
 
-// overlap - is it possbile for 2 bv's to collide ?
-static int tree_overlap(float *bv1, float *bv2, int start_axis, int stop_axis)
+// return the min index of all the leafs archivable with the given branch
+static int implicit_leafs_index(BVHBuildHelper *data, int depth, int child_index)
 {
+	int min_leaf_index = child_index * data->leafs_per_child[depth-1];
+	if(min_leaf_index <= data->remain_leafs)
+		return min_leaf_index;
+	else if(data->leafs_per_child[depth])
+		return data->totleafs - (data->branches_on_level[depth-1] - child_index) * data->leafs_per_child[depth];
+	else
+		return data->remain_leafs;
+}
+
+/**
+ * Generalized implicit tree build
+ *
+ * An implicit tree is a tree where its structure is implied, thus there is no need to store child pointers or indexs.
+ * Its possible to find the position of the child or the parent with simple maths (multiplication and adittion). This type
+ * of tree is for example used on heaps.. where node N has its childs at indexs N*2 and N*2+1.
+ *
+ * Altought in this case the tree type is general.. and not know until runtime.
+ * tree_type stands for the maximum number of childs that a tree node can have.
+ * All tree types >= 2 are supported.
+ *
+ * Advantages of the used trees include:
+ *  - No need to store child/parent relations (they are implicit);
+ *  - Any node child always has an index greater than the parent;
+ *  - Brother nodes are sequencial in memory;
+ *
+ *
+ * Some math relations derived for general implicit trees:
+ *
+ *   K = tree_type, ( 2 <= K )
+ *   ROOT = 1
+ *   N child of node A = A * K + (2 - K) + N, (0 <= N < K)
+ *
+ * Util methods:
+ *   TODO...
+ *    (looping elements, knowing if its a leaf or not.. etc...)
+ */
+
+// This functions returns the number of branches needed to have the requested number of leafs.
+static int implicit_needed_branches(int tree_type, int leafs)
+{
+	return MAX2(1, (leafs + tree_type - 3) / (tree_type-1) );
+}
+
+/*
+ * This function handles the problem of "sorting" the leafs (along the split_axis).
+ *
+ * It arranges the elements in the given partitions such that:
+ *  - any element in partition N is less or equal to any element in partition N+1.
+ *  - if all elements are diferent all partition will get the same subset of elements
+ *    as if the array was sorted.
+ *
+ * partition P is described as the elements in the range ( nth[P] , nth[P+1] ]
+ *
+ * TODO: This can be optimized a bit by doing a specialized nth_element instead of K nth_elements
+ */
+static void split_leafs(BVHNode **leafs_array, int *nth, int partitions, int split_axis)
+{
+	int i;
+	for(i=0; i < partitions-1; i++)
+	{
+		if(nth[i] >= nth[partitions])
+			break;
+
+		partition_nth_element(leafs_array, nth[i], nth[partitions], nth[i+1], split_axis);
+	}
+}
+
+/*
+ * This functions builds an optimal implicit tree from the given leafs.
+ * Where optimal stands for:
+ *  - The resulting tree will have the smallest number of branches;
+ *  - At most only one branch will have NULL childs;
+ *  - All leafs will be stored at level N or N+1.
+ *
+ * This function creates an implicit tree on branches_array, the leafs are given on the leafs_array.
+ *
+ * The tree is built per depth levels. First branchs at depth 1.. then branches at depth 2.. etc..
+ * The reason is that we can build level N+1 from level N witouth any data dependencies.. thus it allows
+ * to use multithread building.
+ *
+ * To archieve this is necessary to find how much leafs are accessible from a certain branch, BVHBuildHelper
+ * implicit_needed_branches and implicit_leafs_index are auxiliar functions to solve that "optimal-split".
+ */
+static void non_recursive_bvh_div_nodes(BVHTree *tree, BVHNode *branches_array, BVHNode **leafs_array, int num_leafs)
+{
+	int i;
+
+	const int tree_type   = tree->tree_type;
+	const int tree_offset = 2 - tree->tree_type; //this value is 0 (on binary trees) and negative on the others
+	const int num_branches= implicit_needed_branches(tree_type, num_leafs);
+
+	BVHBuildHelper data;
+	int depth;
+
+	branches_array--;	//Implicit trees use 1-based indexs
+	
+	build_implicit_tree_helper(tree, &data);
+
+	//Loop tree levels (log N) loops
+	for(i=1, depth = 1; i <= num_branches; i = i*tree_type + tree_offset, depth++)
+	{
+		const int first_of_next_level = i*tree_type + tree_offset;
+		const int  end_j = MIN2(first_of_next_level, num_branches + 1);	//index of last branch on this level
+		int j;
+
+		//Loop all branches on this level
+#pragma omp parallel for private(j) schedule(static)
+		for(j = i; j < end_j; j++)
+		{
+			int k;
+			const int parent_level_index= j-i;
+			BVHNode* parent = branches_array + j;
+			int nth_positions[ MAX_TREETYPE + 1];
+			char split_axis;
+
+			int parent_leafs_begin = implicit_leafs_index(&data, depth, parent_level_index);
+			int parent_leafs_end   = implicit_leafs_index(&data, depth, parent_level_index+1);
+
+			//This calculates the bounding box of this branch
+			//and chooses the largest axis as the axis to divide leafs
+			refit_kdop_hull(tree, parent, parent_leafs_begin, parent_leafs_end);
+			split_axis = get_largest_axis(parent->bv);
+
+			//Save split axis (this can be used on raytracing to speedup the query time)
+			parent->main_axis = split_axis / 2;
+
+			//Split the childs along the split_axis, note: its not needed to sort the whole leafs array
+			//Only to assure that the elements are partioned on a way that each child takes the elements
+			//it would take in case the whole array was sorted.
+			//Split_leafs takes care of that "sort" problem.
+			nth_positions[        0] = parent_leafs_begin;
+			nth_positions[tree_type] = parent_leafs_end;
+			for(k = 1; k < tree_type; k++)
+			{
+				int child_index = j * tree_type + tree_offset + k;
+				int child_level_index = child_index - first_of_next_level; //child level index
+				nth_positions[k] = implicit_leafs_index(&data, depth+1, child_level_index);
+			}
+
+			split_leafs(leafs_array, nth_positions, tree_type, split_axis);
+
+
+			//Setup children and totnode counters
+			//Not really needed but currently most of BVH code relies on having an explicit children structure
+			for(k = 0; k < tree_type; k++)
+			{
+				int child_index = j * tree_type + tree_offset + k;
+				int child_level_index = child_index - first_of_next_level; //child level index
+
+				int child_leafs_begin = implicit_leafs_index(&data, depth+1, child_level_index);
+				int child_leafs_end   = implicit_leafs_index(&data, depth+1, child_level_index+1);
+
+				if(child_leafs_end - child_leafs_begin > 1)
+					parent->children[k] = branches_array + child_index;
+				else if(child_leafs_end - child_leafs_begin == 1)
+					parent->children[k] = leafs_array[ child_leafs_begin ];
+				else
+					break;
+
+				parent->totnode = k+1;
+			}
+		}
+	}
+}
+
+
+/*
+ * BLI_bvhtree api
+ */
+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;
+
+	tree = (BVHTree *)MEM_callocN(sizeof(BVHTree), "BVHTree");
+	
+	if(tree)
+	{
+		tree->epsilon = epsilon;
+		tree->tree_type = tree_type; 
+		tree->axis = axis;
+		
+		if(axis == 26)
+		{
+			tree->start_axis = 0;
+			tree->stop_axis = 13;
+		}
+		else if(axis == 18)
+		{
+			tree->start_axis = 7;
+			tree->stop_axis = 13;
+		}
+		else if(axis == 14)
+		{
+			tree->start_axis = 0;
+			tree->stop_axis = 7;
+		}
+		else if(axis == 8) // AABB
+		{
+			tree->start_axis = 0;
+			tree->stop_axis = 4;
+		}
+		else if(axis == 6) // OBB
+		{
+			tree->start_axis = 0;
+			tree->stop_axis = 3;
+		}
+		else
+		{
+			MEM_freeN(tree);
+			return NULL;
+		}
+
+
+		//Allocate arrays
+		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)
+		{
+			MEM_freeN(tree->nodes);
+			MEM_freeN(tree);
+		}
+
+		tree->nodechild = (BVHNode**)MEM_callocN(sizeof(BVHNode*) * tree_type * numnodes, "BVHNodeBV");
+		if(!tree->nodechild)
+		{
+			MEM_freeN(tree->nodebv);
+			MEM_freeN(tree->nodes);
+			MEM_freeN(tree);
+		}
+
+		tree->nodearray = (BVHNode *)MEM_callocN(sizeof(BVHNode)* numnodes, "BVHNodeArray");
+		
+		if(!tree->nodearray)
+		{
+			MEM_freeN(tree->nodechild);
+			MEM_freeN(tree->nodebv);
+			MEM_freeN(tree->nodes);
+			MEM_freeN(tree);
+			return NULL;
+		}
+
+		//link the dynamic bv and child links
+		for(i=0; i< numnodes; i++)
+		{
+			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);
+		MEM_freeN(tree->nodearray);
+		MEM_freeN(tree->nodebv);
+		MEM_freeN(tree->nodechild);
+		MEM_freeN(tree);
+	}
+}
+
+void BLI_bvhtree_balance(BVHTree *tree)
+{
+	int i;
+
+	BVHNode*  branches_array = tree->nodearray + tree->totleaf;
+	BVHNode** leafs_array    = tree->nodes;
+
+	//This function should only be called once (some big bug goes here if its being called more than once per tree)
+	assert(tree->totbranch == 0);
+
+	//Build the implicit tree
+	non_recursive_bvh_div_nodes(tree, branches_array, leafs_array, tree->totleaf);
+
+	//current code expects the branches to be linked to the nodes array
+	//we perform that linkage here
+	tree->totbranch = implicit_needed_branches(tree->tree_type, tree->totleaf);
+	for(i = 0; i < tree->totbranch; i++)
+		tree->nodes[tree->totleaf + i] = branches_array + i;
+
+	//bvhtree_info(tree);
+}
+
+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 
+	}
+
+	return 1;
+}
+
+
+// call before BLI_bvhtree_update_tree()
+int BLI_bvhtree_update_node(BVHTree *tree, int index, float *co, float *co_moving, int numpoints)
+{
+	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 
+	}
+
+	return 1;
+}
+
+// call BLI_bvhtree_update_node() first for every node/point/triangle
+void BLI_bvhtree_update_tree(BVHTree *tree)
+{
+	//Update bottom=>top
+	//TRICKY: the way we build the tree all the childs have an index greater than the parent
+	//This allows us todo a bottom up update by starting on the biger numbered branch
+
+	BVHNode** root  = tree->nodes + tree->totleaf;
+	BVHNode** index = tree->nodes + tree->totleaf + tree->totbranch-1;
+
+	for (; index >= root; index--)
+		node_join(tree, *index);
+}
+
+float BLI_bvhtree_getepsilon(BVHTree *tree)
+{
+	return tree->epsilon;
+}
+
+
+/*
+ * BLI_bvhtree_overlap
+ */
+// overlap - is it possbile for 2 bv's to collide ?
+static int tree_overlap(BVHNode *node1, BVHNode *node2, int start_axis, int stop_axis)
+{
+	float *bv1 = node1->bv;
+	float *bv2 = node2->bv;
+
 	float *bv1_end = bv1 + (stop_axis<<1);
 		
 	bv1 += start_axis<<1;
@@ -613,7 +950,7 @@ static void traverse(BVHOverlapData *data, BVHNode *node1, BVHNode *node2)
 {
 	int j;
 	
-	if(tree_overlap(node1->bv, node2->bv, MIN2(data->tree1->start_axis, data->tree2->start_axis), MIN2(data->tree1->stop_axis, data->tree2->stop_axis)))
+	if(tree_overlap(node1, node2, data->start_axis, data->stop_axis))
 	{
 		// check if node1 is a leaf
 		if(!node1->totnode)
@@ -679,7 +1016,7 @@ BVHTreeOverlap *BLI_bvhtree_overlap(BVHTree *tree1, BVHTree *tree2, int *result)
 		return 0;
 	
 	// fast check root nodes for collision before doing big splitting + traversal
-	if(!tree_overlap(tree1->nodes[tree1->totleaf]->bv, tree2->nodes[tree2->totleaf]->bv, MIN2(tree1->start_axis, tree2->start_axis), MIN2(tree1->stop_axis, tree2->stop_axis)))
+	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");
@@ -694,6 +1031,8 @@ BVHTreeOverlap *BLI_bvhtree_overlap(BVHTree *tree1, BVHTree *tree2, int *result)
 		data[j]->tree2 = tree2;
 		data[j]->max_overlap = MAX2(tree1->totleaf, tree2->totleaf);
 		data[j]->i = 0;
+		data[j]->start_axis = MIN2(tree1->start_axis, tree2->start_axis);
+		data[j]->stop_axis  = MIN2(tree1->stop_axis,  tree2->stop_axis );
 	}
 
 #pragma omp parallel for private(j) schedule(static)
@@ -725,88 +1064,251 @@ BVHTreeOverlap *BLI_bvhtree_overlap(BVHTree *tree1, BVHTree *tree2, int *result)
 }
 
 
-// bottom up update of bvh tree:
-// join the 4 children here
-static void node_join(BVHTree *tree, BVHNode *node)
+/*
+ * Nearest neighbour - BLI_bvhtree_find_nearest
+ */
+static float squared_dist(const float *a, const float *b)
 {
-	int i, j;
-	
-	for (i = tree->start_axis; i < tree->stop_axis; i++)
+	float tmp[3];
+	VECSUB(tmp, a, b);
+	return INPR(tmp, tmp);
+}
+
+//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)
+{
+	int i;
+	const float *bv = node->bv;
+
+	//nearest on AABB hull
+	for(i=0; i != 3; i++, bv += 2)
 	{
-		node->bv[2*i] = FLT_MAX;
-		node->bv[2*i + 1] = -FLT_MAX;
+		if(bv[0] > data->proj[i])
+			nearest[i] = bv[0];
+		else if(bv[1] < data->proj[i])
+			nearest[i] = bv[1];
+		else
+			nearest[i] = data->proj[i];
 	}
-	
-	for (i = 0; i < tree->tree_type; i++)
+
+/*
+	//nearest on a general hull
+	VECCOPY(nearest, data->co);
+	for(i = data->tree->start_axis; i != data->tree->stop_axis; i++, bv+=2)
 	{
-		if (node->children[i]) 
+		float proj = INPR( nearest, KDOP_AXES[i]);
+		float dl = bv[0] - proj;
+		float du = bv[1] - proj;
+
+		if(dl > 0)
 		{
-			for (j = tree->start_axis; j < tree->stop_axis; j++)
+			VECADDFAC(nearest, nearest, KDOP_AXES[i], dl);
+		}
+		else if(du < 0)
+		{
+			VECADDFAC(nearest, nearest, KDOP_AXES[i], du);
+		}
+	}
+*/
+	return squared_dist(data->co, nearest);
+}
+
+
+// TODO: use a priority queue to reduce the number of nodes looked on
+static void dfs_find_nearest(BVHNearestData *data, BVHNode *node)
+{
+	int i;
+	float nearest[3], sdist;
+
+	sdist = calc_nearest_point(data, node, nearest);
+	if(sdist >= data->nearest.dist) return;
+
+	if(node->totnode == 0)
+	{
+		if(data->callback)
+			data->callback(data->userdata , node->index, data->co, &data->nearest);
+		else
+		{
+			data->nearest.index	= node->index;
+			VECCOPY(data->nearest.co, nearest);
+			data->nearest.dist	= sdist;
+		}
+	}
+	else
+	{
+		for(i=0; i != node->totnode; i++)
+			dfs_find_nearest(data, node->children[i]);
+	}
+}
+
+int BLI_bvhtree_find_nearest(BVHTree *tree, const float *co, BVHTreeNearest *nearest, BVHTree_NearestPointCallback callback, void *userdata)
+{
+	int i;
+
+	BVHNearestData data;
+	BVHNode* root = tree->nodes[tree->totleaf];
+
+	//init data to search
+	data.tree = tree;
+	data.co = co;
+
+	data.callback = callback;
+	data.userdata = userdata;
+
+	for(i = data.tree->start_axis; i != data.tree->stop_axis; i++)
+	{
+		data.proj[i] = INPR(data.co, KDOP_AXES[i]);
+	}
+
+	if(nearest)
+	{
+		memcpy( &data.nearest , nearest, sizeof(*nearest) );
+	}
+	else
+	{
+		data.nearest.index = -1;
+		data.nearest.dist = FLT_MAX;
+	}
+
+	//dfs search
+	if(root)
+		dfs_find_nearest(&data, root);
+
+	//copy back results
+	if(nearest)
+	{
+		memcpy(nearest, &data.nearest, sizeof(*nearest));
+	}
+
+	return data.nearest.index;
+}
+
+
+/*
+ * Raycast - BLI_bvhtree_ray_cast
+ *
+ * raycast is done by performing a DFS on the BVHTree and saving the closest hit
+ */
+
+//Determines the distance that the ray must travel to hit the bounding volume of the given node
+static float ray_nearest_hit(BVHRayCastData *data, BVHNode *node)
+{
+	int i;
+	const float *bv = node->bv;
+
+	float low = 0, upper = data->hit.dist;
+
+	for(i=0; i != 3; i++, bv += 2)
+	{
+		if(data->ray_dot_axis[i] == 0.0f)
+		{
+			//axis aligned ray
+			if(data->ray.origin[i] < bv[0]
+			|| data->ray.origin[i] > bv[1])
+				return FLT_MAX;
+		}
+		else
+		{
+			float ll = (bv[0] - data->ray.origin[i]) / data->ray_dot_axis[i];
+			float lu = (bv[1] - data->ray.origin[i]) / data->ray_dot_axis[i];
+
+			if(data->ray_dot_axis[i] > 0)
 			{
-				// 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 
-				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];
+				if(ll > low)   low = ll;
+				if(lu < upper) upper = lu;
+			}
+			else
+			{
+				if(lu > low)   low = lu;
+				if(ll < upper) upper = ll;
+			}
+	
+			if(low > upper) return FLT_MAX;
+		}
+	}
+	return low;
+}
+
+static void dfs_raycast(BVHRayCastData *data, BVHNode *node)
+{
+	int i;
+
+	//ray-bv is really fast.. and simple tests revealed its worth to test it
+	//before calling the ray-primitive functions
+	float dist = ray_nearest_hit(data, node);
+	if(dist >= data->hit.dist) return;
+
+	if(node->totnode == 0)
+	{
+		if(data->callback)
+			data->callback(data->userdata, node->index, &data->ray, &data->hit);
+		else
+		{
+			data->hit.index	= node->index;
+			data->hit.dist  = dist;
+			VECADDFAC(data->hit.co, data->ray.origin, data->ray.direction, dist);
+		}
+	}
+	else
+	{
+		//pick loop direction to dive into the tree (based on ray direction and split axis)
+		if(data->ray_dot_axis[ node->main_axis ] > 0)
+		{
+			for(i=0; i != node->totnode; i++)
+			{
+				dfs_raycast(data, node->children[i]);
 			}
 		}
 		else
-			break;
-	}
-}
-
-// call before BLI_bvhtree_update_tree()
-int BLI_bvhtree_update_node(BVHTree *tree, int index, float *co, float *co_moving, int numpoints)
-{
-	BVHNode *node= NULL;
-	int i = 0;
-	
-	// 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 
-	}
-	
-	return 1;
-}
-
-// call BLI_bvhtree_update_node() first for every node/point/triangle
-void BLI_bvhtree_update_tree(BVHTree *tree)
-{
-	BVHNode *leaf, *parent;
-	
-	// reset tree traversing flag
-	for (leaf = tree->nodearray + tree->totleaf; leaf != tree->nodearray + tree->totleaf + tree->totbranch; leaf++)
-		leaf->traversed = 0;
-	
-	for (leaf = tree->nodearray; leaf != tree->nodearray + tree->totleaf; leaf++)
-	{
-		for (parent = leaf->parent; parent; parent = parent->parent)
 		{
-			parent->traversed++;	// we tried to go up in hierarchy 
-			if (parent->traversed < parent->totnode) 
-				break;	// we do not need to check further 
-			else 
-				node_join(tree, parent);
+			for(i=node->totnode-1; i >= 0; i--)
+			{
+				dfs_raycast(data, node->children[i]);
+			}
 		}
 	}
 }
 
-float BLI_bvhtree_getepsilon(BVHTree *tree)
+int BLI_bvhtree_ray_cast(BVHTree *tree, const float *co, const float *dir, BVHTreeRayHit *hit, BVHTree_RayCastCallback callback, void *userdata)
 {
-	return tree->epsilon;
+	int i;
+	BVHRayCastData data;
+	BVHNode * root = tree->nodes[tree->totleaf];
+
+	data.tree = tree;
+
+	data.callback = callback;
+	data.userdata = userdata;
+
+	VECCOPY(data.ray.origin,    co);
+	VECCOPY(data.ray.direction, dir);
+
+	Normalize(data.ray.direction);
+
+	for(i=0; i<3; i++)
+	{
+		data.ray_dot_axis[i] = INPR( data.ray.direction, KDOP_AXES[i]);
+
+		if(fabs(data.ray_dot_axis[i]) < 1e-7)
+			data.ray_dot_axis[i] = 0.0;
+	}
+
+
+	if(hit)
+		memcpy( &data.hit, hit, sizeof(*hit) );
+	else
+	{
+		data.hit.index = -1;
+		data.hit.dist = FLT_MAX;
+	}
+
+	if(root)
+		dfs_raycast(&data, root);
+
+
+	if(hit)
+		memcpy( hit, &data.hit, sizeof(*hit) );
+
+	return data.hit.index;
 }
+
diff --git a/source/blender/blenlib/intern/boxpack2d.c b/source/blender/blenlib/intern/boxpack2d.c
index acd53e5d516..db7bae8a91d 100644
--- a/source/blender/blenlib/intern/boxpack2d.c
+++ b/source/blender/blenlib/intern/boxpack2d.c
@@ -42,6 +42,8 @@
 #define TRF 2
 #define TLF 4
 #define BRF 8
+#define CORNERFLAGS (BLF|TRF|TLF|BRF)
+
 #define BL 0
 #define TR 1
 #define TL 2
@@ -159,7 +161,7 @@ void boxPack2D(boxPack *boxarray, int len, float *tot_width, float *tot_height)
 		vert->blb = vert->brb = vert->tlb =\
 			vert->isect_cache[0] = vert->isect_cache[1] =\
 			vert->isect_cache[2] = vert->isect_cache[3] = NULL;
-		vert->free = 15 &~ TRF;
+		vert->free = CORNERFLAGS &~ TRF;
 		vert->trb = box;
 		vert->index = i; i++;
 		box->v[BL] = vert; vert++;
@@ -167,7 +169,7 @@ void boxPack2D(boxPack *boxarray, int len, float *tot_width, float *tot_height)
 		vert->trb= vert->brb = vert->tlb =\
 			vert->isect_cache[0] = vert->isect_cache[1] =\
 			vert->isect_cache[2] = vert->isect_cache[3] = NULL;
-		vert->free = 15 &~ BLF;
+		vert->free = CORNERFLAGS &~ BLF;
 		vert->blb = box;
 		vert->index = i; i++;
 		box->v[TR] = vert; vert++;
@@ -175,7 +177,7 @@ void boxPack2D(boxPack *boxarray, int len, float *tot_width, float *tot_height)
 		vert->trb = vert->blb = vert->tlb =\
 			vert->isect_cache[0] = vert->isect_cache[1] =\
 			vert->isect_cache[2] = vert->isect_cache[3] = NULL;
-		vert->free = 15 &~ BRF;
+		vert->free = CORNERFLAGS &~ BRF;
 		vert->brb = box;
 		vert->index = i; i++;
 		box->v[TL] = vert; vert++;
@@ -183,7 +185,7 @@ void boxPack2D(boxPack *boxarray, int len, float *tot_width, float *tot_height)
 		vert->trb = vert->blb = vert->brb =\
 			vert->isect_cache[0] = vert->isect_cache[1] =\
 			vert->isect_cache[2] = vert->isect_cache[3] = NULL;
-		vert->free = 15 &~ TLF;
+		vert->free = CORNERFLAGS &~ TLF;
 		vert->tlb = box; 
 		vert->index = i; i++;
 		box->v[BR] = vert; vert++;
diff --git a/source/blender/imbuf/intern/anim.c b/source/blender/imbuf/intern/anim.c
index 720f5b0f7c8..c0e84b73e47 100644
--- a/source/blender/imbuf/intern/anim.c
+++ b/source/blender/imbuf/intern/anim.c
@@ -612,6 +612,7 @@ static int startffmpeg(struct anim * anim) {
 		av_free(anim->pFrameRGB);
 		av_free(anim->pFrameDeinterlaced);
 		av_free(anim->pFrame);
+		anim->pCodecCtx = NULL;
 		return -1;
 	}
 
@@ -639,7 +640,19 @@ static int startffmpeg(struct anim * anim) {
 		PIX_FMT_BGR32,
 		SWS_FAST_BILINEAR | SWS_PRINT_INFO,
 		NULL, NULL, NULL);
-				
+		
+	if (!anim->img_convert_ctx) {
+		fprintf (stderr,
+			 "Can't transform color space??? Bailing out...\n");
+		avcodec_close(anim->pCodecCtx);
+		av_close_input_file(anim->pFormatCtx);
+		av_free(anim->pFrameRGB);
+		av_free(anim->pFrameDeinterlaced);
+		av_free(anim->pFrame);
+		anim->pCodecCtx = NULL;
+		return -1;
+	}
+		
 	return (0);
 }
 
diff --git a/source/blender/include/BIF_editarmature.h b/source/blender/include/BIF_editarmature.h
index da98eb3d4f1..13c16749612 100644
--- a/source/blender/include/BIF_editarmature.h
+++ b/source/blender/include/BIF_editarmature.h
@@ -108,7 +108,8 @@ void	mouse_armature(void);
 void	remake_editArmature(void);
 void	selectconnected_armature(void);
 void	selectconnected_posearmature(void);
-void	select_bone_parent(void);
+void	armature_select_hierarchy(short direction, short add_to_sel);
+
 void	setflag_armature(short mode);
 void    unique_editbone_name (struct ListBase *ebones, char *name);
 
@@ -143,6 +144,10 @@ void	set_locks_armature_bones(short lock);
 
 #define BONESEL_NOSEL	0x80000000	/* Indicates a negative number */
 
+/* used in bone_select_hierachy() */
+#define BONE_SELECT_PARENT	0
+#define BONE_SELECT_CHILD	1
+
 #endif
 
 
diff --git a/source/blender/include/BIF_editmesh.h b/source/blender/include/BIF_editmesh.h
index ca9f3d6a378..9354a577ac1 100644
--- a/source/blender/include/BIF_editmesh.h
+++ b/source/blender/include/BIF_editmesh.h
@@ -132,7 +132,7 @@ extern int EM_check_backbuf(unsigned int index);
 extern void EM_free_backbuf(void);
 
 extern void EM_selectmode_menu(void);
-
+extern void EM_mesh_copy_face(short type);
 
 extern void vertexnoise(void);
 extern void vertexsmooth(void);
diff --git a/source/blender/include/BIF_poseobject.h b/source/blender/include/BIF_poseobject.h
index 58c67ff102a..ab96f7ec03e 100644
--- a/source/blender/include/BIF_poseobject.h
+++ b/source/blender/include/BIF_poseobject.h
@@ -65,6 +65,8 @@ void pose_assign_to_posegroup(short active);
 void pose_remove_from_posegroups(void);
 void pgroup_operation_with_menu(void);
 
+void pose_select_hierarchy(short direction, short add_to_sel);
+
 void pose_select_grouped(short nr);
 void pose_select_grouped_menu(void);
 
diff --git a/source/blender/include/butspace.h b/source/blender/include/butspace.h
index c0542e3f34c..8e80f630cf2 100644
--- a/source/blender/include/butspace.h
+++ b/source/blender/include/butspace.h
@@ -593,7 +593,7 @@ void curvemap_buttons(struct uiBlock *block, struct CurveMapping *cumap, char la
 
 #define B_VPCOLSLI		2801
 #define B_VPGAMMA		2802
-
+#define B_COPY_TF_TRANSP	2803
 #define B_COPY_TF_MODE		2804
 #define B_COPY_TF_UV		2805
 #define B_COPY_TF_COL		2806
diff --git a/source/blender/python/BPY_interface.c b/source/blender/python/BPY_interface.c
index 36a8ee27a50..48633d37fa2 100644
--- a/source/blender/python/BPY_interface.c
+++ b/source/blender/python/BPY_interface.c
@@ -160,11 +160,10 @@ ScriptError g_script_error;
 * Function prototypes 
 ***************************************************************************/
 PyObject *RunPython( Text * text, PyObject * globaldict );
-char *GetName( Text * text );
 PyObject *CreateGlobalDictionary( void );
 void ReleaseGlobalDictionary( PyObject * dict );
 void DoAllScriptsFromList( ListBase * list, short event );
-PyObject *importText( char *name );
+static PyObject *importText( char *name );
 void init_ourImport( void );
 void init_ourReload( void );
 PyObject *blender_import( PyObject * self, PyObject * args );
@@ -651,7 +650,7 @@ int BPY_txt_do_python_Text( struct Text *text )
 	}
 
 	/* Create a new script structure and initialize it: */
-	script = alloc_libblock( &G.main->script, ID_SCRIPT, GetName( text ) );
+	script = alloc_libblock( &G.main->script, ID_SCRIPT, text->id.name+2 );
 
 	if( !script ) {
 		printf( "couldn't allocate memory for Script struct!" );
@@ -662,8 +661,7 @@ int BPY_txt_do_python_Text( struct Text *text )
 	 * an error after it will call BPY_Err_Handle below, but the text struct
 	 * will have been deallocated already, so we need to copy its name here.
 	 */
-	BLI_strncpy( textname, GetName( text ),
-		     strlen( GetName( text ) ) + 1 );
+	BLI_strncpy( textname, text->id.name+2, 21 );
 
 	script->id.us = 1;
 	script->flags = SCRIPT_RUNNING;
@@ -1135,12 +1133,10 @@ int BPY_menu_invoke( BPyMenu *pym, short menutype )
 *****************************************************************************/
 void BPY_free_compiled_text( struct Text *text )
 {
-	if( !text->compiled )
-		return;
-	Py_DECREF( ( PyObject * ) text->compiled );
-	text->compiled = NULL;
-
-	return;
+	if( text->compiled ) {
+		Py_DECREF( ( PyObject * ) text->compiled );
+		text->compiled = NULL;
+	}
 }
 
 /*****************************************************************************
@@ -2753,8 +2749,7 @@ PyObject *RunPython( Text * text, PyObject * globaldict )
 		buf = txt_to_buf( text );
 
 		text->compiled =
-			Py_CompileString( buf, GetName( text ),
-					  Py_file_input );
+			Py_CompileString( buf, text->id.name+2, Py_file_input );
 
 		MEM_freeN( buf );
 
@@ -2768,15 +2763,6 @@ PyObject *RunPython( Text * text, PyObject * globaldict )
 	return PyEval_EvalCode( text->compiled, globaldict, globaldict );
 }
 
-/*****************************************************************************
-* Description: This function returns the value of the name field of the	
-*	given Text struct.
-*****************************************************************************/
-char *GetName( Text * text )
-{
-	return ( text->id.name + 2 );
-}
-
 /*****************************************************************************
 * Description: This function creates a new Python dictionary object.
 *****************************************************************************/
@@ -2821,49 +2807,38 @@ void DoAllScriptsFromList( ListBase * list, short event )
 	return;
 }
 
-PyObject *importText( char *name )
+static PyObject *importText( char *name )
 {
 	Text *text;
-	char *txtname;
+	char txtname[22]; /* 21+NULL */
 	char *buf = NULL;
 	int namelen = strlen( name );
-
-	txtname = malloc( namelen + 3 + 1 );
-	if( !txtname )
-		return NULL;
-
+	
+	if (namelen>21-3) return NULL; /* we know this cant be importable, the name is too long for blender! */
+	
 	memcpy( txtname, name, namelen );
 	memcpy( &txtname[namelen], ".py", 4 );
 
-	text = ( Text * ) & ( G.main->text.first );
-
-	while( text ) {
-		if( !strcmp( txtname, GetName( text ) ) )
+	for(text = G.main->text.first; text; text = text->id.next) {
+		if( !strcmp( txtname, text->id.name+2 ) )
 			break;
-		text = text->id.next;
 	}
 
-	if( !text ) {
-		free( txtname );
+	if( !text )
 		return NULL;
-	}
 
 	if( !text->compiled ) {
 		buf = txt_to_buf( text );
-		text->compiled =
-			Py_CompileString( buf, GetName( text ),
-					  Py_file_input );
+		text->compiled = Py_CompileString( buf, text->id.name+2, Py_file_input );
 		MEM_freeN( buf );
 
 		if( PyErr_Occurred(  ) ) {
 			PyErr_Print(  );
 			BPY_free_compiled_text( text );
-			free( txtname );
 			return NULL;
 		}
 	}
 
-	free( txtname );
 	return PyImport_ExecCodeModule( name, text->compiled );
 }
 
@@ -2934,7 +2909,7 @@ static PyObject *reimportText( PyObject *module )
 	/* look up the text object */
 	text = ( Text * ) & ( G.main->text.first );
 	while( text ) {
-		if( !strcmp( txtname, GetName( text ) ) )
+		if( !strcmp( txtname, text->id.name+2 ) )
 			break;
 		text = text->id.next;
 	}
@@ -2951,8 +2926,7 @@ static PyObject *reimportText( PyObject *module )
 
 	/* compile the buffer */
 	buf = txt_to_buf( text );
-	text->compiled = Py_CompileString( buf, GetName( text ),
-			Py_file_input );
+	text->compiled = Py_CompileString( buf, text->id.name+2, Py_file_input );
 	MEM_freeN( buf );
 
 	/* if compile failed.... return this error */
diff --git a/source/blender/python/api2_2x/Blender.c b/source/blender/python/api2_2x/Blender.c
index 420d292cdce..2b190a6c828 100644
--- a/source/blender/python/api2_2x/Blender.c
+++ b/source/blender/python/api2_2x/Blender.c
@@ -1074,7 +1074,7 @@ void M_Blender_Init(void)
 	PyDict_SetItemString(dict, "Material", Material_Init());
 	PyDict_SetItemString(dict, "Mesh", Mesh_Init()); 
 	PyDict_SetItemString(dict, "Metaball", Metaball_Init());
-	PyDict_SetItemString(dict, "Mathutils", Mathutils_Init());
+	PyDict_SetItemString(dict, "Mathutils", Mathutils_Init("Blender.Mathutils"));
 	PyDict_SetItemString(dict, "Geometry", Geometry_Init());
 	PyDict_SetItemString(dict, "Modifier", Modifier_Init());
 	PyDict_SetItemString(dict, "NMesh", NMesh_Init());
diff --git a/source/blender/python/api2_2x/Constraint.c b/source/blender/python/api2_2x/Constraint.c
index 8db6a49465e..a62a5ee7ed8 100644
--- a/source/blender/python/api2_2x/Constraint.c
+++ b/source/blender/python/api2_2x/Constraint.c
@@ -29,6 +29,7 @@
 
 #include "Constraint.h" /*This must come first*/
 
+#include "DNA_armature_types.h"
 #include "DNA_object_types.h"
 #include "DNA_effect_types.h"
 #include "DNA_vec_types.h"
@@ -43,6 +44,7 @@
 #include "BKE_constraint.h"
 #include "BLI_blenlib.h"
 #include "BIF_editconstraint.h"
+#include "BIF_poseobject.h"
 #include "BSE_editipo.h"
 #include "MEM_guardedalloc.h"
 #include "butspace.h"
@@ -2286,19 +2288,32 @@ static PyObject *ConstraintSeq_moveDown( BPy_ConstraintSeq *self, BPy_Constraint
 
 static PyObject *ConstraintSeq_remove( BPy_ConstraintSeq *self, BPy_Constraint *value )
 {
-	bConstraint *con = locate_constr( self,  value );
+	bConstraint *con = locate_constr(self, value);
+	bPoseChannel *active= NULL;
 
 	/* if we can't locate the constraint, return (exception already set) */
-	if( !con )
+	if (!con)
 		return (PyObject *)NULL;
 
-	/* do the actual removal */
-	if( self->pchan )
-		BLI_remlink( &self->pchan->constraints, con );
-	else
-		BLI_remlink( &self->obj->constraints, con);
+	/* check if we need to set temporary 'active' flag for pchan */
+	if (self->pchan) {
+		active= get_active_posechannel(self->obj);
+		
+		if (active != self->pchan) {
+			if (active) active->bone->flag &= ~BONE_ACTIVE;
+			self->pchan->bone->flag |= BONE_ACTIVE;
+		}
+	}
+	
+	/* del_constr_func() frees constraint + its data */
 	del_constr_func( self->obj, con );
 
+	/* reset active pchan (if applicable) */
+	if (self->pchan && self->pchan!=active) {
+		if (active) active->bone->flag |= BONE_ACTIVE;
+		self->pchan->bone->flag &= ~BONE_ACTIVE;
+	}
+	
 	/* erase the link to the constraint */
 	value->con = NULL;
 
diff --git a/source/blender/python/api2_2x/Material.c b/source/blender/python/api2_2x/Material.c
index c36213950b0..ccd24a437b5 100644
--- a/source/blender/python/api2_2x/Material.c
+++ b/source/blender/python/api2_2x/Material.c
@@ -131,11 +131,11 @@
 #define EXPP_MAT_RAYMIRRGLOSS_MIN			 0.0
 #define EXPP_MAT_RAYMIRRGLOSS_MAX			 1.0
 #define EXPP_MAT_RAYMIRRGLOSSSAMPLES_MIN	 0
-#define EXPP_MAT_RAYMIRRGLOSSSAMPLES_MAX	 255
+#define EXPP_MAT_RAYMIRRGLOSSSAMPLES_MAX	 1024
 #define EXPP_MAT_RAYTRANSPGLOSS_MIN			 0.0
 #define EXPP_MAT_RAYTRANSPGLOSS_MAX			 1.0
 #define EXPP_MAT_RAYTRANSPGLOSSSAMPLES_MIN	 0
-#define EXPP_MAT_RAYTRANSPGLOSSSAMPLES_MAX	 255
+#define EXPP_MAT_RAYTRANSPGLOSSSAMPLES_MAX	 1024
 #define EXPP_MAT_FILTER_MIN			0.0
 #define EXPP_MAT_FILTER_MAX			1.0
 #define EXPP_MAT_TRANSLUCENCY_MIN			0.0
@@ -738,8 +738,10 @@ static PyMethodDef BPy_Material_methods[] = {
 	 "() - Return fresnel power for refractions factor"},
 	{"getRayTransGloss", ( PyCFunction ) Material_getGlossTrans, METH_NOARGS,
 	 "() - Return amount refraction glossiness"},
+	{"getRayTransGlossSamples", ( PyCFunction ) Material_getGlossTransSamples, METH_NOARGS,
+	 "() - Return number of sampels for transparent glossiness"},
 	{"getRayMirrGlossSamples", ( PyCFunction ) Material_getGlossMirrSamples, METH_NOARGS,
-	 "() - Return amount mirror glossiness"},
+	 "() - Return number of sampels for mirror glossiness"},
 	{"getFilter", ( PyCFunction ) Material_getFilter, METH_NOARGS,
 	 "() - Return the amount of filtering when transparent raytrace is enabled"},
 	{"getTranslucency", ( PyCFunction ) Material_getTranslucency, METH_NOARGS,
@@ -847,8 +849,10 @@ static PyMethodDef BPy_Material_methods[] = {
 	 "(f) - Set blend fac for mirror fresnel - [1.0, 5.0]"},
 	{"setRayTransGloss", ( PyCFunction ) Material_setGlossTrans, METH_VARARGS,
 	 "(f) - Set amount refraction glossiness - [0.0, 1.0]"},
+	{"setRayTransGlossSamples", ( PyCFunction ) Material_setGlossTransSamples, METH_VARARGS,
+	 "(i) - Set number transparent gloss samples - [1, 1024]"},
 	{"setRayMirrGlossSamples", ( PyCFunction ) Material_setGlossMirrSamples, METH_VARARGS,
-	 "(f) - Set amount mirror glossiness - [0.0, 1.0]"},
+	 "(i) - Set number mirror gloss samples - [1, 1024]"},
 	{"setFilter", ( PyCFunction ) Matr_oldsetFilter, METH_VARARGS,
 	 "(f) - Set the amount of filtering when transparent raytrace is enabled"},
 	{"setTranslucency", ( PyCFunction ) Matr_oldsetTranslucency, METH_VARARGS,
diff --git a/source/blender/python/api2_2x/Mathutils.c b/source/blender/python/api2_2x/Mathutils.c
index 85c56a61628..217e096060f 100644
--- a/source/blender/python/api2_2x/Mathutils.c
+++ b/source/blender/python/api2_2x/Mathutils.c
@@ -106,8 +106,9 @@ struct PyMethodDef M_Mathutils_methods[] = {
 	{"Point", (PyCFunction) M_Mathutils_Point, METH_VARARGS, M_Mathutils_Point_doc},
 	{NULL, NULL, 0, NULL}
 };
-//----------------------------MODULE INIT-------------------------
-PyObject *Mathutils_Init(void)
+/*----------------------------MODULE INIT-------------------------*/
+/* from can be Blender.Mathutils or GameLogic.Mathutils for the BGE */
+PyObject *Mathutils_Init(char *from)
 {
 	PyObject *submodule;
 
@@ -125,8 +126,7 @@ PyObject *Mathutils_Init(void)
 	if( PyType_Ready( &quaternion_Type ) < 0 )
 		return NULL;
 	
-	submodule = Py_InitModule3("Blender.Mathutils",
-				    M_Mathutils_methods, M_Mathutils_doc);
+	submodule = Py_InitModule3(from, M_Mathutils_methods, M_Mathutils_doc);
 	return (submodule);
 }
 //-----------------------------METHODS----------------------------
diff --git a/source/blender/python/api2_2x/Mathutils.h b/source/blender/python/api2_2x/Mathutils.h
index dd9aae2abed..76d53cb6c4c 100644
--- a/source/blender/python/api2_2x/Mathutils.h
+++ b/source/blender/python/api2_2x/Mathutils.h
@@ -38,7 +38,7 @@
 #include "euler.h"
 #include "point.h"
 
-PyObject *Mathutils_Init( void );
+PyObject *Mathutils_Init( char * from );
 PyObject *row_vector_multiplication(VectorObject* vec, MatrixObject * mat);
 PyObject *column_vector_multiplication(MatrixObject * mat, VectorObject* vec);
 PyObject *row_point_multiplication(PointObject* pt, MatrixObject * mat);
diff --git a/source/blender/python/api2_2x/doc/Render.py b/source/blender/python/api2_2x/doc/Render.py
index d4dc83e84a0..df688893aa3 100644
--- a/source/blender/python/api2_2x/doc/Render.py
+++ b/source/blender/python/api2_2x/doc/Render.py
@@ -772,7 +772,7 @@ class RenderData:
     """
     Get/set the starting frame for sequence rendering.
     @type frame: int (optional)
-    @param frame: must be between 1 - 18000
+    @param frame: must be a valid Blender frame number.
     @rtype: int (if prototype is empty)
     @return: Current starting frame for the scene.
     """
@@ -781,7 +781,7 @@ class RenderData:
     """
     Get/set the ending frame for sequence rendering.
     @type frame: int (optional)
-    @param frame: must be between 1 - 18000
+    @param frame: must be a valid Blender frame number.
     @rtype: int (if prototype is empty)
     @return: Current ending frame for the scene.
     """
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index faa7a68f754..e4a5ad67631 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -1865,9 +1865,17 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem
 			num= cpa->num;
 
 			/* get orco */
-			psys_particle_on_emitter(ob, psmd,
-				(part->childtype == PART_CHILD_FACES)? PART_FROM_FACE: PART_FROM_PARTICLE,
-				cpa->num,DMCACHE_ISCHILD,cpa->fuv,cpa->foffset,co,nor,0,0,orco,0);
+			if(part->childtype == PART_CHILD_FACES) {
+				psys_particle_on_emitter(ob, psmd,
+					PART_FROM_FACE, cpa->num,DMCACHE_ISCHILD,
+					cpa->fuv,cpa->foffset,co,nor,0,0,orco,0);
+			}
+			else {
+				ParticleData *par = psys->particles + cpa->parent;
+				psys_particle_on_emitter(ob, psmd, part->from,
+					par->num,DMCACHE_ISCHILD,par->fuv,
+					par->foffset,co,nor,0,0,orco,0);
+			}
 
 			if(uvco){
 				if(part->from!=PART_FROM_PARTICLE && part->childtype==PART_CHILD_FACES){
diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c
index b26c52a92e2..cb6f7e629fa 100644
--- a/source/blender/src/buttons_editing.c
+++ b/source/blender/src/buttons_editing.c
@@ -5671,13 +5671,9 @@ void sculptmode_draw_interface_textures(uiBlock *block, unsigned short cx, unsig
 
 void do_fpaintbuts(unsigned short event)
 {
-	Mesh *me;
 	Object *ob;
 	bDeformGroup *defGroup;
-	MTFace *activetf, *tf;
-	MFace *mf;
-	MCol *activemcol;
-	int a;
+	MTFace *activetf;
 	SculptData *sd= &G.scene->sculptdata;
 	ID *id, *idtest;
 	extern VPaint Gwp;         /* from vpaint */
@@ -5695,45 +5691,19 @@ void do_fpaintbuts(unsigned short event)
 		vpaint_dogamma();
 		break;
 	case B_COPY_TF_MODE:
+		EM_mesh_copy_face(4); /* todo, get rid of magic numbers */
+		break;
+	case B_COPY_TF_TRANSP:
+		EM_mesh_copy_face(5);
+		break;
 	case B_COPY_TF_UV:
+		EM_mesh_copy_face(3);
+		break;
 	case B_COPY_TF_COL:
+		EM_mesh_copy_face(6);
+		break;
 	case B_COPY_TF_TEX:
-		me= get_mesh(OBACT);
-		activetf= get_active_mtface(NULL, &activemcol, 0);
-
-		if(me && activetf) {
-			for (a=0, tf=me->mtface, mf=me->mface; a < me->totface; a++, tf++, mf++) {
-				if(tf!=activetf && (mf->flag & ME_FACE_SEL)) {
-					if(event==B_COPY_TF_MODE) {
-						tf->mode= activetf->mode;
-						tf->transp= activetf->transp;
-					}
-					else if(event==B_COPY_TF_UV) {
-						memcpy(tf->uv, activetf->uv, sizeof(tf->uv));
-						tf->tpage= activetf->tpage;
-						tf->tile= activetf->tile;
-
-						if(activetf->mode & TF_TILES) tf->mode |= TF_TILES;
-						else tf->mode &= ~TF_TILES;
-
-					}
-					else if(event==B_COPY_TF_TEX) {
-						tf->tpage= activetf->tpage;
-						tf->tile= activetf->tile;
-
-						if(activetf->mode & TF_TILES) tf->mode |= TF_TILES;
-						else tf->mode &= ~TF_TILES;
-					}
-					else if(event==B_COPY_TF_COL && activemcol)
-						memcpy(&me->mcol[a*4], activemcol, sizeof(MCol)*4);
-				}
-			}
-
-			DAG_object_flush_update(G.scene, ob, OB_RECALC_DATA);
-			do_shared_vertexcol(me);
-			allqueue(REDRAWVIEW3D, 0);
-			allqueue(REDRAWIMAGE, 0);
-		}
+		EM_mesh_copy_face(2);
 		break;
 	case B_SET_VCOL:
 		if(FACESEL_PAINT_TEST) 
@@ -6170,8 +6140,20 @@ static void editing_panel_mesh_texface(void)
 	if(uiNewPanel(curarea, block, "Texture Face", "Editing", 960, 0, 318, 204)==0) return;
 	
 	tf = get_active_mtface(NULL, NULL, 0);
+	
 	if(tf) {
+		uiDefBut(block, LABEL, B_NOP, "Active Face Mode",	600,185,300,19, NULL, 0.0, 0.0, 0, 0, "Face mode its used for TexFace display and the game engine ");
+		uiDefBut(block, BUT,B_COPY_TF_MODE, "Copy", 850,185,50,19, 0, 0, 0, 0, 0, "Copy active faces mode to other selected (View3D Ctrl+C)");
+		
+		/* Other copy buttons, layout isnt that nice */
 		uiBlockBeginAlign(block);
+		uiDefBut(block, BUT,B_COPY_TF_UV, "CopyUV", 600,15,100,19, 0, 0, 0, 0, 0, "Copy active faces UVs to other selected (View3D Ctrl+C)");
+		uiDefBut(block, BUT,B_COPY_TF_TEX, "CopyTex", 700,15,100,19, 0, 0, 0, 0, 0, "Copy active faces Texture to other selected (View3D Ctrl+C)");		
+		uiDefBut(block, BUT,B_COPY_TF_COL, "CopyColor", 800,15,100,19, 0, 0, 0, 0, 0, "Copy active faces Color to other selected (View3D Ctrl+C)");
+		uiBlockEndAlign(block);
+		
+		uiBlockBeginAlign(block);
+		
 		uiDefButBitS(block, TOG, TF_TEX, B_REDR_3D_IMA, "Tex",	600,160,60,19, &tf->mode, 0, 0, 0, 0, "Render face with texture");
 		uiDefButBitS(block, TOG, TF_TILES, B_REDR_3D_IMA, "Tiles",	660,160,60,19, &tf->mode, 0, 0, 0, 0, "Use tilemode for face");
 		uiDefButBitS(block, TOG, TF_LIGHT, REDRAWVIEW3D, "Light",	720,160,60,19, &tf->mode, 0, 0, 0, 0, "Use light for face");
@@ -6182,24 +6164,30 @@ static void editing_panel_mesh_texface(void)
 		uiDefButBitS(block, TOG, TF_SHAREDCOL, REDRAWVIEW3D, "Shared",	600,135,60,19, &tf->mode, 0, 0, 0, 0, "Blend vertex colors across face when vertices are shared");
 		uiDefButBitS(block, TOG, TF_TWOSIDE, REDRAWVIEW3D, "Twoside",660,135,60,19, &tf->mode, 0, 0, 0, 0, "Render face twosided");
 		uiDefButBitS(block, TOG, TF_OBCOL, REDRAWVIEW3D, "ObColor",720,135,60,19, &tf->mode, 0, 0, 0, 0, "Use ObColor instead of vertex colors");
-
-		uiBlockBeginAlign(block);
+		uiBlockEndAlign(block);
 		
+		uiBlockBeginAlign(block);
 		uiDefButBitS(block, TOG, TF_BILLBOARD, B_TFACE_HALO, "Halo",	600,110,60,19, &tf->mode, 0, 0, 0, 0, "Screen aligned billboard");
 		uiDefButBitS(block, TOG, TF_BILLBOARD2, B_TFACE_BILLB, "Billboard",660,110,60,19, &tf->mode, 0, 0, 0, 0, "Billboard with Z-axis constraint");
 		uiDefButBitS(block, TOG, TF_SHADOW, REDRAWVIEW3D, "Shadow", 720,110,60,19, &tf->mode, 0, 0, 0, 0, "Face is used for shadow");
 		uiDefButBitS(block, TOG, TF_BMFONT, REDRAWVIEW3D, "Text", 780,110,60,19, &tf->mode, 0, 0, 0, 0, "Enable bitmap text on face");
 		uiDefButBitS(block, TOG, TF_ALPHASORT, REDRAWVIEW3D, "Sort", 840,110,60,19, &tf->mode, 0, 0, 0, 0, "Enable sorting of faces for correct alpha drawing (slow, use Clip Alpha instead when possible)");
-
+		uiBlockEndAlign(block);
+		
+		uiDefBut(block, LABEL, B_NOP, "Active Face Alpha Blending (Transp)",	600,75,300,19, NULL, 0.0, 0.0, 0, 0, "Face mode its used for TexFace display and the game engine");
+		uiDefBut(block, BUT,B_COPY_TF_TRANSP, "Copy", 850,75,50,19, 0, 0, 0, 0, 0, "Copy active faces transp to other selected (View3D Ctrl+C)");
+		
 		uiBlockBeginAlign(block);
 		uiBlockSetCol(block, TH_BUT_SETTING1);
-		uiDefButC(block, ROW, REDRAWVIEW3D, "Opaque",	600,80,60,19, &tf->transp, 2.0, (float)TF_SOLID,0, 0, "Render color of textured face as color");
-		uiDefButC(block, ROW, REDRAWVIEW3D, "Add",		660,80,60,19, &tf->transp, 2.0, (float)TF_ADD,	0, 0, "Render face transparent and add color of face");
-		uiDefButC(block, ROW, REDRAWVIEW3D, "Alpha",	720,80,60,19, &tf->transp, 2.0, (float)TF_ALPHA,0, 0, "Render polygon transparent, depending on alpha channel of the texture");
-		uiDefButC(block, ROW, REDRAWVIEW3D, "Clip Alpha",	780,80,80,19, &tf->transp, 2.0, (float)TF_CLIP,0, 0, "Use the images alpha values clipped with no blending (binary alpha)");
-	}
-	else
+		uiDefButC(block, ROW, REDRAWVIEW3D, "Opaque",		600,50,60,19, &tf->transp, 2.0, (float)TF_SOLID,0, 0, "Render color of textured face as color");
+		uiDefButC(block, ROW, REDRAWVIEW3D, "Add",			660,50,60,19, &tf->transp, 2.0, (float)TF_ADD,	0, 0, "Render face transparent and add color of face");
+		uiDefButC(block, ROW, REDRAWVIEW3D, "Alpha",		720,50,60,19, &tf->transp, 2.0, (float)TF_ALPHA,0, 0, "Render polygon transparent, depending on alpha channel of the texture");
+		uiDefButC(block, ROW, REDRAWVIEW3D, "Clip Alpha",	780,50,80,19, &tf->transp, 2.0, (float)TF_CLIP,0, 0,  "Use the images alpha values clipped with no blending (binary alpha)");
+		uiBlockEndAlign(block);
+		
+	} else {
 		uiDefBut(block,LABEL,B_NOP, "(No Active Face)", 10,200,150,19,0,0,0,0,0,"");
+	}
 
 }
 
diff --git a/source/blender/src/buttons_object.c b/source/blender/src/buttons_object.c
index 2c7802c3302..58f3bff09c8 100644
--- a/source/blender/src/buttons_object.c
+++ b/source/blender/src/buttons_object.c
@@ -173,6 +173,7 @@ static void constraint_active_func(void *ob_v, void *con_v)
 	}
 	
 	lb= get_active_constraints(ob);
+	if (lb == NULL) return;
 	
 	for(con= lb->first; con; con= con->next) {
 		if(con==con_v) con->flag |= CONSTRAINT_ACTIVE;
@@ -307,7 +308,7 @@ void del_constr_func (void *ob_v, void *con_v)
 	}
 	/* remove constraint itself */
 	lb= get_active_constraints(ob_v);
-	free_constraint_data (con);
+	free_constraint_data(con);
 	BLI_freelinkN(lb, con);
 	
 	constraint_active_func(ob_v, NULL);
diff --git a/source/blender/src/buttons_scene.c b/source/blender/src/buttons_scene.c
index 3b0167d673c..fb6a7636e16 100644
--- a/source/blender/src/buttons_scene.c
+++ b/source/blender/src/buttons_scene.c
@@ -763,7 +763,16 @@ static void seq_panel_input()
 	}
 
 	if (last_seq->type == SEQ_IMAGE) {
-		StripElem * se = give_stripelem(last_seq, CFRA);
+		int cfra = CFRA;
+		StripElem * se;
+
+		if(last_seq->startdisp >cfra) {
+			cfra = last_seq->startdisp;
+		} else if (last_seq->enddisp <= cfra) {
+			cfra = last_seq->enddisp - 1;
+		}
+
+		se = give_stripelem(last_seq, cfra);
 
 		if (se) {
 			uiDefBut(block, TEX, 
diff --git a/source/blender/src/drawgpencil.c b/source/blender/src/drawgpencil.c
index 733310bfda7..ee28049e2c0 100644
--- a/source/blender/src/drawgpencil.c
+++ b/source/blender/src/drawgpencil.c
@@ -310,6 +310,8 @@ short draw_gpencil_panel (uiBlock *block, bGPdata *gpd, ScrArea *sa)
 /* ************************************************** */
 /* GREASE PENCIL DRAWING */
 
+/* ----- General Defines ------ */
+
 /* flags for sflag */
 enum {
 	GP_DRAWDATA_NOSTATUS 	= (1<<0),	/* don't draw status info */
@@ -317,7 +319,9 @@ enum {
 	GP_DRAWDATA_ONLYV2D		= (1<<2),	/* only draw 'canvas' strokes */
 };
 
-/* draw stroke in buffer */
+/* ----- Tool Buffer Drawing ------ */
+
+/* draw stroke defined in buffer (simple ogl lines/points for now, as dotted lines) */
 static void gp_draw_stroke_buffer (tGPspoint *points, int totpoints, short thickness, short dflag, short sflag)
 {
 	tGPspoint *pt;
@@ -377,115 +381,232 @@ static void gp_draw_stroke_buffer (tGPspoint *points, int totpoints, short thick
 	}
 }
 
-/* draw a given stroke */
-static void gp_draw_stroke (bGPDspoint *points, int totpoints, short thickness, short dflag, short sflag, short debug, int winx, int winy)
+/* ----- Existing Strokes Drawing (3D and Point) ------ */
+
+/* draw a given stroke - just a single dot (only one point) */
+static void gp_draw_stroke_point (bGPDspoint *points, short sflag, int winx, int winy)
 {
-	bGPDspoint *pt;
-	int i;
-	
-	/* error checking */
-	if ((points == NULL) || (totpoints <= 0))
-		return;
-	
-	/* check if stroke can be drawn */
-	if ((dflag & GP_DRAWDATA_ONLY3D) && !(sflag & GP_STROKE_3DSPACE))
-		return;
-	if (!(dflag & GP_DRAWDATA_ONLY3D) && (sflag & GP_STROKE_3DSPACE))
-		return;
-	if ((dflag & GP_DRAWDATA_ONLYV2D) && !(sflag & GP_STROKE_2DSPACE))
-		return;
-	if (!(dflag & GP_DRAWDATA_ONLYV2D) && (sflag & GP_STROKE_2DSPACE))
-		return;
-	
-	/* if drawing a single point, draw it larger */
-	if (totpoints == 1) {		
-		/* draw point */
-		if (sflag & GP_STROKE_3DSPACE) {
-			glBegin(GL_POINTS);
-				glVertex3f(points->x, points->y, points->z);
-			glEnd();
-		}
-		else if (sflag & GP_STROKE_2DSPACE) {
-			glBegin(GL_POINTS);
-				glVertex2f(points->x, points->y);
-			glEnd();
-		}
-		else {
-			const float x= (points->x / 1000 * winx);
-			const float y= (points->y / 1000 * winy);
-			
-			glBegin(GL_POINTS);
-				glVertex2f(x, y);
-			glEnd();
-		}
+	/* draw point */
+	if (sflag & GP_STROKE_3DSPACE) {
+		glBegin(GL_POINTS);
+			glVertex3f(points->x, points->y, points->z);
+		glEnd();
+	}
+	else if (sflag & GP_STROKE_2DSPACE) {
+		glBegin(GL_POINTS);
+			glVertex2f(points->x, points->y);
+		glEnd();
 	}
 	else {
-		float oldpressure = 0.0f;
+		const float x= (points->x / 1000 * winx);
+		const float y= (points->y / 1000 * winy);
+		
+		glBegin(GL_POINTS);
+			glVertex2f(x, y);
+		glEnd();
+	}
+}
+
+/* draw a given stroke in 3d (i.e. in 3d-space), using simple ogl lines */
+static void gp_draw_stroke_3d (bGPDspoint *points, int totpoints, short thickness, short dflag, short sflag, short debug, int winx, int winy)
+{
+	bGPDspoint *pt;
+	float oldpressure = 0.0f;
+	int i;
+	
+	/* draw stroke curve */
+	glBegin(GL_LINE_STRIP);
+	for (i=0, pt=points; i < totpoints && pt; i++, pt++) {
+		if (fabs(pt->pressure - oldpressure) > 0.2f) {
+			glEnd();
+			glLineWidth(pt->pressure * thickness);
+			glBegin(GL_LINE_STRIP);
+			
+			glVertex3f(pt->x, pt->y, pt->z);
+			
+			oldpressure = pt->pressure;
+		}
+		else
+			glVertex3f(pt->x, pt->y, pt->z);
+	}
+	glEnd();
+	
+	/* draw debug points of curve on top? */
+	if (debug) {
+		glBegin(GL_POINTS);
+		for (i=0, pt=points; i < totpoints && pt; i++, pt++)
+			glVertex3f(pt->x, pt->y, pt->z);
+		glEnd();
+	}
+}
+
+/* ----- Fancy 2D-Stroke Drawing ------ */
+
+/* draw a given stroke in 2d */
+static void gp_draw_stroke (bGPDspoint *points, int totpoints, short thickness, short dflag, short sflag, short debug, int winx, int winy)
+{	
+	/* if thickness is less than 3, 'smooth' opengl lines look better */
+	if ((thickness < 3) || (G.rt==0)) {
+		bGPDspoint *pt;
+		int i;
 		
-		/* draw stroke curve */
 		glBegin(GL_LINE_STRIP);
 		for (i=0, pt=points; i < totpoints && pt; i++, pt++) {
-			float x, y, z;
-			
-			if (sflag & GP_STROKE_3DSPACE) {
-				x= pt->x;
-				y= pt->y;
-				z= pt->z;
-			}
-			else if (sflag & GP_STROKE_2DSPACE) {
-				x= pt->x;
-				y= pt->y;
-				z= 0;
+			if (sflag & GP_STROKE_2DSPACE) {
+				glVertex2f(pt->x, pt->y);
 			}
 			else {
-				x= (pt->x / 1000 * winx);
-				y= (pt->y / 1000 * winy);
-				z= 0;
-			}
-			
-			if (fabs(pt->pressure - oldpressure) > 0.2f) {
-				glEnd();
-				glLineWidth(pt->pressure * thickness);
-				glBegin(GL_LINE_STRIP);
+				const float x= (pt->x / 1000 * winx);
+				const float y= (pt->y / 1000 * winy);
 				
-				if (sflag & GP_STROKE_3DSPACE) 
-					glVertex3f(x, y, z);
-				else
-					glVertex2f(x, y);
-				
-				oldpressure = pt->pressure;
-			}
-			else {
-				if (sflag & GP_STROKE_3DSPACE) 
-					glVertex3f(x, y, z);
-				else
-					glVertex2f(x, y);
+				glVertex2f(x, y);
 			}
 		}
 		glEnd();
+	}
+	else { /* tesselation code: currently only enabled with rt != 0 */
+		bGPDspoint *pt1, *pt2;
+		float p0[2], p1[2], pm[2];
+		int i;
 		
-		/* draw debug points of curve on top? */
-		if (debug) {
-			glBegin(GL_POINTS);
-			for (i=0, pt=points; i < totpoints && pt; i++, pt++) {
-				if (sflag & GP_STROKE_3DSPACE) {
-					glVertex3f(pt->x, pt->y, pt->z);
-				}
-				else if (sflag & GP_STROKE_2DSPACE) {
-					glVertex2f(pt->x, pt->y);
-				}
-				else {
-					const float x= (pt->x / 1000 * winx);
-					const float y= (pt->y / 1000 * winy);
-					
-					glVertex2f(x, y);
-				}
+		glShadeModel(GL_FLAT);
+		glBegin(GL_QUAD_STRIP);
+		
+		for (i=0, pt1=points, pt2=points+1; i < (totpoints-1); i++, pt1++, pt2++) {
+			float s0[2], s1[2];		/* segment 'center' points */
+			float t0[2], t1[2];		/* tesselated coordinates */
+			float m1[2], m2[2];		/* gradient and normal */
+			float pthick, dist;		/* thickness at segment point, and length of segment */
+			float sminorang;		/* minor angle between strokes */
+			
+			/* get x and y coordinates from points */
+			if (sflag & GP_STROKE_2DSPACE) {
+				s0[0]= pt1->x; 		s0[1]= pt1->y;
+				s1[0]= pt2->x;		s1[1]= pt2->y;
 			}
-			glEnd();
+			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);
+			}		
+			
+			/* calculate gradient and normal - 'angle'=(ny/nx) */
+			m1[1]= s1[1] - s0[1];		
+			m1[0]= s1[0] - s0[0];
+			dist = Vec2Lenf(s0, s1);
+			m2[1]= -(m1[0]) / dist;
+			m2[0]= m1[1] / dist;
+			
+			/* if the first segment, initialise the first segment using segment's normal */
+			if (i == 0) {	
+				pthick= (pt1->pressure * thickness);
+				
+				// TODO: also draw/do a round end-cap first
+				
+				p0[0]= s0[0] - (pthick * m2[0]);
+				p0[1]= s0[1] - (pthick * m2[1]);
+				p1[0]= s1[0] + (pthick * m2[0]);
+				p1[1]= s1[1] + (pthick * m2[1]);
+				
+				Vec2Copyf(pm, m1);
+			}
+			
+			/* if the minor angle between the current segment and the previous one is less than 90 degrees */
+			if (i)
+				sminorang= NormalizedVecAngle2_2D(pm, m1);
+			else
+				sminorang= 0.0f;
+			
+			if ((IS_EQ(sminorang, 0)==0) && (abs(sminorang) < M_PI_2) ) 
+			{
+				float closep[2];
+				
+				/* recalculate startpoint of segment, where the new start-line:
+				 * 	- starts a new gl-quad-strip
+				 *	- uses the vert of old startpoint closer to our endpoint
+				 *	- distance between new startpoints = distance between old startpoints
+				 *	- new startpoints occur on same gradient as old segment does (has potential for some 'minor' overlap, but ok)
+				 */
+				
+				/* find the closer vertex, and distance between startpoints */
+				if (Vec2Lenf(p0, s1) > Vec2Lenf(p1, s1))
+					Vec2Copyf(closep, p1);
+				else
+					Vec2Copyf(closep, p0);
+					
+				/* determine which side this closer vertex should be on */
+				pthick= (pt1->pressure * thickness * 2);
+				if ( ((closep[0] - s0[0]) > 0) || ((closep[1] - s0[1]) > 0) ) {
+					/* assumes this is the 'second' point, (i.e. the 'plus' one), so the other is subtracting */
+					p0[0]= closep[0] - (pthick * pm[0]);
+					p0[1]= closep[1] - (pthick * pm[1]);
+					p1[0]= closep[0];
+					p1[1]= closep[1];
+				}
+				else if ( ((closep[0] - s0[0]) < 0) || ((closep[1] - s0[1]) < 0) ) {
+					/* assumes this is the 'first' point, (i.e. the 'minus' one), so the other is adding */
+					p0[0]= closep[0];
+					p0[1]= closep[1];
+					p1[0]= closep[0] + (pthick * pm[0]);
+					p1[1]= closep[1] + (pthick * pm[1]);
+				}
+				
+				/* reset gl-states! */
+				glEnd();
+				glBegin(GL_QUAD_STRIP);				
+			}
+			
+			/* do the end of this segment */
+			pthick= (pt2->pressure * thickness);
+			t0[0] = s1[0] - (pthick * m2[0]);
+			t0[1] = s1[1] - (pthick * m2[1]);
+			t1[0] = s1[0] + (pthick * m2[0]);
+			t1[1] = s1[1] + (pthick * m2[1]);
+			
+			/* draw this segment */
+			glVertex2f(p0[0], p0[1]);
+			glVertex2f(p1[0], p1[1]);
+			glVertex2f(t0[0], t0[1]);
+			glVertex2f(t1[0], t1[1]);
+			
+			// TODO: draw end cap if last segment
+			if (i == totpoints-2) {
+			
+			}
+			
+			/* store current points for next segment to use */
+			Vec2Copyf(p0, t0);
+			Vec2Copyf(p1, t1);
+			Vec2Copyf(pm, m1);
 		}
+		
+		glEnd();
+	}
+	
+	/* draw debug points of curve on top? (original stroke points) */
+	if (debug) {
+		bGPDspoint *pt;
+		int i;
+		
+		glBegin(GL_POINTS);
+		for (i=0, pt=points; i < totpoints && pt; i++, pt++) {
+			if (sflag & GP_STROKE_2DSPACE) {
+				glVertex2f(pt->x, pt->y);
+			}
+			else {
+				const float x= (pt->x / 1000 * winx);
+				const float y= (pt->y / 1000 * winy);
+				
+				glVertex2f(x, y);
+			}
+		}
+		glEnd();
 	}
 }
 
+/* ----- General Drawing ------ */
+
 /* draw a set of strokes */
 static void gp_draw_strokes (bGPDframe *gpf, int winx, int winy, int dflag, short debug, 
 							 short lthick, float color[4])
@@ -495,9 +616,26 @@ static void gp_draw_strokes (bGPDframe *gpf, int winx, int winy, int dflag, shor
 	/* set color first (may need to reset it again later too) */
 	glColor4f(color[0], color[1], color[2], color[3]);
 	
-	for (gps= gpf->strokes.first; gps; gps= gps->next) {	
-		/* just draw the stroke once */
-		gp_draw_stroke(gps->points, gps->totpoints, lthick, dflag, gps->flag, debug, winx, winy);
+	for (gps= gpf->strokes.first; gps; gps= gps->next) {
+		/* check if stroke can be drawn */
+		if ((dflag & GP_DRAWDATA_ONLY3D) && !(gps->flag & GP_STROKE_3DSPACE))
+			continue;
+		if (!(dflag & GP_DRAWDATA_ONLY3D) && (gps->flag & GP_STROKE_3DSPACE))
+			continue;
+		if ((dflag & GP_DRAWDATA_ONLYV2D) && !(gps->flag & GP_STROKE_2DSPACE))
+			continue;
+		if (!(dflag & GP_DRAWDATA_ONLYV2D) && (gps->flag & GP_STROKE_2DSPACE))
+			continue;
+		if ((gps->points == 0) || (gps->totpoints < 1))
+			continue;
+		
+		/* check which stroke-drawer to use */
+		if (gps->totpoints == 1)
+			gp_draw_stroke_point(gps->points, gps->flag, winx, winy);
+		else if (dflag & GP_DRAWDATA_ONLY3D)
+			gp_draw_stroke_3d(gps->points, gps->totpoints, lthick, dflag, gps->flag, debug, winx, winy);
+		else if (gps->totpoints > 1)	
+			gp_draw_stroke(gps->points, gps->totpoints, lthick, dflag, gps->flag, debug, winx, winy);
 	}
 }
 
@@ -656,7 +794,7 @@ static void gp_draw_data (bGPdata *gpd, int winx, int winy, int dflag)
 	glColor4f(0, 0, 0, 1);
 }
 
-/* ----------- */
+/* ----- Grease Pencil Sketches Drawing API ------ */
 
 /* draw grease-pencil sketches to specified 2d-view assuming that matrices are already set correctly 
  * Note: this gets called twice - first time with onlyv2d=1 to draw 'canvas' strokes, second time with onlyv2d=0 for screen-aligned strokes
diff --git a/source/blender/src/drawseq.c b/source/blender/src/drawseq.c
index cc431c73a2e..71a777c9056 100644
--- a/source/blender/src/drawseq.c
+++ b/source/blender/src/drawseq.c
@@ -98,7 +98,7 @@
 int no_rightbox=0, no_leftbox= 0;
 static void draw_seq_handle(Sequence *seq, SpaceSeq *sseq, float pixelx, short direction);
 static void draw_seq_extensions(Sequence *seq, SpaceSeq *sseq);
-static void draw_seq_text(Sequence *seq, float x1, float x2, float y1, float y2);
+static void draw_seq_text(Sequence *seq, float x1, float x2, float y1, float y2, char *background_col);
 static void draw_shadedstrip(Sequence *seq, char *col, float x1, float y1, float x2, float y2);
 static void draw_seq_strip(struct Sequence *seq, struct ScrArea *sa, struct SpaceSeq *sseq, int outline_tint, float pixelx);
 
@@ -604,7 +604,7 @@ static void draw_seq_extensions(Sequence *seq, SpaceSeq *sseq)
 }
 
 /* draw info text on a sequence strip */
-static void draw_seq_text(Sequence *seq, float x1, float x2, float y1, float y2)
+static void draw_seq_text(Sequence *seq, float x1, float x2, float y1, float y2, char *background_col)
 {
 	float v1[2], v2[2];
 	int len, size;
@@ -670,8 +670,13 @@ static void draw_seq_text(Sequence *seq, float x1, float x2, float y1, float y2)
 	mval[1]= 1;
 	areamouseco_to_ipoco(G.v2d, mval, &x1, &x2);
 	
-	if(seq->flag & SELECT) cpack(0xFFFFFF);
-	else cpack(0);
+	if(seq->flag & SELECT){
+		cpack(0xFFFFFF);
+	}else if ((((int)background_col[0] + (int)background_col[1] + (int)background_col[2]) / 3) < 50){
+		cpack(0x505050); /* use lighter text colour for dark background */
+	}else{
+		cpack(0);
+	}
 	glRasterPos3f(x1,  y1+SEQ_STRIP_OFSBOTTOM, 0.0);
 	BMF_DrawString(G.font, strp);
 }
@@ -740,7 +745,7 @@ so wave file sample drawing precission is zoom adjusted
 static void draw_seq_strip(Sequence *seq, ScrArea *sa, SpaceSeq *sseq, int outline_tint, float pixelx)
 {
 	float x1, x2, y1, y2;
-	char col[3], is_single_image;
+	char col[3], background_col[3], is_single_image;
 
 	/* we need to know if this is a single image/color or not for drawing */
 	is_single_image = (char)check_single_seq(seq);
@@ -755,13 +760,14 @@ static void draw_seq_strip(Sequence *seq, ScrArea *sa, SpaceSeq *sseq, int outli
 	
 	
 	/* get the correct color per strip type*/
-	get_seq_color3ubv(seq, col);
+	//get_seq_color3ubv(seq, col);
+	get_seq_color3ubv(seq, background_col);
 	
 	/* draw the main strip body */
 	if (is_single_image) /* single image */
-		draw_shadedstrip(seq, col, seq_tx_get_final_left(seq, 0), y1, seq_tx_get_final_right(seq, 0), y2);
+		draw_shadedstrip(seq, background_col, seq_tx_get_final_left(seq, 0), y1, seq_tx_get_final_right(seq, 0), y2);
 	else /* normal operation */
-		draw_shadedstrip(seq, col, x1, y1, x2, y2);
+		draw_shadedstrip(seq, background_col, x1, y1, x2, y2);
 	
 	/* draw additional info and controls */
 	if (seq->type == SEQ_RAM_SOUND)
@@ -814,7 +820,7 @@ static void draw_seq_strip(Sequence *seq, ScrArea *sa, SpaceSeq *sseq, int outli
 
 	/* nice text here would require changing the view matrix for texture text */
 	if( (x2-x1) / pixelx > 32) {
-		draw_seq_text(seq, x1, x2, y1, y2);
+		draw_seq_text(seq, x1, x2, y1, y2, background_col);
 	}
 }
 
diff --git a/source/blender/src/editarmature.c b/source/blender/src/editarmature.c
index 3d0f26960d6..80c24f3a989 100644
--- a/source/blender/src/editarmature.c
+++ b/source/blender/src/editarmature.c
@@ -1033,87 +1033,6 @@ static void *get_nearest_bone (short findunsel)
 	return NULL;
 }
 
-/* used by posemode and editmode */
-void select_bone_parent (void)
-{
-	Object *ob;
-	bArmature *arm;	
-	
-	/* get data */
-	if (G.obedit)
-		ob= G.obedit;
-	else if (OBACT)
-		ob= OBACT;
-	else
-		return;
-	arm= (bArmature *)ob->data;
-	
-	/* determine which mode armature is in */
-	if ((!G.obedit) && (ob->flag & OB_POSEMODE)) {
-		/* deal with pose channels */
-		/* channels are sorted on dependency, so the loop below won't result in a flood-select */
-		bPoseChannel *pchan=NULL;
-		
-		for (pchan= ob->pose->chanbase.first; pchan; pchan= pchan->next) {
-			/* check if bone in original selection */
-			if (pchan->bone->flag & BONE_SELECTED) {
-				bPoseChannel *chanpar= pchan->parent;
-				
-				/* check if any parent */
-				if ((chanpar) && ((chanpar->bone->flag & BONE_SELECTED)==0)) {
-					chanpar->bone->flag |= BONE_SELECTED;
-					select_actionchannel_by_name (ob->action, pchan->name, 1);
-				}
-			}
-		}
-	}
-	else if (G.obedit) {
-		/* deal with editbones */
-		EditBone *curbone, *parbone, *parpar;
-		
-		/* prevent floods */
-		for (curbone= G.edbo.first; curbone; curbone= curbone->next)
-			curbone->temp= NULL;
-		
-		for (curbone= G.edbo.first; curbone; curbone= curbone->next) {
-			/* check if bone selected */
-			if ((curbone->flag & BONE_SELECTED) && curbone->temp==NULL) {
-				parbone= curbone->parent;
-				
-				/* check if any parent */
-				if ((parbone) && ((parbone->flag & BONE_SELECTED)==0)) {
-					/* select the parent bone */
-					parbone->flag |= (BONE_SELECTED|BONE_TIPSEL|BONE_ROOTSEL);
-					
-					/* check if parent has parent */
-					parpar= parbone->parent;
-					
-					if ((parpar) && (parbone->flag & BONE_CONNECTED)) {
-						parpar->flag |= BONE_TIPSEL;
-					}
-					/* tag this bone to not flood selection */
-					parbone->temp= parbone;
-				}
-			}
-		}
-		
-		/* to be sure... */
-		for (curbone= G.edbo.first; curbone; curbone= curbone->next)
-			curbone->temp= NULL;
-		
-	}
-	
-	/* undo + redraw pushes */
-	countall(); // flushes selection!
-
-	allqueue (REDRAWVIEW3D, 0);
-	allqueue (REDRAWBUTSEDIT, 0);
-	allqueue(REDRAWBUTSOBJECT, 0);
-	allqueue(REDRAWOOPS, 0);
-	
-	BIF_undo_push("Select Parent");
-}
-
 /* helper for setflag_sel_bone() */
 static void bone_setflag (int *bone, int flag, short mode)
 {
@@ -1139,6 +1058,89 @@ static void bone_setflag (int *bone, int flag, short mode)
 	}
 }
 
+/* Get the first available child of an editbone */
+static EditBone *editbone_get_child(EditBone *pabone, short use_visibility)
+{
+	Object *ob;
+	bArmature *arm;
+	EditBone *curbone, *chbone=NULL;
+	
+	if (!G.obedit) return NULL;
+	else ob= G.obedit;
+	arm= (bArmature *)ob->data;
+
+	for (curbone= G.edbo.first; curbone; curbone= curbone->next) {
+		if (curbone->parent == pabone) {
+			if (use_visibility) {
+				if ((arm->layer & curbone->layer) && !(pabone->flag & BONE_HIDDEN_A))
+					chbone = curbone;
+			}
+			else
+				chbone = curbone;
+		}
+	}
+	
+	return chbone;
+}
+
+void armature_select_hierarchy(short direction, short add_to_sel)
+{
+	Object *ob;
+	bArmature *arm;
+	EditBone *curbone, *pabone, *chbone;
+
+	if (!G.obedit) return;
+	else ob= G.obedit;
+	arm= (bArmature *)ob->data;
+	
+	for (curbone= G.edbo.first; curbone; curbone= curbone->next) {
+		if (arm->layer & curbone->layer) {
+			if (curbone->flag & (BONE_ACTIVE)) {
+				if (direction == BONE_SELECT_PARENT) {
+					if (curbone->parent == NULL) continue;
+					else pabone = curbone->parent;
+					
+					if ((arm->layer & pabone->layer) && !(pabone->flag & BONE_HIDDEN_A)) {
+						pabone->flag |= (BONE_ACTIVE|BONE_SELECTED|BONE_TIPSEL|BONE_ROOTSEL);
+						if (pabone->parent)	pabone->parent->flag |= BONE_TIPSEL;
+						
+						if (!add_to_sel) curbone->flag &= ~(BONE_SELECTED|BONE_TIPSEL|BONE_ROOTSEL);
+						curbone->flag &= ~BONE_ACTIVE;
+						break;
+					}
+					
+				} else { // BONE_SELECT_CHILD
+					chbone = editbone_get_child(curbone, 1);
+					if (chbone == NULL) continue;
+					
+					if ((arm->layer & chbone->layer) && !(chbone->flag & BONE_HIDDEN_A)) {
+						chbone->flag |= (BONE_ACTIVE|BONE_SELECTED|BONE_TIPSEL|BONE_ROOTSEL);
+						
+						if (!add_to_sel) {
+							curbone->flag &= ~(BONE_SELECTED|BONE_ROOTSEL);
+							if (curbone->parent) curbone->parent->flag &= ~BONE_TIPSEL;
+						}
+						curbone->flag &= ~BONE_ACTIVE;
+						break;
+					}
+				}
+			}
+		}
+	}
+
+	countall(); // flushes selection!
+	
+	allqueue (REDRAWVIEW3D, 0);
+	allqueue (REDRAWBUTSEDIT, 0);
+	allqueue (REDRAWBUTSOBJECT, 0);
+	allqueue (REDRAWOOPS, 0);
+	
+	if (direction==BONE_SELECT_PARENT)
+		BIF_undo_push("Select edit bone parent");
+	if (direction==BONE_SELECT_CHILD)
+		BIF_undo_push("Select edit bone child");
+}
+
 /* used by posemode and editmode */
 void setflag_armature (short mode)
 {
diff --git a/source/blender/src/editimasel.c b/source/blender/src/editimasel.c
index 67e10d771e0..97ddc2e0f1d 100644
--- a/source/blender/src/editimasel.c
+++ b/source/blender/src/editimasel.c
@@ -1076,6 +1076,12 @@ void winqreadimaselspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			toggle_blockhandler(sa, IMASEL_HANDLER_IMAGE, UI_PNL_UNSTOW);
 			scrarea_queue_winredraw(sa);
 			break;
+		case HKEY:
+			simasel->flag ^= FILE_HIDE_DOT;
+			BIF_filelist_free(simasel->files);
+			do_draw= 1;
+			do_headdraw= 1;
+			break;
 		case PKEY:
 			if(G.qual & LR_SHIFTKEY) {
 				extern char bprogname[];	/* usiblender.c */
diff --git a/source/blender/src/editmesh_mods.c b/source/blender/src/editmesh_mods.c
index c7a75b32df1..6dfbd67720b 100644
--- a/source/blender/src/editmesh_mods.c
+++ b/source/blender/src/editmesh_mods.c
@@ -1432,348 +1432,78 @@ int mesh_layers_menu(CustomData *data, int type) {
 	return ret;
 }
 
-/* ctrl+c in mesh editmode */
-void mesh_copy_menu(void)
+void EM_mesh_copy_edge(short type) 
 {
 	EditMesh *em = G.editMesh;
 	EditSelection *ese;
-	short ret, change=0;
+	short change=0;
+	
+	EditEdge *eed, *eed_act;
+	float vec[3], vec_mid[3], eed_len, eed_len_act;
 	
 	if (!em) return;
 	
 	ese = em->selected.last;
+	if (!ese) return;
 	
-	/* Faces can have a NULL ese, so dont return on a NULL ese here */
+	eed_act = (EditEdge*)ese->data;
 	
-	if(ese && ese->type == EDITVERT) {
-		
-		if (!ese) return;
-		/*EditVert *ev, *ev_act = (EditVert*)ese->data;
-		ret= pupmenu("");*/
-	} else if(ese && ese->type == EDITEDGE) {
-		EditEdge *eed, *eed_act;
-		float vec[3], vec_mid[3], eed_len, eed_len_act;
-		
-		if (!ese) return;
-		
-		eed_act = (EditEdge*)ese->data;
-		
-		ret= pupmenu("Copy Active Edge to Selected%t|Crease%x1|Bevel Weight%x2|Length%x3");
-		if (ret<1) return;
-		
+	switch (type) {
+	case 1: /* copy crease */
+		for(eed=em->edges.first; eed; eed=eed->next) {
+			if (eed->f & SELECT && eed != eed_act && eed->crease != eed_act->crease) {
+				eed->crease = eed_act->crease;
+				change = 1;
+			}
+		}
+		break;
+	case 2: /* copy bevel weight */
+		for(eed=em->edges.first; eed; eed=eed->next) {
+			if (eed->f & SELECT && eed != eed_act && eed->bweight != eed_act->bweight) {
+				eed->bweight = eed_act->bweight;
+				change = 1;
+			}
+		}
+		break;
+
+	case 3: /* copy length */
 		eed_len_act = VecLenf(eed_act->v1->co, eed_act->v2->co);
-		
-		switch (ret) {
-		case 1: /* copy crease */
-			for(eed=em->edges.first; eed; eed=eed->next) {
-				if (eed->f & SELECT && eed != eed_act && eed->crease != eed_act->crease) {
-					eed->crease = eed_act->crease;
-					change = 1;
+		for(eed=em->edges.first; eed; eed=eed->next) {
+			if (eed->f & SELECT && eed != eed_act) {
+
+				eed_len = VecLenf(eed->v1->co, eed->v2->co);
+
+				if (eed_len == eed_len_act) continue;
+				/* if this edge is zero length we cont do anything with it*/
+				if (eed_len == 0.0f) continue;
+				if (eed_len_act == 0.0f) {
+					VecAddf(vec_mid, eed->v1->co, eed->v2->co);
+					VecMulf(vec_mid, 0.5);
+					VECCOPY(eed->v1->co, vec_mid);
+					VECCOPY(eed->v2->co, vec_mid);
+				} else {
+					/* copy the edge length */
+					VecAddf(vec_mid, eed->v1->co, eed->v2->co);
+					VecMulf(vec_mid, 0.5);
+
+					/* SCALE 1 */
+					VecSubf(vec, eed->v1->co, vec_mid);
+					VecMulf(vec, eed_len_act/eed_len);
+					VecAddf(eed->v1->co, vec, vec_mid);
+
+					/* SCALE 2 */
+					VecSubf(vec, eed->v2->co, vec_mid);
+					VecMulf(vec, eed_len_act/eed_len);
+					VecAddf(eed->v2->co, vec, vec_mid);
 				}
+				change = 1;
 			}
-			break;
-		case 2: /* copy bevel weight */
-			for(eed=em->edges.first; eed; eed=eed->next) {
-				if (eed->f & SELECT && eed != eed_act && eed->bweight != eed_act->bweight) {
-					eed->bweight = eed_act->bweight;
-					change = 1;
-				}
-			}
-			break;
-			
-		case 3: /* copy length */
-			
-			for(eed=em->edges.first; eed; eed=eed->next) {
-				if (eed->f & SELECT && eed != eed_act) {
-					
-					eed_len = VecLenf(eed->v1->co, eed->v2->co);
-					
-					if (eed_len == eed_len_act) continue;
-					/* if this edge is zero length we cont do anything with it*/
-					if (eed_len == 0.0f) continue;
-					if (eed_len_act == 0.0f) {
-						VecAddf(vec_mid, eed->v1->co, eed->v2->co);
-						VecMulf(vec_mid, 0.5);
-						VECCOPY(eed->v1->co, vec_mid);
-						VECCOPY(eed->v2->co, vec_mid);
-					} else {
-						/* copy the edge length */
-						VecAddf(vec_mid, eed->v1->co, eed->v2->co);
-						VecMulf(vec_mid, 0.5);
-						
-						/* SCALE 1 */
-						VecSubf(vec, eed->v1->co, vec_mid);
-						VecMulf(vec, eed_len_act/eed_len);
-						VecAddf(eed->v1->co, vec, vec_mid);
-						
-						/* SCALE 2 */
-						VecSubf(vec, eed->v2->co, vec_mid);
-						VecMulf(vec, eed_len_act/eed_len);
-						VecAddf(eed->v2->co, vec, vec_mid);
-					}
-					change = 1;
-				}
-			}
-			
-			if (change)
-				recalc_editnormals();
-			
-			
-			break;
 		}
-		
-	} else if(ese==NULL || ese->type == EDITFACE) {
-		EditFace *efa, *efa_act;
-		MTFace *tf, *tf_act = NULL;
-		MCol *mcol, *mcol_act = NULL;
-		
-		efa_act = EM_get_actFace(0);
-		
-		if (efa_act) {
-			ret= pupmenu(
-				"Copy Face Selected%t|"
-				"Active Material%x1|Active Image%x2|Active UV Coords%x3|"
-				"Active Mode%x4|Active Transp%x5|Active Vertex Colors%x6|%l|"
-				
-				"TexFace UVs from layer%x7|"
-				"TexFace Images from layer%x8|"
-				"TexFace All from layer%x9|"
-				"Vertex Colors from layer%x10");
-			if (ret<1) return;
-			tf_act =	CustomData_em_get(&em->fdata, efa_act->data, CD_MTFACE);
-			mcol_act =	CustomData_em_get(&em->fdata, efa_act->data, CD_MCOL);
-		} else {
-			ret= pupmenu(
-				"Copy Face Selected%t|"
-				
-				/* Make sure these are always the same as above */
-				"TexFace UVs from layer%x7|"
-				"TexFace Images from layer%x8|"
-				"TexFace All from layer%x9|"
-				"Vertex Colors from layer%x10");
-			if (ret<1) return;
-		}
-		
-		switch (ret) {
-		case 1: /* copy material */
-			for(efa=em->faces.first; efa; efa=efa->next) {
-				if (efa->f & SELECT && efa->mat_nr != efa_act->mat_nr) {
-					efa->mat_nr = efa_act->mat_nr;
-					change = 1;
-				}
-			}
-			break;
-		case 2:	/* copy image */
-			if (!tf_act) {
-				error("mesh has no uv/image layers");
-				return;
-			}
-			for(efa=em->faces.first; efa; efa=efa->next) {
-				if (efa->f & SELECT && efa != efa_act) {
-					tf = CustomData_em_get(&em->fdata, efa->data, CD_MTFACE);
-					if (tf_act->tpage) {
-						tf->tpage = tf_act->tpage;
-						tf->mode |= TF_TEX;
-					} else {
-						tf->tpage = NULL;
-						tf->mode &= ~TF_TEX;
-					}
-					tf->tile= tf_act->tile;
-					change = 1;
-				}
-			}
-			break;
-			
-		case 3: /* copy UV's */
-			if (!tf_act) {
-				error("mesh has no uv/image layers");
-				return;
-			}
-			for(efa=em->faces.first; efa; efa=efa->next) {
-				if (efa->f & SELECT && efa != efa_act) {
-					tf = CustomData_em_get(&em->fdata, efa->data, CD_MTFACE);
-					memcpy(tf->uv, tf_act->uv, sizeof(tf->uv));
-					change = 1;
-				}
-			}
-			break;
-		case 4: /* mode's */
-			if (!tf_act) {
-				error("mesh has no uv/image layers");
-				return;
-			}
-			for(efa=em->faces.first; efa; efa=efa->next) {
-				if (efa->f & SELECT && efa != efa_act) {
-					tf = CustomData_em_get(&em->fdata, efa->data, CD_MTFACE);
-					tf->mode= tf_act->mode;
-					change = 1;
-				}
-			}
-			break;
-		case 5: /* copy transp's */
-			if (!tf_act) {
-				error("mesh has no uv/image layers");
-				return;
-			}
-			for(efa=em->faces.first; efa; efa=efa->next) {
-				if (efa->f & SELECT && efa != efa_act) {
-					tf = CustomData_em_get(&em->fdata, efa->data, CD_MTFACE);
-					tf->transp= tf_act->transp;
-					change = 1;
-				}
-			}
-			break;
-			
-		case 6: /* copy vcols's */
-			if (!mcol_act) {
-				error("mesh has no color layers");
-				return;
-			} else {
-				/* guess the 4th color if needs be */
-				float val =- 1;
-				
-				if (!efa_act->v4) {
-					/* guess the othe vale, we may need to use it
-					 * 
-					 * Modifying the 4th value of the mcol is ok here since its not seen
-					 * on a triangle
-					 * */
-					val = ((float)(mcol_act->r +  (mcol_act+1)->r + (mcol_act+2)->r)) / 3; CLAMP(val, 0, 255);
-					(mcol_act+3)->r = (char)val;
-					
-					val = ((float)(mcol_act->g +  (mcol_act+1)->g + (mcol_act+2)->g)) / 3; CLAMP(val, 0, 255);
-					(mcol_act+3)->g = (char)val;
-					
-					val = ((float)(mcol_act->b +  (mcol_act+1)->b + (mcol_act+2)->b)) / 3; CLAMP(val, 0, 255);
-					(mcol_act+3)->b = (char)val;
-				} 
-				
-				
-				for(efa=em->faces.first; efa; efa=efa->next) {
-					if (efa->f & SELECT && efa != efa_act) {
-						/* TODO - make copy from tri to quad guess the 4th vert */
-						mcol = CustomData_em_get(&em->fdata, efa->data, CD_MCOL);
-						memcpy(mcol, mcol_act, sizeof(MCol)*4);	
-						change = 1;
-					}
-				}
-			}
-			
-			break;
-		
-		/* Copy from layer - Warning! tf_act and mcol_act will be NULL here */
-		case 7:
-		case 8:
-		case 9:
-			if (CustomData_number_of_layers(&em->fdata, CD_MTFACE)<2) {
-				error("mesh does not have multiple uv/image layers");
-				return;
-			} else {
-				int layer_orig_idx, layer_idx;
-				
-				layer_idx = mesh_layers_menu(&em->fdata, CD_MTFACE);
-				if (layer_idx<0) return;
-				
-				/* warning, have not updated mesh pointers however this is not needed since we swicth back */
-				layer_orig_idx = CustomData_get_active_layer(&em->fdata, CD_MTFACE);
-				if (layer_idx==layer_orig_idx)
-					return;
-				
-				/* get the tfaces */
-				CustomData_set_layer_active(&em->fdata, CD_MTFACE, (int)layer_idx);
-				/* store the tfaces in our temp */
-				for(efa=em->faces.first; efa; efa=efa->next) {
-					if (efa->f & SELECT) {
-						efa->tmp.p = CustomData_em_get(&em->fdata, efa->data, CD_MTFACE);
-					}	
-				}
-				CustomData_set_layer_active(&em->fdata, CD_MTFACE, layer_orig_idx);
-			}
-			break;
-			
-		case 10: /* select vcol layers - make sure this stays in sync with above code */
-			if (CustomData_number_of_layers(&em->fdata, CD_MCOL)<2) {
-				error("mesh does not have multiple color layers");
-				return;
-			} else {
-				int layer_orig_idx, layer_idx;
-				
-				layer_idx = mesh_layers_menu(&em->fdata, CD_MCOL);
-				if (layer_idx<0) return;
-				
-				/* warning, have not updated mesh pointers however this is not needed since we swicth back */
-				layer_orig_idx = CustomData_get_active_layer(&em->fdata, CD_MCOL);
-				if (layer_idx==layer_orig_idx)
-					return;
-				
-				/* get the tfaces */
-				CustomData_set_layer_active(&em->fdata, CD_MCOL, (int)layer_idx);
-				/* store the tfaces in our temp */
-				for(efa=em->faces.first; efa; efa=efa->next) {
-					if (efa->f & SELECT) {
-						efa->tmp.p = CustomData_em_get(&em->fdata, efa->data, CD_MCOL);
-					}	
-				}
-				CustomData_set_layer_active(&em->fdata, CD_MCOL, layer_orig_idx);
-				
-			}
-			break;
-		}
-		
-		/* layer copy only - sanity checks done above */
-		switch (ret) {
-		case 7: /* copy UV's only */
-			for(efa=em->faces.first; efa; efa=efa->next) {
-				if (efa->f & SELECT) {
-					tf_act = (MTFace *)efa->tmp.p; /* not active but easier to use this way */
-					tf = CustomData_em_get(&em->fdata, efa->data, CD_MTFACE);
-					memcpy(tf->uv, tf_act->uv, sizeof(tf->uv));
-					change = 1;
-				}
-			}
-			break;
-		case 8: /* copy image settings only */
-			for(efa=em->faces.first; efa; efa=efa->next) {
-				if (efa->f & SELECT) {
-					tf_act = (MTFace *)efa->tmp.p; /* not active but easier to use this way */
-					tf = CustomData_em_get(&em->fdata, efa->data, CD_MTFACE);
-					if (tf_act->tpage) {
-						tf->tpage = tf_act->tpage;
-						tf->mode |= TF_TEX;
-					} else {
-						tf->tpage = NULL;
-						tf->mode &= ~TF_TEX;
-					}
-					tf->tile= tf_act->tile;
-					change = 1;
-				}
-			}
-			break;
-		case 9: /* copy all tface info */
-			for(efa=em->faces.first; efa; efa=efa->next) {
-				if (efa->f & SELECT) {
-					tf_act = (MTFace *)efa->tmp.p; /* not active but easier to use this way */
-					tf = CustomData_em_get(&em->fdata, efa->data, CD_MTFACE);
-					memcpy(tf->uv, ((MTFace *)efa->tmp.p)->uv, sizeof(tf->uv));
-					tf->tpage = tf_act->tpage;
-					tf->mode = tf_act->mode;
-					tf->transp = tf_act->transp;
-					change = 1;
-				}
-			}
-			break;
-		case 10:
-			for(efa=em->faces.first; efa; efa=efa->next) {
-				if (efa->f & SELECT) {
-					mcol_act = (MCol *)efa->tmp.p; 
-					mcol = CustomData_em_get(&em->fdata, efa->data, CD_MCOL);
-					memcpy(mcol, mcol_act, sizeof(MCol)*4);	
-					change = 1;
-				}
-			}
-			break;
-		}
-		
+
+		if (change)
+			recalc_editnormals();
+
+		break;
 	}
 	
 	if (change) {
@@ -1781,12 +1511,319 @@ void mesh_copy_menu(void)
 		allqueue(REDRAWVIEW3D, 0);
 		allqueue(REDRAWBUTSEDIT, 0);
 		
-		if (ese==NULL ||	ese->type == EDITFACE)	BIF_undo_push("Copy Face Attribute");
-		else if (			ese->type == EDITEDGE)	BIF_undo_push("Copy Edge Attribute");
-		else if (			ese->type == EDITVERT)	BIF_undo_push("Copy Vert Attribute");
-		
+		BIF_undo_push("Copy Edge Attribute");
+	}
+}
+
+void EM_mesh_copy_face(short type)
+{
+	EditMesh *em = G.editMesh;
+	short change=0;
+	
+	EditFace *efa, *efa_act;
+	MTFace *tf, *tf_act = NULL;
+	MCol *mcol, *mcol_act = NULL;
+	if (!em) return;
+	efa_act = EM_get_actFace(0);
+	
+	if (!efa_act) return;
+	
+	tf_act =	CustomData_em_get(&em->fdata, efa_act->data, CD_MTFACE);
+	mcol_act =	CustomData_em_get(&em->fdata, efa_act->data, CD_MCOL);
+	
+	switch (type) {
+	case 1: /* copy material */
+		for(efa=em->faces.first; efa; efa=efa->next) {
+			if (efa->f & SELECT && efa->mat_nr != efa_act->mat_nr) {
+				efa->mat_nr = efa_act->mat_nr;
+				change = 1;
+			}
+		}
+		break;
+	case 2:	/* copy image */
+		if (!tf_act) {
+			error("mesh has no uv/image layers");
+			return;
+		}
+		for(efa=em->faces.first; efa; efa=efa->next) {
+			if (efa->f & SELECT && efa != efa_act) {
+				tf = CustomData_em_get(&em->fdata, efa->data, CD_MTFACE);
+				if (tf_act->tpage) {
+					tf->tpage = tf_act->tpage;
+					tf->mode |= TF_TEX;
+				} else {
+					tf->tpage = NULL;
+					tf->mode &= ~TF_TEX;
+				}
+				tf->tile= tf_act->tile;
+				change = 1;
+			}
+		}
+		break;
+
+	case 3: /* copy UV's */
+		if (!tf_act) {
+			error("mesh has no uv/image layers");
+			return;
+		}
+		for(efa=em->faces.first; efa; efa=efa->next) {
+			if (efa->f & SELECT && efa != efa_act) {
+				tf = CustomData_em_get(&em->fdata, efa->data, CD_MTFACE);
+				memcpy(tf->uv, tf_act->uv, sizeof(tf->uv));
+				change = 1;
+			}
+		}
+		break;
+	case 4: /* mode's */
+		if (!tf_act) {
+			error("mesh has no uv/image layers");
+			return;
+		}
+		for(efa=em->faces.first; efa; efa=efa->next) {
+			if (efa->f & SELECT && efa != efa_act) {
+				tf = CustomData_em_get(&em->fdata, efa->data, CD_MTFACE);
+				tf->mode= tf_act->mode;
+				change = 1;
+			}
+		}
+		break;
+	case 5: /* copy transp's */
+		if (!tf_act) {
+			error("mesh has no uv/image layers");
+			return;
+		}
+		for(efa=em->faces.first; efa; efa=efa->next) {
+			if (efa->f & SELECT && efa != efa_act) {
+				tf = CustomData_em_get(&em->fdata, efa->data, CD_MTFACE);
+				tf->transp= tf_act->transp;
+				change = 1;
+			}
+		}
+		break;
+
+	case 6: /* copy vcols's */
+		if (!mcol_act) {
+			error("mesh has no color layers");
+			return;
+		} else {
+			/* guess the 4th color if needs be */
+			float val =- 1;
+
+			if (!efa_act->v4) {
+				/* guess the othe vale, we may need to use it
+				 * 
+				 * Modifying the 4th value of the mcol is ok here since its not seen
+				 * on a triangle
+				 * */
+				val = ((float)(mcol_act->r +  (mcol_act+1)->r + (mcol_act+2)->r)) / 3; CLAMP(val, 0, 255);
+				(mcol_act+3)->r = (char)val;
+
+				val = ((float)(mcol_act->g +  (mcol_act+1)->g + (mcol_act+2)->g)) / 3; CLAMP(val, 0, 255);
+				(mcol_act+3)->g = (char)val;
+
+				val = ((float)(mcol_act->b +  (mcol_act+1)->b + (mcol_act+2)->b)) / 3; CLAMP(val, 0, 255);
+				(mcol_act+3)->b = (char)val;
+			} 
+
+
+			for(efa=em->faces.first; efa; efa=efa->next) {
+				if (efa->f & SELECT && efa != efa_act) {
+					/* TODO - make copy from tri to quad guess the 4th vert */
+					mcol = CustomData_em_get(&em->fdata, efa->data, CD_MCOL);
+					memcpy(mcol, mcol_act, sizeof(MCol)*4);	
+					change = 1;
+				}
+			}
+		}
+		break;
 	}
 	
+	if (change) {
+		DAG_object_flush_update(G.scene, G.obedit, OB_RECALC_DATA);
+		allqueue(REDRAWVIEW3D, 0);
+		allqueue(REDRAWBUTSEDIT, 0);
+		if (type==3) {
+			allqueue(REDRAWIMAGE, 0);			
+		}
+		
+		BIF_undo_push("Copy Face Attribute");
+	}
+}
+
+
+void EM_mesh_copy_face_layer(short type) 
+{
+	EditMesh *em = G.editMesh;
+	short change=0;
+	
+	EditFace *efa;
+	MTFace *tf, *tf_from;
+	MCol *mcol, *mcol_from;
+	
+	if (!em) return;
+	
+	switch(type) {
+	case 7:
+	case 8:
+	case 9:
+		if (CustomData_number_of_layers(&em->fdata, CD_MTFACE)<2) {
+			error("mesh does not have multiple uv/image layers");
+			return;
+		} else {
+			int layer_orig_idx, layer_idx;
+
+			layer_idx = mesh_layers_menu(&em->fdata, CD_MTFACE);
+			if (layer_idx<0) return;
+
+			/* warning, have not updated mesh pointers however this is not needed since we swicth back */
+			layer_orig_idx = CustomData_get_active_layer(&em->fdata, CD_MTFACE);
+			if (layer_idx==layer_orig_idx)
+				return;
+
+			/* get the tfaces */
+			CustomData_set_layer_active(&em->fdata, CD_MTFACE, (int)layer_idx);
+			/* store the tfaces in our temp */
+			for(efa=em->faces.first; efa; efa=efa->next) {
+				if (efa->f & SELECT) {
+					efa->tmp.p = CustomData_em_get(&em->fdata, efa->data, CD_MTFACE);
+				}	
+			}
+			CustomData_set_layer_active(&em->fdata, CD_MTFACE, layer_orig_idx);
+		}
+		break;
+
+	case 10: /* select vcol layers - make sure this stays in sync with above code */
+		if (CustomData_number_of_layers(&em->fdata, CD_MCOL)<2) {
+			error("mesh does not have multiple color layers");
+			return;
+		} else {
+			int layer_orig_idx, layer_idx;
+
+			layer_idx = mesh_layers_menu(&em->fdata, CD_MCOL);
+			if (layer_idx<0) return;
+
+			/* warning, have not updated mesh pointers however this is not needed since we swicth back */
+			layer_orig_idx = CustomData_get_active_layer(&em->fdata, CD_MCOL);
+			if (layer_idx==layer_orig_idx)
+				return;
+
+			/* get the tfaces */
+			CustomData_set_layer_active(&em->fdata, CD_MCOL, (int)layer_idx);
+			/* store the tfaces in our temp */
+			for(efa=em->faces.first; efa; efa=efa->next) {
+				if (efa->f & SELECT) {
+					efa->tmp.p = CustomData_em_get(&em->fdata, efa->data, CD_MCOL);
+				}	
+			}
+			CustomData_set_layer_active(&em->fdata, CD_MCOL, layer_orig_idx);
+
+		}
+		break;
+	}
+
+	/* layer copy only - sanity checks done above */
+	switch (type) {
+	case 7: /* copy UV's only */
+		for(efa=em->faces.first; efa; efa=efa->next) {
+			if (efa->f & SELECT) {
+				tf_from = (MTFace *)efa->tmp.p; /* not active but easier to use this way */
+				tf = CustomData_em_get(&em->fdata, efa->data, CD_MTFACE);
+				memcpy(tf->uv, tf_from->uv, sizeof(tf->uv));
+				change = 1;
+			}
+		}
+		break;
+	case 8: /* copy image settings only */
+		for(efa=em->faces.first; efa; efa=efa->next) {
+			if (efa->f & SELECT) {
+				tf_from = (MTFace *)efa->tmp.p; /* not active but easier to use this way */
+				tf = CustomData_em_get(&em->fdata, efa->data, CD_MTFACE);
+				if (tf_from->tpage) {
+					tf->tpage = tf_from->tpage;
+					tf->mode |= TF_TEX;
+				} else {
+					tf->tpage = NULL;
+					tf->mode &= ~TF_TEX;
+				}
+				tf->tile= tf_from->tile;
+				change = 1;
+			}
+		}
+		break;
+	case 9: /* copy all tface info */
+		for(efa=em->faces.first; efa; efa=efa->next) {
+			if (efa->f & SELECT) {
+				tf_from = (MTFace *)efa->tmp.p; /* not active but easier to use this way */
+				tf = CustomData_em_get(&em->fdata, efa->data, CD_MTFACE);
+				memcpy(tf->uv, ((MTFace *)efa->tmp.p)->uv, sizeof(tf->uv));
+				tf->tpage = tf_from->tpage;
+				tf->mode = tf_from->mode;
+				tf->transp = tf_from->transp;
+				change = 1;
+			}
+		}
+		break;
+	case 10:
+		for(efa=em->faces.first; efa; efa=efa->next) {
+			if (efa->f & SELECT) {
+				mcol_from = (MCol *)efa->tmp.p; 
+				mcol = CustomData_em_get(&em->fdata, efa->data, CD_MCOL);
+				memcpy(mcol, mcol_from, sizeof(MCol)*4);	
+				change = 1;
+			}
+		}
+		break;
+	}
+
+	if (change) {
+		DAG_object_flush_update(G.scene, G.obedit, OB_RECALC_DATA);
+		allqueue(REDRAWVIEW3D, 0);
+		allqueue(REDRAWBUTSEDIT, 0);
+		
+		BIF_undo_push("Copy Face Layer");
+	}
+}
+
+
+/* ctrl+c in mesh editmode */
+void mesh_copy_menu(void)
+{
+	EditMesh *em = G.editMesh;
+	EditSelection *ese;
+	int ret;
+	if (!em) return;
+	
+	ese = em->selected.last;
+	
+	/* Faces can have a NULL ese, so dont return on a NULL ese here */
+	
+	if(ese && ese->type == EDITVERT) {
+		/* EditVert *ev, *ev_act = (EditVert*)ese->data;
+		ret= pupmenu(""); */
+	} else if(ese && ese->type == EDITEDGE) {
+		ret= pupmenu("Copy Active Edge to Selected%t|Crease%x1|Bevel Weight%x2|Length%x3");
+		if (ret<1) return;
+		
+		EM_mesh_copy_edge(ret);
+		
+	} else if(ese==NULL || ese->type == EDITFACE) {
+		ret= pupmenu(
+			"Copy Face Selected%t|"
+			"Active Material%x1|Active Image%x2|Active UV Coords%x3|"
+			"Active Mode%x4|Active Transp%x5|Active Vertex Colors%x6|%l|"
+
+			"TexFace UVs from layer%x7|"
+			"TexFace Images from layer%x8|"
+			"TexFace All from layer%x9|"
+			"Vertex Colors from layer%x10");
+		if (ret<1) return;
+		
+		if (ret<=6) {
+			EM_mesh_copy_face(ret);
+		} else {
+			EM_mesh_copy_face_layer(ret);
+		}
+	}
 }
 
 
diff --git a/source/blender/src/editseq.c b/source/blender/src/editseq.c
index 12019a9dab9..e9d0b57a166 100644
--- a/source/blender/src/editseq.c
+++ b/source/blender/src/editseq.c
@@ -644,6 +644,7 @@ static int seq_is_parent(Sequence *par, Sequence *seq)
 
 static int seq_is_predecessor(Sequence *pred, Sequence *seq)
 {
+	if (!pred) return 0;
 	if(pred == seq) return 0;
 	else if(seq_is_parent(pred, seq)) return 1;
 	else if(pred->seq1 && seq_is_predecessor(pred->seq1, seq)) return 1;
diff --git a/source/blender/src/header_info.c b/source/blender/src/header_info.c
index c14e88770f9..a9280d9dd19 100644
--- a/source/blender/src/header_info.c
+++ b/source/blender/src/header_info.c
@@ -540,6 +540,42 @@ static void check_packAll()
 	}
 }
 
+#ifdef _WIN32
+static void copy_game_dll(char *dll_filename, char *source_dir, char *dest_dir)
+{
+	char source_filename[FILE_MAX];
+	char dest_filename[FILE_MAX];
+
+	strcpy( source_filename, source_dir );
+	strcat( source_filename, dll_filename );
+
+	strcpy( dest_filename, dest_dir );
+	strcat( dest_filename, dll_filename );
+	
+	if(!BLI_exists(dest_filename)) {
+		BLI_copy_fileops( source_filename, dest_filename );
+	}
+}
+
+static void copy_all_game_dlls(char *str)
+{
+#define GAME_DLL_COUNT		7
+	char *game_dll_list[GAME_DLL_COUNT]={"gnu_gettext.dll", "libpng.dll", "libtiff.dll", "pthreadVC2.dll", "python25.dll", "SDL.dll", "zlib.dll"};
+
+	char dest_dir[FILE_MAX];
+	char source_dir[FILE_MAX];
+	int i;
+
+	strcpy(source_dir, get_install_dir());
+	strcat(source_dir, "\\");
+	BLI_split_dirfile_basic(str, dest_dir, NULL);
+
+	for (i= 0; i< GAME_DLL_COUNT; i++) {
+		copy_game_dll(game_dll_list[i], source_dir, dest_dir );
+	};
+}
+#endif
+
 static int write_runtime(char *str, char *exename)
 {
 	char *freestr= NULL;
@@ -587,7 +623,14 @@ static void write_runtime_check(char *str)
 #endif
 
 	write_runtime(str, player);
+
+#ifdef _WIN32
+	// get a list of the .DLLs in the Blender folder and copy all of these to the destination folder if they don't exist
+	copy_all_game_dlls(str);
+#endif
 }
+
+
 /* end keyed functions */
 
 /************************** MAIN MENU *****************************/
@@ -1026,7 +1069,7 @@ static uiBlock *info_externalfiles(void *arg_unused)
 	block= uiNewBlock(&curarea->uiblocks, "info_externalfiles", UI_EMBOSSP, UI_HELV, G.curscreen->mainwin);
 	uiBlockSetButmFunc(block, do_info_externalfiles, NULL);
 
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Pack into Blend",				0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 1, "");
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Pack into .blend file",				0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 1, "");
 #if 0
 	uiDefBut(block, BUTM, 1, "Unpack Data to current dir",		0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 2, "Removes all packed files from the project and saves them to the current directory");
 #endif
@@ -1036,8 +1079,8 @@ static uiBlock *info_externalfiles(void *arg_unused)
 	
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Make all Paths Relative",				0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 10, "");
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Make all Paths Absolute",				0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 11, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Report Missing Files",				0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 12, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Find Missing Files",				0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 13, "");
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Report Missing Files...",				0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 12, "");
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Find Missing Files...",				0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 13, "");
 
 	uiBlockSetDirection(block, UI_RIGHT);
 	uiTextBoundsBlock(block, 60);
diff --git a/source/blender/src/header_view3d.c b/source/blender/src/header_view3d.c
index 0b48db461e6..948023bebfb 100644
--- a/source/blender/src/header_view3d.c
+++ b/source/blender/src/header_view3d.c
@@ -166,9 +166,9 @@ void do_layer_buttons(short event)
 	if(event==-1 && (G.qual & LR_CTRLKEY)) {
 		G.vd->scenelock= !G.vd->scenelock;
 		do_view3d_buttons(B_SCENELOCK);
-	} else if (event==-1) {
+	} else if (event<0) {
 		if(G.vd->lay== (1<<20)-1) {
-			if(G.qual & LR_SHIFTKEY) G.vd->lay= oldlay;
+			if(event==-2 || G.qual & LR_SHIFTKEY) G.vd->lay= oldlay;
 		}
 		else {
 			oldlay= G.vd->lay;
@@ -605,6 +605,9 @@ static void do_view3d_viewmenu(void *arg, int event)
 	case 21: /* Grease Pencil */
 		add_blockhandler(curarea, VIEW3D_HANDLER_GREASEPENCIL, UI_PNL_UNSTOW);
 		break;		
+	case 22: /* View all layers */
+		do_layer_buttons(-2);
+		break;
 	}
 	allqueue(REDRAWVIEW3D, 1);
 }
@@ -648,6 +651,11 @@ static uiBlock *view3d_viewmenu(void *arg_unused)
 	
 	uiDefBut(block, SEPR, 0, "",					0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
 	
+	if(G.vd->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(G.vd->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(!G.vd->localview) uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_HLT, "Global View|NumPad /",	0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 8, "");
@@ -726,6 +734,9 @@ void do_view3d_select_object_typemenu(void *arg, int event)
 	case 10: /* Lamp */
 		selectall_type(OB_LAMP);
 		break;
+	case 20:
+		do_layer_buttons(-2);
+		break;
 	}
 	allqueue(REDRAWVIEW3D, 0);
 }
@@ -1314,12 +1325,21 @@ static void do_view3d_select_armaturemenu(void *arg, int event)
 		case 2: /* Select/Deselect all */
 			deselectall_armature(1, 1);
 			break;
-		case 3: /* Select Parent(s) */	
-			select_bone_parent();
-			break;
-		case 4: /* Swap Select All */
+		case 3: /* Swap Select All */
 			deselectall_armature(3, 1);
 			break;
+		case 4: /* Select parent */
+			armature_select_hierarchy(BONE_SELECT_PARENT, 0);
+			break;
+		case 5: /* Select child */
+			armature_select_hierarchy(BONE_SELECT_CHILD, 0);
+			break;
+		case 6: /* Extend Select parent */
+			armature_select_hierarchy(BONE_SELECT_PARENT, 1);
+			break;
+		case 7: /* Extend Select child */
+			armature_select_hierarchy(BONE_SELECT_CHILD, 1);
+			break;
 	}
 	allqueue(REDRAWVIEW3D, 0);
 }
@@ -1337,11 +1357,18 @@ static uiBlock *view3d_select_armaturemenu(void *arg_unused)
 	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, "Inverse|Ctrl I",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 3, "");
 	
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Swap Select All|Ctrl I",			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, "Select Parent|[",					0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 4, "");
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Select Child|]",					0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 5, "");
+	
+	uiDefBut(block, SEPR, 0, "",				0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
+	
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Extend Select Parent|Shift [",					0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 6, "");
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Extend Select Child|Shift ]",					0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 7, "");
 	
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Select Parent(s)|P",					0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 3, "");
-
 	if(curarea->headertype==HEADERTOP) {
 		uiBlockSetDirection(block, UI_DOWN);
 	}
@@ -1368,12 +1395,21 @@ static void do_view3d_select_pose_armaturemenu(void *arg, int event)
 	case 3: /* Select Target(s) of Constraint(s) */
 		pose_select_constraint_target();
 		break;
-	case 4: /* Select Bone's Parent */
-		select_bone_parent();
-		break;
 	case 5: /* Swap Select All */
 		deselectall_posearmature(OBACT, 3, 1);
 		break;
+	case 6: /* Select parent */
+		pose_select_hierarchy(BONE_SELECT_PARENT, 0);
+		break;
+	case 7: /* Select child */
+		pose_select_hierarchy(BONE_SELECT_CHILD, 0);
+		break;
+	case 8: /* Extend Select parent */
+		pose_select_hierarchy(BONE_SELECT_PARENT, 1);
+		break;
+	case 9: /* Extend Select child */
+		pose_select_hierarchy(BONE_SELECT_CHILD, 1);
+		break;
 	}
 	allqueue(REDRAWVIEW3D, 0);
 }
@@ -1393,8 +1429,17 @@ static uiBlock *view3d_select_pose_armaturemenu(void *arg_unused)
 	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, "Swap Select All|Ctrl I",				0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 5, "");
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Select Constraint Target|W",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 3, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Select Parent(s)|P",					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, "Select Parent|[",					0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 6, "");
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Select Child|]",					0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 7, "");
+	
+	uiDefBut(block, SEPR, 0, "",				0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
+	
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Extend Select Parent|Shift [",					0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 8, "");
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Extend Select Child|Shift ]",					0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 9, "");
+	
 	if(curarea->headertype==HEADERTOP) {
 		uiBlockSetDirection(block, UI_DOWN);
 	}
@@ -2467,8 +2512,11 @@ static void do_view3d_edit_objectmenu(void *arg, int event)
 	case 15: /* Object Panel */
 		add_blockhandler(curarea, VIEW3D_HANDLER_OBJECT, UI_PNL_UNSTOW);
 		break;
+	case 16: /* make proxy object*/
+		make_proxy();
+		break;
 #ifdef WITH_VERSE
-	case 16: /* Share Object at Verse server */
+	case 17: /* Share Object at Verse server */
 		if(session_list.first != session_list.last) session = session_menu();
 		else session = session_list.first;
 		if(session) b_verse_push_object(session, ob);
@@ -2493,7 +2541,7 @@ static uiBlock *view3d_edit_objectmenu(void *arg_unused)
 		if (base) ob= base->object;
 
 		if(ob && (ob->type == OB_MESH) && (!ob->vnode)) {
-			uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Share at Verse Server", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 16, "");
+			uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Share at Verse Server", 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, "");
 		}
 	}
@@ -2519,6 +2567,7 @@ static uiBlock *view3d_edit_objectmenu(void *arg_unused)
 	
 	uiDefBut(block, SEPR, 0, "",				0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
 	
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Make Proxy|Ctrl Alt P",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 16, "");
 	uiDefIconTextBlockBut(block, view3d_edit_object_makelinksmenu, NULL, ICON_RIGHTARROW_THIN, "Make Links", 0, yco-=20, 120, 19, "");
 	uiDefIconTextBlockBut(block, view3d_edit_object_singleusermenu, NULL, ICON_RIGHTARROW_THIN, "Make Single User", 0, yco-=20, 120, 19, "");
 	uiDefIconTextBlockBut(block, view3d_edit_object_makelocalmenu, NULL, ICON_RIGHTARROW_THIN, "Make Local", 0, yco-=20, 120, 19, "");
diff --git a/source/blender/src/poselib.c b/source/blender/src/poselib.c
index fb2bfe5b605..6aeef7c75c2 100644
--- a/source/blender/src/poselib.c
+++ b/source/blender/src/poselib.c
@@ -312,7 +312,7 @@ void poselib_add_current_pose (Object *ob, int val)
 	/* mode - add new or replace existing */
 	if (val == 0) {
 		if ((ob->poselib) && (ob->poselib->markers.first)) {
-			val= pupmenu("PoseLib Add Current Pose%t|Add New%x1|Replace Existing%x2");
+			val= pupmenu("PoseLib Add Current Pose%t|Add New%x1|Add New (Current Frame)%x3|Replace Existing%x2");
 			if (val <= 0) return;
 		}
 		else 
@@ -347,7 +347,10 @@ void poselib_add_current_pose (Object *ob, int val)
 		act= poselib_validate(ob);
 		
 		/* get frame */
-		frame= poselib_get_free_index(act);
+		if (val == 3)
+			frame= CFRA;
+		else /* if (val == 1) */
+			frame= poselib_get_free_index(act);
 		
 		/* add pose to poselib - replaces any existing pose there */
 		for (marker= act->markers.first; marker; marker= marker->next) {
diff --git a/source/blender/src/poseobject.c b/source/blender/src/poseobject.c
index b054b435002..28b8729a247 100644
--- a/source/blender/src/poseobject.c
+++ b/source/blender/src/poseobject.c
@@ -479,6 +479,67 @@ void pose_select_constraint_target(void)
 
 }
 
+void pose_select_hierarchy(short direction, short add_to_sel)
+{
+	Object *ob= OBACT;
+	bArmature *arm= ob->data;
+	bPoseChannel *pchan;
+	Bone *curbone, *pabone, *chbone;
+	
+	/* paranoia checks */
+	if (!ob && !ob->pose) return;
+	if (ob==G.obedit || (ob->flag & OB_POSEMODE)==0) return;
+	
+	for(pchan= ob->pose->chanbase.first; pchan; pchan= pchan->next) {
+		curbone= pchan->bone;
+		
+		if (arm->layer & curbone->layer) {
+			if (curbone->flag & (BONE_ACTIVE)) {
+				if (direction == BONE_SELECT_PARENT) {
+				
+					if (pchan->parent == NULL) continue;
+					else pabone= pchan->parent->bone;
+					
+					if ((arm->layer & pabone->layer) && !(pabone->flag & BONE_HIDDEN_P)) {
+						
+						if (!add_to_sel) curbone->flag &= ~BONE_SELECTED;
+						curbone->flag &= ~BONE_ACTIVE;
+						pabone->flag |= (BONE_ACTIVE|BONE_SELECTED);
+						
+						select_actionchannel_by_name (ob->action, pchan->name, 0);
+						select_actionchannel_by_name (ob->action, pchan->parent->name, 1);
+						break;
+					}
+				} else { // BONE_SELECT_CHILD
+				
+					if (pchan->child == NULL) continue;
+					else chbone = pchan->child->bone;
+					
+					if ((arm->layer & chbone->layer) && !(chbone->flag & BONE_HIDDEN_P)) {
+					
+						if (!add_to_sel) curbone->flag &= ~BONE_SELECTED;
+						curbone->flag &= ~BONE_ACTIVE;
+						chbone->flag |= (BONE_ACTIVE|BONE_SELECTED);
+						
+						select_actionchannel_by_name (ob->action, pchan->name, 0);
+						select_actionchannel_by_name (ob->action, pchan->child->name, 1);
+						break;
+					}
+				}
+			}
+		}
+	}
+	
+	allqueue (REDRAWVIEW3D, 0);
+	allqueue (REDRAWBUTSOBJECT, 0);
+	allqueue (REDRAWOOPS, 0);
+	
+	if (direction==BONE_SELECT_PARENT)
+		BIF_undo_push("Select pose bone parent");
+	if (direction==BONE_SELECT_CHILD)
+		BIF_undo_push("Select pose bone child");
+}
+
 /* context: active channel */
 void pose_special_editmenu(void)
 {
diff --git a/source/blender/src/space.c b/source/blender/src/space.c
index c59faa36853..72115205c34 100644
--- a/source/blender/src/space.c
+++ b/source/blender/src/space.c
@@ -2428,7 +2428,7 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 					else if(G.qual==LR_ALTKEY && G.obedit->type==OB_ARMATURE)
 						clear_bone_parent();
 					else if((G.qual==0) && (G.obedit->type==OB_ARMATURE)) 
-						select_bone_parent();
+						armature_select_hierarchy(BONE_SELECT_PARENT, 1); // 1 = add to selection
 					else if((G.qual==(LR_CTRLKEY|LR_ALTKEY)) && (G.obedit->type==OB_ARMATURE))
 						separate_armature();
 					else if((G.qual==0) && G.obedit->type==OB_MESH)
@@ -2458,7 +2458,7 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
                 	start_RBSimulation();
 				}
 				else if((G.qual==0) && (OBACT) && (OBACT->type==OB_ARMATURE) && (OBACT->flag & OB_POSEMODE))
-					select_bone_parent();
+					pose_select_hierarchy(BONE_SELECT_PARENT, 1); // 1 = add to selection
 				else if((G.qual==0)) {
                 	start_game();
 				}
@@ -2761,6 +2761,19 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 				scrarea_queue_winredraw(curarea);
 				break;
 			
+			case LEFTBRACKETKEY:
+				if ((G.obedit) && (G.obedit->type == OB_ARMATURE))
+					armature_select_hierarchy(BONE_SELECT_PARENT, (G.qual == LR_SHIFTKEY));
+				else if ((ob) && (ob->flag & OB_POSEMODE))
+					pose_select_hierarchy(BONE_SELECT_PARENT, (G.qual == LR_SHIFTKEY));
+				break;
+			case RIGHTBRACKETKEY:
+				if ((G.obedit) && (G.obedit->type == OB_ARMATURE))
+					armature_select_hierarchy(BONE_SELECT_CHILD, (G.qual == LR_SHIFTKEY));
+				if ((ob) && (ob->flag & OB_POSEMODE))
+					pose_select_hierarchy(BONE_SELECT_CHILD, (G.qual == LR_SHIFTKEY));
+				break;
+			
 			case PADSLASHKEY:
 				if(G.qual==0) {
 					if(G.vd->localview) {
diff --git a/source/blender/src/toolbox.c b/source/blender/src/toolbox.c
index 94ab289f716..cd71e7fd8e6 100644
--- a/source/blender/src/toolbox.c
+++ b/source/blender/src/toolbox.c
@@ -125,8 +125,6 @@
 
 void asciitoraw(int ch, unsigned short *event, unsigned short *qual)
 {
-	if( isalpha(ch)==0 ) return;
-	
 	if( isupper(ch) ) {
 		*qual= LEFTSHIFTKEY;
 		ch= tolower(ch);
@@ -804,7 +802,10 @@ static void tb_do_hotkey(void *arg, int event)
 		case 'd': key= PAGEDOWNKEY; break;
 		}
 	}
-	else asciitoraw(event, &key, &qual[3]);
+	else if (isalpha(event))
+		asciitoraw(event, &key, &qual[3]);
+	else if (event == '~')
+		key = ACCENTGRAVEKEY;
 
 	for (i=0;i<4;i++)
 	{
@@ -1213,6 +1214,8 @@ static TBitem tb_view[]= {
 {	0, "Ortho/Perspective|NumPad 5", 	TB_PAD|'5', NULL},
 {	0, "Local/Global View|NumPad /", 	TB_PAD|'/', NULL},
 {	0, "SEPR", 						0, NULL},
+{	0, "Show All Layers|Shift ~",  TB_SHIFT|'~', NULL},
+{	0, "SEPR", 						0, NULL},
 {	0, "Align View", 			0, tb_view_alignview},
 {	0, "SEPR", 		0, NULL},
 {	0, "View Selected|NumPad .", 	TB_PAD|'.', NULL},
diff --git a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
index b3a3a47152a..7de3056e382 100644
--- a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
+++ b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
@@ -335,7 +335,7 @@ extern "C" void StartKetsjiShell(struct ScrArea *area,
 			PyDict_SetItemString(dictionaryobject, "GameLogic", gameLogic); // Same as importing the module.
 			initGameKeys();
 			initPythonConstraintBinding();
-
+			initMathutils();
 
 			if (sceneconverter)
 			{
@@ -602,6 +602,7 @@ extern "C" void StartKetsjiShellSimulation(struct ScrArea *area,
 			PyDict_SetItemString(dictionaryobject, "GameLogic", gameLogic); // Same as importing the module
 			initGameKeys();
 			initPythonConstraintBinding();
+			initMathutils();
 
 			if (sceneconverter)
 			{
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
index f44318120e8..a6337403cd1 100644
--- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp
+++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
@@ -1939,7 +1939,17 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
 				float* fl = (float*) blenderobject->parentinv;
 				MT_Transform parinvtrans(fl);
 				parentinversenode->SetLocalPosition(parinvtrans.getOrigin());
-				parentinversenode->SetLocalOrientation(parinvtrans.getBasis());
+				// problem here: the parent inverse transform combines scaling and rotation 
+				// in the basis but the scenegraph needs separate rotation and scaling.
+				// This is not important for OpenGL (it uses 4x4 matrix) but it is important
+				// for the physic engine that needs a separate scaling
+				//parentinversenode->SetLocalOrientation(parinvtrans.getBasis());
+
+				// Extract the rotation and the scaling from the basis
+				MT_Matrix3x3 inverseOrientation(parinvtrans.getRotation());
+				parentinversenode->SetLocalOrientation(inverseOrientation);
+				MT_Matrix3x3 scale(inverseOrientation.transposed()*parinvtrans.getBasis());
+				parentinversenode->SetLocalScale(MT_Vector3(scale[0][0], scale[1][1], scale[2][2]));
 				
 				parentinversenode->AddChild(gameobj->GetSGNode());
 			}
diff --git a/source/gameengine/Converter/KX_IpoConvert.cpp b/source/gameengine/Converter/KX_IpoConvert.cpp
index 7410beecaf4..ce004fa0504 100644
--- a/source/gameengine/Converter/KX_IpoConvert.cpp
+++ b/source/gameengine/Converter/KX_IpoConvert.cpp
@@ -766,15 +766,18 @@ void BL_ConvertMaterialIpos(
 		// if there is only one material attached to the mesh then set material_index in BL_ConvertMaterialIpos to NULL
 		// --> this makes the UpdateMaterialData function in KX_GameObject.cpp use the old hack of using SetObjectColor
 		// because this yields a better performance as not all the vertex colors need to be edited
-		if(mat) ConvertMaterialIpos(mat, NULL, gameobj, converter);
+		if(mat) ConvertMaterialIpos(mat, 0, gameobj, converter);
 	}
 	else
 	{
 		for (int material_index=1; material_index <= blenderobject->totcol; material_index++)
 		{
 			Material *mat = give_current_material(blenderobject, material_index);
-			STR_HashedString matname = mat->id.name;
-			if(mat) ConvertMaterialIpos(mat, matname.hash(), gameobj, converter);
+			STR_HashedString matname;
+			if(mat) {
+				matname= mat->id.name;
+				ConvertMaterialIpos(mat, matname.hash(), gameobj, converter);
+			}
 		}
 	}
 }
diff --git a/source/gameengine/GamePlayer/common/windows/GPW_Canvas.h b/source/gameengine/GamePlayer/common/windows/GPW_Canvas.h
index bb1abd71505..bf8cb720811 100644
--- a/source/gameengine/GamePlayer/common/windows/GPW_Canvas.h
+++ b/source/gameengine/GamePlayer/common/windows/GPW_Canvas.h
@@ -36,7 +36,7 @@
 
 #include <iostream>
 #include <windows.h>
-#include <gl/gl.h>
+//#include <gl/gl.h>
 
 #include "GPC_Canvas.h"
 
diff --git a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
index b5ebffb9378..7be3b94d8ae 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
+++ b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
@@ -56,6 +56,7 @@ extern "C"
 #include "BLO_readfile.h"
 #include "BKE_global.h"
 #include "BKE_main.h"
+#include "DNA_scene_types.h"
 #ifdef __cplusplus
 }
 #endif // __cplusplus
@@ -647,7 +648,7 @@ bool GPG_Application::startEngine(void)
 		PyDict_SetItemString(dictionaryobject, "GameLogic", initGameLogic(startscene)); // Same as importing the module
 		initGameKeys();
 		initPythonConstraintBinding();
-
+		initMathutils();
 
 
 
@@ -669,6 +670,11 @@ bool GPG_Application::startEngine(void)
 		m_ketsjiengine->StartEngine(true);
 		m_engineRunning = true;
 		
+		// Set the animation playback rate for ipo's and actions
+		// the framerate below should patch with FPS macro defined in blendef.h
+		// Could be in StartEngine set the framerate, we need the scene to do this
+		m_ketsjiengine->SetAnimFrameRate( (((double) G.scene->r.frs_sec) / G.scene->r.frs_sec_base) );
+		
 	}
 	
 	if (!m_engineRunning)
diff --git a/source/gameengine/Ketsji/CMakeLists.txt b/source/gameengine/Ketsji/CMakeLists.txt
index 3b907d8d530..be009d94701 100644
--- a/source/gameengine/Ketsji/CMakeLists.txt
+++ b/source/gameengine/Ketsji/CMakeLists.txt
@@ -25,6 +25,17 @@
 # ***** END GPL LICENSE BLOCK *****
 
 FILE(GLOB SRC *.cpp)
+SET(SRC 
+  ${SRC}
+  ../../../source/blender/python/api2_2x/Mathutils.c
+  ../../../source/blender/python/api2_2x/constant.c
+  ../../../source/blender/python/api2_2x/euler.c
+  ../../../source/blender/python/api2_2x/gen_utils.c
+  ../../../source/blender/python/api2_2x/matrix.c
+  ../../../source/blender/python/api2_2x/point.c
+  ../../../source/blender/python/api2_2x/quat.c
+  ../../../source/blender/python/api2_2x/vector.c
+)
 
 SET(INC
   .
@@ -39,7 +50,8 @@ SET(INC
   ../../../intern/moto/include
   ../../../source/gameengine/Ketsji 
   ../../../source/blender/blenlib
-  ../../../source/blender/blenkernel 
+  ../../../source/blender/blenkernel
+  ../../../source/blender/python/api2_2x
   ../../../source/blender 
   ../../../source/blender/include
   ../../../source/blender/makesdna 
diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp
index 02d1ad1b12b..989cdabd491 100644
--- a/source/gameengine/Ketsji/KX_GameObject.cpp
+++ b/source/gameengine/Ketsji/KX_GameObject.cpp
@@ -914,6 +914,7 @@ PyMethodDef KX_GameObject::Methods[] = {
 	KX_PYMETHODTABLE(KX_GameObject, rayCastTo),
 	KX_PYMETHODTABLE(KX_GameObject, rayCast),
 	KX_PYMETHODTABLE(KX_GameObject, getDistanceTo),
+	KX_PYMETHODTABLE(KX_GameObject, getVectTo),
 	{NULL,NULL} //Sentinel
 };
 
@@ -1367,14 +1368,15 @@ PyObject* KX_GameObject::PyGetMesh(PyObject* self,
 {
 	int mesh = 0;
 
-	if (PyArg_ParseTuple(args, "|i", &mesh))
+	if (!PyArg_ParseTuple(args, "|i", &mesh))
+		return NULL; // python sets a simple error
+	
+	if (((unsigned int)mesh < m_meshes.size()) && mesh >= 0)
 	{
-		if (((unsigned int)mesh < m_meshes.size()) && mesh >= 0)
-		{
-			KX_MeshProxy* meshproxy = new KX_MeshProxy(m_meshes[mesh]);
-			return meshproxy;
-		}
+		KX_MeshProxy* meshproxy = new KX_MeshProxy(m_meshes[mesh]);
+		return meshproxy;
 	}
+	
 	Py_RETURN_NONE;
 }
 
@@ -1488,6 +1490,9 @@ PyObject* KX_GameObject::PyAlignAxisToVect(PyObject* self,
 		MT_Vector3 vect;
 		if (PyVecTo(pyvect, vect))
 		{
+			if (fac<=0.0) Py_RETURN_NONE; // Nothing to do.
+			if (fac> 1.0) fac= 1.0;
+			
 			AlignAxisToVect(vect,axis,fac);
 			NodeUpdateGS(0.f,true);
 			Py_RETURN_NONE;
@@ -1555,6 +1560,54 @@ KX_PYMETHODDEF_DOC(KX_GameObject, getDistanceTo,
 	return NULL;
 }
 
+KX_PYMETHODDEF_DOC(KX_GameObject, getVectTo,
+"getVectTo(other): get vector and the distance to another point/KX_GameObject\n"
+"Returns a 3-tuple with (distance,worldVector,localVector)\n")
+{
+	MT_Point3 toPoint, fromPoint;
+	MT_Vector3 toDir, locToDir;
+	MT_Scalar distance;
+
+	PyObject *returnValue;
+	PyObject *pyother;
+
+	if (!PyVecArgTo(args, toPoint))
+	{
+		PyErr_Clear();
+		if (PyArg_ParseTuple(args, "O!", &KX_GameObject::Type, &pyother))
+		{
+			KX_GameObject *other = static_cast<KX_GameObject*>(pyother);
+			toPoint = other->NodeGetWorldPosition();
+		}else
+		{
+			PyErr_SetString(PyExc_TypeError, "Expected a 3D Vector or GameObject type");
+			return NULL;
+		}
+	}
+
+	fromPoint = NodeGetWorldPosition();
+	toDir = toPoint-fromPoint;
+	distance = toDir.length();
+
+	if (MT_fuzzyZero(distance))
+	{
+		//cout << "getVectTo() Error: Null vector!\n";
+		locToDir = toDir = MT_Vector3(0.0,0.0,0.0);
+		distance = 0.0;
+	} else {
+		toDir.normalize();
+		locToDir = toDir * NodeGetWorldOrientation();
+	}
+	
+	returnValue = PyTuple_New(3);
+	if (returnValue) { // very unlikely to fail, python sets a memory error here.
+		PyTuple_SET_ITEM(returnValue, 0, PyFloat_FromDouble(distance));
+		PyTuple_SET_ITEM(returnValue, 1, PyObjectFrom(toDir));
+		PyTuple_SET_ITEM(returnValue, 2, PyObjectFrom(locToDir));
+	}
+	return returnValue;
+}
+
 bool KX_GameObject::RayHit(KX_ClientObjectInfo* client, MT_Point3& hit_point, MT_Vector3& hit_normal, void * const data)
 {
 
@@ -1588,8 +1641,7 @@ KX_PYMETHODDEF_DOC(KX_GameObject, rayCastTo,
 	char *propName = NULL;
 
 	if (!PyArg_ParseTuple(args,"O|fs", &pyarg, &dist, &propName)) {
-		PyErr_SetString(PyExc_TypeError, "Invalid arguments");
-		return NULL;
+		return NULL; // python sets simple error
 	}
 
 	if (!PyVecTo(pyarg, toPoint))
@@ -1654,8 +1706,7 @@ KX_PYMETHODDEF_DOC(KX_GameObject, rayCast,
 	KX_GameObject *other;
 
 	if (!PyArg_ParseTuple(args,"O|Ofs", &pyto, &pyfrom, &dist, &propName)) {
-		PyErr_SetString(PyExc_TypeError, "Invalid arguments");
-		return NULL;
+		return NULL; // Python sets a simple error
 	}
 
 	if (!PyVecTo(pyto, toPoint))
@@ -1714,13 +1765,11 @@ KX_PYMETHODDEF_DOC(KX_GameObject, rayCast,
     if (m_pHitObject)
 	{
 		PyObject* returnValue = PyTuple_New(3);
-		if (!returnValue) {
-			PyErr_SetString(PyExc_TypeError, "PyTuple_New() failed");
-			return NULL;
+		if (returnValue) { // unlikely this would ever fail, if it does python sets an error
+			PyTuple_SET_ITEM(returnValue, 0, m_pHitObject->AddRef());
+			PyTuple_SET_ITEM(returnValue, 1, PyObjectFrom(resultPoint));
+			PyTuple_SET_ITEM(returnValue, 2, PyObjectFrom(resultNormal));
 		}
-		PyTuple_SET_ITEM(returnValue, 0, m_pHitObject->AddRef());
-		PyTuple_SET_ITEM(returnValue, 1, PyObjectFrom(resultPoint));
-		PyTuple_SET_ITEM(returnValue, 2, PyObjectFrom(resultNormal));
 		return returnValue;
 	}
 	return Py_BuildValue("OOO", Py_None, Py_None, Py_None);
diff --git a/source/gameengine/Ketsji/KX_GameObject.h b/source/gameengine/Ketsji/KX_GameObject.h
index 1d36798b12f..4e435e9ddf4 100644
--- a/source/gameengine/Ketsji/KX_GameObject.h
+++ b/source/gameengine/Ketsji/KX_GameObject.h
@@ -756,6 +756,7 @@ public:
 	KX_PYMETHOD_DOC(KX_GameObject,rayCastTo);
 	KX_PYMETHOD_DOC(KX_GameObject,rayCast);
 	KX_PYMETHOD_DOC(KX_GameObject,getDistanceTo);
+	KX_PYMETHOD_DOC(KX_GameObject,getVectTo);
 	
 private :
 
diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp
index b66c3e42606..db4793de23d 100644
--- a/source/gameengine/Ketsji/KX_PythonInit.cpp
+++ b/source/gameengine/Ketsji/KX_PythonInit.cpp
@@ -62,6 +62,10 @@
 
 #include "KX_PyMath.h"
 
+extern "C" {
+	#include "Mathutils.h" // Blender.Mathutils module copied here so the blenderlayer can use.
+}
+
 #include "PHY_IPhysicsEnvironment.h"
 // FIXME: Enable for access to blender python modules.  This is disabled because
 // python has dependencies on a lot of other modules and is a pain to link.
@@ -733,7 +737,7 @@ PyObject* initGameLogic(KX_Scene* scene) // quick hack to get gravity hook
 
 	ErrorObject = PyString_FromString("GameLogic.error");
 	PyDict_SetItemString(d, "error", ErrorObject);
-
+	
 	// XXXX Add constants here
 	/* To use logic bricks, we need some sort of constants. Here, we associate */
 	/* constants and sumbolic names. Add them to dictionary d.                 */
@@ -876,7 +880,7 @@ PyObject *KXpy_import(PyObject *self, PyObject *args)
 	/* quick hack for GamePython modules 
 		TODO: register builtin modules properly by ExtendInittab */
 	if (!strcmp(name, "GameLogic") || !strcmp(name, "GameKeys") || !strcmp(name, "PhysicsConstraints") ||
-		!strcmp(name, "Rasterizer")) {
+		!strcmp(name, "Rasterizer") || !strcmp(name, "Mathutils")) {
 		return PyImport_ImportModuleEx(name, globals, locals, fromlist);
 	}
 		
@@ -1169,6 +1173,11 @@ PyObject* initGameKeys()
 	return d;
 }
 
+PyObject* initMathutils()
+{
+	return Mathutils_Init("Mathutils"); // Use as a top level module in BGE
+}
+
 void PHY_SetActiveScene(class KX_Scene* scene)
 {
 	gp_KetsjiScene = scene;
diff --git a/source/gameengine/Ketsji/KX_PythonInit.h b/source/gameengine/Ketsji/KX_PythonInit.h
index 41cf7fd67b3..f094a1ca575 100644
--- a/source/gameengine/Ketsji/KX_PythonInit.h
+++ b/source/gameengine/Ketsji/KX_PythonInit.h
@@ -44,6 +44,7 @@ PyObject*	initGameLogic(class KX_Scene* ketsjiscene);
 PyObject*	initGameKeys();
 PyObject*	initRasterizer(class RAS_IRasterizer* rasty,class RAS_ICanvas* canvas);
 PyObject*	initGamePlayerPythonScripting(const STR_String& progname, TPythonSecurityLevel level);
+PyObject*	initMathutils();
 void		exitGamePlayerPythonScripting();
 PyObject*	initGamePythonScripting(const STR_String& progname, TPythonSecurityLevel level);
 void		exitGamePythonScripting();
diff --git a/source/gameengine/Ketsji/KX_RadarSensor.cpp b/source/gameengine/Ketsji/KX_RadarSensor.cpp
index de4979ac4c9..d371626b597 100644
--- a/source/gameengine/Ketsji/KX_RadarSensor.cpp
+++ b/source/gameengine/Ketsji/KX_RadarSensor.cpp
@@ -147,23 +147,23 @@ void KX_RadarSensor::SynchronizeTransform()
 		};
 	case 3: // -X Axis
 		{
-			MT_Quaternion rotquatje(MT_Vector3(0,0,1),MT_radians(90));
+			MT_Quaternion rotquatje(MT_Vector3(0,0,1),MT_radians(-90));
 			trans.rotate(rotquatje);
-			trans.translate(MT_Vector3 (0, m_coneheight/2.0 ,0));
+			trans.translate(MT_Vector3 (0, -m_coneheight/2.0 ,0));
 			break;
 		};
 	case 4: // -Y Axis
 		{
-			MT_Quaternion rotquatje(MT_Vector3(1,0,0),MT_radians(-180));
-			trans.rotate(rotquatje);
-			trans.translate(MT_Vector3 (0, m_coneheight/2.0 ,0));
+			//MT_Quaternion rotquatje(MT_Vector3(1,0,0),MT_radians(-180));
+			//trans.rotate(rotquatje);
+			trans.translate(MT_Vector3 (0, -m_coneheight/2.0 ,0));
 			break;
 		};
 	case 5: // -Z Axis
 		{
-			MT_Quaternion rotquatje(MT_Vector3(1,0,0),MT_radians(-90));
+			MT_Quaternion rotquatje(MT_Vector3(1,0,0),MT_radians(90));
 			trans.rotate(rotquatje);
-			trans.translate(MT_Vector3 (0, m_coneheight/2.0 ,0));
+			trans.translate(MT_Vector3 (0, -m_coneheight/2.0 ,0));
 			break;
 		};
 	default:
diff --git a/source/gameengine/Ketsji/KX_TouchEventManager.cpp b/source/gameengine/Ketsji/KX_TouchEventManager.cpp
index 7528fdbbc34..48d4cf59a2b 100644
--- a/source/gameengine/Ketsji/KX_TouchEventManager.cpp
+++ b/source/gameengine/Ketsji/KX_TouchEventManager.cpp
@@ -100,17 +100,17 @@ bool	 KX_TouchEventManager::newBroadphaseResponse(void *client_data,
 void KX_TouchEventManager::RegisterSensor(SCA_ISensor* sensor)
 {
 	KX_TouchSensor* touchsensor = static_cast<KX_TouchSensor*>(sensor);
-	m_sensors.insert(touchsensor);
-
-	touchsensor->RegisterSumo(this);
+	if (m_sensors.insert(touchsensor).second)
+		// the sensor was effectively inserted, register it
+		touchsensor->RegisterSumo(this);
 }
 
 void KX_TouchEventManager::RemoveSensor(SCA_ISensor* sensor)
 {
 	KX_TouchSensor* touchsensor = static_cast<KX_TouchSensor*>(sensor);
-	m_sensors.erase(touchsensor);
-
-	touchsensor->UnregisterSumo(this);
+	if (m_sensors.erase(touchsensor))
+		// the sensor was effectively removed, unregister it
+		touchsensor->UnregisterSumo(this);
 }
 
 
diff --git a/source/gameengine/Ketsji/SConscript b/source/gameengine/Ketsji/SConscript
index fdac5a71071..f6f744b199a 100644
--- a/source/gameengine/Ketsji/SConscript
+++ b/source/gameengine/Ketsji/SConscript
@@ -5,7 +5,21 @@ Import ('env')
 
 sources = env.Glob('*.cpp')
 
-incs = '. #source/kernel/gen_system #intern/string #intern/guardedalloc'
+# Mathutils C files.
+sources.extend([\
+	'#source/blender/python/api2_2x/Mathutils.c',\
+	'#source/blender/python/api2_2x/constant.c',\
+	'#source/blender/python/api2_2x/euler.c',\
+	'#source/blender/python/api2_2x/gen_utils.c',\
+	'#source/blender/python/api2_2x/matrix.c',\
+	'#source/blender/python/api2_2x/point.c',\
+	'#source/blender/python/api2_2x/quat.c',\
+	'#source/blender/python/api2_2x/vector.c',\
+])
+
+incs = '. #source/blender/python/api2_2x' # Only for Mathutils! - no other deps
+
+incs += ' #source/kernel/gen_system #intern/string #intern/guardedalloc'
 incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer #intern/bmfont'
 incs += ' #intern/SoundSystem #intern/SoundSystem/include #intern/SoundSystem/openal'
 incs += ' #intern/SoundSystem/dummy #intern/SoundSystem/intern #source/gameengine/Converter'
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
index 5c70b071661..b872fae6138 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
@@ -42,7 +42,8 @@ CcdPhysicsController::CcdPhysicsController (const CcdConstructionInfo& ci)
 {
 	m_collisionDelay = 0;
 	m_newClientInfo = 0;
-	
+	m_registerCount = 0;
+		
 	m_MotionState = ci.m_MotionState;
 	m_bulletMotionState = 0;
 	
@@ -217,7 +218,7 @@ void		CcdPhysicsController::WriteDynamicsToMotionState()
 void		CcdPhysicsController::PostProcessReplica(class PHY_IMotionState* motionstate,class PHY_IPhysicsController* parentctrl)
 {
 	m_MotionState = motionstate;
-
+	m_registerCount = 0;
 	
 
 	m_body = 0;
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.h b/source/gameengine/Physics/Bullet/CcdPhysicsController.h
index 64f1876e199..448e5622eff 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsController.h
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.h
@@ -110,12 +110,19 @@ class CcdPhysicsController : public PHY_IPhysicsController
 
 
 	void*		m_newClientInfo;
-
+	int			m_registerCount;	// needed when multiple sensors use the same controller
 	CcdConstructionInfo	m_cci;//needed for replication
 	void GetWorldOrientation(btMatrix3x3& mat);
 
 	void CreateRigidbody();
 
+	bool Register()	{ 
+		return (m_registerCount++ == 0) ? true : false;
+	}
+	bool Unregister() {
+		return (--m_registerCount == 0) ? true : false;
+	}
+
 	protected:
 		void setWorldOrientation(const btMatrix3x3& mat);
 
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
index ea14c5430e2..dfbcf115fd7 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
@@ -439,6 +439,9 @@ void	CcdPhysicsEnvironment::removeCcdPhysicsController(CcdPhysicsController* ctr
 	m_dynamicsWorld->removeRigidBody(ctrl->GetRigidBody());
 	m_controllers.erase(ctrl);
 
+	if (ctrl->m_registerCount != 0)
+		printf("Warning: removing controller with non-zero m_registerCount: %d\n", ctrl->m_registerCount);
+
 	//remove it from the triggers
 	m_triggerControllers.erase(ctrl);
 }
@@ -473,6 +476,13 @@ void CcdPhysicsEnvironment::enableCcdPhysicsController(CcdPhysicsController* ctr
 	}
 }
 
+void CcdPhysicsEnvironment::disableCcdPhysicsController(CcdPhysicsController* ctrl)
+{
+	if (m_controllers.erase(ctrl))
+	{
+		m_dynamicsWorld->removeRigidBody(ctrl->GetRigidBody());
+	}
+}
 
 
 void	CcdPhysicsEnvironment::beginFrame()
@@ -885,13 +895,17 @@ void CcdPhysicsEnvironment::addSensor(PHY_IPhysicsController* ctrl)
 
 void CcdPhysicsEnvironment::removeCollisionCallback(PHY_IPhysicsController* ctrl)
 {
-	m_triggerControllers.erase((CcdPhysicsController*)ctrl);
+	CcdPhysicsController* ccdCtrl = (CcdPhysicsController*)ctrl;
+	if (ccdCtrl->Unregister())
+		m_triggerControllers.erase(ccdCtrl);
 }
 
 
 void CcdPhysicsEnvironment::removeSensor(PHY_IPhysicsController* ctrl)
 {
-	removeCcdPhysicsController((CcdPhysicsController*)ctrl);
+	removeCollisionCallback(ctrl);
+
+	disableCcdPhysicsController((CcdPhysicsController*)ctrl);
 }
 
 void CcdPhysicsEnvironment::addTouchCallback(int response_class, PHY_ResponseCallback callback, void *user)
@@ -930,8 +944,8 @@ void CcdPhysicsEnvironment::requestCollisionCallback(PHY_IPhysicsController* ctr
 {
 	CcdPhysicsController* ccdCtrl = static_cast<CcdPhysicsController*>(ctrl);
 
-	//printf("requestCollisionCallback\n");
-	m_triggerControllers.insert(ccdCtrl);
+	if (ccdCtrl->Register())
+		m_triggerControllers.insert(ccdCtrl);
 }
 
 void	CcdPhysicsEnvironment::CallbackTriggers()
@@ -942,13 +956,16 @@ void	CcdPhysicsEnvironment::CallbackTriggers()
 	if (m_triggerCallbacks[PHY_OBJECT_RESPONSE] || (m_debugDrawer && (m_debugDrawer->getDebugMode() & btIDebugDraw::DBG_DrawContactPoints)))
 	{
 		//walk over all overlapping pairs, and if one of the involved bodies is registered for trigger callback, perform callback
-		int numManifolds = m_dynamicsWorld->getDispatcher()->getNumManifolds();
+		btDispatcher* dispatcher = m_dynamicsWorld->getDispatcher();
+		int numManifolds = dispatcher->getNumManifolds();
 		for (int i=0;i<numManifolds;i++)
 		{
-			btPersistentManifold* manifold = m_dynamicsWorld->getDispatcher()->getManifoldByIndexInternal(i);
+			btPersistentManifold* manifold = dispatcher->getManifoldByIndexInternal(i);
 			int numContacts = manifold->getNumContacts();
 			if (numContacts)
 			{
+				btRigidBody* rb0 = static_cast<btRigidBody*>(manifold->getBody0());
+				btRigidBody* rb1 = static_cast<btRigidBody*>(manifold->getBody1());
 				if (m_debugDrawer && (m_debugDrawer->getDebugMode() & btIDebugDraw::DBG_DrawContactPoints))
 				{
 					for (int j=0;j<numContacts;j++)
@@ -959,8 +976,8 @@ void	CcdPhysicsEnvironment::CallbackTriggers()
 							m_debugDrawer->drawContactPoint(cp.m_positionWorldOnB,cp.m_normalWorldOnB,cp.getDistance(),cp.getLifeTime(),color);
 					}
 				}
-				btRigidBody* obj0 = static_cast<btRigidBody* >(manifold->getBody0());
-				btRigidBody* obj1 = static_cast<btRigidBody* >(manifold->getBody1());
+				btRigidBody* obj0 = rb0;
+				btRigidBody* obj1 = rb1;
 
 				//m_internalOwner is set in 'addPhysicsController'
 				CcdPhysicsController* ctrl0 = static_cast<CcdPhysicsController*>(obj0->getUserPointer());
@@ -977,6 +994,15 @@ void	CcdPhysicsEnvironment::CallbackTriggers()
 					m_triggerCallbacks[PHY_OBJECT_RESPONSE](m_triggerCallbacksUserPtrs[PHY_OBJECT_RESPONSE],
 						ctrl0,ctrl1,0);
 				}
+				// Bullet does not refresh the manifold contact point for object without contact response
+				// may need to remove this when a newer Bullet version is integrated
+				if (!dispatcher->needsResponse(rb0, rb1))
+				{
+					// Refresh algorithm fails sometimes when there is penetration 
+					// (usuall the case with ghost and sensor objects)
+					// Let's just clear the manifold, in any case, it is recomputed on each frame.
+					manifold->clearManifold(); //refreshContactPoints(rb0->getCenterOfMassTransform(),rb1->getCenterOfMassTransform());
+				}
 			}
 		}
 
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
index fd96522037e..825a5e525f2 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
@@ -186,10 +186,7 @@ protected:
 
 		void	updateCcdPhysicsController(CcdPhysicsController* ctrl, btScalar newMass, int newCollisionFlags, short int newCollisionGroup, short int newCollisionMask);
 
-		void	disableCcdPhysicsController(CcdPhysicsController* ctrl)
-		{ 
-			removeCcdPhysicsController(ctrl); 
-		}
+		void	disableCcdPhysicsController(CcdPhysicsController* ctrl);
 
 		void	enableCcdPhysicsController(CcdPhysicsController* ctrl);
 
diff --git a/source/gameengine/PyDoc/KX_GameObject.py b/source/gameengine/PyDoc/KX_GameObject.py
index 8f17cf26f15..a5ba5b1d634 100644
--- a/source/gameengine/PyDoc/KX_GameObject.py
+++ b/source/gameengine/PyDoc/KX_GameObject.py
@@ -253,6 +253,16 @@ class KX_GameObject:
 		@type other: L{KX_GameObject} or list [x, y, z]
 		@rtype: float
 		"""
+	def getVectTo(other):
+		"""
+		Returns the vector and the distance to another object or point.
+		The vector is normalized unless the distance is 0, in which a NULL vector is returned.
+		
+		@param other: a point or another L{KX_GameObject} to get the vector and distance to.
+		@type other: L{KX_GameObject} or list [x, y, z]
+		@rtype: 3-tuple (float, 3-tuple (x,y,z), 3-tuple (x,y,z))
+		@return: (distance, globalVector(3), localVector(3))
+		"""
 	def rayCastTo(other,dist,prop):
 		"""
 		Look towards another point/object and find first object hit within dist that matches prop.

From 4c89ee7838c3162bca9045db857593b05fb42419 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Sat, 9 Aug 2008 14:47:51 +0000
Subject: [PATCH 194/252] Line highlighting did not work for syntax errors.

---
 source/blender/python/BPY_interface.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/source/blender/python/BPY_interface.c b/source/blender/python/BPY_interface.c
index 48633d37fa2..05ea2d77ab9 100644
--- a/source/blender/python/BPY_interface.c
+++ b/source/blender/python/BPY_interface.c
@@ -556,6 +556,7 @@ void BPY_Err_Handle( char *script_name )
 	if( exception
 	    && PyErr_GivenExceptionMatches( exception, PyExc_SyntaxError ) ) {
 		/* no traceback available when SyntaxError */
+		PyErr_NormalizeException( &exception, &err, &tb );
 		PyErr_Restore( exception, err, tb );	/* takes away reference! */
 		PyErr_Print(  );
 		v = PyObject_GetAttrString( err, "lineno" );

From 83bcb9deffb5eef2cbbb883c21f700840175d3fc Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Sat, 9 Aug 2008 18:11:40 +0000
Subject: [PATCH 195/252] Python errors originating in the active text are now
 displayed at the top of the text area. Errors in other files/scripts still
 pop up a message as before and all errors are still printed to the console.
 This removes the need to switch to the console for local errors.

---
 source/blender/python/BPY_extern.h    |  1 +
 source/blender/python/BPY_interface.c | 28 +++++++++++++++++++++++++++
 source/blender/src/drawtext.c         | 20 +++++++++++++++----
 3 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/source/blender/python/BPY_extern.h b/source/blender/python/BPY_extern.h
index 3d9b45051fb..a8b9cb48c16 100644
--- a/source/blender/python/BPY_extern.h
+++ b/source/blender/python/BPY_extern.h
@@ -89,6 +89,7 @@ extern "C" {
 	
 	int BPY_Err_getLinenumber( void );
 	const char *BPY_Err_getFilename( void );
+	const char *BPY_Err_getMessage( void );
 
 	int BPY_txt_do_python_Text( struct Text *text );
 	int BPY_menu_do_python( short menutype, int event );
diff --git a/source/blender/python/BPY_interface.c b/source/blender/python/BPY_interface.c
index 05ea2d77ab9..635bdfe2d3c 100644
--- a/source/blender/python/BPY_interface.c
+++ b/source/blender/python/BPY_interface.c
@@ -145,9 +145,11 @@ static struct _inittab BPy_Inittab_Modules[] = {
 * Structure definitions	
 **************************************************************************/
 #define FILENAME_LENGTH 24
+#define MESSAGE_LENGTH 256
 
 typedef struct _ScriptError {
 	char filename[FILENAME_LENGTH];
+	char message[MESSAGE_LENGTH+1];
 	int lineno;
 } ScriptError;
 
@@ -507,6 +509,15 @@ const char *BPY_Err_getFilename( void )
 	return g_script_error.filename;
 }
 
+/*****************************************************************************/
+/* Description: This function will return the short message of the error     */
+/* that has occured in the python script.                                    */
+/*****************************************************************************/
+const char *BPY_Err_getMessage( void )
+{
+	return g_script_error.message;
+}
+
 /*****************************************************************************/
 /* Description: Return PyString filename from a traceback object	    */
 /*****************************************************************************/
@@ -566,6 +577,15 @@ void BPY_Err_Handle( char *script_name )
 		} else {
 			g_script_error.lineno = -1;
 		}
+		v = PyObject_GetAttrString( err, "text" );
+		if ( v && PyString_Check(v) ) {
+			strcpy(g_script_error.message, "Invalid syntax: ");
+			strncpy(g_script_error.message+16, PyString_AS_STRING( v ), MESSAGE_LENGTH-16);
+			g_script_error.message[MESSAGE_LENGTH]= '\0';
+			Py_DECREF( v );
+		} else {
+			strcpy(g_script_error.message, "Invalid Syntax");
+		}
 		/* this avoids an abort in Python 2.3's garbage collecting: */
 		PyErr_Clear(  );
 		return;
@@ -612,6 +632,14 @@ void BPY_Err_Handle( char *script_name )
 				FILENAME_LENGTH );
 			Py_DECREF(v);
 		}
+		v = PyObject_GetAttrString( err, "message" );
+		if ( v && PyString_Check(v) ) {
+			strncpy(g_script_error.message, PyString_AS_STRING( v ), MESSAGE_LENGTH);
+			g_script_error.message[MESSAGE_LENGTH]= '\0';
+			Py_DECREF( v );
+		} else {
+			g_script_error.message[0] = '\0';
+		}
 		Py_DECREF( tb );
 	}
 
diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index ccb5767d7e7..bc30a52f126 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -2014,6 +2014,18 @@ void txt_find_panel(SpaceText *st, int again, int flags)
 	}
 }
 
+static void txt_print_error(SpaceText *st, char* str)
+{
+	if (curarea->spacetype != SPACE_TEXT) return;
+	drawtextspace(curarea, st);
+	glColor3ub(128, 16, 16);
+	glRecti(22, curarea->winy-2, curarea->winx-2, curarea->winy-st->lheight-3);
+	glColor3ub(255, 32, 32);
+	glRasterPos2i(22, curarea->winy-st->lheight);
+	BMF_DrawString(spacetext_get_font(st), str);
+	curarea->win_swap= WIN_BACK_OK;
+}
+
 void run_python_script(SpaceText *st)
 {
 	char *py_filename;
@@ -2029,16 +2041,17 @@ void run_python_script(SpaceText *st)
 		if (!st->text) return;
 
 		if (!strcmp(py_filename, st->text->id.name+2)) {
-			error_pyscript(  );
+			//error_pyscript(  );
 			if (lineno >= 0) {
 				txt_move_toline(text, lineno-1, 0);
 				txt_sel_line(text);
 				pop_space_text(st);
-			}	
+			}
+			txt_print_error(st, BPY_Err_getMessage());
 		} else {
 			error("Error in other (possibly external) file, "\
 				"check console");
-		}	
+		}
 	}
 }
 
@@ -2862,7 +2875,6 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 		case PKEY:
 			if (G.qual == LR_ALTKEY) {
 				run_python_script(st);
-				do_draw= 1;
 			}
 			break; /* BREAK P */
 		case QKEY:

From c1e9d2536426daa1e27db19d41177f8e7ef6839e Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Sat, 9 Aug 2008 19:39:31 +0000
Subject: [PATCH 196/252] Fix bug caused by extranuous return in distance
 weight calculations (ignored the weighting parameter) Extract constant for
 shape level matching Go to lowest node with matching shape, instead of just
 lowest node (created bugs)

---
 source/blender/src/autoarmature.c | 55 ++++++++++++++++++++++---------
 1 file changed, 40 insertions(+), 15 deletions(-)

diff --git a/source/blender/src/autoarmature.c b/source/blender/src/autoarmature.c
index ba68ec0e322..e7cd771b1b1 100644
--- a/source/blender/src/autoarmature.c
+++ b/source/blender/src/autoarmature.c
@@ -165,6 +165,9 @@ typedef enum
 
 static void RIG_calculateEdgeAngle(RigEdge *edge_first, RigEdge *edge_second);
 
+/* two levels */
+#define SHAPE_LEVELS (SHAPE_RADIX * SHAPE_RADIX) 
+
 /*********************************** EDITBONE UTILS ****************************************************/
 
 int countEditBoneChildren(ListBase *list, EditBone *parent)
@@ -839,14 +842,12 @@ static float costDistance(ReebArcIterator *iter, float *vec0, float *vec1, int i
 				max_dist = dist > max_dist ? dist : max_dist;
 			}
 			
-			return max_dist;
+			return G.scene->toolsettings->skgen_retarget_distance_weight * max_dist;
 		}
 		else
 		{
 			return MAX_COST;
 		}
-		
-		return G.scene->toolsettings->skgen_retarget_distance_weight * max_dist;
 	}
 	else
 	{
@@ -1550,14 +1551,34 @@ static void retargetArctoArc(RigGraph *rigg, RigArc *iarc)
 	}
 }
 
+static void matchMultiResolutionNode(RigNode *inode, ReebNode *top_node)
+{
+	ReebNode *enode;
+	int ishape, eshape;
+	
+	enode = top_node;
+	
+	ishape = BLI_subtreeShape((BNode*)inode, NULL, 0) % SHAPE_LEVELS;
+	eshape = BLI_subtreeShape((BNode*)enode, NULL, 0) % SHAPE_LEVELS;
+	
+	inode->link_mesh = enode;
+
+	while (ishape == eshape && enode->link_down)
+	{
+		inode->link_mesh = enode;
+
+		enode = enode->link_down;
+		eshape = BLI_subtreeShape((BNode*)enode, NULL, 0) % SHAPE_LEVELS;
+	} 
+}
+
 static void matchMultiResolutionArc(RigNode *start_node, RigArc *next_iarc, ReebArc *next_earc)
 {
 	ReebNode *enode = next_earc->head;
 	int ishape, eshape;
-	int shape_levels = SHAPE_RADIX * SHAPE_RADIX; /* two levels */
 
-	ishape = BLI_subtreeShape((BNode*)start_node, (BArc*)next_iarc, 1) % shape_levels;
-	eshape = BLI_subtreeShape((BNode*)enode, (BArc*)next_earc, 1) % shape_levels;
+	ishape = BLI_subtreeShape((BNode*)start_node, (BArc*)next_iarc, 1) % SHAPE_LEVELS;
+	eshape = BLI_subtreeShape((BNode*)enode, (BArc*)next_earc, 1) % SHAPE_LEVELS;
 	
 	while (ishape != eshape && next_earc->link_up)
 	{
@@ -1565,23 +1586,29 @@ static void matchMultiResolutionArc(RigNode *start_node, RigArc *next_iarc, Reeb
 		
 		next_earc = next_earc->link_up;
 		enode = next_earc->head;
-		eshape = BLI_subtreeShape((BNode*)enode, (BArc*)next_earc, 1) % shape_levels;
+		eshape = BLI_subtreeShape((BNode*)enode, (BArc*)next_earc, 1) % SHAPE_LEVELS;
 	} 
 
 	next_earc->flag = 1; // mark as taken
 	next_iarc->link_mesh = next_earc;
+	
+	/* mark all higher levels as taken too */
+	while (next_earc->link_up)
+	{
+		next_earc = next_earc->link_up;
+		next_earc->flag = 1; // mark as taken
+	}
 }
 
 static void matchMultiResolutionStartingNode(ReebGraph *reebg, RigNode *inode)
 {
 	ReebNode *enode;
 	int ishape, eshape;
-	int shape_levels = SHAPE_RADIX * SHAPE_RADIX; /* two levels */
 	
 	enode = reebg->nodes.first;
 	
-	ishape = BLI_subtreeShape((BNode*)inode, NULL, 0) % shape_levels;
-	eshape = BLI_subtreeShape((BNode*)enode, NULL, 0) % shape_levels;
+	ishape = BLI_subtreeShape((BNode*)inode, NULL, 0) % SHAPE_LEVELS;
+	eshape = BLI_subtreeShape((BNode*)enode, NULL, 0) % SHAPE_LEVELS;
 	
 	while (ishape != eshape && reebg->link_up)
 	{
@@ -1589,7 +1616,7 @@ static void matchMultiResolutionStartingNode(ReebGraph *reebg, RigNode *inode)
 		
 		enode = reebg->nodes.first;
 		
-		eshape = BLI_subtreeShape((BNode*)enode, NULL, 0) % shape_levels;
+		eshape = BLI_subtreeShape((BNode*)enode, NULL, 0) % SHAPE_LEVELS;
 	} 
 
 	inode->link_mesh = enode;
@@ -1670,10 +1697,8 @@ static void retargetSubgraph(RigGraph *rigg, RigArc *start_arc, RigNode *start_n
 		enode = BIF_otherNodeFromIndex(earc, enode);
 		inode = (RigNode*)BLI_otherNode((BArc*)start_arc, (BNode*)inode);
 	
-		/* Link with lowest possible node
-		 * Enabling going back to lower levels for each arc
-		 * */
-		inode->link_mesh = BIF_lowestLevelNode(enode);
+		/* match with lowest node with correct shape */
+		matchMultiResolutionNode(inode, enode);
 	}
 	
 	for(i = 0; i < inode->degree; i++)

From 6ba72d45502a98e26bb21d0821ad0f7774f229da Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Sun, 10 Aug 2008 12:02:33 +0000
Subject: [PATCH 197/252] Fixed saving to relative paths and made external
 modification messages more user friendly.

---
 source/blender/src/drawtext.c | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index bc30a52f126..49ca738169d 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -1560,14 +1560,18 @@ int txt_file_modified(Text *text)
 {
 	struct stat st;
 	int result;
+	char file[FILE_MAXDIR+FILE_MAXFILE];
 
 	if (!text || !text->name)
 		return 0;
 
-	if (!BLI_exists(text->name))
+	BLI_strncpy(file, text->name, FILE_MAXDIR+FILE_MAXFILE);
+	BLI_convertstringcode(file, G.sce);
+
+	if (!BLI_exists(file))
 		return 2;
 
-	result = stat(text->name, &st);
+	result = stat(file, &st);
 	
 	if(result == -1)
 		return -1;
@@ -1609,6 +1613,7 @@ void txt_write_file(Text *text)
 	TextLine *tmp;
 	int res;
 	struct stat st;
+	char file[FILE_MAXDIR+FILE_MAXFILE];
 	
 	/* Do we need to get a filename? */
 	if (text->flags & TXT_ISMEM) {
@@ -1618,17 +1623,20 @@ void txt_write_file(Text *text)
 			activate_fileselect(FILE_SPECIAL, "SAVE TEXT FILE", text->id.name+2, save_mem_text);
 		return;
 	}
+
+	BLI_strncpy(file, text->name, FILE_MAXDIR+FILE_MAXFILE);
+	BLI_convertstringcode(file, G.sce);
 	
 	/* Should we ask to save over? */
 	if (text->flags & TXT_ISTMP) {
-		if (BLI_exists(text->name)) {
+		if (BLI_exists(file)) {
 			if (!okee("Save over")) return;
 		} else if (!okee("Create new file")) return;
 
 		text->flags ^= TXT_ISTMP;
 	}
 		
-	fp= fopen(text->name, "w");
+	fp= fopen(file, "w");
 	if (fp==NULL) {
 		error("Unable to save file");
 		return;
@@ -1644,7 +1652,7 @@ void txt_write_file(Text *text)
 	
 	fclose (fp);
 
-	res= stat(text->name, &st);
+	res= stat(file, &st);
 	text->mtime= st.st_mtime;
 	
 	if (text->flags & TXT_ISDIRTY) text->flags ^= TXT_ISDIRTY;
@@ -3157,12 +3165,12 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 		}
 	}
 
-	if (last_check_time < PIL_check_seconds_timer() - 1.0) {
+	if (last_check_time < PIL_check_seconds_timer() - 10.0) {
 		switch (txt_file_modified(text)) {
 		case 1:
 			/* Modified locally and externally, ahhh. Offer more possibilites. */
 			if (text->flags & TXT_ISDIRTY) {
-				switch (pupmenu("External File Modified with Local Changes %t|Load external changes (overwrite local) %x0|Save local changes (overwrite external) %x1|Make text internal %x2")) {
+				switch (pupmenu("File Modified Outside and Inside Blender %t|Load outside changes (ignore local changes) %x0|Save local changes (ignore outside changes) %x1|Make text internal (separate copy) %x2")) {
 				case 0:
 					reopen_text(text);
 					if (st->showsyntax) txt_format_text(st);
@@ -3180,7 +3188,7 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 					break;
 				}
 			} else {
-				switch (pupmenu("External File Modified %t|Reload from disk %x0|Make text internal %x1")) {
+				switch (pupmenu("File Modified Outside Blender %t|Reload from disk %x0|Make text internal (separate copy) %x1")) {
 				case 0:
 					reopen_text(text);
 					if (st->showsyntax) txt_format_text(st);
@@ -3196,13 +3204,17 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			}
 			break;
 		case 2:
-			switch (pupmenu("External File Deleted %t|Make text internal %x0")) {
+			switch (pupmenu("File Deleted Outside Blender %t|Make text internal %x0|Recreate file %x1")) {
 			case 0:
 				text->flags |= TXT_ISMEM | TXT_ISDIRTY | TXT_ISTMP;
 				MEM_freeN(text->name);
 				text->name= NULL;
 				do_draw= 1;
 				break;
+			case 1:
+				txt_write_file(text);
+				do_draw= 1;
+				break;
 			}
 			break;
 		default:

From fb3a42d0f961bc575e3c56d0ad1c9ea46af4b2ed Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Sun, 10 Aug 2008 14:24:14 +0000
Subject: [PATCH 198/252] Shift keys cancelled the suggestions list (missed
 from earlier event refactor)

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

diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index 49ca738169d..7d1a17c6e65 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -2381,6 +2381,9 @@ static short do_texttools(SpaceText *st, char ascii, unsigned short evnt, short
 					draw= 1;
 					break;
 				}
+			case RIGHTSHIFTKEY:
+			case LEFTSHIFTKEY:
+				break;
 			default:
 				if (tools & TOOL_SUGG_LIST) texttool_suggest_clear(), draw= 1;
 				if (tools & TOOL_DOCUMENT) texttool_docs_clear(), doc_scroll= 0, draw= 1;

From 5dad15441439065cbbe79c54edf0b2bdfab810dc Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Sun, 10 Aug 2008 16:07:14 +0000
Subject: [PATCH 199/252] Fixed inconsistencies between the text plugins and
 them not suggesting when called from the menu.

---
 release/scripts/textplugin_functiondocs.py  | 10 ++-
 release/scripts/textplugin_imports.py       | 75 +++++++++++++--------
 release/scripts/textplugin_membersuggest.py |  2 +-
 release/scripts/textplugin_outliner.py      |  4 +-
 release/scripts/textplugin_suggest.py       | 16 +++--
 release/scripts/textplugin_templates.py     |  2 +-
 source/blender/src/drawtext.c               |  2 +-
 7 files changed, 74 insertions(+), 37 deletions(-)

diff --git a/release/scripts/textplugin_functiondocs.py b/release/scripts/textplugin_functiondocs.py
index 7456f7236da..d9cf6657a25 100644
--- a/release/scripts/textplugin_functiondocs.py
+++ b/release/scripts/textplugin_functiondocs.py
@@ -1,6 +1,6 @@
 #!BPY
 """
-Name: 'Function Documentation'
+Name: 'Function Documentation | Ctrl I'
 Blender: 246
 Group: 'TextPlugin'
 Shortcut: 'Ctrl+I'
@@ -29,14 +29,22 @@ def main():
 	
 	# Look backwards for first '(' without ')'
 	b = 0
+	found = False
 	for i in range(c-1, -1, -1):
 		if line[i] == ')': b += 1
 		elif line[i] == '(':
 			b -= 1
 			if b < 0:
+				found = True
 				c = i
 				break
 	
+	# Otherwise identify the name under the cursor
+	if not found:
+		llen = len(line)
+		while c<llen and (line[c].isalnum() or line[c]=='_'):
+			c += 1
+	
 	pre = get_targets(line, c)
 	
 	if len(pre) == 0:
diff --git a/release/scripts/textplugin_imports.py b/release/scripts/textplugin_imports.py
index 16d27ac1004..0e32a6fb2a6 100644
--- a/release/scripts/textplugin_imports.py
+++ b/release/scripts/textplugin_imports.py
@@ -1,6 +1,6 @@
 #!BPY
 """
-Name: 'Import Complete'
+Name: 'Import Complete|Space'
 Blender: 246
 Group: 'TextPlugin'
 Shortcut: 'Space'
@@ -31,41 +31,62 @@ def main():
 	
 	# No 'from' found
 	if pos == -1:
-		# Check instead for straight 'import'
+		# Check instead for straight 'import xxxx'
 		pos2 = line.rfind('import ', 0, c)
-		if pos2 != -1 and (pos2 == c-7 or (pos2 < c-7 and line[c-2]==',')):
+		if pos2 != -1:
+			pos2 += 7
+			for i in range(pos2, c):
+				if line[i]==',' or (line[i]==' ' and line[i-1]==','):
+					pos2 = i+1
+				elif not line[i].isalnum() and line[i] != '_':
+					return
 			items = [(m, 'm') for m in get_modules()]
 			items.sort(cmp = suggest_cmp)
-			txt.suggest(items, '')
+			txt.suggest(items, line[pos2:c].strip())
+		return
 	
-	# Immediate 'from' before cursor
-	elif pos == c-5:
+	# Found 'from xxxxx' before cursor
+	immediate = True
+	pos += 5
+	for i in range(pos, c):
+		if line[i]=='.':
+			pos = i+1
+		elif not line[i].isalnum() and line[i] != '_':
+			immediate = False
+			break
+	
+	# Immediate 'from' followed by at most a module name
+	if immediate:
 		items = [(m, 'm') for m in get_modules()]
 		items.sort(cmp = suggest_cmp)
 		txt.suggest(items, '')
+		return
 	
-	# Found 'from' earlier
-	else:
-		pos2 = line.rfind('import ', pos+5, c)
+	# Found 'from' earlier, suggest import if not already there
+	pos2 = line.rfind('import ', pos, c)
+	
+	# No 'import' found after 'from' so suggest it
+	if pos2 == -1:
+		txt.suggest([('import', 'k')], '')
+		return
 		
-		# No 'import' found after 'from' so suggest it
-		if pos2 == -1:
-			txt.suggest([('import', 'k')], '')
-			
-		# Immediate 'import' before cursor and after 'from...'
-		elif pos2 == c-7 or line[c-2] == ',':
-			between = line[pos+5:pos2-1].strip()
-			try:
-				mod = get_module(between)
-			except ImportError:
-				print 'Module not found:', between
-				return
-			
-			items = [('*', 'k')]
-			for (k,v) in mod.__dict__.items():
-				items.append((k, type_char(v)))
-			items.sort(cmp = suggest_cmp)
-			txt.suggest(items, '')
+	# Immediate 'import' before cursor and after 'from...'
+	for i in range(pos2+7, c):
+		if line[i]==',' or (line[i]==' ' and line[i-1]==','):
+			pass
+		elif not line[i].isalnum() and line[i] != '_':
+			return
+	between = line[pos:pos2-1].strip()
+	try:
+		mod = get_module(between)
+	except ImportError:
+		return
+	
+	items = [('*', 'k')]
+	for (k,v) in mod.__dict__.items():
+		items.append((k, type_char(v)))
+	items.sort(cmp = suggest_cmp)
+	txt.suggest(items, '')
 
 # Check we are running as a script and not imported as a module
 if __name__ == "__main__" and OK:
diff --git a/release/scripts/textplugin_membersuggest.py b/release/scripts/textplugin_membersuggest.py
index 63ade4b660b..2b261703e19 100644
--- a/release/scripts/textplugin_membersuggest.py
+++ b/release/scripts/textplugin_membersuggest.py
@@ -1,6 +1,6 @@
 #!BPY
 """
-Name: 'Member Suggest'
+Name: 'Member Suggest | .'
 Blender: 246
 Group: 'TextPlugin'
 Shortcut: 'Period'
diff --git a/release/scripts/textplugin_outliner.py b/release/scripts/textplugin_outliner.py
index 0dbdb624dc5..345361b47d4 100644
--- a/release/scripts/textplugin_outliner.py
+++ b/release/scripts/textplugin_outliner.py
@@ -1,6 +1,6 @@
 #!BPY
 """
-Name: 'Outline'
+Name: 'Code Outline | Ctrl T'
 Blender: 246
 Group: 'TextPlugin'
 Shortcut: 'Ctrl+T'
@@ -99,7 +99,7 @@ def main():
 	vars_menu_length = len(tmp)
 	items.extend(tmp)
 	
-	menu = [('Outliner%t', 0),
+	menu = [('Script %t', 0),
 			('Classes', class_menu),
 			('Functions', defs_menu),
 			('Variables', vars_menu)]
diff --git a/release/scripts/textplugin_suggest.py b/release/scripts/textplugin_suggest.py
index c2a12ac15f5..0e83e1e8cc7 100644
--- a/release/scripts/textplugin_suggest.py
+++ b/release/scripts/textplugin_suggest.py
@@ -1,6 +1,6 @@
 #!BPY
 """
-Name: 'Suggest All'
+Name: 'Suggest All | Ctrl Space'
 Blender: 246
 Group: 'TextPlugin'
 Shortcut: 'Ctrl+Space'
@@ -21,14 +21,22 @@ def check_membersuggest(line, c):
 	if pos == -1:
 		return False
 	for s in line[pos+1:c]:
-		if not s.isalnum() and not s == '_':
+		if not s.isalnum() and s != '_':
 			return False
 	return True
 
 def check_imports(line, c):
-	if c >= 7 and line.rfind('import ', 0, c) == c-7:
+	pos = line.rfind('import ', 0, c)
+	if pos > -1:
+		for s in line[pos+7:c]:
+			if not s.isalnum() and s != '_':
+				return False
 		return True
-	if c >= 5 and line.rfind('from ', 0, c) == c-5:
+	pos = line.rfind('from ', 0, c)
+	if pos > -1:
+		for s in line[pos+5:c]:
+			if not s.isalnum() and s != '_':
+				return False
 		return True
 	return False
 
diff --git a/release/scripts/textplugin_templates.py b/release/scripts/textplugin_templates.py
index 0cd772f863e..508ede11ddc 100644
--- a/release/scripts/textplugin_templates.py
+++ b/release/scripts/textplugin_templates.py
@@ -1,6 +1,6 @@
 #!BPY
 """
-Name: 'Templates'
+Name: 'Template Completion | Tab'
 Blender: 246
 Group: 'TextPlugin'
 Shortcut: 'Tab'
diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index 7d1a17c6e65..997fb01cab8 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -2267,7 +2267,7 @@ static short do_texttools(SpaceText *st, char ascii, unsigned short evnt, short
 		}
 		if (tools & TOOL_DOCUMENT) texttool_docs_clear(), doc_scroll= 0, draw= 1;
 
-	} else if (val==1) {
+	} else if (val==1 && evnt) {
 		switch (evnt) {
 			case LEFTMOUSE:
 				if (do_suggest_select(st))

From a5d955632f40f4a1abee4928c5068968b35a757e Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Sun, 10 Aug 2008 17:00:25 +0000
Subject: [PATCH 200/252] Added sys.path module search to BPyTextPlugin module
 and fixed IndentationError when parsing.

---
 release/scripts/bpymodules/BPyTextPlugin.py | 40 ++++++++++++++++-----
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/release/scripts/bpymodules/BPyTextPlugin.py b/release/scripts/bpymodules/BPyTextPlugin.py
index 870194880b3..94a2b8be38a 100644
--- a/release/scripts/bpymodules/BPyTextPlugin.py
+++ b/release/scripts/bpymodules/BPyTextPlugin.py
@@ -1,4 +1,4 @@
-import bpy, sys
+import bpy, sys, os
 import __builtin__, tokenize
 from Blender.sys import time
 from tokenize import generate_tokens, TokenError, \
@@ -65,7 +65,7 @@ CTX_DOUBLE_QUOTE = 2
 CTX_COMMENT = 3
 
 # Special time period constants
-AUTO = -1
+TP_AUTO = -1
 
 # Python keywords
 KEYWORDS = ['and', 'del', 'from', 'not', 'while', 'as', 'elif', 'global',
@@ -74,25 +74,49 @@ KEYWORDS = ['and', 'del', 'from', 'not', 'while', 'as', 'elif', 'global',
 			'raise', 'continue', 'finally', 'is', 'return', 'def', 'for',
 			'lambda', 'try' ]
 
+# Module file extensions
+MODULE_EXTS = ['.py', '.pyc', '.pyo', '.pyw', '.pyd']
+
 ModuleType = type(__builtin__)
 NoneScriptDesc = ScriptDesc('', dict(), dict(), dict(), dict(), True)
 
-_modules = dict([(n, None) for n in sys.builtin_module_names])
+_modules = {}
 _modules_updated = 0
 _parse_cache = dict()
 
-def get_cached_descriptor(txt, period=AUTO):
+def _load_module_names():
+	"""Searches the sys.path for module files and lists them, along with
+	sys.builtin_module_names, in the global dict _modules.
+	"""
+	
+	global _modules
+	
+	for n in sys.builtin_module_names:
+		_modules[n] = None
+	for p in sys.path:
+		if p == '': p = os.curdir
+		if not os.path.isdir(p): continue
+		for f in os.listdir(p):
+			for ext in MODULE_EXTS:
+				if f.endswith(ext):
+					_modules[f[:-len(ext)]] = None
+					break
+
+_load_module_names()
+
+
+def get_cached_descriptor(txt, period=TP_AUTO):
 	"""Returns the cached ScriptDesc for the specified Text object 'txt'. If the
 	script has not been parsed in the last 'period' seconds it will be reparsed
 	to obtain this descriptor.
 	
-	Specifying AUTO for the period (default) will choose a period based on the
+	Specifying TP_AUTO for the period (default) will choose a period based on the
 	size of the Text object. Larger texts are parsed less often.
 	"""
 	
-	global _parse_cache, NoneScriptDesc, AUTO
+	global _parse_cache
 	
-	if period == AUTO:
+	if period == TP_AUTO:
 		m = txt.nlines
 		r = 1
 		while True:
@@ -155,7 +179,7 @@ def parse_text(txt):
 			type, string, start, end, line = tokens.next()
 		except StopIteration:
 			break
-		except TokenError:
+		except TokenError, IndentationError:
 			incomplete = True
 			break
 		

From d90d413421a39e6c5b96fbe483090a13bc9a4569 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Mon, 11 Aug 2008 11:10:16 +0000
Subject: [PATCH 201/252] Suggestion list scrolling and selection made
 independent for easier use. Selections no longer move away from the cursor.

---
 source/blender/blenkernel/BKE_suggestions.h   |  2 +
 .../blender/blenkernel/intern/suggestions.c   | 14 ++++-
 source/blender/src/drawtext.c                 | 57 +++++++++++++------
 3 files changed, 53 insertions(+), 20 deletions(-)

diff --git a/source/blender/blenkernel/BKE_suggestions.h b/source/blender/blenkernel/BKE_suggestions.h
index 41a87aaa05e..d58b8f58bf5 100644
--- a/source/blender/blenkernel/BKE_suggestions.h
+++ b/source/blender/blenkernel/BKE_suggestions.h
@@ -60,6 +60,7 @@ typedef struct SuggList {
 	SuggItem *first, *last;
 	SuggItem *firstmatch, *lastmatch;
 	SuggItem *selected;
+	int top;
 } SuggList;
 
 /* Free all text tool memory */
@@ -78,6 +79,7 @@ SuggItem *texttool_suggest_first();
 SuggItem *texttool_suggest_last();
 void texttool_suggest_select(SuggItem *sel);
 SuggItem *texttool_suggest_selected();
+int *texttool_suggest_top();
 
 /* Documentation */
 void texttool_docs_show(const char *docs);
diff --git a/source/blender/blenkernel/intern/suggestions.c b/source/blender/blenkernel/intern/suggestions.c
index edccc0886f6..54ce425a04a 100644
--- a/source/blender/blenkernel/intern/suggestions.c
+++ b/source/blender/blenkernel/intern/suggestions.c
@@ -65,6 +65,7 @@ static void txttl_free_suggest() {
 	suggestions.first = suggestions.last = NULL;
 	suggestions.firstmatch = suggestions.lastmatch = NULL;
 	suggestions.selected = NULL;
+	suggestions.top = 0;
 }
 
 static void txttl_free_docs() {
@@ -149,11 +150,12 @@ void texttool_suggest_add(const char *name, char type) {
 		}
 	}
 	suggestions.firstmatch = suggestions.lastmatch = suggestions.selected = NULL;
+	suggestions.top= 0;
 }
 
 void texttool_suggest_prefix(const char *prefix) {
 	SuggItem *match, *first, *last;
-	int cmp, len = strlen(prefix);
+	int cmp, len = strlen(prefix), top = 0;
 
 	if (!suggestions.first) return;
 	if (len==0) {
@@ -166,14 +168,17 @@ void texttool_suggest_prefix(const char *prefix) {
 	for (match=suggestions.first; match; match=match->next) {
 		cmp = txttl_cmp(prefix, match->name, len);
 		if (cmp==0) {
-			if (!first)
+			if (!first) {
 				first = match;
+				suggestions.top = top;
+			}
 		} else if (cmp<0) {
 			if (!last) {
 				last = match->prev;
 				break;
 			}
 		}
+		top++;
 	}
 	if (first) {
 		if (!last) last = suggestions.last;
@@ -184,6 +189,7 @@ void texttool_suggest_prefix(const char *prefix) {
 		suggestions.firstmatch = NULL;
 		suggestions.lastmatch = NULL;
 		suggestions.selected = NULL;
+		suggestions.top = 0;
 	}
 }
 
@@ -207,6 +213,10 @@ SuggItem *texttool_suggest_selected() {
 	return suggestions.selected;
 }
 
+int *texttool_suggest_top() {
+	return &suggestions.top;
+}
+
 /*************************/
 /* Documentation methods */
 /*************************/
diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index 997fb01cab8..80233c8295f 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -1202,7 +1202,7 @@ static int do_suggest_select(SpaceText *st)
 	short mval[2];
 	TextLine *tmp;
 	int l, x, y, w, h, i;
-	int seli, tgti;
+	int tgti, *top;
 	
 	if (!st || !st->text) return 0;
 	if (!texttool_text_is_active(st->text)) return 0;
@@ -1210,6 +1210,7 @@ static int do_suggest_select(SpaceText *st)
 	first = texttool_suggest_first();
 	last = texttool_suggest_last();
 	sel = texttool_suggest_selected();
+	top = texttool_suggest_top();
 
 	if (!last || !first)
 		return 0;
@@ -1233,26 +1234,39 @@ static int do_suggest_select(SpaceText *st)
 	if (mval[0]<x || x+w<mval[0] || mval[1]<y-h || y<mval[1])
 		return 0;
 
-	/* Work out which of the visible SUGG_LIST_SIZE items is selected */
-	for (seli=0, item=sel; seli<3 && item && item!=first; seli++, item=item->prev);
+	/* Work out which of the items is at the top of the visible list */
+	for (i=0, item=first; i<*top && item->next; i++, item=item->next);
 
 	/* Work out the target item index in the visible list */
 	tgti = (y-mval[1]-4) / st->lheight;
 	if (tgti<0 || tgti>SUGG_LIST_SIZE)
 		return 1;
 
-	if (seli<tgti) {
-		for (i=seli; i<tgti && sel && sel!=last; i++, sel=sel->next);
-		if (sel)
-			texttool_suggest_select(sel);
-	} else {
-		for (i=seli; i>tgti && sel && sel!=first; i--, sel=sel->prev);
-		if (sel)
-			texttool_suggest_select(sel);
-	}
+	for (i=tgti; i>0 && item->next; i--, item=item->next);
+	if (item)
+		texttool_suggest_select(item);
 	return 1;
 }
 
+static void pop_suggest_list() {
+	SuggItem *item, *sel;
+	int *top, i;
+
+	item= texttool_suggest_first();
+	sel= texttool_suggest_selected();
+	top= texttool_suggest_top();
+
+	i= 0;
+	while (item && item != sel) {
+		item= item->next;
+		i++;
+	}
+	if (i > *top+SUGG_LIST_SIZE-1)
+		*top= i-SUGG_LIST_SIZE+1;
+	else if (i < *top)
+		*top= i;
+}
+
 void draw_documentation(SpaceText *st)
 {
 	TextLine *tmp;
@@ -1343,7 +1357,7 @@ void draw_suggestion_list(SpaceText *st)
 	SuggItem *item, *first, *last, *sel;
 	TextLine *tmp;
 	char str[SUGG_LIST_WIDTH+1];
-	int w, boxw=0, boxh, i, l, x, y, b;
+	int w, boxw=0, boxh, i, l, x, y, b, *top;
 	
 	if (!st || !st->text) return;
 	if (!texttool_text_is_active(st->text)) return;
@@ -1353,7 +1367,9 @@ void draw_suggestion_list(SpaceText *st)
 
 	if (!first || !last) return;
 
+	pop_suggest_list();
 	sel = texttool_suggest_selected();
+	top = texttool_suggest_top();
 
 	/* Count the visible lines to the cursor */
 	for (tmp=st->text->curl, l=-st->top; tmp; tmp=tmp->prev, l++);
@@ -1375,9 +1391,7 @@ void draw_suggestion_list(SpaceText *st)
 	glRecti(x, y, x+boxw, y-boxh);
 
 	/* Set the top 'item' of the visible list */
-	for (i=0, item=sel; i<3 && item && item!=first; i++, item=item->prev);
-	if (!item)
-		item = first;
+	for (i=0, item=first; i<*top && item->next; i++, item=item->next);
 
 	for (i=0; i<SUGG_LIST_SIZE && item; i++, item=item->next) {
 
@@ -2261,6 +2275,7 @@ static short do_texttools(SpaceText *st, char ascii, unsigned short evnt, short
 				if (st->showsyntax) txt_format_line(st, st->text->curl, 1);
 			} else if ((st->overwrite && txt_replace_char(st->text, ascii)) || txt_add_char(st->text, ascii)) {
 				get_suggest_prefix(st->text, 0);
+				pop_suggest_list();
 				swallow= 1;
 				draw= 1;
 			}
@@ -2313,8 +2328,10 @@ static short do_texttools(SpaceText *st, char ascii, unsigned short evnt, short
 						/* Work out which char we are about to delete/pass */
 						if (st->text->curl && st->text->curc > 0) {
 							char ch= st->text->curl->line[st->text->curc-1];
-							if ((ch=='_' || !ispunct(ch)) && !check_whitespace(ch))
+							if ((ch=='_' || !ispunct(ch)) && !check_whitespace(ch)) {
 								get_suggest_prefix(st->text, -1);
+								pop_suggest_list();
+							}
 							else
 								texttool_suggest_clear();
 						} else
@@ -2331,8 +2348,10 @@ static short do_texttools(SpaceText *st, char ascii, unsigned short evnt, short
 						/* Work out which char we are about to pass */
 						if (st->text->curl && st->text->curc < st->text->curl->len) {
 							char ch= st->text->curl->line[st->text->curc+1];
-							if ((ch=='_' || !ispunct(ch)) && !check_whitespace(ch))
+							if ((ch=='_' || !ispunct(ch)) && !check_whitespace(ch)) {
 								get_suggest_prefix(st->text, 1);
+								pop_suggest_list();
+							}
 							else
 								texttool_suggest_clear();
 						} else
@@ -2358,6 +2377,7 @@ static short do_texttools(SpaceText *st, char ascii, unsigned short evnt, short
 						texttool_suggest_select(sel->next);
 						sel= sel->next;
 					}
+					pop_suggest_list();
 					swallow= 1;
 					draw= 1;
 					break;
@@ -2377,6 +2397,7 @@ static short do_texttools(SpaceText *st, char ascii, unsigned short evnt, short
 						texttool_suggest_select(sel->prev);
 						sel= sel->prev;
 					}
+					pop_suggest_list();
 					swallow= 1;
 					draw= 1;
 					break;

From d4f1a9821925ab60e4245fc4840a55314965580b Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Mon, 11 Aug 2008 20:01:15 +0000
Subject: [PATCH 202/252] Fix flipped arc caused by harmonic interpolation

---
 source/blender/src/reeb.c | 60 ++++++++++++++++++++++++++++++++-------
 1 file changed, 49 insertions(+), 11 deletions(-)

diff --git a/source/blender/src/reeb.c b/source/blender/src/reeb.c
index d601ec2ab76..9938a8850cc 100644
--- a/source/blender/src/reeb.c
+++ b/source/blender/src/reeb.c
@@ -1161,17 +1161,21 @@ void reweightArc(ReebArc *arc, ReebNode *start_node, float start_weight)
 			reweightArc(next_arc, node, end_weight);
 		}
 	}
-	
-	old_weight = arc->head->weight; /* backup head weight, other arcs need it intact, it will be fixed by the source arc */
-	
-	arc->head->weight = start_weight;
-	arc->tail->weight = end_weight;
-	
-	reweightBuckets(arc);
-	resizeArcBuckets(arc);
-	fillArcEmptyBuckets(arc);
-	
-	arc->head->weight = old_weight;
+
+	/* update only if needed */	
+	if (arc->head->weight != start_weight)
+	{
+		old_weight = arc->head->weight; /* backup head weight, other arcs need it intact, it will be fixed by the source arc */
+		
+		arc->head->weight = start_weight;
+		arc->tail->weight = end_weight;
+		
+		reweightBuckets(arc);
+		resizeArcBuckets(arc);
+		fillArcEmptyBuckets(arc);
+		
+		arc->head->weight = old_weight;
+	}
 } 
 
 void reweightSubgraph(ReebGraph *rg, ReebNode *start_node, float start_weight)
@@ -1269,6 +1273,34 @@ int joinSubgraphsEnds(ReebGraph *rg, float threshold, int nb_subgraphs)
 	return joined;
 }
 
+/* Reweight graph from smallest node, fix fliped arcs */
+void fixSubgraphsOrientation(ReebGraph *rg, int nb_subgraphs)
+{
+	int subgraph;
+	
+	for (subgraph = 1; subgraph <= nb_subgraphs; subgraph++)
+	{
+		ReebNode *node;
+		ReebNode *start_node = NULL;
+		
+		for (node = rg->nodes.first; node; node = node->next)
+		{
+			if (node->flag == subgraph)
+			{
+				if (start_node == NULL || node->weight < start_node->weight)
+				{
+					start_node = node;
+				}
+			}
+		}
+		
+		if (start_node)
+		{
+			reweightSubgraph(rg, start_node, start_node->weight);
+		}
+	}
+}
+
 int joinSubgraphs(ReebGraph *rg, float threshold)
 {
 	int nb_subgraphs;
@@ -1282,6 +1314,12 @@ int joinSubgraphs(ReebGraph *rg, float threshold)
 	
 	nb_subgraphs = BLI_FlagSubgraphs((BGraph*)rg);
 	
+	/* Harmonic function can create flipped arcs, take the occasion to fix them */
+	if (G.scene->toolsettings->skgen_options & SKGEN_HARMONIC)
+	{
+		fixSubgraphsOrientation(rg, nb_subgraphs);
+	}
+
 	if (nb_subgraphs > 1)
 	{
 		joined |= joinSubgraphsEnds(rg, threshold, nb_subgraphs);

From 65d0ef3e746dd43e1f5480cd70434d34cecb6459 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Tue, 12 Aug 2008 15:17:08 +0000
Subject: [PATCH 203/252] Speed improvements for reading text lines and the
 option to specify a range for Text.asLines([start[, end]]) Also some tweaks
 for the plug-in scripts and updates to pydocs.

---
 release/scripts/bpymodules/BPyTextPlugin.py |  9 ++--
 release/scripts/textplugin_imports.py       |  6 +--
 release/scripts/textplugin_outliner.py      | 14 ++++--
 release/scripts/textplugin_suggest.py       | 10 ++--
 release/scripts/textplugin_templates.py     |  2 +-
 source/blender/python/api2_2x/Text.c        | 56 ++++++++++++++-------
 source/blender/python/api2_2x/Text.h        |  2 +-
 source/blender/python/api2_2x/doc/Text.py   | 43 +++++++++++++---
 8 files changed, 102 insertions(+), 40 deletions(-)

diff --git a/release/scripts/bpymodules/BPyTextPlugin.py b/release/scripts/bpymodules/BPyTextPlugin.py
index 94a2b8be38a..9d33eca9de7 100644
--- a/release/scripts/bpymodules/BPyTextPlugin.py
+++ b/release/scripts/bpymodules/BPyTextPlugin.py
@@ -449,7 +449,7 @@ def parse_text(txt):
 	desc.set_time()
 	
 	global _parse_cache
-	_parse_cache[hash(txt.name)] = desc
+	_parse_cache[hash(txt)] = desc
 	return desc
 
 def get_modules(since=1):
@@ -511,9 +511,12 @@ def get_context(txt):
 	
 	"""
 	
-	global CTX_NORMAL, CTX_SINGLE_QUOTE, CTX_DOUBLE_QUOTE, CTX_COMMENT
 	l, cursor = txt.getCursorPos()
-	lines = txt.asLines()[:l+1]
+	lines = txt.asLines(0, l+1)
+	
+	# FIXME: This method is too slow in large files for it to be called as often
+	# as it is. So for lines below the 1000th line we do this... (quorn)
+	if l > 1000: return CTX_NORMAL
 	
 	# Detect context (in string or comment)
 	in_str = CTX_NORMAL
diff --git a/release/scripts/textplugin_imports.py b/release/scripts/textplugin_imports.py
index 0e32a6fb2a6..ec608243c2b 100644
--- a/release/scripts/textplugin_imports.py
+++ b/release/scripts/textplugin_imports.py
@@ -49,9 +49,7 @@ def main():
 	immediate = True
 	pos += 5
 	for i in range(pos, c):
-		if line[i]=='.':
-			pos = i+1
-		elif not line[i].isalnum() and line[i] != '_':
+		if not line[i].isalnum() and line[i] != '_' and line[i] != '.':
 			immediate = False
 			break
 	
@@ -59,7 +57,7 @@ def main():
 	if immediate:
 		items = [(m, 'm') for m in get_modules()]
 		items.sort(cmp = suggest_cmp)
-		txt.suggest(items, '')
+		txt.suggest(items, line[pos:c])
 		return
 	
 	# Found 'from' earlier, suggest import if not already there
diff --git a/release/scripts/textplugin_outliner.py b/release/scripts/textplugin_outliner.py
index 345361b47d4..3879a2819a5 100644
--- a/release/scripts/textplugin_outliner.py
+++ b/release/scripts/textplugin_outliner.py
@@ -30,23 +30,27 @@ def make_menu(items, eventoffs):
 				letters.append(c)
 				break
 	
-	dict = {}
+	entries = {}
 	i = 0
 	for item in items:
 		i += 1
 		c = item[0].lower()
-		if not dict.has_key(c): dict[c] = []
-		dict[c].append((item, i+eventoffs))
+		entries.setdefault(c, []).append((item, i+eventoffs))
 	
 	subs = []
 	for c in letters:
-		subs.append((c, dict[c]))
+		subs.append((c, entries[c]))
 	
 	return subs
 
 def find_word(txt, word):
 	i = 0
-	for line in txt.asLines():
+	txt.reset()
+	while True:
+		try:
+			line = txt.readline()
+		except StopIteration:
+			break
 		c = line.find(word)
 		if c != -1:
 			txt.setCursorPos(i, c)
diff --git a/release/scripts/textplugin_suggest.py b/release/scripts/textplugin_suggest.py
index 0e83e1e8cc7..1e011a2e82d 100644
--- a/release/scripts/textplugin_suggest.py
+++ b/release/scripts/textplugin_suggest.py
@@ -66,6 +66,7 @@ def main():
 	# Otherwise we suggest globals, keywords, etc.
 	list = []
 	pre = get_targets(line, c)
+	desc = get_cached_descriptor(txt)
 	
 	for k in KEYWORDS:
 		list.append((k, 'k'))
@@ -73,13 +74,16 @@ def main():
 	for k, v in get_builtins().items():
 		list.append((k, type_char(v)))
 	
-	for k, v in get_imports(txt).items():
+	for k, v in desc.imports.items():
 		list.append((k, type_char(v)))
 	
-	for k, v in get_defs(txt).items():
+	for k, v in desc.classes.items():
 		list.append((k, 'f'))
 	
-	for k in get_vars(txt):
+	for k, v in desc.defs.items():
+		list.append((k, 'f'))
+	
+	for k, v in desc.vars.items():
 		list.append((k, 'v'))
 	
 	list.sort(cmp = suggest_cmp)
diff --git a/release/scripts/textplugin_templates.py b/release/scripts/textplugin_templates.py
index 508ede11ddc..25dadf4de54 100644
--- a/release/scripts/textplugin_templates.py
+++ b/release/scripts/textplugin_templates.py
@@ -49,7 +49,7 @@ def main():
 		return
 	
 	row, c = txt.getCursorPos()
-	line = txt.asLines()[row]
+	line = txt.asLines(row, row+1)[0]
 	indent=0
 	while indent<c and (line[indent]==' ' or line[indent]=='\t'):
 		indent += 1
diff --git a/source/blender/python/api2_2x/Text.c b/source/blender/python/api2_2x/Text.c
index 0f0abda04e1..7e31b3bb25b 100644
--- a/source/blender/python/api2_2x/Text.c
+++ b/source/blender/python/api2_2x/Text.c
@@ -100,7 +100,7 @@ static PyObject *Text_write( BPy_Text * self, PyObject * value );
 static PyObject *Text_insert( BPy_Text * self, PyObject * value );
 static PyObject *Text_delete( BPy_Text * self, PyObject * value );
 static PyObject *Text_set( BPy_Text * self, PyObject * args );
-static PyObject *Text_asLines( BPy_Text * self );
+static PyObject *Text_asLines( BPy_Text * self, PyObject * args );
 static PyObject *Text_getCursorPos( BPy_Text * self );
 static PyObject *Text_setCursorPos( BPy_Text * self, PyObject * args );
 static PyObject *Text_getSelectPos( BPy_Text * self );
@@ -136,8 +136,8 @@ static PyMethodDef BPy_Text_methods[] = {
 	 "(chars) - Deletes a number of characters to the left (chars<0) or right (chars>0)"},
 	{"set", ( PyCFunction ) Text_set, METH_VARARGS,
 	 "(name, val) - Set attribute 'name' to value 'val'"},
-	{"asLines", ( PyCFunction ) Text_asLines, METH_NOARGS,
-	 "() - Return text buffer as a list of lines"},
+	{"asLines", ( PyCFunction ) Text_asLines, METH_VARARGS,
+	 "(start=0, end=nlines) - Return text buffer as a list of lines between start and end"},
 	{"getCursorPos", ( PyCFunction ) Text_getCursorPos, METH_NOARGS,
 	 "() - Return cursor position as (row, col) tuple"},
 	{"setCursorPos", ( PyCFunction ) Text_setCursorPos, METH_VARARGS,
@@ -377,8 +377,8 @@ PyObject *Text_CreatePyObject( Text * txt )
 					      "couldn't create BPy_Text PyObject" );
 
 	pytxt->text = txt;
-	pytxt->iol = 0;
-	pytxt->ioc = 0;
+	pytxt->iol = NULL;
+	pytxt->ioc = -1;
 
 	return ( PyObject * ) pytxt;
 }
@@ -430,8 +430,8 @@ static PyObject *Text_clear( BPy_Text * self)
 
 static PyObject *Text_reset( BPy_Text * self )
 {
-	self->iol = 0;
-	self->ioc = 0;
+	self->iol = NULL;
+	self->ioc = -1;
 
 	Py_RETURN_NONE;
 }
@@ -439,29 +439,33 @@ static PyObject *Text_reset( BPy_Text * self )
 static PyObject *Text_readline( BPy_Text * self )
 {
 	PyObject *tmpstr;
-	TextLine *line;
-	int i;
 	
 	if( !self->text )
 		return EXPP_ReturnPyObjError( PyExc_RuntimeError,
 					      "This object isn't linked to a Blender Text Object" );
 
-	for (i=0, line=self->text->lines.first; i<self->iol && line; i++, line=line->next);
+	/* Reset */
+	if (!self->iol && self->ioc == -1) {
+		self->iol = self->text->lines.first;
+		self->ioc = 0;
+	}
 
-	if (!line) {
+	if (!self->iol) {
 		PyErr_SetString( PyExc_StopIteration, "End of buffer reached" );
 		return PyString_FromString( "" );
 	}
 
-	if (self->ioc > line->len)
+	if (self->ioc > self->iol->len) {
+		self->iol = NULL;
 		return EXPP_ReturnPyObjError( PyExc_RuntimeError,
 						  "Line length exceeded, text may have changed while reading" );
+	}
 
-	tmpstr = PyString_FromString( line->line + self->ioc );
-	if (line->next)
+	tmpstr = PyString_FromString( self->iol->line + self->ioc );
+	if (self->iol->next)
 		PyString_ConcatAndDel( &tmpstr, PyString_FromString("\n") );
 
-	self->iol++;
+	self->iol = self->iol->next;
 	self->ioc = 0;
 
 	return tmpstr;
@@ -485,6 +489,8 @@ static PyObject *Text_write( BPy_Text * self, PyObject * value )
 	txt_move_eof( self->text, 0 );
 	txt_set_undostate( oldstate );
 
+	Text_reset( self );
+
 	Py_RETURN_NONE;
 }
 
@@ -505,6 +511,8 @@ static PyObject *Text_insert( BPy_Text * self, PyObject * value )
 	txt_insert_buf( self->text, str );
 	txt_set_undostate( oldstate );
 
+	Text_reset( self );
+
 	Py_RETURN_NONE;
 }
 
@@ -531,6 +539,8 @@ static PyObject *Text_delete( BPy_Text * self, PyObject * value )
 		num--;
 	}
 	txt_set_undostate( oldstate );
+	
+	Text_reset( self );
 
 	Py_RETURN_NONE;
 }
@@ -554,27 +564,39 @@ static PyObject *Text_set( BPy_Text * self, PyObject * args )
 	Py_RETURN_NONE;
 }
 
-static PyObject *Text_asLines( BPy_Text * self )
+static PyObject *Text_asLines( BPy_Text * self, PyObject * args )
 {
 	TextLine *line;
 	PyObject *list, *tmpstr;
+	int start=0, end=-1, i;
 
 	if( !self->text )
 		return EXPP_ReturnPyObjError( PyExc_RuntimeError,
 					      "This object isn't linked to a Blender Text Object" );
 
+	if( !PyArg_ParseTuple( args, "|ii", &start, &end ) )
+			return EXPP_ReturnPyObjError( PyExc_TypeError,
+							  "expected upto two optional ints as arguments" );
+	
+	if (start<0)
+		start=0;
+
 	line = self->text->lines.first;
+	for (i = 0; i < start && line->next; i++)
+		line= line->next;
+
 	list = PyList_New( 0 );
 
 	if( !list )
 		return EXPP_ReturnPyObjError( PyExc_MemoryError,
 					      "couldn't create PyList" );
 
-	while( line ) {
+	while( line && (i < end || end == -1) ) {
 		tmpstr = PyString_FromString( line->line );
 		PyList_Append( list, tmpstr );
 		Py_DECREF(tmpstr);
 		line = line->next;
+		i++;
 	}
 
 	return list;
diff --git a/source/blender/python/api2_2x/Text.h b/source/blender/python/api2_2x/Text.h
index eb64b6d43ea..73943ddb9cd 100644
--- a/source/blender/python/api2_2x/Text.h
+++ b/source/blender/python/api2_2x/Text.h
@@ -41,7 +41,7 @@ extern PyTypeObject Text_Type;
 typedef struct {
 	PyObject_HEAD
 	Text * text; /* libdata must be second */
-	int iol; /* index of line being read */
+	TextLine * iol; /* current line being read or NULL if reset */
 	int ioc; /* character offset in line being read */
 } BPy_Text;
 
diff --git a/source/blender/python/api2_2x/doc/Text.py b/source/blender/python/api2_2x/doc/Text.py
index c4a25899343..022205573aa 100644
--- a/source/blender/python/api2_2x/doc/Text.py
+++ b/source/blender/python/api2_2x/doc/Text.py
@@ -108,7 +108,8 @@ class Text:
 	def readline():
 		"""
 		Reads a line of text from the buffer from the current IO pointer
-		position to the end of the line.
+		position to the end of the line. If the text has changed since the last
+		read, reset() *must* be called.
 		@rtype: string
 		"""
 
@@ -137,11 +138,19 @@ class Text:
 		@param data:  The string to insert into the text buffer.
 		"""
 
-	def asLines():
+	def asLines(start=0, end=-1):
 		"""
-		Retrieve the contents of this Text buffer as a list of strings.
+		Retrieve the contents of this Text buffer as a list of strings between
+		the start and end lines specified. If end < 0 all lines from start will
+		be included.
+		@type start int
+		@param start:  Optional index of first line of the span to return
+		@type end int
+		@param end:  Optional index of the line to which the span is taken or
+			-1 to include all lines from start
 		@rtype: list of strings
-		@return:  A list of strings, one for each line in the buffer
+		@return:  A list of strings, one for each line in the buffer between 
+			start and end.
 		"""
 
 	def getCursorPos():
@@ -154,7 +163,29 @@ class Text:
 
 	def setCursorPos(row, col):
 		"""
-		Set the position of the cursor in this Text buffer.
+		Set the position of the cursor in this Text buffer. Any selection will
+		be cleared. Use setSelectPos to extend a selection from the point
+		specified here.
+		@type row: int
+		@param row:  The index of the line in which to position the cursor.
+		@type col: int
+		@param col:  The index of the character within the line to position the
+			cursor.
+		"""
+
+	def getSelectPos():
+		"""
+		Retrieve the position of the selection cursor in this Text buffer.
+		@rtype: (int, int)
+		@return:  A pair (row, col) indexing the line and character of the
+			selection cursor.
+		"""
+
+	def setSelectPos(row, col):
+		"""
+		Set the position of the selection cursor in this Text buffer. This
+		method should be called after setCursorPos to extend the selection to
+		the specified point.
 		@type row: int
 		@param row:  The index of the line in which to position the cursor.
 		@type col: int
@@ -180,7 +211,7 @@ class Text:
 			the list. This is usually whatever precedes the cursor so that
 			backspace will update it.
 		"""
-	
+
 	def showDocs(docs):
 		"""
 		Displays a word-wrapped message box containing the specified

From b30a925447f5c0b0256d99e30e4062e7aa19b064 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Tue, 12 Aug 2008 19:56:03 +0000
Subject: [PATCH 204/252] Add missing stuff in new scene code to properly init
 skeletor params properly.

Add sanity check on file load to fix old files (won't be merged in trunk).
---
 source/blender/blenkernel/intern/scene.c    | 15 +++++++++++++++
 source/blender/blenloader/intern/readfile.c | 18 ++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 553107dd264..6102ee9a5d7 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -252,6 +252,21 @@ Scene *add_scene(char *name)
 	sce->toolsettings->select_thresh= 0.01f;
 	sce->toolsettings->jointrilimit = 0.8f;
 
+	sce->toolsettings->skgen_resolution = 100;
+	sce->toolsettings->skgen_threshold_internal 	= 0.01f;
+	sce->toolsettings->skgen_threshold_external 	= 0.01f;
+	sce->toolsettings->skgen_angle_limit	 		= 45.0f;
+	sce->toolsettings->skgen_length_ratio			= 1.3f;
+	sce->toolsettings->skgen_length_limit			= 1.5f;
+	sce->toolsettings->skgen_correlation_limit		= 0.98f;
+	sce->toolsettings->skgen_symmetry_limit			= 0.1f;
+	sce->toolsettings->skgen_postpro = SKGEN_SMOOTH;
+	sce->toolsettings->skgen_postpro_passes = 1;
+	sce->toolsettings->skgen_options = SKGEN_FILTER_INTERNAL|SKGEN_FILTER_EXTERNAL|SKGEN_FILTER_SMART|SKGEN_HARMONIC|SKGEN_SUB_CORRELATION|SKGEN_STICK_TO_EMBEDDING;
+	sce->toolsettings->skgen_subdivisions[0] = SKGEN_SUB_CORRELATION;
+	sce->toolsettings->skgen_subdivisions[1] = SKGEN_SUB_LENGTH;
+	sce->toolsettings->skgen_subdivisions[2] = SKGEN_SUB_ANGLE;
+
 	pset= &sce->toolsettings->particle;
 	pset->flag= PE_KEEP_LENGTHS|PE_LOCK_FIRST|PE_DEFLECT_EMITTER;
 	pset->emitterdist= 0.25f;
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index ad19cde3c9b..c399ca13437 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -7343,6 +7343,24 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 			}
 		}
 	}
+	
+	/* sanity check for skgen
+	 * */
+	{
+		Scene *sce;
+		for(sce=main->scene.first; sce; sce = sce->id.next)
+		{
+			if (sce->toolsettings->skgen_subdivisions[0] == sce->toolsettings->skgen_subdivisions[1] ||
+				sce->toolsettings->skgen_subdivisions[0] == sce->toolsettings->skgen_subdivisions[2] ||
+				sce->toolsettings->skgen_subdivisions[1] == sce->toolsettings->skgen_subdivisions[2])
+			{
+					sce->toolsettings->skgen_subdivisions[0] = SKGEN_SUB_CORRELATION;
+					sce->toolsettings->skgen_subdivisions[1] = SKGEN_SUB_LENGTH;
+					sce->toolsettings->skgen_subdivisions[2] = SKGEN_SUB_ANGLE;
+			}
+		}
+	}
+	
 
 	if ((main->versionfile < 245) || (main->versionfile == 245 && main->subversionfile < 2)) {
 		Image *ima;

From 5ade00459296bc397cd476322d4b7441bb52379e Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Tue, 12 Aug 2008 22:12:24 +0000
Subject: [PATCH 205/252] Added a button to allow plug-ins to be
 enabled/disabled for each text space. It was confusing using the syntax
 button for both.

---
 source/blender/include/blendef.h          | 1 +
 source/blender/makesdna/DNA_space_types.h | 2 +-
 source/blender/src/drawtext.c             | 8 ++++----
 source/blender/src/header_text.c          | 6 +++++-
 source/blender/src/space.c                | 1 +
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/source/blender/include/blendef.h b/source/blender/include/blendef.h
index 6b5b315a470..33e20974ba6 100644
--- a/source/blender/include/blendef.h
+++ b/source/blender/include/blendef.h
@@ -378,6 +378,7 @@
 #define B_TAB_NUMBERS		508
 #define B_SYNTAX		509
 #define B_WORDWRAP		510
+#define B_TEXTPLUGINS	511
 
 /* SCRIPT: 525 */
 #define B_SCRIPTBROWSE		526
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index 22e9ee54473..1e3f337ad99 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -290,7 +290,7 @@ typedef struct SpaceText {
 
 	struct rcti txtscroll, txtbar;
 
-	int wordwrap, pad1;
+	int wordwrap, doplugins;
 
 } SpaceText;
 
diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index 8647c3dde58..f717e19ecea 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -2250,7 +2250,7 @@ static short do_texttools(SpaceText *st, char ascii, unsigned short evnt, short
 	if (!texttool_text_is_active(st->text)) return 0;
 	if (!st->text || st->text->id.lib) return 0;
 
-	if (st->showsyntax && texttool_text_is_active(st->text)) {
+	if (st->doplugins && texttool_text_is_active(st->text)) {
 		if (texttool_suggest_first()) tools |= TOOL_SUGG_LIST;
 		if (texttool_docs_get()) tools |= TOOL_DOCUMENT;
 	}
@@ -2646,7 +2646,7 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 		return;
 	}
 
-	if (st->showsyntax && do_texttools(st, ascii, event, val)) return;
+	if (st->doplugins && do_texttools(st, ascii, event, val)) return;
 	if (do_markers(st, ascii, event, val)) return;
 	
 	if (event==UI_BUT_EVENT) {
@@ -3170,8 +3170,8 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 		}
 	}
 
-	/* Run text plugin scripts if in syntax mode */
-	if (st->showsyntax && event && val) {
+	/* Run text plugin scripts if enabled */
+	if (st->doplugins && event && val) {
 		if (BPY_menu_do_shortcut(PYMENU_TEXTPLUGIN, event, G.qual)) {
 			do_draw= 1;
 		}
diff --git a/source/blender/src/header_text.c b/source/blender/src/header_text.c
index 16344c35b82..dd83be7cae6 100644
--- a/source/blender/src/header_text.c
+++ b/source/blender/src/header_text.c
@@ -204,6 +204,9 @@ void do_text_buttons(unsigned short event)
 		allqueue(REDRAWTEXT, 0);
 		allqueue(REDRAWHEADERS, 0);
 		break;
+	case B_TEXTPLUGINS:
+		allqueue(REDRAWHEADERS, 0);
+		break;
 	case B_WORDWRAP:
 		st->left= 0;
 		allqueue(REDRAWTEXT, 0);
@@ -841,8 +844,9 @@ void text_buttons(void)
 	else uiDefIconBut(block, BUT,B_FULL, ICON_FULLSCREEN,	xco,0,XIC,YIC, 0, 0, 0, 0, 0, "Makes current window full screen (CTRL+Down arrow)");
 		
 	uiDefIconButI(block, ICONTOG, B_TEXTLINENUM, ICON_LONGDISPLAY, xco+=XIC,0,XIC,YIC, &st->showlinenrs, 0, 0, 0, 0, "Displays line numbers");
-	uiDefIconButI(block, ICONTOG, B_SYNTAX, ICON_SYNTAX, xco+=XIC,0,XIC,YIC, &st->showsyntax, 0, 0, 0, 0, "Enables Syntax Highlighting");
 	uiDefIconButI(block, ICONTOG, B_WORDWRAP, ICON_WORDWRAP, xco+=XIC,0,XIC,YIC, &st->wordwrap, 0, 0, 0, 0, "Enables word wrap");
+	uiDefIconButI(block, ICONTOG, B_SYNTAX, ICON_SYNTAX, xco+=XIC,0,XIC,YIC, &st->showsyntax, 0, 0, 0, 0, "Enables Syntax Highlighting");
+	uiDefIconButI(block, ICONTOG, B_TEXTPLUGINS, ICON_CLIPUV_DEHLT, xco+=XIC,0,XIC,YIC, &st->doplugins, 0, 0, 0, 0, "Enables text plugins");
 	uiBlockEndAlign(block);
 	
 	/* STD TEXT BUTTONS */
diff --git a/source/blender/src/space.c b/source/blender/src/space.c
index 72115205c34..ff5abb2b9ad 100644
--- a/source/blender/src/space.c
+++ b/source/blender/src/space.c
@@ -6054,6 +6054,7 @@ static void init_textspace(ScrArea *sa)
 	st->showlinenrs= 0;
 	st->tabnumber = 4;
 	st->showsyntax= 0;
+	st->doplugins= 1;
 	st->overwrite= 0;
 	st->wordwrap= 0;
 	st->currtab_set = 0;

From e2c42be82992bba42a6207ace9ea782ac01f747a Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Wed, 13 Aug 2008 12:20:49 +0000
Subject: [PATCH 206/252] PageUp/Down now moves the mouse cursor instead of
 just the view. Also added some other pops for when the cursor went off screen
 (click after horizontal scroll, undo, redo, etc.)

---
 source/blender/src/drawtext.c    | 43 ++++++++++++++++++++++++++++++--
 source/blender/src/header_text.c |  2 ++
 2 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index f717e19ecea..e9c8c1b166c 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -1064,6 +1064,38 @@ static void screen_skip(SpaceText *st, int lines)
 	if (st->top<0) st->top= 0;
 }
 
+static void cursor_skip(SpaceText *st, int lines, int sel)
+{
+	Text *text;
+	TextLine **linep;
+	int oldl, oldc, *charp;
+	
+	if (!st) return;
+	if (st->spacetype != SPACE_TEXT) return;
+	if (!st->text) return;
+
+	text= st->text;
+
+	if (sel) linep= &text->sell, charp= &text->selc;
+	else linep= &text->curl, charp= &text->curc;
+	oldl= txt_get_span(text->lines.first, *linep);
+	oldc= *charp;
+
+	while (lines>0 && (*linep)->next) {
+		*linep= (*linep)->next;
+		lines--;
+	}
+	while (lines<0 && (*linep)->prev) {
+		*linep= (*linep)->prev;
+		lines++;
+	}
+
+	if (*charp > (*linep)->len) *charp= (*linep)->len;
+
+	if (!sel) txt_pop_sel(st->text);
+	txt_undo_add_toop(st->text, sel?UNDO_STO:UNDO_CTO, oldl, oldc, txt_get_span(text->lines.first, *linep), *charp);
+}
+
 /* 
  * mode 1 == view scroll
  * mode 2 == scrollbar
@@ -1194,6 +1226,8 @@ static void do_selection(SpaceText *st, int selecting)
 		
 	if (sell!=linep2 || selc!=charp2)
 		txt_undo_add_toop(st->text, UNDO_STO, sell, selc, linep2, charp2);
+
+	pop_space_text(st);
 }
 
 static int do_suggest_select(SpaceText *st)
@@ -2947,11 +2981,13 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			//txt_print_undo(text); //debug buffer in console
 			if (G.qual == (LR_ALTKEY|LR_SHIFTKEY)) {
 				txt_do_redo(text);
+				pop_space_text(st);
 				do_draw= 1;
 			}
 			if (G.qual == LR_ALTKEY) {
 				txt_do_undo(text);
 				if (st->showsyntax) txt_format_text(st);
+				pop_space_text(st);
 				do_draw= 1;
 			}
 			break; /* BREAK U */
@@ -3014,6 +3050,7 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 					txt_do_undo(text);
 				}
 				if (st->showsyntax) txt_format_text(st);
+				pop_space_text(st);
 				do_draw= 1;
 			}
 			break;
@@ -3140,11 +3177,13 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			pop_space_text(st);
 			break;
 		case PAGEDOWNKEY:
-			screen_skip(st, st->viewlines);
+			cursor_skip(st, st->viewlines, G.qual & LR_SHIFTKEY);
+			pop_space_text(st);
 			do_draw= 1;
 			break;
 		case PAGEUPKEY:
-			screen_skip(st, -st->viewlines);
+			cursor_skip(st, -st->viewlines, G.qual & LR_SHIFTKEY);
+			pop_space_text(st);
 			do_draw= 1;
 			break;
 		case HOMEKEY:
diff --git a/source/blender/src/header_text.c b/source/blender/src/header_text.c
index dd83be7cae6..8bd92d11a5d 100644
--- a/source/blender/src/header_text.c
+++ b/source/blender/src/header_text.c
@@ -378,9 +378,11 @@ static void do_text_editmenu(void *arg, int event)
 	switch(event) {
 	case 1:
 		txt_do_undo(text);
+		pop_space_text(st);
 		break;
 	case 2:
 		txt_do_redo(text);
+		pop_space_text(st);
 		break;
 	case 3:
 		if (text && text->id.lib) {

From 55438d9fe0b0b61857cc2aa6b1edf16b9c07c1d5 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Wed, 13 Aug 2008 17:29:51 +0000
Subject: [PATCH 207/252] Small bug fix: Scripts were not being recompiled
 after an error, if the (auto-selected) erroneous text was simply deleted and
 the script re-run.

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

diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c
index 12a9fda367e..db5b568f043 100644
--- a/source/blender/blenkernel/intern/text.c
+++ b/source/blender/blenkernel/intern/text.c
@@ -2221,6 +2221,7 @@ void txt_delete_char (Text *text)
 
 	if (txt_has_sel(text)) { /* deleting a selection */
 		txt_delete_sel(text);
+		txt_make_dirty(text);
 		return;
 	}
 	else if (text->curc== text->curl->len) { /* Appending two lines */
@@ -2281,6 +2282,7 @@ void txt_backspace_char (Text *text)
 	
 	if (txt_has_sel(text)) { /* deleting a selection */
 		txt_delete_sel(text);
+		txt_make_dirty(text);
 		return;
 	}
 	else if (text->curc==0) { /* Appending two lines */

From 715ca7cbf6d4b6b26a3ecf65de24bda64b1f1709 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Wed, 13 Aug 2008 20:33:57 +0000
Subject: [PATCH 208/252] starting threading code for retarget

nothing working yet, will finish tomorrow at home
---
 source/blender/src/autoarmature.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/source/blender/src/autoarmature.c b/source/blender/src/autoarmature.c
index e7cd771b1b1..e6bd97f58a5 100644
--- a/source/blender/src/autoarmature.c
+++ b/source/blender/src/autoarmature.c
@@ -52,6 +52,7 @@
 #include "BLI_ghash.h"
 #include "BLI_graph.h"
 #include "BLI_rand.h"
+#include "BLI_threads.h"
 
 #include "BDR_editobject.h"
 
@@ -92,6 +93,7 @@ typedef struct RigGraph {
 	ReebGraph *link_mesh;
 	
 	ListBase controls;
+	ListBase threads;
 	
 	GHash *bones_map;
 	
@@ -149,6 +151,11 @@ typedef struct RigControl {
 	int		flag;
 } RigControl;
 
+typedef struct RetargetParam {
+	RigGraph	*rigg;
+	RigArc		*iarc;
+} RetargetParam;
+
 typedef enum 
 {
 	RETARGET_LENGTH,
@@ -163,6 +170,8 @@ typedef enum
 
 /*******************************************************************************************************/
 
+void *exec_retargetArctoArc(void *param);
+
 static void RIG_calculateEdgeAngle(RigEdge *edge_first, RigEdge *edge_second);
 
 /* two levels */
@@ -249,6 +258,8 @@ static RigGraph *newRigGraph()
 	rg->free_arc = RIG_freeRigArc;
 	rg->free_node = NULL;
 	
+	BLI_init_threads(&rg->threads, exec_retargetArctoArc, 2); /* fix number of threads */
+	
 	return rg;
 }
 
@@ -1551,6 +1562,19 @@ static void retargetArctoArc(RigGraph *rigg, RigArc *iarc)
 	}
 }
 
+void *exec_retargetArctoArc(void *param)
+{
+	RetargetParam *p = (RetargetParam*)param;
+	retargetArctoArc(p->rigg, p->iarc);
+	MEM_freeN(param);
+	
+	return NULL;
+}
+
+void thread_retargetArctoArc(RigGraph *rigg, RigArc *iarc)
+{
+}
+
 static void matchMultiResolutionNode(RigNode *inode, ReebNode *top_node)
 {
 	ReebNode *enode;

From 6a5976a0f5d0726dbaa526e88ae6abf3e703b8b8 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Wed, 13 Aug 2008 21:13:56 +0000
Subject: [PATCH 209/252] Added a Marker sub-menu to the Edit menu in the text
 space header.

---
 source/blender/src/drawtext.c    |  2 +-
 source/blender/src/header_text.c | 86 ++++++++++++++++++++++++++++++--
 2 files changed, 84 insertions(+), 4 deletions(-)

diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index e9c8c1b166c..da67c6573a3 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -2455,7 +2455,7 @@ static short do_markers(SpaceText *st, char ascii, unsigned short evnt, short va
 	text= st->text;
 	if (!text || text->id.lib || text->curl != text->sell) return 0;
 
-	marker= txt_find_marker(text, text->curl, text->curc, 0);
+	marker= txt_find_marker(text, text->sell, text->selc, 0);
 	if (!marker) {
 		/* Find the next temporary marker */
 		if (evnt==TABKEY) {
diff --git a/source/blender/src/header_text.c b/source/blender/src/header_text.c
index 8bd92d11a5d..f8042adfb2a 100644
--- a/source/blender/src/header_text.c
+++ b/source/blender/src/header_text.c
@@ -42,6 +42,7 @@
 
 #include "BMF_Api.h"
 #include "BIF_language.h"
+#include "MEM_guardedalloc.h"
 
 #include "BSE_headerbuttons.h"
 
@@ -315,9 +316,14 @@ static void do_text_filemenu(void *arg, int event)
 		txt_write_file(text);
 		break;
 	case 6:
-		run_python_script(st);
+		text->flags |= TXT_ISMEM | TXT_ISDIRTY | TXT_ISTMP;
+		MEM_freeN(text->name);
+		text->name= NULL;
 		break;
 	case 7:
+		run_python_script(st);
+		break;
+	case 8:
 	{
 		Object *ob;
 		bConstraint *con;
@@ -491,6 +497,57 @@ static void do_text_editmenu_selectmenu(void *arg, int event)
 	}
 }
 
+/* action executed after clicking in Markers menu */
+static void do_text_editmenu_markermenu(void *arg, int event)
+{
+	SpaceText *st= curarea->spacedata.first; /* bad but cant pass as an arg here */
+	Text *text;
+	TextMarker *mrk;
+	ScrArea *sa;
+	int lineno;
+	
+	if (st==NULL || st->spacetype != SPACE_TEXT) return;
+	
+	text = st->text;
+	
+	switch(event) {
+	case 1:
+		txt_clear_markers(text, 0);
+		break;
+	case 2:
+		lineno= txt_get_span(text->lines.first, text->curl);
+		mrk= text->markers.first;
+		while (mrk && (mrk->lineno<lineno || (mrk->lineno==lineno && mrk->start <= text->curc)))
+			mrk= mrk->next;
+		if (!mrk) mrk= text->markers.first;
+		if (mrk) {
+			txt_move_to(text, mrk->lineno, mrk->start, 0);
+			txt_move_to(text, mrk->lineno, mrk->end, 1);
+		}
+		break;
+	case 3:
+		lineno= txt_get_span(text->lines.first, text->curl);
+		mrk= text->markers.last;
+		while (mrk && (mrk->lineno>lineno || (mrk->lineno==lineno && mrk->end > text->curc)))
+			mrk= mrk->prev;
+		if (!mrk) mrk= text->markers.last;
+		if (mrk) {
+			txt_move_to(text, mrk->lineno, mrk->start, 0);
+			txt_move_to(text, mrk->lineno, mrk->end, 1);
+		}
+		break;
+	default:
+		break;
+	}
+
+	for (sa= G.curscreen->areabase.first; sa; sa= sa->next) {
+		SpaceText *st= sa->spacedata.first;
+		if (st && st->spacetype==SPACE_TEXT) {
+			scrarea_queue_redraw(sa);
+		}
+	}
+}
+
 /* action executed after clicking in Format menu */
 static void do_text_formatmenu(void *arg, int event)
 {
@@ -600,6 +657,25 @@ static uiBlock *text_editmenu_selectmenu(void *arg_unused)
 	return block;
 }
 
+/* Select menu */
+static uiBlock *text_editmenu_markermenu(void *arg_unused)
+{
+	uiBlock *block;
+	short yco = 20, menuwidth = 120;
+
+	block= uiNewBlock(&curarea->uiblocks, "text_editmenu_markermenu", UI_EMBOSSP, UI_HELV, G.curscreen->mainwin);
+	uiBlockSetButmFunc(block, do_text_editmenu_markermenu, NULL);
+
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Clear All", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 1, "");
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Next Marker", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 2, "");
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Previous Marker", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 3, "");
+	
+	uiBlockSetDirection(block, UI_RIGHT);
+	uiTextBoundsBlock(block, 60);
+	
+	return block;
+}
+
 void do_text_formatmenu_convert(void *arg, int event)
 {
 	SpaceText *st= curarea->spacedata.first; /* bad but cant pass as an arg here */
@@ -713,6 +789,7 @@ static uiBlock *text_editmenu(void *arg_unused)
 	uiDefBut(block, SEPR, 0, "",        0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
 	uiDefIconTextBlockBut(block, text_editmenu_viewmenu, NULL, ICON_RIGHTARROW_THIN, "View|Alt Shift V   ", 0, yco-=20, 120, 19, "");
 	uiDefIconTextBlockBut(block, text_editmenu_selectmenu, NULL, ICON_RIGHTARROW_THIN, "Select|Alt Shift S   ", 0, yco-=20, 120, 19, "");
+	uiDefIconTextBlockBut(block, text_editmenu_markermenu, NULL, ICON_RIGHTARROW_THIN, "Markers", 0, yco-=20, 120, 19, "");
 	uiDefBut(block, SEPR, 0, "",        0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Jump...|Alt J", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 7, "");
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Find And Replace...|Alt F", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 8, "");
@@ -754,12 +831,15 @@ static uiBlock *text_filemenu(void *arg_unused)
 		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Save|Alt S", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 4, "");
 		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Save As...", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 5, "");
 		
+		if (text->name)
+			uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Make Internal", 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, "");
 		
-		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Run Python Script|Alt P", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 6, "");
+		uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Run Python Script|Alt P", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 7, "");
 		
 		if (BPY_is_pyconstraint(text))
-			uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Refresh All PyConstraints", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 7, "");
+			uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Refresh All PyConstraints", 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, "");
 	}

From 7b1a2d5f3a5ed2495b6d369c48ff7f2f28d65dd8 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Thu, 14 Aug 2008 16:22:25 +0000
Subject: [PATCH 210/252] Got rid of the horrible blocking UI problems with
 Find and Replace by using a blockhandler panel. The panel is shown when find
 is invoked with Alt F (or from the menu). Successive presses of Alt F search
 again, while the panel is visible. Alt H does the same for replace. (Ctrl F
 and Ctrl H also work - more like other editors)

---
 source/blender/blenkernel/BKE_text.h |   7 +-
 source/blender/include/BIF_space.h   |   3 +
 source/blender/include/blendef.h     |   5 +
 source/blender/src/drawtext.c        | 352 ++++++++++++++-------------
 source/blender/src/header_text.c     |  10 +-
 5 files changed, 197 insertions(+), 180 deletions(-)

diff --git a/source/blender/blenkernel/BKE_text.h b/source/blender/blenkernel/BKE_text.h
index a092a991344..0094030e757 100644
--- a/source/blender/blenkernel/BKE_text.h
+++ b/source/blender/blenkernel/BKE_text.h
@@ -87,7 +87,7 @@ void	txt_backspace_char	(struct Text *text);
 void	txt_backspace_word	(struct Text *text);
 int		txt_add_char		(struct Text *text, char add);
 int		txt_replace_char	(struct Text *text, char add);
-void	txt_find_panel		(struct SpaceText *st, int again, int flags);
+void	find_and_replace	(struct SpaceText *st, short mode);
 void	run_python_script	(struct SpaceText *st);
 int	jumptoline_interactive	(struct SpaceText *st);
 void	txt_export_to_object	(struct Text *text);
@@ -153,11 +153,8 @@ struct TextMarker	*txt_next_marker_color	(struct Text *text, struct TextMarker *
 #define UNDO_UNCOMMENT		035
 
 /* Find and replace flags */
-#define TXT_FIND_REPLACE	0x01
+#define TXT_FIND_WRAP		0x01
 #define TXT_FIND_ALLTEXTS	0x02
-#define TXT_FIND_WRAP		0x04
-#define TXT_FIND_MARKALL	0x08
-#define TXT_FIND_KEEP		0x10
 
 /* Marker flags */
 #define TMARK_TEMP		0x01	/* Remove on non-editing events, don't save */
diff --git a/source/blender/include/BIF_space.h b/source/blender/include/BIF_space.h
index 4b2b8e14bb6..b441bfe3663 100644
--- a/source/blender/include/BIF_space.h
+++ b/source/blender/include/BIF_space.h
@@ -83,6 +83,9 @@ struct SpaceOops;
 /* nodes handler codes */
 #define NODES_HANDLER_GREASEPENCIL		80
 
+/* text handler codes */
+#define TEXT_HANDLER_FIND	90
+
 /* theme codes */
 #define B_ADD_THEME 	3301
 #define B_DEL_THEME 	3302
diff --git a/source/blender/include/blendef.h b/source/blender/include/blendef.h
index 33e20974ba6..228530db445 100644
--- a/source/blender/include/blendef.h
+++ b/source/blender/include/blendef.h
@@ -379,6 +379,11 @@
 #define B_SYNTAX		509
 #define B_WORDWRAP		510
 #define B_TEXTPLUGINS	511
+#define B_PASTEFIND		512
+#define B_PASTEREPLACE	513
+#define B_TEXTREPLACE	514
+#define B_TEXTFIND		515
+#define B_TEXTMARKALL	516
 
 /* SCRIPT: 525 */
 #define B_SCRIPTBROWSE		526
diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index da67c6573a3..15bf97f19f7 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -149,9 +149,9 @@ static void get_suggest_prefix(Text *text, int offset);
 static void confirm_suggestion(Text *text, int skipleft);
 
 #define TXT_MAXFINDSTR 255
-static int last_find_flags= TXT_FIND_WRAP | TXT_FIND_KEEP;
-static char *last_find_string= NULL;
-static char *last_repl_string= NULL;
+static int g_find_flags= TXT_FIND_WRAP;
+static char *g_find_str= NULL;
+static char *g_replace_str= NULL;
 
 static int doc_scroll= 0;
 static double last_check_time= 0;
@@ -217,8 +217,8 @@ static void temp_char_write(char c, int accum) {
 void free_txt_data(void) {
 	txt_free_cut_buffer();
 	
-	if (last_find_string) MEM_freeN(last_find_string);
-	if (last_repl_string) MEM_freeN(last_repl_string);
+	if (g_find_str) MEM_freeN(g_find_str);
+	if (g_replace_str) MEM_freeN(g_replace_str);
 	if (temp_char_buf) MEM_freeN(temp_char_buf);
 	if (temp_char_accum) MEM_freeN(temp_char_accum);	
 }
@@ -1458,6 +1458,163 @@ void draw_suggestion_list(SpaceText *st)
 	}
 }
 
+static short check_blockhandler(SpaceText *st, short handler) {
+	short a;
+	for(a=0; a<SPACE_MAXHANDLER; a+=2)
+		if (st->blockhandler[a]==handler) return 1;
+	return 0;
+}
+
+static void text_panel_find(short cntrl)	// TEXT_HANDLER_FIND
+{
+	uiBlock *block;
+
+	if (!g_find_str || !g_replace_str) {
+		g_find_str= MEM_mallocN(TXT_MAXFINDSTR+1, "find_string");
+		g_replace_str= MEM_mallocN(TXT_MAXFINDSTR+1, "replace_string");
+		g_find_str[0]= g_replace_str[0]= '\0';
+	}
+	
+	block= uiNewBlock(&curarea->uiblocks, "text_panel_find", UI_EMBOSS, UI_HELV, curarea->win);
+	uiPanelControl(UI_PNL_SOLID | UI_PNL_CLOSE | cntrl);
+	uiSetPanelHandler(TEXT_HANDLER_FIND);  // for close and esc
+	if(uiNewPanel(curarea, block, "Find & Replace", "Text", curarea->winx-230, curarea->winy-130, 260, 120)==0) return;
+	
+	uiBlockBeginAlign(block);
+	uiDefButC(block, TEX, 0, "Find: ", 0,80,220,20, g_find_str, 0,(float)TXT_MAXFINDSTR, 0,0, "");
+	uiDefIconBut(block, BUT, B_PASTEFIND, ICON_TEXT, 220,80,20,20, NULL, 0,0,0,0, "Copy from selection");
+	uiDefButC(block, TEX, 0, "Replace: ", 0,60,220,20, g_replace_str, 0,(float)TXT_MAXFINDSTR, 0,0, "");
+	uiDefIconBut(block, BUT, B_PASTEREPLACE, ICON_TEXT, 220,60,20,20, NULL, 0,0,0,0, "Copy from selection");
+	uiBlockEndAlign(block);
+	uiDefButBitI(block, TOG, TXT_FIND_WRAP,    0,"Wrap Around", 0,30,110,20,&g_find_flags,0,0,0,0,"Wrap search around current text");
+	uiDefButBitI(block, TOG, TXT_FIND_ALLTEXTS,0,"Search All Texts",  110,30,130,20,&g_find_flags,0,0,0,0,"Search in each text");
+	uiDefBut(block, BUT, B_TEXTFIND,    "Find",       0,0,50,20, NULL, 0,0,0,0, "Find next");
+	uiDefBut(block, BUT, B_TEXTREPLACE, "Replace/Find", 50,0,110,20, NULL, 0,0,0,0, "Replace then find next");
+	uiDefBut(block, BUT, B_TEXTMARKALL, "Mark All",   160,0,80,20, NULL, 0,0,0,0, "Mark each occurrence to edit all from one");
+}
+
+/* mode: 0 find only, 1 replace/find, 2 mark all occurrences */
+void find_and_replace(SpaceText *st, short mode) {
+	char *tmp;
+	Text *start= NULL, *text= st->text;
+	int flags, first= 1;
+
+	if (!check_blockhandler(st, TEXT_HANDLER_FIND)) {
+		toggle_blockhandler(st->area, TEXT_HANDLER_FIND, UI_PNL_TO_MOUSE);
+		return;
+	}
+
+	if (!g_find_str || !g_replace_str) return;
+	if (g_find_str[0] == '\0') return;
+	flags= g_find_flags;
+	if (flags & TXT_FIND_ALLTEXTS) flags ^= TXT_FIND_WRAP;
+
+	do {
+		if (first)
+			txt_clear_markers(text, TMARK_GRP_FINDALL);
+		first= 0;
+		
+		/* Replace current */
+		if (mode && txt_has_sel(text)) {
+			tmp= txt_sel_to_buf(text);
+			if (strcmp(g_find_str, tmp)==0) {
+				if (mode==1) {
+					txt_insert_buf(text, g_replace_str);
+					if (st->showsyntax) txt_format_line(st, text->curl, 1);
+				} else if (mode==2) {
+					char clr[4];
+					BIF_GetThemeColor4ubv(TH_SHADE2, clr);
+					if (txt_find_marker(text, text->curl, text->selc, TMARK_GRP_FINDALL)) {
+						if (tmp) MEM_freeN(tmp), tmp=NULL;
+						break;
+					}
+					txt_add_marker(text, text->curl, text->curc, text->selc, clr, TMARK_GRP_FINDALL | TMARK_EDITALL);
+				}
+			}
+			MEM_freeN(tmp);
+			tmp= NULL;
+		}
+
+		/* Find next */
+		if (txt_find_string(text, g_find_str, flags & TXT_FIND_WRAP)) {
+			pop_space_text(st);
+		} else if (flags & TXT_FIND_ALLTEXTS) {
+			if (text==start) break;
+			if (!start) start= text;
+			if (text->id.next)
+				text= st->text= text->id.next;
+			else
+				text= st->text= G.main->text.first;
+			txt_move_toline(text, 0, 0);
+			pop_space_text(st);
+			first= 1;
+		} else {
+			okee("Text not found: %s", g_find_str);
+			break;
+		}
+	} while (mode==2);
+}
+
+static void do_find_buttons(val) {
+	Text *text;
+	SpaceText *st;
+	int do_draw= 0;
+	char *tmp;
+
+	st= curarea->spacedata.first;
+	if (!st || st->spacetype != SPACE_TEXT) return;
+	text= st->text;
+	if (!text) return;
+
+	switch (val) {
+		case B_PASTEFIND:
+			if (!g_find_str) break;
+			tmp= txt_sel_to_buf(text);
+			strncpy(g_find_str, tmp, TXT_MAXFINDSTR);
+			MEM_freeN(tmp);
+			do_draw= 1;
+			break;
+		case B_PASTEREPLACE:
+			if (!g_replace_str) break;
+			tmp= txt_sel_to_buf(text);
+			strncpy(g_replace_str, tmp, TXT_MAXFINDSTR);
+			MEM_freeN(tmp);
+			do_draw= 1;
+			break;
+		case B_TEXTFIND:
+			find_and_replace(st, 0);
+			do_draw= 1;
+			break;
+		case B_TEXTREPLACE:
+			find_and_replace(st, 1);
+			do_draw= 1;
+			break;
+		case B_TEXTMARKALL:
+			find_and_replace(st, 2);
+			do_draw= 1;
+			break;
+	}
+}
+
+static void text_blockhandlers(ScrArea *sa)
+{
+	SpaceText *st= sa->spacedata.first;
+	short a;
+
+	/* warning; blocks need to be freed each time, handlers dont remove */
+	uiFreeBlocksWin(&sa->uiblocks, sa->win);
+	
+	for(a=0; a<SPACE_MAXHANDLER; a+=2) {
+		/* clear action value for event */
+		switch(st->blockhandler[a]) {
+			case TEXT_HANDLER_FIND:
+				text_panel_find(st->blockhandler[a+1]);
+				break;
+		}
+	}
+	uiDrawBlocksPanels(sa, 0);
+}
+
 void drawtextspace(ScrArea *sa, void *spacedata)
 {
 	SpaceText *st= curarea->spacedata.first;
@@ -1470,6 +1627,9 @@ void drawtextspace(ScrArea *sa, void *spacedata)
 
 	if (st==NULL || st->spacetype != SPACE_TEXT) return;
 	
+	bwin_clear_viewmat(sa->win);	/* clear buttons view */
+	glLoadIdentity();
+	
 	BIF_GetThemeColor3fv(TH_BACK, col);
 	glClearColor(col[0], col[1], col[2], 0.0);
 	glClear(GL_COLOR_BUFFER_BIT);
@@ -1541,7 +1701,10 @@ void drawtextspace(ScrArea *sa, void *spacedata)
 	draw_textscroll(st);
 	draw_documentation(st);
 	draw_suggestion_list(st);
-
+	
+	bwin_scalematrix(sa->win, st->blockscale, st->blockscale, st->blockscale);
+	text_blockhandlers(sa);
+	
 	curarea->win_swap= WIN_BACK_OK;
 }
 
@@ -1913,163 +2076,6 @@ void txt_copy_clipboard(Text *text) {
 	}
 }
 
-static short find_and_replace_popup(short focus)
-{
-	uiBlock *block;
-	ListBase listb={0, 0};
-	short x1,y1;
-	short ret=0;
-	char *editfindvar=NULL, *editreplvar=NULL; /* dont edit the original text, incase we cancel the popup */
-
-	block= uiNewBlock(&listb, "button", UI_EMBOSS, UI_HELV, G.curscreen->mainwin);
-	uiBlockSetFlag(block, UI_BLOCK_LOOP|UI_BLOCK_REDRAW|UI_BLOCK_RET_1|UI_BLOCK_ENTER_OK);
-
-	x1= curarea->winrct.xmax - 240;
-	y1= curarea->winrct.ymin;
-	
-	editfindvar = MEM_callocN(TXT_MAXFINDSTR+1, "findvar");
-	editreplvar = MEM_callocN(TXT_MAXFINDSTR+1, "replvar");
-	BLI_strncpy(editfindvar, last_find_string, TXT_MAXFINDSTR);
-	BLI_strncpy(editreplvar, last_repl_string, TXT_MAXFINDSTR);
-	
-	uiDefButC(block, TEX, 1, "Find: ", x1+5,y1+85,225,20, editfindvar, 0,(float)TXT_MAXFINDSTR, 0, 0, "");
-	uiDefButC(block, TEX, 2, "Replace: ", x1+5,y1+60,225,20, editreplvar, 0,(float)TXT_MAXFINDSTR, 0, 0, "");
-	uiDefButBitI(block, TOG, TXT_FIND_WRAP,    3,"Wrap",        x1+  5,y1+35,60,20,&last_find_flags,0,0,0,0,"Wrap search around current text");
-	uiDefButBitI(block, TOG, TXT_FIND_ALLTEXTS,4,"All Texts",   x1+ 65,y1+35,70,20,&last_find_flags,0,0,0,0,"Search all texts");
-	uiDefButBitI(block, TOG, TXT_FIND_KEEP,    5,"Keep Visible",x1+135,y1+35,95,20,&last_find_flags,0,0,0,0,"Keep the find panel visible");
-	uiDefBut(block, BUT, 6, "Replace/Find", x1+  5,y1+10,90,20, NULL, 0, 0, 0, 0, "Replace then find next");
-	uiDefBut(block, BUT, 7, "Find",         x1+ 95,y1+10,60,20, NULL, 0, 0, 0, 0, "Find next");
-	uiDefBut(block, BUT, 8, "Mark All",     x1+155,y1+10,75,20, NULL, 0, 0, 0, 0, "Find and mark all");
-
-	uiBoundsBlock(block, 5);
-	
-	if (focus) mainqenter_ext(BUT_ACTIVATE, focus, 0);
-	ret= uiDoBlocks(&listb, 0, 0);
-
-	if(ret==UI_RETURN_OK) {
-		BLI_strncpy(last_find_string, editfindvar, TXT_MAXFINDSTR);
-		BLI_strncpy(last_repl_string, editreplvar, TXT_MAXFINDSTR);
-		MEM_freeN(editfindvar);
-		MEM_freeN(editreplvar);
-		return 1;
-	}
-	MEM_freeN(editfindvar);
-	MEM_freeN(editreplvar);
-	return 0;
-	
-}
-
-static void do_find_and_replace_popup(SpaceText *st, short val) {
-	last_find_flags &= ~TXT_FIND_REPLACE & ~TXT_FIND_MARKALL;
-	switch (val) {
-		case -1: case 0: return;
-		case 1: case 2: break;
-		/* Toggles */
-		case 3: if (last_find_flags & TXT_FIND_WRAP) last_find_flags &= ~TXT_FIND_ALLTEXTS; break;
-		case 4: if (last_find_flags & TXT_FIND_ALLTEXTS) last_find_flags &= ~TXT_FIND_WRAP; break;
-		case 5: break;
-		/* Buttons */
-		case 6: last_find_flags |= TXT_FIND_REPLACE;
-		case 7: break;
-		case 8: last_find_flags |= TXT_FIND_MARKALL;
-	}
-	if (val>5) {
-		txt_find_panel(st, 1, last_find_flags);
-		scrarea_do_windraw(curarea);
-		screen_swapbuffers();
-		if (!(last_find_flags & TXT_FIND_MARKALL) && (last_find_flags & TXT_FIND_KEEP))
-			find_and_replace_popup(0);
-	} else {
-		find_and_replace_popup(0);
-	}
-}
-
-/*
- * again==0 always show find panel
- * again==1 find text again (no panel) If first find, panel shown anyway
- * flags (used to initialize UI if again==0):
- *   TXT_FIND_REPLACE  replace last found occurrence before searching again
- *   TXT_FIND_ALLTEXTS search through all texts (off wraps current text)
- */
-void txt_find_panel(SpaceText *st, int again, int flags)
-{
-	Text *start, *text;
-	char *tmp;
-	
-	start= NULL; /* Set on first switch */
-	text= st->text;
-	if (!text) return;
-
-	if (!last_find_string) {
-		last_find_string= MEM_mallocN(TXT_MAXFINDSTR+1, "find_string");
-		last_find_string[0]= '\0';
-		again= 0;
-	}
-	if (!last_repl_string) {
-		last_repl_string= MEM_mallocN(TXT_MAXFINDSTR+1, "replace_string");
-		last_repl_string[0]= '\0';
-		if (flags & TXT_FIND_REPLACE) again= 0;
-	}
-	
-	if (txt_has_sel(text)) {
-		tmp= txt_sel_to_buf(text);
-		strncpy(last_find_string, tmp, TXT_MAXFINDSTR);
-		MEM_freeN(tmp);
-	}
-
-	if (again) {
-		int first= 1;
-		do {
-			if (first && (flags & TXT_FIND_MARKALL))
-				txt_clear_markers(text, TMARK_GRP_FINDALL);
-			first= 0;
-			
-			/* Replace current */
-			if ((flags & (TXT_FIND_REPLACE | TXT_FIND_MARKALL)) && txt_has_sel(text)) {
-				tmp= txt_sel_to_buf(text);
-				if (strcmp(last_find_string, tmp)==0) {
-					if (flags & TXT_FIND_REPLACE) {
-						txt_insert_buf(text, last_repl_string);
-						if (st->showsyntax) txt_format_line(st, text->curl, 1);
-					} else {
-						char clr[4];
-						BIF_GetThemeColor4ubv(TH_SHADE2, clr);
-						if (txt_find_marker(text, text->curl, text->selc, TMARK_GRP_FINDALL)) {
-							if (tmp) MEM_freeN(tmp), tmp=NULL;
-							break;
-						}
-						txt_add_marker(text, text->curl, text->curc, text->selc, clr, TMARK_GRP_FINDALL | TMARK_EDITALL);
-					}
-				}
-				MEM_freeN(tmp);
-				tmp= NULL;
-			}
-
-			/* Find next */
-			if (txt_find_string(text, last_find_string, flags & TXT_FIND_WRAP)) {
-				pop_space_text(st);
-			} else if (flags & TXT_FIND_ALLTEXTS) {
-				if (text==start) break;
-				if (!start) start= text;
-				if (text->id.next)
-					text= st->text= text->id.next;
-				else
-					text= st->text= G.main->text.first;
-				txt_move_toline(text, 0, 0);
-				pop_space_text(st);
-				first= 1;
-			} else {
-				okee("Text not found: %s", last_find_string);
-				break;
-			}
-		} while (flags & TXT_FIND_MARKALL);
-	}
-	else {
-		last_find_flags= flags;
-		find_and_replace_popup(1);
-	}
-}
-
 void run_python_script(SpaceText *st)
 {
 	char *py_filename;
@@ -2680,12 +2686,14 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 		return;
 	}
 
+	if (val && uiDoBlocks(&curarea->uiblocks, event, 1)!=UI_NOTHING) event= 0;
+
 	if (st->doplugins && do_texttools(st, ascii, event, val)) return;
 	if (do_markers(st, ascii, event, val)) return;
 	
 	if (event==UI_BUT_EVENT) {
-		do_find_and_replace_popup(st, val);
-		return;
+		do_find_buttons(val);
+		do_draw= 1;
 	} else if (event==LEFTMOUSE) {
 		if (val) {
 			short mval[2];
@@ -2891,15 +2899,17 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 					break;
 				}
 			}
-			else if (G.qual == LR_ALTKEY || G.qual == LR_CTRLKEY) {
-				txt_find_panel(st, 0, last_find_flags);
-				do_draw= 1;
-			}
-			else if (G.qual == (LR_ALTKEY|LR_CTRLKEY)) {
-				txt_find_panel(st, 1, last_find_flags & ~TXT_FIND_REPLACE & ~TXT_FIND_MARKALL);
+			else if (G.qual & (LR_ALTKEY|LR_CTRLKEY)) {
+				find_and_replace(st, 0);
 				do_draw= 1;
 			}
 			break; /* BREAK F */
+		case HKEY:
+			if (G.qual & (LR_ALTKEY|LR_CTRLKEY)) {
+				find_and_replace(st, 1);
+				do_draw= 1;
+			}
+			break; /* BREAK H */
 		case JKEY:
 			if (G.qual == LR_ALTKEY) {
 				do_draw= jumptoline_interactive(st);
diff --git a/source/blender/src/header_text.c b/source/blender/src/header_text.c
index f8042adfb2a..0eea8c93fd4 100644
--- a/source/blender/src/header_text.c
+++ b/source/blender/src/header_text.c
@@ -418,10 +418,11 @@ static void do_text_editmenu(void *arg, int event)
 		jumptoline_interactive(st);
 		break;
 	case 8:
-		txt_find_panel(st, 0, TXT_FIND_WRAP | TXT_FIND_KEEP);
-		break;
 	case 9:
-		txt_find_panel(st, 1, TXT_FIND_WRAP);
+		find_and_replace(st, 0);
+		break;
+	case 10:
+		find_and_replace(st, 1);
 		break;
 	default:
 		break;
@@ -793,7 +794,8 @@ static uiBlock *text_editmenu(void *arg_unused)
 	uiDefBut(block, SEPR, 0, "",        0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Jump...|Alt J", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 7, "");
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Find And Replace...|Alt F", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 8, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Find Again|Alt Ctrl F", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 9, "");
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Find Next|Alt F", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 9, "");
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Replace|Alt H", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 10, "");
 	uiDefBut(block, SEPR, 0, "",        0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
 	uiDefIconTextBlockBut(block, text_editmenu_to3dmenu, NULL, ICON_RIGHTARROW_THIN, "Text to 3d Object", 0, yco-=20, 120, 19, "");
 	

From 4cec4803385e6ae3f73cc38a079dad847df05f33 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Thu, 14 Aug 2008 17:09:39 +0000
Subject: [PATCH 211/252] Used the Python icon for the text plugin button and
 created an ON version.

---
 source/blender/include/BIF_resources.h |    2 +-
 source/blender/src/blenderbuttons.c    | 4253 ++++++++++++------------
 source/blender/src/header_text.c       |    4 +-
 source/blender/src/space.c             |    2 +-
 4 files changed, 2133 insertions(+), 2128 deletions(-)

diff --git a/source/blender/include/BIF_resources.h b/source/blender/include/BIF_resources.h
index 55f1439b10e..92f18a89a4b 100644
--- a/source/blender/include/BIF_resources.h
+++ b/source/blender/include/BIF_resources.h
@@ -108,7 +108,7 @@ typedef enum {
 	ICON_FF,
 	ICON_REW,
 	ICON_PYTHON,
-	ICON_BLANK11,
+	ICON_PYTHON_ON,
 	ICON_BLANK12,
 	ICON_BLANK13,
 	ICON_BLANK14,
diff --git a/source/blender/src/blenderbuttons.c b/source/blender/src/blenderbuttons.c
index 3035baf14ac..ba8ecf266ce 100644
--- a/source/blender/src/blenderbuttons.c
+++ b/source/blender/src/blenderbuttons.c
@@ -1,2128 +1,2133 @@
 /* DataToC output of file <blenderbuttons> */
 
-int datatoc_blenderbuttons_size= 67881;
+int datatoc_blenderbuttons_size= 68083;
 char datatoc_blenderbuttons[]= {
-137, 80, 78, 71, 13, 10, 26, 10,  0,
-  0,  0, 13, 73, 72, 68, 82,  0,  0,  2,  0,  0,  0,  1,  0,  8,  6,  0,  0,  0,197,144,206,103,  0,  0,  0,  6, 98, 75, 71, 68,
-  0,255,  0,255,  0,255,160,189,167,147,  0,  0,  0,  9,112, 72, 89,115,  0,  0, 11, 19,  0,  0, 11, 19,  1,  0,154,156, 24,  0,
-  0,  0,  7,116, 73, 77, 69,  7,216,  7, 26, 14,  5,  6, 33,183, 35,115,  0,  0, 32,  0, 73, 68, 65, 84,120,218,236,125,121, 92,
- 84, 85,255,255,251,220,217,217, 23,  1, 21,133,193,125, 95,201, 37, 55, 40, 49, 51,205, 52,192,212, 36,219,196,210,180,178,180,
-111,249, 60,233, 79,159, 12,148,202,212,132,158, 74,179,210, 18,151,180, 92, 18,116, 80, 83, 82,209, 92,202,  5, 69,  1, 65,145,
-101, 86,102,187,115,231,222,223, 31, 51,131,  3,  2,179,128, 73, 61,243,126,113, 95,195, 93,230, 51,231,158,237,253,249,124,206,
-231,156, 67,250,245,235,199,193,  3, 15, 60,240,192,  3, 15, 60,248,159,  2,229,201,  2, 15, 60,240,192,  3, 15, 60,248,223,193,
-153,223,179,  1,  0,196,227,  1,240,192,  3, 15, 60,240,192,  3,143,  7,192,  3, 15, 60,240,192,  3, 15, 60,240, 40,  0, 30,120,
-224,129,  7, 30,120,224,129, 71,  1,240,192,  3, 15, 60,240,192,  3, 15,254, 17,224,219,159,156, 61,123,150,184, 43,168,190, 88,
-  2,143, 60,143,188,134,144,145,145,193,173, 95,191,254,129,165,111,234,212,169,220,150, 45, 91,136,167, 60,254,214,242,208,  4,
-121,240,228,159, 71,222, 63, 89,158,203, 10,192,255, 56,234,102, 32,105,201,233, 76, 79, 79,199,236,217,179,137,167,216,220, 47,
-227,184,184,184,154,243,172,172,172,127, 68, 94, 78,124, 42,185,209,142, 96,215,143, 25,255,232, 58, 35,  9,220,  9,177,161, 19,
-162, 64,163, 26,251,144,175, 95,220,146,235,162,167,253,122,208,114, 60,  0,127, 69,101,157, 56,113, 98,204,174, 93,187,100,118,
-231,177,187,118,237,202,105, 17, 45,146,179,244,157,132,180,216,118,201, 21, 22, 22,  2,  0,164, 82,233,223,169, 19,113, 90, 59,
-157, 58,117,170,211,207,110,217,178,197, 21, 69,141,219,186,117,107,205,201,206,157, 59, 17, 23, 23, 87,235,254,131, 82,  2,242,
-242,242, 56,  0,136,142,142, 38,205,241,220,174, 31, 51,238,107,249,133, 71,181,  7,  0,220, 49, 24,192,232,141,150,139, 74, 53,
-  0, 32, 33, 33,  1,153,153,153, 13,166,111, 96,193, 64,174,243,237,206, 46,253,248,247,195,191,119,162, 92, 36,  8,124,245,  2,
- 12,187,118, 66,161,152,  4,  5,128,  1,146,149, 88, 44, 57,141,246, 98,160,194, 80,128,197,250, 68,151,126, 55, 33, 33, 33, 38,
- 51, 51, 83, 86,231, 90,108,102,102,102, 78, 11,107, 91,205, 82,111,255, 38,239,219,236,104, 19, 44, 34, 62,  2,127, 98, 20, 11,
- 57,163, 82, 79, 85,235,213,172,214,104,250,159,152, 29,231, 80,  1,176, 18,182,237,179,169, 21,129,219,181,107, 23,150,110, 93,
- 14,159,246,254,168,190,169,194,251,137,139,101, 45,220,226,110, 73, 32, 82,169,148, 43, 44, 44, 68, 97, 97, 33,246,239,223,143,
-217,179,103,183, 84, 37,192,214,128, 72, 70, 70,134, 32, 57, 57,217,148,154,154,122, 10,  0, 22, 46, 92,248, 80, 99, 95,156, 52,
-105, 82,205,255, 12, 99,  6,109, 50,130, 54,210,160,105,203,193, 48, 12, 22, 46, 92,232, 82, 90,236,201,191, 62, 88,149,  1,238,
- 65,122,  2, 92, 81,126, 30,152,133, 31,224,135,243,215,191,135,  4,237, 96,198, 49,148,127,113,  6,231, 10,170, 48,249,195, 13,
- 78,125,189,243,237,206, 78, 18,186,  5,207,252,250,140,195, 60,145,140, 91,140,160,137, 47,162,244,245,  1,128, 94, 81,115,253,
-140,254,109,156,  1,  0, 61, 48, 82,146,128,131,129,167, 17,  0, 96,160, 98,160, 83,117, 38, 51, 51,243,158,139,118,  4, 73, 90,
- 80, 27,107,142, 62,224,239,240,190,205,138, 97,125,250,145,103,195,163,248,202,136, 86,188,208,238,225, 20,159,132, 18,157, 74,
-197,138, 17,102,166,250,183, 51, 63, 55, 97,140,217, 73, 81,183, 92,248,217,182, 78, 60,179,192,  5,121,105,247, 85,  1,216,181,
-107,151,108,235,191,222, 69,226,178, 15,100, 77,172,  4,156,141,248,  1,160, 82, 87,  5,  4,  3,255,119,112,  9,212,215, 21, 88,
-247,242,234,150, 70,100, 13,117, 60, 15, 58,141, 53, 74,192,216,177, 99, 81, 88, 88,  8,169, 84,218,226,242, 78, 38,179,244, 27,
-177,177,177, 28,  0, 42, 35, 35, 35, 60, 57, 57,185, 52, 53, 53,245,180,179, 66, 24,134,  1, 77,155,106,136,223,158,252,243,242,
-242, 16, 29, 29,237, 82,162, 18, 19, 19,237,201, 22, 89, 89, 89,117, 21,128,230,168, 43, 46,151, 67,116,116, 52,153, 58,117, 42,
- 55,102,204,152,123,238, 29, 56,112,192,230,233,176,121, 61,156,150,223,156,195,  1,225, 81,237, 81,170, 80, 97,199,236,167, 17,
- 76,134,161,224,191,111,161,195,164, 14,200,114,129,252,107, 50,203,234,106, 35,205,224,106, 11,223,122, 12,186,162,106,148, 38,
- 71, 53,250,220,  5,113, 54,150,246,190,131, 21, 23,222,107,106,121, 54,  7,233, 54,167, 12, 52,179,172,251,241,190,205,130,164,
-164, 36, 47,  0, 15,  3,240,177,187,172,  4,112,126,211,166, 77,114,103,229,124,178,254, 19,138,174, 52, 10,104,163, 65,172,128,
- 73, 44, 16,240,249,106,131,152, 18, 10,245, 44,207,207,155,161, 37, 38, 19,191,236,150,241,235, 47, 54, 26,158,123,105,166,217,
-153,247, 86, 42,149,255,177,253,159,159,159, 95,233,237,237, 77,105,181, 90,214,254,153, 65,131,  6,125,220,204,196,190,160,169,
-121,202,119,100,253, 95,186,116,  9,157,125,252,236,189,  1,238,120,  1,106,200,191, 82, 87,133, 21,143, 46,169,185,241,252,174,
- 87,129, 80, 96, 82,106, 34,118, 46,220,234, 74, 37,107,172,115,107,114, 69,189,121,243, 38,  0,160,125,251,246,181,254,135, 11,
-238,236,102, 84, 68, 72, 67, 74,128,201,196,216,226,  1,154,197, 10,104,134,188,180, 39,127,  0, 32,201,201,201,  0,112, 43, 35,
- 35, 35, 48, 57, 57, 89,225, 52,249,155, 76,160,105, 35,140, 52, 13, 83, 29,242,231, 88,215,138, 33, 49, 49, 17,121,121,121,119,
- 91, 87, 90, 26,226,227,227,107,206,183,109,219,214,100,101,199, 78,225,105,114,253,179, 39,254,169, 83,167,162,127,255,254, 54,
-  5,192, 85,143, 64,179, 84,194,146,235,197,208,238,252, 55,124, 94, 88,141,240,168,246,  8, 11,150,224,250,206,235, 22,242, 15,
-240,179, 12,  1,  8,120,206,105,176,205, 52,198,214,229,226, 53,220,124,127, 57,244,153, 27, 27,247, 16, 72, 36, 48, 24, 12, 40,
- 40, 40, 64,185,225, 10,186, 32,188,193,103,173,110,240,198,234, 62,177,181, 19,235,179, 57,110,180, 47, 98,215,174, 57, 55,219,
- 25,105,132,184,157,174,131,245,189,111,124,124, 60, 71,  8,177, 13,229, 52,229,125,109,109,153,227,243,249, 77, 42,243,164,164,
- 36,127,  0,147, 14, 30, 60,248,111,150,101,141,118,117,137,207,227,241,188,147,146,146, 94,218,180,105,211, 94,135,140,185,104,
-  1,191,242, 86,133, 88, 32, 16,121, 83,124,226,199,241, 68, 94, 44,143,199,103,  9,  5,150,240,205, 28,143,103,228,177,196,160,
-229,153,117,222, 66,  1,249,226,216, 94,195,220,148,153, 44,138, 29,167, 81,161, 80,168,117, 58, 29,  3,  0, 90,173,150,125,247,
-221,119,107,  8,255,131, 15, 62,120,163,169,245,125,244,232,209,179,109,255,103,103,103,167, 55, 71, 27,162, 28, 89,255,203,167,
-196,195, 80, 81,129,183,122,118,131,253,216,189,211, 86,200,196,137, 49,  0,106,145,255,196,137, 19, 99,  1,144,137, 19, 39,198,
-110,152,248,153,197,179,216,181, 85,173,231,157,193,194,117,249, 88,184, 46, 31,115, 86, 93,194,115,203,254,192,228,255, 59,219,
-244,142,174,164,196, 41,197,224,175, 34,127,235,152, 63,215,128, 39,  0, 38,154,198,224, 65,131,154, 67,201,224,182,110,221,138,
-173, 91,183, 66, 38,147,213, 28, 46, 42, 60,156, 76, 38, 67,108,108,108, 13,249,219,223, 76, 78, 78, 86, 58,211, 49, 49,140,217,
- 98,249, 27, 45,174,255,186,228,111, 54,155,161,213,107, 93,122, 65,155,199,160,174,215, 96,219,182,109,216,182,109, 91, 45,101,
-192,165,247,205,169,221, 31, 90,207,155,164, 36,218,200,127,234,212,169, 72, 77, 77,173, 33,127,  1, 95,224, 42,249,219, 58,240,
-134, 14,167,161, 71, 49,170, 39, 13,  6,151,249, 22, 74,174, 23,131,155,212,253,110, 38,100,190,  5,126,155, 16, 32, 32,224, 47,
-213,140,181,149,  5,208,103,110,  4,199,113,184,112,225,  2, 70,142, 28,  9,137, 68, 82,139,248,  3,  3,  3,161,215,235,161,215,
-235, 81, 90, 90,138,105,250,121,248, 34,240,245,  6,101, 58,233,242, 38,117,158,117,149,184,155,203, 88, 33, 13,144,191,211,117,
-176,238,251,198,199,199,115,219,182,109, 67,102,102, 38, 18, 18, 18,184,166,190,175,149,252,193, 48,140,219,109, 34, 41, 41, 73,
- 12,224,229,236,236,236,119,151, 45, 91,118,130, 16, 34,181, 29,  0,218,  5,  7,  7,123, 29, 58,116,104,125, 82, 82,210,200,198,
-228,124,150,190,158,199, 35,  2, 17,205,112,126, 70,163, 41,212,204,178,237,204, 44, 27,101, 38, 36,  2, 60, 94, 48, 33, 36,  0,
-132,231,199,114,  8,226,104, 54, 64,173, 55,121,135,250, 49, 60,106,144,198,169, 50,210,233,116, 76, 93,171,191,165,131,106,140,
-184,187,116,233,130,206, 62,126,208,149,221,198,227,253,  7,184, 76,208, 54, 37, 98,233,214,229,  0, 80, 67,254, 54, 47,194,174,
- 93,187,114,108, 74, 64,137,250, 22,  6, 44, 28,226,146,146,161,213,155,161,213,155,113,187,202,136,210, 10,  3,110,222, 49,184,
- 69,124,182,198,226,136,252, 31, 20, 26, 81,  2, 96,160,141, 48, 24, 12, 77, 17,207,201,100, 50,216,198,200, 67, 66, 66,236,173,
- 89,184,208,153,212,178,132, 27,113, 37, 58,236,244,104,147,209, 98,249, 27,105,208,166,218,228,111, 50,153,160,213,106,161, 81,
-107, 30,116,177,112, 91,183,102,214,126, 37,203, 31,172,215,221,234,240,236,201,223, 70,252, 20, 69, 65, 44, 22,195,219,199,171,
- 73,  9,158,248, 84, 50,215,208,225,232,187,251,255,111,  9,130, 49, 12,204,232,215,  0,  0, 62,185,215,112,174,160,202,210,201,
-143,126, 13,166, 11, 75,129,202, 42,215, 50,208, 10,119,223,199, 27,149,  0,128,141, 27, 55, 98,215,174, 93, 88,185,114, 37, 78,
-158, 60,  9,163,209,136,242,242,114,155, 85, 86,243,124,120,120, 56,244,  0,120,184,241, 64,234, 75, 35,245,158, 52, 65,105, 36,
-141,120,240, 92,150,105,239,  9,171, 47, 38,192, 29,242,  7,  0,119,149,128,164,164,164,214, 86,242,159,245,245,215, 95, 95, 92,
-188,120,241, 83,155, 55,111, 70,151, 46, 93,  0,  0,145,145,145, 80,169, 84,162,165, 75,151,158, 62,116,232,208,183, 73, 73, 73,
-210,  6,115,137,229,  8, 88, 70,108, 54, 51, 65,102,198,220,206,100, 54,117,226, 81,164,173,144, 79,  9,196,  2,158,158,239, 37,
- 84,122,251,242,212, 60, 49,199,136,121, 60,111, 62, 67,251,221, 56,243,187,104, 70,200, 39, 14,211,157,159,159, 95,169,213,106,
-217,250,220,252,125,251,246,189, 66,211,116,179, 85,164,190,125,251, 54,155, 44,126, 99,196,253,223, 89, 47,222, 37,219,146,155,
-120,171,103, 55,172,178, 16,180, 75, 90,171,205,250,183,145,126,157,223,169, 57, 15,238,221,218,165,196, 87,235,205,208,232, 24,
-168,181, 12, 84,213, 12,148, 26,198,245, 86, 89, 79,228,191,189,149,111,255,255,245,235,215,161, 84, 42,255,178, 30, 35, 61, 61,
- 29, 82,169, 20,182,160,191, 58, 99,253, 92,122,122, 58, 12,122,125, 83, 20,  0,110,195,134, 13, 40, 41, 45,133,128,199, 67, 88,
-235,214,181,200,255,209, 71, 31,197,193,131,  7,157,237,156, 72,108,108,108, 93, 37,160,150, 39,195,217, 88,  5,218, 72,131, 54,
- 26, 97, 50,209, 96, 24,115, 13,249, 27,141, 70,232,116, 58, 84, 87, 87, 67,163,113, 93,  1,176, 31,  2,176,193, 93,203,127,107,
-230, 86,128,  3, 42,173, 68, 99, 29,212,  6,225, 56,139, 18,144,153,137, 68,139,  5,229, 82, 91,169, 75,254,  2,129,  0, 34,145,
-  8, 98,177, 24, 98,177,184,201,117,170,161, 33,129,250,230,197,219, 99,114,250,118,112, 79, 70,225,206,208,  1,  8,198, 48, 72,
-158, 94,  3,230,118,  5, 16,224,  7,126,213, 22,252,252,201,105,128,199,115, 41, 45, 77, 29, 10,208,242, 44,125,202,138, 21, 43,
- 80, 81, 81,129,245,235,215,163,111,223,190, 88,182,108, 25,  6, 12, 24,  0,189, 94, 95,215, 66,179,169,212,127, 53,241, 59, 75,
-208,238, 14,  7, 52,164, 72,184, 44,199, 58,139,163,166,109,184, 59, 52,102, 79,254, 53,100, 99, 85,  2, 92, 28, 14,240, 61,127,
-254,252,167,175,188,242,202,145,222,189,123,251,  1,192,146, 37, 75,144,159,159, 15,  0, 24, 50,100,  8,118,236,216,129,225,195,
-135,123, 79,155, 54,173, 32, 39, 39, 39,251,249,231,159,159,246,251,239,191,223,147,179, 65,193, 65,236,245,235,  5, 76,142,236,
-224,190, 78,157, 58,231, 68, 69, 74, 47,242,124, 37,229, 60, 34,212, 82, 34,129,142, 18,123,105,104, 62,143,  6,103,226,177, 98,
-147,175,166,180,202,231,228,161,179,131, 90,  5,134,237,112,168,140,218,141,249,239,220,185,243,185, 73,147, 38,125,109,115,251,
-171,213,106, 74, 40, 20, 54,185, 34,217,220,254,217,217,217,247,215,  3, 96,179,242,163, 59,118,134,161,162,  2,218, 18, 11,  9,
-142,180, 90,135,174,122,  1,174,255,113,237, 30,217,245,157, 87, 93, 40,115, 41,241, 77, 37,127,123,226,231, 56,206, 54,198, 95,
-  3,147,201, 84,115, 40,149, 74,104,181, 90,200,229,242,191,172,231,176,205,243,223,191,127,127, 93, 79,  0,151,158,158,142, 62,
-125,250,192, 96,208,215,116,116,233,233,233, 46,185,235,215,125,182, 14, 38,147,  9,237,194,195, 97, 50,155, 27, 34,127, 87, 58,
- 18, 82,143,235,191,102,234, 98, 99,158,140,123, 20,  0,218, 84, 67,254,167, 78,158,130, 78,175,135, 70,163,129, 74,165,130, 82,
-169,172,101,217,185, 10,219, 48, 64, 19,198,253, 81, 85, 89,133,170,170, 74, 84, 86,201, 81, 89, 85,133,170,170, 42, 84, 85, 90,
- 44,210,110,221,187, 67,110,253,223, 85,235, 31,  0,250,247,239,127,215,234,247,246,134,143,143, 47,124,125,124,161,209,104, 98,
-155, 72,254,110, 15,  7, 20,172,156,  5,193,211,107, 16,140, 97,224,231,174,129,105,251,107, 64,128, 31,118,191, 26,143,162,221,
- 55, 48, 33,117, 19,192,255,139,151, 21, 49, 20, 65, 18, 46,129, 86,171,133,193, 96,128, 78,167, 67,110,110, 46, 62,252,240,195,
-122, 31,247,242,178,121, 80,174,185, 67,222,238, 90,213,246,249, 75,156, 60,111,138,146,225,106,155,173, 37, 39, 51, 51,147, 36,
- 36, 36,216,200,223,109,207,  4,159,207, 39, 12,195,212, 85, 10,224,106, 44,192,166, 77,155,174, 38, 36, 36,244,221,188,121,243,
-200,163, 71,143,250,142, 30, 61,250,164,141,252,173,  6, 36, 68, 34, 17, 87, 84, 84, 36,216,183,111, 95,215,192,192,192, 83,195,
-134, 13, 43,168, 79,214, 51, 83,158, 97, 59, 71,117,209, 12, 25, 50, 36,254,226,197, 63, 31, 81,107, 53,173, 57,198,196,128,130,
-137, 49, 82, 70,163,209,168, 87,163, 76,205, 26, 13,154,210,226, 50,230,231, 61,123, 83, 90,  5,135,148,211,180,206,161,249, 94,
-159,245,175, 80, 40,248,  0,224,231,231,215, 98,135,  5,168,134,172,255,173,255,122,215,162, 53,151,221,174,117,207,213, 88,128,
-137, 19, 39,198,174,123,121, 53,  0, 75,192,223,174, 93,187,100, 54,210,183,173,  9, 16,247,205, 83,  0,128, 51,169,191,217,226,
-  3,254, 42,212, 84,198,146,146,146, 26,107,223, 70,250,118,133, 11,141, 70,  3,131,193, 96,215,137,252,117,105,156, 61,219, 18,
-251, 97, 98, 24, 92,188,120, 17,191,159, 57,131,190,125,250,194, 96, 48, 64,175, 55,192,160,215,227,219,111,190,129,237, 57,103,
- 26,122, 90, 90, 26,122,116,239,  1,147,201,132,171, 87,175,130, 49,209, 40, 45, 41,109,214, 60,181,157, 91,215, 44,176,173, 93,
-224,216,  3, 96, 50,130, 49, 91,220,254, 39, 78,252,  6,173, 94,139,106,141, 26, 42,149, 10, 10,165, 18, 10,133,188, 73,138,152,
-205, 19,224,166,245, 15,  0, 56,114,228,  8, 52, 26, 13, 52, 26,181,245, 83,131, 86,193,193,232,214,189, 59, 46, 95,186,132,195,
- 71,142,184, 44,211,102,253,243,249,  2,120,121,121,193,199,199,  7,190, 62, 62,240,241,241,130, 92, 33,143, 77, 78, 78,206,113,
-170,205, 53,193,213,223, 16,206, 21, 84,193,116, 97, 41,170,112, 12,100,220, 42,144, 97,255, 70,193,202, 89,120, 50,245,107,136,
-  5, 20, 32,224, 91, 14,119, 88,199,205,161,128,210,241,159, 33,104,203,120,232,116, 58,  4,  5,  5, 65,161, 80, 64,161, 80,224,
-248,241,227,184,125,251,118,141,155,184,230,249,210, 82,188, 26, 40, 65, 43,175,138,198, 44,224, 88,123, 82, 77, 72, 72,136,177,
-187, 23, 83,231, 94,172,139,237,130,107,132,192,155, 99, 70,129,203,150,127,125,239,155,153,153, 73,182,109,219, 70,154,248,190,
-181,148,  0,119,200,223,134,247,222,123,239,252, 83, 79, 61, 53,109,197,138, 21, 93,207,157, 59, 55, 76, 34,145,240,158,124,242,
- 73, 34, 18,137,192,178, 44, 25, 55,110,220,249,249,243,231,247,233,213,171,215,238,151, 94,122,233,185,151, 94,122,169,193,177,
-168,228, 57,201,236,159,151,174,158,234,213,187,207,179,167, 78,158,156,188,123,207, 79, 31,228,157, 60,217,250, 98,254,101,241,
-213,210,  2,238,219,213, 63, 72, 86,164,173,236,145,189,103, 79, 90,167,142,157,126,246,  9,243, 62,178,105,211, 38,179,179, 57,
- 58,122,244,104,156, 58,117,170, 95,122,122,250, 82,131,193, 32, 88,182,108,217, 71,187,119,239,158, 90, 90, 90,250,151, 19,135,
- 83,101,212,208,141,224, 27,133,144,  3, 53,214,191, 13, 35, 67, 66,176, 10,151,157,183, 58,172, 46,254,203,167, 47, 34,160,107,
- 43,196,125,243, 20,118,205,248, 81,102,211,222,108,228,111,179,254, 93,153,101,176, 99, 69,191,230, 97, 88, 66,112,233,210, 37,
-216, 42,107, 93,247,178, 64, 32,128, 64, 32, 64, 69, 69,  5,198,141, 27,247, 32,202,137, 72,165, 82, 46, 61, 61, 29,131,  6, 13,
-130,193,104,132,222,160,135,193, 26,220,164, 55, 88,134,  1,214,174, 93,139,185,115,231, 58,234, 76,184,212,212, 84,152,205,102,
-156, 62,125,  6,  2,190,197,109,219,185,115,103,220, 40, 44, 68,105,105, 41,182,108,249, 30, 83,167, 62,  3,  0, 92, 29, 79, 64,
-131, 29, 80, 70, 70,134, 16,  0,147,156,156,204,214,103,  1,185, 50, 85,209,102,249,231,230,230, 66, 91,173,171, 81,192,212, 26,
- 53,212,106, 21,212,106,247,134,  0,236,173,255,169, 83,167,214,120,  0, 92, 85,  4,166, 78,157, 90,235, 60, 74, 42, 69,183,238,
-150,160,184,203,151, 46,225,134,213,227, 49,117,234, 84,151,163,246,135, 62, 60, 20, 34,161,  8, 18,137,  4, 98,177, 24, 34,145,
-  8,101,101,101, 78,147,191,157,181,223,172, 21,112,242,135, 27,176,  3,192,216, 21, 79,128,203,124, 11, 36, 49, 13,231, 10,170,
- 64,130,  2,113,173, 68,109,177,254, 93, 28,  2,176,107,127,196,166,  8,216,159, 59,132, 94, 15,240, 44,198,222, 93,247,190,133,
-232, 77, 38, 19,190,248,226, 11,140, 28,121, 55, 46,236,224,204,112,160, 92,135,174,123, 21,232, 23, 18, 89,175,200,122,162,220,
-237,135, 60,101, 14,158,117,150,176, 73, 19, 60, 10,141,121, 35, 92, 86, 36,238,247,251, 90,149,128, 38,207,  2, 88,177, 98,197,
-150,121,243,230,133,156, 61,127, 62, 81,175,215,247,145,201, 14, 73, 68, 98, 17,159, 34, 20, 14, 29, 58,228,219,163, 71,143, 77,
-  9,  9,  9,255,158, 60,121,178, 67,107, 61,231,208,  1,118,194, 83, 19, 14,247,237,219,127, 33,205, 24,199, 94,203,191,250,  1,
- 91, 88,192,  0,224,196,160, 76,189, 59,117,205, 12, 13, 13,217,203,227, 11,191,253,207,226, 20,250,147,101, 31, 59, 44,165, 65,
-131,  6,125, 60,122,244,104,  0, 64, 69, 69,  5,178,179,179,253,190,250,234,171, 15,  0,224,212,169, 83,131,122,246,236,185,255,
-111,161,  0,216, 22,254,121,244,219,205,142, 44,123, 87,166,  4,146,157, 11,183,114,  3, 22, 14, 65,112,239,214, 53,164, 95,227,
- 78,189, 80,134, 51,169,191,185,234,182,106,174, 57,169,  4,  0,215,189,123,119, 92,184,112,161, 22,177, 40,149,202,  2,  0, 29,
- 93,212,230,239,167, 39,224,158,223,252,246,155,111, 97, 48, 24, 96,164,141,160,105, 26,169,169,169,141, 45,146,195,165,166,166,
-214,156,176,172, 25, 98,137, 15,244,122,  3, 46, 93,188,  8,190, 64,  0, 19, 77,195,203,219, 11, 91,182,108,  1,143,199, 67, 98,
- 98, 34, 30,125,244, 81,174,170,170,225,  0,175,212,212,212,253,201,201,201,116, 70, 70, 70,168, 45,111,234,172,  3,224,146,107,
-115,225,194,133, 56,118,236, 24,170,171,171, 81,173,213, 66,163, 86, 91,201, 95, 13,141, 90,131,106, 77, 53,180,118, 29,190, 51,
-121, 23, 29, 29,205,229,229,229,213, 88,255,245, 77,  3,116,118, 17, 32,235, 92,252, 90,101, 97, 35,125,219,216,163, 43,171, 20,
-218, 86,248,  3,  0, 31, 47, 31,136, 37, 98,104, 52,154, 88,219,208,142, 27,228,127, 95,230,107,219,148,128, 73, 43,190,  2,183,
- 29,104, 53, 51,  3, 57,175,199, 99,120,202,119,128, 64,  0,111,113,211,198, 57,235, 42,  2,  0, 48,245,216, 84,  7,223,186,131,
-222,251,189, 80,246,147, 14,138,229,119,175,154, 76, 38,140, 24, 49,  2,  0, 16, 30, 40,193,175, 25,237,177,242,195,155,248,236,
-140,222,145, 69,108, 63, 45, 14, 13,253,111,247,108,142, 27,125, 86,115,205,173,111,142, 49,255,251,249,190, 53, 74, 64,115,212,
-191, 79, 63,253,244,211,231,103, 62,191,239,161,129,209,131, 52,106,117, 16, 99,102,140, 97, 97, 97, 21,225,225,225,101,106,181,
-250,220,228,201,147,157,238, 20,126,250,241, 39, 22,192,150,103,167,191,152, 59,108,248,240, 31, 37, 18,137, 63,  1,199, 18, 66,
-192,178,156, 74,175, 85,200,174,156, 47,214,120,139,132, 78,245,243, 54,242,  7, 44,129,212,117,  3,245, 62,252,240,195,127,255,
- 45, 20,  0, 43,169, 59, 44,176, 93,187,118,185, 92, 89,207,164,254,198,  1,128, 77, 17,176, 35,254,230, 36,116,183, 27, 82,239,
-222,189,113,234,212, 41, 84, 84,212,184,  8, 59,  2,128,141,252,102,204,152,241,160,203,171, 86, 30,165,167,167,115,207,206,120,
- 22,107,215,174,179,142,153, 51, 88,184,112, 97,163,211,151, 92, 92, 65,207, 98, 57, 29, 60,232,104,179,137,238,169,169,169, 87,
-147,147,147,203, 51, 50, 50,120,201,201,201, 53,  1,129,214,105,129, 78,119,116, 54,139,121,216,176, 97,205,158,119,209,209,209,
-156,189, 21,111, 31,  3,224,198, 10,128,  4,  0,183,101,203,150,123,172,124,171,135,192,229,250,188,101,203, 22,226,170,199,192,
- 25, 52,230,250,119, 85, 89,152,252,225,  6,192,110,225,159, 81,239,222,157,142,172,109,174,130,178,243,  0, 56, 90,  9,176,116,
- 88, 41, 74,  1, 12, 88, 25,136,229,167,187, 32,  4, 64, 69,129, 22,157, 58,117,178,144,198,242, 64, 60,246, 80,  8,162, 30,203,
-119,214, 34,118,122,120,211,250, 44,113,183,191,105,166, 62,175, 73,178,254,162,247,109, 54,108,216,184,225, 42,128,171,205, 37,
-239,219,239,190, 44, 68, 51, 68,133, 54,103, 96,158, 21, 11,254,138,252,252,171, 55,  3, 34, 19, 39, 78,140,217,149,218, 34,247,
-  2, 32,  0,184,135, 30,122,  8,123,247,238, 53, 88, 73,159,  5,224,117,159, 60, 15, 77,134, 45, 72,112,238,220, 57,156,213,242,
-127, 32,105, 91,184,112, 97,100,125,110, 73,187,105,132,174, 88, 59,228, 62,151,113, 77,122,154,186,236,111, 67,171,242,185, 74,
-226,142,214,246,111, 14, 52,101, 72, 96,209,162, 69,184,126,253,122,179,165,197,153,229,125, 93,197,153,183, 21, 56,  3, 75, 96,
-232,200,  4,  9,126, 57,209,  5, 97, 94, 62,248, 51,239, 14,186, 58, 73,254, 78,212,191,150,186, 28, 46,185, 79,223,245, 44,207,
-238, 28,218, 54,179,188,180,191, 42,225,127,249,110,128,117, 61, 12,110,120, 18,238,187, 18, 48,110,220, 56,241,223,172,  2,186,
-101,217, 55,215,111,103,100,100,216, 86,168, 97,146,147,147,155, 58,149,201,131,230, 39,255, 38,149, 69, 74, 74, 74,179,148,101,
- 70, 70,  6, 63,121,120,242,125,175, 23, 71, 50,245, 56,146,153,223,226,219,172,167,102,122,240,192, 43,161,187,251,  8,123,224,
-129,  7, 30,120,224,129,  7,127, 95, 80,158, 44,240,192,  3, 15, 60,240,192,  3,143,  2,224,129,  7, 30,120,224,129,  7, 30,120,
- 20,  0, 15, 60,240,192,  3, 15, 60,240,192,163,  0,120,224,129,  7, 30,120,224,129,  7,255,  8,212,154,  5,112,246,236, 89,183,
- 35, 83,235, 11, 38,244,200,243,200,243,200,243,200,115, 82, 94,163,211, 68, 91,128, 60, 79,249,122,228,213,194, 43,175,188,210,
- 14,128,  2,128,208,186,213,121,139, 74,159,199,  3,224,129,  7, 30,192,223,223,159,242,247,247, 39,254,254,254,  2,  0,188,150,
-150, 62,219,190,243,118,251,207, 55, 21,245,173,143,239, 65, 11,194, 19, 79, 60, 17,243, 15,120, 13,219,218, 87,146,191,235, 11,
-120, 20,128,127, 56,154,176,221,186,203,136,139,139,139,177,118,186, 53,135,245,218, 63, 82, 94, 11,  7,137, 12, 11, 35,  0,160,
- 82,169, 88,149, 74,197,169, 84, 42, 19,  0,179, 59,194, 94,126,172,119,201,172,177,189, 39,  2,192,172,177,189,191,121,249,177,
-222,235,  0, 96,225,164,135,200,194,167,163,  5, 47,143,233,229,214,154, 34,246, 75,209,102,102,102,214,218,124,167, 41,228,111,
- 87,239,155,115,173,253,166,202,108, 14,121,220,125, 80,108,254, 82, 69,233,137, 39,158,136,217,187,119,175,236, 31,208,198, 12,
-176, 44, 22,119, 95,121,180, 77,176,136,234,220, 58,148, 31, 33,109, 71,133,  5,  4, 11,189, 69,130,102,251, 61, 62,254, 25,160,
-172, 90,152,222, 90, 32, 30,216, 41,  0, 78,236,173, 98,  4, 32,106,234, 79,101,101,101, 33, 45, 45,173,214,242,127, 11, 22, 44,
-176, 53,116,226,142, 60,246,135,192,218,  5, 61, 37,171,165,200,107,241, 69, 31,229, 45,225,162, 58, 72,  1,  0,101, 52, 51,189,
-181,144,255,157,237,230,101,117,181,168,172,178,146,118, 70,208, 75, 99,122,229,155,205, 92,248,195, 67, 91,249,117,237, 58,236,
-128, 72, 68, 21,205, 73, 25,244,159,255,146, 11,184,163,210, 61, 33,224,147,159,  0,114, 17, 64, 79, 87, 19, 89,119, 41,218, 38,
- 46, 55, 91,139,252,237,234,190,187, 75,229, 18, 23,175,223,119,121,  9,  9,  9,182, 53,250, 29,190, 83, 66, 66,  2,151,153,153,
- 73, 92,200, 59,210, 12,114,156, 34,127,150,101, 65,  8,193,200,145, 35,185, 35, 71,142, 16, 23,203, 88,  8,192,212, 28,233,  9,
- 10, 10,154, 37,151,203, 63,119,243,235,126,  0,148,104,190, 85,176,107, 97, 88,159,126,212,179,225, 81, 98,101, 68, 43, 97,104,
-247,112, 62,159,132, 82, 58,149,138, 17, 35,140,166,250,183,163,159,155, 48,134,110,234,111, 56,171, 73,132,  0,120,220,250,217,
-210,224,  7,224, 41,  0,233,214, 79,191,102,146,251,125, 75,179,176,221, 42, 96,202, 97, 17, 15,178, 54,168,208,166,144,205,252,
-249,243,239, 33,127,  0, 72, 75, 75,139,157, 63,127,190,203, 86,206,198,215,188,239, 33,107,  0, 96,127,  8,196,198,215,188, 31,
-168,188,212,212,212, 24,138,162,184,103,158,185,187,164,237, 43,175,188, 18,  3,128,139,136,136,224,218,181,107,199,  5,  7,  7,
-115, 79, 63,253,180, 83, 50, 55,164,126, 20,115,156, 26,194, 45,141,142,175,177,126,215, 45, 93, 23, 51, 15,171,185, 57, 17, 27,
-184, 25,237,182,114,227,131,247,115,131, 58, 44,115,202, 58,238,208, 46,172,117, 76,  7, 41,247,218,156, 25,198,229,111,189,200,
- 45,124, 97, 26, 90, 11,249,223,189, 59,251, 89,172,124,227,101,110,217,220, 23,216,110,126, 62, 70,  0,104,221, 58,152,111, 45,
-255,122,113,102,231,211,157,195,195,189,  2,158,153, 18,153, 54,113, 82,123,  1,203,177,210,144, 86, 34,239,143, 95, 63,145, 54,
-239,169,126,223, 62,254, 88,155,200,136,  8,239,226,127, 47,238,237,238, 54,153,246, 27, 69,185,180,105,148,  3,203, 31,205,224,
-  9,104,113, 30,128,204,204, 76,146,144,144, 80,243,189,132,132,  4,174,190,161, 19, 43,105, 59,173, 84, 52,148, 14, 59, 57, 77,
-238,232,236,201,127,193,130,  5, 24, 57,114, 36,247,235,175,191,186, 35,138,110, 70,227,181, 44, 40, 40,104,146,155,223, 13,183,
- 26,156, 82,  0, 72, 74, 74,138, 76, 74, 74,218,147,148,148,148,107,119,236, 76, 74, 74,114,105, 27,229, 79,214,127,194, 79, 93,
-150,226,247,248,147,147,194, 21,  3,123,118,224,183, 13,239,168, 54,136, 59, 86,155,245,237,137,159,119, 91, 58,204, 20,198,148,
-221, 10,248,250,139,141, 66, 23,121,220, 45,  5,160, 61,128,111,  0,196, 91, 63,219,183, 32,126, 11,  6,176,197,170,156, 28,  7,
- 48,214,122, 30,220, 12,178,167,192,137,241,210,150,174,  0, 56,129, 33,  0,174,  0,136,114,199,186,177,185,208, 35, 34, 34, 98,
-237,173,126, 59,203,191,230,158, 51,238,118,219, 51, 73,195,133,118, 86,186,  2,212, 20, 69,205,185,237,222,131,144,  7,  0, 39,
- 78,156,144,137,197, 98,228,230,230,222,163,108, 21, 23, 23,147,146,146, 18, 50,100,200,144,216, 61,123,246, 56,149,135,173, 79,
- 92,148,113, 98,  1,250, 84,  8,107, 89,195,132,226,176,174,248,121,242, 77, 73, 34,145,142,189, 16,203,220, 26,239,208,109, 26,
-211, 65,202, 69,  8, 37,183,223,124,117,186,177,157,143, 80,168,186,120,140,120,149,159,199,188, 17,157,209, 54, 64,130,242, 51,
- 71,201,157,211,199,168,  5,179,102,208, 49, 29,164, 92, 55, 47, 95,147,181, 67,173, 23,173, 90,  9, 71,  9,133,148,248,248,241,
-219,243, 79,157,188,213, 61,172, 93,  7, 83, 64,171,118,196,215, 23, 94, 29,162,188,162,130,130, 68,157, 88,142, 51,254,124,178,
- 92,251,  0,235, 48,103,111,241,219, 14, 55,149,  0,174,158,207,186, 71,125,207,253, 85,242,106,148,  0,185,124, 52, 50, 50, 20,
-104, 10,249, 55,166, 84,212,145,211, 36, 15,192, 19, 79, 60, 17,179,103,207, 30, 25, 33,  4, 20, 69, 33, 47, 47, 15, 71,143, 30,
-117, 75,150,217,108, 62,111,245,  0, 52, 71, 60,139, 68, 46,151,239, 12, 10, 10,122,218,141,239,218, 60,206,154,164,164,164, 94,
-  0, 14, 28, 60,120,112, 92, 86, 86,214, 16,219,145,157,157,253,148, 76, 38, 59,148,148,148,228,212,144,199,130, 69, 11,196,149,
-183, 42,130,245,156, 49,130,227,147,110,156, 72,212,157, 21,  8,187,179,132,234,204, 18,126, 39,134,199,139,100, 89, 18,174, 37,
-230, 80, 70, 72,  5,126,113,108,175, 88,252,100,232,125, 85,  0, 62,  1,112, 16,192, 60,235,231, 39, 77,200,236, 64,  0, 75,  0,
-236,177, 86,244, 61,214,243, 64, 55,229, 29,  1,176, 23, 64, 50,128,245,  0,222,176,202, 60,210,196, 74,225,111,253,244,110,  6,
- 11, 27, 86, 11,107, 73, 99,150,214,  3,196, 67,  0,142,  1,104,109, 85,158,158,117,229,203, 89, 89, 89, 50,123,203,127,193,130,
-  5,178,180,180,180,216,180,180,180, 88,123, 37, 32, 45, 45, 45, 54, 43, 43, 75,230,140, 60,123, 75,157,154,162,192,213,189, 51,
-112,117,239,140, 90,164,205,254, 16,  8,119,229,217, 44, 77,119,228,165,167,167,199, 28, 63,126, 28,211,167, 79, 71,113,113, 49,
-146,147,147, 99,234,123, 70, 44, 22,203,218,180,105,227, 48,255, 50,210,211, 99,218, 28,255,  3, 37,211,135, 65, 88,172,194,231,
- 75, 62,142,169,109, 28,  3,233,233, 25, 49,  2, 67,132, 44,168,141,222, 33,249,207,122,105, 10,253,175,249, 51, 56, 97,209, 25,
- 97,224,157, 11,228,194,109, 53,194, 67,188,241,112,143, 48,180, 85, 94,193,117,141, 30,124,150, 67,  0,225,  9,254,239,197,233,
-220,107,175,188,112, 37,166,131,180, 65,210, 81, 40, 53, 65,131,  6,249,164,245, 30,242,184,201, 55,168,163,200, 39, 32,148,149,
-248,120, 27,131, 90,  5, 27, 66,194,219,243, 21,114,141, 72,173, 98,160, 80, 25, 93,113, 99,199, 56, 67,156, 78,198,  3,220, 99,
-249,215,167,148,187,160,  4,144,122, 62,235, 30,245, 61,231,148, 60,110,107,224, 61,135,139,242, 26,202,211, 38,145,118, 93,165,
- 34, 35, 67,129,230, 34,127,138,162,184,125,251,246,201, 88,150,197,235,175,191, 14, 66,  8,142, 30, 61, 10,203,214,187, 44,113,
- 67, 30,104,154,254, 29,  0,211, 12,158,  0, 57,  0,200,229,242,237, 65, 65, 65,177, 46,126,151, 15,  0, 51,103,206, 20,  1,200,
-202,206,206,238,178,108,217, 50,166,174, 18, 26, 28, 28,140, 67,135, 14,197, 36, 37, 37, 57,212,202,120, 68,224, 71, 51, 92, 91,
-163,209,212,197,204,178,189,204, 44, 59,192, 76, 72, 47,240,120,237,  9, 33,109, 64,120, 97, 44,135,  8,142,102,219,169,245,166,
-144, 80, 63, 70, 72, 13,210,220, 55,  5, 32,220,106,241,175,132,101,156, 99,165,245, 60,220,141,223,154,  1,160,216, 90,153, 22,
-  1,  8,178,126, 18,235,117, 87,247,218,253, 55,128,107,  0,214,  1, 16,192, 50,134,205,  0,248,204,122,189, 41,251, 47,143,  4,
- 80,  1, 96, 84, 51,145,236, 11,  0,222,183,126,182, 52,244,  4,240, 35,128, 71,173,158,148,158,238, 10,178,145,191, 61,233,219,
- 43,  1, 46, 87, 78, 43,249,219, 80, 87,  9,112, 71, 94,157,206,140,184, 42,239,240,225,195,160,105, 26,  3,  7, 14,140,237,214,
-173, 27, 10, 11, 11,107,222,143,101, 89, 72,165, 82,110,241,226,197,178,227,199,143, 99,220,184,113, 14, 59, 20, 67,238, 41, 80,
- 52,  3,229, 64,105,172,177, 91, 48,174,109, 56,124,151,180, 88, 14,115,164, 27,184,195,139,131,101, 55,142,251, 35,238,249,171,
-142, 59, 40,138, 87, 93,113, 33,151, 45, 83, 26, 80, 85, 77,115,241,253, 34, 56,127,137, 16,183,148, 90, 84,168,244, 72,236, 31,
-193, 81,132,112,191,253,180, 31,170, 35, 39,184, 51, 59,127, 46,106, 76, 92,238,239,109,231,132,132,250,117,108, 27, 17,197,120,
- 73,216,142, 35, 31, 79,244,233, 48, 48,121,124,235, 46, 79,198,  5,181,141,238, 43,175,110, 29,111,162, 77,166,235,  5, 90,167,
-134,222,172,  4,229, 84,157,200,204,204,148, 57,152, 25, 80,239, 61, 39, 98, 94,254, 17,179,  3,146,147,  3,145,156,124, 87,185,
-181, 17,119,115,144,118, 61, 10,140,219,150, 63,199,113, 48,153,238, 14,217, 15, 31, 62,220,214, 94,220,149,109, 18,  8,  4, 38,
-150,101,143, 91, 61,  1, 77, 81,  2,106,134, 62,229,114,185, 44, 40, 40, 40,217,133,239, 22, 38, 38, 38,250, 29, 62,124,120, 69,
-118,118,118,235,175,191,254,154, 93,188,120, 49,127,243,230,205,232,210,165, 11,  0, 32, 50, 50, 18, 42,149, 10, 75,151, 46, 53,
- 31, 58,116, 40, 62, 41, 41,233,213, 70, 37,178,140,191,217,204, 68,154, 25,115, 79,147,217,212,159, 71,145, 40, 33,159, 18,137,
-  5, 60, 53,223, 75,120,219,219,151,119,135, 39,230,140, 98, 30, 47,136,207,208,109,110,156,249,221,119, 70,200, 39,110,199,189,
- 57, 82,  0, 30,179, 90,135,246, 56,102,189,238, 10,166,  1,120, 29,150,177,146,247,  1,252,  1,203,252,201, 63,172,231, 82,235,
-253,105, 78,202,243,  2, 48, 11, 64,146,245,220,104,119,192,122,125, 22,238,221,202,215, 89, 76,  1,240,149,245,179,169,120, 30,
-192, 28,107,158,205,177,158,183, 20,116,178,186,176,126,  6, 48, 23,192,108,  0, 49,240,160, 65,148,150,150,202,  6, 15, 30,140,
-217,179,103,231, 12, 30, 60, 24, 39, 78,156,192,250,245,235, 99, 90,183,110, 45,163, 40, 10,133,133,133,164,178,178,146,188,246,
-218,107,177, 71,142, 28,145,189,244,210, 75,141,146,205,208, 27,183,100,101,131,187, 35,121,246,236,156, 63,195,204,177, 61, 85,
- 65,178,140,245, 25, 49, 22,237,  4, 88, 87,248, 60,217, 82, 25, 79, 70,190, 86, 26,123, 52, 83, 42,139,125,120,101,131,229, 83,
- 66, 51,171, 62,255,124,115,208,246,243,165, 55, 55,159, 41, 86,110, 56,126, 93,123,163,204,192, 81, 28,  5,131,206,140,138, 10,
- 26,121,197, 10,243,174,194, 82,205,158, 91,101,202, 29, 69, 37,151,143,149,149,143,185,105, 52,125,212,144, 76,191,192,240,118,
-250,106, 69,219, 30,209,143, 80, 52,137, 28, 89,122,249, 71,125, 96,144,183,164, 67,247,126, 21, 28, 83,113,158,240,252, 66, 88,
-150,229,221,185,163,119,198,139, 87,215, 53, 93,159, 27,188, 86,148,187, 19,227,207,164,174,165,111, 59,238,  7,161,181, 20, 52,
- 22,148,103,231,206,111, 18,154, 67, 78,117,117,181, 12,  0,248,124, 62,222,122,235, 45,228,229,229,193,205,113,127,123, 24,  1,
- 24,141, 70,163,177,180,180, 52, 11, 77, 11,  8,212,212,114,  7,200,229, 25, 65, 65, 65, 19,156,245, 20, 27, 12,134,254, 11, 23,
- 46,124,242,149, 87, 94,225,122,247,238, 77,  0, 96,201,146, 37,200,207,183,236, 70, 57,100,200, 16,176, 44,139,225,195,135, 83,
-211,166, 77,227, 46, 95,190,188,238,249,231,159,127,222,203,171,126,106, 98, 89,206,144,115,240,224,182,194,194,235,207,155, 77,
-230, 48,158, 64, 98,224, 17,177,138, 18,  9, 85,148,216,171,156, 22,120, 85,130, 18,221,102,197,102,131, 70, 85,213, 74,182,251,
-236,123,230, 83,191,187, 29,247,230, 72,  1, 24,  3,224, 80,157,107,135,172,215,157,  5, 15,192,187,  0, 18,  1, 84, 53,240, 76,
-149,245,254,187,112,110, 92,103, 26,128,  3,  0, 84, 13,220, 87, 89,239, 79,115, 35, 79, 30,129, 37,134,224, 67,235,231, 35, 77,
-168, 92,241, 86,175,201, 16,107,122,134, 88,207,227, 93,148, 19,  8, 32,192,137,195,213,161,148,161,  0,157, 16, 39,240,  0,  0,
- 32,  0, 73, 68, 65, 84, 78,226,110,  4,112,145,213,211,227, 86,156, 71, 93,139,191,174, 71,192, 85,176, 63,  4,162,243,184,111,
-106,206, 59,143,251,166,222, 64, 62, 87,228,213, 33, 19,206, 21,121,107,215,174,229,242,242,242,112,250,244,105,180,107,215,142,
-251,229,151, 95,160, 86,171,113,233,210,165,123, 44,218,119,223,125, 55,167, 71,143, 30,177, 91,183,110,109, 80,222, 23,107,215,
-114,237,243, 46, 32,244,116, 62,100,237,198,113,189,175, 48, 50, 74,109,130,249, 82,245, 61,207,190,249,238,139, 57, 17,209,167,
- 99,139,254,152,210,160,245,124,173,164,228,237, 18,154, 89, 85, 81,169,151,210,122,115, 96,254, 45,181,207,158,203,165, 85,198,
-200,190,232, 17, 26,  4,  0,216,115,246, 14,191,160,172,218, 15, 64, 96, 25,109,232,113,211,104, 74, 40, 40, 45,125,187, 33,153,
-163,198, 39, 82,221, 70,126,208,155,209,254, 81, 28,209,125,180, 68, 32, 48,211,215,254,200, 82,150, 22, 95,186, 83, 94,252, 91,
-177, 90, 94, 10, 80, 20,145,107,104,255, 89,137,253, 29,213, 27, 82,135, 84,234,115,171,215, 10,  4,180, 62,255, 87, 69,227,255,
-237, 96,111,245,215,245,  8,184,235, 85,  8, 10,202,110,178, 28,  0, 24, 57,114, 36,119,248,240, 97,176, 63,  4,128,227, 56,124,
-252,241,199, 56,114,228,136, 77, 81,115,187, 12, 20, 10,133,145, 16, 50,226,212,169, 83,134,240,240,240,184, 38,122,117,  2,  0,
-203,108,  0,235,231, 12,  0,108, 80, 80,144, 51,134,154,106,247,238,221,165,251,247,239,255,106,243,230,205,228,232,209,163,100,
-244,232,209,156,141,252,  1,203,118,247, 34,145,  8, 69, 69, 69,216,183,111, 31,  9, 12, 12,100,134, 13, 27,246, 43,203,214,111,
-180,119,142,234,114,123,200,144, 33,179, 46, 94,252, 51, 66,173,213,132,113,140,201,  4, 10, 70,198, 72, 85, 27,141, 70,165, 26,
-101,183, 88,163,225, 78,105,113,153,241,231, 61,123,215,180, 10, 14, 41,162,105, 93,181,187,121,201,175,167, 97,216, 10,166,181,
-245, 56, 92, 71, 81, 56, 12, 96,  1,128,182,  0,202, 28,100, 62,129, 37,118,224, 56,128, 27, 14, 20,142, 27,214,231,230,161,225,
- 56,  3, 91,250, 38,  3, 72,113, 32,239,107, 88,134, 24,190,114,144, 62,251,138, 40,133, 37,206, 97, 32,  0, 53,128,247,  0,156,
-  6,208, 17, 64,161, 19, 46, 68,123,121,207,  0,120,209, 74,178,122,107, 90,245,214,243,116, 88,226,  1,190,119, 66,222, 12,  0,
-175, 56, 89,193,  9, 44,177, 16,223, 56, 72,223, 42,  0,190,176,196, 58,236,182,166, 77,108,213,164,255,  0, 48,216,234, 17,248,
- 21,119,227, 53,234, 69, 92, 92, 92,172, 61,209,219, 43,  1,117, 99,  3,226,226,226, 98,179,178,178, 26,125,129,184,184,184, 88,
-106,202,221,113,123,246,135, 64, 80, 86, 37,160,238, 88,190,219,242,166, 40, 56,119,228,157, 61,123, 22, 17, 17, 17,184,124,249,
-114, 77,157, 25, 54,108, 24,151,155,155,139,241,227,199,223,235,166,242,242,146,137,197, 98,168,213,234,122,229, 73,207,158,133,
- 50,162, 13,250, 93, 62, 81, 35,239, 77,191,199, 98,162,114, 85, 50,106,188,248, 30,197,169, 56,159,134, 72,108,178,212,204,134,
-149,128,133,104,215,238, 55,  0, 67, 56,112, 60,220,168,120, 67,199, 48, 96, 12, 22,231,216,197,138, 10,220, 48,208,155,248,132,
-104, 64,136,169,160,180,116, 91, 99,249,215, 86,218,109, 33,128,212,252,163,243, 11,197, 97,147, 21,165,101,226,118,101, 37,167,
-196, 16,  4,117, 42, 44, 50,135, 87,149,221,132, 80, 40,  8,237, 25,230, 61, 77,169, 49,125, 11,224,166, 35,203,213, 58,247,223,
-225, 48, 64, 66, 66, 66,108,102,102,102,142,203,236, 94,103,  8,224, 31, 16,168,219,100,175,128,139,223,231,154, 42,111,212,168,
-145,156, 76,150,  3,178,205, 18,143,125, 96,177, 47,198, 44,215, 96,228,200,145,112,113,218,223, 61,176,141,213, 63,252,240,195,
-186,102, 80,232, 20, 65, 65, 65,211,237,140, 83,163, 92, 46,223,227,228,119, 25,  0,229,187,118,237,146, 61,245,212, 83,209, 43,
- 86,172,232, 99, 54,155,137, 68, 34, 65, 92, 92, 28,126,249,229, 23,176, 44,139,113,227,198,113,243,231,207, 39,253,250,245, 51,
- 78,158, 60, 57, 50, 33, 33,225, 78,191,126,253,234, 87,192,230, 36, 51, 49,143,140,217,212,171,119, 31,255, 83, 39, 79,174,252,
-157,207,239,213, 33,178,195,151,126,193, 33, 37,130, 16, 49,119,120,223,161, 64,185,162,106, 68,120, 80,200,251, 93,186,116, 57,
-236, 19,230,189,254,147,101,159,211, 13,201,115, 85,  1,224,  1,136,  6, 48, 12,192, 50,  0,175, 89, 43,131,119, 29,242,251,  6,
-150,113,246,127,193, 50, 36,144,215,136,135,225, 33,171,245,235,140, 59,254,184,213,187, 64, 53, 34, 47,  4, 64,164,149,152, 27,
-147,121,218,250, 92, 40, 44,227,249, 13,201, 19, 90, 45,231, 36, 88,166, 17, 62,  3, 32,223, 42, 59,223,122,190, 25,150,113,242,
- 77,176, 12, 93,208, 14,228, 77,  1,240,  5,128,110, 86, 37,201, 62,157,183, 97,  9, 90,188,108,125,246,  7,  7,242, 94,135,101,
-118,131,206,137,252,243,  2,176, 31,192,119, 14,202,227,105,  0,255,177,126,254,110,151, 62,129,181, 44, 51,  1,172,  1,176,220,
-122,255,118, 67, 63,152,149,149,149,  3,  0,197,197,197, 50, 91,180,127, 93,171,191,184,184, 88,102,255,108, 99,176, 61,179,233,
- 87,186, 38, 58,191,174,149,190,233, 87, 26, 15, 66, 94,110,110, 46, 70,140, 24,129,203,151, 47,223, 37,113,169, 52,118,235,214,
-173,178, 14, 29, 58,196,178, 44, 43,139,140,140,228, 88,150,133, 94,175,199,207, 63,255,140,232,232,232,216,125,251,246,213, 43,
-175,107,110, 46,190, 15, 14,173,149, 87,221,231,142,129,118,229, 77,224,209, 80,112, 44, 48, 39,242, 43,174,154,245,129, 92,239,
-  7,121,126, 16,250,142,216, 29,123,105, 71,227,110,246,107, 37, 37,219,  1,108,239, 24,209,182, 43,128, 55,140,102, 22,219,206,
- 23, 98, 68,152,101,184,147,112,156, 70,195, 48,203,202,203,203,239, 56, 65,166, 43, 57,142,243,206,191, 44,127, 86,121,122,107,
-171,242,219,114,148,223,209,128,207,175,242,174, 86,112, 80,170,205, 92,104,136, 48,128,207, 98,146,222,104,254,126,217,235, 15,
-  7,252,235,147,227, 74,  7, 68,147,227, 68,167, 77, 92,137,100,191,  7,163,173,158,151,236, 68, 87,191,105,243,134, 57,138,202,
-183,127,142, 56, 43,143, 36, 42,208, 68,121,247, 88,236,153,153,153, 24, 56,112, 96, 75,210, 69,184,156, 57, 23,  0, 27,249,159,
-103,176, 65,102,105, 99, 77, 37,127, 91,221,224,241,120, 33,124, 62,191,252,248,241,227, 95, 62,252,240,195,238,174,243,  0,  0,
- 17,114,185,124,157, 85,177,152, 34,151,203,127,176,125, 58,227, 84,  4, 80, 13,160,114,197,138, 21,125,231,205,155, 87,122,246,
-252,249, 54,122,189,158,200,100,135, 32, 18,139, 64, 17, 10,135, 14, 29, 34, 61,122,244,208, 37, 36, 36, 12,158, 60,121,178,195,
- 54,151,115,232,  0, 51,225,169,  9,107,250,246,237,223,129,102,140,143, 95,203,191,250, 34, 91, 88,240,  2,  0,136, 65,113,189,
- 59,117, 61, 21, 26, 26,146,195,227, 11,223,254,207,226,148,234, 79,150,125,236,118, 70,214,167,  0,188, 97,213,134,198,  3,184,
-  4,192,167,158,239,237,181, 90,236,241,176,204, 35, 79,106,196,253,223, 25,150,232,114,103, 20,128, 42,235,243,188, 70,228,197,
-  0,184,234,164,188,171,214,231,119, 52, 34,111, 22,128,153,  0, 46,  0,152,111,125, 47,123,217, 50,171,245, 63,199,106, 13,111,
-180, 90,217, 13,201,155, 97,205,143,126, 86, 47, 66,125,233, 84, 91,239,219, 60,  1, 27, 27,145,247,181,181, 83,240,114,178,243,
-250,218, 65,254,125,100,245,108, 28,176, 42, 53,168, 35,251, 23,  0, 61,172,101,145,111, 85,164, 28,186,118, 87,175, 94,205,  1,
-144, 53,211, 66, 64,100,230, 26, 45, 55,115,141,182,158,133,123,220, 10,114,106, 22,121,127,254,249, 39,249,243,207, 63,107, 93,
-251,238,187,239,114,  0,144, 31,126,248,  1,  0, 72, 81, 81,237,152,186,134,200, 31,  0,218,255,249, 39,  1,106,203,123,249,131,
-  5, 22,114,252,208,154,166,186, 33,122, 59, 92,232,133,205, 92, 33,248,  0,175, 26, 53,228,111,101,245, 59, 98,177,216,169, 69,
- 68, 56,142, 35,132,144, 37, 11, 19,123,122,133,181,139,156,192,194,171,115, 73,113, 25,207,100, 80,114,173, 67,125,136,143,183,
-128, 48, 38, 22, 10, 37,205, 16,  9,145,168, 52, 76,167, 70, 12,130,134,234,108,221,255, 31,164,139,222,126, 56,162, 33, 98,225,
-224,222, 44,128,230,144, 87,175,197,222,161, 67,  7,156, 62,125,186, 69,144, 63,251, 67, 32, 14,156,103,  0,  0, 27,101, 52,190,
- 63, 78,219,188, 48,164,185,202,199,108, 54, 87,  1,192,128,  1,  3,154,180, 32,144,141,252,173,168,180,126, 58,187,192,142,208,
-106,152,157,  1,128, 79, 63,253, 52,252,249,153,207, 47,122,104, 96,244, 12,141, 90,237,207,152, 25, 83, 88, 88,216,157,240,240,
-240,171,106,181,122,249,228,201,147,243,157, 77,215, 79, 63,254,196,  0,120,237,217,233, 47, 14, 31, 54,124,248,120,137, 68,210,
-138,128, 51, 91,102, 78,112, 85,122,173, 98,221,149,243,197,183,189, 69,194, 38, 45,124, 87, 87,  1, 48,195, 18,164,230,204, 56,
-252, 41,235, 97, 70,195,203,139,154, 97,137,168,119,118,190,166, 12, 64,182,  3,121,187, 96,  9, 90,115,  6,207, 58,145,190,207,
-  1,124,233,168,239,  7,240,170,221,119, 26,147,247,141,213, 99,224,  8,133, 86,203,222,153,244,185, 50,223,245,115,  7,242, 30,
-117, 66,158,205,219,176,209,154, 55,206, 44, 31, 75,226,226,226, 98,234, 70,253, 91,221,234, 57,238, 52,244,184,184,184, 24,187,
-149,250, 90,154,188, 22,143,235,165,183,141, 84,187,118, 27, 95, 89,153, 62,211,118,141, 22, 80,223, 25,116,236,254,178,226, 98,
-141, 83,153, 70,  8,247,159, 89, 67,200,123,159,255,182,240,231, 53,161, 59, 79,156,188, 61, 59,196,159,125,146, 10,242, 11,224,
- 56,128, 16,206,104,100,216, 50, 22,168,164,141,108, 64,233,109,189, 75,171,147, 89,221,252,178, 58,231, 45, 37, 11, 91,220, 74,
-128,127, 23, 60,182, 92,115,191,223,145,  5,208, 70, 44, 22,223, 30, 48, 96,192,163,103,206,156,105,178, 64,185, 92,126, 48, 40,
- 40,104,166, 92, 46,223,232,130,  2,192, 88, 61,167,  0,128, 13, 27, 55,164,192, 50, 60,221, 44,248,246,187, 47,127,133,101, 40,
-246,190,160, 62,  5,192,224,142,214,215, 72, 33, 25, 61,242,254,177,242,106,193, 74,164,164,206, 53,183, 43,103, 75,151,247,119,
-128, 92,167,123,  1,240, 50,  1,  8, 97,193,149, 26, 12,244,230,178,178,138,115,214,142,203, 41,188,247,249,111,220,143, 31,141,
- 37,227, 95,219,159, 11, 32, 55, 97,112,215, 55,130,130, 68,139,248, 60,194,221,174, 50, 92,185, 77, 51,155, 36,  2, 74, 44,225,
-243,120, 38,134, 21,187,146,190,204,204,204, 28,219,242,182,214, 79,183,148,177,123,166,254,217,185,254,157,152, 22,216, 88,189,
- 39, 46, 92,255,171,229,221, 55,197,167, 41, 74, 24, 53, 69,  1, 66,  8,158,156, 56,171,222, 62,100,215,143, 25,205,245,174,101,
-  0, 72,115,144,191,157, 18,176,209,133,199,  3,173,237, 72,251,119,237, 31,248,245, 84,196,230,140,152,241,200,251,103,203,243,
-160,165, 43,  0,114, 57, 39,151,203,103, 53, 85,206, 83,111,238,231,  0,224,217,145, 61,200,183, 71, 46,126,172,231,230,172,121,
-109,234,241, 30,180,150, 68,  5,  9,248,173, 64,136,206, 71,194,175,232,213,205, 47,127,219,  1,215,100, 91, 93,217, 77, 89,111,
-254,126,145,231,223,197,  3, 64, 90,146,215, 36, 35, 35,157, 75, 78,158, 77,118,253,152,241, 79,111, 94,225, 86,131,217, 23,150,
- 61,  1,254,118, 32,238,238, 35,236,129,  7, 30,252, 13, 53,126, 30,224, 37, 34, 96, 89, 14, 32,  4,213,122, 79,243,247,192,131,
-255,217,254,192,147,  5, 30,120,240,191,  3,198, 12,168,117, 78, 47, 59,239,129,  7, 30,252,131, 65,121,178,192,  3, 15, 60,240,
-192,  3, 15, 60, 10,128,  7, 30,120,224,129,  7, 30,120,224, 81,  0, 60,240,192,  3, 15, 60,240,192,131,127, 34,106,197,  0,156,
- 61,123,214,237,104,212,250,130,  9,235,147, 55,254,145,232,152, 94,125, 58,201,218,180, 11,143,213,232,181,178,195,178,220,216,
-172, 67,231,114,220,149,215,123,240,152,152,126,125,  6,203,238,148,150,194, 91,226,141,155, 37,  5,177,121, 39,246,186, 45,175,
-185,223,119,238, 52, 42,102,200,224, 14, 50,137, 55, 15,124, 30,  5, 34, 38,120,114,234, 69,226,174,188,228,255,151, 27,243,208,
-224,135,100,254, 62, 60,128, 15, 36, 12,174,127,142,211,131,122, 95,143,188, 22, 43,175,209,169,102, 45,253,125, 59, 12,120,154,
-243, 99, 11,238,107,250,126,127,183,200,237,142,180,255,  7,145,247, 92,251,184, 85,169,219,242,222,168,188,119,195, 85, 79,125,
-254, 75,228,241, 81,207, 20, 89, 87,228,197,198,198, 70, 25, 12,  6, 69,110,110,174,242, 65,190,175,203, 10, 64, 67, 88, 29,131,
-206,  0, 58,192,178, 78, 64,193,252, 28,220,112,246,  7,198, 12,239, 16, 67,192, 34, 36, 32,  8,185,135,207,200,222,153, 59,  3,
-195, 70, 15,  3,163,213,201,122,116, 27,  9,150,133,108,222,139, 15,199,246,239,223,  7,215,174, 21, 65,165,212, 98,237,198, 35,
- 57, 13,201, 27, 56,226,153, 24, 14,  4,145,157, 58,200,146,223, 92,142, 23,158,121, 12,223,252,247, 51,  0, 98,236, 61, 87,  2,
-138,130,108,245,146,197,200,207,191,  2,169, 52, 18, 34,  9, 31,183, 74,242, 99,161,171, 63,201,139, 30,235,203,  9,133, 66, 72,
- 36, 18, 20, 20, 20,160,109,168, 31, 90,241,125,208, 54, 34,  0,129, 18,127,120, 19, 51, 40,138,  2,199,154,161, 19,241,161,186,
-163,194,164,255,102, 57, 44,168,212,133,125, 56, 95,137, 10,126,  1, 66,248,120,243, 33,148, 80,224,243,  0, 74,200, 71,206,207,
-209,156,137,227, 33,110,194,  9,167, 11,188,247, 83,171, 99,194,195,195,209,174, 99, 59,153,222, 96,  4, 37,146,  0, 38, 96, 78,
-218,169, 24,189, 78,139,175,254, 21,147,243,  0, 21,201,150, 54,143,249,127, 25,174,150,133,211,207, 39,188,179,200, 27,192, 67,
-173, 37, 94,255, 41, 45, 45,237, 38, 16,139,192,122,121,125,  8, 96,125,230,135, 41,213, 45, 37,  3,162,122,140,138,185,113,241,
-112,125,123, 13,252, 35,234,104, 70, 70,  6,249,102,211,166,203, 34,161, 80,194,178,172,191,183,143,143,207,132, 39,159,244,  2,
- 64, 39, 39, 39,115, 45, 52,205, 20,  0, 36, 39, 39,179,205, 32,206,207,223,223,127, 65,215,174, 93, 39,139, 68,162,118, 37, 37,
- 37, 37,165,165,165, 39,105,154,254,  0, 64,129, 27,242,  2,  2,  3,  3,151, 63,242,200, 35,143,135,133,133, 73, 79,157, 58,117,
-231,194,133, 11,199, 13,  6,195, 82, 88, 86,136,117, 26,163, 70,141, 74,141,136,136,120,219,219,219, 27,190,190,190,167, 15, 28,
- 56, 16,253,183,241,  0, 52, 64,254, 60,111, 17,255,161, 25,195, 59,174, 98, 57,206,112,244,202,157, 79, 87,199,168, 14,204,207,
-193, 69, 71,223,149,223, 62,200, 25,171,229, 48, 85, 43,193, 55, 83,248,227,226, 21, 60,247,220,252,154,251, 20,  5,252,150,187,
- 17,173, 34,194,101,108,181, 26, 52, 75,112,232, 80,110,236,218,141, 71, 26,144, 24,201,157, 62,113, 17,196,203, 15,103, 46, 22,
-227,220,197,231,241,213,247,191,212,220,101, 89, 96,236,208,161, 64,117, 25,  0, 95, 20, 92,184,  4, 65,171,  0, 12, 27,210, 75,
-166,212, 53,162,179, 16, 10, 32, 20,250,245, 25,128,214,222, 66,180,109, 37,134, 95,112, 16,  2, 69,190,  8, 20,243, 32,224,241,
- 96, 50,155,161,100, 88,156,170,116,188,220,230,210, 87,219,115, 18,158,  2,126, 94, 94,  8,105, 21, 12, 63, 63, 47,112,148, 25,
- 12, 91, 13, 51,204,240,241,241, 66,171,214,237, 80,112,185, 11,215,177,219, 55,141,118, 74,253,227,215,112,254,190,222,240, 15,
-  8, 68, 72,171, 96,104,181, 90,  8, 69, 98,  8, 12,150,197,249,162,164,145, 50,185, 66,137, 71, 94,220, 24, 91, 92,114, 11,138,
-178, 34, 84,157,203,112,164, 12, 56,221, 73,140,158, 57, 58, 54,123, 99,118,142, 19,178,238,171, 18, 80, 88, 88,200,  1,128, 84,
- 42, 37, 45, 69, 94,120,120,248,115, 52, 77,111,  4,128,201,177,177, 84,198,214,173,238,116,190,150, 53, 82,237, 28, 57, 28,199,
-129, 16, 82,243,105,187,102,123,206,193, 78,106,174,172, 39,239, 10,249,247,240, 54, 49,219,125,  3,252,187,  1,128, 80, 34,  6,
-173, 55,128,213,234, 82,143, 31, 57,188, 36,225,157, 69,221, 51, 63, 76, 41,118, 36,231,211,119,231,114, 86, 11,139,129,101,  8,
-146,181,246, 67,245,246, 69,125, 71, 61,142, 81,143, 61,225, 82, 25,221,184,120, 88,214,169, 87, 76,236,181, 63,114, 92, 87,138,
- 19,228, 46, 61,158,152,152,136,173,  9,217,141, 62, 19,155, 93,123, 43,146, 30,  1,150, 87, 45, 55,176,208, 51,150,114,213, 90,
- 63, 51,  6,  7,160,139,175,160, 81,121,171, 86,173,202,121,247,245,183, 66, 39, 78,158,228, 99, 48,232,177,250,227,143,168,181,
-107,215, 26,230,206,157, 27, 14,224, 86,115,183,189, 73,147, 38,141,222,185,115,103,150,171, 74,212,204,153, 51,185,194,194, 66,
- 84, 85, 85, 97,197,138, 21,240,245,245, 69, 76, 76, 12,164, 82, 41, 54,110,220,232,110,187, 27, 57, 96,192,128, 77,111,190,249,
-230,181,174, 93,187,110,236,223,191,255,165, 59,119,238,180,203,205,205, 29,240,194, 11, 47,236, 81,171,213,169,176,108,  0,231,
- 44, 98, 39, 79,158,156,153,146,146, 18,108, 50,153, 32,145, 72,224,237,237,221, 70,171,213, 62, 61,113,226,196,  9,231,207,159,
-159, 11,224,191,206, 10,139,136,136,104,187,104,209, 34,228,229,229,113, 26,141, 38,160,206,109, 30,156, 91, 85,181, 89,112,246,
-236,217,186, 94,  2,231, 20,128,213, 49,104, 15,203, 14,120, 60,  0,102,173,145,185,153,123,181,252,147,161,157, 67,231, 63,210,
-163,205,146,214,254,146,182,171, 81,182,  5,192,149,249, 57, 13,111, 82, 99,172,150,163,117,167, 71,177,252,237,201,216,104,199,
- 73,135,143,167, 67,171, 51, 98,220,232,249,120,120,216, 76, 60,147,248,  8, 36, 18, 17,104, 51,  3,141,142,150, 53, 92,201,138,
-  0, 26,152, 60,125, 61, 94,126,115,118,205,213,177, 15,199, 64, 44, 22,225,199, 67,191, 96,239,177, 92,108,218,240, 25, 12,122,
- 35,132, 60, 62,124,188,132,208, 86,149,196, 42, 75, 80,239,238, 99, 28,199,  1, 28,107, 57, 40, 22, 28,199,193, 72,139, 44,221,
-147,  8,224,104, 51,204, 60,192, 12, 51,204, 52, 11,198,220,184,  2,187,240, 69, 41, 23,232,199,192,207,215, 27,225,237,162,208,
-173,119, 39,248,250, 72,160,170,174, 64, 89, 69, 25, 20,170, 59, 48, 25,  8,188,188,188, 16, 18, 50, 12,149,229, 33, 92,171,208,
-143,234,119,227,143, 92,204, 49,122, 29,244,124, 64, 40, 22, 66,175, 19,130,214,  9, 97, 16,139,192, 39, 12, 56,240, 96,208, 87,
- 67,175,211,160, 93,187,182, 50, 33,143, 15, 57,212,  8,165,167,163,238, 26,243,117,177,114,211, 74,135, 21,232,237,164,183, 27,
-239, 43, 19, 18,106,237,239,158,144,144, 48, 48, 40, 40, 40,159, 16, 98,224, 56,142, 31, 24, 24,232, 85, 80, 80, 16,108, 93,221,
-173,173,187, 21,121,238,220,185, 83,237,126, 35,198,221,213,226,234,101, 75, 66,184, 57,115,230,196,174, 93,187,214, 37,153,225,
-225,225,201,131,  6, 13,250, 96,120,191,126, 48,137, 68, 72, 75, 75, 99,103, 79,153, 18,151,254,195, 15,217, 46,254, 62, 86, 45,
- 89, 82,115,190,224,253,247,145,182,116,105,163,231,206,136,173, 67,238,156,117,179, 24,110,244,232, 14, 61,  1, 92, 79, 73,201,
-212,187, 72,254,185,189,123,246,244,179,181, 25,111,177,  4,183, 43,202,161, 86, 40, 49, 96,208, 96,175,159,191,218,144,157,240,
-206,162,158,153, 31,166, 56, 90,155,157,153,247,193, 90,254,179, 79, 79,224,119,150, 74, 89,171, 18,128,247,211,214,212, 86,162,
- 23,188,  6,  0,120,247,245,185,110,109, 39,237, 22,249,219,144, 25,228,194,195,163, 93, 18,237,205, 39, 56,183,244, 69, 16,191,
- 86, 48, 95, 63,  7,227,245, 63,145, 47,215, 34,122, 95,185, 83,223,239, 63, 96,192,209, 89,211,146, 34,147, 94,122, 33, 32,243,
-187,239, 89,169, 84, 74, 45, 79, 73,133,239,146,229,248,241,199, 31, 75, 51, 50, 50,168,230,242,  2, 76,154, 52, 41,110,231,206,
-157,  7,118,238,220,105, 59, 31, 99,251,223,129,130, 18,115,224,192,  1, 89, 81, 81, 17, 58,118,236,136, 17, 35, 70,192,223,223,
- 31, 74,165, 18,183,110,221,194,141, 27, 55, 48,102,204, 24,110,204,152, 49,177,111,189,245,150, 43,229, 52,233,145, 71, 30, 89,
-189,106,213,170, 45,253,251,247, 95, 77,  8,185,101,215,143,147,248,248,120, 31,  0,185,214,195, 41,121,115,231,206,221, 54,103,
-206, 28,234,244,233,211, 32,132, 32, 56, 56,184,230,216,183,111,159,112,200,144, 33,159,221,188,121,243,132, 35, 65,147, 39, 79,
- 38, 59,118,236,224,138,138,138, 34,242,243,243,113,253,250,117,162, 82,169, 58,  2,224, 79,156, 56,209,188,107,215, 46,238, 65,
-146,191,237, 90, 93, 37,128, 95, 15,249,  7, 71, 71,  5, 39,245,139, 12,154, 78,  8, 17,112, 28,103, 98, 45,  7,109, 54, 25,244,
- 66,138,109,219,187,181,248,237, 86,126, 29, 59,237, 60,117,227,251,213, 49,236,209,249, 57, 13,239, 22,  7,  8,209,163,123, 87,
- 80, 84, 14,242,149, 85,  0, 46, 65, 85,122, 21,  2,177,  8,187,246,124, 10, 93,165, 25,211,159,127,  3, 44, 11, 60, 57, 97, 40,
-204,124, 31,135, 47,151,159,127,  9, 44, 11,140,235, 75,172,188, 18,  9,131,145, 70,252,216, 49, 16,  7, 80,216,180,121, 63, 40,
- 10,216,246,253, 70,148, 94,255, 51,118,223,150, 85, 57, 13,109,151,200,114,  0,203,178, 96, 89, 22,102,179, 25, 70,  1,  7, 19,
- 49,129,166,105,232,188, 12,  0, 43,  6,197,153, 97, 22,114,168,166, 13,208,170, 85,141,166, 45,196,199,  8, 62, 95,130,224,224,
- 96,116,234,212,  9, 97,173,  7,  3, 60, 10,102,243,105, 80,156, 18,  6, 45,  3, 51,171, 69,217, 45, 57, 66,130, 43, 17, 28, 48,
- 12, 31,174,250, 57,230,251,111,239,149, 37, 49, 48,224,140,149,128, 65,  4,154, 50, 65, 43,228,163, 90, 34,  0, 95, 32,  4, 88,
-111, 16, 30, 65,181, 86,  7, 69, 89, 17, 10, 78, 31,131,188,184, 24, 44,203,130,226,120,110, 85,154,175,214,223, 85,156, 95,120,
-229,  5,199,253,100,237,213,199, 12,153,153,153,139,222,124,243,205,217,197,197,197, 20, 33, 36, 36, 35, 35,227,123, 88, 54,119,
-242,114,183, 34,207, 74, 72, 16,172, 91,183,110,243,157, 59,119,176,109,219, 54, 68,119,237,202,107,142,  6, 34,149, 74, 73, 98,
- 98, 98, 12,199,113,178,181,107,215,186,188, 97, 17, 77,211,233,195,173,117, 74, 40, 20,162, 75,151, 46,216,126,232, 80, 86, 72,
- 72,  8, 42, 42, 42,156,150,115, 31,183,170, 37,  3,  7, 14,228,108, 27,196,216,125,254, 57,106,212,168,210, 69,139, 18,252, 83,
- 82, 28,175, 30,151,240,206, 34,111,111, 19,179,189,119,207,158,126, 60,138,194,171,207, 78,135,222, 96, 68,218,151, 95,194, 75,
- 34,129,193, 96,128, 65,175, 71,223,254,253, 58,255,242,221,119,115,208,240, 86,222, 53,125,206,210,  5,175,177,  0,168,171,133,
-133, 84, 93,194,175,219, 60,221,121,241,246,221, 70,198,222,188,124,132,139,123,242,197,216,172,221, 95,186,165,  8,216,239,218,
-199,109, 13,116,120,221, 17,122,  4,240, 81, 84,109,198,225,184, 16,  8,230,103, 64, 61, 61, 10,252,192, 80,151,200, 63, 49, 49,
-177,204,164,213,221,122,233,213,217,237,223,121, 99, 33,214,110, 72,191, 56,104,192,128, 14,233,107,210,189, 94, 95,248, 22,190,
- 27, 58, 24,155, 55,111,158,  1,203,174,165, 77, 33,254,152,157, 59,119,202,108,100,159,145,145, 81,  0,203, 54,237,  7,157, 81,
-  0, 14, 28, 56, 32, 11,  9,  9, 65,255,254,253, 25,138,162,248, 22,239, 44, 11,129, 64,128,160,160, 32,180,110,221, 26, 55,110,
-220,192,129,  3,  7,100, 46,180,185,132,241,227,199,127,180,106,213,170, 53, 93,187,118, 93, 79,  8, 97,  1,124,  6,224, 49,  0,
- 71,  8, 33, 75, 97,217, 95,229, 45,  0, 75,157,145,183,106,238,220, 31,134, 39, 36,144,221,187,119,131,207,231, 67, 38,147,225,
-220,185,115,232,212,169, 19,150, 45, 91,134, 94,189,122, 97,246,236,217,252,247,222,123,111,149, 35, 97, 59,118,236,224,  0,192,
-203,203,235,118, 64, 64,  0,196, 98, 49,132, 66, 97, 53,  0,198,129,199,238,190,145,255,172, 69, 31,214, 92,251, 60,229,157,122,
-149,128,250,102,  1, 80,124, 30,197,103, 88, 78,163, 55, 49,183,  8, 33, 34, 31, 17,175,143,159, 16,209,146,158,163, 58, 34,246,
-101,160,219,  8,180,241,230, 38,205, 24, 22,245, 78,144,159, 87,220,234, 24,248, 55,156, 28, 22, 60,158,173,207,246,  3,208, 14,
-254,225,227,161, 55, 27,176, 62, 99,  3,190,217,188, 13, 99, 98,135,  1,  0,116, 58,128,199,111, 88,148,196,171, 43,  0,192,108,
-182, 87,164,202,  0,228,130,226,137,144,244,220,139,136, 79, 76,196,207,123, 44, 68,230,229, 13,104,171,111, 55,154, 89, 38,240,
-106,200,223,196,152, 97, 84,155,160, 83,234,160, 52,209,144,235,104, 40,140, 26, 40, 53,213, 80,148,107, 32, 87, 26, 32,175,110,
-120,  9,245, 87,159,233,192, 17, 66,192,227, 17, 16, 74,  4,179,153,  3,163, 43,134, 86,121, 21,165,101, 42,200, 21,213, 80,105,
-204,144, 43, 12, 40, 41, 41,195,197,203,103,161, 84,157,197,224,  1,  3, 27,220, 27,157,  7,128,210, 24,160,191,118, 11, 85,127,
- 92, 66, 85,113, 17,212, 42, 57,212, 42, 57,138, 46,158,198,241,204,175,144,187,117, 19, 42,174, 93,131,153,102, 45,173,137,247,
-151, 13,  3, 18,235, 65,199,199,199,119, 95,190,124,249,155,109,218,180,209,110,219,182,173, 79,102,102,230, 79,  0,250, 91, 11,
-221,237,  5,167,132, 97, 97, 11,  0, 96, 72,175, 94,152, 51,103, 78,249,169,203,151,179, 31,234,214, 45,166, 57, 18,191,117,235,
-214, 28,  0,100,238, 92,139,149, 57,119,238, 92,151,228,154, 68, 34,  0,192,246,237,219, 17, 26, 26,138,119,230,206,197,130,  5,
- 11, 16, 18, 18,210, 34,198, 97,109,164,159,145,145, 81,115,  0,192,225,195,135,195,  1, 76,112, 82,204, 67,  1,129,129,221,120,
- 20,133,231,227,227,161, 84,169, 81,114,251, 22,  4,  2, 62,248,124,203, 33, 16,  8, 32,146,120,161,163, 84,250,113,255,209,163,
-157,178,216,175, 22, 22,226,219,237, 63,213, 28, 54,188,159,182,  6,239,167,173,193, 94,217, 97,151,223,119,116,194,123, 49,  0,
-112,243,242,145,156,209, 22,242,151,161,133,172,118,116,254,235, 79, 80,254,242,  0,140,202,170, 64,143,  0, 62,120,126, 65, 96,
- 20,229,136,222, 87, 14,111,190,133, 31,120, 14,230,100,221,184,118,173,234,243,140,255,118,253,250,191, 95,227,211, 47, 63, 43,
-250,108,213, 71,239,191,249,218,188,  9,203, 63, 88, 14,137,175, 55, 70, 12, 25,134, 83, 39, 79,125,253,108,210,179,110,191,179,
-141,252,109,231,187,119,239,198, 67, 15, 61,212, 17,192,116,103,221,254, 38,147,  9,  3,  6, 12, 96,205,102, 51, 95,165, 82,193,
-104, 52,194,104, 52,226,242,229,203,144,201,100, 56,118,236, 24,218,180,105,  3,147,201,132,153, 51,103, 58,147,214,169,137,137,
-137,159, 76,158, 60,217,111,253,250,245,126,132, 16, 33,128,195,  0, 84,  0,  6,  0,248,201, 78,241, 60,  8,160,151, 35,121, 59,
-223,124,243,135,  9,125,251,146,239,226,227, 81,250,251,239,248,232,163,143,216,159,127,254,249,255,221,188,121, 51, 84, 38,147,
-189,188,104,209, 34,152, 76, 38, 12, 27, 54, 12,222,222,222, 67,157,205,191,128,128,128,202,214,173, 91,195,199,199,135,243,246,
-246,190,105,205,195,  7, 94,  7,237,149,129, 70, 61,  0,243,115, 80,177, 26, 21,233,191, 93,171,200,138,142, 10,142, 29, 40, 13,
-178,172, 35, 62,126, 25,126,243, 25,131,131,127,148, 99,104,207, 64, 60, 34,253, 25,190,191,124,208,127,108, 63,233,244,205, 71,
- 46,254, 81,159,240, 54,157, 19,  8,199,149,112, 19,159,155,143,  5,175,125,  6, 64, 14,203,178,201, 70, 68,118, 29,  0,177,136,
- 15,189,214,  8,208, 22,  5,193,215,215, 23,229,242,  6,247,203,134, 94,119,133,  0,224, 46,254,246, 37, 40,106,109, 45, 35,129,
-213,255,  9,131,209,  4,137,143, 24, 16, 90, 20,  4,141, 90,141,161, 67,135,226,200, 79,223, 53,108,142,176, 52, 88,150, 15,134,
- 97, 96, 52, 26, 81,205,231,129, 79, 83,192,109, 53, 24, 47,  6,102, 33, 11, 78,192,131,142,199,  7,163,213, 65,105,108, 56,214,
-201,215, 71, 11,134, 33, 48,210,102, 40, 85,106,228, 95, 43, 70,201,237, 74,232,105, 19,212,213,114, 84,107,148, 48,152,105, 16,
- 62,129, 86,167,130, 90,119,  3, 69,165, 42, 84,105, 26,222, 75,194,108,167,165, 49, 42, 45, 74,206, 94,194,157, 75, 55,160,214,
- 92,131, 70,169,  4,  7, 62,  4, 60,  2,142,  8, 64, 81, 22,175,175, 43,234,230,219, 73,111, 59, 53, 28,224,  0,119,  0,220, 89,
-188,120,177, 30,  0, 22, 45, 90,116, 42, 37, 37,197,219,154,116,  3,128, 98,119,  5,175, 91,183,110, 69,124,124, 60,  0, 32, 42,
- 36, 36,212, 58, 38,206,107,206,198, 97,115,255, 91, 61,  1, 14,179, 47, 60, 60,124, 52, 77,211, 72, 75, 75,195,211, 79, 63,141,
-201, 99,198,220,237,232,207,159,183,120,130, 66, 66, 56,103,227,  2, 22,188,255,126,205,152, 63,  0,188,181,100, 73, 45,207,128,
-147,110,255, 90,176, 89,255, 54,210,183, 33, 35, 35,  3,201,201,201,200,206,190,254, 45,128,239, 28,118,104,124,254,127, 12,180,
- 17, 60, 30, 15,151,175, 23,128,227, 56, 92,204,191, 10,154, 54,129,  2,  1,159,207,  7, 33,  4,172,217, 12,189, 86,135,171,191,
-253,118,200,137, 60,164,236, 73,255,217,167, 39,216, 91,252, 20,  0,156, 56,115, 30,157,163, 34, 93,154,166,156,157,249,159, 26,
-107, 63,219, 98,249,219,134, 66,184,199, 39,189, 24,187,111,167,123,222,128,102,129,252, 54,132, 17, 93, 80, 62, 71, 12,209, 35,
- 83, 97,206,219, 15,179,218, 18,111, 80, 62,231, 97, 68,102,228,194,204, 54, 94, 85,186,118,238,218,214,203,203,219,235,211, 47,
-214, 25, 98, 71,141, 18, 14, 30, 58,228,187,  3,123,127,121,252,242,181,124,128,229, 32, 22,137, 48,108,224, 48,236,217,189,  7,
- 99,199,142,229,246,239,223,239,116, 87, 80,215,234, 63,112,224,  0,174, 95,191, 78,  3, 16,158, 60,121,146,158, 61,123,246,180,
-140,140,140,103, 29,201, 41, 44, 44, 68,199,142, 29,  1,128, 42, 44, 44,196,185,115,231, 16, 25, 25,137,168,168, 40, 40, 20, 10,
-228,229,229,161, 67,135, 14,  8, 13, 13, 69,100,100, 36, 10, 11, 11, 27,175, 40, 20,149,148,152,152,248,193,200,145, 35,125, 78,
-157, 58,229,199, 48,204, 75, 18,137,100,162, 94,175, 95,  5,203,214,231,176, 42,  0,107, 96,217,157,143, 70, 35,211,219,  5,  2,
- 65, 82,230,188,121, 27, 31, 14,  9, 33, 21, 11, 23, 98, 40,203, 98,205,238,221, 92,169, 78,247, 34,238,110,203,190,241,226,197,
-139,235, 25,134,225,251,248,248, 32, 60, 60,220,199,100, 50, 65, 32, 16, 56,122,125,175,210,210,210,174, 55,111,222,132, 86,171,
- 37, 10,133,162, 59,159,207,143, 99, 24,166,197,238, 56, 86,223, 16, 64, 24,128,142,147,162, 35, 94,109, 31,236, 61, 29, 38, 61,
-208, 53, 14,103, 66, 38,225,145,185, 95, 65, 95,169,  4,207,207, 23,178,213, 73, 24,209,227, 55,  4,157,207, 26,  9, 32,162,161,
- 31,232,228,215, 14,127,156,223, 97,231,112,208,  2, 48, 89, 14,147, 17,124,150,  7,202, 74,226, 59,127,116,188,139,200,254, 11,
- 28,198,246,239, 85,199,  8,229,  3, 16,  0,  2, 49, 24, 98,134,213, 14,198,148,233,243,  0, 64,150,242,238,220,  6, 27,130,153,
-229,192,176, 20, 40,134,  1, 69, 27,161,163, 44,117, 71,207,227,193,155,209, 67,173,231, 64,  4,  4,102,179, 25, 58, 51, 80,174,
-109,120,183, 83,134,102, 97, 16,240,192,234, 24, 48,172, 10,154,106, 19,120, 68,  0, 35, 99,  2,205,209, 96, 76, 52, 32,100, 65,
- 17,128,136, 88,168,244,102,148, 85,232,160, 53, 50,245, 26,201, 20, 49,215, 12, 26, 17,114,119, 72,215,100,208, 67, 37,151,131,
- 34, 60,240,249, 28,192,241,193, 35,238,155, 58, 87,138,174,208, 93, 35,187, 10,157,113,251, 55,164,155,193,110, 15,237,148,148,
-148,  9,  0,110, 46, 90,180,168,191,191,191,127,128, 74,165, 42, 74, 73,113,125,135,204,185,115,231,190,176,110,221, 58,180,110,
-221,218,254,154,114,205,154, 53,217, 15,117,235, 54,250,212,229,203,  7,155,171, 33,204,157, 59, 55,214,110, 40,160, 49,242,143,
- 25, 52,104, 80,248,240,126,253, 64,124,125,145,146,146,130,133, 11, 23, 66, 32, 16,192,164, 80,192,223,223, 31,239,204,157, 91,
- 19, 23,144,156,152,232, 80,  9,168, 59,198,239, 40, 38,160,177, 17,133,186,214,191,  3,239,128,195, 42,163,144,203,187,249,248,
-250,162, 82,161,128,236,196,  9,240, 41, 30,140, 38, 19,116,122, 61, 88,150,173, 81, 92, 24, 19, 13,218,104,116,102, 72,131,  5,
- 64, 89,135,  1, 88,187,138,111,176, 94,199,251,105,107,132,  0,208, 89, 42, 45,191, 81,191,109,225,146,151,170, 93,199,232,152,
-125, 59,191,116,197,221,220,112,  6,187,224,246,175,229,150,221,250, 95,244,123,238, 13,136,162,250, 88,250,138,202,219,200,151,
- 91, 20,127,209,208,241, 40, 54, 51,240, 90,219,248, 80,179, 90,173, 14, 16, 73,196,232, 20, 21, 37,190, 81,114,179, 77, 85, 69,
- 21,166, 60, 59, 93,182,247, 96, 22, 86,127,152,182,109,231,222,221,241,157,163, 58, 35,233,233, 25,200, 61,115, 12, 99,199,140,
-225,246, 31, 56,224,240,157,237,173,254,  3,  7, 14, 32, 46, 46,206,166, 44, 10,111,221,186,133,217,179,103, 11,  1,192,153,216,
-130,170,170, 42,140, 24, 49,  2,102,179, 25,133,133,133, 56,118,236, 24,122,244,232,  1,127,127,127,180,111,223, 30,253,250,245,
-  3, 69, 81,160, 40, 10,109,218,180,113, 84, 79,123,244,234,213,235,147,161, 67,135,242,206,159, 63,239,103, 54,155,203,182,111,
-223,174,214,235,245, 41,  0,236,  7, 77, 95,125,252,241,199,139,247,238,221, 27, 69,  8,185,141,134,119,180,237,159, 60,124,248,
-198,193,124, 62,169,248,224,  3,112, 38, 19,100, 60, 30,155,171,211,205,132,101, 27,119, 27, 94, 89,188,120, 49,159,162, 40,200,
-229,114, 92,191,126,189,188, 87,175, 94,161,206,148,115,120,120,120,144,153,227,160,215,233,112,241,226, 69, 48, 12,211,162,103,
-158,240,235,144,127,231, 48,127,201,240,199,251,134,207,246,147,  8,  6, 49,102, 86,193,231,204,126,  8,104,195,187,173, 52, 64,
- 95,169,  2,132,124,152,149, 26,148, 40,104, 32, 56,  2, 20, 75,139, 27,115,241, 94, 83,171,209, 37,192, 15,140, 17,184,150,243,
- 45, 58,197, 60, 86, 99,192,153,104, 19,  4,160, 80,109,176,236, 80, 59, 54,102,  0, 36,193,225, 88,181,241,167,  6, 19, 60,182,
- 55,193,222,115, 28,  4, 98, 64, 24,241, 24,232,226,163, 53, 94,  0,129, 80,  4, 19, 12,240,145, 88,118, 36,221,189,119, 11,254,
- 56,153,211,168, 75,146,101, 89,  8,105, 61, 76, 16,130,162, 24,192, 96,233,216, 76, 38, 19,140,  6,  1,120,124,  1, 96,  0, 56,
-214, 50, 68, 16, 41,141,  2,114,235,159, 81,160, 51,176,224,241,  8, 76,140,  9,  6, 35, 11,181,198, 82, 15, 77, 44,  7,218,200,
-  2,124,128, 39,224,129, 47,  6,136,222, 12,150, 48, 96,161,135, 70, 15, 88,118,150,108, 28,102,  0, 20, 11,112,  4,160, 40, 22,
-132,240,192,114,  4, 20,101, 53,156, 88, 10, 44, 69,129,176,206, 25,200,118, 65,126,194, 38,214, 35,111,  0, 33,139, 22, 45, 42,
- 79, 73, 73,137,  5,240,212,162, 69,139,198,164,164,164,104,  1, 84,185,229,178, 74, 72, 16,174, 91,183,238,203,248,248,120, 72,
- 91,181,170,185, 46,109,213, 42,192,234,  5,  8,121, 16, 13,134,166,105,153,109,236,159,211,104,240,175,127,253, 11,198,170, 42,
-216, 34,223, 58, 89,149, 21,129,209,136,  9, 19, 38,148,151,150,151, 79,115,198,210,110,198, 33,153, 90, 30,128, 70, 60,  4, 56,
-125,250, 52,169, 79,121,168,165,212, 26,105, 40,105, 57, 12,  6,  3,  2,252,253, 33, 22,138, 96, 50, 51,224, 56, 14,102,179, 25,
- 52, 77,195,100, 50,129,101,204,206,198, 51,176, 87, 11, 11,169,206, 82,169,205, 34, 96,175, 22, 22, 82,223,110,255, 73,108,239,
- 17,232, 44,149, 42,155,203,125, 95, 82,144,215,108,150,191,187, 49,  0,163,178, 42, 80, 46,221,  6, 97, 68, 23,144,168, 62,136,
-220,240, 59, 42, 13, 44,188,249,  4,244,175, 63,226,202,245, 27,112,180,107,177,158,161,113, 58,247, 36, 62, 89,245, 49, 30,142,
- 25,142,197,255,111,  9,126,217,247, 11,190,219,244, 13,134,142, 28, 30,223, 94, 26,  1,190,151,  0,  7,143, 30,196,230,175,191,
-193,142, 31,183, 67, 40, 22,115,187,119,239,110,116,125,136,157, 59,119,214, 34,126, 27,148, 74,215, 55,184,211,104, 52,240,247,
-247, 63,  1, 96,176, 84,103, 60,227,177,  0,  0, 32,  0, 73, 68, 65, 84, 42,197,192,129,  3,193,227, 89,134, 89, 35, 35, 35, 33,
- 18,137,160, 82,169, 32,149, 74,225,235,235, 91,164,209,104, 34, 27, 17,119,241,252,249,243, 43,118,236,216, 49,174,115,231,206,
-221,182,111,223, 94,173, 80, 40,150,  2,216,108,175,191,140, 26, 53,234,205, 13, 27, 54,108,  5, 80, 14, 32,  1,192,111,  0,250,
-214, 35,239,247,181, 50,217,138,128,188,188,119,159, 97, 24,124, 12,176, 95, 86, 87,207,168, 35,239,169,121,243,230,125, 60,107,
-214, 44,220,184,113,  3,123,246,236,  1,195, 48,135,  0, 60,227,196,235, 83,  1, 60, 94,149, 15, 77, 67,251,251,239, 92,  8,203,
-106,174,  1,154,191,186,143,234,215,175, 31,206,158, 61, 91, 51,238,223,104,130,235,156,119,152, 20, 29,177,220, 79, 34, 24, 84,
-161, 54,252,114,252,106, 69, 10,120, 34,224,202, 81, 60, 42,229,240,127,175, 77,192,192,158, 82,204, 75,126, 28, 79,118,164,129,
- 11,  7,192,  9, 36, 12, 26, 13,214, 81, 34, 95, 89, 12,190,  8, 24,251,228, 27,216,252,233,135, 22, 99, 81,103,132, 89, 15,252,
- 40, 59,139,236, 83,150, 25,133,237, 34,162, 64,241, 29,147,215,184,190,  4, 38,  3,176,123,207,126, 68,143,121,205, 98,253, 67,
-  0,158,  4, 72, 28,159,128,113, 35, 39, 90, 26,126, 81,  1, 24,  3,221,184, 70,207,113, 96,136,133,224,141,180, 37,248,207,104,
-208, 67,167,211,161,186,186, 26, 26,181, 10, 26,141,  6,106, 77, 53, 12,213,213,208,235,245, 13, 87,254,106,  2,189,193, 12,189,
-193, 12,173,206,  4, 77,181, 17, 10,141, 17, 74, 53, 13,149,198,  4,165,210,242, 41,175, 98, 32, 87, 48,144,171, 24, 84,202,105,
-220,169,108, 56,141, 20,199,193, 12,128,152,  9,  8,197,130, 35, 28,192,113,224, 56, 30,204,236,221,226, 99,173,189,135,171,190,
-241,238, 67,187,227,216,222, 99,248,229,208, 47, 53, 74,193,149,162, 43,174,214,185,112,  0, 29, 83, 83, 83,207,  1, 88,251,206,
- 59,239,188,222,161, 67,  7, 38, 35, 35,131,164,165,165,185,172,  1,207, 74, 72, 32,194,176,176,157,  0, 16, 22, 22,118,207,253,
- 57,115,230, 48,121, 87,174,108,105,174, 88,  0,155,251,223,217,125,227,109, 99,255,  0,240,195, 15, 63,224, 90, 89, 25,  0,224,
-231,156,156, 90,247,174, 92,185, 18, 26, 18, 18,162,120, 16,138,202,232,209, 29,108,243,174,107, 93,183,157,219,238, 59,244,105,
-250,249, 94,102,205,102,168,229, 10, 84, 86, 86,162, 74,169,128, 86,167,131, 86,167,131,166,186, 26, 90,149, 26, 26,165, 18,  6,
-189, 14,180,193,  0,150,113, 24,232, 76,117,150, 74,109,125,  6, 11,128,182, 31, 14,  0,128,111,183,255,132,247,211,214,  4,  0,
-  8,115,185, 34,118,140,142,169,171, 56, 68,245, 24, 21,131,  7,140,219, 83,164,136,220,240, 59, 72, 84, 31, 24, 15,111, 67,209,
-243,253,225,205, 39, 56, 26, 23,  2, 70, 85,129,232,253,229,224, 59,168,126, 89, 89, 89,228,229,249,175,224,218,149, 43,200,205,
- 57, 10,127, 95,127, 76,157, 50, 21,  1,193, 65, 56,115, 50, 15, 62, 66, 49,188,189,189,209, 70,218, 22, 91,190,223,130,119,222,
-123, 23,213, 74,247,119,169, 29, 48, 96,128,203,223,241,245,245,133, 74,165, 26, 76, 81, 20,221,190,125,123, 12, 26, 52,  8, 61,
-123,246, 68,171, 86,173, 32, 22,139, 33,149, 74,209,183,111, 95,  4,  4,  4, 64,163,209, 68,250,250,250, 58, 18,185,242,240,225,
-195, 89,155, 54,109, 18, 40, 20,138,197,117,200, 58, 97,196,136, 17,159,108,216,176,225,171,176,176,176, 15,  8, 33, 62,  0,222,
-  1,208,152,155,236,189,229, 26,205,202, 23, 25,198,252,165, 94, 63,173,142,188,248,103,146,255,189,227,181,215, 23,240,174, 92,
-185,130, 19, 39, 78, 96,195,134, 13,213,  0,254,207,201,215,167,188,140, 70, 49,119,233, 18,218,103,103,147,240,210, 82, 30, 30,
- 80, 12, 74,221,160,247,134,130,224,235,118,  2, 34, 30, 69,124,139,171,180,223,109,201,189,241,127,103,139,228, 39,245,102,114,
- 13,149, 55, 32,222,241, 42, 62, 24,166, 65,222,210, 65, 88, 29, 91, 13,239, 31,231,  0,242, 18, 84,115,226, 11, 86,205,171,  1,
-220,141,234, 63,119,254, 39,252,251,223,155,208,201,175, 55,254, 60,126, 14,  7,100,151, 16, 59,180, 39,226, 70, 88, 42, 26,199,
-227,131,118, 97,162,196,216,254,221,176,124,229,135,216,127, 65, 13, 31,105, 15,140, 31, 63,  1,191, 28,218,137, 61,191,108,177,
-188,156,217,  4,145,160,241,126,142, 99,205, 48,179, 22,107,  6, 86,107,134,166,105, 24, 12,  6,232,245,122,104,117,122,232,117,
- 90,232,117, 90,232,140,  6,208, 70, 67,195,238, 47,189, 47, 84,213,102,168,245, 44,212,122,214,242,191,134, 69,181,150, 65,181,
-142,129, 66,110, 70,149,220,132, 42,133,  9, 85, 85, 38, 84, 86,210,184, 83,105,106, 84,  1,184,235,254,191,215, 84,227,243, 56,
-240,  8,  1, 87, 39,234,159, 35,142,235,220,219, 73,111,163,251,208,238, 53,231,217, 27,179,107, 60,  2,199,246, 30,195,149,162,
- 43, 55, 92,169,112,219,182,109,251,149,227,184, 94,241,241,241, 73, 81, 81, 81, 33,  0, 40,150,101, 69, 38,147, 41,112,254,252,
-249,126, 13,184,130,235,133, 48, 44,236,253,117,235,214,141,139,143,143, 71, 84, 72,136, 83, 67, 87, 77,116,255,199,  0, 64,116,
-183,110, 14,  3,216, 58,183,110, 29,155,150,150,134, 63,139,138,212, 59, 14, 28,192,229,203,151,107,172,254,174, 93,187,194,122,
-143,222,113,224,  0,138,138,138,112, 37, 47, 79,239, 72,230,130,247,223,199, 91, 75,150,212,184,247,109,255,219,206,109,255,187,
- 18, 11,144,146,146,201,141, 26, 53,234, 85,123,210,183,125, 14, 28, 56, 16, 41, 41,153, 78,117, 76, 87, 47, 23,228, 49, 12,  3,
-154, 54, 66,126,167, 28, 21,183,203, 80, 89,118,  7,149,101,119, 32, 47,175,128,178,170, 10, 70,173,214, 18, 63,163, 84,194,137,
- 32, 64,230,253,180, 53,252,247,211,214,240,  1,168,  1,176,131,  7,244,185,231, 33,187,184,  0,167,209,182, 99,116, 76,105, 65,
-158,172,239,160,187,105,232,216,255,201, 24,101,197,117, 89, 83,234,  7, 73, 84,212,178,252,221, 65,190, 92,139,226,151, 30,  2,
-119,227, 60, 66,255,123,  6,222,235, 79,227,246, 20, 41,  6,238, 47,  7, 17,136,192, 39,  0,159,114,172,128,158,191,112,129,252,
-235,195,229,152,247,214,155, 48,177,102, 92, 46,188,138,233, 83,167, 65, 40, 22, 99,215,143,187,  1,147, 25, 70,131, 17, 71,243,
-142, 67,175,175,198,172,153, 51, 15,191,252,242,203,141,149, 53,153, 52,105, 82,236,152, 49, 99, 64,  8, 65, 86, 86,214, 61, 46,
-253,183,223,126,219,233,247, 12, 14, 14,198,173, 91,183,  0,128,159,158,158,142,138,138, 10,244,238,221, 27,  1,  1,  1,160, 40,
- 10, 39, 79,158,  4, 69, 81, 32,132,224,214,173, 91,  8, 14, 14,118, 70,236,  7, 52, 77,143,  4,240,131,221,181,169, 35, 70,140,
- 72,123,233,165,151,  2,211,211,211,197,132, 16, 10,192, 78, 88,102,  1,220,113, 32,111,225,  9,147, 41,186,174,188,103, 22,237,
-216,250,244,180, 57,100,220, 43,233,200, 57,113, 17,105,105,105,172, 90,173,126,  1,150,217,  5, 78,121,183, 58,249,250,  6,180,
- 47, 43,195,112,157, 14,109,  4,  2,111,111, 30,239,129, 45,183,223,175, 95,191,154,195,169, 33,  0,  0,  5, 91,142,223,152, 43,
-215, 26, 79,  3,200,  7,208, 38,247,106,197,231, 35,187,133,189,199,191,113, 34,  8, 27,102,  0, 34,111,192,168,  5, 56, 14, 38,
-158,248,206,209, 63,111,127,137, 70, 86, 95,218,252,221,103,177,211,166, 39,201,  0, 64,203,154,112, 77, 89, 12,192,140, 78,126,
- 81,136,141,237,131,176, 86,255,159,189, 47, 15,107,234,218,222,126,247,201, 64,  0, 21,193, 89,180, 42, 86,212,170,117,192,138,
-168,149, 68,209, 90,173, 29,190, 26,181,245,218,250,211,150,160,246, 58,117, 64, 91,123,237, 96,171,222,123, 81, 59, 74,236,112,
-181,189,245,170,193,218, 58,213,  1, 77, 80, 17, 65,180, 90, 71, 64, 80, 17, 20, 81, 18,166,  4,200,180,191, 63,146, 19,  3,  4,
-114, 18, 80,180, 61,239,243,228,225, 76, 89,236,236,189,207, 94,239, 90,123,237,181,219,163,168,164,212,230, 43, 48,154,113,179,
- 88, 95,239,143,234,244, 72,  4,242,114,237,203, 60,137, 16,227,250,219, 98,  0,246,158, 53, 97,223,174,  4,220,186,115,  3,173,
- 90,218, 86, 18,180, 20,139,240,248,224,  1, 80,255, 82,143, 75, 23, 66,136,173,102, 88, 32,128,149, 16, 48, 22, 43, 96, 50,195,
- 34, 18,  2,132,  1,251, 78, 90, 41,108,185,  2,234,193,111,234, 43,228,233, 17,205,169,159,152, 66, 40,114,242, 48,152,  0, 51,
-  5, 42,141,128,165,202,  2, 66,  8,136,152,192,108,  1,244, 85, 64, 90, 74,  9, 25, 48,160, 51,117,233,242,103,123, 22, 99,  5,
-177,187,255,109,164,128,192, 98,101,192,  8,236, 43,  5,  0, 80,  1,  5, 40, 55, 47,128,179,242,119,117,158,188, 39,185, 27,215,
-142, 54,105,210,164, 62,  9,  9,  9,107,  0, 12, 72, 72, 72,216,155,144,144,112,100,210,164, 73,111,116,239,222,221, 68,  8,105,
-245,217,103,159,237, 95,188,120,241,180,149, 43, 87, 38,213, 67, 62, 89,235, 95,248,214, 91,111, 45,123,235,173,183,176,119,239,
- 94,232,111,213,126,151,187,181,105,131, 43, 87,174,  0,128,154, 75, 34,159,186,146,254,188,241,198, 27,210,175,190,250, 74,253,
-229,151, 95, 98,112,207,158,178, 19, 23, 47,186,117, 21, 31, 59,123, 86, 51,188,127,255,167, 46,157, 56,209, 21,128, 15,128,207,
- 77, 62, 62, 16, 85, 85,161, 71,135, 14, 88,180,104, 17,146,147,147, 87,133,134,134, 38, 37, 39, 39, 31,204,203,203,115, 67,238,
-106,231,  1,104, 64, 12, 64, 53, 30,152,148,148, 68, 98, 99,229, 39,142, 31, 47, 76, 86, 40, 20, 98,  0,136,141,149, 15, 91,181,
- 74,149,  2,142, 73,128,186,246,127,236,221,138,155,  5, 99,173,102, 75, 47,125, 73,  9, 74,238,220,  6, 33, 12, 40,181,162,178,
-178, 18,148, 82, 80, 74,113,229,194, 69,152,140, 85,248, 61, 49,209, 93, 29, 58,143, 57, 45,  1, 48,227,101,145,214,241,178, 72,
- 56, 47, 11,180, 79, 17,112, 70,167, 30, 67,164,121, 89,105,106,  0,232,218,165, 11,206,164,217,120,114,246,239, 59,  0,  0,109,
- 30, 25, 36,187,157,123,170,201, 60,  0,131,127, 43, 68,250,211,192,128,176, 40, 20,206, 29,134,246, 95, 31, 67,166, 86,143, 64,
- 49, 65,145, 86,  7, 33, 33,110, 61,  0,142,119, 51, 57,185,218,147,221,187,119,167,227, 39, 60,141, 93, 59,118, 97,235,214,173,
-248,224,189,247,177, 95,115, 16,  2,161,  0,193,157,130, 35, 75, 74,234, 95,186,188,125,251,118,141,157,  8, 72,199,142, 29, 91,
- 45, 22,224,192,129,  3,184,124,249,114,165, 82,169,236, 80,211,155,228,178,191,116,237,138,156,156, 28, 60,246,216, 99,230,  5,
- 11, 22,136, 55,111,222,140,128,128,  0, 92,186,116,169,150,231, 53, 39, 39,  7, 93,185,183,179,115,226,185,233, 79, 60,241,196,
- 71, 47,189,244, 82, 64,122,122,122,243,202,202,202,255,243,245,245,125,198, 30, 24,248, 43, 71,121,206, 11,229,167, 63,243,247,
-205, 27, 71,140,126,129,252, 51, 17, 32, 29,159,197,167,107,223,165,218,172, 75, 51,  1,168, 60,104,102, 82,102, 50, 21,139,125,
-124,208, 66, 44,134,175,197, 82,165,175,190,100,237,129, 67, 53,  2, 48, 95,131,243,159, 73,171, 50,231,107, 28, 83,154,185,159,
- 73,139,127, 43,171, 52,235,195, 31,109, 61, 62,200, 79,240,132,160,170,210,223, 76,153,178,162, 50,227,241,148,203,  5,251,242,
-181,134,164,249, 26,220,172,139,100, 76,251,219, 82,205,225, 99, 41, 50,  0,106,171,128,157,230, 19,224,114,233, 77,252,227,141,
-153, 48, 24,170, 80, 90, 97,139,  1, 48, 50, 62,216,178,189,254, 52,187,121,185, 41,228,133,103,255,110, 83,150, 22,214,114, 54,
- 99, 92, 63,130,169,115, 86,195,207,207,  7, 45,124, 37, 50,  0,234,172,115,167,100, 27,190,216, 94,239,128, 36,164,102, 24,137,
-141,  4,128, 16, 88, 40,181, 17,  1,179,125,185, 31, 97, 32,180, 90, 97,182,  7,  7,186, 35,  1,197, 21, 45, 81, 81, 85,  4,177,
-144,113,164, 57, 51, 91,  1,147,137,194,100,166, 40,175,176,130,  8,  8, 44, 32, 48, 89,239,186,238, 93,193, 98,101,192, 16, 11,
-136,133,128, 50,212,225,254, 39,117, 24,207,172,164,243,151, 54, 19,119,185,161, 47,166, 92,108,104,223,113,184, 45,250,245,235,
-119, 51, 36, 36,228,133,171, 87,175,246,216,186,117,107, 26,128,231, 18, 18, 18,158,115,126,120,229,202,149,154,197,139, 23,203,
- 86,174, 92,233, 78, 65, 56, 42, 36, 38, 38,166,206,135, 94,124,245, 85,155, 15,208,179,196, 64,180,134,219, 31,  0, 48,164,119,
-111, 89, 26,  7,229,239, 24,128,207,156,113, 68,171, 14,235,215,207, 26, 23, 23,247,229,196,137, 19,205, 25, 25, 25,194,107,215,
-174,161,107,171, 86, 41,187,118,237,226, 20,160,120,143,242,  0, 56, 43,247, 91, 73, 73, 73,206, 49, 30,103,157,234,217, 45,  9,
- 80,173, 92,165,151, 47,142,125,241,210,193, 67, 41, 45,253,253, 91,148,234,138, 97, 54,155, 65,237,239,129,238, 86, 33, 74,117,
- 58, 80, 74, 49, 48, 42, 74,246,123,162,219, 60, 72,102,220,141, 57, 97,236,203,  1,153,240, 65,143, 99,188, 44,210,177, 10, 32,
-235,234, 85,206, 36, 32,106,194, 75,210,196,221,255,115, 88,249,191,170,190, 83,  3, 64,155,144,225,178,219, 57,201, 26,  0,104,
- 26,229, 79,107,147,  0,124,131,  1, 49,255, 64,129,213,138,254, 27,210,144, 54,174, 29,250,236,186,  5, 33,  1,154,139,188, 51,
- 22,119,237,218, 69,166,188, 52,133,142, 26, 51, 26, 59,182,253,130,143, 87,173, 68,108, 73,  9,168,213,138, 45, 91,182, 33, 63,
- 63,255, 25,  0,187,220,201,113, 69,  4,  0,224,133, 23, 94, 56, 13,142,115,217, 27, 54,108, 32, 99,199,142,165,167, 78,157, 18,
- 15, 26, 52,  8,163, 71,143,134, 90,173,198, 35,143, 60,130,170,170, 42, 68, 70, 70,130, 82,106, 61,117,234, 20, 35, 18,137,188,
-201,  8,248, 88, 64, 64,192,154, 41, 83,166,136, 46, 92,184,208,162,170,170,170,174,192, 64,174, 24, 24, 60, 96,242,198,  1, 35,
-167,144,239,146,128,210, 10,192,120,101,175, 85,155,165,158,129,234,129,129,156,244,169,182,164,196, 44, 54,153, 96, 16,139, 33,
- 52,155,221, 76,143,223, 27,176,121,  0,156, 45,127, 87,215, 92,186, 82,157,148, 63,123,126,241, 51,105,121,238,181, 59,229, 41,
-  0, 58,216, 95,222, 42,  0,249,  0,114,230,107,224,214,197,169,252,122,183,102,196,136,126, 50, 11,109,166,118,126, 57,202,245,
-165,182,117,255,140, 31,178,203, 64,214,126,189,137,211, 15,220,190,227, 11,114, 91,155, 35,  5, 99, 80, 59, 87,111,179,102,  1,
-176,152,116,  0,213, 99, 92, 63,110, 19,186, 38,  8,  0, 74,109,138, 26,  2,136,169,157,  8,216,149,191, 45,  7, 32,  0,142, 68,
- 46,229,228,117, 18,214,183,  3, 53,155,180, 16,218,189, 63,148, 82, 88,204, 20,149, 38,160,180,204, 12, 19, 40,204,148,129, 80,
- 68,112,231,150,169,206,114,158, 56,177,138,  0,192,176,136,183, 41, 49,217,172,127, 10,128, 82,  2, 80,187,197, 64,  5, 32,  2,
- 43,172, 86, 33, 50,179,182,113,250,205,175,125,252,154,236,106,246,213,250, 20,176,  8,182,165, 26,245,105, 39, 71,205, 47, 91,
-182,140,245,143,158,177, 91,197,119, 21,245,139, 47, 74,183,109,219,166,182,147,  0,181, 59, 18,176, 94,165, 50,253,126,246,172,
-188,107,191,126,150, 39,122,245,210,219,251,104, 21,106,100,209,146,143, 27,103,179, 56,250,245,115, 63,221,241,246,219, 50,  0,
- 24,220,179,103,173,123,233, 25, 25,154,180,139,222,147,161,126,189,123,127,205, 48,140,229,210,137, 19,254,237,218,181,187,147,
-156,151,183,209,157,213,127, 31,180,142,115, 63,208,219,  3,254,216,169,129,242, 26,109,205,133,  4, 92,144, 47,142, 13,223,241,
-237,119,219, 66,186,117,125,172,170,170, 18, 22,147, 25, 86,171, 21,205,  3,  3, 81,162,213,178,202,159, 11,137, 42,254,240,205,
-191,183,  5, 96,204,186,122, 85,204,206,255,167,158,250,  3,227,101,145,214,101,113, 95,184, 75, 14,228,192,156,121,177,244, 82,
-198, 37,153,179,242,  7,128, 81, 79, 61, 39, 59,180,239, 87,205,237,156,100,239, 43,177,142,  0, 63,215,215,185,235,176,193,191,
- 21,  2,191,189,225, 56,127,244,215,  2,199,113,137,201,123, 99,113,203,255,182,144,225,195,135, 63, 61,118,194,184, 61,175, 79,
-159,117,244,241,254,253, 70,236,248,117, 39, 82, 78,159,196,201,147, 39,119,215,231,  6,174,135,  8,204,218,190,125,251,183,219,
-183,111, 31,186,125,251,118,206,133, 27, 59,118,236,168,253,251,247, 31,218,181,107, 23, 66, 66, 66, 48,102,204, 24,  4,  4,  4,
-100,150,148,148,132,158, 63,127, 30, 57, 57, 57,140, 72, 36,194,216,177, 99,163,246,239,223,239,233, 79,189, 80, 82, 82,178,106,
-231,206,157,245,  5,  6,122,130,223,243, 79,111, 93,241, 75,194,179,239, 86,  4, 79, 67,197,137,165,214, 27, 71, 62,153,238,165,
-188,202,107,133,133,162, 55, 51, 51,243, 44,  6,  3,115,134, 97, 68,237,  5,130,130,130, 38,114,  2,184,202,  6,232,110, 10,192,
- 37,230,107,160,  7,240,135,253,227, 21,142, 30, 61,171,137,137, 89, 44,139, 87,126,172, 14,238,210,  3, 64, 21, 68, 62, 18,228,
-221, 44,197,166, 93,201,196,115,121,187, 53, 51, 94, 91,136, 13,223,255, 12, 88,175,  1, 16,194, 92, 89,129,224, 14,  1,178, 79,
-222,158,197,217,154,131,197, 10, 33, 99,133,137,  8, 33,162,230,187, 68,  0,102,128, 90,192, 53, 48,204, 25, 39,207,221, 36,  0,
-208, 62,136,161, 34,161,205,218, 55, 91,109,  9,140,138,203, 40, 44,102, 64, 32,180,194, 98,230, 54,114, 28, 75,249, 23,  1,128,
-240, 33,139, 40,216,156,240, 12, 96, 37, 54,119,127, 70,214, 78,143, 10,249,237,251,223,106, 26,161,127,113, 50, 87, 88,229,239,
-228,  9,112,187, 28,235,196,165, 75,  9, 39,106,184, 12,235,121,214,237, 51,141,153, 58,184, 22,185,181, 45,241,139,183,217,214,
-103,189,146,209,200,121,  0,106,214,173,222,205, 82, 43, 78,125, 71,181,114,213, 37,249,226,216,190,  0,  4,151,146,146, 76,149,
-134, 10, 88, 45, 22,244, 14, 11,147,117,  8,125, 12, 39,126,219,201,173,142, 41,153,178,239,183,221,142,211, 97,143,133, 56,142,
-247,253,182,187,214,121,125,161,241, 95,127,110, 35,200,163,159,122, 94,118,225, 82, 54,110, 94, 59,171,  6,128, 67,251,126, 85,
-183,123,164,175,236, 86,238, 57,143,219,125,242,228,201,240, 52,189,175,133,248,212,123, 63,247,133,246,248,237, 70,229, 61, 31,
-240,147,147,147,127, 83, 42,149, 76,122,122,186,245,224,241, 36,180,106,221,170,230, 74, 15,143,176,125,251,246,239,148, 74,229,
- 15, 10,133,194,228,201,247,222,122,235, 45, 53,  0, 50, 99,198, 12,154,157,157,141,180,180, 52,148,149,149,133, 54,111,222, 28,
-173, 90,181,114,236,  5,224,133,242,103,241,175,164,164, 36, 81, 74, 74, 74, 63,163,209,184, 20,213,231,242,189,193,123,231,182,
-252, 77, 20,208,253,135, 69, 37,217,251,167, 53, 64,158,121,115,106,234, 51,  0,198,  0,248, 29, 86,107, 25,220,199, 35, 52, 58,
-216, 85,  0,174,174,123, 69,  0,220, 14,130, 74,165,112,221,186,117,238, 93, 85,251,142,105, 58,117, 29, 77,110,229,165,208,182,
-193,157,161, 45, 51, 99,211,142,163, 94,119,208, 13,223,174,177,127,183, 29,  5,110, 33,176,185, 16,159, 44,121,221,163,151,254,
-155,227, 89,247,108,157,102,129,214, 74,  0, 64,226, 43,162,198, 10, 19,172,  0,252,252,252, 96, 48, 27,136,197,236,185,188,212,
- 52,219,158,  1,225, 79, 44,164, 86, 42,192,213, 43,123,154,114,141, 41,215,165,131,252, 46,129, 28,234,199, 89,225, 55,242,180,
-128, 49, 54, 86,238,  3,192,178,106,149,170, 65,166,136,106,229, 42,118, 35, 31, 71,155,102,159,243,108,157,254,188, 21, 95,120,
- 69,198,106,110,  5,236,140,131,251,126,209,212,236,107,183,114,189,203, 31,224,110, 99,159,154, 28,216, 76,124, 80,193,212,191,
- 34, 53,187,204,140,208,230,194,251,242,170,216,215,234, 55,218, 59,231,169,242,175, 54, 62,123,191,225, 15, 23,124,106, 52, 26,
-127,  1,220,111, 74,199, 17,239,148,100,239,223,132,234,177,  1,158,194,  4,160, 24,158,197, 13,220, 51, 18,192,105,240,241,118,
- 31, 97, 30, 60,156,209,163, 71, 15,100,101,101,241, 21,193,131,  7, 15, 30, 15,  9, 24,190, 10,120, 52,  6,120,229,207,131,  7,
- 15, 30, 60,  1,224,193,131,  7, 15, 30, 60,120,240,  4,128,  7, 15, 30, 60,120,240,224,193, 19,  0, 30, 60,120,240,224,193,131,
- 71,147,163, 90,104,234,233,211,167,189,142,218,116, 21, 76,200,203,227,229,241,242, 30, 24,121,245, 70,135,243,245,199,203,227,
-229,253,185,228,121, 76,  0,156,  6, 10, 79,225,110,224,105, 76,121, 60, 30, 76, 80,190,221, 30,202,118,224,252,188, 82,169,244,
-  7,240,196,209,163, 71, 63, 17,  8,  4,195,124,124,124, 96, 48, 24,142,141, 24, 49,226, 61,  0,105, 10,133,194,240, 32, 84,128,
- 61, 59,164,250,175, 60,174, 80, 74,233,185,115,231,208,175, 95, 63,254,157,228,225, 17,  1,240,104, 29, 50,151, 68, 57,174,228,
- 57, 39, 62,241, 84,222, 95,112, 64,231,132,167,158,122, 74,182,111,223, 62, 13, 87,153,193,193,193,181,110,228,231,231,215, 28,
- 76,161, 82,169,  8,199, 50,222, 51, 18, 80, 87, 62,255,166,146,183,122,245,234,209,219,182,109, 75,204,204,204,  4,  0,132,132,
-132, 60,155,154,154,186,211,219,246,117,238,247,148, 82,199,251,193, 94,103,223, 21,251,117,226,134, 60,115,109,  7, 79,148,255,
- 99,231,206,157,219, 86, 90, 90,218,171, 75,151, 46,184,115,231, 14, 42, 43, 43,  1, 96,216,182,109,219,212,254,254,254,151,148,
- 74,229,243, 10,133,162,222,173, 36,207,157, 59,231,145, 65,144,156,156, 44, 83, 40, 20, 26, 79,190,163, 82,169,212,114,185, 92,
-230, 77,  2, 40,234, 97, 18,134,201,147, 39,123,242,126,  0,  0,186,116,177,237,128, 91, 86, 86,134,170, 42, 91, 26,116,189, 94,
-239,201,251, 86, 47,206,158, 61, 75,135, 13, 27,134,222,189,123,195,199,199,167,176,170,170,234, 17,126, 24,253,235,161,102, 50,
-160,123,150,  8,136,183, 98,239, 45,126,141, 31,231,246,153,231,103,239,245, 72,166, 90,125,215, 64,202,204,204,132,191,191,191,
- 99, 16, 98,193,101,243, 15,185, 92, 78, 85, 42, 85,205,115, 82,199, 51, 94,213,109,100,228,221,237, 92, 93,201,111,  8,  8, 33,
-116,228,200,145,178,164,164, 36,143,148,197,182,109,219, 18,219,182,109,139, 87, 94,121,  5, 58,157,206, 26, 23, 23,183, 99,229,
-202,149, 83, 23, 47, 94,188,197,195,255,143,223,126,251,205,113, 62,110,220, 56,236,221,187,183,222,115, 46, 98,107,244,101, 26,
- 22, 22,  6,  0,212, 41, 51,156, 71,202,191,164,164, 36,165,123,247,238, 45,  0, 64, 34,145,192,215,215, 23,133,133,133, 40, 46,
- 46, 70, 64, 64,  0, 10, 11, 11,123,237,221,187, 55, 77,169, 84,246, 84, 40, 20,  5,245,201,235,219,183, 47,228,114, 57, 66, 66,
-238,102,253, 91,181,106, 85,181,103, 98, 99, 99,  1,  0,199,143, 31, 87,123,211,111, 26,146,253,113,237,218,181,117,221,114,236,
- 85,224, 45,252,253,253,113,225,194,  5,136, 68, 34, 24,141, 70,236,221,187, 23, 89, 89, 89, 88,178,100, 73,131,250,113, 96, 96,
-160,  0, 64,212,225,195,135,247, 70, 70, 70,222,122,254,249,231,219, 37, 38, 38, 66, 32, 16,180,105,217,178,165,  0, 60,254,210,
-202,159,189, 86,147,  4,252,105,130,  0,195,195,195,165,247,219,226,110, 74,  4, 15, 94,238,248,120, 11,157, 78,231,176,248,245,
-122, 61,214,175, 95,239,248,120, 48,208,186, 60,159, 52,105, 18,149,203,229, 20,  0,173,249,140,167, 56,124,248,176,250,237,183,
-223, 70,183,110,221, 26,173,254,186,118,237, 74,222,121,231, 29, 80, 74,145,148,148,164,246,180,221, 51, 51, 51, 49,110,220, 56,
- 43,  0,136,197, 98, 38, 52, 52, 20,113,113,113,155,219,180,105, 67,195,195,195,199,123, 96,113,222,171, 46, 66,194,194,194, 40,
-251,187, 78,158, 60,201,238,  7,192,182, 11,103,183,191, 78,167,219, 38, 22,139, 91,  0,192,220,185,115, 49,109,218, 52,136,197,
- 98,248,250,250, 66, 34,145,128, 16,  2,129, 64,128,146,146,146, 22,  0,226,148, 74,101,189,178, 99, 99, 99, 17, 18, 18,130,156,
-156, 28,199, 39, 54, 54,182,218,167, 33,144,203,229, 50,251,239,244,122, 76, 88,184,112,161,227,227, 60, 94,214,184,206,121,163,
-151, 46, 93,186,192,223,223, 31, 75,151, 46,133,191,191, 63,118,236,216,129,138,138,138, 70, 81,254,246,119,153,234,116,186,255,
-155, 62,125, 58,122,244,232,209,110,239,222,189,184,117,235, 22,174, 95,191,142,226,226, 98,227,253, 28,155,148, 74,165, 52, 47,
- 47,143, 42,149, 74,169,171,123, 89, 89, 89,244,242,229,203,124,  2,186,251,160,252,163, 99, 87, 34, 58,118,101,157,196,224,190,
- 16,  0,226,  2,245, 93,247,  6,169,169,169,234,198, 32,  1,211,166, 77,123,104, 72, 64, 67, 97, 48, 24,106, 89,253,222, 52, 47,
-171, 76, 38, 77,154,228,176,242, 19, 18, 18,208, 80,197,239,108,253,171, 84, 42, 50,114,228, 72,153, 74,165,170,230, 17,104,  8,
-182,110,221, 74,  0,144,200,200, 72, 89, 77, 79,  3,199, 65,215,108,247,  6,160,109,219,182, 88,190,124,121,229,155,111,190,105,
-204,201,201,217,189,114,229,202, 49, 77,221,190, 78,123,  0, 16,231,118,242,176, 93,158,200,202,202,234,  5,  0,179,102,205, 66,
- 73, 73,  9,110,220,184,  1,145, 72,  4,161, 80,  8,161, 80,  8,145, 72,  4, 95, 95, 95, 84, 84, 84, 32, 49, 49,241,101,  0,129,
-238,132,230,228,228, 64,165, 82, 57, 62,206,158,128, 85,171, 86, 33, 49, 49,209,235,223,173, 82,169, 52,246, 41,  0,117, 35,189,
-203,117, 37,238,230, 60,126, 94,189,122, 21,187,119,239,198,242,229,203,209,165, 75, 23,180,110,221, 26, 73, 73, 73, 88,178,100,
-  9,252,253,253,  1,  0,  2, 65,131, 12,245, 14, 51,103,206,156,242,175,127,253, 11,169,169,169,184,113,227,  6,204,102,243, 43,
-173, 90,181, 10,  4, 96,186,223,125, 47, 56, 56, 24,209,209,209,234,236,236,108,234,172,252,163,163,163,213,143, 62,250, 40, 30,
-240, 93,114,255, 20,112, 86,252,206,199, 77,225,  1,160, 46, 62,245, 93,111, 50, 18, 48,126,252,248,198, 32,  1,212,131, 15,103,
-188,248,198,190, 70,107,144,204,204, 76,232,245,250, 58,221,252,199,142, 29,107, 12, 98,208, 96, 28, 62,124, 88,109, 39, 22, 72,
- 74, 74,210, 16, 66,208,182,109, 91,117, 99,118, 78,214,253,111,247,  4,212,139,213,171, 87,143, 31, 62,124, 56,  5,128,184,184,
- 56,241,247,223,127,143, 87, 94,121,133,117,205, 75,254,248,227, 15,177,253,222,254,240,240,240,231,184,252,255,113,227,198,225,
-233,167,159,118,184,247,217, 99,246,156, 61,230,232,254,  7,  0,216,173,127, 87,237, 64,106,220,175, 23,123,247,238,253,164,117,
-235,214,  0,128,203,151, 47, 35, 55, 55, 23,167, 78,157,130,209,104,  4, 33,  4, 66,161, 16,132, 16, 88, 44, 22, 24, 12,  6,108,
-223,190, 29,  0,250,123,226, 57,146,203,229, 46,201, 75, 78, 78, 78,131, 72,128,211,111,111,144, 55,  0,141, 48, 85,106, 50,153,
- 48,104,208, 32,104, 52, 26, 92,189,122, 21,131,  7, 15,118,220,211,104, 52,  8, 10, 10,114, 16,  1, 47,208,113,230,204,153,121,
-223,125,247, 29,162,162,108, 27, 25,117,236,216, 17, 22,139,229, 71,216,114,211,223, 87, 40, 20, 10, 13, 75, 62, 67, 66, 66,112,
-226,196,  9,202, 42,127,150,252,245,236,217,147,203,248, 48,  4,192, 15,176,237,121, 86, 31, 38,  0,136,  6,208,134, 87,251,247,
-185, 99,115,210,134,247, 49,  8,208, 78,  2,100,169,169,169, 26,111,101,116,237,218, 21,211,166, 77,195, 79, 63,253,228,109, 76,
-  0,  1, 64,127,250,233, 39,151, 55,247,236,217,  3,251, 61,143,101, 31,191,242, 24,134,118,187,128,252,244,165, 13,170, 39,231,
- 57,255,196,196, 68, 68, 69, 69, 33, 58, 58,218,161,252, 59,119,238,220, 24,164,175, 65, 68, 32, 50, 50, 82,122,248,240, 97,220,
-185,115, 71,198, 94,147, 74,165, 50,149, 74,165,142,140,140,148,122, 58,111,239,230,127,201,184, 16,128,109,219,182,237,102,231,
-254,245,122, 61, 86,173, 90,133,242,242,114,136, 68, 34,248,248,248,224,202,149, 43, 88,190,124, 57,116, 58, 29,226,226,226,126,
- 89,185,114,229,168,197,139, 23,171,221, 40,217,106,100,192, 93, 76,  0,135, 58,135,155, 29,  0, 29,211,  1,238,126,111, 80, 80,
-208,176,170,170, 42,152,205,102, 28, 59,118, 12,  2,129,  0, 70,163, 17, 21, 21, 21,176, 90,173,142,247,216,100, 50,161,170,170,
-138,125,167,251,186,147, 91,151,155, 63, 54, 54,214, 17, 15, 16, 18, 18,130,194,194,194,  6, 19, 81,167, 85,  1, 92,251,162, 22,
- 64,144,171, 27,107,214,172,241,170, 16,113,113,113,120,251,237,183, 49,112,224, 64,135,  7,132, 77,159, 61,112,224, 64,100,100,
-100,160,109,219,182,222,136,238, 50,115,230,204,171,223,125,247,157,243,248, 25,124,227,198,141, 27, 77,169, 88,  6, 15, 30, 76,
- 88,165, 63,120,240, 96, 12, 30, 60, 88, 13,  0, 25, 25, 25,232,213,171, 23,215,118, 56, 13,192, 23,192,102,  0, 83, 81, 99, 75,
-112, 59,222,  0,240,133,253,248, 61,  0,189,  0,247, 91,212,255,153,193,238,  6,184,126,213, 98,135,229,191,126,213, 98,199,189,
-251, 78,  0,238, 55, 30, 20, 18, 48,109,218, 52,250,222,123,239,213,114,  5,122,163,252, 27,211,250,  7,224,210,250,103,173,126,
-145, 72,132,130,130,130, 38, 85,254,206,214,191,115, 64,151, 90,173,118,246,  2,220,247,128,205,204,204, 76,188,242,202, 43,  6,
-  0,126,254,254,254,120,255,253,247, 33, 18,137, 28,247,103,204,152,  1,  0,  8, 12, 12,196,196,137, 19,113,244,232,209, 67,247,
-177,156,196,217,  3, 80, 31,  9,  8, 11, 11,171,185, 85,172, 75, 50, 96, 52, 26,161,213,106, 81, 89, 89,137,128,128,  0,248,248,
-248,192,108, 54,131, 82, 10,139,197,  2,163,209,  8,147,201,  4,139,197,226, 76,232,239,212, 87,200,156,156,156,106,  1,128,236,
-116,128,179, 71,192,249,126, 67,225, 69, 64,160,164,174, 27,206, 49,  1,158,144,129,229,203,151, 99,194,132,  9,232,218,181, 43,
-252,252,252, 32,149, 74,161,213,106,225,239,239, 15,157, 78,135, 13, 27, 54,128, 97, 60,118,200,118,154, 57,115,230,213,  5, 11,
- 22, 96,199,142, 29,120,238,185,231,  0,160, 61,154, 96, 11,218,186, 60,  1,  1,  1,  1,178, 41, 83,166,168,  1, 96,203,150, 45,
-178,169, 83,167,122,210, 22, 70,  0,211,  0,252, 84, 15,  9,112,158,106,123,  4, 64, 63,  0,105,188,109,143,106,138,191, 46,252,
- 41, 51,  1, 54, 84,249,179,240,214, 74,119, 30,144, 63,249,228,147,  6, 43,127, 22,131,  6, 14,192,193, 67,106,108, 58,228,231,
- 32,  5,199,175, 60,214,160,223, 24, 22, 22,134,156,156, 28, 36, 36, 36,160,115,231,206,216,184,113,163,199, 86,151, 82, 25, 47,
-117,242,224, 52,138,242,103,231,227, 11, 11, 11,101, 53,239,141, 28, 57, 82,150,144,144,208,104,177,  0,128,205,253,207,213,251,
-164,211,233, 46,194, 54, 47,108,221,178,101, 11, 54,108,216,  0,  0,216,188,121, 51,116, 58, 29,251,152, 57, 35, 35,  3,109,218,
- 52,141, 87,178, 70,180,127, 45,114,198,117,159,248,156,156,156, 99, 22,139,  5, 58,157, 14,119,238,220,129, 78,167,131,193, 96,
-128,193, 96, 64,121,121, 57, 74, 75, 75, 81, 82, 82,130,138,138, 10, 84, 85, 85,177,115,187, 41,245,201,172,169,220, 93,  5,146,
-214, 92, 21,192, 21,118, 87, 63,117,113,205, 19,248, 53,118,123,108,220,184, 17, 82,169, 20,126,126,126,184,112,225,  2, 52, 26,
- 13,252,253,253,241,143,127,252,  3, 71,143, 30,197,146, 37, 75, 60, 37,  0,237,103,206,156,121,125,234,212,169,248,249,231,159,
- 89,229,223,241, 65, 81,254,182,113, 65, 41,101,149, 63,  0, 76,153, 50, 69,125,233,210, 37, 79,167, 86, 89, 18,  0, 59,  9,168,
- 57, 29,112,217,233, 56, 23,192, 89, 94,237,223, 69,205, 32,192, 38, 33,  0,247, 35,  8,176,177,149,191, 93,113, 55,134,229, 70,
- 62,249,228,147,  6, 41,255, 23,223,216,135, 65,  3,239,186,110,182,253,188,221,225, 17, 56,120, 72,237, 21,  9, 80, 40, 20,176,
- 47, 13,131,193, 96,192,129,  3,  7,176,124,185,109, 69,193,217,179,103, 97, 54,155, 61,144, 21,163,  1,108,129,127,148, 82, 54,
- 24,176, 65,202,159,181,254,235,115,243, 55, 86, 44,  0, 75, 36,164, 82,169,204,221,179, 33, 33, 33, 99,227,226,226,194, 82, 83,
- 83,133, 63,252,240,  3,115,233,210, 37,204,152, 49,195,204,214, 99, 92, 92, 28, 82, 83, 83,241,195, 15, 63,  8,175, 93,187,134,
-240,240,112,183, 50,239, 69, 12,  0,107, 73,215, 32,  1,148, 37,125, 92, 17, 26, 26,154,110, 54,155, 97, 52, 26,113,251,246,109,
- 20, 20, 20,224,214,173, 91,184,117,235, 22,110,223,190, 13,173, 86, 11,131,193,128,170,170, 42,148,148,148,176,255, 51,175, 62,
-153,108,160,159, 51,  9,173,167,236, 30, 41,127, 54,  7, 64,205,107, 13,233, 31, 46, 86,  3, 56, 72, 30, 87, 25, 89, 89, 89,200,
-200,200,128,193, 96, 64, 68, 68,  4,250,247,239,143,141, 27, 55,226,221,119,223,133, 88, 44,134, 64, 32,128, 80,200,217, 33,219,
-105,230,204,153, 55,167, 78,157,138,180,180, 52,124,240,193,  7,172,245,123, 19, 15,200, 50,230,244,244,116,202,206,249,159, 58,
-117, 10,235,215,175,151,  1, 64,207,158, 61,225, 28, 24,216, 64, 18, 48, 31,182,249,255, 73,  0,230,  0,  8,199, 95,220,253, 15,
-220,141,244,119, 21,  4, 88,115, 21,192,253,154,  2,160, 30, 94,255,179, 40,127,  7,  9,104,192, 84, 66, 53,229,239,234,252,224,
- 33,207,199, 55,231, 65,215,207,207, 15,189,123,247,174,118, 63, 53, 53,213, 35,121,147, 38, 77, 66, 66, 66,  2, 88, 34,  0,128,
-218,175,121,188,238,124,227,198,141,106,  0,216,187,119,175,204, 85,196,122, 82, 82,146,230,234,213,171, 46,173, 71, 87,168, 43,
-233, 15, 75, 52,146,146,146, 16, 25, 25, 41, 83,171,213,110,251, 78,106,106,234,129, 21, 43, 86,140, 78, 78, 78, 62, 24, 26, 26,
-138,204,204, 76,232,116, 58, 97, 96, 96, 32,102,206,156,  9,173, 86,123, 45, 57, 57,185, 75,104,104, 40,146,147,147, 73, 76, 76,
-140, 59,114, 92,107,206,191,  1, 49,  0,213,222, 45, 54, 95,130, 61,119,130,195, 51,227, 52,255,239,182, 61,134, 14, 29,250,174,
- 70,163,153,103,177, 88, 80, 90, 90, 10,147,201,228,152,247,175,172,172,  4,165, 20,148, 82,100,100,100,192,104, 52, 34, 42, 42,
-234, 37,133, 66, 97,118,149,116,164, 46, 68, 69, 69, 33, 42, 42,170, 90,208,159,167, 83,  0,206,138,222,238,242,167,206,253,195,
-190, 42,160,177,199, 53,206,227, 39,187,212,239,205, 55,223,132, 70,163,129, 76, 38, 67, 86, 86, 22,154, 53,107,134,220,220, 92,
-  8,  4,  2,174, 30,  0, 50,115,230,204,235,211,167, 79,199,145, 35, 71,240,143,127,252,  3,  0,130,  1,220,192,221,252, 15, 77,
-110,249,179,227, 75, 78, 78, 14,194,194,194,216,126, 38,139,142,142, 86,135,132,132, 32, 35, 35,131,114, 12,  4,116, 38,  1, 83,
-237,  4, 96, 51,128, 99,  0, 20,  0,164,  0, 10,192,163,241, 58,112, 99,103,227,115, 21,240,179,106,213,170, 58,175, 55,165,242,
-183,175,  0,184, 23, 44,218,107,153,215,243,220,247,111, 95, 95,207,188,150,238,130,196, 60, 69, 84, 84,148, 44, 33, 33, 65, 51,
-121,242,100,186,117,235,214,106, 68,160,  6,225,227, 92, 15, 49, 49, 49,110,153,141,135,137,129,104, 13, 34, 97, 27,149,100, 50,
- 78,202,223,105, 48,119,204,235,135,135,135,255, 45, 46, 46,238,199,137, 19, 39, 34, 35, 35,  3,215,174, 93,235,178,116,233, 82,
- 89, 76, 76, 12, 39,121,247, 40, 15, 64,181,122,174, 67,241,113,202, 24,168, 80, 40,244,241,241,241,203,246,236,217,243,161,217,
-108, 70,113,113,177, 35,  6,  0,  0,110,223,190,141,226,226, 98, 80, 74, 89,171,221, 35, 45,203,206,255,135,133,133, 57, 34,216,
-217,235, 92, 73,128, 11, 43,191,214, 52,212, 61, 80,254, 30,131, 37,  1,139, 23, 47, 70, 82, 82, 18, 38, 78,156,136, 21, 43, 86,
-224,173,183,222,130, 80, 40,132, 68, 34,113, 59,134, 80, 74,173,179,102,205,194,143, 63,254,136,239,191,255, 30,  0, 58,219,149,
-127,163, 27, 84, 13, 65,126,126, 62,118,239,222, 93, 45,139,163,253, 88, 54,106,212, 40,181,151, 75, 30, 45,118, 18,176,203,110,
-253, 15,229,149,127,221,112, 21,  4,200,137,  0,120,146,136,195, 91,133,221,216,104, 12,229,223, 80, 69,125, 47, 48,127,254,124,
-217,165, 75,151, 26, 85,166,221, 69,218,168, 75,233, 88,133,103, 95, 91,207,122,  5, 40, 33,  4, 86,171, 21,219,182,109,227, 76,
-  2,222,126,251,109,182,156,181, 98,  0, 24,134,129,213,106,197, 59,239,188,163,230,170, 60,235,147,151,148,148,164,113,206,138,
-232, 69,191,251,239,138, 21, 43,110, 39, 39, 39,239,229,106,245,223,  7,104, 62, 28, 93,  0,  0, 32,  0, 73, 68, 65, 84,111, 27,
-169,233,237,169,131,240,113, 34,  1, 49, 49, 49, 31, 41,149,202,132,159,126,250,233,188, 88, 44,  6,187, 42,192,106,181,162,101,
-203,150,208,233,116,144,203,229,136,138,138,242, 83, 40, 20,110, 23,120,179,227,139,115,240,223,201,147, 39, 17, 21, 21, 85,109,
- 60,113, 55, 14,197,198,198,210,156,156, 28, 89, 77, 23,191,183,105,128,157,225, 34,192,207, 12,192,188,102,205, 26,137,221, 26,
-101,156, 62, 30,145,  0,231,196, 63,115,230,204,113, 28,151,150,150,186, 29,155,  8, 33,100,230,204,153,244,135, 31,126,120, 30,
-192,175, 15,162,226,177, 43,122,226,233, 61, 46,164,189,  6,110, 62, 12, 99,248,253,  6,187, 10,192,149,226,231,180, 10,160,177,
-149,122, 93,242, 30, 20,242,240, 32,119,156,207, 62,251, 76,211,216, 50,107,172,145,190,103,168,225,254,231,250, 82,115,205,133,
- 78, 60,248,189,247,244,183, 46, 89,178,100, 95, 67,234,115,220,184,113,213,150,197, 62,253,244,211,213, 60,  3, 30,206,253, 19,
- 15,189, 61,156,202,173, 80, 40, 46, 40,149,202,102,251,247,239,255, 52, 55, 55,119, 94, 69, 69,  5, 44, 22, 11,  6, 12, 24,128,
-193,131,  7,199, 69, 69, 69,197,114, 81,254,  0,112,252,248,113,199,113,100,100,100,181,235, 53,207,221,140, 43,196,153,208,178,
-100,194, 30,  7,224, 85,187, 79,158, 60,185,174, 91, 66,167,241, 82,124,175,198, 21, 55,158, 10, 43,  0,124,255,253,247,252,134,
- 41, 60, 56,147,128,186,148,127, 93,  4,160,177, 59, 23,223, 89,121, 16, 15,153,253, 95,174,110,156, 21,254, 61,152, 22,104,148,
-119, 80,161, 80,232, 97,115,189,206,103,175, 93,188,120,145,139,226,114,160,111,223,190,141, 62, 30,184, 34,180,222,186,252,239,
- 53, 89,228,193,235,143,251, 73,  2,220, 86,174,183,251,  8,243,224,193,131,  7, 15, 30, 60, 30, 94, 48,124, 21,240,224,193,131,
-  7, 15, 30, 60,  1,224,193,131,  7, 15, 30, 60,120,240,  4,128,  7, 15, 30, 60,120, 60,132, 48,195,131,237,138,121,252, 53, 33,
-228,171,128,  7, 15, 30, 60,248,177,157,199, 95,188,147,156, 62,125,218,235,136, 75, 87,193,132,110,228,213,187,254,216, 11,121,
-141, 93, 62, 94, 30, 47,239, 47, 45,239,247,119,175,121, 61,176, 12,252,180, 11,238,181,188,147, 75,188,151, 23,182,162,182, 60,
-182,254,148, 74,165,212,100, 50,225,202,149, 43,106,163,209,  8,161, 80,136,188,188, 60,188, 20,208, 21,251,210,211, 81,241,120,
-103, 12, 29, 58, 84, 38, 16,  8,216,117,237, 77,214,190, 74,165,242, 49,  0,109,207,159, 63,191,187, 99,199,142,140, 86,171,149,
-116,236,216,113,185,175,175,239, 58,133, 66,113,  3,  0,226,227,227,153,248,248,120, 75, 93,242,226,227,227,155,219,189,  5,134,
-152,152, 24, 10,  0, 75,255,254,228, 55,138, 39,115,103,110, 74, 15,189, 34,108, 59,118,104,179,230, 45,202,  1, 80, 74,169, 16,
- 64, 96,124,124,252,117,254,125,123,176,229,221,107,150,200,117,211, 23, 79, 83,224,122,156, 50,119, 85,196, 83, 82, 97, 80,128,
- 58, 59,243,178,236, 81,159,102, 88,116,238,176,230, 65, 98, 89,245,228, 35,231,151,184, 52, 49, 38, 76,152, 32,221,179,103,143,
- 58,238, 93,219,249, 47, 71,158,196,225,195,135, 57,181,203,223,102,188, 42,101,  8, 81,103, 92,186,  4,157, 78,135, 46, 93,186,
-160, 89,243,230,216,158,176,141,115,187, 78,154, 52,169,218,139,155,144,144, 80,239, 94, 10,246,236,138, 94,245, 27,118,163, 38,
- 74,105,195,250,157, 92, 91,253, 85, 85,  5,121, 47, 43,108, 13, 16,242,170,237, 56,103,  3,112,114, 81,195, 27,117,210,157,234,
-229, 75,104,205,233,107, 74,165,146,234,245,122,217,246,237,219,213, 57, 57, 57,144,139, 90,161,125,231, 54,168,212, 87,192,215,
- 96,198,240,183, 94,199,200,137, 83,176,235,187,120,236, 60,120, 80, 61,118,236, 88,217,  3,208,133, 51, 45, 22, 75,135,156,156,
- 28,107,255,254,253,197,161,161,161, 56,117,234,212,187,149,149,149, 19,148, 74,101,148, 66,161,208,198,196,196, 88,235, 91, 18,
- 22, 19, 19, 83,230,124,254,213, 87, 95, 49,123,255, 27,219,163,211,172,129,120,103, 72,159, 54,199,247,255,123,235,182,179,210,
-211, 61,250,142, 90, 65,  8,209, 42, 20,138,188,  1,  3,  6, 88,237,164,129,247, 52,252,197,220, 68,158, 50, 13, 78,217,198,188,
- 81,254, 95, 71, 62, 43,141,104,211, 73, 77, 64,145, 85, 94,140, 14, 29,187,170, 77, 86, 11,150,244, 27,134,194, 46,109,100,223,
-237,250,149, 19, 17,136,158, 10,218,171, 59,123, 38,192,246,253, 86, 28, 57, 65, 17, 61, 21,232,213, 29, 88,244, 73,195, 20, 55,
-187, 65, 73, 67,179,147,185, 34, 19,141, 37,183, 33,160,148, 82, 44, 35, 32, 31,213,251, 12,176,140, 96,242, 69,249,  3,179,214,
-250,174,242,167,118,229, 63, 18, 71,143, 30,229,244,221,148,227, 47, 82,179,169, 23, 84,170,155, 72, 77,177, 37,172,201,188,148,
-  1,  0,216,189,155,208,140,203,147,100,139,230,115,107,151, 49, 99,198, 88, 15, 28, 56,192, 36, 36, 36,224,208,161, 67,213,146,
-225,212,132,151, 41, 84, 29,205,228,162, 35, 83,234,  5,161, 96,211,133, 55, 56,103, 65,200,171,142,141,118,214,172, 89,211, 56,
-  4,192,169,158,236,187, 19,114, 66,118,118, 54, 52, 91,183,170, 63,138,154,140,  1,211,230, 64,220, 46, 16, 16,218,147,253, 89,
- 41, 96, 21,193, 90, 69, 49,254,213,104,228,126,190, 18,199,142, 29, 83, 43,149,202,106,233,110,155,  0, 22,134, 97,218,182,110,
-221, 26, 26,141, 70,216,191,127,127, 12, 25, 50,132, 41, 40, 40, 24,120,230,204,153,115, 74,165,114,144, 66,161, 40,176, 43,107,
-134, 99,221, 53, 27, 61,106, 76,200,138,213, 59,152,216, 25,103, 91, 12, 29, 55, 91, 54, 52, 60,241,201,183,190,200,123, 38,244,
-137, 87,194,  0,148,193, 22, 99,192,212,165, 31,156, 19, 91,185,235, 71, 13, 38,164, 60,106,122, 18,220,121, 11, 28,199,158,  4,
-  1, 82,182,113,  7,188,210, 15, 74,165,146,241, 64, 17,214,220,164,130,134,133,133, 33, 44, 44,204,235, 60,241,202,151,163,165,
- 47, 15,140, 80,247,236, 16,140,238, 29,130,241,120,155,142,  8,246,109,  6,137, 21,232,230,211, 12,  1, 89, 55,212, 51,159,121,
- 78,202, 69, 86,175,238,192,165,108,  6, 23, 47,251,225, 92,118, 11, 60, 63,198, 31,171,223, 19,160, 87,119,210,104, 70,122, 67,
-149, 52,187,205,105, 72, 72,136, 58, 61, 61, 29,233,233,233,248,240,191,103,240,232,248, 88, 53,  0,234,225,150,167,148,235, 71,
- 46,151,187,127,139,151,217,234, 40, 44, 44, 12,114,185,220,229,135,125,198, 83, 76,236,255,129,212,185, 60, 19,250, 45,147, 54,
- 70,123, 76,152, 48, 65,186,123,247,110, 53, 33,  4,111,126, 74,240,203,145,145, 56,114,228,  8,167,239,110,221, 58, 77, 58, 52,
- 60,  6, 35, 70,220,196,231,159,127, 94,237,222,203, 47,  3,227,199,  3, 11,231, 37,168, 87,127,198,173, 77, 88,229,175,209,104,
-192, 48, 12,166, 76,153,  2,129, 64,208, 16,101, 95,203,242,119, 53, 32, 19,226,157,242,111, 52,132,173,  6,  0,172, 93,187, 22,
-107,215,174,181, 93, 27, 20,215,100,197, 57,116,232, 16,190,122, 33, 26,131,159,147, 67,216, 42,  8, 68, 36,  0, 35, 18, 64, 32,
- 17,131,241,149,  0,160,160, 22, 51,168,209,136,215, 95,157,131,210,131,233,200,206,206, 86, 43,149, 74, 41,154, 14, 36, 61, 61,
- 61,162,115,231,206, 98,171,213,138,164,164, 36,236,216,177,  3,  1,  1,  1,136,136,136,232,176,101,203,150,143,237,207,113, 10,
-  8, 84, 42,149,130,163,  7,255,247,159, 71,252,242,218,233,203,  4,120,121, 89, 57,190,252,247,103, 64,243,190,194,127,199,182,
-237,150,125,234,167,151,157,116,  7, 83,  7, 49, 36, 78, 74,157,216, 46, 19,199,177,243,245,123,180, 23,  6,143, 70,246,  0, 56,
- 90,105,211,222,159,138,187, 63,218,189,165,226,163,215,173, 30,106, 71, 18, 22, 22, 70,217,180,164, 78,233, 73,169,167,105, 59,
-149, 47,188, 42,125,170,243,163,106,113,165, 25,190,255,126, 27,102,131, 17,146, 55, 63, 65,128, 88,130, 74, 81,  5,244,149, 21,
-240,  5, 65,213,245, 66,245, 63,255,249, 79,217, 59,239,188, 83,175,242,189,148, 13,172,223,108,  5, 96,176,127,128, 39,159, 96,
-240,194, 88, 82,237,189,137,158, 10,172,223,236,149,242,150,169, 84, 42,234,173,181,206, 90,253,233,233,233,119,235,224,168,  9,
- 21, 70, 61,  0, 96,116,236,  1,168, 86,141,241,200,203,144,189, 50, 27, 34,146,117,183, 35,144,124,144,214,189,156,206, 11,209,
-230,255, 94,224,214,176, 31, 57,242,205,147,186,210,206, 18, 59,233, 59,121,146, 91, 59, 43,158,253, 82,186,126,199,223,213, 59,
-207,124,128, 21, 11,126, 65,184, 52, 20,155,190, 62,130,111,247,219, 54,  8,154,253,183, 15,100,235,254,251,129, 87,164, 42,238,
- 93, 80, 96, 55, 84, 63,156,  7,165, 20,205,219, 62,142, 35, 71,142,192,190,111, 65,189,229, 91,253,153, 92, 42,151,183, 82,  3,
- 95,  1,248,  5,169,169, 64,120,248,221,251, 31,127,124,247,120,225,188,  4,181,175,223, 82,217,236,215,151,215, 91, 78, 86,249,
- 71, 70, 70,194,106,181,226,203, 47,191,108, 84,  7, 13,  0, 88,173,214,218,202,159,214,255,254, 50,147,117,213, 94,126,118,  8,
-183,202, 93, 60,231,240,243,217, 14,250,247,175, 61,199,206, 76,209, 85,163,249, 86,235, 12, 44, 88,176,192,113,127,193,130,  5,
- 88,187,118, 45,152, 30,179,238,254, 87,251,243,174,228,  9,167,184, 46, 95,205,157,172,133, 83,184,149,175,178,178, 18,237,187,
-116,  5,172, 70, 48, 62,  0, 17, 10, 96, 46, 43, 65,101,206, 21,220,206,203, 71,167, 97, 82, 16,113, 75, 16,147, 17, 16, 48, 88,
- 53,251, 45,140, 89,255,  1, 22, 45, 90,212,216,227, 50, 39,173,168, 84, 42,  9,165,180,101, 69, 69,197,176,160,160, 32,100,100,
-100,192,106,181,226,202,149, 43,216,176, 97,  3,122,247,238,141,224,224,224, 87,  0,188, 94, 67, 89,215,233, 13,160,148,182,238,
-194,164, 74, 59, 60, 50, 78, 92,156,116, 22, 37, 58, 31,252,184,203,140, 61,199,255,139,121,114, 95,161,208, 96, 13,179,199, 20,
-184, 36,  0,188, 66,111,122,212, 53,221,227,202, 51,192,112,232,136,236,188, 33,164, 75, 70, 98,125,146,178,101,246,229,108,156,
-254,225, 44,148, 74,165, 71,214,  3,171, 28, 12,134,159, 96, 48,108,130, 86, 27,197, 90,199, 30,253,192, 33, 62, 45,212,109, 43,
- 45,144, 44,155,  3,203, 29, 45,204,151,175, 66, 40, 22,193,143,  8,224, 79,  4,240, 23,  8, 17, 36,146,128,150,233,113,243,208,
- 49,183, 59,189,184, 82,234, 71, 78, 88, 29,239,225,234,247,  8,226,150, 18,187, 71,192, 59,235,223,174,156,213,240, 34,  5,110,
- 77,229, 15,161,  0, 57, 55,203,113,179,200,136,212, 11,182, 13, 68,122,204,216,  9, 79,246, 61, 23,145, 44,  8, 73, 62,124,152,
- 51,182,191,109,  9,  2, 95,190,129,128,169,231,224,243,252, 50, 32,216,223, 51, 79, 46,135,157,219, 60,217,226, 85,185,227, 13,
-245,208,160,247,112,242,240, 21,252,191, 73, 19, 17,220,186, 39,230,252,253, 53,124,177,116, 63,134,  6, 46,197,186,255,126,232,
-245, 14, 62,132,  0, 49,139,206, 57, 44,150, 17, 35, 70,216, 21,146,213,109,  3, 79,155, 42, 82,  3,135,  0,252,130,226, 91,205,
-208,227,145,102,248,230, 27,155,229,191,108, 25, 16, 18, 98, 19, 81,124,171, 25,138,111, 53,195,128,126, 23,213,238,148,255,161,
- 67,135, 96,181, 90, 29, 74,122,203,150, 45,176, 88, 44, 30,185,175,235,241,240,212, 82,254,182,247,217, 61,121,167,  0, 89,167,
- 84,202, 88, 75,205, 74, 41,172,214,218,221,151,189,110,165, 20,235,226,227,101,241,182,239,184,252,159, 20, 32,148,130,196,199,
- 43,101,148, 82,124,246,217,103,142,251,236,113,124,124,188,140, 82,219,115, 20, 32,117,201,139, 87, 42, 97,191, 71, 44, 22, 11,
-204, 22, 11,204,230,218,117,198, 94, 55, 91, 44,248,122,221, 58,217,186,248,248, 58,202, 71, 33,108,222, 28, 16,  9, 96, 49,148,
-227,252,182,  4,252,227, 53,  5, 58,189,161,192,192,149, 31,225,202,239,167, 32,240,149,192, 84,116, 11,103,143,107,176,243,200,
- 62,148, 20, 20,224,220,185,115,141,182,177, 86, 68, 68,  4, 39,111,130, 82,169, 12,160,148, 14, 73, 79, 79,255,245,253,247,223,
-239,115,254,252,121,177,209,104,132, 64, 32, 64,243,230,205, 97, 54,155,145,150,150,  6, 66,136,216,221, 88, 31, 31, 31,239,175,
- 84, 42,125,227,227,227,131,139,243,146,127,255,240, 63,185, 65,127, 28,217,  5,173,158,129, 88,200,160, 83,160,  4, 37,119,196,
- 80,252,211,140,179,119,  6,250,187,211, 27,246, 88, 19,234,220, 23,237,196,160,214,117, 94, 93,223, 31,176,202,191, 38, 57, 96,
-220,177, 80,118,191,239,106,110,206,113,211, 60,247,246,217,221,253,  6,195, 38,  0,  4,149,149,223, 67,114,226, 42, 12,251, 30,
-173,118,223, 29,222, 25, 20, 41, 13,208,150,193, 42, 22,194,120,242, 60,170, 46,230,160,114,255, 17,160,162, 10, 98, 74,225,  7,
-  1,132, 32,168,178,154,161,173,170,196,215,  7,118,185,149,185,250, 61,155,117,239, 12,219, 57,107,174, 80,100, 92,166, 88,244,
-137,247,253,181, 70,190,114,206, 46,123,185, 92,238,216, 91,155,197, 75,107,243,112,240,164, 14,185,183, 42,  1,  0,185,183, 42,
-145,149, 87,  1, 68,109,101, 55, 70,113,239,250, 33,249, 54, 34, 80,118, 22,254,254,151,225, 35, 41,131,213,170,133,201,116, 18,
-  2, 65,  8,140,250,162, 38,235,172,147,199,253, 93, 10, 16,124,249,203, 44, 52, 99, 30,  1,  0,220,204,160, 24, 52, 81,128,191,
- 47, 31,131, 17, 99,250,  0,160,246,231, 60, 67,100,100, 36,125,243, 83,130,102,109,250,129,  2, 24,247,194,108,206,243,254,235,
-190, 89, 74,219,182,253,  3,192, 57, 20,223,106,134,178, 34,219, 22,204,253,251,  3, 61,122,  0,175,188,114, 87,249,151, 21,249,
-162,172,200, 23, 65,126, 55,235,149, 57,105,210, 36,200,100, 50,140, 26, 53,170,154,235,223,249,227,205,148,128,171,247,214, 27,
-196, 56,205,111, 19, 66, 28,159,186,174,197, 40, 20, 26, 69,180,251, 57,241,232,232,104,181, 43,203,121,193,130,  5,136,142,142,
-174,166, 80,235,146,247,139, 82,137,115,231,206, 57, 92,240,206,117,198,162,230,181,217, 49, 49,154, 24,133,235,173,154,197,148,
-130,241,243,129,169,224, 26,148, 75,151, 98,131,190, 24,186,200,161,142,251,223,253,119,  3, 62,120,235, 53,132, 46,122,  9, 31,
-157, 61,132,173,186, 43, 24,243,236,179,  8,  9,  9,241, 56, 24,208,174,232,105,120,120,120,181, 62,124,252,248,113,117,125,219,
-177, 43,149, 74,145, 82,169, 28,124,246,236,217,220,164,164, 36,205,155,111,190, 57,244,203, 47,191,148,148,151,151, 59,182,105,
-174,172,172, 68,179,102,205,178, 38, 79,158,220,115,248,240,225,143,184, 33, 18, 12, 33,164,203,217,148,109,133,153,251, 22, 93,
- 93,180, 36,174,195,206,101, 29,113, 49, 95,136,146,114,  1,172,  4, 40, 42, 55,130,182,234, 94,185,240,221, 79,250, 60,243,252,
-223, 94,135,155,120,  2,187,251,191,154,171,223,205, 49,143, 38, 80,254,117, 77,  1, 80,174,174, 28,133, 66,225,238, 33, 90,211,
-250,183,185,218,190,175,203, 59,224,246,159,246,105,221, 78,173,165, 38,136,139,180,144,252,114,  8, 68,200,  0,149, 70,208, 50,
- 61,136,217, 12, 17,  0, 11,181,162,210, 98, 70,153,217,  8, 88,221, 91, 81,108,144,223,234,247,234,228,180,176,  5,  9, 54, 10,
- 97, 37, 78,129,124,110, 95,128, 90,214, 63,128,255,189,209,161,218,249,224,197, 57, 16,209, 59, 48,145,214, 80,169, 84,135,184,
-190, 88,146,114, 53,130, 62,250, 47,110,191, 25,131, 59, 90, 95,116, 52,157,135,197,146,  3,  0,184,118,186,125,147,117,216,173,
-123,191, 80,191, 54, 86, 89, 77,249,179, 24, 26,184, 20,195,250, 76, 66, 68,208,121,108,221,187, 92,237,201, 32, 50,114,228, 72,
-154,148,148,132,162,162,209,104,213,234, 32,154,181,238, 11, 74, 41, 24,134,225, 20,136,148,155, 11,228,228,156,179,159,149,  3,
-146,114,104,245,192,144, 33,182, 43, 89, 89,192, 87, 95,  1,101,165,128,190, 28, 40,215,  3,254,129,165,156,202, 86,151,181,159,
-157,157, 13,  0,248,244,211, 79,  1,  0,161,161,161,247,194,205,204,169, 14,231,207,159, 95,205, 98,175,169,184, 57,123,119,236,
- 10,219, 49,239,239,132,207, 62,251, 12,107,215,174,133, 82,169,148,186, 11,174,155, 21, 28,138,204,243, 23,144, 31, 24,168,102,
- 24,  6,243,230,205,171, 21,147,225, 73,249,158,172,106,  9,106, 45,199,107,159,190,135,126,147, 38, 65,249,233,167, 96,152,187,
-122, 78,153,117,238,174,135,240,200, 17, 28, 56,112,  0, 87,174, 92,145, 41, 20, 10, 13,151,141, 87,156,149,127, 74, 74,138, 26,
-  0,210,210,210,212, 17, 17, 17,178,148,148, 20, 77,120,120,184, 52, 53, 53, 21, 17, 17, 17,178,138,138, 10,117, 29, 99,174,105,
-198,140, 25,253,166, 77,155,214,162, 91,183,110,216,179,103,143,161,164,164, 68, 88, 81, 81, 97,243,118,216,231, 63,182,111,223,
- 30, 58,110,220, 56, 95,133, 66, 81,225, 66, 12,227,164,172,153,156,140,211,107, 63,120,103,102,179, 86, 61, 84,248, 93,245, 42,
-254,184, 78,144,123, 75,  8, 80,  6, 85, 70, 19,180,180, 85,254,220, 89,115,134, 18, 66,242,217, 49,223,147,223,235,194, 67,192,
- 79, 21, 60, 32,168,147,197, 37, 37, 37,213,250, 20,231,235, 80,156,175,243,168,173,217,207, 93, 43,214,214,240,146, 19, 87,225,
-115, 46, 31,194, 60, 29,235,  1,168,246,124, 93,  2, 47,228,229,226,196,157, 27, 56,127, 37,  7,183,174, 92, 69,233,213, 60,148,
- 93,207,135,217, 80,  1,147,201,140, 50,139, 17,  6,139, 25, 85,212,  2, 11, 40, 40,225, 78, 50,157,163,253, 47,101,219,206, 23,
-125,194, 90,254, 12,226,222,107,156, 21, 47,158,198,  1,196,170,116,136, 85,233,170, 41,124,246, 19, 17,155,  6, 17,189,  3, 33,
-213,225,127,179, 44,102,206, 83,  0,183, 78,192,162,111,  6,  0,248,183, 48,  0, 85,183,174, 33,253,159, 29,144,249,211,  4,156,
-248,231,  0,100,101,220,104,210,142,217,127, 72,  8,244, 58, 64,175,  3, 12,190, 23,  0,  0, 63,127,104,194, 59, 11,150,  1,  0,
-134, 71,245,241,216,242,127, 97,228, 97,104,181, 81,  8, 60,126, 16,107,222,179,145,220,145, 35, 71,114,114,253,  3,192,138,143,
-151,147,238,221,  1,231,207,165, 75, 54,247, 63,  0,244,232, 65,177,118, 45,208,165,103, 57, 30, 27,122, 27, 67, 70,223,198,243,
- 47,153, 56,151,209,217,226,103,207, 67, 67, 67, 17, 26, 26,138,121,243,230, 53,118, 21,187,125,215,156,177,126,253,122,153, 43,
-133,237,240,162,173, 94,141,245,235,215,115,178,132, 95,127,253,117, 53, 27,249,239, 10, 11, 23, 46,172,229,  5,112,133,195, 23,
-114, 49,115,214, 92,156,220,180,  9, 75,150, 44,169,147,156,176,229, 59,120,240, 32,234, 11,216, 27,249,216, 35,248,254,187,175,
- 16,246,242,203, 88,177, 98,  5,234, 43,227,130,  5, 11, 48,122,244,104,120,179,  2, 32, 37, 37, 69,237, 20, 44,135,227,199,143,
-171,  1, 32, 53, 53, 85, 77,  8, 65, 74, 74, 74,189, 50, 13,  6, 67,203, 93,187,118,225,194,133, 11,200,202,202,242,211,235,245,
- 48,153,108,253,204,104, 52, 98,239,222,189,196, 78, 22, 42, 56, 20,199, 90, 85, 85, 37, 62,185,237,101, 84,102,126,129,125, 73,
-217,184,114, 83,128, 82, 61,  3, 11,  5,242,245,190,152,187,232,189,136,152,152,152, 60, 14,  6,159,131, 87,176, 75, 78, 57, 78,
-  7,240,104,  2,235,191, 46,  2, 64,  0, 16,169, 84, 10,169, 84,138, 51,103,206, 56, 62, 57, 39,174,161,164,162,  4,173,134,120,
-190,238,247,228,201,147,  4,  0,252,252,166, 65,114,226, 42, 68,215,138, 64,  9,129,120, 86, 81,181,251,110, 21,151, 88,  0, 11,
-  5,242,244,197,200, 45,209,226,118,169, 14, 37,149,149,208, 25, 43,112,187,170,  2, 55, 43, 13,200,175, 44,135,214, 84,  5,157,
-213,  4,163,213,125,240,235,147, 79,184, 24,240,156,226,  2, 94,155,210, 12, 20, 98, 80,143,183,  1,191, 27,189,239,226, 26,103,
-228,222,170,196,193,147, 58, 12, 94,156, 83,189, 46,232, 29,248, 88,175,193,199,122, 13, 31, 60, 37, 68,110,110,174,145,171,204,
-109, 87,172,104, 19, 23,239, 56,191,162,183, 32, 47, 59, 31, 25,201,231, 81,112,181,184,201, 59,238,166,175,147,  0,  0,165,133,
- 20,126, 21,143, 65, 58, 75,136,255,183, 76,228,248,196,109,125, 25,132,187,241, 79,159, 27,145,132, 87, 23,217,148, 63, 33,  4,
-191, 38,219,154,128,235,154,127, 22,161,189,122, 86, 47,231, 38,224,203, 47,129,203,151,109,158,128, 15, 63,164, 14,247, 59,165,
- 20,129,129,129,238, 71, 96,123, 31,101,231,253, 63,253,244, 83,100,103,103, 35, 51, 51, 19,153,153,153, 72, 76, 76,196, 91,111,
-189,133,220,220,220, 38,107, 15, 86,209,185,178,164,231,207,159, 15, 66,  8,103,101, 72,  8, 65,125,100,162,190,123,206, 56,226,
- 83, 12,194, 52,195,183,239,126,130,102,187, 18, 17, 29, 29,141,151, 89, 54,  6, 64,209,163, 47,230,135, 13,131,159,159, 31, 70,
-142, 28,137,247,223,127, 31,137,137,137,234, 21, 43, 86,184,124,255,190,203,207,196,205, 62,143, 33, 56, 56, 88,102,181, 90,235,
- 37, 20,245,221,227,160, 28, 29, 30,167,136,136,  8,153,147,162,196,208,161, 67,101,110,188, 39,163, 70,142, 28,217, 34, 55, 55,
- 23, 71,142, 28,193,163,143, 62, 10,161, 80,232,152,226,  8, 14, 14,230, 58, 29, 97,181,255, 95,210,189,215,192,216,245,251, 91,
-226,143, 61,203,240,100, 68,111,248, 75, 24,248,251, 89,224,235, 83,133,167,159,155,108,  5,160,117,254, 98,124,124,188,187,185,
- 40,199, 42,  0,142,211,  1, 60, 30, 52, 15,  0,  0,162, 84, 42,155,207,159, 63, 31,243,231,207,  7,  0,227,199, 49, 31,195, 84,
-104,134,175,175,  4,222, 52,158, 92,110, 11, 31,246,123,234, 50,168,128,193,251, 63, 27,156,173,127, 78,240, 11, 14,150,153,155,
-249, 65, 71, 45,184,160,215,225, 92, 73, 17,206,151,222,193,249, 82, 45, 46,232,181,184,108,208,161,168,170, 18,229,102, 51,110,
- 24,244,142,255, 89, 31, 94, 24, 75,176,250, 61,  1, 86,191, 39,  0,133,  0,148, 48,136,158, 74,240,250, 84, 49,102, 77,105,131,
-238,221,219,193, 10,145,199, 63,153,117,245, 59,207,203,215,147, 20,168, 46, 25,178,172, 60, 27,145, 79, 95,105, 11,162,219,247,
-118,  0,  0, 64, 72,117, 16, 80, 61,170, 24, 91, 68,179, 86,171,245,147,203,229, 81,158,148, 49, 44, 44, 12,137,137,137,216, 84,
-174, 71,133,145,193,171,155,191, 69,161,196, 23, 21,198,166,219, 38, 98, 98,255, 15,100, 41,218, 79,176,233,199,173,142,107, 63,
-127,104,194,208,192,165,142,243,232,103,190,146, 81,112, 90, 63, 76,215, 44,  5,102, 44, 26,141,150,199, 19, 33,251,103, 36,152,
-  9,128, 70,163,241,170, 15,119,233, 82, 61,122,124,212, 40,160,101, 75, 32, 36,  4,  8,239,223, 28, 18,177,  0,  2,230,174, 88,
-137,175,175,219,  1,153, 97, 24,135,229,159,157,157,237,176,250,217,207, 71, 31,125,132,143, 62,250,  8, 55,110,112,247,202,184,
-154,175,175,126,223,115,235,107,253,250,245,178, 53,107,214,184, 84,216, 92,173,127, 39,215,115,173, 56,  5,246,220,106,229,150,
-194,222, 72,  8,172,134, 42,136,218,119,129, 98,249,114,204,240,111,137,150,154, 20,199,253, 89,127,155,129, 15,254,253, 45,178,
- 86,255, 15,255,232, 55, 10,147,  3,187,225,192,142, 29,200,201,201,113,249,254, 61, 31,163, 64,159,190,125,101, 86,123,153, 88,
- 66,230, 60, 61,227,234, 90, 93,152, 61,123, 54, 37,132, 80, 54,176,143,157,239,119, 86,242, 41, 41, 41,154,161, 67,135,202, 40,
-165, 96,167,  2,220,212, 91,146, 72, 36,122,244,249,231,159,207, 46, 41, 41,129, 78,167,131,175,175, 47,218,180,105,131,150, 45,
- 91,162,101,203,150,238, 42,207, 90,131,216, 89,124,124,124, 12, 47,198,124, 46,219,112, 98, 48,174, 94, 47, 69,187,  0,  1, 34,
-122, 18, 60,222,141,194,191, 69,139, 98,  0,150,122,244,  6,191,223,192, 67,106,253,  3,110,150,  1, 42, 20,138,114,165, 82,233,
-  3,192, 95,161, 80, 56, 88, 96,167,200,142, 94, 49, 95,118,169,159, 92, 46,167,226, 89,142,200,127,226, 52,255,239,118, 64,126,
-119,247, 86,205,167, 81,207,193, 96,174, 66,169,222,128,108,147,  9, 34,171,237,203, 37,166, 74, 88, 41,  5,  5,176,231,214, 21,
-232,205, 38,  0,224, 48, 48, 17, 44,250,164,122, 31,183,197,  3, 88, 97, 65, 21, 46, 94, 46,195,247, 91, 74, 61,250,177,206,138,
-222,238,242,167,246, 99,135, 98,231,178,250,193,246, 93, 21, 68,163,191,  6, 16,130,162,162,187,193,121, 98,235, 77, 24,153, 14,
-152,219, 47, 19, 55,111, 58, 44,167,131, 92,202, 23,243,243,250,106,196, 75,165, 82,129, 45,205,230,179,199, 16, 21, 21,213,100,
- 29,119,231, 25,219,242,190,228,196,243,  0,128, 97,125,108,153,241,222, 89,176, 12,199,206,247,193,191,183,190, 12,229,174, 57,
-156,231,255, 95, 93, 20,133,160,160, 68,251,153,198, 78,150,162, 64,169,205, 26,  3, 40,130,130, 18, 57,201, 58,176,111,191, 35,
-167,197,203, 47,  3, 50, 25,193,157,235,  1,208,235, 36,168, 40, 21, 99,243, 70,130,249,243, 41,174, 21,150, 33, 60, 98, 40,146,
- 14,169, 57, 89,197, 22,139,197, 49,223,159,152,104, 43,171,179,194, 47, 44, 44, 68, 97, 97, 33,103,253,239,164, 48, 40,195, 48,
-181,148, 42,165, 32,158, 38,  1, 82, 40, 20,154,215, 95,127,189, 90, 44,  0,235, 17,240,196, 21, 78,156, 88,137,181,198,178,  2,
- 66,184,207,217, 17, 66, 96, 46, 43,131,168,117, 16,  4,126,205,208,231,197, 73,248,104,236, 24,188,203, 46,219, 27, 56,  8,150,
-138, 74,136, 90,181, 67,191,161, 82,116,237,212, 13,159, 95, 76, 65,223,190,125,101, 39, 78,156,168, 69,  2, 98, 20, 10,  0, 68,
- 13,  0,115, 98, 98, 28, 75,  7,205, 53,148,189, 80, 40,  0,232,221,133,138,117, 21,120,221,186,117,  4,  0,181,187,248, 73, 90,
- 90,154, 75, 23,127, 74, 74,138,134,139,242,143,143,143, 39,132,144,165, 45, 91,182,236, 51,116,232,208,238,151, 46, 93,194,169,
- 83,167, 96,177, 88,224,239,239, 15,131,193, 80, 24, 20, 20,116,213, 19,163, 79,169, 84, 50,237,218,181, 59,240,220,115,207,181,
- 59,126, 52, 13,107, 85,  7,208,130,136,209,179, 93, 21, 46,223,241,199,136,158,166, 43,  0,106,206, 99, 89,234,107, 19,231,140,
- 83,132, 16,231,211,154,121, 95,120, 52, 49,132, 28, 94,122, 35,  0,163,211,160, 66,243,146, 60,158, 31,174,166,220,235, 80,124,
-156, 51,  6,150,106,117, 50,147,159, 68, 93,194, 88, 81, 80, 89, 14,152, 76,176,216,215, 53, 93, 44, 47, 70,190,161, 20,148, 82,
-216,243, 11,104,184, 20, 47,122, 42,193,250,205,119,251,228,165,108,160, 87,119, 51,  4,208, 55, 72,249,215,232,236,238,234,160,
- 78, 47,128, 74, 53, 71, 13,164, 67,171,213, 26,115,115,115,133,171,198,128,137, 61, 48, 18, 11,250, 30,115, 88, 97, 92, 73,133,
- 43,175, 75,205,115, 86,  9,113,181,230,176,140, 96,176,125, 37,135,171,229,126, 91,183,110,181,101,  2,148,203, 41,151,156, 15,
- 49, 19,191,150, 41,119,206, 85,167,108,165,136,  8, 58,143,225, 81,125,112,244,192,121, 28,215, 45,  7,  1,129, 98,226, 87,178,
-248,157,115, 57,149, 47, 40, 40, 17,132, 16,188,240,194, 11,248,230,155, 82,176, 42,198,246,151,178,132,128, 86,183,236,239,212,
- 41, 47,114,148, 76,150,116, 72,173, 30, 53, 10, 48, 22,116,198,245, 98, 31, 88,237,179,173, 29,244,237,240,118,116, 25, 14, 28,
-239,137,230,157,122,202,216, 44,129,245,129, 85,252,121,121,121,  0,128,130,130,  2,135,103,224,214,173, 91,142,129,213, 75, 16,
- 39,183,115,205,151,146,112,201,  7,224,140,111,190,249, 70,182,118,237, 90, 53, 75,  0,214,172, 89,227,177,245, 95, 83, 97,120,
- 11,137, 68,130,130,107, 87,209,173,123, 15, 88,205, 85, 32,102, 11,132,205, 91,160,249,160,193,104, 54,240,  9, 88,245,102, 88,
- 12, 85,160,102, 11, 96,177, 34,118,221,191, 49,229,229, 41,144, 72, 36, 46,229,153, 55,  7,114,250,191,174,158, 11, 91,225,250,
-217,136,136,  8,153,157,  0, 80, 74, 41,134, 15, 31, 46, 75, 78, 78,174,245,156, 59,229,111,175, 43, 43,128,189, 61,123,246, 28,
-248,197, 23, 95, 24,111,223,190, 93, 57,102,204,152,231,210,211,211,255, 97, 48, 24,138, 90,183,110,173,248,252,243,207,181, 92,
-235, 79,169, 84,138,  0, 60, 50, 52, 60,188, 77,204,172, 24, 92,201,187,162,157, 62, 43,230,201,212,  3, 27,227,110,150,105,135,
- 13,142, 28, 99,109,215, 41,244,255,213,180,242,235, 75, 45,108,239, 99,196,137,127, 18, 23, 58,160,230, 49,143,  7,149,  0,212,
-103, 93,120,163,252, 89,101, 83, 71,194, 24, 78, 36, 96,229,169,195, 26,  0,100,234,160,  8, 10, 95,  9,116,212, 12,163,217, 12,
- 43,181,162, 85, 64,  0,242,244, 37,240, 36,185,144,171,229,125,119, 99,  0, 60, 91,139,237,202,197,223,208,116,189,246, 60,  2,
- 19,  7, 15, 30,188, 51, 54, 54, 86, 28, 20, 20,100,189,121,243, 38, 22,244,189, 89, 83,249,115,254, 31,117, 37,236,241, 10,246,
- 44,127, 46,146, 60,213,122,134, 43,226,119,206,209,  0, 32, 19,250, 45,147,238, 62,251,161, 58,101, 43, 64, 64, 48,177,255,  7,
-178,157,103, 62,208,112, 85,254,108, 95, 42, 42, 26, 77,129, 82,214,250,133, 43,189,179, 33,238, 32,219, 31, 72,125,155,107,216,
-173,122, 82,164,235, 43,181,148,149,169,137,  0, 48, 84,250,130,148,153, 33,100,132, 48, 48, 18,217,216,201,175, 97,110,116,140,
-219,246, 72, 72, 72, 32,  9,  9,  9,244, 30,190,127,160,148, 18, 66,  8,117,142,104,119,246,  4,120, 34, 75,161, 80,104,162,163,
-163,177, 96,193,  2,  7,161,104,170, 84,184,163, 70,141,194,220,173,235,241, 81, 89, 49,  6, 68,142,  0,211, 46,208, 86, 38, 19,
-181,165,238,133,  8, 68, 32,  4, 17, 11,240, 77,252,106,180, 24, 61, 24,221,187,119,247, 56,106,191, 33,112,178,238,213,225,225,
-225,178,228,228,228,  6,213, 85,118,118,118,212,193,131,  7,175,  9,  4,130, 29, 79, 62,249,228,199,115,230,204,185,189,110,221,
-186, 36,192, 54,229,224,129, 40,  6, 64,226,169, 83,167,134,252,176, 97, 35, 35, 22,248, 92,159,244,210,164,254,115,231,206,213,
-125,253,245,215, 19,  0,  4,216, 21,127, 25,187, 65, 16, 23,143,  2,143,  7,  3, 92,220,255,222, 18,128,  6, 19,  6, 55,202,135,
-243,128,180,249, 84, 10,145, 79,146, 75,173, 25, 89,106,125,149, 17,102,139,  5,221,135, 12, 66,168, 57,220, 83,133,219,104,193,
- 40,108,210, 31,  0,106,214, 26,183,199,  1, 52, 40,  7,190, 74,165,218,165, 84, 42,133,137,137,137,139, 86,173, 90,245, 79, 39,
-114, 49,202,249,127,113,245, 40,  0,104,180,228, 37,147, 47,178,113, 22,117,255,190,201, 23,229, 94, 49,253,221,103, 63,212,176,
-237, 67, 65,177,243,204,  7, 94,149,209,166,220,  9, 94, 93, 52,234,174,217, 75,238,222, 91,244,137,231,249,200, 99,223, 62,167,
-137,  5,200,186,111,150, 74, 43, 12,182,125,  0,238,230,255,143,241,248, 29,177, 91,100, 22,133, 66,209,232,243,170, 44,  9,104,
- 12, 89,246, 88,  0, 53,123,220,  8,101,243,234,123,221,187,119, 71,251,121,243,100,107,247,239, 87,231,124,252, 11,228,162, 86,
-104,105,223,188,167,194, 96,198,252,183,150, 64,224, 23,132, 61, 27,149, 56,211,154, 96,236,176, 97, 94,231,237,183, 88,204, 94,
- 15, 19, 92, 93,252, 28,200, 23,121,254,249,231,111, 83, 74,227,122,245,234,245,159,162,162, 34,189, 23,138,223,185,222, 71,166,
-165,165,193,106, 38, 24, 54,188,255,  7,115,231,206,213,  1,192,156, 57,115,172,  0,116, 13,105, 82, 39,143, 83,181, 99, 23, 94,
- 81, 30, 15,153,  7,224,158,144,  2,175, 21, 99, 66,181,  4, 59, 72,203,206,104,242, 74,173,145,244,135,189,214, 96,185, 10,133,
-194,  2,224, 95,246,143,215,114, 93,149,175,129,191,151, 52,198, 51,247, 18, 54,  5, 79,177,232,147,196, 70,151,237, 46,213,175,
-  7,237,107,186,151,117,208, 88,155,174, 40, 20, 10,141, 66,161,104, 20, 89,164,  1,115,  0,108, 25,148, 74, 37,236,219,247, 34,
-215,105,251,222,228,131,  7, 28,219,247,142, 30, 58, 26,118,210, 91,231,255, 19, 76,209, 17,203,150,192,218,138,137,227,110,130,
-238, 72, 64, 99,212,215, 19, 79, 60, 81,101, 54,155,147,  0,232,223,127,255,253,  6, 41,209,152,152, 24,242,254,251,239, 83,163,
-209,  8,  0,251,235,122,110,229,202,149,100,241,226,197,142,255,101, 79,  5, 92,239,216, 94, 51,184,147,199,253,  5, 87, 15, 23,
-241,118, 31, 97, 30, 60,120,240,224,209, 36, 48,  3,168,  4, 32,105,100, 35,206,221,142,129,156,119, 20,228,241,112,128,111, 76,
- 30, 60,120,240,120,184, 32,  4,208,140,131,242, 55,192, 22,192,221, 88,250,192, 10,126,217,223,159,174, 35,241,224,193,131,  7,
-143, 63, 31,252,120,125,193,131,247,  0,240,224,193,131,  7, 15, 30, 60,120,  2,192,131,  7, 15, 30, 60,120,252,213, 81,205,165,
-115,250,244,105,175, 35,114, 93,  5, 19, 62,232,242, 66,  6,249,192,215,167,  0, 34,113, 49,172, 86,219,178, 48,129,128,  1, 67,
-  4,182,191, 12,  1, 33, 12, 40, 17,130, 16,  2,  6,102,236,220, 45,  2,165, 20, 65, 76, 43,120, 82, 62,123, 70,197,214,176,  5,
-240,148,193,150, 96,192,196, 46,249,122, 24,235,143,151,199,203,227,229,241,242,120,121, 15,166, 60,222,  3,224,  6,135,143, 94,
-134,174, 68,  7,147,137,226,246, 29,130,125,137,190,216,127,192, 31, 12, 17,225,128,186, 61,246, 31,234,128,253,234, 14, 56,114,
-162, 13,132, 16,130,129,  4, 35, 34, 24,248,136,125, 56,255,143,169,175, 78,167, 83, 95,157, 78,143, 38,171, 43, 77, 12, 73, 62,
-127, 46,253,176,250,216, 81,125, 98, 98, 98, 37,128,230, 60,  7,125,248, 49,230,169, 17,210, 57,115,166, 83, 79, 55,121,122, 88,
-161, 84, 42,165,212,142,250,118,215,227, 10, 90,  3,124,143,226,193,163,  9, 60,  0, 44,134, 13, 31,194,249, 37, 60,150,156,230,
-150,181, 52,182,188,198, 68, 90,186,  8,227,198, 88,112,230, 15, 95,136, 69, 66,  8,  5, 66,136, 68, 20, 62,  2, 19, 32,108, 14,
- 33, 42, 48,164,143, 25, 18,177, 15, 40,128, 14,237,128,103,199, 91,113,112,  7, 55,229,127,249, 98, 38, 30,125,172, 59, 58,  6,
-183, 68,222,181, 75, 93,  2,218,119, 67,235,142, 22,252,246,235,175, 72, 76, 76, 44, 70, 19,239,136, 37,151,203,199,171, 84,170,
-221, 78,231,207, 56,159,243,168, 27,115,231,200,169,185,242,188,108, 72, 88,160,218,106, 45, 66, 73,199, 10,117,167,246,163, 81,
- 94,213,  1,223,172,255,239,159,118,167,179,232,232,104,245,130,  5, 11, 64,  8,193,154, 53,107,212,141,145, 19,128, 77,  7,192,
-235,255,251, 15,143, 72, 23,165, 32, 12, 83, 95,123, 83,231,246,100,219,244,110,242,173,234,237,236,188, 51, 34,143,198,  5,155,
- 13,208,201, 75,192,141,  0, 52, 21,152,251,172, 11,199,143, 53,129, 66,  0,161, 64,132, 97,225,  4,109,219, 48, 16, 10, 25,248,
-136,  4,232, 21,202,224,218,117, 51,134,132, 49,104, 21, 36,193,111,135, 90,  0,  0,  4,180,  2,148, 90,225, 46, 69,240,212, 87,
-167,211, 63,210,211,209,181, 99, 39,252,145,114, 28,169, 70, 19,116,119,116, 16,251, 52, 71,239,129,195,209,127,248, 88,168,119,
-170, 32,231,152, 27,255, 30, 40,254, 81, 42,149,234, 96, 72, 72,  8,210,211,211,217, 14, 83, 12, 96,158, 74,165,218, 37,151,203,
-163, 84, 42,213,193, 63,219, 75, 49, 59, 70, 78,125,132, 90,  8, 25, 35, 42, 43, 45, 40,209,251,226,199,159, 14,122, 84,255,163,
-199, 12,151,182,240,213, 98,212,112, 49,186,118,121, 86,221,162, 69,  0, 76,102, 51,110,223,190,131,118,185,215,145,149,157,131,
- 87, 95, 25, 79, 55,254,176,199,171,118, 13,179,239,169,  0,112,223, 38,251,126, 90,255,192,221,237,112,215,172, 89,  3,165, 82,
- 41,109,170,116,192,247,241,125,161,219,182,109,171,189,159, 66, 19, 41, 47,165, 50, 94, 74, 64, 16,221,  8,245, 78,115,127,  6,
- 73,125,205, 89,199,219,179,100, 58,246,189,114,224,181,120,189, 91, 34,247,219,111,191, 57,206,199,141, 27,135,189,123,247,214,
-123,206,227,222, 43,127,231,107,206, 68,160, 94,  2,144,124, 52, 21,195, 71,132,223,183, 66, 91, 61,203, 14,233,252,176, 87, 47,
- 33, 35, 20, 64,167, 21,162,125, 91, 17,218,183, 21,163,188, 92,  4,137, 72,  8,139,208,  7,131,250, 17, 12,120, 92,  0,134,136,
- 64,  8,129,143, 72, 12, 17, 83,  5, 34, 17,195,108,  0,204,208,215,171,252,143, 30, 58,136,110, 29,218,224,220,153,115,200, 45,
-188,121,183,124,101,229,144,156, 63, 65, 25,  1,193,160,176, 65,248,109,175,103, 58,118,221,186,117,210,244,244,116,245,229,203,
-151,225,235,235, 11, 95, 95, 95,217,246,237,219, 53, 30, 14,102, 50,149, 74,117,144, 85,252, 78,157,163, 37,128,177,223,151, 57,
-221, 86,  0,  0, 32,  0, 73, 68, 65, 84,126,251,237,157,215, 94,123, 45, 81, 46,151,143, 81,169, 84,137, 15, 98,  7, 15, 15, 15,
-151,166,166,166,114,254,221,210, 81,195,164,125, 67,155,171, 59,117, 40, 68, 64, 11, 31, 48,140, 31, 42, 42,204, 40,210, 86,224,
-101,121,111, 42,105, 49,  8,223,127,247, 19,167,126, 36, 66,  1, 94,120,230,113,117,159, 62,189,113,179, 64,135,147,191,159, 66,
-121,185, 30,  1,  1,205, 17, 18,210,  5,140, 64,  4,139, 37, 23, 49,179,167,211,248,117, 63,254,169,172,155,232,232,104,245,194,
-133, 11, 29,231, 11, 22, 44,104, 52, 47,192,131,236,  1, 80,169, 84, 68, 46,151,211,132,132,  4,184,218, 88,233,126, 27,237, 10,
- 69, 12,  8, 33, 88,191, 94, 41,139,142,110, 24,  9, 96,186,188,232, 80,222,105, 43,154,185, 28, 76,219,183,100, 16, 28,196, 60,
-180,237,247, 87,133,179,178,119, 69, 10,220,122,  0,146,143,166,  2, 64,131,137,192,209,121, 89,245,222, 31,241,121, 15,175,  7,
- 11,167, 28,231, 30, 13, 66,137,154,182, 16,  9, 69,232,220,177, 28,101,101, 34,156, 60,215, 25,  2,129,  0,  2, 34,128, 88,100,
- 70,159, 30,  6,244,236, 33,  0,  1,  3,177,200,  7, 98,  1, 65,216,227, 70,  4,  5, 90,177,233, 63,245,203,238,221,173, 29,174,
-101, 23, 86, 87,254,118,228,222,184, 70,  8, 35,164, 29, 34, 30, 71, 96,203,230, 40,214,221,225, 84,222,181,107,215, 74, 87,174,
- 92,169,190,118,237,154,243,101,245,248,241,227,177,103, 15,119,107, 83,165, 82, 29,114, 86,254, 46,208, 58, 46, 46,174,248,205,
- 55,223, 60,128, 38,158,162,168, 71,249,171, 61, 41, 91,104, 72,144, 58,184, 93, 41, 90,183,242, 71,167,224,246,240,243,247,195,
-181,107,249,176, 88,172,  8,238,216, 28,231, 47,166, 32, 98,196, 16,105,202,209,180,122,  7,211, 55,222,152, 78, 31, 15,213,225,
-145, 71, 58,225,194,197,107, 56,121,242, 34,110,223, 41,  3,165, 64, 96,160, 47, 12,134,114, 12, 28,216,  7,197,197, 37,200, 63,
-249, 59,134, 63, 25, 46, 77, 62,194,157,168, 60,200, 96,173,127,251,182,211, 96, 61,  1,107,215,174,245,216, 11,192, 78,247,215,
-204,  4,236, 98, 59,217,  6,247,191, 78,157, 58,209,206,157, 59, 55, 56, 23,191, 74,165, 34,147, 39, 79,166, 91,183,110,  5,187,
-177, 82,125, 10,207,190, 21,110,173,242, 71, 68, 68, 72,217,205,129,234, 32,177,212,141, 76,199,255, 86, 40, 98,212, 13,121, 71,
-107,202, 27,178,164, 28, 39, 86, 52,171,166,248,121, 60,156,214,127, 77,151,127,131,166,  0, 26, 74,  4, 70,124,222,163, 78, 18,
-224,141,242,103,145,148,148,132,252,252,124,  0, 64,112,112, 48,245,228,101, 16,208, 10,  8,137,  5, 98,145,  8,191,159,107,  3,
-129, 80,136,230, 34,189, 45, 14,160, 25,131,252,252,230,120,188,143, 21,132, 16,200,159, 53,131, 90, 25,128,248,128,128,194, 22,
-200,239, 26,134,226,235, 40,208,150, 35, 51, 63,191,206,178, 20,151,104,161,187, 93, 96,151,197,121,  0,170,169,252,  1,  0,123,
-246,236,193, 83, 79, 61, 37,221,183,111,159,219,  1, 78, 46,151,143,202,201,201,113,217, 97, 74, 74, 74,156, 47,183, 92,182,108,
- 25, 46, 92,184, 48,250, 65,154, 10,112, 82,254,156, 33, 29, 53, 76, 42, 17,222,132,175,111, 75, 72,124,196,232,214,173, 43, 58,
-119,237,138,210, 82, 13,180,218,114,136,197,  2,  4,  5, 74, 32,244,109,233,118, 48, 21,210,124, 52,111,214, 10,134, 10, 51,206,
-157,203,194,141,130, 18,220, 44, 40, 71, 69,149,  4,143,  4,155, 33,241, 17, 32, 43, 51,  7,143,118,239,142, 27, 55, 75, 81, 97,
-110,193,105,128,118,118,251,215,117,221,211,233,128,186,100,122, 35,139,181,254, 23, 44, 88, 80,235,250,194,133, 11,189,242,  2,
-184,218,157,176,230,220,113, 99,121, 21, 82, 82, 82,212, 13,221,144,103,242,228,201, 84,165, 82, 65, 46,151,195,213,116,  0, 23,
- 79, 21,171,252,  1, 32, 45, 45,173, 86,153,236,247,221, 26, 61,236, 14,131,141,229,113,217,186,208, 31,147,215,232, 93, 42,254,
-224, 32,198, 62, 74,113,107,222,113,227,198, 85,243,146, 60,253,244,211,213,234,138,119,251, 63, 56,240, 56,  6,160,177, 60,  2,
-141,137,172, 44, 27,177,200,207,207,247,136,  4,  8,133, 66,136,  4, 34,136, 68,  4, 35,135,  3,  6,125, 21,174,100,139, 33, 18,
-138, 32,180,  8, 49, 52,156, 66, 44, 18, 65, 32, 96,  0, 74,160,213,  1, 39, 78,  9, 97,181, 90,  1,220,174, 83,238,169,223,179,
- 81, 94, 94,119,  6,206,110,237,219, 83,189,153,160,162,162,  4, 22,171,153,243,239, 60,117,234, 84,221,164,195, 96,224,164,104,
-106,186,254, 93, 49,195,157, 59,119, 58, 63,159,216, 20, 94,  0, 87, 46,126,103,229,111, 31,  0,185, 89,128,193,237,212, 12,115,
- 29,102,139, 21, 70,147, 25,183,239,104, 33, 18, 75, 80, 85,101,130,201,108,129,217,108,133,217, 66, 57,121, 98,196, 34, 61, 36,
-190,157, 80, 84, 84,130,210, 50,  3,180,186, 10,180,104,213, 31,195, 30,127, 28,105,201,123,209,209,104, 70, 73,105,  9,122,246,
-236, 14, 31,177, 16,250, 50,237,159, 98,160,176, 71,254, 59,230,254,107,120,166,188,138,  5, 88,176, 96, 65, 53,111, 66,205,123,
- 92,  9,128, 86, 27,229,120, 48, 38, 38,  8, 91,183,110,173,214, 95, 89,  3, 33, 55, 55,215,235, 93, 57,229,114, 57,221,186,117,
-171, 99,155,241,186, 98,  2,106, 42,215,154,158,170,148,148, 20, 53, 27,248, 70, 41,165,199,143, 31,175,118,255,248,241,227,106,
-119, 78, 15,150, 52,176, 36,192,217,138,175,203,208,119,243,219, 48, 41, 34, 17, 91,  0, 76, 89,163,199, 19, 75,202, 27, 68,190,
-106,206,241,187,139,  9,224,113,239,189,  1,117,121,  0,238,171,127,199,149,165,223, 16,235,191,134,197,138,172,172, 44,118, 64,
-225,212,123,  5,  2, 33,134, 14,177, 66,192,  8,113, 34, 93,130,140, 44,  9, 38, 60,  5, 60,243, 52, 48,113, 28, 65,135,118, 98,
- 72,196, 62,144,136,125,224, 43,241, 65,112,  7, 31, 72,196, 18, 72,220, 44,  3,204,203,189, 78,138,181,183, 72, 93,  3, 73,247,
-110, 93, 16,208,210, 31, 18,171, 17,229,  6,211,125,239, 20, 71,143, 30, 61,120,244,232,209,106, 10,223,249,  3,  0, 69, 69, 69,
-152, 56,113, 98,147, 89,249,118,235, 72, 90,243,154,253,216, 35, 75,206, 98,  1,244,  6, 19,244,122, 35, 74, 75,171,112,235,150,
- 14, 55,110,220, 65, 89, 89, 21,202,203, 77, 40, 47, 55, 66,175, 55,161,164,184,196,173,172,170, 42, 51, 42, 43, 45, 48,153,140,
-104,222, 92,140,206,193, 45,224,231,239, 15,  0,  8,233,222, 21,157, 58,182, 64, 64, 11,  9, 40,181,192,100,182,162,170, 74,255,
-167, 24, 72,162,163,163,213,139, 22, 45,170, 87,153, 71, 71, 71,115,182, 72,237, 91, 10,215,121,127,205,154, 53,248,230,155,111,
- 60,222,106,216,105,219, 89,199,135, 85,168,249,249,249,236,238,153, 30,105,183,201,147, 39,211,132,132,  4, 56,147,  7,149, 74,
- 69, 38, 77,154, 84,239,247,102,207,158, 13, 66,  8,216,126, 28, 30, 30, 46,  5,128,161, 67,135,202, 88, 69,206, 90,253,236,125,
- 74,169,227, 62,135, 95, 91,205,138,119, 69, 28,184,204,160,180,110,221, 26,196,137, 37, 52, 84, 30,143,  7, 79,249,187, 58,247,
-202,  3,240, 32, 89,254,119,  7,120, 11,  4,  2,129,199,223, 27, 62,196,138,182,109,124, 80, 90, 42,132,143,208, 12, 31,177,  0,
-154, 84, 49, 38,200, 68, 16,139, 68, 40, 45, 21, 33, 57,221, 31, 45, 36,  4, 12,195, 96, 92,148, 17,207, 77,160, 96, 24,138,229,
-167, 61, 47,167, 92, 46,167,  2, 63,  9,180,162,214,240, 51,229,225,114, 62,197, 40,233, 72,206, 91,250, 14, 28, 56, 16,199,142,
- 29,115,121,207,207,207,143,243, 96,169,211,233, 70,  3,192,134, 13, 27, 48, 99,198, 12,199,245,162,162, 34,199,241,140, 25, 51,
- 80, 88, 88,216, 36,237,153,154,154,170, 33,132,128,157, 39,101, 24,  6,172,187,179,158,121,211, 58,145,123,253,134,172, 77, 11,
-131,218, 71, 44,128,209,100, 69,101, 85, 30,174,231, 21, 65,171, 43,133, 86,107, 64,145,182,  2, 69,218, 10,180, 12,234, 10, 32,
-187, 94, 89,183,238, 80, 20,220,186,131,222,189,187,163, 88,167,131, 72,200,160,180, 44, 15,250, 98, 43, 30,123, 84,143,118,109,
-218,192,207,207, 15, 62, 62,190,184, 89, 80,  6, 34,  8,228, 84, 70,103,151,124, 99,173,  2,104,236, 21,  4,117, 89,235,192,221,
- 88,  0,174, 80, 40, 20,154,232,232,104,204,159, 63,191,150, 87,129,157,102,240,118,101,193,228,201,147,171, 89,176,236,251, 69,
-  8,193,139, 47,190,136,132,132,  4,194,149,  4,212,180,252,157,239,213,244, 52,212,196,186,117,235,  8,  0,135,149,159,150,150,
-166,182,247,107,141,221, 27,192,254, 85,  3, 32,169,169,169,142,251,245,109,231,154,146,146,162, 30, 62,124,152,236,216, 49,219,
- 59, 49,123,246,108,156, 62,253,187,140, 85,225,199,143, 31, 87,179,191,127,232,208,161,110, 61,101,235,214,173,195, 87,178, 64,
- 76, 89,107,176,253,174,133,254,213,238, 79, 89,107,112,212,231, 76,153,  8,223, 29, 50,130,199, 67, 64,218, 99, 87, 86, 39,221,
-171, 22,227,244,233,211,220, 87,  1,220, 11,197,239, 28, 11,208, 16,235,191,186, 37, 95, 93,249,219,221, 76,110,167,  2, 90,183,
- 22,128, 33,  2,180,105, 45, 64,143,238, 20, 55,110,  8,193,  8,  8, 68, 66, 33, 68, 66, 17,254, 56,235,143, 32,127, 17,  4,  2,
-  1,134,135, 91,224,235,235,  3,171,149,  2,212,226,149,242,111,214,174, 51,110,149, 83,232, 47,107, 32, 36,  2, 92,190,145, 75,
- 46,115, 84,254,246,129, 77,118,253,250,117,245,245,235,215, 93,253, 94, 13,199,114,140, 41, 42, 42, 58,192, 42,121,  0,152, 56,
-113, 34, 54,108,216,224,120,166,180,180, 20,133,133,133,216,181,107, 23,187, 92,240,190,119, 94,251,192,165, 78, 75, 75, 83,179,
-193, 98,246,107, 30, 43,133,228, 35,169, 26,153, 52, 12, 52,191, 20,134, 10, 19,116, 62,149,160,208,161,178,210,140,210,210, 42,
- 20,222, 49,224,198,205,114, 60, 41,235,  2, 32,185, 94, 89, 21,198,214,200,185,114, 27, 33,221, 30, 65,183,110,157, 80, 84,116,
-  7,129, 45, 45,232,209, 35,  0,109,219,132, 64,226,235,139,226,226,114,156, 60,117,  9,121,249,165,104,223,169,207, 67, 59,128,
-196, 43,149,148, 16,200, 88, 93,234,172, 84,235, 91,183, 31,175, 84, 74,227,215,173,227,228,  5, 88,187,118,173,186, 38,  1, 88,
-189,122, 53,214,175, 95, 47,115, 39, 47, 62, 62,158,198,196,196, 16,133, 34,208,169, 76,212,149, 98,166,  0, 48,105,210, 36, 78,
-238,127,231, 41,133, 86,173, 18,224,237,180,  1,107,229,219,  9,  0,165,148, 98,248,240,225,178,228,228,228, 58,239,187, 83,216,
-236,220,122,114,242, 49, 53, 33,  4,132, 16, 12, 24,208, 95,182,110,221, 58, 77,237,103,239,146, 12,119,242,152,201, 58,176,242,
-228,163,186, 86,227, 71,147,215, 92,112,200,227,  2, 62,  6,224,225,129, 91,  2,240, 32, 90,252, 44,166, 78,157,218,160,239, 51,
- 12,  3,129,192,246,233, 29,202, 96, 96, 63, 11,124,196, 18, 27,  1, 16,137, 48, 44, 28,240,241,  1, 68,  2, 31,180,110, 45,129,
- 64,160,135,197, 98,133,213,234,185,219,222,160, 45,128,164, 83, 47, 92, 73,252, 47,218,  8, 25, 28,205,189,230,241,128,178, 96,
-193,  2,205,186,117,235,100, 13, 89,  6,200, 46,235,123,227,141, 55, 28,215, 88, 75,191,180,180, 20,  6,131,  1, 51,103,206,  4,
-  0,124,253,245,215,  0,160,110,138,182, 77, 73, 73,209,216,173,125, 53,  0, 12, 25, 50,164, 65,  1, 92,157,186,244, 68,250,241,
-125,104,219,218, 15,126,126,182,110, 95, 85,101, 65,105,153, 17, 90, 93,  5, 58,119,235,131, 31, 55,110,114,219, 38,191,254,186,
-159,188,248,252, 80,122, 60,237, 60,158, 28,222, 31, 93,186,116,129,201, 88,137,129,  3, 30,135,127, 64,  0,174,229,228, 34,255,
- 70, 49,146, 83, 46, 66, 87, 22,128,189, 27, 54, 61,180, 62,211,217, 49, 10,123,251, 19,204, 86, 40, 28,203,194,173, 53,148, 62,
-195, 16,128, 58, 84,  6,157,173, 80,160,191, 11, 11,150, 16, 80, 56,209,242,152,152, 24,212,244,  2,204,159, 63, 31,132, 16,196,
-196, 40,212,118,125,142,217, 49, 10,244,239, 95, 91, 94, 76, 76,140,195, 29,239, 78,201,113, 85,254, 53, 49,105,210, 36,140, 30,
- 61, 90,230, 45,  9,118,158,171, 15, 15, 15,151, 37, 39, 39,107,234,186,207, 37, 72,209,190,170,128,178,228, 43, 34, 34, 66,166,
- 80,196,104,106,146, 14, 39,249,240, 68,222,214,133,205,108,167,146,118,119, 61, 29, 11,115, 29,132, 96,223,153,250,199, 62, 87,
-121,  0,248, 24,128,135,148,  0, 12, 27, 62,228,158,204,249, 52,150,229,239,220,145,188,129, 86, 71,208,161, 29,  3, 66, 24, 16,
-134,193,254,131,182,249,125, 31, 31,  9,124,196, 62,152,248, 52,129,196, 71, 12, 95,  9,129,182, 72,128,180,147,205, 97,177, 90,
-208,185,147,103,243,186,114,185,156,222,200,187,  2, 93,250, 30,244,232, 44,194,185,124,239,231,133,103,207,158,173, 65,  3,131,
-242,228,114,185,236,203, 47,191, 84,179,110,254,162,162,162, 41,225,225,225,229,  7, 14, 28,216,253,220,115,207,141, 45, 42, 42,
- 34,211,167, 79,223,103,207, 23,208,100,157, 51, 53, 53, 85, 19, 30, 30, 46, 99,143, 27, 34,235,199,141,155,200,244, 87, 95,166,
-153,151, 46,224, 70,206, 53, 48, 12,129,197, 66, 33,241, 13, 66,104,239,190,216,251, 91, 34,231, 58,189,113,219, 42,211, 22,221,
- 80, 87, 86,154,209,175,111,  8,130, 59,182, 70,238,245, 91,208,157,205, 70, 70,102, 46, 14, 30,250,  3,215,242, 41, 78,164,159,
-243,170,157, 30,148,228, 63,214, 45,129, 94, 63, 55,240, 83,142,242,178,255,131,181,107,215, 58,  8,192,218,181,107,129,156, 13,
-181,158,117, 37,143, 43, 40,165,164, 33,253, 56, 38, 38,166, 65,125,207, 73,201,107,188,185,239,202,171,224,252, 93, 87,242, 60,
-106,231,107,219,144,176,246, 21,219,216, 48,234,145,106,202, 31,  0,228,227,159,176, 29,232, 78,187, 37,  0,124, 30,128,  7,  7,
-235, 87, 45,174, 53, 13,224, 17,  1,120,192,  3, 62, 26, 92,184,244, 83, 62,144,136,197,152, 56,158,128, 33,  4, 67,  6,155,113,
-246,156, 47, 24, 98,155,243, 47, 46,102,208,177,189,  0, 12, 17,227,204, 89, 49, 36, 62,128,209,100,196,181, 92, 95,143,148,127,
-118,230,239,  8, 31,253, 12,132,173,195,145,157,153,  6, 97, 65,  2,  2, 90,  4,209,146, 82,109,147, 84,176, 74,165,210,200,229,
-114,217,224,193,131,213,177,177,177,232,219,183,111,161, 78,167,195,224,193,131,101, 58,157, 14,243,230,205, 83,219,149,191,166,
-169, 27,185,161,138,191, 38,  9,  0,128,136, 17, 67,164, 29,218,119, 80,251,251,251,227,199,141,155,200,185,243,217,158, 13,232,
-201,105, 26,  0,196,130,214,244, 66, 70, 42, 58,180,107,  6,137, 68,132,242,114, 35,242,111,150,130,  8, 59,227, 68,122, 50, 31,
- 45,197,  5,167,222,  4,186,255, 31,170, 45, 47, 60,185,168, 73,139, 20, 19, 19,228,148,182,182,113, 20,154, 59,165,236,137,210,
-110,104, 62,  3, 87,227,188, 60,194,199,246, 91, 43,110,218, 62, 60, 30, 90, 12, 24, 48,192, 17,240,183,126,213,226, 90,247,220,
- 18,128,198,206,199,127,191,243,251,123,198, 34,  8,116, 58,  2,191,246,  4,173,130,  8,  6, 15, 50, 65, 34, 22,192, 71,108, 66,
-171, 32,137,125, 16, 32, 24, 58,216,130,180, 83, 34,155,183,128, 35, 49,146,203,229,180, 79,207, 22,120,115,254, 71,168, 16,119,
-194,207,137,249,232, 30, 58,  4,  0,208,236,196, 46,100,230,130,150,151, 53, 29,  9,  0, 64,114,114,114,164,171, 86,173, 82, 59,
-123,  7,  0,144,166,180,252,239, 53,236,201,126, 26, 92,239,135,143,156, 34,211, 95,125,153,222, 46,186,141,138,  2,  3, 36,146,
- 86,232,212,237,113, 78, 83,  9, 15, 59,108,233,176, 27,233,103,230,108,128, 99, 69, 64,206,198, 38,255,109,238,130,251,254,108,
- 24,251,204,148, 70,181,220,249, 24,128,  7,139,  4,212,165,252,221,122,  0,254, 10,160,176, 69,245, 19,134,130,130, 34,168, 37,
- 69,210, 81, 33, 36, 98, 17,124,196, 66, 60, 59,158,130, 82, 43,  2, 91,153, 97,182, 16, 88,173, 22,251,224,231, 30,143,119, 45,
-199,132, 23,229, 40, 23,246, 64,219,102,254,120,249,133, 32,108,218,126,214, 65,  2, 76,150,159,113,246, 82,211,174, 19,103,137,
-128,211, 57,255,246,120,225, 85,248, 51,130, 76,214, 17,186, 53,176,182,102, 80,  5,121, 37,111,189,110, 37,162,  3, 23,215,190,
-113,114, 81,147, 91,253,127,101, 28,248,195,212,152,125,152,216,  8, 34,117, 34,139,252,180, 64, 83,145,  0,183,141,229,237, 62,
-194, 60,120,240,224,193,131,  7,143,135, 23,124,162,103, 30, 60,120,240,224,193,131, 39,  0, 60,120,240,224,193,131,  7, 15,158,
-  0,240,224,193,131,  7, 15, 30, 60,120,  2,192,131,  7, 15, 30, 60,120,240,248,115,160,218, 42,128,211,167, 79,123, 29, 13,234,
- 42,152,176,177,229, 77,155, 25,227,246,123,122,109,129,227,216, 63,168,189,227,248,167,239,227,107, 61,219, 70,246,154, 91,121,
-  7,214,220,205,152, 55,102,225,151,142,227,219,234,111,225, 77,249,234,130,183,229,171, 11,174,202,247,252,116,133,219,239,165,
-171,119,163,107,215,174,184,122,245, 42,  6,203, 38, 56,174,255,242,163,242,158,215,159,187,254, 18, 23, 28, 44,125, 51, 63,223,
- 57, 51, 33,185,159,253,175,166,188,  9, 19, 38, 72,247,236,217, 83, 45, 83,226,248,241,227,101,187,119,239,214, 52,197,251,241,
- 32,203,107,136,172, 63,115,253, 69, 70, 70,190,212,175, 95,191, 77,103,207,158,125, 49, 41, 41,233,231, 70, 40, 31,125, 80,222,
- 15, 94, 94,211,202,243,152,  0,212,196, 87, 95,125, 37,173,172,172,  4, 17,136, 64,  8,129,197,108,130, 88, 36,196,188,121,243,
- 52, 13,101, 30, 95,125,245,149, 20,  0,230,206,157,219, 32, 89,122,109,  1,252,131,218, 59, 20,127,251,206, 93,  1,  0,  5,215,
-175,122, 37,239,192,154, 55, 48,102,225,151, 14,197,245,213,142, 52,  0,192,220,103,135,252, 41, 25, 96,186,122, 55,  6,203, 38,
- 32, 93,189,219,166,212, 38, 77,  3,  0, 92,189,218,244,245, 23, 10, 72, 51,  1,117, 40, 32,203,  4,212,111,230,231, 35, 45,246,
- 29,  0,192,144, 85,255,108,210,122,123,233,165,151,232,230,205,155, 81, 89, 89, 89,237,186, 68, 34, 81,191,244,210, 75,248,223,
-255,254,247,160, 46, 15, 28,209,179, 91,240, 70,106,177, 24, 50,115, 11,150,  0,216,197,219, 65,117,227,243,207, 63, 31,245,251,
-239,191,183,184,113,227, 70,251,160,160,160,255,207,222,151,199, 55, 81,117,239, 63,147,164, 89,186,175,148,125, 43, 84, 86, 41,
- 20, 17, 89, 19,161, 32, 22, 80,150,162,165,250,138,  8, 13,168, 40, 32,138,246,245,251,115, 71, 80,164, 40,107, 64,  4, 94, 41,
- 91,225, 69, 89, 10,133, 66, 74,217,180, 82,160,236,150, 82, 74, 23,150,238,107,246,204,253,253,209, 76, 76, 67,218, 76,210,176,
-190,243,124, 62,243, 73,102,201,201,204,157,123,239,115,206,185,231,158,235, 27, 30, 30, 94, 56,111,222,188, 95,157,149, 55,116,
-232,208, 97,147, 39, 79, 62,186,121,243,230,105,  0,124, 94,125,115,198, 84,  0,244,133, 11, 23,254,165, 80, 40,126,147,203,229,
-180,131, 34,153,228,202,196,  5,253,149, 53,137,184,170, 14,147,251, 32,147,131,171, 61,  0,150,248,126,241, 15, 82,159, 54, 61,
-149, 67,123,118,129,187,200, 13,132, 16, 24,141,  4, 23,175,221,196, 15,241, 63,202, 36, 34, 55,188,253,246,219, 78,145,119,194,
-198, 79,164,221, 59,167, 41, 47,102,117,148, 57,123,227, 12,225, 75,124,  2, 80, 91,118,199, 76,252,141,121,  4,216, 88,170,253,
- 98, 62,198,161,248,119,205, 13,169,161,235, 26,155, 99,105,253,159, 66,161,176,174, 21, 16,  2,154,174,107,223, 70,163,209,124,
-255, 60,190, 27,107, 43, 26,  0, 90, 52,171, 75,213,169,171,170,128,214, 96,  0,  0,212, 24,234,228,117, 24,241, 22, 58,117,239,
-205,138,248,  1,160,215,128, 97, 56,173,220,103, 38,254,134,174,123,144,229,199,116, 26, 89,  0, 70,122,120, 32,185,182, 86,201,
- 16, 63,  0,252,125,240, 80, 99,157, 86,163,248,110,211, 55,210,140,146,191, 80,152,151,137,206,237,250, 99,253,251, 91, 28,174,
-195,145,145,145, 47,109,219,182,141, 33,127,  3,  0, 13,  0,119,  0,180, 70,163, 17, 72, 36, 18, 68, 70, 70, 74,109,121,  2, 30,
- 50,130,159,  9,235,185, 63,121,203,106,207,218,194, 43, 24, 20, 53,115,243,205,114,253,191,  0,252,246,168,117, 76, 81, 81, 81,
-196,217,  5,120,172,136,209, 41, 44, 95,190, 92,154,158,158,174,220,184,241,159,196, 68, 37, 37, 37,200,202,202,194,232,209,163,
-255, 35,149, 74,101,243,230,205, 99,245,126, 21, 10,  5,111,243,230,205, 95,  0,120,110,208,200,151, 37,155, 55,111, 14,126,245,
-205, 25, 94,  0,140,  0, 90,152, 46,123, 10,  0,111,232,208,161, 67,128,123,151, 58,111,136, 84,251,197,124,140,244,132,133,164,
-161,246,230, 64,251, 32,105,167,210,193,231, 11, 96, 52, 26, 80, 89, 93,131,201, 19, 94, 34,213,213,213, 77, 37,108,226,202,247,
-194,193, 62,108, 45,251,107,225, 41,176,175,  0, 44, 89,186, 76, 42,125,113,162,178, 77, 51, 31,184,139,  5,160,105, 26, 70, 26,
- 16,240, 41,248,251,116, 65,247,206,109,149, 41,201,251,100, 43, 87,174,148, 58,170,  4, 44, 91,182, 76,218, 53,228,132,178, 87,
-151, 27,224,243,140,202,101,203,151,203,102,189,251,174, 67, 50,106,203,238, 64,226, 19,  0, 31,111, 47,  0, 48,127,218,186,174,
-121,155,246,118,189,  1,135,226,223, 69,191,152,143,241,198, 43,227,  1,192,252,105,235,186, 21,187,211, 29,210,174,249,124, 62,
- 90,183,110, 13, 62,159, 15,157, 78,135,218,218, 90, 24,141, 70,148,151,151, 59,245,114, 61,  5,124,252,178,116, 23, 68, 62,192,
-221, 92,224,175,154, 66, 20,223,201,198,175,241,159, 56,100,245,247, 26, 48, 12,173, 91,214, 13,145,180,182, 65,254,237,219,183,
- 55, 15,  7,  0, 64, 65, 65,129, 75,202,143,101,114, 85, 50,210,195,  3, 95,189,251, 14,  0,224, 43, 11,226,223,148,149, 85,191,
- 51,113, 32, 91,235,228, 79,  6, 75,203,251,165, 40, 63,110,251, 26,180,244,112,136,104,130,136,151,140, 88,255,253,118,217,161,
- 21, 96,219,153, 11,102,204,152,241,155, 90,173,198,134, 13, 27, 52, 83,166, 76, 17,  3,240,  4, 64,111,216,176, 65, 55,101,202,
- 20,129, 90,173,134, 88, 44, 86, 54,181,163, 27, 57,114,164,244,224,193,131, 74,211,130, 45, 77,134,167,144,247,255,150,125,245,
-145,196,247,242, 22, 72,254, 62,130,207,159,247,243,122,111, 79,241,151,213, 58,242, 72, 41,  0,204, 18,188,229,229, 17,196,223,
- 63,197,225,103,127,246,217,103,165,127,254,249,167,211,100,179,100,201, 18,233,142, 29, 59,148,213,213,213, 54,207,223,190,125,
- 27, 59,118,236, 80,190,249,230,155,178,245,235,215,167,218,169, 47,212,230,205,155,127, 29, 52,242,229, 73, 89,103, 79, 10, 90,
-183,108,110,120,245,205, 25,245,250,221, 35,251,254,139,158, 61,123,118,217,188,121,243,168,158, 61,123,238,  6,128,227,199,143,
- 55,218, 62,216,180,183,186,246, 65,  1,118, 18,241,244,238,221,155,236, 79, 62,132,179, 23, 47,155,143,105, 52, 90,124,183,108,
- 77,205,204, 41,209, 28, 97, 63,193,184, 39,  8,112,241,226,197,210, 65, 35,198, 41,187,180, 13,128,200,141,  7,154,166,113,231,
-206, 29, 92,200, 60, 11,157,129,  6, 77, 19,  4,248,184, 99,196,168,209, 74,181,214,224,240, 31,138,220,138, 16,210,246, 14,192,
-167,208,173,115, 62, 68,130,187, 14, 91,254,150,228,111,141,202,170,106,220,201,207,133,196, 39,160, 65,175, 64, 99,228,101,141,
-141,219,254,139,119,198,246, 67,191,152,143,209,136,150,125, 15,132, 66, 33,248,124, 62,188,189,189,145,147,147,131,242,242,242,
- 58, 69,202, 73,242,111,209, 44, 24,158,  2, 62,198,205,250, 26,163, 38, 15,192,222,139,133,184,163, 70,147,201,223, 26,  5,183,
-238,224,210,233, 19,  8,242,243,174, 35,127,  1,223, 37,229,247,194,132, 55,  0,  0,126,  2, 55,135,200, 31,  0,254,111,249, 10,
-252,223,242, 21,102,242, 79,174,173,197,135, 35, 70,215,157, 12, 18,178,122,238,  1,113, 29,164,211, 63,120, 78,249,102,187,183,
-225,198,243,132,  7,220,193,  3, 31,173,130,  7,226,221,175,230, 42,231,239,233,194, 74,141, 72, 77, 77,213,  3,192,198,141, 27,
- 85,  0,196,204, 50,202, 27, 54,108,160,  1,184, 91, 46,171, 28, 29, 29,237,212,184, 92,124,124,188,212,145,227, 44, 48,168,111,
-239, 94,170,196,255,238,146,247,238, 17,202,175,189,124, 24,185, 69,213,184, 93,161,  2, 77,136, 83,129,192,132, 16, 82, 86, 54,
-156, 12, 25, 50,196,165,137,196, 44,200, 31,254,254, 41, 78,201, 72, 79, 79, 87,  2,160, 40,138,194,179,207, 62,235,112,153,165,
-164,164,220, 67,254,167, 79,159,198,228,201,147,205,251,122,189, 30, 87,175, 94, 85,198,199,199, 55,234,197,220,188,121,243,187,
-131, 70,190, 60,250,155,184, 57,130,196,196, 68,252,188,108,177,192,228, 49, 50,147,127, 98, 98, 34,150, 47, 95,142,158, 61,123,
-238,182,215,222,172,201,191,161,246, 54,106,160,201, 11,232,229, 97, 87,222, 15,203, 86,153,201,191,168,164, 20, 69, 37,165,168,
-172,174,129,155,155,192,115,213,134, 45, 26,184,106, 65,  4, 14, 15, 20, 97, 97, 97,247,108,141, 42,  0, 43, 87,174, 36,  1,237,
-159, 70,251,230,190,208,232,141,160, 40, 32, 57,249,  0,254,179,113,  3,206,103,102,226,195,185,179,193,231,243, 64, 27,105,120,
-187,139,208,254,233, 65,202,165, 75,151,178,110, 96,203,151, 47,151,118,239,124, 83,233,237,169,194, 47, 27,139,192,163,  8,250,
-245,252, 91,185,124,249,114,135, 26,169, 45,242,103,136, 95, 93, 89, 90, 79, 65,168,172,170,182, 43,207, 86, 99, 98, 26, 82,122,
-194,194,122,  4,183,113,219,127, 89,221, 99, 72, 72,  8,  2,  2,  2, 80, 85, 85,  5,161, 80,  8, 30,143,  7,181, 90,141,242,242,
-114,240,249,117,141,220,145,197,150,118,254,182, 11,179,151, 30,196,174,101,159,162, 69,179, 96,184,123,248, 35,223, 88,136, 95,
-227, 63,129,167,169,211,224,179,148,103,139,252, 25,226,175,188,117, 29, 93, 90, 55, 67,181, 74,  3,145,187,  8, 48, 26,237,198,
-  3,216, 43,191, 79,214,238,197,165, 51,167,208,163, 99, 55, 84, 26,237, 43,141, 12,249,255,125,240, 16,254,111,249, 10,243,241,
-228,218, 90, 36,215,214, 34, 71,254,  5, 14, 94, 62,143,238,253, 58,  2,165,246,151,102, 30, 58,175,163,116,230,123,195,148, 65,
- 30, 93,161, 38,213,128,182,  8, 66,109, 25,180,198,106,104,104, 53,104,161, 39, 90, 13,238,139,136,153,237,136, 61,107,142, 25,
-247,151,203,229,238,114,185, 28,168, 27,  2,128, 92, 46,135,105,223,100, 65,105,176,117,235, 86,135, 27,237,156, 57,115,164,115,
-231,206, 85,118,235,214,141, 80, 20,165,  4,128,215, 94,123,141,180,107,215,142,124,250,233,167, 78, 45,205,236, 37,226,109, 88,
-241,241,155,146,145,173,180,252,147, 87,239, 96,111, 46, 15, 31,239,191,171,253, 34,181,166,178, 86,143, 55,156,145, 89, 94, 30,
-113, 63, 45,127,248,251,167, 32, 38, 38,198,225, 33, 66, 75,194, 39,132, 80,204,114,210,108,241,198, 27,111, 72,239,222,101,103,
-148,232,116, 58, 92,184,112,225, 72, 99,245,  5,128,180,117,203,230,194,168,168, 40,  0, 64, 70, 70,  6,142,236,251,175,184,224,
-214, 29,154, 33,127,211,179,155,219,219,133, 11, 23,226,155,210,222,190,155, 50, 26, 23,175,231,163,121,199, 22, 64,173,138,245,
-179, 23,149,148, 66,175, 55,152, 20, 28,  3,244,122,  3,242,111,230,138,155,248, 90, 41, 59,251, 28, 30, 34,234,185,162,180, 90,
- 45,122,119,233,162,116,151,184,129,166,  9,140, 52,112,226,216,113,124,241,213,215,160,  9,112, 45, 59, 27,231, 51,207,161, 71,
-143, 94,224,243, 41, 60,213,177, 53,114,206,176,247,  2,  8,  5, 69,  8,109,127, 11, 16, 80,200,191,173,  7,  4, 20,158,238,114,
- 19,233, 23,138,156,126,  0, 75,247,190, 45,207,128,186,178,180,222,108,  0,123,176,116,239,219,210,180,211, 19, 22, 34, 98,206,
-114,155, 81,236,150, 48, 24, 12,112,119,119,  7,143,199,131,159,159, 31, 84, 42, 21,106,107,235,150,  1, 14, 10, 10, 66,105,105,
-169, 67, 57,178, 53,229, 64, 63,137,  4, 31, 46, 59,134,136, 94,192,205,179,192, 95,166,115, 31, 46, 59,134,159,230,200, 96,164,
-141, 14,151,223,165,211, 39,204,223,135,133,119,129,192,139,135,228,212,203,232,221,165, 13,188, 61, 69,216,184, 35,  5,125,101,
-145, 40,176, 49, 11,192, 94,249,237,190, 76,128,219,192,216, 97, 20,214,238,205, 65,128, 95,  7,140, 31, 72,177, 42, 63,198,221,
-159, 92,251,207,210,201,228,243,120,160, 85, 37,168,233,159,129,124,241, 21,192, 83,131, 74, 95,192,116, 42, 13, 22,102,200,  4,
- 79,101, 59,223,112, 84, 25,107,160, 45,207,198,175,121,155,113,124,108, 57,186, 77,147, 97,196, 44, 79, 72,252,158,130, 88,224,
-  7,193,216, 74, 76, 51, 76, 35, 63,175,253,217,102, 39, 37,151,203,  9,163,180,241,120, 60, 16, 66,116, 38, 37, 90,195,227,241,
- 84,132, 16,127,  0, 52,154, 48,189, 54, 62, 62, 62,117,228,200,145,178,210,210, 82,101,114,114,114,157,226,147,156,140,174, 93,
-187,162, 75,151, 46, 50,230,152, 35,168,214,210,239, 77,253,191,159,246,124, 31,217,156, 71, 52,149,152,158,144,165, 55,232,245,
-203,181, 70, 44,  0,224,212, 98, 20, 47,191,172,187,239,228,159,144,144,144,234,140,245,111, 57,100, 66, 81, 20,250,245,235, 39,
-101,187,170,164,209,104,116, 72, 97,184,113,227,  6, 20, 10,  5,181,106,213, 42, 91,167,197,  0,186,  1, 16, 60, 31, 57,190, 34,
- 39, 39,199, 55, 35, 35,  3,137,137,137,  8,207,201,225,101,100,100,  0,  0,194,195,195,241,194,208,190,240,246, 20, 97,249,250,
- 93, 69,147, 39, 79,142, 91,181,106,213, 28, 71,219,219,237,223, 22,194,171,187, 24,158,157,103, 99,251,194,105,232,213,163, 57,
-158, 26,253,181,221,246, 81, 89, 85, 13,177, 88,  4,  0,112,115, 19, 64,165,210,184,154,103, 56,210,127,  8, 96,179, 24, 80,189,
-142,138,166,105,184,139,132,208, 25,  8,104,  2,240, 40,224,179, 47,191,134,145,  6,106,106,106,112,231,206,109,  4,  7, 55,  7,
- 33, 52, 12,  6, 35,196,110,  2,240,221,216,185, 96, 87,172, 88, 33,237,220,190, 64, 25,232, 87, 85, 87, 29, 76, 27, 69, 17,244,
-233,126, 77,201,204, 10,112,  4,140,117,207,184,251,173,201,159,141,245,111,173, 69, 51,196,191, 98,119,250, 61,228,207,214,250,
-  7,234,  2,134, 68, 34, 17,124,124,124,204, 46, 67, 38,240,207,199,199,  7,205,155, 55,135,193,192, 94,121, 90,159,114, 20, 62,
-237,  1,105,104,221,126,150,161,206,253, 15,212, 29,251,244,107, 37, 42,116,142, 13,201, 20,220,170, 11, 86,108,219,204, 31, 94,
- 62, 30, 16,120,243,161, 41, 81,  3, 60, 30, 90,180,107,141, 19,153,185, 78,149,223, 27, 31,124,131, 33,253,159,135,224, 14, 80,
- 19, 12,184,243,120,232,223,190,  3,228, 99,131, 89,201,177, 30,235,223,244,202, 52,140,123,121, 48,208, 73,  3,156, 23,  0,158,
-  2, 96, 76, 56, 90,175, 94,203,206, 27,211,202, 31, 58, 93, 25, 40,109, 41,126,205,219,140, 83, 83,124, 48,100,220, 20, 12,106,
-246,130,236,226, 65,  3, 12,116, 45,220,116,181, 48,116,161, 81,124,151, 93,208,168, 73,121,211, 76,153, 50,133,  7,160,156,152,
- 86,136, 50,237, 55,  9,201,201,201,169, 93,187,118,149,185,187,187, 35, 48, 48, 16,238,238,238, 72, 75, 75,163,146,147,147, 83,
-157, 16,215,124,244,232,209,107, 87,172,249,133,247, 89,106, 13,189,227,100, 54,180, 58,125,173,198,136,121,142,144,191,181,203,
- 63, 45, 45,141, 98,182, 71,133,252,109,185,251, 29,245,  2,212,212,212,152,191,159, 62,125,218,188,  1,192,220,185,115,235,237,
- 91, 92, 47,106, 64, 92, 75,  0,237, 77, 74,161,251, 11, 19, 94,211, 88,122,  2, 24,203,255,185,129,  3, 45,219,219, 94,185, 92,
-174,113,164,189,197,142, 25,130,167,195,187,192,171,151, 23, 10, 15,231,  1, 98, 17, 38,204,250, 23,250,189,254, 19,171,103, 54,
- 24,140, 40,188,125,215,192, 88,254, 12,242,111,230, 54,245,213,146,  6, 54, 14,143,128, 66,  0, 91,150, 10, 49,117,110, 52,  1,
-140,116,157, 18, 64, 81,192,127,119,238,192,184,241, 19, 17, 24,212,204,220,  1, 18,  7,222, 37,159, 87,132,238,157,242,205,251,
- 79,247,112, 55,235,134,125,186,229,128,207,115,220, 11, 96,237,238,183,117,222, 17,235,223,218,221,111,235,188,229, 92,246,198,
- 80, 85, 85,133,234,234,106,104,181, 90,208, 52,141,226,226, 98,179,251, 95,165, 82,161,166,166,198,161, 33,128, 93,203, 62, 69,
-234, 69,160, 50, 23,208,171,129,159,230,203,204,238,255, 51,103,129,115,183, 79,128,239, 96,249, 85,222,186, 14,127, 31, 15,  4,
-248,123,224,169,208,174,200,185, 81,140,172,194, 82,180, 13,240,129,246,110, 17,178,175,101,215,203,  5,192,166,252,  6, 72, 95,
-194, 32, 89, 52,118,237,217, 14,101,218,118,108, 94,242,  1, 38,124,176,  0,231,245, 64,113,105, 17,171,242,179, 28,235,127,115,
-192,179,136,233,214, 14,219,119, 29,193,249,243,185, 88,114, 33,  3, 91, 35,254,  5,172, 59,137,194,194, 98, 86,214, 69,107,141,
-  8, 70, 93,  9,116,186,186,200,234,224, 86,109,208,165,107, 87, 89,149,164, 46, 22, 67, 77,171,192,211,214, 66, 82,203,199,221,
-219,141, 43,  0,204, 59,211,104, 52,208,104, 52, 98,  0, 58,  0, 94, 26,141,198,219,122, 74, 96, 19,188,  0,210,180,180, 52,101,
-215,174, 93,241,218,107,175,201, 74, 74, 74, 48,126,252,120, 71, 58,206, 65, 66,161,176,198,211,211,211, 16, 17, 17,113,123,254,
-252,249, 45,227,226,226,114,254, 58,123,254,197,173,151,180, 87,245, 52, 28, 94,143,245,126,184,252, 93, 73,254,214,214, 63,163,
-176, 48,239,140,109, 44,128,155,219, 63, 49, 42, 75,150, 44, 49,111,182,246,  1,243, 12,159,134,222,141,208,180,241,  0,  8, 42,
-111, 93,183,233, 78,103,218,219,217, 51,103,111, 76,158, 60, 57,214,145,246, 54,248,153,167, 48,124, 96, 40,190,249,114, 49,126,
- 88,154,132,255,183,233,  8,102, 60,223, 23,119,126, 79, 66,101,121, 21,155,246, 65, 69,141,125,  1,122,189,225,172, 94,111, 48,
- 88, 42,  0,  0,176,224,179, 79,154, 98,193,115,150,255, 67,132,173,177,127,107, 37,160,158,  2,192,227,241, 80, 89,163,  2,159,
- 71,193, 96, 48,130, 38,  4,  6,186, 46,136, 52,243,220, 89, 60, 63,108,100,157,155,140, 16,240,121,124, 84,171,116, 48,232,180,
-246,173,255,149, 43,165, 29, 90,221, 86,  6,249, 87,154,181,140,  1,253, 60, 77, 49,186, 20, 40,138,160,119,215,108,229,138,149,
- 43, 89,123,  1, 24,235,190,177, 96, 64,167,172,215, 70,130,107, 28,129,159,159, 31,138,139,139, 33, 18,137, 80, 93, 93,141,160,
-160, 32,115, 80,160, 70,163, 65, 69, 69,133, 67, 10, 64,236, 55, 91,241,211,124, 25,124,218,  3,169, 23,129,247, 22, 41,225, 41,
-224, 99,252,251,223,162,128,190,131,132, 37, 31,129,207, 99, 47,143,177,254,195,195, 67, 17,212,177, 61,154,  5,  5, 66,200,163,
- 96,160,  8,138,107,213, 40,175,214, 56, 85,126, 63, 44,252, 13, 47,119,237,  0,111,239,  0,184,  7,181,132,190,172, 28,103,247,
-110, 65, 69, 89,158, 83,149,248,151,133,239,  2,115,134, 67, 96,208,161,125, 45, 80,196,175,194, 79,183,255,  2,132,222,172,101,
-156,217,243,135,172,132,167, 70,158, 80,133,190,157,100,232,246, 47, 79,228,248,165, 42,131,130,206, 42,219,244,207, 65, 37,175,
- 26, 90,162,134,106, 19, 13,177,167, 23, 27,203,223,178,131,103,102,  1,  8, 93,213,112, 15, 28, 56,  0,  0,136,137,137,145,197,
-199,199,167,142, 27, 55,206,108, 49,178, 33,255,160,160,160,253,107,215,174,245, 80, 40, 20,252, 57,115,230, 96,246,236,217,228,
-228,201,147,253,  1, 36,171, 13,232, 10,224, 79, 71,239, 73, 46,247,107,208,237,239,108, 64,160, 43,201,223,154,224, 45, 21, 22,
- 66,  8,101, 10, 12,180,223, 46, 10, 10, 78, 50,223, 55,111,222,108,222,172,143, 49,240,247,247,135, 92, 46,111,168, 19, 44,  0,
- 80,  1,128, 87,112,235, 14, 78,157, 58,101, 30,243, 15, 15, 15,  7, 80,183,252,246,182,221, 73, 40,175,214,168,  0, 44,144,203,
-229, 70, 71,218,219,239,187, 62,199,200,249,179,240,226,139,195, 16, 40,226,163,154, 34, 72,206,202,199,169,139,133, 14, 17,245,
-204, 41,209,207,228,100,103, 11,242,111,230,130,217, 76,228, 15,206,106,127, 60,137,223,250,152, 45,212,139,  1, 16,137, 68,184,
-118,249,188,172,125, 75,127,165,196, 77,  0,163,145,  6, 69, 81,160, 40, 32, 86,254, 14,  8,161, 97, 52,229,  3, 80,105, 52,184,
-146,149,  3,161,208,110, 84, 55, 12,250, 50,244,238,118,195,178,199,192,219,115,110, 96,231,166,206,230,170,213,183,199,117,252,
-145,217,213, 97,235,223, 22,241,171, 43,158,218, 92,106,  0,  0, 32,  0, 73, 68, 65, 84, 75,  1,192, 41,235,223, 86, 67, 75, 79,
- 88,  8,  0,172,173,127,160,110,158,127,243,230,205,161,213,106,113,247,238, 93, 24,141, 70,  4,  6,  6,162,180,180, 20,129,129,
-129,166,114,101, 79,216,197,119,178,241,233,215, 74, 84,230,  2,223,127, 48, 24, 53,  6, 35,230, 46, 74,196,143,243,163,240,193,
-146,189, 16, 80, 20, 28,224,127, 84,222,186,142, 22,129,190,112,131, 27,140,160,112,251,198, 37,220, 44,170, 68, 72,144, 63,126,
- 63,115, 18, 87, 46,195, 97,235,127,194,212,185,112,243,  7,120,124, 96, 67,210, 13,236, 92,249, 33,166, 46, 84, 96,238,152, 94,
-120,103, 88, 59,135,202, 47,185,182, 22, 63,140,157,  4, 84,136,  1,202, 13,248, 97, 49, 38,254,117, 12,  7,135,205,  4,245,237,
- 44, 80,127,124,196,218,194, 56,119, 59,  0,207,170, 43, 81, 35,225, 67, 37, 22, 35,100,130, 27,180, 68,141, 74,158, 27, 12,  8,
-  5, 49,170,160, 47,185,141, 19,203, 42, 17, 51, 57,  4,169, 74,229,  3,111,180,177,177,177,  4,  0,214,172, 89,195,184,250,169,
- 57,115,234,134,129, 55,109,218,196,246,205, 14,108,217,178,229,129,111,191,253,214,227,218,181,107,112,115,115,131,183,183, 55,
-206,159, 63,175,  7, 80,220,148,251,107,108, 78,190, 51,222,  1, 87,146,191,181,245, 95, 71,204,247, 78, 31, 52, 77, 15, 76,181,
-115, 95,215,182,109,219, 54,128,237,240,156, 88, 44,158,218,176,210, 36,175, 30, 58,116,232, 13,  0,225, 89,103, 79,194,114,204,
-255,237,169,147,112,160, 99, 71, 36, 38, 38, 34, 35, 35,  3,251, 59,118,116,159, 60,121,242,250,163, 71,143,178,110,111,175, 12,
-127, 22, 62,180, 31, 84,112,195,206,248, 89, 88,185,247, 28, 62,124, 97, 16,166, 44,217,140,137, 11,126,117,212,  2,167, 22,124,
-246,137,173, 68, 64,196, 66,  9,224, 44,250, 39, 12,245, 60,  0,111,191,253, 54, 85,113, 59, 27,215,243, 75, 33,112,227,195, 96,
-164,161, 55, 24,113,230, 76,  6,254,243,159,245,208, 25,  9,244, 70, 26, 66,  1, 15, 69,229, 53, 40,188,114, 74, 54,123,246,236,
- 70, 27,212,202,149, 43,165, 93, 67,110,254, 99,253,155,234,213,206, 77,161,117,245,137, 71,  0, 30,  1,143, 71,163,127,175, 43,
-202,149, 44,188,  0,182,172,127,203, 89,  0, 30,254,205, 29, 34,127, 91,214,191,101, 84,109,196,156,229, 14,145, 87, 93,167, 88,
-142,154,154, 26,184,185,185,153,173,127,154,166,205,159,142, 42,  0,191,198,127,130, 51,133, 71,225,217,188, 46,232,207, 75,192,
- 71,241,157,108,120,139,220, 80, 81, 86,  0, 62,143,130,128,199,110,248,153,177,254,219,248,123,225,114,206, 13, 24,116, 58,136,
-  4, 66,212,212,104,240,187,242, 36,250,202, 34, 29, 34,127,166,252, 94,122,247, 43, 36,252,244, 35, 84, 52,208, 38,164, 53, 46,
- 94,250,  3,115,199,244,114,170,252,  0, 96,110, 72, 95,236,185,118,  4,168, 52,  0,226, 64, 28, 74,191, 12,234,219, 89, 76,199,
-196,186,240,142, 46,206, 73, 61,113, 40, 29,208, 85,163,134,170, 70, 57,175,  6,149,  2, 61,244,198, 42,136, 52, 42,136,111,221,
-192,214,184,107,104, 31, 22,138,134,  2,  0,173, 33,145, 72, 44, 73,  0, 98,177,216,230, 57,182, 88,187,118, 45,214,174, 93,219,
-164,198,236,229,229,245, 94,118,118,182,135,183,183, 55, 36, 18,  9,252,253,253, 81, 92, 92, 12,138,162, 84,174,236, 52, 24,139,
- 63, 42, 42,138,  0,117,  1,129,142,  4,  5,186,154,252,159,125,246, 89,169,189,128, 90,182,177,  0, 30, 30, 30,177,  2,129,224,
-186,245,241, 37, 75,150,212,179,252,  1,160, 93,187,118, 24, 62,124,248,  6,123,246, 79,193,173, 59,245,162,253, 63,253,191, 57,
- 16,  9,132,  8, 14, 14,  6, 19, 19, 96, 58,239,225, 72,123,155, 38,125, 26,179, 23,255,136,234,187, 69,  8,242,110,134, 75,151,
-243, 48,101,201,102,135,219,135, 21,225, 83, 86,191,183,148,195,121,  2, 30,  3,156, 59,119,174,209,100, 64, 13,122,  0,  0, 96,
-222,188,121,169,223, 47,166,100,132,140, 85,182,111, 25,  0, 47,119, 17,186,245,  8, 67,183,238,189, 32,224,  1, 53,106, 35,242,
-110,151, 33, 61,117,159,204,211,195,221,238, 31,212,170, 84,  8,109,119, 27, 26,173,216,148,181,165,174, 26, 73,196, 26, 16,  2,
-148, 85,136,  0, 10,240,242, 48,160,103,104, 46,142,157,182,159,197,206,210,250,183,180,248, 37, 62,  1,112, 35,122,192,240, 79,
-127,103, 20,216,191, 71, 75,235,223,210,226,103,142,101, 95, 58,107,190,150, 77,150, 61, 75, 37,  0,  0,154, 55,175, 83, 70,202,
-202,202,224,237,237,109,118,255, 59,162,  0, 48, 74,  0,240, 45,102, 70, 13,  5,126, 58,134,149,255,142,196,196, 15,126,196,230,
-133,239, 64, 64, 81, 16,138,216,205,216, 97,172,255,203,121, 69,232,212, 38, 16,235,126,222,138,246,237,219,195,167,101,  8,122,
-181, 12,129, 94,251,143,251,223,141,133, 76,198,250,255,122,234, 48,188,247,217,  6,180,233, 72, 53,169,252, 24,235,127,196,174,
- 95,112, 48, 38, 26, 84,235,254,  0,234,178,  2,  2,192,141,218, 90,179,146,152,  5,118,  9,124, 86, 76,185, 78, 13,157, 71,164,
- 33,227,171,149,237, 59,247, 64,149,  4,184,129,155,168,206, 45, 70,241,  2, 35,106,202, 91,227,234,137, 44,214, 47,132,166,105,
- 74, 34,145, 16,181, 90, 13, 11,203,147, 72, 36, 18,208, 52, 77, 61,140,206,178,186,186,250,251,119,222,121,103,236,218,181,107,
-197, 62, 62, 62, 80, 42,149, 88,186,116,105,149, 78,167,123,193,149,255,195, 88,252,204,116, 57, 71,  3,  1, 19, 19, 19, 41, 83,
-146,159, 38,147, 63,  0, 88, 16,187,221, 50,183,151, 97, 80, 46,151,235, 20, 10, 69,255,237,219,183,159,175,173,173,109,161,215,
-215, 77, 51,181, 38,255,110,221,186,161,127,255,254,163,229,114,185,189,255, 20, 84,222,186,142,111, 62,255, 20,255,221,179, 31,
- 35,  7,245,193,225,148, 63,234, 12,152,150, 33,240,105, 25,130,240,156, 28,188, 48,225,181,146,188, 82,213,  8,  0, 59,216, 90,
-255,179,215,236, 65,220, 91, 35,208,178,185,212,172, 92, 88,151, 67, 19,179, 41,114,158,128, 39, 72, 41, 96,165,  0,  0,192,135,
-243, 62, 72,253,254,123, 90,118,163,245, 83,232,216,185,171,210,219, 67,  2,154,  0,106,173, 14, 57, 57, 57, 40,206, 57, 39,243,
-242,244,192,204,153, 51,237, 54, 92,137, 88,140,237,  7,134,202,152,  8,248, 70,221, 17, 60, 30, 60, 60,216, 91, 79,204, 20, 64,
- 15,255,230,160,141,250, 58,242, 55, 65, 79,185,217, 77,177,107, 13,102, 74, 77,196,156,229,245, 72,203, 25,242,183, 84,  2, 44,
- 19,255,148,149,149,217,127,  1,118,148,128, 95, 45,102,  9,175, 93,240,246, 63, 59,250, 26,120,178,148,211,198,223, 11,219, 79,
-159,195,197,171,127,163,175, 44,178, 30,233, 59, 66,254, 12, 94,122,247, 43,236,236,227,129,119,199,117,113, 73,249,205, 13,233,
-139, 15,118,111,  7,245,205,103,216, 31,252, 44,150,214, 92,172,119,126,188,143, 47, 22, 86, 86, 56, 68, 28, 71, 23,231,164,250,
-  9, 34, 80, 80,126, 29,197,165,183,113, 55,203, 19,124,163, 55,  6, 62, 61, 24, 91, 79,108,125,168,157,154,139,178,253,157, 94,
-191,126,125,  4, 69, 81,135,126,252,241, 71,241,203, 47,191, 92,165, 82,169, 70,192,137, 49,255,198,224,138, 41,128,114,185,159,
- 75,200,223,134,149,106, 79,249, 96,113,111,242, 18,133, 66, 17, 82, 93, 93,253, 77, 70, 70,198,156,194,194, 66,212,214,214, 66,
- 40, 20,162, 69,139, 22,  8, 10, 10,122, 89,161, 80,252,254,235,175,172,150,  4,184,  2, 32,188,141,191, 23,158,123,238, 57,156,
-187, 86,136,192, 14,221,235,181,183, 23, 38,188,166,  2,176,236,155,184, 57, 59,216, 62,199, 52,233,211,136, 72,249, 19, 49,159,
-253,  7, 67,134, 12, 65,112,112,176, 77, 69,203,133,175,157,114,130,252, 73, 35,199, 57, 37,226, 33,144, 62,171, 84,192,  0,240,
-225,135, 31,166,174, 88,177, 66,122, 38, 53, 75,  6,212, 69,210, 18, 66, 32, 18,137,240,209,135,243, 88, 55,218,119, 29, 76,243,
-203, 22,140,171,159,111, 80,  1,  6,149, 57,  2,158, 33,126, 71,231, 98, 49,174,254,236, 75,103,145,125,233, 44,130,130,130, 80,
- 92, 92,236, 20,241,251,  4,181,132,142, 69,112, 36, 91,196,124,245, 43, 78, 30,115, 93, 49,230,230,230,154, 87,251,211,107, 53,
-247,144,191, 35,196,207,224, 95,125, 60, 92, 86,126,  0, 64,197,127,100, 38,126,134,252,111,212,214,202,198,251,248, 34, 25, 72,
- 93, 88, 89,225,212,179,255,182,240,144, 69,199,163,  6,  0,108,189,196, 62, 97, 15, 33,132, 18,137, 68,102, 47,  0,243, 29,  0,
- 68, 34, 17,101,235,251,  3,198,241, 95,126,249,101,200,142, 29, 59,230, 86, 85, 85,197,  3, 72,119,245, 31,184, 98,234,159,139,
-201,201,229,144,203,229,106,  0,115, 77, 91,147,222,199,133, 11, 23,  6,  2,232, 16,216,161,187, 74,175,213,184,155,218, 91, 21,
-128, 74,  0, 87,218,  6,184,191, 34,151,203, 29,170,208, 17,159,174,125, 80,196,239,148,162,229,228,245, 28, 92,128,176,176, 48,
- 86,228,111,215,  0,109,234, 74,125,247,  3,204,216, 62, 67,252,104, 34,241, 51, 99,211,149, 69,  5,168, 44, 42, 64, 80, 80, 80,
-147, 44,126,  0, 48, 24,105,135,189, 15,141,161,168,172,210,233,123,177,  6, 51,182,239, 42,226,191, 15,229, 71,  1,192, 72, 15,
- 15, 98,105,245,247, 22,184, 53,137,248,255,199,240, 87, 85, 85, 85, 52, 87, 12, 15, 31, 71,143, 30, 85, 40, 20,138,255,228,149,
-170, 84,122,173,198,114, 60,210,187,109,128,187,159, 19,171,255, 81, 64,221, 80,198,227,166, 84,113,120,176, 74,  0,171,202,228,
-236, 58,194, 28, 56,112,224,192,129,  3,135,199, 23, 60,174,  8, 56,112,224,192,129,  3,  7, 78,  1,224,192,129,  3,  7, 14, 28,
- 56,112, 10,  0,  7, 14, 28, 56,112,224,192,129, 83,  0, 56,112,224,192,129,  3,  7, 14, 79,  4,234,205,  2, 56,119,238,156,211,
- 81,164,182,130,  9, 57,121,156, 60, 87,201, 51,173,173,206,  3, 64,219, 74,190,194,149, 95,195,242,194,194,194,152,178, 99,230,
-114,147,115,231,206,209, 92,249,113,242, 30, 39,121,225,225,225,130,140,140, 12,  3,  0,244,235,215,143,116,238,220, 25,  9,  9,
-  9, 20, 87,126,182,229, 57,172,  0, 60, 33,104, 82,146,137,168,168, 40, 41,  0,203,148,161,178,196,196,196, 84, 78, 87,124, 56,
-248,238,187,239, 94,191,112,225, 66,175, 83,167, 78,125, 32, 18,137,160, 82,169, 62, 82, 40, 20,139, 89,100, 96,227,240, 79,199,
- 66,  0, 24,185,146,120,180, 17, 25, 25, 41,221,183,111, 95,170,147,191,149, 37, 37, 37, 29,113, 81, 66, 41, 68, 70, 70,190,146,
-148,148,180,117,245,234,213,254,  0,170,  1, 24, 31,118,155, 99,200, 63, 38, 38,134,108,218,180,  9,125,251,246,229, 42, 77, 19,
-241, 68, 13,  1,152,200,187, 73,191,223,190,125,187,117,190,112,101, 83,228, 70, 69, 69, 73, 77,115,118, 73, 84, 84, 20,113, 84,
- 22,113, 16,182,230,  7, 55, 81,158,244, 97,188, 75,133, 66, 65,205,154, 53,107,241,165, 75,151,126,106,215,174,221,  7, 98,177,
- 24, 90,173, 22,  0,190,219,185,115, 39, 61,110,220, 56,217, 67,106, 50,196,241,237, 65,202,107,112, 13,118,203,181,216,157, 90,
-159, 61, 42, 42, 74, 74,  8, 33,228,255,217,150,205,156,179, 87,  7,109, 33, 55, 55,151,228,230,230,186,140, 96,202,202,134,215,
- 91,175,192,213, 68, 77, 81,148, 67,114,105,154, 16,163,145, 16,154,182,189, 69, 70, 70, 74,147,146,146,156, 90,133,106,205,154,
- 53,207,239,223,191,255,200,208,161, 67, 65, 81, 20,217,178,101,203,112, 71,239,205,122,219,191,127,255,214, 87,  7,  8, 33,159,
- 33, 47,187,238,153,179, 99,250,244, 88,154, 57,103, 79, 94,109,109, 45,169,173,173,109,180, 30, 50,215, 56,251,126,174,158,150,
- 33,101, 77, 38,194,195,195, 57, 67,128,189, 33,112, 79,130, 32,129,157,  6,111, 51,111,182,189,124,218, 15, 17, 77, 90,198,109,
-251,246,237,202, 73,147, 38,  1,168, 75,170, 97, 81, 57,149,206,120, 21, 24,133,130,201,249,111, 74, 67,170,140,138,138,114,204,
-171,144,232,239,192,191,218,111,251,181, 99,222,102, 47,206,241,117,109, 26,106,144,172,203, 79,161, 80, 80,149,149,149,219,122,
-244,232, 49,  1,  0,143, 16,  2,137, 68,130,162,162, 34, 84, 84, 84,192,199,199,  7, 69, 69, 69, 71,198,141, 27, 39,219,181,107,
- 87,170,131,239,132, 48,233, 96, 41,138,194,132,  9, 19, 48,124,248,112,217,140, 25, 51, 88,203,217,189,251, 55,243,247,177, 99,
- 95,182,187,111, 15,234,147,239,254, 83,220,  3,150,215,219,183, 62, 38, 25, 96,127, 81, 37,102, 57, 97, 75,164,165,165, 97,193,
-130,  5,247,188,139,193,131,  7,147, 99,199,142,177,170,203,137,137,137, 74,124, 70, 49,251,247, 38,158,249,140,106,114,103,252,
-  8,247, 45,245, 44,109,133, 66, 33,139,141,141,197,144, 33, 67,200,241,227,199, 89,253,246,100,  3, 57, 25,119, 37,126,128,164,
-164, 36, 37,179, 72,216,144, 33, 67, 72, 85, 85, 85, 99,132, 47,141,141,141, 53,215,215,223,127,255,221,157,162, 40, 68, 71, 71,
-223,  5, 16, 60,121,242,228, 67, 10,133,130,231,136,197,190,248,208, 98,243,247, 59,201,183, 65, 81, 20, 54,191,239, 14,128,194,
-247,175,125,247, 82, 96, 96, 32,  0, 96,203,198,205,172,203, 42, 60, 60, 28, 29, 59,118,116, 73,185,135,135,135,243, 50, 50, 50,
-232,126,253,250,145, 77,155, 54,225,110, 86,123,160,196,143, 99,117,  7,200,223, 81, 15,  0, 73, 76, 76,188, 71,195,178,232, 64,
-137, 19,141,219,165,214,164,181,188,196,196, 68,203,  5, 49, 28,  6, 69, 81, 84, 98, 98, 34,197,116, 64,166, 79,167, 45, 77,134,
-252, 77,247, 68, 89,220,155,195,138, 10, 53,169,220,188,177, 57,110, 15,158,123, 87,153, 55, 54,199, 29, 33,127, 66,  8,152,213,
-217,  8,113,172,154, 40, 20, 10, 94,121,121,249,127,124,124,124, 38,  0,224, 77,157, 58, 21, 49, 49, 49, 16, 10,133,144, 72, 36,
- 16,139,197,160, 40, 10,124, 62, 31,149,149,149,172,203, 49, 34, 34, 66, 10,128,236,216,177,  3,204, 59, 33,132, 96,231,206,157,
-152, 49, 99,134,210,116,254,145,131, 45,133,224, 97,120,214, 18, 19, 19,149,  0,168, 87,174, 78,194,164, 43, 54,219, 24,153,116,
- 37, 74, 70,125,233, 84,187, 35, 31,126,248, 33, 58,116,232,224,146,251,165, 40,138,200,229,126,  8,  8, 56,236,210,114, 24, 53,
-106,212,176,148,148,148, 35,132, 16, 42, 54, 54, 54,213, 17,242,111,  8,187, 18, 63, 64,124,124, 60,104,154,198,  7, 31,124,192,
- 74,161,176, 36,127,  0,216,191,127,255,158, 33, 67,134,  0,128, 95,116,116,180, 97,232,208,161,144,203,229,180, 41,110,134,141,
-151,177,222,254,210,165, 75,241,202,115,117,182,225,230,247, 37,120,117,128, 16, 31,141,252,144,245, 51,121,120,120, 96,200,144,
- 33,200,200,200, 48,247,167,214, 27,115, 13, 91,101, 47, 35, 35,131,  6,234,150, 89,  7,  0,111,247, 18,142,213,155, 72,254,141,
- 42,  0, 12, 89,101,100,100,152,211, 78, 90, 90, 79,142, 18,173, 69, 39,226,234, 78,201, 90, 25,112,169,107,216,198,144,128,195,
-176, 84, 40, 76,214,255,147, 88,207,136,101,103, 82, 88, 88,104, 62, 81, 80, 80,192, 90, 97,172,172,172,252, 86,165, 82,189,198,
-227,241,120,147, 39, 79, 70,101,101, 37,110,221,186,  5, 55, 55, 55,  8,  4,  2,  8,  4,  2,184,185,185, 65, 34,145, 64,173, 86,
-131,141, 11,113,245,234,213,210, 67,135, 14, 41, 41,138,194,196,137, 19, 65,  8, 97,148, 60,106,226,196,137,  0,128,148,148, 20,
- 37,215, 85, 52, 78,254,166,247, 43,179, 84,146,153,119,111,233,213,114,198,130, 79, 76, 76,164, 76,239,  5,171, 87,175,118,137,
- 50,246,201, 39,159, 48, 70, 65,147, 61, 19, 35, 71,142,140, 56,125,250,116, 74,251,246,237,209,169, 83, 39, 50,112,224, 64,179,
-231,196,180,250,163, 83,228,191,100,201, 18, 80, 20,  5, 30,143,135,211,167, 79,131,141, 55,198,202, 35,241, 18, 69, 81,120,245,
-213, 87, 13,166, 67,186,232,232,232, 42,169, 84,138, 25, 51,102,208, 47,190,248,162,221,103,183, 92,149,244, 78,242,109,128,  2,
- 18,222,251, 39,107,241,230,247,221, 17, 61, 80,132,249, 47,124,196,250,190,216, 88,254,108,174,137,137,137, 33,225,225,225,230,
-237,244,233,211,168,201, 11,  7,116,106, 80,158,  6,164,124,125,  5,150,231,153,141,107,185,245,201, 63,118,254, 66,155,231,  5,
-141, 53,200,240,240,112,146,145,145,  1,198, 19,192, 16, 87,120,120,184, 67,141,252,126,147,191,165, 85,253,168,  7,236, 89, 14,
-  9, 60,113, 26,  0, 33, 40, 44, 44,196,157, 59,119,204,199,172,247,237, 88,255,252,  3,  7, 14,188, 24, 26, 26, 10, 62,159,143,
-236,236,108, 16, 66,240,247,223,127, 67,167,211,129,162, 40,  8,  4,  2, 80, 20,  5,163,209,  8,149, 74,133, 93,187,118,217,149,
-123,248,240, 97, 37,  0, 76,156, 56,241,158,122,203, 12,245, 48, 68,193,166, 94, 91,187,245,237,237,179,177,242, 25, 52, 52, 28,
-192,198,245,111,141,180,180, 52,152, 44,195,166, 41,192,159, 81,160,190,172, 83,224, 44,149, 87, 66,  8,240, 25,133, 73, 87,162,
-156, 14,148,165, 40,138,152,222,139,153,140, 76,239,139,106,138,188,206,157, 59,223, 67,110,206, 66, 36, 18,145, 75,151, 46,161,
-184,184,152, 42, 46, 46, 70, 88, 88, 24,201,205,205,  5,159,207,135,193, 96,112,234, 15,134, 14,228, 51,202,  3,230,205,155,135,
-165, 75,151,226,216,177, 99,160, 40, 10, 99,198, 78,199,205, 92,118, 11, 56,238,223,191,255, 55,211, 59,214,  0,160, 77, 27,162,
-163,163, 43,  0,248, 38, 37, 37, 33, 50, 50, 82,106,169,144, 55,134, 58,235,255,222,117, 76,234,134,  3,128, 45,155,207, 58, 36,
-175,169,184,122,245, 42, 78,159, 62, 93,239,152,177,226,  6, 12,122, 26,160,170,225,251,130, 30,167,173, 22,187,230,130,  3,217,
-145,127,163, 30,  0,147,245, 79, 89,122,  2, 24,203, 63, 35, 35,163, 41,228,111, 47, 64,201, 41,121, 22,158,  9, 41,156,  8,112,
-186, 15,150, 19,177,232,124,204,247,195, 28,115, 85,112, 18,217,238,103,222, 92,129,154,209, 51,205,155,  3,150, 63, 97, 58,219,
-214,173, 91,163,111,223,190,230, 70,200,236, 91, 95,219,  0,124,253,253,253,123,104,181, 90,148,149,149,225,228,201,147, 72, 79,
- 79, 71,113,113, 49,212,106, 53,152, 49, 82, 66,  8,244,122, 61,180, 90, 45,171, 33,  6,166,110, 52, 68,238,137,137,137, 20, 69,
- 81, 96,235,153,217,189,251, 55,243,198,102,223, 30,212, 39,223,173, 71,244,204,102,185,111,121, 13, 91, 12, 25, 50,  4,105,105,
-105, 77,171, 16, 22, 99,254,168, 27,198,146,153,200,153, 98,206,161,137,177, 55,150,239,133,241,  2,184, 10,174,240,  2,180,106,
-213, 10,  5,  5,  5,148,181,178,235, 44,249,239, 74,252,192, 92,135, 25, 12, 26, 52,  8,  0,112,244,  4,251,201, 26,145,145,145,
- 35, 77, 99,255,151,  1,168, 76,253, 57,179,153,181,110,182,193,133,245,199,254,109, 40, 87, 14,202,115,  5, 50, 50, 50,168,190,
-125,251,162,250,242, 40,148,159,108,129,138,227, 18,144,242, 10,160,  6,224,169, 12,168, 58,198,131,250, 79, 33, 42, 78, 54,195,
-129,205, 17,232,219,183,175, 67,252,244,191, 14,  1,155,198,201,120,  2, 28,181,252,231,207,159, 79, 22, 45, 90,228,178,155,181,
- 39,207,212, 73,185,172,114,178, 29, 67,107,140,116, 44,100,213,200,229,114,207,134,206, 59, 11,203,177,127, 87, 40,  1,150, 99,
-255,108,149,128,152,152, 24,120,120,120,192,211,211, 19, 94, 94, 94,240,241,241,161,253,252,252,120, 73, 73, 73,120,253,245,215,
-205,215,137,197, 98,140, 24, 49,  2,141, 40,  1,  1, 58,157, 14,101,101,101,208,104, 52,240,241,241,129, 72, 36,130,193, 96,  0,
- 33,  4, 70,163, 17, 58,157, 14,122,189, 30, 70,163,209,161,248,  2, 83,208, 90,131,231, 45,173,208,135,  9,123,  1,129,142,162,
-169, 74,  0,245,101,195,195,125,147,174, 68,153,200,213, 73,217, 86,214,191,197,113, 76,156, 56,209,225, 96, 64,107,235,223, 82,
-158,179,  8, 15, 15, 39, 70,163, 17, 97, 97, 97,228,220,185,115, 84, 88, 88, 24,209,235,245,168,172,172,108, 10,169,213,117,190,
-  2,  1,230,204,153,131,211,167, 79,227,159,113,127,246,117,250,192,129,  3,  7,  6, 15, 30, 12,  0, 94, 38,210, 87,  1,192,214,
-173, 91,155, 29, 61,122,212,219,212, 62, 40,211,167, 93,193, 75,127, 92,138, 87,251,223,107,253,199,252,164,194,214,147,122, 16,
- 66,208,123,114,111,156,221,124,150,122,144,198, 85, 70, 70,  6, 37,251, 87, 56, 57,176,180, 29,  4, 53, 85,128,161,238,175,105,
-  0, 66,  1, 80,120,199, 23, 71,242,194,141,107,182, 20,243, 51, 50, 50,168,240,240,112, 49, 19, 43,192, 89,255, 11, 27,189,206,
-238, 52,192,168,168, 40,194, 84, 88,203,120,  0, 54, 88,180,104, 17, 99, 49,184,  4, 44,228, 57, 61,190,110,154,162, 87,111, 75,
- 73, 73,161,153, 89,  1, 77,181,216, 99, 99, 99, 61,159,228, 10,183,102,205, 26, 44, 89,178,164, 94,189, 98,200,127,236,216,177,
- 24, 59,118,108,157,133,115,244,104, 99, 98,252,115,114,114, 52, 70,163, 17,229,229,229, 40, 41, 41, 65,121,121, 57, 84, 42, 21,
- 84, 42, 21,106,106,106, 80, 85, 85,133,202,202, 74,168,213,106,104,181, 90,176,105,232, 20, 69, 97,199,142, 29, 14, 41,108,143,
- 51,210,210,210,234,109,150,152, 51,103,142,212,114,159,205,152,179,141, 49,255,122,150,123, 83,162,246,109,253,150, 16, 66,237,
-216,177,195,165,177,  0, 59,118,236,112,184, 13,247,233,211,135, 24,141, 70,115,130,150,176,176, 48, 66,211, 52,238,222,189,139,
-218,218, 90,167,158,249,223,243,135,226,232,209,163,160,183,249,130, 16,130,248,248,120,243, 59, 74, 59, 73,131,237,200, 71,100,
-100,228,203,  0, 16, 29, 29, 93,104, 82,  0,180, 91,182, 36, 52,155, 57,115,102,179,163, 71,143, 98,212,168, 81, 17,142,228,  4,
-184,147,124, 27, 20, 40, 36, 88, 88,255,147,127, 84,129,255,106, 37,182,156,212, 97,246,236,217, 88,116,224,187,  7, 94,151,195,
-195,195,249,140, 18,240,194,108,  3,136,218,  7,168,  2, 80,  5,240,171,129,170,187,192,254,179, 45, 96, 65,254,130,140,140, 12,
- 13, 71,254,246,201,223,174,  7,192,122,220,223, 50, 30,128,173,155, 37, 49, 49, 49,213, 20, 32,164,180,242, 36, 57,219, 97,220,
- 35,143, 25, 22, 48,141, 67,186,196,253, 51,124,248,240,139, 41, 41, 41, 61, 30,197, 23,204, 88,253,174,114,251, 51, 86,191,  3,
-110,255,122, 72, 72, 72, 48,127,255,226,139, 47,176,126,253,122,  0,208,  1, 16, 50,196, 15,  0, 35, 70,140,176,167,  0,168, 67,
- 67, 67,161, 82,169,160,211,233, 80, 92, 92, 12,145, 72,  4,129, 64, 96,246,  0,212,214,214, 66,165, 82, 65,171,213,162,178,178,
- 18, 19, 38, 76,144,237,220,185,179,209,251, 99,172, 76, 59,211, 90, 49,113,226, 68,187,138, 66,157, 66,115,255, 98,  0,156, 57,
-111, 13,139,233,126,247, 32, 62, 62, 94, 57,103,206, 28, 89,124,124,124,234, 67,173,195, 13, 88,255,150,112, 36, 22,160, 33,235,
-223, 89,244,233,211,135,156, 57,115,134, 10, 11, 11,251,156,169,218, 70,163,241, 51, 15, 15, 15,148,148,148, 56,213,199,124,250,
-241, 80,164,166,166,130,218, 17,  0,  0, 56,248,169, 23, 70,124, 93,141, 33, 67,134,224,155, 69, 71, 65,  8, 97,237,173,216,191,
-127,255,174,161, 67,135,  2, 64,241,214,173,155, 91, 29, 61,122,204,151, 80,  4, 47,142,122,113,236,190,125,251,246,236,219,183,
-207, 33, 47,231,210,165, 75,241,234,  0,183,250, 22, 63,  8,230,204,158,131,224, 17,205,241,176,226,150, 50, 50, 50,234,105,248,
-164, 26, 16,233,  0,154, 80, 48, 24,  9, 68,  4,  8,150,240, 44,175, 55,128, 67,157, 81,182,232,227,  6, 21,132,176,176,176,198,
- 21,  0,203,136,127, 19,249,155,131,165, 24, 79,  0, 91,205,223,  6,105, 55,  9, 54,228,185,124, 76, 42, 54, 54,182, 71, 74, 74,
-138, 43, 59,188, 39,181,158, 81,168,139,  2, 55, 91,210,111,190,249, 38,  0,  8, 45,234,146,249,156,169,211,106,  8,151,250,247,
-239,255,122,106,106,106,162,209,104, 68, 85, 85, 21,244,122,189,121,220, 95,163,209,152,167, 24, 50,129,129, 59,119,238, 76,101,
- 81, 95, 40,152,166,  0, 90,215,219,168,168, 40,194,144,254,240,225,195,101,108, 20,128,251,149,  7,192,114,236,223,146,252,173,
-135,  5, 88,188,143,198, 64,226,227,227,149,175,188,242, 10,182,109,219,230,172,183, 76,106,233, 57, 97,246,153,128,193, 73, 87,
-162,200,181,107,215, 26,252, 61,147,240,231,192,129,  3, 13,122,236,110,220,184,193,218, 51, 83, 86, 54,156,  0, 64, 68, 68, 14,
-114,114,114,108, 70,151,151,150, 14,  3, 80, 14,192,126,191,213,173, 91, 55,114,230,204, 25,202,212, 89,126, 14,  0, 60, 30,239,
-179,155, 55,111,162,188,188,220,169,134,204,227, 81,117, 10, 59, 67,254,231, 13, 88,175,212,  1,  0,190, 89,116,212,225, 62,130,
-105, 19, 51,103,206, 12, 35,132, 32,114,116,228,132,189,123,246,254,151, 45,241, 91,138,122,121,220, 75,151, 41,138,234, 70,  8,
-192,127,181, 18,132, 16,204,153, 59,  7,205, 71,180,104, 98, 94,213,186,105,189, 76,189,107, 74, 38,193,240,240,112,178,253,227,
-150,240, 44,189,129,235, 85,173,209, 65, 84, 12,120,  4, 67, 80,123, 23,222,181,165,  0,154,153, 61,  6,214, 74,  3,  7, 39, 60,
-  0,150,211,253,172,166,177,145,196,196, 68,135, 93,166, 22,164,237,146, 27,183,148,199,204,255,127, 66,167,215, 61, 22,176, 42,
-251,122, 83,196, 26, 56,119, 79,103, 32,151,203, 13, 10,133, 98,231,208,161, 67,103, 37, 37, 37, 45, 51, 24, 12,168,168,168, 48,
-199,  0,  0, 64,113,113, 49, 42, 42, 42, 64,  8,129, 35,245, 41, 34, 34, 66,118,232,208, 33,101, 98, 98, 98, 61,235,147,249,125,
- 68, 68,132, 67,201,128,238,  7,212, 39,223,117,134,240,239, 33,120, 59, 93, 54, 69, 81, 20,113,134,252, 77,158,182, 84, 91,109,
- 17,  0, 44,130,  2, 89, 97,198,140, 25, 74, 22,255, 73, 28,152, 43, 94,239,179, 62, 17,177, 75,142,215,161, 67,  7,114,249,242,
-101,198,229,255, 57,128,207,180, 90, 45,174, 95,191,142,202,202, 74,103,169,144,208,219,252,112,240,124,157,113,186, 65,169,195,
-214,147, 58, 16, 66,112,236,148,243, 35,139,105,105,105, 24, 53,106,148,108,223,190,125,169,123,247,236,117, 86, 12,143,166,105,
- 55,  0,216,118, 74,143,217,179,103,163,249,200, 22,236,213, 73, 27,168,173,173,  5,  0,228,228,228,144, 53,107,214,152, 21, 50,
-203, 88,146, 13, 27, 54, 88,246, 15,172,254,165, 29,175, 22,  8, 10,195,235,107, 43,  1,  4,215,149,193, 59,129,104, 43,200,199,
-215,195,139,176,177,243,171,100,235,214,173,255,243,  1,128,140,117,111,203,242,183, 62,223,216, 16,  0,101, 26,  2,184,103,218,
-148, 35, 67,  0, 54, 59, 10,215,145,142,165, 60,151,206,255,103,198,254,157,133, 61,133,196, 81,133,165, 33,119,191,179,195,  0,
- 13,185,251,157, 28,  6,176, 12, 10,162, 28, 56,  7, 27, 74,  0,  1,176, 92,161, 80,172, 78, 72, 72,208, 11,133, 66,104,181, 90,
- 24, 12,  6,208, 52, 13, 95, 95, 95,148,151,151,195,209,108,138,135, 14, 29, 74, 69,221,188,127,178, 99,199, 14,152, 20,  1,243,
-212,192, 67,135, 14,253, 79,116, 14,175,188,242, 10,169,173,173,197,222,189,123, 29,173,207, 82, 59,229, 77, 38, 93,137,146,177,
-241,198,125,248,225,135,247, 24, 23,214,248,232,163,143,  8,219, 32, 79,185,220,207,174, 60,185,220,143,149, 48,137, 68,194,116,
-146,132, 16,  2,149, 74,133, 91,183,110, 57, 61,230,111,137,145, 95, 87,215,219,111, 10,249, 27,141, 70, 10,  0,156,176,248,173,
- 65,239,254,125, 79,103,203, 76,128,174, 66, 99, 10,153,133,  2,192,202,250,151, 79, 12,185,245, 75, 22, 90, 42,118, 92,175, 23,
-229, 63,100, 69, 56, 57, 50,227, 41, 92,187, 43, 65, 99, 94, 39, 14, 14,122,  0, 76, 47,142,114,228,248, 67,182, 64, 83, 31,177,
-251,161, 28,176,152,237, 40, 34,195, 93,118, 95,147, 38, 77,146, 57,145,222,183, 81, 11,205,134,  5,218,152,117,202, 42,104, 76,
- 46,151, 27,  0, 80, 19, 38, 76,144,230,229,229, 41,213,106, 53,140, 70, 35,186,117,235, 38,235,219,183,175,211,239,123,199,142,
- 29,150, 83,206,156,242, 26,221,239, 24,  0,123,251,108,244, 69, 83,116,120,125,194, 57,118,204, 97,183,191,105,174, 63,153,116,
-229, 94,  5,142, 16, 66,152, 28,  1, 22, 10,153, 57, 96,206,217,182,  1,  0,219,183,111,167, 92,213,214,216, 94,  3,  0,101,101,
-101,232,208,161,  3,169,170,170, 66,187,118,237,144,153,153,233,146,190,142,247, 74, 57, 40,138,194,216,151, 98, 25, 55, 12, 22,
- 47,154, 97,254,238,104,198, 76, 87, 65, 46,151,211,171,143,174,118,169,204, 41, 83,166,152,188, 46, 10, 79,  0,  6,211, 70,228,
-114, 57,109,113,141, 67, 15,172,216,113,189,165, 37,247, 48,174,254,140,140, 12, 74,126,248, 85,194,145,255,125, 80,  0, 30, 35,
- 52,185,145, 62,170,249,199, 93,125, 95,247,193, 11,115, 95,203,205, 52,198,111,254,143, 43, 87,174, 60,228, 55, 66, 83,143,182,
-188,186,178,114, 52,163, 92,131,248,172,222, 58, 22,196,214, 57,147,229,157,250, 36,116, 36,119,238,220, 49,191,143,156,156, 28,
-151,189, 19,133, 98, 53,145,203,103, 80,191,255,166, 96,245,  3,103,151,119,117,  6,166,105,125, 46,239, 19, 26, 83,174, 29,236,
- 55, 60, 80, 23, 83,164,183, 48, 66,205,227,252,156,219, 31,108,235,212,189, 21,243, 65, 86, 52, 14, 28, 56,112,224,192,129,195,
-163,  1, 30, 87,  4, 28, 56,112,224,192,129,  3,167,  0,112,224,192,129,  3,  7, 14, 28, 56,  5,128,  3,  7, 14, 28, 56,112,224,
-192, 41,  0, 28, 56,112,224,192,129,  3,135, 39,  2,245,102,  1, 48, 57,175,157,129,173, 96, 66, 78, 30, 39,143,147,247,224,228,
-197,197,197,213,215,238,121, 60,115,118, 57,203,169,102, 76, 54, 69,203,169,103,182,210,  7,123,122,122, 66, 44, 22,155,127,207,
-227,241,192,231,243,239,145,199, 44,204, 68,211,117,179,188, 26, 90, 44,135,123,191, 13, 67,161, 88, 35,229, 11, 68, 32,180,  1,
-211,167,191,149,234,140,188,213,171, 87,203, 50, 51, 51,  5, 97, 97, 97, 41,214, 89,247,156,148, 39,205,204,204,196,170, 85,171,
- 82,185,246,246,248,201,115, 88,  1,248, 95, 68, 96,224, 91,245, 10,174,164,100, 29,245, 72,201,123, 43,144,  0, 64,201,186, 18,
-202,242,123, 19, 68, 54, 49,185,231,125,151,247, 63,139,181,203,150, 72,139, 47,158,196, 16,191, 98,101, 43, 67, 62,178, 72,  7,
-156,174,245,151,121,135, 62,139, 89,115,231,165,218,251,253,241,227,199, 49,104,208, 32, 51,241, 51,132, 77, 81,212, 61,132, 77,
-211,180,121,187,121,243,166, 77,121,103,206,156, 65,120,120, 56, 36, 18,  9,  4,  2,  1,248,124,126, 61,153, 12,233, 27,141, 70,
-243,166,213,106,145,145,145,129, 78,157, 58, 61,113,239, 71,161, 80, 80,114,185,156,172, 94,189, 90,250,247,223,127,227,218,181,
-107, 74, 95, 95, 95,108,218,180,169, 73,245,127,205,154,181, 82,145,216, 31,190,126, 79, 41,107,107, 10,101,107,214,252, 44, 93,
-185,210,177,220, 15,171, 86,173,146, 38, 38, 38, 30,201,202,202,194,222,189,123, 17, 26, 26,138, 15, 62,248,128,111, 57,247,222,
-  9,121,202,156,235,217,232, 20,210, 17, 66,145,  8,179,103,207,121, 62, 54, 54, 86,201,181,212, 39,212,  3,240, 56, 33, 34, 34,
-194,174,198,115,232,208, 33,187, 13,147, 33,104,107,226,118, 22,174,150,119, 31, 64, 57, 72,218,118, 83,203,186, 88, 30,155,223,
- 91,255,255,227, 77, 44,171, 87, 75, 47, 31, 63,136,188,173,223, 43, 85, 42, 45,244,207,242, 32,105, 77,161,115,222,121, 60,227,
- 69,148,229,197,127,161,229,234,255, 39,155, 48,227,203, 70,149,128,203,151, 47,131,207,231, 99,240,224,193, 16,  8,  4,230,141,
- 81,  8, 24,171,223, 96, 48,192,104, 52, 66,175,215,227,230,205,155, 56,114,228,136, 77,121, 42,149, 10,103,207,158, 69,255,254,
-253, 33, 20, 10,225,230,230, 86, 79, 38, 77,211, 48, 24, 12, 48, 24, 12,208,235,245, 80,171,213, 56,123,246, 44,106,106,106, 30,
-  5,178,230,153,234,  6, 15,128,161, 41,121,232, 21, 10,  5, 21, 23, 23, 71,199,197,197, 33, 32, 32,  0,255,254,247,191, 49,113,
-226, 68, 84, 87, 87, 35, 32, 32,192,169, 12,164,  1,  1,  1,230,251,249,228,147,143,241,235,230, 12, 72, 36,205,192,231, 11,149,
- 53,213,249, 14,203, 76, 79, 79, 71, 77, 77, 13,250,247,239,127,115,248,240,225, 45, 74, 75, 75,113,240,224, 65,227,244,233,211,
-177,118,237,218, 70,219,136, 54, 55,251,158,178,185,112,245, 42, 82,189,220, 49, 55,254,203,252,222,125,122,180,185, 93, 80,132,
-131, 73,169, 71,182,108,217, 58, 60, 58,250,213,195, 28,117, 62,250, 96, 82,255, 90,121, 10, 88, 41,  0,214,169, 91,237,237, 63,
-112,242,127,251,237,183, 27,189,166,188,188, 28,  0,  8, 27, 37,128, 33,235,166, 90,235,247, 67,158,165,229,239,  2,235,223, 81,
-210,102, 75,214,174,150,103,121,173,229, 39,  0,160,172,172, 46, 51,162,191,127,202, 19,209, 80,115,255, 76, 65,167,124,165, 50,
- 95, 69, 99,124, 39, 62,158, 10, 50,128,246, 39,112,243,231,163,186, 84,  8, 73,181, 26, 93, 51,151, 43,127,141,143,147,189, 62,
-103, 65,131, 74,  0, 69, 81,184,114,229, 10,132, 66, 33,158,127,254,121, 51,105,187,185,185,129,199,227,129, 16,  2,189, 94, 15,
-131,193,  0,173, 86,139,252,252,124, 40,149,202,  6,151, 84,230,241,120,208,235,245,200,204,204,196,224,193,131, 33,145, 72, 32,
- 18,137,204,242, 24,  5, 64,171,213,162,166,166,  6, 23, 46, 92,128, 70,163, 49, 15, 19,176, 65,116,116,180,148,207,231, 43,171,
-171,171, 33, 20, 10, 81, 84, 84,244,238,248,241,227,171,197, 98,241,175,206,144,118,116,116,244, 36, 62,159,191, 45, 41, 41,137,
-145,151, 53,126,252,248,191, 21, 10,197, 68,185, 92,174,115,198, 18,142,139,139, 83, 46, 88,176,160,  8,166, 21,103,226,226,226,
-112,249,242,101, 52,107,214, 12, 97, 97, 97,216,184,113,163,195,228,255,203,212,169,120,177,119,111,  0, 64,243, 89,179, 32,113,
- 15, 70, 77, 85, 30,170, 42,175,203, 98, 99,167,165, 54,148,207,189, 33, 60,253,244,211, 40, 42, 42,194,241,227,199,219,241,120,
- 60, 92,184,112,  1,254,254,254, 72, 75, 75,195, 27,111,188, 65, 50, 51, 51, 27,253,125,233,183,115,235,237,123,234,244,104,105,
-208, 96,246,135,159,181,137, 95,252,  5,190, 95,188, 18,173,120, 70,172, 92,188, 36,229,141, 55,222,128, 61,121, 28, 30, 61,242,
-103,142,179, 93, 11,224,158,252,223,246,246, 31, 36, 92,185, 82,223,227,  0, 75, 37,224,  1,121,  2, 28,181,212, 41, 59,214,185,
- 51,242,108,125, 62, 81,137,171,126, 92,244,141, 52, 52,243, 23,101, 17,223,136, 78, 62, 64,187,182,  4,252,167,133, 16,116,236,
-  8,161, 86,  3,237,137,124,104, 43,  5,224,211,110,208,164,252,170, 92,187, 98,177,108,250, 59,182,135,  3, 24,247,124,118,118,
- 54,252,252,252, 32,147,201, 32, 22,139, 33, 20, 10, 33, 16,  8,204, 86,191, 70,163,193,173, 91,183,112,244,232, 81,240,120, 60,
-240,120, 60, 52, 38,207,104, 52,226,210,165, 75, 24, 52,104, 16,188,189,189, 33, 22,139,193,231,243, 97, 48, 24,160,211,233, 80,
- 85, 85,133,191,254,250, 11, 90,173, 22,  2,129,192, 28, 11, 96, 15,131,  7, 15,150, 94,189,122, 85,121,227,198, 13, 84, 85, 85,
- 65, 40, 20,162,121,243,230,203,143, 29, 59,134,  1,  3,  6,  8, 20, 10,197,122, 71,148,128,193,131,  7,143,187,122,245,234, 54,
- 43,121,161,199,142, 29, 11, 29, 48, 96,192, 22,147, 18,192, 74,222,170, 85,171,164, 58,157, 14,119,238,220, 97, 92,222,230, 66,
- 90,176, 96, 65, 97, 92, 92, 92,171,137, 19, 39, 62,255,254,251,239, 59,212,255,173,253,121,189,244,227,249,243,234, 29,187,179,
-108, 25,154,191,220, 26,223,127,255,163,108,234,212,215,156,234, 79,143, 31, 63,174,252,243,207, 63,241,241,199, 31, 87,241,249,
-124,111,177, 88,140,  1,  3,  6, 64,169, 84, 34, 41, 41,  9,173, 90,181,114,160,229, 81,216,148,125, 27, 59,175, 21, 98,247,239,
- 27,193,231, 83,152, 59,235,117,186, 87,243, 64,222,154,217,159, 97,173,163,242, 56, 60, 20,242,183, 86, 34,109, 41,  5, 78,207,
-  2,120,216,203,219,118,236,216, 81,102,111,123,208,214,250,253,144,231, 66,171,159, 45,105, 59, 67,214,176,180,206, 25, 11,221,
- 36,135, 56, 41,175,193,142,218,223, 63,197, 41,235,127,197,138, 21,210,105,211,166,145,134,142, 89,159,107,  8,150,215,175, 88,
-177, 66,106,125,206,250, 88,163,229,117,233,140,242, 86, 97, 21,154,121,  9,208,209,139, 64, 16, 72, 67,240,220, 11,240,232,245,
- 43, 36,125,126,128,200, 71,  2, 97,141, 26, 42,149, 17,109,249, 42,164, 37, 52,156, 74,150,199,227, 65, 32, 16,192,205,205, 13,
-215,174, 93,195,133, 11, 23,224,237,237,141,128,128,  0,  4,  4,  4, 32, 48, 48, 16,190,172,156,122,115,  0,  0, 32,  0, 73, 68,
- 65, 84,190,190,168,172,172, 68, 90, 90, 26,248,124,190,121,108,223, 22,152,243, 66,161, 16, 70,163, 17, 89, 89, 89,112,119,119,
- 71, 96, 96, 32,154, 53,107,134,160,160, 32,120,122,122, 34, 43, 43, 11,122,189,222, 60, 68,208,144, 66, 97,109,249,223,189,123,
- 87,121,253,250,117,116,232,208,  1, 35, 71,142, 68,191,126,253,160, 82,169,112,228,200, 17,100,102,102,174,211,104, 52,175, 57,
- 96,249,203,238, 22, 21,255, 55,231,118, 37,188, 58,245, 71,232,200,183,208,170,223, 88,148,107,121, 56,148,114, 24,153,153,153,
-227, 53, 26,205,116,182,228, 95, 85, 85,133,243,231,207, 43,143, 31, 63,142,167,159,126, 26,113,113,113,129,  0,104,147,  7,160,
- 21,  0,136,197, 98,214,100,189,246,231,245,210, 77,  9,123,164,254,  1, 61,148,  9, 91,207, 99,234, 47,191, 32,233,236, 89, 36,
-157, 61,139,230,179,102,  1,  0,244,250,218,163,206,180,185,151, 94,122,137,236,222,189, 27, 19, 38, 76,184,233,229,229,197,115,
-119,119,207, 72, 79, 79,199,241,227,199, 81, 82, 82,130,208,208, 80,199,148,210,179,215,176,248,143,139, 88,187,248,147,243,  2,
-190, 26, 60, 99, 53,190, 91,250, 11,111, 91, 90,  6,110,241,  4,120,234,169,167, 56,150,125, 66, 32,112,150,224, 31,214,226, 21,
-247,205,194,254,223, 86,  4,238,203,184,122, 19, 93,245,148,157,227, 14, 41, 21,139, 23, 47,150, 30, 62,124, 88,153,157,157,221,
-224,177,244,244,116, 86,178,152,235,210,211,211, 81, 86, 86,166, 92,188,120,177,108,222,188, 58,171,220,214,177,198,224,173, 41,
- 69, 82,158,  6,173,202,249,232,237, 77, 33,168, 24,232, 36,240,  1,143, 10,  0,209,220, 69,237, 93, 10,151,242,104,220,169,213,
- 64,192,227,161,167,191, 72,217,208,115, 91, 42,  0, 34,145,  8,215,175, 95, 71,171, 86,173, 16, 17, 17,  1, 62,159, 15,154,166,
- 81, 90, 90,138,227,199,143,195,205,205, 13, 66,161, 16, 58,157,174, 65,  5,128,241, 14, 48, 74,  0, 33,  4, 57, 57, 57,232,212,
-169, 19,124,124,124, 80, 83, 83,131,179,103,207,194,104, 52, 66, 36, 18, 65,171,213, 66,171,213, 54,216,119, 48, 65,116,  0, 80,
- 92, 92,172, 44, 40, 40, 64,175, 94,189, 32,149, 74,209,186,117,107, 89,109,109, 45,130,130,130,148, 41, 41, 41, 56,117,234, 20,
-124,125,125,251, 43, 20,138,205,114,185,220,238,250,238,197,197,197, 71,238,150, 85,194, 63,180, 63, 58, 14,126,  5,190,173, 67,
-161,173,173, 64,222,159,251,112,237,240, 70, 70, 30,171,247,107,138,125, 80,222,186,117, 11,193,193,193, 16,139,197,178,243,231,
-207, 43,227,226,226,120, 38, 15,  0,  0, 92,141,139,139,163,217,212,193,159,215,109,148,250,250, 61,165,244,245,127, 10, 60,158,
- 27,244,250, 90,172, 91,175,196,212, 55,101,140, 71,  1,211,167, 79, 71, 80, 80, 16,237,104,219,123,253,245,215, 73, 66, 66,  2,
-  6, 15, 30,140, 62,125,250,180,  3, 96, 56,124,248,112,120,110,110, 46, 36, 18,  9, 36, 18,  9, 34, 35, 35,159,223,190,125,251,
- 17, 54,242, 54,255,157,143, 31,254,186,138,159, 23,206, 47,107,253, 84,187,167,107,107,202,241,251,254,191,112,254,194,223,240,
- 37, 52,132,119,238, 34,242,221,152,225,219,182,109,255,223,114,193, 62, 70,176, 53,124,212,144, 87,160, 33, 85,157,154, 56,113,
-162,165,  5, 77, 69, 69, 69, 53,182,255,216,162,164,100, 29,101,185, 61,106,242,128,251,226,254,111,204,106,111,210, 61, 59,107,
-157, 59,226,  1,112, 20,209,209,209,210, 61,123,246,212, 35,127, 91,199,156, 65,118,118, 54,246,236,217,163,140,142,142,150, 54,
-118,172, 65,226, 42,201,199,201,219,106,168,140, 52,142,229,211,184, 99, 16,192,168,205, 64,249,229,183,177,113, 86, 44,246, 30,
-172,196,133, 82,130,115,197,  6, 92, 42, 53,160,244,214,157, 70,189,114,150, 74,128, 88, 44,198,205,155, 55,113,245,234, 85,  0,
-117,113, 49,127,252,241, 71,189,177,252,198,198,235, 41,138, 50,123,  1, 24,121,132, 16,228,231,231,163,109,219,182,184,117,235,
- 22,104,154,134, 88, 44, 54,203,106,108, 72,193, 18,121,121,121,208,104, 52,  8, 15, 15, 71,235,214,173,101,124, 62, 31,222,222,
-222,120,246,217,103,101,158,158,158,200,203,203, 67, 85, 85,213,  5,182,245, 32, 47, 47, 15, 52, 79,136, 86, 97,195,225,219, 58,
- 20, 60,190, 27, 36,222, 65,104,251,108, 36,132, 30,126,140,188, 92,123,114, 86,175, 94, 45,173,168,168, 80, 22, 22, 22,162, 77,
-155, 54,144,201,100,178, 95,127,253, 53,181,180,180,148,  2,128,254,253,251, 27, 76,151,134,250,248,248, 64,161, 80,216, 13,120,
- 16,139,  3, 16, 16,212, 11, 70,131, 22, 69,183,211,113,167,240,248,176,146,226,179,159,152,228,  1,  0,238,222,185,  3,147, 60,
- 55,182,117, 79, 46,151, 79, 76, 72, 72, 64, 76, 76, 12, 38, 79,158, 12,  0,244,193,131,  7,  5,123,246,236,193,212,169, 83, 71,
-156, 57,115,134, 58,113,226,  4, 21, 23, 23,199, 42,114, 63,171, 74,133,249, 71,207,225,219, 15, 98, 49,120,244,112,127, 35, 49,
- 96,251,127,143,226,167,229,191, 98,255,156, 55,176,182, 87, 91,180,245, 17,224,147, 79,226,184, 32,192,199,  4,231,206,157,107,
-144,252, 27,245,  0, 88,143,237,219,219,127, 18,113, 31,166,224, 57,133,175,159,249, 90, 54, 99,198,140,199,161,188,235, 13, 41,
-220,231, 32, 61, 86,239, 33, 50, 50, 82,122,237,218, 53,165, 78,167,107,244, 88, 83, 80, 94, 94,142,218,218, 90,101,100,100,164,
- 44, 63, 63,255,158, 99,251,246,237,107,240,221,101,150,169, 81,169,163,145, 89,108,192,173, 10,  3,130,255, 16,224,233,237,217,
-184,153,123,  9,127,255,169,131, 65,192,135,142,  6, 52, 58,130,114, 66, 35,168,145,101,237,153,233,126,204,216, 61, 19,177,127,
-247,238, 93,180,107,215, 14,185,185,185,102,151,191, 64, 32, 48, 95,239,232,112,158,101, 14,  1,230,243, 62, 13,  9, 86,192,181,
- 49, 31,118,201,154,166,105,212,214,214,214,117,142,  2,129,236,237,183,223,174,247,238,170,171,171,  5,187,119,239,198,216,177,
- 99,121,243,231,207,191,187,104,209, 34,131,189,186, 72, 81,117, 10,145, 90,117, 23, 53,213,249,178,105,211,222, 72, 85, 40, 20,
-105,  0,190,173,174,174,198,238,221,187,205,138, 99,167, 78,157,116,108,234,246,194,133, 11,199,126,255,253,247,137,145,145,145,
- 24, 52,104, 16,  0,208, 39, 78,156,224,253,246,219,111,144, 74,165,163, 87,172, 88,113,200,145,130,185,173,210,226,245,164, 63,
- 48,123, 82, 36, 38,190, 62,  1, 42, 77, 21,118,237, 78,197,210,149,155,241,159, 17,207,160, 99, 81,  1,199,166, 79,128, 50,192,
-214,  3,224,106, 16,171,134,108,111,159,131,  5,238, 55,249,187,208,106,111,200,163,224,236,248,127, 99,245,130, 85,125,217,183,
-111, 95,106,231,206,157,101,126,126,126,141, 30,107, 10,252,252,252,208,185,115,231,122, 68,111,235,152, 45,168,141,222,208, 83,
-192,233, 18, 45,138,140, 70, 28,206,209, 96,123,162,  6, 71, 10,130,144, 45,244, 65, 65,165, 30,249,213, 52,106, 13,128,202, 64,
- 32, 10,104,110,151,152,153,249,253, 70,163, 17,  6,131,  1,  1,  1,  1,240,244,244, 68,187,118,237,160,215,235,205,199,109, 37,
-  4,178,150,199,204,239, 55, 24, 12, 80,171,213, 32,132,160, 77,155, 54, 40, 44, 44, 68,139, 22, 45, 32, 16,  8,160,213,106,161,
-211,233,204,255,203,102,120,176,109,219,182, 16,139,197,200,200,200, 64, 65, 65,129,210,104, 52,162,170,170,138,250,243,207, 63,
-149, 53, 53, 53,104,219,182, 45,188,189,189, 95, 96,219, 71,181,109,219, 22, 60, 90,135,194,179, 41,168, 40,200,  2,109,212, 67,
- 93, 85,140,188, 63,247, 65, 87, 91,206,200,107,207, 70,185, 97, 16, 16, 16,160, 92,181,106,149,217,139, 83, 90, 90, 74, 93,186,
-116,  9, 38,210,166,  1,  4,219, 74,120,100, 13,131, 65, 13,131,190,  6, 18,143,230, 16, 75,252,161, 80,172,145,202,229,114,195,
-130,  5, 11,  2, 44,228, 97,237,218,181,168,172,172,100,166, 48,222,131,  5, 11, 22,144,129,  3,  7,146, 62,125,250,144, 47,191,
-252,242,247,177, 99,199, 98,244,232,209,  0,128, 51,103,206, 84,237,217,179,  7, 19, 39, 78, 28,123,248,240,225,125,108,202,108,
-193,130,  5,100,208,160, 65,228,213,183,223,197,243, 59,142, 98,222,191,198,227,189,143,102, 66,163,171,193,141,235,249, 80, 40,
-182,227,183, 49,  3, 32,109,211,204,233,182, 49,106,212, 40,174, 95,127,136,  8, 11, 11,171, 71,250,214,129,128, 15, 52, 21,112,
- 84, 84,148,212,145,253,  7,102,233, 55, 48,103,223,218,218,103,107,253, 55, 36,239,173,192, 64,242, 86,224, 63,238,124,235,125,
-123,158,  8, 87,201,107,192,146,118,134,168,239, 27,172,148,  8,167, 61,  0,  0,176,101,203,150,212, 49, 99,198,200, 44,147,211,
-216, 58,230, 12, 58,117,234,132, 49, 99,198,200,182,108,217,146,218,216,177,  6,127,223,185, 19, 58,123,240,225, 69,  1,122, 66,
-112,165, 92,135,132,108, 45,182,156,188,133,191,174,151,225,150, 26, 40,213, 24,113,189,134,224,182,150,160, 70,167,151, 53, 70,
- 94,204,212, 60,157, 78,  7,181, 90,141, 22, 45, 90,160, 71,143, 30, 38, 69,207, 31,253,250,245, 51, 19, 54, 67,218, 13, 17, 54,
- 67,232,122,189, 30, 58,157, 14, 20, 69, 33, 36, 36,  4, 21, 21, 21,200,207,207, 71, 89, 89, 25,218,183,111, 15, 30,143,  7,157,
- 78,  7,173, 86,107,254,141, 61,  4,  5,  5,201, 90,183,110,141, 75,151, 46,225,192,129,  3,216,187,119,175,114,239,222,189, 71,
-142, 29, 59,  6, 62,159,143,231,158,123, 14, 29, 59,118, 84,195, 20,120,199, 66,222,216, 96,127, 31,148,230,156,195,223,135,214,
-227,210,190, 85,184,178, 79,129,155,167,126,131,136, 71, 51,242, 10,237,201,121,231,157,119, 82,131,131,131,101,222,222,222,200,
-204,204, 68, 65, 65,129, 50, 62, 62, 94,106,169,  8,152, 60,  1,188,132,132,  4,116,239,222,221,238,189,233,180,149,168,172,200,
-134,155,155,  7,124,253,187, 40, 61, 60, 91,225,151, 95, 54, 73, 41,138,215,159,185,198,171, 34,  5,202,255,188,135,136, 46, 53,
- 13,214,237,125,251,246, 65, 34,145,160,123,247,238,104,223,190, 61, 51,124, 96, 40, 47, 47,175,217,177, 99,135,111, 88, 88,216,
-216,109,219,182,237, 97, 91,119,147,146,246,193,219,219, 19, 67,134, 62,171, 10,235,243, 52,198,189, 61, 21, 42,202,128,226,162,
- 50,204,152,245, 21, 22,245,237,132, 62,205,156, 87,146, 71,141, 26, 69,190,251,238, 59, 78,  9,120, 68, 20,  1, 91,120,100,214,
-  2,120,216,179, 10,156, 33, 96, 71,177,174,164, 78,129,176, 36,106,230,216,163, 32,239, 81,245, 40, 88,121,  2,136, 35, 30,  0,
-  6,243,230,205, 75, 29, 54,108,152,172, 95,191,126, 13, 30,179, 60,215, 24, 44,175, 31, 54,108, 88,189, 96, 63, 91,199, 26,181,
- 14, 69, 30,178,158, 45,  2, 49, 48, 64,132,103,252,132,104, 41,230, 65, 68,  8,196, 90,  3,218,122, 10, 80, 78,  8, 46,214, 24,
-144, 85,107, 64,171,102,  1,104,255,204,208,  6,101, 49, 86, 63, 51,213,175,109,219,182,232,213,171, 23,202,203,203, 81, 81, 81,
-129,138,138, 10,120,121,121,161,127,255,254,208,233,116,230,156,  0, 13, 17, 54,163, 76,232,245,122, 80, 20,133,208,208, 80,168,
-213,106, 20, 23, 23,163,168,168,  8,197,197,197,168,173,173, 69,104,104, 40,  4,  2,129, 89, 94, 67,121,  5,172,149,178,224,224,
- 96, 89, 72, 72,  8,110,220,184,129,228,228,100,164,167,167,195,221,221, 29,207, 63,255, 60,122,245,234,181, 79, 44, 22,207,101,
- 59,109,111,203,150, 45,123,130,155,  5,189, 22,210,194, 23, 53,215,255, 68, 86,242, 58, 20,166,255, 14, 63,145, 17,195,135, 61,
-143, 94,189,122, 77,121,255,253,247,119,179,145,229,237,237,141, 62,125,250,128, 16,130,147, 39, 79, 34, 35, 35, 67, 89, 88, 88,
-168,252,246,219,111,165,113,113,113, 50, 38,115, 98,223,190,125,145,150,150,102, 87,222,244,233, 83, 83, 43,203,179,101,101,197,
- 23, 32, 18,251,163,121,203,231,148, 65,205,251, 41,189,188,219,239,251,126,241, 79, 99, 24,121, 91,222,119,199,214, 19, 90, 52,
-164,244,100,101,101, 33, 48, 48, 16,131,  6, 13,162,159,121,230, 25,168, 84, 42,212,214,214, 98,249,242,229,158, 93,186,116,121,
- 89,169, 84,238,113,164, 77,252,253,119, 22,218,181,109,141, 87, 95, 29,235,254,233,191,103,163,180,186, 18, 37,165, 37,136,125,
-239, 43,124, 53,110, 24,134,181, 13,110, 18,249, 47, 93,186, 20, 61,122,244,192,178,101,203, 56, 37,224,  1,194,114,220,223, 30,
- 30, 88, 38, 64, 87,206, 42, 48, 37,247,113, 73, 38, 64,123,176, 78,196,227, 10, 37,192,149,100,237,106,121,174,120,213,112, 65,
-122, 96, 43,  5,130,106,192, 99,225, 16,222,121,231,157, 84,235,223, 89, 30,251,249,231,159, 89,201,100,174,179,117, 61, 91, 25,
- 12, 54,108,217,150, 58,255,245, 73, 48,164, 39, 33,183, 18,240,164,220,208,206,147,135, 66, 35,  5,190, 72,128,180, 34, 35, 52,
- 52, 16, 36,226, 35,164,239, 16,188,191,120,109,106, 99, 10,128, 94,175,  7,159,207, 71,135, 14, 29,208,167, 79, 31, 84, 85, 85,
- 65,163,209,152,231,231,235,116, 58,248,251,251, 99,208,160, 65,216,179,103,143,121, 72,192, 22,140, 70,163, 57,139, 96,215,174,
- 93, 97,114,211, 67,163,209,152,219, 51,227, 73,232,218,181, 43,202,202,202, 80, 83, 83,211, 96, 91,182, 38,243, 99,199,142,165,
- 70, 71, 71, 63,223,189,123,247, 35, 22,137,128, 42,  6, 15, 30,124, 68, 44, 22,199,200,229,114,141, 35,101,121,236,216,177,132,
-232,232,232,170,238,221,187,239,182,144, 87, 50,120,240,224,229,239,191,255, 62,235,108, 61, 51,103,206, 76, 93,181,106,149,108,
-228,200,145,184,113,227,134,242,234,213,171,200,203,203,131,151,151,151,210,215,215, 23, 17, 17, 17,248,249,231,159,209,183,111,
- 95,214,247,246,214, 91,175,167,254,252,243,  6,153, 70, 83,  6, 95,191, 80,165,167, 87, 27,120,121,183, 69,109,117,225,158,133,
-139,214, 33,250,213,225,216,242,190,187,185,156,108, 89,108, 47,190,248, 34,146,146,146, 80, 80, 80,192, 43, 43, 43,131, 70,163,
- 65, 90, 90,154,192,164,116, 86,157, 56,113,194,161,246, 16, 25,249, 34,118,237,218,131,170,138, 82, 20,220,186,141,247,223,249,
-151,238,195,143, 23,  8,199, 61, 63,  0,131,180, 85,128,155,115,244, 48,106,212, 40,242,249,231,159,155,211, 65,135,132,132,224,
-187,239,190,  3,  0,178,127,255,126, 46,109,248, 67, 82, 10, 30,166,  2, 64, 77,156, 56,209,210,133, 70, 89,185,251, 41, 71,221,
-255,174, 32,119, 51,201,151,172,131,189,108,123,142,  4,255,149,148,172,131,165, 43,222,146,152,173, 93,246,108, 72,187,100, 93,
-137, 75,229, 61,  6,248,159,234, 36,218, 15,144,201,206,107, 13,202,226, 35,135,225,102, 80,227,124, 53, 65, 74,181,  1, 66,138,
- 66,  0, 33,144,181,240,133, 95,243, 32, 89,235,103,165,192,134,109,118, 61,  0,237,219,183, 71,191,126,253,160, 86,171,161,215,
-235, 33, 20, 10,205,132,205, 88,233, 65, 65, 65, 24, 56,112, 32,146,147,147, 27,245,  0,  8,  4,  2,244,234,213, 11, 20, 69, 65,
-165, 82,153,189, 11,140,210,206,100, 23,164,105, 26, 61,123,246,196, 31,127,252,  1, 71,130, 43,183,108,217,162,  4, 64, 41, 20,
- 10, 10,128, 39,234,178,237,229,201,229,114,189, 51,101,185,101,203,150, 61, 38,121,158,  0,252,  1,148,201,229,114,135,115, 19,
-207,156, 57, 51, 21,  0, 86,172, 88, 33,115,115,115, 67, 78, 78, 14,252,253,253,149,  0, 80, 88, 88,136, 81,163, 70, 97,201,146,
- 37, 14,201,156, 54,109, 74,170, 66,177, 70,170,211, 85,202, 36, 85,185, 74,111,223, 16,184,123,182,132,187,103, 75, 28, 60,124,
- 23,212,176,198, 45,238,141, 27, 55, 82,211,167, 79, 39,101,101,101,120,241,197, 23,117,  1,  1,  1, 66,154,166,145,151,151,231,
-176, 71, 12,  0, 54,108,216, 72,201,229,177,196,251,114,  6,222,121,231, 45,180, 14,237, 44,252,110,246, 91,244,134,149, 27,121,
-203,249, 26,167,234,242,168, 81,163,200,252,249,243,225,235,235,139, 91,183,110, 65, 34,145,128,166,105,120,120,120,224,155,111,
-190,225,148,128,  7,128,176,176,176,  6,189,  0,108, 83,  1,187, 28,143,248,172,  2,170,100, 93,137,205, 19, 78, 90,255,212,186,
-146,123,229, 89, 91,234,140,235,158,  5,105,187, 90, 30,135, 71,  8, 38,178,161, 94,137, 28, 37,245, 49,104,149,252,155, 57,232,
-164,191, 13,175,128, 96, 12,232,217,  5,  1,173,  2,101, 31,173,218,156,186, 53,125,166, 93, 47, 90,135, 14, 29, 48,104,208, 32,
-243,120, 60,159,207,135, 86,171, 53,167,238,181, 28, 38,104,211,166, 13,  6, 14, 28,136,212, 84,219, 77, 79, 34,145, 32, 44, 44,
- 12,  2,129,  0, 58,157,206,252, 59,203,169,131,150, 11,  1,241,120, 60,244,238,221, 27, 25, 25, 25, 14,151,129,201, 59, 80,109,
-218,154, 12, 19,233, 55,121, 81,  2,147,135,200,220, 14, 87,173, 90, 37, 85,169, 84,208,106,181,232,210,165, 11,226,227,227,149,
-142,221, 87,108, 42,  0, 40, 20,107,100,106,117, 49, 68, 34, 63,184,  9,189,148, 60,158,  0,155, 18,246,201, 94,139,137,108, 84,
-222,218,181,107, 41,133, 66, 65,253,240,195, 15,180, 90,173,  6,  0,132,134,134, 58,148,126,217, 18, 10,197, 26,234,231,159,215,
-142,154,250,249, 15, 73,117,242,  8, 47, 52,244, 41,132,190,252,242,107,239,188,243, 78,130, 51, 50, 23, 45, 90,196, 53,234, 71,
- 68,  9,104,140,252, 31,168,  2,240,184,194,149,211,254,172,137,185,169, 68,237, 66,121,174, 86, 24, 56,  5,196,  9,108,219,183,
- 63,181, 94,217, 85,229,225,216,141, 60,214,191,143,138,138,130,159,159,159, 57,194,159,166,105,179, 11,159,241,  0, 48, 65,127,
-204,138,128, 33, 33, 33,160, 40, 10, 91,183,110,189, 71,222,210,165, 75,145,152,152,104,190,214,104, 52,218, 93, 14, 88, 40, 20,
-162,111,223,190, 96, 19, 29,255, 24, 43,107, 77,174,235,140, 34, 80, 71,234,235, 80, 23,142, 69, 43,217,200, 51, 41, 75, 20,  0,
-172, 90,181,138,204,156, 57,147, 58,124,216,249,169,249,211,166, 77,223,111,242,154,240,104,154, 54,242,120, 60,137,163,195, 47,
- 12, 56,235,254,209, 82,  2,236,118,212,206,174, 35,204,129,  3,  7, 14, 28, 56,112,120,124,193,227,138,128,  3,  7, 14, 28, 56,
-112,224, 20,  0, 14, 28, 56,112,224,192,129,  3,167,  0,112,224,192,129,  3,  7, 14, 28, 56,  5,128,  3,  7, 14, 28, 56,112,224,
-240, 68,160,222, 44,128,115,231,206, 57, 29,193,105, 43,152,144,147,199,201,227,228, 61,145,242,200, 75, 47,203,241,251,111, 10,
- 40, 20, 10,158,173,108,125, 92,249,113,242,218,182,109,107,190, 38, 47, 47,143,226,202,239,193,202,115, 88,  1, 96, 26,119, 35,
-215, 59,115,131,143,179, 60,103,100, 62,234,207, 91, 15, 10,133, 66,  8,192, 27,128,187,169, 62,208,  0, 74,156, 73,158,114,159,
- 65, 92,245,204, 13,148,233, 67,153,190,180,120,241, 98,233,201,147, 39,149, 71,143, 30,  5,  0, 12, 29, 58, 20,  3,  6, 12, 96,
-157, 74,248, 97,188,135,151, 94,150,227,197, 81,125, 12,128, 92, 32,151,203,105,112,211, 62, 57, 88,161,109,219,182,100,204,152,
- 16,243,254,158, 61, 32,246,148,  0, 14, 15,217,  3, 96,110,225,219,239, 93,  0,130,154, 84,222,148,255,161,156, 32,222,  7, 38,
-207,214,243, 54,241,153, 31,233,231,101,136,255,210,249, 99,235,183,111, 89, 62,172,121,171,144,224,202, 74, 61,124,124,220,112,
-167,240, 58,221,189,123,175, 50,133, 66,209, 79, 46,151,223,112, 68,166,124, 74, 47,146,115, 61, 11,215,115, 53,200,191, 77,208,
-166,  5,133,144,246, 98,116, 12,  9,133, 98, 67,230,163,210,248,109, 41, 18,204, 90,  3, 15,252, 30, 47, 92,184,160, 12, 11, 59,
-128,213,171, 85, 72, 77,  5, 62,251,236, 32,242,243,243,149, 99,198,140,129, 88, 44,198,173, 91,183,100,227,198,141,131, 43, 20,
-130,215, 94,123,141, 84, 86, 86,202, 34, 34, 34,240,222,123,239,165, 58, 81,103,120,114,185, 28, 47,142,234, 67,199,198,198, 10,
-128, 53,248,253, 55, 64,161, 80, 80,108,115,246,115,248,223,129, 78, 55, 31,201,201,177, 24, 57,114, 13,198,140, 89,132, 61,123,
-234,218, 30,167,  8, 60, 24,112,137,128, 28, 97, 88, 11,178,167, 40,128,222,230,247,196, 62,235,242,101, 75, 94,223,187,251,151,
-184, 78,157, 58,119, 25,255,242, 80,180,105,229, 13, 95, 31, 17,202, 43, 52, 40,188,221,134,119, 45,167, 60,112,239,238, 95,148,
-203,151, 45,249,225,221, 89,115,151,217,147,247,254,187,147,165, 55,178,246, 42,139,110,101,226,149, 72, 96, 96, 56, 16,210, 14,
-200,206, 37, 56,126, 90,141, 36,101, 38,198,142,240, 38, 29, 66, 71,203,126, 92,190,217, 89, 34,115,165,229, 79,217,144,253, 80,
-148,128,178,178, 50,188,247,158, 10, 65, 65, 64, 84, 20,176,112, 97, 13,206,158, 61, 11,131,193,  0,177, 88,140,102,205,154, 41,
-247,238,221,139,233,211,167,203,214,174, 93,235, 80,217,205,156, 57, 83,122,241,226, 69,  4,  7,  7, 43,119,236,216, 65,109,218,
-180,  9,  0,148, 41, 41, 41,120,235,173,183,176,110,221, 58, 71,159, 85,  8,  0, 73,251,207,240,128, 53,116,221,231,189, 57,254,
- 57,112,214, 63,  0, 76,152,176, 19,201,201,117,159,177,177,215,193,120,  4, 56,111,192,131, 37,126,203,227,214, 74,  0, 23,  4,
-104,195, 11,240, 36,147,191, 66,161, 16, 28, 74,222,254,169,108, 72,159, 46,227, 35, 67,209,171,123, 51,  4,248, 73, 64,129,130,
-183,167,  8,161, 33,254,136, 24,218, 30, 67,  7,245,110,119, 40,121,251,167, 10,133,162,185, 61,153, 55,178,246, 42,  7,135, 87,
- 97,251,114, 96,106, 20,208,197,228,249,243,112,  7,186,118,  2,190,156,  3,244,239, 85,133, 27, 89,123,149, 77,121, 69, 77,245,
-122,216, 81, 36, 30, 74,135,228,239,239,143,189,123, 37, 40, 46,  6, 18, 19,129,242,114,  1, 58,117,234,132,209,163, 71, 51,203,
-189, 34, 53, 53, 21, 25, 25, 25,202,197,139, 23, 75,217,202, 29, 57,114,164,244,210,165, 75, 74,161, 80,168, 44, 47,175,239,201,
- 82,171,213, 88,183,110, 29,100, 50,153,163,229, 73,  3,192,239,191, 41,144,180,255, 12,239,247,223, 20, 77,122,246,105,211,166,
- 17,102,107,236, 24,203,122, 65,156, 56,214, 40,214,172, 94, 45, 93, 51,103,142,244,220,244,233, 36,255,197, 23,201,169, 41, 83,
-200,138,247,222,147,174, 89,189, 90,218,148,103,110,106,157,177, 37,131,237,177,251, 45,143,113,253,143, 25, 19,130,216,216,228,
-122,159, 12,198,140,  9,169, 23, 31,192,225,254, 32, 44, 44,172,222,102, 75, 57,224, 20,128, 71,129,  5, 30, 32, 46,157, 63,182,
-176, 83,167, 78,161,253,250,180,168, 95, 17,120, 20,132, 66, 62, 36, 98,  1,220,220,120,  8,233,224,135,144,144, 78,205, 46,157,
- 63,182, 87,161, 80, 52,232, 41,146, 79,233, 69,248,168,194,156,169,128, 70, 11,220,200,  7,202, 43,129,138, 42, 96,243,110, 96,
-214,231, 64,220, 98, 96, 64, 31,128, 71,170, 32,159,210,139,107,248, 22,232,217,179,167,236,247,223,187,162, 89, 51, 96,242,100,
-  1,154, 55,127,  6, 67,135, 14,149,237,221,187,151, 26, 61,122,180,108,228,200,145,  8, 14, 14,198,153, 51,103,176,109,219, 54,
-229,132,  9, 19,164, 63,253,244, 83,163,  4, 52,120,240, 96,169, 86,171, 85,186,185,185, 53,250,223, 74,165, 18,195,134, 13, 99,
- 67,102, 36, 38, 38,134,200,229,114,157, 41,102,  4, 22,228, 79,  1, 64, 76, 76,140,195, 10, 90,122,122,186,121,107,236,152,147,
-205,150,106, 74,243, 94,179,122,181,180,227,213,171,202,113,231,206, 41,219,100,101, 67, 88, 85,133, 22, 89, 87, 33,253,227,148,
- 50, 40, 51, 83,169,112, 82,  9, 72, 79, 79,199,180,105,211,200,172, 89,179,156, 86, 34, 24, 25,108,142,177,149,103, 77,244,108,
-142,217,  3, 67,250,204,167,110, 76, 39,174,193, 63, 64,226,103,131,199, 85,  1, 32, 54, 54,151,  9,190,143,247, 71, 92,124,155,
-196,209,178,184,116, 57,115, 84,104,136,191,153,244,109, 45,211, 44, 22,  9, 96, 48,208,  8, 13,241,199,165,203,153, 33,  0,124,
- 26,146,151,115, 61, 11,145,207,215,125, 63,144,  6,188,245, 49,176,122, 51,112,235, 46,112, 53, 27, 56,123,137, 32,229,  4,112,
-248, 36, 48,114,104,221,245, 77,208,205,168,251,248,138, 31,138, 98, 50,111,222,188,212,154,154,186,120,203,201,147, 39,227,212,
-169, 83,148, 66,161, 72,101,206,149,149,149,201,186,118, 21, 96,250,116,160,119,239,211, 48, 26,175, 42, 11, 10, 10, 26,244,164,
-204,156, 57, 83, 74, 81,148,146,237,226, 48, 69, 69, 69,118,189, 50, 49, 49, 49, 72, 72, 72,  0,  0,146,150,150,166,179,120, 23,
- 20, 67,252,  9,  9,  9,136,137,137,121,152,253,129,179,199,108, 66,123,241, 34, 58,252,249,167,105, 17, 36, 29, 12, 52, 13, 90,
-111,  4,173, 55, 32,232, 88, 26,170, 88,174,183,222, 16,225,254,245,215, 95,202,231,158,123,238,190, 43,  1,206,120, 23,154, 74,
-254,186, 49,157,108,110,201,177,201, 28, 59, 63, 98,176,105,217, 53, 18,252, 70,156, 52,156,137, 11,229, 81,143, 64,231,210,232,
- 61,216,  9, 42, 36,174, 40, 63,103,  2, 23, 21, 10,133, 32, 45,109,127,183,150,205, 61, 65,  8,112,236, 84, 62, 84,234,186, 85,
- 87,251,244,106,142,160,  0,  9,242, 11,171,233,236, 27,229, 60,129,128,135,206, 29,253,208,178,101, 39, 95,212, 45,209,106, 19,
-215,115, 53, 24, 24, 14,104,245,192,254,163,128,242, 20, 65,203, 96, 10, 29,219,  2,195,  6,  1, 93, 66, 40,  8,248,117, 75,139,
-247, 15,  3,190, 87,104,216,150, 55,229,224,119,182, 74,  4,193,189,177,  0,228, 33,213, 45,  0, 96,150,115,197,211, 79, 63, 45,
-179, 62,199,231,243,149,221,186, 21, 33, 46,174,238, 54, 23, 44,200, 66,110,110,247,  6,101,105, 52, 26,187,150,191, 37,114,115,
-115,237, 94,147,144,144, 96,182,242, 25, 69,192,226, 28,163, 32, 80,166,115,143,130,211,142,106,106,191,209,185,164, 84,169,211,
-235,193,227,241, 64,248,124,208, 52, 13, 61, 77,131, 54, 26, 97, 52,210,104,125,251,182,178, 41,245, 69,165, 82,  1,128,114,218,
-180,105,160, 40,202,225,248, 14, 75,194,255,249,231,159,169,198,142, 61, 72,242,  7,128,228,216,100,140, 92, 51, 18, 19,118,  2,
-177,201,117,223, 25,242,215,141,233,  4,225,158,108,142,121, 31, 32, 44,221,254,172,150,  3,110,104, 22, 64, 19,102,  7, 52, 20,
-197,238, 76,116, 59,177,211,185, 59,173, 52, 52, 64,170,148, 51, 86, 68, 35, 65,133,206,200,107,240, 55,204,255, 80,  0,232,237,
-118, 99, 23,232,186,104,127, 17,  0, 32,255, 86, 21,212,106,  3,  0,160, 83, 71, 63,  4,  5, 72,144,121,169,136,247,247,181, 50,
-136,197,124,132,116,240, 69,121,165, 14,  0, 26, 20,156,127,155, 32,164, 93,221,255,191, 48,  4,  8,235, 70, 65, 36,  4, 12,  6,
- 96,196, 96,192,215, 11,200,201,  3, 70, 14,  1,218,181,174,187,254, 33,131,178,242,158, 60, 44,197,242,190,160,168,168,200,161,
-118, 88, 93,205,126,245,221,132,132,  4,202, 66,  9,176,244, 14, 60,244,178,235,216,177, 35,201,201,201,161,156, 61,111, 13,183,
-235,217,208,234,117,160,248,  2, 24,  9,  1,  5,192, 96,164,161, 55,208, 32, 70, 35,168,107,127,187,228,190, 47, 94,188,136,192,
-192, 64,229,119,223,125, 39,251,232,163,143,156, 86,  2,172,135, 81, 28, 37,110, 87,145,127, 94, 94, 30,213,182,109, 91, 50, 97,
-103,125,133,  0,  0, 70,174, 25,  9,225,158,108,236,217,115,221, 60, 19,128,139,  5,120,120,228,223,160,  2,240, 24,160, 49, 18,
-117,152, 96,155, 56,197,177, 97,185,247,121, 54,  1, 53,169,220,209,255,160,124,124,220, 80, 94,161, 65,160,191, 59,162,198,118,
-129,193, 72, 67, 36,226,131,207,227,129, 16,130,209, 35, 66, 16, 25, 17,  2,138,  2, 74,203,213,240,241,113,  3,128,178,134,  4,
-182,105, 65,225,250, 77,130, 46, 33,192,243,207,213, 21,246,213,108,224,233, 46,128,159, 55, 48, 74, 10,208, 52, 32,224,  3, 89,
- 55,234,174,207,201, 39,108,223,173, 35,223,155,218,145, 60,148,105,128,171, 86,173,146, 46, 94,188, 24,215,175, 95, 71, 90, 90,
-154,242,251,239,191,151,121,122,122,154,151,157, 53, 26,141,178,203,151,155, 41,191,248,162, 16, 20, 69,161,168, 40, 20,161,161,
-237,145,149,101,123, 40,133,166,105,155,199,135, 13, 27,118,175, 23,137, 16, 28, 57,114,196,161,103,182, 84,  2, 30, 37,242,119,
-133,146, 96,137,178,214,173, 32,188,250, 55,136, 27, 32,164,  9, 40, 10,208,255,255,246,190, 60, 46,170,170,255,255,125,  7, 24,
-  6, 24, 20, 92, 17,141,  4,151, 82,220,113, 65,205, 98,204,109, 68,192,141,236, 41, 11,211, 98,228, 41,179, 82,193, 44,205,122,
-234,167,240,104,242,100,153, 99,110,244,109,209, 70, 52,196, 13,163,134, 30, 77,173,196, 45,151, 82,193,196, 68, 36, 81,182, 97,
-134, 89,238,249,253, 49,115,241, 50,204,114,239,204, 32,214,115,223,175,215,188,102,230,220, 59,159, 57,247,156,123,207,251,243,
-249,156,207,249, 28,147, 17,122, 98, 66,157,209,  8,109,247,135,129,243,191,186, 93,247, 62,125,250,128,162, 40,151,200, 31,  0,
-134, 14, 29,138,141, 27, 55, 82,253,250,245, 35,142,202,156, 97,227,198,141,148, 53,225,219, 42,227,131,228,188,187,196, 15,160,
-137,229,207,  4, 12,230,230, 22,  9, 76,221,  2,228, 15,  8, 65,128,108, 18,177,126,185,109, 21, 18,  2,136,102,220,105,182, 74,
-147,175,130,205,255,193, 93,129,241, 46,187, 94,116,235,218,117,179,213,247,254,199, 63,227,212,217,114, 24, 12, 52,104,154, 88,
-148, 22,170, 33, 54,224,218,245, 26,148, 93, 47,186,  2,192,174, 89,217,173,171,  4, 63, 20,154, 63,183,139,  2, 78,158,  3,146,
-255,  1,116,127,208,236,246,127,247, 67, 64,236,  3,136, 68,192, 15,133,230,243,221, 32,104, 79,199, 80, 88,247,247, 61,183, 70,
-206,159, 63, 15,137,196,220, 38,123,247,238,197,231,159,127,174, 46, 40, 48,115,193,170, 85,171, 98,218,180,105,163,190,112,193,
-136, 79, 62,  1, 78,158, 28, 12, 47,175,135,101, 93,186,116,145,217,147, 23, 16, 16,192,249,191,141, 70,227, 95,254,193,101,147,
-127, 68, 68,  4,177,247,226,171, 44, 20,181,239, 32,187,163,175, 71,181, 94, 15,173,222,128,122,163, 17,  6, 98, 66,157,193,128,
- 26,189, 30,165,161,161, 50,119,234,237,239,239,143,128,128,  0,217,198,141, 27, 41, 87,220,255,108,162,119, 86,198, 71,  9, 24,
- 58,116,168,211, 50, 46, 94,  0,123,228,207,182,254,  5,180, 44,249, 11, 10,192, 61, 64,115, 47, 41, 36, 95,  5,131,128,179,162,
- 97,140,140,236, 95,122,249,202, 29,208, 52,193,226,249,209,184,120,249, 54, 46, 92,172,  0, 69,161, 81, 64, 32, 77, 19, 92,190,
-114,  7,145,145,253,207,  2,176,235, 39,142,232,214, 19,123,191,  3, 76, 38,128, 20,  3,234,163, 64,238,183,128,252, 57, 64,246,
- 20, 80,112,204,124,158,201,  4,236,253,206,124,126, 11,194,214,252, 63, 60,161,236,185,138,219,183,111,171,123,245,186,130,159,
-126,  2,142, 30, 53,161, 75,151, 51, 56,121,242,164, 58, 46, 46,142,236,217,179, 71,157,151,151,135,155, 55,111, 98,208,160, 65,
-152, 49, 99,134, 44, 59, 59,187,192, 81, 18, 31, 66,136,204,158, 23,192, 26,140,226,193, 23,204, 20, 64, 11,205,249, 55,  2,219,
-162, 47, 46, 46,166,236,189,108,157,239,  8,193,  3,  7,162, 98,212,163,184,173,213,225,142,161, 30, 58,163, 17,181,  6, 19,170,
-244,122,212,140,126, 28,237,162,162, 92,244, 10, 82, 24, 58,116, 40,250,246,237, 43, 59,122,244,104,129, 59, 50,216, 68,111,171,
-204, 29, 37,128, 61, 22,216, 42,227,  2, 91,228,207, 88,254,214,153,  2,  5,220,123,242, 23, 20,128,191,186,219,226,137, 59,188,
-166,  1, 20, 10,133, 41,178,223,168,209, 69, 69,151,127,253,177,176, 20, 52, 77, 32, 31, 19,129, 51,231,202,241,222,251, 71,241,
-238,234, 35, 13,228,255, 99, 97, 41,138,138, 46, 95,141,236, 55,234, 37,133, 66, 97,176, 39, 83,185,245, 52,101, 66, 43,172,217,
-108, 38,249,245,239,  2,159,238,  4,100,209,192,192,222, 64,193,151,230,242, 53,155,  1, 19, 90,185,147, 17,208,221, 85,  0,196,
-137,156, 22,153,139,212,104, 52,232,219, 87,135, 33, 67,128, 33, 67,128,193,131,  9,138,139,139,145,155,155,139, 99,199,204,218,
- 83, 76, 76, 12,162,162,162, 56,165,  7,206,206,206, 46,224, 66,236, 70,163, 17,129,129,129,188,173, 88, 75,212,127, 67,196, 63,
-243,221, 85, 11,150,121, 57, 42,227,163,  4,120,226, 60,  0, 80,164,164, 20,232,135, 13,147, 93, 24, 55, 86, 86,246,208, 67, 40,
-243,241, 65,217,195, 15,227,226,248,241, 50,211,240,104,153,194, 50, 69,195, 23, 67,134, 12,129, 59, 86, 63, 91,134,179, 50,174,
-109,104,203,234, 31, 50,100,136,211, 50, 87,192,228,  8,184,155, 20, 72,240,  8, 52, 23,184, 44,  5, 20, 50,  1, 54,163,101,126,
- 63,254,135, 66,161,168,248,112,237,251,153,121,  7,182, 47,250,227, 70, 77,183,238,225,193,136, 29,215, 13,193, 65, 18,220,169,
-212,225,228, 47, 55,113,249,202, 29, 20, 21, 93, 62, 50,126,194,140,157,  0,174, 57,147, 25,222,115,146,236, 80,225, 30,245,145,
-194,106,196,142,  6, 62, 89, 97,206,  4, 88,116, 21,216,244,149,217,242, 55,161, 21,194,123, 78,146,225,224, 23,158, 32,112, 79,
-255,182,197, 86,  1,220,184,113, 67, 22, 28,220, 78,125,252,248,159,  0,128,139, 23, 91, 97,200,144,222,104,219,182, 45, 36, 18,
-  9,110,220,184, 33,155, 52,105, 18,175, 84,192, 93,187,118,149,253,246,219,111,106,123, 22,155,209,104, 68,247,238,221,177,105,
-211, 38, 94, 36,100, 61,247,207,250, 78, 92,137,  5,176,101,173,186,106,193, 58, 35,119, 62,228,207, 86,  2, 26,221, 23,103,206,
-184,221,223,238, 90,232,124,218,141,235,127,121, 90,158, 35,242,103, 67, 31,215, 29, 16,230,255,239,137, 39,192,158, 98,192,107,
- 25,160, 27,193,114,158, 94,123, 77, 92, 60,118, 79,234,231,164,157, 60, 82, 63,119,  2, 23, 95,154,247,154, 82,169, 84,110, 59,
-119,230,208,186, 93, 57,223, 71,132,116,238, 22,205,218, 11,224, 88,100,100,255,159, 38,197,207, 94,162, 80, 40, 52, 92,228, 89,
-210,251, 82,138, 89,253,201,246,189, 23,241,255, 62,178,179, 23,128,235,228,239, 17,135,201,253, 70,254,  0,240,228,147, 79,226,
-244,233,211,120,238,185,227,  0,128,193,131,  7,227,137, 39,250,203, 94,125,245,213,  6,114,254,225,135, 31,120,201,252,248,227,
-143, 11,  0, 80,177,177,177, 49, 53, 53, 53,106, 47, 47, 47,136, 68, 34, 24,141, 70,136,197, 98, 72,165, 82,153,187,228, 15,192,
- 35, 74,128,128,191, 39, 74, 74, 74,168,188,228, 60, 18, 58, 47, 84,134,174,182,207, 41, 77,206, 83, 11,214,127,203,194,155,199,
- 64,233,233,129,183, 57,228, 81,247,121,253,238,  7,121,140, 39,160, 74,169, 84,206,140,236, 55,138,201, 24, 35,  5,208, 14,192,
- 13,  0, 90,203, 46,111,188, 96,237,222, 47,190, 70, 80,124, 77, 11, 28, 58,221,210,237,112, 63,229,149,104,  4, 11,209, 55,212,
-225,236,217,179, 30,147,189,119,239,222,  2, 79, 93, 31,107,222,159,178, 42,167, 96, 73,  4, 36, 64,128,181, 18, 80,178,168,  4,
-247,235,179,247,119,  5,215, 44,128,  0, 64,185,186,143,176,  0,  1,  2,  4,  8, 16, 32,224,175, 11, 33,  8, 80,128,  0,  1,  2,
-  4,  8, 16, 20,  0,  1,  2,  4,  8, 16, 32, 64,128,160,  0,  8, 16, 32, 64,128,  0,  1,  2,  4,  5, 64,128,  0,  1,  2,  4,  8,
- 16,240,247, 64,163, 85,  0,167, 78,157,114, 57, 42,211, 86, 48,161, 32,175,217,228, 57,221,196,166, 37,229, 37, 38, 38,198,  0,
- 80,171, 84, 42,143,200,155, 49, 99, 70, 12, 77,211, 30,147, 39,220,127, 45, 35, 47, 37, 37,101,134, 66,161,248,170, 57,235,167,
- 84, 42,125,  0, 72, 44,247,180, 14,  0, 13,128, 40, 20, 10, 34,244,135, 32,239,127, 73,158,167, 60,  0,132,195,139, 15, 60, 45,
-239,158,129,220,206, 32,164, 54,147,115,253, 44, 68,232,177,235,101,201,195,234,213,171,101, 14,218,147,183,188,179, 31,181,130,
-187,242, 24, 76, 30,178, 79, 29,222, 42, 23,  0, 16, 21, 21,229,118,127,246,236,184, 29, 15,182,255, 22,126,126,126, 24, 51,102,
-204,125,115,127, 40,149,202,246, 84,128,244,128, 82,169,108,239, 33,121, 97, 34, 95,255, 60,123,242,148, 74,165,143, 82,169,164,
-156,200,240, 97,234, 38,145,248, 31, 80, 42,149,237,149, 74,165,151,179,223,185,242, 56,184,112,111, 28,109,174,190,216,176, 97,
-195,196,141, 27, 55, 46,244,241,241,217, 37, 22,139, 11,197, 98,241,175,  0,148, 94, 94, 94, 42,138,162,214, 41,149,202,118,205,
-208,  6,  2,  4, 52, 65, 93,106, 42,241,240,131,214,108, 99,158,179, 76,128,132, 16,251,255,205, 51, 55, 52,177,  8,244,148, 60,
- 94, 22,172, 39, 49,125,250,116,114,249,242,101,167,228,170, 82,169,212,105,105,105,232,208,161,131,205,148,171, 11, 22, 44, 80,
-243, 33,  4, 22,160,106,  0,  0, 32,  0, 73, 68, 65, 84,107,149, 74,165, 94,189,122,181,108,193,130,  5,234, 99,199,142,169,173,
- 20,  1,151,228,209,231,151, 65,212,251, 29,124,250,157, 30,  0, 64,159, 95,118, 87, 59,236,253, 14,175,118,249,242,223,  1,132,
- 38,192,182,  3,102, 89,242,199,124, 16,217,253, 28,  0,179, 18, 80, 88, 88,200,171,111, 50, 62,146,197, 84,254, 94,129, 90,125,
-176, 90, 83, 31,  0,249,248, 74,116, 14,161, 16, 30,158, 68,170,171,117,216,190,125,123,139, 14,232, 41,243,231,191, 12,154, 30,
-151, 50,127,254,203,  0,150,186, 45,111,222,252, 23,  8, 77,143, 77,153,103, 91,158,163,148,204,236,115,148, 74, 37, 53,111,222,
-252,151,105,218, 52,110,222,188,249, 47,235,245,186,165, 54, 20,  5,145, 43,185, 30,220,132,158,125,255,237,216,177, 67, 61,117,
-234, 84, 89,118,118,118,129, 59, 66, 55,110,220, 40,247,246,246,126,212,219,219,251, 73, 47, 47,175, 96,145, 72, 36, 77, 79, 79,
- 23, 45, 90,180,104,182,201,100,130,209,140, 39, 77, 38, 83,156, 82,169,252,193,226, 13,208, 91,198,191,102,159,  6,141,143,143,
- 39, 92,199,187,156,156, 28, 94,247,116, 66, 66,  2,113,231,247,  2, 60, 15,191,140, 12,143,202,211,166,166,  2,110,200,100, 50,
-  2,242,221, 14,216, 41,249, 71, 69, 69,161,176,176,144, 15, 57, 59, 36,121,142,242,154,200, 79, 75, 75, 67,113,113, 49, 44, 46,
- 98,143,109,235, 74, 74,163,  8,252,122,130, 10,254,146,  2,  0,170, 77, 42, 53,125,250,116,167,218, 24,155,172,203,203,203,213,
-246,200, 63, 45, 45, 13,233,233,233,188,200,223,242, 29,209,209,209,178,232,232,104,183,228, 49,100,207,188,175,252, 23, 26,145,
-127,234, 52,  9, 50,178,117,156,218,106, 91,166,148,244,  9, 23, 65,163, 37,120,237, 25,  9,142,157, 51, 66,171, 33,168,211,  3,
-178,  1,231,112,238,162,  9, 81, 81, 81,132,171, 18,144,246,230,195,164,232,100, 53,  2, 91,137, 17,210, 73,138,246, 29,187,227,
-106,145, 30, 93,123, 27,224, 35, 41, 71,254,174, 91,152, 48, 97,  2, 57,112,224, 64, 75, 13,120,190,109,218,182,157,255,217,177,
-159, 40,249, 67, 61, 94,  6,240, 46,128,122,119,228,181,109,211,118,254,182,239,142, 81, 99,  7, 60,228,150, 60,133, 66, 33, 14,
-  9,233, 52,255,160,250, 16, 53,184,127,164, 77, 89, 45, 64,254,  0,208,176,253,160, 74,165, 82,199,197,197, 33, 59, 59, 91,109,
-235,121,253,249,231,159,201,219,111,191,141, 61,123,246, 56,236,223, 77,155, 54,141, 22,139,197,125,196, 98,241, 60,177, 88,236,
-127,237,218, 53,244,232,209,  3, 94, 94, 94,  8, 12, 12,196,229,203,151, 33,149, 74,189,127,254,249,231,160,163, 71,143, 30,122,
-241,197, 23,187,  2,184, 10, 64, 12,243,244,128,221,129,143, 61,254,177,199, 45,166,156,162, 40, 80, 28,172,150,221,187,119,219,
-149,193, 46,119, 52,222,218, 67, 78, 78,142, 91,191,111, 86,  5, 57, 37, 37,198,146,149,210,109,188,243,206, 59,132,166,105, 64,
- 84,  9,125,189, 14, 98, 95,  9, 64,  7, 65, 36, 18, 97,217,178,101,212, 81, 43,158, 73,113, 32,235,220,185,115, 36, 59, 59, 27,
-246,228, 77,155, 54, 13,145,145,145,148,171,245,195,178, 76, 44,127,231, 21,194,174,159, 59,215,238,159,145,193,251,247,246,210,
-  0,115, 85,  0, 56,145, 63, 87,164,165,165, 57, 61,135, 11,113,217, 35,255,149, 43, 87, 98,241,226,197,214, 74,135, 75,141, 78,
-142, 71, 17,180,237,  9, 42,252, 75,138,109,241,239,216,177,131,  2,  0,230,221,222,156,139, 53, 89, 59, 34,127,139,103,192,169,
-213,174, 82,169,212,214, 22, 62, 83,198,110, 99,190,242, 28, 89,248,169,211,184,239, 20,151,157, 25, 64,122, 60, 40,130,159, 47,
-133,  7, 67,189,112,235, 14, 13,131,209, 11, 21,149,  4, 85,181,  4,151,255,160,  1, 17,208,206,255, 12,211, 62, 14,  7,133, 37,
-111, 60, 20,211,179, 91,  4,142,150,221, 68,120, 88,123,244,233, 23,  1, 47,223, 54,120, 48,252, 14,238,104,117, 40, 47, 51,225,
-143,155, 58,248,123, 23,115,146,215, 76,120,250,153, 69,139,196,197,157, 66,225, 27, 53, 88,164, 59,244,223,167,  1,108,230, 43,
-132,101,137, 63,157,244,242, 66,241, 31,226, 16, 72,123, 14, 18, 85,159, 61,236,146, 60,166,110, 47,206,127, 85, 12,223, 64,132,
- 63, 20, 41,250,237,151, 19,238,200,242, 36,104,150,245, 15,137, 68, 34,  3,160,182,238,195,227,199,143,115, 34,127,  0,240,241,
-241,  9,146, 72, 36,179,110,221,186,229,223,179,103, 79, 12, 28, 56, 16,222,222,222,248,224,131, 15, 96, 50,153,208,183,111, 95,
-236,220,185, 19, 63,255,252, 51,206,156, 57,  3, 47, 47,175,117, 74,165, 50,225,227,143, 63,118,100, 85, 55,140,115,158,240, 88,
- 42,149, 74, 89, 72, 72,136,154, 16,226,240, 55,101,101,101, 50,133, 66,193,247,254,145,133,132,132,168, 93,253, 61, 67,212, 23,
- 46, 92,112, 56,110,244,234,213, 75,198,151,204, 47, 92,184,160,126,234,169,167,208,186,117,107,153, 59,138,128, 98,110, 18, 73,
- 78, 25,135,128,  0,191, 38,199, 52, 26, 45,150, 45, 91,134,225,  0,245,199,238,221,228, 90,124,188,253,177,125,102, 79,115,103,
-174,152,130, 78,163, 39, 65, 50,104, 48, 76, 61, 35, 27,157, 99,216,150,133,224, 21, 83,238,158, 11, 64, 59,225,121,140, 88,245,
-133,195,250, 37, 61, 55, 22,109,218,250,155, 11,150,101, 98,193,194,231,  0,  0,183, 43,234,112,189,180,136, 40,215,103,185,172,
-  4,212,165,166, 18, 87,148,  0, 87, 21,  0,194,197, 82,191, 95, 80, 92, 92,140,197,139, 23,187,170, 64,216,197,244,233,211,  9,
- 21,186,131,154, 62, 61,156,168, 54, 12,  5,182, 62, 66, 40,233, 43, 78, 59,193, 22, 89, 91,147,178,163,105,  1,123, 96, 43, 20,
-199,142, 29, 83, 71, 71, 71, 55,114,253,243,149,247,197, 34,169,221,193,237,233, 85, 26,206,114, 62,254,248,227, 24, 95,175, 69,
- 16,137,  0,127, 63,160,178,154, 70, 61, 33,  8,240,163,160,163,  1,109, 61, 65,151,246, 34,208, 70,224,210, 53, 19,138,139,139,
-213,142,148,179,249, 47,143,141,  9,127,208, 95, 45, 22, 19,188, 48,107, 24, 76, 38,130,178,114, 61, 74,174, 87,  2, 62,215,224,
- 23, 92,143, 27,229,191, 67, 36,174,194,249,243,149,104, 29,236, 88, 94,243,153,255,109,150, 61,249,236,179,190,111,210, 64,240,
-226, 55,164, 55, 79,159, 90, 74, 87, 87,187, 66,178,  4,  0, 36,173,219, 44,251,199,204,103,125, 87, 93, 49,161,203,140, 52,233,
-111,197,103,150,154,234, 26,203, 83, 42,149,148,117, 48,155, 45,180,106, 29,180,236,233,153,207,248,158, 41,185,131,248,167,146,
-165, 31,254,107,193, 82,109,157,198, 93,  5,128,235,126, 25,142,250,194,196, 60, 35,147, 38, 77,  2, 67,250, 90,173,182,161, 15,
- 25,203, 63, 55, 55,151, 83,159,250,250,250,142,208,104, 52, 15,247,234,213, 11, 50,153, 12, 11, 22, 44,192,156, 57,115,204,131,
-185,193,128,173, 91,183,162,176,176, 16, 39, 78,156,192,246,237,219,161,213,106,187,211, 52, 45,119, 98,177,123,244,126,218,187,
-119, 47,167,169, 57,138,162,120,223,203,108,217,174,252,222,242, 12, 23, 60,245,212, 83, 40, 45, 45,181,121, 60, 52, 52, 20,174,
- 18,120,105,105, 41, 74, 75, 75,221, 82,  4,206,156,190,136,255,203,218,131, 81,163, 70, 32,178,111,231,187,150,252, 47,215,113,
-232,208, 17, 12, 31, 62,156,168, 94,127, 29,215,226,227,225, 55,114, 36,180,118,246,206,160, 62,187, 72,  1,192,194, 17,125, 72,
-191,242,  3,120,230,187, 61, 48,245,140,132,118,225,114,  0,128,223,170,229,144, 94, 60,135, 69,197, 98,172, 58,114,246,110, 59,
-126,150,234, 48,200,142,169,223,152,177, 35,155,212, 47,255,155, 31,112,230,244, 69,183,238, 31, 87,166, 20,216,238,126, 71,222,
-  0,111,190, 22,187,167,137,214, 93, 88,220,254,174,143,106, 81, 32,232,  4, 80,123,204, 15, 14, 53,184,144,154, 62, 61,188,161,
-179,119,236,216, 65, 97,195, 80, 98,237,  9,224, 74,214,229,229,229,141,200,217, 21,178,230, 10,150,210,225,148, 36,184,184, 11,
- 89,238,127,155, 39,175, 95,191,158,252,121,238, 85,116,234,233,  5,141,246,238, 41, 90, 19,129, 78, 15, 24, 44,101,  6, 35,  1,
- 17,153, 63,255,114,166, 16,137,137,137, 49,151, 46, 93,178,249,159,129,129, 85,106,141, 86,132,118,109,130, 80,121,187, 14,149,
- 85,149, 56,118,188, 12,215,111, 18,136,  3,234,208,185,123, 45,180,117,183,208,163,159,  1, 93,123,213, 99,251, 39,133,152, 50,
-101, 74,204,149, 43, 87,238,201,253,102,177,216,199, 76,154, 54,189, 99,105,235, 96, 20, 25,  1,191, 49,227, 32, 10,110,219,142,
-174,174, 30,  7,224, 32, 67,214,  0,124, 20, 10,133,222,217,184, 15, 96,108,220,148,105, 29,255, 20,181,198,213, 90,  3,130,  6,
-141,129,119, 96,112, 59, 83,221, 93,121,  0,192,133,252,  1,140,159, 60,101,106, 71,226,229,139, 42, 77, 61,250, 68, 13,135,180,
- 85,235,118,218, 58, 77, 35, 89, 45,  5,198,250,167, 40, 10,147, 38, 77, 34,  0,176,103,207, 30, 36, 38, 38,198,164,165,165,169,
-249,144,191, 82,169,244,173,172,172, 76, 50, 24, 12, 34,127,127,127, 60,250,232,163, 88,181,106, 21,124,124,124,160, 80, 40,144,
-149,149,133,194,194, 66, 28, 59,118, 12,223,126,251, 45,126,249,229, 23,180,107,215,174,157,209,104,124, 16,118,220,255,108, 23,
-168,179, 41,  0,145, 72,196,169,158,205, 57,  5,176,123,247,110,143, 76,  1,180,110,221, 90, 86, 90, 90,170,182,119,204,221,126,
-119, 69, 17,184,152,154, 74, 42, 50, 50,128,163, 71,129,163, 71,113,123,218, 68,172,238,223,179,193,101, 31,217,187, 55,158,152,
- 17,139,174,119,110,225, 90,124, 60,218,166,166,162,103, 70, 70,147,233,  0,107,136,101,143,160,167, 60,  6,139, 82,223,197,191,
-113, 14,171,163, 71,163,207,144, 97,232,126,187, 24, 91,131,  6,162,184,245, 77,100,101,101,145,164,164, 36, 78,253, 43, 27,221,
- 31,207, 36, 77,194, 79, 63,254,130,  3,121,  7,241, 22,128,213,171,182, 32,178,119,111, 60,147, 52,  9,117,218, 10,204,157, 59,
-151,179, 60,107,184, 27,  3,192,215,  3,240, 87,  2,101,135,156,120, 55,244,244,233,211,137,106,241, 21,192, 75, 12,  4,249,  0,
- 65, 93, 65,237,176,  8,227, 56,247,223, 12, 32,108,171, 31,  0,216,150,191,141,193, 21,209,209,209, 50,  7,193,128,188,175,225,
-243,133,  1,118, 61,  2,129,213, 11,240,187,158,160,236, 22, 13, 64,  4,169,191,217,197,105, 48, 18,232,234,  1,157, 30,208,213,
-  3,122,  3,160,211,  2,250,250,187, 94, 18, 91,  1, 41,159,127, 20, 64,242,143,213,224,129,112, 41,136,143, 55,110,105,181, 80,
-127,127, 13,231, 47, 95,199,237,219,181,136,140, 50, 65,163, 51, 66, 87,111,130,182,142, 70, 89,  9,160,213,  0,187,118,237, 82,
-243,217,  0,195, 29, 40, 20, 10,218, 43, 40,104,217,115,175,191, 46,217,206,162,144,224,215,223,144,222, 94,188,112,169,169,178,
-242, 32,139,172,245, 92,250,216, 91, 26,180,108,206,171,139, 37,251,175,155, 26, 10,187, 60,185, 88,122,117,211,235, 75,141,181,
-149,  7,249,120,  1,252,165,129, 75, 95,126,109,161,164,168,244,238,110,145,113, 79, 37, 75,183,109, 88,189,180,174,182,230,160,
-155,207,154,173,123,137,207,179, 70, 24,235, 95, 34,145,200, 84, 42, 85,  1,179,100, 84,171,213,170,  7, 15, 30,204, 71,150, 17,
- 64,119,  0,244,128,  1,  3,104,137, 68, 34,202,202,202,194,236,217,179,177, 98,197, 10, 16, 66,240,227,143, 63,226,251,239,191,
-199,153, 51,103, 80, 85, 85,133, 30, 61,122,160,186,186,218, 95, 36, 18,117,112, 38,124,242,228,201,118,  9,213,217,212,128, 61,
- 55,253,253, 58,  5,224,200, 11,224,142,245,239,174, 34,112,167,178,178,225,115,135, 55,230,162,207, 27, 41, 24,101,117,206,149,
-  9,115,208,229,191,199, 81,180,240,  5,252, 24, 26, 10,  0, 24, 14, 80,  3,108,140,117,153,153,153,164, 75,151, 86, 56,113,242,
- 39, 68, 14,234,  5,100,188,137, 87, 55,237,194,172,110,167,209,191,254, 50, 22,221, 20,227, 95,159, 47,193,138,247, 62,198,153,
- 95, 14, 35, 51, 51,147,188,242,138,125,175, 47, 91, 94,155,182,254,152, 48,113, 24, 38, 76, 28,134,183,233, 76,232,235, 23,227,
-228, 73,224,228, 73,224,208,161, 73,248,112,237, 69, 60,249,228,  5, 18, 22,246, 32, 50, 50,252,121,241, 83,254, 35,111, 34, 21,
-203, 29,222,112,  7, 15,142,248,159, 81,  0, 72, 98, 98,162,140, 53,103,104,173,  4, 80,108,107,195,226,146,119, 73,243, 98, 72,
-127,199,142, 29,148,106,195, 80, 64, 44,  6,181, 99,199, 61,189, 88, 38,234, 95,165, 82, 81,137,137,137,196,153, 55,196, 58, 54,
-128, 15,161,219,130,163,115,147, 94,215, 32,180,163,  8, 79,197,137,161,171,  7, 90,  7, 82, 16, 81, 22,171, 31,  4,186, 58, 64,
-163, 39,208,104,  9, 52, 58,  2,154,  0, 34,  7, 49,215, 73,243, 53,232,219,191, 24, 33, 15,223,198, 55,251,203,113,251,182, 14,
-  3,134, 87,163, 95,155, 90,192,167, 30,186, 58, 26,229,215,  9, 52, 26, 10, 70, 35,133, 54,237, 40,128,186,231,177,108,145,  3,
-251,247, 31, 28, 28, 22,134, 35,119,249, 26,210,167,102,226,118,218,130, 40,  0,189,  1,156,231,161, 80,244, 26, 50,242,177,193,
-109, 67,195,112,252,167,134, 24, 57,180,151,253,  3, 87, 63, 89,220, 68,158, 19, 47, 64,239,129,253,  7, 12, 14, 13,237,130,243,
- 39,238,122, 68, 70, 62, 30,139, 47,149,171,120,215,173, 57, 21, 90,230,249,181,142,223,136,139,139,107, 18,127,100, 35, 22,128,
-233,244,238,  0, 78,165,166,166,142,240,246,246,150,126,250,233,167,216,178,101, 11,158,123,238, 57,172, 92,185, 18, 20, 69,225,
-247,223,127,135, 86,171, 69, 90, 90, 26,140, 70, 35,230,206,157, 75, 83, 20,229,244,  1,240,100, 52,253,253, 62,  5,224,200, 11,
-224,  9,235,223, 85,100,101,101,225,217,228, 39, 80, 85, 89, 15,188,183, 30,154, 67,199, 17, 48,106,112,195,241,242,247,214,227,
-156,175, 47,168,151,158, 71,159, 25, 19,112,116,235,126,135,242, 46, 93, 58,139,225, 35,229, 56,123, 46, 24,235,215,169, 48,106,
-212,  8,252,235,163, 37,120,123,204,211,248, 12,192,195,207,204,198,250,117, 42,136,197,193, 72,152, 60, 24,159,242,144,247,159,
-247,191,194,144, 73,125,241,110,223, 85, 56, 27, 43, 69,112,220,206, 70,231,182,243,151,224,167,  2, 53,194,158,157,197,187, 29,
- 14, 31,246, 70, 70,134,159,195,115, 92,181,127,254,146, 30,  0, 27,243,200,148,131,243,184,155, 56,131,205, 17,234,211,167,119,
- 38,192, 37,168, 62,184,  2,248,245,108,240,  4, 48, 74,  1,151,105,  0, 79,129,177,230, 19, 19, 19,  9,219,250,103, 60,  2,236,
-239,137,137,137, 96, 37,203, 33,124,  9,221, 26,172, 85,  0, 54,229, 25, 77,128,166,142,160, 94,111, 14,246,171,215, 19,120,251,
-222, 61,166,171,  3,180,  6,130,138,219,  4,127,222, 33, 56,113,222,  8,154,  6, 18, 19, 19,101,151, 46, 93,106,210, 55, 70, 35,
- 80,122, 77,143,107, 69,119,112,248,232, 29, 16, 66,225,252,175, 52, 38, 61,101,132,216,155,224,207,155,192,225,131, 64,117, 53,
-  1,161,129, 71, 70, 83,144, 72,  0,185, 60,  1, 87,175, 94,229,116, 77,242,225, 32,251,143,186, 62, 72,138,164,173, 94,127, 97,
-101,186, 79, 14, 17, 53,106,144,118,190,190,240,121,105,190,207,239,107, 51,151,232,171,171,103,114,149,231,229, 39, 93,146,178,
-116,165,207,193, 82,210, 72, 94,219,  0, 95,244,153,241,162,207,249,175, 62, 88,162,215,212,206,228,226,  1,144,248,  5, 44, 89,
-188,108,185,207,149,178,170, 70,178, 90,  5,  6, 96,202, 83,207,249,228,124,177,121,137, 70,163,153,217,194,143, 47,181,103,207,
-158, 38,101,111,189,245, 22,217,179,103, 15,114,115,115, 57,119,  5,128,179,  0, 78,173, 94,189,186,127, 80, 80,144,148,113,131,
-111,222,188, 25,179,103,207,198,150, 45, 91, 26, 44,245,213,171, 87,163,178,178, 18,213,213,213,181,117,117,117,197, 22, 15,130,
-216,209, 31,208, 52, 77,172, 93,244,140,245,207,213,253,207,184,233,217,114,172,221,245,247,195, 20,128, 45, 47,128,167,173,127,
- 70, 38,215, 41,128,243,195,135,131,122, 97,  6,130,  0,144,209, 81,168, 59,113, 22,154,247,214,223,109,183,228, 39,208,227,153,
- 39, 32,145,152,175,255,220, 57,199, 75,179,153,227,242,137,102, 37,162,240,248, 25,124,246,127,219,224, 63,108, 40,234, 12, 70,
-232,161,199,163,143, 13,108,114, 62, 23,121,215, 76,122, 60,213,241, 69,208, 39,234,145,248,239,209, 16, 79, 63,134,222,145,189,
- 17,217,167,123, 67,253,210, 22,173, 69, 70,198, 63, 57,223, 55,151,171, 47,143, 57,143,243,223,196,183,226,226, 49,112, 45, 17,
-208, 95, 82,  1, 40, 44, 44,116, 26,253,109, 57,206, 77,160,111,  0, 84, 93,255, 11,124, 20, 78, 16, 30,  0,116,171,  7,245, 80,
- 46,133, 15,162, 26,230,254,221,153,  6,176, 94, 10,104,111,105,160,  3,183,107,  3,249, 91,  7,  0, 50, 46,117,166,204,137,  7,
-128,178,182,196,220, 29,204, 31,121, 44, 62,230,250,141,253,106,186, 61, 13,145, 55,224, 99, 25, 23, 13, 52,129,209,  8,212,212,
- 16,232, 13,128,209, 96, 86, 10, 18, 38,155,189, 55,118, 92,246, 84,244,240,248,152,250, 91,251,212,145,145, 52, 14,125,111,  2,
- 37,  2,254, 44,163, 32,241,  3,190, 63,  0,232,181, 20, 40,  2,244, 27,228,131,210, 18, 26,143, 61, 22,139,156,156, 28, 78,219,
- 90,203,135,131,100,188,104,190,126, 87,149,  0, 66,155,198,155,218,182, 19,237,167,239,178, 80, 71,  0, 33, 20,160,141,138,242,
-190, 98, 52,141,231, 37,143,208,227, 17,216, 70,164, 46, 51, 53,200,107, 47,  1,218, 73, 40,248,247,141,242, 62,183,141, 30,111,
-229, 49, 32,142,100,  5,  4,  6,137,174,222,172,180, 16, 11, 16,232,231,139, 64,127, 49,  6, 13, 24,232,189,235, 51, 50,190,133,
- 31, 93,155,109,206, 68,253,179,207, 97,188,119,211,166, 77,147,101,103,103,219,147, 87, 11,224,202,201,147, 39,107, 71,141, 26,
-213, 30,172, 53,253,155, 55,111,110, 32, 68,131,193,  0,147,201,132, 75,151, 46,161,125,251,246,183,104,154,230,164, 45, 78,158,
- 60,217,158,165,238,146,155,254,126,158,  2,176,229,  5,240,164,245,207,135,248, 25,116, 10, 13,194, 39,159,124,135,248,184,225,
-232, 24, 21,  9, 68, 69,130,122, 97, 70, 99,165, 23,192,205, 50, 45,118,231, 30, 69,167,208, 32,238,242, 66,252, 16, 53,184,  7,
-162,  6,247,104,114, 30, 95,121,143, 78,237,133, 55, 30,251,  0,244, 89, 51,249,207, 89,148,228,146, 60,107,188, 30,248,250, 55,
- 43,106, 86,140,109,206,  7,210, 45,  5,192,178,102,255,158, 70, 96, 51, 86,174, 74,165, 98, 44, 94,202,198, 57,132, 33,127,150,
- 85,204, 11,236, 85,  0, 76, 25, 95,203,223, 58,  0,208,130,134,178,  5, 11, 22,168, 45,211, 25,156,228,177,201,223, 86, 76,  0,
- 95,121,206,144,145,173,131, 51,121, 57, 57, 57,  5,109,131, 40, 60, 30,237,  3, 26,128, 65, 79,195, 87,108,110,166, 26, 13, 65,
-189,129,192,104,  2, 10,207,154, 96,162,  9,156, 45,217,203,201,201, 41,232,216,158,194, 99, 49, 94,152,242,180, 23,106,107,  8,
-106,170,  0, 77, 13,133,240, 30,  4, 38,  3,  5,111,145,  4,149,183,105,148,254,161,199,165, 95,185,  5,140,201,135,131,100,206,
-  7,122,134,  1,107, 95,  3,230,189,239,154, 18, 64,234, 52, 83, 95,138, 26,184, 47, 36,103,159, 52,120,228, 35,232,  8,160, 35,
-  5,152,142, 28, 70,126,210,204, 90, 67,157,102, 10, 31,121,180,174,110,202, 11, 99,  6,239,239,245,246,215,210, 14,253, 70,160,
-157, 47,133,246, 18, 10,218, 11, 63, 96,247,155,179,106, 13,218, 58,206,242,234,117,218, 41, 19, 31, 31,181,127,193,123,235,164,
-189,251, 71, 33,208, 95,140, 64, 63, 95, 20,157, 63,133,101,105, 47,215,106,121,200,114,149,204,157, 93,174, 45,242, 95,190,124,
-121, 19, 55,255,142, 29, 59,152, 60,  1,  5,118,172,127,192, 28, 99,113,234,161,135, 30, 42,210,233,116,157,189,188,188, 36,254,
-254,230,165, 88,217,217,217,152, 54,109, 26,180, 90, 45,116, 58, 29,234,235,235, 33,149, 74,117, 38,147, 41,135, 16, 82,198,209,
-186,246,200,216,246, 87,153,  2, 96,123,  1,152,207, 45, 65,252, 12,194,195, 67,240,250, 27,201, 56,176,255, 71,124,189,235,  4,
-124,197,173,240, 71,233,221, 25,172, 46,161,189, 81,175,175,198,160,168,135,177, 38, 51, 25, 43,222,251,152,151,188, 14, 29, 90,
-227,220,249,115, 13,199, 35,123, 71,162,188,188,138,151,188,216,249, 83, 48, 77, 52, 19,245,103,107, 17, 61,175, 15,232,126, 18,
-124,242,201,246,134,250, 85, 85, 85, 97,196, 35,189, 56,201,179,134,138, 82, 81, 42,168,208,156,112, 89,  1,104, 14,242,231, 34,
-211, 66,248,196,242, 25,  0,  8,123, 89, 98, 97, 97, 97, 35,194,183,165, 32, 52,245,195, 82,128, 88,  4,248,121,  1, 82,111,160,
-190,  6,170, 21, 62, 64,230, 28,  2,191, 54,128, 95, 27,222,115,255,118,200, 31, 54,200,154,211,131, 97, 77,254,214, 49,  1,124,
-229,241, 32,127,167,242, 42, 42,  9,181,183,192, 64, 36, 18,128,166,129,190, 15,121,221,237,143, 95, 76, 48,152,  8, 76,180, 23,
-166, 78,157,202, 73, 57,185,249, 39,161,246, 31, 48, 17,163, 17,208, 27,  8, 76, 70, 64, 68,  1, 49,177, 64, 77, 37,133, 95, 79,
-107,161,213,137, 16, 31, 55, 21, 59,119,238,228, 68,254,203,231,  0,221,187,152,191,119,235, 12,184,234,  9, 80, 42,149,199, 20,
- 10,133,188, 44, 97,226,254,176,221,251,164, 97, 35, 31,129,225,200, 97,236,140,155, 88,171,175,169,145,  3, 56,204,179,169, 15,
-155,180, 53,242, 11,111, 77,222, 31,250,239, 28,105,231, 33, 35,161,185,112,  4,159,191,148, 80, 91, 95,199, 91,222, 97,157,182,
- 78,190,250,141,127,238,255,215,127, 54, 73,163,135,143,192,229,115,167,240,114,242,204,218,186,218, 90, 87,234,214,172,112,144,
-236,135,196,198,198,114, 89, 13,224, 21, 20, 20,116, 74,171,213,126, 86, 92, 92,220,181,127,255,254, 17, 70,163,209,219,199,199,
-  7, 57, 57, 57, 24, 59,118, 44,116, 58, 29,234,234,234,112,233,210,165,234,224,224,224,239,180, 90,237,167, 52, 77,107,192, 49,
-  3, 32, 59, 32,129,175,235,255,175, 54,  5,192,246,  2,120, 66,142, 43,185,  3,108, 97,130,124, 24, 38,200,135, 89,190,185,175,
-195, 54,150, 55,217, 61,229, 46,104,  7,234, 79,215, 34,105, 93, 44,254,245,221, 18,183,235,150,169,207, 36,193,198, 96, 36,249,
- 39,221, 19,195,218, 37,  5,160, 37, 44,127, 27,214,  7,177,170,143,167,172, 20,187, 30,  1,174, 30,  0, 79,147, 63,163,236, 88,
-185,247,  9,187,140,175, 60,103,177,  0,124,229,105,116,132,210,232, 64, 68, 34,224,112,161,121,174,159,  9,248, 51,207,251, 79,
-229, 37,175,166,134, 80,148,101,154,157, 18,153,101,252,244, 95, 64, 83, 75,131,208, 64,124,124, 44,118,238,220,233,180, 63,228,
-195, 65,210,102,  2, 65, 82,160,244, 22,224,231, 11,208,  4,  8,144,  0,239, 41, 92, 83,  2,  0, 28,166,107,106,228,133,241, 19,
-247,183, 94,254,142,180, 96,249,178,218,122,215,200,191,145, 18, 80,144,154,176,223,239,165,183,164,121, 31,190,237, 10,249, 55,
-200, 50, 26,244, 19,151,189,242,194,190,121, 11,210,164,235,214,164,215,214,213,214,202,149, 74,229,105,182,123, 88,169, 84,122,
- 43, 20, 10, 35, 95,  7,136, 39,189,  2,182,200,159,162, 40, 18, 27, 27, 11,  0,152, 52,105, 18,161, 40,202,145, 34, 32,213,235,
-245,181, 34,145, 40, 63, 52, 52,180, 75, 77, 77,205,139,199,143, 31,239, 52,112,224, 64,218,104, 52,214, 85, 85, 85,221, 60,125,
-250,244,239,225,225,225, 69,109,219,182, 45,214,106,181,217, 70,163,241,102,114,114,178,102,192,128,  1,156, 20,  0, 38, 41,144,
- 59, 80, 42,149,156,  9,213,149, 41,  0,119,126,111,207, 11,224,137, 49,211, 93, 57, 58,173,151, 71,207,247,180,188,202, 59, 34,
-164, 27, 21,136, 56, 26,130, 25, 31, 57, 87, 76, 42,239, 56,191,229,238, 37,249,219, 85,  0, 56,172,245,231, 85, 65, 30,185,  3,
-248,200,165, 88, 81,254, 46,147, 23, 85,  8,106,122,248,  4,130,139,  0,154,228,107,168,178,188,248,173, 49,183, 92,175,218, 83,
-228,106,213, 46,132,201, 51, 96,  9, 16,164, 88,222, 16,151,228,125,190, 48,128,173, 20,184, 34,175, 65,238,180,105,119,251,132,
-  9,248, 83,169, 84,  5,174,200, 35,116,227, 62,174,173,  6, 98, 99, 99,177,119,239, 94,138,177,170, 56,245,199,103,158,123, 96,
- 88,249,248, 15, 27,106,106,228,223, 47,127, 43,171,190,166, 38,201,  3,214,245, 97,125, 93,141,252,224,186,183,179,116,117, 53,
-179,148, 74,229, 17, 87,  7,115,163,209,120,200,104,172,149,175,203,204,200,170,173,173, 77,  2,112,216, 90,150, 11,228,239,  9,
- 52, 26, 81,173,201,159,137,219, 97,  7,  9,198,197,197, 57,146, 87,162,215,235,125,  9, 33, 53, 52, 77, 43,245,122,253,143, 97,
- 97, 97,237, 42, 43, 43,169,165, 75,151, 86, 87, 85, 85, 85,116,238,220,185,166,182,182, 86,163,215,235,171, 13,  6, 67,253,243,
-207, 63,175,229,105, 97, 83, 30,184,103, 10,154,171, 65,155, 83,118, 75,227,253,247, 63,162,  0,144, 39,158, 28,139,200, 62,225,
-118,207, 59,119,246, 10,190,218,246, 13,115,254, 61,147,183,110,221,186,  6,121, 14, 13,230,227,197,248,106,219, 55,204,249, 14,
-113, 47,201,223,158,  2,224,233, 10, 52,219,  5, 89, 72,148,178,101, 45,243,129,135,163,250,185,100, 11,116,235, 15,248,108,250,
-227,  9,111,128, 11,125, 98,247,187,187,242,246,238,221,203,171,175,220,137,248,231, 66,218,186,154,234,110,158,148,167,173,173,
-233,230, 33, 75,238,112,109, 77, 77,183,251,236, 89,166,  0, 96,195,134, 13, 68, 36, 18,129,121,177, 93,216,114,185, 28, 52, 77,
-131,166,105, 36, 39, 39, 83, 78, 86,  5, 80, 70,163,209,159, 16, 98,162,105,186,222, 96, 48,252,215,203,203,139, 18,137, 68,190,
-  0,124,105,154,134,201,100,242, 50, 26,141, 98,163,209,216,233,249,231,159,191,192,250,109,179,111,  2, 36,192, 51, 74,192,208,
-161,163,200,129,125,187, 80, 82, 94,141,144,224,186,134, 99,101,119,252, 17,214,161, 21, 30,126,248, 97,167,100,221, 92,242,214,
-173, 91, 71, 61,250,232,163,100,109,230, 94, 92,254,227, 86, 19,121,221,187,180, 67, 68, 68,  4, 39,242,111, 46, 56,202,145, 66,
-185,186,143,176,  0,  1,  2,  4,220,  7,168, 99, 17, 58,205, 50,108,188, 89,229, 55,  0,180,134, 57,104, 92, 32,126,  1,  2, 28,
-120,  0,  4,  8, 16, 32,224,175,  2,137, 69,  9,160, 89,196, 47,194,221,157,  7,189,  1,116,178,124,166,133,230, 18, 32, 64, 80,
-  0,  4,  8, 16,240,247,128,  8,128,148,245,157, 33,126, 49,139,244,105,203,121,130,245, 47, 64,128,160,  0,  8, 16, 32,224,127,
-100, 76, 19, 72, 95,128,  0,  7,218,179,  0,  1,  2,  4,  8, 16, 32,224,127, 89, 91, 62,117,234, 20,123, 35, 29, 98,149, 68,135,
-160,241, 70, 59, 37, 42,149, 42,140,249,110, 43,152,144, 45,143, 47,254,142,242,108, 44, 91,164,132,246, 19,250,227,175, 34, 47,
- 44, 44,172,225,156,146,146, 18,138,175,188,148,148, 20, 40, 20, 10, 74,184,255, 92,147, 41, 60,191,130, 60, 62,242,120, 43,  0,
- 60,209,158,227,121, 36, 49, 49,145,119,102, 41,123,251,197,163,105, 50, 18, 91,187,  1,218, 58,231,158,131, 33, 24,203, 90,120,
-181, 74,165,106,200,214,197, 55,159,120,115, 33, 46, 46, 46, 38, 55, 55,183,129,  4, 99, 99, 99,101,123,247,238, 45,248, 59,106,
-187,182,250,227,194,  5,243,202,176, 94,189,122,181,116,245, 72,194,100,  5,114,190, 86,218,188,103, 19, 38, 43,136,229,152,221,
- 27, 39, 97,178,195,157,  2,145,243,181,210,229,155, 46, 44, 44,140,196,197,221, 93, 85,152,155, 11,226, 76,  9,112,134, 85,171,
- 87,197,236, 62,184, 27, 17,145, 17,106, 80,192,133,147,231,101,195,  7,140, 64,230,251,153,188,238,191,164,164,164, 38,215,157,
-149,149, 69, 65,128,  0,  1,205,166,  0,136,185,158, 24, 29, 29,205, 91,184,  3,  5,192, 38,137, 90,111,180,193,131,104, 93,209,
-156,184, 12, 46, 68,165, 82, 33, 45, 45, 13,233,233,233,106,  7,105, 58,185,252,127,163,115, 58,135, 63,  0,  0,184,169,211,193,
-168,173, 55, 23, 86, 86, 51, 36,199, 45,253,113,195, 64,158,219, 40,167,128, 37,183, 56,175, 61,222, 69,148, 57,187, 30,243, 14,
- 56,253,220, 18,131,115,163,254, 96,136,223,141,254,240,228, 53,144,132,201, 10, 76,148, 15,210,  1, 10,137,133,232, 93,250, 15,
-150,  2,225,113,232,245,105,200,203, 75,198,248,241, 27, 16, 23,151,142,220, 92,115, 91,185,162,  8, 60,243,242, 51,164,178,205,
-109,172, 81,174, 66,176,127, 48,104,163,  9, 58, 82,175, 62,240,227,193,241, 51, 76, 79,144, 17, 17, 35,101,243,231,207,119,170,
-  8, 36, 37, 37,145,148,148, 20,155,109, 42, 40,  1,  2,238,  5,226,227,227, 27,198,140, 57,115,230, 96,211,166, 77,141,184,103,
-246,236,217,141, 54,167,114,150, 92,202,153, 60,174, 91, 85,159, 58,117,202,218, 75,224, 81,  5,128, 87,252,128,173, 93,236, 60,
-129,245, 74,101,204, 92, 55,147,166,240,201,161,205,209,114, 39,105,105,105, 88,185,114, 37,  0, 52,188,219,254,107,194,207, 27,
- 16,212, 10,103,138,183,193, 15, 93, 96,194, 15, 40,223,120,  2,167,139, 42, 48,117,229,150, 22,123,  0,206,252,114, 22,253,250,
-246,  1, 77,128,179,103,205,159,129,187,159,217,229, 52,225,220, 39,132, 99,127, 80, 92,251, 99,214,172, 89,  0,208,240,110,147,
-216, 41, 10,112,252,215,228,241,199,247,227,219,111,229, 30, 85,  2, 38,202,  7,213, 37, 39, 39,251,  3, 27,144,243,181,107,196,
-238,142,133,239,204,250,  7,128,105,211,178,145,151,103,126, 79, 78, 46,  2,227, 17,224,227, 13, 88,191,126,125,140,250,183,239,
-212, 47,164,204,198,224,246,  3,225,215,186, 53,136,222,  8,154,152,224,229, 45, 70,247, 49,221,243,126,141,250, 13, 43, 55,164,
-171,215,172, 89, 35,123,245,213, 87,157, 42,  1,183,110,221,106,244, 61,118, 84,  0,134,205,255,  1, 58,221,140, 70, 29,185,125,
-251,118,151,219, 71, 46,151,147,253,251,247,123,172,125, 61, 45,175, 57,145,146,146, 18,227,110, 90,223,148,148,148, 24,192,245,
-244,192, 74,165,178,223,107,175,189,118, 67,163,209,132,  1, 24,  7,243, 38,156,189,  0,156,130,121, 83, 40,  0,248, 28,192,175,
-247,186,125,216,123, 61,204,153, 51,  7,185,185,185,141, 56,101,246,236,217,224,147,185,212,153,188,134,231, 61, 39,135, 36, 36,
- 36, 80, 92,200,159, 41,179, 86,  2, 26, 41,  0,105,105,105,164,184,184, 24,  0, 16, 17, 17,  1,246,102, 51, 42,149,170,209,119,
-235,227,142, 44,246,242,242,114,181, 74,165,226,236,  9,176,222,235,222, 17,  9,207,181,164,194,180,230,  1,190, 46,246, 13, 27,
- 54, 56, 61, 39, 63, 63,159, 19,119, 37, 38, 38,218, 37,253,197,139, 23, 35, 61, 61, 29,108,  5,129, 11, 58,135, 63,128,235,119,
-170,176,115,238, 52,180,165, 70,162,232,147,133,136,152, 18,129,111, 90,152,252,  1, 52, 16, 62,  0,244,233,211,167, 81, 57,227,
- 25, 96,151,123,218,178,119, 66,196, 36, 49, 49,209, 46,233,111,221,186, 21,233,233,233,144,143, 28,136,253, 63,156,  4,  2,  3,
-128,234,218,123,222,134,251,246,159,240,  7, 54, 96,223,254, 19, 30,145,119,243,223,109, 29,106, 49, 29, 23, 85,112,122, 64,216,
-174,255,228,228, 60,196,197,117,107,120,103, 16, 23,215,141,179, 18,240,201,151,159, 96,197, 71,239, 98, 84,143, 24,152,234,235,
- 97, 52, 25, 65,121, 83,  0,188, 64, 64,227,230,159,165,232,213,254, 97, 44,153,187,  4,239,102,188,203,201, 27,101, 61,216,197,
-134,110,181, 73,248, 51,102,204, 32,174, 40,  1,114,185,156,236, 91,186, 31, 19,225, 25,210,150,203,229, 36, 35, 35,  3,  0,238,
-107, 37, 32, 37, 37, 37,166,170,170,138,241,150,185, 85,207,170,170, 42,102, 76,119, 73,142, 66,161, 40,  6, 48, 11,192, 73,  0,
-159,  2, 24, 11, 96,  2,128,127,178, 20,128, 91, 45,209, 78,236,237,158,  1,224,235,175,155,106,240, 95,127,253, 53,  8, 33,152,
- 60,121, 50,197, 87,222,250,245,235,101,236,177, 46, 36, 36,196, 46,241, 91, 35, 57,205,204, 49, 27,210, 23,219, 60,222, 72,  1,
- 72, 79, 79,119, 24,  4,200,254,110,125,220, 81, 16,  2,163, 84, 44, 88,176, 64,157,150,150,  6,235,141,114,172, 55,207, 81,169,
- 84,142,210, 23, 82, 28,202, 90,244,161,250,234,171,175,236, 18,191, 69,209,106, 32,255,197,139, 23,115,146,249, 71,113,  9, 52,
-187,150, 65, 58,251, 63,232, 28,254,  0, 58,182,245, 67,241,174, 98, 51,249,  7,181, 50, 79,  1,248,120,241,174,107, 92, 92,156,
-140, 61, 13, 96,249,206, 75,  6, 77,128,176,  0,224,195,153,192,243, 91,129,246,254,192,133, 74,219,229,231,238,240,171,159, 61,
- 69,142,143,215,230,157,119,222,177, 75,252,  0,144, 49,107, 18,214, 30, 56,134,144,136, 78, 40,187,122,211,169,245, 15,  0, 28,
-189,  0,156,189,  4,102, 11, 95, 97,211,210,231, 50,255,111, 11, 25, 95,120, 54,201, 39, 67,250,204,187, 62,174, 59,196,185,151,
- 57,255,190, 78, 91,135,145, 51, 70,168,163, 59, 13, 67,189, 70,  3,111, 95, 95,120,123,223, 29,130,138, 47, 95,198,238,156,156,
-235,179,159,155,213,185,171,111, 24,  6, 62, 54, 96,140, 84, 23, 24,179,249,147,205,188,172,198,247,246,205,194,247,223,127, 15,
-160,113,221,182,111,223, 78,241, 85,  2, 24,242, 71,215, 53,216,183,244, 85,183,149,  0,185, 92, 78, 50, 51, 51,209,179,103, 79,
-172, 93,187, 22,243,230,205,187,239,148,  0, 43,226,247,136, 60, 70,150, 27,222,  4, 25,128,199,  0,108,  5, 80, 11, 32,  4,192,
-111,  0,174,226,110,238,135, 22,129,245,118,207,108,183,189,181, 11, 63, 33, 33,129, 56,115,225,239,219,183,175,209,148,241,238,
-221,187, 11,216, 86, 63, 87,133,152, 33,127,230,243,134,244,197, 77,188,  0,247, 36, 15,  0,107,238, 21,197,197,197,232,208,161,
- 67, 19,  5,129, 41, 43, 47, 47,231,154,231,222, 89, 48, 32,231,  1,243,137, 39,158,104,182,107,103, 19,152, 45,171,223, 66, 66,
-182,234,222,  8, 90,148,160,118,202, 48,144,192,133,192,152,165,168,197,151,192,198, 19, 22,205,108, 33,124,158, 93, 11,163,145,
-127,162,179,220,220,220,  2,118, 59,241, 37,127,  0, 40,223, 12,188,189, 30,120,160, 11,112,115,143, 24, 89,155,244,152,181,205,
-126, 57, 47,243,158,120,150,196,216,193,126, 55,190, 94,137,192, 72,  9,164, 61, 94,193, 87, 43,159, 71,255, 62, 33,120,104,210,
-187,156,250,131, 75,213,121, 76, 21, 80,  0,136, 21,249, 83, 12,241,187, 50,175,207,213,194,231,  2,125, 92,119,155,229,121, 86,
-158,  0,103,184, 81,126,  3,227, 18,199, 33,176, 85, 48, 76,148, 17,135,190,255, 47,106,106,107, 17, 23, 31,143, 63,203,203,177,
- 35,123, 39,230, 60, 55,171,179,175,196, 23, 34,226,131,241,131,198,231,255,166, 94,235,146, 66,127,231,206, 29,183,175,155, 77,
-254,  0,220, 86,  2,228,114, 57, 89,190,124, 57,186,119, 55,183,103,183,110,221,112, 63,121,  2, 60, 77,252, 54,172,127,230,179,
- 43,215,218,219,242, 76,250,  0,240,  7, 16,  9,224, 60,128,206,  0,170,  1, 84,122,224,153,117,  9,214,219, 61,207,153, 51,167,
-161,140,113,225, 51, 99, 25, 23,207,180,189,233,  2, 54,249,115, 81,  4,184,224,158, 37,  2,234,208,161,131, 44, 49, 49,177,201,
- 84,128,101,111,123,  0,224, 29, 35, 96, 47, 24,208,145,229,104, 79, 65,105, 14, 48,214,189, 61,119, 63, 87,235, 31,  0, 14,188,
-190, 28,113, 43,222,135,113,204, 72,120,  3,144, 30,189,140,111,138, 42,  0,  0,198, 49,243, 96,248,165, 29,168,246,255,228, 77,
- 82, 60,188, 44,118, 81, 49,249, 75,204,123,238, 26, 46,206, 77,133,230, 91, 61, 66,218, 57, 46,247,132,  7,192, 21,229, 96,235,
-214,173,102,109, 56,238, 81, 28, 43, 45, 71, 96,255, 64, 92,207, 43,  2, 36,190,152, 54,239, 89,180,233, 50,169, 37,199, 95,123,
- 81,255, 30,241,106, 57, 90, 33,224, 44,118, 32, 47, 57, 15,227, 55,140,199,180,108, 32, 57,207,252, 57, 47, 57,143,183, 23,160,
- 86, 87,131,118,126,109, 97,212,213,129,136,  8,134, 12, 29,138, 93,187,118,233, 50,223,127, 95, 66, 19,130,167,103, 62,141, 54,
-109,219,160,174,182, 22, 70,147, 17,129, 62,173, 96, 16, 25, 92,186,222,202,202,202, 70,171,  3,248,  6,  4, 54, 33,127,  6, 46,
- 42,  1,114,185,156,164,165,165, 97,232,208,161,141,202,251,244,233,131,247,222,123,175, 69,149,128,230, 34,126,107,235, 31,  0,
- 74, 75, 75, 93,245,  2,252,  8,243,124,127, 53,204,174,255,113,  0, 46,  1,232,  7, 32,  7,192, 22,  0, 14,111, 22,165, 82, 73,
- 41, 20, 10,143, 43,  9,108,151, 61, 43, 80,175,225, 56,123, 74,160,172,172, 44,198,217, 70, 95,132, 16,138, 33,120,182,171, 63,
- 33, 33,193,102,185, 39, 21,  0, 98, 69,138,132,231,113,137,167,193, 38,  0,  0,  8, 86, 73, 68, 65, 84,135,136,136,136,104, 32,
-253,232,232,104, 25, 19, 27,192,120,  7, 34, 34, 34,212,204,116, 65, 75, 13,188,158,132,179,185,126,150,245,239, 20, 83,215,103,
-131,196,135,227,230,240, 65,104,139,145,240,155,182, 22,198, 27,127,  2, 65,173,224, 93,241, 37,246,100, 22,  2, 94, 94,174, 92,
-187,219, 15,196,233,215,254,129,193,  3,128,136,121,103, 17, 41,125, 14,191, 61,152,  8,124,152,106,183,188,165, 60,  0,233,233,
-233, 24, 53,228, 33,140, 25,217, 19,113,125, 83,177, 58,243, 99,156, 47,188,142,185,163,  7,163, 44,103, 31,170,238, 84,123,234,
-126,176, 53, 85,224,148,160,217,132,239, 73,242,183, 35,147, 19, 74, 74, 74,168,176,176, 48, 50, 45,187,177, 66,  0,  0,227, 55,
-140,135, 56,247, 50,114,115,139, 26, 86,  2,176,115,  5,216,186,221,104,154,134,137,  6,  8,109,132,175,159,  4, 51,159,121, 70,
-242,246, 91,111,161, 99,199,142,116,231,144, 16,145, 78, 83, 11, 19,  1,  8,109,  2, 77, 59,247,104,101,101,101, 81, 99,199,142,
- 37, 21, 21, 21,168,174,174,110,164, 56, 90,173, 14,224,188, 42, 64, 46,151,147,213,207,159,  3, 36,221,129,178,143,154,158, 32,
-233,142,213,207,159,  3, 56, 42,  1,114,185,156, 36, 36, 36,200,250,244,233,163,174,168,168,104,114, 60, 44, 44, 12,  9,  9,  9,
- 50,220,231, 49,  1,238, 90,255,110,122,  1,216, 10, 67, 39,  0,167,  1, 76,  1,192,121, 43,211,230, 32,127,192,241, 20,128, 13,
- 99,166,192,217,181,199,199,199, 19,230,247,241,241,241,196, 90,222,166, 77,155, 16, 31, 31, 79,248,174, 10,224,162,  0,240, 73,
-  4,100,235,184, 77, 36, 38, 38,218,244,  2, 48,100,223,161, 67,  7, 89, 90, 90,154,154,153,147, 77, 76, 76,116, 24, 84,232,200,
- 58,116, 97,125,125,179, 44,  3,100,172,123, 71,193,128,124, 80,244,239,100,248, 76, 91, 11,109,233, 69,120, 31, 93, 11, 67,246,
- 60, 80, 19, 87, 97,247, 63,167,227,234,238, 43,136,203,248, 20,240,110,153,204,206,169, 42, 32, 47, 99, 23, 34,175,142,  7,110,
-105,176,104,108,170,195,114, 79,120,  0, 92,181,254,115,118, 45,135, 87,231,222,144,162, 39, 74,190,223,128, 26,138,224,167,139,
-215, 48,230,236,117, 78,213,249,246, 91,185, 93,178,  7,  0,203,113,155,231,113, 37,127, 59,247,168, 91,196,224,137, 21,  2,201,
-121,119,137, 31, 64, 19,203,159,  9, 24,204,205, 45,178,249,251, 64,191, 64,148, 86,149, 98,104,215, 97,208,214,235,  0,173, 14,
- 70,189,  1, 75,210,210, 64,137, 32,170,211,212,130,166, 77, 48,154,  8,124,189,125,240,103,237,159,240, 49, 57, 95,109,252,205,
- 55,223, 52, 92, 91, 82, 82, 18, 97,198, 27,246,234,128, 27, 55,110,112,190, 78, 51,  9,155,149,128, 94,225, 77,255,255,194, 21,
- 61, 22,108,140,  4, 87,178,182,156, 71,134, 14, 29,138,176,176,176, 38,199,207,158, 61,139,156,156, 28,117, 75,145,191,197, 26,
-167, 24, 79, 64,105,105,105,179, 88,255, 30,240,  2, 48, 24,103, 33,210,250,251, 65,201,113, 52,  5,192, 46,231, 59,  5,224,169,
- 41,  5, 62, 10, 64,179,128,177,252,  1, 32, 58, 58, 90,166, 82,169,212,140,235,223,142,114, 32,187,116,233,146,179, 88,  0,138,
- 99,153, 71,173, 76,174, 13,206, 88,255,182,136,159, 81,116,248,212,247,116, 81,  5, 12,191,188,141,155,248,  1, 33, 19, 87,  1,
- 85,213, 40,218,176, 16,221, 82,214,160,108,203, 66,192,199, 27, 16,181, 76,102,231, 18, 13,208,171,195, 20,206,229, 45,225,  1,
- 72, 79, 79,175,157, 49,102,216,141,214,116,240,  3,117,240,145,100,175,153,135,117,123, 78, 97,209,132, 71, 48,235,253, 47, 48,
-253,255,253, 95,179,122,131, 28, 93, 98,206,215, 74, 88,146,  0, 81,238, 42,167,238,184,250, 29,121,  1,146,243,242,136, 45,242,
-103, 91,255,206, 16,218, 33, 20,  7, 14,229, 97,196,  3, 35,224, 31, 32,  5, 77, 19,136,136, 17, 52, 69,129, 16,  2, 19,  1,140,
- 52,129,209,104,132,182, 74,131,189, 63,239,133,216, 36,230,189,116,216,122, 85,192, 27,243, 70, 34, 54,180, 24,212, 65,238, 50,
-236, 41,  1,124,201,223, 90,  9,200,200,200, 64,167, 78,157,238, 42,246, 69, 69, 72, 79, 79,199,253, 96,249,123, 90, 17,176,101,
-253,187,233,  5,  0,128, 24,  0, 15,  2,120, 19, 45, 28,252,199, 64,169, 84, 54,186, 71,203,202,202,160, 84, 42, 29,121, 34,156,
-202, 99, 79, 41,148,149,149,197, 40,149, 74, 10,  0, 41, 43, 43,163,214,175, 95, 79, 88,222, 91, 74,225,198, 50,248,123,162,  0,
- 88, 71,253, 91,146,213, 52, 81, 14,216,159,221,180,224,121,223, 88, 30, 92,  6,104,211,250,119,149,248, 25, 76, 93,185,  5, 59,
-  1, 76, 88, 17, 11,162, 90,  8,234,137,213, 56, 93, 84,  1,170, 77, 48, 46,255, 81,109,182,254,249, 79,  1,120,  4,246,214,251,
-187,147,  7,128,139,194,197, 85, 57,216,186,117,171, 30, 64,205,243, 49,253,170, 95, 89,245, 31,253,235, 75,210,116,237, 91,117,
-168, 56,119,190,164,227,172,243, 95, 72,209,194,171, 70, 28,144, 51,123,138,134,231,138,  2,207,195, 22,249, 51,150, 63,  0,167,
-  1,129,243,231,207,167, 70, 60, 62, 34, 94, 61,178, 32, 39,177,239,116, 84,235,170, 65,137,  0,115, 74, 17, 26, 38, 19,  1,109,
- 52, 34,192, 55, 16, 71,170, 78,226,210,209,203,216,161,220, 81,224,118,197,139, 94,  0,192,127, 25, 96, 35, 37,160, 83,  9, 46,
-220,  8,115,137,252,173,149,128,181,107,215, 34, 40, 40,  8, 21, 21, 21, 88,190,124, 57,238, 55,183,191, 39, 20,  1,123,214,191,
-139, 94,128,142, 48, 71,253,139,  0, 12,  4,176,  0, 64,209,253,210, 94, 10,203, 82,116, 79,193,122, 74, 97,247,238,221,223, 55,
- 87,221,239, 73, 30,  0,123, 30,129,213,171, 87,203,172, 21,133,196,196, 68, 53,223,139, 96, 19,193,253,144, 98,151,109,253, 91,
- 47,255,179,180, 47,187, 93, 57, 87,152, 81,  2,166,172,216, 12,146, 13,180,155,165, 68,193, 43,211,241, 72,250,231,128,143, 15,
-  2, 36,226, 22,185, 94,246, 26,127, 91,159, 93,204,  3, 96,  4, 32,178,244,173,200,205,254,184, 57, 99,204,176,210, 87, 54,228,
-134, 47,153, 51,174, 85,104, 72,140, 30,192,153,196,196,196,214, 48,111, 37,235, 82,127, 48,183,220,183,223,202,153,136,127, 87,
-148, 59,202,153,  5,207,135,208,155, 43, 25,144, 61, 88,147, 62,227, 17,104,211,166,141, 77,237,236,200,183, 71,118,135, 61,252,
-  0, 76, 51,140,103, 30,123,224,177,126,109,  3,219, 66,103,208,129, 16,  2,177,183, 24,149,218, 58, 28,251,227, 91,108,253, 44,
- 11,178,222, 50,217, 14,236,112,187,142,239,237,155,133,172,172, 44, 92,186,196, 63,  7,192, 93, 37,  0,110,145, 63, 91,222,188,
-121,243, 72, 70, 70,  6, 82, 83, 83,113, 63,207,249,179, 21,129,130,130,  2,151,126,235,232, 28, 30, 50, 19, 96, 94,239,175,  3,
-240, 26,128,159,  1,152,240, 55,133,245, 20,  0, 95, 12, 24, 48,  0,167, 78,157,194,134,244,197, 77,242,  0, 56, 76,  4,212, 92,
-121,  0,108,121,  4,236, 17,189,139, 94,  0,183,208, 92,203,  0,153, 14, 84, 42,149,200,207,207,167,139,139,139,217, 68, 38, 83,
-169, 84,188, 53,199,169, 43,183,  0,172,196, 63,143, 45, 89,223,240, 89,211, 50,247,171,211,187,148, 38, 46,181, 93, 38,128,219,
- 48, 47,255,153,233,102, 29,203,158,143,233, 87, 63, 54,255,199, 86, 79,191,245, 41,148, 74,165, 56, 63, 63,191, 19, 26,167,179,
-118,169, 63,154,219, 19,224, 44,191,191,211,145,179, 25,166,  4,236,145,191, 62,174, 59,144,235,220, 48,219,246,209,118, 42,192,
- 75, 74,142,134, 29,195,200, 97, 35,209, 57,176, 51, 64, 19,252,169,171,192,145, 19, 71, 80,118,174, 12,163,123,141,150,189,252,
-242,203, 45,222, 31,108, 37,192, 83,100,205,120,  2,254, 42,  1,127,238,102,  1,244,  0, 54, 88, 94,255, 19,176,158, 82,112,199,
-197,111, 47,  1,144, 77,  5,160,185,176, 96,193,  2,155,100,111,181, 19, 27, 27,106,  7,137,128,236, 18,173,171,104,142,101,128,
-233,233,233, 80, 42,149,198,252,252,124,111,203,212,  1, 67,254,163, 29, 92,183, 77, 88, 54, 83, 82, 55, 67,215, 16,  7,229, 84,
- 11,221,252,190,150,251,114,169,165,200,164, 80, 40,158,113, 83,172,239,216, 55, 63, 41, 84, 42,149,143,230,231,231, 35, 63, 63,
- 95,  7, 64, 98,121,121,130,248, 41,119, 82,  3, 59, 35,249,132,201,138, 70,253,197,151,184, 61, 49, 37, 80, 82, 82, 66,229, 37,
-231,145,208,121,161, 50,116,181,125, 78,105,114,158,154,107, 60,192,166, 15, 54, 81,107,214,172,137,217,178, 98, 11,194,186, 63,
-168,  6,128,223,206,254, 42,155, 52, 54, 14,153, 31,103, 22,108,195, 54,151,234,153,149,149, 69,141, 27, 55,174,201,170,  0,131,
-193,224,214,245,123,154,172,255,110,209,254,247,  1,105, 82,205, 21,229,127,175,225,137, 41,  5,198, 11, 96, 93,198, 89,  1,112,
-102,137,243,176,212, 93,189,209, 73, 51,203,247,212,239,109,202, 75, 76, 76, 36,249,249,249,222,236,246, 98,123, 88,120, 42, 40,
-  5,205, 68,200,247,227, 32, 20,  8,160,214,156,144,159,162,  0,248,193,201,250, 94,142,253,241,123,126,126, 62,179,174,172, 58,
- 34, 34,162,125,122,122,186,239,253,208,150,205,233,182,247,164,236,146,146, 18,170,100, 81,137,199,218,128,149,231,191,225,119,
- 71,190, 59,234,118, 61, 15, 30, 60, 40,144,235,223,156,236,217, 28,166, 80, 40, 12,158, 36,127,165, 82, 41, 81, 40, 20,186,191,
-122, 59,113, 49,162, 41, 87,247, 17, 22, 32, 64,128,  0,  1,  2,  4,252,117, 33, 18,154, 64,128,  0,  1,  2,  4,  8, 16, 20,  0,
-  1,  2,  4,  8, 16, 32, 64,192,255,  0,254, 63, 77, 57, 32,181,169,121,  6,251,  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,
+  0,  0,  0,  1,  0,  8,  6,  0,  0,  0,197,144,206,103,  0,  0,  0,  6, 98, 75, 71, 68,  0,  0,  0,  0,  0,  0,249, 67,187,127,
+  0,  0,  0,  9,112, 72, 89,115,  0,  0, 11, 19,  0,  0, 11, 19,  1,  0,154,156, 24,  0,  0,  0,  7,116, 73, 77, 69,  7,216,  8,
+ 14, 16, 39, 19,160, 75, 88,219,  0,  0, 32,  0, 73, 68, 65, 84,120,218,236,125,121, 92, 84, 85,255,255,251,220,217,217, 23,  1,
+ 21,133,193,125, 95,201, 37, 55, 40, 49, 51,205, 52,192,212, 36,219,196,210,180,178,180,111,249, 60,233, 79,159, 12,148,202,212,
+132,158, 74,179,210, 18,151,180, 92, 18,116, 80, 83, 82,209, 92,202,  5, 69,  1, 65,145,101, 86,102,187,115,231,222,223, 31, 51,
+131,  3,  2,179,128, 73, 61,243,126,113, 95,195, 93,230, 51,231,158,237,253,249,124,206,231,156, 67,250,245,235,199,193,  3, 15,
+ 60,240,192,  3, 15, 60,248,159,  2,229,201,  2, 15, 60,240,192,  3, 15, 60,248,223,193,153,223,179,  1,  0,196,227,  1,240,192,
+  3, 15, 60,240,192,  3,143,  7,192,  3, 15, 60,240,192,  3, 15, 60,240, 40,  0, 30,120,224,129,  7, 30,120,224,129, 71,  1,240,
+192,  3, 15, 60,240,192,  3, 15,254, 17,224,219,159,156, 61,123,150,184, 43,168,190, 88,  2,143, 60,143,188,134,144,145,145,193,
+173, 95,191,254,129,165,111,234,212,169,220,150, 45, 91,136,167, 60,254,214,242,208,  4,121,240,228,159, 71,222, 63, 89,158,203,
+ 10,192,255, 56,234,102, 32,105,201,233, 76, 79, 79,199,236,217,179,137,167,216,220, 47,227,184,184,184,154,243,172,172,172,127,
+ 68, 94, 78,124, 42,185,209,142, 96,215,143, 25,255,232, 58, 35,  9,220,  9,177,161, 19,162, 64,163, 26,251,144,175, 95,220,146,
+235,162,167,253,122,208,114, 60,  0,127, 69,101,157, 56,113, 98,204,174, 93,187,100,118,231,177,187,118,237,202,105, 17, 45,146,
+179,244,157,132,180,216,118,201, 21, 22, 22,  2,  0,164, 82,233,223,169, 19,113, 90, 59,157, 58,117,170,211,207,110,217,178,197,
+ 21, 69,141,219,186,117,107,205,201,206,157, 59, 17, 23, 23, 87,235,254,131, 82,  2,242,242,242, 56,  0,136,142,142, 38,205,241,
+220,174, 31, 51,238,107,249,133, 71,181,  7,  0,220, 49, 24,192,232,141,150,139, 74, 53,  0, 32, 33, 33,  1,153,153,153, 13,166,
+111, 96,193, 64,174,243,237,206, 46,253,248,247,195,191,119,162, 92, 36,  8,124,245,  2, 12,187,118, 66,161,152,  4,  5,128,  1,
+146,149, 88, 44, 57,141,246, 98,160,194, 80,128,197,250, 68,151,126, 55, 33, 33, 33, 38, 51, 51, 83, 86,231, 90,108,102,102,102,
+ 78, 11,107, 91,205, 82,111,255, 38,239,219,236,104, 19, 44, 34, 62,  2,127, 98, 20, 11, 57,163, 82, 79, 85,235,213,172,214,104,
+250,159,152, 29,231, 80,  1,176, 18,182,237,179,169, 21,129,219,181,107, 23,150,110, 93, 14,159,246,254,168,190,169,194,251,137,
+139,101, 45,220,226,110, 73, 32, 82,169,148, 43, 44, 44, 68, 97, 97, 33,246,239,223,143,217,179,103,183, 84, 37,192,214,128, 72,
+ 70, 70,134, 32, 57, 57,217,148,154,154,122, 10,  0, 22, 46, 92,248, 80, 99, 95,156, 52,105, 82,205,255, 12, 99,  6,109, 50,130,
+ 54,210,160,105,203,193, 48, 12, 22, 46, 92,232, 82, 90,236,201,191, 62, 88,149,  1,238, 65,122,  2, 92, 81,126, 30,152,133, 31,
+224,135,243,215,191,135,  4,237, 96,198, 49,148,127,113,  6,231, 10,170, 48,249,195, 13, 78,125,189,243,237,206, 78, 18,186,  5,
+207,252,250,140,195, 60,145,140, 91,140,160,137, 47,162,244,245,  1,128, 94, 81,115,253,140,254,109,156,  1,  0, 61, 48, 82,146,
+128,131,129,167, 17,  0, 96,160, 98,160, 83,117, 38, 51, 51,243,158,139,118,  4, 73, 90, 80, 27,107,142, 62,224,239,240,190,205,
+138, 97,125,250,145,103,195,163,248,202,136, 86,188,208,238,225, 20,159,132, 18,157, 74,197,138, 17,102,166,250,183, 51, 63, 55,
+ 97,140,217, 73, 81,183, 92,248,217,182, 78, 60,179,192,  5,121,105,247, 85,  1,216,181,107,151,108,235,191,222, 69,226,178, 15,
+100, 77,172,  4,156,141,248,  1,160, 82, 87,  5,  4,  3,255,119,112,  9,212,215, 21, 88,247,242,234,150, 70,100, 13,117, 60, 15,
+ 58,141, 53, 74,192,216,177, 99, 81, 88, 88,  8,169, 84,218,226,242, 78, 38,179,244, 27,177,177,177, 28,  0, 42, 35, 35, 35, 60,
+ 57, 57,185, 52, 53, 53,245,180,179, 66, 24,134,  1, 77,155,106,136,223,158,252,243,242,242, 16, 29, 29,237, 82,162, 18, 19, 19,
+237,201, 22, 89, 89, 89,117, 21,128,230,168, 43, 46,151, 67,116,116, 52,153, 58,117, 42, 55,102,204,152,123,238, 29, 56,112,192,
+230,233,176,121, 61,156,150,223,156,195,  1,225, 81,237, 81,170, 80, 97,199,236,167, 17, 76,134,161,224,191,111,161,195,164, 14,
+200,114,129,252,107, 50,203,234,106, 35,205,224,106, 11,223,122, 12,186,162,106,148, 38, 71, 53,250,220,  5,113, 54,150,246,190,
+131, 21, 23,222,107,106,121, 54,  7,233, 54,167, 12, 52,179,172,251,241,190,205,130,164,164, 36, 47,  0, 15,  3,240,177,187,172,
+  4,112,126,211,166, 77,114,103,229,124,178,254, 19,138,174, 52, 10,104,163, 65,172,128, 73, 44, 16,240,249,106,131,152, 18, 10,
+245, 44,207,207,155,161, 37, 38, 19,191,236,150,241,235, 47, 54, 26,158,123,105,166,217,153,247, 86, 42,149,255,177,253,159,159,
+159, 95,233,237,237, 77,105,181, 90,214,254,153, 65,131,  6,125,220,204,196,190,160,169,121,202,119,100,253, 95,186,116,  9,157,
+125,252,236,189,  1,238,120,  1,106,200,191, 82, 87,133, 21,143, 46,169,185,241,252,174, 87,129, 80, 96, 82,106, 34,118, 46,220,
+234, 74, 37,107,172,115,107,114, 69,189,121,243, 38,  0,160,125,251,246,181,254,135, 11,238,236,102, 84, 68, 72, 67, 74,128,201,
+196,216,226,  1,154,197, 10,104,134,188,180, 39,127,  0, 32,201,201,201,  0,112, 43, 35, 35, 35, 48, 57, 57, 89,225, 52,249,155,
+ 76,160,105, 35,140, 52, 13, 83, 29,242,231, 88,215,138, 33, 49, 49, 17,121,121,121,119, 91, 87, 90, 26,226,227,227,107,206,183,
+109,219,214,100,101,199, 78,225,105,114,253,179, 39,254,169, 83,167,162,127,255,254, 54,  5,192, 85,143, 64,179, 84,194,146,235,
+197,208,238,252, 55,124, 94, 88,141,240,168,246,  8, 11,150,224,250,206,235, 22,242, 15,240,179, 12,  1,  8,120,206,105,176,205,
+ 52,198,214,229,226, 53,220,124,127, 57,244,153, 27, 27,247, 16, 72, 36, 48, 24, 12, 40, 40, 40, 64,185,225, 10,186, 32,188,193,
+103,173,110,240,198,234, 62,177,181, 19,235,179, 57,110,180, 47, 98,215,174, 57, 55,219, 25,105,132,184,157,174,131,245,189,111,
+124,124, 60, 71,  8,177, 13,229, 52,229,125,109,109,153,227,243,249, 77, 42,243,164,164, 36,127,  0,147, 14, 30, 60,248,111,150,
+101,141,118,117,137,207,227,241,188,147,146,146, 94,218,180,105,211, 94,135,140,185,104,  1,191,242, 86,133, 88, 32, 16,121, 83,
+124,226,199,241, 68, 94, 44,143,199,103,  9,  5,150,240,205, 28,143,103,228,177,196,160,229,153,117,222, 66,  1,249,226,216, 94,
+195,220,148,153, 44,138, 29,167, 81,161, 80,168,117, 58, 29,  3,  0, 90,173,150,125,247,221,119,107,  8,255,131, 15, 62,120,163,
+169,245,125,244,232,209,179,109,255,103,103,103,167, 55, 71, 27,162, 28, 89,255,203,167,196,195, 80, 81,129,183,122,118,131,253,
+216,189,211, 86,200,196,137, 49,  0,106,145,255,196,137, 19, 99,  1,144,137, 19, 39,198,110,152,248,153,197,179,216,181, 85,173,
+231,157,193,194,117,249, 88,184, 46, 31,115, 86, 93,194,115,203,254,192,228,255, 59,219,244,142,174,164,196, 41,197,224,175, 34,
+127,235,152, 63,215,128, 39,  0, 38,154,198,224, 65,131,154, 67,201,224,182,110,221,138,173, 91,183, 66, 38,147,213, 28, 46, 42,
+ 60,156, 76, 38, 67,108,108,108, 13,249,219,223, 76, 78, 78, 86, 58,211, 49, 49,140,217, 98,249, 27, 45,174,255,186,228,111, 54,
+155,161,213,107, 93,122, 65,155,199,160,174,215, 96,219,182,109,216,182,109, 91, 45,101,192,165,247,205,169,221, 31, 90,207,155,
+164, 36,218,200,127,234,212,169, 72, 77, 77,173, 33,127,  1, 95,224, 42,249,219, 58,240,134, 14,167,161, 71, 49,170, 39, 13,  6,
+151,249, 22, 74,174, 23,131,155,212,253,110, 38,100,190,  5,126,155, 16, 32, 32,224, 47,213,140,181,149,  5,208,103,110,  4,199,
+113,184,112,225,  2, 70,142, 28,  9,137, 68, 82,139,248,  3,  3,  3,161,215,235,161,215,235, 81, 90, 90,138,105,250,121,248, 34,
+240,245,  6,101, 58,233,242, 38,117,158,117,149,184,155,203, 88, 33, 13,144,191,211,117,176,238,251,198,199,199,115,219,182,109,
+ 67,102,102, 38, 18, 18, 18,184,166,190,175,149,252,193, 48,140,219,109, 34, 41, 41, 73, 12,224,229,236,236,236,119,151, 45, 91,
+118,130, 16, 34,181, 29,  0,218,  5,  7,  7,123, 29, 58,116,104,125, 82, 82,210,200,198,228,124,150,190,158,199, 35,  2, 17,205,
+112,126, 70,163, 41,212,204,178,237,204, 44, 27,101, 38, 36,  2, 60, 94, 48, 33, 36,  0,132,231,199,114,  8,226,104, 54, 64,173,
+ 55,121,135,250, 49, 60,106,144,198,169, 50,210,233,116, 76, 93,171,191,165,131,106,140,184,187,116,233,130,206, 62,126,208,149,
+221,198,227,253,  7,184, 76,208, 54, 37, 98,233,214,229,  0, 80, 67,254, 54, 47,194,174, 93,187,114,108, 74, 64,137,250, 22,  6,
+ 44, 28,226,146,146,161,213,155,161,213,155,113,187,202,136,210, 10,  3,110,222, 49,184, 69,124,182,198,226,136,252, 31, 20, 26,
+ 81,  2, 96,160,141, 48, 24, 12, 77, 17,207,201,100, 50,216,198,200, 67, 66, 66,236,173, 89,184,208,153,212,178,132, 27,113, 37,
+ 58,236,244,104,147,209, 98,249, 27,105,208,166,218,228,111, 50,153,160,213,106,161, 81,107, 30,116,177,112, 91,183,102,214,126,
+ 37,203, 31,172,215,221,234,240,236,201,223, 70,252, 20, 69, 65, 44, 22,195,219,199,171, 73,  9,158,248, 84, 50,215,208,225,232,
+187,251,255,111,  9,130, 49, 12,204,232,215,  0,  0, 62,185,215,112,174,160,202,210,201,143,126, 13,166, 11, 75,129,202, 42,215,
+ 50,208, 10,119,223,199, 27,149,  0,128,141, 27, 55, 98,215,174, 93, 88,185,114, 37, 78,158, 60,  9,163,209,136,242,242,114,155,
+ 85, 86,243,124,120,120, 56,244,  0,120,184,241, 64,234, 75, 35,245,158, 52, 65,105, 36,141,120,240, 92,150,105,239,  9,171, 47,
+ 38,192, 29,242,  7,  0,119,149,128,164,164,164,214, 86,242,159,245,245,215, 95, 95, 92,188,120,241, 83,155, 55,111, 70,151, 46,
+ 93,  0,  0,145,145,145, 80,169, 84,162,165, 75,151,158, 62,116,232,208,183, 73, 73, 73,210,  6,115,137,229,  8, 88, 70,108, 54,
+ 51, 65,102,198,220,206,100, 54,117,226, 81,164,173,144, 79,  9,196,  2,158,158,239, 37, 84,122,251,242,212, 60, 49,199,136,121,
+ 60,111, 62, 67,251,221, 56,243,187,104, 70,200, 39, 14,211,157,159,159, 95,169,213,106,217,250,220,252,125,251,246,189, 66,211,
+116,179, 85,164,190,125,251, 54,155, 44,126, 99,196,253,223, 89, 47,222, 37,219,146,155,120,171,103, 55,172,178, 16,180, 75, 90,
+171,205,250,183,145,126,157,223,169, 57, 15,238,221,218,165,196, 87,235,205,208,232, 24,168,181, 12, 84,213, 12,148, 26,198,245,
+ 86, 89, 79,228,191,189,149,111,255,255,245,235,215,161, 84, 42,255,178, 30, 35, 61, 61, 29, 82,169, 20,182,160,191, 58, 99,253,
+ 92,122,122, 58, 12,122,125, 83, 20,  0,110,195,134, 13, 40, 41, 45,133,128,199, 67, 88,235,214,181,200,255,209, 71, 31,197,193,
+131,  7,157,237,156, 72,108,108,108, 93, 37,160,150, 39,195,217, 88,  5,218, 72,131, 54, 26, 97, 50,209, 96, 24,115, 13,249, 27,
+141, 70,232,116, 58, 84, 87, 87, 67,163,113, 93,  1,176, 31,  2,176,193, 93,203,127,107,230, 86,128,  3, 42,173, 68, 99, 29,212,
+  6,225, 56,139, 18,144,153,137, 68,139,  5,229, 82, 91,169, 75,254,  2,129,  0, 34,145,  8, 98,177, 24, 98,177,184,201,117,170,
+161, 33,129,250,230,197,219, 99,114,250,118,112, 79, 70,225,206,208,  1,  8,198, 48, 72,158, 94,  3,230,118,  5, 16,224,  7,126,
+213, 22,252,252,201,105,128,199,115, 41, 45, 77, 29, 10,208,242, 44,125,202,138, 21, 43, 80, 81, 81,129,245,235,215,163,111,223,
+190, 88,182,108, 25,  6, 12, 24,  0,189, 94, 95,215, 66,179,169,212,127, 53,241, 59, 75,208,238, 14,  7, 52,164, 72,184, 44,199,
+ 58,139,163,166,109,184, 59, 52,102, 79,254, 53,100, 99, 85,  2, 92, 28, 14,240, 61,127,254,252,167,175,188,242,202,145,222,189,
+123,251,  1,192,146, 37, 75,144,159,159, 15,  0, 24, 50,100,  8,118,236,216,129,225,195,135,123, 79,155, 54,173, 32, 39, 39, 39,
+251,249,231,159,159,246,251,239,191,223,147,179, 65,193, 65,236,245,235,  5, 76,142,236,224,190, 78,157, 58,231, 68, 69, 74, 47,
+242,124, 37,229, 60, 34,212, 82, 34,129,142, 18,123,105,104, 62,143,  6,103,226,177, 98,147,175,166,180,202,231,228,161,179,131,
+ 90,  5,134,237,112,168,140,218,141,249,239,220,185,243,185, 73,147, 38,125,109,115,251,171,213,106, 74, 40, 20, 54,185, 34,217,
+220,254,217,217,217,247,215,  3, 96,179,242,163, 59,118,134,161,162,  2,218, 18, 11,  9,142,180, 90,135,174,122,  1,174,255,113,
+237, 30,217,245,157, 87, 93, 40,115, 41,241, 77, 37,127,123,226,231, 56,206, 54,198, 95,  3,147,201, 84,115, 40,149, 74,104,181,
+ 90,200,229,242,191,172,231,176,205,243,223,191,127,127, 93, 79,  0,151,158,158,142, 62,125,250,192, 96,208,215,116,116,233,233,
+233, 46,185,235,215,125,182, 14, 38,147,  9,237,194,195, 97, 50,155, 27, 34,127, 87, 58, 18, 82,143,235,191,102,234, 98, 99,158,
+140,123, 20,  0,218, 84, 67,254,167, 78,158,130, 78,175,135, 70,163,129, 74,165,130, 82,169,172,101,217,185, 10,219, 48, 64, 19,
+198,253, 81, 85, 89,133,170,170, 74, 84, 86,201, 81, 89, 85,133,170,170, 42, 84, 85, 90, 44,210,110,221,187, 67,110,253,223, 85,
+235, 31,  0,250,247,239,127,215,234,247,246,134,143,143, 47,124,125,124,161,209,104, 98,155, 72,254,110, 15,  7, 20,172,156,  5,
+193,211,107, 16,140, 97,224,231,174,129,105,251,107, 64,128, 31,118,191, 26,143,162,221, 55, 48, 33,117, 19,192,255,139,151, 21,
+ 49, 20, 65, 18, 46,129, 86,171,133,193, 96,128, 78,167, 67,110,110, 46, 62,252,240,195,122, 31,247,242,178,121, 80,174,185, 67,
+222,238, 90,213,246,249, 75,156, 60,111,138,146,225,106,155,173, 37, 39, 51, 51,147, 36, 36, 36,216,200,223,109,207,  4,159,207,
+ 39, 12,195,212, 85, 10,224,106, 44,192,166, 77,155,174, 38, 36, 36,244,221,188,121,243,200,163, 71,143,250,142, 30, 61,250,164,
+141,252,173,  6, 36, 68, 34, 17, 87, 84, 84, 36,216,183,111, 95,215,192,192,192, 83,195,134, 13, 43,168, 79,214, 51, 83,158, 97,
+ 59, 71,117,209, 12, 25, 50, 36,254,226,197, 63, 31, 81,107, 53,173, 57,198,196,128,130,137, 49, 82, 70,163,209,168, 87,163, 76,
+205, 26, 13,154,210,226, 50,230,231, 61,123, 83, 90,  5,135,148,211,180,206,161,249, 94,159,245,175, 80, 40,248,  0,224,231,231,
+215, 98,135,  5,168,134,172,255,173,255,122,215,162, 53,151,221,174,117,207,213, 88,128,137, 19, 39,198,174,123,121, 53,  0, 75,
+192,223,174, 93,187,100, 54,210,183,173,  9, 16,247,205, 83,  0,128, 51,169,191,217,226,  3,254, 42,212, 84,198,146,146,146, 26,
+107,223, 70,250,118,133, 11,141, 70,  3,131,193, 96,215,137,252,117,105,156, 61,219, 18,251, 97, 98, 24, 92,188,120, 17,191,159,
+ 57,131,190,125,250,194, 96, 48, 64,175, 55,192,160,215,227,219,111,190,129,237, 57,103, 26,122, 90, 90, 26,122,116,239,  1,147,
+201,132,171, 87,175,130, 49,209, 40, 45, 41,109,214, 60,181,157, 91,215, 44,176,173, 93,224,216,  3, 96, 50,130, 49, 91,220,254,
+ 39, 78,252,  6,173, 94,139,106,141, 26, 42,149, 10, 10,165, 18, 10,133,188, 73,138,152,205, 19,224,166,245, 15,  0, 56,114,228,
+  8, 52, 26, 13, 52, 26,181,245, 83,131, 86,193,193,232,214,189, 59, 46, 95,186,132,195, 71,142,184, 44,211,102,253,243,249,  2,
+120,121,121,193,199,199,  7,190, 62, 62,240,241,241,130, 92, 33,143, 77, 78, 78,206,113,170,205, 53,193,213,223, 16,206, 21, 84,
+193,116, 97, 41,170,112, 12,100,220, 42,144, 97,255, 70,193,202, 89,120, 50,245,107,136,  5, 20, 32,224, 91, 14,119, 88,199,205,
+161,128,210,241,159, 33,104,203,120,232,116, 58,  4,  5,  5, 65,161, 80, 64,161, 80,224,248,241,227,184,125,251,118,141,155,184,
+230,249,210, 82,188, 26, 40, 65, 43,175,138,198, 44,224, 88,123, 82, 77, 72, 72,136,177,187, 23, 83,231, 94,172,139,237,130,107,
+132,192,155, 99, 70,129,203,150,127,125,239,155,153,153, 73,182,109,219, 70,154,248,190,181,148,  0,119,200,223,134,247,222,123,
+239,252, 83, 79, 61, 53,109,197,138, 21, 93,207,157, 59, 55, 76, 34,145,240,158,124,242, 73, 34, 18,137,192,178, 44, 25, 55,110,
+220,249,249,243,231,247,233,213,171,215,238,151, 94,122,233,185,151, 94,122,169,193,177,168,228, 57,201,236,159,151,174,158,234,
+213,187,207,179,167, 78,158,156,188,123,207, 79, 31,228,157, 60,217,250, 98,254,101,241,213,210,  2,238,219,213, 63, 72, 86,164,
+173,236,145,189,103, 79, 90,167,142,157,126,246,  9,243, 62,178,105,211, 38,179,179, 57, 58,122,244,104,156, 58,117,170, 95,122,
+122,250, 82,131,193, 32, 88,182,108,217, 71,187,119,239,158, 90, 90, 90,250,151, 19,135, 83,101,212,208,141,224, 27,133,144,  3,
+ 53,214,191, 13, 35, 67, 66,176, 10,151,157,183, 58,172, 46,254,203,167, 47, 34,160,107, 43,196,125,243, 20,118,205,248, 81,102,
+211,222,108,228,111,179,254, 93,153,101,176, 99, 69,191,230, 97, 88, 66,112,233,210, 37,216, 42,107, 93,247,178, 64, 32,128, 64,
+ 32, 64, 69, 69,  5,198,141, 27,247, 32,202,137, 72,165, 82, 46, 61, 61, 29,131,  6, 13,130,193,104,132,222,160,135,193, 26,220,
+164, 55, 88,134,  1,214,174, 93,139,185,115,231, 58,234, 76,184,212,212, 84,152,205,102,156, 62,125,  6,  2,190,197,109,219,185,
+115,103,220, 40, 44, 68,105,105, 41,182,108,249, 30, 83,167, 62,  3,  0, 92, 29, 79, 64,131, 29, 80, 70, 70,134, 16,  0,147,156,
+156,204,214,103,  1,185, 50, 85,209,102,249,231,230,230, 66, 91,173,171, 81,192,212, 26, 53,212,106, 21,212,106,247,134,  0,236,
+173,255,169, 83,167,214,120,  0, 92, 85,  4,166, 78,157, 90,235, 60, 74, 42, 69,183,238,150,160,184,203,151, 46,225,134,213,227,
+ 49,117,234, 84,151,163,246,135, 62, 60, 20, 34,161,  8, 18,137,  4, 98,177, 24, 34,145,  8,101,101,101, 78,147,191,157,181,223,
+172, 21,112,242,135, 27,176,  3,192,216, 21, 79,128,203,124, 11, 36, 49, 13,231, 10,170, 64,130,  2,113,173, 68,109,177,254, 93,
+ 28,  2,176,107,127,196,166,  8,216,159, 59,132, 94, 15,240, 44,198,222, 93,247,190,133,232, 77, 38, 19,190,248,226, 11,140, 28,
+121, 55, 46,236,224,204,112,160, 92,135,174,123, 21,232, 23, 18, 89,175,200,122,162,220,237,135, 60,101, 14,158,117,150,176, 73,
+ 19, 60, 10,141,121, 35, 92, 86, 36,238,247,251, 90,149,128, 38,207,  2, 88,177, 98,197,150,121,243,230,133,156, 61,127, 62, 81,
+175,215,247,145,201, 14, 73, 68, 98, 17,159, 34, 20, 14, 29, 58,228,219,163, 71,143, 77,  9,  9,  9,255,158, 60,121,178, 67,107,
+ 61,231,208,  1,118,194, 83, 19, 14,247,237,219,127, 33,205, 24,199, 94,203,191,250,  1, 91, 88,192,  0,224,196,160, 76,189, 59,
+117,205, 12, 13, 13,217,203,227, 11,191,253,207,226, 20,250,147,101, 31, 59, 44,165, 65,131,  6,125, 60,122,244,104,  0, 64, 69,
+ 69,  5,178,179,179,253,190,250,234,171, 15,  0,224,212,169, 83,131,122,246,236,185,255,111,161,  0,216, 22,254,121,244,219,205,
+142, 44,123, 87,166,  4,146,157, 11,183,114,  3, 22, 14, 65,112,239,214, 53,164, 95,227, 78,189, 80,134, 51,169,191,185,234,182,
+106,174, 57,169,  4,  0,215,189,123,119, 92,184,112,161, 22,177, 40,149,202,  2,  0, 29, 93,212,230,239,167, 39,224,158,223,252,
+246,155,111, 97, 48, 24, 96,164,141,160,105, 26,169,169,169,141, 45,146,195,165,166,166,214,156,176,172, 25, 98,137, 15,244,122,
+  3, 46, 93,188,  8,190, 64,  0, 19, 77,195,203,219, 11, 91,182,108,  1,143,199, 67, 98, 98, 34, 30,125,244, 81,174,170,170,225,
+  0,175,212,212,212,253,201,201,201,116, 70, 70, 70,168, 45,111,234,172,  3,224,146,107,115,225,194,133, 56,118,236, 24,170,171,
+171, 81,173,213, 66,163, 86, 91,201, 95, 13,141, 90,131,106, 77, 53,180,118, 29,190, 51,121, 23, 29, 29,205,229,229,229,213, 88,
+255,245, 77,  3,116,118, 17, 32,235, 92,252, 90,101, 97, 35,125,219,216,163, 43,171, 20,218, 86,248,  3,  0, 31, 47, 31,136, 37,
+ 98,104, 52,154, 88,219,208,142, 27,228,127, 95,230,107,219,148,128, 73, 43,190,  2,183, 29,104, 53, 51,  3, 57,175,199, 99,120,
+202,119,128, 64,  0,111,113,211,198, 57,235, 42,  2,  0, 48,245,216, 84,  7,223,186,131,222,251,189, 80,246,147, 14,138,229,119,
+175,154, 76, 38,140, 24, 49,  2,  0, 16, 30, 40,193,175, 25,237,177,242,195,155,248,236,140,222,145, 69,108, 63, 45, 14, 13,253,
+111,247,108,142, 27,125, 86,115,205,173,111,142, 49,255,251,249,190, 53, 74, 64,115,212,191, 79, 63,253,244,211,231,103, 62,191,
+239,161,129,209,131, 52,106,117, 16, 99,102,140, 97, 97, 97, 21,225,225,225,101,106,181,250,220,228,201,147,157,238, 20,126,250,
+241, 39, 22,192,150,103,167,191,152, 59,108,248,240, 31, 37, 18,137, 63,  1,199, 18, 66,192,178,156, 74,175, 85,200,174,156, 47,
+214,120,139,132, 78,245,243, 54,242,  7, 44,129,212,117,  3,245, 62,252,240,195,127,255, 45, 20,  0, 43,169, 59, 44,176, 93,187,
+118,185, 92, 89,207,164,254,198,  1,128, 77, 17,176, 35,254,230, 36,116,183, 27, 82,239,222,189,113,234,212, 41, 84, 84,212,184,
+  8, 59,  2,128,141,252,102,204,152,241,160,203,171, 86, 30,165,167,167,115,207,206,120, 22,107,215,174,179,142,153, 51, 88,184,
+112, 97,163,211,151, 92, 92, 65,207, 98, 57, 29, 60,232,104,179,137,238,169,169,169, 87,147,147,147,203, 51, 50, 50,120,201,201,
+201, 53,  1,129,214,105,129, 78,119,116, 54,139,121,216,176, 97,205,158,119,209,209,209,156,189, 21,111, 31,  3,224,198, 10,128,
+  4,  0,183,101,203,150,123,172,124,171,135,192,229,250,188,101,203, 22,226,170,199,192, 25, 52,230,250,119, 85, 89,152,252,225,
+  6,192,110,225,159, 81,239,222,157,142,172,109,174,130,178,243,  0, 56, 90,  9,176,116, 88, 41, 74,  1, 12, 88, 25,136,229,167,
+187, 32,  4, 64, 69,129, 22,157, 58,117,178,144,198,242, 64, 60,246, 80,  8,162, 30,203,119,214, 34,118,122,120,211,250, 44,113,
+183,191,105,166, 62,175, 73,178,254,162,247,109, 54,108,216,184,225, 42,128,171,205, 37,239,219,239,190, 44, 68, 51, 68,133, 54,
+103, 96,158, 21, 11,254,138,252,252,171, 55,  3, 34, 19, 39, 78,140,217,149,218, 34,247,  2, 32,  0,184,135, 30,122,  8,123,247,
+238, 53, 88, 73,159,  5,224,117,159, 60, 15, 77,134, 45, 72,112,238,220, 57,156,213,242,127, 32,105, 91,184,112, 97,100,125,110,
+ 73,187,105,132,174, 88, 59,228, 62,151,113, 77,122,154,186,236,111, 67,171,242,185, 74,226,142,214,246,111, 14, 52,101, 72, 96,
+209,162, 69,184,126,253,122,179,165,197,153,229,125, 93,197,153,183, 21, 56,  3, 75, 96,232,200,  4,  9,126, 57,209,  5, 97, 94,
+ 62,248, 51,239, 14,186, 58, 73,254, 78,212,191,150,186, 28, 46,185, 79,223,245, 44,207,238, 28,218, 54,179,188,180,191, 42,225,
+127,249,110,128,117, 61, 12,110,120, 18,238,187, 18, 48,110,220, 56,241,223,172,  2,186,101,217, 55,215,111,103,100,100,216, 86,
+168, 97,146,147,147,155, 58,149,201,131,230, 39,255, 38,149, 69, 74, 74, 74,179,148,101, 70, 70,  6, 63,121,120,242,125,175, 23,
+ 71, 50,245, 56,146,153,223,226,219,172,167,102,122,240,192, 43,161,187,251,  8,123,224,129,  7, 30,120,224,129,  7,127, 95, 80,
+158, 44,240,192,  3, 15, 60,240,192,  3,143,  2,224,129,  7, 30,120,224,129,  7, 30,120, 20,  0, 15, 60,240,192,  3, 15, 60,240,
+192,163,  0,120,224,129,  7, 30,120,224,129,  7,255,  8,212,154,  5,112,246,236, 89,183, 35, 83,235, 11, 38,244,200,243,200,243,
+200,243,200,115, 82, 94,163,211, 68, 91,128, 60, 79,249,122,228,213,194, 43,175,188,210, 14,128,  2,128,208,186,213,121,139, 74,
+159,199,  3,224,129,  7, 30,192,223,223,159,242,247,247, 39,254,254,254,  2,  0,188,150,150, 62,219,190,243,118,251,207, 55, 21,
+245,173,143,239, 65, 11,194, 19, 79, 60, 17,243, 15,120, 13,219,218, 87,146,191,235, 11,120, 20,128,127, 56,154,176,221,186,203,
+136,139,139,139,177,118,186, 53,135,245,218, 63, 82, 94, 11,  7,137, 12, 11, 35,  0,160, 82,169, 88,149, 74,197,169, 84, 42, 19,
+  0,179, 59,194, 94,126,172,119,201,172,177,189, 39,  2,192,172,177,189,191,121,249,177,222,235,  0, 96,225,164,135,200,194,167,
+163,  5, 47,143,233,229,214,154, 34,246, 75,209,102,102,102,214,218,124,167, 41,228,111, 87,239,155,115,173,253,166,202,108, 14,
+121,220,125, 80,108,254, 82, 69,233,137, 39,158,136,217,187,119,175,236, 31,208,198, 12,176, 44, 22,119, 95,121,180, 77,176,136,
+234,220, 58,148, 31, 33,109, 71,133,  5,  4, 11,189, 69,130,102,251, 61, 62,254, 25,160,172, 90,152,222, 90, 32, 30,216, 41,  0,
+ 78,236,173, 98,  4, 32,106,234, 79,101,101,101, 33, 45, 45,173,214,242,127, 11, 22, 44,176, 53,116,226,142, 60,246,135,192,218,
+  5, 61, 37,171,165,200,107,241, 69, 31,229, 45,225,162, 58, 72,  1,  0,101, 52, 51,189,181,144,255,157,237,230,101,117,181,168,
+172,178,146,118, 70,208, 75, 99,122,229,155,205, 92,248,195, 67, 91,249,117,237, 58,236,128, 72, 68, 21,205, 73, 25,244,159,255,
+146, 11,184,163,210, 61, 33,224,147,159,  0,114, 17, 64, 79, 87, 19, 89,119, 41,218, 38, 46, 55, 91,139,252,237,234,190,187, 75,
+229, 18, 23,175,223,119,121,  9,  9,  9,182, 53,250, 29,190, 83, 66, 66,  2,151,153,153, 73, 92,200, 59,210, 12,114,156, 34,127,
+150,101, 65,  8,193,200,145, 35,185, 35, 71,142, 16, 23,203, 88,  8,192,212, 28,233,  9, 10, 10,154, 37,151,203, 63,119,243,235,
+126,  0,148,104,190, 85,176,107, 97, 88,159,126,212,179,225, 81, 98,101, 68, 43, 97,104,247,112, 62,159,132, 82, 58,149,138, 17,
+ 35,140,166,250,183,163,159,155, 48,134,110,234,111, 56,171, 73,132,  0,120,220,250,217,210,224,  7,224, 41,  0,233,214, 79,191,
+102,146,251,125, 75,179,176,221, 42, 96,202, 97, 17, 15,178, 54,168,208,166,144,205,252,249,243,239, 33,127,  0, 72, 75, 75,139,
+157, 63,127,190,203, 86,206,198,215,188,239, 33,107,  0, 96,127,  8,196,198,215,188, 31,168,188,212,212,212, 24,138,162,184,103,
+158,185,187,164,237, 43,175,188, 18,  3,128,139,136,136,224,218,181,107,199,  5,  7,  7,115, 79, 63,253,180, 83, 50, 55,164,126,
+ 20,115,156, 26,194, 45,141,142,175,177,126,215, 45, 93, 23, 51, 15,171,185, 57, 17, 27,184, 25,237,182,114,227,131,247,115,131,
+ 58, 44,115,202, 58,238,208, 46,172,117, 76,  7, 41,247,218,156, 25,198,229,111,189,200, 45,124, 97, 26, 90, 11,249,223,189, 59,
+251, 89,172,124,227,101,110,217,220, 23,216,110,126, 62, 70,  0,104,221, 58,152,111, 45,255,122,113,102,231,211,157,195,195,189,
+  2,158,153, 18,153, 54,113, 82,123,  1,203,177,210,144, 86, 34,239,143, 95, 63,145, 54,239,169,126,223, 62,254, 88,155,200,136,
+  8,239,226,127, 47,238,237,238, 54,153,246, 27, 69,185,180,105,148,  3,203, 31,205,224,  9,104,113, 30,128,204,204, 76,146,144,
+144, 80,243,189,132,132,  4,174,190,161, 19, 43,105, 59,173, 84, 52,148, 14, 59, 57, 77,238,232,236,201,127,193,130,  5, 24, 57,
+114, 36,247,235,175,191,186, 35,138,110, 70,227,181, 44, 40, 40,104,146,155,223, 13,183, 26,156, 82,  0, 72, 74, 74,138, 76, 74,
+ 74,218,147,148,148,148,107,119,236, 76, 74, 74,114,105, 27,229, 79,214,127,194, 79, 93,150,226,247,248,147,147,194, 21,  3,123,
+118,224,183, 13,239,168, 54,136, 59, 86,155,245,237,137,159,119, 91, 58,204, 20,198,148,221, 10,248,250,139,141, 66, 23,121,220,
+ 45,  5,160, 61,128,111,  0,196, 91, 63,219,183, 32,126, 11,  6,176,197,170,156, 28,  7, 48,214,122, 30,220, 12,178,167,192,137,
+241,210,150,174,  0, 56,129, 33,  0,174,  0,136,114,199,186,177,185,208, 35, 34, 34, 98,237,173,126, 59,203,191,230,158, 51,238,
+118,219, 51, 73,195,133,118, 86,186,  2,212, 20, 69,205,185,237,222,131,144,  7,  0, 39, 78,156,144,137,197, 98,228,230,230,222,
+163,108, 21, 23, 23,147,146,146, 18, 50,100,200,144,216, 61,123,246, 56,149,135,173, 79, 92,148,113, 98,  1,250, 84,  8,107, 89,
+195,132,226,176,174,248,121,242, 77, 73, 34,145,142,189, 16,203,220, 26,239,208,109, 26,211, 65,202, 69,  8, 37,183,223,124,117,
+186,177,157,143, 80,168,186,120,140,120,149,159,199,188, 17,157,209, 54, 64,130,242, 51, 71,201,157,211,199,168,  5,179,102,208,
+ 49, 29,164, 92, 55, 47, 95,147,181, 67,173, 23,173, 90,  9, 71,  9,133,148,248,248,241,219,243, 79,157,188,213, 61,172, 93,  7,
+ 83, 64,171,118,196,215, 23, 94, 29,162,188,162,130,130, 68,157, 88,142, 51,254,124,178, 92,251,  0,235, 48,103,111,241,219, 14,
+ 55,149,  0,174,158,207,186, 71,125,207,253, 85,242,106,148,  0,185,124, 52, 50, 50, 20,104, 10,249, 55,166, 84,212,145,211, 36,
+ 15,192, 19, 79, 60, 17,179,103,207, 30, 25, 33,  4, 20, 69, 33, 47, 47, 15, 71,143, 30,117, 75,150,217,108, 62,111,245,  0, 52,
+ 71, 60,139, 68, 46,151,239, 12, 10, 10,122,218,141,239,218, 60,206,154,164,164,164, 94,  0, 14, 28, 60,120,112, 92, 86, 86,214,
+ 16,219,145,157,157,253,148, 76, 38, 59,148,148,148,228,212,144,199,130, 69, 11,196,149,183, 42,130,245,156, 49,130,227,147,110,
+156, 72,212,157, 21,  8,187,179,132,234,204, 18,126, 39,134,199,139,100, 89, 18,174, 37,230, 80, 70, 72,  5,126,113,108,175, 88,
+252,100,232,125, 85,  0, 62,  1,112, 16,192, 60,235,231, 39, 77,200,236, 64,  0, 75,  0,236,177, 86,244, 61,214,243, 64, 55,229,
+ 29,  1,176, 23, 64, 50,128,245,  0,222,176,202, 60,210,196, 74,225,111,253,244,110,  6, 11, 27, 86, 11,107, 73, 99,150,214,  3,
+196, 67,  0,142,  1,104,109, 85,158,158,117,229,203, 89, 89, 89, 50,123,203,127,193,130,  5,178,180,180,180,216,180,180,180, 88,
+123, 37, 32, 45, 45, 45, 54, 43, 43, 75,230,140, 60,123, 75,157,154,162,192,213,189, 51,112,117,239,140, 90,164,205,254, 16,  8,
+119,229,217, 44, 77,119,228,165,167,167,199, 28, 63,126, 28,211,167, 79, 71,113,113, 49,146,147,147, 99,234,123, 70, 44, 22,203,
+218,180,105,227, 48,255, 50,210,211, 99,218, 28,255,  3, 37,211,135, 65, 88,172,194,231, 75, 62,142,169,109, 28,  3,233,233, 25,
+ 49,  2, 67,132, 44,168,141,222, 33,249,207,122,105, 10,253,175,249, 51, 56, 97,209, 25, 97,224,157, 11,228,194,109, 53,194, 67,
+188,241,112,143, 48,180, 85, 94,193,117,141, 30,124,150, 67,  0,225,  9,254,239,197,233,220,107,175,188,112, 37,166,131,180, 65,
+210, 81, 40, 53, 65,131,  6,249,164,245, 30,242,184,201, 55,168,163,200, 39, 32,148,149,248,120, 27,131, 90,  5, 27, 66,194,219,
+243, 21,114,141, 72,173, 98,160, 80, 25, 93,113, 99,199, 56, 67,156, 78,198,  3,220, 99,249,215,167,148,187,160,  4,144,122, 62,
+235, 30,245, 61,231,148, 60,110,107,224, 61,135,139,242, 26,202,211, 38,145,118, 93,165, 34, 35, 67,129,230, 34,127,138,162,184,
+125,251,246,201, 88,150,197,235,175,191, 14, 66,  8,142, 30, 61, 10,203,214,187, 44,113, 67, 30,104,154,254, 29,  0,211, 12,158,
+  0, 57,  0,200,229,242,237, 65, 65, 65,177, 46,126,151, 15,  0, 51,103,206, 20,  1,200,202,206,206,238,178,108,217, 50,166,174,
+ 18, 26, 28, 28,140, 67,135, 14,197, 36, 37, 37, 57,212,202,120, 68,224, 71, 51, 92, 91,163,209,212,197,204,178,189,204, 44, 59,
+192, 76, 72, 47,240,120,237,  9, 33,109, 64,120, 97, 44,135,  8,142,102,219,169,245,166,144, 80, 63, 70, 72, 13,210,220, 55,  5,
+ 32,220,106,241,175,132,101,156, 99,165,245, 60,220,141,223,154,  1,160,216, 90,153, 22,  1,  8,178,126, 18,235,117, 87,247,218,
+253, 55,128,107,  0,214,  1, 16,192, 50,134,205,  0,248,204,122,189, 41,251, 47,143,  4, 80,  1, 96, 84, 51,145,236, 11,  0,222,
+183,126,182, 52,244,  4,240, 35,128, 71,173,158,148,158,238, 10,178,145,191, 61,233,219, 43,  1, 46, 87, 78, 43,249,219, 80, 87,
+  9,112, 71, 94,157,206,140,184, 42,239,240,225,195,160,105, 26,  3,  7, 14,140,237,214,173, 27, 10, 11, 11,107,222,143,101, 89,
+ 72,165, 82,110,241,226,197,178,227,199,143, 99,220,184,113, 14, 59, 20, 67,238, 41, 80, 52,  3,229, 64,105,172,177, 91, 48,174,
+109, 56,124,151,180, 88, 14,115,164, 27,184,195,139,131,101, 55,142,251, 35,238,249,171,142, 59, 40,138, 87, 93,113, 33,151, 45,
+ 83, 26, 80, 85, 77,115,241,253, 34, 56,127,137, 16,183,148, 90, 84,168,244, 72,236, 31,193, 81,132,112,191,253,180, 31,170, 35,
+ 39,184, 51, 59,127, 46,106, 76, 92,238,239,109,231,132,132,250,117,108, 27, 17,197,120, 73,216,142, 35, 31, 79,244,233, 48, 48,
+121,124,235, 46, 79,198,  5,181,141,238, 43,175,110, 29,111,162, 77,166,235,  5, 90,167,134,222,172,  4,229, 84,157,200,204,204,
+148, 57,152, 25, 80,239, 61, 39, 98, 94,254, 17,179,  3,146,147,  3,145,156,124, 87,185,181, 17,119,115,144,118, 61, 10,140,219,
+150, 63,199,113, 48,153,238, 14,217, 15, 31, 62,220,214, 94,220,149,109, 18,  8,  4, 38,150,101,143, 91, 61,  1, 77, 81,  2,106,
+134, 62,229,114,185, 44, 40, 40, 40,217,133,239, 22, 38, 38, 38,250, 29, 62,124,120, 69,118,118,118,235,175,191,254,154, 93,188,
+120, 49,127,243,230,205,232,210,165, 11,  0, 32, 50, 50, 18, 42,149, 10, 75,151, 46, 53, 31, 58,116, 40, 62, 41, 41,233,213, 70,
+ 37,178,140,191,217,204, 68,154, 25,115, 79,147,217,212,159, 71,145, 40, 33,159, 18,137,  5, 60, 53,223, 75,120,219,219,151,119,
+135, 39,230,140, 98, 30, 47,136,207,208,109,110,156,249,221,119, 70,200, 39,110,199,189, 57, 82,  0, 30,179, 90,135,246, 56,102,
+189,238, 10,166,  1,120, 29,150,177,146,247,  1,252,  1,203,252,201, 63,172,231, 82,235,253,105, 78,202,243,  2, 48, 11, 64,146,
+245,220,104,119,192,122,125, 22,238,221,202,215, 89, 76,  1,240,149,245,179,169,120, 30,192, 28,107,158,205,177,158,183, 20,116,
+178,186,176,126,  6, 48, 23,192,108,  0, 49,240,160, 65,148,150,150,202,  6, 15, 30,140,217,179,103,231, 12, 30, 60, 24, 39, 78,
+156,192,250,245,235, 99, 90,183,110, 45,163, 40, 10,133,133,133,164,178,178,146,188,246,218,107,177, 71,142, 28,145,189,244,210,
+ 75,141,146,205,208, 27,183,100,101,131,187, 35,121,246,236,156, 63,195,204,177, 61, 85, 65,178,140,245, 25, 49, 22,237,  4, 88,
+ 87,248, 60,217, 82, 25, 79, 70,190, 86, 26,123, 52, 83, 42,139,125,120,101,131,229, 83, 66, 51,171, 62,255,124,115,208,246,243,
+165, 55, 55,159, 41, 86,110, 56,126, 93,123,163,204,192, 81, 28,  5,131,206,140,138, 10, 26,121,197, 10,243,174,194, 82,205,158,
+ 91,101,202, 29, 69, 37,151,143,149,149,143,185,105, 52,125,212,144, 76,191,192,240,118,250,106, 69,219, 30,209,143, 80, 52,137,
+ 28, 89,122,249, 71,125, 96,144,183,164, 67,247,126, 21, 28, 83,113,158,240,252, 66, 88,150,229,221,185,163,119,198,139, 87,215,
+ 53, 93,159, 27,188, 86,148,187, 19,227,207,164,174,165,111, 59,238,  7,161,181, 20, 52, 22,148,103,231,206,111, 18,154, 67, 78,
+117,117,181, 12,  0,248,124, 62,222,122,235, 45,228,229,229,193,205,113,127,123, 24,  1, 24,141, 70,163,177,180,180, 52, 11, 77,
+ 11,  8,212,212,114,  7,200,229, 25, 65, 65, 65, 19,156,245, 20, 27, 12,134,254, 11, 23, 46,124,242,149, 87, 94,225,122,247,238,
+ 77,  0, 96,201,146, 37,200,207,183,236, 70, 57,100,200, 16,176, 44,139,225,195,135, 83,211,166, 77,227, 46, 95,190,188,238,249,
+231,159,127,222,203,171,126,106, 98, 89,206,144,115,240,224,182,194,194,235,207,155, 77,230, 48,158, 64, 98,224, 17,177,138, 18,
+  9, 85,148,216,171,156, 22,120, 85,130, 18,221,102,197,102,131, 70, 85,213, 74,182,251,236,123,230, 83,191,187, 29,247,230, 72,
+  1, 24,  3,224, 80,157,107,135,172,215,157,  5, 15,192,187,  0, 18,  1, 84, 53,240, 76,149,245,254,187,112,110, 92,103, 26,128,
+  3,  0, 84, 13,220, 87, 89,239, 79,115, 35, 79, 30,129, 37,134,224, 67,235,231, 35, 77,168, 92,241, 86,175,201, 16,107,122,134,
+ 88,207,227, 93,148, 19,  8, 32,192,137,195,213,161,148,161,  0,157, 16, 39,240,  0,  0, 32,  0, 73, 68, 65, 84, 78,226,110,  4,
+112,145,213,211,227, 86,156, 71, 93,139,191,174, 71,192, 85,176, 63,  4,162,243,184,111,106,206, 59,143,251,166,222, 64, 62, 87,
+228,213, 33, 19,206, 21,121,107,215,174,229,242,242,242,112,250,244,105,180,107,215,142,251,229,151, 95,160, 86,171,113,233,210,
+165,123, 44,218,119,223,125, 55,167, 71,143, 30,177, 91,183,110,109, 80,222, 23,107,215,114,237,243, 46, 32,244,116, 62,100,237,
+198,113,189,175, 48, 50, 74,109,130,249, 82,245, 61,207,190,249,238,139, 57, 17,209,167, 99,139,254,152,210,160,245,124,173,164,
+228,237, 18,154, 89, 85, 81,169,151,210,122,115, 96,254, 45,181,207,158,203,165, 85,198,200,190,232, 17, 26,  4,  0,216,115,246,
+ 14,191,160,172,218, 15, 64, 96, 25,109,232,113,211,104, 74, 40, 40, 45,125,187, 33,153,163,198, 39, 82,221, 70,126,208,155,209,
+254, 81, 28,209,125,180, 68, 32, 48,211,215,254,200, 82,150, 22, 95,186, 83, 94,252, 91,177, 90, 94, 10, 80, 20,145,107,104,255,
+ 89,137,253, 29,213, 27, 82,135, 84,234,115,171,215, 10,  4,180, 62,255, 87, 69,227,255,237, 96,111,245,215,245,  8,184,235, 85,
+  8, 10,202,110,178, 28,  0, 24, 57,114, 36,119,248,240, 97,176, 63,  4,128,227, 56,124,252,241,199, 56,114,228,136, 77, 81,115,
+187, 12, 20, 10,133,145, 16, 50,226,212,169, 83,134,240,240,240,184, 38,122,117,  2,  0,203,108,  0,235,231, 12,  0,108, 80, 80,
+144, 51,134,154,106,247,238,221,165,251,247,239,255,106,243,230,205,228,232,209,163,100,244,232,209,156,141,252,  1,203,118,247,
+ 34,145,  8, 69, 69, 69,216,183,111, 31,  9, 12, 12,100,134, 13, 27,246, 43,203,214,111,180,119,142,234,114,123,200,144, 33,179,
+ 46, 94,252, 51, 66,173,213,132,113,140,201,  4, 10, 70,198, 72, 85, 27,141, 70,165, 26,101,183, 88,163,225, 78,105,113,153,241,
+231, 61,123,215,180, 10, 14, 41,162,105, 93,181,187,121,201,175,167, 97,216, 10,166,181,245, 56, 92, 71, 81, 56, 12, 96,  1,128,
+182,  0,202, 28,100, 62,129, 37,118,224, 56,128, 27, 14, 20,142, 27,214,231,230,161,225, 56,  3, 91,250, 38,  3, 72,113, 32,239,
+107, 88,134, 24,190,114,144, 62,251,138, 40,133, 37,206, 97, 32,  0, 53,128,247,  0,156,  6,208, 17, 64,161, 19, 46, 68,123,121,
+207,  0,120,209, 74,178,122,107, 90,245,214,243,116, 88,226,  1,190,119, 66,222, 12,  0,175, 56, 89,193,  9, 44,177, 16,223, 56,
+ 72,223, 42,  0,190,176,196, 58,236,182,166, 77,108,213,164,255,  0, 48,216,234, 17,248, 21,119,227, 53,234, 69, 92, 92, 92,172,
+ 61,209,219, 43,  1,117, 99,  3,226,226,226, 98,179,178,178, 26,125,129,184,184,184, 88,106,202,221,113,123,246,135, 64, 80, 86,
+ 37,160,238, 88,190,219,242,166, 40, 56,119,228,157, 61,123, 22, 17, 17, 17,184,124,249,114, 77,157, 25, 54,108, 24,151,155,155,
+139,241,227,199,223,235,166,242,242,146,137,197, 98,168,213,234,122,229, 73,207,158,133, 50,162, 13,250, 93, 62, 81, 35,239, 77,
+191,199, 98,162,114, 85, 50,106,188,248, 30,197,169, 56,159,134, 72,108,178,212,204,134,149,128,133,104,215,238, 55,  0, 67, 56,
+112, 60,220,168,120, 67,199, 48, 96, 12, 22,231,216,197,138, 10,220, 48,208,155,248,132,104, 64,136,169,160,180,116, 91, 99,249,
+215, 86,218,109, 33,128,212,252,163,243, 11,197, 97,147, 21,165,101,226,118,101, 37,167,196, 16,  4,117, 42, 44, 50,135, 87,149,
+221,132, 80, 40,  8,237, 25,230, 61, 77,169, 49,125, 11,224,166, 35,203,213, 58,247,223,225, 48, 64, 66, 66, 66,108,102,102,102,
+142,203,236, 94,103,  8,224, 31, 16,168,219,100,175,128,139,223,231,154, 42,111,212,168,145,156, 76,150,  3,178,205, 18,143,125,
+ 96,177, 47,198, 44,215, 96,228,200,145,112,113,218,223, 61,176,141,213, 63,252,240,195,186,102, 80,232, 20, 65, 65, 65,211,237,
+140, 83,163, 92, 46,223,227,228,119, 25,  0,229,187,118,237,146, 61,245,212, 83,209, 43, 86,172,232, 99, 54,155,137, 68, 34, 65,
+ 92, 92, 28,126,249,229, 23,176, 44,139,113,227,198,113,243,231,207, 39,253,250,245, 51, 78,158, 60, 57, 50, 33, 33,225, 78,191,
+126,253,234, 87,192,230, 36, 51, 49,143,140,217,212,171,119, 31,255, 83, 39, 79,174,252,157,207,239,213, 33,178,195,151,126,193,
+ 33, 37,130, 16, 49,119,120,223,161, 64,185,162,106, 68,120, 80,200,251, 93,186,116, 57,236, 19,230,189,254,147,101,159,211, 13,
+201,115, 85,  1,224,  1,136,  6, 48, 12,192, 50,  0,175, 89, 43,131,119, 29,242,251,  6,150,113,246,127,193, 50, 36,144,215,136,
+135,225, 33,171,245,235,140, 59,254,184,213,187, 64, 53, 34, 47,  4, 64,164,149,152, 27,147,121,218,250, 92, 40, 44,227,249, 13,
+201, 19, 90, 45,231, 36, 88,166, 17, 62,  3, 32,223, 42, 59,223,122,190, 25,150,113,242, 77,176, 12, 93,208, 14,228, 77,  1,240,
+  5,128,110, 86, 37,201, 62,157,183, 97,  9, 90,188,108,125,246,  7,  7,242, 94,135,101,118,131,206,137,252,243,  2,176, 31,192,
+119, 14,202,227,105,  0,255,177,126,254,110,151, 62,129,181, 44, 51,  1,172,  1,176,220,122,255,118, 67, 63,152,149,149,149,  3,
+  0,197,197,197, 50, 91,180,127, 93,171,191,184,184, 88,102,255,108, 99,176, 61,179,233, 87,186, 38, 58,191,174,149,190,233, 87,
+ 26, 15, 66, 94,110,110, 46, 70,140, 24,129,203,151, 47,223, 37,113,169, 52,118,235,214,173,178, 14, 29, 58,196,178, 44, 43,139,
+140,140,228, 88,150,133, 94,175,199,207, 63,255,140,232,232,232,216,125,251,246,213, 43,175,107,110, 46,190, 15, 14,173,149, 87,
+221,231,142,129,118,229, 77,224,209, 80,112, 44, 48, 39,242, 43,174,154,245,129, 92,239,  7,121,126, 16,250,142,216, 29,123,105,
+ 71,227,110,246,107, 37, 37,219,  1,108,239, 24,209,182, 43,128, 55,140,102, 22,219,206, 23, 98, 68,152,101,184,147,112,156, 70,
+195, 48,203,202,203,203,239, 56, 65,166, 43, 57,142,243,206,191, 44,127, 86,121,122,107,171,242,219,114,148,223,209,128,207,175,
+242,174, 86,112, 80,170,205, 92,104,136, 48,128,207, 98,146,222,104,254,126,217,235, 15,  7,252,235,147,227, 74,  7, 68,147,227,
+ 68,167, 77, 92,137,100,191,  7,163,173,158,151,236, 68, 87,191,105,243,134, 57,138,202,183,127,142, 56, 43,143, 36, 42,208, 68,
+121,247, 88,236,153,153,153, 24, 56,112, 96, 75,210, 69,184,156, 57, 23,  0, 27,249,159,103,176, 65,102,105, 99, 77, 37,127, 91,
+221,224,241,120, 33,124, 62,191,252,248,241,227, 95, 62,252,240,195,238,174,243,  0,  0, 17,114,185,124,157, 85,177,152, 34,151,
+203,127,176,125, 58,227, 84,  4, 80, 13,160,114,197,138, 21,125,231,205,155, 87,122,246,252,249, 54,122,189,158,200,100,135, 32,
+ 18,139, 64, 17, 10,135, 14, 29, 34, 61,122,244,208, 37, 36, 36, 12,158, 60,121,178,195, 54,151,115,232,  0, 51,225,169,  9,107,
+250,246,237,223,129,102,140,143, 95,203,191,250, 34, 91, 88,240,  2,  0,136, 65,113,189, 59,117, 61, 21, 26, 26,146,195,227, 11,
+223,254,207,226,148,234, 79,150,125,236,118, 70,214,167,  0,188, 97,213,134,198,  3,184,  4,192,167,158,239,237,181, 90,236,241,
+176,204, 35, 79,106,196,253,223, 25,150,232,114,103, 20,128, 42,235,243,188, 70,228,197,  0,184,234,164,188,171,214,231,119, 52,
+ 34,111, 22,128,153,  0, 46,  0,152,111,125, 47,123,217, 50,171,245, 63,199,106, 13,111,180, 90,217, 13,201,155, 97,205,143,126,
+ 86, 47, 66,125,233, 84, 91,239,219, 60,  1, 27, 27,145,247,181,181, 83,240,114,178,243,250,218, 65,254,125,100,245,108, 28,176,
+ 42, 53,168, 35,251, 23,  0, 61,172,101,145,111, 85,164, 28,186,118, 87,175, 94,205,  1,144, 53,211, 66, 64,100,230, 26, 45, 55,
+115,141,182,158,133,123,220, 10,114,106, 22,121,127,254,249, 39,249,243,207, 63,107, 93,251,238,187,239,114,  0,144, 31,126,248,
+  1,  0, 72, 81, 81,237,152,186,134,200, 31,  0,218,255,249, 39,  1,106,203,123,249,131,  5, 22,114,252,208,154,166,186, 33,122,
+ 59, 92,232,133,205, 92, 33,248,  0,175, 26, 53,228,111,101,245, 59, 98,177,216,169, 69, 68, 56,142, 35,132,144, 37, 11, 19,123,
+122,133,181,139,156,192,194,171,115, 73,113, 25,207,100, 80,114,173, 67,125,136,143,183,128, 48, 38, 22, 10, 37,205, 16,  9,145,
+168, 52, 76,167, 70, 12,130,134,234,108,221,255, 31,164,139,222,126, 56,162, 33, 98,225,224,222, 44,128,230,144, 87,175,197,222,
+161, 67,  7,156, 62,125,186, 69,144, 63,251, 67, 32, 14,156,103,  0,  0, 27,101, 52,190, 63, 78,219,188, 48,164,185,202,199,108,
+ 54, 87,  1,192,128,  1,  3,154,180, 32,144,141,252,173,168,180,126, 58,187,192,142,208,106,152,157,  1,128, 79, 63,253, 52,252,
+249,153,207, 47,122,104, 96,244, 12,141, 90,237,207,152, 25, 83, 88, 88,216,157,240,240,240,171,106,181,122,249,228,201,147,243,
+157, 77,215, 79, 63,254,196,  0,120,237,217,233, 47, 14, 31, 54,124,248,120,137, 68,210,138,128, 51, 91,102, 78,112, 85,122,173,
+ 98,221,149,243,197,183,189, 69,194, 38, 45,124, 87, 87,  1, 48,195, 18,164,230,204, 56,252, 41,235, 97, 70,195,203,139,154, 97,
+137,168,119,118,190,166, 12, 64,182,  3,121,187, 96,  9, 90,115,  6,207, 58,145,190,207,  1,124,233,168,239,  7,240,170,221,119,
+ 26,147,247,141,213, 99,224,  8,133, 86,203,222,153,244,185, 50,223,245,115,  7,242, 30,117, 66,158,205,219,176,209,154, 55,206,
+ 44, 31, 75,226,226,226, 98,234, 70,253, 91,221,234, 57,238, 52,244,184,184,184, 24,187,149,250, 90,154,188, 22,143,235,165,183,
+141, 84,187,118, 27, 95, 89,153, 62,211,118,141, 22, 80,223, 25,116,236,254,178,226, 98,141, 83,153, 70,  8,247,159, 89, 67,200,
+123,159,255,182,240,231, 53,161, 59, 79,156,188, 61, 59,196,159,125,146, 10,242, 11,224, 56,128, 16,206,104,100,216, 50, 22,168,
+164,141,108, 64,233,109,189, 75,171,147, 89,221,252,178, 58,231, 45, 37, 11, 91,220, 74,128,127, 23, 60,182, 92,115,191,223,145,
+  5,208, 70, 44, 22,223, 30, 48, 96,192,163,103,206,156,105,178, 64,185, 92,126, 48, 40, 40,104,166, 92, 46,223,232,130,  2,192,
+ 88, 61,167,  0,128, 13, 27, 55,164,192, 50, 60,221, 44,248,246,187, 47,127,133,101, 40,246,190,160, 62,  5,192,224,142,214,215,
+ 72, 33, 25, 61,242,254,177,242,106,193, 74,164,164,206, 53,183, 43,103, 75,151,247,119,128, 92,167,123,  1,240, 50,  1,  8, 97,
+193,149, 26, 12,244,230,178,178,138,115,214,142,203, 41,188,247,249,111,220,143, 31,141, 37,227, 95,219,159, 11, 32, 55, 97,112,
+215, 55,130,130, 68,139,248, 60,194,221,174, 50, 92,185, 77, 51,155, 36,  2, 74, 44,225,243,120, 38,134, 21,187,146,190,204,204,
+204, 28,219,242,182,214, 79,183,148,177,123,166,254,217,185,254,157,152, 22,216, 88,189, 39, 46, 92,255,171,229,221, 55,197,167,
+ 41, 74, 24, 53, 69,  1, 66,  8,158,156, 56,171,222, 62,100,215,143, 25,205,245,174,101,  0, 72,115,144,191,157, 18,176,209,133,
+199,  3,173,237, 72,251,119,237, 31,248,245, 84,196,230,140,152,241,200,251,103,203,243,160,165, 43,  0,114, 57, 39,151,203,103,
+ 53, 85,206, 83,111,238,231,  0,224,217,145, 61,200,183, 71, 46,126,172,231,230,172,121,109,234,241, 30,180,150, 68,  5,  9,248,
+173, 64,136,206, 71,194,175,232,213,205, 47,127,219,  1,215,100, 91, 93,217, 77, 89,111,254,126,145,231,223,197,  3, 64, 90,146,
+215, 36, 35, 35,157, 75, 78,158, 77,118,253,152,241, 79,111, 94,225, 86,131,217, 23,150, 61,  1,254,118, 32,238,238, 35,236,129,
+  7, 30,252, 13, 53,126, 30,224, 37, 34, 96, 89, 14, 32,  4,213,122, 79,243,247,192,131,255,217,254,192,147,  5, 30,120,240,191,
+  3,198, 12,168,117, 78, 47, 59,239,129,  7, 30,252,131, 65,121,178,192,  3, 15, 60,240,192,  3, 15, 60, 10,128,  7, 30,120,224,
+129,  7, 30,120,224, 81,  0, 60,240,192,  3, 15, 60,240,192,131,127, 34,106,197,  0,156, 61,123,214,237,104,212,250,130,  9,235,
+147, 55,254,145,232,152, 94,125, 58,201,218,180, 11,143,213,232,181,178,195,178,220,216,172, 67,231,114,220,149,215,123,240,152,
+152,126,125,  6,203,238,148,150,194, 91,226,141,155, 37,  5,177,121, 39,246,186, 45,175,185,223,119,238, 52, 42,102,200,224, 14,
+ 50,137, 55, 15,124, 30,  5, 34, 38,120,114,234, 69,226,174,188,228,255,151, 27,243,208,224,135,100,254, 62, 60,128, 15, 36, 12,
+174,127,142,211,131,122, 95,143,188, 22, 43,175,209,169,102, 45,253,125, 59, 12,120,154,243, 99, 11,238,107,250,126,127,183,200,
+237,142,180,255,  7,145,247, 92,251,184, 85,169,219,242,222,168,188,119,195, 85, 79,125,254, 75,228,241, 81,207, 20, 89, 87,228,
+197,198,198, 70, 25, 12,  6, 69,110,110,174,242, 65,190,175,203, 10, 64, 67, 88, 29,131,206,  0, 58,192,178, 78, 64,193,252, 28,
+220,112,246,  7,198, 12,239, 16, 67,192, 34, 36, 32,  8,185,135,207,200,222,153, 59,  3,195, 70, 15,  3,163,213,201,122,116, 27,
+  9,150,133,108,222,139, 15,199,246,239,223,  7,215,174, 21, 65,165,212, 98,237,198, 35, 57, 13,201, 27, 56,226,153, 24, 14,  4,
+145,157, 58,200,146,223, 92,142, 23,158,121, 12,223,252,247, 51,  0, 98,236, 61, 87,  2,138,130,108,245,146,197,200,207,191,  2,
+169, 52, 18, 34,  9, 31,183, 74,242, 99,161,171, 63,201,139, 30,235,203,  9,133, 66, 72, 36, 18, 20, 20, 20,160,109,168, 31, 90,
+241,125,208, 54, 34,  0,129, 18,127,120, 19, 51, 40,138,  2,199,154,161, 19,241,161,186,163,194,164,255,102, 57, 44,168,212,133,
+125, 56, 95,137, 10,126,  1, 66,248,120,243, 33,148, 80,224,243,  0, 74,200, 71,206,207,209,156,137,227, 33,110,194,  9,167, 11,
+188,247, 83,171, 99,194,195,195,209,174, 99, 59,153,222, 96,  4, 37,146,  0, 38, 96, 78,218,169, 24,189, 78,139,175,254, 21,147,
+243,  0, 21,201,150, 54,143,249,127, 25,174,150,133,211,207, 39,188,179,200, 27,192, 67,173, 37, 94,255, 41, 45, 45,237, 38, 16,
+139,192,122,121,125,  8, 96,125,230,135, 41,213, 45, 37,  3,162,122,140,138,185,113,241,112,125,123, 13,252, 35,234,104, 70, 70,
+  6,249,102,211,166,203, 34,161, 80,194,178,172,191,183,143,143,207,132, 39,159,244,  2, 64, 39, 39, 39,115, 45, 52,205, 20,  0,
+ 36, 39, 39,179,205, 32,206,207,223,223,127, 65,215,174, 93, 39,139, 68,162,118, 37, 37, 37, 37,165,165,165, 39,105,154,254,  0,
+ 64,129, 27,242,  2,  2,  3,  3,151, 63,242,200, 35,143,135,133,133, 73, 79,157, 58,117,231,194,133, 11,199, 13,  6,195, 82, 88,
+ 86,136,117, 26,163, 70,141, 74,141,136,136,120,219,219,219, 27,190,190,190,167, 15, 28, 56, 16,253,183,241,  0, 52, 64,254, 60,
+111, 17,255,161, 25,195, 59,174, 98, 57,206,112,244,202,157, 79, 87,199,168, 14,204,207,193, 69, 71,223,149,223, 62,200, 25,171,
+229, 48, 85, 43,193, 55, 83,248,227,226, 21, 60,247,220,252,154,251, 20,  5,252,150,187, 17,173, 34,194,101,108,181, 26, 52, 75,
+112,232, 80,110,236,218,141, 71, 26,144, 24,201,157, 62,113, 17,196,203, 15,103, 46, 22,227,220,197,231,241,213,247,191,212,220,
+101, 89, 96,236,208,161, 64,117, 25,  0, 95, 20, 92,184,  4, 65,171,  0, 12, 27,210, 75,166,212, 53,162,179, 16, 10, 32, 20,250,
+245, 25,128,214,222, 66,180,109, 37,134, 95,112, 16,  2, 69,190,  8, 20,243, 32,224,241, 96, 50,155,161,100, 88,156,170,116,188,
+220,230,210, 87,219,115, 18,158,  2,126, 94, 94,  8,105, 21, 12, 63, 63, 47,112,148, 25, 12, 91, 13, 51,204,240,241,241, 66,171,
+214,237, 80,112,185, 11,215,177,219, 55,141,118, 74,253,227,215,112,254,190,222,240, 15,  8, 68, 72,171, 96,104,181, 90,  8, 69,
+ 98,  8, 12,150,197,249,162,164,145, 50,185, 66,137, 71, 94,220, 24, 91, 92,114, 11,138,178, 34, 84,157,203,112,164, 12, 56,221,
+ 73,140,158, 57, 58, 54,123, 99,118,142, 19,178,238,171, 18, 80, 88, 88,200,  1,128, 84, 42, 37, 45, 69, 94,120,120,248,115, 52,
+ 77,111,  4,128,201,177,177, 84,198,214,173,238,116,190,150, 53, 82,237, 28, 57, 28,199,129, 16, 82,243,105,187,102,123,206,193,
+ 78,106,174,172, 39,239, 10,249,247,240, 54, 49,219,125,  3,252,187,  1,128, 80, 34,  6,173, 55,128,213,234, 82,143, 31, 57,188,
+ 36,225,157, 69,221, 51, 63, 76, 41,118, 36,231,211,119,231,114, 86, 11,139,129,101,  8,146,181,246, 67,245,246, 69,125, 71, 61,
+142, 81,143, 61,225, 82, 25,221,184,120, 88,214,169, 87, 76,236,181, 63,114, 92, 87,138, 19,228, 46, 61,158,152,152,136,173,  9,
+217,141, 62, 19,155, 93,123, 43,146, 30,  1,150, 87, 45, 55,176,208, 51,150,114,213, 90, 63, 51,  6,  7,160,139,175,160, 81,121,
+171, 86,173,202,121,247,245,183, 66, 39, 78,158,228, 99, 48,232,177,250,227,143,168,181,107,215, 26,230,206,157, 27, 14,224, 86,
+115,183,189, 73,147, 38,141,222,185,115,103,150,171, 74,212,204,153, 51,185,194,194, 66, 84, 85, 85, 97,197,138, 21,240,245,245,
+ 69, 76, 76, 12,164, 82, 41, 54,110,220,232,110,187, 27, 57, 96,192,128, 77,111,190,249,230,181,174, 93,187,110,236,223,191,255,
+165, 59,119,238,180,203,205,205, 29,240,194, 11, 47,236, 81,171,213,169,176,108,  0,231, 44, 98, 39, 79,158,156,153,146,146, 18,
+108, 50,153, 32,145, 72,224,237,237,221, 70,171,213, 62, 61,113,226,196,  9,231,207,159,159, 11,224,191,206, 10,139,136,136,104,
+187,104,209, 34,228,229,229,113, 26,141, 38,160,206,109, 30,156, 91, 85,181, 89,112,246,236,217,186, 94,  2,231, 20,128,213, 49,
+104, 15,203, 14,120, 60,  0,102,173,145,185,153,123,181,252,147,161,157, 67,231, 63,210,163,205,146,214,254,146,182,171, 81,182,
+  5,192,149,249, 57, 13,111, 82, 99,172,150,163,117,167, 71,177,252,237,201,216,104,199, 73,135,143,167, 67,171, 51, 98,220,232,
+249,120,120,216, 76, 60,147,248,  8, 36, 18, 17,104, 51,  3,141,142,150, 53, 92,201,138,  0, 26,152, 60,125, 61, 94,126,115,118,
+205,213,177, 15,199, 64, 44, 22,225,199, 67,191, 96,239,177, 92,108,218,240, 25, 12,122, 35,132, 60, 62,124,188,132,208, 86,149,
+196, 42, 75, 80,239,238, 99, 28,199,  1, 28,107, 57, 40, 22, 28,199,193, 72,139, 44,221,147,  8,224,104, 51,204, 60,192, 12, 51,
+204, 52, 11,198,220,184,  2,187,240, 69, 41, 23,232,199,192,207,215, 27,225,237,162,208,173,119, 39,248,250, 72,160,170,174, 64,
+ 89, 69, 25, 20,170, 59, 48, 25,  8,188,188,188, 16, 18, 50, 12,149,229, 33, 92,171,208,143,234,119,227,143, 92,204, 49,122, 29,
+244,124, 64, 40, 22, 66,175, 19,130,214,  9, 97, 16,139,192, 39, 12, 56,240, 96,208, 87, 67,175,211,160, 93,187,182, 50, 33,143,
+ 15, 57,212,  8,165,167,163,238, 26,243,117,177,114,211, 74,135, 21,232,237,164,183, 27,239, 43, 19, 18,106,237,239,158,144,144,
+ 48, 48, 40, 40, 40,159, 16, 98,224, 56,142, 31, 24, 24,232, 85, 80, 80, 16,108, 93,221,173,173,187, 21,121,238,220,185, 83,237,
+126, 35,198,221,213,226,234,101, 75, 66,184, 57,115,230,196,174, 93,187,214, 37,153,225,225,225,201,131,  6, 13,250, 96,120,191,
+126, 48,137, 68, 72, 75, 75, 99,103, 79,153, 18,151,254,195, 15,217, 46,254, 62, 86, 45, 89, 82,115,190,224,253,247,145,182,116,
+105,163,231,206,136,173, 67,238,156,117,179, 24,110,244,232, 14, 61,  1, 92, 79, 73,201,212,187, 72,254,185,189,123,246,244,179,
+181, 25,111,177,  4,183, 43,202,161, 86, 40, 49, 96,208, 96,175,159,191,218,144,157,240,206,162,158,153, 31,166, 56, 90,155,157,
+153,247,193, 90,254,179, 79, 79,224,119,150, 74, 89,171, 18,128,247,211,214,212, 86,162, 23,188,  6,  0,120,247,245,185,110,109,
+ 39,237, 22,249,219,144, 25,228,194,195,163, 93, 18,237,205, 39, 56,183,244, 69, 16,191, 86, 48, 95, 63,  7,227,245, 63,145, 47,
+215, 34,122, 95,185, 83,223,239, 63, 96,192,209, 89,211,146, 34,147, 94,122, 33, 32,243,187,239, 89,169, 84, 74, 45, 79, 73,133,
+239,146,229,248,241,199, 31, 75, 51, 50, 50,168,230,242,  2, 76,154, 52, 41,110,231,206,157,  7,118,238,220,105, 59, 31, 99,251,
+223,129,130, 18,115,224,192,  1, 89, 81, 81, 17, 58,118,236,136, 17, 35, 70,192,223,223, 31, 74,165, 18,183,110,221,194,141, 27,
+ 55, 48,102,204, 24,110,204,152, 49,177,111,189,245,150, 43,229, 52,233,145, 71, 30, 89,189,106,213,170, 45,253,251,247, 95, 77,
+  8,185,101,215,143,147,248,248,120, 31,  0,185,214,195, 41,121,115,231,206,221, 54,103,206, 28,234,244,233,211, 32,132, 32, 56,
+ 56,184,230,216,183,111,159,112,200,144, 33,159,221,188,121,243,132, 35, 65,147, 39, 79, 38, 59,118,236,224,138,138,138, 34,242,
+243,243,113,253,250,117,162, 82,169, 58,  2,224, 79,156, 56,209,188,107,215, 46,238, 65,146,191,237, 90, 93, 37,128, 95, 15,249,
+  7, 71, 71,  5, 39,245,139, 12,154, 78,  8, 17,112, 28,103, 98, 45,  7,109, 54, 25,244, 66,138,109,219,187,181,248,237, 86,126,
+ 29, 59,237, 60,117,227,251,213, 49,236,209,249, 57, 13,239, 22,  7,  8,209,163,123, 87, 80, 84, 14,242,149, 85,  0, 46, 65, 85,
+122, 21,  2,177,  8,187,246,124, 10, 93,165, 25,211,159,127,  3, 44, 11, 60, 57, 97, 40,204,124, 31,135, 47,151,159,127,  9, 44,
+ 11,140,235, 75,172,188, 18,  9,131,145, 70,252,216, 49, 16,  7, 80,216,180,121, 63, 40, 10,216,246,253, 70,148, 94,255, 51,118,
+223,150, 85, 57, 13,109,151,200,114,  0,203,178, 96, 89, 22,102,179, 25, 70,  1,  7, 19, 49,129,166,105,232,188, 12,  0, 43,  6,
+197,153, 97, 22,114,168,166, 13,208,170, 85,141,166, 45,196,199,  8, 62, 95,130,224,224, 96,116,234,212,  9, 97,173,  7,  3, 60,
+ 10,102,243,105, 80,156, 18,  6, 45,  3, 51,171, 69,217, 45, 57, 66,130, 43, 17, 28, 48, 12, 31,174,250, 57,230,251,111,239,149,
+ 37, 49, 48,224,140,149,128, 65,  4,154, 50, 65, 43,228,163, 90, 34,  0, 95, 32,  4, 88,111, 16, 30, 65,181, 86,  7, 69, 89, 17,
+ 10, 78, 31,131,188,184, 24, 44,203,130,226,120,110, 85,154,175,214,223, 85,156, 95,120,229,  5,199,253,100,237,213,199, 12,153,
+153,153,139,222,124,243,205,217,197,197,197, 20, 33, 36, 36, 35, 35,227,123, 88, 54,119,242,114,183, 34,207, 74, 72, 16,172, 91,
+183,110,243,157, 59,119,176,109,219, 54, 68,119,237,202,107,142,  6, 34,149, 74, 73, 98, 98, 98, 12,199,113,178,181,107,215,186,
+188, 97, 17, 77,211,233,195,173,117, 74, 40, 20,162, 75,151, 46,216,126,232, 80, 86, 72, 72,  8, 42, 42, 42,156,150,115, 31,183,
+170, 37,  3,  7, 14,228,108, 27,196,216,125,254, 57,106,212,168,210, 69,139, 18,252, 83, 82, 28,175, 30,151,240,206, 34,111,111,
+ 19,179,189,119,207,158,126, 60,138,194,171,207, 78,135,222, 96, 68,218,151, 95,194, 75, 34,129,193, 96,128, 65,175, 71,223,254,
+253, 58,255,242,221,119,115,208,240, 86,222, 53,125,206,210,  5,175,177,  0,168,171,133,133, 84, 93,194,175,219, 60,221,121,241,
+246,221, 70,198,222,188,124,132,139,123,242,197,216,172,221, 95,186,165,  8,216,239,218,199,109, 13,116,120,221, 17,122,  4,240,
+ 81, 84,109,198,225,184, 16,  8,230,103, 64, 61, 61, 10,252,192, 80,151,200, 63, 49, 49,177,204,164,213,221,122,233,213,217,237,
+223,121, 99, 33,214,110, 72,191, 56,104,192,128, 14,233,107,210,189, 94, 95,248, 22,190, 27, 58, 24,155, 55,111,158,  1,203,174,
+165, 77, 33,254,152,157, 59,119,202,108,100,159,145,145, 81,  0,203, 54,237,  7,157, 81,  0, 14, 28, 56, 32, 11,  9,  9, 65,255,
+254,253, 25,138,162,248, 22,239, 44, 11,129, 64,128,160,160, 32,180,110,221, 26, 55,110,220,192,129,  3,  7,100, 46,180,185,132,
+241,227,199,127,180,106,213,170, 53, 93,187,118, 93, 79,  8, 97,  1,124,  6,224, 49,  0, 71,  8, 33, 75, 97,217, 95,229, 45,  0,
+ 75,157,145,183,106,238,220, 31,134, 39, 36,144,221,187,119,131,207,231, 67, 38,147,225,220,185,115,232,212,169, 19,150, 45, 91,
+134, 94,189,122, 97,246,236,217,252,247,222,123,111,149, 35, 97, 59,118,236,224,  0,192,203,203,235,118, 64, 64,  0,196, 98, 49,
+132, 66, 97, 53,  0,198,129,199,238,190,145,255,172, 69, 31,214, 92,251, 60,229,157,122,149,128,250,102,  1, 80,124, 30,197,103,
+ 88, 78,163, 55, 49,183,  8, 33, 34, 31, 17,175,143,159, 16,209,146,158,163, 58, 34,246,101,160,219,  8,180,241,230, 38,205, 24,
+ 22,245, 78,144,159, 87,220,234, 24,248, 55,156, 28, 22, 60,158,173,207,246,  3,208, 14,254,225,227,161, 55, 27,176, 62, 99,  3,
+190,217,188, 13, 99, 98,135,  1,  0,116, 58,128,199,111, 88,148,196,171, 43,  0,192,108,182, 87,164,202,  0,228,130,226,137,144,
+244,220,139,136, 79, 76,196,207,123, 44, 68,230,229, 13,104,171,111, 55,154, 89, 38,240,106,200,223,196,152, 97, 84,155,160, 83,
+234,160, 52,209,144,235,104, 40,140, 26, 40, 53,213, 80,148,107, 32, 87, 26, 32,175,110,120,  9,245, 87,159,233,192, 17, 66,192,
+227, 17, 16, 74,  4,179,153,  3,163, 43,134, 86,121, 21,165,101, 42,200, 21,213, 80,105,204,144, 43, 12, 40, 41, 41,195,197,203,
+103,161, 84,157,197,224,  1,  3, 27,220, 27,157,  7,128,210, 24,160,191,118, 11, 85,127, 92, 66, 85,113, 17,212, 42, 57,212, 42,
+ 57,138, 46,158,198,241,204,175,144,187,117, 19, 42,174, 93,131,153,102, 45,173,137,247,151, 13,  3, 18,235, 65,199,199,199,119,
+ 95,190,124,249,155,109,218,180,209,110,219,182,173, 79,102,102,230, 79,  0,250, 91, 11,221,237,  5,167,132, 97, 97, 11,  0, 96,
+ 72,175, 94,152, 51,103, 78,249,169,203,151,179, 31,234,214, 45,166, 57, 18,191,117,235,214, 28,  0,100,238, 92,139,149, 57,119,
+238, 92,151,228,154, 68, 34,  0,192,246,237,219, 17, 26, 26,138,119,230,206,197,130,  5, 11, 16, 18, 18,210, 34,198, 97,109,164,
+159,145,145, 81,115,  0,192,225,195,135,195,  1, 76,112, 82,204, 67,  1,129,129,221,120, 20,133,231,227,227,161, 84,169, 81,114,
+251, 22,  4,  2, 62,248,124,203, 33, 16,  8, 32,146,120,161,163, 84,250,113,255,209,163,157,178,216,175, 22, 22,226,219,237, 63,
+213, 28, 54,188,159,182,  6,239,167,173,193, 94,217, 97,151,223,119,116,194,123, 49,  0,112,243,242,145,156,209, 22,242,151,161,
+133,172,118,116,254,235, 79, 80,254,242,  0,140,202,170, 64,143,  0, 62,120,126, 65, 96, 20,229,136,222, 87, 14,111,190,133, 31,
+120, 14,230,100,221,184,118,173,234,243,140,255,118,253,250,191, 95,227,211, 47, 63, 43,250,108,213, 71,239,191,249,218,188,  9,
+203, 63, 88, 14,137,175, 55, 70, 12, 25,134, 83, 39, 79,125,253,108,210,179,110,191,179,141,252,109,231,187,119,239,198, 67, 15,
+ 61,212, 17,192,116,103,221,254, 38,147,  9,  3,  6, 12, 96,205,102, 51, 95,165, 82,193,104, 52,194,104, 52,226,242,229,203,144,
+201,100, 56,118,236, 24,218,180,105,  3,147,201,132,153, 51,103, 58,147,214,169,137,137,137,159, 76,158, 60,217,111,253,250,245,
+126,132, 16, 33,128,195,  0, 84,  0,  6,  0,248,201, 78,241, 60,  8,160,151, 35,121, 59,223,124,243,135,  9,125,251,146,239,226,
+227, 81,250,251,239,248,232,163,143,216,159,127,254,249,255,221,188,121, 51, 84, 38,147,189,188,104,209, 34,152, 76, 38, 12, 27,
+ 54, 12,222,222,222, 67,157,205,191,128,128,128,202,214,173, 91,195,199,199,135,243,246,246,190,105,205,195,  7, 94,  7,237,149,
+129, 70, 61,  0,243,115, 80,177, 26, 21,233,191, 93,171,200,138,142, 10,142, 29, 40, 13,178,172, 35, 62,126, 25,126,243, 25,131,
+131,127,148, 99,104,207, 64, 60, 34,253, 25,190,191,124,208,127,108, 63,233,244,205, 71, 46,254, 81,159,240, 54,157, 19,  8,199,
+149,112, 19,159,155,143,  5,175,125,  6, 64, 14,203,178,201, 70, 68,118, 29,  0,177,136, 15,189,214,  8,208, 22,  5,193,215,215,
+ 23,229,242,  6,247,203,134, 94,119,133,  0,224, 46,254,246, 37, 40,106,109, 45, 35,129,213,255,  9,131,209,  4,137,143, 24, 16,
+ 90, 20,  4,141, 90,141,161, 67,135,226,200, 79,223, 53,108,142,176, 52, 88,150, 15,134, 97, 96, 52, 26, 81,205,231,129, 79, 83,
+192,109, 53, 24, 47,  6,102, 33, 11, 78,192,131,142,199,  7,163,213, 65,105,108, 56,214,201,215, 71, 11,134, 33, 48,210,102, 40,
+ 85,106,228, 95, 43, 70,201,237, 74,232,105, 19,212,213,114, 84,107,148, 48,152,105, 16, 62,129, 86,167,130, 90,119,  3, 69,165,
+ 42, 84,105, 26,222, 75,194,108,167,165, 49, 42, 45, 74,206, 94,194,157, 75, 55,160,214, 92,131, 70,169,  4,  7, 62,  4, 60,  2,
+142,  8, 64, 81, 22,175,175, 43,234,230,219, 73,111, 59, 53, 28,224,  0,119,  0,220, 89,188,120,177, 30,  0, 22, 45, 90,116, 42,
+ 37, 37,197,219,154,116,  3,128, 98,119,  5,175, 91,183,110, 69,124,124, 60,  0, 32, 42, 36, 36,212, 58, 38,206,107,206,198, 97,
+115,255, 91, 61,  1, 14,179, 47, 60, 60,124, 52, 77,211, 72, 75, 75,195,211, 79, 63,141,201, 99,198,220,237,232,207,159,183,120,
+130, 66, 66, 56,103,227,  2, 22,188,255,126,205,152, 63,  0,188,181,100, 73, 45,207,128,147,110,255, 90,176, 89,255, 54,210,183,
+ 33, 35, 35,  3,201,201,201,200,206,190,254, 45,128,239, 28,118,104,124,254,127, 12,180, 17, 60, 30, 15,151,175, 23,128,227, 56,
+ 92,204,191, 10,154, 54,129,  2,  1,159,207,  7, 33,  4,172,217, 12,189, 86,135,171,191,253,118,200,137, 60,164,236, 73,255,217,
+167, 39,216, 91,252, 20,  0,156, 56,115, 30,157,163, 34, 93,154,166,156,157,249,159, 26,107, 63,219, 98,249,219,134, 66,184,199,
+ 39,189, 24,187,111,167,123,222,128,102,129,252, 54,132, 17, 93, 80, 62, 71, 12,209, 35, 83, 97,206,219, 15,179,218, 18,111, 80,
+ 62,231, 97, 68,102,228,194,204, 54, 94, 85,186,118,238,218,214,203,203,219,235,211, 47,214, 25, 98, 71,141, 18, 14, 30, 58,228,
+187,  3,123,127,121,252,242,181,124,128,229, 32, 22,137, 48,108,224, 48,236,217,189,  7, 99,199,142,229,246,239,223,239,116, 87,
+ 80,215,234, 63,112,224,  0,174, 95,191, 78,  3, 16,158, 60,121,146,158, 61,123,246,180,140,140,140,103, 29,201, 41, 44, 44, 68,
+199,142, 29,  1,128, 42, 44, 44,196,185,115,231, 16, 25, 25,137,168,168, 40, 40, 20, 10,228,229,229,161, 67,135, 14,  8, 13, 13,
+ 69,100,100, 36, 10, 11, 11, 27,175, 40, 20,149,148,152,152,248,193,200,145, 35,125, 78,157, 58,229,199, 48,204, 75, 18,137,100,
+162, 94,175, 95,  5,203,214,231,176, 42,  0,107, 96,217,157,143, 70, 35,211,219,  5,  2, 65, 82,230,188,121, 27, 31, 14,  9, 33,
+ 21, 11, 23, 98, 40,203, 98,205,238,221, 92,169, 78,247, 34,238,110,203,190,241,226,197,139,235, 25,134,225,251,248,248, 32, 60,
+ 60,220,199,100, 50, 65, 32, 16, 56,122,125,175,210,210,210,174, 55,111,222,132, 86,171, 37, 10,133,162, 59,159,207,143, 99, 24,
+166,197,238, 56, 86,223, 16, 64, 24,128,142,147,162, 35, 94,109, 31,236, 61, 29, 38, 61,208, 53, 14,103, 66, 38,225,145,185, 95,
+ 65, 95,169,  4,207,207, 23,178,213, 73, 24,209,227, 55,  4,157,207, 26,  9, 32,162,161, 31,232,228,215, 14,127,156,223, 97,231,
+112,208,  2, 48, 89, 14,147, 17,124,150,  7,202, 74,226, 59,127,116,188,139,200,254, 11, 28,198,246,239, 85,199,  8,229,  3, 16,
+  0,  2, 49, 24, 98,134,213, 14,198,148,233,243,  0, 64,150,242,238,220,  6, 27,130,153,229,192,176, 20, 40,134,  1, 69, 27,161,
+163, 44,117, 71,207,227,193,155,209, 67,173,231, 64,  4,  4,102,179, 25, 58, 51, 80,174,109,120,183, 83,134,102, 97, 16,240,192,
+234, 24, 48,172, 10,154,106, 19,120, 68,  0, 35, 99,  2,205,209, 96, 76, 52, 32,100, 65, 17,128,136, 88,168,244,102,148, 85,232,
+160, 53, 50,245, 26,201, 20, 49,215, 12, 26, 17,114,119, 72,215,100,208, 67, 37,151,131, 34, 60,240,249, 28,192,241,193, 35,238,
+155, 58, 87,138,174,208, 93, 35,187, 10,157,113,251, 55,164,155,193,110, 15,237,148,148,148,  9,  0,110, 46, 90,180,168,191,191,
+191,127,128, 74,165, 42, 74, 73,113,125,135,204,185,115,231,190,176,110,221, 58,180,110,221,218,254,154,114,205,154, 53,217, 15,
+117,235, 54,250,212,229,203,  7,155,171, 33,204,157, 59, 55,214,110, 40,160, 49,242,143, 25, 52,104, 80,248,240,126,253, 64,124,
+125,145,146,146,130,133, 11, 23, 66, 32, 16,192,164, 80,192,223,223, 31,239,204,157, 91, 19, 23,144,156,152,232, 80,  9,168, 59,
+198,239, 40, 38,160,177, 17,133,186,214,191,  3,239,128,195, 42,163,144,203,187,249,248,250,162, 82,161,128,236,196,  9,240, 41,
+ 30,140, 38, 19,116,122, 61, 88,150,173, 81, 92, 24, 19, 13,218,104,116,102, 72,131,  5, 64, 89,135,  1, 88,187,138,111,176, 94,
+199,251,105,107,132,  0,208, 89, 42, 45,191, 81,191,109,225,146,151,170, 93,199,232,152,125, 59,191,116,197,221,220,112,  6,187,
+224,246,175,229,150,221,250, 95,244,123,238, 13,136,162,250, 88,250,138,202,219,200,151, 91, 20,127,209,208,241, 40, 54, 51,240,
+ 90,219,248, 80,179, 90,173, 14, 16, 73,196,232, 20, 21, 37,190, 81,114,179, 77, 85, 69, 21,166, 60, 59, 93,182,247, 96, 22, 86,
+127,152,182,109,231,222,221,241,157,163, 58, 35,233,233, 25,200, 61,115, 12, 99,199,140,225,246, 31, 56,224,240,157,237,173,254,
+  3,  7, 14, 32, 46, 46,206,166, 44, 10,111,221,186,133,217,179,103, 11,  1,192,153,216,130,170,170, 42,140, 24, 49,  2,102,179,
+ 25,133,133,133, 56,118,236, 24,122,244,232,  1,127,127,127,180,111,223, 30,253,250,245,  3, 69, 81,160, 40, 10,109,218,180,113,
+ 84, 79,123,244,234,213,235,147,161, 67,135,242,206,159, 63,239,103, 54,155,203,182,111,223,174,214,235,245, 41,  0,236,  7, 77,
+ 95,125,252,241,199,139,247,238,221, 27, 69,  8,185,141,134,119,180,237,159, 60,124,248,198,193,124, 62,169,248,224,  3,112, 38,
+ 19,100, 60, 30,155,171,211,205,132,101, 27,119, 27, 94, 89,188,120, 49,159,162, 40,200,229,114, 92,191,126,189,188, 87,175, 94,
+161,206,148,115,120,120,120,144,153,227,160,215,233,112,241,226, 69, 48, 12,211,162,103,158,240,235,144,127,231, 48,127,201,240,
+199,251,134,207,246,147,  8,  6, 49,102, 86,193,231,204,126,  8,104,195,187,173, 52, 64, 95,169,  2,132,124,152,149, 26,148, 40,
+104, 32, 56,  2, 20, 75,139, 27,115,241, 94, 83,171,209, 37,192, 15,140, 17,184,150,243, 45, 58,197, 60, 86, 99,192,153,104, 19,
+  4,160, 80,109,176,236, 80, 59, 54,102,  0, 36,193,225, 88,181,241,167,  6, 19, 60,182, 55,193,222,115, 28,  4, 98, 64, 24,241,
+ 24,232,226,163, 53, 94,  0,129, 80,  4, 19, 12,240,145, 88,118, 36,221,189,119, 11,254, 56,153,211,168, 75,146,101, 89,  8,105,
+ 61, 76, 16,130,162, 24,192, 96,233,216, 76, 38, 19,140,  6,  1,120,124,  1, 96,  0, 56,214, 50, 68, 16, 41,141,  2,114,235,159,
+ 81,160, 51,176,224,241,  8, 76,140,  9,  6, 35, 11,181,198, 82, 15, 77, 44,  7,218,200,  2,124,128, 39,224,129, 47,  6,136,222,
+ 12,150, 48, 96,161,135, 70, 15, 88,118,150,108, 28,102,  0, 20, 11,112,  4,160, 40, 22,132,240,192,114,  4, 20,101, 53,156, 88,
+ 10, 44, 69,129,176,206, 25,200,118, 65,126,194, 38,214, 35,111,  0, 33,139, 22, 45, 42, 79, 73, 73,137,  5,240,212,162, 69,139,
+198,164,164,164,104,  1, 84,185,229,178, 74, 72, 16,174, 91,183,238,203,248,248,120, 72, 91,181,170,185, 46,109,213, 42,192,234,
+  5,  8,121, 16, 13,134,166,105,153,109,236,159,211,104,240,175,127,253, 11,198,170, 42,216, 34,223, 58, 89,149, 21,129,209,136,
+  9, 19, 38,148,151,150,151, 79,115,198,210,110,198, 33,153, 90, 30,128, 70, 60,  4, 56,125,250, 52,169, 79,121,168,165,212, 26,
+105, 40,105, 57, 12,  6,  3,  2,252,253, 33, 22,138, 96, 50, 51,224, 56, 14,102,179, 25, 52, 77,195,100, 50,129,101,204,206,198,
+ 51,176, 87, 11, 11,169,206, 82,169,205, 34, 96,175, 22, 22, 82,223,110,255, 73,108,239, 17,232, 44,149, 42,155,203,125, 95, 82,
+144,215,108,150,191,187, 49,  0,163,178, 42, 80, 46,221,  6, 97, 68, 23,144,168, 62,136,220,240, 59, 42, 13, 44,188,249,  4,244,
+175, 63,226,202,245, 27,112,180,107,177,158,161,113, 58,247, 36, 62, 89,245, 49, 30,142, 25,142,197,255,111,  9,126,217,247, 11,
+190,219,244, 13,134,142, 28, 30,223, 94, 26,  1,190,151,  0,  7,143, 30,196,230,175,191,193,142, 31,183, 67, 40, 22,115,187,119,
+239,110,116,125,136,157, 59,119,214, 34,126, 27,148, 74,215, 55,184,211,104, 52,240,247,247, 63,  1, 96,176, 84,103, 60,227,177,
+  0,  0, 32,  0, 73, 68, 65, 84, 42,197,192,129,  3,193,227, 89,134, 89, 35, 35, 35, 33, 18,137,160, 82,169, 32,149, 74,225,235,
+235, 91,164,209,104, 34, 27, 17,119,241,252,249,243, 43,118,236,216, 49,174,115,231,206,221,182,111,223, 94,173, 80, 40,150,  2,
+216,108,175,191,140, 26, 53,234,205, 13, 27, 54,108,  5, 80, 14, 32,  1,192,111,  0,250,214, 35,239,247,181, 50,217,138,128,188,
+188,119,159, 97, 24,124, 12,176, 95, 86, 87,207,168, 35,239,169,121,243,230,125, 60,107,214, 44,220,184,113,  3,123,246,236,  1,
+195, 48,135,  0, 60,227,196,235, 83,  1, 60, 94,149, 15, 77, 67,251,251,239, 92,  8,203,106,174,  1,154,191,186,143,234,215,175,
+ 31,206,158, 61, 91, 51,238,223,104,130,235,156,119,152, 20, 29,177,220, 79, 34, 24, 84,161, 54,252,114,252,106, 69, 10,120, 34,
+224,202, 81, 60, 42,229,240,127,175, 77,192,192,158, 82,204, 75,126, 28, 79,118,164,129, 11,  7,192,  9, 36, 12, 26, 13,214, 81,
+ 34, 95, 89, 12,190,  8, 24,251,228, 27,216,252,233,135, 22, 99, 81,103,132, 89, 15,252, 40, 59,139,236, 83,150, 25,133,237, 34,
+162, 64,241, 29,147,215,184,190,  4, 38,  3,176,123,207,126, 68,143,121,205, 98,253, 67,  0,158,  4, 72, 28,159,128,113, 35, 39,
+ 90, 26,126, 81,  1, 24,  3,221,184, 70,207,113, 96,136,133,224,141,180, 37,248,207,104,208, 67,167,211,161,186,186, 26, 26,181,
+ 10, 26,141,  6,106, 77, 53, 12,213,213,208,235,245, 13, 87,254,106,  2,189,193, 12,189,193, 12,173,206,  4, 77,181, 17, 10,141,
+ 17, 74, 53, 13,149,198,  4,165,210,242, 41,175, 98, 32, 87, 48,144,171, 24, 84,202,105,220,169,108, 56,141, 20,199,193, 12,128,
+152,  9,  8,197,130, 35, 28,192,113,224, 56, 30,204,236,221,226, 99,173,189,135,171,190,241,238, 67,187,227,216,222, 99,248,229,
+208, 47, 53, 74,193,149,162, 43,174,214,185,112,  0, 29, 83, 83, 83,207,  1, 88,251,206, 59,239,188,222,161, 67,  7, 38, 35, 35,
+131,164,165,165,185,172,  1,207, 74, 72, 32,194,176,176,157,  0, 16, 22, 22,118,207,253, 57,115,230, 48,121, 87,174,108,105,174,
+ 88,  0,155,251,223,217,125,227,109, 99,255,  0,240,195, 15, 63,224, 90, 89, 25,  0,224,231,156,156, 90,247,174, 92,185, 18, 26,
+ 18, 18,162,120, 16,138,202,232,209, 29,108,243,174,107, 93,183,157,219,238, 59,244,105,250,249, 94,102,205,102,168,229, 10, 84,
+ 86, 86,162, 74,169,128, 86,167,131, 86,167,131,166,186, 26, 90,149, 26, 26,165, 18,  6,189, 14,180,193,  0,150,113, 24,232, 76,
+117,150, 74,109,125,  6, 11,128,182, 31, 14,  0,128,111,183,255,132,247,211,214,  4,  0,  8,115,185, 34,118,140,142,169,171, 56,
+ 68,245, 24, 21,131,  7,140,219, 83,164,136,220,240, 59, 72, 84, 31, 24, 15,111, 67,209,243,253,225,205, 39, 56, 26, 23,  2, 70,
+ 85,129,232,253,229,224, 59,168,126, 89, 89, 89,228,229,249,175,224,218,149, 43,200,205, 57, 10,127, 95,127, 76,157, 50, 21,  1,
+193, 65, 56,115, 50, 15, 62, 66, 49,188,189,189,209, 70,218, 22, 91,190,223,130,119,222,123, 23,213, 74,247,119,169, 29, 48, 96,
+128,203,223,241,245,245,133, 74,165, 26, 76, 81, 20,221,190,125,123, 12, 26, 52,  8, 61,123,246, 68,171, 86,173, 32, 22,139, 33,
+149, 74,209,183,111, 95,  4,  4,  4, 64,163,209, 68,250,250,250, 58, 18,185,242,240,225,195, 89,155, 54,109, 18, 40, 20,138,197,
+117,200, 58, 97,196,136, 17,159,108,216,176,225,171,176,176,176, 15,  8, 33, 62,  0,222,  1,208,152,155,236,189,229, 26,205,202,
+ 23, 25,198,252,165, 94, 63,173,142,188,248,103,146,255,189,227,181,215, 23,240,174, 92,185,130, 19, 39, 78, 96,195,134, 13,213,
+  0,254,207,201,215,167,188,140, 70, 49,119,233, 18,218,103,103,147,240,210, 82, 30, 30, 80, 12, 74,221,160,247,134,130,224,235,
+118,  2, 34, 30, 69,124,139,171,180,223,109,201,189,241,127,103,139,228, 39,245,102,114, 13,149, 55, 32,222,241, 42, 62, 24,166,
+ 65,222,210, 65, 88, 29, 91, 13,239, 31,231,  0,242, 18, 84,115,226, 11, 86,205,171,  1,220,141,234, 63,119,254, 39,252,251,223,
+155,208,201,175, 55,254, 60,126, 14,  7,100,151, 16, 59,180, 39,226, 70, 88, 42, 26,199,227,131,118, 97,162,196,216,254,221,176,
+124,229,135,216,127, 65, 13, 31,105, 15,140, 31, 63,  1,191, 28,218,137, 61,191,108,177,188,156,217,  4,145,160,241,126,142, 99,
+205, 48,179, 22,107,  6, 86,107,134,166,105, 24, 12,  6,232,245,122,104,117,122,232,117, 90,232,117, 90,232,140,  6,208, 70, 67,
+195,238, 47,189, 47, 84,213,102,168,245, 44,212,122,214,242,191,134, 69,181,150, 65,181,142,129, 66,110, 70,149,220,132, 42,133,
+  9, 85, 85, 38, 84, 86,210,184, 83,105,106, 84,  1,184,235,254,191,215, 84,227,243, 56,240,  8,  1, 87, 39,234,159, 35,142,235,
+220,219, 73,111,163,251,208,238, 53,231,217, 27,179,107, 60,  2,199,246, 30,195,149,162, 43, 55, 92,169,112,219,182,109,251,149,
+227,184, 94,241,241,241, 73, 81, 81, 81, 33,  0, 40,150,101, 69, 38,147, 41,112,254,252,249,126, 13,184,130,235,133, 48, 44,236,
+253,117,235,214,141,139,143,143, 71, 84, 72,136, 83, 67, 87, 77,116,255,199,  0, 64,116,183,110, 14,  3,216, 58,183,110, 29,155,
+150,150,134, 63,139,138,212, 59, 14, 28,192,229,203,151,107,172,254,174, 93,187,194,122,143,222,113,224,  0,138,138,138,112, 37,
+ 47, 79,239, 72,230,130,247,223,199, 91, 75,150,212,184,247,109,255,219,206,109,255,187, 18, 11,144,146,146,201,141, 26, 53,234,
+ 85,123,210,183,125, 14, 28, 56, 16, 41, 41,153, 78,117, 76, 87, 47, 23,228, 49, 12,  3,154, 54, 66,126,167, 28, 21,183,203, 80,
+ 89,118,  7,149,101,119, 32, 47,175,128,178,170, 10, 70,173,214, 18, 63,163, 84,194,137, 32, 64,230,253,180, 53,252,247,211,214,
+240,  1,168,  1,176,131,  7,244,185,231, 33,187,184,  0,167,209,182, 99,116, 76,105, 65,158,172,239,160,187,105,232,216,255,201,
+ 24,101,197,117, 89, 83,234,  7, 73, 84,212,178,252,221, 65,190, 92,139,226,151, 30,  2,119,227, 60, 66,255,123,  6,222,235, 79,
+227,246, 20, 41,  6,238, 47,  7, 17,136,192, 39,  0,159,114,172,128,158,191,112,129,252,235,195,229,152,247,214,155, 48,177,102,
+ 92, 46,188,138,233, 83,167, 65, 40, 22, 99,215,143,187,  1,147, 25, 70,131, 17, 71,243,142, 67,175,175,198,172,153, 51, 15,191,
+252,242,203,141,149, 53,153, 52,105, 82,236,152, 49, 99, 64,  8, 65, 86, 86,214, 61, 46,253,183,223,126,219,233,247, 12, 14, 14,
+198,173, 91,183,  0,128,159,158,158,142,138,138, 10,244,238,221, 27,  1,  1,  1,160, 40, 10, 39, 79,158,  4, 69, 81, 32,132,224,
+214,173, 91,  8, 14, 14,118, 70,236,  7, 52, 77,143,  4,240,131,221,181,169, 35, 70,140, 72,123,233,165,151,  2,211,211,211,197,
+132, 16, 10,192, 78, 88,102,  1,220,113, 32,111,225,  9,147, 41,186,174,188,103, 22,237,216,250,244,180, 57,100,220, 43,233,200,
+ 57,113, 17,105,105,105,172, 90,173,126,  1,150,217,  5, 78,121,183, 58,249,250,  6,180, 47, 43,195,112,157, 14,109,  4,  2,111,
+111, 30,239,129, 45,183,223,175, 95,191,154,195,169, 33,  0,  0,  5, 91,142,223,152, 43,215, 26, 79,  3,200,  7,208, 38,247,106,
+197,231, 35,187,133,189,199,191,113, 34,  8, 27,102,  0, 34,111,192,168,  5, 56, 14, 38,158,248,206,209, 63,111,127,137, 70, 86,
+ 95,218,252,221,103,177,211,166, 39,201,  0, 64,203,154,112, 77, 89, 12,192,140, 78,126, 81,136,141,237,131,176, 86,255,159,189,
+ 47, 15,107,234,218,222,126,247,201, 64,  0, 21,193, 89,180, 42, 86,212,170,117,192,138,168,149, 68,209, 90,173, 29,190, 26,181,
+245,218,250,211,150,160,246, 58,117, 64, 91,123,237, 96,171,222,123, 81, 59, 74,236,112,181,189,245,170,193,218, 58,213,  1, 77,
+ 80, 17, 65,180, 90, 71, 64, 80, 17, 20, 81, 18,166,  4,200,180,191, 63,146, 19,  3,  4,114, 18, 80,180, 61,239,243,228,225, 76,
+ 89,236,236,189,207, 94,239, 90,123,237,181,219,163,168,164,212,230, 43, 48,154,113,179, 88, 95,239,143,234,244, 72,  4,242,114,
+237,203, 60,137, 16,227,250,219, 98,  0,246,158, 53, 97,223,174,  4,220,186,115,  3,173, 90,218, 86, 18,180, 20,139,240,248,224,
+  1, 80,255, 82,143, 75, 23, 66,136,173,102, 88, 32,128,149, 16, 48, 22, 43, 96, 50,195, 34, 18,  2,132,  1,251, 78, 90, 41,108,
+185,  2,234,193,111,234, 43,228,233, 17,205,169,159,152, 66, 40,114,242, 48,152,  0, 51,  5, 42,141,128,165,202,  2, 66,  8,136,
+152,192,108,  1,244, 85, 64, 90, 74,  9, 25, 48,160, 51,117,233,242,103,123, 22, 99,  5,177,187,255,109,164,128,192, 98,101,192,
+  8,236, 43,  5,  0, 80,  1,  5, 40, 55, 47,128,179,242,119,117,158,188, 39,185, 27,215,142, 54,105,210,164, 62,  9,  9,  9,107,
+  0, 12, 72, 72, 72,216,155,144,144,112,100,210,164, 73,111,116,239,222,221, 68,  8,105,245,217,103,159,237, 95,188,120,241,180,
+149, 43, 87, 38,213, 67, 62, 89,235, 95,248,214, 91,111, 45,123,235,173,183,176,119,239, 94,232,111,213,126,151,187,181,105,131,
+ 43, 87,174,  0,128,154, 75, 34,159,186,146,254,188,241,198, 27,210,175,190,250, 74,253,229,151, 95, 98,112,207,158,178, 19, 23,
+ 47,186,117, 21, 31, 59,123, 86, 51,188,127,255,167, 46,157, 56,209, 21,128, 15,128,207, 77, 62, 62, 16, 85, 85,161, 71,135, 14,
+ 88,180,104, 17,146,147,147, 87,133,134,134, 38, 37, 39, 39, 31,204,203,203,115, 67,238,106,231,  1,104, 64, 12, 64, 53, 30,152,
+148,148, 68, 98, 99,229, 39,142, 31, 47, 76, 86, 40, 20, 98,  0,136,141,149, 15, 91,181, 74,149,  2,142, 73,128,186,246,127,236,
+221,138,155,  5, 99,173,102, 75, 47,125, 73,  9, 74,238,220,  6, 33, 12, 40,181,162,178,178, 18,148, 82, 80, 74,113,229,194, 69,
+152,140, 85,248, 61, 49,209, 93, 29, 58,143, 57, 45,  1, 48,227,101,145,214,241,178, 72, 56, 47, 11,180, 79, 17,112, 70,167, 30,
+ 67,164,121, 89,105,106,  0,232,218,165, 11,206,164,217,120,114,246,239, 59,  0,  0,109, 30, 25, 36,187,157,123,170,201, 60,  0,
+131,127, 43, 68,250,211,192,128,176, 40, 20,206, 29,134,246, 95, 31, 67,166, 86,143, 64, 49, 65,145, 86,  7, 33, 33,110, 61,  0,
+142,119, 51, 57,185,218,147,221,187,119,167,227, 39, 60,141, 93, 59,118, 97,235,214,173,248,224,189,247,177, 95,115, 16,  2,161,
+  0,193,157,130, 35, 75, 74,234, 95,186,188,125,251,118,141,157,  8, 72,199,142, 29, 91, 45, 22,224,192,129,  3,184,124,249,114,
+165, 82,169,236, 80,211,155,228,178,191,116,237,138,156,156, 28, 60,246,216, 99,230,  5, 11, 22,136, 55,111,222,140,128,128,  0,
+ 92,186,116,169,150,231, 53, 39, 39,  7, 93,185,183,179,115,226,185,233, 79, 60,241,196, 71, 47,189,244, 82, 64,122,122,122,243,
+202,202,202,255,243,245,245,125,198, 30, 24,248, 43, 71,121,206, 11,229,167, 63,243,247,205, 27, 71,140,126,129,252, 51, 17, 32,
+ 29,159,197,167,107,223,165,218,172, 75, 51,  1,168, 60,104,102, 82,102, 50, 21,139,125,124,208, 66, 44,134,175,197, 82,165,175,
+190,100,237,129, 67, 53,  2, 48, 95,131,243,159, 73,171, 50,231,107, 28, 83,154,185,159, 73,139,127, 43,171, 52,235,195, 31,109,
+ 61, 62,200, 79,240,132,160,170,210,223, 76,153,178,162, 50,227,241,148,203,  5,251,242,181,134,164,249, 26,220,172,139,100, 76,
+251,219, 82,205,225, 99, 41, 50,  0,106,171,128,157,230, 19,224,114,233, 77,252,227,141,153, 48, 24,170, 80, 90, 97,139,  1, 48,
+ 50, 62,216,178,189,254, 52,187,121,185, 41,228,133,103,255,110, 83,150, 22,214,114, 54, 99, 92, 63,130,169,115, 86,195,207,207,
+  7, 45,124, 37, 50,  0,234,172,115,167,100, 27,190,216, 94,239,128, 36,164,102, 24,137,141,  4,128, 16, 88, 40,181, 17,  1,179,
+125,185, 31, 97, 32,180, 90, 97,182,  7,  7,186, 35,  1,197, 21, 45, 81, 81, 85,  4,177,144,113,164, 57, 51, 91,  1,147,137,194,
+100,166, 40,175,176,130,  8,  8, 44, 32, 48, 89,239,186,238, 93,193, 98,101,192, 16, 11,136,133,128, 50,212,225,254, 39,117, 24,
+207,172,164,243,151, 54, 19,119,185,161, 47,166, 92,108,104,223,113,184, 45,250,245,235,119, 51, 36, 36,228,133,171, 87,175,246,
+216,186,117,107, 26,128,231, 18, 18, 18,158,115,126,120,229,202,149,154,197,139, 23,203, 86,174, 92,233, 78, 65, 56, 42, 36, 38,
+ 38,166,206,135, 94,124,245, 85,155, 15,208,179,196, 64,180,134,219, 31,  0, 48,164,119,111, 89, 26,  7,229,239, 24,128,207,156,
+113, 68,171, 14,235,215,207, 26, 23, 23,247,229,196,137, 19,205, 25, 25, 25,194,107,215,174,161,107,171, 86, 41,187,118,237,226,
+ 20,160,120,143,242,  0, 56, 43,247, 91, 73, 73, 73,206, 49, 30,103,157,234,217, 45,  9, 80,173, 92,165,151, 47,142,125,241,210,
+193, 67, 41, 45,253,253, 91,148,234,138, 97, 54,155, 65,237,239,129,238, 86, 33, 74,117, 58, 80, 74, 49, 48, 42, 74,246,123,162,
+219, 60, 72,102,220,141, 57, 97,236,203,  1,153,240, 65,143, 99,188, 44,210,177, 10, 32,235,234, 85,206, 36, 32,106,194, 75,210,
+196,221,255,115, 88,249,191,170,190, 83,  3, 64,155,144,225,178,219, 57,201, 26,  0,104, 26,229, 79,107,147,  0,124,131,  1, 49,
+255, 64,129,213,138,254, 27,210,144, 54,174, 29,250,236,186,  5, 33,  1,154,139,188, 51, 22,119,237,218, 69,166,188, 52,133,142,
+ 26, 51, 26, 59,182,253,130,143, 87,173, 68,108, 73,  9,168,213,138, 45, 91,182, 33, 63, 63,255, 25,  0,187,220,201,113, 69,  4,
+  0,224,133, 23, 94, 56, 13,142,115,217, 27, 54,108, 32, 99,199,142,165,167, 78,157, 18, 15, 26, 52,  8,163, 71,143,134, 90,173,
+198, 35,143, 60,130,170,170, 42, 68, 70, 70,130, 82,106, 61,117,234, 20, 35, 18,137,188,201,  8,248, 88, 64, 64,192,154, 41, 83,
+166,136, 46, 92,184,208,162,170,170,170,174,192, 64,174, 24, 24, 60, 96,242,198,  1, 35,167,144,239,146,128,210, 10,192,120,101,
+175, 85,155,165,158,129,234,129,129,156,244,169,182,164,196, 44, 54,153, 96, 16,139, 33, 52,155,221, 76,143,223, 27,176,121,  0,
+156, 45,127, 87,215, 92,186, 82,157,148, 63,123,126,241, 51,105,121,238,181, 59,229, 41,  0, 58,216, 95,222, 42,  0,249,  0,114,
+230,107,224,214,197,169,252,122,183,102,196,136,126, 50, 11,109,166,118,126, 57,202,245,165,182,117,255,140, 31,178,203, 64,214,
+126,189,137,211, 15,220,190,227, 11,114, 91,155, 35,  5, 99, 80, 59, 87,111,179,102,  1,176,152,116,  0,213, 99, 92, 63,110, 19,
+186, 38,  8,  0, 74,109,138, 26,  2,136,169,157,  8,216,149,191, 45,  7, 32,  0,142, 68, 46,229,228,117, 18,214,183,  3, 53,155,
+180, 16,218,189, 63,148, 82, 88,204, 20,149, 38,160,180,204, 12, 19, 40,204,148,129, 80, 68,112,231,150,169,206,114,158, 56,177,
+138,  0,192,176,136,183, 41, 49,217,172,127, 10,128, 82,  2, 80,187,197, 64,  5, 32,  2, 43,172, 86, 33, 50,179,182,113,250,205,
+175,125,252,154,236,106,246,213,250, 20,176,  8,182,165, 26,245,105, 39, 71,205, 47, 91,182,140,245,143,158,177, 91,197,119, 21,
+245,139, 47, 74,183,109,219,166,182,147,  0,181, 59, 18,176, 94,165, 50,253,126,246,172,188,107,191,126,150, 39,122,245,210,219,
+251,104, 21,106,100,209,146,143, 27,103,179, 56,250,245,115, 63,221,241,246,219, 50,  0, 24,220,179,103,173,123,233, 25, 25,154,
+180,139,222,147,161,126,189,123,127,205, 48,140,229,210,137, 19,254,237,218,181,187,147,156,151,183,209,157,213,127, 31,180,142,
+115, 63,208,219,  3,254,216,169,129,242, 26,109,205,133,  4, 92,144, 47,142, 13,223,241,237,119,219, 66,186,117,125,172,170,170,
+ 18, 22,147, 25, 86,171, 21,205,  3,  3, 81,162,213,178,202,159, 11,137, 42,254,240,205,191,183,  5, 96,204,186,122, 85,204,206,
+255,167,158,250,  3,227,101,145,214,101,113, 95,184, 75, 14,228,192,156,121,177,244, 82,198, 37,153,179,242,  7,128, 81, 79, 61,
+ 39, 59,180,239, 87,205,237,156,100,239, 43,177,142,  0, 63,215,215,185,235,176,193,191, 21,  2,191,189,225, 56,127,244,215,  2,
+199,113,137,201,123, 99,113,203,255,182,144,225,195,135, 63, 61,118,194,184, 61,175, 79,159,117,244,241,254,253, 70,236,248,117,
+ 39, 82, 78,159,196,201,147, 39,119,215,231,  6,174,135,  8,204,218,190,125,251,183,219,183,111, 31,186,125,251,118,206,133, 27,
+ 59,118,236,168,253,251,247, 31,218,181,107, 23, 66, 66, 66, 48,102,204, 24,  4,  4,  4,100,150,148,148,132,158, 63,127, 30, 57,
+ 57, 57,140, 72, 36,194,216,177, 99,163,246,239,223,239,233, 79,189, 80, 82, 82,178,106,231,206,157,245,  5,  6,122,130,223,243,
+ 79,111, 93,241, 75,194,179,239, 86,  4, 79, 67,197,137,165,214, 27, 71, 62,153,238,165,188,202,107,133,133,162, 55, 51, 51,243,
+ 44,  6,  3,115,134, 97, 68,237,  5,130,130,130, 38,114,  2,184,202,  6,232,110, 10,192, 37,230,107,160,  7,240,135,253,227, 21,
+142, 30, 61,171,137,137, 89, 44,139, 87,126,172, 14,238,210,  3, 64, 21, 68, 62, 18,228,221, 44,197,166, 93,201,196,115,121,187,
+ 53, 51, 94, 91,136, 13,223,255, 12, 88,175,  1, 16,194, 92, 89,129,224, 14,  1,178, 79,222,158,197,217,154,131,197, 10, 33, 99,
+133,137,  8, 33,162,230,187, 68,  0,102,128, 90,192, 53, 48,204, 25, 39,207,221, 36,  0,208, 62,136,161, 34,161,205,218, 55, 91,
+109,  9,140,138,203, 40, 44,102, 64, 32,180,194, 98,230, 54,114, 28, 75,249, 23,  1,128,240, 33,139, 40,216,156,240, 12, 96, 37,
+ 54,119,127, 70,214, 78,143, 10,249,237,251,223,106, 26,161,127,113, 50, 87, 88,229,239,228,  9,112,187, 28,235,196,165, 75,  9,
+ 39,106,184, 12,235,121,214,237, 51,141,153, 58,184, 22,185,181, 45,241,139,183,217,214,103,189,146,209,200,121,  0,106,214,173,
+222,205, 82, 43, 78,125, 71,181,114,213, 37,249,226,216,190,  0,  4,151,146,146, 76,149,134, 10, 88, 45, 22,244, 14, 11,147,117,
+  8,125, 12, 39,126,219,201,173,142, 41,153,178,239,183,221,142,211, 97,143,133, 56,142,247,253,182,187,214,121,125,161,241, 95,
+127,110, 35,200,163,159,122, 94,118,225, 82, 54,110, 94, 59,171,  6,128, 67,251,126, 85,183,123,164,175,236, 86,238, 57,143,219,
+125,242,228,201,240, 52,189,175,133,248,212,123, 63,247,133,246,248,237, 70,229, 61, 31,240,147,147,147,127, 83, 42,149, 76,122,
+122,186,245,224,241, 36,180,106,221,170,230, 74, 15,143,176,125,251,246,239,148, 74,229, 15, 10,133,194,228,201,247,222,122,235,
+ 45, 53,  0, 50, 99,198, 12,154,157,157,141,180,180, 52,148,149,149,133, 54,111,222, 28,173, 90,181,114,236,  5,224,133,242,103,
+241,175,164,164, 36, 81, 74, 74, 74, 63,163,209,184, 20,213,231,242,189,193,123,231,182,252, 77, 20,208,253,135, 69, 37,217,251,
+167, 53, 64,158,121,115,106,234, 51,  0,198,  0,248, 29, 86,107, 25,220,199, 35, 52, 58,216, 85,  0,174,174,123, 69,  0,220, 14,
+130, 74,165,112,221,186,117,238, 93, 85,251,142,105, 58,117, 29, 77,110,229,165,208,182,193,157,161, 45, 51, 99,211,142,163, 94,
+119,208, 13,223,174,177,127,183, 29,  5,110, 33,176,185, 16,159, 44,121,221,163,151,254,155,227, 89,247,108,157,102,129,214, 74,
+  0, 64,226, 43,162,198, 10, 19,172,  0,252,252,252, 96, 48, 27,136,197,236,185,188,212, 52,219,158,  1,225, 79, 44,164, 86, 42,
+192,213, 43,123,154,114,141, 41,215,165,131,252, 46,129, 28,234,199, 89,225, 55,242,180,128, 49, 54, 86,238,  3,192,178,106,149,
+170, 65,166,136,106,229, 42,118, 35, 31, 71,155,102,159,243,108,157,254,188, 21, 95,120, 69,198,106,110,  5,236,140,131,251,126,
+209,212,236,107,183,114,189,203, 31,224,110, 99,159,154, 28,216, 76,124, 80,193,212,191, 34, 53,187,204,140,208,230,194,251,242,
+170,216,215,234, 55,218, 59,231,169,242,175, 54, 62,123,191,225, 15, 23,124,106, 52, 26,127,  1,220,111, 74,199, 17,239,148,100,
+239,223,132,234,177,  1,158,194,  4,160, 24,158,197, 13,220, 51, 18,192,105,240,241,118, 31, 97, 30, 60,156,209,163, 71, 15,100,
+101,101,241, 21,193,131,  7, 15, 30, 15,  9, 24,190, 10,120, 52,  6,120,229,207,131,  7, 15, 30, 60,  1,224,193,131,  7, 15, 30,
+ 60,120,240,  4,128,  7, 15, 30, 60,120,240,224,193, 19,  0, 30, 60,120,240,224,193,131, 71,147,163, 90,104,234,233,211,167,189,
+142,218,116, 21, 76,200,203,227,229,241,242, 30, 24,121,245, 70,135,243,245,199,203,227,229,253,185,228,121, 76,  0,156,  6, 10,
+ 79,225,110,224,105, 76,121, 60, 30, 76, 80,190,221, 30,202,118,224,252,188, 82,169,244,  7,240,196,209,163, 71, 63, 17,  8,  4,
+195,124,124,124, 96, 48, 24,142,141, 24, 49,226, 61,  0,105, 10,133,194,240, 32, 84,128, 61, 59,164,250,175, 60,174, 80, 74,233,
+185,115,231,208,175, 95, 63,254,157,228,225, 17,  1,240,104, 29, 50,151, 68, 57,174,228, 57, 39, 62,241, 84,222, 95,112, 64,231,
+132,167,158,122, 74,182,111,223, 62, 13, 87,153,193,193,193,181,110,228,231,231,215, 28, 76,161, 82,169,  8,199, 50,222, 51, 18,
+ 80, 87, 62,255,166,146,183,122,245,234,209,219,182,109, 75,204,204,204,  4,  0,132,132,132, 60,155,154,154,186,211,219,246,117,
+238,247,148, 82,199,251,193, 94,103,223, 21,251,117,226,134, 60,115,109,  7, 79,148,255, 99,231,206,157,219, 86, 90, 90,218,171,
+ 75,151, 46,184,115,231, 14, 42, 43, 43,  1, 96,216,182,109,219,212,254,254,254,151,148, 74,229,243, 10,133,162,222,173, 36,207,
+157, 59,231,145, 65,144,156,156, 44, 83, 40, 20, 26, 79,190,163, 82,169,212,114,185, 92,230, 77,  2, 40,234, 97, 18,134,201,147,
+ 39,123,242,126,  0,  0,186,116,177,237,128, 91, 86, 86,134,170, 42, 91, 26,116,189, 94,239,201,251, 86, 47,206,158, 61, 75,135,
+ 13, 27,134,222,189,123,195,199,199,167,176,170,170,234, 17,126, 24,253,235,161,102, 50,160,123,150,  8,136,183, 98,239, 45,126,
+141, 31,231,246,153,231,103,239,245, 72,166, 90,125,215, 64,202,204,204,132,191,191,191, 99, 16, 98,193,101,243, 15,185, 92, 78,
+ 85, 42, 85,205,115, 82,199, 51, 94,213,109,100,228,221,237, 92, 93,201,111,  8,  8, 33,116,228,200,145,178,164,164, 36,143,148,
+197,182,109,219, 18,219,182,109,139, 87, 94,121,  5, 58,157,206, 26, 23, 23,183, 99,229,202,149, 83, 23, 47, 94,188,197,195,255,
+143,223,126,251,205,113, 62,110,220, 56,236,221,187,183,222,115, 46, 98,107,244,101, 26, 22, 22,  6,  0,212, 41, 51,156, 71,202,
+191,164,164, 36,165,123,247,238, 45,  0, 64, 34,145,192,215,215, 23,133,133,133, 40, 46, 46, 70, 64, 64,  0, 10, 11, 11,123,237,
+221,187, 55, 77,169, 84,246, 84, 40, 20,  5,245,201,235,219,183, 47,228,114, 57, 66, 66,238,102,253, 91,181,106, 85,181,103, 98,
+ 99, 99,  1,  0,199,143, 31, 87,123,211,111, 26,146,253,113,237,218,181,117,221,114,236, 85,224, 45,252,253,253,113,225,194,  5,
+136, 68, 34, 24,141, 70,236,221,187, 23, 89, 89, 89, 88,178,100, 73,131,250,113, 96, 96,160,  0, 64,212,225,195,135,247, 70, 70,
+ 70,222,122,254,249,231,219, 37, 38, 38, 66, 32, 16,180,105,217,178,165,  0, 60,254,210,202,159,189, 86,147,  4,252,105,130,  0,
+195,195,195,165,247,219,226,110, 74,  4, 15, 94,238,248,120, 11,157, 78,231,176,248,245,122, 61,214,175, 95,239,248,120, 48,208,
+186, 60,159, 52,105, 18,149,203,229, 20,  0,173,249,140,167, 56,124,248,176,250,237,183,223, 70,183,110,221, 26,173,254,186,118,
+237, 74,222,121,231, 29, 80, 74,145,148,148,164,246,180,221, 51, 51, 51, 49,110,220, 56, 43,  0,136,197, 98, 38, 52, 52, 20,113,
+113,113,155,219,180,105, 67,195,195,195,199,123, 96,113,222,171, 46, 66,194,194,194, 40,251,187, 78,158, 60,201,238,  7,192,182,
+ 11,103,183,191, 78,167,219, 38, 22,139, 91,  0,192,220,185,115, 49,109,218, 52,136,197, 98,248,250,250, 66, 34,145,128, 16,  2,
+129, 64,128,146,146,146, 22,  0,226,148, 74,101,189,178, 99, 99, 99, 17, 18, 18,130,156,156, 28,199, 39, 54, 54,182,218,167, 33,
+144,203,229, 50,251,239,244,122, 76, 88,184,112,161,227,227, 60, 94,214,184,206,121,163,151, 46, 93,186,192,223,223, 31, 75,151,
+ 46,133,191,191, 63,118,236,216,129,138,138,138, 70, 81,254,246,119,153,234,116,186,255,155, 62,125, 58,122,244,232,209,110,239,
+222,189,184,117,235, 22,174, 95,191,142,226,226, 98,227,253, 28,155,148, 74,165, 52, 47, 47,143, 42,149, 74,169,171,123, 89, 89,
+ 89,244,242,229,203,124,  2,186,251,160,252,163, 99, 87, 34, 58,118,101,157,196,224,190, 16,  0,226,  2,245, 93,247,  6,169,169,
+169,234,198, 32,  1,211,166, 77,123,104, 72, 64, 67, 97, 48, 24,106, 89,253,222, 52, 47,171, 76, 38, 77,154,228,176,242, 19, 18,
+ 18,208, 80,197,239,108,253,171, 84, 42, 50,114,228, 72,153, 74,165,170,230, 17,104,  8,182,110,221, 74,  0,144,200,200, 72, 89,
+ 77, 79,  3,199, 65,215,108,247,  6,160,109,219,182, 88,190,124,121,229,155,111,190,105,204,201,201,217,189,114,229,202, 49, 77,
+221,190, 78,123,  0, 16,231,118,242,176, 93,158,200,202,202,234,  5,  0,179,102,205, 66, 73, 73,  9,110,220,184,  1,145, 72,  4,
+161, 80,  8,161, 80,  8,145, 72,  4, 95, 95, 95, 84, 84, 84, 32, 49, 49,241,101,  0,129,238,132,230,228,228, 64,165, 82, 57, 62,
+206,158,128, 85,171, 86, 33, 49, 49,209,235,223,173, 82,169, 52,246, 41,  0,117, 35,189,203,117, 37,238,230, 60,126, 94,189,122,
+ 21,187,119,239,198,242,229,203,209,165, 75, 23,180,110,221, 26, 73, 73, 73, 88,178,100,  9,252,253,253,  1,  0,  2, 65,131, 12,
+245, 14, 51,103,206,156,242,175,127,253, 11,169,169,169,184,113,227,  6,204,102,243, 43,173, 90,181, 10,  4, 96,186,223,125, 47,
+ 56, 56, 24,209,209,209,234,236,236,108,234,172,252,163,163,163,213,143, 62,250, 40, 30,240, 93,114,255, 20,112, 86,252,206,199,
+ 77,225,  1,160, 46, 62,245, 93,111, 50, 18, 48,126,252,248,198, 32,  1,212,131, 15,103,188,248,198,190, 70,107,144,204,204, 76,
+232,245,250, 58,221,252,199,142, 29,107, 12, 98,208, 96, 28, 62,124, 88,109, 39, 22, 72, 74, 74,210, 16, 66,208,182,109, 91,117,
+ 99,118, 78,214,253,111,247,  4,212,139,213,171, 87,143, 31, 62,124, 56,  5,128,184,184, 56,241,247,223,127,143, 87, 94,121,133,
+117,205, 75,254,248,227, 15,177,253,222,254,240,240,240,231,184,252,255,113,227,198,225,233,167,159,118,184,247,217, 99,246,156,
+ 61,230,232,254,  7,  0,216,173,127, 87,237, 64,106,220,175, 23,123,247,238,253,164,117,235,214,  0,128,203,151, 47, 35, 55, 55,
+ 23,167, 78,157,130,209,104,  4, 33,  4, 66,161, 16,132, 16, 88, 44, 22, 24, 12,  6,108,223,190, 29,  0,250,123,226, 57,146,203,
+229, 46,201, 75, 78, 78, 78,131, 72,128,211,111,111,144, 55,  0,141, 48, 85,106, 50,153, 48,104,208, 32,104, 52, 26, 92,189,122,
+ 21,131,  7, 15,118,220,211,104, 52,  8, 10, 10,114, 16,  1, 47,208,113,230,204,153,121,223,125,247, 29,162,162,108, 27, 25,117,
+236,216, 17, 22,139,229, 71,216,114,211,223, 87, 40, 20, 10, 13, 75, 62, 67, 66, 66,112,226,196,  9,202, 42,127,150,252,245,236,
+217,147,203,248, 48,  4,192, 15,176,237,121, 86, 31, 38,  0,136,  6,208,134, 87,251,247,185, 99,115,210,134,247, 49,  8,208, 78,
+  2,100,169,169,169, 26,111,101,116,237,218, 21,211,166, 77,195, 79, 63,253,228,109, 76,  0,  1, 64,127,250,233, 39,151, 55,247,
+236,217,  3,251, 61,143,101, 31,191,242, 24,134,118,187,128,252,244,165, 13,170, 39,231, 57,255,196,196, 68, 68, 69, 69, 33, 58,
+ 58,218,161,252, 59,119,238,220, 24,164,175, 65, 68, 32, 50, 50, 82,122,248,240, 97,220,185,115, 71,198, 94,147, 74,165, 50,149,
+ 74,165,142,140,140,148,122, 58,111,239,230,127,201,184, 16,128,109,219,182,237,102,231,254,245,122, 61, 86,173, 90,133,242,242,
+114,136, 68, 34,248,248,248,224,202,149, 43, 88,190,124, 57,116, 58, 29,226,226,226,126, 89,185,114,229,168,197,139, 23,171,221,
+ 40,217,106,100,192, 93, 76,  0,135, 58,135,155, 29,  0, 29,211,  1,238,126,111, 80, 80,208,176,170,170, 42,152,205,102, 28, 59,
+118, 12,  2,129,  0, 70,163, 17, 21, 21, 21,176, 90,173,142,247,216,100, 50,161,170,170,138,125,167,251,186,147, 91,151,155, 63,
+ 54, 54,214, 17, 15, 16, 18, 18,130,194,194,194,  6, 19, 81,167, 85,  1, 92,251,162, 22, 64,144,171, 27,107,214,172,241,170, 16,
+113,113,113,120,251,237,183, 49,112,224, 64,135,  7,132, 77,159, 61,112,224, 64,100,100,100,160,109,219,182,222,136,238, 50,115,
+230,204,171,223,125,247,157,243,248, 25,124,227,198,141, 27, 77,169, 88,  6, 15, 30, 76, 88,165, 63,120,240, 96, 12, 30, 60, 88,
+ 13,  0, 25, 25, 25,232,213,171, 23,215,118, 56, 13,192, 23,192,102,  0, 83, 81, 99, 75,112, 59,222,  0,240,133,253,248, 61,  0,
+189,  0,247, 91,212,255,153,193,238,  6,184,126,213, 98,135,229,191,126,213, 98,199,189,251, 78,  0,238, 55, 30, 20, 18, 48,109,
+218, 52,250,222,123,239,213,114,  5,122,163,252, 27,211,250,  7,224,210,250,103,173,126,145, 72,132,130,130,130, 38, 85,254,206,
+214,191,115, 64,151, 90,173,118,246,  2,220,247,128,205,204,204, 76,188,242,202, 43,  6,  0,126,254,254,254,120,255,253,247, 33,
+ 18,137, 28,247,103,204,152,  1,  0,  8, 12, 12,196,196,137, 19,113,244,232,209, 67,247,177,156,196,217,  3, 80, 31,  9,  8, 11,
+ 11,171,185, 85,172, 75, 50, 96, 52, 26,161,213,106, 81, 89, 89,137,128,128,  0,248,248,248,192,108, 54,131, 82, 10,139,197,  2,
+163,209,  8,147,201,  4,139,197,226, 76,232,239,212, 87,200,156,156,156,106,  1,128,236,116,128,179, 71,192,249,126, 67,225, 69,
+ 64,160,164,174, 27,206, 49,  1,158,144,129,229,203,151, 99,194,132,  9,232,218,181, 43,252,252,252, 32,149, 74,161,213,106,225,
+239,239, 15,157, 78,135, 13, 27, 54,128, 97, 60,118,200,118,154, 57,115,230,213,  5, 11, 22, 96,199,142, 29,120,238,185,231,  0,
+160, 61,154, 96, 11,218,186, 60,  1,  1,  1,  1,178, 41, 83,166,168,  1, 96,203,150, 45,178,169, 83,167,122,210, 22, 70,  0,211,
+  0,252, 84, 15,  9,112,158,106,123,  4, 64, 63,  0,105,188,109,143,106,138,191, 46,252, 41, 51,  1, 54, 84,249,179,240,214, 74,
+119, 30,144, 63,249,228,147,  6, 43,127, 22,131,  6, 14,192,193, 67,106,108, 58,228,231, 32,  5,199,175, 60,214,160,223, 24, 22,
+ 22,134,156,156, 28, 36, 36, 36,160,115,231,206,216,184,113,163,199, 86,151, 82, 25, 47,117,242,224, 52,138,242,103,231,227, 11,
+ 11, 11,101, 53,239,141, 28, 57, 82,150,144,144,208,104,177,  0,128,205,253,207,213,251,164,211,233, 46,194, 54, 47,108,221,178,
+101, 11, 54,108,216,  0,  0,216,188,121, 51,116, 58, 29,251,152, 57, 35, 35,  3,109,218, 52,141, 87,178, 70,180,127, 45,114,198,
+117,159,248,156,156,156, 99, 22,139,  5, 58,157, 14,119,238,220,129, 78,167,131,193, 96,128,193, 96, 64,121,121, 57, 74, 75, 75,
+ 81, 82, 82,130,138,138, 10, 84, 85, 85,177,115,187, 41,245,201,172,169,220, 93,  5,146,214, 92, 21,192, 21,118, 87, 63,117,113,
+205, 19,248, 53,118,123,108,220,184, 17, 82,169, 20,126,126,126,184,112,225,  2, 52, 26, 13,252,253,253,241,143,127,252,  3, 71,
+143, 30,197,146, 37, 75, 60, 37,  0,237,103,206,156,121,125,234,212,169,248,249,231,159, 89,229,223,241, 65, 81,254,182,113, 65,
+ 41,101,149, 63,  0, 76,153, 50, 69,125,233,210, 37, 79,167, 86, 89, 18,  0, 59,  9,168, 57, 29,112,217,233, 56, 23,192, 89, 94,
+237,223, 69,205, 32,192, 38, 33,  0,247, 35,  8,176,177,149,191, 93,113, 55,134,229, 70, 62,249,228,147,  6, 41,255, 23,223,216,
+135, 65,  3,239,186,110,182,253,188,221,225, 17, 56,120, 72,237, 21,  9, 80, 40, 20,176, 47, 13,131,193, 96,192,129,  3,  7,176,
+124,185,109, 69,193,217,179,103, 97, 54,155, 61,144, 21,163,  1,108,129,127,148, 82, 54, 24,176, 65,202,159,181,254,235,115,243,
+ 55, 86, 44,  0, 75, 36,164, 82,169,204,221,179, 33, 33, 33, 99,227,226,226,194, 82, 83, 83,133, 63,252,240,  3,115,233,210, 37,
+204,152, 49,195,204,214, 99, 92, 92, 28, 82, 83, 83,241,195, 15, 63,  8,175, 93,187,134,240,240,112,183, 50,239, 69, 12,  0,107,
+ 73,215, 32,  1,148, 37,125, 92, 17, 26, 26,154,110, 54,155, 97, 52, 26,113,251,246,109, 20, 20, 20,224,214,173, 91,184,117,235,
+ 22,110,223,190, 13,173, 86, 11,131,193,128,170,170, 42,148,148,148,176,255, 51,175, 62,153,108,160,159, 51,  9,173,167,236, 30,
+ 41,127, 54,  7, 64,205,107, 13,233, 31, 46, 86,  3, 56, 72, 30, 87, 25, 89, 89, 89,200,200,200,128,193, 96, 64, 68, 68,  4,250,
+247,239,143,141, 27, 55,226,221,119,223,133, 88, 44,134, 64, 32,128, 80,200,217, 33,219,105,230,204,153, 55,167, 78,157,138,180,
+180, 52,124,240,193,  7,172,245,123, 19, 15,200, 50,230,244,244,116,202,206,249,159, 58,117, 10,235,215,175,151,  1, 64,207,158,
+ 61,225, 28, 24,216, 64, 18, 48, 31,182,249,255, 73,  0,230,  0,  8,199, 95,220,253, 15,220,141,244,119, 21,  4, 88,115, 21,192,
+253,154,  2,160, 30, 94,255,179, 40,127,  7,  9,104,192, 84, 66, 53,229,239,234,252,224, 33,207,199, 55,231, 65,215,207,207, 15,
+189,123,247,174,118, 63, 53, 53,213, 35,121,147, 38, 77, 66, 66, 66,  2, 88, 34,  0,128,218,175,121,188,238,124,227,198,141,106,
+  0,216,187,119,175,204, 85,196,122, 82, 82,146,230,234,213,171, 46,173, 71, 87,168, 43,233, 15, 75, 52,146,146,146, 16, 25, 25,
+ 41, 83,171,213,110,251, 78,106,106,234,129, 21, 43, 86,140, 78, 78, 78, 62, 24, 26, 26,138,204,204, 76,232,116, 58, 97, 96, 96,
+ 32,102,206,156,  9,173, 86,123, 45, 57, 57,185, 75,104,104, 40,146,147,147, 73, 76, 76,140, 59,114, 92,107,206,191,  1, 49,  0,
+213,222, 45, 54, 95,130, 61,119,130,195, 51,227, 52,255,239,182, 61,134, 14, 29,250,174, 70,163,153,103,177, 88, 80, 90, 90, 10,
+147,201,228,152,247,175,172,172,  4,165, 20,148, 82,100,100,100,192,104, 52, 34, 42, 42,234, 37,133, 66, 97,118,149,116,164, 46,
+ 68, 69, 69, 33, 42, 42,170, 90,208,159,167, 83,  0,206,138,222,238,242,167,206,253,195,190, 42,160,177,199, 53,206,227, 39,187,
+212,239,205, 55,223,132, 70,163,129, 76, 38, 67, 86, 86, 22,154, 53,107,134,220,220, 92,  8,  4,  2,174, 30,  0, 50,115,230,204,
+235,211,167, 79,199,145, 35, 71,240,143,127,252,  3,  0,130,  1,220,192,221,252, 15, 77,110,249,179,227, 75, 78, 78, 14,194,194,
+194,216,126, 38,139,142,142, 86,135,132,132, 32, 35, 35,131,114, 12,  4,116, 38,  1, 83,237,  4, 96, 51,128, 99,  0, 20,  0,164,
+  0, 10,192,163,241, 58,112, 99,103,227,115, 21,240,179,106,213,170, 58,175, 55,165,242,183,175,  0,184, 23, 44,218,107,153,215,
+243,220,247,111, 95, 95,207,188,150,238,130,196, 60, 69, 84, 84,148, 44, 33, 33, 65, 51,121,242,100,186,117,235,214,106, 68,160,
+  6,225,227, 92, 15, 49, 49, 49,110,153,141,135,137,129,104, 13, 34, 97, 27,149,100, 50, 78,202,223,105, 48,119,204,235,135,135,
+135,255, 45, 46, 46,238,199,137, 19, 39, 34, 35, 35,  3,215,174, 93,235,178,116,233, 82, 89, 76, 76, 12, 39,121,247, 40, 15, 64,
+181,122,174, 67,241,113,202, 24,168, 80, 40,244,241,241,241,203,246,236,217,243,161,217,108, 70,113,113,177, 35,  6,  0,  0,110,
+223,190,141,226,226, 98, 80, 74, 89,171,221, 35, 45,203,206,255,135,133,133, 57, 34,216,217,235, 92, 73,128, 11, 43,191,214, 52,
+212, 61, 80,254, 30,131, 37,  1,139, 23, 47, 70, 82, 82, 18, 38, 78,156,136, 21, 43, 86,224,173,183,222,130, 80, 40,132, 68, 34,
+113, 59,134, 80, 74,173,179,102,205,194,143, 63,254,136,239,191,255, 30,  0, 58,219,149,127,163, 27, 84, 13, 65,126,126, 62,118,
+239,222, 93, 45,139,163,253, 88, 54,106,212, 40,181,151, 75, 30, 45,118, 18,176,203,110,253, 15,229,149,127,221,112, 21,  4,200,
+137,  0,120,146,136,195, 91,133,221,216,104, 12,229,223, 80, 69,125, 47, 48,127,254,124,217,165, 75,151, 26, 85,166,221, 69,218,
+168, 75,233, 88,133,103, 95, 91,207,122,  5, 40, 33,  4, 86,171, 21,219,182,109,227, 76,  2,222,126,251,109,182,156,181, 98,  0,
+ 24,134,129,213,106,197, 59,239,188,163,230,170, 60,235,147,151,148,148,164,113,206,138,232, 69,191,251,239,138, 21, 43,110, 39,
+ 39, 39,239,229,106,245,223,  7,104, 62, 28, 93,  0,  0, 32,  0, 73, 68, 65, 84,111, 27,169,233,237,169,131,240,113, 34,  1, 49,
+ 49, 49, 31, 41,149,202,132,159,126,250,233,188, 88, 44,  6,187, 42,192,106,181,162,101,203,150,208,233,116,144,203,229,136,138,
+138,242, 83, 40, 20,110, 23,120,179,227,139,115,240,223,201,147, 39, 17, 21, 21, 85,109, 60,113, 55, 14,197,198,198,210,156,156,
+ 28, 89, 77, 23,191,183,105,128,157,225, 34,192,207, 12,192,188,102,205, 26,137,221, 26,101,156, 62, 30,145,  0,231,196, 63,115,
+230,204,113, 28,151,150,150,186, 29,155,  8, 33,100,230,204,153,244,135, 31,126,120, 30,192,175, 15,162,226,177, 43,122,226,233,
+ 61, 46,164,189,  6,110, 62, 12, 99,248,253,  6,187, 10,192,149,226,231,180, 10,160,177,149,122, 93,242, 30, 20,242,240, 32,119,
+156,207, 62,251, 76,211,216, 50,107,172,145,190,103,168,225,254,231,250, 82,115,205,133, 78, 60,248,189,247,244,183, 46, 89,178,
+100, 95, 67,234,115,220,184,113,213,150,197, 62,253,244,211,213, 60,  3, 30,206,253, 19, 15,189, 61,156,202,173, 80, 40, 46, 40,
+149,202,102,251,247,239,255, 52, 55, 55,119, 94, 69, 69,  5, 44, 22, 11,  6, 12, 24,128,193,131,  7,199, 69, 69, 69,197,114, 81,
+254,  0,112,252,248,113,199,113,100,100,100,181,235, 53,207,221,140, 43,196,153,208,178,100,194, 30,  7,224, 85,187, 79,158, 60,
+185,174, 91, 66,167,241, 82,124,175,198, 21, 55,158, 10, 43,  0,124,255,253,247,252,134, 41, 60, 56,147,128,186,148,127, 93,  4,
+160,177, 59, 23,223, 89,121, 16, 15,153,253, 95,174,110,156, 21,254, 61,152, 22,104,148,119, 80,161, 80,232, 97,115,189,206,103,
+175, 93,188,120,145,139,226,114,160,111,223,190,141, 62, 30,184, 34,180,222,186,252,239, 53, 89,228,193,235,143,251, 73,  2,220,
+ 86,174,183,251,  8,243,224,193,131,  7, 15, 30, 60, 30, 94, 48,124, 21,240,224,193,131,  7, 15, 30, 60,  1,224,193,131,  7, 15,
+ 30, 60,120,240,  4,128,  7, 15, 30, 60,120, 60,132, 48,195,131,237,138,121,252, 53, 33,228,171,128,  7, 15, 30, 60,248,177,157,
+199, 95,188,147,156, 62,125,218,235,136, 75, 87,193,132,110,228,213,187,254,216, 11,121,141, 93, 62, 94, 30, 47,239, 47, 45,239,
+247,119,175,121, 61,176, 12,252,180, 11,238,181,188,147, 75,188,151, 23,182,162,182, 60,182,254,148, 74,165,212,100, 50,225,202,
+149, 43,106,163,209,  8,161, 80,136,188,188, 60,188, 20,208, 21,251,210,211, 81,241,120,103, 12, 29, 58, 84, 38, 16,  8,216,117,
+237, 77,214,190, 74,165,242, 49,  0,109,207,159, 63,191,187, 99,199,142,140, 86,171,149,116,236,216,113,185,175,175,239, 58,133,
+ 66,113,  3,  0,226,227,227,153,248,248,120, 75, 93,242,226,227,227,155,219,189,  5,134,152,152, 24, 10,  0, 75,255,254,228, 55,
+138, 39,115,103,110, 74, 15,189, 34,108, 59,118,104,179,230, 45,202,  1, 80, 74,169, 16, 64, 96,124,124,252,117,254,125,123,176,
+229,221,107,150,200,117,211, 23, 79, 83,224,122,156, 50,119, 85,196, 83, 82, 97, 80,128, 58, 59,243,178,236, 81,159,102, 88,116,
+238,176,230, 65, 98, 89,245,228, 35,231,151,184, 52, 49, 38, 76,152, 32,221,179,103,143, 58,238, 93,219,249, 47, 71,158,196,225,
+195,135, 57,181,203,223,102,188, 42,101,  8, 81,103, 92,186,  4,157, 78,135, 46, 93,186,160, 89,243,230,216,158,176,141,115,187,
+ 78,154, 52,169,218,139,155,144,144, 80,239, 94, 10,246,236,138, 94,245, 27,118,163, 38, 74,105,195,250,157, 92, 91,253, 85, 85,
+  5,121, 47, 43,108, 13, 16,242,170,237, 56,103,  3,112,114, 81,195, 27,117,210,157,234,229, 75,104,205,233,107, 74,165,146,234,
+245,122,217,246,237,219,213, 57, 57, 57,144,139, 90,161,125,231, 54,168,212, 87,192,215, 96,198,240,183, 94,199,200,137, 83,176,
+235,187,120,236, 60,120, 80, 61,118,236, 88,217,  3,208,133, 51, 45, 22, 75,135,156,156, 28,107,255,254,253,197,161,161,161, 56,
+117,234,212,187,149,149,149, 19,148, 74,101,148, 66,161,208,198,196,196, 88,235, 91, 18, 22, 19, 19, 83,230,124,254,213, 87, 95,
+ 49,123,255, 27,219,163,211,172,129,120,103, 72,159, 54,199,247,255,123,235,182,179,210,211, 61,250,142, 90, 65,  8,209, 42, 20,
+138,188,  1,  3,  6, 88,237,164,129,247, 52,252,197,220, 68,158, 50, 13, 78,217,198,188, 81,254, 95, 71, 62, 43,141,104,211, 73,
+ 77, 64,145, 85, 94,140, 14, 29,187,170, 77, 86, 11,150,244, 27,134,194, 46,109,100,223,237,250,149, 19, 17,136,158, 10,218,171,
+ 59,123, 38,192,246,253, 86, 28, 57, 65, 17, 61, 21,232,213, 29, 88,244, 73,195, 20, 55,187, 65, 73, 67,179,147,185, 34, 19,141,
+ 37,183, 33,160,148, 82, 44, 35, 32, 31,213,251, 12,176,140, 96,242, 69,249,  3,179,214,250,174,242,167,118,229, 63, 18, 71,143,
+ 30,229,244,221,148,227, 47, 82,179,169, 23, 84,170,155, 72, 77,177, 37,172,201,188,148,  1,  0,216,189,155,208,140,203,147,100,
+139,230,115,107,151, 49, 99,198, 88, 15, 28, 56,192, 36, 36, 36,224,208,161, 67,213,146,225,212,132,151, 41, 84, 29,205,228,162,
+ 35, 83,234,  5,161, 96,211,133, 55, 56,103, 65,200,171,142,141,118,214,172, 89,211, 56,  4,192,169,158,236,187, 19,114, 66,118,
+118, 54, 52, 91,183,170, 63,138,154,140,  1,211,230, 64,220, 46, 16, 16,218,147,253, 89, 41, 96, 21,193, 90, 69, 49,254,213,104,
+228,126,190, 18,199,142, 29, 83, 43,149,202,106,233,110,155,  0, 22,134, 97,218,182,110,221, 26, 26,141, 70,216,191,127,127, 12,
+ 25, 50,132, 41, 40, 40, 24,120,230,204,153,115, 74,165,114,144, 66,161, 40,176, 43,107,134, 99,221, 53, 27, 61,106, 76,200,138,
+213, 59,152,216, 25,103, 91, 12, 29, 55, 91, 54, 52, 60,241,201,183,190,200,123, 38,244,137, 87,194,  0,148,193, 22, 99,192,212,
+165, 31,156, 19, 91,185,235, 71, 13, 38,164, 60,106,122, 18,220,121, 11, 28,199,158,  4,  1, 82,182,113,  7,188,210, 15, 74,165,
+146,241, 64, 17,214,220,164,130,134,133,133, 33, 44, 44,204,235, 60,241,202,151,163,165, 47, 15,140, 80,247,236, 16,140,238, 29,
+130,241,120,155,142,  8,246,109,  6,137, 21,232,230,211, 12,  1, 89, 55,212, 51,159,121, 78,202, 69, 86,175,238,192,165,108,  6,
+ 23, 47,251,225, 92,118, 11, 60, 63,198, 31,171,223, 19,160, 87,119,210,104, 70,122, 67,149, 52,187,205,105, 72, 72,136, 58, 61,
+ 61, 29,233,233,233,248,240,191,103,240,232,248, 88, 53,  0,234,225,150,167,148,235, 71, 46,151,187,127,139,151,217,234, 40, 44,
+ 44, 12,114,185,220,229,135,125,198, 83, 76,236,255,129,212,185, 60, 19,250, 45,147, 54, 70,123, 76,152, 48, 65,186,123,247,110,
+ 53, 33,  4,111,126, 74,240,203,145,145, 56,114,228,  8,167,239,110,221, 58, 77, 58, 52, 60,  6, 35, 70,220,196,231,159,127, 94,
+237,222,203, 47,  3,227,199,  3, 11,231, 37,168, 87,127,198,173, 77, 88,229,175,209,104,192, 48, 12,166, 76,153,  2,129, 64,208,
+ 16,101, 95,203,242,119, 53, 32, 19,226,157,242,111, 52,132,173,  6,  0,172, 93,187, 22,107,215,174,181, 93, 27, 20,215,100,197,
+ 57,116,232, 16,190,122, 33, 26,131,159,147, 67,216, 42,  8, 68, 36,  0, 35, 18, 64, 32, 17,131,241,149,  0,160,160, 22, 51,168,
+209,136,215, 95,157,131,210,131,233,200,206,206, 86, 43,149, 74, 41,154, 14, 36, 61, 61, 61,162,115,231,206, 98,171,213,138,164,
+164, 36,236,216,177,  3,  1,  1,  1,136,136,136,232,176,101,203,150,143,237,207,113, 10,  8, 84, 42,149,130,163,  7,255,247,159,
+ 71,252,242,218,233,203,  4,120,121, 89, 57,190,252,247,103, 64,243,190,194,127,199,182,237,150,125,234,167,151,157,116,  7, 83,
+  7, 49, 36, 78, 74,157,216, 46, 19,199,177,243,245,123,180, 23,  6,143, 70,246,  0, 56, 90,105,211,222,159,138,187, 63,218,189,
+165,226,163,215,173, 30,106, 71, 18, 22, 22, 70,217,180,164, 78,233, 73,169,167,105, 59,149, 47,188, 42,125,170,243,163,106,113,
+165, 25,190,255,126, 27,102,131, 17,146, 55, 63, 65,128, 88,130, 74, 81,  5,244,149, 21,240,  5, 65,213,245, 66,245, 63,255,249,
+ 79,217, 59,239,188, 83,175,242,189,148, 13,172,223,108,  5, 96,176,127,128, 39,159, 96,240,194, 88, 82,237,189,137,158, 10,172,
+223,236,149,242,150,169, 84, 42,234,173,181,206, 90,253,233,233,233,119,235,224,168,  9, 21, 70, 61,  0, 96,116,236,  1,168, 86,
+141,241,200,203,144,189, 50, 27, 34,146,117,183, 35,144,124,144,214,189,156,206, 11,209,230,255, 94,224,214,176, 31, 57,242,205,
+147,186,210,206, 18, 59,233, 59,121,146, 91, 59, 43,158,253, 82,186,126,199,223,213, 59,207,124,128, 21, 11,126, 65,184, 52, 20,
+155,190, 62,130,111,247,219, 54,  8,154,253,183, 15,100,235,254,251,129, 87,164, 42,238, 93, 80, 96, 55, 84, 63,156,  7,165, 20,
+205,219, 62,142, 35, 71,142,192,190,111, 65,189,229, 91,253,153, 92, 42,151,183, 82,  3, 95,  1,248,  5,169,169, 64,120,248,221,
+251, 31,127,124,247,120,225,188,  4,181,175,223, 82,217,236,215,151,215, 91, 78, 86,249, 71, 70, 70,194,106,181,226,203, 47,191,
+108, 84,  7, 13,  0, 88,173,214,218,202,159,214,255,254, 50,147,117,213, 94,126,118,  8,183,202, 93, 60,231,240,243,217, 14,250,
+247,175, 61,199,206, 76,209, 85,163,249, 86,235, 12, 44, 88,176,192,113,127,193,130,  5, 88,187,118, 45,152, 30,179,238,254, 87,
+251,243,174,228,  9,167,184, 46, 95,205,157,172,133, 83,184,149,175,178,178, 18,237,187,116,  5,172, 70, 48, 62,  0, 17, 10, 96,
+ 46, 43, 65,101,206, 21,220,206,203, 71,167, 97, 82, 16,113, 75, 16,147, 17, 16, 48, 88, 53,251, 45,140, 89,255,  1, 22, 45, 90,
+212,216,227, 50, 39,173,168, 84, 42,  9,165,180,101, 69, 69,197,176,160,160, 32,100,100,100,192,106,181,226,202,149, 43,216,176,
+ 97,  3,122,247,238,141,224,224,224, 87,  0,188, 94, 67, 89,215,233, 13,160,148,182,238,194,164, 74, 59, 60, 50, 78, 92,156,116,
+ 22, 37, 58, 31,252,184,203,140, 61,199,255,139,121,114, 95,161,208, 96, 13,179,199, 20,184, 36,  0,188, 66,111,122,212, 53,221,
+227,202, 51,192,112,232,136,236,188, 33,164, 75, 70, 98,125,146,178,101,246,229,108,156,254,225, 44,148, 74,165, 71,214,  3,171,
+ 28, 12,134,159, 96, 48,108,130, 86, 27,197, 90,199, 30,253,192, 33, 62, 45,212,109, 43, 45,144, 44,155,  3,203, 29, 45,204,151,
+175, 66, 40, 22,193,143,  8,224, 79,  4,240, 23,  8, 17, 36,146,128,150,233,113,243,208, 49,183, 59,189,184, 82,234, 71, 78, 88,
+ 29,239,225,234,247,  8,226,150, 18,187, 71,192, 59,235,223,174,156,213,240, 34,  5,110, 77,229, 15,161,  0, 57, 55,203,113,179,
+200,136,212, 11,182, 13, 68,122,204,216,  9, 79,246, 61, 23,145, 44,  8, 73, 62,124,152, 51,182,191,109,  9,  2, 95,190,129,128,
+169,231,224,243,252, 50, 32,216,223, 51, 79, 46,135,157,219, 60,217,226, 85,185,227, 13,245,208,160,247,112,242,240, 21,252,191,
+ 73, 19, 17,220,186, 39,230,252,253, 53,124,177,116, 63,134,  6, 46,197,186,255,126,232,245, 14, 62,132,  0, 49,139,206, 57, 44,
+150, 17, 35, 70,216, 21,146,213,109,  3, 79,155, 42, 82,  3,135,  0,252,130,226, 91,205,208,227,145,102,248,230, 27,155,229,191,
+108, 25, 16, 18, 98, 19, 81,124,171, 25,138,111, 53,195,128,126, 23,213,238,148,255,161, 67,135, 96,181, 90, 29, 74,122,203,150,
+ 45,176, 88, 44, 30,185,175,235,241,240,212, 82,254,182,247,217, 61,121,167,  0, 89,167, 84,202, 88, 75,205, 74, 41,172,214,218,
+221,151,189,110,165, 20,235,226,227,101,241,182,239,184,252,159, 20, 32,148,130,196,199, 43,101,148, 82,124,246,217,103,142,251,
+236,113,124,124,188,140, 82,219,115, 20, 32,117,201,139, 87, 42, 97,191, 71, 44, 22, 11,204, 22, 11,204,230,218,117,198, 94, 55,
+ 91, 44,248,122,221, 58,217,186,248,248, 58,202, 71, 33,108,222, 28, 16,  9, 96, 49,148,227,252,182,  4,252,227, 53,  5, 58,189,
+161,192,192,149, 31,225,202,239,167, 32,240,149,192, 84,116, 11,103,143,107,176,243,200, 62,148, 20, 20,224,220,185,115,141,182,
+177, 86, 68, 68,  4, 39,111,130, 82,169, 12,160,148, 14, 73, 79, 79,255,245,253,247,223,239,115,254,252,121,177,209,104,132, 64,
+ 32, 64,243,230,205, 97, 54,155,145,150,150,  6, 66,136,216,221, 88, 31, 31, 31,239,175, 84, 42,125,227,227,227,131,139,243,146,
+127,255,240, 63,185, 65,127, 28,217,  5,173,158,129, 88,200,160, 83,160,  4, 37,119,196, 80,252,211,140,179,119,  6,250,187,211,
+ 27,246, 88, 19,234,220, 23,237,196,160,214,117, 94, 93,223, 31,176,202,191, 38, 57, 96,220,177, 80,118,191,239,106,110,206,113,
+211, 60,247,246,217,221,253,  6,195, 38,  0,  4,149,149,223, 67,114,226, 42, 12,251, 30,173,118,223, 29,222, 25, 20, 41, 13,208,
+150,193, 42, 22,194,120,242, 60,170, 46,230,160,114,255, 17,160,162, 10, 98, 74,225,  7,  1,132, 32,168,178,154,161,173,170,196,
+215,  7,118,185,149,185,250, 61,155,117,239, 12,219, 57,107,174, 80,100, 92,166, 88,244,137,247,253,181, 70,190,114,206, 46,123,
+185, 92,238,216, 91,155,197, 75,107,243,112,240,164, 14,185,183, 42,  1,  0,185,183, 42,145,149, 87,  1, 68,109,101, 55, 70,113,
+239,250, 33,249, 54, 34, 80,118, 22,254,254,151,225, 35, 41,131,213,170,133,201,116, 18,  2, 65,  8,140,250,162, 38,235,172,147,
+199,253, 93, 10, 16,124,249,203, 44, 52, 99, 30,  1,  0,220,204,160, 24, 52, 81,128,191, 47, 31,131, 17, 99,250,  0,160,246,231,
+ 60, 67,100,100, 36,125,243, 83,130,102,109,250,129,  2, 24,247,194,108,206,243,254,235,190, 89, 74,219,182,253,  3,192, 57, 20,
+223,106,134,178, 34,219, 22,204,253,251,  3, 61,122,  0,175,188,114, 87,249,151, 21,249,162,172,200, 23, 65,126, 55,235,149, 57,
+105,210, 36,200,100, 50,140, 26, 53,170,154,235,223,249,227,205,148,128,171,247,214, 27,196, 56,205,111, 19, 66, 28,159,186,174,
+197, 40, 20, 26, 69,180,251, 57,241,232,232,104,181, 43,203,121,193,130,  5,136,142,142,174,166, 80,235,146,247,139, 82,137,115,
+231,206, 57, 92,240,206,117,198,162,230,181,217, 49, 49,154, 24,133,235,173,154,197,148,130,241,243,129,169,224, 26,148, 75,151,
+ 98,131,190, 24,186,200,161,142,251,223,253,119,  3, 62,120,235, 53,132, 46,122,  9, 31,157, 61,132,173,186, 43, 24,243,236,179,
+  8,  9,  9,241, 56, 24,208,174,232,105,120,120,120,181, 62,124,252,248,113,117,125,219,177, 43,149, 74,145, 82,169, 28,124,246,
+236,217,220,164,164, 36,205,155,111,190, 57,244,203, 47,191,148,148,151,151, 59,182,105,174,172,172, 68,179,102,205,178, 38, 79,
+158,220,115,248,240,225,143,184, 33, 18, 12, 33,164,203,217,148,109,133,153,251, 22, 93, 93,180, 36,174,195,206,101, 29,113, 49,
+ 95,136,146,114,  1,172,  4, 40, 42, 55,130,182,234, 94,185,240,221, 79,250, 60,243,252,223, 94,135,155,120,  2,187,251,191,154,
+171,223,205, 49,143, 38, 80,254,117, 77,  1, 80,174,174, 28,133, 66,225,238, 33, 90,211,250,183,185,218,190,175,203, 59,224,246,
+159,246,105,221, 78,173,165, 38,136,139,180,144,252,114,  8, 68,200,  0,149, 70,208, 50, 61,136,217, 12, 17,  0, 11,181,162,210,
+ 98, 70,153,217,  8, 88,221, 91, 81,108,144,223,234,247,234,228,180,176,  5,  9, 54, 10, 97, 37, 78,129,124,110, 95,128, 90,214,
+ 63,128,255,189,209,161,218,249,224,197, 57, 16,209, 59, 48,145,214, 80,169, 84,135,184,190, 88,146,114, 53,130, 62,250, 47,110,
+191, 25,131, 59, 90, 95,116, 52,157,135,197,146,  3,  0,184,118,186,125,147,117,216,173,123,191, 80,191, 54, 86, 89, 77,249,179,
+ 24, 26,184, 20,195,250, 76, 66, 68,208,121,108,221,187, 92,237,201, 32, 50,114,228, 72,154,148,148,132,162,162,209,104,213,234,
+ 32,154,181,238, 11, 74, 41, 24,134,225, 20,136,148,155, 11,228,228,156,179,159,149,  3,146,114,104,245,192,144, 33,182, 43, 89,
+ 89,192, 87, 95,  1,101,165,128,190, 28, 40,215,  3,254,129,165,156,202, 86,151,181,159,157,157, 13,  0,248,244,211, 79,  1,  0,
+161,161,161,247,194,205,204,169, 14,231,207,159, 95,205, 98,175,169,184, 57,123,119,236, 10,219, 49,239,239,132,207, 62,251, 12,
+107,215,174,133, 82,169,148,186, 11,174,155, 21, 28,138,204,243, 23,144, 31, 24,168,102, 24,  6,243,230,205,171, 21,147,225, 73,
+249,158,172,106,  9,106, 45,199,107,159,190,135,126,147, 38, 65,249,233,167, 96,152,187,122, 78,153,117,238,174,135,240,200, 17,
+ 28, 56,112,  0, 87,174, 92,145, 41, 20, 10, 13,151,141, 87,156,149,127, 74, 74,138, 26,  0,210,210,210,212, 17, 17, 17,178,148,
+148, 20, 77,120,120,184, 52, 53, 53, 21, 17, 17, 17,178,138,138, 10,117, 29, 99,174,105,198,140, 25,253,166, 77,155,214,162, 91,
+183,110,216,179,103,143,161,164,164, 68, 88, 81, 81, 97,243,118,216,231, 63,182,111,223, 30, 58,110,220, 56, 95,133, 66, 81,225,
+ 66, 12,227,164,172,153,156,140,211,107, 63,120,103,102,179, 86, 61, 84,248, 93,245, 42,254,184, 78,144,123, 75,  8, 80,  6, 85,
+ 70, 19,180,180, 85,254,220, 89,115,134, 18, 66,242,217, 49,223,147,223,235,194, 67,192, 79, 21, 60, 32,168,147,197, 37, 37, 37,
+213,250, 20,231,235, 80,156,175,243,168,173,217,207, 93, 43,214,214,240,146, 19, 87,225,115, 46, 31,194, 60, 29,235,  1,168,246,
+124, 93,  2, 47,228,229,226,196,157, 27, 56,127, 37,  7,183,174, 92, 69,233,213, 60,148, 93,207,135,217, 80,  1,147,201,140, 50,
+139, 17,  6,139, 25, 85,212,  2, 11, 40, 40,225, 78, 50,157,163,253, 47,101,219,206, 23,125,194, 90,254, 12,226,222,107,156, 21,
+ 47,158,198,  1,196,170,116,136, 85,233,170, 41,124,246, 19, 17,155,  6, 17,189,  3, 33,213,225,127,179, 44,102,206, 83,  0,183,
+ 78,192,162,111,  6,  0,248,183, 48,  0, 85,183,174, 33,253,159, 29,144,249,211,  4,156,248,231,  0,100,101,220,104,210,142,217,
+127, 72,  8,244, 58, 64,175,  3, 12,190, 23,  0,  0, 63,127,104,194, 59, 11,150,  1,  0,134, 71,245,241,216,242,127, 97,228, 97,
+104,181, 81,  8, 60,126, 16,107,222,179,145,220,145, 35, 71,114,114,253,  3,192,138,143,151,147,238,221,  1,231,207,165, 75, 54,
+247, 63,  0,244,232, 65,177,118, 45,208,165,103, 57, 30, 27,122, 27, 67, 70,223,198,243, 47,153, 56,151,209,217,226,103,207, 67,
+ 67, 67, 17, 26, 26,138,121,243,230, 53,118, 21,187,125,215,156,177,126,253,122,153, 43,133,237,240,162,173, 94,141,245,235,215,
+115,178,132, 95,127,253,117, 53, 27,249,239, 10, 11, 23, 46,172,229,  5,112,133,195, 23,114, 49,115,214, 92,156,220,180,  9, 75,
+150, 44,169,147,156,176,229, 59,120,240, 32,234, 11,216, 27,249,216, 35,248,254,187,175, 16,246,242,203, 88,177, 98,  5,234, 43,
+227,130,  5, 11, 48,122,244,104,120,179,  2, 32, 37, 37, 69,237, 20, 44,135,227,199,143,171,  1, 32, 53, 53, 85, 77,  8, 65, 74,
+ 74, 74,189, 50, 13,  6, 67,203, 93,187,118,225,194,133, 11,200,202,202,242,211,235,245, 48,153,108,253,204,104, 52, 98,239,222,
+189,196, 78, 22, 42, 56, 20,199, 90, 85, 85, 37, 62,185,237,101, 84,102,126,129,125, 73,217,184,114, 83,128, 82, 61,  3, 11,  5,
+242,245,190,152,187,232,189,136,152,152,152, 60, 14,  6,159,131, 87,176, 75, 78, 57, 78,  7,240,104,  2,235,191, 46,  2, 64,  0,
+ 16,169, 84, 10,169, 84,138, 51,103,206, 56, 62, 57, 39,174,161,164,162,  4,173,134,120,190,238,247,228,201,147,  4,  0,252,252,
+166, 65,114,226, 42, 68,215,138, 64,  9,129,120, 86, 81,181,251,110, 21,151, 88,  0, 11,  5,242,244,197,200, 45,209,226,118,169,
+ 14, 37,149,149,208, 25, 43,112,187,170,  2, 55, 43, 13,200,175, 44,135,214, 84,  5,157,213,  4,163,213,125,240,235,147, 79,184,
+ 24,240,156,226,  2, 94,155,210, 12, 20, 98, 80,143,183,  1,191, 27,189,239,226, 26,103,228,222,170,196,193,147, 58, 12, 94,156,
+ 83,189, 46,232, 29,248, 88,175,193,199,122, 13, 31, 60, 37, 68,110,110,174,145,171,204,109, 87,172,104, 19, 23,239, 56,191,162,
+183, 32, 47, 59, 31, 25,201,231, 81,112,181,184,201, 59,238,166,175,147,  0,  0,165,133, 20,126, 21,143, 65, 58, 75,136,255,183,
+ 76,228,248,196,109,125, 25,132,187,241, 79,159, 27,145,132, 87, 23,217,148, 63, 33,  4,191, 38,219,154,128,235,154,127, 22,161,
+189,122, 86, 47,231, 38,224,203, 47,129,203,151,109,158,128, 15, 63,164, 14,247, 59,165, 20,129,129,129,238, 71, 96,123, 31,101,
+231,253, 63,253,244, 83,100,103,103, 35, 51, 51, 19,153,153,153, 72, 76, 76,196, 91,111,189,133,220,220,220, 38,107, 15, 86,209,
+185,178,164,231,207,159, 15, 66,  8,103,101, 72,  8, 65,125,100,162,190,123,206, 56,226, 83, 12,194, 52,195,183,239,126,130,102,
+187, 18, 17, 29, 29,141,151, 89, 54,  6, 64,209,163, 47,230,135, 13,131,159,159, 31, 70,142, 28,137,247,223,127, 31,137,137,137,
+234, 21, 43, 86,184,124,255,190,203,207,196,205, 62,143, 33, 56, 56, 88,102,181, 90,235, 37, 20,245,221,227,160, 28, 29, 30,167,
+136,136,  8,153,147,162,196,208,161, 67,101,110,188, 39,163, 70,142, 28,217, 34, 55, 55, 23, 71,142, 28,193,163,143, 62, 10,161,
+ 80,232,152,226,  8, 14, 14,230, 58, 29, 97,181,255, 95,210,189,215,192,216,245,251, 91,226,143, 61,203,240,100, 68,111,248, 75,
+ 24,248,251, 89,224,235, 83,133,167,159,155,108,  5,160,117,254, 98,124,124,188,187,185, 40,199, 42,  0,142,211,  1, 60, 30, 52,
+ 15,  0,  0,162, 84, 42,155,207,159, 63, 31,243,231,207,  7,  0,227,199, 49, 31,195, 84,104,134,175,175,  4,222, 52,158, 92,110,
+ 11, 31,246,123,234, 50,168,128,193,251, 63, 27,156,173,127, 78,240, 11, 14,150,153,155,249, 65, 71, 45,184,160,215,225, 92, 73,
+ 17,206,151,222,193,249, 82, 45, 46,232,181,184,108,208,161,168,170, 18,229,102, 51,110, 24,244,142,255, 89, 31, 94, 24, 75,176,
+250, 61,  1, 86,191, 39,  0,133,  0,148, 48,136,158, 74,240,250, 84, 49,102, 77,105,131,238,221,219,193, 10,145,199, 63,153,117,
+245, 59,207,203,215,147, 20,168, 46, 25,178,172, 60, 27,145, 79, 95,105, 11,162,219,247,118,  0,  0, 64, 72,117, 16, 80, 61,170,
+ 24, 91, 68,179, 86,171,245,147,203,229, 81,158,148, 49, 44, 44, 12,137,137,137,216, 84,174, 71,133,145,193,171,155,191, 69,161,
+196, 23, 21,198,166,219, 38, 98, 98,255, 15,100, 41,218, 79,176,233,199,173,142,107, 63,127,104,194,208,192,165,142,243,232,103,
+190,146, 81,112, 90, 63, 76,215, 44,  5,102, 44, 26,141,150,199, 19, 33,251,103, 36,152,  9,128, 70,163,241,170, 15,119,233, 82,
+ 61,122,124,212, 40,160,101, 75, 32, 36,  4,  8,239,223, 28, 18,177,  0,  2,230,174, 88,137,175,175,219,  1,153, 97, 24,135,229,
+159,157,157,237,176,250,217,207, 71, 31,125,132,143, 62,250,  8, 55,110,112,247,202,184,154,175,175,126,223,115,235,107,253,250,
+245,178, 53,107,214,184, 84,216, 92,173,127, 39,215,115,173, 56,  5,246,220,106,229,150,194,222, 72,  8,172,134, 42,136,218,119,
+129, 98,249,114,204,240,111,137,150,154, 20,199,253, 89,127,155,129, 15,254,253, 45,178, 86,255, 15,255,232, 55, 10,147,  3,187,
+225,192,142, 29,200,201,201,113,249,254, 61, 31,163, 64,159,190,125,101, 86,123,153, 88, 66,230, 60, 61,227,234, 90, 93,152, 61,
+123, 54, 37,132, 80, 54,176,143,157,239,119, 86,242, 41, 41, 41,154,161, 67,135,202, 40,165, 96,167,  2,220,212, 91,146, 72, 36,
+122,244,249,231,159,207, 46, 41, 41,129, 78,167,131,175,175, 47,218,180,105,131,150, 45, 91,162,101,203,150,238, 42,207, 90,131,
+216, 89,124,124,124, 12, 47,198,124, 46,219,112, 98, 48,174, 94, 47, 69,187,  0,  1, 34,122, 18, 60,222,141,194,191, 69,139, 98,
+  0,150,122,244,  6,191,223,192, 67,106,253,  3,110,150,  1, 42, 20,138,114,165, 82,233,  3,192, 95,161, 80, 56, 88, 96,167,200,
+142, 94, 49, 95,118,169,159, 92, 46,167,226, 89,142,200,127,226, 52,255,239,118, 64,126,119,247, 86,205,167, 81,207,193, 96,174,
+ 66,169,222,128,108,147,  9, 34,171,237,203, 37,166, 74, 88, 41,  5,  5,176,231,214, 21,232,205, 38,  0,224, 48, 48, 17, 44,250,
+164,122, 31,183,197,  3, 88, 97, 65, 21, 46, 94, 46,195,247, 91, 74, 61,250,177,206,138,222,238,242,167,246, 99,135, 98,231,178,
+250,193,246, 93, 21, 68,163,191,  6, 16,130,162,162,187,193,121, 98,235, 77, 24,153, 14,152,219, 47, 19, 55,111, 58, 44,167,131,
+ 92,202, 23,243,243,250,106,196, 75,165, 82,129, 45,205,230,179,199, 16, 21, 21,213,100, 29,119,231, 25,219,242,190,228,196,243,
+  0,128, 97,125,108,153,241,222, 89,176, 12,199,206,247,193,191,183,190, 12,229,174, 57,156,231,255, 95, 93, 20,133,160,160, 68,
+251,153,198, 78,150,162, 64,169,205, 26,  3, 40,130,130, 18, 57,201, 58,176,111,191, 35,167,197,203, 47,  3, 50, 25,193,157,235,
+  1,208,235, 36,168, 40, 21, 99,243, 70,130,249,243, 41,174, 21,150, 33, 60, 98, 40,146, 14,169, 57, 89,197, 22,139,197, 49,223,
+159,152,104, 43,171,179,194, 47, 44, 44, 68, 97, 97, 33,103,253,239,164, 48, 40,195, 48,181,148, 42,165, 32,158, 38,  1, 82, 40,
+ 20,154,215, 95,127,189, 90, 44,  0,235, 17,240,196, 21, 78,156, 88,137,181,198,178,  2, 66,184,207,217, 17, 66, 96, 46, 43,131,
+168,117, 16,  4,126,205,208,231,197, 73,248,104,236, 24,188,203, 46,219, 27, 56,  8,150,138, 74,136, 90,181, 67,191,161, 82,116,
+237,212, 13,159, 95, 76, 65,223,190,125,101, 39, 78,156,168, 69,  2, 98, 20, 10,  0, 68, 13,  0,115, 98, 98, 28, 75,  7,205, 53,
+148,189, 80, 40,  0,232,221,133,138,117, 21,120,221,186,117,  4,  0,181,187,248, 73, 90, 90,154, 75, 23,127, 74, 74,138,134,139,
+242,143,143,143, 39,132,144,165, 45, 91,182,236, 51,116,232,208,238,151, 46, 93,194,169, 83,167, 96,177, 88,224,239,239, 15,131,
+193, 80, 24, 20, 20,116,213, 19,163, 79,169, 84, 50,237,218,181, 59,240,220,115,207,181, 59,126, 52, 13,107, 85,  7,208,130,136,
+209,179, 93, 21, 46,223,241,199,136,158,166, 43,  0,106,206, 99, 89,234,107, 19,231,140, 83,132, 16,231,211,154,121, 95,120, 52,
+ 49,132, 28, 94,122, 35,  0,163,211,160, 66,243,146, 60,158, 31,174,166,220,235, 80,124,156, 51,  6,150,106,117, 50,147,159, 68,
+ 93,194, 88, 81, 80, 89, 14,152, 76,176,216,215, 53, 93, 44, 47, 70,190,161, 20,148, 82,216,243, 11,104,184, 20, 47,122, 42,193,
+250,205,119,251,228,165,108,160, 87,119, 51,  4,208, 55, 72,249,215,232,236,238,234,160, 78, 47,128, 74, 53, 71, 13,164, 67,171,
+213, 26,115,115,115,133,171,198,128,137, 61, 48, 18, 11,250, 30,115, 88, 97, 92, 73,133, 43,175, 75,205,115, 86,  9,113,181,230,
+176,140, 96,176,125, 37,135,171,229,126, 91,183,110,181,101,  2,148,203, 41,151,156, 15, 49, 19,191,150, 41,119,206, 85,167,108,
+165,136,  8, 58,143,225, 81,125,112,244,192,121, 28,215, 45,  7,  1,129, 98,226, 87,178,248,157,115, 57,149, 47, 40, 40, 17,132,
+ 16,188,240,194, 11,248,230,155, 82,176, 42,198,246,151,178,132,128, 86,183,236,239,212, 41, 47,114,148, 76,150,116, 72,173, 30,
+ 53, 10, 48, 22,116,198,245, 98, 31, 88,237,179,173, 29,244,237,240,118,116, 25, 14, 28,239,137,230,157,122,202,216, 44,129,245,
+129, 85,252,121,121,121,  0,128,130,130,  2,135,103,224,214,173, 91,142,129,213, 75, 16, 39,183,115,205,151,146,112,201,  7,224,
+140,111,190,249, 70,182,118,237, 90, 53, 75,  0,214,172, 89,227,177,245, 95, 83, 97,120, 11,137, 68,130,130,107, 87,209,173,123,
+ 15, 88,205, 85, 32,102, 11,132,205, 91,160,249,160,193,104, 54,240,  9, 88,245,102, 88, 12, 85,160,102, 11, 96,177, 34,118,221,
+191, 49,229,229, 41,144, 72, 36, 46,229,153, 55,  7,114,250,191,174,158, 11, 91,225,250,217,136,136,  8,153,157,  0, 80, 74, 41,
+134, 15, 31, 46, 75, 78, 78,174,245,156, 59,229,111,175, 43, 43,128,189, 61,123,246, 28,248,197, 23, 95, 24,111,223,190, 93, 57,
+102,204,152,231,210,211,211,255, 97, 48, 24,138, 90,183,110,173,248,252,243,207,181, 92,235, 79,169, 84,138,  0, 60, 50, 52, 60,
+188, 77,204,172, 24, 92,201,187,162,157, 62, 43,230,201,212,  3, 27,227,110,150,105,135, 13,142, 28, 99,109,215, 41,244,255,213,
+180,242,235, 75, 45,108,239, 99,196,137,127, 18, 23, 58,160,230, 49,143,  7,149,  0,212,103, 93,120,163,252, 89,101, 83, 71,194,
+ 24, 78, 36, 96,229,169,195, 26,  0,100,234,160,  8, 10, 95,  9,116,212, 12,163,217, 12, 43,181,162, 85, 64,  0,242,244, 37,240,
+ 36,185,144,171,229,125,119, 99,  0, 60, 91,139,237,202,197,223,208,116,189,246, 60,  2, 19,  7, 15, 30,188, 51, 54, 54, 86, 28,
+ 20, 20,100,189,121,243, 38, 22,244,189, 89, 83,249,115,254, 31,117, 37,236,241, 10,246, 44,127, 46,146, 60,213,122,134, 43,226,
+119,206,209,  0, 32, 19,250, 45,147,238, 62,251,161, 58,101, 43, 64, 64, 48,177,255,  7,178,157,103, 62,208,112, 85,254,108, 95,
+ 42, 42, 26, 77,129, 82,214,250,133, 43,189,179, 33,238, 32,219, 31, 72,125,155,107,216,173,122, 82,164,235, 43,181,148,149,169,
+137,  0, 48, 84,250,130,148,153, 33,100,132, 48, 48, 18,217,216,201,175, 97,110,116,140,219,246, 72, 72, 72, 32,  9,  9,  9,244,
+ 30,190,127,160,148, 18, 66,  8,117,142,104,119,246,  4,120, 34, 75,161, 80,104,162,163,163,177, 96,193,  2,  7,161,104,170, 84,
+184,163, 70,141,194,220,173,235,241, 81, 89, 49,  6, 68,142,  0,211, 46,208, 86, 38, 19,181,165,238,133,  8, 68, 32,  4, 17, 11,
+240, 77,252,106,180, 24, 61, 24,221,187,119,247, 56,106,191, 33,112,178,238,213,225,225,225,178,228,228,228,  6,213, 85,118,118,
+118,212,193,131,  7,175,  9,  4,130, 29, 79, 62,249,228,199,115,230,204,185,189,110,221,186, 36,192, 54,229,224,129, 40,  6, 64,
+226,169, 83,167,134,252,176, 97, 35, 35, 22,248, 92,159,244,210,164,254,115,231,206,213,125,253,245,215, 19,  0,  4,216, 21,127,
+ 25,187, 65, 16, 23,143,  2,143,  7,  3, 92,220,255,222, 18,128,  6, 19,  6, 55,202,135,243,128,180,249, 84, 10,145, 79,146, 75,
+173, 25, 89,106,125,149, 17,102,139,  5,221,135, 12, 66,168, 57,220, 83,133,219,104,193, 40,108,210, 31,  0,106,214, 26,183,199,
+  1, 52, 40,  7,190, 74,165,218,165, 84, 42,133,137,137,137,139, 86,173, 90,245, 79, 39,114, 49,202,249,127,113,245, 40,  0,104,
+180,228, 37,147, 47,178,113, 22,117,255,190,201, 23,229, 94, 49,253,221,103, 63,212,176,237, 67, 65,177,243,204,  7, 94,149,209,
+166,220,  9, 94, 93, 52,234,174,217, 75,238,222, 91,244,137,231,249,200, 99,223, 62,167,137,  5,200,186,111,150, 74, 43, 12,182,
+125,  0,238,230,255,143,241,248, 29,177, 91,100, 22,133, 66,209,232,243,170, 44,  9,104, 12, 89,246, 88,  0, 53,123,220,  8,101,
+243,234,123,221,187,119, 71,251,121,243,100,107,247,239, 87,231,124,252, 11,228,162, 86,104,105,223,188,167,194, 96,198,252,183,
+150, 64,224, 23,132, 61, 27,149, 56,211,154, 96,236,176, 97, 94,231,237,183, 88,204, 94, 15, 19, 92, 93,252, 28,200, 23,121,254,
+249,231,111, 83, 74,227,122,245,234,245,159,162,162, 34,189, 23,138,223,185,222, 71,166,165,165,193,106, 38, 24, 54,188,255,  7,
+115,231,206,213,  1,192,156, 57,115,172,  0,116, 13,105, 82, 39,143, 83,181, 99, 23, 94, 81, 30, 15,153,  7,224,158,144,  2,175,
+ 21, 99, 66,181,  4, 59, 72,203,206,104,242, 74,173,145,244,135,189,214, 96,185, 10,133,194,  2,224, 95,246,143,215,114, 93,149,
+175,129,191,151, 52,198, 51,247, 18, 54,  5, 79,177,232,147,196, 70,151,237, 46,213,175,  7,237,107,186,151,117,208, 88,155,174,
+ 40, 20, 10,141, 66,161,104, 20, 89,164,  1,115,  0,108, 25,148, 74, 37,236,219,247, 34,215,105,251,222,228,131,  7, 28,219,247,
+142, 30, 58, 26,118,210, 91,231,255, 19, 76,209, 17,203,150,192,218,138,137,227,110,130,238, 72, 64, 99,212,215, 19, 79, 60, 81,
+101, 54,155,147,  0,232,223,127,255,253,  6, 41,209,152,152, 24,242,254,251,239, 83,163,209,  8,  0,251,235,122,110,229,202,149,
+100,241,226,197,142,255,101, 79,  5, 92,239,216, 94, 51,184,147,199,253,  5, 87, 15, 23,241,118, 31, 97, 30, 60,120,240,224,209,
+ 36, 48,  3,168,  4, 32,105,100, 35,206,221,142,129,156,119, 20,228,241,112,128,111, 76, 30, 60,120,240,120,184, 32,  4,208,140,
+131,242, 55,192, 22,192,221, 88,250,192, 10,126,217,223,159,174, 35,241,224,193,131,  7,143, 63, 31,252,120,125,193,131,247,  0,
+240,224,193,131,  7, 15, 30, 60,120,  2,192,131,  7, 15, 30, 60,120,252,213, 81,205,165,115,250,244,105,175, 35,114, 93,  5, 19,
+ 62,232,242, 66,  6,249,192,215,167,  0, 34,113, 49,172, 86,219,178, 48,129,128,  1, 67,  4,182,191, 12,  1, 33, 12, 40, 17,130,
+ 16,  2,  6,102,236,220, 45,  2,165, 20, 65, 76, 43,120, 82, 62,123, 70,197,214,176,  5,240,148,193,150, 96,192,196, 46,249,122,
+ 24,235,143,151,199,203,227,229,241,242,120,121, 15,166, 60,222,  3,224,  6,135,143, 94,134,174, 68,  7,147,137,226,246, 29,130,
+125,137,190,216,127,192, 31, 12, 17,225,128,186, 61,246, 31,234,128,253,234, 14, 56,114,162, 13,132, 16,130,129,  4, 35, 34, 24,
+248,136,125, 56,255,143,169,175, 78,167, 83, 95,157, 78,143, 38,171, 43, 77, 12, 73, 62,127, 46,253,176,250,216, 81,125, 98, 98,
+ 98, 37,128,230, 60,  7,125,248, 49,230,169, 17,210, 57,115,166, 83, 79, 55,121,122, 88,161, 84, 42,165,212,142,250,118,215,227,
+ 10, 90,  3,124,143,226,193,163,  9, 60,  0, 44,134, 13, 31,194,249, 37, 60,150,156,230,150,181, 52,182,188,198, 68, 90,186,  8,
+227,198, 88,112,230, 15, 95,136, 69, 66,  8,  5, 66,136, 68, 20, 62,  2, 19, 32,108, 14, 33, 42, 48,164,143, 25, 18,177, 15, 40,
+128, 14,237,128,103,199, 91,113,112,  7, 55,229,127,249, 98, 38, 30,125,172, 59, 58,  6,183, 68,222,181, 75, 93,  2,218,119, 67,
+235,142, 22,252,246,235,175, 72, 76, 76, 44, 70, 19,239,136, 37,151,203,199,171, 84,170,221, 78,231,207, 56,159,243,168, 27,115,
+231,200,169,185,242,188,108, 72, 88,160,218,106, 45, 66, 73,199, 10,117,167,246,163, 81, 94,213,  1,223,172,255,239,159,118,167,
+179,232,232,104,245,130,  5, 11, 64,  8,193,154, 53,107,212,141,145, 19,128, 77,  7,192,235,255,251, 15,143, 72, 23,165, 32, 12,
+ 83, 95,123, 83,231,246,100,219,244,110,242,173,234,237,236,188, 51, 34,143,198,  5,155, 13,208,201, 75,192,141,  0, 52, 21,152,
+251,172, 11,199,143, 53,129, 66,  0,161, 64,132, 97,225,  4,109,219, 48, 16, 10, 25,248,136,  4,232, 21,202,224,218,117, 51,134,
+132, 49,104, 21, 36,193,111,135, 90,  0,  0,  4,180,  2,148, 90,225, 46, 69,240,212, 87,167,211, 63,210,211,209,181, 99, 39,252,
+145,114, 28,169, 70, 19,116,119,116, 16,251, 52, 71,239,129,195,209,127,248, 88,168,119,170, 32,231,152, 27,255, 30, 40,254, 81,
+ 42,149,234, 96, 72, 72,  8,210,211,211,217, 14, 83, 12, 96,158, 74,165,218, 37,151,203,163, 84, 42,213,193, 63,219, 75, 49, 59,
+ 70, 78,125,132, 90,  8, 25, 35, 42, 43, 45, 40,209,251,226,199,159, 14,122, 84,255,163,199, 12,151,182,240,213, 98,212,112, 49,
+186,118,121, 86,221,162, 69,  0, 76,102, 51,110,223,190,131,118,185,215,145,149,157,131, 87, 95, 25, 79, 55,254,176,199,171,118,
+ 13,179,239,169,  0,112,223, 38,251,126, 90,255,192,221,237,112,215,172, 89,  3,165, 82, 41,109,170,116,192,247,241,125,161,219,
+182,109,171,189,159, 66, 19, 41, 47,165, 50, 94, 74, 64, 16,221,  8,245, 78,115,127,  6, 73,125,205, 89,199,219,179,100, 58,246,
+189,114,224,181,120,189, 91, 34,247,219,111,191, 57,206,199,141, 27,135,189,123,247,214,123,206,227,222, 43,127,231,107,206, 68,
+160, 94,  2,144,124, 52, 21,195, 71,132,223,183, 66, 91, 61,203, 14,233,252,176, 87, 47, 33, 35, 20, 64,167, 21,162,125, 91, 17,
+218,183, 21,163,188, 92,  4,137, 72,  8,139,208,  7,131,250, 17, 12,120, 92,  0,134,136, 64,  8,129,143, 72, 12, 17, 83,  5, 34,
+ 17,195,108,  0,204,208,215,171,252,143, 30, 58,136,110, 29,218,224,220,153,115,200, 45,188,121,183,124,101,229,144,156, 63, 65,
+ 25,  1,193,160,176, 65,248,109,175,103, 58,118,221,186,117,210,244,244,116,245,229,203,151,225,235,235, 11, 95, 95, 95,217,246,
+237,219, 53, 30, 14,102, 50,149, 74,117,144, 85,252, 78,157,163, 37,128,177,223,151, 57,221, 86,  0,  0, 32,  0, 73, 68, 65, 84,
+126,251,237,157,215, 94,123, 45, 81, 46,151,143, 81,169, 84,137, 15, 98,  7, 15, 15, 15,151,166,166,166,114,254,221,210, 81,195,
+164,125, 67,155,171, 59,117, 40, 68, 64, 11, 31, 48,140, 31, 42, 42,204, 40,210, 86,224,101,121,111, 42,105, 49,  8,223,127,247,
+ 19,167,126, 36, 66,  1, 94,120,230,113,117,159, 62,189,113,179, 64,135,147,191,159, 66,121,185, 30,  1,  1,205, 17, 18,210,  5,
+140, 64,  4,139, 37, 23, 49,179,167,211,248,117, 63,254,169,172,155,232,232,104,245,194,133, 11, 29,231, 11, 22, 44,104, 52, 47,
+192,131,236,  1, 80,169, 84, 68, 46,151,211,132,132,  4,184,218, 88,233,126, 27,237, 10, 69, 12,  8, 33, 88,191, 94, 41,139,142,
+110, 24,  9, 96,186,188,232, 80,222,105, 43,154,185, 28, 76,219,183,100, 16, 28,196, 60,180,237,247, 87,133,179,178,119, 69, 10,
+220,122,  0,146,143,166,  2, 64,131,137,192,209,121, 89,245,222, 31,241,121, 15,175,  7, 11,167, 28,231, 30, 13, 66,137,154,182,
+ 16,  9, 69,232,220,177, 28,101,101, 34,156, 60,215, 25,  2,129,  0,  2, 34,128, 88,100, 70,159, 30,  6,244,236, 33,  0,  1,  3,
+177,200,  7, 98,  1, 65,216,227, 70,  4,  5, 90,177,233, 63,245,203,238,221,173, 29,174,101, 23, 86, 87,254,118,228,222,184, 70,
+  8, 35,164, 29, 34, 30, 71, 96,203,230, 40,214,221,225, 84,222,181,107,215, 74, 87,174, 92,169,190,118,237,154,243,101,245,248,
+241,227,177,103, 15,119,107, 83,165, 82, 29,114, 86,254, 46,208, 58, 46, 46,174,248,205, 55,223, 60,128, 38,158,162,168, 71,249,
+171, 61, 41, 91,104, 72,144, 58,184, 93, 41, 90,183,242, 71,167,224,246,240,243,247,195,181,107,249,176, 88,172,  8,238,216, 28,
+231, 47,166, 32, 98,196, 16,105,202,209,180,122,  7,211, 55,222,152, 78, 31, 15,213,225,145, 71, 58,225,194,197,107, 56,121,242,
+ 34,110,223, 41,  3,165, 64, 96,160, 47, 12,134,114, 12, 28,216,  7,197,197, 37,200, 63,249, 59,134, 63, 25, 46, 77, 62,194,157,
+168, 60,200, 96,173,127,251,182,211, 96, 61,  1,107,215,174,245,216, 11,192, 78,247,215,204,  4,236, 98, 59,217,  6,247,191, 78,
+157, 58,209,206,157, 59, 55, 56, 23,191, 74,165, 34,147, 39, 79,166, 91,183,110,  5,187,177, 82,125, 10,207,190, 21,110,173,242,
+ 71, 68, 68, 72,217,205,129,234, 32,177,212,141, 76,199,255, 86, 40, 98,212, 13,121, 71,107,202, 27,178,164, 28, 39, 86, 52,171,
+166,248,121, 60,156,214,127, 77,151,127,131,166,  0, 26, 74,  4, 70,124,222,163, 78, 18,224,141,242,103,145,148,148,132,252,252,
+124,  0, 64,112,112, 48,245,228,101, 16,208, 10,  8,137,  5, 98,145,  8,191,159,107,  3,129, 80,136,230, 34,189, 45, 14,160, 25,
+131,252,252,230,120,188,143, 21,132, 16,200,159, 53,131, 90, 25,128,248,128,128,194, 22,200,239, 26,134,226,235, 40,208,150, 35,
+ 51, 63,191,206,178, 20,151,104,161,187, 93, 96,151,197,121,  0,170,169,252,  1,  0,123,246,236,193, 83, 79, 61, 37,221,183,111,
+159,219,  1, 78, 46,151,143,202,201,201,113,217, 97, 74, 74, 74,156, 47,183, 92,182,108, 25, 46, 92,184, 48,250, 65,154, 10,112,
+ 82,254,156, 33, 29, 53, 76, 42, 17,222,132,175,111, 75, 72,124,196,232,214,173, 43, 58,119,237,138,210, 82, 13,180,218,114,136,
+197,  2,  4,  5, 74, 32,244,109,233,118, 48, 21,210,124, 52,111,214, 10,134, 10, 51,206,157,203,194,141,130, 18,220, 44, 40, 71,
+ 69,149,  4,143,  4,155, 33,241, 17, 32, 43, 51,  7,143,118,239,142, 27, 55, 75, 81, 97,110,193,105,128,118,118,251,215,117,221,
+211,233,128,186,100,122, 35,139,181,254, 23, 44, 88, 80,235,250,194,133, 11,189,242,  2,184,218,157,176,230,220,113, 99,121, 21,
+ 82, 82, 82,212, 13,221,144,103,242,228,201, 84,165, 82, 65, 46,151,195,213,116,  0, 23, 79, 21,171,252,  1, 32, 45, 45,173, 86,
+153,236,247,221, 26, 61,236, 14,131,141,229,113,217,186,208, 31,147,215,232, 93, 42,254,224, 32,198, 62, 74,113,107,222,113,227,
+198, 85,243,146, 60,253,244,211,213,234,138,119,251, 63, 56,240, 56,  6,160,177, 60,  2,141,137,172, 44, 27,177,200,207,207,247,
+136,  4,  8,133, 66,136,  4, 34,136, 68,  4, 35,135,  3,  6,125, 21,174,100,139, 33, 18,138, 32,180,  8, 49, 52,156, 66, 44, 18,
+ 65, 32, 96,  0, 74,160,213,  1, 39, 78,  9, 97,181, 90,  1,220,174, 83,238,169,223,179, 81, 94, 94,119,  6,206,110,237,219, 83,
+189,153,160,162,162,  4, 22,171,153,243,239, 60,117,234, 84,221,164,195, 96,224,164,104,106,186,254, 93, 49,195,157, 59,119, 58,
+ 63,159,216, 20, 94,  0, 87, 46,126,103,229,111, 31,  0,185, 89,128,193,237,212, 12,115, 29,102,139, 21, 70,147, 25,183,239,104,
+ 33, 18, 75, 80, 85,101,130,201,108,129,217,108,133,217, 66, 57,121, 98,196, 34, 61, 36,190,157, 80, 84, 84,130,210, 50,  3,180,
+186, 10,180,104,213, 31,195, 30,127, 28,105,201,123,209,209,104, 70, 73,105,  9,122,246,236, 14, 31,177, 16,250, 50,237,159, 98,
+160,176, 71,254, 59,230,254,107,120,166,188,138,  5, 88,176, 96, 65, 53,111, 66,205,123, 92,  9,128, 86, 27,229,120, 48, 38, 38,
+  8, 91,183,110,173,214, 95, 89,  3, 33, 55, 55,215,235, 93, 57,229,114, 57,221,186,117,171, 99,155,241,186, 98,  2,106, 42,215,
+154,158,170,148,148, 20, 53, 27,248, 70, 41,165,199,143, 31,175,118,255,248,241,227,106,119, 78, 15,150, 52,176, 36,192,217,138,
+175,203,208,119,243,219, 48, 41, 34, 17, 91,  0, 76, 89,163,199, 19, 75,202, 27, 68,190,106,206,241,187,139,  9,224,113,239,189,
+  1,117,121,  0,238,171,127,199,149,165,223, 16,235,191,134,197,138,172,172, 44,118, 64,225,212,123,  5,  2, 33,134, 14,177, 66,
+192,  8,113, 34, 93,130,140, 44,  9, 38, 60,  5, 60,243, 52, 48,113, 28, 65,135,118, 98, 72,196, 62,144,136,125,224, 43,241, 65,
+112,  7, 31, 72,196, 18, 72,220, 44,  3,204,203,189, 78,138,181,183, 72, 93,  3, 73,247,110, 93, 16,208,210, 31, 18,171, 17,229,
+  6,211,125,239, 20, 71,143, 30, 61,120,244,232,209,106, 10,223,249,  3,  0, 69, 69, 69,152, 56,113, 98,147, 89,249,118,235, 72,
+ 90,243,154,253,216, 35, 75,206, 98,  1,244,  6, 19,244,122, 35, 74, 75,171,112,235,150, 14, 55,110,220, 65, 89, 89, 21,202,203,
+ 77, 40, 47, 55, 66,175, 55,161,164,184,196,173,172,170, 42, 51, 42, 43, 45, 48,153,140,104,222, 92,140,206,193, 45,224,231,239,
+ 15,  0,  8,233,222, 21,157, 58,182, 64, 64, 11,  9, 40,181,192,100,182,162,170, 74,255,167, 24, 72,162,163,163,213,139, 22, 45,
+170, 87,153, 71, 71, 71,115,182, 72,237, 91, 10,215,121,127,205,154, 53,248,230,155,111, 60,222,106,216,105,219, 89,199,135, 85,
+168,249,249,249,236,238,153, 30,105,183,201,147, 39,211,132,132,  4, 56,147,  7,149, 74, 69, 38, 77,154, 84,239,247,102,207,158,
+ 13, 66,  8,216,126, 28, 30, 30, 46,  5,128,161, 67,135,202, 88, 69,206, 90,253,236,125, 74,169,227, 62,135, 95, 91,205,138,119,
+ 69, 28,184,204,160,180,110,221, 26,196,137, 37, 52, 84, 30,143,  7, 79,249,187, 58,247,202,  3,240, 32, 89,254,119,  7,120, 11,
+  4,  2,129,199,223, 27, 62,196,138,182,109,124, 80, 90, 42,132,143,208, 12, 31,177,  0,154, 84, 49, 38,200, 68, 16,139, 68, 40,
+ 45, 21, 33, 57,221, 31, 45, 36,  4, 12,195, 96, 92,148, 17,207, 77,160, 96, 24,138,229,167, 61, 47,167, 92, 46,167,  2, 63,  9,
+180,162,214,240, 51,229,225,114, 62,197, 40,233, 72,206, 91,250, 14, 28, 56, 16,199,142, 29,115,121,207,207,207,143,243, 96,169,
+211,233, 70,  3,192,134, 13, 27, 48, 99,198, 12,199,245,162,162, 34,199,241,140, 25, 51, 80, 88, 88,216, 36,237,153,154,154,170,
+ 33,132,128,157, 39,101, 24,  6,172,187,179,158,121,211, 58,145,123,253,134,172, 77, 11,131,218, 71, 44,128,209,100, 69,101, 85,
+ 30,174,231, 21, 65,171, 43,133, 86,107, 64,145,182,  2, 69,218, 10,180, 12,234, 10, 32,187, 94, 89,183,238, 80, 20,220,186,131,
+222,189,187,163, 88,167,131, 72,200,160,180, 44, 15,250, 98, 43, 30,123, 84,143,118,109,218,192,207,207, 15, 62, 62,190,184, 89,
+ 80,  6, 34,  8,228, 84, 70,103,151,124, 99,173,  2,104,236, 21,  4,117, 89,235,192,221, 88,  0,174, 80, 40, 20,154,232,232,104,
+204,159, 63,191,150, 87,129,157,102,240,118,101,193,228,201,147,171, 89,176,236,251, 69,  8,193,139, 47,190,136,132,132,  4,194,
+149,  4,212,180,252,157,239,213,244, 52,212,196,186,117,235,  8,  0,135,149,159,150,150,166,182,247,107,141,221, 27,192,254, 85,
+  3, 32,169,169,169,142,251,245,109,231,154,146,146,162, 30, 62,124,152,236,216, 49,219, 59, 49,123,246,108,156, 62,253,187,140,
+ 85,225,199,143, 31, 87,179,191,127,232,208,161,110, 61,101,235,214,173,195, 87,178, 64, 76, 89,107,176,253,174,133,254,213,238,
+ 79, 89,107,112,212,231, 76,153,  8,223, 29, 50,130,199, 67, 64,218, 99, 87, 86, 39,221,171, 22,227,244,233,211,220, 87,  1,220,
+ 11,197,239, 28, 11,208, 16,235,191,186, 37, 95, 93,249,219,221, 76,110,167,  2, 90,183, 22,128, 33,  2,180,105, 45, 64,143,238,
+ 20, 55,110,  8,193,  8,  8, 68, 66, 33, 68, 66, 17,254, 56,235,143, 32,127, 17,  4,  2,  1,134,135, 91,224,235,235,  3,171,149,
+  2,212,226,149,242,111,214,174, 51,110,149, 83,232, 47,107, 32, 36,  2, 92,190,145, 75, 46,115, 84,254,246,129, 77,118,253,250,
+117,245,245,235,215, 93,253, 94, 13,199,114,140, 41, 42, 42, 58,192, 42,121,  0,152, 56,113, 34, 54,108,216,224,120,166,180,180,
+ 20,133,133,133,216,181,107, 23,187, 92,240,190,119, 94,251,192,165, 78, 75, 75, 83,179,193, 98,246,107, 30, 43,133,228, 35,169,
+ 26,153, 52, 12, 52,191, 20,134, 10, 19,116, 62,149,160,208,161,178,210,140,210,210, 42, 20,222, 49,224,198,205,114, 60, 41,235,
+  2, 32,185, 94, 89, 21,198,214,200,185,114, 27, 33,221, 30, 65,183,110,157, 80, 84,116,  7,129, 45, 45,232,209, 35,  0,109,219,
+132, 64,226,235,139,226,226,114,156, 60,117,  9,121,249,165,104,223,169,207, 67, 59,128,196, 43,149,148, 16,200, 88, 93,234,172,
+ 84,235, 91,183, 31,175, 84, 74,227,215,173,227,228,  5, 88,187,118,173,186, 38,  1, 88,189,122, 53,214,175, 95, 47,115, 39, 47,
+ 62, 62,158,198,196,196, 16,133, 34,208,169, 76,212,149, 98,166,  0, 48,105,210, 36, 78,238,127,231, 41,133, 86,173, 18,224,237,
+180,  1,107,229,219,  9,  0,165,148, 98,248,240,225,178,228,228,228, 58,239,187, 83,216,236,220,122,114,242, 49, 53, 33,  4,132,
+ 16, 12, 24,208, 95,182,110,221, 58, 77,237,103,239,146, 12,119,242,152,201, 58,176,242,228,163,186, 86,227, 71,147,215, 92,112,
+200,227,  2, 62,  6,224,225,129, 91,  2,240, 32, 90,252, 44,166, 78,157,218,160,239, 51, 12,  3,129,192,246,233, 29,202, 96, 96,
+ 63, 11,124,196, 18, 27,  1, 16,137, 48, 44, 28,240,241,  1, 68,  2, 31,180,110, 45,129, 64,160,135,197, 98,133,213,234,185,219,
+222,160, 45,128,164, 83, 47, 92, 73,252, 47,218,  8, 25, 28,205,189,230,241,128,178, 96,193,  2,205,186,117,235,100, 13, 89,  6,
+200, 46,235,123,227,141, 55, 28,215, 88, 75,191,180,180, 20,  6,131,  1, 51,103,206,  4,  0,124,253,245,215,  0,160,110,138,182,
+ 77, 73, 73,209,216,173,125, 53,  0, 12, 25, 50,164, 65,  1, 92,157,186,244, 68,250,241,125,104,219,218, 15,126,126,182,110, 95,
+ 85,101, 65,105,153, 17, 90, 93,  5, 58,119,235,131, 31, 55,110,114,219, 38,191,254,186,159,188,248,252, 80,122, 60,237, 60,158,
+ 28,222, 31, 93,186,116,129,201, 88,137,129,  3, 30,135,127, 64,  0,174,229,228, 34,255, 70, 49,146, 83, 46, 66, 87, 22,128,189,
+ 27, 54, 61,180, 62,211,217, 49, 10,123,251, 19,204, 86, 40, 28,203,194,173, 53,148, 62,195, 16,128, 58, 84,  6,157,173, 80,160,
+191, 11, 11,150, 16, 80, 56,209,242,152,152, 24,212,244,  2,204,159, 63, 31,132, 16,196,196, 40,212,118,125,142,217, 49, 10,244,
+239, 95, 91, 94, 76, 76,140,195, 29,239, 78,201,113, 85,254, 53, 49,105,210, 36,140, 30, 61, 90,230, 45,  9,118,158,171, 15, 15,
+ 15,151, 37, 39, 39,107,234,186,207, 37, 72,209,190,170,128,178,228, 43, 34, 34, 66,166, 80,196,104,106,146, 14, 39,249,240, 68,
+222,214,133,205,108,167,146,118,119, 61, 29, 11,115, 29,132, 96,223,153,250,199, 62, 87,121,  0,248, 24,128,135,148,  0, 12, 27,
+ 62,228,158,204,249, 52,150,229,239,220,145,188,129, 86, 71,208,161, 29,  3, 66, 24, 16,134,193,254,131,182,249,125, 31, 31,  9,
+124,196, 62,152,248, 52,129,196, 71, 12, 95,  9,129,182, 72,128,180,147,205, 97,177, 90,208,185,147,103,243,186,114,185,156,222,
+200,187,  2, 93,250, 30,244,232, 44,194,185,124,239,231,133,103,207,158,173, 65,  3,131,242,228,114,185,236,203, 47,191, 84,179,
+110,254,162,162,162, 41,225,225,225,229,  7, 14, 28,216,253,220,115,207,141, 45, 42, 42, 34,211,167, 79,223,103,207, 23,208,100,
+157, 51, 53, 53, 85, 19, 30, 30, 46, 99,143, 27, 34,235,199,141,155,200,244, 87, 95,166,153,151, 46,224, 70,206, 53, 48, 12,129,
+197, 66, 33,241, 13, 66,104,239,190,216,251, 91, 34,231, 58,189,113,219, 42,211, 22,221, 80, 87, 86,154,209,175,111,  8,130, 59,
+182, 70,238,245, 91,208,157,205, 70, 70,102, 46, 14, 30,250,  3,215,242, 41, 78,164,159,243,170,157, 30,148,228, 63,214, 45,129,
+ 94, 63, 55,240, 83,142,242,178,255,131,181,107,215, 58,  8,192,218,181,107,129,156, 13,181,158,117, 37,143, 43, 40,165,164, 33,
+253, 56, 38, 38,166, 65,125,207, 73,201,107,188,185,239,202,171,224,252, 93, 87,242, 60,106,231,107,219,144,176,246, 21,219,216,
+ 48,234,145,106,202, 31,  0,228,227,159,176, 29,232, 78,187, 37,  0,124, 30,128,  7,  7,235, 87, 45,174, 53, 13,224, 17,  1,120,
+192,  3, 62, 26, 92,184,244, 83, 62,144,136,197,152, 56,158,128, 33,  4, 67,  6,155,113,246,156, 47, 24, 98,155,243, 47, 46,102,
+208,177,189,  0, 12, 17,227,204, 89, 49, 36, 62,128,209,100,196,181, 92, 95,143,148,127,118,230,239,  8, 31,253, 12,132,173,195,
+145,157,153,  6, 97, 65,  2,  2, 90,  4,209,146, 82,109,147, 84,176, 74,165,210,200,229,114,217,224,193,131,213,177,177,177,232,
+219,183,111,161, 78,167,195,224,193,131,101, 58,157, 14,243,230,205, 83,219,149,191,166,169, 27,185,161,138,191, 38,  9,  0,128,
+136, 17, 67,164, 29,218,119, 80,251,251,251,227,199,141,155,200,185,243,217,158, 13,232,201,105, 26,  0,196,130,214,244, 66, 70,
+ 42, 58,180,107,  6,137, 68,132,242,114, 35,242,111,150,130,  8, 59,227, 68,122, 50, 31, 45,197,  5,167,222,  4,186,255, 31,170,
+ 45, 47, 60,185,168, 73,139, 20, 19, 19,228,148,182,182,113, 20,154, 59,165,236,137,210,110,104, 62,  3, 87,227,188, 60,194,199,
+246, 91, 43,110,218, 62, 60, 30, 90, 12, 24, 48,192, 17,240,183,126,213,226, 90,247,220, 18,128,198,206,199,127,191,243,251,123,
+198, 34,  8,116, 58,  2,191,246,  4,173,130,  8,  6, 15, 50, 65, 34, 22,192, 71,108, 66,171, 32,137,125, 16, 32, 24, 58,216,130,
+180, 83, 34,155,183,128, 35, 49,146,203,229,180, 79,207, 22,120,115,254, 71,168, 16,119,194,207,137,249,232, 30, 58,  4,  0,208,
+236,196, 46,100,230,130,150,151, 53, 29,  9,  0, 64,114,114,114,164,171, 86,173, 82, 59,123,  7,  0,144,166,180,252,239, 53,236,
+201,126, 26, 92,239,135,143,156, 34,211, 95,125,153,222, 46,186,141,138,  2,  3, 36,146, 86,232,212,237,113, 78, 83,  9, 15, 59,
+108,233,176, 27,233,103,230,108,128, 99, 69, 64,206,198, 38,255,109,238,130,251,254,108, 24,251,204,148, 70,181,220,249, 24,128,
+  7,139,  4,212,165,252,221,122,  0,254, 10,160,176, 69,245, 19,134,130,130, 34,168, 37, 69,210, 81, 33, 36, 98, 17,124,196, 66,
+ 60, 59,158,130, 82, 43,  2, 91,153, 97,182, 16, 88,173, 22,251,224,231, 30,143,119, 45,199,132, 23,229, 40, 23,246, 64,219,102,
+254,120,249,133, 32,108,218,126,214, 65,  2, 76,150,159,113,246, 82,211,174, 19,103,137,128,211, 57,255,246,120,225, 85,248, 51,
+130, 76,214, 17,186, 53,176,182,102, 80,  5,121, 37,111,189,110, 37,162,  3, 23,215,190,113,114, 81,147, 91,253,127,101, 28,248,
+195,212,152,125,152,216,  8, 34,117, 34,139,252,180, 64, 83,145,  0,183,141,229,237, 62,194, 60,120,240,224,193,131,  7,143,135,
+ 23,124,162,103, 30, 60,120,240,224,193,131, 39,  0, 60,120,240,224,193,131,  7, 15,158,  0,240,224,193,131,  7, 15, 30, 60,120,
+  2,192,131,  7, 15, 30, 60,120,240,248,115,160,218, 42,128,211,167, 79,123, 29, 13,234, 42,152,176,177,229, 77,155, 25,227,246,
+123,122,109,129,227,216, 63,168,189,227,248,167,239,227,107, 61,219, 70,246,154, 91,121,  7,214,220,205,152, 55,102,225,151,142,
+227,219,234,111,225, 77,249,234,130,183,229,171, 11,174,202,247,252,116,133,219,239,165,171,119,163,107,215,174,184,122,245, 42,
+  6,203, 38, 56,174,255,242,163,242,158,215,159,187,254, 18, 23, 28, 44,125, 51, 63,223, 57, 51, 33,185,159,253,175,166,188,  9,
+ 19, 38, 72,247,236,217, 83, 45, 83,226,248,241,227,101,187,119,239,214, 52,197,251,241, 32,203,107,136,172, 63,115,253, 69, 70,
+ 70,190,212,175, 95,191, 77,103,207,158,125, 49, 41, 41,233,231, 70, 40, 31,125, 80,222, 15, 94, 94,211,202,243,152,  0,212,196,
+ 87, 95,125, 37,173,172,172,  4, 17,136, 64,  8,129,197,108,130, 88, 36,196,188,121,243, 52, 13,101, 30, 95,125,245,149, 20,  0,
+230,206,157,219, 32, 89,122,109,  1,252,131,218, 59, 20,127,251,206, 93,  1,  0,  5,215,175,122, 37,239,192,154, 55, 48,102,225,
+151, 14,197,245,213,142, 52,  0,192,220,103,135,252, 41, 25, 96,186,122, 55,  6,203, 38, 32, 93,189,219,166,212, 38, 77,  3,  0,
+ 92,189,218,244,245, 23, 10, 72, 51,  1,117, 40, 32,203,  4,212,111,230,231, 35, 45,246, 29,  0,192,144, 85,255,108,210,122,123,
+233,165,151,232,230,205,155, 81, 89, 89, 89,237,186, 68, 34, 81,191,244,210, 75,248,223,255,254,247,160, 46, 15, 28,209,179, 91,
+240, 70,106,177, 24, 50,115, 11,150,  0,216,197,219, 65,117,227,243,207, 63, 31,245,251,239,191,183,184,113,227, 70,251,160,160,
+160,255,207,222,149,135, 55, 81,117,239,119,146, 52, 75,247,149,178,111,133,202, 42,133, 34, 34,107, 34, 20,196,  2,202, 82,180,
+ 84, 63, 17,161,  1, 21,  5, 68,145,126,254, 62,253, 92, 16, 20, 41,202, 26, 16,133, 15,202, 86, 16,101, 41, 20, 10, 41,101,211,
+ 74,129,178, 83, 74,129, 46, 44,221,183,236,201,220,223, 31,205,196,180,164,205, 36, 13,139, 56,239,243,204,147,204,146,147,153,
+ 59,247,222,247,156,115,207, 61,215, 55, 60, 60,188, 96,206,156, 57, 27,156,149, 55,120,240,224, 33, 19, 39, 78, 60,178,105,211,
+166, 41,  0,124, 94,125,115,218,100,  0,244,249,243,231,255,165, 80, 40,126,149,203,229,180,131, 34,153,228,202,196,  5,253, 85,
+ 93, 18,113, 85, 29, 38, 15, 64, 38,  7, 87,123,  0,172,241,237,162,239,164, 62,173,186, 43,  7,119,239,  4,119,145, 27,  8, 33,
+ 48,153,  8, 46, 92,187,133,239,226,191,151, 73, 68,110,120,251,237,183,157, 34,239,132,245,243,164, 93, 59,166, 41, 47,100,181,
+151, 57,123,227, 12,225, 75,124,  2,160, 42,189,107, 33,254,134, 60,  2,108, 44,213, 62, 49, 31,227, 96,252,187,150,134, 84,223,
+117, 13,205,177,172,251,159, 66,161,176,166, 21, 16,  2,154,174,105,223, 38,147,201,114,255, 60,190, 27,107, 43, 26,  0,154, 53,
+169, 73,213,169,175, 44,135,206,104,  4,  0, 84, 27,107,228,181, 27,246, 22, 58,116,237,201,138,248,  1,160, 71,191, 33, 56,165,
+220,107, 33,254,250,174,123,152,229,199,116, 26, 89,  0,134,123,120, 32, 89,165, 82, 50,196, 15,  0, 87, 15, 28,108,168,211,106,
+ 16,223,108,252, 74,154, 81,252, 39, 10,114, 51,209,177, 77, 95,252,252,254,102,135,235,112,100,100,228, 75, 91,183,110,101,200,
+223,  8, 64, 11,192, 29,  0,173,213,106,  5, 18,137,  4,145,145,145, 82, 91,158,128, 71,140,224,103,194,186,239, 75,222,188,202,
+ 83, 85,112, 25,  3,162,166,111,186, 85,102,248, 23,128, 95, 31,183,142, 41, 42, 42,138, 56,187,  0, 79, 29, 98,116, 10,203,150,
+ 45,147,166,167,167, 43,215,175,255, 43, 49, 81,113,113, 49,178,178,178, 48,114,228,200,255, 73,165, 82,217,156, 57,115, 88,189,
+ 95,133, 66,193,219,180,105,211,127,  1, 60, 55, 96,248,203,146, 77,155, 54,  5,191,250,230, 52, 47,  0, 38,  0,205,204,151, 61,
+  5,128, 55,120,240,224, 65,192,253, 75,157,215, 71,170,125, 98, 62, 70,122,194,  2, 82, 95,123,115,160,125,144,180,147,233,224,
+243,  5, 48,153,140,168,168,170,198,196,113, 47,145,170,170,170,198, 18, 54,113,229,123,225, 96, 31,182,150,253,181,242, 20,216,
+ 87,  0, 22, 47, 89, 42,149,190, 56, 94,217,170,137, 15,220,197,  2,208, 52, 13, 19, 13,  8,248, 20,252,125, 58,161,107,199,214,
+202,148,228,189,178, 21, 43, 86, 72, 29, 85,  2,150, 46, 93, 42,237, 28,114, 92,217,163,211, 13,240,121, 38,229,210,101,203,100,
+ 51,222,125,215, 33, 25,170,210,187,144,248,  4,192,199,219, 11,  0, 44,159,182,174,107,218,170,173, 93,111,192,193,248,119,209,
+ 39,230, 99,188,241,202, 88,  0,176,124,218,186,110,249,174,116,135,180,107, 62,159,143,150, 45, 91,130,207,231, 67,175,215, 67,
+165, 82,193,100, 50,161,172,172,204,169,151,235, 41,224,227,167, 37, 59, 33,242,  1,238,221,  4,254,172, 46, 64,209,221,108,108,
+136,159,231,144,213,223,163,223, 16,180,108, 94, 51, 68,210,210,  6,249,183,109,219,214, 50, 28,  0,  0,249,249,249, 46, 41, 63,
+150,201, 85,201,112, 15, 15,124,241,238, 59,  0,128, 47,172,136,127, 99, 86, 86,237,206,196,129,108,173, 19,231, 13,148,150,245,
+ 73, 81,126,220,250, 53,232,232,161, 16,209,  4, 17, 47,153,240,243,183,219,100,  7,151,131,109,103, 46,152, 54,109,218,175, 26,
+141,  6,235,214,173,211, 78,154, 52, 73, 12,192, 19,  0,189,110,221, 58,253,164, 73,147,  4, 26,141,  6, 98,177, 88,217,216,142,
+110,248,240,225,210,  3,  7, 14, 40,205, 11,182, 52, 26,158, 66,222,127,150,126,241,145,196,247,210,102, 72,174, 30,198,103,207,
+251,121,189,183,187,232,243, 42, 61,121,172, 20,  0,102,  9,222,178,178,  8,226,239,159,226,240,179, 63,251,236,179,210, 63,254,
+248,195,105,178, 89,188,120,177,116,251,246,237,202,170,170, 42,155,231,239,220,185,131,237,219,183, 43,223,124,243, 77,217,207,
+ 63,255,156,106,167,190, 80,155, 54,109,218, 48, 96,248,203, 19,178,206,156, 16,180,108,222,212,248,234,155,211,106,245,187,135,
+247,254,130,238,221,187,119,218,180,105,211,136,238,221,187,239,  2,128, 99,199,142, 53,216, 62,216,180,183,154,246, 65,  1,118,
+ 18,241,244,236,217,147,236, 75, 62,136, 51, 23, 46, 89,142,105,181, 58,124,179,116,117,245,244, 73,209, 28, 97, 63,193,184, 47,
+  8,112,209,162, 69,210,  1,195,198, 40, 59,181, 14,128,200,141,  7,154,166,113,247,238, 93,156,207, 60,  3,189,145,  6, 77, 19,
+  4,248,184, 99,216,136,145, 74,141,206,232,240, 31,138,220, 10, 17,210,250, 46,192,167,208,165, 99, 30, 68,130,123, 14, 91,254,
+214,228, 95, 23, 21,149, 85,184,155,119, 19, 18,159,128,122,189,  2, 13,145, 87, 93,172,223,250, 11,222, 25,221,  7,125, 98, 62,
+ 70,  3, 90,246,125, 16, 10,133,224,243,249,240,246,246, 70, 78, 78, 14,202,202,202,106, 20, 41, 39,201,191, 89,147, 96,120, 10,
+248, 24, 51,227, 75,140,152,216, 15,123, 46, 20,224,174,  6,141, 38,255,186,200,191,125, 23, 23, 79, 29, 71,144,159,119, 13,249,
+ 11,248, 46, 41,191, 23,198,189,  1,  0,240, 19,184, 57, 68,254,  0,240,127,203,150,227,255,150, 45,183,144,127,178, 74,133, 15,
+135,141,172, 57, 25, 36,100,245,220,253,226,218, 73,167,126,240,156,242,205, 54,111,195,141,231,  9, 15,184,131,  7, 62, 90,  4,
+247,199,187, 95,204, 86,206,221,221,137,149, 26,145,154,154,106,  0,128,245,235,215,171,  1,136,153,101,148,215,173, 91, 71,  3,
+112,183, 94, 86, 57, 58, 58,218,169,113,185,248,248,120,169, 35,199, 89, 96, 64,239,158, 61,212,137,191,236,148,247,236, 22,202,
+ 87, 93, 58,132,155,133, 85,184, 83,174,  6, 77,136, 83,129,192,132, 16, 82, 90, 58,148, 12, 26, 52,200,165,137,196,172,200, 31,
+254,254, 41, 78,201, 72, 79, 79, 87,  2,160, 40,138,194,179,207, 62,235,112,153,165,164,164,220, 71,254,167, 78,157,194,196,137,
+ 19, 45,251,  6,131,  1, 87,174, 92, 81,198,199,199, 55,232,197,220,180,105,211,187,  3,134,191, 60,242,171,184, 89,130,196,196,
+ 68,252,184,116,145,192,236, 49,178,144,127, 98, 98, 34,150, 45, 91,134,238,221,187,239,178,215,222,234,146,127,125,237,109, 68,
+127,179, 23,208,203,195,174,188,239,150,174,180,144,127, 97,113,  9, 10,139, 75, 80, 81, 85, 13, 55, 55,129,231,202,117,155,181,
+112,213,130,  8, 28, 30, 42,194,194,194,238,219, 26, 84,  0, 86,172, 88, 65,  2,218, 62,141,182, 77,125,161, 53,152, 64, 81, 64,
+114,242,126,252,111,253, 58,156,203,204,196,135,179,103,130,207,231,129, 54,209,240,118, 23,161,237,211,  3,148, 75,150, 44, 97,
+221,192,150, 45, 91, 38,237,218,241,150,210,219, 83,141,159,214, 23,130, 71, 17,244,233,126, 85,185,108,217, 50,135, 26,169, 45,
+242,103,136, 95, 83, 81, 82, 75, 65,168,168,172,178, 43,207, 86, 99, 98, 26, 82,122,194,130, 90,  4,183,126,235, 47,172,238, 49,
+ 36, 36,  4,  1,  1,  1,168,172,172,132, 80, 40,  4,143,199,131, 70,163, 65, 89, 89, 25,248,252,154, 70,238,200, 98, 75, 59,126,
+221,137,153, 75, 14, 96,231,210, 79,208,172, 73, 48,220, 61,252,145,103, 42,192,134,248,121,240, 52,119, 26,124,150,242,108,145,
+ 63, 67,252, 21,183,175,163, 83,203, 38,168, 82,107, 33,114, 23,  1, 38,147,221,120,  0,123,229, 55,111,205, 30, 92, 60,125, 18,
+221,218,119, 65,133,201,190,210,200,144,255,213,  3,  7,241,127,203,150, 91,142, 39,171, 84, 72, 86,169,144, 35,255, 47, 14, 92,
+ 58,135,174,125,218,  3, 37,246,151,102, 30, 60,167,189,116,250,123, 67,148, 65, 30,157,161, 33, 85,128,174, 16, 66, 93, 41,116,
+166, 42,104,105, 13,104,161, 39, 90, 12,236,141,136,233,109,136, 61,107,142, 25,247,151,203,229,238,114,185, 28,168, 25,  2,128,
+ 92, 46,135,121,223,108, 65,105,177,101,203, 22,135, 27,237,172, 89,179,164,179,103,207, 86,118,233,210,133, 80, 20,165,  4,128,
+215, 94,123,141,180,105,211,134,124,242,201, 39, 78, 45,205,236, 37,226,173, 91,254,241,155,146,225, 45,116,252, 19, 87,238, 98,
+207, 77, 30, 62,222,119, 79,247,223,212,234, 10,149,  1,111, 56, 35,179,172, 44,226, 65, 90,254,240,247, 79, 65, 76, 76,140,195,
+ 67,132,214,132, 79,  8,161,152,229,164,217,226,141, 55,222,144,222,187,199,206, 40,209,235,245, 56,127,254,252,225,134,234, 11,
+  0,105,203,230, 77,133, 81, 81, 81,  0,128,140,140, 12, 28,222,251,139, 56,255,246, 93,154, 33,127,243,179, 91,218,219,249,243,
+231,227, 27,211,222,190,153, 52, 18, 23,174,231,161,105,251,102,128, 74,205,250,217, 11,139, 75, 96, 48, 24,205, 10,142, 17,  6,
+131, 17,121,183,110,138, 27,249, 90, 41, 59,251, 28, 30, 33,106,185,162,116, 58, 29,122,118,234,164,116,151,184,129,166,  9, 76,
+ 52,112,252,232, 49,252,247,139, 47, 65, 19,224, 90,118, 54,206,101,158, 69,183,110, 61,192,231, 83,120,170,125, 75,228,156,102,
+239,  5, 16, 10, 10, 17,218,246, 54, 32,160,144,119,199,  0,  8, 40, 60,221,233, 22,210,207, 23, 58,253,  0,214,238,125, 91,158,
+  1, 77, 69, 73,173,217,  0,246, 96,237,222,183,165,105,167, 39, 44, 64,196,172,101, 54,163,216,173, 97, 52, 26,225,238,238, 14,
+ 30,143,  7, 63, 63, 63,168,213,106,168, 84, 53,203,  0,  7,  5,  5,161,164,164,196,161, 28,217,218, 50,160,143, 68,130, 15,151,
+ 30, 69, 68, 15,224,214, 25,224, 79,243,185, 15,151, 30,197, 15,179,100, 48,209, 38,135,203,239,226,169,227,150,239, 67,194, 59,
+ 65,224,197, 67,114,234, 37,244,236,212, 10,222,158, 34,172,223,158,130,222,178, 72,228,219,152,  5, 96,175,252,118, 93, 34,192,
+ 29, 96,244, 16, 10,107,246,228, 32,192,175, 29,198,246,167, 88,149, 31,227,238, 79, 86,253,181,116, 50,249, 44, 30,104, 81,  1,
+106,234,167, 32,255,253,  2,224,105, 64,165,207,103, 58,149,122, 11, 51,100,156,167,178,141,111, 56, 42, 77,213,208,149,101, 99,
+ 67,238, 38, 28, 27, 93,134, 46, 83,100, 24, 54,195, 19, 18,191,167, 32, 22,248, 65, 48,186,  2, 83,140, 83,200,143,107,126,180,
+217, 73,201,229,114,194, 40,109, 60, 30, 15,132, 16,189, 89,137,214,242,120, 60, 53, 33,196, 31,  0,141, 70, 76,175,141,143,143,
+ 79, 29, 62,124,184,172,164,164, 68,153,156,156, 92,163,248, 36, 39,163,115,231,206,232,212,169,147,140, 57,230,  8,170,116,244,
+123,147,255,239,135,221,223, 70, 54,229, 17,109,  5,166, 38,100, 25,140,  6,195, 50,157,  9,243,  1, 56,181, 24,197,203, 47,235,
+ 31, 56,249, 39, 36, 36,164, 58, 99,253, 91, 15,153, 80, 20,133, 62,125,250, 72,217,174, 42,105, 50,153, 28, 82, 24,110,220,184,
+  1,133, 66, 65,173, 92,185,210,214,105, 49,128, 46,  0,  4,207, 71,142, 45,207,201,201,241,205,200,200, 64, 98, 98, 34,194,115,
+114,120, 25, 25, 25,  0,128,240,240,112,188, 48,184, 55,188, 61, 69, 88,246,243,206,194,137, 19, 39,198,173, 92,185,114,150,163,
+237,237,206,175, 11,224,213, 85, 12,207,142, 51,177,109,193, 20,244,232,214, 20, 79,141,252,210,110,251,168,168,172,130, 88, 44,
+  2,  0,184,185,  9,160, 86,107, 93,205, 51, 28,233, 63,  2,176, 89, 12,168, 86, 71, 69,211, 52,220, 69, 66,232,141,  4, 52,  1,
+120, 20,240,233,231, 95,194, 68,  3,213,213,213,184,123,247, 14,130,131,155,130, 16, 26, 70,163,  9, 98, 55,  1,248,110,236, 92,
+176,203,151, 47,151,118,108,155,175, 12,244,171,172,169, 14,230,141,162,  8,122,117,189,166,100,102,  5, 56,  2,198,186,103,220,
+253,117,201,159,141,245, 95, 87,139,102,136,127,249,174,244,251,200,159,173,245, 15,212,  4, 12,137, 68, 34,248,248,248, 88, 92,
+134, 76,224,159,143,143, 15,154, 54,109, 10,163,145,189,242,244,115,202, 17,248,180,  5,164,161, 53,251, 89,198, 26,247, 63, 80,
+115,236,147, 47,149, 40,215, 59, 54, 36,147,127,187, 38, 88,177,117, 19,127,120,249,120, 64,224,205,135,182, 88,  3,240,120,104,
+214,166, 37,142,103,222,116,170,252,222,248,224, 43, 12,234,251, 60,  4,119,129,234, 96,192,157,199, 67,223,182,237, 32, 31, 29,
+204, 74, 78,221,177,254,141,175, 76,193,152,151,  7,  2, 29,180,192, 57,  1,224, 41,  0, 70,133,163,229,170, 53,236,188, 49, 45,
+252,161,215,151,130,210,149, 96, 67,238, 38,156,156,228,131, 65, 99, 38, 97, 64,147, 23,100, 23, 14, 24, 97,164, 85,112,211,171,
+ 96,236, 68,163,232, 30,187,160, 81,179,242,166,157, 52,105, 18, 15, 64, 25, 49,175, 16,101,222,111, 20,146,147,147, 83, 59,119,
+238, 44,115,119,119, 71, 96, 96, 32,220,221,221,145,150,150, 70, 37, 39, 39,167, 58, 33,174,233,200,145, 35,215, 44, 95,253, 19,
+239,211,212,106,122,251,137,108,232,244,  6,149,214,132, 57,142,144,127, 93,151,127, 90, 90, 26,197,108,143, 11,249,219,114,247,
+ 59,234,  5,168,174,174,182,124, 63,117,234,148,101,  3,128,217,179,103,215,218,183,186, 94, 84,143,184,230,  0,218,154,149, 66,
+247, 23,198,189,166,181,246,  4, 48,150,255,115,253,251, 91,183,183, 61,114,185, 92,235, 72,123,139, 29, 53,  8, 79,135,119,130,
+ 87, 15, 47, 20, 28,202,  5,196, 34,140,155,241, 47,244,121,253,  7, 86,207,108, 52,154, 80,112,231,158,145,177,252, 25,228,221,
+186,217,216, 87, 75,234,217, 56, 60,  6, 10,  1,108, 89, 42,196,220,185,209,  4, 48,209, 53, 74,  0, 69,  1,191,236,216,142, 49,
+ 99,199, 35, 48,168,137,165,  3, 36, 14,188, 75, 62,175, 16, 93, 59,228, 89,246,159,238,230,110,209, 13,123,117,201,  1,159,231,
+184, 23,160,174,187,223,214,121, 71,172,255,186,238,126, 91,231,173,231,178, 55,132,202,202, 74, 84, 85, 85, 65,167,211,129,166,
+105, 20, 21, 21, 89,220,255,106,181, 26,213,213,213, 14, 13,  1,236, 92,250,  9, 82, 47,  0, 21, 55,  1,131,  6,248, 97,174,204,
+226,254, 63,125,  6, 56,123,231, 56,248, 14,150, 95,197,237,235,240,247,241, 64,128,191,  7,158, 10,237,140,156, 27, 69,200, 42,
+ 40, 65,235,  0, 31,232,238, 21, 34,251, 90,118,173, 92,  0,108,202,175,159,244, 37, 12,144, 69, 99,231,238,109, 80,166,109,195,
+166,197, 31, 96,220,  7,243,113,206,  0, 20,149, 20,178, 42, 63,235,177,254, 55,251, 61,139,152, 46,109,176,109,231, 97,156, 59,
+119, 19,139,207,103, 96, 75,196,191,128,181, 39, 80, 80, 80,196,202,186,104,169, 21,193,164, 47,134, 94, 95, 19, 89, 29,220,162,
+ 21, 58,117,238, 44,171,148,212,196, 98,104,104, 53,120, 58, 21, 36, 42, 62,238,221,105, 88,  1, 96,222,153, 86,171,133, 86,171,
+ 21,  3,208,  3,240,210,106,181,222,117,167,  4, 54,194, 11, 32, 77, 75, 75, 83,118,238,220, 25,175,189,246,154,172,184,184, 24,
+ 99,199,142,117,164,227, 28, 32, 20, 10,171, 61, 61, 61,141, 17, 17, 17,119,230,206,157,219, 60, 46, 46, 46,231,207, 51,231, 94,
+220,114, 81,119,197, 64,195,225,245, 88, 31,132,203,223,149,228, 95,215,250,103, 20, 22,230,157,177,141,  5,112,115,251, 43, 70,
+101,241,226,197,150,205,214, 62, 96,153,225, 83,223,187, 17,154, 55, 30,  0, 65,197,237,235, 54,221,233, 76,123, 59,115,250,204,
+141,137, 19, 39,198, 58,210,222,  6, 62,243, 20,134,246, 15,197, 87,159, 47,194,119, 75,146,240,159,141,135, 49,237,249,222,184,
+251, 91, 18, 42,202, 42,217,180, 15, 42,106,244, 11, 48, 24,140,103, 12,  6,163,209, 90,  1,  0,128,249,159,206,107,140,  5,207,
+ 89,254,143, 16,182,198,254,235, 42,  1,181, 20,  0, 30,143,135,138,106, 53,248, 60, 10, 70,163,  9, 52, 33, 48,210, 53, 65,164,
+153,103,207,224,249, 33,195,107,220,100,132,128,207,227,163, 74,173,135, 81,175,179,111,253,175, 88, 33,109,215,226,142, 50,200,
+191,194,162,101,244,235,227,105,142,209,165, 64, 81,  4, 61, 59,103, 43,151,175, 88,193,218, 11,192, 88,247, 13,  5,  3, 58,101,
+189, 54, 16, 92,227,  8,252,252,252, 80, 84, 84,  4,145, 72,132,170,170, 42,  4,  5,  5, 89,130,  2,181, 90, 45,202,203,203, 29,
+ 82,  0, 98,191,218,130, 31,230,202,224,211, 22, 72,189,  0,188,183, 80,  9, 79,  1, 31, 99,223,255, 26,249,244, 93, 36, 44,254,
+  8,124, 30,123,121,140,245, 31, 30, 30,138,160,246,109,209, 36, 40, 16, 66, 30,  5, 35, 69, 80,164,210,160,172, 74,235, 84,249,
+125,183,224, 87,188,220,185, 29,188,189,  3,224, 30,212, 28,134,210, 50,156,217,179, 25,229,165,185, 78, 85,226,159, 22,188, 11,
+204, 26, 10,129, 81,143,182, 42,160,144, 95,137, 31,238,252,  9,  8,189, 89,203, 56,189,251,119, 89, 49, 79,131, 92,161, 26,189,
+ 59,200,208,229, 95,158,200,241, 75, 85,  6,  5,157, 81,182,234,155,131, 10, 94, 21,116, 68,  3,245, 70, 26, 98, 79, 47, 54,150,
+191,117,  7,207,204,  2, 16,186,170,225,238,223,191, 31,  0, 16, 19, 19, 35,139,143,143, 79, 29, 51,102,140,197, 98,100, 67,254,
+ 65, 65, 65,251,214,172, 89,227,161, 80, 40,248,179,102,205,194,204,153, 51,201,137, 19, 39,250,  2, 72,214, 24,209, 25,192, 31,
+142,222,147, 92,238, 87,175,219,223,217,128, 64, 87,146,127, 93,130,183, 86, 88,  8, 33,148, 57, 48,208,126,187,200,207, 63,193,
+124,223,180,105,147,101,171,123,140,129,191,191, 63,228,114,121,125,157, 96, 62,128,114,  0,188,252,219,119,113,242,228, 73,203,
+152,127,120,120, 56,128,154,229,183,183,238, 74, 66, 89,149, 86, 13, 96,190, 92, 46, 55, 57,210,222,126,219,249, 25,134,207,157,
+129, 23, 95, 28,130, 64, 17, 31, 85, 20, 65,114, 86, 30, 78, 94, 40,112,136,168,167, 79,138,126, 38, 39, 59, 91,144,119,235, 38,
+152,205, 76,254,224,172,246,191, 39,241,215, 61,102, 11,181, 98,  0, 68, 34, 17,174, 93, 58, 39,107,219,220, 95, 41,113, 19,192,
+100,162, 65, 81, 20, 40, 10,136,149,191,  3, 66,104,152,204,249,  0,212, 90, 45, 46,103,229, 64, 40,180, 27,213, 13,163,161, 20,
+ 61,187,220,176,238, 49,240,246,172, 27,216,177,177,163,165,106,245,238,118, 29,191,103,118,118,216,250,183, 69,252,154,138, 18,
+197, 84,  3, 55,  0,  0, 32,  0, 73, 68, 65, 84,  0,112,202,250,183,213,208,210, 19, 22,  0,  0,107,235, 31,168,153,231,223,180,
+105, 83,232,116, 58,220,187,119, 15, 38,147,  9,129,129,129, 40, 41, 41, 65, 96, 96,160,185, 92,217, 19,118,209,221,108,124,242,
+165, 18, 21, 55,129,111, 63, 24,136,106,163,  9,179, 23, 38,226,251,185, 81,248, 96,241, 30,  8, 40, 10, 14,240, 63, 42,110, 95,
+ 71,179, 64, 95,184,193, 13, 38, 80,184,115,227, 34,110, 21, 86, 32, 36,200, 31,191,157, 62,129,203,151,224,176,245, 63,110,242,
+108,184,249,  3, 60, 62,176, 46,233,  6,118,172,248, 16,147, 23, 40, 48,123, 84, 15,188, 51,164,141, 67,229,151,172, 82,225,187,
+209, 19,128,114, 49, 64,185,  1,223, 45,194,248, 63,143,226,192,144,233,160,190,158,  1,234,247,143, 88, 91, 24,103,239,  4,224,
+ 89, 77,  5,170, 37,124,168,197, 98,132,140,115,131,142,104, 80,193,115,131, 17,161, 32, 38, 53, 12,197,119,112,124,105,  5, 98,
+ 38,134, 32, 85,169,124,232,141, 54, 54, 54,150,  0,192,234,213,171, 25, 87, 63, 53,107, 86,205, 48,240,198,141, 27,217,190,217,
+254,205,155, 55,223,255,245,215, 95,123, 92,187,118, 13,110,110,110,240,246,246,198,185,115,231, 12,  0,138, 26,115,127, 13,205,
+201,119,198, 59,224, 74,242,175,107,253,215, 16,243,253,211,  7,205,211,  3, 83,237,220,215,181,173, 91,183,246, 99, 59, 60, 39,
+ 22,139, 39,215,175, 52,201,171,  6, 15, 30,124,  3, 64,120,214,153, 19,176, 30,243,127,123,242,  4,236,111,223, 30,137,137,137,
+200,200,200,192,190,246,237,221, 39, 78,156,248,243,145, 35, 71, 88,183,183, 87,134, 62, 11, 31,218, 15,106,184, 97, 71,252, 12,
+172,216,115, 22, 31,190, 48,  0,147, 22,111,194,248,249, 27, 28,181,192,169,249,159,206,179,149,  8,136, 88, 41,  1,156, 69,255,
+132,161,150,  7,224,237,183,223,166,202,239,100,227,122, 94,  9,  4,110,124, 24, 77, 52, 12, 70, 19, 78,159,206,192,255,254,247,
+ 51,244, 38,  2,131,137,134, 80,192, 67, 97, 89, 53, 10, 46,159,148,205,156, 57,179,193,  6,181, 98,197, 10,105,231,144, 91,127,
+ 89,255,230,122,181, 99, 99,104, 77,125,226, 17,128, 71,192,227,209,232,219,227,178,114,  5, 11, 47,128, 45,235,223,122, 22,128,
+135,127, 83,135,200,223,150,245,111, 29, 85, 27, 49,107,153, 67,228, 85,211, 41,150,161,186,186, 26,110,110,110, 22,235,159,166,
+105,203,167,163, 10,192,134,248,121, 56, 93,112,  4,158, 77,107,130,254,188,  4,124, 20,221,205,134,183,200, 13,229,165,249,224,
+243, 40,  8,120,236,134,159, 25,235,191,149,191, 23, 46,229,220,128, 81,175,135, 72, 32, 68,117,181, 22,191, 41, 79,160,183, 44,
+210, 33,242,103,202,239,165,119,191, 64,194, 15,223, 67, 77,  3,173, 66, 90,226,194,197,223, 49,123, 84, 15,167,202, 15,  0,102,
+135,244,198,238,107,135,129, 10, 35, 32, 14,196,193,244, 75,160,190,158,193,116, 76,172, 11,239,200,162,156,212,227,  7,211,  1,
+125, 21,170,169, 42,148,241,170, 81, 33, 48,192, 96,170,132, 72,171,134,248,246, 13,108,137,187,134,182, 97,161,168, 47,  0,176,
+ 46, 36, 18,137, 53,  9, 64, 44, 22,219, 60,199, 22,107,214,172,193,154, 53,107, 26,213,152,189,188,188,222,203,206,206,246,240,
+246,246,134, 68, 34,129,191,191, 63,138,138,138, 64, 81,148,218,149,157,  6, 99,241, 71, 69, 69, 17,160, 38, 32,208,145,160, 64,
+ 87,147,255,179,207, 62, 43,181, 23, 80,203, 54, 22,192,195,195, 35, 86, 32, 16, 92,175,123,124,241,226,197,181, 44,127,  0,104,
+211,166, 13,134, 14, 29,186,206,158,253,147,127,251,110,173,104,255, 79,254,111, 22, 68,  2, 33,130,131,131,193,196,  4,152,207,
+123, 56,210,222,166, 72,159,198,204, 69,223,163,234, 94, 33,130,188,155,224,226,165, 92, 76, 90,188,201,225,246, 81,135,240,169,
+ 58,191,183,150,195,121,  2,254,  6, 56,123,246,108,131,201,128,234,245,  0,  0,192,156, 57,115, 82,191, 93, 68,201,  8, 25,173,
+108,219, 60,  0, 94,238, 34,116,233, 22,134, 46, 93,123, 64,192,  3,170, 53, 38,228,222, 41, 69,122,234, 94,153,167,135,187,221,
+ 63, 80,169,213,  8,109,115,  7, 90,157,216,156,181,165,166, 26, 73,196, 90, 16,  2,148,150,139,  0, 10,240,242, 48,162,123,232,
+ 77, 28, 61,101, 63,139,157,181,245,111,109,241, 75,124,  2,224, 70, 12,128,241,175,254,206, 36,176,127,143,214,214,191,181,197,
+207, 28,203,190,120,198,114, 45,155, 44,123,214, 74,  0,  0, 52,109, 90,163,140,148,150,150,194,219,219,219,226,254,119, 68,  1,
+ 96,148,  0,224,107, 76,143, 26, 12,252,112, 20, 43,254, 29,137,241, 31,124,143, 77, 11,222,129,128,162, 32, 20,177,155,177,195,
+ 88,255,151,114, 11,209,161, 85, 32,214,254,184,  5,109,219,182,133, 79,243, 16,244,104, 30,  2,131,238, 47,247,191, 27, 11,153,
+140,245,255,229,228, 33,120,239,211,117,104,213,158,106, 84,249, 49,214,255,176,157, 63,225, 64, 76, 52,168,150,125,  1,212,100,
+  5,  4,128, 27, 42,149, 69, 73,204,  2,187,  4, 62,203, 39, 93,167,  6,207, 33,210,144,177, 85,202,182, 29,187,161, 82,  2,220,
+192, 45, 84,221, 44, 66,209,124, 19,170,203, 90,226,202,241, 44,214, 47,132,166,105, 74, 34,145, 16,141, 70,  3, 43,203,147, 72,
+ 36, 18,208, 52, 77, 61,138,206,178,170,170,234,219,119,222,121,103,244,154, 53,107,196, 62, 62, 62, 80, 42,149, 88,178,100, 73,
+165, 94,175,127,193,149,255,195, 88,252,204,116, 57, 71,  3,  1, 19, 19, 19, 41,115,146,159, 70,147, 63,  0, 88, 17,187,221, 50,
+183,151, 97, 80, 46,151,235, 21, 10, 69,223,109,219,182,157, 83,169, 84,205, 12,134,154,105,166,117,201,191, 75,151, 46,232,219,
+183,239, 72,185, 92,110,239, 63,  5, 21,183,175,227,171,207, 62,193, 47,187,247, 97,248,128, 94, 56,148,242,123,141,  1,211, 60,
+  4, 62,205, 67, 16,158,147,131, 23,198,189, 86,156, 91,162, 30,  6, 96, 59, 91,235,127,230,234,221,136,123,107, 24,154, 55,149,
+ 90,148,139,186,229,208,200,108,138,156, 39,224,  9, 82, 10, 88, 41,  0,  0,240,225,156, 15, 82,191,253,150,150,221,104,249, 20,
+218,119,236,172,244,246,144,128, 38,128, 70,167, 71, 78, 78, 14,138,114,206,202,188, 60, 61, 48,125,250,116,187, 13, 87, 34, 22,
+ 99,219,254,193, 50, 38,  2,190, 65,119,  4,143,  7, 15, 15,246,214, 19, 51,  5,208,195,191, 41,104,147,161,134,252,205, 48, 80,
+110,118, 83,236,214,  5, 51,165, 38, 98,214,178, 90,164,229, 12,249, 91, 43,  1,214,137,127, 74, 75, 75,237,191,  0, 59, 74,192,
+  6,171, 89,194,107,230,191,253,215,142,161, 26,158, 44,229,180,242,247,194,182, 83,103,113,225,202, 85,244,150, 69,214, 34,125,
+ 71,200,159,193, 75,239,126,129, 29,189, 60,240,238,152, 78, 46, 41,191,217, 33,189,241,193,174,109,160,190,250, 20,251,130,159,
+197,146,234, 11,181,206,143,245,241,197,130,138,114,135,136,227,200,162,156, 84, 63, 65,  4,242,203,174,163,168,228, 14,238,101,
+121,130,111,242, 70,255,167,  7, 98,203,241, 45,143,180, 83,115, 81,182,191, 83, 63,255,252,115,  4, 69, 81,  7,191,255,254,123,
+241,203, 47,191, 92,169, 86,171,135,193,137, 49,255,134,224,138, 41,128,114,185,159, 75,200,223,134,149,106, 79,249, 96,113,111,
+242, 98,133, 66, 17, 82, 85, 85,245, 85, 70, 70,198,172,130,130,  2,168, 84, 42,  8,133, 66, 52,107,214, 12, 65, 65, 65, 47, 43,
+ 20,138,223, 54,108, 96,181, 36,192,101,  0,225,173,252,189,240,220,115,207,225,236,181,  2,  4,182,235, 90,171,189,189, 48,238,
+ 53, 53,128,165, 95,197,205,218,206,246, 57,166, 72,159, 70, 68,202, 31,136,249,244,127, 24, 52,104, 16,130,131,131,109, 42, 90,
+ 46,124,237,148, 19,228, 79, 26, 56,206, 41, 17,143,128,244, 89,165,  2,  6,128, 15, 63,252, 48,117,249,242,229,210,211,169, 89,
+ 50,160, 38,146,150, 16,  2,145, 72,132,143, 62,156,195,186,209,190,235, 96,154, 95,182, 96, 92,253,124,163, 26, 48,170, 45, 17,
+240, 12,241, 59, 58, 23,139,113,245,103, 95, 60,131,236,139,103, 16, 20, 20,132,162,162, 34,167,136,223, 39,168, 57,244, 44,130,
+ 35,217, 34,230,139, 13, 56,113,212,117,197,120,243,230, 77,203,106,127,  6,157,246, 62,242,119,132,248, 25,252,171,151,135,203,
+202, 15,  0,168,248,143, 44,196,207,144,255, 13,149, 74, 54,214,199, 23,201, 64,234,130,138,114,167,158,253,215,  5,  7,173, 58,
+ 30, 13,  0, 96,203, 69,246,  9,123,  8, 33,148, 72, 36,178,120,  1,152,239,  0, 32, 18,137, 40, 91,223, 31, 50,142,253,244,211,
+ 79,131,182,111,223, 62,187,178,178, 50, 30, 64,186,171,255,192, 21, 83,255, 92, 76, 78, 46,135, 92, 46,215,  0,152,109,222, 26,
+245, 62,206,159, 63,223, 31, 64,187,192,118, 93,213,  6,157,214,221,220,222, 42,  1, 84,  0,184,220, 58,192,253, 21,185, 92,238,
+ 80,133,142,248,100,205,195, 34,126,167, 20, 45, 39,175,231,224,  2,132,133,133,177, 34,127,187,  6,104, 99, 87,234,123, 16, 96,
+198,246, 25,226, 71, 35,137,159, 25,155,174, 40,204, 71, 69, 97, 62,130,130,130, 26,101,241,  3,128,209, 68, 59,236,125,104,  8,
+133,165, 21, 78,223, 75, 93, 48, 99,251,174, 34,254,  7, 80,126, 20,  0, 12,247,240, 32,214, 86,127, 79,129, 91,163,136,255, 31,
+134, 63, 43, 43, 43,163,185, 98,120,244, 56,114,228,136, 66,161, 80,252, 47,183, 68,173, 54,232,180,214,227,145,222,173,  3,220,
+253,156, 88,253,143,  2,106,134, 50,254,110, 74, 21,135,135,171,  4,176,170, 76,206,174, 35,204,129,  3,  7, 14, 28, 56,112,248,
+251,130,199, 21,  1,  7, 14, 28, 56,112,224,192, 41,  0, 28, 56,112,224,192,129,  3,  7, 78,  1,224,192,129,  3,  7, 14, 28, 56,
+112, 10,  0,  7, 14, 28, 56,112,224,192,225,137, 64,173, 89,  0,103,207,158,117, 58,138,212, 86, 48, 33, 39,143,147,231, 42,121,
+230,181,213,121,  0,104, 91,201, 87,184,242,171, 95, 94, 88, 88, 24, 83,118,204, 92,110,114,246,236, 89,154, 43, 63, 78,222,223,
+ 73, 94,120,120,184, 32, 35, 35,195,  8,  0,125,250,244, 33, 29, 59,118, 68, 66, 66,  2,197,149,159,109,121, 14, 43,  0, 79,  8,
+ 26,149,100, 34, 42, 42, 74, 10,192, 58,101,168, 44, 49, 49, 49,149,211, 21, 31, 13,190,249,230,155,215,207,159, 63,223,227,228,
+201,147, 31,136, 68, 34,168,213,234,143, 20, 10,197, 34, 22, 25,216, 56,252,213,177, 16,  0, 38,174, 36, 30,111, 68, 70, 70, 74,
+247,238,221,155,234,228,111,101, 73, 73, 73,135, 93,148, 80, 10,145,145,145,175, 36, 37, 37,109, 89,181,106,149, 63,128, 42,  0,
+166, 71,221,230, 24,242,143,137,137, 33, 27, 55,110, 68,239,222,189,185, 74,211, 72, 60, 81, 67,  0,102,242,110,212,239,183,109,
+219, 86, 55, 95,184,178, 49,114,163,162,162,164,230, 57,187, 36, 42, 42,138, 56, 42,139, 56,  8, 91,243,131, 27, 41, 79,250, 40,
+222,165, 66,161,160,102,204,152,177,232,226,197,139, 63,180,105,211,230,  3,177, 88, 12,157, 78,  7,  0,223,236,216,177,131, 30,
+ 51,102,140,236, 17, 53, 25,226,248,246, 48,229,213,187,  6,187,245, 90,236, 78,173,207, 30, 21, 21, 37, 37,132, 16,242, 31,219,
+178,153,115,246,234,160, 45,220,188,121,147,220,188,121,211,101,  4, 83, 90, 58,180,214,122,  5,174, 38,106,138,162, 28,146, 75,
+211,132,152, 76,132,208,180,237, 45, 50, 50, 82,154,148,148,228,212, 42, 84,171, 87,175,126,126,223,190,125,135,  7, 15, 30, 12,
+138,162,200,230,205,155,135, 58,122,111,117,183,125,251,246,109,121,181,159, 16,242,105,242,210,235,158, 57,219,167, 78,141,165,
+153,115,246,228,169, 84, 42,162, 82,169, 26,172,135,204, 53,206,190,159, 43,167,100, 72, 89,157,137,240,240,112,206, 16, 96,111,
+  8,220,151, 32, 72, 96,167,193,219,204,155,109, 47,159,246, 35, 68,163,150,113,219,182,109,155,114,194,132,  9,  0,106,146,106,
+ 88, 85, 78,165, 51, 94,  5, 70,161, 96,114,254,155,211,144, 42,163,162,162, 28,243, 42, 36,250, 59,240,175,246,219,190,106,212,
+219,236,197, 57,190,174, 77,125, 13,146,117,249, 41, 20, 10,170,162,162, 98,107,183,110,221,198,  1,224, 17, 66, 32,145, 72, 80,
+ 88, 88,136,242,242,114,248,248,248,160,176,176,240,240,152, 49, 99,100, 59,119,238, 76,117,240,157, 16, 38, 29, 44, 69, 81, 24,
+ 55,110, 28,134, 14, 29, 42,155, 54,109, 26,107, 57,187,118,253,106,249, 62,122,244,203,118,247,237, 65,115,226,221,191,138,187,
+223,178, 90,251,117,143, 73,250,217, 95, 84,137, 89, 78,216, 26,105,105,105,152, 63,127,254,125,239, 98,224,192,129,228,232,209,
+163,172,234,114, 98, 98,162, 18,159, 82,204,254,253,137,103, 62,165, 26,221, 25, 63,198,125, 75, 45, 75, 91,161, 80,200, 98, 99,
+ 99, 49,104,208, 32,114,236,216, 49, 86,191, 61, 81, 79, 78,198,157,137, 31, 32, 41, 41, 73,201, 44, 18, 54,104,208, 32, 82, 89,
+ 89,217, 16,225, 75, 99, 99, 99, 45,245,245,183,223,126,115,167, 40, 10,209,209,209,247,  0,  4, 79,156, 56,241,160, 66,161,224,
+ 57, 98,177, 47, 58,184,200,242,253,110,242, 29, 80, 20,133, 77,239,187,  3,160,240,237,107,223,188, 20, 24, 24,  8,  0,216,188,
+126, 19,235,178, 10, 15, 15, 71,251,246,237, 93, 82,238,225,225,225,188,140,140, 12,186, 79,159, 62,100,227,198,141,184,151,213,
+ 22, 40,246,227, 88,221,  1,242,119,212,  3, 64, 18, 19, 19,239,211,176,172, 58, 80,226, 68,227,118,169, 53, 89, 87, 94, 98, 98,
+162,245,130, 24, 14,131,162, 40, 42, 49, 49,145, 98, 58, 32,243,167,211,150, 38, 67,254,230,123,162,172,238,205, 97, 69,133,154,
+ 80,102,217,216, 28,183,  7,207, 61, 43, 45, 27,155,227,142,144, 63, 33,  4,204,234,108,132, 56, 86, 77, 20, 10,  5,175,172,172,
+236,127, 62, 62, 62,227,  0,240, 38, 79,158,140,152,152, 24,  8,133, 66, 72, 36, 18,136,197, 98, 80, 20,  5, 62,159,143,138,138,
+ 10,214,229, 24, 17, 17, 33,  5, 64,182,111,223, 14,230,157, 16, 66,176, 99,199, 14, 76,155, 54, 77,105, 62,255,216,193,150, 66,
+240, 40, 60,107,137,137,137, 74,  0,212, 43, 87, 38, 96,194,101,155,109,140, 76,184, 28, 37,163, 62,119,170,221,145, 15, 63,252,
+ 16,237,218,181,115,201,253, 82, 20, 69,228,114, 63,  4,  4, 28,114,105, 57,140, 24, 49, 98, 72, 74, 74,202, 97, 66,  8, 21, 27,
+ 27,155,234,  8,249,215,135,157,137, 31, 32, 62, 62, 30, 52, 77,227,131, 15, 62, 96,165, 80, 88,147, 63,  0,236,219,183,111,247,
+160, 65,131,  0,192, 47, 58, 58,218, 56,120,240, 96,200,229,114,218, 28, 55,195,198,203, 88,107,127,201,146, 37,120,229,185, 26,
+219,112,211,251, 18,188,218, 79,136,143,134,127,200,250,153, 60, 60, 60, 48,104,208, 32,100,100,100, 88,250,211,186, 27,115, 13,
+ 91,101, 47, 35, 35,131,  6,106,150, 89,  7,  0,111,247, 98,142,213, 27, 73,254, 13, 42,  0, 12, 89,101,100,100, 88,210, 78, 90,
+ 91, 79,142, 18,173, 85, 39,226,234, 78,169,174, 50,224, 82,215,176,141, 33,  1,135, 97,173, 80,152,173,255, 39,177,158, 17,235,
+206,164,160,160,192,114, 34, 63, 63,159,181,194, 88, 81, 81,241,181, 90,173,126,141,199,227,241, 38, 78,156,136,138,138, 10,220,
+190,125, 27,110,110,110, 16,  8,  4, 16,  8,  4,112,115,115,131, 68, 34,129, 70,163,  1, 27, 23,226,170, 85,171,164,  7, 15, 30,
+ 84, 82, 20,133,241,227,199,131, 16,194, 40,121,212,248,241,227,  1,  0, 41, 41, 41, 74,174,171,104,152,252,205,239, 87,102,173,
+ 36, 51,239,222,218,171,229,140,  5,159,152,152, 72,153,223, 11, 86,173, 90,229, 18,101,108,222,188,121,140, 81,208,104,207,196,
+240,225,195, 35, 78,157, 58,149,210,182,109, 91,116,232,208,129,244,239,223,223,226, 57, 49,175,254,232, 20,249, 47, 94,188, 24,
+ 20, 69,129,199,227,225,212,169, 83, 96,227,141,169,227,145,120,137,162, 40,188,250,234,171, 70,243, 33,125,116,116,116,165, 84,
+ 42,197,180,105,211,232, 23, 95,124,209,238,179, 91,175, 74,122, 55,249, 14, 64,  1,  9,239,253,149,181,120,211,251,238,136,238,
+ 47,194,220, 23, 62, 98,125, 95,108, 44,127, 54,215,196,196,196,144,240,240,112,203,118,234,212, 41, 84,231,134,  3,122, 13, 40,
+ 79, 35, 82,190,188, 12,235,243,204,198,181,220,218,228, 31, 59,119,129,205,243,130,134, 26,100,120,120, 56,201,200,200,  0,227,
+  9, 96,136, 43, 60, 60,220,161, 70,254,160,201,223,218,170,126,220,  3,246,172,135,  4,158, 56, 13,128, 16, 20, 20, 20,224,238,
+221,187,150, 99,117,247,237, 88,255,252,253,251,247,191, 24, 26, 26, 10, 62,159,143,236,236,108, 16, 66,112,245,234, 85,232,245,
+122, 80, 20,  5,129, 64,  0,138,162, 96, 50,153,160, 86,171,177,115,231, 78,187,114, 15, 29, 58,164,  4,128,241,227,199,223, 87,
+111,153,161, 30,134, 40,216,212,235,186,110,125,123,251,108,172,124,  6,245, 13,  7,176,113,253,215, 69, 90, 90, 26,204,150, 97,
+227, 20,224, 79, 41, 80,159,215, 40,112,214,202, 43, 33,  4,248,148,194,132,203, 81, 78,  7,202, 82, 20, 69,204,239,197, 66, 70,
+230,247, 69, 53, 70, 94,199,142, 29,239, 35, 55,103, 33, 18,137,200,197,139, 23, 81, 84, 84, 68, 21, 21, 21, 33, 44, 44,140,220,
+188,121, 19,124, 62, 31, 70,163,209,169, 63, 24,220,159,207, 40, 15,152, 51,103, 14,150, 44, 89,130,163, 71,143,130,162, 40,140,
+ 26, 61, 21,183,110,178, 91,192,113,223,190,125,191,154,223,177, 22,  0,109,222, 16, 29, 29, 93, 14,192, 55, 41, 41,  9,145,145,
+145, 82,107,133,188, 33,212, 88,255,247,175, 99, 82, 51, 28,  0,108,222,116,198, 33,121,141,197,149, 43, 87,112,234,212,169, 90,
+199, 76,229, 55, 96, 52,208,  0, 85,  5,223, 23, 12, 56, 85,103,177,107, 46, 56,144, 29,249, 55,232,  1, 48, 91,255,148,181, 39,
+128,177,252, 51, 50, 50, 26, 67,254,246,  2,148,156,146,103,229,153,144,194,137,  0,167,  7, 96, 57, 17,171,206,199,114, 63,204,
+ 49, 87,  5, 39,145,109,126,150,205, 21,168, 30, 57,221,178, 57, 96,249, 19,166,179,109,217,178, 37,122,247,238,109,105,132,204,
+126,221,107,235,129,175,191,191,127, 55,157, 78,135,210,210, 82,156, 56,113,  2,233,233,233, 40, 42, 42,130, 70,163,  1, 51, 70,
+ 74,  8,129,193, 96,128, 78,167, 99, 53,196,192,212,141,250,200, 61, 49, 49,145,162, 40, 10,108, 61, 51,187,118,253,106,217,216,
+236,219,131,230,196,187,181,136,158,217,172,247,173,175, 97,139, 65,131,  6, 33, 45, 45,173,113, 21,194,106,204, 31, 53,195, 88,
+ 50, 51, 57, 83,204, 57, 52, 50,246,198,250,189, 48, 94,  0, 87,193, 21, 94,128, 22, 45, 90, 32, 63, 63,159,170,171,236, 58, 75,
+254, 59, 19, 63,176,212, 97,  6,  3,  6, 12,  0,  0, 28, 57,206,126,178, 70,100,100,228,112,243,216,255, 37,  0,106,115,127,206,
+108, 22,173,155,109,112, 97,237,177,127, 27,202,149,131,242, 92,129,140,140, 12,170,119,239,222,168,186, 52,  2,101, 39,154,161,
+252,152,  4,164,172, 28,168,  6,120,106, 35, 42,143,242,160,249, 67,136,242, 19, 77,176,127, 83,  4,122,247,238,237, 16, 63,253,
+211, 33, 96,211, 56, 25, 79,128,163,150,255,220,185,115,201,194,133, 11, 93,118,179,246,228,153, 59, 41,151, 85, 78,182, 99,104,
+ 13,145,142,149,172,106,185, 92,238, 89,223,121,103, 97, 61,246,239, 10, 37,192,122,236,159,173, 18, 16, 19, 19,  3, 15, 15, 15,
+120,122,122,194,203,203, 11, 62, 62, 62,180,159,159, 31, 47, 41, 41,  9,175,191,254,186,229, 58,177, 88,140, 97,195,134,161,  1,
+ 37, 32, 64,175,215,163,180,180, 20, 90,173, 22, 62, 62, 62, 16,137, 68, 48, 26,141, 32,132,192,100, 50, 65,175,215,195, 96, 48,
+192,100, 50, 57, 20, 95, 96, 14, 90,171,247,188,181, 21,250, 40, 97, 47, 32,208, 81, 52, 86,  9,160, 62,175,127,184,111,194,229,
+ 40, 51,185, 58, 41,187,142,245,111,117, 28,227,199,143,119, 56, 24,176,174,245,111, 45,207, 89,132,135,135, 19,147,201,132,176,
+176, 48,114,246,236, 89, 42, 44, 44,140, 24, 12,  6, 84, 84, 84, 52,134,212,106, 58, 95,129,  0,179,102,205,194,169, 83,167,240,
+215,184, 63,251, 58,189,127,255,254,253,  3,  7, 14,  4,  0, 47, 51,233,171,  1, 96,203,150, 45, 77,142, 28, 57,226,109,110, 31,
+148,249,211,174,224, 37,223, 47,193,171,125,239,183,254, 99,126, 80, 99,203,  9,  3,  8, 33,232, 57,177, 39,206,108, 58, 67, 61,
+ 76,227, 42, 35, 35,131,146,253, 43,156,236, 95,210,  6,130,234, 74,192, 88,243,215, 52,  0,161,  0, 40,184,235,139,195,185,225,
+166,213,155,139,248, 25, 25, 25, 84,120,120,184,152,137, 21,224,172,255,  5, 13, 94,103,119, 26, 96, 84, 84, 20, 97, 42,172,117,
+ 60,  0, 27, 44, 92,184,144,177, 24, 92,  2, 22,242,156, 30, 95, 55, 79,209,171,181,165,164,164,208,204,172,128,198, 90,236,177,
+177,177,158, 79,114,133, 91,189,122, 53, 22, 47, 94, 92,171, 94, 49,228, 63,122,244,104,140, 30, 61,186,198,194, 57,114,164, 33,
+ 49,254, 57, 57, 57, 90,147,201,132,178,178, 50, 20, 23, 23,163,172,172, 12,106,181, 26,106,181, 26,213,213,213,168,172,172, 68,
+ 69, 69,  5, 52, 26, 13,116, 58, 29,216, 52,116,138,162,176,125,251,118,135, 20,182,191, 51,210,210,210,106,109,214,152, 53,107,
+150,212,122,159,205,152,179,141, 49,255, 90,150,123, 99,162,246,109,253,150, 16, 66,109,223,190,221,165,177,  0,219,183,111,119,
+184, 13,247,234,213,139,152, 76, 38, 75,130,150,176,176, 48, 66,211, 52,238,221,187,  7,149, 74,229,212, 51,255,123,238, 96, 28,
+ 57,114,  4,244, 86, 95, 16, 66, 16, 31, 31,111,121, 71,105, 39,104,176, 29,249,136,140,140,124, 25,  0,162,163,163, 11,204, 10,
+128,110,243,230,132, 38,211,167, 79,111,114,228,200, 17,140, 24, 49, 34,194,145,156,  0,119,147,239,128,  2,133,  4, 43,235,127,
+226,247,106,240, 95,173,192,230, 19,122,204,156, 57, 19, 11,247,127,243,208,235,114,120,120, 56,159, 81,  2, 94,152,105,  4,209,
+248,  0,149,  0, 42,  1,126, 21, 80,121, 15,216,119,166, 25,172,200, 95,144,145,145,161,229,200,223, 62,249,219,245,  0,212, 29,
+247,183,142,  7, 96,235,102, 73, 76, 76, 76, 53,  7,  8, 41,235,120,146,156,237, 48,238,147,199, 12, 11,152,199, 33, 93,226,254,
+ 25, 58,116,232,133,148,148,148,110,143,227, 11,102,172,126, 87,185,253, 25,171,223,  1,183,127, 45, 36, 36, 36, 88,190,255,247,
+191,255,197,207, 63,255, 12,  0,122,  0, 66,134,248,  1, 96,216,176, 97,246, 20,  0, 77,104,104, 40,212,106, 53,244,122, 61,138,
+138,138, 32, 18,137, 32, 16,  8, 44, 30,  0,149, 74,  5,181, 90, 13,157, 78,135,138,138, 10,140, 27, 55, 78,182, 99,199,142,  6,
+239,143,177, 50,237, 76,107,197,248,241,227,237, 42, 10, 53, 10,205,131,139,  1,112,230,124, 93, 88, 77,247,187, 15,241,241,241,
+202, 89,179,102,201,226,227,227, 83, 31,105, 29,174,199,250,183,134, 35,177,  0,245, 89,255,206,162, 87,175, 94,228,244,233,211,
+ 84, 88, 88,216,103, 76,213, 54,153, 76,159,122,120,120,160,184,184,216,169, 62,230,147,143,  7, 35, 53, 53, 21,212,246,  0,  0,
+192,129, 79,188, 48,236,203, 42, 12, 26, 52,  8, 95, 45, 60,  2, 66,  8,107,111,197,190,125,251,118, 14, 30, 60, 24,  0,138,182,
+108,217,212,226,200,145,163,190,132, 34,120,113,196,139,163,247,238,221,187,123,239,222,189, 14,121, 57,151, 44, 89,130, 87,251,
+185,213,182,248, 65, 48,107,230, 44,  4, 15,107,138, 71, 21,183,148,145,145, 81, 75,195, 39, 85,128, 72, 15,208,132,130,209, 68,
+ 32, 34, 64,176,132,103,125,189, 17, 28,106,140,178,133, 31,215,171, 32,132,133,133, 53,172,  0, 88, 71,252,155,201,223, 18, 44,
+197,120,  2,216,106,254, 54, 72,187, 81,176, 33,207,229, 99, 82,177,177,177,221, 82, 82, 82, 92,217,225, 61,169,245,140, 66, 77,
+ 20,184,197,146,126,243,205, 55,  1, 64,104, 85,151, 44,231,204,157, 86,125,184,216,183,111,223,215, 83, 83, 83, 19, 77, 38, 19,
+ 42, 43, 43, 97, 48, 24, 44,227,254, 90,173,214, 50,197,144,  9, 12,220,177, 99, 71, 42,139,250, 66,193, 60,  5,176,110,189,141,
+138,138, 34, 12,233, 15, 29, 58, 84,198, 70,  1,120, 80,121,  0,172,199,254,173,201,191,238,176,  0,139,247,209, 16, 72,124,124,
+188,242,149, 87, 94,193,214,173, 91,157,245,150, 73,173, 61, 39,204, 62, 19, 48, 56,225,114, 20,185,118,237, 90,189,191,103, 18,
+254,236,223,191,191, 94,143,221,141, 27, 55, 88,123,102, 74, 75,135, 18,  0,136,136,200, 65, 78, 78,142,205,232,242,146,146, 33,
+  0,202,  0,216,239,183,186,116,233, 66, 78,159, 62, 77,153, 59,203,207,  0,128,199,227,125,122,235,214, 45,148,149,149, 57,213,
+144,121, 60,170, 70, 97,103,200,255,156, 17, 63, 43,245,  0,128,175, 22, 30,113,184,143, 96,218,196,244,233,211,195,  8, 33,136,
+ 28, 25, 57,110,207,238, 61,191,176, 37,126,107, 81, 47,143,121,233, 18, 69, 81, 93,  8,  1,248,175, 86,128, 16,130, 89,179,103,
+161,233,176,102,141,204,171, 90, 51,173,151,169,119,141,201, 36, 24, 30, 30, 78,182,125,220, 28,158, 37, 55,112,189,178, 37,218,
+137,138,  0,143, 96,  8, 84,247,224,173, 42,  1,208,196,226, 49,168,171, 52,112,112,194,  3, 96, 61,221,175,206, 52, 54,146,152,
+152,232,176,203,212,138,180, 93,114,227,214,242,152,249,255, 79,232,244,186,191,  5,234,148,125,173, 41, 98,245,156,187,175, 51,
+144,203,229, 70,133, 66,177, 99,240,224,193, 51,146,146,146,150, 26,141, 70,148,151,151, 91, 98,  0,  0,160,168,168,  8,229,229,
+229, 32,132,192,145,250, 20, 17, 17, 33, 59,120,240,160, 50, 49, 49,177,150,245,201,252, 62, 34, 34,194,161,100, 64, 15,  2,154,
+ 19,239, 58, 67,248,247, 17,188,157, 46,155,162, 40,138, 56, 67,254,102, 79, 91,170,173,182,  8,  0, 86, 65,129,172, 48,109,218,
+ 52, 37,139,255, 36, 14,204, 21,175,245, 89,155,136,216, 37,199,107,215,174, 29,185,116,233, 18,227,242,255, 12,192,167, 58,157,
+ 14,215,175, 95, 71, 69, 69,133,179, 84, 72,232,173,126, 56,112,174,198, 56, 93,167,212, 99,203,  9, 61,  8, 33, 56,122,210,249,
+145,197,180,180, 52,140, 24, 49, 66,182,119,239,222,212, 61,187,247, 56, 43,134, 71,211,180, 27,  0,108, 61,105,192,204,153, 51,
+209,116,120, 51,246,234,164, 13,168, 84, 42,  0, 64, 78, 78, 14, 89,189,122,181, 69, 33,179,142, 37, 89,183,110,157,117,255,192,
+234, 95,218,240, 84, 64, 80, 24, 94, 95, 83,  1, 32,184,166, 12,222,  9, 68,107, 65, 30,190, 28, 90,136,245, 29, 95, 37, 91,182,
+108,249,199,  7,  0, 50,214,189, 45,203,191,238,249,134,134,  0, 40,243, 16,192,125,211,166, 28, 25,  2,176,217, 81,184,142,116,
+172,229,185,116,254, 63, 51,246,239, 44,236, 41, 36,142, 42, 44,245,185,251,157, 29,  6,168,207,221,239,228, 48,128,117, 80, 16,
+229,192, 57,216, 80,  2,  8,128,101, 10,133, 98, 85, 66, 66,130, 65, 40, 20, 66,167,211,193,104, 52,130,166,105,248,250,250,162,
+172,172, 12,142,102, 83, 60,120,240, 96, 42,106,230,253,147,237,219,183,195,172,  8, 88,166,  6, 30, 60,120,240, 31,209, 57,188,
+242,202, 43, 68,165, 82, 97,207,158, 61,142,214,103,169,157,242, 38, 19, 46, 71,201,216,120,227, 62,252,240,195,251,140,139,186,
+248,232,163,143,  8,219, 32, 79,185,220,207,174, 60,185,220,143,149, 48,137, 68,194,116,146,132, 16,  2,181, 90,141,219,183,111,
+ 59, 61,230,111,141,225, 95, 86,213,218,111, 12,249,155, 76, 38, 10,  0,156,176,248,235,130,222,245,219,238,142,214,153,  0, 93,
+133,134, 20, 50, 43,  5,128,149,245, 47, 31, 31,114,251,167, 44, 52, 87,108,191, 94, 43,202,127,208,242,112,114,120,218, 83,184,
+118, 79,130,134,188, 78, 28, 28,244,  0,152, 95, 28,229,200,241, 71,108,129,166, 62,102,247, 67, 57, 96, 49,219, 81, 68,134,186,
+236,190, 38, 76,152, 32,115, 34,189,111,131, 22,154, 13, 11,180, 33,235,148, 85,208,152, 92, 46, 55,  2,160,198,141, 27, 39,205,
+205,205, 85,106, 52, 26,152, 76, 38,116,233,210, 69,214,187,119,111,167,223,247,246,237,219,173,167,156, 57,229, 53,122,208, 49,
+  0,246,246,217,232,139,230,232,240,218,132,115,244,168,195,110,127,243, 92,127, 50,225,242,253, 10, 28, 33,132, 48, 57,  2,172,
+ 20, 50, 75,192,156,179,109,  3,  0,182,109,219, 70,185,170,173,177,189,  6,  0, 74, 75, 75,209,174, 93, 59, 82, 89, 89,137, 54,
+109,218, 32, 51, 51,211, 37,125, 29,239,149, 50, 80, 20,133,209, 47,197, 50,110, 24, 44, 90, 56,205,242,221,209,140,153,174,130,
+ 92, 46,167, 87, 29, 89,229, 82,153,147, 38, 77, 50,123, 93, 20,158,  0,140,230,141,200,229,114,218,234, 26,135, 30, 88,177,253,
+122,115,107,238, 97, 92,253, 25, 25, 25,148,252,208,171,132, 35,255,  7,160,  0,252,141,208,232, 70,250,184,230, 31,119,245,125,
+ 61,  0, 47,204,  3, 45, 55,243, 24,191,229, 63, 46, 95,190,252,136,223,  8, 77, 61,222,242,106,202,202,209,140,114,245,226,211,
+ 90,235, 88, 16, 91,231,204,150,119,234,147,208,145,220,189,123,215,242, 62,114,114,114, 92,246, 78, 20,138, 85, 68, 46,159, 70,
+253,246,171,130,213, 15,156, 93,222,213, 25,152,167,245,185,188, 79,104, 72,185,118,176,223,240, 64, 77, 76,145,193,202,  8,181,
+140,243,115,110,127,176,173, 83,247, 87,204,135, 89,209, 56,112,224,192,129,  3,  7, 14,143,  7,120, 92, 17,112,224,192,129,  3,
+  7, 14,156,  2,192,129,  3,  7, 14, 28, 56,112,224, 20,  0, 14, 28, 56,112,224,192,129,  3,167,  0,112,224,192,129,  3,  7, 14,
+ 28,158,  8,212,154,  5,192,228,188,118,  6,182,130,  9, 57,121,156, 60, 78,222,195,147, 23, 23, 23, 87, 91,187,231,241, 44,217,
+229,172,167,154, 49,217, 20,173,167,158,217, 74, 31,236,233,233,  9,177, 88,108,249, 61,143,199,  3,159,207,191, 79, 30,179, 48,
+ 19, 77,215,204,242,170,111,177, 28,238,253,214, 15,133, 98,181,148, 47, 16,129,208, 70, 76,157,250, 86,170, 51,242, 86,173, 90,
+ 37,203,204,204, 20,132,133,133,165,212,205,186,231,164, 60,105,102,102, 38, 86,174, 92,153,202,181,183,191,159, 60,135, 21,128,
+127, 34,  2,  3,223,170, 85,112,197,197,107,169,199, 74,222, 91,129,  4,  0,138,215, 22, 83,214,223, 27, 33,178,145,201, 61, 31,
+184,188,127, 44,214, 44, 93, 44, 45,186,112,  2,131,252,138,148, 45,140,121,200, 34,237,112, 74,229, 47,243, 14,125, 22, 51,102,
+207, 73,181,247,251, 99,199,142, 97,192,128,  1, 22,226,103,  8,155,162,168,251,  8,155,166,105,203,118,235,214, 45,155,242, 78,
+159, 62,141,240,240,112, 72, 36, 18,  8,  4,  2,240,249,252, 90, 50, 25,210, 55,153, 76,150, 77,167,211, 33, 35, 35,  3, 29, 58,
+116,120,226,222,143, 66,161,160,228,114, 57, 89,181,106,149,244,234,213,171,184,118,237,154,210,215,215, 23, 27, 55,110,108, 84,
+253, 95,189,122,141, 84, 36,246,135,175,223, 83, 74, 85,117,129,108,245,234, 31,165, 43, 86, 56,150,251, 97,229,202,149,210,196,
+196,196,195, 89, 89, 89,216,179,103, 15, 66, 67, 67,241,193,  7, 31,240,173,231,222, 59, 33, 79,153,115, 61, 27, 29, 66,218, 67,
+ 40, 18, 97,230,204, 89,207,199,198,198, 42,185,150,250,132,122,  0,254, 78,136,136,136,176,171,241, 28, 60,120,208,110,195,100,
+  8,186, 46,113, 59, 11, 87,203,123,  0,160, 28, 36,109,187,169,101, 93, 44,143,205,239,235,254,255,223,155, 88, 86,173,146, 94,
+ 58,118,  0,185, 91,190, 85,170,213, 58, 24,158,229, 65,210,146, 66,199,220,115,120,198,139, 40,203,138,254, 68,243, 85,255,145,
+141,155,246,121,131, 74,192,165, 75,151,192,231,243, 49,112,224, 64,  8,  4,  2,203,198, 40,  4,140,213,111, 52, 26, 97, 50,153,
+ 96, 48, 24,112,235,214, 45, 28, 62,124,216,166, 60,181, 90,141, 51,103,206,160,111,223,190, 16, 10,133,112,115,115,171, 37,147,
+166,105, 24,141, 70, 24,141, 70, 24, 12,  6,104, 52, 26,156, 57,115,  6,213,213,213,143,  3, 89,243,204,117,131,  7,192,216,152,
+ 60,244, 10,133,130,138,139,139,163,227,226,226, 16, 16, 16,128,127,255,251,223, 24, 63,126, 60,170,170,170, 16, 16, 16,224, 84,
+  6,210,128,128,  0,203,253,204,155,247, 49, 54,108,202,128, 68,210,  4,124,190, 80, 89, 93,149,231,176,204,244,244,116, 84, 87,
+ 87,163,111,223,190,183,134, 14, 29,218,172,164,164,  4,  7, 14, 28, 48, 77,157, 58, 21,107,214,172,105,176,141,232,110,102,223,
+ 87, 54,231,175, 92, 65,170,151, 59,102,199,127,158,215,179, 87,183, 86,119,242, 11,113, 32, 41,245,240,230,205, 91,134, 70, 71,
+191,122,136,163,206,199, 31, 76,234,223, 58,158,  2, 86, 10, 64,221,212,173,246,246, 31, 58,249,191,253,246,219, 13, 94, 83, 86,
+ 86,  6,  0,132,141, 18,192,144,117, 99,173,245,  7, 33,207,218,242,119,129,245,239, 40,105,179, 37,107, 87,203,179,190,214,250,
+ 19,  0, 80, 90, 90,147, 25,209,223, 63,229,137,104,168, 55,255, 72, 65,135, 60,165, 50, 79, 77, 99,108,  7, 62,158, 10, 50,130,
+246, 39,112,243,231,163,170, 68,  8, 73,149,  6,157, 51,151, 41, 55,196,199,201, 94,159, 53,191, 94, 37,128,162, 40, 92,190,124,
+ 25, 66,161, 16,207, 63,255,188,133,180,221,220,220,192,227,241, 64,  8,129,193, 96,128,209,104,132, 78,167, 67, 94, 94, 30,148,
+ 74,101,189, 75, 42,243,120, 60, 24, 12,  6,100,102,102, 98,224,192,129,144, 72, 36, 16,137, 68, 22,121,140,  2,160,211,233, 80,
+ 93, 93,141,243,231,207, 67,171,213, 90,134,  9,216, 32, 58, 58, 90,202,231,243,149, 85, 85, 85, 16, 10,133, 40, 44, 44,124,119,
+236,216,177, 85, 98,177,120,131, 51,164, 29, 29, 29, 61,129,207,231,111, 77, 74, 74, 98,228,101,141, 29, 59,246,170, 66,161, 24,
+ 47,151,203,245,206, 88,194,113,113,113,202,249,243,231, 23,194,188,226, 76, 92, 92, 28, 46, 93,186,132, 38, 77,154, 32, 44, 44,
+ 12,235,215,175,119,152,252,127,154, 60, 25, 47,246,236,  9,  0,104, 58, 99,  6, 36,238,193,168,174,204, 69,101,197,117, 89,108,
+236,148,212,250,242,185,215,135,167,159,126, 26,133,133,133, 56,118,236, 88, 27, 30,143,135,243,231,207,195,223,223, 31,105,105,
+105,120,227,141, 55, 72,102,102,102,131,191, 47,249,122,118,173,125, 79,189,  1,205,141, 90,204,252,240,211, 86,241,139,254,139,
+111, 23,173, 64, 11,158,  9, 43, 22, 45, 78,121,227,141, 55, 96, 79, 30,135,199,143,252,153,227,108,215,  2,184, 47,255,183,189,
+253,135,  9, 87,174,212,247,119,128,181, 18,240,144, 60,  1,142, 90,234,148, 29,235,220, 25,121,182, 62,159,168,196, 85,223, 47,
+252, 74, 26,154,249,147,178,144,111, 66,  7, 31,160, 77,107,  2,254,211, 66,  8,218,183,135, 80,167,133,238,120, 30,116, 21,  2,
+240,105, 55,104, 83, 54, 40,215, 44, 95, 36,155,250,142,237,225,  0,198, 61,159,157,157, 13, 63, 63, 63,200,100, 50,136,197, 98,
+  8,133, 66,  8,  4,  2,139,213,175,213,106,113,251,246,109, 28, 57,114,  4, 60, 30, 15, 60, 30, 15, 13,201, 51,153, 76,184,120,
+241, 34,  6, 12, 24,  0,111,111,111,136,197, 98,240,249,124, 24,141, 70,232,245,122, 84, 86, 86,226,207, 63,255,132, 78,167,131,
+ 64, 32,176,196,  2,216,195,192,129,  3,165, 87,174, 92, 81,222,184,113,  3,149,149,149, 16, 10,133,104,218,180,233,178,163, 71,
+143,162, 95,191,126,  2,133, 66,241,179, 35, 74,192,192,129,  3,199, 92,185,114,101,107, 29,121,161, 71,143, 30, 13,237,215,175,
+223,102,179, 18,192, 74,222,202,149, 43,165,122,189, 30,119,239,222,101, 92,222,150, 66,154, 63,127,126, 65, 92, 92, 92,139,241,
+227,199, 63,255,254,251,239, 59,212,255,173,249,241,103,233,199,115,231,212, 58,118,119,233, 82, 52,125,185, 37,190,253,246,123,
+217,228,201,175, 57,213,159, 30, 59,118, 76,249,199, 31,127,224,227,143, 63,174,228,243,249,222, 98,177, 24,253,250,245,131, 82,
+169, 68, 82, 82, 18, 90,180,104,225, 64,203,163,176, 49,251, 14,118, 92, 43,192,174,223,214,131,207,167, 48,123,198,235,116,143,
+166,129,188,213, 51, 63,197, 26, 71,229,113,120, 36,228, 95, 87,137,180,165, 20, 56, 61, 11,224, 81, 47,111,219,190,125,123,153,
+189,237, 97, 91,235, 15, 66,158, 11,173,126,182,164,237, 12, 89,195,218, 58,103, 44,116,179, 28,226,164,188,122, 59,106,127,255,
+ 20,167,172,255,229,203,151, 75,167, 76,153, 66,234, 59, 86,247, 92,125,176,190,126,249,242,229,210,186,231,234, 30,107,176,188,
+ 46,158, 86,222, 46,168, 68, 19, 47,  1,218,123, 17,  8,  2,105,  8,158,123,  1, 30, 61, 54, 64,210,235, 59,136,124, 36, 16, 86,
+107,160, 86,155,208,154,175, 70, 90, 66,253,169,100,121, 60, 30,  4,  2,  1,220,220,220,112,237,218, 53,156, 63,127, 30,222,222,
+222,  8,  8,  8, 64, 64, 64,  0,  2,  3,  3,225, 32,132,148, 37,  0,  0, 32,  0, 73, 68, 65, 84,235,235,139,138,138, 10,164,165,
+165,129,207,231, 91,198,246,109,129, 57, 47, 20, 10, 97, 50,153,144,149,149,  5,119,119,119,  4,  6,  6,162, 73,147, 38,  8, 10,
+ 10,130,167,167, 39,178,178,178, 96, 48, 24, 44, 67,  4,245, 41, 20,117, 45,255,123,247,238, 41,175, 95,191,142,118,237,218, 97,
+248,240,225,232,211,167, 15,212,106, 53, 14, 31, 62,140,204,204,204,181, 90,173,246, 53,  7, 44,127,217,189,194,162, 95,114,238,
+ 84,192,171, 67, 95,132, 14,127, 11, 45,250,140, 70,153,142,135,131, 41,135,144,153,153, 57, 86,171,213, 78,101, 75,254,149,149,
+149, 56,119,238,156,242,216,177, 99,120,250,233,167, 17, 23, 23, 23,  8,128, 54,123,  0, 90,  0,128, 88, 44,102, 77,214,107,126,
+252, 89,186, 49, 97,183,212, 63,160,155, 50, 97,203, 57, 76,254,233, 39, 36,157, 57,131,164, 51,103,208,116,198, 12,  0,128,193,
+160, 58,226, 76,155,123,233,165,151,200,174, 93,187, 48,110,220,184, 91, 94, 94, 94, 60,119,119,247,140,244,244,116, 28, 59,118,
+ 12,197,197,197,  8, 13, 13,117, 76, 41, 61,115, 13,139,126,191,128, 53,139,230,157, 19,240, 53,224,153,170,240,205,146,159,120,
+ 91,211, 50,112,155, 39,192, 83, 79, 61,197,177,236, 19,  2,129,179,  4,255,168, 22,175,120, 96, 22,246, 63, 91, 17,120, 32,227,
+234,141,116,213, 83,118,142, 59,164, 84, 44, 90,180, 72,122,232,208, 33,101,118,118,118,189,199,210,211,211, 89,201, 98,174, 75,
+ 79, 79, 71,105,105,169,114,209,162, 69,178, 57,115,106,172,114, 91,199, 26,130,183,182,  4, 73,185, 90,180, 40,227,163,167, 55,
+133,160, 34,160,131,192,  7, 60, 42,  0, 68,123, 15,170,123, 20, 46,230,210,184,171,210, 66,192,227,161,187,191, 72, 89,223,115,
+ 91, 43,  0, 34,145,  8,215,175, 95, 71,139, 22, 45, 16, 17, 17,  1, 62,159, 15,154,166, 81, 82, 82,130, 99,199,142,193,205,205,
+ 13, 66,161, 16,122,189,190, 94,  5,128,241, 14, 48, 74,  0, 33,  4, 57, 57, 57,232,208,161,  3,124,124,124, 80, 93, 93,141, 51,
+103,206,192,100, 50, 65, 36, 18, 65,167,211, 65,167,211,213,219,119, 48, 65,116,  0, 80, 84, 84,164,204,207,207, 71,143, 30, 61,
+ 32,149, 74,209,178,101, 75,153, 74,165, 66, 80, 80,144, 50, 37, 37,  5, 39, 79,158,132,175,175,111, 95,133, 66,177, 73, 46,151,
+219, 93,223,189,168,168,232,240,189,210, 10,248,135,246, 69,251,129,175,192,183,101, 40,116,170,114,228,254,177, 23,215, 14,173,
+103,228,177,122,191,230,216,  7,229,237,219,183, 17, 28, 28, 12,177, 88, 44, 59,119,238,156, 50, 46, 46,142,103,246,  0,  0,192,
+149,184,184, 56,154, 77, 29,252,113,237,122,169,175,223, 83, 74, 95,255,167,192,227,185,193, 96, 80, 97,237,207, 74, 76,126, 83,
+198,120, 20, 48,117,234, 84,  4,  5,  5,209,142,182,189,215, 95,127,157, 36, 36, 36, 96,224,192,129,232,213,171, 87, 27,  0,198,
+ 67,135, 14,133,223,188,121, 19, 18,137,  4, 18,137,  4,145,145,145,207,111,219,182,237, 48, 27,121,155,174,230,225,187, 63,175,
+224,199,  5,115, 75, 91, 62,213,230,105, 85,117, 25,126,219,247, 39,206,157,191, 10, 95, 66, 67,120,247, 30, 34,223,141, 25,186,
+117,235,182,127,150, 11,246,111,  4, 91,195, 71,245,121,  5,234, 83,213,169,241,227,199, 91, 91,208, 84, 84, 84, 84, 67,251,127,
+ 91, 20, 23,175,165,172,183,199, 77, 30,240, 64,220,255, 13, 89,237,141,186,103,103,173,115, 71, 60,  0,142, 34, 58, 58, 90,186,
+123,247,238, 90,228,111,235,152, 51,200,206,206,198,238,221,187,149,209,209,209,210,134,142,213, 75, 92,197,121, 56,113, 71,  3,
+181,137,198,209, 60, 26,119,141,  2,152,116, 25, 40,187,244, 54,214,207,136,197,158,  3, 21, 56, 95, 66,112,182,200,136,139, 37,
+ 70,148,220,190,219,160, 87,206, 90,  9, 16,139,197,184,117,235, 22,174, 92,185,  2,160, 38, 46,230,247,223,127,175, 53,150,223,
+208,120, 61, 69, 81, 22, 47,  0, 35,143, 16,130,188,188, 60,180,110,221, 26,183,111,223,  6, 77,211, 16,139,197, 22, 89, 13, 13,
+ 41, 88, 35, 55, 55, 23, 90,173, 22,225,225,225,104,217,178,165,140,207,231,195,219,219, 27,207, 62,251,172,204,211,211, 19,185,
+185,185,168,172,172, 60,207,182, 30,228,230,230,130,230,  9,209, 34,108, 40,124, 91,134,130,199,119,131,196, 59,  8,173,159,141,
+132,208,195,143,145,119,211,158,156, 85,171, 86, 73,203,203,203,149,  5,  5,  5,104,213,170, 21,100, 50,153,108,195,134, 13,169,
+ 37, 37, 37, 20,  0,244,237,219,215,104,190, 52,212,199,199,  7, 10,133,194,110,192,131, 88, 28,128,128,160, 30, 48, 25,117, 40,
+188,147,142,187,  5,199,134, 20, 23,157,153,103,150,  7,  0,184,119,247, 46,204,242,220,216,214, 61,185, 92, 62, 62, 33, 33,  1,
+ 49, 49, 49,152, 56,113, 34,  0,208,  7, 14, 28, 16,236,222,189, 27,147, 39, 79, 30,118,250,244,105,234,248,241,227, 84, 92, 92,
+ 28,171,200,253,172, 74, 53,230, 30, 57,139,175, 63,136,197,192,145, 67,253, 77,196,136,109,191, 28,193, 15,203, 54, 96,223,172,
+ 55,176,166, 71,107,180,246, 17, 96,222,188, 56, 46,  8,240,111,130,179,103,207,214, 75,254, 13,122,  0,234,142,237,219,219,127,
+ 18,241,  0,166,224, 57,133, 47,159,249, 82, 54,109,218,180,191, 67,121,215, 26, 82,120,192, 65,122,172,222, 67,100,100,164,244,
+218,181,107, 74,189, 94,223,224,177,198,160,172,172, 12, 42,149, 74, 25, 25, 25, 41,203,203,203,187,239,216,222,189,123,235,125,
+119,153,165, 26, 84,232,105,100, 22, 25,113,187,220,136,224,223,  5,120,122, 91, 54,110,221,188,136,171,127,232, 97, 20,240,161,
+167,  1,173,158,160,140,208,  8,106, 96, 89,123,102,186, 31, 51,118,207, 68,236,223,187,119, 15,109,218,180,193,205,155, 55, 45,
+ 46,127,129, 64, 96,185,222,209,225, 60,235, 28,  2,204,231,  3, 26, 18, 44,135,107, 99, 62,236,146, 53, 77,211, 80,169, 84, 53,
+157,163, 64, 32,123,251,237,183,107,189,187,170,170, 42,193,174, 93,187, 48,122,244,104,222,220,185,115,239, 45, 92,184,208,104,
+175, 46, 82, 84,141, 66,164, 81,223, 67,117, 85,158,108,202,148, 55, 82, 21, 10, 69, 26,128,175,171,170,170,176,107,215, 46,139,
+226,216,161, 67,  7, 61,155,186,189, 96,193,130,209,223,126,251,109, 98,100,100, 36,  6, 12, 24,  0,  0,244,241,227,199,121,191,
+254,250, 43,164, 82,233,200,229,203,151, 31,116,164, 96,238,168,117,120, 61,233,119,204,156, 16,137,241,175,143,131, 90, 91,137,
+157,187, 82,177,100,197, 38,252,111,216, 51,104, 95,152,207,177,233, 19,160, 12,176,245,  0,184, 26,164, 78, 67,182,183,207,193,
+ 10, 15,154,252, 93,104,181,215,231, 81,112,118,252,191,161,122,193,170,190,236,221,187, 55,181, 99,199,142, 50, 63, 63,191,  6,
+143, 53,  6,126,126,126,232,216,177, 99, 45,162,183,117,204, 22, 52, 38,111, 24, 40,224, 84,177, 14,133, 38, 19, 14,229,104,177,
+ 45, 81,139,195,249, 65,200, 22,250, 32,191,194,128,188, 42, 26, 42, 35,160, 54, 18,136,  2,154,218, 37,102,102,126,191,201,100,
+130,209,104, 68, 64, 64,  0, 60, 61, 61,209,166, 77, 27, 24, 12,  6,203,113, 91,  9,129,234,202, 99,230,247, 27,141, 70,104, 52,
+ 26, 16, 66,208,170, 85, 43, 20, 20, 20,160, 89,179,102, 16,  8,  4,208,233,116,208,235,245,150,255,101, 51, 60,216,186,117,107,
+136,197, 98,100,100,100, 32, 63, 63, 95,105, 50,153, 80, 89, 89, 73,253,241,199, 31,202,234,234,106,180,110,221, 26,222,222,222,
+ 47,176,237,163, 90,183,110, 13, 30,173, 71,193,153, 20,148,231,103,129, 54, 25,160,169, 44, 66,238, 31,123,161, 87,149, 49,242,
+218,178, 81,110, 24,  4,  4,  4, 40, 87,174, 92,105,241,226,148,148,148, 80, 23, 47, 94,132,153,180,105,  0,193,182, 18, 30,213,
+133,209,168,129,209, 80, 13,137, 71, 83,136, 37,254, 80, 40, 86, 75,229,114,185,113,254,252,249,  1, 86,242,176,102,205, 26, 84,
+ 84, 84, 48, 83, 24,239,195,252,249,243, 73,255,254,253, 73,175, 94,189,200,231,159,127,254,219,232,209,163, 49,114,228, 72,  0,
+192,233,211,167, 43,119,239,222,141,241,227,199,143, 62,116,232,208, 94, 54,101, 54,127,254,124, 50, 96,192,  0,242,234,219,239,
+226,249,237, 71, 48,231, 95, 99,241,222, 71,211,161,213, 87,227,198,245, 60, 40, 20,219,240,235,168,126,144,182,106,226,116,219,
+ 24, 49, 98,  4,215,175, 63, 66,132,133,133,213, 34,253,186,129,128, 15, 53, 21,112, 84, 84,148,212,145,253,135,102,233,215, 51,
+103,191,174,181,207,214,250,175, 79,222, 91,129,129,228,173,192,191,220,249,117,247,237,121, 34, 92, 37,175, 30, 75,218, 25,162,
+126, 96,168,163, 68, 56,237,  1,  0,128,205,155, 55,167,142, 26, 53, 74,102,157,156,198,214, 49,103,208,161, 67,  7,140, 26, 53,
+ 74,182,121,243,230,212,134,142,213,251,251,142, 29,208,209,131, 15, 47, 10, 48, 16,130,203,101,122, 36,100,235,176,249,196,109,
+252,121,189, 20,183, 53, 64,137,214,132,235,213,  4,119,116,  4,213,122,131,172, 33,242, 98,166,230,233,245,122,104, 52, 26, 52,
+107,214, 12,221,186,117, 51, 43,122,254,232,211,167,143,133,176, 25,210,174,143,176, 25, 66, 55, 24, 12,208,235,245,160, 40, 10,
+ 33, 33, 33, 40, 47, 47, 71, 94, 94, 30, 74, 75, 75,209,182,109, 91,240,120, 60,232,245,122,232,116, 58,203,111,236, 33, 40, 40,
+ 72,214,178,101, 75, 92,188,120, 17,251,247,239,199,158, 61,123,148,123,246,236, 57,124,244,232, 81,240,249,124, 60,247,220,115,
+104,223,190,189,  6,230,192, 59, 22,242, 70,  7,251,251,160, 36,231, 44,174, 30,252, 25, 23,247,174,196,229,189, 10,220, 58,249,
+ 43, 68, 60,154,145, 87, 96, 79,206, 59,239,188,147, 26, 28, 28, 44,243,246,246, 70,102,102, 38,242,243,243,149,241,241,241, 82,
+107, 69,192,236,  9,224, 37, 36, 36,160,107,215,174,118,239, 77,175,171, 64, 69,121, 54,220,220, 60,224,235,223, 73,233,225,217,
+  2, 63,253,180, 81, 74, 81,188,190,204, 53, 94,229, 41, 80,254,239, 61, 68,116,170,174,183,110,239,221,187, 23, 18,137,  4, 93,
+187,118, 69,219,182,109,153,225,  3, 99, 89, 89, 89,245,246,237,219,125,195,194,194, 70,111,221,186,117, 55,219,186,155,148,180,
+ 23,222,222,158, 24, 52,248, 89,117, 88,175,167, 49,230,237,201, 80, 83, 70, 20, 21,150, 98,218,140, 47,176,176,119,  7,244,106,
+226,188,146, 60, 98,196,  8,242,205, 55,223,112, 74,192, 99,162,  8,216,194, 99,179, 22,192,163,158, 85,224, 12,  1, 59,138,181,
+197, 53, 10,132, 53, 81, 51,199, 30,  7,121,143,171, 71,161,142, 39,128, 56,226,  1, 96, 48,103,206,156,212, 33, 67,134,200,250,
+244,233, 83,239, 49,235,115, 13,193,250,250, 33, 67,134,212, 10,246,179,117,172, 65,235, 80,228, 33,235,222, 44, 16,253,  3, 68,
+120,198, 79,136,230, 98, 30, 68,132, 64,172, 51,162,181,167,  0,101,132,224, 66,181, 17, 89, 42, 35, 90, 52,  9, 64,219,103,  6,
+215, 43,139,177,250,153,169,126,173, 91,183, 70,143, 30, 61, 80, 86, 86,134,242,242,114,148,151,151,195,203,203, 11,125,251,246,
+133, 94,175,183,228,  4,168,143,176, 25,101,194, 96, 48,128,162, 40,132,134,134, 66,163,209,160,168,168,  8,133,133,133, 40, 42,
+ 42,130, 74,165, 66,104,104, 40,  4,  2,129, 69, 94,125,121,  5,234, 42,101,193,193,193,178,144,144, 16,220,184,113,  3,201,201,
+201, 72, 79, 79,135,187,187, 59,158,127,254,121,244,232,209, 99,175, 88, 44,158,205,118,218,222,230,205,155,119,  7, 55,  9,122,
+ 45,164,153, 47,170,175,255,129,172,228,181, 40, 72,255, 13,126, 34, 19,134, 14,121, 30, 61,122,244,152,244,254,251,239,239, 98,
+ 35,203,219,219, 27,189,122,245,  2, 33,  4, 39, 78,156, 64, 70, 70,134,178,160,160, 64,249,245,215, 95, 75,227,226,226,100, 76,
+230,196,222,189,123, 35, 45, 45,205,174,188,169, 83, 39,167, 86,148,101,203, 74,139,206, 67, 36,246, 71,211,230,207, 41,131,154,
+246, 81,122,121,183,221,251,237,162, 31, 70, 49,242, 54,191,239,142, 45,199,117,168, 79,233,201,202,202, 66, 96, 96, 32,  6, 12,
+ 24, 64, 63,243,204, 51, 80,171,213, 80,169, 84, 88,182,108,153,103,167, 78,157, 94, 86, 42,149,187, 29,105, 19, 87,175,102,161,
+ 77,235,150,120,245,213,209,238,159,252,123, 38, 74,170, 42, 80, 92, 82,140,216,247,190,192, 23, 99,134, 96, 72,235,224, 70,145,
+255,146, 37, 75,208,173, 91, 55, 44, 93,186,148, 83,  2, 30, 34,172,199,253,237,225,161,101,  2,116,229,172,  2,115,114, 31,151,
+100,  2,180,135,186,137,120, 92,161,  4,184,146,172, 93, 45,207, 21,175, 26, 46, 72, 15, 92, 71,129,160,234,241, 88, 56,132,119,
+222,121, 39,181,238,239,172,143,253,248,227,143,172,100, 50,215,217,186,158,173, 12,  6,235, 54,111, 77,157,251,250,  4, 24,211,
+147,112,179,  2,240,164,220,208,198,147,135,  2, 19,  5,190, 72,128,180, 66, 19,180, 52, 16, 36,226, 35,164,247, 32,188,191,104,
+ 77,106, 67, 10,128,193, 96,  0,159,207, 71,187,118,237,208,171, 87, 47, 84, 86, 86, 66,171,213, 90,230,231,235,245,122,248,251,
+251, 99,192,128,  1,216,189,123,183,101, 72,192, 22, 76, 38,147, 37,139, 96,231,206,157, 97,118,211, 67,171,213, 90,218, 51,227,
+ 73,232,220,185, 51, 74, 75, 75, 81, 93, 93, 93,111, 91,174, 75,230, 71,143, 30, 77,141,142,142,126,190,107,215,174,135,173, 18,
+  1,149, 15, 28, 56,240,176, 88, 44,142,145,203,229, 90, 71,202,242,232,209,163,  9,209,209,209,149, 93,187,118,221,101, 37,175,
+120,224,192,129,203,222,127,255,125,214,217,122,166, 79,159,158,186,114,229, 74,217,240,225,195,113,227,198, 13,229,149, 43, 87,
+144,155,155, 11, 47, 47, 47,165,175,175, 47, 34, 34, 34,240,227,143, 63,162,119,239,222,172,239,237,173,183, 94, 79,253,241,199,
+117, 50,173,182, 20,190,126,161, 74, 79,175, 86,240,242,110, 13, 85, 85,193,238,  5, 11,215, 34,250,213,161,216,252,190,187,165,
+156,108, 89,108, 47,190,248, 34,146,146,146,144,159,159,207, 43, 45, 45,133, 86,171, 69, 90, 90,154,192,172,116, 86, 30, 63,126,
+220,161,246, 16, 25,249, 34,118,238,220,141,202,242, 18,228,223,190,131,247,223,249,151,254,195,143,231, 11,199, 60,223, 15,  3,
+116,149,128,155,115,244, 48, 98,196,  8,242,217,103,159, 89,210, 65,135,132,132,224,155,111,190,  1,  0,178,111,223, 62, 46,109,
+248, 35, 82, 10, 30,165,  2, 64,141, 31, 63,222,218,133, 70,213,113,247, 83,142,186,255, 93, 65,238, 22,146, 47, 94, 11,123,217,
+246, 28,  9,254, 43, 46, 94, 11,107, 87,188, 53, 49,215,117,217,179, 33,237,226,181,197, 46,149,247, 55,192, 63,170,147,104,219,
+ 79, 38, 59,167, 51, 42,139, 14, 31,130,155, 81,131,115, 85,  4, 41, 85, 70,  8, 41, 10,  1,132, 64,214,204, 23,126, 77,131,100,
+ 45,159,149,  2,235,182,218,245,  0,180,109,219, 22,125,250,244,129, 70,163,129,193, 96,128, 80, 40,180, 16, 54, 99,165,  7,  5,
+  5,161,127,255,254, 72, 78, 78,110,208,  3, 32, 16,  8,208,163, 71, 15, 80, 20,  5,181, 90,109,241, 46, 48, 74, 59,147, 93,144,
+166,105,116,239,222, 29,191,255,254, 59, 28,  9,174,220,188,121,179, 18,  0,165, 80, 40, 40,  0,158,168,201,182,151, 43,151,203,
+ 13,206,148,229,230,205,155,119,155,229,121,  2,240,  7, 80, 42,151,203, 29,206, 77, 60,125,250,244, 84,  0, 88,190,124,185,204,
+205,205, 13, 57, 57, 57,240,247,247, 87,  2, 64, 65, 65,  1, 70,140, 24,129,197,139, 23, 59, 36,115,202,148, 73,169, 10,197,106,
+169, 94, 95, 33,147, 84,222, 84,122,251,134,192,221,179, 57,220, 61,155,227,192,161,123,160,134, 52,108,113,175, 95,191,158,154,
+ 58,117, 42, 41, 45, 45,197,139, 47,190,168, 15,  8,  8, 16,210, 52,141,220,220, 92,135, 61, 98,  0,176,110,221,122, 74, 46,143,
+ 37,222,151, 50,240,206, 59,111,161,101,104, 71,225, 55, 51,223,162,215,173, 88,207, 91,198,215, 58, 85,151, 71,140, 24, 65,230,
+206,157, 11, 95, 95, 95,220,190,125, 27, 18,137,  4, 52, 77,195,195,195,  3, 95,125,245, 21,167,  4, 60,  4,132,133,133,213,235,
+  5, 96,155, 10,216,229,120,204,103, 21, 80,197,107,139,109,158,112,210,250,167,214, 22,223, 47,175,174,165,206,184,238, 89,144,
+182,171,229,113,120,140, 96, 38, 27,234,149,200, 17, 82, 31,163, 78,201,191,149,131, 14,134, 59,240, 10,  8, 70,191,238,157, 16,
+208, 34, 80,246,209,202, 77,169, 91,210,167,219,245,162,181,107,215, 14,  3,  6, 12,176,140,199,243,249,124,232,116, 58, 75,234,
+ 94,235, 97,130, 86,173, 90,161,127,255,254, 72, 77,181,221,244, 36, 18,  9,194,194,194, 32, 16,  8,160,215,235, 45,191,179,158,
+ 58,104,189, 16, 16,143,199, 67,207,158, 61,145,145,145,225,112, 25,152,189,  3, 85,230,173,209, 48,147,126,163, 23, 37, 48,123,
+136, 44,237,112,229,202,149, 82,181, 90, 13,157, 78,135, 78,157, 58, 33, 62, 62, 94,233,216,125,197,166,  2,128, 66,177, 90,166,
+209, 20, 65, 36,242,131,155,208, 75,201,227,  9,176, 49, 97,175,236,181,152,200,  6,229,173, 89,179,134, 82, 40, 20,212,119,223,
+125, 71,107, 52, 26,  0, 64,104,104,168, 67,233,151,173,161, 80,172,166,126,252,113,205,136,201,159,125,151, 84, 35,143,240, 66,
+ 67,159, 66,232,203, 47,191,246,206, 59,239, 36, 56, 35,115,225,194,133, 92,163,126, 76,148,128,134,200,255,161, 42,  0,127, 87,
+184,114,218, 95, 93, 98,110, 44, 81,187, 80,158,171, 21,  6, 78,  1,113,  2, 91,247,238, 75,173, 85,118,149,185, 56,122, 35,151,
+245,239,163,162,162,224,231,231,103,137,240,167,105,218,226,194,103, 60,  0, 76,208, 31,179, 34, 96, 72, 72,  8, 40,138,194,150,
+ 45, 91,238,147,183,100,201, 18, 36, 38, 38, 90,174, 53,153, 76,118,151,  3, 22, 10,133,232,221,187, 55,216, 68,199,255,141,149,
+181, 70,215,117, 70, 17,168, 33,245,181,168,  9,199,162,149,108,228,153,149, 37, 10,  0, 86,174, 92, 73,166, 79,159, 78, 29, 58,
+228,252,212,252, 41, 83,166,238, 51,123, 77,120, 52, 77,155,120, 60,158,196,209,225, 23,  6,156,117,255,120, 41,  1,118, 59,106,
+103,215, 17,230,192,129,  3,  7, 14, 28, 56,252,125,193,227,138,128,  3,  7, 14, 28, 56,112,224, 20,  0, 14, 28, 56,112,224,192,
+129,  3,167,  0,112,224,192,129,  3,  7, 14, 28, 56,  5,128,  3,  7, 14, 28, 56,112,224,240, 68,160,214, 44,128,179,103,207, 58,
+ 29,193,105, 43,152,144,147,199,201,227,228, 61,145,242,200, 75, 47,203,241,219,175, 10, 40, 20, 10,158,173,108,125, 92,249,113,
+242, 90,183,110,109,185, 38, 55, 55,151,122,220,228, 61,233,239,195, 97,  5,128,105,220, 13, 92,239,204, 13,254,157,229, 57, 35,
+243,113,127,222, 90, 80, 40, 20, 66,  0,222,  0,220,205,245,129,  6, 80,236, 76,242,148,  7, 12,226,170,103,174,167, 76, 31,201,
+244,165, 69,139, 22, 73, 79,156, 56,161, 60,114,228,  8,  0, 96,240,224,193,232,215,175, 31,235, 84,194,143,226, 61,188,244,178,
+ 28, 47,142,232,101,  4,228,  2,185, 92, 78,131,155,246,201,161, 14, 90,183,110, 77, 70,141, 10,177,236,239,222, 13, 98,143,180,
+237,201,155, 55,111,160,101,255,235,175,143, 54, 74, 30,135,250, 21,  0,144,109,247, 47,  0, 65, 77, 40,107,204,255, 80, 78, 16,
+239, 67,147,103,235,121, 27,249,204,143,245,243, 50,196,127,241,220,209,159,183,109, 94, 54,164,105,139,144,224,138, 10,  3,124,
+124,220,112,183,224, 58,221,181,107,143, 82,133, 66,209, 71, 46,151,223,112, 68,166,124, 82, 15,146,115, 61, 11,215,111,106,145,
+119,135,160, 85, 51, 10, 33,109,197,104, 31, 18, 10,197,186,204,199,165,177,218, 82, 36,152,181,  6, 30,250, 61,158, 63,127, 94,
+ 25, 22,182, 31,171, 86,169,145,154, 10,124,250,233,  1,228,229,229, 41, 71,141, 26,  5,177, 88,140,219,183,111,203,198,140, 25,
+  3, 87, 40,  4,175,189,246, 26,169,168,168,144, 69, 68, 68,224,189,247,222, 75,117,162,206,240,228,114, 57, 94, 28,209,139,142,
+141,141, 21,  0,171,241,219,175,128, 66,161,160,216,230,236,231,240,207,129, 94, 63, 23,201,201,177, 24, 62,124, 53, 70,141, 90,
+136,221,187,107,218,158,179,196,125,245,234,108,252,242,203, 24,140, 29,187, 19,243,230,213, 40,  1,141,145,247,164,131, 75,  4,
+228,  8,195, 90,145, 61, 69,  1,244, 86,191, 39,246, 89,151, 45, 93,252,250,158, 93, 63,197,117,232,208,177,211,216,151,  7,163,
+ 85, 11,111,248,250,136, 80, 86,174, 69,193,157, 86,188,107, 57,101,129,123,118,253,164, 92,182,116,241,119,239,206,152,189,212,
+158,188,247,223,157, 40,189,145,181, 71, 89,120, 59, 19,175, 68,  2,253,195,129,144, 54, 64,246, 77,130, 99,167, 52, 72, 82,102,
+ 98,244, 48,111,210, 46,116,164,236,251,101,155,156, 37, 50, 87, 90,254,148, 13,217,143, 68,  9, 40, 45, 45,197,123,239,169, 17,
+ 20,  4, 68, 69,  1, 11, 22, 84,227,204,153, 51, 48, 26,141, 16,139,197,104,210,164,137,114,207,158, 61,152, 58,117,170,108,205,
+154, 53, 14,149,221,244,233,211,165, 23, 46, 92, 64,112,112,176,114,251,246,237,212,198,141, 27,  1, 64,153,146,146,130,183,222,
+122, 11,107,215,174,117,244, 89,133,  0,144,180,239, 52, 15, 88, 77,215,124,222,159,227,159,  3,103,253,  3,192,184,113, 59,144,
+156, 92,243, 25, 27,123, 29,140, 71,192, 81,111,  0, 35,239,245,215, 55,224,151, 95,106, 62,199,140, 57, 10,198, 35,192,121,  3,
+ 26, 38,126,235,227,117,149,  0, 46,  8,208,134, 23,224, 73, 38,127,133, 66, 33, 56,152,188,237, 19,217,160, 94,157,198, 70,134,
+162, 71,215, 38,  8,240,147,128,  2,  5,111, 79, 17, 66, 67,252, 17, 49,184, 45,  6, 15,232,217,230, 96,242,182, 79, 20, 10, 69,
+ 83,123, 50,111,100,237, 81, 14, 12,175,196,182,101,192,228, 40,160,147,217,243,231,225, 14,116,238,  0,124, 62, 11,232,219,163,
+ 18, 55,178,246, 40, 27,243,138, 26,235,245,176,163, 72, 60,146, 14,196,223,223, 31,123,246, 72, 80, 84,  4, 36, 38,  2,101,101,
+  2,116,232,208,  1, 35, 71,142,100,150,123, 69,106,106, 42, 50, 50, 50,148,139, 22, 45,146,178,149, 59,124,248,112,233,197,139,
+ 23,149, 66,161, 80, 89, 86, 86,219,147,165,209,104,176,118,237, 90,200,100, 50, 71,203,147,  6,128,223,126, 85, 32,105,223,105,
+222,111,191, 42, 26,245,236, 83,166, 76, 33,204,214,208, 49,150,245,130, 56,113,172, 65,172, 94,181, 74,186,122,214, 44,233,217,
+169, 83, 73,222,139, 47,146,147,147, 38,145,229,239,189, 39, 93,189,106,149,180, 49,207,220,216, 58, 99, 75,  6,219, 99, 15, 90,
+ 30,227,250, 31, 53, 42,  4,177,177,201,181, 62, 25,140, 26, 21, 82,107, 60,223,158,188,121,243,  6, 98,222,188,129, 24, 51,230,
+151, 90,159, 12,230,205, 27,200, 90,222, 63,  9, 97, 97, 97,181, 54, 91,202,  1,167,  0, 60, 14, 44,240, 16,113,241,220,209,  5,
+ 29, 58,116,  8,237,211,171, 89,237,138,192,163, 32, 20,242, 33, 17, 11,224,230,198, 67, 72, 59, 63,132,132,116,104,114,241,220,
+209, 61, 10,133,162, 94, 79,145,124, 82, 15,194, 71, 37,102, 77,  6,180, 58,224, 70, 30, 80, 86,  1,148, 87,  2,155,118,  1, 51,
+ 62,  3,226, 22,  1,253,122,  1, 60, 82,  9,249,164, 30, 92, 67,181, 66,247,238,221,101,191,253,214, 25, 77,154,  0, 19, 39, 10,
+208,180,233, 51, 24, 60,120,176,108,207,158, 61,212,200,145, 35,101,195,135, 15, 71,112,112, 48, 78,159, 62,141,173, 91,183, 42,
+199,141, 27, 39,253,225,135, 31, 26, 36,160,129,  3,  7, 74,117, 58,157,210,205,205,173,193,255, 86, 42,149, 24, 50,100,  8, 27,
+ 50, 35, 49, 49, 49, 68, 46,151,235,205, 49, 35,176, 34,127, 10,  0, 98, 98, 98, 28, 86,208,210,211,211, 45, 91, 67,199,156,108,
+182, 84, 99,154,247,234, 85,171,164,237,175, 92, 81,142, 57,123, 86,217, 42, 43, 27,194,202, 74, 52,203,186,  2,233,239, 39,149,
+ 65,153,153, 74,133,147, 74, 64,122,122, 58,166, 76,153, 66,102,204,152,225,180, 18,193,200, 96,115,140,173,188,186, 68,207,230,
+152, 61, 48,164,207,124,234, 71,117,104, 84, 91, 97, 72,159,249,188,218, 39,136,235, 64, 26, 32,126, 54,248,187, 42,  0,196,198,
+230, 50,193, 15,240,254,136,139,111,147, 56, 90, 22, 23, 47,101,142,  8, 13,241,183,144,190,173,101,154,197, 34,  1,140, 70, 26,
+161, 33,254,184,120, 41, 51,  4,128, 79,125,242,114,174,103, 33,242,249,154,239,251,211,128,183, 62,  6, 86,109,  2,110,223,  3,
+174,100,  3,103, 46, 18,164, 28,  7, 14,157,  0,134, 15,174,185,190, 17,186, 25,245,  0, 95,241, 35, 81, 76,230,204,153,147, 90,
+ 93, 93, 19,111, 57,113,226, 68,156, 60,121,146, 82, 40, 20,169,204,185,210,210, 82, 89,231,206,  2, 76,157, 10,244,236,121, 10,
+ 38,211, 21,101,126,126,126,189,158,148,233,211,167, 75, 41,138, 82,178, 93, 28,166,176,176,208,174, 87, 38, 38, 38,  6,  9,  9,
+  9,  0, 64,210,210,210,244, 86,239,130, 98,136, 63, 33, 33,  1, 49, 49, 49,143,178, 63,112,246,152, 77,232, 46, 92, 64,187, 63,
+254, 48, 47,130,164,135,145,166, 65, 27, 76,160, 13, 70,  4, 29, 77, 67, 37,203,245,214,235, 35,220, 63,255,252, 83,249,220,115,
+207, 61,112, 37,192, 25,239, 66, 99,201, 95, 63,170,131,205, 45, 57, 54,217,169,123,186,218, 39,200,230,246,203,152, 95, 56,182,
+111, 36,108, 42,  0,212,132,178,251, 54,103,  9,135,  5, 33, 58, 42,143,106, 96,123, 44,148, 13,178,205,207,230,214,  8,229,229,
+190,235,237,252,135, 77, 40, 20, 10, 65,211,230, 33, 93,154, 55,245,  4, 33, 64,218,137, 60,236, 63,148,131,253,135,114, 80, 88,
+172,  6, 33,  4,185,249,149,116,234,241, 92,100,223, 40, 67, 96,128,  4,205,155,119,240, 69,205, 18,173, 54,113,253,166, 22,253,
+195,  1,157,  1,216,119,  4, 80,158, 36, 88,186, 30,184,146,  3, 12, 25,  0,116, 10,161, 32,224,215, 44, 45,222, 55,172,230,122,
+150,207,234,204,119,182,150,162, 45,247,240, 35,115,  0,153,151,115,197,211, 79, 63, 45,171,123,142,207,231, 43,187,116, 41,196,
+167,159,  2,255,249, 15, 65,243,230, 89,184,121,243,102,189,178,180, 90,173, 93,203,223, 26, 13,201, 98,144,144,144,192,144,189,
+ 69, 17, 96, 54, 43,226,167,204,215, 61, 10,167, 93,221,246,207,246, 88,189,232, 88, 92,162,212, 27, 12,208, 27, 12,208,155,204,
+ 43, 40,210, 52,104,147,  9, 38, 19,141,150,119,238, 52,102, 56, 11,106,181, 26, 42,149, 74, 57,101,202, 20, 50,117,234,212, 70,
+121, 19, 92,165,  4,184,202,242,103,136,126,220,142,191,190, 51,159,206,120,  1, 24,162,127,125,195, 95,223,153, 79,206, 11, 96,
+ 31,214, 75,  3,179, 90, 14,184,190, 89,  0,141,152, 29, 80, 95, 20,187, 51,209,237,164,129,255, 32, 14,252, 63,171,231,182,241,
+ 91, 86,141,171,129,160, 66,103,228,213,251, 27,230,127, 40,  0,244, 54,187,177, 11,116, 77,180,191,  8,  0,144,119,187, 18, 26,
+141, 17,  0,208,161,189, 31,130,  2, 36,200,188, 88,200,187,122,173, 20, 98, 49, 31, 33,237,124, 81, 86,161,  7,128,122,  5,231,
+221, 33,  8,105, 83,243,255, 47, 12,  2,194,186, 80, 16,  9,  1,163, 17, 24, 54, 16,240,245,  2,114,114,129,225,131,128, 54, 45,
+107,174,127,196,168, 79,  9,120, 34, 70,127, 10, 11, 11, 29,106,135, 85, 85,236, 87,223, 77, 72, 72,160, 98, 98, 98,136, 89,  9,
+176,246, 14, 60,242,178,107,223,190, 61,201,201,201,161,156, 61, 95, 23,110,215,179,161, 51,232, 65,241,  5, 48, 17,  2, 10,128,
+209, 68,195, 96,164, 65, 76, 38, 80,215,174,186,228,190, 47, 92,184,128,192,192, 64,229, 55,223,124, 35,251,232,163,143, 82,157,
+ 85,  2,234, 14,163, 56, 74,220,174, 34,255,220,220, 92,170,117,235,214,100,220,142,251, 21,130,225,171,135, 67,184, 59, 27,187,
+119, 95,183, 68,238,219, 27,187,103,228,189,190,225,126,133, 96,236,206,177,120, 42,189,  8, 95,127,125,148,181,188,127, 34,249,
+ 51,120,146,102,  1, 52, 68,162, 14, 19,108, 35,167, 56,214, 47,247,  1,207, 38,160, 38,148, 57,250, 31,148,143,143, 27,202,202,
+181,  8,244,119, 71,212,232, 78, 48,154,104,136, 68,124,240,121, 60, 16, 66, 48,114, 88,  8, 34, 35, 66, 64, 81, 64, 73,153,  6,
+ 62, 62,110,  0, 80, 90,159,192, 86,205, 40, 92,191, 69,208, 41,  4,120,254,185,154,194,190,146, 13, 60,221,  9,240,243,  6, 70,
+ 72,  1,154,  6,  4,124, 32,235, 70,205,245, 57,121,132,237,187,117,228,123, 99, 27,254, 35,153,  6,184,114,229, 74,233,162, 69,
+139,112,253,250,117,164,165,165, 41,191,253,246, 91,153,167,167,167,101,217, 89,147,201, 36,251,255,246,190, 60, 46,170,170,255,
+255,125,  7, 24,  6, 24, 20, 92, 17,141,  4,151, 84,220,113, 65,205, 98,204,109, 68,192,141,236, 49,203, 53, 70,158, 82, 43, 23,
+212,210,172,167,126, 10,143, 22, 79,150, 57,166, 37,125, 91,180, 17, 13,113,195,168,161, 71, 83, 43,113, 95, 74,  5, 19, 19,145,
+ 68,217,134, 25,102,185,231,247,199,204,197,203, 48,203,189, 51,131, 88,207,125,191, 94,188,152, 57,115,230, 51,231,158,115,239,
+121,127, 62,159,243, 57,159,115,241, 98, 27,245,155,111,222,  4, 69, 81, 40, 45,237,138,174, 93, 59,226,242,101,219, 75, 41, 52,
+ 77,219, 44,127,234,169,167, 26,244, 15, 33,  4,223,127,255, 61,175,107,102, 43,  1, 15, 19,249,123, 66, 73, 96,227,110,135,246,
+ 16,255,250, 27,136, 15, 32,166,  9, 40, 10, 48,152,140,208, 19, 19,106,140, 70,104, 59,119,  3, 46,254,234,118,219,123,246,236,
+  9,138,162, 92, 34,127,  0, 24, 52,104, 16,182,108,217, 66,245,238,221,155, 56, 42,115,134, 45, 91,182, 80,214,132,111,171,140,
+ 15,146,114,238, 19, 63,  0,136,179,175,214,251,156,  9, 24,204,206, 46,224, 36,111,226,174,251,196, 15,  0,143,253,252,103,  3,
+121,203,151, 15,199,154, 53,135,  5,230,231, 64,254,128, 16,  4,104,203, 61,200,118, 19,186, 53,185, 17,  2,136,166,222,107,180,
+ 70,147,175,131,205,191,193, 93,129,241, 46,185, 89,112,231,198, 77,179,213,247,238, 71,191,224,244,249, 82, 24, 12, 52,104,154,
+ 88,148, 22,170, 46, 54,224,198,205, 42,148,220, 44,184,  6,192,174, 89,217,169,163,  4, 63,230,155, 95,183,138,  2, 78, 93,  0,
+146,254,  1,116,126,212,236,246,127,251,  3, 64,236,  3,136, 68,192,143,249,230,250,110, 16,180,167, 99, 40,172,199,251,129, 91,
+ 15, 23, 47, 94,132, 68, 98,238,147,125,251,246,225,139, 47,190, 80,231,229,153,185, 96,221,186,117, 49, 45, 90,180, 80, 95,186,
+100,196,199, 31,  3,167, 78, 13,128,151, 87, 55, 89,135, 14, 29,100,246,228,  5,  4,  4,112,254,109,163,209,248,151,127,112,217,
+228, 31, 17, 17, 65,236,253,241, 85, 22, 10, 90,183,145,221,211,215,162, 82,175,135, 86,111, 64,173,209,  8,  3, 49,161,198, 96,
+ 64,149, 94,143,226,208, 80,153, 59,237,246,247,247, 71, 64, 64,128,108,203,150, 45, 20,223,237,157,214, 68,239,172,140,143, 18,
+ 48,104,208, 32,167,101, 92,188,  0,246,200,159,109,253,243,145,103,143,252,217,214,191,  0,126,228, 47, 40,  0, 15,  0,141,189,
+165,144,124, 29, 12,  2,206,138,134, 49, 50,178, 79,241,213,107,247, 64,211,  4,203, 22, 70,227,242,213,187,184,116,185, 12, 20,
+133,122,  1,129, 52, 77,112,245,218, 61, 68, 70,246, 57, 15,192,174,159, 56,162, 83, 87,236,251, 30, 48,153,  0, 82,  8,168,143,
+  1,217,223,  1,242, 89,128,108, 26,144,119,220, 92,207,100,  2,246,125,111,174,223,132, 32,112,156, 11,224,129,227,238,221,187,
+234,238,221,175,225,231,159,129, 99,199, 76,232,208,225, 44, 78,157, 58,165,142,139,139, 35,123,247,238, 85,231,228,228,224,246,
+237,219,232,223,191, 63,166, 78,157, 42,203,204,204,204,115,148,196,135, 16, 34,179,231,  5,176,  6,163,120,240,  5,179,  4,192,
+ 94, 10,104, 42,176, 45,250,194,194, 66,202,222,159,173,250,142, 16,220,175, 31,202,134, 63,129,187, 90, 29,238, 25,106,161, 51,
+ 26, 81,109, 48,161, 66,175, 71,213,136,167,208, 42, 42,202, 69,175, 32,133, 65,131,  6,161, 87,175, 94,178, 99,199,142,229,185,
+ 35,131, 77,244,182,202,220, 81,  2,216,115,129,173, 50, 46,176, 69,254,140,165,110,157, 41,144, 11,108,145, 63, 91, 30,123,107,
+160, 64,254,206,201, 95, 80,  0,254,234,110, 11, 38, 72,147,227, 50,128, 66,161, 48, 69,246, 30, 62,162,160,224,234,175, 63,229,
+ 23,131,166,  9,228, 35, 35,112,246, 66, 41,222,121,247, 24,222, 94,127,180,142,252,127,202, 47, 70, 65,193,213,235,145,189,135,
+191,164, 80, 40, 12,246,100, 42,183,157,161, 76,104,134,247, 62, 49,147,252,166,183,129,207,118,  1,178,104,160, 95, 15, 32,239,
+ 43,115,249,123,159,  0, 38, 52,115, 39, 35,160,187,129,158,196,137,156, 38, 89, 59,212,104, 52,232,213, 75,135,129,  3,129,129,
+  3,129,  1,  3,  8, 10, 11, 11,145,157,157,141,227,199,205,218, 83, 76, 76, 12,162,162,162, 56,165,  7,206,204,204,204,227, 66,
+236, 70,163, 17,129,129,129,188,173, 88, 75,212,127, 93,196, 63,243,222, 85, 11,150,249,115, 84,198, 71,  9,240, 68, 61,  0, 80,
+ 36, 39,231,233,  7, 15,150, 93, 26, 61, 74, 86,242,216, 99, 40,241,241, 65, 73,183,110,184, 60,102,140,204, 52, 36, 90,166,176,
+ 44,209,240,197,192,129,  3,225,142,213,207,150,225,172,140,107, 31,218,178,250,  7, 14, 28,232,180,204, 21, 48, 57,  2,238, 39,
+  5, 42,112,203,130,103,114,  4,176,146,  2,  9, 30,  1,142,228, 15,  8,153,  0, 27,213, 50,127, 24,127, 67,161, 80,148,125,176,
+225,221,244,156,131, 59,150,252,113,171,170, 83,231,240, 96,196,142,238,132,224, 32,  9,238,149,235,112,234,220,109, 92,189,118,
+ 15,  5,  5, 87,143,142, 25, 59,117, 23,128, 27,206,100,134,119, 29, 47, 59,156,191, 87,125, 52,191, 18,177, 35,128,143,215,152,
+ 51,  1, 22, 92,  7,182,126,109,182,252, 77,104,134,240,174,227,101, 56,244,165, 39,  8,220,211,223,109,178, 93,  0,183,110,221,
+146,  5,  7,183, 82,159, 56, 97,182,106, 46, 95,110,134,129,  3,123,160,101,203,150,144, 72, 36,184,117,235,150,108,252,248,241,
+188, 82,  1,119,236,216, 81,246,219,111,191,169,237, 89,108, 70,163, 17,157, 59,119,198,214,173, 91,121,145,144,245,218, 63,235,
+ 61,113, 37, 22,192,150,181,234,170,  5,235,140,220,249,144, 63, 91,  9,168,119, 95,156, 61,235,246,120,187,107,161,243,233, 55,
+174,191,229,105,121,142,200,159, 13,125, 92,103,128,227,250,191, 61,242,103, 67,216, 17, 96,223, 19, 96, 79, 49,240,182,103, 89,
+242, 41,231, 49,  1,123,202,234, 34, 46,126,246, 64,218,231,164,159, 60,210, 62,119,  2, 23, 95,154,255,170, 82,169, 84,110,191,
+112,246,240,198,221, 89, 63, 68,132,180,239, 20,205, 58, 11,224,120,100,100,159,159,199,199,207, 94,161, 80, 40, 52, 92,228, 89,
+210,251, 82,138,153,125,200,142,125,151,241,255, 62,180,115, 22,128,235,228,239, 17,135,201,195, 70,254,  0,240,204, 51,207,224,
+204,153, 51,152, 53,235,  4,  0, 96,192,128,  1,120,250,233, 62,178, 87, 94,121,165,142,156,127,252,241, 71, 94, 50, 63,250,232,
+163, 60,  0, 84,108,108,108, 76, 85, 85,149,218,203,203, 11, 34,145,  8, 70,163, 17, 98,177, 24, 82,169, 84,230, 46,249,  3,240,
+136, 18, 32,224,239,137,162,162, 34, 42, 39, 41,135,132,206, 15,149,161,163,237, 58,197, 73, 57,106,174,214,122, 81, 81, 17,181,
+107,226, 46,210, 37,181,139,236, 92,144,237, 58, 87, 38, 30, 86, 11,214, 63, 63,120,243,152, 40, 61, 61,241, 54,134, 60,234, 33,
+111,223,195, 32,143,241,  4, 84, 40,149,202,233,145,189,135, 51, 25, 99,164,  0, 90,  1,184,  5, 64,107, 57,229,141, 23,172,221,
+251,133, 55,  8, 10,111,104,129,195,103,154,186, 31,168,  7,221,191, 92, 97, 33,250,186, 54,156, 63,127,222, 99,178,247,237,219,
+151,231,169,235, 99,173,251, 83, 86,229, 20, 44,249,  0,  4,  8,176, 38,237,162, 37, 69, 30,123,166,139,138,138,168,162,127, 20,
+225, 97,125,150, 31, 22,112,205,  2,  8,  0,148,171,231,  8, 11, 16, 32, 64,128,  0,  1,  2,254,186, 16,130,  0,  5,  8, 16, 32,
+ 64,128,  0, 65,  1, 16, 32, 64,128,  0,  1,  2,  4,  8, 10,128,  0,  1,  2,  4,  8, 16, 32, 64, 80,  0,  4,  8, 16, 32, 64,128,
+  0,  1,127, 15,212,219,  5,112,250,244,105,151,163, 40,109,  5, 19, 10,242, 26, 77,158,211, 67,108,154, 82, 94, 98, 98, 98, 12,
+  0,181, 74,165,242,136,188,169, 83,167,198,208, 52,237, 49,121,194,253,215, 52,242,146,147,147,167, 42, 20,138,175, 27,179,125,
+ 74,165,210,  7,128,196,114, 79,235,  0,208,  0,136, 66,161, 32,194,120,  8,242,254,151,228,121,202,  3, 64, 56,252,241,129,167,
+229, 61, 48,144,187,105,132, 84,167,115,110,159,133,  8, 61,118,189, 44,121, 88,191,126,189,204, 36,113,187,207,  0,  0, 32,  0,
+ 73, 68, 65, 84, 65,127,242,150,119,254,195,102,112, 87, 30,131,  9,  3,247,171,195,155,101,  3,  0,162,162,162,220, 30,207,174,
+109,119,224,209,214,223,193,207,207, 15, 35, 71,142,124,104,238, 15,165, 82,217,154, 10,144, 30, 84, 42,149,173, 61, 36, 47, 76,
+228,235,159, 99, 79,158, 82,169,244, 81, 42,149,148, 19, 25, 62, 76,219, 36, 18,255,131, 74,165,178,181, 82,169,244,114,246, 61,
+ 87, 30,  7, 23,238,141, 99,141, 53, 22,155, 55,111, 30,183,101,203,150,197, 62, 62, 62,187,197, 98,113,190, 88, 44,254, 21,128,
+210,203,203, 75, 69, 81,212, 70,165, 82,217,170, 17,250, 64,128,128,  6,168, 89,186,148,120,248, 65,107,180, 57,207, 89, 38, 64,
+ 66,136,253,223,230,153, 27,154, 88,  4,122, 74, 30, 47, 11,214,147,152, 50,101, 10,185,122,245,170, 83,114, 85,169, 84,234,148,
+148, 20,180,105,211,198,102,202,213, 69,139, 22,113, 62, 83,156,145,183,126,253,122,217,162, 69,139,212,199,143, 31, 87, 91, 41,
+  2, 46,201,163, 47,174,130,168,199, 91,248,236,123, 61,  0,128,190,184,234,190,118,216,227, 45, 94,253,242,213,191,  3,  8, 77,
+128,237,  7,205,178,228, 79,250, 32,178,243,  5,  0,102, 37, 32, 63, 63,159,215,216,164,125, 40,139, 41,255,189, 12,213,250, 96,
+181,166, 54,  0,242, 49,229,104, 31, 66, 33, 60,124,  6,169,172,212, 97,199,142, 29, 77, 58,161, 39, 47, 92,184,  0, 52, 61, 58,
+121,225,194,  5,  0, 86,186, 45,111,254,194, 23,  8, 77,143, 74,158,111, 91,158,163,148,204,236, 58, 74,165,146,154, 63,127,225,
+  2,154, 54,141,158, 63,127,225,  2,189, 94,183,210,134,162, 32,114, 37,215,131,155,208,179,239,191,157, 59,119,170, 39, 77,154,
+ 36,203,204,204,204,115, 71,232,150, 45, 91,228,222,222,222, 79,120,123,123, 63,227,229,229, 21, 44, 18,137,164,169,169,169,162,
+ 37, 75,150,204, 54,153, 76, 48,154,241,140,201,100,138, 83, 42,149, 63, 90,188,  1,122,203,252,215,232,203,160,241,241,241,132,
+235,124,151,149,149,197,235,158, 78, 72, 72, 32,238,124, 95,128,231,225,151,150,230, 81,121,218,165, 75,  1, 55,100, 50, 25,  1,
+249, 30,  7,236,148,252,163,162,162,144,159,159,207,135,156, 29,146, 60, 71,121, 13,228,167,164,164,160,176,176, 16, 22, 23,177,
+199,142,117, 37,197, 81,  4,126, 93, 65,  5,127, 69,  1,  0,213, 98, 41, 53,101,202, 20,167,218, 24,155,172, 75, 75, 75,213,246,
+200, 63, 37, 37,  5,169,169,169,188,200,223,242, 30,209,209,209,178,232,232,104,183,228, 49,100,207,252, 95,251, 47,212, 35,255,
+165,147, 37, 72,203,212,113,234,171,237,233, 82,210, 51, 92,  4,141,150,224,213,231, 36, 56,126,193,  8,173,134,160, 70, 15,200,
+250, 94,192,133,203, 38, 68, 69, 69, 17,174, 74, 64,202,235,221, 72,193,169, 74,  4, 54, 19, 35,164,157, 20,173,219,118,198,245,
+  2, 61, 58,246, 48,192, 71, 82,138,220,221,119, 48,118,236, 88,114,240,224,193,166,154,240,124, 91,180,108,185,240,243,227, 63,
+ 83,242,199,186, 44,  0,240, 54,128, 90,119,228,181,108,209,114,225,246,239,143, 83,163,250, 62,230,150, 60,133, 66, 33, 14,  9,
+105,183,240,144,250, 48, 53,160, 79,164, 77, 89, 77, 64,254,  0, 80,119,252,160, 74,165, 82,199,197,197, 33, 51, 51, 83,109,235,
+121,253,229,151, 95,200,155,111,190,137,189,123,247, 58, 28,223,173, 91,183,142, 16,139,197, 61,197, 98,241,124,177, 88,236,127,
+227,198, 13,116,233,210,  5, 94, 94, 94,  8, 12, 12,196,213,171, 87, 33,149, 74,189,127,249,229,151,160, 99,199,142, 29,126,241,
+197, 23, 59,  2,184, 14, 64, 12,243,242,128,221,137,143, 61,255,177,231, 45,166,156,162, 40, 80, 28,172,150, 61,123,246,216,149,
+193, 46,119, 52,223,218, 67, 86, 86,150, 91,223,111, 84,  5, 57, 57, 57,198,146,149,210,109,188,245,214, 91,132,166,105, 64, 84,
+ 14,125,173, 14, 98, 95,  9, 64,  7, 65, 36, 18, 97,213,170, 85,212, 49, 43,158, 73,118, 32,235,194,133, 11, 36, 51, 51, 19,246,
+228, 77,158, 60, 25,145,145,145,148,171,237,195,170,116,172,126,235,101,194,110,159, 59,215,238,159,150,198,251,251,246,210,  0,
+115, 85,  0, 56,145, 63, 87,164,164,164, 56,173,195,133,184,236,145,255,218,181,107,177,108,217, 50,107,165,195,165, 78, 39, 39,
+162,  8, 90,118,  5, 21,254, 21,197,182,248,119,238,220, 73,  1,  0,243,223,222,154,139, 53, 89, 59, 34,127,139,103,192,169,213,
+174, 82,169,212,214, 22, 62, 83,198,238, 99,190,242, 28, 89,248, 75, 39,115, 63, 41, 46, 51, 61,128,116,121, 84,  4, 63, 95, 10,
+143,134,122,225,206, 61, 26,  6,163, 23,202,202,  9, 42,170,  9,174,254, 65,  3, 34,160,149,255, 89,166,127, 28, 78, 10, 43, 94,
+123, 44,166,107,167,  8, 28, 43,185,141,240,176,214,232,217, 59,  2, 94,190, 45,240,104,248, 61,220,211,234, 80, 90, 98,194, 31,
+183,117,240,247, 46,228, 36,175,145,240,236,115, 75,150,136, 11,219,133,194, 55,106,128, 72,119,248,191,207,  2,248,132,175, 16,
+150, 37,254,236,140,  5,139,197,127,136, 67, 32,237,218, 95, 84,121,254,136, 75,242,152,182,189,184,240, 21, 49,124,  3, 17,254,
+ 88,164,232,183,115, 39,221,145,229, 73,208, 44,235, 31, 18,137, 68,  6, 64,109, 61,134, 39, 78,156,224, 68,254,  0,224,227,227,
+ 19, 36,145, 72,102,222,185,115,199,191,107,215,174,232,215,175, 31,188,189,189,241,254,251,239,195,100, 50,161, 87,175, 94,216,
+181,107, 23,126,249,229, 23,156, 61,123, 22, 94, 94, 94, 27,149, 74,101,194, 71, 31,125,228,200,170,174,155,231, 60,225,177, 84,
+ 42,149,178,144,144, 16, 53, 33,196,225,119, 74, 74, 74,100, 10,133,130,239,253, 35, 11,  9,  9, 81,187,250,125,134,168, 47, 93,
+186,228,112,222,232,222,189,187,140, 47,153, 95,186,116, 73, 61,109,218, 52, 52,111,222, 92,230,142, 34,160,152, 55,131, 36, 37,
+143, 70, 64,128, 95,131,207, 52, 26, 45, 86,173, 90,133, 33,  0,245,199,158, 61,228, 70,124,188,253,185,125,122, 87,243, 96,174,
+153,136,118, 35,198, 67,210,127,  0, 76, 93, 35,235,213, 49,108,207, 64,240,154,137,247,235,  2,208,142,157,139,161,235,190,116,
+216,190, 25,179, 70,161, 69, 75,127,115,193,170,116, 44, 90, 60, 11,  0,112,183,172,  6, 55,139, 11,136,114, 83,134,203, 74, 64,
+205,210,165,196, 21, 37,192, 85,  5,128,112,177,212, 31, 22, 20, 22, 22, 98,217,178,101,174, 42, 16,118, 49,101,202, 20, 66,133,
+238,164,166, 76,  9, 39,170,205,131,128,109,143, 19, 74,250,178,211, 65,176, 69,214,214,164,236,104, 89,192, 30,216, 10,197,241,
+227,199,213,209,209,209,245, 92,255,124,229,125,185, 68,106,119,114,123,118,157,134,179,156,143, 62,250, 40,198,215,107,  9, 68,
+ 34,192,223, 15, 40,175,164, 81, 75,  8,  2,252, 40,232,104, 64, 91, 75,208,161,181,  8,180, 17,184,114,195,132,194,194, 66,181,
+ 35,229,108,225,130, 81, 49,225,143,250,171,197, 98,130, 23,102, 14,134,201, 68, 80, 82,170, 71,209,205,114,192,231,  6,252,130,
+107,113,171,244,119,136,196, 21,184,120,177, 28,205,131, 29,203,107, 60,243,191,197,170,103,158,127,222,247,117, 26,  8, 94,246,
+154,244,246,153,211, 43,233,202, 74, 87, 72,150,  0,128,164,121,139, 85,255,152,254,188,239,186,107, 38,116,152,154, 34,253,173,
+240,236, 74, 83, 77,125,121, 74,165,146,178, 14,102,179,133,102,205,131, 86, 61, 59,253, 57,223,179, 69,247, 16, 63, 45, 73,250,
+193,191, 22,173,212,214,104,220, 85,  0,184,158,151,225,104, 44, 76,204, 51, 50,126,252,120, 48,164,175,213,106,235,198,144,177,
+252,179,179,179, 57,141,169,175,175,239, 80,141, 70,211,173,123,247,238,144,201,100, 88,180,104, 17,230,204,153, 99,158,204, 13,
+  6,108,219,182, 13,249,249,249, 56,121,242, 36,118,236,216,  1,173, 86,219,153,166,105,185, 19,139,221,163,247,211,190,125,251,
+ 56, 45,205, 81, 20,197,251, 94,102,203,118,229,251,150,103, 56,111,218,180,105, 40, 46, 46,182,249,121,104,104, 40, 92, 37,240,
+226,226, 98, 20, 23, 23,187,165,  8,156, 61,115, 25,255,151,177, 23,195,135, 15, 69,100,175,246,247, 45,249,115, 55,113,248,240,
+ 81, 12, 25, 50,132,168,150, 47,199,141,248,120,248, 13, 27,  6,173,157,179, 51,168,207, 47, 83,  0,176,120,104, 79,210,187,244,
+ 32,158,251,126, 47, 76, 93, 35,161, 93,188, 26,  0,224,183,110, 53,164,151, 47, 96, 73,161, 24,235,142,158,191,223,143,159, 47,
+117, 24,100,199,180,111,228,168, 97, 13,218,151,251,237,143, 56,123,230,178, 91,247,143, 43, 75, 10,108,119,191, 35,111,128, 55,
+ 95,139,221,211, 68,235, 46, 44,110,127,215,103,181, 40, 16,180,  3,168,189,230,  7,135, 26,144, 79, 77,153, 18, 94, 55,216, 59,
+119,238,164,176,121, 16,177,246,  4,112, 37,235,210,210,210,122,228,236, 10, 89,115,  5, 75,233,112, 74, 18, 92,220,133, 44,247,
+191,205,202,155, 54,109, 34,127, 94,120,  5,237,186,122, 65,163,189, 95, 69,107, 34,208,233,  1,131,165,204, 96, 36, 32, 34,243,
+235,115,103,243,145,152,152, 24,115,229,202, 21,155,191, 25, 24, 88,161,214,104, 69,104,213, 34,  8,229,119,107, 80, 94, 81,142,
+227, 39, 74,112,243, 54,129, 56,160,  6,237, 59, 87, 67, 91,115,  7, 93,122, 27,208,177,123, 45,118,124,156,143,137, 19, 39,198,
+ 92,187,118,237,129,220,111, 22,139,125,228,248,201, 83,218, 22, 55, 15, 70,129, 17,240, 27, 57, 26,162,224,150,173,232,202,202,
+209,  0, 14, 49,100, 13,192, 71,161, 80,232,157,205,251,  0, 70,197, 77,156,220,246, 79, 81,115, 92,175, 54, 32,168,255, 72,120,
+  7,  6,183, 50,213,220,151,  7,  0, 92,200, 31,192,152,  9, 19, 39,181, 37, 94,190,168,208,212,162,103,212, 16, 72,155, 53,111,
+165,173,209,212,147,213, 84, 96,172,127,138,162, 48,126,252,120,  2,  0,123,247,238, 69, 98, 98, 98, 76, 74, 74,138,154, 15,249,
+ 43,149, 74,223,242,242,242, 25,  6,131, 65,228,239,239,143, 39,158,120,  2,235,214,173,131,143,143, 15, 20, 10,  5, 50, 50, 50,
+144,159,159,143,227,199,143,227,187,239,190,195,185,115,231,208,170, 85,171, 86, 70,163,241, 81,216,113,255,179, 93,160,206,150,
+  0, 68, 34, 17,167,118, 54,230, 18,192,158, 61,123, 60,178,  4,208,188,121,115, 89,113,113,177,218,222,103,238,142,187, 43,138,
+192,229,165, 75, 73, 89, 90, 26,112,236, 24,112,236, 24,238, 78, 30,135,245,125,186,214,185,236, 35,123,244,192,211, 83, 99,209,
+241,222, 29,220,136,143, 71,203,165, 75,209, 53, 45,173,193,114,128, 53,196,178,199,209, 85, 30,131, 37, 75,223,198,191,113,  1,
+235,163, 71,160,231,192,193,232,124,183, 16,219,130,250,161,176,249,109,100,100,100,144, 25, 51,102,112, 26, 95,217,136, 62,120,
+110,198,120,252,252,211, 57, 28,204, 57,132, 55,  0,172, 95,247, 41, 34,123,244,192,115, 51,198,163, 70, 91,134,121,243,230,113,
+150,103, 13,119, 99,  0,248,122,  0,254, 74,160,236,144, 19,239,142,158, 50,101, 10, 81, 45,187,  6,120,137,129, 32, 31, 32,168,
+ 35,168,157, 22, 97, 28,215,254, 27,  1,132,109,245,  3,  0,219,242,183, 49,185, 34, 58, 58, 90,230, 32, 24,144,247, 53,124,177,
+ 56,192,174, 71, 32,176,114, 17,126,215, 19,148,220,161,  1,136, 32,245, 55,187, 56, 13, 70,  2, 93, 45,160,211,  3,186, 90, 64,
+111,  0,116, 90, 64, 95,123,223, 75, 98, 43, 32,229,139, 15,  3, 72,238,241, 42, 60, 18, 46,  5,241,241,198, 29,173, 22,234, 31,
+110,224,226,213,155,184,123,183, 26,145, 81, 38,104,116, 70,232,106, 77,208,214,208, 40, 41,  2,180, 26, 96,247,238,221,106, 62,
+  7, 96,184,  3,133, 66, 65,123,  5,  5,173,154,181,124,185,100,  7,139, 66,130,151,191, 38,189,187,108,241, 74, 83,121,249, 33,
+ 22, 89,235,185,140,177,183, 52,104,213,156, 87,150, 73, 14,220, 52,213, 21,118,120,102,153,244,250,214,229, 43,141,213,229,135,
+248,120,  1,252,165,129, 43, 23,188,186, 88, 82, 80,124,255,180,200,184,105, 73,210,237,155,215,175,172,169,174, 58,228,230,179,
+102,235, 94,226,243,172, 17,198,250,151, 72, 36, 50,149, 74,149,199,108, 25,213,106,181,234,  1,  3,  6,240,145,101,  4,208, 25,
+  0,221,183,111, 95, 90, 34,145,136, 50, 50, 50, 48,123,246,108,172, 89,179,  6,132, 16,252,244,211, 79,248,225,135, 31,112,246,
+236, 89, 84, 84, 84,160, 75,151, 46,168,172,172,244, 23,137, 68,109,156,  9,159, 48, 97,130, 93, 66,117,182, 52, 96,207, 77,255,
+176, 46,  1, 56,242,  2,184, 99,253,187,171,  8,220, 43, 47,175,123,221,230,181,121,232,249, 90, 50,134, 91,213,185, 54,118, 14,
+ 58,252,247,  4, 10, 22,191,128,159, 66, 67,  1,  0, 67,  0,170,175,141,185, 46, 61, 61,157,116,232,208, 12, 39, 79,253,140,200,
+254,221,129,180,215,241,202,214,221,152,217,233, 12,250,212, 94,197,146,219, 98,252,235,139, 21, 88,243,206, 71, 56,123,238,  8,
+210,211,211,201,203, 47,219,247,250,178,229,181,104,233,143,177,227,  6, 99,236,184,193,120,147, 78,135,190,118, 25, 78,157,  2,
+ 78,157,  2, 14, 31, 30,143, 15, 54, 92,198, 51,207, 92, 34, 97, 97,143, 34, 45,205,159, 23, 63,229, 62,254, 58,150, 98,181,195,
+ 27,238,208,161,161,255, 51, 10,  0, 73, 76, 76,148,177,214, 12,173,149,  0,138,109,109, 88, 92,242, 46,105, 94, 12,233,239,220,
+185,147, 82,109, 30,  4,136,197,160,118,238,124,160, 23,203, 68,253,171, 84, 42, 42, 49, 49,145, 56,243,134, 88,199,  6,240, 33,
+116, 91,112, 84,119,198,114, 13, 66,219,138, 48, 45, 78, 12, 93, 45,208, 60,144,130,136,178, 88,253, 32,208,213,  0, 26, 61,129,
+ 70, 75,160,209, 17,208,  4, 16, 57,136,185,158,177, 80,131, 94,125, 10, 17,210,237, 46,190, 61, 80,138,187,119,117,232, 59,164,
+ 18,189, 91, 84,  3, 62,181,208,213,208, 40,189, 73,160,209, 80, 48, 26, 41,180,104, 69,  1,212,  3,143,101,139,236,215,167,207,
+128,224,176, 48, 28,189,207,215,144, 78,155,142,187, 41,139,162,  0,244,  0,112,145,135, 66,209,125,224,176, 39,  7,180, 12, 13,
+195,137,159,235, 98,228,208, 90,246, 15, 92,255,120, 89,  3,121, 78,188,  0, 61,250,245,233, 59, 32, 52,180,  3, 46,158,188,239,
+ 17, 25,246, 84, 44,190, 82,174,227,221,182,198, 84,104,153,231,215, 58,126, 35, 46, 46,174, 65,252,145,141, 88,  0,102,208, 59,
+  3, 56,189,116,233,210,161,222,222,222,210,207, 62,251, 12,159,126,250, 41,102,205,154,133,181,107,215,130,162, 40,252,254,251,
+239,208,106,181, 72, 73, 73,129,209,104,196,188,121,243,104,138,162,156, 62,  0,158,140,166,127,216,151,  0, 28,121,  1, 60, 97,
+253,187,138,140,140, 12, 60,159,244, 52, 42,202,107,129,119, 54, 65,115,248,  4,  2,134, 15,168,251,188,244,157, 77,184,224,235,
+ 11,234,165,185,232, 57,117, 44,142,109, 59,224, 80,222,149, 43,231, 49,100,152, 28,231, 47,  4, 99,211, 70, 21,134, 15, 31,138,
+127,125,184,  2,111,142,124, 22,159,  3,232,246,220,108,108,218,168,130, 88, 28,140,132,  9,  3,240, 25, 15,121,255,121,247,107,
+ 12, 28,223, 11,111,247, 90,135,243,177, 82,  4,199,237,170, 87,183,149,191,  4, 63,231,169, 17,246,252, 76,222,253,112,228,136,
+ 55,210,210,252, 28,214,113,213,254,249, 75,122,  0,108,172, 35, 83, 14,234,113, 55,113,  6,152, 35,212,167, 76,105, 79,128, 43,
+ 80,189,127, 13,240,235, 90,231,  9, 96,148,  2, 46,203,  0,158,  2, 99,205, 39, 38, 38, 18,182,245,207,120,  4,216,239, 19, 19,
+ 19,193, 74,150, 67,248, 18,186, 53, 88,187,  0,108,202, 51,154,  0, 77, 13, 65,173,222, 28,236, 87,171, 39,240,246,189,255,153,
+174,  6,208, 26,  8,202,238, 18,252,121,143,224,228, 69, 35,104, 26, 72, 76, 76,148, 93,185,114,165,193,216, 24,141, 64,241, 13,
+ 61,110, 20,220,195,145, 99,247, 64,  8,133,139,191,210, 24, 63,205,  8,177, 55,193,159,183,129, 35,135,128,202, 74,  2, 66,  3,
+143,143,160, 32,145,  0,114,121,  2,174, 95,191,206,233,154,228, 67, 64, 14, 28,115,125,146, 20, 73,155, 45,127, 97,109,170, 79,
+ 22, 17,213,235,144, 86,190,190,240,121,105,161,207,239, 27,210, 87,232, 43, 43,167,115,149,231,229, 39, 93,145,188,114,173,207,
+161, 98, 82, 79, 94,203,  0, 95,244,156,250,162,207,197,175,223, 95,161,215, 84, 79,231,226,  1,144,248,  5,172, 88,182,106,181,
+207,181,146,138,122,178,154,  5,  6, 96,226,180, 89, 62, 89, 95,126,178, 66,163,209, 76,111,226,199,151,218,187,119,111,131,178,
+ 55,222,120,131,236,221,187, 23,217,217,217,156,135,  2,192,121,  0,167,215,175, 95,223, 39, 40, 40, 72,202,184,193, 63,249,228,
+ 19,204,158, 61, 27,159,126,250,105,157,165,190,126,253,122,148,151,151,163,178,178,178,186,166,166,166,208,226, 65, 16, 59,250,
+  1,154,166,137,181,139,158,177,254,185,186,255, 25, 55, 61, 91,142,181,187,254, 97, 88,  2,176,229,  5,240,180,245,207,200,228,
+186,  4,112,113,200, 16, 80, 47, 76, 69, 16,  0, 50, 34, 10, 53, 39,207, 67,243,206,166,251,253,150,244, 52,186, 60,247, 52, 36,
+ 18,243,245, 95,184,224,120,107, 54,243,185,124,156, 89,137,200, 63,113, 22,159,255,223,118,248, 15, 30,132, 26,131, 17,122,232,
+241,196,147,253, 26,212,231, 34,239,134, 73,143,105,109, 95,  4,125,178, 22,137,255, 30,  1,241,148,227,232, 17,217,  3,145, 61,
+ 59,215,181, 47,101,201,  6,164,165,253,147,243,125,115,181,242,234,200,139,184,248,109,124, 51, 46, 30,  3,215, 18,  1,253, 37,
+ 21,128,252,252,124,167,209,223,150,207,185,  9,244, 13,128,170,227,127,129, 15,195,  9,194,  3,128, 78,181,160, 30,203,166,240,
+126, 84,221,218,191, 59,203,  0,214, 91,  1,237,109, 13,116,224,118,173, 35,127,235,  0, 64,198,165,206,148, 57,241,  0, 80,214,
+150,152,187,147,249,227, 79,198,199,220,188,117, 64, 77,183,166, 33,242,  6,124, 44,243,162,129, 38, 48, 26,129,170, 42,  2,189,
+  1, 48, 26,204, 74, 65,194,  4,179,247,198,142,203,158,138, 30, 18, 31, 83,123,103,191, 58, 50,146,198,225, 31, 76,160, 68,192,
+159, 37, 20, 36,126,192, 15,  7,  1,189,150,  2, 69,128,222,253,125, 80, 92, 68,227,201, 39, 99,145,149,149,197,233, 88,107,249,
+ 16,144,180, 23,205,215,239,170, 18, 64,104,211, 24, 83,203, 86,162,  3,244,125, 22,106, 11, 32,132,  2,180, 81, 81,222,215,140,
+166, 49,188,228, 17,122, 12,  2, 91,136,212, 37,166, 58,121,173, 37, 64, 43,  9,  5,255, 94, 81,222, 23,182,211, 99,172, 60,  6,
+196,145,172,128,192, 32,209,245,219,229, 22, 98,  1,  2,253,124, 17,232, 47, 70,255,190,253,188,119,127, 78,198, 52,241,163,107,
+179,207,153,168,127,118, 29,198,123, 55,121,242,100, 89,102,102,166, 61,121,213,  0,174,157, 58,117,170,122,248,240,225,173,193,
+218,211,255,201, 39,159,212, 17,162,193, 96,128,201,100,194,149, 43, 87,208,186,117,235, 59, 52, 77,115,210, 22, 39, 76,152, 96,
+207, 82,119,201, 77,255, 48, 47,  1,216,242,  2,120,210,250,231, 67,252, 12,218,133,  6,225,227,143,191, 71,124,220, 16,180,141,
+138,  4,162, 34, 65,189, 48,181,190,210, 11,224,118,137, 22,123,178,143,161, 93,104, 16,119,121, 33,126,136, 26,208,  5, 81,  3,
+186, 52,168,199, 87,222, 19,147,186,227,181, 39,223,  7,125,222, 76,254,115,150,204,112, 73,158, 53,150,  7, 46,255,118, 77,213,
+154, 81,141,249, 64,186,165,  0, 88,246,236, 63,208,  8,108,198,202, 85,169, 84,140,197, 75,217,168, 67, 24,242,103, 89,197,188,
+192,222,  5,192,148,241,181,252,173,  3,  0, 45,168, 43, 91,180,104,145,218,178,156,193, 73, 30,155,252,109,197,  4,240,149,231,
+ 12,105,153, 58, 56,147,151,149,149,149,215, 50,136,194, 83,209, 62,160,  1, 24,244, 52,124,197,230,110,170,210, 16,212, 26,  8,
+140, 38, 32,255,188,  9, 38,154,192,217,150,189,172,172,172,188,182,173, 41, 60, 25,227,133,137,207,122,161,186,138,160,170,  2,
+208, 84, 81,  8,239, 66, 96, 50, 80,240, 22, 73, 80,126,151, 70,241, 31,122, 92,249,149, 91,192,152,124,  8, 72,250, 66,160,107,
+ 24,176,225, 85, 96,254,187,174, 41,  1,164, 70, 51,233,165,168,126,251, 67,178,246, 75,131,135, 61,142,182,  0,218, 82,128,233,
+232, 17,228,206,152, 94,109,168,209, 76,228, 35,143,214,213, 76,124, 97,228,128,  3,221,223,252, 70,218,166,247, 80,180,242,165,
+208, 90, 66, 65,123,233, 71,236,121,125,102,181, 65, 91,195, 89, 94,173, 78, 59,113,220, 83,195, 15, 44,122,103,163,180, 71,159,
+ 40,  4,250,139, 17,232,231,139,130,139,167,177, 42,101, 65,181,150,135, 44, 87,201,220,217,229,218, 34,255,213,171, 87, 55,112,
+243,239,220,185,147,201, 19,144,103,199,250,  7,204, 49, 22,167, 31,123,236,177,  2,157, 78,215,222,203,203, 75,226,239,111,222,
+138,149,153,153,137,201,147, 39, 67,171,213, 66,167,211,161,182,182, 22, 82,169, 84,103, 50,153,178,  8, 33, 37, 28,173,107,143,
+204,109,127,149, 37,  0,182, 23,128,121,221, 20,196,207, 32, 60, 60,  4,203, 95, 75,194,193,  3, 63,225,155,221, 39,225, 43,110,
+134, 63,138,239,175, 96,117,  8,237,129, 90,125, 37,250, 71,117,195,123,233, 73, 88,243,206, 71,188,228,181,105,211, 28, 23, 46,
+ 94,168,251, 60,178, 71, 36, 74, 75, 43,120,201,139, 93, 56, 17,147, 69,211, 81,123,190, 26,209,243,123,130,238, 45,193,199, 31,
+239,168,107, 95, 69, 69,  5,134, 62,222,157,147, 60,107,168, 40, 21,165,130, 10,141,  9,151, 21,128,198, 32,127, 46, 50, 45,132,
+ 79, 44,175,  1,128,176,183, 37,230,231,231,215, 35,124, 91, 10, 66, 67, 63, 44,  5,136, 69,128,159, 23, 32,245,  6,106,171,160,
+ 90,227,  3,164,207, 33,240,107,  1,248,181,224,189,246,111,135,252, 97,131,172, 57, 61, 24,214,228,111, 29, 19,192, 87, 30, 15,
+242,119, 42,175,172,156, 80,251,242, 12, 68, 34,  1,104, 26,232,245,152,215,253,241, 56,103,130,193, 68, 96,162,189, 48,105,210,
+ 36, 78,202,201,237, 63,  9,117,224,160,137, 24,141,128,222, 64, 96, 50,  2, 34, 10,136,137,  5,170,202, 41,252,122, 70, 11,173,
+ 78,132,248,184, 73,216,181,107, 23, 39,242, 95, 61,  7,232,220,193,252,190, 83,123,192, 85, 79,128, 82,169, 60,174, 80, 40,228,
+ 37,  9,227, 14,132,237,217, 47, 13, 27,246, 56, 12, 71,143, 96, 87,220,184,106,125, 85,149, 28,192, 17,158, 93,125,196,164,173,
+146, 95,122, 99,194,129,208,127,103, 73,219, 15, 28,  6,205,165,163,248,226,165,132,234,218, 26,222,242,142,232,180, 53,242,245,
+175,253,243,192,191,254,179, 85, 26, 61,100, 40,174, 94, 56,141,  5, 73,211,171,107,170,171, 93,105, 91,163,194, 65,178, 31, 18,
+ 27, 27,203,101, 55,128, 87, 80, 80,208,105,173, 86,251,121, 97, 97, 97,199, 62,125,250, 68, 24,141, 70,111, 31, 31, 31,100,101,
+101, 97,212,168, 81,208,233,116,168,169,169,193,149, 43, 87, 42,131,131,131,191,215,106,181,159,209, 52,173,  1,199, 12,128,236,
+128,  4,190,174,255,191,218, 18,  0,219, 11,224,  9, 57,174,228, 14,176,133,177,242,193, 24, 43, 31,108,121,231,190, 14, 91, 95,
+222,  4,247,148,187,160,157,168, 61, 83,141, 25, 27, 99,241,175,239, 87,184,221,182,116,125, 58,  9, 54,  6, 99,134,255,140,  7,
+ 98, 88,187,164,  0, 52,133,229,111,195,250, 32, 86,237,241,148,149, 98,215, 35,192,213,  3,224,105,242,103,148, 29, 43,247, 62,
+ 97,151,241,149,231, 44, 22,128,175, 60,141,142, 80, 26, 29,136, 72,  4, 28,201, 55,175,245, 51,  1,127,230,117,255, 73,188,228,
+ 85, 85, 17,138,178, 44,179, 83, 34,179,140,159,255, 11,104,170,105, 16, 26,136,143,143,197,174, 93,187,156,142,135,124,  8, 72,
+202,116, 32, 72, 10, 20,223,  1,252,124,  1,154,  0,  1, 18,224, 29,133,107, 74,  0,128, 35,116, 85,149, 60, 63,126,220,129,230,
+171,223,146,230,173, 94, 85, 93,235, 26,249,215, 83,  2,242,150, 38, 28,240,123,233, 13,105,206,  7,111,186, 66,254,117,178,140,
+  6,253,184, 85, 47,191,176,127,254,162, 20,233,198,247, 82,171,107,170,171,229, 74,165,242, 12,219, 61,172, 84, 42,189, 21, 10,
+133,145,175,  3,196,147, 94,  1, 91,228, 79, 81, 20,137,141,141,  5,  0,140, 31, 63,158, 80, 20,229, 72, 17,144,234,245,250,106,
+145, 72,148, 27, 26, 26,218,161,170,170,234,197, 19, 39, 78,180,235,215,175, 31,109, 52, 26,107, 42, 42, 42,110,159, 57,115,230,
+247,240,240,240,130,150, 45, 91, 22,106,181,218, 76,163,209,120, 59, 41, 41, 73,211,183,111, 95, 78, 10,  0,147, 20,200, 29, 40,
+149, 74,206,132,234,202, 18,128, 59,223,183,231,  5,240,196,156,233,174, 28,157,214,203,163,245, 61, 45,175,252,158,  8,169, 70,
+  5, 34,142,133, 96,234,135,206, 21,147,242,123,206,111,185,  7, 73,254,118, 21,  0, 14,123,253,121, 53,144, 71,238,  0, 62,114,
+ 41, 86,148,191,203,228, 69,229,131,154, 18, 62,150,224, 50,128,  6,249, 26, 42, 44,127,252,246,152, 91,174, 87,237, 41,114,181,
+234, 23,194,228, 25,176,  4,  8, 82, 44,111,136, 75,242,190, 88, 28,192, 86, 10, 92,145, 87, 39,119,242,228,251, 99,194,  4,252,
+169, 84,170, 60, 87,228, 17,186,254, 24, 87, 87,  2,177,177,177,216,183,111, 31,197, 88, 85,156,198,227,115,207, 61, 48,172,124,
+252, 71, 12, 85, 85,242, 31, 86,191,145, 81, 91, 85, 53,195,  3,214,245, 17,125, 77,149,252,208,198, 55, 51,116, 53, 85, 51,149,
+ 74,229, 81, 87, 39,115,163,209,120,216,104,172,150,111, 76, 79,203,168,174,174,158,  1,224,136,181, 44, 23,200,223, 19,168, 55,
+163, 90,147, 63, 19,183,195, 14, 18,140,139,139,115, 36,175, 72,175,215,251, 18, 66,170,104,154, 86,234,245,250,159,194,194,194,
+ 90,149,151,151, 83, 43, 87,174,172,172,168,168, 40,107,223,190,125, 85,117,117,181, 70,175,215, 87, 26, 12,134,218,185,115,231,
+106,121, 90,216,148,  7,238,153,188,198,234,208,198,148,221,212,120,247,221, 15, 41,  0,228,233,103, 70, 33,178,103,184,221,122,
+ 23,206, 95,195,215,219,191,101,234, 63, 48,121, 27, 55,110,172,147,231,208, 96, 62, 81,136,175,183,127,203,212,119,136,  7, 73,
+254,246, 20,  0, 79, 55,160,209, 46,200, 66,162,148, 45,107,153, 15, 60, 28,213,207, 37, 91,160, 91, 63,192,231,208, 31, 79,120,
+  3, 92, 24, 19,187,239,221,149,183,111,223, 62, 94, 99,229, 78,196, 63, 23,210,214, 85, 85,118,242,164, 60,109,117, 85, 39, 15,
+ 89,114, 71,170,171,170, 58, 61,100,207, 50,  5,  0,155, 55,111, 38, 34,145,  8,204, 31,219,133, 45,151,203, 65,211, 52,104,154,
+ 70, 82, 82, 18,229,100, 87,  0,101, 52, 26,253,  9, 33, 38,154,166,107, 13,  6,195,127,189,188,188, 40,145, 72,228, 11,192,151,
+166,105,152, 76, 38, 47,163,209, 40, 54, 26,141,237,230,206,157,123,137,245,221, 70, 63,  4, 72,128,103,148,128, 65,131,134,147,
+131,251,119,163,168,180, 18, 33,193, 53,117,159,149,220,243, 71, 88,155,102,232,214,173,155, 83,178,110, 44,121, 27, 55,110,164,
+158,120,226,  9,178, 33,125, 31,174,254,113,167,129,188,206, 29, 90, 33, 34, 34,130, 19,249, 55, 22, 28,229, 72,161, 92, 61, 71,
+ 88,128,  0,  1,  2, 30,  2,212,176,  8,157,102, 25, 54,222,172,242, 91,  0,154,195, 28, 52, 46, 16,191,  0,  1, 14, 60,  0,  2,
+  4,  8, 16,240, 87,129,196,162,  4,208, 44,226, 23,225,254,201,131,222,  0,218, 89, 94,211, 66,119,  9, 16, 32, 40,  0,  2,  4,
+  8,248,123, 64,  4, 64,202,122,207, 16,191,152, 69,250,180,165,158, 96,253, 11, 16, 32, 40,  0,  2,  4,  8,248, 31,153,211,  4,
+210, 23, 32,192,129,246, 44, 64,128,  0,  1,  2,  4,  8,248, 95,214,150, 79,159, 62,205, 62, 72,135, 88, 37,209, 33,168,127,208,
+ 78,145, 74,165, 10, 99,222,219, 10, 38,100,203,227,139,191,163, 60, 27,219, 22, 41,161,255,132,241,248,171,200, 11, 11, 11,171,
+171, 83, 84, 84, 68,241,149,151,156,156, 12,133, 66, 65,  9,247,159,107, 50,133,231, 87,144,199, 71, 30,111,  5,128, 39, 90,115,
+172, 71, 18, 19, 19,121,103,150,178,119, 94, 60, 26, 38, 35,177,117, 26,160,173, 58, 15, 28, 12,193, 88,246,194,171, 85, 42, 85,
+ 93,182, 46,190,249,196, 27, 11,113,113,113, 49,217,217,217,117, 36, 24, 27, 27, 43,219,183,111, 95,222,223, 81,219,181, 53, 30,
+151, 46,153,119,134,117,239,222,189,169,155, 71, 18, 38, 40,144,245,141,210,230, 61,155, 48, 65, 65, 44,159,217,189,113, 18, 38,
+ 56, 60, 41, 16, 89,223, 40, 93,190,233,194,194,194, 72, 92,220,253, 93,133,217,217, 32,206,148,  0,103, 88,183,126, 93,204,158,
+ 67,123, 16, 17, 25,161,  6,  5, 92, 58,117, 81, 54,164,239, 80,164,191,155,206,235,254,155, 49, 99, 70,131,235,206,200,200,160,
+ 32, 64,128,128, 70, 83,  0,196, 92, 43, 70, 71, 71,243, 22,238, 64,  1,176, 73,162,214,  7,109,240, 32, 90, 87, 52, 39, 46,147,
+ 11, 81,169, 84, 72, 73, 73, 65,106,106,170,218, 65,154, 78, 46,191, 95,175, 78,251,240, 71,  0,  0,183,117, 58, 24,181,181,230,
+194,242, 74,134,228,184,165, 63,174,155,200,179,235,229, 20,176,228, 22,231,117,198,187,136, 50,103,215, 99,254,  3, 78, 95, 55,
+197,228, 92,111, 60, 24,226,119, 99, 60, 60,121, 13, 36, 97,130,  2,227,228,253,117,128, 66, 98, 33,122,151,126,131,165, 64,120,
+ 28,122,125, 10,114,114,146, 48,102,204,102,196,197,165, 34, 59,219,220, 87,174, 40,  2,207, 45,120,142,148,183,184,139,247,148,
+235, 16,236, 31, 12,218,104,130,142,212,170, 15,254,116,104,204, 84,211,211,100,104,196, 48,217,194,133, 11,157, 42,  2, 51,102,
+204, 32,201,201,201, 54,251, 84, 80,  2,  4, 60,  8,196,199,199,215,205, 25,115,230,204,193,214,173, 91,235,113,207,236,217,179,
+235, 29, 78,229, 44,185,148, 51,121, 92,143,170, 62,125,250,180,181,151,192,163, 10,  0,175,248,  1, 91,167,216,121,  2,155,148,
+202,152,121,110, 38, 77,225,147, 67,155,163,229, 78, 82, 82, 82,176,118,237, 90,  0,168,251,111,251,167,  9, 63,111, 64, 80, 51,
+156, 45,220, 14, 63,116,128,  9, 63,162,116,203, 73,156, 41, 40,195,164,181,159, 54,217,  3,112,246,220,121,244,238,213, 19, 52,
+  1,206,159, 55,191,  6,238,191,102,151,211,132,243,152, 16,142,227, 65,113, 29,143,153, 51,103,  2, 64,221,127,155,196, 78, 81,
+128,227,159, 38, 79, 61,117,  0,223,125, 39,247,168, 18, 48, 78,222,191, 38, 41, 41,201, 31,216,140,172,111, 92, 35,118,119, 44,
+124,103,214, 63,  0, 76,158,156,137,156, 28,243,255,164,164,  2, 48, 30,  1, 62,222,128, 77,155, 54,197,168,127,251, 94,253, 66,
+242,108, 12,104,221, 15,126,205,155,131,232,141,160,137,  9, 94,222, 98,116, 30,217, 57,231,215,168,223,176,118,115,170,250,189,
+247,222,147,189,242,202, 43, 78,149,128, 59,119,238,212,123, 31, 59, 60,  0,131, 23,254,  8,157,110,106,189,129,220,177, 99,135,
+203,253, 35,151,203,201,129,  3,  7, 60,214,191,158,150,215,152, 72, 78, 78,142,113, 55,173,111,114,114,114, 12,224,122,122, 96,
+165, 82,217,251,213, 87, 95,189,165,209,104,194,  0,140,134,249, 16,206,238,  0, 78,195,124, 40, 20,  0,124,  1,224,215,  7,221,
+ 63,236,179, 30,230,204,153,131,236,236,236,122,156, 50,123,246,108,240,201, 92,234, 76, 94,221,243,158,149, 69, 18, 18, 18, 40,
+ 46,228,207,148, 89, 43,  1,245, 20,128,148,148, 20, 82, 88, 88,  8,  0,136,136,136,  0,251,176, 25,149, 74, 85,239,189,245,231,
+142, 44,246,210,210, 82,181, 74,165,226,236,  9,176, 62,235,222, 17,  9,207,179,164,194,180,230,  1,190, 46,246,205,155, 55, 59,
+173,147,155,155,203,137,187, 18, 19, 19,237,146,254,178,101,203,144,154,154, 10,182,130,192,  5,237,195, 31,193,205,123, 21,216,
+ 53,111, 50, 90, 82,195, 80,240,241, 98, 68, 76,140,192,183, 77, 76,254,  0,234,  8, 31,  0,122,246,236, 89,175,156,241, 12,176,
+203, 61,109,217, 59, 33, 98,146,152,152,104,151,244,183,109,219,134,212,212, 84,200,135,245,195,129, 31, 79,  1,129,  1, 64,101,
+245,  3,239,195,253,  7, 78,250,  3,155,177,255,192, 73,143,200,187,253,239,150, 14,181,152,182, 75,202, 56, 61, 32,108,215,127,
+ 82, 82, 14,226,226, 58,213,253,103, 16, 23,215,137,179, 18,240,241, 87, 31, 99,205,135,111, 99,120,151, 24,152,106,107, 97, 52,
+ 25, 65,121, 83,  0,188, 64, 64,227,246,159,197,232,222,186, 27, 86,204, 91,129,183,211,222,230,228,141,178,158,236, 98, 67,183,
+217, 36,252,169, 83,167, 18, 87,148,  0,185, 92, 78,246,175, 60,128,113,240, 12,105,203,229,114,146,150,150,  6,  0, 15,181, 18,
+144,156,156, 28, 83, 81, 81,193,120,203,220,106,103, 69, 69,  5, 51,167,187, 36, 71,161, 80, 20,  2,152,  9,224, 20,128,207,  0,
+140,  2, 48, 22,192, 63, 89, 10,192,157,166,232, 39,246,113,207,  0,240,205, 55, 13, 53,248,111,190,249,  6,132, 16, 76,152, 48,
+129,226, 43,111,211,166, 77, 50,246, 92, 23, 18, 18, 98,151,248,173,145,148, 98,230,152,205,169,203,108,126, 94, 79,  1, 72, 77,
+ 77,117, 24,  4,200,126,111,253,185,163, 32,  4, 70,169, 88,180,104,145, 58, 37, 37,  5,214,  7,229, 88, 31,158,163, 82,169, 28,
+165, 47,164, 56,148, 53,233, 67,245,245,215, 95,219, 37,126,139,162, 85, 71,254,203,150, 45,227, 36,243,143,194, 34,104,118,175,
+130,116,246,127,208, 62,252, 17,180,109,233,135,194,221,133,102,242, 15,106,102, 94,  2,240,241,226,221,214,184,184, 56, 25,123,
+ 25,192,242,158,151, 12,154,  0, 97,  1,192,  7,211,129,185,219,128,214,254,192,165,114,219,229, 23,238,241,107,159, 61, 69,142,
+143,215,230,173,183,222,178, 75,252,  0,144, 54,115, 60, 54, 28, 60,142,144,136,118, 40,185,126,219,169,245, 15,  0, 28,189,  0,
+156,189,  4,102, 11, 95, 97,211,210,231,178,254,111, 11,105, 95,122, 54,201, 39, 67,250,204,127,125, 92,103,136,179,175,114,254,
+126,141,182,  6,195,166, 14, 85, 71,183, 27,140, 90,141,  6,222,190,190,240,246,190, 63,  5, 21, 94,189,138, 61, 89, 89, 55,103,
+207,154,217,190,163,111, 24,250, 61,217,119,164, 84, 23, 24,243,201,199,159,240,178, 26,223,217, 63, 19, 63,252,240,  3,128,250,
+109,219,177, 99,  7,197, 87,  9, 96,200, 31, 29,223,195,254,149,175,184,173,  4,200,229,114,146,158,158,142,174, 93,187, 98,195,
+134, 13,152, 63,127,254, 67,167,  4, 88, 17,191, 71,228, 49,178,220,240, 38,200,  0, 60,  9, 96, 27,128,106,  0, 33,  0,126,  3,
+112, 29,247,115, 63, 52,  9,172,143,123,102,187,237,173, 93,248,  9,  9,  9,196,153, 11,127,255,254,253,245,150,140,247,236,217,
+147,199,182,250,185, 42,196, 12,249, 51,175, 55,167, 46,107,224,  5,120, 32,121,  0, 88,107,175, 40, 44, 44, 68,155, 54,109, 26,
+ 40,  8, 76, 89,105,105, 41,215, 60,247,206,130,  1, 57, 79,152, 79, 63,253,116,163, 93, 59,155,192,108, 89,253, 22, 18,178,213,
+246,122,208,162,  8,213, 19,  7,131,  4, 46,  6, 70,174, 68, 53,190,  2,182,156,180,104,102,139,225,243,252,  6, 24,141,252, 19,
+157,101,103,103,231,177,251,137, 47,249,  3, 64,233, 39,192,155,155,128, 71, 58,  0,183,247,138,145,177, 85,143,153,219,237,151,
+243, 50,239,137,103, 73,140, 29,236,119,235,155,181,  8,140,148, 64,218,229,101,124,189,118, 46,250,244, 12,193, 99,227,223,230,
+ 52, 30, 92,154,206, 99,169,128,  2, 64,172,200,159, 98,136,223,149,117,125,174, 22, 62, 23,232,227, 58,219, 44,207,177,242,  4,
+ 56,195,173,210, 91, 24,157, 56, 26,129,205,130, 97,162,140, 56,252,195,127, 81, 85, 93,141,184,248,120,252, 89, 90,138,157,153,
+187, 48,103,214,204,246,190, 18, 95,136,136, 15,198,244, 31,147,251,155,122,131, 75, 10,253,189,123,247,220,190,110, 54,249,  3,
+112, 91,  9,144,203,229,100,245,234,213,232,220,217,220,159,157, 58,117,194,195,228,  9,240, 52,241,219,176,254,153,215,174, 92,
+107, 15,203, 51,233,  3,192, 31, 64, 36,128,139,  0,218,  3,168,  4, 80,238,129,103,214, 37, 88, 31,247, 60,103,206,156,186, 50,
+198,133,207,204,101, 92, 60,211,246,150, 11,216,228,207, 69, 17,224,130,  7,150,  8,168, 77,155, 54,178,196,196,196,  6, 75,  1,
+150,179,237,  1,128,119,140,128,189, 96, 64, 71,150,163, 61,  5,165, 49,192, 88,247,246,220,253, 92,173,127,  0, 56,184,124, 53,
+226,214,188, 11,227,200, 97,240,  6, 32, 61,118, 21,223, 22,148,  1,  0,140, 35,231,195,112,174, 21,168,214,255,228, 77, 82, 60,
+188, 44,118, 81, 54,225, 43,204,159,117,  3,151,231, 45,133,230, 59, 61, 66, 90, 57, 46,247,132,  7,192, 21,229, 96,219,182,109,
+102,109, 56,238,  9, 28, 47, 46, 69, 96,159, 64,220,204, 41,  0, 36,190,152, 60,255,121,180,232, 48,190, 41,231, 95,123, 81,255,
+ 30,241,106, 57, 31,  5,192, 36,  0,  0,  9, 32, 73, 68, 65, 84,218, 33,224, 44,118, 32, 39, 41,  7, 99, 54,143,193,228, 76, 32,
+ 41,199,252, 58, 39, 41,135,183, 23,160, 90, 87,133, 86,126, 45, 97,212,213,128,136,  8,  6, 14, 26,132,221,187,119,235,210,223,
+125, 87, 66, 19,130,103,167, 63,139, 22, 45, 91,160,166,186, 26, 70,147, 17,129, 62,205, 96, 16, 25, 92,186,222,242,242,242,122,
+187,  3,248,  6,  4, 54, 32,127,  6, 46, 42,  1,114,185,156,164,164,164, 96,208,160, 65,245,202,123,246,236,137,119,222,121,167,
+ 73,149,128,198, 34,126,107,235, 31,  0,138,139,139, 93,245,  2,252,  4,243,122,127, 37,204,174,255,209,  0,174,  0,232, 13, 32,
+ 11,192,167,  0, 28,222, 44, 74,165,146, 82, 40, 20, 30, 87, 18,216, 46,123, 86,160, 94,221,231,236, 37,129,146,146,146, 24,103,
+  7,125, 17, 66, 40,134,224,217,174,254,132,132,  4,155,229,158, 84,  0,136, 21, 41, 18,158,159, 59, 68, 68, 68, 68, 29,233, 71,
+ 71, 71,203,152,216,  0,198, 59, 16, 17, 17,161,102,150, 11,154,106,226,245, 36,156,173,245,179,172,127,167,152,180, 41, 19, 36,
+ 62, 28,183,135,244, 71, 75, 12,131,223,228, 13, 48,222,250, 19,  8,106,  6,239,178,175,176, 55, 61, 31,240,242,114,229,218,221,
+126, 32,206,188,250, 15, 12,232, 11, 68,204, 63,143, 72,233, 44,252,246,104, 34,240,193, 82,187,229, 77,229,  1, 72, 77, 77,197,
+240,129,143, 97,228,176,174,136,235,181, 20,235,211, 63,194,197,252,155,152, 55, 98,  0, 74,178,246,163,226, 94,165,167,238,  7,
+ 91, 75,  5, 78,  9,154, 77,248,158, 36,127, 59, 50, 57,161,168,168,136, 10, 11, 11, 35,147, 51,235, 43,  4,  0, 48,102,243, 24,
+136,179,175, 34, 59,187,160,110, 39,  0, 59, 87,128,173,219,141,166,105,152,104,128,208, 70,248,250, 73, 48,253,185,231, 36,111,
+190,241,  6,218,182,109, 75,183, 15,  9, 17,233, 52,213, 48, 17,128,208, 38,208,180,115,143, 86, 70, 70,  6, 53,106,212, 40, 82,
+ 86, 86,134,202,202,202,122,138,163,213,238,  0,206,187,  2,228,114, 57, 89, 63,247,  2, 32,233, 12,148,124,216,176,130,164, 51,
+214,207,189,  0,112, 84,  2,228,114, 57, 73, 72, 72,144,245,236,217, 83, 93, 86, 86,214,224,243,176,176, 48, 36, 36, 36,200,240,
+144,199,  4,184,107,253,187,233,  5, 96, 43, 12,237,  0,156,  1, 48, 17,  0,231,163, 76, 27,131,252,  1,199, 75,  0, 54,140,153,
+ 60,103,215, 30, 31, 31, 79,152,239,199,199,199, 19,107,121, 91,183,110, 69,124,124, 60,225,187, 43,128,139,  2,192, 39, 17,144,
+173,207,109, 34, 49, 49,209,166, 23,128, 33,251, 54,109,218,200, 82, 82, 82,212,204,154,108, 98, 98,162,195,160, 66, 71,214,161,
+ 11,251,235, 27,101, 27, 32, 99,221, 59, 10,  6,228,131,130,127, 39,193,103,242,  6,104,139, 47,195,251,216,  6, 24, 50,231,131,
+ 26,183, 14,123,254, 57,  5,215,247, 92, 67, 92,218,103,128,119,211,100,118, 94,170,  2,114,210,118, 35,242,250, 24,224,142,  6,
+ 75, 70, 45,117, 88,238,  9, 15,128,171,214,127,214,238,213,240,106,223,  3, 82,116, 69,209, 15,155, 81, 69, 17,252,124,249,  6,
+ 70,158,191,201,169, 57,223,125, 39,183, 75,246,  0, 96,249,220,102, 61,174,228,111,231, 30,117,139, 24, 60,177, 67, 32, 41,231,
+ 62,241,  3,104, 96,249, 51,  1,131,217,217,  5, 54,191, 31,232, 23,136,226,138, 98, 12,234, 56, 24,218, 90, 29,160,213,193,168,
+ 55, 96, 69, 74, 10, 40, 17, 68, 53,154,106,208,180,  9, 70, 19,129,175,183, 15,254,172,254, 19, 62, 38,231,187,141,191,253,246,
+219,186,107,155, 49, 99,  6, 97,230, 27,246,238,128, 91,183,110,113,190, 78, 51,  9,155,149,128,238,225, 13,127,255,210, 53, 61,
+ 22,109,137,  4, 87,178,182,212, 35,131,  6, 13, 66, 88, 88, 88,131,207,207,159, 63,143,172,172, 44,117, 83,145,191,197, 26,167,
+ 24, 79, 64,113,113,113,163, 88,255, 30,240,  2, 48, 24,109, 33,210,218,135, 65,201,113,180,  4,192, 46,231,187,  4,224,169, 37,
+  5, 62, 10, 64,163,128,177,252,  1, 32, 58, 58, 90,166, 82,169,212,140,235,223,142,114, 32,187,114,229,138,179, 88,  0,138, 99,
+153, 71,173, 76,174, 29,206, 88,255,182,136,159, 81,116,248,180,247, 76, 65, 25, 12,231,222,196,109,252,136,144,113,235,128,138,
+ 74, 20,108, 94,140, 78,201,239,161,228,211,197,128,143, 55, 32,106,154,204,206, 69, 26,160,123,155,137,156,203,155,194,  3,144,
+154,154, 90, 61,117,228,224, 91,205,233,224, 71,106,224, 35,201,124,111, 62, 54,238, 61,141, 37, 99, 31,199,204,119,191,196,148,
+255,247,127,141,234, 13,114,116,137, 89,223, 40, 97, 73,  2, 68,185,171,156,186,227,234,119,228,  5, 72,202,201, 33,182,200,159,
+109,253, 59, 67,104,155, 80, 28, 60,156,131,161,143, 12,133,127,128, 20, 52, 77, 32, 34, 70,208, 20,  5, 66,  8, 76,  4, 48,210,
+  4, 70,163, 17,218, 10, 13,246,253,178, 15, 98,147,152,247,214, 97,235, 93,  1,175,205, 31,134,216,208, 66, 80,135,184,203,176,
+167,  4,240, 37,127,107, 37, 32, 45, 45, 13,237,218,181,187,175,216, 23, 20, 32, 53, 53, 21, 15,131,229,239,105, 69,192,150,245,
+239,166, 23,  0,  0, 98,  0, 60, 10,224,117, 52,113,240, 31,  3,165, 82, 89,239, 30, 45, 41, 41,129, 82,169,116,228,137,112, 42,
+143,189,164, 80, 82, 82, 18,163, 84, 42, 41,  0,164,164,164,132,218,180,105, 19, 97,121,111, 41,133, 27,219,224, 31,136,  2, 96,
+ 29,245,111, 73, 86,211, 64, 57, 96,191,118,211,130,231,125, 99,121,112, 27,160, 77,235,223, 85,226,103, 48,105,237,167,216,  5,
+ 96,236,154, 88, 16,213, 98, 80, 79,175,199,153,130, 50, 80, 45,130,113,245,143, 74,179,245,207,127,  9,192, 35,176,183,223,223,
+157, 60,  0, 92, 20, 46,174,202,193,182,109,219,244,  0,170,230,198,244,174,124,121,221,127,244,203, 87,164,232, 90, 55,107, 83,
+118,225, 98, 81,219,153, 23,191,148,162,137,119,141, 56, 32,103,246, 18, 13,207, 29,  5,158,135, 45,242,103, 44,127,  0, 78,  3,
+  2, 23, 46, 92, 72, 13,125,106,104,188,122, 88, 94, 86, 98,175, 41,168,212, 85,130, 18,  1,230,148, 34, 52, 76, 38,  2,218,104,
+ 68,128,111, 32,142, 86,156,194,149, 99, 87,177, 83,185, 51,207,237,134, 23,188,  0,128,255, 54,192,122, 74, 64,187, 34, 92,186,
+ 21,230, 18,249, 91, 43,  1, 27, 54,108, 64, 80, 80, 16,202,202,202,176,122,245,106, 60,108,110,127, 79, 40,  2,246,172,127, 23,
+189,  0,109, 97,142,250, 23,  1,232,  7, 96, 17,128,130,135,165,191, 20,150,173,232,158,130,245,146,194,158, 61,123,126,104,172,
+182, 63,144, 60,  0,246, 60,  2,235,215,175,151, 89, 43, 10,137,137,137,106,190, 23,193, 38,130,135, 33,197, 46,219,250,183,222,
+254,103,233, 95,118,191,114,110, 48,163,  4, 76, 92,243,  9, 72, 38,208,106,166, 18,121, 47, 79,193,227,169, 95,  0, 62, 62,  8,
+144,136,155,228,122,217,123,252,109,189,118, 49, 15,128, 17,128,200, 50,182, 34, 55,199,227,246,212,145,131,139, 95,222,156, 29,
+190, 98,206,232,102,161, 33, 49,122,  0,103, 19, 19, 19,155,195,124,148,172, 75,227,193,220,114,223,125, 39,103, 34,254, 93, 81,
+238, 40,103, 22, 60, 31, 66,111,172,100, 64,246, 96, 77,250,140, 71,160, 69,139, 22, 54,181,179,163,223, 29,221, 19,214,237, 17,
+152,166, 26,207, 62,249,200,147,189, 91,  6,182,132,206,160,  3, 33,  4, 98,111, 49,202,181, 53, 56,254,199,119,216,246,121,  6,
+100, 61,100,178,157,216,233,118, 27,223,217, 63, 19, 25, 25, 25,184,114,133,127, 14,128,251, 74,  0,220, 34,127,182,188,249,243,
+231,147,180,180, 52, 44, 93,186, 20, 15,243,154, 63, 91, 17,200,203,203,115,233,187,142,234,240,144,153,  0,243,126,127, 29,128,
+ 87,  1,252,  2,192,132,191, 41,172,151,  0,248,162,111,223,190, 56,125,250, 52, 54,167, 46,107,144,  7,192, 97, 34,160,198,202,
+  3, 96,203, 35, 96,143,232, 93,244,  2,184,133,198,218,  6,200, 12,160, 82,169, 68,110,110, 46, 93, 88, 88,200, 38, 50,153, 74,
+165,226,173, 57, 78, 90,251, 41,192, 74,252,243,228,138, 77,117,175, 53, 77,115,191, 58,189, 75,105,226, 82,223,165,  3,184, 11,
+243,246,159,233,110,182,177,100,110, 76,239,218, 81,185, 63, 53,123,246,141,207,160, 84, 42,197,185,185,185,237, 80, 63,157,181,
+ 75,227,209,216,158,  0,103,249,253,157,206,156,141,176, 36, 96,143,252,245,113,157,129,108,231,134,217,246, 15,119, 80,  1, 94,
+ 82,114, 44,236, 56,134, 13, 30,134,246,129,237,  1,154,224, 79, 93, 25,142,158, 60,138,146, 11, 37, 24,209,125,132,108,193,130,
+  5, 77, 62, 30,108, 37,192, 83,100,205,120,  2,254, 42,  1,127,238,102,  1,244,  0, 54, 91,254,254, 39, 96,189,164,224,142,139,
+223, 94,  2, 32,155, 10, 64, 99, 97,209,162, 69, 54,201,222,234, 36, 54, 54,212, 14, 18,  1,217, 37, 90, 87,209, 24,219,  0, 83,
+ 83, 83,161, 84, 42,141,185,185,185,222,150,165,  3,134,252, 71, 56,184,110,155,176, 28,166,164,110,132,161, 33, 14,202,169, 38,
+186,249,125, 45,247,229, 74, 75,145, 73,161, 80, 60,231,166, 88,223, 81,175,127,156,175, 84, 42,159,200,205,205, 69,110,110,174,
+ 14,128,196,242,231,  9,226,167,220, 73, 13,236,140,228, 19, 38, 40,234,141, 23, 95,226,246,196,146, 64, 81, 81, 17,149,147,148,
+ 67, 66,231,135,202,208,209,118,157,226,164, 28, 53,215,120,128,173,239,111,165,222,123,239,189,152, 79,215,124,138,176,206,143,
+170,  1,224,183,243,191,202,198,143,138, 67,250, 71,233,121,219,177,221,165,118,102,100,100, 80,163, 71,143,110,176, 43,192, 96,
+ 48,184,117,253,158, 38,235,191, 91,180,255, 67, 64,154, 84, 99, 69,249, 63,104,120, 98, 73,129,241,  2, 88,151,113, 86,  0,156,
+ 89,226, 60, 44,117, 87,111,116,210,200,242, 61,245,125,155,242, 18, 19, 19, 73,110,110,174, 55,187,191,216, 30, 22,158, 10, 74,
+ 94, 35, 17,242,195, 56,  9,  5,  2,168, 54, 39,228,167, 40,  0,126,112,178,191,151,227,120,252,158,155,155,203,236, 43,171,140,
+136,136,104,157,154,154,234,251, 48,244,101, 99,186,237, 61, 41,187,168,168,136, 42, 90, 82,228,177, 62, 96,229,249,175,251,222,
+209,239,143,185,221,206, 67,135, 14,  9,228,250, 55, 39,123, 54,135, 41, 20, 10,131, 39,201, 95,169, 84, 74, 20, 10,133,238,175,
+222, 79, 92,140,104,202,213,115,132,  5,  8, 16, 32, 64,128,  0,  1,127, 93,136,132, 46, 16, 32, 64,128,  0,  1,  2,  4,  5, 64,
+128,  0,  1,  2,  4,  8, 16,240, 63,128,255, 15,161, 90,235,177,206,185, 54, 32,  0,  0,  0,  0, 73, 69, 78, 68,174, 66, 96,130,
   0};
-
diff --git a/source/blender/src/header_text.c b/source/blender/src/header_text.c
index 0eea8c93fd4..f7e44895046 100644
--- a/source/blender/src/header_text.c
+++ b/source/blender/src/header_text.c
@@ -929,8 +929,8 @@ void text_buttons(void)
 		
 	uiDefIconButI(block, ICONTOG, B_TEXTLINENUM, ICON_LONGDISPLAY, xco+=XIC,0,XIC,YIC, &st->showlinenrs, 0, 0, 0, 0, "Displays line numbers");
 	uiDefIconButI(block, ICONTOG, B_WORDWRAP, ICON_WORDWRAP, xco+=XIC,0,XIC,YIC, &st->wordwrap, 0, 0, 0, 0, "Enables word wrap");
-	uiDefIconButI(block, ICONTOG, B_SYNTAX, ICON_SYNTAX, xco+=XIC,0,XIC,YIC, &st->showsyntax, 0, 0, 0, 0, "Enables Syntax Highlighting");
-	uiDefIconButI(block, ICONTOG, B_TEXTPLUGINS, ICON_CLIPUV_DEHLT, xco+=XIC,0,XIC,YIC, &st->doplugins, 0, 0, 0, 0, "Enables text plugins");
+	uiDefIconButI(block, ICONTOG, B_SYNTAX, ICON_SYNTAX, xco+=XIC,0,XIC,YIC, &st->showsyntax, 0, 0, 0, 0, "Enables syntax highlighting");
+	uiDefIconButI(block, ICONTOG, B_TEXTPLUGINS, ICON_PYTHON, xco+=XIC,0,XIC,YIC, &st->doplugins, 0, 0, 0, 0, "Enables Python text plugins");
 	uiBlockEndAlign(block);
 	
 	/* STD TEXT BUTTONS */
diff --git a/source/blender/src/space.c b/source/blender/src/space.c
index ff5abb2b9ad..79fdb312309 100644
--- a/source/blender/src/space.c
+++ b/source/blender/src/space.c
@@ -6054,7 +6054,7 @@ static void init_textspace(ScrArea *sa)
 	st->showlinenrs= 0;
 	st->tabnumber = 4;
 	st->showsyntax= 0;
-	st->doplugins= 1;
+	st->doplugins= 0;
 	st->overwrite= 0;
 	st->wordwrap= 0;
 	st->currtab_set = 0;

From feb5e3a688519316c02e9f2d0e0062d5d3ffa907 Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Thu, 14 Aug 2008 23:48:52 +0000
Subject: [PATCH 212/252] Add a function to join thread by index in the thread
 list.

This can be safely merged in trunk, in case anyone needs something like that.
---
 source/blender/blenlib/BLI_threads.h    |  1 +
 source/blender/blenlib/intern/threads.c | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/source/blender/blenlib/BLI_threads.h b/source/blender/blenlib/BLI_threads.h
index 39162b8bd91..386dc7ab1ef 100644
--- a/source/blender/blenlib/BLI_threads.h
+++ b/source/blender/blenlib/BLI_threads.h
@@ -45,6 +45,7 @@ int		BLI_available_threads(struct ListBase *threadbase);
 int		BLI_available_thread_index(struct ListBase *threadbase);
 void	BLI_insert_thread	(struct ListBase *threadbase, void *callerdata);
 void	BLI_remove_thread	(struct ListBase *threadbase, void *callerdata);
+void	BLI_remove_thread_index(struct ListBase *threadbase, int index);
 void	BLI_end_threads		(struct ListBase *threadbase);
 
 void	BLI_lock_thread		(int type);
diff --git a/source/blender/blenlib/intern/threads.c b/source/blender/blenlib/intern/threads.c
index 92fad291e83..70fe07bc8c6 100644
--- a/source/blender/blenlib/intern/threads.c
+++ b/source/blender/blenlib/intern/threads.c
@@ -199,6 +199,21 @@ void BLI_remove_thread(ListBase *threadbase, void *callerdata)
 	}
 }
 
+void BLI_remove_thread_index(ListBase *threadbase, int index)
+{
+	ThreadSlot *tslot;
+	int counter=0;
+	
+	for(tslot = threadbase->first; tslot; tslot = tslot->next, counter++) {
+		if (counter == index && tslot->avail == 0) {
+			tslot->callerdata = NULL;
+			pthread_join(tslot->pthread, NULL);
+			tslot->avail = 1;
+			break;
+		}
+	}
+}
+
 void BLI_end_threads(ListBase *threadbase)
 {
 	ThreadSlot *tslot;

From d1d1d2b8702230138d4fddbafa63ce1e66a7ea0c Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Fri, 15 Aug 2008 23:14:22 +0000
Subject: [PATCH 213/252] Improvements to the base BPyTextPlugin module:  -
 Added a centralized function for resolving targets (aaa.bbb.ccc)  - Added
 documentation support for locally defined classes and methods  - The time
 taken to parse now dictates how long to use the cache before parsing again  -
 Other tweaks and comments and support for numeric var types

The text plugin scripts have been updated to make use of these features.
---
 release/scripts/bpymodules/BPyTextPlugin.py | 278 ++++++++++++++------
 release/scripts/textplugin_functiondocs.py  |  65 ++---
 release/scripts/textplugin_membersuggest.py |  77 +++---
 release/scripts/textplugin_suggest.py       |   6 +-
 4 files changed, 257 insertions(+), 169 deletions(-)

diff --git a/release/scripts/bpymodules/BPyTextPlugin.py b/release/scripts/bpymodules/BPyTextPlugin.py
index 9d33eca9de7..e7c181387dd 100644
--- a/release/scripts/bpymodules/BPyTextPlugin.py
+++ b/release/scripts/bpymodules/BPyTextPlugin.py
@@ -1,8 +1,34 @@
+"""The BPyTextPlugin Module
+
+Use get_cached_descriptor(txt) to retrieve information about the script held in
+the txt Text object.
+
+Use print_cache_for(txt) to print the information to the console.
+
+Use line, cursor = current_line(txt) to get the logical line and cursor position
+
+Use get_targets(line, cursor) to find out what precedes the cursor:
+	aaa.bbb.cc|c.ddd -> ['aaa', 'bbb', 'cc']
+
+Use resolve_targets(txt, targets) to turn a target list into a usable object if
+one is found to match.
+"""
+
 import bpy, sys, os
 import __builtin__, tokenize
 from Blender.sys import time
 from tokenize import generate_tokens, TokenError, \
-		COMMENT, DEDENT, INDENT, NAME, NEWLINE, NL, STRING
+		COMMENT, DEDENT, INDENT, NAME, NEWLINE, NL, STRING, NUMBER
+
+class Definition():
+	"""Describes a definition or defined object through its name, line number
+	and docstring. This is the base class for definition based descriptors.
+	"""
+	
+	def __init__(self, name, lineno, doc=''):
+		self.name = name
+		self.lineno = lineno
+		self.doc = doc
 
 class ScriptDesc():
 	"""Describes a script through lists of further descriptor objects (classes,
@@ -19,43 +45,40 @@ class ScriptDesc():
 		self.defs = defs
 		self.vars = vars
 		self.incomplete = incomplete
-		self.time = 0
+		self.parse_due = 0
 	
-	def set_time(self):
-		self.time = time()
+	def set_delay(self, delay):
+		self.parse_due = time() + delay
 
-class ClassDesc():
+class ClassDesc(Definition):
 	"""Describes a class through lists of further descriptor objects (defs and
 	vars). The name of the class is held by the name field and the line on
 	which it is defined is held in lineno.
 	"""
 	
-	def __init__(self, name, defs, vars, lineno):
-		self.name = name
+	def __init__(self, name, defs, vars, lineno, doc=''):
+		Definition.__init__(self, name, lineno, doc)
 		self.defs = defs
 		self.vars = vars
-		self.lineno = lineno
 
-class FunctionDesc():
+class FunctionDesc(Definition):
 	"""Describes a function through its name and list of parameters (name,
 	params) and the line on which it is defined (lineno).
 	"""
 	
-	def __init__(self, name, params, lineno):
-		self.name = name
+	def __init__(self, name, params, lineno, doc=''):
+		Definition.__init__(self, name, lineno, doc)
 		self.params = params
-		self.lineno = lineno
 
-class VarDesc():
+class VarDesc(Definition):
 	"""Describes a variable through its name and type (if ascertainable) and the
 	line on which it is defined (lineno). If no type can be determined, type
 	will equal None.
 	"""
 	
 	def __init__(self, name, type, lineno):
-		self.name = name
+		Definition.__init__(self, name, lineno)
 		self.type = type # None for unknown (supports: dict/list/str)
-		self.lineno = lineno
 
 # Context types
 CTX_UNSET = -1
@@ -64,9 +87,6 @@ CTX_SINGLE_QUOTE = 1
 CTX_DOUBLE_QUOTE = 2
 CTX_COMMENT = 3
 
-# Special time period constants
-TP_AUTO = -1
-
 # Python keywords
 KEYWORDS = ['and', 'del', 'from', 'not', 'while', 'as', 'elif', 'global',
 			'or', 'with', 'assert', 'else', 'if', 'pass', 'yield',
@@ -104,8 +124,76 @@ def _load_module_names():
 
 _load_module_names()
 
+def _trim_doc(doc):
+	"""Trims the quotes from a quoted STRING token (eg. "'''text'''" -> "text")
+	"""
+	
+	l = len(doc)
+	i = 0
+	while i < l/2 and (doc[i] == "'" or doc[i] == '"'):
+		i += 1
+	return doc[i:-i]
 
-def get_cached_descriptor(txt, period=TP_AUTO):
+def resolve_targets(txt, targets):
+	"""Attempts to return a useful object for the locally or externally defined
+	entity described by targets. If the object is local (defined in txt), a
+	Definition instance is returned. If the object is external (imported or
+	built in), the object itself is returned. If no object can be found, None is
+	returned.
+	"""
+	
+	count = len(targets)
+	if count==0: return None
+	
+	obj = None
+	local = None
+	i = 1
+	
+	desc = get_cached_descriptor(txt)
+	if desc.classes.has_key(targets[0]):
+		local = desc.classes[targets[0]]
+	elif desc.defs.has_key(targets[0]):
+		local = desc.defs[targets[0]]
+	elif desc.vars.has_key(targets[0]):
+		obj = desc.vars[targets[0]].type
+	
+	if local:
+		while i < count:
+			if hasattr(local, 'classes') and local.classes.has_key(targets[i]):
+				local = local.classes[targets[i]]
+			elif hasattr(local, 'defs') and local.defs.has_key(targets[i]):
+				local = local.defs[targets[i]]
+			elif hasattr(local, 'vars') and local.vars.has_key(targets[i]):
+				obj = local.vars[targets[i]].type
+				local = None
+				i += 1
+				break
+			else:
+				local = None
+				break
+			i += 1
+	
+	if local: return local
+	
+	if not obj:
+		if desc.imports.has_key(targets[0]):
+			obj = desc.imports[targets[0]]
+		else:
+			builtins = get_builtins()
+			if builtins.has_key(targets[0]):
+				obj = builtins[targets[0]]
+	
+	while obj and i < count:
+		if hasattr(obj, targets[i]):
+			obj = getattr(obj, targets[i])
+		else:
+			obj = None
+			break
+		i += 1
+	
+	return obj
+
+def get_cached_descriptor(txt, force_parse=0):
 	"""Returns the cached ScriptDesc for the specified Text object 'txt'. If the
 	script has not been parsed in the last 'period' seconds it will be reparsed
 	to obtain this descriptor.
@@ -116,20 +204,11 @@ def get_cached_descriptor(txt, period=TP_AUTO):
 	
 	global _parse_cache
 	
-	if period == TP_AUTO:
-		m = txt.nlines
-		r = 1
-		while True:
-			m = m >> 2
-			if not m: break
-			r = r << 1
-		period = r
-	
 	parse = True
 	key = hash(txt)
-	if _parse_cache.has_key(key):
+	if not force_parse and _parse_cache.has_key(key):
 		desc = _parse_cache[key]
-		if desc.time >= time() - period:
+		if desc.parse_due > time():
 			parse = desc.incomplete
 	
 	if parse:
@@ -147,6 +226,7 @@ def parse_text(txt):
 	flag set and information processed up to this point will still be accessible.
 	"""
 	
+	start_time = time()
 	txt.reset()
 	tokens = generate_tokens(txt.readline) # Throws TokenError
 	
@@ -171,12 +251,12 @@ def parse_text(txt):
 	
 	indent = 0
 	prev_type = -1
-	prev_string = ''
+	prev_text = ''
 	incomplete = False
 	
 	while True:
 		try:
-			type, string, start, end, line = tokens.next()
+			type, text, start, end, line = tokens.next()
 		except StopIteration:
 			break
 		except TokenError, IndentationError:
@@ -204,33 +284,33 @@ def parse_text(txt):
 		
 		# Default, look for 'from' or 'import' to start
 		if imp_step == 0:
-			if string == 'from':
+			if text == 'from':
 				imp_tmp = []
 				imp_step = 1
-			elif string == 'import':
+			elif text == 'import':
 				imp_from = None
 				imp_tmp = []
 				imp_step = 2
 		
 		# Found a 'from', create imp_from in form '???.???...'
 		elif imp_step == 1:
-			if string == 'import':
+			if text == 'import':
 				imp_from = '.'.join(imp_tmp)
 				imp_tmp = []
 				imp_step = 2
 			elif type == NAME:
-				imp_tmp.append(string)
-			elif string != '.':
+				imp_tmp.append(text)
+			elif text != '.':
 				imp_step = 0 # Invalid syntax
 		
 		# Found 'import', imp_from is populated or None, create imp_name
 		elif imp_step == 2:
-			if string == 'as':
+			if text == 'as':
 				imp_name = '.'.join(imp_tmp)
 				imp_step = 3
-			elif type == NAME or string == '*':
-				imp_tmp.append(string)
-			elif string != '.':
+			elif type == NAME or text == '*':
+				imp_tmp.append(text)
+			elif text != '.':
 				imp_name = '.'.join(imp_tmp)
 				imp_symb = imp_name
 				imp_store = True
@@ -238,7 +318,7 @@ def parse_text(txt):
 		# Found 'as', change imp_symb to this value and go back to step 2
 		elif imp_step == 3:
 			if type == NAME:
-				imp_symb = string
+				imp_symb = text
 			else:
 				imp_store = True
 		
@@ -268,7 +348,7 @@ def parse_text(txt):
 					imports[imp_symb] = module
 			
 			# More to import from the same module?
-			if string == ',':
+			if text == ',':
 				imp_tmp = []
 				imp_step = 2
 			else:
@@ -283,7 +363,7 @@ def parse_text(txt):
 		
 		# Look for 'class'
 		if cls_step == 0:
-			if string == 'class':
+			if text == 'class':
 				cls_name = None
 				cls_lineno = start[0]
 				cls_indent = indent
@@ -293,30 +373,32 @@ def parse_text(txt):
 		elif cls_step == 1:
 			if not cls_name:
 				if type == NAME:
-					cls_name = string
+					cls_name = text
 					cls_sline = False
 					cls_defs = dict()
 					cls_vars = dict()
-			elif string == ':':
+			elif text == ':':
 				cls_step = 2
 		
 		# Found 'class' name ... ':', now check if it's a single line statement
 		elif cls_step == 2:
 			if type == NEWLINE:
 				cls_sline = False
-				cls_step = 3
 			else:
 				cls_sline = True
-				cls_step = 3
+			cls_doc = ''
+			cls_step = 3
 		
 		elif cls_step == 3:
+			if not cls_doc and type == STRING:
+				cls_doc = _trim_doc(text)
 			if cls_sline:
 				if type == NEWLINE:
-					classes[cls_name] = ClassDesc(cls_name, cls_defs, cls_vars, cls_lineno)
+					classes[cls_name] = ClassDesc(cls_name, cls_defs, cls_vars, cls_lineno, cls_doc)
 					cls_step = 0
 			else:
 				if type == DEDENT and indent <= cls_indent:
-					classes[cls_name] = ClassDesc(cls_name, cls_defs, cls_vars, cls_lineno)
+					classes[cls_name] = ClassDesc(cls_name, cls_defs, cls_vars, cls_lineno, cls_doc)
 					cls_step = 0
 		
 		#################
@@ -325,7 +407,7 @@ def parse_text(txt):
 		
 		# Look for 'def'
 		if def_step == 0:
-			if string == 'def':
+			if text == 'def':
 				def_name = None
 				def_lineno = start[0]
 				def_step = 1
@@ -333,21 +415,43 @@ def parse_text(txt):
 		# Found 'def', look for def_name followed by '('
 		elif def_step == 1:
 			if type == NAME:
-				def_name = string
+				def_name = text
 				def_params = []
-			elif def_name and string == '(':
+			elif def_name and text == '(':
 				def_step = 2
 		
 		# Found 'def' name '(', now identify the parameters upto ')'
 		# TODO: Handle ellipsis '...'
 		elif def_step == 2:
 			if type == NAME:
-				def_params.append(string)
-			elif string == ')':
+				def_params.append(text)
+			elif text == ':':
+				def_step = 3
+		
+		# Found 'def' ... ':', now check if it's a single line statement
+		elif def_step == 3:
+			if type == NEWLINE:
+				def_sline = False
+			else:
+				def_sline = True
+			def_doc = ''
+			def_step = 4
+		
+		elif def_step == 4:
+			if type == STRING:
+				def_doc = _trim_doc(text)
+			newdef = None
+			if def_sline:
+				if type == NEWLINE:
+					newdef = FunctionDesc(def_name, def_params, def_lineno, def_doc)
+			else:
+				if type == NAME:
+					newdef = FunctionDesc(def_name, def_params, def_lineno, def_doc)
+			if newdef:
 				if cls_step > 0: # Parsing a class
-					cls_defs[def_name] = FunctionDesc(def_name, def_params, def_lineno)
+					cls_defs[def_name] = newdef
 				else:
-					defs[def_name] = FunctionDesc(def_name, def_params, def_lineno)
+					defs[def_name] = newdef
 				def_step = 0
 		
 		##########################
@@ -357,39 +461,42 @@ def parse_text(txt):
 		if cls_step > 0: # Parsing a class
 			# Look for 'self.???'
 			if var1_step == 0:
-				if string == 'self':
+				if text == 'self':
 					var1_step = 1
 			elif var1_step == 1:
-				if string == '.':
+				if text == '.':
 					var_name = None
 					var1_step = 2
 				else:
 					var1_step = 0
 			elif var1_step == 2:
 				if type == NAME:
-					var_name = string
+					var_name = text
 					if cls_vars.has_key(var_name):
 						var_step = 0
 					else:
 						var1_step = 3
 			elif var1_step == 3:
-				if string == '=':
+				if text == '=':
 					var1_step = 4
 			elif var1_step == 4:
 				var_type = None
-				if string == '[':
-					close = line.find(']', end[1])
-					var_type = list
+				if type == NUMBER:
+					if text.find('.') != -1: var_type = float
+					else: var_type = int
 				elif type == STRING:
 					close = end[1]
 					var_type = str
-				elif string == '(':
+				elif text == '[':
+					close = line.find(']', end[1])
+					var_type = list
+				elif text == '(':
 					close = line.find(')', end[1])
 					var_type = tuple
-				elif string == '{':
+				elif text == '{':
 					close = line.find('}', end[1])
 					var_type = dict
-				elif string == 'dict':
+				elif text == 'dict':
 					close = line.find(')', end[1])
 					var_type = dict
 				if var_type and close+1 < len(line):
@@ -401,27 +508,28 @@ def parse_text(txt):
 		elif def_step > 0: # Parsing a def
 			# Look for 'global ???[,???]'
 			if var2_step == 0:
-				if string == 'global':
+				if text == 'global':
 					var2_step = 1
 			elif var2_step == 1:
 				if type == NAME:
-					vars[string] = True
-				elif string != ',' and type != NL:
+					if not vars.has_key(text):
+						vars[text] = VarDesc(text, None, start[0])
+				elif text != ',' and type != NL:
 					var2_step == 0
 		
 		else: # In global scope
 			if var3_step == 0:
 				# Look for names
-				if string == 'for':
+				if text == 'for':
 					var_accum = dict()
 					var_forflag = True
-				elif string == '=' or (var_forflag and string == 'in'):
+				elif text == '=' or (var_forflag and text == 'in'):
 					var_forflag = False
 					var3_step = 1
 				elif type == NAME:
-					if prev_string != '.' and not vars.has_key(string):
-						var_accum[string] = VarDesc(string, None, start[0])
-				elif not string in [',', '(', ')', '[', ']']:
+					if prev_text != '.' and not vars.has_key(text):
+						var_accum[text] = VarDesc(text, None, start[0])
+				elif not text in [',', '(', ')', '[', ']']:
 					var_accum = dict()
 					var_forflag = False
 			elif var3_step == 1:
@@ -431,10 +539,13 @@ def parse_text(txt):
 				else:
 					var_name = var_accum.keys()[0]
 					var_type = None
-					if string == '[': var_type = list
+					if type == NUMBER:
+						if text.find('.') != -1: var_type = float
+						else: var_type = int
 					elif type == STRING: var_type = str
-					elif string == '(': var_type = tuple
-					elif string == '{': var_type = dict
+					elif text == '[': var_type = list
+					elif text == '(': var_type = tuple
+					elif text == '{': var_type = dict
 					vars[var_name] = VarDesc(var_name, var_type, start[0])
 				var3_step = 0
 		
@@ -443,10 +554,10 @@ def parse_text(txt):
 		#######################
 		
 		prev_type = type
-		prev_string = string
+		prev_text = text
 	
 	desc = ScriptDesc(txt.name, imports, classes, defs, vars, incomplete)
-	desc.set_time()
+	desc.set_delay(10 * (time()-start_time) + 0.05)
 	
 	global _parse_cache
 	_parse_cache[hash(txt)] = desc
@@ -587,13 +698,11 @@ def get_targets(line, cursor):
 	returns them as a list in the same order.
 	"""
 	
-	targets = []
 	i = cursor - 1
 	while i >= 0 and (line[i].isalnum() or line[i] == '_' or line[i] == '.'):
 		i -= 1
 	
-	pre = line[i+1:cursor]
-	return pre.split('.')
+	return line[i+1:cursor].split('.')
 
 def get_defs(txt):
 	"""Returns a dictionary which maps definition names in the source code to
@@ -650,6 +759,7 @@ def print_cache_for(txt, period=sys.maxint):
 	print 'Defs:'
 	for name, ddesc in desc.defs.items():
 		print ' ', name, ddesc.params, ddesc.lineno
+		print '   ', ddesc.doc
 	print '------------------------------------------------'
 	print 'Vars:'
 	for name, vdesc in desc.vars.items():
@@ -663,10 +773,12 @@ def print_cache_for(txt, period=sys.maxint):
 	for clsnme, clsdsc in desc.classes.items():
 		print '  *********************************'
 		print '  Name:', clsnme
+		print ' ', clsdsc.doc
 		print '  ---------------------------------'
 		print '  Defs:'
 		for name, ddesc in clsdsc.defs.items():
 			print '   ', name, ddesc.params, ddesc.lineno
+			print '     ', ddesc.doc
 		print '  ---------------------------------'
 		print '  Vars:'
 		for name, vdesc in clsdsc.vars.items():
diff --git a/release/scripts/textplugin_functiondocs.py b/release/scripts/textplugin_functiondocs.py
index d9cf6657a25..41c8d4842a0 100644
--- a/release/scripts/textplugin_functiondocs.py
+++ b/release/scripts/textplugin_functiondocs.py
@@ -27,49 +27,36 @@ def main():
 	if get_context(txt) != CTX_NORMAL:
 		return
 	
-	# Look backwards for first '(' without ')'
-	b = 0
-	found = False
-	for i in range(c-1, -1, -1):
-		if line[i] == ')': b += 1
-		elif line[i] == '(':
-			b -= 1
-			if b < 0:
-				found = True
-				c = i
-				break
+	# Identify the name under the cursor
+	llen = len(line)
+	while c<llen and (line[c].isalnum() or line[c]=='_'):
+		c += 1
 	
-	# Otherwise identify the name under the cursor
-	if not found:
-		llen = len(line)
-		while c<llen and (line[c].isalnum() or line[c]=='_'):
-			c += 1
+	targets = get_targets(line, c)
 	
-	pre = get_targets(line, c)
+	# If no name under cursor, look backward to see if we're in function parens
+	if len(targets) == 0 or targets[0] == '':
+		# Look backwards for first '(' without ')'
+		b = 0
+		found = False
+		for i in range(c-1, -1, -1):
+			if line[i] == ')': b += 1
+			elif line[i] == '(':
+				b -= 1
+				if b < 0:
+					found = True
+					c = i
+					break
+		if found: targets = get_targets(line, c)
+		if len(targets) == 0 or targets[0] == '':
+			return
 	
-	if len(pre) == 0:
-		return
+	obj = resolve_targets(txt, targets)
+	if not obj: return
 	
-	imports = get_imports(txt)
-	builtins = get_builtins()
-	
-	# Identify the root (root.sub.sub.)
-	if imports.has_key(pre[0]):
-		obj = imports[pre[0]]
-	elif builtins.has_key(pre[0]):
-		obj = builtins[pre[0]]
-	else:
-		return
-	
-	# Step through sub-attributes
-	try:
-		for name in pre[1:]:
-			obj = getattr(obj, name)
-	except AttributeError:
-		print "Attribute not found '%s' in '%s'" % (name, '.'.join(pre))
-		return
-	
-	if hasattr(obj, '__doc__') and obj.__doc__:
+	if isinstance(obj, Definition): # Local definition
+		txt.showDocs(obj.doc)
+	elif hasattr(obj, '__doc__') and obj.__doc__:
 		txt.showDocs(obj.__doc__)
 
 # Check we are running as a script and not imported as a module
diff --git a/release/scripts/textplugin_membersuggest.py b/release/scripts/textplugin_membersuggest.py
index 2b261703e19..7c0de78b704 100644
--- a/release/scripts/textplugin_membersuggest.py
+++ b/release/scripts/textplugin_membersuggest.py
@@ -27,23 +27,15 @@ def main():
 	if get_context(txt) != CTX_NORMAL:
 		return
 	
-	pre = get_targets(line, c)
+	targets = get_targets(line, c)
 	
-	if len(pre) <= 1:
-		return
-	
-	imports = get_imports(txt)
-	builtins = get_builtins()
-	
-	# Identify the root (root.sub.sub.)
-	obj = None
-	if pre[0] == '':
-		i = c - len('.'.join(pre)) - 1
+	if targets[0] == '': # Check if we are looking at a constant [] {} '' etc.
+		i = c - len('.'.join(targets)) - 1
 		if i >= 0:
 			if line[i] == '"' or line[i] == "'":
-				obj = str
+				targets[0] = 'str'
 			elif line[i] == '}':
-				obj = dict
+				targets[0] = 'dict'
 			elif line[i] == ']': # Could be array elem x[y] or list [y]
 				i = line.rfind('[', 0, i) - 1
 				while i >= 0:
@@ -54,47 +46,44 @@ def main():
 						break
 					i -= 1
 				if i < 0: 
-					obj = list
-	elif imports.has_key(pre[0]):
-		obj = imports[pre[0]]
-	elif builtins.has_key(pre[0]):
-		obj = builtins[pre[0]]
-	else:
-		desc = get_cached_descriptor(txt)
-		if desc.vars.has_key(pre[0]):
-			obj = desc.vars[pre[0]].type
+					targets[0] = 'list'
 	
+	obj = resolve_targets(txt, targets[:-1])
 	if not obj:
 		return
 	
-	# Step through sub-attributes
-	try:
-		for name in pre[1:-1]:
-			obj = getattr(obj, name)
-	except AttributeError:
-		print "Attribute not found '%s' in '%s'" % (name, '.'.join(pre))
-		return
-	
-	try:
-		attr = obj.__dict__.keys()
-	except AttributeError:
-		attr = dir(obj)
-	else:
-		if not attr:
-			attr = dir(obj)
-	
 	items = []
-	for k in attr:
+	
+	if isinstance(obj, VarDesc):
+		obj = obj.type
+		
+	if isinstance(obj, Definition): # Locally defined
+		if hasattr(obj, 'classes'):
+			items.extend([(s, 'f') for s in obj.classes.keys()])
+		if hasattr(obj, 'defs'):
+			items.extend([(s, 'f') for s in obj.defs.keys()])
+		if hasattr(obj, 'vars'):
+			items.extend([(s, 'v') for s in obj.vars.keys()])
+	
+	else: # Otherwise we have an imported or builtin object
 		try:
-			v = getattr(obj, k)
-		except (AttributeError, TypeError): # Some attributes are not readable
-			pass
+			attr = obj.__dict__.keys()
+		except AttributeError:
+			attr = dir(obj)
 		else:
-			items.append((k, type_char(v)))
+			if not attr: attr = dir(obj)
+		
+		for k in attr:
+			try:
+				v = getattr(obj, k)
+			except (AttributeError, TypeError): # Some attributes are not readable
+				pass
+			else:
+				items.append((k, type_char(v)))
 	
 	if items != []:
 		items.sort(cmp = suggest_cmp)
-		txt.suggest(items, pre[-1])
+		txt.suggest(items, targets[-1])
 
 # Check we are running as a script and not imported as a module
 if __name__ == "__main__" and OK:
diff --git a/release/scripts/textplugin_suggest.py b/release/scripts/textplugin_suggest.py
index 1e011a2e82d..d8122212d3b 100644
--- a/release/scripts/textplugin_suggest.py
+++ b/release/scripts/textplugin_suggest.py
@@ -45,7 +45,7 @@ def main():
 	if not txt:
 		return
 	
-	(line, c) = current_line(txt)
+	line, c = current_line(txt)
 	
 	# Check we are in a normal context
 	if get_context(txt) != CTX_NORMAL:
@@ -65,7 +65,7 @@ def main():
 	
 	# Otherwise we suggest globals, keywords, etc.
 	list = []
-	pre = get_targets(line, c)
+	targets = get_targets(line, c)
 	desc = get_cached_descriptor(txt)
 	
 	for k in KEYWORDS:
@@ -87,7 +87,7 @@ def main():
 		list.append((k, 'v'))
 	
 	list.sort(cmp = suggest_cmp)
-	txt.suggest(list, pre[-1])
+	txt.suggest(list, targets[-1])
 
 # Check we are running as a script and not imported as a module
 if __name__ == "__main__" and OK:

From 310a6e2179a9c55acbe3bdb833ff8420bd6eb216 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Sat, 16 Aug 2008 14:38:08 +0000
Subject: [PATCH 214/252] Esc removes markers in stages. Temporary markers are
 removed first (if any) then other markers follow.

---
 source/blender/blenkernel/BKE_text.h    |  4 ++--
 source/blender/blenkernel/intern/text.c | 16 ++++++++++++----
 source/blender/src/drawtext.c           |  9 ++++++---
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/source/blender/blenkernel/BKE_text.h b/source/blender/blenkernel/BKE_text.h
index 0094030e757..a80f3cec6c1 100644
--- a/source/blender/blenkernel/BKE_text.h
+++ b/source/blender/blenkernel/BKE_text.h
@@ -102,8 +102,8 @@ void	txt_copy_clipboard	(struct Text *text);
 void	txt_paste_clipboard	(struct Text *text);
 
 void	txt_add_marker						(struct Text *text, struct TextLine *line, int start, int end, char clr[4], int flags);
-void	txt_clear_marker_region				(struct Text *text, struct TextLine *line, int start, int end, int flags);
-void	txt_clear_markers					(struct Text *text, int flags);
+short	txt_clear_marker_region				(struct Text *text, struct TextLine *line, int start, int end, int flags);
+short	txt_clear_markers					(struct Text *text, int flags);
 struct TextMarker	*txt_find_marker		(struct Text *text, struct TextLine *line, int curs, int flags);
 struct TextMarker	*txt_find_marker_region	(struct Text *text, struct TextLine *line, int start, int end, int flags);
 struct TextMarker	*txt_prev_marker		(struct Text *text, struct TextMarker *marker);
diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c
index db5b568f043..451642c4670 100644
--- a/source/blender/blenkernel/intern/text.c
+++ b/source/blender/blenkernel/intern/text.c
@@ -2727,9 +2727,10 @@ TextMarker *txt_find_marker_region(Text *text, TextLine *line, int start, int en
 
 /* Clears all markers on the specified line between two points with at least
    the specified flags set. If flags is zero, all markers will be cleared */
-void txt_clear_marker_region(Text *text, TextLine *line, int start, int end, int flags) {
+short txt_clear_marker_region(Text *text, TextLine *line, int start, int end, int flags) {
 	TextMarker *marker, *next;
 	int lineno= txt_get_span(text->lines.first, line);
+	short cleared= 0;
 	
 	for (marker=text->markers.first; marker; marker=next) {
 		next= marker->next;
@@ -2739,22 +2740,29 @@ void txt_clear_marker_region(Text *text, TextLine *line, int start, int end, int
 		else if (marker->lineno > lineno) break;
 
 		if ((marker->start==marker->end && start<=marker->start && marker->start<=end) ||
-				(marker->start<end && marker->end>start))
+			(marker->start<end && marker->end>start)) {
 			BLI_freelinkN(&text->markers, marker);
+			cleared= 1;
+		}
 	}
+	return cleared;
 }
 
 /* Clears all markers with at least the specified flags set (useful for
    clearing temporary markers) */
-void txt_clear_markers(Text *text, int flags) {
+short txt_clear_markers(Text *text, int flags) {
 	TextMarker *marker, *next;
+	short cleared= 0;
 	
 	for (marker=text->markers.first; marker; marker=next) {
 		next= marker->next;
 
-		if ((marker->flags & flags) == flags)
+		if ((marker->flags & flags) == flags) {
 			BLI_freelinkN(&text->markers, marker);
+			cleared= 1;
+		}
 	}
+	return cleared;
 }
 
 /* Finds the marker at the specified line and cursor position with at least the
diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index 15bf97f19f7..3c201663072 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -2483,6 +2483,12 @@ static short do_markers(SpaceText *st, char ascii, unsigned short evnt, short va
 				draw= 1;
 				swallow= 1;
 			}
+		} else if (evnt==ESCKEY) {
+			if (txt_clear_markers(text, TMARK_TEMP)) swallow= 1;
+			else if (txt_clear_markers(text, 0)) swallow= 1;
+			else return 0;
+			evnt= ascii= val= 0;
+			draw= 1;
 		}
 		if (!swallow) return 0;
 	}
@@ -3113,9 +3119,6 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 			do_draw= 1;
 			pop_space_text(st);
 			break;
-		case ESCKEY:
-			txt_clear_markers(text, TMARK_TEMP);
-			break;
 		case BACKSPACEKEY:
 			if (text && text->id.lib) {
 				error_libdata();

From 9b6dffad2d636e6e1c06845cd3114c2a40d9a413 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Sat, 16 Aug 2008 20:31:38 +0000
Subject: [PATCH 215/252] Fixed problems with markers where Edit All did not
 behave the same for every marker and deleting selections that intersect
 markers did not remove the marker in all cases.

---
 source/blender/blenkernel/intern/text.c | 14 +++++++++++---
 source/blender/src/drawtext.c           | 14 +++++++++-----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c
index 451642c4670..7802a1af1da 100644
--- a/source/blender/blenkernel/intern/text.c
+++ b/source/blender/blenkernel/intern/text.c
@@ -989,8 +989,12 @@ static void txt_delete_sel (Text *text)
 	if (text->curl != text->sell) {
 		txt_clear_marker_region(text, text->curl, text->curc, text->curl->len, 0);
 		move= txt_get_span(text->curl, text->sell);
-	} else
+	} else {
+		mrk= txt_find_marker_region(text, text->curl, text->curc, text->selc, 0);
+		if (mrk->start > text->curc || mrk->end < text->selc)
+			txt_clear_marker_region(text, text->curl, text->curc, text->selc, 0);
 		move= 0;
+	}
 
 	mrk= txt_find_marker_region(text, text->sell, text->selc-1, text->sell->len, 0);
 	if (mrk) {
@@ -2394,8 +2398,12 @@ int txt_replace_char (Text *text, char add)
 	if (!text->curl) return 0;
 
 	/* If text is selected or we're at the end of the line just use txt_add_char */
-	if (text->curc==text->curl->len || text->sell!=text->curl || text->selc!=text->curc || add=='\n') {
-		return txt_add_char(text, add);
+	if (text->curc==text->curl->len || txt_has_sel(text) || add=='\n') {
+		TextMarker *mrk;
+		int i= txt_add_char(text, add);
+		mrk= txt_find_marker(text, text->curl, text->curc, 0);
+		if (mrk && mrk->end==text->curc) mrk->end--;
+		return i;
 	}
 	
 	del= text->curl->line[text->curc];
diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index 3c201663072..05d3334b079 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -2462,6 +2462,9 @@ static short do_markers(SpaceText *st, char ascii, unsigned short evnt, short va
 	if (!text || text->id.lib || text->curl != text->sell) return 0;
 
 	marker= txt_find_marker(text, text->sell, text->selc, 0);
+	if (marker && (marker->start > text->curc || marker->end < text->curc))
+		marker= NULL;
+
 	if (!marker) {
 		/* Find the next temporary marker */
 		if (evnt==TABKEY) {
@@ -2498,9 +2501,10 @@ static short do_markers(SpaceText *st, char ascii, unsigned short evnt, short va
 			c= text->curc-marker->start;
 			s= text->selc-marker->start;
 			if (s<0 || s>marker->end-marker->start) return 0;
-			
+
 			mrk= txt_next_marker(text, marker);
 			while (mrk) {
+				nxt=txt_next_marker(text, mrk); /* mrk may become invalid */
 				txt_move_to(text, mrk->lineno, mrk->start+c, 0);
 				if (s!=c) txt_move_to(text, mrk->lineno, mrk->start+s, 1);
 				if (st->overwrite) {
@@ -2512,8 +2516,8 @@ static short do_markers(SpaceText *st, char ascii, unsigned short evnt, short va
 					}
 				}
 
-				if (mrk==marker) break;
-				mrk=txt_next_marker(text, mrk);
+				if (mrk==marker || mrk==nxt) break;
+				mrk=nxt;
 			}
 			swallow= 1;
 			draw= 1;
@@ -2533,7 +2537,7 @@ static short do_markers(SpaceText *st, char ascii, unsigned short evnt, short va
 						if (s!=c) txt_move_to(text, mrk->lineno, mrk->start+s, 1);
 						txt_backspace_char(text);
 						if (st->showsyntax) txt_format_line(st, text->curl, 1);
-						if (mrk==marker) break;
+						if (mrk==marker || mrk==nxt) break;
 						mrk= nxt;
 					}
 					swallow= 1;
@@ -2553,7 +2557,7 @@ static short do_markers(SpaceText *st, char ascii, unsigned short evnt, short va
 						if (s!=c) txt_move_to(text, mrk->lineno, mrk->start+s, 1);
 						txt_delete_char(text);
 						if (st->showsyntax) txt_format_line(st, text->curl, 1);
-						if (mrk==marker) break;
+						if (mrk==marker || mrk==nxt) break;
 						mrk= nxt;
 					}
 					swallow= 1;

From 5c2015fa89ef658b9e624c746f0bb61ee78ea932 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Sun, 17 Aug 2008 09:46:47 +0000
Subject: [PATCH 216/252] Fix for fix. Forgot to check if markers exist before
 trying to clear. Oops

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

diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c
index 7802a1af1da..35422353b0d 100644
--- a/source/blender/blenkernel/intern/text.c
+++ b/source/blender/blenkernel/intern/text.c
@@ -991,7 +991,7 @@ static void txt_delete_sel (Text *text)
 		move= txt_get_span(text->curl, text->sell);
 	} else {
 		mrk= txt_find_marker_region(text, text->curl, text->curc, text->selc, 0);
-		if (mrk->start > text->curc || mrk->end < text->selc)
+		if (mrk && (mrk->start > text->curc || mrk->end < text->selc))
 			txt_clear_marker_region(text, text->curl, text->curc, text->selc, 0);
 		move= 0;
 	}

From 3a62928777ab033373206fb57b489668aabfe932 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Sun, 17 Aug 2008 10:08:38 +0000
Subject: [PATCH 217/252] Fix for numeric var types creating an error.

---
 release/scripts/bpymodules/BPyTextPlugin.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/release/scripts/bpymodules/BPyTextPlugin.py b/release/scripts/bpymodules/BPyTextPlugin.py
index e7c181387dd..5e38725b75f 100644
--- a/release/scripts/bpymodules/BPyTextPlugin.py
+++ b/release/scripts/bpymodules/BPyTextPlugin.py
@@ -482,6 +482,7 @@ def parse_text(txt):
 			elif var1_step == 4:
 				var_type = None
 				if type == NUMBER:
+					close = end[1]
 					if text.find('.') != -1: var_type = float
 					else: var_type = int
 				elif type == STRING:

From e93151dc397bf51ea5c25151e68741a9ff8bc5ca Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Sun, 17 Aug 2008 10:10:25 +0000
Subject: [PATCH 218/252] Fix for text area scrollbar drawing incorrectly

---
 source/blender/src/drawtext.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index 05d3334b079..5a4d5feaa16 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -1627,9 +1627,6 @@ void drawtextspace(ScrArea *sa, void *spacedata)
 
 	if (st==NULL || st->spacetype != SPACE_TEXT) return;
 	
-	bwin_clear_viewmat(sa->win);	/* clear buttons view */
-	glLoadIdentity();
-	
 	BIF_GetThemeColor3fv(TH_BACK, col);
 	glClearColor(col[0], col[1], col[2], 0.0);
 	glClear(GL_COLOR_BUFFER_BIT);
@@ -1704,6 +1701,10 @@ void drawtextspace(ScrArea *sa, void *spacedata)
 	
 	bwin_scalematrix(sa->win, st->blockscale, st->blockscale, st->blockscale);
 	text_blockhandlers(sa);
+
+	/* We end here in non-buttons scale so that the scrollbar can be drawn correctly */
+	bwin_clear_viewmat(sa->win);	/* clear buttons view */
+	glLoadIdentity();
 	
 	curarea->win_swap= WIN_BACK_OK;
 }

From 7f30e5fdd2f1c84ea1a359c09af85d723f2b4f10 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Mon, 18 Aug 2008 10:01:49 +0000
Subject: [PATCH 219/252] Better class support with inheritance for text
 parsing.

---
 release/scripts/bpymodules/BPyTextPlugin.py | 48 +++++++++++++++------
 1 file changed, 36 insertions(+), 12 deletions(-)

diff --git a/release/scripts/bpymodules/BPyTextPlugin.py b/release/scripts/bpymodules/BPyTextPlugin.py
index 5e38725b75f..751af641eb0 100644
--- a/release/scripts/bpymodules/BPyTextPlugin.py
+++ b/release/scripts/bpymodules/BPyTextPlugin.py
@@ -56,8 +56,9 @@ class ClassDesc(Definition):
 	which it is defined is held in lineno.
 	"""
 	
-	def __init__(self, name, defs, vars, lineno, doc=''):
+	def __init__(self, name, parents, defs, vars, lineno, doc=''):
 		Definition.__init__(self, name, lineno, doc)
+		self.parents = parents
 		self.defs = defs
 		self.vars = vars
 
@@ -150,8 +151,11 @@ def resolve_targets(txt, targets):
 	i = 1
 	
 	desc = get_cached_descriptor(txt)
-	if desc.classes.has_key(targets[0]):
-		local = desc.classes[targets[0]]
+	b = targets[0].find('(')
+	if b==-1: b = None # Trick to let us use [:b] and get the whole string
+	
+	if desc.classes.has_key(targets[0][:b]):
+		local = desc.classes[targets[0][:b]]
 	elif desc.defs.has_key(targets[0]):
 		local = desc.defs[targets[0]]
 	elif desc.vars.has_key(targets[0]):
@@ -159,8 +163,10 @@ def resolve_targets(txt, targets):
 	
 	if local:
 		while i < count:
-			if hasattr(local, 'classes') and local.classes.has_key(targets[i]):
-				local = local.classes[targets[i]]
+			b = targets[i].find('(')
+			if b==-1: b = None
+			if hasattr(local, 'classes') and local.classes.has_key(targets[i][:b]):
+				local = local.classes[targets[i][:b]]
 			elif hasattr(local, 'defs') and local.defs.has_key(targets[i]):
 				local = local.defs[targets[i]]
 			elif hasattr(local, 'vars') and local.vars.has_key(targets[i]):
@@ -369,14 +375,21 @@ def parse_text(txt):
 				cls_indent = indent
 				cls_step = 1
 		
-		# Found 'class', look for cls_name followed by '('
+		# Found 'class', look for cls_name followed by '(' parents ')'
 		elif cls_step == 1:
 			if not cls_name:
 				if type == NAME:
 					cls_name = text
 					cls_sline = False
+					cls_parents = dict()
 					cls_defs = dict()
 					cls_vars = dict()
+			elif type == NAME:
+				if classes.has_key(text):
+					parent = classes[text]
+					cls_parents[text] = parent
+					cls_defs.update(parent.defs)
+					cls_vars.update(parent.vars)
 			elif text == ':':
 				cls_step = 2
 		
@@ -394,11 +407,11 @@ def parse_text(txt):
 				cls_doc = _trim_doc(text)
 			if cls_sline:
 				if type == NEWLINE:
-					classes[cls_name] = ClassDesc(cls_name, cls_defs, cls_vars, cls_lineno, cls_doc)
+					classes[cls_name] = ClassDesc(cls_name, cls_parents, cls_defs, cls_vars, cls_lineno, cls_doc)
 					cls_step = 0
 			else:
 				if type == DEDENT and indent <= cls_indent:
-					classes[cls_name] = ClassDesc(cls_name, cls_defs, cls_vars, cls_lineno, cls_doc)
+					classes[cls_name] = ClassDesc(cls_name, cls_parents, cls_defs, cls_vars, cls_lineno, cls_doc)
 					cls_step = 0
 		
 		#################
@@ -699,11 +712,22 @@ def get_targets(line, cursor):
 	returns them as a list in the same order.
 	"""
 	
-	i = cursor - 1
-	while i >= 0 and (line[i].isalnum() or line[i] == '_' or line[i] == '.'):
+	brk = 0
+	targets = []
+	j = cursor
+	i = j-1
+	while i >= 0:
+		if line[i] == ')': brk += 1
+		elif brk:
+			if line[i] == '(': brk -= 1
+		else:
+			if line[i] == '.':
+				targets.insert(0, line[i+1:j]); j=i
+			elif not (line[i].isalnum() or line[i] == '_' or line[i] == '.'):
+				break
 		i -= 1
-	
-	return line[i+1:cursor].split('.')
+	targets.insert(0, line[i+1:j])
+	return targets
 
 def get_defs(txt):
 	"""Returns a dictionary which maps definition names in the source code to

From d39cdd7aad37891fed0885d525b58de17fad0a2f Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Mon, 18 Aug 2008 10:24:56 +0000
Subject: [PATCH 220/252] Moving the find panel caused some funky projection
 effect, introduced when I fixed the scrollbar. The scrollbar and panel now
 play nice.

---
 source/blender/src/drawtext.c | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index 5a4d5feaa16..0c8e96f89fc 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -1111,10 +1111,8 @@ static void do_textscroll(SpaceText *st, int mode)
 
 	st->flags|= ST_SCROLL_SELECT;
 
-	glDrawBuffer(GL_FRONT);
-	uiEmboss(st->txtbar.xmin, st->txtbar.ymin, st->txtbar.xmax, st->txtbar.ymax, st->flags & ST_SCROLL_SELECT);
-	bglFlush();
-	glDrawBuffer(GL_BACK);
+	scrarea_do_windraw(curarea);
+	screen_swapbuffers();
 
 	getmouseco_areawin(mval);
 	old[0]= hold[0]= mval[0];
@@ -1152,10 +1150,8 @@ static void do_textscroll(SpaceText *st, int mode)
 	}
 	st->flags^= ST_SCROLL_SELECT;
 
-	glDrawBuffer(GL_FRONT);
-	uiEmboss(st->txtbar.xmin, st->txtbar.ymin, st->txtbar.xmax, st->txtbar.ymax, st->flags & ST_SCROLL_SELECT);
-	bglFlush();
-	glDrawBuffer(GL_BACK);
+	scrarea_do_windraw(curarea);
+	screen_swapbuffers();
 }
 
 static void do_selection(SpaceText *st, int selecting)
@@ -1626,6 +1622,9 @@ void drawtextspace(ScrArea *sa, void *spacedata)
 	int linecount = 0;
 
 	if (st==NULL || st->spacetype != SPACE_TEXT) return;
+
+	bwin_clear_viewmat(sa->win);	/* clear buttons view */
+	glLoadIdentity();
 	
 	BIF_GetThemeColor3fv(TH_BACK, col);
 	glClearColor(col[0], col[1], col[2], 0.0);
@@ -1701,10 +1700,6 @@ void drawtextspace(ScrArea *sa, void *spacedata)
 	
 	bwin_scalematrix(sa->win, st->blockscale, st->blockscale, st->blockscale);
 	text_blockhandlers(sa);
-
-	/* We end here in non-buttons scale so that the scrollbar can be drawn correctly */
-	bwin_clear_viewmat(sa->win);	/* clear buttons view */
-	glLoadIdentity();
 	
 	curarea->win_swap= WIN_BACK_OK;
 }

From e1ceab6ed68b6efef839f5f1b7adbd84c48279cd Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Mon, 18 Aug 2008 14:16:34 +0000
Subject: [PATCH 221/252] Missed parentheses from except clause, has a whole
 different meaning.

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

diff --git a/release/scripts/bpymodules/BPyTextPlugin.py b/release/scripts/bpymodules/BPyTextPlugin.py
index 751af641eb0..73b0109206a 100644
--- a/release/scripts/bpymodules/BPyTextPlugin.py
+++ b/release/scripts/bpymodules/BPyTextPlugin.py
@@ -265,7 +265,7 @@ def parse_text(txt):
 			type, text, start, end, line = tokens.next()
 		except StopIteration:
 			break
-		except TokenError, IndentationError:
+		except (TokenError, IndentationError):
 			incomplete = True
 			break
 		

From d6a9f7f4850defeb13c994caecc6776adb782f08 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Mon, 18 Aug 2008 17:08:25 +0000
Subject: [PATCH 222/252] Made modification alert slightly less intrusive and
 added Ignore option.

---
 source/blender/src/drawtext.c | 136 ++++++++++++++++++++--------------
 1 file changed, 80 insertions(+), 56 deletions(-)

diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index 0c8e96f89fc..91af3ecb6c6 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -1792,6 +1792,26 @@ int txt_file_modified(Text *text)
 	return 0;
 }
 
+void txt_ignore_modified(Text *text) {
+	struct stat st;
+	int result;
+	char file[FILE_MAXDIR+FILE_MAXFILE];
+
+	if (!text || !text->name) return;
+
+	BLI_strncpy(file, text->name, FILE_MAXDIR+FILE_MAXFILE);
+	BLI_convertstringcode(file, G.sce);
+
+	if (!BLI_exists(file)) return;
+
+	result = stat(file, &st);
+	
+	if(result == -1 || (st.st_mode & S_IFMT) != S_IFREG)
+		return;
+
+	text->mtime= st.st_mtime;
+}
+
 static void save_mem_text(char *str)
 {
 	SpaceText *st= curarea->spacedata.first;
@@ -2621,6 +2641,65 @@ static short do_markers(SpaceText *st, char ascii, unsigned short evnt, short va
 	return swallow;
 }
 
+static short do_modification_check(SpaceText *st) {
+	Text *text= st->text;
+
+	if (last_check_time < PIL_check_seconds_timer() - 2.0) {
+		switch (txt_file_modified(text)) {
+		case 1:
+			/* Modified locally and externally, ahhh. Offer more possibilites. */
+			if (text->flags & TXT_ISDIRTY) {
+				switch (pupmenu("File Modified Outside and Inside Blender %t|Load outside changes (ignore local changes) %x0|Save local changes (ignore outside changes) %x1|Make text internal (separate copy) %x2")) {
+				case 0:
+					reopen_text(text);
+					if (st->showsyntax) txt_format_text(st);
+					return 1;
+				case 1:
+					txt_write_file(text);
+					return 1;
+				case 2:
+					text->flags |= TXT_ISMEM | TXT_ISDIRTY | TXT_ISTMP;
+					MEM_freeN(text->name);
+					text->name= NULL;
+					return 1;
+				}
+			} else {
+				switch (pupmenu("File Modified Outside Blender %t|Reload from disk %x0|Make text internal (separate copy) %x1|Ignore %x2")) {
+				case 0:
+					reopen_text(text);
+					if (st->showsyntax) txt_format_text(st);
+					return 1;
+				case 1:
+					text->flags |= TXT_ISMEM | TXT_ISDIRTY | TXT_ISTMP;
+					MEM_freeN(text->name);
+					text->name= NULL;
+					return 1;
+				case 2:
+					txt_ignore_modified(text);
+					return 1;
+				}
+			}
+			break;
+		case 2:
+			switch (pupmenu("File Deleted Outside Blender %t|Make text internal %x0|Recreate file %x1")) {
+			case 0:
+				text->flags |= TXT_ISMEM | TXT_ISDIRTY | TXT_ISTMP;
+				MEM_freeN(text->name);
+				text->name= NULL;
+				return 1;
+			case 1:
+				txt_write_file(text);
+				return 1;
+			}
+			break;
+		default:
+			break;
+		}
+		last_check_time = PIL_check_seconds_timer();
+	}
+	return 0;
+}
+
 void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 {
 	unsigned short event= evt->event;
@@ -3229,62 +3308,7 @@ void winqreadtextspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 		}
 	}
 
-	if (last_check_time < PIL_check_seconds_timer() - 10.0) {
-		switch (txt_file_modified(text)) {
-		case 1:
-			/* Modified locally and externally, ahhh. Offer more possibilites. */
-			if (text->flags & TXT_ISDIRTY) {
-				switch (pupmenu("File Modified Outside and Inside Blender %t|Load outside changes (ignore local changes) %x0|Save local changes (ignore outside changes) %x1|Make text internal (separate copy) %x2")) {
-				case 0:
-					reopen_text(text);
-					if (st->showsyntax) txt_format_text(st);
-					do_draw= 1;
-					break;
-				case 1:
-					txt_write_file(text);
-					do_draw= 1;
-					break;
-				case 2:
-					text->flags |= TXT_ISMEM | TXT_ISDIRTY | TXT_ISTMP;
-					MEM_freeN(text->name);
-					text->name= NULL;
-					do_draw= 1;
-					break;
-				}
-			} else {
-				switch (pupmenu("File Modified Outside Blender %t|Reload from disk %x0|Make text internal (separate copy) %x1")) {
-				case 0:
-					reopen_text(text);
-					if (st->showsyntax) txt_format_text(st);
-					do_draw= 1;
-					break;
-				case 1:
-					text->flags |= TXT_ISMEM | TXT_ISDIRTY | TXT_ISTMP;
-					MEM_freeN(text->name);
-					text->name= NULL;
-					do_draw= 1;
-					break;
-				}
-			}
-			break;
-		case 2:
-			switch (pupmenu("File Deleted Outside Blender %t|Make text internal %x0|Recreate file %x1")) {
-			case 0:
-				text->flags |= TXT_ISMEM | TXT_ISDIRTY | TXT_ISTMP;
-				MEM_freeN(text->name);
-				text->name= NULL;
-				do_draw= 1;
-				break;
-			case 1:
-				txt_write_file(text);
-				do_draw= 1;
-				break;
-			}
-			break;
-		default:
-			last_check_time = PIL_check_seconds_timer();
-		}
-	}
+	if (do_modification_check(st)) do_draw= 1;
 
 	if (do_draw) {
 		ScrArea *sa;

From bf0803c0c24a3db25b60b1114b30a08ee45d9d1f Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Sun, 24 Aug 2008 13:30:35 +0000
Subject: [PATCH 223/252] Added better grouping for text markers with a
 separate group field (instead of using flags). The lower two bytes of the
 group are used for python scripts while the upper two (or more) are reserved
 for internal grouping. Plenty either way.

---
 source/blender/blenkernel/BKE_text.h     |  10 +--
 source/blender/blenkernel/intern/text.c  | 101 +++++++++--------------
 source/blender/makesdna/DNA_text_types.h |   3 +-
 source/blender/python/api2_2x/Text.c     |   4 +-
 source/blender/src/drawtext.c            |  18 ++--
 source/blender/src/header_text.c         |   2 +-
 6 files changed, 61 insertions(+), 77 deletions(-)

diff --git a/source/blender/blenkernel/BKE_text.h b/source/blender/blenkernel/BKE_text.h
index a80f3cec6c1..bc687cba950 100644
--- a/source/blender/blenkernel/BKE_text.h
+++ b/source/blender/blenkernel/BKE_text.h
@@ -101,11 +101,11 @@ void	convert_tabs		(struct SpaceText *st, int tab);
 void	txt_copy_clipboard	(struct Text *text);
 void	txt_paste_clipboard	(struct Text *text);
 
-void	txt_add_marker						(struct Text *text, struct TextLine *line, int start, int end, char clr[4], int flags);
-short	txt_clear_marker_region				(struct Text *text, struct TextLine *line, int start, int end, int flags);
-short	txt_clear_markers					(struct Text *text, int flags);
-struct TextMarker	*txt_find_marker		(struct Text *text, struct TextLine *line, int curs, int flags);
-struct TextMarker	*txt_find_marker_region	(struct Text *text, struct TextLine *line, int start, int end, int flags);
+void	txt_add_marker						(struct Text *text, struct TextLine *line, int start, int end, char clr[4], int group, int flags);
+short	txt_clear_marker_region				(struct Text *text, struct TextLine *line, int start, int end, int group, int flags);
+short	txt_clear_markers					(struct Text *text, int group, int flags);
+struct TextMarker	*txt_find_marker		(struct Text *text, struct TextLine *line, int curs, int group, int flags);
+struct TextMarker	*txt_find_marker_region	(struct Text *text, struct TextLine *line, int start, int end, int group, int flags);
 struct TextMarker	*txt_prev_marker		(struct Text *text, struct TextMarker *marker);
 struct TextMarker	*txt_next_marker		(struct Text *text, struct TextMarker *marker);
 struct TextMarker	*txt_prev_marker_color	(struct Text *text, struct TextMarker *marker);
diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c
index 35422353b0d..611adbd5535 100644
--- a/source/blender/blenkernel/intern/text.c
+++ b/source/blender/blenkernel/intern/text.c
@@ -987,16 +987,16 @@ static void txt_delete_sel (Text *text)
 	buf= MEM_mallocN(text->curc+(text->sell->len - text->selc)+1, "textline_string");
 	
 	if (text->curl != text->sell) {
-		txt_clear_marker_region(text, text->curl, text->curc, text->curl->len, 0);
+		txt_clear_marker_region(text, text->curl, text->curc, text->curl->len, 0, 0);
 		move= txt_get_span(text->curl, text->sell);
 	} else {
-		mrk= txt_find_marker_region(text, text->curl, text->curc, text->selc, 0);
+		mrk= txt_find_marker_region(text, text->curl, text->curc, text->selc, 0, 0);
 		if (mrk && (mrk->start > text->curc || mrk->end < text->selc))
-			txt_clear_marker_region(text, text->curl, text->curc, text->selc, 0);
+			txt_clear_marker_region(text, text->curl, text->curc, text->selc, 0, 0);
 		move= 0;
 	}
 
-	mrk= txt_find_marker_region(text, text->sell, text->selc-1, text->sell->len, 0);
+	mrk= txt_find_marker_region(text, text->sell, text->selc-1, text->sell->len, 0, 0);
 	if (mrk) {
 		lineno= mrk->lineno;
 		do {
@@ -2190,7 +2190,7 @@ static void txt_combine_lines (Text *text, TextLine *linea, TextLine *lineb)
 	
 	if(!linea || !lineb) return;
 
-	mrk= txt_find_marker_region(text, lineb, 0, lineb->len, 0);
+	mrk= txt_find_marker_region(text, lineb, 0, lineb->len, 0, 0);
 	if (mrk) {
 		lineno= mrk->lineno;
 		do {
@@ -2236,12 +2236,12 @@ void txt_delete_char (Text *text)
 	} else { /* Just deleting a char */
 		int i= text->curc;
 
-		TextMarker *mrk= txt_find_marker_region(text, text->curl, i-1, text->curl->len, 0);
+		TextMarker *mrk= txt_find_marker_region(text, text->curl, i-1, text->curl->len, 0, 0);
 		if (mrk) {
 			int lineno= mrk->lineno;
 			if (mrk->end==i) {
 				if ((mrk->flags & TMARK_TEMP) && !(mrk->flags & TMARK_EDITALL)) {
-					txt_clear_markers(text, mrk->flags);
+					txt_clear_markers(text, mrk->group, TMARK_TEMP);
 				} else {
 					TextMarker *nxt= mrk->next;
 					BLI_freelinkN(&text->markers, mrk);
@@ -2301,12 +2301,12 @@ void txt_backspace_char (Text *text)
 	else { /* Just backspacing a char */
 		int i= text->curc-1;
 
-		TextMarker *mrk= txt_find_marker_region(text, text->curl, i, text->curl->len, 0);
+		TextMarker *mrk= txt_find_marker_region(text, text->curl, i, text->curl->len, 0, 0);
 		if (mrk) {
 			int lineno= mrk->lineno;
 			if (mrk->start==i+1) {
 				if ((mrk->flags & TMARK_TEMP) && !(mrk->flags & TMARK_EDITALL)) {
-					txt_clear_markers(text, mrk->flags);
+					txt_clear_markers(text, mrk->group, TMARK_TEMP);
 				} else {
 					TextMarker *nxt= mrk->next;
 					BLI_freelinkN(&text->markers, mrk);
@@ -2359,7 +2359,7 @@ int txt_add_char (Text *text, char add)
 	
 	txt_delete_sel(text);
 	
-	mrk= txt_find_marker_region(text, text->curl, text->curc-1, text->curl->len, 0);
+	mrk= txt_find_marker_region(text, text->curl, text->curc-1, text->curl->len, 0, 0);
 	if (mrk) {
 		lineno= mrk->lineno;
 		do {
@@ -2401,7 +2401,7 @@ int txt_replace_char (Text *text, char add)
 	if (text->curc==text->curl->len || txt_has_sel(text) || add=='\n') {
 		TextMarker *mrk;
 		int i= txt_add_char(text, add);
-		mrk= txt_find_marker(text, text->curl, text->curc, 0);
+		mrk= txt_find_marker(text, text->curl, text->curc, 0, 0);
 		if (mrk && mrk->end==text->curc) mrk->end--;
 		return i;
 	}
@@ -2689,7 +2689,7 @@ static int color_match(TextMarker *a, TextMarker *b) {
 }
 
 /* Creates and adds a marker to the list maintaining sorted order */
-void txt_add_marker(Text *text, TextLine *line, int start, int end, char clr[4], int flags) {
+void txt_add_marker(Text *text, TextLine *line, int start, int end, char clr[4], int group, int flags) {
 	TextMarker *tmp, *marker;
 
 	marker= MEM_mallocN(sizeof(TextMarker), "text_marker");
@@ -2697,6 +2697,7 @@ void txt_add_marker(Text *text, TextLine *line, int start, int end, char clr[4],
 	marker->lineno= txt_get_span(text->lines.first, line);
 	marker->start= MIN2(start, end);
 	marker->end= MAX2(start, end);
+	marker->group= group;
 	marker->flags= flags;
 
 	marker->clr[0]= clr[0];
@@ -2712,17 +2713,18 @@ void txt_add_marker(Text *text, TextLine *line, int start, int end, char clr[4],
 	else BLI_addhead(&text->markers, marker);
 }
 
-/* Returns the first matching marker on the specified line between two points,
-   with at least the specified flags set. If flags is zero, all markers will be
-   searched */
-TextMarker *txt_find_marker_region(Text *text, TextLine *line, int start, int end, int flags) {
+/* Returns the first matching marker on the specified line between two points.
+   If the group or flags fields are non-zero the returned flag must be in the
+   specified group and have at least the specified flags set. */
+TextMarker *txt_find_marker_region(Text *text, TextLine *line, int start, int end, int group, int flags) {
 	TextMarker *marker, *next;
 	int lineno= txt_get_span(text->lines.first, line);
 	
 	for (marker=text->markers.first; marker; marker=next) {
 		next= marker->next;
 
-		if ((marker->flags & flags) != flags) continue;
+		if (group && marker->group != group) continue;
+		else if ((marker->flags & flags) != flags) continue;
 		else if (marker->lineno < lineno) continue;
 		else if (marker->lineno > lineno) break;
 
@@ -2733,9 +2735,10 @@ TextMarker *txt_find_marker_region(Text *text, TextLine *line, int start, int en
 	return NULL;
 }
 
-/* Clears all markers on the specified line between two points with at least
-   the specified flags set. If flags is zero, all markers will be cleared */
-short txt_clear_marker_region(Text *text, TextLine *line, int start, int end, int flags) {
+/* Clears all markers on the specified line between two points. If the group or
+   flags fields are non-zero the returned flag must be in the specified group
+   and have at least the specified flags set. */
+short txt_clear_marker_region(Text *text, TextLine *line, int start, int end, int group, int flags) {
 	TextMarker *marker, *next;
 	int lineno= txt_get_span(text->lines.first, line);
 	short cleared= 0;
@@ -2743,7 +2746,8 @@ short txt_clear_marker_region(Text *text, TextLine *line, int start, int end, in
 	for (marker=text->markers.first; marker; marker=next) {
 		next= marker->next;
 
-		if ((marker->flags & flags) != flags) continue;
+		if (group && marker->group != group) continue;
+		else if ((marker->flags & flags) != flags) continue;
 		else if (marker->lineno < lineno) continue;
 		else if (marker->lineno > lineno) break;
 
@@ -2756,16 +2760,18 @@ short txt_clear_marker_region(Text *text, TextLine *line, int start, int end, in
 	return cleared;
 }
 
-/* Clears all markers with at least the specified flags set (useful for
-   clearing temporary markers) */
-short txt_clear_markers(Text *text, int flags) {
+/* Clears all markers in the specified group (if given) with at least the
+   specified flags set. Useful for clearing temporary markers (group=0,
+   flags=TMARK_TEMP) */
+short txt_clear_markers(Text *text, int group, int flags) {
 	TextMarker *marker, *next;
 	short cleared= 0;
 	
 	for (marker=text->markers.first; marker; marker=next) {
 		next= marker->next;
 
-		if ((marker->flags & flags) == flags) {
+		if ((!group || marker->group==group) &&
+				(marker->flags & flags) == flags) {
 			BLI_freelinkN(&text->markers, marker);
 			cleared= 1;
 		}
@@ -2774,13 +2780,14 @@ short txt_clear_markers(Text *text, int flags) {
 }
 
 /* Finds the marker at the specified line and cursor position with at least the
-   specified flags set. If flags is zero, all markers will be searched */
-TextMarker *txt_find_marker(Text *text, TextLine *line, int curs, int flags) {
+   specified flags set in the given group (if non-zero). */
+TextMarker *txt_find_marker(Text *text, TextLine *line, int curs, int group, int flags) {
 	TextMarker *marker;
 	int lineno= txt_get_span(text->lines.first, line);
 	
 	for (marker=text->markers.first; marker; marker=marker->next) {
-		if ((marker->flags & flags) != flags) continue;
+		if (group && marker->group != group) continue;
+		else if ((marker->flags & flags) != flags) continue;
 		else if (marker->lineno < lineno) continue;
 		else if (marker->lineno > lineno) break;
 
@@ -2790,53 +2797,27 @@ TextMarker *txt_find_marker(Text *text, TextLine *line, int curs, int flags) {
 	return NULL;
 }
 
-/* Finds the previous marker with matching flags. If no other marker is found,
-   the same one will be returned */
+/* Finds the previous marker in the same group. If no other is found, the same
+   marker will be returned */
 TextMarker *txt_prev_marker(Text *text, TextMarker *marker) {
 	TextMarker *tmp= marker;
 	while (tmp) {
 		if (tmp->prev) tmp= tmp->prev;
 		else tmp= text->markers.last;
-		if (tmp->flags == marker->flags)
+		if (tmp->group == marker->group)
 			return tmp;
 	}
 	return NULL; /* Only if marker==NULL */
 }
 
-/* Finds the next marker with matching flags. If no other marker is found, the
-   same one will be returned */
+/* Finds the next marker in the same group. If no other is found, the same
+   marker will be returned */
 TextMarker *txt_next_marker(Text *text, TextMarker *marker) {
 	TextMarker *tmp= marker;
 	while (tmp) {
 		if (tmp->next) tmp= tmp->next;
 		else tmp= text->markers.first;
-		if (tmp->flags == marker->flags)
-			return tmp;
-	}
-	return NULL; /* Only if marker==NULL */
-}
-
-/* Finds the previous marker with matching colour. If no other marker is found,
-   the same one will be returned */
-TextMarker *txt_prev_marker_color(Text *text, TextMarker *marker) {
-	TextMarker *tmp= marker;
-	while (tmp) {
-		if (tmp->prev) tmp= tmp->prev;
-		else tmp= text->markers.last;
-		if (color_match(tmp, marker))
-			return tmp;
-	}
-	return NULL; /* Only if marker==NULL */
-}
-
-/* Finds the next marker with matching colour. If no other marker is found, the
-   same one will be returned */
-TextMarker *txt_next_marker_color(Text *text, TextMarker *marker) {
-	TextMarker *tmp= marker;
-	while (tmp) {
-		if (tmp->next) tmp= tmp->next;
-		else tmp= text->markers.first;
-		if (color_match(tmp, marker))
+		if (tmp->group == marker->group)
 			return tmp;
 	}
 	return NULL; /* Only if marker==NULL */
diff --git a/source/blender/makesdna/DNA_text_types.h b/source/blender/makesdna/DNA_text_types.h
index 41ea0b23323..6ea5603ca4c 100644
--- a/source/blender/makesdna/DNA_text_types.h
+++ b/source/blender/makesdna/DNA_text_types.h
@@ -44,7 +44,8 @@ typedef struct TextLine {
 
 typedef struct TextMarker {
 	struct TextMarker *next, *prev;
-	int lineno, start, end, flags;
+	int lineno, start, end, pad1;
+	int group, flags;
 	char clr[4], pad[4];
 } TextMarker;
 
diff --git a/source/blender/python/api2_2x/Text.c b/source/blender/python/api2_2x/Text.c
index 7e31b3bb25b..28924ecfcb3 100644
--- a/source/blender/python/api2_2x/Text.c
+++ b/source/blender/python/api2_2x/Text.c
@@ -708,7 +708,9 @@ static PyObject *Text_markSelection( BPy_Text * self, PyObject * args )
 	clr[2] = (char) (b&0xFF);
 	clr[3] = 255;
 
-	txt_add_marker(text, text->curl, text->curc, text->selc, clr, ((group+2)<<16)|flags);
+	group &= 0xFFFF;
+
+	txt_add_marker(text, text->curl, text->curc, text->selc, clr, group, flags);
 	
 	Py_RETURN_NONE;
 }
diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index 91af3ecb6c6..b8da797662c 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -124,8 +124,8 @@ def wrap(line, view_width, wrap_chars):
 #define TOOL_SUGG_LIST	0x01
 #define TOOL_DOCUMENT	0x02
 
-#define TMARK_GRP_CUSTOM	0x00010000	/* Lower 2 bytes used for flags */
-#define TMARK_GRP_FINDALL	0x00020000	/* Upper 2 bytes used for group */
+#define TMARK_GRP_CUSTOM	0x00010000	/* Lower 2 bytes used for Python groups */
+#define TMARK_GRP_FINDALL	0x00020000
 
 /* forward declarations */
 
@@ -1507,7 +1507,7 @@ void find_and_replace(SpaceText *st, short mode) {
 
 	do {
 		if (first)
-			txt_clear_markers(text, TMARK_GRP_FINDALL);
+			txt_clear_markers(text, TMARK_GRP_FINDALL, 0);
 		first= 0;
 		
 		/* Replace current */
@@ -1520,11 +1520,11 @@ void find_and_replace(SpaceText *st, short mode) {
 				} else if (mode==2) {
 					char clr[4];
 					BIF_GetThemeColor4ubv(TH_SHADE2, clr);
-					if (txt_find_marker(text, text->curl, text->selc, TMARK_GRP_FINDALL)) {
+					if (txt_find_marker(text, text->curl, text->selc, TMARK_GRP_FINDALL, 0)) {
 						if (tmp) MEM_freeN(tmp), tmp=NULL;
 						break;
 					}
-					txt_add_marker(text, text->curl, text->curc, text->selc, clr, TMARK_GRP_FINDALL | TMARK_EDITALL);
+					txt_add_marker(text, text->curl, text->curc, text->selc, clr, TMARK_GRP_FINDALL, TMARK_EDITALL);
 				}
 			}
 			MEM_freeN(tmp);
@@ -2477,7 +2477,7 @@ static short do_markers(SpaceText *st, char ascii, unsigned short evnt, short va
 	text= st->text;
 	if (!text || text->id.lib || text->curl != text->sell) return 0;
 
-	marker= txt_find_marker(text, text->sell, text->selc, 0);
+	marker= txt_find_marker(text, text->sell, text->selc, 0, 0);
 	if (marker && (marker->start > text->curc || marker->end < text->curc))
 		marker= NULL;
 
@@ -2503,8 +2503,8 @@ static short do_markers(SpaceText *st, char ascii, unsigned short evnt, short va
 				swallow= 1;
 			}
 		} else if (evnt==ESCKEY) {
-			if (txt_clear_markers(text, TMARK_TEMP)) swallow= 1;
-			else if (txt_clear_markers(text, 0)) swallow= 1;
+			if (txt_clear_markers(text, 0, TMARK_TEMP)) swallow= 1;
+			else if (txt_clear_markers(text, 0, 0)) swallow= 1;
 			else return 0;
 			evnt= ascii= val= 0;
 			draw= 1;
@@ -2608,7 +2608,7 @@ static short do_markers(SpaceText *st, char ascii, unsigned short evnt, short va
 			case RETKEY:
 			case ESCKEY:
 				if (marker->flags & (TMARK_EDITALL | TMARK_TEMP))
-					txt_clear_markers(text, marker->flags);
+					txt_clear_markers(text, marker->group, 0);
 				else
 					BLI_freelinkN(&text->markers, marker);
 				swallow= 1;
diff --git a/source/blender/src/header_text.c b/source/blender/src/header_text.c
index f7e44895046..e7552434b19 100644
--- a/source/blender/src/header_text.c
+++ b/source/blender/src/header_text.c
@@ -513,7 +513,7 @@ static void do_text_editmenu_markermenu(void *arg, int event)
 	
 	switch(event) {
 	case 1:
-		txt_clear_markers(text, 0);
+		txt_clear_markers(text, 0, 0);
 		break;
 	case 2:
 		lineno= txt_get_span(text->lines.first, text->curl);

From 0257f500e788e62f10db147c476b7847638fa450 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Tue, 26 Aug 2008 17:09:17 +0000
Subject: [PATCH 224/252] Fix for text plug-in scripts on 64-bit platforms.

---
 release/scripts/textplugin_templates.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/release/scripts/textplugin_templates.py b/release/scripts/textplugin_templates.py
index 25dadf4de54..8f949563ac0 100644
--- a/release/scripts/textplugin_templates.py
+++ b/release/scripts/textplugin_templates.py
@@ -35,6 +35,13 @@ templates = {
 		'\t"""(${2}) - ${3:comment}"""\n'
 		'\t${4}',
 	'cls':
+		'class ${1:name}(${2:parent}):\n'
+		'\t"""${3:docs}"""\n'
+		'\t\n'
+		'\tdef __init__(self, ${4:params}):\n'
+		'\t\t"""Creates a new ${1}"""\n'
+		'\t\t${5}',
+	'class':
 		'class ${1:name}(${2:parent}):\n'
 		'\t"""${3:docs}"""\n'
 		'\t\n'
@@ -102,7 +109,8 @@ def main():
 			for x, y in points:
 				txt.setCursorPos(y, x)
 				txt.setSelectPos(y, x+len(text))
-				txt.markSelection(hash(text)+int(id), color, Text.TMARK_TEMP | Text.TMARK_EDITALL)
+				txt.markSelection((hash(text)+int(id)) & 0xFFFF, color,
+						Text.TMARK_TEMP | Text.TMARK_EDITALL)
 		if first:
 			text, x, y = first
 			txt.setCursorPos(y, x)

From bccce7e30e51b43d937f4982ad6d66222f8d961b Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Sat, 30 Aug 2008 11:27:27 +0000
Subject: [PATCH 225/252] Fix for class variable parsing/listing bug.

---
 release/scripts/bpymodules/BPyTextPlugin.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/release/scripts/bpymodules/BPyTextPlugin.py b/release/scripts/bpymodules/BPyTextPlugin.py
index 73b0109206a..5e5c9f55e53 100644
--- a/release/scripts/bpymodules/BPyTextPlugin.py
+++ b/release/scripts/bpymodules/BPyTextPlugin.py
@@ -492,6 +492,8 @@ def parse_text(txt):
 			elif var1_step == 3:
 				if text == '=':
 					var1_step = 4
+				elif text != ',':
+					var1_step = 0
 			elif var1_step == 4:
 				var_type = None
 				if type == NUMBER:

From 3bab89cc1c51e80e15efb4f5d751940ac06001a4 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Sat, 30 Aug 2008 14:32:16 +0000
Subject: [PATCH 226/252] Merge from trunk 16122-16307

---
 CMake/macros.cmake                            |   2 +
 CMakeLists.txt                                |   1 -
 .../CollisionDispatch/btCollisionWorld.cpp    |  39 +-
 .../CollisionDispatch/btCollisionWorld.h      |  18 +-
 .../btRaycastCallback.cpp                     |   6 +-
 .../NarrowPhaseCollision/btRaycastCallback.h  |   3 +-
 .../Dynamics/btDiscreteDynamicsWorld.cpp      |  24 +-
 intern/guardedalloc/BLO_sys_types.h           | 125 +++
 intern/guardedalloc/intern/mallocn.c          |  12 +-
 intern/guardedalloc/intern/mmap_win.c         |   2 +-
 .../make/msvc_7_0/guardedalloc.vcproj         |   3 +
 intern/guardedalloc/mmap_win.h                |   4 +-
 intern/opennl/make/msvc_7_0/opennl.vcproj     |   3 +
 intern/opennl/superlu/BLO_sys_types.h         | 125 +++
 intern/opennl/superlu/smemory.c               |  10 +-
 .../blender/blenkernel/BKE_blenkernel.vcproj  |   6 +
 .../gameengine/gamelogic/SCA_GameLogic.vcproj |   6 +
 .../gameengine/ketsji/KX_ketsji.vcproj        |   6 +
 .../PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj  |   8 +-
 .../kernel/system/SYS_system.vcproj           |   8 +-
 release/datafiles/datatoc.c                   |   2 +-
 release/scripts/flt_dofedit.py                | 835 ++++++++++++++++++
 release/scripts/flt_lodedit.py                | 502 +++++++++++
 release/scripts/flt_properties.py             |  19 +-
 release/text/copyright.txt                    |   2 +-
 source/Makefile                               |   1 +
 source/blender/blenkernel/BKE_blender.h       |   2 +-
 source/blender/blenkernel/BKE_collision.h     |  11 +
 source/blender/blenkernel/BKE_customdata.h    |   4 +-
 source/blender/blenkernel/BKE_deform.h        |   4 +
 source/blender/blenkernel/BKE_effect.h        |   6 +
 source/blender/blenkernel/BKE_endian.h        |   6 +-
 source/blender/blenkernel/BKE_shrinkwrap.h    | 146 +++
 source/blender/blenkernel/BKE_utildefines.h   |   4 +-
 source/blender/blenkernel/intern/CCGSubSurf.c |   4 +-
 .../blender/blenkernel/intern/DerivedMesh.c   |  20 +-
 source/blender/blenkernel/intern/bvhutils.c   |  10 +-
 source/blender/blenkernel/intern/cloth.c      |  22 +-
 source/blender/blenkernel/intern/collision.c  |  68 +-
 source/blender/blenkernel/intern/deform.c     |  28 +
 source/blender/blenkernel/intern/displist.c   |   8 +-
 source/blender/blenkernel/intern/effect.c     | 474 ++++++----
 source/blender/blenkernel/intern/icons.c      |   2 +
 source/blender/blenkernel/intern/image.c      |   8 +-
 source/blender/blenkernel/intern/implicit.c   | 141 +--
 source/blender/blenkernel/intern/ipo.c        |  14 +-
 source/blender/blenkernel/intern/modifier.c   | 157 +++-
 source/blender/blenkernel/intern/particle.c   |  31 +-
 .../blenkernel/intern/particle_system.c       | 306 ++-----
 source/blender/blenkernel/intern/sca.c        |   3 +
 source/blender/blenkernel/intern/shrinkwrap.c | 588 ++++++++++++
 source/blender/blenlib/BLI_editVert.h         |   8 +-
 source/blender/blenlib/BLI_rand.h             |   1 +
 source/blender/blenlib/BLI_winstuff.h         |   8 +
 source/blender/blenlib/intern/BLI_ghash.c     |   8 +-
 source/blender/blenlib/intern/BLI_kdopbvh.c   | 229 ++++-
 source/blender/blenlib/intern/fileops.c       |   6 +-
 source/blender/blenlib/intern/psfont.c        |   4 +-
 source/blender/blenlib/intern/rand.c          |  18 +-
 source/blender/blenlib/intern/util.c          |   8 +-
 source/blender/blenloader/BLO_sys_types.h     |  17 +-
 source/blender/blenloader/intern/genfile.c    |  10 +-
 .../blender/blenloader/intern/readblenentry.c |   4 +-
 source/blender/blenloader/intern/readfile.c   |  62 +-
 source/blender/blenloader/intern/writefile.c  |   4 +
 .../blender/blenpluginapi/intern/pluginapi.c  |   4 +-
 .../blender/imbuf/intern/cineon/cineonlib.c   |  32 +-
 source/blender/imbuf/intern/cineon/dpxlib.c   |  36 +-
 .../imbuf/intern/cineon/logImageCore.h        |   6 +-
 .../blender/imbuf/intern/cineon/logmemfile.c  |   6 +-
 .../blender/imbuf/intern/cineon/logmemfile.h  |   2 +-
 source/blender/imbuf/intern/scaling.c         |  74 +-
 source/blender/include/BDR_gpencil.h          |   4 +-
 source/blender/include/BIF_drawgpencil.h      |   5 +-
 source/blender/include/BIF_editarmature.h     |   1 +
 source/blender/include/BIF_editview.h         |   1 +
 source/blender/include/BIF_meshtools.h        |   2 +-
 source/blender/include/BIF_resources.h        |   4 +
 source/blender/include/BSE_drawipo.h          |   3 +
 source/blender/include/transform.h            |   2 +-
 source/blender/makesdna/DNA_actuator_types.h  |   7 +-
 source/blender/makesdna/DNA_gpencil_types.h   |   6 +-
 source/blender/makesdna/DNA_ipo_types.h       |  12 +-
 source/blender/makesdna/DNA_modifier_types.h  |  45 +-
 source/blender/makesdna/DNA_object_force.h    |   7 +-
 source/blender/makesdna/DNA_particle_types.h  |   3 +
 source/blender/makesdna/DNA_sensor_types.h    |  13 +
 source/blender/makesdna/DNA_space_types.h     |   1 +
 source/blender/makesdna/DNA_userdef_types.h   |   5 +
 source/blender/makesdna/intern/makesdna.c     |   8 +-
 source/blender/python/api2_2x/Draw.c          |   6 +
 source/blender/python/api2_2x/Material.c      |  92 +-
 source/blender/python/api2_2x/Mesh.c          |   4 +-
 source/blender/python/api2_2x/Object.c        |  37 +-
 source/blender/python/api2_2x/Particle.c      |   6 +-
 source/blender/python/api2_2x/Text3d.c        |  46 +
 source/blender/python/api2_2x/doc/Material.py |  19 +-
 .../blender/python/api2_2x/doc/Mathutils.py   |   9 +
 source/blender/python/api2_2x/doc/Object.py   |   8 +-
 source/blender/python/api2_2x/doc/Text3d.py   |  20 +
 source/blender/python/api2_2x/vector.c        |  52 +-
 source/blender/python/api2_2x/vector.h        |   1 +
 source/blender/radiosity/CMakeLists.txt       |   2 +-
 source/blender/radiosity/SConscript           |   2 +-
 .../blender/radiosity/intern/source/Makefile  |   1 +
 .../blender/radiosity/intern/source/radnode.c |  10 +-
 .../radiosity/intern/source/radpreprocess.c   |   4 +-
 source/blender/render/CMakeLists.txt          |   2 +-
 source/blender/render/SConscript              |   2 +-
 .../render/intern/include/render_types.h      |   8 +-
 .../render/intern/source/convertblender.c     |   4 +-
 .../blender/render/intern/source/occlusion.c  |   2 +-
 .../blender/render/intern/source/pipeline.c   |   2 +-
 .../blender/render/intern/source/rendercore.c |  22 +-
 source/blender/render/intern/source/shadbuf.c |  16 +-
 source/blender/render/intern/source/strand.c  |   4 +-
 source/blender/render/intern/source/zbuf.c    |   8 +-
 source/blender/src/buttons_editing.c          |  57 +-
 source/blender/src/buttons_logic.c            |  85 +-
 source/blender/src/buttons_object.c           | 112 ++-
 source/blender/src/buttons_scene.c            |   7 +-
 source/blender/src/drawgpencil.c              | 294 +++---
 source/blender/src/drawipo.c                  |  54 +-
 source/blender/src/drawmesh.c                 |   8 +-
 source/blender/src/drawobject.c               |  12 +-
 source/blender/src/editarmature.c             | 103 +++
 source/blender/src/editipo.c                  |  19 +-
 source/blender/src/editipo_lib.c              |   3 +-
 source/blender/src/editkey.c                  |   6 +-
 source/blender/src/editmesh_mods.c            |   5 +-
 source/blender/src/editmesh_tools.c           | 210 +++--
 source/blender/src/editnode.c                 |   1 +
 source/blender/src/editobject.c               |  26 +-
 source/blender/src/editview.c                 |   2 +-
 source/blender/src/gpencil.c                  | 467 ++++++++--
 source/blender/src/header_info.c              |   4 +-
 source/blender/src/header_script.c            |   8 +-
 source/blender/src/header_view3d.c            |   4 +
 source/blender/src/interface.c                |   6 +-
 source/blender/src/meshlaplacian.c            |   8 +-
 source/blender/src/meshtools.c                |  16 +-
 source/blender/src/parametrizer.c             |   4 +-
 source/blender/src/parametrizer.h             |   4 +-
 source/blender/src/parametrizer_intern.h      |   2 +-
 source/blender/src/renderwin.c                |   4 +-
 source/blender/src/resources.c                |  19 +-
 source/blender/src/space.c                    |  13 +-
 source/blender/src/toolbox.c                  |  22 +-
 source/blender/src/transform_conversions.c    |  20 +-
 source/blender/src/transform_generics.c       |  49 +-
 source/blender/src/transform_numinput.c       |  14 +
 source/blender/src/usiblender.c               |  10 +-
 .../blender/yafray/intern/export_Plugin.cpp   |   2 +-
 .../BlenderRoutines/BL_KetsjiEmbedStart.cpp   |  31 +-
 .../BlenderRoutines/KX_BlenderRenderTools.cpp |  11 +-
 .../BlenderRoutines/KX_BlenderRenderTools.h   |   4 +-
 .../Converter/BL_BlenderDataConversion.cpp    |  39 +-
 .../Converter/KX_ConvertActuators.cpp         | 109 ++-
 .../Converter/KX_ConvertSensors.cpp           |  39 +-
 source/gameengine/Expressions/PyObjectPlus.h  |  12 +
 .../gameengine/GameLogic/SCA_DelaySensor.cpp  | 257 ++++++
 source/gameengine/GameLogic/SCA_DelaySensor.h |  77 ++
 .../gameengine/GameLogic/SCA_IController.cpp  |   2 +
 source/gameengine/GameLogic/SCA_ISensor.cpp   |  58 +-
 source/gameengine/GameLogic/SCA_ISensor.h     |  14 +-
 .../GameLogic/SCA_KeyboardSensor.cpp          |   2 +-
 .../gameengine/GameLogic/SCA_LogicManager.cpp |  31 +-
 .../gameengine/GameLogic/SCA_LogicManager.h   |   2 +
 .../GameLogic/SCA_PythonController.cpp        |  15 +-
 .../GameLogic/SCA_PythonController.h          |   6 +
 .../GamePlayer/common/GPC_RenderTools.cpp     |  11 +-
 .../GamePlayer/common/GPC_RenderTools.h       |   5 +-
 .../GamePlayer/ghost/GPG_Application.cpp      |  50 +-
 .../GamePlayer/ghost/GPG_Application.h        |  31 +-
 .../gameengine/GamePlayer/ghost/GPG_ghost.cpp |  19 +-
 .../Ketsji/KX_ConstraintActuator.cpp          |  50 +-
 .../gameengine/Ketsji/KX_ConstraintActuator.h |   5 +-
 .../Ketsji/KX_ConvertPhysicsObjects.cpp       | 339 ++-----
 source/gameengine/Ketsji/KX_GameObject.cpp    | 163 +++-
 source/gameengine/Ketsji/KX_GameObject.h      |  19 +-
 .../gameengine/Ketsji/KX_IPO_SGController.cpp |   2 +-
 .../Ketsji/KX_MaterialIpoController.cpp       |  10 +-
 source/gameengine/Ketsji/KX_MeshProxy.cpp     |  31 +
 source/gameengine/Ketsji/KX_MeshProxy.h       |   2 +
 .../gameengine/Ketsji/KX_MouseFocusSensor.cpp |  17 +-
 .../gameengine/Ketsji/KX_MouseFocusSensor.h   |   6 +-
 source/gameengine/Ketsji/KX_PolyProxy.cpp     | 265 ++++++
 source/gameengine/Ketsji/KX_PolyProxy.h       |  71 ++
 source/gameengine/Ketsji/KX_PythonInit.cpp    | 219 +++--
 source/gameengine/Ketsji/KX_RayCast.cpp       |  85 +-
 source/gameengine/Ketsji/KX_RayCast.h         |  60 +-
 source/gameengine/Ketsji/KX_RaySensor.cpp     |  58 +-
 source/gameengine/Ketsji/KX_RaySensor.h       |   8 +-
 .../Ketsji/KX_SCA_AddObjectActuator.cpp       | 120 ++-
 .../Ketsji/KX_SCA_AddObjectActuator.h         |  30 +-
 source/gameengine/Ketsji/KX_Scene.cpp         |  33 +-
 source/gameengine/Ketsji/KX_Scene.h           |   6 -
 source/gameengine/Ketsji/KX_SoundActuator.cpp |  64 +-
 source/gameengine/Ketsji/Makefile             |   4 +-
 .../Physics/BlOde/OdePhysicsEnvironment.cpp   |   3 +-
 .../Physics/BlOde/OdePhysicsEnvironment.h     |   3 +-
 .../gameengine/Physics/Bullet/CMakeLists.txt  |   4 +
 .../Physics/Bullet/CcdPhysicsController.cpp   | 299 ++++++-
 .../Physics/Bullet/CcdPhysicsController.h     |  84 ++
 .../Physics/Bullet/CcdPhysicsEnvironment.cpp  | 101 ++-
 .../Physics/Bullet/CcdPhysicsEnvironment.h    |   3 +-
 source/gameengine/Physics/Bullet/Makefile     |   5 +
 source/gameengine/Physics/Bullet/SConscript   |   2 +-
 .../Physics/Dummy/DummyPhysicsEnvironment.cpp |   3 +-
 .../Physics/Dummy/DummyPhysicsEnvironment.h   |   3 +-
 .../Physics/Sumo/SumoPhysicsEnvironment.cpp   |  31 +-
 .../Physics/Sumo/SumoPhysicsEnvironment.h     |   3 +-
 .../Physics/common/PHY_DynamicTypes.h         |  12 +
 .../Physics/common/PHY_IPhysicsEnvironment.h  |  47 +-
 source/gameengine/PyDoc/GameKeys.py           |   9 +
 source/gameengine/PyDoc/GameLogic.py          |  14 +-
 source/gameengine/PyDoc/KX_GameObject.py      |  53 +-
 source/gameengine/PyDoc/KX_MeshProxy.py       |  15 +
 source/gameengine/PyDoc/KX_PolyProxy.py       | 100 +++
 .../PyDoc/KX_SCA_AddObjectActuator.py         |  17 +
 source/gameengine/PyDoc/SCA_DelaySensor.py    |  56 ++
 source/gameengine/PyDoc/SCA_ISensor.py        |  13 +-
 .../gameengine/Rasterizer/RAS_MeshObject.cpp  |   2 +-
 source/gameengine/Rasterizer/RAS_MeshObject.h |   2 +-
 source/kernel/CMakeLists.txt                  |   2 +-
 source/kernel/SConscript                      |   2 +-
 source/kernel/gen_system/GEN_HashedPtr.cpp    |   8 +-
 source/kernel/gen_system/Makefile             |   1 +
 source/nan_definitions.mk                     |   8 +-
 229 files changed, 7830 insertions(+), 2151 deletions(-)
 create mode 100644 intern/guardedalloc/BLO_sys_types.h
 create mode 100644 intern/opennl/superlu/BLO_sys_types.h
 create mode 100644 release/scripts/flt_dofedit.py
 create mode 100644 release/scripts/flt_lodedit.py
 create mode 100644 source/blender/blenkernel/BKE_shrinkwrap.h
 create mode 100644 source/blender/blenkernel/intern/shrinkwrap.c
 create mode 100644 source/gameengine/GameLogic/SCA_DelaySensor.cpp
 create mode 100644 source/gameengine/GameLogic/SCA_DelaySensor.h
 create mode 100644 source/gameengine/Ketsji/KX_PolyProxy.cpp
 create mode 100644 source/gameengine/Ketsji/KX_PolyProxy.h
 create mode 100644 source/gameengine/PyDoc/KX_PolyProxy.py
 create mode 100644 source/gameengine/PyDoc/SCA_DelaySensor.py

diff --git a/CMake/macros.cmake b/CMake/macros.cmake
index 6b6837d25f0..e3dd46eb5ea 100644
--- a/CMake/macros.cmake
+++ b/CMake/macros.cmake
@@ -38,6 +38,8 @@ MACRO(BLENDERLIB
 ENDMACRO(BLENDERLIB)
 
 MACRO(SETUP_LIBDIRS)
+  # see "cmake --help-policy CMP0003"
+  CMAKE_POLICY(SET CMP0003 NEW)
   LINK_DIRECTORIES(${PYTHON_LIBPATH} ${SDL_LIBPATH} ${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${ICONV_LIBPATH} ${OPENEXR_LIBPATH} ${QUICKTIME_LIBPATH} ${FFMPEG_LIBPATH})
   IF(WITH_INTERNATIONAL)
     LINK_DIRECTORIES(${GETTEXT_LIBPATH})
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ea26750ec1..5b86ca8f21e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,7 +63,6 @@ OPTION(WITH_QUICKTIME		"Enable Quicktime Support"				OFF)
 OPTION(WITH_OPENEXR		"Enable OpenEXR Support (http://www.openexr.com)"	ON)
 OPTION(WITH_FFMPEG		"Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)"	OFF)
 OPTION(WITH_OPENAL		"Enable OpenAL Support (http://www.openal.org)"		ON)
-OPTION(YESIAMSTUPID		"Enable execution on 64-bit platforms"			OFF)
 OPTION(WITH_OPENMP		"Enable OpenMP (has to be supported by the compiler)"	OFF)
 
 IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
index b49036a5b50..7dc7d8d2f68 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
@@ -181,7 +181,9 @@ void	btCollisionWorld::rayTestSingle(const btTransform& rayFromTrans,const btTra
 					  btCollisionObject* collisionObject,
 					  const btCollisionShape* collisionShape,
 					  const btTransform& colObjWorldTransform,
-					  RayResultCallback& resultCallback,short int collisionFilterMask)
+					  RayResultCallback& resultCallback,
+					  short int collisionFilterMask,
+					  bool faceNormal)
 {
 	
 	btSphereShape pointShape(btScalar(0.0));
@@ -191,14 +193,16 @@ void	btCollisionWorld::rayTestSingle(const btTransform& rayFromTrans,const btTra
 					  collisionObject,
 					  collisionShape,
 					  colObjWorldTransform,
-					  resultCallback,collisionFilterMask);
+					  resultCallback,collisionFilterMask,faceNormal);
 }
 
 void	btCollisionWorld::objectQuerySingle(const btConvexShape* castShape,const btTransform& rayFromTrans,const btTransform& rayToTrans,
 					  btCollisionObject* collisionObject,
 					  const btCollisionShape* collisionShape,
 					  const btTransform& colObjWorldTransform,
-					  RayResultCallback& resultCallback,short int collisionFilterMask)
+					  RayResultCallback& resultCallback,
+					  short int collisionFilterMask,
+					  bool faceNormal)
 {
 	
 
@@ -257,9 +261,9 @@ void	btCollisionWorld::objectQuerySingle(const btConvexShape* castShape,const bt
 							btCollisionObject*	m_collisionObject;
 							btTriangleMeshShape*	m_triangleMesh;
 
-							BridgeTriangleRaycastCallback( const btVector3& from,const btVector3& to,
-								btCollisionWorld::RayResultCallback* resultCallback, btCollisionObject* collisionObject,btTriangleMeshShape*	triangleMesh):
-								btTriangleRaycastCallback(from,to),
+							BridgeTriangleRaycastCallback( const btVector3& from,const btVector3& to,bool faceNormal,
+								btCollisionWorld::RayResultCallback* resultCallback, btCollisionObject* collisionObject,btTriangleMeshShape* triangleMesh):
+								btTriangleRaycastCallback(from,to,faceNormal),
 									m_resultCallback(resultCallback),
 									m_collisionObject(collisionObject),
 									m_triangleMesh(triangleMesh)
@@ -272,6 +276,7 @@ void	btCollisionWorld::objectQuerySingle(const btConvexShape* castShape,const bt
 								btCollisionWorld::LocalShapeInfo	shapeInfo;
 								shapeInfo.m_shapePart = partId;
 								shapeInfo.m_triangleIndex = triangleIndex;
+								shapeInfo.m_triangleShape = m_triangleMesh;
 								
 								btCollisionWorld::LocalRayResult rayResult
 								(m_collisionObject, 
@@ -287,7 +292,7 @@ void	btCollisionWorld::objectQuerySingle(const btConvexShape* castShape,const bt
 						};
 
 
-						BridgeTriangleRaycastCallback	rcb(rayFromLocal,rayToLocal,&resultCallback,collisionObject,triangleMesh);
+						BridgeTriangleRaycastCallback	rcb(rayFromLocal,rayToLocal,faceNormal,&resultCallback,collisionObject,triangleMesh);
 						rcb.m_hitFraction = resultCallback.m_closestHitFraction;
 
 						btVector3 rayAabbMinLocal = rayFromLocal;
@@ -313,7 +318,7 @@ void	btCollisionWorld::objectQuerySingle(const btConvexShape* castShape,const bt
 									collisionObject,
 									childCollisionShape,
 									childWorldTrans,
-									resultCallback, collisionFilterMask);
+									resultCallback, collisionFilterMask, faceNormal);
 
 							}
 
@@ -323,7 +328,7 @@ void	btCollisionWorld::objectQuerySingle(const btConvexShape* castShape,const bt
 			}
 }
 
-void	btCollisionWorld::rayTest(const btVector3& rayFromWorld, const btVector3& rayToWorld, RayResultCallback& resultCallback,short int collisionFilterMask)
+void	btCollisionWorld::rayTest(const btVector3& rayFromWorld, const btVector3& rayToWorld, RayResultCallback& resultCallback,short int collisionFilterMask, bool faceNormal)
 {
 
 	
@@ -350,11 +355,17 @@ void	btCollisionWorld::rayTest(const btVector3& rayFromWorld, const btVector3& r
 			btVector3 hitNormal;
 			if (btRayAabb(rayFromWorld,rayToWorld,collisionObjectAabbMin,collisionObjectAabbMax,hitLambda,hitNormal))
 			{
-				rayTestSingle(rayFromTrans,rayToTrans,
-					collisionObject,
-						collisionObject->getCollisionShape(),
-						collisionObject->getWorldTransform(),
-						resultCallback);
+				// before testing this object, verify that it is not filtered out
+				if (resultCallback.NeedRayCast(collisionObject))
+				{
+					rayTestSingle(rayFromTrans,rayToTrans,
+						collisionObject,
+							collisionObject->getCollisionShape(),
+							collisionObject->getWorldTransform(),
+							resultCallback,
+							collisionFilterMask,
+							faceNormal);
+				}
 			}	
 		}
 	}
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h
index b6d80233ab7..ed41232ece3 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h
@@ -125,8 +125,8 @@ public:
 	{
 		int	m_shapePart;
 		int	m_triangleIndex;
-		
-		//const btCollisionShape*	m_shapeTemp;
+		// needed in case of compound shape
+		const btCollisionShape*	m_triangleShape;
 		//const btTransform*	m_shapeLocalTransform;
 	};
 
@@ -166,6 +166,10 @@ public:
 			:m_closestHitFraction(btScalar(1.))
 		{
 		}
+		virtual bool        NeedRayCast(btCollisionObject* object)
+		{
+			return true;
+		}
 		virtual	btScalar	AddSingleResult(LocalRayResult& rayResult) = 0;
 	};
 
@@ -209,7 +213,7 @@ public:
 
 	/// rayTest performs a raycast on all objects in the btCollisionWorld, and calls the resultCallback
 	/// This allows for several queries: first hit, all hits, any hit, dependent on the value returned by the callback.
-	void	rayTest(const btVector3& rayFromWorld, const btVector3& rayToWorld, RayResultCallback& resultCallback, short int collisionFilterMask=-1);
+	void	rayTest(const btVector3& rayFromWorld, const btVector3& rayToWorld, RayResultCallback& resultCallback, short int collisionFilterMask=-1, bool faceNormal=false);
 
 	/// rayTestSingle performs a raycast call and calls the resultCallback. It is used internally by rayTest.
 	/// In a future implementation, we consider moving the ray test as a virtual method in btCollisionShape.
@@ -218,14 +222,18 @@ public:
 					  btCollisionObject* collisionObject,
 					  const btCollisionShape* collisionShape,
 					  const btTransform& colObjWorldTransform,
-					  RayResultCallback& resultCallback, short int collisionFilterMask=-1);
+					  RayResultCallback& resultCallback, 
+					  short int collisionFilterMask=-1,
+					  bool faceNormal=false);
 
 	/// objectQuerySingle performs a collision detection query and calls the resultCallback. It is used internally by rayTest.
 	static void	objectQuerySingle(const btConvexShape* castShape, const btTransform& rayFromTrans,const btTransform& rayToTrans,
 					  btCollisionObject* collisionObject,
 					  const btCollisionShape* collisionShape,
 					  const btTransform& colObjWorldTransform,
-					  RayResultCallback& resultCallback, short int collisionFilterMask=-1);
+					  RayResultCallback& resultCallback, 
+					  short int collisionFilterMask=-1,
+					  bool faceNormal=false);
 
 	void	addCollisionObject(btCollisionObject* collisionObject,short int collisionFilterGroup=1,short int collisionFilterMask=1);
 
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp
index 31b91467777..68ac93ec3cc 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp
@@ -16,10 +16,11 @@ subject to the following restrictions:
 
 #include "btRaycastCallback.h"
 
-btTriangleRaycastCallback::btTriangleRaycastCallback(const btVector3& from,const btVector3& to)
+btTriangleRaycastCallback::btTriangleRaycastCallback(const btVector3& from,const btVector3& to,bool faceNormal)
 	:
 	m_from(from),
 	m_to(to),
+	m_faceNormal(faceNormal),
 	m_hitFraction(btScalar(1.))
 {
 
@@ -84,8 +85,7 @@ void btTriangleRaycastCallback::processTriangle(btVector3* triangle,int partId,
 					
 					if ( (btScalar)(cp2.dot(triangleNormal)) >=edge_tolerance) 
 					{
-
-						if ( dist_a > 0 )
+						if (m_faceNormal || dist_a > 0)
 						{
 							m_hitFraction = reportHit(triangleNormal,distance,partId,triangleIndex);
 						}
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h
index a0bbc9f8fe9..71ed9fead49 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h
@@ -27,10 +27,11 @@ public:
 		//input
 	btVector3 m_from;
 	btVector3 m_to;
+	bool m_faceNormal;
 
 	btScalar	m_hitFraction;
 
-	btTriangleRaycastCallback(const btVector3& from,const btVector3& to);
+	btTriangleRaycastCallback(const btVector3& from,const btVector3& to,bool faceNormal);
 	
 	virtual void processTriangle(btVector3* triangle, int partId, int triangleIndex);
 
diff --git a/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp b/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
index 29719ec9a3e..1017c8af6ea 100644
--- a/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
+++ b/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
@@ -856,10 +856,26 @@ void btDiscreteDynamicsWorld::debugDrawObject(const btTransform& worldTransform,
 				btScalar radius = coneShape->getRadius();//+coneShape->getMargin();
 				btScalar height = coneShape->getHeight();//+coneShape->getMargin();
 				btVector3 start = worldTransform.getOrigin();
-				getDebugDrawer()->drawLine(start+worldTransform.getBasis() * btVector3(btScalar(0.),btScalar(0.),btScalar(0.5)*height),start+worldTransform.getBasis() * btVector3(radius,btScalar(0.),btScalar(-0.5)*height),color);
-				getDebugDrawer()->drawLine(start+worldTransform.getBasis() * btVector3(btScalar(0.),btScalar(0.),btScalar(0.5)*height),start+worldTransform.getBasis() * btVector3(-radius,btScalar(0.),btScalar(-0.5)*height),color);
-				getDebugDrawer()->drawLine(start+worldTransform.getBasis() * btVector3(btScalar(0.),btScalar(0.),btScalar(0.5)*height),start+worldTransform.getBasis() * btVector3(btScalar(0.),radius,btScalar(-0.5)*height),color);
-				getDebugDrawer()->drawLine(start+worldTransform.getBasis() * btVector3(btScalar(0.),btScalar(0.),btScalar(0.5)*height),start+worldTransform.getBasis() * btVector3(btScalar(0.),-radius,btScalar(-0.5)*height),color);
+				// insert here Bullet 2.69 that fixes representation of cone
+				int upAxis= coneShape->getConeUpIndex();
+				
+				btVector3	offsetHeight(0,0,0);
+				offsetHeight[upAxis] = height * btScalar(0.5);
+				btVector3	offsetRadius(0,0,0);
+				offsetRadius[(upAxis+1)%3] = radius;
+				btVector3	offset2Radius(0,0,0);
+				offset2Radius[(upAxis+2)%3] = radius;
+
+				getDebugDrawer()->drawLine(start+worldTransform.getBasis() * (offsetHeight),start+worldTransform.getBasis() * (-offsetHeight+offsetRadius),color);
+				getDebugDrawer()->drawLine(start+worldTransform.getBasis() * (offsetHeight),start+worldTransform.getBasis() * (-offsetHeight-offsetRadius),color);
+				getDebugDrawer()->drawLine(start+worldTransform.getBasis() * (offsetHeight),start+worldTransform.getBasis() * (-offsetHeight+offset2Radius),color);
+				getDebugDrawer()->drawLine(start+worldTransform.getBasis() * (offsetHeight),start+worldTransform.getBasis() * (-offsetHeight-offset2Radius),color);
+
+				// buggy code that does not take into account the direction of the cone
+				//getDebugDrawer()->drawLine(start+worldTransform.getBasis() * btVector3(btScalar(0.),btScalar(0.),btScalar(0.5)*height),start+worldTransform.getBasis() * btVector3(radius,btScalar(0.),btScalar(-0.5)*height),color);
+				//getDebugDrawer()->drawLine(start+worldTransform.getBasis() * btVector3(btScalar(0.),btScalar(0.),btScalar(0.5)*height),start+worldTransform.getBasis() * btVector3(-radius,btScalar(0.),btScalar(-0.5)*height),color);
+				//getDebugDrawer()->drawLine(start+worldTransform.getBasis() * btVector3(btScalar(0.),btScalar(0.),btScalar(0.5)*height),start+worldTransform.getBasis() * btVector3(btScalar(0.),radius,btScalar(-0.5)*height),color);
+				//getDebugDrawer()->drawLine(start+worldTransform.getBasis() * btVector3(btScalar(0.),btScalar(0.),btScalar(0.5)*height),start+worldTransform.getBasis() * btVector3(btScalar(0.),-radius,btScalar(-0.5)*height),color);
 				break;
 
 			}
diff --git a/intern/guardedalloc/BLO_sys_types.h b/intern/guardedalloc/BLO_sys_types.h
new file mode 100644
index 00000000000..5ed3117c890
--- /dev/null
+++ b/intern/guardedalloc/BLO_sys_types.h
@@ -0,0 +1,125 @@
+/**
+ * $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 *****
+ * A platform-independent definition of [u]intXX_t
+ * Plus the accompanying header include for htonl/ntohl
+ *
+ * This file includes <sys/types.h> to define [u]intXX_t types, where
+ * XX can be 8, 16, 32 or 64. Unfortunately, not all systems have this
+ * file.
+ * - Windows uses __intXX compiler-builtin types. These are signed,
+ *   so we have to flip the signs.
+ * For these rogue platforms, we make the typedefs ourselves.
+ *
+ */
+
+/* 
+// DG: original BLO_sys_types.h is in source/blender/blenkernel 
+// but is not allowed be accessed here because of bad-level-call
+*/
+
+#ifndef BLO_SYS_TYPES_H
+#define BLO_SYS_TYPES_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+ 
+#if defined(_WIN32) && !defined(FREE_WINDOWS)
+
+/* The __intXX are built-in types of the visual complier! So we don't
+ * need to include anything else here. */
+
+typedef signed __int8  int8_t;
+typedef signed __int16 int16_t;
+typedef signed __int32 int32_t;
+typedef signed __int64 int64_t;
+
+typedef unsigned __int8  uint8_t;
+typedef unsigned __int16 uint16_t;
+typedef unsigned __int32 uint32_t;
+typedef unsigned __int64 uint64_t;
+
+#ifndef _INTPTR_T_DEFINED
+#ifdef _WIN64
+typedef __int64 intptr_t;
+#else
+typedef long intptr_t;
+#endif
+#define _INTPTR_T_DEFINED
+#endif
+
+#ifndef _UINTPTR_T_DEFINED
+#ifdef _WIN64
+typedef unsigned __int64 uintptr_t;
+#else
+typedef unsigned long uintptr_t;
+#endif
+#define _UINTPTR_T_DEFINED
+#endif
+
+#elif defined(__linux__)
+
+	/* Linux-i386, Linux-Alpha, Linux-ppc */
+#include <stdint.h>
+
+#elif defined (__APPLE__)
+
+#include <inttypes.h>
+
+#elif defined(FREE_WINDOWS)
+
+#include <stdint.h>
+
+#else
+
+	/* FreeBSD, Irix, Solaris */
+#include <sys/types.h>
+
+#endif /* ifdef platform for types */
+
+#ifdef _WIN32
+#ifndef htonl
+#define htonl(x) correctByteOrder(x)
+#endif
+#ifndef ntohl
+#define ntohl(x) correctByteOrder(x)
+#endif
+#elif defined (__FreeBSD__) || defined (__OpenBSD__) 
+#include <sys/param.h>
+#elif defined (__APPLE__)
+#include <sys/types.h>
+#else  /* irix sun linux */
+#include <netinet/in.h>
+#endif /* ifdef platform for htonl/ntohl */
+
+#ifdef __cplusplus 
+}
+#endif
+
+#endif /* eof */
+
diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c
index 25f2fd8d269..a36549d0cc7 100644
--- a/intern/guardedalloc/intern/mallocn.c
+++ b/intern/guardedalloc/intern/mallocn.c
@@ -49,6 +49,8 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "BLO_sys_types.h" // needed for intptr_t
+
 /* --------------------------------------------------------------------- */
 /* Data definition                                                       */
 /* --------------------------------------------------------------------- */
@@ -112,7 +114,7 @@ static const char *check_memlist(MemHead *memh);
 	
 
 volatile int totblock= 0;
-volatile unsigned long mem_in_use= 0, mmap_in_use= 0;
+volatile uintptr_t mem_in_use= 0, mmap_in_use= 0;
 
 static volatile struct localListBase _membase;
 static volatile struct localListBase *membase = &_membase;
@@ -335,7 +337,7 @@ void *MEM_mapallocN(unsigned int len, const char *str)
 /* Memory statistics print */
 typedef struct MemPrintBlock {
 	const char *name;
-	unsigned long len;
+	uintptr_t len;
 	int items;
 } MemPrintBlock;
 
@@ -485,14 +487,14 @@ short MEM_freeN(void *vmemh)		/* anders compileertie niet meer */
 		return(-1);
 	}
 
-	if(sizeof(long)==8) {
-		if (((long) memh) & 0x7) {
+	if(sizeof(intptr_t)==8) {
+		if (((intptr_t) memh) & 0x7) {
 			MemorY_ErroR("free","attempt to free illegal pointer");
 			return(-1);
 		}
 	}
 	else {
-		if (((long) memh) & 0x3) {
+		if (((intptr_t) memh) & 0x3) {
 			MemorY_ErroR("free","attempt to free illegal pointer");
 			return(-1);
 		}
diff --git a/intern/guardedalloc/intern/mmap_win.c b/intern/guardedalloc/intern/mmap_win.c
index 436c99344a7..642cc16296e 100644
--- a/intern/guardedalloc/intern/mmap_win.c
+++ b/intern/guardedalloc/intern/mmap_win.c
@@ -151,7 +151,7 @@ void *mmap(void *start, size_t len, int prot, int flags, int fd, off_t offset)
 }
 
 /* munmap for windows */
-long munmap(void *ptr, long size)
+intptr_t munmap(void *ptr, intptr_t size)
 {
 	MemMap *mm = mmap_findlink(mmapbase, ptr);
 	if (!mm) {
diff --git a/intern/guardedalloc/make/msvc_7_0/guardedalloc.vcproj b/intern/guardedalloc/make/msvc_7_0/guardedalloc.vcproj
index 40e88511d5d..974acef4e70 100644
--- a/intern/guardedalloc/make/msvc_7_0/guardedalloc.vcproj
+++ b/intern/guardedalloc/make/msvc_7_0/guardedalloc.vcproj
@@ -261,6 +261,9 @@ ECHO Done
 			<Filter
 				Name="extern"
 				Filter="">
+				<File
+					RelativePath="..\..\BLO_sys_types.h">
+				</File>
 				<File
 					RelativePath="..\..\MEM_guardedalloc.h">
 				</File>
diff --git a/intern/guardedalloc/mmap_win.h b/intern/guardedalloc/mmap_win.h
index f83a2d64b18..443c3b6f4ce 100644
--- a/intern/guardedalloc/mmap_win.h
+++ b/intern/guardedalloc/mmap_win.h
@@ -45,8 +45,10 @@
 
 #define MAP_FAILED ((void *)-1)
 
+#include "BLO_sys_types.h" // needed for intptr_t
+
 void *mmap(void *start, size_t len, int prot, int flags, int fd, off_t offset);
-long munmap(void *ptr, long size);
+intptr_t munmap(void *ptr, intptr_t size);
 
 #endif
 
diff --git a/intern/opennl/make/msvc_7_0/opennl.vcproj b/intern/opennl/make/msvc_7_0/opennl.vcproj
index ec999b0c252..d302a2508ab 100644
--- a/intern/opennl/make/msvc_7_0/opennl.vcproj
+++ b/intern/opennl/make/msvc_7_0/opennl.vcproj
@@ -715,6 +715,9 @@ ECHO Done
 			<Filter
 				Name="superlu"
 				Filter="">
+				<File
+					RelativePath="..\..\superlu\BLO_sys_types.h">
+				</File>
 				<File
 					RelativePath="..\..\superlu\Cnames.h">
 				</File>
diff --git a/intern/opennl/superlu/BLO_sys_types.h b/intern/opennl/superlu/BLO_sys_types.h
new file mode 100644
index 00000000000..5ed3117c890
--- /dev/null
+++ b/intern/opennl/superlu/BLO_sys_types.h
@@ -0,0 +1,125 @@
+/**
+ * $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 *****
+ * A platform-independent definition of [u]intXX_t
+ * Plus the accompanying header include for htonl/ntohl
+ *
+ * This file includes <sys/types.h> to define [u]intXX_t types, where
+ * XX can be 8, 16, 32 or 64. Unfortunately, not all systems have this
+ * file.
+ * - Windows uses __intXX compiler-builtin types. These are signed,
+ *   so we have to flip the signs.
+ * For these rogue platforms, we make the typedefs ourselves.
+ *
+ */
+
+/* 
+// DG: original BLO_sys_types.h is in source/blender/blenkernel 
+// but is not allowed be accessed here because of bad-level-call
+*/
+
+#ifndef BLO_SYS_TYPES_H
+#define BLO_SYS_TYPES_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+ 
+#if defined(_WIN32) && !defined(FREE_WINDOWS)
+
+/* The __intXX are built-in types of the visual complier! So we don't
+ * need to include anything else here. */
+
+typedef signed __int8  int8_t;
+typedef signed __int16 int16_t;
+typedef signed __int32 int32_t;
+typedef signed __int64 int64_t;
+
+typedef unsigned __int8  uint8_t;
+typedef unsigned __int16 uint16_t;
+typedef unsigned __int32 uint32_t;
+typedef unsigned __int64 uint64_t;
+
+#ifndef _INTPTR_T_DEFINED
+#ifdef _WIN64
+typedef __int64 intptr_t;
+#else
+typedef long intptr_t;
+#endif
+#define _INTPTR_T_DEFINED
+#endif
+
+#ifndef _UINTPTR_T_DEFINED
+#ifdef _WIN64
+typedef unsigned __int64 uintptr_t;
+#else
+typedef unsigned long uintptr_t;
+#endif
+#define _UINTPTR_T_DEFINED
+#endif
+
+#elif defined(__linux__)
+
+	/* Linux-i386, Linux-Alpha, Linux-ppc */
+#include <stdint.h>
+
+#elif defined (__APPLE__)
+
+#include <inttypes.h>
+
+#elif defined(FREE_WINDOWS)
+
+#include <stdint.h>
+
+#else
+
+	/* FreeBSD, Irix, Solaris */
+#include <sys/types.h>
+
+#endif /* ifdef platform for types */
+
+#ifdef _WIN32
+#ifndef htonl
+#define htonl(x) correctByteOrder(x)
+#endif
+#ifndef ntohl
+#define ntohl(x) correctByteOrder(x)
+#endif
+#elif defined (__FreeBSD__) || defined (__OpenBSD__) 
+#include <sys/param.h>
+#elif defined (__APPLE__)
+#include <sys/types.h>
+#else  /* irix sun linux */
+#include <netinet/in.h>
+#endif /* ifdef platform for htonl/ntohl */
+
+#ifdef __cplusplus 
+}
+#endif
+
+#endif /* eof */
+
diff --git a/intern/opennl/superlu/smemory.c b/intern/opennl/superlu/smemory.c
index 79da748671a..7eefb900673 100644
--- a/intern/opennl/superlu/smemory.c
+++ b/intern/opennl/superlu/smemory.c
@@ -8,6 +8,8 @@
  */
 #include "ssp_defs.h"
 
+#include "BLO_sys_types.h" // needed for intptr_t
+
 /* Constants */
 #define NO_MEMTYPE  4      /* 0: lusup;
 			      1: ucol;
@@ -49,8 +51,8 @@ static int no_expand;
 
 /* Macros to manipulate stack */
 #define StackFull(x)         ( x + stack.used >= stack.size )
-#define NotDoubleAlign(addr) ( (long int)addr & 7 )
-#define DoubleAlign(addr)    ( ((long int)addr + 7) & ~7L )
+#define NotDoubleAlign(addr) ( (intptr_t)addr & 7 )
+#define DoubleAlign(addr)    ( ((intptr_t)addr + 7) & ~7L )
 #define TempSpace(m, w)      ( (2*w + 4 + NO_MARKER) * m * sizeof(int) + \
 			      (w + 1) * m * sizeof(float) )
 #define Reduce(alpha)        ((alpha + 1) / 2)  /* i.e. (alpha-1)/2 + 1 */
@@ -611,8 +613,8 @@ sStackCompress(GlobalLU_t *Glu)
     
     last = (char*)usub + xusub[ndim] * iword;
     fragment = (char*) (((char*)stack.array + stack.top1) - last);
-    stack.used -= (long int) fragment;
-    stack.top1 -= (long int) fragment;
+    stack.used -= (intptr_t) fragment;
+    stack.top1 -= (intptr_t) fragment;
 
     Glu->ucol = ucol;
     Glu->lsub = lsub;
diff --git a/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj b/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
index 0ea3503a289..42dcc843091 100644
--- a/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
+++ b/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
@@ -494,6 +494,9 @@
 			<File
 				RelativePath="..\..\..\source\blender\blenkernel\intern\script.c">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\blenkernel\intern\shrinkwrap.c">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\blenkernel\intern\softbody.c">
 			</File>
@@ -708,6 +711,9 @@
 			<File
 				RelativePath="..\..\..\source\blender\blenkernel\BKE_script.h">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\blenkernel\BKE_shrinkwrap.h">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\blenkernel\BKE_softbody.h">
 			</File>
diff --git a/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj b/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj
index 7e2db4f564f..5f14b5a09a1 100644
--- a/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj
+++ b/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj
@@ -347,6 +347,9 @@
 			<File
 				RelativePath="..\..\..\source\gameengine\GameLogic\SCA_ANDController.cpp">
 			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\GameLogic\SCA_DelaySensor.cpp">
+			</File>
 			<File
 				RelativePath="..\..\..\source\gameengine\GameLogic\SCA_EventManager.cpp">
 			</File>
@@ -465,6 +468,9 @@
 			<File
 				RelativePath="..\..\..\source\gameengine\GameLogic\SCA_ANDController.h">
 			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\GameLogic\SCA_DelaySensor.h">
+			</File>
 			<File
 				RelativePath="..\..\..\source\gameengine\GameLogic\SCA_EventManager.h">
 			</File>
diff --git a/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj b/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
index c046d434cb3..4e362faed69 100644
--- a/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
+++ b/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
@@ -394,6 +394,9 @@
 			<File
 				RelativePath="..\..\..\source\gameengine\Ketsji\KX_PolygonMaterial.cpp">
 			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\Ketsji\KX_PolyProxy.cpp">
+			</File>
 			<File
 				RelativePath="..\..\..\source\gameengine\Ketsji\KX_PyConstraintBinding.cpp">
 			</File>
@@ -621,6 +624,9 @@
 			<File
 				RelativePath="..\..\..\source\gameengine\Ketsji\KX_PolygonMaterial.h">
 			</File>
+			<File
+				RelativePath="..\..\..\source\gameengine\Ketsji\KX_PolyProxy.h">
+			</File>
 			<File
 				RelativePath="..\..\..\source\gameengine\Ketsji\KX_PyConstraintBinding.h">
 			</File>
diff --git a/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj b/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj
index 9a807f2d39a..76fde7612e3 100644
--- a/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj
+++ b/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj
@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet"
+				AdditionalIncludeDirectories="..\..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet;..\..\..\..\..\source\kernel\gen_system;..\..\..\..\..\source\gameengine\Rasterizer"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				MinimalRebuild="FALSE"
 				BasicRuntimeChecks="3"
@@ -64,7 +64,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet"
+				AdditionalIncludeDirectories="..\..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet;..\..\..\..\..\source\kernel\gen_system;..\..\..\..\..\source\gameengine\Rasterizer"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="2"
@@ -107,7 +107,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet"
+				AdditionalIncludeDirectories="..\..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet;..\..\..\..\..\source\kernel\gen_system;..\..\..\..\..\source\gameengine\Rasterizer"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="2"
@@ -151,7 +151,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet"
+				AdditionalIncludeDirectories="..\..\..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\..\source\gameengine\Physics\common;..\..\..\..\..\source\gameengine\Physics\Bullet;..\..\..\..\..\source\gameengine\Rasterizer;..\..\..\..\..\source\kernel\gen_system"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				MinimalRebuild="FALSE"
 				BasicRuntimeChecks="3"
diff --git a/projectfiles_vc7/kernel/system/SYS_system.vcproj b/projectfiles_vc7/kernel/system/SYS_system.vcproj
index 50ffc1fbb99..3b239d9088b 100644
--- a/projectfiles_vc7/kernel/system/SYS_system.vcproj
+++ b/projectfiles_vc7/kernel/system/SYS_system.vcproj
@@ -125,7 +125,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include"
 				PreprocessorDefinitions="_DEBUG,WIN32,_LIB"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -177,7 +177,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include"
 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -229,7 +229,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include"
 				PreprocessorDefinitions="_DEBUG,WIN32,_LIB"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -281,7 +281,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include"
 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
diff --git a/release/datafiles/datatoc.c b/release/datafiles/datatoc.c
index 2e24a0f92ef..46b935c7fd6 100644
--- a/release/datafiles/datatoc.c
+++ b/release/datafiles/datatoc.c
@@ -35,7 +35,7 @@ int main(int argc, char**argv) {
 	FILE *fpin,  *fpout;
 	char cname[256];
 	char sizest[256];
-	long size;
+	size_t size;
 	int i;
 	
 	if (argc<1) {
diff --git a/release/scripts/flt_dofedit.py b/release/scripts/flt_dofedit.py
new file mode 100644
index 00000000000..36e8e4d2501
--- /dev/null
+++ b/release/scripts/flt_dofedit.py
@@ -0,0 +1,835 @@
+#!BPY
+
+"""
+Name: 'FLT DOF Editor'
+Blender: 240
+Group: 'Misc'
+Tooltip: 'Degree of Freedom editor for FLT nodes'
+"""
+
+__author__ = "Geoffrey Bantle"
+__version__ = "1.0 11/21/07"
+__email__ = ('scripts', 'Author, ')
+__url__ = ('blender', 'blenderartists.org')
+
+__bpydoc__ ="""\
+This script provides tools for working with OpenFlight databases in Blender. OpenFlight is a
+registered trademark of MultiGen-Paradigm, Inc.
+
+Feature overview and more availible at:
+http://wiki.blender.org/index.php/Scripts/Manual/FLTools
+"""
+
+# --------------------------------------------------------------------------
+# flt_palettemanager.py version 0.1 2005/04/08
+# --------------------------------------------------------------------------
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# Copyright (C) 2007: Blender Foundation
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+# ***** END GPL LICENCE BLOCK *****
+# --------------------------------------------------------------------------
+
+import Blender.Draw as Draw
+from Blender.BGL import *
+import Blender
+import flt_properties
+reload(flt_properties)
+from flt_properties import *
+
+#event codes
+evcode = {
+	"DOF_MAKE" : 100,
+	"DOF_UPDATE" : 138,
+	"DOF_DELETE" : 101,
+	"DOF_TRANSX" : 102,
+	"DOF_TRANSY" : 103,
+	"DOF_TRANSZ" : 104,
+	"DOF_ROTX" : 105,
+	"DOF_ROTY" : 106,
+	"DOF_ROTZ" : 107,
+	"DOF_SCALEX" : 108,
+	"DOF_SCALEY" : 109,
+	"DOF_SCALEZ" : 110,
+	"DOF_MIN_TRANSX" : 111,
+	"DOF_MIN_TRANSY" : 112,
+	"DOF_MIN_TRANSZ" : 113,
+	"DOF_MIN_ROTX" : 114,
+	"DOF_MIN_ROTY" : 115,
+	"DOF_MIN_ROTZ" : 116,
+	"DOF_MIN_SCALEX" : 117,
+	"DOF_MIN_SCALEY" : 118,
+	"DOF_MIN_SCALEZ" : 119,
+	"DOF_MAX_TRANSX" : 120,
+	"DOF_MAX_TRANSY" : 121,
+	"DOF_MAX_TRANSZ" : 122,
+	"DOF_MAX_ROTX" : 123,
+	"DOF_MAX_ROTY" : 124,
+	"DOF_MAX_ROTZ" : 125,
+	"DOF_MAX_SCALEX" : 126,
+	"DOF_MAX_SCALEY" : 127,
+	"DOF_MAX_SCALEZ" : 128,
+	"DOF_STEP_TRANSX" : 129,
+	"DOF_STEP_TRANSY" : 130,
+	"DOF_STEP_TRANSZ" : 131,
+	"DOF_STEP_ROTX" : 132,
+	"DOF_STEP_ROTY" : 133,
+	"DOF_STEP_ROTZ" : 134,
+	"DOF_STEP_SCALEX" : 135,
+	"DOF_STEP_SCALEY" : 136,
+	"DOF_STEP_SCALEZ" : 137
+}
+
+#system
+DOF_MAKE = None
+DOF_UPDATE = None
+DOF_DELETE = None
+
+#toggle buttons
+DOF_TRANSX = None
+DOF_TRANSY = None
+DOF_TRANSZ = None
+DOF_ROTX = None
+DOF_ROTY = None
+DOF_ROTZ = None
+DOF_SCALEX = None
+DOF_SCALEY = None
+DOF_SCALEZ = None
+
+#Minimums
+DOF_MIN_TRANSX = None
+DOF_MIN_TRANSY = None
+DOF_MIN_TRANSZ = None
+DOF_MIN_ROTX = None
+DOF_MIN_ROTY = None
+DOF_MIN_ROTZ = None
+DOF_MIN_SCALEX = None
+DOF_MIN_SCALEY = None
+DOF_MIN_SCALEZ = None
+
+#maximums
+DOF_MAX_TRANSX = None
+DOF_MAX_TRANSY = None
+DOF_MAX_TRANSZ = None
+DOF_MAX_ROTX = None
+DOF_MAX_ROTY = None
+DOF_MAX_ROTZ = None
+DOF_MAX_SCALEX = None
+DOF_MAX_SCALEY = None
+DOF_MAX_SCALEZ = None
+
+#step
+DOF_STEP_TRANSX = None
+DOF_STEP_TRANSY = None
+DOF_STEP_TRANSZ = None
+DOF_STEP_ROTX = None
+DOF_STEP_ROTY = None
+DOF_STEP_ROTZ = None
+DOF_STEP_SCALEX = None
+DOF_STEP_SCALEY = None
+DOF_STEP_SCALEZ = None
+
+#labels
+DOF_ROTSTRING = None
+DOF_TRANSTRING = None
+DOF_SCALESTRING = None
+DOF_EDITLABEL = None
+
+#make ID props easier/morereadable
+zmin = '14d!ZMIN'
+zmax = '15d!ZMAX'
+zcur = '16d!ZCUR'
+zstep = '17d!ZSTEP'
+ymin = '18d!YMIN'
+ymax = '19d!YMAX'
+ycur = '20d!YCUR'
+ystep = '21d!YSTEP'
+xmin = '22d!XMIN'
+xmax = '23d!XMAX'
+xcur = '24d!XCUR'
+xstep = '25d!XSTEP'
+pitchmin = '26d!PITCH-MIN'
+pitchmax = '27d!PITCH-MAX'
+pitchcur = '28d!PITCH-CUR'
+pitchstep = '29d!PITCH-STEP'
+rollmin = '30d!ROLL-MIN'
+rollmax = '31d!ROLL-MAX'
+rollcur = '32d!ROLL-CUR'
+rollstep = '33d!ROLL-STEP'
+yawmin = '34d!YAW-MIN'
+yawmax = '35d!YAW-MAX'
+yawcur = '36d!YAW-CUR'
+yawstep = '37d!YAW-STEP'
+zscalemin = '38d!ZSIZE-MIN'
+zscalemax = '39d!ZSIZE-MAX'
+zscalecur = '40d!ZSIZE-CUR'
+zscalestep = '41d!ZSIZE-STEP'
+yscalemin = '42d!YSIZE-MIN'
+yscalemax = '43d!YSIZE-MAX'
+yscalecur = '44d!YSIZE-CUR'
+yscalestep = '45d!YSIZE-STEP'
+xscalemin = '46d!XSIZE-MIN'
+xscalemax = '47d!XSIZE-MAX'
+xscalecur = '48d!XSIZE-CUR'
+xscalestep = '49d!XSIZE-STEP'
+
+
+
+def update_state():
+	state = dict()
+	state["activeScene"] = Blender.Scene.GetCurrent()
+	state["activeObject"] = state["activeScene"].objects.active
+	if state["activeObject"] and not state["activeObject"].sel:
+		state["activeObject"] = None
+	state["activeMesh"] = None
+	if state["activeObject"] and state["activeObject"].type == 'Mesh':
+		state["activeMesh"] = state["activeObject"].getData(mesh=True)
+	
+
+	state["activeFace"] = None
+	if state["activeMesh"]:
+		if state["activeMesh"].faceUV and state["activeMesh"].activeFace != None:
+			state["activeFace"] = state["activeMesh"].faces[state["activeMesh"].activeFace]
+		
+		
+	#update editmode
+	state["editmode"]	= Blender.Window.EditMode()
+
+	return state
+	
+def idprops_append(object, typecode, props):
+	object.properties["FLT"] = dict()
+	object.properties["FLT"]['type'] = typecode 
+	for prop in props:
+		object.properties["FLT"][prop] = props[prop]
+	object.properties["FLT"]['3t8!id'] = object.name
+
+def idprops_kill():
+	state = update_state()
+	if state["activeObject"] and state["activeObject"].properties.has_key('FLT'):
+		state["activeObject"].properties.pop('FLT')
+
+def idprops_copy(source):
+	state = update_state()
+	if source.properties.has_key('FLT'):
+		for object in state["activeScene"].objects:
+			if object.sel and object != source and (state["activeScene"].Layers & object.Layers):
+				idprops_kill(object)
+				object.properties['FLT'] = dict()
+				for key in source.properties['FLT']:
+					object.properties['FLT'][key] = source.properties['FLT'][key]
+
+def select_by_typecode(typecode):
+	state = update_state()
+	
+	for object in state["activeScene"].objects:
+		if object.properties.has_key('FLT') and object.properties['FLT']['type'] == typecode and state["activeScene"].Layers & object.Layers:
+				object.select(1)
+
+def DOF_get_frame():
+	state = update_state()
+	
+	if not state["activeObject"] and not id_props_type(state["activeObject"], 14):
+		return
+	
+	#Warning! assumes 1 BU == 10 meters.
+	#do origin
+	state["activeObject"].properties['FLT']['5d!ORIGX'] = state["activeObject"].getLocation('worldspace')[0]*10.0
+	state["activeObject"].properties['FLT']['6d!ORIGY'] = state["activeObject"].getLocation('worldspace')[1]*10.0
+	state["activeObject"].properties['FLT']['7d!ORIGZ'] = state["activeObject"].getLocation('worldspace')[2]*10.0
+	#do X axis
+	x = Blender.Mathutils.Vector(1.0,0.0,0.0)
+	x = x * state["activeObject"].getMatrix('worldspace')
+	x = x * 10.0
+	state["activeObject"].properties['FLT']['8d!XAXIS-X'] = x[0]
+	state["activeObject"].properties['FLT']['9d!XAXIS-Y'] = x[1]
+	state["activeObject"].properties['FLT']['10d!XAXIS-Z'] = x[2]
+	#do X/Y plane
+	x = Blender.Mathutils.Vector(0.0,1.0,0.0)
+	x.normalize()
+	x = x * state["activeObject"].getMatrix('worldspace')
+	x = x * 10.0
+	state["activeObject"].properties['FLT']['11d!XYPLANE-X'] = x[0]
+	state["activeObject"].properties['FLT']['12d!XYPLANE-Y'] = x[1]
+	state["activeObject"].properties['FLT']['13d!XZPLANE-Z'] = x[2]
+
+def idprops_type(object, typecode):
+	if object.properties.has_key('FLT') and object.properties['FLT'].has_key('type') and object.properties['FLT']['type'] == typecode:
+		return True
+	return False
+
+#ui type code
+def get_prop(typecode, prop):
+	
+	state = update_state()
+	if state["activeObject"] and idprops_type(state["activeObject"], typecode):
+		props = state["activeObject"].properties['FLT']
+	else:
+		props =  flt_properties.FLTDOF
+		
+	return props[prop]	
+
+def set_prop(typecode, prop, value):
+	state = update_state()
+	if state["activeObject"] and idprops_type(state["activeObject"],typecode):
+		state["activeObject"].properties['FLT'][prop] = value		
+
+lockxtrans = (1 << 31)
+lockytrans = (1 << 30)
+lockztrans = (1 << 29)
+lockxrot = (1 << 28)
+lockyrot = (1 << 27)
+lockzrot = (1 << 26)
+lockxscale = (1 << 25)
+lockyscale = (1 << 24)
+lockzscale = (1 << 23)
+
+def get_lockmask(mask):	
+	state = update_state()
+	if state["activeObject"]:
+		flag = get_prop(14,'50I!FLAG')
+		if flag & mask:
+			return True
+	return False	
+
+def set_lockmask(mask):
+	state = update_state()
+	if state["activeObject"] and idprops_type(state["activeObject"], 14):
+		oldvalue = state["activeObject"].properties['FLT']['50I!FLAG']
+		oldvalue = struct.unpack('>I', struct.pack('>i', oldvalue))[0]
+		oldvalue |= mask
+		state["activeObject"].properties['FLT']['50I!FLAG'] = struct.unpack('>i', struct.pack(">I", oldvalue))[0]
+
+def clear_lockmask(mask):
+	state = update_state()
+	if state["activeObject"] and idprops_type(state["activeObject"], 14):
+		oldvalue = state["activeObject"].properties['FLT']['50I!FLAG']
+		oldvalue = struct.unpack('>I', struct.pack('>i', oldvalue))[0]
+		oldvalue &= ~mask
+		state["activeObject"].properties['FLT']['50I!FLAG'] = struct.unpack('>i',struct.pack('>I',oldvalue))[0]	
+
+	
+def create_dof():
+	state = update_state()
+	actobj = state["activeObject"]
+	if actobj and not idprops_type(actobj, 14):
+		idprops_kill()
+		idprops_append(actobj,14, flt_properties.FLTDOF)
+		DOF_get_frame()
+	
+		
+def event(evt,val):
+	if evt == Draw.ESCKEY:
+		Draw.Exit()
+		
+def but_event(evt):
+	global DOF_MAKE
+	global DOF_UPDATE
+	global DOF_DELETE
+
+	global DOF_TRANSX
+	global DOF_TRANSY
+	global DOF_TRANSZ
+	global DOF_ROTX
+	global DOF_ROTY
+	global DOF_ROTZ
+	global DOF_SCALEX
+	global DOF_SCALEY
+	global DOF_SCALEZ
+
+	global DOF_MIN_TRANSX
+	global DOF_MIN_TRANSY
+	global DOF_MIN_TRANSZ
+	global DOF_MIN_ROTX
+	global DOF_MIN_ROTY
+	global DOF_MIN_ROTZ
+	global DOF_MIN_SCALEX
+	global DOF_MIN_SCALEY
+	global DOF_MIN_SCALEZ
+
+	global DOF_MAX_TRANSX
+	global DOF_MAX_TRANSY
+	global DOF_MAX_TRANSZ
+	global DOF_MAX_ROTX
+	global DOF_MAX_ROTY
+	global DOF_MAX_ROTZ
+	global DOF_MAX_SCALEX
+	global DOF_MAX_SCALEY
+	global DOF_MAX_SCALEZ
+
+	global DOF_STEP_TRANSX
+	global DOF_STEP_TRANSY
+	global DOF_STEP_TRANSZ
+	global DOF_STEP_ROTX
+	global DOF_STEP_ROTY
+	global DOF_STEP_ROTZ
+	global DOF_STEP_SCALEX
+	global DOF_STEP_SCALEY
+	global DOF_STEP_SCALEZ
+	
+	#labels
+	global DOF_ROTSTRING
+	global DOF_TRANSTRING
+	global DOF_SCALESTRING
+	
+	
+	#masks
+	global lockxtrans
+	global lockytrans
+	global lockztrans
+	global lockxrot
+	global lockyrot
+	global lockzrot
+	global lockxscale
+	global lockyscale
+	global lockzscale
+
+	global zmin
+	global zmax
+	global zcur
+	global zstep
+	global ymin
+	global ymax
+	global ycur
+	global ystep
+	global xmin
+	global xmax
+	global xcur
+	global xstep
+	global pitchmin
+	global pitchmax
+	global pitchcur
+	global pitchstep
+	global rollmin
+	global rollmax
+	global rollcur
+	global rollstep
+	global yawmin
+	global yawmax
+	global yawcur
+	global yawstep
+	global zscalemin
+	global zscalemax
+	global zscalecur
+	global zscalestep
+	global yscalemin
+	global yscalemax
+	global yscalecur
+	global yscalestep
+	global xscalemin
+	global xscalemax
+	global xscalecur
+	global xscalestep	
+
+	
+	
+	#do "system" events
+	if evt == evcode["DOF_MAKE"]:
+		create_dof()
+
+	if evt == evcode["DOF_UPDATE"]:
+		DOF_get_frame()
+	
+	if evt == evcode["DOF_DELETE"]:
+		idprops_kill()
+	#do translation lock events
+	if evt == evcode["DOF_TRANSX"]:
+		if DOF_TRANSX.val == True:
+			set_lockmask(lockxtrans)
+		else:
+			clear_lockmask(lockxtrans)
+
+	if evt == evcode["DOF_TRANSY"]:
+		if DOF_TRANSY.val == True:
+			set_lockmask(lockytrans)
+		else:
+			clear_lockmask(lockytrans)
+
+	if evt == evcode["DOF_TRANSZ"]:
+		if DOF_TRANSZ.val == True:
+			set_lockmask(lockztrans)
+		else:
+			clear_lockmask(lockztrans)
+
+
+	#do rotation lock events
+	if evt == evcode["DOF_ROTX"]:
+		if DOF_ROTX.val == True:
+			set_lockmask(lockxrot)
+		else:
+			clear_lockmask(lockxrot)
+
+	if evt == evcode["DOF_ROTY"]:
+		if DOF_ROTY.val == True:
+			set_lockmask(lockyrot)
+		else:
+			clear_lockmask(lockyrot)
+
+	if evt == evcode["DOF_ROTZ"]:
+		if DOF_ROTZ.val == True:
+			set_lockmask(lockzrot)
+		else:
+			clear_lockmask(lockzrot)
+
+	#do scale lock events
+	if evt == evcode["DOF_SCALEX"]:
+		if DOF_SCALEX.val == True:
+			set_lockmask(lockxscale)
+		else:
+			clear_lockmask(lockxscale)
+
+	if evt == evcode["DOF_SCALEY"]:
+		if DOF_SCALEY.val == True:
+			set_lockmask(lockyscale)
+		else:
+			clear_lockmask(lockyscale)
+
+	if evt == evcode["DOF_SCALEZ"]:
+		if DOF_SCALEZ.val == True:
+			set_lockmask(lockzscale)
+		else:
+			clear_lockmask(lockzscale)
+			
+	
+	#do translation buttons
+	if evt == evcode["DOF_MIN_TRANSX"]:
+		set_prop(14, xmin, DOF_MIN_TRANSX.val)
+	if evt == evcode["DOF_MAX_TRANSX"]:
+		set_prop(14,xmax, DOF_MAX_TRANSX.val)
+	if evt == evcode["DOF_STEP_TRANSX"]:
+		set_prop(14,xstep, DOF_STEP_TRANSX.val)
+		
+	if evt == evcode["DOF_MIN_TRANSY"]:
+		set_prop(14, ymin, DOF_MIN_TRANSY.val)
+	if evt == evcode["DOF_MAX_TRANSY"]:
+		set_prop(14,ymax, DOF_MAX_TRANSY.val)
+	if evt == evcode["DOF_STEP_TRANSY"]:
+		set_prop(14,ystep, DOF_STEP_TRANSY.val)
+		
+	if evt == evcode["DOF_MIN_TRANSZ"]:
+		set_prop(14, zmin, DOF_MIN_TRANSZ.val)
+	if evt == evcode["DOF_MAX_TRANSZ"]:
+		set_prop(14, zmax, DOF_MAX_TRANSZ.val)
+	if evt == evcode["DOF_STEP_TRANSZ"]:
+		set_prop(14, zstep, DOF_STEP_TRANSZ.val)
+
+	#do rotation buttons
+	if evt == evcode["DOF_MIN_ROTX"]:
+		set_prop(14, pitchmin, DOF_MIN_ROTX.val)
+	if evt == evcode["DOF_MAX_ROTX"]:
+		set_prop(14, pitchmax, DOF_MAX_ROTX.val)
+	if evt == evcode["DOF_STEP_ROTX"]:
+		set_prop(14, pitchstep, DOF_STEP_ROTX.val)
+
+	if evt == evcode["DOF_MIN_ROTY"]:
+		set_prop(14, rollmin, DOF_MIN_ROTY.val)
+	if evt == evcode["DOF_MAX_ROTY"]:
+		set_prop(14, rollmax, DOF_MAX_ROTY.val)
+	if evt == evcode["DOF_STEP_ROTY"]:
+		set_prop(14, rollstep, DOF_STEP_ROTY.val)	
+
+	if evt == evcode["DOF_MIN_ROTZ"]:
+		set_prop(14, yawmin, DOF_MIN_ROTZ.val)
+	if evt == evcode["DOF_MAX_ROTZ"]:
+		set_prop(14, yawmax, DOF_MAX_ROTZ.val)
+	if evt == evcode["DOF_STEP_ROTZ"]:
+		set_prop(14, yawstep, DOF_STEP_ROTZ.val)	
+		
+	#do scale buttons
+	if evt == evcode["DOF_MIN_SCALEX"]:
+		set_prop(14, xscalemin, DOF_MIN_SCALEX.val)
+	if evt == evcode["DOF_MAX_SCALEX"]:
+		set_prop(14, xscalemax, DOF_MAX_SCALEX.val)
+	if evt == evcode["DOF_STEP_SCALEX"]:
+		set_prop(14, xscalestep, DOF_STEP_SCALEX.val)
+	
+	if evt == evcode["DOF_MIN_SCALEY"]:
+		set_prop(14, yscalemin, DOF_MIN_SCALEY.val)
+	if evt == evcode["DOF_MAX_SCALEY"]:
+		set_prop(14, yscalemax, DOF_MAX_SCALEY.val)
+	if evt == evcode["DOF_STEP_SCALEY"]:
+		set_prop(14, yscalestep, DOF_STEP_SCALEY.val)	
+
+	if evt == evcode["DOF_MIN_SCALEZ"]:
+		set_prop(14, zscalemin, DOF_MIN_SCALEZ.val)
+	if evt == evcode["DOF_MAX_SCALEZ"]:
+		set_prop(14, zscalemax, DOF_MAX_SCALEZ.val)
+	if evt == evcode["DOF_STEP_SCALEZ"]:
+		set_prop(14, zscalestep, DOF_STEP_SCALEZ.val)
+
+
+	Draw.Redraw(1)
+	Blender.Window.RedrawAll()
+
+def draw_propsheet(x,y):
+	#UI buttons
+	global DOF_MAKE
+	global DOF_UPDATE
+	global DOF_DELETE
+
+	global DOF_TRANSX
+	global DOF_TRANSY
+	global DOF_TRANSZ
+	global DOF_ROTX
+	global DOF_ROTY
+	global DOF_ROTZ
+	global DOF_SCALEX
+	global DOF_SCALEY
+	global DOF_SCALEZ
+
+	global DOF_MIN_TRANSX
+	global DOF_MIN_TRANSY
+	global DOF_MIN_TRANSZ
+	global DOF_MIN_ROTX
+	global DOF_MIN_ROTY
+	global DOF_MIN_ROTZ
+	global DOF_MIN_SCALEX
+	global DOF_MIN_SCALEY
+	global DOF_MIN_SCALEZ
+
+	global DOF_MAX_TRANSX
+	global DOF_MAX_TRANSY
+	global DOF_MAX_TRANSZ
+	global DOF_MAX_ROTX
+	global DOF_MAX_ROTY
+	global DOF_MAX_ROTZ
+	global DOF_MAX_SCALEX
+	global DOF_MAX_SCALEY
+	global DOF_MAX_SCALEZ
+
+	global DOF_STEP_TRANSX
+	global DOF_STEP_TRANSY
+	global DOF_STEP_TRANSZ
+	global DOF_STEP_ROTX
+	global DOF_STEP_ROTY
+	global DOF_STEP_ROTZ
+	global DOF_STEP_SCALEX
+	global DOF_STEP_SCALEY
+	global DOF_STEP_SCALEZ
+
+	#labels
+	global DOF_ROTSTRING
+	global DOF_TRANSTRING
+	global DOF_SCALESTRING	
+	global DOF_EDITLABEL
+	
+	#masks
+	global lockxtrans
+	global lockytrans
+	global lockztrans
+	global lockxrot
+	global lockyrot
+	global lockzrot
+	global lockxscale
+	global lockyscale
+	global lockzscale
+	
+	global zmin
+	global zmax
+	global zcur
+	global zstep
+	global ymin
+	global ymax
+	global ycur
+	global ystep
+	global xmin
+	global xmax
+	global xcur
+	global xstep
+	global pitchmin
+	global pitchmax
+	global pitchcur
+	global pitchstep
+	global rollmin
+	global rollmax
+	global rollcur
+	global rollstep
+	global yawmin
+	global yawmax
+	global yawcur
+	global yawstep
+	global zscalemin
+	global zscalemax
+	global zscalecur
+	global zscalestep
+	global yscalemin
+	global yscalemax
+	global yscalecur
+	global yscalestep
+	global xscalemin
+	global xscalemax
+	global xscalecur
+	global xscalestep	
+
+	
+	global evcode
+	
+	state = update_state()
+	
+	row_height = 20
+	toggle_width = 50
+	input_width = 100
+	pad = 10
+	origx = x
+	origy = (row_height * 15) + (pad * 15)
+
+
+	#editor label
+	x = origx
+	y = origy
+	#y = y - (row_height + pad)
+	DOF_EDITLABEL = Blender.Draw.Label("FLT Degree of Freedom Editor", x, y, 200, row_height)
+
+
+	#draw Translation limits
+	x = origx
+	y = y- (row_height + pad)
+	DOF_TRANSTRING = Blender.Draw.Label("Translation Limits", x, y, input_width, row_height)
+
+
+	#X limits
+	x = origx
+	y = y- (row_height + pad)
+	DOF_TRANSX = Blender.Draw.Toggle("LimX", evcode["DOF_TRANSX"], x, y, toggle_width, row_height, get_lockmask(lockxtrans), "")
+	x = x + (toggle_width + pad)
+	DOF_MIN_TRANSX = Blender.Draw.Number("MinX", evcode["DOF_MIN_TRANSX"], x, y, input_width, row_height,get_prop(14,xmin),  -1000000.0, 1000000.0, "")
+	x = x + (input_width + pad)
+	DOF_MAX_TRANSX = Blender.Draw.Number("MaxX", evcode["DOF_MAX_TRANSX"], x, y, input_width, row_height,get_prop(14,xmax), -1000000.0, 1000000.0, "")
+	x = x + (input_width + pad)
+	DOF_STEP_TRANSX = Blender.Draw.Number("StepX", evcode["DOF_STEP_TRANSX"], x, y, input_width, row_height,get_prop(14,xstep), -1000000.0, 1000000.0, "")
+	
+	#Y limits
+	x = origx
+	y = y- (row_height + pad)
+	DOF_TRANSY = Blender.Draw.Toggle("LimY", evcode["DOF_TRANSY"], x, y, toggle_width, row_height, get_lockmask(lockytrans), "")
+	x = x + (toggle_width + pad)
+	DOF_MIN_TRANSY = Blender.Draw.Number("MinY", evcode["DOF_MIN_TRANSY"], x, y, input_width, row_height, get_prop(14,ymin),  -1000000.0, 1000000.0, "")
+	x = x + (input_width + pad)
+	DOF_MAX_TRANSY = Blender.Draw.Number("MaxY", evcode["DOF_MAX_TRANSY"], x, y, input_width, row_height, get_prop(14,ymax), -1000000.0, 1000000.0, "")
+	x = x + (input_width + pad)
+	DOF_STEP_TRANSY = Blender.Draw.Number("StepY", evcode["DOF_STEP_TRANSY"], x, y, input_width, row_height, get_prop(14,ystep), -1000000.0, 1000000.0, "")	
+	
+	#Z limits
+	x = origx
+	y = y- (row_height + pad)
+	DOF_TRANSZ = Blender.Draw.Toggle("LimZ", evcode["DOF_TRANSZ"], x, y, toggle_width, row_height, get_lockmask(lockztrans), "")
+	x = x + (toggle_width + pad)
+	DOF_MIN_TRANSZ = Blender.Draw.Number("MinZ", evcode["DOF_MIN_TRANSZ"], x, y, input_width, row_height, get_prop(14,zmin),  -1000000.0, 1000000.0, "")
+	x = x + (input_width + pad)
+	DOF_MAX_TRANSZ = Blender.Draw.Number("MaxZ", evcode["DOF_MAX_TRANSZ"], x, y, input_width, row_height, get_prop(14,zmax), -1000000.0, 1000000.0, "")
+	x = x + (input_width + pad)
+	DOF_STEP_TRANSZ = Blender.Draw.Number("StepZ", evcode["DOF_STEP_TRANSZ"], x, y, input_width, row_height, get_prop(14,zstep), -1000000.0, 1000000.0, "")
+	
+	#draw Rotation limits
+	x = origx
+	y = y- (row_height + pad)
+	DOF_ROTSTRING = Blender.Draw.Label("Rotation Limits", x, y, input_width, row_height)
+
+	#draw Rotation limits
+	#X limits
+	x = origx
+	y = y- (row_height + pad)
+	DOF_ROTX = Blender.Draw.Toggle("LimX", evcode["DOF_ROTX"], x, y, toggle_width, row_height, get_lockmask(lockxrot), "")
+	x = x + (toggle_width + pad)
+	DOF_MIN_ROTX = Blender.Draw.Number("MinX", evcode["DOF_MIN_ROTX"], x, y, input_width, row_height, get_prop(14,pitchmin),  -1000000.0, 1000000.0, "")
+	x = x + (input_width + pad)
+	DOF_MAX_ROTX = Blender.Draw.Number("MaxX", evcode["DOF_MAX_ROTX"], x, y, input_width, row_height, get_prop(14,pitchmax), -1000000.0, 1000000.0, "")
+	x = x + (input_width + pad)
+	DOF_STEP_ROTX = Blender.Draw.Number("StepX", evcode["DOF_STEP_ROTX"], x, y, input_width, row_height, get_prop(14,pitchstep), -1000000.0, 1000000.0, "")
+		
+	#Y limits
+	x = origx
+	y = y- (row_height + pad)
+	DOF_ROTY = Blender.Draw.Toggle("LimY", evcode["DOF_ROTY"], x, y, toggle_width, row_height, get_lockmask(lockyrot), "")
+	x = x + (toggle_width + pad)
+	DOF_MIN_ROTY = Blender.Draw.Number("MinY", evcode["DOF_MIN_ROTY"], x, y, input_width, row_height, get_prop(14,rollmin),  -1000000.0, 1000000.0, "")
+	x = x + (input_width + pad)
+	DOF_MAX_ROTY = Blender.Draw.Number("MaxY", evcode["DOF_MAX_ROTY"], x, y, input_width, row_height, get_prop(14,rollmax), -1000000.0, 1000000.0, "")
+	x = x + (input_width + pad)
+	DOF_STEP_ROTY = Blender.Draw.Number("StepY", evcode["DOF_STEP_ROTY"], x, y, input_width, row_height, get_prop(14,rollstep), -1000000.0, 1000000.0, "")
+		
+	#Z limits
+	x = origx
+	y = y- (row_height + pad)
+	DOF_ROTZ = Blender.Draw.Toggle("LimZ", evcode["DOF_ROTZ"], x, y, toggle_width, row_height, get_lockmask(lockzrot), "")
+	x = x + (toggle_width + pad)
+	DOF_MIN_ROTZ = Blender.Draw.Number("MinZ", evcode["DOF_MIN_ROTZ"], x, y, input_width, row_height, get_prop(14, yawmin),  -1000000.0, 1000000.0, "")
+	x = x + (input_width + pad)
+	DOF_MAX_ROTZ = Blender.Draw.Number("MaxZ", evcode["DOF_MAX_ROTZ"], x, y, input_width, row_height, get_prop(14, yawmax), -1000000.0, 1000000.0, "")
+	x = x + (input_width + pad)
+	DOF_STEP_ROTZ = Blender.Draw.Number("StepZ", evcode["DOF_STEP_ROTZ"], x, y, input_width, row_height, get_prop(14, yawstep), -1000000.0, 1000000.0, "")
+			
+
+	#draw Scale limits
+	x = origx
+	y = y- (row_height + pad)
+	DOF_SCALESTRING = Blender.Draw.Label("Scale Limits", x, y, input_width, row_height)
+
+	#draw Scale limits
+	#X limits
+	x = origx
+	y = y- (row_height + pad)
+	DOF_SCALEX = Blender.Draw.Toggle("LimX", evcode["DOF_SCALEX"], x, y, toggle_width, row_height, get_lockmask(lockxscale), "")
+	x = x + (toggle_width + pad)
+	DOF_MIN_SCALEX = Blender.Draw.Number("MinX", evcode["DOF_MIN_SCALEX"], x, y, input_width, row_height, get_prop(14, xscalemin),  -1000000.0, 1000000.0, "")
+	x = x + (input_width + pad)
+	DOF_MAX_SCALEX = Blender.Draw.Number("MaxX", evcode["DOF_MAX_SCALEX"], x, y, input_width, row_height, get_prop(14, xscalemax), -1000000.0, 1000000.0, "")
+	x = x + (input_width + pad)
+	DOF_STEP_SCALEX = Blender.Draw.Number("StepX", evcode["DOF_STEP_SCALEX"], x, y, input_width, row_height, get_prop(14, xscalestep), -1000000.0, 1000000.0, "")
+		
+	#Y limits
+	x = origx
+	y = y- (row_height + pad)
+	DOF_SCALEY = Blender.Draw.Toggle("LimY", evcode["DOF_SCALEY"], x, y, toggle_width, row_height, get_lockmask(lockyscale), "")
+	x = x + (toggle_width + pad)
+	DOF_MIN_SCALEY = Blender.Draw.Number("MinY", evcode["DOF_MIN_SCALEY"], x, y, input_width, row_height, get_prop(14, yscalemin),  -1000000.0, 1000000.0, "")
+	x = x + (input_width + pad)
+	DOF_MAX_SCALEY = Blender.Draw.Number("MaxY", evcode["DOF_MAX_SCALEY"], x, y, input_width, row_height, get_prop(14, yscalemax), -1000000.0, 1000000.0, "")
+	x = x + (input_width + pad)
+	DOF_STEP_SCALEY = Blender.Draw.Number("StepY", evcode["DOF_STEP_SCALEY"], x, y, input_width, row_height, get_prop(14, yscalestep), -1000000.0, 1000000.0, "")		
+
+	#Z limits
+	x = origx
+	y = y- (row_height + pad)
+	DOF_SCALEZ = Blender.Draw.Toggle("LimZ", evcode["DOF_SCALEZ"], x, y, toggle_width, row_height, get_lockmask(lockzscale), "")
+	x = x + (toggle_width + pad)
+	DOF_MIN_SCALEZ = Blender.Draw.Number("MinZ", evcode["DOF_MIN_SCALEZ"], x, y, input_width, row_height, get_prop(14, zscalemin),  -1000000.0, 1000000.0, "")
+	x = x + (input_width + pad)
+	DOF_MAX_SCALEZ = Blender.Draw.Number("MaxZ", evcode["DOF_MAX_SCALEZ"], x, y, input_width, row_height, get_prop(14, zscalemax), -1000000.0, 1000000.0, "")
+	x = x + (input_width + pad)
+	DOF_STEP_SCALEZ = Blender.Draw.Number("StepZ", evcode["DOF_STEP_SCALEZ"], x, y, input_width, row_height, get_prop(14, zscalestep), -1000000.0, 1000000.0, "")		
+
+	#System
+	x = origx
+	y = y - (row_height + (pad)*3)
+	DOF_MAKE = Blender.Draw.PushButton("Make DOF", evcode["DOF_MAKE"], x, y, input_width, row_height, "Make a Dof Node out of Active Object")
+	x = x + (input_width + pad)
+	DOF_UPDATE = Blender.Draw.PushButton("Grab Loc/Rot", evcode["DOF_UPDATE"], x, y, input_width, row_height, "Update the Dof Node position/orientation")
+	x = x + (input_width + pad)
+	DOF_DELETE = Blender.Draw.PushButton("Delete DOF", evcode["DOF_DELETE"], x, y, input_width, row_height, "Delete the Dof Node properties")
+
+
+	
+	
+def gui():
+	#draw the propsheet/toolbox.
+	psheety = 800
+	#psheetx = psheety + 10
+	draw_propsheet(20,psheety)
+
+Draw.Register(gui,event,but_event)
+	
\ No newline at end of file
diff --git a/release/scripts/flt_lodedit.py b/release/scripts/flt_lodedit.py
new file mode 100644
index 00000000000..58319b9e525
--- /dev/null
+++ b/release/scripts/flt_lodedit.py
@@ -0,0 +1,502 @@
+#!BPY
+
+"""
+Name: 'FLT LOD Editor'
+Blender: 240
+Group: 'Misc'
+Tooltip: 'Level of Detail Edtior for FLT nodes'
+"""
+
+__author__ = "Geoffrey Bantle"
+__version__ = "1.0 11/21/07"
+__email__ = ('scripts', 'Author, ')
+__url__ = ('blender', 'blenderartists.org')
+
+__bpydoc__ ="""\
+This script provides tools for working with OpenFlight databases in Blender. OpenFlight is a
+registered trademark of MultiGen-Paradigm, Inc.
+
+Feature overview and more availible at:
+http://wiki.blender.org/index.php/Scripts/Manual/FLTools
+"""
+
+# --------------------------------------------------------------------------
+# flt_palettemanager.py version 0.1 2005/04/08
+# --------------------------------------------------------------------------
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# Copyright (C) 2007: Blender Foundation
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+# ***** END GPL LICENCE BLOCK *****
+# --------------------------------------------------------------------------
+
+import Blender.Draw as Draw
+from Blender.BGL import *
+import Blender
+import flt_properties
+reload(flt_properties)
+from flt_properties import *
+
+#event codes
+evcode = {
+	"LOD_MAKE" : 100,
+	"LOD_DELETE" : 101,
+	"LOD_CALC_CENTER" : 102,
+	"LOD_GRAB_CENTER" : 103,
+	"LOD_X" : 104,
+	"LOD_Y" : 105,
+	"LOD_Z" : 106,
+	"LOD_FREEZE" : 107,
+	"LOD_SIG" : 108,
+	"LOD_IN" : 109,
+	"LOD_OUT" : 110,
+	"LOD_TRANS" : 111,		
+	"LOD_PREVIOUS" : 112
+}
+
+
+#system
+LOD_MAKE = None			#PushButton
+LOD_DELETE = None		#PushButton
+LOD_CALC_CENTER = None	#PushButton
+LOD_GRAB_CENTER = None	#Pushbutton
+LOD_FREEZE = None		#Toggle
+LOD_PREVIOUS = None		#Toggle
+
+LOD_X = None			#Input
+LOD_Y = None			#Input
+LOD_Z = None			#Input
+
+LOD_SIG = None			#Input
+LOD_IN = None			#Input
+LOD_OUT = None			#Input
+LOD_TRANS = None		#Input
+
+#labels
+LOD_EDITLABEL = None
+LOD_SWITCHLABEL = None
+LOD_CENTERLABEL = None
+
+LOD_XLABEL = None
+LOD_YLABEL = None
+LOD_ZLABEL = None
+LOD_SIGLABEL = None
+LOD_INLABEL = None
+LOD_OUTLABEL = None
+LOD_TRANSLABEL = None
+
+
+#ID Props
+switch_in = '5d!switch in'
+switch_out = '6d!switch out'
+xco = '10d!X co'
+yco = '11d!Y co'
+zco = '12d!Z co'
+trans = '13d!Transition'
+sig_size = '14d!Sig Size'
+
+#Flags
+lodflag = '9I!flags'
+previous_mask = (1 << 31)
+freeze_mask = (1 << 29)
+
+def update_state():
+	state = dict()
+	state["activeScene"] = Blender.Scene.GetCurrent()
+	state["activeObject"] = state["activeScene"].objects.active
+	if state["activeObject"] and not state["activeObject"].sel:
+		state["activeObject"] = None
+	state["activeMesh"] = None
+	if state["activeObject"] and state["activeObject"].type == 'Mesh':
+		state["activeMesh"] = state["activeObject"].getData(mesh=True)
+	
+	state["activeFace"] = None
+	if state["activeMesh"]:
+		if state["activeMesh"].faceUV and state["activeMesh"].activeFace != None:
+			state["activeFace"] = state["activeMesh"].faces[state["activeMesh"].activeFace]
+		
+		
+	#update editmode
+	state["editmode"]	= Blender.Window.EditMode()
+
+	return state
+	
+def idprops_append(object, typecode, props):
+	object.properties["FLT"] = dict()
+	object.properties["FLT"]['type'] = typecode 
+	for prop in props:
+		object.properties["FLT"][prop] = props[prop]
+	object.properties["FLT"]['3t8!id'] = object.name
+
+def idprops_kill():
+	state = update_state()
+	if state["activeObject"] and state["activeObject"].properties.has_key('FLT'):
+		state["activeObject"].properties.pop('FLT')
+
+def idprops_copy(source):
+	state = update_state()
+	if source.properties.has_key('FLT'):
+		for object in state["activeScene"].objects:
+			if object.sel and object != source and (state["activeScene"].Layers & object.Layers):
+				idprops_kill(object)
+				object.properties['FLT'] = dict()
+				for key in source.properties['FLT']:
+					object.properties['FLT'][key] = source.properties['FLT'][key]
+
+def select_by_typecode(typecode):
+	state = update_state()
+	
+	for object in state["activeScene"].objects:
+		if object.properties.has_key('FLT') and object.properties['FLT']['type'] == typecode and state["activeScene"].Layers & object.Layers:
+				object.select(1)
+
+def idprops_type(object, typecode):
+	if object.properties.has_key('FLT') and object.properties['FLT'].has_key('type') and object.properties['FLT']['type'] == typecode:
+		return True
+	return False
+
+#ui type code
+def get_prop(typecode, prop):
+	
+	state = update_state()
+	if state["activeObject"] and idprops_type(state["activeObject"], typecode):
+		props = state["activeObject"].properties['FLT']
+	else:
+		props =  flt_properties.FLTLOD
+		
+	return props[prop]	
+
+def set_prop(typecode, prop, value):
+	state = update_state()
+	if state["activeObject"] and idprops_type(state["activeObject"],typecode):
+		state["activeObject"].properties['FLT'][prop] = value		
+
+
+
+def get_lockmask(mask):
+	global lodflag
+	state = update_state()
+	if state["activeObject"]:
+		flag = get_prop(73,lodflag)
+		if flag & mask:
+			return True
+	return False	
+
+def set_lockmask(mask):
+	state = update_state()
+	if state["activeObject"] and idprops_type(state["activeObject"], 73):
+		oldvalue = state["activeObject"].properties['FLT'][lodflag]
+		oldvalue = struct.unpack('>I', struct.pack('>i', oldvalue))[0]
+		oldvalue |= mask
+		state["activeObject"].properties['FLT'][lodflag] = struct.unpack('>i', struct.pack(">I", oldvalue))[0]
+
+def clear_lockmask(mask):
+	state = update_state()
+	if state["activeObject"] and idprops_type(state["activeObject"], 73):
+		oldvalue = state["activeObject"].properties['FLT'][lodflag]
+		oldvalue = struct.unpack('>I', struct.pack('>i', oldvalue))[0]
+		oldvalue &= ~mask
+		state["activeObject"].properties['FLT'][lodflag] = struct.unpack('>i',struct.pack('>I',oldvalue))[0]	
+
+def findchildren(object):
+	state = update_state()
+	children = list()
+	for candidate in state["activeScene"].objects:
+		if candidate.parent == object:
+			children.append(candidate)
+	retlist = list(children)
+	for child in children:
+		retlist = retlist + findchildren(child)
+	return retlist
+
+def get_object_center(object):
+	bbox = object.getBoundBox(1)
+	average = Blender.Mathutils.Vector(0.0, 0.0, 0.0)
+	
+	for point in bbox:
+		average[0] += point[0]
+		average[1] += point[1]
+		average[2] += point[2]
+	
+	average[0] = average[0] / 8.0
+	average[1] = average[1] / 8.0
+	average[2] = average[2] / 8.0
+	
+	return average
+	
+
+def calc_center():
+	
+	global xco
+	global yco
+	global zco
+	
+	state = update_state()
+	if state["activeObject"] and idprops_type(state["activeObject"], 73):
+		average = Blender.Mathutils.Vector(0.0, 0.0, 0.0)
+		children = findchildren(state["activeObject"]) #get children objects	
+		if children:
+			for child in children:
+				center = get_object_center(child)
+				average[0] += center[0]
+				average[1] += center[1]
+				average[2] += center[2]
+			
+			average[0] = average[0] / len(children)
+			average[1] = average[1] / len(children)
+			average[2] = average[2] / len(children)
+			
+		set_prop(73, xco, average[0])
+		set_prop(73, yco, average[1])
+		set_prop(73, zco, average[2])
+		
+
+def grab_center():
+	
+	global xco
+	global yco
+	global zco
+	
+	state = update_state()
+	if state["activeObject"] and idprops_type(state["activeObject"], 73):
+		center = Blender.Window.GetCursorPos()
+		
+		set_prop(73, xco, center[0])
+		set_prop(73, yco, center[1])
+		set_prop(73, zco, center[2])	
+
+
+def create_lod():
+	state = update_state()
+	actobj = state["activeObject"]
+	if actobj and not idprops_type(actobj, 73):
+		idprops_kill()
+		idprops_append(actobj,73, flt_properties.FLTLOD)
+		calc_center()
+
+	
+		
+def event(evt,val):
+	if evt == Draw.ESCKEY:
+		Draw.Exit()
+		
+def but_event(evt):
+
+	global LOD_MAKE
+	global LOD_DELETE
+	global LOD_CALC_CENTER
+	global LOD_GRAB_CENTER
+	global LOD_FREEZE
+	global LOD_PREVIOUS
+	global LOD_X
+	global LOD_Y
+	global LOD_Z
+	global LOD_SIG
+	global LOD_IN
+	global LOD_OUT
+	global LOD_TRANS
+	
+	global switch_in
+	global switch_out
+	global xco
+	global yco
+	global zco
+	global trans
+	global sig_size
+	
+	global lodflag
+	global previous_mask
+	global freeze_mask
+	
+	global evcode
+	
+	#do "system" events
+	if evt == evcode["LOD_MAKE"]:
+		create_lod()
+
+	if evt == evcode["LOD_CALC_CENTER"]:
+		calc_center()
+	
+	if evt == evcode["LOD_DELETE"]:
+		idprops_kill()
+	
+	if evt == evcode["LOD_GRAB_CENTER"]:
+		grab_center()
+
+	#do mask events
+	if evt == evcode["LOD_FREEZE"]:
+		if LOD_FREEZE.val == True:
+			set_lockmask(freeze_mask)
+		else:
+			clear_lockmask(freeze_mask)
+			
+	if evt == evcode["LOD_PREVIOUS"]:
+		if LOD_PREVIOUS.val == True:
+			set_lockmask(previous_mask)
+		else:
+			clear_lockmask(previous_mask)
+			
+	#do input events
+	if evt == evcode["LOD_X"]:
+		set_prop(73, xco, LOD_X.val)
+	if evt == evcode["LOD_Y"]:
+		set_prop(73, yco, LOD_Y.val)
+	if evt == evcode["LOD_Z"]:
+		set_prop(73, zco, LOD_Z.val)
+	if evt == evcode["LOD_SIG"]:
+		set_prop(73, sig_size, LOD_SIG.val)
+	if evt == evcode["LOD_IN"]:
+		set_prop(73, switch_in, LOD_IN.val)
+	if evt == evcode["LOD_OUT"]:
+		set_prop(73, switch_out, LOD_OUT.val)
+	if evt == evcode["LOD_TRANS"]:
+		set_prop(73, trans, LOD_TRANS.val)	
+				
+
+	Draw.Redraw(1)
+	Blender.Window.RedrawAll()
+
+def draw_propsheet(x,y):
+
+	global LOD_MAKE
+	global LOD_DELETE
+	global LOD_CALC_CENTER
+	global LOD_GRAB_CENTER
+	global LOD_FREEZE
+	global LOD_PREVIOUS
+	global LOD_X
+	global LOD_Y
+	global LOD_Z
+	global LOD_SIG
+	global LOD_IN
+	global LOD_OUT
+	global LOD_TRANS
+
+	#labels
+	global LOD_EDITLABEL
+	global LOD_SWITCHLABEL
+	global LOD_CENTERLABEL
+	global LOD_XLABEL
+	global LOD_YLABEL
+	global LOD_ZLABEL
+	global LOD_SIGLABEL
+	global LOD_INLABEL
+	global LOD_OUTLABEL
+	global LOD_TRANSLABEL
+	
+	
+	global switch_in
+	global switch_out
+	global xco
+	global yco
+	global zco
+	global trans
+	global sig_size
+	
+	global lodflag
+	global previous_mask
+	global freeze_mask
+	
+	global evcode
+
+
+	global evcode
+	
+	state = update_state()
+
+	label_width = 100	
+	row_height = 20
+	toggle_width = 50
+	input_width = 100
+	pad = 10
+	origx = x
+	origy = (row_height * 16) + (pad * 16)
+
+
+	#editor label
+	x = origx
+	y = origy
+	LOD_EDITLABEL = Blender.Draw.Label("FLT Level of Detail Editor", x, y, 250, row_height)
+
+
+	#Center inputs
+	x = origx
+	y = y- (row_height + pad)
+	LOD_CENTERLABEL = Blender.Draw.Label("LOD center", x, y, label_width, row_height)
+	y = y- (row_height + pad)
+	LOD_XLABEL = Blender.Draw.Label("X Coordinate", x, y, label_width, row_height)
+	x = origx + (label_width + pad)
+	LOD_X = Blender.Draw.Number("", evcode["LOD_X"], x, y, input_width, row_height,get_prop(73,xco),  -1000000.0, 1000000.0, "")
+	x = origx
+	y = y- (row_height + pad)
+	LOD_YLABEL = Blender.Draw.Label("Y Coordinate", x, y, label_width, row_height)	
+	x = origx + (label_width + pad)
+	LOD_Y = Blender.Draw.Number("", evcode["LOD_Y"], x, y, input_width, row_height,get_prop(73,yco), -1000000.0,  1000000.0, "")
+	x = origx
+	y = y- (row_height + pad)
+	LOD_ZLABEL = Blender.Draw.Label("Z Coordinate", x, y, label_width, row_height)
+	x = origx + (label_width + pad)		
+	LOD_Z = Blender.Draw.Number("", evcode["LOD_Z"], x, y, input_width, row_height,get_prop(73,zco), -1000000.0, 1000000.0, "")
+
+
+	#Switch inputs
+	x = origx
+	y = y- (row_height + pad)
+	LOD_SWITCHLABEL = Blender.Draw.Label("Switch Settings", x, y, input_width, row_height)
+	y = y- (row_height + pad)
+	LOD_SIGLABEL = Blender.Draw.Label("Significant Size", x, y, label_width, row_height)
+	x = origx + (label_width + pad)
+	LOD_SIG = Blender.Draw.Number("", evcode["LOD_SIG"], x, y, input_width, row_height, get_prop(73,sig_size),  -1000000.0, 1000000.0, "")
+	x = origx
+	y = y- (row_height + pad)
+	LOD_INLABEL = Blender.Draw.Label("Switch In", x, y, label_width, row_height)
+	x = origx + (label_width + pad)
+	LOD_IN = Blender.Draw.Number("", evcode["LOD_IN"], x, y, input_width, row_height, get_prop(73,switch_in), -1000000.0, 1000000.0, "")
+	x = origx
+	y = y- (row_height + pad)
+	LOD_OUTLABEL = Blender.Draw.Label("Switch Out", x, y, label_width, row_height)	
+	x = origx + (label_width + pad)
+	LOD_OUT = Blender.Draw.Number("", evcode["LOD_OUT"], x, y, input_width, row_height, get_prop(73,switch_out), -1000000.0, 1000000.0, "")
+	x = origx
+	y = y- (row_height + pad)
+	LOD_TRANSLABEL = Blender.Draw.Label("Transition", x, y, label_width, row_height)		
+	x = origx + (label_width + pad)
+	LOD_TRANS = Blender.Draw.Number("", evcode["LOD_TRANS"], x, y, input_width, row_height, get_prop(73,trans), -1000000.0, 1000000.0, "")	
+
+
+	x = origx
+	y = y - (row_height + pad)	
+ 	LOD_MAKE = Blender.Draw.PushButton("Make LOD", evcode["LOD_MAKE"], x, y, input_width + label_width + pad, row_height, "Make a LOD Node out of Active Object")
+	y = y - (row_height + pad)	
+	LOD_DELETE = Blender.Draw.PushButton("Delete LOD", evcode["LOD_DELETE"], x, y, input_width + label_width + pad, row_height, "Delete the LOD Node properties")
+	y = y - (row_height + pad)
+	LOD_CALC_CENTER = Blender.Draw.PushButton("Calculate Center", evcode["LOD_CALC_CENTER"], x, y, input_width + label_width + pad, row_height, "Calculate the center of this LOD")
+	y = y - (row_height + pad)
+	LOD_GRAB_CENTER = Blender.Draw.PushButton("Grab Center", evcode["LOD_GRAB_CENTER"], x, y, input_width + label_width + pad, row_height, "Grab center from 3d cursor")
+	y = y - (row_height + pad)
+	LOD_FREEZE = Blender.Draw.Toggle("Freeze Center", evcode["LOD_FREEZE"], x, y, input_width + label_width + pad, row_height, get_lockmask(freeze_mask), "")
+	y = y - (row_height + pad)
+	LOD_PREVIOUS = Blender.Draw.Toggle("Previous Range", evcode["LOD_PREVIOUS"], x, y, input_width + label_width + pad, row_height, get_lockmask(previous_mask), "")
+
+def gui():
+	#draw the propsheet/toolbox.
+	psheety = 800
+	#psheetx = psheety + 10
+	draw_propsheet(20,psheety)
+
+Draw.Register(gui,event,but_event)
+	
\ No newline at end of file
diff --git a/release/scripts/flt_properties.py b/release/scripts/flt_properties.py
index bc7c972ca66..4c841e9c0c0 100644
--- a/release/scripts/flt_properties.py
+++ b/release/scripts/flt_properties.py
@@ -197,7 +197,10 @@ def write_prop(fw,type,value,length):
 	elif type == 'i':
 		fw.write_int(value)
 	elif type == 'I':
-		fw.write_uint(value)
+		#NOTE!:
+		#there is no unsigned int type in python, but we can only store signed ints in ID props
+		newvalue = struct.unpack('>I', struct.pack('>i', value))[0]
+		fw.write_uint(newvalue)
 	elif type == 'd':
 		fw.write_double(value)
 	elif type == 'f':
@@ -267,16 +270,16 @@ FLTObjectDisplay = [10]
 FLTLOD = {
 	'3t8!id' : 'L',
 	'4i!reserved' : 0,
-	'5d!switch in' : 0,
-	'6d!switch out' : 0,
+	'5d!switch in' : 0.0,
+	'6d!switch out' : 0.0,
 	'7s!sfx ID1' : 0,
 	'8s!sfx ID2' : 0,
 	'9I!flags' : 0,
-	'10d!X co' : 0,
-	'11d!Y co' : 0,
-	'12d!Z co' : 0,
-	'13d!Transition' : 0,
-	'14d!Sig Size' : 0
+	'10d!X co' : 0.0,
+	'11d!Y co' : 0.0,
+	'12d!Z co' : 0.0,
+	'13d!Transition' : 0.0,
+	'14d!Sig Size' : 0.0
 }
 FLTLODDisplay = [4]
 
diff --git a/release/text/copyright.txt b/release/text/copyright.txt
index 6082af3033f..9f49dd4587a 100644
--- a/release/text/copyright.txt
+++ b/release/text/copyright.txt
@@ -56,7 +56,7 @@
   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 VF has been advised of the possibility of
+  to use the Software, even if BF has been advised of the possibility of
   such damages. 
    
   5. User warning and indemnification
diff --git a/source/Makefile b/source/Makefile
index d06962cbe3f..91dd17d73dd 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -250,6 +250,7 @@ SPLIB += $(OCGDIR)/blender/readblenfile/$(DEBUG_DIR)libreadblenfile.a
 # but somehow it consistently fails to resolve these symbols... or 
 # can I just not check them? nm claims they aren't...
 SPLIB += $(OCGDIR)/blender/blenkernel/blenkernel_blc/$(DEBUG_DIR)libblenkernel_blc.a
+SPLIB += $(OCGDIR)/blender/python/$(DEBUG_DIR)libpython.a
 
 # These three need to be explicitly mentioned on the cl, because 
 # if they are offered as a lib, they are optimized away. (nzc)
diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h
index e1eb6718a30..e403fc33e06 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			247
-#define BLENDER_SUBVERSION		0
+#define BLENDER_SUBVERSION		1
 
 #define BLENDER_MINVERSION		245
 #define BLENDER_MINSUBVERSION	15
diff --git a/source/blender/blenkernel/BKE_collision.h b/source/blender/blenkernel/BKE_collision.h
index 2966d932a49..c483148e4de 100644
--- a/source/blender/blenkernel/BKE_collision.h
+++ b/source/blender/blenkernel/BKE_collision.h
@@ -119,8 +119,10 @@ FaceCollPair;
 /////////////////////////////////////////////////
 // used in modifier.c from collision.c
 /////////////////////////////////////////////////
+
 BVHTree *bvhtree_build_from_mvert ( MFace *mfaces, unsigned int numfaces, MVert *x, unsigned int numverts, float epsilon );
 void bvhtree_update_from_mvert ( BVHTree * bvhtree, MFace *faces, int numfaces, MVert *x, MVert *xnew, int numverts, int moving );
+
 /////////////////////////////////////////////////
 
 LinkNode *BLI_linklist_append_fast ( LinkNode **listp, void *ptr );
@@ -133,6 +135,15 @@ void collision_move_object ( CollisionModifierData *collmd, float step, float pr
 void collisions_compute_barycentric ( float pv[3], float p1[3], float p2[3], float p3[3], float *w1, float *w2, float *w3 );
 void interpolateOnTriangle ( float to[3], float v1[3], float v2[3], float v3[3], double w1, double w2, double w3 );
 
+/////////////////////////////////////////////////
+// used in effect.c
+/////////////////////////////////////////////////
+CollisionModifierData **get_collisionobjects(Object *self, int *numcollobj);
+
+/////////////////////////////////////////////////
+
+
+
 /////////////////////////////////////////////////
 
 #endif
diff --git a/source/blender/blenkernel/BKE_customdata.h b/source/blender/blenkernel/BKE_customdata.h
index e84c7d30956..c84b690bc49 100644
--- a/source/blender/blenkernel/BKE_customdata.h
+++ b/source/blender/blenkernel/BKE_customdata.h
@@ -32,9 +32,11 @@
 #ifndef BKE_CUSTOMDATA_H
 #define BKE_CUSTOMDATA_H
 
+#include "BLO_sys_types.h" // for intptr_t support
+
 struct CustomData;
 struct CustomDataLayer;
-typedef long CustomDataMask;
+typedef intptr_t CustomDataMask;
 
 extern const CustomDataMask CD_MASK_BAREMESH;
 extern const CustomDataMask CD_MASK_MESH;
diff --git a/source/blender/blenkernel/BKE_deform.h b/source/blender/blenkernel/BKE_deform.h
index a1975dd4265..e982806a6cc 100644
--- a/source/blender/blenkernel/BKE_deform.h
+++ b/source/blender/blenkernel/BKE_deform.h
@@ -38,6 +38,7 @@
 struct Object;
 struct ListBase;
 struct bDeformGroup;
+struct MDeformVert;
 
 void copy_defgroups (struct ListBase *lb1, struct ListBase *lb2);
 struct bDeformGroup *copy_defgroup (struct bDeformGroup *ingroup);
@@ -46,5 +47,8 @@ int get_defgroup_num (struct Object *ob, struct bDeformGroup *dg);
 int get_named_vertexgroup_num (Object *ob, char *name);
 void unique_vertexgroup_name (struct bDeformGroup *dg, struct Object *ob);
 
+float deformvert_get_weight(const struct MDeformVert *dvert, int group_num);
+float vertexgroup_get_vertex_weight(const struct MDeformVert *dvert, int index, int group_num);
+
 #endif
 
diff --git a/source/blender/blenkernel/BKE_effect.h b/source/blender/blenkernel/BKE_effect.h
index 3763a659f2f..6475f7a71ac 100644
--- a/source/blender/blenkernel/BKE_effect.h
+++ b/source/blender/blenkernel/BKE_effect.h
@@ -37,6 +37,7 @@ struct Effect;
 struct ListBase;
 struct Particle;
 struct Group;
+struct RNG;
 
 typedef struct pEffectorCache {
 	struct pEffectorCache *next, *prev;
@@ -64,6 +65,11 @@ struct ListBase *pdInitEffectors(struct Object *obsrc, struct Group *group);
 void			pdEndEffectors(struct ListBase *lb);
 void			pdDoEffectors(struct ListBase *lb, float *opco, float *force, float *speed, float cur_time, float loc_time, unsigned int flags);
 
+/* required for particle_system.c */
+void do_physical_effector(Object *ob, float *opco, short type, float force_val, float distance, float falloff, float size, float damp, float *eff_velocity, float *vec_to_part, float *velocity, float *field, int planar, struct RNG *rng, float noise_factor, float charge, float pa_size);
+float effector_falloff(struct PartDeflect *pd, float *eff_velocity, float *vec_to_part);
+
+
 
 
 #endif
diff --git a/source/blender/blenkernel/BKE_endian.h b/source/blender/blenkernel/BKE_endian.h
index 1757103eaf6..dc5efd5ea46 100644
--- a/source/blender/blenkernel/BKE_endian.h
+++ b/source/blender/blenkernel/BKE_endian.h
@@ -33,11 +33,11 @@
 
 #define BKE_ENDIANNESS(a) {  \
 	union {  \
-		long l;  \
-		char c[sizeof (long)];  \
+		intptr_t l;  \
+		char c[sizeof (intptr_t)];  \
 	} u;  \
 	u.l = 1;  \
-	a = (u.c[sizeof (long) - 1] == 1) ? 1 : 0;  \
+	a = (u.c[sizeof (intptr_t) - 1] == 1) ? 1 : 0;  \
 }
 
 #endif
diff --git a/source/blender/blenkernel/BKE_shrinkwrap.h b/source/blender/blenkernel/BKE_shrinkwrap.h
new file mode 100644
index 00000000000..e8276238ff2
--- /dev/null
+++ b/source/blender/blenkernel/BKE_shrinkwrap.h
@@ -0,0 +1,146 @@
+/**
+ * BKE_shrinkwrap.h
+ *
+ * ***** 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): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+#ifndef BKE_SHRINKWRAP_H
+#define BKE_SHRINKWRAP_H
+
+/* mesh util */
+//TODO: move this somewhere else
+#include "BKE_customdata.h"
+struct DerivedMesh;
+struct Object;
+struct DerivedMesh *object_get_derived_final(struct Object *ob, CustomDataMask dataMask);
+
+
+/* SpaceTransform stuff */
+/*
+ * TODO: move this somewhere else
+ *
+ * this structs encapsulates all needed data to convert between 2 coordinate spaces
+ * (where conversion can be represented by a matrix multiplication)
+ *
+ * This is used to reduce the number of arguments to pass to functions that need to perform
+ * this kind of operation and make it easier for the coder, as he/she doenst needs to recode
+ * the matrix calculation.
+ *
+ * A SpaceTransform is initialized using:
+ *   space_transform_setup( &data,  ob1, ob2 )
+ *
+ * After that the following calls can be used:
+ *   space_transform_apply (&data, co); //converts a coordinate in ob1 coords space to the corresponding ob2 coords
+ *   space_transform_invert(&data, co); //converts a coordinate in ob2 coords space to the corresponding ob1 coords
+ *
+ *	//Same Concept as space_transform_apply and space_transform_invert, but no is normalized after conversion
+ *   space_transform_apply_normal (&data, &no);
+ *   space_transform_invert_normal(&data, &no);
+ *
+ */
+struct Object;
+
+typedef struct SpaceTransform
+{
+	float local2target[4][4];
+	float target2local[4][4];
+
+} SpaceTransform;
+
+void space_transform_from_matrixs(SpaceTransform *data, float local[][4], float target[][4]);
+#define space_transform_setup(data, local, target) space_transform_from_matrixs(data, (local)->obmat, (target)->obmat)
+
+void space_transform_apply (const SpaceTransform *data, float *co);
+void space_transform_invert(const SpaceTransform *data, float *co);
+
+void space_transform_apply_normal (const SpaceTransform *data, float *no);
+void space_transform_invert_normal(const SpaceTransform *data, float *no);
+
+/* Shrinkwrap stuff */
+#include "BKE_bvhutils.h"
+
+/*
+ * Shrinkwrap is composed by a set of functions and options that define the type of shrink.
+ *
+ * 3 modes are available:
+ *    - Nearest vertex
+ *	  - Nearest surface
+ *    - Normal projection
+ *
+ * ShrinkwrapCalcData encapsulates all needed data for shrinkwrap functions.
+ * (So that you dont have to pass an enormous ammount of arguments to functions)
+ */
+
+struct Object;
+struct DerivedMesh;
+struct ShrinkwrapModifierData;
+struct BVHTree;
+
+
+typedef struct ShrinkwrapCalcData
+{
+	ShrinkwrapModifierData *smd;	//shrinkwrap modifier data
+
+	struct Object *ob;				//object we are applying shrinkwrap to
+	struct DerivedMesh *original;	//mesh before shrinkwrap
+
+	float (*vertexCos)[3];			//vertexs being shrinkwraped
+	int numVerts;
+
+	struct DerivedMesh *target;		//mesh we are shrinking to	
+	SpaceTransform local2target;	//transform to move bettwem local and target space
+
+	float keepDist;					//Distance to kept from target (units are in local space)
+
+} ShrinkwrapCalcData;
+
+void shrinkwrap_calc_nearest_vertex(ShrinkwrapCalcData *data);
+void shrinkwrap_calc_normal_projection(ShrinkwrapCalcData *data);
+void shrinkwrap_calc_nearest_surface_point(ShrinkwrapCalcData *data);
+
+void shrinkwrapModifier_deform(struct ShrinkwrapModifierData *smd, struct Object *ob, struct DerivedMesh *dm, float (*vertexCos)[3], int numVerts);
+
+/*
+ * This function casts a ray in the given BVHTree.. but it takes into consideration the space_transform, that is:
+ *
+ * if transf was configured with "space_transform_setup( &transf,  ob1, ob2 )"
+ * then the input (vert, dir, BVHTreeRayHit) must be defined in ob1 coordinates space
+ * and the BVHTree must be built in ob2 coordinate space.
+ *
+ * Thus it provides an easy way to cast the same ray across several trees (where each tree was built on its own coords space)
+ */
+int normal_projection_project_vertex(char options, const float *vert, const float *dir, const SpaceTransform *transf, BVHTree *tree, BVHTreeRayHit *hit, BVHTree_RayCastCallback callback, void *userdata);
+
+/*
+ * NULL initializers to local data
+ */
+#define NULL_ShrinkwrapCalcData	{NULL, }
+#define NULL_BVHTreeFromMesh	{NULL, }
+#define NULL_BVHTreeRayHit		{NULL, }
+#define NULL_BVHTreeNearest		{0, }
+
+
+#endif
+
diff --git a/source/blender/blenkernel/BKE_utildefines.h b/source/blender/blenkernel/BKE_utildefines.h
index a96a3e10f40..f389521ffa0 100644
--- a/source/blender/blenkernel/BKE_utildefines.h
+++ b/source/blender/blenkernel/BKE_utildefines.h
@@ -197,8 +197,8 @@
 
 /* Warning-free macros for storing ints in pointers. Use these _only_
  * for storing an int in a pointer, not a pointer in an int (64bit)! */
-#define SET_INT_IN_POINTER(i) ((void*)(long)(i))
-#define GET_INT_FROM_POINTER(i) ((int)(long)(i))
+#define SET_INT_IN_POINTER(i) ((void*)(intptr_t)(i))
+#define GET_INT_FROM_POINTER(i) ((int)(intptr_t)(i))
 
 #endif
 
diff --git a/source/blender/blenkernel/intern/CCGSubSurf.c b/source/blender/blenkernel/intern/CCGSubSurf.c
index 9dcb6b6e7fa..1652b24e1e5 100644
--- a/source/blender/blenkernel/intern/CCGSubSurf.c
+++ b/source/blender/blenkernel/intern/CCGSubSurf.c
@@ -7,6 +7,8 @@
 
 #include "CCGSubSurf.h"
 
+#include "BLO_sys_types.h" // for intptr_t support
+
 /***/
 
 typedef unsigned char	byte;
@@ -35,7 +37,7 @@ typedef struct _EHash {
 #define EHASH_alloc(eh, nb)			((eh)->allocatorIFC.alloc((eh)->allocator, nb))
 #define EHASH_free(eh, ptr)			((eh)->allocatorIFC.free((eh)->allocator, ptr))
 
-#define EHASH_hash(eh, item)	(((unsigned long) (item))%((unsigned int) (eh)->curSize))
+#define EHASH_hash(eh, item)	(((uintptr_t) (item))%((unsigned int) (eh)->curSize))
 
 static EHash *_ehash_new(int estimatedNumEntries, CCGAllocatorIFC *allocatorIFC, CCGAllocatorHDL allocator) {
 	EHash *eh = allocatorIFC->alloc(allocator, sizeof(*eh));
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 67cf89d5ee2..1dabab98a6e 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -79,6 +79,8 @@
 #include "BKE_utildefines.h"
 #include "BKE_particle.h"
 
+#include "BLO_sys_types.h" // for intptr_t support
+
 #ifdef WITH_VERSE
 #include "BKE_verse.h"
 #endif
@@ -479,7 +481,7 @@ static void emDM_foreachMappedEdge(DerivedMesh *dm, void (*func)(void *userData,
 		EditVert *eve;
 
 		for (i=0,eve=emdm->em->verts.first; eve; eve= eve->next)
-			eve->tmp.l = (long) i++;
+			eve->tmp.l = (intptr_t) i++;
 		for(i=0,eed= emdm->em->edges.first; eed; i++,eed= eed->next)
 			func(userData, i, emdm->vertexCos[(int) eed->v1->tmp.l], emdm->vertexCos[(int) eed->v2->tmp.l]);
 	} else {
@@ -497,7 +499,7 @@ static void emDM_drawMappedEdges(DerivedMesh *dm, int (*setDrawOptions)(void *us
 		EditVert *eve;
 
 		for (i=0,eve=emdm->em->verts.first; eve; eve= eve->next)
-			eve->tmp.l = (long) i++;
+			eve->tmp.l = (intptr_t) i++;
 
 		glBegin(GL_LINES);
 		for(i=0,eed= emdm->em->edges.first; eed; i++,eed= eed->next) {
@@ -532,7 +534,7 @@ static void emDM_drawMappedEdgesInterp(DerivedMesh *dm, int (*setDrawOptions)(vo
 		EditVert *eve;
 
 		for (i=0,eve=emdm->em->verts.first; eve; eve= eve->next)
-			eve->tmp.l = (long) i++;
+			eve->tmp.l = (intptr_t) i++;
 
 		glBegin(GL_LINES);
 		for (i=0,eed= emdm->em->edges.first; eed; i++,eed= eed->next) {
@@ -619,7 +621,7 @@ static void emDM_foreachMappedFaceCenter(DerivedMesh *dm, void (*func)(void *use
 
 	if (emdm->vertexCos) {
 		for (i=0,eve=emdm->em->verts.first; eve; eve= eve->next)
-			eve->tmp.l = (long) i++;
+			eve->tmp.l = (intptr_t) i++;
 	}
 
 	for(i=0,efa= emdm->em->faces.first; efa; i++,efa= efa->next) {
@@ -637,7 +639,7 @@ static void emDM_drawMappedFaces(DerivedMesh *dm, int (*setDrawOptions)(void *us
 		EditVert *eve;
 
 		for (i=0,eve=emdm->em->verts.first; eve; eve= eve->next)
-			eve->tmp.l = (long) i++;
+			eve->tmp.l = (intptr_t) i++;
 
 		for (i=0,efa= emdm->em->faces.first; efa; i++,efa= efa->next) {
 			int drawSmooth = (efa->flag & ME_SMOOTH);
@@ -733,7 +735,7 @@ static void emDM_drawFacesTex_common(DerivedMesh *dm,
 		EditVert *eve;
 
 		for (i=0,eve=em->verts.first; eve; eve= eve->next)
-			eve->tmp.l = (long) i++;
+			eve->tmp.l = (intptr_t) i++;
 
 		for (i=0,efa= em->faces.first; efa; i++,efa= efa->next) {
 			MTFace *tf= CustomData_em_get(&em->fdata, efa->data, CD_MTFACE);
@@ -1053,7 +1055,7 @@ void emDM_copyEdgeArray(DerivedMesh *dm, MEdge *edge_r)
 
 	/* store vertex indices in tmp union */
 	for(ev = em->verts.first, i = 0; ev; ev = ev->next, ++i)
-		ev->tmp.l = (long) i;
+		ev->tmp.l = (intptr_t) i;
 
 	for( ; ee; ee = ee->next, ++edge_r) {
 		edge_r->crease = (unsigned char) (ee->crease*255.0f);
@@ -1081,7 +1083,7 @@ void emDM_copyFaceArray(DerivedMesh *dm, MFace *face_r)
 
 	/* store vertexes indices in tmp union */
 	for(ev = em->verts.first, i = 0; ev; ev = ev->next, ++i)
-		ev->tmp.l = (long) i;
+		ev->tmp.l = (intptr_t) i;
 
 	for( ; ef; ef = ef->next, ++face_r) {
 		face_r->mat_nr = ef->mat_nr;
@@ -1168,7 +1170,7 @@ static DerivedMesh *getEditMeshDerivedMesh(EditMesh *em, Object *ob,
 		int i;
 
 		for (i=0,eve=em->verts.first; eve; eve= eve->next)
-			eve->tmp.l = (long) i++;
+			eve->tmp.l = (intptr_t) i++;
 
 		emdm->vertexNos = MEM_callocN(sizeof(*emdm->vertexNos)*i, "emdm_vno");
 		emdm->faceNos = MEM_mallocN(sizeof(*emdm->faceNos)*totface, "emdm_vno");
diff --git a/source/blender/blenkernel/intern/bvhutils.c b/source/blender/blenkernel/intern/bvhutils.c
index 042e2afad53..ae449843d2a 100644
--- a/source/blender/blenkernel/intern/bvhutils.c
+++ b/source/blender/blenkernel/intern/bvhutils.c
@@ -81,7 +81,7 @@ static float sphereray_tri_intersection(const BVHTreeRay *ray, float radius, con
  * Function adapted from David Eberly's distance tools (LGPL)
  * http://www.geometrictools.com/LibFoundation/Distance/Distance.html
  */
-static float nearest_point_in_tri_surface(const float *v0,const float *v1,const float *v2,const float *p, int *v, int *e, float *d, float *nearest )
+static float nearest_point_in_tri_surface(const float *v0,const float *v1,const float *v2,const float *p, int *v, int *e, float *nearest )
 {
 	float diff[3];
 	float e0[3];
@@ -386,7 +386,7 @@ static float nearest_point_in_tri_surface(const float *v0,const float *v1,const
 		VecMulf(y, T);
 		VECADD(z, w, x);
 		VECADD(z, z, y);
-		VECSUB(d, p, z);
+		//VECSUB(d, p, z);
 		VECCOPY(nearest, z);
 		// d = p - ( v0 + S * e0 + T * e1 );
 	}
@@ -418,16 +418,16 @@ static void mesh_faces_nearest_point(void *userdata, int index, const float *co,
 	
 	do
 	{	
-		float nearest_tmp[3], col_normal[3], dist;
+		float nearest_tmp[3], dist;
 		int vertex, edge;
 		
-		dist = nearest_point_in_tri_surface(t0, t1, t2, co, &vertex, &edge, col_normal, nearest_tmp);
+		dist = nearest_point_in_tri_surface(t0, t1, t2, co, &vertex, &edge, nearest_tmp);
 		if(dist < nearest->dist)
 		{
 			nearest->index = index;
 			nearest->dist = dist;
 			VECCOPY(nearest->co, nearest_tmp);
-			VECCOPY(nearest->no, col_normal);
+			CalcNormFloat(t0, t1, t2, nearest->no);
 		}
 
 		t1 = t2;
diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c
index c7817b017ef..dbc94571cad 100644
--- a/source/blender/blenkernel/intern/cloth.c
+++ b/source/blender/blenkernel/intern/cloth.c
@@ -155,7 +155,7 @@ void cloth_init ( ClothModifierData *clmd )
 
 BVHTree *bvhselftree_build_from_cloth (ClothModifierData *clmd, float epsilon)
 {
-	int i;
+	unsigned int i;
 	BVHTree *bvhtree;
 	Cloth *cloth = clmd->clothObject;
 	ClothVertex *verts;
@@ -196,7 +196,7 @@ BVHTree *bvhselftree_build_from_cloth (ClothModifierData *clmd, float epsilon)
 
 BVHTree *bvhtree_build_from_cloth (ClothModifierData *clmd, float epsilon)
 {
-	int i;
+	unsigned int i;
 	BVHTree *bvhtree;
 	Cloth *cloth = clmd->clothObject;
 	ClothVertex *verts;
@@ -782,11 +782,11 @@ static void cloth_to_object (Object *ob,  ClothModifierData *clmd, DerivedMesh *
 /* can be optimized to do all groups in one loop */
 static void cloth_apply_vgroup ( ClothModifierData *clmd, DerivedMesh *dm )
 {
-	unsigned int i = 0;
-	unsigned int j = 0;
+	int i = 0;
+	int j = 0;
 	MDeformVert *dvert = NULL;
 	Cloth *clothObj = NULL;
-	unsigned int numverts = dm->getNumVerts ( dm );
+	int numverts = dm->getNumVerts ( dm );
 	float goalfac = 0;
 	ClothVertex *verts = NULL;
 
@@ -857,7 +857,7 @@ static void cloth_apply_vgroup ( ClothModifierData *clmd, DerivedMesh *dm )
 
 static int cloth_from_object(Object *ob, ClothModifierData *clmd, DerivedMesh *dm, float framenr, int first)
 {
-	unsigned int i = 0;
+	int i = 0;
 	MVert *mvert = NULL;
 	ClothVertex *verts = NULL;
 	float tnull[3] = {0,0,0};
@@ -1082,13 +1082,13 @@ int cloth_build_springs ( ClothModifierData *clmd, DerivedMesh *dm )
 	Cloth *cloth = clmd->clothObject;
 	ClothSpring *spring = NULL, *tspring = NULL, *tspring2 = NULL;
 	unsigned int struct_springs = 0, shear_springs=0, bend_springs = 0;
-	unsigned int i = 0;
-	unsigned int numverts = dm->getNumVerts ( dm );
-	unsigned int numedges = dm->getNumEdges ( dm );
-	unsigned int numfaces = dm->getNumFaces ( dm );
+	int i = 0;
+	int numverts = dm->getNumVerts ( dm );
+	int numedges = dm->getNumEdges ( dm );
+	int numfaces = dm->getNumFaces ( dm );
 	MEdge *medge = CDDM_get_edges ( dm );
 	MFace *mface = CDDM_get_faces ( dm );
-	unsigned int index2 = 0; // our second vertex index
+	int index2 = 0; // our second vertex index
 	LinkNode **edgelist = NULL;
 	EdgeHash *edgehash = NULL;
 	LinkNode *search = NULL, *search2 = NULL;
diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c
index cfcab54058d..b5e09d551f0 100644
--- a/source/blender/blenkernel/intern/collision.c
+++ b/source/blender/blenkernel/intern/collision.c
@@ -31,10 +31,11 @@
 
 #include "BKE_cloth.h"
 
-#include "DNA_group_types.h"
-#include "DNA_object_types.h"
 #include "DNA_cloth_types.h"
+#include "DNA_group_types.h"
 #include "DNA_mesh_types.h"
+#include "DNA_object_types.h"
+#include "DNA_object_force.h"
 #include "DNA_scene_types.h"
 
 #include "BKE_DerivedMesh.h"
@@ -1307,9 +1308,34 @@ CollisionModifierData **get_collisionobjects(Object *self, int *numcollobj)
 	for ( base = G.scene->base.first; base; base = base->next )
 	{
 		coll_ob = base->object;
-		collmd = ( CollisionModifierData * ) modifiers_findByType ( coll_ob, eModifierType_Collision );
-	
-		if ( !collmd )
+		
+		if(coll_ob->pd && coll_ob->pd->deflect)
+		{
+			collmd = ( CollisionModifierData * ) modifiers_findByType ( coll_ob, eModifierType_Collision );
+		}
+		
+		if ( collmd )
+		{
+			if(coll_ob == self)
+				continue;
+			
+			if(numobj >= maxobj)
+			{
+				// realloc
+				int oldmax = maxobj;
+				CollisionModifierData **tmp;
+				maxobj *= 2;
+				tmp = MEM_callocN(sizeof(CollisionModifierData *)*maxobj, "CollisionObjectsArray");
+				memcpy(tmp, objs, sizeof(CollisionModifierData *)*oldmax);
+				MEM_freeN(objs);
+				objs = tmp;
+				
+			}
+			
+			objs[numobj] = collmd;
+			numobj++;
+		}
+		else
 		{
 			if ( coll_ob->dup_group )
 			{
@@ -1319,8 +1345,12 @@ CollisionModifierData **get_collisionobjects(Object *self, int *numcollobj)
 				for ( go= group->gobject.first; go; go= go->next )
 				{
 					coll_ob = go->ob;
-
-					collmd = ( CollisionModifierData * ) modifiers_findByType ( coll_ob, eModifierType_Collision );
+					collmd = NULL;
+					
+					if(coll_ob->pd && coll_ob->pd->deflect)
+					{
+						collmd = ( CollisionModifierData * ) modifiers_findByType ( coll_ob, eModifierType_Collision );
+					}
 
 					if ( !collmd )
 						continue;
@@ -1347,27 +1377,6 @@ CollisionModifierData **get_collisionobjects(Object *self, int *numcollobj)
 					numobj++;
 				}
 			}
-		}
-		else
-		{
-			if(coll_ob == self)
-				continue;
-			
-			if(numobj >= maxobj)
-			{
-				// realloc
-				int oldmax = maxobj;
-				CollisionModifierData **tmp;
-				maxobj *= 2;
-				tmp = MEM_callocN(sizeof(CollisionModifierData *)*maxobj, "CollisionObjectsArray");
-				memcpy(tmp, objs, sizeof(CollisionModifierData *)*oldmax);
-				MEM_freeN(objs);
-				objs = tmp;
-				
-			}
-			
-			objs[numobj] = collmd;
-			numobj++;
 		}	
 	}
 	*numcollobj = numobj;
@@ -1484,6 +1493,9 @@ int cloth_bvh_objcollision ( Object *ob, ClothModifierData * clmd, float step, f
 			BVHTreeOverlap *overlap = NULL;
 			int result = 0;
 			
+			if(!collmd->bvhtree)
+				continue;
+			
 			/* move object to position (step) in time */
 			collision_move_object ( collmd, step + dt, step );
 			
diff --git a/source/blender/blenkernel/intern/deform.c b/source/blender/blenkernel/intern/deform.c
index ab53571b62d..3143c5e4df2 100644
--- a/source/blender/blenkernel/intern/deform.c
+++ b/source/blender/blenkernel/intern/deform.c
@@ -220,3 +220,31 @@ void unique_vertexgroup_name (bDeformGroup *dg, Object *ob)
 		}
 	}	
 }
+
+float deformvert_get_weight(const struct MDeformVert *dvert, int group_num)
+{
+	if(dvert)
+	{
+		const MDeformWeight *dw = dvert->dw;
+		int i;
+
+		for(i=dvert->totweight; i>0; i--, dw++)
+			if(dw->def_nr == group_num)
+				return dw->weight;
+	}
+
+	/* Not found */
+	return 0.0;
+}
+
+float vertexgroup_get_vertex_weight(const struct MDeformVert *dvert, int index, int group_num)
+{
+	if(group_num == -1)
+		return 1.0;
+
+	if(dvert == 0)
+		return 0.0;
+
+	return deformvert_get_weight(dvert+index, group_num);
+}
+
diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c
index 298e4b81d5b..3b79f6689c0 100644
--- a/source/blender/blenkernel/intern/displist.c
+++ b/source/blender/blenkernel/intern/displist.c
@@ -88,6 +88,8 @@
 #include "RE_pipeline.h"
 #include "RE_shader_ext.h"
 
+#include "BLO_sys_types.h" // for intptr_t support
+
 
 static void boundbox_displist(Object *ob);
 
@@ -986,9 +988,9 @@ void filldisplist(ListBase *dispbase, ListBase *to)
 				efa= fillfacebase.first;
 				index= dlnew->index;
 				while(efa) {
-					index[0]= (long)efa->v1->tmp.l;
-					index[1]= (long)efa->v2->tmp.l;
-					index[2]= (long)efa->v3->tmp.l;
+					index[0]= (intptr_t)efa->v1->tmp.l;
+					index[1]= (intptr_t)efa->v2->tmp.l;
+					index[2]= (intptr_t)efa->v3->tmp.l;
 					
 					index+= 3;
 					efa= efa->next;
diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c
index 4588ef800e1..72f70cf17ff 100644
--- a/source/blender/blenkernel/intern/effect.c
+++ b/source/blender/blenkernel/intern/effect.c
@@ -59,6 +59,7 @@
 #include "BKE_armature.h"
 #include "BKE_bad_level_calls.h"
 #include "BKE_blender.h"
+#include "BKE_collision.h"
 #include "BKE_constraint.h"
 #include "BKE_deform.h"
 #include "BKE_depsgraph.h"
@@ -157,6 +158,13 @@ static void add_to_effectorcache(ListBase *lb, Object *ob, Object *obsrc)
 		}
 	}
 	else if(pd->forcefield) {
+		
+		if(pd->forcefield == PFIELD_WIND)
+		{
+			pd->rng = rng_new(1);
+			rng_srandom(pd->rng, (unsigned int)(ceil(PIL_check_seconds_timer()))); // use better seed
+		}
+	
 		ec= MEM_callocN(sizeof(pEffectorCache), "effector cache");
 		ec->ob= ob;
 		BLI_addtail(lb, ec);
@@ -205,13 +213,288 @@ void pdEndEffectors(ListBase *lb)
 		pEffectorCache *ec;
 		/* restore full copy */
 		for(ec= lb->first; ec; ec= ec->next)
+		{
+			if(ec->ob->pd && (ec->ob->pd->forcefield == PFIELD_WIND))
+				rng_free(ec->ob->pd->rng);
+			
 			*(ec->ob)= ec->obcopy;
+		}
 
 		BLI_freelistN(lb);
 	}
 }
 
 
+/************************************************/
+/*			Effectors		*/
+/************************************************/
+
+// triangle - ray callback function
+static void eff_tri_ray_hit(void *userdata, int index, const BVHTreeRay *ray, BVHTreeRayHit *hit)
+{	
+	// whenever we hit a bounding box, we don't check further
+	hit->dist = -1;
+	hit->index = 1;
+}
+
+// get visibility of a wind ray
+static float eff_calc_visibility(Object *ob, float *co, float *dir)
+{
+	CollisionModifierData **collobjs = NULL;
+	int numcollobj = 0, i;
+	float norm[3], len = 0.0;
+	float visibility = 1.0;
+	
+	collobjs = get_collisionobjects(ob, &numcollobj);
+	
+	if(!collobjs)
+		return 0;
+	
+	VECCOPY(norm, dir);
+	VecMulf(norm, -1.0);
+	len = Normalize(norm);
+	
+	// check all collision objects
+	for(i = 0; i < numcollobj; i++)
+	{
+		CollisionModifierData *collmd = collobjs[i];
+		
+		if(collmd->bvhtree)
+		{
+			BVHTreeRayHit hit;
+			
+			hit.index = -1;
+			hit.dist = len + FLT_EPSILON;
+			
+			// check if the way is blocked
+			if(BLI_bvhtree_ray_cast(collmd->bvhtree, co, norm, &hit, eff_tri_ray_hit, NULL)>=0)
+			{
+				// visibility is only between 0 and 1, calculated from 1-absorption
+				visibility *= MAX2(0.0, MIN2(1.0, (1.0-((float)collmd->absorption)*0.01)));
+				
+				if(visibility <= 0.0f)
+					break;
+			}
+		}
+	}
+	
+	MEM_freeN(collobjs);
+	
+	return visibility;
+}
+
+// noise function for wind e.g.
+static float wind_func(struct RNG *rng, float strength)
+{
+	int random = (rng_getInt(rng)+1) % 65535; // max 2357
+	float force = rng_getFloat(rng) + 1.0f;
+	float ret;
+	float sign = 0;
+	
+	sign = (random > 32000.0) ? 1.0: -1.0; // dividing by 2 is not giving equal sign distribution
+	
+	ret = sign*((float)random / force)*strength/65535.0f;
+	
+	return ret;
+}
+
+
+static float falloff_func(float fac, int usemin, float mindist, int usemax, float maxdist, float power)
+{
+	if(!usemin)
+		mindist= 0.0f;
+
+	if(fac < mindist) {
+		return 1.0f;
+	}
+	else if(usemax) {
+		if(fac>maxdist || (maxdist-mindist)<=0.0f)
+			return 0.0f;
+
+		fac= (fac-mindist)/(maxdist-mindist);
+		return 1.0f - (float)pow((double)fac, (double)power);
+	}
+	else
+		return pow((double)1.0f+fac-mindist, (double)-power);
+}
+
+static float falloff_func_dist(PartDeflect *pd, float fac)
+{
+	return falloff_func(fac, pd->flag&PFIELD_USEMIN, pd->mindist, pd->flag&PFIELD_USEMAX, pd->maxdist, pd->f_power);
+}
+
+static float falloff_func_rad(PartDeflect *pd, float fac)
+{
+	return falloff_func(fac, pd->flag&PFIELD_USEMINR, pd->minrad, pd->flag&PFIELD_USEMAXR, pd->maxrad, pd->f_power_r);
+}
+
+float effector_falloff(PartDeflect *pd, float *eff_velocity, float *vec_to_part)
+{
+	float eff_dir[3], temp[3];
+	float falloff=1.0, fac, r_fac;
+
+	if(pd->forcefield==PFIELD_LENNARDJ)
+		return falloff; /* Lennard-Jones field has it's own falloff built in */
+
+	VecCopyf(eff_dir,eff_velocity);
+	Normalize(eff_dir);
+
+	if(pd->flag & PFIELD_POSZ && Inpf(eff_dir,vec_to_part)<0.0f)
+		falloff=0.0f;
+	else switch(pd->falloff){
+		case PFIELD_FALL_SPHERE:
+			fac=VecLength(vec_to_part);
+			falloff= falloff_func_dist(pd, fac);
+			break;
+
+		case PFIELD_FALL_TUBE:
+			fac=Inpf(vec_to_part,eff_dir);
+			falloff= falloff_func_dist(pd, ABS(fac));
+			if(falloff == 0.0f)
+				break;
+
+			VECADDFAC(temp,vec_to_part,eff_dir,-fac);
+			r_fac=VecLength(temp);
+			falloff*= falloff_func_rad(pd, r_fac);
+			break;
+		case PFIELD_FALL_CONE:
+			fac=Inpf(vec_to_part,eff_dir);
+			falloff= falloff_func_dist(pd, ABS(fac));
+			if(falloff == 0.0f)
+				break;
+
+			r_fac=saacos(fac/VecLength(vec_to_part))*180.0f/(float)M_PI;
+			falloff*= falloff_func_rad(pd, r_fac);
+
+			break;
+	}
+
+	return falloff;
+}
+
+void do_physical_effector(Object *ob, float *opco, short type, float force_val, float distance, float falloff, float size, float damp, float *eff_velocity, float *vec_to_part, float *velocity, float *field, int planar, struct RNG *rng, float noise_factor, float charge, float pa_size)
+{
+	float mag_vec[3]={0,0,0};
+	float temp[3], temp2[3];
+	float eff_vel[3];
+	float noise = 0, visibility;
+	
+	// calculate visibility
+	visibility = eff_calc_visibility(ob, opco, vec_to_part);
+	if(visibility <= 0.0)
+		return;
+	falloff *= visibility;
+
+	VecCopyf(eff_vel,eff_velocity);
+	Normalize(eff_vel);
+
+	switch(type){
+		case PFIELD_WIND:
+			VECCOPY(mag_vec,eff_vel);
+			
+			// add wind noise here, only if we have wind
+			if((noise_factor > 0.0f) && (force_val > FLT_EPSILON))
+				noise = wind_func(rng, noise_factor);
+			
+			VecMulf(mag_vec,(force_val+noise)*falloff);
+			VecAddf(field,field,mag_vec);
+			break;
+
+		case PFIELD_FORCE:
+			if(planar)
+				Projf(mag_vec,vec_to_part,eff_vel);
+			else
+				VecCopyf(mag_vec,vec_to_part);
+
+			Normalize(mag_vec);
+
+			VecMulf(mag_vec,force_val*falloff);
+			VecAddf(field,field,mag_vec);
+			break;
+
+		case PFIELD_VORTEX:
+			Crossf(mag_vec,eff_vel,vec_to_part);
+
+			Normalize(mag_vec);
+
+			VecMulf(mag_vec,force_val*distance*falloff);
+			VecAddf(field,field,mag_vec);
+
+			break;
+		case PFIELD_MAGNET:
+			if(planar)
+				VecCopyf(temp,eff_vel);
+			else
+				/* magnetic field of a moving charge */
+				Crossf(temp,eff_vel,vec_to_part);
+
+			Normalize(temp);
+
+			Crossf(temp2,velocity,temp);
+			VecAddf(mag_vec,mag_vec,temp2);
+
+			VecMulf(mag_vec,force_val*falloff);
+			VecAddf(field,field,mag_vec);
+			break;
+		case PFIELD_HARMONIC:
+			if(planar)
+				Projf(mag_vec,vec_to_part,eff_vel);
+			else
+				VecCopyf(mag_vec,vec_to_part);
+
+			Normalize(mag_vec);
+
+			VecMulf(mag_vec,force_val*falloff);
+			VecSubf(field,field,mag_vec);
+
+			VecCopyf(mag_vec,velocity);
+			/* 1.9 is an experimental value to get critical damping at damp=1.0 */
+			VecMulf(mag_vec,damp*1.9f*(float)sqrt(force_val));
+			VecSubf(field,field,mag_vec);
+			break;
+		case PFIELD_CHARGE:
+			if(planar)
+				Projf(mag_vec,vec_to_part,eff_vel);
+			else
+				VecCopyf(mag_vec,vec_to_part);
+
+			Normalize(mag_vec);
+
+			VecMulf(mag_vec,charge*force_val*falloff);
+			VecAddf(field,field,mag_vec);
+			break;
+		case PFIELD_LENNARDJ:
+		{
+			float fac;
+
+			if(planar) {
+				Projf(mag_vec,vec_to_part,eff_vel);
+				distance = VecLength(mag_vec);
+			}
+			else
+				VecCopyf(mag_vec,vec_to_part);
+
+			/* at this distance the field is 60 times weaker than maximum */
+			if(distance > 2.22 * (size+pa_size))
+				break;
+
+			fac = pow((size+pa_size)/distance,6.0);
+			
+			fac = - fac * (1.0 - fac) / distance;
+
+			/* limit the repulsive term drastically to avoid huge forces */
+			fac = ((fac>2.0) ? 2.0 : fac);
+
+			/* 0.003715 is the fac value at 2.22 times (size+pa_size),
+			   substracted to avoid discontinuity at the border
+			*/
+			VecMulf(mag_vec, force_val * (fac-0.0037315));
+			VecAddf(field,field,mag_vec);
+			break;
+		}
+	}
+}
+
 /*  -------- pdDoEffectors() --------
     generic force/speed system, now used for particles and softbodies
 	lb			= listbase with objects that take part in effecting
@@ -244,13 +527,10 @@ void pdDoEffectors(ListBase *lb, float *opco, float *force, float *speed, float
 	pEffectorCache *ec;
 	PartDeflect *pd;
 	float vect_to_vert[3];
-	float f_force, force_vec[3];
 	float *obloc;
-	float distance, force_val, ffall_val;
-	float guidecollect[3], guidedist= 0.0f;
-	int cur_frame;
 	
-	guidecollect[0]= guidecollect[1]= guidecollect[2]=0.0f;
+	float distance, vec_to_part[3];
+	float falloff;
 
 	/* Cycle through collected objects, get total of (1/(gravity_strength * dist^gravity_power)) */
 	/* Check for min distance here? (yes would be cool to add that, ton) */
@@ -261,178 +541,28 @@ void pdDoEffectors(ListBase *lb, float *opco, float *force, float *speed, float
 		pd= ob->pd;
 			
 		/* Get IPO force strength and fall off values here */
-		if (has_ipo_code(ob->ipo, OB_PD_FSTR))
-			force_val = IPO_GetFloatValue(ob->ipo, OB_PD_FSTR, cur_time);
-		else 
-			force_val = pd->f_strength;
-		
-		if (has_ipo_code(ob->ipo, OB_PD_FFALL)) 
-			ffall_val = IPO_GetFloatValue(ob->ipo, OB_PD_FFALL, cur_time);
-		else 
-			ffall_val = pd->f_power;
-			
-		/* Need to set r.cfra for paths (investigate, ton) (uses ob->ctime now, ton) */
-		if(ob->ctime!=cur_time) {
-			cur_frame = G.scene->r.cfra;
-			G.scene->r.cfra = (int)cur_time;
-			where_is_object_time(ob, cur_time);
-			G.scene->r.cfra = cur_frame;
-		}
+		where_is_object_time(ob,cur_time);
 			
 		/* use center of object for distance calculus */
-		obloc= ob->obmat[3];
-		VECSUB(vect_to_vert, obloc, opco);
-		distance = VecLength(vect_to_vert);
-			
-		if((pd->flag & PFIELD_USEMAX) && distance>pd->maxdist && pd->forcefield != PFIELD_GUIDE)
+		VecSubf(vec_to_part, opco, ob->obmat[3]);
+		distance = VecLength(vec_to_part);
+
+		falloff=effector_falloff(pd,ob->obmat[2],vec_to_part);		
+		
+		if(falloff<=0.0f)
 			;	/* don't do anything */
-		else if((pd->flag & PFIELD_USEMIN) && distance<pd->mindist && pd->forcefield != PFIELD_GUIDE)
-			;	/* don't do anything */
-		else if(pd->forcefield == PFIELD_WIND) {
-			VECCOPY(force_vec, ob->obmat[2]);
+		else {
+			float field[3]={0,0,0}, tmp[3];
+			VECCOPY(field, force);
+			do_physical_effector(ob, opco, pd->forcefield,pd->f_strength,distance,
+								falloff,pd->f_dist,pd->f_damp,ob->obmat[2],vec_to_part,
+								speed,force,pd->flag&PFIELD_PLANAR, pd->rng, pd->f_noise, 0.0f, 0.0f);
 			
-			/* wind works harder perpendicular to normal, would be nice for softbody later (ton) */
-			
-			/* Limit minimum distance to vertex so that */
-			/* the force is not too big */
-			if (distance < 0.001) distance = 0.001f;
-			f_force = (force_val)*(1/(1000 * (float)pow((double)distance, (double)ffall_val)));
-			/* this option for softbody only */
-			if(flags && PE_WIND_AS_SPEED){
-				speed[0] -= (force_vec[0] * f_force );
-				speed[1] -= (force_vec[1] * f_force );
-				speed[2] -= (force_vec[2] * f_force );
-			}
-			else{
-				force[0] += force_vec[0]*f_force;
-				force[1] += force_vec[1]*f_force;
-				force[2] += force_vec[2]*f_force;
+			// for softbody backward compatibility
+			if(flags & PE_WIND_AS_SPEED){
+				VECSUB(tmp, force, field);
+				VECSUB(speed, speed, tmp);
 			}
 		}
-		else if(pd->forcefield == PFIELD_FORCE) {
-			
-			/* only use center of object */
-			obloc= ob->obmat[3];
-
-			/* Now calculate the gravitational force */
-			VECSUB(vect_to_vert, obloc, opco);
-			distance = VecLength(vect_to_vert);
-
-			/* Limit minimum distance to vertex so that */
-			/* the force is not too big */
-			if (distance < 0.001) distance = 0.001f;
-			f_force = (force_val)*(1.0/(1000.0 * (float)pow((double)distance, (double)ffall_val)));
-			force[0] += (vect_to_vert[0] * f_force );
-			force[1] += (vect_to_vert[1] * f_force );
-			force[2] += (vect_to_vert[2] * f_force );
-		}
-		else if(pd->forcefield == PFIELD_VORTEX) {
-			float vortexvec[3];
-			
-			/* only use center of object */
-			obloc= ob->obmat[3];
-
-			/* Now calculate the vortex force */
-			VECSUB(vect_to_vert, obloc, opco);
-			distance = VecLength(vect_to_vert);
-
-			Crossf(force_vec, ob->obmat[2], vect_to_vert);
-			Normalize(force_vec);
-
-			/* Limit minimum distance to vertex so that */
-			/* the force is not too big */
-			if (distance < 0.001) distance = 0.001f;
-			f_force = (force_val)*(1.0/(100.0 * (float)pow((double)distance, (double)ffall_val)));
-			vortexvec[0]= -(force_vec[0] * f_force );
-			vortexvec[1]= -(force_vec[1] * f_force );
-			vortexvec[2]= -(force_vec[2] * f_force );
-			
-			/* this option for softbody only */
-			if(flags &&PE_WIND_AS_SPEED) {
-				speed[0]+= vortexvec[0];
-				speed[1]+= vortexvec[1];
-				speed[2]+= vortexvec[2];
-			}
-			else {
-				/* since vortex alters the speed, we have to correct for the previous vortex result */
-				speed[0]+= vortexvec[0] - ec->oldspeed[0];
-				speed[1]+= vortexvec[1] - ec->oldspeed[1];
-				speed[2]+= vortexvec[2] - ec->oldspeed[2];
-				
-				VECCOPY(ec->oldspeed, vortexvec);
-			}
-		}
-		else if(pd->forcefield == PFIELD_GUIDE) {
-			float guidevec[4], guidedir[3];
-			float mindist= force_val; /* force_val is actually mindist in the UI */
-			
-			distance= ec->guide_dist;
-			
-			/* WARNING: bails out with continue here */
-			if((pd->flag & PFIELD_USEMAX) && distance>pd->maxdist) continue;
-			
-			/* calculate contribution factor for this guide */
-			if(distance<=mindist) f_force= 1.0f;
-			else if(pd->flag & PFIELD_USEMAX) {
-				if(distance>pd->maxdist || mindist>=pd->maxdist) f_force= 0.0f;
-				else {
-					f_force= 1.0f - (distance-mindist)/(pd->maxdist - mindist);
-					if(ffall_val!=0.0f)
-						f_force = (float)pow(f_force, ffall_val+1.0);
-				}
-			}
-			else {
-				f_force= 1.0f/(1.0f + distance-mindist);
-				if(ffall_val!=0.0f)
-					f_force = (float)pow(f_force, ffall_val+1.0);
-			}
-			
-			/* now derive path point from loc_time */
-			if(pd->flag & PFIELD_GUIDE_PATH_ADD)
-				where_on_path(ob, f_force*loc_time*ec->time_scale, guidevec, guidedir);
-			else
-				where_on_path(ob, loc_time*ec->time_scale, guidevec, guidedir);
-			
-			VECSUB(guidedir, guidevec, ec->oldloc);
-			VECCOPY(ec->oldloc, guidevec);
-			
-			Mat4Mul3Vecfl(ob->obmat, guidedir);
-			VecMulf(guidedir, ec->scale);	/* correction for lifetime and speed */
-			
-			/* we subtract the speed we gave it previous step */
-			VECCOPY(guidevec, guidedir);
-			VECSUB(guidedir, guidedir, ec->oldspeed);
-			VECCOPY(ec->oldspeed, guidevec);
-			
-			/* if it fully contributes, we stop */
-			if(f_force==1.0) {
-				VECCOPY(guidecollect, guidedir);
-				guidedist= 1.0f;
-				break;
-			}
-			else if(guidedist<1.0f) {
-				VecMulf(guidedir, f_force);
-				VECADD(guidecollect, guidecollect, guidedir);
-				guidedist += f_force;
-			}					
-		}
-	}
-
-	/* all guides are accumulated here */
-	if(guidedist!=0.0f) {
-		if(guidedist!=1.0f) VecMulf(guidecollect, 1.0f/guidedist);
-		VECADD(speed, speed, guidecollect);
 	}
 }
-
-
-/* for paf start to end, store all matrices for objects */
-typedef struct pMatrixCache {
-	float obmat[4][4];
-	float imat[3][3];
-} pMatrixCache;
-
-/* for fluidsim win32 debug messages */
-#if defined(WIN32) && (!(defined snprintf))
-#define snprintf _snprintf
-#endif
diff --git a/source/blender/blenkernel/intern/icons.c b/source/blender/blenkernel/intern/icons.c
index cab7865c1b6..b9e3c593ddf 100644
--- a/source/blender/blenkernel/intern/icons.c
+++ b/source/blender/blenkernel/intern/icons.c
@@ -50,6 +50,8 @@
 #include "BKE_icons.h"
 #include "BKE_utildefines.h"
 
+#include "BLO_sys_types.h" // for intptr_t support
+
 #define GS(a)	(*((short *)(a)))
 
 /* GLOBALS */
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index b6c8ad59e08..07537e3a81c 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -86,6 +86,8 @@
 #include "blendef.h"
 #include "BSE_time.h"
 
+#include "BLO_sys_types.h" // for intptr_t support
+
 /* max int, to indicate we don't store sequences in ibuf */
 #define IMA_NO_INDEX	0x7FEFEFEF
 
@@ -630,11 +632,11 @@ void free_old_images()
 	}
 }
 
-static unsigned long image_mem_size(Image *ima)
+static uintptr_t image_mem_size(Image *ima)
 {
 	ImBuf *ibuf, *ibufm;
 	int level;
-	unsigned long size = 0;
+	uintptr_t size = 0;
 
 	size= 0;
 	for(ibuf= ima->ibufs.first; ibuf; ibuf= ibuf->next) {
@@ -656,7 +658,7 @@ static unsigned long image_mem_size(Image *ima)
 void BKE_image_print_memlist(void)
 {
 	Image *ima;
-	unsigned long size, totsize= 0;
+	uintptr_t size, totsize= 0;
 
 	for(ima= G.main->image.first; ima; ima= ima->id.next)
 		totsize += image_mem_size(ima);
diff --git a/source/blender/blenkernel/intern/implicit.c b/source/blender/blenkernel/intern/implicit.c
index 297ac0b1530..93e35a4db06 100644
--- a/source/blender/blenkernel/intern/implicit.c
+++ b/source/blender/blenkernel/intern/implicit.c
@@ -1354,25 +1354,57 @@ DO_INLINE void cloth_apply_spring_force(ClothModifierData *clmd, ClothSpring *s,
 	}	
 }
 
+
+static void CalcFloat( float *v1, float *v2, float *v3, float *n)
+{
+	float n1[3],n2[3];
+
+	n1[0]= v1[0]-v2[0];
+	n2[0]= v2[0]-v3[0];
+	n1[1]= v1[1]-v2[1];
+	n2[1]= v2[1]-v3[1];
+	n1[2]= v1[2]-v2[2];
+	n2[2]= v2[2]-v3[2];
+	n[0]= n1[1]*n2[2]-n1[2]*n2[1];
+	n[1]= n1[2]*n2[0]-n1[0]*n2[2];
+	n[2]= n1[0]*n2[1]-n1[1]*n2[0];
+}
+
+static void CalcFloat4( float *v1, float *v2, float *v3, float *v4, float *n)
+{
+	/* real cross! */
+	float n1[3],n2[3];
+
+	n1[0]= v1[0]-v3[0];
+	n1[1]= v1[1]-v3[1];
+	n1[2]= v1[2]-v3[2];
+
+	n2[0]= v2[0]-v4[0];
+	n2[1]= v2[1]-v4[1];
+	n2[2]= v2[2]-v4[2];
+
+	n[0]= n1[1]*n2[2]-n1[2]*n2[1];
+	n[1]= n1[2]*n2[0]-n1[0]*n2[2];
+	n[2]= n1[0]*n2[1]-n1[1]*n2[0];
+}
+
 float calculateVertexWindForce(float wind[3], float vertexnormal[3])  
 {
-	return fabs(INPR(wind, vertexnormal));
+	return (INPR(wind, vertexnormal));
 }
 
 void cloth_calc_force(ClothModifierData *clmd, lfVector *lF, lfVector *lX, lfVector *lV, fmatrix3x3 *dFdV, fmatrix3x3 *dFdX, ListBase *effectors, float time, fmatrix3x3 *M)
 {
 	/* Collect forces and derivatives:  F,dFdX,dFdV */
 	Cloth 		*cloth 		= clmd->clothObject;
-	long		i 		= 0;
+	int		i 		= 0;
 	float 		spring_air 	= clmd->sim_parms->Cvi * 0.01f; /* viscosity of air scaled in percent */
 	float 		gravity[3];
 	float 		tm2[3][3] 	= {{-spring_air,0,0}, {0,-spring_air,0},{0,0,-spring_air}};
 	MFace 		*mfaces 	= cloth->mfaces;
-	//ClothVertex 	*verts		= cloth->verts;
-	float wind_normalized[3];
 	unsigned int numverts = cloth->numverts;
 	LinkNode *search = cloth->springs;
-
+	lfVector *winvec;
 
 	VECCOPY(gravity, clmd->sim_parms->gravity);
 	mul_fvector_S(gravity, gravity, 0.001f); /* scale gravity force */
@@ -1387,7 +1419,7 @@ void cloth_calc_force(ClothModifierData *clmd, lfVector *lF, lfVector *lX, lfVec
 	/* multiply lF with mass matrix
 	// force = mass * acceleration (in this case: gravity)
 	*/
-	for(i = 0; i < (long)numverts; i++)
+	for(i = 0; i < numverts; i++)
 	{
 		float temp[3];
 		VECCOPY(temp, lF[i]);
@@ -1399,70 +1431,61 @@ void cloth_calc_force(ClothModifierData *clmd, lfVector *lF, lfVector *lX, lfVec
 	/* handle external forces like wind */
 	if(effectors)
 	{	
+		// 0 = force, 1 = normalized force
+		winvec = create_lfvector(cloth->numverts);
+		
+		if(!winvec)
+			printf("winvec: out of memory in implicit.c\n");
+		
+		// precalculate wind forces
+		for(i = 0; i < cloth->numverts; i++)
+		{
+			float speed[3] = {0.0f, 0.0f,0.0f};
+			
+			pdDoEffectors(effectors, lX[i], winvec[i], speed, (float)G.scene->r.cfra, 0.0f, 0);
+		}
+		
 		for(i = 0; i < cloth->numfaces; i++)
 		{
-			float vertexnormal[3]={0,0,0};
-			float speed[3] = {0.0f, 0.0f,0.0f};
-			float force[3]= {0.0f, 0.0f, 0.0f};
+			float trinormal[3]={0,0,0}; // normalized triangle normal
+			float triunnormal[3]={0,0,0}; // not-normalized-triangle normal
+			float tmp[3]={0,0,0};
+			float factor = (mfaces[i].v4) ? 0.25 : 1.0 / 3.0;
+			factor *= 0.02;
 			
+			// calculate face normal
 			if(mfaces[i].v4)
-				CalcNormFloat4(lX[mfaces[i].v1],lX[mfaces[i].v2],lX[mfaces[i].v3],lX[mfaces[i].v4],vertexnormal);
+				CalcFloat4(lX[mfaces[i].v1],lX[mfaces[i].v2],lX[mfaces[i].v3],lX[mfaces[i].v4],triunnormal);
 			else
-				CalcNormFloat(lX[mfaces[i].v1],lX[mfaces[i].v2],lX[mfaces[i].v3],vertexnormal);
+				CalcFloat(lX[mfaces[i].v1],lX[mfaces[i].v2],lX[mfaces[i].v3],triunnormal);
 			
-			pdDoEffectors(effectors, lX[mfaces[i].v1], force, speed, (float)G.scene->r.cfra, 0.0f, PE_WIND_AS_SPEED);
-			VECCOPY(wind_normalized, speed);
-			Normalize(wind_normalized);
-			VecMulf(wind_normalized, -calculateVertexWindForce(speed, vertexnormal));
+			VECCOPY(trinormal, triunnormal);
+			Normalize(trinormal);
 			
+			// add wind from v1
+			VECCOPY(tmp, trinormal);
+			VecMulf(tmp, calculateVertexWindForce(winvec[mfaces[i].v1], triunnormal));
+			VECADDS(lF[mfaces[i].v1], lF[mfaces[i].v1], tmp, factor);
+			
+			// add wind from v2
+			VECCOPY(tmp, trinormal);
+			VecMulf(tmp, calculateVertexWindForce(winvec[mfaces[i].v2], triunnormal));
+			VECADDS(lF[mfaces[i].v2], lF[mfaces[i].v2], tmp, factor);
+			
+			// add wind from v3
+			VECCOPY(tmp, trinormal);
+			VecMulf(tmp, calculateVertexWindForce(winvec[mfaces[i].v3], triunnormal));
+			VECADDS(lF[mfaces[i].v3], lF[mfaces[i].v3], tmp, factor);
+			
+			// add wind from v4
 			if(mfaces[i].v4)
 			{
-				VECADDS(lF[mfaces[i].v1], lF[mfaces[i].v1], wind_normalized, 0.25);
+				VECCOPY(tmp, trinormal);
+				VecMulf(tmp, calculateVertexWindForce(winvec[mfaces[i].v4], triunnormal));
+				VECADDS(lF[mfaces[i].v4], lF[mfaces[i].v4], tmp, factor);
 			}
-			else
-			{
-				VECADDS(lF[mfaces[i].v1], lF[mfaces[i].v1], wind_normalized, 1.0 / 3.0);
-			}
-			
-			speed[0] = speed[1] = speed[2] = 0.0;
-			pdDoEffectors(effectors, lX[mfaces[i].v2], force, speed, (float)G.scene->r.cfra, 0.0f, PE_WIND_AS_SPEED);
-			VECCOPY(wind_normalized, speed);
-			Normalize(wind_normalized);
-			VecMulf(wind_normalized, -calculateVertexWindForce(speed, vertexnormal));
-			if(mfaces[i].v4)
-			{
-				VECADDS(lF[mfaces[i].v2], lF[mfaces[i].v2], wind_normalized, 0.25);
-			}
-			else
-			{
-				VECADDS(lF[mfaces[i].v2], lF[mfaces[i].v2], wind_normalized, 1.0 / 3.0);
-			}
-			
-			speed[0] = speed[1] = speed[2] = 0.0;
-			pdDoEffectors(effectors, lX[mfaces[i].v3], force, speed, (float)G.scene->r.cfra, 0.0f, PE_WIND_AS_SPEED);
-			VECCOPY(wind_normalized, speed);
-			Normalize(wind_normalized);
-			VecMulf(wind_normalized, -calculateVertexWindForce(speed, vertexnormal));
-			if(mfaces[i].v4)
-			{
-				VECADDS(lF[mfaces[i].v3], lF[mfaces[i].v3], wind_normalized, 0.25);
-			}
-			else
-			{
-				VECADDS(lF[mfaces[i].v3], lF[mfaces[i].v3], wind_normalized, 1.0 / 3.0);
-			}
-			
-			speed[0] = speed[1] = speed[2] = 0.0;
-			if(mfaces[i].v4)
-			{
-				pdDoEffectors(effectors, lX[mfaces[i].v4], force, speed, (float)G.scene->r.cfra, 0.0f, PE_WIND_AS_SPEED);
-				VECCOPY(wind_normalized, speed);
-				Normalize(wind_normalized);
-				VecMulf(wind_normalized, -calculateVertexWindForce(speed, vertexnormal));
-				VECADDS(lF[mfaces[i].v4], lF[mfaces[i].v4], wind_normalized, 0.25);
-			}
-			
 		}
+		del_lfvector(winvec);
 	}
 		
 	// calculate spring forces
diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c
index 59eb3837aab..4af25ee99e7 100644
--- a/source/blender/blenkernel/intern/ipo.c
+++ b/source/blender/blenkernel/intern/ipo.c
@@ -182,7 +182,7 @@ int part_ar[PART_TOTIPO]= {
 	PART_EMIT_FREQ, PART_EMIT_LIFE, PART_EMIT_VEL, PART_EMIT_AVE, PART_EMIT_SIZE,
 	PART_AVE, PART_SIZE, PART_DRAG, PART_BROWN, PART_DAMP, PART_LENGTH, PART_CLUMP,
     PART_GRAV_X, PART_GRAV_Y, PART_GRAV_Z, PART_KINK_AMP, PART_KINK_FREQ, PART_KINK_SHAPE,
-	PART_BB_TILT
+	PART_BB_TILT, PART_PD_FSTR, PART_PD_FFALL, PART_PD_FMAXD, PART_PD2_FSTR, PART_PD2_FFALL, PART_PD2_FMAXD
 };
 
 
@@ -1608,6 +1608,18 @@ void *get_ipo_poin(ID *id, IpoCurve *icu, int *type)
 			poin= &(part->kink_shape); break;
 		case PART_BB_TILT:
 			poin= &(part->bb_tilt); break;
+		case PART_PD_FSTR:
+			poin= (part->pd?(&(part->pd->f_strength)):NULL); break;
+		case PART_PD_FFALL:
+			poin= (part->pd?(&(part->pd->f_power)):NULL); break;
+		case PART_PD_FMAXD:
+			poin= (part->pd?(&(part->pd->maxdist)):NULL); break;
+		case PART_PD2_FSTR:
+			poin= (part->pd2?(&(part->pd2->f_strength)):NULL); break;
+		case PART_PD2_FFALL:
+			poin= (part->pd2?(&(part->pd2->f_power)):NULL); break;
+		case PART_PD2_FMAXD:
+			poin= (part->pd2?(&(part->pd2->maxdist)):NULL); break;
 		}
 	}
 
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index 1dc76296c28..4c74fe1cca2 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -101,6 +101,8 @@
 #include "BKE_utildefines.h"
 #include "depsgraph_private.h"
 #include "BKE_bmesh.h"
+#include "BKE_deform.h"
+#include "BKE_shrinkwrap.h"
 
 #include "LOD_DependKludge.h"
 #include "LOD_decimation.h"
@@ -5493,7 +5495,7 @@ static void collisionModifier_deformVerts(
 		
 		numverts = dm->getNumVerts ( dm );
 		
-		if(current_time > collmd->time)
+		if((current_time > collmd->time)|| (BKE_ptcache_get_continue_physics()))
 		{	
 			// check if mesh has changed
 			if(collmd->x && (numverts != collmd->numverts))
@@ -6120,22 +6122,6 @@ CustomDataMask explodeModifier_requiredDataMask(ModifierData *md)
 	return dataMask;
 }
 
-/* this should really be put somewhere permanently */
-static float vert_weight(MDeformVert *dvert, int group)
-{
-	MDeformWeight *dw;
-	int i;
-	
-	if(dvert) {
-		dw= dvert->dw;
-		for(i= dvert->totweight; i>0; i--, dw++) {
-			if(dw->def_nr == group) return dw->weight;
-			if(i==1) break; /*otherwise dw will point to somewhere it shouldn't*/
-		}
-	}
-	return 0.0;
-}
-
 static void explodeModifier_createFacepa(ExplodeModifierData *emd,
 					 ParticleSystemModifierData *psmd,
       Object *ob, DerivedMesh *dm)
@@ -6179,7 +6165,7 @@ static void explodeModifier_createFacepa(ExplodeModifierData *emd,
 			for(i=0; i<totvert; i++){
 				val = BLI_frand();
 				val = (1.0f-emd->protect)*val + emd->protect*0.5f;
-				if(val < vert_weight(dvert+i,emd->vgroup-1))
+				if(val < deformvert_get_weight(dvert+i,emd->vgroup-1))
 					vertpa[i] = -1;
 			}
 		}
@@ -7236,6 +7222,126 @@ static void meshdeformModifier_deformVertsEM(
 		dm->release(dm);
 }
 
+
+/* Shrinkwrap */
+
+static void shrinkwrapModifier_initData(ModifierData *md)
+{
+	ShrinkwrapModifierData *smd = (ShrinkwrapModifierData*) md;
+	smd->shrinkType = MOD_SHRINKWRAP_NEAREST_SURFACE;
+	smd->shrinkOpts = MOD_SHRINKWRAP_PROJECT_ALLOW_POS_DIR;
+	smd->keepDist	= 0.0f;
+
+	smd->target		= NULL;
+	smd->auxTarget	= NULL;
+}
+
+static void shrinkwrapModifier_copyData(ModifierData *md, ModifierData *target)
+{
+	ShrinkwrapModifierData *smd  = (ShrinkwrapModifierData*)md;
+	ShrinkwrapModifierData *tsmd = (ShrinkwrapModifierData*)target;
+
+	tsmd->target	= smd->target;
+	tsmd->auxTarget = smd->auxTarget;
+
+	strcpy(tsmd->vgroup_name, smd->vgroup_name);
+
+	tsmd->keepDist	= smd->keepDist;
+	tsmd->shrinkType= smd->shrinkType;
+	tsmd->shrinkOpts= smd->shrinkOpts;
+}
+
+CustomDataMask shrinkwrapModifier_requiredDataMask(ModifierData *md)
+{
+	ShrinkwrapModifierData *smd = (ShrinkwrapModifierData *)md;
+	CustomDataMask dataMask = 0;
+
+	/* ask for vertexgroups if we need them */
+	if(smd->vgroup_name[0])
+		dataMask |= (1 << CD_MDEFORMVERT);
+
+	if(smd->shrinkType == MOD_SHRINKWRAP_PROJECT
+	&& smd->projAxis == MOD_SHRINKWRAP_PROJECT_OVER_NORMAL)
+		dataMask |= (1 << CD_MVERT);
+		
+	return dataMask;
+}
+
+static int shrinkwrapModifier_isDisabled(ModifierData *md)
+{
+	ShrinkwrapModifierData *smd = (ShrinkwrapModifierData*) md;
+	return !smd->target;
+}
+
+
+static void shrinkwrapModifier_foreachObjectLink(ModifierData *md, Object *ob, ObjectWalkFunc walk, void *userData)
+{
+	ShrinkwrapModifierData *smd = (ShrinkwrapModifierData*) md;
+
+	walk(userData, ob, &smd->target);
+	walk(userData, ob, &smd->auxTarget);
+}
+
+static void shrinkwrapModifier_deformVerts(ModifierData *md, Object *ob, DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts)
+{
+	DerivedMesh *dm = NULL;
+	CustomDataMask dataMask = shrinkwrapModifier_requiredDataMask(md);
+
+	/* We implement requiredDataMask but thats not really usefull since mesh_calc_modifiers pass a NULL derivedData or without the modified vertexs applied */
+	if(shrinkwrapModifier_requiredDataMask(md))
+	{
+		if(derivedData) dm = CDDM_copy(derivedData);
+		else if(ob->type==OB_MESH) dm = CDDM_from_mesh(ob->data, ob);
+		else return;
+
+		if(dataMask & CD_MVERT)
+		{
+			CDDM_apply_vert_coords(dm, vertexCos);
+			CDDM_calc_normals(dm);
+		}
+	}
+
+	shrinkwrapModifier_deform((ShrinkwrapModifierData*)md, ob, dm, vertexCos, numVerts);
+
+	if(dm)
+		dm->release(dm);
+}
+
+static void shrinkwrapModifier_deformVertsEM(ModifierData *md, Object *ob, EditMesh *editData, DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts)
+{
+	DerivedMesh *dm = NULL;
+	CustomDataMask dataMask = shrinkwrapModifier_requiredDataMask(md);
+
+	if(dataMask)
+	{
+		if(derivedData) dm = CDDM_copy(derivedData);
+		else if(ob->type==OB_MESH) dm = CDDM_from_editmesh(editData, ob->data);
+		else return;
+
+		if(dataMask & CD_MVERT)
+		{
+			CDDM_apply_vert_coords(dm, vertexCos);
+			CDDM_calc_normals(dm);
+		}
+	}
+
+	shrinkwrapModifier_deform((ShrinkwrapModifierData*)md, ob, dm, vertexCos, numVerts);
+
+	if(dm)
+		dm->release(dm);
+}
+
+static void shrinkwrapModifier_updateDepgraph(ModifierData *md, DagForest *forest, Object *ob, DagNode *obNode)
+{
+	ShrinkwrapModifierData *smd = (ShrinkwrapModifierData*) md;
+
+	if (smd->target)
+		dag_add_relation(forest, dag_get_node(forest, smd->target),   obNode, DAG_RL_OB_DATA | DAG_RL_DATA_DATA, "Shrinkwrap Modifier");
+
+	if (smd->auxTarget)
+		dag_add_relation(forest, dag_get_node(forest, smd->auxTarget), obNode, DAG_RL_OB_DATA | DAG_RL_DATA_DATA, "Shrinkwrap Modifier");
+}
+
 /***/
 
 static ModifierTypeInfo typeArr[NUM_MODIFIER_TYPES];
@@ -7557,6 +7663,21 @@ ModifierTypeInfo *modifierType_getInfo(ModifierType type)
 		mti->requiredDataMask = explodeModifier_requiredDataMask;
 		mti->applyModifier = explodeModifier_applyModifier;
 
+		mti = INIT_TYPE(Shrinkwrap);
+		mti->type = eModifierTypeType_OnlyDeform;
+		mti->flags = eModifierTypeFlag_AcceptsMesh
+				| eModifierTypeFlag_AcceptsCVs
+				| eModifierTypeFlag_SupportsEditmode
+				| eModifierTypeFlag_EnableInEditmode;
+		mti->initData = shrinkwrapModifier_initData;
+		mti->copyData = shrinkwrapModifier_copyData;
+		mti->requiredDataMask = shrinkwrapModifier_requiredDataMask;
+		mti->isDisabled = shrinkwrapModifier_isDisabled;
+		mti->foreachObjectLink = shrinkwrapModifier_foreachObjectLink;
+		mti->deformVerts = shrinkwrapModifier_deformVerts;
+		mti->deformVertsEM = shrinkwrapModifier_deformVertsEM;
+		mti->updateDepgraph = shrinkwrapModifier_updateDepgraph;
+
 		typeArrInit = 0;
 #undef INIT_TYPE
 	}
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index 643f90637ad..15d6f71073f 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -320,8 +320,14 @@ int psys_check_enabled(Object *ob, ParticleSystem *psys)
 /************************************************/
 void psys_free_settings(ParticleSettings *part)
 {
-	if(part->pd)
+	if(part->pd) {
 		MEM_freeN(part->pd);
+		part->pd = NULL;
+	}
+	if(part->pd2) {
+		MEM_freeN(part->pd2);
+		part->pd2 = NULL;
+	}
 }
 
 void free_hair(ParticleSystem *psys, int softbody)
@@ -373,8 +379,11 @@ void psys_free_children(ParticleSystem *psys)
 }
 /* free everything */
 void psys_free(Object *ob, ParticleSystem * psys)
-{
+{	
 	if(psys){
+		int nr = 0;
+		ParticleSystem * tpsys;
+		
 		if(ob->particlesystem.first == NULL && G.f & G_PARTICLEEDIT)
 			G.f &= ~G_PARTICLEEDIT;
 
@@ -400,6 +409,21 @@ void psys_free(Object *ob, ParticleSystem * psys)
 
 		if(psys->effectors.first)
 			psys_end_effectors(psys);
+		
+		// check if we are last non-visible particle system
+		for(tpsys=ob->particlesystem.first; tpsys; tpsys=tpsys->next){
+			if(tpsys->part)
+			{
+				if(ELEM(tpsys->part->draw_as,PART_DRAW_OB,PART_DRAW_GR))
+				{
+					nr++;
+					break;
+				}
+			}
+		}
+		// clear do-not-draw-flag
+		if(!nr)
+			ob->transflag &= ~OB_DUPLIPARTS;
 
 		if(psys->part){
 			psys->part->id.us--;		
@@ -411,7 +435,7 @@ void psys_free(Object *ob, ParticleSystem * psys)
 
 		if(psys->pointcache)
 			BKE_ptcache_free(psys->pointcache);
-
+		
 		MEM_freeN(psys);
 	}
 }
@@ -3015,6 +3039,7 @@ ParticleSettings *psys_copy_settings(ParticleSettings *part)
 	
 	partn= copy_libblock(part);
 	if(partn->pd) partn->pd= MEM_dupallocN(part->pd);
+	if(partn->pd2) partn->pd2= MEM_dupallocN(part->pd2);
 	
 	return partn;
 }
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index d1c0cdec71d..92c2f27bc31 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -60,6 +60,7 @@
 #include "BKE_bad_level_calls.h"
 #include "BKE_cdderivedmesh.h"
 #include "BKE_displist.h"
+#include "BKE_effect.h"
 #include "BKE_particle.h"
 #include "BKE_global.h"
 #include "BKE_utildefines.h"
@@ -2208,174 +2209,6 @@ static int get_particles_from_cache(Object *ob, ParticleSystem *psys, int cfra)
 /************************************************/
 /*			Effectors							*/
 /************************************************/
-static float falloff_func(float fac, int usemin, float mindist, int usemax, float maxdist, float power)
-{
-	if(!usemin)
-		mindist= 0.0f;
-
-	if(fac < mindist) {
-		return 1.0f;
-	}
-	else if(usemax) {
-		if(fac>maxdist || (maxdist-mindist)<=0.0f)
-			return 0.0f;
-
-		fac= (fac-mindist)/(maxdist-mindist);
-		return 1.0f - (float)pow((double)fac, (double)power);
-	}
-	else
-		return pow((double)1.0f+fac-mindist, (double)-power);
-}
-
-static float falloff_func_dist(PartDeflect *pd, float fac)
-{
-	return falloff_func(fac, pd->flag&PFIELD_USEMIN, pd->mindist, pd->flag&PFIELD_USEMAX, pd->maxdist, pd->f_power);
-}
-
-static float falloff_func_rad(PartDeflect *pd, float fac)
-{
-	return falloff_func(fac, pd->flag&PFIELD_USEMINR, pd->minrad, pd->flag&PFIELD_USEMAXR, pd->maxrad, pd->f_power_r);
-}
-
-static float effector_falloff(PartDeflect *pd, float *eff_velocity, float *vec_to_part)
-{
-	float eff_dir[3], temp[3];
-	float falloff=1.0, fac, r_fac;
-	
-	VecCopyf(eff_dir,eff_velocity);
-	Normalize(eff_dir);
-
-	if(pd->flag & PFIELD_POSZ && Inpf(eff_dir,vec_to_part)<0.0f)
-		falloff=0.0f;
-	else switch(pd->falloff){
-		case PFIELD_FALL_SPHERE:
-			fac=VecLength(vec_to_part);
-			falloff= falloff_func_dist(pd, fac);
-			break;
-
-		case PFIELD_FALL_TUBE:
-			fac=Inpf(vec_to_part,eff_dir);
-			falloff= falloff_func_dist(pd, ABS(fac));
-			if(falloff == 0.0f)
-				break;
-
-			VECADDFAC(temp,vec_to_part,eff_dir,-fac);
-			r_fac=VecLength(temp);
-			falloff*= falloff_func_rad(pd, r_fac);
-			break;
-		case PFIELD_FALL_CONE:
-			fac=Inpf(vec_to_part,eff_dir);
-			falloff= falloff_func_dist(pd, ABS(fac));
-			if(falloff == 0.0f)
-				break;
-
-			r_fac=saacos(fac/VecLength(vec_to_part))*180.0f/(float)M_PI;
-			falloff*= falloff_func_rad(pd, r_fac);
-
-			break;
-//		case PFIELD_FALL_INSIDE:
-				//for(i=0; i<totface; i++,mface++){
-				//	VECCOPY(v1,mvert[mface->v1].co);
-				//	VECCOPY(v2,mvert[mface->v2].co);
-				//	VECCOPY(v3,mvert[mface->v3].co);
-
-				//	if(AxialLineIntersectsTriangle(a,co1, co2, v2, v3, v1, &lambda)){
-				//		if(from==PART_FROM_FACE)
-				//			(pa+(int)(lambda*size[a])*a0mul)->flag &= ~PARS_UNEXIST;
-				//		else /* store number of intersections */
-				//			(pa+(int)(lambda*size[a])*a0mul)->loop++;
-				//	}
-				//	
-				//	if(mface->v4){
-				//		VECCOPY(v4,mvert[mface->v4].co);
-
-				//		if(AxialLineIntersectsTriangle(a,co1, co2, v4, v1, v3, &lambda)){
-				//			if(from==PART_FROM_FACE)
-				//				(pa+(int)(lambda*size[a])*a0mul)->flag &= ~PARS_UNEXIST;
-				//			else
-				//				(pa+(int)(lambda*size[a])*a0mul)->loop++;
-				//		}
-				//	}
-				//}
-
-//			break;
-	}
-
-	return falloff;
-}
-static void do_physical_effector(short type, float force_val, float distance, float falloff, float size, float damp,
-							float *eff_velocity, float *vec_to_part, float *velocity, float *field, int planar)
-{
-	float mag_vec[3]={0,0,0};
-	float temp[3], temp2[3];
-	float eff_vel[3];
-
-	VecCopyf(eff_vel,eff_velocity);
-	Normalize(eff_vel);
-
-	switch(type){
-		case PFIELD_WIND:
-			VECCOPY(mag_vec,eff_vel);
-
-			VecMulf(mag_vec,force_val*falloff);
-			VecAddf(field,field,mag_vec);
-			break;
-
-		case PFIELD_FORCE:
-			if(planar)
-				Projf(mag_vec,vec_to_part,eff_vel);
-			else
-				VecCopyf(mag_vec,vec_to_part);
-
-			VecMulf(mag_vec,force_val*falloff);
-			VecAddf(field,field,mag_vec);
-			break;
-
-		case PFIELD_VORTEX:
-			Crossf(mag_vec,eff_vel,vec_to_part);
-			Normalize(mag_vec);
-
-			VecMulf(mag_vec,force_val*distance*falloff);
-			VecAddf(field,field,mag_vec);
-
-			break;
-		case PFIELD_MAGNET:
-			if(planar)
-				VecCopyf(temp,eff_vel);
-			else
-				/* magnetic field of a moving charge */
-				Crossf(temp,eff_vel,vec_to_part);
-
-			Crossf(temp2,velocity,temp);
-			VecAddf(mag_vec,mag_vec,temp2);
-
-			VecMulf(mag_vec,force_val*falloff);
-			VecAddf(field,field,mag_vec);
-			break;
-		case PFIELD_HARMONIC:
-			if(planar)
-				Projf(mag_vec,vec_to_part,eff_vel);
-			else
-				VecCopyf(mag_vec,vec_to_part);
-
-			VecMulf(mag_vec,force_val*falloff);
-			VecSubf(field,field,mag_vec);
-
-			VecCopyf(mag_vec,velocity);
-			/* 1.9 is an experimental value to get critical damping at damp=1.0 */
-			VecMulf(mag_vec,damp*1.9f*(float)sqrt(force_val));
-			VecSubf(field,field,mag_vec);
-			break;
-		case PFIELD_NUCLEAR:
-			/*pow here is root of cosine expression below*/
-			//rad=(float)pow(2.0,-1.0/power)*distance/size;
-			//VECCOPY(mag_vec,vec_to_part);
-			//Normalize(mag_vec);
-			//VecMulf(mag_vec,(float)cos(3.0*M_PI/2.0*(1.0-1.0/(pow(rad,power)+1.0)))/(rad+0.2f));
-			//VECADDFAC(field,field,mag_vec,force_val);
-			break;
-	}
-}
 static void do_texture_effector(Tex *tex, short mode, short is_2d, float nabla, short object, float *pa_co, float obmat[4][4], float force_val, float falloff, float *field)
 {
 	TexResult result[4];
@@ -2468,7 +2301,15 @@ static void add_to_effectors(ListBase *lb, Object *ob, Object *obsrc, ParticleSy
 			}
 		}
 		else if(pd->forcefield)
+		{
 			type |= PSYS_EC_EFFECTOR;
+			
+			if(pd->forcefield == PFIELD_WIND)
+			{
+				pd->rng = rng_new(1);
+				rng_srandom(pd->rng, (unsigned int)(ceil(PIL_check_seconds_timer()))); // use better seed
+			}
+		}
 	}
 	
 	if(pd && pd->deflect)
@@ -2493,10 +2334,11 @@ static void add_to_effectors(ListBase *lb, Object *ob, Object *obsrc, ParticleSy
 
 		for(i=0; epsys; epsys=epsys->next,i++){
 			type=0;
-			if(epsys!=psys){
+			if(epsys!=psys || (psys->part->flag & PART_SELF_EFFECT)){
 				epart=epsys->part;
 
-				if(epsys->part->pd && epsys->part->pd->forcefield)
+				if((epsys->part->pd && epsys->part->pd->forcefield)
+					|| (epsys->part->pd2 && epsys->part->pd2->forcefield))
 					type=PSYS_EC_PARTICLE;
 
 				if(epart->type==PART_REACTOR) {
@@ -2579,6 +2421,9 @@ void psys_end_effectors(ParticleSystem *psys)
 
 			if(ec->tree)
 				BLI_kdtree_free(ec->tree);
+			
+			if(ec->ob->pd && (ec->ob->pd->forcefield == PFIELD_WIND))
+				rng_free(ec->ob->pd->rng);
 		}
 
 		BLI_freelistN(lb);
@@ -2745,35 +2590,31 @@ void do_effectors(int pa_no, ParticleData *pa, ParticleKey *state, Object *ob, P
 	ListBase *lb=&psys->effectors;
 	ParticleEffectorCache *ec;
 	float distance, vec_to_part[3];
-	float falloff;
+	float falloff, charge = 0.0f;
 	int p;
 
 	/* check all effector objects for interaction */
 	if(lb->first){
+		if(psys->part->pd && psys->part->pd->forcefield==PFIELD_CHARGE){
+			/* Only the charge of the effected particle is used for 
+			   interaction, not fall-offs. If the fall-offs aren't the	
+			   same this will be unphysical, but for animation this		
+			   could be the wanted behavior. If you want physical
+			   correctness the fall-off should be spherical 2.0 anyways.
+			 */
+			charge = psys->part->pd->f_strength;
+		}
+		if(psys->part->pd2 && psys->part->pd2->forcefield==PFIELD_CHARGE){
+			charge += psys->part->pd2->f_strength;
+		}
 		for(ec = lb->first; ec; ec= ec->next){
 			eob= ec->ob;
 			if(ec->type & PSYS_EC_EFFECTOR){
 				pd=eob->pd;
 				if(psys->part->type!=PART_HAIR && psys->part->integrator)
 					where_is_object_time(eob,cfra);
-				/* Get IPO force strength and fall off values here */
-				//if (has_ipo_code(eob->ipo, OB_PD_FSTR))
-				//	force_val = IPO_GetFloatValue(eob->ipo, OB_PD_FSTR, cfra);
-				//else 
-				//	force_val = pd->f_strength;
-				
-				//if (has_ipo_code(eob->ipo, OB_PD_FFALL)) 
-				//	ffall_val = IPO_GetFloatValue(eob->ipo, OB_PD_FFALL, cfra);
-				//else 
-				//	ffall_val = pd->f_power;
-
-				//if (has_ipo_code(eob->ipo, OB_PD_FMAXD)) 
-				//	maxdist = IPO_GetFloatValue(eob->ipo, OB_PD_FMAXD, cfra);
-				//else 
-				//	maxdist = pd->maxdist;
 
 				/* use center of object for distance calculus */
-				//obloc= eob->obmat[3];
 				VecSubf(vec_to_part, state->co, eob->obmat[3]);
 				distance = VecLength(vec_to_part);
 
@@ -2786,22 +2627,22 @@ void do_effectors(int pa_no, ParticleData *pa, ParticleKey *state, Object *ob, P
 									pd->flag & PFIELD_TEX_OBJECT, (pd->flag & PFIELD_TEX_ROOTCO) ? rootco : state->co, eob->obmat,
 									pd->f_strength, falloff, force_field);
 				} else {
-					do_physical_effector(pd->forcefield,pd->f_strength,distance,
-										falloff,pd->f_dist,pd->f_damp,eob->obmat[2],vec_to_part,
-										pa->state.vel,force_field,pd->flag&PFIELD_PLANAR);
+					do_physical_effector(eob, state->co, pd->forcefield,pd->f_strength,distance,
+										falloff,0.0,pd->f_damp,eob->obmat[2],vec_to_part,
+										pa->state.vel,force_field,pd->flag&PFIELD_PLANAR,pd->rng,pd->f_noise,charge,pa->size);
 				}
 			}
 			if(ec->type & PSYS_EC_PARTICLE){
-				int totepart;
+				int totepart, i;
 				epsys= BLI_findlink(&eob->particlesystem,ec->psys_nbr);
 				epart= epsys->part;
-				pd= epart->pd;
+				pd=epart->pd;
 				totepart= epsys->totpart;
 				
 				if(totepart <= 0)
 					continue;
 				
-				if(pd->forcefield==PFIELD_HARMONIC){
+				if(pd && pd->forcefield==PFIELD_HARMONIC){
 					/* every particle is mapped to only one harmonic effector particle */
 					p= pa_no%epsys->totpart;
 					totepart= p+1;
@@ -2813,31 +2654,27 @@ void do_effectors(int pa_no, ParticleData *pa, ParticleKey *state, Object *ob, P
 				epsys->lattice=psys_get_lattice(ob,psys);
 
 				for(; p<totepart; p++){
+					/* particle skips itself as effector */
+					if(epsys==psys && p == pa_no) continue;
+
 					epa = epsys->particles + p;
 					estate.time=-1.0;
 					if(psys_get_particle_state(eob,epsys,p,&estate,0)){
 						VECSUB(vec_to_part, state->co, estate.co);
 						distance = VecLength(vec_to_part);
-
-						//if(pd->forcefield==PFIELD_HARMONIC){
-						//	//if(cfra < epa->time + radius){ /* radius is fade-in in ui */
-						//	//	eforce*=(cfra-epa->time)/radius;
-						//	//}
-						//}
-						//else{
-						//	/* Limit minimum distance to effector particle so that */
-						//	/* the force is not too big */
-						//	if (distance < 0.001) distance = 0.001f;
-						//}
 						
-						falloff=effector_falloff(pd,estate.vel,vec_to_part);
+						for(i=0, pd = epart->pd; i<2; i++,pd = epart->pd2) {
+							if(pd==NULL || pd->forcefield==0) continue;
 
-						if(falloff<=0.0f)
-							;	/* don't do anything */
-						else
-							do_physical_effector(pd->forcefield,pd->f_strength,distance,
-							falloff,epart->size,pd->f_damp,estate.vel,vec_to_part,
-							state->vel,force_field,0);
+							falloff=effector_falloff(pd,estate.vel,vec_to_part);
+
+							if(falloff<=0.0f)
+								;	/* don't do anything */
+							else
+								do_physical_effector(eob, state->co, pd->forcefield,pd->f_strength,distance,
+								falloff,epart->size,pd->f_damp,estate.vel,vec_to_part,
+								state->vel,force_field,0, pd->rng, pd->f_noise,charge,pa->size);
+						}
 					}
 					else if(pd->forcefield==PFIELD_HARMONIC && cfra-framestep <= epa->dietime && cfra>epa->dietime){
 						/* first step after key release */
@@ -3948,27 +3785,44 @@ static void boid_body(BoidVecFunc *bvf, ParticleData *pa, ParticleSystem *psys,
 	bvf->Addf(dvec,dvec,bvec);
 	bvf->Addf(state->co,state->co,dvec);
 	
-	/* air speed from wind effectors */
-	if(psys->effectors.first){
+	/* air speed from wind and vortex effectors */
+	if(psys->effectors.first) {
 		ParticleEffectorCache *ec;
-		for(ec=psys->effectors.first; ec; ec=ec->next){
-			if(ec->type & PSYS_EC_EFFECTOR){
+		for(ec=psys->effectors.first; ec; ec=ec->next) {
+			if(ec->type & PSYS_EC_EFFECTOR) {
 				Object *eob = ec->ob;
 				PartDeflect *pd = eob->pd;
+				float direction[3], vec_to_part[3];
+				float falloff;
 
-				if(pd->forcefield==PFIELD_WIND && pd->f_strength!=0.0){
-					float distance, wind[3];
-					VecCopyf(wind,eob->obmat[2]);
-					distance=VecLenf(state->co,eob->obmat[3]);
+				if(pd->f_strength != 0.0f) {
+					VecCopyf(direction, eob->obmat[2]);
+					VecSubf(vec_to_part, state->co, eob->obmat[3]);
 
-					if (distance < 0.001) distance = 0.001f;
+					falloff=effector_falloff(pd, direction, vec_to_part);
 
-					if(pd->flag&PFIELD_USEMAX && distance > pd->maxdist)
-						;
-					else{
-						Normalize(wind);
-						VecMulf(wind,pd->f_strength/(float)pow((double)distance,(double)pd->f_power));
-						bvf->Addf(state->co,state->co,wind);
+					switch(pd->forcefield) {
+						case PFIELD_WIND:
+							if(falloff <= 0.0f)
+								;	/* don't do anything */
+							else {
+								Normalize(direction);
+								VecMulf(direction, pd->f_strength * falloff);
+								bvf->Addf(state->co, state->co, direction);
+							}
+							break;
+						case PFIELD_VORTEX:
+						{
+							float distance, mag_vec[3];
+							Crossf(mag_vec, direction, vec_to_part);
+							Normalize(mag_vec);
+
+							distance = VecLength(vec_to_part);
+
+							VecMulf(mag_vec, pd->f_strength * distance * falloff);
+							bvf->Addf(state->co, state->co, mag_vec);
+							break;
+						}
 					}
 				}
 			}
diff --git a/source/blender/blenkernel/intern/sca.c b/source/blender/blenkernel/intern/sca.c
index fcf1c7ce311..47d11bb9d29 100644
--- a/source/blender/blenkernel/intern/sca.c
+++ b/source/blender/blenkernel/intern/sca.c
@@ -153,6 +153,9 @@ void init_sensor(bSensor *sens)
 	case SENS_ACTUATOR:
 		sens->data= MEM_callocN(sizeof(bActuatorSensor), "actsens");
 		break;
+	case SENS_DELAY:
+		sens->data= MEM_callocN(sizeof(bDelaySensor), "delaysens");
+		break;
 	case SENS_MOUSE:
 		ms=sens->data= MEM_callocN(sizeof(bMouseSensor), "mousesens");
 		ms->type= LEFTMOUSE;
diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c
new file mode 100644
index 00000000000..c60535cade2
--- /dev/null
+++ b/source/blender/blenkernel/intern/shrinkwrap.c
@@ -0,0 +1,588 @@
+/**
+ * shrinkwrap.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.
+ *
+ * The Original Code is Copyright (C) Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): André Pinto
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+#include <string.h>
+#include <float.h>
+#include <math.h>
+#include <memory.h>
+#include <stdio.h>
+#include <time.h>
+#include <assert.h>
+
+#include "DNA_object_types.h"
+#include "DNA_modifier_types.h"
+#include "DNA_meshdata_types.h"
+#include "DNA_mesh_types.h"
+
+#include "BKE_shrinkwrap.h"
+#include "BKE_DerivedMesh.h"
+#include "BKE_utildefines.h"
+#include "BKE_deform.h"
+#include "BKE_cdderivedmesh.h"
+#include "BKE_displist.h"
+#include "BKE_global.h"
+#include "BKE_subsurf.h"
+
+#include "BLI_arithb.h"
+#include "BLI_kdtree.h"
+#include "BLI_kdopbvh.h"
+
+#include "RE_raytrace.h"
+#include "MEM_guardedalloc.h"
+
+
+/* Util macros */
+#define TO_STR(a)	#a
+#define JOIN(a,b)	a##b
+
+#define OUT_OF_MEMORY()	((void)printf("Shrinkwrap: Out of memory\n"))
+
+/* Benchmark macros */
+#if !defined(_WIN32) && 0
+
+#include <sys/time.h>
+
+#define BENCH(a)	\
+	do {			\
+		double _t1, _t2;				\
+		struct timeval _tstart, _tend;	\
+		clock_t _clock_init = clock();	\
+		gettimeofday ( &_tstart, NULL);	\
+		(a);							\
+		gettimeofday ( &_tend, NULL);	\
+		_t1 = ( double ) _tstart.tv_sec + ( double ) _tstart.tv_usec/ ( 1000*1000 );	\
+		_t2 = ( double )   _tend.tv_sec + ( double )   _tend.tv_usec/ ( 1000*1000 );	\
+		printf("%s: %fs (real) %fs (cpu)\n", #a, _t2-_t1, (float)(clock()-_clock_init)/CLOCKS_PER_SEC);\
+	} while(0)
+
+#else
+
+#define BENCH(a)	(a)
+
+#endif
+
+typedef void ( *Shrinkwrap_ForeachVertexCallback) (DerivedMesh *target, float *co, float *normal);
+
+/* get derived mesh */
+//TODO is anyfunction that does this? returning the derivedFinal witouth we caring if its in edit mode or not?
+DerivedMesh *object_get_derived_final(Object *ob, CustomDataMask dataMask)
+{
+	if (ob==G.obedit)
+	{
+		DerivedMesh *final = NULL;
+		editmesh_get_derived_cage_and_final(&final, dataMask);
+		return final;
+	}
+	else
+		return mesh_get_derived_final(ob, dataMask);
+}
+
+/* Space transform */
+void space_transform_from_matrixs(SpaceTransform *data, float local[4][4], float target[4][4])
+{
+	float itarget[4][4];
+	Mat4Invert(itarget, target);
+	Mat4MulSerie(data->local2target, itarget, local, 0, 0, 0, 0, 0, 0);
+	Mat4Invert(data->target2local, data->local2target);
+}
+
+void space_transform_apply(const SpaceTransform *data, float *co)
+{
+	VecMat4MulVecfl(co, ((SpaceTransform*)data)->local2target, co);
+}
+
+void space_transform_invert(const SpaceTransform *data, float *co)
+{
+	VecMat4MulVecfl(co, ((SpaceTransform*)data)->target2local, co);
+}
+
+void space_transform_apply_normal(const SpaceTransform *data, float *no)
+{
+	Mat4Mul3Vecfl( ((SpaceTransform*)data)->local2target, no);
+	Normalize(no); // TODO: could we just determine de scale value from the matrix?
+}
+
+void space_transform_invert_normal(const SpaceTransform *data, float *no)
+{
+	Mat4Mul3Vecfl(((SpaceTransform*)data)->target2local, no);
+	Normalize(no); // TODO: could we just determine de scale value from the matrix?
+}
+
+/*
+ * Returns the squared distance between two given points
+ */
+static float squared_dist(const float *a, const float *b)
+{
+	float tmp[3];
+	VECSUB(tmp, a, b);
+	return INPR(tmp, tmp);
+}
+
+/* Main shrinkwrap function */
+void shrinkwrapModifier_deform(ShrinkwrapModifierData *smd, Object *ob, DerivedMesh *dm, float (*vertexCos)[3], int numVerts)
+{
+
+	ShrinkwrapCalcData calc = NULL_ShrinkwrapCalcData;
+
+	//remove loop dependencies on derived meshs (TODO should this be done elsewhere?)
+	if(smd->target == ob) smd->target = NULL;
+	if(smd->auxTarget == ob) smd->auxTarget = NULL;
+
+
+	//Configure Shrinkwrap calc data
+	calc.smd = smd;
+	calc.ob = ob;
+	calc.original = dm;
+	calc.numVerts = numVerts;
+	calc.vertexCos = vertexCos;
+
+	if(smd->target)
+	{
+		//TODO currently we need a copy in case object_get_derived_final returns an emDM that does not defines getVertArray or getFace array
+		calc.target = CDDM_copy( object_get_derived_final(smd->target, CD_MASK_BAREMESH) );
+
+		//TODO there might be several "bugs" on non-uniform scales matrixs.. because it will no longer be nearest surface, not sphere projection
+		//because space has been deformed
+		space_transform_setup(&calc.local2target, ob, smd->target);
+
+		calc.keepDist = smd->keepDist;	//TODO: smd->keepDist is in global units.. must change to local
+	}
+
+
+	//Projecting target defined - lets work!
+	if(calc.target)
+	{
+		switch(smd->shrinkType)
+		{
+			case MOD_SHRINKWRAP_NEAREST_SURFACE:
+				BENCH(shrinkwrap_calc_nearest_surface_point(&calc));
+			break;
+
+			case MOD_SHRINKWRAP_PROJECT:
+				BENCH(shrinkwrap_calc_normal_projection(&calc));
+			break;
+
+			case MOD_SHRINKWRAP_NEAREST_VERTEX:
+				BENCH(shrinkwrap_calc_nearest_vertex(&calc));
+			break;
+		}
+	}
+
+	//free memory
+	if(calc.target)
+		calc.target->release( calc.target );
+}
+
+/*
+ * Shrinkwrap to the nearest vertex
+ *
+ * it builds a kdtree of vertexs we can attach to and then
+ * for each vertex performs a nearest vertex search on the tree
+ */
+void shrinkwrap_calc_nearest_vertex(ShrinkwrapCalcData *calc)
+{
+	int i;
+	const int vgroup		 = get_named_vertexgroup_num(calc->ob, calc->smd->vgroup_name);
+	MDeformVert *const dvert = calc->original ? calc->original->getVertDataArray(calc->original, CD_MDEFORMVERT) : NULL;
+
+	BVHTreeFromMesh treeData = NULL_BVHTreeFromMesh;
+	BVHTreeNearest  nearest  = NULL_BVHTreeNearest;
+
+
+	BENCH(bvhtree_from_mesh_verts(&treeData, calc->target, 0.0, 2, 6));
+	if(treeData.tree == NULL) return OUT_OF_MEMORY();
+
+	//Setup nearest
+	nearest.index = -1;
+	nearest.dist = FLT_MAX;
+
+#pragma omp parallel for default(none) private(i) firstprivate(nearest) shared(treeData,calc) schedule(static)
+	for(i = 0; i<calc->numVerts; ++i)
+	{
+		float *co = calc->vertexCos[i];
+		float tmp_co[3];
+		float weight = vertexgroup_get_vertex_weight(dvert, i, vgroup);
+		if(weight == 0.0f) continue;
+
+		VECCOPY(tmp_co, co);
+		space_transform_apply(&calc->local2target, tmp_co); //Convert the coordinates to the tree coordinates
+
+		//Use local proximity heuristics (to reduce the nearest search)
+		//
+		//If we already had an hit before.. we assume this vertex is going to have a close hit to that other vertex
+		//so we can initiate the "nearest.dist" with the expected value to that last hit.
+		//This will lead in prunning of the search tree.
+		if(nearest.index != -1)
+			nearest.dist = squared_dist(tmp_co, nearest.co);
+		else
+			nearest.dist = FLT_MAX;
+
+		BLI_bvhtree_find_nearest(treeData.tree, tmp_co, &nearest, treeData.nearest_callback, &treeData);
+
+
+		//Found the nearest vertex
+		if(nearest.index != -1)
+		{
+			//Adjusting the vertex weight, so that after interpolating it keeps a certain distance from the nearest position
+			float dist = sasqrt(nearest.dist);
+			if(dist > FLT_EPSILON) weight *= (dist - calc->keepDist)/dist;
+
+			//Convert the coordinates back to mesh coordinates
+			VECCOPY(tmp_co, nearest.co);
+			space_transform_invert(&calc->local2target, tmp_co);
+
+			VecLerpf(co, co, tmp_co, weight);	//linear interpolation
+		}
+	}
+
+	free_bvhtree_from_mesh(&treeData);
+}
+
+/*
+ * This function raycast a single vertex and updates the hit if the "hit" is considered valid.
+ * Returns TRUE if "hit" was updated.
+ * Opts control whether an hit is valid or not
+ * Supported options are:
+ *	MOD_SHRINKWRAP_CULL_TARGET_FRONTFACE (front faces hits are ignored)
+ *	MOD_SHRINKWRAP_CULL_TARGET_BACKFACE (back faces hits are ignored)
+ */
+int normal_projection_project_vertex(char options, const float *vert, const float *dir, const SpaceTransform *transf, BVHTree *tree, BVHTreeRayHit *hit, BVHTree_RayCastCallback callback, void *userdata)
+{
+	float tmp_co[3], tmp_no[3];
+	const float *co, *no;
+	BVHTreeRayHit hit_tmp;
+
+	//Copy from hit (we need to convert hit rays from one space coordinates to the other
+	memcpy( &hit_tmp, hit, sizeof(hit_tmp) );
+
+	//Apply space transform (TODO readjust dist)
+	if(transf)
+	{
+		VECCOPY( tmp_co, vert );
+		space_transform_apply( transf, tmp_co );
+		co = tmp_co;
+
+		VECCOPY( tmp_no, dir );
+		space_transform_apply_normal( transf, tmp_no );
+		no = tmp_no;
+
+		hit_tmp.dist *= Mat4ToScalef( ((SpaceTransform*)transf)->local2target );
+	}
+	else
+	{
+		co = vert;
+		no = dir;
+	}
+
+	hit_tmp.index = -1;
+
+	BLI_bvhtree_ray_cast(tree, co, no, &hit_tmp, callback, userdata);
+
+	if(hit_tmp.index != -1)
+	{
+		float dot = INPR( dir, hit_tmp.no);
+
+		if(((options & MOD_SHRINKWRAP_CULL_TARGET_FRONTFACE) && dot <= 0.0f)
+		|| ((options & MOD_SHRINKWRAP_CULL_TARGET_BACKFACE) && dot >= 0.0f))
+			return FALSE; //Ignore hit
+
+
+		//Inverting space transform (TODO make coeherent with the initial dist readjust)
+		if(transf)
+		{
+			space_transform_invert( transf, hit_tmp.co );
+			space_transform_invert_normal( transf, hit_tmp.no );
+
+			hit_tmp.dist = VecLenf( (float*)vert, hit_tmp.co );
+		}
+
+		memcpy(hit, &hit_tmp, sizeof(hit_tmp) );
+		return TRUE;
+	}
+	return FALSE;
+}
+
+
+void shrinkwrap_calc_normal_projection(ShrinkwrapCalcData *calc)
+{
+	int i;
+
+	//Options about projection direction
+	const char use_normal    = calc->smd->shrinkOpts;
+	float proj_axis[3] = {0.0f, 0.0f, 0.0f};
+	MVert *vert  = NULL; //Needed in case of vertex normal
+	DerivedMesh* ss_mesh = NULL;
+
+	//Vertex group data
+	const int vgroup		   = get_named_vertexgroup_num(calc->ob, calc->smd->vgroup_name);
+	const MDeformVert *dvert = calc->original ? calc->original->getVertDataArray(calc->original, CD_MDEFORMVERT) : NULL;
+
+
+	//Raycast and tree stuff
+	BVHTreeRayHit hit;
+	BVHTreeFromMesh treeData = NULL_BVHTreeFromMesh; 	//target
+
+	//auxiliar target
+	DerivedMesh * aux_mesh = NULL;
+	BVHTreeFromMesh auxData= NULL_BVHTreeFromMesh;
+	SpaceTransform local2aux;
+
+do
+{
+
+	//Prepare data to retrieve the direction in which we should project each vertex
+	if(calc->smd->projAxis == MOD_SHRINKWRAP_PROJECT_OVER_NORMAL)
+	{
+		//No Mvert information: jump to "free memory and return" part
+		if(calc->original == NULL) break;
+
+		if(calc->smd->subsurfLevels)
+		{
+			SubsurfModifierData smd;
+			memset(&smd, 0, sizeof(smd));
+			smd.subdivType = ME_CC_SUBSURF;			//catmull clark
+			smd.levels = calc->smd->subsurfLevels;	//levels
+
+			ss_mesh = subsurf_make_derived_from_derived(calc->original, &smd, FALSE, NULL, 0, 0);
+
+			if(ss_mesh)
+			{
+				vert = ss_mesh->getVertDataArray(ss_mesh, CD_MVERT);
+				if(vert)
+				{
+					//TRICKY: this code assumes subsurface will have the transformed original vertices
+					//in their original order at the end of the vert array.
+					vert = vert
+						 + ss_mesh->getNumVerts(ss_mesh)
+						 - calc->original->getNumVerts(calc->original);
+				}
+			}
+
+			//To make sure we are not letting any memory behind
+			assert(smd.emCache == NULL);
+			assert(smd.mCache == NULL);
+		}
+		else
+			vert = calc->original->getVertDataArray(calc->original, CD_MVERT);
+
+		//Not able to get vert information: jump to "free memory and return" part
+		if(vert == NULL) break;
+	}
+	else
+	{
+		//The code supports any axis that is a combination of X,Y,Z.. altought currently UI only allows to set the 3 diferent axis
+		if(calc->smd->projAxis & MOD_SHRINKWRAP_PROJECT_OVER_X_AXIS) proj_axis[0] = 1.0f;
+		if(calc->smd->projAxis & MOD_SHRINKWRAP_PROJECT_OVER_Y_AXIS) proj_axis[1] = 1.0f;
+		if(calc->smd->projAxis & MOD_SHRINKWRAP_PROJECT_OVER_Z_AXIS) proj_axis[2] = 1.0f;
+
+		Normalize(proj_axis);
+
+		//Invalid projection direction: jump to "free memory and return" part
+		if(INPR(proj_axis, proj_axis) < FLT_EPSILON) break; 
+	}
+
+	//If the user doesn't allows to project in any direction of projection axis... then theres nothing todo.
+	if((use_normal & (MOD_SHRINKWRAP_PROJECT_ALLOW_POS_DIR | MOD_SHRINKWRAP_PROJECT_ALLOW_NEG_DIR)) == 0)
+		break; //jump to "free memory and return" part
+
+
+	//Build target tree
+	BENCH(bvhtree_from_mesh_faces(&treeData, calc->target, calc->keepDist, 4, 6));
+	if(treeData.tree == NULL)
+		break; //jump to "free memory and return" part
+
+
+	//Build auxiliar target
+	if(calc->smd->auxTarget)
+	{
+		space_transform_setup( &local2aux, calc->ob, calc->smd->auxTarget);
+
+		aux_mesh = CDDM_copy( object_get_derived_final(calc->smd->auxTarget, CD_MASK_BAREMESH) ); 		//TODO currently we need a copy in case object_get_derived_final returns an emDM that does not defines getVertArray or getFace array
+		if(aux_mesh)
+			BENCH(bvhtree_from_mesh_faces(&auxData, aux_mesh, 0.0, 4, 6));
+		else
+			printf("Auxiliar target finalDerived mesh is null\n");
+	}
+
+
+	//Now, everything is ready to project the vertexs!
+#pragma omp parallel for private(i,hit) schedule(static)
+	for(i = 0; i<calc->numVerts; ++i)
+	{
+		float *co = calc->vertexCos[i];
+		float tmp_co[3], tmp_no[3];
+		float lim = 10000.0f; //TODO: we should use FLT_MAX here, but sweepsphere code isnt prepared for that
+		float weight = vertexgroup_get_vertex_weight(dvert, i, vgroup);
+
+		if(weight == 0.0f) continue;
+
+		if(ss_mesh)
+		{
+			VECCOPY(tmp_co, vert[i].co);
+		}
+		else
+		{
+			VECCOPY(tmp_co, co);
+		}
+
+
+		if(vert)
+			NormalShortToFloat(tmp_no, vert[i].no);
+		else
+			VECCOPY( tmp_no, proj_axis );
+
+
+		hit.index = -1;
+		hit.dist = lim;
+
+
+		//Project over positive direction of axis
+		if(use_normal & MOD_SHRINKWRAP_PROJECT_ALLOW_POS_DIR)
+		{
+
+			if(auxData.tree)
+				normal_projection_project_vertex(0, tmp_co, tmp_no, &local2aux, auxData.tree, &hit, auxData.raycast_callback, &auxData);
+
+			normal_projection_project_vertex(calc->smd->shrinkOpts, tmp_co, tmp_no, &calc->local2target, treeData.tree, &hit, treeData.raycast_callback, &treeData);
+		}
+
+		//Project over negative direction of axis
+		if(use_normal & MOD_SHRINKWRAP_PROJECT_ALLOW_NEG_DIR)
+		{
+			float inv_no[3] = { -tmp_no[0], -tmp_no[1], -tmp_no[2] };
+
+
+			if(auxData.tree)
+				normal_projection_project_vertex(0, tmp_co, inv_no, &local2aux, auxData.tree, &hit, auxData.raycast_callback, &auxData);
+
+			normal_projection_project_vertex(calc->smd->shrinkOpts, tmp_co, inv_no, &calc->local2target, treeData.tree, &hit, treeData.raycast_callback, &treeData);
+		}
+
+
+		if(hit.index != -1)
+		{
+			VecLerpf(co, co, hit.co, weight);
+		}
+	}
+
+
+//Simple do{} while(0) structure to allow to easily jump to the "free memory and return" part
+} while(0);
+
+	//free data structures
+
+	free_bvhtree_from_mesh(&treeData);
+	free_bvhtree_from_mesh(&auxData);
+
+	if(aux_mesh)
+		aux_mesh->release(aux_mesh);
+
+	if(ss_mesh)
+		ss_mesh->release(ss_mesh);
+}
+
+/*
+ * Shrinkwrap moving vertexs to the nearest surface point on the target
+ *
+ * it builds a BVHTree from the target mesh and then performs a
+ * NN matchs for each vertex
+ */
+void shrinkwrap_calc_nearest_surface_point(ShrinkwrapCalcData *calc)
+{
+	int i;
+
+	const int vgroup = get_named_vertexgroup_num(calc->ob, calc->smd->vgroup_name);
+	const MDeformVert *const dvert = calc->original ? calc->original->getVertDataArray(calc->original, CD_MDEFORMVERT) : NULL;
+
+	BVHTreeFromMesh treeData = NULL_BVHTreeFromMesh;
+	BVHTreeNearest  nearest  = NULL_BVHTreeNearest;
+
+
+
+	//Create a bvh-tree of the given target
+	BENCH(bvhtree_from_mesh_faces( &treeData, calc->target, 0.0, 2, 6));
+	if(treeData.tree == NULL) return OUT_OF_MEMORY();
+
+	//Setup nearest
+	nearest.index = -1;
+	nearest.dist = FLT_MAX;
+
+
+	//Find the nearest vertex
+#pragma omp parallel for default(none) private(i) firstprivate(nearest) shared(calc,treeData) schedule(static)
+	for(i = 0; i<calc->numVerts; ++i)
+	{
+		float *co = calc->vertexCos[i];
+		float tmp_co[3];
+		float weight = vertexgroup_get_vertex_weight(dvert, i, vgroup);
+		if(weight == 0.0f) continue;
+
+		//Convert the vertex to tree coordinates
+		VECCOPY(tmp_co, co);
+		space_transform_apply(&calc->local2target, tmp_co);
+
+		//Use local proximity heuristics (to reduce the nearest search)
+		//
+		//If we already had an hit before.. we assume this vertex is going to have a close hit to that other vertex
+		//so we can initiate the "nearest.dist" with the expected value to that last hit.
+		//This will lead in prunning of the search tree.
+		if(nearest.index != -1)
+			nearest.dist = squared_dist(tmp_co, nearest.co);
+		else
+			nearest.dist = FLT_MAX;
+
+		BLI_bvhtree_find_nearest(treeData.tree, tmp_co, &nearest, treeData.nearest_callback, &treeData);
+
+		//Found the nearest vertex
+		if(nearest.index != -1)
+		{
+			if(calc->smd->shrinkOpts & MOD_SHRINKWRAP_KEEP_ABOVE_SURFACE)
+			{
+				//Make the vertex stay on the front side of the face
+				VECADDFAC(tmp_co, nearest.co, nearest.no, calc->keepDist);
+			}
+			else
+			{
+				//Adjusting the vertex weight, so that after interpolating it keeps a certain distance from the nearest position
+				float dist = sasqrt( nearest.dist );
+				if(dist > FLT_EPSILON)
+					VecLerpf(tmp_co, tmp_co, nearest.co, (dist - calc->keepDist)/dist);	//linear interpolation
+				else
+					VECCOPY( tmp_co, nearest.co );
+			}
+
+			//Convert the coordinates back to mesh coordinates
+			space_transform_invert(&calc->local2target, tmp_co);
+			VecLerpf(co, co, tmp_co, weight);	//linear interpolation
+		}
+	}
+
+
+	free_bvhtree_from_mesh(&treeData);
+}
+
diff --git a/source/blender/blenlib/BLI_editVert.h b/source/blender/blenlib/BLI_editVert.h
index d42663e17c7..447f6a2a485 100644
--- a/source/blender/blenlib/BLI_editVert.h
+++ b/source/blender/blenlib/BLI_editVert.h
@@ -38,6 +38,8 @@
 #include "DNA_customdata_types.h"
 #include "DNA_mesh_types.h"
 
+#include "BLO_sys_types.h" // for intptr_t support
+
 struct DerivedMesh;
 struct RetopoPaintData;
 
@@ -53,7 +55,7 @@ typedef struct EditVert
 		struct EditEdge *e;
 		struct EditFace *f;
 		void            *p;
-		long             l;
+		intptr_t         l;
 		float            fp;
 	} tmp;
 	float no[3]; /*vertex normal */
@@ -95,7 +97,7 @@ typedef struct EditEdge
 		struct EditEdge *e;
 		struct EditFace *f;
 		void            *p;
-		long             l;
+		intptr_t         l;
 		float			fp;
 	} tmp;
 	short f1, f2;	/* short, f1 is (ab)used in subdiv */
@@ -122,7 +124,7 @@ typedef struct EditFace
 		struct EditEdge *e;
 		struct EditFace *f;
 		void            *p;
-		long             l;
+		intptr_t         l;
 		float			fp;
 	} tmp;
 	float n[3], cent[3];
diff --git a/source/blender/blenlib/BLI_rand.h b/source/blender/blenlib/BLI_rand.h
index 0e534783c17..266aa347aff 100644
--- a/source/blender/blenlib/BLI_rand.h
+++ b/source/blender/blenlib/BLI_rand.h
@@ -44,6 +44,7 @@ struct RNG*	rng_new			(unsigned int seed);
 void		rng_free		(struct RNG* rng);
 
 void		rng_seed		(struct RNG* rng, unsigned int seed);
+void rng_srandom(struct RNG *rng, unsigned int seed);
 int			rng_getInt		(struct RNG* rng);
 double		rng_getDouble	(struct RNG* rng);
 float		rng_getFloat	(struct RNG* rng);
diff --git a/source/blender/blenlib/BLI_winstuff.h b/source/blender/blenlib/BLI_winstuff.h
index 11150075bac..3bb63506c95 100644
--- a/source/blender/blenlib/BLI_winstuff.h
+++ b/source/blender/blenlib/BLI_winstuff.h
@@ -61,6 +61,10 @@
 
 	// These definitions are also in arithb for simplicity
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifndef M_PI
 #define M_PI		3.14159265358979323846
 #endif
@@ -116,5 +120,9 @@ int closedir (DIR *dp);
 void get_default_root(char *root);
 int check_file_chars(char *filename);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __WINSTUFF_H__ */
 
diff --git a/source/blender/blenlib/intern/BLI_ghash.c b/source/blender/blenlib/intern/BLI_ghash.c
index 227cb8f5e9a..e9271ca3bb5 100644
--- a/source/blender/blenlib/intern/BLI_ghash.c
+++ b/source/blender/blenlib/intern/BLI_ghash.c
@@ -34,6 +34,8 @@
 #include "MEM_guardedalloc.h"
 #include "BLI_ghash.h"
 
+#include "BLO_sys_types.h" // for intptr_t support
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -256,11 +258,7 @@ int BLI_ghashutil_ptrcmp(void *a, void *b) {
 }
 
 unsigned int BLI_ghashutil_inthash(void *ptr) {
-#if defined(_WIN64)
-	unsigned __int64 key = (unsigned __int64)ptr;
-#else
-	unsigned long key = (unsigned long)ptr;
-#endif
+	uintptr_t key = (uintptr_t)ptr;
 
 	key += ~(key << 16);
 	key ^=  (key >>  5);
diff --git a/source/blender/blenlib/intern/BLI_kdopbvh.c b/source/blender/blenlib/intern/BLI_kdopbvh.c
index 9671551a7f1..989e516d161 100644
--- a/source/blender/blenlib/intern/BLI_kdopbvh.c
+++ b/source/blender/blenlib/intern/BLI_kdopbvh.c
@@ -46,6 +46,7 @@
 
 
 #define MAX_TREETYPE 32
+#define DEFAULT_FIND_NEAREST_HEAP_SIZE 1024
 
 typedef struct BVHNode
 {
@@ -81,7 +82,7 @@ typedef struct BVHOverlapData
 typedef struct BVHNearestData
 {
 	BVHTree *tree;
-	float	*co;
+	const float	*co;
 	BVHTree_NearestPointCallback callback;
 	void	*userdata;
 	float proj[13];			//coordinates projection over axis
@@ -119,6 +120,72 @@ static float KDOP_AXES[13][3] =
 {0, 1.0, -1.0}
 };
 
+/*
+ * Generic push and pop heap
+ */
+#define PUSH_HEAP_BODY(HEAP_TYPE,PRIORITY,heap,heap_size)	\
+{													\
+	HEAP_TYPE element = heap[heap_size-1];			\
+	int child = heap_size-1;						\
+	while(child != 0)								\
+	{												\
+		int parent = (child-1) / 2;					\
+		if(PRIORITY(element, heap[parent]))			\
+		{											\
+			heap[child] = heap[parent];				\
+			child = parent;							\
+		}											\
+		else break;									\
+	}												\
+	heap[child] = element;							\
+}
+
+#define POP_HEAP_BODY(HEAP_TYPE, PRIORITY,heap,heap_size)	\
+{													\
+	HEAP_TYPE element = heap[heap_size-1];			\
+	int parent = 0;									\
+	while(parent < (heap_size-1)/2 )				\
+	{												\
+		int child2 = (parent+1)*2;					\
+		if(PRIORITY(heap[child2-1], heap[child2]))	\
+			--child2;								\
+													\
+		if(PRIORITY(element, heap[child2]))			\
+			break;									\
+													\
+		heap[parent] = heap[child2];				\
+		parent = child2;							\
+	}												\
+	heap[parent] = element;							\
+}
+
+int ADJUST_MEMORY(void *local_memblock, void **memblock, int new_size, int *max_size, int size_per_item)
+{
+	int   new_max_size = *max_size * 2;
+	void *new_memblock = NULL;
+
+	if(new_size <= *max_size)
+		return TRUE;
+
+	if(*memblock == local_memblock)
+	{
+		new_memblock = malloc( size_per_item * new_max_size );
+		memcpy( new_memblock, *memblock, size_per_item * *max_size );
+	}
+	else
+		new_memblock = realloc(*memblock, size_per_item * new_max_size );
+
+	if(new_memblock)
+	{
+		*memblock = new_memblock;
+		*max_size = new_max_size;
+		return TRUE;
+	}
+	else
+		return FALSE;
+}
+
+
 //////////////////////////////////////////////////////////////////////////////////////////////////////
 // Introsort 
 // with permission deriven from the following Java code:
@@ -634,6 +701,18 @@ static void non_recursive_bvh_div_nodes(BVHTree *tree, BVHNode *branches_array,
 	BVHBuildHelper data;
 	int depth;
 
+	//Most of bvhtree code relies on 1-leaf trees having at least one branch
+	//We handle that special case here
+	if(num_leafs == 1)
+	{
+		BVHNode *root = branches_array+0;
+		refit_kdop_hull(tree, root, 0, num_leafs);
+		root->main_axis = get_largest_axis(root->bv) / 2;
+		root->totnode = 1;
+		root->children[0] = leafs_array[0];		
+		return;
+	}
+
 	branches_array--;	//Implicit trees use 1-based indexs
 	
 	build_implicit_tree_helper(tree, &data);
@@ -722,6 +801,11 @@ BVHTree *BLI_bvhtree_new(int maxsize, float epsilon, char tree_type, char axis)
 		return NULL;
 
 	tree = (BVHTree *)MEM_callocN(sizeof(BVHTree), "BVHTree");
+
+	//tree epsilon must be >= FLT_EPSILON
+	//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)
 	{
@@ -1114,15 +1198,18 @@ static float calc_nearest_point(BVHNearestData *data, BVHNode *node, float *near
 }
 
 
-// TODO: use a priority queue to reduce the number of nodes looked on
-static void dfs_find_nearest(BVHNearestData *data, BVHNode *node)
+typedef struct NodeDistance
 {
-	int i;
-	float nearest[3], sdist;
+	BVHNode *node;
+	float dist;
 
-	sdist = calc_nearest_point(data, node, nearest);
-	if(sdist >= data->nearest.dist) return;
+} NodeDistance;
 
+#define NodeDistance_priority(a,b)	( (a).dist < (b).dist )
+
+// TODO: use a priority queue to reduce the number of nodes looked on
+static void dfs_find_nearest_dfs(BVHNearestData *data, BVHNode *node)
+{
 	if(node->totnode == 0)
 	{
 		if(data->callback)
@@ -1130,17 +1217,129 @@ static void dfs_find_nearest(BVHNearestData *data, BVHNode *node)
 		else
 		{
 			data->nearest.index	= node->index;
-			VECCOPY(data->nearest.co, nearest);
-			data->nearest.dist	= sdist;
+			data->nearest.dist	= calc_nearest_point(data, node, data->nearest.co);
 		}
 	}
 	else
 	{
-		for(i=0; i != node->totnode; i++)
-			dfs_find_nearest(data, node->children[i]);
+		//Better heuristic to pick the closest node to dive on
+		int i;
+		float nearest[3];
+
+		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;
+				dfs_find_nearest_dfs(data, node->children[i]);
+			}
+		}
+		else
+		{
+			for(i=node->totnode-1; i >= 0 ; i--)
+			{
+				if( calc_nearest_point(data, node->children[i], nearest) >= data->nearest.dist) continue;
+				dfs_find_nearest_dfs(data, node->children[i]);
+			}
+		}
 	}
 }
 
+static void dfs_find_nearest_begin(BVHNearestData *data, BVHNode *node)
+{
+	float nearest[3], sdist;
+	sdist = calc_nearest_point(data, node, nearest);
+	if(sdist >= data->nearest.dist) return;
+	dfs_find_nearest_dfs(data, node);
+}
+
+
+static void NodeDistance_push_heap(NodeDistance *heap, int heap_size)
+PUSH_HEAP_BODY(NodeDistance, NodeDistance_priority, heap, heap_size)
+
+static void NodeDistance_pop_heap(NodeDistance *heap, int heap_size)
+POP_HEAP_BODY(NodeDistance, NodeDistance_priority, heap, heap_size)
+
+//NN function that uses an heap.. this functions leads to an optimal number of min-distance
+//but for normal tri-faces and BV 6-dop.. a simple dfs with local heuristics (as implemented
+//in source/blender/blenkernel/intern/shrinkwrap.c) works faster.
+//
+//It may make sense to use this function if the callback queries are very slow.. or if its impossible
+//to get a nice heuristic
+//
+//this function uses "malloc/free" instead of the MEM_* because it intends to be openmp safe
+static void bfs_find_nearest(BVHNearestData *data, BVHNode *node)
+{
+	int i;
+	NodeDistance default_heap[DEFAULT_FIND_NEAREST_HEAP_SIZE];
+	NodeDistance *heap=default_heap, current;
+	int heap_size = 0, max_heap_size = sizeof(default_heap)/sizeof(default_heap[0]);
+	float nearest[3];
+
+	int callbacks = 0, push_heaps = 0;
+
+	if(node->totnode == 0)
+	{
+		dfs_find_nearest_dfs(data, node);
+		return;
+	}
+
+	current.node = node;
+	current.dist = calc_nearest_point(data, node, nearest);
+
+	while(current.dist < data->nearest.dist)
+	{
+//		printf("%f : %f\n", current.dist, data->nearest.dist);
+		for(i=0; i< current.node->totnode; i++)
+		{
+			BVHNode *child = current.node->children[i];
+			if(child->totnode == 0)
+			{
+				callbacks++;
+				dfs_find_nearest_dfs(data, child);
+			}
+			else
+			{
+				//adjust heap size
+				if(heap_size >= max_heap_size
+				&& ADJUST_MEMORY(default_heap, (void**)&heap, heap_size+1, &max_heap_size, sizeof(heap[0])) == FALSE)
+				{
+					printf("WARNING: bvh_find_nearest got out of memory\n");
+
+					if(heap != default_heap)
+						free(heap);
+
+					return;
+				}
+
+				heap[heap_size].node = current.node->children[i];
+				heap[heap_size].dist = calc_nearest_point(data, current.node->children[i], nearest);
+
+				if(heap[heap_size].dist >= data->nearest.dist) continue;
+				heap_size++;
+
+				NodeDistance_push_heap(heap, heap_size);
+	//			PUSH_HEAP_BODY(NodeDistance, NodeDistance_priority, heap, heap_size);
+				push_heaps++;
+			}
+		}
+		
+		if(heap_size == 0) break;
+
+		current = heap[0];
+		NodeDistance_pop_heap(heap, heap_size);
+//		POP_HEAP_BODY(NodeDistance, NodeDistance_priority, heap, heap_size);
+		heap_size--;
+	}
+
+//	printf("hsize=%d, callbacks=%d, pushs=%d\n", heap_size, callbacks, push_heaps);
+
+	if(heap != default_heap)
+		free(heap);
+}
+
+
 int BLI_bvhtree_find_nearest(BVHTree *tree, const float *co, BVHTreeNearest *nearest, BVHTree_NearestPointCallback callback, void *userdata)
 {
 	int i;
@@ -1172,7 +1371,7 @@ int BLI_bvhtree_find_nearest(BVHTree *tree, const float *co, BVHTreeNearest *nea
 
 	//dfs search
 	if(root)
-		dfs_find_nearest(&data, root);
+		dfs_find_nearest_begin(&data, root);
 
 	//copy back results
 	if(nearest)
@@ -1212,7 +1411,7 @@ static float ray_nearest_hit(BVHRayCastData *data, BVHNode *node)
 			float ll = (bv[0] - data->ray.origin[i]) / data->ray_dot_axis[i];
 			float lu = (bv[1] - data->ray.origin[i]) / data->ray_dot_axis[i];
 
-			if(data->ray_dot_axis[i] > 0)
+			if(data->ray_dot_axis[i] > 0.0f)
 			{
 				if(ll > low)   low = ll;
 				if(lu < upper) upper = lu;
@@ -1252,7 +1451,7 @@ static void dfs_raycast(BVHRayCastData *data, BVHNode *node)
 	else
 	{
 		//pick loop direction to dive into the tree (based on ray direction and split axis)
-		if(data->ray_dot_axis[ node->main_axis ] > 0)
+		if(data->ray_dot_axis[ node->main_axis ] > 0.0f)
 		{
 			for(i=0; i != node->totnode; i++)
 			{
@@ -1289,7 +1488,7 @@ int BLI_bvhtree_ray_cast(BVHTree *tree, const float *co, const float *dir, BVHTr
 	{
 		data.ray_dot_axis[i] = INPR( data.ray.direction, KDOP_AXES[i]);
 
-		if(fabs(data.ray_dot_axis[i]) < 1e-7)
+		if(fabs(data.ray_dot_axis[i]) < FLT_EPSILON)
 			data.ray_dot_axis[i] = 0.0;
 	}
 
diff --git a/source/blender/blenlib/intern/fileops.c b/source/blender/blenlib/intern/fileops.c
index 96de5e99f4f..2acbbbe6712 100644
--- a/source/blender/blenlib/intern/fileops.c
+++ b/source/blender/blenlib/intern/fileops.c
@@ -62,6 +62,8 @@
 #include "BKE_utildefines.h"
 #include <errno.h>
 
+#include "BLO_sys_types.h" // for intptr_t support
+
 /* implementations: */
 char *first_slash(char *string) {
 	char *ffslash, *fbslash;
@@ -72,7 +74,7 @@ char *first_slash(char *string) {
 	if (!ffslash) return fbslash;
 	else if (!fbslash) return ffslash;
 	
-	if ((long)ffslash < (long)fbslash) return ffslash;
+	if ((intptr_t)ffslash < (intptr_t)fbslash) return ffslash;
 	else return fbslash;
 }
 
@@ -85,7 +87,7 @@ char *BLI_last_slash(const char *string) {
 	if (!lfslash) return lbslash; 
 	else if (!lbslash) return lfslash;
 	
-	if ((long)lfslash < (long)lbslash) return lbslash;
+	if ((intptr_t)lfslash < (intptr_t)lbslash) return lbslash;
 	else return lfslash;
 }
 
diff --git a/source/blender/blenlib/intern/psfont.c b/source/blender/blenlib/intern/psfont.c
index 498c87cdef9..216246dcdd7 100644
--- a/source/blender/blenlib/intern/psfont.c
+++ b/source/blender/blenlib/intern/psfont.c
@@ -43,6 +43,8 @@
 #include "DNA_packedFile_types.h"
 #include "DNA_curve_types.h"
 
+#include "BLO_sys_types.h" // for intptr_t support
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -54,7 +56,7 @@ typedef struct chardesc {
     short llx, lly;		/* bounding box */
     short urx, ury;
     short *data;		/* char data */
-    long datalen;		
+    intptr_t datalen;		
 } chardesc;
 
 typedef struct objfnt {
diff --git a/source/blender/blenlib/intern/rand.c b/source/blender/blenlib/intern/rand.c
index ccc478203fe..c484a307393 100644
--- a/source/blender/blenlib/intern/rand.c
+++ b/source/blender/blenlib/intern/rand.c
@@ -81,6 +81,16 @@ void rng_seed(RNG *rng, unsigned int seed) {
 	rng->X= (((r_uint64) seed)<<16) | LOWSEED;
 }
 
+void rng_srandom(RNG *rng, unsigned int seed) {
+	extern unsigned char hash[];	// noise.c
+	
+	rng_seed(rng, seed + hash[seed & 255]);
+	seed= rng_getInt(rng);
+	rng_seed(rng, seed + hash[seed & 255]);
+	seed= rng_getInt(rng);
+	rng_seed(rng, seed + hash[seed & 255]);
+}
+
 int rng_getInt(RNG *rng) {
 	rng->X= (MULTIPLIER*rng->X + ADDEND)&MASK;
 	return (int) (rng->X>>17);
@@ -132,13 +142,7 @@ void BLI_srand(unsigned int seed) {
 
 /* using hash table to create better seed */
 void BLI_srandom(unsigned int seed) {
-	extern unsigned char hash[];	// noise.c
-	
-	rng_seed(&theBLI_rng, seed + hash[seed & 255]);
-	seed= rng_getInt(&theBLI_rng);
-	rng_seed(&theBLI_rng, seed + hash[seed & 255]);
-	seed= rng_getInt(&theBLI_rng);
-	rng_seed(&theBLI_rng, seed + hash[seed & 255]);
+	rng_srandom(&theBLI_rng, seed);
 }
 
 int BLI_rand(void) {
diff --git a/source/blender/blenlib/intern/util.c b/source/blender/blenlib/intern/util.c
index 48ebf770e1b..a31121148e3 100644
--- a/source/blender/blenlib/intern/util.c
+++ b/source/blender/blenlib/intern/util.c
@@ -1970,7 +1970,7 @@ void BLI_timestr(double _time, char *str)
 
 int BLI_int_from_pointer(void *poin)
 {
-	long lval= (long)poin;
+	intptr_t lval= (intptr_t)poin;
 	
 	return (int)(lval>>3);
 }
@@ -1978,17 +1978,17 @@ int BLI_int_from_pointer(void *poin)
 void *BLI_pointer_from_int(int val)
 {
 	static int firsttime= 1;
-	static long basevalue= 0;
+	static intptr_t basevalue= 0;
 	
 	if(firsttime) {
 		void *poin= malloc(10000);
-		basevalue= (long)poin;
+		basevalue= (intptr_t)poin;
 		basevalue &= ~PMASK;
 		printf("base: %d pointer %p\n", basevalue, poin); /* debug */
 		firsttime= 0;
 		free(poin);
 	}
-	return (void *)(basevalue | (((long)val)<<3));
+	return (void *)(basevalue | (((intptr_t)val)<<3));
 }
 
 #else
diff --git a/source/blender/blenloader/BLO_sys_types.h b/source/blender/blenloader/BLO_sys_types.h
index a1885894fe3..a9d29375eac 100644
--- a/source/blender/blenloader/BLO_sys_types.h
+++ b/source/blender/blenloader/BLO_sys_types.h
@@ -43,11 +43,6 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-
-#ifdef FREE_WINDOWS
-typedef unsigned char uint8_t;
-typedef unsigned int uint32_t;
-#endif
  
 #if defined(_WIN32) && !defined(FREE_WINDOWS)
 
@@ -64,6 +59,14 @@ typedef unsigned __int16 uint16_t;
 typedef unsigned __int32 uint32_t;
 typedef unsigned __int64 uint64_t;
 
+#ifdef _WIN64
+typedef __int64 intptr_t;
+typedef unsigned __int64 uintptr_t;
+#else
+typedef long intptr_t;
+typedef unsigned long uintptr_t;
+#endif
+
 #elif defined(__linux__)
 
 	/* Linux-i386, Linux-Alpha, Linux-ppc */
@@ -73,6 +76,10 @@ typedef unsigned __int64 uint64_t;
 
 #include <inttypes.h>
 
+#elif defined(FREE_WINDOWS)
+
+#include <stdint.h>
+
 #else
 
 	/* FreeBSD, Irix, Solaris */
diff --git a/source/blender/blenloader/intern/genfile.c b/source/blender/blenloader/intern/genfile.c
index 87c859de839..86338ca9e89 100644
--- a/source/blender/blenloader/intern/genfile.c
+++ b/source/blender/blenloader/intern/genfile.c
@@ -58,6 +58,8 @@
 
 #include "genfile.h"
 
+#include "BLO_sys_types.h" // for intptr_t support
+
 /* gcc 4.1 on mingw was complaining that __int64 was alredy defined
 actually is saw the line below as typedef long long long long... 
 Anyhow, since its alredy defined, its safe to do an ifndef here- Cambpell*/
@@ -315,7 +317,7 @@ static void init_structDNA(struct SDNA *sdna, int do_endian_swap)
 /* in sdna->data the data, now we convert that to something understandable */
 {
 	int *data, *verg;
-	long nr;
+	intptr_t nr;
 	short *sp;
 	char str[8], *cp;
 	
@@ -351,7 +353,7 @@ static void init_structDNA(struct SDNA *sdna, int do_endian_swap)
 			cp++;
 			nr++;
 		}
-		nr= (long)cp;		/* prevent BUS error */
+		nr= (intptr_t)cp;		/* prevent BUS error */
 		nr= (nr+3) & ~3;
 		cp= (char *)nr;
 		
@@ -389,7 +391,7 @@ static void init_structDNA(struct SDNA *sdna, int do_endian_swap)
 			cp++;
 			nr++;
 		}
-		nr= (long)cp;		/* prevent BUS error */
+		nr= (intptr_t)cp;		/* prevent BUS error */
 		nr= (nr+3) & ~3;
 		cp= (char *)nr;
 		
@@ -1098,7 +1100,7 @@ int dna_elem_offset(struct SDNA *sdna, char *stype, char *vartype, char *name)
 	int SDNAnr= dna_findstruct_nr(sdna, stype);
 	short *spo= sdna->structs[SDNAnr];
 	char *cp= find_elem(sdna, vartype, name, spo, NULL, NULL);
-	return (int)((long)cp);
+	return (int)((intptr_t)cp);
 }
 
 
diff --git a/source/blender/blenloader/intern/readblenentry.c b/source/blender/blenloader/intern/readblenentry.c
index f56b261efe2..5a75b5c8b11 100644
--- a/source/blender/blenloader/intern/readblenentry.c
+++ b/source/blender/blenloader/intern/readblenentry.c
@@ -63,6 +63,8 @@
 
 #include "BLO_readblenfile.h"
 
+#include "BLO_sys_types.h" // needed for intptr_t
+
 	/**
 	 * IDType stuff, I plan to move this
 	 * out into its own file + prefix, and
@@ -193,7 +195,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, (long)bhead->len+sizeof(BHead));
+			fprintf(fp, "['%.4s', '%s', %d, %ld ], \n", buf, name, bhead->nr, (intptr_t)bhead->len+sizeof(BHead));
 		}
 	}
 	fprintf(fp, "]\n");
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 29fd314236b..6affec0e104 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -2583,6 +2583,7 @@ static void lib_link_particlesettings(FileData *fd, Main *main)
 static void direct_link_particlesettings(FileData *fd, ParticleSettings *part)
 {
 	part->pd= newdataadr(fd, part->pd);
+	part->pd2= newdataadr(fd, part->pd2);
 }
 
 static void lib_link_particlesystems(FileData *fd, ID *id, ListBase *particles)
@@ -2943,11 +2944,9 @@ static void lib_link_object(FileData *fd, Main *main)
 
 			sens= ob->sensors.first;
 			while(sens) {
-				if(ob->id.lib==NULL) {	// done in expand_main
-					for(a=0; a<sens->totlinks; a++) {
-						sens->links[a]= newglobadr(fd, sens->links[a]);
-					}
-				}
+				for(a=0; a<sens->totlinks; a++)
+					sens->links[a]= newglobadr(fd, sens->links[a]);
+
 				if(sens->type==SENS_TOUCH) {
 					bTouchSensor *ts= sens->data;
 					ts->ma= newlibadr(fd, ob->id.lib, ts->ma);
@@ -2962,11 +2961,9 @@ static void lib_link_object(FileData *fd, Main *main)
 
 			cont= ob->controllers.first;
 			while(cont) {
-				if(ob->id.lib==NULL) {	// done in expand_main
-					for(a=0; a<cont->totlinks; a++) {
-						cont->links[a]= newglobadr(fd, cont->links[a]);
-					}
-				}
+				for(a=0; a<cont->totlinks; a++)
+					cont->links[a]= newglobadr(fd, cont->links[a]);
+
 				if(cont->type==CONT_PYTHON) {
 					bPythonCont *pc= cont->data;
 					pc->text= newlibadr(fd, ob->id.lib, pc->text);
@@ -3594,9 +3591,9 @@ static void direct_link_scene(FileData *fd, Scene *sce)
 		{
 			Sequence temp;
 			char *poin;
-			long offset;
+			intptr_t offset;
 			
-			offset= ((long)&(temp.seqbase)) - ((long)&temp);
+			offset= ((intptr_t)&(temp.seqbase)) - ((intptr_t)&temp);
 			
 			/* root pointer */
 			if(ed->seqbasep == old_seqbasep) {
@@ -4095,7 +4092,7 @@ static void direct_link_screen(FileData *fd, bScreen *sc)
 	while(se) {
 		se->v1= newdataadr(fd, se->v1);
 		se->v2= newdataadr(fd, se->v2);
-		if( (long)se->v1 > (long)se->v2) {
+		if( (intptr_t)se->v1 > (intptr_t)se->v2) {
 			sv= se->v1;
 			se->v1= se->v2;
 			se->v2= sv;
@@ -7731,31 +7728,6 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 		idproperties_fix_group_lengths(main->brush);
 		idproperties_fix_group_lengths(main->particle);		
 	}
-	
-	/* only needed until old bad svn/RC1,2 files are saved with a > 17 version -dg */
-	if(main->versionfile == 245 && main->subversionfile < 17) {
-		ModifierData *md;
-		Object *ob;
-		
-		for(ob = main->object.first; ob; ob= ob->id.next) {
-			for(md=ob->modifiers.first; md; ) {
-				if(md->type==eModifierType_Cloth) {
-					ModifierData *next;
-					MEM_freeN(((ClothModifierData *)md)->sim_parms);
-					MEM_freeN(((ClothModifierData *)md)->coll_parms);
-					MEM_freeN(((ClothModifierData *)md)->point_cache);
-					((ClothModifierData *)md)->sim_parms = NULL;
-					((ClothModifierData *)md)->coll_parms = NULL;
-					((ClothModifierData *)md)->point_cache = NULL;
-					next=md->next;
-					BLI_remlink(&ob->modifiers, md);
-					md = next;
-				}
-				else
-					md = md->next;
-			}
-		}
-	}
 
 	/* sun/sky */
 	if(main->versionfile < 246) {
@@ -7782,6 +7754,14 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 		for(me=main->mesh.first; me; me= me->id.next)
 			alphasort_version_246(fd, lib, me);
 	}
+	
+	if(main->versionfile <= 246 && main->subversionfile < 1){
+		Object *ob;
+		for(ob = main->object.first; ob; ob= ob->id.next) {
+			if(ob->pd && (ob->pd->forcefield == PFIELD_WIND))
+				ob->pd->f_noise = 0.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! */
@@ -8499,9 +8479,6 @@ static void expand_object(FileData *fd, Main *mainvar, Object *ob)
 
 	sens= ob->sensors.first;
 	while(sens) {
-		for(a=0; a<sens->totlinks; a++) {
-			sens->links[a]= newglobadr(fd, sens->links[a]);
-		}
 		if(sens->type==SENS_TOUCH) {
 			bTouchSensor *ts= sens->data;
 			expand_doit(fd, mainvar, ts->ma);
@@ -8515,9 +8492,6 @@ static void expand_object(FileData *fd, Main *mainvar, Object *ob)
 
 	cont= ob->controllers.first;
 	while(cont) {
-		for(a=0; a<cont->totlinks; a++) {
-			cont->links[a]= newglobadr(fd, cont->links[a]);
-		}
 		if(cont->type==CONT_PYTHON) {
 			bPythonCont *pc= cont->data;
 			expand_doit(fd, mainvar, pc->text);
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 3af7d3f7c25..3bc6799d616 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -535,6 +535,7 @@ static void write_particlesettings(WriteData *wd, ListBase *idbase)
 			writestruct(wd, ID_PA, "ParticleSettings", 1, part);
 			if (part->id.properties) IDP_WriteProperty(part->id.properties, wd);
 			writestruct(wd, DATA, "PartDeflect", 1, part->pd);
+			writestruct(wd, DATA, "PartDeflect", 1, part->pd2);
 		}
 		part= part->id.next;
 	}
@@ -608,6 +609,9 @@ static void write_sensors(WriteData *wd, ListBase *lb)
 		case SENS_ACTUATOR:
 			writestruct(wd, DATA, "bActuatorSensor", 1, sens->data);
 			break;
+		case SENS_DELAY:
+			writestruct(wd, DATA, "bDelaySensor", 1, sens->data);
+			break;
 		case SENS_COLLISION:
 			writestruct(wd, DATA, "bCollisionSensor", 1, sens->data);
 			break;
diff --git a/source/blender/blenpluginapi/intern/pluginapi.c b/source/blender/blenpluginapi/intern/pluginapi.c
index e65148a0b04..9c08a0b2f9d 100644
--- a/source/blender/blenpluginapi/intern/pluginapi.c
+++ b/source/blender/blenpluginapi/intern/pluginapi.c
@@ -50,10 +50,12 @@
 #include "plugin.h"
 #include "MEM_guardedalloc.h"
 
+#include "BLO_sys_types.h" // needed for intptr_t
+
 #include "BLI_blenlib.h"  /* util and noise functions */
 #include "BLI_threads.h"  /* For threadsfe guardedalloc malloc/calloc/free */
 #include "IMB_imbuf.h"    /* image buffer stuff       */
-#define GET_INT_FROM_POINTER(i) ((int)(long)(i)) /* should use BKE_utildefines.h */
+#define GET_INT_FROM_POINTER(i) ((int)(intptr_t)(i)) /* should use BKE_utildefines.h */
 
 /* -------------------------------------------------------------------------- */
 /* stuff from util.h                                                          */ 
diff --git a/source/blender/imbuf/intern/cineon/cineonlib.c b/source/blender/imbuf/intern/cineon/cineonlib.c
index 3b45a9de822..ecee3c7d6c0 100644
--- a/source/blender/imbuf/intern/cineon/cineonlib.c
+++ b/source/blender/imbuf/intern/cineon/cineonlib.c
@@ -67,12 +67,12 @@ fillCineonFileInfo(CineonFile* cineon, CineonFileInformation* fileInfo, const ch
 static void
 dumpCineonFileInfo(CineonFileInformation* fileInfo) {
 	d_printf("\n--File Information--\n");
-	d_printf("Magic: %8.8lX\n", (unsigned long)ntohl(fileInfo->magic_num));
-	d_printf("Image Offset %ld\n", (long)ntohl(fileInfo->image_offset));
-	d_printf("Generic Header size %ld\n", (long)ntohl(fileInfo->gen_hdr_size));
-	d_printf("Industry Header size %ld\n", (long)ntohl(fileInfo->ind_hdr_size));
-	d_printf("User Data size %ld\n", (long)ntohl(fileInfo->user_data_size));
-	d_printf("File size %ld\n", (long)ntohl(fileInfo->file_size));
+	d_printf("Magic: %8.8lX\n", (uintptr_t)ntohl(fileInfo->magic_num));
+	d_printf("Image Offset %ld\n", (intptr_t)ntohl(fileInfo->image_offset));
+	d_printf("Generic Header size %ld\n", (intptr_t)ntohl(fileInfo->gen_hdr_size));
+	d_printf("Industry Header size %ld\n", (intptr_t)ntohl(fileInfo->ind_hdr_size));
+	d_printf("User Data size %ld\n", (intptr_t)ntohl(fileInfo->user_data_size));
+	d_printf("File size %ld\n", (intptr_t)ntohl(fileInfo->file_size));
 	d_printf("Version \"%s\"\n", fileInfo->vers);
 	d_printf("File name \"%s\"\n", fileInfo->file_name);
 	d_printf("Creation date \"%s\"\n", fileInfo->create_date);
@@ -112,11 +112,11 @@ dumpCineonChannelInfo(CineonChannelInformation* chan) {
 		default: d_printf(" (unknown)\n"); break;
 	}
 	d_printf("	Bits per pixel %d\n", chan->bits_per_pixel);
-	d_printf("	Pixels per line %ld\n", (long)ntohl(chan->pixels_per_line));
-	d_printf("	Lines per image %ld\n", (long)ntohl(chan->lines_per_image));
-	d_printf("	Ref low data %ld\n", (long)ntohl(chan->ref_low_data));
+	d_printf("	Pixels per line %ld\n", (intptr_t)ntohl(chan->pixels_per_line));
+	d_printf("	Lines per image %ld\n", (intptr_t)ntohl(chan->lines_per_image));
+	d_printf("	Ref low data %ld\n", (intptr_t)ntohl(chan->ref_low_data));
 	d_printf("	Ref low quantity %f\n", ntohf(chan->ref_low_quantity));
-	d_printf("	Ref high data %ld\n", (long)ntohl(chan->ref_high_data));
+	d_printf("	Ref high data %ld\n", (intptr_t)ntohl(chan->ref_high_data));
 	d_printf("	Ref high quantity %f\n", ntohf(chan->ref_high_quantity));
 }
 
@@ -231,8 +231,8 @@ dumpCineonFormatInfo(CineonFormatInformation* formatInfo) {
 	} else {
 		d_printf(" positive\n");
 	}
-	d_printf("End of line padding %ld\n", (long)ntohl(formatInfo->line_padding));
-	d_printf("End of channel padding %ld\n", (long)ntohl(formatInfo->channel_padding));
+	d_printf("End of line padding %ld\n", (intptr_t)ntohl(formatInfo->line_padding));
+	d_printf("End of channel padding %ld\n", (intptr_t)ntohl(formatInfo->channel_padding));
 }
 
 static void
@@ -256,8 +256,8 @@ fillCineonOriginationInfo(CineonFile* cineon,
 static void
 dumpCineonOriginationInfo(CineonOriginationInformation* originInfo) {
 	d_printf("\n--Origination Information--\n");
-	d_printf("X offset %ld\n", (long)ntohl(originInfo->x_offset));
-	d_printf("Y offset %ld\n", (long)ntohl(originInfo->y_offset));
+	d_printf("X offset %ld\n", (intptr_t)ntohl(originInfo->x_offset));
+	d_printf("Y offset %ld\n", (intptr_t)ntohl(originInfo->y_offset));
 	d_printf("File name \"%s\"\n", originInfo->file_name);
 	d_printf("Creation date \"%s\"\n", originInfo->create_date);
 	d_printf("Creation time \"%s\"\n", originInfo->create_time);
@@ -529,7 +529,7 @@ cineonOpen(const char* filename) {
 	/* let's assume cineon files are always network order */
 	if (header.fileInfo.magic_num != ntohl(CINEON_FILE_MAGIC)) {
 		if (verbose) d_printf("Bad magic number %8.8lX in \"%s\".\n",
-			(unsigned long)ntohl(header.fileInfo.magic_num), filename);
+			(uintptr_t)ntohl(header.fileInfo.magic_num), filename);
 		cineonClose(cineon);
 		return 0;
 	}
@@ -628,7 +628,7 @@ cineonOpenFromMem(unsigned char *mem, unsigned int size) {
 
 	/* let's assume cineon files are always network order */
 	if (header.fileInfo.magic_num != ntohl(CINEON_FILE_MAGIC)) {
-		if (verbose) d_printf("Bad magic number %8.8lX in\n", (unsigned long)ntohl(header.fileInfo.magic_num));
+		if (verbose) d_printf("Bad magic number %8.8lX in\n", (uintptr_t)ntohl(header.fileInfo.magic_num));
 
 		cineonClose(cineon);
 		return 0;
diff --git a/source/blender/imbuf/intern/cineon/dpxlib.c b/source/blender/imbuf/intern/cineon/dpxlib.c
index 500c09ba265..1710cdde501 100644
--- a/source/blender/imbuf/intern/cineon/dpxlib.c
+++ b/source/blender/imbuf/intern/cineon/dpxlib.c
@@ -58,15 +58,15 @@ fillDpxChannelInfo(DpxFile* dpx, DpxChannelInformation* chan, int des) {
 
 static void
 dumpDpxChannelInfo(DpxChannelInformation* chan) {
-	d_printf("	Signage %ld", (long)ntohl(chan->signage));
-	d_printf("	Ref low data %ld\n", (long)ntohl(chan->ref_low_data));
+	d_printf("	Signage %ld", (intptr_t)ntohl(chan->signage));
+	d_printf("	Ref low data %ld\n", (intptr_t)ntohl(chan->ref_low_data));
 	d_printf("	Ref low quantity %f\n", ntohf(chan->ref_low_quantity));
-	d_printf("	Ref high data %ld\n", (long)ntohl(chan->ref_high_data));
+	d_printf("	Ref high data %ld\n", (intptr_t)ntohl(chan->ref_high_data));
 	d_printf("	Ref high quantity %f\n", ntohf(chan->ref_high_quantity));
 	d_printf("	Designator1: %d,", chan->designator1);
 	d_printf("	Bits per pixel %d\n", chan->bits_per_pixel);
 	d_printf("	Packing: %d,", ntohs(chan->packing));
-	d_printf("	Data Offset: %ld,", (long)ntohl(chan->data_offset));
+	d_printf("	Data Offset: %ld,", (intptr_t)ntohl(chan->data_offset));
 }
 
 static void
@@ -110,19 +110,19 @@ static void
 dumpDpxFileInfo(DpxFileInformation* fileInfo) {
 	d_printf("\n--File Information--\n");
 	d_printf("Magic: %8.8lX\n", (unsigned long)ntohl(fileInfo->magic_num));
-	d_printf("Image Offset %ld\n", (long)ntohl(fileInfo->offset));
+	d_printf("Image Offset %ld\n", (intptr_t)ntohl(fileInfo->offset));
 	d_printf("Version \"%s\"\n", fileInfo->vers);
-	d_printf("File size %ld\n", (long)ntohl(fileInfo->file_size));
-	d_printf("Ditto key %ld\n", (long)ntohl(fileInfo->ditto_key));
-	d_printf("Generic Header size %ld\n", (long)ntohl(fileInfo->gen_hdr_size));
-	d_printf("Industry Header size %ld\n", (long)ntohl(fileInfo->ind_hdr_size));
-	d_printf("User Data size %ld\n", (long)ntohl(fileInfo->user_data_size));
+	d_printf("File size %ld\n", (intptr_t)ntohl(fileInfo->file_size));
+	d_printf("Ditto key %ld\n", (intptr_t)ntohl(fileInfo->ditto_key));
+	d_printf("Generic Header size %ld\n", (intptr_t)ntohl(fileInfo->gen_hdr_size));
+	d_printf("Industry Header size %ld\n", (intptr_t)ntohl(fileInfo->ind_hdr_size));
+	d_printf("User Data size %ld\n", (intptr_t)ntohl(fileInfo->user_data_size));
 	d_printf("File name \"%s\"\n", fileInfo->file_name);
 	d_printf("Creation date \"%s\"\n", fileInfo->create_date);
 	d_printf("Creator \"%s\"\n", fileInfo->creator);
 	d_printf("Project \"%s\"\n", fileInfo->project);
 	d_printf("Copyright \"%s\"\n", fileInfo->copyright);
-	d_printf("Key %ld\n", (long)ntohl(fileInfo->key));
+	d_printf("Key %ld\n", (intptr_t)ntohl(fileInfo->key));
 }
 
 static void
@@ -150,8 +150,8 @@ dumpDpxImageInfo(DpxImageInformation* imageInfo) {
 	d_printf("Image orientation %d,", ntohs(imageInfo->orientation));
 	n = ntohs(imageInfo->channels_per_image);
 	d_printf("Channels %d\n", n);
-	d_printf("Pixels per line %ld\n", (long)ntohl(imageInfo->pixels_per_line));
-	d_printf("Lines per image %ld\n", (long)ntohl(imageInfo->lines_per_image));
+	d_printf("Pixels per line %ld\n", (intptr_t)ntohl(imageInfo->pixels_per_line));
+	d_printf("Lines per image %ld\n", (intptr_t)ntohl(imageInfo->lines_per_image));
 	for (i = 0; i < n; ++i) {
 		d_printf("	--Channel %d--\n", i);
 		dumpDpxChannelInfo(&imageInfo->channel[i]);
@@ -166,12 +166,12 @@ fillDpxOriginationInfo(
 static void
 dumpDpxOriginationInfo(DpxOriginationInformation* originInfo) {
 	d_printf("\n--Origination Information--\n");
-	d_printf("X offset %ld\n", (long)ntohl(originInfo->x_offset));
-	d_printf("Y offset %ld\n", (long)ntohl(originInfo->y_offset));
+	d_printf("X offset %ld\n", (intptr_t)ntohl(originInfo->x_offset));
+	d_printf("Y offset %ld\n", (intptr_t)ntohl(originInfo->y_offset));
 	d_printf("X centre %f\n", ntohf(originInfo->x_centre));
 	d_printf("Y centre %f\n", ntohf(originInfo->y_centre));
-	d_printf("Original X %ld\n", (long)ntohl(originInfo->x_original_size));
-	d_printf("Original Y %ld\n", (long)ntohl(originInfo->y_original_size));
+	d_printf("Original X %ld\n", (intptr_t)ntohl(originInfo->x_original_size));
+	d_printf("Original Y %ld\n", (intptr_t)ntohl(originInfo->y_original_size));
 	d_printf("File name \"%s\"\n", originInfo->file_name);
 	d_printf("Creation time \"%s\"\n", originInfo->creation_time);
 	d_printf("Input device \"%s\"\n", originInfo->input_device);
@@ -417,7 +417,7 @@ intern_dpxOpen(int mode, const char* bytestuff, int bufsize) {
 	/* let's assume dpx files are always network order */
 	if (header.fileInfo.magic_num != ntohl(DPX_FILE_MAGIC)) {
 		if (verbose) d_printf("Bad magic number %8.8lX in \"%s\".\n",
-			(unsigned long)ntohl(header.fileInfo.magic_num), filename);
+			(uintptr_t)ntohl(header.fileInfo.magic_num), filename);
 		dpxClose(dpx);
 		return 0;
 	}
diff --git a/source/blender/imbuf/intern/cineon/logImageCore.h b/source/blender/imbuf/intern/cineon/logImageCore.h
index 01eff8d570d..2646e8b3c12 100644
--- a/source/blender/imbuf/intern/cineon/logImageCore.h
+++ b/source/blender/imbuf/intern/cineon/logImageCore.h
@@ -34,7 +34,9 @@
 extern "C" {
 #endif
 
-
+#include "BLO_sys_types.h" // for intptr_t support
+#undef ntohl
+#undef htonl
 typedef int (GetRowFn)(LogImageFile* logImage, unsigned short* row, int lineNum);
 typedef int (SetRowFn)(LogImageFile* logImage, const unsigned short* row, int lineNum);
 typedef void (CloseFn)(LogImageFile* logImage);
@@ -80,7 +82,7 @@ struct _Log_Image_File_t_
 	CloseFn* close;
 	
 	unsigned char *membuffer;
-	unsigned long membuffersize;
+	uintptr_t membuffersize;
 	unsigned char *memcursor;
 };
 
diff --git a/source/blender/imbuf/intern/cineon/logmemfile.c b/source/blender/imbuf/intern/cineon/logmemfile.c
index 20359335933..160e8453713 100644
--- a/source/blender/imbuf/intern/cineon/logmemfile.c
+++ b/source/blender/imbuf/intern/cineon/logmemfile.c
@@ -24,10 +24,10 @@
 
 #include "logImageCore.h"
 
-int logimage_fseek(void* logfile, long offsett, int origin)
+int logimage_fseek(void* logfile, intptr_t offsett, int origin)
 {	
 	struct _Log_Image_File_t_ *file = (struct _Log_Image_File_t_*) logfile;
-	long offset = offsett;
+	intptr_t offset = offsett;
 	
 	if (file->file) fseek(file->file, offset, origin);
 	else { /*we're seeking in memory*/
@@ -38,7 +38,7 @@ int logimage_fseek(void* logfile, long offsett, int origin)
 			if (offset > file->membuffersize) return 1;
 			file->memcursor = (file->membuffer + file->membuffersize) - offset;
 		} else if (origin==SEEK_CUR) {
-			unsigned long pos = (unsigned long)file->membuffer - (unsigned long)file->memcursor;
+			uintptr_t pos = (uintptr_t)file->membuffer - (uintptr_t)file->memcursor;
 			if (pos + offset > file->membuffersize) return 1;
 			if (pos < 0) return 1;
 			file->memcursor += offset;
diff --git a/source/blender/imbuf/intern/cineon/logmemfile.h b/source/blender/imbuf/intern/cineon/logmemfile.h
index 6e82cf2b145..39e2f36dad9 100644
--- a/source/blender/imbuf/intern/cineon/logmemfile.h
+++ b/source/blender/imbuf/intern/cineon/logmemfile.h
@@ -22,7 +22,7 @@
 #ifndef _LOGMEMFILE_H
 #define _LOGMEMFILE_H
 
-int logimage_fseek(void* logfile, long offsett, int origin);
+int logimage_fseek(void* logfile, intptr_t offsett, int origin);
 int logimage_fwrite(void *buffer, unsigned int size, unsigned int count, void *logfile);
 int logimage_fread(void *buffer, unsigned int size, unsigned int count, void *logfile);
 
diff --git a/source/blender/imbuf/intern/scaling.c b/source/blender/imbuf/intern/scaling.c
index 40c1f83c98c..8257eb4643e 100644
--- a/source/blender/imbuf/intern/scaling.c
+++ b/source/blender/imbuf/intern/scaling.c
@@ -39,6 +39,8 @@
 #include "IMB_allocimbuf.h"
 #include "IMB_filter.h"
 
+#include "BLO_sys_types.h" // for intptr_t support
+
 /************************************************************************/
 /*								SCALING									*/
 /************************************************************************/
@@ -490,8 +492,8 @@ static void enlarge_picture_byte(
 		/ (double) (src_width - 1.001);
 	double ratioy = (double) (dst_height - 1.0) 
 		/ (double) (src_height - 1.001);
-	unsigned long x_src, dx_src, x_dst;
-	unsigned long y_src, dy_src, y_dst;
+	uintptr_t x_src, dx_src, x_dst;
+	uintptr_t y_src, dy_src, y_dst;
 
 	dx_src = 65536.0 / ratiox;
 	dy_src = 65536.0 / ratioy;
@@ -500,8 +502,8 @@ static void enlarge_picture_byte(
 	for (y_dst = 0; y_dst < dst_height; y_dst++) {
 		unsigned char* line1 = src + (y_src >> 16) * 4 * src_width;
 		unsigned char* line2 = line1 + 4 * src_width;
-		unsigned long weight1y = 65536 - (y_src & 0xffff);
-		unsigned long weight2y = 65536 - weight1y;
+		uintptr_t weight1y = 65536 - (y_src & 0xffff);
+		uintptr_t weight2y = 65536 - weight1y;
 
 		if ((y_src >> 16) == src_height - 1) {
 			line2 = line1;
@@ -509,8 +511,8 @@ static void enlarge_picture_byte(
 
 		x_src = 0;
 		for (x_dst = 0; x_dst < dst_width; x_dst++) {
-			unsigned long weight1x = 65536 - (x_src & 0xffff);
-			unsigned long weight2x = 65536 - weight1x;
+			uintptr_t weight1x = 65536 - (x_src & 0xffff);
+			uintptr_t weight2x = 65536 - weight1x;
 
 			unsigned long x = (x_src >> 16) * 4;
 
@@ -557,12 +559,12 @@ static void enlarge_picture_byte(
 }
 
 struct scale_outpix_byte {
-	unsigned long r;
-	unsigned long g;
-	unsigned long b;
-	unsigned long a;
+	uintptr_t r;
+	uintptr_t g;
+	uintptr_t b;
+	uintptr_t a;
 
-	unsigned long weight;
+	uintptr_t weight;
 };
 
 static void shrink_picture_byte(
@@ -571,9 +573,9 @@ static void shrink_picture_byte(
 {
 	double ratiox = (double) (dst_width) / (double) (src_width);
 	double ratioy = (double) (dst_height) / (double) (src_height);
-	unsigned long x_src, dx_dst, x_dst;
-	unsigned long y_src, dy_dst, y_dst;
-	long y_counter;
+	uintptr_t x_src, dx_dst, x_dst;
+	uintptr_t y_src, dy_dst, y_dst;
+	intptr_t y_counter;
 	unsigned char * dst_begin = dst;
 
 	struct scale_outpix_byte * dst_line1 = NULL;
@@ -593,16 +595,16 @@ static void shrink_picture_byte(
 	y_counter = 65536;
 	for (y_src = 0; y_src < src_height; y_src++) {
 		unsigned char* line = src + y_src * 4 * src_width;
-		unsigned long weight1y = 65536 - (y_dst & 0xffff);
-		unsigned long weight2y = 65536 - weight1y;
+		uintptr_t weight1y = 65536 - (y_dst & 0xffff);
+		uintptr_t weight2y = 65536 - weight1y;
 		x_dst = 0;
 		for (x_src = 0; x_src < src_width; x_src++) {
-			unsigned long weight1x = 65536 - (x_dst & 0xffff);
-			unsigned long weight2x = 65536 - weight1x;
+			uintptr_t weight1x = 65536 - (x_dst & 0xffff);
+			uintptr_t weight2x = 65536 - weight1x;
 
-			unsigned long x = x_dst >> 16;
+			uintptr_t x = x_dst >> 16;
 
-			unsigned long w;
+			uintptr_t w;
 
 			w = (weight1y * weight1x) >> 16;
 
@@ -643,13 +645,13 @@ static void shrink_picture_byte(
 		y_dst += dy_dst;
 		y_counter -= dy_dst;
 		if (y_counter < 0) {
-			unsigned long x;
+			uintptr_t x;
 			struct scale_outpix_byte * temp;
 
 			y_counter += 65536;
 			
 			for (x=0; x < dst_width; x++) {
-				unsigned long f = 0x80000000UL
+				uintptr_t f = 0x80000000UL
 					/ dst_line1[x].weight;
 				*dst++ = (dst_line1[x].r * f) >> 15;
 				*dst++ = (dst_line1[x].g * f) >> 15;
@@ -664,9 +666,9 @@ static void shrink_picture_byte(
 		}
 	}
 	if (dst - dst_begin < dst_width * dst_height * 4) {
-		unsigned long x;
+		uintptr_t x;
 		for (x = 0; x < dst_width; x++) {
-			unsigned long f = 0x80000000UL / dst_line1[x].weight;
+			uintptr_t f = 0x80000000UL / dst_line1[x].weight;
 			*dst++ = (dst_line1[x].r * f) >> 15;
 			*dst++ = (dst_line1[x].g * f) >> 15;
 			*dst++ = (dst_line1[x].b * f) >> 15;
@@ -698,8 +700,8 @@ static void enlarge_picture_float(
 		/ (double) (src_width - 1.001);
 	double ratioy = (double) (dst_height - 1.0) 
 		/ (double) (src_height - 1.001);
-	unsigned long x_dst;
-	unsigned long y_dst;
+	uintptr_t x_dst;
+	uintptr_t y_dst;
 	double x_src, dx_src;
 	double y_src, dy_src;
 
@@ -727,7 +729,7 @@ static void enlarge_picture_float(
 			float w12 = weight1y * weight2x;
 			float w22 = weight2y * weight2x;
 
-			unsigned long x = ((int) x_src) * 4;
+			uintptr_t x = ((int) x_src) * 4;
 
 			*dst++ =  line1[x]     * w11	
 				+ line2[x]     * w21
@@ -770,8 +772,8 @@ static void shrink_picture_float(
 {
 	double ratiox = (double) (dst_width) / (double) (src_width);
 	double ratioy = (double) (dst_height) / (double) (src_height);
-	unsigned long x_src;
-	unsigned long y_src;
+	uintptr_t x_src;
+	uintptr_t y_src;
         float dx_dst, x_dst;
 	float dy_dst, y_dst;
 	float y_counter;
@@ -794,14 +796,14 @@ static void shrink_picture_float(
 	y_counter = 1.0;
 	for (y_src = 0; y_src < src_height; y_src++) {
 		float* line = src + y_src * 4 * src_width;
-		unsigned long weight1y = 1.0 - (y_dst - (int) y_dst);
-		unsigned long weight2y = 1.0 - weight1y;
+		uintptr_t weight1y = 1.0 - (y_dst - (int) y_dst);
+		uintptr_t weight2y = 1.0 - weight1y;
 		x_dst = 0;
 		for (x_src = 0; x_src < src_width; x_src++) {
-			unsigned long weight1x = 1.0 - (x_dst - (int) x_dst);
-			unsigned long weight2x = 1.0 - weight1x;
+			uintptr_t weight1x = 1.0 - (x_dst - (int) x_dst);
+			uintptr_t weight2x = 1.0 - weight1x;
 
-			unsigned long x = (int) x_dst;
+			uintptr_t x = (int) x_dst;
 
 			float w;
 
@@ -844,7 +846,7 @@ static void shrink_picture_float(
 		y_dst += dy_dst;
 		y_counter -= dy_dst;
 		if (y_counter < 0) {
-			unsigned long x;
+			uintptr_t x;
 			struct scale_outpix_float * temp;
 
 			y_counter += 1.0;
@@ -864,7 +866,7 @@ static void shrink_picture_float(
 		}
 	}
 	if (dst - dst_begin < dst_width * dst_height * 4) {
-		unsigned long x;
+		uintptr_t x;
 		for (x = 0; x < dst_width; x++) {
 			float f = 1.0 / dst_line1[x].weight;
 			*dst++ = dst_line1[x].r * f;
diff --git a/source/blender/include/BDR_gpencil.h b/source/blender/include/BDR_gpencil.h
index eb749cf28ec..9b9294b0343 100644
--- a/source/blender/include/BDR_gpencil.h
+++ b/source/blender/include/BDR_gpencil.h
@@ -43,7 +43,6 @@ struct bGPDframe;
 /* Temporary 'Stroke Point' data */
 typedef struct tGPspoint {
 	short x, y;				/* x and y coordinates of cursor (in relative to area) */
-	float xf, yf;			/* same as x and y, but as floats */
 	float pressure;			/* pressure of tablet at this point */
 } tGPspoint;
 
@@ -77,6 +76,9 @@ void gpencil_delete_laststroke(struct bGPdata *gpd);
 void gpencil_delete_operation(short mode);
 void gpencil_delete_menu(void);
 
+void gpencil_convert_operation(short mode);
+void gpencil_convert_menu(void);
+
 //short gpencil_paint(short mousebutton);
 short gpencil_do_paint(struct ScrArea *sa, short mousebutton);
 
diff --git a/source/blender/include/BIF_drawgpencil.h b/source/blender/include/BIF_drawgpencil.h
index 418446313df..eacafce058d 100644
--- a/source/blender/include/BIF_drawgpencil.h
+++ b/source/blender/include/BIF_drawgpencil.h
@@ -28,15 +28,18 @@
 #ifndef BIF_DRAWGPENCIL_H
 #define BIF_DRAWGPENCIL_H
 
+
+struct bGPdata;
 struct ScrArea;
 struct View3D;
 struct SpaceNode;
 struct SpaceSeq;
-struct bGPdata;
 struct uiBlock;
+struct ImBuf;
 
 short draw_gpencil_panel(struct uiBlock *block, struct bGPdata *gpd, struct ScrArea *sa); 
 
+void draw_gpencil_2dimage(struct ScrArea *sa, struct ImBuf *ibuf);
 void draw_gpencil_2dview(struct ScrArea *sa, short onlyv2d);
 void draw_gpencil_3dview(struct ScrArea *sa, short only3d);
 void draw_gpencil_oglrender(struct View3D *v3d, int winx, int winy);
diff --git a/source/blender/include/BIF_editarmature.h b/source/blender/include/BIF_editarmature.h
index 07fc8f08b4a..b2bdb2dad73 100644
--- a/source/blender/include/BIF_editarmature.h
+++ b/source/blender/include/BIF_editarmature.h
@@ -91,6 +91,7 @@ void	free_editArmature(void);
 
 int		join_armature(void);
 void 	separate_armature(void);
+void	apply_armature_pose2bones(void);
 void	load_editArmature(void);
 
 void	make_bone_parent(void);
diff --git a/source/blender/include/BIF_editview.h b/source/blender/include/BIF_editview.h
index d2c6c56d01a..204733a19d6 100644
--- a/source/blender/include/BIF_editview.h
+++ b/source/blender/include/BIF_editview.h
@@ -40,6 +40,7 @@ void	arrows_move_cursor(unsigned short event);
 void 	lasso_select_boundbox(struct rcti *rect, short mcords[][2], short moves);
 int		lasso_inside(short mcords[][2], short moves, short sx, short sy);
 int 	lasso_inside_edge(short mcords[][2], short moves, int x0, int y0, int x1, int y1);
+int 	edge_inside_circle(short centx, short centy, short rad, short x1, short y1, short x2, short y2);
 void	borderselect(void);
 void	circle_select(void);
 void	deselectall(void);
diff --git a/source/blender/include/BIF_meshtools.h b/source/blender/include/BIF_meshtools.h
index b08c66fd16e..d809d1f21f9 100644
--- a/source/blender/include/BIF_meshtools.h
+++ b/source/blender/include/BIF_meshtools.h
@@ -40,7 +40,7 @@ extern void objects_bake_render_menu(void);
 extern void objects_bake_render_ui(short event);
 extern void objects_bake_render(short event, char **error_msg);
 
-extern long mesh_octree_table(struct Object *ob, float *co, char mode);
+extern intptr_t mesh_octree_table(struct Object *ob, float *co, char mode);
 extern int mesh_get_x_mirror_vert(struct Object *ob, int index);
 extern struct EditVert *editmesh_get_x_mirror_vert(struct Object *ob, float *co);
 extern int *mesh_get_x_mirror_faces(struct Object *ob);
diff --git a/source/blender/include/BIF_resources.h b/source/blender/include/BIF_resources.h
index 92f18a89a4b..5099c253c79 100644
--- a/source/blender/include/BIF_resources.h
+++ b/source/blender/include/BIF_resources.h
@@ -524,6 +524,10 @@ enum {
 	
 	TH_EDGE_SHARP,
 	TH_EDITMESH_ACTIVE,
+
+	TH_HANDLE_VERTEX,
+	TH_HANDLE_VERTEX_SELECT,
+	TH_HANDLE_VERTEX_SIZE,
 };
 /* XXX WARNING: previous is saved in file, so do not change order! */
 
diff --git a/source/blender/include/BSE_drawipo.h b/source/blender/include/BSE_drawipo.h
index 932f103a579..b8388b2172a 100644
--- a/source/blender/include/BSE_drawipo.h
+++ b/source/blender/include/BSE_drawipo.h
@@ -42,6 +42,7 @@ struct ScrArea;
 struct EditIpo;
 struct View2D;
 struct rctf;
+struct SpaceLink;
 
 void calc_ipogrid(void);
 void draw_ipogrid(void);
@@ -50,6 +51,8 @@ void areamouseco_to_ipoco	(struct View2D *v2d, short *mval, float *x, float *y);
 void ipoco_to_areaco		(struct View2D *v2d, float *vec, short *mval);
 void ipoco_to_areaco_noclip	(struct View2D *v2d, float *vec, short *mval);
 
+struct View2D *spacelink_get_view2d(struct SpaceLink *sl);
+
 void view2d_do_locks		(struct ScrArea *cursa, int flag);
 void view2d_zoom			(struct View2D *v2d, float factor, int winx, int winy);
 void view2d_getscale		(struct View2D *v2d, float *x, float *y);
diff --git a/source/blender/include/transform.h b/source/blender/include/transform.h
index 720b856a149..51fa39ff9d6 100644
--- a/source/blender/include/transform.h
+++ b/source/blender/include/transform.h
@@ -466,7 +466,6 @@ int validSnappingNormal(TransInfo *t);
 /*********************** Generics ********************************/
 
 void initTrans(TransInfo *t);
-void initTransModeFlags(TransInfo *t, int mode);
 void postTrans (TransInfo *t);
 
 void drawLine(float *center, float *dir, char axis, short options);
@@ -498,6 +497,7 @@ TransInfo * BIF_GetTransInfo(void);
 
 /*********************** NumInput ********************************/
 
+void initNumInput(NumInput *n);
 void outputNumInput(NumInput *n, char *str);
 short hasNumInput(NumInput *n);
 void applyNumInput(NumInput *n, float *vec);
diff --git a/source/blender/makesdna/DNA_actuator_types.h b/source/blender/makesdna/DNA_actuator_types.h
index 7444ce95f56..59d0555b452 100644
--- a/source/blender/makesdna/DNA_actuator_types.h
+++ b/source/blender/makesdna/DNA_actuator_types.h
@@ -81,7 +81,9 @@ typedef struct bEditObjectActuator {
 	struct Mesh *me;
 	char name[32];
 	float linVelocity[3]; /* initial lin. velocity on creation */
-	short localflag; /* flag for the lin. vel: apply locally   */
+	float angVelocity[3]; /* initial ang. velocity on creation */
+	float pad;
+	short localflag; /* flag for the lin & ang. vel: apply locally   */
 	short dyn_operation;
 } bEditObjectActuator;
 
@@ -384,6 +386,9 @@ typedef struct FreeCamera {
 #define ACT_EDOB_TRACK_TO		3
 #define ACT_EDOB_DYNAMICS		4
 
+/* editObjectActuator->localflag */
+#define ACT_EDOB_LOCAL_LINV		2
+#define ACT_EDOB_LOCAL_ANGV		4
 
 
 /* editObjectActuator->flag */
diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h
index dca4e28688d..cc0c9912057 100644
--- a/source/blender/makesdna/DNA_gpencil_types.h
+++ b/source/blender/makesdna/DNA_gpencil_types.h
@@ -59,8 +59,10 @@ typedef struct bGPDstroke {
 #define GP_STROKE_3DSPACE		(1<<0)
 	/* stroke is in 2d-space */
 #define GP_STROKE_2DSPACE		(1<<1)
-	/* stroke is an "eraser" stroke */
-#define GP_STROKE_ERASER		(1<<2)
+	/* stroke is in 2d-space (but with special 'image' scaling) */
+#define GP_STROKE_2DIMAGE		(1<<2)
+	/* only for use with stroke-buffer (while drawing eraser) */
+#define GP_STROKE_ERASER		(1<<15)
 
 
 /* Grease-Pencil Annotations - 'Frame'
diff --git a/source/blender/makesdna/DNA_ipo_types.h b/source/blender/makesdna/DNA_ipo_types.h
index 3954a500dc7..1e30f3f7640 100644
--- a/source/blender/makesdna/DNA_ipo_types.h
+++ b/source/blender/makesdna/DNA_ipo_types.h
@@ -354,8 +354,8 @@ typedef short IPO_Channel;
 
 /* ******************** */
 /* particle ipos */
-#define PART_TOTIPO		19
-#define PART_TOTNAM		19
+#define PART_TOTIPO		25
+#define PART_TOTNAM		25
 
 #define PART_EMIT_FREQ	1
 #define PART_EMIT_LIFE	2
@@ -381,6 +381,14 @@ typedef short IPO_Channel;
 
 #define PART_BB_TILT	19
 
+#define PART_PD_FSTR	20
+#define PART_PD_FFALL	21
+#define PART_PD_FMAXD	22
+
+#define PART_PD2_FSTR	23
+#define PART_PD2_FFALL	24
+#define PART_PD2_FMAXD	25
+
 
 /* these are IpoCurve specific */
 /* **************** IPO ********************* */
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index a44d9793062..9599cc1d247 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -35,6 +35,7 @@ typedef enum ModifierType {
 	eModifierType_Cloth,
 	eModifierType_Collision,
 	eModifierType_Bevel,
+	eModifierType_Shrinkwrap,
 	NUM_MODIFIER_TYPES
 } ModifierType;
 
@@ -390,7 +391,8 @@ typedef struct CollisionModifierData {
 	
 	unsigned int numverts;
 	unsigned int numfaces;
-	int pad;
+	short absorption; /* used for forces, in % */
+	short pad;
 	float time;		/* cfra time of modifier */
 	struct BVHTree *bvhtree; /* bounding volume hierarchy for this cloth object */
 } CollisionModifierData;
@@ -490,4 +492,45 @@ typedef struct ExplodeModifierData {
 	float protect;
 } ExplodeModifierData;
 
+typedef struct ShrinkwrapModifierData {
+	ModifierData modifier;
+
+	struct Object *target;	/* shrink target */
+	struct Object *auxTarget; /* additional shrink target */
+	char vgroup_name[32];	/* optional vertexgroup name */
+	float keepDist;			/* distance offset to keep from mesh/projection point */
+	short shrinkType;		/* shrink type projection */
+	short shrinkOpts;		/* shrink options */
+	char projAxis;			/* axis to project over */
+
+	/*
+	 * if using projection over vertex normal this controls the
+	 * the level of subsurface that must be done before getting the
+	 * vertex coordinates and normal
+	 */
+	char subsurfLevels;
+
+	char pad[6];
+
+} ShrinkwrapModifierData;
+
+/* Shrinkwrap->shrinkType */
+#define MOD_SHRINKWRAP_NEAREST_SURFACE	0
+#define MOD_SHRINKWRAP_PROJECT			1
+#define MOD_SHRINKWRAP_NEAREST_VERTEX	2
+
+/* Shrinkwrap->shrinkOpts */
+#define MOD_SHRINKWRAP_PROJECT_ALLOW_POS_DIR	(1<<0)	/* allow shrinkwrap to move the vertex in the positive direction of axis */
+#define MOD_SHRINKWRAP_PROJECT_ALLOW_NEG_DIR	(1<<1)	/* allow shrinkwrap to move the vertex in the negative direction of axis */
+
+#define MOD_SHRINKWRAP_CULL_TARGET_FRONTFACE	(1<<3)	/* ignore vertex moves if a vertex ends projected on a front face of the target */
+#define MOD_SHRINKWRAP_CULL_TARGET_BACKFACE		(1<<4)	/* ignore vertex moves if a vertex ends projected on a back face of the target */
+
+#define MOD_SHRINKWRAP_KEEP_ABOVE_SURFACE		(1<<5)	/* distance is measure to the front face of the target */
+
+#define MOD_SHRINKWRAP_PROJECT_OVER_X_AXIS		(1<<0)
+#define MOD_SHRINKWRAP_PROJECT_OVER_Y_AXIS		(1<<1)
+#define MOD_SHRINKWRAP_PROJECT_OVER_Z_AXIS		(1<<2)
+#define MOD_SHRINKWRAP_PROJECT_OVER_NORMAL			0	/* projection over normal is used if no axis is selected */
+
 #endif
diff --git a/source/blender/makesdna/DNA_object_force.h b/source/blender/makesdna/DNA_object_force.h
index dc6c2bcbcc0..5900e16d5e8 100644
--- a/source/blender/makesdna/DNA_object_force.h
+++ b/source/blender/makesdna/DNA_object_force.h
@@ -67,6 +67,9 @@ typedef struct PartDeflect {
 	float tex_nabla;
 	short tex_mode, kink, kink_axis, rt2;
 	struct Tex *tex;	/* Texture of the texture effector */
+	struct RNG *rng; /* random noise generator for e.g. wind */
+	float f_noise; /* noise of force (currently used for wind) */
+	int pad;
 } PartDeflect;
 
 typedef struct PointCache {
@@ -153,8 +156,8 @@ typedef struct SoftBody {
 #define PFIELD_GUIDE	5
 #define PFIELD_TEXTURE	6
 #define PFIELD_HARMONIC	7
-#define PFIELD_NUCLEAR	8
-#define PFIELD_MDIPOLE	9
+#define PFIELD_CHARGE	8
+#define PFIELD_LENNARDJ	9
 
 
 /* pd->flag: various settings */
diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h
index 4f62cd084cc..363f0075e23 100644
--- a/source/blender/makesdna/DNA_particle_types.h
+++ b/source/blender/makesdna/DNA_particle_types.h
@@ -166,6 +166,7 @@ typedef struct ParticleSettings {
 	struct Object *bb_ob;
 	struct Ipo *ipo;
 	struct PartDeflect *pd;
+	struct PartDeflect *pd2;
 } ParticleSettings;
 
 typedef struct ParticleSystem{				/* note, make sure all (runtime) are NULL's in copy_particlesystem */
@@ -264,6 +265,8 @@ typedef struct ParticleSystem{				/* note, make sure all (runtime) are NULL's in
 #define PART_CHILD_RENDER	(1<<29)
 #define PART_CHILD_GUIDE	(1<<30)
 
+#define PART_SELF_EFFECT	(1<<22)
+
 /* part->rotfrom */
 #define PART_ROT_KEYS		0	/* interpolate directly from keys */
 #define PART_ROT_ZINCR		1	/* same as zdir but done incrementally from previous position */
diff --git a/source/blender/makesdna/DNA_sensor_types.h b/source/blender/makesdna/DNA_sensor_types.h
index c0306f43730..d508ff3a552 100644
--- a/source/blender/makesdna/DNA_sensor_types.h
+++ b/source/blender/makesdna/DNA_sensor_types.h
@@ -88,6 +88,13 @@ typedef struct bActuatorSensor {
 	char name[32];
 } bActuatorSensor;
 
+typedef struct bDelaySensor {
+    short delay;
+	short duration;
+	short flag;
+	short pad;
+} bDelaySensor;
+
 typedef struct bCollisionSensor {
 	char name[32];          /* property name */
 	char materialName[32];  /* material      */
@@ -204,6 +211,7 @@ typedef struct bJoystickSensor {
 #define SENS_MESSAGE   10
 #define SENS_JOYSTICK  11
 #define SENS_ACTUATOR  12
+#define SENS_DELAY     13
 /* sensor->flag */
 #define SENS_SHOW		1
 #define SENS_DEL		2
@@ -229,6 +237,9 @@ typedef struct bJoystickSensor {
  * */
 /*  #define SENS_COLLISION_PROPERTY 0  */
 #define SENS_COLLISION_MATERIAL 1
+/* ray specific mode */
+/* X-Ray means that the ray will traverse objects that don't have the property/material */
+#define SENS_RAY_XRAY			2
 
 /* Some stuff for the mouse sensor Type: */
 #define BL_SENS_MOUSE_LEFT_BUTTON    1
@@ -254,5 +265,7 @@ typedef struct bJoystickSensor {
 #define SENS_JOY_HAT			2
 #define SENS_JOY_HAT_DIR		0
 
+#define SENS_DELAY_REPEAT		1
+
 #endif
 
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index 1e3f337ad99..8e849c5aa3d 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -247,6 +247,7 @@ typedef struct SpaceImage {
 	float xof, yof;					/* user defined offset, image is centered */
 	float centx, centy;				/* storage for offset while render drawing */
 	
+	struct bGPdata *gpd;			/* grease pencil data */
 } SpaceImage;
 
 typedef struct SpaceNla {
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index cd1c047dac9..856324695a9 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -101,6 +101,11 @@ typedef struct ThemeSpace {
 	char movie[4], image[4], scene[4], audio[4];		// for sequence editor
 	char effect[4], plugin[4], transition[4], meta[4];
 	char editmesh_active[4]; 
+
+	char handle_vertex[4];
+	char handle_vertex_select[4];
+	char handle_vertex_size;
+	char hpad[7];
 } ThemeSpace;
 
 
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c
index 3818d66b39c..b4deb1f2b60 100644
--- a/source/blender/makesdna/intern/makesdna.c
+++ b/source/blender/makesdna/intern/makesdna.c
@@ -55,6 +55,8 @@
 #include "MEM_guardedalloc.h"
 #include "DNA_sdna_types.h"
 
+#include "BLO_sys_types.h" // for intptr_t support
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -955,7 +957,7 @@ int make_structDNA(char *baseDirectory, FILE *file)
 		/* calculate size of datablock with strings */
 		cp= names[nr_names-1];
 		cp+= strlen(names[nr_names-1]) + 1;			/* +1: null-terminator */
-		len= (long) (cp - (char*) names[0]);
+		len= (intptr_t) (cp - (char*) names[0]);
 		len= (len+3) & ~3;
 		dna_write(file, names[0], len);
 		
@@ -968,7 +970,7 @@ int make_structDNA(char *baseDirectory, FILE *file)
 		/* calculate datablock size */
 		cp= types[nr_types-1];
 		cp+= strlen(types[nr_types-1]) + 1;		/* +1: null-terminator */
-		len= (long) (cp - (char*) types[0]);
+		len= (intptr_t) (cp - (char*) types[0]);
 		len= (len+3) & ~3;
 		
 		dna_write(file, types[0], len);
@@ -990,7 +992,7 @@ int make_structDNA(char *baseDirectory, FILE *file)
 		/* calc datablock size */
 		sp= structs[nr_structs-1];
 		sp+= 2+ 2*( sp[1] );
-		len= (long) ((char*) sp - (char*) structs[0]);
+		len= (intptr_t) ((char*) sp - (char*) structs[0]);
 		len= (len+3) & ~3;
 		
 		dna_write(file, structs[0], len);
diff --git a/source/blender/python/api2_2x/Draw.c b/source/blender/python/api2_2x/Draw.c
index 047a035fb8b..bd19a6a6a3e 100644
--- a/source/blender/python/api2_2x/Draw.c
+++ b/source/blender/python/api2_2x/Draw.c
@@ -1554,6 +1554,12 @@ static PyObject *Method_Number( PyObject * self, PyObject * args )
 
 	UI_METHOD_ERRORCHECK;
 
+	if ( !PyNumber_Check(inio) || !PyNumber_Check(mino) ||
+			!PyNumber_Check(maxo) ) {
+		return EXPP_ReturnPyObjError( PyExc_TypeError,
+				"expected ints or floats for the initial, min and max values" );
+	}
+
 	but = newbutton(  );
 	if (tip) strncpy(but->tooltip, tip, BPY_MAX_TOOLTIP);
 	block = Get_uiBlock(  );
diff --git a/source/blender/python/api2_2x/Material.c b/source/blender/python/api2_2x/Material.c
index ccd24a437b5..20747a167e6 100644
--- a/source/blender/python/api2_2x/Material.c
+++ b/source/blender/python/api2_2x/Material.c
@@ -554,6 +554,7 @@ static int Material_setSssTexScatter( BPy_Material * self, PyObject * value );
 static int Material_setSssFront( BPy_Material * self, PyObject * value );
 static int Material_setSssBack( BPy_Material * self, PyObject * value );
 static int Material_setSssBack( BPy_Material * self, PyObject * value );
+static int Material_setTexChannel( BPy_Material * self, PyObject * value );
 
 static PyObject *Material_getColorComponent( BPy_Material * self,
 							void * closure );
@@ -633,6 +634,7 @@ static PyObject *Material_getSssBack( BPy_Material * self );
 static PyObject *Material_getFilter( BPy_Material * self );
 static PyObject *Material_getTranslucency( BPy_Material * self );
 static PyObject *Material_getTextures( BPy_Material * self );
+static PyObject *Material_getTexChannel( BPy_Material * self );
 static PyObject *Material_clearIpo( BPy_Material * self );
 
 static PyObject *Material_setTexture( BPy_Material * self, PyObject * args );
@@ -1140,7 +1142,11 @@ static PyGetSetDef BPy_Material_getseters[] = {
 	 NULL},
 	{"lightGroup",
 	 (getter)Material_getLightGroup, (setter)Material_setLightGroup,
-	 "Set the light group for this material",
+	 "The light group for this material",
+	 NULL},
+	{"enabledTextures",
+	 (getter)Material_getTexChannel, (setter)Material_setTexChannel,
+	 "Enabled texture channels for this material",
 	 NULL},
 	{"R",
 	 (getter)Material_getColorComponent, (setter)Material_setColorComponent,
@@ -1517,6 +1523,36 @@ static PyObject *Material_getLightGroup( BPy_Material * self )
 	return Group_CreatePyObject( self->material->group );
 }
 
+static PyObject *Material_getTexChannel( BPy_Material * self )
+{
+	int i;
+    short mask = 1;
+	PyObject *list = PyList_New(0);
+	if( !list )
+		return EXPP_ReturnPyObjError( PyExc_MemoryError,
+				"PyList_New() failed" );
+
+	for( i = 0, mask = 1; i < MAX_MTEX ; ++i, mask <<= 1 ) {
+		if( self->material->mtex[i] && (mask & self->material->septex) == 0 ) {
+			PyObject * val = PyInt_FromLong(i);
+			if( !val ) {
+				Py_DECREF( list );
+				return EXPP_ReturnPyObjError( PyExc_MemoryError,
+						"PyInt_FromLong() failed" );
+			}
+			if( PyList_Append( list, val ) < 0 ) {
+				Py_DECREF( val );
+				Py_DECREF( list );
+				return EXPP_ReturnPyObjError( PyExc_RuntimeError,
+						"PyList_Append() failed" );
+			}
+			Py_DECREF( val );
+		}
+	}
+
+	return list;
+}
+
 static PyObject *Material_getHaloSize( BPy_Material * self )
 {
 	return PyFloat_FromDouble( ( double ) self->material->hasize );
@@ -1982,6 +2018,57 @@ static int Material_setLightGroup( BPy_Material * self, PyObject * value )
 	return GenericLib_assignData(value, (void **) &self->material->group, NULL, 1, ID_GR, 0);
 }
 
+static int Material_setTexChannel( BPy_Material * self, PyObject * value )
+{
+	int i, mask;
+	short septex = 0;
+	int result = 1;
+
+	/* fail if input is not a standard sequence */
+	if( !PyList_Check( value ) && !PyTuple_Check( value ) )
+		return EXPP_ReturnIntError( PyExc_TypeError,
+						"expected tuple or list of integers" );
+
+	/* get a fast sequence; in Python 2.5, this just return the original
+	 * list or tuple and INCREFs it, so we must DECREF */
+	value = PySequence_Fast( value, "" );
+
+	/* set the disable bit for each existing texture */
+	for( i= 0, mask= 1; i < MAX_MTEX; ++i, mask <<= 1 )
+		if( self->material->mtex[i] != NULL )
+			septex |= mask;
+
+	/* check the list, and build new septex value */
+	for( i= PySequence_Size(value)-1; i >= 0; --i ) {
+		long ival;
+		PyObject *item = PySequence_Fast_GET_ITEM( value, i );
+		if( !PyInt_Check( item ) ) {
+			PyErr_SetString ( PyExc_TypeError,
+					"expected tuple or list of integers" );
+			goto exit;
+		}
+		ival= PyInt_AsLong( item );
+		if(ival < 0 || ival > MAX_MTEX) {
+			PyErr_SetString( PyExc_ValueError,
+							"channel value out of range" );
+			goto exit;
+		}
+		ival&= (1<<MAX_MTEX)-1;
+		if( self->material->mtex[(int)ival] == NULL ) {
+			PyErr_SetString( PyExc_ValueError,
+							"channels must have a texture assigned" );
+			goto exit;
+		}
+		septex&= ~(1<<ival);
+	}
+	self->material->septex= septex;
+	result = 0;
+
+exit:
+	Py_DECREF(value);
+	return result;
+}
+
 static int Material_setAdd( BPy_Material * self, PyObject * value )
 {
 	return EXPP_setFloatClamped ( value, &self->material->add,
@@ -2313,9 +2400,6 @@ static int Material_setSssBack( BPy_Material * self, PyObject * value )
 								EXPP_MAT_SSS_BACK_MAX);
 }
 
-
-
-
 static PyObject *Material_setTexture( BPy_Material * self, PyObject * args )
 {
 	int texnum;
diff --git a/source/blender/python/api2_2x/Mesh.c b/source/blender/python/api2_2x/Mesh.c
index 9f68287d658..b3e8fefdb7b 100644
--- a/source/blender/python/api2_2x/Mesh.c
+++ b/source/blender/python/api2_2x/Mesh.c
@@ -5381,11 +5381,11 @@ static PyObject *MFaceSeq_delete( BPy_MFaceSeq * self, PyObject *args )
 	if( PySequence_Size( args ) != 2 ||
 			!PyArg_ParseTuple( args, "iO", &edge_also, &args ) )
 		return EXPP_ReturnPyObjError( PyExc_TypeError,
-				"expected and int and a sequence of ints or MFaces" );
+				"expected an int and a sequence of ints or MFaces" );
 
 	if( !PyList_Check( args ) && !PyTuple_Check( args ) )
 		return EXPP_ReturnPyObjError( PyExc_TypeError,
-				"expected and int and a sequence of ints or MFaces" );
+				"expected an int and a sequence of ints or MFaces" );
 
 	/* see how many args we need to parse */
 	len = PySequence_Size( args );
diff --git a/source/blender/python/api2_2x/Object.c b/source/blender/python/api2_2x/Object.c
index 45cce46d389..dc70921492c 100644
--- a/source/blender/python/api2_2x/Object.c
+++ b/source/blender/python/api2_2x/Object.c
@@ -204,6 +204,7 @@ enum obj_consts {
 	EXPP_OBJ_ATTR_SB_INSPRING,
 	EXPP_OBJ_ATTR_SB_INFRICT,
 
+	EXPP_OBJ_ATTR_EMPTY_DRAWTYPE
 };
 
 #define EXPP_OBJECT_DRAWSIZEMIN         0.01f
@@ -2431,6 +2432,12 @@ static int Object_setDrawType( BPy_Object * self, PyObject * value )
 			OB_BOUNDBOX, OB_TEXTURE, 'b' );
 }
 
+static int Object_setEmptyShape( BPy_Object * self, PyObject * value )
+{
+	return EXPP_setIValueRange( value, &self->object->empty_drawtype,
+			OB_ARROWS, OB_EMPTY_CONE, 'b' );
+}
+
 static int Object_setEuler( BPy_Object * self, PyObject * args )
 {
 	float rot1, rot2, rot3;
@@ -3758,6 +3765,9 @@ static PyObject *getIntAttr( BPy_Object *self, void *type )
 	case EXPP_OBJ_ATTR_DRAWTYPE:
 		param = object->dt;
 		break;
+	case EXPP_OBJ_ATTR_EMPTY_DRAWTYPE:
+		param = object->empty_drawtype;
+		break;
 	case EXPP_OBJ_ATTR_PARENT_TYPE:
 		param = object->partype;
 		break;
@@ -4938,6 +4948,10 @@ static PyGetSetDef BPy_Object_getseters[] = {
 	 (getter)getIntAttr, (setter)Object_setDrawType,
 	 "The object's drawing type",
 	 (void *)EXPP_OBJ_ATTR_DRAWTYPE},
+	{"emptyShape",
+	 (getter)getIntAttr, (setter)Object_setEmptyShape,
+	 "The empty's drawing shape",
+	 (void *)EXPP_OBJ_ATTR_EMPTY_DRAWTYPE},
 	{"parentType",
 	 (getter)getIntAttr, (setter)NULL,
 	 "The object's parent type",
@@ -5538,6 +5552,24 @@ static PyObject *M_Object_IpoKeyTypesDict( void )
 	return M;
 }
 
+static PyObject *M_Object_EmptyShapesDict( void )
+{
+	PyObject *M = PyConstant_New(  );
+
+	if( M ) {
+		BPy_constant *d = ( BPy_constant * ) M;
+		PyConstant_Insert( d, "ARROWS", PyInt_FromLong( OB_ARROWS ) );
+		PyConstant_Insert( d, "AXES", PyInt_FromLong( OB_PLAINAXES ) );
+		PyConstant_Insert( d, "CIRCLE", PyInt_FromLong( OB_CIRCLE ) );
+		PyConstant_Insert( d, "ARROW", PyInt_FromLong( OB_SINGLE_ARROW ) );
+		PyConstant_Insert( d, "CUBE", PyInt_FromLong( OB_CUBE ) );
+		PyConstant_Insert( d, "SPHERE", PyInt_FromLong( OB_EMPTY_SPHERE ) );
+		PyConstant_Insert( d, "CONE", PyInt_FromLong( OB_EMPTY_CONE ) );
+	}
+	return M;
+}
+
+
 /*****************************************************************************/
 /* Function:	 initObject						*/
 /*****************************************************************************/
@@ -5552,6 +5584,7 @@ PyObject *Object_Init( void )
 	PyObject *RBFlagsDict = M_Object_RBFlagsDict( );
 	PyObject *RBShapesDict = M_Object_RBShapeBoundDict( );
 	PyObject *IpoKeyTypesDict = M_Object_IpoKeyTypesDict( );
+	PyObject *EmptyShapesDict = M_Object_EmptyShapesDict( );
 
 	PyType_Ready( &Object_Type ) ;
 
@@ -5596,7 +5629,9 @@ PyObject *Object_Init( void )
 	if( RBShapesDict )
 		PyModule_AddObject( module, "RBShapes", RBShapesDict );
 	if( IpoKeyTypesDict )
-		PyModule_AddObject( module, "IpoKeyTypes", IpoKeyTypesDict );	
+		PyModule_AddObject( module, "IpoKeyTypes", IpoKeyTypesDict );
+	if( EmptyShapesDict )
+		PyModule_AddObject( module, "EmptyShapes", EmptyShapesDict );
 
 		/*Add SUBMODULES to the module*/
 	dict = PyModule_GetDict( module ); /*borrowed*/
diff --git a/source/blender/python/api2_2x/Particle.c b/source/blender/python/api2_2x/Particle.c
index 2c2e724129e..bc65426e16c 100644
--- a/source/blender/python/api2_2x/Particle.c
+++ b/source/blender/python/api2_2x/Particle.c
@@ -804,7 +804,7 @@ static PyObject *Part_GetLoc( BPy_PartSys * self, PyObject * args )
 {
 	ParticleSystem *psys = 0L;
 	Object *ob = 0L;
-	PyObject *partlist,*seglist;
+	PyObject *partlist,*seglist=0L;
 	ParticleCacheKey **cache,*path;
 	PyObject* loc = 0L;
 	ParticleKey state;
@@ -1107,7 +1107,7 @@ static PyObject *Part_GetSize( BPy_PartSys * self, PyObject * args )
 	ParticleSystem *psys = 0L;
 	ParticleData *data;
 	Object *ob = 0L;
-	PyObject *partlist,*tuple;
+	PyObject *partlist,*tuple=0L;
 	DerivedMesh* dm;
 	float vm[4][4],wm[4][4];
 	float size;
@@ -1217,7 +1217,7 @@ static PyObject *Part_GetAge( BPy_PartSys * self, PyObject * args )
 	ParticleSystem *psys = 0L;
 	ParticleData *data;
 	Object *ob = 0L;
-	PyObject *partlist,*tuple;
+	PyObject *partlist,*tuple=0L;
 	DerivedMesh* dm;
 	float vm[4][4],wm[4][4];
 	float life;
diff --git a/source/blender/python/api2_2x/Text3d.c b/source/blender/python/api2_2x/Text3d.c
index 5137e989b8d..202195cdcb4 100644
--- a/source/blender/python/api2_2x/Text3d.c
+++ b/source/blender/python/api2_2x/Text3d.c
@@ -132,9 +132,12 @@ static PyObject *Text3d_getAlignment( BPy_Text3d * self );
 static PyObject *Text3d_setAlignment( BPy_Text3d * self, PyObject * args );
 static PyObject *Text3d_getFont( BPy_Text3d * self );
 static PyObject *Text3d_setFont( BPy_Text3d * self, PyObject * args );
+static PyObject *Text3d_getMaterial( BPy_Text3d * self, PyObject * value );
+static PyObject *Text3d_setMaterial( BPy_Text3d * self, PyObject * args );
 static PyObject *Text3d_addFrame( BPy_Text3d * self );
 static PyObject *Text3d_removeFrame( BPy_Text3d * self, PyObject * args );
 
+
 /*****************************************************************************/
 /* Python BPy_Text3d methods table:                                            */
 /*****************************************************************************/
@@ -210,6 +213,10 @@ static PyMethodDef BPy_Text3d_methods[] = {
 	METH_NOARGS, "() - Gets font list for Text3d"},
  	{"setFont", ( PyCFunction ) Text3d_setFont,
  	METH_VARARGS, "() - Sets font for Text3d"},
+ 	{"getMaterial", ( PyCFunction ) Text3d_getMaterial,
+	METH_O, "() - Gets font list for Text3d"},
+ 	{"setMaterial", ( PyCFunction ) Text3d_setMaterial,
+ 	METH_VARARGS, "() - Sets font for Text3d"},	
  	{"addFrame", ( PyCFunction ) Text3d_addFrame,
  	METH_NOARGS, "() - adds a new text frame"},
  	{"removeFrame", ( PyCFunction ) Text3d_removeFrame,
@@ -1132,6 +1139,45 @@ static PyObject *Text3d_setFont( BPy_Text3d * self, PyObject * args )
 	Py_RETURN_NONE;
 }
 
+/* todo, add style access, will be almost exact copy of these 2  */
+static PyObject *Text3d_getMaterial( BPy_Text3d * self, PyObject * value )
+{
+	int index = PyInt_AsLong( value );
+	if (index == -1 && PyErr_Occurred())
+		return EXPP_ReturnPyObjError( PyExc_TypeError, "expected a character index" );
+
+	if (index < 0)
+		index = self->curve->len + index;
+	
+	if ( index < 0 || index >= self->curve->len )
+		return EXPP_ReturnPyObjError( PyExc_IndexError, "character index out of range" );
+	
+	return PyInt_FromLong( self->curve->strinfo[index].mat_nr );
+}
+
+static PyObject *Text3d_setMaterial( BPy_Text3d * self, PyObject * args )
+{
+	int index, mat_nr;
+	if( !PyArg_ParseTuple( args, "ii",&index, &mat_nr) )
+		return NULL; /* Python error is ok */
+	
+	if (index < 0)
+		index = self->curve->len + index;
+	
+	if ( index < 0 || index >= self->curve->len )
+		return EXPP_ReturnPyObjError( PyExc_IndexError, "character index out of range" );
+
+	if (mat_nr < 0)
+		mat_nr = self->curve->totcol + mat_nr;
+	
+	if ( mat_nr < 0 || mat_nr >= self->curve->totcol )
+		return EXPP_ReturnPyObjError( PyExc_IndexError, "material index out of range" );
+	
+	self->curve->strinfo[index].mat_nr = mat_nr;
+	
+	Py_RETURN_NONE;
+}
+
 static PyObject *Text3d_addFrame( BPy_Text3d * self )
 {
 	Curve *cu = self->curve;
diff --git a/source/blender/python/api2_2x/doc/Material.py b/source/blender/python/api2_2x/doc/Material.py
index a3496164cd1..02f7edd77f5 100644
--- a/source/blender/python/api2_2x/doc/Material.py
+++ b/source/blender/python/api2_2x/doc/Material.py
@@ -323,6 +323,21 @@ class Material:
 	each color a list of 5 floats [0 - 1], [r,g,b,a,pos].
 	The colorband can have between 1 and 31 colors.
 	@type colorbandSpecular:  list
+	@type enabledTextures: list of integers
+	@ivar enabledTextures: The texture channels enabled in this material.
+		The attribute returns is list of integers in the range [0, 9], each
+		number representing the respective enabled MTex entry (see
+		L{getTextures()<getTextures>}).  Enabling is done by assigning
+		a list of ints or an empty list.  Attempting to enable a channel
+		which does not have a texture assigned to it will result in a
+		ValueError exception.
+		Example::
+			mat.enabledTextures = []  # no texture channels are enabled
+			mat.enabledTextures = [0, 6] # texture channels 0 and 6 are enabled
+			ch = mat.enabledTextures
+			ch.append(4)
+			mat.enabledTextures = ch
+			print mat.enabledTextures # will print: [0, 4, 6]
 	
 	@ivar enableSSS:  If True, subsurface scattering will be rendered on this material.
 	@type enableSSS:  bool
@@ -1010,7 +1025,7 @@ class Material:
 
 	def setTexture(index, texture, texco, mapto):
 		"""
-		Assign a Blender Texture object to slot number 'number'.
+		Assign a Blender Texture object to channel number 'number'.
 		@type index: int
 		@param index: material's texture index in [0, 9].
 		@type texture: Blender Texture
@@ -1033,7 +1048,7 @@ class Material:
 		Get this Material's Texture list.
 		@rtype: list of MTex
 		@return: a list of Blender MTex objects.  None is returned for each empty
-				texture slot.
+				texture channel.
 		"""
 
 	def getScriptLinks (event):
diff --git a/source/blender/python/api2_2x/doc/Mathutils.py b/source/blender/python/api2_2x/doc/Mathutils.py
index 8b0c41b9a69..524d1fb6d4c 100644
--- a/source/blender/python/api2_2x/doc/Mathutils.py
+++ b/source/blender/python/api2_2x/doc/Mathutils.py
@@ -521,6 +521,15 @@ class Vector:
     @return: Return a quaternion rotation from the vector and the track and up axis.
     """
 
+  def reflect(mirror):
+    """
+    Return the reflection vector from the mirror vector argument.
+    @type mirror: Vector object
+    @param mirror: This vector could be a normal from the reflecting surface.
+    @rtype: Vector object matching the size of this vector.
+    @return: The reflected vector.
+    """
+
 class Euler:
   """
   The Euler object
diff --git a/source/blender/python/api2_2x/doc/Object.py b/source/blender/python/api2_2x/doc/Object.py
index 2e4850aeb14..07942d58093 100644
--- a/source/blender/python/api2_2x/doc/Object.py
+++ b/source/blender/python/api2_2x/doc/Object.py
@@ -117,6 +117,10 @@ Example::
 	attribute.  Only one type can be selected at a time.  Values are
 	BOX, SPHERE, CYLINDER, CONE, and POLYHEDERON
 
+@type EmptyShapes: readonly dictionary
+@var EmptyShapes: Constant dict used for with L{Object.emptyShape} attribute.
+	Only one type can be selected at a time. Values are
+	ARROW, ARROWS, AXES, CIRCLE, CONE, CUBE AND SPHERE
 """
 
 def New (type, name='type'):
@@ -347,7 +351,7 @@ class Object:
 			ob.layers = []  # object won't be visible
 			ob.layers = [1, 4] # object visible only in layers 1 and 4
 			ls = o.layers
-			ls.append([10])
+			ls.append(10)
 			o.layers = ls
 			print ob.layers # will print: [1, 4, 10]
 		B{Note}: changes will only be visible after the screen (at least
@@ -525,6 +529,8 @@ class Object:
 	@ivar drawType: The object's drawing type.
 		See L{DrawTypes} constant dict for values.
 	@type drawType: int
+	@ivar emptyShape: The empty drawing shape.
+		See L{EmptyShapes} constant dict for values.
 	@ivar parentType: The object's parent type.  Read-only.
 		See L{ParentTypes} constant dict for values.
 	@type parentType: int
diff --git a/source/blender/python/api2_2x/doc/Text3d.py b/source/blender/python/api2_2x/doc/Text3d.py
index a7d8c585078..4bd989014f4 100644
--- a/source/blender/python/api2_2x/doc/Text3d.py
+++ b/source/blender/python/api2_2x/doc/Text3d.py
@@ -287,6 +287,26 @@ class Text3d:
 		@param align: The new text3d's Alignment value. 
 		"""
 	
+	def getMaterial(index):
+		"""
+		get the material index of a character.
+		@rtype: int
+		@return: the material index if the character
+		@type index: int
+		@param index: the index of the character in a string
+		"""
+
+	def setMaterial(index, material_index):
+		"""
+		Set a characters material.
+		@note: after changing this youll need to update the object with object.makeDisplayList() to see the changes.
+		@rtype: None
+		@type index: int
+		@param index: the index of the character in a string
+		@type material_index: int
+		@param material_index: the material index set set the character.
+		"""
+	
 	def addFrame():
 		"""
 		Adds a text frame. maximum number of frames is 255.
diff --git a/source/blender/python/api2_2x/vector.c b/source/blender/python/api2_2x/vector.c
index 33ca993fb49..fe28f0fac42 100644
--- a/source/blender/python/api2_2x/vector.c
+++ b/source/blender/python/api2_2x/vector.c
@@ -42,6 +42,7 @@ char Vector_Resize3D_doc[] = "() - resize a vector to [x,y,z]";
 char Vector_Resize4D_doc[] = "() - resize a vector to [x,y,z,w]";
 char Vector_toPoint_doc[] = "() - create a new Point Object from this vector";
 char Vector_ToTrackQuat_doc[] = "(track, up) - extract a quaternion from the vector and the track and up axis";
+char Vector_reflect_doc[] = "(mirror) - return a vector reflected on the mirror normal";
 char Vector_copy_doc[] = "() - return a copy of the vector";
 /*-----------------------METHOD DEFINITIONS ----------------------*/
 struct PyMethodDef Vector_methods[] = {
@@ -53,6 +54,7 @@ struct PyMethodDef Vector_methods[] = {
 	{"resize4D", (PyCFunction) Vector_Resize4D, METH_NOARGS, Vector_Resize2D_doc},
 	{"toPoint", (PyCFunction) Vector_toPoint, METH_NOARGS, Vector_toPoint_doc},
 	{"toTrackQuat", ( PyCFunction ) Vector_ToTrackQuat, METH_VARARGS, Vector_ToTrackQuat_doc},
+	{"reflect", ( PyCFunction ) Vector_reflect, METH_O, Vector_reflect_doc},
 	{"copy", (PyCFunction) Vector_copy, METH_NOARGS, Vector_copy_doc},
 	{"__copy__", (PyCFunction) Vector_copy, METH_NOARGS, Vector_copy_doc},
 	{NULL, NULL, 0, NULL}
@@ -273,7 +275,55 @@ PyObject *Vector_ToTrackQuat( VectorObject * self, PyObject * args )
 	return newQuaternionObject(quat, Py_NEW);
 }
 
-
+/*----------------------------Vector.reflect(mirror) ----------------------
+  return a reflected vector on the mirror normal
+  ((2 * DotVecs(vec, mirror)) * mirror) - vec
+  using arithb.c would be nice here */
+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;
+	
+	if (!VectorObject_Check(value)) 
+		return EXPP_ReturnPyObjError( PyExc_TypeError, "expected a vector argument" );
+	
+	mirrvec = (VectorObject *)value;
+	
+	mirror[0] = mirrvec->vec[0];
+	mirror[1] = mirrvec->vec[1];
+	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];
+	
+	return newVectorObject(reflect, self->size, Py_NEW);
+}
 
 /*----------------------------Vector.copy() --------------------------------------
   return a copy of the vector */
diff --git a/source/blender/python/api2_2x/vector.h b/source/blender/python/api2_2x/vector.h
index a86f2ddfe42..61b50d5f458 100644
--- a/source/blender/python/api2_2x/vector.h
+++ b/source/blender/python/api2_2x/vector.h
@@ -52,6 +52,7 @@ PyObject *Vector_Resize3D( VectorObject * self );
 PyObject *Vector_Resize4D( VectorObject * self );
 PyObject *Vector_toPoint( VectorObject * self );
 PyObject *Vector_ToTrackQuat( VectorObject * self, PyObject * args );
+PyObject *Vector_reflect( VectorObject * self, PyObject * value );
 PyObject *Vector_copy( VectorObject * self );
 PyObject *newVectorObject(float *vec, int size, int type);
 
diff --git a/source/blender/radiosity/CMakeLists.txt b/source/blender/radiosity/CMakeLists.txt
index 36e9ad19770..941da41a5b2 100644
--- a/source/blender/radiosity/CMakeLists.txt
+++ b/source/blender/radiosity/CMakeLists.txt
@@ -29,7 +29,7 @@ FILE(GLOB SRC intern/source/*.c)
 SET(INC 
   extern/include ../blenlib ../blenkernel ../makesdna ../include
   ../../../intern/guardedalloc ../render/extern/include
-  ../render/intern/include
+  ../render/intern/include ../blenloader
 )
 
 BLENDERLIB_NOLIST(blender_radiosity "${SRC}" "${INC}")
diff --git a/source/blender/radiosity/SConscript b/source/blender/radiosity/SConscript
index 102f79683f9..a86b76bb4b1 100644
--- a/source/blender/radiosity/SConscript
+++ b/source/blender/radiosity/SConscript
@@ -5,7 +5,7 @@ sources = env.Glob('intern/source/*.c')
 
 incs = 'extern/include ../blenlib ../blenkernel ../makesdna ../include'
 incs += ' #/intern/guardedalloc ../render/extern/include'
-incs += ' ../render/intern/include'
+incs += ' ../render/intern/include ../blenloader'
 
 incs += ' ' + env['BF_OPENGL_INC']
 
diff --git a/source/blender/radiosity/intern/source/Makefile b/source/blender/radiosity/intern/source/Makefile
index 19768c959c7..e5ff8c40d08 100644
--- a/source/blender/radiosity/intern/source/Makefile
+++ b/source/blender/radiosity/intern/source/Makefile
@@ -44,6 +44,7 @@ CPPFLAGS += -I../../../blenlib
 CPPFLAGS += -I../../../makesdna
 CPPFLAGS += -I../../../imbuf
 CPPFLAGS += -I../../../
+CPPFLAGS += -I../../../blenloader
 CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
 
 # first /include is my own includes, second are the external includes
diff --git a/source/blender/radiosity/intern/source/radnode.c b/source/blender/radiosity/intern/source/radnode.c
index 5517a22eb93..042fe6840fc 100644
--- a/source/blender/radiosity/intern/source/radnode.c
+++ b/source/blender/radiosity/intern/source/radnode.c
@@ -50,6 +50,8 @@
 
 #include "radio.h"
 
+#include "BLO_sys_types.h" // for intptr_t support
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -167,14 +169,14 @@ void *calloc_fast(int size)
 void free_fast(void *poin, int size)
 {
 	MallocGroup *mg;
-	long val;
+	intptr_t val;
 
 	mg= MallocBase.last;
 	while(mg) {
 		if(mg->size==size) {
-			if( ((long)poin) >= ((long)mg->data) ) {
-				if( ((long)poin) < ((long)(mg->data+MAL_GROUPSIZE*size)) ) {
-					val= ((long)poin) - ((long)mg->data);
+			if( ((intptr_t)poin) >= ((intptr_t)mg->data) ) {
+				if( ((intptr_t)poin) < ((intptr_t)(mg->data+MAL_GROUPSIZE*size)) ) {
+					val= ((intptr_t)poin) - ((intptr_t)mg->data);
 					val/= size;
 					mg->curfree= val;
 					mg->flags[val]= 0;
diff --git a/source/blender/radiosity/intern/source/radpreprocess.c b/source/blender/radiosity/intern/source/radpreprocess.c
index 5f8a39786c1..07b933b6db9 100644
--- a/source/blender/radiosity/intern/source/radpreprocess.c
+++ b/source/blender/radiosity/intern/source/radpreprocess.c
@@ -68,6 +68,8 @@
 
 #include "radio.h"
 
+#include "BLO_sys_types.h" // for intptr_t support
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -179,7 +181,7 @@ int vergedge(const void *v1,const void *v2)
 
 void addedge(float *v1, float *v2, EdSort *es)
 {
-	if( ((long)v1)<((long)v2) ) {
+	if( ((intptr_t)v1)<((intptr_t)v2) ) {
 		es->v1= v1;
 		es->v2= v2;
 	}
diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt
index b543dff49ff..0b659554d1a 100644
--- a/source/blender/render/CMakeLists.txt
+++ b/source/blender/render/CMakeLists.txt
@@ -29,7 +29,7 @@ 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 ../yafray
+  ../quicktime ../include ../../kernel/gen_messaging ../yafray ../blenloader
 )
 
 IF(WITH_OPENEXR)
diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript
index b1bc9673f23..f0d1353b0d3 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'
 incs += ' extern/include ../blenkernel ../radiosity/extern/include ../imbuf'
-incs += ' ../quicktime ../include ../../kernel/gen_messaging'
+incs += ' ../quicktime ../include ../../kernel/gen_messaging ../blenloader'
 
 defs = []
 
diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h
index 2f97b19f75c..f83bbd7e8b2 100644
--- a/source/blender/render/intern/include/render_types.h
+++ b/source/blender/render/intern/include/render_types.h
@@ -44,6 +44,8 @@
 #include "RE_shader_ext.h"	/* TexResult, ShadeResult, ShadeInput */
 #include "sunsky.h"
 
+#include "BLO_sys_types.h" // for intptr_t support
+
 struct Object;
 struct MemArena;
 struct VertTableNode;
@@ -89,11 +91,11 @@ typedef struct RenderPart
 	int *rectp;						/* polygon index table */
 	int *rectz;						/* zbuffer */
 	int *rectmask;					/* negative zmask */
-	long *rectdaps;					/* delta acum buffer for pixel structs */
+	intptr_t *rectdaps;					/* delta acum buffer for pixel structs */
 	int *rectbacko;					/* object table for backside sss */
 	int *rectbackp;					/* polygon index table for backside sss */
 	int *rectbackz;					/* zbuffer for backside sss */
-	long *rectall;					/* buffer for all faces for sss */
+	intptr_t *rectall;					/* buffer for all faces for sss */
 
 	rcti disprect;					/* part coordinates within total picture */
 	int rectx, recty;				/* the size */
@@ -226,7 +228,7 @@ struct ISBData;
 
 typedef struct ShadSampleBuf {
 	struct ShadSampleBuf *next, *prev;
-	long *zbuf;
+	intptr_t *zbuf;
 	char *cbuf;
 } ShadSampleBuf;
 
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index e4a5ad67631..8626fb0f9d0 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -1565,7 +1565,7 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem
 	float hasize, pa_size, pa_time, r_tilt, cfra=bsystem_time(ob,(float)CFRA,0.0);
 	float adapt_angle=0.0, adapt_pix=0.0, random, simplify[2];
 	int i, a, k, max_k=0, totpart, totuv=0, totcol=0, override_uv=-1, dosimplify = 0, dosurfacecache = 0;
-	int path_possible=0, keys_possible=0, baked_keys=0, totchild=psys->totchild;
+	int path_possible=0, keys_possible=0, baked_keys=0, totchild=0;
 	int seed, path_nbr=0, path=0, orco1=0, adapt=0, uv[3]={0,0,0}, num;
 	int totface, *origindex = 0;
 	char **uv_name=0;
@@ -1573,6 +1573,8 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem
 /* 1. check that everything is ok & updated */
 	if(psys==NULL)
 		return 0;
+	
+	totchild=psys->totchild;
 
 	part=psys->part;
 	pars=psys->particles;
diff --git a/source/blender/render/intern/source/occlusion.c b/source/blender/render/intern/source/occlusion.c
index d70c51b83bc..15c57eb9362 100644
--- a/source/blender/render/intern/source/occlusion.c
+++ b/source/blender/render/intern/source/occlusion.c
@@ -1670,7 +1670,7 @@ void cache_occ_samples(Render *re, RenderPart *pa, ShadeSample *ssamp)
 	OcclusionCacheSample *sample;
 	OccFace exclude;
 	ShadeInput *shi;
-	long *rd=NULL;
+	intptr_t *rd=NULL;
 	int *ro=NULL, *rp=NULL, *rz=NULL, onlyshadow;
 	int x, y, step = CACHE_STEP;
 
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 6a0af82b4d7..3cd7bdc6772 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -138,7 +138,7 @@ static void print_error(char *str) {printf("ERROR: %s\n", str);}
 
 static void stats_background(RenderStats *rs)
 {
-	extern unsigned long mem_in_use;
+	extern uintptr_t mem_in_use;
 	float megs_used_memory= mem_in_use/(1024.0*1024.0);
 	char str[400], *spos= str;
 	
diff --git a/source/blender/render/intern/source/rendercore.c b/source/blender/render/intern/source/rendercore.c
index 4520e4c10bb..4a2ad995b39 100644
--- a/source/blender/render/intern/source/rendercore.c
+++ b/source/blender/render/intern/source/rendercore.c
@@ -243,7 +243,7 @@ static void halo_tile(RenderPart *pa, RenderLayer *rl)
 	rcti disprect= pa->disprect, testrect= pa->disprect;
 	float dist, xsq, ysq, xn, yn;
 	float col[4];
-	long *rd= NULL;
+	intptr_t *rd= NULL;
 	int a, *rz, zz, y, sample, totsample, od;
 	short minx, maxx, miny, maxy, x;
 	unsigned int lay= rl->lay;
@@ -324,7 +324,7 @@ static void lamphalo_tile(RenderPart *pa, RenderLayer *rl)
 	ShadeInput shi;
 	float *pass;
 	float fac, col[4];
-	long *rd= pa->rectdaps;
+	intptr_t *rd= pa->rectdaps;
 	int *rz= pa->rectz;
 	int x, y, sample, totsample, fullsample, od;
 	
@@ -767,7 +767,7 @@ static void shadeDA_tile(RenderPart *pa, RenderLayer *rl)
 {
 	RenderResult *rr= pa->result;
 	ShadeSample ssamp;
-	long *rd, *rectdaps= pa->rectdaps;
+	intptr_t *rd, *rectdaps= pa->rectdaps;
 	int samp;
 	int x, y, seed, crop=0, offs=0, od;
 	
@@ -874,7 +874,7 @@ static void freeps(ListBase *lb)
 	lb->first= lb->last= NULL;
 }
 
-static void addps(ListBase *lb, long *rd, int obi, int facenr, int z, int maskz, unsigned short mask)
+static void addps(ListBase *lb, intptr_t *rd, int obi, int facenr, int z, int maskz, unsigned short mask)
 {
 	PixStrMain *psm;
 	PixStr *ps, *last= NULL;
@@ -901,7 +901,7 @@ static void addps(ListBase *lb, long *rd, int obi, int facenr, int z, int maskz,
 	ps= psm->ps + psm->counter++;
 	
 	if(last) last->next= ps;
-	else *rd= (long)ps;
+	else *rd= (intptr_t)ps;
 	
 	ps->next= NULL;
 	ps->obi= obi;
@@ -1027,7 +1027,7 @@ static void reset_sky_speed(RenderPart *pa, RenderLayer *rl)
 
 static unsigned short *make_solid_mask(RenderPart *pa)
 { 
- 	long *rd= pa->rectdaps;
+ 	intptr_t *rd= pa->rectdaps;
  	unsigned short *solidmask, *sp;
  	int x;
  	
@@ -1092,7 +1092,7 @@ void make_pixelstructs(RenderPart *pa, ZSpan *zspan, int sample, void *data)
 {
 	ZbufSolidData *sdata= (ZbufSolidData*)data;
 	ListBase *lb= sdata->psmlist;
-	long *rd= pa->rectdaps;
+	intptr_t *rd= pa->rectdaps;
 	int *ro= zspan->recto;
 	int *rp= zspan->rectp;
 	int *rz= zspan->rectz;
@@ -1133,7 +1133,7 @@ void zbufshadeDA_tile(RenderPart *pa)
 	
 		/* initialize pixelstructs and edge buffer */
 		addpsmain(&psmlist);
-		pa->rectdaps= MEM_callocN(sizeof(long)*pa->rectx*pa->recty+4, "zbufDArectd");
+		pa->rectdaps= MEM_callocN(sizeof(intptr_t)*pa->rectx*pa->recty+4, "zbufDArectd");
 		
 		if(rl->layflag & SCE_LAY_EDGE) 
 			if(R.r.mode & R_EDGE) 
@@ -1433,7 +1433,7 @@ static void addps_sss(void *cb_handle, int obi, int facenr, int x, int y, int z)
 		return;
 	
 	if(pa->rectall) {
-		long *rs= pa->rectall + pa->rectx*y + x;
+		intptr_t *rs= pa->rectall + pa->rectx*y + x;
 
 		addps(&handle->psmlist, rs, obi, facenr, z, 0, 0);
 		handle->totps++;
@@ -1569,7 +1569,7 @@ void zbufshade_sss_tile(RenderPart *pa)
 	int *ro, *rz, *rp, *rbo, *rbz, *rbp, lay;
 #if 0
 	PixStr *ps;
-	long *rs;
+	intptr_t *rs;
 	int z;
 #endif
 
@@ -1581,7 +1581,7 @@ void zbufshade_sss_tile(RenderPart *pa)
 	handle.psmlist.first= handle.psmlist.last= NULL;
 	addpsmain(&handle.psmlist);
 
-	pa->rectall= MEM_callocN(sizeof(long)*pa->rectx*pa->recty+4, "rectall");
+	pa->rectall= MEM_callocN(sizeof(intptr_t)*pa->rectx*pa->recty+4, "rectall");
 #else
 	pa->recto= MEM_mallocN(sizeof(int)*pa->rectx*pa->recty, "recto");
 	pa->rectp= MEM_mallocN(sizeof(int)*pa->rectx*pa->recty, "rectp");
diff --git a/source/blender/render/intern/source/shadbuf.c b/source/blender/render/intern/source/shadbuf.c
index f3258b601de..f477df3ed8c 100644
--- a/source/blender/render/intern/source/shadbuf.c
+++ b/source/blender/render/intern/source/shadbuf.c
@@ -171,7 +171,7 @@ static void compress_shadowbuf(ShadBuf *shb, int *rectz, int square)
 {
 	ShadSampleBuf *shsample;
 	float dist;
-	unsigned long *ztile;
+	uintptr_t *ztile;
 	int *rz, *rz1, verg, verg1, size= shb->size;
 	int a, x, y, minx, miny, byt1, byt2;
 	char *rc, *rcline, *ctile, *zt;
@@ -179,10 +179,10 @@ static void compress_shadowbuf(ShadBuf *shb, int *rectz, int square)
 	shsample= MEM_mallocN( sizeof(ShadSampleBuf), "shad sample buf");
 	BLI_addtail(&shb->buffers, shsample);
 	
-	shsample->zbuf= MEM_mallocN( sizeof(unsigned long)*(size*size)/256, "initshadbuf2");
+	shsample->zbuf= MEM_mallocN( sizeof(uintptr_t)*(size*size)/256, "initshadbuf2");
 	shsample->cbuf= MEM_callocN( (size*size)/256, "initshadbuf3");
 	
-	ztile= (unsigned long *)shsample->zbuf;
+	ztile= (uintptr_t *)shsample->zbuf;
 	ctile= shsample->cbuf;
 	
 	/* help buffer */
@@ -237,7 +237,7 @@ static void compress_shadowbuf(ShadBuf *shb, int *rectz, int square)
 				}
 				if(byt1 && byt2) {	/* only store byte */
 					*ctile= 1;
-					*ztile= (unsigned long)MEM_mallocN(256+4, "tile1");
+					*ztile= (uintptr_t)MEM_mallocN(256+4, "tile1");
 					rz= (int *)*ztile;
 					*rz= *rz1;
 					
@@ -247,7 +247,7 @@ static void compress_shadowbuf(ShadBuf *shb, int *rectz, int square)
 				}
 				else if(byt1) {		/* only store short */
 					*ctile= 2;
-					*ztile= (unsigned long)MEM_mallocN(2*256+4,"Tile2");
+					*ztile= (uintptr_t)MEM_mallocN(2*256+4,"Tile2");
 					rz= (int *)*ztile;
 					*rz= *rz1;
 					
@@ -260,7 +260,7 @@ static void compress_shadowbuf(ShadBuf *shb, int *rectz, int square)
 				}
 				else {			/* store triple */
 					*ctile= 3;
-					*ztile= (unsigned long)MEM_mallocN(3*256,"Tile3");
+					*ztile= (uintptr_t)MEM_mallocN(3*256,"Tile3");
 
 					zt= (char *)*ztile;
 					rc= rcline;
@@ -542,7 +542,7 @@ void freeshadowbuf(LampRen *lar)
 		v= (shb->size*shb->size)/256;
 		
 		for(shsample= shb->buffers.first; shsample; shsample= shsample->next) {
-			long *ztile= shsample->zbuf;
+			intptr_t *ztile= shsample->zbuf;
 			char *ctile= shsample->cbuf;
 			
 			for(b=0; b<v; b++, ztile++, ctile++)
@@ -1752,7 +1752,7 @@ static void isb_make_buffer(RenderPart *pa, LampRen *lar)
 	ISBSample *samp, *samplebuf[16];	/* should be RE_MAX_OSA */
 	ISBBranch root;
 	MemArena *memarena;
-	long *rd;
+	intptr_t *rd;
 	int *recto, *rectp, x, y, sindex, sample, bsp_err=0;
 	
 	/* storage for shadow, per thread */
diff --git a/source/blender/render/intern/source/strand.c b/source/blender/render/intern/source/strand.c
index 591d51a969d..05e36160f0e 100644
--- a/source/blender/render/intern/source/strand.c
+++ b/source/blender/render/intern/source/strand.c
@@ -416,7 +416,7 @@ typedef struct StrandPart {
 	int *totapixbuf;
 	int *rectz;
 	int *rectmask;
-	long *rectdaps;
+	intptr_t *rectdaps;
 	int rectx, recty;
 	int sample;
 
@@ -510,7 +510,7 @@ static void do_strand_fillac(void *handle, int x, int y, float u, float v, float
 	if(spart->rectdaps) {
 		/* find the z of the sample */
 		PixStr *ps;
-		long *rd= spart->rectdaps + offset;
+		intptr_t *rd= spart->rectdaps + offset;
 		
 		bufferz= 0x7FFFFFFF;
 		if(spart->rectmask) maskz= 0x7FFFFFFF;
diff --git a/source/blender/render/intern/source/zbuf.c b/source/blender/render/intern/source/zbuf.c
index c91c9e2f799..29aa6e3be29 100644
--- a/source/blender/render/intern/source/zbuf.c
+++ b/source/blender/render/intern/source/zbuf.c
@@ -2278,7 +2278,7 @@ static int hashlist_projectvert(float *v1, float winmat[][4], float *hoco)
 		return 0;
 	}
 	
-	buck= &bucket[ (((long)v1)/16) & 255 ];
+	buck= &bucket[ (((intptr_t)v1)/16) & 255 ];
 	if(buck->vert==v1) {
 		QUATCOPY(hoco, buck->hoco);
 		return buck->clip;
@@ -3263,7 +3263,7 @@ static void copyto_abufz(RenderPart *pa, int *arectz, int *rectmask, int sample)
 {
 	PixStr *ps;
 	int x, y, *rza, *rma;
-	long *rd;
+	intptr_t *rd;
 	
 	if(R.osa==0) {
 		memcpy(arectz, pa->rectz, sizeof(int)*pa->rectx*pa->recty);
@@ -3484,7 +3484,7 @@ static int zbuffer_abuf(RenderPart *pa, APixstr *APixbuf, ListBase *apsmbase, Re
 /* speed pointer NULL = sky, we clear */
 /* else if either alpha is full or no solid was filled in: copy speed */
 /* else fill in minimum speed */
-void add_transp_speed(RenderLayer *rl, int offset, float *speed, float alpha, long *rdrect)
+void add_transp_speed(RenderLayer *rl, int offset, float *speed, float alpha, intptr_t *rdrect)
 {
 	RenderPass *rpass;
 	
@@ -3958,7 +3958,7 @@ unsigned short *zbuffer_transp_shade(RenderPart *pa, RenderLayer *rl, float *pas
 	ZTranspRow zrow[MAX_ZROW];
 	StrandShadeCache *sscache= NULL;
 	float sampalpha, alpha, *passrect= pass;
-	long *rdrect;
+	intptr_t *rdrect;
 	int x, y, crop=0, a, b, totface, totsample, doztra;
 	int addpassflag, offs= 0, od, addzbuf, osa = (R.osa? R.osa: 1);
 	unsigned short *ztramask= NULL, filled;
diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c
index cb6f7e629fa..76f244db6fc 100644
--- a/source/blender/src/buttons_editing.c
+++ b/source/blender/src/buttons_editing.c
@@ -1826,6 +1826,16 @@ static void draw_modifier(uiBlock *block, Object *ob, ModifierData *md, int *xco
 			height = 94;
 		} else if (md->type==eModifierType_Explode) {
 			height = 94;
+		} else if (md->type==eModifierType_Shrinkwrap) {
+			ShrinkwrapModifierData *smd = (ShrinkwrapModifierData*) md;
+			height = 86 + 3;
+			if (smd->shrinkType == MOD_SHRINKWRAP_PROJECT)
+			{
+				height += 19*5;
+				if(smd->projAxis == 0) height += 19;
+			}
+			else if (smd->shrinkType == MOD_SHRINKWRAP_NEAREST_SURFACE)
+				height += 19;
 		}
 							/* roundbox 4 free variables: corner-rounding, nop, roundbox type, shade */
 		uiDefBut(block, ROUNDBOX, 0, "", x-10, y-height-2, width, height-2, NULL, 5.0, 0.0, 12, 40, ""); 
@@ -2446,6 +2456,51 @@ static void draw_modifier(uiBlock *block, Object *ob, ModifierData *md, int *xco
 			uiDefButBitS(block, TOG, eExplodeFlag_Alive, B_MODIFIER_RECALC, "Alive",	lx+buttonWidth/3, cy, buttonWidth/3,19, &emd->flag, 0, 0, 0, 0, "Show mesh when particles are alive");
 			uiDefButBitS(block, TOG, eExplodeFlag_Dead, B_MODIFIER_RECALC, "Dead",	lx+buttonWidth*2/3, cy, buttonWidth/3,19, &emd->flag, 0, 0, 0, 0, "Show mesh when particles are dead");
 			uiBlockEndAlign(block);
+		} else if (md->type==eModifierType_Shrinkwrap) {
+			ShrinkwrapModifierData *smd = (ShrinkwrapModifierData*) md;
+
+			char shrinktypemenu[]="Shrinkwrap type%t|nearest surface point %x0|projection %x1|nearest vertex %x2";
+
+			uiDefIDPoinBut(block, modifier_testMeshObj, ID_OB, B_CHANGEDEP, "Ob: ",	lx, (cy-=19), buttonWidth,19, &smd->target, "Target to shrink to");
+
+			but=uiDefBut(block, TEX, B_MODIFIER_RECALC, "VGroup: ",		lx, (cy-=19), buttonWidth,19, &smd->vgroup_name, 0, 31, 0, 0, "Vertex Group name");
+			uiButSetCompleteFunc(but, autocomplete_vgroup, (void *)ob);
+
+			uiDefButF(block, NUM, B_MODIFIER_RECALC, "Offset:",	lx,(cy-=19),buttonWidth,19, &smd->keepDist, 0.0f, 100.0f, 1.0f, 0, "Specify distance to keep from the target");
+
+			cy -= 3;
+			uiDefButS(block, MENU, B_MODIFIER_RECALC, shrinktypemenu, lx,(cy-=19),buttonWidth,19, &smd->shrinkType, 0, 0, 0, 0, "Selects type of shrinkwrap algorithm for target position.");
+
+			if (smd->shrinkType == MOD_SHRINKWRAP_PROJECT){
+
+
+				/* UI for projection axis */
+				uiBlockBeginAlign(block);
+				uiDefButC(block, ROW, B_MODIFIER_RECALC, "Normal"    , lx,(cy-=19),buttonWidth,19, &smd->projAxis, 18.0, MOD_SHRINKWRAP_PROJECT_OVER_NORMAL, 0, 0, "Projection over X axis");
+				if(smd->projAxis == 0)
+				{
+					uiDefButC(block, NUM, B_MODIFIER_RECALC, "SS Levels:",		lx, (cy-=19), buttonWidth,19, &smd->subsurfLevels, 0, 6, 0, 0, "This indicates the number of CCSubdivisions that must be performed before extracting vertexs positions and normals");
+				}
+
+				uiDefButBitC(block, TOG, MOD_SHRINKWRAP_PROJECT_OVER_X_AXIS, B_MODIFIER_RECALC, "X",	lx+buttonWidth/3*0,(cy-=19),buttonWidth/3,19, &smd->projAxis, 0, 0, 0, 0, "Projection over X axis");
+				uiDefButBitC(block, TOG, MOD_SHRINKWRAP_PROJECT_OVER_Y_AXIS, B_MODIFIER_RECALC, "Y",	lx+buttonWidth/3*1,cy,buttonWidth/3,19, &smd->projAxis, 0, 0, 0, 0, "Projection over Y axis");
+				uiDefButBitC(block, TOG, MOD_SHRINKWRAP_PROJECT_OVER_Z_AXIS, B_MODIFIER_RECALC, "Z",	lx+buttonWidth/3*2,cy,buttonWidth/3,19, &smd->projAxis, 0, 0, 0, 0, "Projection over Z axis");
+
+
+				/* allowed directions of projection axis */
+				uiDefButBitS(block, TOG, MOD_SHRINKWRAP_PROJECT_ALLOW_NEG_DIR, B_MODIFIER_RECALC, "Negative",	lx,(cy-=19),buttonWidth/2,19, &smd->shrinkOpts, 0, 0, 0, 0, "Allows to move the vertex in the negative direction of axis");
+				uiDefButBitS(block, TOG, MOD_SHRINKWRAP_PROJECT_ALLOW_POS_DIR, B_MODIFIER_RECALC, "Positive",	lx + buttonWidth/2,cy,buttonWidth/2,19, &smd->shrinkOpts, 0, 0, 0, 0, "Allows to move the vertex in the positive direction of axis");
+
+				uiDefButBitS(block, TOG, MOD_SHRINKWRAP_CULL_TARGET_FRONTFACE, B_MODIFIER_RECALC, "Cull frontfaces",lx,(cy-=19),buttonWidth/2,19, &smd->shrinkOpts, 0, 0, 0, 0, "Controls whether a vertex can be projected to a front face on target");
+				uiDefButBitS(block, TOG, MOD_SHRINKWRAP_CULL_TARGET_BACKFACE,  B_MODIFIER_RECALC, "Cull backfaces",	lx+buttonWidth/2,cy,buttonWidth/2,19, &smd->shrinkOpts, 0, 0, 0, 0, "Controls whether a vertex can be projected to a back face on target");
+				uiDefIDPoinBut(block, modifier_testMeshObj, ID_OB, B_CHANGEDEP, "Ob2: ",	lx, (cy-=19), buttonWidth,19, &smd->auxTarget, "Aditional mesh to project over");
+			}
+			else if (smd->shrinkType == MOD_SHRINKWRAP_NEAREST_SURFACE){
+				uiDefButBitS(block, TOG, MOD_SHRINKWRAP_KEEP_ABOVE_SURFACE, B_MODIFIER_RECALC, "Above surface",	lx,(cy-=19),buttonWidth,19, &smd->shrinkOpts, 0, 0, 0, 0, "Vertices are kept on the front side of faces");
+			}
+
+			uiBlockEndAlign(block);
+
 		}
 
 		uiBlockEndAlign(block);
@@ -4145,7 +4200,7 @@ static void validate_posebonebutton_cb(void *bonev, void *namev)
 static void armature_layer_cb(void *lay_v, void *value_v)
 {
 	short *layer= lay_v;
-	int value= (long)value_v;
+	int value= (intptr_t)value_v;
 	
 	if(*layer==0 || G.qual==0) *layer= value;
 	allqueue(REDRAWBUTSEDIT, 0);
diff --git a/source/blender/src/buttons_logic.c b/source/blender/src/buttons_logic.c
index 8788363c19b..9b41b646bc8 100644
--- a/source/blender/src/buttons_logic.c
+++ b/source/blender/src/buttons_logic.c
@@ -683,6 +683,8 @@ static char *sensor_name(int type)
 		return "Property";
 	case SENS_ACTUATOR:
 		return "Actuator";
+	case SENS_DELAY:
+		return "Delay";
 	case SENS_MOUSE:
 		return "Mouse";
 	case SENS_COLLISION:
@@ -704,7 +706,7 @@ static char *sensor_name(int type)
 static char *sensor_pup(void)
 {
 	/* the number needs to match defines in game.h */
-	return "Sensors %t|Always %x0|Keyboard %x3|Mouse %x5|"
+	return "Sensors %t|Always %x0|Delay %x13|Keyboard %x3|Mouse %x5|"
 		"Touch %x1|Collision %x6|Near %x2|Radar %x7|"
 		"Property %x4|Random %x8|Ray %x9|Message %x10|Joystick %x11|Actuator %x12";
 }
@@ -1000,6 +1002,7 @@ static int get_col_sensor(int type)
 {
 	switch(type) {
 	case SENS_ALWAYS:		return TH_BUT_ACTION;
+	case SENS_DELAY:		return TH_BUT_ACTION;
 	case SENS_TOUCH:		return TH_BUT_NEUTRAL;
 	case SENS_COLLISION:	return TH_BUT_SETTING;
 	case SENS_NEAR:			return TH_BUT_SETTING1; 
@@ -1070,8 +1073,8 @@ static short draw_sensorbuttons(bSensor *sens, uiBlock *block, short xco, short
 	bRaySensor       *raySens      = NULL;
 	bMessageSensor   *mes          = NULL;
 	bJoystickSensor	 *joy		   = NULL;
-	bActuatorSensor  *as          = NULL;
-
+	bActuatorSensor  *as           = NULL;
+	bDelaySensor     *ds		   = NULL;
 	short ysize;
 	char *str;
 	
@@ -1297,6 +1300,27 @@ static short draw_sensorbuttons(bSensor *sens, uiBlock *block, short xco, short
 			yco-= ysize;
 			break;
 		}
+	case SENS_DELAY:
+		{
+			ysize= 48;
+			
+			glRects(xco, yco-ysize, xco+width, yco);
+			uiEmboss((float)xco, (float)yco-ysize,
+				(float)xco+width, (float)yco, 1);
+			
+			draw_default_sensor_header(sens, block, xco, yco, width);
+			ds = sens->data;
+			
+			uiDefButS(block, NUM, 0, "Delay",(short)(10+xco),(short)(yco-44),(short)((width-22)*0.4+10), 19,
+				&ds->delay, 0.0, 5000.0, 0, 0, "Delay in number of frames before the positive trigger");
+			uiDefButS(block, NUM, 0, "Dur",(short)(10+xco+(width-22)*0.4+10),(short)(yco-44),(short)((width-22)*0.4-10), 19,
+				&ds->duration, 0.0, 5000.0, 0, 0, "If >0, delay in number of frames before the negative trigger following the positive trigger");
+			uiDefButBitS(block, TOG, SENS_DELAY_REPEAT, 0, "REP",(short)(xco + 10 + (width-22)*0.8),(short)(yco - 44),
+				(short)(0.20 * (width-22)), 19, &ds->flag, 0.0, 0.0, 0, 0,
+				"Toggle repeat option. If selected, the sensor restarts after Delay+Dur frames");
+			yco-= ysize;
+			break;
+		}
 	case SENS_MOUSE:
 		{
 			ms= sens->data;
@@ -1366,9 +1390,14 @@ static short draw_sensorbuttons(bSensor *sens, uiBlock *block, short xco, short
 					&raySens->propname, 0, 31, 0, 0,
 					"Only look for Objects with this property");
 			}
-			
+
+			/* X-Ray option */
+			uiDefButBitS(block, TOG, SENS_RAY_XRAY, 1, "X",
+				xco + 10,yco - 68, 0.10 * (width-20), 19,
+				&raySens->mode, 0.0, 0.0, 0, 0,
+				"Toggle X-Ray option (see through objects that don't have the property)");
 			/* 2. sensing range */
-			uiDefButF(block, NUM, 1, "Range", xco+10, yco-68, 0.6 * (width-20), 19,
+			uiDefButF(block, NUM, 1, "Range", xco+10 + 0.10 * (width-20), yco-68, 0.5 * (width-20), 19,
 				&raySens->range, 0.01, 10000.0, 100, 0,
 				"Sense objects no farther than this distance");
 			
@@ -1833,7 +1862,7 @@ static short draw_actuatorbuttons(Object *ob, bActuator *act, uiBlock *block, sh
 			but = uiDefButBitS(block, TOG, ACT_IPOFORCE, ACT_IPOFORCE, 
 				"Force", xco+10+(width-20)/2, yco-24, (width-20)/4-10, 19, 
 				&ia->flag, 0, 0, 0, 0, 
-				"Convert Ipo to force. Force is applied in global or local coordinate according to Local flag"); 
+				"Apply Ipo as a global or local force depending on the local option (dynamic objects only)"); 
 			uiButSetFunc(but, change_ipo_actuator, but, ia);
 
 			but = uiDefButBitS(block, TOG, ACT_IPOADD, ACT_IPOADD, 
@@ -1998,7 +2027,7 @@ static short draw_actuatorbuttons(Object *ob, bActuator *act, uiBlock *block, sh
 
 		if(eoa->type==ACT_EDOB_ADD_OBJECT) {
 			int wval; /* just a temp width */
-			ysize = 72;
+			ysize = 92;
 			glRects(xco, yco-ysize, xco+width, yco);
 			uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1);
 	 
@@ -2018,9 +2047,27 @@ static short draw_actuatorbuttons(Object *ob, bActuator *act, uiBlock *block, sh
 			uiDefButF(block, NUM, 0, "",		xco+45+2*wval, yco-68, wval, 19,
 					 eoa->linVelocity+2, -100.0, 100.0, 10, 0,
 					 "Velocity upon creation, z component.");
-			uiDefButBitS(block, TOG, 2, 0, "L", xco+45+3*wval, yco-68, 15, 19,
+			uiDefButBitS(block, TOG, ACT_EDOB_LOCAL_LINV, 0, "L", xco+45+3*wval, yco-68, 15, 19,
 					 &eoa->localflag, 0.0, 0.0, 0, 0,
 					 "Apply the transformation locally");
+			
+			
+			uiDefBut(block, LABEL, 0, "AngV",	xco,           yco-90,   45, 19,
+					 NULL, 0, 0, 0, 0,
+					 "Angular velocity upon creation.");
+			uiDefButF(block, NUM, 0, "",		xco+45,        yco-90, wval, 19,
+					 eoa->angVelocity, -10000.0, 10000.0, 10, 0,
+					 "Angular velocity upon creation, x component.");
+			uiDefButF(block, NUM, 0, "",		xco+45+wval,   yco-90, wval, 19,
+					 eoa->angVelocity+1, -10000.0, 10000.0, 10, 0,
+					 "Angular velocity upon creation, y component.");
+			uiDefButF(block, NUM, 0, "",		xco+45+2*wval, yco-90, wval, 19,
+					 eoa->angVelocity+2, -10000.0, 10000.0, 10, 0,
+					 "Angular velocity upon creation, z component.");
+			uiDefButBitS(block, TOG, ACT_EDOB_LOCAL_ANGV, 0, "L", xco+45+3*wval, yco-90, 15, 19,
+					 &eoa->localflag, 0.0, 0.0, 0, 0,
+					 "Apply the rotation locally");
+					 
 
 		}
 		else if(eoa->type==ACT_EDOB_END_OBJECT) {
@@ -3183,7 +3230,8 @@ void logic_buts(void)
 		while(cont) {
 			for (iact=0; iact<cont->totlinks; iact++) {
 				act = cont->links[iact];
-				act->flag |= ACT_LINKED;
+				if (act)
+					act->flag |= ACT_LINKED;
 			}
 			controller_state_mask |= cont->state_mask;
 			cont = cont->next;
@@ -3231,7 +3279,8 @@ void logic_buts(void)
 						/* this controller is visible, mark all its actuator */
 						for (iact=0; iact<cont->totlinks; iact++) {
 							act = cont->links[iact];
-							act->flag |= ACT_VISIBLE;
+							if (act)
+								act->flag |= ACT_VISIBLE;
 						}
 						uiBlockSetEmboss(block, UI_EMBOSSM);
 						uiDefIconButBitS(block, TOG, CONT_DEL, B_DEL_CONT, ICON_X,	xco, yco, 22, 19, &cont->flag, 0, 0, 0, 0, "Delete Controller");
@@ -3323,8 +3372,8 @@ void logic_buts(void)
 					ycoo= yco;
 					if(sens->flag & SENS_SHOW)
 					{
-						uiDefButS(block, MENU, B_CHANGE_SENS, sensor_pup(),	(short)(xco+22), yco, 100, 19, &sens->type, 0, 0, 0, 0, "Sensor type");
-						but= uiDefBut(block, TEX, 1, "", (short)(xco+122), yco, (short)(width-144), 19, sens->name, 0, 31, 0, 0, "Sensor name");
+						uiDefButS(block, MENU, B_CHANGE_SENS, sensor_pup(),	(short)(xco+22), yco, 80, 19, &sens->type, 0, 0, 0, 0, "Sensor type");
+						but= uiDefBut(block, TEX, 1, "", (short)(xco+102), yco, (short)(width-124), 19, sens->name, 0, 31, 0, 0, "Sensor name");
 						uiButSetFunc(but, make_unique_prop_names_cb, sens->name, (void*) 0);
 
 						sens->otype= sens->type;
@@ -3334,9 +3383,9 @@ void logic_buts(void)
 					else {
 						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, 100, 19, sens, 0, 0, 0, 0, "");
+						but= uiDefBut(block, LABEL, 0, sensor_name(sens->type),	(short)(xco+22), yco, 80, 19, sens, 0, 0, 0, 0, "");
 						uiButSetFunc(but, sca_move_sensor, sens, NULL);
-						but= uiDefBut(block, LABEL, 0, sens->name, (short)(xco+122), yco, (short)(width-144), 19, sens, 0, 31, 0, 0, "");
+						but= uiDefBut(block, LABEL, 0, sens->name, (short)(xco+102), yco, (short)(width-124), 19, sens, 0, 31, 0, 0, "");
 						uiButSetFunc(but, sca_move_sensor, sens, NULL);
 					}
 
@@ -3393,8 +3442,8 @@ void logic_buts(void)
 
 					if(act->flag & ACT_SHOW) {
 						act->otype= act->type;
-						uiDefButS(block, MENU, B_CHANGE_ACT, actuator_pup(ob),	(short)(xco+22), yco, 100, 19, &act->type, 0, 0, 0, 0, "Actuator type");
-						but= uiDefBut(block, TEX, 1, "", (short)(xco+122), yco, (short)(width-144), 19, act->name, 0, 31, 0, 0, "Actuator name");
+						uiDefButS(block, MENU, B_CHANGE_ACT, actuator_pup(ob),	(short)(xco+22), yco, 90, 19, &act->type, 0, 0, 0, 0, "Actuator type");
+						but= uiDefBut(block, TEX, 1, "", (short)(xco+112), yco, (short)(width-134), 19, act->name, 0, 31, 0, 0, "Actuator name");
 						uiButSetFunc(but, make_unique_prop_names_cb, act->name, (void*) 0);
 
 						ycoo= yco;
@@ -3404,9 +3453,9 @@ void logic_buts(void)
 					else {
 						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, 100, 19, act, 0, 0, 0, 0, "Actuator type");
+						but= uiDefBut(block, LABEL, 0, actuator_name(act->type), (short)(xco+22), yco, 90, 19, act, 0, 0, 0, 0, "Actuator type");
 						uiButSetFunc(but, sca_move_actuator, act, NULL);
-						but= uiDefBut(block, LABEL, 0, act->name, (short)(xco+122), yco, (short)(width-144), 19, act, 0, 0, 0, 0, "Actuator name");
+						but= uiDefBut(block, LABEL, 0, act->name, (short)(xco+112), yco, (short)(width-134), 19, act, 0, 0, 0, 0, "Actuator name");
 						uiButSetFunc(but, sca_move_actuator, act, NULL);
 						ycoo= yco;
 					}
diff --git a/source/blender/src/buttons_object.c b/source/blender/src/buttons_object.c
index 58f3bff09c8..b0d612456d2 100644
--- a/source/blender/src/buttons_object.c
+++ b/source/blender/src/buttons_object.c
@@ -3279,6 +3279,8 @@ static void object_panel_collision(Object *ob)
 		uiDefBut(block, LABEL, 0, "",160,160,150,2, NULL, 0.0, 0, 0, 0, "");
 		
 		if(pd->deflect) {
+			CollisionModifierData *collmd = (CollisionModifierData *)modifiers_findByType ( ob, eModifierType_Collision );
+			
 			uiDefBut(block, LABEL, 0, "Particle Interaction",			10,135,310,20, NULL, 0.0, 0, 0, 0, "");
 
 			uiBlockBeginAlign(block);
@@ -3294,12 +3296,18 @@ static void object_panel_collision(Object *ob)
 			uiDefBut(block, LABEL, 0, "Soft Body and Cloth Interaction",			10,65,310,20, NULL, 0.0, 0, 0, 0, "");
 
 			uiBlockBeginAlign(block);
-			uiDefButF(block, NUM, B_FIELD_CHANGE, "Damping:",	10,45,150,20, &pd->pdef_sbdamp, 0.0, 1.0, 10, 0, "Amount of damping during collision");
-			uiDefButF(block, NUM, B_FIELD_CHANGE, "Inner:",	10,25,150,20, &pd->pdef_sbift, 0.001, 1.0, 10, 0, "Inner face thickness");
-			uiDefButF(block, NUM, B_FIELD_CHANGE, "Outer:",	10, 5,150,20, &pd->pdef_sboft, 0.001, 1.0, 10, 0, "Outer face thickness");
+			uiDefButF(block, NUM, B_FIELD_CHANGE, "Inner:",	10,45,150,20, &pd->pdef_sbift, 0.001, 1.0, 10, 0, "Inner face thickness");
+			uiDefButF(block, NUM, B_FIELD_CHANGE, "Outer:",	160, 45,150,20, &pd->pdef_sboft, 0.001, 1.0, 10, 0, "Outer face thickness");
 			uiBlockEndAlign(block);
+			uiDefButF(block, NUM, B_FIELD_CHANGE, "Damping:",	10,25,150,20, &pd->pdef_sbdamp, 0.0, 1.0, 10, 0, "Amount of damping during collision");
 
-			uiDefButBitS(block, TOG, OB_SB_COLLFINAL, B_FIELD_CHANGE, "Ev.M.Stack", 170,45,150,20, &ob->softflag, 0, 0, 0, 0, "Pick collision object from modifier stack (softbody only)");
+			uiDefButBitS(block, TOG, OB_SB_COLLFINAL, B_FIELD_CHANGE, "Ev.M.Stack", 160,25,150,20, &ob->softflag, 0, 0, 0, 0, "Pick collision object from modifier stack (softbody only)");
+			
+			// collision options
+			if(collmd)
+			{
+				uiDefButS(block, NUM, B_FIELD_CHANGE, "Absorption: ",	10,0,150,20, &collmd->absorption, 0.0, 100, 1, 2, "How much of effector force gets lost during collision with this object (in percent).");
+			}
 		}
 	}
 }
@@ -3309,6 +3317,7 @@ static void object_panel_fields(Object *ob)
 	uiBut *but;
 	int particles=0;
 	static short actpsys=-1;
+	static char slot=0;
 
 	block= uiNewBlock(&curarea->uiblocks, "object_panel_fields", UI_EMBOSS, UI_HELV, curarea->win);
 	if(uiNewPanel(curarea, block, "Fields", "Physics", 0, 0, 318, 204)==0) return;
@@ -3330,7 +3339,7 @@ static void object_panel_fields(Object *ob)
 		char *tipstr="Choose field type";
 
 		uiBlockBeginAlign(block);
-		
+
 		if(ob->particlesystem.first) {
 			ParticleSystem *psys;
 			char *menustr2= psys_menu_string(ob,1);
@@ -3342,8 +3351,16 @@ static void object_panel_fields(Object *ob)
 				if(psys->part->pd==NULL)
 					psys->part->pd= MEM_callocN(sizeof(PartDeflect), "PartDeflect");
 
-				pd= psys->part->pd;
+				if(psys->part->pd2==NULL)
+					psys->part->pd2= MEM_callocN(sizeof(PartDeflect), "PartDeflect");
+
+				pd= ((slot==1) ? psys->part->pd2 : psys->part->pd);
 				particles=1;
+
+				uiDefButC(block, ROW, B_REDR, "",	10, 163, 14, 14, &slot, 3.0, 0, 0, 0, "Edit first particle effector slot");
+				uiDefButC(block, ROW, B_REDR, "",	24, 163, 14, 14, &slot, 3.0, 1, 0, 0, "Edit second particle effector slot");
+				uiBlockEndAlign(block);
+				uiBlockBeginAlign(block);
 			}
 			else
 				actpsys= -1; /* -1 = object */
@@ -3356,8 +3373,8 @@ static void object_panel_fields(Object *ob)
 
 		/* setup menu button */
 		if(particles){
-			sprintf(menustr, "Field Type%%t|None%%x0|Spherical%%x%d|Wind%%x%d|Vortex%%x%d|Magnetic%%x%d|Harmonic%%x%d", 
-					PFIELD_FORCE, PFIELD_WIND, PFIELD_VORTEX, PFIELD_MAGNET, PFIELD_HARMONIC);
+			sprintf(menustr, "Field Type%%t|None%%x0|Spherical%%x%d|Wind%%x%d|Vortex%%x%d|Magnetic%%x%d|Harmonic%%x%d|Charge%%x%d|Lennard-Jones%%x%d", 
+					PFIELD_FORCE, PFIELD_WIND, PFIELD_VORTEX, PFIELD_MAGNET, PFIELD_HARMONIC, PFIELD_CHARGE, PFIELD_LENNARDJ);
 
 			if(pd->forcefield==PFIELD_FORCE) tipstr= "Particle attracts or repels particles (On shared object layers)";
 			else if(pd->forcefield==PFIELD_WIND) tipstr= "Constant force applied in direction of particle Z axis (On shared object layers)";
@@ -3365,11 +3382,11 @@ static void object_panel_fields(Object *ob)
 		}
 		else{
 			if(ob->type==OB_CURVE)
-				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", 
-						PFIELD_FORCE, PFIELD_WIND, PFIELD_VORTEX, PFIELD_GUIDE, PFIELD_MAGNET, PFIELD_HARMONIC, PFIELD_TEXTURE);
+				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", 
-						PFIELD_FORCE, PFIELD_WIND, PFIELD_VORTEX, PFIELD_MAGNET, PFIELD_HARMONIC, PFIELD_TEXTURE);
+				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);
 
 			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)";
@@ -3384,8 +3401,6 @@ static void object_panel_fields(Object *ob)
 
 		uiBlockEndAlign(block);
 		uiDefBut(block, LABEL, 0, "",160,180,150,2, NULL, 0.0, 0, 0, 0, "");
-
-		MEM_freeN(menustr);
 		
 		if(pd->forcefield) {
 			uiBlockBeginAlign(block);
@@ -3411,6 +3426,8 @@ static void object_panel_fields(Object *ob)
 				}
 				else if(pd->forcefield == PFIELD_HARMONIC) 
 					uiDefButF(block, NUM, B_FIELD_CHANGE, "Damp: ",	10,120,140,20, &pd->f_damp, 0, 10, 10, 0, "Damping of the harmonic force");	
+				else if(pd->forcefield == PFIELD_WIND) 
+					uiDefButF(block, NUM, B_FIELD_CHANGE, "Noise: ",10,120,140,20, &pd->f_noise, 0, 10, 100, 0, "Noise of the wind force");	
 			}
 			uiBlockEndAlign(block);
 			
@@ -3449,40 +3466,49 @@ static void object_panel_fields(Object *ob)
 				uiBlockEndAlign(block);
 			}
 			else{
-				uiDefButS(block, MENU, B_FIELD_DEP, "Fall-off%t|Cone%x2|Tube%x1|Sphere%x0",	160,180,140,20, &pd->falloff, 0.0, 0.0, 0, 0, "Fall-off shape");
-				if(pd->falloff==PFIELD_FALL_TUBE)
-					uiDefBut(block, LABEL, 0, "Longitudinal",		160,160,140,20, NULL, 0.0, 0, 0, 0, "");
-				uiBlockBeginAlign(block);
-				uiDefButBitS(block, TOG, PFIELD_POSZ, B_FIELD_CHANGE, "Pos",	160,140,40,20, &pd->flag, 0.0, 0, 0, 0, "Effect only in direction of positive Z axis");
-				uiDefButF(block, NUM, B_FIELD_CHANGE, "Fall-off: ",	200,140,100,20, &pd->f_power, 0, 10, 10, 0, "Falloff power (real gravitational falloff = 2)");
-				uiDefButBitS(block, TOG, PFIELD_USEMAX, B_FIELD_CHANGE, "Use",	160,120,40,20, &pd->flag, 0.0, 0, 0, 0, "Use a maximum distance for the field to work");
-				uiDefButF(block, NUM, B_FIELD_CHANGE, "MaxDist: ",	200,120,100,20, &pd->maxdist, 0, 1000.0, 10, 0, "Maximum distance for the field to work");
-				uiDefButBitS(block, TOG, PFIELD_USEMIN, B_FIELD_CHANGE, "Use",	160,100,40,20, &pd->flag, 0.0, 0, 0, 0, "Use a minimum distance for the field's fall-off");
-				uiDefButF(block, NUM, B_FIELD_CHANGE, "MinDist: ",	200,100,100,20, &pd->mindist, 0, 1000.0, 10, 0, "Minimum distance for the field's fall-off");
-				uiBlockEndAlign(block);
-
-				if(pd->falloff==PFIELD_FALL_TUBE){
-					uiDefBut(block, LABEL, 0, "Radial",		160,80,70,20, NULL, 0.0, 0, 0, 0, "");
-					uiBlockBeginAlign(block);
-					uiDefButF(block, NUM, B_FIELD_CHANGE, "Fall-off: ",	160,60,140,20, &pd->f_power_r, 0, 10, 10, 0, "Radial falloff power (real gravitational falloff = 2)");
-					uiDefButBitS(block, TOG, PFIELD_USEMAXR, B_FIELD_CHANGE, "Use",	160,40,40,20, &pd->flag, 0.0, 0, 0, 0, "Use a maximum radial distance for the field to work");
-					uiDefButF(block, NUM, B_FIELD_CHANGE, "MaxDist: ",	200,40,100,20, &pd->maxrad, 0, 1000.0, 10, 0, "Maximum radial distance for the field to work");
-					uiDefButBitS(block, TOG, PFIELD_USEMINR, B_FIELD_CHANGE, "Use",	160,20,40,20, &pd->flag, 0.0, 0, 0, 0, "Use a minimum radial distance for the field's fall-off");
-					uiDefButF(block, NUM, B_FIELD_CHANGE, "MinDist: ",	200,20,100,20, &pd->minrad, 0, 1000.0, 10, 0, "Minimum radial distance for the field's fall-off");
-					uiBlockEndAlign(block);
+				if(pd->forcefield==PFIELD_LENNARDJ) {
+					uiDefBut(block, LABEL, 0, "Fall-off determined",		160,140,140,20, NULL, 0.0, 0, 0, 0, "");
+					uiDefBut(block, LABEL, 0, "by particle sizes",		160,120,140,20, NULL, 0.0, 0, 0, 0, "");
 				}
-				else if(pd->falloff==PFIELD_FALL_CONE){
-					uiDefBut(block, LABEL, 0, "Angular",		160,80,70,20, NULL, 0.0, 0, 0, 0, "");
+				else {
+					uiDefButS(block, MENU, B_FIELD_DEP, "Fall-off%t|Cone%x2|Tube%x1|Sphere%x0",	160,180,140,20, &pd->falloff, 0.0, 0.0, 0, 0, "Fall-off shape");
+					if(pd->falloff==PFIELD_FALL_TUBE)
+						uiDefBut(block, LABEL, 0, "Longitudinal",		160,160,140,20, NULL, 0.0, 0, 0, 0, "");
 					uiBlockBeginAlign(block);
-					uiDefButF(block, NUM, B_FIELD_CHANGE, "Fall-off: ",	160,60,140,20, &pd->f_power_r, 0, 10, 10, 0, "Radial falloff power (real gravitational falloff = 2)");
-					uiDefButBitS(block, TOG, PFIELD_USEMAXR, B_FIELD_CHANGE, "Use",	160,40,40,20, &pd->flag, 0.0, 0, 0, 0, "Use a maximum angle for the field to work");
-					uiDefButF(block, NUM, B_FIELD_CHANGE, "MaxAngle: ",	200,40,100,20, &pd->maxrad, 0, 89.0, 10, 0, "Maximum angle for the field to work (in radians)");
-					uiDefButBitS(block, TOG, PFIELD_USEMINR, B_FIELD_CHANGE, "Use",	160,20,40,20, &pd->flag, 0.0, 0, 0, 0, "Use a minimum angle for the field's fall-off");
-					uiDefButF(block, NUM, B_FIELD_CHANGE, "MinAngle: ",	200,20,100,20, &pd->minrad, 0, 89.0, 10, 0, "Minimum angle for the field's fall-off (in radians)");
+					uiDefButBitS(block, TOG, PFIELD_POSZ, B_FIELD_CHANGE, "Pos",	160,140,40,20, &pd->flag, 0.0, 0, 0, 0, "Effect only in direction of positive Z axis");
+					uiDefButF(block, NUM, B_FIELD_CHANGE, "Fall-off: ",	200,140,100,20, &pd->f_power, 0, 10, 10, 0, "Falloff power (real gravitational falloff = 2)");
+					uiDefButBitS(block, TOG, PFIELD_USEMAX, B_FIELD_CHANGE, "Use",	160,120,40,20, &pd->flag, 0.0, 0, 0, 0, "Use a maximum distance for the field to work");
+					uiDefButF(block, NUM, B_FIELD_CHANGE, "MaxDist: ",	200,120,100,20, &pd->maxdist, 0, 1000.0, 10, 0, "Maximum distance for the field to work");
+					uiDefButBitS(block, TOG, PFIELD_USEMIN, B_FIELD_CHANGE, "Use",	160,100,40,20, &pd->flag, 0.0, 0, 0, 0, "Use a minimum distance for the field's fall-off");
+					uiDefButF(block, NUM, B_FIELD_CHANGE, "MinDist: ",	200,100,100,20, &pd->mindist, 0, 1000.0, 10, 0, "Minimum distance for the field's fall-off");
 					uiBlockEndAlign(block);
+
+					if(pd->falloff==PFIELD_FALL_TUBE){
+						uiDefBut(block, LABEL, 0, "Radial",		160,80,70,20, NULL, 0.0, 0, 0, 0, "");
+						uiBlockBeginAlign(block);
+						uiDefButF(block, NUM, B_FIELD_CHANGE, "Fall-off: ",	160,60,140,20, &pd->f_power_r, 0, 10, 10, 0, "Radial falloff power (real gravitational falloff = 2)");
+						uiDefButBitS(block, TOG, PFIELD_USEMAXR, B_FIELD_CHANGE, "Use",	160,40,40,20, &pd->flag, 0.0, 0, 0, 0, "Use a maximum radial distance for the field to work");
+						uiDefButF(block, NUM, B_FIELD_CHANGE, "MaxDist: ",	200,40,100,20, &pd->maxrad, 0, 1000.0, 10, 0, "Maximum radial distance for the field to work");
+						uiDefButBitS(block, TOG, PFIELD_USEMINR, B_FIELD_CHANGE, "Use",	160,20,40,20, &pd->flag, 0.0, 0, 0, 0, "Use a minimum radial distance for the field's fall-off");
+						uiDefButF(block, NUM, B_FIELD_CHANGE, "MinDist: ",	200,20,100,20, &pd->minrad, 0, 1000.0, 10, 0, "Minimum radial distance for the field's fall-off");
+						uiBlockEndAlign(block);
+					}
+					else if(pd->falloff==PFIELD_FALL_CONE){
+						uiDefBut(block, LABEL, 0, "Angular",		160,80,70,20, NULL, 0.0, 0, 0, 0, "");
+						uiBlockBeginAlign(block);
+						uiDefButF(block, NUM, B_FIELD_CHANGE, "Fall-off: ",	160,60,140,20, &pd->f_power_r, 0, 10, 10, 0, "Radial falloff power (real gravitational falloff = 2)");
+						uiDefButBitS(block, TOG, PFIELD_USEMAXR, B_FIELD_CHANGE, "Use",	160,40,40,20, &pd->flag, 0.0, 0, 0, 0, "Use a maximum angle for the field to work");
+						uiDefButF(block, NUM, B_FIELD_CHANGE, "MaxAngle: ",	200,40,100,20, &pd->maxrad, 0, 89.0, 10, 0, "Maximum angle for the field to work (in radians)");
+						uiDefButBitS(block, TOG, PFIELD_USEMINR, B_FIELD_CHANGE, "Use",	160,20,40,20, &pd->flag, 0.0, 0, 0, 0, "Use a minimum angle for the field's fall-off");
+						uiDefButF(block, NUM, B_FIELD_CHANGE, "MinAngle: ",	200,20,100,20, &pd->minrad, 0, 89.0, 10, 0, "Minimum angle for the field's fall-off (in radians)");
+						uiBlockEndAlign(block);
+					}
 				}
 			}
+
 		}	
+		
+		MEM_freeN(menustr);
 	}
 }
 
@@ -4329,6 +4355,8 @@ static void object_panel_particle_extra(Object *ob)
 		uiDefButBitI(block, TOG, PART_CHILD_EFFECT, B_PART_RECALC, "Children", butx+(butw*3)/5,buty,(butw*2)/5,buth, &part->flag, 0, 0, 0, 0, "Apply effectors to children");
 		uiBlockEndAlign(block);
 	}
+	else if(part->phystype == PART_PHYS_NEWTON)
+		uiDefButBitI(block, TOG, PART_SELF_EFFECT, B_PART_RECALC, "Self Effect",	 butx,(buty-=buth),butw,buth, &part->flag, 0, 0, 0, 0, "Particle effectors effect themselves");
 	else
 		buty-=buth;
 
diff --git a/source/blender/src/buttons_scene.c b/source/blender/src/buttons_scene.c
index fb6a7636e16..5205be3e1b0 100644
--- a/source/blender/src/buttons_scene.c
+++ b/source/blender/src/buttons_scene.c
@@ -33,6 +33,7 @@
 #include <string.h>
 
 #include "MEM_guardedalloc.h"
+#include "BLO_sys_types.h" // for intptr_t support
 #include "DNA_node_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_space_types.h"
@@ -3261,7 +3262,7 @@ static void layer_copy_func(void *lay_v, void *lay_p)
 static void delete_scene_layer_func(void *srl_v, void *act_i)
 {
 	if(BLI_countlist(&G.scene->r.layers)>1) {
-		long act= (long)act_i;
+		intptr_t act= (intptr_t)act_i;
 		
 		BLI_remlink(&G.scene->r.layers, srl_v);
 		MEM_freeN(srl_v);
@@ -3322,7 +3323,7 @@ static char *scene_layer_menu(void)
 static void draw_3d_layer_buttons(uiBlock *block, int type, unsigned int *poin, short xco, short yco, short dx, short dy, char *tip)
 {
 	uiBut *bt;
-	long a;
+	intptr_t a;
 	
 	uiBlockBeginAlign(block);
 	for(a=0; a<5; a++) {
@@ -3381,7 +3382,7 @@ static void render_panel_layers(void)
 	
 	uiDefButBitI(block, TOG, R_SINGLE_LAYER, B_NOP, "Single",	230,145,60,20, &G.scene->r.scemode, 0, 0, 0, 0, "Only render this layer");	
 	bt=uiDefIconBut(block, BUT, B_NOP, ICON_X,	285, 145, 25, 20, 0, 0, 0, 0, 0, "Deletes current Render Layer");
-	uiButSetFunc(bt, delete_scene_layer_func, srl, (void *)(long)G.scene->r.actlay);
+	uiButSetFunc(bt, delete_scene_layer_func, srl, (void *)(intptr_t)G.scene->r.actlay);
 	uiBlockEndAlign(block);
 
 	/* RenderLayer visible-layers */
diff --git a/source/blender/src/drawgpencil.c b/source/blender/src/drawgpencil.c
index ee28049e2c0..15f65bfe3cf 100644
--- a/source/blender/src/drawgpencil.c
+++ b/source/blender/src/drawgpencil.c
@@ -37,6 +37,9 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "IMB_imbuf.h"
+#include "IMB_imbuf_types.h"
+
 #include "BMF_Api.h"
 
 #include "BLI_arithb.h"
@@ -142,6 +145,13 @@ void gp_ui_delframe_cb (void *gpd, void *gpl)
 	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();
+}
+
 /* ------- Drawing Code ------- */
 
 /* draw the controls for a given layer */
@@ -163,7 +173,7 @@ static void gp_drawui_layer (uiBlock *block, bGPdata *gpd, bGPDlayer *gpl, short
 		/* rounded header */
 		if (active) uiBlockSetCol(block, TH_BUT_ACTION);
 			rb_col= (active)?-20:20;
-			uiDefBut(block, ROUNDBOX, B_DIFF, "", *xco-8, *yco-2, width, 24, NULL, 5.0, 0.0, 15 , rb_col-20, ""); 
+			uiDefBut(block, ROUNDBOX, B_REDR, "", *xco-8, *yco-2, width, 24, NULL, 5.0, 0.0, 15 , rb_col-20, ""); 
 		if (active) uiBlockSetCol(block, TH_AUTO);
 		
 		/* lock toggle */
@@ -174,7 +184,7 @@ static void gp_drawui_layer (uiBlock *block, bGPdata *gpd, bGPDlayer *gpl, short
 	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= 26;
+		height= 0;
 		
 		/* visibility button (only if hidden but not locked!) */
 		if ((gpl->flag & GP_LAYER_HIDE) && !(gpl->flag & GP_LAYER_LOCKED))
@@ -246,8 +256,14 @@ static void gp_drawui_layer (uiBlock *block, bGPdata *gpd, bGPDlayer *gpl, short
 			
 			/* options */
 			uiBlockBeginAlign(block);
-				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);
+				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);
@@ -317,8 +333,12 @@ enum {
 	GP_DRAWDATA_NOSTATUS 	= (1<<0),	/* don't draw status info */
 	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 */
 };
 
+/* thickness above which we should use special drawing */
+#define GP_DRAWTHICKNESS_SPECIAL 	3
+
 /* ----- Tool Buffer Drawing ------ */
 
 /* draw stroke defined in buffer (simple ogl lines/points for now, as dotted lines) */
@@ -343,23 +363,13 @@ static void gp_draw_stroke_buffer (tGPspoint *points, int totpoints, short thick
 		glEnd();
 	}
 	else if (sflag & GP_STROKE_ERASER) {
-		/* draw stroke curve - just standard thickness */
-		setlinestyle(4);
-		glLineWidth(1.0f);
-		
-		glBegin(GL_LINE_STRIP);
-		for (i=0, pt=points; i < totpoints && pt; i++, pt++) {
-			glVertex2f(pt->x, pt->y);
-		}
-		glEnd();
-		
-		setlinestyle(0);
+		/* don't draw stroke at all! */
 	}
 	else {
 		float oldpressure = 0.0f;
 		
 		/* draw stroke curve */
-		setlinestyle(2);
+		if (G.f & G_DEBUG) setlinestyle(2);
 		
 		glBegin(GL_LINE_STRIP);
 		for (i=0, pt=points; i < totpoints && pt; i++, pt++) {
@@ -377,14 +387,14 @@ static void gp_draw_stroke_buffer (tGPspoint *points, int totpoints, short thick
 		}
 		glEnd();
 		
-		setlinestyle(0);
+		if (G.f & G_DEBUG) setlinestyle(0);
 	}
 }
 
 /* ----- Existing Strokes Drawing (3D and Point) ------ */
 
 /* draw a given stroke - just a single dot (only one point) */
-static void gp_draw_stroke_point (bGPDspoint *points, short sflag, int winx, int winy)
+static void gp_draw_stroke_point (bGPDspoint *points, short thickness, short sflag, int winx, int winy)
 {
 	/* draw point */
 	if (sflag & GP_STROKE_3DSPACE) {
@@ -392,18 +402,38 @@ static void gp_draw_stroke_point (bGPDspoint *points, short sflag, int winx, int
 			glVertex3f(points->x, points->y, points->z);
 		glEnd();
 	}
-	else if (sflag & GP_STROKE_2DSPACE) {
-		glBegin(GL_POINTS);
-			glVertex2f(points->x, points->y);
-		glEnd();
-	}
 	else {
-		const float x= (points->x / 1000 * winx);
-		const float y= (points->y / 1000 * winy);
+		float co[2];
 		
-		glBegin(GL_POINTS);
-			glVertex2f(x, y);
-		glEnd();
+		/* get coordinates of point */
+		if (sflag & GP_STROKE_2DSPACE) {
+			co[0]= points->x;
+			co[1]= points->y;
+		}
+		else {
+			co[0]= (points->x / 1000 * winx);
+			co[1]= (points->y / 1000 * winy);
+		}
+		
+		/* if thickness is less than GP_DRAWTHICKNESS_SPECIAL, simple opengl point will do */
+		if (thickness < GP_DRAWTHICKNESS_SPECIAL) {
+			glBegin(GL_POINTS);
+				glVertex2fv(co);
+			glEnd();
+		}
+		else {
+			/* draw filled circle as is done in circf (but without the matrix push/pops which screwed things up) */
+			GLUquadricObj *qobj = gluNewQuadric(); 
+			
+			gluQuadricDrawStyle(qobj, GLU_FILL); 
+			
+			/* need to translate drawing position, but must reset after too! */
+			glTranslatef(co[0],  co[1], 0.); 
+			gluDisk( qobj, 0.0,  thickness, 32, 1); 
+			glTranslatef(-co[0],  -co[1], 0.);
+			
+			gluDeleteQuadric(qobj);
+		}
 	}
 }
 
@@ -445,8 +475,8 @@ 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 winx, int winy)
 {	
-	/* if thickness is less than 3, 'smooth' opengl lines look better */
-	if ((thickness < 3) || (G.rt==0)) {
+	/* if thickness is less than GP_DRAWTHICKNESS_SPECIAL, 'smooth' opengl lines look better */
+	if (thickness < GP_DRAWTHICKNESS_SPECIAL) {
 		bGPDspoint *pt;
 		int i;
 		
@@ -466,18 +496,18 @@ static void gp_draw_stroke (bGPDspoint *points, int totpoints, short thickness,
 	}
 	else { /* tesselation code: currently only enabled with rt != 0 */
 		bGPDspoint *pt1, *pt2;
-		float p0[2], p1[2], pm[2];
+		float pm[2];
 		int i;
 		
 		glShadeModel(GL_FLAT);
-		glBegin(GL_QUAD_STRIP);
+		glBegin(GL_QUADS);
 		
 		for (i=0, pt1=points, pt2=points+1; i < (totpoints-1); i++, pt1++, pt2++) {
 			float s0[2], s1[2];		/* segment 'center' points */
 			float t0[2], t1[2];		/* tesselated coordinates */
 			float m1[2], m2[2];		/* gradient and normal */
-			float pthick, dist;		/* thickness at segment point, and length of segment */
-			float sminorang;		/* minor angle between strokes */
+			float mt[2], sc[2];		/* gradient for thickness, point for end-cap */
+			float pthick;			/* thickness at segment point */
 			
 			/* get x and y coordinates from points */
 			if (sflag & GP_STROKE_2DSPACE) {
@@ -494,91 +524,123 @@ static void gp_draw_stroke (bGPDspoint *points, int totpoints, short thickness,
 			/* calculate gradient and normal - 'angle'=(ny/nx) */
 			m1[1]= s1[1] - s0[1];		
 			m1[0]= s1[0] - s0[0];
-			dist = Vec2Lenf(s0, s1);
-			m2[1]= -(m1[0]) / dist;
-			m2[0]= m1[1] / dist;
+			Normalize2(m1);
+			m2[1]= -m1[0];
+			m2[0]= m1[1];
 			
-			/* if the first segment, initialise the first segment using segment's normal */
-			if (i == 0) {	
-				pthick= (pt1->pressure * thickness);
+			/* always use pressure from first point here */
+			pthick= (pt1->pressure * thickness);
+			
+			/* if the first segment, start of segment is segment's normal */
+			if (i == 0) {
+				/* draw start cap first 
+				 *	- make points slightly closer to center (about halfway across) 
+				 */				
+				mt[0]= m2[0] * pthick * 0.5;
+				mt[1]= m2[1] * pthick * 0.5;
+				sc[0]= s0[0] - (m1[0] * pthick * 0.75);
+				sc[1]= s0[1] - (m1[1] * pthick * 0.75);
 				
-				// TODO: also draw/do a round end-cap first
+				t0[0]= sc[0] - mt[0];
+				t0[1]= sc[1] - mt[1];
+				t1[0]= sc[0] + mt[0];
+				t1[1]= sc[1] + mt[1];
 				
-				p0[0]= s0[0] - (pthick * m2[0]);
-				p0[1]= s0[1] - (pthick * m2[1]);
-				p1[0]= s1[0] + (pthick * m2[0]);
-				p1[1]= s1[1] + (pthick * m2[1]);
+				glVertex2fv(t0);
+				glVertex2fv(t1);
 				
-				Vec2Copyf(pm, m1);
+				/* calculate points for start of segment */
+				mt[0]= m2[0] * pthick;
+				mt[1]= m2[1] * pthick;
+				
+				t0[0]= s0[0] - mt[0];
+				t0[1]= s0[1] - mt[1];
+				t1[0]= s0[0] + mt[0];
+				t1[1]= s0[1] + mt[1];
+				
+				/* draw this line twice (first to finish off start cap, then for stroke) */
+				glVertex2fv(t1);
+				glVertex2fv(t0);
+				glVertex2fv(t0);
+				glVertex2fv(t1);
 			}
-			
-			/* if the minor angle between the current segment and the previous one is less than 90 degrees */
-			if (i)
-				sminorang= NormalizedVecAngle2_2D(pm, m1);
-			else
-				sminorang= 0.0f;
-			
-			if ((IS_EQ(sminorang, 0)==0) && (abs(sminorang) < M_PI_2) ) 
-			{
-				float closep[2];
+			/* if not the first segment, use bisector of angle between segments */
+			else {
+				float mb[2]; 		/* bisector normal */
+				float athick, dfac;		/* actual thickness, difference between thicknesses */
 				
-				/* recalculate startpoint of segment, where the new start-line:
-				 * 	- starts a new gl-quad-strip
-				 *	- uses the vert of old startpoint closer to our endpoint
-				 *	- distance between new startpoints = distance between old startpoints
-				 *	- new startpoints occur on same gradient as old segment does (has potential for some 'minor' overlap, but ok)
+				/* calculate gradient of bisector (as average of normals) */
+				mb[0]= (pm[0] + m2[0]) / 2;
+				mb[1]= (pm[1] + m2[1]) / 2;
+				Normalize2(mb);
+				
+				/* calculate gradient to apply 
+				 * 	- as basis, use just pthick * bisector gradient
+				 *	- if cross-section not as thick as it should be, add extra padding to fix it
 				 */
+				mt[0]= mb[0] * pthick;
+				mt[1]= mb[1] * pthick;
+				athick= Vec2Length(mt);
+				dfac= pthick - (athick * 2);
+				if ( ((athick * 2) < pthick) && (IS_EQ(athick, pthick)==0) ) 
+				{
+					mt[0] += (mb[0] * dfac);
+					mt[1] += (mb[1] * dfac);
+				}	
 				
-				/* find the closer vertex, and distance between startpoints */
-				if (Vec2Lenf(p0, s1) > Vec2Lenf(p1, s1))
-					Vec2Copyf(closep, p1);
-				else
-					Vec2Copyf(closep, p0);
-					
-				/* determine which side this closer vertex should be on */
-				pthick= (pt1->pressure * thickness * 2);
-				if ( ((closep[0] - s0[0]) > 0) || ((closep[1] - s0[1]) > 0) ) {
-					/* assumes this is the 'second' point, (i.e. the 'plus' one), so the other is subtracting */
-					p0[0]= closep[0] - (pthick * pm[0]);
-					p0[1]= closep[1] - (pthick * pm[1]);
-					p1[0]= closep[0];
-					p1[1]= closep[1];
-				}
-				else if ( ((closep[0] - s0[0]) < 0) || ((closep[1] - s0[1]) < 0) ) {
-					/* assumes this is the 'first' point, (i.e. the 'minus' one), so the other is adding */
-					p0[0]= closep[0];
-					p0[1]= closep[1];
-					p1[0]= closep[0] + (pthick * pm[0]);
-					p1[1]= closep[1] + (pthick * pm[1]);
-				}
+				/* calculate points for start of segment */
+				t0[0]= s0[0] - mt[0];
+				t0[1]= s0[1] - mt[1];
+				t1[0]= s0[0] + mt[0];
+				t1[1]= s0[1] + mt[1];
 				
-				/* reset gl-states! */
-				glEnd();
-				glBegin(GL_QUAD_STRIP);				
+				/* draw this line twice (once for end of current segment, and once for start of next) */
+				glVertex2fv(t1);
+				glVertex2fv(t0);
+				glVertex2fv(t0);
+				glVertex2fv(t1);
 			}
 			
-			/* do the end of this segment */
-			pthick= (pt2->pressure * thickness);
-			t0[0] = s1[0] - (pthick * m2[0]);
-			t0[1] = s1[1] - (pthick * m2[1]);
-			t1[0] = s1[0] + (pthick * m2[0]);
-			t1[1] = s1[1] + (pthick * m2[1]);
-			
-			/* draw this segment */
-			glVertex2f(p0[0], p0[1]);
-			glVertex2f(p1[0], p1[1]);
-			glVertex2f(t0[0], t0[1]);
-			glVertex2f(t1[0], t1[1]);
-			
-			// TODO: draw end cap if last segment
+			/* if last segment, also draw end of segment (defined as segment's normal) */
 			if (i == totpoints-2) {
-			
+				/* for once, we use second point's pressure (otherwise it won't be drawn) */
+				pthick= (pt2->pressure * thickness);
+				
+				/* calculate points for end of segment */
+				mt[0]= m2[0] * pthick;
+				mt[1]= m2[1] * pthick;
+				
+				t0[0]= s1[0] - mt[0];
+				t0[1]= s1[1] - mt[1];
+				t1[0]= s1[0] + mt[0];
+				t1[1]= s1[1] + mt[1];
+				
+				/* draw this line twice (once for end of stroke, and once for endcap)*/
+				glVertex2fv(t1);
+				glVertex2fv(t0);
+				glVertex2fv(t0);
+				glVertex2fv(t1);
+				
+				
+				/* draw end cap as last step 
+				 *	- make points slightly closer to center (about halfway across) 
+				 */				
+				mt[0]= m2[0] * pthick * 0.5;
+				mt[1]= m2[1] * pthick * 0.5;
+				sc[0]= s1[0] + (m1[0] * pthick * 0.75);
+				sc[1]= s1[1] + (m1[1] * pthick * 0.75);
+				
+				t0[0]= sc[0] - mt[0];
+				t0[1]= sc[1] - mt[1];
+				t1[0]= sc[0] + mt[0];
+				t1[1]= sc[1] + mt[1];
+				
+				glVertex2fv(t1);
+				glVertex2fv(t0);
 			}
 			
-			/* store current points for next segment to use */
-			Vec2Copyf(p0, t0);
-			Vec2Copyf(p1, t1);
-			Vec2Copyf(pm, m1);
+			/* store stroke's 'natural' normal for next stroke to use */
+			Vec2Copyf(pm, m2);
 		}
 		
 		glEnd();
@@ -626,12 +688,16 @@ static void gp_draw_strokes (bGPDframe *gpf, int winx, int winy, int dflag, shor
 			continue;
 		if (!(dflag & GP_DRAWDATA_ONLYV2D) && (gps->flag & GP_STROKE_2DSPACE))
 			continue;
+		if ((dflag & GP_DRAWDATA_ONLYI2D) && !(gps->flag & GP_STROKE_2DIMAGE))
+			continue;
+		if (!(dflag & GP_DRAWDATA_ONLYI2D) && (gps->flag & GP_STROKE_2DIMAGE))
+			continue;
 		if ((gps->points == 0) || (gps->totpoints < 1))
 			continue;
 		
 		/* check which stroke-drawer to use */
 		if (gps->totpoints == 1)
-			gp_draw_stroke_point(gps->points, gps->flag, winx, winy);
+			gp_draw_stroke_point(gps->points, lthick, gps->flag, winx, winy);
 		else if (dflag & GP_DRAWDATA_ONLY3D)
 			gp_draw_stroke_3d(gps->points, gps->totpoints, lthick, dflag, gps->flag, debug, winx, winy);
 		else if (gps->totpoints > 1)	
@@ -796,6 +862,22 @@ static void gp_draw_data (bGPdata *gpd, int winx, int winy, int dflag)
 
 /* ----- Grease Pencil Sketches Drawing API ------ */
 
+/* draw grease-pencil sketches to specified 2d-view that uses ibuf corrections */
+void draw_gpencil_2dimage (ScrArea *sa, ImBuf *ibuf)
+{
+	bGPdata *gpd;
+	int dflag = 0;
+	
+	/* check that we have grease-pencil stuff to draw */
+	if (ELEM(NULL, sa, ibuf)) return;
+	gpd= gpencil_data_getactive(sa);
+	if (gpd == NULL) return;
+	
+	/* draw it! */
+	dflag = (GP_DRAWDATA_ONLYI2D|GP_DRAWDATA_NOSTATUS);
+	gp_draw_data(gpd, sa->winx, sa->winy, dflag);
+}
+
 /* draw grease-pencil sketches to specified 2d-view assuming that matrices are already set correctly 
  * Note: this gets called twice - first time with onlyv2d=1 to draw 'canvas' strokes, second time with onlyv2d=0 for screen-aligned strokes
  */
diff --git a/source/blender/src/drawipo.c b/source/blender/src/drawipo.c
index 0e7476bbe82..9b5be04eac1 100644
--- a/source/blender/src/drawipo.c
+++ b/source/blender/src/drawipo.c
@@ -442,7 +442,7 @@ int in_ipo_buttons(void)
 	else return 1;
 }
 
-static View2D *spacelink_get_view2d(SpaceLink *sl)
+View2D *spacelink_get_view2d(SpaceLink *sl)
 {
 	if(sl->spacetype==SPACE_IPO) 
 		return &((SpaceIpo *)sl)->v2d;
@@ -1212,16 +1212,9 @@ static void draw_ipovertices(int sel)
 					/*}*/
 				} else { /* normal non bit curves */
 					if(ei->flag & IPO_EDIT) {
-						if(ei->icu->ipo==IPO_BEZ) {
-							/* Draw the editmode hendels for a bezier curve */
-							if( (bezt->f1 & SELECT) == sel)/* && G.v2d->cur.xmin < bezt->vec[0][0] < G.v2d->cur.xmax)*/
-								bglVertex3fv(bezt->vec[0]);
-							
-							if( (bezt->f3 & SELECT) == sel)/* && G.v2d->cur.xmin < bezt->vec[2][0] < G.v2d->cur.xmax)*/
-								bglVertex3fv(bezt->vec[2]);
-							
-						}
-						
+						/* Only the vertex of the line, the
+						 * handler are draw below.
+						 */
 						if( (bezt->f2 & SELECT) == sel) /* && G.v2d->cur.xmin < bezt->vec[1][0] < G.v2d->cur.xmax)*/
 							bglVertex3fv(bezt->vec[1]);
 						
@@ -1237,6 +1230,45 @@ static void draw_ipovertices(int sel)
 				bezt++;
 			}
 			bglEnd();
+
+			if (ei->flag & IPO_EDIT) {
+				/* Now draw the two vertex of the handler,
+				 * need split it because we can't call glPointSize
+				 * in the middle of a glBegin/glEnd also the
+				 * bug comment before.
+				 */
+				a= ei->icu->totvert;
+				bezt= ei->icu->bezt;
+
+				glPointSize(BIF_GetThemeValuef(TH_HANDLE_VERTEX_SIZE));
+
+				if(sel) BIF_ThemeColor(TH_HANDLE_VERTEX_SELECT);
+				else BIF_ThemeColor(TH_HANDLE_VERTEX);
+
+				bglBegin(GL_POINTS);
+
+				while(a--) {
+					if (ei->disptype!=IPO_DISPBITS) {
+						if(ei->flag & IPO_EDIT) {
+							if(ei->icu->ipo==IPO_BEZ) {
+								/* Draw the editmode hendels for a bezier curve */
+								if( (bezt->f1 & SELECT) == sel)/* && G.v2d->cur.xmin < bezt->vec[0][0] < G.v2d->cur.xmax)*/
+									bglVertex3fv(bezt->vec[0]);
+							
+								if( (bezt->f3 & SELECT) == sel)/* && G.v2d->cur.xmin < bezt->vec[2][0] < G.v2d->cur.xmax)*/
+									bglVertex3fv(bezt->vec[2]);
+							}
+						}
+					}
+					bezt++;
+				}
+				bglEnd();
+
+				/* The color are always reset (see the while)
+				 * but the point size not so we reset now.
+				 */
+				glPointSize(BIF_GetThemeValuef(TH_VERTEX_SIZE));
+			}
 		}
 	}
 	
diff --git a/source/blender/src/drawmesh.c b/source/blender/src/drawmesh.c
index dd512595ebc..09f74c01c71 100644
--- a/source/blender/src/drawmesh.c
+++ b/source/blender/src/drawmesh.c
@@ -664,7 +664,7 @@ static int draw_tfaces3D__setHiddenOpts(void *userData, int index)
 {
 	struct { Mesh *me; EdgeHash *eh; } *data = userData;
 	MEdge *med = &data->me->medge[index];
-	unsigned long flags = (long) BLI_edgehash_lookup(data->eh, med->v1, med->v2);
+	uintptr_t flags = (intptr_t) BLI_edgehash_lookup(data->eh, med->v1, med->v2);
 
 	if((G.f & G_DRAWSEAMS) && (med->flag&ME_SEAM)) {
 		return 0;
@@ -682,7 +682,7 @@ static int draw_tfaces3D__setSeamOpts(void *userData, int index)
 {
 	struct { Mesh *me; EdgeHash *eh; } *data = userData;
 	MEdge *med = &data->me->medge[index];
-	unsigned long flags = (long) BLI_edgehash_lookup(data->eh, med->v1, med->v2);
+	uintptr_t flags = (intptr_t) BLI_edgehash_lookup(data->eh, med->v1, med->v2);
 
 	if (med->flag&ME_SEAM) {
 		if (G.f&G_HIDDENEDGES) {
@@ -698,7 +698,7 @@ static int draw_tfaces3D__setSelectOpts(void *userData, int index)
 {
 	struct { Mesh *me; EdgeHash *eh; } *data = userData;
 	MEdge *med = &data->me->medge[index];
-	unsigned long flags = (long) BLI_edgehash_lookup(data->eh, med->v1, med->v2);
+	uintptr_t flags = (intptr_t) BLI_edgehash_lookup(data->eh, med->v1, med->v2);
 
 	return flags & eEdge_Select;
 }
@@ -706,7 +706,7 @@ static int draw_tfaces3D__setActiveOpts(void *userData, int index)
 {
 	struct { Mesh *me; EdgeHash *eh; } *data = userData;
 	MEdge *med = &data->me->medge[index];
-	unsigned long flags = (long) BLI_edgehash_lookup(data->eh, med->v1, med->v2);
+	uintptr_t flags = (intptr_t) BLI_edgehash_lookup(data->eh, med->v1, med->v2);
 
 	if (flags & eEdge_Select) {
 		return 1;
diff --git a/source/blender/src/drawobject.c b/source/blender/src/drawobject.c
index 1a469e8b366..213f49528f0 100644
--- a/source/blender/src/drawobject.c
+++ b/source/blender/src/drawobject.c
@@ -5315,7 +5315,7 @@ void draw_object_ext(Base *base)
 
 static void bbs_mesh_verts__mapFunc(void *userData, int index, float *co, float *no_f, short *no_s)
 {
-	int offset = (long) userData;
+	int offset = (intptr_t) userData;
 	EditVert *eve = EM_get_vert_for_index(index);
 
 	if (eve->h==0) {
@@ -5327,7 +5327,7 @@ static int bbs_mesh_verts(DerivedMesh *dm, int offset)
 {
 	glPointSize( BIF_GetThemeValuef(TH_VERTEX_SIZE) );
 	bglBegin(GL_POINTS);
-	dm->foreachMappedVert(dm, bbs_mesh_verts__mapFunc, (void*)(long) offset);
+	dm->foreachMappedVert(dm, bbs_mesh_verts__mapFunc, (void*)(intptr_t) offset);
 	bglEnd();
 	glPointSize(1.0);
 
@@ -5336,7 +5336,7 @@ static int bbs_mesh_verts(DerivedMesh *dm, int offset)
 
 static int bbs_mesh_wire__setDrawOptions(void *userData, int index)
 {
-	int offset = (long) userData;
+	int offset = (intptr_t) userData;
 	EditEdge *eed = EM_get_edge_for_index(index);
 
 	if (eed->h==0) {
@@ -5348,7 +5348,7 @@ static int bbs_mesh_wire__setDrawOptions(void *userData, int index)
 }
 static int bbs_mesh_wire(DerivedMesh *dm, int offset)
 {
-	dm->drawMappedEdges(dm, bbs_mesh_wire__setDrawOptions, (void*)(long) offset);
+	dm->drawMappedEdges(dm, bbs_mesh_wire__setDrawOptions, (void*)(intptr_t) offset);
 
 	return offset + G.totedge;
 }		
@@ -5382,7 +5382,7 @@ static int bbs_mesh_solid_EM(DerivedMesh *dm, int facecol)
 	cpack(0);
 
 	if (facecol) {
-		dm->drawMappedFaces(dm, bbs_mesh_solid__setSolidDrawOptions, (void*)(long) 1, 0);
+		dm->drawMappedFaces(dm, bbs_mesh_solid__setSolidDrawOptions, (void*)(intptr_t) 1, 0);
 
 		if( CHECK_OB_DRAWFACEDOT(G.scene, G.vd, G.obedit->dt) ) {
 			glPointSize(BIF_GetThemeValuef(TH_FACEDOT_SIZE));
@@ -5415,7 +5415,7 @@ static int bbs_mesh_wire__setDrawOpts(void *userData, int index)
 {
 	struct { Mesh *me; EdgeHash *eh; int offset; } *data = userData;
 	MEdge *med = data->me->medge + index;
-	unsigned long flags = (long)BLI_edgehash_lookup(data->eh, med->v1, med->v2);
+	uintptr_t flags = (intptr_t)BLI_edgehash_lookup(data->eh, med->v1, med->v2);
 
 	if (flags & 1) {
 		set_framebuffer_index_color(data->offset+index);
diff --git a/source/blender/src/editarmature.c b/source/blender/src/editarmature.c
index 35986fcff4a..5e50c8117cc 100644
--- a/source/blender/src/editarmature.c
+++ b/source/blender/src/editarmature.c
@@ -439,6 +439,109 @@ void docenter_armature (Object *ob, int centermode)
 	}
 }
 
+/* helper for apply_armature_pose2bones - fixes parenting of objects that are bone-parented to armature */
+static void applyarmature_fix_boneparents (Object *armob)
+{
+	Object *ob;
+	
+	/* go through all objects in database */
+	for (ob= G.main->object.first; ob; ob= ob->id.next) {
+		/* if parent is bone in this armature, apply corrections */
+		if ((ob->parent == armob) && (ob->partype == PARBONE)) {
+			/* apply current transform from parent (not yet destroyed), 
+			 * then calculate new parent inverse matrix
+			 */
+			apply_obmat(ob);
+			
+			what_does_parent(ob);
+			Mat4Invert(ob->parentinv, workob.obmat);
+		}
+	}
+}
+
+/* set the current pose as the restpose */
+void apply_armature_pose2bones(void)
+{
+	Object	*ob;
+	bArmature *arm;
+	bPose *pose;
+	bPoseChannel *pchan;
+	EditBone *curbone;
+	
+	/* don't check if editmode (should be done by caller) */
+	ob= OBACT;
+	if (ob->type!=OB_ARMATURE) return;
+	if (object_data_is_libdata(ob)) {
+		error_libdata();
+		return;
+	}
+	arm= get_armature(ob); 
+	
+	/* helpful warnings... */
+	// TODO: add warnings to be careful about actions, applying deforms first, etc.
+	
+	/* Get editbones of active armature to alter */
+	if (G.edbo.first) BLI_freelistN(&G.edbo);
+	make_boneList(&G.edbo, &arm->bonebase, NULL);
+	
+	/* get pose of active object and move it out of posemode */
+	pose= ob->pose;
+	
+	for (pchan=pose->chanbase.first; pchan; pchan=pchan->next) {
+		curbone= editbone_name_exists(&G.edbo, pchan->name);
+		
+		/* simply copy the head/tail values from pchan over to curbone */
+		VECCOPY(curbone->head, pchan->pose_head);
+		VECCOPY(curbone->tail, pchan->pose_tail);
+		
+		/* fix roll:
+		 *	1. find auto-calculated roll value for this bone now
+		 *	2. remove this from the 'visual' y-rotation
+		 */
+		{
+			float premat[3][3], imat[3][3],pmat[3][3], tmat[3][3];
+			float delta[3], eul[3];
+			
+			/* obtain new auto y-rotation */
+			VecSubf(delta, curbone->tail, curbone->head);
+			vec_roll_to_mat3(delta, 0.0, premat);
+			Mat3Inv(imat, premat);
+			
+			/* get pchan 'visual' matrix */
+			Mat3CpyMat4(pmat, pchan->pose_mat);
+			
+			/* remove auto from visual and get euler rotation */
+			Mat3MulMat3(tmat, imat, pmat);
+			Mat3ToEul(tmat, eul);
+			
+			/* just use this euler-y as new roll value */
+			curbone->roll= eul[1];
+		}
+		
+		/* clear transform values for pchan */
+		pchan->loc[0]= pchan->loc[1]= pchan->loc[2]= 0;
+		pchan->quat[1]= pchan->quat[2]= pchan->quat[3]= 0;
+		pchan->quat[0]= pchan->size[0]= pchan->size[1]= pchan->size[2]= 1;
+		
+		/* set anim lock */
+		curbone->flag |= BONE_UNKEYED;
+	}
+	
+	/* convert editbones back to bones */
+	editbones_to_armature(&G.edbo, ob);
+	if (G.edbo.first) BLI_freelistN(&G.edbo);
+	
+	/* flush positions of posebones */
+	where_is_pose(ob);
+	
+	/* fix parenting of objects which are bone-parented */
+	applyarmature_fix_boneparents(ob);
+	
+	BIF_undo_push("Apply new restpose");
+	allqueue(REDRAWVIEW3D, 0);
+}
+
+
 /* Helper function for armature joining - link fixing */
 static void joined_armature_fix_links(Object *tarArm, Object *srcArm, bPoseChannel *pchan, EditBone *curbone)
 {
diff --git a/source/blender/src/editipo.c b/source/blender/src/editipo.c
index 63c301658f2..cd6aefdb87c 100644
--- a/source/blender/src/editipo.c
+++ b/source/blender/src/editipo.c
@@ -462,24 +462,7 @@ static void make_part_editipo(SpaceIpo *si)
 		name = getname_part_ei(part_ar[a]);
 		strcpy(ei->name, name);
 		ei->adrcode= part_ar[a];
-		
-		//if(ei->adrcode & MA_MAP1) {
-		//	ei->adrcode-= MA_MAP1;
-		//	ei->adrcode |= texchannel_to_adrcode(si->channel);
-		//}
-		//else {
-		//	if(ei->adrcode==MA_MODE) ei->disptype= IPO_DISPBITS;
-		//}
-		
 		ei->col= ipo_rainbow(a, PART_TOTIPO);
-		
-		//len= strlen(ei->name);
-		//if(len) {
-		//	if( ei->name[ len-1 ]=='R') ei->col= 0x5050FF;
-		//	else if( ei->name[ len-1 ]=='G') ei->col= 0x50FF50;
-		//	else if( ei->name[ len-1 ]=='B') ei->col= 0xFF7050;
-		//}
-		
 		ei->icu= find_ipocurve(si->ipo, ei->adrcode);
 		if(ei->icu) {
 			ei->flag= ei->icu->flag;
@@ -6011,4 +5994,4 @@ void move_to_frame(void)
 		}
 	}
 	BIF_undo_push("Set frame to selected Ipo vertex");
-}
\ No newline at end of file
+}
diff --git a/source/blender/src/editipo_lib.c b/source/blender/src/editipo_lib.c
index 41044ad13d7..e1e286e10cf 100644
--- a/source/blender/src/editipo_lib.c
+++ b/source/blender/src/editipo_lib.c
@@ -103,7 +103,8 @@ char *ic_name_empty[1] ={ "" };
 char *fluidsim_ic_names[FLUIDSIM_TOTNAM] = { "Fac-Visc", "Fac-Time",  "GravX","GravY","GravZ",  "VelX","VelY","VelZ", "Active"  };
 char *part_ic_names[PART_TOTNAM] = { "E_Freq", "E_Life", "E_Speed", "E_Angular", "E_Size",
 "Angular", "Size", "Drag", "Brown", "Damp", "Length", "Clump",
-"GravX", "GravY", "GravZ", "KinkAmp", "KinkFreq", "KinkShape", "BBTilt"};
+"GravX", "GravY", "GravZ", "KinkAmp", "KinkFreq", "KinkShape", "BBTilt",
+"FStreng", "FFall", "FMaxD", "F2Streng", "F2Fall", "F2MaxD"};
 
 /* gets the appropriate icon for the given blocktype */
 int geticon_ipo_blocktype(short blocktype)
diff --git a/source/blender/src/editkey.c b/source/blender/src/editkey.c
index 1f24fb07667..ce798064632 100644
--- a/source/blender/src/editkey.c
+++ b/source/blender/src/editkey.c
@@ -84,6 +84,8 @@
 #include "blendef.h"
 #include "mydevice.h"
 
+#include "BLO_sys_types.h" // for intptr_t support
+
 extern ListBase editNurb; /* in editcurve.c */
 
 /* temporary storage for slider values */
@@ -162,7 +164,7 @@ static void rvk_slider_func(void *voidob, void *voidkeynum)
 	IpoCurve  *icu=NULL;
 	BezTriple *bezt=NULL;
 	float cfra, rvkval;
-	int keynum = (long) voidkeynum;
+	int keynum = (intptr_t) voidkeynum;
 
 	cfra = frame_to_float(CFRA);
 
@@ -275,7 +277,7 @@ void make_rvk_slider(uiBlock *block, Object *ob, int keynum,
 				  x, y , w, h,
 				  meshslidervals+keynum, min, max, 10, 2, tip);
 	
-	uiButSetFunc(but, rvk_slider_func, ob, (void *)(long)keynum);
+	uiButSetFunc(but, rvk_slider_func, ob, (void *)(intptr_t)keynum);
 	// no hilite, the winmatrix is not correct later on...
 	uiButSetFlag(but, UI_NO_HILITE);
 
diff --git a/source/blender/src/editmesh_mods.c b/source/blender/src/editmesh_mods.c
index 6dfbd67720b..c162c904776 100644
--- a/source/blender/src/editmesh_mods.c
+++ b/source/blender/src/editmesh_mods.c
@@ -109,6 +109,7 @@ editmesh_mods.c, UI level access, no geometry changes
 
 #include "editmesh.h"
 
+#include "BLO_sys_types.h" // for intptr_t support
 
 /* ****************************** MIRROR **************** */
 
@@ -2937,7 +2938,7 @@ void select_sharp_edges(void)
 	EditFace *efa;
 	EditFace **efa1;
 	EditFace **efa2;
-	long edgecount = 0, i;
+	intptr_t edgecount = 0, i;
 	static short sharpness = 135;
 	float fsharpness;
 
@@ -3041,7 +3042,7 @@ void select_linked_flat_faces(void)
 	EditFace *efa;
 	EditFace **efa1;
 	EditFace **efa2;
-	long edgecount = 0, i, faceselcount=0, faceselcountold=0;
+	intptr_t edgecount = 0, i, faceselcount=0, faceselcountold=0;
 	static short sharpness = 135;
 	float fsharpness;
 
diff --git a/source/blender/src/editmesh_tools.c b/source/blender/src/editmesh_tools.c
index f9bb14a08c6..2b25253dc95 100644
--- a/source/blender/src/editmesh_tools.c
+++ b/source/blender/src/editmesh_tools.c
@@ -110,6 +110,8 @@ editmesh_tool.c: UI called tools for editmesh, geometry changes here, otherwise
 
 #include "PIL_time.h"
 
+#include "BLO_sys_types.h" // for intptr_t support
+
 /* local prototypes ---------------*/
 void bevel_menu(void);
 static void free_tagged_edges_faces(EditEdge *eed, EditFace *efa);
@@ -132,7 +134,7 @@ static int vergxco(const void *v1, const void *v2)
 }
 
 struct facesort {
-	unsigned long x;
+	uintptr_t x;
 	struct EditFace *efa;
 };
 
@@ -433,8 +435,8 @@ int removedoublesflag(short flag, short automerge, float limit)		/* return amoun
 		efa= em->faces.first;
 		while(efa) {
 			if(efa->f1 & 1) {
-				if(efa->v4) vsb->x= (unsigned long) MIN4( (unsigned long)efa->v1, (unsigned long)efa->v2, (unsigned long)efa->v3, (unsigned long)efa->v4);
-				else vsb->x= (unsigned long) MIN3( (unsigned long)efa->v1, (unsigned long)efa->v2, (unsigned long)efa->v3);
+				if(efa->v4) vsb->x= (uintptr_t) MIN4( (uintptr_t)efa->v1, (uintptr_t)efa->v2, (uintptr_t)efa->v3, (uintptr_t)efa->v4);
+				else vsb->x= (uintptr_t) MIN3( (uintptr_t)efa->v1, (uintptr_t)efa->v2, (uintptr_t)efa->v3);
 
 				vsb->efa= efa;
 				vsb++;
@@ -4665,6 +4667,7 @@ int EdgeLoopDelete(void) {
 
 int EdgeSlide(short immediate, float imperc)
 {
+	NumInput num;
 	EditMesh *em = G.editMesh;
 	EditFace *efa;
 	EditEdge *eed,*first=NULL,*last=NULL, *temp = NULL;
@@ -4681,6 +4684,8 @@ int EdgeSlide(short immediate, float imperc)
 	char str[128]; 
 	float labda = 0.0f;
 	
+	initNumInput(&num);
+		
 	view3d_get_object_project_mat(curarea, G.obedit, projectMat, viewMat);
 	
 	mvalo[0] = -1; mvalo[1] = -1; 
@@ -4992,88 +4997,22 @@ int EdgeSlide(short immediate, float imperc)
 		float v2[2], v3[2];
 		EditVert *centerVert, *upVert, *downVert;
 		
-		
-
 		getmouseco_areawin(mval);  
 		
 		if (!immediate && (mval[0] == mvalo[0] && mval[1] ==  mvalo[1])) {
 			PIL_sleep_ms(10);
 		} else {
+			char *p = str;;
 
 			mvalo[0] = mval[0];
 			mvalo[1] = mval[1];
 			
-			//Adjust Edgeloop
-			if(immediate) {
-				perc = imperc;   
-			}
-			percp = perc;
-			if(prop) {
-				look = vertlist;	  
-				while(look) { 
-					EditVert *tempev;
-					ev = look->link;
-					tempsv = BLI_ghash_lookup(vertgh,ev);
-					
-					tempev = editedge_getOtherVert((perc>=0)?tempsv->up:tempsv->down, ev);
-					VecLerpf(ev->co, tempsv->origvert.co, tempev->co, fabs(perc));
-									
-					look = look->next;	 
-				}
-			}
-			else {
-				//Non prop code  
-				look = vertlist;	  
-				while(look) { 
-					float newlen;
-					ev = look->link;
-					tempsv = BLI_ghash_lookup(vertgh,ev);
-					newlen = (len / VecLenf(editedge_getOtherVert(tempsv->up,ev)->co,editedge_getOtherVert(tempsv->down,ev)->co));
-					if(newlen > 1.0) {newlen = 1.0;}
-					if(newlen < 0.0) {newlen = 0.0;}
-					if(flip == 0) {
-						VecLerpf(ev->co, editedge_getOtherVert(tempsv->down,ev)->co, editedge_getOtherVert(tempsv->up,ev)->co, fabs(newlen));									
-					} else{
-						VecLerpf(ev->co, editedge_getOtherVert(tempsv->up,ev)->co, editedge_getOtherVert(tempsv->down,ev)->co, fabs(newlen));				
-					}
-					look = look->next;	 
-				}
 
-			}
-			
 			tempsv = BLI_ghash_lookup(vertgh,nearest);
 
 			centerVert = editedge_getSharedVert(tempsv->up, tempsv->down);
 			upVert = editedge_getOtherVert(tempsv->up, centerVert);
 			downVert = editedge_getOtherVert(tempsv->down, centerVert);
-			 // Highlight the Control Edges
-	
-			scrarea_do_windraw(curarea);   
-			persp(PERSP_VIEW);   
-			glPushMatrix();   
-			mymultmatrix(G.obedit->obmat);
-
-			glColor3ub(0, 255, 0);   
-			glBegin(GL_LINES);
-			glVertex3fv(upVert->co);
-			glVertex3fv(downVert->co);
-			glEnd(); 
-			
-			if(prop == 0) {
-				// draw start edge for non-prop
-				glPointSize(5);
-				glBegin(GL_POINTS);
-				glColor3ub(255,0,255);
-				if(flip) {
-					glVertex3fv(upVert->co);
-				} else {
-					glVertex3fv(downVert->co);					
-				}
-				glEnd();	
-			}
-			
-			
-			glPopMatrix();		 
 
 			view3d_project_float(curarea, upVert->co, v2, projectMat);
 			view3d_project_float(curarea, downVert->co, v3, projectMat);
@@ -5112,18 +5051,126 @@ int EdgeSlide(short immediate, float imperc)
 				perc = floor(perc);
 				perc /= 10;				   
 			}			
-			if(prop) {
-				sprintf(str, "(P)ercentage: %f", perc);
-			} else {
+			
+			if(prop == 0) {
 				len = VecLenf(upVert->co,downVert->co)*((perc+1)/2);
 				if(flip == 1) {
 					len = VecLenf(upVert->co,downVert->co) - len;
 				} 
-				sprintf(str, "Non (P)rop Length: %f, Press (F) to flip control side", len);
+			}
+			
+			if (hasNumInput(&num))
+			{
+				applyNumInput(&num, &perc);
+				
+				if (prop)
+				{
+					perc = MIN2(perc, 1);
+					perc = MAX2(perc, -1);
+				}
+				else
+				{
+					len = MIN2(perc, VecLenf(upVert->co,downVert->co));
+					len = MAX2(len, 0);
+				}
 			}
 
+			//Adjust Edgeloop
+			if(immediate) {
+				perc = imperc;   
+			}
+			percp = perc;
+			if(prop) {
+				look = vertlist;	  
+				while(look) { 
+					EditVert *tempev;
+					ev = look->link;
+					tempsv = BLI_ghash_lookup(vertgh,ev);
+					
+					tempev = editedge_getOtherVert((perc>=0)?tempsv->up:tempsv->down, ev);
+					VecLerpf(ev->co, tempsv->origvert.co, tempev->co, fabs(perc));
+									
+					look = look->next;	 
+				}
+			}
+			else {
+				//Non prop code  
+				look = vertlist;	  
+				while(look) { 
+					float newlen;
+					ev = look->link;
+					tempsv = BLI_ghash_lookup(vertgh,ev);
+					newlen = (len / VecLenf(editedge_getOtherVert(tempsv->up,ev)->co,editedge_getOtherVert(tempsv->down,ev)->co));
+					if(newlen > 1.0) {newlen = 1.0;}
+					if(newlen < 0.0) {newlen = 0.0;}
+					if(flip == 0) {
+						VecLerpf(ev->co, editedge_getOtherVert(tempsv->down,ev)->co, editedge_getOtherVert(tempsv->up,ev)->co, fabs(newlen));									
+					} else{
+						VecLerpf(ev->co, editedge_getOtherVert(tempsv->up,ev)->co, editedge_getOtherVert(tempsv->down,ev)->co, fabs(newlen));				
+					}
+					look = look->next;	 
+				}
+
+			}
+			
+			 // Highlight the Control Edges
+			scrarea_do_windraw(curarea);   
+			persp(PERSP_VIEW);   
+			glPushMatrix();   
+			mymultmatrix(G.obedit->obmat);
+
+			glColor3ub(0, 255, 0);   
+			glBegin(GL_LINES);
+			glVertex3fv(upVert->co);
+			glVertex3fv(downVert->co);
+			glEnd(); 
+			
+			if(prop == 0) {
+				// draw start edge for non-prop
+				glPointSize(5);
+				glBegin(GL_POINTS);
+				glColor3ub(255,0,255);
+				if(flip) {
+					glVertex3fv(upVert->co);
+				} else {
+					glVertex3fv(downVert->co);					
+				}
+				glEnd();	
+			}
 			
 			
+			glPopMatrix();		 
+
+			if(prop) {
+				p += sprintf(str, "(P)ercentage: ");
+			} else {
+				p += sprintf(str, "Non (P)rop Length: ");
+			}
+			
+			if (hasNumInput(&num))
+			{
+				char num_str[20];
+				
+				outputNumInput(&num, num_str);
+				p += sprintf(p, "%s", num_str);
+			}
+			else
+			{
+				if (prop)
+				{
+					p += sprintf(p, "%f", perc);
+				}
+				else
+				{
+					p += sprintf(p, "%f", len);
+				}
+			}
+			
+			
+			if (prop == 0) {
+				p += sprintf(p, ", Press (F) to flip control side");
+			}
+
 			headerprint(str);
 			screen_swapbuffers();			
 		}
@@ -5146,7 +5193,14 @@ int EdgeSlide(short immediate, float imperc)
 							perc = 0;  
 							immediate = 1;
 					} else if(event==PKEY) {
-							(prop == 1) ? (prop = 0):(prop = 1);
+							initNumInput(&num); /* reset num input */
+							if (prop) {
+								prop = 0;
+								num.flag |= NUM_NO_NEGATIVE;
+							}
+							else {
+								prop = 1;
+							}
 							mvalo[0] = -1;  
 					} else if(event==FKEY) {
 							(flip == 1) ? (flip = 0):(flip = 1); 
@@ -5184,7 +5238,13 @@ int EdgeSlide(short immediate, float imperc)
 							look = look->next;   
 						}	  
 					}
+					
+					if (handleNumInput(&num, event))
+					{
+						mvalo[0] = -1; /* NEED A BETTER WAY TO TRIGGER REDRAW */
+					}
 				}
+				
 			} 
 		} else {
 			draw = 0;
diff --git a/source/blender/src/editnode.c b/source/blender/src/editnode.c
index 98f4f1bb46f..eba6c5b4488 100644
--- a/source/blender/src/editnode.c
+++ b/source/blender/src/editnode.c
@@ -2110,6 +2110,7 @@ static void node_border_link_delete(SpaceNode *snode)
 			mval[1]= rect.ymax;
 			areamouseco_to_ipoco(&snode->v2d, mval, &rectf.xmax, &rectf.ymax);
 			
+			glLoadIdentity();
 			myortho2(rectf.xmin, rectf.xmax, rectf.ymin, rectf.ymax);
 			
 			glSelectBuffer(256, buffer); 
diff --git a/source/blender/src/editobject.c b/source/blender/src/editobject.c
index fee967bcd9a..2094074e3f3 100644
--- a/source/blender/src/editobject.c
+++ b/source/blender/src/editobject.c
@@ -172,6 +172,7 @@
 #include "BDR_drawobject.h"
 #include "BDR_editcurve.h"
 #include "BDR_unwrapper.h"
+#include "BDR_gpencil.h"
 
 #include <time.h>
 #include "mydevice.h"
@@ -2827,7 +2828,7 @@ void convertmenu(void)
 	if(G.scene->id.lib) return;
 
 	obact= OBACT;
-	if(obact==0) return;
+	if (obact == NULL) return;
 	if(!obact->flag & SELECT) return;
 	if(G.obedit) return;
 	
@@ -4130,15 +4131,26 @@ void apply_object( void )
 		}
 		allqueue(REDRAWVIEW3D, 0);
 		
-	} else {
+	} 
+	else {
+		ob= OBACT;
 		
-		evt = pupmenu("Apply Object%t|Scale and Rotation to ObData|Visual Transform to Objects Loc/Scale/Rot");
+		if ((ob->pose) && (ob->flag & OB_POSEMODE))
+			evt = pupmenu("Apply Object%t|Current Pose as RestPose%x3");
+		else
+			evt = pupmenu("Apply Object%t|Scale and Rotation to ObData%x1|Visual Transform to Objects Loc/Scale/Rot%x2");
 		if (evt==-1) return;
 		
-		if (evt==1) {
-			apply_objects_locrot();
-		} else if (evt==2) {
-			apply_objects_visual_tx();
+		switch (evt) {
+			case 1:
+				apply_objects_locrot();
+				break;
+			case 2:
+				apply_objects_visual_tx();
+				break;
+			case 3:
+				apply_armature_pose2bones();
+				break;
 		}
 	}
 }
diff --git a/source/blender/src/editview.c b/source/blender/src/editview.c
index a3fcad7885c..d2e59ae676d 100644
--- a/source/blender/src/editview.c
+++ b/source/blender/src/editview.c
@@ -1631,7 +1631,7 @@ void mouse_select(void)
 
 /* ------------------------------------------------------------------------- */
 
-static int edge_inside_circle(short centx, short centy, short rad, short x1, short y1, short x2, short y2)
+int edge_inside_circle(short centx, short centy, short rad, short x1, short y1, short x2, short y2)
 {
 	int radsq= rad*rad;
 	float v1[2], v2[2], v3[2];
diff --git a/source/blender/src/gpencil.c b/source/blender/src/gpencil.c
index eef21323a44..ed046929d2e 100644
--- a/source/blender/src/gpencil.c
+++ b/source/blender/src/gpencil.c
@@ -39,11 +39,16 @@
 
 #include "BMF_Api.h"
 
+#include "IMB_imbuf.h"
+#include "IMB_imbuf_types.h"
+
 #include "BLI_arithb.h"
 #include "BLI_blenlib.h"
 
 #include "DNA_listBase.h"
+#include "DNA_curve_types.h"
 #include "DNA_gpencil_types.h"
+#include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_space_types.h"
@@ -54,6 +59,7 @@
 #include "BKE_global.h"
 #include "BKE_utildefines.h"
 #include "BKE_blender.h"
+#include "BKE_curve.h"
 
 #include "BIF_gl.h"
 #include "BIF_glutil.h"
@@ -71,6 +77,8 @@
 #include "BDR_gpencil.h"
 #include "BIF_drawgpencil.h"
 
+#include "BDR_editobject.h"
+
 #include "BSE_drawipo.h"
 #include "BSE_headerbuttons.h"
 #include "BSE_view.h"
@@ -312,11 +320,17 @@ bGPdata *gpencil_data_getactive (ScrArea *sa)
 		{
 			SpaceSeq *sseq= sa->spacedata.first;
 			
-			/* only applicable for "Image Preview" mode */
+			/* only applicable for image modes */
 			if (sseq->mainb)
 				return sseq->gpd;
 		}
 			break;
+		case SPACE_IMAGE:
+		{
+			SpaceImage *sima= sa->spacedata.first;
+			return sima->gpd;
+		}
+			break;
 	}
 	
 	/* nothing found */
@@ -379,6 +393,17 @@ short gpencil_data_setactive (ScrArea *sa, bGPdata *gpd)
 			}
 		}
 			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 */
@@ -589,7 +614,7 @@ void gpencil_layer_delactive (bGPdata *gpd)
 }
 
 /* ************************************************** */
-/* GREASE-PENCIL EDITING MODE - Tools */
+/* GREASE-PENCIL EDITING - Tools */
 
 /* --------- Data Deletion ---------- */
 
@@ -658,6 +683,208 @@ void gpencil_delete_menu (void)
 	gpencil_delete_operation(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])
+{
+	if (gps->flag & GP_STROKE_3DSPACE) {
+		/* directly use 3d-coordinates */
+		// FIXME: maybe we need to counterotate this for object rotation?
+		VecCopyf(p3d, &pt->x);
+	}
+	else {
+		short mval[2], mx, my;
+		float *fp= give_cursor();
+		float dvec[3];
+		
+		/* get screen coordinate */
+		if (gps->flag & GP_STROKE_2DSPACE) {
+			View2D *v2d= spacelink_get_view2d(curarea->spacedata.first);
+			ipoco_to_areaco_noclip(v2d, &pt->x, mval);
+		}
+		else {
+			mval[0]= (pt->x / 1000 * curarea->winx);
+			mval[1]= (pt->y / 1000 * curarea->winy);
+		}
+		mx= mval[0]; 
+		my= mval[1];
+		
+		/* convert screen coordinate to 3d coordinates 
+		 *	- method taken from editview.c - mouse_cursor() 
+		 */
+		project_short_noclip(fp, mval);
+		window_to_3d(dvec, mval[0]-mx, mval[1]-my);
+		VecSubf(p3d, fp, dvec);
+	}
+}
+
+/* convert stroke to 3d path */
+static void gp_layer_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_layer_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;
+	}
+	
+	/* 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, short mode)
+{
+	bGPDframe *gpf= gpencil_layer_getframe(gpl, 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;
+		
+	/* initialise the curve */	
+	cu= add_curve(gpl->info, 1);
+	cu->flag |= CU_3D;
+	
+	/* init the curve object (remove rotation and assign curve data to it) */
+	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;
+	ob->data= cu;
+	
+	/* add points to curve */
+	for (gps= gpf->strokes.first; gps; gps= gps->next) {
+		switch (mode) {
+			case 1: 
+				gp_layer_to_path(gpl, gps, cu);
+				break;
+			case 2:
+				gp_layer_to_bezier(gpl, gps, cu);
+				break;
+		}
+	}
+}
+
+/* convert grease-pencil strokes to another representation 
+ *	mode: 	1 - Active layer to path
+ *			2 - Active layer to bezier
+ */
+void gpencil_convert_operation (short mode)
+{
+	bGPdata *gpd;	
+	float *fp= give_cursor();
+	
+	/* get datablock to work on */
+	gpd= gpencil_data_getactive(NULL);
+	if (gpd == NULL) return;
+	
+	/* initialise 3d-cursor correction globals */
+	initgrabz(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, mode);
+		}
+			break;
+	}
+	
+	/* redraw and undo-push */
+	BIF_undo_push("GPencil Convert");
+	allqueue(REDRAWVIEW3D, 0);
+	allqueue(REDRAWOOPS, 0);
+}
+
+/* display a menu for converting grease-pencil strokes */
+void gpencil_convert_menu (void)
+{
+	bGPdata *gpd= gpencil_data_getactive(NULL);
+	short mode;
+	
+	/* only show menu if it will be relevant */
+	if (gpd == NULL) return;
+	
+	mode= pupmenu("Grease Pencil Convert %t|Active Layer To Path%x1|Active Layer to Bezier%x2");
+	if (mode <= 0) return;
+	
+	gpencil_convert_operation(mode);
+}
+
 /* ************************************************** */
 /* GREASE-PENCIL EDITING MODE - Painting */
 
@@ -679,6 +906,7 @@ void gpencil_delete_menu (void)
 typedef struct tGPsdata {
 	ScrArea *sa;		/* area where painting originated */
 	View2D *v2d;		/* needed for GP_STROKE_2DSPACE */
+	ImBuf *ibuf;		/* needed for GP_STROKE_2DIMAGE */
 	
 	bGPdata *gpd;		/* gp-datablock layer comes from */
 	bGPDlayer *gpl;		/* layer we're working on */
@@ -686,6 +914,10 @@ typedef struct tGPsdata {
 	
 	short status;		/* current status of painting */
 	short paintmode;	/* mode for painting */
+	
+	short mval[2];		/* current mouse-position */
+	short mvalo[2];		/* previous recorded mouse-position */
+	short radius;		/* radius of influence for eraser */
 } tGPsdata;
 
 /* values for tGPsdata->status */
@@ -800,6 +1032,16 @@ static void gp_session_initpaint (tGPsdata *p)
 			}
 		}
 			break;	
+		case SPACE_IMAGE:
+		{
+			SpaceImage *sima= curarea->spacedata.first;
+			
+			/* set the current area */
+			p->sa= curarea;
+			p->v2d= &sima->v2d;
+			//p->ibuf= BKE_image_get_ibuf(sima->image, &sima->iuser);
+		}
+			break;
 		/* unsupported views */
 		default:
 		{
@@ -869,6 +1111,7 @@ static short gp_stroke_filtermval (tGPsdata *p, short mval[2], short pmval[2])
 		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;
 	
@@ -884,7 +1127,7 @@ 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) {
-		short mx=mval[0], my=mval[1];
+		const short mx=mval[0], my=mval[1];
 		float *fp= give_cursor();
 		float dvec[3];
 		
@@ -904,6 +1147,26 @@ static void gp_stroke_convertcoords (tGPsdata *p, short mval[], float out[])
 		out[1]= y;
 	}
 	
+	/* 2d - on image 'canvas' (asume that p->v2d is set) */
+	else if ( (gpd->sbuffer_sflag & GP_STROKE_2DIMAGE) && 
+			  (p->v2d) && (p->ibuf) ) 
+	{
+		ImBuf *ibuf= p->ibuf;
+		float x, y;
+		
+		/* convert to 'canvas' coordinates, then adjust for view */
+		areamouseco_to_ipoco(p->v2d, mval, &x, &y);
+		
+		if (ibuf) {
+			out[0]= x*ibuf->x;
+			out[1]= y*ibuf->y;
+		}
+		else {
+			out[0]= x;
+			out[1]= y;
+		}
+	}
+	
 	/* 2d - relative to screen (viewport area) */
 	else {
 		out[0] = (float)(mval[0]) / (float)(p->sa->winx) * 1000;
@@ -927,8 +1190,6 @@ static short gp_stroke_addpoint (tGPsdata *p, short mval[2], float pressure)
 	/* store settings */
 	pt->x= mval[0];
 	pt->y= mval[1];
-	pt->xf= (float)mval[0];
-	pt->yf= (float)mval[0];
 	pt->pressure= pressure;
 	
 	/* increment counters */
@@ -949,9 +1210,18 @@ static void gp_stroke_newfrombuffer (tGPsdata *p)
 	bGPDspoint *pt;
 	tGPspoint *ptc;
 	int i, totelem;
+
+	/* macro to test if only converting endpoints  */	
+	#define GP_BUFFER2STROKE_ENDPOINTS ((gpd->flag & GP_DATA_EDITPAINT) && (G.qual & LR_CTRLKEY))
 	
-	/* get total number of points to allocate space for */
-	totelem = gpd->sbuffer_size;
+	/* 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) {
@@ -972,45 +1242,53 @@ static void gp_stroke_newfrombuffer (tGPsdata *p)
 	gps->flag= gpd->sbuffer_sflag;
 	
 	/* copy points from the buffer to the stroke */
-	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++;
+	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);
+	
+	/* undefine macro to test if only converting endpoints  */	
+	#undef GP_BUFFER2STROKE_ENDPOINTS
 }
 
 /* --- 'Eraser' for 'Paint' Tool ------ */
-/* User should draw 'circles' around the parts of the sketches they wish to 
- * delete instead of drawing squiggles over existing lines. This should be 
- * easier to manage than if it was done otherwise.
- */
-
-/* convert gp-buffer stroke into mouse-coordinates array */
-static short (*gp_stroke_eraser_2mco (bGPdata *gpd))[2]
-{
-	tGPspoint *pt;
-	short (*mcoords)[2]; 
-	int i;
-	
-	/* allocate memory for coordinates array */
-	mcoords= MEM_mallocN(sizeof(*mcoords)*gpd->sbuffer_size,"gp_buf_mcords");
-	
-	/* copy coordinates */
-	for (pt=gpd->sbuffer, i=0; i < gpd->sbuffer_size; i++, pt++) {
-		mcoords[i][0]= pt->x;
-		mcoords[i][1]= pt->y;
-	}
-	
-	/* return */
-	return mcoords;
-}
 
 /* eraser tool - remove segment from stroke/split stroke (after lasso inside) */
 static short gp_stroke_eraser_splitdel (bGPDframe *gpf, bGPDstroke *gps, int i)
@@ -1080,8 +1358,19 @@ static short gp_stroke_eraser_splitdel (bGPDframe *gpf, bGPDstroke *gps, int i)
 	}
 }
 
+/* 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 mcoords[][2], short moves, rcti *rect, bGPDframe *gpf, bGPDstroke *gps)
+static void gp_stroke_eraser_dostroke (tGPsdata *p, short mval[], short mvalo[], short rad, rcti *rect, bGPDframe *gpf, bGPDstroke *gps)
 {
 	bGPDspoint *pt1, *pt2;
 	short x0=0, y0=0, x1=0, y1=0;
@@ -1097,10 +1386,9 @@ static void gp_stroke_eraser_dostroke (tGPsdata *p, short mcoords[][2], short mo
 	else if (gps->totpoints == 1) {
 		/* get coordinates */
 		if (gps->flag & GP_STROKE_3DSPACE) {
-			// FIXME: this may not be the correct correction
 			project_short(&gps->points->x, xyval);
 			x0= xyval[0];
-			x1= xyval[1];
+			y0= xyval[1];
 		}
 		else if (gps->flag & GP_STROKE_2DSPACE) {			
 			ipoco_to_areaco_noclip(p->v2d, &gps->points->x, xyval);
@@ -1115,7 +1403,7 @@ static void gp_stroke_eraser_dostroke (tGPsdata *p, short mcoords[][2], short mo
 		/* do boundbox check first */
 		if (BLI_in_rcti(rect, x0, y0)) {
 			/* only check if point is inside */
-			if (lasso_inside(mcoords, moves, x0, y0)) {
+			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);
@@ -1133,10 +1421,13 @@ static void gp_stroke_eraser_dostroke (tGPsdata *p, short mcoords[][2], short mo
 			
 			/* get coordinates */
 			if (gps->flag & GP_STROKE_3DSPACE) {
-				// FIXME: may not be correct correction
-				project_short(&gps->points->x, xyval);
+				project_short(&pt1->x, xyval);
 				x0= xyval[0];
-				x1= xyval[1];
+				y0= xyval[1];
+				
+				project_short(&pt2->x, xyval);
+				x1= xyval[0];
+				y1= xyval[1];
 			}
 			else if (gps->flag & GP_STROKE_2DSPACE) {
 				ipoco_to_areaco_noclip(p->v2d, &pt1->x, xyval);
@@ -1159,9 +1450,8 @@ static void gp_stroke_eraser_dostroke (tGPsdata *p, short mcoords[][2], short mo
 				/* 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
-				 *	- handled using the lasso-select checking code
 				 */
-				if (lasso_inside_edge(mcoords, moves, x0, y0, x1, x1)) {
+				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;
@@ -1176,24 +1466,21 @@ static void gp_stroke_eraser_dostroke (tGPsdata *p, short mcoords[][2], short mo
 /* erase strokes which fall under the eraser strokes */
 static void gp_stroke_doeraser (tGPsdata *p)
 {
-	bGPdata *gpd= p->gpd;
 	bGPDframe *gpf= p->gpf;
 	bGPDstroke *gps, *gpn;
-	short (*mcoords)[2];
 	rcti rect;
 	
-	/* get buffer-stroke coordinates as shorts array, and then get bounding box */
-	mcoords= gp_stroke_eraser_2mco(gpd);
-	lasso_select_boundbox(&rect, mcoords, gpd->sbuffer_size);
+	/* 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, mcoords, gpd->sbuffer_size, &rect, gpf, gps);
+		gp_stroke_eraser_dostroke(p, p->mval, p->mvalo, p->radius, &rect, gpf, gps);
 	}
-	
-	/* free mcoords array */
-	MEM_freeN(mcoords);
 }
 
 /* ---------- 'Paint' Tool ------------ */
@@ -1247,6 +1534,12 @@ static void gp_paint_initstroke (tGPsdata *p, short paintmode)
 			case SPACE_SEQ:
 			{
 				/* for now, this is not applicable here... */
+				//p->gpd->sbuffer_sflag |= GP_STROKE_2DIMAGE;
+			}
+				break;
+			case SPACE_IMAGE:
+			{
+				p->gpd->sbuffer_sflag |= GP_STROKE_2DIMAGE;
 			}
 				break;
 		}
@@ -1257,11 +1550,7 @@ static void gp_paint_initstroke (tGPsdata *p, short paintmode)
 static void gp_paint_strokeend (tGPsdata *p)
 {
 	/* check if doing eraser or not */
-	if (p->gpd->sbuffer_sflag & GP_STROKE_ERASER) {
-		/* get rid of relevant sections of strokes */
-		gp_stroke_doeraser(p);
-	}
-	else {
+	if ((p->gpd->sbuffer_sflag & GP_STROKE_ERASER) == 0) {
 		/* transfer stroke to frame */
 		gp_stroke_newfrombuffer(p);
 	}
@@ -1295,7 +1584,6 @@ static void gp_paint_cleanup (tGPsdata *p)
 short gpencil_paint (short mousebutton, short paintmode)
 {
 	tGPsdata p;
-	short prevmval[2], mval[2];
 	float opressure, pressure;
 	short ok = GP_STROKEADD_NORMAL;
 	
@@ -1315,31 +1603,51 @@ short gpencil_paint (short mousebutton, short paintmode)
 	setcursor_space(p.sa->spacetype, CURSOR_VPAINT);
 	
 	/* init drawing-device settings */
-	getmouseco_areawin(mval);
+	getmouseco_areawin(p.mval);
 	pressure = get_pressure();
 	
-	prevmval[0]= mval[0];
-	prevmval[1]= mval[1];
+	p.mvalo[0]= p.mval[0];
+	p.mvalo[1]= p.mval[1];
 	opressure= pressure;
 	
+	/* radius for eraser circle is thickness^2 */
+	p.radius= p.gpl->thickness * p.gpl->thickness;
+	
+	/* start drawing eraser-circle (if applicable) */
+	if (paintmode == GP_PAINTMODE_ERASER)
+		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 (!(pressure >= 0.99f) || (p.gpd->flag & GP_DATA_EDITPAINT)) { 
-		gp_stroke_addpoint(&p, mval, pressure);
+	if (paintmode != GP_PAINTMODE_ERASER) {
+		if (!(pressure >= 0.99f) || (p.gpd->flag & GP_DATA_EDITPAINT)) { 
+			gp_stroke_addpoint(&p, p.mval, pressure);
+		}
 	}
 	
 	/* paint loop */
 	do {
 		/* get current user input */
-		getmouseco_areawin(mval);
+		getmouseco_areawin(p.mval);
 		pressure = get_pressure();
 		
 		/* only add current point to buffer if mouse moved (otherwise wait until it does) */
-		if (gp_stroke_filtermval(&p, mval, prevmval)) {
+		if (paintmode == GP_PAINTMODE_ERASER) {
+			/* do 'live' erasing now */
+			gp_stroke_doeraser(&p);
+			
+			draw_sel_circle(p.mval, p.mvalo, p.radius, p.radius, 0);
+			force_draw(0);
+			
+			p.mvalo[0]= p.mval[0];
+			p.mvalo[1]= p.mval[1];
+		}
+		else if (gp_stroke_filtermval(&p, p.mval, p.mvalo)) {
 			/* try to add point */
-			ok= gp_stroke_addpoint(&p, mval, pressure);
+			ok= gp_stroke_addpoint(&p, p.mval, pressure);
 			
 			/* handle errors while adding point */
 			if ((ok == GP_STROKEADD_FULL) || (ok == GP_STROKEADD_OVERFLOW)) {
@@ -1347,8 +1655,8 @@ short gpencil_paint (short mousebutton, short paintmode)
 				gp_paint_strokeend(&p);
 				
 				/* start a new stroke, starting from previous point */
-				gp_stroke_addpoint(&p, prevmval, opressure);
-				ok= gp_stroke_addpoint(&p, mval, pressure);
+				gp_stroke_addpoint(&p, p.mvalo, opressure);
+				ok= gp_stroke_addpoint(&p, p.mval, pressure);
 			}
 			else if (ok == GP_STROKEADD_INVALID) {
 				/* the painting operation cannot continue... */
@@ -1361,8 +1669,8 @@ short gpencil_paint (short mousebutton, short paintmode)
 			}
 			force_draw(0);
 			
-			prevmval[0]= mval[0];
-			prevmval[1]= mval[1];
+			p.mvalo[0]= p.mval[0];
+			p.mvalo[1]= p.mval[1];
 			opressure= pressure;
 		}
 		else
@@ -1380,8 +1688,10 @@ short gpencil_paint (short mousebutton, short paintmode)
 	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= (p.gpd->sbuffer_size > 1);
+	if (paintmode == GP_PAINTMODE_ERASER) {
+		ok= 1; // fixme
+		draw_sel_circle(NULL, p.mvalo, 0, p.radius, 0);
+	}
 	else
 		ok= p.gpd->sbuffer_size;
 	
@@ -1408,7 +1718,8 @@ short gpencil_do_paint (ScrArea *sa, short mbut)
 	
 	/* currently, we will only 'paint' if:
 	 * 	1. draw-mode on gpd is set (for accessibility reasons)
-	 *		(single 'dots' are only available via this method)
+	 *		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
diff --git a/source/blender/src/header_info.c b/source/blender/src/header_info.c
index a9280d9dd19..8b8fd9ef266 100644
--- a/source/blender/src/header_info.c
+++ b/source/blender/src/header_info.c
@@ -39,6 +39,8 @@
 #include <config.h>
 #endif
 
+#include "BLO_sys_types.h" // for intptr_t support
+
 #include "DNA_group_types.h"
 #include "DNA_ID.h"
 #include "DNA_image_types.h"
@@ -2106,7 +2108,7 @@ static void info_text(int x, int y)
 {
 	Object *ob= OBACT;
 	extern float hashvectf[];
-	extern unsigned long mem_in_use, mmap_in_use;
+	extern uintptr_t mem_in_use, mmap_in_use;
 	unsigned int swatch_color;
 	float fac1, fac2, fac3;
 	char infostr[300], memstr[64];
diff --git a/source/blender/src/header_script.c b/source/blender/src/header_script.c
index 3c96e1692bf..53c4b9b5953 100644
--- a/source/blender/src/header_script.c
+++ b/source/blender/src/header_script.c
@@ -63,12 +63,14 @@
 #include "blendef.h"
 #include "mydevice.h"
 
+#include "BLO_sys_types.h" // for intptr_t support
+
 /* ********************** SCRIPT ****************************** */
 
 /* action executed after clicking in Scripts menu */
 static void do_scripts_submenus(void *int_arg, int event)
 {
-	int menutype = (long)int_arg;
+	int menutype = (intptr_t)int_arg;
 
 	BPY_menu_do_python (menutype, event);
 
@@ -80,7 +82,7 @@ static uiBlock *script_scripts_submenus(void *int_menutype)
 	uiBlock *block;
 	short yco = 20, menuwidth = 120;
 	BPyMenu *pym;
-	int i = 0, menutype = (long)int_menutype;
+	int i = 0, menutype = (intptr_t)int_menutype;
 
 	if ((menutype < 0) || (menutype > PYMENU_SCRIPTS_MENU_TOTAL))
 		return NULL;
@@ -132,7 +134,7 @@ static uiBlock *script_scriptsmenu(void *arg_unused)
 	uiBlockSetButmFunc(block, do_script_scriptsmenu, NULL);
 
 	for (i = 0; i < PYMENU_SCRIPTS_MENU_TOTAL; i++) {
-		uiDefIconTextBlockBut(block, script_scripts_submenus, (void *)(long)i, ICON_RIGHTARROW_THIN, BPyMenu_group_itoa(i), 0, yco-=20, menuwidth, 19, "");
+		uiDefIconTextBlockBut(block, script_scripts_submenus, (void *)(intptr_t)i, ICON_RIGHTARROW_THIN, BPyMenu_group_itoa(i), 0, yco-=20, menuwidth, 19, "");
 	}
 
 	uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
diff --git a/source/blender/src/header_view3d.c b/source/blender/src/header_view3d.c
index fcf4caf4522..e57a3480b52 100644
--- a/source/blender/src/header_view3d.c
+++ b/source/blender/src/header_view3d.c
@@ -4370,6 +4370,9 @@ static void do_view3d_pose_armaturemenu(void *arg, int event)
 	case 18:
 		pose_autoside_names(event-16);
 		break;
+	case 19: /* assign pose as restpose */
+		apply_armature_pose2bones();
+		break;
 	}
 		
 	allqueue(REDRAWVIEW3D, 0);
@@ -4395,6 +4398,7 @@ static uiBlock *view3d_pose_armaturemenu(void *arg_unused)
 	uiDefBut(block, SEPR, 0, "",				0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
 
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Relax Pose|W",				0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 15, "");
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Apply Pose as Restpose|Ctrl A",		0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 19, "");
 	
 	uiDefBut(block, SEPR, 0, "",				0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
 
diff --git a/source/blender/src/interface.c b/source/blender/src/interface.c
index e7b5b176979..a2b2af05083 100644
--- a/source/blender/src/interface.c
+++ b/source/blender/src/interface.c
@@ -105,6 +105,8 @@
 #include "blendef.h"
 #include "winlay.h"
 
+#include "BLO_sys_types.h" // for intptr_t support
+
 #define INSIDE_BLOCK		1
 #define INSIDE_PANEL_HEADER	2
 #define INSIDE_PANEL_SCALE	3
@@ -6039,7 +6041,7 @@ void autocomplete_end(AutoComplete *autocpl, char *autoname)
 /* autocomplete callback for ID buttons */
 static void autocomplete_id(char *str, void *arg_v)
 {
-	int blocktype= (long)arg_v;
+	int blocktype= (intptr_t)arg_v;
 	ListBase *listb= wich_libbase(G.main, blocktype);
 	
 	if(listb==NULL) return;
@@ -6370,7 +6372,7 @@ uiBut *uiDefIDPoinBut(uiBlock *block, uiIDPoinFuncFP func, short blocktype, int
 	ui_check_but(but);
 	
 	if(blocktype)
-		uiButSetCompleteFunc(but, autocomplete_id, (void *)(long)blocktype);
+		uiButSetCompleteFunc(but, autocomplete_id, (void *)(intptr_t)blocktype);
 
 	return but;
 }
diff --git a/source/blender/src/meshlaplacian.c b/source/blender/src/meshlaplacian.c
index 60f569ecf0e..2de6367c9ad 100644
--- a/source/blender/src/meshlaplacian.c
+++ b/source/blender/src/meshlaplacian.c
@@ -63,6 +63,8 @@
 
 #include "ONL_opennl.h"
 
+#include "BLO_sys_types.h" // for intptr_t support
+
 /************************** Laplacian System *****************************/
 
 struct LaplacianSystem {
@@ -126,14 +128,14 @@ static void laplacian_increase_edge_count(EdgeHash *edgehash, int v1, int v2)
 	void **p = BLI_edgehash_lookup_p(edgehash, v1, v2);
 
 	if(p)
-		*p = (void*)((long)*p + (long)1);
+		*p = (void*)((intptr_t)*p + (intptr_t)1);
 	else
-		BLI_edgehash_insert(edgehash, v1, v2, (void*)(long)1);
+		BLI_edgehash_insert(edgehash, v1, v2, (void*)(intptr_t)1);
 }
 
 static int laplacian_edge_count(EdgeHash *edgehash, int v1, int v2)
 {
-	return (int)(long)BLI_edgehash_lookup(edgehash, v1, v2);
+	return (int)(intptr_t)BLI_edgehash_lookup(edgehash, v1, v2);
 }
 
 static float cotan_weight(float *v1, float *v2, float *v3)
diff --git a/source/blender/src/meshtools.c b/source/blender/src/meshtools.c
index 0f30aef04df..99833625baa 100644
--- a/source/blender/src/meshtools.c
+++ b/source/blender/src/meshtools.c
@@ -107,6 +107,8 @@ void sort_faces(void);
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
 
+#include "BLO_sys_types.h" // for intptr_t support
+
 /* from rendercode.c */
 #define VECMUL(dest, f)                  dest[0]*= f; dest[1]*= f; dest[2]*= f
 
@@ -592,7 +594,7 @@ void sort_faces(void)
 
 typedef struct MocNode {
 	struct MocNode *next;
-	long index[MOC_NODE_RES];
+	intptr_t index[MOC_NODE_RES];
 } MocNode;
 
 static int mesh_octree_get_base_offs(float *co, float *offs, float *div)
@@ -610,7 +612,7 @@ static int mesh_octree_get_base_offs(float *co, float *offs, float *div)
 	return (vx*MOC_RES*MOC_RES) + vy*MOC_RES + vz;
 }
 
-static void mesh_octree_add_node(MocNode **bt, long index)
+static void mesh_octree_add_node(MocNode **bt, intptr_t index)
 {
 	if(*bt==NULL) {
 		*bt= MEM_callocN(sizeof(MocNode), "MocNode");
@@ -642,7 +644,7 @@ static void mesh_octree_free_node(MocNode **bt)
 /* temporal define, just to make nicer code below */
 #define MOC_ADDNODE(vx, vy, vz)	mesh_octree_add_node(basetable + ((vx)*MOC_RES*MOC_RES) + (vy)*MOC_RES + (vz), index)
 
-static void mesh_octree_add_nodes(MocNode **basetable, float *co, float *offs, float *div, long index)
+static void mesh_octree_add_nodes(MocNode **basetable, float *co, float *offs, float *div, intptr_t index)
 {
 	float fx, fy, fz;
 	int vx, vy, vz;
@@ -690,7 +692,7 @@ static void mesh_octree_add_nodes(MocNode **basetable, float *co, float *offs, f
 	
 }
 
-static long mesh_octree_find_index(MocNode **bt, float (*orco)[3], MVert *mvert, float *co)
+static intptr_t mesh_octree_find_index(MocNode **bt, float (*orco)[3], MVert *mvert, float *co)
 {
 	float *vec;
 	int a;
@@ -734,7 +736,7 @@ static struct {
 
 /* mode is 's' start, or 'e' end, or 'u' use */
 /* if end, ob can be NULL */
-long mesh_octree_table(Object *ob, float *co, char mode)
+intptr_t mesh_octree_table(Object *ob, float *co, char mode)
 {
 	MocNode **bt;
 	
@@ -805,7 +807,7 @@ long mesh_octree_table(Object *ob, float *co, char mode)
 			EditVert *eve;
 
 			for(eve= G.editMesh->verts.first; eve; eve= eve->next) {
-				mesh_octree_add_nodes(MeshOctree.table, eve->co, MeshOctree.offs, MeshOctree.div, (long)(eve));
+				mesh_octree_add_nodes(MeshOctree.table, eve->co, MeshOctree.offs, MeshOctree.div, (intptr_t)(eve));
 			}
 		}
 		else {		
@@ -863,7 +865,7 @@ int mesh_get_x_mirror_vert(Object *ob, int index)
 EditVert *editmesh_get_x_mirror_vert(Object *ob, float *co)
 {
 	float vec[3];
-	long poinval;
+	intptr_t poinval;
 	
 	/* ignore nan verts */
 	if (isnan(co[0]) || !finite(co[0]) ||
diff --git a/source/blender/src/parametrizer.c b/source/blender/src/parametrizer.c
index 096629b01ec..7aa27f99d77 100644
--- a/source/blender/src/parametrizer.c
+++ b/source/blender/src/parametrizer.c
@@ -22,6 +22,8 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "BLO_sys_types.h" // for intptr_t support
+
 #if defined(_WIN32)
 #define M_PI 3.14159265358979323846
 #endif
@@ -38,7 +40,7 @@ static int PHashSizes[] = {
 	4194319, 8388617, 16777259, 33554467, 67108879, 134217757, 268435459
 };
 
-#define PHASH_hash(ph, item) (((unsigned long) (item))%((unsigned int) (ph)->cursize))
+#define PHASH_hash(ph, item) (((uintptr_t) (item))%((unsigned int) (ph)->cursize))
 #define PHASH_edge(v1, v2)	 ((v1)^(v2))
 
 static PHash *phash_new(PHashLink **list, int sizehint)
diff --git a/source/blender/src/parametrizer.h b/source/blender/src/parametrizer.h
index 80fab110d5f..c468b8d62c5 100644
--- a/source/blender/src/parametrizer.h
+++ b/source/blender/src/parametrizer.h
@@ -5,9 +5,11 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+	
+#include "BLO_sys_types.h" // for intptr_t support
 
 typedef void ParamHandle;	/* handle to a set of charts */
-typedef long ParamKey;		/* (hash) key for identifying verts and faces */
+typedef intptr_t ParamKey;		/* (hash) key for identifying verts and faces */
 typedef enum ParamBool {
 	PARAM_TRUE = 1,
 	PARAM_FALSE = 0
diff --git a/source/blender/src/parametrizer_intern.h b/source/blender/src/parametrizer_intern.h
index f7a32816b33..bc38cb4bc0f 100644
--- a/source/blender/src/parametrizer_intern.h
+++ b/source/blender/src/parametrizer_intern.h
@@ -30,7 +30,7 @@ typedef enum PBool {
 
 /* Special Purpose Hash */
 
-typedef long PHashKey;
+typedef intptr_t PHashKey;
 
 typedef struct PHashLink {
 	struct PHashLink *next;
diff --git a/source/blender/src/renderwin.c b/source/blender/src/renderwin.c
index 6c150f3d30f..88f5f6efe15 100644
--- a/source/blender/src/renderwin.c
+++ b/source/blender/src/renderwin.c
@@ -50,6 +50,8 @@
 
 #endif
 
+#include "BLO_sys_types.h" // for intptr_t support
+
 #include <limits.h>
 
 #include "BLI_blenlib.h"
@@ -901,7 +903,7 @@ static void renderwin_progress_display_cb(RenderResult *rr, volatile rcti *rect)
 void make_renderinfo_string(RenderStats *rs, char *str)
 {
 	extern char info_time_str[32];	// header_info.c
-	extern unsigned long mem_in_use, mmap_in_use;
+	extern uintptr_t mem_in_use, mmap_in_use;
 	float megs_used_memory, mmap_used_memory;
 	char *spos= str;
 	
diff --git a/source/blender/src/resources.c b/source/blender/src/resources.c
index f47f14a605c..acd14aae7a5 100644
--- a/source/blender/src/resources.c
+++ b/source/blender/src/resources.c
@@ -313,7 +313,15 @@ char *BIF_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colorid)
 				cp= ts->transition; break;
 			case TH_SEQ_META:
 				cp= ts->meta; break;
-				
+			case TH_HANDLE_VERTEX:
+				cp= ts->handle_vertex;
+				break;
+			case TH_HANDLE_VERTEX_SELECT:
+				cp= ts->handle_vertex_select;
+				break;
+			case TH_HANDLE_VERTEX_SIZE:
+				cp= &ts->handle_vertex_size;
+				break;
 			}
 
 		}
@@ -493,6 +501,10 @@ void BIF_InitTheme(void)
 	SETCOL(btheme->tipo.hilite, 0x60, 0xc0, 0x40, 255); 
 	btheme->tipo.vertex_size= 3;
 
+	SETCOL(btheme->tipo.handle_vertex, 0xff, 0x70, 0xff, 255);
+	SETCOL(btheme->tipo.handle_vertex_select, 0xff, 0xff, 0x70, 255);
+	btheme->tipo.handle_vertex_size= 3;
+
 	/* space file */
 	/* to have something initialized */
 	btheme->tfile= btheme->tv3d;
@@ -684,7 +696,10 @@ char *BIF_ThemeColorsPup(int spacetype)
 			str += sprintf(str, "Vertex %%x%d|", TH_VERTEX);
 			str += sprintf(str, "Vertex Selected %%x%d|", TH_VERTEX_SELECT);
 			str += sprintf(str, "Vertex Size %%x%d|", TH_VERTEX_SIZE);
-			str += sprintf(str, "Current Frame %%x%d", TH_CFRAME);
+			str += sprintf(str, "Current Frame %%x%d|", TH_CFRAME);
+			str += sprintf(str, "Handle Vertex %%x%d|", TH_HANDLE_VERTEX);
+			str += sprintf(str, "Handle Vertex Selected %%x%d|", TH_HANDLE_VERTEX_SELECT);
+			str += sprintf(str, "Handle Vertex Size %%x%d", TH_HANDLE_VERTEX_SIZE);
 			break;
 		case SPACE_FILE:
 			str += sprintf(str, "Selected file %%x%d", TH_HILITE);
diff --git a/source/blender/src/space.c b/source/blender/src/space.c
index 79fdb312309..81b0efeef0d 100644
--- a/source/blender/src/space.c
+++ b/source/blender/src/space.c
@@ -182,6 +182,8 @@
 
 #include "SYS_System.h" /* for the user def menu ... should move elsewhere. */
 
+#include "BLO_sys_types.h" // for intptr_t support
+
 /* maybe we need this defined somewhere else */
 extern void StartKetsjiShell(ScrArea *area, char* startscenename, struct Main* maggie, struct SpaceIpo* sipo,int always_use_expand_framing);
 extern void StartKetsjiShellSimulation(ScrArea *area, char* startscenename, struct Main* maggie, struct SpaceIpo* sipo,int always_use_expand_framing);/*rcruiz*/
@@ -460,7 +462,7 @@ static LinkNode *save_and_reset_all_scene_cfra(void)
 	Scene *sc;
 	
 	for (sc= G.main->scene.first; sc; sc= sc->id.next) {
-		BLI_linklist_prepend(&storelist, (void*) (long) sc->r.cfra);
+		BLI_linklist_prepend(&storelist, (void*) (intptr_t) sc->r.cfra);
 
 		/* why is this reset to 1 ?*/
 		/* sc->r.cfra= 1;*/
@@ -478,7 +480,7 @@ static void restore_all_scene_cfra(LinkNode *storelist) {
 	Scene *sc;
 	
 	for (sc= G.main->scene.first; sc; sc= sc->id.next) {
-		int stored_cfra= (long) sc_store->link;
+		int stored_cfra= (intptr_t) sc_store->link;
 		
 		sc->r.cfra= stored_cfra;
 		set_scene_bg(sc);
@@ -1904,6 +1906,8 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 					else
 						copy_attr_menu();
 				}
+				else if(G.qual==(LR_ALTKEY|LR_SHIFTKEY)) 
+					gpencil_convert_menu(); /* gpencil.c */
 				else if(G.qual==LR_ALTKEY) {
 					if(ob && (ob->flag & OB_POSEMODE))
 						pose_clear_constraints();	/* poseobject.c */
@@ -1962,7 +1966,7 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 						G.vd->drawtype= pupval;
 						doredraw= 1;
 					}
-                                }
+                }
 				
 				break;
 			case EKEY:
@@ -3490,6 +3494,9 @@ static void info_user_themebuts(uiBlock *block, short y1, short y2, short y3, sh
 		uiButSetFunc(but, set_userdef_iconfile_cb, &iconfileindex, NULL);
 									
 	}
+	else if(th_curcol==TH_HANDLE_VERTEX_SIZE) {
+		uiDefButC(block, NUMSLI, B_UPDATE_THEME,"Handle size ", 465,y3,200,20, col, 1.0, 10.0, 0, 0, "");
+	}
 	else {
 		uiBlockBeginAlign(block);
 		if ELEM9(th_curcol, TH_PANEL, TH_LAMP, TH_FACE, TH_FACE_SELECT, TH_EDITMESH_ACTIVE, TH_MENU_BACK, TH_MENU_HILITE, TH_MENU_ITEM, TH_NODE) {
diff --git a/source/blender/src/toolbox.c b/source/blender/src/toolbox.c
index cd71e7fd8e6..5b2120424f1 100644
--- a/source/blender/src/toolbox.c
+++ b/source/blender/src/toolbox.c
@@ -123,6 +123,8 @@
 #include "BPY_extern.h"
 #include "BPY_menus.h"
 
+#include "BLO_sys_types.h" // for intptr_t support
+
 void asciitoraw(int ch, unsigned short *event, unsigned short *qual)
 {
 	if( isupper(ch) ) {
@@ -238,7 +240,7 @@ void error_libdata(void)
 
 int saveover(char *file)
 {
-	int len= strlen(file);
+	size_t len= strlen(file);
 	
 	if(len==0) 
 		return 0;
@@ -1756,8 +1758,8 @@ static uiBlock *tb_makemenu(void *arg)
 static int tb_mainx= 1234, tb_mainy= 0;
 static void store_main(void *arg1, void *arg2)
 {
-	tb_mainx= (long)arg1;
-	tb_mainy= (long)arg2;
+	tb_mainx= (intptr_t)arg1;
+	tb_mainy= (intptr_t)arg2;
 }
 
 static void do_group_addmenu(void *arg, int event)
@@ -2185,27 +2187,27 @@ void toolbox_n(void)
 	
 		but=uiDefBlockBut(block, tb_makemenu, menu1, str1,	mval[0]-(1.5*dx)+tb_mainx,mval[1]+tb_mainy, dx, 19, "");
 		uiButSetFlag(but, UI_MAKE_TOP|UI_MAKE_RIGHT);
-		uiButSetFunc(but, store_main, (void *)(long)dx, (void *)(long)-5);
+		uiButSetFunc(but, store_main, (void *)(intptr_t)dx, (void *)(intptr_t)-5);
 
 		but=uiDefBlockBut(block, tb_makemenu, menu2, str2,	mval[0]-(0.5*dx)+tb_mainx,mval[1]+tb_mainy, dx, 19, "");
 		uiButSetFlag(but, UI_MAKE_TOP);
-		uiButSetFunc(but, store_main, (void *)(long)0, (void *)(long)-5);
+		uiButSetFunc(but, store_main, (void *)(intptr_t)0, (void *)(intptr_t)-5);
 
 		but=uiDefBlockBut(block, tb_makemenu, menu3, str3,	mval[0]+(0.5*dx)+tb_mainx,mval[1]+tb_mainy, dx, 19, "");
 		uiButSetFlag(but, UI_MAKE_TOP|UI_MAKE_LEFT);
-		uiButSetFunc(but, store_main, (void *)(long)-dx, (void *)(long)-5);
+		uiButSetFunc(but, store_main, (void *)(intptr_t)-dx, (void *)(intptr_t)-5);
 
 		but=uiDefBlockBut(block, tb_makemenu, menu4, str4,	mval[0]-(1.5*dx)+tb_mainx,mval[1]+tb_mainy-20, dx, 19, "");
 		uiButSetFlag(but, UI_MAKE_DOWN|UI_MAKE_RIGHT);
-		uiButSetFunc(but, store_main, (void *)(long)dx, (void *)(long)5);
+		uiButSetFunc(but, store_main, (void *)(intptr_t)dx, (void *)(intptr_t)5);
 
 		but=uiDefBlockBut(block, tb_makemenu, menu5, str5,	mval[0]-(0.5*dx)+tb_mainx,mval[1]+tb_mainy-20, dx, 19, "");
 		uiButSetFlag(but, UI_MAKE_DOWN);
-		uiButSetFunc(but, store_main, (void *)(long)0, (void *)(long)5);
+		uiButSetFunc(but, store_main, (void *)(intptr_t)0, (void *)(intptr_t)5);
 
 		but=uiDefBlockBut(block, tb_makemenu, menu6, str6,	mval[0]+(0.5*dx)+tb_mainx,mval[1]+tb_mainy-20, dx, 19, "");
 		uiButSetFlag(but, UI_MAKE_DOWN|UI_MAKE_LEFT);
-		uiButSetFunc(but, store_main, (void *)(long)-dx, (void *)(long)5);
+		uiButSetFunc(but, store_main, (void *)(intptr_t)-dx, (void *)(intptr_t)5);
 	} else if (tot==5 || tot==7) {
                 /* check if it fits, dubious */
 		if(mval[0]-0.25*dx+tb_mainx < 6) mval[0]= 6 + 0.25*dx -tb_mainx;
@@ -2282,7 +2284,7 @@ void toolbox_generic( TBitem *generic_menu )
 	TBitem *menu;
 	int dx=96, first=1, len;
 	short event, mval[2];
-	long ypos = -5;
+	intptr_t ypos = -5;
 	
 	tb_mainx= -32;
 	tb_mainy= -5;
diff --git a/source/blender/src/transform_conversions.c b/source/blender/src/transform_conversions.c
index 9f2f58d0cdb..efb86b59ed1 100644
--- a/source/blender/src/transform_conversions.c
+++ b/source/blender/src/transform_conversions.c
@@ -144,6 +144,8 @@ extern ListBase editelems;
 
 #include "transform.h"
 
+#include "BLO_sys_types.h" // for intptr_t support
+
 /* local function prototype - for Object/Bone Constraints */
 static short constraints_list_needinv(TransInfo *t, ListBase *list);
 /* local function prototype - for finding number of keyframes that are selected for editing */
@@ -1913,7 +1915,7 @@ static void set_crazyspace_quats(float *origcos, float *mappedcos, float *quats)
 	EditVert *eve, *prev;
 	EditFace *efa;
 	float *v1, *v2, *v3, *v4, *co1, *co2, *co3, *co4;
-	long index= 0;
+	intptr_t index= 0;
 	
 	/* two abused locations in vertices */
 	for(eve= em->verts.first; eve; eve= eve->next, index++) {
@@ -1925,13 +1927,13 @@ static void set_crazyspace_quats(float *origcos, float *mappedcos, float *quats)
 	for(efa= em->faces.first; efa; efa= efa->next) {
 		
 		/* retrieve mapped coordinates */
-		v1= mappedcos + 3*(long)(efa->v1->prev);
-		v2= mappedcos + 3*(long)(efa->v2->prev);
-		v3= mappedcos + 3*(long)(efa->v3->prev);
+		v1= mappedcos + 3*(intptr_t)(efa->v1->prev);
+		v2= mappedcos + 3*(intptr_t)(efa->v2->prev);
+		v3= mappedcos + 3*(intptr_t)(efa->v3->prev);
 
-		co1= (origcos)? origcos + 3*(long)(efa->v1->prev): efa->v1->co;
-		co2= (origcos)? origcos + 3*(long)(efa->v2->prev): efa->v2->co;
-		co3= (origcos)? origcos + 3*(long)(efa->v3->prev): efa->v3->co;
+		co1= (origcos)? origcos + 3*(intptr_t)(efa->v1->prev): efa->v1->co;
+		co2= (origcos)? origcos + 3*(intptr_t)(efa->v2->prev): efa->v2->co;
+		co3= (origcos)? origcos + 3*(intptr_t)(efa->v3->prev): efa->v3->co;
 
 		if(efa->v2->tmp.p==NULL && efa->v2->f1) {
 			set_crazy_vertex_quat(quats, co2, co3, co1, v2, v3, v1);
@@ -1940,8 +1942,8 @@ static void set_crazyspace_quats(float *origcos, float *mappedcos, float *quats)
 		}
 		
 		if(efa->v4) {
-			v4= mappedcos + 3*(long)(efa->v4->prev);
-			co4= (origcos)? origcos + 3*(long)(efa->v4->prev): efa->v4->co;
+			v4= mappedcos + 3*(intptr_t)(efa->v4->prev);
+			co4= (origcos)? origcos + 3*(intptr_t)(efa->v4->prev): efa->v4->co;
 
 			if(efa->v1->tmp.p==NULL && efa->v1->f1) {
 				set_crazy_vertex_quat(quats, co1, co2, co4, v1, v2, v4);
diff --git a/source/blender/src/transform_generics.c b/source/blender/src/transform_generics.c
index c332fd723eb..a1440b8cbce 100644
--- a/source/blender/src/transform_generics.c
+++ b/source/blender/src/transform_generics.c
@@ -32,6 +32,8 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "BLO_sys_types.h" // for intptr_t support
+
 #include "DNA_action_types.h"
 #include "DNA_armature_types.h"
 #include "DNA_constraint_types.h"
@@ -581,39 +583,6 @@ void recalcData(TransInfo *t)
 		reshadeall_displist();
 }
 
-void initTransModeFlags(TransInfo *t, int mode) 
-{
-	t->mode = mode;
-	t->num.flag = 0;
-
-	/* REMOVING RESTRICTIONS FLAGS */
-	t->flag &= ~T_ALL_RESTRICTIONS;
-	
-	switch (mode) {
-	case TFM_RESIZE:
-		t->flag |= T_NULL_ONE;
-		t->num.flag |= NUM_NULL_ONE;
-		t->num.flag |= NUM_AFFECT_ALL;
-		if (!G.obedit) {
-			t->flag |= T_NO_ZERO;
-			t->num.flag |= NUM_NO_ZERO;
-		}
-		break;
-	case TFM_TOSPHERE:
-		t->num.flag |= NUM_NULL_ONE;
-		t->num.flag |= NUM_NO_NEGATIVE;
-		t->flag |= T_NO_CONSTRAINT;
-		break;
-	case TFM_SHEAR:
-	case TFM_CREASE:
-	case TFM_BONE_ENVELOPE:
-	case TFM_CURVE_SHRINKFATTEN:
-	case TFM_BONE_ROLL:
-		t->flag |= T_NO_CONSTRAINT;
-		break;
-	}
-}
-
 void drawLine(float *center, float *dir, char axis, short options)
 {
 	extern void make_axis_color(char *col, char *col2, char axis);	// drawview.c
@@ -672,19 +641,10 @@ void initTrans (TransInfo *t)
 	t->transform		= NULL;
 	t->handleEvent		= NULL;
 
-	t->total			=
-		t->num.idx		=
-		t->num.idx_max	=
-		t->num.ctrl[0]	= 
-		t->num.ctrl[1]	= 
-		t->num.ctrl[2]	= 0;
+	t->total			= 0;
 
 	t->val = 0.0f;
 
-	t->num.val[0]		= 
-		t->num.val[1]	= 
-		t->num.val[2]	= 0.0f;
-
 	t->vec[0]			=
 		t->vec[1]		=
 		t->vec[2]		= 0.0f;
@@ -706,7 +666,8 @@ void initTrans (TransInfo *t)
 		t->around = V3D_CENTER;
 
 	setTransformViewMatrices(t);
-	initNDofInput(&(t->ndof));
+	initNumInput(&t->num);
+	initNDofInput(&t->ndof);
 }
 
 /* Here I would suggest only TransInfo related issues, like free data & reset vars. Not redraws */
diff --git a/source/blender/src/transform_numinput.c b/source/blender/src/transform_numinput.c
index 9b811595a9a..89a76c097e0 100644
--- a/source/blender/src/transform_numinput.c
+++ b/source/blender/src/transform_numinput.c
@@ -41,6 +41,20 @@
 
 /* ************************** NUMINPUT **************************** */
 
+void initNumInput(NumInput *n)
+{
+	n->flag		=
+	n->idx		=
+	n->idx_max	=
+	n->ctrl[0]	= 
+	n->ctrl[1]	= 
+	n->ctrl[2]	= 0;
+
+	n->val[0]		= 
+	n->val[1]	= 
+	n->val[2]	= 0.0f;
+}
+
 void outputNumInput(NumInput *n, char *str)
 {
 	char cur;
diff --git a/source/blender/src/usiblender.c b/source/blender/src/usiblender.c
index 36d98245827..e757f634a45 100644
--- a/source/blender/src/usiblender.c
+++ b/source/blender/src/usiblender.c
@@ -479,7 +479,15 @@ static void init_userdef_file(void)
 	if ((G.main->versionfile < 245) || (G.main->versionfile == 245 && G.main->subversionfile < 16)) {
 		U.flag |= USER_ADD_VIEWALIGNED|USER_ADD_EDITMODE;
 	}
-	
+	if ((G.main->versionfile < 247) || (G.main->versionfile == 247 && G.main->subversionfile < 1)) {
+		bTheme *btheme;
+		for(btheme= U.themes.first; btheme; btheme= btheme->next) {
+			SETCOL(btheme->tipo.handle_vertex, 0xff, 0x70, 0xff, 255);
+			SETCOL(btheme->tipo.handle_vertex_select, 0xff, 0xff, 0x70, 255);
+			btheme->tipo.handle_vertex_size= 3;
+		}
+	}
+
 	/* GL Texture Garbage Collection (variable abused above!) */
 	if (U.textimeout == 0) {
 		U.texcollectrate = 60;
diff --git a/source/blender/yafray/intern/export_Plugin.cpp b/source/blender/yafray/intern/export_Plugin.cpp
index 6ae4a31bf50..77d53c4ed96 100644
--- a/source/blender/yafray/intern/export_Plugin.cpp
+++ b/source/blender/yafray/intern/export_Plugin.cpp
@@ -74,7 +74,7 @@ extern "C" { extern char bprogname[]; }
 // add drive character if not in path string, using blender executable location as reference
 static void addDrive(string &path)
 {
-	int sp = path.find_first_of(":");
+	size_t sp = path.find_first_of(":");
 	if (sp==-1) {
 		string blpath = bprogname;
 		sp = blpath.find_first_of(":");
diff --git a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
index 7de3056e382..16f8ae0095a 100644
--- a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
+++ b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
@@ -90,33 +90,10 @@ void update_for_newframe();
 
 static BlendFileData *load_game_data(char *filename) {
 	BlendReadError error;
-	//this doesn't work anymore for relative paths, so use BLO_read_from_memory instead
-	//BlendFileData *bfd= BLO_read_from_file(filename, &error);
-	FILE* file = fopen(filename,"rb");
-	BlendFileData *bfd  = 0;
-	if (file)
-	{
-		fseek(file, 0L, SEEK_END);
-		int len= ftell(file);
-		fseek(file, 0L, SEEK_SET);	
-		char* filebuffer= new char[len];//MEM_mallocN(len, "text_buffer");
-		int sizeread = fread(filebuffer,len,1,file);
-		if (sizeread==1){
-			bfd = BLO_read_from_memory(filebuffer, len, &error);
-		} else {
-			error = BRE_UNABLE_TO_READ;
-		}
-		fclose(file);
-		// the memory is not released in BLO_read_from_memory, must do it here
-		delete filebuffer;
-	} else {
-		error = BRE_UNABLE_TO_OPEN;
-	}
-
+	BlendFileData *bfd= BLO_read_from_file(filename, &error);
 	if (!bfd) {
 		printf("Loading %s failed: %s\n", filename, BLO_bre_as_string(error));
 	}
-	
 	return bfd;
 }
 
@@ -139,7 +116,9 @@ extern "C" void StartKetsjiShell(struct ScrArea *area,
 	// Acquire Python's GIL (global interpreter lock)
 	// so we can safely run Python code and API calls
 	PyGILState_STATE gilstate = PyGILState_Ensure();
-
+	
+	PyObject *pyGlobalDict = PyDict_New(); /* python utility storage, spans blend file loading */
+	
 	bgl::InitExtensions(true);
 
 	do
@@ -333,6 +312,7 @@ extern "C" void StartKetsjiShell(struct ScrArea *area,
 			initRasterizer(rasterizer, canvas);
 			PyObject *gameLogic = initGameLogic(startscene);
 			PyDict_SetItemString(dictionaryobject, "GameLogic", gameLogic); // Same as importing the module.
+			PyDict_SetItemString(PyModule_GetDict(gameLogic), "globalDict", pyGlobalDict); // Same as importing the module.
 			initGameKeys();
 			initPythonConstraintBinding();
 			initMathutils();
@@ -407,6 +387,7 @@ extern "C" void StartKetsjiShell(struct ScrArea *area,
 				// which allows the scene to safely delete them :)
 				// see: (space.c)->start_game
 				PyDict_Clear(PyModule_GetDict(gameLogic));
+				PyDict_SetItemString(PyModule_GetDict(gameLogic), "globalDict", pyGlobalDict);
 				
 				ketsjiengine->StopEngine();
 				exitGamePythonScripting();
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
index e4eff163d5b..dafc2599850 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
+++ b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
@@ -131,11 +131,11 @@ void KX_BlenderRenderTools::SetClientObject(void* obj)
 	}
 }
 
-bool KX_BlenderRenderTools::RayHit(KX_ClientObjectInfo* client, MT_Point3& hit_point, MT_Vector3& hit_normal, void * const data)
+bool KX_BlenderRenderTools::RayHit(KX_ClientObjectInfo* client, KX_RayCast* result, void * const data)
 {
 	double* const oglmatrix = (double* const) data;
-	MT_Point3 resultpoint(hit_point);
-	MT_Vector3 resultnormal(hit_normal);
+	MT_Point3 resultpoint(result->m_hitPoint);
+	MT_Vector3 resultnormal(result->m_hitNormal);
 	MT_Vector3 left(oglmatrix[0],oglmatrix[1],oglmatrix[2]);
 	MT_Vector3 dir = -(left.cross(resultnormal)).safe_normalized();
 	left = (dir.cross(resultnormal)).safe_normalized();
@@ -236,9 +236,8 @@ void KX_BlenderRenderTools::applyTransform(RAS_IRasterizer* rasty,double* oglmat
 			if (parent)
 				parent->Release();
 				
-			MT_Point3 resultpoint;
-			MT_Vector3 resultnormal;
-			if (!KX_RayCast::RayTest(physics_controller, physics_environment, frompoint, topoint, resultpoint, resultnormal, KX_RayCast::Callback<KX_BlenderRenderTools>(this, oglmatrix)))
+			KX_RayCast::Callback<KX_BlenderRenderTools> callback(this, physics_controller, oglmatrix);
+			if (!KX_RayCast::RayTest(physics_environment, frompoint, topoint, callback))
 			{
 				// couldn't find something to cast the shadow on...
 				glMultMatrixd(oglmatrix);
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
index 8abce1b8c3e..8027136aa52 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
+++ b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
@@ -37,6 +37,7 @@
 #include "RAS_IRenderTools.h"
 
 struct KX_ClientObjectInfo;
+class KX_RayCast;
 
 /**
 BlenderRenderTools are a set of tools to apply 2D/3D graphics effects, which are not
@@ -97,7 +98,8 @@ public:
 									void* clientobject,
 									void* tface);
 	
-	bool RayHit(KX_ClientObjectInfo* client, MT_Point3& hit_point, MT_Vector3& hit_normal, void * const data);
+	bool RayHit(KX_ClientObjectInfo* client, class KX_RayCast* result, void * const data);
+	bool NeedRayCast(KX_ClientObjectInfo*) { return true; }
 
 	virtual void MotionBlur(RAS_IRasterizer* rasterizer);
 
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
index a6337403cd1..edc14dabc70 100644
--- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp
+++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
@@ -1946,10 +1946,22 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
 				//parentinversenode->SetLocalOrientation(parinvtrans.getBasis());
 
 				// Extract the rotation and the scaling from the basis
-				MT_Matrix3x3 inverseOrientation(parinvtrans.getRotation());
-				parentinversenode->SetLocalOrientation(inverseOrientation);
-				MT_Matrix3x3 scale(inverseOrientation.transposed()*parinvtrans.getBasis());
-				parentinversenode->SetLocalScale(MT_Vector3(scale[0][0], scale[1][1], scale[2][2]));
+				MT_Matrix3x3 ori(parinvtrans.getBasis());
+				MT_Vector3 x(ori.getColumn(0));
+				MT_Vector3 y(ori.getColumn(1));
+				MT_Vector3 z(ori.getColumn(2));
+				MT_Vector3 scale(x.length(), y.length(), z.length());
+				if (!MT_fuzzyZero(scale[0]))
+					x /= scale[0];
+				if (!MT_fuzzyZero(scale[1]))
+					y /= scale[1];
+				if (!MT_fuzzyZero(scale[2]))
+					z /= scale[2];
+				ori.setColumn(0, x);								
+				ori.setColumn(1, y);								
+				ori.setColumn(2, z);								
+				parentinversenode->SetLocalOrientation(ori);
+				parentinversenode->SetLocalScale(scale);
 				
 				parentinversenode->AddChild(gameobj->GetSGNode());
 			}
@@ -2129,7 +2141,24 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
 								float* fl = (float*) blenderobject->parentinv;
 								MT_Transform parinvtrans(fl);
 								parentinversenode->SetLocalPosition(parinvtrans.getOrigin());
-								parentinversenode->SetLocalOrientation(parinvtrans.getBasis());
+
+								// Extract the rotation and the scaling from the basis
+								MT_Matrix3x3 ori(parinvtrans.getBasis());
+								MT_Vector3 x(ori.getColumn(0));
+								MT_Vector3 y(ori.getColumn(1));
+								MT_Vector3 z(ori.getColumn(2));
+								MT_Vector3 scale(x.length(), y.length(), z.length());
+								if (!MT_fuzzyZero(scale[0]))
+									x /= scale[0];
+								if (!MT_fuzzyZero(scale[1]))
+									y /= scale[1];
+								if (!MT_fuzzyZero(scale[2]))
+									z /= scale[2];
+								ori.setColumn(0, x);								
+								ori.setColumn(1, y);								
+								ori.setColumn(2, z);								
+								parentinversenode->SetLocalOrientation(ori);
+								parentinversenode->SetLocalScale(scale);
 								
 								parentinversenode->AddChild(gameobj->GetSGNode());
 							}
diff --git a/source/gameengine/Converter/KX_ConvertActuators.cpp b/source/gameengine/Converter/KX_ConvertActuators.cpp
index cb2521de9a4..7e976beaf44 100644
--- a/source/gameengine/Converter/KX_ConvertActuators.cpp
+++ b/source/gameengine/Converter/KX_ConvertActuators.cpp
@@ -355,22 +355,26 @@ void BL_ConvertActuators(char* maggiename,
 				
 				if (soundActuatorType != KX_SoundActuator::KX_SOUNDACT_NODEF) 
 				{
-					SND_SoundObject* sndobj = NULL;
+					SND_Scene* soundscene = scene->GetSoundScene();
+					STR_String samplename = "";
+					bool sampleisloaded = false;
 					
-					if (soundact->sound)
-					{
-						SND_Scene* soundscene = scene->GetSoundScene();
-						STR_String samplename = soundact->sound->name;
+					if (soundact->sound) {
+						/* Need to convert the samplename into absolute path
+						 * before checking if its loaded */
+						char fullpath[sizeof(soundact->sound->name)];
 						
-						bool sampleisloaded = false;
+						/* dont modify soundact->sound->name, only change a copy */
+						BLI_strncpy(fullpath, soundact->sound->name, sizeof(fullpath));
+						BLI_convertstringcode(fullpath, maggiename);
+						samplename = fullpath;
 						
 						/* let's see if the sample was already loaded */
 						if (soundscene->IsSampleLoaded(samplename))
 						{
 							sampleisloaded = true;
 						}
-						else
-						{
+						else {
 							/* if not, make it so */
 							PackedFile* pf = soundact->sound->newpackedfile;
 							
@@ -383,21 +387,33 @@ void BL_ConvertActuators(char* maggiename,
 							/* or else load it from disk */
 							else
 							{
-								/* but we need to convert the samplename into absolute pathname first */
-								BLI_convertstringcode(soundact->sound->name, maggiename);
-								samplename = soundact->sound->name;
-								
-								/* and now we can load it */
-								if (soundscene->LoadSample(samplename, NULL, 0) > -1)
+								if (soundscene->LoadSample(samplename, NULL, 0) > -1) {
 									sampleisloaded = true;
+								}
+								else {
+									std::cout <<	"WARNING: Sound actuator \"" << bact->name <<
+													"\" from object \"" <<  blenderobject->id.name+2 <<
+													"\" failed to load sample." << std::endl;
+								}
 							}
 						}
-						
-						if (sampleisloaded)
-						{
-							sndobj = new SND_SoundObject();
-							sndobj->SetSampleName(samplename.Ptr());
-							sndobj->SetObjectName(bact->name);
+					} else {
+						std::cout <<	"WARNING: Sound actuator \"" << bact->name <<
+										"\" from object \"" <<  blenderobject->id.name+2 <<
+										"\" has no sound datablock." << std::endl;
+					}
+					
+					/* Note, allowing actuators for sounds that are not there was added since 2.47
+					 * This is because python may expect the actuator and raise an exception if it dosnt find it
+					 * better just to add a dummy sound actuator. */
+					SND_SoundObject* sndobj = NULL;
+					if (sampleisloaded)
+					{
+						/* setup the SND_SoundObject */
+						sndobj = new SND_SoundObject();
+						sndobj->SetSampleName(samplename.Ptr());
+						sndobj->SetObjectName(bact->name);
+						if (soundact->sound) {
 							sndobj->SetRollOffFactor(soundact->sound->attenuation);
 							sndobj->SetGain(soundact->sound->volume);
 							sndobj->SetPitch(exp((soundact->sound->pitch / 12.0) * log(2.0)));
@@ -410,8 +426,9 @@ void BL_ConvertActuators(char* maggiename,
 								else
 									sndobj->SetLoopMode(SND_LOOP_NORMAL);
 							}
-							else
+							else {
 								sndobj->SetLoopMode(SND_LOOP_OFF);
+							}
 							
 							if (soundact->sound->flags & SOUND_FLAGS_PRIORITY)
 								sndobj->SetHighPriority(true);
@@ -422,22 +439,30 @@ void BL_ConvertActuators(char* maggiename,
 								sndobj->Set3D(true);
 							else
 								sndobj->Set3D(false);
-							
-							KX_SoundActuator* tmpsoundact = 
-								new KX_SoundActuator(gameobj, 
-								sndobj,
-								scene->GetSoundScene(), // needed for replication!
-								soundActuatorType,
-								startFrame,
-								stopFrame);
-							
-							tmpsoundact->SetName(bact->name);
-							baseact = tmpsoundact;
-							soundscene->AddObject(sndobj);
-						} else {
-							std::cout << "WARNING: Sound actuator " << bact->name << " failed to load sample." << std::endl;
+						}
+						else {
+							/* dummy values for a NULL sound
+							* see editsound.c - defaults are unlikely to change soon */
+							sndobj->SetRollOffFactor(1.0);
+							sndobj->SetGain(1.0);
+							sndobj->SetPitch(1.0);
+							sndobj->SetLoopMode(SND_LOOP_OFF);
+							sndobj->SetHighPriority(false);
+							sndobj->Set3D(false);
 						}
 					}
+					KX_SoundActuator* tmpsoundact = 
+						new KX_SoundActuator(gameobj, 
+						sndobj,
+						scene->GetSoundScene(), // needed for replication!
+						soundActuatorType,
+						startFrame,
+						stopFrame);
+					
+					tmpsoundact->SetName(bact->name);
+					baseact = tmpsoundact;
+					if (sndobj)
+						soundscene->AddObject(sndobj);
 				}
 				break;
 			}
@@ -550,10 +575,16 @@ void BL_ConvertActuators(char* maggiename,
 								originalval = converter->FindGameObject(editobact->ob);
 							}
 						}
-						MT_Vector3 linvelvec ( KX_BLENDERTRUNC(editobact->linVelocity[0]),
+						MT_Vector3 linvelvec (
+							KX_BLENDERTRUNC(editobact->linVelocity[0]),
 							KX_BLENDERTRUNC(editobact->linVelocity[1]),
 							KX_BLENDERTRUNC(editobact->linVelocity[2]));
-							
+						
+						MT_Vector3 angvelvec (
+							KX_BLENDERTRUNC(editobact->angVelocity[0]),
+							KX_BLENDERTRUNC(editobact->angVelocity[1]),
+							KX_BLENDERTRUNC(editobact->angVelocity[2]));
+						
 						KX_SCA_AddObjectActuator* tmpaddact = 
 							new KX_SCA_AddObjectActuator(
 								gameobj, 
@@ -561,7 +592,9 @@ void BL_ConvertActuators(char* maggiename,
 								editobact->time,
 								scene,
 								linvelvec.getValue(),
-								editobact->localflag!=0
+								(editobact->localflag & ACT_EDOB_LOCAL_LINV)!=0,
+								angvelvec.getValue(),
+								(editobact->localflag & ACT_EDOB_LOCAL_ANGV)!=0
 								);
 								
 								//editobact->ob to gameobj
diff --git a/source/gameengine/Converter/KX_ConvertSensors.cpp b/source/gameengine/Converter/KX_ConvertSensors.cpp
index 5e433bb821b..db47dc2dd3d 100644
--- a/source/gameengine/Converter/KX_ConvertSensors.cpp
+++ b/source/gameengine/Converter/KX_ConvertSensors.cpp
@@ -65,6 +65,7 @@ probably misplaced */
 #include "SCA_JoystickSensor.h"
 #include "KX_NetworkMessageSensor.h"
 #include "SCA_ActuatorSensor.h"
+#include "SCA_DelaySensor.h"
 
 
 #include "SCA_PropertySensor.h"
@@ -281,6 +282,22 @@ void BL_ConvertSensors(struct Object* blenderobject,
 				break;
 			}
 			
+		case  SENS_DELAY:
+			{
+				// we can reuse the Always event manager for the delay sensor
+				SCA_EventManager* eventmgr = logicmgr->FindEventManager(SCA_EventManager::ALWAYS_EVENTMGR);
+				if (eventmgr)
+				{
+					bDelaySensor* delaysensor = (bDelaySensor*)sens->data;
+					gamesensor = new SCA_DelaySensor(eventmgr, 
+						gameobj,
+						delaysensor->delay,
+						delaysensor->duration,
+						(delaysensor->flag & SENS_DELAY_REPEAT) != 0);
+				}
+				break;
+			}
+
 		case SENS_COLLISION:
 			{
 				SCA_EventManager* eventmgr = logicmgr->FindEventManager(SCA_EventManager::TOUCH_EVENTMGR);
@@ -616,6 +633,7 @@ void BL_ConvertSensors(struct Object* blenderobject,
 				if (eventmgr)
 				{
 					bool bFindMaterial = (blenderraysensor->mode & SENS_COLLISION_MATERIAL);
+					bool bXRay = (blenderraysensor->mode & SENS_RAY_XRAY);
 					
 					STR_String checkname = (bFindMaterial? blenderraysensor->matname : blenderraysensor->propname);
 
@@ -628,6 +646,7 @@ void BL_ConvertSensors(struct Object* blenderobject,
 												  gameobj,
 												  checkname,
 												  bFindMaterial,
+												  bXRay,
 												  distance,
 												  axis,
 												  kxscene);
@@ -741,10 +760,24 @@ void BL_ConvertSensors(struct Object* blenderobject,
 			for (int i=0;i<sens->totlinks;i++)
 			{
 				bController* linkedcont = (bController*) sens->links[i];
-				SCA_IController* gamecont = converter->FindGameController(linkedcont);
+				if (linkedcont) {
+					SCA_IController* gamecont = converter->FindGameController(linkedcont);
 
-				if (gamecont) {
-					logicmgr->RegisterToSensor(gamecont,gamesensor);
+					if (gamecont) {
+						logicmgr->RegisterToSensor(gamecont,gamesensor);
+					} else {
+						printf(
+							"Warning, sensor \"%s\" could not find its controller "
+							"(link %d of %d) from object \"%s\"\n"
+							"\tthere has been an error converting the blender controller for the game engine,"
+							"logic may be incorrect\n", sens->name, i+1, sens->totlinks, blenderobject->id.name+2);
+					}
+				} else {
+					printf(
+						"Warning, sensor \"%s\" has lost a link to a controller "
+						"(link %d of %d) from object \"%s\"\n"
+						"\tpossible causes are partially appended objects or an error reading the file,"
+						"logic may be incorrect\n", sens->name, i+1, sens->totlinks, blenderobject->id.name+2);
 				}
 			}
 			// done with gamesensor
diff --git a/source/gameengine/Expressions/PyObjectPlus.h b/source/gameengine/Expressions/PyObjectPlus.h
index f433a08faba..65cd4e890f7 100644
--- a/source/gameengine/Expressions/PyObjectPlus.h
+++ b/source/gameengine/Expressions/PyObjectPlus.h
@@ -102,6 +102,12 @@ static inline void Py_Fatal(char *M) {
 		return ((class_name*) self)->Py##method_name(self, args, kwds);		\
 	}; \
 
+#define KX_PYMETHOD_VARARGS(class_name, method_name)			\
+	PyObject* Py##method_name(PyObject* self, PyObject* args); \
+	static PyObject* sPy##method_name( PyObject* self, PyObject* args) { \
+		return ((class_name*) self)->Py##method_name(self, args);		\
+	}; \
+
 #define KX_PYMETHOD_NOARGS(class_name, method_name)			\
 	PyObject* Py##method_name(PyObject* self); \
 	static PyObject* sPy##method_name( PyObject* self) { \
@@ -150,6 +156,9 @@ static inline void Py_Fatal(char *M) {
 #define KX_PYMETHODTABLE(class_name, method_name) \
 	{#method_name , (PyCFunction) class_name::sPy##method_name, METH_VARARGS, class_name::method_name##_doc}
 
+#define KX_PYMETHODTABLE_NOARG(class_name, method_name) \
+	{#method_name , (PyCFunction) class_name::sPy##method_name, METH_NOARGS, class_name::method_name##_doc}
+
 /**
  * Function implementation macro
  */
@@ -157,6 +166,9 @@ static inline void Py_Fatal(char *M) {
 char class_name::method_name##_doc[] = doc_string; \
 PyObject* class_name::Py##method_name(PyObject*, PyObject* args, PyObject*)
 
+#define KX_PYMETHODDEF_DOC_NOARG(class_name, method_name, doc_string) \
+char class_name::method_name##_doc[] = doc_string; \
+PyObject* class_name::Py##method_name(PyObject*)
 
 /*------------------------------
  * PyObjectPlus
diff --git a/source/gameengine/GameLogic/SCA_DelaySensor.cpp b/source/gameengine/GameLogic/SCA_DelaySensor.cpp
new file mode 100644
index 00000000000..4d05250e91c
--- /dev/null
+++ b/source/gameengine/GameLogic/SCA_DelaySensor.cpp
@@ -0,0 +1,257 @@
+/**
+ * Delay trigger
+ *
+ * $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 *****
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifdef WIN32
+// This warning tells us about truncation of __long__ stl-generated names.
+// It can occasionally cause DevStudio to have internal compiler warnings.
+#pragma warning( disable : 4786 )     
+#endif
+
+#include "SCA_DelaySensor.h"
+#include "SCA_LogicManager.h"
+#include "SCA_EventManager.h"
+
+/* ------------------------------------------------------------------------- */
+/* Native functions                                                          */
+/* ------------------------------------------------------------------------- */
+
+SCA_DelaySensor::SCA_DelaySensor(class SCA_EventManager* eventmgr,
+								 SCA_IObject* gameobj,
+								 int delay,
+								 int duration,
+								 bool repeat,
+								 PyTypeObject* T)
+	: SCA_ISensor(gameobj,eventmgr, T), 
+	m_delay(delay),
+	m_duration(duration),
+	m_repeat(repeat)
+{
+	Init();
+}
+
+void SCA_DelaySensor::Init()
+{
+	m_lastResult = false;
+	m_frameCount = -1;
+	m_reset = true;
+}
+
+SCA_DelaySensor::~SCA_DelaySensor()
+{
+	/* intentionally empty */
+}
+
+CValue* SCA_DelaySensor::GetReplica()
+{
+	CValue* replica = new SCA_DelaySensor(*this);
+	// this will copy properties and so on...
+	CValue::AddDataToReplica(replica);
+
+	return replica;
+}
+
+
+
+bool SCA_DelaySensor::IsPositiveTrigger()
+{ 
+	return (m_invert ? !m_lastResult : m_lastResult);
+}
+
+bool SCA_DelaySensor::Evaluate(CValue* event)
+{
+	bool trigger = false;
+	bool result;
+
+	if (m_frameCount==-1) {
+		// this is needed to ensure ON trigger in case delay==0
+		// and avoid spurious OFF trigger when duration==0
+		m_lastResult = false;
+		m_frameCount = 0;
+	}
+
+	if (m_frameCount<m_delay) {
+		m_frameCount++;
+		result = false;
+	} else if (m_duration > 0) {
+		if (m_frameCount < m_delay+m_duration) {
+			m_frameCount++;
+			result = true;
+		} else {
+			result = false;
+			if (m_repeat)
+				m_frameCount = -1;
+		}
+	} else {
+		result = true;
+		if (m_repeat)
+			m_frameCount = -1;
+	}
+	if ((m_reset && m_level) || result != m_lastResult)
+		trigger = true;
+	m_reset = false;
+	m_lastResult = result;
+	return trigger;
+}
+
+/* ------------------------------------------------------------------------- */
+/* Python functions                                                          */
+/* ------------------------------------------------------------------------- */
+
+/* Integration hooks ------------------------------------------------------- */
+PyTypeObject SCA_DelaySensor::Type = {
+	PyObject_HEAD_INIT(&PyType_Type)
+	0,
+	"SCA_DelaySensor",
+	sizeof(SCA_DelaySensor),
+	0,
+	PyDestructor,
+	0,
+	__getattr,
+	__setattr,
+	0, //&MyPyCompare,
+	__repr,
+	0, //&cvalue_as_number,
+	0,
+	0,
+	0,
+	0
+};
+
+PyParentObject SCA_DelaySensor::Parents[] = {
+	&SCA_DelaySensor::Type,
+	&SCA_ISensor::Type,
+	&SCA_ILogicBrick::Type,
+	&CValue::Type,
+	NULL
+};
+
+PyMethodDef SCA_DelaySensor::Methods[] = {
+	/* setProperty */
+	{"setDelay", (PyCFunction) SCA_DelaySensor::sPySetDelay, METH_VARARGS, SetDelay_doc},
+	{"setDuration", (PyCFunction) SCA_DelaySensor::sPySetDuration, METH_VARARGS, SetDuration_doc},
+	{"setRepeat", (PyCFunction) SCA_DelaySensor::sPySetRepeat, METH_VARARGS, SetRepeat_doc},
+	/* getProperty */
+	{"getDelay", (PyCFunction) SCA_DelaySensor::sPyGetDelay, METH_NOARGS, GetDelay_doc},
+	{"getDuration", (PyCFunction) SCA_DelaySensor::sPyGetDuration, METH_NOARGS, GetDuration_doc},
+	{"getRepeat", (PyCFunction) SCA_DelaySensor::sPyGetRepeat, METH_NOARGS, GetRepeat_doc},
+	{NULL,NULL} //Sentinel
+};
+
+PyObject* SCA_DelaySensor::_getattr(const STR_String& attr) {
+	_getattr_up(SCA_ISensor);
+}
+
+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* self, PyObject* args, PyObject* kwds)
+{
+	int delay;
+	
+	if(!PyArg_ParseTuple(args, "i", &delay)) {
+		return NULL;
+	}
+	if (delay < 0) {
+		PyErr_SetString(PyExc_ValueError, "Delay cannot be negative");
+		return NULL;
+	}
+	m_delay = delay;
+	Py_Return;
+}
+
+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* self, PyObject* args, PyObject* kwds)
+{
+	int duration;
+	
+	if(!PyArg_ParseTuple(args, "i", &duration)) {
+		return NULL;
+	}
+	if (duration < 0) {
+		PyErr_SetString(PyExc_ValueError, "Duration cannot be negative");
+		return NULL;
+	}
+	m_duration = duration;
+	Py_Return;
+}
+
+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* self, PyObject* args, PyObject* kwds)
+{
+	int repeat;
+	
+	if(!PyArg_ParseTuple(args, "i", &repeat)) {
+		return NULL;
+	}
+	m_repeat = (repeat != 0);
+	Py_Return;
+}
+
+char SCA_DelaySensor::GetDelay_doc[] = 
+"getDelay()\n"
+"\tReturn the delay parameter value\n";
+PyObject* SCA_DelaySensor::PyGetDelay(PyObject* self)
+{
+	return PyInt_FromLong(m_delay);
+}
+
+char SCA_DelaySensor::GetDuration_doc[] = 
+"getDuration()\n"
+"\tReturn the duration parameter value\n";
+PyObject* SCA_DelaySensor::PyGetDuration(PyObject* self)
+{
+	return PyInt_FromLong(m_duration);
+}
+
+char SCA_DelaySensor::GetRepeat_doc[] = 
+"getRepeat()\n"
+"\tReturn the repeat parameter value\n";
+PyObject* SCA_DelaySensor::PyGetRepeat(PyObject* self)
+{
+	return BoolToPyArg(m_repeat);
+}
+
+/* eof */
diff --git a/source/gameengine/GameLogic/SCA_DelaySensor.h b/source/gameengine/GameLogic/SCA_DelaySensor.h
new file mode 100644
index 00000000000..a997fabe3cd
--- /dev/null
+++ b/source/gameengine/GameLogic/SCA_DelaySensor.h
@@ -0,0 +1,77 @@
+/**
+ * SCA_DelaySensor.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 __KX_DELAYSENSOR
+#define __KX_DELAYSENSOR
+#include "SCA_ISensor.h"
+
+class SCA_DelaySensor : public SCA_ISensor
+{
+	Py_Header;
+	bool			m_lastResult;
+	bool			m_repeat;
+	int				m_delay; 
+	int				m_duration;
+	int				m_frameCount;
+
+public:
+	SCA_DelaySensor(class SCA_EventManager* eventmgr,
+					SCA_IObject* gameobj,
+					int delay,
+					int duration,
+					bool repeat,
+					PyTypeObject* T =&Type);
+	virtual ~SCA_DelaySensor();
+	virtual CValue* GetReplica();
+	virtual bool Evaluate(CValue* event);
+	virtual bool IsPositiveTrigger();
+	virtual void Init();
+
+
+	/* --------------------------------------------------------------------- */
+	/* Python interface ---------------------------------------------------- */
+	/* --------------------------------------------------------------------- */
+	
+	virtual PyObject* _getattr(const STR_String& attr);
+
+	/* setProperty */
+	KX_PYMETHOD_DOC(SCA_DelaySensor,SetDelay);
+	KX_PYMETHOD_DOC(SCA_DelaySensor,SetDuration);
+	KX_PYMETHOD_DOC(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);
+
+};
+
+#endif //__KX_ALWAYSSENSOR
+
diff --git a/source/gameengine/GameLogic/SCA_IController.cpp b/source/gameengine/GameLogic/SCA_IController.cpp
index 8f156cc63e7..0bd20117f31 100644
--- a/source/gameengine/GameLogic/SCA_IController.cpp
+++ b/source/gameengine/GameLogic/SCA_IController.cpp
@@ -188,6 +188,8 @@ void SCA_IController::ApplyState(unsigned int state)
 			for (sensit = m_linkedsensors.begin();!(sensit==m_linkedsensors.end());++sensit)
 			{
 				(*sensit)->IncLink();
+				// remember that this controller just activated that sensor
+				(*sensit)->AddNewController(this);
 			}
 			SetActive(true);
 		}
diff --git a/source/gameengine/GameLogic/SCA_ISensor.cpp b/source/gameengine/GameLogic/SCA_ISensor.cpp
index 2dc49924062..c96eb82e29e 100644
--- a/source/gameengine/GameLogic/SCA_ISensor.cpp
+++ b/source/gameengine/GameLogic/SCA_ISensor.cpp
@@ -32,6 +32,8 @@
 #include "SCA_ISensor.h"
 #include "SCA_EventManager.h"
 #include "SCA_LogicManager.h"
+// needed for IsTriggered()
+#include "SCA_PythonController.h"
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -132,10 +134,8 @@ void SCA_ISensor::DecLink() {
 	}
 	if (!m_links)
 	{
-		// sensor is detached from all controllers, initialize it so that it
-		// is fresh as at startup when it is reattached again.
+		// sensor is detached from all controllers, remove it from manager
 		UnregisterToManager();
-		Init();
 	}
 }
 
@@ -168,7 +168,9 @@ PyParentObject SCA_ISensor::Parents[] = {
 };
 PyMethodDef SCA_ISensor::Methods[] = {
 	{"isPositive", (PyCFunction) SCA_ISensor::sPyIsPositive, 
-	 METH_VARARGS, IsPositive_doc},
+	 METH_NOARGS, IsPositive_doc},
+	{"isTriggered", (PyCFunction) SCA_ISensor::sPyIsTriggered, 
+	 METH_VARARGS, IsTriggered_doc},
 	{"getUsePosPulseMode", (PyCFunction) SCA_ISensor::sPyGetUsePosPulseMode, 
 	 METH_NOARGS, GetUsePosPulseMode_doc},
 	{"setUsePosPulseMode", (PyCFunction) SCA_ISensor::sPySetUsePosPulseMode, 
@@ -189,6 +191,8 @@ PyMethodDef SCA_ISensor::Methods[] = {
 	 METH_NOARGS, GetLevel_doc},
 	{"setLevel", (PyCFunction) SCA_ISensor::sPySetLevel, 
 	 METH_VARARGS, SetLevel_doc},
+	{"reset", (PyCFunction) SCA_ISensor::sPyReset, 
+	 METH_NOARGS, Reset_doc},
 	{NULL,NULL} //Sentinel
 };
 
@@ -202,6 +206,9 @@ SCA_ISensor::_getattr(const STR_String& attr)
 
 void SCA_ISensor::RegisterToManager()
 {
+	// sensor is just activated, initialize it
+	Init();
+	m_newControllers.erase(m_newControllers.begin(), m_newControllers.end());
 	m_eventmgr->RegisterSensor(this);
 }
 
@@ -247,19 +254,47 @@ void SCA_ISensor::Activate(class SCA_LogicManager* logicmgr,	  CValue* event)
 				}
 			}
 		}
+		if (!m_newControllers.empty())
+		{
+			if (!IsActive() && m_level)
+			{
+				// This level sensor is connected to at least one controller that was just made 
+				// active but it did not generate an event yet, do it now to those controllers only 
+				for (std::vector<SCA_IController*>::iterator ci=m_newControllers.begin();
+					 ci != m_newControllers.end(); ci++)
+				{
+					logicmgr->AddTriggeredController(*ci, this);
+				}
+			}
+			// clear the list. Instead of using clear, which also release the memory,
+			// use erase, which keeps the memory available for next time.
+			m_newControllers.erase(m_newControllers.begin(), m_newControllers.end());
+		}
 	} 
 }
 
 /* Python functions: */
 char SCA_ISensor::IsPositive_doc[] = 
 "isPositive()\n"
-"\tReturns whether the sensor is registered a positive event.\n";
-PyObject* SCA_ISensor::PyIsPositive(PyObject* self, PyObject* args, PyObject* kwds)
+"\tReturns whether the sensor is in an active state.\n";
+PyObject* SCA_ISensor::PyIsPositive(PyObject* self)
 {
 	int retval = IsPositiveTrigger();
 	return PyInt_FromLong(retval);
 }
 
+char SCA_ISensor::IsTriggered_doc[] = 
+"isTriggered()\n"
+"\tReturns whether the sensor has triggered the current controller.\n";
+PyObject* SCA_ISensor::PyIsTriggered(PyObject* self)
+{
+	// check with the current controller
+	int retval = 0;
+	if (SCA_PythonController::m_sCurrentController)
+		retval = SCA_PythonController::m_sCurrentController->IsTriggered(this);
+	return PyInt_FromLong(retval);
+}
+
 /**
  * getUsePulseMode: getter for the pulse mode (KX_TRUE = on)
  */
@@ -390,4 +425,15 @@ PyObject* SCA_ISensor::PySetUseNegPulseMode(PyObject* self, PyObject* args, PyOb
 	Py_Return;
 }
 
+char SCA_ISensor::Reset_doc[] = 
+"reset()\n"
+"\tReset sensor internal state, effect depends on the type of sensor and settings.\n"
+"\tThe sensor is put in its initial state as if it was just activated.\n";
+PyObject* SCA_ISensor::PyReset(PyObject* self)
+{
+	Init();
+	Py_Return;
+}
+
+
 /* eof */
diff --git a/source/gameengine/GameLogic/SCA_ISensor.h b/source/gameengine/GameLogic/SCA_ISensor.h
index d5dabbce3ee..0d65270dc7b 100644
--- a/source/gameengine/GameLogic/SCA_ISensor.h
+++ b/source/gameengine/GameLogic/SCA_ISensor.h
@@ -34,6 +34,8 @@
 
 #include "SCA_ILogicBrick.h"
 
+#include <vector>
+
 /**
  * Interface Class for all logic Sensors. Implements
  * pulsemode,pulsefrequency */
@@ -73,9 +75,9 @@ class SCA_ISensor : public SCA_ILogicBrick
 	/** number of connections to controller */
 	int m_links;
 
-	/** Pass the activation on to the logic manager.*/
-	void SignalActivation(class SCA_LogicManager* logicmgr);
-	
+	/** list of controllers that have just activated this sensor because of a state change */
+	std::vector<class SCA_IController*> m_newControllers;
+
 public:
 	SCA_ISensor(SCA_IObject* gameobj,
 				class SCA_EventManager* eventmgr,
@@ -128,6 +130,8 @@ public:
 	/** Resume sensing. */
 	void Resume();
 
+	void AddNewController(class SCA_IController* controller)
+		{ m_newControllers.push_back(controller); }
 	void ClrLink()
 		{ m_links = 0; }
 	void IncLink()
@@ -137,7 +141,8 @@ public:
 		{ return !m_links; }
 
 	/* Python functions: */
-	KX_PYMETHOD_DOC(SCA_ISensor,IsPositive);
+	KX_PYMETHOD_DOC_NOARGS(SCA_ISensor,IsPositive);
+	KX_PYMETHOD_DOC_NOARGS(SCA_ISensor,IsTriggered);
 	KX_PYMETHOD_DOC_NOARGS(SCA_ISensor,GetUsePosPulseMode);
 	KX_PYMETHOD_DOC(SCA_ISensor,SetUsePosPulseMode);
 	KX_PYMETHOD_DOC_NOARGS(SCA_ISensor,GetFrequency);
@@ -148,6 +153,7 @@ public:
 	KX_PYMETHOD_DOC(SCA_ISensor,SetInvert);
 	KX_PYMETHOD_DOC_NOARGS(SCA_ISensor,GetLevel);
 	KX_PYMETHOD_DOC(SCA_ISensor,SetLevel);
+	KX_PYMETHOD_DOC_NOARGS(SCA_ISensor,Reset);
 
 };
 
diff --git a/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp b/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
index a7a6fa93db4..fba1162993d 100644
--- a/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
+++ b/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
@@ -505,7 +505,7 @@ PyObject* SCA_KeyboardSensor::sPySetAllMode(PyObject* self,
 				       PyObject* kwds)
 {
 //	printf("sPyIsPositive\n");
-    return ((SCA_KeyboardSensor*) self)->PyIsPositive(self, args, kwds);
+    return ((SCA_KeyboardSensor*) self)->PyIsPositive(self);
 }
 
 
diff --git a/source/gameengine/GameLogic/SCA_LogicManager.cpp b/source/gameengine/GameLogic/SCA_LogicManager.cpp
index 91e66aea359..b584b37180f 100644
--- a/source/gameengine/GameLogic/SCA_LogicManager.cpp
+++ b/source/gameengine/GameLogic/SCA_LogicManager.cpp
@@ -33,6 +33,7 @@
 #include "SCA_IController.h"
 #include "SCA_IActuator.h"
 #include "SCA_EventManager.h"
+#include "SCA_PythonController.h"
 #include <set>
 
 #ifdef HAVE_CONFIG_H
@@ -232,8 +233,6 @@ void SCA_LogicManager::BeginFrame(double curtime, double fixedtime)
 	// for this frame, look up for activated sensors, and build the collection of triggered controllers
 	// int numsensors = this->m_activatedsensors.size(); /*unused*/
 
-	set<SmartControllerPtr> triggeredControllerSet;
-
 	for (vector<SCA_ISensor*>::const_iterator is=m_activatedsensors.begin();
 	!(is==m_activatedsensors.end());is++)
 	{
@@ -244,19 +243,28 @@ void SCA_LogicManager::BeginFrame(double curtime, double fixedtime)
 		{
 				SCA_IController* contr = *c;//controllerarray->at(c);
 				if (contr->IsActive())
-					triggeredControllerSet.insert(SmartControllerPtr(contr,0));
+				{
+					m_triggeredControllerSet.insert(SmartControllerPtr(contr,0));
+					// So that the controller knows which sensor has activited it.
+					// Only needed for the python controller though.
+					if (contr->GetType() == &SCA_PythonController::Type)
+					{
+						SCA_PythonController* pythonController = (SCA_PythonController*)contr;
+						pythonController->AddTriggeredSensor(sensor);
+					}
+				}
 		}
 		//sensor->SetActive(false);
 	}
 
 	
 	// int numtriggered = triggeredControllerSet.size(); /*unused*/
-	for (set<SmartControllerPtr>::iterator tit=triggeredControllerSet.begin();
-	!(tit==triggeredControllerSet.end());tit++)
+	for (set<SmartControllerPtr>::iterator tit=m_triggeredControllerSet.begin();
+	!(tit==m_triggeredControllerSet.end());tit++)
 	{
 		(*tit)->Trigger(this);
 	}
-	triggeredControllerSet.clear();
+	m_triggeredControllerSet.clear();
 }
 
 
@@ -382,6 +390,17 @@ void SCA_LogicManager::AddActivatedSensor(SCA_ISensor* sensor)
 	}
 }
 
+void SCA_LogicManager::AddTriggeredController(SCA_IController* controller, SCA_ISensor* sensor)
+{
+	m_triggeredControllerSet.insert(SmartControllerPtr(controller,0));
+	// so that the controller knows which sensor has activited it
+	// only needed for python controller
+	if (controller->GetType() == &SCA_PythonController::Type)
+	{
+		SCA_PythonController* pythonController = (SCA_PythonController*)controller;
+		pythonController->AddTriggeredSensor(sensor);
+	}
+}
 
 
 void SCA_LogicManager::AddActiveActuator(SCA_IActuator* actua,CValue* event)
diff --git a/source/gameengine/GameLogic/SCA_LogicManager.h b/source/gameengine/GameLogic/SCA_LogicManager.h
index e0d3d506702..50383879d8f 100644
--- a/source/gameengine/GameLogic/SCA_LogicManager.h
+++ b/source/gameengine/GameLogic/SCA_LogicManager.h
@@ -99,6 +99,7 @@ class SCA_LogicManager
 	
 	vector<class SCA_ISensor*>			m_activatedsensors;
 	set<class SmartActuatorPtr>			m_activeActuators;
+	set<class SmartControllerPtr>		m_triggeredControllerSet;
 
 	map<SCA_ISensor*,controllerlist >	m_sensorcontrollermapje;
 
@@ -127,6 +128,7 @@ public:
 	void	EndFrame();
 	void	AddActivatedSensor(SCA_ISensor* sensor);
 	void	AddActiveActuator(SCA_IActuator* sensor,class CValue* event);
+	void	AddTriggeredController(SCA_IController* controller, SCA_ISensor* sensor);
 	SCA_EventManager*	FindEventManager(int eventmgrtype);
 	
 	void	RemoveGameObject(const STR_String& gameobjname);
diff --git a/source/gameengine/GameLogic/SCA_PythonController.cpp b/source/gameengine/GameLogic/SCA_PythonController.cpp
index cd1b029fc34..e6f7b1dd143 100644
--- a/source/gameengine/GameLogic/SCA_PythonController.cpp
+++ b/source/gameengine/GameLogic/SCA_PythonController.cpp
@@ -35,6 +35,7 @@
 #include "SCA_IActuator.h"
 #include "compile.h"
 #include "eval.h"
+#include <algorithm>
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -139,6 +140,14 @@ void SCA_PythonController::SetDictionary(PyObject*	pythondictionary)
 	m_pythondictionary = PyDict_Copy(pythondictionary); /* new reference */
 }
 
+int SCA_PythonController::IsTriggered(class SCA_ISensor* sensor)
+{
+	if (std::find(m_triggeredSensors.begin(), m_triggeredSensors.end(), sensor) != 
+		m_triggeredSensors.end())
+		return 1;
+	return 0;
+}
+
 #if 0
 static char* sPyGetCurrentController__doc__;
 #endif
@@ -248,7 +257,7 @@ void SCA_PythonController::Trigger(SCA_LogicManager* logicmgr)
 		{
 			// didn't compile, so instead of compile, complain
 			// something is wrong, tell the user what went wrong
-			printf("PYTHON SCRIPT ERROR:\n");
+			printf("Python compile error from controller \"%s\": \n", GetName().Ptr());
 			//PyRun_SimpleString(m_scriptText.Ptr());
 			PyErr_Print();
 			return;
@@ -285,7 +294,7 @@ void SCA_PythonController::Trigger(SCA_LogicManager* logicmgr)
 	else
 	{
 		// something is wrong, tell the user what went wrong
-		printf("PYTHON SCRIPT ERROR:\n");
+		printf("Python script error from controller \"%s\": \n", GetName().Ptr());
 		PyErr_Print();
 		//PyRun_SimpleString(m_scriptText.Ptr());
 	}
@@ -294,7 +303,7 @@ void SCA_PythonController::Trigger(SCA_LogicManager* logicmgr)
 	// something in this dictionary and crash?
 	PyDict_Clear(excdict);
 	Py_DECREF(excdict);
-
+	m_triggeredSensors.erase(m_triggeredSensors.begin(), m_triggeredSensors.end());
 	m_sCurrentController = NULL;
 }
 
diff --git a/source/gameengine/GameLogic/SCA_PythonController.h b/source/gameengine/GameLogic/SCA_PythonController.h
index 39b6c68c359..1b62e7ecb53 100644
--- a/source/gameengine/GameLogic/SCA_PythonController.h
+++ b/source/gameengine/GameLogic/SCA_PythonController.h
@@ -36,6 +36,8 @@
 #include "SCA_LogicManager.h"
 #include "BoolValue.h"
 
+#include <vector>
+
 class SCA_IObject;
 class SCA_PythonController : public SCA_IController
 {
@@ -47,6 +49,7 @@ class SCA_PythonController : public SCA_IController
 	STR_String				m_scriptText;
 	STR_String				m_scriptName;
 	PyObject*				m_pythondictionary;
+	std::vector<class SCA_ISensor*>		m_triggeredSensors;
 
  public: 
 	static SCA_PythonController* m_sCurrentController; // protected !!!
@@ -64,6 +67,9 @@ class SCA_PythonController : public SCA_IController
 	void	SetScriptText(const STR_String& text);
 	void	SetScriptName(const STR_String& name);
 	void	SetDictionary(PyObject*	pythondictionary);
+	void	AddTriggeredSensor(class SCA_ISensor* sensor)
+		{ m_triggeredSensors.push_back(sensor); }
+	int		IsTriggered(class SCA_ISensor* sensor);
 
 	static char* sPyGetCurrentController__doc__;
 	static PyObject* sPyGetCurrentController(PyObject* self);
diff --git a/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp b/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
index 8b828393c67..a64c85f6c17 100644
--- a/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
+++ b/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
@@ -470,11 +470,11 @@ void GPC_RenderTools::SetClientObject(void* obj)
 	}
 }
 
-bool GPC_RenderTools::RayHit(KX_ClientObjectInfo* client, MT_Point3& hit_point, MT_Vector3& hit_normal, void * const data)
+bool GPC_RenderTools::RayHit(KX_ClientObjectInfo* client, KX_RayCast* result, void * const data)
 {
 	double* const oglmatrix = (double* const) data;
-	MT_Point3 resultpoint(hit_point);
-	MT_Vector3 resultnormal(hit_normal);
+	MT_Point3 resultpoint(result->m_hitPoint);
+	MT_Vector3 resultnormal(result->m_hitNormal);
 	MT_Vector3 left(oglmatrix[0],oglmatrix[1],oglmatrix[2]);
 	MT_Vector3 dir = -(left.cross(resultnormal)).safe_normalized();
 	left = (dir.cross(resultnormal)).safe_normalized();
@@ -563,9 +563,8 @@ void GPC_RenderTools::applyTransform(RAS_IRasterizer* rasty,double* oglmatrix,in
 			if (parent)
 				parent->Release();
 				
-			MT_Point3 resultpoint;
-			MT_Vector3 resultnormal;
-			if (!KX_RayCast::RayTest(physics_controller, physics_environment, frompoint, topoint, resultpoint, resultnormal, KX_RayCast::Callback<GPC_RenderTools>(this, oglmatrix)))
+			KX_RayCast::Callback<GPC_RenderTools> callback(this, physics_controller, oglmatrix);
+			if (!KX_RayCast::RayTest(physics_environment, frompoint, topoint, callback))
 			{
 				// couldn't find something to cast the shadow on...
 				glMultMatrixd(oglmatrix);
diff --git a/source/gameengine/GamePlayer/common/GPC_RenderTools.h b/source/gameengine/GamePlayer/common/GPC_RenderTools.h
index 8fae3d2b305..9f70f67caf2 100644
--- a/source/gameengine/GamePlayer/common/GPC_RenderTools.h
+++ b/source/gameengine/GamePlayer/common/GPC_RenderTools.h
@@ -41,7 +41,7 @@
 #include "BMF_Api.h"
 
 struct KX_ClientObjectInfo;
-
+class KX_RayCast;
 
 class GPC_RenderTools : public RAS_IRenderTools
 {
@@ -138,7 +138,8 @@ public:
 
 	int applyLights(int objectlayer);
 
-	bool RayHit(KX_ClientObjectInfo* client, MT_Point3& hit_point, MT_Vector3& hit_normal, void * const data);
+	bool RayHit(KX_ClientObjectInfo* client, KX_RayCast* result, void * const data);
+	bool NeedRayCast(KX_ClientObjectInfo* client) { return true; }
 
 	virtual void MotionBlur(RAS_IRasterizer* rasterizer);
 
diff --git a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
index 7be3b94d8ae..c56a6d0da23 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
+++ b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
@@ -97,7 +97,7 @@ extern "C"
 #include "GHOST_IEventConsumer.h"
 #include "GHOST_IWindow.h"
 #include "GHOST_Rect.h"
-
+#include "marshal.h"
 
 static void frameTimerProc(GHOST_ITimerTask* task, GHOST_TUns64 time);
 
@@ -125,7 +125,9 @@ GPG_Application::GPG_Application(GHOST_ISystem* system, struct Main* maggie, STR
 	  m_networkdevice(0), 
 	  m_audiodevice(0),
 	  m_blendermat(0),
-	  m_blenderglslmat(0)
+	  m_blenderglslmat(0),
+	  m_pyGlobalDictString(0),
+	  m_pyGlobalDictString_Length(0)
 {
 	fSystem = system;
 }
@@ -645,14 +647,23 @@ bool GPG_Application::startEngine(void)
 		PyObject* dictionaryobject = initGamePlayerPythonScripting("Ketsji", psl_Lowest);
 		m_ketsjiengine->SetPythonDictionary(dictionaryobject);
 		initRasterizer(m_rasterizer, m_canvas);
-		PyDict_SetItemString(dictionaryobject, "GameLogic", initGameLogic(startscene)); // Same as importing the module
+		PyObject *gameLogic = initGameLogic(startscene);
+		PyDict_SetItemString(dictionaryobject, "GameLogic", gameLogic); // Same as importing the module
 		initGameKeys();
 		initPythonConstraintBinding();
 		initMathutils();
 
-
-
-
+		/* Restore the dict */
+		if (m_pyGlobalDictString) {
+			PyObject* pyGlobalDict = PyMarshal_ReadObjectFromString(m_pyGlobalDictString, m_pyGlobalDictString_Length);
+			if (pyGlobalDict) {
+				PyDict_SetItemString(PyModule_GetDict(gameLogic), "globalDict", pyGlobalDict); // Same as importing the module.
+			} else {
+				PyErr_Clear();
+				printf("Error could not marshall string\n");
+			}
+		}
+		
 		m_sceneconverter->ConvertScene(
 			startscenename,
 			startscene,
@@ -688,6 +699,33 @@ bool GPG_Application::startEngine(void)
 
 void GPG_Application::stopEngine()
 {
+	// get the python dict and convert to a string for future use
+	{
+		SetPyGlobalDictMarshal(NULL, 0);
+		
+		PyObject* gameLogic = PyImport_ImportModule("GameLogic");
+		if (gameLogic) {
+			PyObject* pyGlobalDict = PyDict_GetItemString(PyModule_GetDict(gameLogic), "globalDict"); // Same as importing the module
+			if (pyGlobalDict) {
+				PyObject* pyGlobalDictMarshal = PyMarshal_WriteObjectToString(	pyGlobalDict, 2); // Py_MARSHAL_VERSION == 2 as of Py2.5
+				if (pyGlobalDictMarshal) {
+					m_pyGlobalDictString_Length = PyString_Size(pyGlobalDictMarshal);
+					PyObject_Print(pyGlobalDictMarshal, stderr, 0);
+					m_pyGlobalDictString = static_cast<char *> (malloc(m_pyGlobalDictString_Length));
+					memcpy(m_pyGlobalDictString, PyString_AsString(pyGlobalDictMarshal), m_pyGlobalDictString_Length);
+				} else {
+					printf("Error, GameLogic.globalDict could not be marshal'd\n");
+				}
+				Py_DECREF(gameLogic);
+			} else {
+				printf("Error, GameLogic.globalDict was removed\n");
+			}
+		} else {
+			printf("Error, GameLogic failed to import GameLogic.globalDict will be lost\n");
+		}
+	}	
+	
+	
 	// when exiting the mainloop
 	exitGamePythonScripting();
 	m_ketsjiengine->StopEngine();
diff --git a/source/gameengine/GamePlayer/ghost/GPG_Application.h b/source/gameengine/GamePlayer/ghost/GPG_Application.h
index 17f5add8b19..31f5eb75e52 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_Application.h
+++ b/source/gameengine/GamePlayer/ghost/GPG_Application.h
@@ -72,6 +72,29 @@ public:
 			bool StartGameEngine(int stereoMode);
 			void StopGameEngine();
 
+			char*
+		GetPyGlobalDictMarshal()
+		{ 
+			return m_pyGlobalDictString;
+		};
+		
+			void
+		SetPyGlobalDictMarshal( char* pyGlobalDictString, int length )
+		{
+			if (m_pyGlobalDictString && m_pyGlobalDictString != pyGlobalDictString)
+				free(m_pyGlobalDictString);
+			
+			m_pyGlobalDictString = pyGlobalDictString;
+			m_pyGlobalDictString_Length = length;
+		};
+		
+			int
+		GetPyGlobalDictMarshalLength()
+		{ 
+			return m_pyGlobalDictString_Length;
+		};
+
+
 protected:
 	bool	handleWheel(GHOST_IEvent* event);
 	bool	handleButton(GHOST_IEvent* event, bool isDown);
@@ -142,6 +165,12 @@ protected:
 
 	bool m_blendermat;
 	bool m_blenderglslmat;
-
+	
+	/*
+	 * GameLogic.globalDict as a string so that loading new blend files can use the same dict.
+	 * Do this because python starts/stops when loading blend files.
+	 */
+	char* m_pyGlobalDictString;
+	int m_pyGlobalDictString_Length;
 };
 
diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
index 8222e5c8bac..26a85128025 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
+++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
@@ -293,7 +293,9 @@ int main(int argc, char** argv)
 	GHOST_TUns32 fullScreenHeight= 0;
 	int fullScreenBpp = 32;
 	int fullScreenFrequency = 60;
-
+	char* pyGlobalDictString = NULL; /* store python dict data between blend file loading */
+	int pyGlobalDictString_Length = 0;
+	
 #ifdef __linux__
 #ifdef __alpha__
 	signal (SIGFPE, SIG_IGN);
@@ -625,6 +627,10 @@ int main(int argc, char** argv)
 						
 						titlename = maggie->name;
 						
+						// Set the GameLogic.globalDict from marshal'd data, so we can load new blend files
+						// abd keep data in GameLogic.globalDict
+						app.SetPyGlobalDictMarshal(pyGlobalDictString, pyGlobalDictString_Length);
+						
 						// Check whether the game should be displayed full-screen
 						if ((!fullScreenParFound) && (!windowParFound))
 						{
@@ -750,6 +756,12 @@ int main(int argc, char** argv)
 							}
 						}
 						app.StopGameEngine();
+						
+						// GameLogic.globalDict has been converted into a buffer
+						// store in pyGlobalDictString so we can restore after python has stopped and started.
+						pyGlobalDictString = app.GetPyGlobalDictMarshal();
+						pyGlobalDictString_Length = app.GetPyGlobalDictMarshalLength();
+						
 						BLO_blendfiledata_free(bfd);
 						
 #ifdef __APPLE__
@@ -772,6 +784,11 @@ int main(int argc, char** argv)
 		}
 	}
 
+	if (pyGlobalDictString) {
+		free(pyGlobalDictString);
+		pyGlobalDictString = NULL;
+	}
+	
 	return error ? -1 : 0;
 }
 
diff --git a/source/gameengine/Ketsji/KX_ConstraintActuator.cpp b/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
index e00ec68ad33..4b57b0e8c54 100644
--- a/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
+++ b/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
@@ -109,16 +109,11 @@ KX_ConstraintActuator::~KX_ConstraintActuator()
 	// there's nothing to be done here, really....
 } /* end of destructor */
 
-bool KX_ConstraintActuator::RayHit(KX_ClientObjectInfo* client, MT_Point3& hit_point, MT_Vector3& hit_normal, void * const data)
+bool KX_ConstraintActuator::RayHit(KX_ClientObjectInfo* client, KX_RayCast* result, void * const data)
 {
 
 	KX_GameObject* hitKXObj = client->m_gameobject;
 	
-	if (client->m_type > KX_ClientObjectInfo::ACTOR)
-	{
-		// false hit
-		return false;
-	}
 	bool bFound = false;
 
 	if (m_property[0] == 0)
@@ -139,8 +134,26 @@ bool KX_ConstraintActuator::RayHit(KX_ClientObjectInfo* client, MT_Point3& hit_p
 			bFound = hitKXObj->GetProperty(m_property) != NULL;
 		}
 	}
+	// update the hit status
+	result->m_hitFound = bFound;
+	// stop looking
+	return true;
+}
 
-	return bFound;
+/* this function is used to pre-filter the object before casting the ray on them.
+   This is useful for "X-Ray" option when we want to see "through" unwanted object.
+ */
+bool KX_ConstraintActuator::NeedRayCast(KX_ClientObjectInfo* client)
+{
+	if (client->m_type > KX_ClientObjectInfo::ACTOR)
+	{
+		// Unknown type of object, skip it.
+		// Should not occur as the sensor objects are filtered in RayTest()
+		printf("Invalid client type %d found in ray casting\n", client->m_type);
+		return false;
+	}
+	// no X-Ray function yet
+	return true;
 }
 
 bool KX_ConstraintActuator::Update(double curtime, bool frame)
@@ -287,8 +300,6 @@ bool KX_ConstraintActuator::Update(double curtime, bool frame)
 			direction.normalize();
 			{
 				MT_Point3 topoint = position + (m_maximumBound) * direction;
-				MT_Point3 resultpoint;
-				MT_Vector3 resultnormal;
 				PHY_IPhysicsEnvironment* pe = obj->GetPhysicsEnvironment();
 				KX_IPhysicsController *spc = obj->GetPhysicsController();
 
@@ -304,9 +315,10 @@ bool KX_ConstraintActuator::Update(double curtime, bool frame)
 						parent->Release();
 					}
 				}
-				result = KX_RayCast::RayTest(spc, pe, position, topoint, resultpoint, resultnormal, KX_RayCast::Callback<KX_ConstraintActuator>(this));
-
+				KX_RayCast::Callback<KX_ConstraintActuator> callback(this,spc);
+				result = KX_RayCast::RayTest(pe, position, topoint, callback);
 				if (result)	{
+					MT_Vector3 newnormal = callback.m_hitNormal;
 					// compute new position & orientation
 					if ((m_option & (KX_ACT_CONSTRAINT_NORMAL|KX_ACT_CONSTRAINT_DISTANCE)) == 0) {
 						// if none option is set, the actuator does nothing but detect ray 
@@ -316,27 +328,27 @@ bool KX_ConstraintActuator::Update(double curtime, bool frame)
 					if (m_option & KX_ACT_CONSTRAINT_NORMAL) {
 						// the new orientation must be so that the axis is parallel to normal
 						if (sign)
-							resultnormal = -resultnormal;
+							newnormal = -newnormal;
 						// apply damping on the direction
 						if (m_rotDampTime) {
 							MT_Scalar rotFilter = 1.0/(1.0+m_rotDampTime);
-							resultnormal = (-m_rotDampTime*rotFilter)*direction + rotFilter*resultnormal;
+							newnormal = (-m_rotDampTime*rotFilter)*direction + rotFilter*newnormal;
 						} else if (m_posDampTime) {
-							resultnormal = -filter*direction + (1.0-filter)*resultnormal;
+							newnormal = -filter*direction + (1.0-filter)*newnormal;
 						}
-						obj->AlignAxisToVect(resultnormal, axis);
-						direction = -resultnormal;
+						obj->AlignAxisToVect(newnormal, axis);
+						direction = -newnormal;
 					}
 					if (m_option & KX_ACT_CONSTRAINT_DISTANCE) {
 						if (m_posDampTime) {
-							newdistance = filter*(position-resultpoint).length()+(1.0-filter)*m_minimumBound;
+							newdistance = filter*(position-callback.m_hitPoint).length()+(1.0-filter)*m_minimumBound;
 						} else {
 							newdistance = m_minimumBound;
 						}
 					} else {
-						newdistance = (position-resultpoint).length();
+						newdistance = (position-callback.m_hitPoint).length();
 					}
-					newposition = resultpoint-newdistance*direction;
+					newposition = callback.m_hitPoint-newdistance*direction;
 				} else if (m_option & KX_ACT_CONSTRAINT_PERMANENT) {
 					// no contact but still keep running
 					result = true;
diff --git a/source/gameengine/Ketsji/KX_ConstraintActuator.h b/source/gameengine/Ketsji/KX_ConstraintActuator.h
index d9f39124cac..6ec4de9aad9 100644
--- a/source/gameengine/Ketsji/KX_ConstraintActuator.h
+++ b/source/gameengine/Ketsji/KX_ConstraintActuator.h
@@ -37,6 +37,8 @@
 #include "MT_Vector3.h"
 #include "KX_ClientObjectInfo.h"
 
+class KX_RayCast;
+
 class KX_ConstraintActuator : public SCA_IActuator
 {
 	Py_Header;
@@ -100,7 +102,8 @@ protected:
 		KX_ACT_CONSTRAINT_DISTANCE = 512
 	};
 	bool IsValidMode(KX_CONSTRAINTTYPE m); 
-	bool RayHit(KX_ClientObjectInfo* client, MT_Point3& hit_point, MT_Vector3& hit_normal, void * const data);
+	bool RayHit(KX_ClientObjectInfo* client, KX_RayCast* result, void * const data);
+	bool NeedRayCast(KX_ClientObjectInfo*);
 
 	KX_ConstraintActuator(SCA_IObject* gameobj,
 						  int posDamptime,
diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
index e0cd5a3bc9e..d6997ee29a8 100644
--- a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
+++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
@@ -680,188 +680,6 @@ void	KX_ConvertODEEngineObject(KX_GameObject* gameobj,
 
 
 // forward declarations
-static btCollisionShape* CreateBulletShapeFromMesh(RAS_MeshObject* meshobj, bool polytope)
-{
-	if (!meshobj)
-		return 0;
-
-	btCollisionShape* collisionMeshShape = 0;
-	btConvexHullShape* convexHullShape = 0;
-	btTriangleMeshShape* concaveShape = 0;
-
-	btTriangleMesh* collisionMeshData = 0;
-
-	//see if there is any polygons, if not, bail out.
-
-	int numPoints = 0;
-	btVector3* points = 0;
-
-	// Mesh has no polygons!
-	int numpolys = meshobj->NumPolygons();
-	if (!numpolys)
-	{
-		return NULL;
-	}
-
-	// Count the number of collision polygons and check they all come from the same 
-	// vertex array
-	int numvalidpolys = 0;
-	int vtxarray = -1;
-	RAS_IPolyMaterial *poly_material = NULL;
-	bool reinstance = true;
-
-	for (int p=0; p<numpolys; p++)
-	{
-		RAS_Polygon* poly = meshobj->GetPolygon(p);
-
-		// only add polygons that have the collisionflag set
-		if (poly->IsCollider())
-		{
-			// check polygon is from the same vertex array
-			if (poly->GetVertexIndexBase().m_vtxarray != vtxarray)
-			{
-				if (vtxarray < 0)
-					vtxarray = poly->GetVertexIndexBase().m_vtxarray;
-				else
-				{
-					reinstance = false;
-					vtxarray = -1;
-				}
-			}
-
-			// check poly is from the same material
-			if (poly->GetMaterial()->GetPolyMaterial() != poly_material)
-			{
-				if (poly_material)
-				{
-					reinstance = false;
-					poly_material = NULL;
-				}
-				else
-					poly_material = poly->GetMaterial()->GetPolyMaterial();
-			}
-
-			// count the number of collision polys
-			numvalidpolys++;
-
-			// We have one collision poly, and we can't reinstance, so we
-			// might as well break here.
-			if (!reinstance)
-				break;
-		}
-	}
-
-	// No collision polygons
-	if (numvalidpolys < 1)
-		return NULL;
-
-
-	if (polytope)
-	{
-		convexHullShape = new btConvexHullShape(&points[0].getX(),numPoints);
-		collisionMeshShape = convexHullShape;
-	} else
-	{
-		collisionMeshData = new btTriangleMesh();
-//		concaveShape = new btTriangleMeshShape(collisionMeshData);
-		//collisionMeshShape = concaveShape;
-
-	}
-
-
-	numvalidpolys = 0;
-
-	for (int p2=0; p2<numpolys; p2++)
-	{
-		RAS_Polygon* poly = meshobj->GetPolygon(p2);
-
-		// only add polygons that have the collisionflag set
-		if (poly->IsCollider())
-		{   
-			//Bullet can raycast any shape, so
-			if (polytope)
-			{
-				for (int i=0;i<poly->VertexCount();i++)
-				{
-					const float* vtx = meshobj->GetVertex(poly->GetVertexIndexBase().m_vtxarray, 
-						poly->GetVertexIndexBase().m_indexarray[i],
-						poly->GetMaterial()->GetPolyMaterial())->getLocalXYZ();
-					btPoint3 point(vtx[0],vtx[1],vtx[2]);
-					convexHullShape->addPoint(point);
-				}
-				if (poly->VertexCount())
-					numvalidpolys++;
-
-			} else
-			{
-				{
-					const float* vtx = meshobj->GetVertex(poly->GetVertexIndexBase().m_vtxarray, 
-						poly->GetVertexIndexBase().m_indexarray[2],
-						poly->GetMaterial()->GetPolyMaterial())->getLocalXYZ();
-					btPoint3 vertex0(vtx[0],vtx[1],vtx[2]);
-					vtx = meshobj->GetVertex(poly->GetVertexIndexBase().m_vtxarray, 
-						poly->GetVertexIndexBase().m_indexarray[1],
-						poly->GetMaterial()->GetPolyMaterial())->getLocalXYZ();
-					btPoint3 vertex1(vtx[0],vtx[1],vtx[2]);
-					vtx = meshobj->GetVertex(poly->GetVertexIndexBase().m_vtxarray, 
-						poly->GetVertexIndexBase().m_indexarray[0],
-						poly->GetMaterial()->GetPolyMaterial())->getLocalXYZ();
-					btPoint3 vertex2(vtx[0],vtx[1],vtx[2]);
-					collisionMeshData->addTriangle(vertex0,vertex1,vertex2);
-					numvalidpolys++;
-				}
-				if (poly->VertexCount() == 4)
-				{
-					const float* vtx = meshobj->GetVertex(poly->GetVertexIndexBase().m_vtxarray, 
-						poly->GetVertexIndexBase().m_indexarray[3],
-						poly->GetMaterial()->GetPolyMaterial())->getLocalXYZ();
-					btPoint3 vertex0(vtx[0],vtx[1],vtx[2]);
-					vtx = meshobj->GetVertex(poly->GetVertexIndexBase().m_vtxarray, 
-						poly->GetVertexIndexBase().m_indexarray[2],
-						poly->GetMaterial()->GetPolyMaterial())->getLocalXYZ();
-					btPoint3 vertex1(vtx[0],vtx[1],vtx[2]);
-					vtx = meshobj->GetVertex(poly->GetVertexIndexBase().m_vtxarray, 
-						poly->GetVertexIndexBase().m_indexarray[0],
-						poly->GetMaterial()->GetPolyMaterial())->getLocalXYZ();
-					btPoint3 vertex2(vtx[0],vtx[1],vtx[2]);
-					collisionMeshData->addTriangle(vertex0,vertex1,vertex2);
-					numvalidpolys++;
-				}
-
-			}		
-		}
-	}
-
-
-
-	if (numvalidpolys > 0)
-	{
-		
-		if (!polytope)
-		{
-			bool useQuantization = true;
-			concaveShape = new btBvhTriangleMeshShape( collisionMeshData, useQuantization );
-			//concaveShape = new btTriangleMeshShape( collisionMeshData );
-
-			concaveShape->recalcLocalAabb();
-			if (collisionMeshShape)
-				delete collisionMeshShape;
-			collisionMeshShape = concaveShape;
-
-		} 
-		
-		
-
-		return collisionMeshShape;
-	}
-	if (collisionMeshShape)
-		delete collisionMeshShape;
-	if (collisionMeshData)
-		delete collisionMeshData;
-	return NULL;
-
-}
-
 
 void	KX_ConvertBulletObject(	class	KX_GameObject* gameobj,
 	class	RAS_MeshObject* meshobj,
@@ -878,6 +696,7 @@ void	KX_ConvertBulletObject(	class	KX_GameObject* gameobj,
 	bool isbulletdyna = false;
 	CcdConstructionInfo ci;
 	class PHY_IMotionState* motionstate = new KX_MotionState(gameobj->GetSGNode());
+	class CcdShapeConstructionInfo *shapeInfo = new CcdShapeConstructionInfo();
 
 	
 
@@ -894,120 +713,80 @@ void	KX_ConvertBulletObject(	class	KX_GameObject* gameobj,
 	ci.m_gravity = btVector3(0,0,0);
 	ci.m_localInertiaTensor =btVector3(0,0,0);
 	ci.m_mass = objprop->m_dyna ? shapeprops->m_mass : 0.f;
+	shapeInfo->m_radius = objprop->m_radius;
 	isbulletdyna = objprop->m_dyna;
 	
 	ci.m_localInertiaTensor = btVector3(ci.m_mass/3.f,ci.m_mass/3.f,ci.m_mass/3.f);
 	
-	btTransform trans;
-	trans.setIdentity();
-	
 	btCollisionShape* bm = 0;
 
 	switch (objprop->m_boundclass)
 	{
 	case KX_BOUNDSPHERE:
 		{
-			float radius = objprop->m_radius;
-			btVector3 inertiaHalfExtents (
-				radius,
-				radius,
-				radius);
+			//float radius = objprop->m_radius;
+			//btVector3 inertiaHalfExtents (
+			//	radius,
+			//	radius,
+			//	radius);
 			
 			//blender doesn't support multisphere, but for testing:
 
 			//bm = new MultiSphereShape(inertiaHalfExtents,,&trans.getOrigin(),&radius,1);
-			bm = new btSphereShape(objprop->m_radius);
-			bm->calculateLocalInertia(ci.m_mass,ci.m_localInertiaTensor);
+			shapeInfo->m_shapeType = PHY_SHAPE_SPHERE;
+			bm = shapeInfo->CreateBulletShape();
 			break;
 		};
 	case KX_BOUNDBOX:
 		{
-			MT_Vector3 halfExtents (
+			shapeInfo->m_halfExtend.setValue(
 				objprop->m_boundobject.box.m_extends[0],
-			objprop->m_boundobject.box.m_extends[1],
-			objprop->m_boundobject.box.m_extends[2]);
+				objprop->m_boundobject.box.m_extends[1],
+				objprop->m_boundobject.box.m_extends[2]);
 
-			halfExtents /= 2.f;
-
-			//btVector3 he (halfExtents[0]-CONVEX_DISTANCE_MARGIN ,halfExtents[1]-CONVEX_DISTANCE_MARGIN ,halfExtents[2]-CONVEX_DISTANCE_MARGIN );
-			//he = he.absolute();
-
-			btVector3 he (halfExtents[0],halfExtents[1],halfExtents[2]);
-			he = he.absolute();
-
-
-			bm = new btBoxShape(he);
-			bm->calculateLocalInertia(ci.m_mass,ci.m_localInertiaTensor);
+			shapeInfo->m_halfExtend /= 2.0;
+			shapeInfo->m_halfExtend = shapeInfo->m_halfExtend.absolute();
+			shapeInfo->m_shapeType = PHY_SHAPE_BOX;
+			bm = shapeInfo->CreateBulletShape();
 			break;
 		};
 	case KX_BOUNDCYLINDER:
 		{
-			btVector3 halfExtents (
+			shapeInfo->m_halfExtend.setValue(
 				objprop->m_boundobject.c.m_radius,
 				objprop->m_boundobject.c.m_radius,
 				objprop->m_boundobject.c.m_height * 0.5f
 			);
-			bm = new btCylinderShapeZ(halfExtents);
-			bm->calculateLocalInertia(ci.m_mass,ci.m_localInertiaTensor);
-
+			shapeInfo->m_shapeType = PHY_SHAPE_CYLINDER;
+			bm = shapeInfo->CreateBulletShape();
 			break;
 		}
 
-		case KX_BOUNDCONE:
+	case KX_BOUNDCONE:
 		{
-				btVector3 halfExtents (objprop->m_boundobject.box.m_extends[0],
-				objprop->m_boundobject.box.m_extends[1],
-				objprop->m_boundobject.box.m_extends[2]);
-
-
-				halfExtents /= 2.f;
-
-				bm = new btConeShapeZ(objprop->m_boundobject.c.m_radius,objprop->m_boundobject.c.m_height);
-				bm->calculateLocalInertia(ci.m_mass,ci.m_localInertiaTensor);
-
+			shapeInfo->m_radius = objprop->m_boundobject.c.m_radius;
+			shapeInfo->m_height = objprop->m_boundobject.c.m_height;
+			shapeInfo->m_shapeType = PHY_SHAPE_CONE;
+			bm = shapeInfo->CreateBulletShape();
 			break;
 		}
-		case KX_BOUNDPOLYTOPE:
-			{
-				bm = CreateBulletShapeFromMesh(meshobj,true);
-				if (bm)
-				{
-					bm->calculateLocalInertia(ci.m_mass,ci.m_localInertiaTensor);
-				}
-				break;
-			}
-		case KX_BOUNDMESH:
-			{
-				if (!ci.m_mass)
-				{				
-					bm = CreateBulletShapeFromMesh(meshobj,false);
-					ci.m_localInertiaTensor.setValue(0.f,0.f,0.f);
-					//no moving concave meshes, so don't bother calculating inertia
-					//bm->calculateLocalInertia(ci.m_mass,ci.m_localInertiaTensor);
-				}
-
-				break;
-			}
-
-	default:
-		//interpret the shape as a concave triangle-mesh
+	case KX_BOUNDPOLYTOPE:
 		{
-			if (meshobj)
-			{
-				bm = CreateBulletShapeFromMesh(meshobj,false);
-				ci.m_localInertiaTensor.setValue(0.f,0.f,0.f);
-
-			//	assert(0);
-
-					/*
-				meshobj->ScheduleCollisionPolygons();
-
-				KX_DeformableMesh* gfxmesh = new KX_DeformableMesh(meshobj);
-				gfxmesh->sendFixedMapping();
-				//trianglemesh
-				bm = new TriangleMeshInterface(gfxmesh,trans);
-				*/
+			shapeInfo->SetMesh(meshobj, true);
+			bm = shapeInfo->CreateBulletShape();
+			break;
+		}
+	case KX_BOUNDMESH:
+		{
+			if (!ci.m_mass)
+			{				
+				shapeInfo->SetMesh(meshobj, false);
+				bm = shapeInfo->CreateBulletShape();
+				//no moving concave meshes, so don't bother calculating inertia
+				//bm->calculateLocalInertia(ci.m_mass,ci.m_localInertiaTensor);
 			}
+
+			break;
 		}
 	}
 
@@ -1017,44 +796,41 @@ void	KX_ConvertBulletObject(	class	KX_GameObject* gameobj,
 	if (!bm)
 	{
 		delete motionstate;
+		delete shapeInfo;
 		return;
 	}
 
 	bm->setMargin(0.06);
 
 
-
 		if (objprop->m_isCompoundChild)
 		{
 			//find parent, compound shape and add to it
 			//take relative transform into account!
 			KX_BulletPhysicsController* parentCtrl = (KX_BulletPhysicsController*)objprop->m_dynamic_parent->GetPhysicsController();
 			assert(parentCtrl);
+			CcdShapeConstructionInfo* parentShapeInfo = parentCtrl->GetShapeInfo();
 			btRigidBody* rigidbody = parentCtrl->GetRigidBody();
 			btCollisionShape* colShape = rigidbody->getCollisionShape();
 			assert(colShape->isCompound());
 			btCompoundShape* compoundShape = (btCompoundShape*)colShape;
-			btTransform childTrans;
-			childTrans.setIdentity();
-			NodeList& children = objprop->m_dynamic_parent->GetSGNode()->GetSGChildren();
 
 			MT_Point3 childPos = gameobj->GetSGNode()->GetLocalPosition();
 			MT_Matrix3x3 childRot = gameobj->GetSGNode()->GetLocalOrientation();
 			MT_Vector3 childScale = gameobj->GetSGNode()->GetLocalScale();
 
 			bm->setLocalScaling(btVector3(childScale.x(),childScale.y(),childScale.z()));
-			childTrans.setOrigin(btVector3(childPos.x(),childPos.y(),childPos.z()));
+			shapeInfo->m_childTrans.setOrigin(btVector3(childPos.x(),childPos.y(),childPos.z()));
 			float rotval[12];
 			childRot.getValue(rotval);
 			btMatrix3x3 newRot;
 			newRot.setValue(rotval[0],rotval[1],rotval[2],rotval[4],rotval[5],rotval[6],rotval[8],rotval[9],rotval[10]);
 			newRot = newRot.transpose();
 
-			childTrans.setBasis(newRot);
-				
-
-			compoundShape->addChildShape(childTrans,bm);
-			kxscene->AddShape(bm);
+			shapeInfo->m_childTrans.setBasis(newRot);
+			parentShapeInfo->AddShape(shapeInfo);	
+			
+			compoundShape->addChildShape(shapeInfo->m_childTrans,bm);
 			//do some recalc?
 			//recalc inertia for rigidbody
 			if (!rigidbody->isStaticOrKinematicObject())
@@ -1069,15 +845,16 @@ void	KX_ConvertBulletObject(	class	KX_GameObject* gameobj,
 
 		if (objprop->m_hasCompoundChildren)
 		{
-			//replace shape by compoundShape
+			// create a compound shape info
+			CcdShapeConstructionInfo *compoundShapeInfo = new CcdShapeConstructionInfo();
+			compoundShapeInfo->m_shapeType = PHY_SHAPE_COMPOUND;
+			compoundShapeInfo->AddShape(shapeInfo);
+			// create the compound shape manually as we already have the child shape
 			btCompoundShape* compoundShape = new btCompoundShape();
-			btTransform identTrans;
-			identTrans.setIdentity();
-			compoundShape->addChildShape(identTrans,bm);
-			//note abount compoundShape: Bullet does not delete the child shapes when 
-			//the compound shape is deleted, so insert also the child shapes 
-			kxscene->AddShape(bm);
+			compoundShape->addChildShape(shapeInfo->m_childTrans,bm);
+			// now replace the shape
 			bm = compoundShape;
+			shapeInfo = compoundShapeInfo;
 		}
 
 
@@ -1113,6 +890,7 @@ void	KX_ConvertBulletObject(	class	KX_GameObject* gameobj,
 
 
 	ci.m_collisionShape = bm;
+	ci.m_shapeInfo = shapeInfo;
 	ci.m_friction = smmaterial->m_friction;//tweak the friction a bit, so the default 0.5 works nice
 	ci.m_restitution = smmaterial->m_restitution;
 	ci.m_physicsEnv = env;
@@ -1124,9 +902,12 @@ void	KX_ConvertBulletObject(	class	KX_GameObject* gameobj,
 	ci.m_collisionFilterGroup = (isbulletdyna) ? short(CcdConstructionInfo::DefaultFilter) : short(CcdConstructionInfo::StaticFilter);
 	ci.m_collisionFilterMask = (isbulletdyna) ? short(CcdConstructionInfo::AllFilter) : short(CcdConstructionInfo::AllFilter ^ CcdConstructionInfo::StaticFilter);
 	ci.m_bRigid = objprop->m_dyna && objprop->m_angular_rigidbody;
+	MT_Vector3 scaling = gameobj->NodeGetWorldScaling();
+	ci.m_scaling.setValue(scaling[0], scaling[1], scaling[2]);
 	KX_BulletPhysicsController* physicscontroller = new KX_BulletPhysicsController(ci,isbulletdyna);
-	//remember that we created a shape so that we can delete it when the scene is removed (bullet will not delete it) 
-	kxscene->AddShape(bm);
+	// shapeInfo is reference counted, decrement now as we don't use it anymore
+	if (shapeInfo)
+		shapeInfo->Release();
 
 	if (objprop->m_in_active_layer)
 	{
diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp
index 700cc00e996..c1b228e8d26 100644
--- a/source/gameengine/Ketsji/KX_GameObject.cpp
+++ b/source/gameengine/Ketsji/KX_GameObject.cpp
@@ -51,6 +51,7 @@ typedef unsigned long uint_ptr;
 #include "KX_GameObject.h"
 #include "RAS_MeshObject.h"
 #include "KX_MeshProxy.h"
+#include "KX_PolyProxy.h"
 #include <stdio.h> // printf
 #include "SG_Controller.h"
 #include "KX_IPhysicsController.h"
@@ -84,6 +85,7 @@ KX_GameObject::KX_GameObject(
 	m_bVisible(true),
 	m_pPhysicsController1(NULL),
 	m_pPhysicsEnvironment(NULL),
+	m_xray(false),
 	m_pHitObject(NULL),
 	m_isDeformable(false)
 {
@@ -885,6 +887,8 @@ PyMethodDef KX_GameObject::Methods[] = {
 	{"setPosition", (PyCFunction) KX_GameObject::sPySetPosition, METH_O},
 	{"getLinearVelocity", (PyCFunction) KX_GameObject::sPyGetLinearVelocity, METH_VARARGS},
 	{"setLinearVelocity", (PyCFunction) KX_GameObject::sPySetLinearVelocity, METH_VARARGS},
+	{"getAngularVelocity", (PyCFunction) KX_GameObject::sPyGetAngularVelocity, METH_VARARGS},
+	{"setAngularVelocity", (PyCFunction) KX_GameObject::sPySetAngularVelocity, METH_VARARGS},
 	{"getVelocity", (PyCFunction) KX_GameObject::sPyGetVelocity, METH_VARARGS},
 	{"getMass", (PyCFunction) KX_GameObject::sPyGetMass, METH_NOARGS},
 	{"getReactionForce", (PyCFunction) KX_GameObject::sPyGetReactionForce, METH_NOARGS},
@@ -1146,9 +1150,7 @@ int KX_GameObject::_setattr(const STR_String& attr, PyObject *value)	// _setattr
 }
 
 
-PyObject* KX_GameObject::PyGetLinearVelocity(PyObject* self, 
-											 PyObject* args, 
-											 PyObject* kwds)
+PyObject* KX_GameObject::PyGetLinearVelocity(PyObject* self, PyObject* args)
 {
 	// only can get the velocity if we have a physics object connected to us...
 	int local = 0;
@@ -1162,9 +1164,7 @@ PyObject* KX_GameObject::PyGetLinearVelocity(PyObject* self,
 	}
 }
 
-PyObject* KX_GameObject::PySetLinearVelocity(PyObject* self, 
-											 PyObject* args, 
-											 PyObject* kwds)
+PyObject* KX_GameObject::PySetLinearVelocity(PyObject* self, PyObject* args)
 {
 	int local = 0;
 	PyObject* pyvect;
@@ -1179,6 +1179,35 @@ PyObject* KX_GameObject::PySetLinearVelocity(PyObject* self,
 	return NULL;
 }
 
+PyObject* KX_GameObject::PyGetAngularVelocity(PyObject* self, PyObject* args)
+{
+	// only can get the velocity if we have a physics object connected to us...
+	int local = 0;
+	if (PyArg_ParseTuple(args,"|i",&local))
+	{
+		return PyObjectFrom(GetAngularVelocity((local!=0)));
+	}
+	else
+	{
+		return NULL;
+	}
+}
+
+PyObject* KX_GameObject::PySetAngularVelocity(PyObject* self, PyObject* args)
+{
+	int local = 0;
+	PyObject* pyvect;
+	
+	if (PyArg_ParseTuple(args,"O|i",&pyvect,&local)) {
+		MT_Vector3 velocity;
+		if (PyVecTo(pyvect, velocity)) {
+			setAngularVelocity(velocity, (local!=0));
+			Py_RETURN_NONE;
+		}
+	}
+	return NULL;
+}
+
 PyObject* KX_GameObject::PySetVisible(PyObject* self, PyObject* value)
 {
 	int visible = PyInt_AsLong(value);
@@ -1228,9 +1257,7 @@ PyObject* KX_GameObject::PySetState(PyObject* self, PyObject* value)
 
 
 
-PyObject* KX_GameObject::PyGetVelocity(PyObject* self, 
-									   PyObject* args, 
-									   PyObject* kwds)
+PyObject* KX_GameObject::PyGetVelocity(PyObject* self, PyObject* args)
 {
 	// only can get the velocity if we have a physics object connected to us...
 	MT_Vector3 velocity(0.0,0.0,0.0);
@@ -1362,9 +1389,7 @@ PyObject* KX_GameObject::PyGetChildrenRecursive(PyObject* self)
 	return list;
 }
 
-PyObject* KX_GameObject::PyGetMesh(PyObject* self, 
-								   PyObject* args, 
-								   PyObject* kwds)
+PyObject* KX_GameObject::PyGetMesh(PyObject* self, PyObject* args)
 {
 	int mesh = 0;
 
@@ -1404,9 +1429,7 @@ PyObject* KX_GameObject::PySetCollisionMargin(PyObject* self, PyObject* value)
 
 
 
-PyObject* KX_GameObject::PyApplyImpulse(PyObject* self, 
-										PyObject* args, 
-										PyObject* kwds)
+PyObject* KX_GameObject::PyApplyImpulse(PyObject* self, PyObject* args)
 {
 	PyObject* pyattach;
 	PyObject* pyimpulse;
@@ -1477,9 +1500,7 @@ PyObject* KX_GameObject::PySetOrientation(PyObject* self, PyObject* value)
 	return NULL;
 }
 
-PyObject* KX_GameObject::PyAlignAxisToVect(PyObject* self, 
-										  PyObject* args, 
-										  PyObject* kwds)
+PyObject* KX_GameObject::PyAlignAxisToVect(PyObject* self, PyObject* args)
 {
 	PyObject* pyvect;
 	int axis = 2; //z axis is the default
@@ -1609,25 +1630,45 @@ KX_PYMETHODDEF_DOC(KX_GameObject, getVectTo,
 	return returnValue;
 }
 
-bool KX_GameObject::RayHit(KX_ClientObjectInfo* client, MT_Point3& hit_point, MT_Vector3& hit_normal, void * const data)
+bool KX_GameObject::RayHit(KX_ClientObjectInfo* client, KX_RayCast* result, void * const data)
 {
-
 	KX_GameObject* hitKXObj = client->m_gameobject;
 	
-	if (client->m_type > KX_ClientObjectInfo::ACTOR)
-	{
-		// false hit
-		return false;
-	}
-
-	if (m_testPropName.Length() == 0 || hitKXObj->GetProperty(m_testPropName) != NULL)
+	// if X-ray option is selected, the unwnted objects were not tested, so get here only with true hit
+	// if not, all objects were tested and the front one may not be the correct one.
+	if (m_xray || m_testPropName.Length() == 0 || hitKXObj->GetProperty(m_testPropName) != NULL)
 	{
 		m_pHitObject = hitKXObj;
 		return true;
 	}
+	// return true to stop RayCast::RayTest from looping, the above test was decisive
+	// We would want to loop only if we want to get more than one hit point
+	return true;
+}
 
-	return false;
+/* this function is used to pre-filter the object before casting the ray on them.
+   This is useful for "X-Ray" option when we want to see "through" unwanted object.
+ */
+bool KX_GameObject::NeedRayCast(KX_ClientObjectInfo* client)
+{
+	KX_GameObject* hitKXObj = client->m_gameobject;
 	
+	if (client->m_type > KX_ClientObjectInfo::ACTOR)
+	{
+		// Unknown type of object, skip it.
+		// Should not occur as the sensor objects are filtered in RayTest()
+		printf("Invalid client type %d found in ray casting\n", client->m_type);
+		return false;
+	}
+	
+	// if X-Ray option is selected, skip object that don't match the criteria as we see through them
+	// if not, test all objects because we don't know yet which one will be on front
+	if (!m_xray || m_testPropName.Length() == 0 || hitKXObj->GetProperty(m_testPropName) != NULL)
+	{
+		return true;
+	}
+	// skip the object
+	return false;
 }
 
 KX_PYMETHODDEF_DOC(KX_GameObject, rayCastTo,
@@ -1667,8 +1708,6 @@ KX_PYMETHODDEF_DOC(KX_GameObject, rayCastTo,
 		toPoint = fromPoint + (dist) * toDir;
 	}
 
-	MT_Point3 resultPoint;
-	MT_Vector3 resultNormal;
 	PHY_IPhysicsEnvironment* pe = GetPhysicsEnvironment();
 	KX_IPhysicsController *spc = GetPhysicsController();
 	KX_GameObject *parent = GetParent();
@@ -1682,7 +1721,8 @@ KX_PYMETHODDEF_DOC(KX_GameObject, rayCastTo,
 		m_testPropName = propName;
 	else
 		m_testPropName.SetLength(0);
-	KX_RayCast::RayTest(spc, pe, fromPoint, toPoint, resultPoint, resultNormal, KX_RayCast::Callback<KX_GameObject>(this));
+	KX_RayCast::Callback<KX_GameObject> callback(this,spc);
+	KX_RayCast::RayTest(pe, fromPoint, toPoint, callback);
 
     if (m_pHitObject)
 	{
@@ -1693,13 +1733,24 @@ KX_PYMETHODDEF_DOC(KX_GameObject, rayCastTo,
 }
 
 KX_PYMETHODDEF_DOC(KX_GameObject, rayCast,
-				   "rayCast(to,from,dist,prop): cast a ray and return tuple (object,hit,normal) of contact point with object within dist that matches prop or (None,None,None) tuple if no hit\n"
-" prop = property name that object must have; can be omitted => detect any object\n"
-" dist = max distance to look (can be negative => look behind); 0 or omitted => detect up to to\n"
+				   "rayCast(to,from,dist,prop,face,xray,poly): cast a ray and return 3-tuple (object,hit,normal) or 4-tuple (object,hit,normal,polygon) of contact point with object within dist that matches prop.\n"
+				   " If no hit, return (None,None,None) or (None,None,None,None).\n"
+" to   = 3-tuple or object reference for destination of ray (if object, use center of object)\n"
 " from = 3-tuple or object reference for origin of ray (if object, use center of object)\n"
 "        Can be None or omitted => start from self object center\n"
-" to = 3-tuple or object reference for destination of ray (if object, use center of object)\n"
-"Note: the object on which you call this method matters: the ray will ignore it if it goes through it\n")
+" dist = max distance to look (can be negative => look behind); 0 or omitted => detect up to to\n"
+" prop = property name that object must have; can be omitted => detect any object\n"
+" face = normal option: 1=>return face normal; 0 or omitted => normal is oriented towards origin\n"
+" xray = X-ray option: 1=>skip objects that don't match prop; 0 or omitted => stop on first object\n"
+" poly = polygon option: 1=>return value is a 4-tuple and the 4th element is a KX_PolyProxy object\n"
+"                           which can be None if hit object has no mesh or if there is no hit\n"
+"        If 0 or omitted, return value is a 3-tuple\n"
+"Note: The object on which you call this method matters: the ray will ignore it.\n"
+"      prop and xray option interact as follow:\n"
+"        prop off, xray off: return closest hit or no hit if there is no object on the full extend of the ray\n"
+"        prop off, xray on : idem\n"
+"        prop on,  xray off: return closest hit if it matches prop, no hit otherwise\n"
+"        prop on,  xray on : return closest hit matching prop or no hit if there is no object matching prop on the full extend of the ray\n")
 {
 	MT_Point3 toPoint;
 	MT_Point3 fromPoint;
@@ -1708,8 +1759,9 @@ KX_PYMETHODDEF_DOC(KX_GameObject, rayCast,
 	float dist = 0.0f;
 	char *propName = NULL;
 	KX_GameObject *other;
+	int face=0, xray=0, poly=0;
 
-	if (!PyArg_ParseTuple(args,"O|Ofs", &pyto, &pyfrom, &dist, &propName)) {
+	if (!PyArg_ParseTuple(args,"O|Ofsiii", &pyto, &pyfrom, &dist, &propName, &face, &xray, &poly)) {
 		return NULL; // Python sets a simple error
 	}
 
@@ -1755,8 +1807,6 @@ KX_PYMETHODDEF_DOC(KX_GameObject, rayCast,
 		return Py_BuildValue("OOO", Py_None, Py_None, Py_None);
 	}
 	
-	MT_Point3 resultPoint;
-	MT_Vector3 resultNormal;
 	PHY_IPhysicsEnvironment* pe = GetPhysicsEnvironment();
 	KX_IPhysicsController *spc = GetPhysicsController();
 	KX_GameObject *parent = GetParent();
@@ -1770,20 +1820,41 @@ KX_PYMETHODDEF_DOC(KX_GameObject, rayCast,
 		m_testPropName = propName;
 	else
 		m_testPropName.SetLength(0);
-	KX_RayCast::RayTest(spc, pe, fromPoint, toPoint, resultPoint, resultNormal, KX_RayCast::Callback<KX_GameObject>(this));
+	m_xray = xray;
+	// to get the hit results
+	KX_RayCast::Callback<KX_GameObject> callback(this,spc,NULL,face);
+	KX_RayCast::RayTest(pe, fromPoint, toPoint, callback);
 
-    if (m_pHitObject)
+	if (m_pHitObject)
 	{
-		PyObject* returnValue = PyTuple_New(3);
+		PyObject* returnValue = (poly) ? PyTuple_New(4) : PyTuple_New(3);
 		if (returnValue) { // unlikely this would ever fail, if it does python sets an error
 			PyTuple_SET_ITEM(returnValue, 0, m_pHitObject->AddRef());
-			PyTuple_SET_ITEM(returnValue, 1, PyObjectFrom(resultPoint));
-			PyTuple_SET_ITEM(returnValue, 2, PyObjectFrom(resultNormal));
+			PyTuple_SET_ITEM(returnValue, 1, PyObjectFrom(callback.m_hitPoint));
+			PyTuple_SET_ITEM(returnValue, 2, PyObjectFrom(callback.m_hitNormal));
+			if (poly)
+			{
+				if (callback.m_hitMesh)
+				{
+					// if this field is set, then we can trust that m_hitPolygon is a valid polygon
+					RAS_Polygon* poly = callback.m_hitMesh->GetPolygon(callback.m_hitPolygon);
+					KX_PolyProxy* polyproxy = new KX_PolyProxy(callback.m_hitMesh, poly);
+					PyTuple_SET_ITEM(returnValue, 3, polyproxy);
+				}
+				else
+				{
+					Py_INCREF(Py_None);
+					PyTuple_SET_ITEM(returnValue, 3, Py_None);
+				}
+			}
 		}
 		return returnValue;
 	}
-	return Py_BuildValue("OOO", Py_None, Py_None, Py_None);
-	//Py_RETURN_NONE;
+	// no hit
+	if (poly)
+		return Py_BuildValue("OOOO", Py_None, Py_None, Py_None, Py_None);
+	else
+		return Py_BuildValue("OOO", Py_None, Py_None, Py_None);
 }
 
 /* --------------------------------------------------------------------- 
diff --git a/source/gameengine/Ketsji/KX_GameObject.h b/source/gameengine/Ketsji/KX_GameObject.h
index a7ac2d75a93..508bc7cdfd0 100644
--- a/source/gameengine/Ketsji/KX_GameObject.h
+++ b/source/gameengine/Ketsji/KX_GameObject.h
@@ -54,6 +54,7 @@
 
 //Forward declarations.
 struct KX_ClientObjectInfo;
+class KX_RayCast;
 class RAS_MeshObject;
 class KX_IPhysicsController;
 class PHY_IPhysicsEnvironment;
@@ -88,6 +89,7 @@ protected:
 	// used for ray casting
 	PHY_IPhysicsEnvironment*			m_pPhysicsEnvironment;
 	STR_String							m_testPropName;
+	bool								m_xray;
 	KX_GameObject*						m_pHitObject;
 
 	SG_Node*							m_pSGNode;
@@ -428,7 +430,8 @@ public:
 		return (m_pSGNode && m_pSGNode->GetSGParent() && m_pSGNode->GetSGParent()->IsVertexParent());
 	}
 
-	bool RayHit(KX_ClientObjectInfo* client, MT_Point3& hit_point, MT_Vector3& hit_normal, void * const data);
+	bool RayHit(KX_ClientObjectInfo* client, KX_RayCast* result, void * const data);
+	bool NeedRayCast(KX_ClientObjectInfo* client);
 
 
 	/**
@@ -726,9 +729,11 @@ public:
 
 	KX_PYMETHOD_NOARGS(KX_GameObject,GetPosition);
 	KX_PYMETHOD_O(KX_GameObject,SetPosition);
-	KX_PYMETHOD(KX_GameObject,GetLinearVelocity);
-	KX_PYMETHOD(KX_GameObject,SetLinearVelocity);
-	KX_PYMETHOD(KX_GameObject,GetVelocity);
+	KX_PYMETHOD_VARARGS(KX_GameObject,GetLinearVelocity);
+	KX_PYMETHOD_VARARGS(KX_GameObject,SetLinearVelocity);
+	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);
@@ -737,20 +742,20 @@ public:
 	KX_PYMETHOD_O(KX_GameObject,SetVisible);
 	KX_PYMETHOD_NOARGS(KX_GameObject,GetState);
 	KX_PYMETHOD_O(KX_GameObject,SetState);
-	KX_PYMETHOD(KX_GameObject,AlignAxisToVect);
+	KX_PYMETHOD_VARARGS(KX_GameObject,AlignAxisToVect);
 	KX_PYMETHOD_O(KX_GameObject,GetAxisVect);
 	KX_PYMETHOD_NOARGS(KX_GameObject,SuspendDynamics);
 	KX_PYMETHOD_NOARGS(KX_GameObject,RestoreDynamics);
 	KX_PYMETHOD_NOARGS(KX_GameObject,EnableRigidBody);
 	KX_PYMETHOD_NOARGS(KX_GameObject,DisableRigidBody);
-	KX_PYMETHOD(KX_GameObject,ApplyImpulse);
+	KX_PYMETHOD_VARARGS(KX_GameObject,ApplyImpulse);
 	KX_PYMETHOD_O(KX_GameObject,SetCollisionMargin);
 	KX_PYMETHOD_NOARGS(KX_GameObject,GetParent);
 	KX_PYMETHOD_O(KX_GameObject,SetParent);
 	KX_PYMETHOD_NOARGS(KX_GameObject,RemoveParent);
 	KX_PYMETHOD_NOARGS(KX_GameObject,GetChildren);	
 	KX_PYMETHOD_NOARGS(KX_GameObject,GetChildrenRecursive);
-	KX_PYMETHOD(KX_GameObject,GetMesh);
+	KX_PYMETHOD_VARARGS(KX_GameObject,GetMesh);
 	KX_PYMETHOD_NOARGS(KX_GameObject,GetPhysicsId);
 	KX_PYMETHOD_NOARGS(KX_GameObject,GetPropertyNames);
 	KX_PYMETHOD_NOARGS(KX_GameObject,EndObject);
diff --git a/source/gameengine/Ketsji/KX_IPO_SGController.cpp b/source/gameengine/Ketsji/KX_IPO_SGController.cpp
index d3aa924665e..6223643f75a 100644
--- a/source/gameengine/Ketsji/KX_IPO_SGController.cpp
+++ b/source/gameengine/Ketsji/KX_IPO_SGController.cpp
@@ -143,7 +143,7 @@ bool KX_IpoSGController::Update(double currentTime)
 		{
 			if (m_ipo_as_force == true) 
 			{
-				if (m_game_object && ob) 
+				if (m_game_object && ob && m_game_object->GetPhysicsController()) 
 				{
 					m_game_object->GetPhysicsController()->ApplyForce(m_ipo_local ?
 						ob->GetWorldOrientation() * m_ipo_xform.GetPosition() :
diff --git a/source/gameengine/Ketsji/KX_MaterialIpoController.cpp b/source/gameengine/Ketsji/KX_MaterialIpoController.cpp
index 2ce5d469380..85d514bd22f 100644
--- a/source/gameengine/Ketsji/KX_MaterialIpoController.cpp
+++ b/source/gameengine/Ketsji/KX_MaterialIpoController.cpp
@@ -3,6 +3,8 @@
 #include "KX_ScalarInterpolator.h"
 #include "KX_GameObject.h"
 
+#include "BLO_sys_types.h" // for intptr_t support
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -76,10 +78,10 @@ SG_Controller*	KX_MaterialIpoController::GetReplica(class SG_Node* destnode)
 		iporeplica->AddInterpolator(copyipo);
 
 		MT_Scalar* scaal = ((KX_ScalarInterpolator*)*i)->GetTarget();
-		long orgbase = (long)this;
-		long orgloc = (long)scaal;
-		long offset = orgloc-orgbase;
-		long newaddrbase = (long)iporeplica + offset;
+		intptr_t orgbase = (intptr_t)this;
+		intptr_t orgloc = (intptr_t)scaal;
+		intptr_t offset = orgloc-orgbase;
+		intptr_t newaddrbase = (intptr_t)iporeplica + offset;
 		MT_Scalar* blaptr = (MT_Scalar*) newaddrbase;
 		copyipo->SetNewTarget((MT_Scalar*)blaptr);
 	}
diff --git a/source/gameengine/Ketsji/KX_MeshProxy.cpp b/source/gameengine/Ketsji/KX_MeshProxy.cpp
index a0ac9cfd4ff..29842af7fb6 100644
--- a/source/gameengine/Ketsji/KX_MeshProxy.cpp
+++ b/source/gameengine/Ketsji/KX_MeshProxy.cpp
@@ -35,6 +35,7 @@
 #include "RAS_MeshObject.h"
 
 #include "KX_VertexProxy.h"
+#include "KX_PolyProxy.h"
 
 #include "KX_PolygonMaterial.h"
 #include "KX_BlenderMaterial.h"
@@ -71,10 +72,12 @@ PyParentObject KX_MeshProxy::Parents[] = {
 
 PyMethodDef KX_MeshProxy::Methods[] = {
 {"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},
 KX_PYMETHODTABLE(KX_MeshProxy, reinstancePhysicsMesh),
 //{"getIndexArrayLength", (PyCFunction)KX_MeshProxy::sPyGetIndexArrayLength,METH_VARARGS},
 
@@ -146,6 +149,12 @@ PyObject* KX_MeshProxy::PyGetNumMaterials(PyObject* self,
 	return PyInt_FromLong(num);
 }
 
+PyObject* KX_MeshProxy::PyGetNumPolygons(PyObject* self)
+{
+	int num = m_meshobj->NumPolygons();
+	return PyInt_FromLong(num);
+}
+
 PyObject* KX_MeshProxy::PyGetMaterialName(PyObject* self, 
 			       PyObject* args, 
 			       PyObject* kwds)
@@ -234,6 +243,28 @@ PyObject* KX_MeshProxy::PyGetVertex(PyObject* self,
 		
 }
 
+PyObject* KX_MeshProxy::PyGetPolygon(PyObject* self,
+			       PyObject* args, 
+			       PyObject* kwds)
+{
+    int polyindex= 1;
+	PyObject* polyob = NULL;
+
+	if (!PyArg_ParseTuple(args,"i",&polyindex))
+		return NULL;
+
+	RAS_Polygon* polygon = m_meshobj->GetPolygon(polyindex);
+	if (polygon)
+	{
+		polyob = new KX_PolyProxy(m_meshobj, polygon);
+	}
+	else
+	{
+		PyErr_SetString(PyExc_AttributeError, "Invalid polygon index");
+	}
+	return polyob;
+}
+
 KX_PYMETHODDEF_DOC(KX_MeshProxy, reinstancePhysicsMesh,
 "Reinstance the physics mesh.")
 {
diff --git a/source/gameengine/Ketsji/KX_MeshProxy.h b/source/gameengine/Ketsji/KX_MeshProxy.h
index 7c6202c15a4..3335c349673 100644
--- a/source/gameengine/Ketsji/KX_MeshProxy.h
+++ b/source/gameengine/Ketsji/KX_MeshProxy.h
@@ -57,10 +57,12 @@ public:
 	KX_PYMETHOD(KX_MeshProxy,GetNumMaterials);
 	KX_PYMETHOD(KX_MeshProxy,GetMaterialName);
 	KX_PYMETHOD(KX_MeshProxy,GetTextureName);
+	KX_PYMETHOD_NOARGS(KX_MeshProxy,GetNumPolygons);
 	
 	// both take materialid (int)
 	KX_PYMETHOD(KX_MeshProxy,GetVertexArrayLength);
 	KX_PYMETHOD(KX_MeshProxy,GetVertex);
+	KX_PYMETHOD(KX_MeshProxy,GetPolygon);
 	KX_PYMETHOD_DOC(KX_MeshProxy, reinstancePhysicsMesh);
 };
 
diff --git a/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp b/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
index db0bef8b7e1..3156f543ed5 100644
--- a/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
+++ b/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
@@ -122,16 +122,10 @@ bool KX_MouseFocusSensor::Evaluate(CValue* event)
 	return result;
 }
 
-bool KX_MouseFocusSensor::RayHit(KX_ClientObjectInfo* client_info, MT_Point3& hit_point, MT_Vector3& hit_normal, void * const data)
+bool KX_MouseFocusSensor::RayHit(KX_ClientObjectInfo* client_info, KX_RayCast* result, void * const data)
 {
 	KX_GameObject* hitKXObj = client_info->m_gameobject;
 	
-	if (client_info->m_type > KX_ClientObjectInfo::ACTOR)
-	{
-		// false hit
-		return false;
-	}
-	
 	/* Is this me? In the ray test, there are a lot of extra checks
 	* for aliasing artefacts from self-hits. That doesn't happen
 	* here, so a simple test suffices. Or does the camera also get
@@ -142,8 +136,8 @@ bool KX_MouseFocusSensor::RayHit(KX_ClientObjectInfo* client_info, MT_Point3& hi
 	if ((m_focusmode == 2) || hitKXObj == thisObj)
 	{
 		m_hitObject = hitKXObj;
-		m_hitPosition = hit_point;
-		m_hitNormal = hit_normal;
+		m_hitPosition = result->m_hitPoint;
+		m_hitNormal = result->m_hitNormal;
 		return true;
 	}
 	
@@ -158,8 +152,6 @@ bool KX_MouseFocusSensor::ParentObjectHasFocus(void)
 	m_hitObject = 0;
 	m_hitPosition = MT_Vector3(0,0,0);
 	m_hitNormal =	MT_Vector3(1,0,0);
-	MT_Point3 resultpoint;
-	MT_Vector3 resultnormal;
 
 	/* All screen handling in the gameengine is done by GL,
 	 * specifically the model/view and projection parts. The viewport
@@ -280,7 +272,8 @@ bool KX_MouseFocusSensor::ParentObjectHasFocus(void)
 
 	bool result = false;
 
-	result = KX_RayCast::RayTest(physics_controller, physics_environment, frompoint3, topoint3, resultpoint, resultnormal, KX_RayCast::Callback<KX_MouseFocusSensor>(this));
+	KX_RayCast::Callback<KX_MouseFocusSensor> callback(this,physics_controller);
+	KX_RayCast::RayTest(physics_environment, frompoint3, topoint3, callback);
 	
 	result = (m_hitObject!=0);
 
diff --git a/source/gameengine/Ketsji/KX_MouseFocusSensor.h b/source/gameengine/Ketsji/KX_MouseFocusSensor.h
index b011ebe1288..a6cc39d66eb 100644
--- a/source/gameengine/Ketsji/KX_MouseFocusSensor.h
+++ b/source/gameengine/Ketsji/KX_MouseFocusSensor.h
@@ -33,6 +33,8 @@
 
 #include "SCA_MouseSensor.h"
 
+class KX_RayCast;
+
 /**
  * The mouse focus sensor extends the basic SCA_MouseSensor. It has
  * been placed in KX because it needs access to the rasterizer and
@@ -76,7 +78,9 @@ class KX_MouseFocusSensor : public SCA_MouseSensor
 		return result;
 	};
 
-	bool RayHit(KX_ClientObjectInfo* client, MT_Point3& hit_point, MT_Vector3& hit_normal, void * const data);
+	bool RayHit(KX_ClientObjectInfo* client, KX_RayCast* result, void * const data);
+	bool NeedRayCast(KX_ClientObjectInfo* client) { return true; }
+	
 
 	
 	/* --------------------------------------------------------------------- */
diff --git a/source/gameengine/Ketsji/KX_PolyProxy.cpp b/source/gameengine/Ketsji/KX_PolyProxy.cpp
new file mode 100644
index 00000000000..658c8a98e4f
--- /dev/null
+++ b/source/gameengine/Ketsji/KX_PolyProxy.cpp
@@ -0,0 +1,265 @@
+/**
+ * $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 *****
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "KX_PolyProxy.h"
+#include "KX_MeshProxy.h"
+#include "RAS_MeshObject.h"
+#include "KX_BlenderMaterial.h"
+#include "KX_PolygonMaterial.h"
+
+#include "KX_PyMath.h"
+
+PyTypeObject KX_PolyProxy::Type = {
+	PyObject_HEAD_INIT(&PyType_Type)
+	0,
+	"KX_PolyProxy",
+	sizeof(KX_PolyProxy),
+	0,
+	PyDestructor,
+	0,
+	__getattr,
+	__setattr,
+	0, //&MyPyCompare,
+	__repr,
+	0, //&cvalue_as_number,
+	0,
+	0,
+	0,
+	0
+};
+
+PyParentObject KX_PolyProxy::Parents[] = {
+	&KX_PolyProxy::Type,
+	&SCA_IObject::Type,
+	&CValue::Type,
+	NULL
+};
+
+PyMethodDef KX_PolyProxy::Methods[] = {
+	KX_PYMETHODTABLE_NOARG(KX_PolyProxy,getMaterialIndex),
+	KX_PYMETHODTABLE_NOARG(KX_PolyProxy,getNumVertex),
+	KX_PYMETHODTABLE_NOARG(KX_PolyProxy,isVisible),
+	KX_PYMETHODTABLE_NOARG(KX_PolyProxy,isCollider),
+	KX_PYMETHODTABLE_NOARG(KX_PolyProxy,getMaterialName),
+	KX_PYMETHODTABLE_NOARG(KX_PolyProxy,getTextureName),
+	KX_PYMETHODTABLE(KX_PolyProxy,getVertexIndex),
+	KX_PYMETHODTABLE_NOARG(KX_PolyProxy,getMesh),
+	KX_PYMETHODTABLE_NOARG(KX_PolyProxy,getMaterial),
+	{NULL,NULL} //Sentinel
+};
+
+PyObject*
+KX_PolyProxy::_getattr(const STR_String& attr)
+{
+	if (attr == "matname")
+	{
+		return PyString_FromString(m_polygon->GetMaterial()->GetPolyMaterial()->GetMaterialName());
+	}
+	if (attr == "texture")
+	{
+		return PyString_FromString(m_polygon->GetMaterial()->GetPolyMaterial()->GetTextureName());
+	}
+	if (attr == "material")
+	{
+		RAS_IPolyMaterial *polymat = m_polygon->GetMaterial()->GetPolyMaterial();
+		if(polymat->GetFlag() & RAS_BLENDERMAT)
+		{
+			KX_BlenderMaterial* mat = static_cast<KX_BlenderMaterial*>(polymat);
+			Py_INCREF(mat);
+			return mat;
+		}
+		else
+		{
+			KX_PolygonMaterial* mat = static_cast<KX_PolygonMaterial*>(polymat);
+			Py_INCREF(mat);
+			return mat;
+		}
+	}
+	if (attr == "matid")
+	{
+		// we'll have to scan through the material bucket of the mes and compare with 
+		// the one of the polygon
+		RAS_MaterialBucket* polyBucket = m_polygon->GetMaterial();
+		unsigned int matid;
+		for (matid=0; matid<m_mesh->NumMaterials(); matid++)
+		{
+			RAS_MaterialBucket* meshBucket = m_mesh->GetMaterialBucket(matid);
+			if (meshBucket == polyBucket)
+				// found it
+				break;
+		}
+		return PyInt_FromLong(matid);
+	}
+	if (attr == "v1")
+	{
+		return PyInt_FromLong(m_polygon->GetVertexIndexBase().m_indexarray[0]);
+	}
+	if (attr == "v2")
+	{
+		return PyInt_FromLong(m_polygon->GetVertexIndexBase().m_indexarray[1]);
+	}
+	if (attr == "v3")
+	{
+		return PyInt_FromLong(m_polygon->GetVertexIndexBase().m_indexarray[2]);
+	}
+	if (attr == "v4")
+	{
+		return PyInt_FromLong(((m_polygon->VertexCount()>3)?m_polygon->GetVertexIndexBase().m_indexarray[3]:0));
+	}
+	if (attr == "visible")
+	{
+		return PyInt_FromLong(m_polygon->IsVisible());
+	}
+	if (attr == "collide")
+	{
+		return PyInt_FromLong(m_polygon->IsCollider());
+	}
+	_getattr_up(SCA_IObject);
+}
+
+KX_PolyProxy::KX_PolyProxy(const RAS_MeshObject*mesh, RAS_Polygon* polygon)
+:	m_mesh((RAS_MeshObject*)mesh),
+	m_polygon(polygon)
+{
+}
+
+KX_PolyProxy::~KX_PolyProxy()
+{
+}
+
+
+// stuff for cvalue related things
+CValue*		KX_PolyProxy::Calc(VALUE_OPERATOR, CValue *) { return NULL;}
+CValue*		KX_PolyProxy::CalcFinal(VALUE_DATA_TYPE, VALUE_OPERATOR, CValue *) { return NULL;}	
+STR_String	sPolyName="polygone";
+const STR_String &	KX_PolyProxy::GetText() {return sPolyName;};
+float		KX_PolyProxy::GetNumber() { return -1;}
+STR_String	KX_PolyProxy::GetName() { return sPolyName;}
+void		KX_PolyProxy::SetName(STR_String) { };
+CValue*		KX_PolyProxy::GetReplica() { return NULL;}
+void		KX_PolyProxy::ReplicaSetName(STR_String) {};
+
+
+// stuff for python integration
+
+KX_PYMETHODDEF_DOC_NOARG(KX_PolyProxy, getMaterialIndex, 
+"getMaterialIndex() : return the material index of the polygon in the mesh\n")
+{
+	RAS_MaterialBucket* polyBucket = m_polygon->GetMaterial();
+	unsigned int matid;
+	for (matid=0; matid<m_mesh->NumMaterials(); matid++)
+	{
+		RAS_MaterialBucket* meshBucket = m_mesh->GetMaterialBucket(matid);
+		if (meshBucket == polyBucket)
+			// found it
+			break;
+	}
+	return PyInt_FromLong(matid);
+}
+
+KX_PYMETHODDEF_DOC_NOARG(KX_PolyProxy, getNumVertex,
+"getNumVertex() : returns the number of vertex of the polygon, 3 or 4\n")
+{
+	return PyInt_FromLong(m_polygon->VertexCount());
+}
+
+KX_PYMETHODDEF_DOC_NOARG(KX_PolyProxy, isVisible,
+"isVisible() : returns whether the polygon is visible or not\n")
+{
+	return PyInt_FromLong(m_polygon->IsVisible());
+}
+
+KX_PYMETHODDEF_DOC_NOARG(KX_PolyProxy, isCollider,
+"isCollider() : returns whether the polygon is receives collision or not\n")
+{
+	return PyInt_FromLong(m_polygon->IsCollider());
+}
+
+KX_PYMETHODDEF_DOC_NOARG(KX_PolyProxy, getMaterialName,
+"getMaterialName() : returns the polygon material name, \"NoMaterial\" if no material\n")
+{
+	return PyString_FromString(m_polygon->GetMaterial()->GetPolyMaterial()->GetMaterialName());
+}
+
+KX_PYMETHODDEF_DOC_NOARG(KX_PolyProxy, getTextureName,
+"getTexturelName() : returns the polygon texture name, \"NULL\" if no texture\n")
+{
+	return PyString_FromString(m_polygon->GetMaterial()->GetPolyMaterial()->GetTextureName());
+}
+
+KX_PYMETHODDEF_DOC(KX_PolyProxy, getVertexIndex,
+"getVertexIndex(vertex) : returns the mesh vertex index of a polygon vertex\n"
+"vertex: index of the vertex in the polygon: 0->3\n"
+"return value can be used to retrieve the vertex details through mesh proxy\n"
+"Note: getVertexIndex(3) on a triangle polygon returns 0\n")
+{
+	int index;
+	if (!PyArg_ParseTuple(args,"i",&index))
+	{
+		return NULL;
+	}
+	if (index < 0 || index > 3)
+	{
+		PyErr_SetString(PyExc_AttributeError, "Valid range for index is 0-3");
+		return NULL;
+	}
+	if (index < m_polygon->VertexCount())
+	{
+		return PyInt_FromLong(m_polygon->GetVertexIndexBase().m_indexarray[index]);
+	}
+	return PyInt_FromLong(0);
+}
+
+KX_PYMETHODDEF_DOC_NOARG(KX_PolyProxy, getMesh,
+"getMesh() : returns a mesh proxy\n")
+{
+	KX_MeshProxy* meshproxy = new KX_MeshProxy((RAS_MeshObject*)m_mesh);
+	return meshproxy;
+}
+
+KX_PYMETHODDEF_DOC_NOARG(KX_PolyProxy, getMaterial,
+"getMaterial() : returns a material\n")
+{
+	RAS_IPolyMaterial *polymat = m_polygon->GetMaterial()->GetPolyMaterial();
+	if(polymat->GetFlag() & RAS_BLENDERMAT)
+	{
+		KX_BlenderMaterial* mat = static_cast<KX_BlenderMaterial*>(polymat);
+		Py_INCREF(mat);
+		return mat;
+	}
+	else
+	{
+		KX_PolygonMaterial* mat = static_cast<KX_PolygonMaterial*>(polymat);
+		Py_INCREF(mat);
+		return mat;
+	}
+}
diff --git a/source/gameengine/Ketsji/KX_PolyProxy.h b/source/gameengine/Ketsji/KX_PolyProxy.h
new file mode 100644
index 00000000000..506e2c2a656
--- /dev/null
+++ b/source/gameengine/Ketsji/KX_PolyProxy.h
@@ -0,0 +1,71 @@
+/**
+ * $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_POLYROXY
+#define __KX_POLYPROXY
+
+#include "SCA_IObject.h"
+
+class KX_PolyProxy	: public SCA_IObject
+{
+	Py_Header;
+protected:
+	class RAS_Polygon*		m_polygon;
+	class RAS_MeshObject*	m_mesh;
+public:
+	KX_PolyProxy(const class RAS_MeshObject*mesh, class RAS_Polygon* polygon);
+	virtual ~KX_PolyProxy();
+
+	// stuff for cvalue related things
+	CValue*		Calc(VALUE_OPERATOR op, CValue *val) ;
+	CValue*		CalcFinal(VALUE_DATA_TYPE dtype, VALUE_OPERATOR op, CValue *val);
+	const STR_String &	GetText();
+	float		GetNumber();
+	STR_String	GetName();
+	void		SetName(STR_String name);								// Set the name of the value
+	void		ReplicaSetName(STR_String name);
+	CValue*		GetReplica();
+
+
+// stuff for python integration
+	virtual PyObject* _getattr(const STR_String& attr);
+
+	KX_PYMETHOD_DOC_NOARGS(KX_PolyProxy,getMaterialIndex)
+	KX_PYMETHOD_DOC_NOARGS(KX_PolyProxy,getNumVertex)
+	KX_PYMETHOD_DOC_NOARGS(KX_PolyProxy,isVisible)
+	KX_PYMETHOD_DOC_NOARGS(KX_PolyProxy,isCollider)
+	KX_PYMETHOD_DOC_NOARGS(KX_PolyProxy,getMaterialName)
+	KX_PYMETHOD_DOC_NOARGS(KX_PolyProxy,getTextureName)
+	KX_PYMETHOD_DOC(KX_PolyProxy,getVertexIndex)
+	KX_PYMETHOD_DOC_NOARGS(KX_PolyProxy,getMesh)
+	KX_PYMETHOD_DOC_NOARGS(KX_PolyProxy,getMaterial)
+
+};
+
+#endif //__KX_POLYPROXY
+
diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp
index 868439546c3..e9fb0278d76 100644
--- a/source/gameengine/Ketsji/KX_PythonInit.cpp
+++ b/source/gameengine/Ketsji/KX_PythonInit.cpp
@@ -30,7 +30,13 @@
 
 #include "GL/glew.h"
 
+// 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)
@@ -112,9 +118,7 @@ static PyObject* gPyGetRandomFloat(PyObject*)
 	return PyFloat_FromDouble(MT_random());
 }
 
-static PyObject* gPySetGravity(PyObject*,
-										 PyObject* args, 
-										 PyObject*)
+static PyObject* gPySetGravity(PyObject*, PyObject* args)
 {
 	MT_Vector3 vec = MT_Vector3(0., 0., 0.);
 	if (PyVecArgTo(args, vec))
@@ -138,9 +142,7 @@ file to make a full path name (doesn't change during the game, even if you load\
 other .blend).\n\
 The function also converts the directory separator to the local file system format.";
 
-static PyObject* gPyExpandPath(PyObject*,
-								PyObject* args, 
-								PyObject*)
+static PyObject* gPyExpandPath(PyObject*, PyObject* args)
 {
 	char expanded[FILE_MAXDIR + FILE_MAXFILE];
 	char* filename;
@@ -185,9 +187,7 @@ static PyObject* gPyGetSpectrum(PyObject*)
 
 
 
-static PyObject* gPyStartDSP(PyObject*,
-						PyObject* args, 
-						PyObject*)
+static PyObject* gPyStartDSP(PyObject*, PyObject* args)
 {
 	SND_IAudioDevice* audiodevice = SND_DeviceManager::Instance();
 
@@ -205,9 +205,7 @@ static PyObject* gPyStartDSP(PyObject*,
 
 
 
-static PyObject* gPyStopDSP(PyObject*,
-					   PyObject* args, 
-					   PyObject*)
+static PyObject* gPyStopDSP(PyObject*, PyObject* args)
 {
 	SND_IAudioDevice* audiodevice = SND_DeviceManager::Instance();
 
@@ -223,9 +221,7 @@ static PyObject* gPyStopDSP(PyObject*,
 	return NULL;
 }
 
-static PyObject* gPySetLogicTicRate(PyObject*,
-					PyObject* args,
-					PyObject*)
+static PyObject* gPySetLogicTicRate(PyObject*, PyObject* args)
 {
 	float ticrate;
 	if (PyArg_ParseTuple(args, "f", &ticrate))
@@ -242,9 +238,7 @@ static PyObject* gPyGetLogicTicRate(PyObject*)
 	return PyFloat_FromDouble(KX_KetsjiEngine::GetTicRate());
 }
 
-static PyObject* gPySetPhysicsTicRate(PyObject*,
-					PyObject* args,
-					PyObject*)
+static PyObject* gPySetPhysicsTicRate(PyObject*, PyObject* args)
 {
 	float ticrate;
 	if (PyArg_ParseTuple(args, "f", &ticrate))
@@ -257,9 +251,7 @@ static PyObject* gPySetPhysicsTicRate(PyObject*,
 	return NULL;
 }
 
-static PyObject* gPySetPhysicsDebug(PyObject*,
-					PyObject* args,
-					PyObject*)
+static PyObject* gPySetPhysicsDebug(PyObject*, PyObject* args)
 {
 	int debugMode;
 	if (PyArg_ParseTuple(args, "i", &debugMode))
@@ -278,6 +270,44 @@ static PyObject* gPyGetPhysicsTicRate(PyObject*)
 	return PyFloat_FromDouble(PHY_GetActiveEnvironment()->getFixedTimeStep());
 }
 
+static PyObject* gPyGetBlendFileList(PyObject*, PyObject* args)
+{
+	char cpath[sizeof(G.sce)];
+	char *searchpath = NULL;
+	PyObject* list;
+	
+    DIR *dp;
+    struct dirent *dirp;
+	
+	if (!PyArg_ParseTuple(args, "|s", &searchpath))
+		return NULL;
+	
+	list = PyList_New(0);
+	
+	if (searchpath) {
+		BLI_strncpy(cpath, searchpath, FILE_MAXDIR + FILE_MAXFILE);
+		BLI_convertstringcode(cpath, G.sce);
+	} else {
+		/* Get the dir only */
+		BLI_split_dirfile_basic(G.sce, cpath, NULL);
+	}
+	
+    if((dp  = opendir(cpath)) == NULL) {
+		/* todo, show the errno, this shouldnt happen anyway if the blendfile is readable */
+		fprintf(stderr, "Could not read directoty () failed, code %d (%s)\n", cpath, errno, strerror(errno));
+		return list;
+    }
+	
+    while ((dirp = readdir(dp)) != NULL) {
+		if (BLI_testextensie(dirp->d_name, ".blend")) {
+			PyList_Append(list, PyString_FromString(dirp->d_name));
+		}
+    }
+	
+    closedir(dp);
+    return list;
+}
+
 static STR_String gPyGetCurrentScene_doc =  
 "getCurrentScene()\n"
 "Gets a reference to the current scene.\n";
@@ -377,14 +407,13 @@ static struct PyMethodDef game_methods[] = {
 	{"setLogicTicRate", (PyCFunction) gPySetLogicTicRate, METH_VARARGS, "Sets the logic tic rate"},
 	{"getPhysicsTicRate", (PyCFunction) gPyGetPhysicsTicRate, METH_NOARGS, "Gets the physics tic rate"},
 	{"setPhysicsTicRate", (PyCFunction) gPySetPhysicsTicRate, METH_VARARGS, "Sets the physics tic rate"},
+	{"getBlendFileList", (PyCFunction)gPyGetBlendFileList, METH_VARARGS, "Gets a list of blend files in the same directory as the current blend file"},
 	{"PrintGLInfo", (PyCFunction)pyPrintExt, METH_NOARGS, "Prints GL Extension Info"},
 	{NULL, (PyCFunction) NULL, 0, NULL }
 };
 
 
-static PyObject* gPyGetWindowHeight(PyObject*, 
-										 PyObject* args, 
-										 PyObject*)
+static PyObject* gPyGetWindowHeight(PyObject*, PyObject* args)
 {
 	int height = (gp_Canvas ? gp_Canvas->GetHeight() : 0);
 
@@ -394,9 +423,7 @@ static PyObject* gPyGetWindowHeight(PyObject*,
 
 
 
-static PyObject* gPyGetWindowWidth(PyObject*, 
-										 PyObject* args, 
-										 PyObject*)
+static PyObject* gPyGetWindowWidth(PyObject*, PyObject* args)
 {
 		
 
@@ -411,9 +438,7 @@ static PyObject* gPyGetWindowWidth(PyObject*,
 // temporarility visibility thing, will be moved to rasterizer/renderer later
 bool gUseVisibilityTemp = false;
 
-static PyObject* gPyEnableVisibility(PyObject*, 
-										 PyObject* args, 
-										 PyObject*)
+static PyObject* gPyEnableVisibility(PyObject*, PyObject* args)
 {
 	int visible;
 	if (PyArg_ParseTuple(args,"i",&visible))
@@ -429,9 +454,7 @@ static PyObject* gPyEnableVisibility(PyObject*,
 
 
 
-static PyObject* gPyShowMouse(PyObject*, 
-										 PyObject* args, 
-										 PyObject*)
+static PyObject* gPyShowMouse(PyObject*, PyObject* args)
 {
 	int visible;
 	if (PyArg_ParseTuple(args,"i",&visible))
@@ -455,9 +478,7 @@ static PyObject* gPyShowMouse(PyObject*,
 
 
 
-static PyObject* gPySetMousePosition(PyObject*, 
-										 PyObject* args, 
-										 PyObject*)
+static PyObject* gPySetMousePosition(PyObject*, PyObject* args)
 {
 	int x,y;
 	if (PyArg_ParseTuple(args,"ii",&x,&y))
@@ -472,9 +493,7 @@ static PyObject* gPySetMousePosition(PyObject*,
    Py_Return;
 }
 
-static PyObject* gPySetEyeSeparation(PyObject*,
-						PyObject* args,
-						PyObject*)
+static PyObject* gPySetEyeSeparation(PyObject*, PyObject* args)
 {
 	float sep;
 	if (PyArg_ParseTuple(args, "f", &sep))
@@ -496,9 +515,7 @@ static PyObject* gPyGetEyeSeparation(PyObject*, PyObject*, PyObject*)
 	return NULL;
 }
 
-static PyObject* gPySetFocalLength(PyObject*,
-					PyObject* args,
-					PyObject*)
+static PyObject* gPySetFocalLength(PyObject*, PyObject* args)
 {
 	float focus;
 	if (PyArg_ParseTuple(args, "f", &focus))
@@ -518,9 +535,7 @@ static PyObject* gPyGetFocalLength(PyObject*, PyObject*, PyObject*)
 	return NULL;
 }
 
-static PyObject* gPySetBackgroundColor(PyObject*, 
-										 PyObject* args, 
-										 PyObject*)
+static PyObject* gPySetBackgroundColor(PyObject*, PyObject* args)
 {
 	
 	MT_Vector4 vec = MT_Vector4(0., 0., 0.3, 0.);
@@ -538,9 +553,7 @@ static PyObject* gPySetBackgroundColor(PyObject*,
 
 
 
-static PyObject* gPySetMistColor(PyObject*, 
-										 PyObject* args, 
-										 PyObject*)
+static PyObject* gPySetMistColor(PyObject*, PyObject* args)
 {
 	
 	MT_Vector3 vec = MT_Vector3(0., 0., 0.);
@@ -558,9 +571,7 @@ static PyObject* gPySetMistColor(PyObject*,
 
 
 
-static PyObject* gPySetMistStart(PyObject*, 
-										 PyObject* args, 
-										 PyObject*)
+static PyObject* gPySetMistStart(PyObject*, PyObject* args)
 {
 
 	float miststart;
@@ -579,9 +590,7 @@ static PyObject* gPySetMistStart(PyObject*,
 
 
 
-static PyObject* gPySetMistEnd(PyObject*, 
-										 PyObject* args, 
-										 PyObject*)
+static PyObject* gPySetMistEnd(PyObject*, PyObject* args)
 {
 
 	float mistend;
@@ -599,9 +608,7 @@ static PyObject* gPySetMistEnd(PyObject*,
 }
 
 
-static PyObject* gPySetAmbientColor(PyObject*, 
-										 PyObject* args, 
-										 PyObject*)
+static PyObject* gPySetAmbientColor(PyObject*, PyObject* args)
 {
 	
 	MT_Vector3 vec = MT_Vector3(0., 0., 0.);
@@ -620,9 +627,7 @@ static PyObject* gPySetAmbientColor(PyObject*,
 
 
 
-static PyObject* gPyMakeScreenshot(PyObject*,
-									PyObject* args,
-									PyObject*)
+static PyObject* gPyMakeScreenshot(PyObject*, PyObject* args)
 {
 	char* filename;
 	if (PyArg_ParseTuple(args,"s",&filename))
@@ -638,9 +643,7 @@ static PyObject* gPyMakeScreenshot(PyObject*,
 	Py_Return;
 }
 
-static PyObject* gPyEnableMotionBlur(PyObject*,
-									PyObject* args,
-									PyObject*)
+static PyObject* gPyEnableMotionBlur(PyObject*, PyObject* args)
 {
 	float motionblurvalue;
 	if (PyArg_ParseTuple(args,"f",&motionblurvalue))
@@ -656,9 +659,7 @@ static PyObject* gPyEnableMotionBlur(PyObject*,
 	Py_Return;
 }
 
-static PyObject* gPyDisableMotionBlur(PyObject*,
-									PyObject* args,
-									PyObject*)
+static PyObject* gPyDisableMotionBlur(PyObject*, PyObject* args)
 {
 	if(gp_Rasterizer)
 	{
@@ -733,6 +734,10 @@ PyObject* initGameLogic(KX_Scene* scene) // quick hack to get gravity hook
 
 	// Add some symbolic constants to the module
 	d = PyModule_GetDict(m);
+	
+	// can be overwritten later for gameEngine instances that can load new blend files and re-initialize this module
+	// for now its safe to make sure it exists for other areas such as the web plugin
+	PyDict_SetItemString(d, "globalDict", PyDict_New());
 
 	ErrorObject = PyString_FromString("GameLogic.error");
 	PyDict_SetItemString(d, "error", ErrorObject);
@@ -847,13 +852,30 @@ PyObject* initGameLogic(KX_Scene* scene) // quick hack to get gravity hook
 // override builtin functions import() and open()
 
 
-PyObject *KXpy_open(PyObject *self, PyObject *args)
-{
+PyObject *KXpy_open(PyObject *self, PyObject *args) {
 	PyErr_SetString(PyExc_RuntimeError, "Sandbox: open() function disabled!\nGame Scripts should not use this function.");
 	return NULL;
 }
 
+PyObject *KXpy_reload(PyObject *self, PyObject *args) {
+	PyErr_SetString(PyExc_RuntimeError, "Sandbox: reload() function disabled!\nGame Scripts should not use this function.");
+	return NULL;
+}
 
+PyObject *KXpy_file(PyObject *self, PyObject *args) {
+	PyErr_SetString(PyExc_RuntimeError, "Sandbox: file() function disabled!\nGame Scripts should not use this function.");
+	return NULL;
+}
+
+PyObject *KXpy_execfile(PyObject *self, PyObject *args) {
+	PyErr_SetString(PyExc_RuntimeError, "Sandbox: execfile() function disabled!\nGame Scripts should not use this function.");
+	return NULL;
+}
+
+PyObject *KXpy_compile(PyObject *self, PyObject *args) {
+	PyErr_SetString(PyExc_RuntimeError, "Sandbox: compile() function disabled!\nGame Scripts should not use this function.");
+	return NULL;
+}
 
 PyObject *KXpy_import(PyObject *self, PyObject *args)
 {
@@ -890,19 +912,13 @@ PyObject *KXpy_import(PyObject *self, PyObject *args)
 }
 
 
+static PyMethodDef meth_open[] = {{ "open", KXpy_open, METH_VARARGS, "(disabled)"}};
+static PyMethodDef meth_reload[] = {{ "reload", KXpy_reload, METH_VARARGS, "(disabled)"}};
+static PyMethodDef meth_file[] = {{ "file", KXpy_file, METH_VARARGS, "(disabled)"}};
+static PyMethodDef meth_execfile[] = {{ "execfile", KXpy_execfile, METH_VARARGS, "(disabled)"}};
+static PyMethodDef meth_compile[] = {{ "compile", KXpy_compile, METH_VARARGS, "(disabled)"}};
 
-static PyMethodDef meth_open[] = {
-	{ "open", KXpy_open, METH_VARARGS,
-		"(disabled)"}
-};
-
-
-static PyMethodDef meth_import[] = {
-	{ "import", KXpy_import, METH_VARARGS,
-		"our own import"}
-};
-
-
+static PyMethodDef meth_import[] = {{ "import", KXpy_import, METH_VARARGS, "our own import"}};
 
 //static PyObject *g_oldopen = 0;
 //static PyObject *g_oldimport = 0;
@@ -913,15 +929,21 @@ void setSandbox(TPythonSecurityLevel level)
 {
     PyObject *m = PyImport_AddModule("__builtin__");
     PyObject *d = PyModule_GetDict(m);
-	PyObject *meth = PyCFunction_New(meth_open, NULL);
 
 	switch (level) {
 	case psl_Highest:
 		//if (!g_security) {
 			//g_oldopen = PyDict_GetItemString(d, "open");
-			PyDict_SetItemString(d, "open", meth);
-			meth = PyCFunction_New(meth_import, NULL);
-			PyDict_SetItemString(d, "__import__", meth);
+	
+			// functions we cant trust
+			PyDict_SetItemString(d, "open", PyCFunction_New(meth_open, NULL));
+			PyDict_SetItemString(d, "reload", PyCFunction_New(meth_reload, NULL));
+			PyDict_SetItemString(d, "file", PyCFunction_New(meth_file, NULL));
+			PyDict_SetItemString(d, "execfile", PyCFunction_New(meth_execfile, NULL));
+			PyDict_SetItemString(d, "compile", PyCFunction_New(meth_compile, NULL));
+			
+			// our own import
+			PyDict_SetItemString(d, "__import__", PyCFunction_New(meth_import, NULL));
 			//g_security = level;
 		//}
 		break;
@@ -1026,9 +1048,38 @@ static char GameKeys_module_documentation[] =
 "This modules provides defines for key-codes"
 ;
 
+static char gPyEventToString_doc[] =
+"Take a valid event from the GameKeys module or Keyboard Sensor and return a name"
+;
 
+static PyObject* gPyEventToString(PyObject*, PyObject* value)
+{
+	PyObject* mod, *dict, *key, *val, *ret = NULL;
+	Py_ssize_t pos = 0;
+	
+	mod = PyImport_ImportModule( "GameKeys" );
+	if (!mod)
+		return NULL;
+	
+	dict = PyModule_GetDict(mod);
+	
+	while (PyDict_Next(dict, &pos, &key, &val)) {
+		if (PyObject_Compare(value, val)==0) {
+			ret = key;
+			break;
+		}
+	}
+	
+	PyErr_Clear(); // incase there was an error clearing
+	Py_DECREF(mod);
+	if (!ret)	PyErr_SetString(PyExc_ValueError, "expected a valid int keyboard event");
+	else		Py_INCREF(ret);
+	
+	return ret;
+}
 
 static struct PyMethodDef gamekeys_methods[] = {
+	{"EventToString", (PyCFunction)gPyEventToString, METH_O, gPyEventToString_doc},
 	{ NULL, (PyCFunction) NULL, 0, NULL }
 };
 
diff --git a/source/gameengine/Ketsji/KX_RayCast.cpp b/source/gameengine/Ketsji/KX_RayCast.cpp
index 89e2d645d54..974d4b992a6 100644
--- a/source/gameengine/Ketsji/KX_RayCast.cpp
+++ b/source/gameengine/Ketsji/KX_RayCast.cpp
@@ -40,7 +40,21 @@
 #include "PHY_IPhysicsEnvironment.h"
 #include "PHY_IPhysicsController.h"
 
-bool KX_RayCast::RayTest(KX_IPhysicsController* ignore_controller, PHY_IPhysicsEnvironment* physics_environment, const MT_Point3& _frompoint, const MT_Point3& topoint, MT_Point3& result_point, MT_Vector3& result_normal, const KX_RayCast& callback)
+KX_RayCast::KX_RayCast(KX_IPhysicsController* ignoreController, bool faceNormal)
+	:PHY_IRayCastFilterCallback(dynamic_cast<PHY_IPhysicsController*>(ignoreController), faceNormal) 
+{
+}
+
+void KX_RayCast::reportHit(PHY_RayCastResult* result)
+{
+	m_hitFound = true;
+	m_hitPoint.setValue((const float*)result->m_hitPoint);
+	m_hitNormal.setValue((const float*)result->m_hitNormal);
+	m_hitMesh = result->m_meshObject;
+	m_hitPolygon = result->m_polygon;
+}
+
+bool KX_RayCast::RayTest(PHY_IPhysicsEnvironment* physics_environment, const MT_Point3& _frompoint, const MT_Point3& topoint, KX_RayCast& callback)
 {
 	// Loops over all physics objects between frompoint and topoint,
 	// calling callback.RayHit for each one.
@@ -50,58 +64,51 @@ bool KX_RayCast::RayTest(KX_IPhysicsController* ignore_controller, PHY_IPhysicsE
 	// returns true if an object was found, false if not.
 	MT_Point3 frompoint(_frompoint);
 	const MT_Vector3 todir( (topoint - frompoint).safe_normalized() );
+	MT_Point3 prevpoint(_frompoint+todir*(-1.f));
 	
 	PHY_IPhysicsController* hit_controller;
-	PHY__Vector3 phy_pos;
-	PHY__Vector3 phy_normal;
 
-	while((hit_controller = physics_environment->rayTest(dynamic_cast<PHY_IPhysicsController*>(ignore_controller),
+	while((hit_controller = physics_environment->rayTest(callback,
 			frompoint.x(),frompoint.y(),frompoint.z(),
-			topoint.x(),topoint.y(),topoint.z(),
-			phy_pos[0],phy_pos[1],phy_pos[2],
-			phy_normal[0],phy_normal[1],phy_normal[2]))) 
+			topoint.x(),topoint.y(),topoint.z())) != NULL) 
 	{
-		result_point = MT_Point3(phy_pos);
-		result_normal = MT_Vector3(phy_normal);
 		KX_ClientObjectInfo* info = static_cast<KX_ClientObjectInfo*>(hit_controller->getNewClientInfo());
 		
 		if (!info)
 		{
 			printf("no info!\n");
 			MT_assert(info && "Physics controller with no client object info");
-			return false;
+			break;
 		}
 		
-		if (callback.RayHit(info, result_point, result_normal))
-			return true;
-	
-		// There is a bug in the code below: the delta is computed with the wrong
-		// sign on the face opposite to the center, resulting in infinite looping.
-		// In Blender 2.45 this code was never executed because callback.RayHit() always 
-		// returned true, causing the ray sensor to stop on the first object.
-		// To avoid changing the behaviour will simply return false here.
-		// It should be discussed if we want the ray sensor to "see" through objects
-		// that don't have the required property/material (condition to get here)
-		return false;
-	
-		// skip past the object and keep tracing
-		/* We add 0.01 of fudge, so that if the margin && radius == 0., we don't endless loop. */
-		MT_Scalar marg = 0.01 + hit_controller->GetMargin();
-		marg += 2.f * hit_controller->GetMargin();
+		// The biggest danger to to endless loop, prevent this by checking that the
+		// hit point always progresses along the ray direction..
+		prevpoint -= callback.m_hitPoint;
+		if (prevpoint.length2() < MT_EPSILON)
+			break;
+
+		if (callback.RayHit(info))
+			// caller may decide to stop the loop and still cancel the hit
+			return callback.m_hitFound;
+
+		// Skip past the object and keep tracing.
+		// Note that retrieving in a single shot multiple hit points would be possible 
+		// but it would require some change in Bullet.
+		prevpoint = callback.m_hitPoint;
+		/* We add 0.001 of fudge, so that if the margin && radius == 0., we don't endless loop. */
+		MT_Scalar marg = 0.001 + hit_controller->GetMargin();
+		marg *= 2.f;
 		/* Calculate the other side of this object */
-		PHY__Vector3 hitpos;
-		hit_controller->getPosition(hitpos);
-		MT_Point3 hitObjPos(hitpos);
-		
-		MT_Vector3 hitvector = hitObjPos - result_point;
-		if (hitvector.dot(hitvector) > MT_EPSILON)
-		{
-			hitvector.normalize();
-			marg *= 2.*todir.dot(hitvector);
-		}
-		frompoint = result_point + marg * todir;
+		MT_Scalar h = MT_abs(todir.dot(callback.m_hitNormal));
+		if (h <= 0.01)
+			// the normal is almost orthogonal to the ray direction, cannot compute the other side
+			break;
+		marg /= h; 
+		frompoint = callback.m_hitPoint + marg * todir;
+		// verify that we are not passed the to point
+		if ((topoint - frompoint).dot(todir) < 0.f)
+			break;
 	}
-	
-	return hit_controller;
+	return false;
 }
 
diff --git a/source/gameengine/Ketsji/KX_RayCast.h b/source/gameengine/Ketsji/KX_RayCast.h
index 607dabd8afc..c3084c997a1 100644
--- a/source/gameengine/Ketsji/KX_RayCast.h
+++ b/source/gameengine/Ketsji/KX_RayCast.h
@@ -30,12 +30,14 @@
 #ifndef __KX_RAYCAST_H__
 #define __KX_RAYCAST_H__
 
-class MT_Point3;
-class MT_Vector3;
-class KX_IPhysicsController;
-class PHY_IPhysicsEnvironment;
+#include "PHY_IPhysicsEnvironment.h"
+#include "PHY_IPhysicsController.h"
+#include "MT_Point3.h"
+#include "MT_Vector3.h"
 
+class RAS_MeshObject; 
 struct KX_ClientObjectInfo;
+class KX_IPhysicsController;
 
 /**
  *  Defines a function for doing a ray cast.
@@ -49,17 +51,27 @@ struct KX_ClientObjectInfo;
  *
  *  Returns true if a client was accepted, false if nothing found.
  */
-class KX_RayCast
+class KX_RayCast : public PHY_IRayCastFilterCallback
 {
-protected:
-	KX_RayCast() {};
 public:
+	bool					m_hitFound;
+	MT_Point3				m_hitPoint;
+	MT_Vector3				m_hitNormal;
+	const RAS_MeshObject*	m_hitMesh;
+	int						m_hitPolygon;
+
+	KX_RayCast(KX_IPhysicsController* ignoreController, bool faceNormal);
 	virtual ~KX_RayCast() {}
 
+	/**
+	 * The physic environment returns the ray casting result through this function
+	 */
+	virtual void reportHit(PHY_RayCastResult* result);
+
 	/** ray test callback.
 	 *  either override this in your class, or use a callback wrapper.
 	 */
-	virtual bool RayHit(KX_ClientObjectInfo* client, MT_Point3& hit_point, MT_Vector3& hit_normal) const = 0;
+	virtual bool RayHit(KX_ClientObjectInfo* client) = 0;
 
 	/** 
 	 *  Callback wrapper.
@@ -71,13 +83,11 @@ public:
 	
 	/// Public interface.
 	/// Implement bool RayHit in your class to receive ray callbacks.
-	static bool RayTest(KX_IPhysicsController* physics_controller, 
+	static bool RayTest(
 		PHY_IPhysicsEnvironment* physics_environment, 
-		const MT_Point3& _frompoint, 
+		const MT_Point3& frompoint, 
 		const MT_Point3& topoint, 
-		MT_Point3& result_point, 
-		MT_Vector3& result_normal, 
-		const KX_RayCast& callback);
+		KX_RayCast& callback);
 	
 };
 
@@ -86,18 +96,32 @@ template<class T> class KX_RayCast::Callback : public KX_RayCast
 	T *self;
 	void *data;
 public:
-	Callback(T *_self, void *_data = NULL)
-		: self(_self),
+	Callback(T *_self, KX_IPhysicsController* controller=NULL, void *_data = NULL, bool faceNormal=false)
+		: KX_RayCast(controller, faceNormal),
+		self(_self),
 		data(_data)
 	{
 	}
 	
 	~Callback() {}
-	
-	virtual bool RayHit(KX_ClientObjectInfo* client, MT_Point3& hit_point, MT_Vector3& hit_normal) const
+
+	virtual bool RayHit(KX_ClientObjectInfo* client)
 	{
-		return self->RayHit(client, hit_point, hit_normal, data);
+		return self->RayHit(client, this, data);
 	}
+
+	virtual	bool needBroadphaseRayCast(PHY_IPhysicsController* controller)
+	{
+		KX_ClientObjectInfo* info = static_cast<KX_ClientObjectInfo*>(controller->getNewClientInfo());
+		
+		if (!info)
+		{
+			MT_assert(info && "Physics controller with no client object info");
+			return false;
+		}
+		return self->NeedRayCast(info);
+	}
+
 };
 	
 
diff --git a/source/gameengine/Ketsji/KX_RaySensor.cpp b/source/gameengine/Ketsji/KX_RaySensor.cpp
index a416c8c9f89..8dc22fe13c1 100644
--- a/source/gameengine/Ketsji/KX_RaySensor.cpp
+++ b/source/gameengine/Ketsji/KX_RaySensor.cpp
@@ -51,6 +51,7 @@ KX_RaySensor::KX_RaySensor(class SCA_EventManager* eventmgr,
 					SCA_IObject* gameobj,
 					const STR_String& propname,
 					bool bFindMaterial,
+					bool bXRay,
 					double distance,
 					int axis,
 					KX_Scene* ketsjiScene,
@@ -58,6 +59,7 @@ KX_RaySensor::KX_RaySensor(class SCA_EventManager* eventmgr,
 			: SCA_ISensor(gameobj,eventmgr, T),
 					m_propertyname(propname),
 					m_bFindMaterial(bFindMaterial),
+					m_bXRay(bXRay),
 					m_distance(distance),
 					m_scene(ketsjiScene),
 					m_axis(axis)
@@ -104,16 +106,10 @@ bool KX_RaySensor::IsPositiveTrigger()
 	return result;
 }
 
-bool KX_RaySensor::RayHit(KX_ClientObjectInfo* client, MT_Point3& hit_point, MT_Vector3& hit_normal, void * const data)
+bool KX_RaySensor::RayHit(KX_ClientObjectInfo* client, KX_RayCast* result, void * const data)
 {
 
 	KX_GameObject* hitKXObj = client->m_gameobject;
-	
-	if (client->m_type > KX_ClientObjectInfo::ACTOR)
-	{
-		// false hit
-		return false;
-	}
 	bool bFound = false;
 
 	if (m_propertyname.Length() == 0)
@@ -139,16 +135,43 @@ bool KX_RaySensor::RayHit(KX_ClientObjectInfo* client, MT_Point3& hit_point, MT_
 	{
 		m_rayHit = true;
 		m_hitObject = hitKXObj;
-		m_hitPosition = hit_point;
-		m_hitNormal = hit_normal;
+		m_hitPosition = result->m_hitPoint;
+		m_hitNormal = result->m_hitNormal;
 			
 	}
-
-	return bFound;
-	
+	// no multi-hit search yet
+	return true;
 }
 
-
+/* this function is used to pre-filter the object before casting the ray on them.
+   This is useful for "X-Ray" option when we want to see "through" unwanted object.
+ */
+bool KX_RaySensor::NeedRayCast(KX_ClientObjectInfo* client)
+{
+	if (client->m_type > KX_ClientObjectInfo::ACTOR)
+	{
+		// Unknown type of object, skip it.
+		// Should not occur as the sensor objects are filtered in RayTest()
+		printf("Invalid client type %d found ray casting\n", client->m_type);
+		return false;
+	}
+	if (m_bXRay && m_propertyname.Length() != 0)
+	{
+		if (m_bFindMaterial)
+		{
+			// not quite correct: an object may have multiple material
+			// should check all the material and not only the first one
+			if (!client->m_auxilary_info || (m_propertyname != ((char*)client->m_auxilary_info)))
+				return false;
+		}
+		else
+		{
+			if (client->m_gameobject->GetProperty(m_propertyname) == NULL)
+				return false;
+		}
+	}
+	return true;
+}
 
 bool KX_RaySensor::Evaluate(CValue* event)
 {
@@ -215,8 +238,6 @@ bool KX_RaySensor::Evaluate(CValue* event)
 	m_rayDirection = todir;
 
 	MT_Point3 topoint = frompoint + (m_distance) * todir;
-	MT_Point3 resultpoint;
-	MT_Vector3 resultnormal;
 	PHY_IPhysicsEnvironment* pe = m_scene->GetPhysicsEnvironment();
 
 	if (!pe)
@@ -238,7 +259,8 @@ bool KX_RaySensor::Evaluate(CValue* event)
 	PHY_IPhysicsEnvironment* physics_environment = this->m_scene->GetPhysicsEnvironment();
 	
 
-	result = KX_RayCast::RayTest(spc, physics_environment, frompoint, topoint, resultpoint, resultnormal, KX_RayCast::Callback<KX_RaySensor>(this));
+	KX_RayCast::Callback<KX_RaySensor> callback(this, spc);
+	KX_RayCast::RayTest(physics_environment, frompoint, topoint, callback);
 
 	/* now pass this result to some controller */
 
@@ -265,6 +287,10 @@ bool KX_RaySensor::Evaluate(CValue* event)
 			// notify logicsystem that ray JUST left the Object
 			result = true;
 		}
+		else
+		{
+			result = false;
+		}
 	
       }
     if (reset)
diff --git a/source/gameengine/Ketsji/KX_RaySensor.h b/source/gameengine/Ketsji/KX_RaySensor.h
index f4305b053d1..02a755fedc1 100644
--- a/source/gameengine/Ketsji/KX_RaySensor.h
+++ b/source/gameengine/Ketsji/KX_RaySensor.h
@@ -36,12 +36,14 @@
 #include "MT_Point3.h"
 
 struct KX_ClientObjectInfo;
+class KX_RayCast;
 
 class KX_RaySensor : public SCA_ISensor
 {
 	Py_Header;
 	STR_String		m_propertyname;
 	bool			m_bFindMaterial;
+	bool			m_bXRay;
 	double			m_distance;
 	class KX_Scene* m_scene;
 	bool			m_bTriggered;
@@ -56,7 +58,8 @@ public:
 	KX_RaySensor(class SCA_EventManager* eventmgr,
 					SCA_IObject* gameobj,
 					const STR_String& propname,
-					bool fFindMaterial,
+					bool bFindMaterial,
+					bool bXRay,
 					double distance,
 					int axis,
 					class KX_Scene* ketsjiScene,
@@ -68,7 +71,8 @@ public:
 	virtual bool IsPositiveTrigger();
 	virtual void Init();
 
-	bool RayHit(KX_ClientObjectInfo* client, MT_Point3& hit_point, MT_Vector3& hit_normal, void * const data);
+	bool RayHit(KX_ClientObjectInfo* client, KX_RayCast* result, void * const data);
+	bool NeedRayCast(KX_ClientObjectInfo* client);
 	
 	KX_PYMETHOD_DOC(KX_RaySensor,GetHitObject);
 	KX_PYMETHOD_DOC(KX_RaySensor,GetHitPosition);
diff --git a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
index ca0106d64d9..a7330b9a20a 100644
--- a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
+++ b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
@@ -52,14 +52,20 @@ KX_SCA_AddObjectActuator::KX_SCA_AddObjectActuator(SCA_IObject *gameobj,
 												   int time,
 												   SCA_IScene* scene,
 												   const MT_Vector3& linvel,
-												   bool local,
+												   bool linv_local,
+												   const MT_Vector3& angvel,
+												   bool angv_local,
 												   PyTypeObject* T)
 	: 
 	SCA_IActuator(gameobj, T),
 	m_OriginalObject(original),
 	m_scene(scene),
+	
 	m_linear_velocity(linvel),
-	m_localFlag(local)
+	m_localLinvFlag(linv_local),
+	
+	m_angular_velocity(angvel),
+	m_localAngvFlag(angv_local)
 {
 	if (m_OriginalObject)
 		m_OriginalObject->RegisterActuator(this);
@@ -181,13 +187,15 @@ PyParentObject KX_SCA_AddObjectActuator::Parents[] = {
 };
 PyMethodDef KX_SCA_AddObjectActuator::Methods[] = {
   {"setObject", (PyCFunction) KX_SCA_AddObjectActuator::sPySetObject, METH_O, SetObject_doc},
-  {"setTime", (PyCFunction) KX_SCA_AddObjectActuator::sPySetTime, METH_VARARGS, SetTime_doc},
+  {"setTime", (PyCFunction) KX_SCA_AddObjectActuator::sPySetTime, METH_O, SetTime_doc},
   {"getObject", (PyCFunction) KX_SCA_AddObjectActuator::sPyGetObject, METH_VARARGS, GetObject_doc},
-  {"getTime", (PyCFunction) KX_SCA_AddObjectActuator::sPyGetTime, METH_VARARGS, GetTime_doc},
-  {"getLinearVelocity", (PyCFunction) KX_SCA_AddObjectActuator::sPyGetLinearVelocity, METH_VARARGS, GetLinearVelocity_doc},
+  {"getTime", (PyCFunction) KX_SCA_AddObjectActuator::sPyGetTime, METH_NOARGS, GetTime_doc},
+  {"getLinearVelocity", (PyCFunction) KX_SCA_AddObjectActuator::sPyGetLinearVelocity, METH_NOARGS, GetLinearVelocity_doc},
   {"setLinearVelocity", (PyCFunction) KX_SCA_AddObjectActuator::sPySetLinearVelocity, METH_VARARGS, SetLinearVelocity_doc},
-  {"getLastCreatedObject", (PyCFunction) KX_SCA_AddObjectActuator::sPyGetLastCreatedObject, METH_VARARGS,"getLastCreatedObject() : get the object handle to the last created object\n"},
-  {"instantAddObject", (PyCFunction) KX_SCA_AddObjectActuator::sPyInstantAddObject, METH_VARARGS,"instantAddObject() : immediately add object without delay\n"},
+  {"getAngularVelocity", (PyCFunction) KX_SCA_AddObjectActuator::sPyGetAngularVelocity, METH_NOARGS, GetAngularVelocity_doc},
+  {"setAngularVelocity", (PyCFunction) KX_SCA_AddObjectActuator::sPySetAngularVelocity, METH_VARARGS, 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"},
   
   {NULL,NULL} //Sentinel
 };
@@ -231,19 +239,18 @@ char KX_SCA_AddObjectActuator::SetTime_doc[] =
 "\tIf the duration is negative, it is set to 0.\n";
 
 
-PyObject* KX_SCA_AddObjectActuator::PySetTime(PyObject* self,
-											  PyObject* args,
-											  PyObject* kwds)
+PyObject* KX_SCA_AddObjectActuator::PySetTime(PyObject* self, PyObject* value)
 {
-	int deltatime;
-	
-	if (!PyArg_ParseTuple(args, "i", &deltatime))
+	int deltatime = PyInt_AsLong(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;
+	Py_RETURN_NONE;
 }
 
 
@@ -254,9 +261,7 @@ char KX_SCA_AddObjectActuator::GetTime_doc[] =
 "\tReturns the lifetime of the object that will be added.\n";
 
 
-PyObject* KX_SCA_AddObjectActuator::PyGetTime(PyObject* self,
-											  PyObject* args,
-											  PyObject* kwds)
+PyObject* KX_SCA_AddObjectActuator::PyGetTime(PyObject* self)
 {
 	return PyInt_FromLong(m_timeProp);
 }
@@ -290,17 +295,13 @@ char KX_SCA_AddObjectActuator::GetLinearVelocity_doc[] =
 "\tReturns the linear velocity that will be assigned to \n"
 "\tthe created object.\n";
 
-
-
-PyObject* KX_SCA_AddObjectActuator::PyGetLinearVelocity(PyObject* self,
-														PyObject* args,
-														PyObject* kwds)
+PyObject* KX_SCA_AddObjectActuator::PyGetLinearVelocity(PyObject* self)
 {
 	PyObject *retVal = PyList_New(3);
 
-	PyList_SetItem(retVal, 0, PyFloat_FromDouble(m_linear_velocity[0]));
-	PyList_SetItem(retVal, 1, PyFloat_FromDouble(m_linear_velocity[1]));
-	PyList_SetItem(retVal, 2, PyFloat_FromDouble(m_linear_velocity[2]));
+	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;
 }
@@ -313,12 +314,10 @@ char KX_SCA_AddObjectActuator::SetLinearVelocity_doc[] =
 "\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* self,
-														PyObject* args,
-														PyObject* kwds)
+PyObject* KX_SCA_AddObjectActuator::PySetLinearVelocity(PyObject* self, PyObject* args)
 {
 	
 	float vecArg[3];
@@ -326,7 +325,46 @@ PyObject* KX_SCA_AddObjectActuator::PySetLinearVelocity(PyObject* self,
 		return NULL;
 
 	m_linear_velocity.setValue(vecArg);
-	Py_Return;
+	Py_RETURN_NONE;
+}
+
+/* 7. getAngularVelocity */
+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(PyObject* self)
+{
+	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                                                 */
+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* self, PyObject* args)
+{
+	
+	float vecArg[3];
+	if (!PyArg_ParseTuple(args, "fff", &vecArg[0], &vecArg[1], &vecArg[2]))
+		return NULL;
+
+	m_angular_velocity.setValue(vecArg);
+	Py_RETURN_NONE;
 }
 
 void	KX_SCA_AddObjectActuator::InstantAddObject()
@@ -337,8 +375,9 @@ void	KX_SCA_AddObjectActuator::InstantAddObject()
 		// Now it needs to be added to the current scene.
 		SCA_IObject* replica = m_scene->AddReplicaObject(m_OriginalObject,GetParent(),m_timeProp );
 		KX_GameObject * game_obj = static_cast<KX_GameObject *>(replica);
-		game_obj->setLinearVelocity(m_linear_velocity,m_localFlag);
-		game_obj->ResolveCombinedVelocities(m_linear_velocity, MT_Vector3(0., 0., 0.), m_localFlag, false);
+		game_obj->setLinearVelocity(m_linear_velocity,m_localLinvFlag);
+		game_obj->setAngularVelocity(m_angular_velocity,m_localAngvFlag);
+		game_obj->ResolveCombinedVelocities(m_linear_velocity, m_angular_velocity, m_localLinvFlag, m_localAngvFlag);
 
 		// keep a copy of the last object, to allow python scripters to change it
 		if (m_lastCreatedObject)
@@ -355,13 +394,11 @@ void	KX_SCA_AddObjectActuator::InstantAddObject()
 	}
 }
 
-PyObject* KX_SCA_AddObjectActuator::PyInstantAddObject(PyObject* self,
-														   PyObject* args,
-														   PyObject* kwds)
+PyObject* KX_SCA_AddObjectActuator::PyInstantAddObject(PyObject* self)
 {
 	InstantAddObject();
 
-	Py_Return;
+	Py_RETURN_NONE;
 }
 
 
@@ -372,16 +409,17 @@ char KX_SCA_AddObjectActuator::GetLastCreatedObject_doc[] =
 "\tReturn the last created object. \n";
 
 
-PyObject* KX_SCA_AddObjectActuator::PyGetLastCreatedObject(PyObject* self,
-														   PyObject* args,
-														   PyObject* kwds)
+PyObject* KX_SCA_AddObjectActuator::PyGetLastCreatedObject(PyObject* self)
 {
 	SCA_IObject* result = this->GetLastCreatedObject();
-	if (result)
+	
+	// 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()) 
 	{
 		result->AddRef();
 		return result;
 	}
 	// don't return NULL to python anymore, it gives trouble in the scripts
-	Py_Return;
+	Py_RETURN_NONE;
 }
diff --git a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
index e7fdb2fbfbc..278d4180284 100644
--- a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
+++ b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
@@ -60,9 +60,13 @@ class KX_SCA_AddObjectActuator : public SCA_IActuator
 
 	/// Linear velocity upon creation of the object. 
 	MT_Vector3  m_linear_velocity;
+	
+	/// Angular velocity upon creation of the object. 
+	MT_Vector3  m_angular_velocity;
 
 	/// Apply the velocity locally 
-	bool m_localFlag;
+	bool m_localLinvFlag;
+	bool m_localAngvFlag;
 	
 	SCA_IObject*	m_lastCreatedObject;
 	
@@ -79,7 +83,9 @@ public:
 		int time,
 		SCA_IScene* scene,
 		const MT_Vector3& linvel,
-		bool local,
+		bool linv_local,
+		const MT_Vector3& angvel,
+		bool angv_local,
 		PyTypeObject* T=&Type
 	);
 
@@ -115,19 +121,23 @@ public:
 	/* 1. setObject */
 	KX_PYMETHOD_DOC_O(KX_SCA_AddObjectActuator,SetObject);
 	/* 2. setTime */
-	KX_PYMETHOD_DOC(KX_SCA_AddObjectActuator,SetTime);
+	KX_PYMETHOD_DOC_O(KX_SCA_AddObjectActuator,SetTime);
 	/* 3. getTime */
-	KX_PYMETHOD_DOC(KX_SCA_AddObjectActuator,GetTime);
+	KX_PYMETHOD_DOC_NOARGS(KX_SCA_AddObjectActuator,GetTime);
 	/* 4. getObject */
 	KX_PYMETHOD_DOC_VARARGS(KX_SCA_AddObjectActuator,GetObject);
 	/* 5. getLinearVelocity */
-	KX_PYMETHOD_DOC(KX_SCA_AddObjectActuator,GetLinearVelocity);
+	KX_PYMETHOD_DOC_NOARGS(KX_SCA_AddObjectActuator,GetLinearVelocity);
 	/* 6. setLinearVelocity */
-	KX_PYMETHOD_DOC(KX_SCA_AddObjectActuator,SetLinearVelocity);
-	/* 7. getLastCreatedObject */
-	KX_PYMETHOD_DOC(KX_SCA_AddObjectActuator,GetLastCreatedObject);
-	/* 8. instantAddObject*/
-	KX_PYMETHOD_DOC(KX_SCA_AddObjectActuator,InstantAddObject);
+	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);
 
 	
 }; /* end of class KX_SCA_AddObjectActuator : public KX_EditObjectActuator */
diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp
index 2828663c63d..1c37fcea77e 100644
--- a/source/gameengine/Ketsji/KX_Scene.cpp
+++ b/source/gameengine/Ketsji/KX_Scene.cpp
@@ -234,40 +234,9 @@ KX_Scene::~KX_Scene()
 	{
 		delete m_bucketmanager;
 	}
-#ifdef USE_BULLET
-	// This is a fix for memory leaks in bullet: the collision shapes is not destroyed 
-	// when the physical controllers are destroyed. The reason is that shapes are shared
-	// between replicas of an object. There is no reference count in Bullet so the
-	// only workaround that does not involve changes in Bullet is to save in this array
-	// the list of shapes that are created when the scene is created (see KX_ConvertPhysicsObjects.cpp)
-	class btCollisionShape* shape;
-	class btTriangleMeshShape* meshShape;
-	vector<class btCollisionShape*>::iterator it = m_shapes.begin();
-	while (it != m_shapes.end()) {
-		shape = *it;
-		if (shape->getShapeType() == TRIANGLE_MESH_SHAPE_PROXYTYPE)
-		{
-			meshShape = static_cast<btTriangleMeshShape*>(shape);
-			// shapes based on meshes use an interface that contains the vertices.
-			// Again the idea is to be able to share the interface between shapes but
-			// this is not used in Blender: each base object will have its own interface 
-			btStridingMeshInterface* meshInterface = meshShape->getMeshInterface();
-			if (meshInterface)
-				delete meshInterface;
-		}
-		delete shape;
-		it++;
-	}
-#endif
 	//Py_DECREF(m_attrlist);
 }
 
-void KX_Scene::AddShape(class btCollisionShape*shape)
-{
-	m_shapes.push_back(shape);
-}
-
-
 void KX_Scene::SetProjectionMatrix(MT_CmMatrix4x4& pmat)
 {
 	m_projectionmat = pmat;
@@ -975,6 +944,8 @@ int KX_Scene::NewRemoveObject(class CValue* gameobj)
 	
 	newobj->RemoveMeshes();
 	ret = 1;
+	if (m_lightlist->RemoveValue(newobj)) // TODO - use newobj->IsLight() test when its merged in from apricot. - Campbell
+		ret = newobj->Release();
 	if (m_objectlist->RemoveValue(newobj))
 		ret = newobj->Release();
 	if (m_tempObjectList->RemoveValue(newobj))
diff --git a/source/gameengine/Ketsji/KX_Scene.h b/source/gameengine/Ketsji/KX_Scene.h
index 80a2abe287a..1c56dd1ee55 100644
--- a/source/gameengine/Ketsji/KX_Scene.h
+++ b/source/gameengine/Ketsji/KX_Scene.h
@@ -121,11 +121,6 @@ protected:
 	 * The set of cameras for this scene
 	 */
 	list<class KX_Camera*>       m_cameras;
-	/**
-	 * The set of bullet shapes that must be deleted at the end of the scene
-	 * to avoid memory leak (not deleted by bullet because shape are shared between replicas)
-	 */
-	vector<class btCollisionShape*> m_shapes;
 	/**
 	 * Various SCA managers used by the scene
 	 */
@@ -322,7 +317,6 @@ public:
 	int NewRemoveObject(CValue* gameobj);
 	void ReplaceMesh(CValue* gameobj,
 					 void* meshobj);
-	void AddShape(class btCollisionShape* shape);
 	/**
 	 * @section Logic stuff
 	 * Initiate an update of the logic system.
diff --git a/source/gameengine/Ketsji/KX_SoundActuator.cpp b/source/gameengine/Ketsji/KX_SoundActuator.cpp
index 34a3baec093..f75a1ee5c62 100644
--- a/source/gameengine/Ketsji/KX_SoundActuator.cpp
+++ b/source/gameengine/Ketsji/KX_SoundActuator.cpp
@@ -69,11 +69,11 @@ KX_SoundActuator::KX_SoundActuator(SCA_IObject* gameobj,
 
 KX_SoundActuator::~KX_SoundActuator()
 {
-	//m_soundScene->RemoveObject(this->m_soundObject);
-	//(this->m_soundObject)->DeleteWhenFinished();
-	m_soundScene->RemoveActiveObject(m_soundObject);
-//	m_soundScene->DeleteObjectWhenFinished(m_soundObject);
-	m_soundScene->DeleteObject(m_soundObject);
+	if (m_soundObject)
+	{
+		m_soundScene->RemoveActiveObject(m_soundObject);
+		m_soundScene->DeleteObject(m_soundObject);
+	}
 }
 
 
@@ -82,9 +82,12 @@ CValue* KX_SoundActuator::GetReplica()
 {
 	KX_SoundActuator* replica = new KX_SoundActuator(*this);
 	replica->ProcessReplica();
-	SND_SoundObject* soundobj = new SND_SoundObject(*m_soundObject);
-	replica->setSoundObject(soundobj);
-	m_soundScene->AddObject(soundobj);
+	if (m_soundObject)
+	{
+	    SND_SoundObject* soundobj = new SND_SoundObject(*m_soundObject);
+		replica->setSoundObject(soundobj);
+		m_soundScene->AddObject(soundobj);
+	}
 	
 	// this will copy properties and so on...
 	CValue::AddDataToReplica(replica);
@@ -104,6 +107,9 @@ bool KX_SoundActuator::Update(double curtime, bool frame)
 
 	RemoveAllEvents();
 
+	if (!m_soundObject)
+		return false;
+
 	if (m_pino)
 	{
 		bNegativeEvent = true;
@@ -287,6 +293,10 @@ PyObject* KX_SoundActuator::PySetFilename(PyObject* self, PyObject* args, PyObje
 
 PyObject* KX_SoundActuator::PyGetFilename(PyObject* self, PyObject* args, PyObject* kwds)
 {
+	if (!m_soundObject)
+	{
+		return PyString_FromString("");
+	}
 	STR_String objectname = m_soundObject->GetObjectName();
 	char* name = objectname.Ptr();
 	
@@ -301,7 +311,8 @@ PyObject* KX_SoundActuator::PyGetFilename(PyObject* self, PyObject* args, PyObje
 
 PyObject* KX_SoundActuator::PyStartSound(PyObject* self, PyObject* args, PyObject* kwds)
 {
-	m_soundObject->StartSound();	
+	if (m_soundObject)
+		m_soundObject->StartSound();	
 	Py_Return;
 }         
 
@@ -309,7 +320,8 @@ PyObject* KX_SoundActuator::PyStartSound(PyObject* self, PyObject* args, PyObjec
 
 PyObject* KX_SoundActuator::PyPauseSound(PyObject* self, PyObject* args, PyObject* kwds)
 {
-	m_soundObject->PauseSound();	
+	if (m_soundObject)
+		m_soundObject->PauseSound();	
 	Py_Return;
 } 
 
@@ -317,7 +329,8 @@ PyObject* KX_SoundActuator::PyPauseSound(PyObject* self, PyObject* args, PyObjec
 
 PyObject* KX_SoundActuator::PyStopSound(PyObject* self, PyObject* args, PyObject* kwds)
 {
-	m_soundObject->StopSound();	
+	if (m_soundObject)
+		m_soundObject->StopSound();	
 	Py_Return;
 }
 
@@ -329,7 +342,8 @@ PyObject* KX_SoundActuator::PySetGain(PyObject* self, PyObject* args, PyObject*
 	if (!PyArg_ParseTuple(args, "f", &gain))
 		return NULL;
 	
-	m_soundObject->SetGain(gain);
+	if (m_soundObject)
+		m_soundObject->SetGain(gain);
 	
 	Py_Return;
 }         
@@ -338,7 +352,7 @@ PyObject* KX_SoundActuator::PySetGain(PyObject* self, PyObject* args, PyObject*
 
 PyObject* KX_SoundActuator::PyGetGain(PyObject* self, PyObject* args, PyObject* kwds)
 {
-	float gain = m_soundObject->GetGain();
+	float gain = (m_soundObject) ? m_soundObject->GetGain() : 1.0f;
 	PyObject* result = PyFloat_FromDouble(gain);
 	
 	return result;
@@ -352,7 +366,8 @@ PyObject* KX_SoundActuator::PySetPitch(PyObject* self, PyObject* args, PyObject*
 	if (!PyArg_ParseTuple(args, "f", &pitch))
 		return NULL;
 	
-	m_soundObject->SetPitch(pitch);
+	if (m_soundObject)
+		m_soundObject->SetPitch(pitch);
 	
 	Py_Return;
 }         
@@ -361,7 +376,7 @@ PyObject* KX_SoundActuator::PySetPitch(PyObject* self, PyObject* args, PyObject*
 
 PyObject* KX_SoundActuator::PyGetPitch(PyObject* self, PyObject* args, PyObject* kwds)
 {
-	float pitch = m_soundObject->GetPitch();
+	float pitch = (m_soundObject) ? m_soundObject->GetPitch() : 1.0;
 	PyObject* result = PyFloat_FromDouble(pitch);
 	
 	return result;
@@ -375,7 +390,8 @@ PyObject* KX_SoundActuator::PySetRollOffFactor(PyObject* self, PyObject* args, P
 	if (!PyArg_ParseTuple(args, "f", &rollofffactor))
 		return NULL;
 	
-	m_soundObject->SetRollOffFactor(rollofffactor);
+	if (m_soundObject)
+		m_soundObject->SetRollOffFactor(rollofffactor);
 
 	Py_Return;
 }         
@@ -384,7 +400,7 @@ PyObject* KX_SoundActuator::PySetRollOffFactor(PyObject* self, PyObject* args, P
 
 PyObject* KX_SoundActuator::PyGetRollOffFactor(PyObject* self, PyObject* args, PyObject* kwds)
 {
-	float rollofffactor = m_soundObject->GetRollOffFactor();
+	float rollofffactor = (m_soundObject) ? m_soundObject->GetRollOffFactor() : 1.0;
 	PyObject* result = PyFloat_FromDouble(rollofffactor);
 	
 	return result;
@@ -398,7 +414,8 @@ PyObject* KX_SoundActuator::PySetLooping(PyObject* self, PyObject* args, PyObjec
 	if (!PyArg_ParseTuple(args, "i", &looping))
 		return NULL;
 	
-	m_soundObject->SetLoopMode(looping);
+	if (m_soundObject)
+		m_soundObject->SetLoopMode(looping);
 	
 	Py_Return;
 }         
@@ -407,7 +424,7 @@ PyObject* KX_SoundActuator::PySetLooping(PyObject* self, PyObject* args, PyObjec
 
 PyObject* KX_SoundActuator::PyGetLooping(PyObject* self, PyObject* args, PyObject* kwds)
 {
-	int looping = m_soundObject->GetLoopMode();
+	int looping = (m_soundObject) ? m_soundObject->GetLoopMode() : SND_LOOP_OFF;
 	PyObject* result = PyInt_FromLong(looping);
 	
 	return result;
@@ -425,7 +442,8 @@ PyObject* KX_SoundActuator::PySetPosition(PyObject* self, PyObject* args, PyObje
 	if (!PyArg_ParseTuple(args, "fff", &pos[0], &pos[1], &pos[2]))
 		return NULL;
 	
-	m_soundObject->SetPosition(pos);
+	if (m_soundObject)
+		m_soundObject->SetPosition(pos);
 	
 	Py_Return;
 }         
@@ -442,7 +460,8 @@ PyObject* KX_SoundActuator::PySetVelocity(PyObject* self, PyObject* args, PyObje
 	if (!PyArg_ParseTuple(args, "fff", &vel[0], &vel[1], &vel[2]))
 		return NULL;
 	
-	m_soundObject->SetVelocity(vel);
+	if (m_soundObject)
+		m_soundObject->SetVelocity(vel);
 	
 	Py_Return;
 }         
@@ -465,7 +484,8 @@ PyObject* KX_SoundActuator::PySetOrientation(PyObject* self, PyObject* args, PyO
 	if (!PyArg_ParseTuple(args, "fffffffff", &ori[0][0], &ori[0][1], &ori[0][2], &ori[1][0], &ori[1][1], &ori[1][2], &ori[2][0], &ori[2][1], &ori[2][2]))
 		return NULL;
 	
-	m_soundObject->SetOrientation(ori);
+	if (m_soundObject)
+		m_soundObject->SetOrientation(ori);
 	
 	Py_Return;
 }
diff --git a/source/gameengine/Ketsji/Makefile b/source/gameengine/Ketsji/Makefile
index 47a4855b00c..59cc6c8ca7e 100644
--- a/source/gameengine/Ketsji/Makefile
+++ b/source/gameengine/Ketsji/Makefile
@@ -38,7 +38,9 @@ CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
 CPPFLAGS += $(OGL_CPPFLAGS)
 CPPFLAGS += -I$(NAN_GLEW)/include
 CPPFLAGS += -I$(OPENGL_HEADERS)
-CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) -I../../blender/python
+CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) 
+CPPFLAGS += -I../../blender/python
+CPPFLAGS += -I../../blender/python/api2_2x
 CPPFLAGS += -I$(NAN_STRING)/include    
 CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include    
 CPPFLAGS += -I$(NAN_FUZZICS)/include -I$(NAN_SUMO) -I$(NAN_MOTO)/include
diff --git a/source/gameengine/Physics/BlOde/OdePhysicsEnvironment.cpp b/source/gameengine/Physics/BlOde/OdePhysicsEnvironment.cpp
index a04560aaf09..6d9b41e08d2 100644
--- a/source/gameengine/Physics/BlOde/OdePhysicsEnvironment.cpp
+++ b/source/gameengine/Physics/BlOde/OdePhysicsEnvironment.cpp
@@ -206,8 +206,7 @@ void		ODEPhysicsEnvironment::removeConstraint(int constraintid)
 	}
 }
 
-PHY_IPhysicsController* ODEPhysicsEnvironment::rayTest(PHY_IPhysicsController* ignoreClient,float fromX,float fromY,float fromZ, float toX,float toY,float toZ, 
-									float& hitX,float& hitY,float& hitZ,float& normalX,float& normalY,float& normalZ)
+PHY_IPhysicsController* ODEPhysicsEnvironment::rayTest(PHY_IRayCastFilterCallback &filterCallback,float fromX,float fromY,float fromZ, float toX,float toY,float toZ)
 {
 
 	//m_OdeWorld
diff --git a/source/gameengine/Physics/BlOde/OdePhysicsEnvironment.h b/source/gameengine/Physics/BlOde/OdePhysicsEnvironment.h
index 7c61902f8e2..dcc87d614c0 100644
--- a/source/gameengine/Physics/BlOde/OdePhysicsEnvironment.h
+++ b/source/gameengine/Physics/BlOde/OdePhysicsEnvironment.h
@@ -54,8 +54,7 @@ public:
 			float axisX,float axisY,float axisZ);
 
 	virtual void		removeConstraint(void * constraintid);
-	virtual PHY_IPhysicsController* rayTest(PHY_IPhysicsController* ignoreClient,float fromX,float fromY,float fromZ, float toX,float toY,float toZ, 
-									float& hitX,float& hitY,float& hitZ,float& normalX,float& normalY,float& normalZ);
+	virtual PHY_IPhysicsController* rayTest(PHY_IRayCastFilterCallback &filterCallback,float fromX,float fromY,float fromZ, float toX,float toY,float toZ);
 
 
 	//gamelogic callbacks
diff --git a/source/gameengine/Physics/Bullet/CMakeLists.txt b/source/gameengine/Physics/Bullet/CMakeLists.txt
index b610fd1bbb0..6c733786caf 100644
--- a/source/gameengine/Physics/Bullet/CMakeLists.txt
+++ b/source/gameengine/Physics/Bullet/CMakeLists.txt
@@ -30,6 +30,10 @@ SET(INC
   .
   ../common
   ../../../../extern/bullet2/src
+  ../../../../intern/moto/include
+  ../../../kernel/gen_system
+  ../../../../intern/string
+  ../../Rasterizer
 )
 
 BLENDERLIB(bf_bullet "${SRC}" "${INC}")
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
index b872fae6138..2ec96c75a68 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
@@ -18,6 +18,7 @@ subject to the following restrictions:
 
 #include "PHY_IMotionState.h"
 #include "CcdPhysicsEnvironment.h"
+#include "RAS_MeshObject.h"
 
 
 class BP_Proxy;
@@ -44,7 +45,18 @@ CcdPhysicsController::CcdPhysicsController (const CcdConstructionInfo& ci)
 	m_newClientInfo = 0;
 	m_registerCount = 0;
 		
+	// copy pointers locally to allow smart release
 	m_MotionState = ci.m_MotionState;
+	m_collisionShape = ci.m_collisionShape;
+	// apply scaling before creating rigid body
+	m_collisionShape->setLocalScaling(m_cci.m_scaling);
+	if (m_cci.m_mass)
+		m_collisionShape->calculateLocalInertia(m_cci.m_mass, m_cci.m_localInertiaTensor);
+	// shape info is shared, increment ref count
+	m_shapeInfo = ci.m_shapeInfo;
+	if (m_shapeInfo)
+		m_shapeInfo->AddRef();
+	
 	m_bulletMotionState = 0;
 	
 	
@@ -116,7 +128,7 @@ void CcdPhysicsController::CreateRigidbody()
 
 	m_body = new btRigidBody(m_cci.m_mass,
 		m_bulletMotionState,
-		m_cci.m_collisionShape,
+		m_collisionShape,
 		m_cci.m_localInertiaTensor * m_cci.m_inertiaFactor,
 		m_cci.m_linearDamping,m_cci.m_angularDamping,
 		m_cci.m_friction,m_cci.m_restitution);
@@ -144,6 +156,19 @@ void CcdPhysicsController::CreateRigidbody()
 	}
 }
 
+static void DeleteBulletShape(btCollisionShape* shape)
+{
+	if (shape->getShapeType() == TRIANGLE_MESH_SHAPE_PROXYTYPE)
+	{
+		// shapes based on meshes use an interface that contains the vertices.
+		btTriangleMeshShape* meshShape = static_cast<btTriangleMeshShape*>(shape);
+		btStridingMeshInterface* meshInterface = meshShape->getMeshInterface();
+		if (meshInterface)
+			delete meshInterface;
+	}
+	delete shape;
+}
+
 CcdPhysicsController::~CcdPhysicsController()
 {
 	//will be reference counted, due to sharing
@@ -155,6 +180,27 @@ CcdPhysicsController::~CcdPhysicsController()
 	if (m_bulletMotionState)
 		delete m_bulletMotionState;
 	delete m_body;
+
+	if (m_collisionShape)
+	{
+		// collision shape is always unique to the controller, can delete it here
+		if (m_collisionShape->isCompound())
+		{
+			// bullet does not delete the child shape, must do it here
+			btCompoundShape* compoundShape = (btCompoundShape*)m_collisionShape;
+			int numChild = compoundShape->getNumChildShapes();
+			for (int i=numChild-1 ; i >= 0; i--)
+			{
+				btCollisionShape* childShape = compoundShape->getChildShape(i);
+				DeleteBulletShape(childShape);
+			}
+		}
+		DeleteBulletShape(m_collisionShape);
+	}
+	if (m_shapeInfo)
+	{
+		m_shapeInfo->Release();
+	}
 }
 
 
@@ -219,11 +265,33 @@ void		CcdPhysicsController::PostProcessReplica(class PHY_IMotionState* motionsta
 {
 	m_MotionState = motionstate;
 	m_registerCount = 0;
-	
+	m_collisionShape = NULL;
+
+	// always create a new shape to avoid scaling bug
+	if (m_shapeInfo)
+	{
+		m_shapeInfo->AddRef();
+		m_collisionShape = m_shapeInfo->CreateBulletShape();
+
+		if (m_collisionShape)
+		{
+			// new shape has no scaling, apply initial scaling
+			m_collisionShape->setLocalScaling(m_cci.m_scaling);
+			if (m_cci.m_mass)
+				m_collisionShape->calculateLocalInertia(m_cci.m_mass, m_cci.m_localInertiaTensor);
+		}
+	}
 
 	m_body = 0;
 	CreateRigidbody();
-	
+
+	if (m_body)
+	{
+		if (m_cci.m_mass)
+		{
+			m_body->setMassProps(m_cci.m_mass, m_cci.m_localInertiaTensor * m_cci.m_inertiaFactor);
+		} 
+	}			
 	m_cci.m_physicsEnv->addCcdPhysicsController(this);
 
 
@@ -597,29 +665,32 @@ bool CcdPhysicsController::wantsSleeping()
 
 PHY_IPhysicsController*	CcdPhysicsController::GetReplica()
 {
-	//very experimental, shape sharing is not implemented yet.
-	//just support btSphereShape/ConeShape for now
-
+	// This is used only to replicate Near and Radar sensor controllers
+	// The replication of object physics controller is done in KX_BulletPhysicsController::GetReplica()
 	CcdConstructionInfo cinfo = m_cci;
-	if (cinfo.m_collisionShape)
+	if (m_shapeInfo)
 	{
-		switch (cinfo.m_collisionShape->getShapeType())
+		// This situation does not normally happen
+		cinfo.m_collisionShape = m_shapeInfo->CreateBulletShape();
+	} 
+	else if (m_collisionShape)
+	{
+		switch (m_collisionShape->getShapeType())
 		{
 		case SPHERE_SHAPE_PROXYTYPE:
 			{
-				btSphereShape* orgShape = (btSphereShape*)cinfo.m_collisionShape;
+				btSphereShape* orgShape = (btSphereShape*)m_collisionShape;
 				cinfo.m_collisionShape = new btSphereShape(*orgShape);
 				break;
 			}
 
-			case CONE_SHAPE_PROXYTYPE:
+		case CONE_SHAPE_PROXYTYPE:
 			{
-				btConeShape* orgShape = (btConeShape*)cinfo.m_collisionShape;
+				btConeShape* orgShape = (btConeShape*)m_collisionShape;
 				cinfo.m_collisionShape = new btConeShape(*orgShape);
 				break;
 			}
 
-
 		default:
 			{
 				return 0;
@@ -628,6 +699,7 @@ PHY_IPhysicsController*	CcdPhysicsController::GetReplica()
 	}
 
 	cinfo.m_MotionState = new DefaultMotionState();
+	cinfo.m_shapeInfo = m_shapeInfo;
 
 	CcdPhysicsController* replica = new CcdPhysicsController(cinfo);
 	return replica;
@@ -689,3 +761,206 @@ void	DefaultMotionState::calculateWorldTransformations()
 
 }
 
+// Shape constructor
+bool CcdShapeConstructionInfo::SetMesh(RAS_MeshObject* meshobj, bool polytope)
+{
+	// assume no shape information
+	m_shapeType = PHY_SHAPE_NONE;
+	m_vertexArray.clear();
+	m_polygonIndexArray.clear();
+	m_meshObject = NULL;
+
+	if (!meshobj)
+		return false;
+
+	// Mesh has no polygons!
+	int numpolys = meshobj->NumPolygons();
+	if (!numpolys)
+	{
+		return false;
+	}
+
+	// check that we have at least one colliding polygon
+	int numvalidpolys = 0;
+
+	for (int p=0; p<numpolys; p++)
+	{
+		RAS_Polygon* poly = meshobj->GetPolygon(p);
+
+		// only add polygons that have the collisionflag set
+		if (poly->IsCollider())
+		{
+			numvalidpolys++;
+			break;
+		}
+	}
+
+	// No collision polygons
+	if (numvalidpolys < 1)
+		return false;
+
+	m_shapeType = (polytope) ? PHY_SHAPE_POLYTOPE : PHY_SHAPE_MESH;
+
+	numvalidpolys = 0;
+
+	for (int p2=0; p2<numpolys; p2++)
+	{
+		RAS_Polygon* poly = meshobj->GetPolygon(p2);
+
+		// only add polygons that have the collisionflag set
+		if (poly->IsCollider())
+		{   
+			//Bullet can raycast any shape, so
+			if (polytope)
+			{
+				for (int i=0;i<poly->VertexCount();i++)
+				{
+					const float* vtx = meshobj->GetVertex(poly->GetVertexIndexBase().m_vtxarray, 
+						poly->GetVertexIndexBase().m_indexarray[i],
+						poly->GetMaterial()->GetPolyMaterial())->getLocalXYZ();
+					btPoint3 point(vtx[0],vtx[1],vtx[2]);
+					m_vertexArray.push_back(point);
+					numvalidpolys++;
+				}
+			} else
+			{
+				{
+					const float* vtx = meshobj->GetVertex(poly->GetVertexIndexBase().m_vtxarray, 
+						poly->GetVertexIndexBase().m_indexarray[2],
+						poly->GetMaterial()->GetPolyMaterial())->getLocalXYZ();
+					btPoint3 vertex0(vtx[0],vtx[1],vtx[2]);
+					vtx = meshobj->GetVertex(poly->GetVertexIndexBase().m_vtxarray, 
+						poly->GetVertexIndexBase().m_indexarray[1],
+						poly->GetMaterial()->GetPolyMaterial())->getLocalXYZ();
+					btPoint3 vertex1(vtx[0],vtx[1],vtx[2]);
+					vtx = meshobj->GetVertex(poly->GetVertexIndexBase().m_vtxarray, 
+						poly->GetVertexIndexBase().m_indexarray[0],
+						poly->GetMaterial()->GetPolyMaterial())->getLocalXYZ();
+					btPoint3 vertex2(vtx[0],vtx[1],vtx[2]);
+					m_vertexArray.push_back(vertex0);
+					m_vertexArray.push_back(vertex1);
+					m_vertexArray.push_back(vertex2);
+					m_polygonIndexArray.push_back(p2);
+					numvalidpolys++;
+				}
+				if (poly->VertexCount() == 4)
+				{
+					const float* vtx = meshobj->GetVertex(poly->GetVertexIndexBase().m_vtxarray, 
+						poly->GetVertexIndexBase().m_indexarray[3],
+						poly->GetMaterial()->GetPolyMaterial())->getLocalXYZ();
+					btPoint3 vertex0(vtx[0],vtx[1],vtx[2]);
+					vtx = meshobj->GetVertex(poly->GetVertexIndexBase().m_vtxarray, 
+						poly->GetVertexIndexBase().m_indexarray[2],
+						poly->GetMaterial()->GetPolyMaterial())->getLocalXYZ();
+					btPoint3 vertex1(vtx[0],vtx[1],vtx[2]);
+					vtx = meshobj->GetVertex(poly->GetVertexIndexBase().m_vtxarray, 
+						poly->GetVertexIndexBase().m_indexarray[0],
+						poly->GetMaterial()->GetPolyMaterial())->getLocalXYZ();
+					btPoint3 vertex2(vtx[0],vtx[1],vtx[2]);
+					m_vertexArray.push_back(vertex0);
+					m_vertexArray.push_back(vertex1);
+					m_vertexArray.push_back(vertex2);
+					m_polygonIndexArray.push_back(p2);
+					numvalidpolys++;
+				}
+			}		
+		}
+	}
+
+	if (!numvalidpolys)
+	{
+		// should not happen
+		m_shapeType = PHY_SHAPE_NONE;
+		return false;
+	}
+	m_meshObject = meshobj;
+	return true;
+}
+
+btCollisionShape* CcdShapeConstructionInfo::CreateBulletShape()
+{
+	btCollisionShape* collisionShape = 0;
+	btTriangleMeshShape* concaveShape = 0;
+	btTriangleMesh* collisionMeshData = 0;
+	btCompoundShape* compoundShape = 0;
+	CcdShapeConstructionInfo* nextShapeInfo;
+
+	switch (m_shapeType) 
+	{
+	case PHY_SHAPE_NONE:
+		break;
+
+	case PHY_SHAPE_BOX:
+		collisionShape = new btBoxShape(m_halfExtend);
+		break;
+
+	case PHY_SHAPE_SPHERE:
+		collisionShape = new btSphereShape(m_radius);
+		break;
+
+	case PHY_SHAPE_CYLINDER:
+		collisionShape = new btCylinderShapeZ(m_halfExtend);
+		break;
+
+	case PHY_SHAPE_CONE:
+		collisionShape = new btConeShapeZ(m_radius, m_height);
+		break;
+
+	case PHY_SHAPE_POLYTOPE:
+		collisionShape = new btConvexHullShape(&m_vertexArray.begin()->getX(), m_vertexArray.size());
+		break;
+
+	case PHY_SHAPE_MESH:
+		collisionMeshData = new btTriangleMesh();
+		// m_vertexArray is necessarily a multiple of 3
+		for (std::vector<btPoint3>::iterator it=m_vertexArray.begin(); it != m_vertexArray.end(); )
+		{
+            collisionMeshData->addTriangle(*it++,*it++,*it++);
+		}
+		concaveShape = new btBvhTriangleMeshShape( collisionMeshData, true );
+		concaveShape->recalcLocalAabb();
+		collisionShape = concaveShape;
+		break;
+
+	case PHY_SHAPE_COMPOUND:
+		if (m_nextShape)
+		{
+			compoundShape = new btCompoundShape();
+			for (nextShapeInfo=m_nextShape; nextShapeInfo; nextShapeInfo = nextShapeInfo->m_nextShape)
+			{
+				collisionShape = nextShapeInfo->CreateBulletShape();
+				if (collisionShape)
+				{
+					compoundShape->addChildShape(nextShapeInfo->m_childTrans, collisionShape);
+				}
+			}
+			collisionShape = compoundShape;
+		}
+	}
+	return collisionShape;
+}
+
+void CcdShapeConstructionInfo::AddShape(CcdShapeConstructionInfo* shapeInfo)
+{
+	CcdShapeConstructionInfo* nextShape = this;
+	while (nextShape->m_nextShape != NULL)
+		nextShape = nextShape->m_nextShape;
+	nextShape->m_nextShape = shapeInfo;
+}
+
+CcdShapeConstructionInfo::~CcdShapeConstructionInfo()
+{
+	CcdShapeConstructionInfo* childShape = m_nextShape;
+
+	while (childShape)
+	{
+		CcdShapeConstructionInfo* nextShape = childShape->m_nextShape;
+		childShape->m_nextShape = NULL;
+		childShape->Release();
+		childShape = nextShape;
+	}
+	
+	m_vertexArray.clear();
+}
+
+
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.h b/source/gameengine/Physics/Bullet/CcdPhysicsController.h
index 448e5622eff..8a7f1062f53 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsController.h
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.h
@@ -17,11 +17,14 @@ subject to the following restrictions:
 #ifndef BULLET2_PHYSICSCONTROLLER_H
 #define BULLET2_PHYSICSCONTROLLER_H
 
+#include <vector>
+
 #include "PHY_IPhysicsController.h"
 
 ///	PHY_IPhysicsController is the abstract simplified Interface to a physical object.
 ///	It contains the IMotionState and IDeformableMesh Interfaces.
 #include "btBulletDynamicsCommon.h"
+#include "LinearMath/btTransform.h"
 
 #include "PHY_IMotionState.h"
 
@@ -31,8 +34,81 @@ extern float gAngularSleepingTreshold;
 extern bool gDisableDeactivation;
 class CcdPhysicsEnvironment;
 class btMotionState;
+class RAS_MeshObject;
+class btCollisionShape;
 
+// Shape contructor
+// It contains all the information needed to create a simple bullet shape at runtime
+class CcdShapeConstructionInfo
+{
+public:
+	CcdShapeConstructionInfo() :
+		m_shapeType(PHY_SHAPE_NONE),
+		m_radius(1.0),
+		m_height(1.0),
+		m_halfExtend(0.f,0.f,0.f),
+		m_nextShape(NULL),
+		m_refCount(1)
+	{
+		m_childTrans.setIdentity();
+	}
 
+	~CcdShapeConstructionInfo();
+
+	CcdShapeConstructionInfo* AddRef()
+	{ 
+		m_refCount++;
+		return this;
+	}
+
+	int Release()
+	{
+		if (--m_refCount > 0)
+			return m_refCount;
+		delete this;
+		return 0;
+	}
+
+	void AddShape(CcdShapeConstructionInfo* shapeInfo);
+
+	CcdShapeConstructionInfo* GetNextShape()
+	{
+		return m_nextShape;
+	}
+	CcdShapeConstructionInfo* GetChildShape(int i)
+	{
+		CcdShapeConstructionInfo* shape = m_nextShape;
+		while (i > 0 && shape != NULL)
+		{
+			shape = shape->m_nextShape;
+			i--;
+		}
+		return shape;
+	}
+
+	bool SetMesh(RAS_MeshObject* mesh, bool polytope);
+
+	btCollisionShape* CreateBulletShape();
+
+	// member variables
+	PHY_ShapeType			m_shapeType;
+	btScalar				m_radius;
+	btScalar				m_height;
+	btVector3				m_halfExtend;
+	btTransform				m_childTrans;
+	std::vector<btPoint3>	m_vertexArray;	// Contains both vertex array for polytope shape and
+											// triangle array for concave mesh shape.
+											// In this case a triangle is made of 3 consecutive points
+	std::vector<int>		m_polygonIndexArray;	// Contains the array of polygon index in the 
+													// original mesh that correspond to shape triangles.
+													// only set for concave mesh shape.
+	const RAS_MeshObject*	m_meshObject;	// Keep a pointer to the original mesh 
+
+protected:
+	CcdShapeConstructionInfo* m_nextShape;	// for compound shape
+	int						m_refCount;		// this class is shared between replicas
+											// keep track of users so that we can release it 
+};
 
 struct CcdConstructionInfo
 {
@@ -65,6 +141,7 @@ struct CcdConstructionInfo
 		m_collisionFilterMask(AllFilter),
 		m_collisionShape(0),
 		m_MotionState(0),
+		m_shapeInfo(0),
 		m_physicsEnv(0),
 		m_inertiaFactor(1.f)
 	{
@@ -89,8 +166,11 @@ struct CcdConstructionInfo
 	short int	m_collisionFilterGroup;
 	short int	m_collisionFilterMask;
 
+	///these pointers are used as argument passing for the CcdPhysicsController constructor
+	///and not anymore after that
 	class btCollisionShape*	m_collisionShape;
 	class PHY_IMotionState*	m_MotionState;
+	class CcdShapeConstructionInfo* m_shapeInfo;
 	
 	CcdPhysicsEnvironment*	m_physicsEnv; //needed for self-replication
 	float	m_inertiaFactor;//tweak the inertia (hooked up to Blender 'formfactor'
@@ -106,6 +186,9 @@ class CcdPhysicsController : public PHY_IPhysicsController
 	btRigidBody* m_body;
 	class PHY_IMotionState*		m_MotionState;
 	btMotionState* 	m_bulletMotionState;
+	class btCollisionShape*	m_collisionShape;
+	class CcdShapeConstructionInfo* m_shapeInfo;
+
 	friend class CcdPhysicsEnvironment;	// needed when updating the controller
 
 
@@ -137,6 +220,7 @@ class CcdPhysicsController : public PHY_IPhysicsController
 
 
 		btRigidBody* GetRigidBody() { return m_body;}
+		CcdShapeConstructionInfo* GetShapeInfo() { return m_shapeInfo; }
 
 		btCollisionShape*	GetCollisionShape() { 
 			return m_body->getCollisionShape();
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
index dfbcf115fd7..d14ddf8f65c 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
@@ -53,6 +53,7 @@ void DrawRasterizerLine(const float* from,const float* to,int color);
 
 
 #include <stdio.h>
+#include <string.h>		// for memset
 
 #ifdef NEW_BULLET_VEHICLE_SUPPORT
 class WrapperVehicle : public PHY_IVehicle
@@ -709,35 +710,51 @@ void		CcdPhysicsEnvironment::removeConstraint(int	constraintId)
 
 struct	FilterClosestRayResultCallback : public btCollisionWorld::ClosestRayResultCallback
 {
-	PHY_IPhysicsController*	m_ignoreClient;
+	PHY_IRayCastFilterCallback&	m_phyRayFilter;
+	const btCollisionShape*		m_hitTriangleShape;
+	int							m_hitTriangleIndex;
 
-	FilterClosestRayResultCallback (PHY_IPhysicsController* ignoreClient,const btVector3& rayFrom,const btVector3& rayTo)
+	FilterClosestRayResultCallback (PHY_IRayCastFilterCallback& phyRayFilter,const btVector3& rayFrom,const btVector3& rayTo)
 		: btCollisionWorld::ClosestRayResultCallback(rayFrom,rayTo),
-		m_ignoreClient(ignoreClient)
+		m_phyRayFilter(phyRayFilter),
+		m_hitTriangleShape(NULL),
+		m_hitTriangleIndex(0)
 	{
-
 	}
 
 	virtual ~FilterClosestRayResultCallback()
 	{
 	}
 
+	virtual bool    NeedRayCast(btCollisionObject* object)
+	{
+		CcdPhysicsController* phyCtrl = static_cast<CcdPhysicsController*>(object->getUserPointer());
+		if (phyCtrl != m_phyRayFilter.m_ignoreController)
+		{
+			return m_phyRayFilter.needBroadphaseRayCast(phyCtrl);
+		}
+		return false;
+	}
+
 	virtual	float	AddSingleResult( btCollisionWorld::LocalRayResult& rayResult)
 	{
 		CcdPhysicsController* curHit = static_cast<CcdPhysicsController*>(rayResult.m_collisionObject->getUserPointer());
-		//ignore client...
-		if (curHit != m_ignoreClient)
-		{		
-			//if valid
-			return ClosestRayResultCallback::AddSingleResult(rayResult);
+		// save shape information as ClosestRayResultCallback::AddSingleResult() does not do it
+		if (rayResult.m_localShapeInfo)
+		{
+			m_hitTriangleShape = rayResult.m_localShapeInfo->m_triangleShape;
+			m_hitTriangleIndex = rayResult.m_localShapeInfo->m_triangleIndex;
+		} else 
+		{
+			m_hitTriangleShape = NULL;
+			m_hitTriangleIndex = 0;
 		}
-		return m_closestHitFraction;
+		return ClosestRayResultCallback::AddSingleResult(rayResult);
 	}
 
 };
 
-PHY_IPhysicsController* CcdPhysicsEnvironment::rayTest(PHY_IPhysicsController* ignoreClient, float fromX,float fromY,float fromZ, float toX,float toY,float toZ, 
-													   float& hitX,float& hitY,float& hitZ,float& normalX,float& normalY,float& normalZ)
+PHY_IPhysicsController* CcdPhysicsEnvironment::rayTest(PHY_IRayCastFilterCallback &filterCallback, float fromX,float fromY,float fromZ, float toX,float toY,float toZ)
 {
 
 
@@ -751,18 +768,21 @@ PHY_IPhysicsController* CcdPhysicsEnvironment::rayTest(PHY_IPhysicsController* i
 	//Either Ray Cast with or without filtering
 
 	//btCollisionWorld::ClosestRayResultCallback rayCallback(rayFrom,rayTo);
-	FilterClosestRayResultCallback	 rayCallback(ignoreClient,rayFrom,rayTo);
+	FilterClosestRayResultCallback	 rayCallback(filterCallback,rayFrom,rayTo);
 
 
-	PHY_IPhysicsController* nearestHit = 0;
+	PHY_RayCastResult result;
+	memset(&result, 0, sizeof(result));
+
 	// don't collision with sensor object
-	m_dynamicsWorld->rayTest(rayFrom,rayTo,rayCallback, CcdConstructionInfo::AllFilter ^ CcdConstructionInfo::SensorFilter);
+	m_dynamicsWorld->rayTest(rayFrom,rayTo,rayCallback, CcdConstructionInfo::AllFilter ^ CcdConstructionInfo::SensorFilter,filterCallback.m_faceNormal);
 	if (rayCallback.HasHit())
 	{
-		nearestHit = static_cast<CcdPhysicsController*>(rayCallback.m_collisionObject->getUserPointer());
-		hitX = 	rayCallback.m_hitPointWorld.getX();
-		hitY = 	rayCallback.m_hitPointWorld.getY();
-		hitZ = 	rayCallback.m_hitPointWorld.getZ();
+		CcdPhysicsController* controller = static_cast<CcdPhysicsController*>(rayCallback.m_collisionObject->getUserPointer());
+		result.m_controller = controller;
+		result.m_hitPoint[0] = rayCallback.m_hitPointWorld.getX();
+		result.m_hitPoint[1] = rayCallback.m_hitPointWorld.getY();
+		result.m_hitPoint[2] = rayCallback.m_hitPointWorld.getZ();
 
 		if (rayCallback.m_hitNormalWorld.length2() > (SIMD_EPSILON*SIMD_EPSILON))
 		{
@@ -771,14 +791,42 @@ PHY_IPhysicsController* CcdPhysicsEnvironment::rayTest(PHY_IPhysicsController* i
 		{
 			rayCallback.m_hitNormalWorld.setValue(1,0,0);
 		}
-		normalX = rayCallback.m_hitNormalWorld.getX();
-		normalY = rayCallback.m_hitNormalWorld.getY();
-		normalZ = rayCallback.m_hitNormalWorld.getZ();
-
+		result.m_hitNormal[0] = rayCallback.m_hitNormalWorld.getX();
+		result.m_hitNormal[1] = rayCallback.m_hitNormalWorld.getY();
+		result.m_hitNormal[2] = rayCallback.m_hitNormalWorld.getZ();
+		if (rayCallback.m_hitTriangleShape != NULL)
+		{
+			// identify the mesh polygon
+			CcdShapeConstructionInfo* shapeInfo = controller->m_shapeInfo;
+			if (shapeInfo)
+			{
+				btCollisionShape* shape = controller->GetRigidBody()->getCollisionShape();
+				if (shape->isCompound())
+				{
+					btCompoundShape* compoundShape = (btCompoundShape*)shape;
+					CcdShapeConstructionInfo* compoundShapeInfo = shapeInfo;
+					// need to search which sub-shape has been hit
+					for (int i=0; i<compoundShape->getNumChildShapes(); i++)
+					{
+						shapeInfo = compoundShapeInfo->GetChildShape(i);
+						shape=compoundShape->getChildShape(i);
+						if (shape == rayCallback.m_hitTriangleShape)
+							break;
+					}
+				}
+				if (shape == rayCallback.m_hitTriangleShape && 
+					rayCallback.m_hitTriangleIndex < shapeInfo->m_polygonIndexArray.size())
+				{
+					result.m_meshObject = shapeInfo->m_meshObject;
+					result.m_polygon = shapeInfo->m_polygonIndexArray.at(rayCallback.m_hitTriangleIndex);
+				}
+			}
+		}
+		filterCallback.reportHit(&result);
 	}	
 
 
-	return nearestHit;
+	return result.m_controller;
 }
 
 
@@ -1370,8 +1418,9 @@ int			CcdPhysicsEnvironment::createConstraint(class PHY_IPhysicsController* ctrl
 PHY_IPhysicsController* CcdPhysicsEnvironment::CreateConeController(float coneradius,float coneheight)
 {
 	CcdConstructionInfo	cinfo;
-	//This is a memory leak: Bullet does not delete the shape and it cannot be added to 
-	//the KX_Scene.m_shapes list -- too bad but that's not a lot of data
+
+	// we don't need a CcdShapeConstructionInfo for this shape:
+	// it is simple enough for the standard copy constructor (see CcdPhysicsController::GetReplica)
 	cinfo.m_collisionShape = new btConeShape(coneradius,coneheight);
 	cinfo.m_MotionState = 0;
 	cinfo.m_physicsEnv = this;
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
index 825a5e525f2..667e310dcb3 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
@@ -157,8 +157,7 @@ protected:
 
 		btTypedConstraint*	getConstraintById(int constraintId);
 
-		virtual PHY_IPhysicsController* rayTest(PHY_IPhysicsController* ignoreClient, float fromX,float fromY,float fromZ, float toX,float toY,float toZ, 
-										float& hitX,float& hitY,float& hitZ,float& normalX,float& normalY,float& normalZ);
+		virtual PHY_IPhysicsController* rayTest(PHY_IRayCastFilterCallback &filterCallback, float fromX,float fromY,float fromZ, float toX,float toY,float toZ);
 
 
 		//Methods for gamelogic collision/physics callbacks
diff --git a/source/gameengine/Physics/Bullet/Makefile b/source/gameengine/Physics/Bullet/Makefile
index 49259d0a67c..d5570e75833 100644
--- a/source/gameengine/Physics/Bullet/Makefile
+++ b/source/gameengine/Physics/Bullet/Makefile
@@ -37,5 +37,10 @@ CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
 
 CPPFLAGS += -I$(NAN_BULLET2)/include
 CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
+CPPFLAGS += -I$(NAN_STRING)/include
+CPPFLAGS += -I$(NAN_MOTO)/include
+CPPFLAGS += -I../../../kernel/gen_system
 CPPFLAGS += -I../../Physics/common
 CPPFLAGS += -I../../Physics/Dummy
+CPPFLAGS += -I../../Rasterizer
+
diff --git a/source/gameengine/Physics/Bullet/SConscript b/source/gameengine/Physics/Bullet/SConscript
index dd6eab0f018..0936d45197a 100644
--- a/source/gameengine/Physics/Bullet/SConscript
+++ b/source/gameengine/Physics/Bullet/SConscript
@@ -3,7 +3,7 @@ Import ('env')
 
 sources = 'CcdPhysicsEnvironment.cpp CcdPhysicsController.cpp'
 
-incs = '. ../common'
+incs = '. ../common #source/kernel/gen_system #intern/string #intern/moto/include #source/gameengine/Rasterizer'
 
 incs += ' ' + env['BF_BULLET_INC']
 
diff --git a/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp b/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp
index f512d44c9f2..d78958b746c 100644
--- a/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp
+++ b/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp
@@ -109,8 +109,7 @@ void		DummyPhysicsEnvironment::removeConstraint(int	constraintid)
 	}
 }
 
-PHY_IPhysicsController* DummyPhysicsEnvironment::rayTest(PHY_IPhysicsController* ignoreClient,float fromX,float fromY,float fromZ, float toX,float toY,float toZ, 
-									float& hitX,float& hitY,float& hitZ,float& normalX,float& normalY,float& normalZ)
+PHY_IPhysicsController* DummyPhysicsEnvironment::rayTest(PHY_IRayCastFilterCallback &filterCallback,float fromX,float fromY,float fromZ, float toX,float toY,float toZ)
 {
 	//collision detection / raytesting
 	return NULL;
diff --git a/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h b/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
index b5a61f72e4a..975be84f2a7 100644
--- a/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
+++ b/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
@@ -69,8 +69,7 @@ public:
 		return 0;
 	}
 
-	virtual PHY_IPhysicsController* rayTest(PHY_IPhysicsController* ignoreClient, float fromX,float fromY,float fromZ, float toX,float toY,float toZ, 
-									float& hitX,float& hitY,float& hitZ,float& normalX,float& normalY,float& normalZ);
+	virtual PHY_IPhysicsController* rayTest(PHY_IRayCastFilterCallback &filterCallback, float fromX,float fromY,float fromZ, float toX,float toY,float toZ);
 
 
 	//gamelogic callbacks
diff --git a/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.cpp b/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.cpp
index 65018d2523e..80e4dc4044e 100644
--- a/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.cpp
+++ b/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.cpp
@@ -26,6 +26,7 @@
  *
  * ***** END GPL LICENSE BLOCK *****
  */
+#include <string.h>		// memset
 #include "SumoPhysicsEnvironment.h"
 #include "PHY_IMotionState.h"
 #include "SumoPhysicsController.h"
@@ -125,37 +126,35 @@ void SumoPhysicsEnvironment::removeConstraint(int	constraintid)
 	}
 }
 
-PHY_IPhysicsController* SumoPhysicsEnvironment::rayTest(PHY_IPhysicsController* ignoreClientCtrl, 
+PHY_IPhysicsController* SumoPhysicsEnvironment::rayTest(PHY_IRayCastFilterCallback &filterCallback, 
 	float fromX,float fromY,float fromZ, 
-	float toX,float toY,float toZ, 
-	float& hitX,float& hitY,float& hitZ,
-	float& normalX,float& normalY,float& normalZ)
+	float toX,float toY,float toZ)
 {
-	SumoPhysicsController* ignoreCtr = static_cast<SumoPhysicsController*> (ignoreClientCtrl);
+	SumoPhysicsController* ignoreCtr = static_cast<SumoPhysicsController*> (filterCallback.m_ignoreController);
 
 	//collision detection / raytesting
 	MT_Point3 hit, normal;
-	PHY_IPhysicsController *ret = 0;
+	PHY_RayCastResult result;
 
 	SM_Object* sm_ignore = 0;
 	if (ignoreCtr)
 		sm_ignore = ignoreCtr->GetSumoObject();
 
+	memset(&result, 0, sizeof(result));
 
 	SM_Object* smOb = m_sumoScene->rayTest(sm_ignore,MT_Point3(fromX, fromY, fromZ),MT_Point3(toX, toY, toZ), hit, normal);
 	if (smOb)
 	{
-		ret = (PHY_IPhysicsController *) smOb->getPhysicsClientObject();
+		result.m_controller = (PHY_IPhysicsController *) smOb->getPhysicsClientObject();
+		result.m_hitPoint[0] = hit[0];
+		result.m_hitPoint[1] = hit[1];
+		result.m_hitPoint[2] = hit[2];
+		result.m_hitNormal[0] = normal[0];
+		result.m_hitNormal[1] = normal[1];
+		result.m_hitNormal[2] = normal[2];
+		filterCallback.reportHit(&result);
 	}
-	hitX = hit[0];
-	hitY = hit[1];
-	hitZ = hit[2];
-
-	normalX = normal[0];
-	normalY = normal[1];
-	normalZ = normal[2];
-	
-	return ret;
+	return result.m_controller;
 }
 //gamelogic callbacks
 void SumoPhysicsEnvironment::addSensor(PHY_IPhysicsController* ctrl)
diff --git a/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.h b/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.h
index 8b9fb463034..100adf969d5 100644
--- a/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.h
+++ b/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.h
@@ -75,8 +75,7 @@ public:
 		return 0;
 	}
 
-	virtual PHY_IPhysicsController* rayTest(PHY_IPhysicsController* ignoreClient,float fromX,float fromY,float fromZ, float toX,float toY,float toZ, 
-									float& hitX,float& hitY,float& hitZ,float& normalX,float& normalY,float& normalZ);
+	virtual PHY_IPhysicsController* rayTest(PHY_IRayCastFilterCallback &filterCallback,float fromX,float fromY,float fromZ, float toX,float toY,float toZ);
 
 	
 	//gamelogic callbacks
diff --git a/source/gameengine/Physics/common/PHY_DynamicTypes.h b/source/gameengine/Physics/common/PHY_DynamicTypes.h
index c289b9d8bcb..3b3e42c38d2 100644
--- a/source/gameengine/Physics/common/PHY_DynamicTypes.h
+++ b/source/gameengine/Physics/common/PHY_DynamicTypes.h
@@ -87,6 +87,18 @@ typedef enum PHY_ConstraintType {
 
 } PHY_ConstraintType;
 
+typedef enum PHY_ShapeType {
+	PHY_SHAPE_NONE,
+	PHY_SHAPE_BOX,
+	PHY_SHAPE_SPHERE,
+	PHY_SHAPE_CYLINDER,
+	PHY_SHAPE_CONE,
+	PHY_SHAPE_MESH,
+	PHY_SHAPE_POLYTOPE,
+	PHY_SHAPE_COMPOUND
+} PHY_ShapeType;
+
+
 typedef float	PHY_Vector3[3];
 
 #endif //__PHY_DYNAMIC_TYPES
diff --git a/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h b/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
index 5b275066665..98496fb7f9e 100644
--- a/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
+++ b/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
@@ -33,6 +33,50 @@
 #include <vector>
 #include "PHY_DynamicTypes.h"
 class PHY_IVehicle;
+class RAS_MeshObject;
+class PHY_IPhysicsController;
+
+/**
+ * pass back information from rayTest
+ */
+struct PHY_RayCastResult
+{
+	PHY_IPhysicsController* m_controller;	
+	PHY__Vector3			m_hitPoint;
+	PHY__Vector3			m_hitNormal;
+	const RAS_MeshObject*	m_meshObject;	// !=NULL for mesh object (only for Bullet controllers) 
+	int						m_polygon;		// index of the polygon hit by the ray,
+											// only if m_meshObject != NULL
+};
+
+/**
+ * This class replaces the ignoreController parameter of rayTest function. 
+ * It allows more sophisticated filtering on the physics controller before computing the ray intersection to save CPU. 
+ * It is only used to its full extend by the Ccd physics environement (Bullet).
+ */
+class PHY_IRayCastFilterCallback
+{
+public:
+	PHY_IPhysicsController* m_ignoreController;
+	bool					m_faceNormal;
+
+	virtual		~PHY_IRayCastFilterCallback()
+	{
+	}
+
+	virtual	bool needBroadphaseRayCast(PHY_IPhysicsController* controller)
+	{
+		return true;
+	}
+
+	virtual void reportHit(PHY_RayCastResult* result) = 0;
+
+	PHY_IRayCastFilterCallback(PHY_IPhysicsController* ignoreController, bool faceNormal=false) 
+		:m_ignoreController(ignoreController),
+		m_faceNormal(faceNormal)
+	{
+	}
+};
 
 /**
 *	Physics Environment takes care of stepping the simulation and is a container for physics entities (rigidbodies,constraints, materials etc.)
@@ -94,8 +138,7 @@ class PHY_IPhysicsEnvironment
 		//complex constraint for vehicles
 		virtual PHY_IVehicle*	getVehicleConstraint(int constraintId) =0;
 
-		virtual PHY_IPhysicsController* rayTest(PHY_IPhysicsController* ignoreClient, float fromX,float fromY,float fromZ, float toX,float toY,float toZ, 
-										float& hitX,float& hitY,float& hitZ,float& normalX,float& normalY,float& normalZ)=0;
+		virtual PHY_IPhysicsController* rayTest(PHY_IRayCastFilterCallback &filterCallback, float fromX,float fromY,float fromZ, float toX,float toY,float toZ)=0;
 
 
 		//Methods for gamelogic collision/physics callbacks
diff --git a/source/gameengine/PyDoc/GameKeys.py b/source/gameengine/PyDoc/GameKeys.py
index 268fb9cc172..1a0a737718e 100644
--- a/source/gameengine/PyDoc/GameKeys.py
+++ b/source/gameengine/PyDoc/GameKeys.py
@@ -164,3 +164,12 @@ Example::
 				# Activate Right!
 		
 """
+
+def EventToString(event):
+	"""
+	Return the string name of a key event. Will raise a ValueError error if its invalid.
+	
+	@type event: int
+	@param event: key event from GameKeys or the keyboard sensor.
+	@rtype: string
+	"""
diff --git a/source/gameengine/PyDoc/GameLogic.py b/source/gameengine/PyDoc/GameLogic.py
index 965c0522bd7..b65bc0f3ce8 100644
--- a/source/gameengine/PyDoc/GameLogic.py
+++ b/source/gameengine/PyDoc/GameLogic.py
@@ -14,8 +14,7 @@ Documentation for the GameLogic Module.
 	
 	Examples::
 		# To get a controller:
-		import GameLogic
-		co = GameLogic.getCurrentController()
+		co = GameLogic.getCurrentController() # GameLogic is automatically imported
 		
 		# To get the game object associated with this controller:
 		obj = co.getOwner()
@@ -42,6 +41,7 @@ Documentation for the GameLogic Module.
 		- L{SCA_MouseSensor}
 		- L{SCA_PropertySensor} 
 		- L{SCA_RandomSensor} 
+		- L{SCA_DelaySensor}
 	
 	You can also access actuators linked to the controller::
 		# To get an actuator attached to the controller:
@@ -236,3 +236,13 @@ def expandPath(path):
 	@return: The converted string
 	@rtype: string
 	"""
+
+def getBlendFileList(path = "//"):
+	"""
+	Returns a list of blend files in the same directory as the open blend file, or from using the option argument.
+
+	@param path: Optional directory argument, will be expanded (like expandPath) into the full path.
+	@type path: string
+	@return: A list of filenames, with no directory prefix
+	@rtype: list
+	"""
\ No newline at end of file
diff --git a/source/gameengine/PyDoc/KX_GameObject.py b/source/gameengine/PyDoc/KX_GameObject.py
index a5ba5b1d634..2136ce54e30 100644
--- a/source/gameengine/PyDoc/KX_GameObject.py
+++ b/source/gameengine/PyDoc/KX_GameObject.py
@@ -135,6 +135,26 @@ class KX_GameObject:
 		@param local: - False: you get the "global" velocity ie: relative to world orientation (default).
 		              - True: you get the "local" velocity ie: relative to object orientation.
 		"""
+	def getAngularVelocity(local = 0):
+		"""
+		Gets the game object's angular velocity.
+		
+		@type local: boolean
+		@param local: - False: you get the "global" velocity ie: relative to world orientation (default).
+		              - True: you get the "local" velocity ie: relative to object orientation.
+		@rtype: list [vx, vy, vz]
+		@return: the object's angular velocity.
+		"""
+	def setAngularVelocity(velocity, local = 0):
+		"""
+		Sets the game object's angular velocity.
+		
+		@type velocity: 3d vector.
+		@param velocity: angular velocity vector.
+		@type local: boolean
+		@param local: - False: you get the "global" velocity ie: relative to world orientation (default).
+		              - True: you get the "local" velocity ie: relative to object orientation.
+		"""
 	def getVelocity(point):
 		"""
 		Gets the game object's velocity at the specified point.
@@ -280,10 +300,11 @@ class KX_GameObject:
 		@rtype: L{KX_GameObject}
 		@return: the first object hit or None if no object or object does not match prop
 		"""
-	def rayCast(to,from,dist,prop):
+	def rayCast(to,from,dist,prop,face,xray,poly):
 		"""
 		Look from a point/object to another point/object and find first object hit within dist that matches prop.
-		Returns a 3-tuple with object reference, hit point and hit normal or (None,None,None) if no hit.
+		if poly is 0, returns a 3-tuple with object reference, hit point and hit normal or (None,None,None) if no hit.
+		if poly is 1, returns a 4-tuple with in addition a L{KX_PolyProxy} as 4th element.
 		Ex:
 			# shoot along the axis gun-gunAim (gunAim should be collision-free)
 			ob,point,normal = gun.rayCast(gunAim,None,50)
@@ -292,9 +313,18 @@ class KX_GameObject:
 
 		Notes:				
 		The ray ignores the object on which the method is called.
-		If is casted from/to object center or explicit [x,y,z] points.
-		The ray does not have X-Ray capability: the first object hit (other than self object) stops the ray
-		If a property was specified and the first object hit does not have that property, there is no hit
+		It is casted from/to object center or explicit [x,y,z] points.
+		The face paremeter determines the orientation of the normal: 
+		  0 => hit normal is always oriented towards the ray origin (as if you casted the ray from outside)
+		  1 => hit normal is the real face normal (only for mesh object, otherwise face has no effect)
+		The ray has X-Ray capability if xray parameter is 1, otherwise the first object hit (other than self object) stops the ray.
+		The prop and xray parameters interact as follow:
+		    prop off, xray off: return closest hit or no hit if there is no object on the full extend of the ray.
+		    prop off, xray on : idem.
+		    prop on,  xray off: return closest hit if it matches prop, no hit otherwise.
+		    prop on,  xray on : return closest hit matching prop or no hit if there is no object matching prop on the full extend of the ray.
+		The L{KX_PolyProxy} 4th element of the return tuple when poly=1 allows to retrieve information on the polygon hit by the ray.
+		If there is no hit or the hit object is not a static mesh, None is returned as 4th element. 
 		The	ray ignores collision-free objects and faces that dont have the collision flag enabled, you can however use ghost objects.
 
 		@param to: [x,y,z] or object to which the ray is casted
@@ -305,8 +335,17 @@ class KX_GameObject:
 		@type dist: float
 		@param prop: property name that object must have; can be omitted => detect any object
 		@type prop: string
-		@rtype: 3-tuple (L{KX_GameObject}, 3-tuple (x,y,z), 3-tuple (nx,ny,nz))
-		@return: (object,hitpoint,hitnormal) or (None,None,None)
+		@param face: normal option: 1=>return face normal; 0 or omitted => normal is oriented towards origin
+		@type face: int
+		@param xray: X-ray option: 1=>skip objects that don't match prop; 0 or omitted => stop on first object
+		@type xray: int
+		@param poly: polygon option: 1=>return value is a 4-tuple and the 4th element is a L{KX_PolyProxy}
+		@type poly: int
+		@rtype:    3-tuple (L{KX_GameObject}, 3-tuple (x,y,z), 3-tuple (nx,ny,nz))
+		        or 4-tuple (L{KX_GameObject}, 3-tuple (x,y,z), 3-tuple (nx,ny,nz), L{KX_PolyProxy))
+		@return: (object,hitpoint,hitnormal) or (object,hitpoint,hitnormal,polygon)
+		         If no hit, returns (None,None,None) or (None,None,None,None)
+		         If the object hit is not a static mesh, polygon is None
 		"""
 
 
diff --git a/source/gameengine/PyDoc/KX_MeshProxy.py b/source/gameengine/PyDoc/KX_MeshProxy.py
index e43fa3598f0..03bc36b6ac1 100644
--- a/source/gameengine/PyDoc/KX_MeshProxy.py
+++ b/source/gameengine/PyDoc/KX_MeshProxy.py
@@ -95,6 +95,21 @@ class KX_MeshProxy:
 		@rtype: L{KX_VertexProxy}
 		@return: a vertex object.
 		"""
+	def getNumPolygons():
+		"""
+		Returns the number of polygon in the mesh.
+		
+		@rtype: integer
+		"""
+	def getPolygon(index):
+		"""
+		Gets the specified polygon from the mesh.
+		
+		@type index: integer
+		@param index: polygon number
+		@rtype: L{KX_PolyProxy}
+		@return: a polygon object.
+		"""
 	def reinstancePhysicsMesh():
 		"""
 		Updates the physics system with the changed mesh.
diff --git a/source/gameengine/PyDoc/KX_PolyProxy.py b/source/gameengine/PyDoc/KX_PolyProxy.py
new file mode 100644
index 00000000000..45ae30a13dd
--- /dev/null
+++ b/source/gameengine/PyDoc/KX_PolyProxy.py
@@ -0,0 +1,100 @@
+# $Id$
+# Documentation for the polygon proxy class
+
+class KX_PolyProxy:
+	"""
+	A polygon holds the index of the vertex forming the poylgon.
+
+	Note: 
+	The polygon attributes are read-only, you need to retrieve the vertex proxy if you want
+	to change the vertex settings. 
+	
+	@ivar matname: The name of polygon material, empty if no material.
+	@type matname: string
+	@ivar material: The material of the polygon
+	@type material: L{KX_PolygonMaterial} or KX_BlenderMaterial
+	@ivar texture: The texture name of the polygon.
+	@type texture: string
+	@ivar matid: The material index of the polygon, use this to retrieve vertex proxy from mesh proxy
+	@type matid: integer
+	@ivar v1: vertex index of the first vertex of the polygon, use this to retrieve vertex proxy from mesh proxy
+	@type v1: integer	
+	@ivar v2: vertex index of the second vertex of the polygon, use this to retrieve vertex proxy from mesh proxy
+	@type v2: integer	
+	@ivar v3: vertex index of the third vertex of the polygon, use this to retrieve vertex proxy from mesh proxy
+	@type v3: integer	
+	@ivar v4: vertex index of the fourth vertex of the polygon, 0 if polygon has only 3 vertex
+	          use this to retrieve vertex proxy from mesh proxy
+	@type v4: integer	
+	@ivar visible: visible state of the polygon: 1=visible, 0=invisible
+	@type visible: integer
+	@ivar collide: collide state of the polygon: 1=receives collision, 0=collision free.
+	@type collide: integer
+	"""
+
+	def getMaterialName(): 
+		"""
+		Returns the polygon material name with MA prefix
+		
+		@rtype: string
+		@return: material name
+		"""
+	def getMaterial(): 
+		"""
+		Returns the polygon material
+		
+		@rtype: L{KX_PolygonMaterial} or KX_BlenderMaterial
+		"""
+	def getTextureName():
+		"""
+		Returns the polygon texture name
+		
+		@rtype: string
+		@return: texture name
+		"""
+	def getMaterialIndex():
+		"""
+		Returns the material bucket index of the polygon. 
+		This index and the ones returned by getVertexIndex() are needed to retrieve the vertex proxy from L{KX_MeshProxy}.
+		
+		@rtype: integer
+		@return: the material index in the mesh
+	
+	def getNumVertex(): 
+		"""
+		Returns the number of vertex of the polygon.
+		
+		@rtype: integer
+		@return: number of vertex, 3 or 4.
+		"""
+	def isVisible():
+		"""
+		Returns whether the polygon is visible or not
+		
+		@rtype: integer
+		@return: 0=invisible, 1=visible
+		"""
+	def isCollider():
+		"""
+		Returns whether the polygon is receives collision or not
+		
+		@rtype: integer
+		@return: 0=collision free, 1=receives collision
+		"""
+	def getVertexIndex(vertex):
+		"""
+		Returns the mesh vertex index of a polygon vertex
+		This index and the one returned by getMaterialIndex() are needed to retrieve the vertex proxy from L{KX_MeshProxy}.
+		
+		@type vertex: integer
+		@param vertex: index of the vertex in the polygon: 0->3
+		@rtype: integer
+		@return: mesh vertex index
+		"""
+	def getMesh():
+		"""
+		Returns a mesh proxy
+		
+		@rtype: L{KX_MeshProxy}
+		@return: mesh proxy
+		"""
diff --git a/source/gameengine/PyDoc/KX_SCA_AddObjectActuator.py b/source/gameengine/PyDoc/KX_SCA_AddObjectActuator.py
index 4f2bf85bff3..c3b2e947ddb 100644
--- a/source/gameengine/PyDoc/KX_SCA_AddObjectActuator.py
+++ b/source/gameengine/PyDoc/KX_SCA_AddObjectActuator.py
@@ -64,6 +64,23 @@ class KX_SCA_AddObjectActuator(SCA_IActuator):
 		"""
 		Returns the initial linear velocity of added objects.
 		
+		@rtype: list [vx, vy, vz]
+		"""
+	def setAngularVelocity(vx, vy, vz):
+		"""
+		Sets the initial angular velocity of added objects.
+		
+		@type vx: float
+		@param vx: the x component of the initial angular velocity.
+		@type vy: float
+		@param vy: the y component of the initial angular velocity.
+		@type vz: float
+		@param vz: the z component of the initial angular velocity.
+		"""
+	def getAngularVelocity():
+		"""
+		Returns the initial angular velocity of added objects.
+		
 		@rtype: list [vx, vy, vz]
 		"""
 	def getLastCreatedObject():
diff --git a/source/gameengine/PyDoc/SCA_DelaySensor.py b/source/gameengine/PyDoc/SCA_DelaySensor.py
new file mode 100644
index 00000000000..46b74f461a7
--- /dev/null
+++ b/source/gameengine/PyDoc/SCA_DelaySensor.py
@@ -0,0 +1,56 @@
+# $Id$
+# Documentation for SCA_DelaySensor
+from SCA_IActuator import *
+
+class SCA_DelaySensor(SCA_ISensor):
+	"""
+	The Delay sensor generates positive and negative triggers at precise time,
+	expressed in number of frames. The delay parameter defines the length
+	of the initial OFF period. A positive trigger is generated at the end of this period. 
+	The duration parameter defines the length of the ON period following the OFF period.
+	There is a negative trigger at the end of the ON period. If duration is 0, the sensor
+	stays ON and there is no negative trigger.
+	The sensor runs the OFF-ON cycle once unless the repeat option is set: the
+	OFF-ON cycle repeats indefinately (or the OFF cycle if duration is 0).
+	Use SCA_ISensor::reset() at any time to restart sensor.
+	"""
+	def setDelay(delay):
+		"""
+		Set the initial delay before the positive trigger.
+		
+		@param delay: length of the initial OFF period as number of frame, 0 for immediate trigger
+		@type delay: integer
+		"""
+	def setDuration(duration):
+		"""
+		Set the duration of the ON pulse after initial delay and the generation of the positive trigger.
+		If duration is greater than 0, a negative trigger is sent at the end of the ON pulse.
+		
+		@param duration: length of the ON period in number of frame after the initial OFF period
+		@type duration: integer
+		"""	
+	def setRepeat(repeat):
+		"""
+		Set if the sensor repeat mode.
+		
+		@param repeat: 1 if the OFF-ON cycle should be repeated indefinately, 0 if it should run once.
+		@type repeat: integer
+		"""		
+	def getDelay():
+		"""
+		Return the delay parameter value.
+		
+		@rtype: integer
+		"""
+	def getDuration():
+		"""
+		Return the duration parameter value
+		
+		@rtype: integer
+		"""
+	def getRepeat():
+		"""
+		Return the repeat parameter value
+		
+		@rtype: KX_TRUE or KX_FALSE
+		"""
diff --git a/source/gameengine/PyDoc/SCA_ISensor.py b/source/gameengine/PyDoc/SCA_ISensor.py
index 0ebc2debb31..14858505e24 100644
--- a/source/gameengine/PyDoc/SCA_ISensor.py
+++ b/source/gameengine/PyDoc/SCA_ISensor.py
@@ -9,7 +9,12 @@ class SCA_ISensor(SCA_ILogicBrick):
 	
 	def isPositive():
 		"""
-		True if this sensor brick has been activated.
+		True if this sensor brick is in a positive state.
+		"""
+	
+	def isTriggered():
+		"""
+		True if this sensor brick has triggered the current controller.
 		"""
 	
 	def getUsePosPulseMode():
@@ -77,4 +82,10 @@ class SCA_ISensor(SCA_ILogicBrick):
 		@param level: Detect level instead of edge? (KX_TRUE, KX_FALSE)
 		@type level: boolean
 		"""
+	def reset():
+		"""
+		Reset sensor internal state, effect depends on the type of sensor and settings.
+		
+		The sensor is put in its initial state as if it was just activated.
+		"""
 
diff --git a/source/gameengine/Rasterizer/RAS_MeshObject.cpp b/source/gameengine/Rasterizer/RAS_MeshObject.cpp
index af5228e4c35..a4f7f3f01dd 100644
--- a/source/gameengine/Rasterizer/RAS_MeshObject.cpp
+++ b/source/gameengine/Rasterizer/RAS_MeshObject.cpp
@@ -134,7 +134,7 @@ int RAS_MeshObject::NumPolygons()
 
 
 
-RAS_Polygon* RAS_MeshObject::GetPolygon(int num)
+RAS_Polygon* RAS_MeshObject::GetPolygon(int num) const
 {
 	return m_Polygons[num];
 }
diff --git a/source/gameengine/Rasterizer/RAS_MeshObject.h b/source/gameengine/Rasterizer/RAS_MeshObject.h
index 99806666fa6..9a46d89c393 100644
--- a/source/gameengine/Rasterizer/RAS_MeshObject.h
+++ b/source/gameengine/Rasterizer/RAS_MeshObject.h
@@ -178,7 +178,7 @@ public:
 	void				UpdateMaterialList();
 	
 	int					NumPolygons();
-	RAS_Polygon*		GetPolygon(int num);
+	RAS_Polygon*		GetPolygon(int num) const;
 	
 	virtual void		Bucketize(
 							double* oglmatrix,
diff --git a/source/kernel/CMakeLists.txt b/source/kernel/CMakeLists.txt
index 3d966152cc5..ac759393326 100644
--- a/source/kernel/CMakeLists.txt
+++ b/source/kernel/CMakeLists.txt
@@ -24,7 +24,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC gen_messaging gen_system ../../intern/string ../../intern/moto/include)
+SET(INC gen_messaging gen_system ../../intern/string ../../intern/moto/include ../../source/blender/blenloader )
 
 FILE(GLOB SRC   
   gen_messaging/intern/messaging.c
diff --git a/source/kernel/SConscript b/source/kernel/SConscript
index 9e678c041dc..8bd1a18f835 100644
--- a/source/kernel/SConscript
+++ b/source/kernel/SConscript
@@ -5,6 +5,6 @@ sources = 'gen_messaging/intern/messaging.c gen_system/GEN_HashedPtr.cpp'
 sources += ' gen_system/GEN_Matrix4x4.cpp gen_system/SYS_SingletonSystem.cpp'
 sources += ' gen_system/SYS_System.cpp'
 
-incs = 'gen_messaging gen_system #/intern/string #/intern/moto/include'
+incs = 'gen_messaging gen_system #/intern/string #/intern/moto/include #/source/blender/blenloader '
 
 env.BlenderLib ( 'bf_kernel', Split(sources), Split(incs), [], libtype = ['common','game2', 'player'], priority = [15, 10, 150] )
diff --git a/source/kernel/gen_system/GEN_HashedPtr.cpp b/source/kernel/gen_system/GEN_HashedPtr.cpp
index 49ccb252246..6dbed1fb7a8 100644
--- a/source/kernel/gen_system/GEN_HashedPtr.cpp
+++ b/source/kernel/gen_system/GEN_HashedPtr.cpp
@@ -33,6 +33,8 @@
 #include <config.h>
 #endif
 
+#include "BLO_sys_types.h" // for intptr_t support
+
 //
 // Build hash index from pointer.  Even though the final result
 // is a 32-bit integer, use all the bits of the pointer as long
@@ -41,11 +43,7 @@
 
 unsigned int GEN_Hash(void * inDWord)
 {
-#if defined(_WIN64)
-	unsigned __int64 key = (unsigned __int64)inDWord;
-#else
-	unsigned long key = (unsigned long)inDWord;
-#endif
+	uintptr_t key = (uintptr_t)inDWord;
 
 	key += ~(key << 16);
 	key ^=  (key >>  5);
diff --git a/source/kernel/gen_system/Makefile b/source/kernel/gen_system/Makefile
index 855af376615..31535ad2a97 100644
--- a/source/kernel/gen_system/Makefile
+++ b/source/kernel/gen_system/Makefile
@@ -37,4 +37,5 @@ CCFLAGS += $(LEVEL_2_CPP_WARNINGS)
 
 CPPFLAGS += -I$(NAN_MOTO)/include    
 CPPFLAGS += -I$(NAN_STRING)/include    
+CPPFLAGS += -I../../../source/blender/blenloader
 
diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk
index 9c1a28de999..6200d430dd4 100644
--- a/source/nan_definitions.mk
+++ b/source/nan_definitions.mk
@@ -287,7 +287,7 @@ endif
     export FREEDESKTOP ?= true
 
     export NAN_PYTHON ?= /usr/local
-    export NAN_PYTHON_VERSION ?= 2.3
+    export NAN_PYTHON_VERSION ?= 2.5
     export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION)
     export NAN_PYTHON_LIB ?= $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a
     export NAN_OPENAL ?= /usr/local
@@ -302,9 +302,9 @@ endif
     export NAN_NSPR ?= /usr/local
     export NAN_FREETYPE ?= $(LCGDIR)/freetype
     export NAN_GETTEXT ?= $(LCGDIR)/gettext
-    export NAN_SDL ?= $(shell sdl11-config --prefix)
-    export NAN_SDLLIBS ?= $(shell sdl11-config --libs)
-    export NAN_SDLCFLAGS ?= $(shell sdl11-config --cflags)
+    export NAN_SDL ?= $(shell sdl-config --prefix)
+    export NAN_SDLLIBS ?= $(shell sdl-config --libs)
+    export NAN_SDLCFLAGS ?= $(shell sdl-config --cflags)
 
     # Uncomment the following line to use Mozilla inplace of netscape
     # CPPFLAGS +=-DMOZ_NOT_NET

From 062bf735e7eb6ae4922127efe027ee9354dc4cf6 Mon Sep 17 00:00:00 2001
From: Ian Thompson <quornian@googlemail.com>
Date: Sun, 31 Aug 2008 16:23:31 +0000
Subject: [PATCH 227/252] Minor tidying and commenting

---
 source/blender/blenkernel/BKE_text.h     |  2 +-
 source/blender/blenkernel/intern/text.c  | 18 +++++++++---------
 source/blender/makesdna/DNA_text_types.h | 12 +++++++-----
 source/blender/python/api2_2x/Text.c     | 12 ++++++------
 source/blender/src/drawtext.c            |  8 ++++----
 5 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/source/blender/blenkernel/BKE_text.h b/source/blender/blenkernel/BKE_text.h
index bc687cba950..002c804f17f 100644
--- a/source/blender/blenkernel/BKE_text.h
+++ b/source/blender/blenkernel/BKE_text.h
@@ -101,7 +101,7 @@ void	convert_tabs		(struct SpaceText *st, int tab);
 void	txt_copy_clipboard	(struct Text *text);
 void	txt_paste_clipboard	(struct Text *text);
 
-void	txt_add_marker						(struct Text *text, struct TextLine *line, int start, int end, char clr[4], int group, int flags);
+void	txt_add_marker						(struct Text *text, struct TextLine *line, int start, int end, char color[4], int group, int flags);
 short	txt_clear_marker_region				(struct Text *text, struct TextLine *line, int start, int end, int group, int flags);
 short	txt_clear_markers					(struct Text *text, int group, int flags);
 struct TextMarker	*txt_find_marker		(struct Text *text, struct TextLine *line, int curs, int group, int flags);
diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c
index 611adbd5535..12133fc4fff 100644
--- a/source/blender/blenkernel/intern/text.c
+++ b/source/blender/blenkernel/intern/text.c
@@ -2682,14 +2682,14 @@ int setcurr_tab (Text *text)
 /*********************************/
 
 static int color_match(TextMarker *a, TextMarker *b) {
-	return (a->clr[0]==b->clr[0] &&
-			a->clr[1]==b->clr[1] &&
-			a->clr[2]==b->clr[2] &&
-			a->clr[3]==b->clr[3]);
+	return (a->color[0]==b->color[0] &&
+			a->color[1]==b->color[1] &&
+			a->color[2]==b->color[2] &&
+			a->color[3]==b->color[3]);
 }
 
 /* Creates and adds a marker to the list maintaining sorted order */
-void txt_add_marker(Text *text, TextLine *line, int start, int end, char clr[4], int group, int flags) {
+void txt_add_marker(Text *text, TextLine *line, int start, int end, char color[4], int group, int flags) {
 	TextMarker *tmp, *marker;
 
 	marker= MEM_mallocN(sizeof(TextMarker), "text_marker");
@@ -2700,10 +2700,10 @@ void txt_add_marker(Text *text, TextLine *line, int start, int end, char clr[4],
 	marker->group= group;
 	marker->flags= flags;
 
-	marker->clr[0]= clr[0];
-	marker->clr[1]= clr[1];
-	marker->clr[2]= clr[2];
-	marker->clr[3]= clr[3];
+	marker->color[0]= color[0];
+	marker->color[1]= color[1];
+	marker->color[2]= color[2];
+	marker->color[3]= color[3];
 
 	for (tmp=text->markers.last; tmp; tmp=tmp->prev)
 		if (tmp->lineno < marker->lineno || (tmp->lineno==marker->lineno && tmp->start < marker->start))
diff --git a/source/blender/makesdna/DNA_text_types.h b/source/blender/makesdna/DNA_text_types.h
index 6ea5603ca4c..48ecccd517a 100644
--- a/source/blender/makesdna/DNA_text_types.h
+++ b/source/blender/makesdna/DNA_text_types.h
@@ -38,15 +38,17 @@ typedef struct TextLine {
 	struct TextLine *next, *prev;
 
 	char *line;
-	char *format;
-	int len, blen;
+	char *format; /* may be NULL if syntax is off or not yet formatted */
+	int len, blen; /* blen unused */
 } TextLine;
 
 typedef struct TextMarker {
 	struct TextMarker *next, *prev;
-	int lineno, start, end, pad1;
-	int group, flags;
-	char clr[4], pad[4];
+
+	int lineno, start, end, pad1; /* line number and start/end character indices */
+	
+	int group, flags; /* see BKE_text.h for flag defines */
+	char color[4], pad[4]; /* draw color of the marker */
 } TextMarker;
 
 typedef struct Text {
diff --git a/source/blender/python/api2_2x/Text.c b/source/blender/python/api2_2x/Text.c
index 28924ecfcb3..a76a6f56224 100644
--- a/source/blender/python/api2_2x/Text.c
+++ b/source/blender/python/api2_2x/Text.c
@@ -688,7 +688,7 @@ static PyObject *Text_markSelection( BPy_Text * self, PyObject * args )
 {
 	int group = 0, flags = 0,r, g, b;
 	Text *text;
-	char clr[4];
+	char color[4];
 
 	text = self->text;
 	if (!text)
@@ -703,14 +703,14 @@ static PyObject *Text_markSelection( BPy_Text * self, PyObject * args )
 		return EXPP_ReturnPyObjError(PyExc_RuntimeError,
 					      "Cannot mark multi-line selection.");
 
-	clr[0] = (char) (r&0xFF);
-	clr[1] = (char) (g&0xFF);
-	clr[2] = (char) (b&0xFF);
-	clr[3] = 255;
+	color[0] = (char) (r&0xFF);
+	color[1] = (char) (g&0xFF);
+	color[2] = (char) (b&0xFF);
+	color[3] = 255;
 
 	group &= 0xFFFF;
 
-	txt_add_marker(text, text->curl, text->curc, text->selc, clr, group, flags);
+	txt_add_marker(text, text->curl, text->curc, text->selc, color, group, flags);
 	
 	Py_RETURN_NONE;
 }
diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index b8da797662c..0797a425f2a 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -809,7 +809,7 @@ static void draw_markers(SpaceText *st) {
 				x2= get_char_pos(st, line->line, marker->end) - st->left + offc;
 				y2= cy + offl;
 
-				glColor3ub(marker->clr[0], marker->clr[1], marker->clr[2]);
+				glColor3ub(marker->color[0], marker->color[1], marker->color[2]);
 				x= st->showlinenrs ? TXT_OFFSET + TEXTXLOC : TXT_OFFSET;
 				y= curarea->winy-3;
 
@@ -1518,13 +1518,13 @@ void find_and_replace(SpaceText *st, short mode) {
 					txt_insert_buf(text, g_replace_str);
 					if (st->showsyntax) txt_format_line(st, text->curl, 1);
 				} else if (mode==2) {
-					char clr[4];
-					BIF_GetThemeColor4ubv(TH_SHADE2, clr);
+					char color[4];
+					BIF_GetThemeColor4ubv(TH_SHADE2, color);
 					if (txt_find_marker(text, text->curl, text->selc, TMARK_GRP_FINDALL, 0)) {
 						if (tmp) MEM_freeN(tmp), tmp=NULL;
 						break;
 					}
-					txt_add_marker(text, text->curl, text->curc, text->selc, clr, TMARK_GRP_FINDALL, TMARK_EDITALL);
+					txt_add_marker(text, text->curl, text->curc, text->selc, color, TMARK_GRP_FINDALL, TMARK_EDITALL);
 				}
 			}
 			MEM_freeN(tmp);

From 234b616078ab5de7c6ef2a96c8a201a7552ae96c Mon Sep 17 00:00:00 2001
From: Benoit Bolsee <benoit.bolsee@online.be>
Date: Sun, 31 Aug 2008 21:53:39 +0000
Subject: [PATCH 228/252] BGE bug #17459 fixed: action actuators depending on
 their order in the actuator list.

---
 source/gameengine/Converter/BL_ArmatureObject.cpp | 6 ++++++
 source/gameengine/Converter/BL_ArmatureObject.h   | 1 +
 2 files changed, 7 insertions(+)

diff --git a/source/gameengine/Converter/BL_ArmatureObject.cpp b/source/gameengine/Converter/BL_ArmatureObject.cpp
index 09f1d9d4d87..cdfce321713 100644
--- a/source/gameengine/Converter/BL_ArmatureObject.cpp
+++ b/source/gameengine/Converter/BL_ArmatureObject.cpp
@@ -54,6 +54,7 @@ BL_ArmatureObject::BL_ArmatureObject(
 :	KX_GameObject(sgReplicationInfo,callbacks),
 	m_objArma(armature),
 	m_mrdPose(NULL),
+	m_framePose(NULL),
 	m_lastframe(0.),
 	m_activeAct(NULL),
 	m_activePriority(999)
@@ -114,10 +115,15 @@ bool BL_ArmatureObject::SetActiveAction(BL_ActionActuator *act, short priority,
 		m_activePriority = 9999;
 		m_lastframe= curtime;
 		m_activeAct = NULL;
+		// remember the pose at the start of the frame
+		m_framePose = m_pose;
 	}
 
 	if (priority<=m_activePriority)
 	{
+		if (priority<m_activePriority)
+			// this action overwrites the previous ones, start from initial pose to cancel their effects
+			m_pose = m_framePose;
 		if (m_activeAct && (m_activeAct!=act))
 			m_activeAct->SetBlendTime(0.0);	/* Reset the blend timer */
 		m_activeAct = act;
diff --git a/source/gameengine/Converter/BL_ArmatureObject.h b/source/gameengine/Converter/BL_ArmatureObject.h
index 752bd5eb365..a612ca77ec0 100644
--- a/source/gameengine/Converter/BL_ArmatureObject.h
+++ b/source/gameengine/Converter/BL_ArmatureObject.h
@@ -80,6 +80,7 @@ protected:
 	struct bArmature	*m_armature;
 	struct bPose		*m_pose;
 	struct bPose		*m_mrdPose;
+	struct bPose		*m_framePose;
 	double	m_lastframe;
 	class BL_ActionActuator *m_activeAct;
 	short	m_activePriority;

From e8049903ac8d44973ba7c30da0f4f1d02c790d8f Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Mon, 1 Sep 2008 00:12:39 +0000
Subject: [PATCH 229/252] BGE python api for get/setting the joystick index,
 minor cleanup also.

---
 .../GameLogic/SCA_JoystickSensor.cpp          | 105 ++++++++----------
 .../gameengine/GameLogic/SCA_JoystickSensor.h |  27 +++--
 2 files changed, 63 insertions(+), 69 deletions(-)

diff --git a/source/gameengine/GameLogic/SCA_JoystickSensor.cpp b/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
index 4362a896f61..f77272b0974 100644
--- a/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
+++ b/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
@@ -295,6 +295,8 @@ PyParentObject SCA_JoystickSensor::Parents[] = {
 
 
 PyMethodDef SCA_JoystickSensor::Methods[] = {
+	{"getIndex", 	 (PyCFunction) SCA_JoystickSensor::sPyGetIndex,		METH_NOARGS,	GetIndex_doc},
+	{"setIndex",	 (PyCFunction) SCA_JoystickSensor::sPySetIndex,		METH_O,	SetIndex_doc},
 	{"getAxis", 	 (PyCFunction) SCA_JoystickSensor::sPyGetAxis,		METH_NOARGS,	GetAxis_doc},
 	{"setAxis", 	 (PyCFunction) SCA_JoystickSensor::sPySetAxis,		METH_VARARGS,	SetAxis_doc},
 	{"getAxisValue", (PyCFunction) SCA_JoystickSensor::sPyGetRealAxis,	METH_NOARGS,	GetRealAxis_doc},
@@ -316,14 +318,36 @@ PyObject* SCA_JoystickSensor::_getattr(const STR_String& attr) {
 }
 
 
+/* get index ---------------------------------------------------------- */
+char SCA_JoystickSensor::GetIndex_doc[] = 
+"getIndex\n"
+"\tReturns the joystick index to use.\n";
+PyObject* SCA_JoystickSensor::PyGetIndex( PyObject* self ) {
+	return PyInt_FromLong(m_joyindex);
+}
+
+
+/* set index ---------------------------------------------------------- */
+char SCA_JoystickSensor::SetIndex_doc[] = 
+"setIndex\n"
+"\tSets the joystick index to use.\n";
+PyObject* SCA_JoystickSensor::PySetIndex( PyObject* self, PyObject* value ) {
+	int index = PyInt_AsLong( value ); /* -1 on error, will raise an error in this case */
+	if (index < 0 or 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  ---------------------------------------------------------- */
 char SCA_JoystickSensor::GetAxis_doc[] = 
 "getAxis\n"
 "\tReturns the current state of the axis.\n";
-PyObject* SCA_JoystickSensor::PyGetAxis( PyObject* self, 
-										PyObject* args, 
-										PyObject* kwds) {
-	return Py_BuildValue("[ii]",m_axis, m_axisf);
+PyObject* SCA_JoystickSensor::PyGetAxis( PyObject* self) {
+	return PyInt_FromLong(m_joyindex);
 }
 
 
@@ -331,9 +355,7 @@ PyObject* SCA_JoystickSensor::PyGetAxis( PyObject* self,
 char SCA_JoystickSensor::SetAxis_doc[] = 
 "setAxis\n"
 "\tSets the current state of the axis.\n";
-PyObject* SCA_JoystickSensor::PySetAxis( PyObject* self, 
-										PyObject* args, 
-										PyObject* kwds) {
+PyObject* SCA_JoystickSensor::PySetAxis( PyObject* self, PyObject* args ) {
 	
 	int axis,axisflag;
 	if(!PyArg_ParseTuple(args, "ii", &axis, &axisflag)){
@@ -341,7 +363,7 @@ PyObject* SCA_JoystickSensor::PySetAxis( PyObject* self,
 	}
 	m_axis = axis;
 	m_axisf = axisflag;
-	Py_Return;
+	Py_RETURN_NONE;
 }
 
 
@@ -349,16 +371,9 @@ PyObject* SCA_JoystickSensor::PySetAxis( PyObject* self,
 char SCA_JoystickSensor::GetRealAxis_doc[] = 
 "getAxisValue\n"
 "\tReturns a list of the values for each axis .\n";
-PyObject* SCA_JoystickSensor::PyGetRealAxis( PyObject* self, 
-											PyObject* args, 
-											PyObject* kwds) {
-	int a,b,c,d;
+PyObject* SCA_JoystickSensor::PyGetRealAxis( PyObject* self) {
 	SCA_Joystick *joy = m_pJoystickMgr->GetJoystickDevice(m_joyindex);
-	a = joy->GetAxis10();
-	b = joy->GetAxis11();
-	c = joy->GetAxis20();
-	d = joy->GetAxis21();
-	return Py_BuildValue("[iiii]",a,b,c,d);
+	return Py_BuildValue("[iiii]", joy->GetAxis10(), joy->GetAxis11(), joy->GetAxis20(), joy->GetAxis21());
 }
 
 
@@ -366,10 +381,8 @@ PyObject* SCA_JoystickSensor::PyGetRealAxis( PyObject* self,
 char SCA_JoystickSensor::GetThreshold_doc[] = 
 "getThreshold\n"
 "\tReturns the threshold of the axis.\n";
-PyObject* SCA_JoystickSensor::PyGetThreshold( PyObject* self, 
-											 PyObject* args, 
-											 PyObject* kwds) {
-	return Py_BuildValue("i", m_precision);
+PyObject* SCA_JoystickSensor::PyGetThreshold( PyObject* self) {
+	return PyInt_FromLong(m_precision);
 }
 
 
@@ -377,15 +390,13 @@ PyObject* SCA_JoystickSensor::PyGetThreshold( PyObject* self,
 char SCA_JoystickSensor::SetThreshold_doc[] = 
 "setThreshold\n"
 "\tSets the threshold of the axis.\n";
-PyObject* SCA_JoystickSensor::PySetThreshold( PyObject* self, 
-											 PyObject* args, 
-											 PyObject* kwds) {
+PyObject* SCA_JoystickSensor::PySetThreshold( PyObject* self, PyObject* args ) {
 	int thresh;
 	if(!PyArg_ParseTuple(args, "i", &thresh)){
 		return NULL;
 	}
 	m_precision = thresh;
-	Py_Return;
+	Py_RETURN_NONE;
 }
 
 
@@ -393,9 +404,7 @@ PyObject* SCA_JoystickSensor::PySetThreshold( PyObject* self,
 char SCA_JoystickSensor::GetButton_doc[] = 
 "getButton\n"
 "\tReturns the currently pressed button.\n";
-PyObject* SCA_JoystickSensor::PyGetButton( PyObject* self, 
-										  PyObject* args, 
-										  PyObject* kwds) {
+PyObject* SCA_JoystickSensor::PyGetButton( PyObject* self) {
 	return Py_BuildValue("[ii]",m_button, m_buttonf);
 }
 
@@ -404,16 +413,14 @@ PyObject* SCA_JoystickSensor::PyGetButton( PyObject* self,
 char SCA_JoystickSensor::SetButton_doc[] = 
 "setButton\n"
 "\tSets the button the sensor reacts to.\n";
-PyObject* SCA_JoystickSensor::PySetButton( PyObject* self, 
-										  PyObject* args, 
-										  PyObject* kwds) {
+PyObject* SCA_JoystickSensor::PySetButton( PyObject* self, PyObject* args ) {
 	int button,buttonflag;
 	if(!PyArg_ParseTuple(args, "ii", &button, &buttonflag)){
 		return NULL;
 	}
 	m_button = button;
 	m_buttonf = buttonflag;
-	Py_Return;	
+	Py_RETURN_NONE;	
 }
 
 
@@ -421,9 +428,7 @@ PyObject* SCA_JoystickSensor::PySetButton( PyObject* self,
 char SCA_JoystickSensor::GetHat_doc[] = 
 "getHat\n"
 "\tReturns the current direction of the hat.\n";
-PyObject* SCA_JoystickSensor::PyGetHat( PyObject* self, 
-									   PyObject* args, 
-									   PyObject* kwds) {
+PyObject* SCA_JoystickSensor::PyGetHat( PyObject* self ) {
 	return Py_BuildValue("[ii]",m_hat, m_hatf);
 }
 
@@ -432,16 +437,14 @@ PyObject* SCA_JoystickSensor::PyGetHat( PyObject* self,
 char SCA_JoystickSensor::SetHat_doc[] = 
 "setHat\n"
 "\tSets the hat the sensor reacts to.\n";
-PyObject* SCA_JoystickSensor::PySetHat( PyObject* self, 
-									   PyObject* args, 
-									   PyObject* kwds) {
+PyObject* SCA_JoystickSensor::PySetHat( PyObject* self, PyObject* args ) {
 	int hat,hatflag;
 	if(!PyArg_ParseTuple(args, "ii", &hat, &hatflag)){
 		return NULL;
 	}
 	m_hat = hat;
 	m_hatf = hatflag;
-	Py_Return;
+	Py_RETURN_NONE;
 }
 
 
@@ -449,37 +452,25 @@ PyObject* SCA_JoystickSensor::PySetHat( PyObject* self,
 char SCA_JoystickSensor::NumberOfAxes_doc[] = 
 "getNumAxes\n"
 "\tReturns the number of axes .\n";
-PyObject* SCA_JoystickSensor::PyNumberOfAxes( PyObject* self, 
-											PyObject* args, 
-											PyObject* kwds) {
-	int num;
+PyObject* SCA_JoystickSensor::PyNumberOfAxes( PyObject* self ) {
 	SCA_Joystick *joy = m_pJoystickMgr->GetJoystickDevice(m_joyindex);
-	num = joy->GetNumberOfAxes();
-	return Py_BuildValue("i",num);
+	return PyInt_FromLong( joy->GetNumberOfAxes() );
 }
 
 
 char SCA_JoystickSensor::NumberOfButtons_doc[] = 
 "getNumButtons\n"
 "\tReturns the number of buttons .\n";
-PyObject* SCA_JoystickSensor::PyNumberOfButtons( PyObject* self, 
-											PyObject* args, 
-											PyObject* kwds) {
-	int num;
+PyObject* SCA_JoystickSensor::PyNumberOfButtons( PyObject* self ) {
 	SCA_Joystick *joy = m_pJoystickMgr->GetJoystickDevice(m_joyindex);
-	num = joy->GetNumberOfButtons();
-	return Py_BuildValue("i",num);
+	return PyInt_FromLong( joy->GetNumberOfButtons() );
 }
 
 
 char SCA_JoystickSensor::NumberOfHats_doc[] = 
 "getNumHats\n"
 "\tReturns the number of hats .\n";
-PyObject* SCA_JoystickSensor::PyNumberOfHats( PyObject* self, 
-											PyObject* args, 
-											PyObject* kwds) {
-	int num;
+PyObject* SCA_JoystickSensor::PyNumberOfHats( PyObject* self ) {
 	SCA_Joystick *joy = m_pJoystickMgr->GetJoystickDevice(m_joyindex);
-	num = joy->GetNumberOfHats();
-	return Py_BuildValue("i",num);
+	return PyInt_FromLong( joy->GetNumberOfHats() );
 }
diff --git a/source/gameengine/GameLogic/SCA_JoystickSensor.h b/source/gameengine/GameLogic/SCA_JoystickSensor.h
index e499d8cd0dc..504c4eaa497 100644
--- a/source/gameengine/GameLogic/SCA_JoystickSensor.h
+++ b/source/gameengine/GameLogic/SCA_JoystickSensor.h
@@ -112,22 +112,25 @@ public:
 
 	virtual PyObject* _getattr(const STR_String& attr);
 
+	/* Joystick Index */
+	KX_PYMETHOD_DOC_NOARGS(SCA_JoystickSensor,GetIndex);
+	KX_PYMETHOD_DOC_O(SCA_JoystickSensor,SetIndex);
 	/* Axes*/
-	KX_PYMETHOD_DOC(SCA_JoystickSensor,GetAxis);
-	KX_PYMETHOD_DOC(SCA_JoystickSensor,SetAxis);
-	KX_PYMETHOD_DOC(SCA_JoystickSensor,GetRealAxis);
-	KX_PYMETHOD_DOC(SCA_JoystickSensor,GetThreshold);
-	KX_PYMETHOD_DOC(SCA_JoystickSensor,SetThreshold);
+	KX_PYMETHOD_DOC_NOARGS(SCA_JoystickSensor,GetAxis);
+	KX_PYMETHOD_DOC_VARARGS(SCA_JoystickSensor,SetAxis);
+	KX_PYMETHOD_DOC_NOARGS(SCA_JoystickSensor,GetRealAxis);
+	KX_PYMETHOD_DOC_NOARGS(SCA_JoystickSensor,GetThreshold);
+	KX_PYMETHOD_DOC_VARARGS(SCA_JoystickSensor,SetThreshold);
 	/* Buttons */
-	KX_PYMETHOD_DOC(SCA_JoystickSensor,GetButton);
-	KX_PYMETHOD_DOC(SCA_JoystickSensor,SetButton);
+	KX_PYMETHOD_DOC_NOARGS(SCA_JoystickSensor,GetButton);
+	KX_PYMETHOD_DOC_VARARGS(SCA_JoystickSensor,SetButton);
 	/* Hats */
-	KX_PYMETHOD_DOC(SCA_JoystickSensor,GetHat);
-	KX_PYMETHOD_DOC(SCA_JoystickSensor,SetHat);
+	KX_PYMETHOD_DOC_NOARGS(SCA_JoystickSensor,GetHat);
+	KX_PYMETHOD_DOC_VARARGS(SCA_JoystickSensor,SetHat);
 	/* number of */
-	KX_PYMETHOD_DOC(SCA_JoystickSensor,NumberOfAxes);
-	KX_PYMETHOD_DOC(SCA_JoystickSensor,NumberOfButtons);
-	KX_PYMETHOD_DOC(SCA_JoystickSensor,NumberOfHats);
+	KX_PYMETHOD_DOC_NOARGS(SCA_JoystickSensor,NumberOfAxes);
+	KX_PYMETHOD_DOC_NOARGS(SCA_JoystickSensor,NumberOfButtons);
+	KX_PYMETHOD_DOC_NOARGS(SCA_JoystickSensor,NumberOfHats);
 	
 };
 

From 6f3a8519da4e391d88198ce5e7f4098ef3921fa9 Mon Sep 17 00:00:00 2001
From: Joshua Leung <aligorith@gmail.com>
Date: Mon, 1 Sep 2008 04:09:07 +0000
Subject: [PATCH 230/252] Bugfix #17557: Segfault when no active node and
 trying to insert keyframe

When there is no active node in the Composite Nodes, Blender crashes when trying to insert a keyframe using IKEY.
---
 source/blender/src/editnode.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/source/blender/src/editnode.c b/source/blender/src/editnode.c
index eba6c5b4488..d3ba153e600 100644
--- a/source/blender/src/editnode.c
+++ b/source/blender/src/editnode.c
@@ -2001,7 +2001,10 @@ void node_hide(SpaceNode *snode)
 void node_insert_key(SpaceNode *snode)
 {
 	bNode *node= editnode_get_active(snode->edittree);
-
+	
+	if(node == NULL)
+		return;
+	
 	if(node->type==CMP_NODE_TIME) {
 		if(node->custom1<node->custom2) {
 

From 7b9ee57c0bff50f812c00bc16801e8e2da12e253 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Mon, 1 Sep 2008 06:25:13 +0000
Subject: [PATCH 231/252] BGE joystick sensor py api function 'getConnected()',
 returns true if the joystick is connected and working. SCA_Joystick.h seemed
 to have twice as many newlines as needed.

---
 .../GameLogic/Joystick/SCA_Joystick.cpp       |  10 ++
 .../GameLogic/Joystick/SCA_Joystick.h         | 147 +-----------------
 .../GameLogic/SCA_JoystickSensor.cpp          |  13 +-
 .../gameengine/GameLogic/SCA_JoystickSensor.h |   1 +
 4 files changed, 28 insertions(+), 143 deletions(-)

diff --git a/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp b/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
index b244bddcacd..ec0b0303b68 100644
--- a/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
+++ b/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
@@ -367,6 +367,16 @@ void SCA_Joystick::DestroyJoystickDevice(void)
 	}
 }
 
+int SCA_Joystick::Connected(void)
+{
+	if (m_isinit){
+		if(SDL_JoystickOpened(m_joyindex)){
+			return 1;
+		}
+	}
+	
+	return 0;
+}
 
 void SCA_Joystick::pFillAxes()
 {
diff --git a/source/gameengine/GameLogic/Joystick/SCA_Joystick.h b/source/gameengine/GameLogic/Joystick/SCA_Joystick.h
index 689efc72975..d318d28e0f7 100644
--- a/source/gameengine/GameLogic/Joystick/SCA_Joystick.h
+++ b/source/gameengine/GameLogic/Joystick/SCA_Joystick.h
@@ -1,72 +1,36 @@
 /**
-
  * ***** 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): snailrose.
-
  *
-
  * ***** END GPL LICENSE BLOCK *****
-
  */
 
 #ifndef _SCA_JOYSTICK_H_
-
 #define _SCA_JOYSTICK_H_
 
-
-
 #include "SCA_JoystickDefines.h"
 
-
-
-
-
 /*
-
  * Basic Joystick class
  * I will make this class a singleton because there should be only one joystick
  * even if there are more than one scene using it and count how many scene are using it.
@@ -86,169 +50,105 @@ class SCA_Joystick
 	int				m_joyindex;
 
 	/* 
-
 	 *support for 2 axes 
-
 	 */
 
 	int m_axis10,m_axis11;
-
 	int m_axis20,m_axis21;
 
-	/* 
-
+	/*
 	 * Precision or range of the axes
-
 	 */
-
 	int 			m_prec;
 
 	/*
-
 	 * multiple axis values stored here
-
 	 */
-
 	int 			m_axisnum;
-
 	int 			m_axisvalue;
 
 	/*
-
 	 * max # of axes avail
-
 	 */
-
 	/*disabled
-
 	int 			m_axismax;
-
 	*/
 
 	/* 
-
 	 *	button values stored here 
-
 	 */
-
 	int 			m_buttonnum;
 
 	/*
-
 	 * max # of buttons avail
-
 	*/
 
 	int 			m_buttonmax;
-
 	 /* 
-
 	 * hat values stored here 
-
 	 */
-
 	int 			m_hatnum;
-
 	int 			m_hatdir;
 
 	/*
 
 	 * max # of hats avail
-
 		disabled
-
 	int 			m_hatmax;
-
 	 */
-
 	/* is the joystick initialized ?*/
-
 	bool			m_isinit;
 
 	
-
 	/* is triggered */
-
 	bool			m_istrig;
 
 	/*
-
 	 * Open the joystick
-
 	 */
-
 	bool CreateJoystickDevice(void);
 
 	/*
-
 	 * Close the joystick
-
 	 */
-
 	void DestroyJoystickDevice(void);
-
 	
-
 	/*
-
 	 * event callbacks
-
 	 */
 
 	void OnAxisMotion(void);
-
 	void OnHatMotion(void);
-
 	void OnButtonUp(void);
-
 	void OnButtonDown(void);
-
 	void OnNothing(void);
-
 	void OnBallMotion(void){}
 
 	/*
-
 	 * fills the axis mnember values 
-
 	 */
-
 	void pFillAxes(void);
-
-
-
 	void pFillButtons(void);
 
 	/*
-
 	 * returns m_axis10,m_axis11...
-
 	 */
-
 	int pGetAxis(int axisnum, int udlr);
-
+	
 	/*
-
 	 * gets the current button
-
 	 */
 
 	int pGetButtonPress(int button);
 
 	/*
-
 	 * returns if no button is pressed
-
 	 */
-
 	int pGetButtonRelease(int button);
 
 	/*
-
 	 * gets the current hat direction
-
 	 */
-
 	int pGetHat(int direction);
 
 	SCA_Joystick(short int index);
@@ -258,40 +158,27 @@ class SCA_Joystick
 public:
 
 	static SCA_Joystick *GetInstance( short int joyindex );
-
 	void ReleaseInstance();
 	
-
 	void HandleEvents();
 
 	/*
-
 	 */
 
 	bool aUpAxisIsPositive(int axis);
-
 	bool aDownAxisIsPositive(int axis);
-
 	bool aLeftAxisIsPositive(int axis);
-
 	bool aRightAxisIsPositive(int axis);
-
 	bool aButtonPressIsPositive(int button);
-
 	bool aButtonReleaseIsPositive(int button);
-
 	bool aHatIsPositive(int dir);
 
 	/*
-
 	 * precision is default '3200' which is overridden by input
-
 	 */
 
 	void cSetPrecision(int val);
 
-
-
 	int GetAxis10(void){
 
 		return m_axis10;
@@ -299,77 +186,55 @@ public:
 	}
 
 	int GetAxis11(void){
-
 		return m_axis11;
-
 	}
 
 	int GetAxis20(void){
-
 		return m_axis20;
-
 	}
 
 	int GetAxis21(void){
-
 		return m_axis21;
-
 	}
 
 	int GetButton(void){
-
 		return m_buttonnum;
-
 	}
 
 	int GetHat(void){
-
 		return m_hatdir;
-
 	}
 
 	int GetThreshold(void){
-
 		return m_prec;
-
 	}
 
 	bool IsTrig(void){
-
 		return m_istrig;
-
 	}
-
 	
 
 	/*
-
 	 * returns true if an event is being processed
-
 	 */
 
 	bool GetJoyAxisMotion(void);
-
 	bool GetJoyButtonPress(void);
-
 	bool GetJoyButtonRelease(void);
-
 	bool GetJoyHatMotion(void);
 
 	/*
-
 	 * returns the # of...
-
 	 */
 
 	int GetNumberOfAxes(void);
-
 	int GetNumberOfButtons(void);
-
 	int GetNumberOfHats(void);
-
 	
-
+	/*
+	 * Test if the joystick is connected
+	 */
+	int Connected(void);
 };
 
 
diff --git a/source/gameengine/GameLogic/SCA_JoystickSensor.cpp b/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
index f77272b0974..325657cbc7f 100644
--- a/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
+++ b/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
@@ -296,7 +296,7 @@ PyParentObject SCA_JoystickSensor::Parents[] = {
 
 PyMethodDef SCA_JoystickSensor::Methods[] = {
 	{"getIndex", 	 (PyCFunction) SCA_JoystickSensor::sPyGetIndex,		METH_NOARGS,	GetIndex_doc},
-	{"setIndex",	 (PyCFunction) SCA_JoystickSensor::sPySetIndex,		METH_O,	SetIndex_doc},
+	{"setIndex",	 (PyCFunction) SCA_JoystickSensor::sPySetIndex,		METH_O,			SetIndex_doc},
 	{"getAxis", 	 (PyCFunction) SCA_JoystickSensor::sPyGetAxis,		METH_NOARGS,	GetAxis_doc},
 	{"setAxis", 	 (PyCFunction) SCA_JoystickSensor::sPySetAxis,		METH_VARARGS,	SetAxis_doc},
 	{"getAxisValue", (PyCFunction) SCA_JoystickSensor::sPyGetRealAxis,	METH_NOARGS,	GetRealAxis_doc},
@@ -309,6 +309,7 @@ PyMethodDef SCA_JoystickSensor::Methods[] = {
 	{"getNumAxes",	 (PyCFunction) SCA_JoystickSensor::sPyNumberOfAxes,	METH_NOARGS,	NumberOfAxes_doc},
 	{"getNumButtons",(PyCFunction) SCA_JoystickSensor::sPyNumberOfButtons,METH_NOARGS,	NumberOfButtons_doc},
 	{"getNumHats",	 (PyCFunction) SCA_JoystickSensor::sPyNumberOfHats,	METH_NOARGS,	NumberOfHats_doc},
+	{"getConnected", (PyCFunction) SCA_JoystickSensor::sPyConnected,	METH_NOARGS,	Connected_doc},
 	{NULL,NULL} //Sentinel
 };
 
@@ -333,7 +334,7 @@ char SCA_JoystickSensor::SetIndex_doc[] =
 "\tSets the joystick index to use.\n";
 PyObject* SCA_JoystickSensor::PySetIndex( PyObject* self, PyObject* value ) {
 	int index = PyInt_AsLong( value ); /* -1 on error, will raise an error in this case */
-	if (index < 0 or index >= JOYINDEX_MAX) {
+	if (index < 0 || index >= JOYINDEX_MAX) {
 		PyErr_SetString(PyExc_ValueError, "joystick index out of range or not an int");
 		return NULL;
 	}
@@ -474,3 +475,11 @@ PyObject* SCA_JoystickSensor::PyNumberOfHats( PyObject* self ) {
 	SCA_Joystick *joy = m_pJoystickMgr->GetJoystickDevice(m_joyindex);
 	return PyInt_FromLong( joy->GetNumberOfHats() );
 }
+
+char SCA_JoystickSensor::Connected_doc[] = 
+"getConnected\n"
+"\tReturns True if a joystick is connected at this joysticks index.\n";
+PyObject* SCA_JoystickSensor::PyConnected( PyObject* self ) {
+	SCA_Joystick *joy = m_pJoystickMgr->GetJoystickDevice(m_joyindex);
+	return PyBool_FromLong( joy->Connected() );
+}
diff --git a/source/gameengine/GameLogic/SCA_JoystickSensor.h b/source/gameengine/GameLogic/SCA_JoystickSensor.h
index 504c4eaa497..a21146b568b 100644
--- a/source/gameengine/GameLogic/SCA_JoystickSensor.h
+++ b/source/gameengine/GameLogic/SCA_JoystickSensor.h
@@ -131,6 +131,7 @@ public:
 	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);
 	
 };
 

From 81ad271d157c70433b36af31581261ae8c2098a4 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Tue, 2 Sep 2008 02:03:03 +0000
Subject: [PATCH 232/252] BGE joystick sensor bugfix, was sending true events
 logic tick (as if the true pulse option was enabled).

---
 .../GameLogic/SCA_JoystickSensor.cpp          | 24 +++++++++++++++++--
 .../gameengine/GameLogic/SCA_JoystickSensor.h |  6 +++++
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/source/gameengine/GameLogic/SCA_JoystickSensor.cpp b/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
index 325657cbc7f..456401d48df 100644
--- a/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
+++ b/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
@@ -120,7 +120,7 @@ bool SCA_JoystickSensor::Evaluate(CValue* event)
 			js->cSetPrecision(m_precision);
 			if(m_axisf == 1){
 				if(js->aUpAxisIsPositive(m_axis)){
-					m_istrig =1;
+					m_istrig = 1;
 					result = true;
 				}else{
 					if(m_istrig){
@@ -243,11 +243,31 @@ bool SCA_JoystickSensor::Evaluate(CValue* event)
 		printf("Error invalid switch statement\n");
 		break;
 	}
-	if(!js->IsTrig()){
+	
+	if (js->IsTrig()) {
+		/* This test detects changes with the joystick trigger state.
+		 * js->IsTrig() will stay true as long as the key is held.
+		 * even though the event from SDL will only be sent once.
+		 * istrig_js && m_istrig_lastjs - when this is true it means this sensor
+		 * had the same joystick trigger state last time,
+		 * Setting the result false this time means it wont run the sensors
+		 * controller every time (like a pulse sensor)
+		 *
+		 * This is not done with the joystick its self incase other sensors use
+		 * it or become active.
+		 */
+		if (m_istrig_lastjs) {
+			result = false;
+		}
+		m_istrig_lastjs = true;
+	} else {
 		m_istrig = 0;
+		m_istrig_lastjs = false;
 	}
+	
 	if (reset)
 		result = true;
+	
 	return result;
 }
 
diff --git a/source/gameengine/GameLogic/SCA_JoystickSensor.h b/source/gameengine/GameLogic/SCA_JoystickSensor.h
index a21146b568b..8b74f6e0296 100644
--- a/source/gameengine/GameLogic/SCA_JoystickSensor.h
+++ b/source/gameengine/GameLogic/SCA_JoystickSensor.h
@@ -68,6 +68,12 @@ class SCA_JoystickSensor :public SCA_ISensor
 	 * Is an event triggered ?
 	 */
 	bool	m_istrig;
+	/**
+	 * Last trigger state for this sensors joystick,
+	 * Otherwise it will trigger all the time
+	 * this is used to see if the trigger state changes.
+	 */
+	bool	m_istrig_lastjs;
 	/**
 	 * The mode to determine axis,button or hat
 	 */

From 84dcfa181b0722655ceba3930a2daa0e27e72f93 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Tue, 2 Sep 2008 06:12:19 +0000
Subject: [PATCH 233/252] BGE Bugfix, SDL joysticks arrow keys didnt work when
 2 joysticks were being used at the same time. The event queue was running for
 every joystick sensor without checking if the events were for that joystick.
 seperating the event queue for each joystick is overkill so instead deal with
 all joysticks events in once function.

Also removed some unused functions
---
 .../GameLogic/Joystick/SCA_Joystick.cpp       | 102 ------------------
 .../GameLogic/Joystick/SCA_Joystick.h         |  36 +++----
 .../GameLogic/Joystick/SCA_JoystickDefines.h  |   8 --
 .../GameLogic/Joystick/SCA_JoystickEvents.cpp |  56 ++++++++--
 .../GameLogic/Joystick/SCA_JoystickPrivate.h  |   4 -
 .../GameLogic/SCA_JoystickManager.cpp         |  22 ++--
 .../GameLogic/SCA_JoystickSensor.cpp          |   4 +-
 7 files changed, 74 insertions(+), 158 deletions(-)

diff --git a/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp b/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
index ec0b0303b68..06002060bf1 100644
--- a/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
+++ b/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
@@ -99,38 +99,6 @@ void SCA_Joystick::ReleaseInstance()
 	}
 }
 
-void SCA_Joystick::HandleEvents()
-{
-	if(m_isinit)
-	{
-		if(SDL_PollEvent(&m_private->m_event))
-		{
-			switch(m_private->m_event.type)
-			{
-			case SDL_JOYAXISMOTION:
-				HANDLE_AXISMOTION(OnAxisMotion);
-				break;
-			case SDL_JOYHATMOTION:
-				HANDLE_HATMOTION(OnHatMotion);
-				break;
-			case SDL_JOYBUTTONUP:
-				HANDLE_BUTTONUP(OnButtonUp);
-				break;
-			case SDL_JOYBUTTONDOWN:
-				HANDLE_BUTTONDOWN(OnButtonDown);
-				break;
-			case SDL_JOYBALLMOTION: 
-				HANDLE_BALLMOTION(OnBallMotion);
-				break;
-			default:
-				HANDLE_NOEVENT(OnNothing);
-				break;
-			}
-		}
-	}
-}
-
-
 void SCA_Joystick::cSetPrecision(int val)
 {
 	m_prec = val;
@@ -229,76 +197,6 @@ int SCA_Joystick::pGetHat(int direction)
 	return 0;
 }
 
-
-bool SCA_Joystick::GetJoyAxisMotion()
-{
-	bool result = false;
-	if(m_isinit){
-		if(SDL_PollEvent(&m_private->m_event)){
-			switch(m_private->m_event.type)
-			{
-			case SDL_JOYAXISMOTION:
-				result = true;
-				break;
-			}
-		}
-	}
-	return result;
-}
-
-
-bool SCA_Joystick::GetJoyButtonPress()
-{
-	bool result = false;
-	if(m_isinit){
-		if(SDL_PollEvent(&m_private->m_event)){
-			switch(m_private->m_event.type)
-			{
-			case SDL_JOYBUTTONDOWN:
-				result = true;
-				break;
-			}
-		}
-	}
-	return result;
-}
-
-
-bool SCA_Joystick::GetJoyButtonRelease()
-{
-	bool result = false;
-	if(m_isinit)
-	{
-		if(SDL_PollEvent(&m_private->m_event)){
-			switch(m_private->m_event.type)
-			{
-			case SDL_JOYBUTTONUP:
-				result = true;
-				break;
-			}
-		}
-	}
-	return result;
-}
-
-
-bool SCA_Joystick::GetJoyHatMotion()
-{
-	bool result = false;
-	if(m_isinit){
-		if(SDL_PollEvent(&m_private->m_event)){
-			switch(m_private->m_event.type)
-			{
-			case SDL_JOYHATMOTION:
-				result = true;
-				break;
-			}
-		}
-	}
-	return 0;
-}
-
-
 int SCA_Joystick::GetNumberOfAxes()
 {
 	int number;
diff --git a/source/gameengine/GameLogic/Joystick/SCA_Joystick.h b/source/gameengine/GameLogic/Joystick/SCA_Joystick.h
index d318d28e0f7..bcbb43241c2 100644
--- a/source/gameengine/GameLogic/Joystick/SCA_Joystick.h
+++ b/source/gameengine/GameLogic/Joystick/SCA_Joystick.h
@@ -29,6 +29,7 @@
 #define _SCA_JOYSTICK_H_
 
 #include "SCA_JoystickDefines.h"
+#include "SDL.h"
 
 /*
  * Basic Joystick class
@@ -103,6 +104,16 @@ class SCA_Joystick
 	/* is triggered */
 	bool			m_istrig;
 
+	/*
+	 * event callbacks
+	 */
+	void OnAxisMotion(SDL_Event *sdl_event);
+	void OnHatMotion(SDL_Event *sdl_event);
+	void OnButtonUp(SDL_Event *sdl_event);
+	void OnButtonDown(SDL_Event *sdl_event);
+	void OnNothing(SDL_Event *sdl_event);
+	void OnBallMotion(SDL_Event *sdl_event){}
+
 	/*
 	 * Open the joystick
 	 */
@@ -112,17 +123,6 @@ class SCA_Joystick
 	 * Close the joystick
 	 */
 	void DestroyJoystickDevice(void);
-	
-	/*
-	 * event callbacks
-	 */
-
-	void OnAxisMotion(void);
-	void OnHatMotion(void);
-	void OnButtonUp(void);
-	void OnButtonDown(void);
-	void OnNothing(void);
-	void OnBallMotion(void){}
 
 	/*
 	 * fills the axis mnember values 
@@ -158,9 +158,9 @@ class SCA_Joystick
 public:
 
 	static SCA_Joystick *GetInstance( short int joyindex );
+	static void HandleEvents( void );
 	void ReleaseInstance();
 	
-	void HandleEvents();
 
 	/*
 	 */
@@ -212,16 +212,6 @@ public:
 	bool IsTrig(void){
 		return m_istrig;
 	}
-	
-
-	/*
-	 * returns true if an event is being processed
-	 */
-
-	bool GetJoyAxisMotion(void);
-	bool GetJoyButtonPress(void);
-	bool GetJoyButtonRelease(void);
-	bool GetJoyHatMotion(void);
 
 	/*
 	 * returns the # of...
@@ -237,7 +227,7 @@ public:
 	int Connected(void);
 };
 
-
+void Joystick_HandleEvents( void );
 
 #endif
 
diff --git a/source/gameengine/GameLogic/Joystick/SCA_JoystickDefines.h b/source/gameengine/GameLogic/Joystick/SCA_JoystickDefines.h
index 8d8f88ecaf2..73ffe1406d9 100644
--- a/source/gameengine/GameLogic/Joystick/SCA_JoystickDefines.h
+++ b/source/gameengine/GameLogic/Joystick/SCA_JoystickDefines.h
@@ -40,12 +40,4 @@
 
 #define JOYINDEX_MAX			8
 
-/* function callbacks */
-#define HANDLE_AXISMOTION(fn)	((fn)(), 0L)
-#define HANDLE_HATMOTION(fn)	((fn)(), 0L)
-#define HANDLE_BUTTONUP(fn) 	((fn)(), 0L)
-#define HANDLE_BUTTONDOWN(fn)	((fn)(), 0L)
-#define HANDLE_BALLMOTION(fn)	((fn)(), 0L)
-#define HANDLE_NOEVENT(fn)		((fn)(), 0L)
-
 #endif
diff --git a/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp b/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp
index ab523470e21..1e064f55397 100644
--- a/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp
+++ b/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp
@@ -30,41 +30,75 @@
 
 
 
-void SCA_Joystick::OnAxisMotion(void)
+void SCA_Joystick::OnAxisMotion(SDL_Event* sdl_event)
 {
 	pFillAxes();
-	m_axisnum	= m_private->m_event.jaxis.axis;
-	m_axisvalue = m_private->m_event.jaxis.value;
+	m_axisnum	= sdl_event->jaxis.axis;
+	m_axisvalue = sdl_event->jaxis.value;
 	m_istrig = 1;
 }
 
 
-void SCA_Joystick::OnHatMotion(void)
+void SCA_Joystick::OnHatMotion(SDL_Event* sdl_event)
 {
-	m_hatdir = m_private->m_event.jhat.value;
-	m_hatnum = m_private->m_event.jhat.hat;
+	m_hatdir = sdl_event->jhat.value;
+	m_hatnum = sdl_event->jhat.hat;
 	m_istrig = 1;
 }
 
 
-void SCA_Joystick::OnButtonUp(void)
+void SCA_Joystick::OnButtonUp(SDL_Event* sdl_event)
 {
 	m_buttonnum = -2;
 }
 
 
-void SCA_Joystick::OnButtonDown(void)
+void SCA_Joystick::OnButtonDown(SDL_Event* sdl_event)
 {
 	m_buttonmax = GetNumberOfButtons();
-	if(m_private->m_event.jbutton.button >= 1 || m_private->m_event.jbutton.button <= m_buttonmax)
+	if(sdl_event->jbutton.button >= 1 || sdl_event->jbutton.button <= m_buttonmax)
 	{
 		m_istrig = 1;
-		m_buttonnum = m_private->m_event.jbutton.button;
+		m_buttonnum = sdl_event->jbutton.button;
 	}
 }
 
 
-void SCA_Joystick::OnNothing(void)
+void SCA_Joystick::OnNothing(SDL_Event* sdl_event)
 {
 	m_istrig = 0;
 }
+
+/* only handle events for 1 joystick */
+
+void SCA_Joystick::HandleEvents(void)
+{
+	SDL_Event		sdl_event;
+
+	if(SDL_PollEvent(&sdl_event))
+	{
+		/* Note! m_instance[sdl_event.jaxis.which]
+		 * will segfault if over JOYINDEX_MAX, not too nice but what are the chances? */
+		switch(sdl_event.type)
+		{
+		case SDL_JOYAXISMOTION:
+			SCA_Joystick::m_instance[sdl_event.jaxis.which]->OnAxisMotion(&sdl_event);
+			break;
+		case SDL_JOYHATMOTION:
+			SCA_Joystick::m_instance[sdl_event.jhat.which]->OnHatMotion(&sdl_event);
+			break;
+		case SDL_JOYBUTTONUP:
+			SCA_Joystick::m_instance[sdl_event.jbutton.which]->OnButtonUp(&sdl_event);
+			break;
+		case SDL_JOYBUTTONDOWN:
+			SCA_Joystick::m_instance[sdl_event.jbutton.which]->OnButtonDown(&sdl_event);
+			break;
+		case SDL_JOYBALLMOTION:
+			SCA_Joystick::m_instance[sdl_event.jball.which]->OnBallMotion(&sdl_event);
+			break;
+		default:
+			printf("SCA_Joystick::HandleEvents, Unknown SDL event, this should not happen\n");
+			break;
+		}
+	}
+}
diff --git a/source/gameengine/GameLogic/Joystick/SCA_JoystickPrivate.h b/source/gameengine/GameLogic/Joystick/SCA_JoystickPrivate.h
index 23fad3cd55d..bb6bfe2d4cc 100644
--- a/source/gameengine/GameLogic/Joystick/SCA_JoystickPrivate.h
+++ b/source/gameengine/GameLogic/Joystick/SCA_JoystickPrivate.h
@@ -32,10 +32,6 @@
 class SCA_Joystick::PrivateData
 {
 public:
-	/*
-	 * SDL events structure 
-	 */
-	SDL_Event		m_event;
 	/*
 	 * The Joystick
 	 */
diff --git a/source/gameengine/GameLogic/SCA_JoystickManager.cpp b/source/gameengine/GameLogic/SCA_JoystickManager.cpp
index 08c36326712..a86770a6e0a 100644
--- a/source/gameengine/GameLogic/SCA_JoystickManager.cpp
+++ b/source/gameengine/GameLogic/SCA_JoystickManager.cpp
@@ -44,7 +44,6 @@ SCA_JoystickManager::SCA_JoystickManager(class SCA_LogicManager* logicmgr)
 	for (i=0; i<JOYINDEX_MAX; i++) {
 		m_joystick[i] = SCA_Joystick::GetInstance( i );
 	}
-	//m_joystick = NULL;
 }
 
 
@@ -59,14 +58,21 @@ SCA_JoystickManager::~SCA_JoystickManager()
 
 void SCA_JoystickManager::NextFrame(double curtime,double deltatime)
 {
-	set<SCA_ISensor*>::iterator it;
-	for (it = m_sensors.begin(); it != m_sensors.end(); it++)
-	{
-		SCA_JoystickSensor* joysensor = (SCA_JoystickSensor*)(*it);
-		if(!joysensor->IsSuspended())
+	if (m_sensors.size()==0) {
+		return;
+	}
+	else {
+		set<SCA_ISensor*>::iterator it;
+	
+		SCA_Joystick::HandleEvents(); /* Handle all SDL Joystick events */
+	
+		for (it = m_sensors.begin(); it != m_sensors.end(); it++)
 		{
-			m_joystick[joysensor->GetJoyIndex()]->HandleEvents();
-			joysensor->Activate(m_logicmgr, NULL);
+			SCA_JoystickSensor* joysensor = (SCA_JoystickSensor*)(*it);
+			if(!joysensor->IsSuspended())
+			{
+				joysensor->Activate(m_logicmgr, NULL);
+			}
 		}
 	}
 }
diff --git a/source/gameengine/GameLogic/SCA_JoystickSensor.cpp b/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
index 456401d48df..b32cbd83285 100644
--- a/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
+++ b/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
@@ -245,10 +245,10 @@ bool SCA_JoystickSensor::Evaluate(CValue* event)
 	}
 	
 	if (js->IsTrig()) {
-		/* This test detects changes with the joystick trigger state.
+		/* The if below detects changes with the joystick trigger state.
 		 * js->IsTrig() will stay true as long as the key is held.
 		 * even though the event from SDL will only be sent once.
-		 * istrig_js && m_istrig_lastjs - when this is true it means this sensor
+		 * (js->IsTrig() && m_istrig_lastjs) - when true it means this sensor
 		 * had the same joystick trigger state last time,
 		 * Setting the result false this time means it wont run the sensors
 		 * controller every time (like a pulse sensor)

From ead69661e814218290abcf3cf010f8b0d8e7e986 Mon Sep 17 00:00:00 2001
From: Geoffrey Bantle <hairbat@yahoo.com>
Date: Tue, 2 Sep 2008 16:39:03 +0000
Subject: [PATCH 234/252] -> Fix for 64 bit alignment of Vertex colors in bmesh

Vertex color structure in bmesh needed to be padded for
8 byte aligned memory access.
---
 source/blender/makesdna/DNA_meshdata_types.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/source/blender/makesdna/DNA_meshdata_types.h b/source/blender/makesdna/DNA_meshdata_types.h
index 4e427ed733c..fc686a4cc10 100644
--- a/source/blender/makesdna/DNA_meshdata_types.h
+++ b/source/blender/makesdna/DNA_meshdata_types.h
@@ -82,6 +82,7 @@ typedef struct MLoopUV{
 
 typedef struct MLoopCol{
 	char a, r, g, b;
+	int pad;  /*waste!*/
 }MLoopCol;
 
 typedef struct MSticky {

From dcbf8fbf76bda8f6084f5317a8cdd98ab6314df3 Mon Sep 17 00:00:00 2001
From: Diego Borghetti <bdiego@gmail.com>
Date: Tue, 2 Sep 2008 17:50:54 +0000
Subject: [PATCH 235/252] Fix segmentation fault when try separate a mesh with
 the active face selected.

If the active face is part of the selection, Blender crash when
split the mesh because the act_face have an invalid pointer.

The solution is simple, check if the active face is part of the selection
and in that case, set it to NULL.

Campbell please double check this.
---
 source/blender/src/editmesh.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/source/blender/src/editmesh.c b/source/blender/src/editmesh.c
index 188f7476728..b75f7e07143 100644
--- a/source/blender/src/editmesh.c
+++ b/source/blender/src/editmesh.c
@@ -1683,6 +1683,10 @@ void separate_mesh(void)
 	efa= em->faces.first;
 	while(efa) {
 		vl1= efa->next;
+		if (efa == G.editMesh->act_face && (efa->f & SELECT)) {
+			EM_set_actFace(NULL);
+		}
+
 		if((efa->f & SELECT)==0) {
 			BLI_remlink(&em->faces, efa);
 			BLI_addtail(&edvl, efa);

From 0fe906f49e259f5c2042070d2201291f32ad3223 Mon Sep 17 00:00:00 2001
From: Benoit Bolsee <benoit.bolsee@online.be>
Date: Tue, 2 Sep 2008 18:34:54 +0000
Subject: [PATCH 236/252] BGE patch: simple fix to synchronize sensor pulse
 mode with sensor state transitions.

---
 source/gameengine/GameLogic/SCA_ISensor.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/source/gameengine/GameLogic/SCA_ISensor.cpp b/source/gameengine/GameLogic/SCA_ISensor.cpp
index c96eb82e29e..084b1395159 100644
--- a/source/gameengine/GameLogic/SCA_ISensor.cpp
+++ b/source/gameengine/GameLogic/SCA_ISensor.cpp
@@ -226,6 +226,9 @@ void SCA_ISensor::Activate(class SCA_LogicManager* logicmgr,	  CValue* event)
 		bool result = this->Evaluate(event);
 		if (result) {
 			logicmgr->AddActivatedSensor(this);	
+			// reset these counters so that pulse are synchronized with transition
+			m_pos_ticks = 0;
+			m_neg_ticks = 0;
 		} else
 		{
 			/* First, the pulsing behaviour, if pulse mode is

From e4dbf0e7d6d80701edc5b41fe9a2d49027abcb44 Mon Sep 17 00:00:00 2001
From: Ken Hughes <khughes@pacific.edu>
Date: Tue, 2 Sep 2008 20:53:07 +0000
Subject: [PATCH 237/252] Fix gcc compiler warnings.

---
 source/blender/blenkernel/intern/particle_system.c | 2 ++
 source/blender/python/api2_2x/Text.c               | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index 92c2f27bc31..96eb4d5d8e3 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -76,6 +76,8 @@
 #include "BKE_modifier.h"
 #include "BKE_scene.h"
 
+#include "PIL_time.h"
+
 #include "BSE_headerbuttons.h"
 
 #include "blendef.h"
diff --git a/source/blender/python/api2_2x/Text.c b/source/blender/python/api2_2x/Text.c
index a76a6f56224..9719daaa3d4 100644
--- a/source/blender/python/api2_2x/Text.c
+++ b/source/blender/python/api2_2x/Text.c
@@ -718,7 +718,7 @@ static PyObject *Text_markSelection( BPy_Text * self, PyObject * args )
 static PyObject *Text_suggest( BPy_Text * self, PyObject * args )
 {
 	PyObject *item = NULL, *tup1 = NULL, *tup2 = NULL;
-	PyObject *list = NULL, *resl = NULL;
+	PyObject *list = NULL;
 	int list_len, i;
 	char *prefix = NULL, *name, type;
 	SpaceText *st;

From bbf2ff410b4d14967c929cef91ed741beca256b6 Mon Sep 17 00:00:00 2001
From: Ken Hughes <khughes@pacific.edu>
Date: Tue, 2 Sep 2008 21:09:29 +0000
Subject: [PATCH 238/252] Fix some more gcc warnings.

---
 source/blender/src/drawtext.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index 0797a425f2a..daa2d52d485 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -328,12 +328,14 @@ void txt_format_line(SpaceText *st, TextLine *line, int do_next) {
 	int len, i;
 
 	/* Get continuation from previous line */
-	if (line->prev && (fmt=line->prev->format)) {
+	if (line->prev && line->prev->format != NULL) {
+		fmt= line->prev->format;
 		cont = fmt[strlen(fmt)+1]; /* Just after the null-terminator */
 	} else cont = 0;
 
 	/* Get original continuation from this line */
-	if (fmt=line->format) {
+	if (line->format != NULL) {
+		fmt= line->format;
 		orig = fmt[strlen(fmt)+1]; /* Just after the null-terminator */
 	} else orig = 0xFF;
 
@@ -405,7 +407,7 @@ void txt_format_line(SpaceText *st, TextLine *line, int do_next) {
 					prev = 'b';
 				if (i>0) {
 					while (i>1) {
-						*fmt = prev; *fmt++; *str++;
+						*fmt = prev; fmt++; str++;
 						i--;
 					}
 					*fmt = prev;

From fe93743518b32fbb43ec8f3b11640672867a3937 Mon Sep 17 00:00:00 2001
From: Benoit Bolsee <benoit.bolsee@online.be>
Date: Tue, 2 Sep 2008 22:13:07 +0000
Subject: [PATCH 239/252] BGE patch 17547 approved: Cleaned up pydoc for BGE,
 compiles now error free

---
 source/gameengine/PyDoc/KX_GameObject.py | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/source/gameengine/PyDoc/KX_GameObject.py b/source/gameengine/PyDoc/KX_GameObject.py
index 916851fa2a2..9729b14a43f 100644
--- a/source/gameengine/PyDoc/KX_GameObject.py
+++ b/source/gameengine/PyDoc/KX_GameObject.py
@@ -300,12 +300,13 @@ class KX_GameObject:
 		@rtype: L{KX_GameObject}
 		@return: the first object hit or None if no object or object does not match prop
 		"""
-	def rayCast(to,from,dist,prop,face,xray,poly):
+	def rayCast(objto,objfrom,dist,prop,face,xray,poly):
 		"""
 		Look from a point/object to another point/object and find first object hit within dist that matches prop.
 		if poly is 0, returns a 3-tuple with object reference, hit point and hit normal or (None,None,None) if no hit.
 		if poly is 1, returns a 4-tuple with in addition a L{KX_PolyProxy} as 4th element.
-		Ex:
+		
+		Ex::
 			# shoot along the axis gun-gunAim (gunAim should be collision-free)
 			ob,point,normal = gun.rayCast(gunAim,None,50)
 			if ob:
@@ -314,23 +315,26 @@ class KX_GameObject:
 		Notes:				
 		The ray ignores the object on which the method is called.
 		It is casted from/to object center or explicit [x,y,z] points.
-		The face paremeter determines the orientation of the normal: 
+		
+		The face paremeter determines the orientation of the normal:: 
 		  0 => hit normal is always oriented towards the ray origin (as if you casted the ray from outside)
 		  1 => hit normal is the real face normal (only for mesh object, otherwise face has no effect)
+		  
 		The ray has X-Ray capability if xray parameter is 1, otherwise the first object hit (other than self object) stops the ray.
-		The prop and xray parameters interact as follow:
+		The prop and xray parameters interact as follow::
 		    prop off, xray off: return closest hit or no hit if there is no object on the full extend of the ray.
 		    prop off, xray on : idem.
 		    prop on,  xray off: return closest hit if it matches prop, no hit otherwise.
 		    prop on,  xray on : return closest hit matching prop or no hit if there is no object matching prop on the full extend of the ray.
 		The L{KX_PolyProxy} 4th element of the return tuple when poly=1 allows to retrieve information on the polygon hit by the ray.
 		If there is no hit or the hit object is not a static mesh, None is returned as 4th element. 
-		The	ray ignores collision-free objects and faces that dont have the collision flag enabled, you can however use ghost objects.
+		
+		The ray ignores collision-free objects and faces that dont have the collision flag enabled, you can however use ghost objects.
 
-		@param to: [x,y,z] or object to which the ray is casted
-		@type to: L{KX_GameObject} or 3-tuple
-		@param from: [x,y,z] or object from which the ray is casted; None or omitted => use self object center
-		@type from: L{KX_GameObject} or 3-tuple or None
+		@param objto: [x,y,z] or object to which the ray is casted
+		@type objto: L{KX_GameObject} or 3-tuple
+		@param objfrom: [x,y,z] or object from which the ray is casted; None or omitted => use self object center
+		@type objfrom: L{KX_GameObject} or 3-tuple or None
 		@param dist: max distance to look (can be negative => look behind); 0 or omitted => detect up to to
 		@type dist: float
 		@param prop: property name that object must have; can be omitted => detect any object

From 33ac84e888ee3e3217f15f955e1b389a9c4bb230 Mon Sep 17 00:00:00 2001
From: Daniel Genrich <daniel.genrich@gmx.net>
Date: Wed, 3 Sep 2008 00:00:32 +0000
Subject: [PATCH 240/252] Compile fixes (reported by broken)

---
 intern/opennl/superlu/BLO_sys_types.h     |  2 ++
 source/blender/blenloader/BLO_sys_types.h | 14 +++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/intern/opennl/superlu/BLO_sys_types.h b/intern/opennl/superlu/BLO_sys_types.h
index 5ed3117c890..411a8582f96 100644
--- a/intern/opennl/superlu/BLO_sys_types.h
+++ b/intern/opennl/superlu/BLO_sys_types.h
@@ -54,6 +54,7 @@ extern "C" {
 /* The __intXX are built-in types of the visual complier! So we don't
  * need to include anything else here. */
 
+
 typedef signed __int8  int8_t;
 typedef signed __int16 int16_t;
 typedef signed __int32 int32_t;
@@ -102,6 +103,7 @@ typedef unsigned long uintptr_t;
 
 #endif /* ifdef platform for types */
 
+
 #ifdef _WIN32
 #ifndef htonl
 #define htonl(x) correctByteOrder(x)
diff --git a/source/blender/blenloader/BLO_sys_types.h b/source/blender/blenloader/BLO_sys_types.h
index a9d29375eac..49155260b31 100644
--- a/source/blender/blenloader/BLO_sys_types.h
+++ b/source/blender/blenloader/BLO_sys_types.h
@@ -49,6 +49,7 @@ extern "C" {
 /* The __intXX are built-in types of the visual complier! So we don't
  * need to include anything else here. */
 
+
 typedef signed __int8  int8_t;
 typedef signed __int16 int16_t;
 typedef signed __int32 int32_t;
@@ -59,13 +60,23 @@ typedef unsigned __int16 uint16_t;
 typedef unsigned __int32 uint32_t;
 typedef unsigned __int64 uint64_t;
 
+#ifndef _INTPTR_T_DEFINED
 #ifdef _WIN64
 typedef __int64 intptr_t;
-typedef unsigned __int64 uintptr_t;
 #else
 typedef long intptr_t;
+#endif
+#define _INTPTR_T_DEFINED
+#endif
+
+#ifndef _UINTPTR_T_DEFINED
+#ifdef _WIN64
+typedef unsigned __int64 uintptr_t;
+#else
 typedef unsigned long uintptr_t;
 #endif
+#define _UINTPTR_T_DEFINED
+#endif
 
 #elif defined(__linux__)
 
@@ -87,6 +98,7 @@ typedef unsigned long uintptr_t;
 
 #endif /* ifdef platform for types */
 
+
 #ifdef _WIN32
 #define htonl(x) correctByteOrder(x)
 #define ntohl(x) correctByteOrder(x)

From 1926e846500212d11061c23cacdbd08d88e375da Mon Sep 17 00:00:00 2001
From: Erwin Coumans <blender@erwincoumans.com>
Date: Wed, 3 Sep 2008 02:27:16 +0000
Subject: [PATCH 241/252] Finally upgraded to latest Bullet subversion, about
 to release 2.71. Some recent changes in extern/bullet2 need to be re-applied,
 will check with Benoit. Ray tests in 0_FPS_Template.blend is broken, didn't
 figure out why yet.

HELP BUILD SYSTEM MAINTAINERS: Please help with updating all build systems: the newly added files need to be added. Note that the src/SoftBody has been added for future extension of real-time soft bodies.
---
 extern/bullet2/src/Bullet-C-Api.h             |  136 +-
 .../BroadphaseCollision/btAxisSweep3.cpp      |  638 +---
 .../BroadphaseCollision/btAxisSweep3.h        |  865 +++++-
 .../btBroadphaseInterface.h                   |   28 +-
 .../BroadphaseCollision/btBroadphaseProxy.h   |   57 +-
 .../btCollisionAlgorithm.cpp                  |    2 +-
 .../btCollisionAlgorithm.h                    |   11 +-
 .../BroadphaseCollision/btDbvt.cpp            | 1320 +++++++++
 .../BroadphaseCollision/btDbvt.h              | 1101 +++++++
 .../BroadphaseCollision/btDbvtBroadphase.cpp  |  344 +++
 .../BroadphaseCollision/btDbvtBroadphase.h    |  103 +
 .../BroadphaseCollision/btDispatcher.h        |   22 +-
 .../btMultiSapBroadphase.cpp                  |  466 +++
 .../btMultiSapBroadphase.h                    |  144 +
 .../btOverlappingPairCache.cpp                |  535 +++-
 .../btOverlappingPairCache.h                  |  351 ++-
 .../btOverlappingPairCallback.h               |   40 +
 .../BroadphaseCollision/btQuantizedBvh.cpp    | 1025 +++++++
 .../BroadphaseCollision/btQuantizedBvh.h      |  486 ++++
 .../btSimpleBroadphase.cpp                    |  248 +-
 .../BroadphaseCollision/btSimpleBroadphase.h  |  101 +-
 .../SphereTriangleDetector.cpp                |   15 +-
 .../SphereTriangleDetector.h                  |    6 +-
 .../btBoxBoxCollisionAlgorithm.cpp            |   85 +
 .../btBoxBoxCollisionAlgorithm.h              |   66 +
 .../CollisionDispatch/btBoxBoxDetector.cpp    |  683 +++++
 .../CollisionDispatch/btBoxBoxDetector.h      |   44 +
 .../btCollisionConfiguration.h                |   47 +
 .../CollisionDispatch/btCollisionCreateFunc.h |    2 +-
 .../btCollisionDispatcher.cpp                 |  237 +-
 .../CollisionDispatch/btCollisionDispatcher.h |   62 +-
 .../CollisionDispatch/btCollisionObject.cpp   |   10 +-
 .../CollisionDispatch/btCollisionObject.h     |   71 +-
 .../CollisionDispatch/btCollisionWorld.cpp    |  653 +++--
 .../CollisionDispatch/btCollisionWorld.h      |  210 +-
 .../btCompoundCollisionAlgorithm.cpp          |   36 +-
 .../btCompoundCollisionAlgorithm.h            |   28 +-
 .../btConvexConcaveCollisionAlgorithm.cpp     |   27 +-
 .../btConvexConcaveCollisionAlgorithm.h       |   24 +-
 .../btConvexConvexAlgorithm.cpp               |   20 +-
 .../btConvexConvexAlgorithm.h                 |   25 +-
 .../btConvexPlaneCollisionAlgorithm.cpp       |  108 +
 .../btConvexPlaneCollisionAlgorithm.h         |   71 +
 .../btDefaultCollisionConfiguration.cpp       |  281 ++
 .../btDefaultCollisionConfiguration.h         |  112 +
 .../btEmptyCollisionAlgorithm.h               |   10 +-
 .../CollisionDispatch/btManifoldResult.cpp    |   30 +-
 .../CollisionDispatch/btManifoldResult.h      |   29 +-
 .../btSimulationIslandManager.cpp             |  129 +-
 .../btSimulationIslandManager.h               |   14 +-
 .../btSphereBoxCollisionAlgorithm.cpp         |   19 +-
 .../btSphereBoxCollisionAlgorithm.h           |   23 +-
 .../btSphereSphereCollisionAlgorithm.cpp      |   19 +-
 .../btSphereSphereCollisionAlgorithm.h        |   18 +-
 .../btSphereTriangleCollisionAlgorithm.cpp    |   18 +-
 .../btSphereTriangleCollisionAlgorithm.h      |   18 +-
 .../CollisionDispatch/btUnionFind.cpp         |    4 +-
 .../CollisionDispatch/btUnionFind.h           |    6 +-
 .../CollisionShapes/btBoxShape.cpp            |   11 +-
 .../CollisionShapes/btBoxShape.h              |  104 +-
 .../btBvhTriangleMeshShape.cpp                |  223 +-
 .../CollisionShapes/btBvhTriangleMeshShape.h  |   40 +-
 .../CollisionShapes/btCapsuleShape.cpp        |   36 +-
 .../CollisionShapes/btCapsuleShape.h          |   77 +-
 .../CollisionShapes/btCollisionShape.cpp      |    9 +-
 .../CollisionShapes/btCollisionShape.h        |   45 +-
 .../CollisionShapes/btCompoundShape.cpp       |   61 +-
 .../CollisionShapes/btCompoundShape.h         |   77 +-
 .../CollisionShapes/btConcaveShape.h          |    6 +-
 .../CollisionShapes/btConeShape.h             |   12 +-
 .../CollisionShapes/btConvexHullShape.h       |   20 +-
 .../CollisionShapes/btConvexInternalShape.cpp |   78 +
 .../CollisionShapes/btConvexInternalShape.h   |   98 +
 .../CollisionShapes/btConvexShape.cpp         |   59 -
 .../CollisionShapes/btConvexShape.h           |   93 +-
 .../btConvexTriangleMeshShape.cpp             |    5 +-
 .../btConvexTriangleMeshShape.h               |   17 +-
 .../CollisionShapes/btCylinderShape.cpp       |   14 +-
 .../CollisionShapes/btCylinderShape.h         |   20 +-
 .../CollisionShapes/btEmptyShape.cpp          |    2 +-
 .../CollisionShapes/btEmptyShape.h            |   14 +-
 .../btHeightfieldTerrainShape.cpp             |  107 +-
 .../btHeightfieldTerrainShape.h               |   17 +-
 .../CollisionShapes/btMaterial.h              |   34 +
 .../CollisionShapes/btMinkowskiSumShape.cpp   |    6 +-
 .../CollisionShapes/btMinkowskiSumShape.h     |   12 +-
 .../CollisionShapes/btMultiSphereShape.cpp    |    4 +-
 .../CollisionShapes/btMultiSphereShape.h      |   13 +-
 .../btMultimaterialTriangleMeshShape.cpp      |   45 +
 .../btMultimaterialTriangleMeshShape.h        |  124 +
 .../CollisionShapes/btOptimizedBvh.cpp        |  655 +----
 .../CollisionShapes/btOptimizedBvh.h          |  299 +-
 .../btPolyhedralConvexShape.cpp               |   42 +-
 .../CollisionShapes/btPolyhedralConvexShape.h |   14 +-
 .../CollisionShapes/btShapeHull.cpp           |  164 ++
 .../CollisionShapes/btShapeHull.h             |   56 +
 .../CollisionShapes/btSphereShape.cpp         |    2 +-
 .../CollisionShapes/btSphereShape.h           |   20 +-
 .../CollisionShapes/btStaticPlaneShape.cpp    |    5 +-
 .../CollisionShapes/btStaticPlaneShape.h      |   16 +-
 .../btStridingMeshInterface.cpp               |    6 +-
 .../CollisionShapes/btStridingMeshInterface.h |   12 +-
 .../CollisionShapes/btTetrahedronShape.h      |    6 +-
 .../CollisionShapes/btTriangleBuffer.cpp      |    9 +-
 .../CollisionShapes/btTriangleBuffer.h        |   10 +-
 .../CollisionShapes/btTriangleCallback.h      |    4 +-
 .../btTriangleIndexVertexArray.cpp            |   45 +-
 .../btTriangleIndexVertexArray.h              |   40 +-
 .../btTriangleIndexVertexMaterialArray.cpp    |   86 +
 .../btTriangleIndexVertexMaterialArray.h      |   84 +
 .../CollisionShapes/btTriangleMesh.cpp        |  117 +-
 .../CollisionShapes/btTriangleMesh.h          |   60 +-
 .../CollisionShapes/btTriangleMeshShape.cpp   |   14 +-
 .../CollisionShapes/btTriangleMeshShape.h     |   17 +-
 .../CollisionShapes/btTriangleShape.h         |   18 +-
 .../CollisionShapes/btUniformScalingShape.cpp |  114 +
 .../CollisionShapes/btUniformScalingShape.h   |   88 +
 .../btContinuousConvexCollision.cpp           |   41 +-
 .../btContinuousConvexCollision.h             |    6 +-
 .../NarrowPhaseCollision/btConvexCast.h       |   18 +-
 .../btConvexPenetrationDepthSolver.h          |    4 +-
 .../btDiscreteCollisionDetectorInterface.h    |    6 +-
 .../NarrowPhaseCollision/btGjkConvexCast.cpp  |  166 +-
 .../NarrowPhaseCollision/btGjkConvexCast.h    |   10 +-
 .../NarrowPhaseCollision/btGjkEpa.cpp         |   10 +-
 .../NarrowPhaseCollision/btGjkEpa.h           |    8 +-
 .../NarrowPhaseCollision/btGjkEpa2.cpp        |  943 ++++++
 .../NarrowPhaseCollision/btGjkEpa2.h          |   71 +
 .../btGjkEpaPenetrationDepthSolver.cpp        |   13 +-
 .../btGjkEpaPenetrationDepthSolver.h          |    2 +-
 .../btGjkPairDetector.cpp                     |   11 +-
 .../NarrowPhaseCollision/btGjkPairDetector.h  |   12 +-
 .../NarrowPhaseCollision/btManifoldPoint.h    |   26 +-
 .../btMinkowskiPenetrationDepthSolver.cpp     |    7 +-
 .../btMinkowskiPenetrationDepthSolver.h       |    2 +-
 .../btPersistentManifold.cpp                  |   38 +-
 .../btPersistentManifold.h                    |   62 +-
 .../btRaycastCallback.cpp                     |   72 +-
 .../NarrowPhaseCollision/btRaycastCallback.h  |   27 +-
 .../btSimplexSolverInterface.h                |    4 +-
 .../btSubSimplexConvexCast.cpp                |   82 +-
 .../btVoronoiSimplexSolver.cpp                |    2 +-
 .../btConeTwistConstraint.cpp                 |   27 +-
 .../ConstraintSolver/btConeTwistConstraint.h  |    3 +
 .../ConstraintSolver/btConstraintSolver.h     |   13 +-
 .../ConstraintSolver/btContactConstraint.cpp  |   32 +-
 .../ConstraintSolver/btContactConstraint.h    |    4 +-
 .../ConstraintSolver/btContactSolverInfo.h    |   56 +-
 .../btGeneric6DofConstraint.cpp               |  821 +++---
 .../btGeneric6DofConstraint.h                 |  463 ++-
 .../ConstraintSolver/btHingeConstraint.cpp    |  267 +-
 .../ConstraintSolver/btHingeConstraint.h      |   97 +-
 .../ConstraintSolver/btJacobianEntry.h        |    4 +-
 .../btPoint2PointConstraint.cpp               |   15 +-
 .../btPoint2PointConstraint.h                 |   18 +-
 .../btSequentialImpulseConstraintSolver.cpp   |  824 ++++--
 .../btSequentialImpulseConstraintSolver.h     |   48 +-
 .../ConstraintSolver/btSliderConstraint.cpp   |  414 +++
 .../ConstraintSolver/btSliderConstraint.h     |  215 ++
 .../btSolve2LinearConstraint.h                |    4 +-
 .../ConstraintSolver/btSolverBody.h           |   64 +-
 .../ConstraintSolver/btSolverConstraint.h     |   21 +-
 .../ConstraintSolver/btTypedConstraint.cpp    |   15 +-
 .../ConstraintSolver/btTypedConstraint.h      |   38 +-
 .../BulletDynamics/Dynamics/Bullet-C-API.cpp  |  366 ++-
 .../Dynamics/btContinuousDynamicsWorld.cpp    |  193 ++
 .../Dynamics/btContinuousDynamicsWorld.h      |   46 +
 .../Dynamics/btDiscreteDynamicsWorld.cpp      |  461 +--
 .../Dynamics/btDiscreteDynamicsWorld.h        |   42 +-
 .../BulletDynamics/Dynamics/btDynamicsWorld.h |   86 +-
 .../BulletDynamics/Dynamics/btRigidBody.cpp   |  222 +-
 .../src/BulletDynamics/Dynamics/btRigidBody.h |  189 +-
 .../Dynamics/btSimpleDynamicsWorld.cpp        |   52 +-
 .../Dynamics/btSimpleDynamicsWorld.h          |   32 +-
 .../Vehicle/btRaycastVehicle.cpp              |   72 +-
 .../BulletDynamics/Vehicle/btRaycastVehicle.h |   14 +-
 .../Vehicle/btVehicleRaycaster.h              |    2 +-
 .../src/BulletDynamics/Vehicle/btWheelInfo.h  |    4 +-
 .../bullet2/src/BulletSoftBody/CMakeLists.txt |   21 +
 .../bullet2/src/BulletSoftBody/btSoftBody.cpp | 2590 +++++++++++++++++
 .../bullet2/src/BulletSoftBody/btSoftBody.h   |  810 ++++++
 .../btSoftBodyConcaveCollisionAlgorithm.cpp   |  410 +++
 .../btSoftBodyConcaveCollisionAlgorithm.h     |  118 +
 .../src/BulletSoftBody/btSoftBodyHelpers.cpp  |  656 +++++
 .../src/BulletSoftBody/btSoftBodyHelpers.h    |  107 +
 .../src/BulletSoftBody/btSoftBodyInternals.h  |  895 ++++++
 ...oftBodyRigidBodyCollisionConfiguration.cpp |  108 +
 ...tSoftBodyRigidBodyCollisionConfiguration.h |   48 +
 .../btSoftRigidCollisionAlgorithm.cpp         |   79 +
 .../btSoftRigidCollisionAlgorithm.h           |   75 +
 .../btSoftRigidDynamicsWorld.cpp              |  126 +
 .../BulletSoftBody/btSoftRigidDynamicsWorld.h |   73 +
 .../btSoftSoftCollisionAlgorithm.cpp          |   46 +
 .../btSoftSoftCollisionAlgorithm.h            |   69 +
 .../bullet2/src/BulletSoftBody/btSparseSDF.h  |  306 ++
 extern/bullet2/src/LinearMath/btAabbUtil2.h   |   49 +-
 .../src/LinearMath/btAlignedAllocator.cpp     |  185 +-
 .../src/LinearMath/btAlignedAllocator.h       |   28 +-
 .../src/LinearMath/btAlignedObjectArray.h     |   69 +-
 .../src/LinearMath/btDefaultMotionState.h     |    2 +-
 .../bullet2/src/LinearMath/btGeometryUtil.cpp |    9 +-
 .../bullet2/src/LinearMath/btGeometryUtil.h   |    1 +
 extern/bullet2/src/LinearMath/btIDebugDraw.h  |   16 +
 extern/bullet2/src/LinearMath/btMatrix3x3.h   |   11 +-
 extern/bullet2/src/LinearMath/btMinMax.h      |   12 +-
 extern/bullet2/src/LinearMath/btMotionState.h |    2 +-
 extern/bullet2/src/LinearMath/btQuadWord.h    |   71 +-
 extern/bullet2/src/LinearMath/btQuaternion.h  |   10 +-
 extern/bullet2/src/LinearMath/btQuickprof.cpp |  302 +-
 extern/bullet2/src/LinearMath/btQuickprof.h   |  822 ++----
 extern/bullet2/src/LinearMath/btScalar.h      |  253 +-
 extern/bullet2/src/LinearMath/btStackAlloc.h  |   19 +-
 extern/bullet2/src/LinearMath/btTransform.h   |   19 +-
 .../bullet2/src/LinearMath/btTransformUtil.h  |   12 +-
 extern/bullet2/src/LinearMath/btVector3.h     |   51 +
 extern/bullet2/src/btBulletCollisionCommon.h  |    7 +-
 extern/bullet2/src/btBulletDynamicsCommon.h   |    8 +-
 .../Converter/KX_BlenderSceneConverter.cpp    |    5 +
 .../Physics/Bullet/CcdPhysicsController.cpp   |   15 +-
 .../Physics/Bullet/CcdPhysicsEnvironment.cpp  |   61 +-
 .../Physics/Bullet/CcdPhysicsEnvironment.h    |    4 +
 221 files changed, 24976 insertions(+), 5260 deletions(-)
 create mode 100644 extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.cpp
 create mode 100644 extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.h
 create mode 100644 extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp
 create mode 100644 extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h
 create mode 100644 extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp
 create mode 100644 extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h
 create mode 100644 extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h
 create mode 100644 extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp
 create mode 100644 extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
 create mode 100644 extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp
 create mode 100644 extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h
 create mode 100644 extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp
 create mode 100644 extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.h
 create mode 100644 extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h
 create mode 100644 extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp
 create mode 100644 extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h
 create mode 100644 extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp
 create mode 100644 extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h
 create mode 100644 extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp
 create mode 100644 extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.h
 create mode 100644 extern/bullet2/src/BulletCollision/CollisionShapes/btMaterial.h
 create mode 100644 extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp
 create mode 100644 extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h
 create mode 100644 extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.cpp
 create mode 100644 extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.h
 create mode 100644 extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp
 create mode 100644 extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h
 create mode 100644 extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.cpp
 create mode 100644 extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.h
 create mode 100644 extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp
 create mode 100644 extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h
 create mode 100644 extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp
 create mode 100644 extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h
 create mode 100644 extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp
 create mode 100644 extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.h
 create mode 100644 extern/bullet2/src/BulletSoftBody/CMakeLists.txt
 create mode 100644 extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
 create mode 100644 extern/bullet2/src/BulletSoftBody/btSoftBody.h
 create mode 100644 extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp
 create mode 100644 extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
 create mode 100644 extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp
 create mode 100644 extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.h
 create mode 100644 extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h
 create mode 100644 extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp
 create mode 100644 extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h
 create mode 100644 extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp
 create mode 100644 extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h
 create mode 100644 extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp
 create mode 100644 extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.h
 create mode 100644 extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp
 create mode 100644 extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h
 create mode 100644 extern/bullet2/src/BulletSoftBody/btSparseSDF.h

diff --git a/extern/bullet2/src/Bullet-C-Api.h b/extern/bullet2/src/Bullet-C-Api.h
index 078dcae63bb..a196f6417bc 100644
--- a/extern/bullet2/src/Bullet-C-Api.h
+++ b/extern/bullet2/src/Bullet-C-Api.h
@@ -23,11 +23,145 @@ subject to the following restrictions:
 #ifndef BULLET_C_API_H
 #define BULLET_C_API_H
 
+#define PL_DECLARE_HANDLE(name) typedef struct name##__ { int unused; } *name
+
+#ifdef BT_USE_DOUBLE_PRECISION
+typedef double	plReal;
+#else
+typedef float	plReal;
+#endif
+
+typedef plReal	plVector3[3];
+typedef plReal	plQuaternion[4];
+
 #ifdef __cplusplus
 extern "C" { 
 #endif
 
-double plNearestPoints(float p1[3], float p2[3], float p3[3], float q1[3], float q2[3], float q3[3], float *pa, float *pb, float normal[3]);
+/*	Particular physics SDK */
+	PL_DECLARE_HANDLE(plPhysicsSdkHandle);
+
+/* 	Dynamics world, belonging to some physics SDK */
+	PL_DECLARE_HANDLE(plDynamicsWorldHandle);
+
+/* Rigid Body that can be part of a Dynamics World */	
+	PL_DECLARE_HANDLE(plRigidBodyHandle);
+
+/* 	Collision Shape/Geometry, property of a Rigid Body */
+	PL_DECLARE_HANDLE(plCollisionShapeHandle);
+
+/* Constraint for Rigid Bodies */
+	PL_DECLARE_HANDLE(plConstraintHandle);
+
+/* Triangle Mesh interface */
+	PL_DECLARE_HANDLE(plMeshInterfaceHandle);
+
+/* Broadphase Scene/Proxy Handles */
+	PL_DECLARE_HANDLE(plCollisionBroadphaseHandle);
+	PL_DECLARE_HANDLE(plBroadphaseProxyHandle);
+	PL_DECLARE_HANDLE(plCollisionWorldHandle);
+
+/*
+	Create and Delete a Physics SDK	
+*/
+
+	extern	plPhysicsSdkHandle	plNewBulletSdk(); //this could be also another sdk, like ODE, PhysX etc.
+	extern	void		plDeletePhysicsSdk(plPhysicsSdkHandle	physicsSdk);
+
+/* Collision World, not strictly necessary, you can also just create a Dynamics World with Rigid Bodies which internally manages the Collision World with Collision Objects */
+
+	typedef void(*btBroadphaseCallback)(void* clientData, void* object1,void* object2);
+
+	extern plCollisionBroadphaseHandle	plCreateSapBroadphase(btBroadphaseCallback beginCallback,btBroadphaseCallback endCallback);
+
+	extern void	plDestroyBroadphase(plCollisionBroadphaseHandle bp);
+
+	extern 	plBroadphaseProxyHandle plCreateProxy(plCollisionBroadphaseHandle bp, void* clientData, plReal minX,plReal minY,plReal minZ, plReal maxX,plReal maxY, plReal maxZ);
+
+	extern void plDestroyProxy(plCollisionBroadphaseHandle bp, plBroadphaseProxyHandle proxyHandle);
+
+	extern void plSetBoundingBox(plBroadphaseProxyHandle proxyHandle, plReal minX,plReal minY,plReal minZ, plReal maxX,plReal maxY, plReal maxZ);
+
+/* todo: add pair cache support with queries like add/remove/find pair */
+	
+	extern plCollisionWorldHandle plCreateCollisionWorld(plPhysicsSdkHandle physicsSdk);
+
+/* todo: add/remove objects */
+	
+
+/* Dynamics World */
+
+	extern  plDynamicsWorldHandle plCreateDynamicsWorld(plPhysicsSdkHandle physicsSdk);
+
+	extern  void           plDeleteDynamicsWorld(plDynamicsWorldHandle world);
+
+	extern	void	plStepSimulation(plDynamicsWorldHandle,	plReal	timeStep);
+
+	extern  void plAddRigidBody(plDynamicsWorldHandle world, plRigidBodyHandle object);
+
+	extern  void plRemoveRigidBody(plDynamicsWorldHandle world, plRigidBodyHandle object);
+
+
+/* Rigid Body  */
+
+	extern  plRigidBodyHandle plCreateRigidBody(	void* user_data,  float mass, plCollisionShapeHandle cshape );
+
+	extern  void plDeleteRigidBody(plRigidBodyHandle body);
+
+
+/* Collision Shape definition */
+
+	extern  plCollisionShapeHandle plNewSphereShape(plReal radius);
+	extern  plCollisionShapeHandle plNewBoxShape(plReal x, plReal y, plReal z);
+	extern  plCollisionShapeHandle plNewCapsuleShape(plReal radius, plReal height);	
+	extern  plCollisionShapeHandle plNewConeShape(plReal radius, plReal height);
+	extern  plCollisionShapeHandle plNewCylinderShape(plReal radius, plReal height);
+	extern	plCollisionShapeHandle plNewCompoundShape();
+	extern	void	plAddChildShape(plCollisionShapeHandle compoundShape,plCollisionShapeHandle childShape, plVector3 childPos,plQuaternion childOrn);
+
+	extern  void plDeleteShape(plCollisionShapeHandle shape);
+
+	/* Convex Meshes */
+	extern  plCollisionShapeHandle plNewConvexHullShape();
+	extern  void		plAddVertex(plCollisionShapeHandle convexHull, plReal x,plReal y,plReal z);
+/* Concave static triangle meshes */
+	extern  plMeshInterfaceHandle		   plNewMeshInterface();
+	extern  void		plAddTriangle(plMeshInterfaceHandle meshHandle, plVector3 v0,plVector3 v1,plVector3 v2);
+	extern  plCollisionShapeHandle plNewStaticTriangleMeshShape(plMeshInterfaceHandle);
+
+	extern  void plSetScaling(plCollisionShapeHandle shape, plVector3 scaling);
+
+/* SOLID has Response Callback/Table/Management */
+/* PhysX has Triggers, User Callbacks and filtering */
+/* ODE has the typedef void dNearCallback (void *data, dGeomID o1, dGeomID o2); */
+
+/*	typedef void plUpdatedPositionCallback(void* userData, plRigidBodyHandle	rbHandle, plVector3 pos); */
+/*	typedef void plUpdatedOrientationCallback(void* userData, plRigidBodyHandle	rbHandle, plQuaternion orientation); */
+
+	/* get world transform */
+	extern void	plGetOpenGLMatrix(plRigidBodyHandle object, plReal* matrix);
+	extern void	plGetPosition(plRigidBodyHandle object,plVector3 position);
+	extern void plGetOrientation(plRigidBodyHandle object,plQuaternion orientation);
+
+	/* set world transform (position/orientation) */
+	extern  void plSetPosition(plRigidBodyHandle object, const plVector3 position);
+	extern  void plSetOrientation(plRigidBodyHandle object, const plQuaternion orientation);
+	extern	void plSetEuler(plReal yaw,plReal pitch,plReal roll, plQuaternion orient);
+
+	typedef struct plRayCastResult {
+		plRigidBodyHandle		m_body;  
+		plCollisionShapeHandle	m_shape; 		
+		plVector3				m_positionWorld; 		
+		plVector3				m_normalWorld;
+	} plRayCastResult;
+
+	extern  int plRayCast(plDynamicsWorldHandle world, const plVector3 rayStart, const plVector3 rayEnd, plRayCastResult res);
+
+	/* Sweep API */
+
+	/* extern  plRigidBodyHandle plObjectCast(plDynamicsWorldHandle world, const plVector3 rayStart, const plVector3 rayEnd, plVector3 hitpoint, plVector3 normal); */
+
+	/* Continuous Collision Detection API */
 
 #ifdef __cplusplus
 }
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp
index be4a11506df..d7eea33ea41 100644
--- a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp
+++ b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp
@@ -21,640 +21,18 @@
 
 #include <assert.h>
 
-#ifdef DEBUG_BROADPHASE
-#include <stdio.h>
-void btAxisSweep3::debugPrintAxis(int axis, bool checkCardinality)
+btAxisSweep3::btAxisSweep3(const btPoint3& worldAabbMin,const btPoint3& worldAabbMax, unsigned short int maxHandles, btOverlappingPairCache* pairCache)
+:btAxisSweep3Internal<unsigned short int>(worldAabbMin,worldAabbMax,0xfffe,0xffff,maxHandles,pairCache)
 {
-	int numEdges = m_pHandles[0].m_maxEdges[axis];
-	printf("SAP Axis %d, numEdges=%d\n",axis,numEdges);
-
-	int i;
-	for (i=0;i<numEdges+1;i++)
-	{
-		Edge* pEdge = m_pEdges[axis] + i;
-		Handle* pHandlePrev = getHandle(pEdge->m_handle);
-		int handleIndex = pEdge->IsMax()? pHandlePrev->m_maxEdges[axis] : pHandlePrev->m_minEdges[axis];
-		char beginOrEnd;
-		beginOrEnd=pEdge->IsMax()?'E':'B';
-		printf("	[%c,h=%d,p=%x,i=%d]\n",beginOrEnd,pEdge->m_handle,pEdge->m_pos,handleIndex);
-	}
-
-	if (checkCardinality)
-		assert(numEdges == m_numHandles*2+1);
-}
-#endif //DEBUG_BROADPHASE
-
-
-btBroadphaseProxy*	btAxisSweep3::createProxy(  const btVector3& min,  const btVector3& max,int shapeType,void* userPtr,short int collisionFilterGroup,short int collisionFilterMask)
-{
-		(void)shapeType;
-		BP_FP_INT_TYPE handleId = addHandle(min,max, userPtr,collisionFilterGroup,collisionFilterMask);
-		
-		Handle* handle = getHandle(handleId);
-				
-		return handle;
-}
-
-void	btAxisSweep3::destroyProxy(btBroadphaseProxy* proxy)
-{
-	Handle* handle = static_cast<Handle*>(proxy);
-	removeHandle(handle->m_handleId);
-}
-
-void	btAxisSweep3::setAabb(btBroadphaseProxy* proxy,const btVector3& aabbMin,const btVector3& aabbMax)
-{
-	Handle* handle = static_cast<Handle*>(proxy);
-	updateHandle(handle->m_handleId,aabbMin,aabbMax);
-
-}
-
-
-
-
-
-
-btAxisSweep3::btAxisSweep3(const btPoint3& worldAabbMin,const btPoint3& worldAabbMax, int maxHandles)
-:btOverlappingPairCache()
-{
-	m_invalidPair = 0;
-	//assert(bounds.HasVolume());
-
 	// 1 handle is reserved as sentinel
-	btAssert(maxHandles > 1 && maxHandles < BP_MAX_HANDLES);
-
-	// init bounds
-	m_worldAabbMin = worldAabbMin;
-	m_worldAabbMax = worldAabbMax;
-
-	btVector3 aabbSize = m_worldAabbMax - m_worldAabbMin;
-
-	BP_FP_INT_TYPE	maxInt = BP_HANDLE_SENTINEL;
-
-	m_quantize = btVector3(btScalar(maxInt),btScalar(maxInt),btScalar(maxInt)) / aabbSize;
-
-	// allocate handles buffer and put all handles on free list
-	m_pHandles = new Handle[maxHandles];
-	m_maxHandles = maxHandles;
-	m_numHandles = 0;
-
-	// handle 0 is reserved as the null index, and is also used as the sentinel
-	m_firstFreeHandle = 1;
-	{
-		for (BP_FP_INT_TYPE i = m_firstFreeHandle; i < maxHandles; i++)
-			m_pHandles[i].SetNextFree(i + 1);
-		m_pHandles[maxHandles - 1].SetNextFree(0);
-	}
-
-	{
-	// allocate edge buffers
-	for (int i = 0; i < 3; i++)
-		m_pEdges[i] = new Edge[maxHandles * 2];
-	}
-	//removed overlap management
-
-	// make boundary sentinels
-	
-	m_pHandles[0].m_clientObject = 0;
-
-	for (int axis = 0; axis < 3; axis++)
-	{
-		m_pHandles[0].m_minEdges[axis] = 0;
-		m_pHandles[0].m_maxEdges[axis] = 1;
-
-		m_pEdges[axis][0].m_pos = 0;
-		m_pEdges[axis][0].m_handle = 0;
-		m_pEdges[axis][1].m_pos = BP_HANDLE_SENTINEL;
-		m_pEdges[axis][1].m_handle = 0;
-#ifdef DEBUG_BROADPHASE
-		debugPrintAxis(axis);
-#endif //DEBUG_BROADPHASE
-
-	}
+	btAssert(maxHandles > 1 && maxHandles < 32767);
 
 }
 
-btAxisSweep3::~btAxisSweep3()
+
+bt32BitAxisSweep3::bt32BitAxisSweep3(const btPoint3& worldAabbMin,const btPoint3& worldAabbMax, unsigned int maxHandles , btOverlappingPairCache* pairCache )
+:btAxisSweep3Internal<unsigned int>(worldAabbMin,worldAabbMax,0xfffffffe,0x7fffffff,maxHandles,pairCache)
 {
-	
-	for (int i = 2; i >= 0; i--)
-		delete[] m_pEdges[i];
-	delete[] m_pHandles;
-}
-
-void btAxisSweep3::quantize(BP_FP_INT_TYPE* out, const btPoint3& point, int isMax) const
-{
-	btPoint3 clampedPoint(point);
-	
-
-
-	clampedPoint.setMax(m_worldAabbMin);
-	clampedPoint.setMin(m_worldAabbMax);
-
-	btVector3 v = (clampedPoint - m_worldAabbMin) * m_quantize;
-	out[0] = (BP_FP_INT_TYPE)(((BP_FP_INT_TYPE)v.getX() & BP_HANDLE_MASK) | isMax);
-	out[1] = (BP_FP_INT_TYPE)(((BP_FP_INT_TYPE)v.getY() & BP_HANDLE_MASK) | isMax);
-	out[2] = (BP_FP_INT_TYPE)(((BP_FP_INT_TYPE)v.getZ() & BP_HANDLE_MASK) | isMax);
-	
-}
-
-
-
-BP_FP_INT_TYPE btAxisSweep3::allocHandle()
-{
-	assert(m_firstFreeHandle);
-
-	BP_FP_INT_TYPE handle = m_firstFreeHandle;
-	m_firstFreeHandle = getHandle(handle)->GetNextFree();
-	m_numHandles++;
-
-	return handle;
-}
-
-void btAxisSweep3::freeHandle(BP_FP_INT_TYPE handle)
-{
-	assert(handle > 0 && handle < m_maxHandles);
-
-	getHandle(handle)->SetNextFree(m_firstFreeHandle);
-	m_firstFreeHandle = handle;
-
-	m_numHandles--;
-}
-
-
-
-BP_FP_INT_TYPE btAxisSweep3::addHandle(const btPoint3& aabbMin,const btPoint3& aabbMax, void* pOwner,short int collisionFilterGroup,short int collisionFilterMask)
-{
-	// quantize the bounds
-	BP_FP_INT_TYPE min[3], max[3];
-	quantize(min, aabbMin, 0);
-	quantize(max, aabbMax, 1);
-
-	// allocate a handle
-	BP_FP_INT_TYPE handle = allocHandle();
-	assert(handle!= 0xcdcd);
-
-	Handle* pHandle = getHandle(handle);
-	
-	pHandle->m_handleId = handle;
-	//pHandle->m_pOverlaps = 0;
-	pHandle->m_clientObject = pOwner;
-	pHandle->m_collisionFilterGroup = collisionFilterGroup;
-	pHandle->m_collisionFilterMask = collisionFilterMask;
-
-	// compute current limit of edge arrays
-	BP_FP_INT_TYPE limit = m_numHandles * 2;
-
-	
-	// insert new edges just inside the max boundary edge
-	for (BP_FP_INT_TYPE axis = 0; axis < 3; axis++)
-	{
-
-		m_pHandles[0].m_maxEdges[axis] += 2;
-
-		m_pEdges[axis][limit + 1] = m_pEdges[axis][limit - 1];
-
-		m_pEdges[axis][limit - 1].m_pos = min[axis];
-		m_pEdges[axis][limit - 1].m_handle = handle;
-
-		m_pEdges[axis][limit].m_pos = max[axis];
-		m_pEdges[axis][limit].m_handle = handle;
-
-		pHandle->m_minEdges[axis] = limit - 1;
-		pHandle->m_maxEdges[axis] = limit;
-	}
-
-	// now sort the new edges to their correct position
-	sortMinDown(0, pHandle->m_minEdges[0], false);
-	sortMaxDown(0, pHandle->m_maxEdges[0], false);
-	sortMinDown(1, pHandle->m_minEdges[1], false);
-	sortMaxDown(1, pHandle->m_maxEdges[1], false);
-	sortMinDown(2, pHandle->m_minEdges[2], true);
-	sortMaxDown(2, pHandle->m_maxEdges[2], true);
-
-
-	return handle;
-}
-
-
-void btAxisSweep3::removeHandle(BP_FP_INT_TYPE handle)
-{
-	
-	Handle* pHandle = getHandle(handle);
-
-	//explicitly remove the pairs containing the proxy
-	//we could do it also in the sortMinUp (passing true)
-	//todo: compare performance
-	removeOverlappingPairsContainingProxy(pHandle);
-
-
-	// compute current limit of edge arrays
-	int limit = m_numHandles * 2;
-	
-	int axis;
-
-	for (axis = 0;axis<3;axis++)
-	{
-		m_pHandles[0].m_maxEdges[axis] -= 2;
-	}
-
-	// remove the edges by sorting them up to the end of the list
-	for ( axis = 0; axis < 3; axis++)
-	{
-		Edge* pEdges = m_pEdges[axis];
-		BP_FP_INT_TYPE max = pHandle->m_maxEdges[axis];
-		pEdges[max].m_pos = BP_HANDLE_SENTINEL;
-
-		sortMaxUp(axis,max,false);
-
-
-		BP_FP_INT_TYPE i = pHandle->m_minEdges[axis];
-		pEdges[i].m_pos = BP_HANDLE_SENTINEL;
-
-
-		sortMinUp(axis,i,false);
-
-		pEdges[limit-1].m_handle = 0;
-		pEdges[limit-1].m_pos = BP_HANDLE_SENTINEL;
-		
-#ifdef DEBUG_BROADPHASE
-			debugPrintAxis(axis,false);
-#endif //DEBUG_BROADPHASE
-
-
-	}
-
-
-	// free the handle
-	freeHandle(handle);
-
-	
-}
-
-extern int gOverlappingPairs;
-
-
-void	btAxisSweep3::refreshOverlappingPairs()
-{
-
-}
-void	btAxisSweep3::processAllOverlappingPairs(btOverlapCallback* callback)
-{
-
-	//perform a sort, to find duplicates and to sort 'invalid' pairs to the end
-	m_overlappingPairArray.heapSort(btBroadphasePairSortPredicate());
-
-	//remove the 'invalid' ones
-#ifdef USE_POPBACK_REMOVAL
-	while (m_invalidPair>0)
-	{
-		m_invalidPair--;
-		m_overlappingPairArray.pop_back();
-	}
-#else	
-	m_overlappingPairArray.resize(m_overlappingPairArray.size() - m_invalidPair);
-	m_invalidPair = 0;
-#endif
-
-	
-	int i;
-
-	btBroadphasePair previousPair;
-	previousPair.m_pProxy0 = 0;
-	previousPair.m_pProxy1 = 0;
-	previousPair.m_algorithm = 0;
-	
-	
-	for (i=0;i<m_overlappingPairArray.size();i++)
-	{
-	
-		btBroadphasePair& pair = m_overlappingPairArray[i];
-
-		bool isDuplicate = (pair == previousPair);
-
-		previousPair = pair;
-
-		bool needsRemoval = false;
-
-		if (!isDuplicate)
-		{
-			bool hasOverlap = testOverlap(pair.m_pProxy0,pair.m_pProxy1);
-
-			if (hasOverlap)
-			{
-				needsRemoval = callback->processOverlap(pair);
-			} else
-			{
-				needsRemoval = true;
-			}
-		} else
-		{
-			//remove duplicate
-			needsRemoval = true;
-			//should have no algorithm
-			btAssert(!pair.m_algorithm);
-		}
-		
-		if (needsRemoval)
-		{
-			cleanOverlappingPair(pair);
-
-	//		m_overlappingPairArray.swap(i,m_overlappingPairArray.size()-1);
-	//		m_overlappingPairArray.pop_back();
-			pair.m_pProxy0 = 0;
-			pair.m_pProxy1 = 0;
-			m_invalidPair++;
-			gOverlappingPairs--;
-		} 
-		
-	}
-}
-
-
-bool btAxisSweep3::testOverlap(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1)
-{
-	const Handle* pHandleA = static_cast<Handle*>(proxy0);
-	const Handle* pHandleB = static_cast<Handle*>(proxy1);
-	
-	//optimization 1: check the array index (memory address), instead of the m_pos
-
-	for (int axis = 0; axis < 3; axis++)
-	{ 
-		if (pHandleA->m_maxEdges[axis] < pHandleB->m_minEdges[axis] || 
-			pHandleB->m_maxEdges[axis] < pHandleA->m_minEdges[axis]) 
-		{ 
-			return false; 
-		} 
-	} 
-	return true;
-}
-
-bool btAxisSweep3::testOverlap(int ignoreAxis,const Handle* pHandleA, const Handle* pHandleB)
-{
-	//optimization 1: check the array index (memory address), instead of the m_pos
-
-	for (int axis = 0; axis < 3; axis++)
-	{ 
-		if (axis != ignoreAxis)
-		{
-			if (pHandleA->m_maxEdges[axis] < pHandleB->m_minEdges[axis] || 
-				pHandleB->m_maxEdges[axis] < pHandleA->m_minEdges[axis]) 
-			{ 
-				return false; 
-			} 
-		}
-	} 
-
-	//optimization 2: only 2 axis need to be tested (conflicts with 'delayed removal' optimization)
-
-	/*for (int axis = 0; axis < 3; axis++)
-	{
-		if (m_pEdges[axis][pHandleA->m_maxEdges[axis]].m_pos < m_pEdges[axis][pHandleB->m_minEdges[axis]].m_pos ||
-			m_pEdges[axis][pHandleB->m_maxEdges[axis]].m_pos < m_pEdges[axis][pHandleA->m_minEdges[axis]].m_pos)
-		{
-			return false;
-		}
-	}
-	*/
-
-	return true;
-}
-
-void btAxisSweep3::updateHandle(BP_FP_INT_TYPE handle, const btPoint3& aabbMin,const btPoint3& aabbMax)
-{
-//	assert(bounds.IsFinite());
-	//assert(bounds.HasVolume());
-
-	Handle* pHandle = getHandle(handle);
-
-	// quantize the new bounds
-	BP_FP_INT_TYPE min[3], max[3];
-	quantize(min, aabbMin, 0);
-	quantize(max, aabbMax, 1);
-
-	// update changed edges
-	for (int axis = 0; axis < 3; axis++)
-	{
-		BP_FP_INT_TYPE emin = pHandle->m_minEdges[axis];
-		BP_FP_INT_TYPE emax = pHandle->m_maxEdges[axis];
-
-		int dmin = (int)min[axis] - (int)m_pEdges[axis][emin].m_pos;
-		int dmax = (int)max[axis] - (int)m_pEdges[axis][emax].m_pos;
-
-		m_pEdges[axis][emin].m_pos = min[axis];
-		m_pEdges[axis][emax].m_pos = max[axis];
-
-		// expand (only adds overlaps)
-		if (dmin < 0)
-			sortMinDown(axis, emin);
-
-		if (dmax > 0)
-			sortMaxUp(axis, emax);
-
-		// shrink (only removes overlaps)
-		if (dmin > 0)
-			sortMinUp(axis, emin);
-
-		if (dmax < 0)
-			sortMaxDown(axis, emax);
-
-#ifdef DEBUG_BROADPHASE
-	debugPrintAxis(axis);
-#endif //DEBUG_BROADPHASE
-	}
-
-	
-}
-
-
-
-
-// sorting a min edge downwards can only ever *add* overlaps
-void btAxisSweep3::sortMinDown(int axis, BP_FP_INT_TYPE edge, bool updateOverlaps)
-{
-
-	Edge* pEdge = m_pEdges[axis] + edge;
-	Edge* pPrev = pEdge - 1;
-	Handle* pHandleEdge = getHandle(pEdge->m_handle);
-
-	while (pEdge->m_pos < pPrev->m_pos)
-	{
-		Handle* pHandlePrev = getHandle(pPrev->m_handle);
-
-		if (pPrev->IsMax())
-		{
-			// if previous edge is a maximum check the bounds and add an overlap if necessary
-			if (updateOverlaps && testOverlap(axis,pHandleEdge, pHandlePrev))
-			{
-				addOverlappingPair(pHandleEdge,pHandlePrev);
-
-				//AddOverlap(pEdge->m_handle, pPrev->m_handle);
-
-			}
-
-			// update edge reference in other handle
-			pHandlePrev->m_maxEdges[axis]++;
-		}
-		else
-			pHandlePrev->m_minEdges[axis]++;
-
-		pHandleEdge->m_minEdges[axis]--;
-
-		// swap the edges
-		Edge swap = *pEdge;
-		*pEdge = *pPrev;
-		*pPrev = swap;
-
-		// decrement
-		pEdge--;
-		pPrev--;
-	}
-
-#ifdef DEBUG_BROADPHASE
-	debugPrintAxis(axis);
-#endif //DEBUG_BROADPHASE
-
-}
-
-// sorting a min edge upwards can only ever *remove* overlaps
-void btAxisSweep3::sortMinUp(int axis, BP_FP_INT_TYPE edge, bool updateOverlaps)
-{
-	Edge* pEdge = m_pEdges[axis] + edge;
-	Edge* pNext = pEdge + 1;
-	Handle* pHandleEdge = getHandle(pEdge->m_handle);
-
-	while (pNext->m_handle && (pEdge->m_pos >= pNext->m_pos))
-	{
-		Handle* pHandleNext = getHandle(pNext->m_handle);
-
-		if (pNext->IsMax())
-		{
-			// if next edge is maximum remove any overlap between the two handles
-			if (updateOverlaps)
-			{
-				/*
-				Handle* handle0 = getHandle(pEdge->m_handle);
-				Handle* handle1 = getHandle(pNext->m_handle);
-				btBroadphasePair tmpPair(*handle0,*handle1);
-				removeOverlappingPair(tmpPair);
-				*/
-
-			}
-
-			// update edge reference in other handle
-			pHandleNext->m_maxEdges[axis]--;
-		}
-		else
-			pHandleNext->m_minEdges[axis]--;
-
-		pHandleEdge->m_minEdges[axis]++;
-
-		// swap the edges
-		Edge swap = *pEdge;
-		*pEdge = *pNext;
-		*pNext = swap;
-
-		// increment
-		pEdge++;
-		pNext++;
-	}
-
-
-}
-
-// sorting a max edge downwards can only ever *remove* overlaps
-void btAxisSweep3::sortMaxDown(int axis, BP_FP_INT_TYPE edge, bool updateOverlaps)
-{
-
-	Edge* pEdge = m_pEdges[axis] + edge;
-	Edge* pPrev = pEdge - 1;
-	Handle* pHandleEdge = getHandle(pEdge->m_handle);
-
-	while (pEdge->m_pos < pPrev->m_pos)
-	{
-		Handle* pHandlePrev = getHandle(pPrev->m_handle);
-
-		if (!pPrev->IsMax())
-		{
-			// if previous edge was a minimum remove any overlap between the two handles
-			if (updateOverlaps)
-			{
-				//this is done during the overlappingpairarray iteration/narrowphase collision
-				/*
-				Handle* handle0 = getHandle(pEdge->m_handle);
-				Handle* handle1 = getHandle(pPrev->m_handle);
-				btBroadphasePair* pair = findPair(handle0,handle1);
-				//assert(pair);
-
-				if (pair)
-				{
-					removeOverlappingPair(*pair);
-				}
-				*/
-
-			}
-
-			// update edge reference in other handle
-			pHandlePrev->m_minEdges[axis]++;;
-		}
-		else
-			pHandlePrev->m_maxEdges[axis]++;
-
-		pHandleEdge->m_maxEdges[axis]--;
-
-		// swap the edges
-		Edge swap = *pEdge;
-		*pEdge = *pPrev;
-		*pPrev = swap;
-
-		// decrement
-		pEdge--;
-		pPrev--;
-	}
-
-	
-#ifdef DEBUG_BROADPHASE
-	debugPrintAxis(axis);
-#endif //DEBUG_BROADPHASE
-
-}
-
-// sorting a max edge upwards can only ever *add* overlaps
-void btAxisSweep3::sortMaxUp(int axis, BP_FP_INT_TYPE edge, bool updateOverlaps)
-{
-	Edge* pEdge = m_pEdges[axis] + edge;
-	Edge* pNext = pEdge + 1;
-	Handle* pHandleEdge = getHandle(pEdge->m_handle);
-
-	while (pNext->m_handle && (pEdge->m_pos >= pNext->m_pos))
-	{
-		Handle* pHandleNext = getHandle(pNext->m_handle);
-
-		if (!pNext->IsMax())
-		{
-			// if next edge is a minimum check the bounds and add an overlap if necessary
-			if (updateOverlaps && testOverlap(axis, pHandleEdge, pHandleNext))
-			{
-				Handle* handle0 = getHandle(pEdge->m_handle);
-				Handle* handle1 = getHandle(pNext->m_handle);
-				addOverlappingPair(handle0,handle1);
-			}
-
-			// update edge reference in other handle
-			pHandleNext->m_minEdges[axis]--;
-		}
-		else
-			pHandleNext->m_maxEdges[axis]--;
-
-		pHandleEdge->m_maxEdges[axis]++;
-
-		// swap the edges
-		Edge swap = *pEdge;
-		*pEdge = *pNext;
-		*pNext = swap;
-
-		// increment
-		pEdge++;
-		pNext++;
-	}
-	
+	// 1 handle is reserved as sentinel
+	btAssert(maxHandles > 1 && maxHandles < 2147483647);
 }
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
index 57bbb368672..e7c5fb5b6cf 100644
--- a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
+++ b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
@@ -19,34 +19,25 @@
 #ifndef AXIS_SWEEP_3_H
 #define AXIS_SWEEP_3_H
 
-#include "../../LinearMath/btPoint3.h"
-#include "../../LinearMath/btVector3.h"
+#include "LinearMath/btPoint3.h"
+#include "LinearMath/btVector3.h"
 #include "btOverlappingPairCache.h"
+#include "btBroadphaseInterface.h"
 #include "btBroadphaseProxy.h"
-
-
-//Enable BP_USE_FIXEDPOINT_INT_32 if you need more then 32767 objects
-//#define BP_USE_FIXEDPOINT_INT_32 1
-
-#ifdef BP_USE_FIXEDPOINT_INT_32
-	#define BP_FP_INT_TYPE unsigned int
-	#define BP_MAX_HANDLES 1500000 //arbitrary maximum number of handles
-	#define BP_HANDLE_SENTINEL 0x7fffffff
-	#define BP_HANDLE_MASK	0xfffffffe
-#else
-	#define BP_FP_INT_TYPE unsigned short int
-	#define BP_MAX_HANDLES 32767
-	#define BP_HANDLE_SENTINEL 0xffff
-	#define BP_HANDLE_MASK	0xfffe
-#endif //BP_USE_FIXEDPOINT_INT_32
+#include "btOverlappingPairCallback.h"
 
 //#define DEBUG_BROADPHASE 1
 
-/// btAxisSweep3 is an efficient implementation of the 3d axis sweep and prune broadphase.
-/// It uses arrays rather then lists for storage of the 3 axis. Also it operates using integer coordinates instead of floats.
-/// The testOverlap check is optimized to check the array index, rather then the actual AABB coordinates/pos
-class btAxisSweep3 : public btOverlappingPairCache
+/// The internal templace class btAxisSweep3Internal implements the sweep and prune broadphase.
+/// It uses quantized integers to represent the begin and end points for each of the 3 axis.
+/// Dont use this class directly, use btAxisSweep3 or bt32BitAxisSweep3 instead.
+template <typename BP_FP_INT_TYPE>
+class btAxisSweep3Internal : public btBroadphaseInterface
 {
+protected:
+
+	BP_FP_INT_TYPE	m_bpHandleMask;
+	BP_FP_INT_TYPE	m_handleSentinel;
 
 public:
 	
@@ -57,40 +48,52 @@ public:
 		BP_FP_INT_TYPE m_pos;			// low bit is min/max
 		BP_FP_INT_TYPE m_handle;
 
-		BP_FP_INT_TYPE IsMax() const {return m_pos & 1;}
+		BP_FP_INT_TYPE IsMax() const {return static_cast<BP_FP_INT_TYPE>(m_pos & 1);}
 	};
 
 public:
+	//This breaks the Intel compiler, see http://softwarecommunity.intel.com/isn/Community/en-US/forums/thread/30253577.aspx
 	class Handle : public btBroadphaseProxy
+	//ATTRIBUTE_ALIGNED16(class) Handle : public btBroadphaseProxy
 	{
 	public:
-		
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+	
 		// indexes into the edge arrays
 		BP_FP_INT_TYPE m_minEdges[3], m_maxEdges[3];		// 6 * 2 = 12
-		BP_FP_INT_TYPE m_handleId;
+//		BP_FP_INT_TYPE m_uniqueId;
 		BP_FP_INT_TYPE m_pad;
 		
 		//void* m_pOwner; this is now in btBroadphaseProxy.m_clientObject
 	
-		inline void SetNextFree(BP_FP_INT_TYPE next) {m_minEdges[0] = next;}
-		inline BP_FP_INT_TYPE GetNextFree() const {return m_minEdges[0];}
+		SIMD_FORCE_INLINE void SetNextFree(BP_FP_INT_TYPE next) {m_minEdges[0] = next;}
+		SIMD_FORCE_INLINE BP_FP_INT_TYPE GetNextFree() const {return m_minEdges[0];}
 	};		// 24 bytes + 24 for Edge structures = 44 bytes total per entry
 
 	
-private:
+protected:
 	btPoint3 m_worldAabbMin;						// overall system bounds
 	btPoint3 m_worldAabbMax;						// overall system bounds
 
 	btVector3 m_quantize;						// scaling factor for quantization
 
 	BP_FP_INT_TYPE m_numHandles;						// number of active handles
-	int m_maxHandles;						// max number of handles
+	BP_FP_INT_TYPE m_maxHandles;						// max number of handles
 	Handle* m_pHandles;						// handles pool
+	void* m_pHandlesRawPtr;
 	BP_FP_INT_TYPE m_firstFreeHandle;		// free handles list
 
 	Edge* m_pEdges[3];						// edge arrays for the 3 axes (each array has m_maxHandles * 2 + 2 sentinel entries)
+	void* m_pEdgesRawPtr[3];
 
-	int m_invalidPair;
+	btOverlappingPairCache* m_pairCache;
+
+	///btOverlappingPairCallback is an additional optional user callback for adding/removing overlapping pairs, similar interface to btOverlappingPairCache.
+	btOverlappingPairCallback* m_userPairCallback;
+	
+	bool	m_ownsPairCache;
+
+	int	m_invalidPair;
 
 	// allocation/deallocation
 	BP_FP_INT_TYPE allocHandle();
@@ -108,29 +111,801 @@ private:
 
 	void quantize(BP_FP_INT_TYPE* out, const btPoint3& point, int isMax) const;
 
-	void sortMinDown(int axis, BP_FP_INT_TYPE edge, bool updateOverlaps = true);
-	void sortMinUp(int axis, BP_FP_INT_TYPE edge, bool updateOverlaps = true);
-	void sortMaxDown(int axis, BP_FP_INT_TYPE edge, bool updateOverlaps = true);
-	void sortMaxUp(int axis, BP_FP_INT_TYPE edge, bool updateOverlaps = true);
+	void sortMinDown(int axis, BP_FP_INT_TYPE edge, btDispatcher* dispatcher, bool updateOverlaps );
+	void sortMinUp(int axis, BP_FP_INT_TYPE edge, btDispatcher* dispatcher, bool updateOverlaps );
+	void sortMaxDown(int axis, BP_FP_INT_TYPE edge, btDispatcher* dispatcher, bool updateOverlaps );
+	void sortMaxUp(int axis, BP_FP_INT_TYPE edge, btDispatcher* dispatcher, bool updateOverlaps );
 
 public:
-	btAxisSweep3(const btPoint3& worldAabbMin,const btPoint3& worldAabbMax, int maxHandles = 16384);
-	virtual	~btAxisSweep3();
 
-	virtual void	refreshOverlappingPairs();
+	btAxisSweep3Internal(const btPoint3& worldAabbMin,const btPoint3& worldAabbMax, BP_FP_INT_TYPE handleMask, BP_FP_INT_TYPE handleSentinel, BP_FP_INT_TYPE maxHandles = 16384, btOverlappingPairCache* pairCache=0);
+
+	virtual	~btAxisSweep3Internal();
+
+	BP_FP_INT_TYPE getNumHandles() const
+	{
+		return m_numHandles;
+	}
+
+	virtual void	calculateOverlappingPairs(btDispatcher* dispatcher);
 	
-	BP_FP_INT_TYPE addHandle(const btPoint3& aabbMin,const btPoint3& aabbMax, void* pOwner,short int collisionFilterGroup,short int collisionFilterMask);
-	void removeHandle(BP_FP_INT_TYPE handle);
-	void updateHandle(BP_FP_INT_TYPE handle, const btPoint3& aabbMin,const btPoint3& aabbMax);
-	inline Handle* getHandle(BP_FP_INT_TYPE index) const {return m_pHandles + index;}
+	BP_FP_INT_TYPE addHandle(const btPoint3& aabbMin,const btPoint3& aabbMax, void* pOwner,short int collisionFilterGroup,short int collisionFilterMask,btDispatcher* dispatcher,void* multiSapProxy);
+	void removeHandle(BP_FP_INT_TYPE handle,btDispatcher* dispatcher);
+	void updateHandle(BP_FP_INT_TYPE handle, const btPoint3& aabbMin,const btPoint3& aabbMax,btDispatcher* dispatcher);
+	SIMD_FORCE_INLINE Handle* getHandle(BP_FP_INT_TYPE index) const {return m_pHandles + index;}
 
 	void	processAllOverlappingPairs(btOverlapCallback* callback);
 
 	//Broadphase Interface
-	virtual btBroadphaseProxy*	createProxy(  const btVector3& min,  const btVector3& max,int shapeType,void* userPtr ,short int collisionFilterGroup,short int collisionFilterMask);
-	virtual void	destroyProxy(btBroadphaseProxy* proxy);
-	virtual void	setAabb(btBroadphaseProxy* proxy,const btVector3& aabbMin,const btVector3& aabbMax);
-	bool testOverlap(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1);
+	virtual btBroadphaseProxy*	createProxy(  const btVector3& aabbMin,  const btVector3& aabbMax,int shapeType,void* userPtr ,short int collisionFilterGroup,short int collisionFilterMask,btDispatcher* dispatcher,void* multiSapProxy);
+	virtual void	destroyProxy(btBroadphaseProxy* proxy,btDispatcher* dispatcher);
+	virtual void	setAabb(btBroadphaseProxy* proxy,const btVector3& aabbMin,const btVector3& aabbMax,btDispatcher* dispatcher);
+	
+	bool	testAabbOverlap(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1);
+
+	btOverlappingPairCache*	getOverlappingPairCache()
+	{
+		return m_pairCache;
+	}
+	const btOverlappingPairCache*	getOverlappingPairCache() const
+	{
+		return m_pairCache;
+	}
+
+	void	setOverlappingPairUserCallback(btOverlappingPairCallback* pairCallback)
+	{
+		m_userPairCallback = pairCallback;
+	}
+	const btOverlappingPairCallback*	getOverlappingPairUserCallback() const
+	{
+		return m_userPairCallback;
+	}
+
+	///getAabb returns the axis aligned bounding box in the 'global' coordinate frame
+	///will add some transform later
+	virtual void getBroadphaseAabb(btVector3& aabbMin,btVector3& aabbMax) const
+	{
+		aabbMin = m_worldAabbMin;
+		aabbMax = m_worldAabbMax;
+	}
+
+	virtual void	printStats()
+	{
+/*		printf("btAxisSweep3.h\n");
+		printf("numHandles = %d, maxHandles = %d\n",m_numHandles,m_maxHandles);
+		printf("aabbMin=%f,%f,%f,aabbMax=%f,%f,%f\n",m_worldAabbMin.getX(),m_worldAabbMin.getY(),m_worldAabbMin.getZ(),
+			m_worldAabbMax.getX(),m_worldAabbMax.getY(),m_worldAabbMax.getZ());
+			*/
+
+	}
+
+};
+
+////////////////////////////////////////////////////////////////////
+
+
+
+
+#ifdef DEBUG_BROADPHASE
+#include <stdio.h>
+
+template <typename BP_FP_INT_TYPE>
+void btAxisSweep3<BP_FP_INT_TYPE>::debugPrintAxis(int axis, bool checkCardinality)
+{
+	int numEdges = m_pHandles[0].m_maxEdges[axis];
+	printf("SAP Axis %d, numEdges=%d\n",axis,numEdges);
+
+	int i;
+	for (i=0;i<numEdges+1;i++)
+	{
+		Edge* pEdge = m_pEdges[axis] + i;
+		Handle* pHandlePrev = getHandle(pEdge->m_handle);
+		int handleIndex = pEdge->IsMax()? pHandlePrev->m_maxEdges[axis] : pHandlePrev->m_minEdges[axis];
+		char beginOrEnd;
+		beginOrEnd=pEdge->IsMax()?'E':'B';
+		printf("	[%c,h=%d,p=%x,i=%d]\n",beginOrEnd,pEdge->m_handle,pEdge->m_pos,handleIndex);
+	}
+
+	if (checkCardinality)
+		assert(numEdges == m_numHandles*2+1);
+}
+#endif //DEBUG_BROADPHASE
+
+template <typename BP_FP_INT_TYPE>
+btBroadphaseProxy*	btAxisSweep3Internal<BP_FP_INT_TYPE>::createProxy(  const btVector3& aabbMin,  const btVector3& aabbMax,int shapeType,void* userPtr,short int collisionFilterGroup,short int collisionFilterMask,btDispatcher* dispatcher,void* multiSapProxy)
+{
+		(void)shapeType;
+		BP_FP_INT_TYPE handleId = addHandle(aabbMin,aabbMax, userPtr,collisionFilterGroup,collisionFilterMask,dispatcher,multiSapProxy);
+		
+		Handle* handle = getHandle(handleId);
+				
+		return handle;
+}
+
+
+
+template <typename BP_FP_INT_TYPE>
+void	btAxisSweep3Internal<BP_FP_INT_TYPE>::destroyProxy(btBroadphaseProxy* proxy,btDispatcher* dispatcher)
+{
+	Handle* handle = static_cast<Handle*>(proxy);
+	removeHandle(static_cast<BP_FP_INT_TYPE>(handle->m_uniqueId), dispatcher);
+}
+
+template <typename BP_FP_INT_TYPE>
+void	btAxisSweep3Internal<BP_FP_INT_TYPE>::setAabb(btBroadphaseProxy* proxy,const btVector3& aabbMin,const btVector3& aabbMax,btDispatcher* dispatcher)
+{
+	Handle* handle = static_cast<Handle*>(proxy);
+	updateHandle(static_cast<BP_FP_INT_TYPE>(handle->m_uniqueId), aabbMin, aabbMax,dispatcher);
+
+}
+
+
+
+
+
+template <typename BP_FP_INT_TYPE>
+btAxisSweep3Internal<BP_FP_INT_TYPE>::btAxisSweep3Internal(const btPoint3& worldAabbMin,const btPoint3& worldAabbMax, BP_FP_INT_TYPE handleMask, BP_FP_INT_TYPE handleSentinel,BP_FP_INT_TYPE userMaxHandles, btOverlappingPairCache* pairCache )
+:m_bpHandleMask(handleMask),
+m_handleSentinel(handleSentinel),
+m_pairCache(pairCache),
+m_userPairCallback(0),
+m_ownsPairCache(false),
+m_invalidPair(0)
+{
+	BP_FP_INT_TYPE maxHandles = static_cast<BP_FP_INT_TYPE>(userMaxHandles+1);//need to add one sentinel handle
+
+	if (!m_pairCache)
+	{
+		void* ptr = btAlignedAlloc(sizeof(btHashedOverlappingPairCache),16);
+		m_pairCache = new(ptr) btHashedOverlappingPairCache();
+		m_ownsPairCache = true;
+	}
+
+	//assert(bounds.HasVolume());
+
+	// init bounds
+	m_worldAabbMin = worldAabbMin;
+	m_worldAabbMax = worldAabbMax;
+
+	btVector3 aabbSize = m_worldAabbMax - m_worldAabbMin;
+
+	BP_FP_INT_TYPE	maxInt = m_handleSentinel;
+
+	m_quantize = btVector3(btScalar(maxInt),btScalar(maxInt),btScalar(maxInt)) / aabbSize;
+
+	// allocate handles buffer and put all handles on free list
+	m_pHandlesRawPtr = btAlignedAlloc(sizeof(Handle)*maxHandles,16);
+	m_pHandles = new(m_pHandlesRawPtr) Handle[maxHandles];
+
+	m_maxHandles = maxHandles;
+	m_numHandles = 0;
+
+	// handle 0 is reserved as the null index, and is also used as the sentinel
+	m_firstFreeHandle = 1;
+	{
+		for (BP_FP_INT_TYPE i = m_firstFreeHandle; i < maxHandles; i++)
+			m_pHandles[i].SetNextFree(static_cast<BP_FP_INT_TYPE>(i + 1));
+		m_pHandles[maxHandles - 1].SetNextFree(0);
+	}
+
+	{
+		// allocate edge buffers
+		for (int i = 0; i < 3; i++)
+		{
+			m_pEdgesRawPtr[i] = btAlignedAlloc(sizeof(Edge)*maxHandles*2,16);
+			m_pEdges[i] = new(m_pEdgesRawPtr[i]) Edge[maxHandles * 2];
+		}
+	}
+	//removed overlap management
+
+	// make boundary sentinels
+	
+	m_pHandles[0].m_clientObject = 0;
+
+	for (int axis = 0; axis < 3; axis++)
+	{
+		m_pHandles[0].m_minEdges[axis] = 0;
+		m_pHandles[0].m_maxEdges[axis] = 1;
+
+		m_pEdges[axis][0].m_pos = 0;
+		m_pEdges[axis][0].m_handle = 0;
+		m_pEdges[axis][1].m_pos = m_handleSentinel;
+		m_pEdges[axis][1].m_handle = 0;
+#ifdef DEBUG_BROADPHASE
+		debugPrintAxis(axis);
+#endif //DEBUG_BROADPHASE
+
+	}
+
+}
+
+template <typename BP_FP_INT_TYPE>
+btAxisSweep3Internal<BP_FP_INT_TYPE>::~btAxisSweep3Internal()
+{
+	
+	for (int i = 2; i >= 0; i--)
+	{
+		btAlignedFree(m_pEdgesRawPtr[i]);
+	}
+	btAlignedFree(m_pHandlesRawPtr);
+
+	if (m_ownsPairCache)
+	{
+		m_pairCache->~btOverlappingPairCache();
+		btAlignedFree(m_pairCache);
+	}
+}
+
+template <typename BP_FP_INT_TYPE>
+void btAxisSweep3Internal<BP_FP_INT_TYPE>::quantize(BP_FP_INT_TYPE* out, const btPoint3& point, int isMax) const
+{
+	btPoint3 clampedPoint(point);
+	
+
+
+	clampedPoint.setMax(m_worldAabbMin);
+	clampedPoint.setMin(m_worldAabbMax);
+
+	btVector3 v = (clampedPoint - m_worldAabbMin) * m_quantize;
+	out[0] = (BP_FP_INT_TYPE)(((BP_FP_INT_TYPE)v.getX() & m_bpHandleMask) | isMax);
+	out[1] = (BP_FP_INT_TYPE)(((BP_FP_INT_TYPE)v.getY() & m_bpHandleMask) | isMax);
+	out[2] = (BP_FP_INT_TYPE)(((BP_FP_INT_TYPE)v.getZ() & m_bpHandleMask) | isMax);
+	
+}
+
+
+template <typename BP_FP_INT_TYPE>
+BP_FP_INT_TYPE btAxisSweep3Internal<BP_FP_INT_TYPE>::allocHandle()
+{
+	assert(m_firstFreeHandle);
+
+	BP_FP_INT_TYPE handle = m_firstFreeHandle;
+	m_firstFreeHandle = getHandle(handle)->GetNextFree();
+	m_numHandles++;
+
+	return handle;
+}
+
+template <typename BP_FP_INT_TYPE>
+void btAxisSweep3Internal<BP_FP_INT_TYPE>::freeHandle(BP_FP_INT_TYPE handle)
+{
+	assert(handle > 0 && handle < m_maxHandles);
+
+	getHandle(handle)->SetNextFree(m_firstFreeHandle);
+	m_firstFreeHandle = handle;
+
+	m_numHandles--;
+}
+
+
+template <typename BP_FP_INT_TYPE>
+BP_FP_INT_TYPE btAxisSweep3Internal<BP_FP_INT_TYPE>::addHandle(const btPoint3& aabbMin,const btPoint3& aabbMax, void* pOwner,short int collisionFilterGroup,short int collisionFilterMask,btDispatcher* dispatcher,void* multiSapProxy)
+{
+	// quantize the bounds
+	BP_FP_INT_TYPE min[3], max[3];
+	quantize(min, aabbMin, 0);
+	quantize(max, aabbMax, 1);
+
+	// allocate a handle
+	BP_FP_INT_TYPE handle = allocHandle();
+	
+
+	Handle* pHandle = getHandle(handle);
+	
+	pHandle->m_uniqueId = static_cast<int>(handle);
+	//pHandle->m_pOverlaps = 0;
+	pHandle->m_clientObject = pOwner;
+	pHandle->m_collisionFilterGroup = collisionFilterGroup;
+	pHandle->m_collisionFilterMask = collisionFilterMask;
+	pHandle->m_multiSapParentProxy = multiSapProxy;
+
+	// compute current limit of edge arrays
+	BP_FP_INT_TYPE limit = static_cast<BP_FP_INT_TYPE>(m_numHandles * 2);
+
+	
+	// insert new edges just inside the max boundary edge
+	for (BP_FP_INT_TYPE axis = 0; axis < 3; axis++)
+	{
+
+		m_pHandles[0].m_maxEdges[axis] += 2;
+
+		m_pEdges[axis][limit + 1] = m_pEdges[axis][limit - 1];
+
+		m_pEdges[axis][limit - 1].m_pos = min[axis];
+		m_pEdges[axis][limit - 1].m_handle = handle;
+
+		m_pEdges[axis][limit].m_pos = max[axis];
+		m_pEdges[axis][limit].m_handle = handle;
+
+		pHandle->m_minEdges[axis] = static_cast<BP_FP_INT_TYPE>(limit - 1);
+		pHandle->m_maxEdges[axis] = limit;
+	}
+
+	// now sort the new edges to their correct position
+	sortMinDown(0, pHandle->m_minEdges[0], dispatcher,false);
+	sortMaxDown(0, pHandle->m_maxEdges[0], dispatcher,false);
+	sortMinDown(1, pHandle->m_minEdges[1], dispatcher,false);
+	sortMaxDown(1, pHandle->m_maxEdges[1], dispatcher,false);
+	sortMinDown(2, pHandle->m_minEdges[2], dispatcher,true);
+	sortMaxDown(2, pHandle->m_maxEdges[2], dispatcher,true);
+
+
+	return handle;
+}
+
+
+template <typename BP_FP_INT_TYPE>
+void btAxisSweep3Internal<BP_FP_INT_TYPE>::removeHandle(BP_FP_INT_TYPE handle,btDispatcher* dispatcher)
+{
+
+	Handle* pHandle = getHandle(handle);
+
+	//explicitly remove the pairs containing the proxy
+	//we could do it also in the sortMinUp (passing true)
+	//todo: compare performance
+	if (!m_pairCache->hasDeferredRemoval())
+	{
+		m_pairCache->removeOverlappingPairsContainingProxy(pHandle,dispatcher);
+	}
+
+	// compute current limit of edge arrays
+	int limit = static_cast<int>(m_numHandles * 2);
+	
+	int axis;
+
+	for (axis = 0;axis<3;axis++)
+	{
+		m_pHandles[0].m_maxEdges[axis] -= 2;
+	}
+
+	// remove the edges by sorting them up to the end of the list
+	for ( axis = 0; axis < 3; axis++)
+	{
+		Edge* pEdges = m_pEdges[axis];
+		BP_FP_INT_TYPE max = pHandle->m_maxEdges[axis];
+		pEdges[max].m_pos = m_handleSentinel;
+
+		sortMaxUp(axis,max,dispatcher,false);
+
+
+		BP_FP_INT_TYPE i = pHandle->m_minEdges[axis];
+		pEdges[i].m_pos = m_handleSentinel;
+
+
+		sortMinUp(axis,i,dispatcher,false);
+
+		pEdges[limit-1].m_handle = 0;
+		pEdges[limit-1].m_pos = m_handleSentinel;
+		
+#ifdef DEBUG_BROADPHASE
+			debugPrintAxis(axis,false);
+#endif //DEBUG_BROADPHASE
+
+
+	}
+
+
+	// free the handle
+	freeHandle(handle);
+
+	
+}
+
+extern int gOverlappingPairs;
+//#include <stdio.h>
+
+template <typename BP_FP_INT_TYPE>
+void	btAxisSweep3Internal<BP_FP_INT_TYPE>::calculateOverlappingPairs(btDispatcher* dispatcher)
+{
+
+	if (m_pairCache->hasDeferredRemoval())
+	{
+	
+		btBroadphasePairArray&	overlappingPairArray = m_pairCache->getOverlappingPairArray();
+
+		//perform a sort, to find duplicates and to sort 'invalid' pairs to the end
+		overlappingPairArray.quickSort(btBroadphasePairSortPredicate());
+
+		overlappingPairArray.resize(overlappingPairArray.size() - m_invalidPair);
+		m_invalidPair = 0;
+
+		
+		int i;
+
+		btBroadphasePair previousPair;
+		previousPair.m_pProxy0 = 0;
+		previousPair.m_pProxy1 = 0;
+		previousPair.m_algorithm = 0;
+		
+		
+		for (i=0;i<overlappingPairArray.size();i++)
+		{
+		
+			btBroadphasePair& pair = overlappingPairArray[i];
+
+			bool isDuplicate = (pair == previousPair);
+
+			previousPair = pair;
+
+			bool needsRemoval = false;
+
+			if (!isDuplicate)
+			{
+				bool hasOverlap = testAabbOverlap(pair.m_pProxy0,pair.m_pProxy1);
+
+				if (hasOverlap)
+				{
+					needsRemoval = false;//callback->processOverlap(pair);
+				} else
+				{
+					needsRemoval = true;
+				}
+			} else
+			{
+				//remove duplicate
+				needsRemoval = true;
+				//should have no algorithm
+				btAssert(!pair.m_algorithm);
+			}
+			
+			if (needsRemoval)
+			{
+				m_pairCache->cleanOverlappingPair(pair,dispatcher);
+
+		//		m_overlappingPairArray.swap(i,m_overlappingPairArray.size()-1);
+		//		m_overlappingPairArray.pop_back();
+				pair.m_pProxy0 = 0;
+				pair.m_pProxy1 = 0;
+				m_invalidPair++;
+				gOverlappingPairs--;
+			} 
+			
+		}
+
+	///if you don't like to skip the invalid pairs in the array, execute following code:
+	#define CLEAN_INVALID_PAIRS 1
+	#ifdef CLEAN_INVALID_PAIRS
+
+		//perform a sort, to sort 'invalid' pairs to the end
+		overlappingPairArray.quickSort(btBroadphasePairSortPredicate());
+
+		overlappingPairArray.resize(overlappingPairArray.size() - m_invalidPair);
+		m_invalidPair = 0;
+	#endif//CLEAN_INVALID_PAIRS
+		
+		//printf("overlappingPairArray.size()=%d\n",overlappingPairArray.size());
+	}
+
+
+
+	
+
+}
+
+
+template <typename BP_FP_INT_TYPE>
+bool btAxisSweep3Internal<BP_FP_INT_TYPE>::testAabbOverlap(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1)
+{
+	const Handle* pHandleA = static_cast<Handle*>(proxy0);
+	const Handle* pHandleB = static_cast<Handle*>(proxy1);
+	
+	//optimization 1: check the array index (memory address), instead of the m_pos
+
+	for (int axis = 0; axis < 3; axis++)
+	{ 
+		if (pHandleA->m_maxEdges[axis] < pHandleB->m_minEdges[axis] || 
+			pHandleB->m_maxEdges[axis] < pHandleA->m_minEdges[axis]) 
+		{ 
+			return false; 
+		} 
+	} 
+	return true;
+}
+
+template <typename BP_FP_INT_TYPE>
+bool btAxisSweep3Internal<BP_FP_INT_TYPE>::testOverlap(int ignoreAxis,const Handle* pHandleA, const Handle* pHandleB)
+{
+	//optimization 1: check the array index (memory address), instead of the m_pos
+
+	for (int axis = 0; axis < 3; axis++)
+	{ 
+		if (axis != ignoreAxis)
+		{
+			if (pHandleA->m_maxEdges[axis] < pHandleB->m_minEdges[axis] || 
+				pHandleB->m_maxEdges[axis] < pHandleA->m_minEdges[axis]) 
+			{ 
+				return false; 
+			} 
+		}
+	} 
+
+	//optimization 2: only 2 axis need to be tested (conflicts with 'delayed removal' optimization)
+
+	/*for (int axis = 0; axis < 3; axis++)
+	{
+		if (m_pEdges[axis][pHandleA->m_maxEdges[axis]].m_pos < m_pEdges[axis][pHandleB->m_minEdges[axis]].m_pos ||
+			m_pEdges[axis][pHandleB->m_maxEdges[axis]].m_pos < m_pEdges[axis][pHandleA->m_minEdges[axis]].m_pos)
+		{
+			return false;
+		}
+	}
+	*/
+
+	return true;
+}
+
+template <typename BP_FP_INT_TYPE>
+void btAxisSweep3Internal<BP_FP_INT_TYPE>::updateHandle(BP_FP_INT_TYPE handle, const btPoint3& aabbMin,const btPoint3& aabbMax,btDispatcher* dispatcher)
+{
+//	assert(bounds.IsFinite());
+	//assert(bounds.HasVolume());
+
+	Handle* pHandle = getHandle(handle);
+
+	// quantize the new bounds
+	BP_FP_INT_TYPE min[3], max[3];
+	quantize(min, aabbMin, 0);
+	quantize(max, aabbMax, 1);
+
+	// update changed edges
+	for (int axis = 0; axis < 3; axis++)
+	{
+		BP_FP_INT_TYPE emin = pHandle->m_minEdges[axis];
+		BP_FP_INT_TYPE emax = pHandle->m_maxEdges[axis];
+
+		int dmin = (int)min[axis] - (int)m_pEdges[axis][emin].m_pos;
+		int dmax = (int)max[axis] - (int)m_pEdges[axis][emax].m_pos;
+
+		m_pEdges[axis][emin].m_pos = min[axis];
+		m_pEdges[axis][emax].m_pos = max[axis];
+
+		// expand (only adds overlaps)
+		if (dmin < 0)
+			sortMinDown(axis, emin,dispatcher,true);
+
+		if (dmax > 0)
+			sortMaxUp(axis, emax,dispatcher,true);
+
+		// shrink (only removes overlaps)
+		if (dmin > 0)
+			sortMinUp(axis, emin,dispatcher,true);
+
+		if (dmax < 0)
+			sortMaxDown(axis, emax,dispatcher,true);
+
+#ifdef DEBUG_BROADPHASE
+	debugPrintAxis(axis);
+#endif //DEBUG_BROADPHASE
+	}
+
+	
+}
+
+
+
+
+// sorting a min edge downwards can only ever *add* overlaps
+template <typename BP_FP_INT_TYPE>
+void btAxisSweep3Internal<BP_FP_INT_TYPE>::sortMinDown(int axis, BP_FP_INT_TYPE edge, btDispatcher* /* dispatcher */, bool updateOverlaps)
+{
+
+	Edge* pEdge = m_pEdges[axis] + edge;
+	Edge* pPrev = pEdge - 1;
+	Handle* pHandleEdge = getHandle(pEdge->m_handle);
+
+	while (pEdge->m_pos < pPrev->m_pos)
+	{
+		Handle* pHandlePrev = getHandle(pPrev->m_handle);
+
+		if (pPrev->IsMax())
+		{
+			// if previous edge is a maximum check the bounds and add an overlap if necessary
+			if (updateOverlaps && testOverlap(axis,pHandleEdge, pHandlePrev))
+			{
+				m_pairCache->addOverlappingPair(pHandleEdge,pHandlePrev);
+				if (m_userPairCallback)
+					m_userPairCallback->addOverlappingPair(pHandleEdge,pHandlePrev);
+
+				//AddOverlap(pEdge->m_handle, pPrev->m_handle);
+
+			}
+
+			// update edge reference in other handle
+			pHandlePrev->m_maxEdges[axis]++;
+		}
+		else
+			pHandlePrev->m_minEdges[axis]++;
+
+		pHandleEdge->m_minEdges[axis]--;
+
+		// swap the edges
+		Edge swap = *pEdge;
+		*pEdge = *pPrev;
+		*pPrev = swap;
+
+		// decrement
+		pEdge--;
+		pPrev--;
+	}
+
+#ifdef DEBUG_BROADPHASE
+	debugPrintAxis(axis);
+#endif //DEBUG_BROADPHASE
+
+}
+
+// sorting a min edge upwards can only ever *remove* overlaps
+template <typename BP_FP_INT_TYPE>
+void btAxisSweep3Internal<BP_FP_INT_TYPE>::sortMinUp(int axis, BP_FP_INT_TYPE edge, btDispatcher* dispatcher, bool updateOverlaps)
+{
+	Edge* pEdge = m_pEdges[axis] + edge;
+	Edge* pNext = pEdge + 1;
+	Handle* pHandleEdge = getHandle(pEdge->m_handle);
+
+	while (pNext->m_handle && (pEdge->m_pos >= pNext->m_pos))
+	{
+		Handle* pHandleNext = getHandle(pNext->m_handle);
+
+		if (pNext->IsMax())
+		{
+
+			// if next edge is maximum remove any overlap between the two handles
+			if (updateOverlaps)
+			{
+				Handle* handle0 = getHandle(pEdge->m_handle);
+				Handle* handle1 = getHandle(pNext->m_handle);
+
+				m_pairCache->removeOverlappingPair(handle0,handle1,dispatcher);	
+				if (m_userPairCallback)
+					m_userPairCallback->removeOverlappingPair(handle0,handle1,dispatcher);
+				
+			}
+
+
+			// update edge reference in other handle
+			pHandleNext->m_maxEdges[axis]--;
+		}
+		else
+			pHandleNext->m_minEdges[axis]--;
+
+		pHandleEdge->m_minEdges[axis]++;
+
+		// swap the edges
+		Edge swap = *pEdge;
+		*pEdge = *pNext;
+		*pNext = swap;
+
+		// increment
+		pEdge++;
+		pNext++;
+	}
+
+
+}
+
+// sorting a max edge downwards can only ever *remove* overlaps
+template <typename BP_FP_INT_TYPE>
+void btAxisSweep3Internal<BP_FP_INT_TYPE>::sortMaxDown(int axis, BP_FP_INT_TYPE edge, btDispatcher* dispatcher, bool updateOverlaps)
+{
+
+	Edge* pEdge = m_pEdges[axis] + edge;
+	Edge* pPrev = pEdge - 1;
+	Handle* pHandleEdge = getHandle(pEdge->m_handle);
+
+	while (pEdge->m_pos < pPrev->m_pos)
+	{
+		Handle* pHandlePrev = getHandle(pPrev->m_handle);
+
+		if (!pPrev->IsMax())
+		{
+			// if previous edge was a minimum remove any overlap between the two handles
+			if (updateOverlaps)
+			{
+				//this is done during the overlappingpairarray iteration/narrowphase collision
+
+				Handle* handle0 = getHandle(pEdge->m_handle);
+				Handle* handle1 = getHandle(pPrev->m_handle);
+				m_pairCache->removeOverlappingPair(handle0,handle1,dispatcher);
+				if (m_userPairCallback)
+					m_userPairCallback->removeOverlappingPair(handle0,handle1,dispatcher);
+			
+
+
+			}
+
+			// update edge reference in other handle
+			pHandlePrev->m_minEdges[axis]++;;
+		}
+		else
+			pHandlePrev->m_maxEdges[axis]++;
+
+		pHandleEdge->m_maxEdges[axis]--;
+
+		// swap the edges
+		Edge swap = *pEdge;
+		*pEdge = *pPrev;
+		*pPrev = swap;
+
+		// decrement
+		pEdge--;
+		pPrev--;
+	}
+
+	
+#ifdef DEBUG_BROADPHASE
+	debugPrintAxis(axis);
+#endif //DEBUG_BROADPHASE
+
+}
+
+// sorting a max edge upwards can only ever *add* overlaps
+template <typename BP_FP_INT_TYPE>
+void btAxisSweep3Internal<BP_FP_INT_TYPE>::sortMaxUp(int axis, BP_FP_INT_TYPE edge, btDispatcher* /* dispatcher */, bool updateOverlaps)
+{
+	Edge* pEdge = m_pEdges[axis] + edge;
+	Edge* pNext = pEdge + 1;
+	Handle* pHandleEdge = getHandle(pEdge->m_handle);
+
+	while (pNext->m_handle && (pEdge->m_pos >= pNext->m_pos))
+	{
+		Handle* pHandleNext = getHandle(pNext->m_handle);
+
+		if (!pNext->IsMax())
+		{
+			// if next edge is a minimum check the bounds and add an overlap if necessary
+			if (updateOverlaps && testOverlap(axis, pHandleEdge, pHandleNext))
+			{
+				Handle* handle0 = getHandle(pEdge->m_handle);
+				Handle* handle1 = getHandle(pNext->m_handle);
+				m_pairCache->addOverlappingPair(handle0,handle1);
+				if (m_userPairCallback)
+					m_userPairCallback->addOverlappingPair(handle0,handle1);
+			}
+
+			// update edge reference in other handle
+			pHandleNext->m_minEdges[axis]--;
+		}
+		else
+			pHandleNext->m_maxEdges[axis]--;
+
+		pHandleEdge->m_maxEdges[axis]++;
+
+		// swap the edges
+		Edge swap = *pEdge;
+		*pEdge = *pNext;
+		*pNext = swap;
+
+		// increment
+		pEdge++;
+		pNext++;
+	}
+	
+}
+
+
+
+////////////////////////////////////////////////////////////////////
+
+
+/// The btAxisSweep3 is an efficient implementation of the 3d axis sweep and prune broadphase.
+/// It uses arrays rather then lists for storage of the 3 axis. Also it operates using 16 bit integer coordinates instead of floats.
+/// For large worlds and many objects, use bt32BitAxisSweep3 or btDbvtBroadphase instead. bt32BitAxisSweep3 has higher precision and allows more then 16384 objects at the cost of more memory and bit of performance.
+class btAxisSweep3 : public btAxisSweep3Internal<unsigned short int>
+{
+public:
+
+	btAxisSweep3(const btPoint3& worldAabbMin,const btPoint3& worldAabbMax, unsigned short int maxHandles = 16384, btOverlappingPairCache* pairCache = 0);
+
+};
+
+/// The bt32BitAxisSweep3 allows higher precision quantization and more objects compared to the btAxisSweep3 sweep and prune.
+/// This comes at the cost of more memory per handle, and a bit slower performance.
+/// It uses arrays rather then lists for storage of the 3 axis.
+class bt32BitAxisSweep3 : public btAxisSweep3Internal<unsigned int>
+{
+public:
+
+	bt32BitAxisSweep3(const btPoint3& worldAabbMin,const btPoint3& worldAabbMax, unsigned int maxHandles = 1500000, btOverlappingPairCache* pairCache = 0);
 
 };
 
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h
index b6ace03c07a..200ac365329 100644
--- a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h
+++ b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h
@@ -20,20 +20,34 @@ subject to the following restrictions:
 
 struct btDispatcherInfo;
 class btDispatcher;
-struct btBroadphaseProxy;
-#include "../../LinearMath/btVector3.h"
+#include "btBroadphaseProxy.h"
+class btOverlappingPairCache;
 
-///BroadphaseInterface for aabb-overlapping object pairs
+#include "LinearMath/btVector3.h"
+
+///The btBroadphaseInterface class provides an interface to detect aabb-overlapping object pairs.
+///Some implementations for this broadphase interface include btAxisSweep3, bt32BitAxisSweep3 and btDbvtBroadphase.
+///The actual overlapping pair management, storage, adding and removing of pairs is dealt by the btOverlappingPairCache class.
 class btBroadphaseInterface
 {
 public:
 	virtual ~btBroadphaseInterface() {}
 
-	virtual btBroadphaseProxy*	createProxy(  const btVector3& min,  const btVector3& max,int shapeType,void* userPtr, short int collisionFilterGroup,short int collisionFilterMask) =0;
-	virtual void	destroyProxy(btBroadphaseProxy* proxy)=0;
-	virtual void	setAabb(btBroadphaseProxy* proxy,const btVector3& aabbMin,const btVector3& aabbMax)=0;
-	virtual void	cleanProxyFromPairs(btBroadphaseProxy* proxy)=0;
+	virtual btBroadphaseProxy*	createProxy(  const btVector3& aabbMin,  const btVector3& aabbMax,int shapeType,void* userPtr, short int collisionFilterGroup,short int collisionFilterMask, btDispatcher* dispatcher,void* multiSapProxy) =0;
+	virtual void	destroyProxy(btBroadphaseProxy* proxy,btDispatcher* dispatcher)=0;
+	virtual void	setAabb(btBroadphaseProxy* proxy,const btVector3& aabbMin,const btVector3& aabbMax, btDispatcher* dispatcher)=0;
 	
+	///calculateOverlappingPairs is optional: incremental algorithms (sweep and prune) might do it during the set aabb
+	virtual void	calculateOverlappingPairs(btDispatcher* dispatcher)=0;
+
+	virtual	btOverlappingPairCache*	getOverlappingPairCache()=0;
+	virtual	const btOverlappingPairCache*	getOverlappingPairCache() const =0;
+
+	///getAabb returns the axis aligned bounding box in the 'global' coordinate frame
+	///will add some transform later
+	virtual void getBroadphaseAabb(btVector3& aabbMin,btVector3& aabbMax) const =0;
+
+	virtual void	printStats() = 0;
 
 };
 
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h
index 40d9748ffa9..e0bb67f8521 100644
--- a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h
+++ b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h
@@ -16,7 +16,8 @@ subject to the following restrictions:
 #ifndef BROADPHASE_PROXY_H
 #define BROADPHASE_PROXY_H
 
-#include "../../LinearMath/btScalar.h" //for SIMD_FORCE_INLINE
+#include "LinearMath/btScalar.h" //for SIMD_FORCE_INLINE
+#include "LinearMath/btAlignedAllocator.h"
 
 
 /// btDispatcher uses these types
@@ -38,6 +39,7 @@ IMPLICIT_CONVEX_SHAPES_START_HERE,
 	CONE_SHAPE_PROXYTYPE,
 	CONVEX_SHAPE_PROXYTYPE,
 	CYLINDER_SHAPE_PROXYTYPE,
+	UNIFORM_SCALING_SHAPE_PROXYTYPE,
 	MINKOWSKI_SUM_SHAPE_PROXYTYPE,
 	MINKOWSKI_DIFFERENCE_SHAPE_PROXYTYPE,
 //concave shapes
@@ -50,6 +52,8 @@ CONCAVE_SHAPES_START_HERE,
 	TERRAIN_SHAPE_PROXYTYPE,
 ///Used for GIMPACT Trimesh integration
 	GIMPACT_SHAPE_PROXYTYPE,
+///Multimaterial mesh
+    MULTIMATERIAL_TRIANGLE_MESH_PROXYTYPE,
 	
 	EMPTY_SHAPE_PROXYTYPE,
 	STATIC_PLANE_PROXYTYPE,
@@ -57,13 +61,18 @@ CONCAVE_SHAPES_END_HERE,
 
 	COMPOUND_SHAPE_PROXYTYPE,
 
+	SOFTBODY_SHAPE_PROXYTYPE,
+
 	MAX_BROADPHASE_COLLISION_TYPES
 };
 
 
-///btBroadphaseProxy
-struct btBroadphaseProxy
+///The btBroadphaseProxy is the main class that can be used with the Bullet broadphases. 
+///It stores collision shape type information, collision filter information and a client object, typically a btCollisionObject or btRigidBody.
+ATTRIBUTE_ALIGNED16(struct) btBroadphaseProxy
 {
+
+BT_DECLARE_ALIGNED_ALLOCATOR();
 	
 	///optional filtering to cull potential collisions
 	enum CollisionFilterGroups
@@ -73,44 +82,60 @@ struct btBroadphaseProxy
 	        KinematicFilter = 4,
 	        DebrisFilter = 8,
 			SensorTrigger = 16,
-	        AllFilter = DefaultFilter | StaticFilter | KinematicFilter | DebrisFilter | SensorTrigger
+	        AllFilter = -1 //all bits sets: DefaultFilter | StaticFilter | KinematicFilter | DebrisFilter | SensorTrigger
 	};
 
 	//Usually the client btCollisionObject or Rigidbody class
 	void*	m_clientObject;
+
 	short int m_collisionFilterGroup;
 	short int m_collisionFilterMask;
 
-	//used for memory pools
-	btBroadphaseProxy() :m_clientObject(0){}
+	void*	m_multiSapParentProxy;		
 
-	btBroadphaseProxy(void* userPtr,short int collisionFilterGroup, short int collisionFilterMask)
+
+	int			m_uniqueId;//m_uniqueId is introduced for paircache. could get rid of this, by calculating the address offset etc.
+
+	SIMD_FORCE_INLINE int getUid() const
+	{
+		return m_uniqueId;
+	}
+
+	//used for memory pools
+	btBroadphaseProxy() :m_clientObject(0),m_multiSapParentProxy(0)
+	{
+	}
+
+	btBroadphaseProxy(void* userPtr,short int collisionFilterGroup, short int collisionFilterMask,void* multiSapParentProxy=0)
 		:m_clientObject(userPtr),
 		m_collisionFilterGroup(collisionFilterGroup),
 		m_collisionFilterMask(collisionFilterMask)
 	{
+		m_multiSapParentProxy = multiSapParentProxy;
 	}
 
-	static inline bool isPolyhedral(int proxyType)
+	
+
+	static SIMD_FORCE_INLINE bool isPolyhedral(int proxyType)
 	{
 		return (proxyType  < IMPLICIT_CONVEX_SHAPES_START_HERE);
 	}
 
-	static inline bool	isConvex(int proxyType)
+	static SIMD_FORCE_INLINE bool	isConvex(int proxyType)
 	{
 		return (proxyType < CONCAVE_SHAPES_START_HERE);
 	}
 
-	static inline bool	isConcave(int proxyType)
+	static SIMD_FORCE_INLINE bool	isConcave(int proxyType)
 	{
 		return ((proxyType > CONCAVE_SHAPES_START_HERE) &&
 			(proxyType < CONCAVE_SHAPES_END_HERE));
 	}
-	static inline bool	isCompound(int proxyType)
+	static SIMD_FORCE_INLINE bool	isCompound(int proxyType)
 	{
 		return (proxyType == COMPOUND_SHAPE_PROXYTYPE);
 	}
-	static inline bool isInfinite(int proxyType)
+	static SIMD_FORCE_INLINE bool isInfinite(int proxyType)
 	{
 		return (proxyType == STATIC_PLANE_PROXYTYPE);
 	}
@@ -124,8 +149,9 @@ struct btBroadphaseProxy;
 
 
 
-/// contains a pair of aabb-overlapping objects
-struct btBroadphasePair
+///The btBroadphasePair class contains a pair of aabb-overlapping objects.
+///A btDispatcher can search a btCollisionAlgorithm that performs exact/narrowphase collision detection on the actual collision shapes.
+ATTRIBUTE_ALIGNED16(struct) btBroadphasePair
 {
 	btBroadphasePair ()
 		:
@@ -136,6 +162,8 @@ struct btBroadphasePair
 	{
 	}
 
+BT_DECLARE_ALIGNED_ALLOCATOR();
+
 	btBroadphasePair(const btBroadphasePair& other)
 		:		m_pProxy0(other.m_pProxy0),
 				m_pProxy1(other.m_pProxy1),
@@ -181,6 +209,7 @@ SIMD_FORCE_INLINE bool operator<(const btBroadphasePair& a, const btBroadphasePa
 */
 
 
+
 class btBroadphasePairSortPredicate
 {
 	public:
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp
index 2ad0c86d8a2..c95d1be0f2c 100644
--- a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp
+++ b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp
@@ -18,6 +18,6 @@ subject to the following restrictions:
 
 btCollisionAlgorithm::btCollisionAlgorithm(const btCollisionAlgorithmConstructionInfo& ci)
 {
-	m_dispatcher = ci.m_dispatcher;
+	m_dispatcher = ci.m_dispatcher1;
 }
 
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h
index 55cec386a7b..1618ad9fdd3 100644
--- a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h
+++ b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h
@@ -16,7 +16,8 @@ subject to the following restrictions:
 #ifndef COLLISION_ALGORITHM_H
 #define COLLISION_ALGORITHM_H
 
-#include "../../LinearMath/btScalar.h"
+#include "LinearMath/btScalar.h"
+#include "LinearMath/btAlignedObjectArray.h"
 
 struct btBroadphaseProxy;
 class btDispatcher;
@@ -25,21 +26,22 @@ class btCollisionObject;
 struct btDispatcherInfo;
 class	btPersistentManifold;
 
+typedef btAlignedObjectArray<btPersistentManifold*>	btManifoldArray;
 
 struct btCollisionAlgorithmConstructionInfo
 {
 	btCollisionAlgorithmConstructionInfo()
-		:m_dispatcher(0),
+		:m_dispatcher1(0),
 		m_manifold(0)
 	{
 	}
 	btCollisionAlgorithmConstructionInfo(btDispatcher* dispatcher,int temp)
-		:m_dispatcher(dispatcher)
+		:m_dispatcher1(dispatcher)
 	{
 		(void)temp;
 	}
 
-	btDispatcher*	m_dispatcher;
+	btDispatcher*	m_dispatcher1;
 	btPersistentManifold*	m_manifold;
 
 	int	getDispatcherId();
@@ -71,6 +73,7 @@ public:
 
 	virtual btScalar calculateTimeOfImpact(btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut) = 0;
 
+	virtual	void	getAllContactManifolds(btManifoldArray&	manifoldArray) = 0;
 };
 
 
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.cpp b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.cpp
new file mode 100644
index 00000000000..fade71179e6
--- /dev/null
+++ b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.cpp
@@ -0,0 +1,1320 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+///btDbvt implementation by Nathanael Presson
+
+#include "btDbvt.h"
+
+//
+typedef btAlignedObjectArray<btDbvtNode*>			tNodeArray;
+typedef btAlignedObjectArray<const btDbvtNode*>	tConstNodeArray;
+
+//
+struct btDbvtNodeEnumerator : btDbvt::ICollide
+{
+tConstNodeArray	nodes;
+void Process(const btDbvtNode* n) { nodes.push_back(n); }
+};
+
+//
+static DBVT_INLINE int			indexof(const btDbvtNode* node)
+{
+return(node->parent->childs[1]==node);
+}
+
+//
+static DBVT_INLINE btDbvtVolume	merge(	const btDbvtVolume& a,
+										const btDbvtVolume& b)
+{
+#if DBVT_MERGE_IMPL==DBVT_IMPL_SSE
+DBVT_ALIGN char locals[sizeof(btDbvtAabbMm)];
+btDbvtVolume&	res=*(btDbvtVolume*)locals;
+#else
+btDbvtVolume	res;
+#endif
+Merge(a,b,res);
+return(res);
+}
+
+// volume+edge lengths
+static DBVT_INLINE btScalar		size(const btDbvtVolume& a)
+{
+const btVector3	edges=a.Lengths();
+return(	edges.x()*edges.y()*edges.z()+
+		edges.x()+edges.y()+edges.z());
+}
+
+//
+static void						getmaxdepth(const btDbvtNode* node,int depth,int& maxdepth)
+{
+if(node->isinternal())
+	{
+	getmaxdepth(node->childs[0],depth+1,maxdepth);
+	getmaxdepth(node->childs[0],depth+1,maxdepth);
+	} else maxdepth=btMax(maxdepth,depth);
+}
+
+//
+static DBVT_INLINE void			deletenode(	btDbvt* pdbvt,
+											btDbvtNode* node)
+{
+btAlignedFree(pdbvt->m_free);
+pdbvt->m_free=node;
+}
+	
+//
+static void						recursedeletenode(	btDbvt* pdbvt,
+													btDbvtNode* node)
+{
+if(!node->isleaf())
+	{
+	recursedeletenode(pdbvt,node->childs[0]);
+	recursedeletenode(pdbvt,node->childs[1]);
+	}
+if(node==pdbvt->m_root) pdbvt->m_root=0;
+deletenode(pdbvt,node);
+}
+
+//
+static DBVT_INLINE btDbvtNode*	createnode(	btDbvt* pdbvt,
+											btDbvtNode* parent,
+											void* data)
+{
+btDbvtNode*	node;
+if(pdbvt->m_free)
+	{ node=pdbvt->m_free;pdbvt->m_free=0; }
+	else
+	{ node=new(btAlignedAlloc(sizeof(btDbvtNode),16)) btDbvtNode(); }
+node->parent	=	parent;
+node->data		=	data;
+node->childs[1]	=	0;
+return(node);
+}
+
+//
+static DBVT_INLINE btDbvtNode*	createnode(	btDbvt* pdbvt,
+											btDbvtNode* parent,
+											const btDbvtVolume& volume,
+											void* data)
+{
+btDbvtNode*	node=createnode(pdbvt,parent,data);
+node->volume=volume;
+return(node);
+}
+
+//
+static DBVT_INLINE btDbvtNode*	createnode(	btDbvt* pdbvt,
+											btDbvtNode* parent,
+											const btDbvtVolume& volume0,
+											const btDbvtVolume& volume1,
+											void* data)
+{
+btDbvtNode*	node=createnode(pdbvt,parent,data);
+Merge(volume0,volume1,node->volume);
+return(node);
+}
+
+//
+static void						insertleaf(	btDbvt* pdbvt,
+											btDbvtNode* root,
+											btDbvtNode* leaf)
+{
+if(!pdbvt->m_root)
+	{
+	pdbvt->m_root	=	leaf;
+	leaf->parent	=	0;
+	}
+	else
+	{
+	if(!root->isleaf())
+		{
+		do	{
+			root=root->childs[Select(	leaf->volume,
+										root->childs[0]->volume,
+										root->childs[1]->volume)];
+			} while(!root->isleaf());
+		}
+	btDbvtNode*	prev=root->parent;
+	btDbvtNode*	node=createnode(pdbvt,prev,leaf->volume,root->volume,0);
+	if(prev)
+		{
+		prev->childs[indexof(root)]	=	node;
+		node->childs[0]				=	root;root->parent=node;
+		node->childs[1]				=	leaf;leaf->parent=node;
+		do	{
+			if(!prev->volume.Contain(node->volume))
+				Merge(prev->childs[0]->volume,prev->childs[1]->volume,prev->volume);
+				else
+				break;
+			node=prev;
+			} while(0!=(prev=node->parent));
+		}
+		else
+		{
+		node->childs[0]	=	root;root->parent=node;
+		node->childs[1]	=	leaf;leaf->parent=node;
+		pdbvt->m_root	=	node;
+		}
+	}
+}
+	
+//
+static btDbvtNode*				removeleaf(	btDbvt* pdbvt,
+											btDbvtNode* leaf)
+{
+if(leaf==pdbvt->m_root)
+	{
+	pdbvt->m_root=0;
+	return(0);
+	}
+	else
+	{
+	btDbvtNode*	parent=leaf->parent;
+	btDbvtNode*	prev=parent->parent;
+	btDbvtNode*	sibling=parent->childs[1-indexof(leaf)];			
+	if(prev)
+		{
+		prev->childs[indexof(parent)]=sibling;
+		sibling->parent=prev;
+		deletenode(pdbvt,parent);
+		while(prev)
+			{
+			const btDbvtVolume	pb=prev->volume;
+			Merge(prev->childs[0]->volume,prev->childs[1]->volume,prev->volume);
+			if(NotEqual(pb,prev->volume))
+				{
+				prev=prev->parent;
+				} else break;
+			}
+		return(prev?prev:pdbvt->m_root);
+		}
+		else
+		{								
+		pdbvt->m_root=sibling;
+		sibling->parent=0;
+		deletenode(pdbvt,parent);
+		return(pdbvt->m_root);
+		}			
+	}
+}
+
+//
+static void						fetchleaves(btDbvt* pdbvt,
+											btDbvtNode* root,
+											tNodeArray& leaves,
+											int depth=-1)
+{
+if(root->isinternal()&&depth)
+	{
+	fetchleaves(pdbvt,root->childs[0],leaves,depth-1);
+	fetchleaves(pdbvt,root->childs[1],leaves,depth-1);
+	deletenode(pdbvt,root);
+	}
+	else
+	{
+	leaves.push_back(root);
+	}
+}
+
+//
+static void						split(	const tNodeArray& leaves,
+										tNodeArray& left,
+										tNodeArray& right,
+										const btVector3& org,
+										const btVector3& axis)
+{
+left.resize(0);
+right.resize(0);
+for(int i=0,ni=leaves.size();i<ni;++i)
+	{
+	if(dot(axis,leaves[i]->volume.Center()-org)<0)
+		left.push_back(leaves[i]);
+		else
+		right.push_back(leaves[i]);
+	}
+}
+
+//
+static btDbvtVolume				bounds(	const tNodeArray& leaves)
+{
+#if DBVT_MERGE_IMPL==DBVT_IMPL_SSE
+DBVT_ALIGN char	locals[sizeof(btDbvtVolume)];
+btDbvtVolume&	volume=*(btDbvtVolume*)locals;
+volume=leaves[0]->volume;
+#else
+btDbvtVolume volume=leaves[0]->volume;
+#endif
+for(int i=1,ni=leaves.size();i<ni;++i)
+	{
+	Merge(volume,leaves[i]->volume,volume);
+	}
+return(volume);
+}
+
+//
+static void						bottomup(	btDbvt* pdbvt,
+											tNodeArray& leaves)
+{
+while(leaves.size()>1)
+	{
+	btScalar	minsize=SIMD_INFINITY;
+	int			minidx[2]={-1,-1};
+	for(int i=0;i<leaves.size();++i)
+		{
+		for(int j=i+1;j<leaves.size();++j)
+			{
+			const btScalar	sz=size(merge(leaves[i]->volume,leaves[j]->volume));
+			if(sz<minsize)
+				{
+				minsize		=	sz;
+				minidx[0]	=	i;
+				minidx[1]	=	j;
+				}
+			}
+		}
+	btDbvtNode*	n[]	=	{leaves[minidx[0]],leaves[minidx[1]]};
+	btDbvtNode*	p	=	createnode(pdbvt,0,n[0]->volume,n[1]->volume,0);
+	p->childs[0]		=	n[0];
+	p->childs[1]		=	n[1];
+	n[0]->parent		=	p;
+	n[1]->parent		=	p;
+	leaves[minidx[0]]	=	p;
+	leaves.swap(minidx[1],leaves.size()-1);
+	leaves.pop_back();
+	}
+}
+
+//
+static btDbvtNode*			topdown(btDbvt* pdbvt,
+									tNodeArray& leaves,
+									int bu_treshold)
+{
+static const btVector3	axis[]={btVector3(1,0,0),
+								btVector3(0,1,0),
+								btVector3(0,0,1)};
+if(leaves.size()>1)
+	{
+	if(leaves.size()>bu_treshold)
+		{
+		const btDbvtVolume	vol=bounds(leaves);
+		const btVector3			org=vol.Center();
+		tNodeArray				sets[2];
+		int						bestaxis=-1;
+		int						bestmidp=leaves.size();
+		int						splitcount[3][2]={{0,0},{0,0},{0,0}};
+		int i;
+		for( i=0;i<leaves.size();++i)
+			{
+			const btVector3	x=leaves[i]->volume.Center()-org;
+			for(int j=0;j<3;++j)
+				{
+				++splitcount[j][dot(x,axis[j])>0?1:0];
+				}
+			}
+		for( i=0;i<3;++i)
+			{
+			if((splitcount[i][0]>0)&&(splitcount[i][1]>0))
+				{
+				const int	midp=(int)btFabs(btScalar(splitcount[i][0]-splitcount[i][1]));
+				if(midp<bestmidp)
+					{
+					bestaxis=i;
+					bestmidp=midp;
+					}
+				}
+			}
+		if(bestaxis>=0)
+			{
+			sets[0].reserve(splitcount[bestaxis][0]);
+			sets[1].reserve(splitcount[bestaxis][1]);
+			split(leaves,sets[0],sets[1],org,axis[bestaxis]);
+			}
+			else
+			{
+			sets[0].reserve(leaves.size()/2+1);
+			sets[1].reserve(leaves.size()/2);
+			for(int i=0,ni=leaves.size();i<ni;++i)
+				{
+				sets[i&1].push_back(leaves[i]);
+				}
+			}
+		btDbvtNode*	node=createnode(pdbvt,0,vol,0);
+		node->childs[0]=topdown(pdbvt,sets[0],bu_treshold);
+		node->childs[1]=topdown(pdbvt,sets[1],bu_treshold);
+		node->childs[0]->parent=node;
+		node->childs[1]->parent=node;
+		return(node);
+		}
+		else
+		{
+		bottomup(pdbvt,leaves);
+		return(leaves[0]);
+		}
+	}
+return(leaves[0]);
+}
+
+//
+static DBVT_INLINE btDbvtNode*	sort(btDbvtNode* n,btDbvtNode*& r)
+{
+btDbvtNode*	p=n->parent;
+btAssert(n->isinternal());
+if(p>n)
+	{
+	const int		i=indexof(n);
+	const int		j=1-i;
+	btDbvtNode*	s=p->childs[j];
+	btDbvtNode*	q=p->parent;
+	btAssert(n==p->childs[i]);
+	if(q) q->childs[indexof(p)]=n; else r=n;
+	s->parent=n;
+	p->parent=n;
+	n->parent=q;
+	p->childs[0]=n->childs[0];
+	p->childs[1]=n->childs[1];
+	n->childs[0]->parent=p;
+	n->childs[1]->parent=p;
+	n->childs[i]=p;
+	n->childs[j]=s;
+	btSwap(p->volume,n->volume);
+	return(p);
+	}
+return(n);
+}
+
+//
+static DBVT_INLINE btDbvtNode*	walkup(btDbvtNode* n,int count)
+{
+while(n&&(count--)) n=n->parent;
+return(n);
+}
+
+//
+// Api
+//
+
+//
+				btDbvt::btDbvt()
+{
+m_root		=	0;
+m_free		=	0;
+m_lkhd		=	-1;
+m_leaves	=	0;
+m_opath		=	0;
+}
+
+//
+				btDbvt::~btDbvt()
+{
+clear();
+}
+
+//
+void			btDbvt::clear()
+{
+if(m_root)	recursedeletenode(this,m_root);
+btAlignedFree(m_free);
+m_free=0;
+}
+
+//
+void			btDbvt::optimizeBottomUp()
+{
+if(m_root)
+	{
+	tNodeArray leaves;
+	leaves.reserve(m_leaves);
+	fetchleaves(this,m_root,leaves);
+	bottomup(this,leaves);
+	m_root=leaves[0];
+	}
+}
+
+//
+void			btDbvt::optimizeTopDown(int bu_treshold)
+{
+if(m_root)
+	{
+	tNodeArray	leaves;
+	leaves.reserve(m_leaves);
+	fetchleaves(this,m_root,leaves);
+	m_root=topdown(this,leaves,bu_treshold);
+	}
+}
+
+//
+void			btDbvt::optimizeIncremental(int passes)
+{
+if(passes<0) passes=m_leaves;
+if(m_root&&(passes>0))
+	{
+	do	{
+		btDbvtNode*		node=m_root;
+		unsigned	bit=0;
+		while(node->isinternal())
+			{
+			node=sort(node,m_root)->childs[(m_opath>>bit)&1];
+			bit=(bit+1)&(sizeof(unsigned)*8-1);
+			}
+		update(node);
+		++m_opath;
+		} while(--passes);
+	}
+}
+
+//
+btDbvtNode*	btDbvt::insert(const btDbvtVolume& volume,void* data)
+{
+btDbvtNode*	leaf=createnode(this,0,volume,data);
+insertleaf(this,m_root,leaf);
+++m_leaves;
+return(leaf);
+}
+
+//
+void			btDbvt::update(btDbvtNode* leaf,int lookahead)
+{
+btDbvtNode*	root=removeleaf(this,leaf);
+if(root)
+	{
+	if(lookahead>=0)
+		{
+		for(int i=0;(i<lookahead)&&root->parent;++i)
+			{
+			root=root->parent;
+			}
+		} else root=m_root;
+	}
+insertleaf(this,root,leaf);
+}
+
+//
+void			btDbvt::update(btDbvtNode* leaf,const btDbvtVolume& volume)
+{
+btDbvtNode*	root=removeleaf(this,leaf);
+if(root)
+	{
+	if(m_lkhd>=0)
+		{
+		for(int i=0;(i<m_lkhd)&&root->parent;++i)
+			{
+			root=root->parent;
+			}
+		} else root=m_root;
+	}
+leaf->volume=volume;
+insertleaf(this,root,leaf);
+}
+
+//
+bool			btDbvt::update(btDbvtNode* leaf,btDbvtVolume volume,const btVector3& velocity,btScalar margin)
+{
+if(leaf->volume.Contain(volume)) return(false);
+volume.Expand(btVector3(margin,margin,margin));
+volume.SignedExpand(velocity);
+update(leaf,volume);
+return(true);
+}
+
+//
+bool			btDbvt::update(btDbvtNode* leaf,btDbvtVolume volume,const btVector3& velocity)
+{
+if(leaf->volume.Contain(volume)) return(false);
+volume.SignedExpand(velocity);
+update(leaf,volume);
+return(true);
+}
+
+//
+bool			btDbvt::update(btDbvtNode* leaf,btDbvtVolume volume,btScalar margin)
+{
+if(leaf->volume.Contain(volume)) return(false);
+volume.Expand(btVector3(margin,margin,margin));
+update(leaf,volume);
+return(true);
+}
+
+//
+void			btDbvt::remove(btDbvtNode* leaf)
+{
+removeleaf(this,leaf);
+deletenode(this,leaf);
+--m_leaves;
+}
+
+//
+void			btDbvt::write(IWriter* iwriter) const
+{
+btDbvtNodeEnumerator	nodes;
+nodes.nodes.reserve(m_leaves*2);
+enumNodes(m_root,nodes);
+iwriter->Prepare(m_root,nodes.nodes.size());
+for(int i=0;i<nodes.nodes.size();++i)
+	{
+	const btDbvtNode* n=nodes.nodes[i];
+	int			p=-1;
+	if(n->parent) p=nodes.nodes.findLinearSearch(n->parent);
+	if(n->isinternal())
+		{
+		const int	c0=nodes.nodes.findLinearSearch(n->childs[0]);
+		const int	c1=nodes.nodes.findLinearSearch(n->childs[1]);
+		iwriter->WriteNode(n,i,p,c0,c1);
+		}
+		else
+		{
+		iwriter->WriteLeaf(n,i,p);
+		}	
+	}
+}
+
+//
+void			btDbvt::clone(btDbvt& dest,IClone* iclone) const
+{
+dest.clear();
+if(m_root!=0)
+	{	
+	btAlignedObjectArray<sStkCLN>	stack;
+	stack.reserve(m_leaves);
+	stack.push_back(sStkCLN(m_root,0));
+	do	{
+		const int		i=stack.size()-1;
+		const sStkCLN	e=stack[i];
+		btDbvtNode*			n=createnode(&dest,e.parent,e.node->volume,e.node->data);
+		stack.pop_back();
+		if(e.parent!=0)
+			e.parent->childs[i&1]=n;
+			else
+			dest.m_root=n;
+		if(e.node->isinternal())
+			{
+			stack.push_back(sStkCLN(e.node->childs[0],n));
+			stack.push_back(sStkCLN(e.node->childs[1],n));
+			}
+			else
+			{
+			iclone->CloneLeaf(n);
+			}
+		} while(stack.size()>0);
+	}
+}
+
+//
+int				btDbvt::maxdepth(const btDbvtNode* node)
+{
+int	depth=0;
+if(node) getmaxdepth(node,1,depth);
+return(depth);
+}
+
+//
+int				btDbvt::countLeaves(const btDbvtNode* node)
+{
+if(node->isinternal())
+	return(countLeaves(node->childs[0])+countLeaves(node->childs[1]));
+	else
+	return(1);
+}
+
+//
+void			btDbvt::extractLeaves(const btDbvtNode* node,btAlignedObjectArray<const btDbvtNode*>& leaves)
+{
+if(node->isinternal())
+	{
+	extractLeaves(node->childs[0],leaves);
+	extractLeaves(node->childs[1],leaves);
+	}
+	else
+	{
+	leaves.push_back(node);
+	}	
+}
+
+//
+#if DBVT_ENABLE_BENCHMARK
+
+#include <stdio.h>
+#include <stdlib.h>
+#include "LinearMath/btQuickProf.h"
+
+/*
+q6600,2.4ghz
+
+/Ox /Ob2 /Oi /Ot /I "." /I "..\.." /I "..\..\src" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"
+/GF /FD /MT /GS- /Gy /arch:SSE2 /Zc:wchar_t- /Fp"..\..\out\release8\build\libbulletcollision\libbulletcollision.pch"
+/Fo"..\..\out\release8\build\libbulletcollision\\"
+/Fd"..\..\out\release8\build\libbulletcollision\bulletcollision.pdb"
+/W3 /nologo /c /Wp64 /Zi /errorReport:prompt
+
+Benchmarking dbvt...
+        World scale: 100.000000
+        Extents base: 1.000000
+        Extents range: 4.000000
+        Leaves: 8192
+        sizeof(btDbvtVolume): 32 bytes
+        sizeof(btDbvtNode):   44 bytes
+[1] btDbvtVolume intersections: 3537 ms (0%)
+[2] btDbvtVolume merges: 1945 ms (0%)
+[3] btDbvt::collideTT: 6646 ms (0%)
+[4] btDbvt::collideTT self: 3389 ms (0%)
+[5] btDbvt::collideTT xform: 7505 ms (0%)
+[6] btDbvt::collideTT xform,self: 7480 ms (0%)
+[7] btDbvt::collideRAY: 6307 ms (0%),(332511 r/s)
+[8] insert/remove: 2105 ms (-3%),(996271 ir/s)
+[9] updates (teleport): 1943 ms (0%),(1079337 u/s)
+[10] updates (jitter): 1301 ms (0%),(1611953 u/s)
+[11] optimize (incremental): 2510 ms (0%),(1671000 o/s)
+[12] btDbvtVolume notequal: 3677 ms (0%)
+[13] culling(OCL+fullsort): 2231 ms (0%),(458 t/s)
+[14] culling(OCL+qsort): 3500 ms (0%),(2340 t/s)
+[15] culling(KDOP+qsort): 1151 ms (0%),(7117 t/s)
+[16] insert/remove batch(256): 5138 ms (0%),(816330 bir/s)
+[17] btDbvtVolume proximity: 2842 ms (0%)
+[18] btDbvtVolume select: 3390 ms (0%)
+*/
+
+struct btDbvtBenchmark
+{
+struct NilPolicy : btDbvt::ICollide
+	{
+	NilPolicy() : m_pcount(0),m_depth(-SIMD_INFINITY),m_checksort(true)		{}
+	void	Process(const btDbvtNode*,const btDbvtNode*)				{ ++m_pcount; }
+	void	Process(const btDbvtNode*)									{ ++m_pcount; }
+	void	Process(const btDbvtNode*,btScalar depth)
+		{
+		++m_pcount;
+		if(m_checksort)
+			{ if(depth>=m_depth) m_depth=depth; else printf("wrong depth: %f (should be >= %f)\r\n",depth,m_depth); }
+		}
+	int			m_pcount;
+	btScalar	m_depth;
+	bool		m_checksort;
+	};
+struct P14 : btDbvt::ICollide
+	{
+	struct Node
+		{
+		const btDbvtNode*	leaf;
+		btScalar			depth;
+		};
+	void Process(const btDbvtNode* leaf,btScalar depth)
+		{
+		Node	n;
+		n.leaf	=	leaf;
+		n.depth	=	depth;
+		}
+	static int sortfnc(const Node& a,const Node& b)
+		{
+		if(a.depth<b.depth) return(+1);
+		if(a.depth>b.depth) return(-1);
+		return(0);
+		}
+	btAlignedObjectArray<Node>		m_nodes;
+	};
+struct P15 : btDbvt::ICollide
+	{
+	struct Node
+		{
+		const btDbvtNode*	leaf;
+		btScalar			depth;
+		};
+	void Process(const btDbvtNode* leaf)
+		{
+		Node	n;
+		n.leaf	=	leaf;
+		n.depth	=	dot(leaf->volume.Center(),m_axis);
+		}
+	static int sortfnc(const Node& a,const Node& b)
+		{
+		if(a.depth<b.depth) return(+1);
+		if(a.depth>b.depth) return(-1);
+		return(0);
+		}
+	btAlignedObjectArray<Node>		m_nodes;
+	btVector3						m_axis;
+	};
+static btScalar			RandUnit()
+	{
+	return(rand()/(btScalar)RAND_MAX);
+	}
+static btVector3		RandVector3()
+	{
+	return(btVector3(RandUnit(),RandUnit(),RandUnit()));
+	}
+static btVector3		RandVector3(btScalar cs)
+	{
+	return(RandVector3()*cs-btVector3(cs,cs,cs)/2);
+	}
+static btDbvtVolume	RandVolume(btScalar cs,btScalar eb,btScalar es)
+	{
+	return(btDbvtVolume::FromCE(RandVector3(cs),btVector3(eb,eb,eb)+RandVector3()*es));
+	}
+static btTransform		RandTransform(btScalar cs)
+	{
+	btTransform	t;
+	t.setOrigin(RandVector3(cs));
+	t.setRotation(btQuaternion(RandUnit()*SIMD_PI*2,RandUnit()*SIMD_PI*2,RandUnit()*SIMD_PI*2).normalized());
+	return(t);
+	}
+static void				RandTree(btScalar cs,btScalar eb,btScalar es,int leaves,btDbvt& dbvt)
+	{
+	dbvt.clear();
+	for(int i=0;i<leaves;++i)
+		{
+		dbvt.insert(RandVolume(cs,eb,es),0);
+		}
+	}
+};
+
+void			btDbvt::benchmark()
+{
+static const btScalar	cfgVolumeCenterScale		=	100;
+static const btScalar	cfgVolumeExentsBase			=	1;
+static const btScalar	cfgVolumeExentsScale		=	4;
+static const int		cfgLeaves					=	8192;
+static const bool		cfgEnable					=	true;
+
+//[1] btDbvtVolume intersections
+bool					cfgBenchmark1_Enable		=	cfgEnable;
+static const int		cfgBenchmark1_Iterations	=	8;
+static const int		cfgBenchmark1_Reference		=	3537;
+//[2] btDbvtVolume merges
+bool					cfgBenchmark2_Enable		=	cfgEnable;
+static const int		cfgBenchmark2_Iterations	=	4;
+static const int		cfgBenchmark2_Reference		=	1945;
+//[3] btDbvt::collideTT
+bool					cfgBenchmark3_Enable		=	cfgEnable;
+static const int		cfgBenchmark3_Iterations	=	512;
+static const int		cfgBenchmark3_Reference		=	6646;
+//[4] btDbvt::collideTT self
+bool					cfgBenchmark4_Enable		=	cfgEnable;
+static const int		cfgBenchmark4_Iterations	=	512;
+static const int		cfgBenchmark4_Reference		=	3389;
+//[5] btDbvt::collideTT xform
+bool					cfgBenchmark5_Enable		=	cfgEnable;
+static const int		cfgBenchmark5_Iterations	=	512;
+static const btScalar	cfgBenchmark5_OffsetScale	=	2;
+static const int		cfgBenchmark5_Reference		=	7505;
+//[6] btDbvt::collideTT xform,self
+bool					cfgBenchmark6_Enable		=	cfgEnable;
+static const int		cfgBenchmark6_Iterations	=	512;
+static const btScalar	cfgBenchmark6_OffsetScale	=	2;
+static const int		cfgBenchmark6_Reference		=	7480;
+//[7] btDbvt::collideRAY
+bool					cfgBenchmark7_Enable		=	cfgEnable;
+static const int		cfgBenchmark7_Passes		=	32;
+static const int		cfgBenchmark7_Iterations	=	65536;
+static const int		cfgBenchmark7_Reference		=	6307;
+//[8] insert/remove
+bool					cfgBenchmark8_Enable		=	cfgEnable;
+static const int		cfgBenchmark8_Passes		=	32;
+static const int		cfgBenchmark8_Iterations	=	65536;
+static const int		cfgBenchmark8_Reference		=	2105;
+//[9] updates (teleport)
+bool					cfgBenchmark9_Enable		=	cfgEnable;
+static const int		cfgBenchmark9_Passes		=	32;
+static const int		cfgBenchmark9_Iterations	=	65536;
+static const int		cfgBenchmark9_Reference		=	1943;
+//[10] updates (jitter)
+bool					cfgBenchmark10_Enable		=	cfgEnable;
+static const btScalar	cfgBenchmark10_Scale		=	cfgVolumeCenterScale/10000;
+static const int		cfgBenchmark10_Passes		=	32;
+static const int		cfgBenchmark10_Iterations	=	65536;
+static const int		cfgBenchmark10_Reference	=	1301;
+//[11] optimize (incremental)
+bool					cfgBenchmark11_Enable		=	cfgEnable;
+static const int		cfgBenchmark11_Passes		=	64;
+static const int		cfgBenchmark11_Iterations	=	65536;
+static const int		cfgBenchmark11_Reference	=	2510;
+//[12] btDbvtVolume notequal
+bool					cfgBenchmark12_Enable		=	cfgEnable;
+static const int		cfgBenchmark12_Iterations	=	32;
+static const int		cfgBenchmark12_Reference	=	3677;
+//[13] culling(OCL+fullsort)
+bool					cfgBenchmark13_Enable		=	cfgEnable;
+static const int		cfgBenchmark13_Iterations	=	1024;
+static const int		cfgBenchmark13_Reference	=	2231;
+//[14] culling(OCL+qsort)
+bool					cfgBenchmark14_Enable		=	cfgEnable;
+static const int		cfgBenchmark14_Iterations	=	8192;
+static const int		cfgBenchmark14_Reference	=	3500;
+//[15] culling(KDOP+qsort)
+bool					cfgBenchmark15_Enable		=	cfgEnable;
+static const int		cfgBenchmark15_Iterations	=	8192;
+static const int		cfgBenchmark15_Reference	=	1151;
+//[16] insert/remove batch
+bool					cfgBenchmark16_Enable		=	cfgEnable;
+static const int		cfgBenchmark16_BatchCount	=	256;
+static const int		cfgBenchmark16_Passes		=	16384;
+static const int		cfgBenchmark16_Reference	=	5138;
+//[17] proximity
+bool					cfgBenchmark17_Enable		=	cfgEnable;
+static const int		cfgBenchmark17_Iterations	=	8;
+static const int		cfgBenchmark17_Reference	=	2842;
+//[18] select
+bool					cfgBenchmark18_Enable		=	cfgEnable;
+static const int		cfgBenchmark18_Iterations	=	4;
+static const int		cfgBenchmark18_Reference	=	3390;
+
+btClock					wallclock;
+printf("Benchmarking dbvt...\r\n");
+printf("\tWorld scale: %f\r\n",cfgVolumeCenterScale);
+printf("\tExtents base: %f\r\n",cfgVolumeExentsBase);
+printf("\tExtents range: %f\r\n",cfgVolumeExentsScale);
+printf("\tLeaves: %u\r\n",cfgLeaves);
+printf("\tsizeof(btDbvtVolume): %u bytes\r\n",sizeof(btDbvtVolume));
+printf("\tsizeof(btDbvtNode):   %u bytes\r\n",sizeof(btDbvtNode));
+if(cfgBenchmark1_Enable)
+	{// Benchmark 1	
+	srand(380843);
+	btAlignedObjectArray<btDbvtVolume>	volumes;
+	btAlignedObjectArray<bool>			results;
+	volumes.resize(cfgLeaves);
+	results.resize(cfgLeaves);
+	for(int i=0;i<cfgLeaves;++i)
+		{
+		volumes[i]=btDbvtBenchmark::RandVolume(cfgVolumeCenterScale,cfgVolumeExentsBase,cfgVolumeExentsScale);
+		}
+	printf("[1] btDbvtVolume intersections: ");
+	wallclock.reset();
+	for(int i=0;i<cfgBenchmark1_Iterations;++i)
+		{
+		for(int j=0;j<cfgLeaves;++j)
+			{
+			for(int k=0;k<cfgLeaves;++k)
+				{
+				results[k]=Intersect(volumes[j],volumes[k]);
+				}
+			}
+		}
+	const int time=(int)wallclock.getTimeMilliseconds();
+	printf("%u ms (%i%%)\r\n",time,(time-cfgBenchmark1_Reference)*100/time);
+	}
+if(cfgBenchmark2_Enable)
+	{// Benchmark 2	
+	srand(380843);
+	btAlignedObjectArray<btDbvtVolume>	volumes;
+	btAlignedObjectArray<btDbvtVolume>	results;
+	volumes.resize(cfgLeaves);
+	results.resize(cfgLeaves);
+	for(int i=0;i<cfgLeaves;++i)
+		{
+		volumes[i]=btDbvtBenchmark::RandVolume(cfgVolumeCenterScale,cfgVolumeExentsBase,cfgVolumeExentsScale);
+		}
+	printf("[2] btDbvtVolume merges: ");
+	wallclock.reset();
+	for(int i=0;i<cfgBenchmark2_Iterations;++i)
+		{
+		for(int j=0;j<cfgLeaves;++j)
+			{
+			for(int k=0;k<cfgLeaves;++k)
+				{
+				Merge(volumes[j],volumes[k],results[k]);
+				}
+			}
+		}
+	const int time=(int)wallclock.getTimeMilliseconds();
+	printf("%u ms (%i%%)\r\n",time,(time-cfgBenchmark2_Reference)*100/time);
+	}
+if(cfgBenchmark3_Enable)
+	{// Benchmark 3	
+	srand(380843);
+	btDbvt						dbvt[2];
+	btDbvtBenchmark::NilPolicy	policy;
+	btDbvtBenchmark::RandTree(cfgVolumeCenterScale,cfgVolumeExentsBase,cfgVolumeExentsScale,cfgLeaves,dbvt[0]);
+	btDbvtBenchmark::RandTree(cfgVolumeCenterScale,cfgVolumeExentsBase,cfgVolumeExentsScale,cfgLeaves,dbvt[1]);
+	dbvt[0].optimizeTopDown();
+	dbvt[1].optimizeTopDown();
+	printf("[3] btDbvt::collideTT: ");
+	wallclock.reset();
+	for(int i=0;i<cfgBenchmark3_Iterations;++i)
+		{
+		btDbvt::collideTT(dbvt[0].m_root,dbvt[1].m_root,policy);
+		}
+	const int time=(int)wallclock.getTimeMilliseconds();
+	printf("%u ms (%i%%)\r\n",time,(time-cfgBenchmark3_Reference)*100/time);
+	}
+if(cfgBenchmark4_Enable)
+	{// Benchmark 4
+	srand(380843);
+	btDbvt						dbvt;
+	btDbvtBenchmark::NilPolicy	policy;
+	btDbvtBenchmark::RandTree(cfgVolumeCenterScale,cfgVolumeExentsBase,cfgVolumeExentsScale,cfgLeaves,dbvt);
+	dbvt.optimizeTopDown();
+	printf("[4] btDbvt::collideTT self: ");
+	wallclock.reset();
+	for(int i=0;i<cfgBenchmark4_Iterations;++i)
+		{
+		btDbvt::collideTT(dbvt.m_root,dbvt.m_root,policy);
+		}
+	const int time=(int)wallclock.getTimeMilliseconds();
+	printf("%u ms (%i%%)\r\n",time,(time-cfgBenchmark4_Reference)*100/time);
+	}
+if(cfgBenchmark5_Enable)
+	{// Benchmark 5	
+	srand(380843);
+	btDbvt								dbvt[2];
+	btAlignedObjectArray<btTransform>	transforms;
+	btDbvtBenchmark::NilPolicy			policy;
+	transforms.resize(cfgBenchmark5_Iterations);
+	for(int i=0;i<transforms.size();++i)
+		{
+		transforms[i]=btDbvtBenchmark::RandTransform(cfgVolumeCenterScale*cfgBenchmark5_OffsetScale);
+		}
+	btDbvtBenchmark::RandTree(cfgVolumeCenterScale,cfgVolumeExentsBase,cfgVolumeExentsScale,cfgLeaves,dbvt[0]);
+	btDbvtBenchmark::RandTree(cfgVolumeCenterScale,cfgVolumeExentsBase,cfgVolumeExentsScale,cfgLeaves,dbvt[1]);
+	dbvt[0].optimizeTopDown();
+	dbvt[1].optimizeTopDown();
+	printf("[5] btDbvt::collideTT xform: ");
+	wallclock.reset();
+	for(int i=0;i<cfgBenchmark5_Iterations;++i)
+		{
+		btDbvt::collideTT(dbvt[0].m_root,dbvt[1].m_root,transforms[i],policy);
+		}
+	const int time=(int)wallclock.getTimeMilliseconds();
+	printf("%u ms (%i%%)\r\n",time,(time-cfgBenchmark5_Reference)*100/time);
+	}
+if(cfgBenchmark6_Enable)
+	{// Benchmark 6	
+	srand(380843);
+	btDbvt								dbvt;
+	btAlignedObjectArray<btTransform>	transforms;
+	btDbvtBenchmark::NilPolicy			policy;
+	transforms.resize(cfgBenchmark6_Iterations);
+	for(int i=0;i<transforms.size();++i)
+		{
+		transforms[i]=btDbvtBenchmark::RandTransform(cfgVolumeCenterScale*cfgBenchmark6_OffsetScale);
+		}
+	btDbvtBenchmark::RandTree(cfgVolumeCenterScale,cfgVolumeExentsBase,cfgVolumeExentsScale,cfgLeaves,dbvt);
+	dbvt.optimizeTopDown();
+	printf("[6] btDbvt::collideTT xform,self: ");
+	wallclock.reset();
+	for(int i=0;i<cfgBenchmark6_Iterations;++i)
+		{
+		btDbvt::collideTT(dbvt.m_root,dbvt.m_root,transforms[i],policy);		
+		}
+	const int time=(int)wallclock.getTimeMilliseconds();
+	printf("%u ms (%i%%)\r\n",time,(time-cfgBenchmark6_Reference)*100/time);
+	}
+if(cfgBenchmark7_Enable)
+	{// Benchmark 7	
+	srand(380843);
+	btDbvt								dbvt;
+	btAlignedObjectArray<btVector3>		rayorg;
+	btAlignedObjectArray<btVector3>		raydir;
+	btDbvtBenchmark::NilPolicy			policy;
+	rayorg.resize(cfgBenchmark7_Iterations);
+	raydir.resize(cfgBenchmark7_Iterations);
+	for(int i=0;i<rayorg.size();++i)
+		{
+		rayorg[i]=btDbvtBenchmark::RandVector3(cfgVolumeCenterScale*2);
+		raydir[i]=btDbvtBenchmark::RandVector3(cfgVolumeCenterScale*2);
+		}
+	btDbvtBenchmark::RandTree(cfgVolumeCenterScale,cfgVolumeExentsBase,cfgVolumeExentsScale,cfgLeaves,dbvt);
+	dbvt.optimizeTopDown();
+	printf("[7] btDbvt::collideRAY: ");
+	wallclock.reset();
+	for(int i=0;i<cfgBenchmark7_Passes;++i)
+		{
+		for(int j=0;j<cfgBenchmark7_Iterations;++j)
+			{
+			btDbvt::collideRAY(dbvt.m_root,rayorg[j],raydir[j],policy);
+			}
+		}
+	const int	time=(int)wallclock.getTimeMilliseconds();
+	unsigned	rays=cfgBenchmark7_Passes*cfgBenchmark7_Iterations;
+	printf("%u ms (%i%%),(%u r/s)\r\n",time,(time-cfgBenchmark7_Reference)*100/time,(rays*1000)/time);
+	}
+if(cfgBenchmark8_Enable)
+	{// Benchmark 8	
+	srand(380843);
+	btDbvt								dbvt;
+	btDbvtBenchmark::RandTree(cfgVolumeCenterScale,cfgVolumeExentsBase,cfgVolumeExentsScale,cfgLeaves,dbvt);
+	dbvt.optimizeTopDown();
+	printf("[8] insert/remove: ");
+	wallclock.reset();
+	for(int i=0;i<cfgBenchmark8_Passes;++i)
+		{
+		for(int j=0;j<cfgBenchmark8_Iterations;++j)
+			{
+			dbvt.remove(dbvt.insert(btDbvtBenchmark::RandVolume(cfgVolumeCenterScale,cfgVolumeExentsBase,cfgVolumeExentsScale),0));
+			}
+		}
+	const int	time=(int)wallclock.getTimeMilliseconds();
+	const int	ir=cfgBenchmark8_Passes*cfgBenchmark8_Iterations;
+	printf("%u ms (%i%%),(%u ir/s)\r\n",time,(time-cfgBenchmark8_Reference)*100/time,ir*1000/time);
+	}
+if(cfgBenchmark9_Enable)
+	{// Benchmark 9	
+	srand(380843);
+	btDbvt										dbvt;
+	btAlignedObjectArray<const btDbvtNode*>	leaves;
+	btDbvtBenchmark::RandTree(cfgVolumeCenterScale,cfgVolumeExentsBase,cfgVolumeExentsScale,cfgLeaves,dbvt);
+	dbvt.optimizeTopDown();
+	dbvt.extractLeaves(dbvt.m_root,leaves);
+	printf("[9] updates (teleport): ");
+	wallclock.reset();
+	for(int i=0;i<cfgBenchmark9_Passes;++i)
+		{
+		for(int j=0;j<cfgBenchmark9_Iterations;++j)
+			{
+			dbvt.update(const_cast<btDbvtNode*>(leaves[rand()%cfgLeaves]),
+						btDbvtBenchmark::RandVolume(cfgVolumeCenterScale,cfgVolumeExentsBase,cfgVolumeExentsScale));
+			}
+		}
+	const int	time=(int)wallclock.getTimeMilliseconds();
+	const int	up=cfgBenchmark9_Passes*cfgBenchmark9_Iterations;
+	printf("%u ms (%i%%),(%u u/s)\r\n",time,(time-cfgBenchmark9_Reference)*100/time,up*1000/time);
+	}
+if(cfgBenchmark10_Enable)
+	{// Benchmark 10	
+	srand(380843);
+	btDbvt										dbvt;
+	btAlignedObjectArray<const btDbvtNode*>	leaves;
+	btAlignedObjectArray<btVector3>				vectors;
+	vectors.resize(cfgBenchmark10_Iterations);
+	for(int i=0;i<vectors.size();++i)
+		{
+		vectors[i]=(btDbvtBenchmark::RandVector3()*2-btVector3(1,1,1))*cfgBenchmark10_Scale;
+		}
+	btDbvtBenchmark::RandTree(cfgVolumeCenterScale,cfgVolumeExentsBase,cfgVolumeExentsScale,cfgLeaves,dbvt);
+	dbvt.optimizeTopDown();
+	dbvt.extractLeaves(dbvt.m_root,leaves);
+	printf("[10] updates (jitter): ");
+	wallclock.reset();
+	
+	for(int i=0;i<cfgBenchmark10_Passes;++i)
+		{
+		for(int j=0;j<cfgBenchmark10_Iterations;++j)
+			{			
+			const btVector3&	d=vectors[j];
+			btDbvtNode*		l=const_cast<btDbvtNode*>(leaves[rand()%cfgLeaves]);
+			btDbvtVolume		v=btDbvtVolume::FromMM(l->volume.Mins()+d,l->volume.Maxs()+d);
+			dbvt.update(l,v);
+			}
+		}
+	const int	time=(int)wallclock.getTimeMilliseconds();
+	const int	up=cfgBenchmark10_Passes*cfgBenchmark10_Iterations;
+	printf("%u ms (%i%%),(%u u/s)\r\n",time,(time-cfgBenchmark10_Reference)*100/time,up*1000/time);
+	}
+if(cfgBenchmark11_Enable)
+	{// Benchmark 11	
+	srand(380843);
+	btDbvt										dbvt;
+	btDbvtBenchmark::RandTree(cfgVolumeCenterScale,cfgVolumeExentsBase,cfgVolumeExentsScale,cfgLeaves,dbvt);
+	dbvt.optimizeTopDown();
+	printf("[11] optimize (incremental): ");
+	wallclock.reset();	
+	for(int i=0;i<cfgBenchmark11_Passes;++i)
+		{
+		dbvt.optimizeIncremental(cfgBenchmark11_Iterations);
+		}
+	const int	time=(int)wallclock.getTimeMilliseconds();
+	const int	op=cfgBenchmark11_Passes*cfgBenchmark11_Iterations;
+	printf("%u ms (%i%%),(%u o/s)\r\n",time,(time-cfgBenchmark11_Reference)*100/time,op/time*1000);
+	}
+if(cfgBenchmark12_Enable)
+	{// Benchmark 12	
+	srand(380843);
+	btAlignedObjectArray<btDbvtVolume>	volumes;
+	btAlignedObjectArray<bool>				results;
+	volumes.resize(cfgLeaves);
+	results.resize(cfgLeaves);
+	for(int i=0;i<cfgLeaves;++i)
+		{
+		volumes[i]=btDbvtBenchmark::RandVolume(cfgVolumeCenterScale,cfgVolumeExentsBase,cfgVolumeExentsScale);
+		}
+	printf("[12] btDbvtVolume notequal: ");
+	wallclock.reset();
+	for(int i=0;i<cfgBenchmark12_Iterations;++i)
+		{
+		for(int j=0;j<cfgLeaves;++j)
+			{
+			for(int k=0;k<cfgLeaves;++k)
+				{
+				results[k]=NotEqual(volumes[j],volumes[k]);
+				}
+			}
+		}
+	const int time=(int)wallclock.getTimeMilliseconds();
+	printf("%u ms (%i%%)\r\n",time,(time-cfgBenchmark12_Reference)*100/time);
+	}
+if(cfgBenchmark13_Enable)
+	{// Benchmark 13	
+	srand(380843);
+	btDbvt								dbvt;
+	btAlignedObjectArray<btVector3>		vectors;
+	btDbvtBenchmark::NilPolicy			policy;
+	vectors.resize(cfgBenchmark13_Iterations);
+	for(int i=0;i<vectors.size();++i)
+		{
+		vectors[i]=(btDbvtBenchmark::RandVector3()*2-btVector3(1,1,1)).normalized();
+		}
+	btDbvtBenchmark::RandTree(cfgVolumeCenterScale,cfgVolumeExentsBase,cfgVolumeExentsScale,cfgLeaves,dbvt);
+	dbvt.optimizeTopDown();
+	printf("[13] culling(OCL+fullsort): ");
+	wallclock.reset();	
+	for(int i=0;i<cfgBenchmark13_Iterations;++i)
+		{
+		static const btScalar	offset=0;
+		policy.m_depth=-SIMD_INFINITY;
+		dbvt.collideOCL(dbvt.m_root,&vectors[i],&offset,vectors[i],1,policy);
+		}
+	const int	time=(int)wallclock.getTimeMilliseconds();
+	const int	t=cfgBenchmark13_Iterations;
+	printf("%u ms (%i%%),(%u t/s)\r\n",time,(time-cfgBenchmark13_Reference)*100/time,(t*1000)/time);
+	}
+if(cfgBenchmark14_Enable)
+	{// Benchmark 14	
+	srand(380843);
+	btDbvt								dbvt;
+	btAlignedObjectArray<btVector3>		vectors;
+	btDbvtBenchmark::P14				policy;
+	vectors.resize(cfgBenchmark14_Iterations);
+	for(int i=0;i<vectors.size();++i)
+		{
+		vectors[i]=(btDbvtBenchmark::RandVector3()*2-btVector3(1,1,1)).normalized();
+		}
+	btDbvtBenchmark::RandTree(cfgVolumeCenterScale,cfgVolumeExentsBase,cfgVolumeExentsScale,cfgLeaves,dbvt);
+	dbvt.optimizeTopDown();
+	policy.m_nodes.reserve(cfgLeaves);
+	printf("[14] culling(OCL+qsort): ");
+	wallclock.reset();	
+	for(int i=0;i<cfgBenchmark14_Iterations;++i)
+		{
+		static const btScalar	offset=0;
+		policy.m_nodes.resize(0);
+		dbvt.collideOCL(dbvt.m_root,&vectors[i],&offset,vectors[i],1,policy,false);
+		policy.m_nodes.quickSort(btDbvtBenchmark::P14::sortfnc);
+		}
+	const int	time=(int)wallclock.getTimeMilliseconds();
+	const int	t=cfgBenchmark14_Iterations;
+	printf("%u ms (%i%%),(%u t/s)\r\n",time,(time-cfgBenchmark14_Reference)*100/time,(t*1000)/time);
+	}
+if(cfgBenchmark15_Enable)
+	{// Benchmark 15	
+	srand(380843);
+	btDbvt								dbvt;
+	btAlignedObjectArray<btVector3>		vectors;
+	btDbvtBenchmark::P15				policy;
+	vectors.resize(cfgBenchmark15_Iterations);
+	for(int i=0;i<vectors.size();++i)
+		{
+		vectors[i]=(btDbvtBenchmark::RandVector3()*2-btVector3(1,1,1)).normalized();
+		}
+	btDbvtBenchmark::RandTree(cfgVolumeCenterScale,cfgVolumeExentsBase,cfgVolumeExentsScale,cfgLeaves,dbvt);
+	dbvt.optimizeTopDown();
+	policy.m_nodes.reserve(cfgLeaves);
+	printf("[15] culling(KDOP+qsort): ");
+	wallclock.reset();	
+	for(int i=0;i<cfgBenchmark15_Iterations;++i)
+		{
+		static const btScalar	offset=0;
+		policy.m_nodes.resize(0);
+		policy.m_axis=vectors[i];
+		dbvt.collideKDOP(dbvt.m_root,&vectors[i],&offset,1,policy);
+		policy.m_nodes.quickSort(btDbvtBenchmark::P15::sortfnc);
+		}
+	const int	time=(int)wallclock.getTimeMilliseconds();
+	const int	t=cfgBenchmark15_Iterations;
+	printf("%u ms (%i%%),(%u t/s)\r\n",time,(time-cfgBenchmark15_Reference)*100/time,(t*1000)/time);
+	}
+if(cfgBenchmark16_Enable)
+	{// Benchmark 16	
+	srand(380843);
+	btDbvt								dbvt;
+	btAlignedObjectArray<btDbvtNode*>	batch;
+	btDbvtBenchmark::RandTree(cfgVolumeCenterScale,cfgVolumeExentsBase,cfgVolumeExentsScale,cfgLeaves,dbvt);
+	dbvt.optimizeTopDown();
+	batch.reserve(cfgBenchmark16_BatchCount);
+	printf("[16] insert/remove batch(%u): ",cfgBenchmark16_BatchCount);
+	wallclock.reset();
+	for(int i=0;i<cfgBenchmark16_Passes;++i)
+		{
+		for(int j=0;j<cfgBenchmark16_BatchCount;++j)
+			{
+			batch.push_back(dbvt.insert(btDbvtBenchmark::RandVolume(cfgVolumeCenterScale,cfgVolumeExentsBase,cfgVolumeExentsScale),0));
+			}
+		for(int j=0;j<cfgBenchmark16_BatchCount;++j)
+			{
+			dbvt.remove(batch[j]);
+			}
+		batch.resize(0);
+		}
+	const int	time=(int)wallclock.getTimeMilliseconds();
+	const int	ir=cfgBenchmark16_Passes*cfgBenchmark16_BatchCount;
+	printf("%u ms (%i%%),(%u bir/s)\r\n",time,(time-cfgBenchmark16_Reference)*100/time,int(ir*1000.0/time));
+	}
+if(cfgBenchmark17_Enable)
+	{// Benchmark 17
+	srand(380843);
+	btAlignedObjectArray<btDbvtVolume>	volumes;
+	btAlignedObjectArray<btScalar>		results;
+	volumes.resize(cfgLeaves);
+	results.resize(cfgLeaves);
+	for(int i=0;i<cfgLeaves;++i)
+		{
+		volumes[i]=btDbvtBenchmark::RandVolume(cfgVolumeCenterScale,cfgVolumeExentsBase,cfgVolumeExentsScale);
+		}
+	printf("[17] btDbvtVolume proximity: ");
+	wallclock.reset();
+	for(int i=0;i<cfgBenchmark17_Iterations;++i)
+		{
+		for(int j=0;j<cfgLeaves;++j)
+			{
+			for(int k=0;k<cfgLeaves;++k)
+				{
+				results[k]=Proximity(volumes[j],volumes[k]);
+				}
+			}
+		}
+	const int time=(int)wallclock.getTimeMilliseconds();
+	printf("%u ms (%i%%)\r\n",time,(time-cfgBenchmark17_Reference)*100/time);
+	}
+if(cfgBenchmark18_Enable)
+	{// Benchmark 18
+	srand(380843);
+	btAlignedObjectArray<btDbvtVolume>	volumes;
+	btAlignedObjectArray<int>			results;
+	btAlignedObjectArray<int>			indices;
+	volumes.resize(cfgLeaves);
+	results.resize(cfgLeaves);
+	indices.resize(cfgLeaves);
+	for(int i=0;i<cfgLeaves;++i)
+		{
+		indices[i]=i;
+		volumes[i]=btDbvtBenchmark::RandVolume(cfgVolumeCenterScale,cfgVolumeExentsBase,cfgVolumeExentsScale);
+		}
+	for(int i=0;i<cfgLeaves;++i)
+		{
+		btSwap(indices[i],indices[rand()%cfgLeaves]);
+		}
+	printf("[18] btDbvtVolume select: ");
+	wallclock.reset();
+	for(int i=0;i<cfgBenchmark18_Iterations;++i)
+		{
+		for(int j=0;j<cfgLeaves;++j)
+			{
+			for(int k=0;k<cfgLeaves;++k)
+				{
+				const int idx=indices[k];
+				results[idx]=Select(volumes[idx],volumes[j],volumes[k]);
+				}
+			}
+		}
+	const int time=(int)wallclock.getTimeMilliseconds();
+	printf("%u ms (%i%%)\r\n",time,(time-cfgBenchmark18_Reference)*100/time);
+	}
+printf("\r\n\r\n");
+}
+#endif
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.h b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.h
new file mode 100644
index 00000000000..10f94627c37
--- /dev/null
+++ b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.h
@@ -0,0 +1,1101 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2007 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+///btDbvt implementation by Nathanael Presson
+
+#ifndef BT_DYNAMIC_BOUNDING_VOLUME_TREE_H
+#define BT_DYNAMIC_BOUNDING_VOLUME_TREE_H
+
+#include "LinearMath/btAlignedObjectArray.h"
+#include "LinearMath/btVector3.h"
+#include "LinearMath/btTransform.h"
+
+//
+// Compile time configuration
+//
+
+
+// Implementation profiles
+#define DBVT_IMPL_GENERIC		0	// Generic implementation	
+#define DBVT_IMPL_SSE			1	// SSE
+
+// Template implementation of ICollide
+#ifdef WIN32_AVOID_WHEN_EMBEDDED_INSIDE_BLENDER
+	#if (defined (_MSC_VER) && _MSC_VER >= 1400)
+	#define	DBVT_USE_TEMPLATE		1
+	#else
+	#define	DBVT_USE_TEMPLATE		0
+#endif
+#else
+#define	DBVT_USE_TEMPLATE		0
+#endif
+
+// Using memmov for collideOCL
+#define DBVT_USE_MEMMOVE		1
+
+// Enable benchmarking code
+#define	DBVT_ENABLE_BENCHMARK	0
+
+// Inlining
+#define DBVT_INLINE				SIMD_FORCE_INLINE
+// Align
+#ifdef WIN32
+#define DBVT_ALIGN				__declspec(align(16))
+#else
+#define DBVT_ALIGN
+#endif
+
+// Specific methods implementation
+#ifdef WIN32_AVOID_WHEN_EMBEDDED_INSIDE_BLENDER
+#define DBVT_PROXIMITY_IMPL		DBVT_IMPL_SSE
+#define DBVT_SELECT_IMPL		DBVT_IMPL_SSE
+#define DBVT_MERGE_IMPL			DBVT_IMPL_SSE
+#else
+#define DBVT_PROXIMITY_IMPL		DBVT_IMPL_GENERIC
+#define DBVT_SELECT_IMPL		DBVT_IMPL_GENERIC
+#define DBVT_MERGE_IMPL			DBVT_IMPL_GENERIC
+#endif
+
+//
+// Auto config and checks
+//
+
+#if DBVT_USE_TEMPLATE
+#define	DBVT_VIRTUAL
+#define DBVT_VIRTUAL_DTOR(a)
+#define DBVT_PREFIX					template <typename T>
+#define DBVT_IPOLICY				T& policy
+#define DBVT_CHECKTYPE				static const ICollide&	typechecker=*(T*)0;
+#else
+#define	DBVT_VIRTUAL_DTOR(a)		virtual ~a() {}
+#define DBVT_VIRTUAL				virtual
+#define DBVT_PREFIX
+#define DBVT_IPOLICY				ICollide& policy
+#define DBVT_CHECKTYPE
+#endif
+
+#if DBVT_USE_MEMMOVE
+#ifndef __CELLOS_LV2__
+#include <memory.h>
+#endif
+#include <string.h>
+#endif
+
+#ifndef DBVT_USE_TEMPLATE
+#error "DBVT_USE_TEMPLATE undefined"
+#endif
+
+#ifndef DBVT_USE_MEMMOVE
+#error "DBVT_USE_MEMMOVE undefined"
+#endif
+
+#ifndef DBVT_ENABLE_BENCHMARK
+#error "DBVT_ENABLE_BENCHMARK undefined"
+#endif
+
+#ifndef DBVT_PROXIMITY_IMPL
+#error "DBVT_PROXIMITY_IMPL undefined"
+#endif
+
+#ifndef DBVT_SELECT_IMPL
+#error "DBVT_SELECT_IMPL undefined"
+#endif
+
+#ifndef DBVT_MERGE_IMPL
+#error "DBVT_MERGE_IMPL undefined"
+#endif
+
+//
+// Defaults volumes
+//
+
+/* btDbvtAabbMm			*/ 
+struct	btDbvtAabbMm
+{
+DBVT_INLINE btVector3			Center() const	{ return((mi+mx)/2); }
+DBVT_INLINE btVector3			Lengths() const	{ return(mx-mi); }
+DBVT_INLINE btVector3			Extents() const	{ return((mx-mi)/2); }
+DBVT_INLINE const btVector3&	Mins() const	{ return(mi); }
+DBVT_INLINE const btVector3&	Maxs() const	{ return(mx); }
+static inline btDbvtAabbMm		FromCE(const btVector3& c,const btVector3& e);
+static inline btDbvtAabbMm		FromCR(const btVector3& c,btScalar r);
+static inline btDbvtAabbMm		FromMM(const btVector3& mi,const btVector3& mx);
+static inline btDbvtAabbMm		FromPoints(const btVector3* pts,int n);
+static inline btDbvtAabbMm		FromPoints(const btVector3** ppts,int n);
+DBVT_INLINE void				Expand(const btVector3 e);
+DBVT_INLINE void				SignedExpand(const btVector3 e);
+DBVT_INLINE bool				Contain(const btDbvtAabbMm& a) const;
+DBVT_INLINE int					Classify(const btVector3& n,btScalar o,int s) const;
+DBVT_INLINE btScalar			ProjectMinimum(const btVector3& v,unsigned signs) const;
+DBVT_INLINE friend bool			Intersect(	const btDbvtAabbMm& a,
+											const btDbvtAabbMm& b);
+DBVT_INLINE friend bool			Intersect(	const btDbvtAabbMm& a,
+											const btDbvtAabbMm& b,
+											const btTransform& xform);
+DBVT_INLINE friend bool			Intersect(	const btDbvtAabbMm& a,
+											const btVector3& b);
+DBVT_INLINE friend bool			Intersect(	const btDbvtAabbMm& a,
+											const btVector3& org,
+											const btVector3& invdir,
+											const unsigned* signs);
+DBVT_INLINE friend btScalar		Proximity(	const btDbvtAabbMm& a,
+											const btDbvtAabbMm& b);
+DBVT_INLINE friend int			Select(		const btDbvtAabbMm& o,
+											const btDbvtAabbMm& a,
+											const btDbvtAabbMm& b);
+DBVT_INLINE friend void			Merge(		const btDbvtAabbMm& a,
+											const btDbvtAabbMm& b,
+											btDbvtAabbMm& r);
+DBVT_INLINE friend bool			NotEqual(	const btDbvtAabbMm& a,
+											const btDbvtAabbMm& b);
+private:
+DBVT_INLINE void				AddSpan(const btVector3& d,btScalar& smi,btScalar& smx) const;
+private:
+btVector3	mi,mx;
+};
+
+// Types	
+typedef	btDbvtAabbMm	btDbvtVolume;
+
+/* btDbvtNode				*/ 
+struct	btDbvtNode
+{
+	btDbvtVolume	volume;
+	btDbvtNode*		parent;
+	bool	isleaf() const		{ return(childs[1]==0); }
+	bool	isinternal() const	{ return(!isleaf()); }
+	union	{
+		btDbvtNode*	childs[2];
+		void*	data;
+		};
+};
+
+///The btDbvt class implements a fast dynamic bounding volume tree based on axis aligned bounding boxes (aabb tree).
+///This btDbvt is used for soft body collision detection and for the btDbvtBroadphase. It has a fast insert, remove and update of nodes.
+///Unlike the btQuantizedBvh, nodes can be dynamically moved around, which allows for change in topology of the underlying data structure.
+struct	btDbvt
+	{
+	
+	
+	/* Stack element	*/ 
+	struct	sStkNN
+		{
+		const btDbvtNode*	a;
+		const btDbvtNode*	b;
+		sStkNN() {}
+		sStkNN(const btDbvtNode* na,const btDbvtNode* nb) : a(na),b(nb) {}
+		};
+	struct	sStkNP
+		{
+		const btDbvtNode*	node;
+		int			mask;
+		sStkNP(const btDbvtNode* n,unsigned m) : node(n),mask(m) {}
+		};
+	struct	sStkNPS
+		{
+		const btDbvtNode*	node;
+		int			mask;
+		btScalar	value;
+		sStkNPS() {}
+		sStkNPS(const btDbvtNode* n,unsigned m,btScalar v) : node(n),mask(m),value(v) {}
+		};
+	struct	sStkCLN
+		{
+		const btDbvtNode*	node;
+		btDbvtNode*		parent;
+		sStkCLN(const btDbvtNode* n,btDbvtNode* p) : node(n),parent(p) {}
+		};
+	// Policies/Interfaces
+			
+	/* ICollide	*/ 
+	struct	ICollide
+		{		
+		DBVT_VIRTUAL_DTOR(ICollide)
+		DBVT_VIRTUAL void	Process(const btDbvtNode*,const btDbvtNode*)		{}
+		DBVT_VIRTUAL void	Process(const btDbvtNode*)					{}
+		DBVT_VIRTUAL void	Process(const btDbvtNode* n,btScalar)			{ Process(n); }
+		DBVT_VIRTUAL bool	Descent(const btDbvtNode*)					{ return(true); }
+		DBVT_VIRTUAL bool	AllLeaves(const btDbvtNode*)					{ return(true); }
+		};
+	/* IWriter	*/ 
+	struct	IWriter
+		{
+		virtual ~IWriter() {}
+		virtual void		Prepare(const btDbvtNode* root,int numnodes)=0;
+		virtual void		WriteNode(const btDbvtNode*,int index,int parent,int child0,int child1)=0;
+		virtual void		WriteLeaf(const btDbvtNode*,int index,int parent)=0;
+		};
+	/* IClone	*/ 
+	struct	IClone
+		{
+		virtual ~IClone()	{}
+		virtual void		CloneLeaf(btDbvtNode*) {}
+		};
+		
+	// Constants
+	enum	{
+			SIMPLE_STACKSIZE	=	64,
+			DOUBLE_STACKSIZE	=	SIMPLE_STACKSIZE*2
+			};
+		
+	// Fields
+	btDbvtNode*			m_root;
+	btDbvtNode*			m_free;
+	int				m_lkhd;
+	int				m_leaves;
+	unsigned		m_opath;
+	// Methods
+					btDbvt();
+					~btDbvt();
+	void			clear();
+	bool			empty() const { return(0==m_root); }
+	void			optimizeBottomUp();
+	void			optimizeTopDown(int bu_treshold=128);
+	void			optimizeIncremental(int passes);
+	btDbvtNode*		insert(const btDbvtVolume& box,void* data);
+	void			update(btDbvtNode* leaf,int lookahead=-1);
+	void			update(btDbvtNode* leaf,const btDbvtVolume& volume);
+	bool			update(btDbvtNode* leaf,btDbvtVolume volume,const btVector3& velocity,btScalar margin);
+	bool			update(btDbvtNode* leaf,btDbvtVolume volume,const btVector3& velocity);
+	bool			update(btDbvtNode* leaf,btDbvtVolume volume,btScalar margin);	
+	void			remove(btDbvtNode* leaf);
+	void			write(IWriter* iwriter) const;
+	void			clone(btDbvt& dest,IClone* iclone=0) const;
+	static int		maxdepth(const btDbvtNode* node);
+	static int		countLeaves(const btDbvtNode* node);
+	static void		extractLeaves(const btDbvtNode* node,btAlignedObjectArray<const btDbvtNode*>& leaves);
+	#if DBVT_ENABLE_BENCHMARK
+	static void		benchmark();
+	#else
+	static void		benchmark(){}
+	#endif
+	// DBVT_IPOLICY must support ICollide policy/interface
+	DBVT_PREFIX
+	static void		enumNodes(	const btDbvtNode* root,
+								DBVT_IPOLICY);
+	DBVT_PREFIX
+	static void		enumLeaves(	const btDbvtNode* root,
+								DBVT_IPOLICY);
+	DBVT_PREFIX
+	static void		collideTT(	const btDbvtNode* root0,
+								const btDbvtNode* root1,
+								DBVT_IPOLICY);
+	DBVT_PREFIX
+	static void		collideTT(	const btDbvtNode* root0,
+								const btDbvtNode* root1,
+								const btTransform& xform,
+								DBVT_IPOLICY);
+	DBVT_PREFIX
+	static void		collideTT(	const btDbvtNode* root0,
+								const btTransform& xform0,
+								const btDbvtNode* root1,
+								const btTransform& xform1,
+								DBVT_IPOLICY);
+	DBVT_PREFIX
+	static void		collideTV(	const btDbvtNode* root,
+								const btDbvtVolume& volume,
+								DBVT_IPOLICY);
+	DBVT_PREFIX
+	static void		collideRAY(	const btDbvtNode* root,
+								const btVector3& origin,
+								const btVector3& direction,
+								DBVT_IPOLICY);
+	DBVT_PREFIX
+	static void		collideKDOP(const btDbvtNode* root,
+								const btVector3* normals,
+								const btScalar* offsets,
+								int count,
+								DBVT_IPOLICY);
+	DBVT_PREFIX
+	static void		collideOCL(	const btDbvtNode* root,
+								const btVector3* normals,
+								const btScalar* offsets,
+								const btVector3& sortaxis,
+								int count,								
+								DBVT_IPOLICY,
+								bool fullsort=true);
+	DBVT_PREFIX
+	static void		collideTU(	const btDbvtNode* root,
+								DBVT_IPOLICY);
+	// Helpers	
+	static DBVT_INLINE int	nearest(const int* i,const btDbvt::sStkNPS* a,btScalar v,int l,int h)
+		{
+		int	m=0;
+		while(l<h)
+			{
+			m=(l+h)>>1;
+			if(a[i[m]].value>=v) l=m+1; else h=m;
+			}
+		return(h);
+		}
+	static DBVT_INLINE int	allocate(	btAlignedObjectArray<int>& ifree,
+										btAlignedObjectArray<sStkNPS>& stock,
+										const sStkNPS& value)
+		{
+		int	i;
+		if(ifree.size()>0)
+			{ i=ifree[ifree.size()-1];ifree.pop_back();stock[i]=value; }
+			else
+			{ i=stock.size();stock.push_back(value); }
+		return(i); 
+		}
+	//
+	private:
+					btDbvt(const btDbvt&)	{}	
+	};
+
+//
+// Inline's
+//
+
+//
+inline btDbvtAabbMm			btDbvtAabbMm::FromCE(const btVector3& c,const btVector3& e)
+{
+btDbvtAabbMm box;
+box.mi=c-e;box.mx=c+e;
+return(box);
+}
+	
+//
+inline btDbvtAabbMm			btDbvtAabbMm::FromCR(const btVector3& c,btScalar r)
+{
+return(FromCE(c,btVector3(r,r,r)));
+}
+	
+//
+inline btDbvtAabbMm			btDbvtAabbMm::FromMM(const btVector3& mi,const btVector3& mx)
+{
+btDbvtAabbMm box;
+box.mi=mi;box.mx=mx;
+return(box);
+}
+	
+//
+inline btDbvtAabbMm			btDbvtAabbMm::FromPoints(const btVector3* pts,int n)
+{
+btDbvtAabbMm box;
+box.mi=box.mx=pts[0];
+for(int i=1;i<n;++i)
+	{
+	box.mi.setMin(pts[i]);
+	box.mx.setMax(pts[i]);
+	}
+return(box);
+}
+
+//
+inline btDbvtAabbMm			btDbvtAabbMm::FromPoints(const btVector3** ppts,int n)
+{
+btDbvtAabbMm box;
+box.mi=box.mx=*ppts[0];
+for(int i=1;i<n;++i)
+	{
+	box.mi.setMin(*ppts[i]);
+	box.mx.setMax(*ppts[i]);
+	}
+return(box);
+}
+
+//
+DBVT_INLINE void		btDbvtAabbMm::Expand(const btVector3 e)
+{
+mi-=e;mx+=e;
+}
+	
+//
+DBVT_INLINE void		btDbvtAabbMm::SignedExpand(const btVector3 e)
+{
+if(e.x()>0) mx.setX(mx.x()+e.x()); else mi.setX(mi.x()+e.x());
+if(e.y()>0) mx.setY(mx.y()+e.y()); else mi.setY(mi.y()+e.y());
+if(e.z()>0) mx.setZ(mx.z()+e.z()); else mi.setZ(mi.z()+e.z());
+}
+	
+//
+DBVT_INLINE bool		btDbvtAabbMm::Contain(const btDbvtAabbMm& a) const
+{
+return(	(mi.x()<=a.mi.x())&&
+		(mi.y()<=a.mi.y())&&
+		(mi.z()<=a.mi.z())&&
+		(mx.x()>=a.mx.x())&&
+		(mx.y()>=a.mx.y())&&
+		(mx.z()>=a.mx.z()));
+}
+
+//
+DBVT_INLINE int		btDbvtAabbMm::Classify(const btVector3& n,btScalar o,int s) const
+{
+btVector3			pi,px;
+switch(s)
+	{
+	case	(0+0+0):	px=btVector3(mi.x(),mi.y(),mi.z());
+						pi=btVector3(mx.x(),mx.y(),mx.z());break;
+	case	(1+0+0):	px=btVector3(mx.x(),mi.y(),mi.z());
+						pi=btVector3(mi.x(),mx.y(),mx.z());break;
+	case	(0+2+0):	px=btVector3(mi.x(),mx.y(),mi.z());
+						pi=btVector3(mx.x(),mi.y(),mx.z());break;
+	case	(1+2+0):	px=btVector3(mx.x(),mx.y(),mi.z());
+						pi=btVector3(mi.x(),mi.y(),mx.z());break;
+	case	(0+0+4):	px=btVector3(mi.x(),mi.y(),mx.z());
+						pi=btVector3(mx.x(),mx.y(),mi.z());break;
+	case	(1+0+4):	px=btVector3(mx.x(),mi.y(),mx.z());
+						pi=btVector3(mi.x(),mx.y(),mi.z());break;
+	case	(0+2+4):	px=btVector3(mi.x(),mx.y(),mx.z());
+						pi=btVector3(mx.x(),mi.y(),mi.z());break;
+	case	(1+2+4):	px=btVector3(mx.x(),mx.y(),mx.z());
+						pi=btVector3(mi.x(),mi.y(),mi.z());break;
+	}
+if((dot(n,px)+o)<0)		return(-1);
+if((dot(n,pi)+o)>=0)	return(+1);
+return(0);
+}
+
+//
+DBVT_INLINE btScalar	btDbvtAabbMm::ProjectMinimum(const btVector3& v,unsigned signs) const
+{
+const btVector3*	b[]={&mx,&mi};
+const btVector3		p(	b[(signs>>0)&1]->x(),
+						b[(signs>>1)&1]->y(),
+						b[(signs>>2)&1]->z());
+return(dot(p,v));
+}
+
+//
+DBVT_INLINE void		btDbvtAabbMm::AddSpan(const btVector3& d,btScalar& smi,btScalar& smx) const
+{
+for(int i=0;i<3;++i)
+	{
+	if(d[i]<0)
+		{ smi+=mx[i]*d[i];smx+=mi[i]*d[i]; }
+		else
+		{ smi+=mi[i]*d[i];smx+=mx[i]*d[i]; }
+	}
+}
+	
+//
+DBVT_INLINE bool		Intersect(	const btDbvtAabbMm& a,
+									const btDbvtAabbMm& b)
+{
+return(	(a.mi.x()<=b.mx.x())&&
+		(a.mx.x()>=b.mi.x())&&
+		(a.mi.y()<=b.mx.y())&&
+		(a.mx.y()>=b.mi.y())&&
+		(a.mi.z()<=b.mx.z())&&		
+		(a.mx.z()>=b.mi.z()));
+}
+
+//
+DBVT_INLINE bool		Intersect(	const btDbvtAabbMm& a,
+									const btDbvtAabbMm& b,
+									const btTransform& xform)
+{
+const btVector3		d0=xform*b.Center()-a.Center();
+const btVector3		d1=d0*xform.getBasis();
+btScalar			s0[2]={0,0};
+btScalar			s1[2]={dot(xform.getOrigin(),d0),s1[0]};
+a.AddSpan(d0,s0[0],s0[1]);
+b.AddSpan(d1,s1[0],s1[1]);
+if(s0[0]>(s1[1])) return(false);
+if(s0[1]<(s1[0])) return(false);
+return(true);
+}
+
+//
+DBVT_INLINE bool		Intersect(	const btDbvtAabbMm& a,
+									const btVector3& b)
+{
+return(	(b.x()>=a.mi.x())&&
+		(b.y()>=a.mi.y())&&
+		(b.z()>=a.mi.z())&&
+		(b.x()<=a.mx.x())&&
+		(b.y()<=a.mx.y())&&
+		(b.z()<=a.mx.z()));
+}
+
+//
+DBVT_INLINE bool		Intersect(	const btDbvtAabbMm& a,
+									const btVector3& org,
+									const btVector3& invdir,
+									const unsigned* signs)
+{
+#if 0
+const btVector3		b0((a.mi-org)*invdir);
+const btVector3		b1((a.mx-org)*invdir);
+const btVector3		tmin(btMin(b0[0],b1[0]),btMin(b0[1],b1[1]),btMin(b0[2],b1[2]));
+const btVector3		tmax(btMax(b0[0],b1[0]),btMax(b0[1],b1[1]),btMax(b0[2],b1[2]));
+const btScalar		tin=btMax(tmin[0],btMax(tmin[1],tmin[2]));
+const btScalar		tout=btMin(tmax[0],btMin(tmax[1],tmax[2]));
+return(tin<tout);
+#else
+const btVector3*	bounds[2]={&a.mi,&a.mx};
+btScalar			txmin=(bounds[  signs[0]]->x()-org[0])*invdir[0];
+btScalar			txmax=(bounds[1-signs[0]]->x()-org[0])*invdir[0];
+const btScalar		tymin=(bounds[  signs[1]]->y()-org[1])*invdir[1];
+const btScalar		tymax=(bounds[1-signs[1]]->y()-org[1])*invdir[1];
+if((txmin>tymax)||(tymin>txmax)) return(false);
+if(tymin>txmin) txmin=tymin;
+if(tymax<txmax) txmax=tymax;
+const btScalar		tzmin=(bounds[  signs[2]]->z()-org[2])*invdir[2];
+const btScalar		tzmax=(bounds[1-signs[2]]->z()-org[2])*invdir[2];
+if((txmin>tzmax)||(tzmin>txmax)) return(false);
+if(tzmin>txmin) txmin=tzmin;
+if(tzmax<txmax) txmax=tzmax;
+return(txmax>0);
+#endif
+}
+	
+//
+DBVT_INLINE btScalar	Proximity(	const btDbvtAabbMm& a,
+									const btDbvtAabbMm& b)
+{
+#if	DBVT_PROXIMITY_IMPL == DBVT_IMPL_SSE
+DBVT_ALIGN btScalar							r[1];
+static DBVT_ALIGN const unsigned __int32	mask[]={0x7fffffff,0x7fffffff,0x7fffffff,0x7fffffff};
+__asm
+	{
+	mov		eax,a
+	mov		ecx,b
+	movaps	xmm0,[eax]
+	movaps	xmm2,[ecx]
+	movaps	xmm1,[eax+16]
+	movaps	xmm3,[ecx+16]
+	addps	xmm0,xmm1
+	addps	xmm2,xmm3
+	subps	xmm0,xmm2
+	andps	xmm0,mask
+	movhlps	xmm1,xmm0
+	addps	xmm0,xmm1
+	pshufd	xmm1,xmm0,1
+	addss	xmm0,xmm1
+	movss	r,xmm0
+	}
+return(r[0]);
+#else
+const btVector3	d=(a.mi+a.mx)-(b.mi+b.mx);
+return(btFabs(d.x())+btFabs(d.y())+btFabs(d.z()));
+#endif
+}
+
+//
+DBVT_INLINE int			Select(	const btDbvtAabbMm& o,
+								const btDbvtAabbMm& a,
+								const btDbvtAabbMm& b)
+{
+#if	DBVT_SELECT_IMPL == DBVT_IMPL_SSE
+DBVT_ALIGN __int32							r[1];
+static DBVT_ALIGN const unsigned __int32	mask[]={0x7fffffff,0x7fffffff,0x7fffffff,0x7fffffff};
+__asm
+	{
+	mov		eax,o
+	mov		ecx,a
+	mov		edx,b
+	movaps	xmm0,[eax]
+	movaps	xmm5,mask
+	addps	xmm0,[eax+16]	
+	movaps	xmm1,[ecx]
+	movaps	xmm2,[edx]
+	addps	xmm1,[ecx+16]
+	addps	xmm2,[edx+16]
+	subps	xmm1,xmm0
+	subps	xmm2,xmm0
+	andps	xmm1,xmm5
+	andps	xmm2,xmm5
+	movhlps	xmm3,xmm1
+	movhlps	xmm4,xmm2
+	addps	xmm1,xmm3
+	addps	xmm2,xmm4
+	pshufd	xmm3,xmm1,1
+	pshufd	xmm4,xmm2,1
+	addss	xmm1,xmm3
+	addss	xmm2,xmm4
+	cmpless	xmm2,xmm1
+	movss	r,xmm2
+	}
+return(r[0]&1);
+#else
+return(Proximity(o,a)<Proximity(o,b)?0:1);
+#endif
+}
+
+//
+DBVT_INLINE void		Merge(	const btDbvtAabbMm& a,
+								const btDbvtAabbMm& b,
+								btDbvtAabbMm& r)
+{
+#if DBVT_MERGE_IMPL==DBVT_IMPL_SSE
+__asm
+	{
+	mov		eax,a
+	mov		edx,b
+	mov		ecx,r
+	movaps	xmm0,[eax+0]
+	movaps	xmm1,[edx+0]
+	movaps	xmm2,[eax+16]
+	movaps	xmm3,[edx+16]
+	minps	xmm0,xmm1
+	maxps	xmm2,xmm3
+	movaps	[ecx+0],xmm0
+	movaps	[ecx+16],xmm2
+	}
+#else
+for(int i=0;i<3;++i)
+	{
+	if(a.mi[i]<b.mi[i]) r.mi[i]=a.mi[i]; else r.mi[i]=b.mi[i];
+	if(a.mx[i]>b.mx[i]) r.mx[i]=a.mx[i]; else r.mx[i]=b.mx[i];
+	}
+#endif
+}
+
+//
+DBVT_INLINE bool		NotEqual(	const btDbvtAabbMm& a,
+									const btDbvtAabbMm& b)
+{
+return(	(a.mi.x()!=b.mi.x())||
+		(a.mi.y()!=b.mi.y())||
+		(a.mi.z()!=b.mi.z())||
+		(a.mx.x()!=b.mx.x())||
+		(a.mx.y()!=b.mx.y())||
+		(a.mx.z()!=b.mx.z()));
+}
+
+//
+// Inline's
+//
+
+//
+DBVT_PREFIX
+inline void		btDbvt::enumNodes(	const btDbvtNode* root,
+									DBVT_IPOLICY)
+{
+DBVT_CHECKTYPE
+policy.Process(root);
+if(root->isinternal())
+	{
+	enumNodes(root->childs[0],policy);
+	enumNodes(root->childs[1],policy);
+	}
+}
+
+//
+DBVT_PREFIX
+inline void		btDbvt::enumLeaves(	const btDbvtNode* root,
+									DBVT_IPOLICY)
+{
+DBVT_CHECKTYPE
+if(root->isinternal())
+	{
+	enumLeaves(root->childs[0],policy);
+	enumLeaves(root->childs[1],policy);
+	}
+	else
+	{
+	policy.Process(root);
+	}
+}
+
+//
+DBVT_PREFIX
+inline void		btDbvt::collideTT(	const btDbvtNode* root0,
+									const btDbvtNode* root1,
+									DBVT_IPOLICY)
+{
+DBVT_CHECKTYPE
+if(root0&&root1)
+	{
+	btAlignedObjectArray<sStkNN>	stack;
+	int								depth=1;
+	int								treshold=DOUBLE_STACKSIZE-4;
+	stack.resize(DOUBLE_STACKSIZE);
+	stack[0]=sStkNN(root0,root1);
+	do	{
+		sStkNN	p=stack[--depth];
+		if(depth>treshold)
+			{
+			stack.resize(stack.size()*2);
+			treshold=stack.size()-4;
+			}
+		if(p.a==p.b)
+			{
+			if(p.a->isinternal())
+				{
+				stack[depth++]=sStkNN(p.a->childs[0],p.a->childs[0]);
+				stack[depth++]=sStkNN(p.a->childs[1],p.a->childs[1]);
+				stack[depth++]=sStkNN(p.a->childs[0],p.a->childs[1]);
+				}
+			}
+		else if(Intersect(p.a->volume,p.b->volume))
+			{
+			if(p.a->isinternal())
+				{
+				if(p.b->isinternal())
+					{
+					stack[depth++]=sStkNN(p.a->childs[0],p.b->childs[0]);
+					stack[depth++]=sStkNN(p.a->childs[1],p.b->childs[0]);
+					stack[depth++]=sStkNN(p.a->childs[0],p.b->childs[1]);
+					stack[depth++]=sStkNN(p.a->childs[1],p.b->childs[1]);
+					}
+					else
+					{
+					stack[depth++]=sStkNN(p.a->childs[0],p.b);
+					stack[depth++]=sStkNN(p.a->childs[1],p.b);
+					}
+				}
+				else
+				{
+				if(p.b->isinternal())
+					{
+					stack[depth++]=sStkNN(p.a,p.b->childs[0]);
+					stack[depth++]=sStkNN(p.a,p.b->childs[1]);
+					}
+					else
+					{
+					policy.Process(p.a,p.b);
+					}
+				}
+			}
+		} while(depth);
+	}
+}
+
+//
+DBVT_PREFIX
+inline void		btDbvt::collideTT(	const btDbvtNode* root0,
+									const btDbvtNode* root1,
+									const btTransform& xform,
+									DBVT_IPOLICY)
+{
+DBVT_CHECKTYPE
+if(root0&&root1)
+	{
+	btAlignedObjectArray<sStkNN>	stack;
+	int								depth=1;
+	int								treshold=DOUBLE_STACKSIZE-4;
+	stack.resize(DOUBLE_STACKSIZE);
+	stack[0]=sStkNN(root0,root1);
+	do	{
+		sStkNN	p=stack[--depth];
+		if(Intersect(p.a->volume,p.b->volume,xform))
+			{
+			if(depth>treshold)
+				{
+				stack.resize(stack.size()*2);
+				treshold=stack.size()-4;
+				}
+			if(p.a->isinternal())
+				{
+				if(p.b->isinternal())
+					{					
+					stack[depth++]=sStkNN(p.a->childs[0],p.b->childs[0]);
+					stack[depth++]=sStkNN(p.a->childs[1],p.b->childs[0]);
+					stack[depth++]=sStkNN(p.a->childs[0],p.b->childs[1]);
+					stack[depth++]=sStkNN(p.a->childs[1],p.b->childs[1]);
+					}
+					else
+					{
+					stack[depth++]=sStkNN(p.a->childs[0],p.b);
+					stack[depth++]=sStkNN(p.a->childs[1],p.b);
+					}
+				}
+				else
+				{
+				if(p.b->isinternal())
+					{
+					stack[depth++]=sStkNN(p.a,p.b->childs[0]);
+					stack[depth++]=sStkNN(p.a,p.b->childs[1]);
+					}
+					else
+					{
+					policy.Process(p.a,p.b);
+					}
+				}
+			}
+		} while(depth);
+	}
+}
+
+//
+DBVT_PREFIX
+inline void		btDbvt::collideTT(	const btDbvtNode* root0,
+									const btTransform& xform0,
+									const btDbvtNode* root1,
+									const btTransform& xform1,
+									DBVT_IPOLICY)
+{
+const btTransform	xform=xform0.inverse()*xform1;
+collideTT(root0,root1,xform,policy);
+}
+
+//
+DBVT_PREFIX
+inline void		btDbvt::collideTV(	const btDbvtNode* root,
+									const btDbvtVolume& volume,
+									DBVT_IPOLICY)
+{
+DBVT_CHECKTYPE
+if(root)
+	{
+	btAlignedObjectArray<const btDbvtNode*>	stack;
+	stack.reserve(SIMPLE_STACKSIZE);
+	stack.push_back(root);
+	do	{
+		const btDbvtNode*	n=stack[stack.size()-1];
+		stack.pop_back();
+		if(Intersect(n->volume,volume))
+			{
+			if(n->isinternal())
+				{
+				stack.push_back(n->childs[0]);
+				stack.push_back(n->childs[1]);
+				}
+				else
+				{
+				policy.Process(n);
+				}
+			}
+		} while(stack.size()>0);
+	}
+}
+
+//
+DBVT_PREFIX
+inline void		btDbvt::collideRAY(	const btDbvtNode* root,
+									const btVector3& origin,
+									const btVector3& direction,
+									DBVT_IPOLICY)
+{
+DBVT_CHECKTYPE
+if(root)
+	{
+	const btVector3	normal=direction.normalized();
+	const btVector3	invdir(	1/normal.x(),
+							1/normal.y(),
+							1/normal.z());
+	const unsigned	signs[]={	direction.x()<0,
+								direction.y()<0,
+								direction.z()<0};
+	btAlignedObjectArray<const btDbvtNode*>	stack;
+	stack.reserve(SIMPLE_STACKSIZE);
+	stack.push_back(root);
+	do	{
+		const btDbvtNode*	node=stack[stack.size()-1];
+		stack.pop_back();
+		if(Intersect(node->volume,origin,invdir,signs))
+			{
+			if(node->isinternal())
+				{
+				stack.push_back(node->childs[0]);
+				stack.push_back(node->childs[1]);
+				}
+				else
+				{
+				policy.Process(node);
+				}
+			}
+		} while(stack.size());
+	}
+}
+
+//
+DBVT_PREFIX
+inline void		btDbvt::collideKDOP(const btDbvtNode* root,
+									const btVector3* normals,
+									const btScalar* offsets,
+									int count,
+									DBVT_IPOLICY)
+{
+DBVT_CHECKTYPE
+if(root)
+	{
+	const int						inside=(1<<count)-1;
+	btAlignedObjectArray<sStkNP>	stack;
+	int								signs[sizeof(unsigned)*8];
+	btAssert(count<int (sizeof(signs)/sizeof(signs[0])));
+	for(int i=0;i<count;++i)
+		{
+		signs[i]=	((normals[i].x()>=0)?1:0)+
+					((normals[i].y()>=0)?2:0)+
+					((normals[i].z()>=0)?4:0);
+		}
+	stack.reserve(SIMPLE_STACKSIZE);
+	stack.push_back(sStkNP(root,0));
+	do	{
+		sStkNP	se=stack[stack.size()-1];
+		bool	out=false;
+		stack.pop_back();
+		for(int i=0,j=1;(!out)&&(i<count);++i,j<<=1)
+			{
+			if(0==(se.mask&j))
+				{
+				const int	side=se.node->volume.Classify(normals[i],offsets[i],signs[i]);
+				switch(side)
+					{
+					case	-1:	out=true;break;
+					case	+1:	se.mask|=j;break;
+					}
+				}
+			}
+		if(!out)
+			{
+			if((se.mask!=inside)&&(se.node->isinternal()))
+				{
+				stack.push_back(sStkNP(se.node->childs[0],se.mask));
+				stack.push_back(sStkNP(se.node->childs[1],se.mask));
+				}
+				else
+				{
+				if(policy.AllLeaves(se.node)) enumLeaves(se.node,policy);
+				}
+			}
+		} while(stack.size());
+	}
+}
+
+//
+DBVT_PREFIX
+inline void		btDbvt::collideOCL(	const btDbvtNode* root,
+									const btVector3* normals,
+									const btScalar* offsets,
+									const btVector3& sortaxis,
+									int count,
+									DBVT_IPOLICY,
+									bool fsort)
+{
+DBVT_CHECKTYPE
+if(root)
+	{
+	const unsigned					srtsgns=(sortaxis[0]>=0?1:0)+
+											(sortaxis[1]>=0?2:0)+
+											(sortaxis[2]>=0?4:0);
+	const int						inside=(1<<count)-1;
+	btAlignedObjectArray<sStkNPS>	stock;
+	btAlignedObjectArray<int>		ifree;
+	btAlignedObjectArray<int>		stack;
+	int								signs[sizeof(unsigned)*8];
+	btAssert(count<int (sizeof(signs)/sizeof(signs[0])));
+	for(int i=0;i<count;++i)
+		{
+		signs[i]=	((normals[i].x()>=0)?1:0)+
+					((normals[i].y()>=0)?2:0)+
+					((normals[i].z()>=0)?4:0);
+		}
+	stock.reserve(SIMPLE_STACKSIZE);
+	stack.reserve(SIMPLE_STACKSIZE);
+	ifree.reserve(SIMPLE_STACKSIZE);
+	stack.push_back(allocate(ifree,stock,sStkNPS(root,0,root->volume.ProjectMinimum(sortaxis,srtsgns))));
+	do	{
+		const int	id=stack[stack.size()-1];
+		sStkNPS		se=stock[id];
+		stack.pop_back();ifree.push_back(id);
+		if(se.mask!=inside)
+			{
+			bool	out=false;
+			for(int i=0,j=1;(!out)&&(i<count);++i,j<<=1)
+				{
+				if(0==(se.mask&j))
+					{
+					const int	side=se.node->volume.Classify(normals[i],offsets[i],signs[i]);
+					switch(side)
+						{
+						case	-1:	out=true;break;
+						case	+1:	se.mask|=j;break;
+						}
+					}
+				}
+			if(out) continue;
+			}
+		if(policy.Descent(se.node))
+			{
+			if(se.node->isinternal())
+				{
+				const btDbvtNode* pns[]={	se.node->childs[0],se.node->childs[1]};
+				sStkNPS		nes[]={	sStkNPS(pns[0],se.mask,pns[0]->volume.ProjectMinimum(sortaxis,srtsgns)),
+									sStkNPS(pns[1],se.mask,pns[1]->volume.ProjectMinimum(sortaxis,srtsgns))};
+				const int	q=nes[0].value<nes[1].value?1:0;				
+				int			j=stack.size();
+				if(fsort&&(j>0))
+					{
+					/* Insert 0	*/ 
+					j=nearest(&stack[0],&stock[0],nes[q].value,0,stack.size());
+					stack.push_back(0);
+					#if DBVT_USE_MEMMOVE
+					memmove(&stack[j+1],&stack[j],sizeof(int)*(stack.size()-j-1));
+					#else
+					for(int k=stack.size()-1;k>j;--k) stack[k]=stack[k-1];
+					#endif
+					stack[j]=allocate(ifree,stock,nes[q]);
+					/* Insert 1	*/ 
+					j=nearest(&stack[0],&stock[0],nes[1-q].value,j,stack.size());
+					stack.push_back(0);
+					#if DBVT_USE_MEMMOVE
+					memmove(&stack[j+1],&stack[j],sizeof(int)*(stack.size()-j-1));
+					#else
+					for(int k=stack.size()-1;k>j;--k) stack[k]=stack[k-1];
+					#endif
+					stack[j]=allocate(ifree,stock,nes[1-q]);
+					}
+					else
+					{
+					stack.push_back(allocate(ifree,stock,nes[q]));
+					stack.push_back(allocate(ifree,stock,nes[1-q]));
+					}
+				}
+				else
+				{
+				policy.Process(se.node,se.value);
+				}
+			}
+		} while(stack.size());
+	}
+}
+
+//
+DBVT_PREFIX
+inline void		btDbvt::collideTU(	const btDbvtNode* root,
+									DBVT_IPOLICY)
+{
+DBVT_CHECKTYPE
+if(root)
+	{
+	btAlignedObjectArray<const btDbvtNode*>	stack;
+	stack.reserve(SIMPLE_STACKSIZE);
+	stack.push_back(root);
+	do	{
+		const btDbvtNode*	n=stack[stack.size()-1];
+		stack.pop_back();
+		if(policy.Descent(n))
+			{
+			if(n->isinternal())
+				{ stack.push_back(n->childs[0]);stack.push_back(n->childs[1]); }
+				else
+				{ policy.Process(n); }
+			}
+		} while(stack.size()>0);
+	}
+}
+
+//
+// PP Cleanup
+//
+
+#undef DBVT_USE_MEMMOVE
+#undef DBVT_USE_TEMPLATE
+#undef DBVT_VIRTUAL_DTOR
+#undef DBVT_VIRTUAL
+#undef DBVT_PREFIX
+#undef DBVT_IPOLICY
+#undef DBVT_CHECKTYPE
+#undef DBVT_IMPL_GENERIC
+#undef DBVT_IMPL_FPU0x86
+#undef DBVT_IMPL_SSE
+
+#endif
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp
new file mode 100644
index 00000000000..c6086f28f19
--- /dev/null
+++ b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp
@@ -0,0 +1,344 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2007 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+///btDbvtBroadphase implementation by Nathanael Presson
+
+#include "btDbvtBroadphase.h"
+
+//
+// Profiling
+//
+
+#if DBVT_BP_PROFILE
+#include <stdio.h>
+struct	ProfileScope
+	{
+	ProfileScope(btClock& clock,unsigned long& value)
+		{
+		m_clock=&clock;
+		m_value=&value;
+		m_base=clock.getTimeMicroseconds();
+		}
+	~ProfileScope()
+		{
+		(*m_value)+=m_clock->getTimeMicroseconds()-m_base;
+		}
+	btClock*		m_clock;
+	unsigned long*	m_value;
+	unsigned long	m_base;
+	};
+#define	SPC(_value_)	ProfileScope	spc_scope(m_clock,_value_)
+#else
+#define	SPC(_value_)
+#endif
+
+//
+// Helpers
+//
+
+//
+template <typename T>
+static inline void	listappend(T* item,T*& list)
+{
+item->links[0]=0;
+item->links[1]=list;
+if(list) list->links[0]=item;
+list=item;
+}
+
+//
+template <typename T>
+static inline void	listremove(T* item,T*& list)
+{
+if(item->links[0]) item->links[0]->links[1]=item->links[1]; else list=item->links[1];
+if(item->links[1]) item->links[1]->links[0]=item->links[0];
+}
+
+//
+template <typename T>
+static inline int	listcount(T* root)
+{
+int	n=0;
+while(root) { ++n;root=root->links[1]; }
+return(n);
+}
+
+//
+template <typename T>
+static inline void	clear(T& value)
+{
+static const struct ZeroDummy : T {} zerodummy;
+value=zerodummy;
+}
+
+//
+// Colliders
+//
+
+/* Tree collider	*/ 
+struct	btDbvtTreeCollider : btDbvt::ICollide
+{
+btDbvtBroadphase*	pbp;
+		btDbvtTreeCollider(btDbvtBroadphase* p) : pbp(p) {}
+void	Process(const btDbvtNode* na,const btDbvtNode* nb)
+	{
+	btDbvtProxy*	pa=(btDbvtProxy*)na->data;
+	btDbvtProxy*	pb=(btDbvtProxy*)nb->data;
+	#if DBVT_BP_DISCRETPAIRS
+	if(Intersect(pa->aabb,pb->aabb))
+	#endif
+		{
+		if(pa>pb) btSwap(pa,pb);
+		pbp->m_paircache->addOverlappingPair(pa,pb);
+		}
+	}
+};
+
+//
+// btDbvtBroadphase
+//
+
+//
+btDbvtBroadphase::btDbvtBroadphase(btOverlappingPairCache* paircache)
+{
+m_releasepaircache	=	(paircache!=0)?false:true;
+m_predictedframes	=	2;
+m_stageCurrent		=	0;
+m_fupdates			=	1;
+m_dupdates			=	1;
+m_paircache			=	paircache?
+							paircache	:
+							new(btAlignedAlloc(sizeof(btHashedOverlappingPairCache),16)) btHashedOverlappingPairCache();
+m_gid				=	0;
+m_pid				=	0;
+for(int i=0;i<=STAGECOUNT;++i)
+	{
+	m_stageRoots[i]=0;
+	}
+#if DBVT_BP_PROFILE
+clear(m_profiling);
+#endif
+}
+
+//
+btDbvtBroadphase::~btDbvtBroadphase()
+{
+if(m_releasepaircache) 
+{
+	m_paircache->~btOverlappingPairCache();
+	btAlignedFree(m_paircache);
+}
+}
+
+//
+btBroadphaseProxy*				btDbvtBroadphase::createProxy(	const btVector3& aabbMin,
+																const btVector3& aabbMax,
+																int /*shapeType*/,
+																void* userPtr,
+																short int collisionFilterGroup,
+																short int collisionFilterMask,
+																btDispatcher* /*dispatcher*/,
+																void* /*multiSapProxy*/)
+{
+btDbvtProxy*	proxy=new(btAlignedAlloc(sizeof(btDbvtProxy),16)) btDbvtProxy(	userPtr,
+																				collisionFilterGroup,
+																				collisionFilterMask);
+proxy->aabb			=	btDbvtVolume::FromMM(aabbMin,aabbMax);
+proxy->leaf			=	m_sets[0].insert(proxy->aabb,proxy);
+proxy->stage		=	m_stageCurrent;
+proxy->m_uniqueId	=	++m_gid;
+listappend(proxy,m_stageRoots[m_stageCurrent]);
+return(proxy);
+}
+
+//
+void							btDbvtBroadphase::destroyProxy(	btBroadphaseProxy* absproxy,
+																btDispatcher* dispatcher)
+{
+btDbvtProxy*	proxy=(btDbvtProxy*)absproxy;
+if(proxy->stage==STAGECOUNT)
+	m_sets[1].remove(proxy->leaf);
+	else
+	m_sets[0].remove(proxy->leaf);
+listremove(proxy,m_stageRoots[proxy->stage]);
+m_paircache->removeOverlappingPairsContainingProxy(proxy,dispatcher);
+btAlignedFree(proxy);
+}
+
+//
+void							btDbvtBroadphase::setAabb(		btBroadphaseProxy* absproxy,
+																const btVector3& aabbMin,
+																const btVector3& aabbMax,
+																btDispatcher* /*dispatcher*/)
+{
+btDbvtProxy*	proxy=(btDbvtProxy*)absproxy;
+btDbvtVolume	aabb=btDbvtVolume::FromMM(aabbMin,aabbMax);
+if(NotEqual(aabb,proxy->leaf->volume))
+	{
+	if(proxy->stage==STAGECOUNT)
+		{/* fixed -> dynamic set	*/ 
+		m_sets[1].remove(proxy->leaf);
+		proxy->leaf=m_sets[0].insert(aabb,proxy);
+		}
+		else
+		{/* dynamic set				*/ 
+		if(Intersect(proxy->leaf->volume,aabb))
+			{/* Moving				*/ 
+			const btVector3	delta=(aabbMin+aabbMax)/2-proxy->aabb.Center();
+			#ifdef DBVT_BP_MARGIN
+			m_sets[0].update(proxy->leaf,aabb,delta*m_predictedframes,DBVT_BP_MARGIN);
+			#else
+			m_sets[0].update(proxy->leaf,aabb,delta*m_predictedframes);
+			#endif
+			}
+			else
+			{/* Teleporting			*/ 
+			m_sets[0].update(proxy->leaf,aabb);		
+			}	
+		}
+	listremove(proxy,m_stageRoots[proxy->stage]);
+	proxy->aabb		=	aabb;
+	proxy->stage	=	m_stageCurrent;
+	listappend(proxy,m_stageRoots[m_stageCurrent]);
+	}
+}
+
+//
+void							btDbvtBroadphase::calculateOverlappingPairs(btDispatcher* dispatcher)
+{
+collide(dispatcher);
+#if DBVT_BP_PROFILE
+if(0==(m_pid%DBVT_BP_PROFILING_RATE))
+	{	
+	printf("fixed(%u) dynamics(%u) pairs(%u)\r\n",m_sets[1].m_leaves,m_sets[0].m_leaves,m_paircache->getNumOverlappingPairs());
+	unsigned int	total=m_profiling.m_total;
+	if(total<=0) total=1;
+	printf("ddcollide: %u%% (%uus)\r\n",(50+m_profiling.m_ddcollide*100)/total,m_profiling.m_ddcollide/DBVT_BP_PROFILING_RATE);
+	printf("fdcollide: %u%% (%uus)\r\n",(50+m_profiling.m_fdcollide*100)/total,m_profiling.m_fdcollide/DBVT_BP_PROFILING_RATE);
+	printf("cleanup:   %u%% (%uus)\r\n",(50+m_profiling.m_cleanup*100)/total,m_profiling.m_cleanup/DBVT_BP_PROFILING_RATE);
+	printf("total:     %uus\r\n",total/DBVT_BP_PROFILING_RATE);
+	const unsigned long	sum=m_profiling.m_ddcollide+
+							m_profiling.m_fdcollide+
+							m_profiling.m_cleanup;
+	printf("leaked: %u%% (%uus)\r\n",100-((50+sum*100)/total),(total-sum)/DBVT_BP_PROFILING_RATE);
+	printf("job counts: %u%%\r\n",(m_profiling.m_jobcount*100)/((m_sets[0].m_leaves+m_sets[1].m_leaves)*DBVT_BP_PROFILING_RATE));
+	clear(m_profiling);
+	m_clock.reset();
+	}
+#endif
+}
+
+//
+void							btDbvtBroadphase::collide(btDispatcher* dispatcher)
+{
+SPC(m_profiling.m_total);
+/* optimize				*/ 
+m_sets[0].optimizeIncremental(1+(m_sets[0].m_leaves*m_dupdates)/100);
+m_sets[1].optimizeIncremental(1+(m_sets[1].m_leaves*m_fupdates)/100);
+/* dynamic -> fixed set	*/ 
+m_stageCurrent=(m_stageCurrent+1)%STAGECOUNT;
+btDbvtProxy*	current=m_stageRoots[m_stageCurrent];
+if(current)
+	{
+	btDbvtTreeCollider	collider(this);
+	do	{
+		btDbvtProxy*	next=current->links[1];
+		listremove(current,m_stageRoots[current->stage]);
+		listappend(current,m_stageRoots[STAGECOUNT]);
+		btDbvt::collideTT(m_sets[1].m_root,current->leaf,collider);
+		m_sets[0].remove(current->leaf);
+		current->leaf	=	m_sets[1].insert(current->aabb,current);
+		current->stage	=	STAGECOUNT;	
+		current			=	next;
+		} while(current);
+	}
+/* collide dynamics		*/ 
+	{
+	btDbvtTreeCollider	collider(this);
+		{
+		SPC(m_profiling.m_fdcollide);
+		btDbvt::collideTT(m_sets[0].m_root,m_sets[1].m_root,collider);
+		}
+		{
+		SPC(m_profiling.m_ddcollide);
+		btDbvt::collideTT(m_sets[0].m_root,m_sets[0].m_root,collider);
+		}
+	}
+/* clean up				*/ 
+	{
+	SPC(m_profiling.m_cleanup);
+	btBroadphasePairArray&	pairs=m_paircache->getOverlappingPairArray();
+	if(pairs.size()>0)
+		{
+		for(int i=0,ni=pairs.size();i<ni;++i)
+			{
+			btBroadphasePair&	p=pairs[i];
+			btDbvtProxy*	pa=(btDbvtProxy*)p.m_pProxy0;
+			btDbvtProxy*	pb=(btDbvtProxy*)p.m_pProxy1;
+			if(!Intersect(pa->aabb,pb->aabb))
+				{
+				if(pa>pb) btSwap(pa,pb);
+				m_paircache->removeOverlappingPair(pa,pb,dispatcher);
+				--ni;--i;
+				}
+			}
+		}
+	}
+++m_pid;
+}
+
+//
+void							btDbvtBroadphase::optimize()
+{
+m_sets[0].optimizeTopDown();
+m_sets[1].optimizeTopDown();
+}
+
+//
+btOverlappingPairCache*			btDbvtBroadphase::getOverlappingPairCache()
+{
+return(m_paircache);
+}
+
+//
+const btOverlappingPairCache*	btDbvtBroadphase::getOverlappingPairCache() const
+{
+return(m_paircache);
+}
+
+//
+void							btDbvtBroadphase::getBroadphaseAabb(btVector3& aabbMin,btVector3& aabbMax) const
+{
+
+	ATTRIBUTE_ALIGNED16(btDbvtVolume)	bounds;
+
+if(!m_sets[0].empty())
+	if(!m_sets[1].empty())	Merge(	m_sets[0].m_root->volume,
+									m_sets[1].m_root->volume,bounds);
+							else
+							bounds=m_sets[0].m_root->volume;
+else if(!m_sets[1].empty())	bounds=m_sets[1].m_root->volume;
+							else
+							bounds=btDbvtVolume::FromCR(btVector3(0,0,0),0);
+aabbMin=bounds.Mins();
+aabbMax=bounds.Maxs();
+}
+
+//
+void							btDbvtBroadphase::printStats()
+{}
+
+#if DBVT_BP_PROFILE
+#undef	SPC
+#endif
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h
new file mode 100644
index 00000000000..3f19075552b
--- /dev/null
+++ b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h
@@ -0,0 +1,103 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2007 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+///btDbvtBroadphase implementation by Nathanael Presson
+#ifndef BT_DBVT_BROADPHASE_H
+#define BT_DBVT_BROADPHASE_H
+
+#include "BulletCollision/BroadphaseCollision/btDbvt.h"
+#include "BulletCollision/BroadphaseCollision/btOverlappingPairCache.h"
+
+//
+// Compile time config
+//
+
+#define	DBVT_BP_PROFILE			0
+#define DBVT_BP_DISCRETPAIRS	1
+#define DBVT_BP_MARGIN			(btScalar)0.05
+
+#if DBVT_BP_PROFILE
+	#define	DBVT_BP_PROFILING_RATE	256
+	#include "LinearMath/btQuickprof.h"
+#endif
+
+//
+// btDbvtProxy
+//
+struct btDbvtProxy : btBroadphaseProxy
+{
+/* Fields		*/ 
+btDbvtAabbMm		aabb;
+btDbvtNode*		leaf;
+btDbvtProxy*		links[2];
+int					stage;
+/* ctor			*/ 
+btDbvtProxy(void* userPtr,short int collisionFilterGroup, short int collisionFilterMask) :
+	btBroadphaseProxy(userPtr,collisionFilterGroup,collisionFilterMask)
+	{
+	links[0]=links[1]=0;
+	}
+};
+
+typedef btAlignedObjectArray<btDbvtProxy*>	btDbvtProxyArray;
+
+///The btDbvtBroadphase implements a broadphase using two dynamic AABB bounding volume hierarchies/trees (see btDbvt).
+///One tree is used for static/non-moving objects, and another tree is used for dynamic objects. Objects can move from one tree to the other.
+///This is a very fast broadphase, especially for very dynamic worlds where many objects are moving. Its insert/add and remove of objects is generally faster than the sweep and prune broadphases btAxisSweep3 and bt32BitAxisSweep3.
+struct	btDbvtBroadphase : btBroadphaseInterface
+{
+/* Config		*/ 
+enum	{
+		DYNAMIC_SET			=	0,	/* Dynamic set index	*/ 
+		FIXED_SET			=	1,	/* Fixed set index		*/ 
+		STAGECOUNT			=	2	/* Number of stages		*/ 
+		};
+/* Fields		*/ 
+btDbvt					m_sets[2];					// Dbvt sets
+btDbvtProxy*			m_stageRoots[STAGECOUNT+1];	// Stages list
+btOverlappingPairCache*	m_paircache;				// Pair cache
+btScalar				m_predictedframes;			// Frames predicted
+int						m_stageCurrent;				// Current stage
+int						m_fupdates;					// % of fixed updates per frame
+int						m_dupdates;					// % of dynamic updates per frame
+int						m_pid;						// Parse id
+int						m_gid;						// Gen id
+bool					m_releasepaircache;			// Release pair cache on delete
+#if DBVT_BP_PROFILE
+btClock					m_clock;
+struct	{
+		unsigned long		m_total;
+		unsigned long		m_ddcollide;
+		unsigned long		m_fdcollide;
+		unsigned long		m_cleanup;
+		unsigned long		m_jobcount;
+		}				m_profiling;
+#endif
+/* Methods		*/ 
+btDbvtBroadphase(btOverlappingPairCache* paircache=0);
+~btDbvtBroadphase();
+void							collide(btDispatcher* dispatcher);
+void							optimize();
+/* btBroadphaseInterface Implementation	*/ 
+btBroadphaseProxy*				createProxy(const btVector3& aabbMin,const btVector3& aabbMax,int shapeType,void* userPtr,short int collisionFilterGroup,short int collisionFilterMask,btDispatcher* dispatcher,void* multiSapProxy);
+void							destroyProxy(btBroadphaseProxy* proxy,btDispatcher* dispatcher);
+void							setAabb(btBroadphaseProxy* proxy,const btVector3& aabbMin,const btVector3& aabbMax,btDispatcher* dispatcher);
+void							calculateOverlappingPairs(btDispatcher* dispatcher);
+btOverlappingPairCache*			getOverlappingPairCache();
+const btOverlappingPairCache*	getOverlappingPairCache() const;
+void							getBroadphaseAabb(btVector3& aabbMin,btVector3& aabbMax) const;
+void							printStats();
+};
+
+#endif
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDispatcher.h b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDispatcher.h
index 3d958cc8fef..6db71a0170e 100644
--- a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDispatcher.h
+++ b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDispatcher.h
@@ -16,7 +16,7 @@ subject to the following restrictions:
 #ifndef _DISPATCHER_H
 #define _DISPATCHER_H
 
-#include "../../LinearMath/btScalar.h"
+#include "LinearMath/btScalar.h"
 
 class btCollisionAlgorithm;
 struct btBroadphaseProxy;
@@ -43,7 +43,9 @@ struct btDispatcherInfo
 		m_useContinuous(false),
 		m_debugDraw(0),
 		m_enableSatConvex(false),
-		m_enableSPU(false),
+		m_enableSPU(true),
+		m_useEpa(true),
+		m_allowedCcdPenetration(btScalar(0.04)),
 		m_stackAllocator(0)
 	{
 
@@ -51,17 +53,19 @@ struct btDispatcherInfo
 	btScalar	m_timeStep;
 	int		m_stepCount;
 	int		m_dispatchFunc;
-	btScalar	m_timeOfImpact;
+	mutable btScalar	m_timeOfImpact;
 	bool	m_useContinuous;
 	class btIDebugDraw*	m_debugDraw;
 	bool	m_enableSatConvex;
 	bool	m_enableSPU;
+	bool	m_useEpa;
+	btScalar	m_allowedCcdPenetration;
 	btStackAlloc*	m_stackAllocator;
 	
 };
 
-/// btDispatcher can be used in combination with broadphase to dispatch overlapping pairs.
-/// For example for pairwise collision detection or user callbacks (game logic).
+///The btDispatcher interface class can be used in combination with broadphase to dispatch calculations for overlapping pairs.
+///For example for pairwise collision detection, calculating contact points stored in btPersistentManifold or user callbacks (game logic).
 class btDispatcher
 {
 
@@ -81,12 +85,18 @@ public:
 
 	virtual bool	needsResponse(btCollisionObject* body0,btCollisionObject* body1)=0;
 
-	virtual void	dispatchAllCollisionPairs(btOverlappingPairCache* pairCache,btDispatcherInfo& dispatchInfo)=0;
+	virtual void	dispatchAllCollisionPairs(btOverlappingPairCache* pairCache,const btDispatcherInfo& dispatchInfo,btDispatcher* dispatcher)  =0;
 
 	virtual int getNumManifolds() const = 0;
 
 	virtual btPersistentManifold* getManifoldByIndexInternal(int index) = 0;
 
+	virtual	btPersistentManifold**	getInternalManifoldPointer() = 0;
+
+	virtual	void* allocateCollisionAlgorithm(int size)  = 0;
+
+	virtual	void freeCollisionAlgorithm(void* ptr) = 0;
+
 };
 
 
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp
new file mode 100644
index 00000000000..3f866ab7c5f
--- /dev/null
+++ b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp
@@ -0,0 +1,466 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btMultiSapBroadphase.h"
+
+#include "btSimpleBroadphase.h"
+#include "LinearMath/btAabbUtil2.h"
+#include "btQuantizedBvh.h"
+
+///	btSapBroadphaseArray	m_sapBroadphases;
+
+///	btOverlappingPairCache*	m_overlappingPairs;
+extern int gOverlappingPairs;
+
+/*
+class btMultiSapSortedOverlappingPairCache : public btSortedOverlappingPairCache
+{
+public:
+
+	virtual btBroadphasePair*	addOverlappingPair(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1)
+	{
+		return btSortedOverlappingPairCache::addOverlappingPair((btBroadphaseProxy*)proxy0->m_multiSapParentProxy,(btBroadphaseProxy*)proxy1->m_multiSapParentProxy);
+	}
+};
+
+*/
+
+btMultiSapBroadphase::btMultiSapBroadphase(int /*maxProxies*/,btOverlappingPairCache* pairCache)
+:m_overlappingPairs(pairCache),
+m_optimizedAabbTree(0),
+m_ownsPairCache(false),
+m_invalidPair(0)
+{
+	if (!m_overlappingPairs)
+	{
+		m_ownsPairCache = true;
+		void* mem = btAlignedAlloc(sizeof(btSortedOverlappingPairCache),16);
+		m_overlappingPairs = new (mem)btSortedOverlappingPairCache();
+	}
+
+	struct btMultiSapOverlapFilterCallback : public btOverlapFilterCallback
+	{
+		virtual ~btMultiSapOverlapFilterCallback()
+		{}
+		// return true when pairs need collision
+		virtual bool	needBroadphaseCollision(btBroadphaseProxy* childProxy0,btBroadphaseProxy* childProxy1) const
+		{
+			btBroadphaseProxy* multiProxy0 = (btBroadphaseProxy*)childProxy0->m_multiSapParentProxy;
+			btBroadphaseProxy* multiProxy1 = (btBroadphaseProxy*)childProxy1->m_multiSapParentProxy;
+			
+			bool collides = (multiProxy0->m_collisionFilterGroup & multiProxy1->m_collisionFilterMask) != 0;
+			collides = collides && (multiProxy1->m_collisionFilterGroup & multiProxy0->m_collisionFilterMask);
+	
+			return collides;
+		}
+	};
+
+	void* mem = btAlignedAlloc(sizeof(btMultiSapOverlapFilterCallback),16);
+	m_filterCallback = new (mem)btMultiSapOverlapFilterCallback();
+
+	m_overlappingPairs->setOverlapFilterCallback(m_filterCallback);
+//	mem = btAlignedAlloc(sizeof(btSimpleBroadphase),16);
+//	m_simpleBroadphase = new (mem) btSimpleBroadphase(maxProxies,m_overlappingPairs);
+}
+
+btMultiSapBroadphase::~btMultiSapBroadphase()
+{
+	if (m_ownsPairCache)
+	{
+		m_overlappingPairs->~btOverlappingPairCache();
+		btAlignedFree(m_overlappingPairs);
+	}
+}
+
+
+void	btMultiSapBroadphase::buildTree(const btVector3& bvhAabbMin,const btVector3& bvhAabbMax)
+{
+	m_optimizedAabbTree = new btQuantizedBvh();
+	m_optimizedAabbTree->setQuantizationValues(bvhAabbMin,bvhAabbMax);
+	QuantizedNodeArray&	nodes = m_optimizedAabbTree->getLeafNodeArray();
+	for (int i=0;i<m_sapBroadphases.size();i++)
+	{
+		btQuantizedBvhNode node;
+		btVector3 aabbMin,aabbMax;
+		m_sapBroadphases[i]->getBroadphaseAabb(aabbMin,aabbMax);
+		m_optimizedAabbTree->quantize(&node.m_quantizedAabbMin[0],aabbMin,0);
+		m_optimizedAabbTree->quantize(&node.m_quantizedAabbMax[0],aabbMax,1);
+		int partId = 0;
+		node.m_escapeIndexOrTriangleIndex = (partId<<(31-MAX_NUM_PARTS_IN_BITS)) | i;
+		nodes.push_back(node);
+	}
+	m_optimizedAabbTree->buildInternal();
+}
+
+btBroadphaseProxy*	btMultiSapBroadphase::createProxy(  const btVector3& aabbMin,  const btVector3& aabbMax,int shapeType,void* userPtr, short int collisionFilterGroup,short int collisionFilterMask, btDispatcher* dispatcher,void* /*ignoreMe*/)
+{
+	//void* ignoreMe -> we could think of recursive multi-sap, if someone is interested
+
+	void* mem = btAlignedAlloc(sizeof(btMultiSapProxy),16);
+	btMultiSapProxy* proxy = new (mem)btMultiSapProxy(aabbMin,  aabbMax,shapeType,userPtr, collisionFilterGroup,collisionFilterMask);
+	m_multiSapProxies.push_back(proxy);
+
+	///this should deal with inserting/removal into child broadphases
+	setAabb(proxy,aabbMin,aabbMax,dispatcher);
+	return proxy;
+}
+
+void	btMultiSapBroadphase::destroyProxy(btBroadphaseProxy* /*proxy*/,btDispatcher* /*dispatcher*/)
+{
+	///not yet
+	btAssert(0);
+
+}
+
+
+void	btMultiSapBroadphase::addToChildBroadphase(btMultiSapProxy* parentMultiSapProxy, btBroadphaseProxy* childProxy, btBroadphaseInterface*	childBroadphase)
+{
+	void* mem = btAlignedAlloc(sizeof(btBridgeProxy),16);
+	btBridgeProxy* bridgeProxyRef = new(mem) btBridgeProxy;
+	bridgeProxyRef->m_childProxy = childProxy;
+	bridgeProxyRef->m_childBroadphase = childBroadphase;
+	parentMultiSapProxy->m_bridgeProxies.push_back(bridgeProxyRef);
+}
+
+
+bool boxIsContainedWithinBox(const btVector3& amin,const btVector3& amax,const btVector3& bmin,const btVector3& bmax);
+bool boxIsContainedWithinBox(const btVector3& amin,const btVector3& amax,const btVector3& bmin,const btVector3& bmax)
+{
+return
+amin.getX() >= bmin.getX() && amax.getX() <= bmax.getX() &&
+amin.getY() >= bmin.getY() && amax.getY() <= bmax.getY() &&
+amin.getZ() >= bmin.getZ() && amax.getZ() <= bmax.getZ();
+}
+
+
+
+
+
+
+//#include <stdio.h>
+
+void	btMultiSapBroadphase::setAabb(btBroadphaseProxy* proxy,const btVector3& aabbMin,const btVector3& aabbMax, btDispatcher* dispatcher)
+{
+	btMultiSapProxy* multiProxy = static_cast<btMultiSapProxy*>(proxy);
+	multiProxy->m_aabbMin = aabbMin;
+	multiProxy->m_aabbMax = aabbMax;
+	
+	
+//	bool fullyContained = false;
+//	bool alreadyInSimple = false;
+	
+
+
+	
+	struct MyNodeOverlapCallback : public btNodeOverlapCallback
+	{
+		btMultiSapBroadphase*	m_multiSap;
+		btMultiSapProxy*		m_multiProxy;
+		btDispatcher*			m_dispatcher;
+
+		MyNodeOverlapCallback(btMultiSapBroadphase* multiSap,btMultiSapProxy* multiProxy,btDispatcher* dispatcher)
+			:m_multiSap(multiSap),
+			m_multiProxy(multiProxy),
+			m_dispatcher(dispatcher)
+		{
+
+		}
+
+		virtual void processNode(int /*nodeSubPart*/, int broadphaseIndex)
+		{
+			btBroadphaseInterface* childBroadphase = m_multiSap->getBroadphaseArray()[broadphaseIndex];
+
+			int containingBroadphaseIndex = -1;
+			//already found?
+			for (int i=0;i<m_multiProxy->m_bridgeProxies.size();i++)
+			{
+
+				if (m_multiProxy->m_bridgeProxies[i]->m_childBroadphase == childBroadphase)
+				{
+					containingBroadphaseIndex = i;
+					break;
+				}
+			}
+			if (containingBroadphaseIndex<0)
+			{
+				//add it
+				btBroadphaseProxy* childProxy = childBroadphase->createProxy(m_multiProxy->m_aabbMin,m_multiProxy->m_aabbMax,m_multiProxy->m_shapeType,m_multiProxy->m_clientObject,m_multiProxy->m_collisionFilterGroup,m_multiProxy->m_collisionFilterMask, m_dispatcher,m_multiProxy);
+				m_multiSap->addToChildBroadphase(m_multiProxy,childProxy,childBroadphase);
+
+			}
+		}
+	};
+
+	MyNodeOverlapCallback	myNodeCallback(this,multiProxy,dispatcher);
+
+
+
+	
+	m_optimizedAabbTree->reportAabbOverlappingNodex(&myNodeCallback,aabbMin,aabbMax);
+	int i;
+
+	for ( i=0;i<multiProxy->m_bridgeProxies.size();i++)
+	{
+		btVector3 worldAabbMin,worldAabbMax;
+		multiProxy->m_bridgeProxies[i]->m_childBroadphase->getBroadphaseAabb(worldAabbMin,worldAabbMax);
+		bool overlapsBroadphase = TestAabbAgainstAabb2(worldAabbMin,worldAabbMax,multiProxy->m_aabbMin,multiProxy->m_aabbMax);
+		if (!overlapsBroadphase)
+		{
+			//remove it now
+			btBridgeProxy* bridgeProxy = multiProxy->m_bridgeProxies[i];
+
+			btBroadphaseProxy* childProxy = bridgeProxy->m_childProxy;
+			bridgeProxy->m_childBroadphase->destroyProxy(childProxy,dispatcher);
+			
+			multiProxy->m_bridgeProxies.swap( i,multiProxy->m_bridgeProxies.size()-1);
+			multiProxy->m_bridgeProxies.pop_back();
+
+		}
+	}
+
+
+	/*
+
+	if (1)
+	{
+
+		//find broadphase that contain this multiProxy
+		int numChildBroadphases = getBroadphaseArray().size();
+		for (int i=0;i<numChildBroadphases;i++)
+		{
+			btBroadphaseInterface* childBroadphase = getBroadphaseArray()[i];
+			btVector3 worldAabbMin,worldAabbMax;
+			childBroadphase->getBroadphaseAabb(worldAabbMin,worldAabbMax);
+			bool overlapsBroadphase = TestAabbAgainstAabb2(worldAabbMin,worldAabbMax,multiProxy->m_aabbMin,multiProxy->m_aabbMax);
+			
+		//	fullyContained = fullyContained || boxIsContainedWithinBox(worldAabbMin,worldAabbMax,multiProxy->m_aabbMin,multiProxy->m_aabbMax);
+			int containingBroadphaseIndex = -1;
+			
+			//if already contains this
+			
+			for (int i=0;i<multiProxy->m_bridgeProxies.size();i++)
+			{
+				if (multiProxy->m_bridgeProxies[i]->m_childBroadphase == childBroadphase)
+				{
+					containingBroadphaseIndex = i;
+				}
+				alreadyInSimple = alreadyInSimple || (multiProxy->m_bridgeProxies[i]->m_childBroadphase == m_simpleBroadphase);
+			}
+
+			if (overlapsBroadphase)
+			{
+				if (containingBroadphaseIndex<0)
+				{
+					btBroadphaseProxy* childProxy = childBroadphase->createProxy(aabbMin,aabbMax,multiProxy->m_shapeType,multiProxy->m_clientObject,multiProxy->m_collisionFilterGroup,multiProxy->m_collisionFilterMask, dispatcher);
+					childProxy->m_multiSapParentProxy = multiProxy;
+					addToChildBroadphase(multiProxy,childProxy,childBroadphase);
+				}
+			} else
+			{
+				if (containingBroadphaseIndex>=0)
+				{
+					//remove
+					btBridgeProxy* bridgeProxy = multiProxy->m_bridgeProxies[containingBroadphaseIndex];
+
+					btBroadphaseProxy* childProxy = bridgeProxy->m_childProxy;
+					bridgeProxy->m_childBroadphase->destroyProxy(childProxy,dispatcher);
+					
+					multiProxy->m_bridgeProxies.swap( containingBroadphaseIndex,multiProxy->m_bridgeProxies.size()-1);
+					multiProxy->m_bridgeProxies.pop_back();
+				}
+			}
+		}
+
+
+		///If we are in no other child broadphase, stick the proxy in the global 'simple' broadphase (brute force)
+		///hopefully we don't end up with many entries here (can assert/provide feedback on stats)
+		if (0)//!multiProxy->m_bridgeProxies.size())
+		{
+			///we don't pass the userPtr but our multisap proxy. We need to patch this, before processing an actual collision
+			///this is needed to be able to calculate the aabb overlap
+			btBroadphaseProxy* childProxy = m_simpleBroadphase->createProxy(aabbMin,aabbMax,multiProxy->m_shapeType,multiProxy->m_clientObject,multiProxy->m_collisionFilterGroup,multiProxy->m_collisionFilterMask, dispatcher);
+			childProxy->m_multiSapParentProxy = multiProxy;
+			addToChildBroadphase(multiProxy,childProxy,m_simpleBroadphase);
+		}
+	}
+
+	if (!multiProxy->m_bridgeProxies.size())
+	{
+		///we don't pass the userPtr but our multisap proxy. We need to patch this, before processing an actual collision
+		///this is needed to be able to calculate the aabb overlap
+		btBroadphaseProxy* childProxy = m_simpleBroadphase->createProxy(aabbMin,aabbMax,multiProxy->m_shapeType,multiProxy->m_clientObject,multiProxy->m_collisionFilterGroup,multiProxy->m_collisionFilterMask, dispatcher);
+		childProxy->m_multiSapParentProxy = multiProxy;
+		addToChildBroadphase(multiProxy,childProxy,m_simpleBroadphase);
+	}
+*/
+
+
+	//update
+	for ( i=0;i<multiProxy->m_bridgeProxies.size();i++)
+	{
+		btBridgeProxy* bridgeProxyRef = multiProxy->m_bridgeProxies[i];
+		bridgeProxyRef->m_childBroadphase->setAabb(bridgeProxyRef->m_childProxy,aabbMin,aabbMax,dispatcher);
+	}
+
+}
+bool stopUpdating=false;
+
+
+
+class btMultiSapBroadphasePairSortPredicate
+{
+	public:
+
+		bool operator() ( const btBroadphasePair& a1, const btBroadphasePair& b1 )
+		{
+				btMultiSapBroadphase::btMultiSapProxy* aProxy0 = a1.m_pProxy0 ? (btMultiSapBroadphase::btMultiSapProxy*)a1.m_pProxy0->m_multiSapParentProxy : 0;
+				btMultiSapBroadphase::btMultiSapProxy* aProxy1 = a1.m_pProxy1 ? (btMultiSapBroadphase::btMultiSapProxy*)a1.m_pProxy1->m_multiSapParentProxy : 0;
+				btMultiSapBroadphase::btMultiSapProxy* bProxy0 = b1.m_pProxy0 ? (btMultiSapBroadphase::btMultiSapProxy*)b1.m_pProxy0->m_multiSapParentProxy : 0;
+				btMultiSapBroadphase::btMultiSapProxy* bProxy1 = b1.m_pProxy1 ? (btMultiSapBroadphase::btMultiSapProxy*)b1.m_pProxy1->m_multiSapParentProxy : 0;
+
+				 return aProxy0 > bProxy0 || 
+					(aProxy0 == bProxy0 && aProxy1 > bProxy1) ||
+					(aProxy0 == bProxy0 && aProxy1 == bProxy1 && a1.m_algorithm > b1.m_algorithm); 
+		}
+};
+
+
+        ///calculateOverlappingPairs is optional: incremental algorithms (sweep and prune) might do it during the set aabb
+void    btMultiSapBroadphase::calculateOverlappingPairs(btDispatcher* dispatcher)
+{
+
+//	m_simpleBroadphase->calculateOverlappingPairs(dispatcher);
+
+	if (!stopUpdating && getOverlappingPairCache()->hasDeferredRemoval())
+	{
+	
+		btBroadphasePairArray&	overlappingPairArray = getOverlappingPairCache()->getOverlappingPairArray();
+
+	//	quicksort(overlappingPairArray,0,overlappingPairArray.size());
+
+		overlappingPairArray.quickSort(btMultiSapBroadphasePairSortPredicate());
+
+		//perform a sort, to find duplicates and to sort 'invalid' pairs to the end
+	//	overlappingPairArray.heapSort(btMultiSapBroadphasePairSortPredicate());
+
+		overlappingPairArray.resize(overlappingPairArray.size() - m_invalidPair);
+		m_invalidPair = 0;
+
+		
+		int i;
+
+		btBroadphasePair previousPair;
+		previousPair.m_pProxy0 = 0;
+		previousPair.m_pProxy1 = 0;
+		previousPair.m_algorithm = 0;
+		
+		
+		for (i=0;i<overlappingPairArray.size();i++)
+		{
+		
+			btBroadphasePair& pair = overlappingPairArray[i];
+
+			btMultiSapProxy* aProxy0 = pair.m_pProxy0 ? (btMultiSapProxy*)pair.m_pProxy0->m_multiSapParentProxy : 0;
+			btMultiSapProxy* aProxy1 = pair.m_pProxy1 ? (btMultiSapProxy*)pair.m_pProxy1->m_multiSapParentProxy : 0;
+			btMultiSapProxy* bProxy0 = previousPair.m_pProxy0 ? (btMultiSapProxy*)previousPair.m_pProxy0->m_multiSapParentProxy : 0;
+			btMultiSapProxy* bProxy1 = previousPair.m_pProxy1 ? (btMultiSapProxy*)previousPair.m_pProxy1->m_multiSapParentProxy : 0;
+
+			bool isDuplicate = (aProxy0 == bProxy0) && (aProxy1 == bProxy1);
+			
+			previousPair = pair;
+
+			bool needsRemoval = false;
+
+			if (!isDuplicate)
+			{
+				bool hasOverlap = testAabbOverlap(pair.m_pProxy0,pair.m_pProxy1);
+
+				if (hasOverlap)
+				{
+					needsRemoval = false;//callback->processOverlap(pair);
+				} else
+				{
+					needsRemoval = true;
+				}
+			} else
+			{
+				//remove duplicate
+				needsRemoval = true;
+				//should have no algorithm
+				btAssert(!pair.m_algorithm);
+			}
+			
+			if (needsRemoval)
+			{
+				getOverlappingPairCache()->cleanOverlappingPair(pair,dispatcher);
+
+		//		m_overlappingPairArray.swap(i,m_overlappingPairArray.size()-1);
+		//		m_overlappingPairArray.pop_back();
+				pair.m_pProxy0 = 0;
+				pair.m_pProxy1 = 0;
+				m_invalidPair++;
+				gOverlappingPairs--;
+			} 
+			
+		}
+
+	///if you don't like to skip the invalid pairs in the array, execute following code:
+	#define CLEAN_INVALID_PAIRS 1
+	#ifdef CLEAN_INVALID_PAIRS
+
+		//perform a sort, to sort 'invalid' pairs to the end
+		//overlappingPairArray.heapSort(btMultiSapBroadphasePairSortPredicate());
+		overlappingPairArray.quickSort(btMultiSapBroadphasePairSortPredicate());
+
+		overlappingPairArray.resize(overlappingPairArray.size() - m_invalidPair);
+		m_invalidPair = 0;
+	#endif//CLEAN_INVALID_PAIRS
+		
+		//printf("overlappingPairArray.size()=%d\n",overlappingPairArray.size());
+	}
+
+
+}
+
+
+bool	btMultiSapBroadphase::testAabbOverlap(btBroadphaseProxy* childProxy0,btBroadphaseProxy* childProxy1)
+{
+	btMultiSapProxy* multiSapProxy0 = (btMultiSapProxy*)childProxy0->m_multiSapParentProxy;
+		btMultiSapProxy* multiSapProxy1 = (btMultiSapProxy*)childProxy1->m_multiSapParentProxy;
+
+		return	TestAabbAgainstAabb2(multiSapProxy0->m_aabbMin,multiSapProxy0->m_aabbMax,
+			multiSapProxy1->m_aabbMin,multiSapProxy1->m_aabbMax);
+		
+}
+
+
+void	btMultiSapBroadphase::printStats()
+{
+/*	printf("---------------------------------\n");
+	
+		printf("btMultiSapBroadphase.h\n");
+		printf("numHandles = %d\n",m_multiSapProxies.size());
+			//find broadphase that contain this multiProxy
+		int numChildBroadphases = getBroadphaseArray().size();
+		for (int i=0;i<numChildBroadphases;i++)
+		{
+
+			btBroadphaseInterface* childBroadphase = getBroadphaseArray()[i];
+			childBroadphase->printStats();
+
+		}
+		*/
+
+}
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h
new file mode 100644
index 00000000000..a0c002de856
--- /dev/null
+++ b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h
@@ -0,0 +1,144 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+#ifndef BT_MULTI_SAP_BROADPHASE
+#define BT_MULTI_SAP_BROADPHASE
+
+#include "btBroadphaseInterface.h"
+#include "LinearMath/btAlignedObjectArray.h"
+#include "btOverlappingPairCache.h"
+
+
+class btBroadphaseInterface;
+class btSimpleBroadphase;
+
+
+typedef btAlignedObjectArray<btBroadphaseInterface*> btSapBroadphaseArray;
+
+///The btMultiSapBroadphase is a broadphase that contains multiple SAP broadphases.
+///The user can add SAP broadphases that cover the world. A btBroadphaseProxy can be in multiple child broadphases at the same time.
+///A btQuantizedBvh acceleration structures finds overlapping SAPs for each btBroadphaseProxy.
+///See http://www.continuousphysics.com/Bullet/phpBB2/viewtopic.php?t=328
+///and http://www.continuousphysics.com/Bullet/phpBB2/viewtopic.php?t=1329
+class btMultiSapBroadphase :public btBroadphaseInterface
+{
+	btSapBroadphaseArray	m_sapBroadphases;
+	
+	btSimpleBroadphase*		m_simpleBroadphase;
+
+	btOverlappingPairCache*	m_overlappingPairs;
+
+	class btQuantizedBvh*			m_optimizedAabbTree;
+
+
+	bool					m_ownsPairCache;
+	
+	btOverlapFilterCallback*	m_filterCallback;
+
+	int			m_invalidPair;
+
+	struct	btBridgeProxy
+	{
+		btBroadphaseProxy*		m_childProxy;
+		btBroadphaseInterface*	m_childBroadphase;
+	};
+
+
+public:
+
+	struct	btMultiSapProxy	: public btBroadphaseProxy
+	{
+
+		///array with all the entries that this proxy belongs to
+		btAlignedObjectArray<btBridgeProxy*> m_bridgeProxies;
+		btVector3	m_aabbMin;
+		btVector3	m_aabbMax;
+
+		int	m_shapeType;
+
+/*		void*	m_userPtr;
+		short int	m_collisionFilterGroup;
+		short int	m_collisionFilterMask;
+*/
+		btMultiSapProxy(const btVector3& aabbMin,  const btVector3& aabbMax,int shapeType,void* userPtr, short int collisionFilterGroup,short int collisionFilterMask)
+			:btBroadphaseProxy(userPtr,collisionFilterGroup,collisionFilterMask),
+			m_aabbMin(aabbMin),
+			m_aabbMax(aabbMax),
+			m_shapeType(shapeType)
+		{
+			m_multiSapParentProxy =this;
+		}
+
+		
+	};
+
+protected:
+
+
+	btAlignedObjectArray<btMultiSapProxy*> m_multiSapProxies;
+
+public:
+
+	btMultiSapBroadphase(int maxProxies = 16384,btOverlappingPairCache* pairCache=0);
+
+
+	btSapBroadphaseArray&	getBroadphaseArray()
+	{
+		return m_sapBroadphases;
+	}
+
+	const btSapBroadphaseArray&	getBroadphaseArray() const
+	{
+		return m_sapBroadphases;
+	}
+
+	virtual ~btMultiSapBroadphase();
+
+	virtual btBroadphaseProxy*	createProxy(  const btVector3& aabbMin,  const btVector3& aabbMax,int shapeType,void* userPtr, short int collisionFilterGroup,short int collisionFilterMask, btDispatcher* dispatcher,void* multiSapProxy);
+	virtual void	destroyProxy(btBroadphaseProxy* proxy,btDispatcher* dispatcher);
+	virtual void	setAabb(btBroadphaseProxy* proxy,const btVector3& aabbMin,const btVector3& aabbMax, btDispatcher* dispatcher);
+
+	void	addToChildBroadphase(btMultiSapProxy* parentMultiSapProxy, btBroadphaseProxy* childProxy, btBroadphaseInterface*	childBroadphase);
+
+	///calculateOverlappingPairs is optional: incremental algorithms (sweep and prune) might do it during the set aabb
+	virtual void	calculateOverlappingPairs(btDispatcher* dispatcher);
+
+	bool	testAabbOverlap(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1);
+
+	virtual	btOverlappingPairCache*	getOverlappingPairCache()
+	{
+		return m_overlappingPairs;
+	}
+	virtual	const btOverlappingPairCache*	getOverlappingPairCache() const
+	{
+		return m_overlappingPairs;
+	}
+
+	///getAabb returns the axis aligned bounding box in the 'global' coordinate frame
+	///will add some transform later
+	virtual void getBroadphaseAabb(btVector3& aabbMin,btVector3& aabbMax) const
+	{
+		aabbMin.setValue(-1e30f,-1e30f,-1e30f);
+		aabbMax.setValue(1e30f,1e30f,1e30f);
+	}
+
+	void	buildTree(const btVector3& bvhAabbMin,const btVector3& bvhAabbMax);
+
+	virtual void	printStats();
+
+	void quicksort (btBroadphasePairArray& a, int lo, int hi);
+
+};
+
+#endif //BT_MULTI_SAP_BROADPHASE
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp
index 60f0a41a9d7..ff65cdde79f 100644
--- a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp
+++ b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp
@@ -1,4 +1,3 @@
-
 /*
 Bullet Continuous Collision Detection and Physics Library
 Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
@@ -21,44 +20,43 @@ subject to the following restrictions:
 #include "btDispatcher.h"
 #include "btCollisionAlgorithm.h"
 
+#include <stdio.h>
+
 int	gOverlappingPairs = 0;
 
-btOverlappingPairCache::btOverlappingPairCache():
-m_blockedForChanges(false),
-m_overlapFilterCallback(0)
-//m_NumOverlapBroadphasePair(0)
+int gRemovePairs =0;
+int gAddedPairs =0;
+int gFindPairs =0;
+
+
+
+
+btHashedOverlappingPairCache::btHashedOverlappingPairCache():
+	m_overlapFilterCallback(0),
+	m_blockedForChanges(false)
 {
+	int initialAllocatedSize= 2;
+	m_overlappingPairArray.reserve(initialAllocatedSize);
+	growTables();
 }
 
 
-btOverlappingPairCache::~btOverlappingPairCache()
+
+
+btHashedOverlappingPairCache::~btHashedOverlappingPairCache()
 {
 	//todo/test: show we erase/delete data, or is it automatic
 }
 
 
-void	btOverlappingPairCache::removeOverlappingPair(btBroadphasePair& findPair)
-{
-	
-	int findIndex = m_overlappingPairArray.findLinearSearch(findPair);
-	if (findIndex < m_overlappingPairArray.size())
-	{
-		gOverlappingPairs--;
-		btBroadphasePair& pair = m_overlappingPairArray[findIndex];
-		cleanOverlappingPair(pair);
-		
-		m_overlappingPairArray.swap(findIndex,m_overlappingPairArray.size()-1);
-		m_overlappingPairArray.pop_back();
-	}
-}
 
-
-void	btOverlappingPairCache::cleanOverlappingPair(btBroadphasePair& pair)
+void	btHashedOverlappingPairCache::cleanOverlappingPair(btBroadphasePair& pair,btDispatcher* dispatcher)
 {
 	if (pair.m_algorithm)
 	{
 		{
-			delete pair.m_algorithm;;
+			pair.m_algorithm->~btCollisionAlgorithm();
+			dispatcher->freeCollisionAlgorithm(pair.m_algorithm);
 			pair.m_algorithm=0;
 		}
 	}
@@ -67,60 +65,20 @@ void	btOverlappingPairCache::cleanOverlappingPair(btBroadphasePair& pair)
 
 
 
-
-void	btOverlappingPairCache::addOverlappingPair(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1)
-{
-	//don't add overlap with own
-	assert(proxy0 != proxy1);
-
-	if (!needsBroadphaseCollision(proxy0,proxy1))
-		return;
-
-
-	btBroadphasePair pair(*proxy0,*proxy1);
-	
-	m_overlappingPairArray.push_back(pair);
-	gOverlappingPairs++;
-	
-}
-
-///this findPair becomes really slow. Either sort the list to speedup the query, or
-///use a different solution. It is mainly used for Removing overlapping pairs. Removal could be delayed.
-///we could keep a linked list in each proxy, and store pair in one of the proxies (with lowest memory address)
-///Also we can use a 2D bitmap, which can be useful for a future GPU implementation
- btBroadphasePair*	btOverlappingPairCache::findPair(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1)
-{
-	if (!needsBroadphaseCollision(proxy0,proxy1))
-		return 0;
-
-	btBroadphasePair tmpPair(*proxy0,*proxy1);
-	int findIndex = m_overlappingPairArray.findLinearSearch(tmpPair);
-
-	if (findIndex < m_overlappingPairArray.size())
-	{
-		//assert(it != m_overlappingPairSet.end());
-		 btBroadphasePair* pair = &m_overlappingPairArray[findIndex];
-		return pair;
-	}
-	return 0;
-}
-
-
-
-
-
-void	btOverlappingPairCache::cleanProxyFromPairs(btBroadphaseProxy* proxy)
+void	btHashedOverlappingPairCache::cleanProxyFromPairs(btBroadphaseProxy* proxy,btDispatcher* dispatcher)
 {
 
 	class	CleanPairCallback : public btOverlapCallback
 	{
 		btBroadphaseProxy* m_cleanProxy;
 		btOverlappingPairCache*	m_pairCache;
+		btDispatcher* m_dispatcher;
 
 	public:
-		CleanPairCallback(btBroadphaseProxy* cleanProxy,btOverlappingPairCache* pairCache)
+		CleanPairCallback(btBroadphaseProxy* cleanProxy,btOverlappingPairCache* pairCache,btDispatcher* dispatcher)
 			:m_cleanProxy(cleanProxy),
-			m_pairCache(pairCache)
+			m_pairCache(pairCache),
+			m_dispatcher(dispatcher)
 		{
 		}
 		virtual	bool	processOverlap(btBroadphasePair& pair)
@@ -128,22 +86,23 @@ void	btOverlappingPairCache::cleanProxyFromPairs(btBroadphaseProxy* proxy)
 			if ((pair.m_pProxy0 == m_cleanProxy) ||
 				(pair.m_pProxy1 == m_cleanProxy))
 			{
-				m_pairCache->cleanOverlappingPair(pair);
+				m_pairCache->cleanOverlappingPair(pair,m_dispatcher);
 			}
 			return false;
 		}
 		
 	};
 
-	CleanPairCallback cleanPairs(proxy,this);
+	CleanPairCallback cleanPairs(proxy,this,dispatcher);
 
-	processAllOverlappingPairs(&cleanPairs);
+	processAllOverlappingPairs(&cleanPairs,dispatcher);
 
 }
 
 
 
-void	btOverlappingPairCache::removeOverlappingPairsContainingProxy(btBroadphaseProxy* proxy)
+
+void	btHashedOverlappingPairCache::removeOverlappingPairsContainingProxy(btBroadphaseProxy* proxy,btDispatcher* dispatcher)
 {
 
 	class	RemovePairCallback : public btOverlapCallback
@@ -166,12 +125,346 @@ void	btOverlappingPairCache::removeOverlappingPairsContainingProxy(btBroadphaseP
 
 	RemovePairCallback removeCallback(proxy);
 
-	processAllOverlappingPairs(&removeCallback);
+	processAllOverlappingPairs(&removeCallback,dispatcher);
 }
 
 
 
-void	btOverlappingPairCache::processAllOverlappingPairs(btOverlapCallback* callback)
+
+
+btBroadphasePair* btHashedOverlappingPairCache::findPair(btBroadphaseProxy* proxy0, btBroadphaseProxy* proxy1)
+{
+	gFindPairs++;
+	if(proxy0>proxy1) btSwap(proxy0,proxy1);
+	int proxyId1 = proxy0->getUid();
+	int proxyId2 = proxy1->getUid();
+
+	/*if (proxyId1 > proxyId2) 
+		btSwap(proxyId1, proxyId2);*/
+
+	int hash = static_cast<int>(getHash(static_cast<unsigned int>(proxyId1), static_cast<unsigned int>(proxyId2)) & (m_overlappingPairArray.capacity()-1));
+
+	if (hash >= m_hashTable.size())
+	{
+		return NULL;
+	}
+
+	int index = m_hashTable[hash];
+	while (index != BT_NULL_PAIR && equalsPair(m_overlappingPairArray[index], proxyId1, proxyId2) == false)
+	{
+		index = m_next[index];
+	}
+
+	if (index == BT_NULL_PAIR)
+	{
+		return NULL;
+	}
+
+	btAssert(index < m_overlappingPairArray.size());
+
+	return &m_overlappingPairArray[index];
+}
+
+//#include <stdio.h>
+
+void	btHashedOverlappingPairCache::growTables()
+{
+
+	int newCapacity = m_overlappingPairArray.capacity();
+
+	if (m_hashTable.size() < newCapacity)
+	{
+		//grow hashtable and next table
+		int curHashtableSize = m_hashTable.size();
+
+		m_hashTable.resize(newCapacity);
+		m_next.resize(newCapacity);
+
+
+		int i;
+
+		for (i= 0; i < newCapacity; ++i)
+		{
+			m_hashTable[i] = BT_NULL_PAIR;
+		}
+		for (i = 0; i < newCapacity; ++i)
+		{
+			m_next[i] = BT_NULL_PAIR;
+		}
+
+		for(i=0;i<curHashtableSize;i++)
+		{
+	
+			const btBroadphasePair& pair = m_overlappingPairArray[i];
+			int proxyId1 = pair.m_pProxy0->getUid();
+			int proxyId2 = pair.m_pProxy1->getUid();
+			/*if (proxyId1 > proxyId2) 
+				btSwap(proxyId1, proxyId2);*/
+			int	hashValue = static_cast<int>(getHash(static_cast<unsigned int>(proxyId1),static_cast<unsigned int>(proxyId2)) & (m_overlappingPairArray.capacity()-1));	// New hash value with new mask
+			m_next[i] = m_hashTable[hashValue];
+			m_hashTable[hashValue] = i;
+		}
+
+
+	}
+}
+
+btBroadphasePair* btHashedOverlappingPairCache::internalAddPair(btBroadphaseProxy* proxy0, btBroadphaseProxy* proxy1)
+{
+	if(proxy0>proxy1) btSwap(proxy0,proxy1);
+	int proxyId1 = proxy0->getUid();
+	int proxyId2 = proxy1->getUid();
+
+	/*if (proxyId1 > proxyId2) 
+		btSwap(proxyId1, proxyId2);*/
+
+	int	hash = static_cast<int>(getHash(static_cast<unsigned int>(proxyId1),static_cast<unsigned int>(proxyId2)) & (m_overlappingPairArray.capacity()-1));	// New hash value with new mask
+
+
+	btBroadphasePair* pair = internalFindPair(proxy0, proxy1, hash);
+	if (pair != NULL)
+	{
+		return pair;
+	}
+	/*for(int i=0;i<m_overlappingPairArray.size();++i)
+		{
+		if(	(m_overlappingPairArray[i].m_pProxy0==proxy0)&&
+			(m_overlappingPairArray[i].m_pProxy1==proxy1))
+			{
+			printf("Adding duplicated %u<>%u\r\n",proxyId1,proxyId2);
+			internalFindPair(proxy0, proxy1, hash);
+			}
+		}*/
+	int count = m_overlappingPairArray.size();
+	int oldCapacity = m_overlappingPairArray.capacity();
+	void* mem = &m_overlappingPairArray.expand();
+	int newCapacity = m_overlappingPairArray.capacity();
+
+	if (oldCapacity < newCapacity)
+	{
+		growTables();
+		//hash with new capacity
+		hash = static_cast<int>(getHash(static_cast<unsigned int>(proxyId1),static_cast<unsigned int>(proxyId2)) & (m_overlappingPairArray.capacity()-1));
+	}
+	
+	pair = new (mem) btBroadphasePair(*proxy0,*proxy1);
+//	pair->m_pProxy0 = proxy0;
+//	pair->m_pProxy1 = proxy1;
+	pair->m_algorithm = 0;
+	pair->m_userInfo = 0;
+	
+
+	m_next[count] = m_hashTable[hash];
+	m_hashTable[hash] = count;
+
+	return pair;
+}
+
+
+
+void* btHashedOverlappingPairCache::removeOverlappingPair(btBroadphaseProxy* proxy0, btBroadphaseProxy* proxy1,btDispatcher* dispatcher)
+{
+	gRemovePairs++;
+	if(proxy0>proxy1) btSwap(proxy0,proxy1);
+	int proxyId1 = proxy0->getUid();
+	int proxyId2 = proxy1->getUid();
+
+	/*if (proxyId1 > proxyId2) 
+		btSwap(proxyId1, proxyId2);*/
+
+	int	hash = static_cast<int>(getHash(static_cast<unsigned int>(proxyId1),static_cast<unsigned int>(proxyId2)) & (m_overlappingPairArray.capacity()-1));
+
+	btBroadphasePair* pair = internalFindPair(proxy0, proxy1, hash);
+	if (pair == NULL)
+	{
+		return 0;
+	}
+
+	cleanOverlappingPair(*pair,dispatcher);
+
+	void* userData = pair->m_userInfo;
+
+	btAssert(pair->m_pProxy0->getUid() == proxyId1);
+	btAssert(pair->m_pProxy1->getUid() == proxyId2);
+
+	int pairIndex = int(pair - &m_overlappingPairArray[0]);
+	btAssert(pairIndex < m_overlappingPairArray.size());
+
+	// Remove the pair from the hash table.
+	int index = m_hashTable[hash];
+	btAssert(index != BT_NULL_PAIR);
+
+	int previous = BT_NULL_PAIR;
+	while (index != pairIndex)
+	{
+		previous = index;
+		index = m_next[index];
+	}
+
+	if (previous != BT_NULL_PAIR)
+	{
+		btAssert(m_next[previous] == pairIndex);
+		m_next[previous] = m_next[pairIndex];
+	}
+	else
+	{
+		m_hashTable[hash] = m_next[pairIndex];
+	}
+
+	// We now move the last pair into spot of the
+	// pair being removed. We need to fix the hash
+	// table indices to support the move.
+
+	int lastPairIndex = m_overlappingPairArray.size() - 1;
+
+	// If the removed pair is the last pair, we are done.
+	if (lastPairIndex == pairIndex)
+	{
+		m_overlappingPairArray.pop_back();
+		return userData;
+	}
+
+	// Remove the last pair from the hash table.
+	const btBroadphasePair* last = &m_overlappingPairArray[lastPairIndex];
+		/* missing swap here too, Nat. */ 
+	int lastHash = static_cast<int>(getHash(static_cast<unsigned int>(last->m_pProxy0->getUid()), static_cast<unsigned int>(last->m_pProxy1->getUid())) & (m_overlappingPairArray.capacity()-1));
+
+	index = m_hashTable[lastHash];
+	btAssert(index != BT_NULL_PAIR);
+
+	previous = BT_NULL_PAIR;
+	while (index != lastPairIndex)
+	{
+		previous = index;
+		index = m_next[index];
+	}
+
+	if (previous != BT_NULL_PAIR)
+	{
+		btAssert(m_next[previous] == lastPairIndex);
+		m_next[previous] = m_next[lastPairIndex];
+	}
+	else
+	{
+		m_hashTable[lastHash] = m_next[lastPairIndex];
+	}
+
+	// Copy the last pair into the remove pair's spot.
+	m_overlappingPairArray[pairIndex] = m_overlappingPairArray[lastPairIndex];
+
+	// Insert the last pair into the hash table
+	m_next[pairIndex] = m_hashTable[lastHash];
+	m_hashTable[lastHash] = pairIndex;
+
+	m_overlappingPairArray.pop_back();
+
+	return userData;
+}
+//#include <stdio.h>
+
+void	btHashedOverlappingPairCache::processAllOverlappingPairs(btOverlapCallback* callback,btDispatcher* dispatcher)
+{
+
+	int i;
+
+//	printf("m_overlappingPairArray.size()=%d\n",m_overlappingPairArray.size());
+	for (i=0;i<m_overlappingPairArray.size();)
+	{
+	
+		btBroadphasePair* pair = &m_overlappingPairArray[i];
+		if (callback->processOverlap(*pair))
+		{
+			removeOverlappingPair(pair->m_pProxy0,pair->m_pProxy1,dispatcher);
+
+			gOverlappingPairs--;
+		} else
+		{
+			i++;
+		}
+	}
+}
+
+
+
+void*	btSortedOverlappingPairCache::removeOverlappingPair(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1, btDispatcher* dispatcher )
+{
+	if (!hasDeferredRemoval())
+	{
+		btBroadphasePair findPair(*proxy0,*proxy1);
+
+		int findIndex = m_overlappingPairArray.findLinearSearch(findPair);
+		if (findIndex < m_overlappingPairArray.size())
+		{
+			gOverlappingPairs--;
+			btBroadphasePair& pair = m_overlappingPairArray[findIndex];
+			void* userData = pair.m_userInfo;
+			cleanOverlappingPair(pair,dispatcher);
+			
+			m_overlappingPairArray.swap(findIndex,m_overlappingPairArray.capacity()-1);
+			m_overlappingPairArray.pop_back();
+			return userData;
+		}
+	}
+
+	return 0;
+}
+
+
+
+
+
+
+
+
+btBroadphasePair*	btSortedOverlappingPairCache::addOverlappingPair(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1)
+{
+	//don't add overlap with own
+	assert(proxy0 != proxy1);
+
+	if (!needsBroadphaseCollision(proxy0,proxy1))
+		return 0;
+	
+	void* mem = &m_overlappingPairArray.expand();
+	btBroadphasePair* pair = new (mem) btBroadphasePair(*proxy0,*proxy1);
+	gOverlappingPairs++;
+	gAddedPairs++;
+	return pair;
+	
+}
+
+///this findPair becomes really slow. Either sort the list to speedup the query, or
+///use a different solution. It is mainly used for Removing overlapping pairs. Removal could be delayed.
+///we could keep a linked list in each proxy, and store pair in one of the proxies (with lowest memory address)
+///Also we can use a 2D bitmap, which can be useful for a future GPU implementation
+ btBroadphasePair*	btSortedOverlappingPairCache::findPair(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1)
+{
+	if (!needsBroadphaseCollision(proxy0,proxy1))
+		return 0;
+
+	btBroadphasePair tmpPair(*proxy0,*proxy1);
+	int findIndex = m_overlappingPairArray.findLinearSearch(tmpPair);
+
+	if (findIndex < m_overlappingPairArray.size())
+	{
+		//assert(it != m_overlappingPairSet.end());
+		 btBroadphasePair* pair = &m_overlappingPairArray[findIndex];
+		return pair;
+	}
+	return 0;
+}
+
+
+
+
+
+
+
+
+
+
+//#include <stdio.h>
+
+void	btSortedOverlappingPairCache::processAllOverlappingPairs(btOverlapCallback* callback,btDispatcher* dispatcher)
 {
 
 	int i;
@@ -182,9 +475,9 @@ void	btOverlappingPairCache::processAllOverlappingPairs(btOverlapCallback* callb
 		btBroadphasePair* pair = &m_overlappingPairArray[i];
 		if (callback->processOverlap(*pair))
 		{
-			cleanOverlappingPair(*pair);
+			cleanOverlappingPair(*pair,dispatcher);
 
-			m_overlappingPairArray.swap(i,m_overlappingPairArray.size()-1);
+			m_overlappingPairArray.swap(i,m_overlappingPairArray.capacity()-1);
 			m_overlappingPairArray.pop_back();
 			gOverlappingPairs--;
 		} else
@@ -194,3 +487,93 @@ void	btOverlappingPairCache::processAllOverlappingPairs(btOverlapCallback* callb
 	}
 }
 
+
+
+
+btSortedOverlappingPairCache::btSortedOverlappingPairCache():
+	m_blockedForChanges(false),
+	m_hasDeferredRemoval(true),
+	m_overlapFilterCallback(0)
+{
+	int initialAllocatedSize= 2;
+	m_overlappingPairArray.reserve(initialAllocatedSize);
+}
+
+btSortedOverlappingPairCache::~btSortedOverlappingPairCache()
+{
+	//todo/test: show we erase/delete data, or is it automatic
+}
+
+void	btSortedOverlappingPairCache::cleanOverlappingPair(btBroadphasePair& pair,btDispatcher* dispatcher)
+{
+	if (pair.m_algorithm)
+	{
+		{
+			pair.m_algorithm->~btCollisionAlgorithm();
+			dispatcher->freeCollisionAlgorithm(pair.m_algorithm);
+			pair.m_algorithm=0;
+			gRemovePairs--;
+		}
+	}
+}
+
+
+void	btSortedOverlappingPairCache::cleanProxyFromPairs(btBroadphaseProxy* proxy,btDispatcher* dispatcher)
+{
+
+	class	CleanPairCallback : public btOverlapCallback
+	{
+		btBroadphaseProxy* m_cleanProxy;
+		btOverlappingPairCache*	m_pairCache;
+		btDispatcher* m_dispatcher;
+
+	public:
+		CleanPairCallback(btBroadphaseProxy* cleanProxy,btOverlappingPairCache* pairCache,btDispatcher* dispatcher)
+			:m_cleanProxy(cleanProxy),
+			m_pairCache(pairCache),
+			m_dispatcher(dispatcher)
+		{
+		}
+		virtual	bool	processOverlap(btBroadphasePair& pair)
+		{
+			if ((pair.m_pProxy0 == m_cleanProxy) ||
+				(pair.m_pProxy1 == m_cleanProxy))
+			{
+				m_pairCache->cleanOverlappingPair(pair,m_dispatcher);
+			}
+			return false;
+		}
+		
+	};
+
+	CleanPairCallback cleanPairs(proxy,this,dispatcher);
+
+	processAllOverlappingPairs(&cleanPairs,dispatcher);
+
+}
+
+
+void	btSortedOverlappingPairCache::removeOverlappingPairsContainingProxy(btBroadphaseProxy* proxy,btDispatcher* dispatcher)
+{
+
+	class	RemovePairCallback : public btOverlapCallback
+	{
+		btBroadphaseProxy* m_obsoleteProxy;
+
+	public:
+		RemovePairCallback(btBroadphaseProxy* obsoleteProxy)
+			:m_obsoleteProxy(obsoleteProxy)
+		{
+		}
+		virtual	bool	processOverlap(btBroadphasePair& pair)
+		{
+			return ((pair.m_pProxy0 == m_obsoleteProxy) ||
+				(pair.m_pProxy1 == m_obsoleteProxy));
+		}
+		
+	};
+
+	RemovePairCallback removeCallback(proxy);
+
+	processAllOverlappingPairs(&removeCallback,dispatcher);
+}
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h
index a81fe3264df..66679bd218a 100644
--- a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h
+++ b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h
@@ -1,4 +1,3 @@
-
 /*
 Bullet Continuous Collision Detection and Physics Library
 Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
@@ -20,9 +19,13 @@ subject to the following restrictions:
 
 #include "btBroadphaseInterface.h"
 #include "btBroadphaseProxy.h"
-#include "../../LinearMath/btPoint3.h"
-#include "../../LinearMath/btAlignedObjectArray.h"
+#include "btOverlappingPairCallback.h"
 
+#include "LinearMath/btPoint3.h"
+#include "LinearMath/btAlignedObjectArray.h"
+class btDispatcher;
+
+typedef btAlignedObjectArray<btBroadphasePair>	btBroadphasePairArray;
 
 struct	btOverlapCallback
 {
@@ -30,6 +33,7 @@ struct	btOverlapCallback
 	{}
 	//return true for deletion of the pair
 	virtual bool	processOverlap(btBroadphasePair& pair) = 0;
+
 };
 
 struct btOverlapFilterCallback
@@ -40,38 +44,261 @@ struct btOverlapFilterCallback
 	virtual bool	needBroadphaseCollision(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1) const = 0;
 };
 
-///btOverlappingPairCache maintains the objects with overlapping AABB
+
+
+
+
+
+
+extern int gRemovePairs;
+extern int gAddedPairs;
+extern int gFindPairs;
+
+const int BT_NULL_PAIR=0xffffffff;
+
+///The btOverlappingPairCache provides an interface for overlapping pair management (add, remove, storage), used by the btBroadphaseInterface broadphases.
+///The btHashedOverlappingPairCache and btSortedOverlappingPairCache classes are two implementations.
+class btOverlappingPairCache : public btOverlappingPairCallback
+{
+public:
+	virtual ~btOverlappingPairCache() {} // this is needed so we can get to the derived class destructor
+
+	virtual btBroadphasePair*	getOverlappingPairArrayPtr() = 0;
+	
+	virtual const btBroadphasePair*	getOverlappingPairArrayPtr() const = 0;
+
+	virtual btBroadphasePairArray&	getOverlappingPairArray() = 0;
+
+	virtual	void	cleanOverlappingPair(btBroadphasePair& pair,btDispatcher* dispatcher) = 0;
+
+	virtual int getNumOverlappingPairs() const = 0;
+
+	virtual void	cleanProxyFromPairs(btBroadphaseProxy* proxy,btDispatcher* dispatcher) = 0;
+
+	virtual	void setOverlapFilterCallback(btOverlapFilterCallback* callback) = 0;
+
+	virtual void	processAllOverlappingPairs(btOverlapCallback*,btDispatcher* dispatcher) = 0;
+
+	virtual btBroadphasePair* findPair(btBroadphaseProxy* proxy0, btBroadphaseProxy* proxy1) = 0;
+
+	virtual bool	hasDeferredRemoval() = 0;
+
+};
+
+/// Hash-space based Pair Cache, thanks to Erin Catto, Box2D, http://www.box2d.org, and Pierre Terdiman, Codercorner, http://codercorner.com
+class btHashedOverlappingPairCache : public btOverlappingPairCache
+{
+	btBroadphasePairArray	m_overlappingPairArray;
+	btOverlapFilterCallback* m_overlapFilterCallback;
+	bool		m_blockedForChanges;
+
+
+public:
+	btHashedOverlappingPairCache();
+	virtual ~btHashedOverlappingPairCache();
+
+	
+	void	removeOverlappingPairsContainingProxy(btBroadphaseProxy* proxy,btDispatcher* dispatcher);
+
+	virtual void*	removeOverlappingPair(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1,btDispatcher* dispatcher);
+	
+	SIMD_FORCE_INLINE bool needsBroadphaseCollision(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1) const
+	{
+		if (m_overlapFilterCallback)
+			return m_overlapFilterCallback->needBroadphaseCollision(proxy0,proxy1);
+
+		bool collides = (proxy0->m_collisionFilterGroup & proxy1->m_collisionFilterMask) != 0;
+		collides = collides && (proxy1->m_collisionFilterGroup & proxy0->m_collisionFilterMask);
+		
+		return collides;
+	}
+
+	// Add a pair and return the new pair. If the pair already exists,
+	// no new pair is created and the old one is returned.
+	virtual btBroadphasePair* 	addOverlappingPair(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1)
+	{
+		gAddedPairs++;
+
+		if (!needsBroadphaseCollision(proxy0,proxy1))
+			return 0;
+
+		return internalAddPair(proxy0,proxy1);
+	}
+
+	
+
+	void	cleanProxyFromPairs(btBroadphaseProxy* proxy,btDispatcher* dispatcher);
+
+	
+	virtual void	processAllOverlappingPairs(btOverlapCallback*,btDispatcher* dispatcher);
+
+	virtual btBroadphasePair*	getOverlappingPairArrayPtr()
+	{
+		return &m_overlappingPairArray[0];
+	}
+
+	const btBroadphasePair*	getOverlappingPairArrayPtr() const
+	{
+		return &m_overlappingPairArray[0];
+	}
+
+	btBroadphasePairArray&	getOverlappingPairArray()
+	{
+		return m_overlappingPairArray;
+	}
+
+	const btBroadphasePairArray&	getOverlappingPairArray() const
+	{
+		return m_overlappingPairArray;
+	}
+
+	void	cleanOverlappingPair(btBroadphasePair& pair,btDispatcher* dispatcher);
+
+
+
+	btBroadphasePair* findPair(btBroadphaseProxy* proxy0, btBroadphaseProxy* proxy1);
+
+	int GetCount() const { return m_overlappingPairArray.size(); }
+//	btBroadphasePair* GetPairs() { return m_pairs; }
+
+	btOverlapFilterCallback* getOverlapFilterCallback()
+	{
+		return m_overlapFilterCallback;
+	}
+
+	void setOverlapFilterCallback(btOverlapFilterCallback* callback)
+	{
+		m_overlapFilterCallback = callback;
+	}
+
+	int	getNumOverlappingPairs() const
+	{
+		return m_overlappingPairArray.size();
+	}
+private:
+	
+	btBroadphasePair* 	internalAddPair(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1);
+
+	void	growTables();
+
+	SIMD_FORCE_INLINE bool equalsPair(const btBroadphasePair& pair, int proxyId1, int proxyId2)
+	{	
+		return pair.m_pProxy0->getUid() == proxyId1 && pair.m_pProxy1->getUid() == proxyId2;
+	}
+
+	/*
+	// Thomas Wang's hash, see: http://www.concentric.net/~Ttwang/tech/inthash.htm
+	// This assumes proxyId1 and proxyId2 are 16-bit.
+	SIMD_FORCE_INLINE int getHash(int proxyId1, int proxyId2)
+	{
+		int key = (proxyId2 << 16) | proxyId1;
+		key = ~key + (key << 15);
+		key = key ^ (key >> 12);
+		key = key + (key << 2);
+		key = key ^ (key >> 4);
+		key = key * 2057;
+		key = key ^ (key >> 16);
+		return key;
+	}
+	*/
+
+
+	
+	SIMD_FORCE_INLINE	unsigned int getHash(unsigned int proxyId1, unsigned int proxyId2)
+	{
+		int key = static_cast<int>(((unsigned int)proxyId1) | (((unsigned int)proxyId2) <<16));
+		// Thomas Wang's hash
+
+		key += ~(key << 15);
+		key ^=  (key >> 10);
+		key +=  (key << 3);
+		key ^=  (key >> 6);
+		key += ~(key << 11);
+		key ^=  (key >> 16);
+		return static_cast<unsigned int>(key);
+	}
+	
+
+
+
+
+	SIMD_FORCE_INLINE btBroadphasePair* internalFindPair(btBroadphaseProxy* proxy0, btBroadphaseProxy* proxy1, int hash)
+	{
+		int proxyId1 = proxy0->getUid();
+		int proxyId2 = proxy1->getUid();
+		#if 0 // wrong, 'equalsPair' use unsorted uids, copy-past devil striked again. Nat.
+		if (proxyId1 > proxyId2) 
+			btSwap(proxyId1, proxyId2);
+		#endif
+
+		int index = m_hashTable[hash];
+		
+		while( index != BT_NULL_PAIR && equalsPair(m_overlappingPairArray[index], proxyId1, proxyId2) == false)
+		{
+			index = m_next[index];
+		}
+
+		if ( index == BT_NULL_PAIR )
+		{
+			return NULL;
+		}
+
+		btAssert(index < m_overlappingPairArray.size());
+
+		return &m_overlappingPairArray[index];
+	}
+
+	virtual bool	hasDeferredRemoval()
+	{
+		return false;
+	}
+
+public:
+	
+	btAlignedObjectArray<int>	m_hashTable;
+	btAlignedObjectArray<int>	m_next;
+	
+};
+
+
+
+
+///btSortedOverlappingPairCache maintains the objects with overlapping AABB
 ///Typically managed by the Broadphase, Axis3Sweep or btSimpleBroadphase
-class	btOverlappingPairCache : public btBroadphaseInterface
+class	btSortedOverlappingPairCache : public btOverlappingPairCache
 {
 	protected:
 		//avoid brute-force finding all the time
-		btAlignedObjectArray<btBroadphasePair>	m_overlappingPairArray;
-		
+		btBroadphasePairArray	m_overlappingPairArray;
+
 		//during the dispatch, check that user doesn't destroy/create proxy
 		bool		m_blockedForChanges;
+
+		///by default, do the removal during the pair traversal
+		bool		m_hasDeferredRemoval;
 		
 		//if set, use the callback instead of the built in filter in needBroadphaseCollision
 		btOverlapFilterCallback* m_overlapFilterCallback;
+
 	public:
 			
-		btOverlappingPairCache();	
-		virtual ~btOverlappingPairCache();
+		btSortedOverlappingPairCache();	
+		virtual ~btSortedOverlappingPairCache();
 
-		virtual void	processAllOverlappingPairs(btOverlapCallback*);
+		virtual void	processAllOverlappingPairs(btOverlapCallback*,btDispatcher* dispatcher);
 
-		void	removeOverlappingPair(btBroadphasePair& pair);
+		void*	removeOverlappingPair(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1,btDispatcher* dispatcher);
 
-		void	cleanOverlappingPair(btBroadphasePair& pair);
+		void	cleanOverlappingPair(btBroadphasePair& pair,btDispatcher* dispatcher);
 		
-		void	addOverlappingPair(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1);
+		btBroadphasePair*	addOverlappingPair(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1);
 
 		btBroadphasePair*	findPair(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1);
 			
 		
-		void	cleanProxyFromPairs(btBroadphaseProxy* proxy);
+		void	cleanProxyFromPairs(btBroadphaseProxy* proxy,btDispatcher* dispatcher);
 
-		void	removeOverlappingPairsContainingProxy(btBroadphaseProxy* proxy);
+		void	removeOverlappingPairsContainingProxy(btBroadphaseProxy* proxy,btDispatcher* dispatcher);
 
 
 		inline bool needsBroadphaseCollision(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1) const
@@ -84,10 +311,19 @@ class	btOverlappingPairCache : public btBroadphaseInterface
 			
 			return collides;
 		}
-			
+		
+		btBroadphasePairArray&	getOverlappingPairArray()
+		{
+			return m_overlappingPairArray;
+		}
+
+		const btBroadphasePairArray&	getOverlappingPairArray() const
+		{
+			return m_overlappingPairArray;
+		}
+
 		
 
-		virtual void	refreshOverlappingPairs() =0;
 
 		btBroadphasePair*	getOverlappingPairArrayPtr()
 		{
@@ -114,7 +350,88 @@ class	btOverlappingPairCache : public btBroadphaseInterface
 			m_overlapFilterCallback = callback;
 		}
 
+		virtual bool	hasDeferredRemoval()
+		{
+			return m_hasDeferredRemoval;
+		}
+
+
 };
+
+
+
+///btNullPairCache skips add/removal of overlapping pairs. Userful for benchmarking and testing.
+class btNullPairCache : public btOverlappingPairCache
+{
+
+	btBroadphasePairArray	m_overlappingPairArray;
+
+public:
+
+	virtual btBroadphasePair*	getOverlappingPairArrayPtr()
+	{
+		return &m_overlappingPairArray[0];
+	}
+	const btBroadphasePair*	getOverlappingPairArrayPtr() const
+	{
+		return &m_overlappingPairArray[0];
+	}
+	btBroadphasePairArray&	getOverlappingPairArray()
+	{
+		return m_overlappingPairArray;
+	}
+	
+	virtual	void	cleanOverlappingPair(btBroadphasePair& /*pair*/,btDispatcher* /*dispatcher*/)
+	{
+
+	}
+
+	virtual int getNumOverlappingPairs() const
+	{
+		return 0;
+	}
+
+	virtual void	cleanProxyFromPairs(btBroadphaseProxy* /*proxy*/,btDispatcher* /*dispatcher*/)
+	{
+
+	}
+
+	virtual	void setOverlapFilterCallback(btOverlapFilterCallback* /*callback*/)
+	{
+	}
+
+	virtual void	processAllOverlappingPairs(btOverlapCallback*,btDispatcher* /*dispatcher*/)
+	{
+	}
+
+	virtual btBroadphasePair* findPair(btBroadphaseProxy* /*proxy0*/, btBroadphaseProxy* /*proxy1*/)
+	{
+		return 0;
+	}
+
+	virtual bool	hasDeferredRemoval()
+	{
+		return true;
+	}
+
+	virtual btBroadphasePair*	addOverlappingPair(btBroadphaseProxy* /*proxy0*/,btBroadphaseProxy* /*proxy1*/)
+	{
+		return 0;
+	}
+
+	virtual void*	removeOverlappingPair(btBroadphaseProxy* /*proxy0*/,btBroadphaseProxy* /*proxy1*/,btDispatcher* /*dispatcher*/)
+	{
+		return 0;
+	}
+
+	virtual void	removeOverlappingPairsContainingProxy(btBroadphaseProxy* /*proxy0*/,btDispatcher* /*dispatcher*/)
+	{
+	}
+
+
+};
+
+
 #endif //OVERLAPPING_PAIR_CACHE_H
 
 
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h
new file mode 100644
index 00000000000..9c7b6f81367
--- /dev/null
+++ b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h
@@ -0,0 +1,40 @@
+
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef OVERLAPPING_PAIR_CALLBACK_H
+#define OVERLAPPING_PAIR_CALLBACK_H
+
+class btDispatcher;
+struct  btBroadphasePair;
+
+///The btOverlappingPairCallback class is an additional optional broadphase user callback for adding/removing overlapping pairs, similar interface to btOverlappingPairCache.
+class btOverlappingPairCallback
+{
+public:
+	virtual ~btOverlappingPairCallback()
+	{
+
+	}
+	
+	virtual btBroadphasePair*	addOverlappingPair(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1) = 0;
+
+	virtual void*	removeOverlappingPair(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1,btDispatcher* dispatcher) = 0;
+
+	virtual void	removeOverlappingPairsContainingProxy(btBroadphaseProxy* proxy0,btDispatcher* dispatcher) = 0;
+
+};
+
+#endif //OVERLAPPING_PAIR_CALLBACK_H
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp
new file mode 100644
index 00000000000..a30bd1fd9e1
--- /dev/null
+++ b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp
@@ -0,0 +1,1025 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btQuantizedBvh.h"
+
+#include "LinearMath/btAabbUtil2.h"
+#include "LinearMath/btIDebugDraw.h"
+
+
+btQuantizedBvh::btQuantizedBvh() : m_useQuantization(false), 
+					//m_traversalMode(TRAVERSAL_STACKLESS_CACHE_FRIENDLY)
+					m_traversalMode(TRAVERSAL_STACKLESS)
+					//m_traversalMode(TRAVERSAL_RECURSIVE)
+					,m_subtreeHeaderCount(0) //PCK: add this line
+{ 
+
+}
+
+
+
+
+
+void btQuantizedBvh::buildInternal()
+{
+	///assumes that caller filled in the m_quantizedLeafNodes
+	m_useQuantization = true;
+	int numLeafNodes = 0;
+	
+	if (m_useQuantization)
+	{
+		//now we have an array of leafnodes in m_leafNodes
+		numLeafNodes = m_quantizedLeafNodes.size();
+
+		m_quantizedContiguousNodes.resize(2*numLeafNodes);
+
+	}
+
+	m_curNodeIndex = 0;
+
+	buildTree(0,numLeafNodes);
+
+	///if the entire tree is small then subtree size, we need to create a header info for the tree
+	if(m_useQuantization && !m_SubtreeHeaders.size())
+	{
+		btBvhSubtreeInfo& subtree = m_SubtreeHeaders.expand();
+		subtree.setAabbFromQuantizeNode(m_quantizedContiguousNodes[0]);
+		subtree.m_rootNodeIndex = 0;
+		subtree.m_subtreeSize = m_quantizedContiguousNodes[0].isLeafNode() ? 1 : m_quantizedContiguousNodes[0].getEscapeIndex();
+	}
+
+	//PCK: update the copy of the size
+	m_subtreeHeaderCount = m_SubtreeHeaders.size();
+
+	//PCK: clear m_quantizedLeafNodes and m_leafNodes, they are temporary
+	m_quantizedLeafNodes.clear();
+	m_leafNodes.clear();
+}
+
+
+
+///just for debugging, to visualize the individual patches/subtrees
+#ifdef DEBUG_PATCH_COLORS
+btVector3 color[4]=
+{
+	btVector3(255,0,0),
+	btVector3(0,255,0),
+	btVector3(0,0,255),
+	btVector3(0,255,255)
+};
+#endif //DEBUG_PATCH_COLORS
+
+
+
+void	btQuantizedBvh::setQuantizationValues(const btVector3& bvhAabbMin,const btVector3& bvhAabbMax,btScalar quantizationMargin)
+{
+	//enlarge the AABB to avoid division by zero when initializing the quantization values
+	btVector3 clampValue(quantizationMargin,quantizationMargin,quantizationMargin);
+	m_bvhAabbMin = bvhAabbMin - clampValue;
+	m_bvhAabbMax = bvhAabbMax + clampValue;
+	btVector3 aabbSize = m_bvhAabbMax - m_bvhAabbMin;
+	m_bvhQuantization = btVector3(btScalar(65533.0),btScalar(65533.0),btScalar(65533.0)) / aabbSize;
+	m_useQuantization = true;
+}
+
+
+
+
+btQuantizedBvh::~btQuantizedBvh()
+{
+}
+
+#ifdef DEBUG_TREE_BUILDING
+int gStackDepth = 0;
+int gMaxStackDepth = 0;
+#endif //DEBUG_TREE_BUILDING
+
+void	btQuantizedBvh::buildTree	(int startIndex,int endIndex)
+{
+#ifdef DEBUG_TREE_BUILDING
+	gStackDepth++;
+	if (gStackDepth > gMaxStackDepth)
+		gMaxStackDepth = gStackDepth;
+#endif //DEBUG_TREE_BUILDING
+
+
+	int splitAxis, splitIndex, i;
+	int numIndices =endIndex-startIndex;
+	int curIndex = m_curNodeIndex;
+
+	assert(numIndices>0);
+
+	if (numIndices==1)
+	{
+#ifdef DEBUG_TREE_BUILDING
+		gStackDepth--;
+#endif //DEBUG_TREE_BUILDING
+		
+		assignInternalNodeFromLeafNode(m_curNodeIndex,startIndex);
+
+		m_curNodeIndex++;
+		return;	
+	}
+	//calculate Best Splitting Axis and where to split it. Sort the incoming 'leafNodes' array within range 'startIndex/endIndex'.
+	
+	splitAxis = calcSplittingAxis(startIndex,endIndex);
+
+	splitIndex = sortAndCalcSplittingIndex(startIndex,endIndex,splitAxis);
+
+	int internalNodeIndex = m_curNodeIndex;
+	
+	setInternalNodeAabbMax(m_curNodeIndex,m_bvhAabbMin);
+	setInternalNodeAabbMin(m_curNodeIndex,m_bvhAabbMax);
+	
+	for (i=startIndex;i<endIndex;i++)
+	{
+		mergeInternalNodeAabb(m_curNodeIndex,getAabbMin(i),getAabbMax(i));
+	}
+
+	m_curNodeIndex++;
+	
+
+	//internalNode->m_escapeIndex;
+	
+	int leftChildNodexIndex = m_curNodeIndex;
+
+	//build left child tree
+	buildTree(startIndex,splitIndex);
+
+	int rightChildNodexIndex = m_curNodeIndex;
+	//build right child tree
+	buildTree(splitIndex,endIndex);
+
+#ifdef DEBUG_TREE_BUILDING
+	gStackDepth--;
+#endif //DEBUG_TREE_BUILDING
+
+	int escapeIndex = m_curNodeIndex - curIndex;
+
+	if (m_useQuantization)
+	{
+		//escapeIndex is the number of nodes of this subtree
+		const int sizeQuantizedNode =sizeof(btQuantizedBvhNode);
+		const int treeSizeInBytes = escapeIndex * sizeQuantizedNode;
+		if (treeSizeInBytes > MAX_SUBTREE_SIZE_IN_BYTES)
+		{
+			updateSubtreeHeaders(leftChildNodexIndex,rightChildNodexIndex);
+		}
+	}
+
+	setInternalNodeEscapeIndex(internalNodeIndex,escapeIndex);
+
+}
+
+void	btQuantizedBvh::updateSubtreeHeaders(int leftChildNodexIndex,int rightChildNodexIndex)
+{
+	btAssert(m_useQuantization);
+
+	btQuantizedBvhNode& leftChildNode = m_quantizedContiguousNodes[leftChildNodexIndex];
+	int leftSubTreeSize = leftChildNode.isLeafNode() ? 1 : leftChildNode.getEscapeIndex();
+	int leftSubTreeSizeInBytes =  leftSubTreeSize * static_cast<int>(sizeof(btQuantizedBvhNode));
+	
+	btQuantizedBvhNode& rightChildNode = m_quantizedContiguousNodes[rightChildNodexIndex];
+	int rightSubTreeSize = rightChildNode.isLeafNode() ? 1 : rightChildNode.getEscapeIndex();
+	int rightSubTreeSizeInBytes =  rightSubTreeSize *  static_cast<int>(sizeof(btQuantizedBvhNode));
+
+	if(leftSubTreeSizeInBytes <= MAX_SUBTREE_SIZE_IN_BYTES)
+	{
+		btBvhSubtreeInfo& subtree = m_SubtreeHeaders.expand();
+		subtree.setAabbFromQuantizeNode(leftChildNode);
+		subtree.m_rootNodeIndex = leftChildNodexIndex;
+		subtree.m_subtreeSize = leftSubTreeSize;
+	}
+
+	if(rightSubTreeSizeInBytes <= MAX_SUBTREE_SIZE_IN_BYTES)
+	{
+		btBvhSubtreeInfo& subtree = m_SubtreeHeaders.expand();
+		subtree.setAabbFromQuantizeNode(rightChildNode);
+		subtree.m_rootNodeIndex = rightChildNodexIndex;
+		subtree.m_subtreeSize = rightSubTreeSize;
+	}
+
+	//PCK: update the copy of the size
+	m_subtreeHeaderCount = m_SubtreeHeaders.size();
+}
+
+
+int	btQuantizedBvh::sortAndCalcSplittingIndex(int startIndex,int endIndex,int splitAxis)
+{
+	int i;
+	int splitIndex =startIndex;
+	int numIndices = endIndex - startIndex;
+	btScalar splitValue;
+
+	btVector3 means(btScalar(0.),btScalar(0.),btScalar(0.));
+	for (i=startIndex;i<endIndex;i++)
+	{
+		btVector3 center = btScalar(0.5)*(getAabbMax(i)+getAabbMin(i));
+		means+=center;
+	}
+	means *= (btScalar(1.)/(btScalar)numIndices);
+	
+	splitValue = means[splitAxis];
+	
+	//sort leafNodes so all values larger then splitValue comes first, and smaller values start from 'splitIndex'.
+	for (i=startIndex;i<endIndex;i++)
+	{
+		btVector3 center = btScalar(0.5)*(getAabbMax(i)+getAabbMin(i));
+		if (center[splitAxis] > splitValue)
+		{
+			//swap
+			swapLeafNodes(i,splitIndex);
+			splitIndex++;
+		}
+	}
+
+	//if the splitIndex causes unbalanced trees, fix this by using the center in between startIndex and endIndex
+	//otherwise the tree-building might fail due to stack-overflows in certain cases.
+	//unbalanced1 is unsafe: it can cause stack overflows
+	//bool unbalanced1 = ((splitIndex==startIndex) || (splitIndex == (endIndex-1)));
+
+	//unbalanced2 should work too: always use center (perfect balanced trees)	
+	//bool unbalanced2 = true;
+
+	//this should be safe too:
+	int rangeBalancedIndices = numIndices/3;
+	bool unbalanced = ((splitIndex<=(startIndex+rangeBalancedIndices)) || (splitIndex >=(endIndex-1-rangeBalancedIndices)));
+	
+	if (unbalanced)
+	{
+		splitIndex = startIndex+ (numIndices>>1);
+	}
+
+	bool unbal = (splitIndex==startIndex) || (splitIndex == (endIndex));
+	(void)unbal;
+	btAssert(!unbal);
+
+	return splitIndex;
+}
+
+
+int	btQuantizedBvh::calcSplittingAxis(int startIndex,int endIndex)
+{
+	int i;
+
+	btVector3 means(btScalar(0.),btScalar(0.),btScalar(0.));
+	btVector3 variance(btScalar(0.),btScalar(0.),btScalar(0.));
+	int numIndices = endIndex-startIndex;
+
+	for (i=startIndex;i<endIndex;i++)
+	{
+		btVector3 center = btScalar(0.5)*(getAabbMax(i)+getAabbMin(i));
+		means+=center;
+	}
+	means *= (btScalar(1.)/(btScalar)numIndices);
+		
+	for (i=startIndex;i<endIndex;i++)
+	{
+		btVector3 center = btScalar(0.5)*(getAabbMax(i)+getAabbMin(i));
+		btVector3 diff2 = center-means;
+		diff2 = diff2 * diff2;
+		variance += diff2;
+	}
+	variance *= (btScalar(1.)/	((btScalar)numIndices-1)	);
+	
+	return variance.maxAxis();
+}
+
+
+
+void	btQuantizedBvh::reportAabbOverlappingNodex(btNodeOverlapCallback* nodeCallback,const btVector3& aabbMin,const btVector3& aabbMax) const
+{
+	//either choose recursive traversal (walkTree) or stackless (walkStacklessTree)
+
+	if (m_useQuantization)
+	{
+		///quantize query AABB
+		unsigned short int quantizedQueryAabbMin[3];
+		unsigned short int quantizedQueryAabbMax[3];
+		quantizeWithClamp(quantizedQueryAabbMin,aabbMin,0);
+		quantizeWithClamp(quantizedQueryAabbMax,aabbMax,1);
+
+		switch (m_traversalMode)
+		{
+		case TRAVERSAL_STACKLESS:
+				walkStacklessQuantizedTree(nodeCallback,quantizedQueryAabbMin,quantizedQueryAabbMax,0,m_curNodeIndex);
+			break;
+		case TRAVERSAL_STACKLESS_CACHE_FRIENDLY:
+				walkStacklessQuantizedTreeCacheFriendly(nodeCallback,quantizedQueryAabbMin,quantizedQueryAabbMax);
+			break;
+		case TRAVERSAL_RECURSIVE:
+			{
+				const btQuantizedBvhNode* rootNode = &m_quantizedContiguousNodes[0];
+				walkRecursiveQuantizedTreeAgainstQueryAabb(rootNode,nodeCallback,quantizedQueryAabbMin,quantizedQueryAabbMax);
+			}
+			break;
+		default:
+			//unsupported
+			btAssert(0);
+		}
+	} else
+	{
+		walkStacklessTree(nodeCallback,aabbMin,aabbMax);
+	}
+}
+
+
+int maxIterations = 0;
+
+void	btQuantizedBvh::walkStacklessTree(btNodeOverlapCallback* nodeCallback,const btVector3& aabbMin,const btVector3& aabbMax) const
+{
+	btAssert(!m_useQuantization);
+
+	const btOptimizedBvhNode* rootNode = &m_contiguousNodes[0];
+	int escapeIndex, curIndex = 0;
+	int walkIterations = 0;
+	bool isLeafNode;
+	//PCK: unsigned instead of bool
+	unsigned aabbOverlap;
+
+	while (curIndex < m_curNodeIndex)
+	{
+		//catch bugs in tree data
+		assert (walkIterations < m_curNodeIndex);
+
+		walkIterations++;
+		aabbOverlap = TestAabbAgainstAabb2(aabbMin,aabbMax,rootNode->m_aabbMinOrg,rootNode->m_aabbMaxOrg);
+		isLeafNode = rootNode->m_escapeIndex == -1;
+		
+		//PCK: unsigned instead of bool
+		if (isLeafNode && (aabbOverlap != 0))
+		{
+			nodeCallback->processNode(rootNode->m_subPart,rootNode->m_triangleIndex);
+		} 
+		
+		//PCK: unsigned instead of bool
+		if ((aabbOverlap != 0) || isLeafNode)
+		{
+			rootNode++;
+			curIndex++;
+		} else
+		{
+			escapeIndex = rootNode->m_escapeIndex;
+			rootNode += escapeIndex;
+			curIndex += escapeIndex;
+		}
+	}
+	if (maxIterations < walkIterations)
+		maxIterations = walkIterations;
+
+}
+
+/*
+///this was the original recursive traversal, before we optimized towards stackless traversal
+void	btQuantizedBvh::walkTree(btOptimizedBvhNode* rootNode,btNodeOverlapCallback* nodeCallback,const btVector3& aabbMin,const btVector3& aabbMax) const
+{
+	bool isLeafNode, aabbOverlap = TestAabbAgainstAabb2(aabbMin,aabbMax,rootNode->m_aabbMin,rootNode->m_aabbMax);
+	if (aabbOverlap)
+	{
+		isLeafNode = (!rootNode->m_leftChild && !rootNode->m_rightChild);
+		if (isLeafNode)
+		{
+			nodeCallback->processNode(rootNode);
+		} else
+		{
+			walkTree(rootNode->m_leftChild,nodeCallback,aabbMin,aabbMax);
+			walkTree(rootNode->m_rightChild,nodeCallback,aabbMin,aabbMax);
+		}
+	}
+
+}
+*/
+
+void btQuantizedBvh::walkRecursiveQuantizedTreeAgainstQueryAabb(const btQuantizedBvhNode* currentNode,btNodeOverlapCallback* nodeCallback,unsigned short int* quantizedQueryAabbMin,unsigned short int* quantizedQueryAabbMax) const
+{
+	btAssert(m_useQuantization);
+	
+	bool isLeafNode;
+	//PCK: unsigned instead of bool
+	unsigned aabbOverlap;
+
+	//PCK: unsigned instead of bool
+	aabbOverlap = testQuantizedAabbAgainstQuantizedAabb(quantizedQueryAabbMin,quantizedQueryAabbMax,currentNode->m_quantizedAabbMin,currentNode->m_quantizedAabbMax);
+	isLeafNode = currentNode->isLeafNode();
+		
+	//PCK: unsigned instead of bool
+	if (aabbOverlap != 0)
+	{
+		if (isLeafNode)
+		{
+			nodeCallback->processNode(currentNode->getPartId(),currentNode->getTriangleIndex());
+		} else
+		{
+			//process left and right children
+			const btQuantizedBvhNode* leftChildNode = currentNode+1;
+			walkRecursiveQuantizedTreeAgainstQueryAabb(leftChildNode,nodeCallback,quantizedQueryAabbMin,quantizedQueryAabbMax);
+
+			const btQuantizedBvhNode* rightChildNode = leftChildNode->isLeafNode() ? leftChildNode+1:leftChildNode+leftChildNode->getEscapeIndex();
+			walkRecursiveQuantizedTreeAgainstQueryAabb(rightChildNode,nodeCallback,quantizedQueryAabbMin,quantizedQueryAabbMax);
+		}
+	}		
+}
+
+
+
+
+
+void	btQuantizedBvh::walkStacklessQuantizedTreeAgainstRay(btNodeOverlapCallback* nodeCallback, const btVector3& raySource, const btVector3& rayTarget, const btVector3& aabbMin, const btVector3& aabbMax, int startNodeIndex,int endNodeIndex) const
+{
+	btAssert(m_useQuantization);
+	
+	int curIndex = startNodeIndex;
+	int walkIterations = 0;
+	int subTreeSize = endNodeIndex - startNodeIndex;
+	(void)subTreeSize;
+
+	const btQuantizedBvhNode* rootNode = &m_quantizedContiguousNodes[startNodeIndex];
+	int escapeIndex;
+	
+	bool isLeafNode;
+	//PCK: unsigned instead of bool
+	unsigned boxBoxOverlap = 0;
+	unsigned rayBoxOverlap = 0;
+
+	btScalar lambda_max = 1.0;
+#define RAYAABB2
+#ifdef RAYAABB2
+	btVector3 rayFrom = raySource;
+	btVector3 rayDirection = (rayTarget-raySource);
+	rayDirection.normalize ();
+	lambda_max = rayDirection.dot(rayTarget-raySource);
+	///what about division by zero? --> just set rayDirection[i] to 1.0
+	rayDirection[0] = rayDirection[0] == btScalar(0.0) ? btScalar(1e30) : btScalar(1.0) / rayDirection[0];
+	rayDirection[1] = rayDirection[1] == btScalar(0.0) ? btScalar(1e30) : btScalar(1.0) / rayDirection[1];
+	rayDirection[2] = rayDirection[2] == btScalar(0.0) ? btScalar(1e30) : btScalar(1.0) / rayDirection[2];
+	unsigned int sign[3] = { rayDirection[0] < 0.0, rayDirection[1] < 0.0, rayDirection[2] < 0.0};
+#endif
+
+	/* Quick pruning by quantized box */
+	btVector3 rayAabbMin = raySource;
+	btVector3 rayAabbMax = raySource;
+	rayAabbMin.setMin(rayTarget);
+	rayAabbMax.setMax(rayTarget);
+
+	/* Add box cast extents to bounding box */
+	rayAabbMin += aabbMin;
+	rayAabbMax += aabbMax;
+
+	unsigned short int quantizedQueryAabbMin[3];
+	unsigned short int quantizedQueryAabbMax[3];
+	quantizeWithClamp(quantizedQueryAabbMin,rayAabbMin,0);
+	quantizeWithClamp(quantizedQueryAabbMax,rayAabbMax,1);
+
+	while (curIndex < endNodeIndex)
+	{
+
+//#define VISUALLY_ANALYZE_BVH 1
+#ifdef VISUALLY_ANALYZE_BVH
+		//some code snippet to debugDraw aabb, to visually analyze bvh structure
+		static int drawPatch = 0;
+		//need some global access to a debugDrawer
+		extern btIDebugDraw* debugDrawerPtr;
+		if (curIndex==drawPatch)
+		{
+			btVector3 aabbMin,aabbMax;
+			aabbMin = unQuantize(rootNode->m_quantizedAabbMin);
+			aabbMax = unQuantize(rootNode->m_quantizedAabbMax);
+			btVector3	color(1,0,0);
+			debugDrawerPtr->drawAabb(aabbMin,aabbMax,color);
+		}
+#endif//VISUALLY_ANALYZE_BVH
+
+		//catch bugs in tree data
+		assert (walkIterations < subTreeSize);
+
+		walkIterations++;
+		//PCK: unsigned instead of bool
+		// only interested if this is closer than any previous hit
+		btScalar param = 1.0;
+		rayBoxOverlap = 0;
+		boxBoxOverlap = testQuantizedAabbAgainstQuantizedAabb(quantizedQueryAabbMin,quantizedQueryAabbMax,rootNode->m_quantizedAabbMin,rootNode->m_quantizedAabbMax);
+		isLeafNode = rootNode->isLeafNode();
+		if (boxBoxOverlap)
+		{
+			btVector3 bounds[2];
+			bounds[0] = unQuantize(rootNode->m_quantizedAabbMin);
+			bounds[1] = unQuantize(rootNode->m_quantizedAabbMax);
+			/* Add box cast extents */
+			bounds[0] += aabbMin;
+			bounds[1] += aabbMax;
+			btVector3 normal;
+#if 0
+			bool ra2 = btRayAabb2 (raySource, rayDirection, sign, bounds, param, 0.0, lambda_max);
+			bool ra = btRayAabb (raySource, rayTarget, bounds[0], bounds[1], param, normal);
+			if (ra2 != ra)
+			{
+				printf("functions don't match\n");
+			}
+#endif
+#ifdef RAYAABB2
+			///careful with this check: need to check division by zero (above) and fix the unQuantize method
+			///thanks Joerg/hiker for the reproduction case!
+			///http://www.bulletphysics.com/Bullet/phpBB3/viewtopic.php?f=9&t=1858
+
+			rayBoxOverlap = btRayAabb2 (raySource, rayDirection, sign, bounds, param, 0.0f, lambda_max);
+#else
+			rayBoxOverlap = true;//btRayAabb(raySource, rayTarget, bounds[0], bounds[1], param, normal);
+#endif
+		}
+		
+		if (isLeafNode && rayBoxOverlap)
+		{
+			nodeCallback->processNode(rootNode->getPartId(),rootNode->getTriangleIndex());
+		}
+		
+		//PCK: unsigned instead of bool
+		if ((rayBoxOverlap != 0) || isLeafNode)
+		{
+			rootNode++;
+			curIndex++;
+		} else
+		{
+			escapeIndex = rootNode->getEscapeIndex();
+			rootNode += escapeIndex;
+			curIndex += escapeIndex;
+		}
+	}
+	if (maxIterations < walkIterations)
+		maxIterations = walkIterations;
+
+}
+
+void	btQuantizedBvh::walkStacklessQuantizedTree(btNodeOverlapCallback* nodeCallback,unsigned short int* quantizedQueryAabbMin,unsigned short int* quantizedQueryAabbMax,int startNodeIndex,int endNodeIndex) const
+{
+	btAssert(m_useQuantization);
+	
+	int curIndex = startNodeIndex;
+	int walkIterations = 0;
+	int subTreeSize = endNodeIndex - startNodeIndex;
+	(void)subTreeSize;
+
+	const btQuantizedBvhNode* rootNode = &m_quantizedContiguousNodes[startNodeIndex];
+	int escapeIndex;
+	
+	bool isLeafNode;
+	//PCK: unsigned instead of bool
+	unsigned aabbOverlap;
+
+	while (curIndex < endNodeIndex)
+	{
+
+//#define VISUALLY_ANALYZE_BVH 1
+#ifdef VISUALLY_ANALYZE_BVH
+		//some code snippet to debugDraw aabb, to visually analyze bvh structure
+		static int drawPatch = 0;
+		//need some global access to a debugDrawer
+		extern btIDebugDraw* debugDrawerPtr;
+		if (curIndex==drawPatch)
+		{
+			btVector3 aabbMin,aabbMax;
+			aabbMin = unQuantize(rootNode->m_quantizedAabbMin);
+			aabbMax = unQuantize(rootNode->m_quantizedAabbMax);
+			btVector3	color(1,0,0);
+			debugDrawerPtr->drawAabb(aabbMin,aabbMax,color);
+		}
+#endif//VISUALLY_ANALYZE_BVH
+
+		//catch bugs in tree data
+		assert (walkIterations < subTreeSize);
+
+		walkIterations++;
+		//PCK: unsigned instead of bool
+		aabbOverlap = testQuantizedAabbAgainstQuantizedAabb(quantizedQueryAabbMin,quantizedQueryAabbMax,rootNode->m_quantizedAabbMin,rootNode->m_quantizedAabbMax);
+		isLeafNode = rootNode->isLeafNode();
+		
+		if (isLeafNode && aabbOverlap)
+		{
+			nodeCallback->processNode(rootNode->getPartId(),rootNode->getTriangleIndex());
+		} 
+		
+		//PCK: unsigned instead of bool
+		if ((aabbOverlap != 0) || isLeafNode)
+		{
+			rootNode++;
+			curIndex++;
+		} else
+		{
+			escapeIndex = rootNode->getEscapeIndex();
+			rootNode += escapeIndex;
+			curIndex += escapeIndex;
+		}
+	}
+	if (maxIterations < walkIterations)
+		maxIterations = walkIterations;
+
+}
+
+//This traversal can be called from Playstation 3 SPU
+void	btQuantizedBvh::walkStacklessQuantizedTreeCacheFriendly(btNodeOverlapCallback* nodeCallback,unsigned short int* quantizedQueryAabbMin,unsigned short int* quantizedQueryAabbMax) const
+{
+	btAssert(m_useQuantization);
+
+	int i;
+
+
+	for (i=0;i<this->m_SubtreeHeaders.size();i++)
+	{
+		const btBvhSubtreeInfo& subtree = m_SubtreeHeaders[i];
+
+		//PCK: unsigned instead of bool
+		unsigned overlap = testQuantizedAabbAgainstQuantizedAabb(quantizedQueryAabbMin,quantizedQueryAabbMax,subtree.m_quantizedAabbMin,subtree.m_quantizedAabbMax);
+		if (overlap != 0)
+		{
+			walkStacklessQuantizedTree(nodeCallback,quantizedQueryAabbMin,quantizedQueryAabbMax,
+				subtree.m_rootNodeIndex,
+				subtree.m_rootNodeIndex+subtree.m_subtreeSize);
+		}
+	}
+}
+
+
+void	btQuantizedBvh::reportRayOverlappingNodex (btNodeOverlapCallback* nodeCallback, const btVector3& raySource, const btVector3& rayTarget) const
+{
+	bool fast_path = m_useQuantization && m_traversalMode == TRAVERSAL_STACKLESS;
+	if (fast_path)
+	{
+		walkStacklessQuantizedTreeAgainstRay(nodeCallback, raySource, rayTarget, btVector3(0, 0, 0), btVector3(0, 0, 0), 0, m_curNodeIndex);
+	} else {
+		/* Otherwise fallback to AABB overlap test */
+		btVector3 aabbMin = raySource;
+		btVector3 aabbMax = raySource;
+		aabbMin.setMin(rayTarget);
+		aabbMax.setMax(rayTarget);
+		reportAabbOverlappingNodex(nodeCallback,aabbMin,aabbMax);
+	}
+}
+
+
+void	btQuantizedBvh::reportBoxCastOverlappingNodex(btNodeOverlapCallback* nodeCallback, const btVector3& raySource, const btVector3& rayTarget, const btVector3& aabbMin,const btVector3& aabbMax) const
+{
+	bool fast_path = m_useQuantization && m_traversalMode == TRAVERSAL_STACKLESS;
+	if (fast_path)
+	{
+		walkStacklessQuantizedTreeAgainstRay(nodeCallback, raySource, rayTarget, aabbMin, aabbMax, 0, m_curNodeIndex);
+	} else {
+		/* Slow path:
+		   Construct the bounding box for the entire box cast and send that down the tree */
+		btVector3 qaabbMin = raySource;
+		btVector3 qaabbMax = raySource;
+		qaabbMin.setMin(rayTarget);
+		qaabbMax.setMax(rayTarget);
+		qaabbMin += aabbMin;
+		qaabbMax += aabbMax;
+		reportAabbOverlappingNodex(nodeCallback,qaabbMin,qaabbMax);
+	}
+}
+
+
+void	btQuantizedBvh::swapLeafNodes(int i,int splitIndex)
+{
+	if (m_useQuantization)
+	{
+			btQuantizedBvhNode tmp = m_quantizedLeafNodes[i];
+			m_quantizedLeafNodes[i] = m_quantizedLeafNodes[splitIndex];
+			m_quantizedLeafNodes[splitIndex] = tmp;
+	} else
+	{
+			btOptimizedBvhNode tmp = m_leafNodes[i];
+			m_leafNodes[i] = m_leafNodes[splitIndex];
+			m_leafNodes[splitIndex] = tmp;
+	}
+}
+
+void	btQuantizedBvh::assignInternalNodeFromLeafNode(int internalNode,int leafNodeIndex)
+{
+	if (m_useQuantization)
+	{
+		m_quantizedContiguousNodes[internalNode] = m_quantizedLeafNodes[leafNodeIndex];
+	} else
+	{
+		m_contiguousNodes[internalNode] = m_leafNodes[leafNodeIndex];
+	}
+}
+
+//PCK: include
+#include <new>
+
+//PCK: consts
+static const unsigned BVH_ALIGNMENT = 16;
+static const unsigned BVH_ALIGNMENT_MASK = BVH_ALIGNMENT-1;
+
+static const unsigned BVH_ALIGNMENT_BLOCKS = 2;
+
+
+
+unsigned int btQuantizedBvh::getAlignmentSerializationPadding()
+{
+	return BVH_ALIGNMENT_BLOCKS * BVH_ALIGNMENT;
+}
+
+unsigned btQuantizedBvh::calculateSerializeBufferSize()
+{
+	unsigned baseSize = sizeof(btQuantizedBvh) + getAlignmentSerializationPadding();
+	baseSize += sizeof(btBvhSubtreeInfo) * m_subtreeHeaderCount;
+	if (m_useQuantization)
+	{
+		return baseSize + m_curNodeIndex * sizeof(btQuantizedBvhNode);
+	}
+	return baseSize + m_curNodeIndex * sizeof(btOptimizedBvhNode);
+}
+
+bool btQuantizedBvh::serialize(void *o_alignedDataBuffer, unsigned /*i_dataBufferSize */, bool i_swapEndian)
+{
+	assert(m_subtreeHeaderCount == m_SubtreeHeaders.size());
+	m_subtreeHeaderCount = m_SubtreeHeaders.size();
+
+/*	if (i_dataBufferSize < calculateSerializeBufferSize() || o_alignedDataBuffer == NULL || (((unsigned)o_alignedDataBuffer & BVH_ALIGNMENT_MASK) != 0))
+	{
+		///check alignedment for buffer?
+		btAssert(0);
+		return false;
+	}
+*/
+
+	btQuantizedBvh *targetBvh = (btQuantizedBvh *)o_alignedDataBuffer;
+
+	// construct the class so the virtual function table, etc will be set up
+	// Also, m_leafNodes and m_quantizedLeafNodes will be initialized to default values by the constructor
+	new (targetBvh) btQuantizedBvh;
+
+	if (i_swapEndian)
+	{
+		targetBvh->m_curNodeIndex = static_cast<int>(btSwapEndian(m_curNodeIndex));
+
+
+		btSwapVector3Endian(m_bvhAabbMin,targetBvh->m_bvhAabbMin);
+		btSwapVector3Endian(m_bvhAabbMax,targetBvh->m_bvhAabbMax);
+		btSwapVector3Endian(m_bvhQuantization,targetBvh->m_bvhQuantization);
+
+		targetBvh->m_traversalMode = (btTraversalMode)btSwapEndian(m_traversalMode);
+		targetBvh->m_subtreeHeaderCount = static_cast<int>(btSwapEndian(m_subtreeHeaderCount));
+	}
+	else
+	{
+		targetBvh->m_curNodeIndex = m_curNodeIndex;
+		targetBvh->m_bvhAabbMin = m_bvhAabbMin;
+		targetBvh->m_bvhAabbMax = m_bvhAabbMax;
+		targetBvh->m_bvhQuantization = m_bvhQuantization;
+		targetBvh->m_traversalMode = m_traversalMode;
+		targetBvh->m_subtreeHeaderCount = m_subtreeHeaderCount;
+	}
+
+	targetBvh->m_useQuantization = m_useQuantization;
+
+	unsigned char *nodeData = (unsigned char *)targetBvh;
+	nodeData += sizeof(btQuantizedBvh);
+	
+	unsigned sizeToAdd = 0;//(BVH_ALIGNMENT-((unsigned)nodeData & BVH_ALIGNMENT_MASK))&BVH_ALIGNMENT_MASK;
+	nodeData += sizeToAdd;
+	
+	int nodeCount = m_curNodeIndex;
+
+	if (m_useQuantization)
+	{
+		targetBvh->m_quantizedContiguousNodes.initializeFromBuffer(nodeData, nodeCount, nodeCount);
+
+		if (i_swapEndian)
+		{
+			for (int nodeIndex = 0; nodeIndex < nodeCount; nodeIndex++)
+			{
+				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[0] = btSwapEndian(m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[0]);
+				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[1] = btSwapEndian(m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[1]);
+				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[2] = btSwapEndian(m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[2]);
+
+				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[0] = btSwapEndian(m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[0]);
+				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[1] = btSwapEndian(m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[1]);
+				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[2] = btSwapEndian(m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[2]);
+
+				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_escapeIndexOrTriangleIndex = static_cast<int>(btSwapEndian(m_quantizedContiguousNodes[nodeIndex].m_escapeIndexOrTriangleIndex));
+			}
+		}
+		else
+		{
+			for (int nodeIndex = 0; nodeIndex < nodeCount; nodeIndex++)
+			{
+	
+				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[0] = m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[0];
+				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[1] = m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[1];
+				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[2] = m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[2];
+
+				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[0] = m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[0];
+				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[1] = m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[1];
+				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[2] = m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[2];
+
+				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_escapeIndexOrTriangleIndex = m_quantizedContiguousNodes[nodeIndex].m_escapeIndexOrTriangleIndex;
+
+
+			}
+		}
+		nodeData += sizeof(btQuantizedBvhNode) * nodeCount;
+	}
+	else
+	{
+		targetBvh->m_contiguousNodes.initializeFromBuffer(nodeData, nodeCount, nodeCount);
+
+		if (i_swapEndian)
+		{
+			for (int nodeIndex = 0; nodeIndex < nodeCount; nodeIndex++)
+			{
+				btSwapVector3Endian(m_contiguousNodes[nodeIndex].m_aabbMinOrg, targetBvh->m_contiguousNodes[nodeIndex].m_aabbMinOrg);
+				btSwapVector3Endian(m_contiguousNodes[nodeIndex].m_aabbMaxOrg, targetBvh->m_contiguousNodes[nodeIndex].m_aabbMaxOrg);
+
+				targetBvh->m_contiguousNodes[nodeIndex].m_escapeIndex = static_cast<int>(btSwapEndian(m_contiguousNodes[nodeIndex].m_escapeIndex));
+				targetBvh->m_contiguousNodes[nodeIndex].m_subPart = static_cast<int>(btSwapEndian(m_contiguousNodes[nodeIndex].m_subPart));
+				targetBvh->m_contiguousNodes[nodeIndex].m_triangleIndex = static_cast<int>(btSwapEndian(m_contiguousNodes[nodeIndex].m_triangleIndex));
+			}
+		}
+		else
+		{
+			for (int nodeIndex = 0; nodeIndex < nodeCount; nodeIndex++)
+			{
+				targetBvh->m_contiguousNodes[nodeIndex].m_aabbMinOrg = m_contiguousNodes[nodeIndex].m_aabbMinOrg;
+				targetBvh->m_contiguousNodes[nodeIndex].m_aabbMaxOrg = m_contiguousNodes[nodeIndex].m_aabbMaxOrg;
+
+				targetBvh->m_contiguousNodes[nodeIndex].m_escapeIndex = m_contiguousNodes[nodeIndex].m_escapeIndex;
+				targetBvh->m_contiguousNodes[nodeIndex].m_subPart = m_contiguousNodes[nodeIndex].m_subPart;
+				targetBvh->m_contiguousNodes[nodeIndex].m_triangleIndex = m_contiguousNodes[nodeIndex].m_triangleIndex;
+			}
+		}
+		nodeData += sizeof(btOptimizedBvhNode) * nodeCount;
+	}
+
+	sizeToAdd = 0;//(BVH_ALIGNMENT-((unsigned)nodeData & BVH_ALIGNMENT_MASK))&BVH_ALIGNMENT_MASK;
+	nodeData += sizeToAdd;
+
+	// Now serialize the subtree headers
+	targetBvh->m_SubtreeHeaders.initializeFromBuffer(nodeData, m_subtreeHeaderCount, m_subtreeHeaderCount);
+	if (i_swapEndian)
+	{
+		for (int i = 0; i < m_subtreeHeaderCount; i++)
+		{
+			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMin[0] = btSwapEndian(m_SubtreeHeaders[i].m_quantizedAabbMin[0]);
+			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMin[1] = btSwapEndian(m_SubtreeHeaders[i].m_quantizedAabbMin[1]);
+			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMin[2] = btSwapEndian(m_SubtreeHeaders[i].m_quantizedAabbMin[2]);
+
+			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMax[0] = btSwapEndian(m_SubtreeHeaders[i].m_quantizedAabbMax[0]);
+			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMax[1] = btSwapEndian(m_SubtreeHeaders[i].m_quantizedAabbMax[1]);
+			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMax[2] = btSwapEndian(m_SubtreeHeaders[i].m_quantizedAabbMax[2]);
+
+			targetBvh->m_SubtreeHeaders[i].m_rootNodeIndex = static_cast<int>(btSwapEndian(m_SubtreeHeaders[i].m_rootNodeIndex));
+			targetBvh->m_SubtreeHeaders[i].m_subtreeSize = static_cast<int>(btSwapEndian(m_SubtreeHeaders[i].m_subtreeSize));
+		}
+	}
+	else
+	{
+		for (int i = 0; i < m_subtreeHeaderCount; i++)
+		{
+			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMin[0] = (m_SubtreeHeaders[i].m_quantizedAabbMin[0]);
+			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMin[1] = (m_SubtreeHeaders[i].m_quantizedAabbMin[1]);
+			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMin[2] = (m_SubtreeHeaders[i].m_quantizedAabbMin[2]);
+
+			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMax[0] = (m_SubtreeHeaders[i].m_quantizedAabbMax[0]);
+			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMax[1] = (m_SubtreeHeaders[i].m_quantizedAabbMax[1]);
+			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMax[2] = (m_SubtreeHeaders[i].m_quantizedAabbMax[2]);
+
+			targetBvh->m_SubtreeHeaders[i].m_rootNodeIndex = (m_SubtreeHeaders[i].m_rootNodeIndex);
+			targetBvh->m_SubtreeHeaders[i].m_subtreeSize = (m_SubtreeHeaders[i].m_subtreeSize);
+			targetBvh->m_SubtreeHeaders[i] = m_SubtreeHeaders[i];
+		}
+	}
+
+	nodeData += sizeof(btBvhSubtreeInfo) * m_subtreeHeaderCount;
+
+	return true;
+}
+
+btQuantizedBvh *btQuantizedBvh::deSerializeInPlace(void *i_alignedDataBuffer, unsigned int i_dataBufferSize, bool i_swapEndian)
+{
+
+	if (i_alignedDataBuffer == NULL)// || (((unsigned)i_alignedDataBuffer & BVH_ALIGNMENT_MASK) != 0))
+	{
+		return NULL;
+	}
+	btQuantizedBvh *bvh = (btQuantizedBvh *)i_alignedDataBuffer;
+
+	if (i_swapEndian)
+	{
+		bvh->m_curNodeIndex = static_cast<int>(btSwapEndian(bvh->m_curNodeIndex));
+
+		btUnSwapVector3Endian(bvh->m_bvhAabbMin);
+		btUnSwapVector3Endian(bvh->m_bvhAabbMax);
+		btUnSwapVector3Endian(bvh->m_bvhQuantization);
+
+		bvh->m_traversalMode = (btTraversalMode)btSwapEndian(bvh->m_traversalMode);
+		bvh->m_subtreeHeaderCount = static_cast<int>(btSwapEndian(bvh->m_subtreeHeaderCount));
+	}
+
+	unsigned int calculatedBufSize = bvh->calculateSerializeBufferSize();
+	btAssert(calculatedBufSize <= i_dataBufferSize);
+
+	if (calculatedBufSize > i_dataBufferSize)
+	{
+		return NULL;
+	}
+
+	unsigned char *nodeData = (unsigned char *)bvh;
+	nodeData += sizeof(btQuantizedBvh);
+	
+	unsigned sizeToAdd = 0;//(BVH_ALIGNMENT-((unsigned)nodeData & BVH_ALIGNMENT_MASK))&BVH_ALIGNMENT_MASK;
+	nodeData += sizeToAdd;
+	
+	int nodeCount = bvh->m_curNodeIndex;
+
+	// Must call placement new to fill in virtual function table, etc, but we don't want to overwrite most data, so call a special version of the constructor
+	// Also, m_leafNodes and m_quantizedLeafNodes will be initialized to default values by the constructor
+	new (bvh) btQuantizedBvh(*bvh, false);
+
+	if (bvh->m_useQuantization)
+	{
+		bvh->m_quantizedContiguousNodes.initializeFromBuffer(nodeData, nodeCount, nodeCount);
+
+		if (i_swapEndian)
+		{
+			for (int nodeIndex = 0; nodeIndex < nodeCount; nodeIndex++)
+			{
+				bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[0] = btSwapEndian(bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[0]);
+				bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[1] = btSwapEndian(bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[1]);
+				bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[2] = btSwapEndian(bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[2]);
+
+				bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[0] = btSwapEndian(bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[0]);
+				bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[1] = btSwapEndian(bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[1]);
+				bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[2] = btSwapEndian(bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[2]);
+
+				bvh->m_quantizedContiguousNodes[nodeIndex].m_escapeIndexOrTriangleIndex = static_cast<int>(btSwapEndian(bvh->m_quantizedContiguousNodes[nodeIndex].m_escapeIndexOrTriangleIndex));
+			}
+		}
+		nodeData += sizeof(btQuantizedBvhNode) * nodeCount;
+	}
+	else
+	{
+		bvh->m_contiguousNodes.initializeFromBuffer(nodeData, nodeCount, nodeCount);
+
+		if (i_swapEndian)
+		{
+			for (int nodeIndex = 0; nodeIndex < nodeCount; nodeIndex++)
+			{
+				btUnSwapVector3Endian(bvh->m_contiguousNodes[nodeIndex].m_aabbMinOrg);
+				btUnSwapVector3Endian(bvh->m_contiguousNodes[nodeIndex].m_aabbMaxOrg);
+				
+				bvh->m_contiguousNodes[nodeIndex].m_escapeIndex = static_cast<int>(btSwapEndian(bvh->m_contiguousNodes[nodeIndex].m_escapeIndex));
+				bvh->m_contiguousNodes[nodeIndex].m_subPart = static_cast<int>(btSwapEndian(bvh->m_contiguousNodes[nodeIndex].m_subPart));
+				bvh->m_contiguousNodes[nodeIndex].m_triangleIndex = static_cast<int>(btSwapEndian(bvh->m_contiguousNodes[nodeIndex].m_triangleIndex));
+			}
+		}
+		nodeData += sizeof(btOptimizedBvhNode) * nodeCount;
+	}
+
+	sizeToAdd = 0;//(BVH_ALIGNMENT-((unsigned)nodeData & BVH_ALIGNMENT_MASK))&BVH_ALIGNMENT_MASK;
+	nodeData += sizeToAdd;
+
+	// Now serialize the subtree headers
+	bvh->m_SubtreeHeaders.initializeFromBuffer(nodeData, bvh->m_subtreeHeaderCount, bvh->m_subtreeHeaderCount);
+	if (i_swapEndian)
+	{
+		for (int i = 0; i < bvh->m_subtreeHeaderCount; i++)
+		{
+			bvh->m_SubtreeHeaders[i].m_quantizedAabbMin[0] = btSwapEndian(bvh->m_SubtreeHeaders[i].m_quantizedAabbMin[0]);
+			bvh->m_SubtreeHeaders[i].m_quantizedAabbMin[1] = btSwapEndian(bvh->m_SubtreeHeaders[i].m_quantizedAabbMin[1]);
+			bvh->m_SubtreeHeaders[i].m_quantizedAabbMin[2] = btSwapEndian(bvh->m_SubtreeHeaders[i].m_quantizedAabbMin[2]);
+
+			bvh->m_SubtreeHeaders[i].m_quantizedAabbMax[0] = btSwapEndian(bvh->m_SubtreeHeaders[i].m_quantizedAabbMax[0]);
+			bvh->m_SubtreeHeaders[i].m_quantizedAabbMax[1] = btSwapEndian(bvh->m_SubtreeHeaders[i].m_quantizedAabbMax[1]);
+			bvh->m_SubtreeHeaders[i].m_quantizedAabbMax[2] = btSwapEndian(bvh->m_SubtreeHeaders[i].m_quantizedAabbMax[2]);
+
+			bvh->m_SubtreeHeaders[i].m_rootNodeIndex = static_cast<int>(btSwapEndian(bvh->m_SubtreeHeaders[i].m_rootNodeIndex));
+			bvh->m_SubtreeHeaders[i].m_subtreeSize = static_cast<int>(btSwapEndian(bvh->m_SubtreeHeaders[i].m_subtreeSize));
+		}
+	}
+
+	return bvh;
+}
+
+// Constructor that prevents btVector3's default constructor from being called
+btQuantizedBvh::btQuantizedBvh(btQuantizedBvh &self, bool /* ownsMemory */) :
+m_bvhAabbMin(self.m_bvhAabbMin),
+m_bvhAabbMax(self.m_bvhAabbMax),
+m_bvhQuantization(self.m_bvhQuantization)
+{
+
+
+}
+
+
+
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
new file mode 100644
index 00000000000..8a149b533fa
--- /dev/null
+++ b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
@@ -0,0 +1,486 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef QUANTIZED_BVH_H
+#define QUANTIZED_BVH_H
+
+//#define DEBUG_CHECK_DEQUANTIZATION 1
+#ifdef DEBUG_CHECK_DEQUANTIZATION
+#ifdef __SPU__
+#define printf spu_printf
+#endif //__SPU__
+
+#include <stdio.h>
+#include <stdlib.h>
+#endif //DEBUG_CHECK_DEQUANTIZATION
+
+#include "LinearMath/btVector3.h"
+#include "LinearMath/btAlignedAllocator.h"
+
+
+//http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclang/html/vclrf__m128.asp
+
+
+//Note: currently we have 16 bytes per quantized node
+#define MAX_SUBTREE_SIZE_IN_BYTES  2048
+
+// 10 gives the potential for 1024 parts, with at most 2^21 (2097152) (minus one
+// actually) triangles each (since the sign bit is reserved
+#define MAX_NUM_PARTS_IN_BITS 10
+
+///btQuantizedBvhNode is a compressed aabb node, 16 bytes.
+///Node can be used for leafnode or internal node. Leafnodes can point to 32-bit triangle index (non-negative range).
+ATTRIBUTE_ALIGNED16	(struct) btQuantizedBvhNode
+{
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	//12 bytes
+	unsigned short int	m_quantizedAabbMin[3];
+	unsigned short int	m_quantizedAabbMax[3];
+	//4 bytes
+	int	m_escapeIndexOrTriangleIndex;
+
+	bool isLeafNode() const
+	{
+		//skipindex is negative (internal node), triangleindex >=0 (leafnode)
+		return (m_escapeIndexOrTriangleIndex >= 0);
+	}
+	int getEscapeIndex() const
+	{
+		btAssert(!isLeafNode());
+		return -m_escapeIndexOrTriangleIndex;
+	}
+	int	getTriangleIndex() const
+	{
+		btAssert(isLeafNode());
+		// Get only the lower bits where the triangle index is stored
+		return (m_escapeIndexOrTriangleIndex&~((~0)<<(31-MAX_NUM_PARTS_IN_BITS)));
+	}
+	int	getPartId() const
+	{
+		btAssert(isLeafNode());
+		// Get only the highest bits where the part index is stored
+		return (m_escapeIndexOrTriangleIndex>>(31-MAX_NUM_PARTS_IN_BITS));
+	}
+}
+;
+
+/// btOptimizedBvhNode contains both internal and leaf node information.
+/// Total node size is 44 bytes / node. You can use the compressed version of 16 bytes.
+ATTRIBUTE_ALIGNED16 (struct) btOptimizedBvhNode
+{
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	//32 bytes
+	btVector3	m_aabbMinOrg;
+	btVector3	m_aabbMaxOrg;
+
+	//4
+	int	m_escapeIndex;
+
+	//8
+	//for child nodes
+	int	m_subPart;
+	int	m_triangleIndex;
+	int	m_padding[5];//bad, due to alignment
+
+
+};
+
+
+///btBvhSubtreeInfo provides info to gather a subtree of limited size
+ATTRIBUTE_ALIGNED16(class) btBvhSubtreeInfo
+{
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	//12 bytes
+	unsigned short int	m_quantizedAabbMin[3];
+	unsigned short int	m_quantizedAabbMax[3];
+	//4 bytes, points to the root of the subtree
+	int			m_rootNodeIndex;
+	//4 bytes
+	int			m_subtreeSize;
+	int			m_padding[3];
+
+	btBvhSubtreeInfo()
+	{
+		//memset(&m_padding[0], 0, sizeof(m_padding));
+	}
+
+
+	void	setAabbFromQuantizeNode(const btQuantizedBvhNode& quantizedNode)
+	{
+		m_quantizedAabbMin[0] = quantizedNode.m_quantizedAabbMin[0];
+		m_quantizedAabbMin[1] = quantizedNode.m_quantizedAabbMin[1];
+		m_quantizedAabbMin[2] = quantizedNode.m_quantizedAabbMin[2];
+		m_quantizedAabbMax[0] = quantizedNode.m_quantizedAabbMax[0];
+		m_quantizedAabbMax[1] = quantizedNode.m_quantizedAabbMax[1];
+		m_quantizedAabbMax[2] = quantizedNode.m_quantizedAabbMax[2];
+	}
+}
+;
+
+
+class btNodeOverlapCallback
+{
+public:
+	virtual ~btNodeOverlapCallback() {};
+
+	virtual void processNode(int subPart, int triangleIndex) = 0;
+};
+
+#include "LinearMath/btAlignedAllocator.h"
+#include "LinearMath/btAlignedObjectArray.h"
+
+
+
+///for code readability:
+typedef btAlignedObjectArray<btOptimizedBvhNode>	NodeArray;
+typedef btAlignedObjectArray<btQuantizedBvhNode>	QuantizedNodeArray;
+typedef btAlignedObjectArray<btBvhSubtreeInfo>		BvhSubtreeInfoArray;
+
+
+///The btQuantizedBvh class stores an AABB tree that can be quickly traversed on CPU and Cell SPU.
+///It is used by the btBvhTriangleMeshShape as midphase, and by the btMultiSapBroadphase.
+///It is recommended to use quantization for better performance and lower memory requirements.
+ATTRIBUTE_ALIGNED16(class) btQuantizedBvh
+{
+protected:
+
+	NodeArray			m_leafNodes;
+	NodeArray			m_contiguousNodes;
+
+	QuantizedNodeArray	m_quantizedLeafNodes;
+	
+	QuantizedNodeArray	m_quantizedContiguousNodes;
+	
+	int					m_curNodeIndex;
+
+
+	//quantization data
+	bool				m_useQuantization;
+	btVector3			m_bvhAabbMin;
+	btVector3			m_bvhAabbMax;
+	btVector3			m_bvhQuantization;
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	enum btTraversalMode
+	{
+		TRAVERSAL_STACKLESS = 0,
+		TRAVERSAL_STACKLESS_CACHE_FRIENDLY,
+		TRAVERSAL_RECURSIVE
+	};
+protected:
+
+	btTraversalMode	m_traversalMode;
+	
+	BvhSubtreeInfoArray		m_SubtreeHeaders;
+
+	//This is only used for serialization so we don't have to add serialization directly to btAlignedObjectArray
+	int m_subtreeHeaderCount;
+
+
+	///two versions, one for quantized and normal nodes. This allows code-reuse while maintaining readability (no template/macro!)
+	///this might be refactored into a virtual, it is usually not calculated at run-time
+	void	setInternalNodeAabbMin(int nodeIndex, const btVector3& aabbMin)
+	{
+		if (m_useQuantization)
+		{
+			quantize(&m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[0] ,aabbMin,0);
+		} else
+		{
+			m_contiguousNodes[nodeIndex].m_aabbMinOrg = aabbMin;
+
+		}
+	}
+	void	setInternalNodeAabbMax(int nodeIndex,const btVector3& aabbMax)
+	{
+		if (m_useQuantization)
+		{
+			quantize(&m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[0],aabbMax,1);
+		} else
+		{
+			m_contiguousNodes[nodeIndex].m_aabbMaxOrg = aabbMax;
+		}
+	}
+
+	btVector3 getAabbMin(int nodeIndex) const
+	{
+		if (m_useQuantization)
+		{
+			return unQuantize(&m_quantizedLeafNodes[nodeIndex].m_quantizedAabbMin[0]);
+		}
+		//non-quantized
+		return m_leafNodes[nodeIndex].m_aabbMinOrg;
+
+	}
+	btVector3 getAabbMax(int nodeIndex) const
+	{
+		if (m_useQuantization)
+		{
+			return unQuantize(&m_quantizedLeafNodes[nodeIndex].m_quantizedAabbMax[0]);
+		} 
+		//non-quantized
+		return m_leafNodes[nodeIndex].m_aabbMaxOrg;
+		
+	}
+
+	
+	void	setInternalNodeEscapeIndex(int nodeIndex, int escapeIndex)
+	{
+		if (m_useQuantization)
+		{
+			m_quantizedContiguousNodes[nodeIndex].m_escapeIndexOrTriangleIndex = -escapeIndex;
+		} 
+		else
+		{
+			m_contiguousNodes[nodeIndex].m_escapeIndex = escapeIndex;
+		}
+
+	}
+
+	void mergeInternalNodeAabb(int nodeIndex,const btVector3& newAabbMin,const btVector3& newAabbMax) 
+	{
+		if (m_useQuantization)
+		{
+			unsigned short int quantizedAabbMin[3];
+			unsigned short int quantizedAabbMax[3];
+			quantize(quantizedAabbMin,newAabbMin,0);
+			quantize(quantizedAabbMax,newAabbMax,1);
+			for (int i=0;i<3;i++)
+			{
+				if (m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[i] > quantizedAabbMin[i])
+					m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[i] = quantizedAabbMin[i];
+
+				if (m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[i] < quantizedAabbMax[i])
+					m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[i] = quantizedAabbMax[i];
+
+			}
+		} else
+		{
+			//non-quantized
+			m_contiguousNodes[nodeIndex].m_aabbMinOrg.setMin(newAabbMin);
+			m_contiguousNodes[nodeIndex].m_aabbMaxOrg.setMax(newAabbMax);		
+		}
+	}
+
+	void	swapLeafNodes(int firstIndex,int secondIndex);
+
+	void	assignInternalNodeFromLeafNode(int internalNode,int leafNodeIndex);
+
+protected:
+
+	
+
+	void	buildTree	(int startIndex,int endIndex);
+
+	int	calcSplittingAxis(int startIndex,int endIndex);
+
+	int	sortAndCalcSplittingIndex(int startIndex,int endIndex,int splitAxis);
+	
+	void	walkStacklessTree(btNodeOverlapCallback* nodeCallback,const btVector3& aabbMin,const btVector3& aabbMax) const;
+
+	void	walkStacklessQuantizedTreeAgainstRay(btNodeOverlapCallback* nodeCallback, const btVector3& raySource, const btVector3& rayTarget, const btVector3& aabbMin, const btVector3& aabbMax, int startNodeIndex,int endNodeIndex) const;
+	void	walkStacklessQuantizedTree(btNodeOverlapCallback* nodeCallback,unsigned short int* quantizedQueryAabbMin,unsigned short int* quantizedQueryAabbMax,int startNodeIndex,int endNodeIndex) const;
+
+	///tree traversal designed for small-memory processors like PS3 SPU
+	void	walkStacklessQuantizedTreeCacheFriendly(btNodeOverlapCallback* nodeCallback,unsigned short int* quantizedQueryAabbMin,unsigned short int* quantizedQueryAabbMax) const;
+
+	///use the 16-byte stackless 'skipindex' node tree to do a recursive traversal
+	void	walkRecursiveQuantizedTreeAgainstQueryAabb(const btQuantizedBvhNode* currentNode,btNodeOverlapCallback* nodeCallback,unsigned short int* quantizedQueryAabbMin,unsigned short int* quantizedQueryAabbMax) const;
+
+	///use the 16-byte stackless 'skipindex' node tree to do a recursive traversal
+	void	walkRecursiveQuantizedTreeAgainstQuantizedTree(const btQuantizedBvhNode* treeNodeA,const btQuantizedBvhNode* treeNodeB,btNodeOverlapCallback* nodeCallback) const;
+	
+
+#define USE_BANCHLESS 1
+#ifdef USE_BANCHLESS
+	//This block replaces the block below and uses no branches, and replaces the 8 bit return with a 32 bit return for improved performance (~3x on XBox 360)
+	SIMD_FORCE_INLINE unsigned testQuantizedAabbAgainstQuantizedAabb(unsigned short int* aabbMin1,unsigned short int* aabbMax1,const unsigned short int* aabbMin2,const unsigned short int* aabbMax2) const
+	{		
+		return static_cast<unsigned int>(btSelect((unsigned)((aabbMin1[0] <= aabbMax2[0]) & (aabbMax1[0] >= aabbMin2[0])
+			& (aabbMin1[2] <= aabbMax2[2]) & (aabbMax1[2] >= aabbMin2[2])
+			& (aabbMin1[1] <= aabbMax2[1]) & (aabbMax1[1] >= aabbMin2[1])),
+			1, 0));
+	}
+#else
+	SIMD_FORCE_INLINE bool testQuantizedAabbAgainstQuantizedAabb(unsigned short int* aabbMin1,unsigned short int* aabbMax1,const unsigned short int* aabbMin2,const unsigned short int* aabbMax2) const
+	{
+		bool overlap = true;
+		overlap = (aabbMin1[0] > aabbMax2[0] || aabbMax1[0] < aabbMin2[0]) ? false : overlap;
+		overlap = (aabbMin1[2] > aabbMax2[2] || aabbMax1[2] < aabbMin2[2]) ? false : overlap;
+		overlap = (aabbMin1[1] > aabbMax2[1] || aabbMax1[1] < aabbMin2[1]) ? false : overlap;
+		return overlap;
+	}
+#endif //USE_BANCHLESS
+
+	void	updateSubtreeHeaders(int leftChildNodexIndex,int rightChildNodexIndex);
+
+public:
+	btQuantizedBvh();
+
+	virtual ~btQuantizedBvh();
+
+	
+	///***************************************** expert/internal use only *************************
+	void	setQuantizationValues(const btVector3& bvhAabbMin,const btVector3& bvhAabbMax,btScalar quantizationMargin=btScalar(1.0));
+	QuantizedNodeArray&	getLeafNodeArray() {			return	m_quantizedLeafNodes;	}
+	///buildInternal is expert use only: assumes that setQuantizationValues and LeafNodeArray are initialized
+	void	buildInternal();
+	///***************************************** expert/internal use only *************************
+
+	void	reportAabbOverlappingNodex(btNodeOverlapCallback* nodeCallback,const btVector3& aabbMin,const btVector3& aabbMax) const;
+	void	reportRayOverlappingNodex (btNodeOverlapCallback* nodeCallback, const btVector3& raySource, const btVector3& rayTarget) const;
+	void	reportBoxCastOverlappingNodex(btNodeOverlapCallback* nodeCallback, const btVector3& raySource, const btVector3& rayTarget, const btVector3& aabbMin,const btVector3& aabbMax) const;
+
+		SIMD_FORCE_INLINE void quantize(unsigned short* out, const btVector3& point,int isMax) const
+	{
+
+		btAssert(m_useQuantization);
+
+		btAssert(point.getX() <= m_bvhAabbMax.getX());
+		btAssert(point.getY() <= m_bvhAabbMax.getY());
+		btAssert(point.getZ() <= m_bvhAabbMax.getZ());
+
+		btAssert(point.getX() >= m_bvhAabbMin.getX());
+		btAssert(point.getY() >= m_bvhAabbMin.getY());
+		btAssert(point.getZ() >= m_bvhAabbMin.getZ());
+
+		btVector3 v = (point - m_bvhAabbMin) * m_bvhQuantization;
+		///Make sure rounding is done in a way that unQuantize(quantizeWithClamp(...)) is conservative
+		///end-points always set the first bit, so that they are sorted properly (so that neighbouring AABBs overlap properly)
+		///todo: double-check this
+		if (isMax)
+		{
+			out[0] = (unsigned short) (((unsigned short)(v.getX()+btScalar(1.)) | 1));
+			out[1] = (unsigned short) (((unsigned short)(v.getY()+btScalar(1.)) | 1));
+			out[2] = (unsigned short) (((unsigned short)(v.getZ()+btScalar(1.)) | 1));
+		} else
+		{
+			out[0] = (unsigned short) (((unsigned short)(v.getX()) & 0xfffe));
+			out[1] = (unsigned short) (((unsigned short)(v.getY()) & 0xfffe));
+			out[2] = (unsigned short) (((unsigned short)(v.getZ()) & 0xfffe));
+		}
+
+
+#ifdef DEBUG_CHECK_DEQUANTIZATION
+		btVector3 newPoint = unQuantize(out);
+		if (isMax)
+		{
+			if (newPoint.getX() < point.getX())
+			{
+				printf("unconservative X, diffX = %f, oldX=%f,newX=%f\n",newPoint.getX()-point.getX(), newPoint.getX(),point.getX());
+			}
+			if (newPoint.getY() < point.getY())
+			{
+				printf("unconservative Y, diffY = %f, oldY=%f,newY=%f\n",newPoint.getY()-point.getY(), newPoint.getY(),point.getY());
+			}
+			if (newPoint.getZ() < point.getZ())
+			{
+
+				printf("unconservative Z, diffZ = %f, oldZ=%f,newZ=%f\n",newPoint.getZ()-point.getZ(), newPoint.getZ(),point.getZ());
+			}
+		} else
+		{
+			if (newPoint.getX() > point.getX())
+			{
+				printf("unconservative X, diffX = %f, oldX=%f,newX=%f\n",newPoint.getX()-point.getX(), newPoint.getX(),point.getX());
+			}
+			if (newPoint.getY() > point.getY())
+			{
+				printf("unconservative Y, diffY = %f, oldY=%f,newY=%f\n",newPoint.getY()-point.getY(), newPoint.getY(),point.getY());
+			}
+			if (newPoint.getZ() > point.getZ())
+			{
+				printf("unconservative Z, diffZ = %f, oldZ=%f,newZ=%f\n",newPoint.getZ()-point.getZ(), newPoint.getZ(),point.getZ());
+			}
+		}
+#endif //DEBUG_CHECK_DEQUANTIZATION
+
+	}
+
+
+	SIMD_FORCE_INLINE void quantizeWithClamp(unsigned short* out, const btVector3& point2,int isMax) const
+	{
+
+		btAssert(m_useQuantization);
+
+		btVector3 clampedPoint(point2);
+		clampedPoint.setMax(m_bvhAabbMin);
+		clampedPoint.setMin(m_bvhAabbMax);
+
+		quantize(out,clampedPoint,isMax);
+
+	}
+	
+	SIMD_FORCE_INLINE btVector3	unQuantize(const unsigned short* vecIn) const
+	{
+			btVector3	vecOut;
+			vecOut.setValue(
+			(btScalar)(vecIn[0]) / (m_bvhQuantization.getX()),
+			(btScalar)(vecIn[1]) / (m_bvhQuantization.getY()),
+			(btScalar)(vecIn[2]) / (m_bvhQuantization.getZ()));
+			vecOut += m_bvhAabbMin;
+			return vecOut;
+	}
+
+	///setTraversalMode let's you choose between stackless, recursive or stackless cache friendly tree traversal. Note this is only implemented for quantized trees.
+	void	setTraversalMode(btTraversalMode	traversalMode)
+	{
+		m_traversalMode = traversalMode;
+	}
+
+
+	SIMD_FORCE_INLINE QuantizedNodeArray&	getQuantizedNodeArray()
+	{	
+		return	m_quantizedContiguousNodes;
+	}
+
+
+	SIMD_FORCE_INLINE BvhSubtreeInfoArray&	getSubtreeInfoArray()
+	{
+		return m_SubtreeHeaders;
+	}
+
+
+	/////Calculate space needed to store BVH for serialization
+	unsigned calculateSerializeBufferSize();
+
+	/// Data buffer MUST be 16 byte aligned
+	virtual bool serialize(void *o_alignedDataBuffer, unsigned i_dataBufferSize, bool i_swapEndian);
+
+	///deSerializeInPlace loads and initializes a BVH from a buffer in memory 'in place'
+	static btQuantizedBvh *deSerializeInPlace(void *i_alignedDataBuffer, unsigned int i_dataBufferSize, bool i_swapEndian);
+
+	static unsigned int getAlignmentSerializationPadding();
+
+	SIMD_FORCE_INLINE bool isQuantized()
+	{
+		return m_useQuantization;
+	}
+
+private:
+	// Special "copy" constructor that allows for in-place deserialization
+	// Prevents btVector3's default constructor from being called, but doesn't inialize much else
+	// ownsMemory should most likely be false if deserializing, and if you are not, don't call this (it also changes the function signature, which we need)
+	btQuantizedBvh(btQuantizedBvh &other, bool ownsMemory);
+
+}
+;
+
+
+#endif //QUANTIZED_BVH_H
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp
index 30bcbe0c5f1..2d27f22567f 100644
--- a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp
+++ b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp
@@ -14,83 +14,86 @@ subject to the following restrictions:
 */
 
 #include "btSimpleBroadphase.h"
-#include <BulletCollision/BroadphaseCollision/btDispatcher.h>
-#include <BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h>
+#include "BulletCollision/BroadphaseCollision/btDispatcher.h"
+#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
 
 #include "LinearMath/btVector3.h"
 #include "LinearMath/btTransform.h"
 #include "LinearMath/btMatrix3x3.h"
 #include <new>
 
+extern int gOverlappingPairs;
 
 void	btSimpleBroadphase::validate()
 {
-	for (int i=0;i<m_numProxies;i++)
+	for (int i=0;i<m_numHandles;i++)
 	{
-		for (int j=i+1;j<m_numProxies;j++)
+		for (int j=i+1;j<m_numHandles;j++)
 		{
-			assert(m_pProxies[i] != m_pProxies[j]);
+			btAssert(&m_pHandles[i] != &m_pHandles[j]);
 		}
 	}
 	
 }
 
-btSimpleBroadphase::btSimpleBroadphase(int maxProxies)
-	:btOverlappingPairCache(),
-	m_firstFreeProxy(0),
-	m_numProxies(0),
-	m_maxProxies(maxProxies)
+btSimpleBroadphase::btSimpleBroadphase(int maxProxies, btOverlappingPairCache* overlappingPairCache)
+	:m_pairCache(overlappingPairCache),
+	m_ownsPairCache(false),
+	m_invalidPair(0)
 {
 
-	m_proxies = new btSimpleBroadphaseProxy[maxProxies];
-	m_freeProxies = new int[maxProxies];
-	m_pProxies = new btSimpleBroadphaseProxy*[maxProxies];
-	
-
-	int i;
-	for (i=0;i<m_maxProxies;i++)
+	if (!overlappingPairCache)
 	{
-		m_freeProxies[i] = i;
+		void* mem = btAlignedAlloc(sizeof(btHashedOverlappingPairCache),16);
+		m_pairCache = new (mem)btHashedOverlappingPairCache();
+		m_ownsPairCache = true;
 	}
+
+	// allocate handles buffer and put all handles on free list
+	m_pHandlesRawPtr = btAlignedAlloc(sizeof(btSimpleBroadphaseProxy)*maxProxies,16);
+	m_pHandles = new(m_pHandlesRawPtr) btSimpleBroadphaseProxy[maxProxies];
+	m_maxHandles = maxProxies;
+	m_numHandles = 0;
+	m_firstFreeHandle = 0;
+	m_firstAllocatedHandle = -1;
+
+	{
+		for (int i = m_firstFreeHandle; i < maxProxies; i++)
+		{
+			m_pHandles[i].SetNextFree(i + 1);
+			m_pHandles[i].m_uniqueId = i+2;//any UID will do, we just avoid too trivial values (0,1) for debugging purposes
+			m_pHandles[i].SetNextAllocated(-1);
+		}
+		m_pHandles[maxProxies - 1].SetNextFree(0);
+		m_pHandles[maxProxies - 1].SetNextAllocated(-1);
+	
+	}
+
 }
 
 btSimpleBroadphase::~btSimpleBroadphase()
 {
-	delete[] m_proxies;
-	delete []m_freeProxies;
-	delete [] m_pProxies;
+	btAlignedFree(m_pHandlesRawPtr);
 
-	/*int i;
-	for (i=m_numProxies-1;i>=0;i--)
+	if (m_ownsPairCache)
 	{
-		BP_Proxy* proxy = m_pProxies[i]; 
-		destroyProxy(proxy);
+		m_pairCache->~btOverlappingPairCache();
+		btAlignedFree(m_pairCache);
 	}
-	*/
 }
 
 
-btBroadphaseProxy*	btSimpleBroadphase::createProxy(  const btVector3& min,  const btVector3& max,int shapeType,void* userPtr ,short int collisionFilterGroup,short int collisionFilterMask)
+btBroadphaseProxy*	btSimpleBroadphase::createProxy(  const btVector3& aabbMin,  const btVector3& aabbMax,int shapeType,void* userPtr ,short int collisionFilterGroup,short int collisionFilterMask, btDispatcher* /*dispatcher*/,void* multiSapProxy)
 {
-	if (m_numProxies >= m_maxProxies)
+	if (m_numHandles >= m_maxHandles)
 	{
-		assert(0);
+		btAssert(0);
 		return 0; //should never happen, but don't let the game crash ;-)
 	}
-	assert(min[0]<= max[0] && min[1]<= max[1] && min[2]<= max[2]);
+	assert(aabbMin[0]<= aabbMax[0] && aabbMin[1]<= aabbMax[1] && aabbMin[2]<= aabbMax[2]);
 
-	int freeIndex= m_freeProxies[m_firstFreeProxy];
-	btSimpleBroadphaseProxy* proxy = new (&m_proxies[freeIndex])btSimpleBroadphaseProxy(min,max,shapeType,userPtr,collisionFilterGroup,collisionFilterMask);
-	m_firstFreeProxy++;
-
-	btSimpleBroadphaseProxy* proxy1 = &m_proxies[0];
-		
-	int	index = int(proxy - proxy1);
-	btAssert(index == freeIndex);
-
-	m_pProxies[m_numProxies] = proxy;
-	m_numProxies++;
-	//validate();
+	int newHandleIndex = allocHandle();
+	btSimpleBroadphaseProxy* proxy = new (&m_pHandles[newHandleIndex])btSimpleBroadphaseProxy(aabbMin,aabbMax,shapeType,userPtr,collisionFilterGroup,collisionFilterMask,multiSapProxy);
 
 	return proxy;
 }
@@ -124,34 +127,19 @@ protected:
 	};
 };
 
-void	btSimpleBroadphase::destroyProxy(btBroadphaseProxy* proxyOrg)
+void	btSimpleBroadphase::destroyProxy(btBroadphaseProxy* proxyOrg,btDispatcher* dispatcher)
 {
 		
-		int i;
-		
 		btSimpleBroadphaseProxy* proxy0 = static_cast<btSimpleBroadphaseProxy*>(proxyOrg);
-		btSimpleBroadphaseProxy* proxy1 = &m_proxies[0];
-	
-		int index = int(proxy0 - proxy1);
-		btAssert (index < m_maxProxies);
-		m_freeProxies[--m_firstFreeProxy] = index;
+		freeHandle(proxy0);
+
+		m_pairCache->removeOverlappingPairsContainingProxy(proxyOrg,dispatcher);
 
-		removeOverlappingPairsContainingProxy(proxyOrg);
-		
-		for (i=0;i<m_numProxies;i++)
-		{
-			if (m_pProxies[i] == proxyOrg)
-			{
-				m_pProxies[i] = m_pProxies[m_numProxies-1];
-				break;
-			}
-		}
-		m_numProxies--;
 		//validate();
 		
 }
 
-void	btSimpleBroadphase::setAabb(btBroadphaseProxy* proxy,const btVector3& aabbMin,const btVector3& aabbMax)
+void	btSimpleBroadphase::setAabb(btBroadphaseProxy* proxy,const btVector3& aabbMin,const btVector3& aabbMax, btDispatcher* /*dispatcher*/)
 {
 	btSimpleBroadphaseProxy* sbp = getSimpleProxyFromProxy(proxy);
 	sbp->m_min = aabbMin;
@@ -186,37 +174,137 @@ public:
 	}
 };
 
-void	btSimpleBroadphase::refreshOverlappingPairs()
+void	btSimpleBroadphase::calculateOverlappingPairs(btDispatcher* dispatcher)
 {
 	//first check for new overlapping pairs
 	int i,j;
 
-	for (i=0;i<m_numProxies;i++)
+	if (m_firstAllocatedHandle >= 0)
 	{
-		btBroadphaseProxy* proxy0 = m_pProxies[i];
-		for (j=i+1;j<m_numProxies;j++)
-		{
-			btBroadphaseProxy* proxy1 = m_pProxies[j];
-			btSimpleBroadphaseProxy* p0 = getSimpleProxyFromProxy(proxy0);
-			btSimpleBroadphaseProxy* p1 = getSimpleProxyFromProxy(proxy1);
 
-			if (aabbOverlap(p0,p1))
+		btSimpleBroadphaseProxy* proxy0 = &m_pHandles[m_firstAllocatedHandle];
+
+		for (i=0;i<m_numHandles;i++)
+		{
+			btSimpleBroadphaseProxy* proxy1 = &m_pHandles[m_firstAllocatedHandle];
+
+			for (j=0;j<m_numHandles;j++)
 			{
-				if ( !findPair(proxy0,proxy1))
+				
+				if (proxy0 != proxy1)
 				{
-					addOverlappingPair(proxy0,proxy1);
+					btSimpleBroadphaseProxy* p0 = getSimpleProxyFromProxy(proxy0);
+					btSimpleBroadphaseProxy* p1 = getSimpleProxyFromProxy(proxy1);
+
+					if (aabbOverlap(p0,p1))
+					{
+						if ( !m_pairCache->findPair(proxy0,proxy1))
+						{
+							m_pairCache->addOverlappingPair(proxy0,proxy1);
+						}
+					} else
+					{
+					if (!m_pairCache->hasDeferredRemoval())
+					{
+						if ( m_pairCache->findPair(proxy0,proxy1))
+						{
+							m_pairCache->removeOverlappingPair(proxy0,proxy1,dispatcher);
+						}
+					}
+
+					}
 				}
+				proxy1 = &m_pHandles[proxy1->GetNextAllocated()];
+
 			}
+			proxy0 = &m_pHandles[proxy0->GetNextAllocated()];
+
+		}
+
+		if (m_ownsPairCache && m_pairCache->hasDeferredRemoval())
+		{
+			
+			btBroadphasePairArray&	overlappingPairArray = m_pairCache->getOverlappingPairArray();
+
+			//perform a sort, to find duplicates and to sort 'invalid' pairs to the end
+			overlappingPairArray.quickSort(btBroadphasePairSortPredicate());
+
+			overlappingPairArray.resize(overlappingPairArray.size() - m_invalidPair);
+			m_invalidPair = 0;
+
+
+			btBroadphasePair previousPair;
+			previousPair.m_pProxy0 = 0;
+			previousPair.m_pProxy1 = 0;
+			previousPair.m_algorithm = 0;
+			
+			
+			for (i=0;i<overlappingPairArray.size();i++)
+			{
+			
+				btBroadphasePair& pair = overlappingPairArray[i];
+
+				bool isDuplicate = (pair == previousPair);
+
+				previousPair = pair;
+
+				bool needsRemoval = false;
+
+				if (!isDuplicate)
+				{
+					bool hasOverlap = testAabbOverlap(pair.m_pProxy0,pair.m_pProxy1);
+
+					if (hasOverlap)
+					{
+						needsRemoval = false;//callback->processOverlap(pair);
+					} else
+					{
+						needsRemoval = true;
+					}
+				} else
+				{
+					//remove duplicate
+					needsRemoval = true;
+					//should have no algorithm
+					btAssert(!pair.m_algorithm);
+				}
+				
+				if (needsRemoval)
+				{
+					m_pairCache->cleanOverlappingPair(pair,dispatcher);
+
+			//		m_overlappingPairArray.swap(i,m_overlappingPairArray.size()-1);
+			//		m_overlappingPairArray.pop_back();
+					pair.m_pProxy0 = 0;
+					pair.m_pProxy1 = 0;
+					m_invalidPair++;
+					gOverlappingPairs--;
+				} 
+				
+			}
+
+		///if you don't like to skip the invalid pairs in the array, execute following code:
+		#define CLEAN_INVALID_PAIRS 1
+		#ifdef CLEAN_INVALID_PAIRS
+
+			//perform a sort, to sort 'invalid' pairs to the end
+			overlappingPairArray.quickSort(btBroadphasePairSortPredicate());
+
+			overlappingPairArray.resize(overlappingPairArray.size() - m_invalidPair);
+			m_invalidPair = 0;
+		#endif//CLEAN_INVALID_PAIRS
 
 		}
 	}
-
-
-	CheckOverlapCallback	checkOverlap;
-
-	processAllOverlappingPairs(&checkOverlap);
-
-
 }
 
 
+bool btSimpleBroadphase::testAabbOverlap(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1)
+{
+	btSimpleBroadphaseProxy* p0 = getSimpleProxyFromProxy(proxy0);
+	btSimpleBroadphaseProxy* p1 = getSimpleProxyFromProxy(proxy1);
+	return aabbOverlap(p0,p1);
+}
+
+
+
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h
index fb155e7047c..49dfeb84900 100644
--- a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h
+++ b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h
@@ -24,35 +24,78 @@ struct btSimpleBroadphaseProxy : public btBroadphaseProxy
 {
 	btVector3	m_min;
 	btVector3	m_max;
+	int			m_nextFree;
+	int			m_nextAllocated;
+//	int			m_handleId;
+
 	
 	btSimpleBroadphaseProxy() {};
 
-	btSimpleBroadphaseProxy(const btPoint3& minpt,const btPoint3& maxpt,int shapeType,void* userPtr,short int collisionFilterGroup,short int collisionFilterMask)
-	:btBroadphaseProxy(userPtr,collisionFilterGroup,collisionFilterMask),
+	btSimpleBroadphaseProxy(const btPoint3& minpt,const btPoint3& maxpt,int shapeType,void* userPtr,short int collisionFilterGroup,short int collisionFilterMask,void* multiSapProxy)
+	:btBroadphaseProxy(userPtr,collisionFilterGroup,collisionFilterMask,multiSapProxy),
 	m_min(minpt),m_max(maxpt)		
 	{
 		(void)shapeType;
 	}
 	
+	
+	SIMD_FORCE_INLINE void SetNextFree(int next) {m_nextFree = next;}
+	SIMD_FORCE_INLINE int GetNextFree() const {return m_nextFree;}
+
+	SIMD_FORCE_INLINE void SetNextAllocated(int next) {m_nextAllocated = next;}
+	SIMD_FORCE_INLINE int GetNextAllocated() const {return m_nextAllocated;}
+
 
 };
 
-///SimpleBroadphase is a brute force aabb culling broadphase based on O(n^2) aabb checks
-class btSimpleBroadphase : public btOverlappingPairCache
+///The SimpleBroadphase is just a unit-test for btAxisSweep3, bt32BitAxisSweep3, or btDbvtBroadphase, so use those classes instead.
+///It is a brute force aabb culling broadphase based on O(n^2) aabb checks
+class btSimpleBroadphase : public btBroadphaseInterface
 {
 
 protected:
 
-	btSimpleBroadphaseProxy*	m_proxies;
-	int*				m_freeProxies;
-	int				m_firstFreeProxy;
+	int		m_numHandles;						// number of active handles
+	int		m_maxHandles;						// max number of handles
+	btSimpleBroadphaseProxy* m_pHandles;						// handles pool
+	void* m_pHandlesRawPtr;
+	int		m_firstFreeHandle;		// free handles list
+	int		m_firstAllocatedHandle;
 
-	btSimpleBroadphaseProxy** m_pProxies;
-	int				m_numProxies;
+	int allocHandle()
+	{
 
-	
+		int freeHandle = m_firstFreeHandle;
+		m_firstFreeHandle = m_pHandles[freeHandle].GetNextFree();
+		
+		m_pHandles[freeHandle].SetNextAllocated(m_firstAllocatedHandle);
+		m_firstAllocatedHandle = freeHandle;
+		
+		m_numHandles++;
+
+		return freeHandle;
+	}
+
+	void freeHandle(btSimpleBroadphaseProxy* proxy)
+	{
+		int handle = int(proxy-m_pHandles);
+		btAssert(handle >= 0 && handle < m_maxHandles);
+
+		proxy->SetNextFree(m_firstFreeHandle);
+		m_firstFreeHandle = handle;
+
+		m_firstAllocatedHandle = proxy->GetNextAllocated();
+		proxy->SetNextAllocated(-1);
+
+		m_numHandles--;
+	}
+
+
+	btOverlappingPairCache*	m_pairCache;
+	bool	m_ownsPairCache;
+
+	int	m_invalidPair;
 
-	int m_maxProxies;
 	
 	
 	inline btSimpleBroadphaseProxy*	getSimpleProxyFromProxy(btBroadphaseProxy* proxy)
@@ -67,26 +110,48 @@ protected:
 protected:
 
 
-	virtual void	refreshOverlappingPairs();
+	
+
 public:
-	btSimpleBroadphase(int maxProxies=16384);
+	btSimpleBroadphase(int maxProxies=16384,btOverlappingPairCache* overlappingPairCache=0);
 	virtual ~btSimpleBroadphase();
 
 
 		static bool	aabbOverlap(btSimpleBroadphaseProxy* proxy0,btSimpleBroadphaseProxy* proxy1);
 
 
-	virtual btBroadphaseProxy*	createProxy(  const btVector3& min,  const btVector3& max,int shapeType,void* userPtr ,short int collisionFilterGroup,short int collisionFilterMask);
+	virtual btBroadphaseProxy*	createProxy(  const btVector3& aabbMin,  const btVector3& aabbMax,int shapeType,void* userPtr ,short int collisionFilterGroup,short int collisionFilterMask, btDispatcher* dispatcher,void* multiSapProxy);
 
+	virtual void	calculateOverlappingPairs(btDispatcher* dispatcher);
 
-	virtual void	destroyProxy(btBroadphaseProxy* proxy);
-	virtual void	setAabb(btBroadphaseProxy* proxy,const btVector3& aabbMin,const btVector3& aabbMax);
+	virtual void	destroyProxy(btBroadphaseProxy* proxy,btDispatcher* dispatcher);
+	virtual void	setAabb(btBroadphaseProxy* proxy,const btVector3& aabbMin,const btVector3& aabbMax, btDispatcher* dispatcher);
 		
-	
-	
+	btOverlappingPairCache*	getOverlappingPairCache()
+	{
+		return m_pairCache;
+	}
+	const btOverlappingPairCache*	getOverlappingPairCache() const
+	{
+		return m_pairCache;
+	}
+
+	bool	testAabbOverlap(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1);
 
 
+	///getAabb returns the axis aligned bounding box in the 'global' coordinate frame
+	///will add some transform later
+	virtual void getBroadphaseAabb(btVector3& aabbMin,btVector3& aabbMax) const
+	{
+		aabbMin.setValue(-1e30f,-1e30f,-1e30f);
+		aabbMax.setValue(1e30f,1e30f,1e30f);
+	}
 
+	virtual void	printStats()
+	{
+//		printf("btSimpleBroadphase.h\n");
+//		printf("numHandles = %d, maxHandles = %d\n",m_numHandles,m_maxHandles);
+	}
 };
 
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp
index 81133670f0c..f6c1e32ac7c 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp
@@ -26,7 +26,7 @@ m_triangle(triangle)
 
 }
 
-void	SphereTriangleDetector::getClosestPoints(const ClosestPointInput& input,Result& output,class btIDebugDraw* debugDraw)
+void	SphereTriangleDetector::getClosestPoints(const ClosestPointInput& input,Result& output,class btIDebugDraw* debugDraw,bool swapResults)
 {
 
 	(void)debugDraw;
@@ -42,7 +42,16 @@ void	SphereTriangleDetector::getClosestPoints(const ClosestPointInput& input,Res
 
 	if (collide(sphereInTr.getOrigin(),point,normal,depth,timeOfImpact))
 	{
-		output.addContactPoint(transformB.getBasis()*normal,transformB*point,depth);
+		if (swapResults)
+		{
+			btVector3 normalOnB = transformB.getBasis()*normal;
+			btVector3 normalOnA = -normalOnB;
+			btVector3 pointOnA = transformB*point+normalOnB*depth;
+			output.addContactPoint(normalOnA,pointOnA,depth);
+		} else
+		{
+			output.addContactPoint(transformB.getBasis()*normal,transformB*point,depth);
+		}
 	}
 
 }
@@ -53,6 +62,8 @@ void	SphereTriangleDetector::getClosestPoints(const ClosestPointInput& input,Res
 
 // See also geometrictools.com
 // Basic idea: D = |p - (lo + t0*lv)| where t0 = lv . (p - lo) / lv . lv
+btScalar SegmentSqrDistance(const btVector3& from, const btVector3& to,const btVector3 &p, btVector3 &nearest);
+
 btScalar SegmentSqrDistance(const btVector3& from, const btVector3& to,const btVector3 &p, btVector3 &nearest) {
 	btVector3 diff = p - from;
 	btVector3 v = to - from;
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.h
index b32806a6846..26dabaa480e 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.h
@@ -16,8 +16,8 @@ subject to the following restrictions:
 #ifndef SPHERE_TRIANGLE_DETECTOR_H
 #define SPHERE_TRIANGLE_DETECTOR_H
 
-#include "../NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h"
-#include "../../LinearMath/btPoint3.h"
+#include "BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h"
+#include "LinearMath/btPoint3.h"
 
 
 class btSphereShape;
@@ -28,7 +28,7 @@ class btTriangleShape;
 /// sphere-triangle to match the btDiscreteCollisionDetectorInterface
 struct SphereTriangleDetector : public btDiscreteCollisionDetectorInterface
 {
-	virtual void	getClosestPoints(const ClosestPointInput& input,Result& output,class btIDebugDraw* debugDraw);
+	virtual void	getClosestPoints(const ClosestPointInput& input,Result& output,class btIDebugDraw* debugDraw,bool swapResults=false);
 
 	SphereTriangleDetector(btSphereShape* sphere,btTriangleShape* triangle);
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp
new file mode 100644
index 00000000000..cd0c028012c
--- /dev/null
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp
@@ -0,0 +1,85 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btBoxBoxCollisionAlgorithm.h"
+#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h"
+#include "BulletCollision/CollisionShapes/btBoxShape.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
+#include "btBoxBoxDetector.h"
+
+#define USE_PERSISTENT_CONTACTS 1
+
+btBoxBoxCollisionAlgorithm::btBoxBoxCollisionAlgorithm(btPersistentManifold* mf,const btCollisionAlgorithmConstructionInfo& ci,btCollisionObject* obj0,btCollisionObject* obj1)
+: btCollisionAlgorithm(ci),
+m_ownManifold(false),
+m_manifoldPtr(mf)
+{
+	if (!m_manifoldPtr && m_dispatcher->needsCollision(obj0,obj1))
+	{
+		m_manifoldPtr = m_dispatcher->getNewManifold(obj0,obj1);
+		m_ownManifold = true;
+	}
+}
+
+btBoxBoxCollisionAlgorithm::~btBoxBoxCollisionAlgorithm()
+{
+	if (m_ownManifold)
+	{
+		if (m_manifoldPtr)
+			m_dispatcher->releaseManifold(m_manifoldPtr);
+	}
+}
+
+void btBoxBoxCollisionAlgorithm::processCollision (btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut)
+{
+	if (!m_manifoldPtr)
+		return;
+
+	btCollisionObject*	col0 = body0;
+	btCollisionObject*	col1 = body1;
+	btBoxShape* box0 = (btBoxShape*)col0->getCollisionShape();
+	btBoxShape* box1 = (btBoxShape*)col1->getCollisionShape();
+
+
+
+	/// report a contact. internally this will be kept persistent, and contact reduction is done
+	resultOut->setPersistentManifold(m_manifoldPtr);
+#ifndef USE_PERSISTENT_CONTACTS	
+	m_manifoldPtr->clearManifold();
+#endif //USE_PERSISTENT_CONTACTS
+
+	btDiscreteCollisionDetectorInterface::ClosestPointInput input;
+	input.m_maximumDistanceSquared = 1e30f;
+	input.m_transformA = body0->getWorldTransform();
+	input.m_transformB = body1->getWorldTransform();
+
+	btBoxBoxDetector detector(box0,box1);
+	detector.getClosestPoints(input,*resultOut,dispatchInfo.m_debugDraw);
+
+#ifdef USE_PERSISTENT_CONTACTS
+	//  refreshContactPoints is only necessary when using persistent contact points. otherwise all points are newly added
+	if (m_ownManifold)
+	{
+		resultOut->refreshContactPoints();
+	}
+#endif //USE_PERSISTENT_CONTACTS
+
+}
+
+btScalar btBoxBoxCollisionAlgorithm::calculateTimeOfImpact(btCollisionObject* /*body0*/,btCollisionObject* /*body1*/,const btDispatcherInfo& /*dispatchInfo*/,btManifoldResult* /*resultOut*/)
+{
+	//not yet
+	return 1.f;
+}
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h
new file mode 100644
index 00000000000..35afaf175a1
--- /dev/null
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h
@@ -0,0 +1,66 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BOX_BOX__COLLISION_ALGORITHM_H
+#define BOX_BOX__COLLISION_ALGORITHM_H
+
+#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
+#include "BulletCollision/BroadphaseCollision/btDispatcher.h"
+#include "BulletCollision/CollisionDispatch/btCollisionCreateFunc.h"
+
+class btPersistentManifold;
+
+///box-box collision detection
+class btBoxBoxCollisionAlgorithm : public btCollisionAlgorithm
+{
+	bool	m_ownManifold;
+	btPersistentManifold*	m_manifoldPtr;
+	
+public:
+	btBoxBoxCollisionAlgorithm(const btCollisionAlgorithmConstructionInfo& ci)
+		: btCollisionAlgorithm(ci) {}
+
+	virtual void processCollision (btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut);
+
+	virtual btScalar calculateTimeOfImpact(btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut);
+
+	btBoxBoxCollisionAlgorithm(btPersistentManifold* mf,const btCollisionAlgorithmConstructionInfo& ci,btCollisionObject* body0,btCollisionObject* body1);
+
+	virtual ~btBoxBoxCollisionAlgorithm();
+
+	virtual	void	getAllContactManifolds(btManifoldArray&	manifoldArray)
+	{
+		if (m_manifoldPtr && m_ownManifold)
+		{
+			manifoldArray.push_back(m_manifoldPtr);
+		}
+	}
+
+
+	struct CreateFunc :public 	btCollisionAlgorithmCreateFunc
+	{
+		virtual	btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, btCollisionObject* body0,btCollisionObject* body1)
+		{
+			int bbsize = sizeof(btBoxBoxCollisionAlgorithm);
+			void* ptr = ci.m_dispatcher1->allocateCollisionAlgorithm(bbsize);
+			return new(ptr) btBoxBoxCollisionAlgorithm(0,ci,body0,body1);
+		}
+	};
+
+};
+
+#endif //BOX_BOX__COLLISION_ALGORITHM_H
+
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp
new file mode 100644
index 00000000000..e55604632c0
--- /dev/null
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp
@@ -0,0 +1,683 @@
+
+/*
+ * Box-Box collision detection re-distributed under the ZLib license with permission from Russell L. Smith
+ * Original version is from Open Dynamics Engine, Copyright (C) 2001,2002 Russell L. Smith.
+ * All rights reserved.  Email: russ@q12.org   Web: www.q12.org
+ Bullet Continuous Collision Detection and Physics Library
+ Bullet is Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+///ODE box-box collision detection is adapted to work with Bullet
+
+#include "btBoxBoxDetector.h"
+#include "BulletCollision/CollisionShapes/btBoxShape.h"
+
+#include <float.h>
+#include <string.h>
+
+btBoxBoxDetector::btBoxBoxDetector(btBoxShape* box1,btBoxShape* box2)
+: m_box1(box1),
+m_box2(box2)
+{
+
+}
+
+
+// given two boxes (p1,R1,side1) and (p2,R2,side2), collide them together and
+// generate contact points. this returns 0 if there is no contact otherwise
+// it returns the number of contacts generated.
+// `normal' returns the contact normal.
+// `depth' returns the maximum penetration depth along that normal.
+// `return_code' returns a number indicating the type of contact that was
+// detected:
+//        1,2,3 = box 2 intersects with a face of box 1
+//        4,5,6 = box 1 intersects with a face of box 2
+//        7..15 = edge-edge contact
+// `maxc' is the maximum number of contacts allowed to be generated, i.e.
+// the size of the `contact' array.
+// `contact' and `skip' are the contact array information provided to the
+// collision functions. this function only fills in the position and depth
+// fields.
+struct dContactGeom;
+#define dDOTpq(a,b,p,q) ((a)[0]*(b)[0] + (a)[p]*(b)[q] + (a)[2*(p)]*(b)[2*(q)])
+#define dInfinity FLT_MAX
+
+
+/*PURE_INLINE btScalar dDOT   (const btScalar *a, const btScalar *b) { return dDOTpq(a,b,1,1); }
+PURE_INLINE btScalar dDOT13 (const btScalar *a, const btScalar *b) { return dDOTpq(a,b,1,3); }
+PURE_INLINE btScalar dDOT31 (const btScalar *a, const btScalar *b) { return dDOTpq(a,b,3,1); }
+PURE_INLINE btScalar dDOT33 (const btScalar *a, const btScalar *b) { return dDOTpq(a,b,3,3); }
+*/
+static btScalar dDOT   (const btScalar *a, const btScalar *b) { return dDOTpq(a,b,1,1); }
+static btScalar dDOT44 (const btScalar *a, const btScalar *b) { return dDOTpq(a,b,4,4); }
+static btScalar dDOT41 (const btScalar *a, const btScalar *b) { return dDOTpq(a,b,4,1); }
+static btScalar dDOT14 (const btScalar *a, const btScalar *b) { return dDOTpq(a,b,1,4); }
+#define dMULTIPLYOP1_331(A,op,B,C) \
+{\
+  (A)[0] op dDOT41((B),(C)); \
+  (A)[1] op dDOT41((B+1),(C)); \
+  (A)[2] op dDOT41((B+2),(C)); \
+}
+
+#define dMULTIPLYOP0_331(A,op,B,C) \
+{ \
+  (A)[0] op dDOT((B),(C)); \
+  (A)[1] op dDOT((B+4),(C)); \
+  (A)[2] op dDOT((B+8),(C)); \
+} 
+
+#define dMULTIPLY1_331(A,B,C) dMULTIPLYOP1_331(A,=,B,C)
+#define dMULTIPLY0_331(A,B,C) dMULTIPLYOP0_331(A,=,B,C)
+
+typedef btScalar dMatrix3[4*3];
+
+void dLineClosestApproach (const btVector3& pa, const btVector3& ua,
+			   const btVector3& pb, const btVector3& ub,
+			   btScalar *alpha, btScalar *beta);
+void dLineClosestApproach (const btVector3& pa, const btVector3& ua,
+			   const btVector3& pb, const btVector3& ub,
+			   btScalar *alpha, btScalar *beta)
+{
+  btVector3 p;
+  p[0] = pb[0] - pa[0];
+  p[1] = pb[1] - pa[1];
+  p[2] = pb[2] - pa[2];
+  btScalar uaub = dDOT(ua,ub);
+  btScalar q1 =  dDOT(ua,p);
+  btScalar q2 = -dDOT(ub,p);
+  btScalar d = 1-uaub*uaub;
+  if (d <= btScalar(0.0001f)) {
+    // @@@ this needs to be made more robust
+    *alpha = 0;
+    *beta  = 0;
+  }
+  else {
+    d = 1.f/d;
+    *alpha = (q1 + uaub*q2)*d;
+    *beta  = (uaub*q1 + q2)*d;
+  }
+}
+
+
+
+// find all the intersection points between the 2D rectangle with vertices
+// at (+/-h[0],+/-h[1]) and the 2D quadrilateral with vertices (p[0],p[1]),
+// (p[2],p[3]),(p[4],p[5]),(p[6],p[7]).
+//
+// the intersection points are returned as x,y pairs in the 'ret' array.
+// the number of intersection points is returned by the function (this will
+// be in the range 0 to 8).
+
+static int intersectRectQuad2 (btScalar h[2], btScalar p[8], btScalar ret[16])
+{
+  // q (and r) contain nq (and nr) coordinate points for the current (and
+  // chopped) polygons
+  int nq=4,nr=0;
+  btScalar buffer[16];
+  btScalar *q = p;
+  btScalar *r = ret;
+  for (int dir=0; dir <= 1; dir++) {
+    // direction notation: xy[0] = x axis, xy[1] = y axis
+    for (int sign=-1; sign <= 1; sign += 2) {
+      // chop q along the line xy[dir] = sign*h[dir]
+      btScalar *pq = q;
+      btScalar *pr = r;
+      nr = 0;
+      for (int i=nq; i > 0; i--) {
+	// go through all points in q and all lines between adjacent points
+	if (sign*pq[dir] < h[dir]) {
+	  // this point is inside the chopping line
+	  pr[0] = pq[0];
+	  pr[1] = pq[1];
+	  pr += 2;
+	  nr++;
+	  if (nr & 8) {
+	    q = r;
+	    goto done;
+	  }
+	}
+	btScalar *nextq = (i > 1) ? pq+2 : q;
+	if ((sign*pq[dir] < h[dir]) ^ (sign*nextq[dir] < h[dir])) {
+	  // this line crosses the chopping line
+	  pr[1-dir] = pq[1-dir] + (nextq[1-dir]-pq[1-dir]) /
+	    (nextq[dir]-pq[dir]) * (sign*h[dir]-pq[dir]);
+	  pr[dir] = sign*h[dir];
+	  pr += 2;
+	  nr++;
+	  if (nr & 8) {
+	    q = r;
+	    goto done;
+	  }
+	}
+	pq += 2;
+      }
+      q = r;
+      r = (q==ret) ? buffer : ret;
+      nq = nr;
+    }
+  }
+ done:
+  if (q != ret) memcpy (ret,q,nr*2*sizeof(btScalar));
+  return nr;
+}
+
+
+#define M__PI 3.14159265f
+
+// given n points in the plane (array p, of size 2*n), generate m points that
+// best represent the whole set. the definition of 'best' here is not
+// predetermined - the idea is to select points that give good box-box
+// collision detection behavior. the chosen point indexes are returned in the
+// array iret (of size m). 'i0' is always the first entry in the array.
+// n must be in the range [1..8]. m must be in the range [1..n]. i0 must be
+// in the range [0..n-1].
+
+void cullPoints2 (int n, btScalar p[], int m, int i0, int iret[]);
+void cullPoints2 (int n, btScalar p[], int m, int i0, int iret[])
+{
+  // compute the centroid of the polygon in cx,cy
+  int i,j;
+  btScalar a,cx,cy,q;
+  if (n==1) {
+    cx = p[0];
+    cy = p[1];
+  }
+  else if (n==2) {
+    cx = btScalar(0.5)*(p[0] + p[2]);
+    cy = btScalar(0.5)*(p[1] + p[3]);
+  }
+  else {
+    a = 0;
+    cx = 0;
+    cy = 0;
+    for (i=0; i<(n-1); i++) {
+      q = p[i*2]*p[i*2+3] - p[i*2+2]*p[i*2+1];
+      a += q;
+      cx += q*(p[i*2]+p[i*2+2]);
+      cy += q*(p[i*2+1]+p[i*2+3]);
+    }
+    q = p[n*2-2]*p[1] - p[0]*p[n*2-1];
+    a = 1.f/(btScalar(3.0)*(a+q));
+    cx = a*(cx + q*(p[n*2-2]+p[0]));
+    cy = a*(cy + q*(p[n*2-1]+p[1]));
+  }
+
+  // compute the angle of each point w.r.t. the centroid
+  btScalar A[8];
+  for (i=0; i<n; i++) A[i] = btAtan2(p[i*2+1]-cy,p[i*2]-cx);
+
+  // search for points that have angles closest to A[i0] + i*(2*pi/m).
+  int avail[8];
+  for (i=0; i<n; i++) avail[i] = 1;
+  avail[i0] = 0;
+  iret[0] = i0;
+  iret++;
+  for (j=1; j<m; j++) {
+    a = btScalar(j)*(2*M__PI/m) + A[i0];
+    if (a > M__PI) a -= 2*M__PI;
+    btScalar maxdiff=1e9,diff;
+#ifndef dNODEBUG
+    *iret = i0;			// iret is not allowed to keep this value
+#endif
+    for (i=0; i<n; i++) {
+      if (avail[i]) {
+	diff = btFabs (A[i]-a);
+	if (diff > M__PI) diff = 2*M__PI - diff;
+	if (diff < maxdiff) {
+	  maxdiff = diff;
+	  *iret = i;
+	}
+      }
+    }
+#ifndef dNODEBUG
+    btAssert (*iret != i0);	// ensure iret got set
+#endif
+    avail[*iret] = 0;
+    iret++;
+  }
+}
+
+
+
+int dBoxBox2 (const btVector3& p1, const dMatrix3 R1,
+	     const btVector3& side1, const btVector3& p2,
+	     const dMatrix3 R2, const btVector3& side2,
+	     btVector3& normal, btScalar *depth, int *return_code,
+		 int maxc, dContactGeom * /*contact*/, int /*skip*/,btDiscreteCollisionDetectorInterface::Result& output);
+int dBoxBox2 (const btVector3& p1, const dMatrix3 R1,
+	     const btVector3& side1, const btVector3& p2,
+	     const dMatrix3 R2, const btVector3& side2,
+	     btVector3& normal, btScalar *depth, int *return_code,
+		 int maxc, dContactGeom * /*contact*/, int /*skip*/,btDiscreteCollisionDetectorInterface::Result& output)
+{
+  const btScalar fudge_factor = btScalar(1.05);
+  btVector3 p,pp,normalC;
+  const btScalar *normalR = 0;
+  btScalar A[3],B[3],R11,R12,R13,R21,R22,R23,R31,R32,R33,
+    Q11,Q12,Q13,Q21,Q22,Q23,Q31,Q32,Q33,s,s2,l;
+  int i,j,invert_normal,code;
+
+  // get vector from centers of box 1 to box 2, relative to box 1
+  p = p2 - p1;
+  dMULTIPLY1_331 (pp,R1,p);		// get pp = p relative to body 1
+
+  // get side lengths / 2
+  A[0] = side1[0]*btScalar(0.5);
+  A[1] = side1[1]*btScalar(0.5);
+  A[2] = side1[2]*btScalar(0.5);
+  B[0] = side2[0]*btScalar(0.5);
+  B[1] = side2[1]*btScalar(0.5);
+  B[2] = side2[2]*btScalar(0.5);
+
+  // Rij is R1'*R2, i.e. the relative rotation between R1 and R2
+  R11 = dDOT44(R1+0,R2+0); R12 = dDOT44(R1+0,R2+1); R13 = dDOT44(R1+0,R2+2);
+  R21 = dDOT44(R1+1,R2+0); R22 = dDOT44(R1+1,R2+1); R23 = dDOT44(R1+1,R2+2);
+  R31 = dDOT44(R1+2,R2+0); R32 = dDOT44(R1+2,R2+1); R33 = dDOT44(R1+2,R2+2);
+
+  Q11 = btFabs(R11); Q12 = btFabs(R12); Q13 = btFabs(R13);
+  Q21 = btFabs(R21); Q22 = btFabs(R22); Q23 = btFabs(R23);
+  Q31 = btFabs(R31); Q32 = btFabs(R32); Q33 = btFabs(R33);
+
+  // for all 15 possible separating axes:
+  //   * see if the axis separates the boxes. if so, return 0.
+  //   * find the depth of the penetration along the separating axis (s2)
+  //   * if this is the largest depth so far, record it.
+  // the normal vector will be set to the separating axis with the smallest
+  // depth. note: normalR is set to point to a column of R1 or R2 if that is
+  // the smallest depth normal so far. otherwise normalR is 0 and normalC is
+  // set to a vector relative to body 1. invert_normal is 1 if the sign of
+  // the normal should be flipped.
+
+#define TST(expr1,expr2,norm,cc) \
+  s2 = btFabs(expr1) - (expr2); \
+  if (s2 > 0) return 0; \
+  if (s2 > s) { \
+    s = s2; \
+    normalR = norm; \
+    invert_normal = ((expr1) < 0); \
+    code = (cc); \
+  }
+
+  s = -dInfinity;
+  invert_normal = 0;
+  code = 0;
+
+  // separating axis = u1,u2,u3
+  TST (pp[0],(A[0] + B[0]*Q11 + B[1]*Q12 + B[2]*Q13),R1+0,1);
+  TST (pp[1],(A[1] + B[0]*Q21 + B[1]*Q22 + B[2]*Q23),R1+1,2);
+  TST (pp[2],(A[2] + B[0]*Q31 + B[1]*Q32 + B[2]*Q33),R1+2,3);
+
+  // separating axis = v1,v2,v3
+  TST (dDOT41(R2+0,p),(A[0]*Q11 + A[1]*Q21 + A[2]*Q31 + B[0]),R2+0,4);
+  TST (dDOT41(R2+1,p),(A[0]*Q12 + A[1]*Q22 + A[2]*Q32 + B[1]),R2+1,5);
+  TST (dDOT41(R2+2,p),(A[0]*Q13 + A[1]*Q23 + A[2]*Q33 + B[2]),R2+2,6);
+
+  // note: cross product axes need to be scaled when s is computed.
+  // normal (n1,n2,n3) is relative to box 1.
+#undef TST
+#define TST(expr1,expr2,n1,n2,n3,cc) \
+  s2 = btFabs(expr1) - (expr2); \
+  if (s2 > 0) return 0; \
+  l = btSqrt((n1)*(n1) + (n2)*(n2) + (n3)*(n3)); \
+  if (l > 0) { \
+    s2 /= l; \
+    if (s2*fudge_factor > s) { \
+      s = s2; \
+      normalR = 0; \
+      normalC[0] = (n1)/l; normalC[1] = (n2)/l; normalC[2] = (n3)/l; \
+      invert_normal = ((expr1) < 0); \
+      code = (cc); \
+    } \
+  }
+
+  // separating axis = u1 x (v1,v2,v3)
+  TST(pp[2]*R21-pp[1]*R31,(A[1]*Q31+A[2]*Q21+B[1]*Q13+B[2]*Q12),0,-R31,R21,7);
+  TST(pp[2]*R22-pp[1]*R32,(A[1]*Q32+A[2]*Q22+B[0]*Q13+B[2]*Q11),0,-R32,R22,8);
+  TST(pp[2]*R23-pp[1]*R33,(A[1]*Q33+A[2]*Q23+B[0]*Q12+B[1]*Q11),0,-R33,R23,9);
+
+  // separating axis = u2 x (v1,v2,v3)
+  TST(pp[0]*R31-pp[2]*R11,(A[0]*Q31+A[2]*Q11+B[1]*Q23+B[2]*Q22),R31,0,-R11,10);
+  TST(pp[0]*R32-pp[2]*R12,(A[0]*Q32+A[2]*Q12+B[0]*Q23+B[2]*Q21),R32,0,-R12,11);
+  TST(pp[0]*R33-pp[2]*R13,(A[0]*Q33+A[2]*Q13+B[0]*Q22+B[1]*Q21),R33,0,-R13,12);
+
+  // separating axis = u3 x (v1,v2,v3)
+  TST(pp[1]*R11-pp[0]*R21,(A[0]*Q21+A[1]*Q11+B[1]*Q33+B[2]*Q32),-R21,R11,0,13);
+  TST(pp[1]*R12-pp[0]*R22,(A[0]*Q22+A[1]*Q12+B[0]*Q33+B[2]*Q31),-R22,R12,0,14);
+  TST(pp[1]*R13-pp[0]*R23,(A[0]*Q23+A[1]*Q13+B[0]*Q32+B[1]*Q31),-R23,R13,0,15);
+
+#undef TST
+
+  if (!code) return 0;
+
+  // if we get to this point, the boxes interpenetrate. compute the normal
+  // in global coordinates.
+  if (normalR) {
+    normal[0] = normalR[0];
+    normal[1] = normalR[4];
+    normal[2] = normalR[8];
+  }
+  else {
+    dMULTIPLY0_331 (normal,R1,normalC);
+  }
+  if (invert_normal) {
+    normal[0] = -normal[0];
+    normal[1] = -normal[1];
+    normal[2] = -normal[2];
+  }
+  *depth = -s;
+
+  // compute contact point(s)
+
+  if (code > 6) {
+    // an edge from box 1 touches an edge from box 2.
+    // find a point pa on the intersecting edge of box 1
+    btVector3 pa;
+    btScalar sign;
+    for (i=0; i<3; i++) pa[i] = p1[i];
+    for (j=0; j<3; j++) {
+      sign = (dDOT14(normal,R1+j) > 0) ? btScalar(1.0) : btScalar(-1.0);
+      for (i=0; i<3; i++) pa[i] += sign * A[j] * R1[i*4+j];
+    }
+
+    // find a point pb on the intersecting edge of box 2
+    btVector3 pb;
+    for (i=0; i<3; i++) pb[i] = p2[i];
+    for (j=0; j<3; j++) {
+      sign = (dDOT14(normal,R2+j) > 0) ? btScalar(-1.0) : btScalar(1.0);
+      for (i=0; i<3; i++) pb[i] += sign * B[j] * R2[i*4+j];
+    }
+
+    btScalar alpha,beta;
+    btVector3 ua,ub;
+    for (i=0; i<3; i++) ua[i] = R1[((code)-7)/3 + i*4];
+    for (i=0; i<3; i++) ub[i] = R2[((code)-7)%3 + i*4];
+
+    dLineClosestApproach (pa,ua,pb,ub,&alpha,&beta);
+    for (i=0; i<3; i++) pa[i] += ua[i]*alpha;
+    for (i=0; i<3; i++) pb[i] += ub[i]*beta;
+
+	{
+		
+		//contact[0].pos[i] = btScalar(0.5)*(pa[i]+pb[i]);
+		//contact[0].depth = *depth;
+		btVector3 pointInWorld;
+
+#ifdef USE_CENTER_POINT
+	    for (i=0; i<3; i++) 
+			pointInWorld[i] = (pa[i]+pb[i])*btScalar(0.5);
+		output.addContactPoint(-normal,pointInWorld,-*depth);
+#else
+		output.addContactPoint(-normal,pb,-*depth);
+#endif //
+		*return_code = code;
+	}
+    return 1;
+  }
+
+  // okay, we have a face-something intersection (because the separating
+  // axis is perpendicular to a face). define face 'a' to be the reference
+  // face (i.e. the normal vector is perpendicular to this) and face 'b' to be
+  // the incident face (the closest face of the other box).
+
+  const btScalar *Ra,*Rb,*pa,*pb,*Sa,*Sb;
+  if (code <= 3) {
+    Ra = R1;
+    Rb = R2;
+    pa = p1;
+    pb = p2;
+    Sa = A;
+    Sb = B;
+  }
+  else {
+    Ra = R2;
+    Rb = R1;
+    pa = p2;
+    pb = p1;
+    Sa = B;
+    Sb = A;
+  }
+
+  // nr = normal vector of reference face dotted with axes of incident box.
+  // anr = absolute values of nr.
+  btVector3 normal2,nr,anr;
+  if (code <= 3) {
+    normal2[0] = normal[0];
+    normal2[1] = normal[1];
+    normal2[2] = normal[2];
+  }
+  else {
+    normal2[0] = -normal[0];
+    normal2[1] = -normal[1];
+    normal2[2] = -normal[2];
+  }
+  dMULTIPLY1_331 (nr,Rb,normal2);
+  anr[0] = btFabs (nr[0]);
+  anr[1] = btFabs (nr[1]);
+  anr[2] = btFabs (nr[2]);
+
+  // find the largest compontent of anr: this corresponds to the normal
+  // for the indident face. the other axis numbers of the indicent face
+  // are stored in a1,a2.
+  int lanr,a1,a2;
+  if (anr[1] > anr[0]) {
+    if (anr[1] > anr[2]) {
+      a1 = 0;
+      lanr = 1;
+      a2 = 2;
+    }
+    else {
+      a1 = 0;
+      a2 = 1;
+      lanr = 2;
+    }
+  }
+  else {
+    if (anr[0] > anr[2]) {
+      lanr = 0;
+      a1 = 1;
+      a2 = 2;
+    }
+    else {
+      a1 = 0;
+      a2 = 1;
+      lanr = 2;
+    }
+  }
+
+  // compute center point of incident face, in reference-face coordinates
+  btVector3 center;
+  if (nr[lanr] < 0) {
+    for (i=0; i<3; i++) center[i] = pb[i] - pa[i] + Sb[lanr] * Rb[i*4+lanr];
+  }
+  else {
+    for (i=0; i<3; i++) center[i] = pb[i] - pa[i] - Sb[lanr] * Rb[i*4+lanr];
+  }
+
+  // find the normal and non-normal axis numbers of the reference box
+  int codeN,code1,code2;
+  if (code <= 3) codeN = code-1; else codeN = code-4;
+  if (codeN==0) {
+    code1 = 1;
+    code2 = 2;
+  }
+  else if (codeN==1) {
+    code1 = 0;
+    code2 = 2;
+  }
+  else {
+    code1 = 0;
+    code2 = 1;
+  }
+
+  // find the four corners of the incident face, in reference-face coordinates
+  btScalar quad[8];	// 2D coordinate of incident face (x,y pairs)
+  btScalar c1,c2,m11,m12,m21,m22;
+  c1 = dDOT14 (center,Ra+code1);
+  c2 = dDOT14 (center,Ra+code2);
+  // optimize this? - we have already computed this data above, but it is not
+  // stored in an easy-to-index format. for now it's quicker just to recompute
+  // the four dot products.
+  m11 = dDOT44 (Ra+code1,Rb+a1);
+  m12 = dDOT44 (Ra+code1,Rb+a2);
+  m21 = dDOT44 (Ra+code2,Rb+a1);
+  m22 = dDOT44 (Ra+code2,Rb+a2);
+  {
+    btScalar k1 = m11*Sb[a1];
+    btScalar k2 = m21*Sb[a1];
+    btScalar k3 = m12*Sb[a2];
+    btScalar k4 = m22*Sb[a2];
+    quad[0] = c1 - k1 - k3;
+    quad[1] = c2 - k2 - k4;
+    quad[2] = c1 - k1 + k3;
+    quad[3] = c2 - k2 + k4;
+    quad[4] = c1 + k1 + k3;
+    quad[5] = c2 + k2 + k4;
+    quad[6] = c1 + k1 - k3;
+    quad[7] = c2 + k2 - k4;
+  }
+
+  // find the size of the reference face
+  btScalar rect[2];
+  rect[0] = Sa[code1];
+  rect[1] = Sa[code2];
+
+  // intersect the incident and reference faces
+  btScalar ret[16];
+  int n = intersectRectQuad2 (rect,quad,ret);
+  if (n < 1) return 0;		// this should never happen
+
+  // convert the intersection points into reference-face coordinates,
+  // and compute the contact position and depth for each point. only keep
+  // those points that have a positive (penetrating) depth. delete points in
+  // the 'ret' array as necessary so that 'point' and 'ret' correspond.
+  btScalar point[3*8];		// penetrating contact points
+  btScalar dep[8];			// depths for those points
+  btScalar det1 = 1.f/(m11*m22 - m12*m21);
+  m11 *= det1;
+  m12 *= det1;
+  m21 *= det1;
+  m22 *= det1;
+  int cnum = 0;			// number of penetrating contact points found
+  for (j=0; j < n; j++) {
+    btScalar k1 =  m22*(ret[j*2]-c1) - m12*(ret[j*2+1]-c2);
+    btScalar k2 = -m21*(ret[j*2]-c1) + m11*(ret[j*2+1]-c2);
+    for (i=0; i<3; i++) point[cnum*3+i] =
+			  center[i] + k1*Rb[i*4+a1] + k2*Rb[i*4+a2];
+    dep[cnum] = Sa[codeN] - dDOT(normal2,point+cnum*3);
+    if (dep[cnum] >= 0) {
+      ret[cnum*2] = ret[j*2];
+      ret[cnum*2+1] = ret[j*2+1];
+      cnum++;
+    }
+  }
+  if (cnum < 1) return 0;	// this should never happen
+
+  // we can't generate more contacts than we actually have
+  if (maxc > cnum) maxc = cnum;
+  if (maxc < 1) maxc = 1;
+
+  if (cnum <= maxc) {
+    // we have less contacts than we need, so we use them all
+    for (j=0; j < cnum; j++) {
+
+		//AddContactPoint...
+
+		//dContactGeom *con = CONTACT(contact,skip*j);
+      //for (i=0; i<3; i++) con->pos[i] = point[j*3+i] + pa[i];
+      //con->depth = dep[j];
+
+		btVector3 pointInWorld;
+		for (i=0; i<3; i++) 
+			pointInWorld[i] = point[j*3+i] + pa[i];
+		output.addContactPoint(-normal,pointInWorld,-dep[j]);
+
+    }
+  }
+  else {
+    // we have more contacts than are wanted, some of them must be culled.
+    // find the deepest point, it is always the first contact.
+    int i1 = 0;
+    btScalar maxdepth = dep[0];
+    for (i=1; i<cnum; i++) {
+      if (dep[i] > maxdepth) {
+	maxdepth = dep[i];
+	i1 = i;
+      }
+    }
+
+    int iret[8];
+    cullPoints2 (cnum,ret,maxc,i1,iret);
+
+    for (j=0; j < maxc; j++) {
+//      dContactGeom *con = CONTACT(contact,skip*j);
+  //    for (i=0; i<3; i++) con->pos[i] = point[iret[j]*3+i] + pa[i];
+    //  con->depth = dep[iret[j]];
+
+		btVector3 posInWorld;
+		for (i=0; i<3; i++) 
+			posInWorld[i] = point[iret[j]*3+i] + pa[i];
+		output.addContactPoint(-normal,posInWorld,-dep[iret[j]]);
+    }
+    cnum = maxc;
+  }
+
+  *return_code = code;
+  return cnum;
+}
+
+void	btBoxBoxDetector::getClosestPoints(const ClosestPointInput& input,Result& output,class btIDebugDraw* /*debugDraw*/,bool /*swapResults*/)
+{
+	
+	const btTransform& transformA = input.m_transformA;
+	const btTransform& transformB = input.m_transformB;
+	
+	int skip = 0;
+	dContactGeom *contact = 0;
+
+	dMatrix3 R1;
+	dMatrix3 R2;
+
+	for (int j=0;j<3;j++)
+	{
+		R1[0+4*j] = transformA.getBasis()[j].x();
+		R2[0+4*j] = transformB.getBasis()[j].x();
+
+		R1[1+4*j] = transformA.getBasis()[j].y();
+		R2[1+4*j] = transformB.getBasis()[j].y();
+
+
+		R1[2+4*j] = transformA.getBasis()[j].z();
+		R2[2+4*j] = transformB.getBasis()[j].z();
+
+	}
+
+	
+
+	btVector3 normal;
+	btScalar depth;
+	int return_code;
+	int maxc = 4;
+
+
+	dBoxBox2 (transformA.getOrigin(), 
+	R1,
+	2.f*m_box1->getHalfExtentsWithMargin(),
+	transformB.getOrigin(),
+	R2, 
+	2.f*m_box2->getHalfExtentsWithMargin(),
+	normal, &depth, &return_code,
+	maxc, contact, skip,
+	output
+	);
+
+}
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.h
new file mode 100644
index 00000000000..605294d47bd
--- /dev/null
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.h
@@ -0,0 +1,44 @@
+/*
+ * Box-Box collision detection re-distributed under the ZLib license with permission from Russell L. Smith
+ * Original version is from Open Dynamics Engine, Copyright (C) 2001,2002 Russell L. Smith.
+ * All rights reserved.  Email: russ@q12.org   Web: www.q12.org
+
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+#ifndef BOX_BOX_DETECTOR_H
+#define BOX_BOX_DETECTOR_H
+
+
+class btBoxShape;
+#include "BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h"
+
+
+/// btBoxBoxDetector wraps the ODE box-box collision detector
+/// re-distributed under the Zlib license with permission from Russell L. Smith
+struct btBoxBoxDetector : public btDiscreteCollisionDetectorInterface
+{
+	btBoxShape* m_box1;
+	btBoxShape* m_box2;
+
+public:
+
+	btBoxBoxDetector(btBoxShape* box1,btBoxShape* box2);
+
+	virtual ~btBoxBoxDetector() {};
+
+	virtual void	getClosestPoints(const ClosestPointInput& input,Result& output,class btIDebugDraw* debugDraw,bool swapResults=false);
+
+};
+
+#endif //BT_BOX_BOX_DETECTOR_H
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h
new file mode 100644
index 00000000000..fad770ac26d
--- /dev/null
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h
@@ -0,0 +1,47 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_COLLISION_CONFIGURATION
+#define BT_COLLISION_CONFIGURATION
+struct btCollisionAlgorithmCreateFunc;
+
+class btStackAlloc;
+class btPoolAllocator;
+
+///btCollisionConfiguration allows to configure Bullet collision detection
+///stack allocator size, default collision algorithms and persistent manifold pool size
+///todo: describe the meaning
+class	btCollisionConfiguration
+{
+
+public:
+
+	virtual ~btCollisionConfiguration()
+	{
+	}
+
+	///memory pools
+	virtual btPoolAllocator* getPersistentManifoldPool() = 0;
+
+	virtual btPoolAllocator* getCollisionAlgorithmPool() = 0;
+
+	virtual btStackAlloc*	getStackAllocator() = 0;
+
+	virtual btCollisionAlgorithmCreateFunc* getCollisionAlgorithmCreateFunc(int proxyType0,int proxyType1) =0;
+
+};
+
+#endif //BT_COLLISION_CONFIGURATION
+
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h
index d51a59af7f0..c6728918d16 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h
@@ -16,7 +16,7 @@ subject to the following restrictions:
 #ifndef COLLISION_CREATE_FUNC
 #define COLLISION_CREATE_FUNC
 
-#include "../../LinearMath/btAlignedObjectArray.h"
+#include "LinearMath/btAlignedObjectArray.h"
 typedef btAlignedObjectArray<class btCollisionObject*> btCollisionObjectArray;
 class btCollisionAlgorithm;
 class btCollisionObject;
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp
index b535fac6563..a031a9f9784 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp
@@ -19,69 +19,39 @@ subject to the following restrictions:
 
 
 #include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
-#include "BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h"
-#include "BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h"
-#include "BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h"
-#include "BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h"
+
 #include "BulletCollision/CollisionShapes/btCollisionShape.h"
 #include "BulletCollision/CollisionDispatch/btCollisionObject.h"
 #include "BulletCollision/BroadphaseCollision/btOverlappingPairCache.h"
+#include "LinearMath/btPoolAllocator.h"
+#include "BulletCollision/CollisionDispatch/btCollisionConfiguration.h"
 
 int gNumManifold = 0;
 
+#ifdef BT_DEBUG
 #include <stdio.h>
+#endif
 
-	
-btCollisionDispatcher::btCollisionDispatcher(bool noDefaultAlgorithms):
-m_count(0),
-m_useIslands(true),
-m_convexConvexCreateFunc(0),
-m_convexConcaveCreateFunc(0),
-m_swappedConvexConcaveCreateFunc(0),
-m_compoundCreateFunc(0),
-m_swappedCompoundCreateFunc(0),
-m_emptyCreateFunc(0)
-{
-	(void)noDefaultAlgorithms;
-	int i;
 
-	setNearCallback(defaultNearCallback);
-
-	m_emptyCreateFunc = new btEmptyAlgorithm::CreateFunc;
-	for (i=0;i<MAX_BROADPHASE_COLLISION_TYPES;i++)
-	{
-		for (int j=0;j<MAX_BROADPHASE_COLLISION_TYPES;j++)
-		{
-			m_doubleDispatch[i][j] = m_emptyCreateFunc;
-		}
-	}
-}
-//if you want to not link with the default collision algorithms, you can
-//define BT_EXCLUDE_DEFAULT_COLLISIONALGORITHM_REGISTRATION 
-//in your Bullet library build system
-#ifndef BT_EXCLUDE_DEFAULT_COLLISIONALGORITHM_REGISTRATION
-
-btCollisionDispatcher::btCollisionDispatcher (): 
+btCollisionDispatcher::btCollisionDispatcher (btCollisionConfiguration* collisionConfiguration): 
 	m_count(0),
-	m_useIslands(true)
+	m_useIslands(true),
+	m_staticWarningReported(false),
+	m_collisionConfiguration(collisionConfiguration)
 {
 	int i;
 
 	setNearCallback(defaultNearCallback);
 	
-	//default CreationFunctions, filling the m_doubleDispatch table
-	m_convexConvexCreateFunc = new btConvexConvexAlgorithm::CreateFunc;
-	m_convexConcaveCreateFunc = new btConvexConcaveCollisionAlgorithm::CreateFunc;
-	m_swappedConvexConcaveCreateFunc = new btConvexConcaveCollisionAlgorithm::SwappedCreateFunc;
-	m_compoundCreateFunc = new btCompoundCollisionAlgorithm::CreateFunc;
-	m_swappedCompoundCreateFunc = new btCompoundCollisionAlgorithm::SwappedCreateFunc;
-	m_emptyCreateFunc = new btEmptyAlgorithm::CreateFunc;
+	m_collisionAlgorithmPoolAllocator = collisionConfiguration->getCollisionAlgorithmPool();
+
+	m_persistentManifoldPoolAllocator = collisionConfiguration->getPersistentManifoldPool();
 
 	for (i=0;i<MAX_BROADPHASE_COLLISION_TYPES;i++)
 	{
 		for (int j=0;j<MAX_BROADPHASE_COLLISION_TYPES;j++)
 		{
-			m_doubleDispatch[i][j] = internalFindCreateFunc(i,j);
+			m_doubleDispatch[i][j] = m_collisionConfiguration->getCollisionAlgorithmCreateFunc(i,j);
 			assert(m_doubleDispatch[i][j]);
 		}
 	}
@@ -89,8 +59,6 @@ btCollisionDispatcher::btCollisionDispatcher ():
 	
 };
 
-#endif //BT_EXCLUDE_DEFAULT_COLLISIONALGORITHM_REGISTRATION
-
 
 void btCollisionDispatcher::registerCollisionCreateFunc(int proxyType0, int proxyType1, btCollisionAlgorithmCreateFunc *createFunc)
 {
@@ -99,12 +67,6 @@ void btCollisionDispatcher::registerCollisionCreateFunc(int proxyType0, int prox
 
 btCollisionDispatcher::~btCollisionDispatcher()
 {
-	delete m_convexConvexCreateFunc;
-	delete m_convexConcaveCreateFunc;
-	delete m_swappedConvexConcaveCreateFunc;
-	delete m_compoundCreateFunc;
-	delete m_swappedCompoundCreateFunc;
-	delete m_emptyCreateFunc;
 }
 
 btPersistentManifold*	btCollisionDispatcher::getNewManifold(void* b0,void* b1) 
@@ -117,7 +79,18 @@ btPersistentManifold*	btCollisionDispatcher::getNewManifold(void* b0,void* b1)
 	btCollisionObject* body0 = (btCollisionObject*)b0;
 	btCollisionObject* body1 = (btCollisionObject*)b1;
 	
-	btPersistentManifold* manifold = new btPersistentManifold (body0,body1);
+	void* mem = 0;
+	
+	if (m_persistentManifoldPoolAllocator->getFreeCount())
+	{
+		mem = m_persistentManifoldPoolAllocator->allocate(sizeof(btPersistentManifold));
+	} else
+	{
+		mem = btAlignedAlloc(sizeof(btPersistentManifold),16);
+
+	}
+	btPersistentManifold* manifold = new(mem) btPersistentManifold (body0,body1,0);
+	manifold->m_index1a = m_manifoldsPtr.size();
 	m_manifoldsPtr.push_back(manifold);
 
 	return manifold;
@@ -137,13 +110,19 @@ void btCollisionDispatcher::releaseManifold(btPersistentManifold* manifold)
 	//printf("releaseManifold: gNumManifold %d\n",gNumManifold);
 	clearManifold(manifold);
 
-	///todo: this can be improved a lot, linear search might be slow part!
-	int findIndex = m_manifoldsPtr.findLinearSearch(manifold);
-	if (findIndex < m_manifoldsPtr.size())
+	int findIndex = manifold->m_index1a;
+	btAssert(findIndex < m_manifoldsPtr.size());
+	m_manifoldsPtr.swap(findIndex,m_manifoldsPtr.size()-1);
+	m_manifoldsPtr[findIndex]->m_index1a = findIndex;
+	m_manifoldsPtr.pop_back();
+
+	manifold->~btPersistentManifold();
+	if (m_persistentManifoldPoolAllocator->validPtr(manifold))
 	{
-		m_manifoldsPtr.swap(findIndex,m_manifoldsPtr.size()-1);
-		m_manifoldsPtr.pop_back();
-		delete manifold;
+		m_persistentManifoldPoolAllocator->freeMemory(manifold);
+	} else
+	{
+		btAlignedFree(manifold);
 	}
 	
 }
@@ -152,99 +131,19 @@ void btCollisionDispatcher::releaseManifold(btPersistentManifold* manifold)
 
 btCollisionAlgorithm* btCollisionDispatcher::findAlgorithm(btCollisionObject* body0,btCollisionObject* body1,btPersistentManifold* sharedManifold)
 {
-
-#ifdef USE_DISPATCH_REGISTRY_ARRAY
 	
 	btCollisionAlgorithmConstructionInfo ci;
-	ci.m_dispatcher = this;
+
+	ci.m_dispatcher1 = this;
 	ci.m_manifold = sharedManifold;
-	btCollisionAlgorithm* algo = m_doubleDispatch[body0->getCollisionShape()->getShapeType()][body1->getCollisionShape()->getShapeType()]
-	->CreateCollisionAlgorithm(ci,body0,body1);
-#else
-	btCollisionAlgorithm* algo = internalFindAlgorithm(body0,body1);
-#endif //USE_DISPATCH_REGISTRY_ARRAY
+	btCollisionAlgorithm* algo = m_doubleDispatch[body0->getCollisionShape()->getShapeType()][body1->getCollisionShape()->getShapeType()]->CreateCollisionAlgorithm(ci,body0,body1);
+
 	return algo;
 }
 
 
-#ifndef BT_EXCLUDE_DEFAULT_COLLISIONALGORITHM_REGISTRATION
-
-btCollisionAlgorithmCreateFunc* btCollisionDispatcher::internalFindCreateFunc(int proxyType0,int proxyType1)
-{
-	
-	if (btBroadphaseProxy::isConvex(proxyType0) && btBroadphaseProxy::isConvex(proxyType1))
-	{
-		return m_convexConvexCreateFunc;
-	}
-
-	if (btBroadphaseProxy::isConvex(proxyType0) && btBroadphaseProxy::isConcave(proxyType1))
-	{
-		return m_convexConcaveCreateFunc;
-	}
-
-	if (btBroadphaseProxy::isConvex(proxyType1) && btBroadphaseProxy::isConcave(proxyType0))
-	{
-		return m_swappedConvexConcaveCreateFunc;
-	}
-
-	if (btBroadphaseProxy::isCompound(proxyType0))
-	{
-		return m_compoundCreateFunc;
-	} else
-	{
-		if (btBroadphaseProxy::isCompound(proxyType1))
-		{
-			return m_swappedCompoundCreateFunc;
-		}
-	}
-
-	//failed to find an algorithm
-	return m_emptyCreateFunc;
-}
-
-#endif //BT_EXCLUDE_DEFAULT_COLLISIONALGORITHM_REGISTRATION
 
 
-#ifndef USE_DISPATCH_REGISTRY_ARRAY
-
-btCollisionAlgorithm* btCollisionDispatcher::internalFindAlgorithm(btCollisionObject* body0,btCollisionObject* body1,btPersistentManifold* sharedManifold)
-{
-	m_count++;
-	
-	btCollisionAlgorithmConstructionInfo ci;
-	ci.m_dispatcher = this;
-	
-	if (body0->getCollisionShape()->isConvex() && body1->getCollisionShape()->isConvex() )
-	{
-		return new btConvexConvexAlgorithm(sharedManifold,ci,body0,body1);
-	}
-
-	if (body0->getCollisionShape()->isConvex() && body1->getCollisionShape()->isConcave())
-	{
-		return new btConvexConcaveCollisionAlgorithm(ci,body0,body1,false);
-	}
-
-	if (body1->getCollisionShape()->isConvex() && body0->getCollisionShape()->isConcave())
-	{
-		return new btConvexConcaveCollisionAlgorithm(ci,body0,body1,true);
-	}
-
-	if (body0->getCollisionShape()->isCompound())
-	{
-		return new btCompoundCollisionAlgorithm(ci,body0,body1,false);
-	} else
-	{
-		if (body1->getCollisionShape()->isCompound())
-		{
-			return new btCompoundCollisionAlgorithm(ci,body0,body1,true);
-		}
-	}
-
-	//failed to find an algorithm
-	return new btEmptyAlgorithm(ci);
-	
-}
-#endif //USE_DISPATCH_REGISTRY_ARRAY
 
 bool	btCollisionDispatcher::needsResponse(btCollisionObject* body0,btCollisionObject* body1)
 {
@@ -264,13 +163,19 @@ bool	btCollisionDispatcher::needsCollision(btCollisionObject* body0,btCollisionO
 
 	bool needsCollision = true;
 
-	//broadphase filtering already deals with this
-	if ((body0->isStaticObject() || body0->isKinematicObject()) &&
-		(body1->isStaticObject() || body1->isKinematicObject()))
+#ifdef BT_DEBUG
+	if (!m_staticWarningReported)
 	{
-		printf("warning btCollisionDispatcher::needsCollision: static-static collision!\n");
+		//broadphase filtering already deals with this
+		if ((body0->isStaticObject() || body0->isKinematicObject()) &&
+			(body1->isStaticObject() || body1->isKinematicObject()))
+		{
+			m_staticWarningReported = true;
+			printf("warning btCollisionDispatcher::needsCollision: static-static collision!\n");
+		}
 	}
-		
+#endif //BT_DEBUG
+
 	if ((!body0->isActive()) && (!body1->isActive()))
 		needsCollision = false;
 	else if (!body0->checkCollideWith(body1))
@@ -286,23 +191,25 @@ bool	btCollisionDispatcher::needsCollision(btCollisionObject* body0,btCollisionO
 ///this is useful for the collision dispatcher.
 class btCollisionPairCallback : public btOverlapCallback
 {
-	btDispatcherInfo& m_dispatchInfo;
+	const btDispatcherInfo& m_dispatchInfo;
 	btCollisionDispatcher*	m_dispatcher;
 
 public:
 
-	btCollisionPairCallback(btDispatcherInfo& dispatchInfo,btCollisionDispatcher*	dispatcher)
+	btCollisionPairCallback(const btDispatcherInfo& dispatchInfo,btCollisionDispatcher*	dispatcher)
 	:m_dispatchInfo(dispatchInfo),
 	m_dispatcher(dispatcher)
 	{
 	}
 
-	btCollisionPairCallback& operator=(btCollisionPairCallback& other)
+	/*btCollisionPairCallback& operator=(btCollisionPairCallback& other)
 	{
 		m_dispatchInfo = other.m_dispatchInfo;
 		m_dispatcher = other.m_dispatcher;
 		return *this;
 	}
+	*/
+
 
 	virtual ~btCollisionPairCallback() {}
 
@@ -316,13 +223,14 @@ public:
 };
 
 
-void	btCollisionDispatcher::dispatchAllCollisionPairs(btOverlappingPairCache* pairCache,btDispatcherInfo& dispatchInfo)
+
+void	btCollisionDispatcher::dispatchAllCollisionPairs(btOverlappingPairCache* pairCache,const btDispatcherInfo& dispatchInfo,btDispatcher* dispatcher) 
 {
 	//m_blockedForChanges = true;
 
 	btCollisionPairCallback	collisionCallback(dispatchInfo,this);
 
-	pairCache->processAllOverlappingPairs(&collisionCallback);
+	pairCache->processAllOverlappingPairs(&collisionCallback,dispatcher);
 
 	//m_blockedForChanges = false;
 
@@ -332,7 +240,7 @@ void	btCollisionDispatcher::dispatchAllCollisionPairs(btOverlappingPairCache* pa
 
 
 //by default, Bullet will use this near callback
-void btCollisionDispatcher::defaultNearCallback(btBroadphasePair& collisionPair, btCollisionDispatcher& dispatcher, btDispatcherInfo& dispatchInfo)
+void btCollisionDispatcher::defaultNearCallback(btBroadphasePair& collisionPair, btCollisionDispatcher& dispatcher, const btDispatcherInfo& dispatchInfo)
 {
 		btCollisionObject* colObj0 = (btCollisionObject*)collisionPair.m_pProxy0->m_clientObject;
 		btCollisionObject* colObj1 = (btCollisionObject*)collisionPair.m_pProxy1->m_clientObject;
@@ -365,3 +273,26 @@ void btCollisionDispatcher::defaultNearCallback(btBroadphasePair& collisionPair,
 		}
 
 }
+
+
+void* btCollisionDispatcher::allocateCollisionAlgorithm(int size)
+{
+	if (m_collisionAlgorithmPoolAllocator->getFreeCount())
+	{
+		return m_collisionAlgorithmPoolAllocator->allocate(size);
+	}
+	
+	//warn user for overflow?
+	return	btAlignedAlloc(static_cast<size_t>(size), 16);
+}
+
+void btCollisionDispatcher::freeCollisionAlgorithm(void* ptr)
+{
+	if (m_collisionAlgorithmPoolAllocator->validPtr(ptr))
+	{
+		m_collisionAlgorithmPoolAllocator->freeMemory(ptr);
+	} else
+	{
+		btAlignedFree(ptr);
+	}
+}
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h
index ca5aba8f01c..a9c9cd414c1 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h
@@ -16,17 +16,18 @@ subject to the following restrictions:
 #ifndef COLLISION__DISPATCHER_H
 #define COLLISION__DISPATCHER_H
 
-#include "../BroadphaseCollision/btDispatcher.h"
-#include "../NarrowPhaseCollision/btPersistentManifold.h"
+#include "BulletCollision/BroadphaseCollision/btDispatcher.h"
+#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h"
 
-#include "../CollisionDispatch/btManifoldResult.h"
+#include "BulletCollision/CollisionDispatch/btManifoldResult.h"
 
-#include "../BroadphaseCollision/btBroadphaseProxy.h"
-#include "../../LinearMath/btAlignedObjectArray.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
+#include "LinearMath/btAlignedObjectArray.h"
 
 class btIDebugDraw;
 class btOverlappingPairCache;
-
+class btPoolAllocator;
+class btCollisionConfiguration;
 
 #include "btCollisionCreateFunc.h"
 
@@ -34,7 +35,7 @@ class btOverlappingPairCache;
 
 class btCollisionDispatcher;
 ///user can override this nearcallback for collision filtering and more finegrained control over collision detection
-typedef void (*btNearCallback)(btBroadphasePair& collisionPair, btCollisionDispatcher& dispatcher, btDispatcherInfo& dispatchInfo);
+typedef void (*btNearCallback)(btBroadphasePair& collisionPair, btCollisionDispatcher& dispatcher, const btDispatcherInfo& dispatchInfo);
 
 
 ///btCollisionDispatcher supports algorithms that handle ConvexConvex and ConvexConcave collision pairs.
@@ -46,26 +47,22 @@ class btCollisionDispatcher : public btDispatcher
 	btAlignedObjectArray<btPersistentManifold*>	m_manifoldsPtr;
 
 	bool m_useIslands;
+
+	bool	m_staticWarningReported;
 	
 	btManifoldResult	m_defaultManifoldResult;
 
 	btNearCallback		m_nearCallback;
 	
+	btPoolAllocator*	m_collisionAlgorithmPoolAllocator;
+
+	btPoolAllocator*	m_persistentManifoldPoolAllocator;
+
 	btCollisionAlgorithmCreateFunc* m_doubleDispatch[MAX_BROADPHASE_COLLISION_TYPES][MAX_BROADPHASE_COLLISION_TYPES];
 	
-	btCollisionAlgorithmCreateFunc* internalFindCreateFunc(int proxyType0,int proxyType1);
 
-	//default CreationFunctions, filling the m_doubleDispatch table
-	btCollisionAlgorithmCreateFunc*	m_convexConvexCreateFunc;
-	btCollisionAlgorithmCreateFunc*	m_convexConcaveCreateFunc;
-	btCollisionAlgorithmCreateFunc*	m_swappedConvexConcaveCreateFunc;
-	btCollisionAlgorithmCreateFunc*	m_compoundCreateFunc;
-	btCollisionAlgorithmCreateFunc*	m_swappedCompoundCreateFunc;
-	btCollisionAlgorithmCreateFunc*   m_emptyCreateFunc;
+	btCollisionConfiguration*	m_collisionConfiguration;
 
-#ifndef USE_DISPATCH_REGISTRY_ARRAY
-	btCollisionAlgorithm* internalFindAlgorithm(btCollisionObject* body0,btCollisionObject* body1,btPersistentManifold* sharedManifold = 0);
-#endif //USE_DISPATCH_REGISTRY_ARRAY
 
 public:
 
@@ -92,11 +89,7 @@ public:
 		return m_manifoldsPtr[index];
 	}
 
-	///the default constructor creates/register default collision algorithms, for convex, compound and concave shape support
-	btCollisionDispatcher ();
-
-	///a special constructor that doesn't create/register the default collision algorithms
-	btCollisionDispatcher(bool noDefaultAlgorithms);
+	btCollisionDispatcher (btCollisionConfiguration* collisionConfiguration);
 
 	virtual ~btCollisionDispatcher();
 
@@ -114,7 +107,7 @@ public:
 	
 	virtual bool	needsResponse(btCollisionObject* body0,btCollisionObject* body1);
 	
-	virtual void	dispatchAllCollisionPairs(btOverlappingPairCache* pairCache,btDispatcherInfo& dispatchInfo);
+	virtual void	dispatchAllCollisionPairs(btOverlappingPairCache* pairCache,const btDispatcherInfo& dispatchInfo,btDispatcher* dispatcher) ;
 
 	void	setNearCallback(btNearCallback	nearCallback)
 	{
@@ -127,7 +120,26 @@ public:
 	}
 
 	//by default, Bullet will use this near callback
-	static void  defaultNearCallback(btBroadphasePair& collisionPair, btCollisionDispatcher& dispatcher, btDispatcherInfo& dispatchInfo);
+	static void  defaultNearCallback(btBroadphasePair& collisionPair, btCollisionDispatcher& dispatcher, const btDispatcherInfo& dispatchInfo);
+
+	virtual	void* allocateCollisionAlgorithm(int size);
+
+	virtual	void freeCollisionAlgorithm(void* ptr);
+
+	btCollisionConfiguration*	getCollisionConfiguration()
+	{
+		return m_collisionConfiguration;
+	}
+
+	const btCollisionConfiguration*	getCollisionConfiguration() const
+	{
+		return m_collisionConfiguration;
+	}
+
+	void	setCollisionConfiguration(btCollisionConfiguration* config)
+	{
+		m_collisionConfiguration = config;
+	}
 
 };
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp
index d4c0a4e8cb3..d1641249568 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp
@@ -13,15 +13,22 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
+
 #include "btCollisionObject.h"
 
 btCollisionObject::btCollisionObject()
 	:	m_broadphaseHandle(0),
 		m_collisionShape(0),
-		m_collisionFlags(0),
+		m_rootCollisionShape(0),
+		m_collisionFlags(btCollisionObject::CF_STATIC_OBJECT),
+		m_islandTag1(-1),
+		m_companionId(-1),
 		m_activationState1(1),
 		m_deactivationTime(btScalar(0.)),
+		m_friction(btScalar(0.5)),
+		m_restitution(btScalar(0.)),
 		m_userObjectPointer(0),
+		m_internalType(CO_COLLISION_OBJECT),
 		m_hitFraction(btScalar(1.)),
 		m_ccdSweptSphereRadius(btScalar(0.)),
 		m_ccdSquareMotionThreshold(btScalar(0.)),
@@ -55,3 +62,4 @@ void btCollisionObject::activate(bool forceActivation)
 }
 
 
+
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h
index 9fb6a67c4a3..96cbd1c3eb8 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h
@@ -16,7 +16,7 @@ subject to the following restrictions:
 #ifndef COLLISION_OBJECT_H
 #define COLLISION_OBJECT_H
 
-#include "../../LinearMath/btTransform.h"
+#include "LinearMath/btTransform.h"
 
 //island management, m_activationState1
 #define ACTIVE_TAG 1
@@ -27,7 +27,8 @@ subject to the following restrictions:
 
 struct	btBroadphaseProxy;
 class	btCollisionShape;
-#include "../../LinearMath/btMotionState.h"
+#include "LinearMath/btMotionState.h"
+#include "LinearMath/btAlignedAllocator.h"
 
 
 
@@ -50,6 +51,11 @@ protected:
 	btVector3	m_interpolationAngularVelocity;
 	btBroadphaseProxy*		m_broadphaseHandle;
 	btCollisionShape*		m_collisionShape;
+	
+	///m_rootCollisionShape is temporarily used to store the original collision shape
+	///The m_collisionShape might be temporarily replaced by a child collision shape during collision detection purposes
+	///If it is NULL, the m_collisionShape is not temporarily replaced.
+	btCollisionShape*		m_rootCollisionShape;
 
 	int				m_collisionFlags;
 
@@ -65,8 +71,9 @@ protected:
 	///users can point to their objects, m_userPointer is not used by Bullet, see setUserPointer/getUserPointer
 	void*			m_userObjectPointer;
 
-	///m_internalOwner is reserved to point to Bullet's btRigidBody. Don't use this, use m_userObjectPointer instead.
-	void*			m_internalOwner;
+	///m_internalType is reserved to distinguish Bullet's btCollisionObject, btRigidBody, btSoftBody etc.
+	///do not assign your own m_internalType unless you write a new dynamics object class.
+	int				m_internalType;
 
 	///time of impact calculation
 	btScalar		m_hitFraction; 
@@ -82,13 +89,15 @@ protected:
 
 	char	m_pad[7];
 
-	virtual bool	checkCollideWithOverride(btCollisionObject* co)
+	virtual bool	checkCollideWithOverride(btCollisionObject* /* co */)
 	{
 		return true;
 	}
 
 public:
 
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
 	enum CollisionFlags
 	{
 		CF_STATIC_OBJECT= 1,
@@ -97,29 +106,35 @@ public:
 		CF_CUSTOM_MATERIAL_CALLBACK = 8//this allows per-triangle material (friction/restitution)
 	};
 
+	enum	CollisionObjectTypes
+	{
+		CO_COLLISION_OBJECT =1,
+		CO_RIGID_BODY,
+		CO_SOFT_BODY
+	};
 
-	inline bool mergesSimulationIslands() const
+	SIMD_FORCE_INLINE bool mergesSimulationIslands() const
 	{
 		///static objects, kinematic and object without contact response don't merge islands
 		return  ((m_collisionFlags & (CF_STATIC_OBJECT | CF_KINEMATIC_OBJECT | CF_NO_CONTACT_RESPONSE) )==0);
 	}
 
 
-	inline bool		isStaticObject() const {
+	SIMD_FORCE_INLINE bool		isStaticObject() const {
 		return (m_collisionFlags & CF_STATIC_OBJECT) != 0;
 	}
 
-	inline bool		isKinematicObject() const
+	SIMD_FORCE_INLINE bool		isKinematicObject() const
 	{
 		return (m_collisionFlags & CF_KINEMATIC_OBJECT) != 0;
 	}
 
-	inline bool		isStaticOrKinematicObject() const
+	SIMD_FORCE_INLINE bool		isStaticOrKinematicObject() const
 	{
 		return (m_collisionFlags & (CF_KINEMATIC_OBJECT | CF_STATIC_OBJECT)) != 0 ;
 	}
 
-	inline bool		hasContactResponse() const {
+	SIMD_FORCE_INLINE bool		hasContactResponse() const {
 		return (m_collisionFlags & CF_NO_CONTACT_RESPONSE)==0;
 	}
 
@@ -131,20 +146,35 @@ public:
 	void	setCollisionShape(btCollisionShape* collisionShape)
 	{
 		m_collisionShape = collisionShape;
+		m_rootCollisionShape = collisionShape;
 	}
 
-	const btCollisionShape*	getCollisionShape() const
+	SIMD_FORCE_INLINE const btCollisionShape*	getCollisionShape() const
 	{
 		return m_collisionShape;
 	}
 
-	btCollisionShape*	getCollisionShape()
+	SIMD_FORCE_INLINE btCollisionShape*	getCollisionShape()
 	{
 		return m_collisionShape;
 	}
 
-	
+	SIMD_FORCE_INLINE const btCollisionShape*	getRootCollisionShape() const
+	{
+		return m_rootCollisionShape;
+	}
 
+	SIMD_FORCE_INLINE btCollisionShape*	getRootCollisionShape()
+	{
+		return m_rootCollisionShape;
+	}
+
+	///Avoid using this internal API call
+	///internalSetTemporaryCollisionShape is used to temporary replace the actual collision shape by a child collision shape.
+	void	internalSetTemporaryCollisionShape(btCollisionShape* collisionShape)
+	{
+		m_collisionShape = collisionShape;
+	}
 
 	int	getActivationState() const { return m_activationState1;}
 	
@@ -186,14 +216,9 @@ public:
 	}
 
 	///reserved for Bullet internal usage
-	void*	getInternalOwner()
+	int	getInternalType() const
 	{
-		return m_internalOwner;
-	}
-
-	const void*	getInternalOwner() const
-	{
-		return m_internalOwner;
+		return m_internalType;
 	}
 
 	btTransform&	getWorldTransform()
@@ -331,6 +356,7 @@ public:
 		m_userObjectPointer = userPointer;
 	}
 
+
 	inline bool checkCollideWith(btCollisionObject* co)
 	{
 		if (m_checkCollideWith)
@@ -338,9 +364,6 @@ public:
 
 		return true;
 	}
-
-
-}
-;
+};
 
 #endif //COLLISION_OBJECT_H
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
index 7dc7d8d2f68..7c2ecd6098a 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
@@ -4,8 +4,8 @@ Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
 
 This software is provided 'as-is', without any express or implied warranty.
 In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
 subject to the following restrictions:
 
 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
@@ -18,59 +18,57 @@ subject to the following restrictions:
 #include "BulletCollision/CollisionDispatch/btCollisionObject.h"
 #include "BulletCollision/CollisionShapes/btCollisionShape.h"
 #include "BulletCollision/CollisionShapes/btConvexShape.h"
-
+#include "BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h"
 #include "BulletCollision/CollisionShapes/btSphereShape.h" //for raycasting
-#include "BulletCollision/CollisionShapes/btTriangleMeshShape.h" //for raycasting
+#include "BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h" //for raycasting
 #include "BulletCollision/NarrowPhaseCollision/btRaycastCallback.h"
 #include "BulletCollision/CollisionShapes/btCompoundShape.h"
 #include "BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h"
+#include "BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h"
+#include "BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h"
+
 #include "BulletCollision/BroadphaseCollision/btBroadphaseInterface.h"
 #include "LinearMath/btAabbUtil2.h"
 #include "LinearMath/btQuickprof.h"
 #include "LinearMath/btStackAlloc.h"
 
+
 //When the user doesn't provide dispatcher or broadphase, create basic versions (and delete them in destructor)
 #include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h"
 #include "BulletCollision/BroadphaseCollision/btSimpleBroadphase.h"
+#include "BulletCollision/CollisionDispatch/btCollisionConfiguration.h"
 
 
-btCollisionWorld::btCollisionWorld(btDispatcher* dispatcher,btOverlappingPairCache* pairCache, int stackSize)
+btCollisionWorld::btCollisionWorld(btDispatcher* dispatcher,btBroadphaseInterface* pairCache, btCollisionConfiguration* collisionConfiguration)
 :m_dispatcher1(dispatcher),
 m_broadphasePairCache(pairCache),
-m_ownsDispatcher(false),
-m_ownsBroadphasePairCache(false)
+m_debugDrawer(0)
 {
-	m_stackAlloc = new btStackAlloc(stackSize);
+	m_stackAlloc = collisionConfiguration->getStackAllocator();
 	m_dispatchInfo.m_stackAllocator = m_stackAlloc;
 }
 
 
 btCollisionWorld::~btCollisionWorld()
 {
-	m_stackAlloc->destroy();
-	delete m_stackAlloc;
 
 	//clean up remaining objects
 	int i;
 	for (i=0;i<m_collisionObjects.size();i++)
 	{
 		btCollisionObject* collisionObject= m_collisionObjects[i];
-		
+
 		btBroadphaseProxy* bp = collisionObject->getBroadphaseHandle();
 		if (bp)
 		{
 			//
 			// only clear the cached algorithms
 			//
-			getBroadphase()->cleanProxyFromPairs(bp);
-			getBroadphase()->destroyProxy(bp);
+			getBroadphase()->getOverlappingPairCache()->cleanProxyFromPairs(bp,m_dispatcher1);
+			getBroadphase()->destroyProxy(bp,m_dispatcher1);
 		}
 	}
 
-	if (m_ownsDispatcher)
-		delete m_dispatcher1;
-	if (m_ownsBroadphasePairCache)
-		delete m_broadphasePairCache;
 
 }
 
@@ -105,66 +103,100 @@ void	btCollisionWorld::addCollisionObject(btCollisionObject* collisionObject,sho
 			type,
 			collisionObject,
 			collisionFilterGroup,
-			collisionFilterMask
+			collisionFilterMask,
+			m_dispatcher1,0
 			))	;
 
-		
+
 
 
 
 }
 
+void	btCollisionWorld::updateAabbs()
+{
+	BT_PROFILE("updateAabbs");
+
+	btTransform predictedTrans;
+	for ( int i=0;i<m_collisionObjects.size();i++)
+	{
+		btCollisionObject* colObj = m_collisionObjects[i];
+
+		//only update aabb of active objects
+		if (colObj->isActive())
+		{
+			btPoint3 minAabb,maxAabb;
+			colObj->getCollisionShape()->getAabb(colObj->getWorldTransform(), minAabb,maxAabb);
+			btBroadphaseInterface* bp = (btBroadphaseInterface*)m_broadphasePairCache;
+
+			//moving objects should be moderately sized, probably something wrong if not
+			if ( colObj->isStaticObject() || ((maxAabb-minAabb).length2() < btScalar(1e12)))
+			{
+				bp->setAabb(colObj->getBroadphaseHandle(),minAabb,maxAabb, m_dispatcher1);
+			} else
+			{
+				//something went wrong, investigate
+				//this assert is unwanted in 3D modelers (danger of loosing work)
+				colObj->setActivationState(DISABLE_SIMULATION);
+
+				static bool reportMe = true;
+				if (reportMe && m_debugDrawer)
+				{
+					reportMe = false;
+					m_debugDrawer->reportErrorWarning("Overflow in AABB, object removed from simulation");
+					m_debugDrawer->reportErrorWarning("If you can reproduce this, please email bugs@continuousphysics.com\n");
+					m_debugDrawer->reportErrorWarning("Please include above information, your Platform, version of OS.\n");
+					m_debugDrawer->reportErrorWarning("Thanks.\n");
+				}
+			}
+		}
+	}
+
+}
 
 
 
 void	btCollisionWorld::performDiscreteCollisionDetection()
 {
+	BT_PROFILE("performDiscreteCollisionDetection");
+
 	btDispatcherInfo& dispatchInfo = getDispatchInfo();
 
-	BEGIN_PROFILE("perform Broadphase Collision Detection");
+	updateAabbs();
 
-
-	//update aabb (of all moved objects)
-
-	btVector3 aabbMin,aabbMax;
-	for (int i=0;i<m_collisionObjects.size();i++)
 	{
-		m_collisionObjects[i]->getCollisionShape()->getAabb(m_collisionObjects[i]->getWorldTransform(),aabbMin,aabbMax);
-		m_broadphasePairCache->setAabb(m_collisionObjects[i]->getBroadphaseHandle(),aabbMin,aabbMax);
+		BT_PROFILE("calculateOverlappingPairs");
+		m_broadphasePairCache->calculateOverlappingPairs(m_dispatcher1);
 	}
 
-	m_broadphasePairCache->refreshOverlappingPairs();
-
-	
-	END_PROFILE("perform Broadphase Collision Detection");
-
-	BEGIN_PROFILE("performDiscreteCollisionDetection");
 
 	btDispatcher* dispatcher = getDispatcher();
-	if (dispatcher)
-		dispatcher->dispatchAllCollisionPairs(m_broadphasePairCache,dispatchInfo);
-
-	END_PROFILE("performDiscreteCollisionDetection");
+	{
+		BT_PROFILE("dispatchAllCollisionPairs");
+		if (dispatcher)
+			dispatcher->dispatchAllCollisionPairs(m_broadphasePairCache->getOverlappingPairCache(),dispatchInfo,m_dispatcher1);
+	}
 
 }
 
 
+
 void	btCollisionWorld::removeCollisionObject(btCollisionObject* collisionObject)
 {
-	
-	
+
+
 	//bool removeFromBroadphase = false;
-	
+
 	{
-		
+
 		btBroadphaseProxy* bp = collisionObject->getBroadphaseHandle();
 		if (bp)
 		{
 			//
 			// only clear the cached algorithms
 			//
-			getBroadphase()->cleanProxyFromPairs(bp);
-			getBroadphase()->destroyProxy(bp);
+			getBroadphase()->getOverlappingPairCache()->cleanProxyFromPairs(bp,m_dispatcher1);
+			getBroadphase()->destroyProxy(bp,m_dispatcher1);
 			collisionObject->setBroadphaseHandle(0);
 		}
 	}
@@ -181,192 +213,457 @@ void	btCollisionWorld::rayTestSingle(const btTransform& rayFromTrans,const btTra
 					  btCollisionObject* collisionObject,
 					  const btCollisionShape* collisionShape,
 					  const btTransform& colObjWorldTransform,
-					  RayResultCallback& resultCallback,
-					  short int collisionFilterMask,
-					  bool faceNormal)
+					  RayResultCallback& resultCallback)
 {
-	
 	btSphereShape pointShape(btScalar(0.0));
 	pointShape.setMargin(0.f);
+	const btConvexShape* castShape = &pointShape;
 
-	objectQuerySingle(&pointShape,rayFromTrans,rayToTrans,
-					  collisionObject,
-					  collisionShape,
-					  colObjWorldTransform,
-					  resultCallback,collisionFilterMask,faceNormal);
+	if (collisionShape->isConvex())
+	{
+		btConvexCast::CastResult castResult;
+		castResult.m_fraction = resultCallback.m_closestHitFraction;
+
+		btConvexShape* convexShape = (btConvexShape*) collisionShape;
+		btVoronoiSimplexSolver	simplexSolver;
+#define USE_SUBSIMPLEX_CONVEX_CAST 1
+#ifdef USE_SUBSIMPLEX_CONVEX_CAST
+		btSubsimplexConvexCast convexCaster(castShape,convexShape,&simplexSolver);
+#else
+		//btGjkConvexCast	convexCaster(castShape,convexShape,&simplexSolver);
+		//btContinuousConvexCollision convexCaster(castShape,convexShape,&simplexSolver,0);
+#endif //#USE_SUBSIMPLEX_CONVEX_CAST
+
+		if (convexCaster.calcTimeOfImpact(rayFromTrans,rayToTrans,colObjWorldTransform,colObjWorldTransform,castResult))
+		{
+			//add hit
+			if (castResult.m_normal.length2() > btScalar(0.0001))
+			{
+				if (castResult.m_fraction < resultCallback.m_closestHitFraction)
+				{
+#ifdef USE_SUBSIMPLEX_CONVEX_CAST
+					//rotate normal into worldspace
+					castResult.m_normal = rayFromTrans.getBasis() * castResult.m_normal;
+#endif //USE_SUBSIMPLEX_CONVEX_CAST
+
+					castResult.m_normal.normalize();
+					btCollisionWorld::LocalRayResult localRayResult
+						(
+							collisionObject,
+							0,
+							castResult.m_normal,
+							castResult.m_fraction
+						);
+
+					bool normalInWorldSpace = true;
+					resultCallback.addSingleResult(localRayResult, normalInWorldSpace);
+
+				}
+			}
+		}
+	} else {
+		if (collisionShape->isConcave())
+		{
+			if (collisionShape->getShapeType()==TRIANGLE_MESH_SHAPE_PROXYTYPE)
+			{
+				///optimized version for btBvhTriangleMeshShape
+				btBvhTriangleMeshShape* triangleMesh = (btBvhTriangleMeshShape*)collisionShape;
+				btTransform worldTocollisionObject = colObjWorldTransform.inverse();
+				btVector3 rayFromLocal = worldTocollisionObject * rayFromTrans.getOrigin();
+				btVector3 rayToLocal = worldTocollisionObject * rayToTrans.getOrigin();
+
+				//ConvexCast::CastResult
+				struct BridgeTriangleRaycastCallback : public btTriangleRaycastCallback
+				{
+					btCollisionWorld::RayResultCallback* m_resultCallback;
+					btCollisionObject*	m_collisionObject;
+					btTriangleMeshShape*	m_triangleMesh;
+
+					BridgeTriangleRaycastCallback( const btVector3& from,const btVector3& to,
+						btCollisionWorld::RayResultCallback* resultCallback, btCollisionObject* collisionObject,btTriangleMeshShape*	triangleMesh):
+						btTriangleRaycastCallback(from,to),
+							m_resultCallback(resultCallback),
+							m_collisionObject(collisionObject),
+							m_triangleMesh(triangleMesh)
+						{
+						}
+
+
+					virtual btScalar reportHit(const btVector3& hitNormalLocal, btScalar hitFraction, int partId, int triangleIndex )
+					{
+						btCollisionWorld::LocalShapeInfo	shapeInfo;
+						shapeInfo.m_shapePart = partId;
+						shapeInfo.m_triangleIndex = triangleIndex;
+
+						btCollisionWorld::LocalRayResult rayResult
+						(m_collisionObject,
+							&shapeInfo,
+							hitNormalLocal,
+							hitFraction);
+
+						bool	normalInWorldSpace = false;
+						return m_resultCallback->addSingleResult(rayResult,normalInWorldSpace);
+					}
+
+				};
+
+				BridgeTriangleRaycastCallback rcb(rayFromLocal,rayToLocal,&resultCallback,collisionObject,triangleMesh);
+				rcb.m_hitFraction = resultCallback.m_closestHitFraction;
+				triangleMesh->performRaycast(&rcb,rayFromLocal,rayToLocal);
+			} else
+			{
+				btTriangleMeshShape* triangleMesh = (btTriangleMeshShape*)collisionShape;
+
+				btTransform worldTocollisionObject = colObjWorldTransform.inverse();
+
+				btVector3 rayFromLocal = worldTocollisionObject * rayFromTrans.getOrigin();
+				btVector3 rayToLocal = worldTocollisionObject * rayToTrans.getOrigin();
+
+				//ConvexCast::CastResult
+
+				struct BridgeTriangleRaycastCallback : public btTriangleRaycastCallback
+				{
+					btCollisionWorld::RayResultCallback* m_resultCallback;
+					btCollisionObject*	m_collisionObject;
+					btTriangleMeshShape*	m_triangleMesh;
+
+					BridgeTriangleRaycastCallback( const btVector3& from,const btVector3& to,
+						btCollisionWorld::RayResultCallback* resultCallback, btCollisionObject* collisionObject,btTriangleMeshShape*	triangleMesh):
+						btTriangleRaycastCallback(from,to),
+							m_resultCallback(resultCallback),
+							m_collisionObject(collisionObject),
+							m_triangleMesh(triangleMesh)
+						{
+						}
+
+
+					virtual btScalar reportHit(const btVector3& hitNormalLocal, btScalar hitFraction, int partId, int triangleIndex )
+					{
+						btCollisionWorld::LocalShapeInfo	shapeInfo;
+						shapeInfo.m_shapePart = partId;
+						shapeInfo.m_triangleIndex = triangleIndex;
+
+						btCollisionWorld::LocalRayResult rayResult
+						(m_collisionObject,
+							&shapeInfo,
+							hitNormalLocal,
+							hitFraction);
+
+						bool	normalInWorldSpace = false;
+						return m_resultCallback->addSingleResult(rayResult,normalInWorldSpace);
+
+
+					}
+
+				};
+
+
+				BridgeTriangleRaycastCallback	rcb(rayFromLocal,rayToLocal,&resultCallback,collisionObject,triangleMesh);
+				rcb.m_hitFraction = resultCallback.m_closestHitFraction;
+
+				btVector3 rayAabbMinLocal = rayFromLocal;
+				rayAabbMinLocal.setMin(rayToLocal);
+				btVector3 rayAabbMaxLocal = rayFromLocal;
+				rayAabbMaxLocal.setMax(rayToLocal);
+
+				triangleMesh->processAllTriangles(&rcb,rayAabbMinLocal,rayAabbMaxLocal);
+			}
+		} else {
+			//todo: use AABB tree or other BVH acceleration structure!
+			if (collisionShape->isCompound())
+			{
+				const btCompoundShape* compoundShape = static_cast<const btCompoundShape*>(collisionShape);
+				int i=0;
+				for (i=0;i<compoundShape->getNumChildShapes();i++)
+				{
+					btTransform childTrans = compoundShape->getChildTransform(i);
+					const btCollisionShape* childCollisionShape = compoundShape->getChildShape(i);
+					btTransform childWorldTrans = colObjWorldTransform * childTrans;
+					rayTestSingle(rayFromTrans,rayToTrans,
+						collisionObject,
+						childCollisionShape,
+						childWorldTrans,
+						resultCallback);
+
+				}
+			}
+		}
+	}
 }
 
-void	btCollisionWorld::objectQuerySingle(const btConvexShape* castShape,const btTransform& rayFromTrans,const btTransform& rayToTrans,
+void	btCollisionWorld::objectQuerySingle(const btConvexShape* castShape,const btTransform& convexFromTrans,const btTransform& convexToTrans,
 					  btCollisionObject* collisionObject,
 					  const btCollisionShape* collisionShape,
 					  const btTransform& colObjWorldTransform,
-					  RayResultCallback& resultCallback,
-					  short int collisionFilterMask,
-					  bool faceNormal)
+					  ConvexResultCallback& resultCallback, btScalar allowedPenetration)
 {
-	
-
 	if (collisionShape->isConvex())
+	{
+		btConvexCast::CastResult castResult;
+		castResult.m_allowedPenetration = allowedPenetration;
+		castResult.m_fraction = btScalar(1.);//??
+
+		btConvexShape* convexShape = (btConvexShape*) collisionShape;
+		btVoronoiSimplexSolver	simplexSolver;
+		btGjkEpaPenetrationDepthSolver	gjkEpaPenetrationSolver;
+		
+		btContinuousConvexCollision convexCaster1(castShape,convexShape,&simplexSolver,&gjkEpaPenetrationSolver);
+		//btGjkConvexCast convexCaster2(castShape,convexShape,&simplexSolver);
+		//btSubsimplexConvexCast convexCaster3(castShape,convexShape,&simplexSolver);
+
+		btConvexCast* castPtr = &convexCaster1;
+	
+	
+		
+		if (castPtr->calcTimeOfImpact(convexFromTrans,convexToTrans,colObjWorldTransform,colObjWorldTransform,castResult))
+		{
+			//add hit
+			if (castResult.m_normal.length2() > btScalar(0.0001))
 			{
-				btConvexCast::CastResult castResult;
-				castResult.m_fraction = btScalar(1.);//??
-
-				btConvexShape* convexShape = (btConvexShape*) collisionShape;
-				btVoronoiSimplexSolver	simplexSolver;
-				btSubsimplexConvexCast convexCaster(castShape,convexShape,&simplexSolver);
-				//GjkConvexCast	convexCaster(castShape,convexShape,&simplexSolver);
-				//ContinuousConvexCollision convexCaster(castShape,convexShape,&simplexSolver,0);
-				
-				if (convexCaster.calcTimeOfImpact(rayFromTrans,rayToTrans,colObjWorldTransform,colObjWorldTransform,castResult))
+				if (castResult.m_fraction < resultCallback.m_closestHitFraction)
 				{
-					//add hit
-					if (castResult.m_normal.length2() > btScalar(0.0001))
-					{
-						castResult.m_normal.normalize();
-						if (castResult.m_fraction < resultCallback.m_closestHitFraction)
-						{
-
-							btCollisionWorld::LocalRayResult localRayResult
+					castResult.m_normal.normalize();
+					btCollisionWorld::LocalConvexResult localConvexResult
 								(
-									collisionObject, 
+									collisionObject,
 									0,
 									castResult.m_normal,
+									castResult.m_hitPoint,
 									castResult.m_fraction
 								);
 
-							resultCallback.AddSingleResult(localRayResult);
+					bool normalInWorldSpace = true;
+					resultCallback.addSingleResult(localConvexResult, normalInWorldSpace);
 
-						}
-					}
 				}
 			}
-			else
+		}
+	} else {
+		if (collisionShape->isConcave())
+		{
+			if (collisionShape->getShapeType()==TRIANGLE_MESH_SHAPE_PROXYTYPE)
 			{
-				
-				if (collisionShape->isConcave())
-					{
+				btBvhTriangleMeshShape* triangleMesh = (btBvhTriangleMeshShape*)collisionShape;
+				btTransform worldTocollisionObject = colObjWorldTransform.inverse();
+				btVector3 convexFromLocal = worldTocollisionObject * convexFromTrans.getOrigin();
+				btVector3 convexToLocal = worldTocollisionObject * convexToTrans.getOrigin();
+				// rotation of box in local mesh space = MeshRotation^-1 * ConvexToRotation
+				btTransform rotationXform = btTransform(worldTocollisionObject.getBasis() * convexToTrans.getBasis());
 
-						btTriangleMeshShape* triangleMesh = (btTriangleMeshShape*)collisionShape;
-						
-						btTransform worldTocollisionObject = colObjWorldTransform.inverse();
+				//ConvexCast::CastResult
+				struct BridgeTriangleConvexcastCallback : public btTriangleConvexcastCallback
+				{
+					btCollisionWorld::ConvexResultCallback* m_resultCallback;
+					btCollisionObject*	m_collisionObject;
+					btTriangleMeshShape*	m_triangleMesh;
 
-						btVector3 rayFromLocal = worldTocollisionObject * rayFromTrans.getOrigin();
-						btVector3 rayToLocal = worldTocollisionObject * rayToTrans.getOrigin();
-
-						//ConvexCast::CastResult
-
-						struct BridgeTriangleRaycastCallback : public btTriangleRaycastCallback 
+					BridgeTriangleConvexcastCallback(const btConvexShape* castShape, const btTransform& from,const btTransform& to,
+						btCollisionWorld::ConvexResultCallback* resultCallback, btCollisionObject* collisionObject,btTriangleMeshShape*	triangleMesh, const btTransform& triangleToWorld):
+						btTriangleConvexcastCallback(castShape, from,to, triangleToWorld, triangleMesh->getMargin()),
+							m_resultCallback(resultCallback),
+							m_collisionObject(collisionObject),
+							m_triangleMesh(triangleMesh)
 						{
-							btCollisionWorld::RayResultCallback* m_resultCallback;
-							btCollisionObject*	m_collisionObject;
-							btTriangleMeshShape*	m_triangleMesh;
-
-							BridgeTriangleRaycastCallback( const btVector3& from,const btVector3& to,bool faceNormal,
-								btCollisionWorld::RayResultCallback* resultCallback, btCollisionObject* collisionObject,btTriangleMeshShape* triangleMesh):
-								btTriangleRaycastCallback(from,to,faceNormal),
-									m_resultCallback(resultCallback),
-									m_collisionObject(collisionObject),
-									m_triangleMesh(triangleMesh)
-								{
-								}
-
-
-							virtual btScalar reportHit(const btVector3& hitNormalLocal, btScalar hitFraction, int partId, int triangleIndex )
-							{
-								btCollisionWorld::LocalShapeInfo	shapeInfo;
-								shapeInfo.m_shapePart = partId;
-								shapeInfo.m_triangleIndex = triangleIndex;
-								shapeInfo.m_triangleShape = m_triangleMesh;
-								
-								btCollisionWorld::LocalRayResult rayResult
-								(m_collisionObject, 
-									&shapeInfo,
-									hitNormalLocal,
-									hitFraction);
-								
-								return m_resultCallback->AddSingleResult(rayResult);
-								
-								
-							}
-	
-						};
-
-
-						BridgeTriangleRaycastCallback	rcb(rayFromLocal,rayToLocal,faceNormal,&resultCallback,collisionObject,triangleMesh);
-						rcb.m_hitFraction = resultCallback.m_closestHitFraction;
-
-						btVector3 rayAabbMinLocal = rayFromLocal;
-						rayAabbMinLocal.setMin(rayToLocal);
-						btVector3 rayAabbMaxLocal = rayFromLocal;
-						rayAabbMaxLocal.setMax(rayToLocal);
-
-						triangleMesh->processAllTriangles(&rcb,rayAabbMinLocal,rayAabbMaxLocal);
-											
-					} else
-					{
-						//todo: use AABB tree or other BVH acceleration structure!
-						if (collisionShape->isCompound())
-						{
-							const btCompoundShape* compoundShape = static_cast<const btCompoundShape*>(collisionShape);
-							int i=0;
-							for (i=0;i<compoundShape->getNumChildShapes();i++)
-							{
-								btTransform childTrans = compoundShape->getChildTransform(i);
-								const btCollisionShape* childCollisionShape = compoundShape->getChildShape(i);
-								btTransform childWorldTrans = colObjWorldTransform * childTrans;
-								objectQuerySingle(castShape, rayFromTrans,rayToTrans,
-									collisionObject,
-									childCollisionShape,
-									childWorldTrans,
-									resultCallback, collisionFilterMask, faceNormal);
-
-							}
-
-
 						}
+
+
+					virtual btScalar reportHit(const btVector3& hitNormalLocal, const btVector3& hitPointLocal, btScalar hitFraction, int partId, int triangleIndex )
+					{
+						btCollisionWorld::LocalShapeInfo	shapeInfo;
+						shapeInfo.m_shapePart = partId;
+						shapeInfo.m_triangleIndex = triangleIndex;
+						if (hitFraction <= m_resultCallback->m_closestHitFraction)
+						{
+
+							btCollisionWorld::LocalConvexResult convexResult
+							(m_collisionObject,
+								&shapeInfo,
+								hitNormalLocal,
+								hitPointLocal,
+								hitFraction);
+
+							bool	normalInWorldSpace = true;
+
+
+							return m_resultCallback->addSingleResult(convexResult,normalInWorldSpace);
+						}
+						return hitFraction;
 					}
+
+				};
+
+				BridgeTriangleConvexcastCallback tccb(castShape, convexFromTrans,convexToTrans,&resultCallback,collisionObject,triangleMesh, colObjWorldTransform);
+				tccb.m_hitFraction = resultCallback.m_closestHitFraction;
+				btVector3 boxMinLocal, boxMaxLocal;
+				castShape->getAabb(rotationXform, boxMinLocal, boxMaxLocal);
+				triangleMesh->performConvexcast(&tccb,convexFromLocal,convexToLocal,boxMinLocal, boxMaxLocal);
+			} else
+			{
+				btBvhTriangleMeshShape* triangleMesh = (btBvhTriangleMeshShape*)collisionShape;
+				btTransform worldTocollisionObject = colObjWorldTransform.inverse();
+				btVector3 convexFromLocal = worldTocollisionObject * convexFromTrans.getOrigin();
+				btVector3 convexToLocal = worldTocollisionObject * convexToTrans.getOrigin();
+				// rotation of box in local mesh space = MeshRotation^-1 * ConvexToRotation
+				btTransform rotationXform = btTransform(worldTocollisionObject.getBasis() * convexToTrans.getBasis());
+
+				//ConvexCast::CastResult
+				struct BridgeTriangleConvexcastCallback : public btTriangleConvexcastCallback
+				{
+					btCollisionWorld::ConvexResultCallback* m_resultCallback;
+					btCollisionObject*	m_collisionObject;
+					btTriangleMeshShape*	m_triangleMesh;
+
+					BridgeTriangleConvexcastCallback(const btConvexShape* castShape, const btTransform& from,const btTransform& to,
+						btCollisionWorld::ConvexResultCallback* resultCallback, btCollisionObject* collisionObject,btTriangleMeshShape*	triangleMesh, const btTransform& triangleToWorld):
+						btTriangleConvexcastCallback(castShape, from,to, triangleToWorld, triangleMesh->getMargin()),
+							m_resultCallback(resultCallback),
+							m_collisionObject(collisionObject),
+							m_triangleMesh(triangleMesh)
+						{
+						}
+
+
+					virtual btScalar reportHit(const btVector3& hitNormalLocal, const btVector3& hitPointLocal, btScalar hitFraction, int partId, int triangleIndex )
+					{
+						btCollisionWorld::LocalShapeInfo	shapeInfo;
+						shapeInfo.m_shapePart = partId;
+						shapeInfo.m_triangleIndex = triangleIndex;
+						if (hitFraction <= m_resultCallback->m_closestHitFraction)
+						{
+
+							btCollisionWorld::LocalConvexResult convexResult
+							(m_collisionObject,
+								&shapeInfo,
+								hitNormalLocal,
+								hitPointLocal,
+								hitFraction);
+
+							bool	normalInWorldSpace = false;
+
+							return m_resultCallback->addSingleResult(convexResult,normalInWorldSpace);
+						}
+						return hitFraction;
+					}
+
+				};
+
+				BridgeTriangleConvexcastCallback tccb(castShape, convexFromTrans,convexToTrans,&resultCallback,collisionObject,triangleMesh, colObjWorldTransform);
+				tccb.m_hitFraction = resultCallback.m_closestHitFraction;
+				btVector3 boxMinLocal, boxMaxLocal;
+				castShape->getAabb(rotationXform, boxMinLocal, boxMaxLocal);
+
+				btVector3 rayAabbMinLocal = convexFromLocal;
+				rayAabbMinLocal.setMin(convexToLocal);
+				btVector3 rayAabbMaxLocal = convexFromLocal;
+				rayAabbMaxLocal.setMax(convexToLocal);
+				rayAabbMinLocal += boxMinLocal;
+				rayAabbMaxLocal += boxMaxLocal;
+				triangleMesh->processAllTriangles(&tccb,rayAabbMinLocal,rayAabbMaxLocal);
 			}
+		} else {
+			//todo: use AABB tree or other BVH acceleration structure!
+			if (collisionShape->isCompound())
+			{
+				const btCompoundShape* compoundShape = static_cast<const btCompoundShape*>(collisionShape);
+				int i=0;
+				for (i=0;i<compoundShape->getNumChildShapes();i++)
+				{
+					btTransform childTrans = compoundShape->getChildTransform(i);
+					const btCollisionShape* childCollisionShape = compoundShape->getChildShape(i);
+					btTransform childWorldTrans = colObjWorldTransform * childTrans;
+					objectQuerySingle(castShape, convexFromTrans,convexToTrans,
+						collisionObject,
+						childCollisionShape,
+						childWorldTrans,
+						resultCallback, allowedPenetration);
+				}
+			}
+		}
+	}
 }
 
-void	btCollisionWorld::rayTest(const btVector3& rayFromWorld, const btVector3& rayToWorld, RayResultCallback& resultCallback,short int collisionFilterMask, bool faceNormal)
+void	btCollisionWorld::rayTest(const btVector3& rayFromWorld, const btVector3& rayToWorld, RayResultCallback& resultCallback) const
 {
 
-	
+
 	btTransform	rayFromTrans,rayToTrans;
 	rayFromTrans.setIdentity();
 	rayFromTrans.setOrigin(rayFromWorld);
 	rayToTrans.setIdentity();
-	
+
 	rayToTrans.setOrigin(rayToWorld);
 
 	/// go over all objects, and if the ray intersects their aabb, do a ray-shape query using convexCaster (CCD)
-	
+
+	int i;
+	for (i=0;i<m_collisionObjects.size();i++)
+	{
+		///terminate further ray tests, once the closestHitFraction reached zero
+		if (resultCallback.m_closestHitFraction == btScalar(0.f))
+			break;
+
+		btCollisionObject*	collisionObject= m_collisionObjects[i];
+		//only perform raycast if filterMask matches
+		if(resultCallback.needsCollision(collisionObject->getBroadphaseHandle())) {
+			//RigidcollisionObject* collisionObject = ctrl->GetRigidcollisionObject();
+			btVector3 collisionObjectAabbMin,collisionObjectAabbMax;
+			collisionObject->getCollisionShape()->getAabb(collisionObject->getWorldTransform(),collisionObjectAabbMin,collisionObjectAabbMax);
+
+			btScalar hitLambda = resultCallback.m_closestHitFraction;
+			btVector3 hitNormal;
+			if (btRayAabb(rayFromWorld,rayToWorld,collisionObjectAabbMin,collisionObjectAabbMax,hitLambda,hitNormal))
+			{
+				rayTestSingle(rayFromTrans,rayToTrans,
+					collisionObject,
+						collisionObject->getCollisionShape(),
+						collisionObject->getWorldTransform(),
+						resultCallback);
+			}
+		}
+
+	}
+
+}
+
+void	btCollisionWorld::convexSweepTest(const btConvexShape* castShape, const btTransform& convexFromWorld, const btTransform& convexToWorld, ConvexResultCallback& resultCallback) const
+{
+	btTransform	convexFromTrans,convexToTrans;
+	convexFromTrans = convexFromWorld;
+	convexToTrans = convexToWorld;
+	btVector3 castShapeAabbMin, castShapeAabbMax;
+	/* Compute AABB that encompasses angular movement */
+	{
+		btVector3 linVel, angVel;
+		btTransformUtil::calculateVelocity (convexFromTrans, convexToTrans, 1.0, linVel, angVel);
+		btTransform R;
+		R.setIdentity ();
+		R.setRotation (convexFromTrans.getRotation());
+		castShape->calculateTemporalAabb (R, linVel, angVel, 1.0, castShapeAabbMin, castShapeAabbMax);
+	}
+
+	/// go over all objects, and if the ray intersects their aabb + cast shape aabb,
+	// do a ray-shape query using convexCaster (CCD)
 	int i;
 	for (i=0;i<m_collisionObjects.size();i++)
 	{
 		btCollisionObject*	collisionObject= m_collisionObjects[i];
 		//only perform raycast if filterMask matches
-		if(collisionObject->getBroadphaseHandle()->m_collisionFilterGroup & collisionFilterMask) { 
+		if(resultCallback.needsCollision(collisionObject->getBroadphaseHandle())) {
 			//RigidcollisionObject* collisionObject = ctrl->GetRigidcollisionObject();
 			btVector3 collisionObjectAabbMin,collisionObjectAabbMax;
 			collisionObject->getCollisionShape()->getAabb(collisionObject->getWorldTransform(),collisionObjectAabbMin,collisionObjectAabbMax);
-
+			AabbExpand (collisionObjectAabbMin, collisionObjectAabbMax, castShapeAabbMin, castShapeAabbMax);
 			btScalar hitLambda = btScalar(1.); //could use resultCallback.m_closestHitFraction, but needs testing
 			btVector3 hitNormal;
-			if (btRayAabb(rayFromWorld,rayToWorld,collisionObjectAabbMin,collisionObjectAabbMax,hitLambda,hitNormal))
+			if (btRayAabb(convexFromWorld.getOrigin(),convexToWorld.getOrigin(),collisionObjectAabbMin,collisionObjectAabbMax,hitLambda,hitNormal))
 			{
-				// before testing this object, verify that it is not filtered out
-				if (resultCallback.NeedRayCast(collisionObject))
-				{
-					rayTestSingle(rayFromTrans,rayToTrans,
-						collisionObject,
-							collisionObject->getCollisionShape(),
-							collisionObject->getWorldTransform(),
-							resultCallback,
-							collisionFilterMask,
-							faceNormal);
-				}
-			}	
+				objectQuerySingle(castShape, convexFromTrans,convexToTrans,
+					collisionObject,
+						collisionObject->getCollisionShape(),
+						collisionObject->getWorldTransform(),
+						resultCallback,
+						getDispatchInfo().m_allowedCcdPenetration);
+			}
 		}
 	}
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h
index ed41232ece3..7557691a9a9 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h
@@ -68,12 +68,12 @@ class btStackAlloc;
 class btCollisionShape;
 class btConvexShape;
 class btBroadphaseInterface;
-#include "../../LinearMath/btVector3.h"
-#include "../../LinearMath/btTransform.h"
+#include "LinearMath/btVector3.h"
+#include "LinearMath/btTransform.h"
 #include "btCollisionObject.h"
 #include "btCollisionDispatcher.h" //for definition of btCollisionObjectArray
-#include "../BroadphaseCollision/btOverlappingPairCache.h"
-#include "../../LinearMath/btAlignedObjectArray.h"
+#include "BulletCollision/BroadphaseCollision/btOverlappingPairCache.h"
+#include "LinearMath/btAlignedObjectArray.h"
 
 ///CollisionWorld is interface and container for the collision detection
 class btCollisionWorld
@@ -90,18 +90,22 @@ protected:
 
 	btStackAlloc*	m_stackAlloc;
 
-	btOverlappingPairCache*	m_broadphasePairCache;
-	
-	bool	m_ownsDispatcher;
-	bool	m_ownsBroadphasePairCache;
+	btBroadphaseInterface*	m_broadphasePairCache;
 
+	btIDebugDraw*	m_debugDrawer;
+
+	
 public:
 
 	//this constructor doesn't own the dispatcher and paircache/broadphase
-	btCollisionWorld(btDispatcher* dispatcher,btOverlappingPairCache* pairCache, int stackSize = 2*1024*1024);
+	btCollisionWorld(btDispatcher* dispatcher,btBroadphaseInterface* broadphasePairCache, btCollisionConfiguration* collisionConfiguration);
 
 	virtual ~btCollisionWorld();
 
+	void	setBroadphase(btBroadphaseInterface*	pairCache)
+	{
+		m_broadphasePairCache = pairCache;
+	}
 
 	btBroadphaseInterface*	getBroadphase()
 	{
@@ -110,7 +114,7 @@ public:
 
 	btOverlappingPairCache*	getPairCache()
 	{
-		return m_broadphasePairCache;
+		return m_broadphasePairCache->getOverlappingPairCache();
 	}
 
 
@@ -119,14 +123,32 @@ public:
 		return m_dispatcher1;
 	}
 
+	const btDispatcher*	getDispatcher() const
+	{
+		return m_dispatcher1;
+	}
+
+	virtual void	updateAabbs();
+
+	virtual void	setDebugDrawer(btIDebugDraw*	debugDrawer)
+	{
+			m_debugDrawer = debugDrawer;
+	}
+
+	virtual btIDebugDraw*	getDebugDrawer()
+	{
+		return m_debugDrawer;
+	}
+
+
 	///LocalShapeInfo gives extra information for complex shapes
 	///Currently, only btTriangleMeshShape is available, so it just contains triangleIndex and subpart
 	struct	LocalShapeInfo
 	{
 		int	m_shapePart;
 		int	m_triangleIndex;
-		// needed in case of compound shape
-		const btCollisionShape*	m_triangleShape;
+		
+		//const btCollisionShape*	m_shapeTemp;
 		//const btTransform*	m_shapeLocalTransform;
 	};
 
@@ -153,32 +175,43 @@ public:
 	///RayResultCallback is used to report new raycast results
 	struct	RayResultCallback
 	{
+		btScalar	m_closestHitFraction;
+		btCollisionObject*		m_collisionObject;
+		short int	m_collisionFilterGroup;
+		short int	m_collisionFilterMask;
+
 		virtual ~RayResultCallback()
 		{
 		}
-		btScalar	m_closestHitFraction;
-		bool	HasHit()
+		bool	hasHit() const
 		{
-			return (m_closestHitFraction < btScalar(1.));
+			return (m_collisionObject != 0);
 		}
 
 		RayResultCallback()
-			:m_closestHitFraction(btScalar(1.))
+			:m_closestHitFraction(btScalar(1.)),
+			m_collisionObject(0),
+			m_collisionFilterGroup(btBroadphaseProxy::DefaultFilter),
+			m_collisionFilterMask(btBroadphaseProxy::AllFilter)
 		{
 		}
-		virtual bool        NeedRayCast(btCollisionObject* object)
+
+		virtual bool needsCollision(btBroadphaseProxy* proxy0) const
 		{
-			return true;
+			bool collides = (proxy0->m_collisionFilterGroup & m_collisionFilterMask) != 0;
+			collides = collides && (m_collisionFilterGroup & proxy0->m_collisionFilterMask);
+			return collides;
 		}
-		virtual	btScalar	AddSingleResult(LocalRayResult& rayResult) = 0;
+
+
+		virtual	btScalar	addSingleResult(LocalRayResult& rayResult,bool normalInWorldSpace) = 0;
 	};
 
 	struct	ClosestRayResultCallback : public RayResultCallback
 	{
 		ClosestRayResultCallback(const btVector3&	rayFromWorld,const btVector3&	rayToWorld)
 		:m_rayFromWorld(rayFromWorld),
-		m_rayToWorld(rayToWorld),
-		m_collisionObject(0)
+		m_rayToWorld(rayToWorld)
 		{
 		}
 
@@ -187,24 +220,121 @@ public:
 
 		btVector3	m_hitNormalWorld;
 		btVector3	m_hitPointWorld;
-		btCollisionObject*	m_collisionObject;
-		
-		virtual	btScalar	AddSingleResult(LocalRayResult& rayResult)
+			
+		virtual	btScalar	addSingleResult(LocalRayResult& rayResult,bool normalInWorldSpace)
 		{
-
-//caller already does the filter on the m_closestHitFraction
-			assert(rayResult.m_hitFraction <= m_closestHitFraction);
+			//caller already does the filter on the m_closestHitFraction
+			btAssert(rayResult.m_hitFraction <= m_closestHitFraction);
 			
 			m_closestHitFraction = rayResult.m_hitFraction;
 			m_collisionObject = rayResult.m_collisionObject;
-			m_hitNormalWorld = m_collisionObject->getWorldTransform().getBasis()*rayResult.m_hitNormalLocal;
+			if (normalInWorldSpace)
+			{
+				m_hitNormalWorld = rayResult.m_hitNormalLocal;
+			} else
+			{
+				///need to transform normal into worldspace
+				m_hitNormalWorld = m_collisionObject->getWorldTransform().getBasis()*rayResult.m_hitNormalLocal;
+			}
 			m_hitPointWorld.setInterpolate3(m_rayFromWorld,m_rayToWorld,rayResult.m_hitFraction);
 			return rayResult.m_hitFraction;
 		}
 	};
 
 
-	
+	struct LocalConvexResult
+	{
+		LocalConvexResult(btCollisionObject*	hitCollisionObject, 
+			LocalShapeInfo*	localShapeInfo,
+			const btVector3&		hitNormalLocal,
+			const btVector3&		hitPointLocal,
+			btScalar hitFraction
+			)
+		:m_hitCollisionObject(hitCollisionObject),
+		m_localShapeInfo(localShapeInfo),
+		m_hitNormalLocal(hitNormalLocal),
+		m_hitPointLocal(hitPointLocal),
+		m_hitFraction(hitFraction)
+		{
+		}
+
+		btCollisionObject*		m_hitCollisionObject;
+		LocalShapeInfo*			m_localShapeInfo;
+		btVector3				m_hitNormalLocal;
+		btVector3				m_hitPointLocal;
+		btScalar				m_hitFraction;
+	};
+
+	///RayResultCallback is used to report new raycast results
+	struct	ConvexResultCallback
+	{
+		btScalar	m_closestHitFraction;
+		short int	m_collisionFilterGroup;
+		short int	m_collisionFilterMask;
+		
+		ConvexResultCallback()
+			:m_closestHitFraction(btScalar(1.)),
+			m_collisionFilterGroup(btBroadphaseProxy::DefaultFilter),
+			m_collisionFilterMask(btBroadphaseProxy::AllFilter)
+		{
+		}
+
+		virtual ~ConvexResultCallback()
+		{
+		}
+		
+		bool	hasHit() const
+		{
+			return (m_closestHitFraction < btScalar(1.));
+		}
+
+		
+
+		virtual bool needsCollision(btBroadphaseProxy* proxy0) const
+		{
+			bool collides = (proxy0->m_collisionFilterGroup & m_collisionFilterMask) != 0;
+			collides = collides && (m_collisionFilterGroup & proxy0->m_collisionFilterMask);
+			return collides;
+		}
+
+		virtual	btScalar	addSingleResult(LocalConvexResult& convexResult,bool normalInWorldSpace) = 0;
+	};
+
+	struct	ClosestConvexResultCallback : public ConvexResultCallback
+	{
+		ClosestConvexResultCallback(const btVector3&	convexFromWorld,const btVector3&	convexToWorld)
+		:m_convexFromWorld(convexFromWorld),
+		m_convexToWorld(convexToWorld),
+		m_hitCollisionObject(0)
+		{
+		}
+
+		btVector3	m_convexFromWorld;//used to calculate hitPointWorld from hitFraction
+		btVector3	m_convexToWorld;
+
+		btVector3	m_hitNormalWorld;
+		btVector3	m_hitPointWorld;
+		btCollisionObject*	m_hitCollisionObject;
+		
+		virtual	btScalar	addSingleResult(LocalConvexResult& convexResult,bool normalInWorldSpace)
+		{
+//caller already does the filter on the m_closestHitFraction
+			btAssert(convexResult.m_hitFraction <= m_closestHitFraction);
+						
+			m_closestHitFraction = convexResult.m_hitFraction;
+			m_hitCollisionObject = convexResult.m_hitCollisionObject;
+			if (normalInWorldSpace)
+			{
+				m_hitNormalWorld = convexResult.m_hitNormalLocal;
+			} else
+			{
+				///need to transform normal into worldspace
+				m_hitNormalWorld = m_hitCollisionObject->getWorldTransform().getBasis()*convexResult.m_hitNormalLocal;
+			}
+			m_hitPointWorld = convexResult.m_hitPointLocal;
+			return convexResult.m_hitFraction;
+		}
+	};
 
 	int	getNumCollisionObjects() const
 	{
@@ -213,7 +343,12 @@ public:
 
 	/// rayTest performs a raycast on all objects in the btCollisionWorld, and calls the resultCallback
 	/// This allows for several queries: first hit, all hits, any hit, dependent on the value returned by the callback.
-	void	rayTest(const btVector3& rayFromWorld, const btVector3& rayToWorld, RayResultCallback& resultCallback, short int collisionFilterMask=-1, bool faceNormal=false);
+	void	rayTest(const btVector3& rayFromWorld, const btVector3& rayToWorld, RayResultCallback& resultCallback) const; 
+
+	// convexTest performs a swept convex cast on all objects in the btCollisionWorld, and calls the resultCallback
+	// This allows for several queries: first hit, all hits, any hit, dependent on the value return by the callback.
+	void    convexSweepTest (const btConvexShape* castShape, const btTransform& from, const btTransform& to, ConvexResultCallback& resultCallback) const;
+
 
 	/// rayTestSingle performs a raycast call and calls the resultCallback. It is used internally by rayTest.
 	/// In a future implementation, we consider moving the ray test as a virtual method in btCollisionShape.
@@ -222,20 +357,16 @@ public:
 					  btCollisionObject* collisionObject,
 					  const btCollisionShape* collisionShape,
 					  const btTransform& colObjWorldTransform,
-					  RayResultCallback& resultCallback, 
-					  short int collisionFilterMask=-1,
-					  bool faceNormal=false);
+					  RayResultCallback& resultCallback);
 
 	/// objectQuerySingle performs a collision detection query and calls the resultCallback. It is used internally by rayTest.
 	static void	objectQuerySingle(const btConvexShape* castShape, const btTransform& rayFromTrans,const btTransform& rayToTrans,
 					  btCollisionObject* collisionObject,
 					  const btCollisionShape* collisionShape,
 					  const btTransform& colObjWorldTransform,
-					  RayResultCallback& resultCallback, 
-					  short int collisionFilterMask=-1,
-					  bool faceNormal=false);
+					  ConvexResultCallback& resultCallback, btScalar	allowedPenetration);
 
-	void	addCollisionObject(btCollisionObject* collisionObject,short int collisionFilterGroup=1,short int collisionFilterMask=1);
+	void	addCollisionObject(btCollisionObject* collisionObject,short int collisionFilterGroup=btBroadphaseProxy::DefaultFilter,short int collisionFilterMask=btBroadphaseProxy::AllFilter);
 
 	btCollisionObjectArray& getCollisionObjectArray()
 	{
@@ -257,6 +388,11 @@ public:
 		return m_dispatchInfo;
 	}
 
+	const btDispatcherInfo& getDispatchInfo() const
+	{
+		return m_dispatchInfo;
+	}
+
 };
 
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp
index 92f4c8b28a6..a29a6d624e5 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp
@@ -19,7 +19,8 @@ subject to the following restrictions:
 
 
 btCompoundCollisionAlgorithm::btCompoundCollisionAlgorithm( const btCollisionAlgorithmConstructionInfo& ci,btCollisionObject* body0,btCollisionObject* body1,bool isSwapped)
-:m_isSwapped(isSwapped)
+:btCollisionAlgorithm(ci),
+m_isSwapped(isSwapped)
 {
 	btCollisionObject* colObj = m_isSwapped? body1 : body0;
 	btCollisionObject* otherObj = m_isSwapped? body0 : body1;
@@ -32,11 +33,11 @@ btCompoundCollisionAlgorithm::btCompoundCollisionAlgorithm( const btCollisionAlg
 	m_childCollisionAlgorithms.resize(numChildren);
 	for (i=0;i<numChildren;i++)
 	{
+		btCollisionShape* tmpShape = colObj->getCollisionShape();
 		btCollisionShape* childShape = compoundShape->getChildShape(i);
-		btCollisionShape* orgShape = colObj->getCollisionShape();
-		colObj->setCollisionShape( childShape );
-		m_childCollisionAlgorithms[i] = ci.m_dispatcher->findAlgorithm(colObj,otherObj);
-		colObj->setCollisionShape( orgShape );
+		colObj->internalSetTemporaryCollisionShape( childShape );
+		m_childCollisionAlgorithms[i] = ci.m_dispatcher1->findAlgorithm(colObj,otherObj);
+		colObj->internalSetTemporaryCollisionShape( tmpShape );
 	}
 }
 
@@ -47,7 +48,8 @@ btCompoundCollisionAlgorithm::~btCompoundCollisionAlgorithm()
 	int i;
 	for (i=0;i<numChildren;i++)
 	{
-		delete m_childCollisionAlgorithms[i];
+		m_childCollisionAlgorithms[i]->~btCollisionAlgorithm();
+		m_dispatcher->freeCollisionAlgorithm(m_childCollisionAlgorithms[i]);
 	}
 }
 
@@ -75,17 +77,21 @@ void btCompoundCollisionAlgorithm::processCollision (btCollisionObject* body0,bt
 
 		//backup
 		btTransform	orgTrans = colObj->getWorldTransform();
-		btCollisionShape* orgShape = colObj->getCollisionShape();
+		btTransform	orgInterpolationTrans = colObj->getInterpolationWorldTransform();
 
 		const btTransform& childTrans = compoundShape->getChildTransform(i);
-		//btTransform	newChildWorldTrans = orgTrans*childTrans ;
-		colObj->setWorldTransform( orgTrans*childTrans );
+		btTransform	newChildWorldTrans = orgTrans*childTrans ;
+		colObj->setWorldTransform( newChildWorldTrans);
+		colObj->setInterpolationWorldTransform(newChildWorldTrans);
+
 		//the contactpoint is still projected back using the original inverted worldtrans
-		colObj->setCollisionShape( childShape );
+		btCollisionShape* tmpShape = colObj->getCollisionShape();
+		colObj->internalSetTemporaryCollisionShape( childShape );
 		m_childCollisionAlgorithms[i]->processCollision(colObj,otherObj,dispatchInfo,resultOut);
 		//revert back
-		colObj->setCollisionShape( orgShape);
+		colObj->internalSetTemporaryCollisionShape( tmpShape);
 		colObj->setWorldTransform(  orgTrans );
+		colObj->setInterpolationWorldTransform(orgInterpolationTrans);
 	}
 }
 
@@ -117,20 +123,20 @@ btScalar	btCompoundCollisionAlgorithm::calculateTimeOfImpact(btCollisionObject*
 
 		//backup
 		btTransform	orgTrans = colObj->getWorldTransform();
-		btCollisionShape* orgShape = colObj->getCollisionShape();
-
+	
 		const btTransform& childTrans = compoundShape->getChildTransform(i);
 		//btTransform	newChildWorldTrans = orgTrans*childTrans ;
 		colObj->setWorldTransform( orgTrans*childTrans );
 
-		colObj->setCollisionShape( childShape );
+		btCollisionShape* tmpShape = colObj->getCollisionShape();
+		colObj->internalSetTemporaryCollisionShape( childShape );
 		btScalar frac = m_childCollisionAlgorithms[i]->calculateTimeOfImpact(colObj,otherObj,dispatchInfo,resultOut);
 		if (frac<hitFraction)
 		{
 			hitFraction = frac;
 		}
 		//revert back
-		colObj->setCollisionShape( orgShape);
+		colObj->internalSetTemporaryCollisionShape( tmpShape);
 		colObj->setWorldTransform( orgTrans);
 	}
 	return hitFraction;
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h
index 7091b233b46..1682c6761cd 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h
@@ -16,15 +16,16 @@ subject to the following restrictions:
 #ifndef COMPOUND_COLLISION_ALGORITHM_H
 #define COMPOUND_COLLISION_ALGORITHM_H
 
-#include "../BroadphaseCollision/btCollisionAlgorithm.h"
-#include "../BroadphaseCollision/btDispatcher.h"
-#include "../BroadphaseCollision/btBroadphaseInterface.h"
+#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
+#include "BulletCollision/BroadphaseCollision/btDispatcher.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseInterface.h"
 
-#include "../NarrowPhaseCollision/btPersistentManifold.h"
+#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h"
 class btDispatcher;
-#include "../BroadphaseCollision/btBroadphaseProxy.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
 #include "btCollisionCreateFunc.h"
-#include "../../LinearMath/btAlignedObjectArray.h"
+#include "LinearMath/btAlignedObjectArray.h"
+class btDispatcher;
 
 /// btCompoundCollisionAlgorithm  supports collision between CompoundCollisionShapes and other collision shapes
 /// Place holder, not fully implemented yet
@@ -43,11 +44,21 @@ public:
 
 	btScalar	calculateTimeOfImpact(btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut);
 
+	virtual	void	getAllContactManifolds(btManifoldArray&	manifoldArray)
+	{
+		int i;
+		for (i=0;i<m_childCollisionAlgorithms.size();i++)
+		{
+			m_childCollisionAlgorithms[i]->getAllContactManifolds(manifoldArray);
+		}
+	}
+
 	struct CreateFunc :public 	btCollisionAlgorithmCreateFunc
 	{
 		virtual	btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, btCollisionObject* body0,btCollisionObject* body1)
 		{
-			return new btCompoundCollisionAlgorithm(ci,body0,body1,false);
+			void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btCompoundCollisionAlgorithm));
+			return new(mem) btCompoundCollisionAlgorithm(ci,body0,body1,false);
 		}
 	};
 
@@ -55,7 +66,8 @@ public:
 	{
 		virtual	btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, btCollisionObject* body0,btCollisionObject* body1)
 		{
-			return new btCompoundCollisionAlgorithm(ci,body0,body1,true);
+			void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btCompoundCollisionAlgorithm));
+			return new(mem) btCompoundCollisionAlgorithm(ci,body0,body1,true);
 		}
 	};
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp
index 24ceacfd40d..6d28904cb03 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp
@@ -29,7 +29,7 @@ subject to the following restrictions:
 btConvexConcaveCollisionAlgorithm::btConvexConcaveCollisionAlgorithm( const btCollisionAlgorithmConstructionInfo& ci, btCollisionObject* body0,btCollisionObject* body1,bool isSwapped)
 : btCollisionAlgorithm(ci),
 m_isSwapped(isSwapped),
-m_btConvexTriangleCallback(ci.m_dispatcher,body0,body1,isSwapped)
+m_btConvexTriangleCallback(ci.m_dispatcher1,body0,body1,isSwapped)
 {
 }
 
@@ -37,6 +37,13 @@ btConvexConcaveCollisionAlgorithm::~btConvexConcaveCollisionAlgorithm()
 {
 }
 
+void	btConvexConcaveCollisionAlgorithm::getAllContactManifolds(btManifoldArray&	manifoldArray)
+{
+	if (m_btConvexTriangleCallback.m_manifoldPtr)
+	{
+		manifoldArray.push_back(m_btConvexTriangleCallback.m_manifoldPtr);
+	}
+}
 
 
 btConvexTriangleCallback::btConvexTriangleCallback(btDispatcher*  dispatcher,btCollisionObject* body0,btCollisionObject* body1,bool isSwapped):
@@ -79,7 +86,7 @@ void btConvexTriangleCallback::processTriangle(btVector3* triangle,int partId, i
 	//aabb filter is already applied!	
 
 	btCollisionAlgorithmConstructionInfo ci;
-	ci.m_dispatcher = m_dispatcher;
+	ci.m_dispatcher1 = m_dispatcher;
 
 	btCollisionObject* ob = static_cast<btCollisionObject*>(m_triBody);
 
@@ -109,13 +116,11 @@ void btConvexTriangleCallback::processTriangle(btVector3* triangle,int partId, i
 	{
 		btTriangleShape tm(triangle[0],triangle[1],triangle[2]);	
 		tm.setMargin(m_collisionMarginTriangle);
-	
 		
 		btCollisionShape* tmpShape = ob->getCollisionShape();
-		ob->setCollisionShape( &tm );
+		ob->internalSetTemporaryCollisionShape( &tm );
 		
-
-		btCollisionAlgorithm* colAlgo = ci.m_dispatcher->findAlgorithm(m_convexBody,m_triBody,m_manifoldPtr);
+		btCollisionAlgorithm* colAlgo = ci.m_dispatcher1->findAlgorithm(m_convexBody,m_triBody,m_manifoldPtr);
 		///this should use the btDispatcher, so the actual registered algorithm is used
 		//		btConvexConvexAlgorithm cvxcvxalgo(m_manifoldPtr,ci,m_convexBody,m_triBody);
 
@@ -123,12 +128,11 @@ void btConvexTriangleCallback::processTriangle(btVector3* triangle,int partId, i
 	//	cvxcvxalgo.setShapeIdentifiers(-1,-1,partId,triangleIndex);
 //		cvxcvxalgo.processCollision(m_convexBody,m_triBody,*m_dispatchInfoPtr,m_resultOut);
 		colAlgo->processCollision(m_convexBody,m_triBody,*m_dispatchInfoPtr,m_resultOut);
-		delete colAlgo;
-		ob->setCollisionShape( tmpShape );
-
+		colAlgo->~btCollisionAlgorithm();
+		ci.m_dispatcher1->freeCollisionAlgorithm(colAlgo);
+		ob->internalSetTemporaryCollisionShape( tmpShape);
 	}
 
-	
 
 }
 
@@ -188,9 +192,10 @@ void btConvexConcaveCollisionAlgorithm::processCollision (btCollisionObject* bod
 
 			concaveShape->processAllTriangles( &m_btConvexTriangleCallback,m_btConvexTriangleCallback.getAabbMin(),m_btConvexTriangleCallback.getAabbMax());
 			
+			resultOut->refreshContactPoints();
 	
 		}
-
+	
 	}
 
 }
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h
index 4915b6c20c8..34b9a107be9 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h
@@ -16,13 +16,13 @@ subject to the following restrictions:
 #ifndef CONVEX_CONCAVE_COLLISION_ALGORITHM_H
 #define CONVEX_CONCAVE_COLLISION_ALGORITHM_H
 
-#include "../BroadphaseCollision/btCollisionAlgorithm.h"
-#include "../BroadphaseCollision/btDispatcher.h"
-#include "../BroadphaseCollision/btBroadphaseInterface.h"
-#include "../CollisionShapes/btTriangleCallback.h"
-#include "../NarrowPhaseCollision/btPersistentManifold.h"
+#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
+#include "BulletCollision/BroadphaseCollision/btDispatcher.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseInterface.h"
+#include "BulletCollision/CollisionShapes/btTriangleCallback.h"
+#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h"
 class btDispatcher;
-#include "../BroadphaseCollision/btBroadphaseProxy.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
 #include "btCollisionCreateFunc.h"
 
 ///For each triangle in the concave mesh that overlaps with the AABB of a convex (m_convexProxy), processTriangle is called.
@@ -55,11 +55,11 @@ int	m_triangleCount;
 	
 	void clearCache();
 
-	inline const btVector3& getAabbMin() const
+	SIMD_FORCE_INLINE const btVector3& getAabbMin() const
 	{
 		return m_aabbMin;
 	}
-	inline const btVector3& getAabbMax() const
+	SIMD_FORCE_INLINE const btVector3& getAabbMax() const
 	{
 		return m_aabbMax;
 	}
@@ -88,13 +88,16 @@ public:
 
 	btScalar	calculateTimeOfImpact(btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut);
 
+	virtual	void	getAllContactManifolds(btManifoldArray&	manifoldArray);
+	
 	void	clearCache();
 
 	struct CreateFunc :public 	btCollisionAlgorithmCreateFunc
 	{
 		virtual	btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, btCollisionObject* body0,btCollisionObject* body1)
 		{
-			return new btConvexConcaveCollisionAlgorithm(ci,body0,body1,false);
+			void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btConvexConcaveCollisionAlgorithm));
+			return new(mem) btConvexConcaveCollisionAlgorithm(ci,body0,body1,false);
 		}
 	};
 
@@ -102,7 +105,8 @@ public:
 	{
 		virtual	btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, btCollisionObject* body0,btCollisionObject* body1)
 		{
-			return new btConvexConcaveCollisionAlgorithm(ci,body0,body1,true);
+			void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btConvexConcaveCollisionAlgorithm));
+			return new(mem) btConvexConcaveCollisionAlgorithm(ci,body0,body1,true);
 		}
 	};
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp
index 9105fe20b49..cb830f889be 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp
@@ -15,7 +15,7 @@ subject to the following restrictions:
 
 #include "btConvexConvexAlgorithm.h"
 
-#include <stdio.h>
+//#include <stdio.h>
 #include "BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h"
 #include "BulletCollision/BroadphaseCollision/btBroadphaseInterface.h"
 #include "BulletCollision/CollisionDispatch/btCollisionObject.h"
@@ -33,7 +33,6 @@ subject to the following restrictions:
 
 
 
-#include "BulletCollision/CollisionShapes/btMinkowskiSumShape.h"
 #include "BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h"
 #include "BulletCollision/CollisionShapes/btSphereShape.h"
 
@@ -48,26 +47,16 @@ subject to the following restrictions:
 
 
 
-btConvexConvexAlgorithm::CreateFunc::CreateFunc()
-{
-	m_ownsSolvers = true;
-	m_simplexSolver = new btVoronoiSimplexSolver();
-	m_pdSolver = new btGjkEpaPenetrationDepthSolver;
-}
+
 
 btConvexConvexAlgorithm::CreateFunc::CreateFunc(btSimplexSolverInterface*			simplexSolver, btConvexPenetrationDepthSolver* pdSolver)
 {
-	m_ownsSolvers = false;
 	m_simplexSolver = simplexSolver;
 	m_pdSolver = pdSolver;
 }
 
 btConvexConvexAlgorithm::CreateFunc::~CreateFunc() 
 { 
-   if (m_ownsSolvers){ 
-      delete m_simplexSolver; 
-      delete m_pdSolver; 
-   } 
 }
 
 btConvexConvexAlgorithm::btConvexConvexAlgorithm(btPersistentManifold* mf,const btCollisionAlgorithmConstructionInfo& ci,btCollisionObject* body0,btCollisionObject* body1,btSimplexSolverInterface* simplexSolver, btConvexPenetrationDepthSolver* pdSolver)
@@ -152,6 +141,11 @@ void btConvexConvexAlgorithm ::processCollision (btCollisionObject* body0,btColl
 	m_gjkPairDetector.getClosestPoints(input,*resultOut,dispatchInfo.m_debugDraw);
 #endif
 
+	if (m_ownManifold)
+	{
+		resultOut->refreshContactPoints();
+	}
+
 }
 
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h
index cbea9a92b75..a0030e6793d 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h
@@ -16,12 +16,13 @@ subject to the following restrictions:
 #ifndef CONVEX_CONVEX_ALGORITHM_H
 #define CONVEX_CONVEX_ALGORITHM_H
 
-#include "../BroadphaseCollision/btCollisionAlgorithm.h"
-#include "../NarrowPhaseCollision/btGjkPairDetector.h"
-#include "../NarrowPhaseCollision/btPersistentManifold.h"
-#include "../BroadphaseCollision/btBroadphaseProxy.h"
-#include "../NarrowPhaseCollision/btVoronoiSimplexSolver.h"
+#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
+#include "BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h"
+#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
+#include "BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h"
 #include "btCollisionCreateFunc.h"
+#include "btCollisionDispatcher.h"
 
 class btConvexPenetrationDepthSolver;
 
@@ -46,6 +47,14 @@ public:
 
 	virtual btScalar calculateTimeOfImpact(btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut);
 
+	virtual	void	getAllContactManifolds(btManifoldArray&	manifoldArray)
+	{
+		///should we use m_ownManifold to avoid adding duplicates?
+		if (m_manifoldPtr && m_ownManifold)
+			manifoldArray.push_back(m_manifoldPtr);
+	}
+
+
 	void	setLowLevelOfDetail(bool useLowLevel);
 
 
@@ -58,15 +67,15 @@ public:
 	{
 		btConvexPenetrationDepthSolver*		m_pdSolver;
 		btSimplexSolverInterface*			m_simplexSolver;
-		bool	m_ownsSolvers;
 		
 		CreateFunc(btSimplexSolverInterface*			simplexSolver, btConvexPenetrationDepthSolver* pdSolver);
-		CreateFunc();
+		
 		virtual ~CreateFunc();
 
 		virtual	btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, btCollisionObject* body0,btCollisionObject* body1)
 		{
-			return new btConvexConvexAlgorithm(ci.m_manifold,ci,body0,body1,m_simplexSolver,m_pdSolver);
+			void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btConvexConvexAlgorithm));
+			return new(mem) btConvexConvexAlgorithm(ci.m_manifold,ci,body0,body1,m_simplexSolver,m_pdSolver);
 		}
 	};
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp
new file mode 100644
index 00000000000..391cf6c7bc4
--- /dev/null
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp
@@ -0,0 +1,108 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btConvexPlaneCollisionAlgorithm.h"
+
+#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
+#include "BulletCollision/CollisionShapes/btConvexShape.h"
+#include "BulletCollision/CollisionShapes/btStaticPlaneShape.h"
+
+//#include <stdio.h>
+
+btConvexPlaneCollisionAlgorithm::btConvexPlaneCollisionAlgorithm(btPersistentManifold* mf,const btCollisionAlgorithmConstructionInfo& ci,btCollisionObject* col0,btCollisionObject* col1, bool isSwapped)
+: btCollisionAlgorithm(ci),
+m_ownManifold(false),
+m_manifoldPtr(mf),
+m_isSwapped(isSwapped)
+{
+	btCollisionObject* convexObj = m_isSwapped? col1 : col0;
+	btCollisionObject* planeObj = m_isSwapped? col0 : col1;
+	
+	if (!m_manifoldPtr && m_dispatcher->needsCollision(convexObj,planeObj))
+	{
+		m_manifoldPtr = m_dispatcher->getNewManifold(convexObj,planeObj);
+		m_ownManifold = true;
+	}
+}
+
+
+btConvexPlaneCollisionAlgorithm::~btConvexPlaneCollisionAlgorithm()
+{
+	if (m_ownManifold)
+	{
+		if (m_manifoldPtr)
+			m_dispatcher->releaseManifold(m_manifoldPtr);
+	}
+}
+
+
+
+void btConvexPlaneCollisionAlgorithm::processCollision (btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut)
+{
+	(void)dispatchInfo;
+	(void)resultOut;
+	if (!m_manifoldPtr)
+		return;
+
+	btCollisionObject* convexObj = m_isSwapped? body1 : body0;
+	btCollisionObject* planeObj = m_isSwapped? body0: body1;
+
+	btConvexShape* convexShape = (btConvexShape*) convexObj->getCollisionShape();
+	btStaticPlaneShape* planeShape = (btStaticPlaneShape*) planeObj->getCollisionShape();
+
+	bool hasCollision = false;
+	const btVector3& planeNormal = planeShape->getPlaneNormal();
+	const btScalar& planeConstant = planeShape->getPlaneConstant();
+	btTransform planeInConvex;
+	planeInConvex= convexObj->getWorldTransform().inverse() * planeObj->getWorldTransform();
+	btTransform convexInPlaneTrans;
+	convexInPlaneTrans= planeObj->getWorldTransform().inverse() * convexObj->getWorldTransform();
+
+	btVector3 vtx = convexShape->localGetSupportingVertex(planeInConvex.getBasis()*-planeNormal);
+	btVector3 vtxInPlane = convexInPlaneTrans(vtx);
+	btScalar distance = (planeNormal.dot(vtxInPlane) - planeConstant);
+
+	btVector3 vtxInPlaneProjected = vtxInPlane - distance*planeNormal;
+	btVector3 vtxInPlaneWorld = planeObj->getWorldTransform() * vtxInPlaneProjected;
+
+	hasCollision = distance < m_manifoldPtr->getContactBreakingThreshold();
+	resultOut->setPersistentManifold(m_manifoldPtr);
+	if (hasCollision)
+	{
+		/// report a contact. internally this will be kept persistent, and contact reduction is done
+		btVector3 normalOnSurfaceB = planeObj->getWorldTransform().getBasis() * planeNormal;
+		btVector3 pOnB = vtxInPlaneWorld;
+		resultOut->addContactPoint(normalOnSurfaceB,pOnB,distance);
+	}
+	if (m_ownManifold)
+	{
+		if (m_manifoldPtr->getNumContacts())
+		{
+			resultOut->refreshContactPoints();
+		}
+	}
+}
+
+btScalar btConvexPlaneCollisionAlgorithm::calculateTimeOfImpact(btCollisionObject* col0,btCollisionObject* col1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut)
+{
+	(void)resultOut;
+	(void)dispatchInfo;
+	(void)col0;
+	(void)col1;
+
+	//not yet
+	return btScalar(1.);
+}
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h
new file mode 100644
index 00000000000..7b258554171
--- /dev/null
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h
@@ -0,0 +1,71 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef CONVEX_PLANE_COLLISION_ALGORITHM_H
+#define CONVEX_PLANE_COLLISION_ALGORITHM_H
+
+#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
+#include "BulletCollision/CollisionDispatch/btCollisionCreateFunc.h"
+class btPersistentManifold;
+#include "btCollisionDispatcher.h"
+
+#include "LinearMath/btVector3.h"
+
+/// btSphereBoxCollisionAlgorithm  provides sphere-box collision detection.
+/// Other features are frame-coherency (persistent data) and collision response.
+class btConvexPlaneCollisionAlgorithm : public btCollisionAlgorithm
+{
+	bool	m_ownManifold;
+	btPersistentManifold*	m_manifoldPtr;
+	bool	m_isSwapped;
+	
+public:
+
+	btConvexPlaneCollisionAlgorithm(btPersistentManifold* mf,const btCollisionAlgorithmConstructionInfo& ci,btCollisionObject* col0,btCollisionObject* col1, bool isSwapped);
+
+	virtual ~btConvexPlaneCollisionAlgorithm();
+
+	virtual void processCollision (btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut);
+
+	virtual btScalar calculateTimeOfImpact(btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut);
+
+	virtual	void	getAllContactManifolds(btManifoldArray&	manifoldArray)
+	{
+		if (m_manifoldPtr && m_ownManifold)
+		{
+			manifoldArray.push_back(m_manifoldPtr);
+		}
+	}
+
+	struct CreateFunc :public 	btCollisionAlgorithmCreateFunc
+	{
+		virtual	btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, btCollisionObject* body0,btCollisionObject* body1)
+		{
+			void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btConvexPlaneCollisionAlgorithm));
+			if (!m_swapped)
+			{
+				return new(mem) btConvexPlaneCollisionAlgorithm(0,ci,body0,body1,false);
+			} else
+			{
+				return new(mem) btConvexPlaneCollisionAlgorithm(0,ci,body0,body1,true);
+			}
+		}
+	};
+
+};
+
+#endif //CONVEX_PLANE_COLLISION_ALGORITHM_H
+
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp
new file mode 100644
index 00000000000..3f94f4d4eac
--- /dev/null
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp
@@ -0,0 +1,281 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btDefaultCollisionConfiguration.h"
+
+#include "BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h"
+#include "BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h"
+#include "BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h"
+#include "BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h"
+#include "BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h"
+#include "BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h"
+#include "BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h"
+#include "BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h"
+#include "BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h"
+#include "BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h"
+#include "BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h"
+#include "BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h"
+
+
+
+#include "LinearMath/btStackAlloc.h"
+#include "LinearMath/btPoolAllocator.h"
+
+
+
+
+
+btDefaultCollisionConfiguration::btDefaultCollisionConfiguration(const btDefaultCollisionConstructionInfo& constructionInfo)
+//btDefaultCollisionConfiguration::btDefaultCollisionConfiguration(btStackAlloc*	stackAlloc,btPoolAllocator*	persistentManifoldPool,btPoolAllocator*	collisionAlgorithmPool)
+{
+
+	void* mem = btAlignedAlloc(sizeof(btVoronoiSimplexSolver),16);
+	m_simplexSolver = new (mem)btVoronoiSimplexSolver();
+	
+#define USE_EPA 1
+#ifdef USE_EPA
+	mem = btAlignedAlloc(sizeof(btGjkEpaPenetrationDepthSolver),16);
+	m_pdSolver = new (mem)btGjkEpaPenetrationDepthSolver;
+#else
+	mem = btAlignedAlloc(sizeof(btMinkowskiPenetrationDepthSolver),16);
+	m_pdSolver = new (mem)btMinkowskiPenetrationDepthSolver;
+#endif//USE_EPA	
+	
+
+	//default CreationFunctions, filling the m_doubleDispatch table
+	mem = btAlignedAlloc(sizeof(btConvexConvexAlgorithm::CreateFunc),16);
+	m_convexConvexCreateFunc = new(mem) btConvexConvexAlgorithm::CreateFunc(m_simplexSolver,m_pdSolver);
+	mem = btAlignedAlloc(sizeof(btConvexConcaveCollisionAlgorithm::CreateFunc),16);
+	m_convexConcaveCreateFunc = new (mem)btConvexConcaveCollisionAlgorithm::CreateFunc;
+	mem = btAlignedAlloc(sizeof(btConvexConcaveCollisionAlgorithm::CreateFunc),16);
+	m_swappedConvexConcaveCreateFunc = new (mem)btConvexConcaveCollisionAlgorithm::SwappedCreateFunc;
+	mem = btAlignedAlloc(sizeof(btCompoundCollisionAlgorithm::CreateFunc),16);
+	m_compoundCreateFunc = new (mem)btCompoundCollisionAlgorithm::CreateFunc;
+	mem = btAlignedAlloc(sizeof(btCompoundCollisionAlgorithm::SwappedCreateFunc),16);
+	m_swappedCompoundCreateFunc = new (mem)btCompoundCollisionAlgorithm::SwappedCreateFunc;
+	mem = btAlignedAlloc(sizeof(btEmptyAlgorithm::CreateFunc),16);
+	m_emptyCreateFunc = new(mem) btEmptyAlgorithm::CreateFunc;
+	
+	mem = btAlignedAlloc(sizeof(btSphereSphereCollisionAlgorithm::CreateFunc),16);
+	m_sphereSphereCF = new(mem) btSphereSphereCollisionAlgorithm::CreateFunc;
+	mem = btAlignedAlloc(sizeof(btSphereBoxCollisionAlgorithm::CreateFunc),16);
+	m_sphereBoxCF = new(mem) btSphereBoxCollisionAlgorithm::CreateFunc;
+	mem = btAlignedAlloc(sizeof(btSphereBoxCollisionAlgorithm::CreateFunc),16);
+	m_boxSphereCF = new (mem)btSphereBoxCollisionAlgorithm::CreateFunc;
+	m_boxSphereCF->m_swapped = true;
+	mem = btAlignedAlloc(sizeof(btSphereTriangleCollisionAlgorithm::CreateFunc),16);
+	m_sphereTriangleCF = new (mem)btSphereTriangleCollisionAlgorithm::CreateFunc;
+	mem = btAlignedAlloc(sizeof(btSphereTriangleCollisionAlgorithm::CreateFunc),16);
+	m_triangleSphereCF = new (mem)btSphereTriangleCollisionAlgorithm::CreateFunc;
+	m_triangleSphereCF->m_swapped = true;
+	
+	mem = btAlignedAlloc(sizeof(btBoxBoxCollisionAlgorithm::CreateFunc),16);
+	m_boxBoxCF = new(mem)btBoxBoxCollisionAlgorithm::CreateFunc;
+
+	//convex versus plane
+	mem = btAlignedAlloc (sizeof(btConvexPlaneCollisionAlgorithm::CreateFunc),16);
+	m_convexPlaneCF = new (mem) btConvexPlaneCollisionAlgorithm::CreateFunc;
+	mem = btAlignedAlloc (sizeof(btConvexPlaneCollisionAlgorithm::CreateFunc),16);
+	m_planeConvexCF = new (mem) btConvexPlaneCollisionAlgorithm::CreateFunc;
+	m_planeConvexCF->m_swapped = true;
+	
+	///calculate maximum element size, big enough to fit any collision algorithm in the memory pool
+	int maxSize = sizeof(btConvexConvexAlgorithm);
+	int maxSize2 = sizeof(btConvexConcaveCollisionAlgorithm);
+	int maxSize3 = sizeof(btCompoundCollisionAlgorithm);
+	int maxSize4 = sizeof(btEmptyAlgorithm);
+	
+	int	collisionAlgorithmMaxElementSize = btMax(maxSize,maxSize2);
+	collisionAlgorithmMaxElementSize = btMax(collisionAlgorithmMaxElementSize,maxSize3);
+	collisionAlgorithmMaxElementSize = btMax(collisionAlgorithmMaxElementSize,maxSize4);
+
+	if (constructionInfo.m_stackAlloc)
+	{
+		m_ownsStackAllocator = false;
+		this->m_stackAlloc = constructionInfo.m_stackAlloc;
+	} else
+	{
+		m_ownsStackAllocator = true;
+		void* mem = btAlignedAlloc(sizeof(btStackAlloc),16);
+		m_stackAlloc = new(mem)btStackAlloc(constructionInfo.m_defaultStackAllocatorSize);
+	}
+		
+	if (constructionInfo.m_persistentManifoldPool)
+	{
+		m_ownsPersistentManifoldPool = false;
+		m_persistentManifoldPool = constructionInfo.m_persistentManifoldPool;
+	} else
+	{
+		m_ownsPersistentManifoldPool = true;
+		void* mem = btAlignedAlloc(sizeof(btPoolAllocator),16);
+		m_persistentManifoldPool = new (mem) btPoolAllocator(sizeof(btPersistentManifold),constructionInfo.m_defaultMaxPersistentManifoldPoolSize);
+	}
+	
+	if (constructionInfo.m_collisionAlgorithmPool)
+	{
+		m_ownsCollisionAlgorithmPool = false;
+		m_collisionAlgorithmPool = constructionInfo.m_collisionAlgorithmPool;
+	} else
+	{
+		m_ownsCollisionAlgorithmPool = true;
+		void* mem = btAlignedAlloc(sizeof(btPoolAllocator),16);
+		m_collisionAlgorithmPool = new(mem) btPoolAllocator(collisionAlgorithmMaxElementSize,constructionInfo.m_defaultMaxCollisionAlgorithmPoolSize);
+	}
+
+
+}
+
+btDefaultCollisionConfiguration::~btDefaultCollisionConfiguration()
+{
+	if (m_ownsStackAllocator)
+	{
+		m_stackAlloc->destroy();
+		m_stackAlloc->~btStackAlloc();
+		btAlignedFree(m_stackAlloc);
+	}
+	if (m_ownsCollisionAlgorithmPool)
+	{
+		m_collisionAlgorithmPool->~btPoolAllocator();
+		btAlignedFree(m_collisionAlgorithmPool);
+	}
+	if (m_ownsPersistentManifoldPool)
+	{
+		m_persistentManifoldPool->~btPoolAllocator();
+		btAlignedFree(m_persistentManifoldPool);
+	}
+
+	m_convexConvexCreateFunc->~btCollisionAlgorithmCreateFunc();
+	btAlignedFree(	m_convexConvexCreateFunc);
+
+	m_convexConcaveCreateFunc->~btCollisionAlgorithmCreateFunc();
+	btAlignedFree( m_convexConcaveCreateFunc);
+	m_swappedConvexConcaveCreateFunc->~btCollisionAlgorithmCreateFunc();
+	btAlignedFree( m_swappedConvexConcaveCreateFunc);
+
+	m_compoundCreateFunc->~btCollisionAlgorithmCreateFunc();
+	btAlignedFree( m_compoundCreateFunc);
+
+	m_swappedCompoundCreateFunc->~btCollisionAlgorithmCreateFunc();
+	btAlignedFree( m_swappedCompoundCreateFunc);
+
+	m_emptyCreateFunc->~btCollisionAlgorithmCreateFunc();
+	btAlignedFree( m_emptyCreateFunc);
+
+	m_sphereSphereCF->~btCollisionAlgorithmCreateFunc();
+	btAlignedFree( m_sphereSphereCF);
+
+	m_sphereBoxCF->~btCollisionAlgorithmCreateFunc();
+	btAlignedFree( m_sphereBoxCF);
+	m_boxSphereCF->~btCollisionAlgorithmCreateFunc();
+	btAlignedFree( m_boxSphereCF);
+	m_sphereTriangleCF->~btCollisionAlgorithmCreateFunc();
+	btAlignedFree( m_sphereTriangleCF);
+	m_triangleSphereCF->~btCollisionAlgorithmCreateFunc();
+	btAlignedFree( m_triangleSphereCF);
+	m_boxBoxCF->~btCollisionAlgorithmCreateFunc();
+	btAlignedFree( m_boxBoxCF);
+
+	m_convexPlaneCF->~btCollisionAlgorithmCreateFunc();
+	btAlignedFree( m_convexPlaneCF);
+	m_planeConvexCF->~btCollisionAlgorithmCreateFunc();
+	btAlignedFree( m_planeConvexCF);
+
+	m_simplexSolver->~btVoronoiSimplexSolver();
+	btAlignedFree(m_simplexSolver);
+
+	m_pdSolver->~btConvexPenetrationDepthSolver();
+	
+	btAlignedFree(m_pdSolver);
+
+
+}
+
+
+btCollisionAlgorithmCreateFunc* btDefaultCollisionConfiguration::getCollisionAlgorithmCreateFunc(int proxyType0,int proxyType1)
+{
+
+
+
+	if ((proxyType0 == SPHERE_SHAPE_PROXYTYPE) && (proxyType1==SPHERE_SHAPE_PROXYTYPE))
+	{
+		return	m_sphereSphereCF;
+	}
+
+	if ((proxyType0 == SPHERE_SHAPE_PROXYTYPE) && (proxyType1==BOX_SHAPE_PROXYTYPE))
+	{
+		return	m_sphereBoxCF;
+	}
+
+	if ((proxyType0 == BOX_SHAPE_PROXYTYPE ) && (proxyType1==SPHERE_SHAPE_PROXYTYPE))
+	{
+		return	m_boxSphereCF;
+	}
+
+	if ((proxyType0 == SPHERE_SHAPE_PROXYTYPE ) && (proxyType1==TRIANGLE_SHAPE_PROXYTYPE))
+	{
+		return	m_sphereTriangleCF;
+	}
+
+	if ((proxyType0 == TRIANGLE_SHAPE_PROXYTYPE  ) && (proxyType1==SPHERE_SHAPE_PROXYTYPE))
+	{
+		return	m_triangleSphereCF;
+	} 
+
+	if ((proxyType0 == BOX_SHAPE_PROXYTYPE) && (proxyType1 == BOX_SHAPE_PROXYTYPE))
+	{
+		return m_boxBoxCF;
+	}
+	
+	if (btBroadphaseProxy::isConvex(proxyType0) && (proxyType1 == STATIC_PLANE_PROXYTYPE))
+	{
+		return m_convexPlaneCF;
+	}
+
+	if (btBroadphaseProxy::isConvex(proxyType1) && (proxyType0 == STATIC_PLANE_PROXYTYPE))
+	{
+		return m_planeConvexCF;
+	}
+	
+
+
+	if (btBroadphaseProxy::isConvex(proxyType0) && btBroadphaseProxy::isConvex(proxyType1))
+	{
+		return m_convexConvexCreateFunc;
+	}
+
+	if (btBroadphaseProxy::isConvex(proxyType0) && btBroadphaseProxy::isConcave(proxyType1))
+	{
+		return m_convexConcaveCreateFunc;
+	}
+
+	if (btBroadphaseProxy::isConvex(proxyType1) && btBroadphaseProxy::isConcave(proxyType0))
+	{
+		return m_swappedConvexConcaveCreateFunc;
+	}
+
+	if (btBroadphaseProxy::isCompound(proxyType0))
+	{
+		return m_compoundCreateFunc;
+	} else
+	{
+		if (btBroadphaseProxy::isCompound(proxyType1))
+		{
+			return m_swappedCompoundCreateFunc;
+		}
+	}
+
+	//failed to find an algorithm
+	return m_emptyCreateFunc;
+}
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h
new file mode 100644
index 00000000000..0b274d394af
--- /dev/null
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h
@@ -0,0 +1,112 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_DEFAULT_COLLISION_CONFIGURATION
+#define BT_DEFAULT_COLLISION_CONFIGURATION
+
+#include "btCollisionConfiguration.h"
+class btVoronoiSimplexSolver;
+class btConvexPenetrationDepthSolver;
+
+struct	btDefaultCollisionConstructionInfo
+{
+	btStackAlloc*		m_stackAlloc;
+	btPoolAllocator*	m_persistentManifoldPool;
+	btPoolAllocator*	m_collisionAlgorithmPool;
+	int					m_defaultMaxPersistentManifoldPoolSize;
+	int					m_defaultMaxCollisionAlgorithmPoolSize;
+	int					m_defaultStackAllocatorSize;
+
+	btDefaultCollisionConstructionInfo()
+		:m_stackAlloc(0),
+		m_persistentManifoldPool(0),
+		m_collisionAlgorithmPool(0),
+		m_defaultMaxPersistentManifoldPoolSize(65535),
+		m_defaultMaxCollisionAlgorithmPoolSize(65535),
+		m_defaultStackAllocatorSize(5*1024*1024)
+	{
+	}
+};
+
+
+
+///btCollisionConfiguration allows to configure Bullet collision detection
+///stack allocator, pool memory allocators
+///todo: describe the meaning
+class	btDefaultCollisionConfiguration : public btCollisionConfiguration
+{
+
+	int	m_persistentManifoldPoolSize;
+	
+	btStackAlloc*	m_stackAlloc;
+	bool	m_ownsStackAllocator;
+
+	btPoolAllocator*	m_persistentManifoldPool;
+	bool	m_ownsPersistentManifoldPool;
+
+	btPoolAllocator*	m_collisionAlgorithmPool;
+	bool	m_ownsCollisionAlgorithmPool;
+
+	//default simplex/penetration depth solvers
+	btVoronoiSimplexSolver*	m_simplexSolver;
+	btConvexPenetrationDepthSolver*	m_pdSolver;
+	
+	//default CreationFunctions, filling the m_doubleDispatch table
+	btCollisionAlgorithmCreateFunc*	m_convexConvexCreateFunc;
+	btCollisionAlgorithmCreateFunc*	m_convexConcaveCreateFunc;
+	btCollisionAlgorithmCreateFunc*	m_swappedConvexConcaveCreateFunc;
+	btCollisionAlgorithmCreateFunc*	m_compoundCreateFunc;
+	btCollisionAlgorithmCreateFunc*	m_swappedCompoundCreateFunc;
+	btCollisionAlgorithmCreateFunc* m_emptyCreateFunc;
+	btCollisionAlgorithmCreateFunc* m_sphereSphereCF;
+	btCollisionAlgorithmCreateFunc* m_sphereBoxCF;
+	btCollisionAlgorithmCreateFunc* m_boxSphereCF;
+	btCollisionAlgorithmCreateFunc* m_boxBoxCF;
+	btCollisionAlgorithmCreateFunc*	m_sphereTriangleCF;
+	btCollisionAlgorithmCreateFunc*	m_triangleSphereCF;
+	btCollisionAlgorithmCreateFunc*	m_planeConvexCF;
+	btCollisionAlgorithmCreateFunc*	m_convexPlaneCF;
+	
+public:
+
+
+	btDefaultCollisionConfiguration(const btDefaultCollisionConstructionInfo& constructionInfo = btDefaultCollisionConstructionInfo());
+
+	virtual ~btDefaultCollisionConfiguration();
+
+		///memory pools
+	virtual btPoolAllocator* getPersistentManifoldPool()
+	{
+		return m_persistentManifoldPool;
+	}
+
+	virtual btPoolAllocator* getCollisionAlgorithmPool()
+	{
+		return m_collisionAlgorithmPool;
+	}
+
+	virtual btStackAlloc*	getStackAllocator()
+	{
+		return m_stackAlloc;
+	}
+
+
+	virtual btCollisionAlgorithmCreateFunc* getCollisionAlgorithmCreateFunc(int proxyType0,int proxyType1);
+
+
+};
+
+#endif //BT_DEFAULT_COLLISION_CONFIGURATION
+
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h
index b1a193d2cfd..e54721dec21 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h
@@ -15,8 +15,9 @@ subject to the following restrictions:
 
 #ifndef EMPTY_ALGORITH
 #define EMPTY_ALGORITH
-#include "../BroadphaseCollision/btCollisionAlgorithm.h"
+#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
 #include "btCollisionCreateFunc.h"
+#include "btCollisionDispatcher.h"
 
 #define ATTRIBUTE_ALIGNED(a)
 
@@ -33,13 +34,18 @@ public:
 
 	virtual btScalar calculateTimeOfImpact(btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut);
 
+	virtual	void	getAllContactManifolds(btManifoldArray&	manifoldArray)
+	{
+	}
+
 	struct CreateFunc :public 	btCollisionAlgorithmCreateFunc
 	{
 		virtual	btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, btCollisionObject* body0,btCollisionObject* body1)
 		{
 			(void)body0;
 			(void)body1;
-			return new btEmptyAlgorithm(ci);
+			void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btEmptyAlgorithm));
+			return new(mem) btEmptyAlgorithm(ci);
 		}
 	};
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.cpp
index 490acc0b611..d5b12598be2 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.cpp
@@ -79,12 +79,30 @@ void btManifoldResult::addContactPoint(const btVector3& normalOnBInWorld,const b
 	}
 
 	btManifoldPoint newPt(localA,localB,normalOnBInWorld,depth);
-
+	newPt.m_positionWorldOnA = pointA;
+	newPt.m_positionWorldOnB = pointInWorld;
+	
 	int insertIndex = m_manifoldPtr->getCacheEntry(newPt);
 
 	newPt.m_combinedFriction = calculateCombinedFriction(m_body0,m_body1);
 	newPt.m_combinedRestitution = calculateCombinedRestitution(m_body0,m_body1);
 
+   //BP mod, store contact triangles.
+   newPt.m_partId0 = m_partId0;
+   newPt.m_partId1 = m_partId1;
+   newPt.m_index0  = m_index0;
+   newPt.m_index1  = m_index1;
+	
+	///todo, check this for any side effects
+	if (insertIndex >= 0)
+	{
+		//const btManifoldPoint& oldPoint = m_manifoldPtr->getContactPoint(insertIndex);
+		m_manifoldPtr->replaceContactPoint(newPt,insertIndex);
+	} else
+	{
+		insertIndex = m_manifoldPtr->addManifoldPoint(newPt);
+	}
+	
 	//User can override friction and/or restitution
 	if (gContactAddedCallback &&
 		//and if either of the two bodies requires custom material
@@ -94,16 +112,8 @@ void btManifoldResult::addContactPoint(const btVector3& normalOnBInWorld,const b
 		//experimental feature info, for per-triangle material etc.
 		btCollisionObject* obj0 = isSwapped? m_body1 : m_body0;
 		btCollisionObject* obj1 = isSwapped? m_body0 : m_body1;
-		(*gContactAddedCallback)(newPt,obj0,m_partId0,m_index0,obj1,m_partId1,m_index1);
+		(*gContactAddedCallback)(m_manifoldPtr->getContactPoint(insertIndex),obj0,m_partId0,m_index0,obj1,m_partId1,m_index1);
 	}
 
-	if (insertIndex >= 0)
-	{
-		//const btManifoldPoint& oldPoint = m_manifoldPtr->getContactPoint(insertIndex);
-		m_manifoldPtr->replaceContactPoint(newPt,insertIndex);
-	} else
-	{
-		m_manifoldPtr->AddManifoldPoint(newPt);
-	}
 }
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.h
index 77192625513..5aac9a46f6a 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.h
@@ -18,12 +18,12 @@ subject to the following restrictions:
 #define MANIFOLD_RESULT_H
 
 class btCollisionObject;
-class btPersistentManifold;
+#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h"
 class btManifoldPoint;
 
 #include "BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h"
 
-#include "../../LinearMath/btTransform.h"
+#include "LinearMath/btTransform.h"
 
 typedef bool (*ContactAddedCallback)(btManifoldPoint& cp,	const btCollisionObject* colObj0,int partId0,int index0,const btCollisionObject* colObj1,int partId1,int index1);
 extern ContactAddedCallback		gContactAddedCallback;
@@ -60,6 +60,15 @@ public:
 		m_manifoldPtr = manifoldPtr;
 	}
 
+	const btPersistentManifold*	getPersistentManifold() const
+	{
+		return m_manifoldPtr;
+	}
+	btPersistentManifold*	getPersistentManifold()
+	{
+		return m_manifoldPtr;
+	}
+
 	virtual void setShapeIdentifiers(int partId0,int index0,	int partId1,int index1)
 	{
 			m_partId0=partId0;
@@ -70,6 +79,22 @@ public:
 
 	virtual void addContactPoint(const btVector3& normalOnBInWorld,const btVector3& pointInWorld,btScalar depth);
 
+	SIMD_FORCE_INLINE	void refreshContactPoints()
+	{
+		btAssert(m_manifoldPtr);
+		if (!m_manifoldPtr->getNumContacts())
+			return;
+
+		bool isSwapped = m_manifoldPtr->getBody0() != m_body0;
+
+		if (isSwapped)
+		{
+			m_manifoldPtr->refreshContactPoints(m_rootTransB,m_rootTransA);
+		} else
+		{
+			m_manifoldPtr->refreshContactPoints(m_rootTransA,m_rootTransB);
+		}
+	}
 
 
 };
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp
index ac2e8554c3a..1cc78f76acd 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp
@@ -1,3 +1,17 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
 
 
 #include "LinearMath/btScalar.h"
@@ -7,7 +21,7 @@
 #include "BulletCollision/CollisionDispatch/btCollisionObject.h"
 #include "BulletCollision/CollisionDispatch/btCollisionWorld.h"
 
-#include <stdio.h>
+//#include <stdio.h>
 #include "LinearMath/btQuickprof.h"
 
 btSimulationIslandManager::btSimulationIslandManager()
@@ -25,17 +39,17 @@ void btSimulationIslandManager::initUnionFind(int n)
 }
 		
 
-void btSimulationIslandManager::findUnions(btDispatcher* dispatcher)
+void btSimulationIslandManager::findUnions(btDispatcher* /* dispatcher */,btCollisionWorld* colWorld)
 {
 	
 	{
-		for (int i=0;i<dispatcher->getNumManifolds();i++)
-		{
-			const btPersistentManifold* manifold = dispatcher->getManifoldByIndexInternal(i);
-			//static objects (invmass btScalar(0.)) don't merge !
+		btBroadphasePair* pairPtr = colWorld->getPairCache()->getOverlappingPairArrayPtr();
 
-			 const  btCollisionObject* colObj0 = static_cast<const btCollisionObject*>(manifold->getBody0());
-			 const  btCollisionObject* colObj1 = static_cast<const btCollisionObject*>(manifold->getBody1());
+		for (int i=0;i<colWorld->getPairCache()->getNumOverlappingPairs();i++)
+		{
+			const btBroadphasePair& collisionPair = pairPtr[i];
+			btCollisionObject* colObj0 = (btCollisionObject*)collisionPair.m_pProxy0->m_clientObject;
+			btCollisionObject* colObj1 = (btCollisionObject*)collisionPair.m_pProxy1->m_clientObject;
 
 			if (((colObj0) && ((colObj0)->mergesSimulationIslands())) &&
 				((colObj1) && ((colObj1)->mergesSimulationIslands())))
@@ -71,7 +85,7 @@ void	btSimulationIslandManager::updateActivationState(btCollisionWorld* colWorld
 	}
 	// do the union find
 	
-	findUnions(dispatcher);
+	findUnions(dispatcher,colWorld);
 	
 
 	
@@ -129,30 +143,13 @@ class btPersistentManifoldSortPredicate
 };
 
 
-
-
-
-//
-// todo: this is random access, it can be walked 'cache friendly'!
-//
-void btSimulationIslandManager::buildAndProcessIslands(btDispatcher* dispatcher,btCollisionObjectArray& collisionObjects, IslandCallback* callback)
+void btSimulationIslandManager::buildIslands(btDispatcher* dispatcher,btCollisionObjectArray& collisionObjects)
 {
 
+	BT_PROFILE("islandUnionFindAndQuickSort");
 	
-	
-	/*if (0)
-	{
-		int maxNumManifolds = dispatcher->getNumManifolds();
-		btCollisionDispatcher* colDis = (btCollisionDispatcher*)dispatcher;
-		btPersistentManifold** manifold = colDis->getInternalManifoldPointer();
-		callback->ProcessIsland(&collisionObjects[0],collisionObjects.size(),manifold,maxNumManifolds, 0);
-		return;
-	}
-	*/
+	m_islandmanifold.resize(0);
 
-
-	BEGIN_PROFILE("islandUnionFindAndHeapSort");
-	
 	//we are going to sort the unionfind array, and store the element id in the size
 	//afterwards, we clean unionfind, to make sure no-one uses it anymore
 	
@@ -183,7 +180,7 @@ void btSimulationIslandManager::buildAndProcessIslands(btDispatcher* dispatcher,
 			btCollisionObject* colObj0 = collisionObjects[i];
 			if ((colObj0->getIslandTag() != islandId) && (colObj0->getIslandTag() != -1))
 			{
-				printf("error in island management\n");
+//				printf("error in island management\n");
 			}
 
 			assert((colObj0->getIslandTag() == islandId) || (colObj0->getIslandTag() == -1));
@@ -210,7 +207,7 @@ void btSimulationIslandManager::buildAndProcessIslands(btDispatcher* dispatcher,
 				btCollisionObject* colObj0 = collisionObjects[i];
 				if ((colObj0->getIslandTag() != islandId) && (colObj0->getIslandTag() != -1))
 				{
-					printf("error in island management\n");
+//					printf("error in island management\n");
 				}
 
 				assert((colObj0->getIslandTag() == islandId) || (colObj0->getIslandTag() == -1));
@@ -231,7 +228,7 @@ void btSimulationIslandManager::buildAndProcessIslands(btDispatcher* dispatcher,
 				btCollisionObject* colObj0 = collisionObjects[i];
 				if ((colObj0->getIslandTag() != islandId) && (colObj0->getIslandTag() != -1))
 				{
-					printf("error in island management\n");
+//					printf("error in island management\n");
 				}
 
 				assert((colObj0->getIslandTag() == islandId) || (colObj0->getIslandTag() == -1));
@@ -247,11 +244,17 @@ void btSimulationIslandManager::buildAndProcessIslands(btDispatcher* dispatcher,
 		}
 	}
 
-	btAlignedObjectArray<btPersistentManifold*>  islandmanifold;
+	
 	int i;
 	int maxNumManifolds = dispatcher->getNumManifolds();
-	islandmanifold.reserve(maxNumManifolds);
 
+#define SPLIT_ISLANDS 1
+#ifdef SPLIT_ISLANDS
+
+	
+#endif //SPLIT_ISLANDS
+
+	
 	for (i=0;i<maxNumManifolds ;i++)
 	{
 		 btPersistentManifold* manifold = dispatcher->getManifoldByIndexInternal(i);
@@ -265,29 +268,52 @@ void btSimulationIslandManager::buildAndProcessIslands(btDispatcher* dispatcher,
 		{
 		
 			//kinematic objects don't merge islands, but wake up all connected objects
-			if (colObj0->isStaticOrKinematicObject() && colObj0->getActivationState() != ISLAND_SLEEPING)
+			if (colObj0->isKinematicObject() && colObj0->getActivationState() != ISLAND_SLEEPING)
 			{
 				colObj1->activate();
 			}
-			if (colObj1->isStaticOrKinematicObject() && colObj1->getActivationState() != ISLAND_SLEEPING)
+			if (colObj1->isKinematicObject() && colObj1->getActivationState() != ISLAND_SLEEPING)
 			{
 				colObj0->activate();
 			}
-
-			//filtering for response
+#ifdef SPLIT_ISLANDS
+	//		//filtering for response
 			if (dispatcher->needsResponse(colObj0,colObj1))
-				islandmanifold.push_back(manifold);
+				m_islandmanifold.push_back(manifold);
+#endif //SPLIT_ISLANDS
 		}
 	}
+}
 
-	int numManifolds = int (islandmanifold.size());
 
+
+//
+// todo: this is random access, it can be walked 'cache friendly'!
+//
+void btSimulationIslandManager::buildAndProcessIslands(btDispatcher* dispatcher,btCollisionObjectArray& collisionObjects, IslandCallback* callback)
+{
+
+	buildIslands(dispatcher,collisionObjects);
+
+	int endIslandIndex=1;
+	int startIslandIndex;
+	int numElem = getUnionFind().getNumElements();
+
+	BT_PROFILE("processIslands");
+
+#ifndef SPLIT_ISLANDS
+	btPersistentManifold** manifold = dispatcher->getInternalManifoldPointer();
+	
+	callback->ProcessIsland(&collisionObjects[0],collisionObjects.size(),manifold,maxNumManifolds, -1);
+#else
 	// Sort manifolds, based on islands
 	// Sort the vector using predicate and std::sort
 	//std::sort(islandmanifold.begin(), islandmanifold.end(), btPersistentManifoldSortPredicate);
 
+	int numManifolds = int (m_islandmanifold.size());
+
 	//we should do radix sort, it it much faster (O(n) instead of O (n log2(n))
-	islandmanifold.heapSort(btPersistentManifoldSortPredicate());
+	m_islandmanifold.quickSort(btPersistentManifoldSortPredicate());
 
 	//now process all active islands (sets of manifolds for now)
 
@@ -296,10 +322,9 @@ void btSimulationIslandManager::buildAndProcessIslands(btDispatcher* dispatcher,
 
 	//int islandId;
 
-	END_PROFILE("islandUnionFindAndHeapSort");
-
-	btAlignedObjectArray<btCollisionObject*>	islandBodies;
+	
 
+//	printf("Start Islands\n");
 
 	//traverse the simulation islands, and call the solver, unless all objects are sleeping/deactivated
 	for ( startIslandIndex=0;startIslandIndex<numElem;startIslandIndex = endIslandIndex)
@@ -313,7 +338,7 @@ void btSimulationIslandManager::buildAndProcessIslands(btDispatcher* dispatcher,
                 {
                         int i = getUnionFind().getElement(endIslandIndex).m_sz;
                         btCollisionObject* colObj0 = collisionObjects[i];
-						islandBodies.push_back(colObj0);
+						m_islandBodies.push_back(colObj0);
                         if (!colObj0->isActive())
                                 islandSleeping = true;
                 }
@@ -325,12 +350,12 @@ void btSimulationIslandManager::buildAndProcessIslands(btDispatcher* dispatcher,
 
 		if (startManifoldIndex<numManifolds)
 		{
-			int curIslandId = getIslandId(islandmanifold[startManifoldIndex]);
+			int curIslandId = getIslandId(m_islandmanifold[startManifoldIndex]);
 			if (curIslandId == islandId)
 			{
-				startManifold = &islandmanifold[startManifoldIndex];
+				startManifold = &m_islandmanifold[startManifoldIndex];
 			
-				for (endManifoldIndex = startManifoldIndex+1;(endManifoldIndex<numManifolds) && (islandId == getIslandId(islandmanifold[endManifoldIndex]));endManifoldIndex++)
+				for (endManifoldIndex = startManifoldIndex+1;(endManifoldIndex<numManifolds) && (islandId == getIslandId(m_islandmanifold[endManifoldIndex]));endManifoldIndex++)
 				{
 
 				}
@@ -342,7 +367,8 @@ void btSimulationIslandManager::buildAndProcessIslands(btDispatcher* dispatcher,
 
 		if (!islandSleeping)
 		{
-			callback->ProcessIsland(&islandBodies[0],islandBodies.size(),startManifold,numIslandManifolds, islandId);
+			callback->ProcessIsland(&m_islandBodies[0],m_islandBodies.size(),startManifold,numIslandManifolds, islandId);
+//			printf("Island callback of size:%d bodies, %d manifolds\n",islandBodies.size(),numIslandManifolds);
 		}
 		
 		if (numIslandManifolds)
@@ -350,8 +376,9 @@ void btSimulationIslandManager::buildAndProcessIslands(btDispatcher* dispatcher,
 			startManifoldIndex = endManifoldIndex;
 		}
 
-		islandBodies.resize(0);
+		m_islandBodies.resize(0);
 	}
+#endif //SPLIT_ISLANDS
+
 
-	
 }
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.h
index d91ed1c20eb..5f4d54cd803 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.h
@@ -16,18 +16,26 @@ subject to the following restrictions:
 #ifndef SIMULATION_ISLAND_MANAGER_H
 #define SIMULATION_ISLAND_MANAGER_H
 
-#include "../CollisionDispatch/btUnionFind.h"
+#include "BulletCollision/CollisionDispatch/btUnionFind.h"
 #include "btCollisionCreateFunc.h"
+#include "LinearMath/btAlignedObjectArray.h"
+
 
 class btCollisionObject;
 class btCollisionWorld;
 class btDispatcher;
+class btPersistentManifold;
+
 
 ///SimulationIslandManager creates and handles simulation islands, using btUnionFind
 class btSimulationIslandManager
 {
 	btUnionFind m_unionFind;
 
+	btAlignedObjectArray<btPersistentManifold*>  m_islandmanifold;
+	btAlignedObjectArray<btCollisionObject* >  m_islandBodies;
+	
+	
 public:
 	btSimulationIslandManager();
 	virtual ~btSimulationIslandManager();
@@ -42,7 +50,7 @@ public:
 	virtual	void	storeIslandActivationState(btCollisionWorld* world);
 
 
-	void	findUnions(btDispatcher* dispatcher);
+	void	findUnions(btDispatcher* dispatcher,btCollisionWorld* colWorld);
 
 	
 
@@ -55,6 +63,8 @@ public:
 
 	void	buildAndProcessIslands(btDispatcher* dispatcher,btCollisionObjectArray& collisionObjects, IslandCallback* callback);
 
+	void buildIslands(btDispatcher* dispatcher,btCollisionObjectArray& collisionObjects);
+
 };
 
 #endif //SIMULATION_ISLAND_MANAGER_H
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp
index 05556bd34e2..1e4bbce451d 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp
@@ -68,18 +68,25 @@ void btSphereBoxCollisionAlgorithm::processCollision (btCollisionObject* body0,b
 	
 	btScalar dist = getSphereDistance(boxObj,pOnBox,pOnSphere,sphereCenter,radius);
 
+	resultOut->setPersistentManifold(m_manifoldPtr);
+
 	if (dist < SIMD_EPSILON)
 	{
 		btVector3 normalOnSurfaceB = (pOnBox- pOnSphere).normalize();
 
 		/// report a contact. internally this will be kept persistent, and contact reduction is done
 
-		resultOut->setPersistentManifold(m_manifoldPtr);
 		resultOut->addContactPoint(normalOnSurfaceB,pOnBox,dist);
 		
 	}
 
-	
+	if (m_ownManifold)
+	{
+		if (m_manifoldPtr->getNumContacts())
+		{
+			resultOut->refreshContactPoints();
+		}
+	}
 
 }
 
@@ -102,8 +109,8 @@ btScalar btSphereBoxCollisionAlgorithm::getSphereDistance(btCollisionObject* box
 	btVector3 bounds[2];
 	btBoxShape* boxShape= (btBoxShape*)boxObj->getCollisionShape();
 	
-	bounds[0] = -boxShape->getHalfExtents();
-	bounds[1] = boxShape->getHalfExtents();
+	bounds[0] = -boxShape->getHalfExtentsWithoutMargin();
+	bounds[1] = boxShape->getHalfExtentsWithoutMargin();
 
 	margins = boxShape->getMargin();//also add sphereShape margin?
 
@@ -209,6 +216,10 @@ btScalar btSphereBoxCollisionAlgorithm::getSpherePenetration( btCollisionObject*
 	btVector3	p0, tmp, prel, n[6], normal;
 	btScalar   fSep = btScalar(-10000000.0), fSepThis;
 
+	// set p0 and normal to a default value to shup up GCC
+	p0.setValue(btScalar(0.), btScalar(0.), btScalar(0.));
+	normal.setValue(btScalar(0.), btScalar(0.), btScalar(0.));
+
 	n[0].setValue( btScalar(-1.0),  btScalar(0.0),  btScalar(0.0) );
 	n[1].setValue(  btScalar(0.0), btScalar(-1.0),  btScalar(0.0) );
 	n[2].setValue(  btScalar(0.0),  btScalar(0.0), btScalar(-1.0) );
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h
index 07592909200..158f0ffcc74 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h
@@ -16,11 +16,13 @@ subject to the following restrictions:
 #ifndef SPHERE_BOX_COLLISION_ALGORITHM_H
 #define SPHERE_BOX_COLLISION_ALGORITHM_H
 
-#include "../BroadphaseCollision/btCollisionAlgorithm.h"
-#include "../BroadphaseCollision/btBroadphaseProxy.h"
-#include "../CollisionDispatch/btCollisionCreateFunc.h"
+#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
+#include "BulletCollision/CollisionDispatch/btCollisionCreateFunc.h"
 class btPersistentManifold;
-#include "../../LinearMath/btVector3.h"
+#include "btCollisionDispatcher.h"
+
+#include "LinearMath/btVector3.h"
 
 /// btSphereBoxCollisionAlgorithm  provides sphere-box collision detection.
 /// Other features are frame-coherency (persistent data) and collision response.
@@ -40,6 +42,14 @@ public:
 
 	virtual btScalar calculateTimeOfImpact(btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut);
 
+	virtual	void	getAllContactManifolds(btManifoldArray&	manifoldArray)
+	{
+		if (m_manifoldPtr && m_ownManifold)
+		{
+			manifoldArray.push_back(m_manifoldPtr);
+		}
+	}
+
 	btScalar getSphereDistance( btCollisionObject* boxObj,btVector3& v3PointOnBox, btVector3& v3PointOnSphere, const btVector3& v3SphereCenter, btScalar fRadius );
 
 	btScalar getSpherePenetration( btCollisionObject* boxObj, btVector3& v3PointOnBox, btVector3& v3PointOnSphere, const btVector3& v3SphereCenter, btScalar fRadius, const btVector3& aabbMin, const btVector3& aabbMax);
@@ -48,12 +58,13 @@ public:
 	{
 		virtual	btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, btCollisionObject* body0,btCollisionObject* body1)
 		{
+			void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btSphereBoxCollisionAlgorithm));
 			if (!m_swapped)
 			{
-				return new btSphereBoxCollisionAlgorithm(0,ci,body0,body1,false);
+				return new(mem) btSphereBoxCollisionAlgorithm(0,ci,body0,body1,false);
 			} else
 			{
-				return new btSphereBoxCollisionAlgorithm(0,ci,body0,body1,true);
+				return new(mem) btSphereBoxCollisionAlgorithm(0,ci,body0,body1,true);
 			}
 		}
 	};
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp
index 424ff432f84..c9256473c00 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp
@@ -46,6 +46,8 @@ void btSphereSphereCollisionAlgorithm::processCollision (btCollisionObject* col0
 	if (!m_manifoldPtr)
 		return;
 
+	resultOut->setPersistentManifold(m_manifoldPtr);
+
 	btSphereShape* sphere0 = (btSphereShape*)col0->getCollisionShape();
 	btSphereShape* sphere1 = (btSphereShape*)col1->getCollisionShape();
 
@@ -54,23 +56,34 @@ void btSphereSphereCollisionAlgorithm::processCollision (btCollisionObject* col0
 	btScalar radius0 = sphere0->getRadius();
 	btScalar radius1 = sphere1->getRadius();
 
+	//m_manifoldPtr->clearManifold(); //don't do this, it disables warmstarting
+
 	///iff distance positive, don't generate a new contact
 	if ( len > (radius0+radius1))
+	{
 		return;
-
+	}
 	///distance (negative means penetration)
 	btScalar dist = len - (radius0+radius1);
 
-	btVector3 normalOnSurfaceB = diff / len;
+	btVector3 normalOnSurfaceB(1,0,0);
+	if (len > SIMD_EPSILON)
+	{
+		normalOnSurfaceB = diff / len;
+	}
+
 	///point on A (worldspace)
 	btVector3 pos0 = col0->getWorldTransform().getOrigin() - radius0 * normalOnSurfaceB;
 	///point on B (worldspace)
 	btVector3 pos1 = col1->getWorldTransform().getOrigin() + radius1* normalOnSurfaceB;
 
 	/// report a contact. internally this will be kept persistent, and contact reduction is done
-	resultOut->setPersistentManifold(m_manifoldPtr);
+	
+	
 	resultOut->addContactPoint(normalOnSurfaceB,pos1,dist);
 
+	//no resultOut->refreshContactPoints(); needed, because of clearManifold (all points are new)
+
 }
 
 btScalar btSphereSphereCollisionAlgorithm::calculateTimeOfImpact(btCollisionObject* col0,btCollisionObject* col1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut)
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h
index 7a19ff31edf..afdc2ee7fa0 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h
@@ -16,9 +16,11 @@ subject to the following restrictions:
 #ifndef SPHERE_SPHERE_COLLISION_ALGORITHM_H
 #define SPHERE_SPHERE_COLLISION_ALGORITHM_H
 
-#include "../BroadphaseCollision/btCollisionAlgorithm.h"
-#include "../BroadphaseCollision/btBroadphaseProxy.h"
-#include "../CollisionDispatch/btCollisionCreateFunc.h"
+#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
+#include "BulletCollision/CollisionDispatch/btCollisionCreateFunc.h"
+#include "btCollisionDispatcher.h"
+
 class btPersistentManifold;
 
 /// btSphereSphereCollisionAlgorithm  provides sphere-sphere collision detection.
@@ -39,6 +41,13 @@ public:
 
 	virtual btScalar calculateTimeOfImpact(btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut);
 
+	virtual	void	getAllContactManifolds(btManifoldArray&	manifoldArray)
+	{
+		if (m_manifoldPtr && m_ownManifold)
+		{
+			manifoldArray.push_back(m_manifoldPtr);
+		}
+	}
 	
 	virtual ~btSphereSphereCollisionAlgorithm();
 
@@ -46,7 +55,8 @@ public:
 	{
 		virtual	btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, btCollisionObject* body0,btCollisionObject* body1)
 		{
-			return new btSphereSphereCollisionAlgorithm(0,ci,body0,body1);
+			void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btSphereSphereCollisionAlgorithm));
+			return new(mem) btSphereSphereCollisionAlgorithm(0,ci,body0,body1);
 		}
 	};
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp
index b011b707e3f..46961f5d61b 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp
@@ -48,8 +48,11 @@ void btSphereTriangleCollisionAlgorithm::processCollision (btCollisionObject* co
 	if (!m_manifoldPtr)
 		return;
 
-	btSphereShape* sphere = (btSphereShape*)col0->getCollisionShape();
-	btTriangleShape* triangle = (btTriangleShape*)col1->getCollisionShape();
+	btCollisionObject* sphereObj = m_swapped? col1 : col0;
+	btCollisionObject* triObj = m_swapped? col0 : col1;
+
+	btSphereShape* sphere = (btSphereShape*)sphereObj->getCollisionShape();
+	btTriangleShape* triangle = (btTriangleShape*)triObj->getCollisionShape();
 	
 	/// report a contact. internally this will be kept persistent, and contact reduction is done
 	resultOut->setPersistentManifold(m_manifoldPtr);
@@ -57,11 +60,16 @@ void btSphereTriangleCollisionAlgorithm::processCollision (btCollisionObject* co
 	
 	btDiscreteCollisionDetectorInterface::ClosestPointInput input;
 	input.m_maximumDistanceSquared = btScalar(1e30);//todo: tighter bounds
-	input.m_transformA = col0->getWorldTransform();
-	input.m_transformB = col1->getWorldTransform();
+	input.m_transformA = sphereObj->getWorldTransform();
+	input.m_transformB = triObj->getWorldTransform();
 
-	detector.getClosestPoints(input,*resultOut,dispatchInfo.m_debugDraw);
+	bool swapResults = m_swapped && !m_ownManifold;
 
+	detector.getClosestPoints(input,*resultOut,dispatchInfo.m_debugDraw,swapResults);
+
+	if (m_ownManifold)
+		resultOut->refreshContactPoints();
+	
 }
 
 btScalar btSphereTriangleCollisionAlgorithm::calculateTimeOfImpact(btCollisionObject* col0,btCollisionObject* col1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut)
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h
index 57c6e6af619..bbaf228c44c 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h
@@ -16,10 +16,11 @@ subject to the following restrictions:
 #ifndef SPHERE_TRIANGLE_COLLISION_ALGORITHM_H
 #define SPHERE_TRIANGLE_COLLISION_ALGORITHM_H
 
-#include "../BroadphaseCollision/btCollisionAlgorithm.h"
-#include "../BroadphaseCollision/btBroadphaseProxy.h"
-#include "../CollisionDispatch/btCollisionCreateFunc.h"
+#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
+#include "BulletCollision/CollisionDispatch/btCollisionCreateFunc.h"
 class btPersistentManifold;
+#include "btCollisionDispatcher.h"
 
 /// btSphereSphereCollisionAlgorithm  provides sphere-sphere collision detection.
 /// Other features are frame-coherency (persistent data) and collision response.
@@ -40,6 +41,13 @@ public:
 
 	virtual btScalar calculateTimeOfImpact(btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut);
 
+	virtual	void	getAllContactManifolds(btManifoldArray&	manifoldArray)
+	{
+		if (m_manifoldPtr && m_ownManifold)
+		{
+			manifoldArray.push_back(m_manifoldPtr);
+		}
+	}
 	
 	virtual ~btSphereTriangleCollisionAlgorithm();
 
@@ -49,7 +57,9 @@ public:
 		virtual	btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, btCollisionObject* body0,btCollisionObject* body1)
 		{
 			
-				return new btSphereTriangleCollisionAlgorithm(ci.m_manifold,ci,body0,body1,m_swapped);
+			void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btSphereTriangleCollisionAlgorithm));
+
+			return new(mem) btSphereTriangleCollisionAlgorithm(ci.m_manifold,ci,body0,body1,m_swapped);
 		}
 	};
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.cpp
index 62254335796..bb01b60fa85 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.cpp
@@ -18,6 +18,7 @@ subject to the following restrictions:
 
 
 
+
 btUnionFind::~btUnionFind()
 {
 	Free();
@@ -76,8 +77,7 @@ void	btUnionFind::sortIslands()
 	
 	 // Sort the vector using predicate and std::sort
 	  //std::sort(m_elements.begin(), m_elements.end(), btUnionFindElementSortPredicate);
-	//perhaps use radix sort?
-	  m_elements.heapSort(btUnionFindElementSortPredicate());
+	  m_elements.quickSort(btUnionFindElementSortPredicate());
 
 }
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.h
index 236cc33b94f..820c8bc858e 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.h
@@ -16,7 +16,7 @@ subject to the following restrictions:
 #ifndef UNION_FIND_H
 #define UNION_FIND_H
 
-#include "../../LinearMath/btAlignedObjectArray.h"
+#include "LinearMath/btAlignedObjectArray.h"
 
 	#define USE_PATH_COMPRESSION 1
 
@@ -46,11 +46,11 @@ class btUnionFind
 
 	  void	reset(int N);
 
-	  inline int	getNumElements() const
+	  SIMD_FORCE_INLINE int	getNumElements() const
 	  {
 		  return int(m_elements.size());
 	  }
-	  inline bool  isRoot(int x) const
+	  SIMD_FORCE_INLINE bool  isRoot(int x) const
 	  {
 		  return (x == m_elements[x].m_id);
 	  }
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.cpp
index 636b0046c13..adac455bbcb 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.cpp
@@ -15,16 +15,13 @@ subject to the following restrictions:
 
 #include "btBoxShape.h"
 
-btVector3 btBoxShape::getHalfExtents() const
-{
-	return m_implicitShapeDimensions * m_localScaling;
-}
+
 //{ 
 
 
 void btBoxShape::getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const
 {
-	btVector3 halfExtents = getHalfExtents();
+	const btVector3& halfExtents = getHalfExtentsWithoutMargin();
 
 	btMatrix3x3 abs_b = t.getBasis().absolute();  
 	btPoint3 center = t.getOrigin();
@@ -40,10 +37,10 @@ void btBoxShape::getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabb
 }
 
 
-void	btBoxShape::calculateLocalInertia(btScalar mass,btVector3& inertia)
+void	btBoxShape::calculateLocalInertia(btScalar mass,btVector3& inertia) const
 {
 	//btScalar margin = btScalar(0.);
-	btVector3 halfExtents = getHalfExtents();
+	btVector3 halfExtents = getHalfExtentsWithMargin();
 
 	btScalar lx=btScalar(2.)*(halfExtents.x());
 	btScalar ly=btScalar(2.)*(halfExtents.y());
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.h
index bc42f146c7c..4d4fbefea37 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.h
@@ -18,11 +18,11 @@ subject to the following restrictions:
 
 #include "btPolyhedralConvexShape.h"
 #include "btCollisionMargin.h"
-#include "../BroadphaseCollision/btBroadphaseProxy.h"
-#include "../../LinearMath/btPoint3.h"
-#include "../../LinearMath/btSimdMinMax.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
+#include "LinearMath/btPoint3.h"
+#include "LinearMath/btMinMax.h"
 
-///btBoxShape implements both a feature based (vertex/edge/plane) and implicit (getSupportingVertex) Box
+///The btBoxShape is a box primitive around the origin, its sides axis aligned with length specified by half extents, in local shape coordinates. When used as part of a btCollisionObject or btRigidBody it will be an oriented box in world space.
 class btBoxShape: public btPolyhedralConvexShape
 {
 
@@ -31,47 +31,52 @@ class btBoxShape: public btPolyhedralConvexShape
 
 public:
 
-	btVector3 getHalfExtents() const;
-		
+	btVector3 getHalfExtentsWithMargin() const
+	{
+		btVector3 halfExtents = getHalfExtentsWithoutMargin();
+		btVector3 margin(getMargin(),getMargin(),getMargin());
+		halfExtents += margin;
+		return halfExtents;
+	}
+	
+	const btVector3& getHalfExtentsWithoutMargin() const
+	{
+		return m_implicitShapeDimensions;//changed in Bullet 2.63: assume the scaling and margin are included
+	}
+	
+
 	virtual int	getShapeType() const { return BOX_SHAPE_PROXYTYPE;}
 
 	virtual btVector3	localGetSupportingVertex(const btVector3& vec) const
 	{
+		btVector3 halfExtents = getHalfExtentsWithoutMargin();
+		btVector3 margin(getMargin(),getMargin(),getMargin());
+		halfExtents += margin;
 		
-		btVector3 halfExtents = getHalfExtents();
-		
-		btVector3 supVertex;
-		supVertex = btPoint3(vec.x() < btScalar(0.0) ? -halfExtents.x() : halfExtents.x(),
-                     vec.y() < btScalar(0.0) ? -halfExtents.y() : halfExtents.y(),
-                     vec.z() < btScalar(0.0) ? -halfExtents.z() : halfExtents.z()); 
-  
-		return supVertex;
+		return btVector3(btFsels(vec.x(), halfExtents.x(), -halfExtents.x()),
+			btFsels(vec.y(), halfExtents.y(), -halfExtents.y()),
+			btFsels(vec.z(), halfExtents.z(), -halfExtents.z()));
 	}
 
-	virtual inline btVector3	localGetSupportingVertexWithoutMargin(const btVector3& vec)const
+	SIMD_FORCE_INLINE  btVector3	localGetSupportingVertexWithoutMargin(const btVector3& vec)const
 	{
-		btVector3 halfExtents = getHalfExtents();
-		btVector3 margin(getMargin(),getMargin(),getMargin());
-		halfExtents -= margin;
-
-		return btVector3(vec.x() < btScalar(0.0) ? -halfExtents.x() : halfExtents.x(),
-                    vec.y() < btScalar(0.0) ? -halfExtents.y() : halfExtents.y(),
-                    vec.z() < btScalar(0.0) ? -halfExtents.z() : halfExtents.z()); 
+		const btVector3& halfExtents = getHalfExtentsWithoutMargin();
+		
+		return btVector3(btFsels(vec.x(), halfExtents.x(), -halfExtents.x()),
+			btFsels(vec.y(), halfExtents.y(), -halfExtents.y()),
+			btFsels(vec.z(), halfExtents.z(), -halfExtents.z()));
 	}
 
 	virtual void	batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors,btVector3* supportVerticesOut,int numVectors) const
 	{
-		btVector3 halfExtents = getHalfExtents();
-		btVector3 margin(getMargin(),getMargin(),getMargin());
-		halfExtents -= margin;
-
-
+		const btVector3& halfExtents = getHalfExtentsWithoutMargin();
+	
 		for (int i=0;i<numVectors;i++)
 		{
 			const btVector3& vec = vectors[i];
-			supportVerticesOut[i].setValue(vec.x() < btScalar(0.0) ? -halfExtents.x() : halfExtents.x(),
-                    vec.y() < btScalar(0.0) ? -halfExtents.y() : halfExtents.y(),
-                    vec.z() < btScalar(0.0) ? -halfExtents.z() : halfExtents.z()); 
+			supportVerticesOut[i].setValue(btFsels(vec.x(), halfExtents.x(), -halfExtents.x()),
+				btFsels(vec.y(), halfExtents.y(), -halfExtents.y()),
+				btFsels(vec.z(), halfExtents.z(), -halfExtents.z())); 
 		}
 
 	}
@@ -79,14 +84,38 @@ public:
 
 	btBoxShape( const btVector3& boxHalfExtents)
 	{
-		m_implicitShapeDimensions = boxHalfExtents;
+		btVector3 margin(getMargin(),getMargin(),getMargin());
+		m_implicitShapeDimensions = (boxHalfExtents * m_localScaling) - margin;
 	};
-	
+
+	virtual void setMargin(btScalar collisionMargin)
+	{
+		//correct the m_implicitShapeDimensions for the margin
+		btVector3 oldMargin(getMargin(),getMargin(),getMargin());
+		btVector3 implicitShapeDimensionsWithMargin = m_implicitShapeDimensions+oldMargin;
+		
+		btConvexInternalShape::setMargin(collisionMargin);
+		btVector3 newMargin(getMargin(),getMargin(),getMargin());
+		m_implicitShapeDimensions = implicitShapeDimensionsWithMargin - newMargin;
+
+	}
+	virtual void	setLocalScaling(const btVector3& scaling)
+	{
+		btVector3 oldMargin(getMargin(),getMargin(),getMargin());
+		btVector3 implicitShapeDimensionsWithMargin = m_implicitShapeDimensions+oldMargin;
+		btVector3 unScaledImplicitShapeDimensionsWithMargin = implicitShapeDimensionsWithMargin / m_localScaling;
+
+		btConvexInternalShape::setLocalScaling(scaling);
+
+		m_implicitShapeDimensions = (unScaledImplicitShapeDimensionsWithMargin * m_localScaling) - oldMargin;
+
+	}
+
 	virtual void getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const;
 
 	
 
-	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia);
+	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia) const;
 
 	virtual void getPlane(btVector3& planeNormal,btPoint3& planeSupport,int i ) const
 	{
@@ -116,7 +145,7 @@ public:
 
 	virtual void getVertex(int i,btVector3& vtx) const
 	{
-		btVector3 halfExtents = getHalfExtents();
+		btVector3 halfExtents = getHalfExtentsWithoutMargin();
 
 		vtx = btVector3(
 				halfExtents.x() * (1-(i&1)) - halfExtents.x() * (i&1),
@@ -127,7 +156,7 @@ public:
 
 	virtual void	getPlaneEquation(btVector4& plane,int i) const
 	{
-		btVector3 halfExtents = getHalfExtents();
+		btVector3 halfExtents = getHalfExtentsWithoutMargin();
 
 		switch (i)
 		{
@@ -234,7 +263,7 @@ public:
 	
 	virtual	bool isInside(const btPoint3& pt,btScalar tolerance) const
 	{
-		btVector3 halfExtents = getHalfExtents();
+		btVector3 halfExtents = getHalfExtentsWithoutMargin();
 
 		//btScalar minDist = 2*tolerance;
 		
@@ -250,7 +279,7 @@ public:
 
 
 	//debugging
-	virtual char*	getName()const
+	virtual const char*	getName()const
 	{
 		return "Box";
 	}
@@ -291,3 +320,4 @@ public:
 
 #endif //OBB_BOX_MINKOWSKI_H
 
+
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp
index 8da554ef14d..819f6f7f97d 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp
@@ -18,32 +18,56 @@ subject to the following restrictions:
 #include "BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h"
 #include "BulletCollision/CollisionShapes/btOptimizedBvh.h"
 
-
 ///Bvh Concave triangle mesh is a static-triangle mesh shape with Bounding Volume Hierarchy optimization.
 ///Uses an interface to access the triangles to allow for sharing graphics/physics triangles.
-btBvhTriangleMeshShape::btBvhTriangleMeshShape(btStridingMeshInterface* meshInterface, bool useQuantizedAabbCompression)
-:btTriangleMeshShape(meshInterface),m_useQuantizedAabbCompression(useQuantizedAabbCompression)
+btBvhTriangleMeshShape::btBvhTriangleMeshShape(btStridingMeshInterface* meshInterface, bool useQuantizedAabbCompression, bool buildBvh)
+:btTriangleMeshShape(meshInterface),
+m_bvh(0),
+m_useQuantizedAabbCompression(useQuantizedAabbCompression),
+m_ownsBvh(false)
 {
 	//construct bvh from meshInterface
 #ifndef DISABLE_BVH
 
-	m_bvh = new btOptimizedBvh();
 	btVector3 bvhAabbMin,bvhAabbMax;
-	meshInterface->calculateAabbBruteForce(bvhAabbMin,bvhAabbMax);
-	m_bvh->build(meshInterface,m_useQuantizedAabbCompression,bvhAabbMin,bvhAabbMax);
+	if(meshInterface->hasPremadeAabb())
+	{
+		meshInterface->getPremadeAabb(&bvhAabbMin, &bvhAabbMax);
+	}
+	else
+	{
+		meshInterface->calculateAabbBruteForce(bvhAabbMin,bvhAabbMax);
+	}
+	
+	if (buildBvh)
+	{
+		void* mem = btAlignedAlloc(sizeof(btOptimizedBvh),16);
+		m_bvh = new (mem) btOptimizedBvh();
+		m_bvh->build(meshInterface,m_useQuantizedAabbCompression,bvhAabbMin,bvhAabbMax);
+		m_ownsBvh = true;
+	}
 
 #endif //DISABLE_BVH
 
 }
 
-btBvhTriangleMeshShape::btBvhTriangleMeshShape(btStridingMeshInterface* meshInterface, bool useQuantizedAabbCompression,const btVector3& bvhAabbMin,const btVector3& bvhAabbMax)
-:btTriangleMeshShape(meshInterface),m_useQuantizedAabbCompression(useQuantizedAabbCompression)
+btBvhTriangleMeshShape::btBvhTriangleMeshShape(btStridingMeshInterface* meshInterface, bool useQuantizedAabbCompression,const btVector3& bvhAabbMin,const btVector3& bvhAabbMax,bool buildBvh)
+:btTriangleMeshShape(meshInterface),
+m_bvh(0),
+m_useQuantizedAabbCompression(useQuantizedAabbCompression),
+m_ownsBvh(false)
 {
 	//construct bvh from meshInterface
 #ifndef DISABLE_BVH
 
-	m_bvh = new btOptimizedBvh();
-	m_bvh->build(meshInterface,m_useQuantizedAabbCompression,bvhAabbMin,bvhAabbMax);
+	if (buildBvh)
+	{
+		void* mem = btAlignedAlloc(sizeof(btOptimizedBvh),16);
+		m_bvh = new (mem) btOptimizedBvh();
+		
+		m_bvh->build(meshInterface,m_useQuantizedAabbCompression,bvhAabbMin,bvhAabbMax);
+		m_ownsBvh = true;
+	}
 
 #endif //DISABLE_BVH
 
@@ -58,16 +82,140 @@ void	btBvhTriangleMeshShape::partialRefitTree(const btVector3& aabbMin,const btV
 }
 
 
-void	btBvhTriangleMeshShape::refitTree()
+void	btBvhTriangleMeshShape::refitTree(const btVector3& aabbMin,const btVector3& aabbMax)
 {
-	m_bvh->refit( m_meshInterface );
+	m_bvh->refit( m_meshInterface, aabbMin,aabbMax );
 	
 	recalcLocalAabb();
 }
 
 btBvhTriangleMeshShape::~btBvhTriangleMeshShape()
 {
-	delete m_bvh;
+	if (m_ownsBvh)
+	{
+		m_bvh->~btOptimizedBvh();
+		btAlignedFree(m_bvh);
+	}
+}
+
+void	btBvhTriangleMeshShape::performRaycast (btTriangleCallback* callback, const btVector3& raySource, const btVector3& rayTarget)
+{
+	struct	MyNodeOverlapCallback : public btNodeOverlapCallback
+	{
+		btStridingMeshInterface*	m_meshInterface;
+		btTriangleCallback* m_callback;
+
+		MyNodeOverlapCallback(btTriangleCallback* callback,btStridingMeshInterface* meshInterface)
+			:m_meshInterface(meshInterface),
+			m_callback(callback)
+		{
+		}
+				
+		virtual void processNode(int nodeSubPart, int nodeTriangleIndex)
+		{
+			btVector3 m_triangle[3];
+			const unsigned char *vertexbase;
+			int numverts;
+			PHY_ScalarType type;
+			int stride;
+			const unsigned char *indexbase;
+			int indexstride;
+			int numfaces;
+			PHY_ScalarType indicestype;
+
+			m_meshInterface->getLockedReadOnlyVertexIndexBase(
+				&vertexbase,
+				numverts,
+				type,
+				stride,
+				&indexbase,
+				indexstride,
+				numfaces,
+				indicestype,
+				nodeSubPart);
+
+			unsigned int* gfxbase = (unsigned int*)(indexbase+nodeTriangleIndex*indexstride);
+			btAssert(indicestype==PHY_INTEGER||indicestype==PHY_SHORT);
+	
+			const btVector3& meshScaling = m_meshInterface->getScaling();
+			for (int j=2;j>=0;j--)
+			{
+				int graphicsindex = indicestype==PHY_SHORT?((unsigned short*)gfxbase)[j]:gfxbase[j];
+
+				btScalar* graphicsbase = (btScalar*)(vertexbase+graphicsindex*stride);
+
+				m_triangle[j] = btVector3(graphicsbase[0]*meshScaling.getX(),graphicsbase[1]*meshScaling.getY(),graphicsbase[2]*meshScaling.getZ());		
+			}
+
+			/* Perform ray vs. triangle collision here */
+			m_callback->processTriangle(m_triangle,nodeSubPart,nodeTriangleIndex);
+			m_meshInterface->unLockReadOnlyVertexBase(nodeSubPart);
+		}
+	};
+
+	MyNodeOverlapCallback	myNodeCallback(callback,m_meshInterface);
+
+	m_bvh->reportRayOverlappingNodex(&myNodeCallback,raySource,rayTarget);
+}
+
+void	btBvhTriangleMeshShape::performConvexcast (btTriangleCallback* callback, const btVector3& raySource, const btVector3& rayTarget, const btVector3& aabbMin, const btVector3& aabbMax)
+{
+	struct	MyNodeOverlapCallback : public btNodeOverlapCallback
+	{
+		btStridingMeshInterface*	m_meshInterface;
+		btTriangleCallback* m_callback;
+
+		MyNodeOverlapCallback(btTriangleCallback* callback,btStridingMeshInterface* meshInterface)
+			:m_meshInterface(meshInterface),
+			m_callback(callback)
+		{
+		}
+				
+		virtual void processNode(int nodeSubPart, int nodeTriangleIndex)
+		{
+			btVector3 m_triangle[3];
+			const unsigned char *vertexbase;
+			int numverts;
+			PHY_ScalarType type;
+			int stride;
+			const unsigned char *indexbase;
+			int indexstride;
+			int numfaces;
+			PHY_ScalarType indicestype;
+
+			m_meshInterface->getLockedReadOnlyVertexIndexBase(
+				&vertexbase,
+				numverts,
+				type,
+				stride,
+				&indexbase,
+				indexstride,
+				numfaces,
+				indicestype,
+				nodeSubPart);
+
+			unsigned int* gfxbase = (unsigned int*)(indexbase+nodeTriangleIndex*indexstride);
+			btAssert(indicestype==PHY_INTEGER||indicestype==PHY_SHORT);
+	
+			const btVector3& meshScaling = m_meshInterface->getScaling();
+			for (int j=2;j>=0;j--)
+			{
+				int graphicsindex = indicestype==PHY_SHORT?((unsigned short*)gfxbase)[j]:gfxbase[j];
+
+				btScalar* graphicsbase = (btScalar*)(vertexbase+graphicsindex*stride);
+
+				m_triangle[j] = btVector3(graphicsbase[0]*meshScaling.getX(),graphicsbase[1]*meshScaling.getY(),graphicsbase[2]*meshScaling.getZ());		
+			}
+
+			/* Perform ray vs. triangle collision here */
+			m_callback->processTriangle(m_triangle,nodeSubPart,nodeTriangleIndex);
+			m_meshInterface->unLockReadOnlyVertexBase(nodeSubPart);
+		}
+	};
+
+	MyNodeOverlapCallback	myNodeCallback(callback,m_meshInterface);
+
+	m_bvh->reportBoxCastOverlappingNodex (&myNodeCallback, raySource, rayTarget, aabbMin, aabbMax);
 }
 
 //perform bvh tree traversal and report overlapping triangles to 'callback'
@@ -118,13 +266,14 @@ void	btBvhTriangleMeshShape::processAllTriangles(btTriangleCallback* callback,co
 				indicestype,
 				nodeSubPart);
 
-			int* gfxbase = (int*)(indexbase+nodeTriangleIndex*indexstride);
+			unsigned int* gfxbase = (unsigned int*)(indexbase+nodeTriangleIndex*indexstride);
+			btAssert(indicestype==PHY_INTEGER||indicestype==PHY_SHORT);
 	
 			const btVector3& meshScaling = m_meshInterface->getScaling();
 			for (int j=2;j>=0;j--)
 			{
 				
-				int graphicsindex = gfxbase[j];
+				int graphicsindex = indicestype==PHY_SHORT?((unsigned short*)gfxbase)[j]:gfxbase[j];
 
 
 #ifdef DEBUG_TRIANGLE_MESH
@@ -157,17 +306,37 @@ void	btBvhTriangleMeshShape::processAllTriangles(btTriangleCallback* callback,co
 
 }
 
-
-void	btBvhTriangleMeshShape::setLocalScaling(const btVector3& scaling)
+void   btBvhTriangleMeshShape::setLocalScaling(const btVector3& scaling)
 {
-	if ((getLocalScaling() -scaling).length2() > SIMD_EPSILON)
-	{
-		btTriangleMeshShape::setLocalScaling(scaling);
-		delete m_bvh;
-		///m_localAabbMin/m_localAabbMax is already re-calculated in btTriangleMeshShape. We could just scale aabb, but this needs some more work
-		m_bvh = new btOptimizedBvh();
-		//rebuild the bvh...
-		m_bvh->build(m_meshInterface,m_useQuantizedAabbCompression,m_localAabbMin,m_localAabbMax);
-
-	}
+   if ((getLocalScaling() -scaling).length2() > SIMD_EPSILON)
+   {
+      btTriangleMeshShape::setLocalScaling(scaling);
+      if (m_ownsBvh)
+      {
+         m_bvh->~btOptimizedBvh();
+         btAlignedFree(m_bvh);
+      }
+      ///m_localAabbMin/m_localAabbMax is already re-calculated in btTriangleMeshShape. We could just scale aabb, but this needs some more work
+      void* mem = btAlignedAlloc(sizeof(btOptimizedBvh),16);
+      m_bvh = new(mem) btOptimizedBvh();
+      //rebuild the bvh...
+      m_bvh->build(m_meshInterface,m_useQuantizedAabbCompression,m_localAabbMin,m_localAabbMax);
+      m_ownsBvh = true;
+   }
 }
+
+void   btBvhTriangleMeshShape::setOptimizedBvh(btOptimizedBvh* bvh, const btVector3& scaling)
+{
+   btAssert(!m_bvh);
+   btAssert(!m_ownsBvh);
+
+   m_bvh = bvh;
+   m_ownsBvh = false;
+   // update the scaling without rebuilding the bvh
+   if ((getLocalScaling() -scaling).length2() > SIMD_EPSILON)
+   {
+      btTriangleMeshShape::setLocalScaling(scaling);
+   }
+}
+
+
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h
index 4914d9f959c..6e587340dc1 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h
@@ -18,45 +18,55 @@ subject to the following restrictions:
 
 #include "btTriangleMeshShape.h"
 #include "btOptimizedBvh.h"
+#include "LinearMath/btAlignedAllocator.h"
 
-///Bvh Concave triangle mesh is a static-triangle mesh shape with Bounding Volume Hierarchy optimization.
-///Uses an interface to access the triangles to allow for sharing graphics/physics triangles.
+
+///The btBvhTriangleMeshShape is a static-triangle mesh shape with several optimizations, such as bounding volume hierarchy and cache friendly traversal for PlayStation 3 Cell SPU. It is recommended to enable useQuantizedAabbCompression for better memory usage.
+///It takes a triangle mesh as input, for example a btTriangleMesh or btTriangleIndexVertexArray. The btBvhTriangleMeshShape class allows for triangle mesh deformations by a refit or partialRefit method.
+///Instead of building the bounding volume hierarchy acceleration structure, it is also possible to serialize (save) and deserialize (load) the structure from disk.
+///See Demos\ConcaveDemo\ConcavePhysicsDemo.cpp for an example.
 ATTRIBUTE_ALIGNED16(class) btBvhTriangleMeshShape : public btTriangleMeshShape
 {
 
 	btOptimizedBvh*	m_bvh;
 	bool m_useQuantizedAabbCompression;
-	bool m_pad[12];////need padding due to alignment
+	bool m_ownsBvh;
+	bool m_pad[11];////need padding due to alignment
 
 public:
 
-	btBvhTriangleMeshShape() :btTriangleMeshShape(0) {};
-	btBvhTriangleMeshShape(btStridingMeshInterface* meshInterface, bool useQuantizedAabbCompression);
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btBvhTriangleMeshShape() :btTriangleMeshShape(0),m_bvh(0),m_ownsBvh(false) {};
+	btBvhTriangleMeshShape(btStridingMeshInterface* meshInterface, bool useQuantizedAabbCompression, bool buildBvh = true);
 
 	///optionally pass in a larger bvh aabb, used for quantization. This allows for deformations within this aabb
-	btBvhTriangleMeshShape(btStridingMeshInterface* meshInterface, bool useQuantizedAabbCompression,const btVector3& bvhAabbMin,const btVector3& bvhAabbMax);
+	btBvhTriangleMeshShape(btStridingMeshInterface* meshInterface, bool useQuantizedAabbCompression,const btVector3& bvhAabbMin,const btVector3& bvhAabbMax, bool buildBvh = true);
 	
 	virtual ~btBvhTriangleMeshShape();
 
-	
-	/*
+	bool getOwnsBvh () const
+	{
+		return m_ownsBvh;
+	}
+
 	virtual int	getShapeType() const
 	{
 		return TRIANGLE_MESH_SHAPE_PROXYTYPE;
 	}
-	*/
-
-
+	
+	void performRaycast (btTriangleCallback* callback, const btVector3& raySource, const btVector3& rayTarget);
+	void performConvexcast (btTriangleCallback* callback, const btVector3& boxSource, const btVector3& boxTarget, const btVector3& boxMin, const btVector3& boxMax);
 
 	virtual void	processAllTriangles(btTriangleCallback* callback,const btVector3& aabbMin,const btVector3& aabbMax) const;
 
-	void	refitTree();
+	void	refitTree(const btVector3& aabbMin,const btVector3& aabbMax);
 
 	///for a fast incremental refit of parts of the tree. Note: the entire AABB of the tree will become more conservative, it never shrinks
 	void	partialRefitTree(const btVector3& aabbMin,const btVector3& aabbMax);
 
 	//debugging
-	virtual char*	getName()const {return "BVHTRIANGLEMESH";}
+	virtual const char*	getName()const {return "BVHTRIANGLEMESH";}
 
 
 	virtual void	setLocalScaling(const btVector3& scaling);
@@ -65,6 +75,10 @@ public:
 	{
 		return m_bvh;
 	}
+
+
+	void	setOptimizedBvh(btOptimizedBvh* bvh, const btVector3& localScaling=btVector3(1,1,1));
+
 	bool	usesQuantizedAabbCompression() const
 	{
 		return	m_useQuantizedAabbCompression;
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.cpp
index b7e15172da2..26ba276b900 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.cpp
@@ -21,6 +21,7 @@ subject to the following restrictions:
 
 btCapsuleShape::btCapsuleShape(btScalar radius, btScalar height)
 {
+	m_upAxis = 1;
 	m_implicitShapeDimensions.setValue(radius,0.5f*height,radius);
 }
 
@@ -50,7 +51,9 @@ btCapsuleShape::btCapsuleShape(btScalar radius, btScalar height)
 
 
 	{
-		btVector3 pos(0,getHalfHeight(),0);
+		btVector3 pos(0,0,0);
+		pos[getUpAxis()] = getHalfHeight();
+
 		vtx = pos +vec*m_localScaling*(radius) - vec * getMargin();
 		newDot = vec.dot(vtx);
 		if (newDot > maxDot)
@@ -60,7 +63,9 @@ btCapsuleShape::btCapsuleShape(btScalar radius, btScalar height)
 		}
 	}
 	{
-		btVector3 pos(0,-getHalfHeight(),0);
+		btVector3 pos(0,0,0);
+		pos[getUpAxis()] = -getHalfHeight();
+
 		vtx = pos +vec*m_localScaling*(radius) - vec * getMargin();
 		newDot = vec.dot(vtx);
 		if (newDot > maxDot)
@@ -88,7 +93,8 @@ btCapsuleShape::btCapsuleShape(btScalar radius, btScalar height)
 		btVector3 vtx;
 		btScalar newDot;
 		{
-			btVector3 pos(0,getHalfHeight(),0);
+			btVector3 pos(0,0,0);
+			pos[getUpAxis()] = getHalfHeight();
 			vtx = pos +vec*m_localScaling*(radius) - vec * getMargin();
 			newDot = vec.dot(vtx);
 			if (newDot > maxDot)
@@ -98,7 +104,8 @@ btCapsuleShape::btCapsuleShape(btScalar radius, btScalar height)
 			}
 		}
 		{
-			btVector3 pos(0,-getHalfHeight(),0);
+			btVector3 pos(0,0,0);
+			pos[getUpAxis()] = -getHalfHeight();
 			vtx = pos +vec*m_localScaling*(radius) - vec * getMargin();
 			newDot = vec.dot(vtx);
 			if (newDot > maxDot)
@@ -112,7 +119,7 @@ btCapsuleShape::btCapsuleShape(btScalar radius, btScalar height)
 }
 
 
-void	btCapsuleShape::calculateLocalInertia(btScalar mass,btVector3& inertia)
+void	btCapsuleShape::calculateLocalInertia(btScalar mass,btVector3& inertia) const
 {
 	//as an approximation, take the inertia of the box that bounds the spheres
 
@@ -122,7 +129,8 @@ void	btCapsuleShape::calculateLocalInertia(btScalar mass,btVector3& inertia)
 	
 	btScalar radius = getRadius();
 
-	btVector3 halfExtents(radius,radius+getHalfHeight(),radius);
+	btVector3 halfExtents(radius,radius,radius);
+	halfExtents[getUpAxis()]+=getHalfHeight();
 
 	btScalar margin = CONVEX_DISTANCE_MARGIN;
 
@@ -140,6 +148,22 @@ void	btCapsuleShape::calculateLocalInertia(btScalar mass,btVector3& inertia)
 
 }
 
+btCapsuleShapeX::btCapsuleShapeX(btScalar radius,btScalar height)
+{
+	m_upAxis = 0;
+	m_implicitShapeDimensions.setValue(0.5f*height, radius,radius);
+}
+
+
+
+
+
+
+btCapsuleShapeZ::btCapsuleShapeZ(btScalar radius,btScalar height)
+{
+	m_upAxis = 2;
+	m_implicitShapeDimensions.setValue(radius,radius,0.5f*height);
+}
 
 
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.h
index 27da8adefa5..92bcce55119 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.h
@@ -16,20 +16,27 @@ subject to the following restrictions:
 #ifndef BT_CAPSULE_SHAPE_H
 #define BT_CAPSULE_SHAPE_H
 
-#include "btConvexShape.h"
-#include "../BroadphaseCollision/btBroadphaseProxy.h" // for the types
+#include "btConvexInternalShape.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types
 
 
-///btCapsuleShape represents a capsule around the Y axis
-///A more general solution that can represent capsules is the btMultiSphereShape
-class btCapsuleShape : public btConvexShape
+///The btCapsuleShape represents a capsule around the Y axis, there is also the btCapsuleShapeX aligned around the X axis and btCapsuleShapeZ around the Z axis.
+///The total height is height+2*radius, so the height is just the height between the center of each 'sphere' of the capsule caps.
+///The btCapsuleShape is a convex hull of two spheres. The btMultiSphereShape is a more general collision shape that takes the convex hull of multiple sphere, so it can also represent a capsule when just using two spheres.
+class btCapsuleShape : public btConvexInternalShape
 {
+protected:
+	int	m_upAxis;
+
+protected:
+	///only used for btCapsuleShapeZ and btCapsuleShapeX subclasses.
+	btCapsuleShape() {};
 
 public:
 	btCapsuleShape(btScalar radius,btScalar height);
 
 	///CollisionShape Interface
-	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia);
+	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia) const;
 
 	/// btConvexShape Interface
 	virtual btVector3	localGetSupportingVertexWithoutMargin(const btVector3& vec)const;
@@ -38,23 +45,75 @@ public:
 	
 	virtual int	getShapeType() const { return CAPSULE_SHAPE_PROXYTYPE; }
 
-	virtual char*	getName()const 
+	virtual void getAabb (const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const
+	{
+			btVector3 halfExtents(getRadius(),getRadius(),getRadius());
+			halfExtents[m_upAxis] = getRadius() + getHalfHeight();
+			btMatrix3x3 abs_b = t.getBasis().absolute();  
+			btPoint3 center = t.getOrigin();
+			btVector3 extent = btVector3(abs_b[0].dot(halfExtents),abs_b[1].dot(halfExtents),abs_b[2].dot(halfExtents));		  
+			extent += btVector3(getMargin(),getMargin(),getMargin());
+			aabbMin = center - extent;
+			aabbMax = center + extent;
+	}
+
+	virtual const char*	getName()const 
 	{
 		return "CapsuleShape";
 	}
 
+	int	getUpAxis() const
+	{
+		return m_upAxis;
+	}
+
 	btScalar	getRadius() const
 	{
-		return m_implicitShapeDimensions.getX();
+		int radiusAxis = (m_upAxis+2)%3;
+		return m_implicitShapeDimensions[radiusAxis];
 	}
 
 	btScalar	getHalfHeight() const
 	{
-		return m_implicitShapeDimensions.getY();
+		return m_implicitShapeDimensions[m_upAxis];
 	}
 
 };
 
+///btCapsuleShapeX represents a capsule around the Z axis
+///the total height is height+2*radius, so the height is just the height between the center of each 'sphere' of the capsule caps.
+class btCapsuleShapeX : public btCapsuleShape
+{
+public:
+
+	btCapsuleShapeX(btScalar radius,btScalar height);
+		
+	//debugging
+	virtual const char*	getName()const
+	{
+		return "CapsuleX";
+	}
+
+	
+
+};
+
+///btCapsuleShapeZ represents a capsule around the Z axis
+///the total height is height+2*radius, so the height is just the height between the center of each 'sphere' of the capsule caps.
+class btCapsuleShapeZ : public btCapsuleShape
+{
+public:
+	btCapsuleShapeZ(btScalar radius,btScalar height);
+
+		//debugging
+	virtual const char*	getName()const
+	{
+		return "CapsuleZ";
+	}
+
+	
+};
+
 
 
 #endif //BT_CAPSULE_SHAPE_H
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.cpp
index 81d82428f4c..39e621aa946 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.cpp
@@ -21,7 +21,12 @@ subject to the following restrictions:
   can be used by probes that are checking whether the
   library is actually installed.
 */
-extern "C" void btBulletCollisionProbe () {}
+extern "C" 
+{
+void btBulletCollisionProbe ();
+
+void btBulletCollisionProbe () {}
+}
 
 
 
@@ -46,7 +51,7 @@ btScalar	btCollisionShape::getAngularMotionDisc() const
 	return disc;
 }
 
-void btCollisionShape::calculateTemporalAabb(const btTransform& curTrans,const btVector3& linvel,const btVector3& angvel,btScalar timeStep, btVector3& temporalAabbMin,btVector3& temporalAabbMax)
+void btCollisionShape::calculateTemporalAabb(const btTransform& curTrans,const btVector3& linvel,const btVector3& angvel,btScalar timeStep, btVector3& temporalAabbMin,btVector3& temporalAabbMax) const
 {
 	//start with static aabb
 	getAabb(curTrans,temporalAabbMin,temporalAabbMax);
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.h
index 96268734a83..3a352b90777 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.h
@@ -16,18 +16,21 @@ subject to the following restrictions:
 #ifndef COLLISION_SHAPE_H
 #define COLLISION_SHAPE_H
 
-#include "../../LinearMath/btTransform.h"
-#include "../../LinearMath/btVector3.h"
-#include "../../LinearMath/btMatrix3x3.h"
-#include "../../LinearMath/btPoint3.h"
-#include "../BroadphaseCollision/btBroadphaseProxy.h" //for the shape types
+#include "LinearMath/btTransform.h"
+#include "LinearMath/btVector3.h"
+#include "LinearMath/btMatrix3x3.h"
+#include "LinearMath/btPoint3.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" //for the shape types
 
-///btCollisionShape provides interface for collision shapes that can be shared among btCollisionObjects.
+///The btCollisionShape class provides an interface for collision shapes that can be shared among btCollisionObjects.
 class btCollisionShape
 {
+
+	void* m_userPointer;
+
 public:
 
-	btCollisionShape() 
+	btCollisionShape() : m_userPointer(0)
 	{
 	}
 	virtual ~btCollisionShape()
@@ -45,30 +48,30 @@ public:
 
 	///calculateTemporalAabb calculates the enclosing aabb for the moving object over interval [0..timeStep)
 	///result is conservative
-	void calculateTemporalAabb(const btTransform& curTrans,const btVector3& linvel,const btVector3& angvel,btScalar timeStep, btVector3& temporalAabbMin,btVector3& temporalAabbMax);
+	void calculateTemporalAabb(const btTransform& curTrans,const btVector3& linvel,const btVector3& angvel,btScalar timeStep, btVector3& temporalAabbMin,btVector3& temporalAabbMax) const;
 
 #ifndef __SPU__
 
-	inline bool	isPolyhedral() const
+	SIMD_FORCE_INLINE bool	isPolyhedral() const
 	{
 		return btBroadphaseProxy::isPolyhedral(getShapeType());
 	}
 
-	inline bool	isConvex() const
+	SIMD_FORCE_INLINE bool	isConvex() const
 	{
 		return btBroadphaseProxy::isConvex(getShapeType());
 	}
-	inline bool	isConcave() const
+	SIMD_FORCE_INLINE bool	isConcave() const
 	{
 		return btBroadphaseProxy::isConcave(getShapeType());
 	}
-	inline bool	isCompound() const
+	SIMD_FORCE_INLINE bool	isCompound() const
 	{
 		return btBroadphaseProxy::isCompound(getShapeType());
 	}
 
 	///isInfinite is used to catch simulation error (aabb check)
-	inline bool isInfinite() const
+	SIMD_FORCE_INLINE bool isInfinite() const
 	{
 		return btBroadphaseProxy::isInfinite(getShapeType());
 	}
@@ -76,11 +79,11 @@ public:
 	virtual int		getShapeType() const=0;
 	virtual void	setLocalScaling(const btVector3& scaling) =0;
 	virtual const btVector3& getLocalScaling() const =0;
-	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia) = 0;
+	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia) const = 0;
 
 
 //debugging support
-	virtual char*	getName()const =0 ;
+	virtual const char*	getName()const =0 ;
 #endif //__SPU__
 
 	
@@ -88,6 +91,18 @@ public:
 	virtual void	setMargin(btScalar margin) = 0;
 	virtual btScalar	getMargin() const = 0;
 
+	
+	///optional user data pointer
+	void	setUserPointer(void* userPtr)
+	{
+		m_userPointer = userPtr;
+	}
+
+	void*	getUserPointer() const
+	{
+		return m_userPointer;
+	}
+
 };	
 
 #endif //COLLISION_SHAPE_H
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.cpp
index a4712b3e925..740f1783630 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.cpp
@@ -35,8 +35,15 @@ btCompoundShape::~btCompoundShape()
 
 void	btCompoundShape::addChildShape(const btTransform& localTransform,btCollisionShape* shape)
 {
-	m_childTransforms.push_back(localTransform);
-	m_childShapes.push_back(shape);
+	//m_childTransforms.push_back(localTransform);
+	//m_childShapes.push_back(shape);
+	btCompoundShapeChild child;
+	child.m_transform = localTransform;
+	child.m_childShape = shape;
+	child.m_childShapeType = shape->getShapeType();
+	child.m_childMargin = shape->getMargin();
+
+	m_children.push_back(child);
 
 	//extend the local aabbMin/aabbMax
 	btVector3 localAabbMin,localAabbMax;
@@ -55,9 +62,53 @@ void	btCompoundShape::addChildShape(const btTransform& localTransform,btCollisio
 	}
 }
 
+void btCompoundShape::removeChildShape(btCollisionShape* shape)
+{
+   bool done_removing;
+   
+   // Find the children containing the shape specified, and remove those children.
+   do
+   {
+      done_removing = true;
+      
+      for(int i = 0; i < m_children.size(); i++)
+      {
+         if(m_children[i].m_childShape == shape)
+         {
+            m_children.remove(m_children[i]);
+            done_removing = false;  // Do another iteration pass after removing from the vector
+            break;
+         }
+      }
+   }
+   while (!done_removing);
+   
+   recalculateLocalAabb();
+}
 
-
-	///getAabb's default implementation is brute force, expected derived classes to implement a fast dedicated version
+void btCompoundShape::recalculateLocalAabb()
+{
+   // Recalculate the local aabb
+   // Brute force, it iterates over all the shapes left.
+   m_localAabbMin = btVector3(btScalar(1e30),btScalar(1e30),btScalar(1e30));
+   m_localAabbMax = btVector3(btScalar(-1e30),btScalar(-1e30),btScalar(-1e30));
+   
+   //extend the local aabbMin/aabbMax
+   for (int j = 0; j < m_children.size(); j++)
+   {
+      btVector3 localAabbMin,localAabbMax;
+      m_children[j].m_childShape->getAabb(m_children[j].m_transform, localAabbMin, localAabbMax);
+      for (int i=0;i<3;i++)
+      {
+         if (m_localAabbMin[i] > localAabbMin[i])
+             m_localAabbMin[i] = localAabbMin[i];
+         if (m_localAabbMax[i] < localAabbMax[i])
+             m_localAabbMax[i] = localAabbMax[i];
+      }
+   }
+}
+	
+   ///getAabb's default implementation is brute force, expected derived classes to implement a fast dedicated version
 void btCompoundShape::getAabb(const btTransform& trans,btVector3& aabbMin,btVector3& aabbMax) const
 {
 	btVector3 localHalfExtents = btScalar(0.5)*(m_localAabbMax-m_localAabbMin);
@@ -76,7 +127,7 @@ void btCompoundShape::getAabb(const btTransform& trans,btVector3& aabbMin,btVect
 	aabbMax = center + extent;
 }
 
-void	btCompoundShape::calculateLocalInertia(btScalar mass,btVector3& inertia)
+void	btCompoundShape::calculateLocalInertia(btScalar mass,btVector3& inertia) const
 {
 	//approximation: take the inertia from the aabb for now
 	btTransform ident;
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.h
index 86dc1f80947..f77e4b59558 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.h
@@ -18,58 +18,95 @@ subject to the following restrictions:
 
 #include "btCollisionShape.h"
 
-#include "../../LinearMath/btVector3.h"
-#include "../../LinearMath/btTransform.h"
-#include "../../LinearMath/btMatrix3x3.h"
+#include "LinearMath/btVector3.h"
+#include "LinearMath/btTransform.h"
+#include "LinearMath/btMatrix3x3.h"
 #include "btCollisionMargin.h"
-#include "../../LinearMath/btAlignedObjectArray.h"
+#include "LinearMath/btAlignedObjectArray.h"
 
 class btOptimizedBvh;
 
-/// btCompoundShape allows to store multiple other btCollisionShapes
-/// This allows for concave collision objects. This is more general then the Static Concave btTriangleMeshShape.
-class btCompoundShape	: public btCollisionShape
+
+ATTRIBUTE_ALIGNED16(struct) btCompoundShapeChild
 {
-	btAlignedObjectArray<btTransform>		m_childTransforms;
-	btAlignedObjectArray<btCollisionShape*>	m_childShapes;
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btTransform			m_transform;
+	btCollisionShape*	m_childShape;
+	int					m_childShapeType;
+	btScalar			m_childMargin;
+};
+
+SIMD_FORCE_INLINE bool operator==(const btCompoundShapeChild& c1, const btCompoundShapeChild& c2)
+{
+   return  ( c1.m_transform      == c2.m_transform &&
+             c1.m_childShape     == c2.m_childShape &&
+             c1.m_childShapeType == c2.m_childShapeType &&
+             c1.m_childMargin    == c2.m_childMargin );
+}
+
+/// btCompoundShape allows to store multiple other btCollisionShapes
+/// This allows for moving concave collision objects. This is more general then the static concave btBvhTriangleMeshShape.
+ATTRIBUTE_ALIGNED16(class) btCompoundShape	: public btCollisionShape
+{
+	//btAlignedObjectArray<btTransform>		m_childTransforms;
+	//btAlignedObjectArray<btCollisionShape*>	m_childShapes;
+	btAlignedObjectArray<btCompoundShapeChild> m_children;
 	btVector3						m_localAabbMin;
 	btVector3						m_localAabbMax;
 
 	btOptimizedBvh*					m_aabbTree;
 
 public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
 	btCompoundShape();
 
 	virtual ~btCompoundShape();
 
 	void	addChildShape(const btTransform& localTransform,btCollisionShape* shape);
 
+   /** Remove all children shapes that contain the specified shape. */
+	virtual void removeChildShape(btCollisionShape* shape);
+
+	  
+	
+
 	int		getNumChildShapes() const
 	{
-		return int (m_childShapes.size());
+		return int (m_children.size());
 	}
 
 	btCollisionShape* getChildShape(int index)
 	{
-		return m_childShapes[index];
+		return m_children[index].m_childShape;
 	}
 	const btCollisionShape* getChildShape(int index) const
 	{
-		return m_childShapes[index];
+		return m_children[index].m_childShape;
 	}
 
-	btTransform&	getChildTransform(int index)
+	btTransform	getChildTransform(int index)
 	{
-		return m_childTransforms[index];
+		return m_children[index].m_transform;
 	}
-	const btTransform&	getChildTransform(int index) const
+	const btTransform	getChildTransform(int index) const
 	{
-		return m_childTransforms[index];
+		return m_children[index].m_transform;
+	}
+
+
+	btCompoundShapeChild* getChildList()
+	{
+		return &m_children[0];
 	}
 
 	///getAabb's default implementation is brute force, expected derived classes to implement a fast dedicated version
-	void getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const;
-
+	virtual	void getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const;
+	
+   /** Re-calculate the local Aabb. Is called at the end of removeChildShapes. 
+       Use this yourself if you modify the children or their transforms. */
+	virtual void recalculateLocalAabb(); 
 
 	virtual void	setLocalScaling(const btVector3& scaling)
 	{
@@ -80,7 +117,7 @@ public:
 		return m_localScaling;
 	}
 
-	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia);
+	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia) const;
 	
 	virtual int	getShapeType() const { return COMPOUND_SHAPE_PROXYTYPE;}
 
@@ -92,7 +129,7 @@ public:
 	{
 		return m_collisionMargin;
 	}
-	virtual char*	getName()const
+	virtual const char*	getName()const
 	{
 		return "Compound";
 	}
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btConcaveShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btConcaveShape.h
index 73f974e4ee9..f3f57206ab7 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btConcaveShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btConcaveShape.h
@@ -17,12 +17,12 @@ subject to the following restrictions:
 #define CONCAVE_SHAPE_H
 
 #include "btCollisionShape.h"
-#include "../BroadphaseCollision/btBroadphaseProxy.h" // for the types
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types
 #include "btTriangleCallback.h"
 
 
-///Concave shape proves an interface concave shapes that can produce triangles that overlapping a given AABB.
-///Static triangle mesh, infinite plane, height field/landscapes are example that implement this interface.
+///The btConcaveShape class provides an interface for non-moving (static) concave shapes.
+///It has been implemented by the btStaticPlaneShape, btBvhTriangleMeshShape and btHeightfieldTerrainShape.
 class btConcaveShape : public btCollisionShape
 {
 protected:
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.h
index 3ccda5b12c6..685369742e4 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.h
@@ -16,11 +16,11 @@ subject to the following restrictions:
 #ifndef CONE_MINKOWSKI_H
 #define CONE_MINKOWSKI_H
 
-#include "btConvexShape.h"
-#include "../BroadphaseCollision/btBroadphaseProxy.h" // for the types
+#include "btConvexInternalShape.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types
 
-///btConeShape implements a Cone shape, around the Y axis
-class btConeShape : public btConvexShape
+///The btConeShape implements a cone shape primitive, centered around the origin and aligned with the Y axis. The btConeShapeX is aligned around the X axis and btConeShapeZ around the Z axis.
+class btConeShape : public btConvexInternalShape
 
 {
 
@@ -42,7 +42,7 @@ public:
 	btScalar getHeight() const { return m_height;}
 
 
-	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia)
+	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia) const
 	{
 		btTransform identity;
 		identity.setIdentity();
@@ -72,7 +72,7 @@ public:
 
 		virtual int	getShapeType() const { return CONE_SHAPE_PROXYTYPE; }
 
-		virtual char*	getName()const 
+		virtual const char*	getName()const 
 		{
 			return "Cone";
 		}
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.h
index 3fd5e382525..c029ca19403 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.h
@@ -17,18 +17,17 @@ subject to the following restrictions:
 #define CONVEX_HULL_SHAPE_H
 
 #include "btPolyhedralConvexShape.h"
-#include "../BroadphaseCollision/btBroadphaseProxy.h" // for the types
-#include "../../LinearMath/btAlignedObjectArray.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types
+#include "LinearMath/btAlignedObjectArray.h"
 
-///ConvexHullShape implements an implicit (getSupportingVertex) Convex Hull of a Point Cloud (vertices)
-///No connectivity is needed. localGetSupportingVertex iterates linearly though all vertices.
-///on modern hardware, due to cache coherency this isn't that bad. Complex algorithms tend to trash the cash.
-///(memory is much slower then the cpu)
+///The btConvexHullShape implements an implicit convex hull of an array of vertices.
+///Bullet provides a general and fast collision detector for convex shapes based on GJK and EPA using localGetSupportingVertex.
 ATTRIBUTE_ALIGNED16(class) btConvexHullShape : public btPolyhedralConvexShape
 {
 	btAlignedObjectArray<btPoint3>	m_points;
 
 public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
 
 	
 	///this constructor optionally takes in a pointer to points. Each point is assumed to be 3 consecutive btScalar (x,y,z), the striding defines the number of bytes between each point, in memory.
@@ -43,7 +42,12 @@ public:
 		return &m_points[0];
 	}
 
-	int getNumPoints()
+	const btPoint3* getPoints() const
+	{
+		return &m_points[0];
+	}
+
+	int getNumPoints() const 
 	{
 		return m_points.size();
 	}
@@ -56,7 +60,7 @@ public:
 	virtual int	getShapeType()const { return CONVEX_HULL_SHAPE_PROXYTYPE; }
 
 	//debugging
-	virtual char*	getName()const {return "Convex";}
+	virtual const char*	getName()const {return "Convex";}
 
 	
 	virtual int	getNumVertices() const;
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp
new file mode 100644
index 00000000000..f828d28e18c
--- /dev/null
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp
@@ -0,0 +1,78 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+
+#include "btConvexInternalShape.h"
+
+
+btConvexInternalShape::btConvexInternalShape()
+: m_localScaling(btScalar(1.),btScalar(1.),btScalar(1.)),
+m_collisionMargin(CONVEX_DISTANCE_MARGIN)
+{
+}
+
+
+void	btConvexInternalShape::setLocalScaling(const btVector3& scaling)
+{
+	m_localScaling = scaling;
+}
+
+
+
+void	btConvexInternalShape::getAabbSlow(const btTransform& trans,btVector3&minAabb,btVector3&maxAabb) const
+{
+
+	btScalar margin = getMargin();
+	for (int i=0;i<3;i++)
+	{
+		btVector3 vec(btScalar(0.),btScalar(0.),btScalar(0.));
+		vec[i] = btScalar(1.);
+
+		btVector3 sv = localGetSupportingVertex(vec*trans.getBasis());
+
+		btVector3 tmp = trans(sv);
+		maxAabb[i] = tmp[i]+margin;
+		vec[i] = btScalar(-1.);
+		tmp = trans(localGetSupportingVertex(vec*trans.getBasis()));
+		minAabb[i] = tmp[i]-margin;
+	}
+};
+
+
+btVector3	btConvexInternalShape::localGetSupportingVertex(const btVector3& vec)const
+{
+#ifndef __SPU__
+
+	 btVector3	supVertex = localGetSupportingVertexWithoutMargin(vec);
+
+	if ( getMargin()!=btScalar(0.) )
+	{
+		btVector3 vecnorm = vec;
+		if (vecnorm .length2() < (SIMD_EPSILON*SIMD_EPSILON))
+		{
+			vecnorm.setValue(btScalar(-1.),btScalar(-1.),btScalar(-1.));
+		} 
+		vecnorm.normalize();
+		supVertex+= getMargin() * vecnorm;
+	}
+	return supVertex;
+
+#else
+	return btVector3(0,0,0);
+#endif //__SPU__
+
+ }
+
+
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.h
new file mode 100644
index 00000000000..9388ccf31f2
--- /dev/null
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.h
@@ -0,0 +1,98 @@
+
+#ifndef BT_CONVEX_INTERNAL_SHAPE_H
+#define BT_CONVEX_INTERNAL_SHAPE_H
+
+#include "btConvexShape.h"
+
+///The btConvexInternalShape is an internal base class, shared by most convex shape implementations.
+class btConvexInternalShape : public btConvexShape
+{
+
+	protected:
+
+	//local scaling. collisionMargin is not scaled !
+	btVector3	m_localScaling;
+
+	btVector3	m_implicitShapeDimensions;
+	
+	btScalar	m_collisionMargin;
+
+	btScalar	m_padding;
+
+public:
+
+	btConvexInternalShape();
+
+	virtual ~btConvexInternalShape()
+	{
+
+	}
+
+
+	virtual btVector3	localGetSupportingVertex(const btVector3& vec)const;
+#ifndef __SPU__
+	virtual btVector3	localGetSupportingVertexWithoutMargin(const btVector3& vec) const= 0;
+	
+	//notice that the vectors should be unit length
+	virtual void	batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors,btVector3* supportVerticesOut,int numVectors) const= 0;
+#endif //#ifndef __SPU__
+
+	const btVector3& getImplicitShapeDimensions() const
+	{
+		return m_implicitShapeDimensions;
+	}
+
+	///getAabb's default implementation is brute force, expected derived classes to implement a fast dedicated version
+	void getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const
+	{
+		getAabbSlow(t,aabbMin,aabbMax);
+	}
+
+
+	
+	virtual void getAabbSlow(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const;
+
+
+	virtual void	setLocalScaling(const btVector3& scaling);
+	virtual const btVector3& getLocalScaling() const 
+	{
+		return m_localScaling;
+	}
+
+	const btVector3& getLocalScalingNV() const 
+	{
+		return m_localScaling;
+	}
+
+	virtual void	setMargin(btScalar margin)
+	{
+		m_collisionMargin = margin;
+	}
+	virtual btScalar	getMargin() const
+	{
+		return m_collisionMargin;
+	}
+
+	btScalar	getMarginNV() const
+	{
+		return m_collisionMargin;
+	}
+
+	virtual int		getNumPreferredPenetrationDirections() const
+	{
+		return 0;
+	}
+	
+	virtual void	getPreferredPenetrationDirection(int index, btVector3& penetrationVector) const
+	{
+		(void)penetrationVector;
+		(void)index;
+		btAssert(0);
+	}
+
+
+	
+};
+
+
+#endif //BT_CONVEX_INTERNAL_SHAPE_H
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp
index 7edf1ea6db8..7afcccf8b03 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp
@@ -16,62 +16,3 @@ subject to the following restrictions:
 #include "btConvexShape.h"
 
 
-btConvexShape::btConvexShape()
-: m_localScaling(btScalar(1.),btScalar(1.),btScalar(1.)),
-m_collisionMargin(CONVEX_DISTANCE_MARGIN)
-{
-}
-
-
-void	btConvexShape::setLocalScaling(const btVector3& scaling)
-{
-	m_localScaling = scaling;
-}
-
-
-
-void	btConvexShape::getAabbSlow(const btTransform& trans,btVector3&minAabb,btVector3&maxAabb) const
-{
-
-	btScalar margin = getMargin();
-	for (int i=0;i<3;i++)
-	{
-		btVector3 vec(btScalar(0.),btScalar(0.),btScalar(0.));
-		vec[i] = btScalar(1.);
-
-		btVector3 sv = localGetSupportingVertex(vec*trans.getBasis());
-
-		btVector3 tmp = trans(sv);
-		maxAabb[i] = tmp[i]+margin;
-		vec[i] = btScalar(-1.);
-		tmp = trans(localGetSupportingVertex(vec*trans.getBasis()));
-		minAabb[i] = tmp[i]-margin;
-	}
-};
-
-
-btVector3	btConvexShape::localGetSupportingVertex(const btVector3& vec)const
-{
-#ifndef __SPU__
-
-	 btVector3	supVertex = localGetSupportingVertexWithoutMargin(vec);
-
-	if ( getMargin()!=btScalar(0.) )
-	{
-		btVector3 vecnorm = vec;
-		if (vecnorm .length2() < (SIMD_EPSILON*SIMD_EPSILON))
-		{
-			vecnorm.setValue(btScalar(-1.),btScalar(-1.),btScalar(-1.));
-		} 
-		vecnorm.normalize();
-		supVertex+= getMargin() * vecnorm;
-	}
-	return supVertex;
-
-#else
-	return btVector3(0,0,0);
-#endif //__SPU__
-
- }
-
-
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.h
index 746f383dfc7..e4eb7f6dbf6 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.h
@@ -18,37 +18,25 @@ subject to the following restrictions:
 
 #include "btCollisionShape.h"
 
-#include "../../LinearMath/btVector3.h"
-#include "../../LinearMath/btTransform.h"
-#include "../../LinearMath/btMatrix3x3.h"
+#include "LinearMath/btVector3.h"
+#include "LinearMath/btTransform.h"
+#include "LinearMath/btMatrix3x3.h"
 #include "btCollisionMargin.h"
+#include "LinearMath/btAlignedAllocator.h"
 
 //todo: get rid of this btConvexCastResult thing!
 struct btConvexCastResult;
 #define MAX_PREFERRED_PENETRATION_DIRECTIONS 10
 
-/// btConvexShape is an abstract shape interface.
-/// The explicit part provides plane-equations, the implicit part provides GetClosestPoint interface.
-/// used in combination with GJK or btConvexCast
+/// The btConvexShape is an abstract shape interface, implemented by all convex shapes such as btBoxShape, btConvexHullShape etc.
+/// It describes general convex shapes using the localGetSupportingVertex interface, used by collision detectors such as btGjkPairDetector.
 ATTRIBUTE_ALIGNED16(class) btConvexShape : public btCollisionShape
 {
 
-protected:
-
-	//local scaling. collisionMargin is not scaled !
-	btVector3	m_localScaling;
-
-	btVector3	m_implicitShapeDimensions;
-	
-	btScalar	m_collisionMargin;
-
-	btScalar	m_padding[2];
-
-
-
 
 public:
-	btConvexShape();
+
+	BT_DECLARE_ALIGNED_ALLOCATOR();
 
 	virtual ~btConvexShape()
 	{
@@ -56,7 +44,7 @@ public:
 	}
 
 
-	virtual btVector3	localGetSupportingVertex(const btVector3& vec)const;
+	virtual btVector3	localGetSupportingVertex(const btVector3& vec)const =0;
 #ifndef __SPU__
 	virtual btVector3	localGetSupportingVertexWithoutMargin(const btVector3& vec) const= 0;
 	
@@ -64,63 +52,24 @@ public:
 	virtual void	batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors,btVector3* supportVerticesOut,int numVectors) const= 0;
 #endif //#ifndef __SPU__
 
-	const btVector3& getImplicitShapeDimensions() const
-	{
-		return m_implicitShapeDimensions;
-	}
 
 	///getAabb's default implementation is brute force, expected derived classes to implement a fast dedicated version
-	void getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const
-	{
-		getAabbSlow(t,aabbMin,aabbMax);
-	}
+	void getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const =0;
 
+	virtual void getAabbSlow(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const =0;
 
+	virtual void	setLocalScaling(const btVector3& scaling) =0;
+	virtual const btVector3& getLocalScaling() const =0;
+
+	virtual void	setMargin(btScalar margin)=0;
+
+	virtual btScalar	getMargin() const=0;
+
+	virtual int		getNumPreferredPenetrationDirections() const=0;
 	
-	virtual void getAabbSlow(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const;
+	virtual void	getPreferredPenetrationDirection(int index, btVector3& penetrationVector) const=0;
 
-
-	virtual void	setLocalScaling(const btVector3& scaling);
-	virtual const btVector3& getLocalScaling() const 
-	{
-		return m_localScaling;
-	}
-
-	const btVector3& getLocalScalingNV() const 
-	{
-		return m_localScaling;
-	}
-
-	virtual void	setMargin(btScalar margin)
-	{
-		m_collisionMargin = margin;
-	}
-	virtual btScalar	getMargin() const
-	{
-		return m_collisionMargin;
-	}
-
-	btScalar	getMarginNV() const
-	{
-		return m_collisionMargin;
-	}
-
-	virtual int		getNumPreferredPenetrationDirections() const
-	{
-		return 0;
-	}
-	
-	virtual void	getPreferredPenetrationDirection(int index, btVector3& penetrationVector) const
-	{
-		(void)penetrationVector;
-		(void)index;
-		btAssert(0);
-	}
-
-
-
-}
-;
+};
 
 
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp
index 6941030b15f..f1682aaf65b 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp
@@ -19,10 +19,11 @@ subject to the following restrictions:
 #include "BulletCollision/CollisionShapes/btStridingMeshInterface.h"
 
 
-btConvexTriangleMeshShape ::btConvexTriangleMeshShape (btStridingMeshInterface* meshInterface)
+btConvexTriangleMeshShape ::btConvexTriangleMeshShape (btStridingMeshInterface* meshInterface, bool calcAabb)
 :m_stridingMesh(meshInterface)
 {
-	recalcLocalAabb();
+	if ( calcAabb )
+		recalcLocalAabb();
 }
 
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h
index 34ee7af744c..01eecf27811 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h
@@ -3,20 +3,24 @@
 
 
 #include "btPolyhedralConvexShape.h"
-#include "../BroadphaseCollision/btBroadphaseProxy.h" // for the types
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types
 
 
-/// btConvexTriangleMeshShape is a convex hull of a triangle mesh. If you just have a point cloud, you can use btConvexHullShape instead.
-/// It uses the btStridingMeshInterface instead of a point cloud. This can avoid the duplication of the triangle mesh data.
+/// The btConvexTriangleMeshShape is a convex hull of a triangle mesh, but the performance is not as good as btConvexHullShape.
+/// A small benefit of this class is that it uses the btStridingMeshInterface, so you can avoid the duplication of the triangle mesh data. Nevertheless, most users should use the much better performing btConvexHullShape instead.
 class btConvexTriangleMeshShape : public btPolyhedralConvexShape
 {
 
 	class btStridingMeshInterface*	m_stridingMesh;
 
 public:
-	btConvexTriangleMeshShape(btStridingMeshInterface* meshInterface);
+	btConvexTriangleMeshShape(btStridingMeshInterface* meshInterface, bool calcAabb = true);
 
-	class btStridingMeshInterface*	getStridingMesh()
+	class btStridingMeshInterface*	getMeshInterface()
+	{
+		return m_stridingMesh;
+	}
+	const class btStridingMeshInterface* getMeshInterface() const
 	{
 		return m_stridingMesh;
 	}
@@ -28,7 +32,7 @@ public:
 	virtual int	getShapeType()const { return CONVEX_TRIANGLEMESH_SHAPE_PROXYTYPE; }
 
 	//debugging
-	virtual char*	getName()const {return "ConvexTrimesh";}
+	virtual const char*	getName()const {return "ConvexTrimesh";}
 	
 	virtual int	getNumVertices() const;
 	virtual int getNumEdges() const;
@@ -49,3 +53,4 @@ public:
 #endif //CONVEX_TRIANGLEMESH_SHAPE_H
 
 
+
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.cpp
index 1666afb3b88..3afef1c7550 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.cpp
@@ -45,7 +45,7 @@ void btCylinderShape::getAabb(const btTransform& t,btVector3& aabbMin,btVector3&
 }
 
 
-inline btVector3 CylinderLocalSupportX(const btVector3& halfExtents,const btVector3& v) 
+SIMD_FORCE_INLINE btVector3 CylinderLocalSupportX(const btVector3& halfExtents,const btVector3& v) 
 {
 const int cylinderUpAxis = 0;
 const int XX = 1;
@@ -163,24 +163,24 @@ const int ZZ = 1;
 
 btVector3	btCylinderShapeX::localGetSupportingVertexWithoutMargin(const btVector3& vec)const
 {
-	return CylinderLocalSupportX(getHalfExtents(),vec);
+	return CylinderLocalSupportX(getHalfExtentsWithoutMargin(),vec);
 }
 
 
 btVector3	btCylinderShapeZ::localGetSupportingVertexWithoutMargin(const btVector3& vec)const
 {
-	return CylinderLocalSupportZ(getHalfExtents(),vec);
+	return CylinderLocalSupportZ(getHalfExtentsWithoutMargin(),vec);
 }
 btVector3	btCylinderShape::localGetSupportingVertexWithoutMargin(const btVector3& vec)const
 {
-	return CylinderLocalSupportY(getHalfExtents(),vec);
+	return CylinderLocalSupportY(getHalfExtentsWithoutMargin(),vec);
 }
 
 void	btCylinderShape::batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors,btVector3* supportVerticesOut,int numVectors) const
 {
 	for (int i=0;i<numVectors;i++)
 	{
-		supportVerticesOut[i] = CylinderLocalSupportY(getHalfExtents(),vectors[i]);
+		supportVerticesOut[i] = CylinderLocalSupportY(getHalfExtentsWithoutMargin(),vectors[i]);
 	}
 }
 
@@ -188,7 +188,7 @@ void	btCylinderShapeZ::batchedUnitVectorGetSupportingVertexWithoutMargin(const b
 {
 	for (int i=0;i<numVectors;i++)
 	{
-		supportVerticesOut[i] = CylinderLocalSupportZ(getHalfExtents(),vectors[i]);
+		supportVerticesOut[i] = CylinderLocalSupportZ(getHalfExtentsWithoutMargin(),vectors[i]);
 	}
 }
 
@@ -199,7 +199,7 @@ void	btCylinderShapeX::batchedUnitVectorGetSupportingVertexWithoutMargin(const b
 {
 	for (int i=0;i<numVectors;i++)
 	{
-		supportVerticesOut[i] = CylinderLocalSupportX(getHalfExtents(),vectors[i]);
+		supportVerticesOut[i] = CylinderLocalSupportX(getHalfExtentsWithoutMargin(),vectors[i]);
 	}
 }
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.h
index c78890c887a..30938acf7c7 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.h
@@ -17,10 +17,10 @@ subject to the following restrictions:
 #define CYLINDER_MINKOWSKI_H
 
 #include "btBoxShape.h"
-#include "../BroadphaseCollision/btBroadphaseProxy.h" // for the types
-#include "../../LinearMath/btVector3.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types
+#include "LinearMath/btVector3.h"
 
-/// implements cylinder shape interface
+/// The btCylinderShape class implements a cylinder shape primitive, centered around the origin. Its central axis aligned with the Y axis. btCylinderShapeX is aligned with the X axis and btCylinderShapeZ around the Z axis.
 class btCylinderShape : public btBoxShape
 
 {
@@ -60,7 +60,7 @@ public:
 
 
 	//use box inertia
-	//	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia);
+	//	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia) const;
 
 	virtual int	getShapeType() const
 	{
@@ -74,11 +74,11 @@ public:
 
 	virtual btScalar getRadius() const
 	{
-		return getHalfExtents().getX();
+		return getHalfExtentsWithMargin().getX();
 	}
 
 	//debugging
-	virtual char*	getName()const
+	virtual const char*	getName()const
 	{
 		return "CylinderY";
 	}
@@ -96,14 +96,14 @@ public:
 	virtual void	batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors,btVector3* supportVerticesOut,int numVectors) const;
 	
 		//debugging
-	virtual char*	getName()const
+	virtual const char*	getName()const
 	{
 		return "CylinderX";
 	}
 
 	virtual btScalar getRadius() const
 	{
-		return getHalfExtents().getY();
+		return getHalfExtentsWithMargin().getY();
 	}
 
 };
@@ -121,14 +121,14 @@ public:
 		return 2;
 	}
 		//debugging
-	virtual char*	getName()const
+	virtual const char*	getName()const
 	{
 		return "CylinderZ";
 	}
 
 	virtual btScalar getRadius() const
 	{
-		return getHalfExtents().getX();
+		return getHalfExtentsWithMargin().getX();
 	}
 
 };
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.cpp
index dcc486f194b..6954aad7917 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.cpp
@@ -40,7 +40,7 @@ void btEmptyShape::getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aa
 
 }
 
-void	btEmptyShape::calculateLocalInertia(btScalar ,btVector3& )
+void	btEmptyShape::calculateLocalInertia(btScalar ,btVector3& ) const
 {
 	btAssert(0);
 }
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.h
index 8ec53444976..d7d78407b61 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.h
@@ -18,16 +18,16 @@ subject to the following restrictions:
 
 #include "btConcaveShape.h"
 
-#include "../../LinearMath/btVector3.h"
-#include "../../LinearMath/btTransform.h"
-#include "../../LinearMath/btMatrix3x3.h"
+#include "LinearMath/btVector3.h"
+#include "LinearMath/btTransform.h"
+#include "LinearMath/btMatrix3x3.h"
 #include "btCollisionMargin.h"
 
 
 
 
-/// btEmptyShape is a collision shape without actual collision detection. 
-///It can be replaced by another shape during runtime
+/// The btEmptyShape is a collision shape without actual collision detection shape, so most users should ignore this class.
+/// It can be replaced by another shape during runtime, but the inertia tensor should be recomputed.
 class btEmptyShape	: public btConcaveShape
 {
 public:
@@ -49,12 +49,12 @@ public:
 		return m_localScaling;
 	}
 
-	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia);
+	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia) const;
 	
 	virtual int	getShapeType() const { return EMPTY_SHAPE_PROXYTYPE;}
 
 	
-	virtual char*	getName()const
+	virtual const char*	getName()const
 	{
 		return "Empty";
 	}
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp
index 94be43c88e2..9e4800a46fe 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp
@@ -18,16 +18,18 @@ subject to the following restrictions:
 #include "LinearMath/btTransformUtil.h"
 
 
-btHeightfieldTerrainShape::btHeightfieldTerrainShape(int width,int length,void* heightfieldData,btScalar maxHeight,int upAxis,bool useFloatData,bool flipQuadEdges)
-:m_localScaling(btScalar(1.),btScalar(1.),btScalar(1.)),
-m_width(width),
-m_length(length),
-m_heightfieldDataUnknown(heightfieldData),
+btHeightfieldTerrainShape::btHeightfieldTerrainShape(int heightStickWidth, int heightStickLength,void* heightfieldData,btScalar maxHeight,int upAxis,bool useFloatData,bool flipQuadEdges)
+: m_heightStickWidth(heightStickWidth),
+m_heightStickLength(heightStickLength),
 m_maxHeight(maxHeight),
-m_upAxis(upAxis),
+m_width((btScalar)heightStickWidth-1),
+m_length((btScalar)heightStickLength-1),
+m_heightfieldDataUnknown(heightfieldData),
 m_useFloatData(useFloatData),
 m_flipQuadEdges(flipQuadEdges),
-m_useDiamondSubdivision(false)
+m_useDiamondSubdivision(false),
+m_upAxis(upAxis),
+m_localScaling(btScalar(1.),btScalar(1.),btScalar(1.))
 {
 
 
@@ -43,25 +45,25 @@ m_useDiamondSubdivision(false)
 	case 0:
 		{
 			halfExtents.setValue(
-				m_maxHeight,
-				m_width,
-				m_length);
+				btScalar(m_maxHeight),
+				btScalar(m_width), //?? don't know if this should change
+				btScalar(m_length));
 			break;
 		}
 	case 1:
 		{
 			halfExtents.setValue(
-				m_width,
-				m_maxHeight,
-				m_length);
+				btScalar(m_width),
+				btScalar(m_maxHeight),
+				btScalar(m_length));
 			break;
 		};
 	case 2:
 		{
 			halfExtents.setValue(
-				m_width,
-				m_length,
-				m_maxHeight
+				btScalar(m_width),
+				btScalar(m_length),
+				btScalar(m_maxHeight)
 			);
 			break;
 		}
@@ -114,11 +116,11 @@ btScalar	btHeightfieldTerrainShape::getHeightFieldValue(int x,int y) const
 	btScalar val = 0.f;
 	if (m_useFloatData)
 	{
-		val = m_heightfieldDataFloat[(y*m_width)+x];
+		val = m_heightfieldDataFloat[(y*m_heightStickWidth)+x];
 	} else
 	{
 		//assume unsigned short int
-		unsigned char heightFieldValue = m_heightfieldDataUnsignedChar[(y*m_width)+x];
+		unsigned char heightFieldValue = m_heightfieldDataUnsignedChar[(y*m_heightStickWidth)+x];
 		val = heightFieldValue* (m_maxHeight/btScalar(65535));
 	}
 	return val;
@@ -133,8 +135,8 @@ void	btHeightfieldTerrainShape::getVertex(int x,int y,btVector3& vertex) const
 
 	btAssert(x>=0);
 	btAssert(y>=0);
-	btAssert(x<m_width);
-	btAssert(y<m_length);
+	btAssert(x<m_heightStickWidth);
+	btAssert(y<m_heightStickLength);
 
 
 	btScalar	height = getHeightFieldValue(x,y);
@@ -145,25 +147,25 @@ void	btHeightfieldTerrainShape::getVertex(int x,int y,btVector3& vertex) const
 		{
 		vertex.setValue(
 			height,
-			(-m_width/2 ) + x,
-			(-m_length/2 ) + y
+			(-m_width/btScalar(2.0)) + x,
+			(-m_length/btScalar(2.0) ) + y
 			);
 			break;
 		}
 	case 1:
 		{
 			vertex.setValue(
-			(-m_width/2 ) + x,
+			(-m_width/btScalar(2.0)) + x,
 			height,
-			(-m_length/2 ) + y
+			(-m_length/btScalar(2.0)) + y
 			);
 			break;
 		};
 	case 2:
 		{
 			vertex.setValue(
-			(-m_width/2 ) + x,
-			(-m_length/2 ) + y,
+			(-m_width/btScalar(2.0)) + x,
+			(-m_length/btScalar(2.0)) + y,
 			height
 			);
 			break;
@@ -180,21 +182,20 @@ void	btHeightfieldTerrainShape::getVertex(int x,int y,btVector3& vertex) const
 }
 
 
-void btHeightfieldTerrainShape::quantizeWithClamp(int* out, const btVector3& point) const
+void btHeightfieldTerrainShape::quantizeWithClamp(int* out, const btVector3& point,int /*isMax*/) const
 {
-	
-
 	btVector3 clampedPoint(point);
 	clampedPoint.setMax(m_localAabbMin);
 	clampedPoint.setMin(m_localAabbMax);
 
-	btVector3 v = (clampedPoint );// * m_quantization;
-
-	out[0] = (int)(v.getX());
-	out[1] = (int)(v.getY());
-	out[2] = (int)(v.getZ());
-	//correct for
+	btVector3 v = (clampedPoint);// - m_bvhAabbMin) * m_bvhQuantization;
 
+	//TODO: optimization: check out how to removed this btFabs
+		
+	out[0] = (int)(v.getX() + v.getX() / btFabs(v.getX())* btScalar(0.5) );
+	out[1] = (int)(v.getY() + v.getY() / btFabs(v.getY())* btScalar(0.5) );
+	out[2] = (int)(v.getZ() + v.getZ() / btFabs(v.getZ())* btScalar(0.5) );
+	
 }
 
 
@@ -212,24 +213,24 @@ void	btHeightfieldTerrainShape::processAllTriangles(btTriangleCallback* callback
 	btVector3	localAabbMin = aabbMin*btVector3(1.f/m_localScaling[0],1.f/m_localScaling[1],1.f/m_localScaling[2]);
 	btVector3	localAabbMax = aabbMax*btVector3(1.f/m_localScaling[0],1.f/m_localScaling[1],1.f/m_localScaling[2]);
 	
-	quantizeWithClamp(quantizedAabbMin, localAabbMin);
-	quantizeWithClamp(quantizedAabbMax, localAabbMax);
+	quantizeWithClamp(quantizedAabbMin, localAabbMin,0);
+	quantizeWithClamp(quantizedAabbMax, localAabbMax,1);
 	
 	
 
 	int startX=0;
-	int endX=m_width-1;
+	int endX=m_heightStickWidth-1;
 	int startJ=0;
-	int endJ=m_length-1;
+	int endJ=m_heightStickLength-1;
 
 	switch (m_upAxis)
 	{
 	case 0:
 		{
-			quantizedAabbMin[1]+=m_width/2-1;
-			quantizedAabbMax[1]+=m_width/2+1;
-			quantizedAabbMin[2]+=m_length/2-1;
-			quantizedAabbMax[2]+=m_length/2+1;
+			quantizedAabbMin[1]+=m_heightStickWidth/2-1;
+			quantizedAabbMax[1]+=m_heightStickWidth/2+1;
+			quantizedAabbMin[2]+=m_heightStickLength/2-1;
+			quantizedAabbMax[2]+=m_heightStickLength/2+1;
 
 			if (quantizedAabbMin[1]>startX)
 				startX = quantizedAabbMin[1];
@@ -243,10 +244,10 @@ void	btHeightfieldTerrainShape::processAllTriangles(btTriangleCallback* callback
 		}
 	case 1:
 		{
-			quantizedAabbMin[0]+=m_width/2-1;
-			quantizedAabbMax[0]+=m_width/2+1;
-			quantizedAabbMin[2]+=m_length/2-1;
-			quantizedAabbMax[2]+=m_length/2+1;
+			quantizedAabbMin[0]+=m_heightStickWidth/2-1;
+			quantizedAabbMax[0]+=m_heightStickWidth/2+1;
+			quantizedAabbMin[2]+=m_heightStickLength/2-1;
+			quantizedAabbMax[2]+=m_heightStickLength/2+1;
 
 			if (quantizedAabbMin[0]>startX)
 				startX = quantizedAabbMin[0];
@@ -260,10 +261,10 @@ void	btHeightfieldTerrainShape::processAllTriangles(btTriangleCallback* callback
 		};
 	case 2:
 		{
-			quantizedAabbMin[0]+=m_width/2-1;
-			quantizedAabbMax[0]+=m_width/2+1;
-			quantizedAabbMin[1]+=m_length/2-1;
-			quantizedAabbMax[1]+=m_length/2+1;
+			quantizedAabbMin[0]+=m_heightStickWidth/2-1;
+			quantizedAabbMax[0]+=m_heightStickWidth/2+1;
+			quantizedAabbMin[1]+=m_heightStickLength/2-1;
+			quantizedAabbMax[1]+=m_heightStickLength/2+1;
 
 			if (quantizedAabbMin[0]>startX)
 				startX = quantizedAabbMin[0];
@@ -290,7 +291,7 @@ void	btHeightfieldTerrainShape::processAllTriangles(btTriangleCallback* callback
 		for(int x=startX; x<endX; x++)
 		{
 			btVector3 vertices[3];
-			if (m_flipQuadEdges || (m_useDiamondSubdivision && ((j+x) & 1)))
+			if (m_flipQuadEdges || (m_useDiamondSubdivision && !((j+x) & 1)))
 			{
         //first triangle
         getVertex(x,j,vertices[0]);
@@ -322,7 +323,7 @@ void	btHeightfieldTerrainShape::processAllTriangles(btTriangleCallback* callback
 
 }
 
-void	btHeightfieldTerrainShape::calculateLocalInertia(btScalar ,btVector3& inertia)
+void	btHeightfieldTerrainShape::calculateLocalInertia(btScalar ,btVector3& inertia) const
 {
 	//moving concave objects not supported
 	
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h
index 49f3e106733..d6890fe6b97 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h
@@ -18,7 +18,8 @@ subject to the following restrictions:
 
 #include "btConcaveShape.h"
 
-///btHeightfieldTerrainShape simulates a 2D heightfield terrain 
+///The btHeightfieldTerrainShape simulates a 2D heightfield terrain collision shape. You can also use the more general btBvhTriangleMeshShape instead.
+///An example implementation of btHeightfieldTerrainShape is provided in Demos/VehicleDemo/VehicleDemo.cpp
 class btHeightfieldTerrainShape : public btConcaveShape
 {
 protected:
@@ -26,9 +27,11 @@ protected:
 	btVector3	m_localAabbMax;
 	
 	///terrain data
-	int	m_width;
-	int m_length;
+	int	m_heightStickWidth;
+	int m_heightStickLength;
 	btScalar	m_maxHeight;
+	btScalar m_width;
+	btScalar m_length;
 	union
 	{
 		unsigned char*	m_heightfieldDataUnsignedChar;
@@ -45,7 +48,7 @@ protected:
 	btVector3	m_localScaling;
 
 	virtual btScalar	getHeightFieldValue(int x,int y) const;
-	void		quantizeWithClamp(int* out, const btVector3& point) const;
+	void		quantizeWithClamp(int* out, const btVector3& point,int isMax) const;
 	void		getVertex(int x,int y,btVector3& vertex) const;
 
 	inline bool testQuantizedAabbAgainstQuantizedAabb(int* aabbMin1, int* aabbMax1,const  int* aabbMin2,const  int* aabbMax2) const
@@ -58,7 +61,7 @@ protected:
 	}
 
 public:
-	btHeightfieldTerrainShape(int width,int height,void* heightfieldData, btScalar maxHeight,int upAxis,bool useFloatData,bool flipQuadEdges);
+	btHeightfieldTerrainShape(int heightStickWidth,int heightStickHeight,void* heightfieldData, btScalar maxHeight,int upAxis,bool useFloatData,bool flipQuadEdges);
 
 	virtual ~btHeightfieldTerrainShape();
 
@@ -74,14 +77,14 @@ public:
 
 	virtual void	processAllTriangles(btTriangleCallback* callback,const btVector3& aabbMin,const btVector3& aabbMax) const;
 
-	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia);
+	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia) const;
 
 	virtual void	setLocalScaling(const btVector3& scaling);
 	
 	virtual const btVector3& getLocalScaling() const;
 	
 	//debugging
-	virtual char*	getName()const {return "HEIGHTFIELD";}
+	virtual const char*	getName()const {return "HEIGHTFIELD";}
 
 };
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btMaterial.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btMaterial.h
new file mode 100644
index 00000000000..7cb6d5ab6fe
--- /dev/null
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btMaterial.h
@@ -0,0 +1,34 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2008 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+/// This file was created by Alex Silverman
+
+#ifndef MATERIAL_H
+#define MATERIAL_H
+
+// Material class to be used by btMultimaterialTriangleMeshShape to store triangle properties
+class btMaterial
+{
+    // public members so that materials can change due to world events
+public:
+    btScalar m_friction;
+    btScalar m_restitution;
+    int pad[2];
+
+    btMaterial(){}
+    btMaterial(btScalar fric, btScalar rest) { m_friction = fric; m_restitution = rest; }
+};
+
+#endif // MATERIAL_H
\ No newline at end of file
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp
index 015314bc09f..8f893ac98aa 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp
@@ -26,9 +26,9 @@ m_shapeB(shapeB)
 
 btVector3 btMinkowskiSumShape::localGetSupportingVertexWithoutMargin(const btVector3& vec)const
 {
-	btVector3 supVertexA = m_transA(m_shapeA->localGetSupportingVertexWithoutMargin(vec*m_transA.getBasis()));
+	btVector3 supVertexA = m_transA(m_shapeA->localGetSupportingVertexWithoutMargin(-vec*m_transA.getBasis()));
 	btVector3 supVertexB = m_transB(m_shapeB->localGetSupportingVertexWithoutMargin(vec*m_transB.getBasis()));
-	return supVertexA + supVertexB;
+	return  supVertexA - supVertexB;
 }
 
 void	btMinkowskiSumShape::batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors,btVector3* supportVerticesOut,int numVectors) const
@@ -49,7 +49,7 @@ btScalar	btMinkowskiSumShape::getMargin() const
 }
 
 
-void	btMinkowskiSumShape::calculateLocalInertia(btScalar mass,btVector3& inertia)
+void	btMinkowskiSumShape::calculateLocalInertia(btScalar mass,btVector3& inertia) const
 {
 	(void)mass;
 	btAssert(0);
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h
index 198faaff9f9..f9c8427c2f3 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h
@@ -16,11 +16,11 @@ subject to the following restrictions:
 #ifndef MINKOWSKI_SUM_SHAPE_H
 #define MINKOWSKI_SUM_SHAPE_H
 
-#include "btConvexShape.h"
-#include "../BroadphaseCollision/btBroadphaseProxy.h" // for the types
+#include "btConvexInternalShape.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types
 
-/// btMinkowskiSumShape represents implicit (getSupportingVertex) based minkowski sum of two convex implicit shapes.
-class btMinkowskiSumShape : public btConvexShape
+/// The btMinkowskiSumShape is only for advanced users. This shape represents implicit based minkowski sum of two convex implicit shapes.
+class btMinkowskiSumShape : public btConvexInternalShape
 {
 
 	btTransform	m_transA;
@@ -37,7 +37,7 @@ public:
 	virtual void	batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors,btVector3* supportVerticesOut,int numVectors) const;
 
 
-	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia);
+	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia) const;
 
 	void	setTransformA(const btTransform&	transA) { m_transA = transA;}
 	void	setTransformB(const btTransform&	transB) { m_transB = transB;}
@@ -53,7 +53,7 @@ public:
 	const btConvexShape*	getShapeA() const { return m_shapeA;}
 	const btConvexShape*	getShapeB() const { return m_shapeB;}
 
-	virtual char*	getName()const 
+	virtual const char*	getName()const 
 	{
 		return "MinkowskiSum";
 	}
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp
index 6015a618082..c709205efc2 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp
@@ -47,7 +47,7 @@ btMultiSphereShape::btMultiSphereShape (const btVector3& inertiaHalfExtents,cons
 
 	btVector3 vec = vec0;
 	btScalar lenSqr = vec.length2();
-	if (lenSqr < btScalar(0.0001))
+	if (lenSqr < (SIMD_EPSILON*SIMD_EPSILON))
 	{
 		vec.setValue(1,0,0);
 	} else
@@ -116,7 +116,7 @@ btMultiSphereShape::btMultiSphereShape (const btVector3& inertiaHalfExtents,cons
 
 
 
-void	btMultiSphereShape::calculateLocalInertia(btScalar mass,btVector3& inertia)
+void	btMultiSphereShape::calculateLocalInertia(btScalar mass,btVector3& inertia) const
 {
 	//as an approximation, take the inertia of the box that bounds the spheres
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.h
index 1897b474057..45968f3947f 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.h
@@ -16,13 +16,14 @@ subject to the following restrictions:
 #ifndef MULTI_SPHERE_MINKOWSKI_H
 #define MULTI_SPHERE_MINKOWSKI_H
 
-#include "btConvexShape.h"
-#include "../BroadphaseCollision/btBroadphaseProxy.h" // for the types
+#include "btConvexInternalShape.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types
 
 #define MAX_NUM_SPHERES 5
 
-///btMultiSphereShape represents implicit convex hull of a collection of spheres (using getSupportingVertex)
-class btMultiSphereShape : public btConvexShape
+///The btMultiSphereShape represents the convex hull of a collection of spheres. You can create special capsules or other smooth volumes.
+///It is possible to animate the spheres for deformation.
+class btMultiSphereShape : public btConvexInternalShape
 
 {
 	
@@ -39,7 +40,7 @@ public:
 	btMultiSphereShape (const btVector3& inertiaHalfExtents,const btVector3* positions,const btScalar* radi,int numSpheres);
 
 	///CollisionShape Interface
-	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia);
+	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia) const;
 
 	/// btConvexShape Interface
 	virtual btVector3	localGetSupportingVertexWithoutMargin(const btVector3& vec)const;
@@ -63,7 +64,7 @@ public:
 
 	virtual int	getShapeType() const { return MULTI_SPHERE_SHAPE_PROXYTYPE; }
 
-	virtual char*	getName()const 
+	virtual const char*	getName()const 
 	{
 		return "MultiSphere";
 	}
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp
new file mode 100644
index 00000000000..fc47e86411d
--- /dev/null
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp
@@ -0,0 +1,45 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2008 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+/// This file was created by Alex Silverman
+
+#include "BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h"
+#include "BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h"
+//#include "BulletCollision/CollisionShapes/btOptimizedBvh.h"
+
+
+///Obtains the material for a specific triangle
+const btMaterial * btMultimaterialTriangleMeshShape::getMaterialProperties(int partID, int triIndex)
+{
+    const unsigned char * materialBase = 0;
+    int numMaterials;
+    PHY_ScalarType materialType;
+    int materialStride;
+    const unsigned char * triangleMaterialBase = 0;
+    int numTriangles;
+    int triangleMaterialStride;
+    PHY_ScalarType triangleType;
+
+    ((btTriangleIndexVertexMaterialArray*)m_meshInterface)->getLockedReadOnlyMaterialBase(&materialBase, numMaterials, materialType, materialStride,
+        &triangleMaterialBase, numTriangles, triangleMaterialStride, triangleType, partID);
+
+    // return the pointer to the place with the friction for the triangle
+    // TODO: This depends on whether it's a moving mesh or not
+    // BUG IN GIMPACT
+    //return (btScalar*)(&materialBase[triangleMaterialBase[(triIndex-1) * triangleMaterialStride] * materialStride]);
+    int * matInd = (int *)(&(triangleMaterialBase[(triIndex * triangleMaterialStride)]));
+    btMaterial *matVal = (btMaterial *)(&(materialBase[*matInd * materialStride]));
+    return (matVal);
+}
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h
new file mode 100644
index 00000000000..2f108020cdf
--- /dev/null
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h
@@ -0,0 +1,124 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2008 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+/// This file was created by Alex Silverman
+
+#ifndef BVH_TRIANGLE_MATERIAL_MESH_SHAPE_H
+#define BVH_TRIANGLE_MATERIAL_MESH_SHAPE_H
+
+#include "btBvhTriangleMeshShape.h"
+#include "btMaterial.h"
+
+///The BvhTriangleMaterialMeshShape extends the btBvhTriangleMeshShape. Its main contribution is the interface into a material array, which allows per-triangle friction and restitution.
+ATTRIBUTE_ALIGNED16(class) btMultimaterialTriangleMeshShape : public btBvhTriangleMeshShape
+{
+    btAlignedObjectArray <btMaterial*> m_materialList;
+    int ** m_triangleMaterials;
+
+public:
+
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+    btMultimaterialTriangleMeshShape(): btBvhTriangleMeshShape() {}
+    btMultimaterialTriangleMeshShape(btStridingMeshInterface* meshInterface, bool useQuantizedAabbCompression, bool buildBvh = true):
+        btBvhTriangleMeshShape(meshInterface, useQuantizedAabbCompression, buildBvh)
+        {
+            btVector3 m_triangle[3];
+            const unsigned char *vertexbase;
+            int numverts;
+            PHY_ScalarType type;
+            int stride;
+            const unsigned char *indexbase;
+            int indexstride;
+            int numfaces;
+            PHY_ScalarType indicestype;
+
+            //m_materialLookup = (int**)(btAlignedAlloc(sizeof(int*) * meshInterface->getNumSubParts(), 16));
+
+            for(int i = 0; i < meshInterface->getNumSubParts(); i++)
+            {
+                m_meshInterface->getLockedReadOnlyVertexIndexBase(
+                    &vertexbase,
+                    numverts,
+                    type,
+                    stride,
+                    &indexbase,
+                    indexstride,
+                    numfaces,
+                    indicestype,
+                    i);
+                //m_materialLookup[i] = (int*)(btAlignedAlloc(sizeof(int) * numfaces, 16));
+            }
+        }
+
+	///optionally pass in a larger bvh aabb, used for quantization. This allows for deformations within this aabb
+	btMultimaterialTriangleMeshShape(btStridingMeshInterface* meshInterface, bool useQuantizedAabbCompression,const btVector3& bvhAabbMin,const btVector3& bvhAabbMax, bool buildBvh = true):
+        btBvhTriangleMeshShape(meshInterface, useQuantizedAabbCompression, bvhAabbMin, bvhAabbMax, buildBvh)
+        {
+            btVector3 m_triangle[3];
+            const unsigned char *vertexbase;
+            int numverts;
+            PHY_ScalarType type;
+            int stride;
+            const unsigned char *indexbase;
+            int indexstride;
+            int numfaces;
+            PHY_ScalarType indicestype;
+
+            //m_materialLookup = (int**)(btAlignedAlloc(sizeof(int*) * meshInterface->getNumSubParts(), 16));
+
+            for(int i = 0; i < meshInterface->getNumSubParts(); i++)
+            {
+                m_meshInterface->getLockedReadOnlyVertexIndexBase(
+                    &vertexbase,
+                    numverts,
+                    type,
+                    stride,
+                    &indexbase,
+                    indexstride,
+                    numfaces,
+                    indicestype,
+                    i);
+                //m_materialLookup[i] = (int*)(btAlignedAlloc(sizeof(int) * numfaces * 2, 16));
+            }
+        }
+	
+    virtual ~btMultimaterialTriangleMeshShape()
+    {
+/*
+        for(int i = 0; i < m_meshInterface->getNumSubParts(); i++)
+        {
+            btAlignedFree(m_materialValues[i]);
+            m_materialLookup[i] = NULL;
+        }
+        btAlignedFree(m_materialValues);
+        m_materialLookup = NULL;
+*/
+    }
+	virtual int	getShapeType() const
+	{
+		return MULTIMATERIAL_TRIANGLE_MESH_PROXYTYPE;
+	}
+	
+	//debugging
+	virtual const char*	getName()const {return "MULTIMATERIALTRIANGLEMESH";}
+
+    ///Obtains the material for a specific triangle
+    const btMaterial * getMaterialProperties(int partID, int triIndex);
+
+}
+;
+
+#endif //BVH_TRIANGLE_MATERIAL_MESH_SHAPE_H
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp
index 44438a24455..9b78fc0f7c2 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp
@@ -19,13 +19,12 @@ subject to the following restrictions:
 #include "LinearMath/btIDebugDraw.h"
 
 
-
-btOptimizedBvh::btOptimizedBvh() : m_useQuantization(false), 
-					m_traversalMode(TRAVERSAL_STACKLESS_CACHE_FRIENDLY)
-					//m_traversalMode(TRAVERSAL_STACKLESS)
-					//m_traversalMode(TRAVERSAL_RECURSIVE)
+btOptimizedBvh::btOptimizedBvh()
 { 
+}
 
+btOptimizedBvh::~btOptimizedBvh()
+{
 }
 
 
@@ -80,7 +79,7 @@ void btOptimizedBvh::build(btStridingMeshInterface* triangles, bool useQuantized
 	struct	QuantizedNodeTriangleCallback : public btInternalTriangleIndexCallback
 	{
 		QuantizedNodeArray&	m_triangleNodes;
-		const btOptimizedBvh* m_optimizedTree; // for quantization
+		const btQuantizedBvh* m_optimizedTree; // for quantization
 
 		QuantizedNodeTriangleCallback& operator=(QuantizedNodeTriangleCallback& other)
 		{
@@ -89,14 +88,16 @@ void btOptimizedBvh::build(btStridingMeshInterface* triangles, bool useQuantized
 			return *this;
 		}
 
-		QuantizedNodeTriangleCallback(QuantizedNodeArray&	triangleNodes,const btOptimizedBvh* tree)
+		QuantizedNodeTriangleCallback(QuantizedNodeArray&	triangleNodes,const btQuantizedBvh* tree)
 			:m_triangleNodes(triangleNodes),m_optimizedTree(tree)
 		{
 		}
 
 		virtual void internalProcessTriangleIndex(btVector3* triangle,int partId,int  triangleIndex)
 		{
-			btAssert(partId==0);
+			// The partId and triangle index must fit in the same (positive) integer
+			btAssert(partId < (1<<MAX_NUM_PARTS_IN_BITS));
+			btAssert(triangleIndex < (1<<(31-MAX_NUM_PARTS_IN_BITS)));
 			//negative indices are reserved for escapeIndex
 			btAssert(triangleIndex>=0);
 
@@ -111,10 +112,29 @@ void btOptimizedBvh::build(btStridingMeshInterface* triangles, bool useQuantized
 			aabbMin.setMin(triangle[2]);
 			aabbMax.setMax(triangle[2]);
 
-			m_optimizedTree->quantizeWithClamp(&node.m_quantizedAabbMin[0],aabbMin);
-			m_optimizedTree->quantizeWithClamp(&node.m_quantizedAabbMax[0],aabbMax);
+			//PCK: add these checks for zero dimensions of aabb
+			const btScalar MIN_AABB_DIMENSION = btScalar(0.002);
+			const btScalar MIN_AABB_HALF_DIMENSION = btScalar(0.001);
+			if (aabbMax.x() - aabbMin.x() < MIN_AABB_DIMENSION)
+			{
+				aabbMax.setX(aabbMax.x() + MIN_AABB_HALF_DIMENSION);
+				aabbMin.setX(aabbMin.x() - MIN_AABB_HALF_DIMENSION);
+			}
+			if (aabbMax.y() - aabbMin.y() < MIN_AABB_DIMENSION)
+			{
+				aabbMax.setY(aabbMax.y() + MIN_AABB_HALF_DIMENSION);
+				aabbMin.setY(aabbMin.y() - MIN_AABB_HALF_DIMENSION);
+			}
+			if (aabbMax.z() - aabbMin.z() < MIN_AABB_DIMENSION)
+			{
+				aabbMax.setZ(aabbMax.z() + MIN_AABB_HALF_DIMENSION);
+				aabbMin.setZ(aabbMin.z() - MIN_AABB_HALF_DIMENSION);
+			}
 
-			node.m_escapeIndexOrTriangleIndex = triangleIndex;
+			m_optimizedTree->quantize(&node.m_quantizedAabbMin[0],aabbMin,0);
+			m_optimizedTree->quantize(&node.m_quantizedAabbMax[0],aabbMax,1);
+
+			node.m_escapeIndexOrTriangleIndex = (partId<<(31-MAX_NUM_PARTS_IN_BITS)) | triangleIndex;
 
 			m_triangleNodes.push_back(node);
 		}
@@ -170,10 +190,45 @@ void btOptimizedBvh::build(btStridingMeshInterface* triangles, bool useQuantized
 		subtree.m_rootNodeIndex = 0;
 		subtree.m_subtreeSize = m_quantizedContiguousNodes[0].isLeafNode() ? 1 : m_quantizedContiguousNodes[0].getEscapeIndex();
 	}
+
+	//PCK: update the copy of the size
+	m_subtreeHeaderCount = m_SubtreeHeaders.size();
+
+	//PCK: clear m_quantizedLeafNodes and m_leafNodes, they are temporary
+	m_quantizedLeafNodes.clear();
+	m_leafNodes.clear();
 }
 
 
 
+
+void	btOptimizedBvh::refit(btStridingMeshInterface* meshInterface,const btVector3& aabbMin,const btVector3& aabbMax)
+{
+	if (m_useQuantization)
+	{
+
+		setQuantizationValues(aabbMin,aabbMax);
+
+		updateBvhNodes(meshInterface,0,m_curNodeIndex,0);
+
+		///now update all subtree headers
+
+		int i;
+		for (i=0;i<m_SubtreeHeaders.size();i++)
+		{
+			btBvhSubtreeInfo& subtree = m_SubtreeHeaders[i];
+			subtree.setAabbFromQuantizeNode(m_quantizedContiguousNodes[subtree.m_rootNodeIndex]);
+		}
+
+	} else
+	{
+
+	}
+}
+
+
+
+
 void	btOptimizedBvh::refitPartial(btStridingMeshInterface* meshInterface,const btVector3& aabbMin,const btVector3& aabbMax)
 {
 	//incrementally initialize quantization values
@@ -193,16 +248,17 @@ void	btOptimizedBvh::refitPartial(btStridingMeshInterface* meshInterface,const b
 	unsigned short	quantizedQueryAabbMin[3];
 	unsigned short	quantizedQueryAabbMax[3];
 
-	quantizeWithClamp(&quantizedQueryAabbMin[0],aabbMin);
-	quantizeWithClamp(&quantizedQueryAabbMax[0],aabbMax);
+	quantize(&quantizedQueryAabbMin[0],aabbMin,0);
+	quantize(&quantizedQueryAabbMax[0],aabbMax,1);
 
 	int i;
 	for (i=0;i<this->m_SubtreeHeaders.size();i++)
 	{
 		btBvhSubtreeInfo& subtree = m_SubtreeHeaders[i];
 
-		bool overlap = testQuantizedAabbAgainstQuantizedAabb(quantizedQueryAabbMin,quantizedQueryAabbMax,subtree.m_quantizedAabbMin,subtree.m_quantizedAabbMax);
-		if (overlap)
+		//PCK: unsigned instead of bool
+		unsigned overlap = testQuantizedAabbAgainstQuantizedAabb(quantizedQueryAabbMin,quantizedQueryAabbMax,subtree.m_quantizedAabbMin,subtree.m_quantizedAabbMax);
+		if (overlap != 0)
 		{
 			updateBvhNodes(meshInterface,subtree.m_rootNodeIndex,subtree.m_rootNodeIndex+subtree.m_subtreeSize,i);
 
@@ -212,36 +268,23 @@ void	btOptimizedBvh::refitPartial(btStridingMeshInterface* meshInterface,const b
 	
 }
 
-///just for debugging, to visualize the individual patches/subtrees
-#ifdef DEBUG_PATCH_COLORS
-btVector3 color[4]=
-{
-	btVector3(255,0,0),
-	btVector3(0,255,0),
-	btVector3(0,0,255),
-	btVector3(0,255,255)
-};
-#endif //DEBUG_PATCH_COLORS
-
-
 void	btOptimizedBvh::updateBvhNodes(btStridingMeshInterface* meshInterface,int firstNode,int endNode,int index)
 {
 	(void)index;
 
 	btAssert(m_useQuantization);
 
-	int nodeSubPart=0;
+	int curNodeSubPart=-1;
 
 	//get access info to trianglemesh data
-		const unsigned char *vertexbase;
-		int numverts;
-		PHY_ScalarType type;
-		int stride;
-		const unsigned char *indexbase;
-		int indexstride;
-		int numfaces;
-		PHY_ScalarType indicestype;
-		meshInterface->getLockedReadOnlyVertexIndexBase(&vertexbase,numverts,	type,stride,&indexbase,indexstride,numfaces,indicestype,nodeSubPart);
+		const unsigned char *vertexbase = 0;
+		int numverts = 0;
+		PHY_ScalarType type = PHY_INTEGER;
+		int stride = 0;
+		const unsigned char *indexbase = 0;
+		int indexstride = 0;
+		int numfaces = 0;
+		PHY_ScalarType indicestype = PHY_INTEGER;
 
 		btVector3	triangleVerts[3];
 		btVector3	aabbMin,aabbMax;
@@ -256,16 +299,24 @@ void	btOptimizedBvh::updateBvhNodes(btStridingMeshInterface* meshInterface,int f
 			if (curNode.isLeafNode())
 			{
 				//recalc aabb from triangle data
+				int nodeSubPart = curNode.getPartId();
 				int nodeTriangleIndex = curNode.getTriangleIndex();
+				if (nodeSubPart != curNodeSubPart)
+				{
+					if (curNodeSubPart >= 0)
+						meshInterface->unLockReadOnlyVertexBase(curNodeSubPart);
+					meshInterface->getLockedReadOnlyVertexIndexBase(&vertexbase,numverts,	type,stride,&indexbase,indexstride,numfaces,indicestype,nodeSubPart);
+					btAssert(indicestype==PHY_INTEGER||indicestype==PHY_SHORT);
+				}
 				//triangles->getLockedReadOnlyVertexIndexBase(vertexBase,numVerts,
 
-				int* gfxbase = (int*)(indexbase+nodeTriangleIndex*indexstride);
+				unsigned int* gfxbase = (unsigned int*)(indexbase+nodeTriangleIndex*indexstride);
 				
 				
 				for (int j=2;j>=0;j--)
 				{
 					
-					int graphicsindex = gfxbase[j];
+					int graphicsindex = indicestype==PHY_SHORT?((unsigned short*)gfxbase)[j]:gfxbase[j];
 					btScalar* graphicsbase = (btScalar*)(vertexbase+graphicsindex*stride);
 #ifdef DEBUG_PATCH_COLORS
 					btVector3 mycolor = color[index&3];
@@ -292,8 +343,8 @@ void	btOptimizedBvh::updateBvhNodes(btStridingMeshInterface* meshInterface,int f
 				aabbMin.setMin(triangleVerts[2]);
 				aabbMax.setMax(triangleVerts[2]);
 
-				quantizeWithClamp(&curNode.m_quantizedAabbMin[0],aabbMin);
-				quantizeWithClamp(&curNode.m_quantizedAabbMax[0],aabbMax);
+				quantize(&curNode.m_quantizedAabbMin[0],aabbMin,0);
+				quantize(&curNode.m_quantizedAabbMax[0],aabbMax,1);
 				
 			} else
 			{
@@ -321,525 +372,17 @@ void	btOptimizedBvh::updateBvhNodes(btStridingMeshInterface* meshInterface,int f
 
 		}
 
-		meshInterface->unLockReadOnlyVertexBase(nodeSubPart);
+		if (curNodeSubPart >= 0)
+			meshInterface->unLockReadOnlyVertexBase(curNodeSubPart);
 
 		
 }
 
-void	btOptimizedBvh::setQuantizationValues(const btVector3& bvhAabbMin,const btVector3& bvhAabbMax,btScalar quantizationMargin)
+///deSerializeInPlace loads and initializes a BVH from a buffer in memory 'in place'
+btOptimizedBvh* btOptimizedBvh::deSerializeInPlace(void *i_alignedDataBuffer, unsigned int i_dataBufferSize, bool i_swapEndian)
 {
-	//enlarge the AABB to avoid division by zero when initializing the quantization values
-	btVector3 clampValue(quantizationMargin,quantizationMargin,quantizationMargin);
-	m_bvhAabbMin = bvhAabbMin - clampValue;
-	m_bvhAabbMax = bvhAabbMax + clampValue;
-	btVector3 aabbSize = m_bvhAabbMax - m_bvhAabbMin;
-	m_bvhQuantization = btVector3(btScalar(65535.0),btScalar(65535.0),btScalar(65535.0)) / aabbSize;
-}
-
-
-void	btOptimizedBvh::refit(btStridingMeshInterface* meshInterface)
-{
-	if (m_useQuantization)
-	{
-		//calculate new aabb
-		btVector3 aabbMin,aabbMax;
-		meshInterface->calculateAabbBruteForce(aabbMin,aabbMax);
-
-		setQuantizationValues(aabbMin,aabbMax);
-
-		updateBvhNodes(meshInterface,0,m_curNodeIndex,0);
-
-		///now update all subtree headers
-
-		int i;
-		for (i=0;i<m_SubtreeHeaders.size();i++)
-		{
-			btBvhSubtreeInfo& subtree = m_SubtreeHeaders[i];
-			subtree.setAabbFromQuantizeNode(m_quantizedContiguousNodes[subtree.m_rootNodeIndex]);
-		}
-
-	} else
-	{
-
-	}
-}
-
-
-
-btOptimizedBvh::~btOptimizedBvh()
-{
-}
-
-#ifdef DEBUG_TREE_BUILDING
-int gStackDepth = 0;
-int gMaxStackDepth = 0;
-#endif //DEBUG_TREE_BUILDING
-
-void	btOptimizedBvh::buildTree	(int startIndex,int endIndex)
-{
-#ifdef DEBUG_TREE_BUILDING
-	gStackDepth++;
-	if (gStackDepth > gMaxStackDepth)
-		gMaxStackDepth = gStackDepth;
-#endif //DEBUG_TREE_BUILDING
-
-
-	int splitAxis, splitIndex, i;
-	int numIndices =endIndex-startIndex;
-	int curIndex = m_curNodeIndex;
-
-	assert(numIndices>0);
-
-	if (numIndices==1)
-	{
-#ifdef DEBUG_TREE_BUILDING
-		gStackDepth--;
-#endif //DEBUG_TREE_BUILDING
-		
-		assignInternalNodeFromLeafNode(m_curNodeIndex,startIndex);
-
-		m_curNodeIndex++;
-		return;	
-	}
-	//calculate Best Splitting Axis and where to split it. Sort the incoming 'leafNodes' array within range 'startIndex/endIndex'.
+	btQuantizedBvh* bvh = btQuantizedBvh::deSerializeInPlace(i_alignedDataBuffer,i_dataBufferSize,i_swapEndian);
 	
-	splitAxis = calcSplittingAxis(startIndex,endIndex);
-
-	splitIndex = sortAndCalcSplittingIndex(startIndex,endIndex,splitAxis);
-
-	int internalNodeIndex = m_curNodeIndex;
-	
-	setInternalNodeAabbMax(m_curNodeIndex,btVector3(btScalar(-1e30),btScalar(-1e30),btScalar(-1e30)));
-	setInternalNodeAabbMin(m_curNodeIndex,btVector3(btScalar(1e30),btScalar(1e30),btScalar(1e30)));
-	
-	for (i=startIndex;i<endIndex;i++)
-	{
-		mergeInternalNodeAabb(m_curNodeIndex,getAabbMin(i),getAabbMax(i));
-	}
-
-	m_curNodeIndex++;
-	
-
-	//internalNode->m_escapeIndex;
-	
-	int leftChildNodexIndex = m_curNodeIndex;
-
-	//build left child tree
-	buildTree(startIndex,splitIndex);
-
-	int rightChildNodexIndex = m_curNodeIndex;
-	//build right child tree
-	buildTree(splitIndex,endIndex);
-
-#ifdef DEBUG_TREE_BUILDING
-	gStackDepth--;
-#endif //DEBUG_TREE_BUILDING
-
-	int escapeIndex = m_curNodeIndex - curIndex;
-
-	if (m_useQuantization)
-	{
-		//escapeIndex is the number of nodes of this subtree
-		const int sizeQuantizedNode =sizeof(btQuantizedBvhNode);
-		const int treeSizeInBytes = escapeIndex * sizeQuantizedNode;
-		if (treeSizeInBytes > MAX_SUBTREE_SIZE_IN_BYTES)
-		{
-			updateSubtreeHeaders(leftChildNodexIndex,rightChildNodexIndex);
-		}
-	}
-
-	setInternalNodeEscapeIndex(internalNodeIndex,escapeIndex);
-
-}
-
-void	btOptimizedBvh::updateSubtreeHeaders(int leftChildNodexIndex,int rightChildNodexIndex)
-{
-	btAssert(m_useQuantization);
-
-	btQuantizedBvhNode& leftChildNode = m_quantizedContiguousNodes[leftChildNodexIndex];
-	int leftSubTreeSize = leftChildNode.isLeafNode() ? 1 : leftChildNode.getEscapeIndex();
-	int leftSubTreeSizeInBytes =  leftSubTreeSize * sizeof(btQuantizedBvhNode);
-	
-	btQuantizedBvhNode& rightChildNode = m_quantizedContiguousNodes[rightChildNodexIndex];
-	int rightSubTreeSize = rightChildNode.isLeafNode() ? 1 : rightChildNode.getEscapeIndex();
-	int rightSubTreeSizeInBytes =  rightSubTreeSize * sizeof(btQuantizedBvhNode);
-
-	if(leftSubTreeSizeInBytes <= MAX_SUBTREE_SIZE_IN_BYTES)
-	{
-		btBvhSubtreeInfo& subtree = m_SubtreeHeaders.expand();
-		subtree.setAabbFromQuantizeNode(leftChildNode);
-		subtree.m_rootNodeIndex = leftChildNodexIndex;
-		subtree.m_subtreeSize = leftSubTreeSize;
-	}
-
-	if(rightSubTreeSizeInBytes <= MAX_SUBTREE_SIZE_IN_BYTES)
-	{
-		btBvhSubtreeInfo& subtree = m_SubtreeHeaders.expand();
-		subtree.setAabbFromQuantizeNode(rightChildNode);
-		subtree.m_rootNodeIndex = rightChildNodexIndex;
-		subtree.m_subtreeSize = rightSubTreeSize;
-	}
-}
-
-
-int	btOptimizedBvh::sortAndCalcSplittingIndex(int startIndex,int endIndex,int splitAxis)
-{
-	int i;
-	int splitIndex =startIndex;
-	int numIndices = endIndex - startIndex;
-	btScalar splitValue;
-
-	btVector3 means(btScalar(0.),btScalar(0.),btScalar(0.));
-	for (i=startIndex;i<endIndex;i++)
-	{
-		btVector3 center = btScalar(0.5)*(getAabbMax(i)+getAabbMin(i));
-		means+=center;
-	}
-	means *= (btScalar(1.)/(btScalar)numIndices);
-	
-	splitValue = means[splitAxis];
-	
-	//sort leafNodes so all values larger then splitValue comes first, and smaller values start from 'splitIndex'.
-	for (i=startIndex;i<endIndex;i++)
-	{
-		btVector3 center = btScalar(0.5)*(getAabbMax(i)+getAabbMin(i));
-		if (center[splitAxis] > splitValue)
-		{
-			//swap
-			swapLeafNodes(i,splitIndex);
-			splitIndex++;
-		}
-	}
-
-	//if the splitIndex causes unbalanced trees, fix this by using the center in between startIndex and endIndex
-	//otherwise the tree-building might fail due to stack-overflows in certain cases.
-	//unbalanced1 is unsafe: it can cause stack overflows
-	//bool unbalanced1 = ((splitIndex==startIndex) || (splitIndex == (endIndex-1)));
-
-	//unbalanced2 should work too: always use center (perfect balanced trees)	
-	//bool unbalanced2 = true;
-
-	//this should be safe too:
-	int rangeBalancedIndices = numIndices/3;
-	bool unbalanced = ((splitIndex<=(startIndex+rangeBalancedIndices)) || (splitIndex >=(endIndex-1-rangeBalancedIndices)));
-	
-	if (unbalanced)
-	{
-		splitIndex = startIndex+ (numIndices>>1);
-	}
-
-	bool unbal = (splitIndex==startIndex) || (splitIndex == (endIndex));
-	btAssert(!unbal);
-
-	return splitIndex;
-}
-
-
-int	btOptimizedBvh::calcSplittingAxis(int startIndex,int endIndex)
-{
-	int i;
-
-	btVector3 means(btScalar(0.),btScalar(0.),btScalar(0.));
-	btVector3 variance(btScalar(0.),btScalar(0.),btScalar(0.));
-	int numIndices = endIndex-startIndex;
-
-	for (i=startIndex;i<endIndex;i++)
-	{
-		btVector3 center = btScalar(0.5)*(getAabbMax(i)+getAabbMin(i));
-		means+=center;
-	}
-	means *= (btScalar(1.)/(btScalar)numIndices);
-		
-	for (i=startIndex;i<endIndex;i++)
-	{
-		btVector3 center = btScalar(0.5)*(getAabbMax(i)+getAabbMin(i));
-		btVector3 diff2 = center-means;
-		diff2 = diff2 * diff2;
-		variance += diff2;
-	}
-	variance *= (btScalar(1.)/	((btScalar)numIndices-1)	);
-	
-	return variance.maxAxis();
-}
-
-
-
-void	btOptimizedBvh::reportAabbOverlappingNodex(btNodeOverlapCallback* nodeCallback,const btVector3& aabbMin,const btVector3& aabbMax) const
-{
-	//either choose recursive traversal (walkTree) or stackless (walkStacklessTree)
-
-
-	if (m_useQuantization)
-	{
-		///quantize query AABB
-		unsigned short int quantizedQueryAabbMin[3];
-		unsigned short int quantizedQueryAabbMax[3];
-		quantizeWithClamp(quantizedQueryAabbMin,aabbMin);
-		quantizeWithClamp(quantizedQueryAabbMax,aabbMax);
-
-		switch (m_traversalMode)
-		{
-		case TRAVERSAL_STACKLESS:
-				walkStacklessQuantizedTree(nodeCallback,quantizedQueryAabbMin,quantizedQueryAabbMax,0,m_curNodeIndex);
-			break;
-		case TRAVERSAL_STACKLESS_CACHE_FRIENDLY:
-				walkStacklessQuantizedTreeCacheFriendly(nodeCallback,quantizedQueryAabbMin,quantizedQueryAabbMax);
-			break;
-		case TRAVERSAL_RECURSIVE:
-			{
-				const btQuantizedBvhNode* rootNode = &m_quantizedContiguousNodes[0];
-				walkRecursiveQuantizedTreeAgainstQueryAabb(rootNode,nodeCallback,quantizedQueryAabbMin,quantizedQueryAabbMax);
-			}
-			break;
-		default:
-			//unsupported
-			btAssert(0);
-		}
-	} else
-	{
-		walkStacklessTree(nodeCallback,aabbMin,aabbMax);
-	}
-}
-
-
-int maxIterations = 0;
-
-void	btOptimizedBvh::walkStacklessTree(btNodeOverlapCallback* nodeCallback,const btVector3& aabbMin,const btVector3& aabbMax) const
-{
-	btAssert(!m_useQuantization);
-
-	const btOptimizedBvhNode* rootNode = &m_contiguousNodes[0];
-	int escapeIndex, curIndex = 0;
-	int walkIterations = 0;
-	bool aabbOverlap, isLeafNode;
-
-	while (curIndex < m_curNodeIndex)
-	{
-		//catch bugs in tree data
-		assert (walkIterations < m_curNodeIndex);
-
-		walkIterations++;
-		aabbOverlap = TestAabbAgainstAabb2(aabbMin,aabbMax,rootNode->m_aabbMinOrg,rootNode->m_aabbMaxOrg);
-		isLeafNode = rootNode->m_escapeIndex == -1;
-		
-		if (isLeafNode && aabbOverlap)
-		{
-			nodeCallback->processNode(rootNode->m_subPart,rootNode->m_triangleIndex);
-		} 
-		
-		if (aabbOverlap || isLeafNode)
-		{
-			rootNode++;
-			curIndex++;
-		} else
-		{
-			escapeIndex = rootNode->m_escapeIndex;
-			rootNode += escapeIndex;
-			curIndex += escapeIndex;
-		}
-	}
-	if (maxIterations < walkIterations)
-		maxIterations = walkIterations;
-
-}
-
-/*
-///this was the original recursive traversal, before we optimized towards stackless traversal
-void	btOptimizedBvh::walkTree(btOptimizedBvhNode* rootNode,btNodeOverlapCallback* nodeCallback,const btVector3& aabbMin,const btVector3& aabbMax) const
-{
-	bool isLeafNode, aabbOverlap = TestAabbAgainstAabb2(aabbMin,aabbMax,rootNode->m_aabbMin,rootNode->m_aabbMax);
-	if (aabbOverlap)
-	{
-		isLeafNode = (!rootNode->m_leftChild && !rootNode->m_rightChild);
-		if (isLeafNode)
-		{
-			nodeCallback->processNode(rootNode);
-		} else
-		{
-			walkTree(rootNode->m_leftChild,nodeCallback,aabbMin,aabbMax);
-			walkTree(rootNode->m_rightChild,nodeCallback,aabbMin,aabbMax);
-		}
-	}
-
-}
-*/
-
-void btOptimizedBvh::walkRecursiveQuantizedTreeAgainstQueryAabb(const btQuantizedBvhNode* currentNode,btNodeOverlapCallback* nodeCallback,unsigned short int* quantizedQueryAabbMin,unsigned short int* quantizedQueryAabbMax) const
-{
-	btAssert(m_useQuantization);
-	
-	bool aabbOverlap, isLeafNode;
-
-	aabbOverlap = testQuantizedAabbAgainstQuantizedAabb(quantizedQueryAabbMin,quantizedQueryAabbMax,currentNode->m_quantizedAabbMin,currentNode->m_quantizedAabbMax);
-	isLeafNode = currentNode->isLeafNode();
-		
-	if (aabbOverlap)
-	{
-		if (isLeafNode)
-		{
-			nodeCallback->processNode(0,currentNode->getTriangleIndex());
-		} else
-		{
-			//process left and right children
-			const btQuantizedBvhNode* leftChildNode = currentNode+1;
-			walkRecursiveQuantizedTreeAgainstQueryAabb(leftChildNode,nodeCallback,quantizedQueryAabbMin,quantizedQueryAabbMax);
-
-			const btQuantizedBvhNode* rightChildNode = leftChildNode->isLeafNode() ? leftChildNode+1:leftChildNode+leftChildNode->getEscapeIndex();
-			walkRecursiveQuantizedTreeAgainstQueryAabb(rightChildNode,nodeCallback,quantizedQueryAabbMin,quantizedQueryAabbMax);
-		}
-	}		
-}
-
-
-
-
-
-
-
-void	btOptimizedBvh::walkStacklessQuantizedTree(btNodeOverlapCallback* nodeCallback,unsigned short int* quantizedQueryAabbMin,unsigned short int* quantizedQueryAabbMax,int startNodeIndex,int endNodeIndex) const
-{
-	btAssert(m_useQuantization);
-	
-	int curIndex = startNodeIndex;
-	int walkIterations = 0;
-	int subTreeSize = endNodeIndex - startNodeIndex;
-
-	const btQuantizedBvhNode* rootNode = &m_quantizedContiguousNodes[startNodeIndex];
-	int escapeIndex;
-	
-	bool aabbOverlap, isLeafNode;
-
-	while (curIndex < endNodeIndex)
-	{
-
-//#define VISUALLY_ANALYZE_BVH 1
-#ifdef VISUALLY_ANALYZE_BVH
-		//some code snippet to debugDraw aabb, to visually analyze bvh structure
-		static int drawPatch = 0;
-		//need some global access to a debugDrawer
-		extern btIDebugDraw* debugDrawerPtr;
-		if (curIndex==drawPatch)
-		{
-			btVector3 aabbMin,aabbMax;
-			aabbMin = unQuantize(rootNode->m_quantizedAabbMin);
-			aabbMax = unQuantize(rootNode->m_quantizedAabbMax);
-			btVector3	color(1,0,0);
-			debugDrawerPtr->drawAabb(aabbMin,aabbMax,color);
-		}
-#endif//VISUALLY_ANALYZE_BVH
-
-		//catch bugs in tree data
-		assert (walkIterations < subTreeSize);
-
-		walkIterations++;
-		aabbOverlap = testQuantizedAabbAgainstQuantizedAabb(quantizedQueryAabbMin,quantizedQueryAabbMax,rootNode->m_quantizedAabbMin,rootNode->m_quantizedAabbMax);
-		isLeafNode = rootNode->isLeafNode();
-		
-		if (isLeafNode && aabbOverlap)
-		{
-			nodeCallback->processNode(0,rootNode->getTriangleIndex());
-		} 
-		
-		if (aabbOverlap || isLeafNode)
-		{
-			rootNode++;
-			curIndex++;
-		} else
-		{
-			escapeIndex = rootNode->getEscapeIndex();
-			rootNode += escapeIndex;
-			curIndex += escapeIndex;
-		}
-	}
-	if (maxIterations < walkIterations)
-		maxIterations = walkIterations;
-
-}
-
-//This traversal can be called from Playstation 3 SPU
-void	btOptimizedBvh::walkStacklessQuantizedTreeCacheFriendly(btNodeOverlapCallback* nodeCallback,unsigned short int* quantizedQueryAabbMin,unsigned short int* quantizedQueryAabbMax) const
-{
-	btAssert(m_useQuantization);
-
-	int i;
-
-
-	for (i=0;i<this->m_SubtreeHeaders.size();i++)
-	{
-		const btBvhSubtreeInfo& subtree = m_SubtreeHeaders[i];
-
-		bool overlap = testQuantizedAabbAgainstQuantizedAabb(quantizedQueryAabbMin,quantizedQueryAabbMax,subtree.m_quantizedAabbMin,subtree.m_quantizedAabbMax);
-		if (overlap)
-		{
-			walkStacklessQuantizedTree(nodeCallback,quantizedQueryAabbMin,quantizedQueryAabbMax,
-				subtree.m_rootNodeIndex,
-				subtree.m_rootNodeIndex+subtree.m_subtreeSize);
-		}
-	}
-}
-
-
-
-
-void	btOptimizedBvh::reportSphereOverlappingNodex(btNodeOverlapCallback* nodeCallback,const btVector3& aabbMin,const btVector3& aabbMax) const
-{
-	(void)nodeCallback;
-	(void)aabbMin;
-	(void)aabbMax;
-	//not yet, please use aabb
-	btAssert(0);
-}
-
-
-void btOptimizedBvh::quantizeWithClamp(unsigned short* out, const btVector3& point) const
-{
-
-	btAssert(m_useQuantization);
-
-	btVector3 clampedPoint(point);
-	clampedPoint.setMax(m_bvhAabbMin);
-	clampedPoint.setMin(m_bvhAabbMax);
-
-	btVector3 v = (clampedPoint - m_bvhAabbMin) * m_bvhQuantization;
-	out[0] = (unsigned short)(v.getX()+0.5f);
-	out[1] = (unsigned short)(v.getY()+0.5f);
-	out[2] = (unsigned short)(v.getZ()+0.5f);		
-}
-
-btVector3	btOptimizedBvh::unQuantize(const unsigned short* vecIn) const
-{
-	btVector3	vecOut;
-	vecOut.setValue(
-		(btScalar)(vecIn[0]) / (m_bvhQuantization.getX()),
-		(btScalar)(vecIn[1]) / (m_bvhQuantization.getY()),
-		(btScalar)(vecIn[2]) / (m_bvhQuantization.getZ()));
-	vecOut += m_bvhAabbMin;
-	return vecOut;
-}
-
-
-void	btOptimizedBvh::swapLeafNodes(int i,int splitIndex)
-{
-	if (m_useQuantization)
-	{
-			btQuantizedBvhNode tmp = m_quantizedLeafNodes[i];
-			m_quantizedLeafNodes[i] = m_quantizedLeafNodes[splitIndex];
-			m_quantizedLeafNodes[splitIndex] = tmp;
-	} else
-	{
-			btOptimizedBvhNode tmp = m_leafNodes[i];
-			m_leafNodes[i] = m_leafNodes[splitIndex];
-			m_leafNodes[splitIndex] = tmp;
-	}
-}
-
-void	btOptimizedBvh::assignInternalNodeFromLeafNode(int internalNode,int leafNodeIndex)
-{
-	if (m_useQuantization)
-	{
-		m_quantizedContiguousNodes[internalNode] = m_quantizedLeafNodes[leafNodeIndex];
-	} else
-	{
-		m_contiguousNodes[internalNode] = m_leafNodes[leafNodeIndex];
-	}
+	//we don't add additional data so just do a static upcast
+	return static_cast<btOptimizedBvh*>(bvh);
 }
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.h
index d5159586344..d7536417d7e 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.h
@@ -16,315 +16,48 @@ subject to the following restrictions:
 #ifndef OPTIMIZED_BVH_H
 #define OPTIMIZED_BVH_H
 
-
-#include "../../LinearMath/btVector3.h"
-
-
-//http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclang/html/vclrf__m128.asp
-
-
+#include "BulletCollision/BroadphaseCollision/btQuantizedBvh.h"
 
 class btStridingMeshInterface;
 
-//Note: currently we have 16 bytes per quantized node
-#define MAX_SUBTREE_SIZE_IN_BYTES  2048
 
-
-///btQuantizedBvhNode is a compressed aabb node, 16 bytes.
-///Node can be used for leafnode or internal node. Leafnodes can point to 32-bit triangle index (non-negative range).
-ATTRIBUTE_ALIGNED16	(struct) btQuantizedBvhNode
+///The btOptimizedBvh extends the btQuantizedBvh to create AABB tree for triangle meshes, through the btStridingMeshInterface.
+ATTRIBUTE_ALIGNED16(class) btOptimizedBvh : public btQuantizedBvh
 {
 	
-	//12 bytes
-	unsigned short int	m_quantizedAabbMin[3];
-	unsigned short int	m_quantizedAabbMax[3];
-	//4 bytes
-	int	m_escapeIndexOrTriangleIndex;
-
-	bool isLeafNode() const
-	{
-		//skipindex is negative (internal node), triangleindex >=0 (leafnode)
-		return (m_escapeIndexOrTriangleIndex >= 0);
-	}
-	int getEscapeIndex() const
-	{
-		btAssert(!isLeafNode());
-		return -m_escapeIndexOrTriangleIndex;
-	}
-	int	getTriangleIndex() const
-	{
-		btAssert(isLeafNode());
-		return m_escapeIndexOrTriangleIndex;
-	}
-}
-;
-
-/// btOptimizedBvhNode contains both internal and leaf node information.
-/// Total node size is 44 bytes / node. You can use the compressed version of 16 bytes.
-ATTRIBUTE_ALIGNED16 (struct) btOptimizedBvhNode
-{
-	//32 bytes
-	btVector3	m_aabbMinOrg;
-	btVector3	m_aabbMaxOrg;
-
-	//4
-	int	m_escapeIndex;
-
-	//8
-	//for child nodes
-	int	m_subPart;
-	int	m_triangleIndex;
-	int	m_padding[5];//bad, due to alignment
-
-
-};
-
-
-///btBvhSubtreeInfo provides info to gather a subtree of limited size
-ATTRIBUTE_ALIGNED16(class) btBvhSubtreeInfo
-{
 public:
-	//12 bytes
-	unsigned short int	m_quantizedAabbMin[3];
-	unsigned short int	m_quantizedAabbMax[3];
-	//4 bytes, points to the root of the subtree
-	int			m_rootNodeIndex;
-	//4 bytes
-	int			m_subtreeSize;
-	int			m_padding[3];
-
-
-	void	setAabbFromQuantizeNode(const btQuantizedBvhNode& quantizedNode)
-	{
-		m_quantizedAabbMin[0] = quantizedNode.m_quantizedAabbMin[0];
-		m_quantizedAabbMin[1] = quantizedNode.m_quantizedAabbMin[1];
-		m_quantizedAabbMin[2] = quantizedNode.m_quantizedAabbMin[2];
-		m_quantizedAabbMax[0] = quantizedNode.m_quantizedAabbMax[0];
-		m_quantizedAabbMax[1] = quantizedNode.m_quantizedAabbMax[1];
-		m_quantizedAabbMax[2] = quantizedNode.m_quantizedAabbMax[2];
-	}
-}
-;
-
-
-class btNodeOverlapCallback
-{
-public:
-	virtual ~btNodeOverlapCallback() {};
-
-	virtual void processNode(int subPart, int triangleIndex) = 0;
-};
-
-#include "../../LinearMath/btAlignedAllocator.h"
-#include "../../LinearMath/btAlignedObjectArray.h"
-
-
-
-///for code readability:
-typedef btAlignedObjectArray<btOptimizedBvhNode>	NodeArray;
-typedef btAlignedObjectArray<btQuantizedBvhNode>	QuantizedNodeArray;
-typedef btAlignedObjectArray<btBvhSubtreeInfo>		BvhSubtreeInfoArray;
-
-
-///OptimizedBvh store an AABB tree that can be quickly traversed on CPU (and SPU,GPU in future)
-ATTRIBUTE_ALIGNED16(class) btOptimizedBvh
-{
-	NodeArray			m_leafNodes;
-	NodeArray			m_contiguousNodes;
-
-	QuantizedNodeArray	m_quantizedLeafNodes;
-	
-	QuantizedNodeArray	m_quantizedContiguousNodes;
-	
-	int					m_curNodeIndex;
-
-
-	//quantization data
-	bool				m_useQuantization;
-	btVector3			m_bvhAabbMin;
-	btVector3			m_bvhAabbMax;
-	btVector3			m_bvhQuantization;
-
-	enum btTraversalMode
-	{
-		TRAVERSAL_STACKLESS = 0,
-		TRAVERSAL_STACKLESS_CACHE_FRIENDLY,
-		TRAVERSAL_RECURSIVE
-	};
-
-	btTraversalMode	m_traversalMode;
-
-	
-
-
-	BvhSubtreeInfoArray		m_SubtreeHeaders;
-
-
-	///two versions, one for quantized and normal nodes. This allows code-reuse while maintaining readability (no template/macro!)
-	///this might be refactored into a virtual, it is usually not calculated at run-time
-	void	setInternalNodeAabbMin(int nodeIndex, const btVector3& aabbMin)
-	{
-		if (m_useQuantization)
-		{
-			quantizeWithClamp(&m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[0] ,aabbMin);
-		} else
-		{
-			m_contiguousNodes[nodeIndex].m_aabbMinOrg = aabbMin;
-
-		}
-	}
-	void	setInternalNodeAabbMax(int nodeIndex,const btVector3& aabbMax)
-	{
-		if (m_useQuantization)
-		{
-			quantizeWithClamp(&m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[0],aabbMax);
-		} else
-		{
-			m_contiguousNodes[nodeIndex].m_aabbMaxOrg = aabbMax;
-		}
-	}
-
-	btVector3 getAabbMin(int nodeIndex) const
-	{
-		if (m_useQuantization)
-		{
-			return unQuantize(&m_quantizedLeafNodes[nodeIndex].m_quantizedAabbMin[0]);
-		}
-		//non-quantized
-		return m_leafNodes[nodeIndex].m_aabbMinOrg;
-
-	}
-	btVector3 getAabbMax(int nodeIndex) const
-	{
-		if (m_useQuantization)
-		{
-			return unQuantize(&m_quantizedLeafNodes[nodeIndex].m_quantizedAabbMax[0]);
-		} 
-		//non-quantized
-		return m_leafNodes[nodeIndex].m_aabbMaxOrg;
-		
-	}
-
-	void	setQuantizationValues(const btVector3& bvhAabbMin,const btVector3& bvhAabbMax,btScalar quantizationMargin=btScalar(1.0));
-	
-	void	setInternalNodeEscapeIndex(int nodeIndex, int escapeIndex)
-	{
-		if (m_useQuantization)
-		{
-			m_quantizedContiguousNodes[nodeIndex].m_escapeIndexOrTriangleIndex = -escapeIndex;
-		} 
-		else
-		{
-			m_contiguousNodes[nodeIndex].m_escapeIndex = escapeIndex;
-		}
-
-	}
-
-	void mergeInternalNodeAabb(int nodeIndex,const btVector3& newAabbMin,const btVector3& newAabbMax) 
-	{
-		if (m_useQuantization)
-		{
-			unsigned short int quantizedAabbMin[3];
-			unsigned short int quantizedAabbMax[3];
-			quantizeWithClamp(quantizedAabbMin,newAabbMin);
-			quantizeWithClamp(quantizedAabbMax,newAabbMax);
-			for (int i=0;i<3;i++)
-			{
-				if (m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[i] > quantizedAabbMin[i])
-					m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[i] = quantizedAabbMin[i];
-
-				if (m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[i] < quantizedAabbMax[i])
-					m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[i] = quantizedAabbMax[i];
-
-			}
-		} else
-		{
-			//non-quantized
-			m_contiguousNodes[nodeIndex].m_aabbMinOrg.setMin(newAabbMin);
-			m_contiguousNodes[nodeIndex].m_aabbMaxOrg.setMax(newAabbMax);		
-		}
-	}
-
-	void	swapLeafNodes(int firstIndex,int secondIndex);
-
-	void	assignInternalNodeFromLeafNode(int internalNode,int leafNodeIndex);
+	BT_DECLARE_ALIGNED_ALLOCATOR();
 
 protected:
 
-	
-
-	void	buildTree	(int startIndex,int endIndex);
-
-	int	calcSplittingAxis(int startIndex,int endIndex);
-
-	int	sortAndCalcSplittingIndex(int startIndex,int endIndex,int splitAxis);
-	
-	void	walkStacklessTree(btNodeOverlapCallback* nodeCallback,const btVector3& aabbMin,const btVector3& aabbMax) const;
-
-	void	walkStacklessQuantizedTree(btNodeOverlapCallback* nodeCallback,unsigned short int* quantizedQueryAabbMin,unsigned short int* quantizedQueryAabbMax,int startNodeIndex,int endNodeIndex) const;
-
-	///tree traversal designed for small-memory processors like PS3 SPU
-	void	walkStacklessQuantizedTreeCacheFriendly(btNodeOverlapCallback* nodeCallback,unsigned short int* quantizedQueryAabbMin,unsigned short int* quantizedQueryAabbMax) const;
-
-	///use the 16-byte stackless 'skipindex' node tree to do a recursive traversal
-	void	walkRecursiveQuantizedTreeAgainstQueryAabb(const btQuantizedBvhNode* currentNode,btNodeOverlapCallback* nodeCallback,unsigned short int* quantizedQueryAabbMin,unsigned short int* quantizedQueryAabbMax) const;
-
-	///use the 16-byte stackless 'skipindex' node tree to do a recursive traversal
-	void	walkRecursiveQuantizedTreeAgainstQuantizedTree(const btQuantizedBvhNode* treeNodeA,const btQuantizedBvhNode* treeNodeB,btNodeOverlapCallback* nodeCallback) const;
-	
-
-	inline bool testQuantizedAabbAgainstQuantizedAabb(unsigned short int* aabbMin1,unsigned short int* aabbMax1,const unsigned short int* aabbMin2,const unsigned short int* aabbMax2) const
-	{
-		bool overlap = true;
-		overlap = (aabbMin1[0] > aabbMax2[0] || aabbMax1[0] < aabbMin2[0]) ? false : overlap;
-		overlap = (aabbMin1[2] > aabbMax2[2] || aabbMax1[2] < aabbMin2[2]) ? false : overlap;
-		overlap = (aabbMin1[1] > aabbMax2[1] || aabbMax1[1] < aabbMin2[1]) ? false : overlap;
-		return overlap;
-	}
-
-	void	updateSubtreeHeaders(int leftChildNodexIndex,int rightChildNodexIndex);
-
 public:
+
 	btOptimizedBvh();
 
 	virtual ~btOptimizedBvh();
 
 	void	build(btStridingMeshInterface* triangles,bool useQuantizedAabbCompression, const btVector3& bvhAabbMin, const btVector3& bvhAabbMax);
 
-	void	reportAabbOverlappingNodex(btNodeOverlapCallback* nodeCallback,const btVector3& aabbMin,const btVector3& aabbMax) const;
-
-	void	reportSphereOverlappingNodex(btNodeOverlapCallback* nodeCallback,const btVector3& aabbMin,const btVector3& aabbMax) const;
-
-	void quantizeWithClamp(unsigned short* out, const btVector3& point) const;
-	
-	btVector3	unQuantize(const unsigned short* vecIn) const;
-
-	///setTraversalMode let's you choose between stackless, recursive or stackless cache friendly tree traversal. Note this is only implemented for quantized trees.
-	void	setTraversalMode(btTraversalMode	traversalMode)
-	{
-		m_traversalMode = traversalMode;
-	}
-
-	void	refit(btStridingMeshInterface* triangles);
+	void	refit(btStridingMeshInterface* triangles,const btVector3& aabbMin,const btVector3& aabbMax);
 
 	void	refitPartial(btStridingMeshInterface* triangles,const btVector3& aabbMin, const btVector3& aabbMax);
 
 	void	updateBvhNodes(btStridingMeshInterface* meshInterface,int firstNode,int endNode,int index);
 
-
-	QuantizedNodeArray&	getQuantizedNodeArray()
-	{	
-		return	m_quantizedContiguousNodes;
-	}
-
-	BvhSubtreeInfoArray&	getSubtreeInfoArray()
+	/// Data buffer MUST be 16 byte aligned
+	virtual bool serialize(void *o_alignedDataBuffer, unsigned i_dataBufferSize, bool i_swapEndian)
 	{
-		return m_SubtreeHeaders;
+		return btQuantizedBvh::serialize(o_alignedDataBuffer,i_dataBufferSize,i_swapEndian);
+
 	}
 
-}
-;
+	///deSerializeInPlace loads and initializes a BVH from a buffer in memory 'in place'
+	static btOptimizedBvh *deSerializeInPlace(void *i_alignedDataBuffer, unsigned int i_dataBufferSize, bool i_swapEndian);
+
+
+};
 
 
 #endif //OPTIMIZED_BVH_H
 
+
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp
index bbc4ba62af6..71c3af38a02 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp
@@ -13,7 +13,7 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#include <BulletCollision/CollisionShapes/btPolyhedralConvexShape.h>
+#include "BulletCollision/CollisionShapes/btPolyhedralConvexShape.h"
 
 btPolyhedralConvexShape::btPolyhedralConvexShape()
 :m_localAabbMin(1,1,1),
@@ -95,7 +95,7 @@ void	btPolyhedralConvexShape::batchedUnitVectorGetSupportingVertexWithoutMargin(
 
 
 
-void	btPolyhedralConvexShape::calculateLocalInertia(btScalar mass,btVector3& inertia)
+void	btPolyhedralConvexShape::calculateLocalInertia(btScalar mass,btVector3& inertia) const
 {
 	//not yet, return box inertia
 
@@ -128,10 +128,46 @@ void btPolyhedralConvexShape::getAabb(const btTransform& trans,btVector3& aabbMi
 
 
 
+void	btPolyhedralConvexShape::setLocalScaling(const btVector3& scaling)
+{
+	btConvexInternalShape::setLocalScaling(scaling);
+	recalcLocalAabb();
+}
 
 void	btPolyhedralConvexShape::recalcLocalAabb()
 {
 	m_isLocalAabbValid = true;
+	
+	#if 1
+	static const btVector3 _directions[] =
+	{
+		btVector3( 1.,  0.,  0.),
+		btVector3( 0.,  1.,  0.),
+		btVector3( 0.,  0.,  1.),
+		btVector3( -1., 0.,  0.),
+		btVector3( 0., -1.,  0.),
+		btVector3( 0.,  0., -1.)
+	};
+	
+	btVector3 _supporting[] =
+	{
+		btVector3( 0., 0., 0.),
+		btVector3( 0., 0., 0.),
+		btVector3( 0., 0., 0.),
+		btVector3( 0., 0., 0.),
+		btVector3( 0., 0., 0.),
+		btVector3( 0., 0., 0.)
+	};
+	
+	batchedUnitVectorGetSupportingVertexWithoutMargin(_directions, _supporting, 6);
+	
+	for ( int i = 0; i < 3; ++i )
+	{
+		m_localAabbMax[i] = _supporting[i][i] + m_collisionMargin;
+		m_localAabbMin[i] = _supporting[i + 3][i] - m_collisionMargin;
+	}
+	
+	#else
 
 	for (int i=0;i<3;i++)
 	{
@@ -143,6 +179,8 @@ void	btPolyhedralConvexShape::recalcLocalAabb()
 		tmp = localGetSupportingVertex(vec);
 		m_localAabbMin[i] = tmp[i]-m_collisionMargin;
 	}
+	#endif
 }
 
 
+
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h
index c35f7512663..0d55e4fe92c 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h
@@ -16,13 +16,13 @@ subject to the following restrictions:
 #ifndef BU_SHAPE
 #define BU_SHAPE
 
-#include "../../LinearMath/btPoint3.h"
-#include "../../LinearMath/btMatrix3x3.h"
-#include "btConvexShape.h"
+#include "LinearMath/btPoint3.h"
+#include "LinearMath/btMatrix3x3.h"
+#include "btConvexInternalShape.h"
 
 
-///PolyhedralConvexShape is an interface class for feature based (vertex/edge/face) convex shapes.
-class btPolyhedralConvexShape : public btConvexShape
+///The btPolyhedralConvexShape is an internal interface class for polyhedral convex shapes.
+class btPolyhedralConvexShape : public btConvexInternalShape
 {
 
 protected:
@@ -38,7 +38,7 @@ public:
 	virtual btVector3	localGetSupportingVertexWithoutMargin(const btVector3& vec)const;
 	virtual void	batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors,btVector3* supportVerticesOut,int numVectors) const;
 	
-	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia);
+	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia) const;
 
 
 	inline void getNonvirtualAabb(const btTransform& trans,btVector3& aabbMin,btVector3& aabbMax, btScalar margin) const
@@ -73,6 +73,8 @@ public:
 	
 	virtual void getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const;
 
+	virtual void	setLocalScaling(const btVector3& scaling);
+
 	void	recalcLocalAabb();
 
 	virtual int	getNumVertices() const = 0 ;
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.cpp
new file mode 100644
index 00000000000..a87b87f1a6f
--- /dev/null
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.cpp
@@ -0,0 +1,164 @@
+/*
+btbtShapeHull implemented by John McCutchan.
+
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2008 Erwin Coumans  http://bulletphysics.com
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btShapeHull.h"
+#include "LinearMath/btConvexHull.h"
+
+#define NUM_UNITSPHERE_POINTS 42
+
+static btVector3 btUnitSpherePoints[NUM_UNITSPHERE_POINTS+MAX_PREFERRED_PENETRATION_DIRECTIONS*2] = 
+{
+	btVector3(btScalar(0.000000) , btScalar(-0.000000),btScalar(-1.000000)),
+	btVector3(btScalar(0.723608) , btScalar(-0.525725),btScalar(-0.447219)),
+	btVector3(btScalar(-0.276388) , btScalar(-0.850649),btScalar(-0.447219)),
+	btVector3(btScalar(-0.894426) , btScalar(-0.000000),btScalar(-0.447216)),
+	btVector3(btScalar(-0.276388) , btScalar(0.850649),btScalar(-0.447220)),
+	btVector3(btScalar(0.723608) , btScalar(0.525725),btScalar(-0.447219)),
+	btVector3(btScalar(0.276388) , btScalar(-0.850649),btScalar(0.447220)),
+	btVector3(btScalar(-0.723608) , btScalar(-0.525725),btScalar(0.447219)),
+	btVector3(btScalar(-0.723608) , btScalar(0.525725),btScalar(0.447219)),
+	btVector3(btScalar(0.276388) , btScalar(0.850649),btScalar(0.447219)),
+	btVector3(btScalar(0.894426) , btScalar(0.000000),btScalar(0.447216)),
+	btVector3(btScalar(-0.000000) , btScalar(0.000000),btScalar(1.000000)),
+	btVector3(btScalar(0.425323) , btScalar(-0.309011),btScalar(-0.850654)),
+	btVector3(btScalar(-0.162456) , btScalar(-0.499995),btScalar(-0.850654)),
+	btVector3(btScalar(0.262869) , btScalar(-0.809012),btScalar(-0.525738)),
+	btVector3(btScalar(0.425323) , btScalar(0.309011),btScalar(-0.850654)),
+	btVector3(btScalar(0.850648) , btScalar(-0.000000),btScalar(-0.525736)),
+	btVector3(btScalar(-0.525730) , btScalar(-0.000000),btScalar(-0.850652)),
+	btVector3(btScalar(-0.688190) , btScalar(-0.499997),btScalar(-0.525736)),
+	btVector3(btScalar(-0.162456) , btScalar(0.499995),btScalar(-0.850654)),
+	btVector3(btScalar(-0.688190) , btScalar(0.499997),btScalar(-0.525736)),
+	btVector3(btScalar(0.262869) , btScalar(0.809012),btScalar(-0.525738)),
+	btVector3(btScalar(0.951058) , btScalar(0.309013),btScalar(0.000000)),
+	btVector3(btScalar(0.951058) , btScalar(-0.309013),btScalar(0.000000)),
+	btVector3(btScalar(0.587786) , btScalar(-0.809017),btScalar(0.000000)),
+	btVector3(btScalar(0.000000) , btScalar(-1.000000),btScalar(0.000000)),
+	btVector3(btScalar(-0.587786) , btScalar(-0.809017),btScalar(0.000000)),
+	btVector3(btScalar(-0.951058) , btScalar(-0.309013),btScalar(-0.000000)),
+	btVector3(btScalar(-0.951058) , btScalar(0.309013),btScalar(-0.000000)),
+	btVector3(btScalar(-0.587786) , btScalar(0.809017),btScalar(-0.000000)),
+	btVector3(btScalar(-0.000000) , btScalar(1.000000),btScalar(-0.000000)),
+	btVector3(btScalar(0.587786) , btScalar(0.809017),btScalar(-0.000000)),
+	btVector3(btScalar(0.688190) , btScalar(-0.499997),btScalar(0.525736)),
+	btVector3(btScalar(-0.262869) , btScalar(-0.809012),btScalar(0.525738)),
+	btVector3(btScalar(-0.850648) , btScalar(0.000000),btScalar(0.525736)),
+	btVector3(btScalar(-0.262869) , btScalar(0.809012),btScalar(0.525738)),
+	btVector3(btScalar(0.688190) , btScalar(0.499997),btScalar(0.525736)),
+	btVector3(btScalar(0.525730) , btScalar(0.000000),btScalar(0.850652)),
+	btVector3(btScalar(0.162456) , btScalar(-0.499995),btScalar(0.850654)),
+	btVector3(btScalar(-0.425323) , btScalar(-0.309011),btScalar(0.850654)),
+	btVector3(btScalar(-0.425323) , btScalar(0.309011),btScalar(0.850654)),
+	btVector3(btScalar(0.162456) , btScalar(0.499995),btScalar(0.850654))
+};
+
+btShapeHull::btShapeHull (const btConvexShape* shape)
+{
+	m_shape = shape;
+	m_vertices.clear ();
+	m_indices.clear();
+	m_numIndices = 0;
+}
+
+btShapeHull::~btShapeHull ()
+{
+	m_indices.clear();	
+	m_vertices.clear ();
+}
+
+bool
+btShapeHull::buildHull (btScalar /*margin*/)
+{
+	int numSampleDirections = NUM_UNITSPHERE_POINTS;
+	{
+		int numPDA = m_shape->getNumPreferredPenetrationDirections();
+		if (numPDA)
+		{
+			for (int i=0;i<numPDA;i++)
+			{
+				btVector3 norm;
+				m_shape->getPreferredPenetrationDirection(i,norm);
+				btUnitSpherePoints[numSampleDirections] = norm;
+				numSampleDirections++;
+			}
+		}
+	}
+
+	btVector3 supportPoints[NUM_UNITSPHERE_POINTS+MAX_PREFERRED_PENETRATION_DIRECTIONS*2];
+	int i;
+	for (i = 0; i < numSampleDirections; i++)
+	{
+		supportPoints[i] = m_shape->localGetSupportingVertex(btUnitSpherePoints[i]);
+	}
+
+	HullDesc hd;
+	hd.mFlags = QF_TRIANGLES;
+	hd.mVcount = static_cast<unsigned int>(numSampleDirections);
+
+#ifdef BT_USE_DOUBLE_PRECISION
+	hd.mVertices = &supportPoints[0];
+	hd.mVertexStride = sizeof(btVector3);
+#else
+	hd.mVertices = &supportPoints[0];
+	hd.mVertexStride = sizeof (btVector3);
+#endif
+
+	HullLibrary hl;
+	HullResult hr;
+	if (hl.CreateConvexHull (hd, hr) == QE_FAIL)
+	{
+		return false;
+	}
+
+	m_vertices.resize (static_cast<int>(hr.mNumOutputVertices));
+
+
+	for (i = 0; i < static_cast<int>(hr.mNumOutputVertices); i++)
+	{
+		m_vertices[i] = hr.m_OutputVertices[i];
+	}
+	m_numIndices = hr.mNumIndices;
+	m_indices.resize(static_cast<int>(m_numIndices));
+	for (i = 0; i < static_cast<int>(m_numIndices); i++)
+	{
+		m_indices[i] = hr.m_Indices[i];
+	}
+
+	// free temporary hull result that we just copied
+	hl.ReleaseResult (hr);
+
+	return true;
+}
+
+int
+btShapeHull::numTriangles () const
+{
+	return static_cast<int>(m_numIndices / 3);
+}
+
+int
+btShapeHull::numVertices () const
+{
+	return m_vertices.size ();
+}
+
+int
+btShapeHull::numIndices () const
+{
+	return static_cast<int>(m_numIndices);
+}
+
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.h
new file mode 100644
index 00000000000..583c6b99eb6
--- /dev/null
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.h
@@ -0,0 +1,56 @@
+/*
+btShapeHull implemented by John McCutchan.
+
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2008 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef _SHAPE_HULL_H
+#define _SHAPE_HULL_H
+
+#include "LinearMath/btAlignedObjectArray.h"
+#include "BulletCollision/CollisionShapes/btConvexShape.h"
+
+
+///The btShapeHull class takes a btConvexShape, builds a simplified convex hull using btConvexHull and provides triangle indices and vertices.
+///It can be useful for to simplify a complex convex object and for visualization of a non-polyhedral convex object.
+///It approximates the convex hull using the supporting vertex of 42 directions.
+class btShapeHull
+{
+public:
+	btShapeHull (const btConvexShape* shape);
+	~btShapeHull ();
+
+	bool buildHull (btScalar margin);
+
+	int numTriangles () const;
+	int numVertices () const;
+	int numIndices () const;
+
+	const btVector3* getVertexPointer() const
+	{
+		return &m_vertices[0];
+	}
+	const unsigned int* getIndexPointer() const
+	{
+		return &m_indices[0];
+	}
+
+protected:
+	btAlignedObjectArray<btVector3> m_vertices;
+	btAlignedObjectArray<unsigned int> m_indices;
+	unsigned int m_numIndices;
+	const btConvexShape* m_shape;
+};
+
+#endif //_SHAPE_HULL_H
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.cpp
index ca65dd03f3e..15cfe432e27 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.cpp
@@ -68,7 +68,7 @@ void btSphereShape::getAabb(const btTransform& t,btVector3& aabbMin,btVector3& a
 
 
 
-void	btSphereShape::calculateLocalInertia(btScalar mass,btVector3& inertia)
+void	btSphereShape::calculateLocalInertia(btScalar mass,btVector3& inertia) const
 {
 	btScalar elem = btScalar(0.4) * mass * getMargin()*getMargin();
 	inertia.setValue(elem,elem,elem);
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.h
index 66521664087..83421d69e0d 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.h
@@ -16,15 +16,17 @@ subject to the following restrictions:
 #ifndef SPHERE_MINKOWSKI_H
 #define SPHERE_MINKOWSKI_H
 
-#include "btConvexShape.h"
-#include "../BroadphaseCollision/btBroadphaseProxy.h" // for the types
+#include "btConvexInternalShape.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types
 
-///btSphereShape implements an implicit (getSupportingVertex) Sphere
-ATTRIBUTE_ALIGNED16(class) btSphereShape : public btConvexShape
+///The btSphereShape implements an implicit sphere, centered around a local origin with radius.
+ATTRIBUTE_ALIGNED16(class) btSphereShape : public btConvexInternalShape
 
 {
 	
 public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
 	btSphereShape (btScalar radius);
 	
 	
@@ -34,26 +36,26 @@ public:
 	virtual void	batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors,btVector3* supportVerticesOut,int numVectors) const;
 
 
-	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia);
+	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia) const;
 
 	virtual void getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const;
 
 	virtual int	getShapeType() const { return SPHERE_SHAPE_PROXYTYPE; }
 
-	btScalar	getRadius() const { return m_implicitShapeDimensions.getX();}
+	btScalar	getRadius() const { return m_implicitShapeDimensions.getX() * m_localScaling.getX();}
 
 	//debugging
-	virtual char*	getName()const {return "SPHERE";}
+	virtual const char*	getName()const {return "SPHERE";}
 
 	virtual void	setMargin(btScalar margin)
 	{
-		btConvexShape::setMargin(margin);
+		btConvexInternalShape::setMargin(margin);
 	}
 	virtual btScalar	getMargin() const
 	{
 		//to improve gjk behaviour, use radius+margin as the full margin, so never get into the penetration case
 		//this means, non-uniform scaling is not supported anymore
-		return m_localScaling.getX() * getRadius() + btConvexShape::getMargin();
+		return getRadius();
 	}
 
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp
index 4fbaafa1b93..3c98ca08ddc 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp
@@ -19,10 +19,11 @@ subject to the following restrictions:
 
 
 btStaticPlaneShape::btStaticPlaneShape(const btVector3& planeNormal,btScalar planeConstant)
-:m_planeNormal(planeNormal),
+:m_planeNormal(planeNormal.normalized()),
 m_planeConstant(planeConstant),
 m_localScaling(btScalar(0.),btScalar(0.),btScalar(0.))
 {
+	//	btAssert( btFuzzyZero(m_planeNormal.length() - btScalar(1.)) );
 }
 
 
@@ -86,7 +87,7 @@ void	btStaticPlaneShape::processAllTriangles(btTriangleCallback* callback,const
 
 }
 
-void	btStaticPlaneShape::calculateLocalInertia(btScalar mass,btVector3& inertia)
+void	btStaticPlaneShape::calculateLocalInertia(btScalar mass,btVector3& inertia) const
 {
 	(void)mass;
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h
index f59cc0c3347..ddebca73dea 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h
@@ -19,8 +19,7 @@ subject to the following restrictions:
 #include "btConcaveShape.h"
 
 
-///StaticPlaneShape simulates an 'infinite' plane by dynamically reporting triangles approximated by intersection of the plane with the AABB.
-///Assumed is that the other objects is not also infinite, so a reasonable sized AABB.
+///The btStaticPlaneShape simulates an infinite non-moving (static) collision plane.
 class btStaticPlaneShape : public btConcaveShape
 {
 protected:
@@ -46,14 +45,23 @@ public:
 
 	virtual void	processAllTriangles(btTriangleCallback* callback,const btVector3& aabbMin,const btVector3& aabbMax) const;
 
-	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia);
+	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia) const;
 
 	virtual void	setLocalScaling(const btVector3& scaling);
 	virtual const btVector3& getLocalScaling() const;
 	
+	const btVector3&	getPlaneNormal() const
+	{
+		return	m_planeNormal;
+	}
+
+	const btScalar&	getPlaneConstant() const
+	{
+		return	m_planeConstant;
+	}
 
 	//debugging
-	virtual char*	getName()const {return "STATICPLANE";}
+	virtual const char*	getName()const {return "STATICPLANE";}
 
 
 };
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp
index 03ca1ae7736..752a5fc1dfa 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp
@@ -51,7 +51,7 @@ void	btStridingMeshInterface::InternalProcessAllTriangles(btInternalTriangleInde
 			{
 				for (gfxindex=0;gfxindex<numtriangles;gfxindex++)
 				{
-					int* tri_indices= (int*)(indexbase+gfxindex*indexstride);
+					unsigned int* tri_indices= (unsigned int*)(indexbase+gfxindex*indexstride);
 					graphicsbase = (btScalar*)(vertexbase+tri_indices[0]*stride);
 					triangle[0].setValue(graphicsbase[0]*meshScaling.getX(),graphicsbase[1]*meshScaling.getY(),graphicsbase[2]*meshScaling.getZ());
 					graphicsbase = (btScalar*)(vertexbase+tri_indices[1]*stride);
@@ -66,7 +66,7 @@ void	btStridingMeshInterface::InternalProcessAllTriangles(btInternalTriangleInde
 			{
 				for (gfxindex=0;gfxindex<numtriangles;gfxindex++)
 				{
-					short int* tri_indices= (short int*)(indexbase+gfxindex*indexstride);
+					unsigned short int* tri_indices= (unsigned short int*)(indexbase+gfxindex*indexstride);
 					graphicsbase = (btScalar*)(vertexbase+tri_indices[0]*stride);
 					triangle[0].setValue(graphicsbase[0]*meshScaling.getX(),graphicsbase[1]*meshScaling.getY(),graphicsbase[2]*meshScaling.getZ());
 					graphicsbase = (btScalar*)(vertexbase+tri_indices[1]*stride);
@@ -121,4 +121,4 @@ void	btStridingMeshInterface::calculateAabbBruteForce(btVector3& aabbMin,btVecto
 
 	aabbMin = aabbCallback.m_aabbMin;
 	aabbMax = aabbCallback.m_aabbMax;
-}
\ No newline at end of file
+}
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h
index d7b354b7855..85020dd3f58 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h
@@ -16,7 +16,7 @@ subject to the following restrictions:
 #ifndef STRIDING_MESHINTERFACE_H
 #define STRIDING_MESHINTERFACE_H
 
-#include "../../LinearMath/btVector3.h"
+#include "LinearMath/btVector3.h"
 #include "btTriangleCallback.h"
 
 /// PHY_ScalarType enumerates possible scalar types.
@@ -29,7 +29,8 @@ typedef enum PHY_ScalarType {
 	PHY_FIXEDPOINT88
 } PHY_ScalarType;
 
-///	btStridingMeshInterface is the interface class for high performance access to triangle meshes
+///	The btStridingMeshInterface is the interface class for high performance generic access to triangle meshes, used in combination with btBvhTriangleMeshShape and some other collision shapes.
+/// Using index striding of 3*sizeof(integer) it can use triangle arrays, using index striding of 1*sizeof(integer) it can handle triangle strips.
 /// It allows for sharing graphics and collision meshes. Also it provides locking/unlocking of graphics meshes that are in gpu memory.
 class  btStridingMeshInterface
 {
@@ -47,7 +48,7 @@ class  btStridingMeshInterface
 
 
 
-		void	InternalProcessAllTriangles(btInternalTriangleIndexCallback* callback,const btVector3& aabbMin,const btVector3& aabbMax) const;
+		virtual void	InternalProcessAllTriangles(btInternalTriangleIndexCallback* callback,const btVector3& aabbMin,const btVector3& aabbMax) const;
 
 		///brute force method to calculate aabb
 		void	calculateAabbBruteForce(btVector3& aabbMin,btVector3& aabbMax);
@@ -75,6 +76,10 @@ class  btStridingMeshInterface
 		virtual void	preallocateVertices(int numverts)=0;
 		virtual void	preallocateIndices(int numindices)=0;
 
+		virtual bool	hasPremadeAabb() const { return false; }
+		virtual void	setPremadeAabb(const btVector3& aabbMin, const btVector3& aabbMax ) const {}
+		virtual void	getPremadeAabb(btVector3* aabbMin, btVector3* aabbMax ) const {}
+
 		const btVector3&	getScaling() const {
 			return m_scaling;
 		}
@@ -83,6 +88,7 @@ class  btStridingMeshInterface
 			m_scaling = scaling;
 		}
 
+	
 
 };
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btTetrahedronShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btTetrahedronShape.h
index 94bc4ec0fa5..09272d61dc2 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btTetrahedronShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btTetrahedronShape.h
@@ -18,10 +18,10 @@ subject to the following restrictions:
 
 
 #include "btPolyhedralConvexShape.h"
-#include "../BroadphaseCollision/btBroadphaseProxy.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
 
 
-///BU_Simplex1to4 implements feature based and implicit simplex of up to 4 vertices (tetrahedron, triangle, line, vertex).
+///The btBU_Simplex1to4 implements tetrahedron, triangle, line, vertex collision shapes. In most cases it is better to use btConvexHullShape instead.
 class btBU_Simplex1to4 : public btPolyhedralConvexShape
 {
 protected:
@@ -68,7 +68,7 @@ public:
 
 
 	///getName is for debugging
-	virtual  char*	getName()const { return "btBU_Simplex1to4";}
+	virtual const char*	getName()const { return "btBU_Simplex1to4";}
 
 };
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleBuffer.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleBuffer.cpp
index 54864c32f3a..5194219f256 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleBuffer.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleBuffer.cpp
@@ -16,14 +16,7 @@ subject to the following restrictions:
 #include "btTriangleBuffer.h"
 
 
-///example usage of this class:
-//			btTriangleBuffer	triBuf;
-//			concaveShape->processAllTriangles(&triBuf,aabbMin, aabbMax);
-//			for (int i=0;i<triBuf.getNumTriangles();i++)
-//			{
-//				const btTriangle& tri = triBuf.getTriangle(i);
-//				//do something useful here with the triangle
-//			}
+
 
 
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleBuffer.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleBuffer.h
index 3805c519d22..c739fc11e8f 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleBuffer.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleBuffer.h
@@ -17,7 +17,7 @@ subject to the following restrictions:
 #define BT_TRIANGLE_BUFFER_H
 
 #include "btTriangleCallback.h"
-#include "../../LinearMath/btAlignedObjectArray.h"
+#include "LinearMath/btAlignedObjectArray.h"
 
 struct	btTriangle
 {
@@ -29,6 +29,14 @@ struct	btTriangle
 };
 
 ///btTriangleBuffer can be useful to collect and store overlapping triangles between AABB and concave objects that support 'processAllTriangles'
+///Example usage of this class:
+///			btTriangleBuffer	triBuf;
+///			concaveShape->processAllTriangles(&triBuf,aabbMin, aabbMax);
+///			for (int i=0;i<triBuf.getNumTriangles();i++)
+///			{
+///				const btTriangle& tri = triBuf.getTriangle(i);
+///				//do something useful here with the triangle
+///			}
 class btTriangleBuffer : public btTriangleCallback
 {
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleCallback.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleCallback.h
index fbb87bc4fd8..cb760be80ca 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleCallback.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleCallback.h
@@ -16,9 +16,11 @@ subject to the following restrictions:
 #ifndef TRIANGLE_CALLBACK_H
 #define TRIANGLE_CALLBACK_H
 
-#include "../../LinearMath/btVector3.h"
+#include "LinearMath/btVector3.h"
 
 
+///The btTriangleCallback provides a callback for each overlapping triangle when calling processAllTriangles.
+///This callback is called by processAllTriangles for all btConcaveShape derived class, such as  btBvhTriangleMeshShape, btStaticPlaneShape and btHeightfieldTerrainShape.
 class btTriangleCallback
 {
 public:
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp
index 00847861cf1..8d634a67143 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp
@@ -4,8 +4,8 @@ Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
 
 This software is provided 'as-is', without any express or implied warranty.
 In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
 subject to the following restrictions:
 
 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
@@ -18,34 +18,43 @@ subject to the following restrictions:
 btTriangleIndexVertexArray::btTriangleIndexVertexArray(int numTriangles,int* triangleIndexBase,int triangleIndexStride,int numVertices,btScalar* vertexBase,int vertexStride)
 {
 	btIndexedMesh mesh;
-	
+
 	mesh.m_numTriangles = numTriangles;
 	mesh.m_triangleIndexBase = (const unsigned char *)triangleIndexBase;
 	mesh.m_triangleIndexStride = triangleIndexStride;
 	mesh.m_numVertices = numVertices;
 	mesh.m_vertexBase = (const unsigned char *)vertexBase;
 	mesh.m_vertexStride = vertexStride;
-	
+
 	addIndexedMesh(mesh);
 
 }
 
+btTriangleIndexVertexArray::~btTriangleIndexVertexArray()
+{
+
+}
+
 void	btTriangleIndexVertexArray::getLockedVertexIndexBase(unsigned char **vertexbase, int& numverts,PHY_ScalarType& type, int& vertexStride,unsigned char **indexbase,int & indexstride,int& numfaces,PHY_ScalarType& indicestype,int subpart)
 {
 	btAssert(subpart< getNumSubParts() );
-	
+
 	btIndexedMesh& mesh = m_indexedMeshes[subpart];
 
 	numverts = mesh.m_numVertices;
 	(*vertexbase) = (unsigned char *) mesh.m_vertexBase;
+	#ifdef BT_USE_DOUBLE_PRECISION
+	type = PHY_DOUBLE;
+	#else
 	type = PHY_FLOAT;
+	#endif
 	vertexStride = mesh.m_vertexStride;
 
 	numfaces = mesh.m_numTriangles;
 
 	(*indexbase) = (unsigned char *)mesh.m_triangleIndexBase;
 	indexstride = mesh.m_triangleIndexStride;
-	indicestype = PHY_INTEGER;
+	indicestype = mesh.m_indexType;
 }
 
 void	btTriangleIndexVertexArray::getLockedReadOnlyVertexIndexBase(const unsigned char **vertexbase, int& numverts,PHY_ScalarType& type, int& vertexStride,const unsigned char **indexbase,int & indexstride,int& numfaces,PHY_ScalarType& indicestype,int subpart) const
@@ -54,12 +63,34 @@ void	btTriangleIndexVertexArray::getLockedReadOnlyVertexIndexBase(const unsigned
 
 	numverts = mesh.m_numVertices;
 	(*vertexbase) = (const unsigned char *)mesh.m_vertexBase;
+	#ifdef BT_USE_DOUBLE_PRECISION
+	type = PHY_DOUBLE;
+	#else
 	type = PHY_FLOAT;
+	#endif
 	vertexStride = mesh.m_vertexStride;
 
 	numfaces = mesh.m_numTriangles;
 	(*indexbase) = (const unsigned char *)mesh.m_triangleIndexBase;
 	indexstride = mesh.m_triangleIndexStride;
-	indicestype = PHY_INTEGER;
+	indicestype = mesh.m_indexType;
+}
+
+bool	btTriangleIndexVertexArray::hasPremadeAabb() const
+{
+	return (m_hasAabb == 1);
+}
+
+void	btTriangleIndexVertexArray::setPremadeAabb(const btVector3& aabbMin, const btVector3& aabbMax )
+{
+	m_aabbMin = aabbMin;
+	m_aabbMax = aabbMax;
+	m_hasAabb = 1; // this is intentionally an int see notes in header
+}
+
+void	btTriangleIndexVertexArray::getPremadeAabb(btVector3* aabbMin, btVector3* aabbMax ) const
+{
+	*aabbMin = m_aabbMin;
+	*aabbMax = m_aabbMax;
 }
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h
index 6ab6a762b39..e546675f802 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h
@@ -17,48 +17,62 @@ subject to the following restrictions:
 #define BT_TRIANGLE_INDEX_VERTEX_ARRAY_H
 
 #include "btStridingMeshInterface.h"
-#include "../../LinearMath/btAlignedObjectArray.h"
+#include "LinearMath/btAlignedObjectArray.h"
+#include "LinearMath/btScalar.h"
 
-///IndexedMesh indexes into existing vertex and index arrays, in a similar way OpenGL glDrawElements
-///instead of the number of indices, we pass the number of triangles
-///todo: explain with pictures
+
+///The btIndexedMesh indexes a single vertex and index array. Multiple btIndexedMesh objects can be passed into a btTriangleIndexVertexArray using addIndexedMesh.
+///Instead of the number of indices, we pass the number of triangles.
 ATTRIBUTE_ALIGNED16( struct)	btIndexedMesh
 {
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
 	int			m_numTriangles;
 	const unsigned char *		m_triangleIndexBase;
 	int			m_triangleIndexStride;
 	int			m_numVertices;
 	const unsigned char *		m_vertexBase;
 	int			m_vertexStride;
-	int			pad[2];
+	// The index type is set when adding an indexed mesh to the
+	// btTriangleIndexVertexArray, do not set it manually
+	PHY_ScalarType		m_indexType;
+	int			pad;
 }
 ;
 
 
 typedef btAlignedObjectArray<btIndexedMesh>	IndexedMeshArray;
 
-///TriangleIndexVertexArray allows to use multiple meshes, by indexing into existing triangle/index arrays.
+///The btTriangleIndexVertexArray allows to access multiple triangle meshes, by indexing into existing triangle/index arrays.
 ///Additional meshes can be added using addIndexedMesh
 ///No duplcate is made of the vertex/index data, it only indexes into external vertex/index arrays.
 ///So keep those arrays around during the lifetime of this btTriangleIndexVertexArray.
 ATTRIBUTE_ALIGNED16( class) btTriangleIndexVertexArray : public btStridingMeshInterface
 {
+protected:
 	IndexedMeshArray	m_indexedMeshes;
-	int m_pad[3];
+	int m_pad[2];
+	int m_hasAabb; // using int instead of bool to maintain alignment
+	btVector3 m_aabbMin;
+	btVector3 m_aabbMax;
 
-		
 public:
 
-	btTriangleIndexVertexArray()
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	btTriangleIndexVertexArray() : m_hasAabb(0)
 	{
 	}
 
+	virtual ~btTriangleIndexVertexArray();
+
 	//just to be backwards compatible
-	btTriangleIndexVertexArray(int numTriangleIndices,int* triangleIndexBase,int triangleIndexStride,int numVertices,btScalar* vertexBase,int vertexStride);
+	btTriangleIndexVertexArray(int numTriangles,int* triangleIndexBase,int triangleIndexStride,int numVertices,btScalar* vertexBase,int vertexStride);
 	
-	void	addIndexedMesh(const btIndexedMesh& mesh)
+	void	addIndexedMesh(const btIndexedMesh& mesh, PHY_ScalarType indexType = PHY_INTEGER)
 	{
 		m_indexedMeshes.push_back(mesh);
+		m_indexedMeshes[m_indexedMeshes.size()-1].m_indexType = indexType;
 	}
 	
 	
@@ -91,6 +105,10 @@ public:
 	virtual void	preallocateVertices(int numverts){(void) numverts;}
 	virtual void	preallocateIndices(int numindices){(void) numindices;}
 
+	virtual bool	hasPremadeAabb() const;
+	virtual void	setPremadeAabb(const btVector3& aabbMin, const btVector3& aabbMax );
+	virtual void	getPremadeAabb(btVector3* aabbMin, btVector3* aabbMax ) const;
+
 }
 ;
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp
new file mode 100644
index 00000000000..492854ff646
--- /dev/null
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp
@@ -0,0 +1,86 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+///This file was created by Alex Silverman
+
+#include "btTriangleIndexVertexMaterialArray.h"
+
+btTriangleIndexVertexMaterialArray::btTriangleIndexVertexMaterialArray(int numTriangles,int* triangleIndexBase,int triangleIndexStride,
+                                   int numVertices,btScalar* vertexBase,int vertexStride,
+                                   int numMaterials, unsigned char* materialBase, int materialStride,
+                                   int* triangleMaterialsBase, int materialIndexStride) :
+btTriangleIndexVertexArray(numTriangles, triangleIndexBase, triangleIndexStride, numVertices, vertexBase, vertexStride)
+{
+    btMaterialProperties mat;
+
+    mat.m_numMaterials = numMaterials;
+    mat.m_materialBase = materialBase;
+    mat.m_materialStride = materialStride;
+#ifdef BT_USE_DOUBLE_PRECISION
+    mat.m_materialType = PHY_DOUBLE;
+#else
+    mat.m_materialType = PHY_FLOAT;
+#endif
+
+    mat.m_numTriangles = numTriangles;
+    mat.m_triangleMaterialsBase = (unsigned char *)triangleMaterialsBase;
+    mat.m_triangleMaterialStride = materialIndexStride;
+    mat.m_triangleType = PHY_INTEGER;
+
+    addMaterialProperties(mat);
+}
+
+
+void btTriangleIndexVertexMaterialArray::getLockedMaterialBase(unsigned char **materialBase, int& numMaterials, PHY_ScalarType& materialType, int& materialStride,
+                                   unsigned char ** triangleMaterialBase, int& numTriangles, int& triangleMaterialStride, PHY_ScalarType& triangleType, int subpart)
+{
+    btAssert(subpart< getNumSubParts() );
+
+    btMaterialProperties& mats = m_materials[subpart];
+
+    numMaterials = mats.m_numMaterials;
+    (*materialBase) = (unsigned char *) mats.m_materialBase;
+#ifdef BT_USE_DOUBLE_PRECISION
+    materialType = PHY_DOUBLE;
+#else
+    materialType = PHY_FLOAT;
+#endif
+    materialStride = mats.m_materialStride;
+
+    numTriangles = mats.m_numTriangles;
+    (*triangleMaterialBase) = (unsigned char *)mats.m_triangleMaterialsBase;
+    triangleMaterialStride = mats.m_triangleMaterialStride;
+    triangleType = mats.m_triangleType;
+}
+
+void btTriangleIndexVertexMaterialArray::getLockedReadOnlyMaterialBase(const unsigned char **materialBase, int& numMaterials, PHY_ScalarType& materialType, int& materialStride,
+                                           const unsigned char ** triangleMaterialBase, int& numTriangles, int& triangleMaterialStride, PHY_ScalarType& triangleType, int subpart)
+{
+    btMaterialProperties& mats = m_materials[subpart];
+
+    numMaterials = mats.m_numMaterials;
+    (*materialBase) = (const unsigned char *) mats.m_materialBase;
+#ifdef BT_USE_DOUBLE_PRECISION
+    materialType = PHY_DOUBLE;
+#else
+    materialType = PHY_FLOAT;
+#endif
+    materialStride = mats.m_materialStride;
+
+    numTriangles = mats.m_numTriangles;
+    (*triangleMaterialBase) = (const unsigned char *)mats.m_triangleMaterialsBase;
+    triangleMaterialStride = mats.m_triangleMaterialStride;
+    triangleType = mats.m_triangleType;
+}
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h
new file mode 100644
index 00000000000..69a2e631458
--- /dev/null
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h
@@ -0,0 +1,84 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+///This file was created by Alex Silverman
+
+#ifndef BT_MULTIMATERIAL_TRIANGLE_INDEX_VERTEX_ARRAY_H
+#define BT_MULTIMATERIAL_TRIANGLE_INDEX_VERTEX_ARRAY_H
+
+#include "btTriangleIndexVertexArray.h"
+
+
+ATTRIBUTE_ALIGNED16( struct)	btMaterialProperties
+{
+    ///m_materialBase ==========> 2 btScalar values make up one material, friction then restitution
+    int m_numMaterials;
+    const unsigned char * m_materialBase;
+    int m_materialStride;
+    PHY_ScalarType m_materialType;
+    ///m_numTriangles <=========== This exists in the btIndexedMesh object for the same subpart, but since we're
+    ///                           padding the structure, it can be reproduced at no real cost
+    ///m_triangleMaterials =====> 1 integer value makes up one entry
+    ///                           eg: m_triangleMaterials[1] = 5; // This will set triangle 2 to use material 5
+    int m_numTriangles; 
+    const unsigned char * m_triangleMaterialsBase;
+    int m_triangleMaterialStride;
+    ///m_triangleType <========== Automatically set in addMaterialProperties
+    PHY_ScalarType m_triangleType;
+};
+
+typedef btAlignedObjectArray<btMaterialProperties>	MaterialArray;
+
+///Teh btTriangleIndexVertexMaterialArray is built on TriangleIndexVertexArray
+///The addition of a material array allows for the utilization of the partID and
+///triangleIndex that are returned in the ContactAddedCallback.  As with
+///TriangleIndexVertexArray, no duplicate is made of the material data, so it
+///is the users responsibility to maintain the array during the lifetime of the
+///TriangleIndexVertexMaterialArray.
+ATTRIBUTE_ALIGNED16(class) btTriangleIndexVertexMaterialArray : public btTriangleIndexVertexArray
+{
+protected:
+    MaterialArray       m_materials;
+		
+public:
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+    btTriangleIndexVertexMaterialArray()
+	{
+	}
+
+    btTriangleIndexVertexMaterialArray(int numTriangles,int* triangleIndexBase,int triangleIndexStride,
+        int numVertices,btScalar* vertexBase,int vertexStride,
+        int numMaterials, unsigned char* materialBase, int materialStride,
+        int* triangleMaterialsBase, int materialIndexStride);
+
+    virtual ~btTriangleIndexVertexMaterialArray() {}
+
+    void	addMaterialProperties(const btMaterialProperties& mat, PHY_ScalarType triangleType = PHY_INTEGER)
+    {
+        m_materials.push_back(mat);
+        m_materials[m_materials.size()-1].m_triangleType = triangleType;
+    }
+
+    virtual void getLockedMaterialBase(unsigned char **materialBase, int& numMaterials, PHY_ScalarType& materialType, int& materialStride,
+        unsigned char ** triangleMaterialBase, int& numTriangles, int& triangleMaterialStride, PHY_ScalarType& triangleType ,int subpart = 0);
+
+    virtual void getLockedReadOnlyMaterialBase(const unsigned char **materialBase, int& numMaterials, PHY_ScalarType& materialType, int& materialStride,
+        const unsigned char ** triangleMaterialBase, int& numTriangles, int& triangleMaterialStride, PHY_ScalarType& triangleType, int subpart = 0);
+
+}
+;
+
+#endif //BT_MULTIMATERIAL_TRIANGLE_INDEX_VERTEX_ARRAY_H
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp
index 98c54ef45f8..bcea97052d6 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp
@@ -14,47 +14,102 @@ subject to the following restrictions:
 */
 
 #include "btTriangleMesh.h"
-#include <assert.h>
 
 
-btTriangleMesh::btTriangleMesh ()
+
+btTriangleMesh::btTriangleMesh (bool use32bitIndices,bool use4componentVertices)
+:m_use32bitIndices(use32bitIndices),
+m_use4componentVertices(use4componentVertices)
 {
+	btIndexedMesh meshIndex;
+	meshIndex.m_numTriangles = 0;
+	meshIndex.m_numVertices = 0;
+	meshIndex.m_indexType = PHY_INTEGER;
+	meshIndex.m_triangleIndexBase = 0;
+	meshIndex.m_triangleIndexStride = 3*sizeof(int);
+	meshIndex.m_vertexBase = 0;
+	meshIndex.m_vertexStride = sizeof(btVector3);
+	m_indexedMeshes.push_back(meshIndex);
+
+	if (m_use32bitIndices)
+	{
+		m_indexedMeshes[0].m_numTriangles = m_32bitIndices.size()/3;
+		m_indexedMeshes[0].m_triangleIndexBase = (unsigned char*) &m_32bitIndices[0];
+		m_indexedMeshes[0].m_indexType = PHY_INTEGER;
+		m_indexedMeshes[0].m_triangleIndexStride = 3*sizeof(int);
+	} else
+	{
+		m_indexedMeshes[0].m_numTriangles = m_16bitIndices.size()/3;
+		m_indexedMeshes[0].m_triangleIndexBase = (unsigned char*) &m_16bitIndices[0];
+		m_indexedMeshes[0].m_indexType = PHY_SHORT;
+		m_indexedMeshes[0].m_triangleIndexStride = 3*sizeof(short int);
+	}
+
+	if (m_use4componentVertices)
+	{
+		m_indexedMeshes[0].m_numVertices = m_4componentVertices.size();
+		m_indexedMeshes[0].m_vertexBase = (unsigned char*)&m_4componentVertices[0];
+		m_indexedMeshes[0].m_vertexStride = sizeof(btVector3);
+	} else
+	{
+		m_indexedMeshes[0].m_numVertices = m_3componentVertices.size()/3;
+		m_indexedMeshes[0].m_vertexBase = (unsigned char*)&m_3componentVertices[0];
+		m_indexedMeshes[0].m_vertexStride = 3*sizeof(btScalar);
+	}
+
 
 }
 
-void	btTriangleMesh::getLockedVertexIndexBase(unsigned char **vertexbase, int& numverts,PHY_ScalarType& type, int& stride,unsigned char **indexbase,int & indexstride,int& numfaces,PHY_ScalarType& indicestype,int subpart)
+		
+void	btTriangleMesh::addTriangle(const btVector3& vertex0,const btVector3& vertex1,const btVector3& vertex2)
 {
-	(void)subpart;
-	numverts = m_vertices.size();
-	*vertexbase = (unsigned char*)&m_vertices[0];
-	type = PHY_FLOAT;
-	stride = sizeof(btVector3);
+	m_indexedMeshes[0].m_numTriangles++;
+	m_indexedMeshes[0].m_numVertices+=3;
 
-	numfaces = m_indices.size()/3;
-	*indexbase = (unsigned char*) &m_indices[0];
-	indicestype = PHY_INTEGER;
-	indexstride = 3*sizeof(int);
+	if (m_use4componentVertices)
+	{
+		m_4componentVertices.push_back(vertex0);
+		m_4componentVertices.push_back(vertex1);
+		m_4componentVertices.push_back(vertex2);
+		m_indexedMeshes[0].m_vertexBase = (unsigned char*)&m_4componentVertices[0];
+	} else
+	{
+		m_3componentVertices.push_back(vertex0.getX());
+		m_3componentVertices.push_back(vertex0.getY());
+		m_3componentVertices.push_back(vertex0.getZ());
 
+		m_3componentVertices.push_back(vertex1.getX());
+		m_3componentVertices.push_back(vertex1.getY());
+		m_3componentVertices.push_back(vertex1.getZ());
+
+		m_3componentVertices.push_back(vertex2.getX());
+		m_3componentVertices.push_back(vertex2.getY());
+		m_3componentVertices.push_back(vertex2.getZ());
+		m_indexedMeshes[0].m_vertexBase = (unsigned char*)&m_3componentVertices[0];
+	}
+
+	if (m_use32bitIndices)
+	{
+		int curIndex = m_32bitIndices.size();
+		m_32bitIndices.push_back(curIndex++);
+		m_32bitIndices.push_back(curIndex++);
+		m_32bitIndices.push_back(curIndex++);
+		m_indexedMeshes[0].m_triangleIndexBase = (unsigned char*) &m_32bitIndices[0];
+	} else
+	{
+		short curIndex = static_cast<short>(m_16bitIndices.size());
+		m_16bitIndices.push_back(curIndex++);
+		m_16bitIndices.push_back(curIndex++);
+		m_16bitIndices.push_back(curIndex++);
+		m_indexedMeshes[0].m_triangleIndexBase = (unsigned char*) &m_16bitIndices[0];
+	}
 }
 
-void	btTriangleMesh::getLockedReadOnlyVertexIndexBase(const unsigned char **vertexbase, int& numverts,PHY_ScalarType& type, int& stride,const unsigned char **indexbase,int & indexstride,int& numfaces,PHY_ScalarType& indicestype,int subpart) const
+int btTriangleMesh::getNumTriangles() const
 {
-	(void)subpart;
-	numverts = m_vertices.size();
-	*vertexbase = (unsigned char*)&m_vertices[0];
-	type = PHY_FLOAT;
-	stride = sizeof(btVector3);
-
-	numfaces = m_indices.size()/3;
-	*indexbase = (unsigned char*) &m_indices[0];
-	indicestype = PHY_INTEGER;
-	indexstride = 3*sizeof(int);
-
-}
-
-
-
-int		btTriangleMesh::getNumSubParts() const
-{
-	return 1;
+	if (m_use32bitIndices)
+	{
+		return m_32bitIndices.size() / 3;
+	}
+	return m_16bitIndices.size() / 3;
 }
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.h
index 525f5336b48..e4d41d5ede0 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.h
@@ -17,54 +17,42 @@ subject to the following restrictions:
 #ifndef TRIANGLE_MESH_H
 #define TRIANGLE_MESH_H
 
-#include "btStridingMeshInterface.h"
-#include "../../LinearMath/btVector3.h"
-#include "../../LinearMath/btAlignedObjectArray.h"
+#include "btTriangleIndexVertexArray.h"
+#include "LinearMath/btVector3.h"
+#include "LinearMath/btAlignedObjectArray.h"
 
-///TriangleMesh provides storage for a concave triangle mesh. It can be used as data for the btTriangleMeshShape.
-class btTriangleMesh : public btStridingMeshInterface
+///The btTriangleMesh class is a convenience class derived from btTriangleIndexVertexArray, that provides storage for a concave triangle mesh. It can be used as data for the btBvhTriangleMeshShape.
+///It allows either 32bit or 16bit indices, and 4 (x-y-z-w) or 3 (x-y-z) component vertices.
+///If you want to share triangle/index data between graphics mesh and collision mesh (btBvhTriangleMeshShape), you can directly use btTriangleIndexVertexArray or derive your own class from btStridingMeshInterface.
+///Performance of btTriangleMesh and btTriangleIndexVertexArray used in a btBvhTriangleMeshShape is the same.
+class btTriangleMesh : public btTriangleIndexVertexArray
 {
-	btAlignedObjectArray<btVector3>	m_vertices;
-	btAlignedObjectArray<int>		m_indices;
+	btAlignedObjectArray<btVector3>	m_4componentVertices;
+	btAlignedObjectArray<float>		m_3componentVertices;
+
+	btAlignedObjectArray<unsigned int>		m_32bitIndices;
+	btAlignedObjectArray<unsigned short int>		m_16bitIndices;
+	bool	m_use32bitIndices;
+	bool	m_use4componentVertices;
+
 
 	public:
-		btTriangleMesh ();
+		btTriangleMesh (bool use32bitIndices=true,bool use4componentVertices=true);
 
-		void	addTriangle(const btVector3& vertex0,const btVector3& vertex1,const btVector3& vertex2)
+		bool	getUse32bitIndices() const
 		{
-			int curIndex = m_indices.size();
-			m_vertices.push_back(vertex0);
-			m_vertices.push_back(vertex1);
-			m_vertices.push_back(vertex2);
-
-			m_indices.push_back(curIndex++);
-			m_indices.push_back(curIndex++);
-			m_indices.push_back(curIndex++);
+			return m_use32bitIndices;
 		}
 
-		int getNumTriangles() const
+		bool	getUse4componentVertices() const
 		{
-			return m_indices.size() / 3;
+			return m_use4componentVertices;
 		}
-
 		
-
-//StridingMeshInterface interface implementation
-
-		virtual void	getLockedVertexIndexBase(unsigned char **vertexbase, int& numverts,PHY_ScalarType& type, int& stride,unsigned char **indexbase,int & indexstride,int& numfaces,PHY_ScalarType& indicestype,int subpart=0);
-
-		virtual void	getLockedReadOnlyVertexIndexBase(const unsigned char **vertexbase, int& numverts,PHY_ScalarType& type, int& stride,const unsigned char **indexbase,int & indexstride,int& numfaces,PHY_ScalarType& indicestype,int subpart=0) const;
-
-		/// unLockVertexBase finishes the access to a subpart of the triangle mesh
-		/// make a call to unLockVertexBase when the read and write access (using getLockedVertexIndexBase) is finished
-		virtual void	unLockVertexBase(int subpart) {(void) subpart;}
-
-		virtual void	unLockReadOnlyVertexBase(int subpart) const { (void) subpart;}
-
-		/// getNumSubParts returns the number of seperate subparts
-		/// each subpart has a continuous array of vertices and indices
-		virtual int		getNumSubParts() const;
+		void	addTriangle(const btVector3& vertex0,const btVector3& vertex1,const btVector3& vertex2);
 		
+		int getNumTriangles() const;
+
 		virtual void	preallocateVertices(int numverts){(void) numverts;}
 		virtual void	preallocateIndices(int numindices){(void) numindices;}
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp
index ed81897b515..cd0a00bbd6f 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp
@@ -20,12 +20,18 @@ subject to the following restrictions:
 #include "LinearMath/btAabbUtil2.h"
 #include "BulletCollision/CollisionShapes/btCollisionMargin.h"
 
-#include "stdio.h"
 
 btTriangleMeshShape::btTriangleMeshShape(btStridingMeshInterface* meshInterface)
 : m_meshInterface(meshInterface)
 {
-	recalcLocalAabb();
+	if(meshInterface->hasPremadeAabb())
+	{
+		meshInterface->getPremadeAabb(&m_localAabbMin, &m_localAabbMax);
+	}
+	else
+	{
+		recalcLocalAabb();
+	}
 }
 
 
@@ -138,6 +144,7 @@ const btVector3& btTriangleMeshShape::getLocalScaling() const
 //#define DEBUG_TRIANGLE_MESH
 
 
+
 void	btTriangleMeshShape::processAllTriangles(btTriangleCallback* callback,const btVector3& aabbMin,const btVector3& aabbMax) const
 {
 		struct FilteredCallback : public btInternalTriangleIndexCallback
@@ -174,8 +181,7 @@ void	btTriangleMeshShape::processAllTriangles(btTriangleCallback* callback,const
 
 
 
-
-void	btTriangleMeshShape::calculateLocalInertia(btScalar mass,btVector3& inertia)
+void	btTriangleMeshShape::calculateLocalInertia(btScalar mass,btVector3& inertia) const
 {
 	(void)mass;
 	//moving concave objects not supported
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h
index e6173e47640..9fba77cb547 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h
@@ -20,17 +20,19 @@ subject to the following restrictions:
 #include "btStridingMeshInterface.h"
 
 
-///Concave triangle mesh. Uses an interface to access the triangles to allow for sharing graphics/physics triangles.
+///The btTriangleMeshShape is an internal concave triangle mesh interface. Don't use this class directly, use btBvhTriangleMeshShape instead.
 class btTriangleMeshShape : public btConcaveShape
 {
 protected:
 	btVector3	m_localAabbMin;
 	btVector3	m_localAabbMax;
 	btStridingMeshInterface* m_meshInterface;
-	
+
+	///btTriangleMeshShape constructor has been disabled/protected, so that users will not mistakenly use this class.
+	///Don't use btTriangleMeshShape but use btBvhTriangleMeshShape instead!
+	btTriangleMeshShape(btStridingMeshInterface* meshInterface);
 
 public:
-	btTriangleMeshShape(btStridingMeshInterface* meshInterface);
 
 	virtual ~btTriangleMeshShape();
 
@@ -44,16 +46,11 @@ public:
 
 	void	recalcLocalAabb();
 
-	virtual int	getShapeType() const
-	{
-		return TRIANGLE_MESH_SHAPE_PROXYTYPE;
-	}
-
 	virtual void getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const;
 
 	virtual void	processAllTriangles(btTriangleCallback* callback,const btVector3& aabbMin,const btVector3& aabbMax) const;
 
-	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia);
+	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia) const;
 
 	virtual void	setLocalScaling(const btVector3& scaling);
 	virtual const btVector3& getLocalScaling() const;
@@ -70,7 +67,7 @@ public:
 
 
 	//debugging
-	virtual char*	getName()const {return "TRIANGLEMESH";}
+	virtual const char*	getName()const {return "TRIANGLEMESH";}
 
 
 };
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleShape.h
index c2e240c051c..ba7aa0c32a0 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleShape.h
@@ -27,7 +27,6 @@ public:
 
 	btVector3	m_vertices1[3];
 
-
 	virtual int getNumVertices() const
 	{
 		return 3;
@@ -84,14 +83,13 @@ public:
 
 
 
-	btTriangleShape(const btVector3& p0,const btVector3& p1,const btVector3& p2)
-	{
-		m_vertices1[0] = p0;
-		m_vertices1[1] = p1;
-		m_vertices1[2] = p2;
-	}
+    btTriangleShape(const btVector3& p0,const btVector3& p1,const btVector3& p2)
+    {
+        m_vertices1[0] = p0;
+        m_vertices1[1] = p1;
+        m_vertices1[2] = p2;
+    }
 
-	
 
 	virtual void getPlane(btVector3& planeNormal,btPoint3& planeSupport,int i) const
 	{
@@ -116,7 +114,7 @@ public:
 		planeSupport = m_vertices1[0];
 	}
 
-	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia)
+	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia) const
 	{
 		(void)mass;
 		btAssert(0);
@@ -155,7 +153,7 @@ public:
 		return false;
 	}
 		//debugging
-		virtual char*	getName()const
+		virtual const char*	getName()const
 		{
 			return "Triangle";
 		}
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.cpp
new file mode 100644
index 00000000000..ef340286cb0
--- /dev/null
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.cpp
@@ -0,0 +1,114 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2007 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btUniformScalingShape.h"
+
+btUniformScalingShape::btUniformScalingShape(	btConvexShape* convexChildShape,btScalar uniformScalingFactor):
+m_childConvexShape(convexChildShape),
+m_uniformScalingFactor(uniformScalingFactor)
+{
+}
+	
+btUniformScalingShape::~btUniformScalingShape()
+{
+}
+	
+
+btVector3	btUniformScalingShape::localGetSupportingVertexWithoutMargin(const btVector3& vec)const
+{
+	btVector3 tmpVertex;
+	tmpVertex = m_childConvexShape->localGetSupportingVertexWithoutMargin(vec);
+	return tmpVertex*m_uniformScalingFactor;
+}
+
+void	btUniformScalingShape::batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors,btVector3* supportVerticesOut,int numVectors) const
+{
+	m_childConvexShape->batchedUnitVectorGetSupportingVertexWithoutMargin(vectors,supportVerticesOut,numVectors);
+	int i;
+	for (i=0;i<numVectors;i++)
+	{
+		supportVerticesOut[i] = supportVerticesOut[i] * m_uniformScalingFactor;
+	}
+}
+
+
+btVector3	btUniformScalingShape::localGetSupportingVertex(const btVector3& vec)const
+{
+	btVector3 tmpVertex;
+	tmpVertex = m_childConvexShape->localGetSupportingVertex(vec);
+	return tmpVertex*m_uniformScalingFactor;
+}
+
+
+void	btUniformScalingShape::calculateLocalInertia(btScalar mass,btVector3& inertia) const
+{
+
+	///this linear upscaling is not realistic, but we don't deal with large mass ratios...
+	btVector3 tmpInertia;
+	m_childConvexShape->calculateLocalInertia(mass,tmpInertia);
+	inertia = tmpInertia * m_uniformScalingFactor;
+}
+
+
+	///getAabb's default implementation is brute force, expected derived classes to implement a fast dedicated version
+void btUniformScalingShape::getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const
+{
+	m_childConvexShape->getAabb(t,aabbMin,aabbMax);
+	btVector3 aabbCenter = (aabbMax+aabbMin)*btScalar(0.5);
+	btVector3 scaledAabbHalfExtends = (aabbMax-aabbMin)*btScalar(0.5)*m_uniformScalingFactor;
+
+	aabbMin = aabbCenter - scaledAabbHalfExtends;
+	aabbMax = aabbCenter + scaledAabbHalfExtends;
+
+}
+
+void btUniformScalingShape::getAabbSlow(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const
+{
+	m_childConvexShape->getAabbSlow(t,aabbMin,aabbMax);
+	btVector3 aabbCenter = (aabbMax+aabbMin)*btScalar(0.5);
+	btVector3 scaledAabbHalfExtends = (aabbMax-aabbMin)*btScalar(0.5)*m_uniformScalingFactor;
+
+	aabbMin = aabbCenter - scaledAabbHalfExtends;
+	aabbMax = aabbCenter + scaledAabbHalfExtends;
+}
+
+void	btUniformScalingShape::setLocalScaling(const btVector3& scaling) 
+{
+	m_childConvexShape->setLocalScaling(scaling);
+}
+
+const btVector3& btUniformScalingShape::getLocalScaling() const
+{
+	return m_childConvexShape->getLocalScaling();
+}
+
+void	btUniformScalingShape::setMargin(btScalar margin)
+{
+	m_childConvexShape->setMargin(margin);
+}
+btScalar	btUniformScalingShape::getMargin() const
+{
+	return m_childConvexShape->getMargin() * m_uniformScalingFactor;
+}
+
+int		btUniformScalingShape::getNumPreferredPenetrationDirections() const
+{
+	return m_childConvexShape->getNumPreferredPenetrationDirections();
+}
+	
+void	btUniformScalingShape::getPreferredPenetrationDirection(int index, btVector3& penetrationVector) const
+{
+	m_childConvexShape->getPreferredPenetrationDirection(index,penetrationVector);
+}
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.h
new file mode 100644
index 00000000000..1e17fc8e198
--- /dev/null
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.h
@@ -0,0 +1,88 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_UNIFORM_SCALING_SHAPE_H
+#define BT_UNIFORM_SCALING_SHAPE_H
+
+#include "btConvexShape.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types
+
+///The btUniformScalingShape allows to re-use uniform scaled instances of btConvexShape in a memory efficient way.
+///Istead of using btUniformScalingShape, it is better to use the non-uniform setLocalScaling method on convex shapes that implement it.
+class btUniformScalingShape : public btConvexShape
+{
+	btConvexShape*	m_childConvexShape;
+
+	btScalar	m_uniformScalingFactor;
+	
+	public:
+	
+	btUniformScalingShape(	btConvexShape* convexChildShape, btScalar uniformScalingFactor);
+	
+	virtual ~btUniformScalingShape();
+	
+	virtual btVector3	localGetSupportingVertexWithoutMargin(const btVector3& vec)const;
+
+	virtual btVector3	localGetSupportingVertex(const btVector3& vec)const;
+
+	virtual void	batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors,btVector3* supportVerticesOut,int numVectors) const;
+
+	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia) const;
+
+	btScalar	getUniformScalingFactor() const
+	{
+		return m_uniformScalingFactor;
+	}
+
+	btConvexShape*	getChildShape() 
+	{
+		return m_childConvexShape;
+	}
+
+	const btConvexShape*	getChildShape() const
+	{
+		return m_childConvexShape;
+	}
+
+	virtual const char*	getName()const 
+	{
+		return "UniformScalingShape";
+	}
+	
+	virtual int	getShapeType() const { return UNIFORM_SCALING_SHAPE_PROXYTYPE; }
+
+
+	///////////////////////////
+
+
+	///getAabb's default implementation is brute force, expected derived classes to implement a fast dedicated version
+	void getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const;
+
+	virtual void getAabbSlow(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const;
+
+	virtual void	setLocalScaling(const btVector3& scaling) ;
+	virtual const btVector3& getLocalScaling() const ;
+
+	virtual void	setMargin(btScalar margin);
+	virtual btScalar	getMargin() const;
+
+	virtual int		getNumPreferredPenetrationDirections() const;
+	
+	virtual void	getPreferredPenetrationDirection(int index, btVector3& penetrationVector) const;
+
+
+};
+
+#endif //BT_UNIFORM_SCALING_SHAPE_H
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp
index 2c565734e97..6551cfb92fe 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp
@@ -16,7 +16,6 @@ subject to the following restrictions:
 
 #include "btContinuousConvexCollision.h"
 #include "BulletCollision/CollisionShapes/btConvexShape.h"
-#include "BulletCollision/CollisionShapes/btMinkowskiSumShape.h"
 #include "BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h"
 #include "LinearMath/btTransformUtil.h"
 #include "BulletCollision/CollisionShapes/btSphereShape.h"
@@ -26,7 +25,7 @@ subject to the following restrictions:
 
 
 
-btContinuousConvexCollision::btContinuousConvexCollision ( btConvexShape*	convexA,btConvexShape*	convexB,btSimplexSolverInterface* simplexSolver, btConvexPenetrationDepthSolver* penetrationDepthSolver)
+btContinuousConvexCollision::btContinuousConvexCollision ( const btConvexShape*	convexA,const btConvexShape*	convexB,btSimplexSolverInterface* simplexSolver, btConvexPenetrationDepthSolver* penetrationDepthSolver)
 :m_simplexSolver(simplexSolver),
 m_penetrationDepthSolver(penetrationDepthSolver),
 m_convexA(convexA),m_convexB(convexB)
@@ -35,7 +34,7 @@ m_convexA(convexA),m_convexB(convexB)
 
 /// This maximum should not be necessary. It allows for untested/degenerate cases in production code.
 /// You don't want your game ever to lock-up.
-#define MAX_ITERATIONS 1000
+#define MAX_ITERATIONS 64
 
 bool	btContinuousConvexCollision::calcTimeOfImpact(
 				const btTransform& fromA,
@@ -52,10 +51,18 @@ bool	btContinuousConvexCollision::calcTimeOfImpact(
 	btTransformUtil::calculateVelocity(fromA,toA,btScalar(1.),linVelA,angVelA);
 	btTransformUtil::calculateVelocity(fromB,toB,btScalar(1.),linVelB,angVelB);
 
+
 	btScalar boundingRadiusA = m_convexA->getAngularMotionDisc();
 	btScalar boundingRadiusB = m_convexB->getAngularMotionDisc();
 
 	btScalar maxAngularProjectedVelocity = angVelA.length() * boundingRadiusA + angVelB.length() * boundingRadiusB;
+	btVector3 relLinVel = (linVelB-linVelA);
+
+	btScalar relLinVelocLength = (linVelB-linVelA).length();
+	
+	if ((relLinVelocLength+maxAngularProjectedVelocity) == 0.f)
+		return false;
+
 
 	btScalar radius = btScalar(0.001);
 
@@ -93,7 +100,7 @@ bool	btContinuousConvexCollision::calcTimeOfImpact(
 		btGjkPairDetector::ClosestPointInput input;
 	
 		//we don't use margins during CCD
-		gjk.setIgnoreMargin(true);
+	//	gjk.setIgnoreMargin(true);
 
 		input.m_transformA = fromA;
 		input.m_transformB = fromB;
@@ -108,25 +115,31 @@ bool	btContinuousConvexCollision::calcTimeOfImpact(
 		btScalar dist;
 		dist = pointCollector1.m_distance;
 		n = pointCollector1.m_normalOnBInWorld;
+
+		btScalar projectedLinearVelocity = relLinVel.dot(n);
 		
 		//not close enough
 		while (dist > radius)
 		{
 			numIter++;
 			if (numIter > maxIter)
+			{
 				return false; //todo: report a failure
-
+			}
 			btScalar dLambda = btScalar(0.);
 
+			projectedLinearVelocity = relLinVel.dot(n);
+
 			//calculate safe moving fraction from distance / (linear+rotational velocity)
 			
 			//btScalar clippedDist  = GEN_min(angularConservativeRadius,dist);
 			//btScalar clippedDist  = dist;
 			
-			btScalar projectedLinearVelocity = (linVelB-linVelA).dot(n);
 			
 			dLambda = dist / (projectedLinearVelocity+ maxAngularProjectedVelocity);
 
+			
+			
 			lambda = lambda + dLambda;
 
 			if (lambda > btScalar(1.))
@@ -135,9 +148,14 @@ bool	btContinuousConvexCollision::calcTimeOfImpact(
 			if (lambda < btScalar(0.))
 				return false;
 
+
 			//todo: next check with relative epsilon
 			if (lambda <= lastLambda)
+			{
+				return false;
+				//n.setValue(0,0,0);
 				break;
+			}
 			lastLambda = lambda;
 
 			
@@ -163,11 +181,13 @@ bool	btContinuousConvexCollision::calcTimeOfImpact(
 				{
 					//degenerate ?!
 					result.m_fraction = lastLambda;
-					result.m_normal = n;
+					n = pointCollector.m_normalOnBInWorld;
+					result.m_normal=n;//.setValue(1,1,1);// = n;
+					result.m_hitPoint = pointCollector.m_pointInWorld;
 					return true;
 				}
 				c = pointCollector.m_pointInWorld;		
-				
+				n = pointCollector.m_normalOnBInWorld;
 				dist = pointCollector.m_distance;
 			} else
 			{
@@ -177,8 +197,13 @@ bool	btContinuousConvexCollision::calcTimeOfImpact(
 
 		}
 
+		//don't report time of impact for motion away from the contact normal (or causes minor penetration)
+		if ((projectedLinearVelocity+ maxAngularProjectedVelocity)<=result.m_allowedPenetration)//SIMD_EPSILON)
+			return false;
+
 		result.m_fraction = lambda;
 		result.m_normal = n;
+		result.m_hitPoint = c;
 		return true;
 	}
 
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h
index 9901bab4b45..28c2b4d6156 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h
@@ -30,13 +30,13 @@ class btContinuousConvexCollision : public btConvexCast
 {
 	btSimplexSolverInterface* m_simplexSolver;
 	btConvexPenetrationDepthSolver*	m_penetrationDepthSolver;
-	btConvexShape*	m_convexA;
-	btConvexShape*	m_convexB;
+	const btConvexShape*	m_convexA;
+	const btConvexShape*	m_convexB;
 
 
 public:
 
-	btContinuousConvexCollision (btConvexShape*	shapeA,btConvexShape*	shapeB ,btSimplexSolverInterface* simplexSolver,btConvexPenetrationDepthSolver* penetrationDepthSolver);
+	btContinuousConvexCollision (const btConvexShape*	shapeA,const btConvexShape*	shapeB ,btSimplexSolverInterface* simplexSolver,btConvexPenetrationDepthSolver* penetrationDepthSolver);
 
 	virtual bool	calcTimeOfImpact(
 				const btTransform& fromA,
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexCast.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexCast.h
index 3101b59993d..0edf4dcd496 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexCast.h
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexCast.h
@@ -17,11 +17,11 @@ subject to the following restrictions:
 #ifndef CONVEX_CAST_H
 #define CONVEX_CAST_H
 
-#include "../../LinearMath/btTransform.h"
-#include "../../LinearMath/btVector3.h"
-#include "../../LinearMath/btScalar.h"
+#include "LinearMath/btTransform.h"
+#include "LinearMath/btVector3.h"
+#include "LinearMath/btScalar.h"
 class btMinkowskiSumShape;
-#include "../../LinearMath/btIDebugDraw.h"
+#include "LinearMath/btIDebugDraw.h"
 
 /// btConvexCast is an interface for Casting
 class btConvexCast
@@ -42,19 +42,21 @@ public:
 
 		CastResult()
 			:m_fraction(btScalar(1e30)),
-			m_debugDrawer(0)
+			m_debugDrawer(0),
+			m_allowedPenetration(btScalar(0))
 		{
 		}
 
 
 		virtual ~CastResult() {};
 
-		btVector3	m_normal;
-		btScalar	m_fraction;
 		btTransform	m_hitTransformA;
 		btTransform	m_hitTransformB;
-
+		btVector3	m_normal;
+		btVector3   m_hitPoint;
+		btScalar	m_fraction; //input and output
 		btIDebugDraw* m_debugDrawer;
+		btScalar	m_allowedPenetration;
 
 	};
 
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h
index 7caeba4be45..99690921317 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h
@@ -21,7 +21,7 @@ class btStackAlloc;
 class btVector3;
 #include "btSimplexSolverInterface.h"
 class btConvexShape;
-#include "../../LinearMath/btPoint3.h"
+#include "LinearMath/btPoint3.h"
 class btTransform;
 
 ///ConvexPenetrationDepthSolver provides an interface for penetration depth calculation.
@@ -31,7 +31,7 @@ public:
 	
 	virtual ~btConvexPenetrationDepthSolver() {};
 	virtual bool calcPenDepth( btSimplexSolverInterface& simplexSolver,
-		btConvexShape* convexA,btConvexShape* convexB,
+		const btConvexShape* convexA,const btConvexShape* convexB,
 					const btTransform& transA,const btTransform& transB,
 				btVector3& v, btPoint3& pa, btPoint3& pb,
 				class btIDebugDraw* debugDraw,btStackAlloc* stackAlloc
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h
index 15000c1ab61..db797d5141f 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h
@@ -16,8 +16,8 @@ subject to the following restrictions:
 
 #ifndef DISCRETE_COLLISION_DETECTOR1_INTERFACE_H
 #define DISCRETE_COLLISION_DETECTOR1_INTERFACE_H
-#include "../../LinearMath/btTransform.h"
-#include "../../LinearMath/btVector3.h"
+#include "LinearMath/btTransform.h"
+#include "LinearMath/btVector3.h"
 class btStackAlloc;
 
 /// This interface is made to be used by an iterative approach to do TimeOfImpact calculations
@@ -58,7 +58,7 @@ struct btDiscreteCollisionDetectorInterface
 	// give either closest points (distance > 0) or penetration (distance)
 	// the normal always points from B towards A
 	//
-	virtual void	getClosestPoints(const ClosestPointInput& input,Result& output,class btIDebugDraw* debugDraw) = 0;
+	virtual void	getClosestPoints(const ClosestPointInput& input,Result& output,class btIDebugDraw* debugDraw,bool swapResults=false) = 0;
 
 };
 
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp
index 93edffeafd6..bef697a0a11 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp
@@ -17,12 +17,17 @@ subject to the following restrictions:
 
 #include "btGjkConvexCast.h"
 #include "BulletCollision/CollisionShapes/btSphereShape.h"
-#include "BulletCollision/CollisionShapes/btMinkowskiSumShape.h"
 #include "btGjkPairDetector.h"
 #include "btPointCollector.h"
+#include "LinearMath/btTransformUtil.h"
 
+#ifdef BT_USE_DOUBLE_PRECISION
+#define MAX_ITERATIONS 64
+#else
+#define MAX_ITERATIONS 32
+#endif
 
-btGjkConvexCast::btGjkConvexCast(btConvexShape* convexA,btConvexShape* convexB,btSimplexSolverInterface* simplexSolver)
+btGjkConvexCast::btGjkConvexCast(const btConvexShape* convexA,const btConvexShape* convexB,btSimplexSolverInterface* simplexSolver)
 :m_simplexSolver(simplexSolver),
 m_convexA(convexA),
 m_convexB(convexB)
@@ -38,120 +43,113 @@ bool	btGjkConvexCast::calcTimeOfImpact(
 {
 
 
-	btMinkowskiSumShape combi(m_convexA,m_convexB);
-	btMinkowskiSumShape* convex = &combi;
+	m_simplexSolver->reset();
 
-	btTransform	rayFromLocalA;
-	btTransform	rayToLocalA;
-
-	rayFromLocalA = fromA.inverse()* fromB;
-	rayToLocalA = toA.inverse()* toB;
-
-
-	btTransform trA,trB;
-	trA = btTransform(fromA);
-	trB = btTransform(fromB);
-	trA.setOrigin(btPoint3(0,0,0));
-	trB.setOrigin(btPoint3(0,0,0));
-
-	convex->setTransformA(trA);
-	convex->setTransformB(trB);
-
-
-
-
-	btScalar radius = btScalar(0.01);
+	/// compute linear velocity for this interval, to interpolate
+	//assume no rotation/angular velocity, assert here?
+	btVector3 linVelA,linVelB;
+	linVelA = toA.getOrigin()-fromA.getOrigin();
+	linVelB = toB.getOrigin()-fromB.getOrigin();
 
+	btScalar radius = btScalar(0.001);
 	btScalar lambda = btScalar(0.);
-	btVector3 s = rayFromLocalA.getOrigin();
-	btVector3 r = rayToLocalA.getOrigin()-rayFromLocalA.getOrigin();
-	btVector3 x = s;
+	btVector3 v(1,0,0);
+
+	int maxIter = MAX_ITERATIONS;
+
 	btVector3 n;
-	n.setValue(0,0,0);
+	n.setValue(btScalar(0.),btScalar(0.),btScalar(0.));
 	bool hasResult = false;
 	btVector3 c;
+	btVector3 r = (linVelA-linVelB);
 
 	btScalar lastLambda = lambda;
+	//btScalar epsilon = btScalar(0.001);
 
+	int numIter = 0;
 	//first solution, using GJK
 
-	//no penetration support for now, perhaps pass a pointer when we really want it
-	btConvexPenetrationDepthSolver* penSolverPtr = 0;
 
 	btTransform identityTrans;
 	identityTrans.setIdentity();
 
-	btSphereShape	raySphere(btScalar(0.0));
-	raySphere.setMargin(btScalar(0.));
 
-	btTransform sphereTr;
-	sphereTr.setIdentity();
-	sphereTr.setOrigin( rayFromLocalA.getOrigin());
+//	result.drawCoordSystem(sphereTr);
 
-	result.drawCoordSystem(sphereTr);
-	{
-		btPointCollector	pointCollector1;
-		btGjkPairDetector gjk(&raySphere,convex,m_simplexSolver,penSolverPtr);		
+	btPointCollector	pointCollector;
 
-		btGjkPairDetector::ClosestPointInput input;
-		input.m_transformA = sphereTr;
-		input.m_transformB = identityTrans;
-		gjk.getClosestPoints(input,pointCollector1,0);
+		
+	btGjkPairDetector gjk(m_convexA,m_convexB,m_simplexSolver,0);//m_penetrationDepthSolver);		
+	btGjkPairDetector::ClosestPointInput input;
 
-		hasResult = pointCollector1.m_hasResult;
-		c = pointCollector1.m_pointInWorld;
-		n = pointCollector1.m_normalOnBInWorld;
-	}
+	//we don't use margins during CCD
+	//	gjk.setIgnoreMargin(true);
 
-	
+	input.m_transformA = fromA;
+	input.m_transformB = fromB;
+	gjk.getClosestPoints(input,pointCollector,0);
+
+	hasResult = pointCollector.m_hasResult;
+	c = pointCollector.m_pointInWorld;
 
 	if (hasResult)
 	{
 		btScalar dist;
-		dist = (c-x).length();
-		if (dist < radius)
-		{
-			//penetration
-			lastLambda = btScalar(1.);
-		}
+		dist = pointCollector.m_distance;
+		n = pointCollector.m_normalOnBInWorld;
+
+	
 
 		//not close enough
 		while (dist > radius)
 		{
-			
-			n = x - c;
-			btScalar nDotr = n.dot(r);
+			numIter++;
+			if (numIter > maxIter)
+			{
+				return false; //todo: report a failure
+			}
+			btScalar dLambda = btScalar(0.);
 
-			if (nDotr >= -(SIMD_EPSILON*SIMD_EPSILON))
+			btScalar projectedLinearVelocity = r.dot(n);
+			
+			dLambda = dist / (projectedLinearVelocity);
+
+			lambda = lambda - dLambda;
+
+			if (lambda > btScalar(1.))
 				return false;
-			
-			lambda = lambda - n.dot(n) / nDotr;
-			if (lambda <= lastLambda)
-				break;
 
+			if (lambda < btScalar(0.))
+				return false;
+
+			//todo: next check with relative epsilon
+			if (lambda <= lastLambda)
+			{
+				return false;
+				//n.setValue(0,0,0);
+				break;
+			}
 			lastLambda = lambda;
 
-			x = s + lambda * r;
-
-			sphereTr.setOrigin( x );
-			result.drawCoordSystem(sphereTr);
-			btPointCollector	pointCollector;
-			btGjkPairDetector gjk(&raySphere,convex,m_simplexSolver,penSolverPtr);
-			btGjkPairDetector::ClosestPointInput input;
-			input.m_transformA = sphereTr;
-			input.m_transformB = identityTrans;
+			//interpolate to next lambda
+			result.DebugDraw( lambda );
+			input.m_transformA.getOrigin().setInterpolate3(fromA.getOrigin(),toA.getOrigin(),lambda);
+			input.m_transformB.getOrigin().setInterpolate3(fromB.getOrigin(),toB.getOrigin(),lambda);
+			
 			gjk.getClosestPoints(input,pointCollector,0);
 			if (pointCollector.m_hasResult)
 			{
 				if (pointCollector.m_distance < btScalar(0.))
 				{
-					//degeneracy, report a hit
 					result.m_fraction = lastLambda;
-					result.m_normal = n;
+					n = pointCollector.m_normalOnBInWorld;
+					result.m_normal=n;
+					result.m_hitPoint = pointCollector.m_pointInWorld;
 					return true;
 				}
-				c = pointCollector.m_pointInWorld;			
-				dist = (c-x).length();
+				c = pointCollector.m_pointInWorld;		
+				n = pointCollector.m_normalOnBInWorld;
+				dist = pointCollector.m_distance;
 			} else
 			{
 				//??
@@ -160,15 +158,19 @@ bool	btGjkConvexCast::calcTimeOfImpact(
 
 		}
 
-		if (lastLambda < btScalar(1.))
-		{
-		
-			result.m_fraction = lastLambda;
-			result.m_normal = n;
-			return true;
-		}
+		//is n normalized?
+		//don't report time of impact for motion away from the contact normal (or causes minor penetration)
+		if (n.dot(r)>=-result.m_allowedPenetration)
+			return false;
+
+		result.m_fraction = lambda;
+		result.m_normal = n;
+		result.m_hitPoint = c;
+		return true;
 	}
 
 	return false;
+
+
 }
 
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h
index 3905c45e6d6..a977c9e83f7 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h
@@ -18,9 +18,9 @@ subject to the following restrictions:
 #ifndef GJK_CONVEX_CAST_H
 #define GJK_CONVEX_CAST_H
 
-#include "../CollisionShapes/btCollisionMargin.h"
+#include "BulletCollision/CollisionShapes/btCollisionMargin.h"
 
-#include "../../LinearMath/btVector3.h"
+#include "LinearMath/btVector3.h"
 #include "btConvexCast.h"
 class btConvexShape;
 class btMinkowskiSumShape;
@@ -30,12 +30,12 @@ class btMinkowskiSumShape;
 class btGjkConvexCast : public btConvexCast
 {
 	btSimplexSolverInterface*	m_simplexSolver;
-	btConvexShape*	m_convexA;
-	btConvexShape*	m_convexB;
+	const btConvexShape*	m_convexA;
+	const btConvexShape*	m_convexB;
 
 public:
 
-	btGjkConvexCast(btConvexShape*	convexA,btConvexShape* convexB,btSimplexSolverInterface* simplexSolver);
+	btGjkConvexCast(const btConvexShape*	convexA,const btConvexShape* convexB,btSimplexSolverInterface* simplexSolver);
 
 	/// cast a convex against another convex object
 	virtual bool	calcTimeOfImpact(
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa.cpp b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa.cpp
index 8abdfdbb7e5..36cdeeaefdb 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa.cpp
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa.cpp
@@ -26,7 +26,7 @@ Nov.2006
 
 #include "btGjkEpa.h"
 #include <string.h> //for memset
-#include <LinearMath/btStackAlloc.h>
+#include "LinearMath/btStackAlloc.h"
 
 #if defined(DEBUG) || defined (_DEBUG)
 #include <stdio.h> //for debug printf
@@ -580,8 +580,8 @@ using namespace	gjkepa_impl;
 
 
 //
-bool	btGjkEpaSolver::Collide(btConvexShape *shape0,const btTransform &wtrs0,
-								btConvexShape *shape1,const btTransform &wtrs1,
+bool	btGjkEpaSolver::Collide(const btConvexShape *shape0,const btTransform &wtrs0,
+								const btConvexShape *shape1,const btTransform &wtrs1,
 								btScalar	radialmargin,
 								btStackAlloc* stackAlloc,
 								sResults&	results)
@@ -602,13 +602,13 @@ GJK			gjk(stackAlloc,
 				wtrs1.getBasis(),wtrs1.getOrigin(),shape1,
 				radialmargin+EPA_accuracy);
 const Z		collide(gjk.SearchOrigin());
-results.gjk_iterations	=	gjk.iterations+1;
+results.gjk_iterations	=	static_cast<int>(gjk.iterations+1);
 if(collide)
 	{
 	/* Then EPA for penetration depth	*/
 	EPA			epa(&gjk);
 	const F		pd(epa.EvaluatePD());
-	results.epa_iterations	=	epa.iterations+1;
+	results.epa_iterations	=	static_cast<int>(epa.iterations+1);
 	if(pd>0)
 		{
 		results.status			=	sResults::Penetrating;
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa.h
index 759b30bb17f..1c256f41939 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa.h
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa.h
@@ -21,7 +21,7 @@ Nov.2006
 
 #ifndef _05E48D53_04E0_49ad_BB0A_D74FE62E7366_
 #define _05E48D53_04E0_49ad_BB0A_D74FE62E7366_
-#include "../CollisionShapes/btConvexShape.h"
+#include "BulletCollision/CollisionShapes/btConvexShape.h"
 
 class btStackAlloc;
 
@@ -35,7 +35,7 @@ struct	sResults
 		Separated,		/* Shapes doesnt penetrate												*/ 
 		Penetrating,	/* Shapes are penetrating												*/ 
 		GJK_Failed,		/* GJK phase fail, no big issue, shapes are probably just 'touching'	*/ 
-		EPA_Failed,		/* EPA phase fail, bigger problem, need to save parameters, and debug	*/ 
+		EPA_Failed		/* EPA phase fail, bigger problem, need to save parameters, and debug	*/ 
 		}		status;
 	btVector3	witnesses[2];
 	btVector3	normal;
@@ -43,8 +43,8 @@ struct	sResults
 	int	epa_iterations;
 	int	gjk_iterations;
 	};
-static bool	Collide(btConvexShape* shape0,const btTransform& wtrs0,
-					btConvexShape* shape1,const btTransform& wtrs1,
+static bool	Collide(const btConvexShape* shape0,const btTransform& wtrs0,
+					const btConvexShape* shape1,const btTransform& wtrs1,
 					btScalar	radialmargin,
 					btStackAlloc* stackAlloc,
 					sResults&	results);
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp
new file mode 100644
index 00000000000..ccfc22ee673
--- /dev/null
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp
@@ -0,0 +1,943 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2008 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the
+use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+claim that you wrote the original software. If you use this software in a
+product, an acknowledgment in the product documentation would be appreciated
+but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+/*
+GJK-EPA collision solver by Nathanael Presson, 2008
+*/
+#include "BulletCollision/CollisionShapes/btConvexInternalShape.h"
+#include "BulletCollision/CollisionShapes/btSphereShape.h"
+#include "btGjkEpa2.h"
+
+#if defined(DEBUG) || defined (_DEBUG)
+#include <stdio.h> //for debug printf
+#ifdef __SPU__
+#include <spu_printf.h>
+#define printf spu_printf
+#endif //__SPU__
+#endif
+
+namespace gjkepa2_impl
+{
+
+// Config
+
+	/* GJK	*/ 
+#define GJK_MAX_ITERATIONS	128
+#define GJK_ACCURARY		((btScalar)0.0001)
+#define GJK_MIN_DISTANCE	((btScalar)0.0001)
+#define GJK_DUPLICATED_EPS	((btScalar)0.0001)
+#define GJK_SIMPLEX2_EPS	((btScalar)0.0)
+#define GJK_SIMPLEX3_EPS	((btScalar)0.0)
+#define GJK_SIMPLEX4_EPS	((btScalar)0.0)
+
+	/* EPA	*/ 
+#define EPA_MAX_VERTICES	64
+#define EPA_MAX_FACES		(EPA_MAX_VERTICES*2)
+#define EPA_MAX_ITERATIONS	255
+#define EPA_ACCURACY		((btScalar)0.0001)
+#define EPA_FALLBACK		(10*EPA_ACCURACY)
+#define EPA_PLANE_EPS		((btScalar)0.00001)
+#define EPA_INSIDE_EPS		((btScalar)0.01)
+
+
+// Shorthands
+typedef unsigned int	U;
+typedef unsigned char	U1;
+
+// MinkowskiDiff
+struct	MinkowskiDiff
+	{
+	const btConvexShape*	m_shapes[2];
+	btMatrix3x3				m_toshape1;
+	btTransform				m_toshape0;
+	btVector3				(btConvexShape::*Ls)(const btVector3&) const;
+	void					EnableMargin(bool enable)
+		{
+		if(enable)
+			Ls=&btConvexShape::localGetSupportingVertex;
+			else
+			Ls=&btConvexShape::localGetSupportingVertexWithoutMargin;
+		}	
+	inline btVector3		Support0(const btVector3& d) const
+		{
+		return(((m_shapes[0])->*(Ls))(d));
+		}
+	inline btVector3		Support1(const btVector3& d) const
+		{
+		return(m_toshape0*((m_shapes[1])->*(Ls))(m_toshape1*d));
+		}
+	inline btVector3		Support(const btVector3& d) const
+		{
+		return(Support0(d)-Support1(-d));
+		}
+	btVector3				Support(const btVector3& d,U index) const
+		{
+		if(index)
+			return(Support1(d));
+			else
+			return(Support0(d));
+		}
+	};
+
+typedef	MinkowskiDiff	tShape;
+
+
+// GJK
+struct	GJK
+{
+/* Types		*/ 
+struct	sSV
+	{
+	btVector3	d,w;
+	};
+struct	sSimplex
+	{
+	sSV*		c[4];
+	btScalar	p[4];
+	U			rank;
+	};
+struct	eStatus	{ enum _ {
+	Valid,
+	Inside,
+	Failed		};};
+/* Fields		*/ 
+tShape			m_shape;
+btVector3		m_ray;
+btScalar		m_distance;
+sSimplex		m_simplices[2];
+sSV				m_store[4];
+sSV*			m_free[4];
+U				m_nfree;
+U				m_current;
+sSimplex*		m_simplex;
+eStatus::_		m_status;
+/* Methods		*/ 
+					GJK()
+	{
+	Initialize();
+	}
+void				Initialize()
+	{
+	m_ray		=	btVector3(0,0,0);
+	m_nfree		=	0;
+	m_status	=	eStatus::Failed;
+	m_current	=	0;
+	m_distance	=	0;
+	}
+eStatus::_			Evaluate(const tShape& shapearg,const btVector3& guess)
+	{
+	U			iterations=0;
+	btScalar	sqdist=0;
+	btScalar	alpha=0;
+	btVector3	lastw[4];
+	U			clastw=0;
+	/* Initialize solver		*/ 
+	m_free[0]			=	&m_store[0];
+	m_free[1]			=	&m_store[1];
+	m_free[2]			=	&m_store[2];
+	m_free[3]			=	&m_store[3];
+	m_nfree				=	4;
+	m_current			=	0;
+	m_status			=	eStatus::Valid;
+	m_shape				=	shapearg;
+	m_distance			=	0;
+	/* Initialize simplex		*/ 
+	m_simplices[0].rank	=	0;
+	m_ray				=	guess;
+	const btScalar	sqrl=	m_ray.length2();
+	appendvertice(m_simplices[0],sqrl>0?-m_ray:btVector3(1,0,0));
+	m_simplices[0].p[0]	=	1;
+	m_ray				=	m_simplices[0].c[0]->w;	
+	sqdist				=	sqrl;
+	lastw[0]			=
+	lastw[1]			=
+	lastw[2]			=
+	lastw[3]			=	m_ray;
+	/* Loop						*/ 
+	do	{
+		const U		next=1-m_current;
+		sSimplex&	cs=m_simplices[m_current];
+		sSimplex&	ns=m_simplices[next];
+		/* Check zero							*/ 
+		const btScalar	rl=m_ray.length();
+		if(rl<GJK_MIN_DISTANCE)
+			{/* Touching or inside				*/ 
+			m_status=eStatus::Inside;
+			break;
+			}
+		/* Append new vertice in -'v' direction	*/ 
+		appendvertice(cs,-m_ray);
+		const btVector3&	w=cs.c[cs.rank-1]->w;
+		bool				found=false;
+		for(U i=0;i<4;++i)
+			{
+			if((w-lastw[i]).length2()<GJK_DUPLICATED_EPS)
+				{ found=true;break; }
+			}
+		if(found)
+			{/* Return old simplex				*/ 
+			removevertice(m_simplices[m_current]);
+			break;
+			}
+			else
+			{/* Update lastw					*/ 
+			lastw[clastw=(clastw+1)&3]=w;
+			}
+		/* Check for termination				*/ 
+		const btScalar	omega=dot(m_ray,w)/rl;
+		alpha=btMax(omega,alpha);
+		if(((rl-alpha)-(GJK_ACCURARY*rl))<=0)
+			{/* Return old simplex				*/ 
+			removevertice(m_simplices[m_current]);
+			break;
+			}		
+		/* Reduce simplex						*/ 
+		btScalar	weights[4];
+		U			mask=0;
+		switch(cs.rank)
+			{
+			case	2:	sqdist=projectorigin(	cs.c[0]->w,
+												cs.c[1]->w,
+												weights,mask);break;
+			case	3:	sqdist=projectorigin(	cs.c[0]->w,
+												cs.c[1]->w,
+												cs.c[2]->w,
+												weights,mask);break;
+			case	4:	sqdist=projectorigin(	cs.c[0]->w,
+												cs.c[1]->w,
+												cs.c[2]->w,
+												cs.c[3]->w,
+												weights,mask);break;
+			}
+		if(sqdist>=0)
+			{/* Valid	*/ 
+			ns.rank		=	0;
+			m_ray		=	btVector3(0,0,0);
+			m_current	=	next;
+			for(U i=0,ni=cs.rank;i<ni;++i)
+				{
+				if(mask&(1<<i))
+					{
+					ns.c[ns.rank]		=	cs.c[i];
+					ns.p[ns.rank++]		=	weights[i];
+					m_ray				+=	cs.c[i]->w*weights[i];
+					}
+					else
+					{
+					m_free[m_nfree++]	=	cs.c[i];
+					}
+				}
+			if(mask==15) m_status=eStatus::Inside;
+			}
+			else
+			{/* Return old simplex				*/ 
+			removevertice(m_simplices[m_current]);
+			break;
+			}
+		m_status=((++iterations)<GJK_MAX_ITERATIONS)?m_status:eStatus::Failed;
+		} while(m_status==eStatus::Valid);
+	m_simplex=&m_simplices[m_current];
+	switch(m_status)
+		{
+		case	eStatus::Valid:		m_distance=m_ray.length();break;
+		case	eStatus::Inside:	m_distance=0;break;
+		}	
+	return(m_status);
+	}
+bool					EncloseOrigin()
+	{
+	switch(m_simplex->rank)
+		{
+		case	1:
+			{
+			for(U i=0;i<3;++i)
+				{
+				btVector3		axis=btVector3(0,0,0);
+				axis[i]=1;
+				appendvertice(*m_simplex, axis);
+				if(EncloseOrigin())	return(true);
+				removevertice(*m_simplex);
+				appendvertice(*m_simplex,-axis);
+				if(EncloseOrigin())	return(true);
+				removevertice(*m_simplex);
+				}
+			}
+		break;
+		case	2:
+			{
+			const btVector3	d=m_simplex->c[1]->w-m_simplex->c[0]->w;
+			for(U i=0;i<3;++i)
+				{
+				btVector3		axis=btVector3(0,0,0);
+				axis[i]=1;
+				const btVector3	p=cross(d,axis);
+				if(p.length2()>0)
+					{
+					appendvertice(*m_simplex, p);
+					if(EncloseOrigin())	return(true);
+					removevertice(*m_simplex);
+					appendvertice(*m_simplex,-p);
+					if(EncloseOrigin())	return(true);
+					removevertice(*m_simplex);
+					}
+				}
+			}
+		break;
+		case	3:
+			{
+			const btVector3	n=cross(m_simplex->c[1]->w-m_simplex->c[0]->w,
+									m_simplex->c[2]->w-m_simplex->c[0]->w);
+			if(n.length2()>0)
+				{
+				appendvertice(*m_simplex,n);
+				if(EncloseOrigin())	return(true);
+				removevertice(*m_simplex);
+				appendvertice(*m_simplex,-n);
+				if(EncloseOrigin())	return(true);
+				removevertice(*m_simplex);
+				}
+			}
+		break;
+		case	4:
+			{
+			if(btFabs(det(	m_simplex->c[0]->w-m_simplex->c[3]->w,
+							m_simplex->c[1]->w-m_simplex->c[3]->w,
+							m_simplex->c[2]->w-m_simplex->c[3]->w))>0)
+				return(true);
+			}
+		break;
+		}
+	return(false);
+	}
+/* Internals	*/ 
+void				getsupport(const btVector3& d,sSV& sv) const
+	{
+	sv.d	=	d/d.length();
+	sv.w	=	m_shape.Support(sv.d);
+	}
+void				removevertice(sSimplex& simplex)
+	{
+	m_free[m_nfree++]=simplex.c[--simplex.rank];
+	}
+void				appendvertice(sSimplex& simplex,const btVector3& v)
+	{
+	simplex.p[simplex.rank]=0;
+	simplex.c[simplex.rank]=m_free[--m_nfree];
+	getsupport(v,*simplex.c[simplex.rank++]);
+	}
+static btScalar		det(const btVector3& a,const btVector3& b,const btVector3& c)
+	{
+	return(	a.y()*b.z()*c.x()+a.z()*b.x()*c.y()-
+			a.x()*b.z()*c.y()-a.y()*b.x()*c.z()+
+			a.x()*b.y()*c.z()-a.z()*b.y()*c.x());
+	}
+static btScalar		projectorigin(	const btVector3& a,
+									const btVector3& b,
+									btScalar* w,U& m)
+	{
+	const btVector3	d=b-a;
+	const btScalar	l=d.length2();
+	if(l>GJK_SIMPLEX2_EPS)
+		{
+		const btScalar	t(l>0?-dot(a,d)/l:0);
+		if(t>=1)		{ w[0]=0;w[1]=1;m=2;return(b.length2()); }
+		else if(t<=0)	{ w[0]=1;w[1]=0;m=1;return(a.length2()); }
+		else			{ w[0]=1-(w[1]=t);m=3;return((a+d*t).length2()); }
+		}
+	return(-1);
+	}
+static btScalar		projectorigin(	const btVector3& a,
+									const btVector3& b,
+									const btVector3& c,
+									btScalar* w,U& m)
+	{
+	static const U		imd3[]={1,2,0};
+	const btVector3*	vt[]={&a,&b,&c};
+	const btVector3		dl[]={a-b,b-c,c-a};
+	const btVector3		n=cross(dl[0],dl[1]);
+	const btScalar		l=n.length2();
+	if(l>GJK_SIMPLEX3_EPS)
+		{
+		btScalar	mindist=-1;
+		btScalar	subw[2];
+		U			subm;
+		for(U i=0;i<3;++i)
+			{
+			if(dot(*vt[i],cross(dl[i],n))>0)
+				{
+				const U			j=imd3[i];
+				const btScalar	subd(projectorigin(*vt[i],*vt[j],subw,subm));
+				if((mindist<0)||(subd<mindist))
+					{
+					mindist		=	subd;
+					m			=	static_cast<U>(((subm&1)?1<<i:0)+((subm&2)?1<<j:0));
+					w[i]		=	subw[0];
+					w[j]		=	subw[1];
+					w[imd3[j]]	=	0;				
+					}
+				}
+			}
+		if(mindist<0)
+			{
+			const btScalar	d=dot(a,n);	
+			const btScalar	s=btSqrt(l);
+			const btVector3	p=n*(d/l);
+			mindist	=	p.length2();
+			m		=	7;
+			w[0]	=	(cross(dl[1],b-p)).length()/s;
+			w[1]	=	(cross(dl[2],c-p)).length()/s;
+			w[2]	=	1-(w[0]+w[1]);
+			}
+		return(mindist);
+		}
+	return(-1);
+	}
+static btScalar		projectorigin(	const btVector3& a,
+									const btVector3& b,
+									const btVector3& c,
+									const btVector3& d,
+									btScalar* w,U& m)
+	{
+	static const U		imd3[]={1,2,0};
+	const btVector3*	vt[]={&a,&b,&c,&d};
+	const btVector3		dl[]={a-d,b-d,c-d};
+	const btScalar		vl=det(dl[0],dl[1],dl[2]);
+	const bool			ng=(vl*dot(a,cross(b-c,a-b)))<=0;
+	if(ng&&(btFabs(vl)>GJK_SIMPLEX4_EPS))
+		{
+		btScalar	mindist=-1;
+		btScalar	subw[3];
+		U			subm;
+		for(U i=0;i<3;++i)
+			{
+			const U			j=imd3[i];
+			const btScalar	s=vl*dot(d,cross(dl[i],dl[j]));
+			if(s>0)
+				{
+				const btScalar	subd=projectorigin(*vt[i],*vt[j],d,subw,subm);
+				if((mindist<0)||(subd<mindist))
+					{
+					mindist		=	subd;
+					m			=	static_cast<U>((subm&1?1<<i:0)+
+									(subm&2?1<<j:0)+
+									(subm&4?8:0));
+					w[i]		=	subw[0];
+					w[j]		=	subw[1];
+					w[imd3[j]]	=	0;
+					w[3]		=	subw[2];
+					}
+				}
+			}
+		if(mindist<0)
+			{
+			mindist	=	0;
+			m		=	15;
+			w[0]	=	det(c,b,d)/vl;
+			w[1]	=	det(a,c,d)/vl;
+			w[2]	=	det(b,a,d)/vl;
+			w[3]	=	1-(w[0]+w[1]+w[2]);
+			}
+		return(mindist);
+		}
+	return(-1);
+	}
+};
+
+// EPA
+struct	EPA
+{
+/* Types		*/ 
+typedef	GJK::sSV	sSV;
+struct	sFace
+	{
+	btVector3	n;
+	btScalar	d;
+	btScalar	p;
+	sSV*		c[3];
+	sFace*		f[3];
+	sFace*		l[2];
+	U1			e[3];
+	U1			pass;
+	};
+struct	sList
+	{
+	sFace*		root;
+	U			count;
+				sList() : root(0),count(0)	{}
+	};
+struct	sHorizon
+	{
+	sFace*		cf;
+	sFace*		ff;
+	U			nf;
+				sHorizon() : cf(0),ff(0),nf(0)	{}
+	};
+struct	eStatus { enum _ {
+	Valid,
+	Touching,
+	Degenerated,
+	NonConvex,
+	InvalidHull,		
+	OutOfFaces,
+	OutOfVertices,
+	AccuraryReached,
+	FallBack,
+	Failed		};};
+/* Fields		*/ 
+eStatus::_		m_status;
+GJK::sSimplex	m_result;
+btVector3		m_normal;
+btScalar		m_depth;
+sSV				m_sv_store[EPA_MAX_VERTICES];
+sFace			m_fc_store[EPA_MAX_FACES];
+U				m_nextsv;
+sList			m_hull;
+sList			m_stock;
+/* Methods		*/ 
+					EPA()
+	{
+	Initialize();	
+	}
+
+
+					static inline void		bind(sFace* fa,U ea,sFace* fb,U eb)
+	{
+	fa->e[ea]=(U1)eb;fa->f[ea]=fb;
+	fb->e[eb]=(U1)ea;fb->f[eb]=fa;
+	}
+static inline void		append(sList& list,sFace* face)
+	{
+	face->l[0]	=	0;
+	face->l[1]	=	list.root;
+	if(list.root) list.root->l[0]=face;
+	list.root	=	face;
+	++list.count;
+	}
+static inline void		remove(sList& list,sFace* face)
+	{
+	if(face->l[1]) face->l[1]->l[0]=face->l[0];
+	if(face->l[0]) face->l[0]->l[1]=face->l[1];
+	if(face==list.root) list.root=face->l[1];
+	--list.count;
+	}
+
+
+void				Initialize()
+	{
+	m_status	=	eStatus::Failed;
+	m_normal	=	btVector3(0,0,0);
+	m_depth		=	0;
+	m_nextsv	=	0;
+	for(U i=0;i<EPA_MAX_FACES;++i)
+		{
+		append(m_stock,&m_fc_store[EPA_MAX_FACES-i-1]);
+		}
+	}
+eStatus::_			Evaluate(GJK& gjk,const btVector3& guess)
+	{
+	GJK::sSimplex&	simplex=*gjk.m_simplex;
+	if((simplex.rank>1)&&gjk.EncloseOrigin())
+		{
+
+		/* Clean up				*/ 
+		while(m_hull.root)
+			{
+			sFace*	f = m_hull.root;
+			remove(m_hull,f);
+			append(m_stock,f);
+			}
+		m_status	=	eStatus::Valid;
+		m_nextsv	=	0;
+		/* Orient simplex		*/ 
+		if(gjk.det(	simplex.c[0]->w-simplex.c[3]->w,
+					simplex.c[1]->w-simplex.c[3]->w,
+					simplex.c[2]->w-simplex.c[3]->w)<0)
+			{
+			btSwap(simplex.c[0],simplex.c[1]);
+			btSwap(simplex.p[0],simplex.p[1]);
+			}
+		/* Build initial hull	*/ 
+		sFace*	tetra[]={newface(simplex.c[0],simplex.c[1],simplex.c[2],true),
+						newface(simplex.c[1],simplex.c[0],simplex.c[3],true),
+						newface(simplex.c[2],simplex.c[1],simplex.c[3],true),
+						newface(simplex.c[0],simplex.c[2],simplex.c[3],true)};
+		if(m_hull.count==4)
+			{
+			sFace*		best=findbest();
+			sFace		outer=*best;
+			U			pass=0;
+			U			iterations=0;
+			bind(tetra[0],0,tetra[1],0);
+			bind(tetra[0],1,tetra[2],0);
+			bind(tetra[0],2,tetra[3],0);
+			bind(tetra[1],1,tetra[3],2);
+			bind(tetra[1],2,tetra[2],1);
+			bind(tetra[2],2,tetra[3],1);
+			m_status=eStatus::Valid;
+			for(;iterations<EPA_MAX_ITERATIONS;++iterations)
+				{
+				if(m_nextsv<EPA_MAX_VERTICES)
+					{	
+					sHorizon		horizon;
+					sSV*			w=&m_sv_store[m_nextsv++];
+					bool			valid=true;					
+					best->pass	=	(U1)(++pass);
+					gjk.getsupport(best->n,*w);
+					const btScalar	wdist=dot(best->n,w->w)-best->d;
+					if(wdist>EPA_ACCURACY)
+						{
+						for(U j=0;(j<3)&&valid;++j)
+							{
+							valid&=expand(	pass,w,
+											best->f[j],best->e[j],
+											horizon);
+							}
+						if(valid&&(horizon.nf>=3))
+							{
+							bind(horizon.cf,1,horizon.ff,2);
+							remove(m_hull,best);
+							append(m_stock,best);
+							best=findbest();
+							if(best->p>=outer.p) outer=*best;
+							} else { m_status=eStatus::InvalidHull;break; }
+						} else { m_status=eStatus::AccuraryReached;break; }
+					} else { m_status=eStatus::OutOfVertices;break; }
+				}
+			const btVector3	projection=outer.n*outer.d;
+			m_normal	=	outer.n;
+			m_depth		=	outer.d;
+			m_result.rank	=	3;
+			m_result.c[0]	=	outer.c[0];
+			m_result.c[1]	=	outer.c[1];
+			m_result.c[2]	=	outer.c[2];
+			m_result.p[0]	=	cross(	outer.c[1]->w-projection,
+										outer.c[2]->w-projection).length();
+			m_result.p[1]	=	cross(	outer.c[2]->w-projection,
+										outer.c[0]->w-projection).length();
+			m_result.p[2]	=	cross(	outer.c[0]->w-projection,
+										outer.c[1]->w-projection).length();
+			const btScalar	sum=m_result.p[0]+m_result.p[1]+m_result.p[2];
+			m_result.p[0]	/=	sum;
+			m_result.p[1]	/=	sum;
+			m_result.p[2]	/=	sum;
+			return(m_status);
+			}
+		}
+	/* Fallback		*/ 
+	m_status	=	eStatus::FallBack;
+	m_normal	=	-guess;
+	const btScalar	nl=m_normal.length();
+	if(nl>0)
+		m_normal	=	m_normal/nl;
+		else
+		m_normal	=	btVector3(1,0,0);
+	m_depth	=	0;
+	m_result.rank=1;
+	m_result.c[0]=simplex.c[0];
+	m_result.p[0]=1;	
+	return(m_status);
+	}
+sFace*				newface(sSV* a,sSV* b,sSV* c,bool forced)
+	{
+	if(m_stock.root)
+		{
+		sFace*	face=m_stock.root;
+		remove(m_stock,face);
+		append(m_hull,face);
+		face->pass	=	0;
+		face->c[0]	=	a;
+		face->c[1]	=	b;
+		face->c[2]	=	c;
+		face->n		=	cross(b->w-a->w,c->w-a->w);
+		const btScalar	l=face->n.length();
+		const bool		v=l>EPA_ACCURACY;
+		face->p		=	btMin(btMin(
+							dot(a->w,cross(face->n,a->w-b->w)),
+							dot(b->w,cross(face->n,b->w-c->w))),
+							dot(c->w,cross(face->n,c->w-a->w)))	/
+							(v?l:1);
+		face->p		=	face->p>=-EPA_INSIDE_EPS?0:face->p;
+		if(v)
+			{
+			face->d		=	dot(a->w,face->n)/l;
+			face->n		/=	l;
+			if(forced||(face->d>=-EPA_PLANE_EPS))
+				{
+				return(face);
+				} else m_status=eStatus::NonConvex;
+			} else m_status=eStatus::Degenerated;
+		remove(m_hull,face);
+		append(m_stock,face);
+		return(0);
+		}
+	m_status=m_stock.root?eStatus::OutOfVertices:eStatus::OutOfFaces;
+	return(0);
+	}
+sFace*				findbest()
+	{
+	sFace*		minf=m_hull.root;
+	btScalar	mind=minf->d*minf->d;
+	btScalar	maxp=minf->p;
+	for(sFace* f=minf->l[1];f;f=f->l[1])
+		{
+		const btScalar	sqd=f->d*f->d;
+		if((f->p>=maxp)&&(sqd<mind))
+			{
+			minf=f;
+			mind=sqd;
+			maxp=f->p;
+			}
+		}
+	return(minf);
+	}
+bool				expand(U pass,sSV* w,sFace* f,U e,sHorizon& horizon)
+	{
+	static const U	i1m3[]={1,2,0};
+	static const U	i2m3[]={2,0,1};
+	if(f->pass!=pass)
+		{
+		const U	e1=i1m3[e];
+		if((dot(f->n,w->w)-f->d)<-EPA_PLANE_EPS)
+			{
+			sFace*	nf=newface(f->c[e1],f->c[e],w,false);
+			if(nf)
+				{
+				bind(nf,0,f,e);
+				if(horizon.cf) bind(horizon.cf,1,nf,2); else horizon.ff=nf;
+				horizon.cf=nf;
+				++horizon.nf;
+				return(true);
+				}
+			}
+			else
+			{
+			const U	e2=i2m3[e];
+			f->pass		=	(U1)pass;
+			if(	expand(pass,w,f->f[e1],f->e[e1],horizon)&&
+				expand(pass,w,f->f[e2],f->e[e2],horizon))
+				{
+				remove(m_hull,f);
+				append(m_stock,f);
+				return(true);
+				}
+			}
+		}
+	return(false);
+	}
+
+};
+
+//
+static void	Initialize(	const btConvexShape* shape0,const btTransform& wtrs0,
+						const btConvexShape* shape1,const btTransform& wtrs1,
+						btGjkEpaSolver2::sResults& results,
+						tShape& shape,
+						bool withmargins)
+{
+/* Results		*/ 
+results.witnesses[0]	=
+results.witnesses[1]	=	btVector3(0,0,0);
+results.status			=	btGjkEpaSolver2::sResults::Separated;
+/* Shape		*/ 
+shape.m_shapes[0]		=	shape0;
+shape.m_shapes[1]		=	shape1;
+shape.m_toshape1		=	wtrs1.getBasis().transposeTimes(wtrs0.getBasis());
+shape.m_toshape0		=	wtrs0.inverseTimes(wtrs1);
+shape.EnableMargin(withmargins);
+}
+
+}
+
+//
+// Api
+//
+
+using namespace	gjkepa2_impl;
+
+//
+int			btGjkEpaSolver2::StackSizeRequirement()
+{
+return(sizeof(GJK)+sizeof(EPA));
+}
+
+//
+bool		btGjkEpaSolver2::Distance(	const btConvexShape*	shape0,
+										const btTransform&		wtrs0,
+										const btConvexShape*	shape1,
+										const btTransform&		wtrs1,
+										const btVector3&		guess,
+										sResults&				results)
+{
+tShape			shape;
+Initialize(shape0,wtrs0,shape1,wtrs1,results,shape,false);
+GJK				gjk;
+GJK::eStatus::_	gjk_status=gjk.Evaluate(shape,guess);
+if(gjk_status==GJK::eStatus::Valid)
+	{
+	btVector3	w0=btVector3(0,0,0);
+	btVector3	w1=btVector3(0,0,0);
+	for(U i=0;i<gjk.m_simplex->rank;++i)
+		{
+		const btScalar	p=gjk.m_simplex->p[i];
+		w0+=shape.Support( gjk.m_simplex->c[i]->d,0)*p;
+		w1+=shape.Support(-gjk.m_simplex->c[i]->d,1)*p;
+		}
+	results.witnesses[0]	=	wtrs0*w0;
+	results.witnesses[1]	=	wtrs0*w1;
+	results.normal			=	w0-w1;
+	results.distance		=	results.normal.length();
+	results.normal			/=	results.distance>GJK_MIN_DISTANCE?results.distance:1;
+	return(true);
+	}
+	else
+	{
+	results.status	=	gjk_status==GJK::eStatus::Inside?
+							sResults::Penetrating	:
+							sResults::GJK_Failed	;
+	return(false);
+	}
+}
+
+//
+bool	btGjkEpaSolver2::Penetration(	const btConvexShape*	shape0,
+										const btTransform&		wtrs0,
+										const btConvexShape*	shape1,
+										const btTransform&		wtrs1,
+										const btVector3&		guess,
+										sResults&				results,
+										bool					usemargins)
+{
+tShape			shape;
+Initialize(shape0,wtrs0,shape1,wtrs1,results,shape,usemargins);
+GJK				gjk;	
+GJK::eStatus::_	gjk_status=gjk.Evaluate(shape,-guess);
+switch(gjk_status)
+	{
+	case	GJK::eStatus::Inside:
+		{
+		EPA				epa;
+		EPA::eStatus::_	epa_status=epa.Evaluate(gjk,-guess);
+		if(epa_status!=EPA::eStatus::Failed)
+			{
+			btVector3	w0=btVector3(0,0,0);
+			for(U i=0;i<epa.m_result.rank;++i)
+				{
+				w0+=shape.Support(epa.m_result.c[i]->d,0)*epa.m_result.p[i];
+				}
+			results.status			=	sResults::Penetrating;
+			results.witnesses[0]	=	wtrs0*w0;
+			results.witnesses[1]	=	wtrs0*(w0-epa.m_normal*epa.m_depth);
+			results.normal			=	-epa.m_normal;
+			results.distance		=	-epa.m_depth;
+			return(true);
+			} else results.status=sResults::EPA_Failed;
+		}
+	break;
+	case	GJK::eStatus::Failed:
+	results.status=sResults::GJK_Failed;
+	break;
+	}
+return(false);
+}
+
+//
+btScalar	btGjkEpaSolver2::SignedDistance(const btVector3& position,
+											btScalar margin,
+											const btConvexShape* shape0,
+											const btTransform& wtrs0,
+											sResults& results)
+{
+tShape			shape;
+btSphereShape	shape1(margin);
+btTransform		wtrs1(btQuaternion(0,0,0,1),position);
+Initialize(shape0,wtrs0,&shape1,wtrs1,results,shape,false);
+GJK				gjk;	
+GJK::eStatus::_	gjk_status=gjk.Evaluate(shape,btVector3(1,1,1));
+if(gjk_status==GJK::eStatus::Valid)
+	{
+	btVector3	w0=btVector3(0,0,0);
+	btVector3	w1=btVector3(0,0,0);
+	for(U i=0;i<gjk.m_simplex->rank;++i)
+		{
+		const btScalar	p=gjk.m_simplex->p[i];
+		w0+=shape.Support( gjk.m_simplex->c[i]->d,0)*p;
+		w1+=shape.Support(-gjk.m_simplex->c[i]->d,1)*p;
+		}
+	results.witnesses[0]	=	wtrs0*w0;
+	results.witnesses[1]	=	wtrs0*w1;
+	const btVector3	delta=	results.witnesses[1]-
+							results.witnesses[0];
+	const btScalar	margin=	shape0->getMargin()+
+							shape1.getMargin();
+	const btScalar	length=	delta.length();	
+	results.normal			=	delta/length;
+	results.witnesses[0]	+=	results.normal*margin;
+	return(length-margin);
+	}
+	else
+	{
+	if(gjk_status==GJK::eStatus::Inside)
+		{
+		if(Penetration(shape0,wtrs0,&shape1,wtrs1,gjk.m_ray,results))
+			{
+			const btVector3	delta=	results.witnesses[0]-
+									results.witnesses[1];
+			const btScalar	length=	delta.length();
+			if (length >= SIMD_EPSILON)
+				results.normal	=	delta/length;			
+			return(-length);
+			}
+		}	
+	}
+return(SIMD_INFINITY);
+}
+
+//
+bool	btGjkEpaSolver2::SignedDistance(const btConvexShape*	shape0,
+										const btTransform&		wtrs0,
+										const btConvexShape*	shape1,
+										const btTransform&		wtrs1,
+										const btVector3&		guess,
+										sResults&				results)
+{
+if(!Distance(shape0,wtrs0,shape1,wtrs1,guess,results))
+	return(Penetration(shape0,wtrs0,shape1,wtrs1,guess,results,false));
+	else
+	return(true);
+}
+
+/* Symbols cleanup		*/ 
+
+#undef GJK_MAX_ITERATIONS
+#undef GJK_ACCURARY
+#undef GJK_MIN_DISTANCE
+#undef GJK_DUPLICATED_EPS
+#undef GJK_SIMPLEX2_EPS
+#undef GJK_SIMPLEX3_EPS
+#undef GJK_SIMPLEX4_EPS
+
+#undef EPA_MAX_VERTICES
+#undef EPA_MAX_FACES
+#undef EPA_MAX_ITERATIONS
+#undef EPA_ACCURACY
+#undef EPA_FALLBACK
+#undef EPA_PLANE_EPS
+#undef EPA_INSIDE_EPS
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h
new file mode 100644
index 00000000000..a55214203d3
--- /dev/null
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h
@@ -0,0 +1,71 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2008 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the
+use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+claim that you wrote the original software. If you use this software in a
+product, an acknowledgment in the product documentation would be appreciated
+but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+/*
+GJK-EPA collision solver by Nathanael Presson, 2008
+*/
+#ifndef _68DA1F85_90B7_4bb0_A705_83B4040A75C6_
+#define _68DA1F85_90B7_4bb0_A705_83B4040A75C6_
+#include "BulletCollision/CollisionShapes/btConvexShape.h"
+
+///btGjkEpaSolver contributed under zlib by Nathanael Presson
+struct	btGjkEpaSolver2
+{
+struct	sResults
+	{
+	enum eStatus
+		{
+		Separated,		/* Shapes doesnt penetrate												*/ 
+		Penetrating,	/* Shapes are penetrating												*/ 
+		GJK_Failed,		/* GJK phase fail, no big issue, shapes are probably just 'touching'	*/ 
+		EPA_Failed		/* EPA phase fail, bigger problem, need to save parameters, and debug	*/ 
+		}		status;
+	btVector3	witnesses[2];
+	btVector3	normal;
+	btScalar	distance;
+	};
+
+static int		StackSizeRequirement();
+
+static bool		Distance(	const btConvexShape* shape0,const btTransform& wtrs0,
+							const btConvexShape* shape1,const btTransform& wtrs1,
+							const btVector3& guess,
+							sResults& results);
+
+static bool		Penetration(const btConvexShape* shape0,const btTransform& wtrs0,
+							const btConvexShape* shape1,const btTransform& wtrs1,
+							const btVector3& guess,
+							sResults& results,
+							bool usemargins=true);
+
+static btScalar	SignedDistance(	const btVector3& position,
+								btScalar margin,
+								const btConvexShape* shape,
+								const btTransform& wtrs,
+								sResults& results);
+							
+static bool		SignedDistance(	const btConvexShape* shape0,const btTransform& wtrs0,
+								const btConvexShape* shape1,const btTransform& wtrs1,
+								const btVector3& guess,
+								sResults& results);
+};
+
+#endif
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp
index 87330493b60..c4f84ed4d75 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp
@@ -18,9 +18,10 @@ subject to the following restrictions:
 #include "BulletCollision/CollisionShapes/btConvexShape.h"
 #include "btGjkEpaPenetrationDepthSolver.h"
 #include "BulletCollision/NarrowPhaseCollision/btGjkEpa.h"
+#include "BulletCollision/NarrowPhaseCollision/btGjkEpa2.h"
 
 bool btGjkEpaPenetrationDepthSolver::calcPenDepth( btSimplexSolverInterface& simplexSolver,
-											  btConvexShape* pConvexA, btConvexShape* pConvexB,
+											  const btConvexShape* pConvexA, const btConvexShape* pConvexB,
 											  const btTransform& transformA, const btTransform& transformB,
 											  btVector3& v, btPoint3& wWitnessOnA, btPoint3& wWitnessOnB,
 											  class btIDebugDraw* debugDraw, btStackAlloc* stackAlloc )
@@ -32,10 +33,20 @@ bool btGjkEpaPenetrationDepthSolver::calcPenDepth( btSimplexSolverInterface& sim
 
 	const btScalar				radialmargin(btScalar(0.));
 	
+//#define USE_ORIGINAL_GJK 1
+#ifdef USE_ORIGINAL_GJK
 	btGjkEpaSolver::sResults	results;
 	if(btGjkEpaSolver::Collide(	pConvexA,transformA,
 								pConvexB,transformB,
 								radialmargin,stackAlloc,results))
+#else
+	btVector3	guessVector(transformA.getOrigin()-transformB.getOrigin());
+	btGjkEpaSolver2::sResults	results;
+	if(btGjkEpaSolver2::Penetration(pConvexA,transformA,
+								pConvexB,transformB,
+								guessVector,results))
+	
+#endif
 		{
 	//	debugDraw->drawLine(results.witnesses[1],results.witnesses[1]+results.normal,btVector3(255,0,0));
 		//resultOut->addContactPoint(results.normal,results.witnesses[1],-results.depth);
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h
index 3916ba0776c..2dc069ce5cf 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h
@@ -26,7 +26,7 @@ class btGjkEpaPenetrationDepthSolver : public btConvexPenetrationDepthSolver
 	public :
 
 		bool			calcPenDepth( btSimplexSolverInterface& simplexSolver,
-									  btConvexShape* pConvexA, btConvexShape* pConvexB,
+									  const btConvexShape* pConvexA, const btConvexShape* pConvexB,
 									  const btTransform& transformA, const btTransform& transformB,
 									  btVector3& v, btPoint3& wWitnessOnA, btPoint3& wWitnessOnB,
 									  class btIDebugDraw* debugDraw,btStackAlloc* stackAlloc );
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp
index f1f3f7f7f6c..01fb1a4b068 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp
@@ -35,7 +35,7 @@ int gNumGjkChecks = 0;
 
 
 
-btGjkPairDetector::btGjkPairDetector(btConvexShape* objectA,btConvexShape* objectB,btSimplexSolverInterface* simplexSolver,btConvexPenetrationDepthSolver*	penetrationDepthSolver)
+btGjkPairDetector::btGjkPairDetector(const btConvexShape* objectA,const btConvexShape* objectB,btSimplexSolverInterface* simplexSolver,btConvexPenetrationDepthSolver*	penetrationDepthSolver)
 :m_cachedSeparatingAxis(btScalar(0.),btScalar(0.),btScalar(1.)),
 m_penetrationDepthSolver(penetrationDepthSolver),
 m_simplexSolver(simplexSolver),
@@ -47,7 +47,7 @@ m_catchDegeneracies(1)
 {
 }
 
-void btGjkPairDetector::getClosestPoints(const ClosestPointInput& input,Result& output,class btIDebugDraw* debugDraw)
+void btGjkPairDetector::getClosestPoints(const ClosestPointInput& input,Result& output,class btIDebugDraw* debugDraw,bool swapResults)
 {
 	btScalar distance=btScalar(0.);
 	btVector3	normalInB(btScalar(0.),btScalar(0.),btScalar(0.));
@@ -144,6 +144,13 @@ void btGjkPairDetector::getClosestPoints(const ClosestPointInput& input,Result&
 				break;
 			}
 
+			if(m_cachedSeparatingAxis.length2()<REL_ERROR2)
+            {
+                m_degenerateSimplex = 6;
+                checkSimplex = true;
+                break;
+            }
+
 			btScalar previousSquaredDistance = squaredDistance;
 			squaredDistance = m_cachedSeparatingAxis.length2();
 			
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h
index af0fe32f6c7..550fc4677e0 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h
@@ -20,8 +20,8 @@ subject to the following restrictions:
 #define GJK_PAIR_DETECTOR_H
 
 #include "btDiscreteCollisionDetectorInterface.h"
-#include "../../LinearMath/btPoint3.h"
-#include "../CollisionShapes/btCollisionMargin.h"
+#include "LinearMath/btPoint3.h"
+#include "BulletCollision/CollisionShapes/btCollisionMargin.h"
 
 class btConvexShape;
 #include "btSimplexSolverInterface.h"
@@ -35,8 +35,8 @@ class btGjkPairDetector : public btDiscreteCollisionDetectorInterface
 	btVector3	m_cachedSeparatingAxis;
 	btConvexPenetrationDepthSolver*	m_penetrationDepthSolver;
 	btSimplexSolverInterface* m_simplexSolver;
-	btConvexShape* m_minkowskiA;
-	btConvexShape* m_minkowskiB;
+	const btConvexShape* m_minkowskiA;
+	const btConvexShape* m_minkowskiB;
 	bool		m_ignoreMargin;
 	
 
@@ -49,10 +49,10 @@ public:
 	int			m_catchDegeneracies;
 
 
-	btGjkPairDetector(btConvexShape* objectA,btConvexShape* objectB,btSimplexSolverInterface* simplexSolver,btConvexPenetrationDepthSolver*	penetrationDepthSolver);
+	btGjkPairDetector(const btConvexShape* objectA,const btConvexShape* objectB,btSimplexSolverInterface* simplexSolver,btConvexPenetrationDepthSolver*	penetrationDepthSolver);
 	virtual ~btGjkPairDetector() {};
 
-	virtual void	getClosestPoints(const ClosestPointInput& input,Result& output,class btIDebugDraw* debugDraw);
+	virtual void	getClosestPoints(const ClosestPointInput& input,Result& output,class btIDebugDraw* debugDraw,bool swapResults=false);
 
 	void setMinkowskiA(btConvexShape* minkA)
 	{
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h
index f6a893151da..e75fc1bee96 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h
@@ -16,8 +16,8 @@ subject to the following restrictions:
 #ifndef MANIFOLD_CONTACT_POINT_H
 #define MANIFOLD_CONTACT_POINT_H
 
-#include "../../LinearMath/btVector3.h"
-#include "../../LinearMath/btTransformUtil.h"
+#include "LinearMath/btVector3.h"
+#include "LinearMath/btTransformUtil.h"
 
 
 
@@ -30,6 +30,8 @@ class btManifoldPoint
 		public:
 			btManifoldPoint()
 				:m_userPersistentData(0),
+				m_appliedImpulse(0.f),
+				m_lateralFrictionInitialized(false),
 				m_lifeTime(0)
 			{
 			}
@@ -43,7 +45,11 @@ class btManifoldPoint
 					m_distance1( distance ),
 					m_combinedFriction(btScalar(0.)),
 					m_combinedRestitution(btScalar(0.)),
-					m_userPersistentData(0),					
+					m_userPersistentData(0),
+					m_appliedImpulse(0.f),
+					m_lateralFrictionInitialized(false),
+					m_appliedImpulseLateral1(0.f),
+					m_appliedImpulseLateral2(0.f),
 					m_lifeTime(0)
 			{
 				
@@ -63,11 +69,23 @@ class btManifoldPoint
 			btScalar	m_combinedFriction;
 			btScalar	m_combinedRestitution;
 
+         //BP mod, store contact triangles.
+         int	   m_partId0;
+         int      m_partId1;
+         int      m_index0;
+         int      m_index1;
 				
 			mutable void*	m_userPersistentData;
+			btScalar		m_appliedImpulse;
 
-			int		m_lifeTime;//lifetime of the contactpoint in frames
+			bool			m_lateralFrictionInitialized;
+			btScalar		m_appliedImpulseLateral1;
+			btScalar		m_appliedImpulseLateral2;
+			int				m_lifeTime;//lifetime of the contactpoint in frames
 			
+			btVector3		m_lateralFrictionDir1;
+			btVector3		m_lateralFrictionDir2;
+
 			btScalar getDistance() const
 			{
 				return m_distance1;
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp
index c4bab3a134a..0e6fa2e6dfe 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp
@@ -14,10 +14,10 @@ subject to the following restrictions:
 */
 
 #include "btMinkowskiPenetrationDepthSolver.h"
-#include "BulletCollision/CollisionShapes/btMinkowskiSumShape.h"
 #include "BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h"
 #include "BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h"
 #include "BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h"
+#include "BulletCollision/CollisionShapes/btConvexShape.h"
 
 
 
@@ -71,7 +71,7 @@ btVector3(btScalar(0.162456) , btScalar(0.499995),btScalar(0.850654))
 
 
 bool btMinkowskiPenetrationDepthSolver::calcPenDepth(btSimplexSolverInterface& simplexSolver,
-												   btConvexShape* convexA,btConvexShape* convexB,
+												   const btConvexShape* convexA,const btConvexShape* convexB,
 												   const btTransform& transA,const btTransform& transB,
 												   btVector3& v, btPoint3& pa, btPoint3& pb,
 												   class btIDebugDraw* debugDraw,btStackAlloc* stackAlloc
@@ -112,8 +112,7 @@ bool btMinkowskiPenetrationDepthSolver::calcPenDepth(btSimplexSolverInterface& s
 
 	//just take fixed number of orientation, and sample the penetration depth in that direction
 	btScalar minProj = btScalar(1e30);
-	btVector3 minNorm;
-	btVector3 minVertex;
+	btVector3 minNorm(btScalar(0.), btScalar(0.), btScalar(0.));
 	btVector3 minA,minB;
 	btVector3 seperatingAxisInA,seperatingAxisInB;
 	btVector3 pInA,qInB,pWorld,qWorld,w;
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h
index b348b21b52a..27b42c2b47e 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h
@@ -25,7 +25,7 @@ class btMinkowskiPenetrationDepthSolver : public btConvexPenetrationDepthSolver
 public:
 
 	virtual bool calcPenDepth( btSimplexSolverInterface& simplexSolver,
-	btConvexShape* convexA,btConvexShape* convexB,
+	const btConvexShape* convexA,const btConvexShape* convexB,
 				const btTransform& transA,const btTransform& transB,
 			btVector3& v, btPoint3& pa, btPoint3& pb,
 			class btIDebugDraw* debugDraw,btStackAlloc* stackAlloc
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp
index 08cb3ed334d..386885d2ac8 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp
@@ -20,6 +20,7 @@ subject to the following restrictions:
 
 btScalar					gContactBreakingThreshold = btScalar(0.02);
 ContactDestroyedCallback	gContactDestroyedCallback = 0;
+ContactProcessedCallback	gContactProcessedCallback = 0;
 
 
 
@@ -27,20 +28,12 @@ btPersistentManifold::btPersistentManifold()
 :m_body0(0),
 m_body1(0),
 m_cachedPoints (0),
-m_index1(0)
+m_index1a(0)
 {
 }
 
 
-void	btPersistentManifold::clearManifold()
-{
-	int i;
-	for (i=0;i<m_cachedPoints;i++)
-	{
-		clearUserCache(m_pointCache[i]);
-	}
-	m_cachedPoints = 0;
-}
+
 
 #ifdef DEBUG_PERSISTENCY
 #include <stdio.h>
@@ -169,7 +162,7 @@ int btPersistentManifold::getCacheEntry(const btManifoldPoint& newPoint) const
 	return nearestPoint;
 }
 
-void btPersistentManifold::AddManifoldPoint(const btManifoldPoint& newPoint)
+int btPersistentManifold::addManifoldPoint(const btManifoldPoint& newPoint)
 {
 	assert(validContactDistance(newPoint));
 
@@ -182,7 +175,7 @@ void btPersistentManifold::AddManifoldPoint(const btManifoldPoint& newPoint)
 #else
 		insertIndex = 0;
 #endif
-
+		clearUserCache(m_pointCache[insertIndex]);
 		
 	} else
 	{
@@ -190,7 +183,9 @@ void btPersistentManifold::AddManifoldPoint(const btManifoldPoint& newPoint)
 
 		
 	}
-	replaceContactPoint(newPoint,insertIndex);
+	btAssert(m_pointCache[insertIndex].m_userPersistentData==0);
+	m_pointCache[insertIndex] = newPoint;
+	return insertIndex;
 }
 
 btScalar	btPersistentManifold::getContactBreakingThreshold() const
@@ -198,10 +193,20 @@ btScalar	btPersistentManifold::getContactBreakingThreshold() const
 	return gContactBreakingThreshold;
 }
 
+
+
 void btPersistentManifold::refreshContactPoints(const btTransform& trA,const btTransform& trB)
 {
 	int i;
-
+#ifdef DEBUG_PERSISTENCY
+	printf("refreshContactPoints posA = (%f,%f,%f) posB = (%f,%f,%f)\n",
+		trA.getOrigin().getX(),
+		trA.getOrigin().getY(),
+		trA.getOrigin().getZ(),
+		trB.getOrigin().getX(),
+		trB.getOrigin().getY(),
+		trB.getOrigin().getZ());
+#endif //DEBUG_PERSISTENCY
 	/// first refresh worldspace positions and distance
 	for (i=getNumContacts()-1;i>=0;i--)
 	{
@@ -232,6 +237,11 @@ void btPersistentManifold::refreshContactPoints(const btTransform& trA,const btT
 			if (distance2d  > getContactBreakingThreshold()*getContactBreakingThreshold() )
 			{
 				removeContactPoint(i);
+			} else
+			{
+				//contact point processed callback
+				if (gContactProcessedCallback)
+					(*gContactProcessedCallback)(manifoldPoint,m_body0,m_body1);
 			}
 		}
 	}
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h
index a5918b84db3..c122eb865e8 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h
@@ -17,9 +17,10 @@ subject to the following restrictions:
 #define PERSISTENT_MANIFOLD_H
 
 
-#include "../../LinearMath/btVector3.h"
-#include "../../LinearMath/btTransform.h"
+#include "LinearMath/btVector3.h"
+#include "LinearMath/btTransform.h"
 #include "btManifoldPoint.h"
+#include "LinearMath/btAlignedAllocator.h"
 
 struct btCollisionResult;
 
@@ -27,6 +28,7 @@ struct btCollisionResult;
 extern btScalar gContactBreakingThreshold;
 
 typedef bool (*ContactDestroyedCallback)(void* userPersistentData);
+typedef bool (*ContactProcessedCallback)(btManifoldPoint& cp,void* body0,void* body1);
 extern ContactDestroyedCallback	gContactDestroyedCallback;
 
 
@@ -34,8 +36,13 @@ extern ContactDestroyedCallback	gContactDestroyedCallback;
 
 #define MANIFOLD_CACHE_SIZE 4
 
-///btPersistentManifold maintains contact points, and reduces them to 4.
-///It does contact filtering/contact reduction.
+///btPersistentManifold is a contact point cache, it stays persistent as long as objects are overlapping in the broadphase.
+///Those contact points are created by the collision narrow phase.
+///The cache can be empty, or hold 1,2,3 or 4 points. Some collision algorithms (GJK) might only add one point at a time.
+///updates/refreshes old contact points, and throw them away if necessary (distance becomes too large)
+///reduces the cache to 4 points, when more then 4 points are added, using following rules:
+///the contact point with deepest penetration is always kept, and it tries to maximuze the area covered by the points
+///note that some pairs of objects might have more then one contact manifold.
 ATTRIBUTE_ALIGNED16( class) btPersistentManifold 
 {
 
@@ -55,20 +62,23 @@ ATTRIBUTE_ALIGNED16( class) btPersistentManifold
 
 public:
 
-	int m_index1;
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
+	int m_index1a;
 
 	btPersistentManifold();
 
-	btPersistentManifold(void* body0,void* body1)
+	btPersistentManifold(void* body0,void* body1,int bla)
 		: m_body0(body0),m_body1(body1),m_cachedPoints(0)
 	{
+		(void)bla;
 	}
 
-	inline void* getBody0() { return m_body0;}
-	inline void* getBody1() { return m_body1;}
+	SIMD_FORCE_INLINE void* getBody0() { return m_body0;}
+	SIMD_FORCE_INLINE void* getBody1() { return m_body1;}
 
-	inline const void* getBody0() const { return m_body0;}
-	inline const void* getBody1() const { return m_body1;}
+	SIMD_FORCE_INLINE const void* getBody0() const { return m_body0;}
+	SIMD_FORCE_INLINE const void* getBody1() const { return m_body1;}
 
 	void	setBodies(void* body0,void* body1)
 	{
@@ -82,15 +92,15 @@ public:
 	void	DebugPersistency();
 #endif //
 	
-	inline int	getNumContacts() const { return m_cachedPoints;}
+	SIMD_FORCE_INLINE int	getNumContacts() const { return m_cachedPoints;}
 
-	inline const btManifoldPoint& getContactPoint(int index) const
+	SIMD_FORCE_INLINE const btManifoldPoint& getContactPoint(int index) const
 	{
 		btAssert(index < m_cachedPoints);
 		return m_pointCache[index];
 	}
 
-	inline btManifoldPoint& getContactPoint(int index)
+	SIMD_FORCE_INLINE btManifoldPoint& getContactPoint(int index)
 	{
 		btAssert(index < m_cachedPoints);
 		return m_pointCache[index];
@@ -101,7 +111,7 @@ public:
 	
 	int getCacheEntry(const btManifoldPoint& newPoint) const;
 
-	void AddManifoldPoint( const btManifoldPoint& newPoint);
+	int addManifoldPoint( const btManifoldPoint& newPoint);
 
 	void removeContactPoint (int index)
 	{
@@ -114,6 +124,11 @@ public:
 			m_pointCache[index] = m_pointCache[lastUsedIndex]; 
 			//get rid of duplicated userPersistentData pointer
 			m_pointCache[lastUsedIndex].m_userPersistentData = 0;
+			m_pointCache[lastUsedIndex].m_appliedImpulse = 0.f;
+			m_pointCache[lastUsedIndex].m_lateralFrictionInitialized = false;
+			m_pointCache[lastUsedIndex].m_appliedImpulseLateral1 = 0.f;
+			m_pointCache[lastUsedIndex].m_appliedImpulseLateral2 = 0.f;
+			m_pointCache[lastUsedIndex].m_lifeTime = 0;
 		}
 
 		btAssert(m_pointCache[lastUsedIndex].m_userPersistentData==0);
@@ -126,12 +141,20 @@ public:
 #define MAINTAIN_PERSISTENCY 1
 #ifdef MAINTAIN_PERSISTENCY
 		int	lifeTime = m_pointCache[insertIndex].getLifeTime();
+		btScalar	appliedImpulse = m_pointCache[insertIndex].m_appliedImpulse;
+		btScalar	appliedLateralImpulse1 = m_pointCache[insertIndex].m_appliedImpulseLateral1;
+		btScalar	appliedLateralImpulse2 = m_pointCache[insertIndex].m_appliedImpulseLateral2;
+				
 		btAssert(lifeTime>=0);
 		void* cache = m_pointCache[insertIndex].m_userPersistentData;
 		
 		m_pointCache[insertIndex] = newPoint;
 
 		m_pointCache[insertIndex].m_userPersistentData = cache;
+		m_pointCache[insertIndex].m_appliedImpulse = appliedImpulse;
+		m_pointCache[insertIndex].m_appliedImpulseLateral1 = appliedLateralImpulse1;
+		m_pointCache[insertIndex].m_appliedImpulseLateral2 = appliedLateralImpulse2;
+		
 		m_pointCache[insertIndex].m_lifeTime = lifeTime;
 #else
 		clearUserCache(m_pointCache[insertIndex]);
@@ -147,7 +170,16 @@ public:
 	/// calculated new worldspace coordinates and depth, and reject points that exceed the collision margin
 	void	refreshContactPoints(  const btTransform& trA,const btTransform& trB);
 
-	void	clearManifold();
+	
+	SIMD_FORCE_INLINE	void	clearManifold()
+	{
+		int i;
+		for (i=0;i<m_cachedPoints;i++)
+		{
+			clearUserCache(m_pointCache[i]);
+		}
+		m_cachedPoints = 0;
+	}
 
 
 
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp
index 68ac93ec3cc..a70a3ae56c4 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp
@@ -13,14 +13,20 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
+//#include <stdio.h>
 
+#include "BulletCollision/CollisionShapes/btConvexShape.h"
+#include "BulletCollision/CollisionShapes/btTriangleShape.h"
+#include "BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h"
+#include "BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h"
+#include "BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h"
+#include "BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h"
 #include "btRaycastCallback.h"
 
-btTriangleRaycastCallback::btTriangleRaycastCallback(const btVector3& from,const btVector3& to,bool faceNormal)
+btTriangleRaycastCallback::btTriangleRaycastCallback(const btVector3& from,const btVector3& to)
 	:
 	m_from(from),
 	m_to(to),
-	m_faceNormal(faceNormal),
 	m_hitFraction(btScalar(1.))
 {
 
@@ -30,8 +36,6 @@ btTriangleRaycastCallback::btTriangleRaycastCallback(const btVector3& from,const
 
 void btTriangleRaycastCallback::processTriangle(btVector3* triangle,int partId, int triangleIndex)
 {
-	
-
 	const btVector3 &vert0=triangle[0];
 	const btVector3 &vert1=triangle[1];
 	const btVector3 &vert2=triangle[2];
@@ -85,7 +89,8 @@ void btTriangleRaycastCallback::processTriangle(btVector3* triangle,int partId,
 					
 					if ( (btScalar)(cp2.dot(triangleNormal)) >=edge_tolerance) 
 					{
-						if (m_faceNormal || dist_a > 0)
+
+						if ( dist_a > 0 )
 						{
 							m_hitFraction = reportHit(triangleNormal,distance,partId,triangleIndex);
 						}
@@ -99,3 +104,60 @@ void btTriangleRaycastCallback::processTriangle(btVector3* triangle,int partId,
 		}
 	}
 }
+
+
+btTriangleConvexcastCallback::btTriangleConvexcastCallback (const btConvexShape* convexShape, const btTransform& convexShapeFrom, const btTransform& convexShapeTo, const btTransform& triangleToWorld, const btScalar triangleCollisionMargin)
+{
+	m_convexShape = convexShape;
+	m_convexShapeFrom = convexShapeFrom;
+	m_convexShapeTo = convexShapeTo;
+	m_triangleToWorld = triangleToWorld;
+	m_hitFraction = 1.0;
+    m_triangleCollisionMargin = triangleCollisionMargin;
+}
+
+void
+btTriangleConvexcastCallback::processTriangle (btVector3* triangle, int partId, int triangleIndex)
+{
+	btTriangleShape triangleShape (triangle[0], triangle[1], triangle[2]);
+    triangleShape.setMargin(m_triangleCollisionMargin);
+
+	btVoronoiSimplexSolver	simplexSolver;
+	btGjkEpaPenetrationDepthSolver	gjkEpaPenetrationSolver;
+
+//#define  USE_SUBSIMPLEX_CONVEX_CAST 1
+//if you reenable USE_SUBSIMPLEX_CONVEX_CAST see commented out code below
+#ifdef USE_SUBSIMPLEX_CONVEX_CAST
+	btSubsimplexConvexCast convexCaster(m_convexShape, &triangleShape, &simplexSolver);
+#else
+	//btGjkConvexCast	convexCaster(m_convexShape,&triangleShape,&simplexSolver);
+	btContinuousConvexCollision convexCaster(m_convexShape,&triangleShape,&simplexSolver,&gjkEpaPenetrationSolver);
+#endif //#USE_SUBSIMPLEX_CONVEX_CAST
+	
+	btConvexCast::CastResult castResult;
+	castResult.m_fraction = btScalar(1.);
+	if (convexCaster.calcTimeOfImpact(m_convexShapeFrom,m_convexShapeTo,m_triangleToWorld, m_triangleToWorld, castResult))
+	{
+		//add hit
+		if (castResult.m_normal.length2() > btScalar(0.0001))
+		{					
+			if (castResult.m_fraction < m_hitFraction)
+			{
+/* btContinuousConvexCast's normal is already in world space */
+/*
+#ifdef USE_SUBSIMPLEX_CONVEX_CAST
+				//rotate normal into worldspace
+				castResult.m_normal = m_convexShapeFrom.getBasis() * castResult.m_normal;
+#endif //USE_SUBSIMPLEX_CONVEX_CAST
+*/
+				castResult.m_normal.normalize();
+
+				reportHit (castResult.m_normal,
+							castResult.m_hitPoint,
+							castResult.m_fraction,
+							partId,
+							triangleIndex);
+			}
+		}
+	}
+}
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h
index 71ed9fead49..d2b4b80f8ba 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h
@@ -16,22 +16,22 @@ subject to the following restrictions:
 #ifndef RAYCAST_TRI_CALLBACK_H
 #define RAYCAST_TRI_CALLBACK_H
 
-#include "../CollisionShapes/btTriangleCallback.h"
+#include "BulletCollision/CollisionShapes/btTriangleCallback.h"
+#include "LinearMath/btTransform.h"
 struct btBroadphaseProxy;
-
+class btConvexShape;
 
 class  btTriangleRaycastCallback: public btTriangleCallback
 {
 public:
 
-		//input
+	//input
 	btVector3 m_from;
 	btVector3 m_to;
-	bool m_faceNormal;
 
 	btScalar	m_hitFraction;
 
-	btTriangleRaycastCallback(const btVector3& from,const btVector3& to,bool faceNormal);
+	btTriangleRaycastCallback(const btVector3& from,const btVector3& to);
 	
 	virtual void processTriangle(btVector3* triangle, int partId, int triangleIndex);
 
@@ -39,5 +39,22 @@ public:
 	
 };
 
+class btTriangleConvexcastCallback : public btTriangleCallback
+{
+public:
+	const btConvexShape* m_convexShape;
+	btTransform m_convexShapeFrom;
+	btTransform m_convexShapeTo;
+	btTransform m_triangleToWorld;
+	btScalar m_hitFraction;
+    btScalar m_triangleCollisionMargin;
+
+	btTriangleConvexcastCallback (const btConvexShape* convexShape, const btTransform& convexShapeFrom, const btTransform& convexShapeTo, const btTransform& triangleToWorld, const btScalar triangleCollisionMargin);
+
+	virtual void processTriangle (btVector3* triangle, int partId, int triangleIndex);
+
+	virtual btScalar reportHit (const btVector3& hitNormalLocal, const btVector3& hitPointLocal, btScalar hitFraction, int partId, int triangleIndex) = 0;
+};
+
 #endif //RAYCAST_TRI_CALLBACK_H
 
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h
index 58393b2eab9..cf65f46505b 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h
@@ -18,8 +18,8 @@ subject to the following restrictions:
 #ifndef SIMPLEX_SOLVER_INTERFACE_H
 #define SIMPLEX_SOLVER_INTERFACE_H
 
-#include "../../LinearMath/btVector3.h"
-#include "../../LinearMath/btPoint3.h"
+#include "LinearMath/btVector3.h"
+#include "LinearMath/btPoint3.h"
 
 #define NO_VIRTUAL_INTERFACE 1
 #ifdef NO_VIRTUAL_INTERFACE
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp
index 687738b7fa9..4c709a8c3a9 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp
@@ -16,9 +16,11 @@ subject to the following restrictions:
 
 #include "btSubSimplexConvexCast.h"
 #include "BulletCollision/CollisionShapes/btConvexShape.h"
+
 #include "BulletCollision/CollisionShapes/btMinkowskiSumShape.h"
 #include "BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h"
-
+#include "btPointCollector.h"
+#include "LinearMath/btTransformUtil.h"
 
 btSubsimplexConvexCast::btSubsimplexConvexCast (const btConvexShape* convexA,const btConvexShape* convexB,btSimplexSolverInterface* simplexSolver)
 :m_simplexSolver(simplexSolver),
@@ -41,34 +43,24 @@ bool	btSubsimplexConvexCast::calcTimeOfImpact(
 		CastResult& result)
 {
 
-	btMinkowskiSumShape combi(m_convexA,m_convexB);
-	btMinkowskiSumShape* convex = &combi;
-
-	btTransform	rayFromLocalA;
-	btTransform	rayToLocalA;
-
-	rayFromLocalA = fromA.inverse()* fromB;
-	rayToLocalA = toA.inverse()* toB;
-
-
 	m_simplexSolver->reset();
 
-	convex->setTransformB(btTransform(rayFromLocalA.getBasis()));
-
-	//btScalar radius = btScalar(0.01);
+	btVector3 linVelA,linVelB;
+	linVelA = toA.getOrigin()-fromA.getOrigin();
+	linVelB = toB.getOrigin()-fromB.getOrigin();
 
 	btScalar lambda = btScalar(0.);
-	//todo: need to verify this:
-	//because of minkowski difference, we need the inverse direction
-	
-	btVector3 s = -rayFromLocalA.getOrigin();
-	btVector3 r = -(rayToLocalA.getOrigin()-rayFromLocalA.getOrigin());
-	btVector3 x = s;
-	btVector3 v;
-	btVector3 arbitraryPoint = convex->localGetSupportingVertex(r);
-	
-	v = x - arbitraryPoint;
 
+	btTransform interpolatedTransA = fromA;
+	btTransform interpolatedTransB = fromB;
+
+	///take relative motion
+	btVector3 r = (linVelA-linVelB);
+	btVector3 v;
+	
+	btVector3 supVertexA = fromA(m_convexA->localGetSupportingVertex(-r*fromA.getBasis()));
+	btVector3 supVertexB = fromB(m_convexB->localGetSupportingVertex(r*fromB.getBasis()));
+	v = supVertexA-supVertexB;
 	int maxIter = MAX_ITERATIONS;
 
 	btVector3 n;
@@ -90,11 +82,17 @@ bool	btSubsimplexConvexCast::calcTimeOfImpact(
 	
 	while ( (dist2 > epsilon) && maxIter--)
 	{
-		p = convex->localGetSupportingVertex( v);
-		 w = x - p;
+		supVertexA = interpolatedTransA(m_convexA->localGetSupportingVertex(-v*interpolatedTransA.getBasis()));
+		supVertexB = interpolatedTransB(m_convexB->localGetSupportingVertex(v*interpolatedTransB.getBasis()));
+		w = supVertexA-supVertexB;
 
 		btScalar VdotW = v.dot(w);
 
+		if (lambda > btScalar(1.0))
+		{
+			return false;
+		}
+
 		if ( VdotW > btScalar(0.))
 		{
 			VdotR = v.dot(r);
@@ -104,20 +102,25 @@ bool	btSubsimplexConvexCast::calcTimeOfImpact(
 			else
 			{
 				lambda = lambda - VdotW / VdotR;
-				x = s + lambda * r;
-				m_simplexSolver->reset();
+				//interpolate to next lambda
+				//	x = s + lambda * r;
+				interpolatedTransA.getOrigin().setInterpolate3(fromA.getOrigin(),toA.getOrigin(),lambda);
+				interpolatedTransB.getOrigin().setInterpolate3(fromB.getOrigin(),toB.getOrigin(),lambda);
+				//m_simplexSolver->reset();
 				//check next line
-				w = x-p;
+				 w = supVertexA-supVertexB;
 				lastLambda = lambda;
 				n = v;
 				hasResult = true;
 			}
 		} 
-		m_simplexSolver->addVertex( w, x , p);
+		m_simplexSolver->addVertex( w, supVertexA , supVertexB);
 		if (m_simplexSolver->closest(v))
 		{
 			dist2 = v.length2();
 			hasResult = true;
+			//todo: check this normal for validity
+			//n=v;
 			//printf("V=%f , %f, %f\n",v[0],v[1],v[2]);
 			//printf("DIST2=%f\n",dist2);
 			//printf("numverts = %i\n",m_simplexSolver->numVertices());
@@ -129,11 +132,26 @@ bool	btSubsimplexConvexCast::calcTimeOfImpact(
 
 	//int numiter = MAX_ITERATIONS - maxIter;
 //	printf("number of iterations: %d", numiter);
-	result.m_fraction = lambda;
-	result.m_normal = n;
+	
+	//don't report a time of impact when moving 'away' from the hitnormal
+	
 
+	result.m_fraction = lambda;
+	if (n.length2() >= (SIMD_EPSILON*SIMD_EPSILON))
+		result.m_normal = n.normalized();
+	else
+		result.m_normal = btVector3(btScalar(0.0), btScalar(0.0), btScalar(0.0));
+
+	//don't report time of impact for motion away from the contact normal (or causes minor penetration)
+	if (result.m_normal.dot(r)>=-result.m_allowedPenetration)
+		return false;
+
+	btVector3 hitA,hitB;
+	m_simplexSolver->compute_points(hitA,hitB);
+	result.m_hitPoint=hitB;
 	return true;
 }
 
 
 
+
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp
index 105b7eccefa..cf8a3ab5eb1 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp
@@ -26,7 +26,7 @@ subject to the following restrictions:
 
 #include "btVoronoiSimplexSolver.h"
 #include <assert.h>
-#include <stdio.h>
+//#include <stdio.h>
 
 #define VERTA  0
 #define VERTB  1
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
index 2289621e8e3..e11b49d9420 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
@@ -19,24 +19,20 @@ Written by: Marcus Hennix
 #include "btConeTwistConstraint.h"
 #include "BulletDynamics/Dynamics/btRigidBody.h"
 #include "LinearMath/btTransformUtil.h"
-#include "LinearMath/btSimdMinMax.h"
+#include "LinearMath/btMinMax.h"
 #include <new>
 
 btConeTwistConstraint::btConeTwistConstraint()
+:btTypedConstraint(CONETWIST_CONSTRAINT_TYPE)
 {
 }
 
 
 btConeTwistConstraint::btConeTwistConstraint(btRigidBody& rbA,btRigidBody& rbB, 
 											 const btTransform& rbAFrame,const btTransform& rbBFrame)
-											 :btTypedConstraint(rbA,rbB),m_rbAFrame(rbAFrame),m_rbBFrame(rbBFrame),
+											 :btTypedConstraint(CONETWIST_CONSTRAINT_TYPE, rbA,rbB),m_rbAFrame(rbAFrame),m_rbBFrame(rbBFrame),
 											 m_angularOnly(false)
 {
-	// flip axis for correct angles
-	m_rbBFrame.getBasis()[1][0] *= btScalar(-1.);
-	m_rbBFrame.getBasis()[1][1] *= btScalar(-1.);
-	m_rbBFrame.getBasis()[1][2] *= btScalar(-1.);
-
 	m_swingSpan1 = btScalar(1e30);
 	m_swingSpan2 = btScalar(1e30);
 	m_twistSpan  = btScalar(1e30);
@@ -49,20 +45,11 @@ btConeTwistConstraint::btConeTwistConstraint(btRigidBody& rbA,btRigidBody& rbB,
 }
 
 btConeTwistConstraint::btConeTwistConstraint(btRigidBody& rbA,const btTransform& rbAFrame)
-											:btTypedConstraint(rbA),m_rbAFrame(rbAFrame),
+											:btTypedConstraint(CONETWIST_CONSTRAINT_TYPE,rbA),m_rbAFrame(rbAFrame),
 											 m_angularOnly(false)
 {
 	m_rbBFrame = m_rbAFrame;
 	
-	// flip axis for correct angles
-	m_rbBFrame.getBasis()[1][0] *= btScalar(-1.);
-	m_rbBFrame.getBasis()[1][1] *= btScalar(-1.);
-	m_rbBFrame.getBasis()[1][2] *= btScalar(-1.);
-
-	m_rbBFrame.getBasis()[2][0] *= btScalar(-1.);
-	m_rbBFrame.getBasis()[2][1] *= btScalar(-1.);
-	m_rbBFrame.getBasis()[2][2] *= btScalar(-1.);
-	
 	m_swingSpan1 = btScalar(1e30);
 	m_swingSpan2 = btScalar(1e30);
 	m_twistSpan  = btScalar(1e30);
@@ -142,7 +129,7 @@ void	btConeTwistConstraint::buildJacobian()
 
 	btScalar RMaxAngle1Sq = 1.0f / (m_swingSpan1*m_swingSpan1);		
 	btScalar RMaxAngle2Sq = 1.0f / (m_swingSpan2*m_swingSpan2);	
-	btScalar EllipseAngle = btFabs(swing1)* RMaxAngle1Sq + btFabs(swing2) * RMaxAngle2Sq;
+	btScalar EllipseAngle = btFabs(swing1*swing1)* RMaxAngle1Sq + btFabs(swing2*swing2) * RMaxAngle2Sq;
 
 	if (EllipseAngle > 1.0f)
 	{
@@ -246,7 +233,7 @@ void	btConeTwistConstraint::solveConstraint(btScalar	timeStep)
 
 			// Clamp the accumulated impulse
 			btScalar temp = m_accSwingLimitImpulse;
-			m_accSwingLimitImpulse = btMax(m_accSwingLimitImpulse + impulseMag, 0.0f );
+			m_accSwingLimitImpulse = btMax(m_accSwingLimitImpulse + impulseMag, btScalar(0.0) );
 			impulseMag = m_accSwingLimitImpulse - temp;
 
 			btVector3 impulse = m_swingAxis * impulseMag;
@@ -264,7 +251,7 @@ void	btConeTwistConstraint::solveConstraint(btScalar	timeStep)
 
 			// Clamp the accumulated impulse
 			btScalar temp = m_accTwistLimitImpulse;
-			m_accTwistLimitImpulse = btMax(m_accTwistLimitImpulse + impulseMag, 0.0f );
+			m_accTwistLimitImpulse = btMax(m_accTwistLimitImpulse + impulseMag, btScalar(0.0) );
 			impulseMag = m_accTwistLimitImpulse - temp;
 
 			btVector3 impulse = m_twistAxis * impulseMag;
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h
index 874669c80b3..f121919c8f9 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h
@@ -30,6 +30,9 @@ class btRigidBody;
 ///btConeTwistConstraint can be used to simulate ragdoll joints (upper arm, leg etc)
 class btConeTwistConstraint : public btTypedConstraint
 {
+#ifdef IN_PARALLELL_SOLVER
+public:
+#endif
 	btJacobianEntry	m_jac[3]; //3 orthogonal linear constraints
 
 	btTransform m_rbAFrame; 
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConstraintSolver.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConstraintSolver.h
index 7e8458c2c7b..7a8e9c1953d 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConstraintSolver.h
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConstraintSolver.h
@@ -16,7 +16,7 @@ subject to the following restrictions:
 #ifndef CONSTRAINT_SOLVER_H
 #define CONSTRAINT_SOLVER_H
 
-#include "../../LinearMath/btScalar.h"
+#include "LinearMath/btScalar.h"
 
 class btPersistentManifold;
 class btRigidBody;
@@ -26,7 +26,7 @@ struct btContactSolverInfo;
 struct btBroadphaseProxy;
 class btIDebugDraw;
 class btStackAlloc;
-
+class	btDispatcher;
 /// btConstraintSolver provides solver interface
 class btConstraintSolver
 {
@@ -35,8 +35,15 @@ public:
 
 	virtual ~btConstraintSolver() {}
 	
-	virtual btScalar solveGroup(btCollisionObject** bodies,int numBodies,btPersistentManifold** manifold,int numManifolds,btTypedConstraint** constraints,int numConstraints, const btContactSolverInfo& info,class btIDebugDraw* debugDrawer, btStackAlloc* stackAlloc) = 0;
+	virtual void prepareSolve (int /* numBodies */, int /* numManifolds */) {;}
 
+	///solve a group of constraints
+	virtual btScalar solveGroup(btCollisionObject** bodies,int numBodies,btPersistentManifold** manifold,int numManifolds,btTypedConstraint** constraints,int numConstraints, const btContactSolverInfo& info,class btIDebugDraw* debugDrawer, btStackAlloc* stackAlloc,btDispatcher* dispatcher) = 0;
+
+	virtual void allSolved (const btContactSolverInfo& /* info */,class btIDebugDraw* /* debugDrawer */, btStackAlloc* /* stackAlloc */) {;}
+
+	///clear internal cached data and reset random seed
+	virtual	void	reset() = 0;
 };
 
 
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp
index bb3fe832592..4d7cd05feb7 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp
@@ -192,8 +192,8 @@ btScalar resolveSingleFriction(
 			j1 = -vrel * cpd->m_jacDiagABInvTangent0;
 			btScalar oldTangentImpulse = cpd->m_accumulatedTangentImpulse0;
 			cpd->m_accumulatedTangentImpulse0 = oldTangentImpulse + j1;
-			GEN_set_min(cpd->m_accumulatedTangentImpulse0, limit);
-			GEN_set_max(cpd->m_accumulatedTangentImpulse0, -limit);
+			btSetMin(cpd->m_accumulatedTangentImpulse0, limit);
+			btSetMax(cpd->m_accumulatedTangentImpulse0, -limit);
 			j1 = cpd->m_accumulatedTangentImpulse0 - oldTangentImpulse;
 
 		}
@@ -206,8 +206,8 @@ btScalar resolveSingleFriction(
 			j2 = -vrel * cpd->m_jacDiagABInvTangent1;
 			btScalar oldTangentImpulse = cpd->m_accumulatedTangentImpulse1;
 			cpd->m_accumulatedTangentImpulse1 = oldTangentImpulse + j2;
-			GEN_set_min(cpd->m_accumulatedTangentImpulse1, limit);
-			GEN_set_max(cpd->m_accumulatedTangentImpulse1, -limit);
+			btSetMin(cpd->m_accumulatedTangentImpulse1, limit);
+			btSetMax(cpd->m_accumulatedTangentImpulse1, -limit);
 			j2 = cpd->m_accumulatedTangentImpulse1 - oldTangentImpulse;
 		}
 
@@ -233,6 +233,12 @@ btScalar resolveSingleFriction(
 }
 
 
+btScalar resolveSingleFrictionOriginal(
+	btRigidBody& body1,
+	btRigidBody& body2,
+	btManifoldPoint& contactPoint,
+	const btContactSolverInfo& solverInfo);
+
 btScalar resolveSingleFrictionOriginal(
 	btRigidBody& body1,
 	btRigidBody& body2,
@@ -270,8 +276,8 @@ btScalar resolveSingleFrictionOriginal(
 			// calculate j that moves us to zero relative velocity
 			btScalar j = -vrel * cpd->m_jacDiagABInvTangent0;
 			btScalar total = cpd->m_accumulatedTangentImpulse0 + j;
-			GEN_set_min(total, limit);
-			GEN_set_max(total, -limit);
+			btSetMin(total, limit);
+			btSetMax(total, -limit);
 			j = total - cpd->m_accumulatedTangentImpulse0;
 			cpd->m_accumulatedTangentImpulse0 = total;
 			body1.applyImpulse(j * cpd->m_frictionWorldTangential0, rel_pos1);
@@ -290,8 +296,8 @@ btScalar resolveSingleFrictionOriginal(
 			// calculate j that moves us to zero relative velocity
 			btScalar j = -vrel * cpd->m_jacDiagABInvTangent1;
 			btScalar total = cpd->m_accumulatedTangentImpulse1 + j;
-			GEN_set_min(total, limit);
-			GEN_set_max(total, -limit);
+			btSetMin(total, limit);
+			btSetMax(total, -limit);
 			j = total - cpd->m_accumulatedTangentImpulse1;
 			cpd->m_accumulatedTangentImpulse1 = total;
 			body1.applyImpulse(j * cpd->m_frictionWorldTangential1, rel_pos1);
@@ -388,8 +394,8 @@ btScalar resolveSingleCollisionCombined(
 				(body1.getInvMass() + body2.getInvMass() + lat_vel.dot(temp1.cross(rel_pos1) + temp2.cross(rel_pos2)));
 			btScalar normal_impulse = cpd->m_appliedImpulse * combinedFriction;
 
-			GEN_set_min(friction_impulse, normal_impulse);
-			GEN_set_max(friction_impulse, -normal_impulse);
+			btSetMin(friction_impulse, normal_impulse);
+			btSetMax(friction_impulse, -normal_impulse);
 			body1.applyImpulse(lat_vel * -friction_impulse, rel_pos1);
 			body2.applyImpulse(lat_vel * friction_impulse, rel_pos2);
 		}
@@ -400,6 +406,12 @@ btScalar resolveSingleCollisionCombined(
 	return normalImpulse;
 }
 
+btScalar resolveSingleFrictionEmpty(
+	btRigidBody& body1,
+	btRigidBody& body2,
+	btManifoldPoint& contactPoint,
+	const btContactSolverInfo& solverInfo);
+
 btScalar resolveSingleFrictionEmpty(
 	btRigidBody& body1,
 	btRigidBody& body2,
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.h
index 0834deddeac..826e79f78bd 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.h
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.h
@@ -19,8 +19,8 @@ subject to the following restrictions:
 //todo: make into a proper class working with the iterative constraint solver
 
 class btRigidBody;
-#include "../../LinearMath/btVector3.h"
-#include "../../LinearMath/btScalar.h"
+#include "LinearMath/btVector3.h"
+#include "LinearMath/btScalar.h"
 struct btContactSolverInfo;
 class btManifoldPoint;
 
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h
index c3c73e300f4..916d4581f79 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h
@@ -16,21 +16,17 @@ subject to the following restrictions:
 #ifndef CONTACT_SOLVER_INFO
 #define CONTACT_SOLVER_INFO
 
-
-struct btContactSolverInfo
+enum	btSolverMode
 {
+	SOLVER_RANDMIZE_ORDER = 1,
+	SOLVER_FRICTION_SEPARATE = 2,
+	SOLVER_USE_WARMSTARTING = 4,
+	SOLVER_CACHE_FRIENDLY = 8
+};
 
-	inline btContactSolverInfo()
-	{
-		m_tau = btScalar(0.6);
-		m_damping = btScalar(1.0);
-		m_friction = btScalar(0.3);
-		m_restitution = btScalar(0.);
-		m_maxErrorReduction = btScalar(20.);
-		m_numIterations = 10;
-		m_erp = btScalar(0.4);
-		m_sor = btScalar(1.3);
-	}
+struct btContactSolverInfoData
+{
+	
 
 	btScalar	m_tau;
 	btScalar	m_damping;
@@ -40,8 +36,40 @@ struct btContactSolverInfo
 	int		m_numIterations;
 	btScalar	m_maxErrorReduction;
 	btScalar	m_sor;
-	btScalar	m_erp;
+	btScalar	m_erp;//used as Baumgarte factor
+	btScalar	m_erp2;//used in Split Impulse
+	int			m_splitImpulse;
+	btScalar	m_splitImpulsePenetrationThreshold;
+	btScalar	m_linearSlop;
+	btScalar	m_warmstartingFactor;
+
+	int			m_solverMode;
+
 
 };
 
+struct btContactSolverInfo : public btContactSolverInfoData
+{
+
+	
+
+	inline btContactSolverInfo()
+	{
+		m_tau = btScalar(0.6);
+		m_damping = btScalar(1.0);
+		m_friction = btScalar(0.3);
+		m_restitution = btScalar(0.);
+		m_maxErrorReduction = btScalar(20.);
+		m_numIterations = 10;
+		m_erp = btScalar(0.2);
+		m_erp2 = btScalar(0.1);
+		m_sor = btScalar(1.3);
+		m_splitImpulse = false;
+		m_splitImpulsePenetrationThreshold = -0.02f;
+		m_linearSlop = btScalar(0.0);
+		m_warmstartingFactor=btScalar(0.85);
+		m_solverMode = SOLVER_RANDMIZE_ORDER | SOLVER_CACHE_FRIENDLY | SOLVER_USE_WARMSTARTING;
+	}
+};
+
 #endif //CONTACT_SOLVER_INFO
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp
index 747d10d1f8b..077b326d13a 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp
@@ -4,14 +4,20 @@ Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
 
 This software is provided 'as-is', without any express or implied warranty.
 In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
 subject to the following restrictions:
 
 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
 3. This notice may not be removed or altered from any source distribution.
 */
+/*
+2007-09-09
+Refactored by Francisco Le?n
+email: projectileman@yahoo.com
+http://gimpact.sf.net
+*/
 
 
 #include "btGeneric6DofConstraint.h"
@@ -19,371 +25,504 @@ subject to the following restrictions:
 #include "LinearMath/btTransformUtil.h"
 #include <new>
 
+
 static const btScalar kSign[] = { btScalar(1.0), btScalar(-1.0), btScalar(1.0) };
 static const int kAxisA[] = { 1, 0, 0 };
 static const int kAxisB[] = { 2, 2, 1 };
 #define GENERIC_D6_DISABLE_WARMSTARTING 1
 
-btGeneric6DofConstraint::btGeneric6DofConstraint()
+btScalar btGetMatrixElem(const btMatrix3x3& mat, int index);
+btScalar btGetMatrixElem(const btMatrix3x3& mat, int index)
 {
-}
-
-btGeneric6DofConstraint::btGeneric6DofConstraint(btRigidBody& rbA, btRigidBody& rbB, const btTransform& frameInA, const btTransform& frameInB)
-: btTypedConstraint(rbA, rbB)
-, m_frameInA(frameInA)
-, m_frameInB(frameInB)
-{
-	//free means upper < lower, 
-	//locked means upper == lower
-	//limited means upper > lower
-	//so start all locked
-	for (int i=0; i<6;++i)
-	{
-		m_lowerLimit[i] = btScalar(0.0);
-		m_upperLimit[i] = btScalar(0.0);
-		m_accumulatedImpulse[i] = btScalar(0.0);
-	}
-
-}
-
-
-void btGeneric6DofConstraint::buildJacobian()
-{
-	btVector3	localNormalInA(0,0,0);
-
-	const btVector3& pivotInA = m_frameInA.getOrigin();
-	const btVector3& pivotInB = m_frameInB.getOrigin();
-
-	btVector3 pivotAInW = m_rbA.getCenterOfMassTransform() * m_frameInA.getOrigin();
-	btVector3 pivotBInW = m_rbB.getCenterOfMassTransform() * m_frameInB.getOrigin();
-
-	btVector3 rel_pos1 = pivotAInW - m_rbA.getCenterOfMassPosition(); 
-	btVector3 rel_pos2 = pivotBInW - m_rbB.getCenterOfMassPosition();
-
-	int i;
-	//linear part
-	for (i=0;i<3;i++)
-	{
-		if (isLimited(i))
-		{
-			localNormalInA[i] = 1;
-			btVector3 normalWorld = m_rbA.getCenterOfMassTransform().getBasis() * localNormalInA;
-
-			
-			// Create linear atom
-			new (&m_jacLinear[i]) btJacobianEntry(
-				m_rbA.getCenterOfMassTransform().getBasis().transpose(),
-				m_rbB.getCenterOfMassTransform().getBasis().transpose(),
-				m_rbA.getCenterOfMassTransform()*pivotInA - m_rbA.getCenterOfMassPosition(),
-				m_rbB.getCenterOfMassTransform()*pivotInB - m_rbB.getCenterOfMassPosition(),
-				normalWorld,
-				m_rbA.getInvInertiaDiagLocal(),
-				m_rbA.getInvMass(),
-				m_rbB.getInvInertiaDiagLocal(),
-				m_rbB.getInvMass());
-
-			//optionally disable warmstarting
-#ifdef GENERIC_D6_DISABLE_WARMSTARTING
-			m_accumulatedImpulse[i] = btScalar(0.);
-#endif //GENERIC_D6_DISABLE_WARMSTARTING
-
-			// Apply accumulated impulse
-			btVector3 impulse_vector = m_accumulatedImpulse[i] * normalWorld;
-
-			m_rbA.applyImpulse( impulse_vector, rel_pos1);
-			m_rbB.applyImpulse(-impulse_vector, rel_pos2);
-
-			localNormalInA[i] = 0;
-		}
-	}
-
-	// angular part
-	for (i=0;i<3;i++)
-	{
-		if (isLimited(i+3))
-		{
-			btVector3 axisA = m_rbA.getCenterOfMassTransform().getBasis() * m_frameInA.getBasis().getColumn( kAxisA[i] );
-			btVector3 axisB = m_rbB.getCenterOfMassTransform().getBasis() * m_frameInB.getBasis().getColumn( kAxisB[i] );
-
-			// Dirk: This is IMO mathematically the correct way, but we should consider axisA and axisB being near parallel maybe
-			btVector3 axis = kSign[i] * axisA.cross(axisB);
-
-			// Create angular atom
-			new (&m_jacAng[i])	btJacobianEntry(axis,
-				m_rbA.getCenterOfMassTransform().getBasis().transpose(),
-				m_rbB.getCenterOfMassTransform().getBasis().transpose(),
-				m_rbA.getInvInertiaDiagLocal(),
-				m_rbB.getInvInertiaDiagLocal());
-
-#ifdef GENERIC_D6_DISABLE_WARMSTARTING
-			m_accumulatedImpulse[i + 3] = btScalar(0.);
-#endif //GENERIC_D6_DISABLE_WARMSTARTING
-
-			// Apply accumulated impulse
-			btVector3 impulse_vector = m_accumulatedImpulse[i + 3] * axis;
-
-			m_rbA.applyTorqueImpulse( impulse_vector);
-			m_rbB.applyTorqueImpulse(-impulse_vector);
-		}
-	}
-}
-
-btScalar getMatrixElem(const btMatrix3x3& mat,int index)
-{
-	int row = index%3;
-	int col = index / 3;
-	return mat[row][col];
+	int i = index%3;
+	int j = index/3;
+	return mat[i][j];
 }
 
 ///MatrixToEulerXYZ from http://www.geometrictools.com/LibFoundation/Mathematics/Wm4Matrix3.inl.html
-bool	MatrixToEulerXYZ(const btMatrix3x3& mat,btVector3& xyz)
+bool	matrixToEulerXYZ(const btMatrix3x3& mat,btVector3& xyz);
+bool	matrixToEulerXYZ(const btMatrix3x3& mat,btVector3& xyz)
 {
-    // rot =  cy*cz          -cy*sz           sy
-    //        cz*sx*sy+cx*sz  cx*cz-sx*sy*sz -cy*sx
-    //       -cx*cz*sy+sx*sz  cz*sx+cx*sy*sz  cx*cy
+//	// rot =  cy*cz          -cy*sz           sy
+//	//        cz*sx*sy+cx*sz  cx*cz-sx*sy*sz -cy*sx
+//	//       -cx*cz*sy+sx*sz  cz*sx+cx*sy*sz  cx*cy
+//
+
+		if (btGetMatrixElem(mat,2) < btScalar(1.0))
+		{
+			if (btGetMatrixElem(mat,2) > btScalar(-1.0))
+			{
+				xyz[0] = btAtan2(-btGetMatrixElem(mat,5),btGetMatrixElem(mat,8));
+				xyz[1] = btAsin(btGetMatrixElem(mat,2));
+				xyz[2] = btAtan2(-btGetMatrixElem(mat,1),btGetMatrixElem(mat,0));
+				return true;
+			}
+			else
+			{
+				// WARNING.  Not unique.  XA - ZA = -atan2(r10,r11)
+				xyz[0] = -btAtan2(btGetMatrixElem(mat,3),btGetMatrixElem(mat,4));
+				xyz[1] = -SIMD_HALF_PI;
+				xyz[2] = btScalar(0.0);
+				return false;
+			}
+		}
+		else
+		{
+			// WARNING.  Not unique.  XAngle + ZAngle = atan2(r10,r11)
+			xyz[0] = btAtan2(btGetMatrixElem(mat,3),btGetMatrixElem(mat,4));
+			xyz[1] = SIMD_HALF_PI;
+			xyz[2] = 0.0;
+
+		}
 
-///	0..8
 
-	 if (getMatrixElem(mat,2) < btScalar(1.0))
-    {
-        if (getMatrixElem(mat,2) > btScalar(-1.0))
-        {
-            xyz[0] = btAtan2(-getMatrixElem(mat,5),getMatrixElem(mat,8));
-            xyz[1] = btAsin(getMatrixElem(mat,2));
-            xyz[2] = btAtan2(-getMatrixElem(mat,1),getMatrixElem(mat,0));
-            return true;
-        }
-        else
-        {
-            // WARNING.  Not unique.  XA - ZA = -atan2(r10,r11)
-            xyz[0] = -btAtan2(getMatrixElem(mat,3),getMatrixElem(mat,4));
-            xyz[1] = -SIMD_HALF_PI;
-            xyz[2] = btScalar(0.0);
-            return false;
-        }
-    }
-    else
-    {
-        // WARNING.  Not unique.  XAngle + ZAngle = atan2(r10,r11)
-        xyz[0] = btAtan2(getMatrixElem(mat,3),getMatrixElem(mat,4));
-        xyz[1] = SIMD_HALF_PI;
-        xyz[2] = 0.0;
-     
-    }
-	 
 	return false;
 }
 
 
-void	btGeneric6DofConstraint::solveConstraint(btScalar	timeStep)
+
+//////////////////////////// btRotationalLimitMotor ////////////////////////////////////
+
+
+int btRotationalLimitMotor::testLimitValue(btScalar test_value)
 {
-	btScalar tau = btScalar(0.1);
-	btScalar damping = btScalar(1.0);
-
-	btVector3 pivotAInW = m_rbA.getCenterOfMassTransform() * m_frameInA.getOrigin();
-	btVector3 pivotBInW = m_rbB.getCenterOfMassTransform() * m_frameInB.getOrigin();
-
-	btVector3 rel_pos1 = pivotAInW - m_rbA.getCenterOfMassPosition(); 
-	btVector3 rel_pos2 = pivotBInW - m_rbB.getCenterOfMassPosition();
-	
-	btVector3 localNormalInA(0,0,0);
-	int i;
-
-	// linear
-	for (i=0;i<3;i++)
-	{		
-		if (isLimited(i))
-		{
-			btVector3 angvelA = m_rbA.getCenterOfMassTransform().getBasis().transpose() * m_rbA.getAngularVelocity();
-			btVector3 angvelB = m_rbB.getCenterOfMassTransform().getBasis().transpose() * m_rbB.getAngularVelocity();
-		
-			localNormalInA.setValue(0,0,0);
-			localNormalInA[i] = 1;
-			btVector3 normalWorld = m_rbA.getCenterOfMassTransform().getBasis() * localNormalInA;
-
-			btScalar jacDiagABInv = btScalar(1.) / m_jacLinear[i].getDiagonal();
-
-			//velocity error (first order error)
-			btScalar rel_vel = m_jacLinear[i].getRelativeVelocity(m_rbA.getLinearVelocity(),angvelA, 
-																	m_rbB.getLinearVelocity(),angvelB);
-		
-			//positional error (zeroth order error)
-			btScalar depth = -(pivotAInW - pivotBInW).dot(normalWorld); 
-			btScalar	lo = btScalar(-1e30);
-			btScalar	hi = btScalar(1e30);
-		
-			//handle the limits
-			if (m_lowerLimit[i] < m_upperLimit[i])
-			{
-				{
-					if (depth > m_upperLimit[i])
-					{
-						depth -= m_upperLimit[i];
-						lo = btScalar(0.);
-					
-					} else
-					{
-						if (depth < m_lowerLimit[i])
-						{
-							depth -= m_lowerLimit[i];
-							hi = btScalar(0.);
-						} else
-						{
-							continue;
-						}
-					}
-				}
-			}
-
-			btScalar normalImpulse= (tau*depth/timeStep - damping*rel_vel) * jacDiagABInv;
-			btScalar oldNormalImpulse = m_accumulatedImpulse[i];
-			btScalar sum = oldNormalImpulse + normalImpulse;
-			m_accumulatedImpulse[i] = sum > hi ? btScalar(0.) : sum < lo ? btScalar(0.) : sum;
-			normalImpulse = m_accumulatedImpulse[i] - oldNormalImpulse;
-
-			btVector3 impulse_vector = normalWorld * normalImpulse;
-			m_rbA.applyImpulse( impulse_vector, rel_pos1);
-			m_rbB.applyImpulse(-impulse_vector, rel_pos2);
-			
-			localNormalInA[i] = 0;
-		}
-	}
-
-	btVector3	axis;
-	btScalar	angle;
-	btTransform	frameAWorld = m_rbA.getCenterOfMassTransform() * m_frameInA;
-	btTransform	frameBWorld = m_rbB.getCenterOfMassTransform() * m_frameInB;
-
-	btTransformUtil::calculateDiffAxisAngle(frameAWorld,frameBWorld,axis,angle);
-	btQuaternion diff(axis,angle);
-	btMatrix3x3 diffMat (diff);
-	btVector3 xyz;
-	///this is not perfect, we can first check which axis are limited, and choose a more appropriate order
-	MatrixToEulerXYZ(diffMat,xyz);
-
-	// angular
-	for (i=0;i<3;i++)
+	if(m_loLimit>m_hiLimit)
 	{
-		if (isLimited(i+3))
-		{
-			btVector3 angvelA = m_rbA.getCenterOfMassTransform().getBasis().transpose() * m_rbA.getAngularVelocity();
-			btVector3 angvelB = m_rbB.getCenterOfMassTransform().getBasis().transpose() * m_rbB.getAngularVelocity();
-		
-			btScalar jacDiagABInv = btScalar(1.) / m_jacAng[i].getDiagonal();
-			
-			//velocity error (first order error)
-			btScalar rel_vel = m_jacAng[i].getRelativeVelocity(m_rbA.getLinearVelocity(),angvelA, 
-																			m_rbB.getLinearVelocity(),angvelB);
-
-			//positional error (zeroth order error)
-			btVector3 axisA = m_rbA.getCenterOfMassTransform().getBasis() * m_frameInA.getBasis().getColumn( kAxisA[i] );
-			btVector3 axisB = m_rbB.getCenterOfMassTransform().getBasis() * m_frameInB.getBasis().getColumn( kAxisB[i] );
-
-			btScalar rel_pos = kSign[i] * axisA.dot(axisB);
-
-			btScalar	lo = btScalar(-1e30);
-			btScalar	hi = btScalar(1e30);
-		
-			//handle the twist limit
-			if (m_lowerLimit[i+3] < m_upperLimit[i+3])
-			{
-				//clamp the values
-				btScalar loLimit =  m_lowerLimit[i+3] > -3.1415 ? m_lowerLimit[i+3] : btScalar(-1e30);
-				btScalar hiLimit = m_upperLimit[i+3] < 3.1415 ? m_upperLimit[i+3] : btScalar(1e30);
-
-				btScalar projAngle  = btScalar(-1.)*xyz[i];
-				
-				if (projAngle < loLimit)
-				{
-					hi = btScalar(0.);
-					rel_pos = (loLimit - projAngle);
-				} else
-				{
-					if (projAngle > hiLimit)
-					{
-						lo = btScalar(0.);
-						rel_pos = (hiLimit - projAngle);
-					} else
-					{
-						continue;
-					}
-				}
-			}
-		
-			//impulse
-			
-			btScalar normalImpulse= -(tau*rel_pos/timeStep + damping*rel_vel) * jacDiagABInv;
-			btScalar oldNormalImpulse = m_accumulatedImpulse[i+3];
-			btScalar sum = oldNormalImpulse + normalImpulse;
-			m_accumulatedImpulse[i+3] = sum > hi ? btScalar(0.) : sum < lo ? btScalar(0.) : sum;
-			normalImpulse = m_accumulatedImpulse[i+3] - oldNormalImpulse;
-			
-			// Dirk: Not needed - we could actually project onto Jacobian entry here (same as above)
-			btVector3 axis = kSign[i] * axisA.cross(axisB);
-			btVector3 impulse_vector = axis * normalImpulse;
-
-			m_rbA.applyTorqueImpulse( impulse_vector);
-			m_rbB.applyTorqueImpulse(-impulse_vector);
-		}
+		m_currentLimit = 0;//Free from violation
+		return 0;
 	}
+
+	if (test_value < m_loLimit)
+	{
+		m_currentLimit = 1;//low limit violation
+		m_currentLimitError =  test_value - m_loLimit;
+		return 1;
+	}
+	else if (test_value> m_hiLimit)
+	{
+		m_currentLimit = 2;//High limit violation
+		m_currentLimitError = test_value - m_hiLimit;
+		return 2;
+	};
+
+	m_currentLimit = 0;//Free from violation
+	return 0;
+	
+}
+
+
+btScalar btRotationalLimitMotor::solveAngularLimits(
+		btScalar timeStep,btVector3& axis,btScalar jacDiagABInv,
+	 	btRigidBody * body0, btRigidBody * body1)
+{
+    if (needApplyTorques()==false) return 0.0f;
+
+    btScalar target_velocity = m_targetVelocity;
+    btScalar maxMotorForce = m_maxMotorForce;
+
+	//current error correction
+    if (m_currentLimit!=0)
+    {
+        target_velocity = -m_ERP*m_currentLimitError/(timeStep);
+        maxMotorForce = m_maxLimitForce;
+    }
+
+    maxMotorForce *= timeStep;
+
+    // current velocity difference
+    btVector3 vel_diff = body0->getAngularVelocity();
+    if (body1)
+    {
+        vel_diff -= body1->getAngularVelocity();
+    }
+
+
+
+    btScalar rel_vel = axis.dot(vel_diff);
+
+	// correction velocity
+    btScalar motor_relvel = m_limitSoftness*(target_velocity  - m_damping*rel_vel);
+
+
+    if ( motor_relvel < SIMD_EPSILON && motor_relvel > -SIMD_EPSILON  )
+    {
+        return 0.0f;//no need for applying force
+    }
+
+
+	// correction impulse
+    btScalar unclippedMotorImpulse = (1+m_bounce)*motor_relvel*jacDiagABInv;
+
+	// clip correction impulse
+    btScalar clippedMotorImpulse;
+
+    //todo: should clip against accumulated impulse
+    if (unclippedMotorImpulse>0.0f)
+    {
+        clippedMotorImpulse =  unclippedMotorImpulse > maxMotorForce? maxMotorForce: unclippedMotorImpulse;
+    }
+    else
+    {
+        clippedMotorImpulse =  unclippedMotorImpulse < -maxMotorForce ? -maxMotorForce: unclippedMotorImpulse;
+    }
+
+
+	// sort with accumulated impulses
+    btScalar	lo = btScalar(-1e30);
+    btScalar	hi = btScalar(1e30);
+
+    btScalar oldaccumImpulse = m_accumulatedImpulse;
+    btScalar sum = oldaccumImpulse + clippedMotorImpulse;
+    m_accumulatedImpulse = sum > hi ? btScalar(0.) : sum < lo ? btScalar(0.) : sum;
+
+    clippedMotorImpulse = m_accumulatedImpulse - oldaccumImpulse;
+
+
+
+    btVector3 motorImp = clippedMotorImpulse * axis;
+
+
+    body0->applyTorqueImpulse(motorImp);
+    if (body1) body1->applyTorqueImpulse(-motorImp);
+
+    return clippedMotorImpulse;
+
+
+}
+
+//////////////////////////// End btRotationalLimitMotor ////////////////////////////////////
+
+//////////////////////////// btTranslationalLimitMotor ////////////////////////////////////
+btScalar btTranslationalLimitMotor::solveLinearAxis(
+		btScalar timeStep,
+        btScalar jacDiagABInv,
+        btRigidBody& body1,const btVector3 &pointInA,
+        btRigidBody& body2,const btVector3 &pointInB,
+        int limit_index,
+        const btVector3 & axis_normal_on_a,
+		const btVector3 & anchorPos)
+{
+
+///find relative velocity
+//    btVector3 rel_pos1 = pointInA - body1.getCenterOfMassPosition();
+//    btVector3 rel_pos2 = pointInB - body2.getCenterOfMassPosition();
+    btVector3 rel_pos1 = anchorPos - body1.getCenterOfMassPosition();
+    btVector3 rel_pos2 = anchorPos - body2.getCenterOfMassPosition();
+
+    btVector3 vel1 = body1.getVelocityInLocalPoint(rel_pos1);
+    btVector3 vel2 = body2.getVelocityInLocalPoint(rel_pos2);
+    btVector3 vel = vel1 - vel2;
+
+    btScalar rel_vel = axis_normal_on_a.dot(vel);
+
+
+
+/// apply displacement correction
+
+//positional error (zeroth order error)
+    btScalar depth = -(pointInA - pointInB).dot(axis_normal_on_a);
+    btScalar	lo = btScalar(-1e30);
+    btScalar	hi = btScalar(1e30);
+
+    btScalar minLimit = m_lowerLimit[limit_index];
+    btScalar maxLimit = m_upperLimit[limit_index];
+
+    //handle the limits
+    if (minLimit < maxLimit)
+    {
+        {
+            if (depth > maxLimit)
+            {
+                depth -= maxLimit;
+                lo = btScalar(0.);
+
+            }
+            else
+            {
+                if (depth < minLimit)
+                {
+                    depth -= minLimit;
+                    hi = btScalar(0.);
+                }
+                else
+                {
+                    return 0.0f;
+                }
+            }
+        }
+    }
+
+    btScalar normalImpulse= m_limitSoftness*(m_restitution*depth/timeStep - m_damping*rel_vel) * jacDiagABInv;
+
+
+
+
+    btScalar oldNormalImpulse = m_accumulatedImpulse[limit_index];
+    btScalar sum = oldNormalImpulse + normalImpulse;
+    m_accumulatedImpulse[limit_index] = sum > hi ? btScalar(0.) : sum < lo ? btScalar(0.) : sum;
+    normalImpulse = m_accumulatedImpulse[limit_index] - oldNormalImpulse;
+
+    btVector3 impulse_vector = axis_normal_on_a * normalImpulse;
+    body1.applyImpulse( impulse_vector, rel_pos1);
+    body2.applyImpulse(-impulse_vector, rel_pos2);
+    return normalImpulse;
+}
+
+//////////////////////////// btTranslationalLimitMotor ////////////////////////////////////
+
+
+btGeneric6DofConstraint::btGeneric6DofConstraint()
+        :btTypedConstraint(D6_CONSTRAINT_TYPE),
+		m_useLinearReferenceFrameA(true)
+{
+}
+
+btGeneric6DofConstraint::btGeneric6DofConstraint(btRigidBody& rbA, btRigidBody& rbB, const btTransform& frameInA, const btTransform& frameInB, bool useLinearReferenceFrameA)
+        : btTypedConstraint(D6_CONSTRAINT_TYPE, rbA, rbB)
+        , m_frameInA(frameInA)
+        , m_frameInB(frameInB),
+		m_useLinearReferenceFrameA(useLinearReferenceFrameA)
+{
+
+}
+
+
+
+
+
+void btGeneric6DofConstraint::calculateAngleInfo()
+{
+	btMatrix3x3 relative_frame = m_calculatedTransformA.getBasis().inverse()*m_calculatedTransformB.getBasis();
+
+	matrixToEulerXYZ(relative_frame,m_calculatedAxisAngleDiff);
+
+
+
+	// in euler angle mode we do not actually constrain the angular velocity
+  // along the axes axis[0] and axis[2] (although we do use axis[1]) :
+  //
+  //    to get			constrain w2-w1 along		...not
+  //    ------			---------------------		------
+  //    d(angle[0])/dt = 0	ax[1] x ax[2]			ax[0]
+  //    d(angle[1])/dt = 0	ax[1]
+  //    d(angle[2])/dt = 0	ax[0] x ax[1]			ax[2]
+  //
+  // constraining w2-w1 along an axis 'a' means that a'*(w2-w1)=0.
+  // to prove the result for angle[0], write the expression for angle[0] from
+  // GetInfo1 then take the derivative. to prove this for angle[2] it is
+  // easier to take the euler rate expression for d(angle[2])/dt with respect
+  // to the components of w and set that to 0.
+
+	btVector3 axis0 = m_calculatedTransformB.getBasis().getColumn(0);
+	btVector3 axis2 = m_calculatedTransformA.getBasis().getColumn(2);
+
+	m_calculatedAxis[1] = axis2.cross(axis0);
+	m_calculatedAxis[0] = m_calculatedAxis[1].cross(axis2);
+	m_calculatedAxis[2] = axis0.cross(m_calculatedAxis[1]);
+
+
+//    if(m_debugDrawer)
+//    {
+//
+//    	char buff[300];
+//		sprintf(buff,"\n X: %.2f ; Y: %.2f ; Z: %.2f ",
+//		m_calculatedAxisAngleDiff[0],
+//		m_calculatedAxisAngleDiff[1],
+//		m_calculatedAxisAngleDiff[2]);
+//    	m_debugDrawer->reportErrorWarning(buff);
+//    }
+
+}
+
+void btGeneric6DofConstraint::calculateTransforms()
+{
+    m_calculatedTransformA = m_rbA.getCenterOfMassTransform() * m_frameInA;
+    m_calculatedTransformB = m_rbB.getCenterOfMassTransform() * m_frameInB;
+
+    calculateAngleInfo();
+}
+
+
+void btGeneric6DofConstraint::buildLinearJacobian(
+    btJacobianEntry & jacLinear,const btVector3 & normalWorld,
+    const btVector3 & pivotAInW,const btVector3 & pivotBInW)
+{
+    new (&jacLinear) btJacobianEntry(
+        m_rbA.getCenterOfMassTransform().getBasis().transpose(),
+        m_rbB.getCenterOfMassTransform().getBasis().transpose(),
+        pivotAInW - m_rbA.getCenterOfMassPosition(),
+        pivotBInW - m_rbB.getCenterOfMassPosition(),
+        normalWorld,
+        m_rbA.getInvInertiaDiagLocal(),
+        m_rbA.getInvMass(),
+        m_rbB.getInvInertiaDiagLocal(),
+        m_rbB.getInvMass());
+
+}
+
+void btGeneric6DofConstraint::buildAngularJacobian(
+    btJacobianEntry & jacAngular,const btVector3 & jointAxisW)
+{
+    new (&jacAngular)	btJacobianEntry(jointAxisW,
+                                      m_rbA.getCenterOfMassTransform().getBasis().transpose(),
+                                      m_rbB.getCenterOfMassTransform().getBasis().transpose(),
+                                      m_rbA.getInvInertiaDiagLocal(),
+                                      m_rbB.getInvInertiaDiagLocal());
+
+}
+
+bool btGeneric6DofConstraint::testAngularLimitMotor(int axis_index)
+{
+    btScalar angle = m_calculatedAxisAngleDiff[axis_index];
+
+    //test limits
+    m_angularLimits[axis_index].testLimitValue(angle);
+    return m_angularLimits[axis_index].needApplyTorques();
+}
+
+void btGeneric6DofConstraint::buildJacobian()
+{
+
+	// Clear accumulated impulses for the next simulation step
+    m_linearLimits.m_accumulatedImpulse.setValue(btScalar(0.), btScalar(0.), btScalar(0.));
+    int i;
+    for(i = 0; i < 3; i++)
+    {
+        m_angularLimits[i].m_accumulatedImpulse = btScalar(0.);
+    }
+    //calculates transform
+    calculateTransforms();
+
+//  const btVector3& pivotAInW = m_calculatedTransformA.getOrigin();
+//  const btVector3& pivotBInW = m_calculatedTransformB.getOrigin();
+	calcAnchorPos();
+	btVector3 pivotAInW = m_AnchorPos;
+	btVector3 pivotBInW = m_AnchorPos;
+
+// not used here
+//    btVector3 rel_pos1 = pivotAInW - m_rbA.getCenterOfMassPosition();
+//    btVector3 rel_pos2 = pivotBInW - m_rbB.getCenterOfMassPosition();
+
+    btVector3 normalWorld;
+    //linear part
+    for (i=0;i<3;i++)
+    {
+        if (m_linearLimits.isLimited(i))
+        {
+			if (m_useLinearReferenceFrameA)
+	            normalWorld = m_calculatedTransformA.getBasis().getColumn(i);
+			else
+	            normalWorld = m_calculatedTransformB.getBasis().getColumn(i);
+
+            buildLinearJacobian(
+                m_jacLinear[i],normalWorld ,
+                pivotAInW,pivotBInW);
+
+        }
+    }
+
+    // angular part
+    for (i=0;i<3;i++)
+    {
+        //calculates error angle
+        if (testAngularLimitMotor(i))
+        {
+            normalWorld = this->getAxis(i);
+            // Create angular atom
+            buildAngularJacobian(m_jacAng[i],normalWorld);
+        }
+    }
+
+
+}
+
+
+void btGeneric6DofConstraint::solveConstraint(btScalar	timeStep)
+{
+    m_timeStep = timeStep;
+
+    //calculateTransforms();
+
+    int i;
+
+    // linear
+
+    btVector3 pointInA = m_calculatedTransformA.getOrigin();
+	btVector3 pointInB = m_calculatedTransformB.getOrigin();
+
+	btScalar jacDiagABInv;
+	btVector3 linear_axis;
+    for (i=0;i<3;i++)
+    {
+        if (m_linearLimits.isLimited(i))
+        {
+            jacDiagABInv = btScalar(1.) / m_jacLinear[i].getDiagonal();
+
+			if (m_useLinearReferenceFrameA)
+	            linear_axis = m_calculatedTransformA.getBasis().getColumn(i);
+			else
+	            linear_axis = m_calculatedTransformB.getBasis().getColumn(i);
+
+            m_linearLimits.solveLinearAxis(
+            	m_timeStep,
+            	jacDiagABInv,
+            	m_rbA,pointInA,
+                m_rbB,pointInB,
+                i,linear_axis, m_AnchorPos);
+
+        }
+    }
+
+    // angular
+    btVector3 angular_axis;
+    btScalar angularJacDiagABInv;
+    for (i=0;i<3;i++)
+    {
+        if (m_angularLimits[i].needApplyTorques())
+        {
+
+			// get axis
+			angular_axis = getAxis(i);
+
+			angularJacDiagABInv = btScalar(1.) / m_jacAng[i].getDiagonal();
+
+			m_angularLimits[i].solveAngularLimits(m_timeStep,angular_axis,angularJacDiagABInv, &m_rbA,&m_rbB);
+        }
+    }
 }
 
 void	btGeneric6DofConstraint::updateRHS(btScalar	timeStep)
 {
-	(void)timeStep;
+    (void)timeStep;
 
 }
 
-btScalar btGeneric6DofConstraint::computeAngle(int axis) const
+btVector3 btGeneric6DofConstraint::getAxis(int axis_index) const
+{
+    return m_calculatedAxis[axis_index];
+}
+
+btScalar btGeneric6DofConstraint::getAngle(int axis_index) const
+{
+    return m_calculatedAxisAngleDiff[axis_index];
+}
+
+void btGeneric6DofConstraint::calcAnchorPos(void)
+{
+	btScalar imA = m_rbA.getInvMass();
+	btScalar imB = m_rbB.getInvMass();
+	btScalar weight;
+	if(imB == btScalar(0.0))
 	{
-	btScalar angle = btScalar(0.f);
-
-	switch (axis)
-		{
-		case 0:
-			{
-			btVector3 v1 = m_rbA.getCenterOfMassTransform().getBasis() * m_frameInA.getBasis().getColumn(1);
-			btVector3 v2 = m_rbB.getCenterOfMassTransform().getBasis() * m_frameInB.getBasis().getColumn(1);
-			btVector3 w2 = m_rbB.getCenterOfMassTransform().getBasis() * m_frameInB.getBasis().getColumn(2);
-
-			btScalar s = v1.dot(w2);
-			btScalar c = v1.dot(v2);
-
-			angle = btAtan2( s, c );
-			}
-			break;
-
-		case 1:
-			{
-			btVector3 w1 = m_rbA.getCenterOfMassTransform().getBasis() * m_frameInA.getBasis().getColumn(2);
-			btVector3 w2 = m_rbB.getCenterOfMassTransform().getBasis() * m_frameInB.getBasis().getColumn(2);
-			btVector3 u2 = m_rbB.getCenterOfMassTransform().getBasis() * m_frameInB.getBasis().getColumn(0);
-
-			btScalar s = w1.dot(u2);
-			btScalar c = w1.dot(w2);
-
-			angle = btAtan2( s, c );
-			}
-			break;
-
-		case 2:
-			{
-			btVector3 u1 = m_rbA.getCenterOfMassTransform().getBasis() * m_frameInA.getBasis().getColumn(0);
-			btVector3 u2 = m_rbB.getCenterOfMassTransform().getBasis() * m_frameInB.getBasis().getColumn(0);
-			btVector3 v2 = m_rbB.getCenterOfMassTransform().getBasis() * m_frameInB.getBasis().getColumn(1);
-
-			btScalar s = u1.dot(v2);
-			btScalar c = u1.dot(u2);
-
-			angle = btAtan2( s, c );
-			}
-			break;
-                  default: 
-					  btAssert ( 0 ) ; 
-					  
-					  break ;
-		}
-
-		return angle;
+		weight = btScalar(1.0);
 	}
+	else
+	{
+		weight = imA / (imA + imB);
+	}
+	const btVector3& pA = m_calculatedTransformA.getOrigin();
+	const btVector3& pB = m_calculatedTransformB.getOrigin();
+	m_AnchorPos = pA * weight + pB * (btScalar(1.0) - weight);
+	return;
+} // btGeneric6DofConstraint::calcAnchorPos()
 
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h
index b114e54fa69..f0718d2d4a0 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h
@@ -4,116 +4,433 @@ Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
 
 This software is provided 'as-is', without any express or implied warranty.
 In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
 subject to the following restrictions:
 
 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
 3. This notice may not be removed or altered from any source distribution.
 */
+/*
+2007-09-09
+btGeneric6DofConstraint Refactored by Francisco Le?n
+email: projectileman@yahoo.com
+http://gimpact.sf.net
+*/
+
 
 #ifndef GENERIC_6DOF_CONSTRAINT_H
 #define GENERIC_6DOF_CONSTRAINT_H
 
-#include "../../LinearMath/btVector3.h"
+#include "LinearMath/btVector3.h"
 #include "btJacobianEntry.h"
 #include "btTypedConstraint.h"
 
 class btRigidBody;
 
 
+//! Rotation Limit structure for generic joints
+class btRotationalLimitMotor
+{
+public:
+    //! limit_parameters
+    //!@{
+    btScalar m_loLimit;//!< joint limit
+    btScalar m_hiLimit;//!< joint limit
+    btScalar m_targetVelocity;//!< target motor velocity
+    btScalar m_maxMotorForce;//!< max force on motor
+    btScalar m_maxLimitForce;//!< max force on limit
+    btScalar m_damping;//!< Damping.
+    btScalar m_limitSoftness;//! Relaxation factor
+    btScalar m_ERP;//!< Error tolerance factor when joint is at limit
+    btScalar m_bounce;//!< restitution factor
+    bool m_enableMotor;
+
+    //!@}
+
+    //! temp_variables
+    //!@{
+    btScalar m_currentLimitError;//!  How much is violated this limit
+    int m_currentLimit;//!< 0=free, 1=at lo limit, 2=at hi limit
+    btScalar m_accumulatedImpulse;
+    //!@}
+
+    btRotationalLimitMotor()
+    {
+    	m_accumulatedImpulse = 0.f;
+        m_targetVelocity = 0;
+        m_maxMotorForce = 0.1f;
+        m_maxLimitForce = 300.0f;
+        m_loLimit = -SIMD_INFINITY;
+        m_hiLimit = SIMD_INFINITY;
+        m_ERP = 0.5f;
+        m_bounce = 0.0f;
+        m_damping = 1.0f;
+        m_limitSoftness = 0.5f;
+        m_currentLimit = 0;
+        m_currentLimitError = 0;
+        m_enableMotor = false;
+    }
+
+    btRotationalLimitMotor(const btRotationalLimitMotor & limot)
+    {
+        m_targetVelocity = limot.m_targetVelocity;
+        m_maxMotorForce = limot.m_maxMotorForce;
+        m_limitSoftness = limot.m_limitSoftness;
+        m_loLimit = limot.m_loLimit;
+        m_hiLimit = limot.m_hiLimit;
+        m_ERP = limot.m_ERP;
+        m_bounce = limot.m_bounce;
+        m_currentLimit = limot.m_currentLimit;
+        m_currentLimitError = limot.m_currentLimitError;
+        m_enableMotor = limot.m_enableMotor;
+    }
+
+
+
+	//! Is limited
+    bool isLimited()
+    {
+    	if(m_loLimit>=m_hiLimit) return false;
+    	return true;
+    }
+
+	//! Need apply correction
+    bool needApplyTorques()
+    {
+    	if(m_currentLimit == 0 && m_enableMotor == false) return false;
+    	return true;
+    }
+
+	//! calculates  error
+	/*!
+	calculates m_currentLimit and m_currentLimitError.
+	*/
+	int testLimitValue(btScalar test_value);
+
+	//! apply the correction impulses for two bodies
+    btScalar solveAngularLimits(btScalar timeStep,btVector3& axis, btScalar jacDiagABInv,btRigidBody * body0, btRigidBody * body1);
+
+
+};
+
+
+
+class btTranslationalLimitMotor
+{
+public:
+	btVector3 m_lowerLimit;//!< the constraint lower limits
+    btVector3 m_upperLimit;//!< the constraint upper limits
+    btVector3 m_accumulatedImpulse;
+    //! Linear_Limit_parameters
+    //!@{
+    btScalar	m_limitSoftness;//!< Softness for linear limit
+    btScalar	m_damping;//!< Damping for linear limit
+    btScalar	m_restitution;//! Bounce parameter for linear limit
+    //!@}
+
+    btTranslationalLimitMotor()
+    {
+    	m_lowerLimit.setValue(0.f,0.f,0.f);
+    	m_upperLimit.setValue(0.f,0.f,0.f);
+    	m_accumulatedImpulse.setValue(0.f,0.f,0.f);
+
+    	m_limitSoftness = 0.7f;
+    	m_damping = btScalar(1.0f);
+    	m_restitution = btScalar(0.5f);
+    }
+
+    btTranslationalLimitMotor(const btTranslationalLimitMotor & other )
+    {
+    	m_lowerLimit = other.m_lowerLimit;
+    	m_upperLimit = other.m_upperLimit;
+    	m_accumulatedImpulse = other.m_accumulatedImpulse;
+
+    	m_limitSoftness = other.m_limitSoftness ;
+    	m_damping = other.m_damping;
+    	m_restitution = other.m_restitution;
+    }
+
+    //! Test limit
+	/*!
+    - free means upper < lower,
+    - locked means upper == lower
+    - limited means upper > lower
+    - limitIndex: first 3 are linear, next 3 are angular
+    */
+    inline bool	isLimited(int limitIndex)
+    {
+       return (m_upperLimit[limitIndex] >= m_lowerLimit[limitIndex]);
+    }
+
+
+    btScalar solveLinearAxis(
+    	btScalar timeStep,
+        btScalar jacDiagABInv,
+        btRigidBody& body1,const btVector3 &pointInA,
+        btRigidBody& body2,const btVector3 &pointInB,
+        int limit_index,
+        const btVector3 & axis_normal_on_a,
+		const btVector3 & anchorPos);
+
+
+};
 
 /// btGeneric6DofConstraint between two rigidbodies each with a pivotpoint that descibes the axis location in local space
-/// btGeneric6DofConstraint can leave any of the 6 degree of freedom 'free' or 'locked'
-/// Work in progress (is still a Hinge actually)
+/*!
+btGeneric6DofConstraint can leave any of the 6 degree of freedom 'free' or 'locked'.
+currently this limit supports rotational motors<br>
+<ul>
+<li> For Linear limits, use btGeneric6DofConstraint.setLinearUpperLimit, btGeneric6DofConstraint.setLinearLowerLimit. You can set the parameters with the btTranslationalLimitMotor structure accsesible through the btGeneric6DofConstraint.getTranslationalLimitMotor method.
+At this moment translational motors are not supported. May be in the future. </li>
+
+<li> For Angular limits, use the btRotationalLimitMotor structure for configuring the limit.
+This is accessible through btGeneric6DofConstraint.getLimitMotor method,
+This brings support for limit parameters and motors. </li>
+
+<li> Angulars limits have these possible ranges:
+<table border=1 >
+<tr
+
+	<td><b>AXIS</b></td>
+	<td><b>MIN ANGLE</b></td>
+	<td><b>MAX ANGLE</b></td>
+	<td>X</td>
+		<td>-PI</td>
+		<td>PI</td>
+	<td>Y</td>
+		<td>-PI/2</td>
+		<td>PI/2</td>
+	<td>Z</td>
+		<td>-PI/2</td>
+		<td>PI/2</td>
+</tr>
+</table>
+</li>
+</ul>
+
+*/
 class btGeneric6DofConstraint : public btTypedConstraint
 {
-	btJacobianEntry	m_jacLinear[3];			// 3 orthogonal linear constraints
-	btJacobianEntry	m_jacAng[3];		// 3 orthogonal angular constraints
+protected:
 
-	btTransform	m_frameInA;			// the constraint space w.r.t body A
-	btTransform	m_frameInB;			// the constraint space w.r.t body B
+	//! relative_frames
+    //!@{
+	btTransform	m_frameInA;//!< the constraint space w.r.t body A
+    btTransform	m_frameInB;//!< the constraint space w.r.t body B
+    //!@}
+
+    //! Jacobians
+    //!@{
+    btJacobianEntry	m_jacLinear[3];//!< 3 orthogonal linear constraints
+    btJacobianEntry	m_jacAng[3];//!< 3 orthogonal angular constraints
+    //!@}
+
+	//! Linear_Limit_parameters
+    //!@{
+    btTranslationalLimitMotor m_linearLimits;
+    //!@}
+
+
+    //! hinge_parameters
+    //!@{
+    btRotationalLimitMotor m_angularLimits[3];
+	//!@}
+
+
+protected:
+    //! temporal variables
+    //!@{
+    btScalar m_timeStep;
+    btTransform m_calculatedTransformA;
+    btTransform m_calculatedTransformB;
+    btVector3 m_calculatedAxisAngleDiff;
+    btVector3 m_calculatedAxis[3];
+    
+	btVector3 m_AnchorPos; // point betwen pivots of bodies A and B to solve linear axes
+
+    bool	m_useLinearReferenceFrameA;
+    
+    //!@}
+
+    btGeneric6DofConstraint&	operator=(btGeneric6DofConstraint&	other)
+    {
+        btAssert(0);
+        (void) other;
+        return *this;
+    }
+
+
+
+    void buildLinearJacobian(
+        btJacobianEntry & jacLinear,const btVector3 & normalWorld,
+        const btVector3 & pivotAInW,const btVector3 & pivotBInW);
+
+    void buildAngularJacobian(btJacobianEntry & jacAngular,const btVector3 & jointAxisW);
+
+
+	//! calcs the euler angles between the two bodies.
+    void calculateAngleInfo();
 
-	btScalar      m_lowerLimit[6];	// the constraint lower limits
-	btScalar      m_upperLimit[6];	// the constraint upper limits
 
-	btScalar		m_accumulatedImpulse[6];
 
-	btGeneric6DofConstraint&	operator=(btGeneric6DofConstraint&	other)
-	{
-		btAssert(0);
-		(void) other;
-		return *this;
-	}
-		
 public:
-	btGeneric6DofConstraint(btRigidBody& rbA, btRigidBody& rbB, const btTransform& frameInA, const btTransform& frameInB );
+    btGeneric6DofConstraint(btRigidBody& rbA, btRigidBody& rbB, const btTransform& frameInA, const btTransform& frameInB ,bool useLinearReferenceFrameA);
 
-	btGeneric6DofConstraint();
+    btGeneric6DofConstraint();
 
-	
-	virtual void	buildJacobian();
+	//! Calcs global transform of the offsets
+	/*!
+	Calcs the global transform for the joint offset for body A an B, and also calcs the agle differences between the bodies.
+	\sa btGeneric6DofConstraint.getCalculatedTransformA , btGeneric6DofConstraint.getCalculatedTransformB, btGeneric6DofConstraint.calculateAngleInfo
+	*/
+    void calculateTransforms();
 
-	virtual	void	solveConstraint(btScalar	timeStep);
+	//! Gets the global transform of the offset for body A
+    /*!
+    \sa btGeneric6DofConstraint.getFrameOffsetA, btGeneric6DofConstraint.getFrameOffsetB, btGeneric6DofConstraint.calculateAngleInfo.
+    */
+    const btTransform & getCalculatedTransformA() const
+    {
+    	return m_calculatedTransformA;
+    }
 
-	void	updateRHS(btScalar	timeStep);
+    //! Gets the global transform of the offset for body B
+    /*!
+    \sa btGeneric6DofConstraint.getFrameOffsetA, btGeneric6DofConstraint.getFrameOffsetB, btGeneric6DofConstraint.calculateAngleInfo.
+    */
+    const btTransform & getCalculatedTransformB() const
+    {
+    	return m_calculatedTransformB;
+    }
 
-	btScalar computeAngle(int axis) const;
+    const btTransform & getFrameOffsetA() const
+    {
+    	return m_frameInA;
+    }
 
-	void	setLinearLowerLimit(const btVector3& linearLower)
-	{
-		m_lowerLimit[0] = linearLower.getX();
-		m_lowerLimit[1] = linearLower.getY();
-		m_lowerLimit[2] = linearLower.getZ();
-	}
+    const btTransform & getFrameOffsetB() const
+    {
+    	return m_frameInB;
+    }
 
-	void	setLinearUpperLimit(const btVector3& linearUpper)
-	{
-		m_upperLimit[0] = linearUpper.getX();
-		m_upperLimit[1] = linearUpper.getY();
-		m_upperLimit[2] = linearUpper.getZ();
-	}
 
-	void	setAngularLowerLimit(const btVector3& angularLower)
-	{
-		m_lowerLimit[3] = angularLower.getX();
-		m_lowerLimit[4] = angularLower.getY();
-		m_lowerLimit[5] = angularLower.getZ();
-	}
+    btTransform & getFrameOffsetA()
+    {
+    	return m_frameInA;
+    }
 
-	void	setAngularUpperLimit(const btVector3& angularUpper)
-	{
-		m_upperLimit[3] = angularUpper.getX();
-		m_upperLimit[4] = angularUpper.getY();
-		m_upperLimit[5] = angularUpper.getZ();
-	}
+    btTransform & getFrameOffsetB()
+    {
+    	return m_frameInB;
+    }
 
-	//first 3 are linear, next 3 are angular
-	void SetLimit(int axis, btScalar lo, btScalar hi)
-	{
-		m_lowerLimit[axis] = lo; 
-		m_upperLimit[axis] = hi; 
-	}
 
-	//free means upper < lower, 
-	//locked means upper == lower
-	//limited means upper > lower
-	//limitIndex: first 3 are linear, next 3 are angular
-	bool	isLimited(int limitIndex)
-	{
-		return (m_upperLimit[limitIndex] >= m_lowerLimit[limitIndex]);
-	}
+	//! performs Jacobian calculation, and also calculates angle differences and axis
+    virtual void	buildJacobian();
 
-	const btRigidBody& getRigidBodyA() const
-	{
-		return m_rbA;
-	}
-	const btRigidBody& getRigidBodyB() const
-	{
-		return m_rbB;
-	}
-	
+    virtual	void	solveConstraint(btScalar	timeStep);
+
+    void	updateRHS(btScalar	timeStep);
+
+	//! Get the rotation axis in global coordinates
+	/*!
+	\pre btGeneric6DofConstraint.buildJacobian must be called previously.
+	*/
+    btVector3 getAxis(int axis_index) const;
+
+    //! Get the relative Euler angle
+    /*!
+	\pre btGeneric6DofConstraint.buildJacobian must be called previously.
+	*/
+    btScalar getAngle(int axis_index) const;
+
+	//! Test angular limit.
+	/*!
+	Calculates angular correction and returns true if limit needs to be corrected.
+	\pre btGeneric6DofConstraint.buildJacobian must be called previously.
+	*/
+    bool testAngularLimitMotor(int axis_index);
+
+    void	setLinearLowerLimit(const btVector3& linearLower)
+    {
+    	m_linearLimits.m_lowerLimit = linearLower;
+    }
+
+    void	setLinearUpperLimit(const btVector3& linearUpper)
+    {
+    	m_linearLimits.m_upperLimit = linearUpper;
+    }
+
+    void	setAngularLowerLimit(const btVector3& angularLower)
+    {
+        m_angularLimits[0].m_loLimit = angularLower.getX();
+        m_angularLimits[1].m_loLimit = angularLower.getY();
+        m_angularLimits[2].m_loLimit = angularLower.getZ();
+    }
+
+    void	setAngularUpperLimit(const btVector3& angularUpper)
+    {
+        m_angularLimits[0].m_hiLimit = angularUpper.getX();
+        m_angularLimits[1].m_hiLimit = angularUpper.getY();
+        m_angularLimits[2].m_hiLimit = angularUpper.getZ();
+    }
+
+	//! Retrieves the angular limit informacion
+    btRotationalLimitMotor * getRotationalLimitMotor(int index)
+    {
+    	return &m_angularLimits[index];
+    }
+
+    //! Retrieves the  limit informacion
+    btTranslationalLimitMotor * getTranslationalLimitMotor()
+    {
+    	return &m_linearLimits;
+    }
+
+    //first 3 are linear, next 3 are angular
+    void setLimit(int axis, btScalar lo, btScalar hi)
+    {
+    	if(axis<3)
+    	{
+    		m_linearLimits.m_lowerLimit[axis] = lo;
+    		m_linearLimits.m_upperLimit[axis] = hi;
+    	}
+    	else
+    	{
+    		m_angularLimits[axis-3].m_loLimit = lo;
+    		m_angularLimits[axis-3].m_hiLimit = hi;
+    	}
+    }
+
+	//! Test limit
+	/*!
+    - free means upper < lower,
+    - locked means upper == lower
+    - limited means upper > lower
+    - limitIndex: first 3 are linear, next 3 are angular
+    */
+    bool	isLimited(int limitIndex)
+    {
+    	if(limitIndex<3)
+    	{
+			return m_linearLimits.isLimited(limitIndex);
+
+    	}
+        return m_angularLimits[limitIndex-3].isLimited();
+    }
+
+    const btRigidBody& getRigidBodyA() const
+    {
+        return m_rbA;
+    }
+    const btRigidBody& getRigidBodyB() const
+    {
+        return m_rbB;
+    }
+
+	virtual void calcAnchorPos(void); // overridable
 
 };
 
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp
index 27e30987549..114abce24c7 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp
@@ -17,58 +17,185 @@ subject to the following restrictions:
 #include "btHingeConstraint.h"
 #include "BulletDynamics/Dynamics/btRigidBody.h"
 #include "LinearMath/btTransformUtil.h"
+#include "LinearMath/btMinMax.h"
 #include <new>
 
-btHingeConstraint::btHingeConstraint():
+
+btHingeConstraint::btHingeConstraint()
+: btTypedConstraint (HINGE_CONSTRAINT_TYPE),
 m_enableAngularMotor(false)
 {
 }
 
 btHingeConstraint::btHingeConstraint(btRigidBody& rbA,btRigidBody& rbB, const btVector3& pivotInA,const btVector3& pivotInB,
-								 btVector3& axisInA,btVector3& axisInB)
-:btTypedConstraint(rbA,rbB),m_pivotInA(pivotInA),m_pivotInB(pivotInB),
-m_axisInA(axisInA),
-m_axisInB(-axisInB),
-m_angularOnly(false),
-m_enableAngularMotor(false)
+									 btVector3& axisInA,btVector3& axisInB)
+									 :btTypedConstraint(HINGE_CONSTRAINT_TYPE, rbA,rbB),
+									 m_angularOnly(false),
+									 m_enableAngularMotor(false)
 {
+	m_rbAFrame.getOrigin() = pivotInA;
+	
+	// since no frame is given, assume this to be zero angle and just pick rb transform axis
+	btVector3 rbAxisA1 = rbA.getCenterOfMassTransform().getBasis().getColumn(0);
+
+	btVector3 rbAxisA2;
+	btScalar projection = axisInA.dot(rbAxisA1);
+	if (projection >= 1.0f - SIMD_EPSILON) {
+		rbAxisA1 = -rbA.getCenterOfMassTransform().getBasis().getColumn(2);
+		rbAxisA2 = rbA.getCenterOfMassTransform().getBasis().getColumn(1);
+	} else if (projection <= -1.0f + SIMD_EPSILON) {
+		rbAxisA1 = rbA.getCenterOfMassTransform().getBasis().getColumn(2);
+		rbAxisA2 = rbA.getCenterOfMassTransform().getBasis().getColumn(1);      
+	} else {
+		rbAxisA2 = axisInA.cross(rbAxisA1);
+		rbAxisA1 = rbAxisA2.cross(axisInA);
+	}
+
+	m_rbAFrame.getBasis().setValue( rbAxisA1.getX(),rbAxisA2.getX(),axisInA.getX(),
+									rbAxisA1.getY(),rbAxisA2.getY(),axisInA.getY(),
+									rbAxisA1.getZ(),rbAxisA2.getZ(),axisInA.getZ() );
+
+	btQuaternion rotationArc = shortestArcQuat(axisInA,axisInB);
+	btVector3 rbAxisB1 =  quatRotate(rotationArc,rbAxisA1);
+	btVector3 rbAxisB2 =  axisInB.cross(rbAxisB1);	
+	
+	m_rbBFrame.getOrigin() = pivotInB;
+	m_rbBFrame.getBasis().setValue( rbAxisB1.getX(),rbAxisB2.getX(),-axisInB.getX(),
+									rbAxisB1.getY(),rbAxisB2.getY(),-axisInB.getY(),
+									rbAxisB1.getZ(),rbAxisB2.getZ(),-axisInB.getZ() );
+	
+	//start with free
+	m_lowerLimit = btScalar(1e30);
+	m_upperLimit = btScalar(-1e30);
+	m_biasFactor = 0.3f;
+	m_relaxationFactor = 1.0f;
+	m_limitSoftness = 0.9f;
+	m_solveLimit = false;
 
 }
 
 
 btHingeConstraint::btHingeConstraint(btRigidBody& rbA,const btVector3& pivotInA,btVector3& axisInA)
-:btTypedConstraint(rbA),m_pivotInA(pivotInA),m_pivotInB(rbA.getCenterOfMassTransform()(pivotInA)),
-m_axisInA(axisInA),
-//fixed axis in worldspace
-m_axisInB(rbA.getCenterOfMassTransform().getBasis() * -axisInA),
+:btTypedConstraint(HINGE_CONSTRAINT_TYPE, rbA), m_angularOnly(false), m_enableAngularMotor(false)
+{
+
+	// since no frame is given, assume this to be zero angle and just pick rb transform axis
+	// fixed axis in worldspace
+	btVector3 rbAxisA1 = rbA.getCenterOfMassTransform().getBasis().getColumn(0);
+	btScalar projection = rbAxisA1.dot(axisInA);
+	if (projection > SIMD_EPSILON)
+		rbAxisA1 = rbAxisA1*projection - axisInA;
+	else
+		rbAxisA1 = rbA.getCenterOfMassTransform().getBasis().getColumn(1);
+
+	btVector3 rbAxisA2 = axisInA.cross(rbAxisA1);
+
+	m_rbAFrame.getOrigin() = pivotInA;
+	m_rbAFrame.getBasis().setValue( rbAxisA1.getX(),rbAxisA2.getX(),axisInA.getX(),
+									rbAxisA1.getY(),rbAxisA2.getY(),axisInA.getY(),
+									rbAxisA1.getZ(),rbAxisA2.getZ(),axisInA.getZ() );
+
+
+	btVector3 axisInB = rbA.getCenterOfMassTransform().getBasis() * -axisInA;
+
+	btQuaternion rotationArc = shortestArcQuat(axisInA,axisInB);
+	btVector3 rbAxisB1 =  quatRotate(rotationArc,rbAxisA1);
+	btVector3 rbAxisB2 = axisInB.cross(rbAxisB1);
+
+
+	m_rbBFrame.getOrigin() = rbA.getCenterOfMassTransform()(pivotInA);
+	m_rbBFrame.getBasis().setValue( rbAxisB1.getX(),rbAxisB2.getX(),axisInB.getX(),
+									rbAxisB1.getY(),rbAxisB2.getY(),axisInB.getY(),
+									rbAxisB1.getZ(),rbAxisB2.getZ(),axisInB.getZ() );
+	
+	//start with free
+	m_lowerLimit = btScalar(1e30);
+	m_upperLimit = btScalar(-1e30);
+	m_biasFactor = 0.3f;
+	m_relaxationFactor = 1.0f;
+	m_limitSoftness = 0.9f;
+	m_solveLimit = false;
+}
+
+btHingeConstraint::btHingeConstraint(btRigidBody& rbA,btRigidBody& rbB, 
+								     const btTransform& rbAFrame, const btTransform& rbBFrame)
+:btTypedConstraint(HINGE_CONSTRAINT_TYPE, rbA,rbB),m_rbAFrame(rbAFrame),m_rbBFrame(rbBFrame),
 m_angularOnly(false),
 m_enableAngularMotor(false)
 {
-	
+	// flip axis
+	m_rbBFrame.getBasis()[0][2] *= btScalar(-1.);
+	m_rbBFrame.getBasis()[1][2] *= btScalar(-1.);
+	m_rbBFrame.getBasis()[2][2] *= btScalar(-1.);
+
+	//start with free
+	m_lowerLimit = btScalar(1e30);
+	m_upperLimit = btScalar(-1e30);
+	m_biasFactor = 0.3f;
+	m_relaxationFactor = 1.0f;
+	m_limitSoftness = 0.9f;
+	m_solveLimit = false;
+}			
+
+
+
+btHingeConstraint::btHingeConstraint(btRigidBody& rbA, const btTransform& rbAFrame)
+:btTypedConstraint(HINGE_CONSTRAINT_TYPE, rbA),m_rbAFrame(rbAFrame),m_rbBFrame(rbAFrame),
+m_angularOnly(false),
+m_enableAngularMotor(false)
+{
+	///not providing rigidbody B means implicitly using worldspace for body B
+
+	// flip axis
+	m_rbBFrame.getBasis()[0][2] *= btScalar(-1.);
+	m_rbBFrame.getBasis()[1][2] *= btScalar(-1.);
+	m_rbBFrame.getBasis()[2][2] *= btScalar(-1.);
+
+	m_rbBFrame.getOrigin() = m_rbA.getCenterOfMassTransform()(m_rbAFrame.getOrigin());
+
+	//start with free
+	m_lowerLimit = btScalar(1e30);
+	m_upperLimit = btScalar(-1e30);	
+	m_biasFactor = 0.3f;
+	m_relaxationFactor = 1.0f;
+	m_limitSoftness = 0.9f;
+	m_solveLimit = false;
 }
 
 void	btHingeConstraint::buildJacobian()
 {
 	m_appliedImpulse = btScalar(0.);
 
-	btVector3	normal(0,0,0);
-
 	if (!m_angularOnly)
 	{
+		btVector3 pivotAInW = m_rbA.getCenterOfMassTransform()*m_rbAFrame.getOrigin();
+		btVector3 pivotBInW = m_rbB.getCenterOfMassTransform()*m_rbBFrame.getOrigin();
+		btVector3 relPos = pivotBInW - pivotAInW;
+
+		btVector3 normal[3];
+		if (relPos.length2() > SIMD_EPSILON)
+		{
+			normal[0] = relPos.normalized();
+		}
+		else
+		{
+			normal[0].setValue(btScalar(1.0),0,0);
+		}
+
+		btPlaneSpace1(normal[0], normal[1], normal[2]);
+
 		for (int i=0;i<3;i++)
 		{
-			normal[i] = 1;
 			new (&m_jac[i]) btJacobianEntry(
 				m_rbA.getCenterOfMassTransform().getBasis().transpose(),
 				m_rbB.getCenterOfMassTransform().getBasis().transpose(),
-				m_rbA.getCenterOfMassTransform()*m_pivotInA - m_rbA.getCenterOfMassPosition(),
-				m_rbB.getCenterOfMassTransform()*m_pivotInB - m_rbB.getCenterOfMassPosition(),
-				normal,
+				pivotAInW - m_rbA.getCenterOfMassPosition(),
+				pivotBInW - m_rbB.getCenterOfMassPosition(),
+				normal[i],
 				m_rbA.getInvInertiaDiagLocal(),
 				m_rbA.getInvMass(),
 				m_rbB.getInvInertiaDiagLocal(),
 				m_rbB.getInvMass());
-			normal[i] = 0;
 		}
 	}
 
@@ -79,12 +206,12 @@ void	btHingeConstraint::buildJacobian()
 	btVector3 jointAxis0local;
 	btVector3 jointAxis1local;
 	
-	btPlaneSpace1(m_axisInA,jointAxis0local,jointAxis1local);
+	btPlaneSpace1(m_rbAFrame.getBasis().getColumn(2),jointAxis0local,jointAxis1local);
 
-	getRigidBodyA().getCenterOfMassTransform().getBasis() * m_axisInA;
+	getRigidBodyA().getCenterOfMassTransform().getBasis() * m_rbAFrame.getBasis().getColumn(2);
 	btVector3 jointAxis0 = getRigidBodyA().getCenterOfMassTransform().getBasis() * jointAxis0local;
 	btVector3 jointAxis1 = getRigidBodyA().getCenterOfMassTransform().getBasis() * jointAxis1local;
-	btVector3 hingeAxisWorld = getRigidBodyA().getCenterOfMassTransform().getBasis() * m_axisInA;
+	btVector3 hingeAxisWorld = getRigidBodyA().getCenterOfMassTransform().getBasis() * m_rbAFrame.getBasis().getColumn(2);
 		
 	new (&m_jacAng[0])	btJacobianEntry(jointAxis0,
 		m_rbA.getCenterOfMassTransform().getBasis().transpose(),
@@ -105,44 +232,70 @@ void	btHingeConstraint::buildJacobian()
 		m_rbB.getInvInertiaDiagLocal());
 
 
+	// Compute limit information
+	btScalar hingeAngle = getHingeAngle();  
+
+	//set bias, sign, clear accumulator
+	m_correction = btScalar(0.);
+	m_limitSign = btScalar(0.);
+	m_solveLimit = false;
+	m_accLimitImpulse = btScalar(0.);
+
+	if (m_lowerLimit < m_upperLimit)
+	{
+		if (hingeAngle <= m_lowerLimit*m_limitSoftness)
+		{
+			m_correction = (m_lowerLimit - hingeAngle);
+			m_limitSign = 1.0f;
+			m_solveLimit = true;
+		} 
+		else if (hingeAngle >= m_upperLimit*m_limitSoftness)
+		{
+			m_correction = m_upperLimit - hingeAngle;
+			m_limitSign = -1.0f;
+			m_solveLimit = true;
+		}
+	}
+
+	//Compute K = J*W*J' for hinge axis
+	btVector3 axisA =  getRigidBodyA().getCenterOfMassTransform().getBasis() *  m_rbAFrame.getBasis().getColumn(2);
+	m_kHinge =   1.0f / (getRigidBodyA().computeAngularImpulseDenominator(axisA) +
+			             getRigidBodyB().computeAngularImpulseDenominator(axisA));
 
 }
 
 void	btHingeConstraint::solveConstraint(btScalar	timeStep)
 {
 
-	btVector3 pivotAInW = m_rbA.getCenterOfMassTransform()*m_pivotInA;
-	btVector3 pivotBInW = m_rbB.getCenterOfMassTransform()*m_pivotInB;
+	btVector3 pivotAInW = m_rbA.getCenterOfMassTransform()*m_rbAFrame.getOrigin();
+	btVector3 pivotBInW = m_rbB.getCenterOfMassTransform()*m_rbBFrame.getOrigin();
 
-	btVector3 normal(0,0,0);
 	btScalar tau = btScalar(0.3);
-	btScalar damping = btScalar(1.);
 
-//linear part
+	//linear part
 	if (!m_angularOnly)
 	{
+		btVector3 rel_pos1 = pivotAInW - m_rbA.getCenterOfMassPosition(); 
+		btVector3 rel_pos2 = pivotBInW - m_rbB.getCenterOfMassPosition();
+
+		btVector3 vel1 = m_rbA.getVelocityInLocalPoint(rel_pos1);
+		btVector3 vel2 = m_rbB.getVelocityInLocalPoint(rel_pos2);
+		btVector3 vel = vel1 - vel2;
+
 		for (int i=0;i<3;i++)
 		{		
-			normal[i] = 1;
+			const btVector3& normal = m_jac[i].m_linearJointAxis;
 			btScalar jacDiagABInv = btScalar(1.) / m_jac[i].getDiagonal();
 
-			btVector3 rel_pos1 = pivotAInW - m_rbA.getCenterOfMassPosition(); 
-			btVector3 rel_pos2 = pivotBInW - m_rbB.getCenterOfMassPosition();
-			
-			btVector3 vel1 = m_rbA.getVelocityInLocalPoint(rel_pos1);
-			btVector3 vel2 = m_rbB.getVelocityInLocalPoint(rel_pos2);
-			btVector3 vel = vel1 - vel2;
 			btScalar rel_vel;
 			rel_vel = normal.dot(vel);
 			//positional error (zeroth order error)
 			btScalar depth = -(pivotAInW - pivotBInW).dot(normal); //this is the error projected on the normal
-			btScalar impulse = depth*tau/timeStep  * jacDiagABInv -  damping * rel_vel * jacDiagABInv * damping;
+			btScalar impulse = depth*tau/timeStep  * jacDiagABInv -  rel_vel * jacDiagABInv;
 			m_appliedImpulse += impulse;
 			btVector3 impulse_vector = normal * impulse;
 			m_rbA.applyImpulse(impulse_vector, pivotAInW - m_rbA.getCenterOfMassPosition());
 			m_rbB.applyImpulse(-impulse_vector, pivotBInW - m_rbB.getCenterOfMassPosition());
-			
-			normal[i] = 0;
 		}
 	}
 
@@ -151,8 +304,8 @@ void	btHingeConstraint::solveConstraint(btScalar	timeStep)
 		///solve angular part
 
 		// get axes in world space
-		btVector3 axisA = getRigidBodyA().getCenterOfMassTransform().getBasis() * m_axisInA;
-		btVector3 axisB = getRigidBodyB().getCenterOfMassTransform().getBasis() * m_axisInB;
+		btVector3 axisA =  getRigidBodyA().getCenterOfMassTransform().getBasis() *  m_rbAFrame.getBasis().getColumn(2);
+		btVector3 axisB =  getRigidBodyB().getCenterOfMassTransform().getBasis() *  m_rbBFrame.getBasis().getColumn(2);
 
 		const btVector3& angVelA = getRigidBodyA().getAngularVelocity();
 		const btVector3& angVelB = getRigidBodyB().getAngularVelocity();
@@ -174,7 +327,7 @@ void	btHingeConstraint::solveConstraint(btScalar	timeStep)
 					getRigidBodyB().computeAngularImpulseDenominator(normal);
 				// scale for mass and relaxation
 				//todo:  expose this 0.9 factor to developer
-				velrelOrthog *= (btScalar(1.)/denom) * btScalar(0.9);
+				velrelOrthog *= (btScalar(1.)/denom) * m_relaxationFactor;
 			}
 
 			//solve angular positional correction
@@ -190,10 +343,28 @@ void	btHingeConstraint::solveConstraint(btScalar	timeStep)
 
 			m_rbA.applyTorqueImpulse(-velrelOrthog+angularError);
 			m_rbB.applyTorqueImpulse(velrelOrthog-angularError);
+
+			// solve limit
+			if (m_solveLimit)
+			{
+				btScalar amplitude = ( (angVelB - angVelA).dot( axisA )*m_relaxationFactor + m_correction* (btScalar(1.)/timeStep)*m_biasFactor  ) * m_limitSign;
+
+				btScalar impulseMag = amplitude * m_kHinge;
+
+				// Clamp the accumulated impulse
+				btScalar temp = m_accLimitImpulse;
+				m_accLimitImpulse = btMax(m_accLimitImpulse + impulseMag, btScalar(0) );
+				impulseMag = m_accLimitImpulse - temp;
+
+
+				btVector3 impulse = axisA * impulseMag * m_limitSign;
+				m_rbA.applyTorqueImpulse(impulse);
+				m_rbB.applyTorqueImpulse(-impulse);
+			}
 		}
 
 		//apply motor
-		if (m_enableAngularMotor)
+		if (m_enableAngularMotor) 
 		{
 			//todo: add limits too
 			btVector3 angularLimit(0,0,0);
@@ -204,10 +375,7 @@ void	btHingeConstraint::solveConstraint(btScalar	timeStep)
 			btScalar desiredMotorVel = m_motorTargetVelocity;
 			btScalar motor_relvel = desiredMotorVel - projRelVel;
 
-			btScalar denom3 = getRigidBodyA().computeAngularImpulseDenominator(axisA) +
-					getRigidBodyB().computeAngularImpulseDenominator(axisA);
-
-			btScalar unclippedMotorImpulse = (btScalar(1.)/denom3) * motor_relvel;;
+			btScalar unclippedMotorImpulse = m_kHinge * motor_relvel;;
 			//todo: should clip against accumulated impulse
 			btScalar clippedMotorImpulse = unclippedMotorImpulse > m_maxMotorImpulse ? m_maxMotorImpulse : unclippedMotorImpulse;
 			clippedMotorImpulse = clippedMotorImpulse < -m_maxMotorImpulse ? -m_maxMotorImpulse : clippedMotorImpulse;
@@ -227,3 +395,12 @@ void	btHingeConstraint::updateRHS(btScalar	timeStep)
 
 }
 
+btScalar btHingeConstraint::getHingeAngle()
+{
+	const btVector3 refAxis0  = getRigidBodyA().getCenterOfMassTransform().getBasis() * m_rbAFrame.getBasis().getColumn(0);
+	const btVector3 refAxis1  = getRigidBodyA().getCenterOfMassTransform().getBasis() * m_rbAFrame.getBasis().getColumn(1);
+	const btVector3 swingAxis = getRigidBodyB().getCenterOfMassTransform().getBasis() * m_rbBFrame.getBasis().getColumn(1);
+
+	return btAtan2Fast( swingAxis.dot(refAxis0), swingAxis.dot(refAxis1)  );
+}
+
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h
index 5c1ceafbc5b..4fa9972f6d8 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h
@@ -13,39 +13,61 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
+/* Hinge Constraint by Dirk Gregorius. Limits added by Marcus Hennix at Starbreeze Studios */
+
 #ifndef HINGECONSTRAINT_H
 #define HINGECONSTRAINT_H
 
-#include "../../LinearMath/btVector3.h"
+#include "LinearMath/btVector3.h"
 #include "btJacobianEntry.h"
 #include "btTypedConstraint.h"
 
 class btRigidBody;
 
-
 /// hinge constraint between two rigidbodies each with a pivotpoint that descibes the axis location in local space
 /// axis defines the orientation of the hinge axis
 class btHingeConstraint : public btTypedConstraint
 {
+#ifdef IN_PARALLELL_SOLVER
+public:
+#endif
 	btJacobianEntry	m_jac[3]; //3 orthogonal linear constraints
 	btJacobianEntry	m_jacAng[3]; //2 orthogonal angular constraints+ 1 for limit/motor
 
-	btVector3	m_pivotInA;
-	btVector3	m_pivotInB;
-	btVector3	m_axisInA;
-	btVector3	m_axisInB;
+	btTransform m_rbAFrame; // constraint axii. Assumes z is hinge axis.
+	btTransform m_rbBFrame;
+
+	btScalar	m_motorTargetVelocity;
+	btScalar	m_maxMotorImpulse;
+
+	btScalar	m_limitSoftness; 
+	btScalar	m_biasFactor; 
+	btScalar    m_relaxationFactor; 
+
+	btScalar    m_lowerLimit;	
+	btScalar    m_upperLimit;	
+	
+	btScalar	m_kHinge;
+
+	btScalar	m_limitSign;
+	btScalar	m_correction;
+
+	btScalar	m_accLimitImpulse;
 
 	bool		m_angularOnly;
-
-	btScalar		m_motorTargetVelocity;
-	btScalar		m_maxMotorImpulse;
 	bool		m_enableAngularMotor;
+	bool		m_solveLimit;
+
 	
 public:
 
-	btHingeConstraint(btRigidBody& rbA,btRigidBody& rbB, const btVector3& pivotInA,const btVector3& pivotInB,btVector3& axisInA,btVector3& axisInB);
+	btHingeConstraint(btRigidBody& rbA,btRigidBody& rbB, const btVector3& pivotInA,const btVector3& pivotInB, btVector3& axisInA,btVector3& axisInB);
 
 	btHingeConstraint(btRigidBody& rbA,const btVector3& pivotInA,btVector3& axisInA);
+	
+	btHingeConstraint(btRigidBody& rbA,btRigidBody& rbB, const btTransform& rbAFrame, const btTransform& rbBFrame);
+
+	btHingeConstraint(btRigidBody& rbA,const btTransform& rbAFrame);
 
 	btHingeConstraint();
 
@@ -76,6 +98,61 @@ public:
 		m_maxMotorImpulse = maxMotorImpulse;
 	}
 
+	void	setLimit(btScalar low,btScalar high,btScalar _softness = 0.9f, btScalar _biasFactor = 0.3f, btScalar _relaxationFactor = 1.0f)
+	{
+		m_lowerLimit = low;
+		m_upperLimit = high;
+
+		m_limitSoftness =  _softness;
+		m_biasFactor = _biasFactor;
+		m_relaxationFactor = _relaxationFactor;
+
+	}
+
+	btScalar	getLowerLimit() const
+	{
+		return m_lowerLimit;
+	}
+
+	btScalar	getUpperLimit() const
+	{
+		return m_upperLimit;
+	}
+
+
+	btScalar getHingeAngle();
+
+
+	const btTransform& getAFrame() { return m_rbAFrame; };	
+	const btTransform& getBFrame() { return m_rbBFrame; };
+
+	inline int getSolveLimit()
+	{
+		return m_solveLimit;
+	}
+
+	inline btScalar getLimitSign()
+	{
+		return m_limitSign;
+	}
+
+	inline bool getAngularOnly() 
+	{ 
+		return m_angularOnly; 
+	}
+	inline bool getEnableAngularMotor() 
+	{ 
+		return m_enableAngularMotor; 
+	}
+	inline btScalar getMotorTargetVelosity() 
+	{ 
+		return m_motorTargetVelocity; 
+	}
+	inline btScalar getMaxMotorImpulse() 
+	{ 
+		return m_maxMotorImpulse; 
+	}
+
 };
 
 #endif //HINGECONSTRAINT_H
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btJacobianEntry.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btJacobianEntry.h
index aae3ed0373f..bfeb24c2dfb 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btJacobianEntry.h
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btJacobianEntry.h
@@ -16,8 +16,8 @@ subject to the following restrictions:
 #ifndef JACOBIAN_ENTRY_H
 #define JACOBIAN_ENTRY_H
 
-#include "../../LinearMath/btVector3.h"
-#include "../Dynamics/btRigidBody.h"
+#include "LinearMath/btVector3.h"
+#include "BulletDynamics/Dynamics/btRigidBody.h"
 
 
 //notes:
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp
index aacb0a3ea66..2b69ad90438 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp
@@ -21,18 +21,19 @@ subject to the following restrictions:
 
 
 btPoint2PointConstraint::btPoint2PointConstraint()
+:btTypedConstraint(POINT2POINT_CONSTRAINT_TYPE)
 {
 }
 
 btPoint2PointConstraint::btPoint2PointConstraint(btRigidBody& rbA,btRigidBody& rbB, const btVector3& pivotInA,const btVector3& pivotInB)
-:btTypedConstraint(rbA,rbB),m_pivotInA(pivotInA),m_pivotInB(pivotInB)
+:btTypedConstraint(POINT2POINT_CONSTRAINT_TYPE,rbA,rbB),m_pivotInA(pivotInA),m_pivotInB(pivotInB)
 {
 
 }
 
 
 btPoint2PointConstraint::btPoint2PointConstraint(btRigidBody& rbA,const btVector3& pivotInA)
-:btTypedConstraint(rbA),m_pivotInA(pivotInA),m_pivotInB(rbA.getCenterOfMassTransform()(pivotInA))
+:btTypedConstraint(POINT2POINT_CONSTRAINT_TYPE,rbA),m_pivotInA(pivotInA),m_pivotInB(rbA.getCenterOfMassTransform()(pivotInA))
 {
 	
 }
@@ -99,6 +100,16 @@ void	btPoint2PointConstraint::solveConstraint(btScalar	timeStep)
 		btScalar depth = -(pivotAInW - pivotBInW).dot(normal); //this is the error projected on the normal
 		
 		btScalar impulse = depth*m_setting.m_tau/timeStep  * jacDiagABInv -  m_setting.m_damping * rel_vel * jacDiagABInv;
+
+		btScalar impulseClamp = m_setting.m_impulseClamp;
+		if (impulseClamp > 0)
+		{
+			if (impulse < -impulseClamp) 
+				impulse = -impulseClamp;
+			if (impulse > impulseClamp) 
+				impulse = impulseClamp;
+		}
+
 		m_appliedImpulse+=impulse;
 		btVector3 impulse_vector = normal * impulse;
 		m_rbA.applyImpulse(impulse_vector, pivotAInW - m_rbA.getCenterOfMassPosition());
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h
index 71da8ac0347..c9d5968530c 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h
@@ -16,7 +16,7 @@ subject to the following restrictions:
 #ifndef POINT2POINTCONSTRAINT_H
 #define POINT2POINTCONSTRAINT_H
 
-#include "../../LinearMath/btVector3.h"
+#include "LinearMath/btVector3.h"
 #include "btJacobianEntry.h"
 #include "btTypedConstraint.h"
 
@@ -26,16 +26,21 @@ struct	btConstraintSetting
 {
 	btConstraintSetting()	:
 		m_tau(btScalar(0.3)),
-		m_damping(btScalar(1.))
+		m_damping(btScalar(1.)),
+		m_impulseClamp(btScalar(0.))
 	{
 	}
 	btScalar		m_tau;
 	btScalar		m_damping;
+	btScalar		m_impulseClamp;
 };
 
 /// point to point constraint between two rigidbodies each with a pivotpoint that descibes the 'ballsocket' location in local space
 class btPoint2PointConstraint : public btTypedConstraint
 {
+#ifdef IN_PARALLELL_SOLVER
+public:
+#endif
 	btJacobianEntry	m_jac[3]; //3 orthogonal linear constraints
 	
 	btVector3	m_pivotInA;
@@ -70,6 +75,15 @@ public:
 		m_pivotInB = pivotB;
 	}
 
+	const btVector3& getPivotInA() const
+	{
+		return m_pivotInA;
+	}
+
+	const btVector3& getPivotInB() const
+	{
+		return m_pivotInB;
+	}
 
 
 };
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
index 14b36ad44fd..b8afbd6aac5 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
@@ -13,6 +13,9 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
+//#define COMPUTE_IMPULSE_DENOM 1
+//It is not necessary (redundant) to refresh contact manifolds, this refresh has been moved to the collision algorithms.
+//#define FORCE_REFESH_CONTACT_MANIFOLDS 1
 
 #include "btSequentialImpulseConstraintSolver.h"
 #include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h"
@@ -30,11 +33,9 @@ subject to the following restrictions:
 #include "btSolverBody.h"
 #include "btSolverConstraint.h"
 
+
 #include "LinearMath/btAlignedObjectArray.h"
 
-#ifdef USE_PROFILE
-#include "LinearMath/btQuickprof.h"
-#endif //USE_PROFILE
 
 int totalCpd = 0;
 
@@ -64,7 +65,7 @@ unsigned long btSequentialImpulseConstraintSolver::btRand2()
 int btSequentialImpulseConstraintSolver::btRandInt2 (int n)
 {
   // seems good; xor-fold and modulus
-  const unsigned long un = n;
+  const unsigned long un = static_cast<unsigned long>(n);
   unsigned long r = btRand2();
 
   // note: probably more aggressive than it needs to be -- might be
@@ -91,12 +92,12 @@ int btSequentialImpulseConstraintSolver::btRandInt2 (int n)
 
 
 
-
+bool  MyContactDestroyedCallback(void* userPersistentData);
 bool  MyContactDestroyedCallback(void* userPersistentData)
 {
 	assert (userPersistentData);
 	btConstraintPersistentData* cpd = (btConstraintPersistentData*)userPersistentData;
-	delete cpd;
+	btAlignedFree(cpd);
 	totalCpd--;
 	//printf("totalCpd = %i. DELETED Ptr %x\n",totalCpd,userPersistentData);
 	return true;
@@ -105,8 +106,7 @@ bool  MyContactDestroyedCallback(void* userPersistentData)
 
 
 btSequentialImpulseConstraintSolver::btSequentialImpulseConstraintSolver()
-:m_solverMode(SOLVER_RANDMIZE_ORDER | SOLVER_CACHE_FRIENDLY), //not using SOLVER_USE_WARMSTARTING,
-m_btSeed2(0)
+:m_btSeed2(0)
 {
 	gContactDestroyedCallback = &MyContactDestroyedCallback;
 
@@ -121,27 +121,42 @@ m_btSeed2(0)
 		}
 }
 
-
-void	initSolverBody(btSolverBody* solverBody, btRigidBody* rigidbody)
+btSequentialImpulseConstraintSolver::~btSequentialImpulseConstraintSolver()
 {
-/*	int size = sizeof(btSolverBody);
-	int sizeofrb = sizeof(btRigidBody);
-	int sizemanifold = sizeof(btPersistentManifold);
-	int sizeofmp = sizeof(btManifoldPoint);
-	int sizeofPersistData = sizeof (btConstraintPersistentData);
-*/
 
-	solverBody->m_angularVelocity = rigidbody->getAngularVelocity();
-	solverBody->m_centerOfMassPosition = rigidbody->getCenterOfMassPosition();
-	solverBody->m_friction = rigidbody->getFriction();
-//	solverBody->m_invInertiaWorld = rigidbody->getInvInertiaTensorWorld();
-	solverBody->m_invMass = rigidbody->getInvMass();
-	solverBody->m_linearVelocity = rigidbody->getLinearVelocity();
-	solverBody->m_originalBody = rigidbody;
-	solverBody->m_angularFactor = rigidbody->getAngularFactor();
 }
 
-btScalar penetrationResolveFactor = btScalar(0.9);
+void	initSolverBody(btSolverBody* solverBody, btCollisionObject* collisionObject);
+void	initSolverBody(btSolverBody* solverBody, btCollisionObject* collisionObject)
+{
+	btRigidBody* rb = btRigidBody::upcast(collisionObject);
+	if (rb)
+	{
+		solverBody->m_angularVelocity = rb->getAngularVelocity() ;
+		solverBody->m_centerOfMassPosition = collisionObject->getWorldTransform().getOrigin();
+		solverBody->m_friction = collisionObject->getFriction();
+		solverBody->m_invMass = rb->getInvMass();
+		solverBody->m_linearVelocity = rb->getLinearVelocity();
+		solverBody->m_originalBody = rb;
+		solverBody->m_angularFactor = rb->getAngularFactor();
+	} else
+	{
+		solverBody->m_angularVelocity.setValue(0,0,0);
+		solverBody->m_centerOfMassPosition = collisionObject->getWorldTransform().getOrigin();
+		solverBody->m_friction = collisionObject->getFriction();
+		solverBody->m_invMass = 0.f;
+		solverBody->m_linearVelocity.setValue(0,0,0);
+		solverBody->m_originalBody = 0;
+		solverBody->m_angularFactor = 1.f;
+	}
+	solverBody->m_pushVelocity.setValue(0.f,0.f,0.f);
+	solverBody->m_turnVelocity.setValue(0.f,0.f,0.f);
+}
+
+
+int		gNumSplitImpulseRecoveries = 0;
+
+btScalar restitutionCurve(btScalar rel_vel, btScalar restitution);
 btScalar restitutionCurve(btScalar rel_vel, btScalar restitution)
 {
 	btScalar rest = restitution * -rel_vel;
@@ -149,30 +164,95 @@ btScalar restitutionCurve(btScalar rel_vel, btScalar restitution)
 }
 
 
+void	resolveSplitPenetrationImpulseCacheFriendly(
+        btSolverBody& body1,
+        btSolverBody& body2,
+        const btSolverConstraint& contactConstraint,
+        const btContactSolverInfo& solverInfo);
+
+//SIMD_FORCE_INLINE
+void	resolveSplitPenetrationImpulseCacheFriendly(
+        btSolverBody& body1,
+        btSolverBody& body2,
+        const btSolverConstraint& contactConstraint,
+        const btContactSolverInfo& solverInfo)
+{
+        (void)solverInfo;
+
+		if (contactConstraint.m_penetration < solverInfo.m_splitImpulsePenetrationThreshold)
+        {
+
+				gNumSplitImpulseRecoveries++;
+                btScalar normalImpulse;
+
+                //  Optimized version of projected relative velocity, use precomputed cross products with normal
+                //      body1.getVelocityInLocalPoint(contactConstraint.m_rel_posA,vel1);
+                //      body2.getVelocityInLocalPoint(contactConstraint.m_rel_posB,vel2);
+                //      btVector3 vel = vel1 - vel2;
+                //      btScalar  rel_vel = contactConstraint.m_contactNormal.dot(vel);
+
+                btScalar rel_vel;
+                btScalar vel1Dotn = contactConstraint.m_contactNormal.dot(body1.m_pushVelocity)
+                + contactConstraint.m_relpos1CrossNormal.dot(body1.m_turnVelocity);
+                btScalar vel2Dotn = contactConstraint.m_contactNormal.dot(body2.m_pushVelocity)
+                + contactConstraint.m_relpos2CrossNormal.dot(body2.m_turnVelocity);
+
+                rel_vel = vel1Dotn-vel2Dotn;
 
 
+				btScalar positionalError = -contactConstraint.m_penetration * solverInfo.m_erp2/solverInfo.m_timeStep;
+                //      btScalar positionalError = contactConstraint.m_penetration;
+
+                btScalar velocityError = contactConstraint.m_restitution - rel_vel;// * damping;
+
+                btScalar penetrationImpulse = positionalError * contactConstraint.m_jacDiagABInv;
+                btScalar        velocityImpulse = velocityError * contactConstraint.m_jacDiagABInv;
+                normalImpulse = penetrationImpulse+velocityImpulse;
+
+                // See Erin Catto's GDC 2006 paper: Clamp the accumulated impulse
+                btScalar oldNormalImpulse = contactConstraint.m_appliedPushImpulse;
+                btScalar sum = oldNormalImpulse + normalImpulse;
+                contactConstraint.m_appliedPushImpulse = btScalar(0.) > sum ? btScalar(0.): sum;
+
+                normalImpulse = contactConstraint.m_appliedPushImpulse - oldNormalImpulse;
+
+				body1.internalApplyPushImpulse(contactConstraint.m_contactNormal*body1.m_invMass, contactConstraint.m_angularComponentA,normalImpulse);
+               
+				body2.internalApplyPushImpulse(contactConstraint.m_contactNormal*body2.m_invMass, contactConstraint.m_angularComponentB,-normalImpulse);
+               
+        }
+
+}
 
 
 //velocity + friction
 //response  between two dynamic objects with friction
-SIMD_FORCE_INLINE btScalar resolveSingleCollisionCombinedCacheFriendly(
+
+btScalar resolveSingleCollisionCombinedCacheFriendly(
 	btSolverBody& body1,
 	btSolverBody& body2,
-	btSolverConstraint& contactConstraint,
+	const btSolverConstraint& contactConstraint,
+	const btContactSolverInfo& solverInfo);
+
+//SIMD_FORCE_INLINE 
+btScalar resolveSingleCollisionCombinedCacheFriendly(
+	btSolverBody& body1,
+	btSolverBody& body2,
+	const btSolverConstraint& contactConstraint,
 	const btContactSolverInfo& solverInfo)
 {
 	(void)solverInfo;
 
-	btScalar normalImpulse(0.f);
-	{
-		if (contactConstraint.m_penetration < 0.f)
-			return 0.f;
+	btScalar normalImpulse;
 
-	//  Optimized version of projected relative velocity, use precomputed cross products with normal
-	//	body1.getVelocityInLocalPoint(contactConstraint.m_rel_posA,vel1);
-	//	body2.getVelocityInLocalPoint(contactConstraint.m_rel_posB,vel2);
-	//	btVector3 vel = vel1 - vel2;
-	//	btScalar  rel_vel = contactConstraint.m_contactNormal.dot(vel);
+	{
+
+		
+		//  Optimized version of projected relative velocity, use precomputed cross products with normal
+		//	body1.getVelocityInLocalPoint(contactConstraint.m_rel_posA,vel1);
+		//	body2.getVelocityInLocalPoint(contactConstraint.m_rel_posB,vel2);
+		//	btVector3 vel = vel1 - vel2;
+		//	btScalar  rel_vel = contactConstraint.m_contactNormal.dot(vel);
 
 		btScalar rel_vel;
 		btScalar vel1Dotn = contactConstraint.m_contactNormal.dot(body1.m_linearVelocity) 
@@ -182,50 +262,51 @@ SIMD_FORCE_INLINE btScalar resolveSingleCollisionCombinedCacheFriendly(
 
 		rel_vel = vel1Dotn-vel2Dotn;
 
+		btScalar positionalError = 0.f;
+		if (!solverInfo.m_splitImpulse || (contactConstraint.m_penetration > solverInfo.m_splitImpulsePenetrationThreshold))
+		{
+ 			positionalError = -contactConstraint.m_penetration * solverInfo.m_erp/solverInfo.m_timeStep;
+		}
 
-		btScalar positionalError = contactConstraint.m_penetration;
 		btScalar velocityError = contactConstraint.m_restitution - rel_vel;// * damping;
 
 		btScalar penetrationImpulse = positionalError * contactConstraint.m_jacDiagABInv;
 		btScalar	velocityImpulse = velocityError * contactConstraint.m_jacDiagABInv;
-		btScalar normalImpulse = penetrationImpulse+velocityImpulse;
+		normalImpulse = penetrationImpulse+velocityImpulse;
+		
 		
 		// See Erin Catto's GDC 2006 paper: Clamp the accumulated impulse
 		btScalar oldNormalImpulse = contactConstraint.m_appliedImpulse;
 		btScalar sum = oldNormalImpulse + normalImpulse;
 		contactConstraint.m_appliedImpulse = btScalar(0.) > sum ? btScalar(0.): sum;
 
-		btScalar oldVelocityImpulse = contactConstraint.m_appliedVelocityImpulse;
-		btScalar velocitySum = oldVelocityImpulse + velocityImpulse;
-		contactConstraint.m_appliedVelocityImpulse = btScalar(0.) > velocitySum ? btScalar(0.): velocitySum;
-
 		normalImpulse = contactConstraint.m_appliedImpulse - oldNormalImpulse;
 
-		if (body1.m_invMass)
-		{
-			body1.internalApplyImpulse(contactConstraint.m_contactNormal*body1.m_invMass,
+		body1.internalApplyImpulse(contactConstraint.m_contactNormal*body1.m_invMass,
 				contactConstraint.m_angularComponentA,normalImpulse);
-		}
-		if (body2.m_invMass)
-		{
-			body2.internalApplyImpulse(contactConstraint.m_contactNormal*body2.m_invMass,
+		
+		body2.internalApplyImpulse(contactConstraint.m_contactNormal*body2.m_invMass,
 				contactConstraint.m_angularComponentB,-normalImpulse);
-		}
-
 	}
 
-	
-
 	return normalImpulse;
 }
 
 
 #ifndef NO_FRICTION_TANGENTIALS
 
-SIMD_FORCE_INLINE btScalar resolveSingleFrictionCacheFriendly(
+btScalar resolveSingleFrictionCacheFriendly(
 	btSolverBody& body1,
 	btSolverBody& body2,
-	btSolverConstraint& contactConstraint,
+	const btSolverConstraint& contactConstraint,
+	const btContactSolverInfo& solverInfo,
+	btScalar appliedNormalImpulse);
+
+//SIMD_FORCE_INLINE 
+btScalar resolveSingleFrictionCacheFriendly(
+	btSolverBody& body1,
+	btSolverBody& body2,
+	const btSolverConstraint& contactConstraint,
 	const btContactSolverInfo& solverInfo,
 	btScalar appliedNormalImpulse)
 {
@@ -252,22 +333,42 @@ SIMD_FORCE_INLINE btScalar resolveSingleFrictionCacheFriendly(
 
 			// calculate j that moves us to zero relative velocity
 			j1 = -rel_vel * contactConstraint.m_jacDiagABInv;
+#define CLAMP_ACCUMULATED_FRICTION_IMPULSE 1
+#ifdef CLAMP_ACCUMULATED_FRICTION_IMPULSE
 			btScalar oldTangentImpulse = contactConstraint.m_appliedImpulse;
 			contactConstraint.m_appliedImpulse = oldTangentImpulse + j1;
-			GEN_set_min(contactConstraint.m_appliedImpulse, limit);
-			GEN_set_max(contactConstraint.m_appliedImpulse, -limit);
+			
+			if (limit < contactConstraint.m_appliedImpulse)
+			{
+				contactConstraint.m_appliedImpulse = limit;
+			} else
+			{
+				if (contactConstraint.m_appliedImpulse < -limit)
+					contactConstraint.m_appliedImpulse = -limit;
+			}
 			j1 = contactConstraint.m_appliedImpulse - oldTangentImpulse;
+#else
+			if (limit < j1)
+			{
+				j1 = limit;
+			} else
+			{
+				if (j1 < -limit)
+					j1 = -limit;
+			}
+
+#endif //CLAMP_ACCUMULATED_FRICTION_IMPULSE
+
+			//GEN_set_min(contactConstraint.m_appliedImpulse, limit);
+			//GEN_set_max(contactConstraint.m_appliedImpulse, -limit);
+
+			
 
 		}
 	
-		if (body1.m_invMass)
-		{
-			body1.internalApplyImpulse(contactConstraint.m_contactNormal*body1.m_invMass,contactConstraint.m_angularComponentA,j1);
-		}
-		if (body2.m_invMass)
-		{
-			body2.internalApplyImpulse(contactConstraint.m_contactNormal*body2.m_invMass,contactConstraint.m_angularComponentB,-j1);
-		}
+		body1.internalApplyImpulse(contactConstraint.m_contactNormal*body1.m_invMass,contactConstraint.m_angularComponentA,j1);
+		
+		body2.internalApplyImpulse(contactConstraint.m_contactNormal*body2.m_invMass,contactConstraint.m_angularComponentB,-j1);
 
 	} 
 	return 0.f;
@@ -309,7 +410,6 @@ btScalar resolveSingleFrictionCacheFriendly(
 		const btVector3& rel_pos2 = contactConstraint.m_rel_posB;
 
 
-		//if (contactConstraint.m_appliedVelocityImpulse > 0.f)
 		if (lat_rel_vel > SIMD_EPSILON*SIMD_EPSILON)
 		{
 			lat_rel_vel = btSqrt(lat_rel_vel);
@@ -319,7 +419,7 @@ btScalar resolveSingleFrictionCacheFriendly(
 			btVector3 temp2 = body2.m_invInertiaWorld * rel_pos2.cross(lat_vel);
 			btScalar friction_impulse = lat_rel_vel /
 				(body1.m_invMass + body2.m_invMass + lat_vel.dot(temp1.cross(rel_pos1) + temp2.cross(rel_pos2)));
-			btScalar normal_impulse = contactConstraint.m_appliedVelocityImpulse * combinedFriction;
+			btScalar normal_impulse = contactConstraint.m_appliedImpulse * combinedFriction;
 
 			GEN_set_min(friction_impulse, normal_impulse);
 			GEN_set_max(friction_impulse, -normal_impulse);
@@ -333,39 +433,111 @@ btScalar resolveSingleFrictionCacheFriendly(
 
 #endif //NO_FRICTION_TANGENTIALS
 
-btAlignedObjectArray<btSolverBody>	tmpSolverBodyPool;
-btAlignedObjectArray<btSolverConstraint>	tmpSolverConstraintPool;
-btAlignedObjectArray<btSolverConstraint>	tmpSolverFrictionConstraintPool;
 
 
-btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendly(btCollisionObject** bodies,int numBodies,btPersistentManifold** manifoldPtr, int numManifolds,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& infoGlobal,btIDebugDraw* debugDrawer,btStackAlloc* stackAlloc)
+
+
+void	btSequentialImpulseConstraintSolver::addFrictionConstraint(const btVector3& normalAxis,int solverBodyIdA,int solverBodyIdB,int frictionIndex,btManifoldPoint& cp,const btVector3& rel_pos1,const btVector3& rel_pos2,btCollisionObject* colObj0,btCollisionObject* colObj1, btScalar relaxation)
 {
+
+	btRigidBody* body0=btRigidBody::upcast(colObj0);
+	btRigidBody* body1=btRigidBody::upcast(colObj1);
+
+	btSolverConstraint& solverConstraint = m_tmpSolverFrictionConstraintPool.expand();
+	solverConstraint.m_contactNormal = normalAxis;
+
+	solverConstraint.m_solverBodyIdA = solverBodyIdA;
+	solverConstraint.m_solverBodyIdB = solverBodyIdB;
+	solverConstraint.m_constraintType = btSolverConstraint::BT_SOLVER_FRICTION_1D;
+	solverConstraint.m_frictionIndex = frictionIndex;
+
+	solverConstraint.m_friction = cp.m_combinedFriction;
+	solverConstraint.m_originalContactPoint = 0;
+
+	solverConstraint.m_appliedImpulse = btScalar(0.);
+	solverConstraint.m_appliedPushImpulse = 0.f;
+	solverConstraint.m_penetration = 0.f;
+	{
+		btVector3 ftorqueAxis1 = rel_pos1.cross(solverConstraint.m_contactNormal);
+		solverConstraint.m_relpos1CrossNormal = ftorqueAxis1;
+		solverConstraint.m_angularComponentA = body0 ? body0->getInvInertiaTensorWorld()*ftorqueAxis1 : btVector3(0,0,0);
+	}
+	{
+		btVector3 ftorqueAxis1 = rel_pos2.cross(solverConstraint.m_contactNormal);
+		solverConstraint.m_relpos2CrossNormal = ftorqueAxis1;
+		solverConstraint.m_angularComponentB = body1 ? body1->getInvInertiaTensorWorld()*ftorqueAxis1 : btVector3(0,0,0);
+	}
+
+#ifdef COMPUTE_IMPULSE_DENOM
+	btScalar denom0 = rb0->computeImpulseDenominator(pos1,solverConstraint.m_contactNormal);
+	btScalar denom1 = rb1->computeImpulseDenominator(pos2,solverConstraint.m_contactNormal);
+#else
+	btVector3 vec;
+	btScalar denom0 = 0.f;
+	btScalar denom1 = 0.f;
+	if (body0)
+	{
+		vec = ( solverConstraint.m_angularComponentA).cross(rel_pos1);
+		denom0 = body0->getInvMass() + normalAxis.dot(vec);
+	}
+	if (body1)
+	{
+		vec = ( solverConstraint.m_angularComponentB).cross(rel_pos2);
+		denom1 = body1->getInvMass() + normalAxis.dot(vec);
+	}
+
+
+#endif //COMPUTE_IMPULSE_DENOM
+	btScalar denom = relaxation/(denom0+denom1);
+	solverConstraint.m_jacDiagABInv = denom;
+
+
+}
+
+
+
+btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendlySetup(btCollisionObject** /*bodies */,int /*numBodies */,btPersistentManifold** manifoldPtr, int numManifolds,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& infoGlobal,btIDebugDraw* debugDrawer,btStackAlloc* stackAlloc)
+{
+	BT_PROFILE("solveGroupCacheFriendlySetup");
 	(void)stackAlloc;
 	(void)debugDrawer;
 
+
 	if (!(numConstraints + numManifolds))
 	{
 //		printf("empty\n");
 		return 0.f;
 	}
+	btPersistentManifold* manifold = 0;
+	btCollisionObject* colObj0=0,*colObj1=0;
+
+	//btRigidBody* rb0=0,*rb1=0;
+
+
+#ifdef FORCE_REFESH_CONTACT_MANIFOLDS
 
 	BEGIN_PROFILE("refreshManifolds");
 
 	int i;
+	
+	
+
 	for (i=0;i<numManifolds;i++)
 	{
-		btPersistentManifold* manifold = manifoldPtr[i];
-		btRigidBody* rb0 = (btRigidBody*)manifold->getBody0();
-		btRigidBody* rb1 = (btRigidBody*)manifold->getBody1();
-
+		manifold = manifoldPtr[i];
+		rb1 = (btRigidBody*)manifold->getBody1();
+		rb0 = (btRigidBody*)manifold->getBody0();
+		
 		manifold->refreshContactPoints(rb0->getCenterOfMassTransform(),rb1->getCenterOfMassTransform());
 
 	}
-	
+
 	END_PROFILE("refreshManifolds");
+#endif //FORCE_REFESH_CONTACT_MANIFOLDS
+
+	
 
 
-	BEGIN_PROFILE("gatherSolverData");
 
 	//int sizeofSB = sizeof(btSolverBody);
 	//int sizeofSC = sizeof(btSolverConstraint);
@@ -382,10 +554,12 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendly(btCollisio
 
 		
 		//todo: use stack allocator for this temp memory
-		int minReservation = numManifolds*2;
+//		int minReservation = numManifolds*2;
 
-		tmpSolverBodyPool.reserve(minReservation);
+		//m_tmpSolverBodyPool.reserve(minReservation);
 
+		//don't convert all bodies, only the one we need so solver the constraints
+/*
 		{
 			for (int i=0;i<numBodies;i++)
 			{
@@ -393,26 +567,26 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendly(btCollisio
 				if (rb && 	(rb->getIslandTag() >= 0))
 				{
 					btAssert(rb->getCompanionId() < 0);
-					int solverBodyId = tmpSolverBodyPool.size();
-					btSolverBody& solverBody = tmpSolverBodyPool.expand();
+					int solverBodyId = m_tmpSolverBodyPool.size();
+					btSolverBody& solverBody = m_tmpSolverBodyPool.expand();
 					initSolverBody(&solverBody,rb);
 					rb->setCompanionId(solverBodyId);
 				} 
 			}
 		}
-
+*/
 		
-		tmpSolverConstraintPool.reserve(minReservation);
-		tmpSolverFrictionConstraintPool.reserve(minReservation);
+		//m_tmpSolverConstraintPool.reserve(minReservation);
+		//m_tmpSolverFrictionConstraintPool.reserve(minReservation);
+
 		{
 			int i;
 
 			for (i=0;i<numManifolds;i++)
 			{
-				btPersistentManifold* manifold = manifoldPtr[i];
-				btRigidBody* rb0 = (btRigidBody*)manifold->getBody0();
-				btRigidBody* rb1 = (btRigidBody*)manifold->getBody1();
-
+				manifold = manifoldPtr[i];
+				colObj0 = (btCollisionObject*)manifold->getBody0();
+				colObj1 = (btCollisionObject*)manifold->getBody1();
 			
 				int solverBodyIdA=-1;
 				int solverBodyIdB=-1;
@@ -422,61 +596,108 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendly(btCollisio
 
 					
 
-					if (rb0->getIslandTag() >= 0)
+					if (colObj0->getIslandTag() >= 0)
 					{
-						solverBodyIdA = rb0->getCompanionId();
+						if (colObj0->getCompanionId() >= 0)
+						{
+							//body has already been converted
+							solverBodyIdA = colObj0->getCompanionId();
+						} else
+						{
+							solverBodyIdA = m_tmpSolverBodyPool.size();
+							btSolverBody& solverBody = m_tmpSolverBodyPool.expand();
+							initSolverBody(&solverBody,colObj0);
+							colObj0->setCompanionId(solverBodyIdA);
+						}
 					} else
 					{
 						//create a static body
-						solverBodyIdA = tmpSolverBodyPool.size();
-						btSolverBody& solverBody = tmpSolverBodyPool.expand();
-						initSolverBody(&solverBody,rb0);
+						solverBodyIdA = m_tmpSolverBodyPool.size();
+						btSolverBody& solverBody = m_tmpSolverBodyPool.expand();
+						initSolverBody(&solverBody,colObj0);
 					}
 
-					if (rb1->getIslandTag() >= 0)
+					if (colObj1->getIslandTag() >= 0)
 					{
-						solverBodyIdB = rb1->getCompanionId();
+						if (colObj1->getCompanionId() >= 0)
+						{
+							solverBodyIdB = colObj1->getCompanionId();
+						} else
+						{
+							solverBodyIdB = m_tmpSolverBodyPool.size();
+							btSolverBody& solverBody = m_tmpSolverBodyPool.expand();
+							initSolverBody(&solverBody,colObj1);
+							colObj1->setCompanionId(solverBodyIdB);
+						}
 					} else
 					{
 						//create a static body
-						solverBodyIdB = tmpSolverBodyPool.size();
-						btSolverBody& solverBody = tmpSolverBodyPool.expand();
-						initSolverBody(&solverBody,rb1);
+						solverBodyIdB = m_tmpSolverBodyPool.size();
+						btSolverBody& solverBody = m_tmpSolverBodyPool.expand();
+						initSolverBody(&solverBody,colObj1);
 					}
 				}
 
+				btVector3 rel_pos1;
+				btVector3 rel_pos2;
+				btScalar relaxation;
+
 				for (int j=0;j<manifold->getNumContacts();j++)
 				{
 					
 					btManifoldPoint& cp = manifold->getContactPoint(j);
-
-					int frictionIndex = tmpSolverConstraintPool.size();
-
+					
 					if (cp.getDistance() <= btScalar(0.))
 					{
 						
 						const btVector3& pos1 = cp.getPositionWorldOnA();
 						const btVector3& pos2 = cp.getPositionWorldOnB();
 
-						btVector3 rel_pos1 = pos1 - rb0->getCenterOfMassPosition(); 
-						btVector3 rel_pos2 = pos2 - rb1->getCenterOfMassPosition();
+						 rel_pos1 = pos1 - colObj0->getWorldTransform().getOrigin(); 
+						 rel_pos2 = pos2 - colObj1->getWorldTransform().getOrigin();
 
 						
-							btScalar relaxation = 1.f;
+						relaxation = 1.f;
+						btScalar rel_vel;
+						btVector3 vel;
+
+						int frictionIndex = m_tmpSolverConstraintPool.size();
 
 						{
-							btSolverConstraint& solverConstraint = tmpSolverConstraintPool.expand();
+							btSolverConstraint& solverConstraint = m_tmpSolverConstraintPool.expand();
+							btRigidBody* rb0 = btRigidBody::upcast(colObj0);
+							btRigidBody* rb1 = btRigidBody::upcast(colObj1);
 
 							solverConstraint.m_solverBodyIdA = solverBodyIdA;
 							solverConstraint.m_solverBodyIdB = solverBodyIdB;
 							solverConstraint.m_constraintType = btSolverConstraint::BT_SOLVER_CONTACT_1D;
 
-					
+							solverConstraint.m_originalContactPoint = &cp;
 
+							btVector3 torqueAxis0 = rel_pos1.cross(cp.m_normalWorldOnB);
+							solverConstraint.m_angularComponentA = rb0 ? rb0->getInvInertiaTensorWorld()*torqueAxis0 : btVector3(0,0,0);
+							btVector3 torqueAxis1 = rel_pos2.cross(cp.m_normalWorldOnB);		
+							solverConstraint.m_angularComponentB = rb1 ? rb1->getInvInertiaTensorWorld()*torqueAxis1 : btVector3(0,0,0);
 							{
-								//can be optimized, the cross products are already calculated
+#ifdef COMPUTE_IMPULSE_DENOM
 								btScalar denom0 = rb0->computeImpulseDenominator(pos1,cp.m_normalWorldOnB);
 								btScalar denom1 = rb1->computeImpulseDenominator(pos2,cp.m_normalWorldOnB);
+#else							
+								btVector3 vec;
+								btScalar denom0 = 0.f;
+								btScalar denom1 = 0.f;
+								if (rb0)
+								{
+									vec = ( solverConstraint.m_angularComponentA).cross(rel_pos1);
+									denom0 = rb0->getInvMass() + cp.m_normalWorldOnB.dot(vec);
+								}
+								if (rb1)
+								{
+									vec = ( solverConstraint.m_angularComponentB).cross(rel_pos2);
+									denom1 = rb1->getInvMass() + cp.m_normalWorldOnB.dot(vec);
+								}
+#endif //COMPUTE_IMPULSE_DENOM		
+								
 								btScalar denom = relaxation/(denom0+denom1);
 								solverConstraint.m_jacDiagABInv = denom;
 							}
@@ -486,121 +707,115 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendly(btCollisio
 							solverConstraint.m_relpos2CrossNormal = rel_pos2.cross(cp.m_normalWorldOnB);
 
 
-							btVector3 vel1 = rb0->getVelocityInLocalPoint(rel_pos1);
-							btVector3 vel2 = rb1->getVelocityInLocalPoint(rel_pos2);
+							btVector3 vel1 = rb0 ? rb0->getVelocityInLocalPoint(rel_pos1) : btVector3(0,0,0);
+							btVector3 vel2 = rb1 ? rb1->getVelocityInLocalPoint(rel_pos2) : btVector3(0,0,0);
 				
-							btVector3 vel = vel1 - vel2;
-							btScalar rel_vel;
+							vel  = vel1 - vel2;
+							
 							rel_vel = cp.m_normalWorldOnB.dot(vel);
 							
+							solverConstraint.m_penetration = btMin(cp.getDistance()+infoGlobal.m_linearSlop,btScalar(0.));
+							//solverConstraint.m_penetration = cp.getDistance();
 
-							solverConstraint.m_penetration = cp.getDistance();///btScalar(infoGlobal.m_numIterations);
 							solverConstraint.m_friction = cp.m_combinedFriction;
-							btScalar rest =  restitutionCurve(rel_vel, cp.m_combinedRestitution);
-							if (rest <= btScalar(0.))
+							solverConstraint.m_restitution =  restitutionCurve(rel_vel, cp.m_combinedRestitution);
+							if (solverConstraint.m_restitution <= btScalar(0.))
 							{
-								rest = 0.f;
+								solverConstraint.m_restitution = 0.f;
 							};
+
 							
 							btScalar penVel = -solverConstraint.m_penetration/infoGlobal.m_timeStep;
-							if (rest > penVel)
-							{
-								rest = btScalar(0.);
-							}
-							solverConstraint.m_restitution = rest;
 
-							solverConstraint.m_penetration *= -(infoGlobal.m_erp/infoGlobal.m_timeStep);
-
-							solverConstraint.m_appliedImpulse = 0.f;
-							solverConstraint.m_appliedVelocityImpulse = 0.f;
 							
-					
-							btVector3 torqueAxis0 = rel_pos1.cross(cp.m_normalWorldOnB);
-							solverConstraint.m_angularComponentA = rb0->getInvInertiaTensorWorld()*torqueAxis0;
-							btVector3 torqueAxis1 = rel_pos2.cross(cp.m_normalWorldOnB);		
-							solverConstraint.m_angularComponentB = rb1->getInvInertiaTensorWorld()*torqueAxis1;
-						}
-
-						//create 2 '1d axis' constraints for 2 tangential friction directions
-			
-						//re-calculate friction direction every frame, todo: check if this is really needed
-						btVector3 frictionTangential0a, frictionTangential1b;
-
-						btPlaneSpace1(cp.m_normalWorldOnB,frictionTangential0a,frictionTangential1b);
-
-						{
-							btSolverConstraint& solverConstraint = tmpSolverFrictionConstraintPool.expand();
-							solverConstraint.m_contactNormal = frictionTangential0a;
-
-							solverConstraint.m_solverBodyIdA = solverBodyIdA;
-							solverConstraint.m_solverBodyIdB = solverBodyIdB;
-							solverConstraint.m_constraintType = btSolverConstraint::BT_SOLVER_FRICTION_1D;
-							solverConstraint.m_frictionIndex = frictionIndex;
-
-							solverConstraint.m_friction = cp.m_combinedFriction;
-
-							solverConstraint.m_appliedImpulse = btScalar(0.);
-							solverConstraint.m_appliedVelocityImpulse = 0.f;
-
-							btScalar denom0 = rb0->computeImpulseDenominator(pos1,solverConstraint.m_contactNormal);
-							btScalar denom1 = rb1->computeImpulseDenominator(pos2,solverConstraint.m_contactNormal);
-							btScalar denom = relaxation/(denom0+denom1);
-							solverConstraint.m_jacDiagABInv = denom;
 
+							if (solverConstraint.m_restitution > penVel)
 							{
-							btVector3 ftorqueAxis0 = rel_pos1.cross(solverConstraint.m_contactNormal);
-							solverConstraint.m_relpos1CrossNormal = ftorqueAxis0;
-							solverConstraint.m_angularComponentA = rb0->getInvInertiaTensorWorld()*ftorqueAxis0;
+								solverConstraint.m_penetration = btScalar(0.);
 							}
+							 
+							
+							
+							///warm starting (or zero if disabled)
+							if (infoGlobal.m_solverMode & SOLVER_USE_WARMSTARTING)
 							{
-							btVector3 ftorqueAxis0 = rel_pos2.cross(solverConstraint.m_contactNormal);
-							solverConstraint.m_relpos2CrossNormal = ftorqueAxis0;
-							solverConstraint.m_angularComponentB = rb1->getInvInertiaTensorWorld()*ftorqueAxis0;
+								solverConstraint.m_appliedImpulse = cp.m_appliedImpulse * infoGlobal.m_warmstartingFactor;
+								if (rb0)
+									m_tmpSolverBodyPool[solverConstraint.m_solverBodyIdA].internalApplyImpulse(solverConstraint.m_contactNormal*rb0->getInvMass(),solverConstraint.m_angularComponentA,solverConstraint.m_appliedImpulse);
+								if (rb1)
+									m_tmpSolverBodyPool[solverConstraint.m_solverBodyIdB].internalApplyImpulse(solverConstraint.m_contactNormal*rb1->getInvMass(),solverConstraint.m_angularComponentB,-solverConstraint.m_appliedImpulse);
+							} else
+							{
+								solverConstraint.m_appliedImpulse = 0.f;
 							}
 
-						}
-
-
-						{
-
-							btSolverConstraint& solverConstraint = tmpSolverFrictionConstraintPool.expand();
-							solverConstraint.m_contactNormal = frictionTangential1b;
-
-							solverConstraint.m_solverBodyIdA = solverBodyIdA;
-							solverConstraint.m_solverBodyIdB = solverBodyIdB;
-							solverConstraint.m_constraintType = btSolverConstraint::BT_SOLVER_FRICTION_1D;
-							solverConstraint.m_frictionIndex = frictionIndex;
-
-							solverConstraint.m_friction = cp.m_combinedFriction;
-
-							solverConstraint.m_appliedImpulse = btScalar(0.);
-							solverConstraint.m_appliedVelocityImpulse = 0.f;
-						
-							btScalar denom0 = rb0->computeImpulseDenominator(pos1,solverConstraint.m_contactNormal);
-							btScalar denom1 = rb1->computeImpulseDenominator(pos2,solverConstraint.m_contactNormal);
-							btScalar denom = relaxation/(denom0+denom1);
-							solverConstraint.m_jacDiagABInv = denom;
+							solverConstraint.m_appliedPushImpulse = 0.f;
+							
+							solverConstraint.m_frictionIndex = m_tmpSolverFrictionConstraintPool.size();
+							if (!cp.m_lateralFrictionInitialized)
 							{
-								btVector3 ftorqueAxis1 = rel_pos1.cross(solverConstraint.m_contactNormal);
-								solverConstraint.m_relpos1CrossNormal = ftorqueAxis1;
-								solverConstraint.m_angularComponentA = rb0->getInvInertiaTensorWorld()*ftorqueAxis1;
+								cp.m_lateralFrictionDir1 = vel - cp.m_normalWorldOnB * rel_vel;
+								btScalar lat_rel_vel = cp.m_lateralFrictionDir1.length2();
+								if (lat_rel_vel > SIMD_EPSILON)//0.0f)
+								{
+									cp.m_lateralFrictionDir1 /= btSqrt(lat_rel_vel);
+									addFrictionConstraint(cp.m_lateralFrictionDir1,solverBodyIdA,solverBodyIdB,frictionIndex,cp,rel_pos1,rel_pos2,colObj0,colObj1, relaxation);
+									cp.m_lateralFrictionDir2 = cp.m_lateralFrictionDir1.cross(cp.m_normalWorldOnB);
+									cp.m_lateralFrictionDir2.normalize();//??
+									addFrictionConstraint(cp.m_lateralFrictionDir2,solverBodyIdA,solverBodyIdB,frictionIndex,cp,rel_pos1,rel_pos2,colObj0,colObj1, relaxation);
+								} else
+								{
+									//re-calculate friction direction every frame, todo: check if this is really needed
+									
+									btPlaneSpace1(cp.m_normalWorldOnB,cp.m_lateralFrictionDir1,cp.m_lateralFrictionDir2);
+									addFrictionConstraint(cp.m_lateralFrictionDir1,solverBodyIdA,solverBodyIdB,frictionIndex,cp,rel_pos1,rel_pos2,colObj0,colObj1, relaxation);
+									addFrictionConstraint(cp.m_lateralFrictionDir2,solverBodyIdA,solverBodyIdB,frictionIndex,cp,rel_pos1,rel_pos2,colObj0,colObj1, relaxation);
 								}
+								cp.m_lateralFrictionInitialized = true;
+								
+							} else
 							{
-								btVector3 ftorqueAxis1 = rel_pos2.cross(solverConstraint.m_contactNormal);
-								solverConstraint.m_relpos2CrossNormal = ftorqueAxis1;
-								solverConstraint.m_angularComponentB = rb1->getInvInertiaTensorWorld()*ftorqueAxis1;
+								addFrictionConstraint(cp.m_lateralFrictionDir1,solverBodyIdA,solverBodyIdB,frictionIndex,cp,rel_pos1,rel_pos2,colObj0,colObj1, relaxation);
+								addFrictionConstraint(cp.m_lateralFrictionDir2,solverBodyIdA,solverBodyIdB,frictionIndex,cp,rel_pos1,rel_pos2,colObj0,colObj1, relaxation);
+							}
+
+							{
+								btSolverConstraint& frictionConstraint1 = m_tmpSolverFrictionConstraintPool[solverConstraint.m_frictionIndex];
+								if (infoGlobal.m_solverMode & SOLVER_USE_WARMSTARTING)
+								{
+									frictionConstraint1.m_appliedImpulse = cp.m_appliedImpulseLateral1 * infoGlobal.m_warmstartingFactor;
+									if (rb0)
+										m_tmpSolverBodyPool[solverConstraint.m_solverBodyIdA].internalApplyImpulse(frictionConstraint1.m_contactNormal*rb0->getInvMass(),frictionConstraint1.m_angularComponentA,frictionConstraint1.m_appliedImpulse);
+									if (rb1)
+										m_tmpSolverBodyPool[solverConstraint.m_solverBodyIdB].internalApplyImpulse(frictionConstraint1.m_contactNormal*rb1->getInvMass(),frictionConstraint1.m_angularComponentB,-frictionConstraint1.m_appliedImpulse);
+								} else
+								{
+									frictionConstraint1.m_appliedImpulse = 0.f;
 								}
 							}
+							{
+								btSolverConstraint& frictionConstraint2 = m_tmpSolverFrictionConstraintPool[solverConstraint.m_frictionIndex+1];
+								if (infoGlobal.m_solverMode & SOLVER_USE_WARMSTARTING)
+								{
+									frictionConstraint2.m_appliedImpulse = cp.m_appliedImpulseLateral2 * infoGlobal.m_warmstartingFactor;
+									if (rb0)
+										m_tmpSolverBodyPool[solverConstraint.m_solverBodyIdA].internalApplyImpulse(frictionConstraint2.m_contactNormal*rb0->getInvMass(),frictionConstraint2.m_angularComponentA,frictionConstraint2.m_appliedImpulse);
+									if (rb1)
+										m_tmpSolverBodyPool[solverConstraint.m_solverBodyIdB].internalApplyImpulse(frictionConstraint2.m_contactNormal*rb1->getInvMass(),frictionConstraint2.m_angularComponentB,-frictionConstraint2.m_appliedImpulse);
+								} else
+								{
+									frictionConstraint2.m_appliedImpulse = 0.f;
+								}
+							}
+						}
+
 
 					}
 				}
 			}
 		}
 	}
-	END_PROFILE("gatherSolverData");
-
-	BEGIN_PROFILE("prepareConstraints");
-
+	
 	btContactSolverInfo info = infoGlobal;
 
 	{
@@ -612,57 +827,60 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendly(btCollisio
 		}
 	}
 	
-	btAlignedObjectArray<int>	gOrderTmpConstraintPool;
-	btAlignedObjectArray<int>	gOrderFrictionConstraintPool;
+	
 
-	int numConstraintPool = tmpSolverConstraintPool.size();
-	int numFrictionPool = tmpSolverFrictionConstraintPool.size();
+	int numConstraintPool = m_tmpSolverConstraintPool.size();
+	int numFrictionPool = m_tmpSolverFrictionConstraintPool.size();
 
 	///todo: use stack allocator for such temporarily memory, same for solver bodies/constraints
-	gOrderTmpConstraintPool.resize(numConstraintPool);
-	gOrderFrictionConstraintPool.resize(numFrictionPool);
+	m_orderTmpConstraintPool.resize(numConstraintPool);
+	m_orderFrictionConstraintPool.resize(numFrictionPool);
 	{
 		int i;
 		for (i=0;i<numConstraintPool;i++)
 		{
-			gOrderTmpConstraintPool[i] = i;
+			m_orderTmpConstraintPool[i] = i;
 		}
 		for (i=0;i<numFrictionPool;i++)
 		{
-			gOrderFrictionConstraintPool[i] = i;
+			m_orderFrictionConstraintPool[i] = i;
 		}
 	}
 
 
 
+	return 0.f;
 
-	END_PROFILE("prepareConstraints");
+}
 
-
-	BEGIN_PROFILE("solveConstraints");
+btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendlyIterations(btCollisionObject** /*bodies */,int /*numBodies*/,btPersistentManifold** /*manifoldPtr*/, int /*numManifolds*/,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& infoGlobal,btIDebugDraw* /*debugDrawer*/,btStackAlloc* /*stackAlloc*/)
+{
+	BT_PROFILE("solveGroupCacheFriendlyIterations");
+	int numConstraintPool = m_tmpSolverConstraintPool.size();
+	int numFrictionPool = m_tmpSolverFrictionConstraintPool.size();
 
 	//should traverse the contacts random order...
 	int iteration;
 	{
-		for ( iteration = 0;iteration<info.m_numIterations;iteration++)
+		for ( iteration = 0;iteration<infoGlobal.m_numIterations;iteration++)
 		{			
 
 			int j;
-			if (m_solverMode & SOLVER_RANDMIZE_ORDER)
+			if (infoGlobal.m_solverMode & SOLVER_RANDMIZE_ORDER)
 			{
 				if ((iteration & 7) == 0) {
 					for (j=0; j<numConstraintPool; ++j) {
-						int tmp = gOrderTmpConstraintPool[j];
+						int tmp = m_orderTmpConstraintPool[j];
 						int swapi = btRandInt2(j+1);
-						gOrderTmpConstraintPool[j] = gOrderTmpConstraintPool[swapi];
-						gOrderTmpConstraintPool[swapi] = tmp;
+						m_orderTmpConstraintPool[j] = m_orderTmpConstraintPool[swapi];
+						m_orderTmpConstraintPool[swapi] = tmp;
 					}
 
 					for (j=0; j<numFrictionPool; ++j) {
-						int tmp = gOrderFrictionConstraintPool[j];
+						int tmp = m_orderFrictionConstraintPool[j];
 						int swapi = btRandInt2(j+1);
-						gOrderFrictionConstraintPool[j] = gOrderFrictionConstraintPool[swapi];
-						gOrderFrictionConstraintPool[swapi] = tmp;
+						m_orderFrictionConstraintPool[j] = m_orderFrictionConstraintPool[swapi];
+						m_orderFrictionConstraintPool[swapi] = tmp;
 					}
 				}
 			}
@@ -674,86 +892,145 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendly(btCollisio
 
 				if ((constraint->getRigidBodyA().getIslandTag() >= 0) && (constraint->getRigidBodyA().getCompanionId() >= 0))
 				{
-					tmpSolverBodyPool[constraint->getRigidBodyA().getCompanionId()].writebackVelocity();
+					m_tmpSolverBodyPool[constraint->getRigidBodyA().getCompanionId()].writebackVelocity();
 				}
 				if ((constraint->getRigidBodyB().getIslandTag() >= 0) && (constraint->getRigidBodyB().getCompanionId() >= 0))
 				{
-					tmpSolverBodyPool[constraint->getRigidBodyB().getCompanionId()].writebackVelocity();
+					m_tmpSolverBodyPool[constraint->getRigidBodyB().getCompanionId()].writebackVelocity();
 				}
 
-				constraint->solveConstraint(info.m_timeStep);
+				constraint->solveConstraint(infoGlobal.m_timeStep);
 
 				if ((constraint->getRigidBodyA().getIslandTag() >= 0) && (constraint->getRigidBodyA().getCompanionId() >= 0))
 				{
-					tmpSolverBodyPool[constraint->getRigidBodyA().getCompanionId()].readVelocity();
+					m_tmpSolverBodyPool[constraint->getRigidBodyA().getCompanionId()].readVelocity();
 				}
 				if ((constraint->getRigidBodyB().getIslandTag() >= 0) && (constraint->getRigidBodyB().getCompanionId() >= 0))
 				{
-					tmpSolverBodyPool[constraint->getRigidBodyB().getCompanionId()].readVelocity();
+					m_tmpSolverBodyPool[constraint->getRigidBodyB().getCompanionId()].readVelocity();
 				}
 
 			}
 
 			{
-				int numPoolConstraints = tmpSolverConstraintPool.size();
+				int numPoolConstraints = m_tmpSolverConstraintPool.size();
 				for (j=0;j<numPoolConstraints;j++)
 				{
-					btSolverConstraint& solveManifold = tmpSolverConstraintPool[gOrderTmpConstraintPool[j]];
-					resolveSingleCollisionCombinedCacheFriendly(tmpSolverBodyPool[solveManifold.m_solverBodyIdA],
-						tmpSolverBodyPool[solveManifold.m_solverBodyIdB],solveManifold,info);
+					
+					const btSolverConstraint& solveManifold = m_tmpSolverConstraintPool[m_orderTmpConstraintPool[j]];
+					resolveSingleCollisionCombinedCacheFriendly(m_tmpSolverBodyPool[solveManifold.m_solverBodyIdA],
+						m_tmpSolverBodyPool[solveManifold.m_solverBodyIdB],solveManifold,infoGlobal);
 				}
 			}
 
 			{
-				 int numFrictionPoolConstraints = tmpSolverFrictionConstraintPool.size();
-				for (j=0;j<numFrictionPoolConstraints;j++)
+				 int numFrictionPoolConstraints = m_tmpSolverFrictionConstraintPool.size();
+				
+				 for (j=0;j<numFrictionPoolConstraints;j++)
 				{
-					btSolverConstraint& solveManifold = tmpSolverFrictionConstraintPool[gOrderFrictionConstraintPool[j]];
-						btScalar appliedNormalImpulse = tmpSolverConstraintPool[solveManifold.m_frictionIndex].m_appliedImpulse;
+					const btSolverConstraint& solveManifold = m_tmpSolverFrictionConstraintPool[m_orderFrictionConstraintPool[j]];
+					btScalar totalImpulse = m_tmpSolverConstraintPool[solveManifold.m_frictionIndex].m_appliedImpulse+
+								m_tmpSolverConstraintPool[solveManifold.m_frictionIndex].m_appliedPushImpulse;			
 
-						resolveSingleFrictionCacheFriendly(tmpSolverBodyPool[solveManifold.m_solverBodyIdA],
-							tmpSolverBodyPool[solveManifold.m_solverBodyIdB],solveManifold,info,appliedNormalImpulse);
+						resolveSingleFrictionCacheFriendly(m_tmpSolverBodyPool[solveManifold.m_solverBodyIdA],
+							m_tmpSolverBodyPool[solveManifold.m_solverBodyIdB],solveManifold,infoGlobal,
+							totalImpulse);
 				}
 			}
 			
 
 
 		}
+	
+		if (infoGlobal.m_splitImpulse)
+		{
+			
+			for ( iteration = 0;iteration<infoGlobal.m_numIterations;iteration++)
+			{
+				{
+					int numPoolConstraints = m_tmpSolverConstraintPool.size();
+					int j;
+					for (j=0;j<numPoolConstraints;j++)
+					{
+						const btSolverConstraint& solveManifold = m_tmpSolverConstraintPool[m_orderTmpConstraintPool[j]];
+
+						resolveSplitPenetrationImpulseCacheFriendly(m_tmpSolverBodyPool[solveManifold.m_solverBodyIdA],
+							m_tmpSolverBodyPool[solveManifold.m_solverBodyIdB],solveManifold,infoGlobal);
+					}
+				}
+			}
+
+		}
+
 	}
-		
-	for ( i=0;i<tmpSolverBodyPool.size();i++)
+
+	return 0.f;
+}
+
+
+btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendly(btCollisionObject** bodies,int numBodies,btPersistentManifold** manifoldPtr, int numManifolds,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& infoGlobal,btIDebugDraw* debugDrawer,btStackAlloc* stackAlloc)
+{
+	int i;
+
+	solveGroupCacheFriendlySetup( bodies, numBodies, manifoldPtr,  numManifolds,constraints, numConstraints,infoGlobal,debugDrawer, stackAlloc);
+	solveGroupCacheFriendlyIterations(bodies, numBodies, manifoldPtr,  numManifolds,constraints, numConstraints,infoGlobal,debugDrawer, stackAlloc);
+
+	int numPoolConstraints = m_tmpSolverConstraintPool.size();
+	int j;
+	for (j=0;j<numPoolConstraints;j++)
 	{
-		tmpSolverBodyPool[i].writebackVelocity();
+		
+		const btSolverConstraint& solveManifold = m_tmpSolverConstraintPool[j];
+		btManifoldPoint* pt = (btManifoldPoint*) solveManifold.m_originalContactPoint;
+		btAssert(pt);
+		pt->m_appliedImpulse = solveManifold.m_appliedImpulse;
+		pt->m_appliedImpulseLateral1 = m_tmpSolverFrictionConstraintPool[solveManifold.m_frictionIndex].m_appliedImpulse;
+		pt->m_appliedImpulseLateral1 = m_tmpSolverFrictionConstraintPool[solveManifold.m_frictionIndex+1].m_appliedImpulse;
+
+		//do a callback here?
+
 	}
 
-	END_PROFILE("solveConstraints");
+	if (infoGlobal.m_splitImpulse)
+	{		
+		for ( i=0;i<m_tmpSolverBodyPool.size();i++)
+		{
+			m_tmpSolverBodyPool[i].writebackVelocity(infoGlobal.m_timeStep);
+		}
+	} else
+	{
+		for ( i=0;i<m_tmpSolverBodyPool.size();i++)
+        {
+                m_tmpSolverBodyPool[i].writebackVelocity();
+        }
+	}
 
-//	printf("tmpSolverConstraintPool.size() = %i\n",tmpSolverConstraintPool.size());
+//	printf("m_tmpSolverConstraintPool.size() = %i\n",m_tmpSolverConstraintPool.size());
 
 /*
-	printf("tmpSolverBodyPool.size() = %i\n",tmpSolverBodyPool.size());
-	printf("tmpSolverConstraintPool.size() = %i\n",tmpSolverConstraintPool.size());
-	printf("tmpSolverFrictionConstraintPool.size() = %i\n",tmpSolverFrictionConstraintPool.size());
+	printf("m_tmpSolverBodyPool.size() = %i\n",m_tmpSolverBodyPool.size());
+	printf("m_tmpSolverConstraintPool.size() = %i\n",m_tmpSolverConstraintPool.size());
+	printf("m_tmpSolverFrictionConstraintPool.size() = %i\n",m_tmpSolverFrictionConstraintPool.size());
 
 	
-	printf("tmpSolverBodyPool.capacity() = %i\n",tmpSolverBodyPool.capacity());
-	printf("tmpSolverConstraintPool.capacity() = %i\n",tmpSolverConstraintPool.capacity());
-	printf("tmpSolverFrictionConstraintPool.capacity() = %i\n",tmpSolverFrictionConstraintPool.capacity());
+	printf("m_tmpSolverBodyPool.capacity() = %i\n",m_tmpSolverBodyPool.capacity());
+	printf("m_tmpSolverConstraintPool.capacity() = %i\n",m_tmpSolverConstraintPool.capacity());
+	printf("m_tmpSolverFrictionConstraintPool.capacity() = %i\n",m_tmpSolverFrictionConstraintPool.capacity());
 */
 
-	tmpSolverBodyPool.resize(0);
-	tmpSolverConstraintPool.resize(0);
-	tmpSolverFrictionConstraintPool.resize(0);
+	m_tmpSolverBodyPool.resize(0);
+	m_tmpSolverConstraintPool.resize(0);
+	m_tmpSolverFrictionConstraintPool.resize(0);
 
 
 	return 0.f;
 }
 
 /// btSequentialImpulseConstraintSolver Sequentially applies impulses
-btScalar btSequentialImpulseConstraintSolver::solveGroup(btCollisionObject** bodies,int numBodies,btPersistentManifold** manifoldPtr, int numManifolds,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& infoGlobal,btIDebugDraw* debugDrawer,btStackAlloc* stackAlloc)
+btScalar btSequentialImpulseConstraintSolver::solveGroup(btCollisionObject** bodies,int numBodies,btPersistentManifold** manifoldPtr, int numManifolds,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& infoGlobal,btIDebugDraw* debugDrawer,btStackAlloc* stackAlloc,btDispatcher* /*dispatcher*/)
 {
-
-	if (getSolverMode() & SOLVER_CACHE_FRIENDLY)
+	BT_PROFILE("solveGroup");
+	if (infoGlobal.m_solverMode & SOLVER_CACHE_FRIENDLY)
 	{
 		//you need to provide at least some bodies
 		//btSimpleDynamicsWorld needs to switch off SOLVER_CACHE_FRIENDLY
@@ -762,16 +1039,11 @@ btScalar btSequentialImpulseConstraintSolver::solveGroup(btCollisionObject** bod
 		return solveGroupCacheFriendly(bodies,numBodies,manifoldPtr, numManifolds,constraints,numConstraints,infoGlobal,debugDrawer,stackAlloc);
 	}
 
-
-	BEGIN_PROFILE("prepareConstraints");
 	
 
 	btContactSolverInfo info = infoGlobal;
 
 	int numiter = infoGlobal.m_numIterations;
-#ifdef USE_PROFILE
-	btProfiler::beginBlock("solve");
-#endif //USE_PROFILE
 
 	int totalPoints = 0;
 
@@ -801,10 +1073,6 @@ btScalar btSequentialImpulseConstraintSolver::solveGroup(btCollisionObject** bod
 		}
 	}
 	
-	END_PROFILE("prepareConstraints");
-
-
-	BEGIN_PROFILE("solveConstraints");
 
 	//should traverse the contacts random order...
 	int iteration;
@@ -813,7 +1081,7 @@ btScalar btSequentialImpulseConstraintSolver::solveGroup(btCollisionObject** bod
 		for ( iteration = 0;iteration<numiter;iteration++)
 		{
 			int j;
-			if (m_solverMode & SOLVER_RANDMIZE_ORDER)
+			if (infoGlobal.m_solverMode & SOLVER_RANDMIZE_ORDER)
 			{
 				if ((iteration & 7) == 0) {
 					for (j=0; j<totalPoints; ++j) {
@@ -845,16 +1113,10 @@ btScalar btSequentialImpulseConstraintSolver::solveGroup(btCollisionObject** bod
 				solveFriction((btRigidBody*)manifold->getBody0(),
 					(btRigidBody*)manifold->getBody1(),manifold->getContactPoint(gOrder[j].m_pointIndex),info,iteration,debugDrawer);
 			}
+			
 		}
 	}
 		
-	END_PROFILE("solveConstraints");
-
-
-#ifdef USE_PROFILE
-	btProfiler::endBlock("solve");
-#endif //USE_PROFILE
-
 
 
 
@@ -878,13 +1140,14 @@ void	btSequentialImpulseConstraintSolver::prepareConstraints(btPersistentManifol
 
 	//only necessary to refresh the manifold once (first iteration). The integration is done outside the loop
 	{
+#ifdef FORCE_REFESH_CONTACT_MANIFOLDS
 		manifoldPtr->refreshContactPoints(body0->getCenterOfMassTransform(),body1->getCenterOfMassTransform());
-		
+#endif //FORCE_REFESH_CONTACT_MANIFOLDS		
 		int numpoints = manifoldPtr->getNumContacts();
 
 		gTotalContactPoints += numpoints;
 
-		btVector3 color(0,1,0);
+		
 		for (int i=0;i<numpoints ;i++)
 		{
 			btManifoldPoint& cp = manifoldPtr->getContactPoint(i);
@@ -925,7 +1188,9 @@ void	btSequentialImpulseConstraintSolver::prepareConstraints(btPersistentManifol
 				} else
 				{
 						
-					cpd = new btConstraintPersistentData;
+					//todo: should this be in a pool?
+					void* mem = btAlignedAlloc(sizeof(btConstraintPersistentData),16);
+					cpd = new (mem)btConstraintPersistentData;
 					assert(cpd);
 
 					totalCpd ++;
@@ -972,10 +1237,9 @@ void	btSequentialImpulseConstraintSolver::prepareConstraints(btPersistentManifol
 					cpd->m_penetration = btScalar(0.);
 				} 				
 				
-				
 
 				btScalar relaxation = info.m_damping;
-				if (m_solverMode & SOLVER_USE_WARMSTARTING)
+				if (info.m_solverMode & SOLVER_USE_WARMSTARTING)
 				{
 					cpd->m_appliedImpulse *= relaxation;
 				} else
@@ -1060,16 +1324,12 @@ btScalar btSequentialImpulseConstraintSolver::solveCombinedContactFriction(btRig
 
 	{
 
-		btVector3 color(0,1,0);
+		
 		{
 			if (cp.getDistance() <= btScalar(0.))
 			{
 
-				if (iter == 0)
-				{
-					if (debugDrawer)
-						debugDrawer->drawContactPoint(cp.m_positionWorldOnB,cp.m_normalWorldOnB,cp.getDistance(),cp.getLifeTime(),color);
-				}
+				
 
 				{
 
@@ -1098,16 +1358,12 @@ btScalar btSequentialImpulseConstraintSolver::solve(btRigidBody* body0,btRigidBo
 
 	{
 
-		btVector3 color(0,1,0);
+		
 		{
 			if (cp.getDistance() <= btScalar(0.))
 			{
 
-				if (iter == 0)
-				{
-					if (debugDrawer)
-						debugDrawer->drawContactPoint(cp.m_positionWorldOnB,cp.m_normalWorldOnB,cp.getDistance(),cp.getLifeTime(),color);
-				}
+				
 
 				{
 
@@ -1136,7 +1392,7 @@ btScalar btSequentialImpulseConstraintSolver::solveFriction(btRigidBody* body0,b
 
 	{
 
-		btVector3 color(0,1,0);
+		
 		{
 			
 			if (cp.getDistance() <= btScalar(0.))
@@ -1156,3 +1412,11 @@ btScalar btSequentialImpulseConstraintSolver::solveFriction(btRigidBody* body0,b
 	}
 	return btScalar(0.);
 }
+
+
+void	btSequentialImpulseConstraintSolver::reset()
+{
+	m_btSeed2 = 0;
+}
+
+
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h
index 13e70c41be4..7143bc41991 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h
@@ -19,7 +19,8 @@ subject to the following restrictions:
 #include "btConstraintSolver.h"
 class btIDebugDraw;
 #include "btContactConstraint.h"
-	
+#include "btSolverBody.h"
+#include "btSolverConstraint.h"
 
 
 /// btSequentialImpulseConstraintSolver uses a Propagation Method and Sequentially applies impulses
@@ -29,29 +30,29 @@ class btIDebugDraw;
 class btSequentialImpulseConstraintSolver : public btConstraintSolver
 {
 
+	btAlignedObjectArray<btSolverBody>	m_tmpSolverBodyPool;
+	btAlignedObjectArray<btSolverConstraint>	m_tmpSolverConstraintPool;
+	btAlignedObjectArray<btSolverConstraint>	m_tmpSolverFrictionConstraintPool;
+	btAlignedObjectArray<int>	m_orderTmpConstraintPool;
+	btAlignedObjectArray<int>	m_orderFrictionConstraintPool;
+
+
 protected:
 	btScalar solve(btRigidBody* body0,btRigidBody* body1, btManifoldPoint& cp, const btContactSolverInfo& info,int iter,btIDebugDraw* debugDrawer);
 	btScalar solveFriction(btRigidBody* body0,btRigidBody* body1, btManifoldPoint& cp, const btContactSolverInfo& info,int iter,btIDebugDraw* debugDrawer);
 	void  prepareConstraints(btPersistentManifold* manifoldPtr, const btContactSolverInfo& info,btIDebugDraw* debugDrawer);
+	void	addFrictionConstraint(const btVector3& normalAxis,int solverBodyIdA,int solverBodyIdB,int frictionIndex,btManifoldPoint& cp,const btVector3& rel_pos1,const btVector3& rel_pos2,btCollisionObject* colObj0,btCollisionObject* colObj1, btScalar relaxation);
 
 	ContactSolverFunc m_contactDispatch[MAX_CONTACT_SOLVER_TYPES][MAX_CONTACT_SOLVER_TYPES];
 	ContactSolverFunc m_frictionDispatch[MAX_CONTACT_SOLVER_TYPES][MAX_CONTACT_SOLVER_TYPES];
 
-	//choose between several modes, different friction model etc.
-	int	m_solverMode;
+	
 	///m_btSeed2 is used for re-arranging the constraint rows. improves convergence/quality of friction
 	unsigned long	m_btSeed2;
 
 public:
 
-	enum	eSolverMode
-	{
-		SOLVER_RANDMIZE_ORDER = 1,
-		SOLVER_FRICTION_SEPARATE = 2,
-		SOLVER_USE_WARMSTARTING = 4,
-		SOLVER_CACHE_FRIENDLY = 8
-	};
-
+	
 	btSequentialImpulseConstraintSolver();
 
 	///Advanced: Override the default contact solving function for contacts, for certain types of rigidbody
@@ -68,25 +69,22 @@ public:
 		m_frictionDispatch[type0][type1] = func;
 	}
 
-	virtual ~btSequentialImpulseConstraintSolver() {}
+	virtual ~btSequentialImpulseConstraintSolver();
 	
-	virtual btScalar solveGroup(btCollisionObject** bodies,int numBodies,btPersistentManifold** manifold,int numManifolds,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& info, btIDebugDraw* debugDrawer, btStackAlloc* stackAlloc);
+	virtual btScalar solveGroup(btCollisionObject** bodies,int numBodies,btPersistentManifold** manifold,int numManifolds,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& info, btIDebugDraw* debugDrawer, btStackAlloc* stackAlloc,btDispatcher* dispatcher);
 
 	virtual btScalar solveGroupCacheFriendly(btCollisionObject** bodies,int numBodies,btPersistentManifold** manifoldPtr, int numManifolds,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& infoGlobal,btIDebugDraw* debugDrawer,btStackAlloc* stackAlloc);
+	btScalar solveGroupCacheFriendlyIterations(btCollisionObject** bodies,int numBodies,btPersistentManifold** manifoldPtr, int numManifolds,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& infoGlobal,btIDebugDraw* debugDrawer,btStackAlloc* stackAlloc);
+	btScalar solveGroupCacheFriendlySetup(btCollisionObject** bodies,int numBodies,btPersistentManifold** manifoldPtr, int numManifolds,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& infoGlobal,btIDebugDraw* debugDrawer,btStackAlloc* stackAlloc);
+
+
+	///clear internal cached data and reset random seed
+	virtual	void	reset();
 
 	btScalar solveCombinedContactFriction(btRigidBody* body0,btRigidBody* body1, btManifoldPoint& cp, const btContactSolverInfo& info,int iter,btIDebugDraw* debugDrawer);
 
 
-	void	setSolverMode(int mode)
-	{
-		m_solverMode = mode;
-	}
-
-	int	getSolverMode() const
-	{
-		return m_solverMode;
-	}
-
+	
 	unsigned long btRand2();
 
 	int btRandInt2 (int n);
@@ -102,7 +100,9 @@ public:
 
 };
 
-
+#ifndef BT_PREFER_SIMD
+typedef btSequentialImpulseConstraintSolver btSequentialImpulseConstraintSolverPrefered;
+#endif
 
 
 #endif //SEQUENTIAL_IMPULSE_CONSTRAINT_SOLVER_H
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp
new file mode 100644
index 00000000000..e7f07a428eb
--- /dev/null
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp
@@ -0,0 +1,414 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+/*
+Added by Roman Ponomarev (rponom@gmail.com)
+April 04, 2008
+*/
+
+//-----------------------------------------------------------------------------
+
+#include "btSliderConstraint.h"
+#include "BulletDynamics/Dynamics/btRigidBody.h"
+#include "LinearMath/btTransformUtil.h"
+#include <new>
+
+//-----------------------------------------------------------------------------
+
+void btSliderConstraint::initParams()
+{
+    m_lowerLinLimit = btScalar(1.0);
+    m_upperLinLimit = btScalar(-1.0);
+    m_lowerAngLimit = btScalar(0.);
+    m_upperAngLimit = btScalar(0.);
+	m_softnessDirLin = SLIDER_CONSTRAINT_DEF_SOFTNESS;
+	m_restitutionDirLin = SLIDER_CONSTRAINT_DEF_RESTITUTION;
+	m_dampingDirLin = btScalar(0.);
+	m_softnessDirAng = SLIDER_CONSTRAINT_DEF_SOFTNESS;
+	m_restitutionDirAng = SLIDER_CONSTRAINT_DEF_RESTITUTION;
+	m_dampingDirAng = btScalar(0.);
+	m_softnessOrthoLin = SLIDER_CONSTRAINT_DEF_SOFTNESS;
+	m_restitutionOrthoLin = SLIDER_CONSTRAINT_DEF_RESTITUTION;
+	m_dampingOrthoLin = SLIDER_CONSTRAINT_DEF_DAMPING;
+	m_softnessOrthoAng = SLIDER_CONSTRAINT_DEF_SOFTNESS;
+	m_restitutionOrthoAng = SLIDER_CONSTRAINT_DEF_RESTITUTION;
+	m_dampingOrthoAng = SLIDER_CONSTRAINT_DEF_DAMPING;
+	m_softnessLimLin = SLIDER_CONSTRAINT_DEF_SOFTNESS;
+	m_restitutionLimLin = SLIDER_CONSTRAINT_DEF_RESTITUTION;
+	m_dampingLimLin = SLIDER_CONSTRAINT_DEF_DAMPING;
+	m_softnessLimAng = SLIDER_CONSTRAINT_DEF_SOFTNESS;
+	m_restitutionLimAng = SLIDER_CONSTRAINT_DEF_RESTITUTION;
+	m_dampingLimAng = SLIDER_CONSTRAINT_DEF_DAMPING;
+
+	m_poweredLinMotor = false;
+    m_targetLinMotorVelocity = btScalar(0.);
+    m_maxLinMotorForce = btScalar(0.);
+	m_accumulatedLinMotorImpulse = btScalar(0.0);
+
+	m_poweredAngMotor = false;
+    m_targetAngMotorVelocity = btScalar(0.);
+    m_maxAngMotorForce = btScalar(0.);
+	m_accumulatedAngMotorImpulse = btScalar(0.0);
+
+} // btSliderConstraint::initParams()
+
+//-----------------------------------------------------------------------------
+
+btSliderConstraint::btSliderConstraint()
+        :btTypedConstraint(SLIDER_CONSTRAINT_TYPE),
+		m_useLinearReferenceFrameA(true)
+{
+	initParams();
+} // btSliderConstraint::btSliderConstraint()
+
+//-----------------------------------------------------------------------------
+
+btSliderConstraint::btSliderConstraint(btRigidBody& rbA, btRigidBody& rbB, const btTransform& frameInA, const btTransform& frameInB, bool useLinearReferenceFrameA)
+        : btTypedConstraint(SLIDER_CONSTRAINT_TYPE, rbA, rbB)
+        , m_frameInA(frameInA)
+        , m_frameInB(frameInB),
+		m_useLinearReferenceFrameA(useLinearReferenceFrameA)
+{
+	initParams();
+} // btSliderConstraint::btSliderConstraint()
+
+//-----------------------------------------------------------------------------
+
+void btSliderConstraint::buildJacobian()
+{
+	if(m_useLinearReferenceFrameA)
+	{
+		buildJacobianInt(m_rbA, m_rbB, m_frameInA, m_frameInB);
+	}
+	else
+	{
+		buildJacobianInt(m_rbB, m_rbA, m_frameInB, m_frameInA);
+	}
+} // btSliderConstraint::buildJacobian()
+
+//-----------------------------------------------------------------------------
+
+void btSliderConstraint::buildJacobianInt(btRigidBody& rbA, btRigidBody& rbB, const btTransform& frameInA, const btTransform& frameInB)
+{
+	//calculate transforms
+    m_calculatedTransformA = rbA.getCenterOfMassTransform() * frameInA;
+    m_calculatedTransformB = rbB.getCenterOfMassTransform() * frameInB;
+	m_realPivotAInW = m_calculatedTransformA.getOrigin();
+	m_realPivotBInW = m_calculatedTransformB.getOrigin();
+	m_sliderAxis = m_calculatedTransformA.getBasis().getColumn(0); // along X
+	m_delta = m_realPivotBInW - m_realPivotAInW;
+	m_projPivotInW = m_realPivotAInW + m_sliderAxis.dot(m_delta) * m_sliderAxis;
+	m_relPosA = m_projPivotInW - rbA.getCenterOfMassPosition();
+	m_relPosB = m_realPivotBInW - rbB.getCenterOfMassPosition();
+    btVector3 normalWorld;
+    int i;
+    //linear part
+    for(i = 0; i < 3; i++)
+    {
+		normalWorld = m_calculatedTransformA.getBasis().getColumn(i);
+		new (&m_jacLin[i]) btJacobianEntry(
+			rbA.getCenterOfMassTransform().getBasis().transpose(),
+			rbB.getCenterOfMassTransform().getBasis().transpose(),
+			m_relPosA,
+			m_relPosB,
+			normalWorld,
+			rbA.getInvInertiaDiagLocal(),
+			rbA.getInvMass(),
+			rbB.getInvInertiaDiagLocal(),
+			rbB.getInvMass()
+			);
+		m_jacLinDiagABInv[i] = btScalar(1.) / m_jacLin[i].getDiagonal();
+		m_depth[i] = m_delta.dot(normalWorld);
+    }
+	testLinLimits();
+    // angular part
+    for(i = 0; i < 3; i++)
+    {
+		normalWorld = m_calculatedTransformA.getBasis().getColumn(i);
+		new (&m_jacAng[i])	btJacobianEntry(
+			normalWorld,
+            rbA.getCenterOfMassTransform().getBasis().transpose(),
+            rbB.getCenterOfMassTransform().getBasis().transpose(),
+            rbA.getInvInertiaDiagLocal(),
+            rbB.getInvInertiaDiagLocal()
+			);
+	}
+	testAngLimits();
+	btVector3 axisA = m_calculatedTransformA.getBasis().getColumn(0);
+	m_kAngle = btScalar(1.0 )/ (rbA.computeAngularImpulseDenominator(axisA) + rbB.computeAngularImpulseDenominator(axisA));
+	// clear accumulator for motors
+	m_accumulatedLinMotorImpulse = btScalar(0.0);
+	m_accumulatedAngMotorImpulse = btScalar(0.0);
+} // btSliderConstraint::buildJacobianInt()
+
+//-----------------------------------------------------------------------------
+
+void btSliderConstraint::solveConstraint(btScalar timeStep)
+{
+    m_timeStep = timeStep;
+	if(m_useLinearReferenceFrameA)
+	{
+		solveConstraintInt(m_rbA, m_rbB);
+	}
+	else
+	{
+		solveConstraintInt(m_rbB, m_rbA);
+	}
+} // btSliderConstraint::solveConstraint()
+
+//-----------------------------------------------------------------------------
+
+void btSliderConstraint::solveConstraintInt(btRigidBody& rbA, btRigidBody& rbB)
+{
+    int i;
+    // linear
+    btVector3 velA = rbA.getVelocityInLocalPoint(m_relPosA);
+    btVector3 velB = rbB.getVelocityInLocalPoint(m_relPosB);
+    btVector3 vel = velA - velB;
+	for(i = 0; i < 3; i++)
+    {
+		const btVector3& normal = m_jacLin[i].m_linearJointAxis;
+		btScalar rel_vel = normal.dot(vel);
+		// calculate positional error
+		btScalar depth = m_depth[i];
+		// get parameters
+		btScalar softness = (i) ? m_softnessOrthoLin : (m_solveLinLim ? m_softnessLimLin : m_softnessDirLin);
+		btScalar restitution = (i) ? m_restitutionOrthoLin : (m_solveLinLim ? m_restitutionLimLin : m_restitutionDirLin);
+		btScalar damping = (i) ? m_dampingOrthoLin : (m_solveLinLim ? m_dampingLimLin : m_dampingDirLin);
+		// calcutate and apply impulse
+		btScalar normalImpulse = softness * (restitution * depth / m_timeStep - damping * rel_vel) * m_jacLinDiagABInv[i];
+		btVector3 impulse_vector = normal * normalImpulse;
+		rbA.applyImpulse( impulse_vector, m_relPosA);
+		rbB.applyImpulse(-impulse_vector, m_relPosB);
+		if(m_poweredLinMotor && (!i))
+		{ // apply linear motor
+			if(m_accumulatedLinMotorImpulse < m_maxLinMotorForce)
+			{
+				btScalar desiredMotorVel = m_targetLinMotorVelocity;
+				btScalar motor_relvel = desiredMotorVel + rel_vel;
+				normalImpulse = -motor_relvel * m_jacLinDiagABInv[i];
+				// clamp accumulated impulse
+				btScalar new_acc = m_accumulatedLinMotorImpulse + btFabs(normalImpulse);
+				if(new_acc  > m_maxLinMotorForce)
+				{
+					new_acc = m_maxLinMotorForce;
+				}
+				btScalar del = new_acc  - m_accumulatedLinMotorImpulse;
+				if(normalImpulse < btScalar(0.0))
+				{
+					normalImpulse = -del;
+				}
+				else
+				{
+					normalImpulse = del;
+				}
+				m_accumulatedLinMotorImpulse = new_acc;
+				// apply clamped impulse
+				impulse_vector = normal * normalImpulse;
+				rbA.applyImpulse( impulse_vector, m_relPosA);
+				rbB.applyImpulse(-impulse_vector, m_relPosB);
+			}
+		}
+    }
+	// angular 
+	// get axes in world space
+	btVector3 axisA =  m_calculatedTransformA.getBasis().getColumn(0);
+	btVector3 axisB =  m_calculatedTransformB.getBasis().getColumn(0);
+
+	const btVector3& angVelA = rbA.getAngularVelocity();
+	const btVector3& angVelB = rbB.getAngularVelocity();
+
+	btVector3 angVelAroundAxisA = axisA * axisA.dot(angVelA);
+	btVector3 angVelAroundAxisB = axisB * axisB.dot(angVelB);
+
+	btVector3 angAorthog = angVelA - angVelAroundAxisA;
+	btVector3 angBorthog = angVelB - angVelAroundAxisB;
+	btVector3 velrelOrthog = angAorthog-angBorthog;
+	//solve orthogonal angular velocity correction
+	btScalar len = velrelOrthog.length();
+	if (len > btScalar(0.00001))
+	{
+		btVector3 normal = velrelOrthog.normalized();
+		btScalar denom = rbA.computeAngularImpulseDenominator(normal) + rbB.computeAngularImpulseDenominator(normal);
+		velrelOrthog *= (btScalar(1.)/denom) * m_dampingOrthoAng * m_softnessOrthoAng;
+	}
+	//solve angular positional correction
+	btVector3 angularError = axisA.cross(axisB) *(btScalar(1.)/m_timeStep);
+	btScalar len2 = angularError.length();
+	if (len2>btScalar(0.00001))
+	{
+		btVector3 normal2 = angularError.normalized();
+		btScalar denom2 = rbA.computeAngularImpulseDenominator(normal2) + rbB.computeAngularImpulseDenominator(normal2);
+		angularError *= (btScalar(1.)/denom2) * m_restitutionOrthoAng * m_softnessOrthoAng;
+	}
+	// apply impulse
+	rbA.applyTorqueImpulse(-velrelOrthog+angularError);
+	rbB.applyTorqueImpulse(velrelOrthog-angularError);
+	btScalar impulseMag;
+	//solve angular limits
+	if(m_solveAngLim)
+	{
+		impulseMag = (angVelB - angVelA).dot(axisA) * m_dampingLimAng + m_angDepth * m_restitutionLimAng / m_timeStep;
+		impulseMag *= m_kAngle * m_softnessLimAng;
+	}
+	else
+	{
+		impulseMag = (angVelB - angVelA).dot(axisA) * m_dampingDirAng + m_angDepth * m_restitutionDirAng / m_timeStep;
+		impulseMag *= m_kAngle * m_softnessDirAng;
+	}
+	btVector3 impulse = axisA * impulseMag;
+	rbA.applyTorqueImpulse(impulse);
+	rbB.applyTorqueImpulse(-impulse);
+	//apply angular motor
+	if(m_poweredAngMotor) 
+	{
+		if(m_accumulatedAngMotorImpulse < m_maxAngMotorForce)
+		{
+			btVector3 velrel = angVelAroundAxisA - angVelAroundAxisB;
+			btScalar projRelVel = velrel.dot(axisA);
+
+			btScalar desiredMotorVel = m_targetAngMotorVelocity;
+			btScalar motor_relvel = desiredMotorVel - projRelVel;
+
+			btScalar angImpulse = m_kAngle * motor_relvel;
+			// clamp accumulated impulse
+			btScalar new_acc = m_accumulatedAngMotorImpulse + btFabs(angImpulse);
+			if(new_acc  > m_maxAngMotorForce)
+			{
+				new_acc = m_maxAngMotorForce;
+			}
+			btScalar del = new_acc  - m_accumulatedAngMotorImpulse;
+			if(angImpulse < btScalar(0.0))
+			{
+				angImpulse = -del;
+			}
+			else
+			{
+				angImpulse = del;
+			}
+			m_accumulatedAngMotorImpulse = new_acc;
+			// apply clamped impulse
+			btVector3 motorImp = angImpulse * axisA;
+			m_rbA.applyTorqueImpulse(motorImp);
+			m_rbB.applyTorqueImpulse(-motorImp);
+		}
+	}
+} // btSliderConstraint::solveConstraint()
+
+//-----------------------------------------------------------------------------
+
+//-----------------------------------------------------------------------------
+
+void btSliderConstraint::calculateTransforms(void){
+	if(m_useLinearReferenceFrameA)
+	{
+		m_calculatedTransformA = m_rbA.getCenterOfMassTransform() * m_frameInA;
+		m_calculatedTransformB = m_rbB.getCenterOfMassTransform() * m_frameInB;
+	}
+	else
+	{
+		m_calculatedTransformA = m_rbB.getCenterOfMassTransform() * m_frameInB;
+		m_calculatedTransformB = m_rbA.getCenterOfMassTransform() * m_frameInA;
+	}
+	m_realPivotAInW = m_calculatedTransformA.getOrigin();
+	m_realPivotBInW = m_calculatedTransformB.getOrigin();
+	m_sliderAxis = m_calculatedTransformA.getBasis().getColumn(0); // along X
+	m_delta = m_realPivotBInW - m_realPivotAInW;
+	m_projPivotInW = m_realPivotAInW + m_sliderAxis.dot(m_delta) * m_sliderAxis;
+    btVector3 normalWorld;
+    int i;
+    //linear part
+    for(i = 0; i < 3; i++)
+    {
+		normalWorld = m_calculatedTransformA.getBasis().getColumn(i);
+		m_depth[i] = m_delta.dot(normalWorld);
+    }
+} // btSliderConstraint::calculateTransforms()
+ 
+//-----------------------------------------------------------------------------
+
+void btSliderConstraint::testLinLimits(void)
+{
+	m_solveLinLim = false;
+	if(m_lowerLinLimit <= m_upperLinLimit)
+	{
+		if(m_depth[0] > m_upperLinLimit)
+		{
+			m_depth[0] -= m_upperLinLimit;
+			m_solveLinLim = true;
+		}
+		else if(m_depth[0] < m_lowerLinLimit)
+		{
+			m_depth[0] -= m_lowerLinLimit;
+			m_solveLinLim = true;
+		}
+		else
+		{
+			m_depth[0] = btScalar(0.);
+		}
+	}
+	else
+	{
+		m_depth[0] = btScalar(0.);
+	}
+} // btSliderConstraint::testLinLimits()
+
+//-----------------------------------------------------------------------------
+ 
+
+void btSliderConstraint::testAngLimits(void)
+{
+	m_angDepth = btScalar(0.);
+	m_solveAngLim = false;
+	if(m_lowerAngLimit <= m_upperAngLimit)
+	{
+		const btVector3 axisA0 = m_calculatedTransformA.getBasis().getColumn(1);
+		const btVector3 axisA1 = m_calculatedTransformA.getBasis().getColumn(2);
+		const btVector3 axisB0 = m_calculatedTransformB.getBasis().getColumn(1);
+		btScalar rot = btAtan2Fast(axisB0.dot(axisA1), axisB0.dot(axisA0));  
+		if(rot < m_lowerAngLimit)
+		{
+			m_angDepth = rot - m_lowerAngLimit;
+			m_solveAngLim = true;
+		} 
+		else if(rot > m_upperAngLimit)
+		{
+			m_angDepth = rot - m_upperAngLimit;
+			m_solveAngLim = true;
+		}
+	}
+} // btSliderConstraint::testAngLimits()
+
+	
+//-----------------------------------------------------------------------------
+
+
+
+btVector3 btSliderConstraint::getAncorInA(void)
+{
+	btVector3 ancorInA;
+	ancorInA = m_realPivotAInW + (m_lowerLinLimit + m_upperLinLimit) * btScalar(0.5) * m_sliderAxis;
+	ancorInA = m_rbA.getCenterOfMassTransform().inverse() * ancorInA;
+	return ancorInA;
+} // btSliderConstraint::getAncorInA()
+
+//-----------------------------------------------------------------------------
+
+btVector3 btSliderConstraint::getAncorInB(void)
+{
+	btVector3 ancorInB;
+	ancorInB = m_frameInB.getOrigin();
+	return ancorInB;
+} // btSliderConstraint::getAncorInB();
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h
new file mode 100644
index 00000000000..f69dfcf3aa7
--- /dev/null
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h
@@ -0,0 +1,215 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+/*
+Added by Roman Ponomarev (rponom@gmail.com)
+April 04, 2008
+
+TODO:
+ - add clamping od accumulated impulse to improve stability
+ - add conversion for ODE constraint solver
+*/
+
+#ifndef SLIDER_CONSTRAINT_H
+#define SLIDER_CONSTRAINT_H
+
+//-----------------------------------------------------------------------------
+
+#include "LinearMath/btVector3.h"
+#include "btJacobianEntry.h"
+#include "btTypedConstraint.h"
+
+//-----------------------------------------------------------------------------
+
+class btRigidBody;
+
+//-----------------------------------------------------------------------------
+
+#define SLIDER_CONSTRAINT_DEF_SOFTNESS		(btScalar(1.0))
+#define SLIDER_CONSTRAINT_DEF_DAMPING		(btScalar(1.0))
+#define SLIDER_CONSTRAINT_DEF_RESTITUTION	(btScalar(0.7))
+
+//-----------------------------------------------------------------------------
+
+class btSliderConstraint : public btTypedConstraint
+{
+protected:
+	btTransform	m_frameInA;
+    btTransform	m_frameInB;
+	// use frameA fo define limits, if true
+	bool m_useLinearReferenceFrameA;
+	// linear limits
+	btScalar m_lowerLinLimit;
+	btScalar m_upperLinLimit;
+	// angular limits
+	btScalar m_lowerAngLimit;
+	btScalar m_upperAngLimit;
+	// softness, restitution and damping for different cases
+	// DirLin - moving inside linear limits
+	// LimLin - hitting linear limit
+	// DirAng - moving inside angular limits
+	// LimAng - hitting angular limit
+	// OrthoLin, OrthoAng - against constraint axis
+	btScalar m_softnessDirLin;
+	btScalar m_restitutionDirLin;
+	btScalar m_dampingDirLin;
+	btScalar m_softnessDirAng;
+	btScalar m_restitutionDirAng;
+	btScalar m_dampingDirAng;
+	btScalar m_softnessLimLin;
+	btScalar m_restitutionLimLin;
+	btScalar m_dampingLimLin;
+	btScalar m_softnessLimAng;
+	btScalar m_restitutionLimAng;
+	btScalar m_dampingLimAng;
+	btScalar m_softnessOrthoLin;
+	btScalar m_restitutionOrthoLin;
+	btScalar m_dampingOrthoLin;
+	btScalar m_softnessOrthoAng;
+	btScalar m_restitutionOrthoAng;
+	btScalar m_dampingOrthoAng;
+	
+	// for interlal use
+	bool m_solveLinLim;
+	bool m_solveAngLim;
+
+	btJacobianEntry	m_jacLin[3];
+	btScalar		m_jacLinDiagABInv[3];
+
+    btJacobianEntry	m_jacAng[3];
+
+	btScalar m_timeStep;
+    btTransform m_calculatedTransformA;
+    btTransform m_calculatedTransformB;
+
+	btVector3 m_sliderAxis;
+	btVector3 m_realPivotAInW;
+	btVector3 m_realPivotBInW;
+	btVector3 m_projPivotInW;
+	btVector3 m_delta;
+	btVector3 m_depth;
+	btVector3 m_relPosA;
+	btVector3 m_relPosB;
+
+	btScalar m_angDepth;
+	btScalar m_kAngle;
+
+	bool	 m_poweredLinMotor;
+    btScalar m_targetLinMotorVelocity;
+    btScalar m_maxLinMotorForce;
+    btScalar m_accumulatedLinMotorImpulse;
+	
+	bool	 m_poweredAngMotor;
+    btScalar m_targetAngMotorVelocity;
+    btScalar m_maxAngMotorForce;
+    btScalar m_accumulatedAngMotorImpulse;
+
+	//------------------------    
+	void initParams();
+public:
+	// constructors
+    btSliderConstraint(btRigidBody& rbA, btRigidBody& rbB, const btTransform& frameInA, const btTransform& frameInB ,bool useLinearReferenceFrameA);
+    btSliderConstraint();
+	// overrides
+    virtual void	buildJacobian();
+    virtual	void	solveConstraint(btScalar	timeStep);
+	// access
+    const btRigidBody& getRigidBodyA() const { return m_rbA; }
+    const btRigidBody& getRigidBodyB() const { return m_rbB; }
+    const btTransform & getCalculatedTransformA() const { return m_calculatedTransformA; }
+    const btTransform & getCalculatedTransformB() const { return m_calculatedTransformB; }
+    const btTransform & getFrameOffsetA() const { return m_frameInA; }
+    const btTransform & getFrameOffsetB() const { return m_frameInB; }
+    btTransform & getFrameOffsetA() { return m_frameInA; }
+    btTransform & getFrameOffsetB() { return m_frameInB; }
+    btScalar getLowerLinLimit() { return m_lowerLinLimit; }
+    void setLowerLinLimit(btScalar lowerLimit) { m_lowerLinLimit = lowerLimit; }
+    btScalar getUpperLinLimit() { return m_upperLinLimit; }
+    void setUpperLinLimit(btScalar upperLimit) { m_upperLinLimit = upperLimit; }
+    btScalar getLowerAngLimit() { return m_lowerAngLimit; }
+    void setLowerAngLimit(btScalar lowerLimit) { m_lowerAngLimit = lowerLimit; }
+    btScalar getUpperAngLimit() { return m_upperAngLimit; }
+    void setUpperAngLimit(btScalar upperLimit) { m_upperAngLimit = upperLimit; }
+	bool getUseLinearReferenceFrameA() { return m_useLinearReferenceFrameA; }
+	btScalar getSoftnessDirLin() { return m_softnessDirLin; }
+	btScalar getRestitutionDirLin() { return m_restitutionDirLin; }
+	btScalar getDampingDirLin() { return m_dampingDirLin ; }
+	btScalar getSoftnessDirAng() { return m_softnessDirAng; }
+	btScalar getRestitutionDirAng() { return m_restitutionDirAng; }
+	btScalar getDampingDirAng() { return m_dampingDirAng; }
+	btScalar getSoftnessLimLin() { return m_softnessLimLin; }
+	btScalar getRestitutionLimLin() { return m_restitutionLimLin; }
+	btScalar getDampingLimLin() { return m_dampingLimLin; }
+	btScalar getSoftnessLimAng() { return m_softnessLimAng; }
+	btScalar getRestitutionLimAng() { return m_restitutionLimAng; }
+	btScalar getDampingLimAng() { return m_dampingLimAng; }
+	btScalar getSoftnessOrthoLin() { return m_softnessOrthoLin; }
+	btScalar getRestitutionOrthoLin() { return m_restitutionOrthoLin; }
+	btScalar getDampingOrthoLin() { return m_dampingOrthoLin; }
+	btScalar getSoftnessOrthoAng() { return m_softnessOrthoAng; }
+	btScalar getRestitutionOrthoAng() { return m_restitutionOrthoAng; }
+	btScalar getDampingOrthoAng() { return m_dampingOrthoAng; }
+	void setSoftnessDirLin(btScalar softnessDirLin) { m_softnessDirLin = softnessDirLin; }
+	void setRestitutionDirLin(btScalar restitutionDirLin) { m_restitutionDirLin = restitutionDirLin; }
+	void setDampingDirLin(btScalar dampingDirLin) { m_dampingDirLin = dampingDirLin; }
+	void setSoftnessDirAng(btScalar softnessDirAng) { m_softnessDirAng = softnessDirAng; }
+	void setRestitutionDirAng(btScalar restitutionDirAng) { m_restitutionDirAng = restitutionDirAng; }
+	void setDampingDirAng(btScalar dampingDirAng) { m_dampingDirAng = dampingDirAng; }
+	void setSoftnessLimLin(btScalar softnessLimLin) { m_softnessLimLin = softnessLimLin; }
+	void setRestitutionLimLin(btScalar restitutionLimLin) { m_restitutionLimLin = restitutionLimLin; }
+	void setDampingLimLin(btScalar dampingLimLin) { m_dampingLimLin = dampingLimLin; }
+	void setSoftnessLimAng(btScalar softnessLimAng) { m_softnessLimAng = softnessLimAng; }
+	void setRestitutionLimAng(btScalar restitutionLimAng) { m_restitutionLimAng = restitutionLimAng; }
+	void setDampingLimAng(btScalar dampingLimAng) { m_dampingLimAng = dampingLimAng; }
+	void setSoftnessOrthoLin(btScalar softnessOrthoLin) { m_softnessOrthoLin = softnessOrthoLin; }
+	void setRestitutionOrthoLin(btScalar restitutionOrthoLin) { m_restitutionOrthoLin = restitutionOrthoLin; }
+	void setDampingOrthoLin(btScalar dampingOrthoLin) { m_dampingOrthoLin = dampingOrthoLin; }
+	void setSoftnessOrthoAng(btScalar softnessOrthoAng) { m_softnessOrthoAng = softnessOrthoAng; }
+	void setRestitutionOrthoAng(btScalar restitutionOrthoAng) { m_restitutionOrthoAng = restitutionOrthoAng; }
+	void setDampingOrthoAng(btScalar dampingOrthoAng) { m_dampingOrthoAng = dampingOrthoAng; }
+	void setPoweredLinMotor(bool onOff) { m_poweredLinMotor = onOff; }
+	bool getPoweredLinMotor() { return m_poweredLinMotor; }
+	void setTargetLinMotorVelocity(btScalar targetLinMotorVelocity) { m_targetLinMotorVelocity = targetLinMotorVelocity; }
+	btScalar getTargetLinMotorVelocity() { return m_targetLinMotorVelocity; }
+	void setMaxLinMotorForce(btScalar maxLinMotorForce) { m_maxLinMotorForce = maxLinMotorForce; }
+	btScalar getMaxLinMotorForce() { return m_maxLinMotorForce; }
+	void setPoweredAngMotor(bool onOff) { m_poweredAngMotor = onOff; }
+	bool getPoweredAngMotor() { return m_poweredAngMotor; }
+	void setTargetAngMotorVelocity(btScalar targetAngMotorVelocity) { m_targetAngMotorVelocity = targetAngMotorVelocity; }
+	btScalar getTargetAngMotorVelocity() { return m_targetAngMotorVelocity; }
+	void setMaxAngMotorForce(btScalar maxAngMotorForce) { m_maxAngMotorForce = maxAngMotorForce; }
+	btScalar getMaxAngMotorForce() { return m_maxAngMotorForce; }
+
+	// access for ODE solver
+	bool getSolveLinLimit() { return m_solveLinLim; }
+	btScalar getLinDepth() { return m_depth[0]; }
+	bool getSolveAngLimit() { return m_solveAngLim; }
+	btScalar getAngDepth() { return m_angDepth; }
+	// internal
+    void	buildJacobianInt(btRigidBody& rbA, btRigidBody& rbB, const btTransform& frameInA, const btTransform& frameInB);
+    void	solveConstraintInt(btRigidBody& rbA, btRigidBody& rbB);
+	// shared code used by ODE solver
+	void	calculateTransforms(void);
+	void	testLinLimits(void);
+	void	testAngLimits(void);
+	// access for PE Solver
+	btVector3 getAncorInA(void);
+	btVector3 getAncorInB(void);
+};
+
+//-----------------------------------------------------------------------------
+
+#endif //SLIDER_CONSTRAINT_H
+
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h
index e7d26645c6a..057d3fac827 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h
@@ -16,8 +16,8 @@ subject to the following restrictions:
 #ifndef SOLVE_2LINEAR_CONSTRAINT_H
 #define SOLVE_2LINEAR_CONSTRAINT_H
 
-#include "../../LinearMath/btMatrix3x3.h"
-#include "../../LinearMath/btVector3.h"
+#include "LinearMath/btMatrix3x3.h"
+#include "LinearMath/btVector3.h"
 
 
 class btRigidBody;
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverBody.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverBody.h
index 0ab536f42b3..b3f0c9d7444 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverBody.h
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverBody.h
@@ -19,38 +19,78 @@ subject to the following restrictions:
 class	btRigidBody;
 #include "LinearMath/btVector3.h"
 #include "LinearMath/btMatrix3x3.h"
+#include "BulletDynamics/Dynamics/btRigidBody.h"
+#include "LinearMath/btAlignedAllocator.h"
+#include "LinearMath/btTransformUtil.h"
 
 
-
-
+///btSolverBody is an internal datastructure for the constraint solver. Only necessary data is packed to increase cache coherence/performance.
 ATTRIBUTE_ALIGNED16 (struct)	btSolverBody
 {
-	btVector3		m_centerOfMassPosition;
-	btVector3		m_linearVelocity;
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+	
 	btVector3		m_angularVelocity;
-	btRigidBody*	m_originalBody;
+	float			m_angularFactor;
 	float			m_invMass;
 	float			m_friction;
-	float			m_angularFactor;
-
-	inline void	getVelocityInLocalPoint(const btVector3& rel_pos, btVector3& velocity ) const
+	btRigidBody*	m_originalBody;
+	btVector3		m_linearVelocity;
+	btVector3		m_centerOfMassPosition;
+	
+	btVector3		m_pushVelocity;
+	btVector3		m_turnVelocity;
+	
+	
+	SIMD_FORCE_INLINE void	getVelocityInLocalPoint(const btVector3& rel_pos, btVector3& velocity ) const
 	{
 		velocity = m_linearVelocity + m_angularVelocity.cross(rel_pos);
 	}
 
 	//Optimization for the iterative solver: avoid calculating constant terms involving inertia, normal, relative position
-	inline void internalApplyImpulse(const btVector3& linearComponent, const btVector3& angularComponent,btScalar impulseMagnitude)
+	SIMD_FORCE_INLINE void internalApplyImpulse(const btVector3& linearComponent, const btVector3& angularComponent,btScalar impulseMagnitude)
 	{
-		m_linearVelocity += linearComponent*impulseMagnitude;
-		m_angularVelocity += angularComponent*impulseMagnitude*m_angularFactor;
+		if (m_invMass)
+		{
+			m_linearVelocity += linearComponent*impulseMagnitude;
+			m_angularVelocity += angularComponent*(impulseMagnitude*m_angularFactor);
+		}
+	}
+	
+	SIMD_FORCE_INLINE void internalApplyPushImpulse(const btVector3& linearComponent, const btVector3& angularComponent,btScalar impulseMagnitude)
+	{
+		if (m_invMass)
+		{
+			m_pushVelocity += linearComponent*impulseMagnitude;
+			m_turnVelocity += angularComponent*(impulseMagnitude*m_angularFactor);
+		}
 	}
 
+	
 	void	writebackVelocity()
 	{
 		if (m_invMass)
 		{
 			m_originalBody->setLinearVelocity(m_linearVelocity);
 			m_originalBody->setAngularVelocity(m_angularVelocity);
+			
+			//m_originalBody->setCompanionId(-1);
+		}
+	}
+	
+
+	void	writebackVelocity(btScalar timeStep)
+	{
+		if (m_invMass)
+		{
+			m_originalBody->setLinearVelocity(m_linearVelocity);
+			m_originalBody->setAngularVelocity(m_angularVelocity);
+			
+			//correct the position/orientation based on push/turn recovery
+			btTransform newTransform;
+			btTransformUtil::integrateTransform(m_originalBody->getWorldTransform(),m_pushVelocity,m_turnVelocity,timeStep,newTransform);
+			m_originalBody->setWorldTransform(newTransform);
+			
+			//m_originalBody->setCompanionId(-1);
 		}
 	}
 
@@ -69,3 +109,5 @@ ATTRIBUTE_ALIGNED16 (struct)	btSolverBody
 };
 
 #endif //BT_SOLVER_BODY_H
+
+
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h
index f1f40ffdf19..2c71360c5b9 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h
@@ -1,5 +1,3 @@
-
-
 /*
 Bullet Continuous Collision Detection and Physics Library
 Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
@@ -27,24 +25,34 @@ class	btRigidBody;
 ///1D constraint along a normal axis between bodyA and bodyB. It can be combined to solve contact and friction constraints.
 ATTRIBUTE_ALIGNED16 (struct)	btSolverConstraint
 {
+	BT_DECLARE_ALIGNED_ALLOCATOR();
+
 	btVector3	m_relpos1CrossNormal;
-	btVector3	m_relpos2CrossNormal;
 	btVector3	m_contactNormal;
+
+	btVector3	m_relpos2CrossNormal;
 	btVector3	m_angularComponentA;
+
 	btVector3	m_angularComponentB;
 
-	btScalar	m_appliedVelocityImpulse;
+	mutable btScalar	m_appliedPushImpulse;
+	
+	mutable btScalar	m_appliedImpulse;
 	int			m_solverBodyIdA;
 	int			m_solverBodyIdB;
+	
 	btScalar	m_friction;
 	btScalar	m_restitution;
 	btScalar	m_jacDiagABInv;
 	btScalar	m_penetration;
-	btScalar	m_appliedImpulse;
+	
 
+	
 	int			m_constraintType;
 	int			m_frictionIndex;
-	int			m_unusedPadding[2];
+	void*		m_originalContactPoint;
+	int			m_unusedPadding[1];
+
 
 	enum		btSolverConstraintType
 	{
@@ -61,3 +69,4 @@ ATTRIBUTE_ALIGNED16 (struct)	btSolverConstraint
 #endif //BT_SOLVER_CONSTRAINT_H
 
 
+
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp
index a15b3e026cd..6e8b552dbbc 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp
@@ -19,18 +19,20 @@ subject to the following restrictions:
 
 static btRigidBody s_fixed(0, 0,0);
 
-btTypedConstraint::btTypedConstraint()
-: m_userConstraintType(-1),
+btTypedConstraint::btTypedConstraint(btTypedConstraintType type)
+:m_userConstraintType(-1),
 m_userConstraintId(-1),
+m_constraintType (type),
 m_rbA(s_fixed),
 m_rbB(s_fixed),
 m_appliedImpulse(btScalar(0.))
 {
 	s_fixed.setMassProps(btScalar(0.),btVector3(btScalar(0.),btScalar(0.),btScalar(0.)));
 }
-btTypedConstraint::btTypedConstraint(btRigidBody& rbA)
-: m_userConstraintType(-1),
+btTypedConstraint::btTypedConstraint(btTypedConstraintType type, btRigidBody& rbA)
+:m_userConstraintType(-1),
 m_userConstraintId(-1),
+m_constraintType (type),
 m_rbA(rbA),
 m_rbB(s_fixed),
 m_appliedImpulse(btScalar(0.))
@@ -40,9 +42,10 @@ m_appliedImpulse(btScalar(0.))
 }
 
 
-btTypedConstraint::btTypedConstraint(btRigidBody& rbA,btRigidBody& rbB)
-: m_userConstraintType(-1),
+btTypedConstraint::btTypedConstraint(btTypedConstraintType type, btRigidBody& rbA,btRigidBody& rbB)
+:m_userConstraintType(-1),
 m_userConstraintId(-1),
+m_constraintType (type),
 m_rbA(rbA),
 m_rbB(rbB),
 m_appliedImpulse(btScalar(0.))
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h
index dfee6e80d0e..c50ec6ec579 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h
@@ -17,7 +17,17 @@ subject to the following restrictions:
 #define TYPED_CONSTRAINT_H
 
 class btRigidBody;
-#include "../../LinearMath/btScalar.h"
+#include "LinearMath/btScalar.h"
+
+enum btTypedConstraintType
+{
+	POINT2POINT_CONSTRAINT_TYPE,
+	HINGE_CONSTRAINT_TYPE,
+	CONETWIST_CONSTRAINT_TYPE,
+	D6_CONSTRAINT_TYPE,
+	VEHICLE_CONSTRAINT_TYPE,
+	SLIDER_CONSTRAINT_TYPE
+};
 
 ///TypedConstraint is the baseclass for Bullet constraints and vehicles
 class btTypedConstraint
@@ -25,6 +35,8 @@ class btTypedConstraint
 	int	m_userConstraintType;
 	int	m_userConstraintId;
 
+	btTypedConstraintType m_constraintType;
+
 	btTypedConstraint&	operator=(btTypedConstraint&	other)
 	{
 		btAssert(0);
@@ -40,11 +52,11 @@ protected:
 
 public:
 
-	btTypedConstraint();
+	btTypedConstraint(btTypedConstraintType type);
 	virtual ~btTypedConstraint() {};
-	btTypedConstraint(btRigidBody& rbA);
+	btTypedConstraint(btTypedConstraintType type, btRigidBody& rbA);
 
-	btTypedConstraint(btRigidBody& rbA,btRigidBody& rbB);
+	btTypedConstraint(btTypedConstraintType type, btRigidBody& rbA,btRigidBody& rbB);
 
 	virtual void	buildJacobian() = 0;
 
@@ -59,7 +71,7 @@ public:
 		return m_rbB;
 	}
 
-	btRigidBody& getRigidBodyA()
+	btRigidBody& getRigidBodyA() 
 	{
 		return m_rbA;
 	}
@@ -83,14 +95,26 @@ public:
 		m_userConstraintId = uid;
 	}
 	
-	int getUserConstraintId()
+	int getUserConstraintId() const
 	{
 		return m_userConstraintId;
 	}
-	btScalar	getAppliedImpulse()
+
+	int getUid() const
+	{
+		return m_userConstraintId;   
+	} 
+
+	btScalar	getAppliedImpulse() const
 	{
 		return m_appliedImpulse;
 	}
+
+	btTypedConstraintType getConstraintType () const
+	{
+		return m_constraintType;
+	}
+
 };
 
 #endif //TYPED_CONSTRAINT_H
diff --git a/extern/bullet2/src/BulletDynamics/Dynamics/Bullet-C-API.cpp b/extern/bullet2/src/BulletDynamics/Dynamics/Bullet-C-API.cpp
index 248c582dcd8..b28a46e299e 100644
--- a/extern/bullet2/src/BulletDynamics/Dynamics/Bullet-C-API.cpp
+++ b/extern/bullet2/src/BulletDynamics/Dynamics/Bullet-C-API.cpp
@@ -24,97 +24,287 @@ subject to the following restrictions:
 #include "btBulletDynamicsCommon.h"
 #include "LinearMath/btAlignedAllocator.h"
 
+/*
+	Create and Delete a Physics SDK	
+*/
 
-#include "LinearMath/btVector3.h"
-#include "LinearMath/btScalar.h"	
-#include "LinearMath/btMatrix3x3.h"
-#include "LinearMath/btTransform.h"
-#include "BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h"
-#include "BulletCollision/CollisionShapes/btTriangleShape.h"
-
-#include "BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h"
-#include "BulletCollision/NarrowPhaseCollision/btPointCollector.h"
-#include "BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h"
-#include "BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h"
-#include "BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h"
-#include "BulletCollision/NarrowPhaseCollision/btGjkEpa.h"
-#include "BulletCollision/CollisionShapes/btMinkowskiSumShape.h"
-#include "BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h"
-#include "BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h"
-#include "BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h"
-
-#include "BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h"
-#include "BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h"
-#include "BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h"
-#include "BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h"
-#include "BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h"
-#include "LinearMath/btStackAlloc.h"
-
-extern "C"
-double plNearestPoints(float p1[3], float p2[3], float p3[3], float q1[3], float q2[3], float q3[3], float *pa, float *pb, float normal[3])
+struct	btPhysicsSdk
 {
-	btVector3 vp(p1[0], p1[1], p1[2]);
-	btTriangleShape trishapeA(vp, 
-				  btVector3(p2[0], p2[1], p2[2]), 
-				  btVector3(p3[0], p3[1], p3[2]));
-	trishapeA.setMargin(0.000001f);
-	btVector3 vq(q1[0], q1[1], q1[2]);
-	btTriangleShape trishapeB(vq, 
-				  btVector3(q2[0], q2[1], q2[2]), 
-				  btVector3(q3[0], q3[1], q3[2]));
-	trishapeB.setMargin(0.000001f);
-	
-	// btVoronoiSimplexSolver sGjkSimplexSolver;
-	// btGjkEpaPenetrationDepthSolver penSolverPtr;	
-	
-	static btSimplexSolverInterface sGjkSimplexSolver;
-	sGjkSimplexSolver.reset();
-	
-	static btGjkEpaPenetrationDepthSolver Solver0;
-	static btMinkowskiPenetrationDepthSolver Solver1;
-		
-	btConvexPenetrationDepthSolver* Solver = NULL;
-	
-	Solver = &Solver1;	
-		
-	btGjkPairDetector convexConvex(&trishapeA ,&trishapeB,&sGjkSimplexSolver,Solver);
-	
-	convexConvex.m_catchDegeneracies = 1;
-	
-	// btGjkPairDetector convexConvex(&trishapeA ,&trishapeB,&sGjkSimplexSolver,0);
-	
-	btPointCollector gjkOutput;
-	btGjkPairDetector::ClosestPointInput input;
-	
-	btStackAlloc gStackAlloc(1024*1024*2);
- 
-	input.m_stackAlloc = &gStackAlloc;
-	
-	btTransform tr;
-	tr.setIdentity();
-	
-	input.m_transformA = tr;
-	input.m_transformB = tr;
-	
-	convexConvex.getClosestPoints(input, gjkOutput, 0);
-	
-	
-	if (gjkOutput.m_hasResult)
+
+//	btDispatcher*				m_dispatcher;
+//	btOverlappingPairCache*		m_pairCache;
+//	btConstraintSolver*			m_constraintSolver
+
+	btVector3	m_worldAabbMin;
+	btVector3	m_worldAabbMax;
+
+
+	//todo: version, hardware/optimization settings etc?
+	btPhysicsSdk()
+		:m_worldAabbMin(-1000,-1000,-1000),
+		m_worldAabbMax(1000,1000,1000)
 	{
-		
-		pb[0] = pa[0] = gjkOutput.m_pointInWorld[0];
-		pb[1] = pa[1] = gjkOutput.m_pointInWorld[1];
-		pb[2] = pa[2] = gjkOutput.m_pointInWorld[2];
 
-		pb[0]+= gjkOutput.m_normalOnBInWorld[0] * gjkOutput.m_distance;
-		pb[1]+= gjkOutput.m_normalOnBInWorld[1] * gjkOutput.m_distance;
-		pb[2]+= gjkOutput.m_normalOnBInWorld[2] * gjkOutput.m_distance;
-		
-		normal[0] = gjkOutput.m_normalOnBInWorld[0];
-		normal[1] = gjkOutput.m_normalOnBInWorld[1];
-		normal[2] = gjkOutput.m_normalOnBInWorld[2];
-
-		return gjkOutput.m_distance;
 	}
-	return -1.0f;	
+
+	
+};
+
+plPhysicsSdkHandle	plNewBulletSdk()
+{
+	void* mem = btAlignedAlloc(sizeof(btPhysicsSdk),16);
+	return (plPhysicsSdkHandle)new (mem)btPhysicsSdk;
 }
+
+void		plDeletePhysicsSdk(plPhysicsSdkHandle	physicsSdk)
+{
+	btPhysicsSdk* phys = reinterpret_cast<btPhysicsSdk*>(physicsSdk);
+	btAlignedFree(phys);	
+}
+
+
+/* Dynamics World */
+plDynamicsWorldHandle plCreateDynamicsWorld(plPhysicsSdkHandle physicsSdkHandle)
+{
+	btPhysicsSdk* physicsSdk = reinterpret_cast<btPhysicsSdk*>(physicsSdkHandle);
+	void* mem = btAlignedAlloc(sizeof(btDefaultCollisionConfiguration),16);
+	btDefaultCollisionConfiguration* collisionConfiguration = new (mem)btDefaultCollisionConfiguration();
+	mem = btAlignedAlloc(sizeof(btCollisionDispatcher),16);
+	btDispatcher*				dispatcher = new (mem)btCollisionDispatcher(collisionConfiguration);
+	mem = btAlignedAlloc(sizeof(btAxisSweep3),16);
+	btBroadphaseInterface*		pairCache = new (mem)btAxisSweep3(physicsSdk->m_worldAabbMin,physicsSdk->m_worldAabbMax);
+	mem = btAlignedAlloc(sizeof(btSequentialImpulseConstraintSolver),16);
+	btConstraintSolver*			constraintSolver = new(mem) btSequentialImpulseConstraintSolver();
+
+	mem = btAlignedAlloc(sizeof(btDiscreteDynamicsWorld),16);
+	return (plDynamicsWorldHandle) new (mem)btDiscreteDynamicsWorld(dispatcher,pairCache,constraintSolver,collisionConfiguration);
+}
+void           plDeleteDynamicsWorld(plDynamicsWorldHandle world)
+{
+	//todo: also clean up the other allocations, axisSweep, pairCache,dispatcher,constraintSolver,collisionConfiguration
+	btDynamicsWorld* dynamicsWorld = reinterpret_cast< btDynamicsWorld* >(world);
+	btAlignedFree(dynamicsWorld);
+}
+
+void	plStepSimulation(plDynamicsWorldHandle world,	plReal	timeStep)
+{
+	btDynamicsWorld* dynamicsWorld = reinterpret_cast< btDynamicsWorld* >(world);
+	assert(dynamicsWorld);
+	dynamicsWorld->stepSimulation(timeStep);
+}
+
+void plAddRigidBody(plDynamicsWorldHandle world, plRigidBodyHandle object)
+{
+	btDynamicsWorld* dynamicsWorld = reinterpret_cast< btDynamicsWorld* >(world);
+	assert(dynamicsWorld);
+	btRigidBody* body = reinterpret_cast< btRigidBody* >(object);
+	assert(body);
+
+	dynamicsWorld->addRigidBody(body);
+}
+
+void plRemoveRigidBody(plDynamicsWorldHandle world, plRigidBodyHandle object)
+{
+	btDynamicsWorld* dynamicsWorld = reinterpret_cast< btDynamicsWorld* >(world);
+	assert(dynamicsWorld);
+	btRigidBody* body = reinterpret_cast< btRigidBody* >(object);
+	assert(body);
+
+	dynamicsWorld->removeRigidBody(body);
+}
+
+/* Rigid Body  */
+
+plRigidBodyHandle plCreateRigidBody(	void* user_data,  float mass, plCollisionShapeHandle cshape )
+{
+	btTransform trans;
+	trans.setIdentity();
+	btVector3 localInertia(0,0,0);
+	btCollisionShape* shape = reinterpret_cast<btCollisionShape*>( cshape);
+	assert(shape);
+	if (mass)
+	{
+		shape->calculateLocalInertia(mass,localInertia);
+	}
+	void* mem = btAlignedAlloc(sizeof(btRigidBody),16);
+	btRigidBody::btRigidBodyConstructionInfo rbci(mass, 0,shape,localInertia);
+	btRigidBody* body = new (mem)btRigidBody(rbci);
+	body->setWorldTransform(trans);
+	body->setUserPointer(user_data);
+	return (plRigidBodyHandle) body;
+}
+
+void plDeleteRigidBody(plRigidBodyHandle cbody)
+{
+	btRigidBody* body = reinterpret_cast< btRigidBody* >(cbody);
+	assert(body);
+	btAlignedFree( body);
+}
+
+
+/* Collision Shape definition */
+
+plCollisionShapeHandle plNewSphereShape(plReal radius)
+{
+	void* mem = btAlignedAlloc(sizeof(btSphereShape),16);
+	return (plCollisionShapeHandle) new (mem)btSphereShape(radius);
+	
+}
+	
+plCollisionShapeHandle plNewBoxShape(plReal x, plReal y, plReal z)
+{
+	void* mem = btAlignedAlloc(sizeof(btBoxShape),16);
+	return (plCollisionShapeHandle) new (mem)btBoxShape(btVector3(x,y,z));
+}
+
+plCollisionShapeHandle plNewCapsuleShape(plReal radius, plReal height)
+{
+	//capsule is convex hull of 2 spheres, so use btMultiSphereShape
+	btVector3 inertiaHalfExtents(radius,height,radius);
+	const int numSpheres = 2;
+	btVector3 positions[numSpheres] = {btVector3(0,height,0),btVector3(0,-height,0)};
+	btScalar radi[numSpheres] = {radius,radius};
+	void* mem = btAlignedAlloc(sizeof(btMultiSphereShape),16);
+	return (plCollisionShapeHandle) new (mem)btMultiSphereShape(inertiaHalfExtents,positions,radi,numSpheres);
+}
+plCollisionShapeHandle plNewConeShape(plReal radius, plReal height)
+{
+	void* mem = btAlignedAlloc(sizeof(btConeShape),16);
+	return (plCollisionShapeHandle) new (mem)btConeShape(radius,height);
+}
+
+plCollisionShapeHandle plNewCylinderShape(plReal radius, plReal height)
+{
+	void* mem = btAlignedAlloc(sizeof(btCylinderShape),16);
+	return (plCollisionShapeHandle) new (mem)btCylinderShape(btVector3(radius,height,radius));
+}
+
+/* Convex Meshes */
+plCollisionShapeHandle plNewConvexHullShape()
+{
+	void* mem = btAlignedAlloc(sizeof(btConvexHullShape),16);
+	return (plCollisionShapeHandle) new (mem)btConvexHullShape();
+}
+
+
+/* Concave static triangle meshes */
+plMeshInterfaceHandle		   plNewMeshInterface()
+{
+	return 0;
+}
+
+plCollisionShapeHandle plNewCompoundShape()
+{
+	void* mem = btAlignedAlloc(sizeof(btCompoundShape),16);
+	return (plCollisionShapeHandle) new (mem)btCompoundShape();
+}
+
+void	plAddChildShape(plCollisionShapeHandle compoundShapeHandle,plCollisionShapeHandle childShapeHandle, plVector3 childPos,plQuaternion childOrn)
+{
+	btCollisionShape* colShape = reinterpret_cast<btCollisionShape*>(compoundShapeHandle);
+	btAssert(colShape->getShapeType() == COMPOUND_SHAPE_PROXYTYPE);
+	btCompoundShape* compoundShape = reinterpret_cast<btCompoundShape*>(colShape);
+	btCollisionShape* childShape = reinterpret_cast<btCollisionShape*>(childShapeHandle);
+	btTransform	localTrans;
+	localTrans.setIdentity();
+	localTrans.setOrigin(btVector3(childPos[0],childPos[1],childPos[2]));
+	localTrans.setRotation(btQuaternion(childOrn[0],childOrn[1],childOrn[2],childOrn[3]));
+	compoundShape->addChildShape(localTrans,childShape);
+}
+
+void plSetEuler(plReal yaw,plReal pitch,plReal roll, plQuaternion orient)
+{
+	btQuaternion orn;
+	orn.setEuler(yaw,pitch,roll);
+	orient[0] = orn.getX();
+	orient[1] = orn.getY();
+	orient[2] = orn.getZ();
+	orient[3] = orn.getW();
+
+}
+
+
+//	extern  void		plAddTriangle(plMeshInterfaceHandle meshHandle, plVector3 v0,plVector3 v1,plVector3 v2);
+//	extern  plCollisionShapeHandle plNewStaticTriangleMeshShape(plMeshInterfaceHandle);
+
+
+void		plAddVertex(plCollisionShapeHandle cshape, plReal x,plReal y,plReal z)
+{
+	btCollisionShape* colShape = reinterpret_cast<btCollisionShape*>( cshape);
+	(void)colShape;
+	btAssert(colShape->getShapeType()==CONVEX_HULL_SHAPE_PROXYTYPE);
+	btConvexHullShape* convexHullShape = reinterpret_cast<btConvexHullShape*>( cshape);
+	convexHullShape->addPoint(btPoint3(x,y,z));
+
+}
+
+void plDeleteShape(plCollisionShapeHandle cshape)
+{
+	btCollisionShape* shape = reinterpret_cast<btCollisionShape*>( cshape);
+	assert(shape);
+	btAlignedFree(shape);
+}
+void plSetScaling(plCollisionShapeHandle cshape, plVector3 cscaling)
+{
+	btCollisionShape* shape = reinterpret_cast<btCollisionShape*>( cshape);
+	assert(shape);
+	btVector3 scaling(cscaling[0],cscaling[1],cscaling[2]);
+	shape->setLocalScaling(scaling);	
+}
+
+
+
+void plSetPosition(plRigidBodyHandle object, const plVector3 position)
+{
+	btRigidBody* body = reinterpret_cast< btRigidBody* >(object);
+	btAssert(body);
+	btVector3 pos(position[0],position[1],position[2]);
+	btTransform worldTrans = body->getWorldTransform();
+	worldTrans.setOrigin(pos);
+	body->setWorldTransform(worldTrans);
+}
+
+void plSetOrientation(plRigidBodyHandle object, const plQuaternion orientation)
+{
+	btRigidBody* body = reinterpret_cast< btRigidBody* >(object);
+	btAssert(body);
+	btQuaternion orn(orientation[0],orientation[1],orientation[2],orientation[3]);
+	btTransform worldTrans = body->getWorldTransform();
+	worldTrans.setRotation(orn);
+	body->setWorldTransform(worldTrans);
+}
+
+void	plGetOpenGLMatrix(plRigidBodyHandle object, plReal* matrix)
+{
+	btRigidBody* body = reinterpret_cast< btRigidBody* >(object);
+	btAssert(body);
+	body->getWorldTransform().getOpenGLMatrix(matrix);
+
+}
+
+void	plGetPosition(plRigidBodyHandle object,plVector3 position)
+{
+	btRigidBody* body = reinterpret_cast< btRigidBody* >(object);
+	btAssert(body);
+	const btVector3& pos = body->getWorldTransform().getOrigin();
+	position[0] = pos.getX();
+	position[1] = pos.getY();
+	position[2] = pos.getZ();
+}
+
+void plGetOrientation(plRigidBodyHandle object,plQuaternion orientation)
+{
+	btRigidBody* body = reinterpret_cast< btRigidBody* >(object);
+	btAssert(body);
+	const btQuaternion& orn = body->getWorldTransform().getRotation();
+	orientation[0] = orn.getX();
+	orientation[1] = orn.getY();
+	orientation[2] = orn.getZ();
+	orientation[3] = orn.getW();
+}
+
+
+
+//plRigidBodyHandle plRayCast(plDynamicsWorldHandle world, const plVector3 rayStart, const plVector3 rayEnd, plVector3 hitpoint, plVector3 normal);
+
+//	extern  plRigidBodyHandle plObjectCast(plDynamicsWorldHandle world, const plVector3 rayStart, const plVector3 rayEnd, plVector3 hitpoint, plVector3 normal);
diff --git a/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp b/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp
new file mode 100644
index 00000000000..19443adc723
--- /dev/null
+++ b/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp
@@ -0,0 +1,193 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2007 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+
+#include "btContinuousDynamicsWorld.h"
+#include "LinearMath/btQuickprof.h"
+
+//collision detection
+#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h"
+#include "BulletCollision/BroadphaseCollision/btSimpleBroadphase.h"
+#include "BulletCollision/CollisionShapes/btCollisionShape.h"
+#include "BulletCollision/CollisionDispatch/btSimulationIslandManager.h"
+
+//rigidbody & constraints
+#include "BulletDynamics/Dynamics/btRigidBody.h"
+#include "BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h"
+#include "BulletDynamics/ConstraintSolver/btContactSolverInfo.h"
+#include "BulletDynamics/ConstraintSolver/btTypedConstraint.h"
+
+
+
+#include <stdio.h>
+
+btContinuousDynamicsWorld::btContinuousDynamicsWorld(btDispatcher* dispatcher,btBroadphaseInterface* pairCache,btConstraintSolver* constraintSolver,btCollisionConfiguration* collisionConfiguration)
+:btDiscreteDynamicsWorld(dispatcher,pairCache,constraintSolver,collisionConfiguration)
+{
+}
+
+btContinuousDynamicsWorld::~btContinuousDynamicsWorld()
+{
+}
+
+	
+void	btContinuousDynamicsWorld::internalSingleStepSimulation( btScalar timeStep)
+{
+	
+	startProfiling(timeStep);
+	
+
+	///update aabbs information
+	updateAabbs();
+	//static int frame=0;
+//	printf("frame %d\n",frame++);
+
+	///apply gravity, predict motion
+	predictUnconstraintMotion(timeStep);
+
+	btDispatcherInfo& dispatchInfo = getDispatchInfo();
+
+	dispatchInfo.m_timeStep = timeStep;
+	dispatchInfo.m_stepCount = 0;
+	dispatchInfo.m_debugDraw = getDebugDrawer();
+
+	///perform collision detection
+	performDiscreteCollisionDetection();
+
+	calculateSimulationIslands();
+
+	
+	getSolverInfo().m_timeStep = timeStep;
+	
+
+
+	///solve contact and other joint constraints
+	solveConstraints(getSolverInfo());
+	
+	///CallbackTriggers();
+	calculateTimeOfImpacts(timeStep);
+
+	btScalar toi = dispatchInfo.m_timeOfImpact;
+//	if (toi < 1.f)
+//		printf("toi = %f\n",toi);
+	if (toi < 0.f)
+		printf("toi = %f\n",toi);
+
+
+	///integrate transforms
+	integrateTransforms(timeStep * toi);
+
+	///update vehicle simulation
+	updateVehicles(timeStep);
+
+
+	updateActivationState( timeStep );
+	
+	if(0 != m_internalTickCallback) {
+		(*m_internalTickCallback)(this, timeStep);
+	}
+}
+
+void	btContinuousDynamicsWorld::calculateTimeOfImpacts(btScalar timeStep)
+{
+		///these should be 'temporal' aabbs!
+		updateTemporalAabbs(timeStep);
+		
+		///'toi' is the global smallest time of impact. However, we just calculate the time of impact for each object individually.
+		///so we handle the case moving versus static properly, and we cheat for moving versus moving
+		btScalar toi = 1.f;
+		
+	
+		btDispatcherInfo& dispatchInfo = getDispatchInfo();
+		dispatchInfo.m_timeStep = timeStep;
+		dispatchInfo.m_timeOfImpact = 1.f;
+		dispatchInfo.m_stepCount = 0;
+		dispatchInfo.m_dispatchFunc = btDispatcherInfo::DISPATCH_CONTINUOUS;
+
+		///calculate time of impact for overlapping pairs
+
+
+		btDispatcher* dispatcher = getDispatcher();
+		if (dispatcher)
+			dispatcher->dispatchAllCollisionPairs(m_broadphasePairCache->getOverlappingPairCache(),dispatchInfo,m_dispatcher1);
+
+		toi = dispatchInfo.m_timeOfImpact;
+
+		dispatchInfo.m_dispatchFunc = btDispatcherInfo::DISPATCH_DISCRETE;
+
+}
+
+void	btContinuousDynamicsWorld::updateTemporalAabbs(btScalar timeStep)
+{
+
+	btVector3 temporalAabbMin,temporalAabbMax;
+
+	for ( int i=0;i<m_collisionObjects.size();i++)
+	{
+		btCollisionObject* colObj = m_collisionObjects[i];
+		
+		btRigidBody* body = btRigidBody::upcast(colObj);
+		if (body)
+		{
+			body->getCollisionShape()->getAabb(m_collisionObjects[i]->getWorldTransform(),temporalAabbMin,temporalAabbMax);
+			const btVector3& linvel = body->getLinearVelocity();
+
+			//make the AABB temporal
+			btScalar temporalAabbMaxx = temporalAabbMax.getX();
+			btScalar temporalAabbMaxy = temporalAabbMax.getY();
+			btScalar temporalAabbMaxz = temporalAabbMax.getZ();
+			btScalar temporalAabbMinx = temporalAabbMin.getX();
+			btScalar temporalAabbMiny = temporalAabbMin.getY();
+			btScalar temporalAabbMinz = temporalAabbMin.getZ();
+
+			// add linear motion
+			btVector3 linMotion = linvel*timeStep;
+		
+			if (linMotion.x() > 0.f)
+				temporalAabbMaxx += linMotion.x(); 
+			else
+				temporalAabbMinx += linMotion.x();
+			if (linMotion.y() > 0.f)
+				temporalAabbMaxy += linMotion.y(); 
+			else
+				temporalAabbMiny += linMotion.y();
+			if (linMotion.z() > 0.f)
+				temporalAabbMaxz += linMotion.z(); 
+			else
+				temporalAabbMinz += linMotion.z();
+
+			//add conservative angular motion
+			btScalar angularMotion(0);// = angvel.length() * GetAngularMotionDisc() * timeStep;
+			btVector3 angularMotion3d(angularMotion,angularMotion,angularMotion);
+			temporalAabbMin = btVector3(temporalAabbMinx,temporalAabbMiny,temporalAabbMinz);
+			temporalAabbMax = btVector3(temporalAabbMaxx,temporalAabbMaxy,temporalAabbMaxz);
+
+			temporalAabbMin -= angularMotion3d;
+			temporalAabbMax += angularMotion3d;
+
+			m_broadphasePairCache->setAabb(body->getBroadphaseHandle(),temporalAabbMin,temporalAabbMax,m_dispatcher1);
+		}
+	}
+
+	//update aabb (of all moved objects)
+
+	m_broadphasePairCache->calculateOverlappingPairs(m_dispatcher1);
+	
+
+
+}
+
+
+
diff --git a/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.h b/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.h
new file mode 100644
index 00000000000..61c8dea03eb
--- /dev/null
+++ b/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.h
@@ -0,0 +1,46 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2007 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_CONTINUOUS_DYNAMICS_WORLD_H
+#define BT_CONTINUOUS_DYNAMICS_WORLD_H
+
+#include "btDiscreteDynamicsWorld.h"
+
+///btContinuousDynamicsWorld adds optional (per object) continuous collision detection for fast moving objects to the btDiscreteDynamicsWorld.
+///This copes with fast moving objects that otherwise would tunnel/miss collisions.
+///Under construction, don't use yet! Please use btDiscreteDynamicsWorld instead.
+class btContinuousDynamicsWorld : public btDiscreteDynamicsWorld
+{
+
+	void	updateTemporalAabbs(btScalar timeStep);
+
+	public:
+
+		btContinuousDynamicsWorld(btDispatcher* dispatcher,btBroadphaseInterface* pairCache,btConstraintSolver* constraintSolver,btCollisionConfiguration* collisionConfiguration);
+		virtual ~btContinuousDynamicsWorld();
+		
+		///time stepping with calculation of time of impact for selected fast moving objects
+		virtual void	internalSingleStepSimulation( btScalar timeStep);
+
+		virtual void	calculateTimeOfImpacts(btScalar timeStep);
+
+		virtual btDynamicsWorldType	getWorldType() const
+		{
+			return BT_CONTINUOUS_DYNAMICS_WORLD;
+		}
+
+};
+
+#endif //BT_CONTINUOUS_DYNAMICS_WORLD_H
diff --git a/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp b/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
index 1017c8af6ea..c7b1af245e9 100644
--- a/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
+++ b/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
@@ -21,7 +21,8 @@ subject to the following restrictions:
 #include "BulletCollision/BroadphaseCollision/btSimpleBroadphase.h"
 #include "BulletCollision/CollisionShapes/btCollisionShape.h"
 #include "BulletCollision/CollisionDispatch/btSimulationIslandManager.h"
-#include <LinearMath/btTransformUtil.h>
+#include "LinearMath/btTransformUtil.h"
+#include "LinearMath/btQuickprof.h"
 
 //rigidbody & constraints
 #include "BulletDynamics/Dynamics/btRigidBody.h"
@@ -41,6 +42,7 @@ subject to the following restrictions:
 #include "BulletCollision/CollisionShapes/btSphereShape.h"
 #include "BulletCollision/CollisionShapes/btTriangleCallback.h"
 #include "BulletCollision/CollisionShapes/btTriangleMeshShape.h"
+#include "BulletCollision/CollisionShapes/btStaticPlaneShape.h"
 #include "LinearMath/btIDebugDraw.h"
 
 
@@ -57,17 +59,29 @@ subject to the following restrictions:
 
 
 
-btDiscreteDynamicsWorld::btDiscreteDynamicsWorld(btDispatcher* dispatcher,btOverlappingPairCache* pairCache,btConstraintSolver* constraintSolver)
-:btDynamicsWorld(dispatcher,pairCache),
-m_constraintSolver(constraintSolver? constraintSolver: new btSequentialImpulseConstraintSolver),
-m_debugDrawer(0),
+btDiscreteDynamicsWorld::btDiscreteDynamicsWorld(btDispatcher* dispatcher,btBroadphaseInterface* pairCache,btConstraintSolver* constraintSolver, btCollisionConfiguration* collisionConfiguration)
+:btDynamicsWorld(dispatcher,pairCache,collisionConfiguration),
+m_constraintSolver(constraintSolver),
 m_gravity(0,-10,0),
 m_localTime(btScalar(1.)/btScalar(60.)),
 m_profileTimings(0)
 {
-	m_islandManager = new btSimulationIslandManager();
+	if (!m_constraintSolver)
+	{
+		void* mem = btAlignedAlloc(sizeof(btSequentialImpulseConstraintSolver),16);
+		m_constraintSolver = new (mem) btSequentialImpulseConstraintSolver;
+		m_ownsConstraintSolver = true;
+	} else
+	{
+		m_ownsConstraintSolver = false;
+	}
+
+	{
+		void* mem = btAlignedAlloc(sizeof(btSimulationIslandManager),16);
+		m_islandManager = new (mem) btSimulationIslandManager();
+	}
+
 	m_ownsIslandManager = true;
-	m_ownsConstraintSolver = (constraintSolver==0);
 }
 
 
@@ -75,9 +89,16 @@ btDiscreteDynamicsWorld::~btDiscreteDynamicsWorld()
 {
 	//only delete it when we created it
 	if (m_ownsIslandManager)
-		delete m_islandManager;
+	{
+		m_islandManager->~btSimulationIslandManager();
+		btAlignedFree( m_islandManager);
+	}
 	if (m_ownsConstraintSolver)
-		 delete m_constraintSolver;
+	{
+
+		m_constraintSolver->~btConstraintSolver();
+		btAlignedFree(m_constraintSolver);
+	}
 }
 
 void	btDiscreteDynamicsWorld::saveKinematicState(btScalar timeStep)
@@ -102,14 +123,35 @@ void	btDiscreteDynamicsWorld::saveKinematicState(btScalar timeStep)
 	}
 }
 
-void	btDiscreteDynamicsWorld::synchronizeMotionStates()
+void	btDiscreteDynamicsWorld::debugDrawWorld()
 {
-	//debug vehicle wheels
-	
-	
+
+	if (getDebugDrawer() && getDebugDrawer()->getDebugMode() & btIDebugDraw::DBG_DrawContactPoints)
 	{
+		int numManifolds = getDispatcher()->getNumManifolds();
+		btVector3 color(0,0,0);
+		for (int i=0;i<numManifolds;i++)
+		{
+			btPersistentManifold* contactManifold = getDispatcher()->getManifoldByIndexInternal(i);
+			//btCollisionObject* obA = static_cast<btCollisionObject*>(contactManifold->getBody0());
+			//btCollisionObject* obB = static_cast<btCollisionObject*>(contactManifold->getBody1());
+
+			int numContacts = contactManifold->getNumContacts();
+			for (int j=0;j<numContacts;j++)
+			{
+				btManifoldPoint& cp = contactManifold->getContactPoint(j);
+				getDebugDrawer()->drawContactPoint(cp.m_positionWorldOnB,cp.m_normalWorldOnB,cp.getDistance(),cp.getLifeTime(),color);
+			}
+		}
+	}
+
+
+	if (getDebugDrawer() && getDebugDrawer()->getDebugMode() & (btIDebugDraw::DBG_DrawWireframe | btIDebugDraw::DBG_DrawAabb))
+	{
+		int i;
+
 		//todo: iterate over awake simulation islands!
-		for ( int i=0;i<m_collisionObjects.size();i++)
+		for (  i=0;i<m_collisionObjects.size();i++)
 		{
 			btCollisionObject* colObj = m_collisionObjects[i];
 			if (getDebugDrawer() && getDebugDrawer()->getDebugMode() & btIDebugDraw::DBG_DrawWireframe)
@@ -135,6 +177,88 @@ void	btDiscreteDynamicsWorld::synchronizeMotionStates()
 
 				debugDrawObject(colObj->getWorldTransform(),colObj->getCollisionShape(),color);
 			}
+			if (m_debugDrawer && (m_debugDrawer->getDebugMode() & btIDebugDraw::DBG_DrawAabb))
+			{
+				btPoint3 minAabb,maxAabb;
+				btVector3 colorvec(1,0,0);
+				colObj->getCollisionShape()->getAabb(colObj->getWorldTransform(), minAabb,maxAabb);
+				m_debugDrawer->drawAabb(minAabb,maxAabb,colorvec);
+			}
+
+		}
+	
+		for (  i=0;i<this->m_vehicles.size();i++)
+		{
+			for (int v=0;v<m_vehicles[i]->getNumWheels();v++)
+			{
+				btVector3 wheelColor(0,255,255);
+				if (m_vehicles[i]->getWheelInfo(v).m_raycastInfo.m_isInContact)
+				{
+					wheelColor.setValue(0,0,255);
+				} else
+				{
+					wheelColor.setValue(255,0,255);
+				}
+		
+				btVector3 wheelPosWS = m_vehicles[i]->getWheelInfo(v).m_worldTransform.getOrigin();
+
+				btVector3 axle = btVector3(	
+					m_vehicles[i]->getWheelInfo(v).m_worldTransform.getBasis()[0][m_vehicles[i]->getRightAxis()],
+					m_vehicles[i]->getWheelInfo(v).m_worldTransform.getBasis()[1][m_vehicles[i]->getRightAxis()],
+					m_vehicles[i]->getWheelInfo(v).m_worldTransform.getBasis()[2][m_vehicles[i]->getRightAxis()]);
+
+
+				//m_vehicles[i]->getWheelInfo(v).m_raycastInfo.m_wheelAxleWS
+				//debug wheels (cylinders)
+				m_debugDrawer->drawLine(wheelPosWS,wheelPosWS+axle,wheelColor);
+				m_debugDrawer->drawLine(wheelPosWS,m_vehicles[i]->getWheelInfo(v).m_raycastInfo.m_contactPointWS,wheelColor);
+
+			}
+		}
+	}
+}
+
+void	btDiscreteDynamicsWorld::clearForces()
+{
+	//todo: iterate over awake simulation islands!
+	for ( int i=0;i<m_collisionObjects.size();i++)
+	{
+		btCollisionObject* colObj = m_collisionObjects[i];
+		
+		btRigidBody* body = btRigidBody::upcast(colObj);
+		if (body)
+		{
+			body->clearForces();
+		}
+	}
+}	
+
+///apply gravity, call this once per timestep
+void	btDiscreteDynamicsWorld::applyGravity()
+{
+	//todo: iterate over awake simulation islands!
+	for ( int i=0;i<m_collisionObjects.size();i++)
+	{
+		btCollisionObject* colObj = m_collisionObjects[i];
+		
+		btRigidBody* body = btRigidBody::upcast(colObj);
+		if (body && body->isActive())
+		{
+			body->applyGravity();
+		}
+	}
+}
+
+
+
+void	btDiscreteDynamicsWorld::synchronizeMotionStates()
+{
+	{
+		//todo: iterate over awake simulation islands!
+		for ( int i=0;i<m_collisionObjects.size();i++)
+		{
+			btCollisionObject* colObj = m_collisionObjects[i];
+			
 			btRigidBody* body = btRigidBody::upcast(colObj);
 			if (body && body->getMotionState() && !body->isStaticOrKinematicObject())
 			{
@@ -158,31 +282,8 @@ void	btDiscreteDynamicsWorld::synchronizeMotionStates()
 		{
 			for (int v=0;v<m_vehicles[i]->getNumWheels();v++)
 			{
-				btVector3 wheelColor(0,255,255);
-				if (m_vehicles[i]->getWheelInfo(v).m_raycastInfo.m_isInContact)
-				{
-					wheelColor.setValue(0,0,255);
-				} else
-				{
-					wheelColor.setValue(255,0,255);
-				}
-
 				//synchronize the wheels with the (interpolated) chassis worldtransform
 				m_vehicles[i]->updateWheelTransform(v,true);
-					
-				btVector3 wheelPosWS = m_vehicles[i]->getWheelInfo(v).m_worldTransform.getOrigin();
-
-				btVector3 axle = btVector3(	
-					m_vehicles[i]->getWheelInfo(v).m_worldTransform.getBasis()[0][m_vehicles[i]->getRightAxis()],
-					m_vehicles[i]->getWheelInfo(v).m_worldTransform.getBasis()[1][m_vehicles[i]->getRightAxis()],
-					m_vehicles[i]->getWheelInfo(v).m_worldTransform.getBasis()[2][m_vehicles[i]->getRightAxis()]);
-
-
-				//m_vehicles[i]->getWheelInfo(v).m_raycastInfo.m_wheelAxleWS
-				//debug wheels (cylinders)
-				m_debugDrawer->drawLine(wheelPosWS,wheelPosWS+axle,wheelColor);
-				m_debugDrawer->drawLine(wheelPosWS,m_vehicles[i]->getWheelInfo(v).m_raycastInfo.m_contactPointWS,wheelColor);
-
 			}
 		}
 	}
@@ -192,6 +293,10 @@ void	btDiscreteDynamicsWorld::synchronizeMotionStates()
 
 int	btDiscreteDynamicsWorld::stepSimulation( btScalar timeStep,int maxSubSteps, btScalar fixedTimeStep)
 {
+	startProfiling(timeStep);
+
+	BT_PROFILE("stepSimulation");
+
 	int numSimulationSubSteps = 0;
 
 	if (maxSubSteps)
@@ -229,6 +334,8 @@ int	btDiscreteDynamicsWorld::stepSimulation( btScalar timeStep,int maxSubSteps,
 
 		saveKinematicState(fixedTimeStep);
 
+		applyGravity();
+
 		//clamp the number of substeps, to prevent simulation grinding spiralling down to a halt
 		int clampedSimulationSteps = (numSimulationSubSteps > maxSubSteps)? maxSubSteps : numSimulationSubSteps;
 
@@ -242,16 +349,19 @@ int	btDiscreteDynamicsWorld::stepSimulation( btScalar timeStep,int maxSubSteps,
 
 	synchronizeMotionStates();
 
+	clearForces();
+
+#ifndef BT_NO_PROFILE
+	CProfileManager::Increment_Frame_Counter();
+#endif //BT_NO_PROFILE
+	
 	return numSimulationSubSteps;
 }
 
 void	btDiscreteDynamicsWorld::internalSingleStepSimulation(btScalar timeStep)
 {
 	
-	startProfiling(timeStep);
-
-	///update aabbs information
-	updateAabbs();
+	BT_PROFILE("internalSingleStepSimulation");
 
 	///apply gravity, predict motion
 	predictUnconstraintMotion(timeStep);
@@ -286,8 +396,9 @@ void	btDiscreteDynamicsWorld::internalSingleStepSimulation(btScalar timeStep)
 
 	updateActivationState( timeStep );
 
-	
-
+	if(0 != m_internalTickCallback) {
+		(*m_internalTickCallback)(this, timeStep);
+	}	
 }
 
 void	btDiscreteDynamicsWorld::setGravity(const btVector3& gravity)
@@ -304,6 +415,11 @@ void	btDiscreteDynamicsWorld::setGravity(const btVector3& gravity)
 	}
 }
 
+btVector3 btDiscreteDynamicsWorld::getGravity () const
+{
+	return m_gravity;
+}
+
 
 void	btDiscreteDynamicsWorld::removeRigidBody(btRigidBody* body)
 {
@@ -343,19 +459,18 @@ void	btDiscreteDynamicsWorld::addRigidBody(btRigidBody* body, short group, short
 
 void	btDiscreteDynamicsWorld::updateVehicles(btScalar timeStep)
 {
-	BEGIN_PROFILE("updateVehicles");
-
+	BT_PROFILE("updateVehicles");
+	
 	for ( int i=0;i<m_vehicles.size();i++)
 	{
 		btRaycastVehicle* vehicle = m_vehicles[i];
 		vehicle->updateVehicle( timeStep);
 	}
-	END_PROFILE("updateVehicles");
 }
 
 void	btDiscreteDynamicsWorld::updateActivationState(btScalar timeStep)
 {
-	BEGIN_PROFILE("updateActivationState");
+	BT_PROFILE("updateActivationState");
 
 	for ( int i=0;i<m_collisionObjects.size();i++)
 	{
@@ -374,6 +489,12 @@ void	btDiscreteDynamicsWorld::updateActivationState(btScalar timeStep)
 				{
 					if (body->getActivationState() == ACTIVE_TAG)
 						body->setActivationState( WANTS_DEACTIVATION );
+					if (body->getActivationState() == ISLAND_SLEEPING) 
+					{
+						body->setAngularVelocity(btVector3(0,0,0));
+						body->setLinearVelocity(btVector3(0,0,0));
+					}
+
 				}
 			} else
 			{
@@ -382,7 +503,6 @@ void	btDiscreteDynamicsWorld::updateActivationState(btScalar timeStep)
 			}
 		}
 	}
-	END_PROFILE("updateActivationState");
 }
 
 void	btDiscreteDynamicsWorld::addConstraint(btTypedConstraint* constraint,bool disableCollisionsBetweenLinkedBodies)
@@ -412,7 +532,7 @@ void	btDiscreteDynamicsWorld::removeVehicle(btRaycastVehicle* vehicle)
 	m_vehicles.remove(vehicle);
 }
 
-inline	int	btGetConstraintIslandId(const btTypedConstraint* lhs)
+SIMD_FORCE_INLINE	int	btGetConstraintIslandId(const btTypedConstraint* lhs)
 {
 	int islandId;
 	
@@ -442,6 +562,7 @@ class btSortConstraintOnIslandPredicate
 
 void	btDiscreteDynamicsWorld::solveConstraints(btContactSolverInfo& solverInfo)
 {
+	BT_PROFILE("solveConstraints");
 	
 	struct InplaceSolverIslandCallback : public btSimulationIslandManager::IslandCallback
 	{
@@ -452,7 +573,7 @@ void	btDiscreteDynamicsWorld::solveConstraints(btContactSolverInfo& solverInfo)
 		int						m_numConstraints;
 		btIDebugDraw*			m_debugDrawer;
 		btStackAlloc*			m_stackAlloc;
-
+		btDispatcher*			m_dispatcher;
 
 		InplaceSolverIslandCallback(
 			btContactSolverInfo& solverInfo,
@@ -460,13 +581,15 @@ void	btDiscreteDynamicsWorld::solveConstraints(btContactSolverInfo& solverInfo)
 			btTypedConstraint** sortedConstraints,
 			int	numConstraints,
 			btIDebugDraw*	debugDrawer,
-			btStackAlloc*			stackAlloc)
+			btStackAlloc*			stackAlloc,
+			btDispatcher* dispatcher)
 			:m_solverInfo(solverInfo),
 			m_solver(solver),
 			m_sortedConstraints(sortedConstraints),
 			m_numConstraints(numConstraints),
 			m_debugDrawer(debugDrawer),
-			m_stackAlloc(stackAlloc)
+			m_stackAlloc(stackAlloc),
+			m_dispatcher(dispatcher)
 		{
 
 		}
@@ -479,30 +602,42 @@ void	btDiscreteDynamicsWorld::solveConstraints(btContactSolverInfo& solverInfo)
 		}
 		virtual	void	ProcessIsland(btCollisionObject** bodies,int numBodies,btPersistentManifold**	manifolds,int numManifolds, int islandId)
 		{
-			//also add all non-contact constraints/joints for this island
-			btTypedConstraint** startConstraint = 0;
-			int numCurConstraints = 0;
-			int i;
-			
-			//find the first constraint for this island
-			for (i=0;i<m_numConstraints;i++)
+			if (islandId<0)
 			{
-				if (btGetConstraintIslandId(m_sortedConstraints[i]) == islandId)
-				{
-					startConstraint = &m_sortedConstraints[i];
-					break;
-				}
-			}
-			//count the number of constraints in this island
-			for (;i<m_numConstraints;i++)
+				///we don't split islands, so all constraints/contact manifolds/bodies are passed into the solver regardless the island id
+				m_solver->solveGroup( bodies,numBodies,manifolds, numManifolds,&m_sortedConstraints[0],m_numConstraints,m_solverInfo,m_debugDrawer,m_stackAlloc,m_dispatcher);
+			} else
 			{
-				if (btGetConstraintIslandId(m_sortedConstraints[i]) == islandId)
+					//also add all non-contact constraints/joints for this island
+				btTypedConstraint** startConstraint = 0;
+				int numCurConstraints = 0;
+				int i;
+				
+				//find the first constraint for this island
+				for (i=0;i<m_numConstraints;i++)
 				{
-					numCurConstraints++;
+					if (btGetConstraintIslandId(m_sortedConstraints[i]) == islandId)
+					{
+						startConstraint = &m_sortedConstraints[i];
+						break;
+					}
+				}
+				//count the number of constraints in this island
+				for (;i<m_numConstraints;i++)
+				{
+					if (btGetConstraintIslandId(m_sortedConstraints[i]) == islandId)
+					{
+						numCurConstraints++;
+					}
 				}
-			}
 
-			m_solver->solveGroup( bodies,numBodies,manifolds, numManifolds,startConstraint,numCurConstraints,m_solverInfo,m_debugDrawer,m_stackAlloc);
+				///only call solveGroup if there is some work: avoid virtual function call, its overhead can be excessive
+				if (numManifolds + numCurConstraints)
+				{
+					m_solver->solveGroup( bodies,numBodies,manifolds, numManifolds,startConstraint,numCurConstraints,m_solverInfo,m_debugDrawer,m_stackAlloc,m_dispatcher);
+				}
+		
+			}
 		}
 
 	};
@@ -520,18 +655,18 @@ void	btDiscreteDynamicsWorld::solveConstraints(btContactSolverInfo& solverInfo)
 		
 	
 
-	sortedConstraints.heapSort(btSortConstraintOnIslandPredicate());
+	sortedConstraints.quickSort(btSortConstraintOnIslandPredicate());
 	
 	btTypedConstraint** constraintsPtr = getNumConstraints() ? &sortedConstraints[0] : 0;
 	
-	InplaceSolverIslandCallback	solverCallback(	solverInfo,	m_constraintSolver, constraintsPtr,sortedConstraints.size(),	m_debugDrawer,m_stackAlloc);
-
+	InplaceSolverIslandCallback	solverCallback(	solverInfo,	m_constraintSolver, constraintsPtr,sortedConstraints.size(),	m_debugDrawer,m_stackAlloc,m_dispatcher1);
 	
+	m_constraintSolver->prepareSolve(getCollisionWorld()->getNumCollisionObjects(), getCollisionWorld()->getDispatcher()->getNumManifolds());
 	
 	/// solve all the constraints for this island
 	m_islandManager->buildAndProcessIslands(getCollisionWorld()->getDispatcher(),getCollisionWorld()->getCollisionObjectArray(),&solverCallback);
 
-
+	m_constraintSolver->allSolved(solverInfo, m_debugDrawer, m_stackAlloc);
 }
 
 
@@ -539,7 +674,7 @@ void	btDiscreteDynamicsWorld::solveConstraints(btContactSolverInfo& solverInfo)
 
 void	btDiscreteDynamicsWorld::calculateSimulationIslands()
 {
-	BEGIN_PROFILE("calculateSimulationIslands");
+	BT_PROFILE("calculateSimulationIslands");
 
 	getSimulationIslandManager()->updateActivationState(getCollisionWorld(),getCollisionWorld()->getDispatcher());
 
@@ -569,66 +704,14 @@ void	btDiscreteDynamicsWorld::calculateSimulationIslands()
 	//Store the island id in each body
 	getSimulationIslandManager()->storeIslandActivationState(getCollisionWorld());
 
-	END_PROFILE("calculateSimulationIslands");
-
+	
 }
 
 
-void	btDiscreteDynamicsWorld::updateAabbs()
-{
-	BEGIN_PROFILE("updateAabbs");
-	
-	btVector3 colorvec(1,0,0);
-	btTransform predictedTrans;
-	for ( int i=0;i<m_collisionObjects.size();i++)
-	{
-		btCollisionObject* colObj = m_collisionObjects[i];
-		
-		btRigidBody* body = btRigidBody::upcast(colObj);
-		if (body)
-		{
-		//	if (body->IsActive() && (!body->IsStatic()))
-			{
-				btPoint3 minAabb,maxAabb;
-				colObj->getCollisionShape()->getAabb(colObj->getWorldTransform(), minAabb,maxAabb);
-				btBroadphaseInterface* bp = (btBroadphaseInterface*)m_broadphasePairCache;
-
-				//moving objects should be moderately sized, probably something wrong if not
-				if ( colObj->isStaticObject() || ((maxAabb-minAabb).length2() < btScalar(1e12)))
-				{
-					bp->setAabb(body->getBroadphaseHandle(),minAabb,maxAabb);
-				} else
-				{
-					//something went wrong, investigate
-					//this assert is unwanted in 3D modelers (danger of loosing work)
-					body->setActivationState(DISABLE_SIMULATION);
-					
-					static bool reportMe = true;
-					if (reportMe && m_debugDrawer)
-					{
-						reportMe = false;
-						m_debugDrawer->reportErrorWarning("Overflow in AABB, object removed from simulation");
-						m_debugDrawer->reportErrorWarning("If you can reproduce this, please email bugs@continuousphysics.com\n");
-						m_debugDrawer->reportErrorWarning("Please include above information, your Platform, version of OS.\n");
-						m_debugDrawer->reportErrorWarning("Thanks.\n");
-					}
-
-
-				}
-				if (m_debugDrawer && (m_debugDrawer->getDebugMode() & btIDebugDraw::DBG_DrawAabb))
-				{
-					m_debugDrawer->drawAabb(minAabb,maxAabb,colorvec);
-				}
-			}
-		}
-	}
-	
-	END_PROFILE("updateAabbs");
-}
 
 void	btDiscreteDynamicsWorld::integrateTransforms(btScalar timeStep)
 {
-	BEGIN_PROFILE("integrateTransforms");
+	BT_PROFILE("integrateTransforms");
 	btTransform predictedTrans;
 	for ( int i=0;i<m_collisionObjects.size();i++)
 	{
@@ -643,14 +726,13 @@ void	btDiscreteDynamicsWorld::integrateTransforms(btScalar timeStep)
 			}
 		}
 	}
-	END_PROFILE("integrateTransforms");
 }
 
 
 
 void	btDiscreteDynamicsWorld::predictUnconstraintMotion(btScalar timeStep)
 {
-	BEGIN_PROFILE("predictUnconstraintMotion");
+	BT_PROFILE("predictUnconstraintMotion");
 	for ( int i=0;i<m_collisionObjects.size();i++)
 	{
 		btCollisionObject* colObj = m_collisionObjects[i];
@@ -661,51 +743,26 @@ void	btDiscreteDynamicsWorld::predictUnconstraintMotion(btScalar timeStep)
 			{
 				if (body->isActive())
 				{
-					body->applyForces( timeStep);
 					body->integrateVelocities( timeStep);
+					//damping
+					body->applyDamping(timeStep);
+
 					body->predictIntegratedTransform(timeStep,body->getInterpolationWorldTransform());
 				}
 			}
 		}
 	}
-	END_PROFILE("predictUnconstraintMotion");
 }
 
 
 void	btDiscreteDynamicsWorld::startProfiling(btScalar timeStep)
 {
 	(void)timeStep;
-	#ifdef USE_QUICKPROF
 
+#ifndef BT_NO_PROFILE
+	CProfileManager::Reset();
+#endif //BT_NO_PROFILE
 
-	//toggle btProfiler
-	if ( m_debugDrawer && m_debugDrawer->getDebugMode() & btIDebugDraw::DBG_ProfileTimings)
-	{
-		if (!m_profileTimings)
-		{
-			m_profileTimings = 1;
-			// To disable profiling, simply comment out the following line.
-			static int counter = 0;
-
-			char filename[128];
-			sprintf(filename,"quickprof_bullet_timings%i.csv",counter++);
-			btProfiler::init(filename, btProfiler::BLOCK_CYCLE_SECONDS);//BLOCK_TOTAL_MICROSECONDS
-		} else
-		{
-			btProfiler::endProfilingCycle();
-		}
-
-	} else
-	{
-		if (m_profileTimings)
-		{
-			btProfiler::endProfilingCycle();
-
-			m_profileTimings = 0;
-			btProfiler::destroy();
-		}
-	}
-#endif //USE_QUICKPROF
 }
 
 
@@ -827,27 +884,52 @@ void btDiscreteDynamicsWorld::debugDrawObject(const btTransform& worldTransform,
 
 				btScalar radius = capsuleShape->getRadius();
 				btScalar halfHeight = capsuleShape->getHalfHeight();
+				
+				int upAxis = capsuleShape->getUpAxis();
+
+				
+				btVector3 capStart(0.f,0.f,0.f);
+				capStart[upAxis] = -halfHeight;
+
+				btVector3 capEnd(0.f,0.f,0.f);
+				capEnd[upAxis] = halfHeight;
 
 				// Draw the ends
 				{
+					
 					btTransform childTransform = worldTransform;
-					childTransform.getOrigin() = worldTransform * btVector3(0,halfHeight,0);
+					childTransform.getOrigin() = worldTransform * capStart;
 					debugDrawSphere(radius, childTransform, color);
 				}
 
 				{
 					btTransform childTransform = worldTransform;
-					childTransform.getOrigin() = worldTransform * btVector3(0,-halfHeight,0);
+					childTransform.getOrigin() = worldTransform * capEnd;
 					debugDrawSphere(radius, childTransform, color);
 				}
 
 				// Draw some additional lines
 				btVector3 start = worldTransform.getOrigin();
-				getDebugDrawer()->drawLine(start+worldTransform.getBasis() * btVector3(-radius,halfHeight,0),start+worldTransform.getBasis() * btVector3(-radius,-halfHeight,0), color);
-				getDebugDrawer()->drawLine(start+worldTransform.getBasis() * btVector3(radius,halfHeight,0),start+worldTransform.getBasis() * btVector3(radius,-halfHeight,0), color);
-				getDebugDrawer()->drawLine(start+worldTransform.getBasis() * btVector3(0,halfHeight,-radius),start+worldTransform.getBasis() * btVector3(0,-halfHeight,-radius), color);
-				getDebugDrawer()->drawLine(start+worldTransform.getBasis() * btVector3(0,halfHeight,radius),start+worldTransform.getBasis() * btVector3(0,-halfHeight,radius), color);
 
+				
+				capStart[(upAxis+1)%3] = radius;
+				capEnd[(upAxis+1)%3] = radius;
+				getDebugDrawer()->drawLine(start+worldTransform.getBasis() * capStart,start+worldTransform.getBasis() * capEnd, color);
+				capStart[(upAxis+1)%3] = -radius;
+				capEnd[(upAxis+1)%3] = -radius;
+				getDebugDrawer()->drawLine(start+worldTransform.getBasis() * capStart,start+worldTransform.getBasis() * capEnd, color);
+
+				capStart[(upAxis+1)%3] = 0.f;
+				capEnd[(upAxis+1)%3] = 0.f;
+
+				capStart[(upAxis+2)%3] = radius;
+				capEnd[(upAxis+2)%3] = radius;
+				getDebugDrawer()->drawLine(start+worldTransform.getBasis() * capStart,start+worldTransform.getBasis() * capEnd, color);
+				capStart[(upAxis+2)%3] = -radius;
+				capEnd[(upAxis+2)%3] = -radius;
+				getDebugDrawer()->drawLine(start+worldTransform.getBasis() * capStart,start+worldTransform.getBasis() * capEnd, color);
+
+				
 				break;
 			}
 		case CONE_SHAPE_PROXYTYPE:
@@ -856,9 +938,10 @@ void btDiscreteDynamicsWorld::debugDrawObject(const btTransform& worldTransform,
 				btScalar radius = coneShape->getRadius();//+coneShape->getMargin();
 				btScalar height = coneShape->getHeight();//+coneShape->getMargin();
 				btVector3 start = worldTransform.getOrigin();
-				// insert here Bullet 2.69 that fixes representation of cone
+
 				int upAxis= coneShape->getConeUpIndex();
 				
+
 				btVector3	offsetHeight(0,0,0);
 				offsetHeight[upAxis] = height * btScalar(0.5);
 				btVector3	offsetRadius(0,0,0);
@@ -871,11 +954,8 @@ void btDiscreteDynamicsWorld::debugDrawObject(const btTransform& worldTransform,
 				getDebugDrawer()->drawLine(start+worldTransform.getBasis() * (offsetHeight),start+worldTransform.getBasis() * (-offsetHeight+offset2Radius),color);
 				getDebugDrawer()->drawLine(start+worldTransform.getBasis() * (offsetHeight),start+worldTransform.getBasis() * (-offsetHeight-offset2Radius),color);
 
-				// buggy code that does not take into account the direction of the cone
-				//getDebugDrawer()->drawLine(start+worldTransform.getBasis() * btVector3(btScalar(0.),btScalar(0.),btScalar(0.5)*height),start+worldTransform.getBasis() * btVector3(radius,btScalar(0.),btScalar(-0.5)*height),color);
-				//getDebugDrawer()->drawLine(start+worldTransform.getBasis() * btVector3(btScalar(0.),btScalar(0.),btScalar(0.5)*height),start+worldTransform.getBasis() * btVector3(-radius,btScalar(0.),btScalar(-0.5)*height),color);
-				//getDebugDrawer()->drawLine(start+worldTransform.getBasis() * btVector3(btScalar(0.),btScalar(0.),btScalar(0.5)*height),start+worldTransform.getBasis() * btVector3(btScalar(0.),radius,btScalar(-0.5)*height),color);
-				//getDebugDrawer()->drawLine(start+worldTransform.getBasis() * btVector3(btScalar(0.),btScalar(0.),btScalar(0.5)*height),start+worldTransform.getBasis() * btVector3(btScalar(0.),-radius,btScalar(-0.5)*height),color);
+
+
 				break;
 
 			}
@@ -884,7 +964,7 @@ void btDiscreteDynamicsWorld::debugDrawObject(const btTransform& worldTransform,
 				const btCylinderShape* cylinder = static_cast<const btCylinderShape*>(shape);
 				int upAxis = cylinder->getUpAxis();
 				btScalar radius = cylinder->getRadius();
-				btScalar halfHeight = cylinder->getHalfExtents()[upAxis];
+				btScalar halfHeight = cylinder->getHalfExtentsWithMargin()[upAxis];
 				btVector3 start = worldTransform.getOrigin();
 				btVector3	offsetHeight(0,0,0);
 				offsetHeight[upAxis] = halfHeight;
@@ -894,6 +974,25 @@ void btDiscreteDynamicsWorld::debugDrawObject(const btTransform& worldTransform,
 				getDebugDrawer()->drawLine(start+worldTransform.getBasis() * (offsetHeight-offsetRadius),start+worldTransform.getBasis() * (-offsetHeight-offsetRadius),color);
 				break;
 			}
+
+			case STATIC_PLANE_PROXYTYPE:
+				{
+					const btStaticPlaneShape* staticPlaneShape = static_cast<const btStaticPlaneShape*>(shape);
+					btScalar planeConst = staticPlaneShape->getPlaneConstant();
+					const btVector3& planeNormal = staticPlaneShape->getPlaneNormal();
+					btVector3 planeOrigin = planeNormal * planeConst;
+					btVector3 vec0,vec1;
+					btPlaneSpace1(planeNormal,vec0,vec1);
+					btScalar vecLen = 100.f;
+					btVector3 pt0 = planeOrigin + vec0*vecLen;
+					btVector3 pt1 = planeOrigin - vec0*vecLen;
+					btVector3 pt2 = planeOrigin + vec1*vecLen;
+					btVector3 pt3 = planeOrigin - vec1*vecLen;
+					getDebugDrawer()->drawLine(worldTransform*pt0,worldTransform*pt1,color);
+					getDebugDrawer()->drawLine(worldTransform*pt2,worldTransform*pt3,color);
+					break;
+
+				}
 		default:
 			{
 
@@ -918,7 +1017,7 @@ void btDiscreteDynamicsWorld::debugDrawObject(const btTransform& worldTransform,
 					btVector3 aabbMin(btScalar(-1e30),btScalar(-1e30),btScalar(-1e30));
 					//DebugDrawcallback drawCallback;
 					DebugDrawcallback drawCallback(getDebugDrawer(),worldTransform,color);
-					convexMesh->getStridingMesh()->InternalProcessAllTriangles(&drawCallback,aabbMin,aabbMax);
+					convexMesh->getMeshInterface()->InternalProcessAllTriangles(&drawCallback,aabbMin,aabbMax);
 				}
 
 
@@ -950,12 +1049,18 @@ void	btDiscreteDynamicsWorld::setConstraintSolver(btConstraintSolver* solver)
 {
 	if (m_ownsConstraintSolver)
 	{
-		delete m_constraintSolver;
+		btAlignedFree( m_constraintSolver);
 	}
 	m_ownsConstraintSolver = false;
 	m_constraintSolver = solver;
 }
 
+btConstraintSolver* btDiscreteDynamicsWorld::getConstraintSolver()
+{
+	return m_constraintSolver;
+}
+
+
 int		btDiscreteDynamicsWorld::getNumConstraints() const
 {
 	return int(m_constraints.size());
diff --git a/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h b/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h
index 83b90bfeebc..d206a604960 100644
--- a/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h
+++ b/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h
@@ -23,11 +23,11 @@ class btOverlappingPairCache;
 class btConstraintSolver;
 class btSimulationIslandManager;
 class btTypedConstraint;
-#include "../ConstraintSolver/btContactSolverInfo.h"
+
 
 class btRaycastVehicle;
 class btIDebugDraw;
-#include "../../LinearMath/btAlignedObjectArray.h"
+#include "LinearMath/btAlignedObjectArray.h"
 
 
 ///btDiscreteDynamicsWorld provides discrete rigid body simulation
@@ -42,7 +42,6 @@ protected:
 
 	btAlignedObjectArray<btTypedConstraint*> m_constraints;
 
-	btIDebugDraw*	m_debugDrawer;
 
 	btVector3	m_gravity;
 
@@ -53,14 +52,12 @@ protected:
 	bool	m_ownsIslandManager;
 	bool	m_ownsConstraintSolver;
 
-	btContactSolverInfo	m_solverInfo;
-
-
+	
 	btAlignedObjectArray<btRaycastVehicle*>	m_vehicles;
 
 	int	m_profileTimings;
 
-	void	predictUnconstraintMotion(btScalar timeStep);
+	virtual void	predictUnconstraintMotion(btScalar timeStep);
 	
 	void	integrateTransforms(btScalar timeStep);
 		
@@ -86,14 +83,13 @@ public:
 
 
 	///this btDiscreteDynamicsWorld constructor gets created objects from the user, and will not delete those
-	btDiscreteDynamicsWorld(btDispatcher* dispatcher,btOverlappingPairCache* pairCache,btConstraintSolver* constraintSolver);
+	btDiscreteDynamicsWorld(btDispatcher* dispatcher,btBroadphaseInterface* pairCache,btConstraintSolver* constraintSolver,btCollisionConfiguration* collisionConfiguration);
 
 	virtual ~btDiscreteDynamicsWorld();
 
 	///if maxSubSteps > 0, it will interpolate motion between fixedTimeStep's
 	virtual int	stepSimulation( btScalar timeStep,int maxSubSteps=1, btScalar fixedTimeStep=btScalar(1.)/btScalar(60.));
 
-	virtual void	updateAabbs();
 
 	void	addConstraint(btTypedConstraint* constraint, bool disableCollisionsBetweenLinkedBodies=false);
 
@@ -118,17 +114,9 @@ public:
 		return this;
 	}
 
-	virtual void	setDebugDrawer(btIDebugDraw*	debugDrawer)
-	{
-			m_debugDrawer = debugDrawer;
-	}
-
-	virtual btIDebugDraw*	getDebugDrawer()
-	{
-		return m_debugDrawer;
-	}
 
 	virtual void	setGravity(const btVector3& gravity);
+	virtual btVector3 getGravity () const;
 
 	virtual void	addRigidBody(btRigidBody* body);
 
@@ -138,7 +126,11 @@ public:
 
 	void	debugDrawObject(const btTransform& worldTransform, const btCollisionShape* shape, const btVector3& color);
 
+	virtual void	debugDrawWorld();
+
 	virtual void	setConstraintSolver(btConstraintSolver* solver);
+
+	virtual btConstraintSolver* getConstraintSolver();
 	
 	virtual	int		getNumConstraints() const;
 
@@ -146,11 +138,21 @@ public:
 
 	virtual const btTypedConstraint* getConstraint(int index) const;
 
-	btContactSolverInfo& getSolverInfo()
+	
+	virtual btDynamicsWorldType	getWorldType() const
 	{
-		return m_solverInfo;
+		return BT_DISCRETE_DYNAMICS_WORLD;
 	}
+	
+	///the forces on each rigidbody is accumulating together with gravity. clear this after each timestep.
+	virtual void	clearForces();
 
+	///apply gravity, call this once per timestep
+	virtual void	applyGravity();
+
+	virtual void	setNumTasks(int numTasks)
+	{
+	}
 
 };
 
diff --git a/extern/bullet2/src/BulletDynamics/Dynamics/btDynamicsWorld.h b/extern/bullet2/src/BulletDynamics/Dynamics/btDynamicsWorld.h
index 65b63fad4b5..dd9dfa71b7f 100644
--- a/extern/bullet2/src/BulletDynamics/Dynamics/btDynamicsWorld.h
+++ b/extern/bullet2/src/BulletDynamics/Dynamics/btDynamicsWorld.h
@@ -16,20 +16,39 @@ subject to the following restrictions:
 #ifndef BT_DYNAMICS_WORLD_H
 #define BT_DYNAMICS_WORLD_H
 
-#include "../../BulletCollision/CollisionDispatch/btCollisionWorld.h"
+#include "BulletCollision/CollisionDispatch/btCollisionWorld.h"
+#include "BulletDynamics/ConstraintSolver/btContactSolverInfo.h"
+
 class btTypedConstraint;
 class btRaycastVehicle;
 class btConstraintSolver;
+class btDynamicsWorld;
 
+/// Type for the callback for each tick
+typedef void (*btInternalTickCallback)(btDynamicsWorld *world, btScalar timeStep);
 
-///btDynamicsWorld is the baseclass for several dynamics implementation, basic, discrete, parallel, and continuous
+enum btDynamicsWorldType
+{
+	BT_SIMPLE_DYNAMICS_WORLD=1,
+	BT_DISCRETE_DYNAMICS_WORLD=2,
+	BT_CONTINUOUS_DYNAMICS_WORLD=3
+};
+
+///The btDynamicsWorld is the interface class for several dynamics implementation, basic, discrete, parallel, and continuous etc.
 class btDynamicsWorld : public btCollisionWorld
 {
-	public:
+
+protected:
+		btInternalTickCallback m_internalTickCallback;
+		void*	m_worldUserInfo;
+
+		btContactSolverInfo	m_solverInfo;
+
+public:
 		
 
-		btDynamicsWorld(btDispatcher* dispatcher,btOverlappingPairCache* pairCache)
-		:btCollisionWorld(dispatcher,pairCache)
+		btDynamicsWorld(btDispatcher* dispatcher,btBroadphaseInterface* broadphase,btCollisionConfiguration* collisionConfiguration)
+		:btCollisionWorld(dispatcher,broadphase,collisionConfiguration), m_internalTickCallback(0), m_worldUserInfo(0)
 		{
 		}
 
@@ -37,34 +56,37 @@ class btDynamicsWorld : public btCollisionWorld
 		{
 		}
 		
-		///stepSimulation proceeds the simulation over timeStep units
-		///if maxSubSteps > 0, it will interpolate time steps
-		virtual int		stepSimulation( btScalar timeStep,int maxSubSteps=1, btScalar fixedTimeStep=btScalar(1.)/btScalar(60.))=0;
+		///stepSimulation proceeds the simulation over 'timeStep', units in preferably in seconds.
+		///By default, Bullet will subdivide the timestep in constant substeps of each 'fixedTimeStep'.
+		///in order to keep the simulation real-time, the maximum number of substeps can be clamped to 'maxSubSteps'.
+		///You can disable subdividing the timestep/substepping by passing maxSubSteps=0 as second argument to stepSimulation, but in that case you have to keep the timeStep constant.
+		virtual int		stepSimulation( btScalar timeStep,int maxSubSteps=10, btScalar fixedTimeStep=btScalar(1.)/btScalar(60.))=0;
 			
-		virtual void	updateAabbs() = 0;
+		virtual void	debugDrawWorld() = 0;
 				
-		virtual void	addConstraint(btTypedConstraint* constraint, bool disableCollisionsBetweenLinkedBodies=false) { (void)constraint;};
+		virtual void	addConstraint(btTypedConstraint* constraint, bool disableCollisionsBetweenLinkedBodies=false) 
+		{ 
+			(void)constraint; (void)disableCollisionsBetweenLinkedBodies;
+		}
 
-		virtual void	removeConstraint(btTypedConstraint* constraint) {(void)constraint;};
+		virtual void	removeConstraint(btTypedConstraint* constraint) {(void)constraint;}
 
-		virtual void	addVehicle(btRaycastVehicle* vehicle) {(void)vehicle;};
+		virtual void	addVehicle(btRaycastVehicle* vehicle) {(void)vehicle;}
 
-		virtual void	removeVehicle(btRaycastVehicle* vehicle) {(void)vehicle;};
-
-
-		virtual void	setDebugDrawer(btIDebugDraw*	debugDrawer) = 0;
-
-		virtual btIDebugDraw*	getDebugDrawer() = 0;
+		virtual void	removeVehicle(btRaycastVehicle* vehicle) {(void)vehicle;}
 
 		//once a rigidbody is added to the dynamics world, it will get this gravity assigned
 		//existing rigidbodies in the world get gravity assigned too, during this method
 		virtual void	setGravity(const btVector3& gravity) = 0;
+		virtual btVector3 getGravity () const = 0;
 
 		virtual void	addRigidBody(btRigidBody* body) = 0;
 
 		virtual void	removeRigidBody(btRigidBody* body) = 0;
 
 		virtual void	setConstraintSolver(btConstraintSolver* solver) = 0;
+
+		virtual btConstraintSolver* getConstraintSolver() = 0;
 		
 		virtual	int		getNumConstraints() const {	return 0;		}
 		
@@ -72,7 +94,35 @@ class btDynamicsWorld : public btCollisionWorld
 		
 		virtual const btTypedConstraint* getConstraint(int index) const	{	(void)index;	return 0;	}
 
+		virtual btDynamicsWorldType	getWorldType() const=0;
+
+		virtual void	clearForces() = 0;
+
+		/// Set the callback for when an internal tick (simulation substep) happens, optional user info
+		void setInternalTickCallback(btInternalTickCallback cb,	void* worldUserInfo=0) 
+		{ 
+			m_internalTickCallback = cb; 
+			m_worldUserInfo = worldUserInfo;
+		}
+
+		void	setWorldUserInfo(void* worldUserInfo)
+		{
+			m_worldUserInfo = worldUserInfo;
+		}
+
+		void*	getWorldUserInfo() const
+		{
+			return m_worldUserInfo;
+		}
+
+		btContactSolverInfo& getSolverInfo()
+		{
+			return m_solverInfo;
+		}
+
+
 };
 
 #endif //BT_DYNAMICS_WORLD_H
 
+
diff --git a/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp b/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp
index 9ed3579d89c..e2afb687ac6 100644
--- a/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp
+++ b/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp
@@ -20,36 +20,53 @@ subject to the following restrictions:
 #include "LinearMath/btMotionState.h"
 #include "BulletDynamics/ConstraintSolver/btTypedConstraint.h"
 
-btScalar gLinearAirDamping = btScalar(1.);
 //'temporarily' global variables
 btScalar	gDeactivationTime = btScalar(2.);
 bool	gDisableDeactivation = false;
-
-btScalar gLinearSleepingThreshold = btScalar(0.8);
-btScalar gAngularSleepingThreshold = btScalar(1.0);
 static int uniqueId = 0;
 
-btRigidBody::btRigidBody(btScalar mass, btMotionState* motionState, btCollisionShape* collisionShape, const btVector3& localInertia,btScalar linearDamping,btScalar angularDamping,btScalar friction,btScalar restitution)
-: 
-	m_linearVelocity(btScalar(0.0), btScalar(0.0), btScalar(0.0)),
-	m_angularVelocity(btScalar(0.),btScalar(0.),btScalar(0.)),
-	m_angularFactor(btScalar(1.)),
-	m_gravity(btScalar(0.0), btScalar(0.0), btScalar(0.0)),
-	m_totalForce(btScalar(0.0), btScalar(0.0), btScalar(0.0)),
-	m_totalTorque(btScalar(0.0), btScalar(0.0), btScalar(0.0)),
-	m_linearDamping(btScalar(0.)),
-	m_angularDamping(btScalar(0.5)),
-	m_optionalMotionState(motionState),
-	m_contactSolverType(0),
-	m_frictionSolverType(0)
+
+btRigidBody::btRigidBody(const btRigidBody::btRigidBodyConstructionInfo& constructionInfo)
+{
+	setupRigidBody(constructionInfo);
+}
+
+btRigidBody::btRigidBody(btScalar mass, btMotionState *motionState, btCollisionShape *collisionShape, const btVector3 &localInertia)
+{
+	btRigidBodyConstructionInfo cinfo(mass,motionState,collisionShape,localInertia);
+	setupRigidBody(cinfo);
+}
+
+void	btRigidBody::setupRigidBody(const btRigidBody::btRigidBodyConstructionInfo& constructionInfo)
 {
 
-	if (motionState)
+	m_internalType=CO_RIGID_BODY;
+
+	m_linearVelocity.setValue(btScalar(0.0), btScalar(0.0), btScalar(0.0));
+	m_angularVelocity.setValue(btScalar(0.),btScalar(0.),btScalar(0.));
+	m_angularFactor = btScalar(1.);
+	m_gravity.setValue(btScalar(0.0), btScalar(0.0), btScalar(0.0));
+	m_totalForce.setValue(btScalar(0.0), btScalar(0.0), btScalar(0.0));
+	m_totalTorque.setValue(btScalar(0.0), btScalar(0.0), btScalar(0.0)),
+	m_linearDamping = btScalar(0.);
+	m_angularDamping = btScalar(0.5);
+	m_linearSleepingThreshold = constructionInfo.m_linearSleepingThreshold;
+	m_angularSleepingThreshold = constructionInfo.m_angularSleepingThreshold;
+	m_optionalMotionState = constructionInfo.m_motionState;
+	m_contactSolverType = 0;
+	m_frictionSolverType = 0;
+	m_additionalDamping = constructionInfo.m_additionalDamping;
+	m_additionalDampingFactor = constructionInfo.m_additionalDampingFactor;
+	m_additionalLinearDampingThresholdSqr = constructionInfo.m_additionalLinearDampingThresholdSqr;
+	m_additionalAngularDampingThresholdSqr = constructionInfo.m_additionalAngularDampingThresholdSqr;
+	m_additionalAngularDampingFactor = constructionInfo.m_additionalAngularDampingFactor;
+
+	if (m_optionalMotionState)
 	{
-		motionState->getWorldTransform(m_worldTransform);
+		m_optionalMotionState->getWorldTransform(m_worldTransform);
 	} else
 	{
-		m_worldTransform = btTransform::getIdentity();
+		m_worldTransform = constructionInfo.m_startWorldTransform;
 	}
 
 	m_interpolationWorldTransform = m_worldTransform;
@@ -57,90 +74,21 @@ btRigidBody::btRigidBody(btScalar mass, btMotionState* motionState, btCollisionS
 	m_interpolationAngularVelocity.setValue(0,0,0);
 	
 	//moved to btCollisionObject
-	m_friction = friction;
-	m_restitution = restitution;
+	m_friction = constructionInfo.m_friction;
+	m_restitution = constructionInfo.m_restitution;
 
-	m_collisionShape = collisionShape;
+	setCollisionShape( constructionInfo.m_collisionShape );
 	m_debugBodyId = uniqueId++;
 	
-	//m_internalOwner is to allow upcasting from collision object to rigid body
-	m_internalOwner = this;
-
-	setMassProps(mass, localInertia);
-    setDamping(linearDamping, angularDamping);
+	setMassProps(constructionInfo.m_mass, constructionInfo.m_localInertia);
+    setDamping(constructionInfo.m_linearDamping, constructionInfo.m_angularDamping);
 	updateInertiaTensor();
 
 }
 
-#ifdef OBSOLETE_MOTIONSTATE_LESS
-btRigidBody::btRigidBody( btScalar mass,const btTransform& worldTransform,btCollisionShape* collisionShape,const btVector3& localInertia,btScalar linearDamping,btScalar angularDamping,btScalar friction,btScalar restitution)
-: 
-	m_gravity(btScalar(0.0), btScalar(0.0), btScalar(0.0)),
-	m_totalForce(btScalar(0.0), btScalar(0.0), btScalar(0.0)),
-	m_totalTorque(btScalar(0.0), btScalar(0.0), btScalar(0.0)),
-	m_linearVelocity(btScalar(0.0), btScalar(0.0), btScalar(0.0)),
-	m_angularVelocity(btScalar(0.),btScalar(0.),btScalar(0.)),
-	m_linearDamping(btScalar(0.)),
-	m_angularDamping(btScalar(0.5)),
-	m_optionalMotionState(0),
-	m_contactSolverType(0),
-	m_frictionSolverType(0)
-{
-	
-	m_worldTransform = worldTransform;
-	m_interpolationWorldTransform = m_worldTransform;
-	m_interpolationLinearVelocity.setValue(0,0,0);
-	m_interpolationAngularVelocity.setValue(0,0,0);
-
-	//moved to btCollisionObject
-	m_friction = friction;
-	m_restitution = restitution;
-
-	m_collisionShape = collisionShape;
-	m_debugBodyId = uniqueId++;
-	
-	//m_internalOwner is to allow upcasting from collision object to rigid body
-	m_internalOwner = this;
-
-	setMassProps(mass, localInertia);
-    setDamping(linearDamping, angularDamping);
-	updateInertiaTensor();
-
-}
-
-#endif //OBSOLETE_MOTIONSTATE_LESS
-
-
-
-
-//#define EXPERIMENTAL_JITTER_REMOVAL 1
-#ifdef EXPERIMENTAL_JITTER_REMOVAL
-//Bullet 2.20b has experimental damping code to reduce jitter just before objects fall asleep/deactivate
-//doesn't work very well yet (value 0 disabled this damping)
-//note there this influences deactivation thresholds!
-btScalar gClippedAngvelThresholdSqr = btScalar(0.01);
-btScalar	gClippedLinearThresholdSqr = btScalar(0.01);
-#endif //EXPERIMENTAL_JITTER_REMOVAL
-
-btScalar	gJitterVelocityDampingFactor = btScalar(0.7);
 
 void btRigidBody::predictIntegratedTransform(btScalar timeStep,btTransform& predictedTransform) 
 {
-
-#ifdef EXPERIMENTAL_JITTER_REMOVAL
-	//if (wantsSleeping())
-	{
-		//clip to avoid jitter
-		if ((m_angularVelocity.length2() < gClippedAngvelThresholdSqr) &&
-			(m_linearVelocity.length2() < gClippedLinearThresholdSqr))
-		{
-			m_angularVelocity *= gJitterVelocityDampingFactor;
-			m_linearVelocity *= gJitterVelocityDampingFactor;
-		}
-	}
-	
-#endif //EXPERIMENTAL_JITTER_REMOVAL
-
 	btTransformUtil::integrateTransform(m_worldTransform,m_linearVelocity,m_angularVelocity,timeStep,predictedTransform);
 }
 
@@ -191,50 +139,63 @@ void btRigidBody::setDamping(btScalar lin_damping, btScalar ang_damping)
 
 
 
-#include <stdio.h>
+
+///applyDamping damps the velocity, using the given m_linearDamping and m_angularDamping
+void			btRigidBody::applyDamping(btScalar timeStep)
+{
+	m_linearVelocity *= GEN_clamped((btScalar(1.) - timeStep * m_linearDamping), (btScalar)btScalar(0.0), (btScalar)btScalar(1.0));
+	m_angularVelocity *= GEN_clamped((btScalar(1.) - timeStep * m_angularDamping), (btScalar)btScalar(0.0), (btScalar)btScalar(1.0));
+
+	if (m_additionalDamping)
+	{
+		//Additional damping can help avoiding lowpass jitter motion, help stability for ragdolls etc.
+		//Such damping is undesirable, so once the overall simulation quality of the rigid body dynamics system has improved, this should become obsolete
+		if ((m_angularVelocity.length2() < m_additionalAngularDampingThresholdSqr) &&
+			(m_linearVelocity.length2() < m_additionalLinearDampingThresholdSqr))
+		{
+			m_angularVelocity *= m_additionalDampingFactor;
+			m_linearVelocity *= m_additionalDampingFactor;
+		}
+	
+
+		btScalar speed = m_linearVelocity.length();
+		if (speed < m_linearDamping)
+		{
+			btScalar dampVel = btScalar(0.005);
+			if (speed > dampVel)
+			{
+				btVector3 dir = m_linearVelocity.normalized();
+				m_linearVelocity -=  dir * dampVel;
+			} else
+			{
+				m_linearVelocity.setValue(btScalar(0.),btScalar(0.),btScalar(0.));
+			}
+		}
+
+		btScalar angSpeed = m_angularVelocity.length();
+		if (angSpeed < m_angularDamping)
+		{
+			btScalar angDampVel = btScalar(0.005);
+			if (angSpeed > angDampVel)
+			{
+				btVector3 dir = m_angularVelocity.normalized();
+				m_angularVelocity -=  dir * angDampVel;
+			} else
+			{
+				m_angularVelocity.setValue(btScalar(0.),btScalar(0.),btScalar(0.));
+			}
+		}
+	}
+}
 
 
-void btRigidBody::applyForces(btScalar step)
+void btRigidBody::applyGravity()
 {
 	if (isStaticOrKinematicObject())
 		return;
 	
 	applyCentralForce(m_gravity);	
-	
-	m_linearVelocity *= GEN_clamped((btScalar(1.) - step * gLinearAirDamping * m_linearDamping), (btScalar)btScalar(0.0), (btScalar)btScalar(1.0));
-	m_angularVelocity *= GEN_clamped((btScalar(1.) - step * m_angularDamping), (btScalar)btScalar(0.0), (btScalar)btScalar(1.0));
 
-#define FORCE_VELOCITY_DAMPING 1
-#ifdef FORCE_VELOCITY_DAMPING
-	btScalar speed = m_linearVelocity.length();
-	if (speed < m_linearDamping)
-	{
-		btScalar dampVel = btScalar(0.005);
-		if (speed > dampVel)
-		{
-			btVector3 dir = m_linearVelocity.normalized();
-			m_linearVelocity -=  dir * dampVel;
-		} else
-		{
-			m_linearVelocity.setValue(btScalar(0.),btScalar(0.),btScalar(0.));
-		}
-	}
-
-	btScalar angSpeed = m_angularVelocity.length();
-	if (angSpeed < m_angularDamping)
-	{
-		btScalar angDampVel = btScalar(0.005);
-		if (angSpeed > angDampVel)
-		{
-			btVector3 dir = m_angularVelocity.normalized();
-			m_angularVelocity -=  dir * angDampVel;
-		} else
-		{
-			m_angularVelocity.setValue(btScalar(0.),btScalar(0.),btScalar(0.));
-		}
-	}
-#endif //FORCE_VELOCITY_DAMPING
-	
 }
 
 void btRigidBody::proceedToTransform(const btTransform& newTrans)
@@ -285,7 +246,6 @@ void btRigidBody::integrateVelocities(btScalar step)
 		m_angularVelocity *= (MAX_ANGVEL/step) /angvel;
 	}
 
-	clearForces();
 }
 
 btQuaternion btRigidBody::getOrientation() const
diff --git a/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h b/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h
index 0707595d48e..4596f90a00f 100644
--- a/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h
+++ b/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h
@@ -16,27 +16,29 @@ subject to the following restrictions:
 #ifndef RIGIDBODY_H
 #define RIGIDBODY_H
 
-#include "../../LinearMath/btAlignedObjectArray.h"
-#include "../../LinearMath/btPoint3.h"
-#include "../../LinearMath/btTransform.h"
-#include "../../BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
-#include "../../BulletCollision/CollisionDispatch/btCollisionObject.h"
+#include "LinearMath/btAlignedObjectArray.h"
+#include "LinearMath/btPoint3.h"
+#include "LinearMath/btTransform.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
 
 class btCollisionShape;
 class btMotionState;
 class btTypedConstraint;
 
 
-extern btScalar gLinearAirDamping;
-
 extern btScalar gDeactivationTime;
 extern bool gDisableDeactivation;
-extern btScalar gLinearSleepingThreshold;
-extern btScalar gAngularSleepingThreshold;
 
 
-/// btRigidBody class for btRigidBody Dynamics
-/// 
+///btRigidBody is the main class for rigid body objects. It is derived from btCollisionObject, so it keeps a pointer to a btCollisionShape.
+///It is recommended for performance and memory use to share btCollisionShape objects whenever possible.
+///There are 3 types of rigid bodies: 
+///- A) Dynamic rigid bodies, with positive mass. Motion is controlled by rigid body dynamics.
+///- B) Fixed objects with zero mass. They are not moving (basically collision objects)
+///- C) Kinematic objects, which are objects without mass, but the user can move them. There is on-way interaction, and Bullet calculates a velocity based on the timestep and previous and current world transform.
+///Bullet automatically deactivates dynamic rigid bodies, when the velocity is below a threshold for a given time.
+///Deactivated (sleeping) rigid bodies don't take any processing time, except a minor broadphase collision detection impact (to allow active objects to activate/wake up sleeping objects)
 class btRigidBody  : public btCollisionObject
 {
 
@@ -53,7 +55,16 @@ class btRigidBody  : public btCollisionObject
 	
 	btScalar		m_linearDamping;
 	btScalar		m_angularDamping;
-	
+
+	bool			m_additionalDamping;
+	btScalar		m_additionalDampingFactor;
+	btScalar		m_additionalLinearDampingThresholdSqr;
+	btScalar		m_additionalAngularDampingThresholdSqr;
+	btScalar		m_additionalAngularDampingFactor;
+
+
+	btScalar		m_linearSleepingThreshold;
+	btScalar		m_angularSleepingThreshold;
 
 	//m_optionalMotionState allows to automatic synchronize the world transform for active objects
 	btMotionState*	m_optionalMotionState;
@@ -63,12 +74,85 @@ class btRigidBody  : public btCollisionObject
 
 public:
 
-#ifdef OBSOLETE_MOTIONSTATE_LESS
-	//not supported, please use btMotionState
-	btRigidBody(btScalar mass, const btTransform& worldTransform, btCollisionShape* collisionShape, const btVector3& localInertia=btVector3(0,0,0),btScalar linearDamping=btScalar(0.),btScalar angularDamping=btScalar(0.),btScalar friction=btScalar(0.5),btScalar restitution=btScalar(0.));
-#endif //OBSOLETE_MOTIONSTATE_LESS
 
-	btRigidBody(btScalar mass, btMotionState* motionState, btCollisionShape* collisionShape, const btVector3& localInertia=btVector3(0,0,0),btScalar linearDamping=btScalar(0.),btScalar angularDamping=btScalar(0.),btScalar friction=btScalar(0.5),btScalar restitution=btScalar(0.));
+	///btRigidBodyConstructionInfo provides information to create a rigid body. Setting mass to zero creates a fixed (non-dynamic) rigid body.
+	///For dynamic objects, you can use the collision shape to approximate the local inertia tensor, otherwise use the zero vector (default argument)
+	///You can use the motion state to synchronize the world transform between physics and graphics objects. 
+	///And if the motion state is provided, the rigid body will initialize its initial world transform from the motion state,
+	///m_startWorldTransform is only used when you don't provide a motion state.
+	struct	btRigidBodyConstructionInfo
+	{
+		btScalar			m_mass;
+
+		///When a motionState is provided, the rigid body will initialize its world transform from the motion state
+		///In this case, m_startWorldTransform is ignored.
+		btMotionState*		m_motionState;
+		btTransform	m_startWorldTransform;
+
+		btCollisionShape*	m_collisionShape;
+		btVector3			m_localInertia;
+		btScalar			m_linearDamping;
+		btScalar			m_angularDamping;
+
+		///best simulation results when friction is non-zero
+		btScalar			m_friction;
+		///best simulation results using zero restitution.
+		btScalar			m_restitution;
+
+		btScalar			m_linearSleepingThreshold;
+		btScalar			m_angularSleepingThreshold;
+
+		//Additional damping can help avoiding lowpass jitter motion, help stability for ragdolls etc.
+		//Such damping is undesirable, so once the overall simulation quality of the rigid body dynamics system has improved, this should become obsolete
+		bool				m_additionalDamping;
+		btScalar			m_additionalDampingFactor;
+		btScalar			m_additionalLinearDampingThresholdSqr;
+		btScalar			m_additionalAngularDampingThresholdSqr;
+		btScalar			m_additionalAngularDampingFactor;
+
+		
+		btRigidBodyConstructionInfo(	btScalar mass, btMotionState* motionState, btCollisionShape* collisionShape, const btVector3& localInertia=btVector3(0,0,0)):
+		m_mass(mass),
+			m_motionState(motionState),
+			m_collisionShape(collisionShape),
+			m_localInertia(localInertia),
+			m_linearDamping(btScalar(0.)),
+			m_angularDamping(btScalar(0.)),
+			m_friction(btScalar(0.5)),
+			m_restitution(btScalar(0.)),
+			m_linearSleepingThreshold(btScalar(0.8)),
+			m_angularSleepingThreshold(btScalar(1.f)),
+			m_additionalDamping(false),
+			m_additionalDampingFactor(btScalar(0.005)),
+			m_additionalLinearDampingThresholdSqr(btScalar(0.01)),
+			m_additionalAngularDampingThresholdSqr(btScalar(0.01)),
+			m_additionalAngularDampingFactor(btScalar(0.01))
+		{
+			m_startWorldTransform.setIdentity();
+		}
+	};
+
+	///btRigidBody constructor using construction info
+	btRigidBody(	const btRigidBodyConstructionInfo& constructionInfo);
+
+	///btRigidBody constructor for backwards compatibility. 
+	///To specify friction (etc) during rigid body construction, please use the other constructor (using btRigidBodyConstructionInfo)
+	btRigidBody(	btScalar mass, btMotionState* motionState, btCollisionShape* collisionShape, const btVector3& localInertia=btVector3(0,0,0));
+
+
+	virtual ~btRigidBody()
+        { 
+                //No constraints should point to this rigidbody
+		//Remove constraints from the dynamics world before you delete the related rigidbodies. 
+                btAssert(m_constraintRefs.size()==0); 
+        }
+
+protected:
+
+	///setupRigidBody is only used internally by the constructor
+	void	setupRigidBody(const btRigidBodyConstructionInfo& constructionInfo);
+
+public:
 
 	void			proceedToTransform(const btTransform& newTrans); 
 	
@@ -76,11 +160,15 @@ public:
 	///but a rigidbody is derived from btCollisionObject, so we can safely perform an upcast
 	static const btRigidBody*	upcast(const btCollisionObject* colObj)
 	{
-		return (const btRigidBody*)colObj->getInternalOwner();
+		if (colObj->getInternalType()==btCollisionObject::CO_RIGID_BODY)
+			return (const btRigidBody*)colObj;
+		return 0;
 	}
 	static btRigidBody*	upcast(btCollisionObject* colObj)
 	{
-		return (btRigidBody*)colObj->getInternalOwner();
+		if (colObj->getInternalType()==btCollisionObject::CO_RIGID_BODY)
+			return (btRigidBody*)colObj;
+		return 0;
 	}
 	
 	/// continuous collision detection needs prediction
@@ -88,8 +176,7 @@ public:
 	
 	void			saveKinematicState(btScalar step);
 	
-
-	void			applyForces(btScalar step);
+	void			applyGravity();
 	
 	void			setGravity(const btVector3& acceleration);  
 
@@ -99,12 +186,34 @@ public:
 	}
 
 	void			setDamping(btScalar lin_damping, btScalar ang_damping);
-	
-	inline const btCollisionShape*	getCollisionShape() const {
+
+	btScalar getLinearDamping() const
+	{
+		return m_linearDamping;
+	}
+
+	btScalar getAngularDamping() const
+	{
+		return m_angularDamping;
+	}
+
+	btScalar getLinearSleepingThreshold() const
+	{
+		return m_linearSleepingThreshold;
+	}
+
+	btScalar getAngularSleepingThreshold() const
+	{
+		return m_angularSleepingThreshold;
+	}
+
+	void			applyDamping(btScalar timeStep);
+
+	SIMD_FORCE_INLINE const btCollisionShape*	getCollisionShape() const {
 		return m_collisionShape;
 	}
 
-	inline btCollisionShape*	getCollisionShape() {
+	SIMD_FORCE_INLINE btCollisionShape*	getCollisionShape() {
 			return m_collisionShape;
 	}
 	
@@ -134,6 +243,12 @@ public:
 		m_invInertiaLocal = diagInvInertia;
 	}
 
+	void	setSleepingThresholds(btScalar linear,btScalar angular)
+	{
+		m_linearSleepingThreshold = linear;
+		m_angularSleepingThreshold = angular;
+	}
+
 	void	applyTorque(const btVector3& torque)
 	{
 		m_totalTorque += torque;
@@ -142,7 +257,7 @@ public:
 	void	applyForce(const btVector3& force, const btVector3& rel_pos) 
 	{
 		applyCentralForce(force);
-		applyTorque(rel_pos.cross(force));
+		applyTorque(rel_pos.cross(force)*m_angularFactor);
 	}
 	
 	void applyCentralImpulse(const btVector3& impulse)
@@ -168,7 +283,7 @@ public:
 	}
 
 	//Optimization for the iterative solver: avoid calculating constant terms involving inertia, normal, relative position
-	inline void internalApplyImpulse(const btVector3& linearComponent, const btVector3& angularComponent,btScalar impulseMagnitude)
+	SIMD_FORCE_INLINE void internalApplyImpulse(const btVector3& linearComponent, const btVector3& angularComponent,btScalar impulseMagnitude)
 	{
 		if (m_inverseMass != btScalar(0.))
 		{
@@ -238,7 +353,7 @@ public:
 
 
 	
-	inline btScalar computeImpulseDenominator(const btPoint3& pos, const btVector3& normal) const
+	SIMD_FORCE_INLINE btScalar computeImpulseDenominator(const btPoint3& pos, const btVector3& normal) const
 	{
 		btVector3 r0 = pos - getCenterOfMassPosition();
 
@@ -250,19 +365,19 @@ public:
 
 	}
 
-	inline btScalar computeAngularImpulseDenominator(const btVector3& axis) const
+	SIMD_FORCE_INLINE btScalar computeAngularImpulseDenominator(const btVector3& axis) const
 	{
 		btVector3 vec = axis * getInvInertiaTensorWorld();
 		return axis.dot(vec);
 	}
 
-	inline void	updateDeactivation(btScalar timeStep)
+	SIMD_FORCE_INLINE void	updateDeactivation(btScalar timeStep)
 	{
 		if ( (getActivationState() == ISLAND_SLEEPING) || (getActivationState() == DISABLE_DEACTIVATION))
 			return;
 
-		if ((getLinearVelocity().length2() < gLinearSleepingThreshold*gLinearSleepingThreshold) &&
-			(getAngularVelocity().length2() < gAngularSleepingThreshold*gAngularSleepingThreshold))
+		if ((getLinearVelocity().length2() < m_linearSleepingThreshold*m_linearSleepingThreshold) &&
+			(getAngularVelocity().length2() < m_angularSleepingThreshold*m_angularSleepingThreshold))
 		{
 			m_deactivationTime += timeStep;
 		} else
@@ -273,7 +388,7 @@ public:
 
 	}
 
-	inline bool	wantsSleeping()
+	SIMD_FORCE_INLINE bool	wantsSleeping()
 	{
 
 		if (getActivationState() == DISABLE_DEACTIVATION)
@@ -348,6 +463,16 @@ public:
 	void addConstraintRef(btTypedConstraint* c);
 	void removeConstraintRef(btTypedConstraint* c);
 
+	btTypedConstraint* getConstraintRef(int index)
+	{
+		return m_constraintRefs[index];
+	}
+
+	int getNumConstraintRefs()
+	{
+		return m_constraintRefs.size();
+	}
+
 	int	m_debugBodyId;
 };
 
diff --git a/extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp b/extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp
index 4ebcb8e7517..3be04d1a4ad 100644
--- a/extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp
+++ b/extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp
@@ -27,16 +27,19 @@ subject to the following restrictions:
   can be used by probes that are checking whether the
   library is actually installed.
 */
-extern "C" void btBulletDynamicsProbe () {}
+extern "C" 
+{
+	void btBulletDynamicsProbe ();
+	void btBulletDynamicsProbe () {}
+}
 
 
 
 
-btSimpleDynamicsWorld::btSimpleDynamicsWorld(btDispatcher* dispatcher,btOverlappingPairCache* pairCache,btConstraintSolver* constraintSolver)
-:btDynamicsWorld(dispatcher,pairCache),
+btSimpleDynamicsWorld::btSimpleDynamicsWorld(btDispatcher* dispatcher,btBroadphaseInterface* pairCache,btConstraintSolver* constraintSolver,btCollisionConfiguration* collisionConfiguration)
+:btDynamicsWorld(dispatcher,pairCache,collisionConfiguration),
 m_constraintSolver(constraintSolver),
 m_ownsConstraintSolver(false),
-m_debugDrawer(0),
 m_gravity(0,0,-10)
 {
 
@@ -46,7 +49,7 @@ m_gravity(0,0,-10)
 btSimpleDynamicsWorld::~btSimpleDynamicsWorld()
 {
 	if (m_ownsConstraintSolver)
-		delete m_constraintSolver;
+		btAlignedFree( m_constraintSolver);
 }
 
 int		btSimpleDynamicsWorld::stepSimulation( btScalar timeStep,int maxSubSteps, btScalar fixedTimeStep)
@@ -74,8 +77,9 @@ int		btSimpleDynamicsWorld::stepSimulation( btScalar timeStep,int maxSubSteps, b
 		
 		btContactSolverInfo infoGlobal;
 		infoGlobal.m_timeStep = timeStep;
-		
-		m_constraintSolver->solveGroup(0,0,manifoldPtr, numManifolds,0,0,infoGlobal,m_debugDrawer, m_stackAlloc);
+		m_constraintSolver->prepareSolve(0,numManifolds);
+		m_constraintSolver->solveGroup(0,0,manifoldPtr, numManifolds,0,0,infoGlobal,m_debugDrawer, m_stackAlloc,m_dispatcher1);
+		m_constraintSolver->allSolved(infoGlobal,m_debugDrawer, m_stackAlloc);
 	}
 
 	///integrate transforms
@@ -85,10 +89,27 @@ int		btSimpleDynamicsWorld::stepSimulation( btScalar timeStep,int maxSubSteps, b
 
 	synchronizeMotionStates();
 
+	clearForces();
+
 	return 1;
 
 }
 
+void	btSimpleDynamicsWorld::clearForces()
+{
+	//todo: iterate over awake simulation islands!
+	for ( int i=0;i<m_collisionObjects.size();i++)
+	{
+		btCollisionObject* colObj = m_collisionObjects[i];
+		
+		btRigidBody* body = btRigidBody::upcast(colObj);
+		if (body)
+		{
+			body->clearForces();
+		}
+	}
+}	
+
 
 void	btSimpleDynamicsWorld::setGravity(const btVector3& gravity)
 {
@@ -104,6 +125,11 @@ void	btSimpleDynamicsWorld::setGravity(const btVector3& gravity)
 	}
 }
 
+btVector3 btSimpleDynamicsWorld::getGravity () const
+{
+	return m_gravity;
+}
+
 void	btSimpleDynamicsWorld::removeRigidBody(btRigidBody* body)
 {
 	removeCollisionObject(body);
@@ -133,7 +159,7 @@ void	btSimpleDynamicsWorld::updateAabbs()
 				btPoint3 minAabb,maxAabb;
 				colObj->getCollisionShape()->getAabb(colObj->getWorldTransform(), minAabb,maxAabb);
 				btBroadphaseInterface* bp = getBroadphase();
-				bp->setAabb(body->getBroadphaseHandle(),minAabb,maxAabb);
+				bp->setAabb(body->getBroadphaseHandle(),minAabb,maxAabb, m_dispatcher1);
 			}
 		}
 	}
@@ -171,8 +197,9 @@ void	btSimpleDynamicsWorld::predictUnconstraintMotion(btScalar timeStep)
 			{
 				if (body->isActive())
 				{
-					body->applyForces( timeStep);
+					body->applyGravity();
 					body->integrateVelocities( timeStep);
+					body->applyDamping(timeStep);
 					body->predictIntegratedTransform(timeStep,body->getInterpolationWorldTransform());
 				}
 			}
@@ -204,8 +231,13 @@ void	btSimpleDynamicsWorld::setConstraintSolver(btConstraintSolver* solver)
 {
 	if (m_ownsConstraintSolver)
 	{
-		delete m_constraintSolver;
+		btAlignedFree(m_constraintSolver);
 	}
 	m_ownsConstraintSolver = false;
 	m_constraintSolver = solver;
 }
+
+btConstraintSolver* btSimpleDynamicsWorld::getConstraintSolver()
+{
+	return m_constraintSolver;
+}
diff --git a/extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h b/extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h
index 25f4ccd8e68..5c56fdf1327 100644
--- a/extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h
+++ b/extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h
@@ -22,11 +22,8 @@ class btDispatcher;
 class btOverlappingPairCache;
 class btConstraintSolver;
 
-///btSimpleDynamicsWorld demonstrates very basic usage of Bullet rigid body dynamics
-///It can be used for basic simulations, and as a starting point for porting Bullet
-///btSimpleDynamicsWorld lacks object deactivation, island management and other concepts.
-///For more complicated simulations, btDiscreteDynamicsWorld and btContinuousDynamicsWorld are recommended
-///those classes replace the obsolete CcdPhysicsEnvironment/CcdPhysicsController
+///btSimpleDynamicsWorld serves as unit-test and to verify more complicated and optimized dynamics worlds.
+///Please use btDiscreteDynamicsWorld instead (or btContinuousDynamicsWorld once it is finished).
 class btSimpleDynamicsWorld : public btDynamicsWorld
 {
 protected:
@@ -35,8 +32,6 @@ protected:
 
 	bool	m_ownsConstraintSolver;
 
-	btIDebugDraw*	m_debugDrawer;
-
 	void	predictUnconstraintMotion(btScalar timeStep);
 	
 	void	integrateTransforms(btScalar timeStep);
@@ -48,25 +43,17 @@ public:
 
 
 	///this btSimpleDynamicsWorld constructor creates dispatcher, broadphase pairCache and constraintSolver
-	btSimpleDynamicsWorld(btDispatcher* dispatcher,btOverlappingPairCache* pairCache,btConstraintSolver* constraintSolver);
+	btSimpleDynamicsWorld(btDispatcher* dispatcher,btBroadphaseInterface* pairCache,btConstraintSolver* constraintSolver,btCollisionConfiguration* collisionConfiguration);
 
 	virtual ~btSimpleDynamicsWorld();
 		
 	///maxSubSteps/fixedTimeStep for interpolation is currently ignored for btSimpleDynamicsWorld, use btDiscreteDynamicsWorld instead
 	virtual int	stepSimulation( btScalar timeStep,int maxSubSteps=1, btScalar fixedTimeStep=btScalar(1.)/btScalar(60.));
 
-	virtual void	setDebugDrawer(btIDebugDraw*	debugDrawer) 
-	{
-		m_debugDrawer = debugDrawer;
-	};
-
-	virtual btIDebugDraw*	getDebugDrawer()
-	{
-		return m_debugDrawer;
-	}
-
 	virtual void	setGravity(const btVector3& gravity);
 
+	virtual btVector3 getGravity () const;
+
 	virtual void	addRigidBody(btRigidBody* body);
 
 	virtual void	removeRigidBody(btRigidBody* body);
@@ -77,6 +64,15 @@ public:
 
 	virtual void	setConstraintSolver(btConstraintSolver* solver);
 
+	virtual btConstraintSolver* getConstraintSolver();
+
+	virtual btDynamicsWorldType	getWorldType() const
+	{
+		return BT_SIMPLE_DYNAMICS_WORLD;
+	}
+
+	virtual void	clearForces();
+
 };
 
 #endif //BT_SIMPLE_DYNAMICS_WORLD_H
diff --git a/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.cpp b/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.cpp
index d53de7f3687..fe65245c2a1 100644
--- a/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.cpp
+++ b/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.cpp
@@ -23,12 +23,11 @@
 
 #include "BulletDynamics/ConstraintSolver/btContactConstraint.h"
 
-
-
 static btRigidBody s_fixedObject( 0,0,0);
 
 btRaycastVehicle::btRaycastVehicle(const btVehicleTuning& tuning,btRigidBody* chassis,	btVehicleRaycaster* raycaster )
-:m_vehicleRaycaster(raycaster),
+: btTypedConstraint(VEHICLE_CONSTRAINT_TYPE),
+m_vehicleRaycaster(raycaster),
 m_pitchControl(btScalar(0.))
 {
 	m_chassisBody = chassis;
@@ -487,6 +486,7 @@ struct btWheelContactPoint
 
 };
 
+btScalar calcRollingFriction(btWheelContactPoint& contactPoint);
 btScalar calcRollingFriction(btWheelContactPoint& contactPoint)
 {
 
@@ -507,8 +507,8 @@ btScalar calcRollingFriction(btWheelContactPoint& contactPoint)
 
 	// calculate j that moves us to zero relative velocity
 	j1 = -vrel * contactPoint.m_jacDiagABInv;
-	GEN_set_min(j1, maxImpulse);
-	GEN_set_max(j1, -maxImpulse);
+	btSetMin(j1, maxImpulse);
+	btSetMax(j1, -maxImpulse);
 
 	return j1;
 }
@@ -525,11 +525,10 @@ void	btRaycastVehicle::updateFriction(btScalar	timeStep)
 		if (!numWheel)
 			return;
 
-
-		btVector3*	forwardWS = new	btVector3[numWheel];
-		btVector3*	axle = new btVector3[numWheel];
-		btScalar* forwardImpulse = new btScalar[numWheel];
-		btScalar* sideImpulse = new btScalar[numWheel];
+		m_forwardWS.resize(numWheel);
+		m_axle.resize(numWheel);
+		m_forwardImpulse.resize(numWheel);
+		m_sideImpulse.resize(numWheel);
 		
 		int numWheelsOnGround = 0;
 	
@@ -541,8 +540,8 @@ void	btRaycastVehicle::updateFriction(btScalar	timeStep)
 			class btRigidBody* groundObject = (class btRigidBody*) wheelInfo.m_raycastInfo.m_groundObject;
 			if (groundObject)
 				numWheelsOnGround++;
-			sideImpulse[i] = btScalar(0.);
-			forwardImpulse[i] = btScalar(0.);
+			m_sideImpulse[i] = btScalar(0.);
+			m_forwardImpulse[i] = btScalar(0.);
 
 		}
 	
@@ -561,25 +560,25 @@ void	btRaycastVehicle::updateFriction(btScalar	timeStep)
 					const btTransform& wheelTrans = getWheelTransformWS( i );
 
 					btMatrix3x3 wheelBasis0 = wheelTrans.getBasis();
-					axle[i] = btVector3(	
+					m_axle[i] = btVector3(	
 						wheelBasis0[0][m_indexRightAxis],
 						wheelBasis0[1][m_indexRightAxis],
 						wheelBasis0[2][m_indexRightAxis]);
 					
 					const btVector3& surfNormalWS = wheelInfo.m_raycastInfo.m_contactNormalWS;
-					btScalar proj = axle[i].dot(surfNormalWS);
-					axle[i] -= surfNormalWS * proj;
-					axle[i] = axle[i].normalize();
+					btScalar proj = m_axle[i].dot(surfNormalWS);
+					m_axle[i] -= surfNormalWS * proj;
+					m_axle[i] = m_axle[i].normalize();
 					
-					forwardWS[i] = surfNormalWS.cross(axle[i]);
-					forwardWS[i].normalize();
+					m_forwardWS[i] = surfNormalWS.cross(m_axle[i]);
+					m_forwardWS[i].normalize();
 
 				
 					resolveSingleBilateral(*m_chassisBody, wheelInfo.m_raycastInfo.m_contactPointWS,
 							  *groundObject, wheelInfo.m_raycastInfo.m_contactPointWS,
-							  btScalar(0.), axle[i],sideImpulse[i],timeStep);
+							  btScalar(0.), m_axle[i],m_sideImpulse[i],timeStep);
 
-					sideImpulse[i] *= sideFrictionStiffness2;
+					m_sideImpulse[i] *= sideFrictionStiffness2;
 						
 				}
 				
@@ -608,7 +607,7 @@ void	btRaycastVehicle::updateFriction(btScalar	timeStep)
 				{
 					btScalar defaultRollingFrictionImpulse = 0.f;
 					btScalar maxImpulse = wheelInfo.m_brake ? wheelInfo.m_brake : defaultRollingFrictionImpulse;
-					btWheelContactPoint contactPt(m_chassisBody,groundObject,wheelInfo.m_raycastInfo.m_contactPointWS,forwardWS[wheel],maxImpulse);
+					btWheelContactPoint contactPt(m_chassisBody,groundObject,wheelInfo.m_raycastInfo.m_contactPointWS,m_forwardWS[wheel],maxImpulse);
 					rollingFriction = calcRollingFriction(contactPt);
 				}
 			}
@@ -618,7 +617,7 @@ void	btRaycastVehicle::updateFriction(btScalar	timeStep)
 
 
 
-			forwardImpulse[wheel] = btScalar(0.);
+			m_forwardImpulse[wheel] = btScalar(0.);
 			m_wheelInfo[wheel].m_skidInfo= btScalar(1.);
 
 			if (groundObject)
@@ -631,10 +630,10 @@ void	btRaycastVehicle::updateFriction(btScalar	timeStep)
 				btScalar maximpSquared = maximp * maximpSide;
 			
 
-				forwardImpulse[wheel] = rollingFriction;//wheelInfo.m_engineForce* timeStep;
+				m_forwardImpulse[wheel] = rollingFriction;//wheelInfo.m_engineForce* timeStep;
 
-				btScalar x = (forwardImpulse[wheel] ) * fwdFactor;
-				btScalar y = (sideImpulse[wheel] ) * sideFactor;
+				btScalar x = (m_forwardImpulse[wheel] ) * fwdFactor;
+				btScalar y = (m_sideImpulse[wheel] ) * sideFactor;
 				
 				btScalar impulseSquared = (x*x + y*y);
 
@@ -658,12 +657,12 @@ void	btRaycastVehicle::updateFriction(btScalar	timeStep)
 		{
 			for (int wheel = 0;wheel < getNumWheels(); wheel++)
 			{
-				if (sideImpulse[wheel] != btScalar(0.))
+				if (m_sideImpulse[wheel] != btScalar(0.))
 				{
 					if (m_wheelInfo[wheel].m_skidInfo< btScalar(1.))
 					{
-						forwardImpulse[wheel] *=	m_wheelInfo[wheel].m_skidInfo;
-						sideImpulse[wheel] *= m_wheelInfo[wheel].m_skidInfo;
+						m_forwardImpulse[wheel] *=	m_wheelInfo[wheel].m_skidInfo;
+						m_sideImpulse[wheel] *= m_wheelInfo[wheel].m_skidInfo;
 					}
 				}
 			}
@@ -678,11 +677,11 @@ void	btRaycastVehicle::updateFriction(btScalar	timeStep)
 				btVector3 rel_pos = wheelInfo.m_raycastInfo.m_contactPointWS - 
 						m_chassisBody->getCenterOfMassPosition();
 
-				if (forwardImpulse[wheel] != btScalar(0.))
+				if (m_forwardImpulse[wheel] != btScalar(0.))
 				{
-					m_chassisBody->applyImpulse(forwardWS[wheel]*(forwardImpulse[wheel]),rel_pos);
+					m_chassisBody->applyImpulse(m_forwardWS[wheel]*(m_forwardImpulse[wheel]),rel_pos);
 				}
-				if (sideImpulse[wheel] != btScalar(0.))
+				if (m_sideImpulse[wheel] != btScalar(0.))
 				{
 					class btRigidBody* groundObject = (class btRigidBody*) m_wheelInfo[wheel].m_raycastInfo.m_groundObject;
 
@@ -690,7 +689,7 @@ void	btRaycastVehicle::updateFriction(btScalar	timeStep)
 						groundObject->getCenterOfMassPosition();
 
 					
-					btVector3 sideImp = axle[wheel] * sideImpulse[wheel];
+					btVector3 sideImp = m_axle[wheel] * m_sideImpulse[wheel];
 
 					rel_pos[2] *= wheelInfo.m_rollInfluence;
 					m_chassisBody->applyImpulse(sideImp,rel_pos);
@@ -701,10 +700,7 @@ void	btRaycastVehicle::updateFriction(btScalar	timeStep)
 			}
 		}
 
-		delete []forwardWS;
-		delete [] axle;
-		delete[]forwardImpulse;
-		delete[] sideImpulse;
+	
 }
 
 
@@ -716,11 +712,11 @@ void* btDefaultVehicleRaycaster::castRay(const btVector3& from,const btVector3&
 
 	m_dynamicsWorld->rayTest(from, to, rayCallback);
 
-	if (rayCallback.HasHit())
+	if (rayCallback.hasHit())
 	{
 		
 		btRigidBody* body = btRigidBody::upcast(rayCallback.m_collisionObject);
-		if (body)
+        if (body && body->hasContactResponse())
 		{
 			result.m_hitPointInWorld = rayCallback.m_hitPointWorld;
 			result.m_hitNormalInWorld = rayCallback.m_hitNormalWorld;
diff --git a/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.h b/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.h
index f4249599615..8361dcabe4b 100644
--- a/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.h
+++ b/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.h
@@ -11,11 +11,11 @@
 #ifndef RAYCASTVEHICLE_H
 #define RAYCASTVEHICLE_H
 
-#include "../Dynamics/btRigidBody.h"
-#include "../ConstraintSolver/btTypedConstraint.h"
+#include "BulletDynamics/Dynamics/btRigidBody.h"
+#include "BulletDynamics/ConstraintSolver/btTypedConstraint.h"
 #include "btVehicleRaycaster.h"
 class btDynamicsWorld;
-#include "../../LinearMath/btAlignedObjectArray.h"
+#include "LinearMath/btAlignedObjectArray.h"
 #include "btWheelInfo.h"
 
 class btVehicleTuning;
@@ -23,6 +23,12 @@ class btVehicleTuning;
 ///rayCast vehicle, very special constraint that turn a rigidbody into a vehicle.
 class btRaycastVehicle : public btTypedConstraint
 {
+
+		btAlignedObjectArray<btVector3>	m_forwardWS;
+		btAlignedObjectArray<btVector3>	m_axle;
+		btAlignedObjectArray<btScalar>	m_forwardImpulse;
+		btAlignedObjectArray<btScalar>	m_sideImpulse;
+
 public:
 	class btVehicleTuning
 		{
@@ -114,7 +120,7 @@ public:
 	
 	void	updateSuspension(btScalar deltaTime);
 
-	void	updateFriction(btScalar	timeStep);
+	virtual void	updateFriction(btScalar	timeStep);
 
 
 
diff --git a/extern/bullet2/src/BulletDynamics/Vehicle/btVehicleRaycaster.h b/extern/bullet2/src/BulletDynamics/Vehicle/btVehicleRaycaster.h
index 64a47fcaada..5112ce6d420 100644
--- a/extern/bullet2/src/BulletDynamics/Vehicle/btVehicleRaycaster.h
+++ b/extern/bullet2/src/BulletDynamics/Vehicle/btVehicleRaycaster.h
@@ -11,7 +11,7 @@
 #ifndef VEHICLE_RAYCASTER_H
 #define VEHICLE_RAYCASTER_H
 
-#include "../../LinearMath/btVector3.h"
+#include "LinearMath/btVector3.h"
 
 /// btVehicleRaycaster is provides interface for between vehicle simulation and raycasting
 struct btVehicleRaycaster
diff --git a/extern/bullet2/src/BulletDynamics/Vehicle/btWheelInfo.h b/extern/bullet2/src/BulletDynamics/Vehicle/btWheelInfo.h
index 2e349b3fde4..ac2729f4fd7 100644
--- a/extern/bullet2/src/BulletDynamics/Vehicle/btWheelInfo.h
+++ b/extern/bullet2/src/BulletDynamics/Vehicle/btWheelInfo.h
@@ -11,8 +11,8 @@
 #ifndef WHEEL_INFO_H
 #define WHEEL_INFO_H
 
-#include "../../LinearMath/btVector3.h"
-#include "../../LinearMath/btTransform.h"
+#include "LinearMath/btVector3.h"
+#include "LinearMath/btTransform.h"
 
 class btRigidBody;
 
diff --git a/extern/bullet2/src/BulletSoftBody/CMakeLists.txt b/extern/bullet2/src/BulletSoftBody/CMakeLists.txt
new file mode 100644
index 00000000000..a725e10ff77
--- /dev/null
+++ b/extern/bullet2/src/BulletSoftBody/CMakeLists.txt
@@ -0,0 +1,21 @@
+
+INCLUDE_DIRECTORIES(
+${BULLET_PHYSICS_SOURCE_DIR}/src }
+)
+
+ADD_LIBRARY(LibBulletSoftBody
+	btSoftBody.cpp
+	btSoftBody.h
+	btSoftBodyHelpers.cpp
+	btSparseSDF.h
+	btSoftBodyHelpers.h
+	btSoftBodyRigidBodyCollisionConfiguration.cpp
+	btSoftRigidCollisionAlgorithm.cpp
+	btSoftRigidCollisionAlgorithm.h
+	btSoftSoftCollisionAlgorithm.cpp
+	btSoftSoftCollisionAlgorithm.h
+	btSoftBodyConcaveCollisionAlgorithm.cpp
+	btSoftBodyConcaveCollisionAlgorithm.h
+	btSoftRigidDynamicsWorld.h
+	btSoftRigidDynamicsWorld.cpp
+)
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp b/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
new file mode 100644
index 00000000000..dfb48e2ff2d
--- /dev/null
+++ b/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
@@ -0,0 +1,2590 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+///btSoftBody implementation by Nathanael Presson
+
+#include "btSoftBodyInternals.h"
+
+//
+btSoftBody::btSoftBody(btSoftBodyWorldInfo*	worldInfo,int node_count,  const btVector3* x,  const btScalar* m)
+:m_worldInfo(worldInfo)
+{	
+	/* Init		*/ 
+	m_internalType		=	CO_SOFT_BODY;
+	m_cfg.aeromodel		=	eAeroModel::V_Point;
+	m_cfg.kVCF			=	1;
+	m_cfg.kDG			=	0;
+	m_cfg.kLF			=	0;
+	m_cfg.kDP			=	0;
+	m_cfg.kPR			=	0;
+	m_cfg.kVC			=	0;
+	m_cfg.kDF			=	(btScalar)0.2;
+	m_cfg.kMT			=	0;
+	m_cfg.kCHR			=	(btScalar)1.0;
+	m_cfg.kKHR			=	(btScalar)0.1;
+	m_cfg.kSHR			=	(btScalar)1.0;
+	m_cfg.kAHR			=	(btScalar)0.7;
+	m_cfg.kSRHR_CL		=	(btScalar)0.1;
+	m_cfg.kSKHR_CL		=	(btScalar)1;
+	m_cfg.kSSHR_CL		=	(btScalar)0.5;
+	m_cfg.kSR_SPLT_CL	=	(btScalar)0.5;
+	m_cfg.kSK_SPLT_CL	=	(btScalar)0.5;
+	m_cfg.kSS_SPLT_CL	=	(btScalar)0.5;
+	m_cfg.maxvolume		=	(btScalar)1;
+	m_cfg.timescale		=	1;
+	m_cfg.viterations	=	0;
+	m_cfg.piterations	=	1;	
+	m_cfg.diterations	=	0;
+	m_cfg.citerations	=	4;
+	m_cfg.collisions	=	fCollision::Default;
+	m_pose.m_bvolume	=	false;
+	m_pose.m_bframe		=	false;
+	m_pose.m_volume		=	0;
+	m_pose.m_com		=	btVector3(0,0,0);
+	m_pose.m_rot.setIdentity();
+	m_pose.m_scl.setIdentity();
+	m_tag				=	0;
+	m_timeacc			=	0;
+	m_bUpdateRtCst		=	true;
+	m_bounds[0]			=	btVector3(0,0,0);
+	m_bounds[1]			=	btVector3(0,0,0);
+	m_worldTransform.setIdentity();
+	setSolver(eSolverPresets::Positions);
+	/* Default material	*/ 
+	Material*	pm=appendMaterial();
+	pm->m_kLST	=	1;
+	pm->m_kAST	=	1;
+	pm->m_kVST	=	1;
+	pm->m_flags	=	fMaterial::Default;
+	/* Collision shape	*/ 
+	///for now, create a collision shape internally
+	setCollisionShape(new btSoftBodyCollisionShape(this));	
+	m_collisionShape->setMargin(0.25);
+	/* Nodes			*/ 
+	const btScalar		margin=getCollisionShape()->getMargin();
+	m_nodes.resize(node_count);
+	for(int i=0,ni=node_count;i<ni;++i)
+	{	
+		Node&	n=m_nodes[i];
+		ZeroInitialize(n);
+		n.m_x		=	x?*x++:btVector3(0,0,0);
+		n.m_q		=	n.m_x;
+		n.m_im		=	m?*m++:1;
+		n.m_im		=	n.m_im>0?1/n.m_im:0;
+		n.m_leaf	=	m_ndbvt.insert(btDbvtVolume::FromCR(n.m_x,margin),&n);
+		n.m_material=	pm;
+	}
+	updateBounds();	
+
+
+}
+
+//
+btSoftBody::~btSoftBody()
+{
+	//for now, delete the internal shape
+	delete m_collisionShape;	
+	int i;
+
+	for(i=0;i<m_clusters.size();++i)
+		btAlignedFree(m_clusters[i]);
+	for(i=0;i<m_materials.size();++i) 
+		btAlignedFree(m_materials[i]);
+	for(i=0;i<m_joints.size();++i) 
+		btAlignedFree(m_joints[i]);
+}
+
+//
+bool			btSoftBody::checkLink(int node0,int node1) const
+{
+	return(checkLink(&m_nodes[node0],&m_nodes[node1]));
+}
+
+//
+bool			btSoftBody::checkLink(const Node* node0,const Node* node1) const
+{
+	const Node*	n[]={node0,node1};
+	for(int i=0,ni=m_links.size();i<ni;++i)
+	{
+		const Link&	l=m_links[i];
+		if(	(l.m_n[0]==n[0]&&l.m_n[1]==n[1])||
+			(l.m_n[0]==n[1]&&l.m_n[1]==n[0]))
+		{
+			return(true);
+		}
+	}
+	return(false);
+}
+
+//
+bool			btSoftBody::checkFace(int node0,int node1,int node2) const
+{
+	const Node*	n[]={	&m_nodes[node0],
+		&m_nodes[node1],
+		&m_nodes[node2]};
+	for(int i=0,ni=m_faces.size();i<ni;++i)
+	{
+		const Face&	f=m_faces[i];
+		int			c=0;
+		for(int j=0;j<3;++j)
+		{
+			if(	(f.m_n[j]==n[0])||
+				(f.m_n[j]==n[1])||
+				(f.m_n[j]==n[2])) c|=1<<j; else break;
+		}
+		if(c==7) return(true);
+	}
+	return(false);
+}
+
+//
+btSoftBody::Material*		btSoftBody::appendMaterial()
+{
+Material*	pm=new(btAlignedAlloc(sizeof(Material),16)) Material();
+if(m_materials.size()>0)
+	*pm=*m_materials[0];
+	else
+	ZeroInitialize(*pm);
+m_materials.push_back(pm);
+return(pm);
+}
+
+//
+void			btSoftBody::appendNote(	const char* text,
+										const btVector3& o,
+										const btVector4& c,
+										Node* n0,
+										Node* n1,
+										Node* n2,
+										Node* n3)
+{
+Note	n;
+ZeroInitialize(n);
+n.m_rank		=	0;
+n.m_text		=	text;
+n.m_offset		=	o;
+n.m_coords[0]	=	c.x();
+n.m_coords[1]	=	c.y();
+n.m_coords[2]	=	c.z();
+n.m_coords[3]	=	c.w();
+n.m_nodes[0]	=	n0;n.m_rank+=n0?1:0;
+n.m_nodes[1]	=	n1;n.m_rank+=n1?1:0;
+n.m_nodes[2]	=	n2;n.m_rank+=n2?1:0;
+n.m_nodes[3]	=	n3;n.m_rank+=n3?1:0;
+m_notes.push_back(n);
+}
+
+//
+void			btSoftBody::appendNote(	const char* text,
+										const btVector3& o,
+										Node* feature)
+{
+appendNote(text,o,btVector4(1,0,0,0),feature);
+}
+
+//
+void			btSoftBody::appendNote(	const char* text,
+										const btVector3& o,
+										Link* feature)
+{
+static const btScalar	w=1/(btScalar)2;
+appendNote(text,o,btVector4(w,w,0,0),	feature->m_n[0],
+										feature->m_n[1]);
+}
+								
+//
+void			btSoftBody::appendNote(	const char* text,
+										const btVector3& o,
+										Face* feature)
+{
+static const btScalar	w=1/(btScalar)3;
+appendNote(text,o,btVector4(w,w,w,0),	feature->m_n[0],
+										feature->m_n[1],
+										feature->m_n[2]);
+}
+
+//
+void			btSoftBody::appendNode(	const btVector3& x,btScalar m)
+{
+if(m_nodes.capacity()==m_nodes.size())
+	{
+	pointersToIndices();
+	m_nodes.reserve(m_nodes.size()*2+1);
+	indicesToPointers();
+	}
+const btScalar	margin=getCollisionShape()->getMargin();
+m_nodes.push_back(Node());
+Node&			n=m_nodes[m_nodes.size()-1];
+ZeroInitialize(n);
+n.m_x			=	x;
+n.m_q			=	n.m_x;
+n.m_im			=	m>0?1/m:0;
+n.m_material	=	m_materials[0];
+n.m_leaf		=	m_ndbvt.insert(btDbvtVolume::FromCR(n.m_x,margin),&n);
+}
+
+//
+void			btSoftBody::appendLink(int model,Material* mat)
+{
+Link	l;
+if(model>=0)
+	l=m_links[model];
+	else
+	{ ZeroInitialize(l);l.m_material=mat?mat:m_materials[0]; }
+m_links.push_back(l);
+}
+
+//
+void			btSoftBody::appendLink(	int node0,
+									   int node1,
+									   Material* mat,
+									   bool bcheckexist)
+{
+	appendLink(&m_nodes[node0],&m_nodes[node1],mat,bcheckexist);
+}
+
+//
+void			btSoftBody::appendLink(	Node* node0,
+									   Node* node1,
+									   Material* mat,
+									   bool bcheckexist)
+{
+	if((!bcheckexist)||(!checkLink(node0,node1)))
+	{
+		appendLink(-1,mat);
+		Link&	l=m_links[m_links.size()-1];
+		l.m_n[0]		=	node0;
+		l.m_n[1]		=	node1;
+		l.m_rl			=	(l.m_n[0]->m_x-l.m_n[1]->m_x).length();
+		m_bUpdateRtCst=true;
+	}
+}
+
+//
+void			btSoftBody::appendFace(int model,Material* mat)
+{
+Face	f;
+if(model>=0)
+	{ f=m_faces[model]; }
+	else
+	{ ZeroInitialize(f);f.m_material=mat?mat:m_materials[0]; }
+m_faces.push_back(f);
+}
+
+//
+void			btSoftBody::appendFace(int node0,int node1,int node2,Material* mat)
+{
+	appendFace(-1,mat);
+	Face&	f=m_faces[m_faces.size()-1];
+	btAssert(node0!=node1);
+	btAssert(node1!=node2);
+	btAssert(node2!=node0);
+	f.m_n[0]	=	&m_nodes[node0];
+	f.m_n[1]	=	&m_nodes[node1];
+	f.m_n[2]	=	&m_nodes[node2];
+	f.m_ra		=	AreaOf(	f.m_n[0]->m_x,
+		f.m_n[1]->m_x,
+		f.m_n[2]->m_x);	
+	m_bUpdateRtCst=true;
+}
+
+//
+void			btSoftBody::appendAnchor(int node,btRigidBody* body)
+{
+	Anchor	a;
+	a.m_node			=	&m_nodes[node];
+	a.m_body			=	body;
+	a.m_local			=	body->getInterpolationWorldTransform().inverse()*a.m_node->m_x;
+	a.m_node->m_battach	=	1;
+	m_anchors.push_back(a);
+}
+
+//
+void			btSoftBody::appendLinearJoint(const LJoint::Specs& specs,Cluster* body0,Body body1)
+{
+LJoint*		pj	=	new(btAlignedAlloc(sizeof(LJoint),16)) LJoint();
+pj->m_bodies[0]	=	body0;
+pj->m_bodies[1]	=	body1;
+pj->m_refs[0]	=	pj->m_bodies[0].xform().inverse()*specs.position;
+pj->m_refs[1]	=	pj->m_bodies[1].xform().inverse()*specs.position;
+pj->m_cfm		=	specs.cfm;
+pj->m_erp		=	specs.erp;
+pj->m_split		=	specs.split;
+m_joints.push_back(pj);
+}
+
+//
+void			btSoftBody::appendLinearJoint(const LJoint::Specs& specs,Body body)
+{
+appendLinearJoint(specs,m_clusters[0],body);
+}
+
+//
+void			btSoftBody::appendLinearJoint(const LJoint::Specs& specs,btSoftBody* body)
+{
+appendLinearJoint(specs,m_clusters[0],body->m_clusters[0]);
+}
+
+//
+void			btSoftBody::appendAngularJoint(const AJoint::Specs& specs,Cluster* body0,Body body1)
+{
+AJoint*		pj	=	new(btAlignedAlloc(sizeof(AJoint),16)) AJoint();
+pj->m_bodies[0]	=	body0;
+pj->m_bodies[1]	=	body1;
+pj->m_refs[0]	=	pj->m_bodies[0].xform().inverse().getBasis()*specs.axis;
+pj->m_refs[1]	=	pj->m_bodies[1].xform().inverse().getBasis()*specs.axis;
+pj->m_cfm		=	specs.cfm;
+pj->m_erp		=	specs.erp;
+pj->m_split		=	specs.split;
+pj->m_icontrol	=	specs.icontrol;
+m_joints.push_back(pj);
+}
+
+//
+void			btSoftBody::appendAngularJoint(const AJoint::Specs& specs,Body body)
+{
+appendAngularJoint(specs,m_clusters[0],body);
+}
+
+//
+void			btSoftBody::appendAngularJoint(const AJoint::Specs& specs,btSoftBody* body)
+{
+appendAngularJoint(specs,m_clusters[0],body->m_clusters[0]);
+}
+
+//
+void			btSoftBody::addForce(const btVector3& force)
+{
+	for(int i=0,ni=m_nodes.size();i<ni;++i) addForce(force,i);
+}
+
+//
+void			btSoftBody::addForce(const btVector3& force,int node)
+{
+	Node&	n=m_nodes[node];
+	if(n.m_im>0)
+	{
+		n.m_f	+=	force;
+	}
+}
+
+//
+void			btSoftBody::addVelocity(const btVector3& velocity)
+{
+	for(int i=0,ni=m_nodes.size();i<ni;++i) addVelocity(velocity,i);
+}
+
+//
+void			btSoftBody::addVelocity(const btVector3& velocity,int node)
+{
+	Node&	n=m_nodes[node];
+	if(n.m_im>0)
+	{
+		n.m_v	+=	velocity;
+	}
+}
+
+//
+void			btSoftBody::setMass(int node,btScalar mass)
+{
+	m_nodes[node].m_im=mass>0?1/mass:0;
+	m_bUpdateRtCst=true;
+}
+
+//
+btScalar		btSoftBody::getMass(int node) const
+{
+	return(m_nodes[node].m_im>0?1/m_nodes[node].m_im:0);
+}
+
+//
+btScalar		btSoftBody::getTotalMass() const
+{
+	btScalar	mass=0;
+	for(int i=0;i<m_nodes.size();++i)
+	{
+		mass+=getMass(i);
+	}
+	return(mass);
+}
+
+//
+void			btSoftBody::setTotalMass(btScalar mass,bool fromfaces)
+{
+	int i;
+
+	if(fromfaces)
+	{
+
+		for(i=0;i<m_nodes.size();++i)
+		{
+			m_nodes[i].m_im=0;
+		}
+		for(i=0;i<m_faces.size();++i)
+		{
+			const Face&		f=m_faces[i];
+			const btScalar	twicearea=AreaOf(	f.m_n[0]->m_x,
+												f.m_n[1]->m_x,
+												f.m_n[2]->m_x);
+			for(int j=0;j<3;++j)
+			{
+				f.m_n[j]->m_im+=twicearea;
+			}
+		}
+		for( i=0;i<m_nodes.size();++i)
+		{
+			m_nodes[i].m_im=1/m_nodes[i].m_im;
+		}
+	}
+	const btScalar	tm=getTotalMass();
+	const btScalar	itm=1/tm;
+	for( i=0;i<m_nodes.size();++i)
+	{
+		m_nodes[i].m_im/=itm*mass;
+	}
+	m_bUpdateRtCst=true;
+}
+
+//
+void			btSoftBody::setTotalDensity(btScalar density)
+{
+	setTotalMass(getVolume()*density,true);
+}
+
+//
+void			btSoftBody::transform(const btTransform& trs)
+{
+	const btScalar	margin=getCollisionShape()->getMargin();
+	for(int i=0,ni=m_nodes.size();i<ni;++i)
+	{
+		Node&	n=m_nodes[i];
+		n.m_x=trs*n.m_x;
+		n.m_q=trs*n.m_q;
+		n.m_n=trs.getBasis()*n.m_n;
+		m_ndbvt.update(n.m_leaf,btDbvtVolume::FromCR(n.m_x,margin));
+	}
+	updateNormals();
+	updateBounds();
+	updateConstants();
+}
+
+//
+void			btSoftBody::translate(const btVector3& trs)
+{
+btTransform	t;
+t.setIdentity();
+t.setOrigin(trs);
+transform(t);
+}
+
+//
+void			btSoftBody::rotate(	const btQuaternion& rot)
+{
+btTransform	t;
+t.setIdentity();
+t.setRotation(rot);
+transform(t);
+}
+
+//
+void			btSoftBody::scale(const btVector3& scl)
+{
+	const btScalar	margin=getCollisionShape()->getMargin();
+	for(int i=0,ni=m_nodes.size();i<ni;++i)
+	{
+		Node&	n=m_nodes[i];
+		n.m_x*=scl;
+		n.m_q*=scl;
+		m_ndbvt.update(n.m_leaf,btDbvtVolume::FromCR(n.m_x,margin));
+	}
+	updateNormals();
+	updateBounds();
+	updateConstants();
+}
+
+//
+void			btSoftBody::setPose(bool bvolume,bool bframe)
+{
+	m_pose.m_bvolume	=	bvolume;
+	m_pose.m_bframe		=	bframe;
+	int i,ni;
+
+	/* Weights		*/ 
+	const btScalar	omass=getTotalMass();
+	const btScalar	kmass=omass*m_nodes.size()*1000;
+	btScalar		tmass=omass;
+	m_pose.m_wgh.resize(m_nodes.size());
+	for(i=0,ni=m_nodes.size();i<ni;++i)
+	{
+		if(m_nodes[i].m_im<=0) tmass+=kmass;
+	}
+	for( i=0,ni=m_nodes.size();i<ni;++i)
+	{
+		Node&	n=m_nodes[i];
+		m_pose.m_wgh[i]=	n.m_im>0					?
+							1/(m_nodes[i].m_im*tmass)	:
+							kmass/tmass;
+	}
+	/* Pos		*/ 
+	const btVector3	com=evaluateCom();
+	m_pose.m_pos.resize(m_nodes.size());
+	for( i=0,ni=m_nodes.size();i<ni;++i)
+	{
+		m_pose.m_pos[i]=m_nodes[i].m_x-com;
+	}
+	m_pose.m_volume	=	bvolume?getVolume():0;
+	m_pose.m_com	=	com;
+	m_pose.m_rot.setIdentity();
+	m_pose.m_scl.setIdentity();
+	/* Aqq		*/ 
+	m_pose.m_aqq[0]	=
+	m_pose.m_aqq[1]	=
+	m_pose.m_aqq[2]	=	btVector3(0,0,0);
+	for( i=0,ni=m_nodes.size();i<ni;++i)
+		{
+		const btVector3&	q=m_pose.m_pos[i];
+		const btVector3		mq=m_pose.m_wgh[i]*q;
+		m_pose.m_aqq[0]+=mq.x()*q;
+		m_pose.m_aqq[1]+=mq.y()*q;
+		m_pose.m_aqq[2]+=mq.z()*q;
+		}
+	m_pose.m_aqq=m_pose.m_aqq.inverse();
+	updateConstants();
+}
+
+//
+btScalar		btSoftBody::getVolume() const
+{
+	btScalar	vol=0;
+	if(m_nodes.size()>0)
+	{
+		int i,ni;
+
+		const btVector3	org=m_nodes[0].m_x;
+		for(i=0,ni=m_faces.size();i<ni;++i)
+		{
+			const Face&	f=m_faces[i];
+			vol+=dot(f.m_n[0]->m_x-org,cross(f.m_n[1]->m_x-org,f.m_n[2]->m_x-org));
+		}
+		vol/=(btScalar)6;
+	}
+	return(vol);
+}
+
+//
+int				btSoftBody::clusterCount() const
+{
+return(m_clusters.size());
+}
+
+//
+btVector3		btSoftBody::clusterCom(const Cluster* cluster)
+{
+btVector3		com(0,0,0);
+for(int i=0,ni=cluster->m_nodes.size();i<ni;++i)
+	{
+	com+=cluster->m_nodes[i]->m_x*cluster->m_masses[i];
+	}
+return(com*cluster->m_imass);
+}
+
+//
+btVector3		btSoftBody::clusterCom(int cluster) const
+{
+return(clusterCom(m_clusters[cluster]));
+}
+
+//
+btVector3		btSoftBody::clusterVelocity(const Cluster* cluster,const btVector3& rpos)
+{
+return(cluster->m_lv+cross(cluster->m_av,rpos));
+}
+
+//
+void			btSoftBody::clusterVImpulse(Cluster* cluster,const btVector3& rpos,const btVector3& impulse)
+{
+const btVector3	li=cluster->m_imass*impulse;
+const btVector3	ai=cluster->m_invwi*cross(rpos,impulse);
+cluster->m_vimpulses[0]+=li;cluster->m_lv+=li;
+cluster->m_vimpulses[1]+=ai;cluster->m_av+=ai;
+cluster->m_nvimpulses++;
+}
+
+//
+void			btSoftBody::clusterDImpulse(Cluster* cluster,const btVector3& rpos,const btVector3& impulse)
+{
+const btVector3	li=cluster->m_imass*impulse;
+const btVector3	ai=cluster->m_invwi*cross(rpos,impulse);
+cluster->m_dimpulses[0]+=li;
+cluster->m_dimpulses[1]+=ai;
+cluster->m_ndimpulses++;
+}
+
+//
+void			btSoftBody::clusterImpulse(Cluster* cluster,const btVector3& rpos,const Impulse& impulse)
+{
+if(impulse.m_asVelocity)	clusterVImpulse(cluster,rpos,impulse.m_velocity);
+if(impulse.m_asDrift)		clusterDImpulse(cluster,rpos,impulse.m_drift);
+}
+
+//
+void			btSoftBody::clusterVAImpulse(Cluster* cluster,const btVector3& impulse)
+{
+const btVector3	ai=cluster->m_invwi*impulse;
+cluster->m_vimpulses[1]+=ai;cluster->m_av+=ai;
+cluster->m_nvimpulses++;
+}
+
+//
+void			btSoftBody::clusterDAImpulse(Cluster* cluster,const btVector3& impulse)
+{
+const btVector3	ai=cluster->m_invwi*impulse;
+cluster->m_dimpulses[1]+=ai;
+cluster->m_ndimpulses++;
+}
+
+//
+void			btSoftBody::clusterAImpulse(Cluster* cluster,const Impulse& impulse)
+{
+if(impulse.m_asVelocity)	clusterVAImpulse(cluster,impulse.m_velocity);
+if(impulse.m_asDrift)		clusterDAImpulse(cluster,impulse.m_drift);
+}
+
+//
+void			btSoftBody::clusterDCImpulse(Cluster* cluster,const btVector3& impulse)
+{
+cluster->m_dimpulses[0]+=impulse*cluster->m_imass;
+cluster->m_ndimpulses++;
+}
+
+//
+int				btSoftBody::generateBendingConstraints(int distance,Material* mat)
+{
+	int i,j;
+
+	if(distance>1)
+	{
+		/* Build graph	*/ 
+		const int		n=m_nodes.size();
+		const unsigned	inf=(~(unsigned)0)>>1;
+		unsigned*		adj=new unsigned[n*n];
+#define IDX(_x_,_y_)	((_y_)*n+(_x_))
+		for(j=0;j<n;++j)
+		{
+			for(i=0;i<n;++i)
+			{
+				if(i!=j)	adj[IDX(i,j)]=adj[IDX(j,i)]=inf;
+				else
+					adj[IDX(i,j)]=adj[IDX(j,i)]=0;
+			}
+		}
+		for( i=0;i<m_links.size();++i)
+		{
+			const int	ia=(int)(m_links[i].m_n[0]-&m_nodes[0]);
+			const int	ib=(int)(m_links[i].m_n[1]-&m_nodes[0]);
+			adj[IDX(ia,ib)]=1;
+			adj[IDX(ib,ia)]=1;
+		}
+		for(int k=0;k<n;++k)
+		{
+			for(j=0;j<n;++j)
+			{
+				for(i=j+1;i<n;++i)
+				{
+					const unsigned	sum=adj[IDX(i,k)]+adj[IDX(k,j)];
+					if(adj[IDX(i,j)]>sum)
+					{
+						adj[IDX(i,j)]=adj[IDX(j,i)]=sum;
+					}
+				}
+			}
+		}
+		/* Build links	*/ 
+		int	nlinks=0;
+		for(j=0;j<n;++j)
+		{
+			for(i=j+1;i<n;++i)
+			{
+				if(adj[IDX(i,j)]==(unsigned)distance)
+				{
+					appendLink(i,j,mat);
+					m_links[m_links.size()-1].m_bbending=1;
+					++nlinks;
+				}
+			}
+		}
+		delete[] adj;		
+		return(nlinks);
+	}
+	return(0);
+}
+
+//
+void			btSoftBody::randomizeConstraints()
+{
+unsigned long	seed=243703;
+#define NEXTRAND (seed=(1664525L*seed+1013904223L)&0xffffffff)
+int i,ni;
+
+	for(i=0,ni=m_links.size();i<ni;++i)
+	{
+		btSwap(m_links[i],m_links[NEXTRAND%ni]);
+	}
+	for(i=0,ni=m_faces.size();i<ni;++i)
+	{
+		btSwap(m_faces[i],m_faces[NEXTRAND%ni]);
+	}
+#undef NEXTRAND
+}
+
+//
+int				btSoftBody::generateClusters(int k,int maxiterations)
+{
+	int i;
+
+for(i=0;i<m_clusters.size();++i)
+	{
+	if(m_clusters[i]->m_leaf) m_cdbvt.remove(m_clusters[i]->m_leaf);
+	btAlignedFree(m_clusters[i]);
+	}
+m_clusters.resize(btMin(k,m_nodes.size()));
+
+
+
+for(i=0;i<m_clusters.size();++i)
+	{
+	m_clusters[i]			=	new(btAlignedAlloc(sizeof(Cluster),16)) Cluster();
+	m_clusters[i]->m_collide=	true;
+	}
+k=m_clusters.size();
+if(k>0)
+	{
+	/* Initialize		*/ 
+	btAlignedObjectArray<btVector3>	centers;
+	btVector3						cog(0,0,0);
+	int								i;
+	for(i=0;i<m_nodes.size();++i)
+		{
+		cog+=m_nodes[i].m_x;
+		m_clusters[(i*29873)%m_clusters.size()]->m_nodes.push_back(&m_nodes[i]);
+		}
+	cog/=(btScalar)m_nodes.size();
+	centers.resize(k,cog);
+	/* Iterate			*/ 
+	const btScalar	slope=16;
+	bool			changed;
+	int				iterations=0;
+	do	{
+		const btScalar	w=2-btMin<btScalar>(1,iterations/slope);
+		changed=false;
+		iterations++;	
+		int i;
+
+		for(i=0;i<k;++i)
+			{
+			btVector3	c(0,0,0);
+			for(int j=0;j<m_clusters[i]->m_nodes.size();++j)
+				{
+				c+=m_clusters[i]->m_nodes[j]->m_x;
+				}
+			if(m_clusters[i]->m_nodes.size())
+				{
+				c			/=	(btScalar)m_clusters[i]->m_nodes.size();
+				c			=	centers[i]+(c-centers[i])*w;
+				changed		|=	((c-centers[i]).length2()>SIMD_EPSILON);
+				centers[i]	=	c;
+				m_clusters[i]->m_nodes.resize(0);
+				}			
+			}
+		for(i=0;i<m_nodes.size();++i)
+			{
+			const btVector3	nx=m_nodes[i].m_x;
+			int				kbest=0;
+			btScalar		kdist=ClusterMetric(centers[0],nx);
+			for(int j=1;j<k;++j)
+				{
+				const btScalar	d=ClusterMetric(centers[j],nx);
+				if(d<kdist)
+					{
+					kbest=j;
+					kdist=d;
+					}
+				}
+			m_clusters[kbest]->m_nodes.push_back(&m_nodes[i]);
+			}		
+		} while(changed&&(iterations<maxiterations));
+	/* Merge		*/ 
+	btAlignedObjectArray<int>	cids;
+	cids.resize(m_nodes.size(),-1);
+	for(i=0;i<m_clusters.size();++i)
+		{
+		for(int j=0;j<m_clusters[i]->m_nodes.size();++j)
+			{
+			cids[int(m_clusters[i]->m_nodes[j]-&m_nodes[0])]=i;
+			}
+		}
+	for(i=0;i<m_faces.size();++i)
+		{
+		const int idx[]={	int(m_faces[i].m_n[0]-&m_nodes[0]),
+							int(m_faces[i].m_n[1]-&m_nodes[0]),
+							int(m_faces[i].m_n[2]-&m_nodes[0])};
+		for(int j=0;j<3;++j)
+			{
+			const int cid=cids[idx[j]];
+			for(int q=1;q<3;++q)
+				{
+				const int kid=idx[(j+q)%3];
+				if(cids[kid]!=cid)
+					{
+					if(m_clusters[cid]->m_nodes.findLinearSearch(&m_nodes[kid])==m_clusters[cid]->m_nodes.size())
+						{
+						m_clusters[cid]->m_nodes.push_back(&m_nodes[kid]);
+						}
+					}
+				}
+			}
+		}
+	/* Master		*/ 
+	if(m_clusters.size()>1)
+		{
+		Cluster*	pmaster=new(btAlignedAlloc(sizeof(Cluster),16)) Cluster();
+		pmaster->m_collide	=	false;
+		pmaster->m_nodes.reserve(m_nodes.size());
+		for(int i=0;i<m_nodes.size();++i) pmaster->m_nodes.push_back(&m_nodes[i]);
+		m_clusters.push_back(pmaster);
+		btSwap(m_clusters[0],m_clusters[m_clusters.size()-1]);
+		}
+	/* Terminate	*/ 
+	for(i=0;i<m_clusters.size();++i)
+		{
+		if(m_clusters[i]->m_nodes.size()==0)
+			{
+			btAlignedFree(m_clusters[i]);
+			btSwap(m_clusters[i],m_clusters[m_clusters.size()-1]);
+			m_clusters.pop_back();
+			--i;
+			}
+		}
+		
+	initializeClusters();
+	updateClusters();
+	return(m_clusters.size());
+	}
+return(0);
+}
+
+//
+void			btSoftBody::refine(ImplicitFn* ifn,btScalar accurary,bool cut)
+{
+const Node*			nbase = &m_nodes[0];
+int					ncount = m_nodes.size();
+btSymMatrix<int>	edges(ncount,-2);
+int					newnodes=0;
+int i,j,k,ni;
+
+/* Filter out		*/ 
+for(i=0;i<m_links.size();++i)
+	{
+	Link&	l=m_links[i];
+	if(l.m_bbending)
+		{
+		if(!SameSign(ifn->Eval(l.m_n[0]->m_x),ifn->Eval(l.m_n[1]->m_x)))
+			{
+			btSwap(m_links[i],m_links[m_links.size()-1]);
+			m_links.pop_back();--i;
+			}
+		}	
+	}
+/* Fill edges		*/ 
+for(i=0;i<m_links.size();++i)
+	{
+	Link&	l=m_links[i];
+	edges(int(l.m_n[0]-nbase),int(l.m_n[1]-nbase))=-1;
+	}
+for(i=0;i<m_faces.size();++i)
+	{	
+	Face&	f=m_faces[i];
+	edges(int(f.m_n[0]-nbase),int(f.m_n[1]-nbase))=-1;
+	edges(int(f.m_n[1]-nbase),int(f.m_n[2]-nbase))=-1;
+	edges(int(f.m_n[2]-nbase),int(f.m_n[0]-nbase))=-1;
+	}
+/* Intersect		*/ 
+for(i=0;i<ncount;++i)
+	{
+	for(j=i+1;j<ncount;++j)
+		{
+		if(edges(i,j)==-1)
+			{
+			Node&			a=m_nodes[i];
+			Node&			b=m_nodes[j];
+			const btScalar	t=ImplicitSolve(ifn,a.m_x,b.m_x,accurary);
+			if(t>0)
+				{
+				const btVector3	x=Lerp(a.m_x,b.m_x,t);
+				const btVector3	v=Lerp(a.m_v,b.m_v,t);
+				btScalar		m=0;
+				if(a.m_im>0)
+					{
+					if(b.m_im>0)
+						{
+						const btScalar	ma=1/a.m_im;
+						const btScalar	mb=1/b.m_im;
+						const btScalar	mc=Lerp(ma,mb,t);
+						const btScalar	f=(ma+mb)/(ma+mb+mc);
+						a.m_im=1/(ma*f);
+						b.m_im=1/(mb*f);
+						m=mc*f;
+						}
+						else
+						{ a.m_im/=0.5;m=1/a.m_im; }
+					}
+					else
+					{
+					if(b.m_im>0)
+						{ b.m_im/=0.5;m=1/b.m_im; }
+						else
+						m=0;
+					}
+				appendNode(x,m);
+				edges(i,j)=m_nodes.size()-1;
+				m_nodes[edges(i,j)].m_v=v;
+				++newnodes;
+				}
+			}
+		}
+	}
+nbase=&m_nodes[0];
+/* Refine links		*/ 
+for(i=0,ni=m_links.size();i<ni;++i)
+	{
+	Link&		feat=m_links[i];
+	const int	idx[]={	int(feat.m_n[0]-nbase),
+						int(feat.m_n[1]-nbase)};
+	if((idx[0]<ncount)&&(idx[1]<ncount))
+		{
+		const int ni=edges(idx[0],idx[1]);
+		if(ni>0)
+			{
+			appendLink(i);
+			Link*		pft[]={	&m_links[i],
+								&m_links[m_links.size()-1]};			
+			pft[0]->m_n[0]=&m_nodes[idx[0]];
+			pft[0]->m_n[1]=&m_nodes[ni];
+			pft[1]->m_n[0]=&m_nodes[ni];
+			pft[1]->m_n[1]=&m_nodes[idx[1]];
+			}
+		}
+	}
+/* Refine faces		*/ 
+for(i=0;i<m_faces.size();++i)
+	{
+	const Face&	feat=m_faces[i];
+	const int	idx[]={	int(feat.m_n[0]-nbase),
+						int(feat.m_n[1]-nbase),
+						int(feat.m_n[2]-nbase)};
+	for(j=2,k=0;k<3;j=k++)
+		{
+		if((idx[j]<ncount)&&(idx[k]<ncount))
+			{
+			const int ni=edges(idx[j],idx[k]);
+			if(ni>0)
+				{
+				appendFace(i);
+				const int	l=(k+1)%3;
+				Face*		pft[]={	&m_faces[i],
+									&m_faces[m_faces.size()-1]};
+				pft[0]->m_n[0]=&m_nodes[idx[l]];
+				pft[0]->m_n[1]=&m_nodes[idx[j]];
+				pft[0]->m_n[2]=&m_nodes[ni];
+				pft[1]->m_n[0]=&m_nodes[ni];
+				pft[1]->m_n[1]=&m_nodes[idx[k]];
+				pft[1]->m_n[2]=&m_nodes[idx[l]];
+				appendLink(ni,idx[l],pft[0]->m_material);
+				--i;break;
+				}
+			}
+		}
+	}
+/* Cut				*/ 
+if(cut)
+	{	
+	btAlignedObjectArray<int>	cnodes;
+	const int					pcount=ncount;
+	int							i;
+	ncount=m_nodes.size();
+	cnodes.resize(ncount,0);
+	/* Nodes		*/ 
+	for(i=0;i<ncount;++i)
+		{
+		const btVector3	x=m_nodes[i].m_x;
+		if((i>=pcount)||(btFabs(ifn->Eval(x))<accurary))
+			{
+			const btVector3	v=m_nodes[i].m_v;
+			btScalar		m=getMass(i);
+			if(m>0) { m*=0.5;m_nodes[i].m_im/=0.5; }
+			appendNode(x,m);
+			cnodes[i]=m_nodes.size()-1;
+			m_nodes[cnodes[i]].m_v=v;
+			}
+		}
+	nbase=&m_nodes[0];
+	/* Links		*/ 
+	for(i=0,ni=m_links.size();i<ni;++i)
+		{
+		const int		id[]={	int(m_links[i].m_n[0]-nbase),
+								int(m_links[i].m_n[1]-nbase)};
+		int				todetach=0;
+		if(cnodes[id[0]]&&cnodes[id[1]])
+			{
+			appendLink(i);
+			todetach=m_links.size()-1;
+			}
+		else
+			{
+			if((	(ifn->Eval(m_nodes[id[0]].m_x)<accurary)&&
+					(ifn->Eval(m_nodes[id[1]].m_x)<accurary)))
+				todetach=i;
+			}
+		if(todetach)
+			{
+			Link&	l=m_links[todetach];
+			for(int j=0;j<2;++j)
+				{
+				int cn=cnodes[int(l.m_n[j]-nbase)];
+				if(cn) l.m_n[j]=&m_nodes[cn];
+				}			
+			}
+		}
+	/* Faces		*/ 
+	for(i=0,ni=m_faces.size();i<ni;++i)
+		{
+		Node**			n=	m_faces[i].m_n;
+		if(	(ifn->Eval(n[0]->m_x)<accurary)&&
+			(ifn->Eval(n[1]->m_x)<accurary)&&
+			(ifn->Eval(n[2]->m_x)<accurary))
+			{
+			for(int j=0;j<3;++j)
+				{
+				int cn=cnodes[int(n[j]-nbase)];
+				if(cn) n[j]=&m_nodes[cn];
+				}
+			}
+		}
+	/* Clean orphans	*/ 
+	int							nnodes=m_nodes.size();
+	btAlignedObjectArray<int>	ranks;
+	btAlignedObjectArray<int>	todelete;
+	ranks.resize(nnodes,0);
+	for(i=0,ni=m_links.size();i<ni;++i)
+		{
+		for(int j=0;j<2;++j) ranks[int(m_links[i].m_n[j]-nbase)]++;
+		}
+	for(i=0,ni=m_faces.size();i<ni;++i)
+		{
+		for(int j=0;j<3;++j) ranks[int(m_faces[i].m_n[j]-nbase)]++;
+		}
+	for(i=0;i<m_links.size();++i)
+		{
+		const int	id[]={	int(m_links[i].m_n[0]-nbase),
+							int(m_links[i].m_n[1]-nbase)};
+		const bool	sg[]={	ranks[id[0]]==1,
+							ranks[id[1]]==1};
+		if(sg[0]||sg[1])
+			{
+			--ranks[id[0]];
+			--ranks[id[1]];
+			btSwap(m_links[i],m_links[m_links.size()-1]);
+			m_links.pop_back();--i;
+			}
+		}
+	#if 0	
+	for(i=nnodes-1;i>=0;--i)
+		{
+		if(!ranks[i]) todelete.push_back(i);
+		}	
+	if(todelete.size())
+		{		
+		btAlignedObjectArray<int>&	map=ranks;
+		for(int i=0;i<nnodes;++i) map[i]=i;
+		PointersToIndices(this);
+		for(int i=0,ni=todelete.size();i<ni;++i)
+			{
+			int		j=todelete[i];
+			int&	a=map[j];
+			int&	b=map[--nnodes];
+			m_ndbvt.remove(m_nodes[a].m_leaf);m_nodes[a].m_leaf=0;
+			btSwap(m_nodes[a],m_nodes[b]);
+			j=a;a=b;b=j;			
+			}
+		IndicesToPointers(this,&map[0]);
+		m_nodes.resize(nnodes);
+		}
+	#endif
+	}
+m_bUpdateRtCst=true;
+}
+
+//
+bool			btSoftBody::cutLink(const Node* node0,const Node* node1,btScalar position)
+{
+return(cutLink(int(node0-&m_nodes[0]),int(node1-&m_nodes[0]),position));
+}
+
+//
+bool			btSoftBody::cutLink(int node0,int node1,btScalar position)
+{
+bool			done=false;
+int i,ni;
+const btVector3	d=m_nodes[node0].m_x-m_nodes[node1].m_x;
+const btVector3	x=Lerp(m_nodes[node0].m_x,m_nodes[node1].m_x,position);
+const btVector3	v=Lerp(m_nodes[node0].m_v,m_nodes[node1].m_v,position);
+const btScalar	m=1;
+appendNode(x,m);
+appendNode(x,m);
+Node*			pa=&m_nodes[node0];
+Node*			pb=&m_nodes[node1];
+Node*			pn[2]={	&m_nodes[m_nodes.size()-2],
+						&m_nodes[m_nodes.size()-1]};
+pn[0]->m_v=v;
+pn[1]->m_v=v;
+for(i=0,ni=m_links.size();i<ni;++i)
+	{
+	const int mtch=MatchEdge(m_links[i].m_n[0],m_links[i].m_n[1],pa,pb);
+	if(mtch!=-1)
+		{
+		appendLink(i);
+		Link*	pft[]={&m_links[i],&m_links[m_links.size()-1]};
+		pft[0]->m_n[1]=pn[mtch];
+		pft[1]->m_n[0]=pn[1-mtch];
+		done=true;
+		}
+	}
+for(i=0,ni=m_faces.size();i<ni;++i)
+	{
+	for(int k=2,l=0;l<3;k=l++)
+		{
+		const int mtch=MatchEdge(m_faces[i].m_n[k],m_faces[i].m_n[l],pa,pb);
+		if(mtch!=-1)
+			{
+			appendFace(i);
+			Face*	pft[]={&m_faces[i],&m_faces[m_faces.size()-1]};
+			pft[0]->m_n[l]=pn[mtch];
+			pft[1]->m_n[k]=pn[1-mtch];
+			appendLink(pn[0],pft[0]->m_n[(l+1)%3],pft[0]->m_material,true);
+			appendLink(pn[1],pft[0]->m_n[(l+1)%3],pft[0]->m_material,true);
+			}
+		}
+	}
+if(!done)
+	{
+	m_ndbvt.remove(pn[0]->m_leaf);
+	m_ndbvt.remove(pn[1]->m_leaf);
+	m_nodes.pop_back();
+	m_nodes.pop_back();
+	}
+return(done);
+}
+
+//
+bool			btSoftBody::rayCast(const btVector3& org,
+									const btVector3& dir,
+									sRayCast& results,
+									btScalar maxtime)
+{
+if(m_faces.size()&&m_fdbvt.empty()) initializeFaceTree();
+results.body	=	this;
+results.time	=	maxtime;
+results.feature	=	eFeature::None;
+results.index	=	-1;
+return(rayCast(org,dir,results.time,results.feature,results.index,false)!=0);
+}
+
+//
+void			btSoftBody::setSolver(eSolverPresets::_ preset)
+{
+m_cfg.m_vsequence.clear();
+m_cfg.m_psequence.clear();
+m_cfg.m_dsequence.clear();
+switch(preset)
+	{
+	case	eSolverPresets::Positions:
+	m_cfg.m_psequence.push_back(ePSolver::Anchors);
+	m_cfg.m_psequence.push_back(ePSolver::RContacts);
+	m_cfg.m_psequence.push_back(ePSolver::SContacts);
+	m_cfg.m_psequence.push_back(ePSolver::Linear);	
+	break;	
+	case	eSolverPresets::Velocities:
+	m_cfg.m_vsequence.push_back(eVSolver::Linear);
+	
+	m_cfg.m_psequence.push_back(ePSolver::Anchors);
+	m_cfg.m_psequence.push_back(ePSolver::RContacts);
+	m_cfg.m_psequence.push_back(ePSolver::SContacts);
+	
+	m_cfg.m_dsequence.push_back(ePSolver::Linear);
+	break;
+	}
+}
+
+//
+void			btSoftBody::predictMotion(btScalar dt)
+{
+	int i,ni;
+
+	/* Update				*/ 
+	if(m_bUpdateRtCst)
+	{
+		m_bUpdateRtCst=false;
+		updateConstants();
+		m_fdbvt.clear();
+		if(m_cfg.collisions&fCollision::VF_SS)
+			{
+			initializeFaceTree();			
+			}
+	}
+		
+	/* Prepare				*/ 
+	m_sst.sdt		=	dt*m_cfg.timescale;
+	m_sst.isdt		=	1/m_sst.sdt;
+	m_sst.velmrg	=	m_sst.sdt*3;
+	m_sst.radmrg	=	getCollisionShape()->getMargin();
+	m_sst.updmrg	=	m_sst.radmrg*(btScalar)0.25;
+	/* Forces				*/ 
+	addVelocity(m_worldInfo->m_gravity*m_sst.sdt);
+	applyForces();
+	/* Integrate			*/ 
+	for(i=0,ni=m_nodes.size();i<ni;++i)
+	{
+		Node&	n=m_nodes[i];
+		n.m_q	=	n.m_x;
+		n.m_v	+=	n.m_f*n.m_im*m_sst.sdt;
+		n.m_x	+=	n.m_v*m_sst.sdt;
+		n.m_f	=	btVector3(0,0,0);
+	}
+	/* Clusters				*/ 
+	updateClusters();
+	/* Bounds				*/ 
+	updateBounds();	
+	/* Nodes				*/ 
+	for(i=0,ni=m_nodes.size();i<ni;++i)
+	{
+		Node&	n=m_nodes[i];
+		m_ndbvt.update(	n.m_leaf,
+						btDbvtVolume::FromCR(n.m_x,m_sst.radmrg),
+						n.m_v*m_sst.velmrg,
+						m_sst.updmrg);
+	}
+	/* Faces				*/ 
+	if(!m_fdbvt.empty())
+		{
+		for(int i=0;i<m_faces.size();++i)
+			{
+			Face&			f=m_faces[i];
+			const btVector3	v=(	f.m_n[0]->m_v+
+								f.m_n[1]->m_v+
+								f.m_n[2]->m_v)/3;
+			m_fdbvt.update(	f.m_leaf,
+							VolumeOf(f,m_sst.radmrg),
+							v*m_sst.velmrg,
+							m_sst.updmrg);
+			}
+		}
+	/* Pose					*/ 
+	updatePose();
+	/* Match				*/ 
+	if(m_pose.m_bframe&&(m_cfg.kMT>0))
+		{
+		const btMatrix3x3	posetrs=m_pose.m_rot;
+		for(int i=0,ni=m_nodes.size();i<ni;++i)
+			{
+			Node&	n=m_nodes[i];
+			if(n.m_im>0)
+				{
+				const btVector3	x=posetrs*m_pose.m_pos[i]+m_pose.m_com;
+				n.m_x=Lerp(n.m_x,x,m_cfg.kMT);
+				}
+			}
+		}
+	/* Clear contacts		*/ 
+	m_rcontacts.resize(0);
+	m_scontacts.resize(0);
+	/* Optimize dbvt's		*/ 
+	m_ndbvt.optimizeIncremental(1);
+	m_fdbvt.optimizeIncremental(1);
+	m_cdbvt.optimizeIncremental(1);
+}
+
+//
+void			btSoftBody::solveConstraints()
+{
+/* Apply clusters		*/ 
+applyClusters(false);
+/* Prepare links		*/ 
+
+int i,ni;
+
+for(i=0,ni=m_links.size();i<ni;++i)
+	{
+	Link&	l=m_links[i];
+	l.m_c3		=	l.m_n[1]->m_q-l.m_n[0]->m_q;
+	l.m_c2		=	1/(l.m_c3.length2()*l.m_c0);
+	}
+/* Prepare anchors		*/ 
+for(i=0,ni=m_anchors.size();i<ni;++i)
+	{
+	Anchor&			a=m_anchors[i];
+	const btVector3	ra=a.m_body->getWorldTransform().getBasis()*a.m_local;
+	a.m_c0	=	ImpulseMatrix(	m_sst.sdt,
+								a.m_node->m_im,
+								a.m_body->getInvMass(),
+								a.m_body->getInvInertiaTensorWorld(),
+								ra);
+	a.m_c1	=	ra;
+	a.m_c2	=	m_sst.sdt*a.m_node->m_im;
+	a.m_body->activate();
+	}
+/* Solve velocities		*/ 
+if(m_cfg.viterations>0)
+	{
+	/* Solve			*/ 
+	for(int isolve=0;isolve<m_cfg.viterations;++isolve)
+		{
+		for(int iseq=0;iseq<m_cfg.m_vsequence.size();++iseq)
+			{
+			getSolver(m_cfg.m_vsequence[iseq])(this,1);
+			}
+		}
+	/* Update			*/ 
+	for(i=0,ni=m_nodes.size();i<ni;++i)
+		{
+		Node&	n=m_nodes[i];
+		n.m_x	=	n.m_q+n.m_v*m_sst.sdt;
+		}
+	}
+/* Solve positions		*/ 
+if(m_cfg.piterations>0)
+	{
+	for(int isolve=0;isolve<m_cfg.piterations;++isolve)
+		{
+		const btScalar ti=isolve/(btScalar)m_cfg.piterations;
+		for(int iseq=0;iseq<m_cfg.m_psequence.size();++iseq)
+			{
+			getSolver(m_cfg.m_psequence[iseq])(this,1,ti);
+			}
+		}
+	const btScalar	vc=m_sst.isdt*(1-m_cfg.kDP);
+	for(i=0,ni=m_nodes.size();i<ni;++i)
+		{
+		Node&	n=m_nodes[i];
+		n.m_v	=	(n.m_x-n.m_q)*vc;
+		n.m_f	=	btVector3(0,0,0);		
+		}
+	}
+/* Solve drift			*/ 
+if(m_cfg.diterations>0)
+	{
+	const btScalar	vcf=m_cfg.kVCF*m_sst.isdt;
+	for(i=0,ni=m_nodes.size();i<ni;++i)
+		{
+		Node&	n=m_nodes[i];
+		n.m_q	=	n.m_x;
+		}
+	for(int idrift=0;idrift<m_cfg.diterations;++idrift)
+		{
+		for(int iseq=0;iseq<m_cfg.m_dsequence.size();++iseq)
+			{
+			getSolver(m_cfg.m_dsequence[iseq])(this,1,0);
+			}
+		}
+	for(int i=0,ni=m_nodes.size();i<ni;++i)
+		{
+		Node&	n=m_nodes[i];
+		n.m_v	+=	(n.m_x-n.m_q)*vcf;
+		}
+	}
+/* Apply clusters		*/ 
+dampClusters();
+applyClusters(true);
+}
+
+//
+void			btSoftBody::staticSolve(int iterations)
+{
+for(int isolve=0;isolve<iterations;++isolve)
+	{
+	for(int iseq=0;iseq<m_cfg.m_psequence.size();++iseq)
+		{
+		getSolver(m_cfg.m_psequence[iseq])(this,1,0);
+		}
+	}
+}
+
+//
+void			btSoftBody::solveCommonConstraints(btSoftBody** /*bodies*/,int /*count*/,int /*iterations*/)
+{
+/// placeholder
+}
+
+//
+void			btSoftBody::solveClusters(const btAlignedObjectArray<btSoftBody*>& bodies)
+{
+const int	nb=bodies.size();
+int			iterations=0;
+int i;
+
+for(i=0;i<nb;++i)
+	{
+	iterations=btMax(iterations,bodies[i]->m_cfg.citerations);
+	}
+for(i=0;i<nb;++i)
+	{
+	bodies[i]->prepareClusters(iterations);
+	}
+for(i=0;i<iterations;++i)
+	{
+	const btScalar sor=1;
+	for(int j=0;j<nb;++j)
+		{
+		bodies[j]->solveClusters(sor);
+		}
+	}
+for(i=0;i<nb;++i)
+	{
+	bodies[i]->cleanupClusters();
+	}
+}
+
+//
+void			btSoftBody::integrateMotion()
+{
+	/* Update			*/ 
+	updateNormals();
+}
+
+//
+					btSoftBody::RayCaster::RayCaster(const btVector3& org,const btVector3& dir,btScalar mxt)
+{
+o		=	org;
+d		=	dir;
+mint	=	mxt;
+face	=	0;
+tests	=	0;
+}
+
+//
+void				btSoftBody::RayCaster::Process(const btDbvtNode* leaf)
+{
+btSoftBody::Face&	f=*(btSoftBody::Face*)leaf->data;
+const btScalar		t=rayTriangle(	o,d,
+									f.m_n[0]->m_x,
+									f.m_n[1]->m_x,
+									f.m_n[2]->m_x,
+									mint);
+if((t>0)&&(t<mint)) { mint=t;face=&f; }
+++tests;
+}
+
+//
+btScalar			btSoftBody::RayCaster::rayTriangle(	const btVector3& org,
+														const btVector3& dir,
+														const btVector3& a,
+														const btVector3& b,
+														const btVector3& c,
+														btScalar maxt)
+{
+	static const btScalar	ceps=-SIMD_EPSILON*10;
+	static const btScalar	teps=SIMD_EPSILON*10;
+	const btVector3			n=cross(b-a,c-a);
+	const btScalar			d=dot(a,n);
+	const btScalar			den=dot(dir,n);
+	if(!btFuzzyZero(den))
+	{
+		const btScalar		num=dot(org,n)-d;
+		const btScalar		t=-num/den;
+		if((t>teps)&&(t<maxt))
+		{
+			const btVector3	hit=org+dir*t;
+			if(	(dot(n,cross(a-hit,b-hit))>ceps)	&&			
+				(dot(n,cross(b-hit,c-hit))>ceps)	&&
+				(dot(n,cross(c-hit,a-hit))>ceps))
+			{
+				return(t);
+			}
+		}
+	}
+	return(-1);
+}
+
+//
+void				btSoftBody::pointersToIndices()
+{
+#define	PTR2IDX(_p_,_b_)	reinterpret_cast<btSoftBody::Node*>((_p_)-(_b_))
+	btSoftBody::Node*	base=&m_nodes[0];
+	int i,ni;
+
+	for(i=0,ni=m_nodes.size();i<ni;++i)
+	{
+		if(m_nodes[i].m_leaf)
+			{
+			m_nodes[i].m_leaf->data=*(void**)&i;
+			}
+	}
+	for(i=0,ni=m_links.size();i<ni;++i)
+	{
+		m_links[i].m_n[0]=PTR2IDX(m_links[i].m_n[0],base);
+		m_links[i].m_n[1]=PTR2IDX(m_links[i].m_n[1],base);
+	}
+	for(i=0,ni=m_faces.size();i<ni;++i)
+	{
+		m_faces[i].m_n[0]=PTR2IDX(m_faces[i].m_n[0],base);
+		m_faces[i].m_n[1]=PTR2IDX(m_faces[i].m_n[1],base);
+		m_faces[i].m_n[2]=PTR2IDX(m_faces[i].m_n[2],base);
+		if(m_faces[i].m_leaf)
+			{
+			m_faces[i].m_leaf->data=*(void**)&i;
+			}
+	}
+	for(i=0,ni=m_anchors.size();i<ni;++i)
+		{
+		m_anchors[i].m_node=PTR2IDX(m_anchors[i].m_node,base);
+		}
+	for(i=0,ni=m_notes.size();i<ni;++i)
+		{
+		for(int j=0;j<m_notes[i].m_rank;++j)
+			{
+			m_notes[i].m_nodes[j]=PTR2IDX(m_notes[i].m_nodes[j],base);
+			}
+		}
+#undef	PTR2IDX
+}
+
+//
+void				btSoftBody::indicesToPointers(const int* map)
+{
+#define	IDX2PTR(_p_,_b_)	map?(&(_b_)[map[(((char*)_p_)-(char*)0)]]):	\
+								(&(_b_)[(((char*)_p_)-(char*)0)])
+	btSoftBody::Node*	base=&m_nodes[0];
+	int i,ni;
+
+	for(i=0,ni=m_nodes.size();i<ni;++i)
+	{
+		if(m_nodes[i].m_leaf)
+			{
+			m_nodes[i].m_leaf->data=&m_nodes[i];
+			}
+	}
+	for(i=0,ni=m_links.size();i<ni;++i)
+	{
+		m_links[i].m_n[0]=IDX2PTR(m_links[i].m_n[0],base);
+		m_links[i].m_n[1]=IDX2PTR(m_links[i].m_n[1],base);
+	}
+	for(i=0,ni=m_faces.size();i<ni;++i)
+	{
+		m_faces[i].m_n[0]=IDX2PTR(m_faces[i].m_n[0],base);
+		m_faces[i].m_n[1]=IDX2PTR(m_faces[i].m_n[1],base);
+		m_faces[i].m_n[2]=IDX2PTR(m_faces[i].m_n[2],base);
+		if(m_faces[i].m_leaf)
+			{
+			m_faces[i].m_leaf->data=&m_faces[i];
+			}
+	}
+	for(i=0,ni=m_anchors.size();i<ni;++i)
+		{
+		m_anchors[i].m_node=IDX2PTR(m_anchors[i].m_node,base);
+		}
+	for(i=0,ni=m_notes.size();i<ni;++i)
+		{
+		for(int j=0;j<m_notes[i].m_rank;++j)
+			{
+			m_notes[i].m_nodes[j]=IDX2PTR(m_notes[i].m_nodes[j],base);
+			}
+		}
+#undef	IDX2PTR
+}
+
+//
+int					btSoftBody::rayCast(const btVector3& org,const btVector3& dir,
+										btScalar& mint,eFeature::_& feature,int& index,bool bcountonly) const
+{
+	int	cnt=0;
+	if(bcountonly||m_fdbvt.empty())
+		{/* Full search	*/ 
+		for(int i=0,ni=m_faces.size();i<ni;++i)
+			{
+			const btSoftBody::Face&	f=m_faces[i];
+			const btScalar			t=RayCaster::rayTriangle(	org,dir,
+																f.m_n[0]->m_x,
+																f.m_n[1]->m_x,
+																f.m_n[2]->m_x,
+																mint);
+			if(t>0)
+				{
+				++cnt;
+				if(!bcountonly)
+					{
+					feature=btSoftBody::eFeature::Face;
+					index=i;
+					mint=t;
+					}
+				}
+			}
+		}
+		else
+		{/* Use dbvt	*/ 
+		RayCaster	collider(org,dir,mint);
+		btDbvt::collideRAY(m_fdbvt.m_root,org,dir,collider);
+		if(collider.face)
+			{
+			mint=collider.mint;
+			feature=btSoftBody::eFeature::Face;
+			index=(int)(collider.face-&m_faces[0]);
+			cnt=1;
+			}
+		}
+	return(cnt);
+}
+
+//
+void			btSoftBody::initializeFaceTree()
+{
+m_fdbvt.clear();
+for(int i=0;i<m_faces.size();++i)
+	{
+	Face&	f=m_faces[i];
+	f.m_leaf=m_fdbvt.insert(VolumeOf(f,0),&f);
+	}
+}
+
+//
+btVector3		btSoftBody::evaluateCom() const
+{
+btVector3	com(0,0,0);
+if(m_pose.m_bframe)
+	{
+	for(int i=0,ni=m_nodes.size();i<ni;++i)
+		{
+		com+=m_nodes[i].m_x*m_pose.m_wgh[i];
+		}
+	}
+	return(com);
+}
+	
+//
+bool				btSoftBody::checkContact(	btRigidBody* prb,
+												const btVector3& x,
+												btScalar margin,
+												btSoftBody::sCti& cti) const
+{
+	btVector3			nrm;
+	btCollisionShape*	shp=prb->getCollisionShape();
+	const btTransform&	wtr=prb->getInterpolationWorldTransform();
+	btScalar			dst=m_worldInfo->m_sparsesdf.Evaluate(	wtr.invXform(x),
+																shp,
+																nrm,
+																margin);
+	if(dst<0)
+	{
+		cti.m_body		=	prb;
+		cti.m_normal	=	wtr.getBasis()*nrm;
+		cti.m_offset	=	-dot(	cti.m_normal,
+									x-cti.m_normal*dst);
+		return(true);
+	}
+	return(false);
+}
+
+//
+void					btSoftBody::updateNormals()
+{
+	const btVector3	zv(0,0,0);
+	int i,ni;
+
+	for(i=0,ni=m_nodes.size();i<ni;++i)
+	{
+		m_nodes[i].m_n=zv;
+	}
+	for(i=0,ni=m_faces.size();i<ni;++i)
+	{
+		btSoftBody::Face&	f=m_faces[i];
+		const btVector3		n=cross(f.m_n[1]->m_x-f.m_n[0]->m_x,
+									f.m_n[2]->m_x-f.m_n[0]->m_x);
+		f.m_normal=n.normalized();
+		f.m_n[0]->m_n+=n;
+		f.m_n[1]->m_n+=n;
+		f.m_n[2]->m_n+=n;
+	}
+	for(i=0,ni=m_nodes.size();i<ni;++i)
+	{
+		btScalar len = m_nodes[i].m_n.length();
+		if (len>SIMD_EPSILON)
+			m_nodes[i].m_n /= len;
+	}
+}
+
+//
+void					btSoftBody::updateBounds()
+{
+	if(m_ndbvt.m_root)
+		{
+		const btVector3&	mins=m_ndbvt.m_root->volume.Mins();
+		const btVector3&	maxs=m_ndbvt.m_root->volume.Maxs();
+		const btScalar		csm=getCollisionShape()->getMargin();
+		const btVector3		mrg=btVector3(	csm,
+											csm,
+											csm)*1; // ??? to investigate...
+		m_bounds[0]=mins-mrg;
+		m_bounds[1]=maxs+mrg;
+			if(0!=getBroadphaseHandle())
+			{					
+				m_worldInfo->m_broadphase->setAabb(	getBroadphaseHandle(),
+													m_bounds[0],
+													m_bounds[1],
+													m_worldInfo->m_dispatcher);
+			}
+		}
+		else
+		{
+		m_bounds[0]=
+		m_bounds[1]=btVector3(0,0,0);
+		}		
+}
+
+
+//
+void					btSoftBody::updatePose()
+{
+	if(m_pose.m_bframe)
+	{
+		btSoftBody::Pose&	pose=m_pose;
+		const btVector3		com=evaluateCom();
+		/* Com			*/ 
+		pose.m_com	=	com;
+		/* Rotation		*/ 
+		btMatrix3x3		Apq;
+		const btScalar	eps=SIMD_EPSILON;
+		Apq[0]=Apq[1]=Apq[2]=btVector3(0,0,0);
+		Apq[0].setX(eps);Apq[1].setY(eps*2);Apq[2].setZ(eps*3);
+		for(int i=0,ni=m_nodes.size();i<ni;++i)
+		{
+			const btVector3		a=pose.m_wgh[i]*(m_nodes[i].m_x-com);
+			const btVector3&	b=pose.m_pos[i];
+			Apq[0]+=a.x()*b;
+			Apq[1]+=a.y()*b;
+			Apq[2]+=a.z()*b;
+		}
+		btMatrix3x3		r,s;
+		PolarDecompose(Apq,r,s);
+		pose.m_rot=r;
+		pose.m_scl=pose.m_aqq*r.transpose()*Apq;
+		if(m_cfg.maxvolume>1)
+			{
+			const btScalar	idet=Clamp<btScalar>(	1/pose.m_scl.determinant(),
+													1,m_cfg.maxvolume);
+			pose.m_scl=Mul(pose.m_scl,idet);
+			}
+		
+	}
+}
+
+//
+void				btSoftBody::updateConstants()
+{
+	int i,ni;
+
+	/* Links		*/ 
+	for(i=0,ni=m_links.size();i<ni;++i)
+	{
+		Link&		l=m_links[i];
+		Material&	m=*l.m_material;
+		l.m_rl	=	(l.m_n[0]->m_x-l.m_n[1]->m_x).length();
+		l.m_c0	=	(l.m_n[0]->m_im+l.m_n[1]->m_im)/m.m_kLST;
+		l.m_c1	=	l.m_rl*l.m_rl;
+	}
+	/* Faces		*/ 
+	for(i=0,ni=m_faces.size();i<ni;++i)
+	{
+		Face&		f=m_faces[i];
+		f.m_ra	=	AreaOf(f.m_n[0]->m_x,f.m_n[1]->m_x,f.m_n[2]->m_x);
+	}
+	/* Area's		*/ 
+	btAlignedObjectArray<int>	counts;
+	counts.resize(m_nodes.size(),0);
+	for(i=0,ni=m_nodes.size();i<ni;++i)
+	{
+		m_nodes[i].m_area	=	0;
+	}
+	for(i=0,ni=m_faces.size();i<ni;++i)
+	{
+		btSoftBody::Face&	f=m_faces[i];
+		for(int j=0;j<3;++j)
+		{
+			const int index=(int)(f.m_n[j]-&m_nodes[0]);
+			counts[index]++;
+			f.m_n[j]->m_area+=btFabs(f.m_ra);
+		}
+	}
+	for(i=0,ni=m_nodes.size();i<ni;++i)
+	{
+		if(counts[i]>0)
+			m_nodes[i].m_area/=(btScalar)counts[i];
+		else
+			m_nodes[i].m_area=0;
+	}
+}
+
+//
+void					btSoftBody::initializeClusters()
+{
+	int i;
+
+for( i=0;i<m_clusters.size();++i)
+	{
+	Cluster&	c=*m_clusters[i];
+	c.m_imass=0;
+	c.m_masses.resize(c.m_nodes.size());
+	for(int j=0;j<c.m_nodes.size();++j)
+		{
+		c.m_masses[j]	=	c.m_nodes[j]->m_im>0?1/c.m_nodes[j]->m_im:0;
+		c.m_imass		+=	c.m_masses[j];
+		}
+	c.m_imass		=	1/c.m_imass;
+	c.m_com			=	btSoftBody::clusterCom(&c);
+	c.m_lv			=	btVector3(0,0,0);
+	c.m_av			=	btVector3(0,0,0);
+	c.m_leaf		=	0;
+	/* Inertia	*/ 
+	btMatrix3x3&	ii=c.m_locii;
+	ii[0]=ii[1]=ii[2]=btVector3(0,0,0);
+	{
+		int i,ni;
+
+		for(i=0,ni=c.m_nodes.size();i<ni;++i)
+		{
+			const btVector3	k=c.m_nodes[i]->m_x-c.m_com;
+			const btVector3	q=k*k;
+			const btScalar	m=c.m_masses[i];
+			ii[0][0]	+=	m*(q[1]+q[2]);
+			ii[1][1]	+=	m*(q[0]+q[2]);
+			ii[2][2]	+=	m*(q[0]+q[1]);
+			ii[0][1]	-=	m*k[0]*k[1];
+			ii[0][2]	-=	m*k[0]*k[2];
+			ii[1][2]	-=	m*k[1]*k[2];
+		}
+	}
+	ii[1][0]=ii[0][1];
+	ii[2][0]=ii[0][2];
+	ii[2][1]=ii[1][2];
+	ii=ii.inverse();
+	/* Frame	*/ 
+	c.m_framexform.setIdentity();
+	c.m_framexform.setOrigin(c.m_com);
+	c.m_framerefs.resize(c.m_nodes.size());
+	{
+		int i;
+		for(i=0;i<c.m_framerefs.size();++i)
+			{
+			c.m_framerefs[i]=c.m_nodes[i]->m_x-c.m_com;
+			}
+		}
+	}
+}
+
+//
+void					btSoftBody::updateClusters()
+{
+BT_PROFILE("UpdateClusters");
+int i;
+
+for(i=0;i<m_clusters.size();++i)
+	{
+	btSoftBody::Cluster&	c=*m_clusters[i];
+	const int				n=c.m_nodes.size();
+	const btScalar			invn=1/(btScalar)n;
+	if(n)
+		{
+		/* Frame				*/ 
+		const btScalar	eps=btScalar(0.0001);
+		btMatrix3x3		m,r,s;
+		m[0]=m[1]=m[2]=btVector3(0,0,0);
+		m[0][0]=eps*1;
+		m[1][1]=eps*2;
+		m[2][2]=eps*3;
+		c.m_com=clusterCom(&c);
+		for(int i=0;i<c.m_nodes.size();++i)
+			{
+			const btVector3		a=c.m_nodes[i]->m_x-c.m_com;
+			const btVector3&	b=c.m_framerefs[i];
+			m[0]+=a[0]*b;m[1]+=a[1]*b;m[2]+=a[2]*b;
+			}
+		PolarDecompose(m,r,s);
+		c.m_framexform.setOrigin(c.m_com);
+		c.m_framexform.setBasis(r);		
+		/* Inertia			*/ 
+		#if 1/* Constant	*/ 
+		c.m_invwi=c.m_framexform.getBasis()*c.m_locii*c.m_framexform.getBasis().transpose();
+		#else
+			#if 0/* Sphere	*/ 
+			const btScalar	rk=(2*c.m_extents.length2())/(5*c.m_imass);
+			const btVector3	inertia(rk,rk,rk);
+			const btVector3	iin(btFabs(inertia[0])>SIMD_EPSILON?1/inertia[0]:0,
+								btFabs(inertia[1])>SIMD_EPSILON?1/inertia[1]:0,
+								btFabs(inertia[2])>SIMD_EPSILON?1/inertia[2]:0);
+			
+			c.m_invwi=c.m_xform.getBasis().scaled(iin)*c.m_xform.getBasis().transpose();
+			#else/* Actual	*/ 		
+			c.m_invwi[0]=c.m_invwi[1]=c.m_invwi[2]=btVector3(0,0,0);
+			for(int i=0;i<n;++i)
+				{
+				const btVector3	k=c.m_nodes[i]->m_x-c.m_com;
+				const btVector3		q=k*k;
+				const btScalar		m=1/c.m_nodes[i]->m_im;
+				c.m_invwi[0][0]	+=	m*(q[1]+q[2]);
+				c.m_invwi[1][1]	+=	m*(q[0]+q[2]);
+				c.m_invwi[2][2]	+=	m*(q[0]+q[1]);
+				c.m_invwi[0][1]	-=	m*k[0]*k[1];
+				c.m_invwi[0][2]	-=	m*k[0]*k[2];
+				c.m_invwi[1][2]	-=	m*k[1]*k[2];
+				}
+			c.m_invwi[1][0]=c.m_invwi[0][1];
+			c.m_invwi[2][0]=c.m_invwi[0][2];
+			c.m_invwi[2][1]=c.m_invwi[1][2];
+			c.m_invwi=c.m_invwi.inverse();
+			#endif
+		#endif
+		/* Velocities			*/ 
+		c.m_lv=btVector3(0,0,0);
+		c.m_av=btVector3(0,0,0);
+		{
+			int i;
+
+			for(i=0;i<n;++i)
+			{
+				const btVector3	v=c.m_nodes[i]->m_v*c.m_masses[i];
+				c.m_lv	+=	v;
+				c.m_av	+=	cross(c.m_nodes[i]->m_x-c.m_com,v);
+			}
+		}
+		c.m_lv=c.m_imass*c.m_lv*(1-c.m_ldamping);
+		c.m_av=c.m_invwi*c.m_av*(1-c.m_adamping);
+		c.m_vimpulses[0]	=
+		c.m_vimpulses[1]	= btVector3(0,0,0);
+		c.m_dimpulses[0]	=
+		c.m_dimpulses[1]	= btVector3(0,0,0);
+		c.m_nvimpulses		= 0;
+		c.m_ndimpulses		= 0;
+		/* Matching				*/ 
+		if(c.m_matching>0)
+			{
+			for(int j=0;j<c.m_nodes.size();++j)
+				{
+				Node&			n=*c.m_nodes[j];
+				const btVector3	x=c.m_framexform*c.m_framerefs[j];
+				n.m_x=Lerp(n.m_x,x,c.m_matching);
+				}
+			}
+		/* Dbvt					*/ 
+		if(c.m_collide)
+			{
+			btVector3	mi=c.m_nodes[0]->m_x;
+			btVector3	mx=mi;
+			for(int j=1;j<n;++j)
+				{
+				mi.setMin(c.m_nodes[j]->m_x);
+				mx.setMax(c.m_nodes[j]->m_x);
+				}			
+			const btDbvtVolume	bounds=btDbvtVolume::FromMM(mi,mx);
+			if(c.m_leaf)
+				m_cdbvt.update(c.m_leaf,bounds,c.m_lv*m_sst.sdt*3,m_sst.radmrg);
+				else
+				c.m_leaf=m_cdbvt.insert(bounds,&c);
+			}
+		}
+	}
+}
+
+//
+void					btSoftBody::cleanupClusters()
+{
+for(int i=0;i<m_joints.size();++i)
+	{
+	m_joints[i]->Terminate(m_sst.sdt);
+	if(m_joints[i]->m_delete)
+		{
+		btAlignedFree(m_joints[i]);
+		m_joints.remove(m_joints[i--]);
+		}	
+	}
+}
+
+//
+void					btSoftBody::prepareClusters(int iterations)
+{
+for(int i=0;i<m_joints.size();++i)
+	{
+	m_joints[i]->Prepare(m_sst.sdt,iterations);
+	}
+}
+
+
+//
+void					btSoftBody::solveClusters(btScalar sor)
+{
+for(int i=0,ni=m_joints.size();i<ni;++i)
+	{
+	m_joints[i]->Solve(m_sst.sdt,sor);
+	}
+}
+
+//
+void					btSoftBody::applyClusters(bool drift)
+{
+BT_PROFILE("ApplyClusters");
+const btScalar					f0=m_sst.sdt;
+const btScalar					f1=f0/2;
+btAlignedObjectArray<btVector3>	deltas;
+btAlignedObjectArray<btScalar>	weights;
+deltas.resize(m_nodes.size(),btVector3(0,0,0));
+weights.resize(m_nodes.size(),0);
+int i;
+
+if(drift)
+	{
+	for(i=0;i<m_clusters.size();++i)
+		{
+		Cluster&	c=*m_clusters[i];
+		if(c.m_ndimpulses)
+			{
+			c.m_dimpulses[0]/=(btScalar)c.m_ndimpulses;
+			c.m_dimpulses[1]/=(btScalar)c.m_ndimpulses;
+			}
+		}
+	}
+for(i=0;i<m_clusters.size();++i)
+	{
+	Cluster&	c=*m_clusters[i];	
+	if(0<(drift?c.m_ndimpulses:c.m_nvimpulses))
+		{
+		const btVector3		v=(drift?c.m_dimpulses[0]:c.m_vimpulses[0])*m_sst.sdt;
+		const btVector3		w=(drift?c.m_dimpulses[1]:c.m_vimpulses[1])*m_sst.sdt;
+		for(int j=0;j<c.m_nodes.size();++j)
+			{
+			const int			idx=int(c.m_nodes[j]-&m_nodes[0]);
+			const btVector3&	x=c.m_nodes[j]->m_x;
+			const btScalar		q=c.m_masses[j];
+			deltas[idx]		+=	(v+cross(w,x-c.m_com))*q;
+			weights[idx]	+=	q;
+			}
+		}
+	}
+	for(i=0;i<deltas.size();++i)
+	{
+		if(weights[i]>0) m_nodes[i].m_x+=deltas[i]/weights[i];
+	}
+}
+
+//
+void					btSoftBody::dampClusters()
+{
+	int i;
+
+for(i=0;i<m_clusters.size();++i)
+	{
+	Cluster&	c=*m_clusters[i];	
+	if(c.m_ndamping>0)
+		{
+		for(int j=0;j<c.m_nodes.size();++j)
+			{
+			Node&			n=*c.m_nodes[j];
+			if(n.m_im>0)
+				{
+				const btVector3	vx=c.m_lv+cross(c.m_av,c.m_nodes[j]->m_q-c.m_com);
+				n.m_v	+=	c.m_ndamping*(vx-n.m_v);
+				}
+			}
+		}
+	}
+}
+
+//
+void				btSoftBody::Joint::Prepare(btScalar dt,int)
+{
+m_bodies[0].activate();
+m_bodies[1].activate();
+}
+
+//
+void				btSoftBody::LJoint::Prepare(btScalar dt,int iterations)
+{
+static const btScalar	maxdrift=4;
+Joint::Prepare(dt,iterations);
+m_rpos[0]		=	m_bodies[0].xform()*m_refs[0];
+m_rpos[1]		=	m_bodies[1].xform()*m_refs[1];
+m_drift			=	Clamp(m_rpos[0]-m_rpos[1],maxdrift)*m_erp/dt;
+m_rpos[0]		-=	m_bodies[0].xform().getOrigin();
+m_rpos[1]		-=	m_bodies[1].xform().getOrigin();
+m_massmatrix	=	ImpulseMatrix(	m_bodies[0].invMass(),m_bodies[0].invWorldInertia(),m_rpos[0],
+									m_bodies[1].invMass(),m_bodies[1].invWorldInertia(),m_rpos[1]);
+if(m_split>0)
+	{
+	m_sdrift	=	m_massmatrix*(m_drift*m_split);
+	m_drift		*=	1-m_split;
+	}
+m_drift	/=(btScalar)iterations;
+}
+
+//
+void				btSoftBody::LJoint::Solve(btScalar dt,btScalar sor)
+{
+const btVector3		va=m_bodies[0].velocity(m_rpos[0]);
+const btVector3		vb=m_bodies[1].velocity(m_rpos[1]);
+const btVector3		vr=va-vb;
+btSoftBody::Impulse	impulse;
+impulse.m_asVelocity	=	1;
+impulse.m_velocity		=	m_massmatrix*(m_drift+vr*m_cfm)*sor;
+m_bodies[0].applyImpulse(-impulse,m_rpos[0]);
+m_bodies[1].applyImpulse( impulse,m_rpos[1]);
+}
+
+//
+void				btSoftBody::LJoint::Terminate(btScalar dt)
+{
+if(m_split>0)
+	{
+	m_bodies[0].applyDImpulse(-m_sdrift,m_rpos[0]);
+	m_bodies[1].applyDImpulse( m_sdrift,m_rpos[1]);
+	}
+}
+
+//
+void				btSoftBody::AJoint::Prepare(btScalar dt,int iterations)
+{
+static const btScalar	maxdrift=SIMD_PI/16;
+m_icontrol->Prepare(this);
+Joint::Prepare(dt,iterations);
+m_axis[0]	=	m_bodies[0].xform().getBasis()*m_refs[0];
+m_axis[1]	=	m_bodies[1].xform().getBasis()*m_refs[1];
+m_drift		=	NormalizeAny(cross(m_axis[1],m_axis[0]));
+m_drift		*=	btMin(maxdrift,btAcos(Clamp<btScalar>(dot(m_axis[0],m_axis[1]),-1,+1)));
+m_drift		*=	m_erp/dt;
+m_massmatrix=	AngularImpulseMatrix(m_bodies[0].invWorldInertia(),m_bodies[1].invWorldInertia());
+if(m_split>0)
+	{
+	m_sdrift	=	m_massmatrix*(m_drift*m_split);
+	m_drift		*=	1-m_split;
+	}
+m_drift	/=(btScalar)iterations;
+}
+
+//
+void				btSoftBody::AJoint::Solve(btScalar dt,btScalar sor)
+{
+const btVector3		va=m_bodies[0].angularVelocity();
+const btVector3		vb=m_bodies[1].angularVelocity();
+const btVector3		vr=va-vb;
+const btScalar		sp=dot(vr,m_axis[0]);
+const btVector3		vc=vr-m_axis[0]*m_icontrol->Speed(this,sp);
+btSoftBody::Impulse	impulse;
+impulse.m_asVelocity	=	1;
+impulse.m_velocity		=	m_massmatrix*(m_drift+vc*m_cfm)*sor;
+m_bodies[0].applyAImpulse(-impulse);
+m_bodies[1].applyAImpulse( impulse);
+}
+
+//
+void				btSoftBody::AJoint::Terminate(btScalar dt)
+{
+if(m_split>0)
+	{
+	m_bodies[0].applyDAImpulse(-m_sdrift);
+	m_bodies[1].applyDAImpulse( m_sdrift);
+	}
+}
+
+//
+void				btSoftBody::CJoint::Prepare(btScalar dt,int iterations)
+{
+Joint::Prepare(dt,iterations);
+const bool	dodrift=(m_life==0);
+m_delete=(++m_life)>m_maxlife;
+if(dodrift)
+	{
+	m_drift=m_drift*m_erp/dt;
+	if(m_split>0)
+		{
+		m_sdrift	=	m_massmatrix*(m_drift*m_split);
+		m_drift		*=	1-m_split;
+		}
+	m_drift/=(btScalar)iterations;
+	}
+	else
+	{
+	m_drift=m_sdrift=btVector3(0,0,0);
+	}
+}
+
+//
+void				btSoftBody::CJoint::Solve(btScalar dt,btScalar sor)
+{
+const btVector3		va=m_bodies[0].velocity(m_rpos[0]);
+const btVector3		vb=m_bodies[1].velocity(m_rpos[1]);
+const btVector3		vrel=va-vb;
+const btScalar		rvac=dot(vrel,m_normal);
+btSoftBody::Impulse	impulse;
+impulse.m_asVelocity	=	1;
+impulse.m_velocity		=	m_drift;
+if(rvac<0)
+	{
+	const btVector3	iv=m_normal*rvac;
+	const btVector3	fv=vrel-iv;
+	impulse.m_velocity	+=	iv+fv*m_friction;
+	}
+impulse.m_velocity=m_massmatrix*impulse.m_velocity*sor;
+m_bodies[0].applyImpulse(-impulse,m_rpos[0]);
+m_bodies[1].applyImpulse( impulse,m_rpos[1]);
+}
+
+//
+void				btSoftBody::CJoint::Terminate(btScalar dt)
+{
+if(m_split>0)
+	{
+	m_bodies[0].applyDImpulse(-m_sdrift,m_rpos[0]);
+	m_bodies[1].applyDImpulse( m_sdrift,m_rpos[1]);
+	}
+}
+
+//
+void				btSoftBody::applyForces()
+{
+	BT_PROFILE("SoftBody applyForces");
+	const btScalar					dt=m_sst.sdt;
+	const btScalar					kLF=m_cfg.kLF;
+	const btScalar					kDG=m_cfg.kDG;
+	const btScalar					kPR=m_cfg.kPR;
+	const btScalar					kVC=m_cfg.kVC;
+	const bool						as_lift=kLF>0;
+	const bool						as_drag=kDG>0;
+	const bool						as_pressure=kPR!=0;
+	const bool						as_volume=kVC>0;
+	const bool						as_aero=	as_lift		||
+												as_drag		;
+	const bool						as_vaero=	as_aero		&&
+												(m_cfg.aeromodel<btSoftBody::eAeroModel::F_TwoSided);
+	const bool						as_faero=	as_aero		&&
+												(m_cfg.aeromodel>=btSoftBody::eAeroModel::F_TwoSided);
+	const bool						use_medium=	as_aero;
+	const bool						use_volume=	as_pressure	||
+												as_volume	;
+	btScalar						volume=0;
+	btScalar						ivolumetp=0;
+	btScalar						dvolumetv=0;
+	btSoftBody::sMedium	medium;
+	if(use_volume)
+	{
+		volume		=	getVolume();
+		ivolumetp	=	1/btFabs(volume)*kPR;
+		dvolumetv	=	(m_pose.m_volume-volume)*kVC;
+	}
+	/* Per vertex forces			*/ 
+	int i,ni;
+
+	for(i=0,ni=m_nodes.size();i<ni;++i)
+	{
+		btSoftBody::Node&	n=m_nodes[i];
+		if(n.m_im>0)
+		{
+			if(use_medium)
+			{
+				EvaluateMedium(m_worldInfo,n.m_x,medium);
+				/* Aerodynamics			*/ 
+				if(as_vaero)
+				{				
+					const btVector3	rel_v=n.m_v-medium.m_velocity;
+					const btScalar	rel_v2=rel_v.length2();
+					if(rel_v2>SIMD_EPSILON)
+					{
+						btVector3	nrm=n.m_n;
+						/* Setup normal		*/ 
+						switch(m_cfg.aeromodel)
+						{
+						case	btSoftBody::eAeroModel::V_Point:
+							nrm=NormalizeAny(rel_v);break;
+						case	btSoftBody::eAeroModel::V_TwoSided:
+							nrm*=(btScalar)(dot(nrm,rel_v)<0?-1:+1);break;
+						}
+						const btScalar	dvn=dot(rel_v,nrm);
+						/* Compute forces	*/ 
+						if(dvn>0)
+						{
+							btVector3		force(0,0,0);
+							const btScalar	c0	=	n.m_area*dvn*rel_v2/2;
+							const btScalar	c1	=	c0*medium.m_density;
+							force	+=	nrm*(-c1*kLF);
+							force	+=	rel_v.normalized()*(-c1*kDG);
+							ApplyClampedForce(n,force,dt);
+						}
+					}
+				}
+			}
+			/* Pressure				*/ 
+			if(as_pressure)
+			{
+				n.m_f	+=	n.m_n*(n.m_area*ivolumetp);
+			}
+			/* Volume				*/ 
+			if(as_volume)
+			{
+				n.m_f	+=	n.m_n*(n.m_area*dvolumetv);
+			}
+		}
+	}
+	/* Per face forces				*/ 
+	for(i=0,ni=m_faces.size();i<ni;++i)
+	{
+		btSoftBody::Face&	f=m_faces[i];
+		if(as_faero)
+		{
+			const btVector3	v=(f.m_n[0]->m_v+f.m_n[1]->m_v+f.m_n[2]->m_v)/3;
+			const btVector3	x=(f.m_n[0]->m_x+f.m_n[1]->m_x+f.m_n[2]->m_x)/3;
+			EvaluateMedium(m_worldInfo,x,medium);
+			const btVector3	rel_v=v-medium.m_velocity;
+			const btScalar	rel_v2=rel_v.length2();
+			if(rel_v2>SIMD_EPSILON)
+			{
+				btVector3	nrm=f.m_normal;
+				/* Setup normal		*/ 
+				switch(m_cfg.aeromodel)
+				{
+				case	btSoftBody::eAeroModel::F_TwoSided:
+					nrm*=(btScalar)(dot(nrm,rel_v)<0?-1:+1);break;
+				}
+				const btScalar	dvn=dot(rel_v,nrm);
+				/* Compute forces	*/ 
+				if(dvn>0)
+				{
+					btVector3		force(0,0,0);
+					const btScalar	c0	=	f.m_ra*dvn*rel_v2;
+					const btScalar	c1	=	c0*medium.m_density;
+					force	+=	nrm*(-c1*kLF);
+					force	+=	rel_v.normalized()*(-c1*kDG);
+					force	/=	3;
+					for(int j=0;j<3;++j) ApplyClampedForce(*f.m_n[j],force,dt);
+				}
+			}
+		}
+	}
+}
+
+//
+void				btSoftBody::PSolve_Anchors(btSoftBody* psb,btScalar kst,btScalar ti)
+{
+	const btScalar	kAHR=psb->m_cfg.kAHR*kst;
+	const btScalar	dt=psb->m_sst.sdt;
+	for(int i=0,ni=psb->m_anchors.size();i<ni;++i)
+	{
+		const Anchor&		a=psb->m_anchors[i];
+		const btTransform&	t=a.m_body->getInterpolationWorldTransform();
+		Node&				n=*a.m_node;
+		const btVector3		wa=t*a.m_local;
+		const btVector3		va=a.m_body->getVelocityInLocalPoint(a.m_c1)*dt;
+		const btVector3		vb=n.m_x-n.m_q;
+		const btVector3		vr=(va-vb)+(wa-n.m_x)*kAHR;
+		const btVector3		impulse=a.m_c0*vr;
+		n.m_x+=impulse*a.m_c2;
+		a.m_body->applyImpulse(-impulse,a.m_c1);
+	}
+}
+
+//
+void				btSoftBody::PSolve_RContacts(btSoftBody* psb,btScalar kst,btScalar ti)
+{
+	const btScalar	dt=psb->m_sst.sdt;
+	const btScalar	mrg=psb->getCollisionShape()->getMargin();
+	for(int i=0,ni=psb->m_rcontacts.size();i<ni;++i)
+	{
+		const RContact&		c=psb->m_rcontacts[i];
+		const sCti&			cti=c.m_cti;	
+		const btVector3		va=cti.m_body->getVelocityInLocalPoint(c.m_c1)*dt;
+		const btVector3		vb=c.m_node->m_x-c.m_node->m_q;	
+		const btVector3		vr=vb-va;
+		const btScalar		dn=dot(vr,cti.m_normal);		
+		if(dn<=SIMD_EPSILON)
+		{
+			const btScalar		dp=btMin(dot(c.m_node->m_x,cti.m_normal)+cti.m_offset,mrg);
+			const btVector3		fv=vr-cti.m_normal*dn;
+			const btVector3		impulse=c.m_c0*((vr-fv*c.m_c3+cti.m_normal*(dp*c.m_c4))*kst);
+			c.m_node->m_x-=impulse*c.m_c2;
+			c.m_cti.m_body->applyImpulse(impulse,c.m_c1);
+		}
+	}
+}
+
+//
+void				btSoftBody::PSolve_SContacts(btSoftBody* psb,btScalar,btScalar ti)
+{
+for(int i=0,ni=psb->m_scontacts.size();i<ni;++i)
+	{
+	const SContact&		c=psb->m_scontacts[i];
+	const btVector3&	nr=c.m_normal;
+	Node&				n=*c.m_node;
+	Face&				f=*c.m_face;
+	const btVector3		p=BaryEval(	f.m_n[0]->m_x,
+									f.m_n[1]->m_x,
+									f.m_n[2]->m_x,
+									c.m_weights);
+	const btVector3		q=BaryEval(	f.m_n[0]->m_q,
+									f.m_n[1]->m_q,
+									f.m_n[2]->m_q,
+									c.m_weights);											
+	const btVector3		vr=(n.m_x-n.m_q)-(p-q);
+	btVector3			corr(0,0,0);
+	if(dot(vr,nr)<0)
+		{
+		const btScalar	j=c.m_margin-(dot(nr,n.m_x)-dot(nr,p));
+		corr+=c.m_normal*j;
+		}
+	corr			-=	ProjectOnPlane(vr,nr)*c.m_friction;
+	n.m_x			+=	corr*c.m_cfm[0];
+	f.m_n[0]->m_x	-=	corr*(c.m_cfm[1]*c.m_weights.x());
+	f.m_n[1]->m_x	-=	corr*(c.m_cfm[1]*c.m_weights.y());
+	f.m_n[2]->m_x	-=	corr*(c.m_cfm[1]*c.m_weights.z());
+	}
+}
+
+//
+void				btSoftBody::PSolve_Links(btSoftBody* psb,btScalar kst,btScalar ti)
+{
+	for(int i=0,ni=psb->m_links.size();i<ni;++i)
+	{			
+		Link&	l=psb->m_links[i];
+		if(l.m_c0>0)
+		{
+			Node&			a=*l.m_n[0];
+			Node&			b=*l.m_n[1];
+			const btVector3	del=b.m_x-a.m_x;
+			const btScalar	len=del.length2();
+			const btScalar	k=((l.m_c1-len)/(l.m_c0*(l.m_c1+len)))*kst;
+			const btScalar	t=k*a.m_im;
+			a.m_x-=del*(k*a.m_im);
+			b.m_x+=del*(k*b.m_im);
+		}
+	}
+}
+
+//
+void				btSoftBody::VSolve_Links(btSoftBody* psb,btScalar kst)
+{
+for(int i=0,ni=psb->m_links.size();i<ni;++i)
+	{			
+	Link&			l=psb->m_links[i];
+	Node**			n=l.m_n;
+	const btScalar	j=-dot(l.m_c3,n[0]->m_v-n[1]->m_v)*l.m_c2*kst;
+	n[0]->m_v+=	l.m_c3*(j*n[0]->m_im);
+	n[1]->m_v-=	l.m_c3*(j*n[1]->m_im);
+	}
+}
+
+//
+btSoftBody::psolver_t	btSoftBody::getSolver(ePSolver::_ solver)
+{
+switch(solver)
+	{
+	case	ePSolver::Anchors:		return(&btSoftBody::PSolve_Anchors);
+	case	ePSolver::Linear:		return(&btSoftBody::PSolve_Links);
+	case	ePSolver::RContacts:	return(&btSoftBody::PSolve_RContacts);
+	case	ePSolver::SContacts:	return(&btSoftBody::PSolve_SContacts);	
+	}
+return(0);
+}
+
+//
+btSoftBody::vsolver_t	btSoftBody::getSolver(eVSolver::_ solver)
+{
+switch(solver)
+	{
+	case	eVSolver::Linear:		return(&btSoftBody::VSolve_Links);
+	}
+return(0);
+}
+
+//
+void			btSoftBody::defaultCollisionHandler(btCollisionObject* pco)
+{
+switch(m_cfg.collisions&fCollision::RVSmask)
+	{
+	case	fCollision::SDF_RS:
+		{
+		btSoftColliders::CollideSDF_RS	docollide;		
+		btRigidBody*		prb=btRigidBody::upcast(pco);
+		const btTransform	wtr=prb->getInterpolationWorldTransform();
+		const btTransform	ctr=prb->getWorldTransform();
+		const btScalar		timemargin=(wtr.getOrigin()-ctr.getOrigin()).length();
+		const btScalar		basemargin=getCollisionShape()->getMargin();
+		btVector3			mins;
+		btVector3			maxs;
+		btDbvtVolume		volume;
+		pco->getCollisionShape()->getAabb(	pco->getInterpolationWorldTransform(),
+											mins,
+											maxs);
+		volume=btDbvtVolume::FromMM(mins,maxs);
+		volume.Expand(btVector3(basemargin,basemargin,basemargin));		
+		docollide.psb		=	this;
+		docollide.prb		=	prb;
+		docollide.dynmargin	=	basemargin+timemargin;
+		docollide.stamargin	=	basemargin;
+		btDbvt::collideTV(m_ndbvt.m_root,volume,docollide);
+		}
+	break;
+	case	fCollision::CL_RS:
+		{
+		btSoftColliders::CollideCL_RS	collider;
+		collider.Process(this,btRigidBody::upcast(pco));
+		}
+	break;
+	}
+}
+
+//
+void			btSoftBody::defaultCollisionHandler(btSoftBody* psb)
+{
+const int cf=m_cfg.collisions&psb->m_cfg.collisions;
+switch(cf&fCollision::SVSmask)
+	{
+	case	fCollision::CL_SS:
+		{
+		btSoftColliders::CollideCL_SS	docollide;
+		docollide.Process(this,psb);
+		}
+	break;
+	case	fCollision::VF_SS:
+		{
+		btSoftColliders::CollideVF_SS	docollide;
+		/* common					*/ 
+		docollide.mrg=	getCollisionShape()->getMargin()+
+						psb->getCollisionShape()->getMargin();
+		/* psb0 nodes vs psb1 faces	*/ 
+		docollide.psb[0]=this;
+		docollide.psb[1]=psb;
+		btDbvt::collideTT(	docollide.psb[0]->m_ndbvt.m_root,
+							docollide.psb[1]->m_fdbvt.m_root,
+							docollide);
+		/* psb1 nodes vs psb0 faces	*/ 
+		docollide.psb[0]=psb;
+		docollide.psb[1]=this;
+		btDbvt::collideTT(	docollide.psb[0]->m_ndbvt.m_root,
+							docollide.psb[1]->m_fdbvt.m_root,
+							docollide);
+		}
+	break;
+	}
+}
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftBody.h b/extern/bullet2/src/BulletSoftBody/btSoftBody.h
new file mode 100644
index 00000000000..834199c668a
--- /dev/null
+++ b/extern/bullet2/src/BulletSoftBody/btSoftBody.h
@@ -0,0 +1,810 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+///btSoftBody implementation by Nathanael Presson
+
+#ifndef _BT_SOFT_BODY_H
+#define _BT_SOFT_BODY_H
+
+#include "LinearMath/btAlignedObjectArray.h"
+#include "LinearMath/btPoint3.h"
+#include "LinearMath/btTransform.h"
+#include "LinearMath/btIDebugDraw.h"
+#include "BulletDynamics/Dynamics/btRigidBody.h"
+
+#include "BulletCollision/CollisionShapes/btConcaveShape.h"
+#include "BulletCollision/CollisionDispatch/btCollisionCreateFunc.h"
+#include "btSparseSDF.h"
+#include "BulletCollision/BroadphaseCollision/btDbvt.h"
+
+class btBroadphaseInterface;
+class btCollisionDispatcher;
+
+/* btSoftBodyWorldInfo	*/ 
+struct	btSoftBodyWorldInfo
+{
+	btScalar				air_density;
+	btScalar				water_density;
+	btScalar				water_offset;
+	btVector3				water_normal;
+	btBroadphaseInterface*	m_broadphase;
+	btCollisionDispatcher*	m_dispatcher;
+	btVector3				m_gravity;
+	btSparseSdf<3>			m_sparsesdf;
+};	
+
+
+/// btSoftBody is work-in-progress
+class	btSoftBody : public btCollisionObject
+{
+public:
+	//
+	// Enumerations
+	//
+
+	///eAeroModel 
+	struct eAeroModel { enum _ {
+		V_Point,	///Vertex normals are oriented toward velocity
+		V_TwoSided,	///Vertex normals are fliped to match velocity	
+		V_OneSided,	///Vertex normals are taken as it is	
+		F_TwoSided,	///Face normals are fliped to match velocity
+		F_OneSided,	///Face normals are taken as it is
+		END
+	};};
+	
+	///eVSolver : velocities solvers
+	struct	eVSolver { enum _ {
+		Linear,		///Linear solver
+		END
+	};};
+	
+	///ePSolver : positions solvers
+	struct	ePSolver { enum _ {
+		Linear,		///Linear solver
+		Anchors,	///Anchor solver
+		RContacts,	///Rigid contacts solver
+		SContacts,	///Soft contacts solver
+		END
+	};};
+	
+	///eSolverPresets
+	struct	eSolverPresets { enum _ {
+		Positions,
+		Velocities,
+		Default	=	Positions,
+		END
+	};};
+	
+	///eFeature
+	struct	eFeature { enum _ {
+		None,
+		Node,
+		Link,
+		Face,
+		END
+	};};
+	
+	typedef btAlignedObjectArray<eVSolver::_>	tVSolverArray;
+	typedef btAlignedObjectArray<ePSolver::_>	tPSolverArray;
+	
+	//
+	// Flags
+	//
+	
+	///fCollision
+	struct fCollision { enum _ {
+		RVSmask	=	0x000f,	///Rigid versus soft mask
+		SDF_RS	=	0x0001,	///SDF based rigid vs soft
+		CL_RS	=	0x0002, ///Cluster vs convex rigid vs soft
+		
+		SVSmask	=	0x00f0,	///Rigid versus soft mask		
+		VF_SS	=	0x0010,	///Vertex vs face soft vs soft handling
+		CL_SS	=	0x0020, ///Cluster vs cluster soft vs soft handling
+		/* presets	*/ 
+		Default	=	SDF_RS,
+		END
+	};};
+	
+	///fMaterial
+	struct fMaterial { enum _ {
+		DebugDraw	=	0x0001,	/// Enable debug draw
+		/* presets	*/ 
+		Default		=	DebugDraw,
+		END
+	};};
+		
+	//
+	// API Types
+	//
+	
+	/* sRayCast		*/ 
+	struct sRayCast
+	{
+		btSoftBody*	body;		/// soft body
+		eFeature::_	feature;	/// feature type
+		int			index;		/// feature index
+		btScalar	time;		/// time of impact (rayorg+raydir*time)
+	};
+	
+	/* ImplicitFn	*/ 
+	struct	ImplicitFn
+	{
+		virtual btScalar	Eval(const btVector3& x)=0;
+	};
+	
+	//
+	// Internal types
+	//
+
+	typedef btAlignedObjectArray<btScalar>	tScalarArray;
+	typedef btAlignedObjectArray<btVector3>	tVector3Array;
+
+	/* sCti is Softbody contact info	*/ 
+	struct	sCti
+	{
+		btRigidBody*	m_body;		/* Rigid body			*/ 
+		btVector3		m_normal;	/* Outward normal		*/ 
+		btScalar		m_offset;	/* Offset from origin	*/ 
+	};	
+
+	/* sMedium		*/ 
+	struct	sMedium
+	{
+		btVector3		m_velocity;	/* Velocity				*/ 
+		btScalar		m_pressure;	/* Pressure				*/ 
+		btScalar		m_density;	/* Density				*/ 
+	};
+
+	/* Base type	*/ 
+	struct	Element
+	{
+		void*			m_tag;			// User data
+		Element() : m_tag(0) {}
+	};
+	/* Material		*/ 
+	struct	Material : Element
+	{
+		btScalar				m_kLST;			// Linear stiffness coefficient [0,1]
+		btScalar				m_kAST;			// Area/Angular stiffness coefficient [0,1]
+		btScalar				m_kVST;			// Volume stiffness coefficient [0,1]
+		int						m_flags;		// Flags
+	};
+		
+	/* Feature		*/ 
+	struct	Feature : Element
+	{
+		Material*				m_material;		// Material
+	};
+	/* Node			*/ 
+	struct	Node : Feature
+	{
+		btVector3				m_x;			// Position
+		btVector3				m_q;			// Previous step position
+		btVector3				m_v;			// Velocity
+		btVector3				m_f;			// Force accumulator
+		btVector3				m_n;			// Normal
+		btScalar				m_im;			// 1/mass
+		btScalar				m_area;			// Area
+		btDbvtNode*				m_leaf;			// Leaf data
+		int						m_battach:1;	// Attached
+	};
+	/* Link			*/ 
+	struct	Link : Feature
+	{
+		Node*					m_n[2];			// Node pointers
+		btScalar				m_rl;			// Rest length		
+		int						m_bbending:1;	// Bending link
+		btScalar				m_c0;			// (ima+imb)*kLST
+		btScalar				m_c1;			// rl^2
+		btScalar				m_c2;			// |gradient|^2/c0
+		btVector3				m_c3;			// gradient
+	};
+	/* Face			*/ 
+	struct	Face : Feature
+	{
+		Node*					m_n[3];			// Node pointers
+		btVector3				m_normal;		// Normal
+		btScalar				m_ra;			// Rest area
+		btDbvtNode*				m_leaf;			// Leaf data
+	};
+	/* RContact		*/ 
+	struct	RContact
+	{
+		sCti		m_cti;			// Contact infos
+		Node*					m_node;			// Owner node
+		btMatrix3x3				m_c0;			// Impulse matrix
+		btVector3				m_c1;			// Relative anchor
+		btScalar				m_c2;			// ima*dt
+		btScalar				m_c3;			// Friction
+		btScalar				m_c4;			// Hardness
+	};
+	/* SContact		*/ 
+	struct	SContact
+	{
+		Node*					m_node;			// Node
+		Face*					m_face;			// Face
+		btVector3				m_weights;		// Weigths
+		btVector3				m_normal;		// Normal
+		btScalar				m_margin;		// Margin
+		btScalar				m_friction;		// Friction
+		btScalar				m_cfm[2];		// Constraint force mixing
+	};
+	/* Anchor		*/ 
+	struct	Anchor
+	{
+		Node*					m_node;			// Node pointer
+		btVector3				m_local;		// Anchor position in body space
+		btRigidBody*			m_body;			// Body
+		btMatrix3x3				m_c0;			// Impulse matrix
+		btVector3				m_c1;			// Relative anchor
+		btScalar				m_c2;			// ima*dt
+	};
+	/* Note			*/ 
+	struct	Note : Element
+	{
+		const char*				m_text;			// Text
+		btVector3				m_offset;		// Offset
+		int						m_rank;			// Rank
+		Node*					m_nodes[4];		// Nodes
+		btScalar				m_coords[4];	// Coordinates
+	};	
+	/* Pose			*/ 
+	struct	Pose
+	{
+		bool					m_bvolume;		// Is valid
+		bool					m_bframe;		// Is frame
+		btScalar				m_volume;		// Rest volume
+		tVector3Array			m_pos;			// Reference positions
+		tScalarArray			m_wgh;			// Weights
+		btVector3				m_com;			// COM
+		btMatrix3x3				m_rot;			// Rotation
+		btMatrix3x3				m_scl;			// Scale
+		btMatrix3x3				m_aqq;			// Base scaling
+	};
+	/* Cluster		*/ 
+	struct	Cluster
+	{		
+		btAlignedObjectArray<Node*>	m_nodes;		
+		tScalarArray				m_masses;
+		tVector3Array				m_framerefs;
+		btTransform					m_framexform;
+		btScalar					m_idmass;
+		btScalar					m_imass;
+		btMatrix3x3					m_locii;
+		btMatrix3x3					m_invwi;
+		btVector3					m_com;
+		btVector3					m_vimpulses[2];
+		btVector3					m_dimpulses[2];
+		int							m_nvimpulses;
+		int							m_ndimpulses;
+		btVector3					m_lv;
+		btVector3					m_av;
+		btDbvtNode*					m_leaf;
+		btScalar					m_ndamping;
+		btScalar					m_ldamping;
+		btScalar					m_adamping;
+		btScalar					m_matching;
+		bool						m_collide;
+									Cluster() : m_leaf(0),m_ndamping(0),m_ldamping(0),m_adamping(0),m_matching(0) {}
+	};
+	/* Impulse		*/ 
+	struct	Impulse
+	{
+		btVector3					m_velocity;
+		btVector3					m_drift;
+		int							m_asVelocity:1;
+		int							m_asDrift:1;
+		Impulse() : m_velocity(0,0,0),m_drift(0,0,0),m_asVelocity(0),m_asDrift(0)	{}
+		Impulse						operator -() const
+			{
+			Impulse i=*this;
+			i.m_velocity=-i.m_velocity;
+			i.m_drift=-i.m_drift;
+			return(i);
+			}
+		Impulse						operator*(btScalar x) const
+			{
+			Impulse i=*this;
+			i.m_velocity*=x;
+			i.m_drift*=x;
+			return(i);
+			}
+	};
+	/* Body			*/ 
+	struct	Body
+	{
+		Cluster*		m_soft;
+		btRigidBody*				m_rigid;
+									Body() : m_soft(0),m_rigid(0)				{}
+									Body(Cluster* p) : m_soft(p),m_rigid(0)	{}
+									Body(btRigidBody* p) : m_soft(0),m_rigid(p)	{}
+		void						activate() const
+			{
+			if(m_rigid) m_rigid->activate();
+			}
+		const btMatrix3x3&			invWorldInertia() const
+			{
+			static const btMatrix3x3	iwi(0,0,0,0,0,0,0,0,0);
+			if(m_rigid) return(m_rigid->getInvInertiaTensorWorld());
+			if(m_soft)	return(m_soft->m_invwi);
+			return(iwi);
+			}
+		btScalar					invMass() const
+			{
+			if(m_rigid) return(m_rigid->getInvMass());
+			if(m_soft)	return(m_soft->m_imass);
+			return(0);
+			}
+		const btTransform&			xform() const
+			{
+			static const btTransform	identity=btTransform::getIdentity();		
+			if(m_rigid) return(m_rigid->getInterpolationWorldTransform());
+			if(m_soft)	return(m_soft->m_framexform);
+			return(identity);
+			}
+		btVector3					linearVelocity() const
+			{
+			if(m_rigid) return(m_rigid->getLinearVelocity());
+			if(m_soft)	return(m_soft->m_lv);
+			return(btVector3(0,0,0));
+			}
+		btVector3					angularVelocity(const btVector3& rpos) const
+			{			
+			if(m_rigid) return(cross(m_rigid->getAngularVelocity(),rpos));
+			if(m_soft)	return(cross(m_soft->m_av,rpos));
+			return(btVector3(0,0,0));
+			}
+		btVector3					angularVelocity() const
+			{			
+			if(m_rigid) return(m_rigid->getAngularVelocity());
+			if(m_soft)	return(m_soft->m_av);
+			return(btVector3(0,0,0));
+			}
+		btVector3					velocity(const btVector3& rpos) const
+			{
+			return(linearVelocity()+angularVelocity(rpos));
+			}
+		void						applyVImpulse(const btVector3& impulse,const btVector3& rpos) const
+			{
+			if(m_rigid)	m_rigid->applyImpulse(impulse,rpos);
+			if(m_soft)	btSoftBody::clusterVImpulse(m_soft,rpos,impulse);
+			}
+		void						applyDImpulse(const btVector3& impulse,const btVector3& rpos) const
+			{
+			if(m_rigid)	m_rigid->applyImpulse(impulse,rpos);
+			if(m_soft)	btSoftBody::clusterDImpulse(m_soft,rpos,impulse);
+			}		
+		void						applyImpulse(const Impulse& impulse,const btVector3& rpos) const
+			{
+			if(impulse.m_asVelocity)	applyVImpulse(impulse.m_velocity,rpos);
+			if(impulse.m_asDrift)		applyDImpulse(impulse.m_drift,rpos);
+			}
+		void						applyVAImpulse(const btVector3& impulse) const
+			{
+			if(m_rigid)	m_rigid->applyTorqueImpulse(impulse);
+			if(m_soft)	btSoftBody::clusterVAImpulse(m_soft,impulse);
+			}
+		void						applyDAImpulse(const btVector3& impulse) const
+			{
+			if(m_rigid)	m_rigid->applyTorqueImpulse(impulse);
+			if(m_soft)	btSoftBody::clusterDAImpulse(m_soft,impulse);
+			}
+		void						applyAImpulse(const Impulse& impulse) const
+			{
+			if(impulse.m_asVelocity)	applyVAImpulse(impulse.m_velocity);
+			if(impulse.m_asDrift)		applyDAImpulse(impulse.m_drift);
+			}
+		void						applyDCImpulse(const btVector3& impulse) const
+			{
+			if(m_rigid)	m_rigid->applyCentralImpulse(impulse);
+			if(m_soft)	btSoftBody::clusterDCImpulse(m_soft,impulse);
+			}
+	};
+	/* Joint		*/ 
+	struct	Joint
+	{
+		struct eType { enum _ {
+			Linear,
+			Angular,
+			Contact,
+		};};
+		struct Specs
+			{
+						Specs() : erp(1),cfm(1),split(1) {}
+			btScalar	erp;
+			btScalar	cfm;
+			btScalar	split;
+			};
+		Body						m_bodies[2];
+		btVector3					m_refs[2];
+		btScalar					m_cfm;
+		btScalar					m_erp;
+		btScalar					m_split;
+		btVector3					m_drift;
+		btVector3					m_sdrift;
+		btMatrix3x3					m_massmatrix;
+		bool						m_delete;
+		virtual						~Joint() {}
+									Joint() : m_delete(false) {}
+		virtual void				Prepare(btScalar dt,int iterations);
+		virtual void				Solve(btScalar dt,btScalar sor)=0;
+		virtual void				Terminate(btScalar dt)=0;
+		virtual eType::_			Type() const=0;
+	};
+	/* LJoint		*/ 
+	struct	LJoint : Joint
+	{
+		struct Specs : Joint::Specs
+			{
+			btVector3	position;
+			};		
+		btVector3					m_rpos[2];
+		void						Prepare(btScalar dt,int iterations);
+		void						Solve(btScalar dt,btScalar sor);
+		void						Terminate(btScalar dt);
+		eType::_					Type() const { return(eType::Linear); }
+	};
+	/* AJoint		*/ 
+	struct	AJoint : Joint
+	{
+		struct IControl
+			{
+			virtual void			Prepare(AJoint*)				{}
+			virtual btScalar		Speed(AJoint*,btScalar current) { return(current); }
+			static IControl*		Default()						{ static IControl def;return(&def); }
+			};
+		struct Specs : Joint::Specs
+			{
+						Specs() : icontrol(IControl::Default()) {}
+			btVector3	axis;
+			IControl*	icontrol;
+			};		
+		btVector3					m_axis[2];
+		IControl*					m_icontrol;
+		void						Prepare(btScalar dt,int iterations);
+		void						Solve(btScalar dt,btScalar sor);
+		void						Terminate(btScalar dt);
+		eType::_					Type() const { return(eType::Angular); }
+	};
+	/* CJoint		*/ 
+	struct	CJoint : Joint
+	{		
+		int							m_life;
+		int							m_maxlife;
+		btVector3					m_rpos[2];
+		btVector3					m_normal;
+		btScalar					m_friction;
+		void						Prepare(btScalar dt,int iterations);
+		void						Solve(btScalar dt,btScalar sor);
+		void						Terminate(btScalar dt);
+		eType::_					Type() const { return(eType::Contact); }
+	};
+	/* Config		*/ 
+	struct	Config
+	{
+		eAeroModel::_			aeromodel;		// Aerodynamic model (default: V_Point)
+		btScalar				kVCF;			// Velocities correction factor (Baumgarte)
+		btScalar				kDP;			// Damping coefficient [0,1]
+		btScalar				kDG;			// Drag coefficient [0,+inf]
+		btScalar				kLF;			// Lift coefficient [0,+inf]
+		btScalar				kPR;			// Pressure coefficient [-inf,+inf]
+		btScalar				kVC;			// Volume conversation coefficient [0,+inf]
+		btScalar				kDF;			// Dynamic friction coefficient [0,1]
+		btScalar				kMT;			// Pose matching coefficient [0,1]		
+		btScalar				kCHR;			// Rigid contacts hardness [0,1]
+		btScalar				kKHR;			// Kinetic contacts hardness [0,1]
+		btScalar				kSHR;			// Soft contacts hardness [0,1]
+		btScalar				kAHR;			// Anchors hardness [0,1]
+		btScalar				kSRHR_CL;		// Soft vs rigid hardness [0,1] (cluster only)
+		btScalar				kSKHR_CL;		// Soft vs kinetic hardness [0,1] (cluster only)
+		btScalar				kSSHR_CL;		// Soft vs soft hardness [0,1] (cluster only)
+		btScalar				kSR_SPLT_CL;	// Soft vs rigid impulse split [0,1] (cluster only)
+		btScalar				kSK_SPLT_CL;	// Soft vs rigid impulse split [0,1] (cluster only)
+		btScalar				kSS_SPLT_CL;	// Soft vs rigid impulse split [0,1] (cluster only)
+		btScalar				maxvolume;		// Maximum volume ratio for pose
+		btScalar				timescale;		// Time scale
+		int						viterations;	// Velocities solver iterations
+		int						piterations;	// Positions solver iterations
+		int						diterations;	// Drift solver iterations
+		int						citerations;	// Cluster solver iterations
+		int						collisions;		// Collisions flags
+		tVSolverArray			m_vsequence;	// Velocity solvers sequence
+		tPSolverArray			m_psequence;	// Position solvers sequence
+		tPSolverArray			m_dsequence;	// Drift solvers sequence
+	};
+	/* SolverState	*/ 
+	struct	SolverState
+	{
+		btScalar				sdt;			// dt*timescale
+		btScalar				isdt;			// 1/sdt
+		btScalar				velmrg;			// velocity margin
+		btScalar				radmrg;			// radial margin
+		btScalar				updmrg;			// Update margin
+	};	
+	/* RayCaster	*/ 
+	struct	RayCaster : btDbvt::ICollide
+		{
+		btVector3			o;
+		btVector3			d;
+		btScalar			mint;
+		Face*	face;
+		int					tests;
+								RayCaster(const btVector3& org,const btVector3& dir,btScalar mxt);
+		void					Process(const btDbvtNode* leaf);
+		static inline btScalar	rayTriangle(const btVector3& org,
+											const btVector3& dir,
+											const btVector3& a,
+											const btVector3& b,
+											const btVector3& c,
+											btScalar maxt=SIMD_INFINITY);
+		};
+
+	//
+	// Typedef's
+	//
+
+	typedef void								(*psolver_t)(btSoftBody*,btScalar,btScalar);
+	typedef void								(*vsolver_t)(btSoftBody*,btScalar);
+	typedef btAlignedObjectArray<Cluster*>		tClusterArray;
+	typedef btAlignedObjectArray<Note>			tNoteArray;
+	typedef btAlignedObjectArray<Node>			tNodeArray;
+	typedef btAlignedObjectArray<btDbvtNode*>	tLeafArray;
+	typedef btAlignedObjectArray<Link>			tLinkArray;
+	typedef btAlignedObjectArray<Face>			tFaceArray;
+	typedef btAlignedObjectArray<Anchor>		tAnchorArray;
+	typedef btAlignedObjectArray<RContact>		tRContactArray;
+	typedef btAlignedObjectArray<SContact>		tSContactArray;
+	typedef btAlignedObjectArray<Material*>		tMaterialArray;
+	typedef btAlignedObjectArray<Joint*>		tJointArray;
+	typedef btAlignedObjectArray<btSoftBody*>	tSoftBodyArray;	
+
+	//
+	// Fields
+	//
+
+	Config					m_cfg;			// Configuration
+	SolverState				m_sst;			// Solver state
+	Pose					m_pose;			// Pose
+	void*					m_tag;			// User data
+	btSoftBodyWorldInfo*	m_worldInfo;	// World info
+	tNoteArray				m_notes;		// Notes
+	tNodeArray				m_nodes;		// Nodes
+	tLinkArray				m_links;		// Links
+	tFaceArray				m_faces;		// Faces
+	tAnchorArray			m_anchors;		// Anchors
+	tRContactArray			m_rcontacts;	// Rigid contacts
+	tSContactArray			m_scontacts;	// Soft contacts
+	tJointArray				m_joints;		// Joints
+	tMaterialArray			m_materials;	// Materials
+	btScalar				m_timeacc;		// Time accumulator
+	btVector3				m_bounds[2];	// Spatial bounds	
+	bool					m_bUpdateRtCst;	// Update runtime constants
+	btDbvt					m_ndbvt;		// Nodes tree
+	btDbvt					m_fdbvt;		// Faces tree
+	btDbvt					m_cdbvt;		// Clusters tree
+	tClusterArray			m_clusters;		// Clusters
+		
+	//
+	// Api
+	//
+	
+	/* ctor																	*/ 
+	btSoftBody(	btSoftBodyWorldInfo* worldInfo,int node_count,
+				const btVector3* x,
+				const btScalar* m);
+	/* dtor																	*/ 
+	virtual ~btSoftBody();
+	/* Check for existing link												*/ 
+	bool				checkLink(	int node0,
+		int node1) const;
+	bool				checkLink(	const Node* node0,
+									const Node* node1) const;
+	/* Check for existring face												*/ 
+	bool				checkFace(	int node0,
+									int node1,
+									int node2) const;
+	/* Append material														*/ 
+	Material*			appendMaterial();
+	/* Append note															*/ 
+	void				appendNote(	const char* text,
+									const btVector3& o,
+									const btVector4& c=btVector4(1,0,0,0),
+									Node* n0=0,
+									Node* n1=0,
+									Node* n2=0,
+									Node* n3=0);
+	void				appendNote(	const char* text,
+									const btVector3& o,
+									Node* feature);
+	void				appendNote(	const char* text,
+									const btVector3& o,
+									Link* feature);
+	void				appendNote(	const char* text,
+									const btVector3& o,
+									Face* feature);
+	/* Append node															*/ 
+	void				appendNode(	const btVector3& x,btScalar m);
+	/* Append link															*/ 
+	void				appendLink(int model=-1,Material* mat=0);
+	void				appendLink(	int node0,
+									int node1,
+									Material* mat=0,
+									bool bcheckexist=false);
+	void				appendLink(	Node* node0,
+									Node* node1,
+									Material* mat=0,
+									bool bcheckexist=false);
+	/* Append face															*/ 
+	void				appendFace(int model=-1,Material* mat=0);
+	void				appendFace(	int node0,
+									int node1,
+									int node2,
+									Material* mat=0);
+	/* Append anchor														*/ 
+	void				appendAnchor(	int node,
+										btRigidBody* body);
+	/* Append linear joint													*/ 
+	void				appendLinearJoint(const LJoint::Specs& specs,Cluster* body0,Body body1);
+	void				appendLinearJoint(const LJoint::Specs& specs,Body body=Body());
+	void				appendLinearJoint(const LJoint::Specs& specs,btSoftBody* body);
+	/* Append linear joint													*/ 
+	void				appendAngularJoint(const AJoint::Specs& specs,Cluster* body0,Body body1);
+	void				appendAngularJoint(const AJoint::Specs& specs,Body body=Body());
+	void				appendAngularJoint(const AJoint::Specs& specs,btSoftBody* body);
+	/* Add force (or gravity) to the entire body							*/ 
+	void				addForce(		const btVector3& force);
+	/* Add force (or gravity) to a node of the body							*/ 
+	void				addForce(		const btVector3& force,
+										int node);
+	/* Add velocity to the entire body										*/ 
+	void				addVelocity(	const btVector3& velocity);
+	/* Add velocity to a node of the body									*/ 
+	void				addVelocity(	const btVector3& velocity,
+										int node);
+	/* Set mass																*/ 
+	void				setMass(		int node,
+										btScalar mass);
+	/* Get mass																*/ 
+	btScalar			getMass(		int node) const;
+	/* Get total mass														*/ 
+	btScalar			getTotalMass() const;
+	/* Set total mass (weighted by previous masses)							*/ 
+	void				setTotalMass(	btScalar mass,
+										bool fromfaces=false);
+	/* Set total density													*/ 
+	void				setTotalDensity(btScalar density);
+	/* Transform															*/ 
+	void				transform(		const btTransform& trs);
+	/* Translate															*/ 
+	void				translate(		const btVector3& trs);
+	/* Rotate															*/ 
+	void				rotate(	const btQuaternion& rot);
+	/* Scale																*/ 
+	void				scale(	const btVector3& scl);
+	/* Set current state as pose											*/ 
+	void				setPose(		bool bvolume,
+										bool bframe);
+	/* Return the volume													*/ 
+	btScalar			getVolume() const;
+	/* Cluster count														*/ 
+	int					clusterCount() const;
+	/* Cluster center of mass												*/ 
+	static btVector3	clusterCom(const Cluster* cluster);
+	btVector3			clusterCom(int cluster) const;
+	/* Cluster velocity at rpos												*/ 
+	static btVector3	clusterVelocity(const Cluster* cluster,const btVector3& rpos);
+	/* Cluster impulse														*/ 
+	static void			clusterVImpulse(Cluster* cluster,const btVector3& rpos,const btVector3& impulse);
+	static void			clusterDImpulse(Cluster* cluster,const btVector3& rpos,const btVector3& impulse);
+	static void			clusterImpulse(Cluster* cluster,const btVector3& rpos,const Impulse& impulse);
+	static void			clusterVAImpulse(Cluster* cluster,const btVector3& impulse);
+	static void			clusterDAImpulse(Cluster* cluster,const btVector3& impulse);
+	static void			clusterAImpulse(Cluster* cluster,const Impulse& impulse);
+	static void			clusterDCImpulse(Cluster* cluster,const btVector3& impulse);
+	/* Generate bending constraints based on distance in the adjency graph	*/ 
+	int					generateBendingConstraints(	int distance,
+													Material* mat=0);
+	/* Randomize constraints to reduce solver bias							*/ 
+	void				randomizeConstraints();
+	/* Generate clusters (K-mean)											*/ 
+	int					generateClusters(int k,int maxiterations=8192);
+	/* Refine																*/ 
+	void				refine(ImplicitFn* ifn,btScalar accurary,bool cut);
+	/* CutLink																*/ 
+	bool				cutLink(int node0,int node1,btScalar position);
+	bool				cutLink(const Node* node0,const Node* node1,btScalar position);
+	/* Ray casting															*/ 
+	bool				rayCast(const btVector3& org,
+								const btVector3& dir,
+								sRayCast& results,
+								btScalar maxtime=SIMD_INFINITY);
+	/* Solver presets														*/ 
+	void				setSolver(eSolverPresets::_ preset);
+	/* predictMotion														*/ 
+	void				predictMotion(btScalar dt);
+	/* solveConstraints														*/ 
+	void				solveConstraints();
+	/* staticSolve															*/ 
+	void				staticSolve(int iterations);
+	/* solveCommonConstraints												*/ 
+	static void			solveCommonConstraints(btSoftBody** bodies,int count,int iterations);
+	/* solveClusters														*/ 
+	static void			solveClusters(const btAlignedObjectArray<btSoftBody*>& bodies);
+	/* integrateMotion														*/ 
+	void				integrateMotion();
+	/* defaultCollisionHandlers												*/ 
+	void				defaultCollisionHandler(btCollisionObject* pco);
+	void				defaultCollisionHandler(btSoftBody* psb);
+		
+	//
+	// Cast
+	//
+		
+	static const btSoftBody*	upcast(const btCollisionObject* colObj)
+	{
+		if (colObj->getInternalType()==CO_SOFT_BODY)
+			return (const btSoftBody*)colObj;
+		return 0;
+	}
+	static btSoftBody*			upcast(btCollisionObject* colObj)
+	{
+		if (colObj->getInternalType()==CO_SOFT_BODY)
+			return (btSoftBody*)colObj;
+		return 0;
+	}
+
+	//
+	// ::btCollisionObject
+	//
+
+	virtual void getAabb(btVector3& aabbMin,btVector3& aabbMax) const
+	{
+		aabbMin = m_bounds[0];
+		aabbMax = m_bounds[1];
+	}
+	//
+	// Private
+	//
+	void				pointersToIndices();
+	void				indicesToPointers(const int* map=0);
+	int					rayCast(const btVector3& org,const btVector3& dir,
+								btScalar& mint,eFeature::_& feature,int& index,bool bcountonly) const;
+	void				initializeFaceTree();
+	btVector3			evaluateCom() const;
+	bool				checkContact(btRigidBody* prb,const btVector3& x,btScalar margin,btSoftBody::sCti& cti) const;
+	void				updateNormals();
+	void				updateBounds();
+	void				updatePose();
+	void				updateConstants();
+	void				initializeClusters();
+	void				updateClusters();
+	void				cleanupClusters();
+	void				prepareClusters(int iterations);
+	void				solveClusters(btScalar sor);
+	void				applyClusters(bool drift);
+	void				dampClusters();
+	void				applyForces();	
+	static void			PSolve_Anchors(btSoftBody* psb,btScalar kst,btScalar ti);
+	static void			PSolve_RContacts(btSoftBody* psb,btScalar kst,btScalar ti);
+	static void			PSolve_SContacts(btSoftBody* psb,btScalar,btScalar ti);
+	static void			PSolve_Links(btSoftBody* psb,btScalar kst,btScalar ti);
+	static void			VSolve_Links(btSoftBody* psb,btScalar kst);
+	static psolver_t	getSolver(ePSolver::_ solver);
+	static vsolver_t	getSolver(eVSolver::_ solver);
+	
+};
+
+
+
+#endif //_BT_SOFT_BODY_H
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp b/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp
new file mode 100644
index 00000000000..5e3211ed73b
--- /dev/null
+++ b/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp
@@ -0,0 +1,410 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+
+#include "btSoftBodyConcaveCollisionAlgorithm.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
+#include "BulletCollision/CollisionShapes/btMultiSphereShape.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
+#include "BulletCollision/CollisionShapes/btConcaveShape.h"
+#include "BulletCollision/CollisionDispatch/btManifoldResult.h"
+#include "BulletCollision/NarrowPhaseCollision/btRaycastCallback.h"
+#include "BulletCollision/CollisionShapes/btTriangleShape.h"
+#include "BulletCollision/CollisionShapes/btSphereShape.h"
+#include "BulletCollision/CollisionShapes/btTetrahedronShape.h"
+#include "BulletCollision/CollisionShapes/btConvexHullShape.h"
+
+
+
+#include "LinearMath/btIDebugDraw.h"
+#include "BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h"
+#include "BulletSoftBody/btSoftBody.h"
+
+#define BT_SOFTBODY_TRIANGLE_EXTRUSION btScalar(0.3)
+
+btSoftBodyConcaveCollisionAlgorithm::btSoftBodyConcaveCollisionAlgorithm( const btCollisionAlgorithmConstructionInfo& ci, btCollisionObject* body0,btCollisionObject* body1,bool isSwapped)
+: btCollisionAlgorithm(ci),
+m_isSwapped(isSwapped),
+m_btSoftBodyTriangleCallback(ci.m_dispatcher1,body0,body1,isSwapped)
+{
+}
+
+
+
+btSoftBodyConcaveCollisionAlgorithm::~btSoftBodyConcaveCollisionAlgorithm()
+{
+}
+
+
+
+btSoftBodyTriangleCallback::btSoftBodyTriangleCallback(btDispatcher*  dispatcher,btCollisionObject* body0,btCollisionObject* body1,bool isSwapped):
+	  m_dispatcher(dispatcher),
+	m_dispatchInfoPtr(0)
+{
+	m_softBody = (btSoftBody*) (isSwapped? body1:body0);
+	m_triBody = isSwapped? body0:body1;
+	
+	  //
+	  // create the manifold from the dispatcher 'manifold pool'
+	  //
+//	  m_manifoldPtr = m_dispatcher->getNewManifold(m_convexBody,m_triBody);
+
+  	  clearCache();
+}
+
+btSoftBodyTriangleCallback::~btSoftBodyTriangleCallback()
+{
+	clearCache();
+//	m_dispatcher->releaseManifold( m_manifoldPtr );
+  
+}
+  
+
+void	btSoftBodyTriangleCallback::clearCache()
+{
+	//m_dispatcher->clearManifold(m_manifoldPtr);
+};
+
+
+static const int maxParts = 1;
+static const int maxTriangleIndex = 100*100;
+
+btCollisionShape* shapeCache[maxParts][maxTriangleIndex];
+
+
+void btSoftBodyTriangleCallback::processTriangle(btVector3* triangle,int partId, int triangleIndex)
+{
+	static bool hackedFirst = true;
+	if (hackedFirst)
+	{
+		hackedFirst = false;
+		int i,j;
+		for (i=0;i<maxParts;i++)
+		{
+			for (j=0;j<maxTriangleIndex;j++)
+			{
+				shapeCache[i][j]=0;
+			}
+		}
+	}
+ 
+	//just for debugging purposes
+	//printf("triangle %d",m_triangleCount++);
+btCollisionObject* ob = static_cast<btCollisionObject*>(m_triBody);
+	btCollisionAlgorithmConstructionInfo ci;
+	ci.m_dispatcher1 = m_dispatcher;
+
+		///debug drawing of the overlapping triangles
+	if (m_dispatchInfoPtr && m_dispatchInfoPtr->m_debugDraw && m_dispatchInfoPtr->m_debugDraw->getDebugMode() > 0)
+	{
+		btVector3 color(255,255,0);
+		btTransform& tr = ob->getWorldTransform();
+		m_dispatchInfoPtr->m_debugDraw->drawLine(tr(triangle[0]),tr(triangle[1]),color);
+		m_dispatchInfoPtr->m_debugDraw->drawLine(tr(triangle[1]),tr(triangle[2]),color);
+		m_dispatchInfoPtr->m_debugDraw->drawLine(tr(triangle[2]),tr(triangle[0]),color);
+
+		//btVector3 center = triangle[0] + triangle[1]+triangle[2];
+		//center *= btScalar(0.333333);
+		//m_dispatchInfoPtr->m_debugDraw->drawLine(tr(triangle[0]),tr(center),color);
+		//m_dispatchInfoPtr->m_debugDraw->drawLine(tr(triangle[1]),tr(center),color);
+		//m_dispatchInfoPtr->m_debugDraw->drawLine(tr(triangle[2]),tr(center),color);
+
+	}
+
+	if (shapeCache[partId][triangleIndex])
+	{
+		btCollisionShape* tm = shapeCache[partId][triangleIndex];
+
+		//copy over user pointers to temporary shape
+		tm->setUserPointer(ob->getRootCollisionShape()->getUserPointer());
+		
+		btCollisionShape* tmpShape = ob->getCollisionShape();
+		ob->internalSetTemporaryCollisionShape( tm );
+		
+
+		btCollisionAlgorithm* colAlgo = ci.m_dispatcher1->findAlgorithm(m_softBody,m_triBody,0);//m_manifoldPtr);
+		
+		colAlgo->processCollision(m_softBody,m_triBody,*m_dispatchInfoPtr,m_resultOut);
+		colAlgo->~btCollisionAlgorithm();
+		ci.m_dispatcher1->freeCollisionAlgorithm(colAlgo);
+		ob->internalSetTemporaryCollisionShape( tmpShape);
+		return;
+	}
+
+	//aabb filter is already applied!	
+
+
+	
+
+	
+
+
+
+	//btCollisionObject* colObj = static_cast<btCollisionObject*>(m_convexProxy->m_clientObject);
+	
+//	if (m_softBody->getCollisionShape()->getShapeType()==
+	{
+//		btVector3 other;
+		btVector3 normal = (triangle[1]-triangle[0]).cross(triangle[2]-triangle[0]);
+		normal.normalize();
+		normal*= BT_SOFTBODY_TRIANGLE_EXTRUSION;
+//		other=(triangle[0]+triangle[1]+triangle[2])*0.333333f;
+//		other+=normal*22.f;
+		btVector3	pts[6] = {triangle[0]+normal,
+			triangle[1]+normal,
+		triangle[2]+normal,
+		triangle[0]-normal,
+		triangle[1]-normal,
+		triangle[2]-normal};
+
+		btConvexHullShape* tm = new btConvexHullShape(&pts[0].getX(),6);
+
+
+//		btBU_Simplex1to4 tm(triangle[0],triangle[1],triangle[2],other);
+		
+		//btTriangleShape tm(triangle[0],triangle[1],triangle[2]);	
+	//	tm.setMargin(m_collisionMarginTriangle);
+		
+		//copy over user pointers to temporary shape
+		tm->setUserPointer(ob->getRootCollisionShape()->getUserPointer());
+		
+		btCollisionShape* tmpShape = ob->getCollisionShape();
+		ob->internalSetTemporaryCollisionShape( tm );
+		
+
+		btCollisionAlgorithm* colAlgo = ci.m_dispatcher1->findAlgorithm(m_softBody,m_triBody,0);//m_manifoldPtr);
+		///this should use the btDispatcher, so the actual registered algorithm is used
+		//		btConvexConvexAlgorithm cvxcvxalgo(m_manifoldPtr,ci,m_convexBody,m_triBody);
+
+		//m_resultOut->setShapeIdentifiers(-1,-1,partId,triangleIndex);
+	//	cvxcvxalgo.setShapeIdentifiers(-1,-1,partId,triangleIndex);
+//		cvxcvxalgo.processCollision(m_convexBody,m_triBody,*m_dispatchInfoPtr,m_resultOut);
+		colAlgo->processCollision(m_softBody,m_triBody,*m_dispatchInfoPtr,m_resultOut);
+		colAlgo->~btCollisionAlgorithm();
+		ci.m_dispatcher1->freeCollisionAlgorithm(colAlgo);
+		ob->internalSetTemporaryCollisionShape( tmpShape );
+//		delete tm;
+
+		shapeCache[partId][triangleIndex] = tm;
+
+	}
+
+	
+
+}
+
+
+
+void	btSoftBodyTriangleCallback::setTimeStepAndCounters(btScalar collisionMarginTriangle,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut)
+{
+	m_dispatchInfoPtr = &dispatchInfo;
+	m_collisionMarginTriangle = collisionMarginTriangle;
+	m_resultOut = resultOut;
+
+	//recalc aabbs
+//	btTransform softbodyInTriangleSpace;
+//	softbodyInTriangleSpace = m_triBody->getWorldTransform().inverse() * m_softBody->getWorldTransform();
+//	btCollisionShape* convexShape = static_cast<btCollisionShape*>(m_convexBody->getCollisionShape());
+	//CollisionShape* triangleShape = static_cast<btCollisionShape*>(triBody->m_collisionShape);
+	btVector3	aabbWorldSpaceMin,aabbWorldSpaceMax;
+	m_softBody->getAabb(aabbWorldSpaceMin,aabbWorldSpaceMax);
+
+	btVector3 halfExtents = (aabbWorldSpaceMax-aabbWorldSpaceMin)*btScalar(0.5);
+	btVector3 softBodyCenter = (aabbWorldSpaceMax+aabbWorldSpaceMin)*btScalar(0.5);
+
+	btTransform	triInverse = m_triBody->getWorldTransform().inverse();
+
+	btMatrix3x3 abs_b = triInverse.getBasis().absolute();  
+	btPoint3 center = softBodyCenter + triInverse.getOrigin();
+
+	btVector3 extent = btVector3(abs_b[0].dot(halfExtents),
+		   abs_b[1].dot(halfExtents),
+		  abs_b[2].dot(halfExtents));
+//	extent += btVector3(getMargin(),getMargin(),getMargin());
+
+	m_aabbMin = center - extent;
+	m_aabbMax = center + extent;
+
+	btScalar extraMargin = collisionMarginTriangle+btScalar(BT_SOFTBODY_TRIANGLE_EXTRUSION);
+	btVector3 extra(extraMargin,extraMargin,extraMargin);
+
+	m_aabbMax += extra;
+	m_aabbMin -= extra;
+
+/*	btVector3 extra(2,2,2);
+	m_aabbMin = aabbWorldSpaceMin-extra;
+	m_aabbMax = aabbWorldSpaceMax+extra;
+*/
+
+}
+
+void btSoftBodyConcaveCollisionAlgorithm::clearCache()
+{
+	m_btSoftBodyTriangleCallback.clearCache();
+
+}
+
+void btSoftBodyConcaveCollisionAlgorithm::processCollision (btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut)
+{
+	
+	
+	btCollisionObject* convexBody = m_isSwapped ? body1 : body0;
+	btCollisionObject* triBody = m_isSwapped ? body0 : body1;
+
+	if (triBody->getCollisionShape()->isConcave())
+	{
+
+
+		btCollisionObject*	triOb = triBody;
+		btConcaveShape* concaveShape = static_cast<btConcaveShape*>( triOb->getCollisionShape());
+		
+	//	if (convexBody->getCollisionShape()->isConvex())
+		{
+			btScalar collisionMarginTriangle = concaveShape->getMargin();
+					
+//			resultOut->setPersistentManifold(m_btSoftBodyTriangleCallback.m_manifoldPtr);
+			m_btSoftBodyTriangleCallback.setTimeStepAndCounters(collisionMarginTriangle,dispatchInfo,resultOut);
+
+			//Disable persistency. previously, some older algorithm calculated all contacts in one go, so you can clear it here.
+			//m_dispatcher->clearManifold(m_btSoftBodyTriangleCallback.m_manifoldPtr);
+
+//			m_btSoftBodyTriangleCallback.m_manifoldPtr->setBodies(convexBody,triBody);
+
+
+			concaveShape->processAllTriangles( &m_btSoftBodyTriangleCallback,m_btSoftBodyTriangleCallback.getAabbMin(),m_btSoftBodyTriangleCallback.getAabbMax());
+			
+		//	resultOut->refreshContactPoints();
+	
+		}
+	
+	}
+
+}
+
+
+btScalar btSoftBodyConcaveCollisionAlgorithm::calculateTimeOfImpact(btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut)
+{
+	(void)resultOut;
+	(void)dispatchInfo;
+	btCollisionObject* convexbody = m_isSwapped ? body1 : body0;
+	btCollisionObject* triBody = m_isSwapped ? body0 : body1;
+
+
+	//quick approximation using raycast, todo: hook up to the continuous collision detection (one of the btConvexCast)
+
+	//only perform CCD above a certain threshold, this prevents blocking on the long run
+	//because object in a blocked ccd state (hitfraction<1) get their linear velocity halved each frame...
+	btScalar squareMot0 = (convexbody->getInterpolationWorldTransform().getOrigin() - convexbody->getWorldTransform().getOrigin()).length2();
+	if (squareMot0 < convexbody->getCcdSquareMotionThreshold())
+	{
+		return btScalar(1.);
+	}
+
+	//const btVector3& from = convexbody->m_worldTransform.getOrigin();
+	//btVector3 to = convexbody->m_interpolationWorldTransform.getOrigin();
+	//todo: only do if the motion exceeds the 'radius'
+
+	btTransform triInv = triBody->getWorldTransform().inverse();
+	btTransform convexFromLocal = triInv * convexbody->getWorldTransform();
+	btTransform convexToLocal = triInv * convexbody->getInterpolationWorldTransform();
+
+	struct LocalTriangleSphereCastCallback	: public btTriangleCallback
+	{
+		btTransform m_ccdSphereFromTrans;
+		btTransform m_ccdSphereToTrans;
+		btTransform	m_meshTransform;
+
+		btScalar	m_ccdSphereRadius;
+		btScalar	m_hitFraction;
+	
+
+		LocalTriangleSphereCastCallback(const btTransform& from,const btTransform& to,btScalar ccdSphereRadius,btScalar hitFraction)
+			:m_ccdSphereFromTrans(from),
+			m_ccdSphereToTrans(to),
+			m_ccdSphereRadius(ccdSphereRadius),
+			m_hitFraction(hitFraction)
+		{			
+		}
+		
+		
+		virtual void processTriangle(btVector3* triangle, int partId, int triangleIndex)
+		{
+			(void)partId;
+			(void)triangleIndex;
+			//do a swept sphere for now
+			btTransform ident;
+			ident.setIdentity();
+			btConvexCast::CastResult castResult;
+			castResult.m_fraction = m_hitFraction;
+			btSphereShape	pointShape(m_ccdSphereRadius);
+			btTriangleShape	triShape(triangle[0],triangle[1],triangle[2]);
+			btVoronoiSimplexSolver	simplexSolver;
+			btSubsimplexConvexCast convexCaster(&pointShape,&triShape,&simplexSolver);
+			//GjkConvexCast	convexCaster(&pointShape,convexShape,&simplexSolver);
+			//ContinuousConvexCollision convexCaster(&pointShape,convexShape,&simplexSolver,0);
+			//local space?
+
+			if (convexCaster.calcTimeOfImpact(m_ccdSphereFromTrans,m_ccdSphereToTrans,
+				ident,ident,castResult))
+			{
+				if (m_hitFraction > castResult.m_fraction)
+					m_hitFraction = castResult.m_fraction;
+			}
+
+		}
+
+	};
+
+
+	
+
+	
+	if (triBody->getCollisionShape()->isConcave())
+	{
+		btVector3 rayAabbMin = convexFromLocal.getOrigin();
+		rayAabbMin.setMin(convexToLocal.getOrigin());
+		btVector3 rayAabbMax = convexFromLocal.getOrigin();
+		rayAabbMax.setMax(convexToLocal.getOrigin());
+		btScalar ccdRadius0 = convexbody->getCcdSweptSphereRadius();
+		rayAabbMin -= btVector3(ccdRadius0,ccdRadius0,ccdRadius0);
+		rayAabbMax += btVector3(ccdRadius0,ccdRadius0,ccdRadius0);
+
+		btScalar curHitFraction = btScalar(1.); //is this available?
+		LocalTriangleSphereCastCallback raycastCallback(convexFromLocal,convexToLocal,
+			convexbody->getCcdSweptSphereRadius(),curHitFraction);
+
+		raycastCallback.m_hitFraction = convexbody->getHitFraction();
+
+		btCollisionObject* concavebody = triBody;
+
+		btConcaveShape* triangleMesh = (btConcaveShape*) concavebody->getCollisionShape();
+		
+		if (triangleMesh)
+		{
+			triangleMesh->processAllTriangles(&raycastCallback,rayAabbMin,rayAabbMax);
+		}
+	
+
+
+		if (raycastCallback.m_hitFraction < convexbody->getHitFraction())
+		{
+			convexbody->setHitFraction( raycastCallback.m_hitFraction);
+			return raycastCallback.m_hitFraction;
+		}
+	}
+
+	return btScalar(1.);
+
+}
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h b/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
new file mode 100644
index 00000000000..adb91329a4c
--- /dev/null
+++ b/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
@@ -0,0 +1,118 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef SOFT_BODY_CONCAVE_COLLISION_ALGORITHM_H
+#define SOFT_BODY_CONCAVE_COLLISION_ALGORITHM_H
+
+#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
+#include "BulletCollision/BroadphaseCollision/btDispatcher.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseInterface.h"
+#include "BulletCollision/CollisionShapes/btTriangleCallback.h"
+#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h"
+class btDispatcher;
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
+#include "BulletCollision/CollisionDispatch/btCollisionCreateFunc.h"
+class btSoftBody;
+
+///For each triangle in the concave mesh that overlaps with the AABB of a soft body (m_softBody), processTriangle is called.
+class btSoftBodyTriangleCallback : public btTriangleCallback
+{
+	btSoftBody* m_softBody;
+	btCollisionObject* m_triBody;
+
+	btVector3	m_aabbMin;
+	btVector3	m_aabbMax ;
+
+	btManifoldResult* m_resultOut;
+
+	btDispatcher*	m_dispatcher;
+	const btDispatcherInfo* m_dispatchInfoPtr;
+	btScalar m_collisionMarginTriangle;
+	
+public:
+int	m_triangleCount;
+	
+//	btPersistentManifold*	m_manifoldPtr;
+
+	btSoftBodyTriangleCallback(btDispatcher* dispatcher,btCollisionObject* body0,btCollisionObject* body1,bool isSwapped);
+
+	void	setTimeStepAndCounters(btScalar collisionMarginTriangle,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut);
+
+	virtual ~btSoftBodyTriangleCallback();
+
+	virtual void processTriangle(btVector3* triangle, int partId, int triangleIndex);
+	
+	void clearCache();
+
+	SIMD_FORCE_INLINE const btVector3& getAabbMin() const
+	{
+		return m_aabbMin;
+	}
+	SIMD_FORCE_INLINE const btVector3& getAabbMax() const
+	{
+		return m_aabbMax;
+	}
+
+};
+
+
+
+
+/// btSoftBodyConcaveCollisionAlgorithm  supports collision between soft body shapes and (concave) trianges meshes.
+class btSoftBodyConcaveCollisionAlgorithm  : public btCollisionAlgorithm
+{
+
+	bool	m_isSwapped;
+
+	btSoftBodyTriangleCallback m_btSoftBodyTriangleCallback;
+
+public:
+
+	btSoftBodyConcaveCollisionAlgorithm( const btCollisionAlgorithmConstructionInfo& ci,btCollisionObject* body0,btCollisionObject* body1,bool isSwapped);
+
+	virtual ~btSoftBodyConcaveCollisionAlgorithm();
+
+	virtual void processCollision (btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut);
+
+	btScalar	calculateTimeOfImpact(btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut);
+
+	virtual	void	getAllContactManifolds(btManifoldArray&	manifoldArray)
+	{
+		//we don't add any manifolds
+	}
+
+	void	clearCache();
+
+	struct CreateFunc :public 	btCollisionAlgorithmCreateFunc
+	{
+		virtual	btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, btCollisionObject* body0,btCollisionObject* body1)
+		{
+			void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btSoftBodyConcaveCollisionAlgorithm));
+			return new(mem) btSoftBodyConcaveCollisionAlgorithm(ci,body0,body1,false);
+		}
+	};
+
+	struct SwappedCreateFunc :public 	btCollisionAlgorithmCreateFunc
+	{
+		virtual	btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, btCollisionObject* body0,btCollisionObject* body1)
+		{
+			void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btSoftBodyConcaveCollisionAlgorithm));
+			return new(mem) btSoftBodyConcaveCollisionAlgorithm(ci,body0,body1,true);
+		}
+	};
+
+};
+
+#endif //SOFT_BODY_CONCAVE_COLLISION_ALGORITHM_H
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp b/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp
new file mode 100644
index 00000000000..e9ec81f4d2c
--- /dev/null
+++ b/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp
@@ -0,0 +1,656 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+///btSoftBodyHelpers.cpp by Nathanael Presson
+
+#include "btSoftBodyInternals.h"
+#include <stdio.h>
+#include <string.h>
+#include "btSoftBodyHelpers.h"
+#include "LinearMath/btConvexHull.h"
+
+//
+static void				drawVertex(	btIDebugDraw* idraw,
+									const btVector3& x,btScalar s,const btVector3& c)
+	{
+		idraw->drawLine(x-btVector3(s,0,0),x+btVector3(s,0,0),c);
+		idraw->drawLine(x-btVector3(0,s,0),x+btVector3(0,s,0),c);
+		idraw->drawLine(x-btVector3(0,0,s),x+btVector3(0,0,s),c);
+	}
+
+//
+static void				drawBox(	btIDebugDraw* idraw,
+									const btVector3& mins,
+									const btVector3& maxs,
+									const btVector3& color)
+{
+const btVector3	c[]={	btVector3(mins.x(),mins.y(),mins.z()),
+						btVector3(maxs.x(),mins.y(),mins.z()),
+						btVector3(maxs.x(),maxs.y(),mins.z()),
+						btVector3(mins.x(),maxs.y(),mins.z()),
+						btVector3(mins.x(),mins.y(),maxs.z()),
+						btVector3(maxs.x(),mins.y(),maxs.z()),
+						btVector3(maxs.x(),maxs.y(),maxs.z()),
+						btVector3(mins.x(),maxs.y(),maxs.z())};
+idraw->drawLine(c[0],c[1],color);idraw->drawLine(c[1],c[2],color);
+idraw->drawLine(c[2],c[3],color);idraw->drawLine(c[3],c[0],color);
+idraw->drawLine(c[4],c[5],color);idraw->drawLine(c[5],c[6],color);
+idraw->drawLine(c[6],c[7],color);idraw->drawLine(c[7],c[4],color);
+idraw->drawLine(c[0],c[4],color);idraw->drawLine(c[1],c[5],color);
+idraw->drawLine(c[2],c[6],color);idraw->drawLine(c[3],c[7],color);
+}
+
+//
+static void				drawTree(	btIDebugDraw* idraw,
+									const btDbvtNode* node,
+									int depth,
+									const btVector3& ncolor,
+									const btVector3& lcolor,
+									int mindepth,
+									int maxdepth)
+{
+if(node)
+	{
+	if(node->isinternal()&&((depth<maxdepth)||(maxdepth<0)))
+		{
+		drawTree(idraw,node->childs[0],depth+1,ncolor,lcolor,mindepth,maxdepth);
+		drawTree(idraw,node->childs[1],depth+1,ncolor,lcolor,mindepth,maxdepth);
+		}
+	if(depth>=mindepth)
+		{
+		const btScalar	scl=(btScalar)(node->isinternal()?1:1);
+		const btVector3	mi=node->volume.Center()-node->volume.Extents()*scl;
+		const btVector3	mx=node->volume.Center()+node->volume.Extents()*scl;
+		drawBox(idraw,mi,mx,node->isleaf()?lcolor:ncolor);
+		}
+	}
+}
+
+//
+template <typename T>
+static inline T				sum(const btAlignedObjectArray<T>& items)
+{
+T	v;
+if(items.size())
+	{
+	v=items[0];
+	for(int i=1,ni=items.size();i<ni;++i)
+		{
+		v+=items[i];
+		}
+	}
+return(v);
+}
+
+//
+template <typename T,typename Q>
+static inline void			add(btAlignedObjectArray<T>& items,const Q& value)
+{
+for(int i=0,ni=items.size();i<ni;++i)
+	{
+	items[i]+=value;
+	}
+}
+
+//
+template <typename T,typename Q>
+static inline void			mul(btAlignedObjectArray<T>& items,const Q& value)
+{
+for(int i=0,ni=items.size();i<ni;++i)
+	{
+	items[i]*=value;
+	}
+}
+
+//
+template <typename T>
+static inline T				average(const btAlignedObjectArray<T>& items)
+{
+const btScalar	n=(btScalar)(items.size()>0?items.size():1);
+return(sum(items)/n);
+}
+
+//
+static inline btScalar		tetravolume(const btVector3& x0,
+										const btVector3& x1,
+										const btVector3& x2,
+										const btVector3& x3)
+{
+	const btVector3	a=x1-x0;
+	const btVector3	b=x2-x0;
+	const btVector3	c=x3-x0;
+	return(dot(a,cross(b,c)));
+}
+
+//
+#if 0
+static btVector3		stresscolor(btScalar stress)
+	{
+	static const btVector3	spectrum[]=	{	btVector3(1,0,1),
+											btVector3(0,0,1),
+											btVector3(0,1,1),
+											btVector3(0,1,0),
+											btVector3(1,1,0),
+											btVector3(1,0,0),
+											btVector3(1,0,0)};
+	static const int		ncolors=sizeof(spectrum)/sizeof(spectrum[0])-1;
+	static const btScalar	one=1;
+	stress=btMax<btScalar>(0,btMin<btScalar>(1,stress))*ncolors;
+	const int				sel=(int)stress;
+	const btScalar			frc=stress-sel;
+	return(spectrum[sel]+(spectrum[sel+1]-spectrum[sel])*frc);
+	}
+#endif
+
+//
+void			btSoftBodyHelpers::Draw(	btSoftBody* psb,
+					 btIDebugDraw* idraw,
+					 int drawflags)
+{
+	const btScalar		scl=(btScalar)0.1;
+	const btScalar		nscl=scl*5;
+	const btVector3		lcolor=btVector3(0,0,0);
+	const btVector3		ncolor=btVector3(1,1,1);
+	const btVector3		ccolor=btVector3(1,0,0);
+	int i,j,nj;
+
+	/* Nodes	*/ 
+	if(0!=(drawflags&fDrawFlags::Nodes))
+	{
+		for(i=0;i<psb->m_nodes.size();++i)
+		{
+			const btSoftBody::Node&	n=psb->m_nodes[i];
+			if(0==(n.m_material->m_flags&btSoftBody::fMaterial::DebugDraw)) continue;
+			idraw->drawLine(n.m_x-btVector3(scl,0,0),n.m_x+btVector3(scl,0,0),btVector3(1,0,0));
+			idraw->drawLine(n.m_x-btVector3(0,scl,0),n.m_x+btVector3(0,scl,0),btVector3(0,1,0));
+			idraw->drawLine(n.m_x-btVector3(0,0,scl),n.m_x+btVector3(0,0,scl),btVector3(0,0,1));
+		}
+	}
+	/* Links	*/ 
+	if(0!=(drawflags&fDrawFlags::Links))
+	{
+		for(i=0;i<psb->m_links.size();++i)
+		{
+			const btSoftBody::Link&	l=psb->m_links[i];
+			if(0==(l.m_material->m_flags&btSoftBody::fMaterial::DebugDraw)) continue;
+			idraw->drawLine(l.m_n[0]->m_x,l.m_n[1]->m_x,lcolor);
+		}
+	}
+	/* Normals	*/ 
+	if(0!=(drawflags&fDrawFlags::Normals))
+	{
+		for(i=0;i<psb->m_nodes.size();++i)
+		{
+			const btSoftBody::Node&	n=psb->m_nodes[i];
+			if(0==(n.m_material->m_flags&btSoftBody::fMaterial::DebugDraw)) continue;
+			const btVector3			d=n.m_n*nscl;
+			idraw->drawLine(n.m_x,n.m_x+d,ncolor);
+			idraw->drawLine(n.m_x,n.m_x-d,ncolor*0.5);
+		}
+	}
+	/* Contacts	*/ 
+	if(0!=(drawflags&fDrawFlags::Contacts))
+	{
+		static const btVector3		axis[]={btVector3(1,0,0),
+			btVector3(0,1,0),
+			btVector3(0,0,1)};
+		for(i=0;i<psb->m_rcontacts.size();++i)
+		{		
+			const btSoftBody::RContact&	c=psb->m_rcontacts[i];
+			const btVector3				o=	c.m_node->m_x-c.m_cti.m_normal*
+				(dot(c.m_node->m_x,c.m_cti.m_normal)+c.m_cti.m_offset);
+			const btVector3				x=cross(c.m_cti.m_normal,axis[c.m_cti.m_normal.minAxis()]).normalized();
+			const btVector3				y=cross(x,c.m_cti.m_normal).normalized();
+			idraw->drawLine(o-x*nscl,o+x*nscl,ccolor);
+			idraw->drawLine(o-y*nscl,o+y*nscl,ccolor);
+			idraw->drawLine(o,o+c.m_cti.m_normal*nscl*3,btVector3(1,1,0));
+		}
+	}
+	/* Anchors	*/ 
+	if(0!=(drawflags&fDrawFlags::Anchors))
+	{
+		for(i=0;i<psb->m_anchors.size();++i)
+		{
+			const btSoftBody::Anchor&	a=psb->m_anchors[i];
+			const btVector3				q=a.m_body->getWorldTransform()*a.m_local;
+			drawVertex(idraw,a.m_node->m_x,0.25,btVector3(1,0,0));
+			drawVertex(idraw,q,0.25,btVector3(0,1,0));
+			idraw->drawLine(a.m_node->m_x,q,btVector3(1,1,1));
+		}
+		for(i=0;i<psb->m_nodes.size();++i)
+		{
+			const btSoftBody::Node&	n=psb->m_nodes[i];		
+			if(0==(n.m_material->m_flags&btSoftBody::fMaterial::DebugDraw)) continue;
+			if(n.m_im<=0)
+			{
+				drawVertex(idraw,n.m_x,0.25,btVector3(1,0,0));
+			}
+		}
+	}
+	/* Faces	*/ 
+	if(0!=(drawflags&fDrawFlags::Faces))
+	{
+		const btScalar	scl=(btScalar)0.8;
+		const btScalar	alp=(btScalar)1;
+		const btVector3	col(0,(btScalar)0.7,0);
+		for(i=0;i<psb->m_faces.size();++i)
+		{
+			const btSoftBody::Face&	f=psb->m_faces[i];
+			if(0==(f.m_material->m_flags&btSoftBody::fMaterial::DebugDraw)) continue;
+			const btVector3			x[]={f.m_n[0]->m_x,f.m_n[1]->m_x,f.m_n[2]->m_x};
+			const btVector3			c=(x[0]+x[1]+x[2])/3;
+			idraw->drawTriangle((x[0]-c)*scl+c,
+								(x[1]-c)*scl+c,
+								(x[2]-c)*scl+c,
+								col,alp);
+		}	
+	}
+	/* Clusters	*/ 
+	if(0!=(drawflags&fDrawFlags::Clusters))
+		{
+		srand(1806);
+		for(i=0;i<psb->m_clusters.size();++i)
+			{
+			if(psb->m_clusters[i]->m_collide)
+				{
+				btVector3						color(	rand()/(btScalar)RAND_MAX,
+														rand()/(btScalar)RAND_MAX,
+														rand()/(btScalar)RAND_MAX);
+				color=color.normalized()*0.75;
+				btAlignedObjectArray<btVector3>	vertices;
+				vertices.resize(psb->m_clusters[i]->m_nodes.size());
+				for(j=0,nj=vertices.size();j<nj;++j)
+					{				
+					vertices[j]=psb->m_clusters[i]->m_nodes[j]->m_x;
+					}
+				HullDesc		hdsc(QF_TRIANGLES,vertices.size(),&vertices[0]);
+				HullResult		hres;
+				HullLibrary		hlib;
+				hdsc.mMaxVertices=vertices.size();
+				hlib.CreateConvexHull(hdsc,hres);
+				const btVector3	center=average(hres.m_OutputVertices);
+				add(hres.m_OutputVertices,-center);
+				mul(hres.m_OutputVertices,(btScalar)1);
+				add(hres.m_OutputVertices,center);
+				for(j=0;j<(int)hres.mNumFaces;++j)
+					{
+					const int idx[]={hres.m_Indices[j*3+0],hres.m_Indices[j*3+1],hres.m_Indices[j*3+2]};
+					idraw->drawTriangle(hres.m_OutputVertices[idx[0]],
+										hres.m_OutputVertices[idx[1]],
+										hres.m_OutputVertices[idx[2]],
+										color,1);
+					}
+				hlib.ReleaseResult(hres);
+				}
+			/* Velocities	*/ 
+			#if 0
+			for(int j=0;j<psb->m_clusters[i].m_nodes.size();++j)
+				{
+				const btSoftBody::Cluster&	c=psb->m_clusters[i];
+				const btVector3				r=c.m_nodes[j]->m_x-c.m_com;
+				const btVector3				v=c.m_lv+cross(c.m_av,r);
+				idraw->drawLine(c.m_nodes[j]->m_x,c.m_nodes[j]->m_x+v,btVector3(1,0,0));
+				}
+			#endif
+			/* Frame		*/ 
+			btSoftBody::Cluster& c=*psb->m_clusters[i];
+			idraw->drawLine(c.m_com,c.m_framexform*btVector3(10,0,0),btVector3(1,0,0));
+			idraw->drawLine(c.m_com,c.m_framexform*btVector3(0,10,0),btVector3(0,1,0));
+			idraw->drawLine(c.m_com,c.m_framexform*btVector3(0,0,10),btVector3(0,0,1));
+			}
+		}
+	/* Notes	*/ 
+	if(0!=(drawflags&fDrawFlags::Notes))
+	{
+		for(i=0;i<psb->m_notes.size();++i)
+		{
+			const btSoftBody::Note&	n=psb->m_notes[i];
+			btVector3				p=n.m_offset;
+			for(int j=0;j<n.m_rank;++j)
+				{
+				p+=n.m_nodes[j]->m_x*n.m_coords[j];
+				}
+			idraw->draw3dText(p,n.m_text);
+		}
+	}
+	/* Node tree	*/ 
+	if(0!=(drawflags&fDrawFlags::NodeTree))		DrawNodeTree(psb,idraw);
+	/* Face tree	*/ 
+	if(0!=(drawflags&fDrawFlags::FaceTree))		DrawFaceTree(psb,idraw);
+	/* Cluster tree	*/ 
+	if(0!=(drawflags&fDrawFlags::ClusterTree))	DrawClusterTree(psb,idraw);
+	/* Joints		*/ 
+	if(0!=(drawflags&fDrawFlags::Joints))
+	{
+	for(i=0;i<psb->m_joints.size();++i)
+		{
+		const btSoftBody::Joint*	pj=psb->m_joints[i];
+		switch(pj->Type())
+			{
+			case	btSoftBody::Joint::eType::Linear:
+				{
+				const btSoftBody::LJoint*	pjl=(const btSoftBody::LJoint*)pj;
+				const btVector3	a0=pj->m_bodies[0].xform()*pjl->m_refs[0];
+				const btVector3	a1=pj->m_bodies[1].xform()*pjl->m_refs[1];
+				idraw->drawLine(pj->m_bodies[0].xform().getOrigin(),a0,btVector3(1,1,0));
+				idraw->drawLine(pj->m_bodies[1].xform().getOrigin(),a1,btVector3(0,1,1));
+				drawVertex(idraw,a0,0.25,btVector3(1,1,0));
+				drawVertex(idraw,a1,0.25,btVector3(0,1,1));
+				}
+			break;
+			case	btSoftBody::Joint::eType::Angular:
+				{
+				const btSoftBody::AJoint*	pja=(const btSoftBody::AJoint*)pj;
+				const btVector3	o0=pj->m_bodies[0].xform().getOrigin();
+				const btVector3	o1=pj->m_bodies[1].xform().getOrigin();
+				const btVector3	a0=pj->m_bodies[0].xform().getBasis()*pj->m_refs[0];
+				const btVector3	a1=pj->m_bodies[1].xform().getBasis()*pj->m_refs[1];
+				idraw->drawLine(o0,o0+a0*10,btVector3(1,1,0));
+				idraw->drawLine(o0,o0+a1*10,btVector3(1,1,0));
+				idraw->drawLine(o1,o1+a0*10,btVector3(0,1,1));
+				idraw->drawLine(o1,o1+a1*10,btVector3(0,1,1));
+				}
+			}		
+		}
+	}
+}
+
+//
+void			btSoftBodyHelpers::DrawInfos(		btSoftBody* psb,
+						  btIDebugDraw* idraw,
+						  bool masses,
+						  bool areas,
+						  bool /*stress*/)
+{
+	/*
+	for(int i=0;i<psb->m_nodes.size();++i)
+	{
+		const btSoftBody::Node&	n=psb->m_nodes[i];
+		char					text[2048]={0};
+		char					buff[1024];
+		if(masses)
+		{
+			sprintf(buff," M(%.2f)",1/n.m_im);
+			strcat(text,buff);
+		}
+		if(areas)
+		{
+			sprintf(buff," A(%.2f)",n.m_area);
+			strcat(text,buff);
+		}
+		if(text[0]) idraw->draw3dText(n.m_x,text);
+	}
+	*/
+
+}
+
+//
+void			btSoftBodyHelpers::DrawNodeTree(	btSoftBody* psb,
+													btIDebugDraw* idraw,
+													int mindepth,
+													int maxdepth)
+{
+drawTree(idraw,psb->m_ndbvt.m_root,0,btVector3(1,0,1),btVector3(1,1,1),mindepth,maxdepth);
+}
+
+//
+void			btSoftBodyHelpers::DrawFaceTree(	btSoftBody* psb,
+													btIDebugDraw* idraw,
+													int mindepth,
+													int maxdepth)
+{
+drawTree(idraw,psb->m_fdbvt.m_root,0,btVector3(0,1,0),btVector3(1,0,0),mindepth,maxdepth);
+}
+
+//
+void			btSoftBodyHelpers::DrawClusterTree(	btSoftBody* psb,
+													btIDebugDraw* idraw,
+													int mindepth,
+													int maxdepth)
+{
+drawTree(idraw,psb->m_cdbvt.m_root,0,btVector3(0,1,1),btVector3(1,0,0),mindepth,maxdepth);
+}
+
+//
+void			btSoftBodyHelpers::DrawFrame(		btSoftBody* psb,
+						  btIDebugDraw* idraw)
+{
+	if(psb->m_pose.m_bframe)
+	{
+		static const btScalar	ascl=10;
+		static const btScalar	nscl=(btScalar)0.1;
+		const btVector3			com=psb->m_pose.m_com;
+		const btMatrix3x3		trs=psb->m_pose.m_rot*psb->m_pose.m_scl;
+		const btVector3			Xaxis=(trs*btVector3(1,0,0)).normalized();
+		const btVector3			Yaxis=(trs*btVector3(0,1,0)).normalized();
+		const btVector3			Zaxis=(trs*btVector3(0,0,1)).normalized();
+		idraw->drawLine(com,com+Xaxis*ascl,btVector3(1,0,0));
+		idraw->drawLine(com,com+Yaxis*ascl,btVector3(0,1,0));
+		idraw->drawLine(com,com+Zaxis*ascl,btVector3(0,0,1));
+		for(int i=0;i<psb->m_pose.m_pos.size();++i)
+		{
+			const btVector3	x=com+trs*psb->m_pose.m_pos[i];
+			drawVertex(idraw,x,nscl,btVector3(1,0,1));
+		}
+	}
+}
+
+//
+btSoftBody*		btSoftBodyHelpers::CreateRope(	btSoftBodyWorldInfo& worldInfo, const btVector3& from,
+						   const btVector3& to,
+						   int res,
+						   int fixeds)
+{
+	/* Create nodes	*/ 
+	const int		r=res+2;
+	btVector3*		x=new btVector3[r];
+	btScalar*		m=new btScalar[r];
+	int i;
+
+	for(i=0;i<r;++i)
+	{
+		const btScalar	t=i/(btScalar)(r-1);
+		x[i]=lerp(from,to,t);
+		m[i]=1;
+	}
+	btSoftBody*		psb= new btSoftBody(&worldInfo,r,x,m);
+	if(fixeds&1) psb->setMass(0,0);
+	if(fixeds&2) psb->setMass(r-1,0);
+	delete[] x;
+	delete[] m;
+	/* Create links	*/ 
+	for(i=1;i<r;++i)
+	{
+		psb->appendLink(i-1,i);
+	}
+	/* Finished		*/ 
+	return(psb);
+}
+
+//
+btSoftBody*		btSoftBodyHelpers::CreatePatch(btSoftBodyWorldInfo& worldInfo,const btVector3& corner00,
+							const btVector3& corner10,
+							const btVector3& corner01,
+							const btVector3& corner11,
+							int resx,
+							int resy,
+							int fixeds,
+							bool gendiags)
+{
+#define IDX(_x_,_y_)	((_y_)*rx+(_x_))
+	/* Create nodes	*/ 
+	if((resx<2)||(resy<2)) return(0);
+	const int	rx=resx;
+	const int	ry=resy;
+	const int	tot=rx*ry;
+	btVector3*	x=new btVector3[tot];
+	btScalar*	m=new btScalar[tot];
+	int iy;
+
+	for(iy=0;iy<ry;++iy)
+	{
+		const btScalar	ty=iy/(btScalar)(ry-1);
+		const btVector3	py0=lerp(corner00,corner01,ty);
+		const btVector3	py1=lerp(corner10,corner11,ty);
+		for(int ix=0;ix<rx;++ix)
+		{
+			const btScalar	tx=ix/(btScalar)(rx-1);
+			x[IDX(ix,iy)]=lerp(py0,py1,tx);
+			m[IDX(ix,iy)]=1;
+		}
+	}
+	btSoftBody*		psb=new btSoftBody(&worldInfo,tot,x,m);
+	if(fixeds&1)	psb->setMass(IDX(0,0),0);
+	if(fixeds&2)	psb->setMass(IDX(rx-1,0),0);
+	if(fixeds&4)	psb->setMass(IDX(0,ry-1),0);
+	if(fixeds&8)	psb->setMass(IDX(rx-1,ry-1),0);
+	delete[] x;
+	delete[] m;
+	/* Create links	and faces */ 
+	for(iy=0;iy<ry;++iy)
+	{
+		for(int ix=0;ix<rx;++ix)
+		{
+			const int	idx=IDX(ix,iy);
+			const bool	mdx=(ix+1)<rx;
+			const bool	mdy=(iy+1)<ry;
+			if(mdx) psb->appendLink(idx,IDX(ix+1,iy));
+			if(mdy) psb->appendLink(idx,IDX(ix,iy+1));
+			if(mdx&&mdy)
+			{
+				if((ix+iy)&1)
+				{
+					psb->appendFace(IDX(ix,iy),IDX(ix+1,iy),IDX(ix+1,iy+1));
+					psb->appendFace(IDX(ix,iy),IDX(ix+1,iy+1),IDX(ix,iy+1));
+					if(gendiags)
+					{
+						psb->appendLink(IDX(ix,iy),IDX(ix+1,iy+1));
+					}
+				}
+				else
+				{
+					psb->appendFace(IDX(ix,iy+1),IDX(ix,iy),IDX(ix+1,iy));
+					psb->appendFace(IDX(ix,iy+1),IDX(ix+1,iy),IDX(ix+1,iy+1));
+					if(gendiags)
+					{
+						psb->appendLink(IDX(ix+1,iy),IDX(ix,iy+1));
+					}
+				}
+			}
+		}
+	}
+	/* Finished		*/ 
+#undef IDX
+	return(psb);
+}
+
+//
+btSoftBody*		btSoftBodyHelpers::CreateEllipsoid(btSoftBodyWorldInfo& worldInfo,const btVector3& center,
+								const btVector3& radius,
+								int res)
+{
+	struct	Hammersley
+	{
+		static void	Generate(btVector3* x,int n)
+		{
+			for(int i=0;i<n;i++)
+			{
+				btScalar	p=0.5,t=0;
+				for(int j=i;j;p*=0.5,j>>=1) if(j&1) t+=p;
+				btScalar	w=2*t-1;
+				btScalar	a=(SIMD_PI+2*i*SIMD_PI)/n;
+				btScalar	s=btSqrt(1-w*w);
+				*x++=btVector3(s*btCos(a),s*btSin(a),w);
+			}
+		}
+	};
+	btAlignedObjectArray<btVector3>	vtx;
+	vtx.resize(3+res);
+	Hammersley::Generate(&vtx[0],vtx.size());
+	for(int i=0;i<vtx.size();++i)
+	{
+		vtx[i]=vtx[i]*radius+center;
+	}
+	return(CreateFromConvexHull(worldInfo,&vtx[0],vtx.size()));
+}
+
+
+
+//
+btSoftBody*		btSoftBodyHelpers::CreateFromTriMesh(btSoftBodyWorldInfo& worldInfo,const btScalar*	vertices,
+								  const int* triangles,
+								  int ntriangles)
+{
+	int		maxidx=0;
+	int i,j,ni;
+
+	for(i=0,ni=ntriangles*3;i<ni;++i)
+	{
+		maxidx=btMax(triangles[i],maxidx);
+	}
+	++maxidx;
+	btAlignedObjectArray<bool>		chks;
+	btAlignedObjectArray<btVector3>	vtx;
+	chks.resize(maxidx*maxidx,false);
+	vtx.resize(maxidx);
+	for(i=0,j=0,ni=maxidx*3;i<ni;++j,i+=3)
+	{
+		vtx[j]=btVector3(vertices[i],vertices[i+1],vertices[i+2]);
+	}
+	btSoftBody*		psb=new btSoftBody(&worldInfo,vtx.size(),&vtx[0],0);
+	for( i=0,ni=ntriangles*3;i<ni;i+=3)
+	{
+		const int idx[]={triangles[i],triangles[i+1],triangles[i+2]};
+#define IDX(_x_,_y_) ((_y_)*maxidx+(_x_))
+		for(int j=2,k=0;k<3;j=k++)
+		{
+			if(!chks[IDX(idx[j],idx[k])])
+			{
+				chks[IDX(idx[j],idx[k])]=true;
+				chks[IDX(idx[k],idx[k])]=true;
+				psb->appendLink(idx[j],idx[k]);
+			}
+		}
+#undef IDX
+		psb->appendFace(idx[0],idx[1],idx[2]);
+	}
+	psb->randomizeConstraints();
+	return(psb);
+}
+
+//
+btSoftBody*		btSoftBodyHelpers::CreateFromConvexHull(btSoftBodyWorldInfo& worldInfo,	const btVector3* vertices,
+									 int nvertices)
+{
+	HullDesc		hdsc(QF_TRIANGLES,nvertices,vertices);
+	HullResult		hres;
+	HullLibrary		hlib;/*??*/ 
+	hdsc.mMaxVertices=nvertices;
+	hlib.CreateConvexHull(hdsc,hres);
+	btSoftBody*		psb=new btSoftBody(&worldInfo,(int)hres.mNumOutputVertices,
+		&hres.m_OutputVertices[0],0);
+	for(int i=0;i<(int)hres.mNumFaces;++i)
+	{
+		const int idx[]={	hres.m_Indices[i*3+0],
+			hres.m_Indices[i*3+1],
+			hres.m_Indices[i*3+2]};
+		if(idx[0]<idx[1]) psb->appendLink(	idx[0],idx[1]);
+		if(idx[1]<idx[2]) psb->appendLink(	idx[1],idx[2]);
+		if(idx[2]<idx[0]) psb->appendLink(	idx[2],idx[0]);
+		psb->appendFace(idx[0],idx[1],idx[2]);
+	}
+	hlib.ReleaseResult(hres);
+	psb->randomizeConstraints();
+	return(psb);
+}
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.h b/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.h
new file mode 100644
index 00000000000..e9c6cb20657
--- /dev/null
+++ b/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.h
@@ -0,0 +1,107 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2008 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef SOFT_BODY_HELPERS_H
+#define SOFT_BODY_HELPERS_H
+
+#include "btSoftBody.h"
+
+//
+// Helpers
+//
+
+/* fDrawFlags															*/ 
+struct	fDrawFlags { enum _ {
+	Nodes		=	0x0001,
+	Links		=	0x0002,
+	Faces		=	0x0004,
+	Tetras		=	0x0008,
+	Normals		=	0x0010,
+	Contacts	=	0x0020,
+	Anchors		=	0x0040,
+	Notes		=	0x0080,
+	Clusters	=	0x0100,
+	NodeTree	=	0x0200,
+	FaceTree	=	0x0400,
+	ClusterTree	=	0x0800,
+	Joints		=	0x1000,
+	/* presets	*/ 
+	Std			=	Links+Faces+Tetras+Anchors+Notes+Joints,
+	StdTetra	=	Std-Faces+Tetras,
+};};
+
+struct	btSoftBodyHelpers
+{
+	/* Draw body															*/ 
+	static void				Draw(		btSoftBody* psb,
+										btIDebugDraw* idraw,
+										int drawflags=fDrawFlags::Std);
+	/* Draw body infos														*/ 
+	static	void			DrawInfos(	btSoftBody* psb,
+										btIDebugDraw* idraw,
+										bool masses,
+										bool areas,
+										bool stress);
+	/* Draw node tree														*/ 
+	static void				DrawNodeTree(	btSoftBody* psb,
+											btIDebugDraw* idraw,
+											int mindepth=0,
+											int maxdepth=-1);
+	/* Draw face tree														*/ 
+	static void				DrawFaceTree(	btSoftBody* psb,
+											btIDebugDraw* idraw,
+											int mindepth=0,
+											int maxdepth=-1);
+	/* Draw cluster tree													*/ 
+	static void				DrawClusterTree(btSoftBody* psb,
+											btIDebugDraw* idraw,
+											int mindepth=0,
+											int maxdepth=-1);
+	/* Draw rigid frame														*/ 
+	static	void			DrawFrame(		btSoftBody* psb,
+											btIDebugDraw* idraw);
+	/* Create a rope														*/ 
+	static	btSoftBody*		CreateRope( btSoftBodyWorldInfo& worldInfo,
+										const btVector3& from,
+										const btVector3& to,
+										int res,
+										int fixeds);
+	/* Create a patch														*/ 
+	static	btSoftBody*		CreatePatch(btSoftBodyWorldInfo& worldInfo,
+										const btVector3& corner00,
+										const btVector3& corner10,
+										const btVector3& corner01,
+										const btVector3& corner11,
+										int resx,
+										int resy,
+										int fixeds,
+										bool gendiags);
+	/* Create an ellipsoid													*/ 
+	static	btSoftBody*		CreateEllipsoid(btSoftBodyWorldInfo& worldInfo,
+											const btVector3& center,
+											const btVector3& radius,
+											int res);	
+	/* Create from trimesh													*/ 
+	static	btSoftBody*		CreateFromTriMesh(	btSoftBodyWorldInfo& worldInfo,
+												const btScalar*	vertices,
+												const int* triangles,
+												int ntriangles);
+	/* Create from convex-hull												*/ 
+	static	btSoftBody*		CreateFromConvexHull(	btSoftBodyWorldInfo& worldInfo,
+													const btVector3* vertices,
+													int nvertices);
+};
+
+#endif //SOFT_BODY_HELPERS_H
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h b/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h
new file mode 100644
index 00000000000..0c87770d714
--- /dev/null
+++ b/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h
@@ -0,0 +1,895 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+///btSoftBody implementation by Nathanael Presson
+
+#ifndef _BT_SOFT_BODY_INTERNALS_H
+#define _BT_SOFT_BODY_INTERNALS_H
+
+#include "btSoftBody.h"
+
+#include "LinearMath/btQuickprof.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseInterface.h"
+#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h"
+#include "BulletCollision/CollisionShapes/btConvexInternalShape.h"
+#include "BulletCollision/NarrowPhaseCollision/btGjkEpa2.h"
+
+//
+// btSymMatrix
+//
+template <typename T>
+struct btSymMatrix
+{
+						btSymMatrix() : dim(0)					{}
+						btSymMatrix(int n,const T& init=T())	{ resize(n,init); }
+void					resize(int n,const T& init=T())			{ dim=n;store.resize((n*(n+1))/2,init); }
+int						index(int c,int r) const				{ if(c>r) btSwap(c,r);btAssert(r<dim);return((r*(r+1))/2+c); }
+T&						operator()(int c,int r)					{ return(store[index(c,r)]); }
+const T&				operator()(int c,int r) const			{ return(store[index(c,r)]); }
+btAlignedObjectArray<T>	store;
+int						dim;
+};	
+
+//
+// btSoftBodyCollisionShape
+//
+class btSoftBodyCollisionShape : public btConcaveShape
+{
+public:
+	btSoftBody*						m_body;
+	
+	btSoftBodyCollisionShape(btSoftBody* backptr)
+	{
+	m_body=backptr;
+	}
+
+	virtual ~btSoftBodyCollisionShape()
+	{
+
+	}
+
+	void	processAllTriangles(btTriangleCallback* /*callback*/,const btVector3& /*aabbMin*/,const btVector3& /*aabbMax*/) const
+	{
+		//not yet
+		btAssert(0);
+	}
+
+	///getAabb returns the axis aligned bounding box in the coordinate frame of the given transform t.
+	virtual void getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const
+	{
+	/* t should be identity, but better be safe than...fast? */ 
+	const btVector3	mins=m_body->m_bounds[0];
+	const btVector3	maxs=m_body->m_bounds[1];
+	const btVector3	crns[]={t*btVector3(mins.x(),mins.y(),mins.z()),
+							t*btVector3(maxs.x(),mins.y(),mins.z()),
+							t*btVector3(maxs.x(),maxs.y(),mins.z()),
+							t*btVector3(mins.x(),maxs.y(),mins.z()),
+							t*btVector3(mins.x(),mins.y(),maxs.z()),
+							t*btVector3(maxs.x(),mins.y(),maxs.z()),
+							t*btVector3(maxs.x(),maxs.y(),maxs.z()),
+							t*btVector3(mins.x(),maxs.y(),maxs.z())};
+	aabbMin=aabbMax=crns[0];
+	for(int i=1;i<8;++i)
+		{
+		aabbMin.setMin(crns[i]);
+		aabbMax.setMax(crns[i]);
+		}
+	}
+
+	virtual int		getShapeType() const
+	{
+		return SOFTBODY_SHAPE_PROXYTYPE;
+	}
+	virtual void	setLocalScaling(const btVector3& /*scaling*/)
+	{		
+		///na
+		btAssert(0);
+	}
+	virtual const btVector3& getLocalScaling() const
+	{
+	static const btVector3 dummy(1,1,1);
+	return dummy;
+	}
+	virtual void	calculateLocalInertia(btScalar /*mass*/,btVector3& /*inertia*/) const
+	{
+		///not yet
+		btAssert(0);
+	}
+	virtual const char*	getName()const
+	{
+		return "SoftBody";
+	}
+
+};
+
+//
+// btSoftClusterCollisionShape
+//
+class btSoftClusterCollisionShape : public btConvexInternalShape
+{
+public:
+	const btSoftBody::Cluster*	m_cluster;
+
+	btSoftClusterCollisionShape (const btSoftBody::Cluster* cluster) : m_cluster(cluster) { setMargin(0); }
+	
+	
+	virtual btVector3	localGetSupportingVertex(const btVector3& vec) const
+		{
+		btSoftBody::Node* const *						n=&m_cluster->m_nodes[0];
+		btScalar										d=dot(vec,n[0]->m_x);
+		int												j=0;
+		for(int i=1,ni=m_cluster->m_nodes.size();i<ni;++i)
+			{
+			const btScalar	k=dot(vec,n[i]->m_x);
+			if(k>d) { d=k;j=i; }
+			}
+		return(n[j]->m_x);
+		}
+	virtual btVector3	localGetSupportingVertexWithoutMargin(const btVector3& vec)const
+		{
+		return(localGetSupportingVertex(vec));
+		}
+	//notice that the vectors should be unit length
+	virtual void	batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors,btVector3* supportVerticesOut,int numVectors) const
+	{}
+
+
+	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia) const
+	{}
+
+	virtual void getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const
+	{}
+
+	virtual int	getShapeType() const { return SOFTBODY_SHAPE_PROXYTYPE; }
+	
+	//debugging
+	virtual const char*	getName()const {return "SOFTCLUSTER";}
+
+	virtual void	setMargin(btScalar margin)
+	{
+		btConvexInternalShape::setMargin(margin);
+	}
+	virtual btScalar	getMargin() const
+	{
+		return getMargin();
+	}
+};
+
+//
+// Inline's
+//
+
+//
+template <typename T>
+static inline void			ZeroInitialize(T& value)
+{
+static const T	zerodummy;
+value=zerodummy;
+}
+//
+template <typename T>
+static inline bool			CompLess(const T& a,const T& b)
+{ return(a<b); }
+//
+template <typename T>
+static inline bool			CompGreater(const T& a,const T& b)
+{ return(a>b); }
+//
+template <typename T>
+static inline T				Lerp(const T& a,const T& b,btScalar t)
+{ return(a+(b-a)*t); }
+//
+template <typename T>
+static inline T				InvLerp(const T& a,const T& b,btScalar t)
+{ return((b+a*t-b*t)/(a*b)); }
+//
+static inline btMatrix3x3	Lerp(	const btMatrix3x3& a,
+									const btMatrix3x3& b,
+									btScalar t)
+{
+btMatrix3x3	r;
+r[0]=Lerp(a[0],b[0],t);
+r[1]=Lerp(a[1],b[1],t);
+r[2]=Lerp(a[2],b[2],t);
+return(r);
+}
+//
+static inline btVector3		Clamp(const btVector3& v,btScalar maxlength)
+{
+const btScalar sql=v.length2();
+if(sql>(maxlength*maxlength))
+	return((v*maxlength)/btSqrt(sql));
+	else
+	return(v);
+}
+//
+template <typename T>
+static inline T				Clamp(const T& x,const T& l,const T& h)
+{ return(x<l?l:x>h?h:x); }
+//
+template <typename T>
+static inline T				Sq(const T& x)
+{ return(x*x); }
+//
+template <typename T>
+static inline T				Cube(const T& x)
+{ return(x*x*x); }
+//
+template <typename T>
+static inline T				Sign(const T& x)
+{ return((T)(x<0?-1:+1)); }
+//
+template <typename T>
+static inline bool			SameSign(const T& x,const T& y)
+{ return((x*y)>0); }
+//
+static inline btScalar		ClusterMetric(const btVector3& x,const btVector3& y)
+{
+const btVector3	d=x-y;
+return(btFabs(d[0])+btFabs(d[1])+btFabs(d[2]));
+}
+//
+static inline btMatrix3x3	ScaleAlongAxis(const btVector3& a,btScalar s)
+{
+	const btScalar	xx=a.x()*a.x();
+	const btScalar	yy=a.y()*a.y();
+	const btScalar	zz=a.z()*a.z();
+	const btScalar	xy=a.x()*a.y();
+	const btScalar	yz=a.y()*a.z();
+	const btScalar	zx=a.z()*a.x();
+	btMatrix3x3		m;
+	m[0]=btVector3(1-xx+xx*s,xy*s-xy,zx*s-zx);
+	m[1]=btVector3(xy*s-xy,1-yy+yy*s,yz*s-yz);
+	m[2]=btVector3(zx*s-zx,yz*s-yz,1-zz+zz*s);
+	return(m);
+}
+//
+static inline btMatrix3x3	Cross(const btVector3& v)
+{
+	btMatrix3x3	m;
+	m[0]=btVector3(0,-v.z(),+v.y());
+	m[1]=btVector3(+v.z(),0,-v.x());
+	m[2]=btVector3(-v.y(),+v.x(),0);
+	return(m);
+}
+//
+static inline btMatrix3x3	Diagonal(btScalar x)
+{
+	btMatrix3x3	m;
+	m[0]=btVector3(x,0,0);
+	m[1]=btVector3(0,x,0);
+	m[2]=btVector3(0,0,x);
+	return(m);
+}
+//
+static inline btMatrix3x3	Add(const btMatrix3x3& a,
+	const btMatrix3x3& b)
+{
+	btMatrix3x3	r;
+	for(int i=0;i<3;++i) r[i]=a[i]+b[i];
+	return(r);
+}
+//
+static inline btMatrix3x3	Sub(const btMatrix3x3& a,
+	const btMatrix3x3& b)
+{
+	btMatrix3x3	r;
+	for(int i=0;i<3;++i) r[i]=a[i]-b[i];
+	return(r);
+}
+//
+static inline btMatrix3x3	Mul(const btMatrix3x3& a,
+	btScalar b)
+{
+	btMatrix3x3	r;
+	for(int i=0;i<3;++i) r[i]=a[i]*b;
+	return(r);
+}
+//
+static inline void			Orthogonalize(btMatrix3x3& m)
+{
+m[2]=cross(m[0],m[1]).normalized();
+m[1]=cross(m[2],m[0]).normalized();
+m[0]=cross(m[1],m[2]).normalized();
+}
+//
+static inline btMatrix3x3	MassMatrix(btScalar im,const btMatrix3x3& iwi,const btVector3& r)
+{
+	const btMatrix3x3	cr=Cross(r);
+	return(Sub(Diagonal(im),cr*iwi*cr));
+}
+
+//
+static inline btMatrix3x3	ImpulseMatrix(	btScalar dt,
+	btScalar ima,
+	btScalar imb,
+	const btMatrix3x3& iwi,
+	const btVector3& r)
+{
+	return(Diagonal(1/dt)*Add(Diagonal(ima),MassMatrix(imb,iwi,r)).inverse());
+}
+
+//
+static inline btMatrix3x3	ImpulseMatrix(	btScalar ima,const btMatrix3x3& iia,const btVector3& ra,
+											btScalar imb,const btMatrix3x3& iib,const btVector3& rb)	
+{
+return(Add(MassMatrix(ima,iia,ra),MassMatrix(imb,iib,rb)).inverse());
+}
+
+//
+static inline btMatrix3x3	AngularImpulseMatrix(	const btMatrix3x3& iia,
+													const btMatrix3x3& iib)
+{
+return(Add(iia,iib).inverse());
+}
+
+//
+static inline btVector3		ProjectOnAxis(	const btVector3& v,
+	const btVector3& a)
+{
+	return(a*dot(v,a));
+}
+//
+static inline btVector3		ProjectOnPlane(	const btVector3& v,
+	const btVector3& a)
+{
+	return(v-ProjectOnAxis(v,a));
+}
+
+//
+static inline void			ProjectOrigin(	const btVector3& a,
+											const btVector3& b,
+											btVector3& prj,
+											btScalar& sqd)
+{
+const btVector3	d=b-a;
+const btScalar	m2=d.length2();
+if(m2>SIMD_EPSILON)
+	{	
+	const btScalar	t=Clamp<btScalar>(-dot(a,d)/m2,0,1);
+	const btVector3	p=a+d*t;
+	const btScalar	l2=p.length2();
+	if(l2<sqd)
+		{
+		prj=p;
+		sqd=l2;
+		}
+	}
+}
+//
+static inline void			ProjectOrigin(	const btVector3& a,
+											const btVector3& b,
+											const btVector3& c,
+											btVector3& prj,
+											btScalar& sqd)
+{
+const btVector3&	q=cross(b-a,c-a);
+const btScalar		m2=q.length2();
+if(m2>SIMD_EPSILON)
+	{
+	const btVector3	n=q/btSqrt(m2);
+	const btScalar	k=dot(a,n);
+	const btScalar	k2=k*k;
+	if(k2<sqd)
+		{
+		const btVector3	p=n*k;
+		if(	(dot(cross(a-p,b-p),q)>0)&&
+			(dot(cross(b-p,c-p),q)>0)&&
+			(dot(cross(c-p,a-p),q)>0))
+			{			
+			prj=p;
+			sqd=k2;
+			}
+			else
+			{
+			ProjectOrigin(a,b,prj,sqd);
+			ProjectOrigin(b,c,prj,sqd);
+			ProjectOrigin(c,a,prj,sqd);
+			}
+		}
+	}
+}
+
+//
+template <typename T>
+static inline T				BaryEval(		const T& a,
+											const T& b,
+											const T& c,
+											const btVector3& coord)
+{
+	return(a*coord.x()+b*coord.y()+c*coord.z());
+}
+//
+static inline btVector3		BaryCoord(	const btVector3& a,
+										const btVector3& b,
+										const btVector3& c,
+										const btVector3& p)
+{
+const btScalar	w[]={	cross(a-p,b-p).length(),
+						cross(b-p,c-p).length(),
+						cross(c-p,a-p).length()};
+const btScalar	isum=1/(w[0]+w[1]+w[2]);
+return(btVector3(w[1]*isum,w[2]*isum,w[0]*isum));
+}
+
+//
+static btScalar				ImplicitSolve(	btSoftBody::ImplicitFn* fn,
+											const btVector3& a,
+											const btVector3& b,
+											const btScalar accuracy,
+											const int maxiterations=256)
+{
+btScalar	span[2]={0,1};
+btScalar	values[2]={fn->Eval(a),fn->Eval(b)};
+if(values[0]>values[1])
+	{
+	btSwap(span[0],span[1]);
+	btSwap(values[0],values[1]);
+	}
+if(values[0]>-accuracy) return(-1);
+if(values[1]<+accuracy) return(-1);
+for(int i=0;i<maxiterations;++i)
+	{
+	const btScalar	t=Lerp(span[0],span[1],values[0]/(values[0]-values[1]));
+	const btScalar	v=fn->Eval(Lerp(a,b,t));
+	if((t<=0)||(t>=1))		break;
+	if(btFabs(v)<accuracy)	return(t);
+	if(v<0)
+		{ span[0]=t;values[0]=v; }
+		else
+		{ span[1]=t;values[1]=v; }
+	}
+return(-1);
+}
+
+//
+static inline btVector3		NormalizeAny(const btVector3& v)
+{
+	const btScalar l=v.length();
+	if(l>SIMD_EPSILON)
+		return(v/l);
+	else
+		return(btVector3(0,0,0));
+}
+
+//
+static inline btDbvtVolume	VolumeOf(	const btSoftBody::Face& f,
+										btScalar margin)
+{
+const btVector3*	pts[]={	&f.m_n[0]->m_x,
+							&f.m_n[1]->m_x,
+							&f.m_n[2]->m_x};
+btDbvtVolume		vol=btDbvtVolume::FromPoints(pts,3);
+vol.Expand(btVector3(margin,margin,margin));
+return(vol);
+}
+
+//
+static inline btVector3			CenterOf(	const btSoftBody::Face& f)
+{
+return((f.m_n[0]->m_x+f.m_n[1]->m_x+f.m_n[2]->m_x)/3);
+}
+
+//
+static inline btScalar			AreaOf(		const btVector3& x0,
+											const btVector3& x1,
+											const btVector3& x2)
+{
+	const btVector3	a=x1-x0;
+	const btVector3	b=x2-x0;
+	const btVector3	cr=cross(a,b);
+	const btScalar	area=cr.length();
+	return(area);
+}
+
+//
+static inline btScalar		VolumeOf(	const btVector3& x0,
+										const btVector3& x1,
+										const btVector3& x2,
+										const btVector3& x3)
+{
+	const btVector3	a=x1-x0;
+	const btVector3	b=x2-x0;
+	const btVector3	c=x3-x0;
+	return(dot(a,cross(b,c)));
+}
+
+//
+static void					EvaluateMedium(	const btSoftBodyWorldInfo* wfi,
+											const btVector3& x,
+											btSoftBody::sMedium& medium)
+{
+	medium.m_velocity	=	btVector3(0,0,0);
+	medium.m_pressure	=	0;
+	medium.m_density	=	wfi->air_density;
+	if(wfi->water_density>0)
+	{
+		const btScalar	depth=-(dot(x,wfi->water_normal)+wfi->water_offset);
+		if(depth>0)
+		{
+			medium.m_density	=	wfi->water_density;
+			medium.m_pressure	=	depth*wfi->water_density*wfi->m_gravity.length();
+		}
+	}
+}
+
+//
+static inline void			ApplyClampedForce(	btSoftBody::Node& n,
+												const btVector3& f,
+												btScalar dt)
+{
+	const btScalar	dtim=dt*n.m_im;
+	if((f*dtim).length2()>n.m_v.length2())
+	{/* Clamp	*/ 
+		n.m_f-=ProjectOnAxis(n.m_v,f.normalized())/dtim;						
+	}
+	else
+	{/* Apply	*/ 
+		n.m_f+=f;
+	}
+}
+
+//
+static inline int		MatchEdge(	const btSoftBody::Node* a,
+									const btSoftBody::Node* b,
+									const btSoftBody::Node* ma,
+									const btSoftBody::Node* mb)
+{
+if((a==ma)&&(b==mb)) return(0);
+if((a==mb)&&(b==ma)) return(1);
+return(-1);
+}
+
+//
+// btEigen : Extract eigen system,
+// straitforward implementation of http://math.fullerton.edu/mathews/n2003/JacobiMethodMod.html
+// outputs are NOT sorted.
+//
+struct	btEigen
+{
+static int			system(btMatrix3x3& a,btMatrix3x3* vectors,btVector3* values=0)
+	{
+	static const int		maxiterations=16;
+	static const btScalar	accuracy=(btScalar)0.0001;
+	btMatrix3x3&			v=*vectors;
+	int						iterations=0;
+	vectors->setIdentity();
+	do	{
+		int				p=0,q=1;
+		if(btFabs(a[p][q])<btFabs(a[0][2])) { p=0;q=2; }
+		if(btFabs(a[p][q])<btFabs(a[1][2])) { p=1;q=2; }
+		if(btFabs(a[p][q])>accuracy)
+			{
+			const btScalar	w=(a[q][q]-a[p][p])/(2*a[p][q]);
+			const btScalar	z=btFabs(w);
+			const btScalar	t=w/(z*(btSqrt(1+w*w)+z));
+			if(t==t)/* [WARNING] let hope that one does not get thrown aways by some compilers... */ 
+				{
+				const btScalar	c=1/btSqrt(t*t+1);
+				const btScalar	s=c*t;
+				mulPQ(a,c,s,p,q);
+				mulTPQ(a,c,s,p,q);
+				mulPQ(v,c,s,p,q);
+				} else break;
+			} else break;
+		} while((++iterations)<maxiterations);
+	if(values)
+		{
+		*values=btVector3(a[0][0],a[1][1],a[2][2]);
+		}
+	return(iterations);
+	}
+private:
+static inline void	mulTPQ(btMatrix3x3& a,btScalar c,btScalar s,int p,int q)
+	{
+	const btScalar	m[2][3]={	{a[p][0],a[p][1],a[p][2]},
+								{a[q][0],a[q][1],a[q][2]}};
+	int i;
+
+	for(i=0;i<3;++i) a[p][i]=c*m[0][i]-s*m[1][i];
+	for(i=0;i<3;++i) a[q][i]=c*m[1][i]+s*m[0][i];
+	}
+static inline void	mulPQ(btMatrix3x3& a,btScalar c,btScalar s,int p,int q)
+	{
+	const btScalar	m[2][3]={	{a[0][p],a[1][p],a[2][p]},
+								{a[0][q],a[1][q],a[2][q]}};
+	int i;
+
+	for(i=0;i<3;++i) a[i][p]=c*m[0][i]-s*m[1][i];
+	for(i=0;i<3;++i) a[i][q]=c*m[1][i]+s*m[0][i];
+	}
+};
+
+//
+// Polar decomposition,
+// "Computing the Polar Decomposition with Applications", Nicholas J. Higham, 1986.
+//
+static inline int			PolarDecompose(	const btMatrix3x3& m,btMatrix3x3& q,btMatrix3x3& s)
+{
+	static const btScalar	half=(btScalar)0.5;
+	static const btScalar	accuracy=(btScalar)0.0001;
+	static const int		maxiterations=16;
+	int						i=0;
+	btScalar				det=0;
+	q	=	Mul(m,1/btVector3(m[0][0],m[1][1],m[2][2]).length());
+	det	=	q.determinant();
+	if(!btFuzzyZero(det))
+	{
+		for(;i<maxiterations;++i)
+		{
+			q=Mul(Add(q,Mul(q.adjoint(),1/det).transpose()),half);
+			const btScalar	ndet=q.determinant();
+			if(Sq(ndet-det)>accuracy) det=ndet; else break;
+		}
+		/* Final orthogonalization	*/ 
+		Orthogonalize(q);
+		/* Compute 'S'				*/ 
+		s=q.transpose()*m;
+	}
+	else
+	{
+		q.setIdentity();
+		s.setIdentity();
+	}
+return(i);
+}
+
+//
+// btSoftColliders
+//
+struct btSoftColliders
+{
+	//
+	// ClusterBase
+	//
+	struct	ClusterBase : btDbvt::ICollide
+	{
+	btScalar			erp;
+	btScalar			idt;
+	btScalar			margin;
+	btScalar			friction;
+	btScalar			threshold;
+					ClusterBase()
+		{
+		erp			=(btScalar)1;
+		idt			=0;
+		margin		=0;
+		friction	=0;
+		threshold	=(btScalar)0;
+		}
+	bool				SolveContact(	const btGjkEpaSolver2::sResults& res,
+										btSoftBody::Body ba,btSoftBody::Body bb,
+										btSoftBody::CJoint& joint)
+		{
+		if(res.distance<margin)
+			{
+			const btVector3		ra=res.witnesses[0]-ba.xform().getOrigin();
+			const btVector3		rb=res.witnesses[1]-bb.xform().getOrigin();
+			const btVector3		va=ba.velocity(ra);
+			const btVector3		vb=bb.velocity(rb);
+			const btVector3		vrel=va-vb;
+			const btScalar		rvac=dot(vrel,res.normal);
+			const btScalar		depth=res.distance-margin;
+			const btVector3		iv=res.normal*rvac;
+			const btVector3		fv=vrel-iv;
+			joint.m_bodies[0]	=	ba;
+			joint.m_bodies[1]	=	bb;
+			joint.m_refs[0]		=	ra*ba.xform().getBasis();
+			joint.m_refs[1]		=	rb*bb.xform().getBasis();
+			joint.m_rpos[0]		=	ra;
+			joint.m_rpos[1]		=	rb;
+			joint.m_cfm			=	1;
+			joint.m_erp			=	1;
+			joint.m_life		=	0;
+			joint.m_maxlife		=	0;
+			joint.m_split		=	1;
+			joint.m_drift		=	depth*res.normal;
+			joint.m_normal		=	res.normal;
+			joint.m_delete		=	false;
+			joint.m_friction	=	fv.length2()<(-rvac*friction)?1:friction;
+			joint.m_massmatrix	=	ImpulseMatrix(	ba.invMass(),ba.invWorldInertia(),joint.m_rpos[0],
+													bb.invMass(),bb.invWorldInertia(),joint.m_rpos[1]);
+			return(true);
+			}
+		return(false);
+		}
+	};
+	//
+	// CollideCL_RS
+	//
+	struct	CollideCL_RS : ClusterBase
+	{
+	btSoftBody*		psb;
+	btRigidBody*	prb;
+	void		Process(const btDbvtNode* leaf)
+		{
+		btSoftBody::Cluster*		cluster=(btSoftBody::Cluster*)leaf->data;
+		btSoftClusterCollisionShape	cshape(cluster);
+		const btConvexShape*		rshape=(const btConvexShape*)prb->getCollisionShape();
+		btGjkEpaSolver2::sResults	res;		
+		if(btGjkEpaSolver2::SignedDistance(	&cshape,btTransform::getIdentity(),
+											rshape,prb->getInterpolationWorldTransform(),
+											btVector3(1,0,0),res))
+			{
+			btSoftBody::CJoint	joint;
+			if(SolveContact(res,cluster,prb,joint))
+				{
+				btSoftBody::CJoint*	pj=new(btAlignedAlloc(sizeof(btSoftBody::CJoint),16)) btSoftBody::CJoint();
+				*pj=joint;psb->m_joints.push_back(pj);
+				if(prb->isStaticOrKinematicObject())
+					{
+					pj->m_erp	*=	psb->m_cfg.kSKHR_CL;
+					pj->m_split	*=	psb->m_cfg.kSK_SPLT_CL;
+					}
+					else
+					{
+					pj->m_erp	*=	psb->m_cfg.kSRHR_CL;
+					pj->m_split	*=	psb->m_cfg.kSR_SPLT_CL;
+					}
+				}
+			}
+		}
+	void		Process(btSoftBody* ps,btRigidBody* pr)
+		{
+		psb			=	ps;
+		prb			=	pr;
+		idt			=	ps->m_sst.isdt;
+		margin		=	ps->getCollisionShape()->getMargin()+
+						pr->getCollisionShape()->getMargin();
+		friction	=	btMin(psb->m_cfg.kDF,prb->getFriction());
+		btVector3			mins;
+		btVector3			maxs;
+		btDbvtVolume		volume;
+		pr->getCollisionShape()->getAabb(pr->getInterpolationWorldTransform(),mins,maxs);
+		volume=btDbvtVolume::FromMM(mins,maxs);
+		volume.Expand(btVector3(1,1,1)*margin);
+		btDbvt::collideTV(ps->m_cdbvt.m_root,volume,*this);
+		}	
+	};
+	//
+	// CollideCL_SS
+	//
+	struct	CollideCL_SS : ClusterBase
+	{
+	btSoftBody*	bodies[2];
+	void		Process(const btDbvtNode* la,const btDbvtNode* lb)
+		{
+		btSoftBody::Cluster*		cla=(btSoftBody::Cluster*)la->data;
+		btSoftBody::Cluster*		clb=(btSoftBody::Cluster*)lb->data;
+		btSoftClusterCollisionShape	csa(cla);
+		btSoftClusterCollisionShape	csb(clb);
+		btGjkEpaSolver2::sResults	res;		
+		if(btGjkEpaSolver2::SignedDistance(	&csa,btTransform::getIdentity(),
+											&csb,btTransform::getIdentity(),
+											cla->m_com-clb->m_com,res))
+			{
+			btSoftBody::CJoint	joint;
+			if(SolveContact(res,cla,clb,joint))
+				{
+				btSoftBody::CJoint*	pj=new(btAlignedAlloc(sizeof(btSoftBody::CJoint),16)) btSoftBody::CJoint();
+				*pj=joint;bodies[0]->m_joints.push_back(pj);
+				pj->m_erp	*=	btMax(bodies[0]->m_cfg.kSSHR_CL,bodies[1]->m_cfg.kSSHR_CL);
+				pj->m_split	*=	(bodies[0]->m_cfg.kSS_SPLT_CL+bodies[1]->m_cfg.kSS_SPLT_CL)/2;
+				}
+			}
+		}
+	void		Process(btSoftBody* psa,btSoftBody* psb)
+		{
+		idt			=	psa->m_sst.isdt;
+		margin		=	(psa->getCollisionShape()->getMargin()+psb->getCollisionShape()->getMargin())/2;
+		friction	=	btMin(psa->m_cfg.kDF,psb->m_cfg.kDF);
+		bodies[0]	=	psa;
+		bodies[1]	=	psb;
+		btDbvt::collideTT(psa->m_cdbvt.m_root,psb->m_cdbvt.m_root,*this);
+		}	
+	};
+	//
+	// CollideSDF_RS
+	//
+	struct	CollideSDF_RS : btDbvt::ICollide
+	{
+	void		Process(const btDbvtNode* leaf)
+		{
+		btSoftBody::Node*	node=(btSoftBody::Node*)leaf->data;
+		DoNode(*node);
+		}
+	void		DoNode(btSoftBody::Node& n) const
+		{
+		const btScalar			m=n.m_im>0?dynmargin:stamargin;
+		btSoftBody::RContact	c;
+		if(	(!n.m_battach)&&
+			psb->checkContact(prb,n.m_x,m,c.m_cti))
+			{
+			const btScalar	ima=n.m_im;
+			const btScalar	imb=prb->getInvMass();
+			const btScalar	ms=ima+imb;
+			if(ms>0)
+				{
+				const btTransform&	wtr=prb->getInterpolationWorldTransform();
+				const btMatrix3x3&	iwi=prb->getInvInertiaTensorWorld();
+				const btVector3		ra=n.m_x-wtr.getOrigin();
+				const btVector3		va=prb->getVelocityInLocalPoint(ra)*psb->m_sst.sdt;
+				const btVector3		vb=n.m_x-n.m_q;	
+				const btVector3		vr=vb-va;
+				const btScalar		dn=dot(vr,c.m_cti.m_normal);
+				const btVector3		fv=vr-c.m_cti.m_normal*dn;
+				const btScalar		fc=psb->m_cfg.kDF*prb->getFriction();
+				c.m_node	=	&n;
+				c.m_c0		=	ImpulseMatrix(psb->m_sst.sdt,ima,imb,iwi,ra);
+				c.m_c1		=	ra;
+				c.m_c2		=	ima*psb->m_sst.sdt;
+				c.m_c3		=	fv.length2()<(btFabs(dn)*fc)?0:1-fc;
+				c.m_c4		=	prb->isStaticOrKinematicObject()?psb->m_cfg.kKHR:psb->m_cfg.kCHR;
+				psb->m_rcontacts.push_back(c);
+				prb->activate();
+				}
+			}
+		}
+	btSoftBody*		psb;
+	btRigidBody*	prb;
+	btScalar		dynmargin;
+	btScalar		stamargin;
+	};
+	//
+	// CollideVF_SS
+	//
+	struct	CollideVF_SS : btDbvt::ICollide
+	{
+	void		Process(const btDbvtNode* lnode,
+						const btDbvtNode* lface)
+		{
+		btSoftBody::Node*	node=(btSoftBody::Node*)lnode->data;
+		btSoftBody::Face*	face=(btSoftBody::Face*)lface->data;
+		btVector3			o=node->m_x;
+		btVector3			p;
+		btScalar			d=SIMD_INFINITY;
+		ProjectOrigin(	face->m_n[0]->m_x-o,
+						face->m_n[1]->m_x-o,
+						face->m_n[2]->m_x-o,
+						p,d);
+		const btScalar	m=mrg+(o-node->m_q).length()*2;
+		if(d<(m*m))
+			{
+			const btSoftBody::Node*	n[]={face->m_n[0],face->m_n[1],face->m_n[2]};
+			const btVector3			w=BaryCoord(n[0]->m_x,n[1]->m_x,n[2]->m_x,p+o);
+			const btScalar			ma=node->m_im;
+			btScalar				mb=BaryEval(n[0]->m_im,n[1]->m_im,n[2]->m_im,w);
+			if(	(n[0]->m_im<=0)||
+				(n[1]->m_im<=0)||
+				(n[2]->m_im<=0))
+				{
+				mb=0;
+				}
+			const btScalar	ms=ma+mb;
+			if(ms>0)
+				{
+				btSoftBody::SContact	c;
+				c.m_normal		=	p/-btSqrt(d);
+				c.m_margin		=	m;
+				c.m_node		=	node;
+				c.m_face		=	face;
+				c.m_weights		=	w;
+				c.m_friction	=	btMax(psb[0]->m_cfg.kDF,psb[1]->m_cfg.kDF);
+				c.m_cfm[0]		=	ma/ms*psb[0]->m_cfg.kSHR;
+				c.m_cfm[1]		=	mb/ms*psb[1]->m_cfg.kSHR;
+				psb[0]->m_scontacts.push_back(c);
+				}
+			}	
+		}
+	btSoftBody*		psb[2];
+	btScalar		mrg;
+	};
+};
+
+#endif //_BT_SOFT_BODY_INTERNALS_H
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp b/extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp
new file mode 100644
index 00000000000..e62f35567b0
--- /dev/null
+++ b/extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp
@@ -0,0 +1,108 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btSoftBodyRigidBodyCollisionConfiguration.h"
+#include "btSoftRigidCollisionAlgorithm.h"
+#include "btSoftBodyConcaveCollisionAlgorithm.h"
+#include "btSoftSoftCollisionAlgorithm.h"
+
+#define ENABLE_SOFTBODY_CONCAVE_COLLISIONS 1
+
+btSoftBodyRigidBodyCollisionConfiguration::btSoftBodyRigidBodyCollisionConfiguration(const btDefaultCollisionConstructionInfo& constructionInfo)
+:btDefaultCollisionConfiguration(constructionInfo)
+{
+	void* mem;
+
+	mem = btAlignedAlloc(sizeof(btSoftSoftCollisionAlgorithm::CreateFunc),16);
+	m_softSoftCreateFunc = new(mem) btSoftSoftCollisionAlgorithm::CreateFunc;
+	
+	mem = btAlignedAlloc(sizeof(btSoftRigidCollisionAlgorithm::CreateFunc),16);
+	m_softRigidConvexCreateFunc = new(mem) btSoftRigidCollisionAlgorithm::CreateFunc;
+	
+	mem = btAlignedAlloc(sizeof(btSoftRigidCollisionAlgorithm::CreateFunc),16);
+	m_swappedSoftRigidConvexCreateFunc = new(mem) btSoftRigidCollisionAlgorithm::CreateFunc;
+	m_swappedSoftRigidConvexCreateFunc->m_swapped=true;
+
+#ifdef ENABLE_SOFTBODY_CONCAVE_COLLISIONS
+	mem = btAlignedAlloc(sizeof(btSoftBodyConcaveCollisionAlgorithm::CreateFunc),16);
+	m_softRigidConcaveCreateFunc = new(mem) btSoftBodyConcaveCollisionAlgorithm::CreateFunc;
+	
+	mem = btAlignedAlloc(sizeof(btSoftBodyConcaveCollisionAlgorithm::CreateFunc),16);
+	m_swappedSoftRigidConcaveCreateFunc = new(mem) btSoftBodyConcaveCollisionAlgorithm::SwappedCreateFunc;
+	m_swappedSoftRigidConcaveCreateFunc->m_swapped=true;
+#endif
+
+}
+
+btSoftBodyRigidBodyCollisionConfiguration::~btSoftBodyRigidBodyCollisionConfiguration()
+{
+	m_softSoftCreateFunc->~btCollisionAlgorithmCreateFunc();
+	btAlignedFree(	m_softSoftCreateFunc);
+
+	m_softRigidConvexCreateFunc->~btCollisionAlgorithmCreateFunc();
+	btAlignedFree(	m_softRigidConvexCreateFunc);
+
+	m_swappedSoftRigidConvexCreateFunc->~btCollisionAlgorithmCreateFunc();
+	btAlignedFree(	m_swappedSoftRigidConvexCreateFunc);
+
+#ifdef ENABLE_SOFTBODY_CONCAVE_COLLISIONS
+	m_softRigidConcaveCreateFunc->~btCollisionAlgorithmCreateFunc();
+	btAlignedFree(	m_softRigidConcaveCreateFunc);
+
+	m_swappedSoftRigidConcaveCreateFunc->~btCollisionAlgorithmCreateFunc();
+	btAlignedFree(	m_swappedSoftRigidConcaveCreateFunc);
+#endif
+}
+	
+///creation of soft-soft and soft-rigid, and otherwise fallback to base class implementation
+btCollisionAlgorithmCreateFunc* btSoftBodyRigidBodyCollisionConfiguration::getCollisionAlgorithmCreateFunc(int proxyType0,int proxyType1)
+{
+
+	///try to handle the softbody interactions first
+
+	if ((proxyType0 == SOFTBODY_SHAPE_PROXYTYPE  ) && (proxyType1==SOFTBODY_SHAPE_PROXYTYPE))
+	{
+		return	m_softSoftCreateFunc;
+	}
+
+	///softbody versus convex
+	if (proxyType0 == SOFTBODY_SHAPE_PROXYTYPE  && btBroadphaseProxy::isConvex(proxyType1))
+	{
+		return	m_softRigidConvexCreateFunc;
+	}
+
+	///convex versus soft body
+	if (btBroadphaseProxy::isConvex(proxyType0) && proxyType1 == SOFTBODY_SHAPE_PROXYTYPE )
+	{
+		return	m_swappedSoftRigidConvexCreateFunc;
+	}
+
+#ifdef ENABLE_SOFTBODY_CONCAVE_COLLISIONS
+	///softbody versus convex
+	if (proxyType0 == SOFTBODY_SHAPE_PROXYTYPE  && btBroadphaseProxy::isConcave(proxyType1))
+	{
+		return	m_softRigidConcaveCreateFunc;
+	}
+
+	///convex versus soft body
+	if (btBroadphaseProxy::isConcave(proxyType0) && proxyType1 == SOFTBODY_SHAPE_PROXYTYPE )
+	{
+		return	m_swappedSoftRigidConcaveCreateFunc;
+	}
+#endif
+
+	///fallback to the regular rigid collision shape
+	return btDefaultCollisionConfiguration::getCollisionAlgorithmCreateFunc(proxyType0,proxyType1);
+}
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h b/extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h
new file mode 100644
index 00000000000..41c3af96939
--- /dev/null
+++ b/extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h
@@ -0,0 +1,48 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef BT_SOFTBODY_RIGIDBODY_COLLISION_CONFIGURATION
+#define BT_SOFTBODY_RIGIDBODY_COLLISION_CONFIGURATION
+
+#include "BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h"
+
+class btVoronoiSimplexSolver;
+class btGjkEpaPenetrationDepthSolver;
+
+
+///btSoftBodyRigidBodyCollisionConfiguration add softbody interaction on top of btDefaultCollisionConfiguration
+class	btSoftBodyRigidBodyCollisionConfiguration : public btDefaultCollisionConfiguration
+{
+
+	//default CreationFunctions, filling the m_doubleDispatch table
+	btCollisionAlgorithmCreateFunc*	m_softSoftCreateFunc;
+	btCollisionAlgorithmCreateFunc*	m_softRigidConvexCreateFunc;
+	btCollisionAlgorithmCreateFunc*	m_swappedSoftRigidConvexCreateFunc;
+	btCollisionAlgorithmCreateFunc*	m_softRigidConcaveCreateFunc;
+	btCollisionAlgorithmCreateFunc*	m_swappedSoftRigidConcaveCreateFunc;
+	
+public:
+
+	btSoftBodyRigidBodyCollisionConfiguration(const btDefaultCollisionConstructionInfo& constructionInfo = btDefaultCollisionConstructionInfo());
+
+	virtual ~btSoftBodyRigidBodyCollisionConfiguration();
+
+	///creation of soft-soft and soft-rigid, and otherwise fallback to base class implementation
+	virtual btCollisionAlgorithmCreateFunc* getCollisionAlgorithmCreateFunc(int proxyType0,int proxyType1);
+
+};
+
+#endif //BT_SOFTBODY_RIGIDBODY_COLLISION_CONFIGURATION
+
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp b/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp
new file mode 100644
index 00000000000..835a03b8e3c
--- /dev/null
+++ b/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp
@@ -0,0 +1,79 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btSoftRigidCollisionAlgorithm.h"
+#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h"
+#include "BulletCollision/CollisionShapes/btSphereShape.h"
+#include "BulletCollision/CollisionShapes/btBoxShape.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
+#include "btSoftBody.h"
+///TODO: include all the shapes that the softbody can collide with
+///alternatively, implement special case collision algorithms (just like for rigid collision shapes)
+
+//#include <stdio.h>
+
+btSoftRigidCollisionAlgorithm::btSoftRigidCollisionAlgorithm(btPersistentManifold* /*mf*/,const btCollisionAlgorithmConstructionInfo& ci,btCollisionObject* /*col0*/,btCollisionObject* /*col1*/, bool isSwapped)
+: btCollisionAlgorithm(ci),
+//m_ownManifold(false),
+//m_manifoldPtr(mf),
+m_isSwapped(isSwapped)
+{
+}
+
+
+btSoftRigidCollisionAlgorithm::~btSoftRigidCollisionAlgorithm()
+{
+	
+	//m_softBody->m_overlappingRigidBodies.remove(m_rigidCollisionObject);
+
+	/*if (m_ownManifold)
+	{
+		if (m_manifoldPtr)
+			m_dispatcher->releaseManifold(m_manifoldPtr);
+	}
+	*/
+
+}
+
+
+#include <stdio.h>
+
+void btSoftRigidCollisionAlgorithm::processCollision (btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut)
+{
+	(void)dispatchInfo;
+	(void)resultOut;
+	//printf("btSoftRigidCollisionAlgorithm\n");
+
+	btSoftBody* softBody =  m_isSwapped? (btSoftBody*)body1 : (btSoftBody*)body0;
+	btCollisionObject* rigidCollisionObject = m_isSwapped? body0 : body1;
+	
+	softBody->defaultCollisionHandler(rigidCollisionObject);
+
+
+}
+
+btScalar btSoftRigidCollisionAlgorithm::calculateTimeOfImpact(btCollisionObject* col0,btCollisionObject* col1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut)
+{
+	(void)resultOut;
+	(void)dispatchInfo;
+	(void)col0;
+	(void)col1;
+
+	//not yet
+	return btScalar(1.);
+}
+
+
+
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h b/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h
new file mode 100644
index 00000000000..74327e6c635
--- /dev/null
+++ b/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h
@@ -0,0 +1,75 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef SOFT_RIGID_COLLISION_ALGORITHM_H
+#define SOFT_RIGID_COLLISION_ALGORITHM_H
+
+#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
+#include "BulletCollision/CollisionDispatch/btCollisionCreateFunc.h"
+class btPersistentManifold;
+#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h"
+
+#include "LinearMath/btVector3.h"
+class btSoftBody;
+
+/// btSoftRigidCollisionAlgorithm  provides collision detection between btSoftBody and btRigidBody
+class btSoftRigidCollisionAlgorithm : public btCollisionAlgorithm
+{
+//	bool	m_ownManifold;
+//	btPersistentManifold*	m_manifoldPtr;
+
+	btSoftBody*				m_softBody;
+	btCollisionObject*		m_rigidCollisionObject;
+
+	///for rigid versus soft (instead of soft versus rigid), we use this swapped boolean
+	bool	m_isSwapped;
+	
+public:
+
+	btSoftRigidCollisionAlgorithm(btPersistentManifold* mf,const btCollisionAlgorithmConstructionInfo& ci,btCollisionObject* col0,btCollisionObject* col1, bool isSwapped);
+
+	virtual ~btSoftRigidCollisionAlgorithm();
+
+	virtual void processCollision (btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut);
+
+	virtual btScalar calculateTimeOfImpact(btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut);
+
+	virtual	void	getAllContactManifolds(btManifoldArray&	manifoldArray)
+	{
+		//we don't add any manifolds
+	}
+
+	
+	struct CreateFunc :public 	btCollisionAlgorithmCreateFunc
+	{
+		virtual	btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, btCollisionObject* body0,btCollisionObject* body1)
+		{
+			void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btSoftRigidCollisionAlgorithm));
+			if (!m_swapped)
+			{
+				return new(mem) btSoftRigidCollisionAlgorithm(0,ci,body0,body1,false);
+			} else
+			{
+				return new(mem) btSoftRigidCollisionAlgorithm(0,ci,body0,body1,true);
+			}
+		}
+	};
+
+};
+
+#endif //SOFT_RIGID_COLLISION_ALGORITHM_H
+
+
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp b/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp
new file mode 100644
index 00000000000..01b9fc0fd35
--- /dev/null
+++ b/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp
@@ -0,0 +1,126 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+
+#include "btSoftRigidDynamicsWorld.h"
+#include "LinearMath/btQuickprof.h"
+
+//softbody & helpers
+#include "btSoftBody.h"
+#include "btSoftBodyHelpers.h"
+
+btSoftRigidDynamicsWorld::btSoftRigidDynamicsWorld(btDispatcher* dispatcher,btBroadphaseInterface* pairCache,btConstraintSolver* constraintSolver,btCollisionConfiguration* collisionConfiguration)
+:btDiscreteDynamicsWorld(dispatcher,pairCache,constraintSolver,collisionConfiguration)
+{
+m_drawFlags			=	fDrawFlags::Std;
+m_drawNodeTree		=	true;
+m_drawFaceTree		=	false;
+m_drawClusterTree	=	false;
+}
+		
+btSoftRigidDynamicsWorld::~btSoftRigidDynamicsWorld()
+{
+
+}
+
+void	btSoftRigidDynamicsWorld::predictUnconstraintMotion(btScalar timeStep)
+{
+	btDiscreteDynamicsWorld::predictUnconstraintMotion( timeStep);
+
+	for ( int i=0;i<m_softBodies.size();++i)
+	{
+		btSoftBody*	psb= m_softBodies[i];
+
+		psb->predictMotion(timeStep);		
+	}
+}
+		
+void	btSoftRigidDynamicsWorld::internalSingleStepSimulation( btScalar timeStep)
+{
+	btDiscreteDynamicsWorld::internalSingleStepSimulation( timeStep );
+
+	///solve soft bodies constraints
+	solveSoftBodiesConstraints();
+
+	///update soft bodies
+	updateSoftBodies();
+
+}
+
+void	btSoftRigidDynamicsWorld::updateSoftBodies()
+{
+	BT_PROFILE("updateSoftBodies");
+	
+	for ( int i=0;i<m_softBodies.size();i++)
+	{
+		btSoftBody*	psb=(btSoftBody*)m_softBodies[i];
+		psb->integrateMotion();	
+	}
+}
+
+void	btSoftRigidDynamicsWorld::solveSoftBodiesConstraints()
+{
+	BT_PROFILE("solveSoftConstraints");
+	
+	if(m_softBodies.size())
+		{
+		btSoftBody::solveClusters(m_softBodies);
+		}
+	
+	for(int i=0;i<m_softBodies.size();++i)
+	{
+		btSoftBody*	psb=(btSoftBody*)m_softBodies[i];
+		psb->solveConstraints();
+	}	
+}
+
+void	btSoftRigidDynamicsWorld::addSoftBody(btSoftBody* body)
+{
+	m_softBodies.push_back(body);
+
+	btCollisionWorld::addCollisionObject(body,
+					btBroadphaseProxy::DefaultFilter,
+					btBroadphaseProxy::AllFilter);
+
+}
+
+void	btSoftRigidDynamicsWorld::removeSoftBody(btSoftBody* body)
+{
+	m_softBodies.remove(body);
+
+	btCollisionWorld::removeCollisionObject(body);
+}
+
+void	btSoftRigidDynamicsWorld::debugDrawWorld()
+{
+	btDiscreteDynamicsWorld::debugDrawWorld();
+
+	if (getDebugDrawer())
+	{
+		int i;
+		for (  i=0;i<this->m_softBodies.size();i++)
+		{
+			btSoftBody*	psb=(btSoftBody*)this->m_softBodies[i];
+			btSoftBodyHelpers::DrawFrame(psb,m_debugDrawer);
+			btSoftBodyHelpers::Draw(psb,m_debugDrawer,m_drawFlags);
+			if (m_debugDrawer && (m_debugDrawer->getDebugMode() & btIDebugDraw::DBG_DrawAabb))
+			{
+				if(m_drawNodeTree)		btSoftBodyHelpers::DrawNodeTree(psb,m_debugDrawer);
+				if(m_drawFaceTree)		btSoftBodyHelpers::DrawFaceTree(psb,m_debugDrawer);
+				if(m_drawClusterTree)	btSoftBodyHelpers::DrawClusterTree(psb,m_debugDrawer);
+			}
+		}		
+	}	
+}
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.h b/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.h
new file mode 100644
index 00000000000..d0010b65aad
--- /dev/null
+++ b/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.h
@@ -0,0 +1,73 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h"
+
+#ifndef BT_SOFT_RIGID_DYNAMICS_WORLD_H
+#define BT_SOFT_RIGID_DYNAMICS_WORLD_H
+
+class btSoftBody;
+typedef	btAlignedObjectArray<btSoftBody*> btSoftBodyArray;
+
+class btSoftRigidDynamicsWorld : public btDiscreteDynamicsWorld
+{
+	
+	btSoftBodyArray	m_softBodies;
+	int				m_drawFlags;
+	bool			m_drawNodeTree;
+	bool			m_drawFaceTree;
+	bool			m_drawClusterTree;
+		
+protected:
+	
+	virtual void	predictUnconstraintMotion(btScalar timeStep);
+	
+	virtual void	internalSingleStepSimulation( btScalar timeStep);
+
+	void	updateSoftBodies();
+
+	void	solveSoftBodiesConstraints();
+
+	
+
+public:
+	
+	btSoftRigidDynamicsWorld(btDispatcher* dispatcher,btBroadphaseInterface* pairCache,btConstraintSolver* constraintSolver,btCollisionConfiguration* collisionConfiguration);
+
+	virtual ~btSoftRigidDynamicsWorld();
+	
+	virtual void	debugDrawWorld();
+			
+	void	addSoftBody(btSoftBody* body);
+
+	void	removeSoftBody(btSoftBody* body);
+	
+	int		getDrawFlags() const { return(m_drawFlags); }
+	void	setDrawFlags(int f)	{ m_drawFlags=f; }
+
+			
+	btSoftBodyArray& getSoftBodyArray()
+	{
+		return m_softBodies;
+	}
+
+	const btSoftBodyArray& getSoftBodyArray() const
+	{
+		return m_softBodies;
+	}
+		
+};
+
+#endif //BT_SOFT_RIGID_DYNAMICS_WORLD_H
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp b/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp
new file mode 100644
index 00000000000..85a727944e0
--- /dev/null
+++ b/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp
@@ -0,0 +1,46 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "btSoftSoftCollisionAlgorithm.h"
+#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h"
+#include "BulletCollision/CollisionShapes/btBoxShape.h"
+#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
+#include "btSoftBody.h"
+
+#define USE_PERSISTENT_CONTACTS 1
+
+btSoftSoftCollisionAlgorithm::btSoftSoftCollisionAlgorithm(btPersistentManifold* /*mf*/,const btCollisionAlgorithmConstructionInfo& ci,btCollisionObject* /*obj0*/,btCollisionObject* /*obj1*/)
+: btCollisionAlgorithm(ci)
+//m_ownManifold(false),
+//m_manifoldPtr(mf)
+{
+}
+
+btSoftSoftCollisionAlgorithm::~btSoftSoftCollisionAlgorithm()
+{
+}
+
+void btSoftSoftCollisionAlgorithm::processCollision (btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& /*dispatchInfo*/,btManifoldResult* /*resultOut*/)
+{
+	btSoftBody* soft0 =	(btSoftBody*)body0;
+	btSoftBody* soft1 =	(btSoftBody*)body1;
+	soft0->defaultCollisionHandler(soft1);
+}
+
+btScalar btSoftSoftCollisionAlgorithm::calculateTimeOfImpact(btCollisionObject* /*body0*/,btCollisionObject* /*body1*/,const btDispatcherInfo& /*dispatchInfo*/,btManifoldResult* /*resultOut*/)
+{
+	//not yet
+	return 1.f;
+}
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h b/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h
new file mode 100644
index 00000000000..7ca9c3415c9
--- /dev/null
+++ b/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h
@@ -0,0 +1,69 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef SOFT_SOFT_COLLISION_ALGORITHM_H
+#define SOFT_SOFT_COLLISION_ALGORITHM_H
+
+#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
+#include "BulletCollision/BroadphaseCollision/btDispatcher.h"
+#include "BulletCollision/CollisionDispatch/btCollisionCreateFunc.h"
+
+class btPersistentManifold;
+class btSoftBody;
+
+///collision detection between two btSoftBody shapes
+class btSoftSoftCollisionAlgorithm : public btCollisionAlgorithm
+{
+	bool	m_ownManifold;
+	btPersistentManifold*	m_manifoldPtr;
+
+	btSoftBody*	m_softBody0;
+	btSoftBody*	m_softBody1;
+
+	
+public:
+	btSoftSoftCollisionAlgorithm(const btCollisionAlgorithmConstructionInfo& ci)
+		: btCollisionAlgorithm(ci) {}
+
+	virtual void processCollision (btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut);
+
+	virtual btScalar calculateTimeOfImpact(btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut);
+
+	virtual	void	getAllContactManifolds(btManifoldArray&	manifoldArray)
+	{
+		if (m_manifoldPtr && m_ownManifold)
+			manifoldArray.push_back(m_manifoldPtr);
+	}
+
+	btSoftSoftCollisionAlgorithm(btPersistentManifold* mf,const btCollisionAlgorithmConstructionInfo& ci,btCollisionObject* body0,btCollisionObject* body1);
+
+	virtual ~btSoftSoftCollisionAlgorithm();
+
+	struct CreateFunc :public 	btCollisionAlgorithmCreateFunc
+	{
+		virtual	btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, btCollisionObject* body0,btCollisionObject* body1)
+		{
+			int bbsize = sizeof(btSoftSoftCollisionAlgorithm);
+			void* ptr = ci.m_dispatcher1->allocateCollisionAlgorithm(bbsize);
+			return new(ptr) btSoftSoftCollisionAlgorithm(0,ci,body0,body1);
+		}
+	};
+
+};
+
+#endif //SOFT_SOFT_COLLISION_ALGORITHM_H
+
+
diff --git a/extern/bullet2/src/BulletSoftBody/btSparseSDF.h b/extern/bullet2/src/BulletSoftBody/btSparseSDF.h
new file mode 100644
index 00000000000..eafe74be1ae
--- /dev/null
+++ b/extern/bullet2/src/BulletSoftBody/btSparseSDF.h
@@ -0,0 +1,306 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+///btSparseSdf implementation by Nathanael Presson
+
+#ifndef _14F9D17F_EAE8_4aba_B41C_292DB2AA70F3_
+#define _14F9D17F_EAE8_4aba_B41C_292DB2AA70F3_
+
+#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
+#include "BulletCollision/NarrowPhaseCollision/btGjkEpa2.h"
+
+// Modified Paul Hsieh hash
+template <const int DWORDLEN>
+unsigned int HsiehHash(const void* pdata)
+	{
+	const unsigned short*	data=(const unsigned short*)pdata;
+	unsigned				hash=DWORDLEN<<2,tmp;
+	for(int i=0;i<DWORDLEN;++i)
+		{
+		hash	+=	data[0];
+		tmp		=	(data[1]<<11)^hash;
+		hash	=	(hash<<16)^tmp;
+		data	+=	2;
+		hash	+=	hash>>11;
+		}
+	hash^=hash<<3;hash+=hash>>5;
+	hash^=hash<<4;hash+=hash>>17;
+	hash^=hash<<25;hash+=hash>>6;
+	return(hash);
+	}
+
+template <const int CELLSIZE>
+struct	btSparseSdf
+	{
+	//
+	// Inner types
+	//
+	struct IntFrac
+		{
+		int					b;
+		int					i;
+		btScalar			f;
+		};
+	struct	Cell
+		{
+		btScalar			d[CELLSIZE+1][CELLSIZE+1][CELLSIZE+1];
+		int					c[3];
+		int					puid;
+		unsigned			hash;
+		btCollisionShape*	pclient;
+		Cell*				next;
+		};
+	//
+	// Fields
+	//
+	
+	btAlignedObjectArray<Cell*>		cells;	
+	btScalar						voxelsz;
+	int								puid;
+	int								ncells;
+	int								nprobes;
+	int								nqueries;	
+	
+	//
+	// Methods
+	//
+	
+	//
+	void					Initialize(int hashsize=2383)
+		{
+		cells.resize(hashsize,0);
+		Reset();		
+		}
+	//
+	void					Reset()
+		{
+		for(int i=0,ni=cells.size();i<ni;++i)
+			{
+			Cell*	pc=cells[i];
+			cells[i]=0;
+			while(pc)
+				{
+				Cell*	pn=pc->next;
+				delete pc;
+				pc=pn;
+				}
+			}
+		voxelsz		=0.25;
+		puid		=0;
+		ncells		=0;
+		nprobes		=1;
+		nqueries	=1;
+		}
+	//
+	void					GarbageCollect(int lifetime=256)
+		{
+		const int life=puid-lifetime;
+		for(int i=0;i<cells.size();++i)
+			{
+			Cell*&	root=cells[i];
+			Cell*	pp=0;
+			Cell*	pc=root;
+			while(pc)
+				{
+				Cell*	pn=pc->next;
+				if(pc->puid<life)
+					{
+					if(pp) pp->next=pn; else root=pn;
+					delete pc;pc=pp;--ncells;
+					}
+				pp=pc;pc=pn;
+				}
+			}
+		//printf("GC[%d]: %d cells, PpQ: %f\r\n",puid,ncells,nprobes/(btScalar)nqueries);
+		nqueries=1;
+		nprobes=1;
+		++puid;	/* TODO: Reset puid's when int range limit is reached	*/ 
+				/* else setup a priority list...						*/ 
+		}
+	//
+	int						RemoveReferences(btCollisionShape* pcs)
+		{
+		int	refcount=0;
+		for(int i=0;i<cells.size();++i)
+			{
+			Cell*&	root=cells[i];
+			Cell*	pp=0;
+			Cell*	pc=root;
+			while(pc)
+				{
+				Cell*	pn=pc->next;
+				if(pc->pclient==pcs)
+					{
+					if(pp) pp->next=pn; else root=pn;
+					delete pc;pc=pp;++refcount;
+					}
+				pp=pc;pc=pn;
+				}
+			}
+		return(refcount);
+		}
+	//
+	btScalar				Evaluate(	const btVector3& x,
+										btCollisionShape* shape,
+										btVector3& normal,
+										btScalar margin)
+		{
+		/* Lookup cell			*/ 
+		const btVector3	scx=x/voxelsz;
+		const IntFrac	ix=Decompose(scx.x());
+		const IntFrac	iy=Decompose(scx.y());
+		const IntFrac	iz=Decompose(scx.z());
+		const unsigned	h=Hash(ix.b,iy.b,iz.b,shape);
+		Cell*&			root=cells[static_cast<int>(h%cells.size())];
+		Cell*			c=root;
+		++nqueries;
+		while(c)
+			{
+			++nprobes;
+			if(	(c->hash==h)	&&
+				(c->c[0]==ix.b)	&&
+				(c->c[1]==iy.b)	&&
+				(c->c[2]==iz.b)	&&
+				(c->pclient==shape))
+				{ break; }
+				else
+				{ c=c->next; }
+			}
+		if(!c)
+			{
+			++nprobes;		
+			++ncells;
+			c=new Cell();
+			c->next=root;root=c;
+			c->pclient=shape;
+			c->hash=h;
+			c->c[0]=ix.b;c->c[1]=iy.b;c->c[2]=iz.b;
+			BuildCell(*c);
+			}
+		c->puid=puid;
+		/* Extract infos		*/ 
+		const int		o[]={	ix.i,iy.i,iz.i};
+		const btScalar	d[]={	c->d[o[0]+0][o[1]+0][o[2]+0],
+								c->d[o[0]+1][o[1]+0][o[2]+0],
+								c->d[o[0]+1][o[1]+1][o[2]+0],
+								c->d[o[0]+0][o[1]+1][o[2]+0],
+								c->d[o[0]+0][o[1]+0][o[2]+1],
+								c->d[o[0]+1][o[1]+0][o[2]+1],
+								c->d[o[0]+1][o[1]+1][o[2]+1],
+								c->d[o[0]+0][o[1]+1][o[2]+1]};
+		/* Normal	*/ 
+		#if 1
+		const btScalar	gx[]={	d[1]-d[0],d[2]-d[3],
+								d[5]-d[4],d[6]-d[7]};
+		const btScalar	gy[]={	d[3]-d[0],d[2]-d[1],
+								d[7]-d[4],d[6]-d[5]};
+		const btScalar	gz[]={	d[4]-d[0],d[5]-d[1],
+								d[7]-d[3],d[6]-d[2]};
+		normal.setX(Lerp(	Lerp(gx[0],gx[1],iy.f),
+							Lerp(gx[2],gx[3],iy.f),iz.f));
+		normal.setY(Lerp(	Lerp(gy[0],gy[1],ix.f),
+							Lerp(gy[2],gy[3],ix.f),iz.f));
+		normal.setZ(Lerp(	Lerp(gz[0],gz[1],ix.f),
+							Lerp(gz[2],gz[3],ix.f),iy.f));
+		normal		=	normal.normalized();
+		#else
+		normal		=	btVector3(d[1]-d[0],d[3]-d[0],d[4]-d[0]).normalized();
+		#endif
+		/* Distance	*/ 
+		const btScalar	d0=Lerp(Lerp(d[0],d[1],ix.f),
+								Lerp(d[3],d[2],ix.f),iy.f);
+		const btScalar	d1=Lerp(Lerp(d[4],d[5],ix.f),
+								Lerp(d[7],d[6],ix.f),iy.f);
+		return(Lerp(d0,d1,iz.f)-margin);
+		}
+	//
+	void					BuildCell(Cell& c)
+		{
+		const btVector3	org=btVector3(	(btScalar)c.c[0],
+										(btScalar)c.c[1],
+										(btScalar)c.c[2])	*
+										CELLSIZE*voxelsz;
+		for(int k=0;k<=CELLSIZE;++k)
+			{
+			const btScalar	z=voxelsz*k+org.z();
+			for(int j=0;j<=CELLSIZE;++j)
+				{
+				const btScalar	y=voxelsz*j+org.y();
+				for(int i=0;i<=CELLSIZE;++i)
+					{
+					const btScalar	x=voxelsz*i+org.x();
+					c.d[i][j][k]=DistanceToShape(	btVector3(x,y,z),
+													c.pclient);
+					}
+				}
+			}
+		}
+	//
+	static inline btScalar	DistanceToShape(const btVector3& x,
+											btCollisionShape* shape)
+		{
+		btTransform	unit;
+		unit.setIdentity();
+		if(shape->isConvex())
+			{
+			btGjkEpaSolver2::sResults	res;
+			btConvexShape*				csh=static_cast<btConvexShape*>(shape);
+			return(btGjkEpaSolver2::SignedDistance(x,0,csh,unit,res));
+			}
+		return(0);
+		}
+	//
+	static inline IntFrac	Decompose(btScalar x)
+		{
+		/* That one need a lot of improvements...	*/
+		/* Remove test, faster floor...				*/ 
+		IntFrac			r;
+		x/=CELLSIZE;
+		const int		o=x<0?(int)(-x+1):0;
+		x+=o;r.b=(int)x;
+		const btScalar	k=(x-r.b)*CELLSIZE;
+		r.i=(int)k;r.f=k-r.i;r.b-=o;
+		return(r);
+		}
+	//
+	static inline btScalar	Lerp(btScalar a,btScalar b,btScalar t)
+		{
+		return(a+(b-a)*t);
+		}
+
+	
+
+	//
+	static inline unsigned int	Hash(int x,int y,int z,btCollisionShape* shape)
+		{
+		struct btS
+		{ 
+			int x,y,z;
+			void* p;
+		};
+
+		btS myset;
+		
+		myset.x=x;myset.y=y;myset.z=z;myset.p=shape;
+		const void* ptr = &myset;
+
+		unsigned int result = HsiehHash<sizeof(btS)/4> (ptr);
+		
+
+		return result;
+		}
+};
+	
+
+#endif
diff --git a/extern/bullet2/src/LinearMath/btAabbUtil2.h b/extern/bullet2/src/LinearMath/btAabbUtil2.h
index 429163c8138..8bb6b3af7c3 100644
--- a/extern/bullet2/src/LinearMath/btAabbUtil2.h
+++ b/extern/bullet2/src/LinearMath/btAabbUtil2.h
@@ -18,11 +18,16 @@ subject to the following restrictions:
 #define AABB_UTIL2
 
 #include "btVector3.h"
-#include "btSimdMinMax.h"
+#include "btMinMax.h"
 
-
-#define btMin(a,b) ((a < b ? a : b))
-#define btMax(a,b) ((a > b ? a : b))
+SIMD_FORCE_INLINE void AabbExpand (btVector3& aabbMin,
+								   btVector3& aabbMax,
+								   const btVector3& expansionMin,
+								   const btVector3& expansionMax)
+{
+	aabbMin = aabbMin + expansionMin;
+	aabbMax = aabbMax + expansionMax;
+}
 
 
 /// conservative test for overlap between two aabbs
@@ -67,6 +72,41 @@ SIMD_FORCE_INLINE int	btOutcode(const btVector3& p,const btVector3& halfExtent)
 }
 
 
+SIMD_FORCE_INLINE bool btRayAabb2(const btVector3& rayFrom,
+								  const btVector3& rayInvDirection,
+								  const unsigned int raySign[3],
+								  const btVector3 bounds[2],
+								  btScalar& tmin,
+								  btScalar lambda_min,
+								  btScalar lambda_max)
+{
+	btScalar tmax, tymin, tymax, tzmin, tzmax;
+	tmin = (bounds[raySign[0]][0] - rayFrom[0]) * rayInvDirection[0];
+	tmax = (bounds[1-raySign[0]][0] - rayFrom[0]) * rayInvDirection[0];
+	tymin = (bounds[raySign[1]][1] - rayFrom[1]) * rayInvDirection[1];
+	tymax = (bounds[1-raySign[1]][1] - rayFrom[1]) * rayInvDirection[1];
+
+	if ( (tmin > tymax) || (tymin > tmax) )
+		return false;
+
+	if (tymin > tmin)
+		tmin = tymin;
+
+	if (tymax < tmax)
+		tmax = tymax;
+
+	tzmin = (bounds[raySign[2]][2] - rayFrom[2]) * rayInvDirection[2];
+	tzmax = (bounds[1-raySign[2]][2] - rayFrom[2]) * rayInvDirection[2];
+
+	if ( (tmin > tzmax) || (tzmin > tmax) )
+		return false;
+	if (tzmin > tmin)
+		tmin = tzmin;
+	if (tzmax < tmax)
+		tmax = tzmax;
+	return ( (tmin < lambda_max) && (tmax > lambda_min) );
+}
+
 SIMD_FORCE_INLINE bool btRayAabb(const btVector3& rayFrom, 
 								 const btVector3& rayTo, 
 								 const btVector3& aabbMin, 
@@ -125,3 +165,4 @@ SIMD_FORCE_INLINE bool btRayAabb(const btVector3& rayFrom,
 
 #endif
 
+
diff --git a/extern/bullet2/src/LinearMath/btAlignedAllocator.cpp b/extern/bullet2/src/LinearMath/btAlignedAllocator.cpp
index 1f5877fa37e..e120289e061 100644
--- a/extern/bullet2/src/LinearMath/btAlignedAllocator.cpp
+++ b/extern/bullet2/src/LinearMath/btAlignedAllocator.cpp
@@ -15,56 +15,187 @@ subject to the following restrictions:
 
 #include "btAlignedAllocator.h"
 
+int gNumAlignedAllocs = 0;
+int gNumAlignedFree = 0;
+int gTotalBytesAlignedAllocs = 0;//detect memory leaks
 
-#if defined (BT_HAS_ALIGNED_ALOCATOR)
-
+#if defined (BT_HAS_ALIGNED_ALLOCATOR)
 #include <malloc.h>
-void*	btAlignedAlloc	(int size, int alignment)
+static void *btAlignedAllocDefault(size_t size, int alignment)
 {
-	return _aligned_malloc(size,alignment);
+	return _aligned_malloc(size, (size_t)alignment);
 }
 
-void	btAlignedFree	(void* ptr)
+static void btAlignedFreeDefault(void *ptr)
 {
 	_aligned_free(ptr);
 }
-
-#else
-
-#ifdef __CELLOS_LV2__
-
+#elif defined(__CELLOS_LV2__)
 #include <stdlib.h>
 
-int numAllocs = 0;
-int numFree = 0;
-
-void*	btAlignedAlloc	(int size, int alignment)
+static inline void *btAlignedAllocDefault(size_t size, int alignment)
 {
-	numAllocs++;
 	return memalign(alignment, size);
 }
 
-void	btAlignedFree	(void* ptr)
+static inline void btAlignedFreeDefault(void *ptr)
+{
+	free(ptr);
+}
+#else
+static inline void *btAlignedAllocDefault(size_t size, int alignment)
+{
+  void *ret;
+  char *real;
+  unsigned long offset;
+
+  real = (char *)malloc(size + sizeof(void *) + (alignment-1));
+  if (real) {
+    offset = (alignment - (unsigned long)(real + sizeof(void *))) & (alignment-1);
+    ret = (void *)((real + sizeof(void *)) + offset);
+    *((void **)(ret)-1) = (void *)(real);
+  } else {
+    ret = (void *)(real);
+  }
+  return (ret);
+}
+
+static inline void btAlignedFreeDefault(void *ptr)
+{
+  void* real;
+
+  if (ptr) {
+    real = *((void **)(ptr)-1);
+    free(real);
+  }
+}
+#endif
+
+static void *btAllocDefault(size_t size)
+{
+	return malloc(size);
+}
+
+static void btFreeDefault(void *ptr)
 {
-	numFree++;
 	free(ptr);
 }
 
+static btAlignedAllocFunc *sAlignedAllocFunc = btAlignedAllocDefault;
+static btAlignedFreeFunc *sAlignedFreeFunc = btAlignedFreeDefault;
+static btAllocFunc *sAllocFunc = btAllocDefault;
+static btFreeFunc *sFreeFunc = btFreeDefault;
+
+void btAlignedAllocSetCustomAligned(btAlignedAllocFunc *allocFunc, btAlignedFreeFunc *freeFunc)
+{
+  sAlignedAllocFunc = allocFunc ? allocFunc : btAlignedAllocDefault;
+  sAlignedFreeFunc = freeFunc ? freeFunc : btAlignedFreeDefault;
+}
+
+void btAlignedAllocSetCustom(btAllocFunc *allocFunc, btFreeFunc *freeFunc)
+{
+  sAllocFunc = allocFunc ? allocFunc : btAllocDefault;
+  sFreeFunc = freeFunc ? freeFunc : btFreeDefault;
+}
+
+#ifdef BT_DEBUG_MEMORY_ALLOCATIONS
+//this generic allocator provides the total allocated number of bytes
+#include <stdio.h>
+
+void*   btAlignedAllocInternal  (size_t size, int alignment,int line,char* filename)
+{
+ void *ret;
+ char *real;
+ unsigned long offset;
+
+ gTotalBytesAlignedAllocs += size;
+ gNumAlignedAllocs++;
+
+ 
+ real = (char *)sAllocFunc(size + 2*sizeof(void *) + (alignment-1));
+ if (real) {
+   offset = (alignment - (unsigned long)(real + 2*sizeof(void *))) &
+(alignment-1);
+   ret = (void *)((real + 2*sizeof(void *)) + offset);
+   *((void **)(ret)-1) = (void *)(real);
+       *((int*)(ret)-2) = size;
+
+ } else {
+   ret = (void *)(real);//??
+ }
+
+ printf("allocation#%d at address %x, from %s,line %d, size %d\n",gNumAlignedAllocs,real, filename,line,size);
+
+ int* ptr = (int*)ret;
+ *ptr = 12;
+ return (ret);
+}
+
+void    btAlignedFreeInternal   (void* ptr,int line,char* filename)
+{
+
+ void* real;
+ gNumAlignedFree++;
+
+ if (ptr) {
+   real = *((void **)(ptr)-1);
+       int size = *((int*)(ptr)-2);
+       gTotalBytesAlignedAllocs -= size;
+
+	   printf("free #%d at address %x, from %s,line %d, size %d\n",gNumAlignedFree,real, filename,line,size);
+
+   sFreeFunc(real);
+ } else
+ {
+	 printf("NULL ptr\n");
+ }
+}
+
+#else //BT_DEBUG_MEMORY_ALLOCATIONS
+
+void*	btAlignedAllocInternal	(size_t size, int alignment)
+{
+	gNumAlignedAllocs++;
+  void* ptr;
+#if defined (BT_HAS_ALIGNED_ALLOCATOR) || defined(__CELLOS_LV2__)
+	ptr = sAlignedAllocFunc(size, alignment);
 #else
-///todo
-///will add some multi-platform version that works without _aligned_malloc/_aligned_free
+  char *real;
+  unsigned long offset;
 
-void*	btAlignedAlloc	(int size, int alignment)
-{
-	return new char[size];
+  real = (char *)sAllocFunc(size + sizeof(void *) + (alignment-1));
+  if (real) {
+    offset = (alignment - (unsigned long)(real + sizeof(void *))) & (alignment-1);
+    ptr = (void *)((real + sizeof(void *)) + offset);
+    *((void **)(ptr)-1) = (void *)(real);
+  } else {
+    ptr = (void *)(real);
+  }
+#endif  // defined (BT_HAS_ALIGNED_ALLOCATOR) || defined(__CELLOS_LV2__)
+//	printf("btAlignedAllocInternal %d, %x\n",size,ptr);
+	return ptr;
 }
 
-void	btAlignedFree	(void* ptr)
+void	btAlignedFreeInternal	(void* ptr)
 {
-	delete [] (char*) ptr;
+	if (!ptr)
+	{
+		return;
+	}
+
+	gNumAlignedFree++;
+//	printf("btAlignedFreeInternal %x\n",ptr);
+#if defined (BT_HAS_ALIGNED_ALLOCATOR) || defined(__CELLOS_LV2__)
+	sAlignedFreeFunc(ptr);
+#else
+  void* real;
+
+  if (ptr) {
+    real = *((void **)(ptr)-1);
+    sFreeFunc(real);
+  }
+#endif  // defined (BT_HAS_ALIGNED_ALLOCATOR) || defined(__CELLOS_LV2__)
 }
-#endif //
-
-#endif
 
+#endif //BT_DEBUG_MEMORY_ALLOCATIONS
 
diff --git a/extern/bullet2/src/LinearMath/btAlignedAllocator.h b/extern/bullet2/src/LinearMath/btAlignedAllocator.h
index 07585717f45..a252f324d77 100644
--- a/extern/bullet2/src/LinearMath/btAlignedAllocator.h
+++ b/extern/bullet2/src/LinearMath/btAlignedAllocator.h
@@ -21,15 +21,39 @@ subject to the following restrictions:
 ///that is better portable and more predictable
 
 #include "btScalar.h"
+//#define BT_DEBUG_MEMORY_ALLOCATIONS 1
+#ifdef BT_DEBUG_MEMORY_ALLOCATIONS
 
-void*	btAlignedAlloc	(int size, int alignment);
+#define btAlignedAlloc(a,b) \
+		btAlignedAllocInternal(a,b,__LINE__,__FILE__)
 
-void	btAlignedFree	(void* ptr);
+#define btAlignedFree(ptr) \
+		btAlignedFreeInternal(ptr,__LINE__,__FILE__)
 
+void*	btAlignedAllocInternal	(size_t size, int alignment,int line,char* filename);
 
+void	btAlignedFreeInternal	(void* ptr,int line,char* filename);
+
+#else
+	void*	btAlignedAllocInternal	(size_t size, int alignment);
+	void	btAlignedFreeInternal	(void* ptr);
+
+	#define btAlignedAlloc(a,b) btAlignedAllocInternal(a,b)
+	#define btAlignedFree(ptr) btAlignedFreeInternal(ptr)
+
+#endif
 typedef int	size_type;
 
+typedef void *(btAlignedAllocFunc)(size_t size, int alignment);
+typedef void (btAlignedFreeFunc)(void *memblock);
+typedef void *(btAllocFunc)(size_t size);
+typedef void (btFreeFunc)(void *memblock);
 
+void btAlignedAllocSetCustomAligned(btAlignedAllocFunc *allocFunc, btAlignedFreeFunc *freeFunc);
+void btAlignedAllocSetCustom(btAllocFunc *allocFunc, btFreeFunc *freeFunc);
+
+///The btAlignedAllocator is a portable class for aligned memory allocations.
+///Default implementations for unaligned and aligned allocations can be overridden by a custom allocator using btAlignedAllocSetCustom and btAlignedAllocSetCustomAligned.
 template < typename T , unsigned Alignment >
 class btAlignedAllocator {
 	
diff --git a/extern/bullet2/src/LinearMath/btAlignedObjectArray.h b/extern/bullet2/src/LinearMath/btAlignedObjectArray.h
index 8bef5eb5d06..5598f0d7236 100644
--- a/extern/bullet2/src/LinearMath/btAlignedObjectArray.h
+++ b/extern/bullet2/src/LinearMath/btAlignedObjectArray.h
@@ -39,8 +39,8 @@ subject to the following restrictions:
 #endif //BT_USE_PLACEMENT_NEW
 
 
-///btAlignedObjectArray uses a subset of the stl::vector interface for its methods
-///It is developed to replace stl::vector to avoid STL alignment issues to add SIMD/SSE data
+///The btAlignedObjectArray template class uses a subset of the stl::vector interface for its methods
+///It is developed to replace stl::vector to avoid portability issues, including STL alignment issues to add SIMD/SSE data
 template <typename T> 
 //template <class T> 
 class btAlignedObjectArray
@@ -50,6 +50,8 @@ class btAlignedObjectArray
 	int					m_size;
 	int					m_capacity;
 	T*					m_data;
+	//PCK: added this line
+	bool				m_ownsMemory;
 
 	protected:
 		SIMD_FORCE_INLINE	int	allocSize(int size)
@@ -69,6 +71,8 @@ class btAlignedObjectArray
 
 		SIMD_FORCE_INLINE	void	init()
 		{
+			//PCK: added this line
+			m_ownsMemory = true;
 			m_data = 0;
 			m_size = 0;
 			m_capacity = 0;
@@ -92,7 +96,11 @@ class btAlignedObjectArray
 		SIMD_FORCE_INLINE	void	deallocate()
 		{
 			if(m_data)	{
-				m_allocator.deallocate(m_data);
+				//PCK: enclosed the deallocation in this block
+				if (m_ownsMemory)
+				{
+					m_allocator.deallocate(m_data);
+				}
 				m_data = 0;
 			}
 		}
@@ -223,6 +231,9 @@ class btAlignedObjectArray
 				destroy(0,size());
 
 				deallocate();
+				
+				//PCK: added this line
+				m_ownsMemory = true;
 
 				m_data = s;
 				
@@ -242,6 +253,46 @@ class btAlignedObjectArray
 				}
 		};
 	
+		template <typename L>
+		void quickSortInternal(L CompareFunc,int lo, int hi)
+		{
+		//  lo is the lower index, hi is the upper index
+		//  of the region of array a that is to be sorted
+			int i=lo, j=hi;
+			T x=m_data[(lo+hi)/2];
+
+			//  partition
+			do
+			{    
+				while (CompareFunc(m_data[i],x)) 
+					i++; 
+				while (CompareFunc(x,m_data[j])) 
+					j--;
+				if (i<=j)
+				{
+					swap(i,j);
+					i++; j--;
+				}
+			} while (i<=j);
+
+			//  recursion
+			if (lo<j) 
+				quickSortInternal( CompareFunc, lo, j);
+			if (i<hi) 
+				quickSortInternal( CompareFunc, i, hi);
+		}
+
+
+		template <typename L>
+		void quickSort(L CompareFunc)
+		{
+			//don't sort 0 or 1 elements
+			if (size()>1)
+			{
+				quickSortInternal(CompareFunc,0,size()-1);
+			}
+		}
+
 
 		///heap sort from http://www.csse.monash.edu.au/~lloyd/tildeAlgDS/Sort/Heap/
 		template <typename L>
@@ -360,8 +411,16 @@ class btAlignedObjectArray
 		}
 	}
 
+	//PCK: whole function
+	void initializeFromBuffer(void *buffer, int size, int capacity)
+	{
+		clear();
+		m_ownsMemory = false;
+		m_data = (T*)buffer;
+		m_size = size;
+		m_capacity = capacity;
+	}
+
 };
 
 #endif //BT_OBJECT_ARRAY__
-
-
diff --git a/extern/bullet2/src/LinearMath/btDefaultMotionState.h b/extern/bullet2/src/LinearMath/btDefaultMotionState.h
index d4ec8e8879c..d758f77ed81 100644
--- a/extern/bullet2/src/LinearMath/btDefaultMotionState.h
+++ b/extern/bullet2/src/LinearMath/btDefaultMotionState.h
@@ -1,7 +1,7 @@
 #ifndef DEFAULT_MOTION_STATE_H
 #define DEFAULT_MOTION_STATE_H
 
-///btDefaultMotionState provides a common implementation to synchronize world transforms with offsets
+///The btDefaultMotionState provides a common implementation to synchronize world transforms with offsets.
 struct	btDefaultMotionState : public btMotionState
 {
 	btTransform m_graphicsWorldTrans;
diff --git a/extern/bullet2/src/LinearMath/btGeometryUtil.cpp b/extern/bullet2/src/LinearMath/btGeometryUtil.cpp
index 3d0fb122a6b..5ac230f712f 100644
--- a/extern/bullet2/src/LinearMath/btGeometryUtil.cpp
+++ b/extern/bullet2/src/LinearMath/btGeometryUtil.cpp
@@ -22,7 +22,12 @@ subject to the following restrictions:
   can be used by probes that are checking whether the
   library is actually installed.
 */
-extern "C" void btBulletMathProbe () {}
+extern "C"
+{	
+	void btBulletMathProbe ();
+
+	void btBulletMathProbe () {}
+}
 
 
 bool	btGeometryUtil::isPointInsidePlanes(const btAlignedObjectArray<btVector3>& planeEquations, const btVector3& point, btScalar	margin)
@@ -57,6 +62,8 @@ bool	btGeometryUtil::areVerticesBehindPlane(const btVector3& planeNormal, const
 	return true;
 }
 
+bool notExist(const btVector3& planeEquation,const btAlignedObjectArray<btVector3>& planeEquations);
+
 bool notExist(const btVector3& planeEquation,const btAlignedObjectArray<btVector3>& planeEquations)
 {
 	int numbrushes = planeEquations.size();
diff --git a/extern/bullet2/src/LinearMath/btGeometryUtil.h b/extern/bullet2/src/LinearMath/btGeometryUtil.h
index 766cd75c383..a4b13b45609 100644
--- a/extern/bullet2/src/LinearMath/btGeometryUtil.h
+++ b/extern/bullet2/src/LinearMath/btGeometryUtil.h
@@ -19,6 +19,7 @@ subject to the following restrictions:
 #include "btVector3.h"
 #include "btAlignedObjectArray.h"
 
+///The btGeometryUtil helper class provides a few methods to convert between plane equations and vertices.
 class btGeometryUtil
 {
 	public:
diff --git a/extern/bullet2/src/LinearMath/btIDebugDraw.h b/extern/bullet2/src/LinearMath/btIDebugDraw.h
index 5f40ca39157..563615a9a32 100644
--- a/extern/bullet2/src/LinearMath/btIDebugDraw.h
+++ b/extern/bullet2/src/LinearMath/btIDebugDraw.h
@@ -31,6 +31,9 @@ DEALINGS IN THE SOFTWARE.
 #include "btVector3.h"
 
 
+///The btIDebugDraw interface class allows hooking up a debug renderer to visually debug simulations.
+///Typical use case: create a debug drawer object, and assign it to a btCollisionWorld or btDynamicsWorld using setDebugDrawer and call debugDrawWorld.
+///A class that implements the btIDebugDraw interface has to implement the drawLine method at a minimum.
 class	btIDebugDraw
 {
 	public:
@@ -55,11 +58,24 @@ class	btIDebugDraw
 	virtual ~btIDebugDraw() {};
 
 	virtual void	drawLine(const btVector3& from,const btVector3& to,const btVector3& color)=0;
+	
+	virtual	void	drawTriangle(const btVector3& v0,const btVector3& v1,const btVector3& v2,const btVector3& /*n0*/,const btVector3& /*n1*/,const btVector3& /*n2*/,const btVector3& color, btScalar alpha)
+	{
+		drawTriangle(v0,v1,v2,color,alpha);
+	}
+	virtual	void	drawTriangle(const btVector3& v0,const btVector3& v1,const btVector3& v2,const btVector3& color, btScalar /*alpha*/)
+	{
+		drawLine(v0,v1,color);
+		drawLine(v1,v2,color);
+		drawLine(v2,v0,color);
+	}
 
 	virtual void	drawContactPoint(const btVector3& PointOnB,const btVector3& normalOnB,btScalar distance,int lifeTime,const btVector3& color)=0;
 
 	virtual void	reportErrorWarning(const char* warningString) = 0;
 
+	virtual void	draw3dText(const btVector3& location,const char* textString) = 0;
+	
 	virtual void	setDebugMode(int debugMode) =0;
 	
 	virtual int		getDebugMode() const = 0;
diff --git a/extern/bullet2/src/LinearMath/btMatrix3x3.h b/extern/bullet2/src/LinearMath/btMatrix3x3.h
index 94f53c3c0a5..ca1a801402f 100644
--- a/extern/bullet2/src/LinearMath/btMatrix3x3.h
+++ b/extern/bullet2/src/LinearMath/btMatrix3x3.h
@@ -22,6 +22,9 @@ subject to the following restrictions:
 #include "btQuaternion.h"
 
 
+
+///The btMatrix3x3 class implements a 3x3 rotation matrix, to perform linear algebra in combination with btQuaternion, btTransform and btVector3.
+///Make sure to only include a pure orthogonal matrix without scaling.
 class btMatrix3x3 {
 	public:
 		btMatrix3x3 () {}
@@ -356,7 +359,7 @@ class btMatrix3x3 {
 			m_el[0].y() * m[0].z() + m_el[1].y() * m[1].z() + m_el[2].y() * m[2].z(),
 			m_el[0].z() * m[0].x() + m_el[1].z() * m[1].x() + m_el[2].z() * m[2].x(),
 			m_el[0].z() * m[0].y() + m_el[1].z() * m[1].y() + m_el[2].z() * m[2].y(),
-			m_el[0].z() * m[0].z() + m_el[1].z() * m[1].z() + m_el[2].z() * m[2].x());
+			m_el[0].z() * m[0].z() + m_el[1].z() * m[1].z() + m_el[2].z() * m[2].z());
 	}
 	
 	SIMD_FORCE_INLINE btMatrix3x3 
@@ -406,5 +409,11 @@ class btMatrix3x3 {
 }
 */
 
+SIMD_FORCE_INLINE bool operator==(const btMatrix3x3& m1, const btMatrix3x3& m2)
+{
+   return ( m1[0][0] == m2[0][0] && m1[1][0] == m2[1][0] && m1[2][0] == m2[2][0] &&
+            m1[0][1] == m2[0][1] && m1[1][1] == m2[1][1] && m1[2][1] == m2[2][1] &&
+            m1[0][2] == m2[0][2] && m1[1][2] == m2[1][2] && m1[2][2] == m2[2][2] );
+}
 
 #endif
diff --git a/extern/bullet2/src/LinearMath/btMinMax.h b/extern/bullet2/src/LinearMath/btMinMax.h
index 1b8a3633f38..5e27d62a4a4 100644
--- a/extern/bullet2/src/LinearMath/btMinMax.h
+++ b/extern/bullet2/src/LinearMath/btMinMax.h
@@ -18,15 +18,15 @@ subject to the following restrictions:
 #define GEN_MINMAX_H
 
 template <class T>
-SIMD_FORCE_INLINE const T& GEN_min(const T& a, const T& b) 
+SIMD_FORCE_INLINE const T& btMin(const T& a, const T& b) 
 {
-  return b < a ? b : a;
+  return a < b ? a : b ;
 }
 
 template <class T>
-SIMD_FORCE_INLINE const T& GEN_max(const T& a, const T& b) 
+SIMD_FORCE_INLINE const T& btMax(const T& a, const T& b) 
 {
-  return  a < b ? b : a;
+  return  a > b ? a : b;
 }
 
 template <class T>
@@ -36,7 +36,7 @@ SIMD_FORCE_INLINE const T& GEN_clamped(const T& a, const T& lb, const T& ub)
 }
 
 template <class T>
-SIMD_FORCE_INLINE void GEN_set_min(T& a, const T& b) 
+SIMD_FORCE_INLINE void btSetMin(T& a, const T& b) 
 {
     if (b < a) 
 	{
@@ -45,7 +45,7 @@ SIMD_FORCE_INLINE void GEN_set_min(T& a, const T& b)
 }
 
 template <class T>
-SIMD_FORCE_INLINE void GEN_set_max(T& a, const T& b) 
+SIMD_FORCE_INLINE void btSetMax(T& a, const T& b) 
 {
     if (a < b) 
 	{
diff --git a/extern/bullet2/src/LinearMath/btMotionState.h b/extern/bullet2/src/LinearMath/btMotionState.h
index 1975e5ff900..94318140902 100644
--- a/extern/bullet2/src/LinearMath/btMotionState.h
+++ b/extern/bullet2/src/LinearMath/btMotionState.h
@@ -18,7 +18,7 @@ subject to the following restrictions:
 
 #include "btTransform.h"
 
-///btMotionState allows the dynamics world to synchronize the updated world transforms with graphics
+///The btMotionState interface class allows the dynamics world to synchronize and interpolate the updated world transforms with graphics
 ///For optimizations, potentially only moving objects get synchronized (using setWorldPosition/setWorldOrientation)
 class	btMotionState
 {
diff --git a/extern/bullet2/src/LinearMath/btQuadWord.h b/extern/bullet2/src/LinearMath/btQuadWord.h
index 961ac484d20..2e80fc2ca47 100644
--- a/extern/bullet2/src/LinearMath/btQuadWord.h
+++ b/extern/bullet2/src/LinearMath/btQuadWord.h
@@ -17,19 +17,31 @@ subject to the following restrictions:
 #define SIMD_QUADWORD_H
 
 #include "btScalar.h"
+#include "btMinMax.h"
+#include <math.h>
 
 
 
+///The btQuadWordStorage class is base class for btVector3 and btQuaternion. 
+///Some issues under PS3 Linux with IBM 2.1 SDK, gcc compiler prevent from using aligned quadword. todo: look into this
+///ATTRIBUTE_ALIGNED16(class) btQuadWordStorage
+class btQuadWordStorage
+{
+protected:
+
+	btScalar	m_x;
+	btScalar	m_y;
+	btScalar	m_z;
+	btScalar	m_unusedW;
+
+public:
+
+};
+
 
 ///btQuadWord is base-class for vectors, points
-class	btQuadWord
+class	btQuadWord : public btQuadWordStorage
 {
-	protected:
-		btScalar	m_x;
-		btScalar	m_y;
-		btScalar	m_z;
-		btScalar	m_unusedW;
-
 	public:
 	
 //		SIMD_FORCE_INLINE btScalar&       operator[](int i)       { return (&m_x)[i];	}      
@@ -61,6 +73,8 @@ class	btQuadWord
 		SIMD_FORCE_INLINE	operator       btScalar *()       { return &m_x; }
 		SIMD_FORCE_INLINE	operator const btScalar *() const { return &m_x; }
 
+
+
 		SIMD_FORCE_INLINE void 	setValue(const btScalar& x, const btScalar& y, const btScalar& z)
 		{
 			m_x=x;
@@ -89,47 +103,36 @@ class	btQuadWord
 		{
 		}
 
-		SIMD_FORCE_INLINE btQuadWord(const btScalar& x, const btScalar& y, const btScalar& z) 
-		:m_x(x),m_y(y),m_z(z)
-		//todo, remove this in release/simd ?
-		,m_unusedW(btScalar(0.))
+		SIMD_FORCE_INLINE btQuadWord(const btQuadWordStorage& q)
 		{
+			*((btQuadWordStorage*)this) = q;
+		}
+
+		SIMD_FORCE_INLINE btQuadWord(const btScalar& x, const btScalar& y, const btScalar& z)		
+		{
+			m_x = x, m_y = y, m_z = z, m_unusedW = 0.0f;
 		}
 
 		SIMD_FORCE_INLINE btQuadWord(const btScalar& x, const btScalar& y, const btScalar& z,const btScalar& w) 
-			:m_x(x),m_y(y),m_z(z),m_unusedW(w)
 		{
+			m_x = x, m_y = y, m_z = z, m_unusedW = w;
 		}
 
 
 		SIMD_FORCE_INLINE void	setMax(const btQuadWord& other)
 		{
-			if (other.m_x > m_x)
-				m_x = other.m_x;
-
-			if (other.m_y > m_y)
-				m_y = other.m_y;
-
-			if (other.m_z > m_z)
-				m_z = other.m_z;
-
-			if (other.m_unusedW > m_unusedW)
-				m_unusedW = other.m_unusedW;
+			btSetMax(m_x, other.m_x);
+			btSetMax(m_y, other.m_y);
+			btSetMax(m_z, other.m_z);
+			btSetMax(m_unusedW, other.m_unusedW);
 		}
 
 		SIMD_FORCE_INLINE void	setMin(const btQuadWord& other)
 		{
-			if (other.m_x < m_x)
-				m_x = other.m_x;
-
-			if (other.m_y < m_y)
-				m_y = other.m_y;
-
-			if (other.m_z < m_z)
-				m_z = other.m_z;
-
-			if (other.m_unusedW < m_unusedW)
-				m_unusedW = other.m_unusedW;
+			btSetMin(m_x, other.m_x);
+			btSetMin(m_y, other.m_y);
+			btSetMin(m_z, other.m_z);
+			btSetMin(m_unusedW, other.m_unusedW);
 		}
 
 
diff --git a/extern/bullet2/src/LinearMath/btQuaternion.h b/extern/bullet2/src/LinearMath/btQuaternion.h
index 50334970ba6..264751b33e7 100644
--- a/extern/bullet2/src/LinearMath/btQuaternion.h
+++ b/extern/bullet2/src/LinearMath/btQuaternion.h
@@ -19,6 +19,7 @@ subject to the following restrictions:
 
 #include "btVector3.h"
 
+///The btQuaternion implements quaternion to perform linear algebra rotations in combination with btMatrix3x3, btVector3 and btTransform.
 class btQuaternion : public btQuadWord {
 public:
 	btQuaternion() {}
@@ -158,7 +159,7 @@ public:
 
 	btQuaternion inverse() const
 	{
-		return btQuaternion(m_x, m_y, m_z, -m_unusedW);
+		return btQuaternion(-m_x, -m_y, -m_z, m_unusedW);
 	}
 
 	SIMD_FORCE_INLINE btQuaternion
@@ -285,7 +286,7 @@ slerp(const btQuaternion& q1, const btQuaternion& q2, const btScalar& t)
 }
 
 SIMD_FORCE_INLINE btVector3 
-quatRotate(btQuaternion& rotation, btVector3& v) 
+quatRotate(const btQuaternion& rotation, const btVector3& v) 
 {
 	btQuaternion q = rotation * v;
 	q *= rotation.inverse();
@@ -293,7 +294,7 @@ quatRotate(btQuaternion& rotation, btVector3& v)
 }
 
 SIMD_FORCE_INLINE btQuaternion 
-shortestArcQuat(btVector3& v0,btVector3& v1) // Game Programming Gems 2.10. make sure v0,v1 are normalized
+shortestArcQuat(const btVector3& v0, const btVector3& v1) // Game Programming Gems 2.10. make sure v0,v1 are normalized
 {
 	btVector3 c = v0.cross(v1);
 	btScalar  d = v0.dot(v1);
@@ -308,7 +309,7 @@ shortestArcQuat(btVector3& v0,btVector3& v1) // Game Programming Gems 2.10. make
 }
 
 SIMD_FORCE_INLINE btQuaternion 
-shortestArcQuatNormalize(btVector3& v0,btVector3& v1)
+shortestArcQuatNormalize2(btVector3& v0,btVector3& v1)
 {
 	v0.normalize();
 	v1.normalize();
@@ -319,3 +320,4 @@ shortestArcQuatNormalize(btVector3& v0,btVector3& v1)
 
 
 
+
diff --git a/extern/bullet2/src/LinearMath/btQuickprof.cpp b/extern/bullet2/src/LinearMath/btQuickprof.cpp
index 37a0c8c3be5..e5b1196149b 100644
--- a/extern/bullet2/src/LinearMath/btQuickprof.cpp
+++ b/extern/bullet2/src/LinearMath/btQuickprof.cpp
@@ -1,38 +1,282 @@
 /*
-Copyright (c) 2006 Tyler Streeter
 
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-
-*/
-
-
-// Please visit the project website (http://quickprof.sourceforge.net) 
-// for usage instructions.
+/***************************************************************************************************
+**
+** profile.cpp
+**
+** Real-Time Hierarchical Profiling for Game Programming Gems 3
+**
+** by Greg Hjelstrom & Byon Garrabrant
+**
+***************************************************************************************************/
 
 // Credits: The Clock class was inspired by the Timer classes in 
 // Ogre (www.ogre3d.org).
 
 #include "LinearMath/btQuickprof.h"
 
-#ifdef USE_QUICKPROF
 
-// Note: We must declare these private static variables again here to 
-// avoid link errors.
-bool btProfiler::mEnabled = false;
-btClock btProfiler::mClock;
-unsigned long int btProfiler::mCurrentCycleStartMicroseconds = 0;
-unsigned long int btProfiler::mLastCycleDurationMicroseconds = 0;
-std::map<std::string, hidden::ProfileBlock*> btProfiler::mProfileBlocks;
-std::ofstream btProfiler::mOutputFile;
-bool btProfiler::mFirstFileOutput = true;
-btProfiler::BlockTimingMethod btProfiler::mFileOutputMethod;
-unsigned long int btProfiler::mCycleNumber = 0;
-#endif //USE_QUICKPROF
+#ifdef USE_BT_CLOCK
+
+static btClock gProfileClock;
+
+inline void Profile_Get_Ticks(unsigned long int * ticks)
+{
+	*ticks = gProfileClock.getTimeMicroseconds();
+}
+
+inline float Profile_Get_Tick_Rate(void)
+{
+//	return 1000000.f;
+	return 1000.f;
+
+}
+
+
+
+/***************************************************************************************************
+**
+** CProfileNode
+**
+***************************************************************************************************/
+
+/***********************************************************************************************
+ * INPUT:                                                                                      *
+ * name - pointer to a static string which is the name of this profile node                    *
+ * parent - parent pointer                                                                     *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ * The name is assumed to be a static pointer, only the pointer is stored and compared for     *
+ * efficiency reasons.                                                                         *
+ *=============================================================================================*/
+CProfileNode::CProfileNode( const char * name, CProfileNode * parent ) :
+	Name( name ),
+	TotalCalls( 0 ),
+	TotalTime( 0 ),
+	StartTime( 0 ),
+	RecursionCounter( 0 ),
+	Parent( parent ),
+	Child( NULL ),
+	Sibling( NULL )
+{
+	Reset();
+}
+
+
+void	CProfileNode::CleanupMemory()
+{
+	delete ( Child);
+	Child = NULL;
+	delete ( Sibling);
+	Sibling = NULL;
+}
+
+CProfileNode::~CProfileNode( void )
+{
+	delete ( Child);
+	delete ( Sibling);
+}
+
+
+/***********************************************************************************************
+ * INPUT:                                                                                      *
+ * name - static string pointer to the name of the node we are searching for                   *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ * All profile names are assumed to be static strings so this function uses pointer compares   *
+ * to find the named node.                                                                     *
+ *=============================================================================================*/
+CProfileNode * CProfileNode::Get_Sub_Node( const char * name )
+{
+	// Try to find this sub node
+	CProfileNode * child = Child;
+	while ( child ) {
+		if ( child->Name == name ) {
+			return child;
+		}
+		child = child->Sibling;
+	}
+
+	// We didn't find it, so add it
+	
+	CProfileNode * node = new CProfileNode( name, this );
+	node->Sibling = Child;
+	Child = node;
+	return node;
+}
+
+
+void	CProfileNode::Reset( void )
+{
+	TotalCalls = 0;
+	TotalTime = 0.0f;
+	gProfileClock.reset();
+
+	if ( Child ) {
+		Child->Reset();
+	}
+	if ( Sibling ) {
+		Sibling->Reset();
+	}
+}
+
+
+void	CProfileNode::Call( void )
+{
+	TotalCalls++;
+	if (RecursionCounter++ == 0) {
+		Profile_Get_Ticks(&StartTime);
+	}
+}
+
+
+bool	CProfileNode::Return( void )
+{
+	if ( --RecursionCounter == 0 && TotalCalls != 0 ) { 
+		unsigned long int time;
+		Profile_Get_Ticks(&time);
+		time-=StartTime;
+		TotalTime += (float)time / Profile_Get_Tick_Rate();
+	}
+	return ( RecursionCounter == 0 );
+}
+
+
+/***************************************************************************************************
+**
+** CProfileIterator
+**
+***************************************************************************************************/
+CProfileIterator::CProfileIterator( CProfileNode * start )
+{
+	CurrentParent = start;
+	CurrentChild = CurrentParent->Get_Child();
+}
+
+
+void	CProfileIterator::First(void)
+{
+	CurrentChild = CurrentParent->Get_Child();
+}
+
+
+void	CProfileIterator::Next(void)
+{
+	CurrentChild = CurrentChild->Get_Sibling();
+}
+
+
+bool	CProfileIterator::Is_Done(void)
+{
+	return CurrentChild == NULL;
+}
+
+
+void	CProfileIterator::Enter_Child( int index )
+{
+	CurrentChild = CurrentParent->Get_Child();
+	while ( (CurrentChild != NULL) && (index != 0) ) {
+		index--;
+		CurrentChild = CurrentChild->Get_Sibling();
+	}
+
+	if ( CurrentChild != NULL ) {
+		CurrentParent = CurrentChild;
+		CurrentChild = CurrentParent->Get_Child();
+	}
+}
+
+
+void	CProfileIterator::Enter_Parent( void )
+{
+	if ( CurrentParent->Get_Parent() != NULL ) {
+		CurrentParent = CurrentParent->Get_Parent();
+	}
+	CurrentChild = CurrentParent->Get_Child();
+}
+
+
+/***************************************************************************************************
+**
+** CProfileManager
+**
+***************************************************************************************************/
+
+CProfileNode	CProfileManager::Root( "Root", NULL );
+CProfileNode *	CProfileManager::CurrentNode = &CProfileManager::Root;
+int				CProfileManager::FrameCounter = 0;
+unsigned long int			CProfileManager::ResetTime = 0;
+
+
+/***********************************************************************************************
+ * CProfileManager::Start_Profile -- Begin a named profile                                    *
+ *                                                                                             *
+ * Steps one level deeper into the tree, if a child already exists with the specified name     *
+ * then it accumulates the profiling; otherwise a new child node is added to the profile tree. *
+ *                                                                                             *
+ * INPUT:                                                                                      *
+ * name - name of this profiling record                                                        *
+ *                                                                                             *
+ * WARNINGS:                                                                                   *
+ * The string used is assumed to be a static string; pointer compares are used throughout      *
+ * the profiling code for efficiency.                                                          *
+ *=============================================================================================*/
+void	CProfileManager::Start_Profile( const char * name )
+{
+	if (name != CurrentNode->Get_Name()) {
+		CurrentNode = CurrentNode->Get_Sub_Node( name );
+	} 
+	
+	CurrentNode->Call();
+}
+
+
+/***********************************************************************************************
+ * CProfileManager::Stop_Profile -- Stop timing and record the results.                       *
+ *=============================================================================================*/
+void	CProfileManager::Stop_Profile( void )
+{
+	// Return will indicate whether we should back up to our parent (we may
+	// be profiling a recursive function)
+	if (CurrentNode->Return()) {
+		CurrentNode = CurrentNode->Get_Parent();
+	}
+}
+
+
+/***********************************************************************************************
+ * CProfileManager::Reset -- Reset the contents of the profiling system                       *
+ *                                                                                             *
+ *    This resets everything except for the tree structure.  All of the timing data is reset.  *
+ *=============================================================================================*/
+void	CProfileManager::Reset( void )
+{ 
+	Root.Reset();
+    Root.Call();
+	FrameCounter = 0;
+	Profile_Get_Ticks(&ResetTime);
+}
+
+
+/***********************************************************************************************
+ * CProfileManager::Increment_Frame_Counter -- Increment the frame counter                    *
+ *=============================================================================================*/
+void CProfileManager::Increment_Frame_Counter( void )
+{
+	FrameCounter++;
+}
+
+
+/***********************************************************************************************
+ * CProfileManager::Get_Time_Since_Reset -- returns the elapsed time since last reset         *
+ *=============================================================================================*/
+float CProfileManager::Get_Time_Since_Reset( void )
+{
+	unsigned long int time;
+	Profile_Get_Ticks(&time);
+	time -= ResetTime;
+	return (float)time / Profile_Get_Tick_Rate();
+}
+
+#endif //USE_BT_CLOCK
+
diff --git a/extern/bullet2/src/LinearMath/btQuickprof.h b/extern/bullet2/src/LinearMath/btQuickprof.h
index a885967c5fa..b033940ca5c 100644
--- a/extern/bullet2/src/LinearMath/btQuickprof.h
+++ b/extern/bullet2/src/LinearMath/btQuickprof.h
@@ -1,20 +1,11 @@
-/*
-Copyright (c) 2006 Tyler Streeter
 
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-
-*/
-	
-// Please visit the project website (http://quickprof.sourceforge.net) 
-// for usage instructions.
+/***************************************************************************************************
+**
+** Real-Time Hierarchical Profiling for Game Programming Gems 3
+**
+** by Greg Hjelstrom & Byon Garrabrant
+**
+***************************************************************************************************/
 
 // Credits: The Clock class was inspired by the Timer classes in 
 // Ogre (www.ogre3d.org).
@@ -23,9 +14,10 @@ subject to the following restrictions:
 #define QUICK_PROF_H
 
 #include "btScalar.h"
-
-//#define USE_QUICKPROF 1
-//Don't use quickprof for now, because it contains STL. TODO: replace STL by Bullet container classes.
+#include "LinearMath/btAlignedAllocator.h"
+#include <new>
+//To disable built-in profiling, please comment out next line
+//#define BT_NO_PROFILE 1
 
 
 //if you don't need btClock, you can comment next line
@@ -34,678 +26,332 @@ subject to the following restrictions:
 #ifdef USE_BT_CLOCK
 #ifdef __CELLOS_LV2__
 #include <sys/sys_time.h>
+#include <sys/time_util.h>
 #include <stdio.h>
-typedef uint64_t __int64;
 #endif
 
 #if defined (SUNOS) || defined (__SUNOS__) 
-        #include <stdio.h> 
+#include <stdio.h> 
 #endif
 
 #if defined(WIN32) || defined(_WIN32)
 
- #define USE_WINDOWS_TIMERS 
-   #define WIN32_LEAN_AND_MEAN 
-   #define NOWINRES 
-   #define NOMCX 
-   #define NOIME 
+#define USE_WINDOWS_TIMERS 
+#define WIN32_LEAN_AND_MEAN 
+#define NOWINRES 
+#define NOMCX 
+#define NOIME 
 #ifdef _XBOX
-	#include <Xtl.h>
+#include <Xtl.h>
 #else
-	#include <windows.h>
+#include <windows.h>
 #endif
-	#include <time.h>
+#include <time.h>
 
 #else
-	#include <sys/time.h>
+#include <sys/time.h>
 #endif
 
 #define mymin(a,b) (a > b ? a : b)
 
-/// basic clock
+///The btClock is a portable basic clock that measures accurate time in seconds, use for profiling.
 class btClock
+{
+public:
+	btClock()
 	{
-	public:
-		btClock()
-		{
 #ifdef USE_WINDOWS_TIMERS
-			QueryPerformanceFrequency(&mClockFrequency);
+		QueryPerformanceFrequency(&mClockFrequency);
 #endif
-			reset();
-		}
+		reset();
+	}
 
-		~btClock()
-		{
-		}
+	~btClock()
+	{
+	}
 
-		/// Resets the initial reference time.
-		void reset()
-		{
+	/// Resets the initial reference time.
+	void reset()
+	{
 #ifdef USE_WINDOWS_TIMERS
-			QueryPerformanceCounter(&mStartTime);
-			mStartTick = GetTickCount();
-			mPrevElapsedTime = 0;
+		QueryPerformanceCounter(&mStartTime);
+		mStartTick = GetTickCount();
+		mPrevElapsedTime = 0;
 #else
 #ifdef __CELLOS_LV2__
 
-	typedef uint64_t __int64;
-	typedef __int64  ClockSize;
-	ClockSize newTime;
-	__asm __volatile__( "mftb %0" : "=r" (newTime) : : "memory");
-	mStartTime = newTime;
+		typedef uint64_t  ClockSize;
+		ClockSize newTime;
+		//__asm __volatile__( "mftb %0" : "=r" (newTime) : : "memory");
+		SYS_TIMEBASE_GET( newTime );
+		mStartTime = newTime;
 #else
-			gettimeofday(&mStartTime, 0);
+		gettimeofday(&mStartTime, 0);
 #endif
 
 #endif
-		}
+	}
 
-		/// Returns the time in ms since the last call to reset or since 
-		/// the btClock was created.
-		unsigned long int getTimeMilliseconds()
-		{
+	/// Returns the time in ms since the last call to reset or since 
+	/// the btClock was created.
+	unsigned long int getTimeMilliseconds()
+	{
 #ifdef USE_WINDOWS_TIMERS
-			LARGE_INTEGER currentTime;
-			QueryPerformanceCounter(&currentTime);
-			LONGLONG elapsedTime = currentTime.QuadPart - 
-				mStartTime.QuadPart;
+		LARGE_INTEGER currentTime;
+		QueryPerformanceCounter(&currentTime);
+		LONGLONG elapsedTime = currentTime.QuadPart - 
+			mStartTime.QuadPart;
 
-			// Compute the number of millisecond ticks elapsed.
-			unsigned long msecTicks = (unsigned long)(1000 * elapsedTime / 
+		// Compute the number of millisecond ticks elapsed.
+		unsigned long msecTicks = (unsigned long)(1000 * elapsedTime / 
+			mClockFrequency.QuadPart);
+
+		// Check for unexpected leaps in the Win32 performance counter.  
+		// (This is caused by unexpected data across the PCI to ISA 
+		// bridge, aka south bridge.  See Microsoft KB274323.)
+		unsigned long elapsedTicks = GetTickCount() - mStartTick;
+		signed long msecOff = (signed long)(msecTicks - elapsedTicks);
+		if (msecOff < -100 || msecOff > 100)
+		{
+			// Adjust the starting time forwards.
+			LONGLONG msecAdjustment = mymin(msecOff * 
+				mClockFrequency.QuadPart / 1000, elapsedTime - 
+				mPrevElapsedTime);
+			mStartTime.QuadPart += msecAdjustment;
+			elapsedTime -= msecAdjustment;
+
+			// Recompute the number of millisecond ticks elapsed.
+			msecTicks = (unsigned long)(1000 * elapsedTime / 
 				mClockFrequency.QuadPart);
+		}
 
-			// Check for unexpected leaps in the Win32 performance counter.  
-			// (This is caused by unexpected data across the PCI to ISA 
-			// bridge, aka south bridge.  See Microsoft KB274323.)
-			unsigned long elapsedTicks = GetTickCount() - mStartTick;
-			signed long msecOff = (signed long)(msecTicks - elapsedTicks);
-			if (msecOff < -100 || msecOff > 100)
-			{
-				// Adjust the starting time forwards.
-				LONGLONG msecAdjustment = mymin(msecOff * 
-					mClockFrequency.QuadPart / 1000, elapsedTime - 
-					mPrevElapsedTime);
-				mStartTime.QuadPart += msecAdjustment;
-				elapsedTime -= msecAdjustment;
+		// Store the current elapsed time for adjustments next time.
+		mPrevElapsedTime = elapsedTime;
 
-				// Recompute the number of millisecond ticks elapsed.
-				msecTicks = (unsigned long)(1000 * elapsedTime / 
-					mClockFrequency.QuadPart);
-			}
-
-			// Store the current elapsed time for adjustments next time.
-			mPrevElapsedTime = elapsedTime;
-
-			return msecTicks;
+		return msecTicks;
 #else
-			
+
 #ifdef __CELLOS_LV2__
-	__int64 freq=sys_time_get_timebase_frequency();
-	 double dFreq=((double) freq) / 1000.0;
-	typedef uint64_t __int64;
-	typedef __int64  ClockSize;
-	ClockSize newTime;
-	__asm __volatile__( "mftb %0" : "=r" (newTime) : : "memory");
-	
-	return (newTime-mStartTime) / dFreq;
+		uint64_t freq=sys_time_get_timebase_frequency();
+		double dFreq=((double) freq) / 1000.0;
+		typedef uint64_t  ClockSize;
+		ClockSize newTime;
+		SYS_TIMEBASE_GET( newTime );
+		//__asm __volatile__( "mftb %0" : "=r" (newTime) : : "memory");
+
+		return (unsigned long int)((double(newTime-mStartTime)) / dFreq);
 #else
 
-			struct timeval currentTime;
-			gettimeofday(&currentTime, 0);
-			return (currentTime.tv_sec - mStartTime.tv_sec) * 1000 + 
-				(currentTime.tv_usec - mStartTime.tv_usec) / 1000;
+		struct timeval currentTime;
+		gettimeofday(&currentTime, 0);
+		return (currentTime.tv_sec - mStartTime.tv_sec) * 1000 + 
+			(currentTime.tv_usec - mStartTime.tv_usec) / 1000;
 #endif //__CELLOS_LV2__
 #endif
+	}
+
+	/// Returns the time in us since the last call to reset or since 
+	/// the Clock was created.
+	unsigned long int getTimeMicroseconds()
+	{
+#ifdef USE_WINDOWS_TIMERS
+		LARGE_INTEGER currentTime;
+		QueryPerformanceCounter(&currentTime);
+		LONGLONG elapsedTime = currentTime.QuadPart - 
+			mStartTime.QuadPart;
+
+		// Compute the number of millisecond ticks elapsed.
+		unsigned long msecTicks = (unsigned long)(1000 * elapsedTime / 
+			mClockFrequency.QuadPart);
+
+		// Check for unexpected leaps in the Win32 performance counter.  
+		// (This is caused by unexpected data across the PCI to ISA 
+		// bridge, aka south bridge.  See Microsoft KB274323.)
+		unsigned long elapsedTicks = GetTickCount() - mStartTick;
+		signed long msecOff = (signed long)(msecTicks - elapsedTicks);
+		if (msecOff < -100 || msecOff > 100)
+		{
+			// Adjust the starting time forwards.
+			LONGLONG msecAdjustment = mymin(msecOff * 
+				mClockFrequency.QuadPart / 1000, elapsedTime - 
+				mPrevElapsedTime);
+			mStartTime.QuadPart += msecAdjustment;
+			elapsedTime -= msecAdjustment;
 		}
 
-		/// Returns the time in us since the last call to reset or since 
-		/// the Clock was created.
-		unsigned long int getTimeMicroseconds()
-		{
-#ifdef USE_WINDOWS_TIMERS
-			LARGE_INTEGER currentTime;
-			QueryPerformanceCounter(&currentTime);
-			LONGLONG elapsedTime = currentTime.QuadPart - 
-				mStartTime.QuadPart;
+		// Store the current elapsed time for adjustments next time.
+		mPrevElapsedTime = elapsedTime;
 
-			// Compute the number of millisecond ticks elapsed.
-			unsigned long msecTicks = (unsigned long)(1000 * elapsedTime / 
-				mClockFrequency.QuadPart);
+		// Convert to microseconds.
+		unsigned long usecTicks = (unsigned long)(1000000 * elapsedTime / 
+			mClockFrequency.QuadPart);
 
-			// Check for unexpected leaps in the Win32 performance counter.  
-			// (This is caused by unexpected data across the PCI to ISA 
-			// bridge, aka south bridge.  See Microsoft KB274323.)
-			unsigned long elapsedTicks = GetTickCount() - mStartTick;
-			signed long msecOff = (signed long)(msecTicks - elapsedTicks);
-			if (msecOff < -100 || msecOff > 100)
-			{
-				// Adjust the starting time forwards.
-				LONGLONG msecAdjustment = mymin(msecOff * 
-					mClockFrequency.QuadPart / 1000, elapsedTime - 
-					mPrevElapsedTime);
-				mStartTime.QuadPart += msecAdjustment;
-				elapsedTime -= msecAdjustment;
-			}
-
-			// Store the current elapsed time for adjustments next time.
-			mPrevElapsedTime = elapsedTime;
-
-			// Convert to microseconds.
-			unsigned long usecTicks = (unsigned long)(1000000 * elapsedTime / 
-				mClockFrequency.QuadPart);
-
-			return usecTicks;
+		return usecTicks;
 #else
 
 #ifdef __CELLOS_LV2__
-	__int64 freq=sys_time_get_timebase_frequency();
-	 double dFreq=((double) freq)/ 1000000.0;
-	typedef uint64_t __int64;
-	typedef __int64  ClockSize;
-	ClockSize newTime;
-	__asm __volatile__( "mftb %0" : "=r" (newTime) : : "memory");
-	
-	return (newTime-mStartTime) / dFreq;
+		uint64_t freq=sys_time_get_timebase_frequency();
+		double dFreq=((double) freq)/ 1000000.0;
+		typedef uint64_t  ClockSize;
+		ClockSize newTime;
+		//__asm __volatile__( "mftb %0" : "=r" (newTime) : : "memory");
+		SYS_TIMEBASE_GET( newTime );
+
+		return (unsigned long int)((double(newTime-mStartTime)) / dFreq);
 #else
 
-			struct timeval currentTime;
-			gettimeofday(&currentTime, 0);
-			return (currentTime.tv_sec - mStartTime.tv_sec) * 1000000 + 
-				(currentTime.tv_usec - mStartTime.tv_usec);
+		struct timeval currentTime;
+		gettimeofday(&currentTime, 0);
+		return (currentTime.tv_sec - mStartTime.tv_sec) * 1000000 + 
+			(currentTime.tv_usec - mStartTime.tv_usec);
 #endif//__CELLOS_LV2__
 #endif 
-		}
+	}
 
-	private:
+private:
 #ifdef USE_WINDOWS_TIMERS
-		LARGE_INTEGER mClockFrequency;
-		DWORD mStartTick;
-		LONGLONG mPrevElapsedTime;
-		LARGE_INTEGER mStartTime;
+	LARGE_INTEGER mClockFrequency;
+	DWORD mStartTick;
+	LONGLONG mPrevElapsedTime;
+	LARGE_INTEGER mStartTime;
 #else
 #ifdef __CELLOS_LV2__
-		uint64_t	mStartTime;
+	uint64_t	mStartTime;
 #else
-		struct timeval mStartTime;
+	struct timeval mStartTime;
 #endif
 #endif //__CELLOS_LV2__
 
-	};
+};
 
 #endif //USE_BT_CLOCK
 
 
-#ifdef USE_QUICKPROF
 
 
-#include <iostream>
-#include <fstream>
-#include <string>
-#include <map>
+///A node in the Profile Hierarchy Tree
+class	CProfileNode {
 
+public:
+	CProfileNode( const char * name, CProfileNode * parent );
+	~CProfileNode( void );
 
+	CProfileNode * Get_Sub_Node( const char * name );
 
+	CProfileNode * Get_Parent( void )		{ return Parent; }
+	CProfileNode * Get_Sibling( void )		{ return Sibling; }
+	CProfileNode * Get_Child( void )			{ return Child; }
 
-namespace hidden
-{
-	/// A simple data structure representing a single timed block 
-	/// of code.
-	struct ProfileBlock
-	{
-		ProfileBlock()
-		{
-			currentBlockStartMicroseconds = 0;
-			currentCycleTotalMicroseconds = 0;
-			lastCycleTotalMicroseconds = 0;
-			totalMicroseconds = 0;
-		}
+	void				CleanupMemory();
+	void				Reset( void );
+	void				Call( void );
+	bool				Return( void );
 
-		/// The starting time (in us) of the current block update.
-		unsigned long int currentBlockStartMicroseconds;
+	const char *	Get_Name( void )				{ return Name; }
+	int				Get_Total_Calls( void )		{ return TotalCalls; }
+	float				Get_Total_Time( void )		{ return TotalTime; }
 
-		/// The accumulated time (in us) spent in this block during the 
-		/// current profiling cycle.
-		unsigned long int currentCycleTotalMicroseconds;
+protected:
 
-		/// The accumulated time (in us) spent in this block during the 
-		/// past profiling cycle.
-		unsigned long int lastCycleTotalMicroseconds;
-
-		/// The total accumulated time (in us) spent in this block.
-		unsigned long int totalMicroseconds;
-	};
+	const char *	Name;
+	int				TotalCalls;
+	float				TotalTime;
+	unsigned long int			StartTime;
+	int				RecursionCounter;
 
+	CProfileNode *	Parent;
+	CProfileNode *	Child;
+	CProfileNode *	Sibling;
 };
 
-/// A static class that manages timing for a set of profiling blocks.
-class btProfiler
+///An iterator to navigate through the tree
+class CProfileIterator
 {
 public:
-	/// A set of ways to retrieve block timing data.
-	enum BlockTimingMethod
-	{
-		/// The total time spent in the block (in seconds) since the 
-		/// profiler was initialized.
-		BLOCK_TOTAL_SECONDS,
+	// Access all the children of the current parent
+	void				First(void);
+	void				Next(void);
+	bool				Is_Done(void);
+	bool                Is_Root(void) { return (CurrentParent->Get_Parent() == 0); }
 
-		/// The total time spent in the block (in ms) since the 
-		/// profiler was initialized.
-		BLOCK_TOTAL_MILLISECONDS,
+	void				Enter_Child( int index );		// Make the given child the new parent
+	void				Enter_Largest_Child( void );	// Make the largest child the new parent
+	void				Enter_Parent( void );			// Make the current parent's parent the new parent
 
-		/// The total time spent in the block (in us) since the 
-		/// profiler was initialized.
-		BLOCK_TOTAL_MICROSECONDS,
+	// Access the current child
+	const char *	Get_Current_Name( void )			{ return CurrentChild->Get_Name(); }
+	int				Get_Current_Total_Calls( void )	{ return CurrentChild->Get_Total_Calls(); }
+	float				Get_Current_Total_Time( void )	{ return CurrentChild->Get_Total_Time(); }
 
-		/// The total time spent in the block, as a % of the total 
-		/// elapsed time since the profiler was initialized.
-		BLOCK_TOTAL_PERCENT,
+	// Access the current parent
+	const char *	Get_Current_Parent_Name( void )			{ return CurrentParent->Get_Name(); }
+	int				Get_Current_Parent_Total_Calls( void )	{ return CurrentParent->Get_Total_Calls(); }
+	float				Get_Current_Parent_Total_Time( void )	{ return CurrentParent->Get_Total_Time(); }
 
-		/// The time spent in the block (in seconds) in the most recent 
-		/// profiling cycle.
-		BLOCK_CYCLE_SECONDS,
+protected:
 
-		/// The time spent in the block (in ms) in the most recent 
-		/// profiling cycle.
-		BLOCK_CYCLE_MILLISECONDS,
+	CProfileNode *	CurrentParent;
+	CProfileNode *	CurrentChild;
 
-		/// The time spent in the block (in us) in the most recent 
-		/// profiling cycle.
-		BLOCK_CYCLE_MICROSECONDS,
-
-		/// The time spent in the block (in seconds) in the most recent 
-		/// profiling cycle, as a % of the total cycle time.
-		BLOCK_CYCLE_PERCENT
-	};
-
-	/// Initializes the profiler.  This must be called first.  If this is 
-	/// never called, the profiler is effectively disabled; all other 
-	/// functions will return immediately.  The first parameter 
-	/// is the name of an output data file; if this string is not empty, 
-	/// data will be saved on every profiling cycle; if this string is 
-	/// empty, no data will be saved to a file.  The second parameter 
-	/// determines which timing method is used when printing data to the 
-	/// output file.
-	inline static void init(const std::string outputFilename="", 
-		BlockTimingMethod outputMethod=BLOCK_CYCLE_MILLISECONDS);
-
-	/// Cleans up allocated memory.
-	inline static void destroy();
-
-	/// Begins timing the named block of code.
-	inline static void beginBlock(const std::string& name);
-
-	/// Updates the accumulated time spent in the named block by adding 
-	/// the elapsed time since the last call to startBlock for this block 
-	/// name.
-	inline static void endBlock(const std::string& name);
-
-	/// Returns the time spent in the named block according to the 
-	/// given timing method.  See comments on BlockTimingMethod for details.
-	inline static double getBlockTime(const std::string& name, 
-		BlockTimingMethod method=BLOCK_CYCLE_MILLISECONDS);
-
-	/// Defines the end of a profiling cycle.  Use this regularly if you 
-	/// want to generate detailed timing information.  This must not be 
-	/// called within a timing block.
-	inline static void endProfilingCycle();
-
-	/// A helper function that creates a string of statistics for 
-	/// each timing block.  This is mainly for printing an overall 
-	/// summary to the command line.
-	inline static std::string createStatsString(
-		BlockTimingMethod method=BLOCK_TOTAL_PERCENT);
-
-//private:
-	inline btProfiler();
-
-	inline ~btProfiler();
-
-	/// Prints an error message to standard output.
-	inline static void printError(const std::string& msg)
-	{
-		//btAssert(0);
-		std::cout << "[QuickProf error] " << msg << std::endl;
-	}
-
-	/// Determines whether the profiler is enabled.
-	static bool mEnabled;
-
-	/// The clock used to time profile blocks.
-	static btClock mClock;
-
-	/// The starting time (in us) of the current profiling cycle.
-	static unsigned long int mCurrentCycleStartMicroseconds;
-
-	/// The duration (in us) of the most recent profiling cycle.
-	static unsigned long int mLastCycleDurationMicroseconds;
-
-	/// Internal map of named profile blocks.
-	static std::map<std::string, hidden::ProfileBlock*> mProfileBlocks;
-
-	/// The data file used if this feature is enabled in 'init.'
-	static std::ofstream mOutputFile;
-
-	/// Tracks whether we have begun print data to the output file.
-	static bool mFirstFileOutput;
-
-	/// The method used when printing timing data to an output file.
-	static BlockTimingMethod mFileOutputMethod;
-
-	/// The number of the current profiling cycle.
-	static unsigned long int mCycleNumber;
+	CProfileIterator( CProfileNode * start );
+	friend	class		CProfileManager;
 };
 
 
-btProfiler::btProfiler()
-{
-	// This never gets called because a btProfiler instance is never 
-	// created.
-}
+///The Manager for the Profile system
+class	CProfileManager {
+public:
+	static	void						Start_Profile( const char * name );
+	static	void						Stop_Profile( void );
 
-btProfiler::~btProfiler()
-{
-	// This never gets called because a btProfiler instance is never 
-	// created.
-}
-
-void btProfiler::init(const std::string outputFilename, 
-	BlockTimingMethod outputMethod)
-{
-	mEnabled = true;
-	
-	if (!outputFilename.empty())
+	static	void						CleanupMemory(void)
 	{
-		mOutputFile.open(outputFilename.c_str());
+		Root.CleanupMemory();
 	}
 
-	mFileOutputMethod = outputMethod;
+	static	void						Reset( void );
+	static	void						Increment_Frame_Counter( void );
+	static	int						Get_Frame_Count_Since_Reset( void )		{ return FrameCounter; }
+	static	float						Get_Time_Since_Reset( void );
 
-	mClock.reset();
+	static	CProfileIterator *	Get_Iterator( void )	
+	{ 
+		
+		return new CProfileIterator( &Root ); 
+	}
+	static	void						Release_Iterator( CProfileIterator * iterator ) { delete ( iterator); }
 
-	// Set the start time for the first cycle.
-	mCurrentCycleStartMicroseconds = mClock.getTimeMicroseconds();
-}
+private:
+	static	CProfileNode			Root;
+	static	CProfileNode *			CurrentNode;
+	static	int						FrameCounter;
+	static	unsigned long int					ResetTime;
+};
 
-void btProfiler::destroy()
-{
-	if (!mEnabled)
-	{
-		return;
+
+///ProfileSampleClass is a simple way to profile a function's scope
+///Use the BT_PROFILE macro at the start of scope to time
+class	CProfileSample {
+public:
+	CProfileSample( const char * name )
+	{ 
+		CProfileManager::Start_Profile( name ); 
 	}
 
-	if (mOutputFile.is_open())
-	{
-		mOutputFile.close();
+	~CProfileSample( void )					
+	{ 
+		CProfileManager::Stop_Profile(); 
 	}
+};
 
-	// Destroy all ProfileBlocks.
-	while (!mProfileBlocks.empty())
-	{
-		delete (*mProfileBlocks.begin()).second;
-		mProfileBlocks.erase(mProfileBlocks.begin());
-	}
-}
-
-void btProfiler::beginBlock(const std::string& name)
-{
-	if (!mEnabled)
-	{
-		return;
-	}
-
-	if (name.empty())
-	{
-		printError("Cannot allow unnamed profile blocks.");
-		return;
-	}
-
-	hidden::ProfileBlock* block = mProfileBlocks[name];
-
-	if (!block)
-	{
-		// Create a new ProfileBlock.
-		mProfileBlocks[name] = new hidden::ProfileBlock();
-		block = mProfileBlocks[name];
-	}
-
-	// We do this at the end to get more accurate results.
-	block->currentBlockStartMicroseconds = mClock.getTimeMicroseconds();
-}
-
-void btProfiler::endBlock(const std::string& name)
-{
-	if (!mEnabled)
-	{
-		return;
-	}
-
-	// We do this at the beginning to get more accurate results.
-	unsigned long int endTick = mClock.getTimeMicroseconds();
-
-	hidden::ProfileBlock* block = mProfileBlocks[name];
-
-	if (!block)
-	{
-		// The named block does not exist.  Print an error.
-		printError("The profile block named '" + name + 
-			"' does not exist.");
-		return;
-	}
-
-	unsigned long int blockDuration = endTick - 
-		block->currentBlockStartMicroseconds;
-	block->currentCycleTotalMicroseconds += blockDuration;
-	block->totalMicroseconds += blockDuration;
-}
-
-double btProfiler::getBlockTime(const std::string& name, 
-	BlockTimingMethod method)
-{
-	if (!mEnabled)
-	{
-		return 0;
-	}
-
-	hidden::ProfileBlock* block = mProfileBlocks[name];
-
-	if (!block)
-	{
-		// The named block does not exist.  Print an error.
-		printError("The profile block named '" + name + 
-			"' does not exist.");
-		return 0;
-	}
-
-	double result = 0;
-
-	switch(method)
-	{
-		case BLOCK_TOTAL_SECONDS:
-			result = (double)block->totalMicroseconds * (double)0.000001;
-			break;
-		case BLOCK_TOTAL_MILLISECONDS:
-			result = (double)block->totalMicroseconds * (double)0.001;
-			break;
-		case BLOCK_TOTAL_MICROSECONDS:
-			result = (double)block->totalMicroseconds;
-			break;
-		case BLOCK_TOTAL_PERCENT:
-		{
-			double timeSinceInit = (double)mClock.getTimeMicroseconds();
-			if (timeSinceInit <= 0)
-			{
-				result = 0;
-			}
-			else
-			{
-				result = 100.0 * (double)block->totalMicroseconds / 
-					timeSinceInit;
-			}
-			break;
-		}
-		case BLOCK_CYCLE_SECONDS:
-			result = (double)block->lastCycleTotalMicroseconds * 
-				(double)0.000001;
-			break;
-		case BLOCK_CYCLE_MILLISECONDS:
-			result = (double)block->lastCycleTotalMicroseconds * 
-				(double)0.001;
-			break;
-		case BLOCK_CYCLE_MICROSECONDS:
-			result = (double)block->lastCycleTotalMicroseconds;
-			break;
-		case BLOCK_CYCLE_PERCENT:
-		{
-			if (0 == mLastCycleDurationMicroseconds)
-			{
-				// We have not yet finished a cycle, so just return zero 
-				// percent to avoid a divide by zero error.
-				result = 0;
-			}
-			else
-			{
-				result = 100.0 * (double)block->lastCycleTotalMicroseconds / 
-					mLastCycleDurationMicroseconds;
-			}
-			break;
-		}
-		default:
-			break;
-	}
-
-	return result;
-}
-
-void btProfiler::endProfilingCycle()
-{
-	if (!mEnabled)
-	{
-		return;
-	}
-
-	// Store the duration of the cycle that just finished.
-	mLastCycleDurationMicroseconds = mClock.getTimeMicroseconds() - 
-		mCurrentCycleStartMicroseconds;
-
-	// For each block, update data for the cycle that just finished.
-	std::map<std::string, hidden::ProfileBlock*>::iterator iter;
-	for (iter = mProfileBlocks.begin(); iter != mProfileBlocks.end(); ++iter)
-	{
-		hidden::ProfileBlock* block = (*iter).second;
-		block->lastCycleTotalMicroseconds = 
-			block->currentCycleTotalMicroseconds;
-		block->currentCycleTotalMicroseconds = 0;
-	}
-
-	if (mOutputFile.is_open())
-	{
-		// Print data to the output file.
-		if (mFirstFileOutput)
-		{
-			// On the first iteration, print a header line that shows the 
-			// names of each profiling block.
-			mOutputFile << "#cycle, ";
-
-			for (iter = mProfileBlocks.begin(); iter != mProfileBlocks.end(); 
-				++iter)
-			{
-				mOutputFile << (*iter).first << ", ";
-			}
-
-			mOutputFile << std::endl;
-			mFirstFileOutput = false;
-		}
-
-		mOutputFile << mCycleNumber << ", ";
-
-		for (iter = mProfileBlocks.begin(); iter != mProfileBlocks.end(); 
-			++iter)
-		{
-			mOutputFile << getBlockTime((*iter).first, mFileOutputMethod) 
-				<< ", ";
-		}
-
-		mOutputFile << std::endl;
-	}
-
-	++mCycleNumber;
-	mCurrentCycleStartMicroseconds = mClock.getTimeMicroseconds();
-}
-
-std::string btProfiler::createStatsString(BlockTimingMethod method)
-{
-	if (!mEnabled)
-	{
-		return "";
-	}
-
-	std::string s;
-	std::string suffix;
-
-	switch(method)
-	{
-		case BLOCK_TOTAL_SECONDS:
-			suffix = "s";
-			break;
-		case BLOCK_TOTAL_MILLISECONDS:
-			suffix = "ms";
-			break;
-		case BLOCK_TOTAL_MICROSECONDS:
-			suffix = "us";
-			break;
-		case BLOCK_TOTAL_PERCENT:
-		{
-			suffix = "%";
-			break;
-		}
-		case BLOCK_CYCLE_SECONDS:
-			suffix = "s";
-			break;
-		case BLOCK_CYCLE_MILLISECONDS:
-			suffix = "ms";
-			break;
-		case BLOCK_CYCLE_MICROSECONDS:
-			suffix = "us";
-			break;
-		case BLOCK_CYCLE_PERCENT:
-		{
-			suffix = "%";
-			break;
-		}
-		default:
-			break;
-	}
-
-	std::map<std::string, hidden::ProfileBlock*>::iterator iter;
-	for (iter = mProfileBlocks.begin(); iter != mProfileBlocks.end(); ++iter)
-	{
-		if (iter != mProfileBlocks.begin())
-		{
-			s += "\n";
-		}
-
-		char blockTime[64];
-		sprintf(blockTime, "%lf", getBlockTime((*iter).first, method));
-
-		s += (*iter).first;
-		s += ": ";
-		s += blockTime;
-		s += " ";
-		s += suffix;
-	}
-
-	return s;
-}
+#if !defined(BT_NO_PROFILE)
+#define	BT_PROFILE( name )			CProfileSample __profile( name )
+#else
+#define	BT_PROFILE( name )
+#endif
 
 
-#define BEGIN_PROFILE(a) btProfiler::beginBlock(a)
-#define END_PROFILE(a) btProfiler::endBlock(a)
 
-#else //USE_QUICKPROF
-#define BEGIN_PROFILE(a)
-#define END_PROFILE(a)
-
-#endif //USE_QUICKPROF
 
 #endif //QUICK_PROF_H
 
diff --git a/extern/bullet2/src/LinearMath/btScalar.h b/extern/bullet2/src/LinearMath/btScalar.h
index 01ad93e786a..1fee626d0c0 100644
--- a/extern/bullet2/src/LinearMath/btScalar.h
+++ b/extern/bullet2/src/LinearMath/btScalar.h
@@ -18,25 +18,47 @@ subject to the following restrictions:
 #define SIMD___SCALAR_H
 
 #include <math.h>
+#include <stdlib.h>//size_t for MSVC 6.0
 
 #include <cstdlib>
 #include <cfloat>
 #include <float.h>
 
+#define BT_BULLET_VERSION 271
+
+inline int	btGetVersion()
+{
+	return BT_BULLET_VERSION;
+}
+
+#if defined(DEBUG) || defined (_DEBUG)
+#define BT_DEBUG
+#endif
+
+
 #ifdef WIN32
 
 		#if defined(__MINGW32__) || defined(__CYGWIN__) || (defined (_MSC_VER) && _MSC_VER < 1300)
+
 			#define SIMD_FORCE_INLINE inline
 			#define ATTRIBUTE_ALIGNED16(a) a
+			#define ATTRIBUTE_ALIGNED128(a) a
 		#else
-			#define BT_HAS_ALIGNED_ALOCATOR
-			#pragma warning(disable:4530)
-			#pragma warning(disable:4996)
-			#pragma warning(disable:4786)
+			#define BT_HAS_ALIGNED_ALLOCATOR
+			#pragma warning(disable : 4324) // disable padding warning
+//			#pragma warning(disable:4530) // Disable the exception disable but used in MSCV Stl warning.
+//			#pragma warning(disable:4996) //Turn off warnings about deprecated C routines
+//			#pragma warning(disable:4786) // Disable the "debug name too long" warning
+
 			#define SIMD_FORCE_INLINE __forceinline
 			#define ATTRIBUTE_ALIGNED16(a) __declspec(align(16)) a
+			#define ATTRIBUTE_ALIGNED128(a) __declspec (align(128)) a
 		#ifdef _XBOX
 			#define BT_USE_VMX128
+
+			#include <ppcintrinsics.h>
+ 			#define BT_HAVE_NATIVE_FSEL
+ 			#define btFsel(a,b,c) __fsel((a),(b),(c))
 		#else
 			#define BT_USE_SSE
 		#endif
@@ -46,29 +68,63 @@ subject to the following restrictions:
 		#define btAssert assert
 		//btFullAssert is optional, slows down a lot
 		#define btFullAssert(x)
+
+		#define btLikely(_c)  _c
+		#define btUnlikely(_c) _c
+
 #else
 	
 #if defined	(__CELLOS_LV2__)
 		#define SIMD_FORCE_INLINE inline
 		#define ATTRIBUTE_ALIGNED16(a) a __attribute__ ((aligned (16)))
+		#define ATTRIBUTE_ALIGNED128(a) a __attribute__ ((aligned (128)))
 		#ifndef assert
 		#include <assert.h>
 		#endif
 		#define btAssert assert
 		//btFullAssert is optional, slows down a lot
 		#define btFullAssert(x)
+
+		#define btLikely(_c)  _c
+		#define btUnlikely(_c) _c
+
 #else
 
+#ifdef USE_LIBSPE2
+
+		#define SIMD_FORCE_INLINE __inline
+		#define ATTRIBUTE_ALIGNED16(a) a __attribute__ ((aligned (16)))
+		#define ATTRIBUTE_ALIGNED128(a) a __attribute__ ((aligned (128)))
+		#ifndef assert
+		#include <assert.h>
+		#endif
+		#define btAssert assert
+		//btFullAssert is optional, slows down a lot
+		#define btFullAssert(x)
+
+
+		#define btLikely(_c)   __builtin_expect((_c), 1)
+		#define btUnlikely(_c) __builtin_expect((_c), 0)
+		
+
+#else
 	//non-windows systems
 
 		#define SIMD_FORCE_INLINE inline
 		#define ATTRIBUTE_ALIGNED16(a) a
+		#define ATTRIBUTE_ALIGNED128(a) a
 		#ifndef assert
 		#include <assert.h>
 		#endif
 		#define btAssert assert
 		//btFullAssert is optional, slows down a lot
 		#define btFullAssert(x)
+		#define btLikely(_c)  _c
+		#define btUnlikely(_c) _c
+
+
+#endif // LIBSPE2
+
 #endif	//__CELLOS_LV2__
 #endif
 
@@ -81,6 +137,7 @@ subject to the following restrictions:
 #endif
 #endif
 
+///The btScalar type abstracts floating point numbers, to easily switch between double and single floating point precision.
 #if defined(BT_USE_DOUBLE_PRECISION)
 typedef double btScalar;
 #else
@@ -88,6 +145,14 @@ typedef float btScalar;
 #endif
 
 
+#define BT_DECLARE_ALIGNED_ALLOCATOR() \
+	SIMD_FORCE_INLINE void* operator new(size_t sizeInBytes)	{ return btAlignedAlloc(sizeInBytes,16); }	\
+	SIMD_FORCE_INLINE void  operator delete(void* ptr)			{ btAlignedFree(ptr); }	\
+	SIMD_FORCE_INLINE void* operator new(size_t, void* ptr)	{ return ptr; }	\
+	SIMD_FORCE_INLINE void  operator delete(void*, void*)		{ }	\
+
+
+
 #if defined(BT_USE_DOUBLE_PRECISION) || defined(BT_FORCE_DOUBLE_FUNCTIONS)
 		
 SIMD_FORCE_INLINE btScalar btSqrt(btScalar x) { return sqrt(x); }
@@ -105,12 +170,34 @@ SIMD_FORCE_INLINE btScalar btPow(btScalar x,btScalar y) { return pow(x,y); }
 
 #else
 		
-SIMD_FORCE_INLINE btScalar btSqrt(btScalar x) { return sqrtf(x); }
+SIMD_FORCE_INLINE btScalar btSqrt(btScalar y) 
+{ 
+#ifdef USE_APPROXIMATION
+    double x, z, tempf;
+    unsigned long *tfptr = ((unsigned long *)&tempf) + 1;
+
+	tempf = y;
+	*tfptr = (0xbfcdd90a - *tfptr)>>1; /* estimate of 1/sqrt(y) */
+	x =  tempf;
+	z =  y*btScalar(0.5);                        /* hoist out the “/2”    */
+	x = (btScalar(1.5)*x)-(x*x)*(x*z);         /* iteration formula     */
+	x = (btScalar(1.5)*x)-(x*x)*(x*z);
+	x = (btScalar(1.5)*x)-(x*x)*(x*z);
+	x = (btScalar(1.5)*x)-(x*x)*(x*z);
+	x = (btScalar(1.5)*x)-(x*x)*(x*z);
+	return x*y;
+#else
+	return sqrtf(y); 
+#endif
+}
 SIMD_FORCE_INLINE btScalar btFabs(btScalar x) { return fabsf(x); }
 SIMD_FORCE_INLINE btScalar btCos(btScalar x) { return cosf(x); }
 SIMD_FORCE_INLINE btScalar btSin(btScalar x) { return sinf(x); }
 SIMD_FORCE_INLINE btScalar btTan(btScalar x) { return tanf(x); }
-SIMD_FORCE_INLINE btScalar btAcos(btScalar x) { return acosf(x); }
+SIMD_FORCE_INLINE btScalar btAcos(btScalar x) { 
+	btAssert(x <= btScalar(1.));
+	return acosf(x); 
+}
 SIMD_FORCE_INLINE btScalar btAsin(btScalar x) { return asinf(x); }
 SIMD_FORCE_INLINE btScalar btAtan(btScalar x) { return atanf(x); }
 SIMD_FORCE_INLINE btScalar btAtan2(btScalar x, btScalar y) { return atan2f(x, y); }
@@ -159,14 +246,6 @@ SIMD_FORCE_INLINE bool	btGreaterEqual (btScalar a, btScalar eps) {
 	return (!((a) <= eps));
 }
 
-/*SIMD_FORCE_INLINE btScalar btCos(btScalar x) { return cosf(x); }
-SIMD_FORCE_INLINE btScalar btSin(btScalar x) { return sinf(x); }
-SIMD_FORCE_INLINE btScalar btTan(btScalar x) { return tanf(x); }
-SIMD_FORCE_INLINE btScalar btAcos(btScalar x) { return acosf(x); }
-SIMD_FORCE_INLINE btScalar btAsin(btScalar x) { return asinf(x); }
-SIMD_FORCE_INLINE btScalar btAtan(btScalar x) { return atanf(x); }
-SIMD_FORCE_INLINE btScalar btAtan2(btScalar x, btScalar y) { return atan2f(x, y); }
-*/
 
 SIMD_FORCE_INLINE int       btIsNegative(btScalar x) {
     return x < btScalar(0.0) ? 1 : 0;
@@ -177,5 +256,151 @@ SIMD_FORCE_INLINE btScalar btDegrees(btScalar x) { return x * SIMD_DEGS_PER_RAD;
 
 #define BT_DECLARE_HANDLE(name) typedef struct name##__ { int unused; } *name
 
+#ifndef btFsel
+SIMD_FORCE_INLINE btScalar btFsel(btScalar a, btScalar b, btScalar c)
+{
+	return a >= 0 ? b : c;
+}
+#endif
+#define btFsels(a,b,c) (btScalar)btFsel(a,b,c)
+
+
+SIMD_FORCE_INLINE bool btMachineIsLittleEndian()
+{
+   long int i = 1;
+   const char *p = (const char *) &i;
+   if (p[0] == 1)  // Lowest address contains the least significant byte
+	   return true;
+   else
+	   return false;
+}
+
+
+
+///btSelect avoids branches, which makes performance much better for consoles like Playstation 3 and XBox 360
+///Thanks Phil Knight. See also http://www.cellperformance.com/articles/2006/04/more_techniques_for_eliminatin_1.html
+SIMD_FORCE_INLINE unsigned btSelect(unsigned condition, unsigned valueIfConditionNonZero, unsigned valueIfConditionZero) 
+{
+    // Set testNz to 0xFFFFFFFF if condition is nonzero, 0x00000000 if condition is zero
+    // Rely on positive value or'ed with its negative having sign bit on
+    // and zero value or'ed with its negative (which is still zero) having sign bit off 
+    // Use arithmetic shift right, shifting the sign bit through all 32 bits
+    unsigned testNz = (unsigned)(((int)condition | -(int)condition) >> 31);
+    unsigned testEqz = ~testNz;
+    return ((valueIfConditionNonZero & testNz) | (valueIfConditionZero & testEqz)); 
+}
+SIMD_FORCE_INLINE int btSelect(unsigned condition, int valueIfConditionNonZero, int valueIfConditionZero)
+{
+    unsigned testNz = (unsigned)(((int)condition | -(int)condition) >> 31);
+    unsigned testEqz = ~testNz; 
+    return static_cast<int>((valueIfConditionNonZero & testNz) | (valueIfConditionZero & testEqz));
+}
+SIMD_FORCE_INLINE float btSelect(unsigned condition, float valueIfConditionNonZero, float valueIfConditionZero)
+{
+#ifdef BT_HAVE_NATIVE_FSEL
+    return (float)btFsel((btScalar)condition - btScalar(1.0f), valueIfConditionNonZero, valueIfConditionZero);
+#else
+    return (condition != 0) ? valueIfConditionNonZero : valueIfConditionZero; 
+#endif
+}
+
+template<typename T> SIMD_FORCE_INLINE void btSwap(T& a, T& b)
+{
+	T tmp = a;
+	a = b;
+	b = tmp;
+}
+
+
+//PCK: endian swapping functions
+SIMD_FORCE_INLINE unsigned btSwapEndian(unsigned val)
+{
+	return (((val & 0xff000000) >> 24) | ((val & 0x00ff0000) >> 8) | ((val & 0x0000ff00) << 8)  | ((val & 0x000000ff) << 24));
+}
+
+SIMD_FORCE_INLINE unsigned short btSwapEndian(unsigned short val)
+{
+	return static_cast<unsigned short>(((val & 0xff00) >> 8) | ((val & 0x00ff) << 8));
+}
+
+SIMD_FORCE_INLINE unsigned btSwapEndian(int val)
+{
+	return btSwapEndian((unsigned)val);
+}
+
+SIMD_FORCE_INLINE unsigned short btSwapEndian(short val)
+{
+	return btSwapEndian((unsigned short) val);
+}
+
+///btSwapFloat uses using char pointers to swap the endianness
+////btSwapFloat/btSwapDouble will NOT return a float, because the machine might 'correct' invalid floating point values
+///Not all values of sign/exponent/mantissa are valid floating point numbers according to IEEE 754. 
+///When a floating point unit is faced with an invalid value, it may actually change the value, or worse, throw an exception. 
+///In most systems, running user mode code, you wouldn't get an exception, but instead the hardware/os/runtime will 'fix' the number for you. 
+///so instead of returning a float/double, we return integer/long long integer
+SIMD_FORCE_INLINE unsigned int  btSwapEndianFloat(float d)
+{
+    unsigned int a = 0;
+    unsigned char *dst = (unsigned char *)&a;
+    unsigned char *src = (unsigned char *)&d;
+
+    dst[0] = src[3];
+    dst[1] = src[2];
+    dst[2] = src[1];
+    dst[3] = src[0];
+    return a;
+}
+
+// unswap using char pointers
+SIMD_FORCE_INLINE float btUnswapEndianFloat(unsigned int a) 
+{
+    float d = 0.0f;
+    unsigned char *src = (unsigned char *)&a;
+    unsigned char *dst = (unsigned char *)&d;
+
+    dst[0] = src[3];
+    dst[1] = src[2];
+    dst[2] = src[1];
+    dst[3] = src[0];
+
+    return d;
+}
+
+
+// swap using char pointers
+SIMD_FORCE_INLINE void  btSwapEndianDouble(double d, unsigned char* dst)
+{
+    unsigned char *src = (unsigned char *)&d;
+
+    dst[0] = src[7];
+    dst[1] = src[6];
+    dst[2] = src[5];
+    dst[3] = src[4];
+    dst[4] = src[3];
+    dst[5] = src[2];
+    dst[6] = src[1];
+    dst[7] = src[0];
+
+}
+
+// unswap using char pointers
+SIMD_FORCE_INLINE double btUnswapEndianDouble(const unsigned char *src) 
+{
+    double d = 0.0;
+    unsigned char *dst = (unsigned char *)&d;
+
+    dst[0] = src[7];
+    dst[1] = src[6];
+    dst[2] = src[5];
+    dst[3] = src[4];
+    dst[4] = src[3];
+    dst[5] = src[2];
+    dst[6] = src[1];
+    dst[7] = src[0];
+
+	return d;
+}
+
 
 #endif //SIMD___SCALAR_H
diff --git a/extern/bullet2/src/LinearMath/btStackAlloc.h b/extern/bullet2/src/LinearMath/btStackAlloc.h
index d219b453537..050d44bdfe9 100644
--- a/extern/bullet2/src/LinearMath/btStackAlloc.h
+++ b/extern/bullet2/src/LinearMath/btStackAlloc.h
@@ -21,6 +21,7 @@ Nov.2006
 #define BT_STACK_ALLOC
 
 #include "btScalar.h" //for btAssert
+#include "btAlignedAllocator.h"
 
 struct btBlock
 {
@@ -28,7 +29,7 @@ struct btBlock
 	unsigned char*		address;
 };
 
-///StackAlloc provides some fast stack-based memory allocator (LIFO last-in first-out)
+///The StackAlloc class provides some fast stack-based memory allocator (LIFO last-in first-out)
 class btStackAlloc
 {
 public:
@@ -39,7 +40,7 @@ public:
 	inline void		create(unsigned int size)
 	{
 		destroy();
-		data		=	new unsigned char[size];
+		data		=  (unsigned char*) btAlignedAlloc(size,16);
 		totalsize	=	size;
 	}
 	inline void		destroy()
@@ -49,12 +50,20 @@ public:
 
 		if(usedsize==0)
 		{
-			if(!ischild)		delete[] data;
+			if(!ischild && data)		
+				btAlignedFree(data);
+
 			data				=	0;
 			usedsize			=	0;
 		}
 		
 	}
+
+	int	getAvailableMemory() const
+	{
+		return static_cast<int>(totalsize - usedsize);
+	}
+
 	unsigned char*			allocate(unsigned int size)
 	{
 		const unsigned int	nus(usedsize+size);
@@ -68,7 +77,7 @@ public:
 		
 		return(0);
 	}
-	inline btBlock*		beginBlock()
+	SIMD_FORCE_INLINE btBlock*		beginBlock()
 	{
 		btBlock*	pb = (btBlock*)allocate(sizeof(btBlock));
 		pb->previous	=	current;
@@ -76,7 +85,7 @@ public:
 		current			=	pb;
 		return(pb);
 	}
-	inline void		endBlock(btBlock* block)
+	SIMD_FORCE_INLINE void		endBlock(btBlock* block)
 	{
 		btAssert(block==current);
 		//Raise(L"Unmatched blocks");
diff --git a/extern/bullet2/src/LinearMath/btTransform.h b/extern/bullet2/src/LinearMath/btTransform.h
index 2d55fec83a4..a8cdb428100 100644
--- a/extern/bullet2/src/LinearMath/btTransform.h
+++ b/extern/bullet2/src/LinearMath/btTransform.h
@@ -21,7 +21,8 @@ subject to the following restrictions:
 #include "btMatrix3x3.h"
 
 
-///btTransform supports rigid transforms (only translation and rotation, no scaling/shear)
+///The btTransform class supports rigid transforms with only translation and rotation and no scaling/shear.
+///It can be used in combination with btVector3, btQuaternion and btMatrix3x3 linear algebra classes.
 class btTransform {
 	
 
@@ -92,13 +93,7 @@ public:
 		m_basis.getRotation(q);
 		return q;
 	}
-	template <typename Scalar2>
-		void setValue(const Scalar2 *m) 
-	{
-		m_basis.setValue(m);
-		m_origin.setValue(&m[12]);
-	}
-
+	
 	
 	void setFromOpenGLMatrix(const btScalar *m)
 	{
@@ -194,8 +189,13 @@ btTransform::operator*(const btTransform& t) const
 {
 	return btTransform(m_basis * t.m_basis, 
 		(*this)(t.m_origin));
-}	
+}
 
+SIMD_FORCE_INLINE bool operator==(const btTransform& t1, const btTransform& t2)
+{
+   return ( t1.getBasis()  == t2.getBasis() &&
+            t1.getOrigin() == t2.getOrigin() );
+}
 
 
 #endif
@@ -204,3 +204,4 @@ btTransform::operator*(const btTransform& t) const
 
 
 
+
diff --git a/extern/bullet2/src/LinearMath/btTransformUtil.h b/extern/bullet2/src/LinearMath/btTransformUtil.h
index bc42fd166b6..86ee1da5edf 100644
--- a/extern/bullet2/src/LinearMath/btTransformUtil.h
+++ b/extern/bullet2/src/LinearMath/btTransformUtil.h
@@ -25,7 +25,7 @@ subject to the following restrictions:
 
 #define btRecipSqrt(x) ((btScalar)(btScalar(1.0)/btSqrt(btScalar(x))))		/* reciprocal square root */
 
-inline btVector3 btAabbSupport(const btVector3& halfExtents,const btVector3& supportDir)
+SIMD_FORCE_INLINE btVector3 btAabbSupport(const btVector3& halfExtents,const btVector3& supportDir)
 {
 	return btVector3(supportDir.x() < btScalar(0.0) ? -halfExtents.x() : halfExtents.x(),
       supportDir.y() < btScalar(0.0) ? -halfExtents.y() : halfExtents.y(),
@@ -33,7 +33,7 @@ inline btVector3 btAabbSupport(const btVector3& halfExtents,const btVector3& sup
 }
 
 
-inline void btPlaneSpace1 (const btVector3& n, btVector3& p, btVector3& q)
+SIMD_FORCE_INLINE void btPlaneSpace1 (const btVector3& n, btVector3& p, btVector3& q)
 {
   if (btFabs(n.z()) > SIMDSQRT12) {
     // choose p in y-z plane
@@ -70,7 +70,9 @@ public:
 		predictedOrn += (angvel * predictedOrn) * (timeStep * btScalar(0.5));
 		predictedOrn.normalize();
 	#else
-		//exponential map
+		//Exponential map
+		//google for "Practical Parameterization of Rotations Using the Exponential Map", F. Sebastian Grassia
+
 		btVector3 axis;
 		btScalar	fAngle = angvel.length(); 
 		//limit the angular motion
@@ -121,6 +123,10 @@ public:
 		dmat.getRotation(dorn);
 #endif//USE_QUATERNION_DIFF
 	
+		///floating point inaccuracy can lead to w component > 1..., which breaks 
+
+		dorn.normalize();
+		
 		angle = dorn.getAngle();
 		axis = btVector3(dorn.x(),dorn.y(),dorn.z());
 		axis[3] = btScalar(0.);
diff --git a/extern/bullet2/src/LinearMath/btVector3.h b/extern/bullet2/src/LinearMath/btVector3.h
index 74d41ad2a19..96548c6ba60 100644
--- a/extern/bullet2/src/LinearMath/btVector3.h
+++ b/extern/bullet2/src/LinearMath/btVector3.h
@@ -27,6 +27,10 @@ class	btVector3 : public btQuadWord {
 public:
 	SIMD_FORCE_INLINE btVector3() {}
 
+	SIMD_FORCE_INLINE btVector3(const btQuadWordStorage& q) 
+		: btQuadWord(q)
+	{
+	}
 	
 
 	SIMD_FORCE_INLINE btVector3(const btScalar& x, const btScalar& y, const btScalar& z) 
@@ -43,6 +47,7 @@ public:
 
 	SIMD_FORCE_INLINE btVector3& operator+=(const btVector3& v)
 	{
+
 		m_x += v.x(); m_y += v.y(); m_z += v.z();
 		return *this;
 	}
@@ -399,4 +404,50 @@ public:
 
 };
 
+
+///btSwapVector3Endian swaps vector endianness, useful for network and cross-platform serialization
+SIMD_FORCE_INLINE void	btSwapScalarEndian(const btScalar& sourceVal, btScalar& destVal)
+{
+	#ifdef BT_USE_DOUBLE_PRECISION
+	unsigned char* dest = (unsigned char*) &destVal;
+	unsigned char* src  = (unsigned char*) &sourceVal;
+	dest[0] = src[7];
+    dest[1] = src[6];
+    dest[2] = src[5];
+    dest[3] = src[4];
+    dest[4] = src[3];
+    dest[5] = src[2];
+    dest[6] = src[1];
+    dest[7] = src[0];
+#else
+	unsigned char* dest = (unsigned char*) &destVal;
+	unsigned char* src  = (unsigned char*) &sourceVal;
+	dest[0] = src[3];
+    dest[1] = src[2];
+    dest[2] = src[1];
+    dest[3] = src[0];
+#endif //BT_USE_DOUBLE_PRECISION
+}
+///btSwapVector3Endian swaps vector endianness, useful for network and cross-platform serialization
+SIMD_FORCE_INLINE void	btSwapVector3Endian(const btVector3& sourceVec, btVector3& destVec)
+{
+	for (int i=0;i<4;i++)
+	{
+		btSwapScalarEndian(sourceVec[i],destVec[i]);
+	}
+
+}
+
+///btUnSwapVector3Endian swaps vector endianness, useful for network and cross-platform serialization
+SIMD_FORCE_INLINE void	btUnSwapVector3Endian(btVector3& vector)
+{
+
+	btVector3	swappedVec;
+	for (int i=0;i<4;i++)
+	{
+		btSwapScalarEndian(vector[i],swappedVec[i]);
+	}
+	vector = swappedVec;
+}
+
 #endif //SIMD__VECTOR3_H
diff --git a/extern/bullet2/src/btBulletCollisionCommon.h b/extern/bullet2/src/btBulletCollisionCommon.h
index 8417ccc671f..b21d8b4f66c 100644
--- a/extern/bullet2/src/btBulletCollisionCommon.h
+++ b/extern/bullet2/src/btBulletCollisionCommon.h
@@ -32,23 +32,26 @@ subject to the following restrictions:
 #include "BulletCollision/CollisionShapes/btConvexHullShape.h"
 #include "BulletCollision/CollisionShapes/btTriangleMesh.h"
 #include "BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h"
+#include "BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h"
 #include "BulletCollision/CollisionShapes/btTriangleMeshShape.h"
 #include "BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h"
 #include "BulletCollision/CollisionShapes/btCompoundShape.h"
 #include "BulletCollision/CollisionShapes/btTetrahedronShape.h"
 #include "BulletCollision/CollisionShapes/btEmptyShape.h"
-#include "BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h"
 #include "BulletCollision/CollisionShapes/btMultiSphereShape.h"
+#include "BulletCollision/CollisionShapes/btUniformScalingShape.h"
 
 ///Narrowphase Collision Detector
 #include "BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h"
 #include "BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h"
+#include "BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h"
 
 ///Dispatching and generation of collision pairs (broadphase)
 #include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h"
 #include "BulletCollision/BroadphaseCollision/btSimpleBroadphase.h"
 #include "BulletCollision/BroadphaseCollision/btAxisSweep3.h"
-
+#include "BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h"
+#include "BulletCollision/BroadphaseCollision/btDbvtBroadphase.h"
 
 ///Math library & Utils
 #include "LinearMath/btQuaternion.h"
diff --git a/extern/bullet2/src/btBulletDynamicsCommon.h b/extern/bullet2/src/btBulletDynamicsCommon.h
index 25f016cba8a..ce9bb1d968b 100644
--- a/extern/bullet2/src/btBulletDynamicsCommon.h
+++ b/extern/bullet2/src/btBulletDynamicsCommon.h
@@ -20,6 +20,8 @@ subject to the following restrictions:
 #include "btBulletCollisionCommon.h"
 
 #include "BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h"
+#include "BulletDynamics/Dynamics/btContinuousDynamicsWorld.h"
+
 #include "BulletDynamics/Dynamics/btSimpleDynamicsWorld.h"
 #include "BulletDynamics/Dynamics/btRigidBody.h"
 
@@ -27,9 +29,13 @@ subject to the following restrictions:
 #include "BulletDynamics/ConstraintSolver/btHingeConstraint.h"
 #include "BulletDynamics/ConstraintSolver/btConeTwistConstraint.h"
 #include "BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h"
-
+#include "BulletDynamics/ConstraintSolver/btSliderConstraint.h"
 
 #include "BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h"
+///Optional ODE quickstep constraint solver, redistributed under ZLib license
+#include "BulletDynamics/ConstraintSolver/btOdeQuickstepConstraintSolver.h"
+#include "BulletDynamics/ConstraintSolver/btOdeTypedJoint.h"
+
 ///Vehicle simulation, with wheel contact simulated by raycasts
 #include "BulletDynamics/Vehicle/btRaycastVehicle.h"
 
diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
index de91bce2ab1..f5fb8ce852d 100644
--- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
+++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
@@ -245,6 +245,11 @@ struct	BlenderDebugDraw : public btIDebugDraw
 	{
 		return m_debugMode;
 	}
+	///todo: find out if Blender can do this
+	virtual void	draw3dText(const btVector3& location,const char* textString)
+	{
+
+	}
 		
 };
 
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
index 2ec96c75a68..e85238b49c3 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
@@ -126,13 +126,14 @@ void CcdPhysicsController::CreateRigidbody()
 
 	m_bulletMotionState = new BlenderBulletMotionState(m_MotionState);
 
-	m_body = new btRigidBody(m_cci.m_mass,
-		m_bulletMotionState,
-		m_collisionShape,
-		m_cci.m_localInertiaTensor * m_cci.m_inertiaFactor,
-		m_cci.m_linearDamping,m_cci.m_angularDamping,
-		m_cci.m_friction,m_cci.m_restitution);
-
+	btRigidBody::btRigidBodyConstructionInfo rbci(m_cci.m_mass,m_bulletMotionState,m_collisionShape,m_cci.m_localInertiaTensor * m_cci.m_inertiaFactor);
+	rbci.m_linearDamping = m_cci.m_linearDamping;
+	rbci.m_angularDamping = m_cci.m_angularDamping;
+	rbci.m_friction = m_cci.m_friction;
+	rbci.m_restitution = m_cci.m_restitution;
+	
+	m_body = new btRigidBody(rbci);
+	
 	//
 	// init the rigidbody properly
 	//
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
index d14ddf8f65c..f9242e6876f 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
@@ -330,30 +330,21 @@ m_filterCallback(NULL)
 	{
 		m_triggerCallbacks[i] = 0;
 	}
+	m_collisionConfiguration = new btDefaultCollisionConfiguration();
+
 	if (!dispatcher)
 	{
-		dispatcher = new btCollisionDispatcher();
+		dispatcher = new btCollisionDispatcher(m_collisionConfiguration);
 		m_ownDispatcher = dispatcher;
 	}
 
-	if(!pairCache)
-	{
-
-		//todo: calculate/let user specify this world sizes
-		btVector3 worldMin(-10000,-10000,-10000);
-		btVector3 worldMax(10000,10000,10000);
-
-		pairCache = new btAxisSweep3(worldMin,worldMax);
-		// remember that this was allocated by us so that we can release it
-		m_ownPairCache = pairCache;
-		//broadphase = new btSimpleBroadphase();
-	}
+	m_broadphase = new btDbvtBroadphase();
 
 	m_filterCallback = new CcdOverlapFilterCallBack(this);
-	pairCache->setOverlapFilterCallback(m_filterCallback);
+	m_broadphase->getOverlappingPairCache()->setOverlapFilterCallback(m_filterCallback);
 
 	setSolverType(1);//issues with quickstep and memory allocations
-	m_dynamicsWorld = new btDiscreteDynamicsWorld(dispatcher,pairCache,m_solver);
+	m_dynamicsWorld = new btDiscreteDynamicsWorld(dispatcher,m_broadphase,m_solver,m_collisionConfiguration);
 	m_debugDrawer = 0;
 	m_gravity = btVector3(0.f,-10.f,0.f);
 	m_dynamicsWorld->setGravity(m_gravity);
@@ -519,6 +510,9 @@ bool	CcdPhysicsEnvironment::proceedDeltaTime(double curTime,float timeStep)
 		veh->SyncWheels();
 	}
 
+	m_dynamicsWorld->debugDrawWorld();
+
+
 	CallbackTriggers();
 
 	return true;
@@ -579,7 +573,7 @@ void		CcdPhysicsEnvironment::setSolverDamping(float damping)
 
 void		CcdPhysicsEnvironment::setLinearAirDamping(float damping)
 {
-	gLinearAirDamping = damping;
+	//gLinearAirDamping = damping;
 }
 
 void		CcdPhysicsEnvironment::setUseEpa(bool epa)
@@ -598,7 +592,7 @@ void		CcdPhysicsEnvironment::setSolverType(int solverType)
 			{
 
 				m_solver = new btSequentialImpulseConstraintSolver();
-				((btSequentialImpulseConstraintSolver*)m_solver)->setSolverMode(btSequentialImpulseConstraintSolver::SOLVER_USE_WARMSTARTING | btSequentialImpulseConstraintSolver::SOLVER_RANDMIZE_ORDER);
+//				((btSequentialImpulseConstraintSolver*)m_solver)->setSolverMode(btSequentialImpulseConstraintSolver::SOLVER_USE_WARMSTARTING | btSequentialImpulseConstraintSolver::SOLVER_RANDMIZE_ORDER);
 				break;
 			}
 		}
@@ -660,9 +654,10 @@ int			CcdPhysicsEnvironment::createUniversalD6Constraint(
 	{
 		
 
+		bool useReferenceFrameA = true;
 		genericConstraint = new btGeneric6DofConstraint(
 			*rb0,*rb1,
-			frameInA,frameInB);
+			frameInA,frameInB,useReferenceFrameA);
 		genericConstraint->setLinearLowerLimit(linearMinLimits);
 		genericConstraint->setLinearUpperLimit(linearMaxLimits);
 		genericConstraint->setAngularLowerLimit(angularMinLimits);
@@ -742,14 +737,15 @@ struct	FilterClosestRayResultCallback : public btCollisionWorld::ClosestRayResul
 		// save shape information as ClosestRayResultCallback::AddSingleResult() does not do it
 		if (rayResult.m_localShapeInfo)
 		{
-			m_hitTriangleShape = rayResult.m_localShapeInfo->m_triangleShape;
-			m_hitTriangleIndex = rayResult.m_localShapeInfo->m_triangleIndex;
+			m_hitTriangleShape = NULL;//rayResult.m_localShapeInfo->m_triangleShape;
+			m_hitTriangleIndex = 0;//rayResult.m_localShapeInfo->m_triangleIndex;
 		} else 
 		{
 			m_hitTriangleShape = NULL;
 			m_hitTriangleIndex = 0;
 		}
-		return ClosestRayResultCallback::AddSingleResult(rayResult);
+		bool normalInWorldspace = true;
+		return ClosestRayResultCallback::addSingleResult(rayResult,normalInWorldspace);
 	}
 
 };
@@ -775,8 +771,11 @@ PHY_IPhysicsController* CcdPhysicsEnvironment::rayTest(PHY_IRayCastFilterCallbac
 	memset(&result, 0, sizeof(result));
 
 	// don't collision with sensor object
-	m_dynamicsWorld->rayTest(rayFrom,rayTo,rayCallback, CcdConstructionInfo::AllFilter ^ CcdConstructionInfo::SensorFilter,filterCallback.m_faceNormal);
-	if (rayCallback.HasHit())
+	rayCallback.m_collisionFilterMask = CcdConstructionInfo::AllFilter ^ CcdConstructionInfo::SensorFilter;
+	//, ,filterCallback.m_faceNormal);
+
+	m_dynamicsWorld->rayTest(rayFrom,rayTo,rayCallback);
+	if (rayCallback.hasHit())
 	{
 		CcdPhysicsController* controller = static_cast<CcdPhysicsController*>(rayCallback.m_collisionObject->getUserPointer());
 		result.m_controller = controller;
@@ -881,6 +880,12 @@ CcdPhysicsEnvironment::~CcdPhysicsEnvironment()
 
 	if (NULL != m_filterCallback)
 		delete m_filterCallback;
+
+	if (NULL != m_collisionConfiguration)
+		delete m_collisionConfiguration;
+
+	if (NULL != m_broadphase)
+		delete m_broadphase;
 }
 
 
@@ -893,7 +898,7 @@ void	CcdPhysicsEnvironment::setConstraintParam(int constraintId,int param,float
 		{
 			//param = 1..12, min0,max0,min1,max1...min6,max6
 			btGeneric6DofConstraint* genCons = (btGeneric6DofConstraint*)typedConstraint;
-			genCons->SetLimit(param,value0,value1);
+			genCons->setLimit(param,value0,value1);
 			break;
 		};
 	default:
@@ -1239,10 +1244,11 @@ int			CcdPhysicsEnvironment::createConstraint(class PHY_IPhysicsController* ctrl
 				btTransform globalFrameA = rb0->getCenterOfMassTransform() * frameInA;
 				
 				frameInB = inv  * globalFrameA;
-				
+				bool useReferenceFrameA = true;
+
 				genericConstraint = new btGeneric6DofConstraint(
 					*rb0,*rb1,
-					frameInA,frameInB);
+					frameInA,frameInB,useReferenceFrameA);
 
 
 			} else
@@ -1263,9 +1269,10 @@ int			CcdPhysicsEnvironment::createConstraint(class PHY_IPhysicsController* ctrl
 				///frameInB in worldspace
 				frameInB = rb0->getCenterOfMassTransform() * frameInA;
 
+				bool useReferenceFrameA = true;
 				genericConstraint = new btGeneric6DofConstraint(
 					*rb0,s_fixedObject2,
-					frameInA,frameInB);
+					frameInA,frameInB,useReferenceFrameA);
 			}
 			
 			if (genericConstraint)
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
index 667e310dcb3..3cf5a943e3f 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
@@ -56,6 +56,10 @@ class CcdPhysicsEnvironment : public PHY_IPhysicsEnvironment
 
 protected:
 	btIDebugDraw*	m_debugDrawer;
+	
+	class btDefaultCollisionConfiguration* m_collisionConfiguration;
+	class btBroadphaseInterface*			m_broadphase;
+
 	//solver iterations
 	int	m_numIterations;
 	

From b818b1a16496b6c68443f8cfd56079df201560cf Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Wed, 3 Sep 2008 03:24:01 +0000
Subject: [PATCH 242/252] cleanup mesh materials option was setting incorrect
 material indicies

---
 release/scripts/mesh_cleanup.py | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/release/scripts/mesh_cleanup.py b/release/scripts/mesh_cleanup.py
index 608201acb98..27adca335cb 100644
--- a/release/scripts/mesh_cleanup.py
+++ b/release/scripts/mesh_cleanup.py
@@ -121,25 +121,29 @@ def rem_unused_materials(me):
 	material_users= dict( [(i,0) for i in xrange(len_materials)] )
 	
 	for f in me.faces:
+		f_mat = f.mat
 		# Make sure the face index isnt too big. this happens sometimes.
-		if f.mat >= len_materials:
-			f.mat=0
-		material_users[f.mat] += 1
+		if f_mat >= len_materials:
+			f_mat = f.mat = 0
+		material_users[f_mat] += 1
 	
-	mat_idx_subtract= 0
-	reindex_mapping= dict( [(i,0) for i in xrange(len_materials)] )
-	i= len_materials
-	while i:
-		i-=1
-		
+	# mat_idx_subtract= 0
+	# reindex_mapping= dict( [(i,0) for i in xrange(len_materials)] )
+	
+	reindex_mapping_ls = range(len_materials)
+	for i in range(len_materials-1, -1, -1):
 		if material_users[i] == 0:
-			mat_idx_subtract+=1
-			reindex_mapping[i]= mat_idx_subtract
-			materials.pop(i)
+			del reindex_mapping_ls[i]
+			del materials[i]
 			rem_materials+=1
 	
+	reindex_mapping= {}
+	
+	for i, mat in enumerate(reindex_mapping_ls):
+		reindex_mapping[mat] = i		
+	
 	for f in me.faces:
-		f.mat= f.mat - reindex_mapping[f.mat]
+		f.mat= reindex_mapping[f.mat]
 	
 	me.materials= materials
 	return rem_materials
@@ -449,4 +453,4 @@ def main():
 	
 	
 if __name__ == '__main__':
-	main()
+	main()
\ No newline at end of file

From cfa07e8d2bdc0a8db15082a692ce25c2fb010ae6 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Wed, 3 Sep 2008 06:43:07 +0000
Subject: [PATCH 243/252] BGE Py api, deleting properties didnt raise an error
 when the property wasnt there. also added some exception messages and renamed
 joystick getConnected() to isConnected()

---
 .../gameengine/Expressions/PyObjectPlus.cpp   |  4 ++-
 source/gameengine/Expressions/Value.cpp       | 30 ++++++++++++-------
 .../GameLogic/SCA_JoystickSensor.cpp          |  2 +-
 source/gameengine/Ketsji/KX_GameObject.cpp    | 10 +++++--
 4 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/source/gameengine/Expressions/PyObjectPlus.cpp b/source/gameengine/Expressions/PyObjectPlus.cpp
index 8937f481922..1eca527151a 100644
--- a/source/gameengine/Expressions/PyObjectPlus.cpp
+++ b/source/gameengine/Expressions/PyObjectPlus.cpp
@@ -119,6 +119,7 @@ PyObject *PyObjectPlus::_getattr(const STR_String& attr)
 
 int PyObjectPlus::_delattr(const STR_String& attr)
 {
+	PyErr_SetString(PyExc_AttributeError, "attribute cant be deleted");
 	return 1;
 }
 
@@ -126,7 +127,8 @@ int PyObjectPlus::_setattr(const STR_String& attr, PyObject *value)
 {
 	//return PyObject::_setattr(attr,value);
 	//cerr << "Unknown attribute" << endl;
-  return 1;
+	PyErr_SetString(PyExc_AttributeError, "attribute cant be set");
+	return 1;
 }
 
 /*------------------------------
diff --git a/source/gameengine/Expressions/Value.cpp b/source/gameengine/Expressions/Value.cpp
index 7bcb45228db..7296dfbec10 100644
--- a/source/gameengine/Expressions/Value.cpp
+++ b/source/gameengine/Expressions/Value.cpp
@@ -391,16 +391,23 @@ float CValue::GetPropertyNumber(const STR_String& inName,float defnumber)
 bool CValue::RemoveProperty(const STR_String & inName)
 {
 	// Check if there are properties at all which can be removed
-	if (m_pNamedPropertyArray == NULL)
-		return false;
-
-	CValue* val = GetProperty(inName);
-	if (NULL != val) 
-	{
-		val->Release();
-		m_pNamedPropertyArray->erase(inName);
-		return true;
-	}
+	if (m_pNamedPropertyArray) {	
+		CValue* val = GetProperty(inName);
+		if (NULL != val) 
+		{
+			val->Release();
+			m_pNamedPropertyArray->erase(inName);
+			return true;
+		}
+	} 
+	
+	char err[128];
+	if (m_pNamedPropertyArray)
+		sprintf(err, "attribute \"%s\" dosnt exist", inName.ReadPtr());
+	else
+		sprintf(err, "attribute \"%s\" dosnt exist (no property array)", inName.ReadPtr());
+	
+	PyErr_SetString(PyExc_AttributeError, err);
 	return false;
 }
 
@@ -755,7 +762,8 @@ CValue* CValue::ConvertPythonToValue(PyObject* pyobj)
 
 int	CValue::_delattr(const STR_String& attr)
 {
-	RemoveProperty(attr);
+	if (!RemoveProperty(attr)) /* sets error */
+		return 1;
 	return 0;
 }
 
diff --git a/source/gameengine/GameLogic/SCA_JoystickSensor.cpp b/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
index b32cbd83285..645afc8964b 100644
--- a/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
+++ b/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
@@ -329,7 +329,7 @@ PyMethodDef SCA_JoystickSensor::Methods[] = {
 	{"getNumAxes",	 (PyCFunction) SCA_JoystickSensor::sPyNumberOfAxes,	METH_NOARGS,	NumberOfAxes_doc},
 	{"getNumButtons",(PyCFunction) SCA_JoystickSensor::sPyNumberOfButtons,METH_NOARGS,	NumberOfButtons_doc},
 	{"getNumHats",	 (PyCFunction) SCA_JoystickSensor::sPyNumberOfHats,	METH_NOARGS,	NumberOfHats_doc},
-	{"getConnected", (PyCFunction) SCA_JoystickSensor::sPyConnected,	METH_NOARGS,	Connected_doc},
+	{"isConnected", (PyCFunction) SCA_JoystickSensor::sPyConnected,		METH_NOARGS,	Connected_doc},
 	{NULL,NULL} //Sentinel
 };
 
diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp
index c1b228e8d26..cc2956813c1 100644
--- a/source/gameengine/Ketsji/KX_GameObject.cpp
+++ b/source/gameengine/Ketsji/KX_GameObject.cpp
@@ -1036,11 +1036,15 @@ PyObject* KX_GameObject::_getattr(const STR_String& attr)
 
 int KX_GameObject::_setattr(const STR_String& attr, PyObject *value)	// _setattr method
 {
-	if (attr == "mass")
+	if (attr == "mass") {
+		PyErr_SetString(PyExc_AttributeError, "attribute \"mass\" is read only");
 		return 1;
+	}
 	
-	if (attr == "parent")
+	if (attr == "parent") {
+		PyErr_SetString(PyExc_AttributeError, "attribute \"mass\" is read only\nUse setParent()");
 		return 1;
+	}
 		
 	if (PyInt_Check(value))
 	{
@@ -1106,7 +1110,7 @@ int KX_GameObject::_setattr(const STR_String& attr, PyObject *value)	// _setattr
 				}
 				return 1;
 			}
-			
+			PyErr_SetString(PyExc_AttributeError, "could not set the orientation from a 3x3 matrix, quaternion or euler sequence");
 			return 1;
 		}
 		

From 096b4638c461cba2e97d336553225e3001da438f Mon Sep 17 00:00:00 2001
From: Daniel Genrich <daniel.genrich@gmx.net>
Date: Wed, 3 Sep 2008 11:11:11 +0000
Subject: [PATCH 244/252] Revert rev16344 on trunk, bullet work is done in
 sim_physics branch as discussed on sunday meeting

---
 extern/bullet2/src/Bullet-C-Api.h             |  136 +-
 .../BroadphaseCollision/btAxisSweep3.cpp      |  636 +++-
 .../BroadphaseCollision/btAxisSweep3.h        |  865 +-----
 .../btBroadphaseInterface.h                   |   28 +-
 .../BroadphaseCollision/btBroadphaseProxy.h   |   55 +-
 .../btCollisionAlgorithm.cpp                  |    2 +-
 .../btCollisionAlgorithm.h                    |   11 +-
 .../BroadphaseCollision/btDbvt.cpp            | 1320 ---------
 .../BroadphaseCollision/btDbvt.h              | 1101 -------
 .../BroadphaseCollision/btDbvtBroadphase.cpp  |  344 ---
 .../BroadphaseCollision/btDbvtBroadphase.h    |  103 -
 .../BroadphaseCollision/btDispatcher.h        |   22 +-
 .../btMultiSapBroadphase.cpp                  |  466 ---
 .../btMultiSapBroadphase.h                    |  144 -
 .../btOverlappingPairCache.cpp                |  515 +---
 .../btOverlappingPairCache.h                  |  351 +--
 .../btOverlappingPairCallback.h               |   40 -
 .../BroadphaseCollision/btQuantizedBvh.cpp    | 1025 -------
 .../BroadphaseCollision/btQuantizedBvh.h      |  486 ----
 .../btSimpleBroadphase.cpp                    |  246 +-
 .../BroadphaseCollision/btSimpleBroadphase.h  |  101 +-
 .../SphereTriangleDetector.cpp                |   15 +-
 .../SphereTriangleDetector.h                  |    6 +-
 .../btBoxBoxCollisionAlgorithm.cpp            |   85 -
 .../btBoxBoxCollisionAlgorithm.h              |   66 -
 .../CollisionDispatch/btBoxBoxDetector.cpp    |  683 -----
 .../CollisionDispatch/btBoxBoxDetector.h      |   44 -
 .../btCollisionConfiguration.h                |   47 -
 .../CollisionDispatch/btCollisionCreateFunc.h |    2 +-
 .../btCollisionDispatcher.cpp                 |  237 +-
 .../CollisionDispatch/btCollisionDispatcher.h |   62 +-
 .../CollisionDispatch/btCollisionObject.cpp   |   10 +-
 .../CollisionDispatch/btCollisionObject.h     |   71 +-
 .../CollisionDispatch/btCollisionWorld.cpp    |  633 ++--
 .../CollisionDispatch/btCollisionWorld.h      |  210 +-
 .../btCompoundCollisionAlgorithm.cpp          |   36 +-
 .../btCompoundCollisionAlgorithm.h            |   28 +-
 .../btConvexConcaveCollisionAlgorithm.cpp     |   27 +-
 .../btConvexConcaveCollisionAlgorithm.h       |   24 +-
 .../btConvexConvexAlgorithm.cpp               |   20 +-
 .../btConvexConvexAlgorithm.h                 |   25 +-
 .../btConvexPlaneCollisionAlgorithm.cpp       |  108 -
 .../btConvexPlaneCollisionAlgorithm.h         |   71 -
 .../btDefaultCollisionConfiguration.cpp       |  281 --
 .../btDefaultCollisionConfiguration.h         |  112 -
 .../btEmptyCollisionAlgorithm.h               |   10 +-
 .../CollisionDispatch/btManifoldResult.cpp    |   30 +-
 .../CollisionDispatch/btManifoldResult.h      |   29 +-
 .../btSimulationIslandManager.cpp             |  129 +-
 .../btSimulationIslandManager.h               |   14 +-
 .../btSphereBoxCollisionAlgorithm.cpp         |   19 +-
 .../btSphereBoxCollisionAlgorithm.h           |   23 +-
 .../btSphereSphereCollisionAlgorithm.cpp      |   19 +-
 .../btSphereSphereCollisionAlgorithm.h        |   18 +-
 .../btSphereTriangleCollisionAlgorithm.cpp    |   18 +-
 .../btSphereTriangleCollisionAlgorithm.h      |   18 +-
 .../CollisionDispatch/btUnionFind.cpp         |    4 +-
 .../CollisionDispatch/btUnionFind.h           |    6 +-
 .../CollisionShapes/btBoxShape.cpp            |   11 +-
 .../CollisionShapes/btBoxShape.h              |  104 +-
 .../btBvhTriangleMeshShape.cpp                |  223 +-
 .../CollisionShapes/btBvhTriangleMeshShape.h  |   40 +-
 .../CollisionShapes/btCapsuleShape.cpp        |   36 +-
 .../CollisionShapes/btCapsuleShape.h          |   77 +-
 .../CollisionShapes/btCollisionShape.cpp      |    9 +-
 .../CollisionShapes/btCollisionShape.h        |   45 +-
 .../CollisionShapes/btCompoundShape.cpp       |   61 +-
 .../CollisionShapes/btCompoundShape.h         |   75 +-
 .../CollisionShapes/btConcaveShape.h          |    6 +-
 .../CollisionShapes/btConeShape.h             |   12 +-
 .../CollisionShapes/btConvexHullShape.h       |   20 +-
 .../CollisionShapes/btConvexInternalShape.cpp |   78 -
 .../CollisionShapes/btConvexInternalShape.h   |   98 -
 .../CollisionShapes/btConvexShape.cpp         |   59 +
 .../CollisionShapes/btConvexShape.h           |   93 +-
 .../btConvexTriangleMeshShape.cpp             |    5 +-
 .../btConvexTriangleMeshShape.h               |   17 +-
 .../CollisionShapes/btCylinderShape.cpp       |   14 +-
 .../CollisionShapes/btCylinderShape.h         |   20 +-
 .../CollisionShapes/btEmptyShape.cpp          |    2 +-
 .../CollisionShapes/btEmptyShape.h            |   14 +-
 .../btHeightfieldTerrainShape.cpp             |  107 +-
 .../btHeightfieldTerrainShape.h               |   17 +-
 .../CollisionShapes/btMaterial.h              |   34 -
 .../CollisionShapes/btMinkowskiSumShape.cpp   |    6 +-
 .../CollisionShapes/btMinkowskiSumShape.h     |   12 +-
 .../CollisionShapes/btMultiSphereShape.cpp    |    4 +-
 .../CollisionShapes/btMultiSphereShape.h      |   13 +-
 .../btMultimaterialTriangleMeshShape.cpp      |   45 -
 .../btMultimaterialTriangleMeshShape.h        |  124 -
 .../CollisionShapes/btOptimizedBvh.cpp        |  659 ++++-
 .../CollisionShapes/btOptimizedBvh.h          |  297 +-
 .../btPolyhedralConvexShape.cpp               |   42 +-
 .../CollisionShapes/btPolyhedralConvexShape.h |   14 +-
 .../CollisionShapes/btShapeHull.cpp           |  164 --
 .../CollisionShapes/btShapeHull.h             |   56 -
 .../CollisionShapes/btSphereShape.cpp         |    2 +-
 .../CollisionShapes/btSphereShape.h           |   20 +-
 .../CollisionShapes/btStaticPlaneShape.cpp    |    5 +-
 .../CollisionShapes/btStaticPlaneShape.h      |   16 +-
 .../btStridingMeshInterface.cpp               |    6 +-
 .../CollisionShapes/btStridingMeshInterface.h |   12 +-
 .../CollisionShapes/btTetrahedronShape.h      |    6 +-
 .../CollisionShapes/btTriangleBuffer.cpp      |    9 +-
 .../CollisionShapes/btTriangleBuffer.h        |   10 +-
 .../CollisionShapes/btTriangleCallback.h      |    4 +-
 .../btTriangleIndexVertexArray.cpp            |   45 +-
 .../btTriangleIndexVertexArray.h              |   40 +-
 .../btTriangleIndexVertexMaterialArray.cpp    |   86 -
 .../btTriangleIndexVertexMaterialArray.h      |   84 -
 .../CollisionShapes/btTriangleMesh.cpp        |  117 +-
 .../CollisionShapes/btTriangleMesh.h          |   62 +-
 .../CollisionShapes/btTriangleMeshShape.cpp   |   14 +-
 .../CollisionShapes/btTriangleMeshShape.h     |   17 +-
 .../CollisionShapes/btTriangleShape.h         |   18 +-
 .../CollisionShapes/btUniformScalingShape.cpp |  114 -
 .../CollisionShapes/btUniformScalingShape.h   |   88 -
 .../btContinuousConvexCollision.cpp           |   41 +-
 .../btContinuousConvexCollision.h             |    6 +-
 .../NarrowPhaseCollision/btConvexCast.h       |   18 +-
 .../btConvexPenetrationDepthSolver.h          |    4 +-
 .../btDiscreteCollisionDetectorInterface.h    |    6 +-
 .../NarrowPhaseCollision/btGjkConvexCast.cpp  |  162 +-
 .../NarrowPhaseCollision/btGjkConvexCast.h    |   10 +-
 .../NarrowPhaseCollision/btGjkEpa.cpp         |   10 +-
 .../NarrowPhaseCollision/btGjkEpa.h           |    8 +-
 .../NarrowPhaseCollision/btGjkEpa2.cpp        |  943 ------
 .../NarrowPhaseCollision/btGjkEpa2.h          |   71 -
 .../btGjkEpaPenetrationDepthSolver.cpp        |   13 +-
 .../btGjkEpaPenetrationDepthSolver.h          |    2 +-
 .../btGjkPairDetector.cpp                     |   11 +-
 .../NarrowPhaseCollision/btGjkPairDetector.h  |   12 +-
 .../NarrowPhaseCollision/btManifoldPoint.h    |   26 +-
 .../btMinkowskiPenetrationDepthSolver.cpp     |    7 +-
 .../btMinkowskiPenetrationDepthSolver.h       |    2 +-
 .../btPersistentManifold.cpp                  |   38 +-
 .../btPersistentManifold.h                    |   62 +-
 .../btRaycastCallback.cpp                     |   72 +-
 .../NarrowPhaseCollision/btRaycastCallback.h  |   27 +-
 .../btSimplexSolverInterface.h                |    4 +-
 .../btSubSimplexConvexCast.cpp                |   80 +-
 .../btVoronoiSimplexSolver.cpp                |    2 +-
 .../btConeTwistConstraint.cpp                 |   27 +-
 .../ConstraintSolver/btConeTwistConstraint.h  |    3 -
 .../ConstraintSolver/btConstraintSolver.h     |   13 +-
 .../ConstraintSolver/btContactConstraint.cpp  |   32 +-
 .../ConstraintSolver/btContactConstraint.h    |    4 +-
 .../ConstraintSolver/btContactSolverInfo.h    |   56 +-
 .../btGeneric6DofConstraint.cpp               |  821 +++---
 .../btGeneric6DofConstraint.h                 |  463 +--
 .../ConstraintSolver/btHingeConstraint.cpp    |  269 +-
 .../ConstraintSolver/btHingeConstraint.h      |   97 +-
 .../ConstraintSolver/btJacobianEntry.h        |    4 +-
 .../btPoint2PointConstraint.cpp               |   15 +-
 .../btPoint2PointConstraint.h                 |   18 +-
 .../btSequentialImpulseConstraintSolver.cpp   |  840 ++----
 .../btSequentialImpulseConstraintSolver.h     |   48 +-
 .../ConstraintSolver/btSliderConstraint.cpp   |  414 ---
 .../ConstraintSolver/btSliderConstraint.h     |  215 --
 .../btSolve2LinearConstraint.h                |    4 +-
 .../ConstraintSolver/btSolverBody.h           |   64 +-
 .../ConstraintSolver/btSolverConstraint.h     |   21 +-
 .../ConstraintSolver/btTypedConstraint.cpp    |   15 +-
 .../ConstraintSolver/btTypedConstraint.h      |   38 +-
 .../BulletDynamics/Dynamics/Bullet-C-API.cpp  |  366 +--
 .../Dynamics/btContinuousDynamicsWorld.cpp    |  193 --
 .../Dynamics/btContinuousDynamicsWorld.h      |   46 -
 .../Dynamics/btDiscreteDynamicsWorld.cpp      |  463 ++-
 .../Dynamics/btDiscreteDynamicsWorld.h        |   42 +-
 .../BulletDynamics/Dynamics/btDynamicsWorld.h |   86 +-
 .../BulletDynamics/Dynamics/btRigidBody.cpp   |  222 +-
 .../src/BulletDynamics/Dynamics/btRigidBody.h |  189 +-
 .../Dynamics/btSimpleDynamicsWorld.cpp        |   52 +-
 .../Dynamics/btSimpleDynamicsWorld.h          |   32 +-
 .../Vehicle/btRaycastVehicle.cpp              |   72 +-
 .../BulletDynamics/Vehicle/btRaycastVehicle.h |   14 +-
 .../Vehicle/btVehicleRaycaster.h              |    2 +-
 .../src/BulletDynamics/Vehicle/btWheelInfo.h  |    4 +-
 .../bullet2/src/BulletSoftBody/CMakeLists.txt |   21 -
 .../bullet2/src/BulletSoftBody/btSoftBody.cpp | 2590 -----------------
 .../bullet2/src/BulletSoftBody/btSoftBody.h   |  810 ------
 .../btSoftBodyConcaveCollisionAlgorithm.cpp   |  410 ---
 .../btSoftBodyConcaveCollisionAlgorithm.h     |  118 -
 .../src/BulletSoftBody/btSoftBodyHelpers.cpp  |  656 -----
 .../src/BulletSoftBody/btSoftBodyHelpers.h    |  107 -
 .../src/BulletSoftBody/btSoftBodyInternals.h  |  895 ------
 ...oftBodyRigidBodyCollisionConfiguration.cpp |  108 -
 ...tSoftBodyRigidBodyCollisionConfiguration.h |   48 -
 .../btSoftRigidCollisionAlgorithm.cpp         |   79 -
 .../btSoftRigidCollisionAlgorithm.h           |   75 -
 .../btSoftRigidDynamicsWorld.cpp              |  126 -
 .../BulletSoftBody/btSoftRigidDynamicsWorld.h |   73 -
 .../btSoftSoftCollisionAlgorithm.cpp          |   46 -
 .../btSoftSoftCollisionAlgorithm.h            |   69 -
 .../bullet2/src/BulletSoftBody/btSparseSDF.h  |  306 --
 extern/bullet2/src/LinearMath/btAabbUtil2.h   |   49 +-
 .../src/LinearMath/btAlignedAllocator.cpp     |  185 +-
 .../src/LinearMath/btAlignedAllocator.h       |   28 +-
 .../src/LinearMath/btAlignedObjectArray.h     |   69 +-
 .../src/LinearMath/btDefaultMotionState.h     |    2 +-
 .../bullet2/src/LinearMath/btGeometryUtil.cpp |    9 +-
 .../bullet2/src/LinearMath/btGeometryUtil.h   |    1 -
 extern/bullet2/src/LinearMath/btIDebugDraw.h  |   16 -
 extern/bullet2/src/LinearMath/btMatrix3x3.h   |   11 +-
 extern/bullet2/src/LinearMath/btMinMax.h      |   12 +-
 extern/bullet2/src/LinearMath/btMotionState.h |    2 +-
 extern/bullet2/src/LinearMath/btQuadWord.h    |   71 +-
 extern/bullet2/src/LinearMath/btQuaternion.h  |   10 +-
 extern/bullet2/src/LinearMath/btQuickprof.cpp |  302 +-
 extern/bullet2/src/LinearMath/btQuickprof.h   |  864 ++++--
 extern/bullet2/src/LinearMath/btScalar.h      |  253 +-
 extern/bullet2/src/LinearMath/btStackAlloc.h  |   19 +-
 extern/bullet2/src/LinearMath/btTransform.h   |   19 +-
 .../bullet2/src/LinearMath/btTransformUtil.h  |   12 +-
 extern/bullet2/src/LinearMath/btVector3.h     |   51 -
 extern/bullet2/src/btBulletCollisionCommon.h  |    7 +-
 extern/bullet2/src/btBulletDynamicsCommon.h   |    8 +-
 .../Converter/KX_BlenderSceneConverter.cpp    |    5 -
 .../Physics/Bullet/CcdPhysicsController.cpp   |   15 +-
 .../Physics/Bullet/CcdPhysicsEnvironment.cpp  |   61 +-
 .../Physics/Bullet/CcdPhysicsEnvironment.h    |    4 -
 221 files changed, 5266 insertions(+), 24982 deletions(-)
 delete mode 100644 extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.cpp
 delete mode 100644 extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.h
 delete mode 100644 extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp
 delete mode 100644 extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h
 delete mode 100644 extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp
 delete mode 100644 extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h
 delete mode 100644 extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h
 delete mode 100644 extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp
 delete mode 100644 extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
 delete mode 100644 extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp
 delete mode 100644 extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h
 delete mode 100644 extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp
 delete mode 100644 extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.h
 delete mode 100644 extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h
 delete mode 100644 extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp
 delete mode 100644 extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h
 delete mode 100644 extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp
 delete mode 100644 extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h
 delete mode 100644 extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp
 delete mode 100644 extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.h
 delete mode 100644 extern/bullet2/src/BulletCollision/CollisionShapes/btMaterial.h
 delete mode 100644 extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp
 delete mode 100644 extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h
 delete mode 100644 extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.cpp
 delete mode 100644 extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.h
 delete mode 100644 extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp
 delete mode 100644 extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h
 delete mode 100644 extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.cpp
 delete mode 100644 extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.h
 delete mode 100644 extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp
 delete mode 100644 extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h
 delete mode 100644 extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp
 delete mode 100644 extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h
 delete mode 100644 extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp
 delete mode 100644 extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.h
 delete mode 100644 extern/bullet2/src/BulletSoftBody/CMakeLists.txt
 delete mode 100644 extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
 delete mode 100644 extern/bullet2/src/BulletSoftBody/btSoftBody.h
 delete mode 100644 extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp
 delete mode 100644 extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
 delete mode 100644 extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp
 delete mode 100644 extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.h
 delete mode 100644 extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h
 delete mode 100644 extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp
 delete mode 100644 extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h
 delete mode 100644 extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp
 delete mode 100644 extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h
 delete mode 100644 extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp
 delete mode 100644 extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.h
 delete mode 100644 extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp
 delete mode 100644 extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h
 delete mode 100644 extern/bullet2/src/BulletSoftBody/btSparseSDF.h

diff --git a/extern/bullet2/src/Bullet-C-Api.h b/extern/bullet2/src/Bullet-C-Api.h
index a196f6417bc..078dcae63bb 100644
--- a/extern/bullet2/src/Bullet-C-Api.h
+++ b/extern/bullet2/src/Bullet-C-Api.h
@@ -23,145 +23,11 @@ subject to the following restrictions:
 #ifndef BULLET_C_API_H
 #define BULLET_C_API_H
 
-#define PL_DECLARE_HANDLE(name) typedef struct name##__ { int unused; } *name
-
-#ifdef BT_USE_DOUBLE_PRECISION
-typedef double	plReal;
-#else
-typedef float	plReal;
-#endif
-
-typedef plReal	plVector3[3];
-typedef plReal	plQuaternion[4];
-
 #ifdef __cplusplus
 extern "C" { 
 #endif
 
-/*	Particular physics SDK */
-	PL_DECLARE_HANDLE(plPhysicsSdkHandle);
-
-/* 	Dynamics world, belonging to some physics SDK */
-	PL_DECLARE_HANDLE(plDynamicsWorldHandle);
-
-/* Rigid Body that can be part of a Dynamics World */	
-	PL_DECLARE_HANDLE(plRigidBodyHandle);
-
-/* 	Collision Shape/Geometry, property of a Rigid Body */
-	PL_DECLARE_HANDLE(plCollisionShapeHandle);
-
-/* Constraint for Rigid Bodies */
-	PL_DECLARE_HANDLE(plConstraintHandle);
-
-/* Triangle Mesh interface */
-	PL_DECLARE_HANDLE(plMeshInterfaceHandle);
-
-/* Broadphase Scene/Proxy Handles */
-	PL_DECLARE_HANDLE(plCollisionBroadphaseHandle);
-	PL_DECLARE_HANDLE(plBroadphaseProxyHandle);
-	PL_DECLARE_HANDLE(plCollisionWorldHandle);
-
-/*
-	Create and Delete a Physics SDK	
-*/
-
-	extern	plPhysicsSdkHandle	plNewBulletSdk(); //this could be also another sdk, like ODE, PhysX etc.
-	extern	void		plDeletePhysicsSdk(plPhysicsSdkHandle	physicsSdk);
-
-/* Collision World, not strictly necessary, you can also just create a Dynamics World with Rigid Bodies which internally manages the Collision World with Collision Objects */
-
-	typedef void(*btBroadphaseCallback)(void* clientData, void* object1,void* object2);
-
-	extern plCollisionBroadphaseHandle	plCreateSapBroadphase(btBroadphaseCallback beginCallback,btBroadphaseCallback endCallback);
-
-	extern void	plDestroyBroadphase(plCollisionBroadphaseHandle bp);
-
-	extern 	plBroadphaseProxyHandle plCreateProxy(plCollisionBroadphaseHandle bp, void* clientData, plReal minX,plReal minY,plReal minZ, plReal maxX,plReal maxY, plReal maxZ);
-
-	extern void plDestroyProxy(plCollisionBroadphaseHandle bp, plBroadphaseProxyHandle proxyHandle);
-
-	extern void plSetBoundingBox(plBroadphaseProxyHandle proxyHandle, plReal minX,plReal minY,plReal minZ, plReal maxX,plReal maxY, plReal maxZ);
-
-/* todo: add pair cache support with queries like add/remove/find pair */
-	
-	extern plCollisionWorldHandle plCreateCollisionWorld(plPhysicsSdkHandle physicsSdk);
-
-/* todo: add/remove objects */
-	
-
-/* Dynamics World */
-
-	extern  plDynamicsWorldHandle plCreateDynamicsWorld(plPhysicsSdkHandle physicsSdk);
-
-	extern  void           plDeleteDynamicsWorld(plDynamicsWorldHandle world);
-
-	extern	void	plStepSimulation(plDynamicsWorldHandle,	plReal	timeStep);
-
-	extern  void plAddRigidBody(plDynamicsWorldHandle world, plRigidBodyHandle object);
-
-	extern  void plRemoveRigidBody(plDynamicsWorldHandle world, plRigidBodyHandle object);
-
-
-/* Rigid Body  */
-
-	extern  plRigidBodyHandle plCreateRigidBody(	void* user_data,  float mass, plCollisionShapeHandle cshape );
-
-	extern  void plDeleteRigidBody(plRigidBodyHandle body);
-
-
-/* Collision Shape definition */
-
-	extern  plCollisionShapeHandle plNewSphereShape(plReal radius);
-	extern  plCollisionShapeHandle plNewBoxShape(plReal x, plReal y, plReal z);
-	extern  plCollisionShapeHandle plNewCapsuleShape(plReal radius, plReal height);	
-	extern  plCollisionShapeHandle plNewConeShape(plReal radius, plReal height);
-	extern  plCollisionShapeHandle plNewCylinderShape(plReal radius, plReal height);
-	extern	plCollisionShapeHandle plNewCompoundShape();
-	extern	void	plAddChildShape(plCollisionShapeHandle compoundShape,plCollisionShapeHandle childShape, plVector3 childPos,plQuaternion childOrn);
-
-	extern  void plDeleteShape(plCollisionShapeHandle shape);
-
-	/* Convex Meshes */
-	extern  plCollisionShapeHandle plNewConvexHullShape();
-	extern  void		plAddVertex(plCollisionShapeHandle convexHull, plReal x,plReal y,plReal z);
-/* Concave static triangle meshes */
-	extern  plMeshInterfaceHandle		   plNewMeshInterface();
-	extern  void		plAddTriangle(plMeshInterfaceHandle meshHandle, plVector3 v0,plVector3 v1,plVector3 v2);
-	extern  plCollisionShapeHandle plNewStaticTriangleMeshShape(plMeshInterfaceHandle);
-
-	extern  void plSetScaling(plCollisionShapeHandle shape, plVector3 scaling);
-
-/* SOLID has Response Callback/Table/Management */
-/* PhysX has Triggers, User Callbacks and filtering */
-/* ODE has the typedef void dNearCallback (void *data, dGeomID o1, dGeomID o2); */
-
-/*	typedef void plUpdatedPositionCallback(void* userData, plRigidBodyHandle	rbHandle, plVector3 pos); */
-/*	typedef void plUpdatedOrientationCallback(void* userData, plRigidBodyHandle	rbHandle, plQuaternion orientation); */
-
-	/* get world transform */
-	extern void	plGetOpenGLMatrix(plRigidBodyHandle object, plReal* matrix);
-	extern void	plGetPosition(plRigidBodyHandle object,plVector3 position);
-	extern void plGetOrientation(plRigidBodyHandle object,plQuaternion orientation);
-
-	/* set world transform (position/orientation) */
-	extern  void plSetPosition(plRigidBodyHandle object, const plVector3 position);
-	extern  void plSetOrientation(plRigidBodyHandle object, const plQuaternion orientation);
-	extern	void plSetEuler(plReal yaw,plReal pitch,plReal roll, plQuaternion orient);
-
-	typedef struct plRayCastResult {
-		plRigidBodyHandle		m_body;  
-		plCollisionShapeHandle	m_shape; 		
-		plVector3				m_positionWorld; 		
-		plVector3				m_normalWorld;
-	} plRayCastResult;
-
-	extern  int plRayCast(plDynamicsWorldHandle world, const plVector3 rayStart, const plVector3 rayEnd, plRayCastResult res);
-
-	/* Sweep API */
-
-	/* extern  plRigidBodyHandle plObjectCast(plDynamicsWorldHandle world, const plVector3 rayStart, const plVector3 rayEnd, plVector3 hitpoint, plVector3 normal); */
-
-	/* Continuous Collision Detection API */
+double plNearestPoints(float p1[3], float p2[3], float p3[3], float q1[3], float q2[3], float q3[3], float *pa, float *pb, float normal[3]);
 
 #ifdef __cplusplus
 }
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp
index d7eea33ea41..be4a11506df 100644
--- a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp
+++ b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp
@@ -21,18 +21,640 @@
 
 #include <assert.h>
 
-btAxisSweep3::btAxisSweep3(const btPoint3& worldAabbMin,const btPoint3& worldAabbMax, unsigned short int maxHandles, btOverlappingPairCache* pairCache)
-:btAxisSweep3Internal<unsigned short int>(worldAabbMin,worldAabbMax,0xfffe,0xffff,maxHandles,pairCache)
+#ifdef DEBUG_BROADPHASE
+#include <stdio.h>
+void btAxisSweep3::debugPrintAxis(int axis, bool checkCardinality)
 {
-	// 1 handle is reserved as sentinel
-	btAssert(maxHandles > 1 && maxHandles < 32767);
+	int numEdges = m_pHandles[0].m_maxEdges[axis];
+	printf("SAP Axis %d, numEdges=%d\n",axis,numEdges);
+
+	int i;
+	for (i=0;i<numEdges+1;i++)
+	{
+		Edge* pEdge = m_pEdges[axis] + i;
+		Handle* pHandlePrev = getHandle(pEdge->m_handle);
+		int handleIndex = pEdge->IsMax()? pHandlePrev->m_maxEdges[axis] : pHandlePrev->m_minEdges[axis];
+		char beginOrEnd;
+		beginOrEnd=pEdge->IsMax()?'E':'B';
+		printf("	[%c,h=%d,p=%x,i=%d]\n",beginOrEnd,pEdge->m_handle,pEdge->m_pos,handleIndex);
+	}
+
+	if (checkCardinality)
+		assert(numEdges == m_numHandles*2+1);
+}
+#endif //DEBUG_BROADPHASE
+
+
+btBroadphaseProxy*	btAxisSweep3::createProxy(  const btVector3& min,  const btVector3& max,int shapeType,void* userPtr,short int collisionFilterGroup,short int collisionFilterMask)
+{
+		(void)shapeType;
+		BP_FP_INT_TYPE handleId = addHandle(min,max, userPtr,collisionFilterGroup,collisionFilterMask);
+		
+		Handle* handle = getHandle(handleId);
+				
+		return handle;
+}
+
+void	btAxisSweep3::destroyProxy(btBroadphaseProxy* proxy)
+{
+	Handle* handle = static_cast<Handle*>(proxy);
+	removeHandle(handle->m_handleId);
+}
+
+void	btAxisSweep3::setAabb(btBroadphaseProxy* proxy,const btVector3& aabbMin,const btVector3& aabbMax)
+{
+	Handle* handle = static_cast<Handle*>(proxy);
+	updateHandle(handle->m_handleId,aabbMin,aabbMax);
 
 }
 
 
-bt32BitAxisSweep3::bt32BitAxisSweep3(const btPoint3& worldAabbMin,const btPoint3& worldAabbMax, unsigned int maxHandles , btOverlappingPairCache* pairCache )
-:btAxisSweep3Internal<unsigned int>(worldAabbMin,worldAabbMax,0xfffffffe,0x7fffffff,maxHandles,pairCache)
+
+
+
+
+btAxisSweep3::btAxisSweep3(const btPoint3& worldAabbMin,const btPoint3& worldAabbMax, int maxHandles)
+:btOverlappingPairCache()
 {
+	m_invalidPair = 0;
+	//assert(bounds.HasVolume());
+
 	// 1 handle is reserved as sentinel
-	btAssert(maxHandles > 1 && maxHandles < 2147483647);
+	btAssert(maxHandles > 1 && maxHandles < BP_MAX_HANDLES);
+
+	// init bounds
+	m_worldAabbMin = worldAabbMin;
+	m_worldAabbMax = worldAabbMax;
+
+	btVector3 aabbSize = m_worldAabbMax - m_worldAabbMin;
+
+	BP_FP_INT_TYPE	maxInt = BP_HANDLE_SENTINEL;
+
+	m_quantize = btVector3(btScalar(maxInt),btScalar(maxInt),btScalar(maxInt)) / aabbSize;
+
+	// allocate handles buffer and put all handles on free list
+	m_pHandles = new Handle[maxHandles];
+	m_maxHandles = maxHandles;
+	m_numHandles = 0;
+
+	// handle 0 is reserved as the null index, and is also used as the sentinel
+	m_firstFreeHandle = 1;
+	{
+		for (BP_FP_INT_TYPE i = m_firstFreeHandle; i < maxHandles; i++)
+			m_pHandles[i].SetNextFree(i + 1);
+		m_pHandles[maxHandles - 1].SetNextFree(0);
+	}
+
+	{
+	// allocate edge buffers
+	for (int i = 0; i < 3; i++)
+		m_pEdges[i] = new Edge[maxHandles * 2];
+	}
+	//removed overlap management
+
+	// make boundary sentinels
+	
+	m_pHandles[0].m_clientObject = 0;
+
+	for (int axis = 0; axis < 3; axis++)
+	{
+		m_pHandles[0].m_minEdges[axis] = 0;
+		m_pHandles[0].m_maxEdges[axis] = 1;
+
+		m_pEdges[axis][0].m_pos = 0;
+		m_pEdges[axis][0].m_handle = 0;
+		m_pEdges[axis][1].m_pos = BP_HANDLE_SENTINEL;
+		m_pEdges[axis][1].m_handle = 0;
+#ifdef DEBUG_BROADPHASE
+		debugPrintAxis(axis);
+#endif //DEBUG_BROADPHASE
+
+	}
+
+}
+
+btAxisSweep3::~btAxisSweep3()
+{
+	
+	for (int i = 2; i >= 0; i--)
+		delete[] m_pEdges[i];
+	delete[] m_pHandles;
+}
+
+void btAxisSweep3::quantize(BP_FP_INT_TYPE* out, const btPoint3& point, int isMax) const
+{
+	btPoint3 clampedPoint(point);
+	
+
+
+	clampedPoint.setMax(m_worldAabbMin);
+	clampedPoint.setMin(m_worldAabbMax);
+
+	btVector3 v = (clampedPoint - m_worldAabbMin) * m_quantize;
+	out[0] = (BP_FP_INT_TYPE)(((BP_FP_INT_TYPE)v.getX() & BP_HANDLE_MASK) | isMax);
+	out[1] = (BP_FP_INT_TYPE)(((BP_FP_INT_TYPE)v.getY() & BP_HANDLE_MASK) | isMax);
+	out[2] = (BP_FP_INT_TYPE)(((BP_FP_INT_TYPE)v.getZ() & BP_HANDLE_MASK) | isMax);
+	
+}
+
+
+
+BP_FP_INT_TYPE btAxisSweep3::allocHandle()
+{
+	assert(m_firstFreeHandle);
+
+	BP_FP_INT_TYPE handle = m_firstFreeHandle;
+	m_firstFreeHandle = getHandle(handle)->GetNextFree();
+	m_numHandles++;
+
+	return handle;
+}
+
+void btAxisSweep3::freeHandle(BP_FP_INT_TYPE handle)
+{
+	assert(handle > 0 && handle < m_maxHandles);
+
+	getHandle(handle)->SetNextFree(m_firstFreeHandle);
+	m_firstFreeHandle = handle;
+
+	m_numHandles--;
+}
+
+
+
+BP_FP_INT_TYPE btAxisSweep3::addHandle(const btPoint3& aabbMin,const btPoint3& aabbMax, void* pOwner,short int collisionFilterGroup,short int collisionFilterMask)
+{
+	// quantize the bounds
+	BP_FP_INT_TYPE min[3], max[3];
+	quantize(min, aabbMin, 0);
+	quantize(max, aabbMax, 1);
+
+	// allocate a handle
+	BP_FP_INT_TYPE handle = allocHandle();
+	assert(handle!= 0xcdcd);
+
+	Handle* pHandle = getHandle(handle);
+	
+	pHandle->m_handleId = handle;
+	//pHandle->m_pOverlaps = 0;
+	pHandle->m_clientObject = pOwner;
+	pHandle->m_collisionFilterGroup = collisionFilterGroup;
+	pHandle->m_collisionFilterMask = collisionFilterMask;
+
+	// compute current limit of edge arrays
+	BP_FP_INT_TYPE limit = m_numHandles * 2;
+
+	
+	// insert new edges just inside the max boundary edge
+	for (BP_FP_INT_TYPE axis = 0; axis < 3; axis++)
+	{
+
+		m_pHandles[0].m_maxEdges[axis] += 2;
+
+		m_pEdges[axis][limit + 1] = m_pEdges[axis][limit - 1];
+
+		m_pEdges[axis][limit - 1].m_pos = min[axis];
+		m_pEdges[axis][limit - 1].m_handle = handle;
+
+		m_pEdges[axis][limit].m_pos = max[axis];
+		m_pEdges[axis][limit].m_handle = handle;
+
+		pHandle->m_minEdges[axis] = limit - 1;
+		pHandle->m_maxEdges[axis] = limit;
+	}
+
+	// now sort the new edges to their correct position
+	sortMinDown(0, pHandle->m_minEdges[0], false);
+	sortMaxDown(0, pHandle->m_maxEdges[0], false);
+	sortMinDown(1, pHandle->m_minEdges[1], false);
+	sortMaxDown(1, pHandle->m_maxEdges[1], false);
+	sortMinDown(2, pHandle->m_minEdges[2], true);
+	sortMaxDown(2, pHandle->m_maxEdges[2], true);
+
+
+	return handle;
+}
+
+
+void btAxisSweep3::removeHandle(BP_FP_INT_TYPE handle)
+{
+	
+	Handle* pHandle = getHandle(handle);
+
+	//explicitly remove the pairs containing the proxy
+	//we could do it also in the sortMinUp (passing true)
+	//todo: compare performance
+	removeOverlappingPairsContainingProxy(pHandle);
+
+
+	// compute current limit of edge arrays
+	int limit = m_numHandles * 2;
+	
+	int axis;
+
+	for (axis = 0;axis<3;axis++)
+	{
+		m_pHandles[0].m_maxEdges[axis] -= 2;
+	}
+
+	// remove the edges by sorting them up to the end of the list
+	for ( axis = 0; axis < 3; axis++)
+	{
+		Edge* pEdges = m_pEdges[axis];
+		BP_FP_INT_TYPE max = pHandle->m_maxEdges[axis];
+		pEdges[max].m_pos = BP_HANDLE_SENTINEL;
+
+		sortMaxUp(axis,max,false);
+
+
+		BP_FP_INT_TYPE i = pHandle->m_minEdges[axis];
+		pEdges[i].m_pos = BP_HANDLE_SENTINEL;
+
+
+		sortMinUp(axis,i,false);
+
+		pEdges[limit-1].m_handle = 0;
+		pEdges[limit-1].m_pos = BP_HANDLE_SENTINEL;
+		
+#ifdef DEBUG_BROADPHASE
+			debugPrintAxis(axis,false);
+#endif //DEBUG_BROADPHASE
+
+
+	}
+
+
+	// free the handle
+	freeHandle(handle);
+
+	
+}
+
+extern int gOverlappingPairs;
+
+
+void	btAxisSweep3::refreshOverlappingPairs()
+{
+
+}
+void	btAxisSweep3::processAllOverlappingPairs(btOverlapCallback* callback)
+{
+
+	//perform a sort, to find duplicates and to sort 'invalid' pairs to the end
+	m_overlappingPairArray.heapSort(btBroadphasePairSortPredicate());
+
+	//remove the 'invalid' ones
+#ifdef USE_POPBACK_REMOVAL
+	while (m_invalidPair>0)
+	{
+		m_invalidPair--;
+		m_overlappingPairArray.pop_back();
+	}
+#else	
+	m_overlappingPairArray.resize(m_overlappingPairArray.size() - m_invalidPair);
+	m_invalidPair = 0;
+#endif
+
+	
+	int i;
+
+	btBroadphasePair previousPair;
+	previousPair.m_pProxy0 = 0;
+	previousPair.m_pProxy1 = 0;
+	previousPair.m_algorithm = 0;
+	
+	
+	for (i=0;i<m_overlappingPairArray.size();i++)
+	{
+	
+		btBroadphasePair& pair = m_overlappingPairArray[i];
+
+		bool isDuplicate = (pair == previousPair);
+
+		previousPair = pair;
+
+		bool needsRemoval = false;
+
+		if (!isDuplicate)
+		{
+			bool hasOverlap = testOverlap(pair.m_pProxy0,pair.m_pProxy1);
+
+			if (hasOverlap)
+			{
+				needsRemoval = callback->processOverlap(pair);
+			} else
+			{
+				needsRemoval = true;
+			}
+		} else
+		{
+			//remove duplicate
+			needsRemoval = true;
+			//should have no algorithm
+			btAssert(!pair.m_algorithm);
+		}
+		
+		if (needsRemoval)
+		{
+			cleanOverlappingPair(pair);
+
+	//		m_overlappingPairArray.swap(i,m_overlappingPairArray.size()-1);
+	//		m_overlappingPairArray.pop_back();
+			pair.m_pProxy0 = 0;
+			pair.m_pProxy1 = 0;
+			m_invalidPair++;
+			gOverlappingPairs--;
+		} 
+		
+	}
+}
+
+
+bool btAxisSweep3::testOverlap(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1)
+{
+	const Handle* pHandleA = static_cast<Handle*>(proxy0);
+	const Handle* pHandleB = static_cast<Handle*>(proxy1);
+	
+	//optimization 1: check the array index (memory address), instead of the m_pos
+
+	for (int axis = 0; axis < 3; axis++)
+	{ 
+		if (pHandleA->m_maxEdges[axis] < pHandleB->m_minEdges[axis] || 
+			pHandleB->m_maxEdges[axis] < pHandleA->m_minEdges[axis]) 
+		{ 
+			return false; 
+		} 
+	} 
+	return true;
+}
+
+bool btAxisSweep3::testOverlap(int ignoreAxis,const Handle* pHandleA, const Handle* pHandleB)
+{
+	//optimization 1: check the array index (memory address), instead of the m_pos
+
+	for (int axis = 0; axis < 3; axis++)
+	{ 
+		if (axis != ignoreAxis)
+		{
+			if (pHandleA->m_maxEdges[axis] < pHandleB->m_minEdges[axis] || 
+				pHandleB->m_maxEdges[axis] < pHandleA->m_minEdges[axis]) 
+			{ 
+				return false; 
+			} 
+		}
+	} 
+
+	//optimization 2: only 2 axis need to be tested (conflicts with 'delayed removal' optimization)
+
+	/*for (int axis = 0; axis < 3; axis++)
+	{
+		if (m_pEdges[axis][pHandleA->m_maxEdges[axis]].m_pos < m_pEdges[axis][pHandleB->m_minEdges[axis]].m_pos ||
+			m_pEdges[axis][pHandleB->m_maxEdges[axis]].m_pos < m_pEdges[axis][pHandleA->m_minEdges[axis]].m_pos)
+		{
+			return false;
+		}
+	}
+	*/
+
+	return true;
+}
+
+void btAxisSweep3::updateHandle(BP_FP_INT_TYPE handle, const btPoint3& aabbMin,const btPoint3& aabbMax)
+{
+//	assert(bounds.IsFinite());
+	//assert(bounds.HasVolume());
+
+	Handle* pHandle = getHandle(handle);
+
+	// quantize the new bounds
+	BP_FP_INT_TYPE min[3], max[3];
+	quantize(min, aabbMin, 0);
+	quantize(max, aabbMax, 1);
+
+	// update changed edges
+	for (int axis = 0; axis < 3; axis++)
+	{
+		BP_FP_INT_TYPE emin = pHandle->m_minEdges[axis];
+		BP_FP_INT_TYPE emax = pHandle->m_maxEdges[axis];
+
+		int dmin = (int)min[axis] - (int)m_pEdges[axis][emin].m_pos;
+		int dmax = (int)max[axis] - (int)m_pEdges[axis][emax].m_pos;
+
+		m_pEdges[axis][emin].m_pos = min[axis];
+		m_pEdges[axis][emax].m_pos = max[axis];
+
+		// expand (only adds overlaps)
+		if (dmin < 0)
+			sortMinDown(axis, emin);
+
+		if (dmax > 0)
+			sortMaxUp(axis, emax);
+
+		// shrink (only removes overlaps)
+		if (dmin > 0)
+			sortMinUp(axis, emin);
+
+		if (dmax < 0)
+			sortMaxDown(axis, emax);
+
+#ifdef DEBUG_BROADPHASE
+	debugPrintAxis(axis);
+#endif //DEBUG_BROADPHASE
+	}
+
+	
+}
+
+
+
+
+// sorting a min edge downwards can only ever *add* overlaps
+void btAxisSweep3::sortMinDown(int axis, BP_FP_INT_TYPE edge, bool updateOverlaps)
+{
+
+	Edge* pEdge = m_pEdges[axis] + edge;
+	Edge* pPrev = pEdge - 1;
+	Handle* pHandleEdge = getHandle(pEdge->m_handle);
+
+	while (pEdge->m_pos < pPrev->m_pos)
+	{
+		Handle* pHandlePrev = getHandle(pPrev->m_handle);
+
+		if (pPrev->IsMax())
+		{
+			// if previous edge is a maximum check the bounds and add an overlap if necessary
+			if (updateOverlaps && testOverlap(axis,pHandleEdge, pHandlePrev))
+			{
+				addOverlappingPair(pHandleEdge,pHandlePrev);
+
+				//AddOverlap(pEdge->m_handle, pPrev->m_handle);
+
+			}
+
+			// update edge reference in other handle
+			pHandlePrev->m_maxEdges[axis]++;
+		}
+		else
+			pHandlePrev->m_minEdges[axis]++;
+
+		pHandleEdge->m_minEdges[axis]--;
+
+		// swap the edges
+		Edge swap = *pEdge;
+		*pEdge = *pPrev;
+		*pPrev = swap;
+
+		// decrement
+		pEdge--;
+		pPrev--;
+	}
+
+#ifdef DEBUG_BROADPHASE
+	debugPrintAxis(axis);
+#endif //DEBUG_BROADPHASE
+
+}
+
+// sorting a min edge upwards can only ever *remove* overlaps
+void btAxisSweep3::sortMinUp(int axis, BP_FP_INT_TYPE edge, bool updateOverlaps)
+{
+	Edge* pEdge = m_pEdges[axis] + edge;
+	Edge* pNext = pEdge + 1;
+	Handle* pHandleEdge = getHandle(pEdge->m_handle);
+
+	while (pNext->m_handle && (pEdge->m_pos >= pNext->m_pos))
+	{
+		Handle* pHandleNext = getHandle(pNext->m_handle);
+
+		if (pNext->IsMax())
+		{
+			// if next edge is maximum remove any overlap between the two handles
+			if (updateOverlaps)
+			{
+				/*
+				Handle* handle0 = getHandle(pEdge->m_handle);
+				Handle* handle1 = getHandle(pNext->m_handle);
+				btBroadphasePair tmpPair(*handle0,*handle1);
+				removeOverlappingPair(tmpPair);
+				*/
+
+			}
+
+			// update edge reference in other handle
+			pHandleNext->m_maxEdges[axis]--;
+		}
+		else
+			pHandleNext->m_minEdges[axis]--;
+
+		pHandleEdge->m_minEdges[axis]++;
+
+		// swap the edges
+		Edge swap = *pEdge;
+		*pEdge = *pNext;
+		*pNext = swap;
+
+		// increment
+		pEdge++;
+		pNext++;
+	}
+
+
+}
+
+// sorting a max edge downwards can only ever *remove* overlaps
+void btAxisSweep3::sortMaxDown(int axis, BP_FP_INT_TYPE edge, bool updateOverlaps)
+{
+
+	Edge* pEdge = m_pEdges[axis] + edge;
+	Edge* pPrev = pEdge - 1;
+	Handle* pHandleEdge = getHandle(pEdge->m_handle);
+
+	while (pEdge->m_pos < pPrev->m_pos)
+	{
+		Handle* pHandlePrev = getHandle(pPrev->m_handle);
+
+		if (!pPrev->IsMax())
+		{
+			// if previous edge was a minimum remove any overlap between the two handles
+			if (updateOverlaps)
+			{
+				//this is done during the overlappingpairarray iteration/narrowphase collision
+				/*
+				Handle* handle0 = getHandle(pEdge->m_handle);
+				Handle* handle1 = getHandle(pPrev->m_handle);
+				btBroadphasePair* pair = findPair(handle0,handle1);
+				//assert(pair);
+
+				if (pair)
+				{
+					removeOverlappingPair(*pair);
+				}
+				*/
+
+			}
+
+			// update edge reference in other handle
+			pHandlePrev->m_minEdges[axis]++;;
+		}
+		else
+			pHandlePrev->m_maxEdges[axis]++;
+
+		pHandleEdge->m_maxEdges[axis]--;
+
+		// swap the edges
+		Edge swap = *pEdge;
+		*pEdge = *pPrev;
+		*pPrev = swap;
+
+		// decrement
+		pEdge--;
+		pPrev--;
+	}
+
+	
+#ifdef DEBUG_BROADPHASE
+	debugPrintAxis(axis);
+#endif //DEBUG_BROADPHASE
+
+}
+
+// sorting a max edge upwards can only ever *add* overlaps
+void btAxisSweep3::sortMaxUp(int axis, BP_FP_INT_TYPE edge, bool updateOverlaps)
+{
+	Edge* pEdge = m_pEdges[axis] + edge;
+	Edge* pNext = pEdge + 1;
+	Handle* pHandleEdge = getHandle(pEdge->m_handle);
+
+	while (pNext->m_handle && (pEdge->m_pos >= pNext->m_pos))
+	{
+		Handle* pHandleNext = getHandle(pNext->m_handle);
+
+		if (!pNext->IsMax())
+		{
+			// if next edge is a minimum check the bounds and add an overlap if necessary
+			if (updateOverlaps && testOverlap(axis, pHandleEdge, pHandleNext))
+			{
+				Handle* handle0 = getHandle(pEdge->m_handle);
+				Handle* handle1 = getHandle(pNext->m_handle);
+				addOverlappingPair(handle0,handle1);
+			}
+
+			// update edge reference in other handle
+			pHandleNext->m_minEdges[axis]--;
+		}
+		else
+			pHandleNext->m_maxEdges[axis]--;
+
+		pHandleEdge->m_maxEdges[axis]++;
+
+		// swap the edges
+		Edge swap = *pEdge;
+		*pEdge = *pNext;
+		*pNext = swap;
+
+		// increment
+		pEdge++;
+		pNext++;
+	}
+	
 }
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
index e7c5fb5b6cf..57bbb368672 100644
--- a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
+++ b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
@@ -19,25 +19,34 @@
 #ifndef AXIS_SWEEP_3_H
 #define AXIS_SWEEP_3_H
 
-#include "LinearMath/btPoint3.h"
-#include "LinearMath/btVector3.h"
+#include "../../LinearMath/btPoint3.h"
+#include "../../LinearMath/btVector3.h"
 #include "btOverlappingPairCache.h"
-#include "btBroadphaseInterface.h"
 #include "btBroadphaseProxy.h"
-#include "btOverlappingPairCallback.h"
+
+
+//Enable BP_USE_FIXEDPOINT_INT_32 if you need more then 32767 objects
+//#define BP_USE_FIXEDPOINT_INT_32 1
+
+#ifdef BP_USE_FIXEDPOINT_INT_32
+	#define BP_FP_INT_TYPE unsigned int
+	#define BP_MAX_HANDLES 1500000 //arbitrary maximum number of handles
+	#define BP_HANDLE_SENTINEL 0x7fffffff
+	#define BP_HANDLE_MASK	0xfffffffe
+#else
+	#define BP_FP_INT_TYPE unsigned short int
+	#define BP_MAX_HANDLES 32767
+	#define BP_HANDLE_SENTINEL 0xffff
+	#define BP_HANDLE_MASK	0xfffe
+#endif //BP_USE_FIXEDPOINT_INT_32
 
 //#define DEBUG_BROADPHASE 1
 
-/// The internal templace class btAxisSweep3Internal implements the sweep and prune broadphase.
-/// It uses quantized integers to represent the begin and end points for each of the 3 axis.
-/// Dont use this class directly, use btAxisSweep3 or bt32BitAxisSweep3 instead.
-template <typename BP_FP_INT_TYPE>
-class btAxisSweep3Internal : public btBroadphaseInterface
+/// btAxisSweep3 is an efficient implementation of the 3d axis sweep and prune broadphase.
+/// It uses arrays rather then lists for storage of the 3 axis. Also it operates using integer coordinates instead of floats.
+/// The testOverlap check is optimized to check the array index, rather then the actual AABB coordinates/pos
+class btAxisSweep3 : public btOverlappingPairCache
 {
-protected:
-
-	BP_FP_INT_TYPE	m_bpHandleMask;
-	BP_FP_INT_TYPE	m_handleSentinel;
 
 public:
 	
@@ -48,52 +57,40 @@ public:
 		BP_FP_INT_TYPE m_pos;			// low bit is min/max
 		BP_FP_INT_TYPE m_handle;
 
-		BP_FP_INT_TYPE IsMax() const {return static_cast<BP_FP_INT_TYPE>(m_pos & 1);}
+		BP_FP_INT_TYPE IsMax() const {return m_pos & 1;}
 	};
 
 public:
-	//This breaks the Intel compiler, see http://softwarecommunity.intel.com/isn/Community/en-US/forums/thread/30253577.aspx
 	class Handle : public btBroadphaseProxy
-	//ATTRIBUTE_ALIGNED16(class) Handle : public btBroadphaseProxy
 	{
 	public:
-	BT_DECLARE_ALIGNED_ALLOCATOR();
-	
+		
 		// indexes into the edge arrays
 		BP_FP_INT_TYPE m_minEdges[3], m_maxEdges[3];		// 6 * 2 = 12
-//		BP_FP_INT_TYPE m_uniqueId;
+		BP_FP_INT_TYPE m_handleId;
 		BP_FP_INT_TYPE m_pad;
 		
 		//void* m_pOwner; this is now in btBroadphaseProxy.m_clientObject
 	
-		SIMD_FORCE_INLINE void SetNextFree(BP_FP_INT_TYPE next) {m_minEdges[0] = next;}
-		SIMD_FORCE_INLINE BP_FP_INT_TYPE GetNextFree() const {return m_minEdges[0];}
+		inline void SetNextFree(BP_FP_INT_TYPE next) {m_minEdges[0] = next;}
+		inline BP_FP_INT_TYPE GetNextFree() const {return m_minEdges[0];}
 	};		// 24 bytes + 24 for Edge structures = 44 bytes total per entry
 
 	
-protected:
+private:
 	btPoint3 m_worldAabbMin;						// overall system bounds
 	btPoint3 m_worldAabbMax;						// overall system bounds
 
 	btVector3 m_quantize;						// scaling factor for quantization
 
 	BP_FP_INT_TYPE m_numHandles;						// number of active handles
-	BP_FP_INT_TYPE m_maxHandles;						// max number of handles
+	int m_maxHandles;						// max number of handles
 	Handle* m_pHandles;						// handles pool
-	void* m_pHandlesRawPtr;
 	BP_FP_INT_TYPE m_firstFreeHandle;		// free handles list
 
 	Edge* m_pEdges[3];						// edge arrays for the 3 axes (each array has m_maxHandles * 2 + 2 sentinel entries)
-	void* m_pEdgesRawPtr[3];
 
-	btOverlappingPairCache* m_pairCache;
-
-	///btOverlappingPairCallback is an additional optional user callback for adding/removing overlapping pairs, similar interface to btOverlappingPairCache.
-	btOverlappingPairCallback* m_userPairCallback;
-	
-	bool	m_ownsPairCache;
-
-	int	m_invalidPair;
+	int m_invalidPair;
 
 	// allocation/deallocation
 	BP_FP_INT_TYPE allocHandle();
@@ -111,801 +108,29 @@ protected:
 
 	void quantize(BP_FP_INT_TYPE* out, const btPoint3& point, int isMax) const;
 
-	void sortMinDown(int axis, BP_FP_INT_TYPE edge, btDispatcher* dispatcher, bool updateOverlaps );
-	void sortMinUp(int axis, BP_FP_INT_TYPE edge, btDispatcher* dispatcher, bool updateOverlaps );
-	void sortMaxDown(int axis, BP_FP_INT_TYPE edge, btDispatcher* dispatcher, bool updateOverlaps );
-	void sortMaxUp(int axis, BP_FP_INT_TYPE edge, btDispatcher* dispatcher, bool updateOverlaps );
+	void sortMinDown(int axis, BP_FP_INT_TYPE edge, bool updateOverlaps = true);
+	void sortMinUp(int axis, BP_FP_INT_TYPE edge, bool updateOverlaps = true);
+	void sortMaxDown(int axis, BP_FP_INT_TYPE edge, bool updateOverlaps = true);
+	void sortMaxUp(int axis, BP_FP_INT_TYPE edge, bool updateOverlaps = true);
 
 public:
+	btAxisSweep3(const btPoint3& worldAabbMin,const btPoint3& worldAabbMax, int maxHandles = 16384);
+	virtual	~btAxisSweep3();
 
-	btAxisSweep3Internal(const btPoint3& worldAabbMin,const btPoint3& worldAabbMax, BP_FP_INT_TYPE handleMask, BP_FP_INT_TYPE handleSentinel, BP_FP_INT_TYPE maxHandles = 16384, btOverlappingPairCache* pairCache=0);
-
-	virtual	~btAxisSweep3Internal();
-
-	BP_FP_INT_TYPE getNumHandles() const
-	{
-		return m_numHandles;
-	}
-
-	virtual void	calculateOverlappingPairs(btDispatcher* dispatcher);
+	virtual void	refreshOverlappingPairs();
 	
-	BP_FP_INT_TYPE addHandle(const btPoint3& aabbMin,const btPoint3& aabbMax, void* pOwner,short int collisionFilterGroup,short int collisionFilterMask,btDispatcher* dispatcher,void* multiSapProxy);
-	void removeHandle(BP_FP_INT_TYPE handle,btDispatcher* dispatcher);
-	void updateHandle(BP_FP_INT_TYPE handle, const btPoint3& aabbMin,const btPoint3& aabbMax,btDispatcher* dispatcher);
-	SIMD_FORCE_INLINE Handle* getHandle(BP_FP_INT_TYPE index) const {return m_pHandles + index;}
+	BP_FP_INT_TYPE addHandle(const btPoint3& aabbMin,const btPoint3& aabbMax, void* pOwner,short int collisionFilterGroup,short int collisionFilterMask);
+	void removeHandle(BP_FP_INT_TYPE handle);
+	void updateHandle(BP_FP_INT_TYPE handle, const btPoint3& aabbMin,const btPoint3& aabbMax);
+	inline Handle* getHandle(BP_FP_INT_TYPE index) const {return m_pHandles + index;}
 
 	void	processAllOverlappingPairs(btOverlapCallback* callback);
 
 	//Broadphase Interface
-	virtual btBroadphaseProxy*	createProxy(  const btVector3& aabbMin,  const btVector3& aabbMax,int shapeType,void* userPtr ,short int collisionFilterGroup,short int collisionFilterMask,btDispatcher* dispatcher,void* multiSapProxy);
-	virtual void	destroyProxy(btBroadphaseProxy* proxy,btDispatcher* dispatcher);
-	virtual void	setAabb(btBroadphaseProxy* proxy,const btVector3& aabbMin,const btVector3& aabbMax,btDispatcher* dispatcher);
-	
-	bool	testAabbOverlap(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1);
-
-	btOverlappingPairCache*	getOverlappingPairCache()
-	{
-		return m_pairCache;
-	}
-	const btOverlappingPairCache*	getOverlappingPairCache() const
-	{
-		return m_pairCache;
-	}
-
-	void	setOverlappingPairUserCallback(btOverlappingPairCallback* pairCallback)
-	{
-		m_userPairCallback = pairCallback;
-	}
-	const btOverlappingPairCallback*	getOverlappingPairUserCallback() const
-	{
-		return m_userPairCallback;
-	}
-
-	///getAabb returns the axis aligned bounding box in the 'global' coordinate frame
-	///will add some transform later
-	virtual void getBroadphaseAabb(btVector3& aabbMin,btVector3& aabbMax) const
-	{
-		aabbMin = m_worldAabbMin;
-		aabbMax = m_worldAabbMax;
-	}
-
-	virtual void	printStats()
-	{
-/*		printf("btAxisSweep3.h\n");
-		printf("numHandles = %d, maxHandles = %d\n",m_numHandles,m_maxHandles);
-		printf("aabbMin=%f,%f,%f,aabbMax=%f,%f,%f\n",m_worldAabbMin.getX(),m_worldAabbMin.getY(),m_worldAabbMin.getZ(),
-			m_worldAabbMax.getX(),m_worldAabbMax.getY(),m_worldAabbMax.getZ());
-			*/
-
-	}
-
-};
-
-////////////////////////////////////////////////////////////////////
-
-
-
-
-#ifdef DEBUG_BROADPHASE
-#include <stdio.h>
-
-template <typename BP_FP_INT_TYPE>
-void btAxisSweep3<BP_FP_INT_TYPE>::debugPrintAxis(int axis, bool checkCardinality)
-{
-	int numEdges = m_pHandles[0].m_maxEdges[axis];
-	printf("SAP Axis %d, numEdges=%d\n",axis,numEdges);
-
-	int i;
-	for (i=0;i<numEdges+1;i++)
-	{
-		Edge* pEdge = m_pEdges[axis] + i;
-		Handle* pHandlePrev = getHandle(pEdge->m_handle);
-		int handleIndex = pEdge->IsMax()? pHandlePrev->m_maxEdges[axis] : pHandlePrev->m_minEdges[axis];
-		char beginOrEnd;
-		beginOrEnd=pEdge->IsMax()?'E':'B';
-		printf("	[%c,h=%d,p=%x,i=%d]\n",beginOrEnd,pEdge->m_handle,pEdge->m_pos,handleIndex);
-	}
-
-	if (checkCardinality)
-		assert(numEdges == m_numHandles*2+1);
-}
-#endif //DEBUG_BROADPHASE
-
-template <typename BP_FP_INT_TYPE>
-btBroadphaseProxy*	btAxisSweep3Internal<BP_FP_INT_TYPE>::createProxy(  const btVector3& aabbMin,  const btVector3& aabbMax,int shapeType,void* userPtr,short int collisionFilterGroup,short int collisionFilterMask,btDispatcher* dispatcher,void* multiSapProxy)
-{
-		(void)shapeType;
-		BP_FP_INT_TYPE handleId = addHandle(aabbMin,aabbMax, userPtr,collisionFilterGroup,collisionFilterMask,dispatcher,multiSapProxy);
-		
-		Handle* handle = getHandle(handleId);
-				
-		return handle;
-}
-
-
-
-template <typename BP_FP_INT_TYPE>
-void	btAxisSweep3Internal<BP_FP_INT_TYPE>::destroyProxy(btBroadphaseProxy* proxy,btDispatcher* dispatcher)
-{
-	Handle* handle = static_cast<Handle*>(proxy);
-	removeHandle(static_cast<BP_FP_INT_TYPE>(handle->m_uniqueId), dispatcher);
-}
-
-template <typename BP_FP_INT_TYPE>
-void	btAxisSweep3Internal<BP_FP_INT_TYPE>::setAabb(btBroadphaseProxy* proxy,const btVector3& aabbMin,const btVector3& aabbMax,btDispatcher* dispatcher)
-{
-	Handle* handle = static_cast<Handle*>(proxy);
-	updateHandle(static_cast<BP_FP_INT_TYPE>(handle->m_uniqueId), aabbMin, aabbMax,dispatcher);
-
-}
-
-
-
-
-
-template <typename BP_FP_INT_TYPE>
-btAxisSweep3Internal<BP_FP_INT_TYPE>::btAxisSweep3Internal(const btPoint3& worldAabbMin,const btPoint3& worldAabbMax, BP_FP_INT_TYPE handleMask, BP_FP_INT_TYPE handleSentinel,BP_FP_INT_TYPE userMaxHandles, btOverlappingPairCache* pairCache )
-:m_bpHandleMask(handleMask),
-m_handleSentinel(handleSentinel),
-m_pairCache(pairCache),
-m_userPairCallback(0),
-m_ownsPairCache(false),
-m_invalidPair(0)
-{
-	BP_FP_INT_TYPE maxHandles = static_cast<BP_FP_INT_TYPE>(userMaxHandles+1);//need to add one sentinel handle
-
-	if (!m_pairCache)
-	{
-		void* ptr = btAlignedAlloc(sizeof(btHashedOverlappingPairCache),16);
-		m_pairCache = new(ptr) btHashedOverlappingPairCache();
-		m_ownsPairCache = true;
-	}
-
-	//assert(bounds.HasVolume());
-
-	// init bounds
-	m_worldAabbMin = worldAabbMin;
-	m_worldAabbMax = worldAabbMax;
-
-	btVector3 aabbSize = m_worldAabbMax - m_worldAabbMin;
-
-	BP_FP_INT_TYPE	maxInt = m_handleSentinel;
-
-	m_quantize = btVector3(btScalar(maxInt),btScalar(maxInt),btScalar(maxInt)) / aabbSize;
-
-	// allocate handles buffer and put all handles on free list
-	m_pHandlesRawPtr = btAlignedAlloc(sizeof(Handle)*maxHandles,16);
-	m_pHandles = new(m_pHandlesRawPtr) Handle[maxHandles];
-
-	m_maxHandles = maxHandles;
-	m_numHandles = 0;
-
-	// handle 0 is reserved as the null index, and is also used as the sentinel
-	m_firstFreeHandle = 1;
-	{
-		for (BP_FP_INT_TYPE i = m_firstFreeHandle; i < maxHandles; i++)
-			m_pHandles[i].SetNextFree(static_cast<BP_FP_INT_TYPE>(i + 1));
-		m_pHandles[maxHandles - 1].SetNextFree(0);
-	}
-
-	{
-		// allocate edge buffers
-		for (int i = 0; i < 3; i++)
-		{
-			m_pEdgesRawPtr[i] = btAlignedAlloc(sizeof(Edge)*maxHandles*2,16);
-			m_pEdges[i] = new(m_pEdgesRawPtr[i]) Edge[maxHandles * 2];
-		}
-	}
-	//removed overlap management
-
-	// make boundary sentinels
-	
-	m_pHandles[0].m_clientObject = 0;
-
-	for (int axis = 0; axis < 3; axis++)
-	{
-		m_pHandles[0].m_minEdges[axis] = 0;
-		m_pHandles[0].m_maxEdges[axis] = 1;
-
-		m_pEdges[axis][0].m_pos = 0;
-		m_pEdges[axis][0].m_handle = 0;
-		m_pEdges[axis][1].m_pos = m_handleSentinel;
-		m_pEdges[axis][1].m_handle = 0;
-#ifdef DEBUG_BROADPHASE
-		debugPrintAxis(axis);
-#endif //DEBUG_BROADPHASE
-
-	}
-
-}
-
-template <typename BP_FP_INT_TYPE>
-btAxisSweep3Internal<BP_FP_INT_TYPE>::~btAxisSweep3Internal()
-{
-	
-	for (int i = 2; i >= 0; i--)
-	{
-		btAlignedFree(m_pEdgesRawPtr[i]);
-	}
-	btAlignedFree(m_pHandlesRawPtr);
-
-	if (m_ownsPairCache)
-	{
-		m_pairCache->~btOverlappingPairCache();
-		btAlignedFree(m_pairCache);
-	}
-}
-
-template <typename BP_FP_INT_TYPE>
-void btAxisSweep3Internal<BP_FP_INT_TYPE>::quantize(BP_FP_INT_TYPE* out, const btPoint3& point, int isMax) const
-{
-	btPoint3 clampedPoint(point);
-	
-
-
-	clampedPoint.setMax(m_worldAabbMin);
-	clampedPoint.setMin(m_worldAabbMax);
-
-	btVector3 v = (clampedPoint - m_worldAabbMin) * m_quantize;
-	out[0] = (BP_FP_INT_TYPE)(((BP_FP_INT_TYPE)v.getX() & m_bpHandleMask) | isMax);
-	out[1] = (BP_FP_INT_TYPE)(((BP_FP_INT_TYPE)v.getY() & m_bpHandleMask) | isMax);
-	out[2] = (BP_FP_INT_TYPE)(((BP_FP_INT_TYPE)v.getZ() & m_bpHandleMask) | isMax);
-	
-}
-
-
-template <typename BP_FP_INT_TYPE>
-BP_FP_INT_TYPE btAxisSweep3Internal<BP_FP_INT_TYPE>::allocHandle()
-{
-	assert(m_firstFreeHandle);
-
-	BP_FP_INT_TYPE handle = m_firstFreeHandle;
-	m_firstFreeHandle = getHandle(handle)->GetNextFree();
-	m_numHandles++;
-
-	return handle;
-}
-
-template <typename BP_FP_INT_TYPE>
-void btAxisSweep3Internal<BP_FP_INT_TYPE>::freeHandle(BP_FP_INT_TYPE handle)
-{
-	assert(handle > 0 && handle < m_maxHandles);
-
-	getHandle(handle)->SetNextFree(m_firstFreeHandle);
-	m_firstFreeHandle = handle;
-
-	m_numHandles--;
-}
-
-
-template <typename BP_FP_INT_TYPE>
-BP_FP_INT_TYPE btAxisSweep3Internal<BP_FP_INT_TYPE>::addHandle(const btPoint3& aabbMin,const btPoint3& aabbMax, void* pOwner,short int collisionFilterGroup,short int collisionFilterMask,btDispatcher* dispatcher,void* multiSapProxy)
-{
-	// quantize the bounds
-	BP_FP_INT_TYPE min[3], max[3];
-	quantize(min, aabbMin, 0);
-	quantize(max, aabbMax, 1);
-
-	// allocate a handle
-	BP_FP_INT_TYPE handle = allocHandle();
-	
-
-	Handle* pHandle = getHandle(handle);
-	
-	pHandle->m_uniqueId = static_cast<int>(handle);
-	//pHandle->m_pOverlaps = 0;
-	pHandle->m_clientObject = pOwner;
-	pHandle->m_collisionFilterGroup = collisionFilterGroup;
-	pHandle->m_collisionFilterMask = collisionFilterMask;
-	pHandle->m_multiSapParentProxy = multiSapProxy;
-
-	// compute current limit of edge arrays
-	BP_FP_INT_TYPE limit = static_cast<BP_FP_INT_TYPE>(m_numHandles * 2);
-
-	
-	// insert new edges just inside the max boundary edge
-	for (BP_FP_INT_TYPE axis = 0; axis < 3; axis++)
-	{
-
-		m_pHandles[0].m_maxEdges[axis] += 2;
-
-		m_pEdges[axis][limit + 1] = m_pEdges[axis][limit - 1];
-
-		m_pEdges[axis][limit - 1].m_pos = min[axis];
-		m_pEdges[axis][limit - 1].m_handle = handle;
-
-		m_pEdges[axis][limit].m_pos = max[axis];
-		m_pEdges[axis][limit].m_handle = handle;
-
-		pHandle->m_minEdges[axis] = static_cast<BP_FP_INT_TYPE>(limit - 1);
-		pHandle->m_maxEdges[axis] = limit;
-	}
-
-	// now sort the new edges to their correct position
-	sortMinDown(0, pHandle->m_minEdges[0], dispatcher,false);
-	sortMaxDown(0, pHandle->m_maxEdges[0], dispatcher,false);
-	sortMinDown(1, pHandle->m_minEdges[1], dispatcher,false);
-	sortMaxDown(1, pHandle->m_maxEdges[1], dispatcher,false);
-	sortMinDown(2, pHandle->m_minEdges[2], dispatcher,true);
-	sortMaxDown(2, pHandle->m_maxEdges[2], dispatcher,true);
-
-
-	return handle;
-}
-
-
-template <typename BP_FP_INT_TYPE>
-void btAxisSweep3Internal<BP_FP_INT_TYPE>::removeHandle(BP_FP_INT_TYPE handle,btDispatcher* dispatcher)
-{
-
-	Handle* pHandle = getHandle(handle);
-
-	//explicitly remove the pairs containing the proxy
-	//we could do it also in the sortMinUp (passing true)
-	//todo: compare performance
-	if (!m_pairCache->hasDeferredRemoval())
-	{
-		m_pairCache->removeOverlappingPairsContainingProxy(pHandle,dispatcher);
-	}
-
-	// compute current limit of edge arrays
-	int limit = static_cast<int>(m_numHandles * 2);
-	
-	int axis;
-
-	for (axis = 0;axis<3;axis++)
-	{
-		m_pHandles[0].m_maxEdges[axis] -= 2;
-	}
-
-	// remove the edges by sorting them up to the end of the list
-	for ( axis = 0; axis < 3; axis++)
-	{
-		Edge* pEdges = m_pEdges[axis];
-		BP_FP_INT_TYPE max = pHandle->m_maxEdges[axis];
-		pEdges[max].m_pos = m_handleSentinel;
-
-		sortMaxUp(axis,max,dispatcher,false);
-
-
-		BP_FP_INT_TYPE i = pHandle->m_minEdges[axis];
-		pEdges[i].m_pos = m_handleSentinel;
-
-
-		sortMinUp(axis,i,dispatcher,false);
-
-		pEdges[limit-1].m_handle = 0;
-		pEdges[limit-1].m_pos = m_handleSentinel;
-		
-#ifdef DEBUG_BROADPHASE
-			debugPrintAxis(axis,false);
-#endif //DEBUG_BROADPHASE
-
-
-	}
-
-
-	// free the handle
-	freeHandle(handle);
-
-	
-}
-
-extern int gOverlappingPairs;
-//#include <stdio.h>
-
-template <typename BP_FP_INT_TYPE>
-void	btAxisSweep3Internal<BP_FP_INT_TYPE>::calculateOverlappingPairs(btDispatcher* dispatcher)
-{
-
-	if (m_pairCache->hasDeferredRemoval())
-	{
-	
-		btBroadphasePairArray&	overlappingPairArray = m_pairCache->getOverlappingPairArray();
-
-		//perform a sort, to find duplicates and to sort 'invalid' pairs to the end
-		overlappingPairArray.quickSort(btBroadphasePairSortPredicate());
-
-		overlappingPairArray.resize(overlappingPairArray.size() - m_invalidPair);
-		m_invalidPair = 0;
-
-		
-		int i;
-
-		btBroadphasePair previousPair;
-		previousPair.m_pProxy0 = 0;
-		previousPair.m_pProxy1 = 0;
-		previousPair.m_algorithm = 0;
-		
-		
-		for (i=0;i<overlappingPairArray.size();i++)
-		{
-		
-			btBroadphasePair& pair = overlappingPairArray[i];
-
-			bool isDuplicate = (pair == previousPair);
-
-			previousPair = pair;
-
-			bool needsRemoval = false;
-
-			if (!isDuplicate)
-			{
-				bool hasOverlap = testAabbOverlap(pair.m_pProxy0,pair.m_pProxy1);
-
-				if (hasOverlap)
-				{
-					needsRemoval = false;//callback->processOverlap(pair);
-				} else
-				{
-					needsRemoval = true;
-				}
-			} else
-			{
-				//remove duplicate
-				needsRemoval = true;
-				//should have no algorithm
-				btAssert(!pair.m_algorithm);
-			}
-			
-			if (needsRemoval)
-			{
-				m_pairCache->cleanOverlappingPair(pair,dispatcher);
-
-		//		m_overlappingPairArray.swap(i,m_overlappingPairArray.size()-1);
-		//		m_overlappingPairArray.pop_back();
-				pair.m_pProxy0 = 0;
-				pair.m_pProxy1 = 0;
-				m_invalidPair++;
-				gOverlappingPairs--;
-			} 
-			
-		}
-
-	///if you don't like to skip the invalid pairs in the array, execute following code:
-	#define CLEAN_INVALID_PAIRS 1
-	#ifdef CLEAN_INVALID_PAIRS
-
-		//perform a sort, to sort 'invalid' pairs to the end
-		overlappingPairArray.quickSort(btBroadphasePairSortPredicate());
-
-		overlappingPairArray.resize(overlappingPairArray.size() - m_invalidPair);
-		m_invalidPair = 0;
-	#endif//CLEAN_INVALID_PAIRS
-		
-		//printf("overlappingPairArray.size()=%d\n",overlappingPairArray.size());
-	}
-
-
-
-	
-
-}
-
-
-template <typename BP_FP_INT_TYPE>
-bool btAxisSweep3Internal<BP_FP_INT_TYPE>::testAabbOverlap(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1)
-{
-	const Handle* pHandleA = static_cast<Handle*>(proxy0);
-	const Handle* pHandleB = static_cast<Handle*>(proxy1);
-	
-	//optimization 1: check the array index (memory address), instead of the m_pos
-
-	for (int axis = 0; axis < 3; axis++)
-	{ 
-		if (pHandleA->m_maxEdges[axis] < pHandleB->m_minEdges[axis] || 
-			pHandleB->m_maxEdges[axis] < pHandleA->m_minEdges[axis]) 
-		{ 
-			return false; 
-		} 
-	} 
-	return true;
-}
-
-template <typename BP_FP_INT_TYPE>
-bool btAxisSweep3Internal<BP_FP_INT_TYPE>::testOverlap(int ignoreAxis,const Handle* pHandleA, const Handle* pHandleB)
-{
-	//optimization 1: check the array index (memory address), instead of the m_pos
-
-	for (int axis = 0; axis < 3; axis++)
-	{ 
-		if (axis != ignoreAxis)
-		{
-			if (pHandleA->m_maxEdges[axis] < pHandleB->m_minEdges[axis] || 
-				pHandleB->m_maxEdges[axis] < pHandleA->m_minEdges[axis]) 
-			{ 
-				return false; 
-			} 
-		}
-	} 
-
-	//optimization 2: only 2 axis need to be tested (conflicts with 'delayed removal' optimization)
-
-	/*for (int axis = 0; axis < 3; axis++)
-	{
-		if (m_pEdges[axis][pHandleA->m_maxEdges[axis]].m_pos < m_pEdges[axis][pHandleB->m_minEdges[axis]].m_pos ||
-			m_pEdges[axis][pHandleB->m_maxEdges[axis]].m_pos < m_pEdges[axis][pHandleA->m_minEdges[axis]].m_pos)
-		{
-			return false;
-		}
-	}
-	*/
-
-	return true;
-}
-
-template <typename BP_FP_INT_TYPE>
-void btAxisSweep3Internal<BP_FP_INT_TYPE>::updateHandle(BP_FP_INT_TYPE handle, const btPoint3& aabbMin,const btPoint3& aabbMax,btDispatcher* dispatcher)
-{
-//	assert(bounds.IsFinite());
-	//assert(bounds.HasVolume());
-
-	Handle* pHandle = getHandle(handle);
-
-	// quantize the new bounds
-	BP_FP_INT_TYPE min[3], max[3];
-	quantize(min, aabbMin, 0);
-	quantize(max, aabbMax, 1);
-
-	// update changed edges
-	for (int axis = 0; axis < 3; axis++)
-	{
-		BP_FP_INT_TYPE emin = pHandle->m_minEdges[axis];
-		BP_FP_INT_TYPE emax = pHandle->m_maxEdges[axis];
-
-		int dmin = (int)min[axis] - (int)m_pEdges[axis][emin].m_pos;
-		int dmax = (int)max[axis] - (int)m_pEdges[axis][emax].m_pos;
-
-		m_pEdges[axis][emin].m_pos = min[axis];
-		m_pEdges[axis][emax].m_pos = max[axis];
-
-		// expand (only adds overlaps)
-		if (dmin < 0)
-			sortMinDown(axis, emin,dispatcher,true);
-
-		if (dmax > 0)
-			sortMaxUp(axis, emax,dispatcher,true);
-
-		// shrink (only removes overlaps)
-		if (dmin > 0)
-			sortMinUp(axis, emin,dispatcher,true);
-
-		if (dmax < 0)
-			sortMaxDown(axis, emax,dispatcher,true);
-
-#ifdef DEBUG_BROADPHASE
-	debugPrintAxis(axis);
-#endif //DEBUG_BROADPHASE
-	}
-
-	
-}
-
-
-
-
-// sorting a min edge downwards can only ever *add* overlaps
-template <typename BP_FP_INT_TYPE>
-void btAxisSweep3Internal<BP_FP_INT_TYPE>::sortMinDown(int axis, BP_FP_INT_TYPE edge, btDispatcher* /* dispatcher */, bool updateOverlaps)
-{
-
-	Edge* pEdge = m_pEdges[axis] + edge;
-	Edge* pPrev = pEdge - 1;
-	Handle* pHandleEdge = getHandle(pEdge->m_handle);
-
-	while (pEdge->m_pos < pPrev->m_pos)
-	{
-		Handle* pHandlePrev = getHandle(pPrev->m_handle);
-
-		if (pPrev->IsMax())
-		{
-			// if previous edge is a maximum check the bounds and add an overlap if necessary
-			if (updateOverlaps && testOverlap(axis,pHandleEdge, pHandlePrev))
-			{
-				m_pairCache->addOverlappingPair(pHandleEdge,pHandlePrev);
-				if (m_userPairCallback)
-					m_userPairCallback->addOverlappingPair(pHandleEdge,pHandlePrev);
-
-				//AddOverlap(pEdge->m_handle, pPrev->m_handle);
-
-			}
-
-			// update edge reference in other handle
-			pHandlePrev->m_maxEdges[axis]++;
-		}
-		else
-			pHandlePrev->m_minEdges[axis]++;
-
-		pHandleEdge->m_minEdges[axis]--;
-
-		// swap the edges
-		Edge swap = *pEdge;
-		*pEdge = *pPrev;
-		*pPrev = swap;
-
-		// decrement
-		pEdge--;
-		pPrev--;
-	}
-
-#ifdef DEBUG_BROADPHASE
-	debugPrintAxis(axis);
-#endif //DEBUG_BROADPHASE
-
-}
-
-// sorting a min edge upwards can only ever *remove* overlaps
-template <typename BP_FP_INT_TYPE>
-void btAxisSweep3Internal<BP_FP_INT_TYPE>::sortMinUp(int axis, BP_FP_INT_TYPE edge, btDispatcher* dispatcher, bool updateOverlaps)
-{
-	Edge* pEdge = m_pEdges[axis] + edge;
-	Edge* pNext = pEdge + 1;
-	Handle* pHandleEdge = getHandle(pEdge->m_handle);
-
-	while (pNext->m_handle && (pEdge->m_pos >= pNext->m_pos))
-	{
-		Handle* pHandleNext = getHandle(pNext->m_handle);
-
-		if (pNext->IsMax())
-		{
-
-			// if next edge is maximum remove any overlap between the two handles
-			if (updateOverlaps)
-			{
-				Handle* handle0 = getHandle(pEdge->m_handle);
-				Handle* handle1 = getHandle(pNext->m_handle);
-
-				m_pairCache->removeOverlappingPair(handle0,handle1,dispatcher);	
-				if (m_userPairCallback)
-					m_userPairCallback->removeOverlappingPair(handle0,handle1,dispatcher);
-				
-			}
-
-
-			// update edge reference in other handle
-			pHandleNext->m_maxEdges[axis]--;
-		}
-		else
-			pHandleNext->m_minEdges[axis]--;
-
-		pHandleEdge->m_minEdges[axis]++;
-
-		// swap the edges
-		Edge swap = *pEdge;
-		*pEdge = *pNext;
-		*pNext = swap;
-
-		// increment
-		pEdge++;
-		pNext++;
-	}
-
-
-}
-
-// sorting a max edge downwards can only ever *remove* overlaps
-template <typename BP_FP_INT_TYPE>
-void btAxisSweep3Internal<BP_FP_INT_TYPE>::sortMaxDown(int axis, BP_FP_INT_TYPE edge, btDispatcher* dispatcher, bool updateOverlaps)
-{
-
-	Edge* pEdge = m_pEdges[axis] + edge;
-	Edge* pPrev = pEdge - 1;
-	Handle* pHandleEdge = getHandle(pEdge->m_handle);
-
-	while (pEdge->m_pos < pPrev->m_pos)
-	{
-		Handle* pHandlePrev = getHandle(pPrev->m_handle);
-
-		if (!pPrev->IsMax())
-		{
-			// if previous edge was a minimum remove any overlap between the two handles
-			if (updateOverlaps)
-			{
-				//this is done during the overlappingpairarray iteration/narrowphase collision
-
-				Handle* handle0 = getHandle(pEdge->m_handle);
-				Handle* handle1 = getHandle(pPrev->m_handle);
-				m_pairCache->removeOverlappingPair(handle0,handle1,dispatcher);
-				if (m_userPairCallback)
-					m_userPairCallback->removeOverlappingPair(handle0,handle1,dispatcher);
-			
-
-
-			}
-
-			// update edge reference in other handle
-			pHandlePrev->m_minEdges[axis]++;;
-		}
-		else
-			pHandlePrev->m_maxEdges[axis]++;
-
-		pHandleEdge->m_maxEdges[axis]--;
-
-		// swap the edges
-		Edge swap = *pEdge;
-		*pEdge = *pPrev;
-		*pPrev = swap;
-
-		// decrement
-		pEdge--;
-		pPrev--;
-	}
-
-	
-#ifdef DEBUG_BROADPHASE
-	debugPrintAxis(axis);
-#endif //DEBUG_BROADPHASE
-
-}
-
-// sorting a max edge upwards can only ever *add* overlaps
-template <typename BP_FP_INT_TYPE>
-void btAxisSweep3Internal<BP_FP_INT_TYPE>::sortMaxUp(int axis, BP_FP_INT_TYPE edge, btDispatcher* /* dispatcher */, bool updateOverlaps)
-{
-	Edge* pEdge = m_pEdges[axis] + edge;
-	Edge* pNext = pEdge + 1;
-	Handle* pHandleEdge = getHandle(pEdge->m_handle);
-
-	while (pNext->m_handle && (pEdge->m_pos >= pNext->m_pos))
-	{
-		Handle* pHandleNext = getHandle(pNext->m_handle);
-
-		if (!pNext->IsMax())
-		{
-			// if next edge is a minimum check the bounds and add an overlap if necessary
-			if (updateOverlaps && testOverlap(axis, pHandleEdge, pHandleNext))
-			{
-				Handle* handle0 = getHandle(pEdge->m_handle);
-				Handle* handle1 = getHandle(pNext->m_handle);
-				m_pairCache->addOverlappingPair(handle0,handle1);
-				if (m_userPairCallback)
-					m_userPairCallback->addOverlappingPair(handle0,handle1);
-			}
-
-			// update edge reference in other handle
-			pHandleNext->m_minEdges[axis]--;
-		}
-		else
-			pHandleNext->m_maxEdges[axis]--;
-
-		pHandleEdge->m_maxEdges[axis]++;
-
-		// swap the edges
-		Edge swap = *pEdge;
-		*pEdge = *pNext;
-		*pNext = swap;
-
-		// increment
-		pEdge++;
-		pNext++;
-	}
-	
-}
-
-
-
-////////////////////////////////////////////////////////////////////
-
-
-/// The btAxisSweep3 is an efficient implementation of the 3d axis sweep and prune broadphase.
-/// It uses arrays rather then lists for storage of the 3 axis. Also it operates using 16 bit integer coordinates instead of floats.
-/// For large worlds and many objects, use bt32BitAxisSweep3 or btDbvtBroadphase instead. bt32BitAxisSweep3 has higher precision and allows more then 16384 objects at the cost of more memory and bit of performance.
-class btAxisSweep3 : public btAxisSweep3Internal<unsigned short int>
-{
-public:
-
-	btAxisSweep3(const btPoint3& worldAabbMin,const btPoint3& worldAabbMax, unsigned short int maxHandles = 16384, btOverlappingPairCache* pairCache = 0);
-
-};
-
-/// The bt32BitAxisSweep3 allows higher precision quantization and more objects compared to the btAxisSweep3 sweep and prune.
-/// This comes at the cost of more memory per handle, and a bit slower performance.
-/// It uses arrays rather then lists for storage of the 3 axis.
-class bt32BitAxisSweep3 : public btAxisSweep3Internal<unsigned int>
-{
-public:
-
-	bt32BitAxisSweep3(const btPoint3& worldAabbMin,const btPoint3& worldAabbMax, unsigned int maxHandles = 1500000, btOverlappingPairCache* pairCache = 0);
+	virtual btBroadphaseProxy*	createProxy(  const btVector3& min,  const btVector3& max,int shapeType,void* userPtr ,short int collisionFilterGroup,short int collisionFilterMask);
+	virtual void	destroyProxy(btBroadphaseProxy* proxy);
+	virtual void	setAabb(btBroadphaseProxy* proxy,const btVector3& aabbMin,const btVector3& aabbMax);
+	bool testOverlap(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1);
 
 };
 
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h
index 200ac365329..b6ace03c07a 100644
--- a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h
+++ b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h
@@ -20,34 +20,20 @@ subject to the following restrictions:
 
 struct btDispatcherInfo;
 class btDispatcher;
-#include "btBroadphaseProxy.h"
-class btOverlappingPairCache;
+struct btBroadphaseProxy;
+#include "../../LinearMath/btVector3.h"
 
-#include "LinearMath/btVector3.h"
-
-///The btBroadphaseInterface class provides an interface to detect aabb-overlapping object pairs.
-///Some implementations for this broadphase interface include btAxisSweep3, bt32BitAxisSweep3 and btDbvtBroadphase.
-///The actual overlapping pair management, storage, adding and removing of pairs is dealt by the btOverlappingPairCache class.
+///BroadphaseInterface for aabb-overlapping object pairs
 class btBroadphaseInterface
 {
 public:
 	virtual ~btBroadphaseInterface() {}
 
-	virtual btBroadphaseProxy*	createProxy(  const btVector3& aabbMin,  const btVector3& aabbMax,int shapeType,void* userPtr, short int collisionFilterGroup,short int collisionFilterMask, btDispatcher* dispatcher,void* multiSapProxy) =0;
-	virtual void	destroyProxy(btBroadphaseProxy* proxy,btDispatcher* dispatcher)=0;
-	virtual void	setAabb(btBroadphaseProxy* proxy,const btVector3& aabbMin,const btVector3& aabbMax, btDispatcher* dispatcher)=0;
+	virtual btBroadphaseProxy*	createProxy(  const btVector3& min,  const btVector3& max,int shapeType,void* userPtr, short int collisionFilterGroup,short int collisionFilterMask) =0;
+	virtual void	destroyProxy(btBroadphaseProxy* proxy)=0;
+	virtual void	setAabb(btBroadphaseProxy* proxy,const btVector3& aabbMin,const btVector3& aabbMax)=0;
+	virtual void	cleanProxyFromPairs(btBroadphaseProxy* proxy)=0;
 	
-	///calculateOverlappingPairs is optional: incremental algorithms (sweep and prune) might do it during the set aabb
-	virtual void	calculateOverlappingPairs(btDispatcher* dispatcher)=0;
-
-	virtual	btOverlappingPairCache*	getOverlappingPairCache()=0;
-	virtual	const btOverlappingPairCache*	getOverlappingPairCache() const =0;
-
-	///getAabb returns the axis aligned bounding box in the 'global' coordinate frame
-	///will add some transform later
-	virtual void getBroadphaseAabb(btVector3& aabbMin,btVector3& aabbMax) const =0;
-
-	virtual void	printStats() = 0;
 
 };
 
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h
index e0bb67f8521..40d9748ffa9 100644
--- a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h
+++ b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h
@@ -16,8 +16,7 @@ subject to the following restrictions:
 #ifndef BROADPHASE_PROXY_H
 #define BROADPHASE_PROXY_H
 
-#include "LinearMath/btScalar.h" //for SIMD_FORCE_INLINE
-#include "LinearMath/btAlignedAllocator.h"
+#include "../../LinearMath/btScalar.h" //for SIMD_FORCE_INLINE
 
 
 /// btDispatcher uses these types
@@ -39,7 +38,6 @@ IMPLICIT_CONVEX_SHAPES_START_HERE,
 	CONE_SHAPE_PROXYTYPE,
 	CONVEX_SHAPE_PROXYTYPE,
 	CYLINDER_SHAPE_PROXYTYPE,
-	UNIFORM_SCALING_SHAPE_PROXYTYPE,
 	MINKOWSKI_SUM_SHAPE_PROXYTYPE,
 	MINKOWSKI_DIFFERENCE_SHAPE_PROXYTYPE,
 //concave shapes
@@ -52,8 +50,6 @@ CONCAVE_SHAPES_START_HERE,
 	TERRAIN_SHAPE_PROXYTYPE,
 ///Used for GIMPACT Trimesh integration
 	GIMPACT_SHAPE_PROXYTYPE,
-///Multimaterial mesh
-    MULTIMATERIAL_TRIANGLE_MESH_PROXYTYPE,
 	
 	EMPTY_SHAPE_PROXYTYPE,
 	STATIC_PLANE_PROXYTYPE,
@@ -61,18 +57,13 @@ CONCAVE_SHAPES_END_HERE,
 
 	COMPOUND_SHAPE_PROXYTYPE,
 
-	SOFTBODY_SHAPE_PROXYTYPE,
-
 	MAX_BROADPHASE_COLLISION_TYPES
 };
 
 
-///The btBroadphaseProxy is the main class that can be used with the Bullet broadphases. 
-///It stores collision shape type information, collision filter information and a client object, typically a btCollisionObject or btRigidBody.
-ATTRIBUTE_ALIGNED16(struct) btBroadphaseProxy
+///btBroadphaseProxy
+struct btBroadphaseProxy
 {
-
-BT_DECLARE_ALIGNED_ALLOCATOR();
 	
 	///optional filtering to cull potential collisions
 	enum CollisionFilterGroups
@@ -82,60 +73,44 @@ BT_DECLARE_ALIGNED_ALLOCATOR();
 	        KinematicFilter = 4,
 	        DebrisFilter = 8,
 			SensorTrigger = 16,
-	        AllFilter = -1 //all bits sets: DefaultFilter | StaticFilter | KinematicFilter | DebrisFilter | SensorTrigger
+	        AllFilter = DefaultFilter | StaticFilter | KinematicFilter | DebrisFilter | SensorTrigger
 	};
 
 	//Usually the client btCollisionObject or Rigidbody class
 	void*	m_clientObject;
-
 	short int m_collisionFilterGroup;
 	short int m_collisionFilterMask;
 
-	void*	m_multiSapParentProxy;		
-
-
-	int			m_uniqueId;//m_uniqueId is introduced for paircache. could get rid of this, by calculating the address offset etc.
-
-	SIMD_FORCE_INLINE int getUid() const
-	{
-		return m_uniqueId;
-	}
-
 	//used for memory pools
-	btBroadphaseProxy() :m_clientObject(0),m_multiSapParentProxy(0)
-	{
-	}
+	btBroadphaseProxy() :m_clientObject(0){}
 
-	btBroadphaseProxy(void* userPtr,short int collisionFilterGroup, short int collisionFilterMask,void* multiSapParentProxy=0)
+	btBroadphaseProxy(void* userPtr,short int collisionFilterGroup, short int collisionFilterMask)
 		:m_clientObject(userPtr),
 		m_collisionFilterGroup(collisionFilterGroup),
 		m_collisionFilterMask(collisionFilterMask)
 	{
-		m_multiSapParentProxy = multiSapParentProxy;
 	}
 
-	
-
-	static SIMD_FORCE_INLINE bool isPolyhedral(int proxyType)
+	static inline bool isPolyhedral(int proxyType)
 	{
 		return (proxyType  < IMPLICIT_CONVEX_SHAPES_START_HERE);
 	}
 
-	static SIMD_FORCE_INLINE bool	isConvex(int proxyType)
+	static inline bool	isConvex(int proxyType)
 	{
 		return (proxyType < CONCAVE_SHAPES_START_HERE);
 	}
 
-	static SIMD_FORCE_INLINE bool	isConcave(int proxyType)
+	static inline bool	isConcave(int proxyType)
 	{
 		return ((proxyType > CONCAVE_SHAPES_START_HERE) &&
 			(proxyType < CONCAVE_SHAPES_END_HERE));
 	}
-	static SIMD_FORCE_INLINE bool	isCompound(int proxyType)
+	static inline bool	isCompound(int proxyType)
 	{
 		return (proxyType == COMPOUND_SHAPE_PROXYTYPE);
 	}
-	static SIMD_FORCE_INLINE bool isInfinite(int proxyType)
+	static inline bool isInfinite(int proxyType)
 	{
 		return (proxyType == STATIC_PLANE_PROXYTYPE);
 	}
@@ -149,9 +124,8 @@ struct btBroadphaseProxy;
 
 
 
-///The btBroadphasePair class contains a pair of aabb-overlapping objects.
-///A btDispatcher can search a btCollisionAlgorithm that performs exact/narrowphase collision detection on the actual collision shapes.
-ATTRIBUTE_ALIGNED16(struct) btBroadphasePair
+/// contains a pair of aabb-overlapping objects
+struct btBroadphasePair
 {
 	btBroadphasePair ()
 		:
@@ -162,8 +136,6 @@ ATTRIBUTE_ALIGNED16(struct) btBroadphasePair
 	{
 	}
 
-BT_DECLARE_ALIGNED_ALLOCATOR();
-
 	btBroadphasePair(const btBroadphasePair& other)
 		:		m_pProxy0(other.m_pProxy0),
 				m_pProxy1(other.m_pProxy1),
@@ -209,7 +181,6 @@ SIMD_FORCE_INLINE bool operator<(const btBroadphasePair& a, const btBroadphasePa
 */
 
 
-
 class btBroadphasePairSortPredicate
 {
 	public:
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp
index c95d1be0f2c..2ad0c86d8a2 100644
--- a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp
+++ b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp
@@ -18,6 +18,6 @@ subject to the following restrictions:
 
 btCollisionAlgorithm::btCollisionAlgorithm(const btCollisionAlgorithmConstructionInfo& ci)
 {
-	m_dispatcher = ci.m_dispatcher1;
+	m_dispatcher = ci.m_dispatcher;
 }
 
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h
index 1618ad9fdd3..55cec386a7b 100644
--- a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h
+++ b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h
@@ -16,8 +16,7 @@ subject to the following restrictions:
 #ifndef COLLISION_ALGORITHM_H
 #define COLLISION_ALGORITHM_H
 
-#include "LinearMath/btScalar.h"
-#include "LinearMath/btAlignedObjectArray.h"
+#include "../../LinearMath/btScalar.h"
 
 struct btBroadphaseProxy;
 class btDispatcher;
@@ -26,22 +25,21 @@ class btCollisionObject;
 struct btDispatcherInfo;
 class	btPersistentManifold;
 
-typedef btAlignedObjectArray<btPersistentManifold*>	btManifoldArray;
 
 struct btCollisionAlgorithmConstructionInfo
 {
 	btCollisionAlgorithmConstructionInfo()
-		:m_dispatcher1(0),
+		:m_dispatcher(0),
 		m_manifold(0)
 	{
 	}
 	btCollisionAlgorithmConstructionInfo(btDispatcher* dispatcher,int temp)
-		:m_dispatcher1(dispatcher)
+		:m_dispatcher(dispatcher)
 	{
 		(void)temp;
 	}
 
-	btDispatcher*	m_dispatcher1;
+	btDispatcher*	m_dispatcher;
 	btPersistentManifold*	m_manifold;
 
 	int	getDispatcherId();
@@ -73,7 +71,6 @@ public:
 
 	virtual btScalar calculateTimeOfImpact(btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut) = 0;
 
-	virtual	void	getAllContactManifolds(btManifoldArray&	manifoldArray) = 0;
 };
 
 
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.cpp b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.cpp
deleted file mode 100644
index fade71179e6..00000000000
--- a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.cpp
+++ /dev/null
@@ -1,1320 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it freely,
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-///btDbvt implementation by Nathanael Presson
-
-#include "btDbvt.h"
-
-//
-typedef btAlignedObjectArray<btDbvtNode*>			tNodeArray;
-typedef btAlignedObjectArray<const btDbvtNode*>	tConstNodeArray;
-
-//
-struct btDbvtNodeEnumerator : btDbvt::ICollide
-{
-tConstNodeArray	nodes;
-void Process(const btDbvtNode* n) { nodes.push_back(n); }
-};
-
-//
-static DBVT_INLINE int			indexof(const btDbvtNode* node)
-{
-return(node->parent->childs[1]==node);
-}
-
-//
-static DBVT_INLINE btDbvtVolume	merge(	const btDbvtVolume& a,
-										const btDbvtVolume& b)
-{
-#if DBVT_MERGE_IMPL==DBVT_IMPL_SSE
-DBVT_ALIGN char locals[sizeof(btDbvtAabbMm)];
-btDbvtVolume&	res=*(btDbvtVolume*)locals;
-#else
-btDbvtVolume	res;
-#endif
-Merge(a,b,res);
-return(res);
-}
-
-// volume+edge lengths
-static DBVT_INLINE btScalar		size(const btDbvtVolume& a)
-{
-const btVector3	edges=a.Lengths();
-return(	edges.x()*edges.y()*edges.z()+
-		edges.x()+edges.y()+edges.z());
-}
-
-//
-static void						getmaxdepth(const btDbvtNode* node,int depth,int& maxdepth)
-{
-if(node->isinternal())
-	{
-	getmaxdepth(node->childs[0],depth+1,maxdepth);
-	getmaxdepth(node->childs[0],depth+1,maxdepth);
-	} else maxdepth=btMax(maxdepth,depth);
-}
-
-//
-static DBVT_INLINE void			deletenode(	btDbvt* pdbvt,
-											btDbvtNode* node)
-{
-btAlignedFree(pdbvt->m_free);
-pdbvt->m_free=node;
-}
-	
-//
-static void						recursedeletenode(	btDbvt* pdbvt,
-													btDbvtNode* node)
-{
-if(!node->isleaf())
-	{
-	recursedeletenode(pdbvt,node->childs[0]);
-	recursedeletenode(pdbvt,node->childs[1]);
-	}
-if(node==pdbvt->m_root) pdbvt->m_root=0;
-deletenode(pdbvt,node);
-}
-
-//
-static DBVT_INLINE btDbvtNode*	createnode(	btDbvt* pdbvt,
-											btDbvtNode* parent,
-											void* data)
-{
-btDbvtNode*	node;
-if(pdbvt->m_free)
-	{ node=pdbvt->m_free;pdbvt->m_free=0; }
-	else
-	{ node=new(btAlignedAlloc(sizeof(btDbvtNode),16)) btDbvtNode(); }
-node->parent	=	parent;
-node->data		=	data;
-node->childs[1]	=	0;
-return(node);
-}
-
-//
-static DBVT_INLINE btDbvtNode*	createnode(	btDbvt* pdbvt,
-											btDbvtNode* parent,
-											const btDbvtVolume& volume,
-											void* data)
-{
-btDbvtNode*	node=createnode(pdbvt,parent,data);
-node->volume=volume;
-return(node);
-}
-
-//
-static DBVT_INLINE btDbvtNode*	createnode(	btDbvt* pdbvt,
-											btDbvtNode* parent,
-											const btDbvtVolume& volume0,
-											const btDbvtVolume& volume1,
-											void* data)
-{
-btDbvtNode*	node=createnode(pdbvt,parent,data);
-Merge(volume0,volume1,node->volume);
-return(node);
-}
-
-//
-static void						insertleaf(	btDbvt* pdbvt,
-											btDbvtNode* root,
-											btDbvtNode* leaf)
-{
-if(!pdbvt->m_root)
-	{
-	pdbvt->m_root	=	leaf;
-	leaf->parent	=	0;
-	}
-	else
-	{
-	if(!root->isleaf())
-		{
-		do	{
-			root=root->childs[Select(	leaf->volume,
-										root->childs[0]->volume,
-										root->childs[1]->volume)];
-			} while(!root->isleaf());
-		}
-	btDbvtNode*	prev=root->parent;
-	btDbvtNode*	node=createnode(pdbvt,prev,leaf->volume,root->volume,0);
-	if(prev)
-		{
-		prev->childs[indexof(root)]	=	node;
-		node->childs[0]				=	root;root->parent=node;
-		node->childs[1]				=	leaf;leaf->parent=node;
-		do	{
-			if(!prev->volume.Contain(node->volume))
-				Merge(prev->childs[0]->volume,prev->childs[1]->volume,prev->volume);
-				else
-				break;
-			node=prev;
-			} while(0!=(prev=node->parent));
-		}
-		else
-		{
-		node->childs[0]	=	root;root->parent=node;
-		node->childs[1]	=	leaf;leaf->parent=node;
-		pdbvt->m_root	=	node;
-		}
-	}
-}
-	
-//
-static btDbvtNode*				removeleaf(	btDbvt* pdbvt,
-											btDbvtNode* leaf)
-{
-if(leaf==pdbvt->m_root)
-	{
-	pdbvt->m_root=0;
-	return(0);
-	}
-	else
-	{
-	btDbvtNode*	parent=leaf->parent;
-	btDbvtNode*	prev=parent->parent;
-	btDbvtNode*	sibling=parent->childs[1-indexof(leaf)];			
-	if(prev)
-		{
-		prev->childs[indexof(parent)]=sibling;
-		sibling->parent=prev;
-		deletenode(pdbvt,parent);
-		while(prev)
-			{
-			const btDbvtVolume	pb=prev->volume;
-			Merge(prev->childs[0]->volume,prev->childs[1]->volume,prev->volume);
-			if(NotEqual(pb,prev->volume))
-				{
-				prev=prev->parent;
-				} else break;
-			}
-		return(prev?prev:pdbvt->m_root);
-		}
-		else
-		{								
-		pdbvt->m_root=sibling;
-		sibling->parent=0;
-		deletenode(pdbvt,parent);
-		return(pdbvt->m_root);
-		}			
-	}
-}
-
-//
-static void						fetchleaves(btDbvt* pdbvt,
-											btDbvtNode* root,
-											tNodeArray& leaves,
-											int depth=-1)
-{
-if(root->isinternal()&&depth)
-	{
-	fetchleaves(pdbvt,root->childs[0],leaves,depth-1);
-	fetchleaves(pdbvt,root->childs[1],leaves,depth-1);
-	deletenode(pdbvt,root);
-	}
-	else
-	{
-	leaves.push_back(root);
-	}
-}
-
-//
-static void						split(	const tNodeArray& leaves,
-										tNodeArray& left,
-										tNodeArray& right,
-										const btVector3& org,
-										const btVector3& axis)
-{
-left.resize(0);
-right.resize(0);
-for(int i=0,ni=leaves.size();i<ni;++i)
-	{
-	if(dot(axis,leaves[i]->volume.Center()-org)<0)
-		left.push_back(leaves[i]);
-		else
-		right.push_back(leaves[i]);
-	}
-}
-
-//
-static btDbvtVolume				bounds(	const tNodeArray& leaves)
-{
-#if DBVT_MERGE_IMPL==DBVT_IMPL_SSE
-DBVT_ALIGN char	locals[sizeof(btDbvtVolume)];
-btDbvtVolume&	volume=*(btDbvtVolume*)locals;
-volume=leaves[0]->volume;
-#else
-btDbvtVolume volume=leaves[0]->volume;
-#endif
-for(int i=1,ni=leaves.size();i<ni;++i)
-	{
-	Merge(volume,leaves[i]->volume,volume);
-	}
-return(volume);
-}
-
-//
-static void						bottomup(	btDbvt* pdbvt,
-											tNodeArray& leaves)
-{
-while(leaves.size()>1)
-	{
-	btScalar	minsize=SIMD_INFINITY;
-	int			minidx[2]={-1,-1};
-	for(int i=0;i<leaves.size();++i)
-		{
-		for(int j=i+1;j<leaves.size();++j)
-			{
-			const btScalar	sz=size(merge(leaves[i]->volume,leaves[j]->volume));
-			if(sz<minsize)
-				{
-				minsize		=	sz;
-				minidx[0]	=	i;
-				minidx[1]	=	j;
-				}
-			}
-		}
-	btDbvtNode*	n[]	=	{leaves[minidx[0]],leaves[minidx[1]]};
-	btDbvtNode*	p	=	createnode(pdbvt,0,n[0]->volume,n[1]->volume,0);
-	p->childs[0]		=	n[0];
-	p->childs[1]		=	n[1];
-	n[0]->parent		=	p;
-	n[1]->parent		=	p;
-	leaves[minidx[0]]	=	p;
-	leaves.swap(minidx[1],leaves.size()-1);
-	leaves.pop_back();
-	}
-}
-
-//
-static btDbvtNode*			topdown(btDbvt* pdbvt,
-									tNodeArray& leaves,
-									int bu_treshold)
-{
-static const btVector3	axis[]={btVector3(1,0,0),
-								btVector3(0,1,0),
-								btVector3(0,0,1)};
-if(leaves.size()>1)
-	{
-	if(leaves.size()>bu_treshold)
-		{
-		const btDbvtVolume	vol=bounds(leaves);
-		const btVector3			org=vol.Center();
-		tNodeArray				sets[2];
-		int						bestaxis=-1;
-		int						bestmidp=leaves.size();
-		int						splitcount[3][2]={{0,0},{0,0},{0,0}};
-		int i;
-		for( i=0;i<leaves.size();++i)
-			{
-			const btVector3	x=leaves[i]->volume.Center()-org;
-			for(int j=0;j<3;++j)
-				{
-				++splitcount[j][dot(x,axis[j])>0?1:0];
-				}
-			}
-		for( i=0;i<3;++i)
-			{
-			if((splitcount[i][0]>0)&&(splitcount[i][1]>0))
-				{
-				const int	midp=(int)btFabs(btScalar(splitcount[i][0]-splitcount[i][1]));
-				if(midp<bestmidp)
-					{
-					bestaxis=i;
-					bestmidp=midp;
-					}
-				}
-			}
-		if(bestaxis>=0)
-			{
-			sets[0].reserve(splitcount[bestaxis][0]);
-			sets[1].reserve(splitcount[bestaxis][1]);
-			split(leaves,sets[0],sets[1],org,axis[bestaxis]);
-			}
-			else
-			{
-			sets[0].reserve(leaves.size()/2+1);
-			sets[1].reserve(leaves.size()/2);
-			for(int i=0,ni=leaves.size();i<ni;++i)
-				{
-				sets[i&1].push_back(leaves[i]);
-				}
-			}
-		btDbvtNode*	node=createnode(pdbvt,0,vol,0);
-		node->childs[0]=topdown(pdbvt,sets[0],bu_treshold);
-		node->childs[1]=topdown(pdbvt,sets[1],bu_treshold);
-		node->childs[0]->parent=node;
-		node->childs[1]->parent=node;
-		return(node);
-		}
-		else
-		{
-		bottomup(pdbvt,leaves);
-		return(leaves[0]);
-		}
-	}
-return(leaves[0]);
-}
-
-//
-static DBVT_INLINE btDbvtNode*	sort(btDbvtNode* n,btDbvtNode*& r)
-{
-btDbvtNode*	p=n->parent;
-btAssert(n->isinternal());
-if(p>n)
-	{
-	const int		i=indexof(n);
-	const int		j=1-i;
-	btDbvtNode*	s=p->childs[j];
-	btDbvtNode*	q=p->parent;
-	btAssert(n==p->childs[i]);
-	if(q) q->childs[indexof(p)]=n; else r=n;
-	s->parent=n;
-	p->parent=n;
-	n->parent=q;
-	p->childs[0]=n->childs[0];
-	p->childs[1]=n->childs[1];
-	n->childs[0]->parent=p;
-	n->childs[1]->parent=p;
-	n->childs[i]=p;
-	n->childs[j]=s;
-	btSwap(p->volume,n->volume);
-	return(p);
-	}
-return(n);
-}
-
-//
-static DBVT_INLINE btDbvtNode*	walkup(btDbvtNode* n,int count)
-{
-while(n&&(count--)) n=n->parent;
-return(n);
-}
-
-//
-// Api
-//
-
-//
-				btDbvt::btDbvt()
-{
-m_root		=	0;
-m_free		=	0;
-m_lkhd		=	-1;
-m_leaves	=	0;
-m_opath		=	0;
-}
-
-//
-				btDbvt::~btDbvt()
-{
-clear();
-}
-
-//
-void			btDbvt::clear()
-{
-if(m_root)	recursedeletenode(this,m_root);
-btAlignedFree(m_free);
-m_free=0;
-}
-
-//
-void			btDbvt::optimizeBottomUp()
-{
-if(m_root)
-	{
-	tNodeArray leaves;
-	leaves.reserve(m_leaves);
-	fetchleaves(this,m_root,leaves);
-	bottomup(this,leaves);
-	m_root=leaves[0];
-	}
-}
-
-//
-void			btDbvt::optimizeTopDown(int bu_treshold)
-{
-if(m_root)
-	{
-	tNodeArray	leaves;
-	leaves.reserve(m_leaves);
-	fetchleaves(this,m_root,leaves);
-	m_root=topdown(this,leaves,bu_treshold);
-	}
-}
-
-//
-void			btDbvt::optimizeIncremental(int passes)
-{
-if(passes<0) passes=m_leaves;
-if(m_root&&(passes>0))
-	{
-	do	{
-		btDbvtNode*		node=m_root;
-		unsigned	bit=0;
-		while(node->isinternal())
-			{
-			node=sort(node,m_root)->childs[(m_opath>>bit)&1];
-			bit=(bit+1)&(sizeof(unsigned)*8-1);
-			}
-		update(node);
-		++m_opath;
-		} while(--passes);
-	}
-}
-
-//
-btDbvtNode*	btDbvt::insert(const btDbvtVolume& volume,void* data)
-{
-btDbvtNode*	leaf=createnode(this,0,volume,data);
-insertleaf(this,m_root,leaf);
-++m_leaves;
-return(leaf);
-}
-
-//
-void			btDbvt::update(btDbvtNode* leaf,int lookahead)
-{
-btDbvtNode*	root=removeleaf(this,leaf);
-if(root)
-	{
-	if(lookahead>=0)
-		{
-		for(int i=0;(i<lookahead)&&root->parent;++i)
-			{
-			root=root->parent;
-			}
-		} else root=m_root;
-	}
-insertleaf(this,root,leaf);
-}
-
-//
-void			btDbvt::update(btDbvtNode* leaf,const btDbvtVolume& volume)
-{
-btDbvtNode*	root=removeleaf(this,leaf);
-if(root)
-	{
-	if(m_lkhd>=0)
-		{
-		for(int i=0;(i<m_lkhd)&&root->parent;++i)
-			{
-			root=root->parent;
-			}
-		} else root=m_root;
-	}
-leaf->volume=volume;
-insertleaf(this,root,leaf);
-}
-
-//
-bool			btDbvt::update(btDbvtNode* leaf,btDbvtVolume volume,const btVector3& velocity,btScalar margin)
-{
-if(leaf->volume.Contain(volume)) return(false);
-volume.Expand(btVector3(margin,margin,margin));
-volume.SignedExpand(velocity);
-update(leaf,volume);
-return(true);
-}
-
-//
-bool			btDbvt::update(btDbvtNode* leaf,btDbvtVolume volume,const btVector3& velocity)
-{
-if(leaf->volume.Contain(volume)) return(false);
-volume.SignedExpand(velocity);
-update(leaf,volume);
-return(true);
-}
-
-//
-bool			btDbvt::update(btDbvtNode* leaf,btDbvtVolume volume,btScalar margin)
-{
-if(leaf->volume.Contain(volume)) return(false);
-volume.Expand(btVector3(margin,margin,margin));
-update(leaf,volume);
-return(true);
-}
-
-//
-void			btDbvt::remove(btDbvtNode* leaf)
-{
-removeleaf(this,leaf);
-deletenode(this,leaf);
---m_leaves;
-}
-
-//
-void			btDbvt::write(IWriter* iwriter) const
-{
-btDbvtNodeEnumerator	nodes;
-nodes.nodes.reserve(m_leaves*2);
-enumNodes(m_root,nodes);
-iwriter->Prepare(m_root,nodes.nodes.size());
-for(int i=0;i<nodes.nodes.size();++i)
-	{
-	const btDbvtNode* n=nodes.nodes[i];
-	int			p=-1;
-	if(n->parent) p=nodes.nodes.findLinearSearch(n->parent);
-	if(n->isinternal())
-		{
-		const int	c0=nodes.nodes.findLinearSearch(n->childs[0]);
-		const int	c1=nodes.nodes.findLinearSearch(n->childs[1]);
-		iwriter->WriteNode(n,i,p,c0,c1);
-		}
-		else
-		{
-		iwriter->WriteLeaf(n,i,p);
-		}	
-	}
-}
-
-//
-void			btDbvt::clone(btDbvt& dest,IClone* iclone) const
-{
-dest.clear();
-if(m_root!=0)
-	{	
-	btAlignedObjectArray<sStkCLN>	stack;
-	stack.reserve(m_leaves);
-	stack.push_back(sStkCLN(m_root,0));
-	do	{
-		const int		i=stack.size()-1;
-		const sStkCLN	e=stack[i];
-		btDbvtNode*			n=createnode(&dest,e.parent,e.node->volume,e.node->data);
-		stack.pop_back();
-		if(e.parent!=0)
-			e.parent->childs[i&1]=n;
-			else
-			dest.m_root=n;
-		if(e.node->isinternal())
-			{
-			stack.push_back(sStkCLN(e.node->childs[0],n));
-			stack.push_back(sStkCLN(e.node->childs[1],n));
-			}
-			else
-			{
-			iclone->CloneLeaf(n);
-			}
-		} while(stack.size()>0);
-	}
-}
-
-//
-int				btDbvt::maxdepth(const btDbvtNode* node)
-{
-int	depth=0;
-if(node) getmaxdepth(node,1,depth);
-return(depth);
-}
-
-//
-int				btDbvt::countLeaves(const btDbvtNode* node)
-{
-if(node->isinternal())
-	return(countLeaves(node->childs[0])+countLeaves(node->childs[1]));
-	else
-	return(1);
-}
-
-//
-void			btDbvt::extractLeaves(const btDbvtNode* node,btAlignedObjectArray<const btDbvtNode*>& leaves)
-{
-if(node->isinternal())
-	{
-	extractLeaves(node->childs[0],leaves);
-	extractLeaves(node->childs[1],leaves);
-	}
-	else
-	{
-	leaves.push_back(node);
-	}	
-}
-
-//
-#if DBVT_ENABLE_BENCHMARK
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "LinearMath/btQuickProf.h"
-
-/*
-q6600,2.4ghz
-
-/Ox /Ob2 /Oi /Ot /I "." /I "..\.." /I "..\..\src" /D "NDEBUG" /D "_LIB" /D "_WINDOWS" /D "_CRT_SECURE_NO_DEPRECATE" /D "_CRT_NONSTDC_NO_DEPRECATE" /D "WIN32"
-/GF /FD /MT /GS- /Gy /arch:SSE2 /Zc:wchar_t- /Fp"..\..\out\release8\build\libbulletcollision\libbulletcollision.pch"
-/Fo"..\..\out\release8\build\libbulletcollision\\"
-/Fd"..\..\out\release8\build\libbulletcollision\bulletcollision.pdb"
-/W3 /nologo /c /Wp64 /Zi /errorReport:prompt
-
-Benchmarking dbvt...
-        World scale: 100.000000
-        Extents base: 1.000000
-        Extents range: 4.000000
-        Leaves: 8192
-        sizeof(btDbvtVolume): 32 bytes
-        sizeof(btDbvtNode):   44 bytes
-[1] btDbvtVolume intersections: 3537 ms (0%)
-[2] btDbvtVolume merges: 1945 ms (0%)
-[3] btDbvt::collideTT: 6646 ms (0%)
-[4] btDbvt::collideTT self: 3389 ms (0%)
-[5] btDbvt::collideTT xform: 7505 ms (0%)
-[6] btDbvt::collideTT xform,self: 7480 ms (0%)
-[7] btDbvt::collideRAY: 6307 ms (0%),(332511 r/s)
-[8] insert/remove: 2105 ms (-3%),(996271 ir/s)
-[9] updates (teleport): 1943 ms (0%),(1079337 u/s)
-[10] updates (jitter): 1301 ms (0%),(1611953 u/s)
-[11] optimize (incremental): 2510 ms (0%),(1671000 o/s)
-[12] btDbvtVolume notequal: 3677 ms (0%)
-[13] culling(OCL+fullsort): 2231 ms (0%),(458 t/s)
-[14] culling(OCL+qsort): 3500 ms (0%),(2340 t/s)
-[15] culling(KDOP+qsort): 1151 ms (0%),(7117 t/s)
-[16] insert/remove batch(256): 5138 ms (0%),(816330 bir/s)
-[17] btDbvtVolume proximity: 2842 ms (0%)
-[18] btDbvtVolume select: 3390 ms (0%)
-*/
-
-struct btDbvtBenchmark
-{
-struct NilPolicy : btDbvt::ICollide
-	{
-	NilPolicy() : m_pcount(0),m_depth(-SIMD_INFINITY),m_checksort(true)		{}
-	void	Process(const btDbvtNode*,const btDbvtNode*)				{ ++m_pcount; }
-	void	Process(const btDbvtNode*)									{ ++m_pcount; }
-	void	Process(const btDbvtNode*,btScalar depth)
-		{
-		++m_pcount;
-		if(m_checksort)
-			{ if(depth>=m_depth) m_depth=depth; else printf("wrong depth: %f (should be >= %f)\r\n",depth,m_depth); }
-		}
-	int			m_pcount;
-	btScalar	m_depth;
-	bool		m_checksort;
-	};
-struct P14 : btDbvt::ICollide
-	{
-	struct Node
-		{
-		const btDbvtNode*	leaf;
-		btScalar			depth;
-		};
-	void Process(const btDbvtNode* leaf,btScalar depth)
-		{
-		Node	n;
-		n.leaf	=	leaf;
-		n.depth	=	depth;
-		}
-	static int sortfnc(const Node& a,const Node& b)
-		{
-		if(a.depth<b.depth) return(+1);
-		if(a.depth>b.depth) return(-1);
-		return(0);
-		}
-	btAlignedObjectArray<Node>		m_nodes;
-	};
-struct P15 : btDbvt::ICollide
-	{
-	struct Node
-		{
-		const btDbvtNode*	leaf;
-		btScalar			depth;
-		};
-	void Process(const btDbvtNode* leaf)
-		{
-		Node	n;
-		n.leaf	=	leaf;
-		n.depth	=	dot(leaf->volume.Center(),m_axis);
-		}
-	static int sortfnc(const Node& a,const Node& b)
-		{
-		if(a.depth<b.depth) return(+1);
-		if(a.depth>b.depth) return(-1);
-		return(0);
-		}
-	btAlignedObjectArray<Node>		m_nodes;
-	btVector3						m_axis;
-	};
-static btScalar			RandUnit()
-	{
-	return(rand()/(btScalar)RAND_MAX);
-	}
-static btVector3		RandVector3()
-	{
-	return(btVector3(RandUnit(),RandUnit(),RandUnit()));
-	}
-static btVector3		RandVector3(btScalar cs)
-	{
-	return(RandVector3()*cs-btVector3(cs,cs,cs)/2);
-	}
-static btDbvtVolume	RandVolume(btScalar cs,btScalar eb,btScalar es)
-	{
-	return(btDbvtVolume::FromCE(RandVector3(cs),btVector3(eb,eb,eb)+RandVector3()*es));
-	}
-static btTransform		RandTransform(btScalar cs)
-	{
-	btTransform	t;
-	t.setOrigin(RandVector3(cs));
-	t.setRotation(btQuaternion(RandUnit()*SIMD_PI*2,RandUnit()*SIMD_PI*2,RandUnit()*SIMD_PI*2).normalized());
-	return(t);
-	}
-static void				RandTree(btScalar cs,btScalar eb,btScalar es,int leaves,btDbvt& dbvt)
-	{
-	dbvt.clear();
-	for(int i=0;i<leaves;++i)
-		{
-		dbvt.insert(RandVolume(cs,eb,es),0);
-		}
-	}
-};
-
-void			btDbvt::benchmark()
-{
-static const btScalar	cfgVolumeCenterScale		=	100;
-static const btScalar	cfgVolumeExentsBase			=	1;
-static const btScalar	cfgVolumeExentsScale		=	4;
-static const int		cfgLeaves					=	8192;
-static const bool		cfgEnable					=	true;
-
-//[1] btDbvtVolume intersections
-bool					cfgBenchmark1_Enable		=	cfgEnable;
-static const int		cfgBenchmark1_Iterations	=	8;
-static const int		cfgBenchmark1_Reference		=	3537;
-//[2] btDbvtVolume merges
-bool					cfgBenchmark2_Enable		=	cfgEnable;
-static const int		cfgBenchmark2_Iterations	=	4;
-static const int		cfgBenchmark2_Reference		=	1945;
-//[3] btDbvt::collideTT
-bool					cfgBenchmark3_Enable		=	cfgEnable;
-static const int		cfgBenchmark3_Iterations	=	512;
-static const int		cfgBenchmark3_Reference		=	6646;
-//[4] btDbvt::collideTT self
-bool					cfgBenchmark4_Enable		=	cfgEnable;
-static const int		cfgBenchmark4_Iterations	=	512;
-static const int		cfgBenchmark4_Reference		=	3389;
-//[5] btDbvt::collideTT xform
-bool					cfgBenchmark5_Enable		=	cfgEnable;
-static const int		cfgBenchmark5_Iterations	=	512;
-static const btScalar	cfgBenchmark5_OffsetScale	=	2;
-static const int		cfgBenchmark5_Reference		=	7505;
-//[6] btDbvt::collideTT xform,self
-bool					cfgBenchmark6_Enable		=	cfgEnable;
-static const int		cfgBenchmark6_Iterations	=	512;
-static const btScalar	cfgBenchmark6_OffsetScale	=	2;
-static const int		cfgBenchmark6_Reference		=	7480;
-//[7] btDbvt::collideRAY
-bool					cfgBenchmark7_Enable		=	cfgEnable;
-static const int		cfgBenchmark7_Passes		=	32;
-static const int		cfgBenchmark7_Iterations	=	65536;
-static const int		cfgBenchmark7_Reference		=	6307;
-//[8] insert/remove
-bool					cfgBenchmark8_Enable		=	cfgEnable;
-static const int		cfgBenchmark8_Passes		=	32;
-static const int		cfgBenchmark8_Iterations	=	65536;
-static const int		cfgBenchmark8_Reference		=	2105;
-//[9] updates (teleport)
-bool					cfgBenchmark9_Enable		=	cfgEnable;
-static const int		cfgBenchmark9_Passes		=	32;
-static const int		cfgBenchmark9_Iterations	=	65536;
-static const int		cfgBenchmark9_Reference		=	1943;
-//[10] updates (jitter)
-bool					cfgBenchmark10_Enable		=	cfgEnable;
-static const btScalar	cfgBenchmark10_Scale		=	cfgVolumeCenterScale/10000;
-static const int		cfgBenchmark10_Passes		=	32;
-static const int		cfgBenchmark10_Iterations	=	65536;
-static const int		cfgBenchmark10_Reference	=	1301;
-//[11] optimize (incremental)
-bool					cfgBenchmark11_Enable		=	cfgEnable;
-static const int		cfgBenchmark11_Passes		=	64;
-static const int		cfgBenchmark11_Iterations	=	65536;
-static const int		cfgBenchmark11_Reference	=	2510;
-//[12] btDbvtVolume notequal
-bool					cfgBenchmark12_Enable		=	cfgEnable;
-static const int		cfgBenchmark12_Iterations	=	32;
-static const int		cfgBenchmark12_Reference	=	3677;
-//[13] culling(OCL+fullsort)
-bool					cfgBenchmark13_Enable		=	cfgEnable;
-static const int		cfgBenchmark13_Iterations	=	1024;
-static const int		cfgBenchmark13_Reference	=	2231;
-//[14] culling(OCL+qsort)
-bool					cfgBenchmark14_Enable		=	cfgEnable;
-static const int		cfgBenchmark14_Iterations	=	8192;
-static const int		cfgBenchmark14_Reference	=	3500;
-//[15] culling(KDOP+qsort)
-bool					cfgBenchmark15_Enable		=	cfgEnable;
-static const int		cfgBenchmark15_Iterations	=	8192;
-static const int		cfgBenchmark15_Reference	=	1151;
-//[16] insert/remove batch
-bool					cfgBenchmark16_Enable		=	cfgEnable;
-static const int		cfgBenchmark16_BatchCount	=	256;
-static const int		cfgBenchmark16_Passes		=	16384;
-static const int		cfgBenchmark16_Reference	=	5138;
-//[17] proximity
-bool					cfgBenchmark17_Enable		=	cfgEnable;
-static const int		cfgBenchmark17_Iterations	=	8;
-static const int		cfgBenchmark17_Reference	=	2842;
-//[18] select
-bool					cfgBenchmark18_Enable		=	cfgEnable;
-static const int		cfgBenchmark18_Iterations	=	4;
-static const int		cfgBenchmark18_Reference	=	3390;
-
-btClock					wallclock;
-printf("Benchmarking dbvt...\r\n");
-printf("\tWorld scale: %f\r\n",cfgVolumeCenterScale);
-printf("\tExtents base: %f\r\n",cfgVolumeExentsBase);
-printf("\tExtents range: %f\r\n",cfgVolumeExentsScale);
-printf("\tLeaves: %u\r\n",cfgLeaves);
-printf("\tsizeof(btDbvtVolume): %u bytes\r\n",sizeof(btDbvtVolume));
-printf("\tsizeof(btDbvtNode):   %u bytes\r\n",sizeof(btDbvtNode));
-if(cfgBenchmark1_Enable)
-	{// Benchmark 1	
-	srand(380843);
-	btAlignedObjectArray<btDbvtVolume>	volumes;
-	btAlignedObjectArray<bool>			results;
-	volumes.resize(cfgLeaves);
-	results.resize(cfgLeaves);
-	for(int i=0;i<cfgLeaves;++i)
-		{
-		volumes[i]=btDbvtBenchmark::RandVolume(cfgVolumeCenterScale,cfgVolumeExentsBase,cfgVolumeExentsScale);
-		}
-	printf("[1] btDbvtVolume intersections: ");
-	wallclock.reset();
-	for(int i=0;i<cfgBenchmark1_Iterations;++i)
-		{
-		for(int j=0;j<cfgLeaves;++j)
-			{
-			for(int k=0;k<cfgLeaves;++k)
-				{
-				results[k]=Intersect(volumes[j],volumes[k]);
-				}
-			}
-		}
-	const int time=(int)wallclock.getTimeMilliseconds();
-	printf("%u ms (%i%%)\r\n",time,(time-cfgBenchmark1_Reference)*100/time);
-	}
-if(cfgBenchmark2_Enable)
-	{// Benchmark 2	
-	srand(380843);
-	btAlignedObjectArray<btDbvtVolume>	volumes;
-	btAlignedObjectArray<btDbvtVolume>	results;
-	volumes.resize(cfgLeaves);
-	results.resize(cfgLeaves);
-	for(int i=0;i<cfgLeaves;++i)
-		{
-		volumes[i]=btDbvtBenchmark::RandVolume(cfgVolumeCenterScale,cfgVolumeExentsBase,cfgVolumeExentsScale);
-		}
-	printf("[2] btDbvtVolume merges: ");
-	wallclock.reset();
-	for(int i=0;i<cfgBenchmark2_Iterations;++i)
-		{
-		for(int j=0;j<cfgLeaves;++j)
-			{
-			for(int k=0;k<cfgLeaves;++k)
-				{
-				Merge(volumes[j],volumes[k],results[k]);
-				}
-			}
-		}
-	const int time=(int)wallclock.getTimeMilliseconds();
-	printf("%u ms (%i%%)\r\n",time,(time-cfgBenchmark2_Reference)*100/time);
-	}
-if(cfgBenchmark3_Enable)
-	{// Benchmark 3	
-	srand(380843);
-	btDbvt						dbvt[2];
-	btDbvtBenchmark::NilPolicy	policy;
-	btDbvtBenchmark::RandTree(cfgVolumeCenterScale,cfgVolumeExentsBase,cfgVolumeExentsScale,cfgLeaves,dbvt[0]);
-	btDbvtBenchmark::RandTree(cfgVolumeCenterScale,cfgVolumeExentsBase,cfgVolumeExentsScale,cfgLeaves,dbvt[1]);
-	dbvt[0].optimizeTopDown();
-	dbvt[1].optimizeTopDown();
-	printf("[3] btDbvt::collideTT: ");
-	wallclock.reset();
-	for(int i=0;i<cfgBenchmark3_Iterations;++i)
-		{
-		btDbvt::collideTT(dbvt[0].m_root,dbvt[1].m_root,policy);
-		}
-	const int time=(int)wallclock.getTimeMilliseconds();
-	printf("%u ms (%i%%)\r\n",time,(time-cfgBenchmark3_Reference)*100/time);
-	}
-if(cfgBenchmark4_Enable)
-	{// Benchmark 4
-	srand(380843);
-	btDbvt						dbvt;
-	btDbvtBenchmark::NilPolicy	policy;
-	btDbvtBenchmark::RandTree(cfgVolumeCenterScale,cfgVolumeExentsBase,cfgVolumeExentsScale,cfgLeaves,dbvt);
-	dbvt.optimizeTopDown();
-	printf("[4] btDbvt::collideTT self: ");
-	wallclock.reset();
-	for(int i=0;i<cfgBenchmark4_Iterations;++i)
-		{
-		btDbvt::collideTT(dbvt.m_root,dbvt.m_root,policy);
-		}
-	const int time=(int)wallclock.getTimeMilliseconds();
-	printf("%u ms (%i%%)\r\n",time,(time-cfgBenchmark4_Reference)*100/time);
-	}
-if(cfgBenchmark5_Enable)
-	{// Benchmark 5	
-	srand(380843);
-	btDbvt								dbvt[2];
-	btAlignedObjectArray<btTransform>	transforms;
-	btDbvtBenchmark::NilPolicy			policy;
-	transforms.resize(cfgBenchmark5_Iterations);
-	for(int i=0;i<transforms.size();++i)
-		{
-		transforms[i]=btDbvtBenchmark::RandTransform(cfgVolumeCenterScale*cfgBenchmark5_OffsetScale);
-		}
-	btDbvtBenchmark::RandTree(cfgVolumeCenterScale,cfgVolumeExentsBase,cfgVolumeExentsScale,cfgLeaves,dbvt[0]);
-	btDbvtBenchmark::RandTree(cfgVolumeCenterScale,cfgVolumeExentsBase,cfgVolumeExentsScale,cfgLeaves,dbvt[1]);
-	dbvt[0].optimizeTopDown();
-	dbvt[1].optimizeTopDown();
-	printf("[5] btDbvt::collideTT xform: ");
-	wallclock.reset();
-	for(int i=0;i<cfgBenchmark5_Iterations;++i)
-		{
-		btDbvt::collideTT(dbvt[0].m_root,dbvt[1].m_root,transforms[i],policy);
-		}
-	const int time=(int)wallclock.getTimeMilliseconds();
-	printf("%u ms (%i%%)\r\n",time,(time-cfgBenchmark5_Reference)*100/time);
-	}
-if(cfgBenchmark6_Enable)
-	{// Benchmark 6	
-	srand(380843);
-	btDbvt								dbvt;
-	btAlignedObjectArray<btTransform>	transforms;
-	btDbvtBenchmark::NilPolicy			policy;
-	transforms.resize(cfgBenchmark6_Iterations);
-	for(int i=0;i<transforms.size();++i)
-		{
-		transforms[i]=btDbvtBenchmark::RandTransform(cfgVolumeCenterScale*cfgBenchmark6_OffsetScale);
-		}
-	btDbvtBenchmark::RandTree(cfgVolumeCenterScale,cfgVolumeExentsBase,cfgVolumeExentsScale,cfgLeaves,dbvt);
-	dbvt.optimizeTopDown();
-	printf("[6] btDbvt::collideTT xform,self: ");
-	wallclock.reset();
-	for(int i=0;i<cfgBenchmark6_Iterations;++i)
-		{
-		btDbvt::collideTT(dbvt.m_root,dbvt.m_root,transforms[i],policy);		
-		}
-	const int time=(int)wallclock.getTimeMilliseconds();
-	printf("%u ms (%i%%)\r\n",time,(time-cfgBenchmark6_Reference)*100/time);
-	}
-if(cfgBenchmark7_Enable)
-	{// Benchmark 7	
-	srand(380843);
-	btDbvt								dbvt;
-	btAlignedObjectArray<btVector3>		rayorg;
-	btAlignedObjectArray<btVector3>		raydir;
-	btDbvtBenchmark::NilPolicy			policy;
-	rayorg.resize(cfgBenchmark7_Iterations);
-	raydir.resize(cfgBenchmark7_Iterations);
-	for(int i=0;i<rayorg.size();++i)
-		{
-		rayorg[i]=btDbvtBenchmark::RandVector3(cfgVolumeCenterScale*2);
-		raydir[i]=btDbvtBenchmark::RandVector3(cfgVolumeCenterScale*2);
-		}
-	btDbvtBenchmark::RandTree(cfgVolumeCenterScale,cfgVolumeExentsBase,cfgVolumeExentsScale,cfgLeaves,dbvt);
-	dbvt.optimizeTopDown();
-	printf("[7] btDbvt::collideRAY: ");
-	wallclock.reset();
-	for(int i=0;i<cfgBenchmark7_Passes;++i)
-		{
-		for(int j=0;j<cfgBenchmark7_Iterations;++j)
-			{
-			btDbvt::collideRAY(dbvt.m_root,rayorg[j],raydir[j],policy);
-			}
-		}
-	const int	time=(int)wallclock.getTimeMilliseconds();
-	unsigned	rays=cfgBenchmark7_Passes*cfgBenchmark7_Iterations;
-	printf("%u ms (%i%%),(%u r/s)\r\n",time,(time-cfgBenchmark7_Reference)*100/time,(rays*1000)/time);
-	}
-if(cfgBenchmark8_Enable)
-	{// Benchmark 8	
-	srand(380843);
-	btDbvt								dbvt;
-	btDbvtBenchmark::RandTree(cfgVolumeCenterScale,cfgVolumeExentsBase,cfgVolumeExentsScale,cfgLeaves,dbvt);
-	dbvt.optimizeTopDown();
-	printf("[8] insert/remove: ");
-	wallclock.reset();
-	for(int i=0;i<cfgBenchmark8_Passes;++i)
-		{
-		for(int j=0;j<cfgBenchmark8_Iterations;++j)
-			{
-			dbvt.remove(dbvt.insert(btDbvtBenchmark::RandVolume(cfgVolumeCenterScale,cfgVolumeExentsBase,cfgVolumeExentsScale),0));
-			}
-		}
-	const int	time=(int)wallclock.getTimeMilliseconds();
-	const int	ir=cfgBenchmark8_Passes*cfgBenchmark8_Iterations;
-	printf("%u ms (%i%%),(%u ir/s)\r\n",time,(time-cfgBenchmark8_Reference)*100/time,ir*1000/time);
-	}
-if(cfgBenchmark9_Enable)
-	{// Benchmark 9	
-	srand(380843);
-	btDbvt										dbvt;
-	btAlignedObjectArray<const btDbvtNode*>	leaves;
-	btDbvtBenchmark::RandTree(cfgVolumeCenterScale,cfgVolumeExentsBase,cfgVolumeExentsScale,cfgLeaves,dbvt);
-	dbvt.optimizeTopDown();
-	dbvt.extractLeaves(dbvt.m_root,leaves);
-	printf("[9] updates (teleport): ");
-	wallclock.reset();
-	for(int i=0;i<cfgBenchmark9_Passes;++i)
-		{
-		for(int j=0;j<cfgBenchmark9_Iterations;++j)
-			{
-			dbvt.update(const_cast<btDbvtNode*>(leaves[rand()%cfgLeaves]),
-						btDbvtBenchmark::RandVolume(cfgVolumeCenterScale,cfgVolumeExentsBase,cfgVolumeExentsScale));
-			}
-		}
-	const int	time=(int)wallclock.getTimeMilliseconds();
-	const int	up=cfgBenchmark9_Passes*cfgBenchmark9_Iterations;
-	printf("%u ms (%i%%),(%u u/s)\r\n",time,(time-cfgBenchmark9_Reference)*100/time,up*1000/time);
-	}
-if(cfgBenchmark10_Enable)
-	{// Benchmark 10	
-	srand(380843);
-	btDbvt										dbvt;
-	btAlignedObjectArray<const btDbvtNode*>	leaves;
-	btAlignedObjectArray<btVector3>				vectors;
-	vectors.resize(cfgBenchmark10_Iterations);
-	for(int i=0;i<vectors.size();++i)
-		{
-		vectors[i]=(btDbvtBenchmark::RandVector3()*2-btVector3(1,1,1))*cfgBenchmark10_Scale;
-		}
-	btDbvtBenchmark::RandTree(cfgVolumeCenterScale,cfgVolumeExentsBase,cfgVolumeExentsScale,cfgLeaves,dbvt);
-	dbvt.optimizeTopDown();
-	dbvt.extractLeaves(dbvt.m_root,leaves);
-	printf("[10] updates (jitter): ");
-	wallclock.reset();
-	
-	for(int i=0;i<cfgBenchmark10_Passes;++i)
-		{
-		for(int j=0;j<cfgBenchmark10_Iterations;++j)
-			{			
-			const btVector3&	d=vectors[j];
-			btDbvtNode*		l=const_cast<btDbvtNode*>(leaves[rand()%cfgLeaves]);
-			btDbvtVolume		v=btDbvtVolume::FromMM(l->volume.Mins()+d,l->volume.Maxs()+d);
-			dbvt.update(l,v);
-			}
-		}
-	const int	time=(int)wallclock.getTimeMilliseconds();
-	const int	up=cfgBenchmark10_Passes*cfgBenchmark10_Iterations;
-	printf("%u ms (%i%%),(%u u/s)\r\n",time,(time-cfgBenchmark10_Reference)*100/time,up*1000/time);
-	}
-if(cfgBenchmark11_Enable)
-	{// Benchmark 11	
-	srand(380843);
-	btDbvt										dbvt;
-	btDbvtBenchmark::RandTree(cfgVolumeCenterScale,cfgVolumeExentsBase,cfgVolumeExentsScale,cfgLeaves,dbvt);
-	dbvt.optimizeTopDown();
-	printf("[11] optimize (incremental): ");
-	wallclock.reset();	
-	for(int i=0;i<cfgBenchmark11_Passes;++i)
-		{
-		dbvt.optimizeIncremental(cfgBenchmark11_Iterations);
-		}
-	const int	time=(int)wallclock.getTimeMilliseconds();
-	const int	op=cfgBenchmark11_Passes*cfgBenchmark11_Iterations;
-	printf("%u ms (%i%%),(%u o/s)\r\n",time,(time-cfgBenchmark11_Reference)*100/time,op/time*1000);
-	}
-if(cfgBenchmark12_Enable)
-	{// Benchmark 12	
-	srand(380843);
-	btAlignedObjectArray<btDbvtVolume>	volumes;
-	btAlignedObjectArray<bool>				results;
-	volumes.resize(cfgLeaves);
-	results.resize(cfgLeaves);
-	for(int i=0;i<cfgLeaves;++i)
-		{
-		volumes[i]=btDbvtBenchmark::RandVolume(cfgVolumeCenterScale,cfgVolumeExentsBase,cfgVolumeExentsScale);
-		}
-	printf("[12] btDbvtVolume notequal: ");
-	wallclock.reset();
-	for(int i=0;i<cfgBenchmark12_Iterations;++i)
-		{
-		for(int j=0;j<cfgLeaves;++j)
-			{
-			for(int k=0;k<cfgLeaves;++k)
-				{
-				results[k]=NotEqual(volumes[j],volumes[k]);
-				}
-			}
-		}
-	const int time=(int)wallclock.getTimeMilliseconds();
-	printf("%u ms (%i%%)\r\n",time,(time-cfgBenchmark12_Reference)*100/time);
-	}
-if(cfgBenchmark13_Enable)
-	{// Benchmark 13	
-	srand(380843);
-	btDbvt								dbvt;
-	btAlignedObjectArray<btVector3>		vectors;
-	btDbvtBenchmark::NilPolicy			policy;
-	vectors.resize(cfgBenchmark13_Iterations);
-	for(int i=0;i<vectors.size();++i)
-		{
-		vectors[i]=(btDbvtBenchmark::RandVector3()*2-btVector3(1,1,1)).normalized();
-		}
-	btDbvtBenchmark::RandTree(cfgVolumeCenterScale,cfgVolumeExentsBase,cfgVolumeExentsScale,cfgLeaves,dbvt);
-	dbvt.optimizeTopDown();
-	printf("[13] culling(OCL+fullsort): ");
-	wallclock.reset();	
-	for(int i=0;i<cfgBenchmark13_Iterations;++i)
-		{
-		static const btScalar	offset=0;
-		policy.m_depth=-SIMD_INFINITY;
-		dbvt.collideOCL(dbvt.m_root,&vectors[i],&offset,vectors[i],1,policy);
-		}
-	const int	time=(int)wallclock.getTimeMilliseconds();
-	const int	t=cfgBenchmark13_Iterations;
-	printf("%u ms (%i%%),(%u t/s)\r\n",time,(time-cfgBenchmark13_Reference)*100/time,(t*1000)/time);
-	}
-if(cfgBenchmark14_Enable)
-	{// Benchmark 14	
-	srand(380843);
-	btDbvt								dbvt;
-	btAlignedObjectArray<btVector3>		vectors;
-	btDbvtBenchmark::P14				policy;
-	vectors.resize(cfgBenchmark14_Iterations);
-	for(int i=0;i<vectors.size();++i)
-		{
-		vectors[i]=(btDbvtBenchmark::RandVector3()*2-btVector3(1,1,1)).normalized();
-		}
-	btDbvtBenchmark::RandTree(cfgVolumeCenterScale,cfgVolumeExentsBase,cfgVolumeExentsScale,cfgLeaves,dbvt);
-	dbvt.optimizeTopDown();
-	policy.m_nodes.reserve(cfgLeaves);
-	printf("[14] culling(OCL+qsort): ");
-	wallclock.reset();	
-	for(int i=0;i<cfgBenchmark14_Iterations;++i)
-		{
-		static const btScalar	offset=0;
-		policy.m_nodes.resize(0);
-		dbvt.collideOCL(dbvt.m_root,&vectors[i],&offset,vectors[i],1,policy,false);
-		policy.m_nodes.quickSort(btDbvtBenchmark::P14::sortfnc);
-		}
-	const int	time=(int)wallclock.getTimeMilliseconds();
-	const int	t=cfgBenchmark14_Iterations;
-	printf("%u ms (%i%%),(%u t/s)\r\n",time,(time-cfgBenchmark14_Reference)*100/time,(t*1000)/time);
-	}
-if(cfgBenchmark15_Enable)
-	{// Benchmark 15	
-	srand(380843);
-	btDbvt								dbvt;
-	btAlignedObjectArray<btVector3>		vectors;
-	btDbvtBenchmark::P15				policy;
-	vectors.resize(cfgBenchmark15_Iterations);
-	for(int i=0;i<vectors.size();++i)
-		{
-		vectors[i]=(btDbvtBenchmark::RandVector3()*2-btVector3(1,1,1)).normalized();
-		}
-	btDbvtBenchmark::RandTree(cfgVolumeCenterScale,cfgVolumeExentsBase,cfgVolumeExentsScale,cfgLeaves,dbvt);
-	dbvt.optimizeTopDown();
-	policy.m_nodes.reserve(cfgLeaves);
-	printf("[15] culling(KDOP+qsort): ");
-	wallclock.reset();	
-	for(int i=0;i<cfgBenchmark15_Iterations;++i)
-		{
-		static const btScalar	offset=0;
-		policy.m_nodes.resize(0);
-		policy.m_axis=vectors[i];
-		dbvt.collideKDOP(dbvt.m_root,&vectors[i],&offset,1,policy);
-		policy.m_nodes.quickSort(btDbvtBenchmark::P15::sortfnc);
-		}
-	const int	time=(int)wallclock.getTimeMilliseconds();
-	const int	t=cfgBenchmark15_Iterations;
-	printf("%u ms (%i%%),(%u t/s)\r\n",time,(time-cfgBenchmark15_Reference)*100/time,(t*1000)/time);
-	}
-if(cfgBenchmark16_Enable)
-	{// Benchmark 16	
-	srand(380843);
-	btDbvt								dbvt;
-	btAlignedObjectArray<btDbvtNode*>	batch;
-	btDbvtBenchmark::RandTree(cfgVolumeCenterScale,cfgVolumeExentsBase,cfgVolumeExentsScale,cfgLeaves,dbvt);
-	dbvt.optimizeTopDown();
-	batch.reserve(cfgBenchmark16_BatchCount);
-	printf("[16] insert/remove batch(%u): ",cfgBenchmark16_BatchCount);
-	wallclock.reset();
-	for(int i=0;i<cfgBenchmark16_Passes;++i)
-		{
-		for(int j=0;j<cfgBenchmark16_BatchCount;++j)
-			{
-			batch.push_back(dbvt.insert(btDbvtBenchmark::RandVolume(cfgVolumeCenterScale,cfgVolumeExentsBase,cfgVolumeExentsScale),0));
-			}
-		for(int j=0;j<cfgBenchmark16_BatchCount;++j)
-			{
-			dbvt.remove(batch[j]);
-			}
-		batch.resize(0);
-		}
-	const int	time=(int)wallclock.getTimeMilliseconds();
-	const int	ir=cfgBenchmark16_Passes*cfgBenchmark16_BatchCount;
-	printf("%u ms (%i%%),(%u bir/s)\r\n",time,(time-cfgBenchmark16_Reference)*100/time,int(ir*1000.0/time));
-	}
-if(cfgBenchmark17_Enable)
-	{// Benchmark 17
-	srand(380843);
-	btAlignedObjectArray<btDbvtVolume>	volumes;
-	btAlignedObjectArray<btScalar>		results;
-	volumes.resize(cfgLeaves);
-	results.resize(cfgLeaves);
-	for(int i=0;i<cfgLeaves;++i)
-		{
-		volumes[i]=btDbvtBenchmark::RandVolume(cfgVolumeCenterScale,cfgVolumeExentsBase,cfgVolumeExentsScale);
-		}
-	printf("[17] btDbvtVolume proximity: ");
-	wallclock.reset();
-	for(int i=0;i<cfgBenchmark17_Iterations;++i)
-		{
-		for(int j=0;j<cfgLeaves;++j)
-			{
-			for(int k=0;k<cfgLeaves;++k)
-				{
-				results[k]=Proximity(volumes[j],volumes[k]);
-				}
-			}
-		}
-	const int time=(int)wallclock.getTimeMilliseconds();
-	printf("%u ms (%i%%)\r\n",time,(time-cfgBenchmark17_Reference)*100/time);
-	}
-if(cfgBenchmark18_Enable)
-	{// Benchmark 18
-	srand(380843);
-	btAlignedObjectArray<btDbvtVolume>	volumes;
-	btAlignedObjectArray<int>			results;
-	btAlignedObjectArray<int>			indices;
-	volumes.resize(cfgLeaves);
-	results.resize(cfgLeaves);
-	indices.resize(cfgLeaves);
-	for(int i=0;i<cfgLeaves;++i)
-		{
-		indices[i]=i;
-		volumes[i]=btDbvtBenchmark::RandVolume(cfgVolumeCenterScale,cfgVolumeExentsBase,cfgVolumeExentsScale);
-		}
-	for(int i=0;i<cfgLeaves;++i)
-		{
-		btSwap(indices[i],indices[rand()%cfgLeaves]);
-		}
-	printf("[18] btDbvtVolume select: ");
-	wallclock.reset();
-	for(int i=0;i<cfgBenchmark18_Iterations;++i)
-		{
-		for(int j=0;j<cfgLeaves;++j)
-			{
-			for(int k=0;k<cfgLeaves;++k)
-				{
-				const int idx=indices[k];
-				results[idx]=Select(volumes[idx],volumes[j],volumes[k]);
-				}
-			}
-		}
-	const int time=(int)wallclock.getTimeMilliseconds();
-	printf("%u ms (%i%%)\r\n",time,(time-cfgBenchmark18_Reference)*100/time);
-	}
-printf("\r\n\r\n");
-}
-#endif
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.h b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.h
deleted file mode 100644
index 10f94627c37..00000000000
--- a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.h
+++ /dev/null
@@ -1,1101 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2007 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-///btDbvt implementation by Nathanael Presson
-
-#ifndef BT_DYNAMIC_BOUNDING_VOLUME_TREE_H
-#define BT_DYNAMIC_BOUNDING_VOLUME_TREE_H
-
-#include "LinearMath/btAlignedObjectArray.h"
-#include "LinearMath/btVector3.h"
-#include "LinearMath/btTransform.h"
-
-//
-// Compile time configuration
-//
-
-
-// Implementation profiles
-#define DBVT_IMPL_GENERIC		0	// Generic implementation	
-#define DBVT_IMPL_SSE			1	// SSE
-
-// Template implementation of ICollide
-#ifdef WIN32_AVOID_WHEN_EMBEDDED_INSIDE_BLENDER
-	#if (defined (_MSC_VER) && _MSC_VER >= 1400)
-	#define	DBVT_USE_TEMPLATE		1
-	#else
-	#define	DBVT_USE_TEMPLATE		0
-#endif
-#else
-#define	DBVT_USE_TEMPLATE		0
-#endif
-
-// Using memmov for collideOCL
-#define DBVT_USE_MEMMOVE		1
-
-// Enable benchmarking code
-#define	DBVT_ENABLE_BENCHMARK	0
-
-// Inlining
-#define DBVT_INLINE				SIMD_FORCE_INLINE
-// Align
-#ifdef WIN32
-#define DBVT_ALIGN				__declspec(align(16))
-#else
-#define DBVT_ALIGN
-#endif
-
-// Specific methods implementation
-#ifdef WIN32_AVOID_WHEN_EMBEDDED_INSIDE_BLENDER
-#define DBVT_PROXIMITY_IMPL		DBVT_IMPL_SSE
-#define DBVT_SELECT_IMPL		DBVT_IMPL_SSE
-#define DBVT_MERGE_IMPL			DBVT_IMPL_SSE
-#else
-#define DBVT_PROXIMITY_IMPL		DBVT_IMPL_GENERIC
-#define DBVT_SELECT_IMPL		DBVT_IMPL_GENERIC
-#define DBVT_MERGE_IMPL			DBVT_IMPL_GENERIC
-#endif
-
-//
-// Auto config and checks
-//
-
-#if DBVT_USE_TEMPLATE
-#define	DBVT_VIRTUAL
-#define DBVT_VIRTUAL_DTOR(a)
-#define DBVT_PREFIX					template <typename T>
-#define DBVT_IPOLICY				T& policy
-#define DBVT_CHECKTYPE				static const ICollide&	typechecker=*(T*)0;
-#else
-#define	DBVT_VIRTUAL_DTOR(a)		virtual ~a() {}
-#define DBVT_VIRTUAL				virtual
-#define DBVT_PREFIX
-#define DBVT_IPOLICY				ICollide& policy
-#define DBVT_CHECKTYPE
-#endif
-
-#if DBVT_USE_MEMMOVE
-#ifndef __CELLOS_LV2__
-#include <memory.h>
-#endif
-#include <string.h>
-#endif
-
-#ifndef DBVT_USE_TEMPLATE
-#error "DBVT_USE_TEMPLATE undefined"
-#endif
-
-#ifndef DBVT_USE_MEMMOVE
-#error "DBVT_USE_MEMMOVE undefined"
-#endif
-
-#ifndef DBVT_ENABLE_BENCHMARK
-#error "DBVT_ENABLE_BENCHMARK undefined"
-#endif
-
-#ifndef DBVT_PROXIMITY_IMPL
-#error "DBVT_PROXIMITY_IMPL undefined"
-#endif
-
-#ifndef DBVT_SELECT_IMPL
-#error "DBVT_SELECT_IMPL undefined"
-#endif
-
-#ifndef DBVT_MERGE_IMPL
-#error "DBVT_MERGE_IMPL undefined"
-#endif
-
-//
-// Defaults volumes
-//
-
-/* btDbvtAabbMm			*/ 
-struct	btDbvtAabbMm
-{
-DBVT_INLINE btVector3			Center() const	{ return((mi+mx)/2); }
-DBVT_INLINE btVector3			Lengths() const	{ return(mx-mi); }
-DBVT_INLINE btVector3			Extents() const	{ return((mx-mi)/2); }
-DBVT_INLINE const btVector3&	Mins() const	{ return(mi); }
-DBVT_INLINE const btVector3&	Maxs() const	{ return(mx); }
-static inline btDbvtAabbMm		FromCE(const btVector3& c,const btVector3& e);
-static inline btDbvtAabbMm		FromCR(const btVector3& c,btScalar r);
-static inline btDbvtAabbMm		FromMM(const btVector3& mi,const btVector3& mx);
-static inline btDbvtAabbMm		FromPoints(const btVector3* pts,int n);
-static inline btDbvtAabbMm		FromPoints(const btVector3** ppts,int n);
-DBVT_INLINE void				Expand(const btVector3 e);
-DBVT_INLINE void				SignedExpand(const btVector3 e);
-DBVT_INLINE bool				Contain(const btDbvtAabbMm& a) const;
-DBVT_INLINE int					Classify(const btVector3& n,btScalar o,int s) const;
-DBVT_INLINE btScalar			ProjectMinimum(const btVector3& v,unsigned signs) const;
-DBVT_INLINE friend bool			Intersect(	const btDbvtAabbMm& a,
-											const btDbvtAabbMm& b);
-DBVT_INLINE friend bool			Intersect(	const btDbvtAabbMm& a,
-											const btDbvtAabbMm& b,
-											const btTransform& xform);
-DBVT_INLINE friend bool			Intersect(	const btDbvtAabbMm& a,
-											const btVector3& b);
-DBVT_INLINE friend bool			Intersect(	const btDbvtAabbMm& a,
-											const btVector3& org,
-											const btVector3& invdir,
-											const unsigned* signs);
-DBVT_INLINE friend btScalar		Proximity(	const btDbvtAabbMm& a,
-											const btDbvtAabbMm& b);
-DBVT_INLINE friend int			Select(		const btDbvtAabbMm& o,
-											const btDbvtAabbMm& a,
-											const btDbvtAabbMm& b);
-DBVT_INLINE friend void			Merge(		const btDbvtAabbMm& a,
-											const btDbvtAabbMm& b,
-											btDbvtAabbMm& r);
-DBVT_INLINE friend bool			NotEqual(	const btDbvtAabbMm& a,
-											const btDbvtAabbMm& b);
-private:
-DBVT_INLINE void				AddSpan(const btVector3& d,btScalar& smi,btScalar& smx) const;
-private:
-btVector3	mi,mx;
-};
-
-// Types	
-typedef	btDbvtAabbMm	btDbvtVolume;
-
-/* btDbvtNode				*/ 
-struct	btDbvtNode
-{
-	btDbvtVolume	volume;
-	btDbvtNode*		parent;
-	bool	isleaf() const		{ return(childs[1]==0); }
-	bool	isinternal() const	{ return(!isleaf()); }
-	union	{
-		btDbvtNode*	childs[2];
-		void*	data;
-		};
-};
-
-///The btDbvt class implements a fast dynamic bounding volume tree based on axis aligned bounding boxes (aabb tree).
-///This btDbvt is used for soft body collision detection and for the btDbvtBroadphase. It has a fast insert, remove and update of nodes.
-///Unlike the btQuantizedBvh, nodes can be dynamically moved around, which allows for change in topology of the underlying data structure.
-struct	btDbvt
-	{
-	
-	
-	/* Stack element	*/ 
-	struct	sStkNN
-		{
-		const btDbvtNode*	a;
-		const btDbvtNode*	b;
-		sStkNN() {}
-		sStkNN(const btDbvtNode* na,const btDbvtNode* nb) : a(na),b(nb) {}
-		};
-	struct	sStkNP
-		{
-		const btDbvtNode*	node;
-		int			mask;
-		sStkNP(const btDbvtNode* n,unsigned m) : node(n),mask(m) {}
-		};
-	struct	sStkNPS
-		{
-		const btDbvtNode*	node;
-		int			mask;
-		btScalar	value;
-		sStkNPS() {}
-		sStkNPS(const btDbvtNode* n,unsigned m,btScalar v) : node(n),mask(m),value(v) {}
-		};
-	struct	sStkCLN
-		{
-		const btDbvtNode*	node;
-		btDbvtNode*		parent;
-		sStkCLN(const btDbvtNode* n,btDbvtNode* p) : node(n),parent(p) {}
-		};
-	// Policies/Interfaces
-			
-	/* ICollide	*/ 
-	struct	ICollide
-		{		
-		DBVT_VIRTUAL_DTOR(ICollide)
-		DBVT_VIRTUAL void	Process(const btDbvtNode*,const btDbvtNode*)		{}
-		DBVT_VIRTUAL void	Process(const btDbvtNode*)					{}
-		DBVT_VIRTUAL void	Process(const btDbvtNode* n,btScalar)			{ Process(n); }
-		DBVT_VIRTUAL bool	Descent(const btDbvtNode*)					{ return(true); }
-		DBVT_VIRTUAL bool	AllLeaves(const btDbvtNode*)					{ return(true); }
-		};
-	/* IWriter	*/ 
-	struct	IWriter
-		{
-		virtual ~IWriter() {}
-		virtual void		Prepare(const btDbvtNode* root,int numnodes)=0;
-		virtual void		WriteNode(const btDbvtNode*,int index,int parent,int child0,int child1)=0;
-		virtual void		WriteLeaf(const btDbvtNode*,int index,int parent)=0;
-		};
-	/* IClone	*/ 
-	struct	IClone
-		{
-		virtual ~IClone()	{}
-		virtual void		CloneLeaf(btDbvtNode*) {}
-		};
-		
-	// Constants
-	enum	{
-			SIMPLE_STACKSIZE	=	64,
-			DOUBLE_STACKSIZE	=	SIMPLE_STACKSIZE*2
-			};
-		
-	// Fields
-	btDbvtNode*			m_root;
-	btDbvtNode*			m_free;
-	int				m_lkhd;
-	int				m_leaves;
-	unsigned		m_opath;
-	// Methods
-					btDbvt();
-					~btDbvt();
-	void			clear();
-	bool			empty() const { return(0==m_root); }
-	void			optimizeBottomUp();
-	void			optimizeTopDown(int bu_treshold=128);
-	void			optimizeIncremental(int passes);
-	btDbvtNode*		insert(const btDbvtVolume& box,void* data);
-	void			update(btDbvtNode* leaf,int lookahead=-1);
-	void			update(btDbvtNode* leaf,const btDbvtVolume& volume);
-	bool			update(btDbvtNode* leaf,btDbvtVolume volume,const btVector3& velocity,btScalar margin);
-	bool			update(btDbvtNode* leaf,btDbvtVolume volume,const btVector3& velocity);
-	bool			update(btDbvtNode* leaf,btDbvtVolume volume,btScalar margin);	
-	void			remove(btDbvtNode* leaf);
-	void			write(IWriter* iwriter) const;
-	void			clone(btDbvt& dest,IClone* iclone=0) const;
-	static int		maxdepth(const btDbvtNode* node);
-	static int		countLeaves(const btDbvtNode* node);
-	static void		extractLeaves(const btDbvtNode* node,btAlignedObjectArray<const btDbvtNode*>& leaves);
-	#if DBVT_ENABLE_BENCHMARK
-	static void		benchmark();
-	#else
-	static void		benchmark(){}
-	#endif
-	// DBVT_IPOLICY must support ICollide policy/interface
-	DBVT_PREFIX
-	static void		enumNodes(	const btDbvtNode* root,
-								DBVT_IPOLICY);
-	DBVT_PREFIX
-	static void		enumLeaves(	const btDbvtNode* root,
-								DBVT_IPOLICY);
-	DBVT_PREFIX
-	static void		collideTT(	const btDbvtNode* root0,
-								const btDbvtNode* root1,
-								DBVT_IPOLICY);
-	DBVT_PREFIX
-	static void		collideTT(	const btDbvtNode* root0,
-								const btDbvtNode* root1,
-								const btTransform& xform,
-								DBVT_IPOLICY);
-	DBVT_PREFIX
-	static void		collideTT(	const btDbvtNode* root0,
-								const btTransform& xform0,
-								const btDbvtNode* root1,
-								const btTransform& xform1,
-								DBVT_IPOLICY);
-	DBVT_PREFIX
-	static void		collideTV(	const btDbvtNode* root,
-								const btDbvtVolume& volume,
-								DBVT_IPOLICY);
-	DBVT_PREFIX
-	static void		collideRAY(	const btDbvtNode* root,
-								const btVector3& origin,
-								const btVector3& direction,
-								DBVT_IPOLICY);
-	DBVT_PREFIX
-	static void		collideKDOP(const btDbvtNode* root,
-								const btVector3* normals,
-								const btScalar* offsets,
-								int count,
-								DBVT_IPOLICY);
-	DBVT_PREFIX
-	static void		collideOCL(	const btDbvtNode* root,
-								const btVector3* normals,
-								const btScalar* offsets,
-								const btVector3& sortaxis,
-								int count,								
-								DBVT_IPOLICY,
-								bool fullsort=true);
-	DBVT_PREFIX
-	static void		collideTU(	const btDbvtNode* root,
-								DBVT_IPOLICY);
-	// Helpers	
-	static DBVT_INLINE int	nearest(const int* i,const btDbvt::sStkNPS* a,btScalar v,int l,int h)
-		{
-		int	m=0;
-		while(l<h)
-			{
-			m=(l+h)>>1;
-			if(a[i[m]].value>=v) l=m+1; else h=m;
-			}
-		return(h);
-		}
-	static DBVT_INLINE int	allocate(	btAlignedObjectArray<int>& ifree,
-										btAlignedObjectArray<sStkNPS>& stock,
-										const sStkNPS& value)
-		{
-		int	i;
-		if(ifree.size()>0)
-			{ i=ifree[ifree.size()-1];ifree.pop_back();stock[i]=value; }
-			else
-			{ i=stock.size();stock.push_back(value); }
-		return(i); 
-		}
-	//
-	private:
-					btDbvt(const btDbvt&)	{}	
-	};
-
-//
-// Inline's
-//
-
-//
-inline btDbvtAabbMm			btDbvtAabbMm::FromCE(const btVector3& c,const btVector3& e)
-{
-btDbvtAabbMm box;
-box.mi=c-e;box.mx=c+e;
-return(box);
-}
-	
-//
-inline btDbvtAabbMm			btDbvtAabbMm::FromCR(const btVector3& c,btScalar r)
-{
-return(FromCE(c,btVector3(r,r,r)));
-}
-	
-//
-inline btDbvtAabbMm			btDbvtAabbMm::FromMM(const btVector3& mi,const btVector3& mx)
-{
-btDbvtAabbMm box;
-box.mi=mi;box.mx=mx;
-return(box);
-}
-	
-//
-inline btDbvtAabbMm			btDbvtAabbMm::FromPoints(const btVector3* pts,int n)
-{
-btDbvtAabbMm box;
-box.mi=box.mx=pts[0];
-for(int i=1;i<n;++i)
-	{
-	box.mi.setMin(pts[i]);
-	box.mx.setMax(pts[i]);
-	}
-return(box);
-}
-
-//
-inline btDbvtAabbMm			btDbvtAabbMm::FromPoints(const btVector3** ppts,int n)
-{
-btDbvtAabbMm box;
-box.mi=box.mx=*ppts[0];
-for(int i=1;i<n;++i)
-	{
-	box.mi.setMin(*ppts[i]);
-	box.mx.setMax(*ppts[i]);
-	}
-return(box);
-}
-
-//
-DBVT_INLINE void		btDbvtAabbMm::Expand(const btVector3 e)
-{
-mi-=e;mx+=e;
-}
-	
-//
-DBVT_INLINE void		btDbvtAabbMm::SignedExpand(const btVector3 e)
-{
-if(e.x()>0) mx.setX(mx.x()+e.x()); else mi.setX(mi.x()+e.x());
-if(e.y()>0) mx.setY(mx.y()+e.y()); else mi.setY(mi.y()+e.y());
-if(e.z()>0) mx.setZ(mx.z()+e.z()); else mi.setZ(mi.z()+e.z());
-}
-	
-//
-DBVT_INLINE bool		btDbvtAabbMm::Contain(const btDbvtAabbMm& a) const
-{
-return(	(mi.x()<=a.mi.x())&&
-		(mi.y()<=a.mi.y())&&
-		(mi.z()<=a.mi.z())&&
-		(mx.x()>=a.mx.x())&&
-		(mx.y()>=a.mx.y())&&
-		(mx.z()>=a.mx.z()));
-}
-
-//
-DBVT_INLINE int		btDbvtAabbMm::Classify(const btVector3& n,btScalar o,int s) const
-{
-btVector3			pi,px;
-switch(s)
-	{
-	case	(0+0+0):	px=btVector3(mi.x(),mi.y(),mi.z());
-						pi=btVector3(mx.x(),mx.y(),mx.z());break;
-	case	(1+0+0):	px=btVector3(mx.x(),mi.y(),mi.z());
-						pi=btVector3(mi.x(),mx.y(),mx.z());break;
-	case	(0+2+0):	px=btVector3(mi.x(),mx.y(),mi.z());
-						pi=btVector3(mx.x(),mi.y(),mx.z());break;
-	case	(1+2+0):	px=btVector3(mx.x(),mx.y(),mi.z());
-						pi=btVector3(mi.x(),mi.y(),mx.z());break;
-	case	(0+0+4):	px=btVector3(mi.x(),mi.y(),mx.z());
-						pi=btVector3(mx.x(),mx.y(),mi.z());break;
-	case	(1+0+4):	px=btVector3(mx.x(),mi.y(),mx.z());
-						pi=btVector3(mi.x(),mx.y(),mi.z());break;
-	case	(0+2+4):	px=btVector3(mi.x(),mx.y(),mx.z());
-						pi=btVector3(mx.x(),mi.y(),mi.z());break;
-	case	(1+2+4):	px=btVector3(mx.x(),mx.y(),mx.z());
-						pi=btVector3(mi.x(),mi.y(),mi.z());break;
-	}
-if((dot(n,px)+o)<0)		return(-1);
-if((dot(n,pi)+o)>=0)	return(+1);
-return(0);
-}
-
-//
-DBVT_INLINE btScalar	btDbvtAabbMm::ProjectMinimum(const btVector3& v,unsigned signs) const
-{
-const btVector3*	b[]={&mx,&mi};
-const btVector3		p(	b[(signs>>0)&1]->x(),
-						b[(signs>>1)&1]->y(),
-						b[(signs>>2)&1]->z());
-return(dot(p,v));
-}
-
-//
-DBVT_INLINE void		btDbvtAabbMm::AddSpan(const btVector3& d,btScalar& smi,btScalar& smx) const
-{
-for(int i=0;i<3;++i)
-	{
-	if(d[i]<0)
-		{ smi+=mx[i]*d[i];smx+=mi[i]*d[i]; }
-		else
-		{ smi+=mi[i]*d[i];smx+=mx[i]*d[i]; }
-	}
-}
-	
-//
-DBVT_INLINE bool		Intersect(	const btDbvtAabbMm& a,
-									const btDbvtAabbMm& b)
-{
-return(	(a.mi.x()<=b.mx.x())&&
-		(a.mx.x()>=b.mi.x())&&
-		(a.mi.y()<=b.mx.y())&&
-		(a.mx.y()>=b.mi.y())&&
-		(a.mi.z()<=b.mx.z())&&		
-		(a.mx.z()>=b.mi.z()));
-}
-
-//
-DBVT_INLINE bool		Intersect(	const btDbvtAabbMm& a,
-									const btDbvtAabbMm& b,
-									const btTransform& xform)
-{
-const btVector3		d0=xform*b.Center()-a.Center();
-const btVector3		d1=d0*xform.getBasis();
-btScalar			s0[2]={0,0};
-btScalar			s1[2]={dot(xform.getOrigin(),d0),s1[0]};
-a.AddSpan(d0,s0[0],s0[1]);
-b.AddSpan(d1,s1[0],s1[1]);
-if(s0[0]>(s1[1])) return(false);
-if(s0[1]<(s1[0])) return(false);
-return(true);
-}
-
-//
-DBVT_INLINE bool		Intersect(	const btDbvtAabbMm& a,
-									const btVector3& b)
-{
-return(	(b.x()>=a.mi.x())&&
-		(b.y()>=a.mi.y())&&
-		(b.z()>=a.mi.z())&&
-		(b.x()<=a.mx.x())&&
-		(b.y()<=a.mx.y())&&
-		(b.z()<=a.mx.z()));
-}
-
-//
-DBVT_INLINE bool		Intersect(	const btDbvtAabbMm& a,
-									const btVector3& org,
-									const btVector3& invdir,
-									const unsigned* signs)
-{
-#if 0
-const btVector3		b0((a.mi-org)*invdir);
-const btVector3		b1((a.mx-org)*invdir);
-const btVector3		tmin(btMin(b0[0],b1[0]),btMin(b0[1],b1[1]),btMin(b0[2],b1[2]));
-const btVector3		tmax(btMax(b0[0],b1[0]),btMax(b0[1],b1[1]),btMax(b0[2],b1[2]));
-const btScalar		tin=btMax(tmin[0],btMax(tmin[1],tmin[2]));
-const btScalar		tout=btMin(tmax[0],btMin(tmax[1],tmax[2]));
-return(tin<tout);
-#else
-const btVector3*	bounds[2]={&a.mi,&a.mx};
-btScalar			txmin=(bounds[  signs[0]]->x()-org[0])*invdir[0];
-btScalar			txmax=(bounds[1-signs[0]]->x()-org[0])*invdir[0];
-const btScalar		tymin=(bounds[  signs[1]]->y()-org[1])*invdir[1];
-const btScalar		tymax=(bounds[1-signs[1]]->y()-org[1])*invdir[1];
-if((txmin>tymax)||(tymin>txmax)) return(false);
-if(tymin>txmin) txmin=tymin;
-if(tymax<txmax) txmax=tymax;
-const btScalar		tzmin=(bounds[  signs[2]]->z()-org[2])*invdir[2];
-const btScalar		tzmax=(bounds[1-signs[2]]->z()-org[2])*invdir[2];
-if((txmin>tzmax)||(tzmin>txmax)) return(false);
-if(tzmin>txmin) txmin=tzmin;
-if(tzmax<txmax) txmax=tzmax;
-return(txmax>0);
-#endif
-}
-	
-//
-DBVT_INLINE btScalar	Proximity(	const btDbvtAabbMm& a,
-									const btDbvtAabbMm& b)
-{
-#if	DBVT_PROXIMITY_IMPL == DBVT_IMPL_SSE
-DBVT_ALIGN btScalar							r[1];
-static DBVT_ALIGN const unsigned __int32	mask[]={0x7fffffff,0x7fffffff,0x7fffffff,0x7fffffff};
-__asm
-	{
-	mov		eax,a
-	mov		ecx,b
-	movaps	xmm0,[eax]
-	movaps	xmm2,[ecx]
-	movaps	xmm1,[eax+16]
-	movaps	xmm3,[ecx+16]
-	addps	xmm0,xmm1
-	addps	xmm2,xmm3
-	subps	xmm0,xmm2
-	andps	xmm0,mask
-	movhlps	xmm1,xmm0
-	addps	xmm0,xmm1
-	pshufd	xmm1,xmm0,1
-	addss	xmm0,xmm1
-	movss	r,xmm0
-	}
-return(r[0]);
-#else
-const btVector3	d=(a.mi+a.mx)-(b.mi+b.mx);
-return(btFabs(d.x())+btFabs(d.y())+btFabs(d.z()));
-#endif
-}
-
-//
-DBVT_INLINE int			Select(	const btDbvtAabbMm& o,
-								const btDbvtAabbMm& a,
-								const btDbvtAabbMm& b)
-{
-#if	DBVT_SELECT_IMPL == DBVT_IMPL_SSE
-DBVT_ALIGN __int32							r[1];
-static DBVT_ALIGN const unsigned __int32	mask[]={0x7fffffff,0x7fffffff,0x7fffffff,0x7fffffff};
-__asm
-	{
-	mov		eax,o
-	mov		ecx,a
-	mov		edx,b
-	movaps	xmm0,[eax]
-	movaps	xmm5,mask
-	addps	xmm0,[eax+16]	
-	movaps	xmm1,[ecx]
-	movaps	xmm2,[edx]
-	addps	xmm1,[ecx+16]
-	addps	xmm2,[edx+16]
-	subps	xmm1,xmm0
-	subps	xmm2,xmm0
-	andps	xmm1,xmm5
-	andps	xmm2,xmm5
-	movhlps	xmm3,xmm1
-	movhlps	xmm4,xmm2
-	addps	xmm1,xmm3
-	addps	xmm2,xmm4
-	pshufd	xmm3,xmm1,1
-	pshufd	xmm4,xmm2,1
-	addss	xmm1,xmm3
-	addss	xmm2,xmm4
-	cmpless	xmm2,xmm1
-	movss	r,xmm2
-	}
-return(r[0]&1);
-#else
-return(Proximity(o,a)<Proximity(o,b)?0:1);
-#endif
-}
-
-//
-DBVT_INLINE void		Merge(	const btDbvtAabbMm& a,
-								const btDbvtAabbMm& b,
-								btDbvtAabbMm& r)
-{
-#if DBVT_MERGE_IMPL==DBVT_IMPL_SSE
-__asm
-	{
-	mov		eax,a
-	mov		edx,b
-	mov		ecx,r
-	movaps	xmm0,[eax+0]
-	movaps	xmm1,[edx+0]
-	movaps	xmm2,[eax+16]
-	movaps	xmm3,[edx+16]
-	minps	xmm0,xmm1
-	maxps	xmm2,xmm3
-	movaps	[ecx+0],xmm0
-	movaps	[ecx+16],xmm2
-	}
-#else
-for(int i=0;i<3;++i)
-	{
-	if(a.mi[i]<b.mi[i]) r.mi[i]=a.mi[i]; else r.mi[i]=b.mi[i];
-	if(a.mx[i]>b.mx[i]) r.mx[i]=a.mx[i]; else r.mx[i]=b.mx[i];
-	}
-#endif
-}
-
-//
-DBVT_INLINE bool		NotEqual(	const btDbvtAabbMm& a,
-									const btDbvtAabbMm& b)
-{
-return(	(a.mi.x()!=b.mi.x())||
-		(a.mi.y()!=b.mi.y())||
-		(a.mi.z()!=b.mi.z())||
-		(a.mx.x()!=b.mx.x())||
-		(a.mx.y()!=b.mx.y())||
-		(a.mx.z()!=b.mx.z()));
-}
-
-//
-// Inline's
-//
-
-//
-DBVT_PREFIX
-inline void		btDbvt::enumNodes(	const btDbvtNode* root,
-									DBVT_IPOLICY)
-{
-DBVT_CHECKTYPE
-policy.Process(root);
-if(root->isinternal())
-	{
-	enumNodes(root->childs[0],policy);
-	enumNodes(root->childs[1],policy);
-	}
-}
-
-//
-DBVT_PREFIX
-inline void		btDbvt::enumLeaves(	const btDbvtNode* root,
-									DBVT_IPOLICY)
-{
-DBVT_CHECKTYPE
-if(root->isinternal())
-	{
-	enumLeaves(root->childs[0],policy);
-	enumLeaves(root->childs[1],policy);
-	}
-	else
-	{
-	policy.Process(root);
-	}
-}
-
-//
-DBVT_PREFIX
-inline void		btDbvt::collideTT(	const btDbvtNode* root0,
-									const btDbvtNode* root1,
-									DBVT_IPOLICY)
-{
-DBVT_CHECKTYPE
-if(root0&&root1)
-	{
-	btAlignedObjectArray<sStkNN>	stack;
-	int								depth=1;
-	int								treshold=DOUBLE_STACKSIZE-4;
-	stack.resize(DOUBLE_STACKSIZE);
-	stack[0]=sStkNN(root0,root1);
-	do	{
-		sStkNN	p=stack[--depth];
-		if(depth>treshold)
-			{
-			stack.resize(stack.size()*2);
-			treshold=stack.size()-4;
-			}
-		if(p.a==p.b)
-			{
-			if(p.a->isinternal())
-				{
-				stack[depth++]=sStkNN(p.a->childs[0],p.a->childs[0]);
-				stack[depth++]=sStkNN(p.a->childs[1],p.a->childs[1]);
-				stack[depth++]=sStkNN(p.a->childs[0],p.a->childs[1]);
-				}
-			}
-		else if(Intersect(p.a->volume,p.b->volume))
-			{
-			if(p.a->isinternal())
-				{
-				if(p.b->isinternal())
-					{
-					stack[depth++]=sStkNN(p.a->childs[0],p.b->childs[0]);
-					stack[depth++]=sStkNN(p.a->childs[1],p.b->childs[0]);
-					stack[depth++]=sStkNN(p.a->childs[0],p.b->childs[1]);
-					stack[depth++]=sStkNN(p.a->childs[1],p.b->childs[1]);
-					}
-					else
-					{
-					stack[depth++]=sStkNN(p.a->childs[0],p.b);
-					stack[depth++]=sStkNN(p.a->childs[1],p.b);
-					}
-				}
-				else
-				{
-				if(p.b->isinternal())
-					{
-					stack[depth++]=sStkNN(p.a,p.b->childs[0]);
-					stack[depth++]=sStkNN(p.a,p.b->childs[1]);
-					}
-					else
-					{
-					policy.Process(p.a,p.b);
-					}
-				}
-			}
-		} while(depth);
-	}
-}
-
-//
-DBVT_PREFIX
-inline void		btDbvt::collideTT(	const btDbvtNode* root0,
-									const btDbvtNode* root1,
-									const btTransform& xform,
-									DBVT_IPOLICY)
-{
-DBVT_CHECKTYPE
-if(root0&&root1)
-	{
-	btAlignedObjectArray<sStkNN>	stack;
-	int								depth=1;
-	int								treshold=DOUBLE_STACKSIZE-4;
-	stack.resize(DOUBLE_STACKSIZE);
-	stack[0]=sStkNN(root0,root1);
-	do	{
-		sStkNN	p=stack[--depth];
-		if(Intersect(p.a->volume,p.b->volume,xform))
-			{
-			if(depth>treshold)
-				{
-				stack.resize(stack.size()*2);
-				treshold=stack.size()-4;
-				}
-			if(p.a->isinternal())
-				{
-				if(p.b->isinternal())
-					{					
-					stack[depth++]=sStkNN(p.a->childs[0],p.b->childs[0]);
-					stack[depth++]=sStkNN(p.a->childs[1],p.b->childs[0]);
-					stack[depth++]=sStkNN(p.a->childs[0],p.b->childs[1]);
-					stack[depth++]=sStkNN(p.a->childs[1],p.b->childs[1]);
-					}
-					else
-					{
-					stack[depth++]=sStkNN(p.a->childs[0],p.b);
-					stack[depth++]=sStkNN(p.a->childs[1],p.b);
-					}
-				}
-				else
-				{
-				if(p.b->isinternal())
-					{
-					stack[depth++]=sStkNN(p.a,p.b->childs[0]);
-					stack[depth++]=sStkNN(p.a,p.b->childs[1]);
-					}
-					else
-					{
-					policy.Process(p.a,p.b);
-					}
-				}
-			}
-		} while(depth);
-	}
-}
-
-//
-DBVT_PREFIX
-inline void		btDbvt::collideTT(	const btDbvtNode* root0,
-									const btTransform& xform0,
-									const btDbvtNode* root1,
-									const btTransform& xform1,
-									DBVT_IPOLICY)
-{
-const btTransform	xform=xform0.inverse()*xform1;
-collideTT(root0,root1,xform,policy);
-}
-
-//
-DBVT_PREFIX
-inline void		btDbvt::collideTV(	const btDbvtNode* root,
-									const btDbvtVolume& volume,
-									DBVT_IPOLICY)
-{
-DBVT_CHECKTYPE
-if(root)
-	{
-	btAlignedObjectArray<const btDbvtNode*>	stack;
-	stack.reserve(SIMPLE_STACKSIZE);
-	stack.push_back(root);
-	do	{
-		const btDbvtNode*	n=stack[stack.size()-1];
-		stack.pop_back();
-		if(Intersect(n->volume,volume))
-			{
-			if(n->isinternal())
-				{
-				stack.push_back(n->childs[0]);
-				stack.push_back(n->childs[1]);
-				}
-				else
-				{
-				policy.Process(n);
-				}
-			}
-		} while(stack.size()>0);
-	}
-}
-
-//
-DBVT_PREFIX
-inline void		btDbvt::collideRAY(	const btDbvtNode* root,
-									const btVector3& origin,
-									const btVector3& direction,
-									DBVT_IPOLICY)
-{
-DBVT_CHECKTYPE
-if(root)
-	{
-	const btVector3	normal=direction.normalized();
-	const btVector3	invdir(	1/normal.x(),
-							1/normal.y(),
-							1/normal.z());
-	const unsigned	signs[]={	direction.x()<0,
-								direction.y()<0,
-								direction.z()<0};
-	btAlignedObjectArray<const btDbvtNode*>	stack;
-	stack.reserve(SIMPLE_STACKSIZE);
-	stack.push_back(root);
-	do	{
-		const btDbvtNode*	node=stack[stack.size()-1];
-		stack.pop_back();
-		if(Intersect(node->volume,origin,invdir,signs))
-			{
-			if(node->isinternal())
-				{
-				stack.push_back(node->childs[0]);
-				stack.push_back(node->childs[1]);
-				}
-				else
-				{
-				policy.Process(node);
-				}
-			}
-		} while(stack.size());
-	}
-}
-
-//
-DBVT_PREFIX
-inline void		btDbvt::collideKDOP(const btDbvtNode* root,
-									const btVector3* normals,
-									const btScalar* offsets,
-									int count,
-									DBVT_IPOLICY)
-{
-DBVT_CHECKTYPE
-if(root)
-	{
-	const int						inside=(1<<count)-1;
-	btAlignedObjectArray<sStkNP>	stack;
-	int								signs[sizeof(unsigned)*8];
-	btAssert(count<int (sizeof(signs)/sizeof(signs[0])));
-	for(int i=0;i<count;++i)
-		{
-		signs[i]=	((normals[i].x()>=0)?1:0)+
-					((normals[i].y()>=0)?2:0)+
-					((normals[i].z()>=0)?4:0);
-		}
-	stack.reserve(SIMPLE_STACKSIZE);
-	stack.push_back(sStkNP(root,0));
-	do	{
-		sStkNP	se=stack[stack.size()-1];
-		bool	out=false;
-		stack.pop_back();
-		for(int i=0,j=1;(!out)&&(i<count);++i,j<<=1)
-			{
-			if(0==(se.mask&j))
-				{
-				const int	side=se.node->volume.Classify(normals[i],offsets[i],signs[i]);
-				switch(side)
-					{
-					case	-1:	out=true;break;
-					case	+1:	se.mask|=j;break;
-					}
-				}
-			}
-		if(!out)
-			{
-			if((se.mask!=inside)&&(se.node->isinternal()))
-				{
-				stack.push_back(sStkNP(se.node->childs[0],se.mask));
-				stack.push_back(sStkNP(se.node->childs[1],se.mask));
-				}
-				else
-				{
-				if(policy.AllLeaves(se.node)) enumLeaves(se.node,policy);
-				}
-			}
-		} while(stack.size());
-	}
-}
-
-//
-DBVT_PREFIX
-inline void		btDbvt::collideOCL(	const btDbvtNode* root,
-									const btVector3* normals,
-									const btScalar* offsets,
-									const btVector3& sortaxis,
-									int count,
-									DBVT_IPOLICY,
-									bool fsort)
-{
-DBVT_CHECKTYPE
-if(root)
-	{
-	const unsigned					srtsgns=(sortaxis[0]>=0?1:0)+
-											(sortaxis[1]>=0?2:0)+
-											(sortaxis[2]>=0?4:0);
-	const int						inside=(1<<count)-1;
-	btAlignedObjectArray<sStkNPS>	stock;
-	btAlignedObjectArray<int>		ifree;
-	btAlignedObjectArray<int>		stack;
-	int								signs[sizeof(unsigned)*8];
-	btAssert(count<int (sizeof(signs)/sizeof(signs[0])));
-	for(int i=0;i<count;++i)
-		{
-		signs[i]=	((normals[i].x()>=0)?1:0)+
-					((normals[i].y()>=0)?2:0)+
-					((normals[i].z()>=0)?4:0);
-		}
-	stock.reserve(SIMPLE_STACKSIZE);
-	stack.reserve(SIMPLE_STACKSIZE);
-	ifree.reserve(SIMPLE_STACKSIZE);
-	stack.push_back(allocate(ifree,stock,sStkNPS(root,0,root->volume.ProjectMinimum(sortaxis,srtsgns))));
-	do	{
-		const int	id=stack[stack.size()-1];
-		sStkNPS		se=stock[id];
-		stack.pop_back();ifree.push_back(id);
-		if(se.mask!=inside)
-			{
-			bool	out=false;
-			for(int i=0,j=1;(!out)&&(i<count);++i,j<<=1)
-				{
-				if(0==(se.mask&j))
-					{
-					const int	side=se.node->volume.Classify(normals[i],offsets[i],signs[i]);
-					switch(side)
-						{
-						case	-1:	out=true;break;
-						case	+1:	se.mask|=j;break;
-						}
-					}
-				}
-			if(out) continue;
-			}
-		if(policy.Descent(se.node))
-			{
-			if(se.node->isinternal())
-				{
-				const btDbvtNode* pns[]={	se.node->childs[0],se.node->childs[1]};
-				sStkNPS		nes[]={	sStkNPS(pns[0],se.mask,pns[0]->volume.ProjectMinimum(sortaxis,srtsgns)),
-									sStkNPS(pns[1],se.mask,pns[1]->volume.ProjectMinimum(sortaxis,srtsgns))};
-				const int	q=nes[0].value<nes[1].value?1:0;				
-				int			j=stack.size();
-				if(fsort&&(j>0))
-					{
-					/* Insert 0	*/ 
-					j=nearest(&stack[0],&stock[0],nes[q].value,0,stack.size());
-					stack.push_back(0);
-					#if DBVT_USE_MEMMOVE
-					memmove(&stack[j+1],&stack[j],sizeof(int)*(stack.size()-j-1));
-					#else
-					for(int k=stack.size()-1;k>j;--k) stack[k]=stack[k-1];
-					#endif
-					stack[j]=allocate(ifree,stock,nes[q]);
-					/* Insert 1	*/ 
-					j=nearest(&stack[0],&stock[0],nes[1-q].value,j,stack.size());
-					stack.push_back(0);
-					#if DBVT_USE_MEMMOVE
-					memmove(&stack[j+1],&stack[j],sizeof(int)*(stack.size()-j-1));
-					#else
-					for(int k=stack.size()-1;k>j;--k) stack[k]=stack[k-1];
-					#endif
-					stack[j]=allocate(ifree,stock,nes[1-q]);
-					}
-					else
-					{
-					stack.push_back(allocate(ifree,stock,nes[q]));
-					stack.push_back(allocate(ifree,stock,nes[1-q]));
-					}
-				}
-				else
-				{
-				policy.Process(se.node,se.value);
-				}
-			}
-		} while(stack.size());
-	}
-}
-
-//
-DBVT_PREFIX
-inline void		btDbvt::collideTU(	const btDbvtNode* root,
-									DBVT_IPOLICY)
-{
-DBVT_CHECKTYPE
-if(root)
-	{
-	btAlignedObjectArray<const btDbvtNode*>	stack;
-	stack.reserve(SIMPLE_STACKSIZE);
-	stack.push_back(root);
-	do	{
-		const btDbvtNode*	n=stack[stack.size()-1];
-		stack.pop_back();
-		if(policy.Descent(n))
-			{
-			if(n->isinternal())
-				{ stack.push_back(n->childs[0]);stack.push_back(n->childs[1]); }
-				else
-				{ policy.Process(n); }
-			}
-		} while(stack.size()>0);
-	}
-}
-
-//
-// PP Cleanup
-//
-
-#undef DBVT_USE_MEMMOVE
-#undef DBVT_USE_TEMPLATE
-#undef DBVT_VIRTUAL_DTOR
-#undef DBVT_VIRTUAL
-#undef DBVT_PREFIX
-#undef DBVT_IPOLICY
-#undef DBVT_CHECKTYPE
-#undef DBVT_IMPL_GENERIC
-#undef DBVT_IMPL_FPU0x86
-#undef DBVT_IMPL_SSE
-
-#endif
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp
deleted file mode 100644
index c6086f28f19..00000000000
--- a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp
+++ /dev/null
@@ -1,344 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2007 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-///btDbvtBroadphase implementation by Nathanael Presson
-
-#include "btDbvtBroadphase.h"
-
-//
-// Profiling
-//
-
-#if DBVT_BP_PROFILE
-#include <stdio.h>
-struct	ProfileScope
-	{
-	ProfileScope(btClock& clock,unsigned long& value)
-		{
-		m_clock=&clock;
-		m_value=&value;
-		m_base=clock.getTimeMicroseconds();
-		}
-	~ProfileScope()
-		{
-		(*m_value)+=m_clock->getTimeMicroseconds()-m_base;
-		}
-	btClock*		m_clock;
-	unsigned long*	m_value;
-	unsigned long	m_base;
-	};
-#define	SPC(_value_)	ProfileScope	spc_scope(m_clock,_value_)
-#else
-#define	SPC(_value_)
-#endif
-
-//
-// Helpers
-//
-
-//
-template <typename T>
-static inline void	listappend(T* item,T*& list)
-{
-item->links[0]=0;
-item->links[1]=list;
-if(list) list->links[0]=item;
-list=item;
-}
-
-//
-template <typename T>
-static inline void	listremove(T* item,T*& list)
-{
-if(item->links[0]) item->links[0]->links[1]=item->links[1]; else list=item->links[1];
-if(item->links[1]) item->links[1]->links[0]=item->links[0];
-}
-
-//
-template <typename T>
-static inline int	listcount(T* root)
-{
-int	n=0;
-while(root) { ++n;root=root->links[1]; }
-return(n);
-}
-
-//
-template <typename T>
-static inline void	clear(T& value)
-{
-static const struct ZeroDummy : T {} zerodummy;
-value=zerodummy;
-}
-
-//
-// Colliders
-//
-
-/* Tree collider	*/ 
-struct	btDbvtTreeCollider : btDbvt::ICollide
-{
-btDbvtBroadphase*	pbp;
-		btDbvtTreeCollider(btDbvtBroadphase* p) : pbp(p) {}
-void	Process(const btDbvtNode* na,const btDbvtNode* nb)
-	{
-	btDbvtProxy*	pa=(btDbvtProxy*)na->data;
-	btDbvtProxy*	pb=(btDbvtProxy*)nb->data;
-	#if DBVT_BP_DISCRETPAIRS
-	if(Intersect(pa->aabb,pb->aabb))
-	#endif
-		{
-		if(pa>pb) btSwap(pa,pb);
-		pbp->m_paircache->addOverlappingPair(pa,pb);
-		}
-	}
-};
-
-//
-// btDbvtBroadphase
-//
-
-//
-btDbvtBroadphase::btDbvtBroadphase(btOverlappingPairCache* paircache)
-{
-m_releasepaircache	=	(paircache!=0)?false:true;
-m_predictedframes	=	2;
-m_stageCurrent		=	0;
-m_fupdates			=	1;
-m_dupdates			=	1;
-m_paircache			=	paircache?
-							paircache	:
-							new(btAlignedAlloc(sizeof(btHashedOverlappingPairCache),16)) btHashedOverlappingPairCache();
-m_gid				=	0;
-m_pid				=	0;
-for(int i=0;i<=STAGECOUNT;++i)
-	{
-	m_stageRoots[i]=0;
-	}
-#if DBVT_BP_PROFILE
-clear(m_profiling);
-#endif
-}
-
-//
-btDbvtBroadphase::~btDbvtBroadphase()
-{
-if(m_releasepaircache) 
-{
-	m_paircache->~btOverlappingPairCache();
-	btAlignedFree(m_paircache);
-}
-}
-
-//
-btBroadphaseProxy*				btDbvtBroadphase::createProxy(	const btVector3& aabbMin,
-																const btVector3& aabbMax,
-																int /*shapeType*/,
-																void* userPtr,
-																short int collisionFilterGroup,
-																short int collisionFilterMask,
-																btDispatcher* /*dispatcher*/,
-																void* /*multiSapProxy*/)
-{
-btDbvtProxy*	proxy=new(btAlignedAlloc(sizeof(btDbvtProxy),16)) btDbvtProxy(	userPtr,
-																				collisionFilterGroup,
-																				collisionFilterMask);
-proxy->aabb			=	btDbvtVolume::FromMM(aabbMin,aabbMax);
-proxy->leaf			=	m_sets[0].insert(proxy->aabb,proxy);
-proxy->stage		=	m_stageCurrent;
-proxy->m_uniqueId	=	++m_gid;
-listappend(proxy,m_stageRoots[m_stageCurrent]);
-return(proxy);
-}
-
-//
-void							btDbvtBroadphase::destroyProxy(	btBroadphaseProxy* absproxy,
-																btDispatcher* dispatcher)
-{
-btDbvtProxy*	proxy=(btDbvtProxy*)absproxy;
-if(proxy->stage==STAGECOUNT)
-	m_sets[1].remove(proxy->leaf);
-	else
-	m_sets[0].remove(proxy->leaf);
-listremove(proxy,m_stageRoots[proxy->stage]);
-m_paircache->removeOverlappingPairsContainingProxy(proxy,dispatcher);
-btAlignedFree(proxy);
-}
-
-//
-void							btDbvtBroadphase::setAabb(		btBroadphaseProxy* absproxy,
-																const btVector3& aabbMin,
-																const btVector3& aabbMax,
-																btDispatcher* /*dispatcher*/)
-{
-btDbvtProxy*	proxy=(btDbvtProxy*)absproxy;
-btDbvtVolume	aabb=btDbvtVolume::FromMM(aabbMin,aabbMax);
-if(NotEqual(aabb,proxy->leaf->volume))
-	{
-	if(proxy->stage==STAGECOUNT)
-		{/* fixed -> dynamic set	*/ 
-		m_sets[1].remove(proxy->leaf);
-		proxy->leaf=m_sets[0].insert(aabb,proxy);
-		}
-		else
-		{/* dynamic set				*/ 
-		if(Intersect(proxy->leaf->volume,aabb))
-			{/* Moving				*/ 
-			const btVector3	delta=(aabbMin+aabbMax)/2-proxy->aabb.Center();
-			#ifdef DBVT_BP_MARGIN
-			m_sets[0].update(proxy->leaf,aabb,delta*m_predictedframes,DBVT_BP_MARGIN);
-			#else
-			m_sets[0].update(proxy->leaf,aabb,delta*m_predictedframes);
-			#endif
-			}
-			else
-			{/* Teleporting			*/ 
-			m_sets[0].update(proxy->leaf,aabb);		
-			}	
-		}
-	listremove(proxy,m_stageRoots[proxy->stage]);
-	proxy->aabb		=	aabb;
-	proxy->stage	=	m_stageCurrent;
-	listappend(proxy,m_stageRoots[m_stageCurrent]);
-	}
-}
-
-//
-void							btDbvtBroadphase::calculateOverlappingPairs(btDispatcher* dispatcher)
-{
-collide(dispatcher);
-#if DBVT_BP_PROFILE
-if(0==(m_pid%DBVT_BP_PROFILING_RATE))
-	{	
-	printf("fixed(%u) dynamics(%u) pairs(%u)\r\n",m_sets[1].m_leaves,m_sets[0].m_leaves,m_paircache->getNumOverlappingPairs());
-	unsigned int	total=m_profiling.m_total;
-	if(total<=0) total=1;
-	printf("ddcollide: %u%% (%uus)\r\n",(50+m_profiling.m_ddcollide*100)/total,m_profiling.m_ddcollide/DBVT_BP_PROFILING_RATE);
-	printf("fdcollide: %u%% (%uus)\r\n",(50+m_profiling.m_fdcollide*100)/total,m_profiling.m_fdcollide/DBVT_BP_PROFILING_RATE);
-	printf("cleanup:   %u%% (%uus)\r\n",(50+m_profiling.m_cleanup*100)/total,m_profiling.m_cleanup/DBVT_BP_PROFILING_RATE);
-	printf("total:     %uus\r\n",total/DBVT_BP_PROFILING_RATE);
-	const unsigned long	sum=m_profiling.m_ddcollide+
-							m_profiling.m_fdcollide+
-							m_profiling.m_cleanup;
-	printf("leaked: %u%% (%uus)\r\n",100-((50+sum*100)/total),(total-sum)/DBVT_BP_PROFILING_RATE);
-	printf("job counts: %u%%\r\n",(m_profiling.m_jobcount*100)/((m_sets[0].m_leaves+m_sets[1].m_leaves)*DBVT_BP_PROFILING_RATE));
-	clear(m_profiling);
-	m_clock.reset();
-	}
-#endif
-}
-
-//
-void							btDbvtBroadphase::collide(btDispatcher* dispatcher)
-{
-SPC(m_profiling.m_total);
-/* optimize				*/ 
-m_sets[0].optimizeIncremental(1+(m_sets[0].m_leaves*m_dupdates)/100);
-m_sets[1].optimizeIncremental(1+(m_sets[1].m_leaves*m_fupdates)/100);
-/* dynamic -> fixed set	*/ 
-m_stageCurrent=(m_stageCurrent+1)%STAGECOUNT;
-btDbvtProxy*	current=m_stageRoots[m_stageCurrent];
-if(current)
-	{
-	btDbvtTreeCollider	collider(this);
-	do	{
-		btDbvtProxy*	next=current->links[1];
-		listremove(current,m_stageRoots[current->stage]);
-		listappend(current,m_stageRoots[STAGECOUNT]);
-		btDbvt::collideTT(m_sets[1].m_root,current->leaf,collider);
-		m_sets[0].remove(current->leaf);
-		current->leaf	=	m_sets[1].insert(current->aabb,current);
-		current->stage	=	STAGECOUNT;	
-		current			=	next;
-		} while(current);
-	}
-/* collide dynamics		*/ 
-	{
-	btDbvtTreeCollider	collider(this);
-		{
-		SPC(m_profiling.m_fdcollide);
-		btDbvt::collideTT(m_sets[0].m_root,m_sets[1].m_root,collider);
-		}
-		{
-		SPC(m_profiling.m_ddcollide);
-		btDbvt::collideTT(m_sets[0].m_root,m_sets[0].m_root,collider);
-		}
-	}
-/* clean up				*/ 
-	{
-	SPC(m_profiling.m_cleanup);
-	btBroadphasePairArray&	pairs=m_paircache->getOverlappingPairArray();
-	if(pairs.size()>0)
-		{
-		for(int i=0,ni=pairs.size();i<ni;++i)
-			{
-			btBroadphasePair&	p=pairs[i];
-			btDbvtProxy*	pa=(btDbvtProxy*)p.m_pProxy0;
-			btDbvtProxy*	pb=(btDbvtProxy*)p.m_pProxy1;
-			if(!Intersect(pa->aabb,pb->aabb))
-				{
-				if(pa>pb) btSwap(pa,pb);
-				m_paircache->removeOverlappingPair(pa,pb,dispatcher);
-				--ni;--i;
-				}
-			}
-		}
-	}
-++m_pid;
-}
-
-//
-void							btDbvtBroadphase::optimize()
-{
-m_sets[0].optimizeTopDown();
-m_sets[1].optimizeTopDown();
-}
-
-//
-btOverlappingPairCache*			btDbvtBroadphase::getOverlappingPairCache()
-{
-return(m_paircache);
-}
-
-//
-const btOverlappingPairCache*	btDbvtBroadphase::getOverlappingPairCache() const
-{
-return(m_paircache);
-}
-
-//
-void							btDbvtBroadphase::getBroadphaseAabb(btVector3& aabbMin,btVector3& aabbMax) const
-{
-
-	ATTRIBUTE_ALIGNED16(btDbvtVolume)	bounds;
-
-if(!m_sets[0].empty())
-	if(!m_sets[1].empty())	Merge(	m_sets[0].m_root->volume,
-									m_sets[1].m_root->volume,bounds);
-							else
-							bounds=m_sets[0].m_root->volume;
-else if(!m_sets[1].empty())	bounds=m_sets[1].m_root->volume;
-							else
-							bounds=btDbvtVolume::FromCR(btVector3(0,0,0),0);
-aabbMin=bounds.Mins();
-aabbMax=bounds.Maxs();
-}
-
-//
-void							btDbvtBroadphase::printStats()
-{}
-
-#if DBVT_BP_PROFILE
-#undef	SPC
-#endif
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h
deleted file mode 100644
index 3f19075552b..00000000000
--- a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2007 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-///btDbvtBroadphase implementation by Nathanael Presson
-#ifndef BT_DBVT_BROADPHASE_H
-#define BT_DBVT_BROADPHASE_H
-
-#include "BulletCollision/BroadphaseCollision/btDbvt.h"
-#include "BulletCollision/BroadphaseCollision/btOverlappingPairCache.h"
-
-//
-// Compile time config
-//
-
-#define	DBVT_BP_PROFILE			0
-#define DBVT_BP_DISCRETPAIRS	1
-#define DBVT_BP_MARGIN			(btScalar)0.05
-
-#if DBVT_BP_PROFILE
-	#define	DBVT_BP_PROFILING_RATE	256
-	#include "LinearMath/btQuickprof.h"
-#endif
-
-//
-// btDbvtProxy
-//
-struct btDbvtProxy : btBroadphaseProxy
-{
-/* Fields		*/ 
-btDbvtAabbMm		aabb;
-btDbvtNode*		leaf;
-btDbvtProxy*		links[2];
-int					stage;
-/* ctor			*/ 
-btDbvtProxy(void* userPtr,short int collisionFilterGroup, short int collisionFilterMask) :
-	btBroadphaseProxy(userPtr,collisionFilterGroup,collisionFilterMask)
-	{
-	links[0]=links[1]=0;
-	}
-};
-
-typedef btAlignedObjectArray<btDbvtProxy*>	btDbvtProxyArray;
-
-///The btDbvtBroadphase implements a broadphase using two dynamic AABB bounding volume hierarchies/trees (see btDbvt).
-///One tree is used for static/non-moving objects, and another tree is used for dynamic objects. Objects can move from one tree to the other.
-///This is a very fast broadphase, especially for very dynamic worlds where many objects are moving. Its insert/add and remove of objects is generally faster than the sweep and prune broadphases btAxisSweep3 and bt32BitAxisSweep3.
-struct	btDbvtBroadphase : btBroadphaseInterface
-{
-/* Config		*/ 
-enum	{
-		DYNAMIC_SET			=	0,	/* Dynamic set index	*/ 
-		FIXED_SET			=	1,	/* Fixed set index		*/ 
-		STAGECOUNT			=	2	/* Number of stages		*/ 
-		};
-/* Fields		*/ 
-btDbvt					m_sets[2];					// Dbvt sets
-btDbvtProxy*			m_stageRoots[STAGECOUNT+1];	// Stages list
-btOverlappingPairCache*	m_paircache;				// Pair cache
-btScalar				m_predictedframes;			// Frames predicted
-int						m_stageCurrent;				// Current stage
-int						m_fupdates;					// % of fixed updates per frame
-int						m_dupdates;					// % of dynamic updates per frame
-int						m_pid;						// Parse id
-int						m_gid;						// Gen id
-bool					m_releasepaircache;			// Release pair cache on delete
-#if DBVT_BP_PROFILE
-btClock					m_clock;
-struct	{
-		unsigned long		m_total;
-		unsigned long		m_ddcollide;
-		unsigned long		m_fdcollide;
-		unsigned long		m_cleanup;
-		unsigned long		m_jobcount;
-		}				m_profiling;
-#endif
-/* Methods		*/ 
-btDbvtBroadphase(btOverlappingPairCache* paircache=0);
-~btDbvtBroadphase();
-void							collide(btDispatcher* dispatcher);
-void							optimize();
-/* btBroadphaseInterface Implementation	*/ 
-btBroadphaseProxy*				createProxy(const btVector3& aabbMin,const btVector3& aabbMax,int shapeType,void* userPtr,short int collisionFilterGroup,short int collisionFilterMask,btDispatcher* dispatcher,void* multiSapProxy);
-void							destroyProxy(btBroadphaseProxy* proxy,btDispatcher* dispatcher);
-void							setAabb(btBroadphaseProxy* proxy,const btVector3& aabbMin,const btVector3& aabbMax,btDispatcher* dispatcher);
-void							calculateOverlappingPairs(btDispatcher* dispatcher);
-btOverlappingPairCache*			getOverlappingPairCache();
-const btOverlappingPairCache*	getOverlappingPairCache() const;
-void							getBroadphaseAabb(btVector3& aabbMin,btVector3& aabbMax) const;
-void							printStats();
-};
-
-#endif
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDispatcher.h b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDispatcher.h
index 6db71a0170e..3d958cc8fef 100644
--- a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDispatcher.h
+++ b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDispatcher.h
@@ -16,7 +16,7 @@ subject to the following restrictions:
 #ifndef _DISPATCHER_H
 #define _DISPATCHER_H
 
-#include "LinearMath/btScalar.h"
+#include "../../LinearMath/btScalar.h"
 
 class btCollisionAlgorithm;
 struct btBroadphaseProxy;
@@ -43,9 +43,7 @@ struct btDispatcherInfo
 		m_useContinuous(false),
 		m_debugDraw(0),
 		m_enableSatConvex(false),
-		m_enableSPU(true),
-		m_useEpa(true),
-		m_allowedCcdPenetration(btScalar(0.04)),
+		m_enableSPU(false),
 		m_stackAllocator(0)
 	{
 
@@ -53,19 +51,17 @@ struct btDispatcherInfo
 	btScalar	m_timeStep;
 	int		m_stepCount;
 	int		m_dispatchFunc;
-	mutable btScalar	m_timeOfImpact;
+	btScalar	m_timeOfImpact;
 	bool	m_useContinuous;
 	class btIDebugDraw*	m_debugDraw;
 	bool	m_enableSatConvex;
 	bool	m_enableSPU;
-	bool	m_useEpa;
-	btScalar	m_allowedCcdPenetration;
 	btStackAlloc*	m_stackAllocator;
 	
 };
 
-///The btDispatcher interface class can be used in combination with broadphase to dispatch calculations for overlapping pairs.
-///For example for pairwise collision detection, calculating contact points stored in btPersistentManifold or user callbacks (game logic).
+/// btDispatcher can be used in combination with broadphase to dispatch overlapping pairs.
+/// For example for pairwise collision detection or user callbacks (game logic).
 class btDispatcher
 {
 
@@ -85,18 +81,12 @@ public:
 
 	virtual bool	needsResponse(btCollisionObject* body0,btCollisionObject* body1)=0;
 
-	virtual void	dispatchAllCollisionPairs(btOverlappingPairCache* pairCache,const btDispatcherInfo& dispatchInfo,btDispatcher* dispatcher)  =0;
+	virtual void	dispatchAllCollisionPairs(btOverlappingPairCache* pairCache,btDispatcherInfo& dispatchInfo)=0;
 
 	virtual int getNumManifolds() const = 0;
 
 	virtual btPersistentManifold* getManifoldByIndexInternal(int index) = 0;
 
-	virtual	btPersistentManifold**	getInternalManifoldPointer() = 0;
-
-	virtual	void* allocateCollisionAlgorithm(int size)  = 0;
-
-	virtual	void freeCollisionAlgorithm(void* ptr) = 0;
-
 };
 
 
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp
deleted file mode 100644
index 3f866ab7c5f..00000000000
--- a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp
+++ /dev/null
@@ -1,466 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-#include "btMultiSapBroadphase.h"
-
-#include "btSimpleBroadphase.h"
-#include "LinearMath/btAabbUtil2.h"
-#include "btQuantizedBvh.h"
-
-///	btSapBroadphaseArray	m_sapBroadphases;
-
-///	btOverlappingPairCache*	m_overlappingPairs;
-extern int gOverlappingPairs;
-
-/*
-class btMultiSapSortedOverlappingPairCache : public btSortedOverlappingPairCache
-{
-public:
-
-	virtual btBroadphasePair*	addOverlappingPair(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1)
-	{
-		return btSortedOverlappingPairCache::addOverlappingPair((btBroadphaseProxy*)proxy0->m_multiSapParentProxy,(btBroadphaseProxy*)proxy1->m_multiSapParentProxy);
-	}
-};
-
-*/
-
-btMultiSapBroadphase::btMultiSapBroadphase(int /*maxProxies*/,btOverlappingPairCache* pairCache)
-:m_overlappingPairs(pairCache),
-m_optimizedAabbTree(0),
-m_ownsPairCache(false),
-m_invalidPair(0)
-{
-	if (!m_overlappingPairs)
-	{
-		m_ownsPairCache = true;
-		void* mem = btAlignedAlloc(sizeof(btSortedOverlappingPairCache),16);
-		m_overlappingPairs = new (mem)btSortedOverlappingPairCache();
-	}
-
-	struct btMultiSapOverlapFilterCallback : public btOverlapFilterCallback
-	{
-		virtual ~btMultiSapOverlapFilterCallback()
-		{}
-		// return true when pairs need collision
-		virtual bool	needBroadphaseCollision(btBroadphaseProxy* childProxy0,btBroadphaseProxy* childProxy1) const
-		{
-			btBroadphaseProxy* multiProxy0 = (btBroadphaseProxy*)childProxy0->m_multiSapParentProxy;
-			btBroadphaseProxy* multiProxy1 = (btBroadphaseProxy*)childProxy1->m_multiSapParentProxy;
-			
-			bool collides = (multiProxy0->m_collisionFilterGroup & multiProxy1->m_collisionFilterMask) != 0;
-			collides = collides && (multiProxy1->m_collisionFilterGroup & multiProxy0->m_collisionFilterMask);
-	
-			return collides;
-		}
-	};
-
-	void* mem = btAlignedAlloc(sizeof(btMultiSapOverlapFilterCallback),16);
-	m_filterCallback = new (mem)btMultiSapOverlapFilterCallback();
-
-	m_overlappingPairs->setOverlapFilterCallback(m_filterCallback);
-//	mem = btAlignedAlloc(sizeof(btSimpleBroadphase),16);
-//	m_simpleBroadphase = new (mem) btSimpleBroadphase(maxProxies,m_overlappingPairs);
-}
-
-btMultiSapBroadphase::~btMultiSapBroadphase()
-{
-	if (m_ownsPairCache)
-	{
-		m_overlappingPairs->~btOverlappingPairCache();
-		btAlignedFree(m_overlappingPairs);
-	}
-}
-
-
-void	btMultiSapBroadphase::buildTree(const btVector3& bvhAabbMin,const btVector3& bvhAabbMax)
-{
-	m_optimizedAabbTree = new btQuantizedBvh();
-	m_optimizedAabbTree->setQuantizationValues(bvhAabbMin,bvhAabbMax);
-	QuantizedNodeArray&	nodes = m_optimizedAabbTree->getLeafNodeArray();
-	for (int i=0;i<m_sapBroadphases.size();i++)
-	{
-		btQuantizedBvhNode node;
-		btVector3 aabbMin,aabbMax;
-		m_sapBroadphases[i]->getBroadphaseAabb(aabbMin,aabbMax);
-		m_optimizedAabbTree->quantize(&node.m_quantizedAabbMin[0],aabbMin,0);
-		m_optimizedAabbTree->quantize(&node.m_quantizedAabbMax[0],aabbMax,1);
-		int partId = 0;
-		node.m_escapeIndexOrTriangleIndex = (partId<<(31-MAX_NUM_PARTS_IN_BITS)) | i;
-		nodes.push_back(node);
-	}
-	m_optimizedAabbTree->buildInternal();
-}
-
-btBroadphaseProxy*	btMultiSapBroadphase::createProxy(  const btVector3& aabbMin,  const btVector3& aabbMax,int shapeType,void* userPtr, short int collisionFilterGroup,short int collisionFilterMask, btDispatcher* dispatcher,void* /*ignoreMe*/)
-{
-	//void* ignoreMe -> we could think of recursive multi-sap, if someone is interested
-
-	void* mem = btAlignedAlloc(sizeof(btMultiSapProxy),16);
-	btMultiSapProxy* proxy = new (mem)btMultiSapProxy(aabbMin,  aabbMax,shapeType,userPtr, collisionFilterGroup,collisionFilterMask);
-	m_multiSapProxies.push_back(proxy);
-
-	///this should deal with inserting/removal into child broadphases
-	setAabb(proxy,aabbMin,aabbMax,dispatcher);
-	return proxy;
-}
-
-void	btMultiSapBroadphase::destroyProxy(btBroadphaseProxy* /*proxy*/,btDispatcher* /*dispatcher*/)
-{
-	///not yet
-	btAssert(0);
-
-}
-
-
-void	btMultiSapBroadphase::addToChildBroadphase(btMultiSapProxy* parentMultiSapProxy, btBroadphaseProxy* childProxy, btBroadphaseInterface*	childBroadphase)
-{
-	void* mem = btAlignedAlloc(sizeof(btBridgeProxy),16);
-	btBridgeProxy* bridgeProxyRef = new(mem) btBridgeProxy;
-	bridgeProxyRef->m_childProxy = childProxy;
-	bridgeProxyRef->m_childBroadphase = childBroadphase;
-	parentMultiSapProxy->m_bridgeProxies.push_back(bridgeProxyRef);
-}
-
-
-bool boxIsContainedWithinBox(const btVector3& amin,const btVector3& amax,const btVector3& bmin,const btVector3& bmax);
-bool boxIsContainedWithinBox(const btVector3& amin,const btVector3& amax,const btVector3& bmin,const btVector3& bmax)
-{
-return
-amin.getX() >= bmin.getX() && amax.getX() <= bmax.getX() &&
-amin.getY() >= bmin.getY() && amax.getY() <= bmax.getY() &&
-amin.getZ() >= bmin.getZ() && amax.getZ() <= bmax.getZ();
-}
-
-
-
-
-
-
-//#include <stdio.h>
-
-void	btMultiSapBroadphase::setAabb(btBroadphaseProxy* proxy,const btVector3& aabbMin,const btVector3& aabbMax, btDispatcher* dispatcher)
-{
-	btMultiSapProxy* multiProxy = static_cast<btMultiSapProxy*>(proxy);
-	multiProxy->m_aabbMin = aabbMin;
-	multiProxy->m_aabbMax = aabbMax;
-	
-	
-//	bool fullyContained = false;
-//	bool alreadyInSimple = false;
-	
-
-
-	
-	struct MyNodeOverlapCallback : public btNodeOverlapCallback
-	{
-		btMultiSapBroadphase*	m_multiSap;
-		btMultiSapProxy*		m_multiProxy;
-		btDispatcher*			m_dispatcher;
-
-		MyNodeOverlapCallback(btMultiSapBroadphase* multiSap,btMultiSapProxy* multiProxy,btDispatcher* dispatcher)
-			:m_multiSap(multiSap),
-			m_multiProxy(multiProxy),
-			m_dispatcher(dispatcher)
-		{
-
-		}
-
-		virtual void processNode(int /*nodeSubPart*/, int broadphaseIndex)
-		{
-			btBroadphaseInterface* childBroadphase = m_multiSap->getBroadphaseArray()[broadphaseIndex];
-
-			int containingBroadphaseIndex = -1;
-			//already found?
-			for (int i=0;i<m_multiProxy->m_bridgeProxies.size();i++)
-			{
-
-				if (m_multiProxy->m_bridgeProxies[i]->m_childBroadphase == childBroadphase)
-				{
-					containingBroadphaseIndex = i;
-					break;
-				}
-			}
-			if (containingBroadphaseIndex<0)
-			{
-				//add it
-				btBroadphaseProxy* childProxy = childBroadphase->createProxy(m_multiProxy->m_aabbMin,m_multiProxy->m_aabbMax,m_multiProxy->m_shapeType,m_multiProxy->m_clientObject,m_multiProxy->m_collisionFilterGroup,m_multiProxy->m_collisionFilterMask, m_dispatcher,m_multiProxy);
-				m_multiSap->addToChildBroadphase(m_multiProxy,childProxy,childBroadphase);
-
-			}
-		}
-	};
-
-	MyNodeOverlapCallback	myNodeCallback(this,multiProxy,dispatcher);
-
-
-
-	
-	m_optimizedAabbTree->reportAabbOverlappingNodex(&myNodeCallback,aabbMin,aabbMax);
-	int i;
-
-	for ( i=0;i<multiProxy->m_bridgeProxies.size();i++)
-	{
-		btVector3 worldAabbMin,worldAabbMax;
-		multiProxy->m_bridgeProxies[i]->m_childBroadphase->getBroadphaseAabb(worldAabbMin,worldAabbMax);
-		bool overlapsBroadphase = TestAabbAgainstAabb2(worldAabbMin,worldAabbMax,multiProxy->m_aabbMin,multiProxy->m_aabbMax);
-		if (!overlapsBroadphase)
-		{
-			//remove it now
-			btBridgeProxy* bridgeProxy = multiProxy->m_bridgeProxies[i];
-
-			btBroadphaseProxy* childProxy = bridgeProxy->m_childProxy;
-			bridgeProxy->m_childBroadphase->destroyProxy(childProxy,dispatcher);
-			
-			multiProxy->m_bridgeProxies.swap( i,multiProxy->m_bridgeProxies.size()-1);
-			multiProxy->m_bridgeProxies.pop_back();
-
-		}
-	}
-
-
-	/*
-
-	if (1)
-	{
-
-		//find broadphase that contain this multiProxy
-		int numChildBroadphases = getBroadphaseArray().size();
-		for (int i=0;i<numChildBroadphases;i++)
-		{
-			btBroadphaseInterface* childBroadphase = getBroadphaseArray()[i];
-			btVector3 worldAabbMin,worldAabbMax;
-			childBroadphase->getBroadphaseAabb(worldAabbMin,worldAabbMax);
-			bool overlapsBroadphase = TestAabbAgainstAabb2(worldAabbMin,worldAabbMax,multiProxy->m_aabbMin,multiProxy->m_aabbMax);
-			
-		//	fullyContained = fullyContained || boxIsContainedWithinBox(worldAabbMin,worldAabbMax,multiProxy->m_aabbMin,multiProxy->m_aabbMax);
-			int containingBroadphaseIndex = -1;
-			
-			//if already contains this
-			
-			for (int i=0;i<multiProxy->m_bridgeProxies.size();i++)
-			{
-				if (multiProxy->m_bridgeProxies[i]->m_childBroadphase == childBroadphase)
-				{
-					containingBroadphaseIndex = i;
-				}
-				alreadyInSimple = alreadyInSimple || (multiProxy->m_bridgeProxies[i]->m_childBroadphase == m_simpleBroadphase);
-			}
-
-			if (overlapsBroadphase)
-			{
-				if (containingBroadphaseIndex<0)
-				{
-					btBroadphaseProxy* childProxy = childBroadphase->createProxy(aabbMin,aabbMax,multiProxy->m_shapeType,multiProxy->m_clientObject,multiProxy->m_collisionFilterGroup,multiProxy->m_collisionFilterMask, dispatcher);
-					childProxy->m_multiSapParentProxy = multiProxy;
-					addToChildBroadphase(multiProxy,childProxy,childBroadphase);
-				}
-			} else
-			{
-				if (containingBroadphaseIndex>=0)
-				{
-					//remove
-					btBridgeProxy* bridgeProxy = multiProxy->m_bridgeProxies[containingBroadphaseIndex];
-
-					btBroadphaseProxy* childProxy = bridgeProxy->m_childProxy;
-					bridgeProxy->m_childBroadphase->destroyProxy(childProxy,dispatcher);
-					
-					multiProxy->m_bridgeProxies.swap( containingBroadphaseIndex,multiProxy->m_bridgeProxies.size()-1);
-					multiProxy->m_bridgeProxies.pop_back();
-				}
-			}
-		}
-
-
-		///If we are in no other child broadphase, stick the proxy in the global 'simple' broadphase (brute force)
-		///hopefully we don't end up with many entries here (can assert/provide feedback on stats)
-		if (0)//!multiProxy->m_bridgeProxies.size())
-		{
-			///we don't pass the userPtr but our multisap proxy. We need to patch this, before processing an actual collision
-			///this is needed to be able to calculate the aabb overlap
-			btBroadphaseProxy* childProxy = m_simpleBroadphase->createProxy(aabbMin,aabbMax,multiProxy->m_shapeType,multiProxy->m_clientObject,multiProxy->m_collisionFilterGroup,multiProxy->m_collisionFilterMask, dispatcher);
-			childProxy->m_multiSapParentProxy = multiProxy;
-			addToChildBroadphase(multiProxy,childProxy,m_simpleBroadphase);
-		}
-	}
-
-	if (!multiProxy->m_bridgeProxies.size())
-	{
-		///we don't pass the userPtr but our multisap proxy. We need to patch this, before processing an actual collision
-		///this is needed to be able to calculate the aabb overlap
-		btBroadphaseProxy* childProxy = m_simpleBroadphase->createProxy(aabbMin,aabbMax,multiProxy->m_shapeType,multiProxy->m_clientObject,multiProxy->m_collisionFilterGroup,multiProxy->m_collisionFilterMask, dispatcher);
-		childProxy->m_multiSapParentProxy = multiProxy;
-		addToChildBroadphase(multiProxy,childProxy,m_simpleBroadphase);
-	}
-*/
-
-
-	//update
-	for ( i=0;i<multiProxy->m_bridgeProxies.size();i++)
-	{
-		btBridgeProxy* bridgeProxyRef = multiProxy->m_bridgeProxies[i];
-		bridgeProxyRef->m_childBroadphase->setAabb(bridgeProxyRef->m_childProxy,aabbMin,aabbMax,dispatcher);
-	}
-
-}
-bool stopUpdating=false;
-
-
-
-class btMultiSapBroadphasePairSortPredicate
-{
-	public:
-
-		bool operator() ( const btBroadphasePair& a1, const btBroadphasePair& b1 )
-		{
-				btMultiSapBroadphase::btMultiSapProxy* aProxy0 = a1.m_pProxy0 ? (btMultiSapBroadphase::btMultiSapProxy*)a1.m_pProxy0->m_multiSapParentProxy : 0;
-				btMultiSapBroadphase::btMultiSapProxy* aProxy1 = a1.m_pProxy1 ? (btMultiSapBroadphase::btMultiSapProxy*)a1.m_pProxy1->m_multiSapParentProxy : 0;
-				btMultiSapBroadphase::btMultiSapProxy* bProxy0 = b1.m_pProxy0 ? (btMultiSapBroadphase::btMultiSapProxy*)b1.m_pProxy0->m_multiSapParentProxy : 0;
-				btMultiSapBroadphase::btMultiSapProxy* bProxy1 = b1.m_pProxy1 ? (btMultiSapBroadphase::btMultiSapProxy*)b1.m_pProxy1->m_multiSapParentProxy : 0;
-
-				 return aProxy0 > bProxy0 || 
-					(aProxy0 == bProxy0 && aProxy1 > bProxy1) ||
-					(aProxy0 == bProxy0 && aProxy1 == bProxy1 && a1.m_algorithm > b1.m_algorithm); 
-		}
-};
-
-
-        ///calculateOverlappingPairs is optional: incremental algorithms (sweep and prune) might do it during the set aabb
-void    btMultiSapBroadphase::calculateOverlappingPairs(btDispatcher* dispatcher)
-{
-
-//	m_simpleBroadphase->calculateOverlappingPairs(dispatcher);
-
-	if (!stopUpdating && getOverlappingPairCache()->hasDeferredRemoval())
-	{
-	
-		btBroadphasePairArray&	overlappingPairArray = getOverlappingPairCache()->getOverlappingPairArray();
-
-	//	quicksort(overlappingPairArray,0,overlappingPairArray.size());
-
-		overlappingPairArray.quickSort(btMultiSapBroadphasePairSortPredicate());
-
-		//perform a sort, to find duplicates and to sort 'invalid' pairs to the end
-	//	overlappingPairArray.heapSort(btMultiSapBroadphasePairSortPredicate());
-
-		overlappingPairArray.resize(overlappingPairArray.size() - m_invalidPair);
-		m_invalidPair = 0;
-
-		
-		int i;
-
-		btBroadphasePair previousPair;
-		previousPair.m_pProxy0 = 0;
-		previousPair.m_pProxy1 = 0;
-		previousPair.m_algorithm = 0;
-		
-		
-		for (i=0;i<overlappingPairArray.size();i++)
-		{
-		
-			btBroadphasePair& pair = overlappingPairArray[i];
-
-			btMultiSapProxy* aProxy0 = pair.m_pProxy0 ? (btMultiSapProxy*)pair.m_pProxy0->m_multiSapParentProxy : 0;
-			btMultiSapProxy* aProxy1 = pair.m_pProxy1 ? (btMultiSapProxy*)pair.m_pProxy1->m_multiSapParentProxy : 0;
-			btMultiSapProxy* bProxy0 = previousPair.m_pProxy0 ? (btMultiSapProxy*)previousPair.m_pProxy0->m_multiSapParentProxy : 0;
-			btMultiSapProxy* bProxy1 = previousPair.m_pProxy1 ? (btMultiSapProxy*)previousPair.m_pProxy1->m_multiSapParentProxy : 0;
-
-			bool isDuplicate = (aProxy0 == bProxy0) && (aProxy1 == bProxy1);
-			
-			previousPair = pair;
-
-			bool needsRemoval = false;
-
-			if (!isDuplicate)
-			{
-				bool hasOverlap = testAabbOverlap(pair.m_pProxy0,pair.m_pProxy1);
-
-				if (hasOverlap)
-				{
-					needsRemoval = false;//callback->processOverlap(pair);
-				} else
-				{
-					needsRemoval = true;
-				}
-			} else
-			{
-				//remove duplicate
-				needsRemoval = true;
-				//should have no algorithm
-				btAssert(!pair.m_algorithm);
-			}
-			
-			if (needsRemoval)
-			{
-				getOverlappingPairCache()->cleanOverlappingPair(pair,dispatcher);
-
-		//		m_overlappingPairArray.swap(i,m_overlappingPairArray.size()-1);
-		//		m_overlappingPairArray.pop_back();
-				pair.m_pProxy0 = 0;
-				pair.m_pProxy1 = 0;
-				m_invalidPair++;
-				gOverlappingPairs--;
-			} 
-			
-		}
-
-	///if you don't like to skip the invalid pairs in the array, execute following code:
-	#define CLEAN_INVALID_PAIRS 1
-	#ifdef CLEAN_INVALID_PAIRS
-
-		//perform a sort, to sort 'invalid' pairs to the end
-		//overlappingPairArray.heapSort(btMultiSapBroadphasePairSortPredicate());
-		overlappingPairArray.quickSort(btMultiSapBroadphasePairSortPredicate());
-
-		overlappingPairArray.resize(overlappingPairArray.size() - m_invalidPair);
-		m_invalidPair = 0;
-	#endif//CLEAN_INVALID_PAIRS
-		
-		//printf("overlappingPairArray.size()=%d\n",overlappingPairArray.size());
-	}
-
-
-}
-
-
-bool	btMultiSapBroadphase::testAabbOverlap(btBroadphaseProxy* childProxy0,btBroadphaseProxy* childProxy1)
-{
-	btMultiSapProxy* multiSapProxy0 = (btMultiSapProxy*)childProxy0->m_multiSapParentProxy;
-		btMultiSapProxy* multiSapProxy1 = (btMultiSapProxy*)childProxy1->m_multiSapParentProxy;
-
-		return	TestAabbAgainstAabb2(multiSapProxy0->m_aabbMin,multiSapProxy0->m_aabbMax,
-			multiSapProxy1->m_aabbMin,multiSapProxy1->m_aabbMax);
-		
-}
-
-
-void	btMultiSapBroadphase::printStats()
-{
-/*	printf("---------------------------------\n");
-	
-		printf("btMultiSapBroadphase.h\n");
-		printf("numHandles = %d\n",m_multiSapProxies.size());
-			//find broadphase that contain this multiProxy
-		int numChildBroadphases = getBroadphaseArray().size();
-		for (int i=0;i<numChildBroadphases;i++)
-		{
-
-			btBroadphaseInterface* childBroadphase = getBroadphaseArray()[i];
-			childBroadphase->printStats();
-
-		}
-		*/
-
-}
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h
deleted file mode 100644
index a0c002de856..00000000000
--- a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-#ifndef BT_MULTI_SAP_BROADPHASE
-#define BT_MULTI_SAP_BROADPHASE
-
-#include "btBroadphaseInterface.h"
-#include "LinearMath/btAlignedObjectArray.h"
-#include "btOverlappingPairCache.h"
-
-
-class btBroadphaseInterface;
-class btSimpleBroadphase;
-
-
-typedef btAlignedObjectArray<btBroadphaseInterface*> btSapBroadphaseArray;
-
-///The btMultiSapBroadphase is a broadphase that contains multiple SAP broadphases.
-///The user can add SAP broadphases that cover the world. A btBroadphaseProxy can be in multiple child broadphases at the same time.
-///A btQuantizedBvh acceleration structures finds overlapping SAPs for each btBroadphaseProxy.
-///See http://www.continuousphysics.com/Bullet/phpBB2/viewtopic.php?t=328
-///and http://www.continuousphysics.com/Bullet/phpBB2/viewtopic.php?t=1329
-class btMultiSapBroadphase :public btBroadphaseInterface
-{
-	btSapBroadphaseArray	m_sapBroadphases;
-	
-	btSimpleBroadphase*		m_simpleBroadphase;
-
-	btOverlappingPairCache*	m_overlappingPairs;
-
-	class btQuantizedBvh*			m_optimizedAabbTree;
-
-
-	bool					m_ownsPairCache;
-	
-	btOverlapFilterCallback*	m_filterCallback;
-
-	int			m_invalidPair;
-
-	struct	btBridgeProxy
-	{
-		btBroadphaseProxy*		m_childProxy;
-		btBroadphaseInterface*	m_childBroadphase;
-	};
-
-
-public:
-
-	struct	btMultiSapProxy	: public btBroadphaseProxy
-	{
-
-		///array with all the entries that this proxy belongs to
-		btAlignedObjectArray<btBridgeProxy*> m_bridgeProxies;
-		btVector3	m_aabbMin;
-		btVector3	m_aabbMax;
-
-		int	m_shapeType;
-
-/*		void*	m_userPtr;
-		short int	m_collisionFilterGroup;
-		short int	m_collisionFilterMask;
-*/
-		btMultiSapProxy(const btVector3& aabbMin,  const btVector3& aabbMax,int shapeType,void* userPtr, short int collisionFilterGroup,short int collisionFilterMask)
-			:btBroadphaseProxy(userPtr,collisionFilterGroup,collisionFilterMask),
-			m_aabbMin(aabbMin),
-			m_aabbMax(aabbMax),
-			m_shapeType(shapeType)
-		{
-			m_multiSapParentProxy =this;
-		}
-
-		
-	};
-
-protected:
-
-
-	btAlignedObjectArray<btMultiSapProxy*> m_multiSapProxies;
-
-public:
-
-	btMultiSapBroadphase(int maxProxies = 16384,btOverlappingPairCache* pairCache=0);
-
-
-	btSapBroadphaseArray&	getBroadphaseArray()
-	{
-		return m_sapBroadphases;
-	}
-
-	const btSapBroadphaseArray&	getBroadphaseArray() const
-	{
-		return m_sapBroadphases;
-	}
-
-	virtual ~btMultiSapBroadphase();
-
-	virtual btBroadphaseProxy*	createProxy(  const btVector3& aabbMin,  const btVector3& aabbMax,int shapeType,void* userPtr, short int collisionFilterGroup,short int collisionFilterMask, btDispatcher* dispatcher,void* multiSapProxy);
-	virtual void	destroyProxy(btBroadphaseProxy* proxy,btDispatcher* dispatcher);
-	virtual void	setAabb(btBroadphaseProxy* proxy,const btVector3& aabbMin,const btVector3& aabbMax, btDispatcher* dispatcher);
-
-	void	addToChildBroadphase(btMultiSapProxy* parentMultiSapProxy, btBroadphaseProxy* childProxy, btBroadphaseInterface*	childBroadphase);
-
-	///calculateOverlappingPairs is optional: incremental algorithms (sweep and prune) might do it during the set aabb
-	virtual void	calculateOverlappingPairs(btDispatcher* dispatcher);
-
-	bool	testAabbOverlap(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1);
-
-	virtual	btOverlappingPairCache*	getOverlappingPairCache()
-	{
-		return m_overlappingPairs;
-	}
-	virtual	const btOverlappingPairCache*	getOverlappingPairCache() const
-	{
-		return m_overlappingPairs;
-	}
-
-	///getAabb returns the axis aligned bounding box in the 'global' coordinate frame
-	///will add some transform later
-	virtual void getBroadphaseAabb(btVector3& aabbMin,btVector3& aabbMax) const
-	{
-		aabbMin.setValue(-1e30f,-1e30f,-1e30f);
-		aabbMax.setValue(1e30f,1e30f,1e30f);
-	}
-
-	void	buildTree(const btVector3& bvhAabbMin,const btVector3& bvhAabbMax);
-
-	virtual void	printStats();
-
-	void quicksort (btBroadphasePairArray& a, int lo, int hi);
-
-};
-
-#endif //BT_MULTI_SAP_BROADPHASE
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp
index ff65cdde79f..60f0a41a9d7 100644
--- a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp
+++ b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp
@@ -1,3 +1,4 @@
+
 /*
 Bullet Continuous Collision Detection and Physics Library
 Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
@@ -20,43 +21,44 @@ subject to the following restrictions:
 #include "btDispatcher.h"
 #include "btCollisionAlgorithm.h"
 
-#include <stdio.h>
-
 int	gOverlappingPairs = 0;
 
-int gRemovePairs =0;
-int gAddedPairs =0;
-int gFindPairs =0;
-
-
-
-
-btHashedOverlappingPairCache::btHashedOverlappingPairCache():
-	m_overlapFilterCallback(0),
-	m_blockedForChanges(false)
+btOverlappingPairCache::btOverlappingPairCache():
+m_blockedForChanges(false),
+m_overlapFilterCallback(0)
+//m_NumOverlapBroadphasePair(0)
 {
-	int initialAllocatedSize= 2;
-	m_overlappingPairArray.reserve(initialAllocatedSize);
-	growTables();
 }
 
 
-
-
-btHashedOverlappingPairCache::~btHashedOverlappingPairCache()
+btOverlappingPairCache::~btOverlappingPairCache()
 {
 	//todo/test: show we erase/delete data, or is it automatic
 }
 
 
+void	btOverlappingPairCache::removeOverlappingPair(btBroadphasePair& findPair)
+{
+	
+	int findIndex = m_overlappingPairArray.findLinearSearch(findPair);
+	if (findIndex < m_overlappingPairArray.size())
+	{
+		gOverlappingPairs--;
+		btBroadphasePair& pair = m_overlappingPairArray[findIndex];
+		cleanOverlappingPair(pair);
+		
+		m_overlappingPairArray.swap(findIndex,m_overlappingPairArray.size()-1);
+		m_overlappingPairArray.pop_back();
+	}
+}
 
-void	btHashedOverlappingPairCache::cleanOverlappingPair(btBroadphasePair& pair,btDispatcher* dispatcher)
+
+void	btOverlappingPairCache::cleanOverlappingPair(btBroadphasePair& pair)
 {
 	if (pair.m_algorithm)
 	{
 		{
-			pair.m_algorithm->~btCollisionAlgorithm();
-			dispatcher->freeCollisionAlgorithm(pair.m_algorithm);
+			delete pair.m_algorithm;;
 			pair.m_algorithm=0;
 		}
 	}
@@ -65,370 +67,20 @@ void	btHashedOverlappingPairCache::cleanOverlappingPair(btBroadphasePair& pair,b
 
 
 
-void	btHashedOverlappingPairCache::cleanProxyFromPairs(btBroadphaseProxy* proxy,btDispatcher* dispatcher)
-{
 
-	class	CleanPairCallback : public btOverlapCallback
-	{
-		btBroadphaseProxy* m_cleanProxy;
-		btOverlappingPairCache*	m_pairCache;
-		btDispatcher* m_dispatcher;
-
-	public:
-		CleanPairCallback(btBroadphaseProxy* cleanProxy,btOverlappingPairCache* pairCache,btDispatcher* dispatcher)
-			:m_cleanProxy(cleanProxy),
-			m_pairCache(pairCache),
-			m_dispatcher(dispatcher)
-		{
-		}
-		virtual	bool	processOverlap(btBroadphasePair& pair)
-		{
-			if ((pair.m_pProxy0 == m_cleanProxy) ||
-				(pair.m_pProxy1 == m_cleanProxy))
-			{
-				m_pairCache->cleanOverlappingPair(pair,m_dispatcher);
-			}
-			return false;
-		}
-		
-	};
-
-	CleanPairCallback cleanPairs(proxy,this,dispatcher);
-
-	processAllOverlappingPairs(&cleanPairs,dispatcher);
-
-}
-
-
-
-
-void	btHashedOverlappingPairCache::removeOverlappingPairsContainingProxy(btBroadphaseProxy* proxy,btDispatcher* dispatcher)
-{
-
-	class	RemovePairCallback : public btOverlapCallback
-	{
-		btBroadphaseProxy* m_obsoleteProxy;
-
-	public:
-		RemovePairCallback(btBroadphaseProxy* obsoleteProxy)
-			:m_obsoleteProxy(obsoleteProxy)
-		{
-		}
-		virtual	bool	processOverlap(btBroadphasePair& pair)
-		{
-			return ((pair.m_pProxy0 == m_obsoleteProxy) ||
-				(pair.m_pProxy1 == m_obsoleteProxy));
-		}
-		
-	};
-
-
-	RemovePairCallback removeCallback(proxy);
-
-	processAllOverlappingPairs(&removeCallback,dispatcher);
-}
-
-
-
-
-
-btBroadphasePair* btHashedOverlappingPairCache::findPair(btBroadphaseProxy* proxy0, btBroadphaseProxy* proxy1)
-{
-	gFindPairs++;
-	if(proxy0>proxy1) btSwap(proxy0,proxy1);
-	int proxyId1 = proxy0->getUid();
-	int proxyId2 = proxy1->getUid();
-
-	/*if (proxyId1 > proxyId2) 
-		btSwap(proxyId1, proxyId2);*/
-
-	int hash = static_cast<int>(getHash(static_cast<unsigned int>(proxyId1), static_cast<unsigned int>(proxyId2)) & (m_overlappingPairArray.capacity()-1));
-
-	if (hash >= m_hashTable.size())
-	{
-		return NULL;
-	}
-
-	int index = m_hashTable[hash];
-	while (index != BT_NULL_PAIR && equalsPair(m_overlappingPairArray[index], proxyId1, proxyId2) == false)
-	{
-		index = m_next[index];
-	}
-
-	if (index == BT_NULL_PAIR)
-	{
-		return NULL;
-	}
-
-	btAssert(index < m_overlappingPairArray.size());
-
-	return &m_overlappingPairArray[index];
-}
-
-//#include <stdio.h>
-
-void	btHashedOverlappingPairCache::growTables()
-{
-
-	int newCapacity = m_overlappingPairArray.capacity();
-
-	if (m_hashTable.size() < newCapacity)
-	{
-		//grow hashtable and next table
-		int curHashtableSize = m_hashTable.size();
-
-		m_hashTable.resize(newCapacity);
-		m_next.resize(newCapacity);
-
-
-		int i;
-
-		for (i= 0; i < newCapacity; ++i)
-		{
-			m_hashTable[i] = BT_NULL_PAIR;
-		}
-		for (i = 0; i < newCapacity; ++i)
-		{
-			m_next[i] = BT_NULL_PAIR;
-		}
-
-		for(i=0;i<curHashtableSize;i++)
-		{
-	
-			const btBroadphasePair& pair = m_overlappingPairArray[i];
-			int proxyId1 = pair.m_pProxy0->getUid();
-			int proxyId2 = pair.m_pProxy1->getUid();
-			/*if (proxyId1 > proxyId2) 
-				btSwap(proxyId1, proxyId2);*/
-			int	hashValue = static_cast<int>(getHash(static_cast<unsigned int>(proxyId1),static_cast<unsigned int>(proxyId2)) & (m_overlappingPairArray.capacity()-1));	// New hash value with new mask
-			m_next[i] = m_hashTable[hashValue];
-			m_hashTable[hashValue] = i;
-		}
-
-
-	}
-}
-
-btBroadphasePair* btHashedOverlappingPairCache::internalAddPair(btBroadphaseProxy* proxy0, btBroadphaseProxy* proxy1)
-{
-	if(proxy0>proxy1) btSwap(proxy0,proxy1);
-	int proxyId1 = proxy0->getUid();
-	int proxyId2 = proxy1->getUid();
-
-	/*if (proxyId1 > proxyId2) 
-		btSwap(proxyId1, proxyId2);*/
-
-	int	hash = static_cast<int>(getHash(static_cast<unsigned int>(proxyId1),static_cast<unsigned int>(proxyId2)) & (m_overlappingPairArray.capacity()-1));	// New hash value with new mask
-
-
-	btBroadphasePair* pair = internalFindPair(proxy0, proxy1, hash);
-	if (pair != NULL)
-	{
-		return pair;
-	}
-	/*for(int i=0;i<m_overlappingPairArray.size();++i)
-		{
-		if(	(m_overlappingPairArray[i].m_pProxy0==proxy0)&&
-			(m_overlappingPairArray[i].m_pProxy1==proxy1))
-			{
-			printf("Adding duplicated %u<>%u\r\n",proxyId1,proxyId2);
-			internalFindPair(proxy0, proxy1, hash);
-			}
-		}*/
-	int count = m_overlappingPairArray.size();
-	int oldCapacity = m_overlappingPairArray.capacity();
-	void* mem = &m_overlappingPairArray.expand();
-	int newCapacity = m_overlappingPairArray.capacity();
-
-	if (oldCapacity < newCapacity)
-	{
-		growTables();
-		//hash with new capacity
-		hash = static_cast<int>(getHash(static_cast<unsigned int>(proxyId1),static_cast<unsigned int>(proxyId2)) & (m_overlappingPairArray.capacity()-1));
-	}
-	
-	pair = new (mem) btBroadphasePair(*proxy0,*proxy1);
-//	pair->m_pProxy0 = proxy0;
-//	pair->m_pProxy1 = proxy1;
-	pair->m_algorithm = 0;
-	pair->m_userInfo = 0;
-	
-
-	m_next[count] = m_hashTable[hash];
-	m_hashTable[hash] = count;
-
-	return pair;
-}
-
-
-
-void* btHashedOverlappingPairCache::removeOverlappingPair(btBroadphaseProxy* proxy0, btBroadphaseProxy* proxy1,btDispatcher* dispatcher)
-{
-	gRemovePairs++;
-	if(proxy0>proxy1) btSwap(proxy0,proxy1);
-	int proxyId1 = proxy0->getUid();
-	int proxyId2 = proxy1->getUid();
-
-	/*if (proxyId1 > proxyId2) 
-		btSwap(proxyId1, proxyId2);*/
-
-	int	hash = static_cast<int>(getHash(static_cast<unsigned int>(proxyId1),static_cast<unsigned int>(proxyId2)) & (m_overlappingPairArray.capacity()-1));
-
-	btBroadphasePair* pair = internalFindPair(proxy0, proxy1, hash);
-	if (pair == NULL)
-	{
-		return 0;
-	}
-
-	cleanOverlappingPair(*pair,dispatcher);
-
-	void* userData = pair->m_userInfo;
-
-	btAssert(pair->m_pProxy0->getUid() == proxyId1);
-	btAssert(pair->m_pProxy1->getUid() == proxyId2);
-
-	int pairIndex = int(pair - &m_overlappingPairArray[0]);
-	btAssert(pairIndex < m_overlappingPairArray.size());
-
-	// Remove the pair from the hash table.
-	int index = m_hashTable[hash];
-	btAssert(index != BT_NULL_PAIR);
-
-	int previous = BT_NULL_PAIR;
-	while (index != pairIndex)
-	{
-		previous = index;
-		index = m_next[index];
-	}
-
-	if (previous != BT_NULL_PAIR)
-	{
-		btAssert(m_next[previous] == pairIndex);
-		m_next[previous] = m_next[pairIndex];
-	}
-	else
-	{
-		m_hashTable[hash] = m_next[pairIndex];
-	}
-
-	// We now move the last pair into spot of the
-	// pair being removed. We need to fix the hash
-	// table indices to support the move.
-
-	int lastPairIndex = m_overlappingPairArray.size() - 1;
-
-	// If the removed pair is the last pair, we are done.
-	if (lastPairIndex == pairIndex)
-	{
-		m_overlappingPairArray.pop_back();
-		return userData;
-	}
-
-	// Remove the last pair from the hash table.
-	const btBroadphasePair* last = &m_overlappingPairArray[lastPairIndex];
-		/* missing swap here too, Nat. */ 
-	int lastHash = static_cast<int>(getHash(static_cast<unsigned int>(last->m_pProxy0->getUid()), static_cast<unsigned int>(last->m_pProxy1->getUid())) & (m_overlappingPairArray.capacity()-1));
-
-	index = m_hashTable[lastHash];
-	btAssert(index != BT_NULL_PAIR);
-
-	previous = BT_NULL_PAIR;
-	while (index != lastPairIndex)
-	{
-		previous = index;
-		index = m_next[index];
-	}
-
-	if (previous != BT_NULL_PAIR)
-	{
-		btAssert(m_next[previous] == lastPairIndex);
-		m_next[previous] = m_next[lastPairIndex];
-	}
-	else
-	{
-		m_hashTable[lastHash] = m_next[lastPairIndex];
-	}
-
-	// Copy the last pair into the remove pair's spot.
-	m_overlappingPairArray[pairIndex] = m_overlappingPairArray[lastPairIndex];
-
-	// Insert the last pair into the hash table
-	m_next[pairIndex] = m_hashTable[lastHash];
-	m_hashTable[lastHash] = pairIndex;
-
-	m_overlappingPairArray.pop_back();
-
-	return userData;
-}
-//#include <stdio.h>
-
-void	btHashedOverlappingPairCache::processAllOverlappingPairs(btOverlapCallback* callback,btDispatcher* dispatcher)
-{
-
-	int i;
-
-//	printf("m_overlappingPairArray.size()=%d\n",m_overlappingPairArray.size());
-	for (i=0;i<m_overlappingPairArray.size();)
-	{
-	
-		btBroadphasePair* pair = &m_overlappingPairArray[i];
-		if (callback->processOverlap(*pair))
-		{
-			removeOverlappingPair(pair->m_pProxy0,pair->m_pProxy1,dispatcher);
-
-			gOverlappingPairs--;
-		} else
-		{
-			i++;
-		}
-	}
-}
-
-
-
-void*	btSortedOverlappingPairCache::removeOverlappingPair(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1, btDispatcher* dispatcher )
-{
-	if (!hasDeferredRemoval())
-	{
-		btBroadphasePair findPair(*proxy0,*proxy1);
-
-		int findIndex = m_overlappingPairArray.findLinearSearch(findPair);
-		if (findIndex < m_overlappingPairArray.size())
-		{
-			gOverlappingPairs--;
-			btBroadphasePair& pair = m_overlappingPairArray[findIndex];
-			void* userData = pair.m_userInfo;
-			cleanOverlappingPair(pair,dispatcher);
-			
-			m_overlappingPairArray.swap(findIndex,m_overlappingPairArray.capacity()-1);
-			m_overlappingPairArray.pop_back();
-			return userData;
-		}
-	}
-
-	return 0;
-}
-
-
-
-
-
-
-
-
-btBroadphasePair*	btSortedOverlappingPairCache::addOverlappingPair(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1)
+void	btOverlappingPairCache::addOverlappingPair(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1)
 {
 	//don't add overlap with own
 	assert(proxy0 != proxy1);
 
 	if (!needsBroadphaseCollision(proxy0,proxy1))
-		return 0;
+		return;
+
+
+	btBroadphasePair pair(*proxy0,*proxy1);
 	
-	void* mem = &m_overlappingPairArray.expand();
-	btBroadphasePair* pair = new (mem) btBroadphasePair(*proxy0,*proxy1);
+	m_overlappingPairArray.push_back(pair);
 	gOverlappingPairs++;
-	gAddedPairs++;
-	return pair;
 	
 }
 
@@ -436,7 +88,7 @@ btBroadphasePair*	btSortedOverlappingPairCache::addOverlappingPair(btBroadphaseP
 ///use a different solution. It is mainly used for Removing overlapping pairs. Removal could be delayed.
 ///we could keep a linked list in each proxy, and store pair in one of the proxies (with lowest memory address)
 ///Also we can use a 2D bitmap, which can be useful for a future GPU implementation
- btBroadphasePair*	btSortedOverlappingPairCache::findPair(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1)
+ btBroadphasePair*	btOverlappingPairCache::findPair(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1)
 {
 	if (!needsBroadphaseCollision(proxy0,proxy1))
 		return 0;
@@ -457,81 +109,18 @@ btBroadphasePair*	btSortedOverlappingPairCache::addOverlappingPair(btBroadphaseP
 
 
 
-
-
-
-
-
-//#include <stdio.h>
-
-void	btSortedOverlappingPairCache::processAllOverlappingPairs(btOverlapCallback* callback,btDispatcher* dispatcher)
-{
-
-	int i;
-
-	for (i=0;i<m_overlappingPairArray.size();)
-	{
-	
-		btBroadphasePair* pair = &m_overlappingPairArray[i];
-		if (callback->processOverlap(*pair))
-		{
-			cleanOverlappingPair(*pair,dispatcher);
-
-			m_overlappingPairArray.swap(i,m_overlappingPairArray.capacity()-1);
-			m_overlappingPairArray.pop_back();
-			gOverlappingPairs--;
-		} else
-		{
-			i++;
-		}
-	}
-}
-
-
-
-
-btSortedOverlappingPairCache::btSortedOverlappingPairCache():
-	m_blockedForChanges(false),
-	m_hasDeferredRemoval(true),
-	m_overlapFilterCallback(0)
-{
-	int initialAllocatedSize= 2;
-	m_overlappingPairArray.reserve(initialAllocatedSize);
-}
-
-btSortedOverlappingPairCache::~btSortedOverlappingPairCache()
-{
-	//todo/test: show we erase/delete data, or is it automatic
-}
-
-void	btSortedOverlappingPairCache::cleanOverlappingPair(btBroadphasePair& pair,btDispatcher* dispatcher)
-{
-	if (pair.m_algorithm)
-	{
-		{
-			pair.m_algorithm->~btCollisionAlgorithm();
-			dispatcher->freeCollisionAlgorithm(pair.m_algorithm);
-			pair.m_algorithm=0;
-			gRemovePairs--;
-		}
-	}
-}
-
-
-void	btSortedOverlappingPairCache::cleanProxyFromPairs(btBroadphaseProxy* proxy,btDispatcher* dispatcher)
+void	btOverlappingPairCache::cleanProxyFromPairs(btBroadphaseProxy* proxy)
 {
 
 	class	CleanPairCallback : public btOverlapCallback
 	{
 		btBroadphaseProxy* m_cleanProxy;
 		btOverlappingPairCache*	m_pairCache;
-		btDispatcher* m_dispatcher;
 
 	public:
-		CleanPairCallback(btBroadphaseProxy* cleanProxy,btOverlappingPairCache* pairCache,btDispatcher* dispatcher)
+		CleanPairCallback(btBroadphaseProxy* cleanProxy,btOverlappingPairCache* pairCache)
 			:m_cleanProxy(cleanProxy),
-			m_pairCache(pairCache),
-			m_dispatcher(dispatcher)
+			m_pairCache(pairCache)
 		{
 		}
 		virtual	bool	processOverlap(btBroadphasePair& pair)
@@ -539,21 +128,22 @@ void	btSortedOverlappingPairCache::cleanProxyFromPairs(btBroadphaseProxy* proxy,
 			if ((pair.m_pProxy0 == m_cleanProxy) ||
 				(pair.m_pProxy1 == m_cleanProxy))
 			{
-				m_pairCache->cleanOverlappingPair(pair,m_dispatcher);
+				m_pairCache->cleanOverlappingPair(pair);
 			}
 			return false;
 		}
 		
 	};
 
-	CleanPairCallback cleanPairs(proxy,this,dispatcher);
+	CleanPairCallback cleanPairs(proxy,this);
 
-	processAllOverlappingPairs(&cleanPairs,dispatcher);
+	processAllOverlappingPairs(&cleanPairs);
 
 }
 
 
-void	btSortedOverlappingPairCache::removeOverlappingPairsContainingProxy(btBroadphaseProxy* proxy,btDispatcher* dispatcher)
+
+void	btOverlappingPairCache::removeOverlappingPairsContainingProxy(btBroadphaseProxy* proxy)
 {
 
 	class	RemovePairCallback : public btOverlapCallback
@@ -573,7 +163,34 @@ void	btSortedOverlappingPairCache::removeOverlappingPairsContainingProxy(btBroad
 		
 	};
 
+
 	RemovePairCallback removeCallback(proxy);
 
-	processAllOverlappingPairs(&removeCallback,dispatcher);
+	processAllOverlappingPairs(&removeCallback);
 }
+
+
+
+void	btOverlappingPairCache::processAllOverlappingPairs(btOverlapCallback* callback)
+{
+
+	int i;
+
+	for (i=0;i<m_overlappingPairArray.size();)
+	{
+	
+		btBroadphasePair* pair = &m_overlappingPairArray[i];
+		if (callback->processOverlap(*pair))
+		{
+			cleanOverlappingPair(*pair);
+
+			m_overlappingPairArray.swap(i,m_overlappingPairArray.size()-1);
+			m_overlappingPairArray.pop_back();
+			gOverlappingPairs--;
+		} else
+		{
+			i++;
+		}
+	}
+}
+
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h
index 66679bd218a..a81fe3264df 100644
--- a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h
+++ b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h
@@ -1,3 +1,4 @@
+
 /*
 Bullet Continuous Collision Detection and Physics Library
 Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
@@ -19,13 +20,9 @@ subject to the following restrictions:
 
 #include "btBroadphaseInterface.h"
 #include "btBroadphaseProxy.h"
-#include "btOverlappingPairCallback.h"
+#include "../../LinearMath/btPoint3.h"
+#include "../../LinearMath/btAlignedObjectArray.h"
 
-#include "LinearMath/btPoint3.h"
-#include "LinearMath/btAlignedObjectArray.h"
-class btDispatcher;
-
-typedef btAlignedObjectArray<btBroadphasePair>	btBroadphasePairArray;
 
 struct	btOverlapCallback
 {
@@ -33,7 +30,6 @@ struct	btOverlapCallback
 	{}
 	//return true for deletion of the pair
 	virtual bool	processOverlap(btBroadphasePair& pair) = 0;
-
 };
 
 struct btOverlapFilterCallback
@@ -44,261 +40,38 @@ struct btOverlapFilterCallback
 	virtual bool	needBroadphaseCollision(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1) const = 0;
 };
 
-
-
-
-
-
-
-extern int gRemovePairs;
-extern int gAddedPairs;
-extern int gFindPairs;
-
-const int BT_NULL_PAIR=0xffffffff;
-
-///The btOverlappingPairCache provides an interface for overlapping pair management (add, remove, storage), used by the btBroadphaseInterface broadphases.
-///The btHashedOverlappingPairCache and btSortedOverlappingPairCache classes are two implementations.
-class btOverlappingPairCache : public btOverlappingPairCallback
-{
-public:
-	virtual ~btOverlappingPairCache() {} // this is needed so we can get to the derived class destructor
-
-	virtual btBroadphasePair*	getOverlappingPairArrayPtr() = 0;
-	
-	virtual const btBroadphasePair*	getOverlappingPairArrayPtr() const = 0;
-
-	virtual btBroadphasePairArray&	getOverlappingPairArray() = 0;
-
-	virtual	void	cleanOverlappingPair(btBroadphasePair& pair,btDispatcher* dispatcher) = 0;
-
-	virtual int getNumOverlappingPairs() const = 0;
-
-	virtual void	cleanProxyFromPairs(btBroadphaseProxy* proxy,btDispatcher* dispatcher) = 0;
-
-	virtual	void setOverlapFilterCallback(btOverlapFilterCallback* callback) = 0;
-
-	virtual void	processAllOverlappingPairs(btOverlapCallback*,btDispatcher* dispatcher) = 0;
-
-	virtual btBroadphasePair* findPair(btBroadphaseProxy* proxy0, btBroadphaseProxy* proxy1) = 0;
-
-	virtual bool	hasDeferredRemoval() = 0;
-
-};
-
-/// Hash-space based Pair Cache, thanks to Erin Catto, Box2D, http://www.box2d.org, and Pierre Terdiman, Codercorner, http://codercorner.com
-class btHashedOverlappingPairCache : public btOverlappingPairCache
-{
-	btBroadphasePairArray	m_overlappingPairArray;
-	btOverlapFilterCallback* m_overlapFilterCallback;
-	bool		m_blockedForChanges;
-
-
-public:
-	btHashedOverlappingPairCache();
-	virtual ~btHashedOverlappingPairCache();
-
-	
-	void	removeOverlappingPairsContainingProxy(btBroadphaseProxy* proxy,btDispatcher* dispatcher);
-
-	virtual void*	removeOverlappingPair(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1,btDispatcher* dispatcher);
-	
-	SIMD_FORCE_INLINE bool needsBroadphaseCollision(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1) const
-	{
-		if (m_overlapFilterCallback)
-			return m_overlapFilterCallback->needBroadphaseCollision(proxy0,proxy1);
-
-		bool collides = (proxy0->m_collisionFilterGroup & proxy1->m_collisionFilterMask) != 0;
-		collides = collides && (proxy1->m_collisionFilterGroup & proxy0->m_collisionFilterMask);
-		
-		return collides;
-	}
-
-	// Add a pair and return the new pair. If the pair already exists,
-	// no new pair is created and the old one is returned.
-	virtual btBroadphasePair* 	addOverlappingPair(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1)
-	{
-		gAddedPairs++;
-
-		if (!needsBroadphaseCollision(proxy0,proxy1))
-			return 0;
-
-		return internalAddPair(proxy0,proxy1);
-	}
-
-	
-
-	void	cleanProxyFromPairs(btBroadphaseProxy* proxy,btDispatcher* dispatcher);
-
-	
-	virtual void	processAllOverlappingPairs(btOverlapCallback*,btDispatcher* dispatcher);
-
-	virtual btBroadphasePair*	getOverlappingPairArrayPtr()
-	{
-		return &m_overlappingPairArray[0];
-	}
-
-	const btBroadphasePair*	getOverlappingPairArrayPtr() const
-	{
-		return &m_overlappingPairArray[0];
-	}
-
-	btBroadphasePairArray&	getOverlappingPairArray()
-	{
-		return m_overlappingPairArray;
-	}
-
-	const btBroadphasePairArray&	getOverlappingPairArray() const
-	{
-		return m_overlappingPairArray;
-	}
-
-	void	cleanOverlappingPair(btBroadphasePair& pair,btDispatcher* dispatcher);
-
-
-
-	btBroadphasePair* findPair(btBroadphaseProxy* proxy0, btBroadphaseProxy* proxy1);
-
-	int GetCount() const { return m_overlappingPairArray.size(); }
-//	btBroadphasePair* GetPairs() { return m_pairs; }
-
-	btOverlapFilterCallback* getOverlapFilterCallback()
-	{
-		return m_overlapFilterCallback;
-	}
-
-	void setOverlapFilterCallback(btOverlapFilterCallback* callback)
-	{
-		m_overlapFilterCallback = callback;
-	}
-
-	int	getNumOverlappingPairs() const
-	{
-		return m_overlappingPairArray.size();
-	}
-private:
-	
-	btBroadphasePair* 	internalAddPair(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1);
-
-	void	growTables();
-
-	SIMD_FORCE_INLINE bool equalsPair(const btBroadphasePair& pair, int proxyId1, int proxyId2)
-	{	
-		return pair.m_pProxy0->getUid() == proxyId1 && pair.m_pProxy1->getUid() == proxyId2;
-	}
-
-	/*
-	// Thomas Wang's hash, see: http://www.concentric.net/~Ttwang/tech/inthash.htm
-	// This assumes proxyId1 and proxyId2 are 16-bit.
-	SIMD_FORCE_INLINE int getHash(int proxyId1, int proxyId2)
-	{
-		int key = (proxyId2 << 16) | proxyId1;
-		key = ~key + (key << 15);
-		key = key ^ (key >> 12);
-		key = key + (key << 2);
-		key = key ^ (key >> 4);
-		key = key * 2057;
-		key = key ^ (key >> 16);
-		return key;
-	}
-	*/
-
-
-	
-	SIMD_FORCE_INLINE	unsigned int getHash(unsigned int proxyId1, unsigned int proxyId2)
-	{
-		int key = static_cast<int>(((unsigned int)proxyId1) | (((unsigned int)proxyId2) <<16));
-		// Thomas Wang's hash
-
-		key += ~(key << 15);
-		key ^=  (key >> 10);
-		key +=  (key << 3);
-		key ^=  (key >> 6);
-		key += ~(key << 11);
-		key ^=  (key >> 16);
-		return static_cast<unsigned int>(key);
-	}
-	
-
-
-
-
-	SIMD_FORCE_INLINE btBroadphasePair* internalFindPair(btBroadphaseProxy* proxy0, btBroadphaseProxy* proxy1, int hash)
-	{
-		int proxyId1 = proxy0->getUid();
-		int proxyId2 = proxy1->getUid();
-		#if 0 // wrong, 'equalsPair' use unsorted uids, copy-past devil striked again. Nat.
-		if (proxyId1 > proxyId2) 
-			btSwap(proxyId1, proxyId2);
-		#endif
-
-		int index = m_hashTable[hash];
-		
-		while( index != BT_NULL_PAIR && equalsPair(m_overlappingPairArray[index], proxyId1, proxyId2) == false)
-		{
-			index = m_next[index];
-		}
-
-		if ( index == BT_NULL_PAIR )
-		{
-			return NULL;
-		}
-
-		btAssert(index < m_overlappingPairArray.size());
-
-		return &m_overlappingPairArray[index];
-	}
-
-	virtual bool	hasDeferredRemoval()
-	{
-		return false;
-	}
-
-public:
-	
-	btAlignedObjectArray<int>	m_hashTable;
-	btAlignedObjectArray<int>	m_next;
-	
-};
-
-
-
-
-///btSortedOverlappingPairCache maintains the objects with overlapping AABB
+///btOverlappingPairCache maintains the objects with overlapping AABB
 ///Typically managed by the Broadphase, Axis3Sweep or btSimpleBroadphase
-class	btSortedOverlappingPairCache : public btOverlappingPairCache
+class	btOverlappingPairCache : public btBroadphaseInterface
 {
 	protected:
 		//avoid brute-force finding all the time
-		btBroadphasePairArray	m_overlappingPairArray;
-
+		btAlignedObjectArray<btBroadphasePair>	m_overlappingPairArray;
+		
 		//during the dispatch, check that user doesn't destroy/create proxy
 		bool		m_blockedForChanges;
-
-		///by default, do the removal during the pair traversal
-		bool		m_hasDeferredRemoval;
 		
 		//if set, use the callback instead of the built in filter in needBroadphaseCollision
 		btOverlapFilterCallback* m_overlapFilterCallback;
-
 	public:
 			
-		btSortedOverlappingPairCache();	
-		virtual ~btSortedOverlappingPairCache();
+		btOverlappingPairCache();	
+		virtual ~btOverlappingPairCache();
 
-		virtual void	processAllOverlappingPairs(btOverlapCallback*,btDispatcher* dispatcher);
+		virtual void	processAllOverlappingPairs(btOverlapCallback*);
 
-		void*	removeOverlappingPair(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1,btDispatcher* dispatcher);
+		void	removeOverlappingPair(btBroadphasePair& pair);
 
-		void	cleanOverlappingPair(btBroadphasePair& pair,btDispatcher* dispatcher);
+		void	cleanOverlappingPair(btBroadphasePair& pair);
 		
-		btBroadphasePair*	addOverlappingPair(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1);
+		void	addOverlappingPair(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1);
 
 		btBroadphasePair*	findPair(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1);
 			
 		
-		void	cleanProxyFromPairs(btBroadphaseProxy* proxy,btDispatcher* dispatcher);
+		void	cleanProxyFromPairs(btBroadphaseProxy* proxy);
 
-		void	removeOverlappingPairsContainingProxy(btBroadphaseProxy* proxy,btDispatcher* dispatcher);
+		void	removeOverlappingPairsContainingProxy(btBroadphaseProxy* proxy);
 
 
 		inline bool needsBroadphaseCollision(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1) const
@@ -311,19 +84,10 @@ class	btSortedOverlappingPairCache : public btOverlappingPairCache
 			
 			return collides;
 		}
-		
-		btBroadphasePairArray&	getOverlappingPairArray()
-		{
-			return m_overlappingPairArray;
-		}
-
-		const btBroadphasePairArray&	getOverlappingPairArray() const
-		{
-			return m_overlappingPairArray;
-		}
-
+			
 		
 
+		virtual void	refreshOverlappingPairs() =0;
 
 		btBroadphasePair*	getOverlappingPairArrayPtr()
 		{
@@ -350,88 +114,7 @@ class	btSortedOverlappingPairCache : public btOverlappingPairCache
 			m_overlapFilterCallback = callback;
 		}
 
-		virtual bool	hasDeferredRemoval()
-		{
-			return m_hasDeferredRemoval;
-		}
-
-
 };
-
-
-
-///btNullPairCache skips add/removal of overlapping pairs. Userful for benchmarking and testing.
-class btNullPairCache : public btOverlappingPairCache
-{
-
-	btBroadphasePairArray	m_overlappingPairArray;
-
-public:
-
-	virtual btBroadphasePair*	getOverlappingPairArrayPtr()
-	{
-		return &m_overlappingPairArray[0];
-	}
-	const btBroadphasePair*	getOverlappingPairArrayPtr() const
-	{
-		return &m_overlappingPairArray[0];
-	}
-	btBroadphasePairArray&	getOverlappingPairArray()
-	{
-		return m_overlappingPairArray;
-	}
-	
-	virtual	void	cleanOverlappingPair(btBroadphasePair& /*pair*/,btDispatcher* /*dispatcher*/)
-	{
-
-	}
-
-	virtual int getNumOverlappingPairs() const
-	{
-		return 0;
-	}
-
-	virtual void	cleanProxyFromPairs(btBroadphaseProxy* /*proxy*/,btDispatcher* /*dispatcher*/)
-	{
-
-	}
-
-	virtual	void setOverlapFilterCallback(btOverlapFilterCallback* /*callback*/)
-	{
-	}
-
-	virtual void	processAllOverlappingPairs(btOverlapCallback*,btDispatcher* /*dispatcher*/)
-	{
-	}
-
-	virtual btBroadphasePair* findPair(btBroadphaseProxy* /*proxy0*/, btBroadphaseProxy* /*proxy1*/)
-	{
-		return 0;
-	}
-
-	virtual bool	hasDeferredRemoval()
-	{
-		return true;
-	}
-
-	virtual btBroadphasePair*	addOverlappingPair(btBroadphaseProxy* /*proxy0*/,btBroadphaseProxy* /*proxy1*/)
-	{
-		return 0;
-	}
-
-	virtual void*	removeOverlappingPair(btBroadphaseProxy* /*proxy0*/,btBroadphaseProxy* /*proxy1*/,btDispatcher* /*dispatcher*/)
-	{
-		return 0;
-	}
-
-	virtual void	removeOverlappingPairsContainingProxy(btBroadphaseProxy* /*proxy0*/,btDispatcher* /*dispatcher*/)
-	{
-	}
-
-
-};
-
-
 #endif //OVERLAPPING_PAIR_CACHE_H
 
 
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h
deleted file mode 100644
index 9c7b6f81367..00000000000
--- a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-#ifndef OVERLAPPING_PAIR_CALLBACK_H
-#define OVERLAPPING_PAIR_CALLBACK_H
-
-class btDispatcher;
-struct  btBroadphasePair;
-
-///The btOverlappingPairCallback class is an additional optional broadphase user callback for adding/removing overlapping pairs, similar interface to btOverlappingPairCache.
-class btOverlappingPairCallback
-{
-public:
-	virtual ~btOverlappingPairCallback()
-	{
-
-	}
-	
-	virtual btBroadphasePair*	addOverlappingPair(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1) = 0;
-
-	virtual void*	removeOverlappingPair(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1,btDispatcher* dispatcher) = 0;
-
-	virtual void	removeOverlappingPairsContainingProxy(btBroadphaseProxy* proxy0,btDispatcher* dispatcher) = 0;
-
-};
-
-#endif //OVERLAPPING_PAIR_CALLBACK_H
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp
deleted file mode 100644
index a30bd1fd9e1..00000000000
--- a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp
+++ /dev/null
@@ -1,1025 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-#include "btQuantizedBvh.h"
-
-#include "LinearMath/btAabbUtil2.h"
-#include "LinearMath/btIDebugDraw.h"
-
-
-btQuantizedBvh::btQuantizedBvh() : m_useQuantization(false), 
-					//m_traversalMode(TRAVERSAL_STACKLESS_CACHE_FRIENDLY)
-					m_traversalMode(TRAVERSAL_STACKLESS)
-					//m_traversalMode(TRAVERSAL_RECURSIVE)
-					,m_subtreeHeaderCount(0) //PCK: add this line
-{ 
-
-}
-
-
-
-
-
-void btQuantizedBvh::buildInternal()
-{
-	///assumes that caller filled in the m_quantizedLeafNodes
-	m_useQuantization = true;
-	int numLeafNodes = 0;
-	
-	if (m_useQuantization)
-	{
-		//now we have an array of leafnodes in m_leafNodes
-		numLeafNodes = m_quantizedLeafNodes.size();
-
-		m_quantizedContiguousNodes.resize(2*numLeafNodes);
-
-	}
-
-	m_curNodeIndex = 0;
-
-	buildTree(0,numLeafNodes);
-
-	///if the entire tree is small then subtree size, we need to create a header info for the tree
-	if(m_useQuantization && !m_SubtreeHeaders.size())
-	{
-		btBvhSubtreeInfo& subtree = m_SubtreeHeaders.expand();
-		subtree.setAabbFromQuantizeNode(m_quantizedContiguousNodes[0]);
-		subtree.m_rootNodeIndex = 0;
-		subtree.m_subtreeSize = m_quantizedContiguousNodes[0].isLeafNode() ? 1 : m_quantizedContiguousNodes[0].getEscapeIndex();
-	}
-
-	//PCK: update the copy of the size
-	m_subtreeHeaderCount = m_SubtreeHeaders.size();
-
-	//PCK: clear m_quantizedLeafNodes and m_leafNodes, they are temporary
-	m_quantizedLeafNodes.clear();
-	m_leafNodes.clear();
-}
-
-
-
-///just for debugging, to visualize the individual patches/subtrees
-#ifdef DEBUG_PATCH_COLORS
-btVector3 color[4]=
-{
-	btVector3(255,0,0),
-	btVector3(0,255,0),
-	btVector3(0,0,255),
-	btVector3(0,255,255)
-};
-#endif //DEBUG_PATCH_COLORS
-
-
-
-void	btQuantizedBvh::setQuantizationValues(const btVector3& bvhAabbMin,const btVector3& bvhAabbMax,btScalar quantizationMargin)
-{
-	//enlarge the AABB to avoid division by zero when initializing the quantization values
-	btVector3 clampValue(quantizationMargin,quantizationMargin,quantizationMargin);
-	m_bvhAabbMin = bvhAabbMin - clampValue;
-	m_bvhAabbMax = bvhAabbMax + clampValue;
-	btVector3 aabbSize = m_bvhAabbMax - m_bvhAabbMin;
-	m_bvhQuantization = btVector3(btScalar(65533.0),btScalar(65533.0),btScalar(65533.0)) / aabbSize;
-	m_useQuantization = true;
-}
-
-
-
-
-btQuantizedBvh::~btQuantizedBvh()
-{
-}
-
-#ifdef DEBUG_TREE_BUILDING
-int gStackDepth = 0;
-int gMaxStackDepth = 0;
-#endif //DEBUG_TREE_BUILDING
-
-void	btQuantizedBvh::buildTree	(int startIndex,int endIndex)
-{
-#ifdef DEBUG_TREE_BUILDING
-	gStackDepth++;
-	if (gStackDepth > gMaxStackDepth)
-		gMaxStackDepth = gStackDepth;
-#endif //DEBUG_TREE_BUILDING
-
-
-	int splitAxis, splitIndex, i;
-	int numIndices =endIndex-startIndex;
-	int curIndex = m_curNodeIndex;
-
-	assert(numIndices>0);
-
-	if (numIndices==1)
-	{
-#ifdef DEBUG_TREE_BUILDING
-		gStackDepth--;
-#endif //DEBUG_TREE_BUILDING
-		
-		assignInternalNodeFromLeafNode(m_curNodeIndex,startIndex);
-
-		m_curNodeIndex++;
-		return;	
-	}
-	//calculate Best Splitting Axis and where to split it. Sort the incoming 'leafNodes' array within range 'startIndex/endIndex'.
-	
-	splitAxis = calcSplittingAxis(startIndex,endIndex);
-
-	splitIndex = sortAndCalcSplittingIndex(startIndex,endIndex,splitAxis);
-
-	int internalNodeIndex = m_curNodeIndex;
-	
-	setInternalNodeAabbMax(m_curNodeIndex,m_bvhAabbMin);
-	setInternalNodeAabbMin(m_curNodeIndex,m_bvhAabbMax);
-	
-	for (i=startIndex;i<endIndex;i++)
-	{
-		mergeInternalNodeAabb(m_curNodeIndex,getAabbMin(i),getAabbMax(i));
-	}
-
-	m_curNodeIndex++;
-	
-
-	//internalNode->m_escapeIndex;
-	
-	int leftChildNodexIndex = m_curNodeIndex;
-
-	//build left child tree
-	buildTree(startIndex,splitIndex);
-
-	int rightChildNodexIndex = m_curNodeIndex;
-	//build right child tree
-	buildTree(splitIndex,endIndex);
-
-#ifdef DEBUG_TREE_BUILDING
-	gStackDepth--;
-#endif //DEBUG_TREE_BUILDING
-
-	int escapeIndex = m_curNodeIndex - curIndex;
-
-	if (m_useQuantization)
-	{
-		//escapeIndex is the number of nodes of this subtree
-		const int sizeQuantizedNode =sizeof(btQuantizedBvhNode);
-		const int treeSizeInBytes = escapeIndex * sizeQuantizedNode;
-		if (treeSizeInBytes > MAX_SUBTREE_SIZE_IN_BYTES)
-		{
-			updateSubtreeHeaders(leftChildNodexIndex,rightChildNodexIndex);
-		}
-	}
-
-	setInternalNodeEscapeIndex(internalNodeIndex,escapeIndex);
-
-}
-
-void	btQuantizedBvh::updateSubtreeHeaders(int leftChildNodexIndex,int rightChildNodexIndex)
-{
-	btAssert(m_useQuantization);
-
-	btQuantizedBvhNode& leftChildNode = m_quantizedContiguousNodes[leftChildNodexIndex];
-	int leftSubTreeSize = leftChildNode.isLeafNode() ? 1 : leftChildNode.getEscapeIndex();
-	int leftSubTreeSizeInBytes =  leftSubTreeSize * static_cast<int>(sizeof(btQuantizedBvhNode));
-	
-	btQuantizedBvhNode& rightChildNode = m_quantizedContiguousNodes[rightChildNodexIndex];
-	int rightSubTreeSize = rightChildNode.isLeafNode() ? 1 : rightChildNode.getEscapeIndex();
-	int rightSubTreeSizeInBytes =  rightSubTreeSize *  static_cast<int>(sizeof(btQuantizedBvhNode));
-
-	if(leftSubTreeSizeInBytes <= MAX_SUBTREE_SIZE_IN_BYTES)
-	{
-		btBvhSubtreeInfo& subtree = m_SubtreeHeaders.expand();
-		subtree.setAabbFromQuantizeNode(leftChildNode);
-		subtree.m_rootNodeIndex = leftChildNodexIndex;
-		subtree.m_subtreeSize = leftSubTreeSize;
-	}
-
-	if(rightSubTreeSizeInBytes <= MAX_SUBTREE_SIZE_IN_BYTES)
-	{
-		btBvhSubtreeInfo& subtree = m_SubtreeHeaders.expand();
-		subtree.setAabbFromQuantizeNode(rightChildNode);
-		subtree.m_rootNodeIndex = rightChildNodexIndex;
-		subtree.m_subtreeSize = rightSubTreeSize;
-	}
-
-	//PCK: update the copy of the size
-	m_subtreeHeaderCount = m_SubtreeHeaders.size();
-}
-
-
-int	btQuantizedBvh::sortAndCalcSplittingIndex(int startIndex,int endIndex,int splitAxis)
-{
-	int i;
-	int splitIndex =startIndex;
-	int numIndices = endIndex - startIndex;
-	btScalar splitValue;
-
-	btVector3 means(btScalar(0.),btScalar(0.),btScalar(0.));
-	for (i=startIndex;i<endIndex;i++)
-	{
-		btVector3 center = btScalar(0.5)*(getAabbMax(i)+getAabbMin(i));
-		means+=center;
-	}
-	means *= (btScalar(1.)/(btScalar)numIndices);
-	
-	splitValue = means[splitAxis];
-	
-	//sort leafNodes so all values larger then splitValue comes first, and smaller values start from 'splitIndex'.
-	for (i=startIndex;i<endIndex;i++)
-	{
-		btVector3 center = btScalar(0.5)*(getAabbMax(i)+getAabbMin(i));
-		if (center[splitAxis] > splitValue)
-		{
-			//swap
-			swapLeafNodes(i,splitIndex);
-			splitIndex++;
-		}
-	}
-
-	//if the splitIndex causes unbalanced trees, fix this by using the center in between startIndex and endIndex
-	//otherwise the tree-building might fail due to stack-overflows in certain cases.
-	//unbalanced1 is unsafe: it can cause stack overflows
-	//bool unbalanced1 = ((splitIndex==startIndex) || (splitIndex == (endIndex-1)));
-
-	//unbalanced2 should work too: always use center (perfect balanced trees)	
-	//bool unbalanced2 = true;
-
-	//this should be safe too:
-	int rangeBalancedIndices = numIndices/3;
-	bool unbalanced = ((splitIndex<=(startIndex+rangeBalancedIndices)) || (splitIndex >=(endIndex-1-rangeBalancedIndices)));
-	
-	if (unbalanced)
-	{
-		splitIndex = startIndex+ (numIndices>>1);
-	}
-
-	bool unbal = (splitIndex==startIndex) || (splitIndex == (endIndex));
-	(void)unbal;
-	btAssert(!unbal);
-
-	return splitIndex;
-}
-
-
-int	btQuantizedBvh::calcSplittingAxis(int startIndex,int endIndex)
-{
-	int i;
-
-	btVector3 means(btScalar(0.),btScalar(0.),btScalar(0.));
-	btVector3 variance(btScalar(0.),btScalar(0.),btScalar(0.));
-	int numIndices = endIndex-startIndex;
-
-	for (i=startIndex;i<endIndex;i++)
-	{
-		btVector3 center = btScalar(0.5)*(getAabbMax(i)+getAabbMin(i));
-		means+=center;
-	}
-	means *= (btScalar(1.)/(btScalar)numIndices);
-		
-	for (i=startIndex;i<endIndex;i++)
-	{
-		btVector3 center = btScalar(0.5)*(getAabbMax(i)+getAabbMin(i));
-		btVector3 diff2 = center-means;
-		diff2 = diff2 * diff2;
-		variance += diff2;
-	}
-	variance *= (btScalar(1.)/	((btScalar)numIndices-1)	);
-	
-	return variance.maxAxis();
-}
-
-
-
-void	btQuantizedBvh::reportAabbOverlappingNodex(btNodeOverlapCallback* nodeCallback,const btVector3& aabbMin,const btVector3& aabbMax) const
-{
-	//either choose recursive traversal (walkTree) or stackless (walkStacklessTree)
-
-	if (m_useQuantization)
-	{
-		///quantize query AABB
-		unsigned short int quantizedQueryAabbMin[3];
-		unsigned short int quantizedQueryAabbMax[3];
-		quantizeWithClamp(quantizedQueryAabbMin,aabbMin,0);
-		quantizeWithClamp(quantizedQueryAabbMax,aabbMax,1);
-
-		switch (m_traversalMode)
-		{
-		case TRAVERSAL_STACKLESS:
-				walkStacklessQuantizedTree(nodeCallback,quantizedQueryAabbMin,quantizedQueryAabbMax,0,m_curNodeIndex);
-			break;
-		case TRAVERSAL_STACKLESS_CACHE_FRIENDLY:
-				walkStacklessQuantizedTreeCacheFriendly(nodeCallback,quantizedQueryAabbMin,quantizedQueryAabbMax);
-			break;
-		case TRAVERSAL_RECURSIVE:
-			{
-				const btQuantizedBvhNode* rootNode = &m_quantizedContiguousNodes[0];
-				walkRecursiveQuantizedTreeAgainstQueryAabb(rootNode,nodeCallback,quantizedQueryAabbMin,quantizedQueryAabbMax);
-			}
-			break;
-		default:
-			//unsupported
-			btAssert(0);
-		}
-	} else
-	{
-		walkStacklessTree(nodeCallback,aabbMin,aabbMax);
-	}
-}
-
-
-int maxIterations = 0;
-
-void	btQuantizedBvh::walkStacklessTree(btNodeOverlapCallback* nodeCallback,const btVector3& aabbMin,const btVector3& aabbMax) const
-{
-	btAssert(!m_useQuantization);
-
-	const btOptimizedBvhNode* rootNode = &m_contiguousNodes[0];
-	int escapeIndex, curIndex = 0;
-	int walkIterations = 0;
-	bool isLeafNode;
-	//PCK: unsigned instead of bool
-	unsigned aabbOverlap;
-
-	while (curIndex < m_curNodeIndex)
-	{
-		//catch bugs in tree data
-		assert (walkIterations < m_curNodeIndex);
-
-		walkIterations++;
-		aabbOverlap = TestAabbAgainstAabb2(aabbMin,aabbMax,rootNode->m_aabbMinOrg,rootNode->m_aabbMaxOrg);
-		isLeafNode = rootNode->m_escapeIndex == -1;
-		
-		//PCK: unsigned instead of bool
-		if (isLeafNode && (aabbOverlap != 0))
-		{
-			nodeCallback->processNode(rootNode->m_subPart,rootNode->m_triangleIndex);
-		} 
-		
-		//PCK: unsigned instead of bool
-		if ((aabbOverlap != 0) || isLeafNode)
-		{
-			rootNode++;
-			curIndex++;
-		} else
-		{
-			escapeIndex = rootNode->m_escapeIndex;
-			rootNode += escapeIndex;
-			curIndex += escapeIndex;
-		}
-	}
-	if (maxIterations < walkIterations)
-		maxIterations = walkIterations;
-
-}
-
-/*
-///this was the original recursive traversal, before we optimized towards stackless traversal
-void	btQuantizedBvh::walkTree(btOptimizedBvhNode* rootNode,btNodeOverlapCallback* nodeCallback,const btVector3& aabbMin,const btVector3& aabbMax) const
-{
-	bool isLeafNode, aabbOverlap = TestAabbAgainstAabb2(aabbMin,aabbMax,rootNode->m_aabbMin,rootNode->m_aabbMax);
-	if (aabbOverlap)
-	{
-		isLeafNode = (!rootNode->m_leftChild && !rootNode->m_rightChild);
-		if (isLeafNode)
-		{
-			nodeCallback->processNode(rootNode);
-		} else
-		{
-			walkTree(rootNode->m_leftChild,nodeCallback,aabbMin,aabbMax);
-			walkTree(rootNode->m_rightChild,nodeCallback,aabbMin,aabbMax);
-		}
-	}
-
-}
-*/
-
-void btQuantizedBvh::walkRecursiveQuantizedTreeAgainstQueryAabb(const btQuantizedBvhNode* currentNode,btNodeOverlapCallback* nodeCallback,unsigned short int* quantizedQueryAabbMin,unsigned short int* quantizedQueryAabbMax) const
-{
-	btAssert(m_useQuantization);
-	
-	bool isLeafNode;
-	//PCK: unsigned instead of bool
-	unsigned aabbOverlap;
-
-	//PCK: unsigned instead of bool
-	aabbOverlap = testQuantizedAabbAgainstQuantizedAabb(quantizedQueryAabbMin,quantizedQueryAabbMax,currentNode->m_quantizedAabbMin,currentNode->m_quantizedAabbMax);
-	isLeafNode = currentNode->isLeafNode();
-		
-	//PCK: unsigned instead of bool
-	if (aabbOverlap != 0)
-	{
-		if (isLeafNode)
-		{
-			nodeCallback->processNode(currentNode->getPartId(),currentNode->getTriangleIndex());
-		} else
-		{
-			//process left and right children
-			const btQuantizedBvhNode* leftChildNode = currentNode+1;
-			walkRecursiveQuantizedTreeAgainstQueryAabb(leftChildNode,nodeCallback,quantizedQueryAabbMin,quantizedQueryAabbMax);
-
-			const btQuantizedBvhNode* rightChildNode = leftChildNode->isLeafNode() ? leftChildNode+1:leftChildNode+leftChildNode->getEscapeIndex();
-			walkRecursiveQuantizedTreeAgainstQueryAabb(rightChildNode,nodeCallback,quantizedQueryAabbMin,quantizedQueryAabbMax);
-		}
-	}		
-}
-
-
-
-
-
-void	btQuantizedBvh::walkStacklessQuantizedTreeAgainstRay(btNodeOverlapCallback* nodeCallback, const btVector3& raySource, const btVector3& rayTarget, const btVector3& aabbMin, const btVector3& aabbMax, int startNodeIndex,int endNodeIndex) const
-{
-	btAssert(m_useQuantization);
-	
-	int curIndex = startNodeIndex;
-	int walkIterations = 0;
-	int subTreeSize = endNodeIndex - startNodeIndex;
-	(void)subTreeSize;
-
-	const btQuantizedBvhNode* rootNode = &m_quantizedContiguousNodes[startNodeIndex];
-	int escapeIndex;
-	
-	bool isLeafNode;
-	//PCK: unsigned instead of bool
-	unsigned boxBoxOverlap = 0;
-	unsigned rayBoxOverlap = 0;
-
-	btScalar lambda_max = 1.0;
-#define RAYAABB2
-#ifdef RAYAABB2
-	btVector3 rayFrom = raySource;
-	btVector3 rayDirection = (rayTarget-raySource);
-	rayDirection.normalize ();
-	lambda_max = rayDirection.dot(rayTarget-raySource);
-	///what about division by zero? --> just set rayDirection[i] to 1.0
-	rayDirection[0] = rayDirection[0] == btScalar(0.0) ? btScalar(1e30) : btScalar(1.0) / rayDirection[0];
-	rayDirection[1] = rayDirection[1] == btScalar(0.0) ? btScalar(1e30) : btScalar(1.0) / rayDirection[1];
-	rayDirection[2] = rayDirection[2] == btScalar(0.0) ? btScalar(1e30) : btScalar(1.0) / rayDirection[2];
-	unsigned int sign[3] = { rayDirection[0] < 0.0, rayDirection[1] < 0.0, rayDirection[2] < 0.0};
-#endif
-
-	/* Quick pruning by quantized box */
-	btVector3 rayAabbMin = raySource;
-	btVector3 rayAabbMax = raySource;
-	rayAabbMin.setMin(rayTarget);
-	rayAabbMax.setMax(rayTarget);
-
-	/* Add box cast extents to bounding box */
-	rayAabbMin += aabbMin;
-	rayAabbMax += aabbMax;
-
-	unsigned short int quantizedQueryAabbMin[3];
-	unsigned short int quantizedQueryAabbMax[3];
-	quantizeWithClamp(quantizedQueryAabbMin,rayAabbMin,0);
-	quantizeWithClamp(quantizedQueryAabbMax,rayAabbMax,1);
-
-	while (curIndex < endNodeIndex)
-	{
-
-//#define VISUALLY_ANALYZE_BVH 1
-#ifdef VISUALLY_ANALYZE_BVH
-		//some code snippet to debugDraw aabb, to visually analyze bvh structure
-		static int drawPatch = 0;
-		//need some global access to a debugDrawer
-		extern btIDebugDraw* debugDrawerPtr;
-		if (curIndex==drawPatch)
-		{
-			btVector3 aabbMin,aabbMax;
-			aabbMin = unQuantize(rootNode->m_quantizedAabbMin);
-			aabbMax = unQuantize(rootNode->m_quantizedAabbMax);
-			btVector3	color(1,0,0);
-			debugDrawerPtr->drawAabb(aabbMin,aabbMax,color);
-		}
-#endif//VISUALLY_ANALYZE_BVH
-
-		//catch bugs in tree data
-		assert (walkIterations < subTreeSize);
-
-		walkIterations++;
-		//PCK: unsigned instead of bool
-		// only interested if this is closer than any previous hit
-		btScalar param = 1.0;
-		rayBoxOverlap = 0;
-		boxBoxOverlap = testQuantizedAabbAgainstQuantizedAabb(quantizedQueryAabbMin,quantizedQueryAabbMax,rootNode->m_quantizedAabbMin,rootNode->m_quantizedAabbMax);
-		isLeafNode = rootNode->isLeafNode();
-		if (boxBoxOverlap)
-		{
-			btVector3 bounds[2];
-			bounds[0] = unQuantize(rootNode->m_quantizedAabbMin);
-			bounds[1] = unQuantize(rootNode->m_quantizedAabbMax);
-			/* Add box cast extents */
-			bounds[0] += aabbMin;
-			bounds[1] += aabbMax;
-			btVector3 normal;
-#if 0
-			bool ra2 = btRayAabb2 (raySource, rayDirection, sign, bounds, param, 0.0, lambda_max);
-			bool ra = btRayAabb (raySource, rayTarget, bounds[0], bounds[1], param, normal);
-			if (ra2 != ra)
-			{
-				printf("functions don't match\n");
-			}
-#endif
-#ifdef RAYAABB2
-			///careful with this check: need to check division by zero (above) and fix the unQuantize method
-			///thanks Joerg/hiker for the reproduction case!
-			///http://www.bulletphysics.com/Bullet/phpBB3/viewtopic.php?f=9&t=1858
-
-			rayBoxOverlap = btRayAabb2 (raySource, rayDirection, sign, bounds, param, 0.0f, lambda_max);
-#else
-			rayBoxOverlap = true;//btRayAabb(raySource, rayTarget, bounds[0], bounds[1], param, normal);
-#endif
-		}
-		
-		if (isLeafNode && rayBoxOverlap)
-		{
-			nodeCallback->processNode(rootNode->getPartId(),rootNode->getTriangleIndex());
-		}
-		
-		//PCK: unsigned instead of bool
-		if ((rayBoxOverlap != 0) || isLeafNode)
-		{
-			rootNode++;
-			curIndex++;
-		} else
-		{
-			escapeIndex = rootNode->getEscapeIndex();
-			rootNode += escapeIndex;
-			curIndex += escapeIndex;
-		}
-	}
-	if (maxIterations < walkIterations)
-		maxIterations = walkIterations;
-
-}
-
-void	btQuantizedBvh::walkStacklessQuantizedTree(btNodeOverlapCallback* nodeCallback,unsigned short int* quantizedQueryAabbMin,unsigned short int* quantizedQueryAabbMax,int startNodeIndex,int endNodeIndex) const
-{
-	btAssert(m_useQuantization);
-	
-	int curIndex = startNodeIndex;
-	int walkIterations = 0;
-	int subTreeSize = endNodeIndex - startNodeIndex;
-	(void)subTreeSize;
-
-	const btQuantizedBvhNode* rootNode = &m_quantizedContiguousNodes[startNodeIndex];
-	int escapeIndex;
-	
-	bool isLeafNode;
-	//PCK: unsigned instead of bool
-	unsigned aabbOverlap;
-
-	while (curIndex < endNodeIndex)
-	{
-
-//#define VISUALLY_ANALYZE_BVH 1
-#ifdef VISUALLY_ANALYZE_BVH
-		//some code snippet to debugDraw aabb, to visually analyze bvh structure
-		static int drawPatch = 0;
-		//need some global access to a debugDrawer
-		extern btIDebugDraw* debugDrawerPtr;
-		if (curIndex==drawPatch)
-		{
-			btVector3 aabbMin,aabbMax;
-			aabbMin = unQuantize(rootNode->m_quantizedAabbMin);
-			aabbMax = unQuantize(rootNode->m_quantizedAabbMax);
-			btVector3	color(1,0,0);
-			debugDrawerPtr->drawAabb(aabbMin,aabbMax,color);
-		}
-#endif//VISUALLY_ANALYZE_BVH
-
-		//catch bugs in tree data
-		assert (walkIterations < subTreeSize);
-
-		walkIterations++;
-		//PCK: unsigned instead of bool
-		aabbOverlap = testQuantizedAabbAgainstQuantizedAabb(quantizedQueryAabbMin,quantizedQueryAabbMax,rootNode->m_quantizedAabbMin,rootNode->m_quantizedAabbMax);
-		isLeafNode = rootNode->isLeafNode();
-		
-		if (isLeafNode && aabbOverlap)
-		{
-			nodeCallback->processNode(rootNode->getPartId(),rootNode->getTriangleIndex());
-		} 
-		
-		//PCK: unsigned instead of bool
-		if ((aabbOverlap != 0) || isLeafNode)
-		{
-			rootNode++;
-			curIndex++;
-		} else
-		{
-			escapeIndex = rootNode->getEscapeIndex();
-			rootNode += escapeIndex;
-			curIndex += escapeIndex;
-		}
-	}
-	if (maxIterations < walkIterations)
-		maxIterations = walkIterations;
-
-}
-
-//This traversal can be called from Playstation 3 SPU
-void	btQuantizedBvh::walkStacklessQuantizedTreeCacheFriendly(btNodeOverlapCallback* nodeCallback,unsigned short int* quantizedQueryAabbMin,unsigned short int* quantizedQueryAabbMax) const
-{
-	btAssert(m_useQuantization);
-
-	int i;
-
-
-	for (i=0;i<this->m_SubtreeHeaders.size();i++)
-	{
-		const btBvhSubtreeInfo& subtree = m_SubtreeHeaders[i];
-
-		//PCK: unsigned instead of bool
-		unsigned overlap = testQuantizedAabbAgainstQuantizedAabb(quantizedQueryAabbMin,quantizedQueryAabbMax,subtree.m_quantizedAabbMin,subtree.m_quantizedAabbMax);
-		if (overlap != 0)
-		{
-			walkStacklessQuantizedTree(nodeCallback,quantizedQueryAabbMin,quantizedQueryAabbMax,
-				subtree.m_rootNodeIndex,
-				subtree.m_rootNodeIndex+subtree.m_subtreeSize);
-		}
-	}
-}
-
-
-void	btQuantizedBvh::reportRayOverlappingNodex (btNodeOverlapCallback* nodeCallback, const btVector3& raySource, const btVector3& rayTarget) const
-{
-	bool fast_path = m_useQuantization && m_traversalMode == TRAVERSAL_STACKLESS;
-	if (fast_path)
-	{
-		walkStacklessQuantizedTreeAgainstRay(nodeCallback, raySource, rayTarget, btVector3(0, 0, 0), btVector3(0, 0, 0), 0, m_curNodeIndex);
-	} else {
-		/* Otherwise fallback to AABB overlap test */
-		btVector3 aabbMin = raySource;
-		btVector3 aabbMax = raySource;
-		aabbMin.setMin(rayTarget);
-		aabbMax.setMax(rayTarget);
-		reportAabbOverlappingNodex(nodeCallback,aabbMin,aabbMax);
-	}
-}
-
-
-void	btQuantizedBvh::reportBoxCastOverlappingNodex(btNodeOverlapCallback* nodeCallback, const btVector3& raySource, const btVector3& rayTarget, const btVector3& aabbMin,const btVector3& aabbMax) const
-{
-	bool fast_path = m_useQuantization && m_traversalMode == TRAVERSAL_STACKLESS;
-	if (fast_path)
-	{
-		walkStacklessQuantizedTreeAgainstRay(nodeCallback, raySource, rayTarget, aabbMin, aabbMax, 0, m_curNodeIndex);
-	} else {
-		/* Slow path:
-		   Construct the bounding box for the entire box cast and send that down the tree */
-		btVector3 qaabbMin = raySource;
-		btVector3 qaabbMax = raySource;
-		qaabbMin.setMin(rayTarget);
-		qaabbMax.setMax(rayTarget);
-		qaabbMin += aabbMin;
-		qaabbMax += aabbMax;
-		reportAabbOverlappingNodex(nodeCallback,qaabbMin,qaabbMax);
-	}
-}
-
-
-void	btQuantizedBvh::swapLeafNodes(int i,int splitIndex)
-{
-	if (m_useQuantization)
-	{
-			btQuantizedBvhNode tmp = m_quantizedLeafNodes[i];
-			m_quantizedLeafNodes[i] = m_quantizedLeafNodes[splitIndex];
-			m_quantizedLeafNodes[splitIndex] = tmp;
-	} else
-	{
-			btOptimizedBvhNode tmp = m_leafNodes[i];
-			m_leafNodes[i] = m_leafNodes[splitIndex];
-			m_leafNodes[splitIndex] = tmp;
-	}
-}
-
-void	btQuantizedBvh::assignInternalNodeFromLeafNode(int internalNode,int leafNodeIndex)
-{
-	if (m_useQuantization)
-	{
-		m_quantizedContiguousNodes[internalNode] = m_quantizedLeafNodes[leafNodeIndex];
-	} else
-	{
-		m_contiguousNodes[internalNode] = m_leafNodes[leafNodeIndex];
-	}
-}
-
-//PCK: include
-#include <new>
-
-//PCK: consts
-static const unsigned BVH_ALIGNMENT = 16;
-static const unsigned BVH_ALIGNMENT_MASK = BVH_ALIGNMENT-1;
-
-static const unsigned BVH_ALIGNMENT_BLOCKS = 2;
-
-
-
-unsigned int btQuantizedBvh::getAlignmentSerializationPadding()
-{
-	return BVH_ALIGNMENT_BLOCKS * BVH_ALIGNMENT;
-}
-
-unsigned btQuantizedBvh::calculateSerializeBufferSize()
-{
-	unsigned baseSize = sizeof(btQuantizedBvh) + getAlignmentSerializationPadding();
-	baseSize += sizeof(btBvhSubtreeInfo) * m_subtreeHeaderCount;
-	if (m_useQuantization)
-	{
-		return baseSize + m_curNodeIndex * sizeof(btQuantizedBvhNode);
-	}
-	return baseSize + m_curNodeIndex * sizeof(btOptimizedBvhNode);
-}
-
-bool btQuantizedBvh::serialize(void *o_alignedDataBuffer, unsigned /*i_dataBufferSize */, bool i_swapEndian)
-{
-	assert(m_subtreeHeaderCount == m_SubtreeHeaders.size());
-	m_subtreeHeaderCount = m_SubtreeHeaders.size();
-
-/*	if (i_dataBufferSize < calculateSerializeBufferSize() || o_alignedDataBuffer == NULL || (((unsigned)o_alignedDataBuffer & BVH_ALIGNMENT_MASK) != 0))
-	{
-		///check alignedment for buffer?
-		btAssert(0);
-		return false;
-	}
-*/
-
-	btQuantizedBvh *targetBvh = (btQuantizedBvh *)o_alignedDataBuffer;
-
-	// construct the class so the virtual function table, etc will be set up
-	// Also, m_leafNodes and m_quantizedLeafNodes will be initialized to default values by the constructor
-	new (targetBvh) btQuantizedBvh;
-
-	if (i_swapEndian)
-	{
-		targetBvh->m_curNodeIndex = static_cast<int>(btSwapEndian(m_curNodeIndex));
-
-
-		btSwapVector3Endian(m_bvhAabbMin,targetBvh->m_bvhAabbMin);
-		btSwapVector3Endian(m_bvhAabbMax,targetBvh->m_bvhAabbMax);
-		btSwapVector3Endian(m_bvhQuantization,targetBvh->m_bvhQuantization);
-
-		targetBvh->m_traversalMode = (btTraversalMode)btSwapEndian(m_traversalMode);
-		targetBvh->m_subtreeHeaderCount = static_cast<int>(btSwapEndian(m_subtreeHeaderCount));
-	}
-	else
-	{
-		targetBvh->m_curNodeIndex = m_curNodeIndex;
-		targetBvh->m_bvhAabbMin = m_bvhAabbMin;
-		targetBvh->m_bvhAabbMax = m_bvhAabbMax;
-		targetBvh->m_bvhQuantization = m_bvhQuantization;
-		targetBvh->m_traversalMode = m_traversalMode;
-		targetBvh->m_subtreeHeaderCount = m_subtreeHeaderCount;
-	}
-
-	targetBvh->m_useQuantization = m_useQuantization;
-
-	unsigned char *nodeData = (unsigned char *)targetBvh;
-	nodeData += sizeof(btQuantizedBvh);
-	
-	unsigned sizeToAdd = 0;//(BVH_ALIGNMENT-((unsigned)nodeData & BVH_ALIGNMENT_MASK))&BVH_ALIGNMENT_MASK;
-	nodeData += sizeToAdd;
-	
-	int nodeCount = m_curNodeIndex;
-
-	if (m_useQuantization)
-	{
-		targetBvh->m_quantizedContiguousNodes.initializeFromBuffer(nodeData, nodeCount, nodeCount);
-
-		if (i_swapEndian)
-		{
-			for (int nodeIndex = 0; nodeIndex < nodeCount; nodeIndex++)
-			{
-				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[0] = btSwapEndian(m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[0]);
-				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[1] = btSwapEndian(m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[1]);
-				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[2] = btSwapEndian(m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[2]);
-
-				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[0] = btSwapEndian(m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[0]);
-				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[1] = btSwapEndian(m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[1]);
-				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[2] = btSwapEndian(m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[2]);
-
-				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_escapeIndexOrTriangleIndex = static_cast<int>(btSwapEndian(m_quantizedContiguousNodes[nodeIndex].m_escapeIndexOrTriangleIndex));
-			}
-		}
-		else
-		{
-			for (int nodeIndex = 0; nodeIndex < nodeCount; nodeIndex++)
-			{
-	
-				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[0] = m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[0];
-				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[1] = m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[1];
-				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[2] = m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[2];
-
-				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[0] = m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[0];
-				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[1] = m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[1];
-				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[2] = m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[2];
-
-				targetBvh->m_quantizedContiguousNodes[nodeIndex].m_escapeIndexOrTriangleIndex = m_quantizedContiguousNodes[nodeIndex].m_escapeIndexOrTriangleIndex;
-
-
-			}
-		}
-		nodeData += sizeof(btQuantizedBvhNode) * nodeCount;
-	}
-	else
-	{
-		targetBvh->m_contiguousNodes.initializeFromBuffer(nodeData, nodeCount, nodeCount);
-
-		if (i_swapEndian)
-		{
-			for (int nodeIndex = 0; nodeIndex < nodeCount; nodeIndex++)
-			{
-				btSwapVector3Endian(m_contiguousNodes[nodeIndex].m_aabbMinOrg, targetBvh->m_contiguousNodes[nodeIndex].m_aabbMinOrg);
-				btSwapVector3Endian(m_contiguousNodes[nodeIndex].m_aabbMaxOrg, targetBvh->m_contiguousNodes[nodeIndex].m_aabbMaxOrg);
-
-				targetBvh->m_contiguousNodes[nodeIndex].m_escapeIndex = static_cast<int>(btSwapEndian(m_contiguousNodes[nodeIndex].m_escapeIndex));
-				targetBvh->m_contiguousNodes[nodeIndex].m_subPart = static_cast<int>(btSwapEndian(m_contiguousNodes[nodeIndex].m_subPart));
-				targetBvh->m_contiguousNodes[nodeIndex].m_triangleIndex = static_cast<int>(btSwapEndian(m_contiguousNodes[nodeIndex].m_triangleIndex));
-			}
-		}
-		else
-		{
-			for (int nodeIndex = 0; nodeIndex < nodeCount; nodeIndex++)
-			{
-				targetBvh->m_contiguousNodes[nodeIndex].m_aabbMinOrg = m_contiguousNodes[nodeIndex].m_aabbMinOrg;
-				targetBvh->m_contiguousNodes[nodeIndex].m_aabbMaxOrg = m_contiguousNodes[nodeIndex].m_aabbMaxOrg;
-
-				targetBvh->m_contiguousNodes[nodeIndex].m_escapeIndex = m_contiguousNodes[nodeIndex].m_escapeIndex;
-				targetBvh->m_contiguousNodes[nodeIndex].m_subPart = m_contiguousNodes[nodeIndex].m_subPart;
-				targetBvh->m_contiguousNodes[nodeIndex].m_triangleIndex = m_contiguousNodes[nodeIndex].m_triangleIndex;
-			}
-		}
-		nodeData += sizeof(btOptimizedBvhNode) * nodeCount;
-	}
-
-	sizeToAdd = 0;//(BVH_ALIGNMENT-((unsigned)nodeData & BVH_ALIGNMENT_MASK))&BVH_ALIGNMENT_MASK;
-	nodeData += sizeToAdd;
-
-	// Now serialize the subtree headers
-	targetBvh->m_SubtreeHeaders.initializeFromBuffer(nodeData, m_subtreeHeaderCount, m_subtreeHeaderCount);
-	if (i_swapEndian)
-	{
-		for (int i = 0; i < m_subtreeHeaderCount; i++)
-		{
-			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMin[0] = btSwapEndian(m_SubtreeHeaders[i].m_quantizedAabbMin[0]);
-			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMin[1] = btSwapEndian(m_SubtreeHeaders[i].m_quantizedAabbMin[1]);
-			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMin[2] = btSwapEndian(m_SubtreeHeaders[i].m_quantizedAabbMin[2]);
-
-			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMax[0] = btSwapEndian(m_SubtreeHeaders[i].m_quantizedAabbMax[0]);
-			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMax[1] = btSwapEndian(m_SubtreeHeaders[i].m_quantizedAabbMax[1]);
-			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMax[2] = btSwapEndian(m_SubtreeHeaders[i].m_quantizedAabbMax[2]);
-
-			targetBvh->m_SubtreeHeaders[i].m_rootNodeIndex = static_cast<int>(btSwapEndian(m_SubtreeHeaders[i].m_rootNodeIndex));
-			targetBvh->m_SubtreeHeaders[i].m_subtreeSize = static_cast<int>(btSwapEndian(m_SubtreeHeaders[i].m_subtreeSize));
-		}
-	}
-	else
-	{
-		for (int i = 0; i < m_subtreeHeaderCount; i++)
-		{
-			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMin[0] = (m_SubtreeHeaders[i].m_quantizedAabbMin[0]);
-			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMin[1] = (m_SubtreeHeaders[i].m_quantizedAabbMin[1]);
-			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMin[2] = (m_SubtreeHeaders[i].m_quantizedAabbMin[2]);
-
-			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMax[0] = (m_SubtreeHeaders[i].m_quantizedAabbMax[0]);
-			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMax[1] = (m_SubtreeHeaders[i].m_quantizedAabbMax[1]);
-			targetBvh->m_SubtreeHeaders[i].m_quantizedAabbMax[2] = (m_SubtreeHeaders[i].m_quantizedAabbMax[2]);
-
-			targetBvh->m_SubtreeHeaders[i].m_rootNodeIndex = (m_SubtreeHeaders[i].m_rootNodeIndex);
-			targetBvh->m_SubtreeHeaders[i].m_subtreeSize = (m_SubtreeHeaders[i].m_subtreeSize);
-			targetBvh->m_SubtreeHeaders[i] = m_SubtreeHeaders[i];
-		}
-	}
-
-	nodeData += sizeof(btBvhSubtreeInfo) * m_subtreeHeaderCount;
-
-	return true;
-}
-
-btQuantizedBvh *btQuantizedBvh::deSerializeInPlace(void *i_alignedDataBuffer, unsigned int i_dataBufferSize, bool i_swapEndian)
-{
-
-	if (i_alignedDataBuffer == NULL)// || (((unsigned)i_alignedDataBuffer & BVH_ALIGNMENT_MASK) != 0))
-	{
-		return NULL;
-	}
-	btQuantizedBvh *bvh = (btQuantizedBvh *)i_alignedDataBuffer;
-
-	if (i_swapEndian)
-	{
-		bvh->m_curNodeIndex = static_cast<int>(btSwapEndian(bvh->m_curNodeIndex));
-
-		btUnSwapVector3Endian(bvh->m_bvhAabbMin);
-		btUnSwapVector3Endian(bvh->m_bvhAabbMax);
-		btUnSwapVector3Endian(bvh->m_bvhQuantization);
-
-		bvh->m_traversalMode = (btTraversalMode)btSwapEndian(bvh->m_traversalMode);
-		bvh->m_subtreeHeaderCount = static_cast<int>(btSwapEndian(bvh->m_subtreeHeaderCount));
-	}
-
-	unsigned int calculatedBufSize = bvh->calculateSerializeBufferSize();
-	btAssert(calculatedBufSize <= i_dataBufferSize);
-
-	if (calculatedBufSize > i_dataBufferSize)
-	{
-		return NULL;
-	}
-
-	unsigned char *nodeData = (unsigned char *)bvh;
-	nodeData += sizeof(btQuantizedBvh);
-	
-	unsigned sizeToAdd = 0;//(BVH_ALIGNMENT-((unsigned)nodeData & BVH_ALIGNMENT_MASK))&BVH_ALIGNMENT_MASK;
-	nodeData += sizeToAdd;
-	
-	int nodeCount = bvh->m_curNodeIndex;
-
-	// Must call placement new to fill in virtual function table, etc, but we don't want to overwrite most data, so call a special version of the constructor
-	// Also, m_leafNodes and m_quantizedLeafNodes will be initialized to default values by the constructor
-	new (bvh) btQuantizedBvh(*bvh, false);
-
-	if (bvh->m_useQuantization)
-	{
-		bvh->m_quantizedContiguousNodes.initializeFromBuffer(nodeData, nodeCount, nodeCount);
-
-		if (i_swapEndian)
-		{
-			for (int nodeIndex = 0; nodeIndex < nodeCount; nodeIndex++)
-			{
-				bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[0] = btSwapEndian(bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[0]);
-				bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[1] = btSwapEndian(bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[1]);
-				bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[2] = btSwapEndian(bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[2]);
-
-				bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[0] = btSwapEndian(bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[0]);
-				bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[1] = btSwapEndian(bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[1]);
-				bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[2] = btSwapEndian(bvh->m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[2]);
-
-				bvh->m_quantizedContiguousNodes[nodeIndex].m_escapeIndexOrTriangleIndex = static_cast<int>(btSwapEndian(bvh->m_quantizedContiguousNodes[nodeIndex].m_escapeIndexOrTriangleIndex));
-			}
-		}
-		nodeData += sizeof(btQuantizedBvhNode) * nodeCount;
-	}
-	else
-	{
-		bvh->m_contiguousNodes.initializeFromBuffer(nodeData, nodeCount, nodeCount);
-
-		if (i_swapEndian)
-		{
-			for (int nodeIndex = 0; nodeIndex < nodeCount; nodeIndex++)
-			{
-				btUnSwapVector3Endian(bvh->m_contiguousNodes[nodeIndex].m_aabbMinOrg);
-				btUnSwapVector3Endian(bvh->m_contiguousNodes[nodeIndex].m_aabbMaxOrg);
-				
-				bvh->m_contiguousNodes[nodeIndex].m_escapeIndex = static_cast<int>(btSwapEndian(bvh->m_contiguousNodes[nodeIndex].m_escapeIndex));
-				bvh->m_contiguousNodes[nodeIndex].m_subPart = static_cast<int>(btSwapEndian(bvh->m_contiguousNodes[nodeIndex].m_subPart));
-				bvh->m_contiguousNodes[nodeIndex].m_triangleIndex = static_cast<int>(btSwapEndian(bvh->m_contiguousNodes[nodeIndex].m_triangleIndex));
-			}
-		}
-		nodeData += sizeof(btOptimizedBvhNode) * nodeCount;
-	}
-
-	sizeToAdd = 0;//(BVH_ALIGNMENT-((unsigned)nodeData & BVH_ALIGNMENT_MASK))&BVH_ALIGNMENT_MASK;
-	nodeData += sizeToAdd;
-
-	// Now serialize the subtree headers
-	bvh->m_SubtreeHeaders.initializeFromBuffer(nodeData, bvh->m_subtreeHeaderCount, bvh->m_subtreeHeaderCount);
-	if (i_swapEndian)
-	{
-		for (int i = 0; i < bvh->m_subtreeHeaderCount; i++)
-		{
-			bvh->m_SubtreeHeaders[i].m_quantizedAabbMin[0] = btSwapEndian(bvh->m_SubtreeHeaders[i].m_quantizedAabbMin[0]);
-			bvh->m_SubtreeHeaders[i].m_quantizedAabbMin[1] = btSwapEndian(bvh->m_SubtreeHeaders[i].m_quantizedAabbMin[1]);
-			bvh->m_SubtreeHeaders[i].m_quantizedAabbMin[2] = btSwapEndian(bvh->m_SubtreeHeaders[i].m_quantizedAabbMin[2]);
-
-			bvh->m_SubtreeHeaders[i].m_quantizedAabbMax[0] = btSwapEndian(bvh->m_SubtreeHeaders[i].m_quantizedAabbMax[0]);
-			bvh->m_SubtreeHeaders[i].m_quantizedAabbMax[1] = btSwapEndian(bvh->m_SubtreeHeaders[i].m_quantizedAabbMax[1]);
-			bvh->m_SubtreeHeaders[i].m_quantizedAabbMax[2] = btSwapEndian(bvh->m_SubtreeHeaders[i].m_quantizedAabbMax[2]);
-
-			bvh->m_SubtreeHeaders[i].m_rootNodeIndex = static_cast<int>(btSwapEndian(bvh->m_SubtreeHeaders[i].m_rootNodeIndex));
-			bvh->m_SubtreeHeaders[i].m_subtreeSize = static_cast<int>(btSwapEndian(bvh->m_SubtreeHeaders[i].m_subtreeSize));
-		}
-	}
-
-	return bvh;
-}
-
-// Constructor that prevents btVector3's default constructor from being called
-btQuantizedBvh::btQuantizedBvh(btQuantizedBvh &self, bool /* ownsMemory */) :
-m_bvhAabbMin(self.m_bvhAabbMin),
-m_bvhAabbMax(self.m_bvhAabbMax),
-m_bvhQuantization(self.m_bvhQuantization)
-{
-
-
-}
-
-
-
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
deleted file mode 100644
index 8a149b533fa..00000000000
--- a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
+++ /dev/null
@@ -1,486 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-#ifndef QUANTIZED_BVH_H
-#define QUANTIZED_BVH_H
-
-//#define DEBUG_CHECK_DEQUANTIZATION 1
-#ifdef DEBUG_CHECK_DEQUANTIZATION
-#ifdef __SPU__
-#define printf spu_printf
-#endif //__SPU__
-
-#include <stdio.h>
-#include <stdlib.h>
-#endif //DEBUG_CHECK_DEQUANTIZATION
-
-#include "LinearMath/btVector3.h"
-#include "LinearMath/btAlignedAllocator.h"
-
-
-//http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclang/html/vclrf__m128.asp
-
-
-//Note: currently we have 16 bytes per quantized node
-#define MAX_SUBTREE_SIZE_IN_BYTES  2048
-
-// 10 gives the potential for 1024 parts, with at most 2^21 (2097152) (minus one
-// actually) triangles each (since the sign bit is reserved
-#define MAX_NUM_PARTS_IN_BITS 10
-
-///btQuantizedBvhNode is a compressed aabb node, 16 bytes.
-///Node can be used for leafnode or internal node. Leafnodes can point to 32-bit triangle index (non-negative range).
-ATTRIBUTE_ALIGNED16	(struct) btQuantizedBvhNode
-{
-	BT_DECLARE_ALIGNED_ALLOCATOR();
-
-	//12 bytes
-	unsigned short int	m_quantizedAabbMin[3];
-	unsigned short int	m_quantizedAabbMax[3];
-	//4 bytes
-	int	m_escapeIndexOrTriangleIndex;
-
-	bool isLeafNode() const
-	{
-		//skipindex is negative (internal node), triangleindex >=0 (leafnode)
-		return (m_escapeIndexOrTriangleIndex >= 0);
-	}
-	int getEscapeIndex() const
-	{
-		btAssert(!isLeafNode());
-		return -m_escapeIndexOrTriangleIndex;
-	}
-	int	getTriangleIndex() const
-	{
-		btAssert(isLeafNode());
-		// Get only the lower bits where the triangle index is stored
-		return (m_escapeIndexOrTriangleIndex&~((~0)<<(31-MAX_NUM_PARTS_IN_BITS)));
-	}
-	int	getPartId() const
-	{
-		btAssert(isLeafNode());
-		// Get only the highest bits where the part index is stored
-		return (m_escapeIndexOrTriangleIndex>>(31-MAX_NUM_PARTS_IN_BITS));
-	}
-}
-;
-
-/// btOptimizedBvhNode contains both internal and leaf node information.
-/// Total node size is 44 bytes / node. You can use the compressed version of 16 bytes.
-ATTRIBUTE_ALIGNED16 (struct) btOptimizedBvhNode
-{
-	BT_DECLARE_ALIGNED_ALLOCATOR();
-
-	//32 bytes
-	btVector3	m_aabbMinOrg;
-	btVector3	m_aabbMaxOrg;
-
-	//4
-	int	m_escapeIndex;
-
-	//8
-	//for child nodes
-	int	m_subPart;
-	int	m_triangleIndex;
-	int	m_padding[5];//bad, due to alignment
-
-
-};
-
-
-///btBvhSubtreeInfo provides info to gather a subtree of limited size
-ATTRIBUTE_ALIGNED16(class) btBvhSubtreeInfo
-{
-public:
-	BT_DECLARE_ALIGNED_ALLOCATOR();
-
-	//12 bytes
-	unsigned short int	m_quantizedAabbMin[3];
-	unsigned short int	m_quantizedAabbMax[3];
-	//4 bytes, points to the root of the subtree
-	int			m_rootNodeIndex;
-	//4 bytes
-	int			m_subtreeSize;
-	int			m_padding[3];
-
-	btBvhSubtreeInfo()
-	{
-		//memset(&m_padding[0], 0, sizeof(m_padding));
-	}
-
-
-	void	setAabbFromQuantizeNode(const btQuantizedBvhNode& quantizedNode)
-	{
-		m_quantizedAabbMin[0] = quantizedNode.m_quantizedAabbMin[0];
-		m_quantizedAabbMin[1] = quantizedNode.m_quantizedAabbMin[1];
-		m_quantizedAabbMin[2] = quantizedNode.m_quantizedAabbMin[2];
-		m_quantizedAabbMax[0] = quantizedNode.m_quantizedAabbMax[0];
-		m_quantizedAabbMax[1] = quantizedNode.m_quantizedAabbMax[1];
-		m_quantizedAabbMax[2] = quantizedNode.m_quantizedAabbMax[2];
-	}
-}
-;
-
-
-class btNodeOverlapCallback
-{
-public:
-	virtual ~btNodeOverlapCallback() {};
-
-	virtual void processNode(int subPart, int triangleIndex) = 0;
-};
-
-#include "LinearMath/btAlignedAllocator.h"
-#include "LinearMath/btAlignedObjectArray.h"
-
-
-
-///for code readability:
-typedef btAlignedObjectArray<btOptimizedBvhNode>	NodeArray;
-typedef btAlignedObjectArray<btQuantizedBvhNode>	QuantizedNodeArray;
-typedef btAlignedObjectArray<btBvhSubtreeInfo>		BvhSubtreeInfoArray;
-
-
-///The btQuantizedBvh class stores an AABB tree that can be quickly traversed on CPU and Cell SPU.
-///It is used by the btBvhTriangleMeshShape as midphase, and by the btMultiSapBroadphase.
-///It is recommended to use quantization for better performance and lower memory requirements.
-ATTRIBUTE_ALIGNED16(class) btQuantizedBvh
-{
-protected:
-
-	NodeArray			m_leafNodes;
-	NodeArray			m_contiguousNodes;
-
-	QuantizedNodeArray	m_quantizedLeafNodes;
-	
-	QuantizedNodeArray	m_quantizedContiguousNodes;
-	
-	int					m_curNodeIndex;
-
-
-	//quantization data
-	bool				m_useQuantization;
-	btVector3			m_bvhAabbMin;
-	btVector3			m_bvhAabbMax;
-	btVector3			m_bvhQuantization;
-public:
-	BT_DECLARE_ALIGNED_ALLOCATOR();
-
-	enum btTraversalMode
-	{
-		TRAVERSAL_STACKLESS = 0,
-		TRAVERSAL_STACKLESS_CACHE_FRIENDLY,
-		TRAVERSAL_RECURSIVE
-	};
-protected:
-
-	btTraversalMode	m_traversalMode;
-	
-	BvhSubtreeInfoArray		m_SubtreeHeaders;
-
-	//This is only used for serialization so we don't have to add serialization directly to btAlignedObjectArray
-	int m_subtreeHeaderCount;
-
-
-	///two versions, one for quantized and normal nodes. This allows code-reuse while maintaining readability (no template/macro!)
-	///this might be refactored into a virtual, it is usually not calculated at run-time
-	void	setInternalNodeAabbMin(int nodeIndex, const btVector3& aabbMin)
-	{
-		if (m_useQuantization)
-		{
-			quantize(&m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[0] ,aabbMin,0);
-		} else
-		{
-			m_contiguousNodes[nodeIndex].m_aabbMinOrg = aabbMin;
-
-		}
-	}
-	void	setInternalNodeAabbMax(int nodeIndex,const btVector3& aabbMax)
-	{
-		if (m_useQuantization)
-		{
-			quantize(&m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[0],aabbMax,1);
-		} else
-		{
-			m_contiguousNodes[nodeIndex].m_aabbMaxOrg = aabbMax;
-		}
-	}
-
-	btVector3 getAabbMin(int nodeIndex) const
-	{
-		if (m_useQuantization)
-		{
-			return unQuantize(&m_quantizedLeafNodes[nodeIndex].m_quantizedAabbMin[0]);
-		}
-		//non-quantized
-		return m_leafNodes[nodeIndex].m_aabbMinOrg;
-
-	}
-	btVector3 getAabbMax(int nodeIndex) const
-	{
-		if (m_useQuantization)
-		{
-			return unQuantize(&m_quantizedLeafNodes[nodeIndex].m_quantizedAabbMax[0]);
-		} 
-		//non-quantized
-		return m_leafNodes[nodeIndex].m_aabbMaxOrg;
-		
-	}
-
-	
-	void	setInternalNodeEscapeIndex(int nodeIndex, int escapeIndex)
-	{
-		if (m_useQuantization)
-		{
-			m_quantizedContiguousNodes[nodeIndex].m_escapeIndexOrTriangleIndex = -escapeIndex;
-		} 
-		else
-		{
-			m_contiguousNodes[nodeIndex].m_escapeIndex = escapeIndex;
-		}
-
-	}
-
-	void mergeInternalNodeAabb(int nodeIndex,const btVector3& newAabbMin,const btVector3& newAabbMax) 
-	{
-		if (m_useQuantization)
-		{
-			unsigned short int quantizedAabbMin[3];
-			unsigned short int quantizedAabbMax[3];
-			quantize(quantizedAabbMin,newAabbMin,0);
-			quantize(quantizedAabbMax,newAabbMax,1);
-			for (int i=0;i<3;i++)
-			{
-				if (m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[i] > quantizedAabbMin[i])
-					m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[i] = quantizedAabbMin[i];
-
-				if (m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[i] < quantizedAabbMax[i])
-					m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[i] = quantizedAabbMax[i];
-
-			}
-		} else
-		{
-			//non-quantized
-			m_contiguousNodes[nodeIndex].m_aabbMinOrg.setMin(newAabbMin);
-			m_contiguousNodes[nodeIndex].m_aabbMaxOrg.setMax(newAabbMax);		
-		}
-	}
-
-	void	swapLeafNodes(int firstIndex,int secondIndex);
-
-	void	assignInternalNodeFromLeafNode(int internalNode,int leafNodeIndex);
-
-protected:
-
-	
-
-	void	buildTree	(int startIndex,int endIndex);
-
-	int	calcSplittingAxis(int startIndex,int endIndex);
-
-	int	sortAndCalcSplittingIndex(int startIndex,int endIndex,int splitAxis);
-	
-	void	walkStacklessTree(btNodeOverlapCallback* nodeCallback,const btVector3& aabbMin,const btVector3& aabbMax) const;
-
-	void	walkStacklessQuantizedTreeAgainstRay(btNodeOverlapCallback* nodeCallback, const btVector3& raySource, const btVector3& rayTarget, const btVector3& aabbMin, const btVector3& aabbMax, int startNodeIndex,int endNodeIndex) const;
-	void	walkStacklessQuantizedTree(btNodeOverlapCallback* nodeCallback,unsigned short int* quantizedQueryAabbMin,unsigned short int* quantizedQueryAabbMax,int startNodeIndex,int endNodeIndex) const;
-
-	///tree traversal designed for small-memory processors like PS3 SPU
-	void	walkStacklessQuantizedTreeCacheFriendly(btNodeOverlapCallback* nodeCallback,unsigned short int* quantizedQueryAabbMin,unsigned short int* quantizedQueryAabbMax) const;
-
-	///use the 16-byte stackless 'skipindex' node tree to do a recursive traversal
-	void	walkRecursiveQuantizedTreeAgainstQueryAabb(const btQuantizedBvhNode* currentNode,btNodeOverlapCallback* nodeCallback,unsigned short int* quantizedQueryAabbMin,unsigned short int* quantizedQueryAabbMax) const;
-
-	///use the 16-byte stackless 'skipindex' node tree to do a recursive traversal
-	void	walkRecursiveQuantizedTreeAgainstQuantizedTree(const btQuantizedBvhNode* treeNodeA,const btQuantizedBvhNode* treeNodeB,btNodeOverlapCallback* nodeCallback) const;
-	
-
-#define USE_BANCHLESS 1
-#ifdef USE_BANCHLESS
-	//This block replaces the block below and uses no branches, and replaces the 8 bit return with a 32 bit return for improved performance (~3x on XBox 360)
-	SIMD_FORCE_INLINE unsigned testQuantizedAabbAgainstQuantizedAabb(unsigned short int* aabbMin1,unsigned short int* aabbMax1,const unsigned short int* aabbMin2,const unsigned short int* aabbMax2) const
-	{		
-		return static_cast<unsigned int>(btSelect((unsigned)((aabbMin1[0] <= aabbMax2[0]) & (aabbMax1[0] >= aabbMin2[0])
-			& (aabbMin1[2] <= aabbMax2[2]) & (aabbMax1[2] >= aabbMin2[2])
-			& (aabbMin1[1] <= aabbMax2[1]) & (aabbMax1[1] >= aabbMin2[1])),
-			1, 0));
-	}
-#else
-	SIMD_FORCE_INLINE bool testQuantizedAabbAgainstQuantizedAabb(unsigned short int* aabbMin1,unsigned short int* aabbMax1,const unsigned short int* aabbMin2,const unsigned short int* aabbMax2) const
-	{
-		bool overlap = true;
-		overlap = (aabbMin1[0] > aabbMax2[0] || aabbMax1[0] < aabbMin2[0]) ? false : overlap;
-		overlap = (aabbMin1[2] > aabbMax2[2] || aabbMax1[2] < aabbMin2[2]) ? false : overlap;
-		overlap = (aabbMin1[1] > aabbMax2[1] || aabbMax1[1] < aabbMin2[1]) ? false : overlap;
-		return overlap;
-	}
-#endif //USE_BANCHLESS
-
-	void	updateSubtreeHeaders(int leftChildNodexIndex,int rightChildNodexIndex);
-
-public:
-	btQuantizedBvh();
-
-	virtual ~btQuantizedBvh();
-
-	
-	///***************************************** expert/internal use only *************************
-	void	setQuantizationValues(const btVector3& bvhAabbMin,const btVector3& bvhAabbMax,btScalar quantizationMargin=btScalar(1.0));
-	QuantizedNodeArray&	getLeafNodeArray() {			return	m_quantizedLeafNodes;	}
-	///buildInternal is expert use only: assumes that setQuantizationValues and LeafNodeArray are initialized
-	void	buildInternal();
-	///***************************************** expert/internal use only *************************
-
-	void	reportAabbOverlappingNodex(btNodeOverlapCallback* nodeCallback,const btVector3& aabbMin,const btVector3& aabbMax) const;
-	void	reportRayOverlappingNodex (btNodeOverlapCallback* nodeCallback, const btVector3& raySource, const btVector3& rayTarget) const;
-	void	reportBoxCastOverlappingNodex(btNodeOverlapCallback* nodeCallback, const btVector3& raySource, const btVector3& rayTarget, const btVector3& aabbMin,const btVector3& aabbMax) const;
-
-		SIMD_FORCE_INLINE void quantize(unsigned short* out, const btVector3& point,int isMax) const
-	{
-
-		btAssert(m_useQuantization);
-
-		btAssert(point.getX() <= m_bvhAabbMax.getX());
-		btAssert(point.getY() <= m_bvhAabbMax.getY());
-		btAssert(point.getZ() <= m_bvhAabbMax.getZ());
-
-		btAssert(point.getX() >= m_bvhAabbMin.getX());
-		btAssert(point.getY() >= m_bvhAabbMin.getY());
-		btAssert(point.getZ() >= m_bvhAabbMin.getZ());
-
-		btVector3 v = (point - m_bvhAabbMin) * m_bvhQuantization;
-		///Make sure rounding is done in a way that unQuantize(quantizeWithClamp(...)) is conservative
-		///end-points always set the first bit, so that they are sorted properly (so that neighbouring AABBs overlap properly)
-		///todo: double-check this
-		if (isMax)
-		{
-			out[0] = (unsigned short) (((unsigned short)(v.getX()+btScalar(1.)) | 1));
-			out[1] = (unsigned short) (((unsigned short)(v.getY()+btScalar(1.)) | 1));
-			out[2] = (unsigned short) (((unsigned short)(v.getZ()+btScalar(1.)) | 1));
-		} else
-		{
-			out[0] = (unsigned short) (((unsigned short)(v.getX()) & 0xfffe));
-			out[1] = (unsigned short) (((unsigned short)(v.getY()) & 0xfffe));
-			out[2] = (unsigned short) (((unsigned short)(v.getZ()) & 0xfffe));
-		}
-
-
-#ifdef DEBUG_CHECK_DEQUANTIZATION
-		btVector3 newPoint = unQuantize(out);
-		if (isMax)
-		{
-			if (newPoint.getX() < point.getX())
-			{
-				printf("unconservative X, diffX = %f, oldX=%f,newX=%f\n",newPoint.getX()-point.getX(), newPoint.getX(),point.getX());
-			}
-			if (newPoint.getY() < point.getY())
-			{
-				printf("unconservative Y, diffY = %f, oldY=%f,newY=%f\n",newPoint.getY()-point.getY(), newPoint.getY(),point.getY());
-			}
-			if (newPoint.getZ() < point.getZ())
-			{
-
-				printf("unconservative Z, diffZ = %f, oldZ=%f,newZ=%f\n",newPoint.getZ()-point.getZ(), newPoint.getZ(),point.getZ());
-			}
-		} else
-		{
-			if (newPoint.getX() > point.getX())
-			{
-				printf("unconservative X, diffX = %f, oldX=%f,newX=%f\n",newPoint.getX()-point.getX(), newPoint.getX(),point.getX());
-			}
-			if (newPoint.getY() > point.getY())
-			{
-				printf("unconservative Y, diffY = %f, oldY=%f,newY=%f\n",newPoint.getY()-point.getY(), newPoint.getY(),point.getY());
-			}
-			if (newPoint.getZ() > point.getZ())
-			{
-				printf("unconservative Z, diffZ = %f, oldZ=%f,newZ=%f\n",newPoint.getZ()-point.getZ(), newPoint.getZ(),point.getZ());
-			}
-		}
-#endif //DEBUG_CHECK_DEQUANTIZATION
-
-	}
-
-
-	SIMD_FORCE_INLINE void quantizeWithClamp(unsigned short* out, const btVector3& point2,int isMax) const
-	{
-
-		btAssert(m_useQuantization);
-
-		btVector3 clampedPoint(point2);
-		clampedPoint.setMax(m_bvhAabbMin);
-		clampedPoint.setMin(m_bvhAabbMax);
-
-		quantize(out,clampedPoint,isMax);
-
-	}
-	
-	SIMD_FORCE_INLINE btVector3	unQuantize(const unsigned short* vecIn) const
-	{
-			btVector3	vecOut;
-			vecOut.setValue(
-			(btScalar)(vecIn[0]) / (m_bvhQuantization.getX()),
-			(btScalar)(vecIn[1]) / (m_bvhQuantization.getY()),
-			(btScalar)(vecIn[2]) / (m_bvhQuantization.getZ()));
-			vecOut += m_bvhAabbMin;
-			return vecOut;
-	}
-
-	///setTraversalMode let's you choose between stackless, recursive or stackless cache friendly tree traversal. Note this is only implemented for quantized trees.
-	void	setTraversalMode(btTraversalMode	traversalMode)
-	{
-		m_traversalMode = traversalMode;
-	}
-
-
-	SIMD_FORCE_INLINE QuantizedNodeArray&	getQuantizedNodeArray()
-	{	
-		return	m_quantizedContiguousNodes;
-	}
-
-
-	SIMD_FORCE_INLINE BvhSubtreeInfoArray&	getSubtreeInfoArray()
-	{
-		return m_SubtreeHeaders;
-	}
-
-
-	/////Calculate space needed to store BVH for serialization
-	unsigned calculateSerializeBufferSize();
-
-	/// Data buffer MUST be 16 byte aligned
-	virtual bool serialize(void *o_alignedDataBuffer, unsigned i_dataBufferSize, bool i_swapEndian);
-
-	///deSerializeInPlace loads and initializes a BVH from a buffer in memory 'in place'
-	static btQuantizedBvh *deSerializeInPlace(void *i_alignedDataBuffer, unsigned int i_dataBufferSize, bool i_swapEndian);
-
-	static unsigned int getAlignmentSerializationPadding();
-
-	SIMD_FORCE_INLINE bool isQuantized()
-	{
-		return m_useQuantization;
-	}
-
-private:
-	// Special "copy" constructor that allows for in-place deserialization
-	// Prevents btVector3's default constructor from being called, but doesn't inialize much else
-	// ownsMemory should most likely be false if deserializing, and if you are not, don't call this (it also changes the function signature, which we need)
-	btQuantizedBvh(btQuantizedBvh &other, bool ownsMemory);
-
-}
-;
-
-
-#endif //QUANTIZED_BVH_H
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp
index 2d27f22567f..30bcbe0c5f1 100644
--- a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp
+++ b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp
@@ -14,86 +14,83 @@ subject to the following restrictions:
 */
 
 #include "btSimpleBroadphase.h"
-#include "BulletCollision/BroadphaseCollision/btDispatcher.h"
-#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
+#include <BulletCollision/BroadphaseCollision/btDispatcher.h>
+#include <BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h>
 
 #include "LinearMath/btVector3.h"
 #include "LinearMath/btTransform.h"
 #include "LinearMath/btMatrix3x3.h"
 #include <new>
 
-extern int gOverlappingPairs;
 
 void	btSimpleBroadphase::validate()
 {
-	for (int i=0;i<m_numHandles;i++)
+	for (int i=0;i<m_numProxies;i++)
 	{
-		for (int j=i+1;j<m_numHandles;j++)
+		for (int j=i+1;j<m_numProxies;j++)
 		{
-			btAssert(&m_pHandles[i] != &m_pHandles[j]);
+			assert(m_pProxies[i] != m_pProxies[j]);
 		}
 	}
 	
 }
 
-btSimpleBroadphase::btSimpleBroadphase(int maxProxies, btOverlappingPairCache* overlappingPairCache)
-	:m_pairCache(overlappingPairCache),
-	m_ownsPairCache(false),
-	m_invalidPair(0)
+btSimpleBroadphase::btSimpleBroadphase(int maxProxies)
+	:btOverlappingPairCache(),
+	m_firstFreeProxy(0),
+	m_numProxies(0),
+	m_maxProxies(maxProxies)
 {
 
-	if (!overlappingPairCache)
-	{
-		void* mem = btAlignedAlloc(sizeof(btHashedOverlappingPairCache),16);
-		m_pairCache = new (mem)btHashedOverlappingPairCache();
-		m_ownsPairCache = true;
-	}
-
-	// allocate handles buffer and put all handles on free list
-	m_pHandlesRawPtr = btAlignedAlloc(sizeof(btSimpleBroadphaseProxy)*maxProxies,16);
-	m_pHandles = new(m_pHandlesRawPtr) btSimpleBroadphaseProxy[maxProxies];
-	m_maxHandles = maxProxies;
-	m_numHandles = 0;
-	m_firstFreeHandle = 0;
-	m_firstAllocatedHandle = -1;
-
-	{
-		for (int i = m_firstFreeHandle; i < maxProxies; i++)
-		{
-			m_pHandles[i].SetNextFree(i + 1);
-			m_pHandles[i].m_uniqueId = i+2;//any UID will do, we just avoid too trivial values (0,1) for debugging purposes
-			m_pHandles[i].SetNextAllocated(-1);
-		}
-		m_pHandles[maxProxies - 1].SetNextFree(0);
-		m_pHandles[maxProxies - 1].SetNextAllocated(-1);
+	m_proxies = new btSimpleBroadphaseProxy[maxProxies];
+	m_freeProxies = new int[maxProxies];
+	m_pProxies = new btSimpleBroadphaseProxy*[maxProxies];
 	
-	}
 
+	int i;
+	for (i=0;i<m_maxProxies;i++)
+	{
+		m_freeProxies[i] = i;
+	}
 }
 
 btSimpleBroadphase::~btSimpleBroadphase()
 {
-	btAlignedFree(m_pHandlesRawPtr);
+	delete[] m_proxies;
+	delete []m_freeProxies;
+	delete [] m_pProxies;
 
-	if (m_ownsPairCache)
+	/*int i;
+	for (i=m_numProxies-1;i>=0;i--)
 	{
-		m_pairCache->~btOverlappingPairCache();
-		btAlignedFree(m_pairCache);
+		BP_Proxy* proxy = m_pProxies[i]; 
+		destroyProxy(proxy);
 	}
+	*/
 }
 
 
-btBroadphaseProxy*	btSimpleBroadphase::createProxy(  const btVector3& aabbMin,  const btVector3& aabbMax,int shapeType,void* userPtr ,short int collisionFilterGroup,short int collisionFilterMask, btDispatcher* /*dispatcher*/,void* multiSapProxy)
+btBroadphaseProxy*	btSimpleBroadphase::createProxy(  const btVector3& min,  const btVector3& max,int shapeType,void* userPtr ,short int collisionFilterGroup,short int collisionFilterMask)
 {
-	if (m_numHandles >= m_maxHandles)
+	if (m_numProxies >= m_maxProxies)
 	{
-		btAssert(0);
+		assert(0);
 		return 0; //should never happen, but don't let the game crash ;-)
 	}
-	assert(aabbMin[0]<= aabbMax[0] && aabbMin[1]<= aabbMax[1] && aabbMin[2]<= aabbMax[2]);
+	assert(min[0]<= max[0] && min[1]<= max[1] && min[2]<= max[2]);
 
-	int newHandleIndex = allocHandle();
-	btSimpleBroadphaseProxy* proxy = new (&m_pHandles[newHandleIndex])btSimpleBroadphaseProxy(aabbMin,aabbMax,shapeType,userPtr,collisionFilterGroup,collisionFilterMask,multiSapProxy);
+	int freeIndex= m_freeProxies[m_firstFreeProxy];
+	btSimpleBroadphaseProxy* proxy = new (&m_proxies[freeIndex])btSimpleBroadphaseProxy(min,max,shapeType,userPtr,collisionFilterGroup,collisionFilterMask);
+	m_firstFreeProxy++;
+
+	btSimpleBroadphaseProxy* proxy1 = &m_proxies[0];
+		
+	int	index = int(proxy - proxy1);
+	btAssert(index == freeIndex);
+
+	m_pProxies[m_numProxies] = proxy;
+	m_numProxies++;
+	//validate();
 
 	return proxy;
 }
@@ -127,19 +124,34 @@ protected:
 	};
 };
 
-void	btSimpleBroadphase::destroyProxy(btBroadphaseProxy* proxyOrg,btDispatcher* dispatcher)
+void	btSimpleBroadphase::destroyProxy(btBroadphaseProxy* proxyOrg)
 {
 		
+		int i;
+		
 		btSimpleBroadphaseProxy* proxy0 = static_cast<btSimpleBroadphaseProxy*>(proxyOrg);
-		freeHandle(proxy0);
-
-		m_pairCache->removeOverlappingPairsContainingProxy(proxyOrg,dispatcher);
+		btSimpleBroadphaseProxy* proxy1 = &m_proxies[0];
+	
+		int index = int(proxy0 - proxy1);
+		btAssert (index < m_maxProxies);
+		m_freeProxies[--m_firstFreeProxy] = index;
 
+		removeOverlappingPairsContainingProxy(proxyOrg);
+		
+		for (i=0;i<m_numProxies;i++)
+		{
+			if (m_pProxies[i] == proxyOrg)
+			{
+				m_pProxies[i] = m_pProxies[m_numProxies-1];
+				break;
+			}
+		}
+		m_numProxies--;
 		//validate();
 		
 }
 
-void	btSimpleBroadphase::setAabb(btBroadphaseProxy* proxy,const btVector3& aabbMin,const btVector3& aabbMax, btDispatcher* /*dispatcher*/)
+void	btSimpleBroadphase::setAabb(btBroadphaseProxy* proxy,const btVector3& aabbMin,const btVector3& aabbMax)
 {
 	btSimpleBroadphaseProxy* sbp = getSimpleProxyFromProxy(proxy);
 	sbp->m_min = aabbMin;
@@ -174,137 +186,37 @@ public:
 	}
 };
 
-void	btSimpleBroadphase::calculateOverlappingPairs(btDispatcher* dispatcher)
+void	btSimpleBroadphase::refreshOverlappingPairs()
 {
 	//first check for new overlapping pairs
 	int i,j;
 
-	if (m_firstAllocatedHandle >= 0)
+	for (i=0;i<m_numProxies;i++)
 	{
-
-		btSimpleBroadphaseProxy* proxy0 = &m_pHandles[m_firstAllocatedHandle];
-
-		for (i=0;i<m_numHandles;i++)
+		btBroadphaseProxy* proxy0 = m_pProxies[i];
+		for (j=i+1;j<m_numProxies;j++)
 		{
-			btSimpleBroadphaseProxy* proxy1 = &m_pHandles[m_firstAllocatedHandle];
+			btBroadphaseProxy* proxy1 = m_pProxies[j];
+			btSimpleBroadphaseProxy* p0 = getSimpleProxyFromProxy(proxy0);
+			btSimpleBroadphaseProxy* p1 = getSimpleProxyFromProxy(proxy1);
 
-			for (j=0;j<m_numHandles;j++)
+			if (aabbOverlap(p0,p1))
 			{
-				
-				if (proxy0 != proxy1)
+				if ( !findPair(proxy0,proxy1))
 				{
-					btSimpleBroadphaseProxy* p0 = getSimpleProxyFromProxy(proxy0);
-					btSimpleBroadphaseProxy* p1 = getSimpleProxyFromProxy(proxy1);
-
-					if (aabbOverlap(p0,p1))
-					{
-						if ( !m_pairCache->findPair(proxy0,proxy1))
-						{
-							m_pairCache->addOverlappingPair(proxy0,proxy1);
-						}
-					} else
-					{
-					if (!m_pairCache->hasDeferredRemoval())
-					{
-						if ( m_pairCache->findPair(proxy0,proxy1))
-						{
-							m_pairCache->removeOverlappingPair(proxy0,proxy1,dispatcher);
-						}
-					}
-
-					}
+					addOverlappingPair(proxy0,proxy1);
 				}
-				proxy1 = &m_pHandles[proxy1->GetNextAllocated()];
-
 			}
-			proxy0 = &m_pHandles[proxy0->GetNextAllocated()];
-
-		}
-
-		if (m_ownsPairCache && m_pairCache->hasDeferredRemoval())
-		{
-			
-			btBroadphasePairArray&	overlappingPairArray = m_pairCache->getOverlappingPairArray();
-
-			//perform a sort, to find duplicates and to sort 'invalid' pairs to the end
-			overlappingPairArray.quickSort(btBroadphasePairSortPredicate());
-
-			overlappingPairArray.resize(overlappingPairArray.size() - m_invalidPair);
-			m_invalidPair = 0;
-
-
-			btBroadphasePair previousPair;
-			previousPair.m_pProxy0 = 0;
-			previousPair.m_pProxy1 = 0;
-			previousPair.m_algorithm = 0;
-			
-			
-			for (i=0;i<overlappingPairArray.size();i++)
-			{
-			
-				btBroadphasePair& pair = overlappingPairArray[i];
-
-				bool isDuplicate = (pair == previousPair);
-
-				previousPair = pair;
-
-				bool needsRemoval = false;
-
-				if (!isDuplicate)
-				{
-					bool hasOverlap = testAabbOverlap(pair.m_pProxy0,pair.m_pProxy1);
-
-					if (hasOverlap)
-					{
-						needsRemoval = false;//callback->processOverlap(pair);
-					} else
-					{
-						needsRemoval = true;
-					}
-				} else
-				{
-					//remove duplicate
-					needsRemoval = true;
-					//should have no algorithm
-					btAssert(!pair.m_algorithm);
-				}
-				
-				if (needsRemoval)
-				{
-					m_pairCache->cleanOverlappingPair(pair,dispatcher);
-
-			//		m_overlappingPairArray.swap(i,m_overlappingPairArray.size()-1);
-			//		m_overlappingPairArray.pop_back();
-					pair.m_pProxy0 = 0;
-					pair.m_pProxy1 = 0;
-					m_invalidPair++;
-					gOverlappingPairs--;
-				} 
-				
-			}
-
-		///if you don't like to skip the invalid pairs in the array, execute following code:
-		#define CLEAN_INVALID_PAIRS 1
-		#ifdef CLEAN_INVALID_PAIRS
-
-			//perform a sort, to sort 'invalid' pairs to the end
-			overlappingPairArray.quickSort(btBroadphasePairSortPredicate());
-
-			overlappingPairArray.resize(overlappingPairArray.size() - m_invalidPair);
-			m_invalidPair = 0;
-		#endif//CLEAN_INVALID_PAIRS
 
 		}
 	}
+
+
+	CheckOverlapCallback	checkOverlap;
+
+	processAllOverlappingPairs(&checkOverlap);
+
+
 }
 
 
-bool btSimpleBroadphase::testAabbOverlap(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1)
-{
-	btSimpleBroadphaseProxy* p0 = getSimpleProxyFromProxy(proxy0);
-	btSimpleBroadphaseProxy* p1 = getSimpleProxyFromProxy(proxy1);
-	return aabbOverlap(p0,p1);
-}
-
-
-
diff --git a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h
index 49dfeb84900..fb155e7047c 100644
--- a/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h
+++ b/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h
@@ -24,78 +24,35 @@ struct btSimpleBroadphaseProxy : public btBroadphaseProxy
 {
 	btVector3	m_min;
 	btVector3	m_max;
-	int			m_nextFree;
-	int			m_nextAllocated;
-//	int			m_handleId;
-
 	
 	btSimpleBroadphaseProxy() {};
 
-	btSimpleBroadphaseProxy(const btPoint3& minpt,const btPoint3& maxpt,int shapeType,void* userPtr,short int collisionFilterGroup,short int collisionFilterMask,void* multiSapProxy)
-	:btBroadphaseProxy(userPtr,collisionFilterGroup,collisionFilterMask,multiSapProxy),
+	btSimpleBroadphaseProxy(const btPoint3& minpt,const btPoint3& maxpt,int shapeType,void* userPtr,short int collisionFilterGroup,short int collisionFilterMask)
+	:btBroadphaseProxy(userPtr,collisionFilterGroup,collisionFilterMask),
 	m_min(minpt),m_max(maxpt)		
 	{
 		(void)shapeType;
 	}
 	
-	
-	SIMD_FORCE_INLINE void SetNextFree(int next) {m_nextFree = next;}
-	SIMD_FORCE_INLINE int GetNextFree() const {return m_nextFree;}
-
-	SIMD_FORCE_INLINE void SetNextAllocated(int next) {m_nextAllocated = next;}
-	SIMD_FORCE_INLINE int GetNextAllocated() const {return m_nextAllocated;}
-
 
 };
 
-///The SimpleBroadphase is just a unit-test for btAxisSweep3, bt32BitAxisSweep3, or btDbvtBroadphase, so use those classes instead.
-///It is a brute force aabb culling broadphase based on O(n^2) aabb checks
-class btSimpleBroadphase : public btBroadphaseInterface
+///SimpleBroadphase is a brute force aabb culling broadphase based on O(n^2) aabb checks
+class btSimpleBroadphase : public btOverlappingPairCache
 {
 
 protected:
 
-	int		m_numHandles;						// number of active handles
-	int		m_maxHandles;						// max number of handles
-	btSimpleBroadphaseProxy* m_pHandles;						// handles pool
-	void* m_pHandlesRawPtr;
-	int		m_firstFreeHandle;		// free handles list
-	int		m_firstAllocatedHandle;
+	btSimpleBroadphaseProxy*	m_proxies;
+	int*				m_freeProxies;
+	int				m_firstFreeProxy;
 
-	int allocHandle()
-	{
+	btSimpleBroadphaseProxy** m_pProxies;
+	int				m_numProxies;
 
-		int freeHandle = m_firstFreeHandle;
-		m_firstFreeHandle = m_pHandles[freeHandle].GetNextFree();
-		
-		m_pHandles[freeHandle].SetNextAllocated(m_firstAllocatedHandle);
-		m_firstAllocatedHandle = freeHandle;
-		
-		m_numHandles++;
-
-		return freeHandle;
-	}
-
-	void freeHandle(btSimpleBroadphaseProxy* proxy)
-	{
-		int handle = int(proxy-m_pHandles);
-		btAssert(handle >= 0 && handle < m_maxHandles);
-
-		proxy->SetNextFree(m_firstFreeHandle);
-		m_firstFreeHandle = handle;
-
-		m_firstAllocatedHandle = proxy->GetNextAllocated();
-		proxy->SetNextAllocated(-1);
-
-		m_numHandles--;
-	}
-
-
-	btOverlappingPairCache*	m_pairCache;
-	bool	m_ownsPairCache;
-
-	int	m_invalidPair;
+	
 
+	int m_maxProxies;
 	
 	
 	inline btSimpleBroadphaseProxy*	getSimpleProxyFromProxy(btBroadphaseProxy* proxy)
@@ -110,48 +67,26 @@ protected:
 protected:
 
 
-	
-
+	virtual void	refreshOverlappingPairs();
 public:
-	btSimpleBroadphase(int maxProxies=16384,btOverlappingPairCache* overlappingPairCache=0);
+	btSimpleBroadphase(int maxProxies=16384);
 	virtual ~btSimpleBroadphase();
 
 
 		static bool	aabbOverlap(btSimpleBroadphaseProxy* proxy0,btSimpleBroadphaseProxy* proxy1);
 
 
-	virtual btBroadphaseProxy*	createProxy(  const btVector3& aabbMin,  const btVector3& aabbMax,int shapeType,void* userPtr ,short int collisionFilterGroup,short int collisionFilterMask, btDispatcher* dispatcher,void* multiSapProxy);
+	virtual btBroadphaseProxy*	createProxy(  const btVector3& min,  const btVector3& max,int shapeType,void* userPtr ,short int collisionFilterGroup,short int collisionFilterMask);
 
-	virtual void	calculateOverlappingPairs(btDispatcher* dispatcher);
 
-	virtual void	destroyProxy(btBroadphaseProxy* proxy,btDispatcher* dispatcher);
-	virtual void	setAabb(btBroadphaseProxy* proxy,const btVector3& aabbMin,const btVector3& aabbMax, btDispatcher* dispatcher);
+	virtual void	destroyProxy(btBroadphaseProxy* proxy);
+	virtual void	setAabb(btBroadphaseProxy* proxy,const btVector3& aabbMin,const btVector3& aabbMax);
 		
-	btOverlappingPairCache*	getOverlappingPairCache()
-	{
-		return m_pairCache;
-	}
-	const btOverlappingPairCache*	getOverlappingPairCache() const
-	{
-		return m_pairCache;
-	}
-
-	bool	testAabbOverlap(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1);
+	
+	
 
 
-	///getAabb returns the axis aligned bounding box in the 'global' coordinate frame
-	///will add some transform later
-	virtual void getBroadphaseAabb(btVector3& aabbMin,btVector3& aabbMax) const
-	{
-		aabbMin.setValue(-1e30f,-1e30f,-1e30f);
-		aabbMax.setValue(1e30f,1e30f,1e30f);
-	}
 
-	virtual void	printStats()
-	{
-//		printf("btSimpleBroadphase.h\n");
-//		printf("numHandles = %d, maxHandles = %d\n",m_numHandles,m_maxHandles);
-	}
 };
 
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp
index f6c1e32ac7c..81133670f0c 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp
@@ -26,7 +26,7 @@ m_triangle(triangle)
 
 }
 
-void	SphereTriangleDetector::getClosestPoints(const ClosestPointInput& input,Result& output,class btIDebugDraw* debugDraw,bool swapResults)
+void	SphereTriangleDetector::getClosestPoints(const ClosestPointInput& input,Result& output,class btIDebugDraw* debugDraw)
 {
 
 	(void)debugDraw;
@@ -42,16 +42,7 @@ void	SphereTriangleDetector::getClosestPoints(const ClosestPointInput& input,Res
 
 	if (collide(sphereInTr.getOrigin(),point,normal,depth,timeOfImpact))
 	{
-		if (swapResults)
-		{
-			btVector3 normalOnB = transformB.getBasis()*normal;
-			btVector3 normalOnA = -normalOnB;
-			btVector3 pointOnA = transformB*point+normalOnB*depth;
-			output.addContactPoint(normalOnA,pointOnA,depth);
-		} else
-		{
-			output.addContactPoint(transformB.getBasis()*normal,transformB*point,depth);
-		}
+		output.addContactPoint(transformB.getBasis()*normal,transformB*point,depth);
 	}
 
 }
@@ -62,8 +53,6 @@ void	SphereTriangleDetector::getClosestPoints(const ClosestPointInput& input,Res
 
 // See also geometrictools.com
 // Basic idea: D = |p - (lo + t0*lv)| where t0 = lv . (p - lo) / lv . lv
-btScalar SegmentSqrDistance(const btVector3& from, const btVector3& to,const btVector3 &p, btVector3 &nearest);
-
 btScalar SegmentSqrDistance(const btVector3& from, const btVector3& to,const btVector3 &p, btVector3 &nearest) {
 	btVector3 diff = p - from;
 	btVector3 v = to - from;
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.h
index 26dabaa480e..b32806a6846 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/SphereTriangleDetector.h
@@ -16,8 +16,8 @@ subject to the following restrictions:
 #ifndef SPHERE_TRIANGLE_DETECTOR_H
 #define SPHERE_TRIANGLE_DETECTOR_H
 
-#include "BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h"
-#include "LinearMath/btPoint3.h"
+#include "../NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h"
+#include "../../LinearMath/btPoint3.h"
 
 
 class btSphereShape;
@@ -28,7 +28,7 @@ class btTriangleShape;
 /// sphere-triangle to match the btDiscreteCollisionDetectorInterface
 struct SphereTriangleDetector : public btDiscreteCollisionDetectorInterface
 {
-	virtual void	getClosestPoints(const ClosestPointInput& input,Result& output,class btIDebugDraw* debugDraw,bool swapResults=false);
+	virtual void	getClosestPoints(const ClosestPointInput& input,Result& output,class btIDebugDraw* debugDraw);
 
 	SphereTriangleDetector(btSphereShape* sphere,btTriangleShape* triangle);
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp
deleted file mode 100644
index cd0c028012c..00000000000
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-#include "btBoxBoxCollisionAlgorithm.h"
-#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h"
-#include "BulletCollision/CollisionShapes/btBoxShape.h"
-#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
-#include "btBoxBoxDetector.h"
-
-#define USE_PERSISTENT_CONTACTS 1
-
-btBoxBoxCollisionAlgorithm::btBoxBoxCollisionAlgorithm(btPersistentManifold* mf,const btCollisionAlgorithmConstructionInfo& ci,btCollisionObject* obj0,btCollisionObject* obj1)
-: btCollisionAlgorithm(ci),
-m_ownManifold(false),
-m_manifoldPtr(mf)
-{
-	if (!m_manifoldPtr && m_dispatcher->needsCollision(obj0,obj1))
-	{
-		m_manifoldPtr = m_dispatcher->getNewManifold(obj0,obj1);
-		m_ownManifold = true;
-	}
-}
-
-btBoxBoxCollisionAlgorithm::~btBoxBoxCollisionAlgorithm()
-{
-	if (m_ownManifold)
-	{
-		if (m_manifoldPtr)
-			m_dispatcher->releaseManifold(m_manifoldPtr);
-	}
-}
-
-void btBoxBoxCollisionAlgorithm::processCollision (btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut)
-{
-	if (!m_manifoldPtr)
-		return;
-
-	btCollisionObject*	col0 = body0;
-	btCollisionObject*	col1 = body1;
-	btBoxShape* box0 = (btBoxShape*)col0->getCollisionShape();
-	btBoxShape* box1 = (btBoxShape*)col1->getCollisionShape();
-
-
-
-	/// report a contact. internally this will be kept persistent, and contact reduction is done
-	resultOut->setPersistentManifold(m_manifoldPtr);
-#ifndef USE_PERSISTENT_CONTACTS	
-	m_manifoldPtr->clearManifold();
-#endif //USE_PERSISTENT_CONTACTS
-
-	btDiscreteCollisionDetectorInterface::ClosestPointInput input;
-	input.m_maximumDistanceSquared = 1e30f;
-	input.m_transformA = body0->getWorldTransform();
-	input.m_transformB = body1->getWorldTransform();
-
-	btBoxBoxDetector detector(box0,box1);
-	detector.getClosestPoints(input,*resultOut,dispatchInfo.m_debugDraw);
-
-#ifdef USE_PERSISTENT_CONTACTS
-	//  refreshContactPoints is only necessary when using persistent contact points. otherwise all points are newly added
-	if (m_ownManifold)
-	{
-		resultOut->refreshContactPoints();
-	}
-#endif //USE_PERSISTENT_CONTACTS
-
-}
-
-btScalar btBoxBoxCollisionAlgorithm::calculateTimeOfImpact(btCollisionObject* /*body0*/,btCollisionObject* /*body1*/,const btDispatcherInfo& /*dispatchInfo*/,btManifoldResult* /*resultOut*/)
-{
-	//not yet
-	return 1.f;
-}
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h
deleted file mode 100644
index 35afaf175a1..00000000000
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-#ifndef BOX_BOX__COLLISION_ALGORITHM_H
-#define BOX_BOX__COLLISION_ALGORITHM_H
-
-#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
-#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
-#include "BulletCollision/BroadphaseCollision/btDispatcher.h"
-#include "BulletCollision/CollisionDispatch/btCollisionCreateFunc.h"
-
-class btPersistentManifold;
-
-///box-box collision detection
-class btBoxBoxCollisionAlgorithm : public btCollisionAlgorithm
-{
-	bool	m_ownManifold;
-	btPersistentManifold*	m_manifoldPtr;
-	
-public:
-	btBoxBoxCollisionAlgorithm(const btCollisionAlgorithmConstructionInfo& ci)
-		: btCollisionAlgorithm(ci) {}
-
-	virtual void processCollision (btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut);
-
-	virtual btScalar calculateTimeOfImpact(btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut);
-
-	btBoxBoxCollisionAlgorithm(btPersistentManifold* mf,const btCollisionAlgorithmConstructionInfo& ci,btCollisionObject* body0,btCollisionObject* body1);
-
-	virtual ~btBoxBoxCollisionAlgorithm();
-
-	virtual	void	getAllContactManifolds(btManifoldArray&	manifoldArray)
-	{
-		if (m_manifoldPtr && m_ownManifold)
-		{
-			manifoldArray.push_back(m_manifoldPtr);
-		}
-	}
-
-
-	struct CreateFunc :public 	btCollisionAlgorithmCreateFunc
-	{
-		virtual	btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, btCollisionObject* body0,btCollisionObject* body1)
-		{
-			int bbsize = sizeof(btBoxBoxCollisionAlgorithm);
-			void* ptr = ci.m_dispatcher1->allocateCollisionAlgorithm(bbsize);
-			return new(ptr) btBoxBoxCollisionAlgorithm(0,ci,body0,body1);
-		}
-	};
-
-};
-
-#endif //BOX_BOX__COLLISION_ALGORITHM_H
-
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp
deleted file mode 100644
index e55604632c0..00000000000
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp
+++ /dev/null
@@ -1,683 +0,0 @@
-
-/*
- * Box-Box collision detection re-distributed under the ZLib license with permission from Russell L. Smith
- * Original version is from Open Dynamics Engine, Copyright (C) 2001,2002 Russell L. Smith.
- * All rights reserved.  Email: russ@q12.org   Web: www.q12.org
- Bullet Continuous Collision Detection and Physics Library
- Bullet is Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-///ODE box-box collision detection is adapted to work with Bullet
-
-#include "btBoxBoxDetector.h"
-#include "BulletCollision/CollisionShapes/btBoxShape.h"
-
-#include <float.h>
-#include <string.h>
-
-btBoxBoxDetector::btBoxBoxDetector(btBoxShape* box1,btBoxShape* box2)
-: m_box1(box1),
-m_box2(box2)
-{
-
-}
-
-
-// given two boxes (p1,R1,side1) and (p2,R2,side2), collide them together and
-// generate contact points. this returns 0 if there is no contact otherwise
-// it returns the number of contacts generated.
-// `normal' returns the contact normal.
-// `depth' returns the maximum penetration depth along that normal.
-// `return_code' returns a number indicating the type of contact that was
-// detected:
-//        1,2,3 = box 2 intersects with a face of box 1
-//        4,5,6 = box 1 intersects with a face of box 2
-//        7..15 = edge-edge contact
-// `maxc' is the maximum number of contacts allowed to be generated, i.e.
-// the size of the `contact' array.
-// `contact' and `skip' are the contact array information provided to the
-// collision functions. this function only fills in the position and depth
-// fields.
-struct dContactGeom;
-#define dDOTpq(a,b,p,q) ((a)[0]*(b)[0] + (a)[p]*(b)[q] + (a)[2*(p)]*(b)[2*(q)])
-#define dInfinity FLT_MAX
-
-
-/*PURE_INLINE btScalar dDOT   (const btScalar *a, const btScalar *b) { return dDOTpq(a,b,1,1); }
-PURE_INLINE btScalar dDOT13 (const btScalar *a, const btScalar *b) { return dDOTpq(a,b,1,3); }
-PURE_INLINE btScalar dDOT31 (const btScalar *a, const btScalar *b) { return dDOTpq(a,b,3,1); }
-PURE_INLINE btScalar dDOT33 (const btScalar *a, const btScalar *b) { return dDOTpq(a,b,3,3); }
-*/
-static btScalar dDOT   (const btScalar *a, const btScalar *b) { return dDOTpq(a,b,1,1); }
-static btScalar dDOT44 (const btScalar *a, const btScalar *b) { return dDOTpq(a,b,4,4); }
-static btScalar dDOT41 (const btScalar *a, const btScalar *b) { return dDOTpq(a,b,4,1); }
-static btScalar dDOT14 (const btScalar *a, const btScalar *b) { return dDOTpq(a,b,1,4); }
-#define dMULTIPLYOP1_331(A,op,B,C) \
-{\
-  (A)[0] op dDOT41((B),(C)); \
-  (A)[1] op dDOT41((B+1),(C)); \
-  (A)[2] op dDOT41((B+2),(C)); \
-}
-
-#define dMULTIPLYOP0_331(A,op,B,C) \
-{ \
-  (A)[0] op dDOT((B),(C)); \
-  (A)[1] op dDOT((B+4),(C)); \
-  (A)[2] op dDOT((B+8),(C)); \
-} 
-
-#define dMULTIPLY1_331(A,B,C) dMULTIPLYOP1_331(A,=,B,C)
-#define dMULTIPLY0_331(A,B,C) dMULTIPLYOP0_331(A,=,B,C)
-
-typedef btScalar dMatrix3[4*3];
-
-void dLineClosestApproach (const btVector3& pa, const btVector3& ua,
-			   const btVector3& pb, const btVector3& ub,
-			   btScalar *alpha, btScalar *beta);
-void dLineClosestApproach (const btVector3& pa, const btVector3& ua,
-			   const btVector3& pb, const btVector3& ub,
-			   btScalar *alpha, btScalar *beta)
-{
-  btVector3 p;
-  p[0] = pb[0] - pa[0];
-  p[1] = pb[1] - pa[1];
-  p[2] = pb[2] - pa[2];
-  btScalar uaub = dDOT(ua,ub);
-  btScalar q1 =  dDOT(ua,p);
-  btScalar q2 = -dDOT(ub,p);
-  btScalar d = 1-uaub*uaub;
-  if (d <= btScalar(0.0001f)) {
-    // @@@ this needs to be made more robust
-    *alpha = 0;
-    *beta  = 0;
-  }
-  else {
-    d = 1.f/d;
-    *alpha = (q1 + uaub*q2)*d;
-    *beta  = (uaub*q1 + q2)*d;
-  }
-}
-
-
-
-// find all the intersection points between the 2D rectangle with vertices
-// at (+/-h[0],+/-h[1]) and the 2D quadrilateral with vertices (p[0],p[1]),
-// (p[2],p[3]),(p[4],p[5]),(p[6],p[7]).
-//
-// the intersection points are returned as x,y pairs in the 'ret' array.
-// the number of intersection points is returned by the function (this will
-// be in the range 0 to 8).
-
-static int intersectRectQuad2 (btScalar h[2], btScalar p[8], btScalar ret[16])
-{
-  // q (and r) contain nq (and nr) coordinate points for the current (and
-  // chopped) polygons
-  int nq=4,nr=0;
-  btScalar buffer[16];
-  btScalar *q = p;
-  btScalar *r = ret;
-  for (int dir=0; dir <= 1; dir++) {
-    // direction notation: xy[0] = x axis, xy[1] = y axis
-    for (int sign=-1; sign <= 1; sign += 2) {
-      // chop q along the line xy[dir] = sign*h[dir]
-      btScalar *pq = q;
-      btScalar *pr = r;
-      nr = 0;
-      for (int i=nq; i > 0; i--) {
-	// go through all points in q and all lines between adjacent points
-	if (sign*pq[dir] < h[dir]) {
-	  // this point is inside the chopping line
-	  pr[0] = pq[0];
-	  pr[1] = pq[1];
-	  pr += 2;
-	  nr++;
-	  if (nr & 8) {
-	    q = r;
-	    goto done;
-	  }
-	}
-	btScalar *nextq = (i > 1) ? pq+2 : q;
-	if ((sign*pq[dir] < h[dir]) ^ (sign*nextq[dir] < h[dir])) {
-	  // this line crosses the chopping line
-	  pr[1-dir] = pq[1-dir] + (nextq[1-dir]-pq[1-dir]) /
-	    (nextq[dir]-pq[dir]) * (sign*h[dir]-pq[dir]);
-	  pr[dir] = sign*h[dir];
-	  pr += 2;
-	  nr++;
-	  if (nr & 8) {
-	    q = r;
-	    goto done;
-	  }
-	}
-	pq += 2;
-      }
-      q = r;
-      r = (q==ret) ? buffer : ret;
-      nq = nr;
-    }
-  }
- done:
-  if (q != ret) memcpy (ret,q,nr*2*sizeof(btScalar));
-  return nr;
-}
-
-
-#define M__PI 3.14159265f
-
-// given n points in the plane (array p, of size 2*n), generate m points that
-// best represent the whole set. the definition of 'best' here is not
-// predetermined - the idea is to select points that give good box-box
-// collision detection behavior. the chosen point indexes are returned in the
-// array iret (of size m). 'i0' is always the first entry in the array.
-// n must be in the range [1..8]. m must be in the range [1..n]. i0 must be
-// in the range [0..n-1].
-
-void cullPoints2 (int n, btScalar p[], int m, int i0, int iret[]);
-void cullPoints2 (int n, btScalar p[], int m, int i0, int iret[])
-{
-  // compute the centroid of the polygon in cx,cy
-  int i,j;
-  btScalar a,cx,cy,q;
-  if (n==1) {
-    cx = p[0];
-    cy = p[1];
-  }
-  else if (n==2) {
-    cx = btScalar(0.5)*(p[0] + p[2]);
-    cy = btScalar(0.5)*(p[1] + p[3]);
-  }
-  else {
-    a = 0;
-    cx = 0;
-    cy = 0;
-    for (i=0; i<(n-1); i++) {
-      q = p[i*2]*p[i*2+3] - p[i*2+2]*p[i*2+1];
-      a += q;
-      cx += q*(p[i*2]+p[i*2+2]);
-      cy += q*(p[i*2+1]+p[i*2+3]);
-    }
-    q = p[n*2-2]*p[1] - p[0]*p[n*2-1];
-    a = 1.f/(btScalar(3.0)*(a+q));
-    cx = a*(cx + q*(p[n*2-2]+p[0]));
-    cy = a*(cy + q*(p[n*2-1]+p[1]));
-  }
-
-  // compute the angle of each point w.r.t. the centroid
-  btScalar A[8];
-  for (i=0; i<n; i++) A[i] = btAtan2(p[i*2+1]-cy,p[i*2]-cx);
-
-  // search for points that have angles closest to A[i0] + i*(2*pi/m).
-  int avail[8];
-  for (i=0; i<n; i++) avail[i] = 1;
-  avail[i0] = 0;
-  iret[0] = i0;
-  iret++;
-  for (j=1; j<m; j++) {
-    a = btScalar(j)*(2*M__PI/m) + A[i0];
-    if (a > M__PI) a -= 2*M__PI;
-    btScalar maxdiff=1e9,diff;
-#ifndef dNODEBUG
-    *iret = i0;			// iret is not allowed to keep this value
-#endif
-    for (i=0; i<n; i++) {
-      if (avail[i]) {
-	diff = btFabs (A[i]-a);
-	if (diff > M__PI) diff = 2*M__PI - diff;
-	if (diff < maxdiff) {
-	  maxdiff = diff;
-	  *iret = i;
-	}
-      }
-    }
-#ifndef dNODEBUG
-    btAssert (*iret != i0);	// ensure iret got set
-#endif
-    avail[*iret] = 0;
-    iret++;
-  }
-}
-
-
-
-int dBoxBox2 (const btVector3& p1, const dMatrix3 R1,
-	     const btVector3& side1, const btVector3& p2,
-	     const dMatrix3 R2, const btVector3& side2,
-	     btVector3& normal, btScalar *depth, int *return_code,
-		 int maxc, dContactGeom * /*contact*/, int /*skip*/,btDiscreteCollisionDetectorInterface::Result& output);
-int dBoxBox2 (const btVector3& p1, const dMatrix3 R1,
-	     const btVector3& side1, const btVector3& p2,
-	     const dMatrix3 R2, const btVector3& side2,
-	     btVector3& normal, btScalar *depth, int *return_code,
-		 int maxc, dContactGeom * /*contact*/, int /*skip*/,btDiscreteCollisionDetectorInterface::Result& output)
-{
-  const btScalar fudge_factor = btScalar(1.05);
-  btVector3 p,pp,normalC;
-  const btScalar *normalR = 0;
-  btScalar A[3],B[3],R11,R12,R13,R21,R22,R23,R31,R32,R33,
-    Q11,Q12,Q13,Q21,Q22,Q23,Q31,Q32,Q33,s,s2,l;
-  int i,j,invert_normal,code;
-
-  // get vector from centers of box 1 to box 2, relative to box 1
-  p = p2 - p1;
-  dMULTIPLY1_331 (pp,R1,p);		// get pp = p relative to body 1
-
-  // get side lengths / 2
-  A[0] = side1[0]*btScalar(0.5);
-  A[1] = side1[1]*btScalar(0.5);
-  A[2] = side1[2]*btScalar(0.5);
-  B[0] = side2[0]*btScalar(0.5);
-  B[1] = side2[1]*btScalar(0.5);
-  B[2] = side2[2]*btScalar(0.5);
-
-  // Rij is R1'*R2, i.e. the relative rotation between R1 and R2
-  R11 = dDOT44(R1+0,R2+0); R12 = dDOT44(R1+0,R2+1); R13 = dDOT44(R1+0,R2+2);
-  R21 = dDOT44(R1+1,R2+0); R22 = dDOT44(R1+1,R2+1); R23 = dDOT44(R1+1,R2+2);
-  R31 = dDOT44(R1+2,R2+0); R32 = dDOT44(R1+2,R2+1); R33 = dDOT44(R1+2,R2+2);
-
-  Q11 = btFabs(R11); Q12 = btFabs(R12); Q13 = btFabs(R13);
-  Q21 = btFabs(R21); Q22 = btFabs(R22); Q23 = btFabs(R23);
-  Q31 = btFabs(R31); Q32 = btFabs(R32); Q33 = btFabs(R33);
-
-  // for all 15 possible separating axes:
-  //   * see if the axis separates the boxes. if so, return 0.
-  //   * find the depth of the penetration along the separating axis (s2)
-  //   * if this is the largest depth so far, record it.
-  // the normal vector will be set to the separating axis with the smallest
-  // depth. note: normalR is set to point to a column of R1 or R2 if that is
-  // the smallest depth normal so far. otherwise normalR is 0 and normalC is
-  // set to a vector relative to body 1. invert_normal is 1 if the sign of
-  // the normal should be flipped.
-
-#define TST(expr1,expr2,norm,cc) \
-  s2 = btFabs(expr1) - (expr2); \
-  if (s2 > 0) return 0; \
-  if (s2 > s) { \
-    s = s2; \
-    normalR = norm; \
-    invert_normal = ((expr1) < 0); \
-    code = (cc); \
-  }
-
-  s = -dInfinity;
-  invert_normal = 0;
-  code = 0;
-
-  // separating axis = u1,u2,u3
-  TST (pp[0],(A[0] + B[0]*Q11 + B[1]*Q12 + B[2]*Q13),R1+0,1);
-  TST (pp[1],(A[1] + B[0]*Q21 + B[1]*Q22 + B[2]*Q23),R1+1,2);
-  TST (pp[2],(A[2] + B[0]*Q31 + B[1]*Q32 + B[2]*Q33),R1+2,3);
-
-  // separating axis = v1,v2,v3
-  TST (dDOT41(R2+0,p),(A[0]*Q11 + A[1]*Q21 + A[2]*Q31 + B[0]),R2+0,4);
-  TST (dDOT41(R2+1,p),(A[0]*Q12 + A[1]*Q22 + A[2]*Q32 + B[1]),R2+1,5);
-  TST (dDOT41(R2+2,p),(A[0]*Q13 + A[1]*Q23 + A[2]*Q33 + B[2]),R2+2,6);
-
-  // note: cross product axes need to be scaled when s is computed.
-  // normal (n1,n2,n3) is relative to box 1.
-#undef TST
-#define TST(expr1,expr2,n1,n2,n3,cc) \
-  s2 = btFabs(expr1) - (expr2); \
-  if (s2 > 0) return 0; \
-  l = btSqrt((n1)*(n1) + (n2)*(n2) + (n3)*(n3)); \
-  if (l > 0) { \
-    s2 /= l; \
-    if (s2*fudge_factor > s) { \
-      s = s2; \
-      normalR = 0; \
-      normalC[0] = (n1)/l; normalC[1] = (n2)/l; normalC[2] = (n3)/l; \
-      invert_normal = ((expr1) < 0); \
-      code = (cc); \
-    } \
-  }
-
-  // separating axis = u1 x (v1,v2,v3)
-  TST(pp[2]*R21-pp[1]*R31,(A[1]*Q31+A[2]*Q21+B[1]*Q13+B[2]*Q12),0,-R31,R21,7);
-  TST(pp[2]*R22-pp[1]*R32,(A[1]*Q32+A[2]*Q22+B[0]*Q13+B[2]*Q11),0,-R32,R22,8);
-  TST(pp[2]*R23-pp[1]*R33,(A[1]*Q33+A[2]*Q23+B[0]*Q12+B[1]*Q11),0,-R33,R23,9);
-
-  // separating axis = u2 x (v1,v2,v3)
-  TST(pp[0]*R31-pp[2]*R11,(A[0]*Q31+A[2]*Q11+B[1]*Q23+B[2]*Q22),R31,0,-R11,10);
-  TST(pp[0]*R32-pp[2]*R12,(A[0]*Q32+A[2]*Q12+B[0]*Q23+B[2]*Q21),R32,0,-R12,11);
-  TST(pp[0]*R33-pp[2]*R13,(A[0]*Q33+A[2]*Q13+B[0]*Q22+B[1]*Q21),R33,0,-R13,12);
-
-  // separating axis = u3 x (v1,v2,v3)
-  TST(pp[1]*R11-pp[0]*R21,(A[0]*Q21+A[1]*Q11+B[1]*Q33+B[2]*Q32),-R21,R11,0,13);
-  TST(pp[1]*R12-pp[0]*R22,(A[0]*Q22+A[1]*Q12+B[0]*Q33+B[2]*Q31),-R22,R12,0,14);
-  TST(pp[1]*R13-pp[0]*R23,(A[0]*Q23+A[1]*Q13+B[0]*Q32+B[1]*Q31),-R23,R13,0,15);
-
-#undef TST
-
-  if (!code) return 0;
-
-  // if we get to this point, the boxes interpenetrate. compute the normal
-  // in global coordinates.
-  if (normalR) {
-    normal[0] = normalR[0];
-    normal[1] = normalR[4];
-    normal[2] = normalR[8];
-  }
-  else {
-    dMULTIPLY0_331 (normal,R1,normalC);
-  }
-  if (invert_normal) {
-    normal[0] = -normal[0];
-    normal[1] = -normal[1];
-    normal[2] = -normal[2];
-  }
-  *depth = -s;
-
-  // compute contact point(s)
-
-  if (code > 6) {
-    // an edge from box 1 touches an edge from box 2.
-    // find a point pa on the intersecting edge of box 1
-    btVector3 pa;
-    btScalar sign;
-    for (i=0; i<3; i++) pa[i] = p1[i];
-    for (j=0; j<3; j++) {
-      sign = (dDOT14(normal,R1+j) > 0) ? btScalar(1.0) : btScalar(-1.0);
-      for (i=0; i<3; i++) pa[i] += sign * A[j] * R1[i*4+j];
-    }
-
-    // find a point pb on the intersecting edge of box 2
-    btVector3 pb;
-    for (i=0; i<3; i++) pb[i] = p2[i];
-    for (j=0; j<3; j++) {
-      sign = (dDOT14(normal,R2+j) > 0) ? btScalar(-1.0) : btScalar(1.0);
-      for (i=0; i<3; i++) pb[i] += sign * B[j] * R2[i*4+j];
-    }
-
-    btScalar alpha,beta;
-    btVector3 ua,ub;
-    for (i=0; i<3; i++) ua[i] = R1[((code)-7)/3 + i*4];
-    for (i=0; i<3; i++) ub[i] = R2[((code)-7)%3 + i*4];
-
-    dLineClosestApproach (pa,ua,pb,ub,&alpha,&beta);
-    for (i=0; i<3; i++) pa[i] += ua[i]*alpha;
-    for (i=0; i<3; i++) pb[i] += ub[i]*beta;
-
-	{
-		
-		//contact[0].pos[i] = btScalar(0.5)*(pa[i]+pb[i]);
-		//contact[0].depth = *depth;
-		btVector3 pointInWorld;
-
-#ifdef USE_CENTER_POINT
-	    for (i=0; i<3; i++) 
-			pointInWorld[i] = (pa[i]+pb[i])*btScalar(0.5);
-		output.addContactPoint(-normal,pointInWorld,-*depth);
-#else
-		output.addContactPoint(-normal,pb,-*depth);
-#endif //
-		*return_code = code;
-	}
-    return 1;
-  }
-
-  // okay, we have a face-something intersection (because the separating
-  // axis is perpendicular to a face). define face 'a' to be the reference
-  // face (i.e. the normal vector is perpendicular to this) and face 'b' to be
-  // the incident face (the closest face of the other box).
-
-  const btScalar *Ra,*Rb,*pa,*pb,*Sa,*Sb;
-  if (code <= 3) {
-    Ra = R1;
-    Rb = R2;
-    pa = p1;
-    pb = p2;
-    Sa = A;
-    Sb = B;
-  }
-  else {
-    Ra = R2;
-    Rb = R1;
-    pa = p2;
-    pb = p1;
-    Sa = B;
-    Sb = A;
-  }
-
-  // nr = normal vector of reference face dotted with axes of incident box.
-  // anr = absolute values of nr.
-  btVector3 normal2,nr,anr;
-  if (code <= 3) {
-    normal2[0] = normal[0];
-    normal2[1] = normal[1];
-    normal2[2] = normal[2];
-  }
-  else {
-    normal2[0] = -normal[0];
-    normal2[1] = -normal[1];
-    normal2[2] = -normal[2];
-  }
-  dMULTIPLY1_331 (nr,Rb,normal2);
-  anr[0] = btFabs (nr[0]);
-  anr[1] = btFabs (nr[1]);
-  anr[2] = btFabs (nr[2]);
-
-  // find the largest compontent of anr: this corresponds to the normal
-  // for the indident face. the other axis numbers of the indicent face
-  // are stored in a1,a2.
-  int lanr,a1,a2;
-  if (anr[1] > anr[0]) {
-    if (anr[1] > anr[2]) {
-      a1 = 0;
-      lanr = 1;
-      a2 = 2;
-    }
-    else {
-      a1 = 0;
-      a2 = 1;
-      lanr = 2;
-    }
-  }
-  else {
-    if (anr[0] > anr[2]) {
-      lanr = 0;
-      a1 = 1;
-      a2 = 2;
-    }
-    else {
-      a1 = 0;
-      a2 = 1;
-      lanr = 2;
-    }
-  }
-
-  // compute center point of incident face, in reference-face coordinates
-  btVector3 center;
-  if (nr[lanr] < 0) {
-    for (i=0; i<3; i++) center[i] = pb[i] - pa[i] + Sb[lanr] * Rb[i*4+lanr];
-  }
-  else {
-    for (i=0; i<3; i++) center[i] = pb[i] - pa[i] - Sb[lanr] * Rb[i*4+lanr];
-  }
-
-  // find the normal and non-normal axis numbers of the reference box
-  int codeN,code1,code2;
-  if (code <= 3) codeN = code-1; else codeN = code-4;
-  if (codeN==0) {
-    code1 = 1;
-    code2 = 2;
-  }
-  else if (codeN==1) {
-    code1 = 0;
-    code2 = 2;
-  }
-  else {
-    code1 = 0;
-    code2 = 1;
-  }
-
-  // find the four corners of the incident face, in reference-face coordinates
-  btScalar quad[8];	// 2D coordinate of incident face (x,y pairs)
-  btScalar c1,c2,m11,m12,m21,m22;
-  c1 = dDOT14 (center,Ra+code1);
-  c2 = dDOT14 (center,Ra+code2);
-  // optimize this? - we have already computed this data above, but it is not
-  // stored in an easy-to-index format. for now it's quicker just to recompute
-  // the four dot products.
-  m11 = dDOT44 (Ra+code1,Rb+a1);
-  m12 = dDOT44 (Ra+code1,Rb+a2);
-  m21 = dDOT44 (Ra+code2,Rb+a1);
-  m22 = dDOT44 (Ra+code2,Rb+a2);
-  {
-    btScalar k1 = m11*Sb[a1];
-    btScalar k2 = m21*Sb[a1];
-    btScalar k3 = m12*Sb[a2];
-    btScalar k4 = m22*Sb[a2];
-    quad[0] = c1 - k1 - k3;
-    quad[1] = c2 - k2 - k4;
-    quad[2] = c1 - k1 + k3;
-    quad[3] = c2 - k2 + k4;
-    quad[4] = c1 + k1 + k3;
-    quad[5] = c2 + k2 + k4;
-    quad[6] = c1 + k1 - k3;
-    quad[7] = c2 + k2 - k4;
-  }
-
-  // find the size of the reference face
-  btScalar rect[2];
-  rect[0] = Sa[code1];
-  rect[1] = Sa[code2];
-
-  // intersect the incident and reference faces
-  btScalar ret[16];
-  int n = intersectRectQuad2 (rect,quad,ret);
-  if (n < 1) return 0;		// this should never happen
-
-  // convert the intersection points into reference-face coordinates,
-  // and compute the contact position and depth for each point. only keep
-  // those points that have a positive (penetrating) depth. delete points in
-  // the 'ret' array as necessary so that 'point' and 'ret' correspond.
-  btScalar point[3*8];		// penetrating contact points
-  btScalar dep[8];			// depths for those points
-  btScalar det1 = 1.f/(m11*m22 - m12*m21);
-  m11 *= det1;
-  m12 *= det1;
-  m21 *= det1;
-  m22 *= det1;
-  int cnum = 0;			// number of penetrating contact points found
-  for (j=0; j < n; j++) {
-    btScalar k1 =  m22*(ret[j*2]-c1) - m12*(ret[j*2+1]-c2);
-    btScalar k2 = -m21*(ret[j*2]-c1) + m11*(ret[j*2+1]-c2);
-    for (i=0; i<3; i++) point[cnum*3+i] =
-			  center[i] + k1*Rb[i*4+a1] + k2*Rb[i*4+a2];
-    dep[cnum] = Sa[codeN] - dDOT(normal2,point+cnum*3);
-    if (dep[cnum] >= 0) {
-      ret[cnum*2] = ret[j*2];
-      ret[cnum*2+1] = ret[j*2+1];
-      cnum++;
-    }
-  }
-  if (cnum < 1) return 0;	// this should never happen
-
-  // we can't generate more contacts than we actually have
-  if (maxc > cnum) maxc = cnum;
-  if (maxc < 1) maxc = 1;
-
-  if (cnum <= maxc) {
-    // we have less contacts than we need, so we use them all
-    for (j=0; j < cnum; j++) {
-
-		//AddContactPoint...
-
-		//dContactGeom *con = CONTACT(contact,skip*j);
-      //for (i=0; i<3; i++) con->pos[i] = point[j*3+i] + pa[i];
-      //con->depth = dep[j];
-
-		btVector3 pointInWorld;
-		for (i=0; i<3; i++) 
-			pointInWorld[i] = point[j*3+i] + pa[i];
-		output.addContactPoint(-normal,pointInWorld,-dep[j]);
-
-    }
-  }
-  else {
-    // we have more contacts than are wanted, some of them must be culled.
-    // find the deepest point, it is always the first contact.
-    int i1 = 0;
-    btScalar maxdepth = dep[0];
-    for (i=1; i<cnum; i++) {
-      if (dep[i] > maxdepth) {
-	maxdepth = dep[i];
-	i1 = i;
-      }
-    }
-
-    int iret[8];
-    cullPoints2 (cnum,ret,maxc,i1,iret);
-
-    for (j=0; j < maxc; j++) {
-//      dContactGeom *con = CONTACT(contact,skip*j);
-  //    for (i=0; i<3; i++) con->pos[i] = point[iret[j]*3+i] + pa[i];
-    //  con->depth = dep[iret[j]];
-
-		btVector3 posInWorld;
-		for (i=0; i<3; i++) 
-			posInWorld[i] = point[iret[j]*3+i] + pa[i];
-		output.addContactPoint(-normal,posInWorld,-dep[iret[j]]);
-    }
-    cnum = maxc;
-  }
-
-  *return_code = code;
-  return cnum;
-}
-
-void	btBoxBoxDetector::getClosestPoints(const ClosestPointInput& input,Result& output,class btIDebugDraw* /*debugDraw*/,bool /*swapResults*/)
-{
-	
-	const btTransform& transformA = input.m_transformA;
-	const btTransform& transformB = input.m_transformB;
-	
-	int skip = 0;
-	dContactGeom *contact = 0;
-
-	dMatrix3 R1;
-	dMatrix3 R2;
-
-	for (int j=0;j<3;j++)
-	{
-		R1[0+4*j] = transformA.getBasis()[j].x();
-		R2[0+4*j] = transformB.getBasis()[j].x();
-
-		R1[1+4*j] = transformA.getBasis()[j].y();
-		R2[1+4*j] = transformB.getBasis()[j].y();
-
-
-		R1[2+4*j] = transformA.getBasis()[j].z();
-		R2[2+4*j] = transformB.getBasis()[j].z();
-
-	}
-
-	
-
-	btVector3 normal;
-	btScalar depth;
-	int return_code;
-	int maxc = 4;
-
-
-	dBoxBox2 (transformA.getOrigin(), 
-	R1,
-	2.f*m_box1->getHalfExtentsWithMargin(),
-	transformB.getOrigin(),
-	R2, 
-	2.f*m_box2->getHalfExtentsWithMargin(),
-	normal, &depth, &return_code,
-	maxc, contact, skip,
-	output
-	);
-
-}
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.h
deleted file mode 100644
index 605294d47bd..00000000000
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Box-Box collision detection re-distributed under the ZLib license with permission from Russell L. Smith
- * Original version is from Open Dynamics Engine, Copyright (C) 2001,2002 Russell L. Smith.
- * All rights reserved.  Email: russ@q12.org   Web: www.q12.org
-
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-#ifndef BOX_BOX_DETECTOR_H
-#define BOX_BOX_DETECTOR_H
-
-
-class btBoxShape;
-#include "BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h"
-
-
-/// btBoxBoxDetector wraps the ODE box-box collision detector
-/// re-distributed under the Zlib license with permission from Russell L. Smith
-struct btBoxBoxDetector : public btDiscreteCollisionDetectorInterface
-{
-	btBoxShape* m_box1;
-	btBoxShape* m_box2;
-
-public:
-
-	btBoxBoxDetector(btBoxShape* box1,btBoxShape* box2);
-
-	virtual ~btBoxBoxDetector() {};
-
-	virtual void	getClosestPoints(const ClosestPointInput& input,Result& output,class btIDebugDraw* debugDraw,bool swapResults=false);
-
-};
-
-#endif //BT_BOX_BOX_DETECTOR_H
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h
deleted file mode 100644
index fad770ac26d..00000000000
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-#ifndef BT_COLLISION_CONFIGURATION
-#define BT_COLLISION_CONFIGURATION
-struct btCollisionAlgorithmCreateFunc;
-
-class btStackAlloc;
-class btPoolAllocator;
-
-///btCollisionConfiguration allows to configure Bullet collision detection
-///stack allocator size, default collision algorithms and persistent manifold pool size
-///todo: describe the meaning
-class	btCollisionConfiguration
-{
-
-public:
-
-	virtual ~btCollisionConfiguration()
-	{
-	}
-
-	///memory pools
-	virtual btPoolAllocator* getPersistentManifoldPool() = 0;
-
-	virtual btPoolAllocator* getCollisionAlgorithmPool() = 0;
-
-	virtual btStackAlloc*	getStackAllocator() = 0;
-
-	virtual btCollisionAlgorithmCreateFunc* getCollisionAlgorithmCreateFunc(int proxyType0,int proxyType1) =0;
-
-};
-
-#endif //BT_COLLISION_CONFIGURATION
-
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h
index c6728918d16..d51a59af7f0 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h
@@ -16,7 +16,7 @@ subject to the following restrictions:
 #ifndef COLLISION_CREATE_FUNC
 #define COLLISION_CREATE_FUNC
 
-#include "LinearMath/btAlignedObjectArray.h"
+#include "../../LinearMath/btAlignedObjectArray.h"
 typedef btAlignedObjectArray<class btCollisionObject*> btCollisionObjectArray;
 class btCollisionAlgorithm;
 class btCollisionObject;
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp
index a031a9f9784..b535fac6563 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.cpp
@@ -19,39 +19,69 @@ subject to the following restrictions:
 
 
 #include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
-
+#include "BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h"
+#include "BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h"
+#include "BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h"
+#include "BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h"
 #include "BulletCollision/CollisionShapes/btCollisionShape.h"
 #include "BulletCollision/CollisionDispatch/btCollisionObject.h"
 #include "BulletCollision/BroadphaseCollision/btOverlappingPairCache.h"
-#include "LinearMath/btPoolAllocator.h"
-#include "BulletCollision/CollisionDispatch/btCollisionConfiguration.h"
 
 int gNumManifold = 0;
 
-#ifdef BT_DEBUG
 #include <stdio.h>
-#endif
 
+	
+btCollisionDispatcher::btCollisionDispatcher(bool noDefaultAlgorithms):
+m_count(0),
+m_useIslands(true),
+m_convexConvexCreateFunc(0),
+m_convexConcaveCreateFunc(0),
+m_swappedConvexConcaveCreateFunc(0),
+m_compoundCreateFunc(0),
+m_swappedCompoundCreateFunc(0),
+m_emptyCreateFunc(0)
+{
+	(void)noDefaultAlgorithms;
+	int i;
 
-btCollisionDispatcher::btCollisionDispatcher (btCollisionConfiguration* collisionConfiguration): 
+	setNearCallback(defaultNearCallback);
+
+	m_emptyCreateFunc = new btEmptyAlgorithm::CreateFunc;
+	for (i=0;i<MAX_BROADPHASE_COLLISION_TYPES;i++)
+	{
+		for (int j=0;j<MAX_BROADPHASE_COLLISION_TYPES;j++)
+		{
+			m_doubleDispatch[i][j] = m_emptyCreateFunc;
+		}
+	}
+}
+//if you want to not link with the default collision algorithms, you can
+//define BT_EXCLUDE_DEFAULT_COLLISIONALGORITHM_REGISTRATION 
+//in your Bullet library build system
+#ifndef BT_EXCLUDE_DEFAULT_COLLISIONALGORITHM_REGISTRATION
+
+btCollisionDispatcher::btCollisionDispatcher (): 
 	m_count(0),
-	m_useIslands(true),
-	m_staticWarningReported(false),
-	m_collisionConfiguration(collisionConfiguration)
+	m_useIslands(true)
 {
 	int i;
 
 	setNearCallback(defaultNearCallback);
 	
-	m_collisionAlgorithmPoolAllocator = collisionConfiguration->getCollisionAlgorithmPool();
-
-	m_persistentManifoldPoolAllocator = collisionConfiguration->getPersistentManifoldPool();
+	//default CreationFunctions, filling the m_doubleDispatch table
+	m_convexConvexCreateFunc = new btConvexConvexAlgorithm::CreateFunc;
+	m_convexConcaveCreateFunc = new btConvexConcaveCollisionAlgorithm::CreateFunc;
+	m_swappedConvexConcaveCreateFunc = new btConvexConcaveCollisionAlgorithm::SwappedCreateFunc;
+	m_compoundCreateFunc = new btCompoundCollisionAlgorithm::CreateFunc;
+	m_swappedCompoundCreateFunc = new btCompoundCollisionAlgorithm::SwappedCreateFunc;
+	m_emptyCreateFunc = new btEmptyAlgorithm::CreateFunc;
 
 	for (i=0;i<MAX_BROADPHASE_COLLISION_TYPES;i++)
 	{
 		for (int j=0;j<MAX_BROADPHASE_COLLISION_TYPES;j++)
 		{
-			m_doubleDispatch[i][j] = m_collisionConfiguration->getCollisionAlgorithmCreateFunc(i,j);
+			m_doubleDispatch[i][j] = internalFindCreateFunc(i,j);
 			assert(m_doubleDispatch[i][j]);
 		}
 	}
@@ -59,6 +89,8 @@ btCollisionDispatcher::btCollisionDispatcher (btCollisionConfiguration* collisio
 	
 };
 
+#endif //BT_EXCLUDE_DEFAULT_COLLISIONALGORITHM_REGISTRATION
+
 
 void btCollisionDispatcher::registerCollisionCreateFunc(int proxyType0, int proxyType1, btCollisionAlgorithmCreateFunc *createFunc)
 {
@@ -67,6 +99,12 @@ void btCollisionDispatcher::registerCollisionCreateFunc(int proxyType0, int prox
 
 btCollisionDispatcher::~btCollisionDispatcher()
 {
+	delete m_convexConvexCreateFunc;
+	delete m_convexConcaveCreateFunc;
+	delete m_swappedConvexConcaveCreateFunc;
+	delete m_compoundCreateFunc;
+	delete m_swappedCompoundCreateFunc;
+	delete m_emptyCreateFunc;
 }
 
 btPersistentManifold*	btCollisionDispatcher::getNewManifold(void* b0,void* b1) 
@@ -79,18 +117,7 @@ btPersistentManifold*	btCollisionDispatcher::getNewManifold(void* b0,void* b1)
 	btCollisionObject* body0 = (btCollisionObject*)b0;
 	btCollisionObject* body1 = (btCollisionObject*)b1;
 	
-	void* mem = 0;
-	
-	if (m_persistentManifoldPoolAllocator->getFreeCount())
-	{
-		mem = m_persistentManifoldPoolAllocator->allocate(sizeof(btPersistentManifold));
-	} else
-	{
-		mem = btAlignedAlloc(sizeof(btPersistentManifold),16);
-
-	}
-	btPersistentManifold* manifold = new(mem) btPersistentManifold (body0,body1,0);
-	manifold->m_index1a = m_manifoldsPtr.size();
+	btPersistentManifold* manifold = new btPersistentManifold (body0,body1);
 	m_manifoldsPtr.push_back(manifold);
 
 	return manifold;
@@ -110,19 +137,13 @@ void btCollisionDispatcher::releaseManifold(btPersistentManifold* manifold)
 	//printf("releaseManifold: gNumManifold %d\n",gNumManifold);
 	clearManifold(manifold);
 
-	int findIndex = manifold->m_index1a;
-	btAssert(findIndex < m_manifoldsPtr.size());
-	m_manifoldsPtr.swap(findIndex,m_manifoldsPtr.size()-1);
-	m_manifoldsPtr[findIndex]->m_index1a = findIndex;
-	m_manifoldsPtr.pop_back();
-
-	manifold->~btPersistentManifold();
-	if (m_persistentManifoldPoolAllocator->validPtr(manifold))
+	///todo: this can be improved a lot, linear search might be slow part!
+	int findIndex = m_manifoldsPtr.findLinearSearch(manifold);
+	if (findIndex < m_manifoldsPtr.size())
 	{
-		m_persistentManifoldPoolAllocator->freeMemory(manifold);
-	} else
-	{
-		btAlignedFree(manifold);
+		m_manifoldsPtr.swap(findIndex,m_manifoldsPtr.size()-1);
+		m_manifoldsPtr.pop_back();
+		delete manifold;
 	}
 	
 }
@@ -131,19 +152,99 @@ void btCollisionDispatcher::releaseManifold(btPersistentManifold* manifold)
 
 btCollisionAlgorithm* btCollisionDispatcher::findAlgorithm(btCollisionObject* body0,btCollisionObject* body1,btPersistentManifold* sharedManifold)
 {
+
+#ifdef USE_DISPATCH_REGISTRY_ARRAY
 	
 	btCollisionAlgorithmConstructionInfo ci;
-
-	ci.m_dispatcher1 = this;
+	ci.m_dispatcher = this;
 	ci.m_manifold = sharedManifold;
-	btCollisionAlgorithm* algo = m_doubleDispatch[body0->getCollisionShape()->getShapeType()][body1->getCollisionShape()->getShapeType()]->CreateCollisionAlgorithm(ci,body0,body1);
-
+	btCollisionAlgorithm* algo = m_doubleDispatch[body0->getCollisionShape()->getShapeType()][body1->getCollisionShape()->getShapeType()]
+	->CreateCollisionAlgorithm(ci,body0,body1);
+#else
+	btCollisionAlgorithm* algo = internalFindAlgorithm(body0,body1);
+#endif //USE_DISPATCH_REGISTRY_ARRAY
 	return algo;
 }
 
 
+#ifndef BT_EXCLUDE_DEFAULT_COLLISIONALGORITHM_REGISTRATION
+
+btCollisionAlgorithmCreateFunc* btCollisionDispatcher::internalFindCreateFunc(int proxyType0,int proxyType1)
+{
+	
+	if (btBroadphaseProxy::isConvex(proxyType0) && btBroadphaseProxy::isConvex(proxyType1))
+	{
+		return m_convexConvexCreateFunc;
+	}
+
+	if (btBroadphaseProxy::isConvex(proxyType0) && btBroadphaseProxy::isConcave(proxyType1))
+	{
+		return m_convexConcaveCreateFunc;
+	}
+
+	if (btBroadphaseProxy::isConvex(proxyType1) && btBroadphaseProxy::isConcave(proxyType0))
+	{
+		return m_swappedConvexConcaveCreateFunc;
+	}
+
+	if (btBroadphaseProxy::isCompound(proxyType0))
+	{
+		return m_compoundCreateFunc;
+	} else
+	{
+		if (btBroadphaseProxy::isCompound(proxyType1))
+		{
+			return m_swappedCompoundCreateFunc;
+		}
+	}
+
+	//failed to find an algorithm
+	return m_emptyCreateFunc;
+}
+
+#endif //BT_EXCLUDE_DEFAULT_COLLISIONALGORITHM_REGISTRATION
 
 
+#ifndef USE_DISPATCH_REGISTRY_ARRAY
+
+btCollisionAlgorithm* btCollisionDispatcher::internalFindAlgorithm(btCollisionObject* body0,btCollisionObject* body1,btPersistentManifold* sharedManifold)
+{
+	m_count++;
+	
+	btCollisionAlgorithmConstructionInfo ci;
+	ci.m_dispatcher = this;
+	
+	if (body0->getCollisionShape()->isConvex() && body1->getCollisionShape()->isConvex() )
+	{
+		return new btConvexConvexAlgorithm(sharedManifold,ci,body0,body1);
+	}
+
+	if (body0->getCollisionShape()->isConvex() && body1->getCollisionShape()->isConcave())
+	{
+		return new btConvexConcaveCollisionAlgorithm(ci,body0,body1,false);
+	}
+
+	if (body1->getCollisionShape()->isConvex() && body0->getCollisionShape()->isConcave())
+	{
+		return new btConvexConcaveCollisionAlgorithm(ci,body0,body1,true);
+	}
+
+	if (body0->getCollisionShape()->isCompound())
+	{
+		return new btCompoundCollisionAlgorithm(ci,body0,body1,false);
+	} else
+	{
+		if (body1->getCollisionShape()->isCompound())
+		{
+			return new btCompoundCollisionAlgorithm(ci,body0,body1,true);
+		}
+	}
+
+	//failed to find an algorithm
+	return new btEmptyAlgorithm(ci);
+	
+}
+#endif //USE_DISPATCH_REGISTRY_ARRAY
 
 bool	btCollisionDispatcher::needsResponse(btCollisionObject* body0,btCollisionObject* body1)
 {
@@ -163,19 +264,13 @@ bool	btCollisionDispatcher::needsCollision(btCollisionObject* body0,btCollisionO
 
 	bool needsCollision = true;
 
-#ifdef BT_DEBUG
-	if (!m_staticWarningReported)
+	//broadphase filtering already deals with this
+	if ((body0->isStaticObject() || body0->isKinematicObject()) &&
+		(body1->isStaticObject() || body1->isKinematicObject()))
 	{
-		//broadphase filtering already deals with this
-		if ((body0->isStaticObject() || body0->isKinematicObject()) &&
-			(body1->isStaticObject() || body1->isKinematicObject()))
-		{
-			m_staticWarningReported = true;
-			printf("warning btCollisionDispatcher::needsCollision: static-static collision!\n");
-		}
+		printf("warning btCollisionDispatcher::needsCollision: static-static collision!\n");
 	}
-#endif //BT_DEBUG
-
+		
 	if ((!body0->isActive()) && (!body1->isActive()))
 		needsCollision = false;
 	else if (!body0->checkCollideWith(body1))
@@ -191,25 +286,23 @@ bool	btCollisionDispatcher::needsCollision(btCollisionObject* body0,btCollisionO
 ///this is useful for the collision dispatcher.
 class btCollisionPairCallback : public btOverlapCallback
 {
-	const btDispatcherInfo& m_dispatchInfo;
+	btDispatcherInfo& m_dispatchInfo;
 	btCollisionDispatcher*	m_dispatcher;
 
 public:
 
-	btCollisionPairCallback(const btDispatcherInfo& dispatchInfo,btCollisionDispatcher*	dispatcher)
+	btCollisionPairCallback(btDispatcherInfo& dispatchInfo,btCollisionDispatcher*	dispatcher)
 	:m_dispatchInfo(dispatchInfo),
 	m_dispatcher(dispatcher)
 	{
 	}
 
-	/*btCollisionPairCallback& operator=(btCollisionPairCallback& other)
+	btCollisionPairCallback& operator=(btCollisionPairCallback& other)
 	{
 		m_dispatchInfo = other.m_dispatchInfo;
 		m_dispatcher = other.m_dispatcher;
 		return *this;
 	}
-	*/
-
 
 	virtual ~btCollisionPairCallback() {}
 
@@ -223,14 +316,13 @@ public:
 };
 
 
-
-void	btCollisionDispatcher::dispatchAllCollisionPairs(btOverlappingPairCache* pairCache,const btDispatcherInfo& dispatchInfo,btDispatcher* dispatcher) 
+void	btCollisionDispatcher::dispatchAllCollisionPairs(btOverlappingPairCache* pairCache,btDispatcherInfo& dispatchInfo)
 {
 	//m_blockedForChanges = true;
 
 	btCollisionPairCallback	collisionCallback(dispatchInfo,this);
 
-	pairCache->processAllOverlappingPairs(&collisionCallback,dispatcher);
+	pairCache->processAllOverlappingPairs(&collisionCallback);
 
 	//m_blockedForChanges = false;
 
@@ -240,7 +332,7 @@ void	btCollisionDispatcher::dispatchAllCollisionPairs(btOverlappingPairCache* pa
 
 
 //by default, Bullet will use this near callback
-void btCollisionDispatcher::defaultNearCallback(btBroadphasePair& collisionPair, btCollisionDispatcher& dispatcher, const btDispatcherInfo& dispatchInfo)
+void btCollisionDispatcher::defaultNearCallback(btBroadphasePair& collisionPair, btCollisionDispatcher& dispatcher, btDispatcherInfo& dispatchInfo)
 {
 		btCollisionObject* colObj0 = (btCollisionObject*)collisionPair.m_pProxy0->m_clientObject;
 		btCollisionObject* colObj1 = (btCollisionObject*)collisionPair.m_pProxy1->m_clientObject;
@@ -273,26 +365,3 @@ void btCollisionDispatcher::defaultNearCallback(btBroadphasePair& collisionPair,
 		}
 
 }
-
-
-void* btCollisionDispatcher::allocateCollisionAlgorithm(int size)
-{
-	if (m_collisionAlgorithmPoolAllocator->getFreeCount())
-	{
-		return m_collisionAlgorithmPoolAllocator->allocate(size);
-	}
-	
-	//warn user for overflow?
-	return	btAlignedAlloc(static_cast<size_t>(size), 16);
-}
-
-void btCollisionDispatcher::freeCollisionAlgorithm(void* ptr)
-{
-	if (m_collisionAlgorithmPoolAllocator->validPtr(ptr))
-	{
-		m_collisionAlgorithmPoolAllocator->freeMemory(ptr);
-	} else
-	{
-		btAlignedFree(ptr);
-	}
-}
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h
index a9c9cd414c1..ca5aba8f01c 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h
@@ -16,18 +16,17 @@ subject to the following restrictions:
 #ifndef COLLISION__DISPATCHER_H
 #define COLLISION__DISPATCHER_H
 
-#include "BulletCollision/BroadphaseCollision/btDispatcher.h"
-#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h"
+#include "../BroadphaseCollision/btDispatcher.h"
+#include "../NarrowPhaseCollision/btPersistentManifold.h"
 
-#include "BulletCollision/CollisionDispatch/btManifoldResult.h"
+#include "../CollisionDispatch/btManifoldResult.h"
 
-#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
-#include "LinearMath/btAlignedObjectArray.h"
+#include "../BroadphaseCollision/btBroadphaseProxy.h"
+#include "../../LinearMath/btAlignedObjectArray.h"
 
 class btIDebugDraw;
 class btOverlappingPairCache;
-class btPoolAllocator;
-class btCollisionConfiguration;
+
 
 #include "btCollisionCreateFunc.h"
 
@@ -35,7 +34,7 @@ class btCollisionConfiguration;
 
 class btCollisionDispatcher;
 ///user can override this nearcallback for collision filtering and more finegrained control over collision detection
-typedef void (*btNearCallback)(btBroadphasePair& collisionPair, btCollisionDispatcher& dispatcher, const btDispatcherInfo& dispatchInfo);
+typedef void (*btNearCallback)(btBroadphasePair& collisionPair, btCollisionDispatcher& dispatcher, btDispatcherInfo& dispatchInfo);
 
 
 ///btCollisionDispatcher supports algorithms that handle ConvexConvex and ConvexConcave collision pairs.
@@ -47,22 +46,26 @@ class btCollisionDispatcher : public btDispatcher
 	btAlignedObjectArray<btPersistentManifold*>	m_manifoldsPtr;
 
 	bool m_useIslands;
-
-	bool	m_staticWarningReported;
 	
 	btManifoldResult	m_defaultManifoldResult;
 
 	btNearCallback		m_nearCallback;
 	
-	btPoolAllocator*	m_collisionAlgorithmPoolAllocator;
-
-	btPoolAllocator*	m_persistentManifoldPoolAllocator;
-
 	btCollisionAlgorithmCreateFunc* m_doubleDispatch[MAX_BROADPHASE_COLLISION_TYPES][MAX_BROADPHASE_COLLISION_TYPES];
 	
+	btCollisionAlgorithmCreateFunc* internalFindCreateFunc(int proxyType0,int proxyType1);
 
-	btCollisionConfiguration*	m_collisionConfiguration;
+	//default CreationFunctions, filling the m_doubleDispatch table
+	btCollisionAlgorithmCreateFunc*	m_convexConvexCreateFunc;
+	btCollisionAlgorithmCreateFunc*	m_convexConcaveCreateFunc;
+	btCollisionAlgorithmCreateFunc*	m_swappedConvexConcaveCreateFunc;
+	btCollisionAlgorithmCreateFunc*	m_compoundCreateFunc;
+	btCollisionAlgorithmCreateFunc*	m_swappedCompoundCreateFunc;
+	btCollisionAlgorithmCreateFunc*   m_emptyCreateFunc;
 
+#ifndef USE_DISPATCH_REGISTRY_ARRAY
+	btCollisionAlgorithm* internalFindAlgorithm(btCollisionObject* body0,btCollisionObject* body1,btPersistentManifold* sharedManifold = 0);
+#endif //USE_DISPATCH_REGISTRY_ARRAY
 
 public:
 
@@ -89,7 +92,11 @@ public:
 		return m_manifoldsPtr[index];
 	}
 
-	btCollisionDispatcher (btCollisionConfiguration* collisionConfiguration);
+	///the default constructor creates/register default collision algorithms, for convex, compound and concave shape support
+	btCollisionDispatcher ();
+
+	///a special constructor that doesn't create/register the default collision algorithms
+	btCollisionDispatcher(bool noDefaultAlgorithms);
 
 	virtual ~btCollisionDispatcher();
 
@@ -107,7 +114,7 @@ public:
 	
 	virtual bool	needsResponse(btCollisionObject* body0,btCollisionObject* body1);
 	
-	virtual void	dispatchAllCollisionPairs(btOverlappingPairCache* pairCache,const btDispatcherInfo& dispatchInfo,btDispatcher* dispatcher) ;
+	virtual void	dispatchAllCollisionPairs(btOverlappingPairCache* pairCache,btDispatcherInfo& dispatchInfo);
 
 	void	setNearCallback(btNearCallback	nearCallback)
 	{
@@ -120,26 +127,7 @@ public:
 	}
 
 	//by default, Bullet will use this near callback
-	static void  defaultNearCallback(btBroadphasePair& collisionPair, btCollisionDispatcher& dispatcher, const btDispatcherInfo& dispatchInfo);
-
-	virtual	void* allocateCollisionAlgorithm(int size);
-
-	virtual	void freeCollisionAlgorithm(void* ptr);
-
-	btCollisionConfiguration*	getCollisionConfiguration()
-	{
-		return m_collisionConfiguration;
-	}
-
-	const btCollisionConfiguration*	getCollisionConfiguration() const
-	{
-		return m_collisionConfiguration;
-	}
-
-	void	setCollisionConfiguration(btCollisionConfiguration* config)
-	{
-		m_collisionConfiguration = config;
-	}
+	static void  defaultNearCallback(btBroadphasePair& collisionPair, btCollisionDispatcher& dispatcher, btDispatcherInfo& dispatchInfo);
 
 };
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp
index d1641249568..d4c0a4e8cb3 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp
@@ -13,22 +13,15 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-
 #include "btCollisionObject.h"
 
 btCollisionObject::btCollisionObject()
 	:	m_broadphaseHandle(0),
 		m_collisionShape(0),
-		m_rootCollisionShape(0),
-		m_collisionFlags(btCollisionObject::CF_STATIC_OBJECT),
-		m_islandTag1(-1),
-		m_companionId(-1),
+		m_collisionFlags(0),
 		m_activationState1(1),
 		m_deactivationTime(btScalar(0.)),
-		m_friction(btScalar(0.5)),
-		m_restitution(btScalar(0.)),
 		m_userObjectPointer(0),
-		m_internalType(CO_COLLISION_OBJECT),
 		m_hitFraction(btScalar(1.)),
 		m_ccdSweptSphereRadius(btScalar(0.)),
 		m_ccdSquareMotionThreshold(btScalar(0.)),
@@ -62,4 +55,3 @@ void btCollisionObject::activate(bool forceActivation)
 }
 
 
-
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h
index 96cbd1c3eb8..9fb6a67c4a3 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h
@@ -16,7 +16,7 @@ subject to the following restrictions:
 #ifndef COLLISION_OBJECT_H
 #define COLLISION_OBJECT_H
 
-#include "LinearMath/btTransform.h"
+#include "../../LinearMath/btTransform.h"
 
 //island management, m_activationState1
 #define ACTIVE_TAG 1
@@ -27,8 +27,7 @@ subject to the following restrictions:
 
 struct	btBroadphaseProxy;
 class	btCollisionShape;
-#include "LinearMath/btMotionState.h"
-#include "LinearMath/btAlignedAllocator.h"
+#include "../../LinearMath/btMotionState.h"
 
 
 
@@ -51,11 +50,6 @@ protected:
 	btVector3	m_interpolationAngularVelocity;
 	btBroadphaseProxy*		m_broadphaseHandle;
 	btCollisionShape*		m_collisionShape;
-	
-	///m_rootCollisionShape is temporarily used to store the original collision shape
-	///The m_collisionShape might be temporarily replaced by a child collision shape during collision detection purposes
-	///If it is NULL, the m_collisionShape is not temporarily replaced.
-	btCollisionShape*		m_rootCollisionShape;
 
 	int				m_collisionFlags;
 
@@ -71,9 +65,8 @@ protected:
 	///users can point to their objects, m_userPointer is not used by Bullet, see setUserPointer/getUserPointer
 	void*			m_userObjectPointer;
 
-	///m_internalType is reserved to distinguish Bullet's btCollisionObject, btRigidBody, btSoftBody etc.
-	///do not assign your own m_internalType unless you write a new dynamics object class.
-	int				m_internalType;
+	///m_internalOwner is reserved to point to Bullet's btRigidBody. Don't use this, use m_userObjectPointer instead.
+	void*			m_internalOwner;
 
 	///time of impact calculation
 	btScalar		m_hitFraction; 
@@ -89,15 +82,13 @@ protected:
 
 	char	m_pad[7];
 
-	virtual bool	checkCollideWithOverride(btCollisionObject* /* co */)
+	virtual bool	checkCollideWithOverride(btCollisionObject* co)
 	{
 		return true;
 	}
 
 public:
 
-	BT_DECLARE_ALIGNED_ALLOCATOR();
-
 	enum CollisionFlags
 	{
 		CF_STATIC_OBJECT= 1,
@@ -106,35 +97,29 @@ public:
 		CF_CUSTOM_MATERIAL_CALLBACK = 8//this allows per-triangle material (friction/restitution)
 	};
 
-	enum	CollisionObjectTypes
-	{
-		CO_COLLISION_OBJECT =1,
-		CO_RIGID_BODY,
-		CO_SOFT_BODY
-	};
 
-	SIMD_FORCE_INLINE bool mergesSimulationIslands() const
+	inline bool mergesSimulationIslands() const
 	{
 		///static objects, kinematic and object without contact response don't merge islands
 		return  ((m_collisionFlags & (CF_STATIC_OBJECT | CF_KINEMATIC_OBJECT | CF_NO_CONTACT_RESPONSE) )==0);
 	}
 
 
-	SIMD_FORCE_INLINE bool		isStaticObject() const {
+	inline bool		isStaticObject() const {
 		return (m_collisionFlags & CF_STATIC_OBJECT) != 0;
 	}
 
-	SIMD_FORCE_INLINE bool		isKinematicObject() const
+	inline bool		isKinematicObject() const
 	{
 		return (m_collisionFlags & CF_KINEMATIC_OBJECT) != 0;
 	}
 
-	SIMD_FORCE_INLINE bool		isStaticOrKinematicObject() const
+	inline bool		isStaticOrKinematicObject() const
 	{
 		return (m_collisionFlags & (CF_KINEMATIC_OBJECT | CF_STATIC_OBJECT)) != 0 ;
 	}
 
-	SIMD_FORCE_INLINE bool		hasContactResponse() const {
+	inline bool		hasContactResponse() const {
 		return (m_collisionFlags & CF_NO_CONTACT_RESPONSE)==0;
 	}
 
@@ -146,35 +131,20 @@ public:
 	void	setCollisionShape(btCollisionShape* collisionShape)
 	{
 		m_collisionShape = collisionShape;
-		m_rootCollisionShape = collisionShape;
 	}
 
-	SIMD_FORCE_INLINE const btCollisionShape*	getCollisionShape() const
+	const btCollisionShape*	getCollisionShape() const
 	{
 		return m_collisionShape;
 	}
 
-	SIMD_FORCE_INLINE btCollisionShape*	getCollisionShape()
+	btCollisionShape*	getCollisionShape()
 	{
 		return m_collisionShape;
 	}
 
-	SIMD_FORCE_INLINE const btCollisionShape*	getRootCollisionShape() const
-	{
-		return m_rootCollisionShape;
-	}
+	
 
-	SIMD_FORCE_INLINE btCollisionShape*	getRootCollisionShape()
-	{
-		return m_rootCollisionShape;
-	}
-
-	///Avoid using this internal API call
-	///internalSetTemporaryCollisionShape is used to temporary replace the actual collision shape by a child collision shape.
-	void	internalSetTemporaryCollisionShape(btCollisionShape* collisionShape)
-	{
-		m_collisionShape = collisionShape;
-	}
 
 	int	getActivationState() const { return m_activationState1;}
 	
@@ -216,9 +186,14 @@ public:
 	}
 
 	///reserved for Bullet internal usage
-	int	getInternalType() const
+	void*	getInternalOwner()
 	{
-		return m_internalType;
+		return m_internalOwner;
+	}
+
+	const void*	getInternalOwner() const
+	{
+		return m_internalOwner;
 	}
 
 	btTransform&	getWorldTransform()
@@ -356,7 +331,6 @@ public:
 		m_userObjectPointer = userPointer;
 	}
 
-
 	inline bool checkCollideWith(btCollisionObject* co)
 	{
 		if (m_checkCollideWith)
@@ -364,6 +338,9 @@ public:
 
 		return true;
 	}
-};
+
+
+}
+;
 
 #endif //COLLISION_OBJECT_H
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
index 7c2ecd6098a..7dc7d8d2f68 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
@@ -4,8 +4,8 @@ Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
 
 This software is provided 'as-is', without any express or implied warranty.
 In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it freely,
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
 subject to the following restrictions:
 
 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
@@ -18,57 +18,59 @@ subject to the following restrictions:
 #include "BulletCollision/CollisionDispatch/btCollisionObject.h"
 #include "BulletCollision/CollisionShapes/btCollisionShape.h"
 #include "BulletCollision/CollisionShapes/btConvexShape.h"
-#include "BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h"
+
 #include "BulletCollision/CollisionShapes/btSphereShape.h" //for raycasting
-#include "BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h" //for raycasting
+#include "BulletCollision/CollisionShapes/btTriangleMeshShape.h" //for raycasting
 #include "BulletCollision/NarrowPhaseCollision/btRaycastCallback.h"
 #include "BulletCollision/CollisionShapes/btCompoundShape.h"
 #include "BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h"
-#include "BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h"
-#include "BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h"
-
 #include "BulletCollision/BroadphaseCollision/btBroadphaseInterface.h"
 #include "LinearMath/btAabbUtil2.h"
 #include "LinearMath/btQuickprof.h"
 #include "LinearMath/btStackAlloc.h"
 
-
 //When the user doesn't provide dispatcher or broadphase, create basic versions (and delete them in destructor)
 #include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h"
 #include "BulletCollision/BroadphaseCollision/btSimpleBroadphase.h"
-#include "BulletCollision/CollisionDispatch/btCollisionConfiguration.h"
 
 
-btCollisionWorld::btCollisionWorld(btDispatcher* dispatcher,btBroadphaseInterface* pairCache, btCollisionConfiguration* collisionConfiguration)
+btCollisionWorld::btCollisionWorld(btDispatcher* dispatcher,btOverlappingPairCache* pairCache, int stackSize)
 :m_dispatcher1(dispatcher),
 m_broadphasePairCache(pairCache),
-m_debugDrawer(0)
+m_ownsDispatcher(false),
+m_ownsBroadphasePairCache(false)
 {
-	m_stackAlloc = collisionConfiguration->getStackAllocator();
+	m_stackAlloc = new btStackAlloc(stackSize);
 	m_dispatchInfo.m_stackAllocator = m_stackAlloc;
 }
 
 
 btCollisionWorld::~btCollisionWorld()
 {
+	m_stackAlloc->destroy();
+	delete m_stackAlloc;
 
 	//clean up remaining objects
 	int i;
 	for (i=0;i<m_collisionObjects.size();i++)
 	{
 		btCollisionObject* collisionObject= m_collisionObjects[i];
-
+		
 		btBroadphaseProxy* bp = collisionObject->getBroadphaseHandle();
 		if (bp)
 		{
 			//
 			// only clear the cached algorithms
 			//
-			getBroadphase()->getOverlappingPairCache()->cleanProxyFromPairs(bp,m_dispatcher1);
-			getBroadphase()->destroyProxy(bp,m_dispatcher1);
+			getBroadphase()->cleanProxyFromPairs(bp);
+			getBroadphase()->destroyProxy(bp);
 		}
 	}
 
+	if (m_ownsDispatcher)
+		delete m_dispatcher1;
+	if (m_ownsBroadphasePairCache)
+		delete m_broadphasePairCache;
 
 }
 
@@ -103,100 +105,66 @@ void	btCollisionWorld::addCollisionObject(btCollisionObject* collisionObject,sho
 			type,
 			collisionObject,
 			collisionFilterGroup,
-			collisionFilterMask,
-			m_dispatcher1,0
+			collisionFilterMask
 			))	;
 
-
+		
 
 
 
 }
 
-void	btCollisionWorld::updateAabbs()
-{
-	BT_PROFILE("updateAabbs");
-
-	btTransform predictedTrans;
-	for ( int i=0;i<m_collisionObjects.size();i++)
-	{
-		btCollisionObject* colObj = m_collisionObjects[i];
-
-		//only update aabb of active objects
-		if (colObj->isActive())
-		{
-			btPoint3 minAabb,maxAabb;
-			colObj->getCollisionShape()->getAabb(colObj->getWorldTransform(), minAabb,maxAabb);
-			btBroadphaseInterface* bp = (btBroadphaseInterface*)m_broadphasePairCache;
-
-			//moving objects should be moderately sized, probably something wrong if not
-			if ( colObj->isStaticObject() || ((maxAabb-minAabb).length2() < btScalar(1e12)))
-			{
-				bp->setAabb(colObj->getBroadphaseHandle(),minAabb,maxAabb, m_dispatcher1);
-			} else
-			{
-				//something went wrong, investigate
-				//this assert is unwanted in 3D modelers (danger of loosing work)
-				colObj->setActivationState(DISABLE_SIMULATION);
-
-				static bool reportMe = true;
-				if (reportMe && m_debugDrawer)
-				{
-					reportMe = false;
-					m_debugDrawer->reportErrorWarning("Overflow in AABB, object removed from simulation");
-					m_debugDrawer->reportErrorWarning("If you can reproduce this, please email bugs@continuousphysics.com\n");
-					m_debugDrawer->reportErrorWarning("Please include above information, your Platform, version of OS.\n");
-					m_debugDrawer->reportErrorWarning("Thanks.\n");
-				}
-			}
-		}
-	}
-
-}
 
 
 
 void	btCollisionWorld::performDiscreteCollisionDetection()
 {
-	BT_PROFILE("performDiscreteCollisionDetection");
-
 	btDispatcherInfo& dispatchInfo = getDispatchInfo();
 
-	updateAabbs();
+	BEGIN_PROFILE("perform Broadphase Collision Detection");
 
+
+	//update aabb (of all moved objects)
+
+	btVector3 aabbMin,aabbMax;
+	for (int i=0;i<m_collisionObjects.size();i++)
 	{
-		BT_PROFILE("calculateOverlappingPairs");
-		m_broadphasePairCache->calculateOverlappingPairs(m_dispatcher1);
+		m_collisionObjects[i]->getCollisionShape()->getAabb(m_collisionObjects[i]->getWorldTransform(),aabbMin,aabbMax);
+		m_broadphasePairCache->setAabb(m_collisionObjects[i]->getBroadphaseHandle(),aabbMin,aabbMax);
 	}
 
+	m_broadphasePairCache->refreshOverlappingPairs();
+
+	
+	END_PROFILE("perform Broadphase Collision Detection");
+
+	BEGIN_PROFILE("performDiscreteCollisionDetection");
 
 	btDispatcher* dispatcher = getDispatcher();
-	{
-		BT_PROFILE("dispatchAllCollisionPairs");
-		if (dispatcher)
-			dispatcher->dispatchAllCollisionPairs(m_broadphasePairCache->getOverlappingPairCache(),dispatchInfo,m_dispatcher1);
-	}
+	if (dispatcher)
+		dispatcher->dispatchAllCollisionPairs(m_broadphasePairCache,dispatchInfo);
+
+	END_PROFILE("performDiscreteCollisionDetection");
 
 }
 
 
-
 void	btCollisionWorld::removeCollisionObject(btCollisionObject* collisionObject)
 {
-
-
+	
+	
 	//bool removeFromBroadphase = false;
-
+	
 	{
-
+		
 		btBroadphaseProxy* bp = collisionObject->getBroadphaseHandle();
 		if (bp)
 		{
 			//
 			// only clear the cached algorithms
 			//
-			getBroadphase()->getOverlappingPairCache()->cleanProxyFromPairs(bp,m_dispatcher1);
-			getBroadphase()->destroyProxy(bp,m_dispatcher1);
+			getBroadphase()->cleanProxyFromPairs(bp);
+			getBroadphase()->destroyProxy(bp);
 			collisionObject->setBroadphaseHandle(0);
 		}
 	}
@@ -213,457 +181,192 @@ void	btCollisionWorld::rayTestSingle(const btTransform& rayFromTrans,const btTra
 					  btCollisionObject* collisionObject,
 					  const btCollisionShape* collisionShape,
 					  const btTransform& colObjWorldTransform,
-					  RayResultCallback& resultCallback)
+					  RayResultCallback& resultCallback,
+					  short int collisionFilterMask,
+					  bool faceNormal)
 {
+	
 	btSphereShape pointShape(btScalar(0.0));
 	pointShape.setMargin(0.f);
-	const btConvexShape* castShape = &pointShape;
 
-	if (collisionShape->isConvex())
-	{
-		btConvexCast::CastResult castResult;
-		castResult.m_fraction = resultCallback.m_closestHitFraction;
-
-		btConvexShape* convexShape = (btConvexShape*) collisionShape;
-		btVoronoiSimplexSolver	simplexSolver;
-#define USE_SUBSIMPLEX_CONVEX_CAST 1
-#ifdef USE_SUBSIMPLEX_CONVEX_CAST
-		btSubsimplexConvexCast convexCaster(castShape,convexShape,&simplexSolver);
-#else
-		//btGjkConvexCast	convexCaster(castShape,convexShape,&simplexSolver);
-		//btContinuousConvexCollision convexCaster(castShape,convexShape,&simplexSolver,0);
-#endif //#USE_SUBSIMPLEX_CONVEX_CAST
-
-		if (convexCaster.calcTimeOfImpact(rayFromTrans,rayToTrans,colObjWorldTransform,colObjWorldTransform,castResult))
-		{
-			//add hit
-			if (castResult.m_normal.length2() > btScalar(0.0001))
-			{
-				if (castResult.m_fraction < resultCallback.m_closestHitFraction)
-				{
-#ifdef USE_SUBSIMPLEX_CONVEX_CAST
-					//rotate normal into worldspace
-					castResult.m_normal = rayFromTrans.getBasis() * castResult.m_normal;
-#endif //USE_SUBSIMPLEX_CONVEX_CAST
-
-					castResult.m_normal.normalize();
-					btCollisionWorld::LocalRayResult localRayResult
-						(
-							collisionObject,
-							0,
-							castResult.m_normal,
-							castResult.m_fraction
-						);
-
-					bool normalInWorldSpace = true;
-					resultCallback.addSingleResult(localRayResult, normalInWorldSpace);
-
-				}
-			}
-		}
-	} else {
-		if (collisionShape->isConcave())
-		{
-			if (collisionShape->getShapeType()==TRIANGLE_MESH_SHAPE_PROXYTYPE)
-			{
-				///optimized version for btBvhTriangleMeshShape
-				btBvhTriangleMeshShape* triangleMesh = (btBvhTriangleMeshShape*)collisionShape;
-				btTransform worldTocollisionObject = colObjWorldTransform.inverse();
-				btVector3 rayFromLocal = worldTocollisionObject * rayFromTrans.getOrigin();
-				btVector3 rayToLocal = worldTocollisionObject * rayToTrans.getOrigin();
-
-				//ConvexCast::CastResult
-				struct BridgeTriangleRaycastCallback : public btTriangleRaycastCallback
-				{
-					btCollisionWorld::RayResultCallback* m_resultCallback;
-					btCollisionObject*	m_collisionObject;
-					btTriangleMeshShape*	m_triangleMesh;
-
-					BridgeTriangleRaycastCallback( const btVector3& from,const btVector3& to,
-						btCollisionWorld::RayResultCallback* resultCallback, btCollisionObject* collisionObject,btTriangleMeshShape*	triangleMesh):
-						btTriangleRaycastCallback(from,to),
-							m_resultCallback(resultCallback),
-							m_collisionObject(collisionObject),
-							m_triangleMesh(triangleMesh)
-						{
-						}
-
-
-					virtual btScalar reportHit(const btVector3& hitNormalLocal, btScalar hitFraction, int partId, int triangleIndex )
-					{
-						btCollisionWorld::LocalShapeInfo	shapeInfo;
-						shapeInfo.m_shapePart = partId;
-						shapeInfo.m_triangleIndex = triangleIndex;
-
-						btCollisionWorld::LocalRayResult rayResult
-						(m_collisionObject,
-							&shapeInfo,
-							hitNormalLocal,
-							hitFraction);
-
-						bool	normalInWorldSpace = false;
-						return m_resultCallback->addSingleResult(rayResult,normalInWorldSpace);
-					}
-
-				};
-
-				BridgeTriangleRaycastCallback rcb(rayFromLocal,rayToLocal,&resultCallback,collisionObject,triangleMesh);
-				rcb.m_hitFraction = resultCallback.m_closestHitFraction;
-				triangleMesh->performRaycast(&rcb,rayFromLocal,rayToLocal);
-			} else
-			{
-				btTriangleMeshShape* triangleMesh = (btTriangleMeshShape*)collisionShape;
-
-				btTransform worldTocollisionObject = colObjWorldTransform.inverse();
-
-				btVector3 rayFromLocal = worldTocollisionObject * rayFromTrans.getOrigin();
-				btVector3 rayToLocal = worldTocollisionObject * rayToTrans.getOrigin();
-
-				//ConvexCast::CastResult
-
-				struct BridgeTriangleRaycastCallback : public btTriangleRaycastCallback
-				{
-					btCollisionWorld::RayResultCallback* m_resultCallback;
-					btCollisionObject*	m_collisionObject;
-					btTriangleMeshShape*	m_triangleMesh;
-
-					BridgeTriangleRaycastCallback( const btVector3& from,const btVector3& to,
-						btCollisionWorld::RayResultCallback* resultCallback, btCollisionObject* collisionObject,btTriangleMeshShape*	triangleMesh):
-						btTriangleRaycastCallback(from,to),
-							m_resultCallback(resultCallback),
-							m_collisionObject(collisionObject),
-							m_triangleMesh(triangleMesh)
-						{
-						}
-
-
-					virtual btScalar reportHit(const btVector3& hitNormalLocal, btScalar hitFraction, int partId, int triangleIndex )
-					{
-						btCollisionWorld::LocalShapeInfo	shapeInfo;
-						shapeInfo.m_shapePart = partId;
-						shapeInfo.m_triangleIndex = triangleIndex;
-
-						btCollisionWorld::LocalRayResult rayResult
-						(m_collisionObject,
-							&shapeInfo,
-							hitNormalLocal,
-							hitFraction);
-
-						bool	normalInWorldSpace = false;
-						return m_resultCallback->addSingleResult(rayResult,normalInWorldSpace);
-
-
-					}
-
-				};
-
-
-				BridgeTriangleRaycastCallback	rcb(rayFromLocal,rayToLocal,&resultCallback,collisionObject,triangleMesh);
-				rcb.m_hitFraction = resultCallback.m_closestHitFraction;
-
-				btVector3 rayAabbMinLocal = rayFromLocal;
-				rayAabbMinLocal.setMin(rayToLocal);
-				btVector3 rayAabbMaxLocal = rayFromLocal;
-				rayAabbMaxLocal.setMax(rayToLocal);
-
-				triangleMesh->processAllTriangles(&rcb,rayAabbMinLocal,rayAabbMaxLocal);
-			}
-		} else {
-			//todo: use AABB tree or other BVH acceleration structure!
-			if (collisionShape->isCompound())
-			{
-				const btCompoundShape* compoundShape = static_cast<const btCompoundShape*>(collisionShape);
-				int i=0;
-				for (i=0;i<compoundShape->getNumChildShapes();i++)
-				{
-					btTransform childTrans = compoundShape->getChildTransform(i);
-					const btCollisionShape* childCollisionShape = compoundShape->getChildShape(i);
-					btTransform childWorldTrans = colObjWorldTransform * childTrans;
-					rayTestSingle(rayFromTrans,rayToTrans,
-						collisionObject,
-						childCollisionShape,
-						childWorldTrans,
-						resultCallback);
-
-				}
-			}
-		}
-	}
+	objectQuerySingle(&pointShape,rayFromTrans,rayToTrans,
+					  collisionObject,
+					  collisionShape,
+					  colObjWorldTransform,
+					  resultCallback,collisionFilterMask,faceNormal);
 }
 
-void	btCollisionWorld::objectQuerySingle(const btConvexShape* castShape,const btTransform& convexFromTrans,const btTransform& convexToTrans,
+void	btCollisionWorld::objectQuerySingle(const btConvexShape* castShape,const btTransform& rayFromTrans,const btTransform& rayToTrans,
 					  btCollisionObject* collisionObject,
 					  const btCollisionShape* collisionShape,
 					  const btTransform& colObjWorldTransform,
-					  ConvexResultCallback& resultCallback, btScalar allowedPenetration)
+					  RayResultCallback& resultCallback,
+					  short int collisionFilterMask,
+					  bool faceNormal)
 {
+	
+
 	if (collisionShape->isConvex())
-	{
-		btConvexCast::CastResult castResult;
-		castResult.m_allowedPenetration = allowedPenetration;
-		castResult.m_fraction = btScalar(1.);//??
-
-		btConvexShape* convexShape = (btConvexShape*) collisionShape;
-		btVoronoiSimplexSolver	simplexSolver;
-		btGjkEpaPenetrationDepthSolver	gjkEpaPenetrationSolver;
-		
-		btContinuousConvexCollision convexCaster1(castShape,convexShape,&simplexSolver,&gjkEpaPenetrationSolver);
-		//btGjkConvexCast convexCaster2(castShape,convexShape,&simplexSolver);
-		//btSubsimplexConvexCast convexCaster3(castShape,convexShape,&simplexSolver);
-
-		btConvexCast* castPtr = &convexCaster1;
-	
-	
-		
-		if (castPtr->calcTimeOfImpact(convexFromTrans,convexToTrans,colObjWorldTransform,colObjWorldTransform,castResult))
-		{
-			//add hit
-			if (castResult.m_normal.length2() > btScalar(0.0001))
 			{
-				if (castResult.m_fraction < resultCallback.m_closestHitFraction)
+				btConvexCast::CastResult castResult;
+				castResult.m_fraction = btScalar(1.);//??
+
+				btConvexShape* convexShape = (btConvexShape*) collisionShape;
+				btVoronoiSimplexSolver	simplexSolver;
+				btSubsimplexConvexCast convexCaster(castShape,convexShape,&simplexSolver);
+				//GjkConvexCast	convexCaster(castShape,convexShape,&simplexSolver);
+				//ContinuousConvexCollision convexCaster(castShape,convexShape,&simplexSolver,0);
+				
+				if (convexCaster.calcTimeOfImpact(rayFromTrans,rayToTrans,colObjWorldTransform,colObjWorldTransform,castResult))
 				{
-					castResult.m_normal.normalize();
-					btCollisionWorld::LocalConvexResult localConvexResult
+					//add hit
+					if (castResult.m_normal.length2() > btScalar(0.0001))
+					{
+						castResult.m_normal.normalize();
+						if (castResult.m_fraction < resultCallback.m_closestHitFraction)
+						{
+
+							btCollisionWorld::LocalRayResult localRayResult
 								(
-									collisionObject,
+									collisionObject, 
 									0,
 									castResult.m_normal,
-									castResult.m_hitPoint,
 									castResult.m_fraction
 								);
 
-					bool normalInWorldSpace = true;
-					resultCallback.addSingleResult(localConvexResult, normalInWorldSpace);
+							resultCallback.AddSingleResult(localRayResult);
 
+						}
+					}
 				}
 			}
-		}
-	} else {
-		if (collisionShape->isConcave())
-		{
-			if (collisionShape->getShapeType()==TRIANGLE_MESH_SHAPE_PROXYTYPE)
+			else
 			{
-				btBvhTriangleMeshShape* triangleMesh = (btBvhTriangleMeshShape*)collisionShape;
-				btTransform worldTocollisionObject = colObjWorldTransform.inverse();
-				btVector3 convexFromLocal = worldTocollisionObject * convexFromTrans.getOrigin();
-				btVector3 convexToLocal = worldTocollisionObject * convexToTrans.getOrigin();
-				// rotation of box in local mesh space = MeshRotation^-1 * ConvexToRotation
-				btTransform rotationXform = btTransform(worldTocollisionObject.getBasis() * convexToTrans.getBasis());
-
-				//ConvexCast::CastResult
-				struct BridgeTriangleConvexcastCallback : public btTriangleConvexcastCallback
-				{
-					btCollisionWorld::ConvexResultCallback* m_resultCallback;
-					btCollisionObject*	m_collisionObject;
-					btTriangleMeshShape*	m_triangleMesh;
-
-					BridgeTriangleConvexcastCallback(const btConvexShape* castShape, const btTransform& from,const btTransform& to,
-						btCollisionWorld::ConvexResultCallback* resultCallback, btCollisionObject* collisionObject,btTriangleMeshShape*	triangleMesh, const btTransform& triangleToWorld):
-						btTriangleConvexcastCallback(castShape, from,to, triangleToWorld, triangleMesh->getMargin()),
-							m_resultCallback(resultCallback),
-							m_collisionObject(collisionObject),
-							m_triangleMesh(triangleMesh)
-						{
-						}
-
-
-					virtual btScalar reportHit(const btVector3& hitNormalLocal, const btVector3& hitPointLocal, btScalar hitFraction, int partId, int triangleIndex )
+				
+				if (collisionShape->isConcave())
 					{
-						btCollisionWorld::LocalShapeInfo	shapeInfo;
-						shapeInfo.m_shapePart = partId;
-						shapeInfo.m_triangleIndex = triangleIndex;
-						if (hitFraction <= m_resultCallback->m_closestHitFraction)
+
+						btTriangleMeshShape* triangleMesh = (btTriangleMeshShape*)collisionShape;
+						
+						btTransform worldTocollisionObject = colObjWorldTransform.inverse();
+
+						btVector3 rayFromLocal = worldTocollisionObject * rayFromTrans.getOrigin();
+						btVector3 rayToLocal = worldTocollisionObject * rayToTrans.getOrigin();
+
+						//ConvexCast::CastResult
+
+						struct BridgeTriangleRaycastCallback : public btTriangleRaycastCallback 
 						{
+							btCollisionWorld::RayResultCallback* m_resultCallback;
+							btCollisionObject*	m_collisionObject;
+							btTriangleMeshShape*	m_triangleMesh;
 
-							btCollisionWorld::LocalConvexResult convexResult
-							(m_collisionObject,
-								&shapeInfo,
-								hitNormalLocal,
-								hitPointLocal,
-								hitFraction);
-
-							bool	normalInWorldSpace = true;
+							BridgeTriangleRaycastCallback( const btVector3& from,const btVector3& to,bool faceNormal,
+								btCollisionWorld::RayResultCallback* resultCallback, btCollisionObject* collisionObject,btTriangleMeshShape* triangleMesh):
+								btTriangleRaycastCallback(from,to,faceNormal),
+									m_resultCallback(resultCallback),
+									m_collisionObject(collisionObject),
+									m_triangleMesh(triangleMesh)
+								{
+								}
 
 
-							return m_resultCallback->addSingleResult(convexResult,normalInWorldSpace);
-						}
-						return hitFraction;
-					}
-
-				};
-
-				BridgeTriangleConvexcastCallback tccb(castShape, convexFromTrans,convexToTrans,&resultCallback,collisionObject,triangleMesh, colObjWorldTransform);
-				tccb.m_hitFraction = resultCallback.m_closestHitFraction;
-				btVector3 boxMinLocal, boxMaxLocal;
-				castShape->getAabb(rotationXform, boxMinLocal, boxMaxLocal);
-				triangleMesh->performConvexcast(&tccb,convexFromLocal,convexToLocal,boxMinLocal, boxMaxLocal);
-			} else
-			{
-				btBvhTriangleMeshShape* triangleMesh = (btBvhTriangleMeshShape*)collisionShape;
-				btTransform worldTocollisionObject = colObjWorldTransform.inverse();
-				btVector3 convexFromLocal = worldTocollisionObject * convexFromTrans.getOrigin();
-				btVector3 convexToLocal = worldTocollisionObject * convexToTrans.getOrigin();
-				// rotation of box in local mesh space = MeshRotation^-1 * ConvexToRotation
-				btTransform rotationXform = btTransform(worldTocollisionObject.getBasis() * convexToTrans.getBasis());
-
-				//ConvexCast::CastResult
-				struct BridgeTriangleConvexcastCallback : public btTriangleConvexcastCallback
-				{
-					btCollisionWorld::ConvexResultCallback* m_resultCallback;
-					btCollisionObject*	m_collisionObject;
-					btTriangleMeshShape*	m_triangleMesh;
-
-					BridgeTriangleConvexcastCallback(const btConvexShape* castShape, const btTransform& from,const btTransform& to,
-						btCollisionWorld::ConvexResultCallback* resultCallback, btCollisionObject* collisionObject,btTriangleMeshShape*	triangleMesh, const btTransform& triangleToWorld):
-						btTriangleConvexcastCallback(castShape, from,to, triangleToWorld, triangleMesh->getMargin()),
-							m_resultCallback(resultCallback),
-							m_collisionObject(collisionObject),
-							m_triangleMesh(triangleMesh)
-						{
-						}
+							virtual btScalar reportHit(const btVector3& hitNormalLocal, btScalar hitFraction, int partId, int triangleIndex )
+							{
+								btCollisionWorld::LocalShapeInfo	shapeInfo;
+								shapeInfo.m_shapePart = partId;
+								shapeInfo.m_triangleIndex = triangleIndex;
+								shapeInfo.m_triangleShape = m_triangleMesh;
+								
+								btCollisionWorld::LocalRayResult rayResult
+								(m_collisionObject, 
+									&shapeInfo,
+									hitNormalLocal,
+									hitFraction);
+								
+								return m_resultCallback->AddSingleResult(rayResult);
+								
+								
+							}
+	
+						};
 
 
-					virtual btScalar reportHit(const btVector3& hitNormalLocal, const btVector3& hitPointLocal, btScalar hitFraction, int partId, int triangleIndex )
+						BridgeTriangleRaycastCallback	rcb(rayFromLocal,rayToLocal,faceNormal,&resultCallback,collisionObject,triangleMesh);
+						rcb.m_hitFraction = resultCallback.m_closestHitFraction;
+
+						btVector3 rayAabbMinLocal = rayFromLocal;
+						rayAabbMinLocal.setMin(rayToLocal);
+						btVector3 rayAabbMaxLocal = rayFromLocal;
+						rayAabbMaxLocal.setMax(rayToLocal);
+
+						triangleMesh->processAllTriangles(&rcb,rayAabbMinLocal,rayAabbMaxLocal);
+											
+					} else
 					{
-						btCollisionWorld::LocalShapeInfo	shapeInfo;
-						shapeInfo.m_shapePart = partId;
-						shapeInfo.m_triangleIndex = triangleIndex;
-						if (hitFraction <= m_resultCallback->m_closestHitFraction)
+						//todo: use AABB tree or other BVH acceleration structure!
+						if (collisionShape->isCompound())
 						{
+							const btCompoundShape* compoundShape = static_cast<const btCompoundShape*>(collisionShape);
+							int i=0;
+							for (i=0;i<compoundShape->getNumChildShapes();i++)
+							{
+								btTransform childTrans = compoundShape->getChildTransform(i);
+								const btCollisionShape* childCollisionShape = compoundShape->getChildShape(i);
+								btTransform childWorldTrans = colObjWorldTransform * childTrans;
+								objectQuerySingle(castShape, rayFromTrans,rayToTrans,
+									collisionObject,
+									childCollisionShape,
+									childWorldTrans,
+									resultCallback, collisionFilterMask, faceNormal);
 
-							btCollisionWorld::LocalConvexResult convexResult
-							(m_collisionObject,
-								&shapeInfo,
-								hitNormalLocal,
-								hitPointLocal,
-								hitFraction);
+							}
 
-							bool	normalInWorldSpace = false;
 
-							return m_resultCallback->addSingleResult(convexResult,normalInWorldSpace);
 						}
-						return hitFraction;
 					}
-
-				};
-
-				BridgeTriangleConvexcastCallback tccb(castShape, convexFromTrans,convexToTrans,&resultCallback,collisionObject,triangleMesh, colObjWorldTransform);
-				tccb.m_hitFraction = resultCallback.m_closestHitFraction;
-				btVector3 boxMinLocal, boxMaxLocal;
-				castShape->getAabb(rotationXform, boxMinLocal, boxMaxLocal);
-
-				btVector3 rayAabbMinLocal = convexFromLocal;
-				rayAabbMinLocal.setMin(convexToLocal);
-				btVector3 rayAabbMaxLocal = convexFromLocal;
-				rayAabbMaxLocal.setMax(convexToLocal);
-				rayAabbMinLocal += boxMinLocal;
-				rayAabbMaxLocal += boxMaxLocal;
-				triangleMesh->processAllTriangles(&tccb,rayAabbMinLocal,rayAabbMaxLocal);
 			}
-		} else {
-			//todo: use AABB tree or other BVH acceleration structure!
-			if (collisionShape->isCompound())
-			{
-				const btCompoundShape* compoundShape = static_cast<const btCompoundShape*>(collisionShape);
-				int i=0;
-				for (i=0;i<compoundShape->getNumChildShapes();i++)
-				{
-					btTransform childTrans = compoundShape->getChildTransform(i);
-					const btCollisionShape* childCollisionShape = compoundShape->getChildShape(i);
-					btTransform childWorldTrans = colObjWorldTransform * childTrans;
-					objectQuerySingle(castShape, convexFromTrans,convexToTrans,
-						collisionObject,
-						childCollisionShape,
-						childWorldTrans,
-						resultCallback, allowedPenetration);
-				}
-			}
-		}
-	}
 }
 
-void	btCollisionWorld::rayTest(const btVector3& rayFromWorld, const btVector3& rayToWorld, RayResultCallback& resultCallback) const
+void	btCollisionWorld::rayTest(const btVector3& rayFromWorld, const btVector3& rayToWorld, RayResultCallback& resultCallback,short int collisionFilterMask, bool faceNormal)
 {
 
-
+	
 	btTransform	rayFromTrans,rayToTrans;
 	rayFromTrans.setIdentity();
 	rayFromTrans.setOrigin(rayFromWorld);
 	rayToTrans.setIdentity();
-
+	
 	rayToTrans.setOrigin(rayToWorld);
 
 	/// go over all objects, and if the ray intersects their aabb, do a ray-shape query using convexCaster (CCD)
-
+	
 	int i;
 	for (i=0;i<m_collisionObjects.size();i++)
 	{
-		///terminate further ray tests, once the closestHitFraction reached zero
-		if (resultCallback.m_closestHitFraction == btScalar(0.f))
-			break;
-
 		btCollisionObject*	collisionObject= m_collisionObjects[i];
 		//only perform raycast if filterMask matches
-		if(resultCallback.needsCollision(collisionObject->getBroadphaseHandle())) {
+		if(collisionObject->getBroadphaseHandle()->m_collisionFilterGroup & collisionFilterMask) { 
 			//RigidcollisionObject* collisionObject = ctrl->GetRigidcollisionObject();
 			btVector3 collisionObjectAabbMin,collisionObjectAabbMax;
 			collisionObject->getCollisionShape()->getAabb(collisionObject->getWorldTransform(),collisionObjectAabbMin,collisionObjectAabbMax);
 
-			btScalar hitLambda = resultCallback.m_closestHitFraction;
+			btScalar hitLambda = btScalar(1.); //could use resultCallback.m_closestHitFraction, but needs testing
 			btVector3 hitNormal;
 			if (btRayAabb(rayFromWorld,rayToWorld,collisionObjectAabbMin,collisionObjectAabbMax,hitLambda,hitNormal))
 			{
-				rayTestSingle(rayFromTrans,rayToTrans,
-					collisionObject,
-						collisionObject->getCollisionShape(),
-						collisionObject->getWorldTransform(),
-						resultCallback);
-			}
-		}
-
-	}
-
-}
-
-void	btCollisionWorld::convexSweepTest(const btConvexShape* castShape, const btTransform& convexFromWorld, const btTransform& convexToWorld, ConvexResultCallback& resultCallback) const
-{
-	btTransform	convexFromTrans,convexToTrans;
-	convexFromTrans = convexFromWorld;
-	convexToTrans = convexToWorld;
-	btVector3 castShapeAabbMin, castShapeAabbMax;
-	/* Compute AABB that encompasses angular movement */
-	{
-		btVector3 linVel, angVel;
-		btTransformUtil::calculateVelocity (convexFromTrans, convexToTrans, 1.0, linVel, angVel);
-		btTransform R;
-		R.setIdentity ();
-		R.setRotation (convexFromTrans.getRotation());
-		castShape->calculateTemporalAabb (R, linVel, angVel, 1.0, castShapeAabbMin, castShapeAabbMax);
-	}
-
-	/// go over all objects, and if the ray intersects their aabb + cast shape aabb,
-	// do a ray-shape query using convexCaster (CCD)
-	int i;
-	for (i=0;i<m_collisionObjects.size();i++)
-	{
-		btCollisionObject*	collisionObject= m_collisionObjects[i];
-		//only perform raycast if filterMask matches
-		if(resultCallback.needsCollision(collisionObject->getBroadphaseHandle())) {
-			//RigidcollisionObject* collisionObject = ctrl->GetRigidcollisionObject();
-			btVector3 collisionObjectAabbMin,collisionObjectAabbMax;
-			collisionObject->getCollisionShape()->getAabb(collisionObject->getWorldTransform(),collisionObjectAabbMin,collisionObjectAabbMax);
-			AabbExpand (collisionObjectAabbMin, collisionObjectAabbMax, castShapeAabbMin, castShapeAabbMax);
-			btScalar hitLambda = btScalar(1.); //could use resultCallback.m_closestHitFraction, but needs testing
-			btVector3 hitNormal;
-			if (btRayAabb(convexFromWorld.getOrigin(),convexToWorld.getOrigin(),collisionObjectAabbMin,collisionObjectAabbMax,hitLambda,hitNormal))
-			{
-				objectQuerySingle(castShape, convexFromTrans,convexToTrans,
-					collisionObject,
-						collisionObject->getCollisionShape(),
-						collisionObject->getWorldTransform(),
-						resultCallback,
-						getDispatchInfo().m_allowedCcdPenetration);
-			}
+				// before testing this object, verify that it is not filtered out
+				if (resultCallback.NeedRayCast(collisionObject))
+				{
+					rayTestSingle(rayFromTrans,rayToTrans,
+						collisionObject,
+							collisionObject->getCollisionShape(),
+							collisionObject->getWorldTransform(),
+							resultCallback,
+							collisionFilterMask,
+							faceNormal);
+				}
+			}	
 		}
 	}
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h
index 7557691a9a9..ed41232ece3 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h
@@ -68,12 +68,12 @@ class btStackAlloc;
 class btCollisionShape;
 class btConvexShape;
 class btBroadphaseInterface;
-#include "LinearMath/btVector3.h"
-#include "LinearMath/btTransform.h"
+#include "../../LinearMath/btVector3.h"
+#include "../../LinearMath/btTransform.h"
 #include "btCollisionObject.h"
 #include "btCollisionDispatcher.h" //for definition of btCollisionObjectArray
-#include "BulletCollision/BroadphaseCollision/btOverlappingPairCache.h"
-#include "LinearMath/btAlignedObjectArray.h"
+#include "../BroadphaseCollision/btOverlappingPairCache.h"
+#include "../../LinearMath/btAlignedObjectArray.h"
 
 ///CollisionWorld is interface and container for the collision detection
 class btCollisionWorld
@@ -90,22 +90,18 @@ protected:
 
 	btStackAlloc*	m_stackAlloc;
 
-	btBroadphaseInterface*	m_broadphasePairCache;
-
-	btIDebugDraw*	m_debugDrawer;
-
+	btOverlappingPairCache*	m_broadphasePairCache;
 	
+	bool	m_ownsDispatcher;
+	bool	m_ownsBroadphasePairCache;
+
 public:
 
 	//this constructor doesn't own the dispatcher and paircache/broadphase
-	btCollisionWorld(btDispatcher* dispatcher,btBroadphaseInterface* broadphasePairCache, btCollisionConfiguration* collisionConfiguration);
+	btCollisionWorld(btDispatcher* dispatcher,btOverlappingPairCache* pairCache, int stackSize = 2*1024*1024);
 
 	virtual ~btCollisionWorld();
 
-	void	setBroadphase(btBroadphaseInterface*	pairCache)
-	{
-		m_broadphasePairCache = pairCache;
-	}
 
 	btBroadphaseInterface*	getBroadphase()
 	{
@@ -114,7 +110,7 @@ public:
 
 	btOverlappingPairCache*	getPairCache()
 	{
-		return m_broadphasePairCache->getOverlappingPairCache();
+		return m_broadphasePairCache;
 	}
 
 
@@ -123,32 +119,14 @@ public:
 		return m_dispatcher1;
 	}
 
-	const btDispatcher*	getDispatcher() const
-	{
-		return m_dispatcher1;
-	}
-
-	virtual void	updateAabbs();
-
-	virtual void	setDebugDrawer(btIDebugDraw*	debugDrawer)
-	{
-			m_debugDrawer = debugDrawer;
-	}
-
-	virtual btIDebugDraw*	getDebugDrawer()
-	{
-		return m_debugDrawer;
-	}
-
-
 	///LocalShapeInfo gives extra information for complex shapes
 	///Currently, only btTriangleMeshShape is available, so it just contains triangleIndex and subpart
 	struct	LocalShapeInfo
 	{
 		int	m_shapePart;
 		int	m_triangleIndex;
-		
-		//const btCollisionShape*	m_shapeTemp;
+		// needed in case of compound shape
+		const btCollisionShape*	m_triangleShape;
 		//const btTransform*	m_shapeLocalTransform;
 	};
 
@@ -175,43 +153,32 @@ public:
 	///RayResultCallback is used to report new raycast results
 	struct	RayResultCallback
 	{
-		btScalar	m_closestHitFraction;
-		btCollisionObject*		m_collisionObject;
-		short int	m_collisionFilterGroup;
-		short int	m_collisionFilterMask;
-
 		virtual ~RayResultCallback()
 		{
 		}
-		bool	hasHit() const
+		btScalar	m_closestHitFraction;
+		bool	HasHit()
 		{
-			return (m_collisionObject != 0);
+			return (m_closestHitFraction < btScalar(1.));
 		}
 
 		RayResultCallback()
-			:m_closestHitFraction(btScalar(1.)),
-			m_collisionObject(0),
-			m_collisionFilterGroup(btBroadphaseProxy::DefaultFilter),
-			m_collisionFilterMask(btBroadphaseProxy::AllFilter)
+			:m_closestHitFraction(btScalar(1.))
 		{
 		}
-
-		virtual bool needsCollision(btBroadphaseProxy* proxy0) const
+		virtual bool        NeedRayCast(btCollisionObject* object)
 		{
-			bool collides = (proxy0->m_collisionFilterGroup & m_collisionFilterMask) != 0;
-			collides = collides && (m_collisionFilterGroup & proxy0->m_collisionFilterMask);
-			return collides;
+			return true;
 		}
-
-
-		virtual	btScalar	addSingleResult(LocalRayResult& rayResult,bool normalInWorldSpace) = 0;
+		virtual	btScalar	AddSingleResult(LocalRayResult& rayResult) = 0;
 	};
 
 	struct	ClosestRayResultCallback : public RayResultCallback
 	{
 		ClosestRayResultCallback(const btVector3&	rayFromWorld,const btVector3&	rayToWorld)
 		:m_rayFromWorld(rayFromWorld),
-		m_rayToWorld(rayToWorld)
+		m_rayToWorld(rayToWorld),
+		m_collisionObject(0)
 		{
 		}
 
@@ -220,121 +187,24 @@ public:
 
 		btVector3	m_hitNormalWorld;
 		btVector3	m_hitPointWorld;
-			
-		virtual	btScalar	addSingleResult(LocalRayResult& rayResult,bool normalInWorldSpace)
+		btCollisionObject*	m_collisionObject;
+		
+		virtual	btScalar	AddSingleResult(LocalRayResult& rayResult)
 		{
-			//caller already does the filter on the m_closestHitFraction
-			btAssert(rayResult.m_hitFraction <= m_closestHitFraction);
+
+//caller already does the filter on the m_closestHitFraction
+			assert(rayResult.m_hitFraction <= m_closestHitFraction);
 			
 			m_closestHitFraction = rayResult.m_hitFraction;
 			m_collisionObject = rayResult.m_collisionObject;
-			if (normalInWorldSpace)
-			{
-				m_hitNormalWorld = rayResult.m_hitNormalLocal;
-			} else
-			{
-				///need to transform normal into worldspace
-				m_hitNormalWorld = m_collisionObject->getWorldTransform().getBasis()*rayResult.m_hitNormalLocal;
-			}
+			m_hitNormalWorld = m_collisionObject->getWorldTransform().getBasis()*rayResult.m_hitNormalLocal;
 			m_hitPointWorld.setInterpolate3(m_rayFromWorld,m_rayToWorld,rayResult.m_hitFraction);
 			return rayResult.m_hitFraction;
 		}
 	};
 
 
-	struct LocalConvexResult
-	{
-		LocalConvexResult(btCollisionObject*	hitCollisionObject, 
-			LocalShapeInfo*	localShapeInfo,
-			const btVector3&		hitNormalLocal,
-			const btVector3&		hitPointLocal,
-			btScalar hitFraction
-			)
-		:m_hitCollisionObject(hitCollisionObject),
-		m_localShapeInfo(localShapeInfo),
-		m_hitNormalLocal(hitNormalLocal),
-		m_hitPointLocal(hitPointLocal),
-		m_hitFraction(hitFraction)
-		{
-		}
-
-		btCollisionObject*		m_hitCollisionObject;
-		LocalShapeInfo*			m_localShapeInfo;
-		btVector3				m_hitNormalLocal;
-		btVector3				m_hitPointLocal;
-		btScalar				m_hitFraction;
-	};
-
-	///RayResultCallback is used to report new raycast results
-	struct	ConvexResultCallback
-	{
-		btScalar	m_closestHitFraction;
-		short int	m_collisionFilterGroup;
-		short int	m_collisionFilterMask;
-		
-		ConvexResultCallback()
-			:m_closestHitFraction(btScalar(1.)),
-			m_collisionFilterGroup(btBroadphaseProxy::DefaultFilter),
-			m_collisionFilterMask(btBroadphaseProxy::AllFilter)
-		{
-		}
-
-		virtual ~ConvexResultCallback()
-		{
-		}
-		
-		bool	hasHit() const
-		{
-			return (m_closestHitFraction < btScalar(1.));
-		}
-
-		
-
-		virtual bool needsCollision(btBroadphaseProxy* proxy0) const
-		{
-			bool collides = (proxy0->m_collisionFilterGroup & m_collisionFilterMask) != 0;
-			collides = collides && (m_collisionFilterGroup & proxy0->m_collisionFilterMask);
-			return collides;
-		}
-
-		virtual	btScalar	addSingleResult(LocalConvexResult& convexResult,bool normalInWorldSpace) = 0;
-	};
-
-	struct	ClosestConvexResultCallback : public ConvexResultCallback
-	{
-		ClosestConvexResultCallback(const btVector3&	convexFromWorld,const btVector3&	convexToWorld)
-		:m_convexFromWorld(convexFromWorld),
-		m_convexToWorld(convexToWorld),
-		m_hitCollisionObject(0)
-		{
-		}
-
-		btVector3	m_convexFromWorld;//used to calculate hitPointWorld from hitFraction
-		btVector3	m_convexToWorld;
-
-		btVector3	m_hitNormalWorld;
-		btVector3	m_hitPointWorld;
-		btCollisionObject*	m_hitCollisionObject;
-		
-		virtual	btScalar	addSingleResult(LocalConvexResult& convexResult,bool normalInWorldSpace)
-		{
-//caller already does the filter on the m_closestHitFraction
-			btAssert(convexResult.m_hitFraction <= m_closestHitFraction);
-						
-			m_closestHitFraction = convexResult.m_hitFraction;
-			m_hitCollisionObject = convexResult.m_hitCollisionObject;
-			if (normalInWorldSpace)
-			{
-				m_hitNormalWorld = convexResult.m_hitNormalLocal;
-			} else
-			{
-				///need to transform normal into worldspace
-				m_hitNormalWorld = m_hitCollisionObject->getWorldTransform().getBasis()*convexResult.m_hitNormalLocal;
-			}
-			m_hitPointWorld = convexResult.m_hitPointLocal;
-			return convexResult.m_hitFraction;
-		}
-	};
+	
 
 	int	getNumCollisionObjects() const
 	{
@@ -343,12 +213,7 @@ public:
 
 	/// rayTest performs a raycast on all objects in the btCollisionWorld, and calls the resultCallback
 	/// This allows for several queries: first hit, all hits, any hit, dependent on the value returned by the callback.
-	void	rayTest(const btVector3& rayFromWorld, const btVector3& rayToWorld, RayResultCallback& resultCallback) const; 
-
-	// convexTest performs a swept convex cast on all objects in the btCollisionWorld, and calls the resultCallback
-	// This allows for several queries: first hit, all hits, any hit, dependent on the value return by the callback.
-	void    convexSweepTest (const btConvexShape* castShape, const btTransform& from, const btTransform& to, ConvexResultCallback& resultCallback) const;
-
+	void	rayTest(const btVector3& rayFromWorld, const btVector3& rayToWorld, RayResultCallback& resultCallback, short int collisionFilterMask=-1, bool faceNormal=false);
 
 	/// rayTestSingle performs a raycast call and calls the resultCallback. It is used internally by rayTest.
 	/// In a future implementation, we consider moving the ray test as a virtual method in btCollisionShape.
@@ -357,16 +222,20 @@ public:
 					  btCollisionObject* collisionObject,
 					  const btCollisionShape* collisionShape,
 					  const btTransform& colObjWorldTransform,
-					  RayResultCallback& resultCallback);
+					  RayResultCallback& resultCallback, 
+					  short int collisionFilterMask=-1,
+					  bool faceNormal=false);
 
 	/// objectQuerySingle performs a collision detection query and calls the resultCallback. It is used internally by rayTest.
 	static void	objectQuerySingle(const btConvexShape* castShape, const btTransform& rayFromTrans,const btTransform& rayToTrans,
 					  btCollisionObject* collisionObject,
 					  const btCollisionShape* collisionShape,
 					  const btTransform& colObjWorldTransform,
-					  ConvexResultCallback& resultCallback, btScalar	allowedPenetration);
+					  RayResultCallback& resultCallback, 
+					  short int collisionFilterMask=-1,
+					  bool faceNormal=false);
 
-	void	addCollisionObject(btCollisionObject* collisionObject,short int collisionFilterGroup=btBroadphaseProxy::DefaultFilter,short int collisionFilterMask=btBroadphaseProxy::AllFilter);
+	void	addCollisionObject(btCollisionObject* collisionObject,short int collisionFilterGroup=1,short int collisionFilterMask=1);
 
 	btCollisionObjectArray& getCollisionObjectArray()
 	{
@@ -388,11 +257,6 @@ public:
 		return m_dispatchInfo;
 	}
 
-	const btDispatcherInfo& getDispatchInfo() const
-	{
-		return m_dispatchInfo;
-	}
-
 };
 
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp
index a29a6d624e5..92f4c8b28a6 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp
@@ -19,8 +19,7 @@ subject to the following restrictions:
 
 
 btCompoundCollisionAlgorithm::btCompoundCollisionAlgorithm( const btCollisionAlgorithmConstructionInfo& ci,btCollisionObject* body0,btCollisionObject* body1,bool isSwapped)
-:btCollisionAlgorithm(ci),
-m_isSwapped(isSwapped)
+:m_isSwapped(isSwapped)
 {
 	btCollisionObject* colObj = m_isSwapped? body1 : body0;
 	btCollisionObject* otherObj = m_isSwapped? body0 : body1;
@@ -33,11 +32,11 @@ m_isSwapped(isSwapped)
 	m_childCollisionAlgorithms.resize(numChildren);
 	for (i=0;i<numChildren;i++)
 	{
-		btCollisionShape* tmpShape = colObj->getCollisionShape();
 		btCollisionShape* childShape = compoundShape->getChildShape(i);
-		colObj->internalSetTemporaryCollisionShape( childShape );
-		m_childCollisionAlgorithms[i] = ci.m_dispatcher1->findAlgorithm(colObj,otherObj);
-		colObj->internalSetTemporaryCollisionShape( tmpShape );
+		btCollisionShape* orgShape = colObj->getCollisionShape();
+		colObj->setCollisionShape( childShape );
+		m_childCollisionAlgorithms[i] = ci.m_dispatcher->findAlgorithm(colObj,otherObj);
+		colObj->setCollisionShape( orgShape );
 	}
 }
 
@@ -48,8 +47,7 @@ btCompoundCollisionAlgorithm::~btCompoundCollisionAlgorithm()
 	int i;
 	for (i=0;i<numChildren;i++)
 	{
-		m_childCollisionAlgorithms[i]->~btCollisionAlgorithm();
-		m_dispatcher->freeCollisionAlgorithm(m_childCollisionAlgorithms[i]);
+		delete m_childCollisionAlgorithms[i];
 	}
 }
 
@@ -77,21 +75,17 @@ void btCompoundCollisionAlgorithm::processCollision (btCollisionObject* body0,bt
 
 		//backup
 		btTransform	orgTrans = colObj->getWorldTransform();
-		btTransform	orgInterpolationTrans = colObj->getInterpolationWorldTransform();
+		btCollisionShape* orgShape = colObj->getCollisionShape();
 
 		const btTransform& childTrans = compoundShape->getChildTransform(i);
-		btTransform	newChildWorldTrans = orgTrans*childTrans ;
-		colObj->setWorldTransform( newChildWorldTrans);
-		colObj->setInterpolationWorldTransform(newChildWorldTrans);
-
+		//btTransform	newChildWorldTrans = orgTrans*childTrans ;
+		colObj->setWorldTransform( orgTrans*childTrans );
 		//the contactpoint is still projected back using the original inverted worldtrans
-		btCollisionShape* tmpShape = colObj->getCollisionShape();
-		colObj->internalSetTemporaryCollisionShape( childShape );
+		colObj->setCollisionShape( childShape );
 		m_childCollisionAlgorithms[i]->processCollision(colObj,otherObj,dispatchInfo,resultOut);
 		//revert back
-		colObj->internalSetTemporaryCollisionShape( tmpShape);
+		colObj->setCollisionShape( orgShape);
 		colObj->setWorldTransform(  orgTrans );
-		colObj->setInterpolationWorldTransform(orgInterpolationTrans);
 	}
 }
 
@@ -123,20 +117,20 @@ btScalar	btCompoundCollisionAlgorithm::calculateTimeOfImpact(btCollisionObject*
 
 		//backup
 		btTransform	orgTrans = colObj->getWorldTransform();
-	
+		btCollisionShape* orgShape = colObj->getCollisionShape();
+
 		const btTransform& childTrans = compoundShape->getChildTransform(i);
 		//btTransform	newChildWorldTrans = orgTrans*childTrans ;
 		colObj->setWorldTransform( orgTrans*childTrans );
 
-		btCollisionShape* tmpShape = colObj->getCollisionShape();
-		colObj->internalSetTemporaryCollisionShape( childShape );
+		colObj->setCollisionShape( childShape );
 		btScalar frac = m_childCollisionAlgorithms[i]->calculateTimeOfImpact(colObj,otherObj,dispatchInfo,resultOut);
 		if (frac<hitFraction)
 		{
 			hitFraction = frac;
 		}
 		//revert back
-		colObj->internalSetTemporaryCollisionShape( tmpShape);
+		colObj->setCollisionShape( orgShape);
 		colObj->setWorldTransform( orgTrans);
 	}
 	return hitFraction;
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h
index 1682c6761cd..7091b233b46 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h
@@ -16,16 +16,15 @@ subject to the following restrictions:
 #ifndef COMPOUND_COLLISION_ALGORITHM_H
 #define COMPOUND_COLLISION_ALGORITHM_H
 
-#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
-#include "BulletCollision/BroadphaseCollision/btDispatcher.h"
-#include "BulletCollision/BroadphaseCollision/btBroadphaseInterface.h"
+#include "../BroadphaseCollision/btCollisionAlgorithm.h"
+#include "../BroadphaseCollision/btDispatcher.h"
+#include "../BroadphaseCollision/btBroadphaseInterface.h"
 
-#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h"
+#include "../NarrowPhaseCollision/btPersistentManifold.h"
 class btDispatcher;
-#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
+#include "../BroadphaseCollision/btBroadphaseProxy.h"
 #include "btCollisionCreateFunc.h"
-#include "LinearMath/btAlignedObjectArray.h"
-class btDispatcher;
+#include "../../LinearMath/btAlignedObjectArray.h"
 
 /// btCompoundCollisionAlgorithm  supports collision between CompoundCollisionShapes and other collision shapes
 /// Place holder, not fully implemented yet
@@ -44,21 +43,11 @@ public:
 
 	btScalar	calculateTimeOfImpact(btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut);
 
-	virtual	void	getAllContactManifolds(btManifoldArray&	manifoldArray)
-	{
-		int i;
-		for (i=0;i<m_childCollisionAlgorithms.size();i++)
-		{
-			m_childCollisionAlgorithms[i]->getAllContactManifolds(manifoldArray);
-		}
-	}
-
 	struct CreateFunc :public 	btCollisionAlgorithmCreateFunc
 	{
 		virtual	btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, btCollisionObject* body0,btCollisionObject* body1)
 		{
-			void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btCompoundCollisionAlgorithm));
-			return new(mem) btCompoundCollisionAlgorithm(ci,body0,body1,false);
+			return new btCompoundCollisionAlgorithm(ci,body0,body1,false);
 		}
 	};
 
@@ -66,8 +55,7 @@ public:
 	{
 		virtual	btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, btCollisionObject* body0,btCollisionObject* body1)
 		{
-			void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btCompoundCollisionAlgorithm));
-			return new(mem) btCompoundCollisionAlgorithm(ci,body0,body1,true);
+			return new btCompoundCollisionAlgorithm(ci,body0,body1,true);
 		}
 	};
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp
index 6d28904cb03..24ceacfd40d 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp
@@ -29,7 +29,7 @@ subject to the following restrictions:
 btConvexConcaveCollisionAlgorithm::btConvexConcaveCollisionAlgorithm( const btCollisionAlgorithmConstructionInfo& ci, btCollisionObject* body0,btCollisionObject* body1,bool isSwapped)
 : btCollisionAlgorithm(ci),
 m_isSwapped(isSwapped),
-m_btConvexTriangleCallback(ci.m_dispatcher1,body0,body1,isSwapped)
+m_btConvexTriangleCallback(ci.m_dispatcher,body0,body1,isSwapped)
 {
 }
 
@@ -37,13 +37,6 @@ btConvexConcaveCollisionAlgorithm::~btConvexConcaveCollisionAlgorithm()
 {
 }
 
-void	btConvexConcaveCollisionAlgorithm::getAllContactManifolds(btManifoldArray&	manifoldArray)
-{
-	if (m_btConvexTriangleCallback.m_manifoldPtr)
-	{
-		manifoldArray.push_back(m_btConvexTriangleCallback.m_manifoldPtr);
-	}
-}
 
 
 btConvexTriangleCallback::btConvexTriangleCallback(btDispatcher*  dispatcher,btCollisionObject* body0,btCollisionObject* body1,bool isSwapped):
@@ -86,7 +79,7 @@ void btConvexTriangleCallback::processTriangle(btVector3* triangle,int partId, i
 	//aabb filter is already applied!	
 
 	btCollisionAlgorithmConstructionInfo ci;
-	ci.m_dispatcher1 = m_dispatcher;
+	ci.m_dispatcher = m_dispatcher;
 
 	btCollisionObject* ob = static_cast<btCollisionObject*>(m_triBody);
 
@@ -116,11 +109,13 @@ void btConvexTriangleCallback::processTriangle(btVector3* triangle,int partId, i
 	{
 		btTriangleShape tm(triangle[0],triangle[1],triangle[2]);	
 		tm.setMargin(m_collisionMarginTriangle);
+	
 		
 		btCollisionShape* tmpShape = ob->getCollisionShape();
-		ob->internalSetTemporaryCollisionShape( &tm );
+		ob->setCollisionShape( &tm );
 		
-		btCollisionAlgorithm* colAlgo = ci.m_dispatcher1->findAlgorithm(m_convexBody,m_triBody,m_manifoldPtr);
+
+		btCollisionAlgorithm* colAlgo = ci.m_dispatcher->findAlgorithm(m_convexBody,m_triBody,m_manifoldPtr);
 		///this should use the btDispatcher, so the actual registered algorithm is used
 		//		btConvexConvexAlgorithm cvxcvxalgo(m_manifoldPtr,ci,m_convexBody,m_triBody);
 
@@ -128,11 +123,12 @@ void btConvexTriangleCallback::processTriangle(btVector3* triangle,int partId, i
 	//	cvxcvxalgo.setShapeIdentifiers(-1,-1,partId,triangleIndex);
 //		cvxcvxalgo.processCollision(m_convexBody,m_triBody,*m_dispatchInfoPtr,m_resultOut);
 		colAlgo->processCollision(m_convexBody,m_triBody,*m_dispatchInfoPtr,m_resultOut);
-		colAlgo->~btCollisionAlgorithm();
-		ci.m_dispatcher1->freeCollisionAlgorithm(colAlgo);
-		ob->internalSetTemporaryCollisionShape( tmpShape);
+		delete colAlgo;
+		ob->setCollisionShape( tmpShape );
+
 	}
 
+	
 
 }
 
@@ -192,10 +188,9 @@ void btConvexConcaveCollisionAlgorithm::processCollision (btCollisionObject* bod
 
 			concaveShape->processAllTriangles( &m_btConvexTriangleCallback,m_btConvexTriangleCallback.getAabbMin(),m_btConvexTriangleCallback.getAabbMax());
 			
-			resultOut->refreshContactPoints();
 	
 		}
-	
+
 	}
 
 }
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h
index 34b9a107be9..4915b6c20c8 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h
@@ -16,13 +16,13 @@ subject to the following restrictions:
 #ifndef CONVEX_CONCAVE_COLLISION_ALGORITHM_H
 #define CONVEX_CONCAVE_COLLISION_ALGORITHM_H
 
-#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
-#include "BulletCollision/BroadphaseCollision/btDispatcher.h"
-#include "BulletCollision/BroadphaseCollision/btBroadphaseInterface.h"
-#include "BulletCollision/CollisionShapes/btTriangleCallback.h"
-#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h"
+#include "../BroadphaseCollision/btCollisionAlgorithm.h"
+#include "../BroadphaseCollision/btDispatcher.h"
+#include "../BroadphaseCollision/btBroadphaseInterface.h"
+#include "../CollisionShapes/btTriangleCallback.h"
+#include "../NarrowPhaseCollision/btPersistentManifold.h"
 class btDispatcher;
-#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
+#include "../BroadphaseCollision/btBroadphaseProxy.h"
 #include "btCollisionCreateFunc.h"
 
 ///For each triangle in the concave mesh that overlaps with the AABB of a convex (m_convexProxy), processTriangle is called.
@@ -55,11 +55,11 @@ int	m_triangleCount;
 	
 	void clearCache();
 
-	SIMD_FORCE_INLINE const btVector3& getAabbMin() const
+	inline const btVector3& getAabbMin() const
 	{
 		return m_aabbMin;
 	}
-	SIMD_FORCE_INLINE const btVector3& getAabbMax() const
+	inline const btVector3& getAabbMax() const
 	{
 		return m_aabbMax;
 	}
@@ -88,16 +88,13 @@ public:
 
 	btScalar	calculateTimeOfImpact(btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut);
 
-	virtual	void	getAllContactManifolds(btManifoldArray&	manifoldArray);
-	
 	void	clearCache();
 
 	struct CreateFunc :public 	btCollisionAlgorithmCreateFunc
 	{
 		virtual	btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, btCollisionObject* body0,btCollisionObject* body1)
 		{
-			void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btConvexConcaveCollisionAlgorithm));
-			return new(mem) btConvexConcaveCollisionAlgorithm(ci,body0,body1,false);
+			return new btConvexConcaveCollisionAlgorithm(ci,body0,body1,false);
 		}
 	};
 
@@ -105,8 +102,7 @@ public:
 	{
 		virtual	btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, btCollisionObject* body0,btCollisionObject* body1)
 		{
-			void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btConvexConcaveCollisionAlgorithm));
-			return new(mem) btConvexConcaveCollisionAlgorithm(ci,body0,body1,true);
+			return new btConvexConcaveCollisionAlgorithm(ci,body0,body1,true);
 		}
 	};
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp
index cb830f889be..9105fe20b49 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp
@@ -15,7 +15,7 @@ subject to the following restrictions:
 
 #include "btConvexConvexAlgorithm.h"
 
-//#include <stdio.h>
+#include <stdio.h>
 #include "BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h"
 #include "BulletCollision/BroadphaseCollision/btBroadphaseInterface.h"
 #include "BulletCollision/CollisionDispatch/btCollisionObject.h"
@@ -33,6 +33,7 @@ subject to the following restrictions:
 
 
 
+#include "BulletCollision/CollisionShapes/btMinkowskiSumShape.h"
 #include "BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h"
 #include "BulletCollision/CollisionShapes/btSphereShape.h"
 
@@ -47,16 +48,26 @@ subject to the following restrictions:
 
 
 
-
+btConvexConvexAlgorithm::CreateFunc::CreateFunc()
+{
+	m_ownsSolvers = true;
+	m_simplexSolver = new btVoronoiSimplexSolver();
+	m_pdSolver = new btGjkEpaPenetrationDepthSolver;
+}
 
 btConvexConvexAlgorithm::CreateFunc::CreateFunc(btSimplexSolverInterface*			simplexSolver, btConvexPenetrationDepthSolver* pdSolver)
 {
+	m_ownsSolvers = false;
 	m_simplexSolver = simplexSolver;
 	m_pdSolver = pdSolver;
 }
 
 btConvexConvexAlgorithm::CreateFunc::~CreateFunc() 
 { 
+   if (m_ownsSolvers){ 
+      delete m_simplexSolver; 
+      delete m_pdSolver; 
+   } 
 }
 
 btConvexConvexAlgorithm::btConvexConvexAlgorithm(btPersistentManifold* mf,const btCollisionAlgorithmConstructionInfo& ci,btCollisionObject* body0,btCollisionObject* body1,btSimplexSolverInterface* simplexSolver, btConvexPenetrationDepthSolver* pdSolver)
@@ -141,11 +152,6 @@ void btConvexConvexAlgorithm ::processCollision (btCollisionObject* body0,btColl
 	m_gjkPairDetector.getClosestPoints(input,*resultOut,dispatchInfo.m_debugDraw);
 #endif
 
-	if (m_ownManifold)
-	{
-		resultOut->refreshContactPoints();
-	}
-
 }
 
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h
index a0030e6793d..cbea9a92b75 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h
@@ -16,13 +16,12 @@ subject to the following restrictions:
 #ifndef CONVEX_CONVEX_ALGORITHM_H
 #define CONVEX_CONVEX_ALGORITHM_H
 
-#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
-#include "BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h"
-#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h"
-#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
-#include "BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h"
+#include "../BroadphaseCollision/btCollisionAlgorithm.h"
+#include "../NarrowPhaseCollision/btGjkPairDetector.h"
+#include "../NarrowPhaseCollision/btPersistentManifold.h"
+#include "../BroadphaseCollision/btBroadphaseProxy.h"
+#include "../NarrowPhaseCollision/btVoronoiSimplexSolver.h"
 #include "btCollisionCreateFunc.h"
-#include "btCollisionDispatcher.h"
 
 class btConvexPenetrationDepthSolver;
 
@@ -47,14 +46,6 @@ public:
 
 	virtual btScalar calculateTimeOfImpact(btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut);
 
-	virtual	void	getAllContactManifolds(btManifoldArray&	manifoldArray)
-	{
-		///should we use m_ownManifold to avoid adding duplicates?
-		if (m_manifoldPtr && m_ownManifold)
-			manifoldArray.push_back(m_manifoldPtr);
-	}
-
-
 	void	setLowLevelOfDetail(bool useLowLevel);
 
 
@@ -67,15 +58,15 @@ public:
 	{
 		btConvexPenetrationDepthSolver*		m_pdSolver;
 		btSimplexSolverInterface*			m_simplexSolver;
+		bool	m_ownsSolvers;
 		
 		CreateFunc(btSimplexSolverInterface*			simplexSolver, btConvexPenetrationDepthSolver* pdSolver);
-		
+		CreateFunc();
 		virtual ~CreateFunc();
 
 		virtual	btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, btCollisionObject* body0,btCollisionObject* body1)
 		{
-			void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btConvexConvexAlgorithm));
-			return new(mem) btConvexConvexAlgorithm(ci.m_manifold,ci,body0,body1,m_simplexSolver,m_pdSolver);
+			return new btConvexConvexAlgorithm(ci.m_manifold,ci,body0,body1,m_simplexSolver,m_pdSolver);
 		}
 	};
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp
deleted file mode 100644
index 391cf6c7bc4..00000000000
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-#include "btConvexPlaneCollisionAlgorithm.h"
-
-#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h"
-#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
-#include "BulletCollision/CollisionShapes/btConvexShape.h"
-#include "BulletCollision/CollisionShapes/btStaticPlaneShape.h"
-
-//#include <stdio.h>
-
-btConvexPlaneCollisionAlgorithm::btConvexPlaneCollisionAlgorithm(btPersistentManifold* mf,const btCollisionAlgorithmConstructionInfo& ci,btCollisionObject* col0,btCollisionObject* col1, bool isSwapped)
-: btCollisionAlgorithm(ci),
-m_ownManifold(false),
-m_manifoldPtr(mf),
-m_isSwapped(isSwapped)
-{
-	btCollisionObject* convexObj = m_isSwapped? col1 : col0;
-	btCollisionObject* planeObj = m_isSwapped? col0 : col1;
-	
-	if (!m_manifoldPtr && m_dispatcher->needsCollision(convexObj,planeObj))
-	{
-		m_manifoldPtr = m_dispatcher->getNewManifold(convexObj,planeObj);
-		m_ownManifold = true;
-	}
-}
-
-
-btConvexPlaneCollisionAlgorithm::~btConvexPlaneCollisionAlgorithm()
-{
-	if (m_ownManifold)
-	{
-		if (m_manifoldPtr)
-			m_dispatcher->releaseManifold(m_manifoldPtr);
-	}
-}
-
-
-
-void btConvexPlaneCollisionAlgorithm::processCollision (btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut)
-{
-	(void)dispatchInfo;
-	(void)resultOut;
-	if (!m_manifoldPtr)
-		return;
-
-	btCollisionObject* convexObj = m_isSwapped? body1 : body0;
-	btCollisionObject* planeObj = m_isSwapped? body0: body1;
-
-	btConvexShape* convexShape = (btConvexShape*) convexObj->getCollisionShape();
-	btStaticPlaneShape* planeShape = (btStaticPlaneShape*) planeObj->getCollisionShape();
-
-	bool hasCollision = false;
-	const btVector3& planeNormal = planeShape->getPlaneNormal();
-	const btScalar& planeConstant = planeShape->getPlaneConstant();
-	btTransform planeInConvex;
-	planeInConvex= convexObj->getWorldTransform().inverse() * planeObj->getWorldTransform();
-	btTransform convexInPlaneTrans;
-	convexInPlaneTrans= planeObj->getWorldTransform().inverse() * convexObj->getWorldTransform();
-
-	btVector3 vtx = convexShape->localGetSupportingVertex(planeInConvex.getBasis()*-planeNormal);
-	btVector3 vtxInPlane = convexInPlaneTrans(vtx);
-	btScalar distance = (planeNormal.dot(vtxInPlane) - planeConstant);
-
-	btVector3 vtxInPlaneProjected = vtxInPlane - distance*planeNormal;
-	btVector3 vtxInPlaneWorld = planeObj->getWorldTransform() * vtxInPlaneProjected;
-
-	hasCollision = distance < m_manifoldPtr->getContactBreakingThreshold();
-	resultOut->setPersistentManifold(m_manifoldPtr);
-	if (hasCollision)
-	{
-		/// report a contact. internally this will be kept persistent, and contact reduction is done
-		btVector3 normalOnSurfaceB = planeObj->getWorldTransform().getBasis() * planeNormal;
-		btVector3 pOnB = vtxInPlaneWorld;
-		resultOut->addContactPoint(normalOnSurfaceB,pOnB,distance);
-	}
-	if (m_ownManifold)
-	{
-		if (m_manifoldPtr->getNumContacts())
-		{
-			resultOut->refreshContactPoints();
-		}
-	}
-}
-
-btScalar btConvexPlaneCollisionAlgorithm::calculateTimeOfImpact(btCollisionObject* col0,btCollisionObject* col1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut)
-{
-	(void)resultOut;
-	(void)dispatchInfo;
-	(void)col0;
-	(void)col1;
-
-	//not yet
-	return btScalar(1.);
-}
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h
deleted file mode 100644
index 7b258554171..00000000000
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-#ifndef CONVEX_PLANE_COLLISION_ALGORITHM_H
-#define CONVEX_PLANE_COLLISION_ALGORITHM_H
-
-#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
-#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
-#include "BulletCollision/CollisionDispatch/btCollisionCreateFunc.h"
-class btPersistentManifold;
-#include "btCollisionDispatcher.h"
-
-#include "LinearMath/btVector3.h"
-
-/// btSphereBoxCollisionAlgorithm  provides sphere-box collision detection.
-/// Other features are frame-coherency (persistent data) and collision response.
-class btConvexPlaneCollisionAlgorithm : public btCollisionAlgorithm
-{
-	bool	m_ownManifold;
-	btPersistentManifold*	m_manifoldPtr;
-	bool	m_isSwapped;
-	
-public:
-
-	btConvexPlaneCollisionAlgorithm(btPersistentManifold* mf,const btCollisionAlgorithmConstructionInfo& ci,btCollisionObject* col0,btCollisionObject* col1, bool isSwapped);
-
-	virtual ~btConvexPlaneCollisionAlgorithm();
-
-	virtual void processCollision (btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut);
-
-	virtual btScalar calculateTimeOfImpact(btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut);
-
-	virtual	void	getAllContactManifolds(btManifoldArray&	manifoldArray)
-	{
-		if (m_manifoldPtr && m_ownManifold)
-		{
-			manifoldArray.push_back(m_manifoldPtr);
-		}
-	}
-
-	struct CreateFunc :public 	btCollisionAlgorithmCreateFunc
-	{
-		virtual	btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, btCollisionObject* body0,btCollisionObject* body1)
-		{
-			void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btConvexPlaneCollisionAlgorithm));
-			if (!m_swapped)
-			{
-				return new(mem) btConvexPlaneCollisionAlgorithm(0,ci,body0,body1,false);
-			} else
-			{
-				return new(mem) btConvexPlaneCollisionAlgorithm(0,ci,body0,body1,true);
-			}
-		}
-	};
-
-};
-
-#endif //CONVEX_PLANE_COLLISION_ALGORITHM_H
-
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp
deleted file mode 100644
index 3f94f4d4eac..00000000000
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp
+++ /dev/null
@@ -1,281 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-#include "btDefaultCollisionConfiguration.h"
-
-#include "BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.h"
-#include "BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h"
-#include "BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h"
-#include "BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h"
-#include "BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h"
-#include "BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h"
-#include "BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h"
-#include "BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h"
-#include "BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h"
-#include "BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h"
-#include "BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h"
-#include "BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h"
-
-
-
-#include "LinearMath/btStackAlloc.h"
-#include "LinearMath/btPoolAllocator.h"
-
-
-
-
-
-btDefaultCollisionConfiguration::btDefaultCollisionConfiguration(const btDefaultCollisionConstructionInfo& constructionInfo)
-//btDefaultCollisionConfiguration::btDefaultCollisionConfiguration(btStackAlloc*	stackAlloc,btPoolAllocator*	persistentManifoldPool,btPoolAllocator*	collisionAlgorithmPool)
-{
-
-	void* mem = btAlignedAlloc(sizeof(btVoronoiSimplexSolver),16);
-	m_simplexSolver = new (mem)btVoronoiSimplexSolver();
-	
-#define USE_EPA 1
-#ifdef USE_EPA
-	mem = btAlignedAlloc(sizeof(btGjkEpaPenetrationDepthSolver),16);
-	m_pdSolver = new (mem)btGjkEpaPenetrationDepthSolver;
-#else
-	mem = btAlignedAlloc(sizeof(btMinkowskiPenetrationDepthSolver),16);
-	m_pdSolver = new (mem)btMinkowskiPenetrationDepthSolver;
-#endif//USE_EPA	
-	
-
-	//default CreationFunctions, filling the m_doubleDispatch table
-	mem = btAlignedAlloc(sizeof(btConvexConvexAlgorithm::CreateFunc),16);
-	m_convexConvexCreateFunc = new(mem) btConvexConvexAlgorithm::CreateFunc(m_simplexSolver,m_pdSolver);
-	mem = btAlignedAlloc(sizeof(btConvexConcaveCollisionAlgorithm::CreateFunc),16);
-	m_convexConcaveCreateFunc = new (mem)btConvexConcaveCollisionAlgorithm::CreateFunc;
-	mem = btAlignedAlloc(sizeof(btConvexConcaveCollisionAlgorithm::CreateFunc),16);
-	m_swappedConvexConcaveCreateFunc = new (mem)btConvexConcaveCollisionAlgorithm::SwappedCreateFunc;
-	mem = btAlignedAlloc(sizeof(btCompoundCollisionAlgorithm::CreateFunc),16);
-	m_compoundCreateFunc = new (mem)btCompoundCollisionAlgorithm::CreateFunc;
-	mem = btAlignedAlloc(sizeof(btCompoundCollisionAlgorithm::SwappedCreateFunc),16);
-	m_swappedCompoundCreateFunc = new (mem)btCompoundCollisionAlgorithm::SwappedCreateFunc;
-	mem = btAlignedAlloc(sizeof(btEmptyAlgorithm::CreateFunc),16);
-	m_emptyCreateFunc = new(mem) btEmptyAlgorithm::CreateFunc;
-	
-	mem = btAlignedAlloc(sizeof(btSphereSphereCollisionAlgorithm::CreateFunc),16);
-	m_sphereSphereCF = new(mem) btSphereSphereCollisionAlgorithm::CreateFunc;
-	mem = btAlignedAlloc(sizeof(btSphereBoxCollisionAlgorithm::CreateFunc),16);
-	m_sphereBoxCF = new(mem) btSphereBoxCollisionAlgorithm::CreateFunc;
-	mem = btAlignedAlloc(sizeof(btSphereBoxCollisionAlgorithm::CreateFunc),16);
-	m_boxSphereCF = new (mem)btSphereBoxCollisionAlgorithm::CreateFunc;
-	m_boxSphereCF->m_swapped = true;
-	mem = btAlignedAlloc(sizeof(btSphereTriangleCollisionAlgorithm::CreateFunc),16);
-	m_sphereTriangleCF = new (mem)btSphereTriangleCollisionAlgorithm::CreateFunc;
-	mem = btAlignedAlloc(sizeof(btSphereTriangleCollisionAlgorithm::CreateFunc),16);
-	m_triangleSphereCF = new (mem)btSphereTriangleCollisionAlgorithm::CreateFunc;
-	m_triangleSphereCF->m_swapped = true;
-	
-	mem = btAlignedAlloc(sizeof(btBoxBoxCollisionAlgorithm::CreateFunc),16);
-	m_boxBoxCF = new(mem)btBoxBoxCollisionAlgorithm::CreateFunc;
-
-	//convex versus plane
-	mem = btAlignedAlloc (sizeof(btConvexPlaneCollisionAlgorithm::CreateFunc),16);
-	m_convexPlaneCF = new (mem) btConvexPlaneCollisionAlgorithm::CreateFunc;
-	mem = btAlignedAlloc (sizeof(btConvexPlaneCollisionAlgorithm::CreateFunc),16);
-	m_planeConvexCF = new (mem) btConvexPlaneCollisionAlgorithm::CreateFunc;
-	m_planeConvexCF->m_swapped = true;
-	
-	///calculate maximum element size, big enough to fit any collision algorithm in the memory pool
-	int maxSize = sizeof(btConvexConvexAlgorithm);
-	int maxSize2 = sizeof(btConvexConcaveCollisionAlgorithm);
-	int maxSize3 = sizeof(btCompoundCollisionAlgorithm);
-	int maxSize4 = sizeof(btEmptyAlgorithm);
-	
-	int	collisionAlgorithmMaxElementSize = btMax(maxSize,maxSize2);
-	collisionAlgorithmMaxElementSize = btMax(collisionAlgorithmMaxElementSize,maxSize3);
-	collisionAlgorithmMaxElementSize = btMax(collisionAlgorithmMaxElementSize,maxSize4);
-
-	if (constructionInfo.m_stackAlloc)
-	{
-		m_ownsStackAllocator = false;
-		this->m_stackAlloc = constructionInfo.m_stackAlloc;
-	} else
-	{
-		m_ownsStackAllocator = true;
-		void* mem = btAlignedAlloc(sizeof(btStackAlloc),16);
-		m_stackAlloc = new(mem)btStackAlloc(constructionInfo.m_defaultStackAllocatorSize);
-	}
-		
-	if (constructionInfo.m_persistentManifoldPool)
-	{
-		m_ownsPersistentManifoldPool = false;
-		m_persistentManifoldPool = constructionInfo.m_persistentManifoldPool;
-	} else
-	{
-		m_ownsPersistentManifoldPool = true;
-		void* mem = btAlignedAlloc(sizeof(btPoolAllocator),16);
-		m_persistentManifoldPool = new (mem) btPoolAllocator(sizeof(btPersistentManifold),constructionInfo.m_defaultMaxPersistentManifoldPoolSize);
-	}
-	
-	if (constructionInfo.m_collisionAlgorithmPool)
-	{
-		m_ownsCollisionAlgorithmPool = false;
-		m_collisionAlgorithmPool = constructionInfo.m_collisionAlgorithmPool;
-	} else
-	{
-		m_ownsCollisionAlgorithmPool = true;
-		void* mem = btAlignedAlloc(sizeof(btPoolAllocator),16);
-		m_collisionAlgorithmPool = new(mem) btPoolAllocator(collisionAlgorithmMaxElementSize,constructionInfo.m_defaultMaxCollisionAlgorithmPoolSize);
-	}
-
-
-}
-
-btDefaultCollisionConfiguration::~btDefaultCollisionConfiguration()
-{
-	if (m_ownsStackAllocator)
-	{
-		m_stackAlloc->destroy();
-		m_stackAlloc->~btStackAlloc();
-		btAlignedFree(m_stackAlloc);
-	}
-	if (m_ownsCollisionAlgorithmPool)
-	{
-		m_collisionAlgorithmPool->~btPoolAllocator();
-		btAlignedFree(m_collisionAlgorithmPool);
-	}
-	if (m_ownsPersistentManifoldPool)
-	{
-		m_persistentManifoldPool->~btPoolAllocator();
-		btAlignedFree(m_persistentManifoldPool);
-	}
-
-	m_convexConvexCreateFunc->~btCollisionAlgorithmCreateFunc();
-	btAlignedFree(	m_convexConvexCreateFunc);
-
-	m_convexConcaveCreateFunc->~btCollisionAlgorithmCreateFunc();
-	btAlignedFree( m_convexConcaveCreateFunc);
-	m_swappedConvexConcaveCreateFunc->~btCollisionAlgorithmCreateFunc();
-	btAlignedFree( m_swappedConvexConcaveCreateFunc);
-
-	m_compoundCreateFunc->~btCollisionAlgorithmCreateFunc();
-	btAlignedFree( m_compoundCreateFunc);
-
-	m_swappedCompoundCreateFunc->~btCollisionAlgorithmCreateFunc();
-	btAlignedFree( m_swappedCompoundCreateFunc);
-
-	m_emptyCreateFunc->~btCollisionAlgorithmCreateFunc();
-	btAlignedFree( m_emptyCreateFunc);
-
-	m_sphereSphereCF->~btCollisionAlgorithmCreateFunc();
-	btAlignedFree( m_sphereSphereCF);
-
-	m_sphereBoxCF->~btCollisionAlgorithmCreateFunc();
-	btAlignedFree( m_sphereBoxCF);
-	m_boxSphereCF->~btCollisionAlgorithmCreateFunc();
-	btAlignedFree( m_boxSphereCF);
-	m_sphereTriangleCF->~btCollisionAlgorithmCreateFunc();
-	btAlignedFree( m_sphereTriangleCF);
-	m_triangleSphereCF->~btCollisionAlgorithmCreateFunc();
-	btAlignedFree( m_triangleSphereCF);
-	m_boxBoxCF->~btCollisionAlgorithmCreateFunc();
-	btAlignedFree( m_boxBoxCF);
-
-	m_convexPlaneCF->~btCollisionAlgorithmCreateFunc();
-	btAlignedFree( m_convexPlaneCF);
-	m_planeConvexCF->~btCollisionAlgorithmCreateFunc();
-	btAlignedFree( m_planeConvexCF);
-
-	m_simplexSolver->~btVoronoiSimplexSolver();
-	btAlignedFree(m_simplexSolver);
-
-	m_pdSolver->~btConvexPenetrationDepthSolver();
-	
-	btAlignedFree(m_pdSolver);
-
-
-}
-
-
-btCollisionAlgorithmCreateFunc* btDefaultCollisionConfiguration::getCollisionAlgorithmCreateFunc(int proxyType0,int proxyType1)
-{
-
-
-
-	if ((proxyType0 == SPHERE_SHAPE_PROXYTYPE) && (proxyType1==SPHERE_SHAPE_PROXYTYPE))
-	{
-		return	m_sphereSphereCF;
-	}
-
-	if ((proxyType0 == SPHERE_SHAPE_PROXYTYPE) && (proxyType1==BOX_SHAPE_PROXYTYPE))
-	{
-		return	m_sphereBoxCF;
-	}
-
-	if ((proxyType0 == BOX_SHAPE_PROXYTYPE ) && (proxyType1==SPHERE_SHAPE_PROXYTYPE))
-	{
-		return	m_boxSphereCF;
-	}
-
-	if ((proxyType0 == SPHERE_SHAPE_PROXYTYPE ) && (proxyType1==TRIANGLE_SHAPE_PROXYTYPE))
-	{
-		return	m_sphereTriangleCF;
-	}
-
-	if ((proxyType0 == TRIANGLE_SHAPE_PROXYTYPE  ) && (proxyType1==SPHERE_SHAPE_PROXYTYPE))
-	{
-		return	m_triangleSphereCF;
-	} 
-
-	if ((proxyType0 == BOX_SHAPE_PROXYTYPE) && (proxyType1 == BOX_SHAPE_PROXYTYPE))
-	{
-		return m_boxBoxCF;
-	}
-	
-	if (btBroadphaseProxy::isConvex(proxyType0) && (proxyType1 == STATIC_PLANE_PROXYTYPE))
-	{
-		return m_convexPlaneCF;
-	}
-
-	if (btBroadphaseProxy::isConvex(proxyType1) && (proxyType0 == STATIC_PLANE_PROXYTYPE))
-	{
-		return m_planeConvexCF;
-	}
-	
-
-
-	if (btBroadphaseProxy::isConvex(proxyType0) && btBroadphaseProxy::isConvex(proxyType1))
-	{
-		return m_convexConvexCreateFunc;
-	}
-
-	if (btBroadphaseProxy::isConvex(proxyType0) && btBroadphaseProxy::isConcave(proxyType1))
-	{
-		return m_convexConcaveCreateFunc;
-	}
-
-	if (btBroadphaseProxy::isConvex(proxyType1) && btBroadphaseProxy::isConcave(proxyType0))
-	{
-		return m_swappedConvexConcaveCreateFunc;
-	}
-
-	if (btBroadphaseProxy::isCompound(proxyType0))
-	{
-		return m_compoundCreateFunc;
-	} else
-	{
-		if (btBroadphaseProxy::isCompound(proxyType1))
-		{
-			return m_swappedCompoundCreateFunc;
-		}
-	}
-
-	//failed to find an algorithm
-	return m_emptyCreateFunc;
-}
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h
deleted file mode 100644
index 0b274d394af..00000000000
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-#ifndef BT_DEFAULT_COLLISION_CONFIGURATION
-#define BT_DEFAULT_COLLISION_CONFIGURATION
-
-#include "btCollisionConfiguration.h"
-class btVoronoiSimplexSolver;
-class btConvexPenetrationDepthSolver;
-
-struct	btDefaultCollisionConstructionInfo
-{
-	btStackAlloc*		m_stackAlloc;
-	btPoolAllocator*	m_persistentManifoldPool;
-	btPoolAllocator*	m_collisionAlgorithmPool;
-	int					m_defaultMaxPersistentManifoldPoolSize;
-	int					m_defaultMaxCollisionAlgorithmPoolSize;
-	int					m_defaultStackAllocatorSize;
-
-	btDefaultCollisionConstructionInfo()
-		:m_stackAlloc(0),
-		m_persistentManifoldPool(0),
-		m_collisionAlgorithmPool(0),
-		m_defaultMaxPersistentManifoldPoolSize(65535),
-		m_defaultMaxCollisionAlgorithmPoolSize(65535),
-		m_defaultStackAllocatorSize(5*1024*1024)
-	{
-	}
-};
-
-
-
-///btCollisionConfiguration allows to configure Bullet collision detection
-///stack allocator, pool memory allocators
-///todo: describe the meaning
-class	btDefaultCollisionConfiguration : public btCollisionConfiguration
-{
-
-	int	m_persistentManifoldPoolSize;
-	
-	btStackAlloc*	m_stackAlloc;
-	bool	m_ownsStackAllocator;
-
-	btPoolAllocator*	m_persistentManifoldPool;
-	bool	m_ownsPersistentManifoldPool;
-
-	btPoolAllocator*	m_collisionAlgorithmPool;
-	bool	m_ownsCollisionAlgorithmPool;
-
-	//default simplex/penetration depth solvers
-	btVoronoiSimplexSolver*	m_simplexSolver;
-	btConvexPenetrationDepthSolver*	m_pdSolver;
-	
-	//default CreationFunctions, filling the m_doubleDispatch table
-	btCollisionAlgorithmCreateFunc*	m_convexConvexCreateFunc;
-	btCollisionAlgorithmCreateFunc*	m_convexConcaveCreateFunc;
-	btCollisionAlgorithmCreateFunc*	m_swappedConvexConcaveCreateFunc;
-	btCollisionAlgorithmCreateFunc*	m_compoundCreateFunc;
-	btCollisionAlgorithmCreateFunc*	m_swappedCompoundCreateFunc;
-	btCollisionAlgorithmCreateFunc* m_emptyCreateFunc;
-	btCollisionAlgorithmCreateFunc* m_sphereSphereCF;
-	btCollisionAlgorithmCreateFunc* m_sphereBoxCF;
-	btCollisionAlgorithmCreateFunc* m_boxSphereCF;
-	btCollisionAlgorithmCreateFunc* m_boxBoxCF;
-	btCollisionAlgorithmCreateFunc*	m_sphereTriangleCF;
-	btCollisionAlgorithmCreateFunc*	m_triangleSphereCF;
-	btCollisionAlgorithmCreateFunc*	m_planeConvexCF;
-	btCollisionAlgorithmCreateFunc*	m_convexPlaneCF;
-	
-public:
-
-
-	btDefaultCollisionConfiguration(const btDefaultCollisionConstructionInfo& constructionInfo = btDefaultCollisionConstructionInfo());
-
-	virtual ~btDefaultCollisionConfiguration();
-
-		///memory pools
-	virtual btPoolAllocator* getPersistentManifoldPool()
-	{
-		return m_persistentManifoldPool;
-	}
-
-	virtual btPoolAllocator* getCollisionAlgorithmPool()
-	{
-		return m_collisionAlgorithmPool;
-	}
-
-	virtual btStackAlloc*	getStackAllocator()
-	{
-		return m_stackAlloc;
-	}
-
-
-	virtual btCollisionAlgorithmCreateFunc* getCollisionAlgorithmCreateFunc(int proxyType0,int proxyType1);
-
-
-};
-
-#endif //BT_DEFAULT_COLLISION_CONFIGURATION
-
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h
index e54721dec21..b1a193d2cfd 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btEmptyCollisionAlgorithm.h
@@ -15,9 +15,8 @@ subject to the following restrictions:
 
 #ifndef EMPTY_ALGORITH
 #define EMPTY_ALGORITH
-#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
+#include "../BroadphaseCollision/btCollisionAlgorithm.h"
 #include "btCollisionCreateFunc.h"
-#include "btCollisionDispatcher.h"
 
 #define ATTRIBUTE_ALIGNED(a)
 
@@ -34,18 +33,13 @@ public:
 
 	virtual btScalar calculateTimeOfImpact(btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut);
 
-	virtual	void	getAllContactManifolds(btManifoldArray&	manifoldArray)
-	{
-	}
-
 	struct CreateFunc :public 	btCollisionAlgorithmCreateFunc
 	{
 		virtual	btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, btCollisionObject* body0,btCollisionObject* body1)
 		{
 			(void)body0;
 			(void)body1;
-			void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btEmptyAlgorithm));
-			return new(mem) btEmptyAlgorithm(ci);
+			return new btEmptyAlgorithm(ci);
 		}
 	};
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.cpp
index d5b12598be2..490acc0b611 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.cpp
@@ -79,30 +79,12 @@ void btManifoldResult::addContactPoint(const btVector3& normalOnBInWorld,const b
 	}
 
 	btManifoldPoint newPt(localA,localB,normalOnBInWorld,depth);
-	newPt.m_positionWorldOnA = pointA;
-	newPt.m_positionWorldOnB = pointInWorld;
-	
+
 	int insertIndex = m_manifoldPtr->getCacheEntry(newPt);
 
 	newPt.m_combinedFriction = calculateCombinedFriction(m_body0,m_body1);
 	newPt.m_combinedRestitution = calculateCombinedRestitution(m_body0,m_body1);
 
-   //BP mod, store contact triangles.
-   newPt.m_partId0 = m_partId0;
-   newPt.m_partId1 = m_partId1;
-   newPt.m_index0  = m_index0;
-   newPt.m_index1  = m_index1;
-	
-	///todo, check this for any side effects
-	if (insertIndex >= 0)
-	{
-		//const btManifoldPoint& oldPoint = m_manifoldPtr->getContactPoint(insertIndex);
-		m_manifoldPtr->replaceContactPoint(newPt,insertIndex);
-	} else
-	{
-		insertIndex = m_manifoldPtr->addManifoldPoint(newPt);
-	}
-	
 	//User can override friction and/or restitution
 	if (gContactAddedCallback &&
 		//and if either of the two bodies requires custom material
@@ -112,8 +94,16 @@ void btManifoldResult::addContactPoint(const btVector3& normalOnBInWorld,const b
 		//experimental feature info, for per-triangle material etc.
 		btCollisionObject* obj0 = isSwapped? m_body1 : m_body0;
 		btCollisionObject* obj1 = isSwapped? m_body0 : m_body1;
-		(*gContactAddedCallback)(m_manifoldPtr->getContactPoint(insertIndex),obj0,m_partId0,m_index0,obj1,m_partId1,m_index1);
+		(*gContactAddedCallback)(newPt,obj0,m_partId0,m_index0,obj1,m_partId1,m_index1);
 	}
 
+	if (insertIndex >= 0)
+	{
+		//const btManifoldPoint& oldPoint = m_manifoldPtr->getContactPoint(insertIndex);
+		m_manifoldPtr->replaceContactPoint(newPt,insertIndex);
+	} else
+	{
+		m_manifoldPtr->AddManifoldPoint(newPt);
+	}
 }
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.h
index 5aac9a46f6a..77192625513 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btManifoldResult.h
@@ -18,12 +18,12 @@ subject to the following restrictions:
 #define MANIFOLD_RESULT_H
 
 class btCollisionObject;
-#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h"
+class btPersistentManifold;
 class btManifoldPoint;
 
 #include "BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h"
 
-#include "LinearMath/btTransform.h"
+#include "../../LinearMath/btTransform.h"
 
 typedef bool (*ContactAddedCallback)(btManifoldPoint& cp,	const btCollisionObject* colObj0,int partId0,int index0,const btCollisionObject* colObj1,int partId1,int index1);
 extern ContactAddedCallback		gContactAddedCallback;
@@ -60,15 +60,6 @@ public:
 		m_manifoldPtr = manifoldPtr;
 	}
 
-	const btPersistentManifold*	getPersistentManifold() const
-	{
-		return m_manifoldPtr;
-	}
-	btPersistentManifold*	getPersistentManifold()
-	{
-		return m_manifoldPtr;
-	}
-
 	virtual void setShapeIdentifiers(int partId0,int index0,	int partId1,int index1)
 	{
 			m_partId0=partId0;
@@ -79,22 +70,6 @@ public:
 
 	virtual void addContactPoint(const btVector3& normalOnBInWorld,const btVector3& pointInWorld,btScalar depth);
 
-	SIMD_FORCE_INLINE	void refreshContactPoints()
-	{
-		btAssert(m_manifoldPtr);
-		if (!m_manifoldPtr->getNumContacts())
-			return;
-
-		bool isSwapped = m_manifoldPtr->getBody0() != m_body0;
-
-		if (isSwapped)
-		{
-			m_manifoldPtr->refreshContactPoints(m_rootTransB,m_rootTransA);
-		} else
-		{
-			m_manifoldPtr->refreshContactPoints(m_rootTransA,m_rootTransB);
-		}
-	}
 
 
 };
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp
index 1cc78f76acd..ac2e8554c3a 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp
@@ -1,17 +1,3 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
 
 
 #include "LinearMath/btScalar.h"
@@ -21,7 +7,7 @@ subject to the following restrictions:
 #include "BulletCollision/CollisionDispatch/btCollisionObject.h"
 #include "BulletCollision/CollisionDispatch/btCollisionWorld.h"
 
-//#include <stdio.h>
+#include <stdio.h>
 #include "LinearMath/btQuickprof.h"
 
 btSimulationIslandManager::btSimulationIslandManager()
@@ -39,17 +25,17 @@ void btSimulationIslandManager::initUnionFind(int n)
 }
 		
 
-void btSimulationIslandManager::findUnions(btDispatcher* /* dispatcher */,btCollisionWorld* colWorld)
+void btSimulationIslandManager::findUnions(btDispatcher* dispatcher)
 {
 	
 	{
-		btBroadphasePair* pairPtr = colWorld->getPairCache()->getOverlappingPairArrayPtr();
-
-		for (int i=0;i<colWorld->getPairCache()->getNumOverlappingPairs();i++)
+		for (int i=0;i<dispatcher->getNumManifolds();i++)
 		{
-			const btBroadphasePair& collisionPair = pairPtr[i];
-			btCollisionObject* colObj0 = (btCollisionObject*)collisionPair.m_pProxy0->m_clientObject;
-			btCollisionObject* colObj1 = (btCollisionObject*)collisionPair.m_pProxy1->m_clientObject;
+			const btPersistentManifold* manifold = dispatcher->getManifoldByIndexInternal(i);
+			//static objects (invmass btScalar(0.)) don't merge !
+
+			 const  btCollisionObject* colObj0 = static_cast<const btCollisionObject*>(manifold->getBody0());
+			 const  btCollisionObject* colObj1 = static_cast<const btCollisionObject*>(manifold->getBody1());
 
 			if (((colObj0) && ((colObj0)->mergesSimulationIslands())) &&
 				((colObj1) && ((colObj1)->mergesSimulationIslands())))
@@ -85,7 +71,7 @@ void	btSimulationIslandManager::updateActivationState(btCollisionWorld* colWorld
 	}
 	// do the union find
 	
-	findUnions(dispatcher,colWorld);
+	findUnions(dispatcher);
 	
 
 	
@@ -143,13 +129,30 @@ class btPersistentManifoldSortPredicate
 };
 
 
-void btSimulationIslandManager::buildIslands(btDispatcher* dispatcher,btCollisionObjectArray& collisionObjects)
+
+
+
+//
+// todo: this is random access, it can be walked 'cache friendly'!
+//
+void btSimulationIslandManager::buildAndProcessIslands(btDispatcher* dispatcher,btCollisionObjectArray& collisionObjects, IslandCallback* callback)
 {
 
-	BT_PROFILE("islandUnionFindAndQuickSort");
 	
-	m_islandmanifold.resize(0);
+	
+	/*if (0)
+	{
+		int maxNumManifolds = dispatcher->getNumManifolds();
+		btCollisionDispatcher* colDis = (btCollisionDispatcher*)dispatcher;
+		btPersistentManifold** manifold = colDis->getInternalManifoldPointer();
+		callback->ProcessIsland(&collisionObjects[0],collisionObjects.size(),manifold,maxNumManifolds, 0);
+		return;
+	}
+	*/
 
+
+	BEGIN_PROFILE("islandUnionFindAndHeapSort");
+	
 	//we are going to sort the unionfind array, and store the element id in the size
 	//afterwards, we clean unionfind, to make sure no-one uses it anymore
 	
@@ -180,7 +183,7 @@ void btSimulationIslandManager::buildIslands(btDispatcher* dispatcher,btCollisio
 			btCollisionObject* colObj0 = collisionObjects[i];
 			if ((colObj0->getIslandTag() != islandId) && (colObj0->getIslandTag() != -1))
 			{
-//				printf("error in island management\n");
+				printf("error in island management\n");
 			}
 
 			assert((colObj0->getIslandTag() == islandId) || (colObj0->getIslandTag() == -1));
@@ -207,7 +210,7 @@ void btSimulationIslandManager::buildIslands(btDispatcher* dispatcher,btCollisio
 				btCollisionObject* colObj0 = collisionObjects[i];
 				if ((colObj0->getIslandTag() != islandId) && (colObj0->getIslandTag() != -1))
 				{
-//					printf("error in island management\n");
+					printf("error in island management\n");
 				}
 
 				assert((colObj0->getIslandTag() == islandId) || (colObj0->getIslandTag() == -1));
@@ -228,7 +231,7 @@ void btSimulationIslandManager::buildIslands(btDispatcher* dispatcher,btCollisio
 				btCollisionObject* colObj0 = collisionObjects[i];
 				if ((colObj0->getIslandTag() != islandId) && (colObj0->getIslandTag() != -1))
 				{
-//					printf("error in island management\n");
+					printf("error in island management\n");
 				}
 
 				assert((colObj0->getIslandTag() == islandId) || (colObj0->getIslandTag() == -1));
@@ -244,17 +247,11 @@ void btSimulationIslandManager::buildIslands(btDispatcher* dispatcher,btCollisio
 		}
 	}
 
-	
+	btAlignedObjectArray<btPersistentManifold*>  islandmanifold;
 	int i;
 	int maxNumManifolds = dispatcher->getNumManifolds();
+	islandmanifold.reserve(maxNumManifolds);
 
-#define SPLIT_ISLANDS 1
-#ifdef SPLIT_ISLANDS
-
-	
-#endif //SPLIT_ISLANDS
-
-	
 	for (i=0;i<maxNumManifolds ;i++)
 	{
 		 btPersistentManifold* manifold = dispatcher->getManifoldByIndexInternal(i);
@@ -268,52 +265,29 @@ void btSimulationIslandManager::buildIslands(btDispatcher* dispatcher,btCollisio
 		{
 		
 			//kinematic objects don't merge islands, but wake up all connected objects
-			if (colObj0->isKinematicObject() && colObj0->getActivationState() != ISLAND_SLEEPING)
+			if (colObj0->isStaticOrKinematicObject() && colObj0->getActivationState() != ISLAND_SLEEPING)
 			{
 				colObj1->activate();
 			}
-			if (colObj1->isKinematicObject() && colObj1->getActivationState() != ISLAND_SLEEPING)
+			if (colObj1->isStaticOrKinematicObject() && colObj1->getActivationState() != ISLAND_SLEEPING)
 			{
 				colObj0->activate();
 			}
-#ifdef SPLIT_ISLANDS
-	//		//filtering for response
+
+			//filtering for response
 			if (dispatcher->needsResponse(colObj0,colObj1))
-				m_islandmanifold.push_back(manifold);
-#endif //SPLIT_ISLANDS
+				islandmanifold.push_back(manifold);
 		}
 	}
-}
 
+	int numManifolds = int (islandmanifold.size());
 
-
-//
-// todo: this is random access, it can be walked 'cache friendly'!
-//
-void btSimulationIslandManager::buildAndProcessIslands(btDispatcher* dispatcher,btCollisionObjectArray& collisionObjects, IslandCallback* callback)
-{
-
-	buildIslands(dispatcher,collisionObjects);
-
-	int endIslandIndex=1;
-	int startIslandIndex;
-	int numElem = getUnionFind().getNumElements();
-
-	BT_PROFILE("processIslands");
-
-#ifndef SPLIT_ISLANDS
-	btPersistentManifold** manifold = dispatcher->getInternalManifoldPointer();
-	
-	callback->ProcessIsland(&collisionObjects[0],collisionObjects.size(),manifold,maxNumManifolds, -1);
-#else
 	// Sort manifolds, based on islands
 	// Sort the vector using predicate and std::sort
 	//std::sort(islandmanifold.begin(), islandmanifold.end(), btPersistentManifoldSortPredicate);
 
-	int numManifolds = int (m_islandmanifold.size());
-
 	//we should do radix sort, it it much faster (O(n) instead of O (n log2(n))
-	m_islandmanifold.quickSort(btPersistentManifoldSortPredicate());
+	islandmanifold.heapSort(btPersistentManifoldSortPredicate());
 
 	//now process all active islands (sets of manifolds for now)
 
@@ -322,9 +296,10 @@ void btSimulationIslandManager::buildAndProcessIslands(btDispatcher* dispatcher,
 
 	//int islandId;
 
-	
+	END_PROFILE("islandUnionFindAndHeapSort");
+
+	btAlignedObjectArray<btCollisionObject*>	islandBodies;
 
-//	printf("Start Islands\n");
 
 	//traverse the simulation islands, and call the solver, unless all objects are sleeping/deactivated
 	for ( startIslandIndex=0;startIslandIndex<numElem;startIslandIndex = endIslandIndex)
@@ -338,7 +313,7 @@ void btSimulationIslandManager::buildAndProcessIslands(btDispatcher* dispatcher,
                 {
                         int i = getUnionFind().getElement(endIslandIndex).m_sz;
                         btCollisionObject* colObj0 = collisionObjects[i];
-						m_islandBodies.push_back(colObj0);
+						islandBodies.push_back(colObj0);
                         if (!colObj0->isActive())
                                 islandSleeping = true;
                 }
@@ -350,12 +325,12 @@ void btSimulationIslandManager::buildAndProcessIslands(btDispatcher* dispatcher,
 
 		if (startManifoldIndex<numManifolds)
 		{
-			int curIslandId = getIslandId(m_islandmanifold[startManifoldIndex]);
+			int curIslandId = getIslandId(islandmanifold[startManifoldIndex]);
 			if (curIslandId == islandId)
 			{
-				startManifold = &m_islandmanifold[startManifoldIndex];
+				startManifold = &islandmanifold[startManifoldIndex];
 			
-				for (endManifoldIndex = startManifoldIndex+1;(endManifoldIndex<numManifolds) && (islandId == getIslandId(m_islandmanifold[endManifoldIndex]));endManifoldIndex++)
+				for (endManifoldIndex = startManifoldIndex+1;(endManifoldIndex<numManifolds) && (islandId == getIslandId(islandmanifold[endManifoldIndex]));endManifoldIndex++)
 				{
 
 				}
@@ -367,8 +342,7 @@ void btSimulationIslandManager::buildAndProcessIslands(btDispatcher* dispatcher,
 
 		if (!islandSleeping)
 		{
-			callback->ProcessIsland(&m_islandBodies[0],m_islandBodies.size(),startManifold,numIslandManifolds, islandId);
-//			printf("Island callback of size:%d bodies, %d manifolds\n",islandBodies.size(),numIslandManifolds);
+			callback->ProcessIsland(&islandBodies[0],islandBodies.size(),startManifold,numIslandManifolds, islandId);
 		}
 		
 		if (numIslandManifolds)
@@ -376,9 +350,8 @@ void btSimulationIslandManager::buildAndProcessIslands(btDispatcher* dispatcher,
 			startManifoldIndex = endManifoldIndex;
 		}
 
-		m_islandBodies.resize(0);
+		islandBodies.resize(0);
 	}
-#endif //SPLIT_ISLANDS
-
 
+	
 }
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.h
index 5f4d54cd803..d91ed1c20eb 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.h
@@ -16,26 +16,18 @@ subject to the following restrictions:
 #ifndef SIMULATION_ISLAND_MANAGER_H
 #define SIMULATION_ISLAND_MANAGER_H
 
-#include "BulletCollision/CollisionDispatch/btUnionFind.h"
+#include "../CollisionDispatch/btUnionFind.h"
 #include "btCollisionCreateFunc.h"
-#include "LinearMath/btAlignedObjectArray.h"
-
 
 class btCollisionObject;
 class btCollisionWorld;
 class btDispatcher;
-class btPersistentManifold;
-
 
 ///SimulationIslandManager creates and handles simulation islands, using btUnionFind
 class btSimulationIslandManager
 {
 	btUnionFind m_unionFind;
 
-	btAlignedObjectArray<btPersistentManifold*>  m_islandmanifold;
-	btAlignedObjectArray<btCollisionObject* >  m_islandBodies;
-	
-	
 public:
 	btSimulationIslandManager();
 	virtual ~btSimulationIslandManager();
@@ -50,7 +42,7 @@ public:
 	virtual	void	storeIslandActivationState(btCollisionWorld* world);
 
 
-	void	findUnions(btDispatcher* dispatcher,btCollisionWorld* colWorld);
+	void	findUnions(btDispatcher* dispatcher);
 
 	
 
@@ -63,8 +55,6 @@ public:
 
 	void	buildAndProcessIslands(btDispatcher* dispatcher,btCollisionObjectArray& collisionObjects, IslandCallback* callback);
 
-	void buildIslands(btDispatcher* dispatcher,btCollisionObjectArray& collisionObjects);
-
 };
 
 #endif //SIMULATION_ISLAND_MANAGER_H
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp
index 1e4bbce451d..05556bd34e2 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp
@@ -68,25 +68,18 @@ void btSphereBoxCollisionAlgorithm::processCollision (btCollisionObject* body0,b
 	
 	btScalar dist = getSphereDistance(boxObj,pOnBox,pOnSphere,sphereCenter,radius);
 
-	resultOut->setPersistentManifold(m_manifoldPtr);
-
 	if (dist < SIMD_EPSILON)
 	{
 		btVector3 normalOnSurfaceB = (pOnBox- pOnSphere).normalize();
 
 		/// report a contact. internally this will be kept persistent, and contact reduction is done
 
+		resultOut->setPersistentManifold(m_manifoldPtr);
 		resultOut->addContactPoint(normalOnSurfaceB,pOnBox,dist);
 		
 	}
 
-	if (m_ownManifold)
-	{
-		if (m_manifoldPtr->getNumContacts())
-		{
-			resultOut->refreshContactPoints();
-		}
-	}
+	
 
 }
 
@@ -109,8 +102,8 @@ btScalar btSphereBoxCollisionAlgorithm::getSphereDistance(btCollisionObject* box
 	btVector3 bounds[2];
 	btBoxShape* boxShape= (btBoxShape*)boxObj->getCollisionShape();
 	
-	bounds[0] = -boxShape->getHalfExtentsWithoutMargin();
-	bounds[1] = boxShape->getHalfExtentsWithoutMargin();
+	bounds[0] = -boxShape->getHalfExtents();
+	bounds[1] = boxShape->getHalfExtents();
 
 	margins = boxShape->getMargin();//also add sphereShape margin?
 
@@ -216,10 +209,6 @@ btScalar btSphereBoxCollisionAlgorithm::getSpherePenetration( btCollisionObject*
 	btVector3	p0, tmp, prel, n[6], normal;
 	btScalar   fSep = btScalar(-10000000.0), fSepThis;
 
-	// set p0 and normal to a default value to shup up GCC
-	p0.setValue(btScalar(0.), btScalar(0.), btScalar(0.));
-	normal.setValue(btScalar(0.), btScalar(0.), btScalar(0.));
-
 	n[0].setValue( btScalar(-1.0),  btScalar(0.0),  btScalar(0.0) );
 	n[1].setValue(  btScalar(0.0), btScalar(-1.0),  btScalar(0.0) );
 	n[2].setValue(  btScalar(0.0),  btScalar(0.0), btScalar(-1.0) );
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h
index 158f0ffcc74..07592909200 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h
@@ -16,13 +16,11 @@ subject to the following restrictions:
 #ifndef SPHERE_BOX_COLLISION_ALGORITHM_H
 #define SPHERE_BOX_COLLISION_ALGORITHM_H
 
-#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
-#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
-#include "BulletCollision/CollisionDispatch/btCollisionCreateFunc.h"
+#include "../BroadphaseCollision/btCollisionAlgorithm.h"
+#include "../BroadphaseCollision/btBroadphaseProxy.h"
+#include "../CollisionDispatch/btCollisionCreateFunc.h"
 class btPersistentManifold;
-#include "btCollisionDispatcher.h"
-
-#include "LinearMath/btVector3.h"
+#include "../../LinearMath/btVector3.h"
 
 /// btSphereBoxCollisionAlgorithm  provides sphere-box collision detection.
 /// Other features are frame-coherency (persistent data) and collision response.
@@ -42,14 +40,6 @@ public:
 
 	virtual btScalar calculateTimeOfImpact(btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut);
 
-	virtual	void	getAllContactManifolds(btManifoldArray&	manifoldArray)
-	{
-		if (m_manifoldPtr && m_ownManifold)
-		{
-			manifoldArray.push_back(m_manifoldPtr);
-		}
-	}
-
 	btScalar getSphereDistance( btCollisionObject* boxObj,btVector3& v3PointOnBox, btVector3& v3PointOnSphere, const btVector3& v3SphereCenter, btScalar fRadius );
 
 	btScalar getSpherePenetration( btCollisionObject* boxObj, btVector3& v3PointOnBox, btVector3& v3PointOnSphere, const btVector3& v3SphereCenter, btScalar fRadius, const btVector3& aabbMin, const btVector3& aabbMax);
@@ -58,13 +48,12 @@ public:
 	{
 		virtual	btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, btCollisionObject* body0,btCollisionObject* body1)
 		{
-			void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btSphereBoxCollisionAlgorithm));
 			if (!m_swapped)
 			{
-				return new(mem) btSphereBoxCollisionAlgorithm(0,ci,body0,body1,false);
+				return new btSphereBoxCollisionAlgorithm(0,ci,body0,body1,false);
 			} else
 			{
-				return new(mem) btSphereBoxCollisionAlgorithm(0,ci,body0,body1,true);
+				return new btSphereBoxCollisionAlgorithm(0,ci,body0,body1,true);
 			}
 		}
 	};
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp
index c9256473c00..424ff432f84 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.cpp
@@ -46,8 +46,6 @@ void btSphereSphereCollisionAlgorithm::processCollision (btCollisionObject* col0
 	if (!m_manifoldPtr)
 		return;
 
-	resultOut->setPersistentManifold(m_manifoldPtr);
-
 	btSphereShape* sphere0 = (btSphereShape*)col0->getCollisionShape();
 	btSphereShape* sphere1 = (btSphereShape*)col1->getCollisionShape();
 
@@ -56,34 +54,23 @@ void btSphereSphereCollisionAlgorithm::processCollision (btCollisionObject* col0
 	btScalar radius0 = sphere0->getRadius();
 	btScalar radius1 = sphere1->getRadius();
 
-	//m_manifoldPtr->clearManifold(); //don't do this, it disables warmstarting
-
 	///iff distance positive, don't generate a new contact
 	if ( len > (radius0+radius1))
-	{
 		return;
-	}
+
 	///distance (negative means penetration)
 	btScalar dist = len - (radius0+radius1);
 
-	btVector3 normalOnSurfaceB(1,0,0);
-	if (len > SIMD_EPSILON)
-	{
-		normalOnSurfaceB = diff / len;
-	}
-
+	btVector3 normalOnSurfaceB = diff / len;
 	///point on A (worldspace)
 	btVector3 pos0 = col0->getWorldTransform().getOrigin() - radius0 * normalOnSurfaceB;
 	///point on B (worldspace)
 	btVector3 pos1 = col1->getWorldTransform().getOrigin() + radius1* normalOnSurfaceB;
 
 	/// report a contact. internally this will be kept persistent, and contact reduction is done
-	
-	
+	resultOut->setPersistentManifold(m_manifoldPtr);
 	resultOut->addContactPoint(normalOnSurfaceB,pos1,dist);
 
-	//no resultOut->refreshContactPoints(); needed, because of clearManifold (all points are new)
-
 }
 
 btScalar btSphereSphereCollisionAlgorithm::calculateTimeOfImpact(btCollisionObject* col0,btCollisionObject* col1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut)
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h
index afdc2ee7fa0..7a19ff31edf 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h
@@ -16,11 +16,9 @@ subject to the following restrictions:
 #ifndef SPHERE_SPHERE_COLLISION_ALGORITHM_H
 #define SPHERE_SPHERE_COLLISION_ALGORITHM_H
 
-#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
-#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
-#include "BulletCollision/CollisionDispatch/btCollisionCreateFunc.h"
-#include "btCollisionDispatcher.h"
-
+#include "../BroadphaseCollision/btCollisionAlgorithm.h"
+#include "../BroadphaseCollision/btBroadphaseProxy.h"
+#include "../CollisionDispatch/btCollisionCreateFunc.h"
 class btPersistentManifold;
 
 /// btSphereSphereCollisionAlgorithm  provides sphere-sphere collision detection.
@@ -41,13 +39,6 @@ public:
 
 	virtual btScalar calculateTimeOfImpact(btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut);
 
-	virtual	void	getAllContactManifolds(btManifoldArray&	manifoldArray)
-	{
-		if (m_manifoldPtr && m_ownManifold)
-		{
-			manifoldArray.push_back(m_manifoldPtr);
-		}
-	}
 	
 	virtual ~btSphereSphereCollisionAlgorithm();
 
@@ -55,8 +46,7 @@ public:
 	{
 		virtual	btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, btCollisionObject* body0,btCollisionObject* body1)
 		{
-			void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btSphereSphereCollisionAlgorithm));
-			return new(mem) btSphereSphereCollisionAlgorithm(0,ci,body0,body1);
+			return new btSphereSphereCollisionAlgorithm(0,ci,body0,body1);
 		}
 	};
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp
index 46961f5d61b..b011b707e3f 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp
@@ -48,11 +48,8 @@ void btSphereTriangleCollisionAlgorithm::processCollision (btCollisionObject* co
 	if (!m_manifoldPtr)
 		return;
 
-	btCollisionObject* sphereObj = m_swapped? col1 : col0;
-	btCollisionObject* triObj = m_swapped? col0 : col1;
-
-	btSphereShape* sphere = (btSphereShape*)sphereObj->getCollisionShape();
-	btTriangleShape* triangle = (btTriangleShape*)triObj->getCollisionShape();
+	btSphereShape* sphere = (btSphereShape*)col0->getCollisionShape();
+	btTriangleShape* triangle = (btTriangleShape*)col1->getCollisionShape();
 	
 	/// report a contact. internally this will be kept persistent, and contact reduction is done
 	resultOut->setPersistentManifold(m_manifoldPtr);
@@ -60,16 +57,11 @@ void btSphereTriangleCollisionAlgorithm::processCollision (btCollisionObject* co
 	
 	btDiscreteCollisionDetectorInterface::ClosestPointInput input;
 	input.m_maximumDistanceSquared = btScalar(1e30);//todo: tighter bounds
-	input.m_transformA = sphereObj->getWorldTransform();
-	input.m_transformB = triObj->getWorldTransform();
+	input.m_transformA = col0->getWorldTransform();
+	input.m_transformB = col1->getWorldTransform();
 
-	bool swapResults = m_swapped && !m_ownManifold;
+	detector.getClosestPoints(input,*resultOut,dispatchInfo.m_debugDraw);
 
-	detector.getClosestPoints(input,*resultOut,dispatchInfo.m_debugDraw,swapResults);
-
-	if (m_ownManifold)
-		resultOut->refreshContactPoints();
-	
 }
 
 btScalar btSphereTriangleCollisionAlgorithm::calculateTimeOfImpact(btCollisionObject* col0,btCollisionObject* col1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut)
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h
index bbaf228c44c..57c6e6af619 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h
@@ -16,11 +16,10 @@ subject to the following restrictions:
 #ifndef SPHERE_TRIANGLE_COLLISION_ALGORITHM_H
 #define SPHERE_TRIANGLE_COLLISION_ALGORITHM_H
 
-#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
-#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
-#include "BulletCollision/CollisionDispatch/btCollisionCreateFunc.h"
+#include "../BroadphaseCollision/btCollisionAlgorithm.h"
+#include "../BroadphaseCollision/btBroadphaseProxy.h"
+#include "../CollisionDispatch/btCollisionCreateFunc.h"
 class btPersistentManifold;
-#include "btCollisionDispatcher.h"
 
 /// btSphereSphereCollisionAlgorithm  provides sphere-sphere collision detection.
 /// Other features are frame-coherency (persistent data) and collision response.
@@ -41,13 +40,6 @@ public:
 
 	virtual btScalar calculateTimeOfImpact(btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut);
 
-	virtual	void	getAllContactManifolds(btManifoldArray&	manifoldArray)
-	{
-		if (m_manifoldPtr && m_ownManifold)
-		{
-			manifoldArray.push_back(m_manifoldPtr);
-		}
-	}
 	
 	virtual ~btSphereTriangleCollisionAlgorithm();
 
@@ -57,9 +49,7 @@ public:
 		virtual	btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, btCollisionObject* body0,btCollisionObject* body1)
 		{
 			
-			void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btSphereTriangleCollisionAlgorithm));
-
-			return new(mem) btSphereTriangleCollisionAlgorithm(ci.m_manifold,ci,body0,body1,m_swapped);
+				return new btSphereTriangleCollisionAlgorithm(ci.m_manifold,ci,body0,body1,m_swapped);
 		}
 	};
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.cpp
index bb01b60fa85..62254335796 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.cpp
@@ -18,7 +18,6 @@ subject to the following restrictions:
 
 
 
-
 btUnionFind::~btUnionFind()
 {
 	Free();
@@ -77,7 +76,8 @@ void	btUnionFind::sortIslands()
 	
 	 // Sort the vector using predicate and std::sort
 	  //std::sort(m_elements.begin(), m_elements.end(), btUnionFindElementSortPredicate);
-	  m_elements.quickSort(btUnionFindElementSortPredicate());
+	//perhaps use radix sort?
+	  m_elements.heapSort(btUnionFindElementSortPredicate());
 
 }
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.h b/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.h
index 820c8bc858e..236cc33b94f 100644
--- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.h
+++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btUnionFind.h
@@ -16,7 +16,7 @@ subject to the following restrictions:
 #ifndef UNION_FIND_H
 #define UNION_FIND_H
 
-#include "LinearMath/btAlignedObjectArray.h"
+#include "../../LinearMath/btAlignedObjectArray.h"
 
 	#define USE_PATH_COMPRESSION 1
 
@@ -46,11 +46,11 @@ class btUnionFind
 
 	  void	reset(int N);
 
-	  SIMD_FORCE_INLINE int	getNumElements() const
+	  inline int	getNumElements() const
 	  {
 		  return int(m_elements.size());
 	  }
-	  SIMD_FORCE_INLINE bool  isRoot(int x) const
+	  inline bool  isRoot(int x) const
 	  {
 		  return (x == m_elements[x].m_id);
 	  }
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.cpp
index adac455bbcb..636b0046c13 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.cpp
@@ -15,13 +15,16 @@ subject to the following restrictions:
 
 #include "btBoxShape.h"
 
-
+btVector3 btBoxShape::getHalfExtents() const
+{
+	return m_implicitShapeDimensions * m_localScaling;
+}
 //{ 
 
 
 void btBoxShape::getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const
 {
-	const btVector3& halfExtents = getHalfExtentsWithoutMargin();
+	btVector3 halfExtents = getHalfExtents();
 
 	btMatrix3x3 abs_b = t.getBasis().absolute();  
 	btPoint3 center = t.getOrigin();
@@ -37,10 +40,10 @@ void btBoxShape::getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabb
 }
 
 
-void	btBoxShape::calculateLocalInertia(btScalar mass,btVector3& inertia) const
+void	btBoxShape::calculateLocalInertia(btScalar mass,btVector3& inertia)
 {
 	//btScalar margin = btScalar(0.);
-	btVector3 halfExtents = getHalfExtentsWithMargin();
+	btVector3 halfExtents = getHalfExtents();
 
 	btScalar lx=btScalar(2.)*(halfExtents.x());
 	btScalar ly=btScalar(2.)*(halfExtents.y());
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.h
index 4d4fbefea37..bc42f146c7c 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btBoxShape.h
@@ -18,11 +18,11 @@ subject to the following restrictions:
 
 #include "btPolyhedralConvexShape.h"
 #include "btCollisionMargin.h"
-#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
-#include "LinearMath/btPoint3.h"
-#include "LinearMath/btMinMax.h"
+#include "../BroadphaseCollision/btBroadphaseProxy.h"
+#include "../../LinearMath/btPoint3.h"
+#include "../../LinearMath/btSimdMinMax.h"
 
-///The btBoxShape is a box primitive around the origin, its sides axis aligned with length specified by half extents, in local shape coordinates. When used as part of a btCollisionObject or btRigidBody it will be an oriented box in world space.
+///btBoxShape implements both a feature based (vertex/edge/plane) and implicit (getSupportingVertex) Box
 class btBoxShape: public btPolyhedralConvexShape
 {
 
@@ -31,52 +31,47 @@ class btBoxShape: public btPolyhedralConvexShape
 
 public:
 
-	btVector3 getHalfExtentsWithMargin() const
-	{
-		btVector3 halfExtents = getHalfExtentsWithoutMargin();
-		btVector3 margin(getMargin(),getMargin(),getMargin());
-		halfExtents += margin;
-		return halfExtents;
-	}
-	
-	const btVector3& getHalfExtentsWithoutMargin() const
-	{
-		return m_implicitShapeDimensions;//changed in Bullet 2.63: assume the scaling and margin are included
-	}
-	
-
+	btVector3 getHalfExtents() const;
+		
 	virtual int	getShapeType() const { return BOX_SHAPE_PROXYTYPE;}
 
 	virtual btVector3	localGetSupportingVertex(const btVector3& vec) const
 	{
-		btVector3 halfExtents = getHalfExtentsWithoutMargin();
-		btVector3 margin(getMargin(),getMargin(),getMargin());
-		halfExtents += margin;
 		
-		return btVector3(btFsels(vec.x(), halfExtents.x(), -halfExtents.x()),
-			btFsels(vec.y(), halfExtents.y(), -halfExtents.y()),
-			btFsels(vec.z(), halfExtents.z(), -halfExtents.z()));
+		btVector3 halfExtents = getHalfExtents();
+		
+		btVector3 supVertex;
+		supVertex = btPoint3(vec.x() < btScalar(0.0) ? -halfExtents.x() : halfExtents.x(),
+                     vec.y() < btScalar(0.0) ? -halfExtents.y() : halfExtents.y(),
+                     vec.z() < btScalar(0.0) ? -halfExtents.z() : halfExtents.z()); 
+  
+		return supVertex;
 	}
 
-	SIMD_FORCE_INLINE  btVector3	localGetSupportingVertexWithoutMargin(const btVector3& vec)const
+	virtual inline btVector3	localGetSupportingVertexWithoutMargin(const btVector3& vec)const
 	{
-		const btVector3& halfExtents = getHalfExtentsWithoutMargin();
-		
-		return btVector3(btFsels(vec.x(), halfExtents.x(), -halfExtents.x()),
-			btFsels(vec.y(), halfExtents.y(), -halfExtents.y()),
-			btFsels(vec.z(), halfExtents.z(), -halfExtents.z()));
+		btVector3 halfExtents = getHalfExtents();
+		btVector3 margin(getMargin(),getMargin(),getMargin());
+		halfExtents -= margin;
+
+		return btVector3(vec.x() < btScalar(0.0) ? -halfExtents.x() : halfExtents.x(),
+                    vec.y() < btScalar(0.0) ? -halfExtents.y() : halfExtents.y(),
+                    vec.z() < btScalar(0.0) ? -halfExtents.z() : halfExtents.z()); 
 	}
 
 	virtual void	batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors,btVector3* supportVerticesOut,int numVectors) const
 	{
-		const btVector3& halfExtents = getHalfExtentsWithoutMargin();
-	
+		btVector3 halfExtents = getHalfExtents();
+		btVector3 margin(getMargin(),getMargin(),getMargin());
+		halfExtents -= margin;
+
+
 		for (int i=0;i<numVectors;i++)
 		{
 			const btVector3& vec = vectors[i];
-			supportVerticesOut[i].setValue(btFsels(vec.x(), halfExtents.x(), -halfExtents.x()),
-				btFsels(vec.y(), halfExtents.y(), -halfExtents.y()),
-				btFsels(vec.z(), halfExtents.z(), -halfExtents.z())); 
+			supportVerticesOut[i].setValue(vec.x() < btScalar(0.0) ? -halfExtents.x() : halfExtents.x(),
+                    vec.y() < btScalar(0.0) ? -halfExtents.y() : halfExtents.y(),
+                    vec.z() < btScalar(0.0) ? -halfExtents.z() : halfExtents.z()); 
 		}
 
 	}
@@ -84,38 +79,14 @@ public:
 
 	btBoxShape( const btVector3& boxHalfExtents)
 	{
-		btVector3 margin(getMargin(),getMargin(),getMargin());
-		m_implicitShapeDimensions = (boxHalfExtents * m_localScaling) - margin;
+		m_implicitShapeDimensions = boxHalfExtents;
 	};
-
-	virtual void setMargin(btScalar collisionMargin)
-	{
-		//correct the m_implicitShapeDimensions for the margin
-		btVector3 oldMargin(getMargin(),getMargin(),getMargin());
-		btVector3 implicitShapeDimensionsWithMargin = m_implicitShapeDimensions+oldMargin;
-		
-		btConvexInternalShape::setMargin(collisionMargin);
-		btVector3 newMargin(getMargin(),getMargin(),getMargin());
-		m_implicitShapeDimensions = implicitShapeDimensionsWithMargin - newMargin;
-
-	}
-	virtual void	setLocalScaling(const btVector3& scaling)
-	{
-		btVector3 oldMargin(getMargin(),getMargin(),getMargin());
-		btVector3 implicitShapeDimensionsWithMargin = m_implicitShapeDimensions+oldMargin;
-		btVector3 unScaledImplicitShapeDimensionsWithMargin = implicitShapeDimensionsWithMargin / m_localScaling;
-
-		btConvexInternalShape::setLocalScaling(scaling);
-
-		m_implicitShapeDimensions = (unScaledImplicitShapeDimensionsWithMargin * m_localScaling) - oldMargin;
-
-	}
-
+	
 	virtual void getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const;
 
 	
 
-	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia) const;
+	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia);
 
 	virtual void getPlane(btVector3& planeNormal,btPoint3& planeSupport,int i ) const
 	{
@@ -145,7 +116,7 @@ public:
 
 	virtual void getVertex(int i,btVector3& vtx) const
 	{
-		btVector3 halfExtents = getHalfExtentsWithoutMargin();
+		btVector3 halfExtents = getHalfExtents();
 
 		vtx = btVector3(
 				halfExtents.x() * (1-(i&1)) - halfExtents.x() * (i&1),
@@ -156,7 +127,7 @@ public:
 
 	virtual void	getPlaneEquation(btVector4& plane,int i) const
 	{
-		btVector3 halfExtents = getHalfExtentsWithoutMargin();
+		btVector3 halfExtents = getHalfExtents();
 
 		switch (i)
 		{
@@ -263,7 +234,7 @@ public:
 	
 	virtual	bool isInside(const btPoint3& pt,btScalar tolerance) const
 	{
-		btVector3 halfExtents = getHalfExtentsWithoutMargin();
+		btVector3 halfExtents = getHalfExtents();
 
 		//btScalar minDist = 2*tolerance;
 		
@@ -279,7 +250,7 @@ public:
 
 
 	//debugging
-	virtual const char*	getName()const
+	virtual char*	getName()const
 	{
 		return "Box";
 	}
@@ -320,4 +291,3 @@ public:
 
 #endif //OBB_BOX_MINKOWSKI_H
 
-
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp
index 819f6f7f97d..8da554ef14d 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp
@@ -18,56 +18,32 @@ subject to the following restrictions:
 #include "BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h"
 #include "BulletCollision/CollisionShapes/btOptimizedBvh.h"
 
+
 ///Bvh Concave triangle mesh is a static-triangle mesh shape with Bounding Volume Hierarchy optimization.
 ///Uses an interface to access the triangles to allow for sharing graphics/physics triangles.
-btBvhTriangleMeshShape::btBvhTriangleMeshShape(btStridingMeshInterface* meshInterface, bool useQuantizedAabbCompression, bool buildBvh)
-:btTriangleMeshShape(meshInterface),
-m_bvh(0),
-m_useQuantizedAabbCompression(useQuantizedAabbCompression),
-m_ownsBvh(false)
+btBvhTriangleMeshShape::btBvhTriangleMeshShape(btStridingMeshInterface* meshInterface, bool useQuantizedAabbCompression)
+:btTriangleMeshShape(meshInterface),m_useQuantizedAabbCompression(useQuantizedAabbCompression)
 {
 	//construct bvh from meshInterface
 #ifndef DISABLE_BVH
 
+	m_bvh = new btOptimizedBvh();
 	btVector3 bvhAabbMin,bvhAabbMax;
-	if(meshInterface->hasPremadeAabb())
-	{
-		meshInterface->getPremadeAabb(&bvhAabbMin, &bvhAabbMax);
-	}
-	else
-	{
-		meshInterface->calculateAabbBruteForce(bvhAabbMin,bvhAabbMax);
-	}
-	
-	if (buildBvh)
-	{
-		void* mem = btAlignedAlloc(sizeof(btOptimizedBvh),16);
-		m_bvh = new (mem) btOptimizedBvh();
-		m_bvh->build(meshInterface,m_useQuantizedAabbCompression,bvhAabbMin,bvhAabbMax);
-		m_ownsBvh = true;
-	}
+	meshInterface->calculateAabbBruteForce(bvhAabbMin,bvhAabbMax);
+	m_bvh->build(meshInterface,m_useQuantizedAabbCompression,bvhAabbMin,bvhAabbMax);
 
 #endif //DISABLE_BVH
 
 }
 
-btBvhTriangleMeshShape::btBvhTriangleMeshShape(btStridingMeshInterface* meshInterface, bool useQuantizedAabbCompression,const btVector3& bvhAabbMin,const btVector3& bvhAabbMax,bool buildBvh)
-:btTriangleMeshShape(meshInterface),
-m_bvh(0),
-m_useQuantizedAabbCompression(useQuantizedAabbCompression),
-m_ownsBvh(false)
+btBvhTriangleMeshShape::btBvhTriangleMeshShape(btStridingMeshInterface* meshInterface, bool useQuantizedAabbCompression,const btVector3& bvhAabbMin,const btVector3& bvhAabbMax)
+:btTriangleMeshShape(meshInterface),m_useQuantizedAabbCompression(useQuantizedAabbCompression)
 {
 	//construct bvh from meshInterface
 #ifndef DISABLE_BVH
 
-	if (buildBvh)
-	{
-		void* mem = btAlignedAlloc(sizeof(btOptimizedBvh),16);
-		m_bvh = new (mem) btOptimizedBvh();
-		
-		m_bvh->build(meshInterface,m_useQuantizedAabbCompression,bvhAabbMin,bvhAabbMax);
-		m_ownsBvh = true;
-	}
+	m_bvh = new btOptimizedBvh();
+	m_bvh->build(meshInterface,m_useQuantizedAabbCompression,bvhAabbMin,bvhAabbMax);
 
 #endif //DISABLE_BVH
 
@@ -82,140 +58,16 @@ void	btBvhTriangleMeshShape::partialRefitTree(const btVector3& aabbMin,const btV
 }
 
 
-void	btBvhTriangleMeshShape::refitTree(const btVector3& aabbMin,const btVector3& aabbMax)
+void	btBvhTriangleMeshShape::refitTree()
 {
-	m_bvh->refit( m_meshInterface, aabbMin,aabbMax );
+	m_bvh->refit( m_meshInterface );
 	
 	recalcLocalAabb();
 }
 
 btBvhTriangleMeshShape::~btBvhTriangleMeshShape()
 {
-	if (m_ownsBvh)
-	{
-		m_bvh->~btOptimizedBvh();
-		btAlignedFree(m_bvh);
-	}
-}
-
-void	btBvhTriangleMeshShape::performRaycast (btTriangleCallback* callback, const btVector3& raySource, const btVector3& rayTarget)
-{
-	struct	MyNodeOverlapCallback : public btNodeOverlapCallback
-	{
-		btStridingMeshInterface*	m_meshInterface;
-		btTriangleCallback* m_callback;
-
-		MyNodeOverlapCallback(btTriangleCallback* callback,btStridingMeshInterface* meshInterface)
-			:m_meshInterface(meshInterface),
-			m_callback(callback)
-		{
-		}
-				
-		virtual void processNode(int nodeSubPart, int nodeTriangleIndex)
-		{
-			btVector3 m_triangle[3];
-			const unsigned char *vertexbase;
-			int numverts;
-			PHY_ScalarType type;
-			int stride;
-			const unsigned char *indexbase;
-			int indexstride;
-			int numfaces;
-			PHY_ScalarType indicestype;
-
-			m_meshInterface->getLockedReadOnlyVertexIndexBase(
-				&vertexbase,
-				numverts,
-				type,
-				stride,
-				&indexbase,
-				indexstride,
-				numfaces,
-				indicestype,
-				nodeSubPart);
-
-			unsigned int* gfxbase = (unsigned int*)(indexbase+nodeTriangleIndex*indexstride);
-			btAssert(indicestype==PHY_INTEGER||indicestype==PHY_SHORT);
-	
-			const btVector3& meshScaling = m_meshInterface->getScaling();
-			for (int j=2;j>=0;j--)
-			{
-				int graphicsindex = indicestype==PHY_SHORT?((unsigned short*)gfxbase)[j]:gfxbase[j];
-
-				btScalar* graphicsbase = (btScalar*)(vertexbase+graphicsindex*stride);
-
-				m_triangle[j] = btVector3(graphicsbase[0]*meshScaling.getX(),graphicsbase[1]*meshScaling.getY(),graphicsbase[2]*meshScaling.getZ());		
-			}
-
-			/* Perform ray vs. triangle collision here */
-			m_callback->processTriangle(m_triangle,nodeSubPart,nodeTriangleIndex);
-			m_meshInterface->unLockReadOnlyVertexBase(nodeSubPart);
-		}
-	};
-
-	MyNodeOverlapCallback	myNodeCallback(callback,m_meshInterface);
-
-	m_bvh->reportRayOverlappingNodex(&myNodeCallback,raySource,rayTarget);
-}
-
-void	btBvhTriangleMeshShape::performConvexcast (btTriangleCallback* callback, const btVector3& raySource, const btVector3& rayTarget, const btVector3& aabbMin, const btVector3& aabbMax)
-{
-	struct	MyNodeOverlapCallback : public btNodeOverlapCallback
-	{
-		btStridingMeshInterface*	m_meshInterface;
-		btTriangleCallback* m_callback;
-
-		MyNodeOverlapCallback(btTriangleCallback* callback,btStridingMeshInterface* meshInterface)
-			:m_meshInterface(meshInterface),
-			m_callback(callback)
-		{
-		}
-				
-		virtual void processNode(int nodeSubPart, int nodeTriangleIndex)
-		{
-			btVector3 m_triangle[3];
-			const unsigned char *vertexbase;
-			int numverts;
-			PHY_ScalarType type;
-			int stride;
-			const unsigned char *indexbase;
-			int indexstride;
-			int numfaces;
-			PHY_ScalarType indicestype;
-
-			m_meshInterface->getLockedReadOnlyVertexIndexBase(
-				&vertexbase,
-				numverts,
-				type,
-				stride,
-				&indexbase,
-				indexstride,
-				numfaces,
-				indicestype,
-				nodeSubPart);
-
-			unsigned int* gfxbase = (unsigned int*)(indexbase+nodeTriangleIndex*indexstride);
-			btAssert(indicestype==PHY_INTEGER||indicestype==PHY_SHORT);
-	
-			const btVector3& meshScaling = m_meshInterface->getScaling();
-			for (int j=2;j>=0;j--)
-			{
-				int graphicsindex = indicestype==PHY_SHORT?((unsigned short*)gfxbase)[j]:gfxbase[j];
-
-				btScalar* graphicsbase = (btScalar*)(vertexbase+graphicsindex*stride);
-
-				m_triangle[j] = btVector3(graphicsbase[0]*meshScaling.getX(),graphicsbase[1]*meshScaling.getY(),graphicsbase[2]*meshScaling.getZ());		
-			}
-
-			/* Perform ray vs. triangle collision here */
-			m_callback->processTriangle(m_triangle,nodeSubPart,nodeTriangleIndex);
-			m_meshInterface->unLockReadOnlyVertexBase(nodeSubPart);
-		}
-	};
-
-	MyNodeOverlapCallback	myNodeCallback(callback,m_meshInterface);
-
-	m_bvh->reportBoxCastOverlappingNodex (&myNodeCallback, raySource, rayTarget, aabbMin, aabbMax);
+	delete m_bvh;
 }
 
 //perform bvh tree traversal and report overlapping triangles to 'callback'
@@ -266,14 +118,13 @@ void	btBvhTriangleMeshShape::processAllTriangles(btTriangleCallback* callback,co
 				indicestype,
 				nodeSubPart);
 
-			unsigned int* gfxbase = (unsigned int*)(indexbase+nodeTriangleIndex*indexstride);
-			btAssert(indicestype==PHY_INTEGER||indicestype==PHY_SHORT);
+			int* gfxbase = (int*)(indexbase+nodeTriangleIndex*indexstride);
 	
 			const btVector3& meshScaling = m_meshInterface->getScaling();
 			for (int j=2;j>=0;j--)
 			{
 				
-				int graphicsindex = indicestype==PHY_SHORT?((unsigned short*)gfxbase)[j]:gfxbase[j];
+				int graphicsindex = gfxbase[j];
 
 
 #ifdef DEBUG_TRIANGLE_MESH
@@ -306,37 +157,17 @@ void	btBvhTriangleMeshShape::processAllTriangles(btTriangleCallback* callback,co
 
 }
 
-void   btBvhTriangleMeshShape::setLocalScaling(const btVector3& scaling)
+
+void	btBvhTriangleMeshShape::setLocalScaling(const btVector3& scaling)
 {
-   if ((getLocalScaling() -scaling).length2() > SIMD_EPSILON)
-   {
-      btTriangleMeshShape::setLocalScaling(scaling);
-      if (m_ownsBvh)
-      {
-         m_bvh->~btOptimizedBvh();
-         btAlignedFree(m_bvh);
-      }
-      ///m_localAabbMin/m_localAabbMax is already re-calculated in btTriangleMeshShape. We could just scale aabb, but this needs some more work
-      void* mem = btAlignedAlloc(sizeof(btOptimizedBvh),16);
-      m_bvh = new(mem) btOptimizedBvh();
-      //rebuild the bvh...
-      m_bvh->build(m_meshInterface,m_useQuantizedAabbCompression,m_localAabbMin,m_localAabbMax);
-      m_ownsBvh = true;
-   }
+	if ((getLocalScaling() -scaling).length2() > SIMD_EPSILON)
+	{
+		btTriangleMeshShape::setLocalScaling(scaling);
+		delete m_bvh;
+		///m_localAabbMin/m_localAabbMax is already re-calculated in btTriangleMeshShape. We could just scale aabb, but this needs some more work
+		m_bvh = new btOptimizedBvh();
+		//rebuild the bvh...
+		m_bvh->build(m_meshInterface,m_useQuantizedAabbCompression,m_localAabbMin,m_localAabbMax);
+
+	}
 }
-
-void   btBvhTriangleMeshShape::setOptimizedBvh(btOptimizedBvh* bvh, const btVector3& scaling)
-{
-   btAssert(!m_bvh);
-   btAssert(!m_ownsBvh);
-
-   m_bvh = bvh;
-   m_ownsBvh = false;
-   // update the scaling without rebuilding the bvh
-   if ((getLocalScaling() -scaling).length2() > SIMD_EPSILON)
-   {
-      btTriangleMeshShape::setLocalScaling(scaling);
-   }
-}
-
-
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h
index 6e587340dc1..4914d9f959c 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h
@@ -18,55 +18,45 @@ subject to the following restrictions:
 
 #include "btTriangleMeshShape.h"
 #include "btOptimizedBvh.h"
-#include "LinearMath/btAlignedAllocator.h"
 
-
-///The btBvhTriangleMeshShape is a static-triangle mesh shape with several optimizations, such as bounding volume hierarchy and cache friendly traversal for PlayStation 3 Cell SPU. It is recommended to enable useQuantizedAabbCompression for better memory usage.
-///It takes a triangle mesh as input, for example a btTriangleMesh or btTriangleIndexVertexArray. The btBvhTriangleMeshShape class allows for triangle mesh deformations by a refit or partialRefit method.
-///Instead of building the bounding volume hierarchy acceleration structure, it is also possible to serialize (save) and deserialize (load) the structure from disk.
-///See Demos\ConcaveDemo\ConcavePhysicsDemo.cpp for an example.
+///Bvh Concave triangle mesh is a static-triangle mesh shape with Bounding Volume Hierarchy optimization.
+///Uses an interface to access the triangles to allow for sharing graphics/physics triangles.
 ATTRIBUTE_ALIGNED16(class) btBvhTriangleMeshShape : public btTriangleMeshShape
 {
 
 	btOptimizedBvh*	m_bvh;
 	bool m_useQuantizedAabbCompression;
-	bool m_ownsBvh;
-	bool m_pad[11];////need padding due to alignment
+	bool m_pad[12];////need padding due to alignment
 
 public:
 
-	BT_DECLARE_ALIGNED_ALLOCATOR();
-
-	btBvhTriangleMeshShape() :btTriangleMeshShape(0),m_bvh(0),m_ownsBvh(false) {};
-	btBvhTriangleMeshShape(btStridingMeshInterface* meshInterface, bool useQuantizedAabbCompression, bool buildBvh = true);
+	btBvhTriangleMeshShape() :btTriangleMeshShape(0) {};
+	btBvhTriangleMeshShape(btStridingMeshInterface* meshInterface, bool useQuantizedAabbCompression);
 
 	///optionally pass in a larger bvh aabb, used for quantization. This allows for deformations within this aabb
-	btBvhTriangleMeshShape(btStridingMeshInterface* meshInterface, bool useQuantizedAabbCompression,const btVector3& bvhAabbMin,const btVector3& bvhAabbMax, bool buildBvh = true);
+	btBvhTriangleMeshShape(btStridingMeshInterface* meshInterface, bool useQuantizedAabbCompression,const btVector3& bvhAabbMin,const btVector3& bvhAabbMax);
 	
 	virtual ~btBvhTriangleMeshShape();
 
-	bool getOwnsBvh () const
-	{
-		return m_ownsBvh;
-	}
-
+	
+	/*
 	virtual int	getShapeType() const
 	{
 		return TRIANGLE_MESH_SHAPE_PROXYTYPE;
 	}
-	
-	void performRaycast (btTriangleCallback* callback, const btVector3& raySource, const btVector3& rayTarget);
-	void performConvexcast (btTriangleCallback* callback, const btVector3& boxSource, const btVector3& boxTarget, const btVector3& boxMin, const btVector3& boxMax);
+	*/
+
+
 
 	virtual void	processAllTriangles(btTriangleCallback* callback,const btVector3& aabbMin,const btVector3& aabbMax) const;
 
-	void	refitTree(const btVector3& aabbMin,const btVector3& aabbMax);
+	void	refitTree();
 
 	///for a fast incremental refit of parts of the tree. Note: the entire AABB of the tree will become more conservative, it never shrinks
 	void	partialRefitTree(const btVector3& aabbMin,const btVector3& aabbMax);
 
 	//debugging
-	virtual const char*	getName()const {return "BVHTRIANGLEMESH";}
+	virtual char*	getName()const {return "BVHTRIANGLEMESH";}
 
 
 	virtual void	setLocalScaling(const btVector3& scaling);
@@ -75,10 +65,6 @@ public:
 	{
 		return m_bvh;
 	}
-
-
-	void	setOptimizedBvh(btOptimizedBvh* bvh, const btVector3& localScaling=btVector3(1,1,1));
-
 	bool	usesQuantizedAabbCompression() const
 	{
 		return	m_useQuantizedAabbCompression;
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.cpp
index 26ba276b900..b7e15172da2 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.cpp
@@ -21,7 +21,6 @@ subject to the following restrictions:
 
 btCapsuleShape::btCapsuleShape(btScalar radius, btScalar height)
 {
-	m_upAxis = 1;
 	m_implicitShapeDimensions.setValue(radius,0.5f*height,radius);
 }
 
@@ -51,9 +50,7 @@ btCapsuleShape::btCapsuleShape(btScalar radius, btScalar height)
 
 
 	{
-		btVector3 pos(0,0,0);
-		pos[getUpAxis()] = getHalfHeight();
-
+		btVector3 pos(0,getHalfHeight(),0);
 		vtx = pos +vec*m_localScaling*(radius) - vec * getMargin();
 		newDot = vec.dot(vtx);
 		if (newDot > maxDot)
@@ -63,9 +60,7 @@ btCapsuleShape::btCapsuleShape(btScalar radius, btScalar height)
 		}
 	}
 	{
-		btVector3 pos(0,0,0);
-		pos[getUpAxis()] = -getHalfHeight();
-
+		btVector3 pos(0,-getHalfHeight(),0);
 		vtx = pos +vec*m_localScaling*(radius) - vec * getMargin();
 		newDot = vec.dot(vtx);
 		if (newDot > maxDot)
@@ -93,8 +88,7 @@ btCapsuleShape::btCapsuleShape(btScalar radius, btScalar height)
 		btVector3 vtx;
 		btScalar newDot;
 		{
-			btVector3 pos(0,0,0);
-			pos[getUpAxis()] = getHalfHeight();
+			btVector3 pos(0,getHalfHeight(),0);
 			vtx = pos +vec*m_localScaling*(radius) - vec * getMargin();
 			newDot = vec.dot(vtx);
 			if (newDot > maxDot)
@@ -104,8 +98,7 @@ btCapsuleShape::btCapsuleShape(btScalar radius, btScalar height)
 			}
 		}
 		{
-			btVector3 pos(0,0,0);
-			pos[getUpAxis()] = -getHalfHeight();
+			btVector3 pos(0,-getHalfHeight(),0);
 			vtx = pos +vec*m_localScaling*(radius) - vec * getMargin();
 			newDot = vec.dot(vtx);
 			if (newDot > maxDot)
@@ -119,7 +112,7 @@ btCapsuleShape::btCapsuleShape(btScalar radius, btScalar height)
 }
 
 
-void	btCapsuleShape::calculateLocalInertia(btScalar mass,btVector3& inertia) const
+void	btCapsuleShape::calculateLocalInertia(btScalar mass,btVector3& inertia)
 {
 	//as an approximation, take the inertia of the box that bounds the spheres
 
@@ -129,8 +122,7 @@ void	btCapsuleShape::calculateLocalInertia(btScalar mass,btVector3& inertia) con
 	
 	btScalar radius = getRadius();
 
-	btVector3 halfExtents(radius,radius,radius);
-	halfExtents[getUpAxis()]+=getHalfHeight();
+	btVector3 halfExtents(radius,radius+getHalfHeight(),radius);
 
 	btScalar margin = CONVEX_DISTANCE_MARGIN;
 
@@ -148,22 +140,6 @@ void	btCapsuleShape::calculateLocalInertia(btScalar mass,btVector3& inertia) con
 
 }
 
-btCapsuleShapeX::btCapsuleShapeX(btScalar radius,btScalar height)
-{
-	m_upAxis = 0;
-	m_implicitShapeDimensions.setValue(0.5f*height, radius,radius);
-}
-
-
-
-
-
-
-btCapsuleShapeZ::btCapsuleShapeZ(btScalar radius,btScalar height)
-{
-	m_upAxis = 2;
-	m_implicitShapeDimensions.setValue(radius,radius,0.5f*height);
-}
 
 
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.h
index 92bcce55119..27da8adefa5 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btCapsuleShape.h
@@ -16,27 +16,20 @@ subject to the following restrictions:
 #ifndef BT_CAPSULE_SHAPE_H
 #define BT_CAPSULE_SHAPE_H
 
-#include "btConvexInternalShape.h"
-#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types
+#include "btConvexShape.h"
+#include "../BroadphaseCollision/btBroadphaseProxy.h" // for the types
 
 
-///The btCapsuleShape represents a capsule around the Y axis, there is also the btCapsuleShapeX aligned around the X axis and btCapsuleShapeZ around the Z axis.
-///The total height is height+2*radius, so the height is just the height between the center of each 'sphere' of the capsule caps.
-///The btCapsuleShape is a convex hull of two spheres. The btMultiSphereShape is a more general collision shape that takes the convex hull of multiple sphere, so it can also represent a capsule when just using two spheres.
-class btCapsuleShape : public btConvexInternalShape
+///btCapsuleShape represents a capsule around the Y axis
+///A more general solution that can represent capsules is the btMultiSphereShape
+class btCapsuleShape : public btConvexShape
 {
-protected:
-	int	m_upAxis;
-
-protected:
-	///only used for btCapsuleShapeZ and btCapsuleShapeX subclasses.
-	btCapsuleShape() {};
 
 public:
 	btCapsuleShape(btScalar radius,btScalar height);
 
 	///CollisionShape Interface
-	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia) const;
+	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia);
 
 	/// btConvexShape Interface
 	virtual btVector3	localGetSupportingVertexWithoutMargin(const btVector3& vec)const;
@@ -45,75 +38,23 @@ public:
 	
 	virtual int	getShapeType() const { return CAPSULE_SHAPE_PROXYTYPE; }
 
-	virtual void getAabb (const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const
-	{
-			btVector3 halfExtents(getRadius(),getRadius(),getRadius());
-			halfExtents[m_upAxis] = getRadius() + getHalfHeight();
-			btMatrix3x3 abs_b = t.getBasis().absolute();  
-			btPoint3 center = t.getOrigin();
-			btVector3 extent = btVector3(abs_b[0].dot(halfExtents),abs_b[1].dot(halfExtents),abs_b[2].dot(halfExtents));		  
-			extent += btVector3(getMargin(),getMargin(),getMargin());
-			aabbMin = center - extent;
-			aabbMax = center + extent;
-	}
-
-	virtual const char*	getName()const 
+	virtual char*	getName()const 
 	{
 		return "CapsuleShape";
 	}
 
-	int	getUpAxis() const
-	{
-		return m_upAxis;
-	}
-
 	btScalar	getRadius() const
 	{
-		int radiusAxis = (m_upAxis+2)%3;
-		return m_implicitShapeDimensions[radiusAxis];
+		return m_implicitShapeDimensions.getX();
 	}
 
 	btScalar	getHalfHeight() const
 	{
-		return m_implicitShapeDimensions[m_upAxis];
+		return m_implicitShapeDimensions.getY();
 	}
 
 };
 
-///btCapsuleShapeX represents a capsule around the Z axis
-///the total height is height+2*radius, so the height is just the height between the center of each 'sphere' of the capsule caps.
-class btCapsuleShapeX : public btCapsuleShape
-{
-public:
-
-	btCapsuleShapeX(btScalar radius,btScalar height);
-		
-	//debugging
-	virtual const char*	getName()const
-	{
-		return "CapsuleX";
-	}
-
-	
-
-};
-
-///btCapsuleShapeZ represents a capsule around the Z axis
-///the total height is height+2*radius, so the height is just the height between the center of each 'sphere' of the capsule caps.
-class btCapsuleShapeZ : public btCapsuleShape
-{
-public:
-	btCapsuleShapeZ(btScalar radius,btScalar height);
-
-		//debugging
-	virtual const char*	getName()const
-	{
-		return "CapsuleZ";
-	}
-
-	
-};
-
 
 
 #endif //BT_CAPSULE_SHAPE_H
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.cpp
index 39e621aa946..81d82428f4c 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.cpp
@@ -21,12 +21,7 @@ subject to the following restrictions:
   can be used by probes that are checking whether the
   library is actually installed.
 */
-extern "C" 
-{
-void btBulletCollisionProbe ();
-
-void btBulletCollisionProbe () {}
-}
+extern "C" void btBulletCollisionProbe () {}
 
 
 
@@ -51,7 +46,7 @@ btScalar	btCollisionShape::getAngularMotionDisc() const
 	return disc;
 }
 
-void btCollisionShape::calculateTemporalAabb(const btTransform& curTrans,const btVector3& linvel,const btVector3& angvel,btScalar timeStep, btVector3& temporalAabbMin,btVector3& temporalAabbMax) const
+void btCollisionShape::calculateTemporalAabb(const btTransform& curTrans,const btVector3& linvel,const btVector3& angvel,btScalar timeStep, btVector3& temporalAabbMin,btVector3& temporalAabbMax)
 {
 	//start with static aabb
 	getAabb(curTrans,temporalAabbMin,temporalAabbMax);
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.h
index 3a352b90777..96268734a83 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.h
@@ -16,21 +16,18 @@ subject to the following restrictions:
 #ifndef COLLISION_SHAPE_H
 #define COLLISION_SHAPE_H
 
-#include "LinearMath/btTransform.h"
-#include "LinearMath/btVector3.h"
-#include "LinearMath/btMatrix3x3.h"
-#include "LinearMath/btPoint3.h"
-#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" //for the shape types
+#include "../../LinearMath/btTransform.h"
+#include "../../LinearMath/btVector3.h"
+#include "../../LinearMath/btMatrix3x3.h"
+#include "../../LinearMath/btPoint3.h"
+#include "../BroadphaseCollision/btBroadphaseProxy.h" //for the shape types
 
-///The btCollisionShape class provides an interface for collision shapes that can be shared among btCollisionObjects.
+///btCollisionShape provides interface for collision shapes that can be shared among btCollisionObjects.
 class btCollisionShape
 {
-
-	void* m_userPointer;
-
 public:
 
-	btCollisionShape() : m_userPointer(0)
+	btCollisionShape() 
 	{
 	}
 	virtual ~btCollisionShape()
@@ -48,30 +45,30 @@ public:
 
 	///calculateTemporalAabb calculates the enclosing aabb for the moving object over interval [0..timeStep)
 	///result is conservative
-	void calculateTemporalAabb(const btTransform& curTrans,const btVector3& linvel,const btVector3& angvel,btScalar timeStep, btVector3& temporalAabbMin,btVector3& temporalAabbMax) const;
+	void calculateTemporalAabb(const btTransform& curTrans,const btVector3& linvel,const btVector3& angvel,btScalar timeStep, btVector3& temporalAabbMin,btVector3& temporalAabbMax);
 
 #ifndef __SPU__
 
-	SIMD_FORCE_INLINE bool	isPolyhedral() const
+	inline bool	isPolyhedral() const
 	{
 		return btBroadphaseProxy::isPolyhedral(getShapeType());
 	}
 
-	SIMD_FORCE_INLINE bool	isConvex() const
+	inline bool	isConvex() const
 	{
 		return btBroadphaseProxy::isConvex(getShapeType());
 	}
-	SIMD_FORCE_INLINE bool	isConcave() const
+	inline bool	isConcave() const
 	{
 		return btBroadphaseProxy::isConcave(getShapeType());
 	}
-	SIMD_FORCE_INLINE bool	isCompound() const
+	inline bool	isCompound() const
 	{
 		return btBroadphaseProxy::isCompound(getShapeType());
 	}
 
 	///isInfinite is used to catch simulation error (aabb check)
-	SIMD_FORCE_INLINE bool isInfinite() const
+	inline bool isInfinite() const
 	{
 		return btBroadphaseProxy::isInfinite(getShapeType());
 	}
@@ -79,11 +76,11 @@ public:
 	virtual int		getShapeType() const=0;
 	virtual void	setLocalScaling(const btVector3& scaling) =0;
 	virtual const btVector3& getLocalScaling() const =0;
-	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia) const = 0;
+	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia) = 0;
 
 
 //debugging support
-	virtual const char*	getName()const =0 ;
+	virtual char*	getName()const =0 ;
 #endif //__SPU__
 
 	
@@ -91,18 +88,6 @@ public:
 	virtual void	setMargin(btScalar margin) = 0;
 	virtual btScalar	getMargin() const = 0;
 
-	
-	///optional user data pointer
-	void	setUserPointer(void* userPtr)
-	{
-		m_userPointer = userPtr;
-	}
-
-	void*	getUserPointer() const
-	{
-		return m_userPointer;
-	}
-
 };	
 
 #endif //COLLISION_SHAPE_H
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.cpp
index 740f1783630..a4712b3e925 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.cpp
@@ -35,15 +35,8 @@ btCompoundShape::~btCompoundShape()
 
 void	btCompoundShape::addChildShape(const btTransform& localTransform,btCollisionShape* shape)
 {
-	//m_childTransforms.push_back(localTransform);
-	//m_childShapes.push_back(shape);
-	btCompoundShapeChild child;
-	child.m_transform = localTransform;
-	child.m_childShape = shape;
-	child.m_childShapeType = shape->getShapeType();
-	child.m_childMargin = shape->getMargin();
-
-	m_children.push_back(child);
+	m_childTransforms.push_back(localTransform);
+	m_childShapes.push_back(shape);
 
 	//extend the local aabbMin/aabbMax
 	btVector3 localAabbMin,localAabbMax;
@@ -62,53 +55,9 @@ void	btCompoundShape::addChildShape(const btTransform& localTransform,btCollisio
 	}
 }
 
-void btCompoundShape::removeChildShape(btCollisionShape* shape)
-{
-   bool done_removing;
-   
-   // Find the children containing the shape specified, and remove those children.
-   do
-   {
-      done_removing = true;
-      
-      for(int i = 0; i < m_children.size(); i++)
-      {
-         if(m_children[i].m_childShape == shape)
-         {
-            m_children.remove(m_children[i]);
-            done_removing = false;  // Do another iteration pass after removing from the vector
-            break;
-         }
-      }
-   }
-   while (!done_removing);
-   
-   recalculateLocalAabb();
-}
 
-void btCompoundShape::recalculateLocalAabb()
-{
-   // Recalculate the local aabb
-   // Brute force, it iterates over all the shapes left.
-   m_localAabbMin = btVector3(btScalar(1e30),btScalar(1e30),btScalar(1e30));
-   m_localAabbMax = btVector3(btScalar(-1e30),btScalar(-1e30),btScalar(-1e30));
-   
-   //extend the local aabbMin/aabbMax
-   for (int j = 0; j < m_children.size(); j++)
-   {
-      btVector3 localAabbMin,localAabbMax;
-      m_children[j].m_childShape->getAabb(m_children[j].m_transform, localAabbMin, localAabbMax);
-      for (int i=0;i<3;i++)
-      {
-         if (m_localAabbMin[i] > localAabbMin[i])
-             m_localAabbMin[i] = localAabbMin[i];
-         if (m_localAabbMax[i] < localAabbMax[i])
-             m_localAabbMax[i] = localAabbMax[i];
-      }
-   }
-}
-	
-   ///getAabb's default implementation is brute force, expected derived classes to implement a fast dedicated version
+
+	///getAabb's default implementation is brute force, expected derived classes to implement a fast dedicated version
 void btCompoundShape::getAabb(const btTransform& trans,btVector3& aabbMin,btVector3& aabbMax) const
 {
 	btVector3 localHalfExtents = btScalar(0.5)*(m_localAabbMax-m_localAabbMin);
@@ -127,7 +76,7 @@ void btCompoundShape::getAabb(const btTransform& trans,btVector3& aabbMin,btVect
 	aabbMax = center + extent;
 }
 
-void	btCompoundShape::calculateLocalInertia(btScalar mass,btVector3& inertia) const
+void	btCompoundShape::calculateLocalInertia(btScalar mass,btVector3& inertia)
 {
 	//approximation: take the inertia from the aabb for now
 	btTransform ident;
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.h
index f77e4b59558..86dc1f80947 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.h
@@ -18,95 +18,58 @@ subject to the following restrictions:
 
 #include "btCollisionShape.h"
 
-#include "LinearMath/btVector3.h"
-#include "LinearMath/btTransform.h"
-#include "LinearMath/btMatrix3x3.h"
+#include "../../LinearMath/btVector3.h"
+#include "../../LinearMath/btTransform.h"
+#include "../../LinearMath/btMatrix3x3.h"
 #include "btCollisionMargin.h"
-#include "LinearMath/btAlignedObjectArray.h"
+#include "../../LinearMath/btAlignedObjectArray.h"
 
 class btOptimizedBvh;
 
-
-ATTRIBUTE_ALIGNED16(struct) btCompoundShapeChild
-{
-	BT_DECLARE_ALIGNED_ALLOCATOR();
-
-	btTransform			m_transform;
-	btCollisionShape*	m_childShape;
-	int					m_childShapeType;
-	btScalar			m_childMargin;
-};
-
-SIMD_FORCE_INLINE bool operator==(const btCompoundShapeChild& c1, const btCompoundShapeChild& c2)
-{
-   return  ( c1.m_transform      == c2.m_transform &&
-             c1.m_childShape     == c2.m_childShape &&
-             c1.m_childShapeType == c2.m_childShapeType &&
-             c1.m_childMargin    == c2.m_childMargin );
-}
-
 /// btCompoundShape allows to store multiple other btCollisionShapes
-/// This allows for moving concave collision objects. This is more general then the static concave btBvhTriangleMeshShape.
-ATTRIBUTE_ALIGNED16(class) btCompoundShape	: public btCollisionShape
+/// This allows for concave collision objects. This is more general then the Static Concave btTriangleMeshShape.
+class btCompoundShape	: public btCollisionShape
 {
-	//btAlignedObjectArray<btTransform>		m_childTransforms;
-	//btAlignedObjectArray<btCollisionShape*>	m_childShapes;
-	btAlignedObjectArray<btCompoundShapeChild> m_children;
+	btAlignedObjectArray<btTransform>		m_childTransforms;
+	btAlignedObjectArray<btCollisionShape*>	m_childShapes;
 	btVector3						m_localAabbMin;
 	btVector3						m_localAabbMax;
 
 	btOptimizedBvh*					m_aabbTree;
 
 public:
-	BT_DECLARE_ALIGNED_ALLOCATOR();
-
 	btCompoundShape();
 
 	virtual ~btCompoundShape();
 
 	void	addChildShape(const btTransform& localTransform,btCollisionShape* shape);
 
-   /** Remove all children shapes that contain the specified shape. */
-	virtual void removeChildShape(btCollisionShape* shape);
-
-	  
-	
-
 	int		getNumChildShapes() const
 	{
-		return int (m_children.size());
+		return int (m_childShapes.size());
 	}
 
 	btCollisionShape* getChildShape(int index)
 	{
-		return m_children[index].m_childShape;
+		return m_childShapes[index];
 	}
 	const btCollisionShape* getChildShape(int index) const
 	{
-		return m_children[index].m_childShape;
+		return m_childShapes[index];
 	}
 
-	btTransform	getChildTransform(int index)
+	btTransform&	getChildTransform(int index)
 	{
-		return m_children[index].m_transform;
+		return m_childTransforms[index];
 	}
-	const btTransform	getChildTransform(int index) const
+	const btTransform&	getChildTransform(int index) const
 	{
-		return m_children[index].m_transform;
-	}
-
-
-	btCompoundShapeChild* getChildList()
-	{
-		return &m_children[0];
+		return m_childTransforms[index];
 	}
 
 	///getAabb's default implementation is brute force, expected derived classes to implement a fast dedicated version
-	virtual	void getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const;
-	
-   /** Re-calculate the local Aabb. Is called at the end of removeChildShapes. 
-       Use this yourself if you modify the children or their transforms. */
-	virtual void recalculateLocalAabb(); 
+	void getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const;
+
 
 	virtual void	setLocalScaling(const btVector3& scaling)
 	{
@@ -117,7 +80,7 @@ public:
 		return m_localScaling;
 	}
 
-	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia) const;
+	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia);
 	
 	virtual int	getShapeType() const { return COMPOUND_SHAPE_PROXYTYPE;}
 
@@ -129,7 +92,7 @@ public:
 	{
 		return m_collisionMargin;
 	}
-	virtual const char*	getName()const
+	virtual char*	getName()const
 	{
 		return "Compound";
 	}
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btConcaveShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btConcaveShape.h
index f3f57206ab7..73f974e4ee9 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btConcaveShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btConcaveShape.h
@@ -17,12 +17,12 @@ subject to the following restrictions:
 #define CONCAVE_SHAPE_H
 
 #include "btCollisionShape.h"
-#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types
+#include "../BroadphaseCollision/btBroadphaseProxy.h" // for the types
 #include "btTriangleCallback.h"
 
 
-///The btConcaveShape class provides an interface for non-moving (static) concave shapes.
-///It has been implemented by the btStaticPlaneShape, btBvhTriangleMeshShape and btHeightfieldTerrainShape.
+///Concave shape proves an interface concave shapes that can produce triangles that overlapping a given AABB.
+///Static triangle mesh, infinite plane, height field/landscapes are example that implement this interface.
 class btConcaveShape : public btCollisionShape
 {
 protected:
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.h
index 685369742e4..3ccda5b12c6 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.h
@@ -16,11 +16,11 @@ subject to the following restrictions:
 #ifndef CONE_MINKOWSKI_H
 #define CONE_MINKOWSKI_H
 
-#include "btConvexInternalShape.h"
-#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types
+#include "btConvexShape.h"
+#include "../BroadphaseCollision/btBroadphaseProxy.h" // for the types
 
-///The btConeShape implements a cone shape primitive, centered around the origin and aligned with the Y axis. The btConeShapeX is aligned around the X axis and btConeShapeZ around the Z axis.
-class btConeShape : public btConvexInternalShape
+///btConeShape implements a Cone shape, around the Y axis
+class btConeShape : public btConvexShape
 
 {
 
@@ -42,7 +42,7 @@ public:
 	btScalar getHeight() const { return m_height;}
 
 
-	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia) const
+	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia)
 	{
 		btTransform identity;
 		identity.setIdentity();
@@ -72,7 +72,7 @@ public:
 
 		virtual int	getShapeType() const { return CONE_SHAPE_PROXYTYPE; }
 
-		virtual const char*	getName()const 
+		virtual char*	getName()const 
 		{
 			return "Cone";
 		}
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.h
index c029ca19403..3fd5e382525 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.h
@@ -17,17 +17,18 @@ subject to the following restrictions:
 #define CONVEX_HULL_SHAPE_H
 
 #include "btPolyhedralConvexShape.h"
-#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types
-#include "LinearMath/btAlignedObjectArray.h"
+#include "../BroadphaseCollision/btBroadphaseProxy.h" // for the types
+#include "../../LinearMath/btAlignedObjectArray.h"
 
-///The btConvexHullShape implements an implicit convex hull of an array of vertices.
-///Bullet provides a general and fast collision detector for convex shapes based on GJK and EPA using localGetSupportingVertex.
+///ConvexHullShape implements an implicit (getSupportingVertex) Convex Hull of a Point Cloud (vertices)
+///No connectivity is needed. localGetSupportingVertex iterates linearly though all vertices.
+///on modern hardware, due to cache coherency this isn't that bad. Complex algorithms tend to trash the cash.
+///(memory is much slower then the cpu)
 ATTRIBUTE_ALIGNED16(class) btConvexHullShape : public btPolyhedralConvexShape
 {
 	btAlignedObjectArray<btPoint3>	m_points;
 
 public:
-	BT_DECLARE_ALIGNED_ALLOCATOR();
 
 	
 	///this constructor optionally takes in a pointer to points. Each point is assumed to be 3 consecutive btScalar (x,y,z), the striding defines the number of bytes between each point, in memory.
@@ -42,12 +43,7 @@ public:
 		return &m_points[0];
 	}
 
-	const btPoint3* getPoints() const
-	{
-		return &m_points[0];
-	}
-
-	int getNumPoints() const 
+	int getNumPoints()
 	{
 		return m_points.size();
 	}
@@ -60,7 +56,7 @@ public:
 	virtual int	getShapeType()const { return CONVEX_HULL_SHAPE_PROXYTYPE; }
 
 	//debugging
-	virtual const char*	getName()const {return "Convex";}
+	virtual char*	getName()const {return "Convex";}
 
 	
 	virtual int	getNumVertices() const;
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp
deleted file mode 100644
index f828d28e18c..00000000000
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-
-#include "btConvexInternalShape.h"
-
-
-btConvexInternalShape::btConvexInternalShape()
-: m_localScaling(btScalar(1.),btScalar(1.),btScalar(1.)),
-m_collisionMargin(CONVEX_DISTANCE_MARGIN)
-{
-}
-
-
-void	btConvexInternalShape::setLocalScaling(const btVector3& scaling)
-{
-	m_localScaling = scaling;
-}
-
-
-
-void	btConvexInternalShape::getAabbSlow(const btTransform& trans,btVector3&minAabb,btVector3&maxAabb) const
-{
-
-	btScalar margin = getMargin();
-	for (int i=0;i<3;i++)
-	{
-		btVector3 vec(btScalar(0.),btScalar(0.),btScalar(0.));
-		vec[i] = btScalar(1.);
-
-		btVector3 sv = localGetSupportingVertex(vec*trans.getBasis());
-
-		btVector3 tmp = trans(sv);
-		maxAabb[i] = tmp[i]+margin;
-		vec[i] = btScalar(-1.);
-		tmp = trans(localGetSupportingVertex(vec*trans.getBasis()));
-		minAabb[i] = tmp[i]-margin;
-	}
-};
-
-
-btVector3	btConvexInternalShape::localGetSupportingVertex(const btVector3& vec)const
-{
-#ifndef __SPU__
-
-	 btVector3	supVertex = localGetSupportingVertexWithoutMargin(vec);
-
-	if ( getMargin()!=btScalar(0.) )
-	{
-		btVector3 vecnorm = vec;
-		if (vecnorm .length2() < (SIMD_EPSILON*SIMD_EPSILON))
-		{
-			vecnorm.setValue(btScalar(-1.),btScalar(-1.),btScalar(-1.));
-		} 
-		vecnorm.normalize();
-		supVertex+= getMargin() * vecnorm;
-	}
-	return supVertex;
-
-#else
-	return btVector3(0,0,0);
-#endif //__SPU__
-
- }
-
-
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.h
deleted file mode 100644
index 9388ccf31f2..00000000000
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.h
+++ /dev/null
@@ -1,98 +0,0 @@
-
-#ifndef BT_CONVEX_INTERNAL_SHAPE_H
-#define BT_CONVEX_INTERNAL_SHAPE_H
-
-#include "btConvexShape.h"
-
-///The btConvexInternalShape is an internal base class, shared by most convex shape implementations.
-class btConvexInternalShape : public btConvexShape
-{
-
-	protected:
-
-	//local scaling. collisionMargin is not scaled !
-	btVector3	m_localScaling;
-
-	btVector3	m_implicitShapeDimensions;
-	
-	btScalar	m_collisionMargin;
-
-	btScalar	m_padding;
-
-public:
-
-	btConvexInternalShape();
-
-	virtual ~btConvexInternalShape()
-	{
-
-	}
-
-
-	virtual btVector3	localGetSupportingVertex(const btVector3& vec)const;
-#ifndef __SPU__
-	virtual btVector3	localGetSupportingVertexWithoutMargin(const btVector3& vec) const= 0;
-	
-	//notice that the vectors should be unit length
-	virtual void	batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors,btVector3* supportVerticesOut,int numVectors) const= 0;
-#endif //#ifndef __SPU__
-
-	const btVector3& getImplicitShapeDimensions() const
-	{
-		return m_implicitShapeDimensions;
-	}
-
-	///getAabb's default implementation is brute force, expected derived classes to implement a fast dedicated version
-	void getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const
-	{
-		getAabbSlow(t,aabbMin,aabbMax);
-	}
-
-
-	
-	virtual void getAabbSlow(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const;
-
-
-	virtual void	setLocalScaling(const btVector3& scaling);
-	virtual const btVector3& getLocalScaling() const 
-	{
-		return m_localScaling;
-	}
-
-	const btVector3& getLocalScalingNV() const 
-	{
-		return m_localScaling;
-	}
-
-	virtual void	setMargin(btScalar margin)
-	{
-		m_collisionMargin = margin;
-	}
-	virtual btScalar	getMargin() const
-	{
-		return m_collisionMargin;
-	}
-
-	btScalar	getMarginNV() const
-	{
-		return m_collisionMargin;
-	}
-
-	virtual int		getNumPreferredPenetrationDirections() const
-	{
-		return 0;
-	}
-	
-	virtual void	getPreferredPenetrationDirection(int index, btVector3& penetrationVector) const
-	{
-		(void)penetrationVector;
-		(void)index;
-		btAssert(0);
-	}
-
-
-	
-};
-
-
-#endif //BT_CONVEX_INTERNAL_SHAPE_H
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp
index 7afcccf8b03..7edf1ea6db8 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp
@@ -16,3 +16,62 @@ subject to the following restrictions:
 #include "btConvexShape.h"
 
 
+btConvexShape::btConvexShape()
+: m_localScaling(btScalar(1.),btScalar(1.),btScalar(1.)),
+m_collisionMargin(CONVEX_DISTANCE_MARGIN)
+{
+}
+
+
+void	btConvexShape::setLocalScaling(const btVector3& scaling)
+{
+	m_localScaling = scaling;
+}
+
+
+
+void	btConvexShape::getAabbSlow(const btTransform& trans,btVector3&minAabb,btVector3&maxAabb) const
+{
+
+	btScalar margin = getMargin();
+	for (int i=0;i<3;i++)
+	{
+		btVector3 vec(btScalar(0.),btScalar(0.),btScalar(0.));
+		vec[i] = btScalar(1.);
+
+		btVector3 sv = localGetSupportingVertex(vec*trans.getBasis());
+
+		btVector3 tmp = trans(sv);
+		maxAabb[i] = tmp[i]+margin;
+		vec[i] = btScalar(-1.);
+		tmp = trans(localGetSupportingVertex(vec*trans.getBasis()));
+		minAabb[i] = tmp[i]-margin;
+	}
+};
+
+
+btVector3	btConvexShape::localGetSupportingVertex(const btVector3& vec)const
+{
+#ifndef __SPU__
+
+	 btVector3	supVertex = localGetSupportingVertexWithoutMargin(vec);
+
+	if ( getMargin()!=btScalar(0.) )
+	{
+		btVector3 vecnorm = vec;
+		if (vecnorm .length2() < (SIMD_EPSILON*SIMD_EPSILON))
+		{
+			vecnorm.setValue(btScalar(-1.),btScalar(-1.),btScalar(-1.));
+		} 
+		vecnorm.normalize();
+		supVertex+= getMargin() * vecnorm;
+	}
+	return supVertex;
+
+#else
+	return btVector3(0,0,0);
+#endif //__SPU__
+
+ }
+
+
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.h
index e4eb7f6dbf6..746f383dfc7 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.h
@@ -18,25 +18,37 @@ subject to the following restrictions:
 
 #include "btCollisionShape.h"
 
-#include "LinearMath/btVector3.h"
-#include "LinearMath/btTransform.h"
-#include "LinearMath/btMatrix3x3.h"
+#include "../../LinearMath/btVector3.h"
+#include "../../LinearMath/btTransform.h"
+#include "../../LinearMath/btMatrix3x3.h"
 #include "btCollisionMargin.h"
-#include "LinearMath/btAlignedAllocator.h"
 
 //todo: get rid of this btConvexCastResult thing!
 struct btConvexCastResult;
 #define MAX_PREFERRED_PENETRATION_DIRECTIONS 10
 
-/// The btConvexShape is an abstract shape interface, implemented by all convex shapes such as btBoxShape, btConvexHullShape etc.
-/// It describes general convex shapes using the localGetSupportingVertex interface, used by collision detectors such as btGjkPairDetector.
+/// btConvexShape is an abstract shape interface.
+/// The explicit part provides plane-equations, the implicit part provides GetClosestPoint interface.
+/// used in combination with GJK or btConvexCast
 ATTRIBUTE_ALIGNED16(class) btConvexShape : public btCollisionShape
 {
 
+protected:
+
+	//local scaling. collisionMargin is not scaled !
+	btVector3	m_localScaling;
+
+	btVector3	m_implicitShapeDimensions;
+	
+	btScalar	m_collisionMargin;
+
+	btScalar	m_padding[2];
+
+
+
 
 public:
-
-	BT_DECLARE_ALIGNED_ALLOCATOR();
+	btConvexShape();
 
 	virtual ~btConvexShape()
 	{
@@ -44,7 +56,7 @@ public:
 	}
 
 
-	virtual btVector3	localGetSupportingVertex(const btVector3& vec)const =0;
+	virtual btVector3	localGetSupportingVertex(const btVector3& vec)const;
 #ifndef __SPU__
 	virtual btVector3	localGetSupportingVertexWithoutMargin(const btVector3& vec) const= 0;
 	
@@ -52,24 +64,63 @@ public:
 	virtual void	batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors,btVector3* supportVerticesOut,int numVectors) const= 0;
 #endif //#ifndef __SPU__
 
+	const btVector3& getImplicitShapeDimensions() const
+	{
+		return m_implicitShapeDimensions;
+	}
 
 	///getAabb's default implementation is brute force, expected derived classes to implement a fast dedicated version
-	void getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const =0;
+	void getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const
+	{
+		getAabbSlow(t,aabbMin,aabbMax);
+	}
 
-	virtual void getAabbSlow(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const =0;
 
-	virtual void	setLocalScaling(const btVector3& scaling) =0;
-	virtual const btVector3& getLocalScaling() const =0;
-
-	virtual void	setMargin(btScalar margin)=0;
-
-	virtual btScalar	getMargin() const=0;
-
-	virtual int		getNumPreferredPenetrationDirections() const=0;
 	
-	virtual void	getPreferredPenetrationDirection(int index, btVector3& penetrationVector) const=0;
+	virtual void getAabbSlow(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const;
 
-};
+
+	virtual void	setLocalScaling(const btVector3& scaling);
+	virtual const btVector3& getLocalScaling() const 
+	{
+		return m_localScaling;
+	}
+
+	const btVector3& getLocalScalingNV() const 
+	{
+		return m_localScaling;
+	}
+
+	virtual void	setMargin(btScalar margin)
+	{
+		m_collisionMargin = margin;
+	}
+	virtual btScalar	getMargin() const
+	{
+		return m_collisionMargin;
+	}
+
+	btScalar	getMarginNV() const
+	{
+		return m_collisionMargin;
+	}
+
+	virtual int		getNumPreferredPenetrationDirections() const
+	{
+		return 0;
+	}
+	
+	virtual void	getPreferredPenetrationDirection(int index, btVector3& penetrationVector) const
+	{
+		(void)penetrationVector;
+		(void)index;
+		btAssert(0);
+	}
+
+
+
+}
+;
 
 
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp
index f1682aaf65b..6941030b15f 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp
@@ -19,11 +19,10 @@ subject to the following restrictions:
 #include "BulletCollision/CollisionShapes/btStridingMeshInterface.h"
 
 
-btConvexTriangleMeshShape ::btConvexTriangleMeshShape (btStridingMeshInterface* meshInterface, bool calcAabb)
+btConvexTriangleMeshShape ::btConvexTriangleMeshShape (btStridingMeshInterface* meshInterface)
 :m_stridingMesh(meshInterface)
 {
-	if ( calcAabb )
-		recalcLocalAabb();
+	recalcLocalAabb();
 }
 
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h
index 01eecf27811..34ee7af744c 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h
@@ -3,24 +3,20 @@
 
 
 #include "btPolyhedralConvexShape.h"
-#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types
+#include "../BroadphaseCollision/btBroadphaseProxy.h" // for the types
 
 
-/// The btConvexTriangleMeshShape is a convex hull of a triangle mesh, but the performance is not as good as btConvexHullShape.
-/// A small benefit of this class is that it uses the btStridingMeshInterface, so you can avoid the duplication of the triangle mesh data. Nevertheless, most users should use the much better performing btConvexHullShape instead.
+/// btConvexTriangleMeshShape is a convex hull of a triangle mesh. If you just have a point cloud, you can use btConvexHullShape instead.
+/// It uses the btStridingMeshInterface instead of a point cloud. This can avoid the duplication of the triangle mesh data.
 class btConvexTriangleMeshShape : public btPolyhedralConvexShape
 {
 
 	class btStridingMeshInterface*	m_stridingMesh;
 
 public:
-	btConvexTriangleMeshShape(btStridingMeshInterface* meshInterface, bool calcAabb = true);
+	btConvexTriangleMeshShape(btStridingMeshInterface* meshInterface);
 
-	class btStridingMeshInterface*	getMeshInterface()
-	{
-		return m_stridingMesh;
-	}
-	const class btStridingMeshInterface* getMeshInterface() const
+	class btStridingMeshInterface*	getStridingMesh()
 	{
 		return m_stridingMesh;
 	}
@@ -32,7 +28,7 @@ public:
 	virtual int	getShapeType()const { return CONVEX_TRIANGLEMESH_SHAPE_PROXYTYPE; }
 
 	//debugging
-	virtual const char*	getName()const {return "ConvexTrimesh";}
+	virtual char*	getName()const {return "ConvexTrimesh";}
 	
 	virtual int	getNumVertices() const;
 	virtual int getNumEdges() const;
@@ -53,4 +49,3 @@ public:
 #endif //CONVEX_TRIANGLEMESH_SHAPE_H
 
 
-
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.cpp
index 3afef1c7550..1666afb3b88 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.cpp
@@ -45,7 +45,7 @@ void btCylinderShape::getAabb(const btTransform& t,btVector3& aabbMin,btVector3&
 }
 
 
-SIMD_FORCE_INLINE btVector3 CylinderLocalSupportX(const btVector3& halfExtents,const btVector3& v) 
+inline btVector3 CylinderLocalSupportX(const btVector3& halfExtents,const btVector3& v) 
 {
 const int cylinderUpAxis = 0;
 const int XX = 1;
@@ -163,24 +163,24 @@ const int ZZ = 1;
 
 btVector3	btCylinderShapeX::localGetSupportingVertexWithoutMargin(const btVector3& vec)const
 {
-	return CylinderLocalSupportX(getHalfExtentsWithoutMargin(),vec);
+	return CylinderLocalSupportX(getHalfExtents(),vec);
 }
 
 
 btVector3	btCylinderShapeZ::localGetSupportingVertexWithoutMargin(const btVector3& vec)const
 {
-	return CylinderLocalSupportZ(getHalfExtentsWithoutMargin(),vec);
+	return CylinderLocalSupportZ(getHalfExtents(),vec);
 }
 btVector3	btCylinderShape::localGetSupportingVertexWithoutMargin(const btVector3& vec)const
 {
-	return CylinderLocalSupportY(getHalfExtentsWithoutMargin(),vec);
+	return CylinderLocalSupportY(getHalfExtents(),vec);
 }
 
 void	btCylinderShape::batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors,btVector3* supportVerticesOut,int numVectors) const
 {
 	for (int i=0;i<numVectors;i++)
 	{
-		supportVerticesOut[i] = CylinderLocalSupportY(getHalfExtentsWithoutMargin(),vectors[i]);
+		supportVerticesOut[i] = CylinderLocalSupportY(getHalfExtents(),vectors[i]);
 	}
 }
 
@@ -188,7 +188,7 @@ void	btCylinderShapeZ::batchedUnitVectorGetSupportingVertexWithoutMargin(const b
 {
 	for (int i=0;i<numVectors;i++)
 	{
-		supportVerticesOut[i] = CylinderLocalSupportZ(getHalfExtentsWithoutMargin(),vectors[i]);
+		supportVerticesOut[i] = CylinderLocalSupportZ(getHalfExtents(),vectors[i]);
 	}
 }
 
@@ -199,7 +199,7 @@ void	btCylinderShapeX::batchedUnitVectorGetSupportingVertexWithoutMargin(const b
 {
 	for (int i=0;i<numVectors;i++)
 	{
-		supportVerticesOut[i] = CylinderLocalSupportX(getHalfExtentsWithoutMargin(),vectors[i]);
+		supportVerticesOut[i] = CylinderLocalSupportX(getHalfExtents(),vectors[i]);
 	}
 }
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.h
index 30938acf7c7..c78890c887a 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btCylinderShape.h
@@ -17,10 +17,10 @@ subject to the following restrictions:
 #define CYLINDER_MINKOWSKI_H
 
 #include "btBoxShape.h"
-#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types
-#include "LinearMath/btVector3.h"
+#include "../BroadphaseCollision/btBroadphaseProxy.h" // for the types
+#include "../../LinearMath/btVector3.h"
 
-/// The btCylinderShape class implements a cylinder shape primitive, centered around the origin. Its central axis aligned with the Y axis. btCylinderShapeX is aligned with the X axis and btCylinderShapeZ around the Z axis.
+/// implements cylinder shape interface
 class btCylinderShape : public btBoxShape
 
 {
@@ -60,7 +60,7 @@ public:
 
 
 	//use box inertia
-	//	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia) const;
+	//	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia);
 
 	virtual int	getShapeType() const
 	{
@@ -74,11 +74,11 @@ public:
 
 	virtual btScalar getRadius() const
 	{
-		return getHalfExtentsWithMargin().getX();
+		return getHalfExtents().getX();
 	}
 
 	//debugging
-	virtual const char*	getName()const
+	virtual char*	getName()const
 	{
 		return "CylinderY";
 	}
@@ -96,14 +96,14 @@ public:
 	virtual void	batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors,btVector3* supportVerticesOut,int numVectors) const;
 	
 		//debugging
-	virtual const char*	getName()const
+	virtual char*	getName()const
 	{
 		return "CylinderX";
 	}
 
 	virtual btScalar getRadius() const
 	{
-		return getHalfExtentsWithMargin().getY();
+		return getHalfExtents().getY();
 	}
 
 };
@@ -121,14 +121,14 @@ public:
 		return 2;
 	}
 		//debugging
-	virtual const char*	getName()const
+	virtual char*	getName()const
 	{
 		return "CylinderZ";
 	}
 
 	virtual btScalar getRadius() const
 	{
-		return getHalfExtentsWithMargin().getX();
+		return getHalfExtents().getX();
 	}
 
 };
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.cpp
index 6954aad7917..dcc486f194b 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.cpp
@@ -40,7 +40,7 @@ void btEmptyShape::getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aa
 
 }
 
-void	btEmptyShape::calculateLocalInertia(btScalar ,btVector3& ) const
+void	btEmptyShape::calculateLocalInertia(btScalar ,btVector3& )
 {
 	btAssert(0);
 }
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.h
index d7d78407b61..8ec53444976 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.h
@@ -18,16 +18,16 @@ subject to the following restrictions:
 
 #include "btConcaveShape.h"
 
-#include "LinearMath/btVector3.h"
-#include "LinearMath/btTransform.h"
-#include "LinearMath/btMatrix3x3.h"
+#include "../../LinearMath/btVector3.h"
+#include "../../LinearMath/btTransform.h"
+#include "../../LinearMath/btMatrix3x3.h"
 #include "btCollisionMargin.h"
 
 
 
 
-/// The btEmptyShape is a collision shape without actual collision detection shape, so most users should ignore this class.
-/// It can be replaced by another shape during runtime, but the inertia tensor should be recomputed.
+/// btEmptyShape is a collision shape without actual collision detection. 
+///It can be replaced by another shape during runtime
 class btEmptyShape	: public btConcaveShape
 {
 public:
@@ -49,12 +49,12 @@ public:
 		return m_localScaling;
 	}
 
-	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia) const;
+	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia);
 	
 	virtual int	getShapeType() const { return EMPTY_SHAPE_PROXYTYPE;}
 
 	
-	virtual const char*	getName()const
+	virtual char*	getName()const
 	{
 		return "Empty";
 	}
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp
index 9e4800a46fe..94be43c88e2 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp
@@ -18,18 +18,16 @@ subject to the following restrictions:
 #include "LinearMath/btTransformUtil.h"
 
 
-btHeightfieldTerrainShape::btHeightfieldTerrainShape(int heightStickWidth, int heightStickLength,void* heightfieldData,btScalar maxHeight,int upAxis,bool useFloatData,bool flipQuadEdges)
-: m_heightStickWidth(heightStickWidth),
-m_heightStickLength(heightStickLength),
-m_maxHeight(maxHeight),
-m_width((btScalar)heightStickWidth-1),
-m_length((btScalar)heightStickLength-1),
+btHeightfieldTerrainShape::btHeightfieldTerrainShape(int width,int length,void* heightfieldData,btScalar maxHeight,int upAxis,bool useFloatData,bool flipQuadEdges)
+:m_localScaling(btScalar(1.),btScalar(1.),btScalar(1.)),
+m_width(width),
+m_length(length),
 m_heightfieldDataUnknown(heightfieldData),
+m_maxHeight(maxHeight),
+m_upAxis(upAxis),
 m_useFloatData(useFloatData),
 m_flipQuadEdges(flipQuadEdges),
-m_useDiamondSubdivision(false),
-m_upAxis(upAxis),
-m_localScaling(btScalar(1.),btScalar(1.),btScalar(1.))
+m_useDiamondSubdivision(false)
 {
 
 
@@ -45,25 +43,25 @@ m_localScaling(btScalar(1.),btScalar(1.),btScalar(1.))
 	case 0:
 		{
 			halfExtents.setValue(
-				btScalar(m_maxHeight),
-				btScalar(m_width), //?? don't know if this should change
-				btScalar(m_length));
+				m_maxHeight,
+				m_width,
+				m_length);
 			break;
 		}
 	case 1:
 		{
 			halfExtents.setValue(
-				btScalar(m_width),
-				btScalar(m_maxHeight),
-				btScalar(m_length));
+				m_width,
+				m_maxHeight,
+				m_length);
 			break;
 		};
 	case 2:
 		{
 			halfExtents.setValue(
-				btScalar(m_width),
-				btScalar(m_length),
-				btScalar(m_maxHeight)
+				m_width,
+				m_length,
+				m_maxHeight
 			);
 			break;
 		}
@@ -116,11 +114,11 @@ btScalar	btHeightfieldTerrainShape::getHeightFieldValue(int x,int y) const
 	btScalar val = 0.f;
 	if (m_useFloatData)
 	{
-		val = m_heightfieldDataFloat[(y*m_heightStickWidth)+x];
+		val = m_heightfieldDataFloat[(y*m_width)+x];
 	} else
 	{
 		//assume unsigned short int
-		unsigned char heightFieldValue = m_heightfieldDataUnsignedChar[(y*m_heightStickWidth)+x];
+		unsigned char heightFieldValue = m_heightfieldDataUnsignedChar[(y*m_width)+x];
 		val = heightFieldValue* (m_maxHeight/btScalar(65535));
 	}
 	return val;
@@ -135,8 +133,8 @@ void	btHeightfieldTerrainShape::getVertex(int x,int y,btVector3& vertex) const
 
 	btAssert(x>=0);
 	btAssert(y>=0);
-	btAssert(x<m_heightStickWidth);
-	btAssert(y<m_heightStickLength);
+	btAssert(x<m_width);
+	btAssert(y<m_length);
 
 
 	btScalar	height = getHeightFieldValue(x,y);
@@ -147,25 +145,25 @@ void	btHeightfieldTerrainShape::getVertex(int x,int y,btVector3& vertex) const
 		{
 		vertex.setValue(
 			height,
-			(-m_width/btScalar(2.0)) + x,
-			(-m_length/btScalar(2.0) ) + y
+			(-m_width/2 ) + x,
+			(-m_length/2 ) + y
 			);
 			break;
 		}
 	case 1:
 		{
 			vertex.setValue(
-			(-m_width/btScalar(2.0)) + x,
+			(-m_width/2 ) + x,
 			height,
-			(-m_length/btScalar(2.0)) + y
+			(-m_length/2 ) + y
 			);
 			break;
 		};
 	case 2:
 		{
 			vertex.setValue(
-			(-m_width/btScalar(2.0)) + x,
-			(-m_length/btScalar(2.0)) + y,
+			(-m_width/2 ) + x,
+			(-m_length/2 ) + y,
 			height
 			);
 			break;
@@ -182,20 +180,21 @@ void	btHeightfieldTerrainShape::getVertex(int x,int y,btVector3& vertex) const
 }
 
 
-void btHeightfieldTerrainShape::quantizeWithClamp(int* out, const btVector3& point,int /*isMax*/) const
+void btHeightfieldTerrainShape::quantizeWithClamp(int* out, const btVector3& point) const
 {
+	
+
 	btVector3 clampedPoint(point);
 	clampedPoint.setMax(m_localAabbMin);
 	clampedPoint.setMin(m_localAabbMax);
 
-	btVector3 v = (clampedPoint);// - m_bvhAabbMin) * m_bvhQuantization;
+	btVector3 v = (clampedPoint );// * m_quantization;
+
+	out[0] = (int)(v.getX());
+	out[1] = (int)(v.getY());
+	out[2] = (int)(v.getZ());
+	//correct for
 
-	//TODO: optimization: check out how to removed this btFabs
-		
-	out[0] = (int)(v.getX() + v.getX() / btFabs(v.getX())* btScalar(0.5) );
-	out[1] = (int)(v.getY() + v.getY() / btFabs(v.getY())* btScalar(0.5) );
-	out[2] = (int)(v.getZ() + v.getZ() / btFabs(v.getZ())* btScalar(0.5) );
-	
 }
 
 
@@ -213,24 +212,24 @@ void	btHeightfieldTerrainShape::processAllTriangles(btTriangleCallback* callback
 	btVector3	localAabbMin = aabbMin*btVector3(1.f/m_localScaling[0],1.f/m_localScaling[1],1.f/m_localScaling[2]);
 	btVector3	localAabbMax = aabbMax*btVector3(1.f/m_localScaling[0],1.f/m_localScaling[1],1.f/m_localScaling[2]);
 	
-	quantizeWithClamp(quantizedAabbMin, localAabbMin,0);
-	quantizeWithClamp(quantizedAabbMax, localAabbMax,1);
+	quantizeWithClamp(quantizedAabbMin, localAabbMin);
+	quantizeWithClamp(quantizedAabbMax, localAabbMax);
 	
 	
 
 	int startX=0;
-	int endX=m_heightStickWidth-1;
+	int endX=m_width-1;
 	int startJ=0;
-	int endJ=m_heightStickLength-1;
+	int endJ=m_length-1;
 
 	switch (m_upAxis)
 	{
 	case 0:
 		{
-			quantizedAabbMin[1]+=m_heightStickWidth/2-1;
-			quantizedAabbMax[1]+=m_heightStickWidth/2+1;
-			quantizedAabbMin[2]+=m_heightStickLength/2-1;
-			quantizedAabbMax[2]+=m_heightStickLength/2+1;
+			quantizedAabbMin[1]+=m_width/2-1;
+			quantizedAabbMax[1]+=m_width/2+1;
+			quantizedAabbMin[2]+=m_length/2-1;
+			quantizedAabbMax[2]+=m_length/2+1;
 
 			if (quantizedAabbMin[1]>startX)
 				startX = quantizedAabbMin[1];
@@ -244,10 +243,10 @@ void	btHeightfieldTerrainShape::processAllTriangles(btTriangleCallback* callback
 		}
 	case 1:
 		{
-			quantizedAabbMin[0]+=m_heightStickWidth/2-1;
-			quantizedAabbMax[0]+=m_heightStickWidth/2+1;
-			quantizedAabbMin[2]+=m_heightStickLength/2-1;
-			quantizedAabbMax[2]+=m_heightStickLength/2+1;
+			quantizedAabbMin[0]+=m_width/2-1;
+			quantizedAabbMax[0]+=m_width/2+1;
+			quantizedAabbMin[2]+=m_length/2-1;
+			quantizedAabbMax[2]+=m_length/2+1;
 
 			if (quantizedAabbMin[0]>startX)
 				startX = quantizedAabbMin[0];
@@ -261,10 +260,10 @@ void	btHeightfieldTerrainShape::processAllTriangles(btTriangleCallback* callback
 		};
 	case 2:
 		{
-			quantizedAabbMin[0]+=m_heightStickWidth/2-1;
-			quantizedAabbMax[0]+=m_heightStickWidth/2+1;
-			quantizedAabbMin[1]+=m_heightStickLength/2-1;
-			quantizedAabbMax[1]+=m_heightStickLength/2+1;
+			quantizedAabbMin[0]+=m_width/2-1;
+			quantizedAabbMax[0]+=m_width/2+1;
+			quantizedAabbMin[1]+=m_length/2-1;
+			quantizedAabbMax[1]+=m_length/2+1;
 
 			if (quantizedAabbMin[0]>startX)
 				startX = quantizedAabbMin[0];
@@ -291,7 +290,7 @@ void	btHeightfieldTerrainShape::processAllTriangles(btTriangleCallback* callback
 		for(int x=startX; x<endX; x++)
 		{
 			btVector3 vertices[3];
-			if (m_flipQuadEdges || (m_useDiamondSubdivision && !((j+x) & 1)))
+			if (m_flipQuadEdges || (m_useDiamondSubdivision && ((j+x) & 1)))
 			{
         //first triangle
         getVertex(x,j,vertices[0]);
@@ -323,7 +322,7 @@ void	btHeightfieldTerrainShape::processAllTriangles(btTriangleCallback* callback
 
 }
 
-void	btHeightfieldTerrainShape::calculateLocalInertia(btScalar ,btVector3& inertia) const
+void	btHeightfieldTerrainShape::calculateLocalInertia(btScalar ,btVector3& inertia)
 {
 	//moving concave objects not supported
 	
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h
index d6890fe6b97..49f3e106733 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h
@@ -18,8 +18,7 @@ subject to the following restrictions:
 
 #include "btConcaveShape.h"
 
-///The btHeightfieldTerrainShape simulates a 2D heightfield terrain collision shape. You can also use the more general btBvhTriangleMeshShape instead.
-///An example implementation of btHeightfieldTerrainShape is provided in Demos/VehicleDemo/VehicleDemo.cpp
+///btHeightfieldTerrainShape simulates a 2D heightfield terrain 
 class btHeightfieldTerrainShape : public btConcaveShape
 {
 protected:
@@ -27,11 +26,9 @@ protected:
 	btVector3	m_localAabbMax;
 	
 	///terrain data
-	int	m_heightStickWidth;
-	int m_heightStickLength;
+	int	m_width;
+	int m_length;
 	btScalar	m_maxHeight;
-	btScalar m_width;
-	btScalar m_length;
 	union
 	{
 		unsigned char*	m_heightfieldDataUnsignedChar;
@@ -48,7 +45,7 @@ protected:
 	btVector3	m_localScaling;
 
 	virtual btScalar	getHeightFieldValue(int x,int y) const;
-	void		quantizeWithClamp(int* out, const btVector3& point,int isMax) const;
+	void		quantizeWithClamp(int* out, const btVector3& point) const;
 	void		getVertex(int x,int y,btVector3& vertex) const;
 
 	inline bool testQuantizedAabbAgainstQuantizedAabb(int* aabbMin1, int* aabbMax1,const  int* aabbMin2,const  int* aabbMax2) const
@@ -61,7 +58,7 @@ protected:
 	}
 
 public:
-	btHeightfieldTerrainShape(int heightStickWidth,int heightStickHeight,void* heightfieldData, btScalar maxHeight,int upAxis,bool useFloatData,bool flipQuadEdges);
+	btHeightfieldTerrainShape(int width,int height,void* heightfieldData, btScalar maxHeight,int upAxis,bool useFloatData,bool flipQuadEdges);
 
 	virtual ~btHeightfieldTerrainShape();
 
@@ -77,14 +74,14 @@ public:
 
 	virtual void	processAllTriangles(btTriangleCallback* callback,const btVector3& aabbMin,const btVector3& aabbMax) const;
 
-	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia) const;
+	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia);
 
 	virtual void	setLocalScaling(const btVector3& scaling);
 	
 	virtual const btVector3& getLocalScaling() const;
 	
 	//debugging
-	virtual const char*	getName()const {return "HEIGHTFIELD";}
+	virtual char*	getName()const {return "HEIGHTFIELD";}
 
 };
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btMaterial.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btMaterial.h
deleted file mode 100644
index 7cb6d5ab6fe..00000000000
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btMaterial.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2008 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-/// This file was created by Alex Silverman
-
-#ifndef MATERIAL_H
-#define MATERIAL_H
-
-// Material class to be used by btMultimaterialTriangleMeshShape to store triangle properties
-class btMaterial
-{
-    // public members so that materials can change due to world events
-public:
-    btScalar m_friction;
-    btScalar m_restitution;
-    int pad[2];
-
-    btMaterial(){}
-    btMaterial(btScalar fric, btScalar rest) { m_friction = fric; m_restitution = rest; }
-};
-
-#endif // MATERIAL_H
\ No newline at end of file
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp
index 8f893ac98aa..015314bc09f 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.cpp
@@ -26,9 +26,9 @@ m_shapeB(shapeB)
 
 btVector3 btMinkowskiSumShape::localGetSupportingVertexWithoutMargin(const btVector3& vec)const
 {
-	btVector3 supVertexA = m_transA(m_shapeA->localGetSupportingVertexWithoutMargin(-vec*m_transA.getBasis()));
+	btVector3 supVertexA = m_transA(m_shapeA->localGetSupportingVertexWithoutMargin(vec*m_transA.getBasis()));
 	btVector3 supVertexB = m_transB(m_shapeB->localGetSupportingVertexWithoutMargin(vec*m_transB.getBasis()));
-	return  supVertexA - supVertexB;
+	return supVertexA + supVertexB;
 }
 
 void	btMinkowskiSumShape::batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors,btVector3* supportVerticesOut,int numVectors) const
@@ -49,7 +49,7 @@ btScalar	btMinkowskiSumShape::getMargin() const
 }
 
 
-void	btMinkowskiSumShape::calculateLocalInertia(btScalar mass,btVector3& inertia) const
+void	btMinkowskiSumShape::calculateLocalInertia(btScalar mass,btVector3& inertia)
 {
 	(void)mass;
 	btAssert(0);
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h
index f9c8427c2f3..198faaff9f9 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h
@@ -16,11 +16,11 @@ subject to the following restrictions:
 #ifndef MINKOWSKI_SUM_SHAPE_H
 #define MINKOWSKI_SUM_SHAPE_H
 
-#include "btConvexInternalShape.h"
-#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types
+#include "btConvexShape.h"
+#include "../BroadphaseCollision/btBroadphaseProxy.h" // for the types
 
-/// The btMinkowskiSumShape is only for advanced users. This shape represents implicit based minkowski sum of two convex implicit shapes.
-class btMinkowskiSumShape : public btConvexInternalShape
+/// btMinkowskiSumShape represents implicit (getSupportingVertex) based minkowski sum of two convex implicit shapes.
+class btMinkowskiSumShape : public btConvexShape
 {
 
 	btTransform	m_transA;
@@ -37,7 +37,7 @@ public:
 	virtual void	batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors,btVector3* supportVerticesOut,int numVectors) const;
 
 
-	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia) const;
+	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia);
 
 	void	setTransformA(const btTransform&	transA) { m_transA = transA;}
 	void	setTransformB(const btTransform&	transB) { m_transB = transB;}
@@ -53,7 +53,7 @@ public:
 	const btConvexShape*	getShapeA() const { return m_shapeA;}
 	const btConvexShape*	getShapeB() const { return m_shapeB;}
 
-	virtual const char*	getName()const 
+	virtual char*	getName()const 
 	{
 		return "MinkowskiSum";
 	}
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp
index c709205efc2..6015a618082 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp
@@ -47,7 +47,7 @@ btMultiSphereShape::btMultiSphereShape (const btVector3& inertiaHalfExtents,cons
 
 	btVector3 vec = vec0;
 	btScalar lenSqr = vec.length2();
-	if (lenSqr < (SIMD_EPSILON*SIMD_EPSILON))
+	if (lenSqr < btScalar(0.0001))
 	{
 		vec.setValue(1,0,0);
 	} else
@@ -116,7 +116,7 @@ btMultiSphereShape::btMultiSphereShape (const btVector3& inertiaHalfExtents,cons
 
 
 
-void	btMultiSphereShape::calculateLocalInertia(btScalar mass,btVector3& inertia) const
+void	btMultiSphereShape::calculateLocalInertia(btScalar mass,btVector3& inertia)
 {
 	//as an approximation, take the inertia of the box that bounds the spheres
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.h
index 45968f3947f..1897b474057 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.h
@@ -16,14 +16,13 @@ subject to the following restrictions:
 #ifndef MULTI_SPHERE_MINKOWSKI_H
 #define MULTI_SPHERE_MINKOWSKI_H
 
-#include "btConvexInternalShape.h"
-#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types
+#include "btConvexShape.h"
+#include "../BroadphaseCollision/btBroadphaseProxy.h" // for the types
 
 #define MAX_NUM_SPHERES 5
 
-///The btMultiSphereShape represents the convex hull of a collection of spheres. You can create special capsules or other smooth volumes.
-///It is possible to animate the spheres for deformation.
-class btMultiSphereShape : public btConvexInternalShape
+///btMultiSphereShape represents implicit convex hull of a collection of spheres (using getSupportingVertex)
+class btMultiSphereShape : public btConvexShape
 
 {
 	
@@ -40,7 +39,7 @@ public:
 	btMultiSphereShape (const btVector3& inertiaHalfExtents,const btVector3* positions,const btScalar* radi,int numSpheres);
 
 	///CollisionShape Interface
-	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia) const;
+	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia);
 
 	/// btConvexShape Interface
 	virtual btVector3	localGetSupportingVertexWithoutMargin(const btVector3& vec)const;
@@ -64,7 +63,7 @@ public:
 
 	virtual int	getShapeType() const { return MULTI_SPHERE_SHAPE_PROXYTYPE; }
 
-	virtual const char*	getName()const 
+	virtual char*	getName()const 
 	{
 		return "MultiSphere";
 	}
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp
deleted file mode 100644
index fc47e86411d..00000000000
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2008 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-/// This file was created by Alex Silverman
-
-#include "BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h"
-#include "BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h"
-//#include "BulletCollision/CollisionShapes/btOptimizedBvh.h"
-
-
-///Obtains the material for a specific triangle
-const btMaterial * btMultimaterialTriangleMeshShape::getMaterialProperties(int partID, int triIndex)
-{
-    const unsigned char * materialBase = 0;
-    int numMaterials;
-    PHY_ScalarType materialType;
-    int materialStride;
-    const unsigned char * triangleMaterialBase = 0;
-    int numTriangles;
-    int triangleMaterialStride;
-    PHY_ScalarType triangleType;
-
-    ((btTriangleIndexVertexMaterialArray*)m_meshInterface)->getLockedReadOnlyMaterialBase(&materialBase, numMaterials, materialType, materialStride,
-        &triangleMaterialBase, numTriangles, triangleMaterialStride, triangleType, partID);
-
-    // return the pointer to the place with the friction for the triangle
-    // TODO: This depends on whether it's a moving mesh or not
-    // BUG IN GIMPACT
-    //return (btScalar*)(&materialBase[triangleMaterialBase[(triIndex-1) * triangleMaterialStride] * materialStride]);
-    int * matInd = (int *)(&(triangleMaterialBase[(triIndex * triangleMaterialStride)]));
-    btMaterial *matVal = (btMaterial *)(&(materialBase[*matInd * materialStride]));
-    return (matVal);
-}
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h
deleted file mode 100644
index 2f108020cdf..00000000000
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2008 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-/// This file was created by Alex Silverman
-
-#ifndef BVH_TRIANGLE_MATERIAL_MESH_SHAPE_H
-#define BVH_TRIANGLE_MATERIAL_MESH_SHAPE_H
-
-#include "btBvhTriangleMeshShape.h"
-#include "btMaterial.h"
-
-///The BvhTriangleMaterialMeshShape extends the btBvhTriangleMeshShape. Its main contribution is the interface into a material array, which allows per-triangle friction and restitution.
-ATTRIBUTE_ALIGNED16(class) btMultimaterialTriangleMeshShape : public btBvhTriangleMeshShape
-{
-    btAlignedObjectArray <btMaterial*> m_materialList;
-    int ** m_triangleMaterials;
-
-public:
-
-	BT_DECLARE_ALIGNED_ALLOCATOR();
-
-    btMultimaterialTriangleMeshShape(): btBvhTriangleMeshShape() {}
-    btMultimaterialTriangleMeshShape(btStridingMeshInterface* meshInterface, bool useQuantizedAabbCompression, bool buildBvh = true):
-        btBvhTriangleMeshShape(meshInterface, useQuantizedAabbCompression, buildBvh)
-        {
-            btVector3 m_triangle[3];
-            const unsigned char *vertexbase;
-            int numverts;
-            PHY_ScalarType type;
-            int stride;
-            const unsigned char *indexbase;
-            int indexstride;
-            int numfaces;
-            PHY_ScalarType indicestype;
-
-            //m_materialLookup = (int**)(btAlignedAlloc(sizeof(int*) * meshInterface->getNumSubParts(), 16));
-
-            for(int i = 0; i < meshInterface->getNumSubParts(); i++)
-            {
-                m_meshInterface->getLockedReadOnlyVertexIndexBase(
-                    &vertexbase,
-                    numverts,
-                    type,
-                    stride,
-                    &indexbase,
-                    indexstride,
-                    numfaces,
-                    indicestype,
-                    i);
-                //m_materialLookup[i] = (int*)(btAlignedAlloc(sizeof(int) * numfaces, 16));
-            }
-        }
-
-	///optionally pass in a larger bvh aabb, used for quantization. This allows for deformations within this aabb
-	btMultimaterialTriangleMeshShape(btStridingMeshInterface* meshInterface, bool useQuantizedAabbCompression,const btVector3& bvhAabbMin,const btVector3& bvhAabbMax, bool buildBvh = true):
-        btBvhTriangleMeshShape(meshInterface, useQuantizedAabbCompression, bvhAabbMin, bvhAabbMax, buildBvh)
-        {
-            btVector3 m_triangle[3];
-            const unsigned char *vertexbase;
-            int numverts;
-            PHY_ScalarType type;
-            int stride;
-            const unsigned char *indexbase;
-            int indexstride;
-            int numfaces;
-            PHY_ScalarType indicestype;
-
-            //m_materialLookup = (int**)(btAlignedAlloc(sizeof(int*) * meshInterface->getNumSubParts(), 16));
-
-            for(int i = 0; i < meshInterface->getNumSubParts(); i++)
-            {
-                m_meshInterface->getLockedReadOnlyVertexIndexBase(
-                    &vertexbase,
-                    numverts,
-                    type,
-                    stride,
-                    &indexbase,
-                    indexstride,
-                    numfaces,
-                    indicestype,
-                    i);
-                //m_materialLookup[i] = (int*)(btAlignedAlloc(sizeof(int) * numfaces * 2, 16));
-            }
-        }
-	
-    virtual ~btMultimaterialTriangleMeshShape()
-    {
-/*
-        for(int i = 0; i < m_meshInterface->getNumSubParts(); i++)
-        {
-            btAlignedFree(m_materialValues[i]);
-            m_materialLookup[i] = NULL;
-        }
-        btAlignedFree(m_materialValues);
-        m_materialLookup = NULL;
-*/
-    }
-	virtual int	getShapeType() const
-	{
-		return MULTIMATERIAL_TRIANGLE_MESH_PROXYTYPE;
-	}
-	
-	//debugging
-	virtual const char*	getName()const {return "MULTIMATERIALTRIANGLEMESH";}
-
-    ///Obtains the material for a specific triangle
-    const btMaterial * getMaterialProperties(int partID, int triIndex);
-
-}
-;
-
-#endif //BVH_TRIANGLE_MATERIAL_MESH_SHAPE_H
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp
index 9b78fc0f7c2..44438a24455 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp
@@ -19,12 +19,13 @@ subject to the following restrictions:
 #include "LinearMath/btIDebugDraw.h"
 
 
-btOptimizedBvh::btOptimizedBvh()
-{ 
-}
 
-btOptimizedBvh::~btOptimizedBvh()
-{
+btOptimizedBvh::btOptimizedBvh() : m_useQuantization(false), 
+					m_traversalMode(TRAVERSAL_STACKLESS_CACHE_FRIENDLY)
+					//m_traversalMode(TRAVERSAL_STACKLESS)
+					//m_traversalMode(TRAVERSAL_RECURSIVE)
+{ 
+
 }
 
 
@@ -79,7 +80,7 @@ void btOptimizedBvh::build(btStridingMeshInterface* triangles, bool useQuantized
 	struct	QuantizedNodeTriangleCallback : public btInternalTriangleIndexCallback
 	{
 		QuantizedNodeArray&	m_triangleNodes;
-		const btQuantizedBvh* m_optimizedTree; // for quantization
+		const btOptimizedBvh* m_optimizedTree; // for quantization
 
 		QuantizedNodeTriangleCallback& operator=(QuantizedNodeTriangleCallback& other)
 		{
@@ -88,16 +89,14 @@ void btOptimizedBvh::build(btStridingMeshInterface* triangles, bool useQuantized
 			return *this;
 		}
 
-		QuantizedNodeTriangleCallback(QuantizedNodeArray&	triangleNodes,const btQuantizedBvh* tree)
+		QuantizedNodeTriangleCallback(QuantizedNodeArray&	triangleNodes,const btOptimizedBvh* tree)
 			:m_triangleNodes(triangleNodes),m_optimizedTree(tree)
 		{
 		}
 
 		virtual void internalProcessTriangleIndex(btVector3* triangle,int partId,int  triangleIndex)
 		{
-			// The partId and triangle index must fit in the same (positive) integer
-			btAssert(partId < (1<<MAX_NUM_PARTS_IN_BITS));
-			btAssert(triangleIndex < (1<<(31-MAX_NUM_PARTS_IN_BITS)));
+			btAssert(partId==0);
 			//negative indices are reserved for escapeIndex
 			btAssert(triangleIndex>=0);
 
@@ -112,29 +111,10 @@ void btOptimizedBvh::build(btStridingMeshInterface* triangles, bool useQuantized
 			aabbMin.setMin(triangle[2]);
 			aabbMax.setMax(triangle[2]);
 
-			//PCK: add these checks for zero dimensions of aabb
-			const btScalar MIN_AABB_DIMENSION = btScalar(0.002);
-			const btScalar MIN_AABB_HALF_DIMENSION = btScalar(0.001);
-			if (aabbMax.x() - aabbMin.x() < MIN_AABB_DIMENSION)
-			{
-				aabbMax.setX(aabbMax.x() + MIN_AABB_HALF_DIMENSION);
-				aabbMin.setX(aabbMin.x() - MIN_AABB_HALF_DIMENSION);
-			}
-			if (aabbMax.y() - aabbMin.y() < MIN_AABB_DIMENSION)
-			{
-				aabbMax.setY(aabbMax.y() + MIN_AABB_HALF_DIMENSION);
-				aabbMin.setY(aabbMin.y() - MIN_AABB_HALF_DIMENSION);
-			}
-			if (aabbMax.z() - aabbMin.z() < MIN_AABB_DIMENSION)
-			{
-				aabbMax.setZ(aabbMax.z() + MIN_AABB_HALF_DIMENSION);
-				aabbMin.setZ(aabbMin.z() - MIN_AABB_HALF_DIMENSION);
-			}
+			m_optimizedTree->quantizeWithClamp(&node.m_quantizedAabbMin[0],aabbMin);
+			m_optimizedTree->quantizeWithClamp(&node.m_quantizedAabbMax[0],aabbMax);
 
-			m_optimizedTree->quantize(&node.m_quantizedAabbMin[0],aabbMin,0);
-			m_optimizedTree->quantize(&node.m_quantizedAabbMax[0],aabbMax,1);
-
-			node.m_escapeIndexOrTriangleIndex = (partId<<(31-MAX_NUM_PARTS_IN_BITS)) | triangleIndex;
+			node.m_escapeIndexOrTriangleIndex = triangleIndex;
 
 			m_triangleNodes.push_back(node);
 		}
@@ -190,45 +170,10 @@ void btOptimizedBvh::build(btStridingMeshInterface* triangles, bool useQuantized
 		subtree.m_rootNodeIndex = 0;
 		subtree.m_subtreeSize = m_quantizedContiguousNodes[0].isLeafNode() ? 1 : m_quantizedContiguousNodes[0].getEscapeIndex();
 	}
-
-	//PCK: update the copy of the size
-	m_subtreeHeaderCount = m_SubtreeHeaders.size();
-
-	//PCK: clear m_quantizedLeafNodes and m_leafNodes, they are temporary
-	m_quantizedLeafNodes.clear();
-	m_leafNodes.clear();
 }
 
 
 
-
-void	btOptimizedBvh::refit(btStridingMeshInterface* meshInterface,const btVector3& aabbMin,const btVector3& aabbMax)
-{
-	if (m_useQuantization)
-	{
-
-		setQuantizationValues(aabbMin,aabbMax);
-
-		updateBvhNodes(meshInterface,0,m_curNodeIndex,0);
-
-		///now update all subtree headers
-
-		int i;
-		for (i=0;i<m_SubtreeHeaders.size();i++)
-		{
-			btBvhSubtreeInfo& subtree = m_SubtreeHeaders[i];
-			subtree.setAabbFromQuantizeNode(m_quantizedContiguousNodes[subtree.m_rootNodeIndex]);
-		}
-
-	} else
-	{
-
-	}
-}
-
-
-
-
 void	btOptimizedBvh::refitPartial(btStridingMeshInterface* meshInterface,const btVector3& aabbMin,const btVector3& aabbMax)
 {
 	//incrementally initialize quantization values
@@ -248,17 +193,16 @@ void	btOptimizedBvh::refitPartial(btStridingMeshInterface* meshInterface,const b
 	unsigned short	quantizedQueryAabbMin[3];
 	unsigned short	quantizedQueryAabbMax[3];
 
-	quantize(&quantizedQueryAabbMin[0],aabbMin,0);
-	quantize(&quantizedQueryAabbMax[0],aabbMax,1);
+	quantizeWithClamp(&quantizedQueryAabbMin[0],aabbMin);
+	quantizeWithClamp(&quantizedQueryAabbMax[0],aabbMax);
 
 	int i;
 	for (i=0;i<this->m_SubtreeHeaders.size();i++)
 	{
 		btBvhSubtreeInfo& subtree = m_SubtreeHeaders[i];
 
-		//PCK: unsigned instead of bool
-		unsigned overlap = testQuantizedAabbAgainstQuantizedAabb(quantizedQueryAabbMin,quantizedQueryAabbMax,subtree.m_quantizedAabbMin,subtree.m_quantizedAabbMax);
-		if (overlap != 0)
+		bool overlap = testQuantizedAabbAgainstQuantizedAabb(quantizedQueryAabbMin,quantizedQueryAabbMax,subtree.m_quantizedAabbMin,subtree.m_quantizedAabbMax);
+		if (overlap)
 		{
 			updateBvhNodes(meshInterface,subtree.m_rootNodeIndex,subtree.m_rootNodeIndex+subtree.m_subtreeSize,i);
 
@@ -268,23 +212,36 @@ void	btOptimizedBvh::refitPartial(btStridingMeshInterface* meshInterface,const b
 	
 }
 
+///just for debugging, to visualize the individual patches/subtrees
+#ifdef DEBUG_PATCH_COLORS
+btVector3 color[4]=
+{
+	btVector3(255,0,0),
+	btVector3(0,255,0),
+	btVector3(0,0,255),
+	btVector3(0,255,255)
+};
+#endif //DEBUG_PATCH_COLORS
+
+
 void	btOptimizedBvh::updateBvhNodes(btStridingMeshInterface* meshInterface,int firstNode,int endNode,int index)
 {
 	(void)index;
 
 	btAssert(m_useQuantization);
 
-	int curNodeSubPart=-1;
+	int nodeSubPart=0;
 
 	//get access info to trianglemesh data
-		const unsigned char *vertexbase = 0;
-		int numverts = 0;
-		PHY_ScalarType type = PHY_INTEGER;
-		int stride = 0;
-		const unsigned char *indexbase = 0;
-		int indexstride = 0;
-		int numfaces = 0;
-		PHY_ScalarType indicestype = PHY_INTEGER;
+		const unsigned char *vertexbase;
+		int numverts;
+		PHY_ScalarType type;
+		int stride;
+		const unsigned char *indexbase;
+		int indexstride;
+		int numfaces;
+		PHY_ScalarType indicestype;
+		meshInterface->getLockedReadOnlyVertexIndexBase(&vertexbase,numverts,	type,stride,&indexbase,indexstride,numfaces,indicestype,nodeSubPart);
 
 		btVector3	triangleVerts[3];
 		btVector3	aabbMin,aabbMax;
@@ -299,24 +256,16 @@ void	btOptimizedBvh::updateBvhNodes(btStridingMeshInterface* meshInterface,int f
 			if (curNode.isLeafNode())
 			{
 				//recalc aabb from triangle data
-				int nodeSubPart = curNode.getPartId();
 				int nodeTriangleIndex = curNode.getTriangleIndex();
-				if (nodeSubPart != curNodeSubPart)
-				{
-					if (curNodeSubPart >= 0)
-						meshInterface->unLockReadOnlyVertexBase(curNodeSubPart);
-					meshInterface->getLockedReadOnlyVertexIndexBase(&vertexbase,numverts,	type,stride,&indexbase,indexstride,numfaces,indicestype,nodeSubPart);
-					btAssert(indicestype==PHY_INTEGER||indicestype==PHY_SHORT);
-				}
 				//triangles->getLockedReadOnlyVertexIndexBase(vertexBase,numVerts,
 
-				unsigned int* gfxbase = (unsigned int*)(indexbase+nodeTriangleIndex*indexstride);
+				int* gfxbase = (int*)(indexbase+nodeTriangleIndex*indexstride);
 				
 				
 				for (int j=2;j>=0;j--)
 				{
 					
-					int graphicsindex = indicestype==PHY_SHORT?((unsigned short*)gfxbase)[j]:gfxbase[j];
+					int graphicsindex = gfxbase[j];
 					btScalar* graphicsbase = (btScalar*)(vertexbase+graphicsindex*stride);
 #ifdef DEBUG_PATCH_COLORS
 					btVector3 mycolor = color[index&3];
@@ -343,8 +292,8 @@ void	btOptimizedBvh::updateBvhNodes(btStridingMeshInterface* meshInterface,int f
 				aabbMin.setMin(triangleVerts[2]);
 				aabbMax.setMax(triangleVerts[2]);
 
-				quantize(&curNode.m_quantizedAabbMin[0],aabbMin,0);
-				quantize(&curNode.m_quantizedAabbMax[0],aabbMax,1);
+				quantizeWithClamp(&curNode.m_quantizedAabbMin[0],aabbMin);
+				quantizeWithClamp(&curNode.m_quantizedAabbMax[0],aabbMax);
 				
 			} else
 			{
@@ -372,17 +321,525 @@ void	btOptimizedBvh::updateBvhNodes(btStridingMeshInterface* meshInterface,int f
 
 		}
 
-		if (curNodeSubPart >= 0)
-			meshInterface->unLockReadOnlyVertexBase(curNodeSubPart);
+		meshInterface->unLockReadOnlyVertexBase(nodeSubPart);
 
 		
 }
 
-///deSerializeInPlace loads and initializes a BVH from a buffer in memory 'in place'
-btOptimizedBvh* btOptimizedBvh::deSerializeInPlace(void *i_alignedDataBuffer, unsigned int i_dataBufferSize, bool i_swapEndian)
+void	btOptimizedBvh::setQuantizationValues(const btVector3& bvhAabbMin,const btVector3& bvhAabbMax,btScalar quantizationMargin)
 {
-	btQuantizedBvh* bvh = btQuantizedBvh::deSerializeInPlace(i_alignedDataBuffer,i_dataBufferSize,i_swapEndian);
-	
-	//we don't add additional data so just do a static upcast
-	return static_cast<btOptimizedBvh*>(bvh);
+	//enlarge the AABB to avoid division by zero when initializing the quantization values
+	btVector3 clampValue(quantizationMargin,quantizationMargin,quantizationMargin);
+	m_bvhAabbMin = bvhAabbMin - clampValue;
+	m_bvhAabbMax = bvhAabbMax + clampValue;
+	btVector3 aabbSize = m_bvhAabbMax - m_bvhAabbMin;
+	m_bvhQuantization = btVector3(btScalar(65535.0),btScalar(65535.0),btScalar(65535.0)) / aabbSize;
+}
+
+
+void	btOptimizedBvh::refit(btStridingMeshInterface* meshInterface)
+{
+	if (m_useQuantization)
+	{
+		//calculate new aabb
+		btVector3 aabbMin,aabbMax;
+		meshInterface->calculateAabbBruteForce(aabbMin,aabbMax);
+
+		setQuantizationValues(aabbMin,aabbMax);
+
+		updateBvhNodes(meshInterface,0,m_curNodeIndex,0);
+
+		///now update all subtree headers
+
+		int i;
+		for (i=0;i<m_SubtreeHeaders.size();i++)
+		{
+			btBvhSubtreeInfo& subtree = m_SubtreeHeaders[i];
+			subtree.setAabbFromQuantizeNode(m_quantizedContiguousNodes[subtree.m_rootNodeIndex]);
+		}
+
+	} else
+	{
+
+	}
+}
+
+
+
+btOptimizedBvh::~btOptimizedBvh()
+{
+}
+
+#ifdef DEBUG_TREE_BUILDING
+int gStackDepth = 0;
+int gMaxStackDepth = 0;
+#endif //DEBUG_TREE_BUILDING
+
+void	btOptimizedBvh::buildTree	(int startIndex,int endIndex)
+{
+#ifdef DEBUG_TREE_BUILDING
+	gStackDepth++;
+	if (gStackDepth > gMaxStackDepth)
+		gMaxStackDepth = gStackDepth;
+#endif //DEBUG_TREE_BUILDING
+
+
+	int splitAxis, splitIndex, i;
+	int numIndices =endIndex-startIndex;
+	int curIndex = m_curNodeIndex;
+
+	assert(numIndices>0);
+
+	if (numIndices==1)
+	{
+#ifdef DEBUG_TREE_BUILDING
+		gStackDepth--;
+#endif //DEBUG_TREE_BUILDING
+		
+		assignInternalNodeFromLeafNode(m_curNodeIndex,startIndex);
+
+		m_curNodeIndex++;
+		return;	
+	}
+	//calculate Best Splitting Axis and where to split it. Sort the incoming 'leafNodes' array within range 'startIndex/endIndex'.
+	
+	splitAxis = calcSplittingAxis(startIndex,endIndex);
+
+	splitIndex = sortAndCalcSplittingIndex(startIndex,endIndex,splitAxis);
+
+	int internalNodeIndex = m_curNodeIndex;
+	
+	setInternalNodeAabbMax(m_curNodeIndex,btVector3(btScalar(-1e30),btScalar(-1e30),btScalar(-1e30)));
+	setInternalNodeAabbMin(m_curNodeIndex,btVector3(btScalar(1e30),btScalar(1e30),btScalar(1e30)));
+	
+	for (i=startIndex;i<endIndex;i++)
+	{
+		mergeInternalNodeAabb(m_curNodeIndex,getAabbMin(i),getAabbMax(i));
+	}
+
+	m_curNodeIndex++;
+	
+
+	//internalNode->m_escapeIndex;
+	
+	int leftChildNodexIndex = m_curNodeIndex;
+
+	//build left child tree
+	buildTree(startIndex,splitIndex);
+
+	int rightChildNodexIndex = m_curNodeIndex;
+	//build right child tree
+	buildTree(splitIndex,endIndex);
+
+#ifdef DEBUG_TREE_BUILDING
+	gStackDepth--;
+#endif //DEBUG_TREE_BUILDING
+
+	int escapeIndex = m_curNodeIndex - curIndex;
+
+	if (m_useQuantization)
+	{
+		//escapeIndex is the number of nodes of this subtree
+		const int sizeQuantizedNode =sizeof(btQuantizedBvhNode);
+		const int treeSizeInBytes = escapeIndex * sizeQuantizedNode;
+		if (treeSizeInBytes > MAX_SUBTREE_SIZE_IN_BYTES)
+		{
+			updateSubtreeHeaders(leftChildNodexIndex,rightChildNodexIndex);
+		}
+	}
+
+	setInternalNodeEscapeIndex(internalNodeIndex,escapeIndex);
+
+}
+
+void	btOptimizedBvh::updateSubtreeHeaders(int leftChildNodexIndex,int rightChildNodexIndex)
+{
+	btAssert(m_useQuantization);
+
+	btQuantizedBvhNode& leftChildNode = m_quantizedContiguousNodes[leftChildNodexIndex];
+	int leftSubTreeSize = leftChildNode.isLeafNode() ? 1 : leftChildNode.getEscapeIndex();
+	int leftSubTreeSizeInBytes =  leftSubTreeSize * sizeof(btQuantizedBvhNode);
+	
+	btQuantizedBvhNode& rightChildNode = m_quantizedContiguousNodes[rightChildNodexIndex];
+	int rightSubTreeSize = rightChildNode.isLeafNode() ? 1 : rightChildNode.getEscapeIndex();
+	int rightSubTreeSizeInBytes =  rightSubTreeSize * sizeof(btQuantizedBvhNode);
+
+	if(leftSubTreeSizeInBytes <= MAX_SUBTREE_SIZE_IN_BYTES)
+	{
+		btBvhSubtreeInfo& subtree = m_SubtreeHeaders.expand();
+		subtree.setAabbFromQuantizeNode(leftChildNode);
+		subtree.m_rootNodeIndex = leftChildNodexIndex;
+		subtree.m_subtreeSize = leftSubTreeSize;
+	}
+
+	if(rightSubTreeSizeInBytes <= MAX_SUBTREE_SIZE_IN_BYTES)
+	{
+		btBvhSubtreeInfo& subtree = m_SubtreeHeaders.expand();
+		subtree.setAabbFromQuantizeNode(rightChildNode);
+		subtree.m_rootNodeIndex = rightChildNodexIndex;
+		subtree.m_subtreeSize = rightSubTreeSize;
+	}
+}
+
+
+int	btOptimizedBvh::sortAndCalcSplittingIndex(int startIndex,int endIndex,int splitAxis)
+{
+	int i;
+	int splitIndex =startIndex;
+	int numIndices = endIndex - startIndex;
+	btScalar splitValue;
+
+	btVector3 means(btScalar(0.),btScalar(0.),btScalar(0.));
+	for (i=startIndex;i<endIndex;i++)
+	{
+		btVector3 center = btScalar(0.5)*(getAabbMax(i)+getAabbMin(i));
+		means+=center;
+	}
+	means *= (btScalar(1.)/(btScalar)numIndices);
+	
+	splitValue = means[splitAxis];
+	
+	//sort leafNodes so all values larger then splitValue comes first, and smaller values start from 'splitIndex'.
+	for (i=startIndex;i<endIndex;i++)
+	{
+		btVector3 center = btScalar(0.5)*(getAabbMax(i)+getAabbMin(i));
+		if (center[splitAxis] > splitValue)
+		{
+			//swap
+			swapLeafNodes(i,splitIndex);
+			splitIndex++;
+		}
+	}
+
+	//if the splitIndex causes unbalanced trees, fix this by using the center in between startIndex and endIndex
+	//otherwise the tree-building might fail due to stack-overflows in certain cases.
+	//unbalanced1 is unsafe: it can cause stack overflows
+	//bool unbalanced1 = ((splitIndex==startIndex) || (splitIndex == (endIndex-1)));
+
+	//unbalanced2 should work too: always use center (perfect balanced trees)	
+	//bool unbalanced2 = true;
+
+	//this should be safe too:
+	int rangeBalancedIndices = numIndices/3;
+	bool unbalanced = ((splitIndex<=(startIndex+rangeBalancedIndices)) || (splitIndex >=(endIndex-1-rangeBalancedIndices)));
+	
+	if (unbalanced)
+	{
+		splitIndex = startIndex+ (numIndices>>1);
+	}
+
+	bool unbal = (splitIndex==startIndex) || (splitIndex == (endIndex));
+	btAssert(!unbal);
+
+	return splitIndex;
+}
+
+
+int	btOptimizedBvh::calcSplittingAxis(int startIndex,int endIndex)
+{
+	int i;
+
+	btVector3 means(btScalar(0.),btScalar(0.),btScalar(0.));
+	btVector3 variance(btScalar(0.),btScalar(0.),btScalar(0.));
+	int numIndices = endIndex-startIndex;
+
+	for (i=startIndex;i<endIndex;i++)
+	{
+		btVector3 center = btScalar(0.5)*(getAabbMax(i)+getAabbMin(i));
+		means+=center;
+	}
+	means *= (btScalar(1.)/(btScalar)numIndices);
+		
+	for (i=startIndex;i<endIndex;i++)
+	{
+		btVector3 center = btScalar(0.5)*(getAabbMax(i)+getAabbMin(i));
+		btVector3 diff2 = center-means;
+		diff2 = diff2 * diff2;
+		variance += diff2;
+	}
+	variance *= (btScalar(1.)/	((btScalar)numIndices-1)	);
+	
+	return variance.maxAxis();
+}
+
+
+
+void	btOptimizedBvh::reportAabbOverlappingNodex(btNodeOverlapCallback* nodeCallback,const btVector3& aabbMin,const btVector3& aabbMax) const
+{
+	//either choose recursive traversal (walkTree) or stackless (walkStacklessTree)
+
+
+	if (m_useQuantization)
+	{
+		///quantize query AABB
+		unsigned short int quantizedQueryAabbMin[3];
+		unsigned short int quantizedQueryAabbMax[3];
+		quantizeWithClamp(quantizedQueryAabbMin,aabbMin);
+		quantizeWithClamp(quantizedQueryAabbMax,aabbMax);
+
+		switch (m_traversalMode)
+		{
+		case TRAVERSAL_STACKLESS:
+				walkStacklessQuantizedTree(nodeCallback,quantizedQueryAabbMin,quantizedQueryAabbMax,0,m_curNodeIndex);
+			break;
+		case TRAVERSAL_STACKLESS_CACHE_FRIENDLY:
+				walkStacklessQuantizedTreeCacheFriendly(nodeCallback,quantizedQueryAabbMin,quantizedQueryAabbMax);
+			break;
+		case TRAVERSAL_RECURSIVE:
+			{
+				const btQuantizedBvhNode* rootNode = &m_quantizedContiguousNodes[0];
+				walkRecursiveQuantizedTreeAgainstQueryAabb(rootNode,nodeCallback,quantizedQueryAabbMin,quantizedQueryAabbMax);
+			}
+			break;
+		default:
+			//unsupported
+			btAssert(0);
+		}
+	} else
+	{
+		walkStacklessTree(nodeCallback,aabbMin,aabbMax);
+	}
+}
+
+
+int maxIterations = 0;
+
+void	btOptimizedBvh::walkStacklessTree(btNodeOverlapCallback* nodeCallback,const btVector3& aabbMin,const btVector3& aabbMax) const
+{
+	btAssert(!m_useQuantization);
+
+	const btOptimizedBvhNode* rootNode = &m_contiguousNodes[0];
+	int escapeIndex, curIndex = 0;
+	int walkIterations = 0;
+	bool aabbOverlap, isLeafNode;
+
+	while (curIndex < m_curNodeIndex)
+	{
+		//catch bugs in tree data
+		assert (walkIterations < m_curNodeIndex);
+
+		walkIterations++;
+		aabbOverlap = TestAabbAgainstAabb2(aabbMin,aabbMax,rootNode->m_aabbMinOrg,rootNode->m_aabbMaxOrg);
+		isLeafNode = rootNode->m_escapeIndex == -1;
+		
+		if (isLeafNode && aabbOverlap)
+		{
+			nodeCallback->processNode(rootNode->m_subPart,rootNode->m_triangleIndex);
+		} 
+		
+		if (aabbOverlap || isLeafNode)
+		{
+			rootNode++;
+			curIndex++;
+		} else
+		{
+			escapeIndex = rootNode->m_escapeIndex;
+			rootNode += escapeIndex;
+			curIndex += escapeIndex;
+		}
+	}
+	if (maxIterations < walkIterations)
+		maxIterations = walkIterations;
+
+}
+
+/*
+///this was the original recursive traversal, before we optimized towards stackless traversal
+void	btOptimizedBvh::walkTree(btOptimizedBvhNode* rootNode,btNodeOverlapCallback* nodeCallback,const btVector3& aabbMin,const btVector3& aabbMax) const
+{
+	bool isLeafNode, aabbOverlap = TestAabbAgainstAabb2(aabbMin,aabbMax,rootNode->m_aabbMin,rootNode->m_aabbMax);
+	if (aabbOverlap)
+	{
+		isLeafNode = (!rootNode->m_leftChild && !rootNode->m_rightChild);
+		if (isLeafNode)
+		{
+			nodeCallback->processNode(rootNode);
+		} else
+		{
+			walkTree(rootNode->m_leftChild,nodeCallback,aabbMin,aabbMax);
+			walkTree(rootNode->m_rightChild,nodeCallback,aabbMin,aabbMax);
+		}
+	}
+
+}
+*/
+
+void btOptimizedBvh::walkRecursiveQuantizedTreeAgainstQueryAabb(const btQuantizedBvhNode* currentNode,btNodeOverlapCallback* nodeCallback,unsigned short int* quantizedQueryAabbMin,unsigned short int* quantizedQueryAabbMax) const
+{
+	btAssert(m_useQuantization);
+	
+	bool aabbOverlap, isLeafNode;
+
+	aabbOverlap = testQuantizedAabbAgainstQuantizedAabb(quantizedQueryAabbMin,quantizedQueryAabbMax,currentNode->m_quantizedAabbMin,currentNode->m_quantizedAabbMax);
+	isLeafNode = currentNode->isLeafNode();
+		
+	if (aabbOverlap)
+	{
+		if (isLeafNode)
+		{
+			nodeCallback->processNode(0,currentNode->getTriangleIndex());
+		} else
+		{
+			//process left and right children
+			const btQuantizedBvhNode* leftChildNode = currentNode+1;
+			walkRecursiveQuantizedTreeAgainstQueryAabb(leftChildNode,nodeCallback,quantizedQueryAabbMin,quantizedQueryAabbMax);
+
+			const btQuantizedBvhNode* rightChildNode = leftChildNode->isLeafNode() ? leftChildNode+1:leftChildNode+leftChildNode->getEscapeIndex();
+			walkRecursiveQuantizedTreeAgainstQueryAabb(rightChildNode,nodeCallback,quantizedQueryAabbMin,quantizedQueryAabbMax);
+		}
+	}		
+}
+
+
+
+
+
+
+
+void	btOptimizedBvh::walkStacklessQuantizedTree(btNodeOverlapCallback* nodeCallback,unsigned short int* quantizedQueryAabbMin,unsigned short int* quantizedQueryAabbMax,int startNodeIndex,int endNodeIndex) const
+{
+	btAssert(m_useQuantization);
+	
+	int curIndex = startNodeIndex;
+	int walkIterations = 0;
+	int subTreeSize = endNodeIndex - startNodeIndex;
+
+	const btQuantizedBvhNode* rootNode = &m_quantizedContiguousNodes[startNodeIndex];
+	int escapeIndex;
+	
+	bool aabbOverlap, isLeafNode;
+
+	while (curIndex < endNodeIndex)
+	{
+
+//#define VISUALLY_ANALYZE_BVH 1
+#ifdef VISUALLY_ANALYZE_BVH
+		//some code snippet to debugDraw aabb, to visually analyze bvh structure
+		static int drawPatch = 0;
+		//need some global access to a debugDrawer
+		extern btIDebugDraw* debugDrawerPtr;
+		if (curIndex==drawPatch)
+		{
+			btVector3 aabbMin,aabbMax;
+			aabbMin = unQuantize(rootNode->m_quantizedAabbMin);
+			aabbMax = unQuantize(rootNode->m_quantizedAabbMax);
+			btVector3	color(1,0,0);
+			debugDrawerPtr->drawAabb(aabbMin,aabbMax,color);
+		}
+#endif//VISUALLY_ANALYZE_BVH
+
+		//catch bugs in tree data
+		assert (walkIterations < subTreeSize);
+
+		walkIterations++;
+		aabbOverlap = testQuantizedAabbAgainstQuantizedAabb(quantizedQueryAabbMin,quantizedQueryAabbMax,rootNode->m_quantizedAabbMin,rootNode->m_quantizedAabbMax);
+		isLeafNode = rootNode->isLeafNode();
+		
+		if (isLeafNode && aabbOverlap)
+		{
+			nodeCallback->processNode(0,rootNode->getTriangleIndex());
+		} 
+		
+		if (aabbOverlap || isLeafNode)
+		{
+			rootNode++;
+			curIndex++;
+		} else
+		{
+			escapeIndex = rootNode->getEscapeIndex();
+			rootNode += escapeIndex;
+			curIndex += escapeIndex;
+		}
+	}
+	if (maxIterations < walkIterations)
+		maxIterations = walkIterations;
+
+}
+
+//This traversal can be called from Playstation 3 SPU
+void	btOptimizedBvh::walkStacklessQuantizedTreeCacheFriendly(btNodeOverlapCallback* nodeCallback,unsigned short int* quantizedQueryAabbMin,unsigned short int* quantizedQueryAabbMax) const
+{
+	btAssert(m_useQuantization);
+
+	int i;
+
+
+	for (i=0;i<this->m_SubtreeHeaders.size();i++)
+	{
+		const btBvhSubtreeInfo& subtree = m_SubtreeHeaders[i];
+
+		bool overlap = testQuantizedAabbAgainstQuantizedAabb(quantizedQueryAabbMin,quantizedQueryAabbMax,subtree.m_quantizedAabbMin,subtree.m_quantizedAabbMax);
+		if (overlap)
+		{
+			walkStacklessQuantizedTree(nodeCallback,quantizedQueryAabbMin,quantizedQueryAabbMax,
+				subtree.m_rootNodeIndex,
+				subtree.m_rootNodeIndex+subtree.m_subtreeSize);
+		}
+	}
+}
+
+
+
+
+void	btOptimizedBvh::reportSphereOverlappingNodex(btNodeOverlapCallback* nodeCallback,const btVector3& aabbMin,const btVector3& aabbMax) const
+{
+	(void)nodeCallback;
+	(void)aabbMin;
+	(void)aabbMax;
+	//not yet, please use aabb
+	btAssert(0);
+}
+
+
+void btOptimizedBvh::quantizeWithClamp(unsigned short* out, const btVector3& point) const
+{
+
+	btAssert(m_useQuantization);
+
+	btVector3 clampedPoint(point);
+	clampedPoint.setMax(m_bvhAabbMin);
+	clampedPoint.setMin(m_bvhAabbMax);
+
+	btVector3 v = (clampedPoint - m_bvhAabbMin) * m_bvhQuantization;
+	out[0] = (unsigned short)(v.getX()+0.5f);
+	out[1] = (unsigned short)(v.getY()+0.5f);
+	out[2] = (unsigned short)(v.getZ()+0.5f);		
+}
+
+btVector3	btOptimizedBvh::unQuantize(const unsigned short* vecIn) const
+{
+	btVector3	vecOut;
+	vecOut.setValue(
+		(btScalar)(vecIn[0]) / (m_bvhQuantization.getX()),
+		(btScalar)(vecIn[1]) / (m_bvhQuantization.getY()),
+		(btScalar)(vecIn[2]) / (m_bvhQuantization.getZ()));
+	vecOut += m_bvhAabbMin;
+	return vecOut;
+}
+
+
+void	btOptimizedBvh::swapLeafNodes(int i,int splitIndex)
+{
+	if (m_useQuantization)
+	{
+			btQuantizedBvhNode tmp = m_quantizedLeafNodes[i];
+			m_quantizedLeafNodes[i] = m_quantizedLeafNodes[splitIndex];
+			m_quantizedLeafNodes[splitIndex] = tmp;
+	} else
+	{
+			btOptimizedBvhNode tmp = m_leafNodes[i];
+			m_leafNodes[i] = m_leafNodes[splitIndex];
+			m_leafNodes[splitIndex] = tmp;
+	}
+}
+
+void	btOptimizedBvh::assignInternalNodeFromLeafNode(int internalNode,int leafNodeIndex)
+{
+	if (m_useQuantization)
+	{
+		m_quantizedContiguousNodes[internalNode] = m_quantizedLeafNodes[leafNodeIndex];
+	} else
+	{
+		m_contiguousNodes[internalNode] = m_leafNodes[leafNodeIndex];
+	}
 }
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.h
index d7536417d7e..d5159586344 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.h
@@ -16,48 +16,315 @@ subject to the following restrictions:
 #ifndef OPTIMIZED_BVH_H
 #define OPTIMIZED_BVH_H
 
-#include "BulletCollision/BroadphaseCollision/btQuantizedBvh.h"
+
+#include "../../LinearMath/btVector3.h"
+
+
+//http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclang/html/vclrf__m128.asp
+
+
 
 class btStridingMeshInterface;
 
+//Note: currently we have 16 bytes per quantized node
+#define MAX_SUBTREE_SIZE_IN_BYTES  2048
 
-///The btOptimizedBvh extends the btQuantizedBvh to create AABB tree for triangle meshes, through the btStridingMeshInterface.
-ATTRIBUTE_ALIGNED16(class) btOptimizedBvh : public btQuantizedBvh
+
+///btQuantizedBvhNode is a compressed aabb node, 16 bytes.
+///Node can be used for leafnode or internal node. Leafnodes can point to 32-bit triangle index (non-negative range).
+ATTRIBUTE_ALIGNED16	(struct) btQuantizedBvhNode
 {
 	
+	//12 bytes
+	unsigned short int	m_quantizedAabbMin[3];
+	unsigned short int	m_quantizedAabbMax[3];
+	//4 bytes
+	int	m_escapeIndexOrTriangleIndex;
+
+	bool isLeafNode() const
+	{
+		//skipindex is negative (internal node), triangleindex >=0 (leafnode)
+		return (m_escapeIndexOrTriangleIndex >= 0);
+	}
+	int getEscapeIndex() const
+	{
+		btAssert(!isLeafNode());
+		return -m_escapeIndexOrTriangleIndex;
+	}
+	int	getTriangleIndex() const
+	{
+		btAssert(isLeafNode());
+		return m_escapeIndexOrTriangleIndex;
+	}
+}
+;
+
+/// btOptimizedBvhNode contains both internal and leaf node information.
+/// Total node size is 44 bytes / node. You can use the compressed version of 16 bytes.
+ATTRIBUTE_ALIGNED16 (struct) btOptimizedBvhNode
+{
+	//32 bytes
+	btVector3	m_aabbMinOrg;
+	btVector3	m_aabbMaxOrg;
+
+	//4
+	int	m_escapeIndex;
+
+	//8
+	//for child nodes
+	int	m_subPart;
+	int	m_triangleIndex;
+	int	m_padding[5];//bad, due to alignment
+
+
+};
+
+
+///btBvhSubtreeInfo provides info to gather a subtree of limited size
+ATTRIBUTE_ALIGNED16(class) btBvhSubtreeInfo
+{
 public:
-	BT_DECLARE_ALIGNED_ALLOCATOR();
+	//12 bytes
+	unsigned short int	m_quantizedAabbMin[3];
+	unsigned short int	m_quantizedAabbMax[3];
+	//4 bytes, points to the root of the subtree
+	int			m_rootNodeIndex;
+	//4 bytes
+	int			m_subtreeSize;
+	int			m_padding[3];
+
+
+	void	setAabbFromQuantizeNode(const btQuantizedBvhNode& quantizedNode)
+	{
+		m_quantizedAabbMin[0] = quantizedNode.m_quantizedAabbMin[0];
+		m_quantizedAabbMin[1] = quantizedNode.m_quantizedAabbMin[1];
+		m_quantizedAabbMin[2] = quantizedNode.m_quantizedAabbMin[2];
+		m_quantizedAabbMax[0] = quantizedNode.m_quantizedAabbMax[0];
+		m_quantizedAabbMax[1] = quantizedNode.m_quantizedAabbMax[1];
+		m_quantizedAabbMax[2] = quantizedNode.m_quantizedAabbMax[2];
+	}
+}
+;
+
+
+class btNodeOverlapCallback
+{
+public:
+	virtual ~btNodeOverlapCallback() {};
+
+	virtual void processNode(int subPart, int triangleIndex) = 0;
+};
+
+#include "../../LinearMath/btAlignedAllocator.h"
+#include "../../LinearMath/btAlignedObjectArray.h"
+
+
+
+///for code readability:
+typedef btAlignedObjectArray<btOptimizedBvhNode>	NodeArray;
+typedef btAlignedObjectArray<btQuantizedBvhNode>	QuantizedNodeArray;
+typedef btAlignedObjectArray<btBvhSubtreeInfo>		BvhSubtreeInfoArray;
+
+
+///OptimizedBvh store an AABB tree that can be quickly traversed on CPU (and SPU,GPU in future)
+ATTRIBUTE_ALIGNED16(class) btOptimizedBvh
+{
+	NodeArray			m_leafNodes;
+	NodeArray			m_contiguousNodes;
+
+	QuantizedNodeArray	m_quantizedLeafNodes;
+	
+	QuantizedNodeArray	m_quantizedContiguousNodes;
+	
+	int					m_curNodeIndex;
+
+
+	//quantization data
+	bool				m_useQuantization;
+	btVector3			m_bvhAabbMin;
+	btVector3			m_bvhAabbMax;
+	btVector3			m_bvhQuantization;
+
+	enum btTraversalMode
+	{
+		TRAVERSAL_STACKLESS = 0,
+		TRAVERSAL_STACKLESS_CACHE_FRIENDLY,
+		TRAVERSAL_RECURSIVE
+	};
+
+	btTraversalMode	m_traversalMode;
+
+	
+
+
+	BvhSubtreeInfoArray		m_SubtreeHeaders;
+
+
+	///two versions, one for quantized and normal nodes. This allows code-reuse while maintaining readability (no template/macro!)
+	///this might be refactored into a virtual, it is usually not calculated at run-time
+	void	setInternalNodeAabbMin(int nodeIndex, const btVector3& aabbMin)
+	{
+		if (m_useQuantization)
+		{
+			quantizeWithClamp(&m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[0] ,aabbMin);
+		} else
+		{
+			m_contiguousNodes[nodeIndex].m_aabbMinOrg = aabbMin;
+
+		}
+	}
+	void	setInternalNodeAabbMax(int nodeIndex,const btVector3& aabbMax)
+	{
+		if (m_useQuantization)
+		{
+			quantizeWithClamp(&m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[0],aabbMax);
+		} else
+		{
+			m_contiguousNodes[nodeIndex].m_aabbMaxOrg = aabbMax;
+		}
+	}
+
+	btVector3 getAabbMin(int nodeIndex) const
+	{
+		if (m_useQuantization)
+		{
+			return unQuantize(&m_quantizedLeafNodes[nodeIndex].m_quantizedAabbMin[0]);
+		}
+		//non-quantized
+		return m_leafNodes[nodeIndex].m_aabbMinOrg;
+
+	}
+	btVector3 getAabbMax(int nodeIndex) const
+	{
+		if (m_useQuantization)
+		{
+			return unQuantize(&m_quantizedLeafNodes[nodeIndex].m_quantizedAabbMax[0]);
+		} 
+		//non-quantized
+		return m_leafNodes[nodeIndex].m_aabbMaxOrg;
+		
+	}
+
+	void	setQuantizationValues(const btVector3& bvhAabbMin,const btVector3& bvhAabbMax,btScalar quantizationMargin=btScalar(1.0));
+	
+	void	setInternalNodeEscapeIndex(int nodeIndex, int escapeIndex)
+	{
+		if (m_useQuantization)
+		{
+			m_quantizedContiguousNodes[nodeIndex].m_escapeIndexOrTriangleIndex = -escapeIndex;
+		} 
+		else
+		{
+			m_contiguousNodes[nodeIndex].m_escapeIndex = escapeIndex;
+		}
+
+	}
+
+	void mergeInternalNodeAabb(int nodeIndex,const btVector3& newAabbMin,const btVector3& newAabbMax) 
+	{
+		if (m_useQuantization)
+		{
+			unsigned short int quantizedAabbMin[3];
+			unsigned short int quantizedAabbMax[3];
+			quantizeWithClamp(quantizedAabbMin,newAabbMin);
+			quantizeWithClamp(quantizedAabbMax,newAabbMax);
+			for (int i=0;i<3;i++)
+			{
+				if (m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[i] > quantizedAabbMin[i])
+					m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMin[i] = quantizedAabbMin[i];
+
+				if (m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[i] < quantizedAabbMax[i])
+					m_quantizedContiguousNodes[nodeIndex].m_quantizedAabbMax[i] = quantizedAabbMax[i];
+
+			}
+		} else
+		{
+			//non-quantized
+			m_contiguousNodes[nodeIndex].m_aabbMinOrg.setMin(newAabbMin);
+			m_contiguousNodes[nodeIndex].m_aabbMaxOrg.setMax(newAabbMax);		
+		}
+	}
+
+	void	swapLeafNodes(int firstIndex,int secondIndex);
+
+	void	assignInternalNodeFromLeafNode(int internalNode,int leafNodeIndex);
 
 protected:
 
-public:
+	
 
+	void	buildTree	(int startIndex,int endIndex);
+
+	int	calcSplittingAxis(int startIndex,int endIndex);
+
+	int	sortAndCalcSplittingIndex(int startIndex,int endIndex,int splitAxis);
+	
+	void	walkStacklessTree(btNodeOverlapCallback* nodeCallback,const btVector3& aabbMin,const btVector3& aabbMax) const;
+
+	void	walkStacklessQuantizedTree(btNodeOverlapCallback* nodeCallback,unsigned short int* quantizedQueryAabbMin,unsigned short int* quantizedQueryAabbMax,int startNodeIndex,int endNodeIndex) const;
+
+	///tree traversal designed for small-memory processors like PS3 SPU
+	void	walkStacklessQuantizedTreeCacheFriendly(btNodeOverlapCallback* nodeCallback,unsigned short int* quantizedQueryAabbMin,unsigned short int* quantizedQueryAabbMax) const;
+
+	///use the 16-byte stackless 'skipindex' node tree to do a recursive traversal
+	void	walkRecursiveQuantizedTreeAgainstQueryAabb(const btQuantizedBvhNode* currentNode,btNodeOverlapCallback* nodeCallback,unsigned short int* quantizedQueryAabbMin,unsigned short int* quantizedQueryAabbMax) const;
+
+	///use the 16-byte stackless 'skipindex' node tree to do a recursive traversal
+	void	walkRecursiveQuantizedTreeAgainstQuantizedTree(const btQuantizedBvhNode* treeNodeA,const btQuantizedBvhNode* treeNodeB,btNodeOverlapCallback* nodeCallback) const;
+	
+
+	inline bool testQuantizedAabbAgainstQuantizedAabb(unsigned short int* aabbMin1,unsigned short int* aabbMax1,const unsigned short int* aabbMin2,const unsigned short int* aabbMax2) const
+	{
+		bool overlap = true;
+		overlap = (aabbMin1[0] > aabbMax2[0] || aabbMax1[0] < aabbMin2[0]) ? false : overlap;
+		overlap = (aabbMin1[2] > aabbMax2[2] || aabbMax1[2] < aabbMin2[2]) ? false : overlap;
+		overlap = (aabbMin1[1] > aabbMax2[1] || aabbMax1[1] < aabbMin2[1]) ? false : overlap;
+		return overlap;
+	}
+
+	void	updateSubtreeHeaders(int leftChildNodexIndex,int rightChildNodexIndex);
+
+public:
 	btOptimizedBvh();
 
 	virtual ~btOptimizedBvh();
 
 	void	build(btStridingMeshInterface* triangles,bool useQuantizedAabbCompression, const btVector3& bvhAabbMin, const btVector3& bvhAabbMax);
 
-	void	refit(btStridingMeshInterface* triangles,const btVector3& aabbMin,const btVector3& aabbMax);
+	void	reportAabbOverlappingNodex(btNodeOverlapCallback* nodeCallback,const btVector3& aabbMin,const btVector3& aabbMax) const;
+
+	void	reportSphereOverlappingNodex(btNodeOverlapCallback* nodeCallback,const btVector3& aabbMin,const btVector3& aabbMax) const;
+
+	void quantizeWithClamp(unsigned short* out, const btVector3& point) const;
+	
+	btVector3	unQuantize(const unsigned short* vecIn) const;
+
+	///setTraversalMode let's you choose between stackless, recursive or stackless cache friendly tree traversal. Note this is only implemented for quantized trees.
+	void	setTraversalMode(btTraversalMode	traversalMode)
+	{
+		m_traversalMode = traversalMode;
+	}
+
+	void	refit(btStridingMeshInterface* triangles);
 
 	void	refitPartial(btStridingMeshInterface* triangles,const btVector3& aabbMin, const btVector3& aabbMax);
 
 	void	updateBvhNodes(btStridingMeshInterface* meshInterface,int firstNode,int endNode,int index);
 
-	/// Data buffer MUST be 16 byte aligned
-	virtual bool serialize(void *o_alignedDataBuffer, unsigned i_dataBufferSize, bool i_swapEndian)
-	{
-		return btQuantizedBvh::serialize(o_alignedDataBuffer,i_dataBufferSize,i_swapEndian);
 
+	QuantizedNodeArray&	getQuantizedNodeArray()
+	{	
+		return	m_quantizedContiguousNodes;
 	}
 
-	///deSerializeInPlace loads and initializes a BVH from a buffer in memory 'in place'
-	static btOptimizedBvh *deSerializeInPlace(void *i_alignedDataBuffer, unsigned int i_dataBufferSize, bool i_swapEndian);
+	BvhSubtreeInfoArray&	getSubtreeInfoArray()
+	{
+		return m_SubtreeHeaders;
+	}
 
-
-};
+}
+;
 
 
 #endif //OPTIMIZED_BVH_H
 
-
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp
index 71c3af38a02..bbc4ba62af6 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp
@@ -13,7 +13,7 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#include "BulletCollision/CollisionShapes/btPolyhedralConvexShape.h"
+#include <BulletCollision/CollisionShapes/btPolyhedralConvexShape.h>
 
 btPolyhedralConvexShape::btPolyhedralConvexShape()
 :m_localAabbMin(1,1,1),
@@ -95,7 +95,7 @@ void	btPolyhedralConvexShape::batchedUnitVectorGetSupportingVertexWithoutMargin(
 
 
 
-void	btPolyhedralConvexShape::calculateLocalInertia(btScalar mass,btVector3& inertia) const
+void	btPolyhedralConvexShape::calculateLocalInertia(btScalar mass,btVector3& inertia)
 {
 	//not yet, return box inertia
 
@@ -128,46 +128,10 @@ void btPolyhedralConvexShape::getAabb(const btTransform& trans,btVector3& aabbMi
 
 
 
-void	btPolyhedralConvexShape::setLocalScaling(const btVector3& scaling)
-{
-	btConvexInternalShape::setLocalScaling(scaling);
-	recalcLocalAabb();
-}
 
 void	btPolyhedralConvexShape::recalcLocalAabb()
 {
 	m_isLocalAabbValid = true;
-	
-	#if 1
-	static const btVector3 _directions[] =
-	{
-		btVector3( 1.,  0.,  0.),
-		btVector3( 0.,  1.,  0.),
-		btVector3( 0.,  0.,  1.),
-		btVector3( -1., 0.,  0.),
-		btVector3( 0., -1.,  0.),
-		btVector3( 0.,  0., -1.)
-	};
-	
-	btVector3 _supporting[] =
-	{
-		btVector3( 0., 0., 0.),
-		btVector3( 0., 0., 0.),
-		btVector3( 0., 0., 0.),
-		btVector3( 0., 0., 0.),
-		btVector3( 0., 0., 0.),
-		btVector3( 0., 0., 0.)
-	};
-	
-	batchedUnitVectorGetSupportingVertexWithoutMargin(_directions, _supporting, 6);
-	
-	for ( int i = 0; i < 3; ++i )
-	{
-		m_localAabbMax[i] = _supporting[i][i] + m_collisionMargin;
-		m_localAabbMin[i] = _supporting[i + 3][i] - m_collisionMargin;
-	}
-	
-	#else
 
 	for (int i=0;i<3;i++)
 	{
@@ -179,8 +143,6 @@ void	btPolyhedralConvexShape::recalcLocalAabb()
 		tmp = localGetSupportingVertex(vec);
 		m_localAabbMin[i] = tmp[i]-m_collisionMargin;
 	}
-	#endif
 }
 
 
-
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h
index 0d55e4fe92c..c35f7512663 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h
@@ -16,13 +16,13 @@ subject to the following restrictions:
 #ifndef BU_SHAPE
 #define BU_SHAPE
 
-#include "LinearMath/btPoint3.h"
-#include "LinearMath/btMatrix3x3.h"
-#include "btConvexInternalShape.h"
+#include "../../LinearMath/btPoint3.h"
+#include "../../LinearMath/btMatrix3x3.h"
+#include "btConvexShape.h"
 
 
-///The btPolyhedralConvexShape is an internal interface class for polyhedral convex shapes.
-class btPolyhedralConvexShape : public btConvexInternalShape
+///PolyhedralConvexShape is an interface class for feature based (vertex/edge/face) convex shapes.
+class btPolyhedralConvexShape : public btConvexShape
 {
 
 protected:
@@ -38,7 +38,7 @@ public:
 	virtual btVector3	localGetSupportingVertexWithoutMargin(const btVector3& vec)const;
 	virtual void	batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors,btVector3* supportVerticesOut,int numVectors) const;
 	
-	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia) const;
+	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia);
 
 
 	inline void getNonvirtualAabb(const btTransform& trans,btVector3& aabbMin,btVector3& aabbMax, btScalar margin) const
@@ -73,8 +73,6 @@ public:
 	
 	virtual void getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const;
 
-	virtual void	setLocalScaling(const btVector3& scaling);
-
 	void	recalcLocalAabb();
 
 	virtual int	getNumVertices() const = 0 ;
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.cpp
deleted file mode 100644
index a87b87f1a6f..00000000000
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.cpp
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
-btbtShapeHull implemented by John McCutchan.
-
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2008 Erwin Coumans  http://bulletphysics.com
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it freely,
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-#include "btShapeHull.h"
-#include "LinearMath/btConvexHull.h"
-
-#define NUM_UNITSPHERE_POINTS 42
-
-static btVector3 btUnitSpherePoints[NUM_UNITSPHERE_POINTS+MAX_PREFERRED_PENETRATION_DIRECTIONS*2] = 
-{
-	btVector3(btScalar(0.000000) , btScalar(-0.000000),btScalar(-1.000000)),
-	btVector3(btScalar(0.723608) , btScalar(-0.525725),btScalar(-0.447219)),
-	btVector3(btScalar(-0.276388) , btScalar(-0.850649),btScalar(-0.447219)),
-	btVector3(btScalar(-0.894426) , btScalar(-0.000000),btScalar(-0.447216)),
-	btVector3(btScalar(-0.276388) , btScalar(0.850649),btScalar(-0.447220)),
-	btVector3(btScalar(0.723608) , btScalar(0.525725),btScalar(-0.447219)),
-	btVector3(btScalar(0.276388) , btScalar(-0.850649),btScalar(0.447220)),
-	btVector3(btScalar(-0.723608) , btScalar(-0.525725),btScalar(0.447219)),
-	btVector3(btScalar(-0.723608) , btScalar(0.525725),btScalar(0.447219)),
-	btVector3(btScalar(0.276388) , btScalar(0.850649),btScalar(0.447219)),
-	btVector3(btScalar(0.894426) , btScalar(0.000000),btScalar(0.447216)),
-	btVector3(btScalar(-0.000000) , btScalar(0.000000),btScalar(1.000000)),
-	btVector3(btScalar(0.425323) , btScalar(-0.309011),btScalar(-0.850654)),
-	btVector3(btScalar(-0.162456) , btScalar(-0.499995),btScalar(-0.850654)),
-	btVector3(btScalar(0.262869) , btScalar(-0.809012),btScalar(-0.525738)),
-	btVector3(btScalar(0.425323) , btScalar(0.309011),btScalar(-0.850654)),
-	btVector3(btScalar(0.850648) , btScalar(-0.000000),btScalar(-0.525736)),
-	btVector3(btScalar(-0.525730) , btScalar(-0.000000),btScalar(-0.850652)),
-	btVector3(btScalar(-0.688190) , btScalar(-0.499997),btScalar(-0.525736)),
-	btVector3(btScalar(-0.162456) , btScalar(0.499995),btScalar(-0.850654)),
-	btVector3(btScalar(-0.688190) , btScalar(0.499997),btScalar(-0.525736)),
-	btVector3(btScalar(0.262869) , btScalar(0.809012),btScalar(-0.525738)),
-	btVector3(btScalar(0.951058) , btScalar(0.309013),btScalar(0.000000)),
-	btVector3(btScalar(0.951058) , btScalar(-0.309013),btScalar(0.000000)),
-	btVector3(btScalar(0.587786) , btScalar(-0.809017),btScalar(0.000000)),
-	btVector3(btScalar(0.000000) , btScalar(-1.000000),btScalar(0.000000)),
-	btVector3(btScalar(-0.587786) , btScalar(-0.809017),btScalar(0.000000)),
-	btVector3(btScalar(-0.951058) , btScalar(-0.309013),btScalar(-0.000000)),
-	btVector3(btScalar(-0.951058) , btScalar(0.309013),btScalar(-0.000000)),
-	btVector3(btScalar(-0.587786) , btScalar(0.809017),btScalar(-0.000000)),
-	btVector3(btScalar(-0.000000) , btScalar(1.000000),btScalar(-0.000000)),
-	btVector3(btScalar(0.587786) , btScalar(0.809017),btScalar(-0.000000)),
-	btVector3(btScalar(0.688190) , btScalar(-0.499997),btScalar(0.525736)),
-	btVector3(btScalar(-0.262869) , btScalar(-0.809012),btScalar(0.525738)),
-	btVector3(btScalar(-0.850648) , btScalar(0.000000),btScalar(0.525736)),
-	btVector3(btScalar(-0.262869) , btScalar(0.809012),btScalar(0.525738)),
-	btVector3(btScalar(0.688190) , btScalar(0.499997),btScalar(0.525736)),
-	btVector3(btScalar(0.525730) , btScalar(0.000000),btScalar(0.850652)),
-	btVector3(btScalar(0.162456) , btScalar(-0.499995),btScalar(0.850654)),
-	btVector3(btScalar(-0.425323) , btScalar(-0.309011),btScalar(0.850654)),
-	btVector3(btScalar(-0.425323) , btScalar(0.309011),btScalar(0.850654)),
-	btVector3(btScalar(0.162456) , btScalar(0.499995),btScalar(0.850654))
-};
-
-btShapeHull::btShapeHull (const btConvexShape* shape)
-{
-	m_shape = shape;
-	m_vertices.clear ();
-	m_indices.clear();
-	m_numIndices = 0;
-}
-
-btShapeHull::~btShapeHull ()
-{
-	m_indices.clear();	
-	m_vertices.clear ();
-}
-
-bool
-btShapeHull::buildHull (btScalar /*margin*/)
-{
-	int numSampleDirections = NUM_UNITSPHERE_POINTS;
-	{
-		int numPDA = m_shape->getNumPreferredPenetrationDirections();
-		if (numPDA)
-		{
-			for (int i=0;i<numPDA;i++)
-			{
-				btVector3 norm;
-				m_shape->getPreferredPenetrationDirection(i,norm);
-				btUnitSpherePoints[numSampleDirections] = norm;
-				numSampleDirections++;
-			}
-		}
-	}
-
-	btVector3 supportPoints[NUM_UNITSPHERE_POINTS+MAX_PREFERRED_PENETRATION_DIRECTIONS*2];
-	int i;
-	for (i = 0; i < numSampleDirections; i++)
-	{
-		supportPoints[i] = m_shape->localGetSupportingVertex(btUnitSpherePoints[i]);
-	}
-
-	HullDesc hd;
-	hd.mFlags = QF_TRIANGLES;
-	hd.mVcount = static_cast<unsigned int>(numSampleDirections);
-
-#ifdef BT_USE_DOUBLE_PRECISION
-	hd.mVertices = &supportPoints[0];
-	hd.mVertexStride = sizeof(btVector3);
-#else
-	hd.mVertices = &supportPoints[0];
-	hd.mVertexStride = sizeof (btVector3);
-#endif
-
-	HullLibrary hl;
-	HullResult hr;
-	if (hl.CreateConvexHull (hd, hr) == QE_FAIL)
-	{
-		return false;
-	}
-
-	m_vertices.resize (static_cast<int>(hr.mNumOutputVertices));
-
-
-	for (i = 0; i < static_cast<int>(hr.mNumOutputVertices); i++)
-	{
-		m_vertices[i] = hr.m_OutputVertices[i];
-	}
-	m_numIndices = hr.mNumIndices;
-	m_indices.resize(static_cast<int>(m_numIndices));
-	for (i = 0; i < static_cast<int>(m_numIndices); i++)
-	{
-		m_indices[i] = hr.m_Indices[i];
-	}
-
-	// free temporary hull result that we just copied
-	hl.ReleaseResult (hr);
-
-	return true;
-}
-
-int
-btShapeHull::numTriangles () const
-{
-	return static_cast<int>(m_numIndices / 3);
-}
-
-int
-btShapeHull::numVertices () const
-{
-	return m_vertices.size ();
-}
-
-int
-btShapeHull::numIndices () const
-{
-	return static_cast<int>(m_numIndices);
-}
-
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.h
deleted file mode 100644
index 583c6b99eb6..00000000000
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-btShapeHull implemented by John McCutchan.
-
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2008 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it freely,
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-#ifndef _SHAPE_HULL_H
-#define _SHAPE_HULL_H
-
-#include "LinearMath/btAlignedObjectArray.h"
-#include "BulletCollision/CollisionShapes/btConvexShape.h"
-
-
-///The btShapeHull class takes a btConvexShape, builds a simplified convex hull using btConvexHull and provides triangle indices and vertices.
-///It can be useful for to simplify a complex convex object and for visualization of a non-polyhedral convex object.
-///It approximates the convex hull using the supporting vertex of 42 directions.
-class btShapeHull
-{
-public:
-	btShapeHull (const btConvexShape* shape);
-	~btShapeHull ();
-
-	bool buildHull (btScalar margin);
-
-	int numTriangles () const;
-	int numVertices () const;
-	int numIndices () const;
-
-	const btVector3* getVertexPointer() const
-	{
-		return &m_vertices[0];
-	}
-	const unsigned int* getIndexPointer() const
-	{
-		return &m_indices[0];
-	}
-
-protected:
-	btAlignedObjectArray<btVector3> m_vertices;
-	btAlignedObjectArray<unsigned int> m_indices;
-	unsigned int m_numIndices;
-	const btConvexShape* m_shape;
-};
-
-#endif //_SHAPE_HULL_H
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.cpp
index 15cfe432e27..ca65dd03f3e 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.cpp
@@ -68,7 +68,7 @@ void btSphereShape::getAabb(const btTransform& t,btVector3& aabbMin,btVector3& a
 
 
 
-void	btSphereShape::calculateLocalInertia(btScalar mass,btVector3& inertia) const
+void	btSphereShape::calculateLocalInertia(btScalar mass,btVector3& inertia)
 {
 	btScalar elem = btScalar(0.4) * mass * getMargin()*getMargin();
 	inertia.setValue(elem,elem,elem);
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.h
index 83421d69e0d..66521664087 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btSphereShape.h
@@ -16,17 +16,15 @@ subject to the following restrictions:
 #ifndef SPHERE_MINKOWSKI_H
 #define SPHERE_MINKOWSKI_H
 
-#include "btConvexInternalShape.h"
-#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types
+#include "btConvexShape.h"
+#include "../BroadphaseCollision/btBroadphaseProxy.h" // for the types
 
-///The btSphereShape implements an implicit sphere, centered around a local origin with radius.
-ATTRIBUTE_ALIGNED16(class) btSphereShape : public btConvexInternalShape
+///btSphereShape implements an implicit (getSupportingVertex) Sphere
+ATTRIBUTE_ALIGNED16(class) btSphereShape : public btConvexShape
 
 {
 	
 public:
-	BT_DECLARE_ALIGNED_ALLOCATOR();
-
 	btSphereShape (btScalar radius);
 	
 	
@@ -36,26 +34,26 @@ public:
 	virtual void	batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors,btVector3* supportVerticesOut,int numVectors) const;
 
 
-	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia) const;
+	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia);
 
 	virtual void getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const;
 
 	virtual int	getShapeType() const { return SPHERE_SHAPE_PROXYTYPE; }
 
-	btScalar	getRadius() const { return m_implicitShapeDimensions.getX() * m_localScaling.getX();}
+	btScalar	getRadius() const { return m_implicitShapeDimensions.getX();}
 
 	//debugging
-	virtual const char*	getName()const {return "SPHERE";}
+	virtual char*	getName()const {return "SPHERE";}
 
 	virtual void	setMargin(btScalar margin)
 	{
-		btConvexInternalShape::setMargin(margin);
+		btConvexShape::setMargin(margin);
 	}
 	virtual btScalar	getMargin() const
 	{
 		//to improve gjk behaviour, use radius+margin as the full margin, so never get into the penetration case
 		//this means, non-uniform scaling is not supported anymore
-		return getRadius();
+		return m_localScaling.getX() * getRadius() + btConvexShape::getMargin();
 	}
 
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp
index 3c98ca08ddc..4fbaafa1b93 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.cpp
@@ -19,11 +19,10 @@ subject to the following restrictions:
 
 
 btStaticPlaneShape::btStaticPlaneShape(const btVector3& planeNormal,btScalar planeConstant)
-:m_planeNormal(planeNormal.normalized()),
+:m_planeNormal(planeNormal),
 m_planeConstant(planeConstant),
 m_localScaling(btScalar(0.),btScalar(0.),btScalar(0.))
 {
-	//	btAssert( btFuzzyZero(m_planeNormal.length() - btScalar(1.)) );
 }
 
 
@@ -87,7 +86,7 @@ void	btStaticPlaneShape::processAllTriangles(btTriangleCallback* callback,const
 
 }
 
-void	btStaticPlaneShape::calculateLocalInertia(btScalar mass,btVector3& inertia) const
+void	btStaticPlaneShape::calculateLocalInertia(btScalar mass,btVector3& inertia)
 {
 	(void)mass;
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h
index ddebca73dea..f59cc0c3347 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h
@@ -19,7 +19,8 @@ subject to the following restrictions:
 #include "btConcaveShape.h"
 
 
-///The btStaticPlaneShape simulates an infinite non-moving (static) collision plane.
+///StaticPlaneShape simulates an 'infinite' plane by dynamically reporting triangles approximated by intersection of the plane with the AABB.
+///Assumed is that the other objects is not also infinite, so a reasonable sized AABB.
 class btStaticPlaneShape : public btConcaveShape
 {
 protected:
@@ -45,23 +46,14 @@ public:
 
 	virtual void	processAllTriangles(btTriangleCallback* callback,const btVector3& aabbMin,const btVector3& aabbMax) const;
 
-	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia) const;
+	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia);
 
 	virtual void	setLocalScaling(const btVector3& scaling);
 	virtual const btVector3& getLocalScaling() const;
 	
-	const btVector3&	getPlaneNormal() const
-	{
-		return	m_planeNormal;
-	}
-
-	const btScalar&	getPlaneConstant() const
-	{
-		return	m_planeConstant;
-	}
 
 	//debugging
-	virtual const char*	getName()const {return "STATICPLANE";}
+	virtual char*	getName()const {return "STATICPLANE";}
 
 
 };
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp
index 752a5fc1dfa..03ca1ae7736 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp
@@ -51,7 +51,7 @@ void	btStridingMeshInterface::InternalProcessAllTriangles(btInternalTriangleInde
 			{
 				for (gfxindex=0;gfxindex<numtriangles;gfxindex++)
 				{
-					unsigned int* tri_indices= (unsigned int*)(indexbase+gfxindex*indexstride);
+					int* tri_indices= (int*)(indexbase+gfxindex*indexstride);
 					graphicsbase = (btScalar*)(vertexbase+tri_indices[0]*stride);
 					triangle[0].setValue(graphicsbase[0]*meshScaling.getX(),graphicsbase[1]*meshScaling.getY(),graphicsbase[2]*meshScaling.getZ());
 					graphicsbase = (btScalar*)(vertexbase+tri_indices[1]*stride);
@@ -66,7 +66,7 @@ void	btStridingMeshInterface::InternalProcessAllTriangles(btInternalTriangleInde
 			{
 				for (gfxindex=0;gfxindex<numtriangles;gfxindex++)
 				{
-					unsigned short int* tri_indices= (unsigned short int*)(indexbase+gfxindex*indexstride);
+					short int* tri_indices= (short int*)(indexbase+gfxindex*indexstride);
 					graphicsbase = (btScalar*)(vertexbase+tri_indices[0]*stride);
 					triangle[0].setValue(graphicsbase[0]*meshScaling.getX(),graphicsbase[1]*meshScaling.getY(),graphicsbase[2]*meshScaling.getZ());
 					graphicsbase = (btScalar*)(vertexbase+tri_indices[1]*stride);
@@ -121,4 +121,4 @@ void	btStridingMeshInterface::calculateAabbBruteForce(btVector3& aabbMin,btVecto
 
 	aabbMin = aabbCallback.m_aabbMin;
 	aabbMax = aabbCallback.m_aabbMax;
-}
+}
\ No newline at end of file
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h
index 85020dd3f58..d7b354b7855 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h
@@ -16,7 +16,7 @@ subject to the following restrictions:
 #ifndef STRIDING_MESHINTERFACE_H
 #define STRIDING_MESHINTERFACE_H
 
-#include "LinearMath/btVector3.h"
+#include "../../LinearMath/btVector3.h"
 #include "btTriangleCallback.h"
 
 /// PHY_ScalarType enumerates possible scalar types.
@@ -29,8 +29,7 @@ typedef enum PHY_ScalarType {
 	PHY_FIXEDPOINT88
 } PHY_ScalarType;
 
-///	The btStridingMeshInterface is the interface class for high performance generic access to triangle meshes, used in combination with btBvhTriangleMeshShape and some other collision shapes.
-/// Using index striding of 3*sizeof(integer) it can use triangle arrays, using index striding of 1*sizeof(integer) it can handle triangle strips.
+///	btStridingMeshInterface is the interface class for high performance access to triangle meshes
 /// It allows for sharing graphics and collision meshes. Also it provides locking/unlocking of graphics meshes that are in gpu memory.
 class  btStridingMeshInterface
 {
@@ -48,7 +47,7 @@ class  btStridingMeshInterface
 
 
 
-		virtual void	InternalProcessAllTriangles(btInternalTriangleIndexCallback* callback,const btVector3& aabbMin,const btVector3& aabbMax) const;
+		void	InternalProcessAllTriangles(btInternalTriangleIndexCallback* callback,const btVector3& aabbMin,const btVector3& aabbMax) const;
 
 		///brute force method to calculate aabb
 		void	calculateAabbBruteForce(btVector3& aabbMin,btVector3& aabbMax);
@@ -76,10 +75,6 @@ class  btStridingMeshInterface
 		virtual void	preallocateVertices(int numverts)=0;
 		virtual void	preallocateIndices(int numindices)=0;
 
-		virtual bool	hasPremadeAabb() const { return false; }
-		virtual void	setPremadeAabb(const btVector3& aabbMin, const btVector3& aabbMax ) const {}
-		virtual void	getPremadeAabb(btVector3* aabbMin, btVector3* aabbMax ) const {}
-
 		const btVector3&	getScaling() const {
 			return m_scaling;
 		}
@@ -88,7 +83,6 @@ class  btStridingMeshInterface
 			m_scaling = scaling;
 		}
 
-	
 
 };
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btTetrahedronShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btTetrahedronShape.h
index 09272d61dc2..94bc4ec0fa5 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btTetrahedronShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btTetrahedronShape.h
@@ -18,10 +18,10 @@ subject to the following restrictions:
 
 
 #include "btPolyhedralConvexShape.h"
-#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
+#include "../BroadphaseCollision/btBroadphaseProxy.h"
 
 
-///The btBU_Simplex1to4 implements tetrahedron, triangle, line, vertex collision shapes. In most cases it is better to use btConvexHullShape instead.
+///BU_Simplex1to4 implements feature based and implicit simplex of up to 4 vertices (tetrahedron, triangle, line, vertex).
 class btBU_Simplex1to4 : public btPolyhedralConvexShape
 {
 protected:
@@ -68,7 +68,7 @@ public:
 
 
 	///getName is for debugging
-	virtual const char*	getName()const { return "btBU_Simplex1to4";}
+	virtual  char*	getName()const { return "btBU_Simplex1to4";}
 
 };
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleBuffer.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleBuffer.cpp
index 5194219f256..54864c32f3a 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleBuffer.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleBuffer.cpp
@@ -16,7 +16,14 @@ subject to the following restrictions:
 #include "btTriangleBuffer.h"
 
 
-
+///example usage of this class:
+//			btTriangleBuffer	triBuf;
+//			concaveShape->processAllTriangles(&triBuf,aabbMin, aabbMax);
+//			for (int i=0;i<triBuf.getNumTriangles();i++)
+//			{
+//				const btTriangle& tri = triBuf.getTriangle(i);
+//				//do something useful here with the triangle
+//			}
 
 
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleBuffer.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleBuffer.h
index c739fc11e8f..3805c519d22 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleBuffer.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleBuffer.h
@@ -17,7 +17,7 @@ subject to the following restrictions:
 #define BT_TRIANGLE_BUFFER_H
 
 #include "btTriangleCallback.h"
-#include "LinearMath/btAlignedObjectArray.h"
+#include "../../LinearMath/btAlignedObjectArray.h"
 
 struct	btTriangle
 {
@@ -29,14 +29,6 @@ struct	btTriangle
 };
 
 ///btTriangleBuffer can be useful to collect and store overlapping triangles between AABB and concave objects that support 'processAllTriangles'
-///Example usage of this class:
-///			btTriangleBuffer	triBuf;
-///			concaveShape->processAllTriangles(&triBuf,aabbMin, aabbMax);
-///			for (int i=0;i<triBuf.getNumTriangles();i++)
-///			{
-///				const btTriangle& tri = triBuf.getTriangle(i);
-///				//do something useful here with the triangle
-///			}
 class btTriangleBuffer : public btTriangleCallback
 {
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleCallback.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleCallback.h
index cb760be80ca..fbb87bc4fd8 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleCallback.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleCallback.h
@@ -16,11 +16,9 @@ subject to the following restrictions:
 #ifndef TRIANGLE_CALLBACK_H
 #define TRIANGLE_CALLBACK_H
 
-#include "LinearMath/btVector3.h"
+#include "../../LinearMath/btVector3.h"
 
 
-///The btTriangleCallback provides a callback for each overlapping triangle when calling processAllTriangles.
-///This callback is called by processAllTriangles for all btConcaveShape derived class, such as  btBvhTriangleMeshShape, btStaticPlaneShape and btHeightfieldTerrainShape.
 class btTriangleCallback
 {
 public:
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp
index 8d634a67143..00847861cf1 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp
@@ -4,8 +4,8 @@ Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
 
 This software is provided 'as-is', without any express or implied warranty.
 In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it freely,
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
 subject to the following restrictions:
 
 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
@@ -18,43 +18,34 @@ subject to the following restrictions:
 btTriangleIndexVertexArray::btTriangleIndexVertexArray(int numTriangles,int* triangleIndexBase,int triangleIndexStride,int numVertices,btScalar* vertexBase,int vertexStride)
 {
 	btIndexedMesh mesh;
-
+	
 	mesh.m_numTriangles = numTriangles;
 	mesh.m_triangleIndexBase = (const unsigned char *)triangleIndexBase;
 	mesh.m_triangleIndexStride = triangleIndexStride;
 	mesh.m_numVertices = numVertices;
 	mesh.m_vertexBase = (const unsigned char *)vertexBase;
 	mesh.m_vertexStride = vertexStride;
-
+	
 	addIndexedMesh(mesh);
 
 }
 
-btTriangleIndexVertexArray::~btTriangleIndexVertexArray()
-{
-
-}
-
 void	btTriangleIndexVertexArray::getLockedVertexIndexBase(unsigned char **vertexbase, int& numverts,PHY_ScalarType& type, int& vertexStride,unsigned char **indexbase,int & indexstride,int& numfaces,PHY_ScalarType& indicestype,int subpart)
 {
 	btAssert(subpart< getNumSubParts() );
-
+	
 	btIndexedMesh& mesh = m_indexedMeshes[subpart];
 
 	numverts = mesh.m_numVertices;
 	(*vertexbase) = (unsigned char *) mesh.m_vertexBase;
-	#ifdef BT_USE_DOUBLE_PRECISION
-	type = PHY_DOUBLE;
-	#else
 	type = PHY_FLOAT;
-	#endif
 	vertexStride = mesh.m_vertexStride;
 
 	numfaces = mesh.m_numTriangles;
 
 	(*indexbase) = (unsigned char *)mesh.m_triangleIndexBase;
 	indexstride = mesh.m_triangleIndexStride;
-	indicestype = mesh.m_indexType;
+	indicestype = PHY_INTEGER;
 }
 
 void	btTriangleIndexVertexArray::getLockedReadOnlyVertexIndexBase(const unsigned char **vertexbase, int& numverts,PHY_ScalarType& type, int& vertexStride,const unsigned char **indexbase,int & indexstride,int& numfaces,PHY_ScalarType& indicestype,int subpart) const
@@ -63,34 +54,12 @@ void	btTriangleIndexVertexArray::getLockedReadOnlyVertexIndexBase(const unsigned
 
 	numverts = mesh.m_numVertices;
 	(*vertexbase) = (const unsigned char *)mesh.m_vertexBase;
-	#ifdef BT_USE_DOUBLE_PRECISION
-	type = PHY_DOUBLE;
-	#else
 	type = PHY_FLOAT;
-	#endif
 	vertexStride = mesh.m_vertexStride;
 
 	numfaces = mesh.m_numTriangles;
 	(*indexbase) = (const unsigned char *)mesh.m_triangleIndexBase;
 	indexstride = mesh.m_triangleIndexStride;
-	indicestype = mesh.m_indexType;
-}
-
-bool	btTriangleIndexVertexArray::hasPremadeAabb() const
-{
-	return (m_hasAabb == 1);
-}
-
-void	btTriangleIndexVertexArray::setPremadeAabb(const btVector3& aabbMin, const btVector3& aabbMax )
-{
-	m_aabbMin = aabbMin;
-	m_aabbMax = aabbMax;
-	m_hasAabb = 1; // this is intentionally an int see notes in header
-}
-
-void	btTriangleIndexVertexArray::getPremadeAabb(btVector3* aabbMin, btVector3* aabbMax ) const
-{
-	*aabbMin = m_aabbMin;
-	*aabbMax = m_aabbMax;
+	indicestype = PHY_INTEGER;
 }
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h
index e546675f802..6ab6a762b39 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h
@@ -17,62 +17,48 @@ subject to the following restrictions:
 #define BT_TRIANGLE_INDEX_VERTEX_ARRAY_H
 
 #include "btStridingMeshInterface.h"
-#include "LinearMath/btAlignedObjectArray.h"
-#include "LinearMath/btScalar.h"
+#include "../../LinearMath/btAlignedObjectArray.h"
 
-
-///The btIndexedMesh indexes a single vertex and index array. Multiple btIndexedMesh objects can be passed into a btTriangleIndexVertexArray using addIndexedMesh.
-///Instead of the number of indices, we pass the number of triangles.
+///IndexedMesh indexes into existing vertex and index arrays, in a similar way OpenGL glDrawElements
+///instead of the number of indices, we pass the number of triangles
+///todo: explain with pictures
 ATTRIBUTE_ALIGNED16( struct)	btIndexedMesh
 {
-	BT_DECLARE_ALIGNED_ALLOCATOR();
-
 	int			m_numTriangles;
 	const unsigned char *		m_triangleIndexBase;
 	int			m_triangleIndexStride;
 	int			m_numVertices;
 	const unsigned char *		m_vertexBase;
 	int			m_vertexStride;
-	// The index type is set when adding an indexed mesh to the
-	// btTriangleIndexVertexArray, do not set it manually
-	PHY_ScalarType		m_indexType;
-	int			pad;
+	int			pad[2];
 }
 ;
 
 
 typedef btAlignedObjectArray<btIndexedMesh>	IndexedMeshArray;
 
-///The btTriangleIndexVertexArray allows to access multiple triangle meshes, by indexing into existing triangle/index arrays.
+///TriangleIndexVertexArray allows to use multiple meshes, by indexing into existing triangle/index arrays.
 ///Additional meshes can be added using addIndexedMesh
 ///No duplcate is made of the vertex/index data, it only indexes into external vertex/index arrays.
 ///So keep those arrays around during the lifetime of this btTriangleIndexVertexArray.
 ATTRIBUTE_ALIGNED16( class) btTriangleIndexVertexArray : public btStridingMeshInterface
 {
-protected:
 	IndexedMeshArray	m_indexedMeshes;
-	int m_pad[2];
-	int m_hasAabb; // using int instead of bool to maintain alignment
-	btVector3 m_aabbMin;
-	btVector3 m_aabbMax;
+	int m_pad[3];
 
+		
 public:
 
-	BT_DECLARE_ALIGNED_ALLOCATOR();
-
-	btTriangleIndexVertexArray() : m_hasAabb(0)
+	btTriangleIndexVertexArray()
 	{
 	}
 
-	virtual ~btTriangleIndexVertexArray();
-
 	//just to be backwards compatible
-	btTriangleIndexVertexArray(int numTriangles,int* triangleIndexBase,int triangleIndexStride,int numVertices,btScalar* vertexBase,int vertexStride);
+	btTriangleIndexVertexArray(int numTriangleIndices,int* triangleIndexBase,int triangleIndexStride,int numVertices,btScalar* vertexBase,int vertexStride);
 	
-	void	addIndexedMesh(const btIndexedMesh& mesh, PHY_ScalarType indexType = PHY_INTEGER)
+	void	addIndexedMesh(const btIndexedMesh& mesh)
 	{
 		m_indexedMeshes.push_back(mesh);
-		m_indexedMeshes[m_indexedMeshes.size()-1].m_indexType = indexType;
 	}
 	
 	
@@ -105,10 +91,6 @@ public:
 	virtual void	preallocateVertices(int numverts){(void) numverts;}
 	virtual void	preallocateIndices(int numindices){(void) numindices;}
 
-	virtual bool	hasPremadeAabb() const;
-	virtual void	setPremadeAabb(const btVector3& aabbMin, const btVector3& aabbMax );
-	virtual void	getPremadeAabb(btVector3* aabbMin, btVector3* aabbMax ) const;
-
 }
 ;
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp
deleted file mode 100644
index 492854ff646..00000000000
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it freely,
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-///This file was created by Alex Silverman
-
-#include "btTriangleIndexVertexMaterialArray.h"
-
-btTriangleIndexVertexMaterialArray::btTriangleIndexVertexMaterialArray(int numTriangles,int* triangleIndexBase,int triangleIndexStride,
-                                   int numVertices,btScalar* vertexBase,int vertexStride,
-                                   int numMaterials, unsigned char* materialBase, int materialStride,
-                                   int* triangleMaterialsBase, int materialIndexStride) :
-btTriangleIndexVertexArray(numTriangles, triangleIndexBase, triangleIndexStride, numVertices, vertexBase, vertexStride)
-{
-    btMaterialProperties mat;
-
-    mat.m_numMaterials = numMaterials;
-    mat.m_materialBase = materialBase;
-    mat.m_materialStride = materialStride;
-#ifdef BT_USE_DOUBLE_PRECISION
-    mat.m_materialType = PHY_DOUBLE;
-#else
-    mat.m_materialType = PHY_FLOAT;
-#endif
-
-    mat.m_numTriangles = numTriangles;
-    mat.m_triangleMaterialsBase = (unsigned char *)triangleMaterialsBase;
-    mat.m_triangleMaterialStride = materialIndexStride;
-    mat.m_triangleType = PHY_INTEGER;
-
-    addMaterialProperties(mat);
-}
-
-
-void btTriangleIndexVertexMaterialArray::getLockedMaterialBase(unsigned char **materialBase, int& numMaterials, PHY_ScalarType& materialType, int& materialStride,
-                                   unsigned char ** triangleMaterialBase, int& numTriangles, int& triangleMaterialStride, PHY_ScalarType& triangleType, int subpart)
-{
-    btAssert(subpart< getNumSubParts() );
-
-    btMaterialProperties& mats = m_materials[subpart];
-
-    numMaterials = mats.m_numMaterials;
-    (*materialBase) = (unsigned char *) mats.m_materialBase;
-#ifdef BT_USE_DOUBLE_PRECISION
-    materialType = PHY_DOUBLE;
-#else
-    materialType = PHY_FLOAT;
-#endif
-    materialStride = mats.m_materialStride;
-
-    numTriangles = mats.m_numTriangles;
-    (*triangleMaterialBase) = (unsigned char *)mats.m_triangleMaterialsBase;
-    triangleMaterialStride = mats.m_triangleMaterialStride;
-    triangleType = mats.m_triangleType;
-}
-
-void btTriangleIndexVertexMaterialArray::getLockedReadOnlyMaterialBase(const unsigned char **materialBase, int& numMaterials, PHY_ScalarType& materialType, int& materialStride,
-                                           const unsigned char ** triangleMaterialBase, int& numTriangles, int& triangleMaterialStride, PHY_ScalarType& triangleType, int subpart)
-{
-    btMaterialProperties& mats = m_materials[subpart];
-
-    numMaterials = mats.m_numMaterials;
-    (*materialBase) = (const unsigned char *) mats.m_materialBase;
-#ifdef BT_USE_DOUBLE_PRECISION
-    materialType = PHY_DOUBLE;
-#else
-    materialType = PHY_FLOAT;
-#endif
-    materialStride = mats.m_materialStride;
-
-    numTriangles = mats.m_numTriangles;
-    (*triangleMaterialBase) = (const unsigned char *)mats.m_triangleMaterialsBase;
-    triangleMaterialStride = mats.m_triangleMaterialStride;
-    triangleType = mats.m_triangleType;
-}
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h
deleted file mode 100644
index 69a2e631458..00000000000
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-///This file was created by Alex Silverman
-
-#ifndef BT_MULTIMATERIAL_TRIANGLE_INDEX_VERTEX_ARRAY_H
-#define BT_MULTIMATERIAL_TRIANGLE_INDEX_VERTEX_ARRAY_H
-
-#include "btTriangleIndexVertexArray.h"
-
-
-ATTRIBUTE_ALIGNED16( struct)	btMaterialProperties
-{
-    ///m_materialBase ==========> 2 btScalar values make up one material, friction then restitution
-    int m_numMaterials;
-    const unsigned char * m_materialBase;
-    int m_materialStride;
-    PHY_ScalarType m_materialType;
-    ///m_numTriangles <=========== This exists in the btIndexedMesh object for the same subpart, but since we're
-    ///                           padding the structure, it can be reproduced at no real cost
-    ///m_triangleMaterials =====> 1 integer value makes up one entry
-    ///                           eg: m_triangleMaterials[1] = 5; // This will set triangle 2 to use material 5
-    int m_numTriangles; 
-    const unsigned char * m_triangleMaterialsBase;
-    int m_triangleMaterialStride;
-    ///m_triangleType <========== Automatically set in addMaterialProperties
-    PHY_ScalarType m_triangleType;
-};
-
-typedef btAlignedObjectArray<btMaterialProperties>	MaterialArray;
-
-///Teh btTriangleIndexVertexMaterialArray is built on TriangleIndexVertexArray
-///The addition of a material array allows for the utilization of the partID and
-///triangleIndex that are returned in the ContactAddedCallback.  As with
-///TriangleIndexVertexArray, no duplicate is made of the material data, so it
-///is the users responsibility to maintain the array during the lifetime of the
-///TriangleIndexVertexMaterialArray.
-ATTRIBUTE_ALIGNED16(class) btTriangleIndexVertexMaterialArray : public btTriangleIndexVertexArray
-{
-protected:
-    MaterialArray       m_materials;
-		
-public:
-	BT_DECLARE_ALIGNED_ALLOCATOR();
-
-    btTriangleIndexVertexMaterialArray()
-	{
-	}
-
-    btTriangleIndexVertexMaterialArray(int numTriangles,int* triangleIndexBase,int triangleIndexStride,
-        int numVertices,btScalar* vertexBase,int vertexStride,
-        int numMaterials, unsigned char* materialBase, int materialStride,
-        int* triangleMaterialsBase, int materialIndexStride);
-
-    virtual ~btTriangleIndexVertexMaterialArray() {}
-
-    void	addMaterialProperties(const btMaterialProperties& mat, PHY_ScalarType triangleType = PHY_INTEGER)
-    {
-        m_materials.push_back(mat);
-        m_materials[m_materials.size()-1].m_triangleType = triangleType;
-    }
-
-    virtual void getLockedMaterialBase(unsigned char **materialBase, int& numMaterials, PHY_ScalarType& materialType, int& materialStride,
-        unsigned char ** triangleMaterialBase, int& numTriangles, int& triangleMaterialStride, PHY_ScalarType& triangleType ,int subpart = 0);
-
-    virtual void getLockedReadOnlyMaterialBase(const unsigned char **materialBase, int& numMaterials, PHY_ScalarType& materialType, int& materialStride,
-        const unsigned char ** triangleMaterialBase, int& numTriangles, int& triangleMaterialStride, PHY_ScalarType& triangleType, int subpart = 0);
-
-}
-;
-
-#endif //BT_MULTIMATERIAL_TRIANGLE_INDEX_VERTEX_ARRAY_H
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp
index bcea97052d6..98c54ef45f8 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp
@@ -14,102 +14,47 @@ subject to the following restrictions:
 */
 
 #include "btTriangleMesh.h"
+#include <assert.h>
 
 
-
-btTriangleMesh::btTriangleMesh (bool use32bitIndices,bool use4componentVertices)
-:m_use32bitIndices(use32bitIndices),
-m_use4componentVertices(use4componentVertices)
+btTriangleMesh::btTriangleMesh ()
 {
-	btIndexedMesh meshIndex;
-	meshIndex.m_numTriangles = 0;
-	meshIndex.m_numVertices = 0;
-	meshIndex.m_indexType = PHY_INTEGER;
-	meshIndex.m_triangleIndexBase = 0;
-	meshIndex.m_triangleIndexStride = 3*sizeof(int);
-	meshIndex.m_vertexBase = 0;
-	meshIndex.m_vertexStride = sizeof(btVector3);
-	m_indexedMeshes.push_back(meshIndex);
-
-	if (m_use32bitIndices)
-	{
-		m_indexedMeshes[0].m_numTriangles = m_32bitIndices.size()/3;
-		m_indexedMeshes[0].m_triangleIndexBase = (unsigned char*) &m_32bitIndices[0];
-		m_indexedMeshes[0].m_indexType = PHY_INTEGER;
-		m_indexedMeshes[0].m_triangleIndexStride = 3*sizeof(int);
-	} else
-	{
-		m_indexedMeshes[0].m_numTriangles = m_16bitIndices.size()/3;
-		m_indexedMeshes[0].m_triangleIndexBase = (unsigned char*) &m_16bitIndices[0];
-		m_indexedMeshes[0].m_indexType = PHY_SHORT;
-		m_indexedMeshes[0].m_triangleIndexStride = 3*sizeof(short int);
-	}
-
-	if (m_use4componentVertices)
-	{
-		m_indexedMeshes[0].m_numVertices = m_4componentVertices.size();
-		m_indexedMeshes[0].m_vertexBase = (unsigned char*)&m_4componentVertices[0];
-		m_indexedMeshes[0].m_vertexStride = sizeof(btVector3);
-	} else
-	{
-		m_indexedMeshes[0].m_numVertices = m_3componentVertices.size()/3;
-		m_indexedMeshes[0].m_vertexBase = (unsigned char*)&m_3componentVertices[0];
-		m_indexedMeshes[0].m_vertexStride = 3*sizeof(btScalar);
-	}
-
 
 }
 
-		
-void	btTriangleMesh::addTriangle(const btVector3& vertex0,const btVector3& vertex1,const btVector3& vertex2)
+void	btTriangleMesh::getLockedVertexIndexBase(unsigned char **vertexbase, int& numverts,PHY_ScalarType& type, int& stride,unsigned char **indexbase,int & indexstride,int& numfaces,PHY_ScalarType& indicestype,int subpart)
 {
-	m_indexedMeshes[0].m_numTriangles++;
-	m_indexedMeshes[0].m_numVertices+=3;
+	(void)subpart;
+	numverts = m_vertices.size();
+	*vertexbase = (unsigned char*)&m_vertices[0];
+	type = PHY_FLOAT;
+	stride = sizeof(btVector3);
 
-	if (m_use4componentVertices)
-	{
-		m_4componentVertices.push_back(vertex0);
-		m_4componentVertices.push_back(vertex1);
-		m_4componentVertices.push_back(vertex2);
-		m_indexedMeshes[0].m_vertexBase = (unsigned char*)&m_4componentVertices[0];
-	} else
-	{
-		m_3componentVertices.push_back(vertex0.getX());
-		m_3componentVertices.push_back(vertex0.getY());
-		m_3componentVertices.push_back(vertex0.getZ());
+	numfaces = m_indices.size()/3;
+	*indexbase = (unsigned char*) &m_indices[0];
+	indicestype = PHY_INTEGER;
+	indexstride = 3*sizeof(int);
 
-		m_3componentVertices.push_back(vertex1.getX());
-		m_3componentVertices.push_back(vertex1.getY());
-		m_3componentVertices.push_back(vertex1.getZ());
-
-		m_3componentVertices.push_back(vertex2.getX());
-		m_3componentVertices.push_back(vertex2.getY());
-		m_3componentVertices.push_back(vertex2.getZ());
-		m_indexedMeshes[0].m_vertexBase = (unsigned char*)&m_3componentVertices[0];
-	}
-
-	if (m_use32bitIndices)
-	{
-		int curIndex = m_32bitIndices.size();
-		m_32bitIndices.push_back(curIndex++);
-		m_32bitIndices.push_back(curIndex++);
-		m_32bitIndices.push_back(curIndex++);
-		m_indexedMeshes[0].m_triangleIndexBase = (unsigned char*) &m_32bitIndices[0];
-	} else
-	{
-		short curIndex = static_cast<short>(m_16bitIndices.size());
-		m_16bitIndices.push_back(curIndex++);
-		m_16bitIndices.push_back(curIndex++);
-		m_16bitIndices.push_back(curIndex++);
-		m_indexedMeshes[0].m_triangleIndexBase = (unsigned char*) &m_16bitIndices[0];
-	}
 }
 
-int btTriangleMesh::getNumTriangles() const
+void	btTriangleMesh::getLockedReadOnlyVertexIndexBase(const unsigned char **vertexbase, int& numverts,PHY_ScalarType& type, int& stride,const unsigned char **indexbase,int & indexstride,int& numfaces,PHY_ScalarType& indicestype,int subpart) const
 {
-	if (m_use32bitIndices)
-	{
-		return m_32bitIndices.size() / 3;
-	}
-	return m_16bitIndices.size() / 3;
+	(void)subpart;
+	numverts = m_vertices.size();
+	*vertexbase = (unsigned char*)&m_vertices[0];
+	type = PHY_FLOAT;
+	stride = sizeof(btVector3);
+
+	numfaces = m_indices.size()/3;
+	*indexbase = (unsigned char*) &m_indices[0];
+	indicestype = PHY_INTEGER;
+	indexstride = 3*sizeof(int);
+
+}
+
+
+
+int		btTriangleMesh::getNumSubParts() const
+{
+	return 1;
 }
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.h
index e4d41d5ede0..525f5336b48 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.h
@@ -17,42 +17,54 @@ subject to the following restrictions:
 #ifndef TRIANGLE_MESH_H
 #define TRIANGLE_MESH_H
 
-#include "btTriangleIndexVertexArray.h"
-#include "LinearMath/btVector3.h"
-#include "LinearMath/btAlignedObjectArray.h"
+#include "btStridingMeshInterface.h"
+#include "../../LinearMath/btVector3.h"
+#include "../../LinearMath/btAlignedObjectArray.h"
 
-///The btTriangleMesh class is a convenience class derived from btTriangleIndexVertexArray, that provides storage for a concave triangle mesh. It can be used as data for the btBvhTriangleMeshShape.
-///It allows either 32bit or 16bit indices, and 4 (x-y-z-w) or 3 (x-y-z) component vertices.
-///If you want to share triangle/index data between graphics mesh and collision mesh (btBvhTriangleMeshShape), you can directly use btTriangleIndexVertexArray or derive your own class from btStridingMeshInterface.
-///Performance of btTriangleMesh and btTriangleIndexVertexArray used in a btBvhTriangleMeshShape is the same.
-class btTriangleMesh : public btTriangleIndexVertexArray
+///TriangleMesh provides storage for a concave triangle mesh. It can be used as data for the btTriangleMeshShape.
+class btTriangleMesh : public btStridingMeshInterface
 {
-	btAlignedObjectArray<btVector3>	m_4componentVertices;
-	btAlignedObjectArray<float>		m_3componentVertices;
-
-	btAlignedObjectArray<unsigned int>		m_32bitIndices;
-	btAlignedObjectArray<unsigned short int>		m_16bitIndices;
-	bool	m_use32bitIndices;
-	bool	m_use4componentVertices;
-
+	btAlignedObjectArray<btVector3>	m_vertices;
+	btAlignedObjectArray<int>		m_indices;
 
 	public:
-		btTriangleMesh (bool use32bitIndices=true,bool use4componentVertices=true);
+		btTriangleMesh ();
 
-		bool	getUse32bitIndices() const
+		void	addTriangle(const btVector3& vertex0,const btVector3& vertex1,const btVector3& vertex2)
 		{
-			return m_use32bitIndices;
+			int curIndex = m_indices.size();
+			m_vertices.push_back(vertex0);
+			m_vertices.push_back(vertex1);
+			m_vertices.push_back(vertex2);
+
+			m_indices.push_back(curIndex++);
+			m_indices.push_back(curIndex++);
+			m_indices.push_back(curIndex++);
 		}
 
-		bool	getUse4componentVertices() const
+		int getNumTriangles() const
 		{
-			return m_use4componentVertices;
+			return m_indices.size() / 3;
 		}
-		
-		void	addTriangle(const btVector3& vertex0,const btVector3& vertex1,const btVector3& vertex2);
-		
-		int getNumTriangles() const;
 
+		
+
+//StridingMeshInterface interface implementation
+
+		virtual void	getLockedVertexIndexBase(unsigned char **vertexbase, int& numverts,PHY_ScalarType& type, int& stride,unsigned char **indexbase,int & indexstride,int& numfaces,PHY_ScalarType& indicestype,int subpart=0);
+
+		virtual void	getLockedReadOnlyVertexIndexBase(const unsigned char **vertexbase, int& numverts,PHY_ScalarType& type, int& stride,const unsigned char **indexbase,int & indexstride,int& numfaces,PHY_ScalarType& indicestype,int subpart=0) const;
+
+		/// unLockVertexBase finishes the access to a subpart of the triangle mesh
+		/// make a call to unLockVertexBase when the read and write access (using getLockedVertexIndexBase) is finished
+		virtual void	unLockVertexBase(int subpart) {(void) subpart;}
+
+		virtual void	unLockReadOnlyVertexBase(int subpart) const { (void) subpart;}
+
+		/// getNumSubParts returns the number of seperate subparts
+		/// each subpart has a continuous array of vertices and indices
+		virtual int		getNumSubParts() const;
+		
 		virtual void	preallocateVertices(int numverts){(void) numverts;}
 		virtual void	preallocateIndices(int numindices){(void) numindices;}
 
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp
index cd0a00bbd6f..ed81897b515 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp
@@ -20,18 +20,12 @@ subject to the following restrictions:
 #include "LinearMath/btAabbUtil2.h"
 #include "BulletCollision/CollisionShapes/btCollisionMargin.h"
 
+#include "stdio.h"
 
 btTriangleMeshShape::btTriangleMeshShape(btStridingMeshInterface* meshInterface)
 : m_meshInterface(meshInterface)
 {
-	if(meshInterface->hasPremadeAabb())
-	{
-		meshInterface->getPremadeAabb(&m_localAabbMin, &m_localAabbMax);
-	}
-	else
-	{
-		recalcLocalAabb();
-	}
+	recalcLocalAabb();
 }
 
 
@@ -144,7 +138,6 @@ const btVector3& btTriangleMeshShape::getLocalScaling() const
 //#define DEBUG_TRIANGLE_MESH
 
 
-
 void	btTriangleMeshShape::processAllTriangles(btTriangleCallback* callback,const btVector3& aabbMin,const btVector3& aabbMax) const
 {
 		struct FilteredCallback : public btInternalTriangleIndexCallback
@@ -181,7 +174,8 @@ void	btTriangleMeshShape::processAllTriangles(btTriangleCallback* callback,const
 
 
 
-void	btTriangleMeshShape::calculateLocalInertia(btScalar mass,btVector3& inertia) const
+
+void	btTriangleMeshShape::calculateLocalInertia(btScalar mass,btVector3& inertia)
 {
 	(void)mass;
 	//moving concave objects not supported
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h
index 9fba77cb547..e6173e47640 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h
@@ -20,19 +20,17 @@ subject to the following restrictions:
 #include "btStridingMeshInterface.h"
 
 
-///The btTriangleMeshShape is an internal concave triangle mesh interface. Don't use this class directly, use btBvhTriangleMeshShape instead.
+///Concave triangle mesh. Uses an interface to access the triangles to allow for sharing graphics/physics triangles.
 class btTriangleMeshShape : public btConcaveShape
 {
 protected:
 	btVector3	m_localAabbMin;
 	btVector3	m_localAabbMax;
 	btStridingMeshInterface* m_meshInterface;
-
-	///btTriangleMeshShape constructor has been disabled/protected, so that users will not mistakenly use this class.
-	///Don't use btTriangleMeshShape but use btBvhTriangleMeshShape instead!
-	btTriangleMeshShape(btStridingMeshInterface* meshInterface);
+	
 
 public:
+	btTriangleMeshShape(btStridingMeshInterface* meshInterface);
 
 	virtual ~btTriangleMeshShape();
 
@@ -46,11 +44,16 @@ public:
 
 	void	recalcLocalAabb();
 
+	virtual int	getShapeType() const
+	{
+		return TRIANGLE_MESH_SHAPE_PROXYTYPE;
+	}
+
 	virtual void getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const;
 
 	virtual void	processAllTriangles(btTriangleCallback* callback,const btVector3& aabbMin,const btVector3& aabbMax) const;
 
-	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia) const;
+	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia);
 
 	virtual void	setLocalScaling(const btVector3& scaling);
 	virtual const btVector3& getLocalScaling() const;
@@ -67,7 +70,7 @@ public:
 
 
 	//debugging
-	virtual const char*	getName()const {return "TRIANGLEMESH";}
+	virtual char*	getName()const {return "TRIANGLEMESH";}
 
 
 };
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleShape.h
index ba7aa0c32a0..c2e240c051c 100644
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleShape.h
+++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleShape.h
@@ -27,6 +27,7 @@ public:
 
 	btVector3	m_vertices1[3];
 
+
 	virtual int getNumVertices() const
 	{
 		return 3;
@@ -83,13 +84,14 @@ public:
 
 
 
-    btTriangleShape(const btVector3& p0,const btVector3& p1,const btVector3& p2)
-    {
-        m_vertices1[0] = p0;
-        m_vertices1[1] = p1;
-        m_vertices1[2] = p2;
-    }
+	btTriangleShape(const btVector3& p0,const btVector3& p1,const btVector3& p2)
+	{
+		m_vertices1[0] = p0;
+		m_vertices1[1] = p1;
+		m_vertices1[2] = p2;
+	}
 
+	
 
 	virtual void getPlane(btVector3& planeNormal,btPoint3& planeSupport,int i) const
 	{
@@ -114,7 +116,7 @@ public:
 		planeSupport = m_vertices1[0];
 	}
 
-	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia) const
+	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia)
 	{
 		(void)mass;
 		btAssert(0);
@@ -153,7 +155,7 @@ public:
 		return false;
 	}
 		//debugging
-		virtual const char*	getName()const
+		virtual char*	getName()const
 		{
 			return "Triangle";
 		}
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.cpp b/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.cpp
deleted file mode 100644
index ef340286cb0..00000000000
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2007 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-#include "btUniformScalingShape.h"
-
-btUniformScalingShape::btUniformScalingShape(	btConvexShape* convexChildShape,btScalar uniformScalingFactor):
-m_childConvexShape(convexChildShape),
-m_uniformScalingFactor(uniformScalingFactor)
-{
-}
-	
-btUniformScalingShape::~btUniformScalingShape()
-{
-}
-	
-
-btVector3	btUniformScalingShape::localGetSupportingVertexWithoutMargin(const btVector3& vec)const
-{
-	btVector3 tmpVertex;
-	tmpVertex = m_childConvexShape->localGetSupportingVertexWithoutMargin(vec);
-	return tmpVertex*m_uniformScalingFactor;
-}
-
-void	btUniformScalingShape::batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors,btVector3* supportVerticesOut,int numVectors) const
-{
-	m_childConvexShape->batchedUnitVectorGetSupportingVertexWithoutMargin(vectors,supportVerticesOut,numVectors);
-	int i;
-	for (i=0;i<numVectors;i++)
-	{
-		supportVerticesOut[i] = supportVerticesOut[i] * m_uniformScalingFactor;
-	}
-}
-
-
-btVector3	btUniformScalingShape::localGetSupportingVertex(const btVector3& vec)const
-{
-	btVector3 tmpVertex;
-	tmpVertex = m_childConvexShape->localGetSupportingVertex(vec);
-	return tmpVertex*m_uniformScalingFactor;
-}
-
-
-void	btUniformScalingShape::calculateLocalInertia(btScalar mass,btVector3& inertia) const
-{
-
-	///this linear upscaling is not realistic, but we don't deal with large mass ratios...
-	btVector3 tmpInertia;
-	m_childConvexShape->calculateLocalInertia(mass,tmpInertia);
-	inertia = tmpInertia * m_uniformScalingFactor;
-}
-
-
-	///getAabb's default implementation is brute force, expected derived classes to implement a fast dedicated version
-void btUniformScalingShape::getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const
-{
-	m_childConvexShape->getAabb(t,aabbMin,aabbMax);
-	btVector3 aabbCenter = (aabbMax+aabbMin)*btScalar(0.5);
-	btVector3 scaledAabbHalfExtends = (aabbMax-aabbMin)*btScalar(0.5)*m_uniformScalingFactor;
-
-	aabbMin = aabbCenter - scaledAabbHalfExtends;
-	aabbMax = aabbCenter + scaledAabbHalfExtends;
-
-}
-
-void btUniformScalingShape::getAabbSlow(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const
-{
-	m_childConvexShape->getAabbSlow(t,aabbMin,aabbMax);
-	btVector3 aabbCenter = (aabbMax+aabbMin)*btScalar(0.5);
-	btVector3 scaledAabbHalfExtends = (aabbMax-aabbMin)*btScalar(0.5)*m_uniformScalingFactor;
-
-	aabbMin = aabbCenter - scaledAabbHalfExtends;
-	aabbMax = aabbCenter + scaledAabbHalfExtends;
-}
-
-void	btUniformScalingShape::setLocalScaling(const btVector3& scaling) 
-{
-	m_childConvexShape->setLocalScaling(scaling);
-}
-
-const btVector3& btUniformScalingShape::getLocalScaling() const
-{
-	return m_childConvexShape->getLocalScaling();
-}
-
-void	btUniformScalingShape::setMargin(btScalar margin)
-{
-	m_childConvexShape->setMargin(margin);
-}
-btScalar	btUniformScalingShape::getMargin() const
-{
-	return m_childConvexShape->getMargin() * m_uniformScalingFactor;
-}
-
-int		btUniformScalingShape::getNumPreferredPenetrationDirections() const
-{
-	return m_childConvexShape->getNumPreferredPenetrationDirections();
-}
-	
-void	btUniformScalingShape::getPreferredPenetrationDirection(int index, btVector3& penetrationVector) const
-{
-	m_childConvexShape->getPreferredPenetrationDirection(index,penetrationVector);
-}
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.h
deleted file mode 100644
index 1e17fc8e198..00000000000
--- a/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-#ifndef BT_UNIFORM_SCALING_SHAPE_H
-#define BT_UNIFORM_SCALING_SHAPE_H
-
-#include "btConvexShape.h"
-#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types
-
-///The btUniformScalingShape allows to re-use uniform scaled instances of btConvexShape in a memory efficient way.
-///Istead of using btUniformScalingShape, it is better to use the non-uniform setLocalScaling method on convex shapes that implement it.
-class btUniformScalingShape : public btConvexShape
-{
-	btConvexShape*	m_childConvexShape;
-
-	btScalar	m_uniformScalingFactor;
-	
-	public:
-	
-	btUniformScalingShape(	btConvexShape* convexChildShape, btScalar uniformScalingFactor);
-	
-	virtual ~btUniformScalingShape();
-	
-	virtual btVector3	localGetSupportingVertexWithoutMargin(const btVector3& vec)const;
-
-	virtual btVector3	localGetSupportingVertex(const btVector3& vec)const;
-
-	virtual void	batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors,btVector3* supportVerticesOut,int numVectors) const;
-
-	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia) const;
-
-	btScalar	getUniformScalingFactor() const
-	{
-		return m_uniformScalingFactor;
-	}
-
-	btConvexShape*	getChildShape() 
-	{
-		return m_childConvexShape;
-	}
-
-	const btConvexShape*	getChildShape() const
-	{
-		return m_childConvexShape;
-	}
-
-	virtual const char*	getName()const 
-	{
-		return "UniformScalingShape";
-	}
-	
-	virtual int	getShapeType() const { return UNIFORM_SCALING_SHAPE_PROXYTYPE; }
-
-
-	///////////////////////////
-
-
-	///getAabb's default implementation is brute force, expected derived classes to implement a fast dedicated version
-	void getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const;
-
-	virtual void getAabbSlow(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const;
-
-	virtual void	setLocalScaling(const btVector3& scaling) ;
-	virtual const btVector3& getLocalScaling() const ;
-
-	virtual void	setMargin(btScalar margin);
-	virtual btScalar	getMargin() const;
-
-	virtual int		getNumPreferredPenetrationDirections() const;
-	
-	virtual void	getPreferredPenetrationDirection(int index, btVector3& penetrationVector) const;
-
-
-};
-
-#endif //BT_UNIFORM_SCALING_SHAPE_H
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp
index 6551cfb92fe..2c565734e97 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp
@@ -16,6 +16,7 @@ subject to the following restrictions:
 
 #include "btContinuousConvexCollision.h"
 #include "BulletCollision/CollisionShapes/btConvexShape.h"
+#include "BulletCollision/CollisionShapes/btMinkowskiSumShape.h"
 #include "BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h"
 #include "LinearMath/btTransformUtil.h"
 #include "BulletCollision/CollisionShapes/btSphereShape.h"
@@ -25,7 +26,7 @@ subject to the following restrictions:
 
 
 
-btContinuousConvexCollision::btContinuousConvexCollision ( const btConvexShape*	convexA,const btConvexShape*	convexB,btSimplexSolverInterface* simplexSolver, btConvexPenetrationDepthSolver* penetrationDepthSolver)
+btContinuousConvexCollision::btContinuousConvexCollision ( btConvexShape*	convexA,btConvexShape*	convexB,btSimplexSolverInterface* simplexSolver, btConvexPenetrationDepthSolver* penetrationDepthSolver)
 :m_simplexSolver(simplexSolver),
 m_penetrationDepthSolver(penetrationDepthSolver),
 m_convexA(convexA),m_convexB(convexB)
@@ -34,7 +35,7 @@ m_convexA(convexA),m_convexB(convexB)
 
 /// This maximum should not be necessary. It allows for untested/degenerate cases in production code.
 /// You don't want your game ever to lock-up.
-#define MAX_ITERATIONS 64
+#define MAX_ITERATIONS 1000
 
 bool	btContinuousConvexCollision::calcTimeOfImpact(
 				const btTransform& fromA,
@@ -51,18 +52,10 @@ bool	btContinuousConvexCollision::calcTimeOfImpact(
 	btTransformUtil::calculateVelocity(fromA,toA,btScalar(1.),linVelA,angVelA);
 	btTransformUtil::calculateVelocity(fromB,toB,btScalar(1.),linVelB,angVelB);
 
-
 	btScalar boundingRadiusA = m_convexA->getAngularMotionDisc();
 	btScalar boundingRadiusB = m_convexB->getAngularMotionDisc();
 
 	btScalar maxAngularProjectedVelocity = angVelA.length() * boundingRadiusA + angVelB.length() * boundingRadiusB;
-	btVector3 relLinVel = (linVelB-linVelA);
-
-	btScalar relLinVelocLength = (linVelB-linVelA).length();
-	
-	if ((relLinVelocLength+maxAngularProjectedVelocity) == 0.f)
-		return false;
-
 
 	btScalar radius = btScalar(0.001);
 
@@ -100,7 +93,7 @@ bool	btContinuousConvexCollision::calcTimeOfImpact(
 		btGjkPairDetector::ClosestPointInput input;
 	
 		//we don't use margins during CCD
-	//	gjk.setIgnoreMargin(true);
+		gjk.setIgnoreMargin(true);
 
 		input.m_transformA = fromA;
 		input.m_transformB = fromB;
@@ -115,31 +108,25 @@ bool	btContinuousConvexCollision::calcTimeOfImpact(
 		btScalar dist;
 		dist = pointCollector1.m_distance;
 		n = pointCollector1.m_normalOnBInWorld;
-
-		btScalar projectedLinearVelocity = relLinVel.dot(n);
 		
 		//not close enough
 		while (dist > radius)
 		{
 			numIter++;
 			if (numIter > maxIter)
-			{
 				return false; //todo: report a failure
-			}
-			btScalar dLambda = btScalar(0.);
 
-			projectedLinearVelocity = relLinVel.dot(n);
+			btScalar dLambda = btScalar(0.);
 
 			//calculate safe moving fraction from distance / (linear+rotational velocity)
 			
 			//btScalar clippedDist  = GEN_min(angularConservativeRadius,dist);
 			//btScalar clippedDist  = dist;
 			
+			btScalar projectedLinearVelocity = (linVelB-linVelA).dot(n);
 			
 			dLambda = dist / (projectedLinearVelocity+ maxAngularProjectedVelocity);
 
-			
-			
 			lambda = lambda + dLambda;
 
 			if (lambda > btScalar(1.))
@@ -148,14 +135,9 @@ bool	btContinuousConvexCollision::calcTimeOfImpact(
 			if (lambda < btScalar(0.))
 				return false;
 
-
 			//todo: next check with relative epsilon
 			if (lambda <= lastLambda)
-			{
-				return false;
-				//n.setValue(0,0,0);
 				break;
-			}
 			lastLambda = lambda;
 
 			
@@ -181,13 +163,11 @@ bool	btContinuousConvexCollision::calcTimeOfImpact(
 				{
 					//degenerate ?!
 					result.m_fraction = lastLambda;
-					n = pointCollector.m_normalOnBInWorld;
-					result.m_normal=n;//.setValue(1,1,1);// = n;
-					result.m_hitPoint = pointCollector.m_pointInWorld;
+					result.m_normal = n;
 					return true;
 				}
 				c = pointCollector.m_pointInWorld;		
-				n = pointCollector.m_normalOnBInWorld;
+				
 				dist = pointCollector.m_distance;
 			} else
 			{
@@ -197,13 +177,8 @@ bool	btContinuousConvexCollision::calcTimeOfImpact(
 
 		}
 
-		//don't report time of impact for motion away from the contact normal (or causes minor penetration)
-		if ((projectedLinearVelocity+ maxAngularProjectedVelocity)<=result.m_allowedPenetration)//SIMD_EPSILON)
-			return false;
-
 		result.m_fraction = lambda;
 		result.m_normal = n;
-		result.m_hitPoint = c;
 		return true;
 	}
 
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h
index 28c2b4d6156..9901bab4b45 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h
@@ -30,13 +30,13 @@ class btContinuousConvexCollision : public btConvexCast
 {
 	btSimplexSolverInterface* m_simplexSolver;
 	btConvexPenetrationDepthSolver*	m_penetrationDepthSolver;
-	const btConvexShape*	m_convexA;
-	const btConvexShape*	m_convexB;
+	btConvexShape*	m_convexA;
+	btConvexShape*	m_convexB;
 
 
 public:
 
-	btContinuousConvexCollision (const btConvexShape*	shapeA,const btConvexShape*	shapeB ,btSimplexSolverInterface* simplexSolver,btConvexPenetrationDepthSolver* penetrationDepthSolver);
+	btContinuousConvexCollision (btConvexShape*	shapeA,btConvexShape*	shapeB ,btSimplexSolverInterface* simplexSolver,btConvexPenetrationDepthSolver* penetrationDepthSolver);
 
 	virtual bool	calcTimeOfImpact(
 				const btTransform& fromA,
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexCast.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexCast.h
index 0edf4dcd496..3101b59993d 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexCast.h
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexCast.h
@@ -17,11 +17,11 @@ subject to the following restrictions:
 #ifndef CONVEX_CAST_H
 #define CONVEX_CAST_H
 
-#include "LinearMath/btTransform.h"
-#include "LinearMath/btVector3.h"
-#include "LinearMath/btScalar.h"
+#include "../../LinearMath/btTransform.h"
+#include "../../LinearMath/btVector3.h"
+#include "../../LinearMath/btScalar.h"
 class btMinkowskiSumShape;
-#include "LinearMath/btIDebugDraw.h"
+#include "../../LinearMath/btIDebugDraw.h"
 
 /// btConvexCast is an interface for Casting
 class btConvexCast
@@ -42,21 +42,19 @@ public:
 
 		CastResult()
 			:m_fraction(btScalar(1e30)),
-			m_debugDrawer(0),
-			m_allowedPenetration(btScalar(0))
+			m_debugDrawer(0)
 		{
 		}
 
 
 		virtual ~CastResult() {};
 
+		btVector3	m_normal;
+		btScalar	m_fraction;
 		btTransform	m_hitTransformA;
 		btTransform	m_hitTransformB;
-		btVector3	m_normal;
-		btVector3   m_hitPoint;
-		btScalar	m_fraction; //input and output
+
 		btIDebugDraw* m_debugDrawer;
-		btScalar	m_allowedPenetration;
 
 	};
 
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h
index 99690921317..7caeba4be45 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h
@@ -21,7 +21,7 @@ class btStackAlloc;
 class btVector3;
 #include "btSimplexSolverInterface.h"
 class btConvexShape;
-#include "LinearMath/btPoint3.h"
+#include "../../LinearMath/btPoint3.h"
 class btTransform;
 
 ///ConvexPenetrationDepthSolver provides an interface for penetration depth calculation.
@@ -31,7 +31,7 @@ public:
 	
 	virtual ~btConvexPenetrationDepthSolver() {};
 	virtual bool calcPenDepth( btSimplexSolverInterface& simplexSolver,
-		const btConvexShape* convexA,const btConvexShape* convexB,
+		btConvexShape* convexA,btConvexShape* convexB,
 					const btTransform& transA,const btTransform& transB,
 				btVector3& v, btPoint3& pa, btPoint3& pb,
 				class btIDebugDraw* debugDraw,btStackAlloc* stackAlloc
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h
index db797d5141f..15000c1ab61 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h
@@ -16,8 +16,8 @@ subject to the following restrictions:
 
 #ifndef DISCRETE_COLLISION_DETECTOR1_INTERFACE_H
 #define DISCRETE_COLLISION_DETECTOR1_INTERFACE_H
-#include "LinearMath/btTransform.h"
-#include "LinearMath/btVector3.h"
+#include "../../LinearMath/btTransform.h"
+#include "../../LinearMath/btVector3.h"
 class btStackAlloc;
 
 /// This interface is made to be used by an iterative approach to do TimeOfImpact calculations
@@ -58,7 +58,7 @@ struct btDiscreteCollisionDetectorInterface
 	// give either closest points (distance > 0) or penetration (distance)
 	// the normal always points from B towards A
 	//
-	virtual void	getClosestPoints(const ClosestPointInput& input,Result& output,class btIDebugDraw* debugDraw,bool swapResults=false) = 0;
+	virtual void	getClosestPoints(const ClosestPointInput& input,Result& output,class btIDebugDraw* debugDraw) = 0;
 
 };
 
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp
index bef697a0a11..93edffeafd6 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.cpp
@@ -17,17 +17,12 @@ subject to the following restrictions:
 
 #include "btGjkConvexCast.h"
 #include "BulletCollision/CollisionShapes/btSphereShape.h"
+#include "BulletCollision/CollisionShapes/btMinkowskiSumShape.h"
 #include "btGjkPairDetector.h"
 #include "btPointCollector.h"
-#include "LinearMath/btTransformUtil.h"
 
-#ifdef BT_USE_DOUBLE_PRECISION
-#define MAX_ITERATIONS 64
-#else
-#define MAX_ITERATIONS 32
-#endif
 
-btGjkConvexCast::btGjkConvexCast(const btConvexShape* convexA,const btConvexShape* convexB,btSimplexSolverInterface* simplexSolver)
+btGjkConvexCast::btGjkConvexCast(btConvexShape* convexA,btConvexShape* convexB,btSimplexSolverInterface* simplexSolver)
 :m_simplexSolver(simplexSolver),
 m_convexA(convexA),
 m_convexB(convexB)
@@ -43,113 +38,120 @@ bool	btGjkConvexCast::calcTimeOfImpact(
 {
 
 
-	m_simplexSolver->reset();
+	btMinkowskiSumShape combi(m_convexA,m_convexB);
+	btMinkowskiSumShape* convex = &combi;
 
-	/// compute linear velocity for this interval, to interpolate
-	//assume no rotation/angular velocity, assert here?
-	btVector3 linVelA,linVelB;
-	linVelA = toA.getOrigin()-fromA.getOrigin();
-	linVelB = toB.getOrigin()-fromB.getOrigin();
+	btTransform	rayFromLocalA;
+	btTransform	rayToLocalA;
+
+	rayFromLocalA = fromA.inverse()* fromB;
+	rayToLocalA = toA.inverse()* toB;
+
+
+	btTransform trA,trB;
+	trA = btTransform(fromA);
+	trB = btTransform(fromB);
+	trA.setOrigin(btPoint3(0,0,0));
+	trB.setOrigin(btPoint3(0,0,0));
+
+	convex->setTransformA(trA);
+	convex->setTransformB(trB);
+
+
+
+
+	btScalar radius = btScalar(0.01);
 
-	btScalar radius = btScalar(0.001);
 	btScalar lambda = btScalar(0.);
-	btVector3 v(1,0,0);
-
-	int maxIter = MAX_ITERATIONS;
-
+	btVector3 s = rayFromLocalA.getOrigin();
+	btVector3 r = rayToLocalA.getOrigin()-rayFromLocalA.getOrigin();
+	btVector3 x = s;
 	btVector3 n;
-	n.setValue(btScalar(0.),btScalar(0.),btScalar(0.));
+	n.setValue(0,0,0);
 	bool hasResult = false;
 	btVector3 c;
-	btVector3 r = (linVelA-linVelB);
 
 	btScalar lastLambda = lambda;
-	//btScalar epsilon = btScalar(0.001);
 
-	int numIter = 0;
 	//first solution, using GJK
 
+	//no penetration support for now, perhaps pass a pointer when we really want it
+	btConvexPenetrationDepthSolver* penSolverPtr = 0;
 
 	btTransform identityTrans;
 	identityTrans.setIdentity();
 
+	btSphereShape	raySphere(btScalar(0.0));
+	raySphere.setMargin(btScalar(0.));
 
-//	result.drawCoordSystem(sphereTr);
+	btTransform sphereTr;
+	sphereTr.setIdentity();
+	sphereTr.setOrigin( rayFromLocalA.getOrigin());
 
-	btPointCollector	pointCollector;
+	result.drawCoordSystem(sphereTr);
+	{
+		btPointCollector	pointCollector1;
+		btGjkPairDetector gjk(&raySphere,convex,m_simplexSolver,penSolverPtr);		
 
-		
-	btGjkPairDetector gjk(m_convexA,m_convexB,m_simplexSolver,0);//m_penetrationDepthSolver);		
-	btGjkPairDetector::ClosestPointInput input;
+		btGjkPairDetector::ClosestPointInput input;
+		input.m_transformA = sphereTr;
+		input.m_transformB = identityTrans;
+		gjk.getClosestPoints(input,pointCollector1,0);
 
-	//we don't use margins during CCD
-	//	gjk.setIgnoreMargin(true);
+		hasResult = pointCollector1.m_hasResult;
+		c = pointCollector1.m_pointInWorld;
+		n = pointCollector1.m_normalOnBInWorld;
+	}
 
-	input.m_transformA = fromA;
-	input.m_transformB = fromB;
-	gjk.getClosestPoints(input,pointCollector,0);
-
-	hasResult = pointCollector.m_hasResult;
-	c = pointCollector.m_pointInWorld;
+	
 
 	if (hasResult)
 	{
 		btScalar dist;
-		dist = pointCollector.m_distance;
-		n = pointCollector.m_normalOnBInWorld;
-
-	
+		dist = (c-x).length();
+		if (dist < radius)
+		{
+			//penetration
+			lastLambda = btScalar(1.);
+		}
 
 		//not close enough
 		while (dist > radius)
 		{
-			numIter++;
-			if (numIter > maxIter)
-			{
-				return false; //todo: report a failure
-			}
-			btScalar dLambda = btScalar(0.);
-
-			btScalar projectedLinearVelocity = r.dot(n);
 			
-			dLambda = dist / (projectedLinearVelocity);
+			n = x - c;
+			btScalar nDotr = n.dot(r);
 
-			lambda = lambda - dLambda;
-
-			if (lambda > btScalar(1.))
+			if (nDotr >= -(SIMD_EPSILON*SIMD_EPSILON))
 				return false;
-
-			if (lambda < btScalar(0.))
-				return false;
-
-			//todo: next check with relative epsilon
+			
+			lambda = lambda - n.dot(n) / nDotr;
 			if (lambda <= lastLambda)
-			{
-				return false;
-				//n.setValue(0,0,0);
 				break;
-			}
+
 			lastLambda = lambda;
 
-			//interpolate to next lambda
-			result.DebugDraw( lambda );
-			input.m_transformA.getOrigin().setInterpolate3(fromA.getOrigin(),toA.getOrigin(),lambda);
-			input.m_transformB.getOrigin().setInterpolate3(fromB.getOrigin(),toB.getOrigin(),lambda);
-			
+			x = s + lambda * r;
+
+			sphereTr.setOrigin( x );
+			result.drawCoordSystem(sphereTr);
+			btPointCollector	pointCollector;
+			btGjkPairDetector gjk(&raySphere,convex,m_simplexSolver,penSolverPtr);
+			btGjkPairDetector::ClosestPointInput input;
+			input.m_transformA = sphereTr;
+			input.m_transformB = identityTrans;
 			gjk.getClosestPoints(input,pointCollector,0);
 			if (pointCollector.m_hasResult)
 			{
 				if (pointCollector.m_distance < btScalar(0.))
 				{
+					//degeneracy, report a hit
 					result.m_fraction = lastLambda;
-					n = pointCollector.m_normalOnBInWorld;
-					result.m_normal=n;
-					result.m_hitPoint = pointCollector.m_pointInWorld;
+					result.m_normal = n;
 					return true;
 				}
-				c = pointCollector.m_pointInWorld;		
-				n = pointCollector.m_normalOnBInWorld;
-				dist = pointCollector.m_distance;
+				c = pointCollector.m_pointInWorld;			
+				dist = (c-x).length();
 			} else
 			{
 				//??
@@ -158,19 +160,15 @@ bool	btGjkConvexCast::calcTimeOfImpact(
 
 		}
 
-		//is n normalized?
-		//don't report time of impact for motion away from the contact normal (or causes minor penetration)
-		if (n.dot(r)>=-result.m_allowedPenetration)
-			return false;
-
-		result.m_fraction = lambda;
-		result.m_normal = n;
-		result.m_hitPoint = c;
-		return true;
+		if (lastLambda < btScalar(1.))
+		{
+		
+			result.m_fraction = lastLambda;
+			result.m_normal = n;
+			return true;
+		}
 	}
 
 	return false;
-
-
 }
 
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h
index a977c9e83f7..3905c45e6d6 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h
@@ -18,9 +18,9 @@ subject to the following restrictions:
 #ifndef GJK_CONVEX_CAST_H
 #define GJK_CONVEX_CAST_H
 
-#include "BulletCollision/CollisionShapes/btCollisionMargin.h"
+#include "../CollisionShapes/btCollisionMargin.h"
 
-#include "LinearMath/btVector3.h"
+#include "../../LinearMath/btVector3.h"
 #include "btConvexCast.h"
 class btConvexShape;
 class btMinkowskiSumShape;
@@ -30,12 +30,12 @@ class btMinkowskiSumShape;
 class btGjkConvexCast : public btConvexCast
 {
 	btSimplexSolverInterface*	m_simplexSolver;
-	const btConvexShape*	m_convexA;
-	const btConvexShape*	m_convexB;
+	btConvexShape*	m_convexA;
+	btConvexShape*	m_convexB;
 
 public:
 
-	btGjkConvexCast(const btConvexShape*	convexA,const btConvexShape* convexB,btSimplexSolverInterface* simplexSolver);
+	btGjkConvexCast(btConvexShape*	convexA,btConvexShape* convexB,btSimplexSolverInterface* simplexSolver);
 
 	/// cast a convex against another convex object
 	virtual bool	calcTimeOfImpact(
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa.cpp b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa.cpp
index 36cdeeaefdb..8abdfdbb7e5 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa.cpp
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa.cpp
@@ -26,7 +26,7 @@ Nov.2006
 
 #include "btGjkEpa.h"
 #include <string.h> //for memset
-#include "LinearMath/btStackAlloc.h"
+#include <LinearMath/btStackAlloc.h>
 
 #if defined(DEBUG) || defined (_DEBUG)
 #include <stdio.h> //for debug printf
@@ -580,8 +580,8 @@ using namespace	gjkepa_impl;
 
 
 //
-bool	btGjkEpaSolver::Collide(const btConvexShape *shape0,const btTransform &wtrs0,
-								const btConvexShape *shape1,const btTransform &wtrs1,
+bool	btGjkEpaSolver::Collide(btConvexShape *shape0,const btTransform &wtrs0,
+								btConvexShape *shape1,const btTransform &wtrs1,
 								btScalar	radialmargin,
 								btStackAlloc* stackAlloc,
 								sResults&	results)
@@ -602,13 +602,13 @@ GJK			gjk(stackAlloc,
 				wtrs1.getBasis(),wtrs1.getOrigin(),shape1,
 				radialmargin+EPA_accuracy);
 const Z		collide(gjk.SearchOrigin());
-results.gjk_iterations	=	static_cast<int>(gjk.iterations+1);
+results.gjk_iterations	=	gjk.iterations+1;
 if(collide)
 	{
 	/* Then EPA for penetration depth	*/
 	EPA			epa(&gjk);
 	const F		pd(epa.EvaluatePD());
-	results.epa_iterations	=	static_cast<int>(epa.iterations+1);
+	results.epa_iterations	=	epa.iterations+1;
 	if(pd>0)
 		{
 		results.status			=	sResults::Penetrating;
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa.h
index 1c256f41939..759b30bb17f 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa.h
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa.h
@@ -21,7 +21,7 @@ Nov.2006
 
 #ifndef _05E48D53_04E0_49ad_BB0A_D74FE62E7366_
 #define _05E48D53_04E0_49ad_BB0A_D74FE62E7366_
-#include "BulletCollision/CollisionShapes/btConvexShape.h"
+#include "../CollisionShapes/btConvexShape.h"
 
 class btStackAlloc;
 
@@ -35,7 +35,7 @@ struct	sResults
 		Separated,		/* Shapes doesnt penetrate												*/ 
 		Penetrating,	/* Shapes are penetrating												*/ 
 		GJK_Failed,		/* GJK phase fail, no big issue, shapes are probably just 'touching'	*/ 
-		EPA_Failed		/* EPA phase fail, bigger problem, need to save parameters, and debug	*/ 
+		EPA_Failed,		/* EPA phase fail, bigger problem, need to save parameters, and debug	*/ 
 		}		status;
 	btVector3	witnesses[2];
 	btVector3	normal;
@@ -43,8 +43,8 @@ struct	sResults
 	int	epa_iterations;
 	int	gjk_iterations;
 	};
-static bool	Collide(const btConvexShape* shape0,const btTransform& wtrs0,
-					const btConvexShape* shape1,const btTransform& wtrs1,
+static bool	Collide(btConvexShape* shape0,const btTransform& wtrs0,
+					btConvexShape* shape1,const btTransform& wtrs1,
 					btScalar	radialmargin,
 					btStackAlloc* stackAlloc,
 					sResults&	results);
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp
deleted file mode 100644
index ccfc22ee673..00000000000
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp
+++ /dev/null
@@ -1,943 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2008 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the
-use of this software.
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely,
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-claim that you wrote the original software. If you use this software in a
-product, an acknowledgment in the product documentation would be appreciated
-but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-/*
-GJK-EPA collision solver by Nathanael Presson, 2008
-*/
-#include "BulletCollision/CollisionShapes/btConvexInternalShape.h"
-#include "BulletCollision/CollisionShapes/btSphereShape.h"
-#include "btGjkEpa2.h"
-
-#if defined(DEBUG) || defined (_DEBUG)
-#include <stdio.h> //for debug printf
-#ifdef __SPU__
-#include <spu_printf.h>
-#define printf spu_printf
-#endif //__SPU__
-#endif
-
-namespace gjkepa2_impl
-{
-
-// Config
-
-	/* GJK	*/ 
-#define GJK_MAX_ITERATIONS	128
-#define GJK_ACCURARY		((btScalar)0.0001)
-#define GJK_MIN_DISTANCE	((btScalar)0.0001)
-#define GJK_DUPLICATED_EPS	((btScalar)0.0001)
-#define GJK_SIMPLEX2_EPS	((btScalar)0.0)
-#define GJK_SIMPLEX3_EPS	((btScalar)0.0)
-#define GJK_SIMPLEX4_EPS	((btScalar)0.0)
-
-	/* EPA	*/ 
-#define EPA_MAX_VERTICES	64
-#define EPA_MAX_FACES		(EPA_MAX_VERTICES*2)
-#define EPA_MAX_ITERATIONS	255
-#define EPA_ACCURACY		((btScalar)0.0001)
-#define EPA_FALLBACK		(10*EPA_ACCURACY)
-#define EPA_PLANE_EPS		((btScalar)0.00001)
-#define EPA_INSIDE_EPS		((btScalar)0.01)
-
-
-// Shorthands
-typedef unsigned int	U;
-typedef unsigned char	U1;
-
-// MinkowskiDiff
-struct	MinkowskiDiff
-	{
-	const btConvexShape*	m_shapes[2];
-	btMatrix3x3				m_toshape1;
-	btTransform				m_toshape0;
-	btVector3				(btConvexShape::*Ls)(const btVector3&) const;
-	void					EnableMargin(bool enable)
-		{
-		if(enable)
-			Ls=&btConvexShape::localGetSupportingVertex;
-			else
-			Ls=&btConvexShape::localGetSupportingVertexWithoutMargin;
-		}	
-	inline btVector3		Support0(const btVector3& d) const
-		{
-		return(((m_shapes[0])->*(Ls))(d));
-		}
-	inline btVector3		Support1(const btVector3& d) const
-		{
-		return(m_toshape0*((m_shapes[1])->*(Ls))(m_toshape1*d));
-		}
-	inline btVector3		Support(const btVector3& d) const
-		{
-		return(Support0(d)-Support1(-d));
-		}
-	btVector3				Support(const btVector3& d,U index) const
-		{
-		if(index)
-			return(Support1(d));
-			else
-			return(Support0(d));
-		}
-	};
-
-typedef	MinkowskiDiff	tShape;
-
-
-// GJK
-struct	GJK
-{
-/* Types		*/ 
-struct	sSV
-	{
-	btVector3	d,w;
-	};
-struct	sSimplex
-	{
-	sSV*		c[4];
-	btScalar	p[4];
-	U			rank;
-	};
-struct	eStatus	{ enum _ {
-	Valid,
-	Inside,
-	Failed		};};
-/* Fields		*/ 
-tShape			m_shape;
-btVector3		m_ray;
-btScalar		m_distance;
-sSimplex		m_simplices[2];
-sSV				m_store[4];
-sSV*			m_free[4];
-U				m_nfree;
-U				m_current;
-sSimplex*		m_simplex;
-eStatus::_		m_status;
-/* Methods		*/ 
-					GJK()
-	{
-	Initialize();
-	}
-void				Initialize()
-	{
-	m_ray		=	btVector3(0,0,0);
-	m_nfree		=	0;
-	m_status	=	eStatus::Failed;
-	m_current	=	0;
-	m_distance	=	0;
-	}
-eStatus::_			Evaluate(const tShape& shapearg,const btVector3& guess)
-	{
-	U			iterations=0;
-	btScalar	sqdist=0;
-	btScalar	alpha=0;
-	btVector3	lastw[4];
-	U			clastw=0;
-	/* Initialize solver		*/ 
-	m_free[0]			=	&m_store[0];
-	m_free[1]			=	&m_store[1];
-	m_free[2]			=	&m_store[2];
-	m_free[3]			=	&m_store[3];
-	m_nfree				=	4;
-	m_current			=	0;
-	m_status			=	eStatus::Valid;
-	m_shape				=	shapearg;
-	m_distance			=	0;
-	/* Initialize simplex		*/ 
-	m_simplices[0].rank	=	0;
-	m_ray				=	guess;
-	const btScalar	sqrl=	m_ray.length2();
-	appendvertice(m_simplices[0],sqrl>0?-m_ray:btVector3(1,0,0));
-	m_simplices[0].p[0]	=	1;
-	m_ray				=	m_simplices[0].c[0]->w;	
-	sqdist				=	sqrl;
-	lastw[0]			=
-	lastw[1]			=
-	lastw[2]			=
-	lastw[3]			=	m_ray;
-	/* Loop						*/ 
-	do	{
-		const U		next=1-m_current;
-		sSimplex&	cs=m_simplices[m_current];
-		sSimplex&	ns=m_simplices[next];
-		/* Check zero							*/ 
-		const btScalar	rl=m_ray.length();
-		if(rl<GJK_MIN_DISTANCE)
-			{/* Touching or inside				*/ 
-			m_status=eStatus::Inside;
-			break;
-			}
-		/* Append new vertice in -'v' direction	*/ 
-		appendvertice(cs,-m_ray);
-		const btVector3&	w=cs.c[cs.rank-1]->w;
-		bool				found=false;
-		for(U i=0;i<4;++i)
-			{
-			if((w-lastw[i]).length2()<GJK_DUPLICATED_EPS)
-				{ found=true;break; }
-			}
-		if(found)
-			{/* Return old simplex				*/ 
-			removevertice(m_simplices[m_current]);
-			break;
-			}
-			else
-			{/* Update lastw					*/ 
-			lastw[clastw=(clastw+1)&3]=w;
-			}
-		/* Check for termination				*/ 
-		const btScalar	omega=dot(m_ray,w)/rl;
-		alpha=btMax(omega,alpha);
-		if(((rl-alpha)-(GJK_ACCURARY*rl))<=0)
-			{/* Return old simplex				*/ 
-			removevertice(m_simplices[m_current]);
-			break;
-			}		
-		/* Reduce simplex						*/ 
-		btScalar	weights[4];
-		U			mask=0;
-		switch(cs.rank)
-			{
-			case	2:	sqdist=projectorigin(	cs.c[0]->w,
-												cs.c[1]->w,
-												weights,mask);break;
-			case	3:	sqdist=projectorigin(	cs.c[0]->w,
-												cs.c[1]->w,
-												cs.c[2]->w,
-												weights,mask);break;
-			case	4:	sqdist=projectorigin(	cs.c[0]->w,
-												cs.c[1]->w,
-												cs.c[2]->w,
-												cs.c[3]->w,
-												weights,mask);break;
-			}
-		if(sqdist>=0)
-			{/* Valid	*/ 
-			ns.rank		=	0;
-			m_ray		=	btVector3(0,0,0);
-			m_current	=	next;
-			for(U i=0,ni=cs.rank;i<ni;++i)
-				{
-				if(mask&(1<<i))
-					{
-					ns.c[ns.rank]		=	cs.c[i];
-					ns.p[ns.rank++]		=	weights[i];
-					m_ray				+=	cs.c[i]->w*weights[i];
-					}
-					else
-					{
-					m_free[m_nfree++]	=	cs.c[i];
-					}
-				}
-			if(mask==15) m_status=eStatus::Inside;
-			}
-			else
-			{/* Return old simplex				*/ 
-			removevertice(m_simplices[m_current]);
-			break;
-			}
-		m_status=((++iterations)<GJK_MAX_ITERATIONS)?m_status:eStatus::Failed;
-		} while(m_status==eStatus::Valid);
-	m_simplex=&m_simplices[m_current];
-	switch(m_status)
-		{
-		case	eStatus::Valid:		m_distance=m_ray.length();break;
-		case	eStatus::Inside:	m_distance=0;break;
-		}	
-	return(m_status);
-	}
-bool					EncloseOrigin()
-	{
-	switch(m_simplex->rank)
-		{
-		case	1:
-			{
-			for(U i=0;i<3;++i)
-				{
-				btVector3		axis=btVector3(0,0,0);
-				axis[i]=1;
-				appendvertice(*m_simplex, axis);
-				if(EncloseOrigin())	return(true);
-				removevertice(*m_simplex);
-				appendvertice(*m_simplex,-axis);
-				if(EncloseOrigin())	return(true);
-				removevertice(*m_simplex);
-				}
-			}
-		break;
-		case	2:
-			{
-			const btVector3	d=m_simplex->c[1]->w-m_simplex->c[0]->w;
-			for(U i=0;i<3;++i)
-				{
-				btVector3		axis=btVector3(0,0,0);
-				axis[i]=1;
-				const btVector3	p=cross(d,axis);
-				if(p.length2()>0)
-					{
-					appendvertice(*m_simplex, p);
-					if(EncloseOrigin())	return(true);
-					removevertice(*m_simplex);
-					appendvertice(*m_simplex,-p);
-					if(EncloseOrigin())	return(true);
-					removevertice(*m_simplex);
-					}
-				}
-			}
-		break;
-		case	3:
-			{
-			const btVector3	n=cross(m_simplex->c[1]->w-m_simplex->c[0]->w,
-									m_simplex->c[2]->w-m_simplex->c[0]->w);
-			if(n.length2()>0)
-				{
-				appendvertice(*m_simplex,n);
-				if(EncloseOrigin())	return(true);
-				removevertice(*m_simplex);
-				appendvertice(*m_simplex,-n);
-				if(EncloseOrigin())	return(true);
-				removevertice(*m_simplex);
-				}
-			}
-		break;
-		case	4:
-			{
-			if(btFabs(det(	m_simplex->c[0]->w-m_simplex->c[3]->w,
-							m_simplex->c[1]->w-m_simplex->c[3]->w,
-							m_simplex->c[2]->w-m_simplex->c[3]->w))>0)
-				return(true);
-			}
-		break;
-		}
-	return(false);
-	}
-/* Internals	*/ 
-void				getsupport(const btVector3& d,sSV& sv) const
-	{
-	sv.d	=	d/d.length();
-	sv.w	=	m_shape.Support(sv.d);
-	}
-void				removevertice(sSimplex& simplex)
-	{
-	m_free[m_nfree++]=simplex.c[--simplex.rank];
-	}
-void				appendvertice(sSimplex& simplex,const btVector3& v)
-	{
-	simplex.p[simplex.rank]=0;
-	simplex.c[simplex.rank]=m_free[--m_nfree];
-	getsupport(v,*simplex.c[simplex.rank++]);
-	}
-static btScalar		det(const btVector3& a,const btVector3& b,const btVector3& c)
-	{
-	return(	a.y()*b.z()*c.x()+a.z()*b.x()*c.y()-
-			a.x()*b.z()*c.y()-a.y()*b.x()*c.z()+
-			a.x()*b.y()*c.z()-a.z()*b.y()*c.x());
-	}
-static btScalar		projectorigin(	const btVector3& a,
-									const btVector3& b,
-									btScalar* w,U& m)
-	{
-	const btVector3	d=b-a;
-	const btScalar	l=d.length2();
-	if(l>GJK_SIMPLEX2_EPS)
-		{
-		const btScalar	t(l>0?-dot(a,d)/l:0);
-		if(t>=1)		{ w[0]=0;w[1]=1;m=2;return(b.length2()); }
-		else if(t<=0)	{ w[0]=1;w[1]=0;m=1;return(a.length2()); }
-		else			{ w[0]=1-(w[1]=t);m=3;return((a+d*t).length2()); }
-		}
-	return(-1);
-	}
-static btScalar		projectorigin(	const btVector3& a,
-									const btVector3& b,
-									const btVector3& c,
-									btScalar* w,U& m)
-	{
-	static const U		imd3[]={1,2,0};
-	const btVector3*	vt[]={&a,&b,&c};
-	const btVector3		dl[]={a-b,b-c,c-a};
-	const btVector3		n=cross(dl[0],dl[1]);
-	const btScalar		l=n.length2();
-	if(l>GJK_SIMPLEX3_EPS)
-		{
-		btScalar	mindist=-1;
-		btScalar	subw[2];
-		U			subm;
-		for(U i=0;i<3;++i)
-			{
-			if(dot(*vt[i],cross(dl[i],n))>0)
-				{
-				const U			j=imd3[i];
-				const btScalar	subd(projectorigin(*vt[i],*vt[j],subw,subm));
-				if((mindist<0)||(subd<mindist))
-					{
-					mindist		=	subd;
-					m			=	static_cast<U>(((subm&1)?1<<i:0)+((subm&2)?1<<j:0));
-					w[i]		=	subw[0];
-					w[j]		=	subw[1];
-					w[imd3[j]]	=	0;				
-					}
-				}
-			}
-		if(mindist<0)
-			{
-			const btScalar	d=dot(a,n);	
-			const btScalar	s=btSqrt(l);
-			const btVector3	p=n*(d/l);
-			mindist	=	p.length2();
-			m		=	7;
-			w[0]	=	(cross(dl[1],b-p)).length()/s;
-			w[1]	=	(cross(dl[2],c-p)).length()/s;
-			w[2]	=	1-(w[0]+w[1]);
-			}
-		return(mindist);
-		}
-	return(-1);
-	}
-static btScalar		projectorigin(	const btVector3& a,
-									const btVector3& b,
-									const btVector3& c,
-									const btVector3& d,
-									btScalar* w,U& m)
-	{
-	static const U		imd3[]={1,2,0};
-	const btVector3*	vt[]={&a,&b,&c,&d};
-	const btVector3		dl[]={a-d,b-d,c-d};
-	const btScalar		vl=det(dl[0],dl[1],dl[2]);
-	const bool			ng=(vl*dot(a,cross(b-c,a-b)))<=0;
-	if(ng&&(btFabs(vl)>GJK_SIMPLEX4_EPS))
-		{
-		btScalar	mindist=-1;
-		btScalar	subw[3];
-		U			subm;
-		for(U i=0;i<3;++i)
-			{
-			const U			j=imd3[i];
-			const btScalar	s=vl*dot(d,cross(dl[i],dl[j]));
-			if(s>0)
-				{
-				const btScalar	subd=projectorigin(*vt[i],*vt[j],d,subw,subm);
-				if((mindist<0)||(subd<mindist))
-					{
-					mindist		=	subd;
-					m			=	static_cast<U>((subm&1?1<<i:0)+
-									(subm&2?1<<j:0)+
-									(subm&4?8:0));
-					w[i]		=	subw[0];
-					w[j]		=	subw[1];
-					w[imd3[j]]	=	0;
-					w[3]		=	subw[2];
-					}
-				}
-			}
-		if(mindist<0)
-			{
-			mindist	=	0;
-			m		=	15;
-			w[0]	=	det(c,b,d)/vl;
-			w[1]	=	det(a,c,d)/vl;
-			w[2]	=	det(b,a,d)/vl;
-			w[3]	=	1-(w[0]+w[1]+w[2]);
-			}
-		return(mindist);
-		}
-	return(-1);
-	}
-};
-
-// EPA
-struct	EPA
-{
-/* Types		*/ 
-typedef	GJK::sSV	sSV;
-struct	sFace
-	{
-	btVector3	n;
-	btScalar	d;
-	btScalar	p;
-	sSV*		c[3];
-	sFace*		f[3];
-	sFace*		l[2];
-	U1			e[3];
-	U1			pass;
-	};
-struct	sList
-	{
-	sFace*		root;
-	U			count;
-				sList() : root(0),count(0)	{}
-	};
-struct	sHorizon
-	{
-	sFace*		cf;
-	sFace*		ff;
-	U			nf;
-				sHorizon() : cf(0),ff(0),nf(0)	{}
-	};
-struct	eStatus { enum _ {
-	Valid,
-	Touching,
-	Degenerated,
-	NonConvex,
-	InvalidHull,		
-	OutOfFaces,
-	OutOfVertices,
-	AccuraryReached,
-	FallBack,
-	Failed		};};
-/* Fields		*/ 
-eStatus::_		m_status;
-GJK::sSimplex	m_result;
-btVector3		m_normal;
-btScalar		m_depth;
-sSV				m_sv_store[EPA_MAX_VERTICES];
-sFace			m_fc_store[EPA_MAX_FACES];
-U				m_nextsv;
-sList			m_hull;
-sList			m_stock;
-/* Methods		*/ 
-					EPA()
-	{
-	Initialize();	
-	}
-
-
-					static inline void		bind(sFace* fa,U ea,sFace* fb,U eb)
-	{
-	fa->e[ea]=(U1)eb;fa->f[ea]=fb;
-	fb->e[eb]=(U1)ea;fb->f[eb]=fa;
-	}
-static inline void		append(sList& list,sFace* face)
-	{
-	face->l[0]	=	0;
-	face->l[1]	=	list.root;
-	if(list.root) list.root->l[0]=face;
-	list.root	=	face;
-	++list.count;
-	}
-static inline void		remove(sList& list,sFace* face)
-	{
-	if(face->l[1]) face->l[1]->l[0]=face->l[0];
-	if(face->l[0]) face->l[0]->l[1]=face->l[1];
-	if(face==list.root) list.root=face->l[1];
-	--list.count;
-	}
-
-
-void				Initialize()
-	{
-	m_status	=	eStatus::Failed;
-	m_normal	=	btVector3(0,0,0);
-	m_depth		=	0;
-	m_nextsv	=	0;
-	for(U i=0;i<EPA_MAX_FACES;++i)
-		{
-		append(m_stock,&m_fc_store[EPA_MAX_FACES-i-1]);
-		}
-	}
-eStatus::_			Evaluate(GJK& gjk,const btVector3& guess)
-	{
-	GJK::sSimplex&	simplex=*gjk.m_simplex;
-	if((simplex.rank>1)&&gjk.EncloseOrigin())
-		{
-
-		/* Clean up				*/ 
-		while(m_hull.root)
-			{
-			sFace*	f = m_hull.root;
-			remove(m_hull,f);
-			append(m_stock,f);
-			}
-		m_status	=	eStatus::Valid;
-		m_nextsv	=	0;
-		/* Orient simplex		*/ 
-		if(gjk.det(	simplex.c[0]->w-simplex.c[3]->w,
-					simplex.c[1]->w-simplex.c[3]->w,
-					simplex.c[2]->w-simplex.c[3]->w)<0)
-			{
-			btSwap(simplex.c[0],simplex.c[1]);
-			btSwap(simplex.p[0],simplex.p[1]);
-			}
-		/* Build initial hull	*/ 
-		sFace*	tetra[]={newface(simplex.c[0],simplex.c[1],simplex.c[2],true),
-						newface(simplex.c[1],simplex.c[0],simplex.c[3],true),
-						newface(simplex.c[2],simplex.c[1],simplex.c[3],true),
-						newface(simplex.c[0],simplex.c[2],simplex.c[3],true)};
-		if(m_hull.count==4)
-			{
-			sFace*		best=findbest();
-			sFace		outer=*best;
-			U			pass=0;
-			U			iterations=0;
-			bind(tetra[0],0,tetra[1],0);
-			bind(tetra[0],1,tetra[2],0);
-			bind(tetra[0],2,tetra[3],0);
-			bind(tetra[1],1,tetra[3],2);
-			bind(tetra[1],2,tetra[2],1);
-			bind(tetra[2],2,tetra[3],1);
-			m_status=eStatus::Valid;
-			for(;iterations<EPA_MAX_ITERATIONS;++iterations)
-				{
-				if(m_nextsv<EPA_MAX_VERTICES)
-					{	
-					sHorizon		horizon;
-					sSV*			w=&m_sv_store[m_nextsv++];
-					bool			valid=true;					
-					best->pass	=	(U1)(++pass);
-					gjk.getsupport(best->n,*w);
-					const btScalar	wdist=dot(best->n,w->w)-best->d;
-					if(wdist>EPA_ACCURACY)
-						{
-						for(U j=0;(j<3)&&valid;++j)
-							{
-							valid&=expand(	pass,w,
-											best->f[j],best->e[j],
-											horizon);
-							}
-						if(valid&&(horizon.nf>=3))
-							{
-							bind(horizon.cf,1,horizon.ff,2);
-							remove(m_hull,best);
-							append(m_stock,best);
-							best=findbest();
-							if(best->p>=outer.p) outer=*best;
-							} else { m_status=eStatus::InvalidHull;break; }
-						} else { m_status=eStatus::AccuraryReached;break; }
-					} else { m_status=eStatus::OutOfVertices;break; }
-				}
-			const btVector3	projection=outer.n*outer.d;
-			m_normal	=	outer.n;
-			m_depth		=	outer.d;
-			m_result.rank	=	3;
-			m_result.c[0]	=	outer.c[0];
-			m_result.c[1]	=	outer.c[1];
-			m_result.c[2]	=	outer.c[2];
-			m_result.p[0]	=	cross(	outer.c[1]->w-projection,
-										outer.c[2]->w-projection).length();
-			m_result.p[1]	=	cross(	outer.c[2]->w-projection,
-										outer.c[0]->w-projection).length();
-			m_result.p[2]	=	cross(	outer.c[0]->w-projection,
-										outer.c[1]->w-projection).length();
-			const btScalar	sum=m_result.p[0]+m_result.p[1]+m_result.p[2];
-			m_result.p[0]	/=	sum;
-			m_result.p[1]	/=	sum;
-			m_result.p[2]	/=	sum;
-			return(m_status);
-			}
-		}
-	/* Fallback		*/ 
-	m_status	=	eStatus::FallBack;
-	m_normal	=	-guess;
-	const btScalar	nl=m_normal.length();
-	if(nl>0)
-		m_normal	=	m_normal/nl;
-		else
-		m_normal	=	btVector3(1,0,0);
-	m_depth	=	0;
-	m_result.rank=1;
-	m_result.c[0]=simplex.c[0];
-	m_result.p[0]=1;	
-	return(m_status);
-	}
-sFace*				newface(sSV* a,sSV* b,sSV* c,bool forced)
-	{
-	if(m_stock.root)
-		{
-		sFace*	face=m_stock.root;
-		remove(m_stock,face);
-		append(m_hull,face);
-		face->pass	=	0;
-		face->c[0]	=	a;
-		face->c[1]	=	b;
-		face->c[2]	=	c;
-		face->n		=	cross(b->w-a->w,c->w-a->w);
-		const btScalar	l=face->n.length();
-		const bool		v=l>EPA_ACCURACY;
-		face->p		=	btMin(btMin(
-							dot(a->w,cross(face->n,a->w-b->w)),
-							dot(b->w,cross(face->n,b->w-c->w))),
-							dot(c->w,cross(face->n,c->w-a->w)))	/
-							(v?l:1);
-		face->p		=	face->p>=-EPA_INSIDE_EPS?0:face->p;
-		if(v)
-			{
-			face->d		=	dot(a->w,face->n)/l;
-			face->n		/=	l;
-			if(forced||(face->d>=-EPA_PLANE_EPS))
-				{
-				return(face);
-				} else m_status=eStatus::NonConvex;
-			} else m_status=eStatus::Degenerated;
-		remove(m_hull,face);
-		append(m_stock,face);
-		return(0);
-		}
-	m_status=m_stock.root?eStatus::OutOfVertices:eStatus::OutOfFaces;
-	return(0);
-	}
-sFace*				findbest()
-	{
-	sFace*		minf=m_hull.root;
-	btScalar	mind=minf->d*minf->d;
-	btScalar	maxp=minf->p;
-	for(sFace* f=minf->l[1];f;f=f->l[1])
-		{
-		const btScalar	sqd=f->d*f->d;
-		if((f->p>=maxp)&&(sqd<mind))
-			{
-			minf=f;
-			mind=sqd;
-			maxp=f->p;
-			}
-		}
-	return(minf);
-	}
-bool				expand(U pass,sSV* w,sFace* f,U e,sHorizon& horizon)
-	{
-	static const U	i1m3[]={1,2,0};
-	static const U	i2m3[]={2,0,1};
-	if(f->pass!=pass)
-		{
-		const U	e1=i1m3[e];
-		if((dot(f->n,w->w)-f->d)<-EPA_PLANE_EPS)
-			{
-			sFace*	nf=newface(f->c[e1],f->c[e],w,false);
-			if(nf)
-				{
-				bind(nf,0,f,e);
-				if(horizon.cf) bind(horizon.cf,1,nf,2); else horizon.ff=nf;
-				horizon.cf=nf;
-				++horizon.nf;
-				return(true);
-				}
-			}
-			else
-			{
-			const U	e2=i2m3[e];
-			f->pass		=	(U1)pass;
-			if(	expand(pass,w,f->f[e1],f->e[e1],horizon)&&
-				expand(pass,w,f->f[e2],f->e[e2],horizon))
-				{
-				remove(m_hull,f);
-				append(m_stock,f);
-				return(true);
-				}
-			}
-		}
-	return(false);
-	}
-
-};
-
-//
-static void	Initialize(	const btConvexShape* shape0,const btTransform& wtrs0,
-						const btConvexShape* shape1,const btTransform& wtrs1,
-						btGjkEpaSolver2::sResults& results,
-						tShape& shape,
-						bool withmargins)
-{
-/* Results		*/ 
-results.witnesses[0]	=
-results.witnesses[1]	=	btVector3(0,0,0);
-results.status			=	btGjkEpaSolver2::sResults::Separated;
-/* Shape		*/ 
-shape.m_shapes[0]		=	shape0;
-shape.m_shapes[1]		=	shape1;
-shape.m_toshape1		=	wtrs1.getBasis().transposeTimes(wtrs0.getBasis());
-shape.m_toshape0		=	wtrs0.inverseTimes(wtrs1);
-shape.EnableMargin(withmargins);
-}
-
-}
-
-//
-// Api
-//
-
-using namespace	gjkepa2_impl;
-
-//
-int			btGjkEpaSolver2::StackSizeRequirement()
-{
-return(sizeof(GJK)+sizeof(EPA));
-}
-
-//
-bool		btGjkEpaSolver2::Distance(	const btConvexShape*	shape0,
-										const btTransform&		wtrs0,
-										const btConvexShape*	shape1,
-										const btTransform&		wtrs1,
-										const btVector3&		guess,
-										sResults&				results)
-{
-tShape			shape;
-Initialize(shape0,wtrs0,shape1,wtrs1,results,shape,false);
-GJK				gjk;
-GJK::eStatus::_	gjk_status=gjk.Evaluate(shape,guess);
-if(gjk_status==GJK::eStatus::Valid)
-	{
-	btVector3	w0=btVector3(0,0,0);
-	btVector3	w1=btVector3(0,0,0);
-	for(U i=0;i<gjk.m_simplex->rank;++i)
-		{
-		const btScalar	p=gjk.m_simplex->p[i];
-		w0+=shape.Support( gjk.m_simplex->c[i]->d,0)*p;
-		w1+=shape.Support(-gjk.m_simplex->c[i]->d,1)*p;
-		}
-	results.witnesses[0]	=	wtrs0*w0;
-	results.witnesses[1]	=	wtrs0*w1;
-	results.normal			=	w0-w1;
-	results.distance		=	results.normal.length();
-	results.normal			/=	results.distance>GJK_MIN_DISTANCE?results.distance:1;
-	return(true);
-	}
-	else
-	{
-	results.status	=	gjk_status==GJK::eStatus::Inside?
-							sResults::Penetrating	:
-							sResults::GJK_Failed	;
-	return(false);
-	}
-}
-
-//
-bool	btGjkEpaSolver2::Penetration(	const btConvexShape*	shape0,
-										const btTransform&		wtrs0,
-										const btConvexShape*	shape1,
-										const btTransform&		wtrs1,
-										const btVector3&		guess,
-										sResults&				results,
-										bool					usemargins)
-{
-tShape			shape;
-Initialize(shape0,wtrs0,shape1,wtrs1,results,shape,usemargins);
-GJK				gjk;	
-GJK::eStatus::_	gjk_status=gjk.Evaluate(shape,-guess);
-switch(gjk_status)
-	{
-	case	GJK::eStatus::Inside:
-		{
-		EPA				epa;
-		EPA::eStatus::_	epa_status=epa.Evaluate(gjk,-guess);
-		if(epa_status!=EPA::eStatus::Failed)
-			{
-			btVector3	w0=btVector3(0,0,0);
-			for(U i=0;i<epa.m_result.rank;++i)
-				{
-				w0+=shape.Support(epa.m_result.c[i]->d,0)*epa.m_result.p[i];
-				}
-			results.status			=	sResults::Penetrating;
-			results.witnesses[0]	=	wtrs0*w0;
-			results.witnesses[1]	=	wtrs0*(w0-epa.m_normal*epa.m_depth);
-			results.normal			=	-epa.m_normal;
-			results.distance		=	-epa.m_depth;
-			return(true);
-			} else results.status=sResults::EPA_Failed;
-		}
-	break;
-	case	GJK::eStatus::Failed:
-	results.status=sResults::GJK_Failed;
-	break;
-	}
-return(false);
-}
-
-//
-btScalar	btGjkEpaSolver2::SignedDistance(const btVector3& position,
-											btScalar margin,
-											const btConvexShape* shape0,
-											const btTransform& wtrs0,
-											sResults& results)
-{
-tShape			shape;
-btSphereShape	shape1(margin);
-btTransform		wtrs1(btQuaternion(0,0,0,1),position);
-Initialize(shape0,wtrs0,&shape1,wtrs1,results,shape,false);
-GJK				gjk;	
-GJK::eStatus::_	gjk_status=gjk.Evaluate(shape,btVector3(1,1,1));
-if(gjk_status==GJK::eStatus::Valid)
-	{
-	btVector3	w0=btVector3(0,0,0);
-	btVector3	w1=btVector3(0,0,0);
-	for(U i=0;i<gjk.m_simplex->rank;++i)
-		{
-		const btScalar	p=gjk.m_simplex->p[i];
-		w0+=shape.Support( gjk.m_simplex->c[i]->d,0)*p;
-		w1+=shape.Support(-gjk.m_simplex->c[i]->d,1)*p;
-		}
-	results.witnesses[0]	=	wtrs0*w0;
-	results.witnesses[1]	=	wtrs0*w1;
-	const btVector3	delta=	results.witnesses[1]-
-							results.witnesses[0];
-	const btScalar	margin=	shape0->getMargin()+
-							shape1.getMargin();
-	const btScalar	length=	delta.length();	
-	results.normal			=	delta/length;
-	results.witnesses[0]	+=	results.normal*margin;
-	return(length-margin);
-	}
-	else
-	{
-	if(gjk_status==GJK::eStatus::Inside)
-		{
-		if(Penetration(shape0,wtrs0,&shape1,wtrs1,gjk.m_ray,results))
-			{
-			const btVector3	delta=	results.witnesses[0]-
-									results.witnesses[1];
-			const btScalar	length=	delta.length();
-			if (length >= SIMD_EPSILON)
-				results.normal	=	delta/length;			
-			return(-length);
-			}
-		}	
-	}
-return(SIMD_INFINITY);
-}
-
-//
-bool	btGjkEpaSolver2::SignedDistance(const btConvexShape*	shape0,
-										const btTransform&		wtrs0,
-										const btConvexShape*	shape1,
-										const btTransform&		wtrs1,
-										const btVector3&		guess,
-										sResults&				results)
-{
-if(!Distance(shape0,wtrs0,shape1,wtrs1,guess,results))
-	return(Penetration(shape0,wtrs0,shape1,wtrs1,guess,results,false));
-	else
-	return(true);
-}
-
-/* Symbols cleanup		*/ 
-
-#undef GJK_MAX_ITERATIONS
-#undef GJK_ACCURARY
-#undef GJK_MIN_DISTANCE
-#undef GJK_DUPLICATED_EPS
-#undef GJK_SIMPLEX2_EPS
-#undef GJK_SIMPLEX3_EPS
-#undef GJK_SIMPLEX4_EPS
-
-#undef EPA_MAX_VERTICES
-#undef EPA_MAX_FACES
-#undef EPA_MAX_ITERATIONS
-#undef EPA_ACCURACY
-#undef EPA_FALLBACK
-#undef EPA_PLANE_EPS
-#undef EPA_INSIDE_EPS
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h
deleted file mode 100644
index a55214203d3..00000000000
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2008 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the
-use of this software.
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely,
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
-claim that you wrote the original software. If you use this software in a
-product, an acknowledgment in the product documentation would be appreciated
-but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
-misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-/*
-GJK-EPA collision solver by Nathanael Presson, 2008
-*/
-#ifndef _68DA1F85_90B7_4bb0_A705_83B4040A75C6_
-#define _68DA1F85_90B7_4bb0_A705_83B4040A75C6_
-#include "BulletCollision/CollisionShapes/btConvexShape.h"
-
-///btGjkEpaSolver contributed under zlib by Nathanael Presson
-struct	btGjkEpaSolver2
-{
-struct	sResults
-	{
-	enum eStatus
-		{
-		Separated,		/* Shapes doesnt penetrate												*/ 
-		Penetrating,	/* Shapes are penetrating												*/ 
-		GJK_Failed,		/* GJK phase fail, no big issue, shapes are probably just 'touching'	*/ 
-		EPA_Failed		/* EPA phase fail, bigger problem, need to save parameters, and debug	*/ 
-		}		status;
-	btVector3	witnesses[2];
-	btVector3	normal;
-	btScalar	distance;
-	};
-
-static int		StackSizeRequirement();
-
-static bool		Distance(	const btConvexShape* shape0,const btTransform& wtrs0,
-							const btConvexShape* shape1,const btTransform& wtrs1,
-							const btVector3& guess,
-							sResults& results);
-
-static bool		Penetration(const btConvexShape* shape0,const btTransform& wtrs0,
-							const btConvexShape* shape1,const btTransform& wtrs1,
-							const btVector3& guess,
-							sResults& results,
-							bool usemargins=true);
-
-static btScalar	SignedDistance(	const btVector3& position,
-								btScalar margin,
-								const btConvexShape* shape,
-								const btTransform& wtrs,
-								sResults& results);
-							
-static bool		SignedDistance(	const btConvexShape* shape0,const btTransform& wtrs0,
-								const btConvexShape* shape1,const btTransform& wtrs1,
-								const btVector3& guess,
-								sResults& results);
-};
-
-#endif
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp
index c4f84ed4d75..87330493b60 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp
@@ -18,10 +18,9 @@ subject to the following restrictions:
 #include "BulletCollision/CollisionShapes/btConvexShape.h"
 #include "btGjkEpaPenetrationDepthSolver.h"
 #include "BulletCollision/NarrowPhaseCollision/btGjkEpa.h"
-#include "BulletCollision/NarrowPhaseCollision/btGjkEpa2.h"
 
 bool btGjkEpaPenetrationDepthSolver::calcPenDepth( btSimplexSolverInterface& simplexSolver,
-											  const btConvexShape* pConvexA, const btConvexShape* pConvexB,
+											  btConvexShape* pConvexA, btConvexShape* pConvexB,
 											  const btTransform& transformA, const btTransform& transformB,
 											  btVector3& v, btPoint3& wWitnessOnA, btPoint3& wWitnessOnB,
 											  class btIDebugDraw* debugDraw, btStackAlloc* stackAlloc )
@@ -33,20 +32,10 @@ bool btGjkEpaPenetrationDepthSolver::calcPenDepth( btSimplexSolverInterface& sim
 
 	const btScalar				radialmargin(btScalar(0.));
 	
-//#define USE_ORIGINAL_GJK 1
-#ifdef USE_ORIGINAL_GJK
 	btGjkEpaSolver::sResults	results;
 	if(btGjkEpaSolver::Collide(	pConvexA,transformA,
 								pConvexB,transformB,
 								radialmargin,stackAlloc,results))
-#else
-	btVector3	guessVector(transformA.getOrigin()-transformB.getOrigin());
-	btGjkEpaSolver2::sResults	results;
-	if(btGjkEpaSolver2::Penetration(pConvexA,transformA,
-								pConvexB,transformB,
-								guessVector,results))
-	
-#endif
 		{
 	//	debugDraw->drawLine(results.witnesses[1],results.witnesses[1]+results.normal,btVector3(255,0,0));
 		//resultOut->addContactPoint(results.normal,results.witnesses[1],-results.depth);
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h
index 2dc069ce5cf..3916ba0776c 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h
@@ -26,7 +26,7 @@ class btGjkEpaPenetrationDepthSolver : public btConvexPenetrationDepthSolver
 	public :
 
 		bool			calcPenDepth( btSimplexSolverInterface& simplexSolver,
-									  const btConvexShape* pConvexA, const btConvexShape* pConvexB,
+									  btConvexShape* pConvexA, btConvexShape* pConvexB,
 									  const btTransform& transformA, const btTransform& transformB,
 									  btVector3& v, btPoint3& wWitnessOnA, btPoint3& wWitnessOnB,
 									  class btIDebugDraw* debugDraw,btStackAlloc* stackAlloc );
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp
index 01fb1a4b068..f1f3f7f7f6c 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp
@@ -35,7 +35,7 @@ int gNumGjkChecks = 0;
 
 
 
-btGjkPairDetector::btGjkPairDetector(const btConvexShape* objectA,const btConvexShape* objectB,btSimplexSolverInterface* simplexSolver,btConvexPenetrationDepthSolver*	penetrationDepthSolver)
+btGjkPairDetector::btGjkPairDetector(btConvexShape* objectA,btConvexShape* objectB,btSimplexSolverInterface* simplexSolver,btConvexPenetrationDepthSolver*	penetrationDepthSolver)
 :m_cachedSeparatingAxis(btScalar(0.),btScalar(0.),btScalar(1.)),
 m_penetrationDepthSolver(penetrationDepthSolver),
 m_simplexSolver(simplexSolver),
@@ -47,7 +47,7 @@ m_catchDegeneracies(1)
 {
 }
 
-void btGjkPairDetector::getClosestPoints(const ClosestPointInput& input,Result& output,class btIDebugDraw* debugDraw,bool swapResults)
+void btGjkPairDetector::getClosestPoints(const ClosestPointInput& input,Result& output,class btIDebugDraw* debugDraw)
 {
 	btScalar distance=btScalar(0.);
 	btVector3	normalInB(btScalar(0.),btScalar(0.),btScalar(0.));
@@ -144,13 +144,6 @@ void btGjkPairDetector::getClosestPoints(const ClosestPointInput& input,Result&
 				break;
 			}
 
-			if(m_cachedSeparatingAxis.length2()<REL_ERROR2)
-            {
-                m_degenerateSimplex = 6;
-                checkSimplex = true;
-                break;
-            }
-
 			btScalar previousSquaredDistance = squaredDistance;
 			squaredDistance = m_cachedSeparatingAxis.length2();
 			
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h
index 550fc4677e0..af0fe32f6c7 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h
@@ -20,8 +20,8 @@ subject to the following restrictions:
 #define GJK_PAIR_DETECTOR_H
 
 #include "btDiscreteCollisionDetectorInterface.h"
-#include "LinearMath/btPoint3.h"
-#include "BulletCollision/CollisionShapes/btCollisionMargin.h"
+#include "../../LinearMath/btPoint3.h"
+#include "../CollisionShapes/btCollisionMargin.h"
 
 class btConvexShape;
 #include "btSimplexSolverInterface.h"
@@ -35,8 +35,8 @@ class btGjkPairDetector : public btDiscreteCollisionDetectorInterface
 	btVector3	m_cachedSeparatingAxis;
 	btConvexPenetrationDepthSolver*	m_penetrationDepthSolver;
 	btSimplexSolverInterface* m_simplexSolver;
-	const btConvexShape* m_minkowskiA;
-	const btConvexShape* m_minkowskiB;
+	btConvexShape* m_minkowskiA;
+	btConvexShape* m_minkowskiB;
 	bool		m_ignoreMargin;
 	
 
@@ -49,10 +49,10 @@ public:
 	int			m_catchDegeneracies;
 
 
-	btGjkPairDetector(const btConvexShape* objectA,const btConvexShape* objectB,btSimplexSolverInterface* simplexSolver,btConvexPenetrationDepthSolver*	penetrationDepthSolver);
+	btGjkPairDetector(btConvexShape* objectA,btConvexShape* objectB,btSimplexSolverInterface* simplexSolver,btConvexPenetrationDepthSolver*	penetrationDepthSolver);
 	virtual ~btGjkPairDetector() {};
 
-	virtual void	getClosestPoints(const ClosestPointInput& input,Result& output,class btIDebugDraw* debugDraw,bool swapResults=false);
+	virtual void	getClosestPoints(const ClosestPointInput& input,Result& output,class btIDebugDraw* debugDraw);
 
 	void setMinkowskiA(btConvexShape* minkA)
 	{
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h
index e75fc1bee96..f6a893151da 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h
@@ -16,8 +16,8 @@ subject to the following restrictions:
 #ifndef MANIFOLD_CONTACT_POINT_H
 #define MANIFOLD_CONTACT_POINT_H
 
-#include "LinearMath/btVector3.h"
-#include "LinearMath/btTransformUtil.h"
+#include "../../LinearMath/btVector3.h"
+#include "../../LinearMath/btTransformUtil.h"
 
 
 
@@ -30,8 +30,6 @@ class btManifoldPoint
 		public:
 			btManifoldPoint()
 				:m_userPersistentData(0),
-				m_appliedImpulse(0.f),
-				m_lateralFrictionInitialized(false),
 				m_lifeTime(0)
 			{
 			}
@@ -45,11 +43,7 @@ class btManifoldPoint
 					m_distance1( distance ),
 					m_combinedFriction(btScalar(0.)),
 					m_combinedRestitution(btScalar(0.)),
-					m_userPersistentData(0),
-					m_appliedImpulse(0.f),
-					m_lateralFrictionInitialized(false),
-					m_appliedImpulseLateral1(0.f),
-					m_appliedImpulseLateral2(0.f),
+					m_userPersistentData(0),					
 					m_lifeTime(0)
 			{
 				
@@ -69,23 +63,11 @@ class btManifoldPoint
 			btScalar	m_combinedFriction;
 			btScalar	m_combinedRestitution;
 
-         //BP mod, store contact triangles.
-         int	   m_partId0;
-         int      m_partId1;
-         int      m_index0;
-         int      m_index1;
 				
 			mutable void*	m_userPersistentData;
-			btScalar		m_appliedImpulse;
 
-			bool			m_lateralFrictionInitialized;
-			btScalar		m_appliedImpulseLateral1;
-			btScalar		m_appliedImpulseLateral2;
-			int				m_lifeTime;//lifetime of the contactpoint in frames
+			int		m_lifeTime;//lifetime of the contactpoint in frames
 			
-			btVector3		m_lateralFrictionDir1;
-			btVector3		m_lateralFrictionDir2;
-
 			btScalar getDistance() const
 			{
 				return m_distance1;
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp
index 0e6fa2e6dfe..c4bab3a134a 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp
@@ -14,10 +14,10 @@ subject to the following restrictions:
 */
 
 #include "btMinkowskiPenetrationDepthSolver.h"
+#include "BulletCollision/CollisionShapes/btMinkowskiSumShape.h"
 #include "BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h"
 #include "BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h"
 #include "BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h"
-#include "BulletCollision/CollisionShapes/btConvexShape.h"
 
 
 
@@ -71,7 +71,7 @@ btVector3(btScalar(0.162456) , btScalar(0.499995),btScalar(0.850654))
 
 
 bool btMinkowskiPenetrationDepthSolver::calcPenDepth(btSimplexSolverInterface& simplexSolver,
-												   const btConvexShape* convexA,const btConvexShape* convexB,
+												   btConvexShape* convexA,btConvexShape* convexB,
 												   const btTransform& transA,const btTransform& transB,
 												   btVector3& v, btPoint3& pa, btPoint3& pb,
 												   class btIDebugDraw* debugDraw,btStackAlloc* stackAlloc
@@ -112,7 +112,8 @@ bool btMinkowskiPenetrationDepthSolver::calcPenDepth(btSimplexSolverInterface& s
 
 	//just take fixed number of orientation, and sample the penetration depth in that direction
 	btScalar minProj = btScalar(1e30);
-	btVector3 minNorm(btScalar(0.), btScalar(0.), btScalar(0.));
+	btVector3 minNorm;
+	btVector3 minVertex;
 	btVector3 minA,minB;
 	btVector3 seperatingAxisInA,seperatingAxisInB;
 	btVector3 pInA,qInB,pWorld,qWorld,w;
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h
index 27b42c2b47e..b348b21b52a 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h
@@ -25,7 +25,7 @@ class btMinkowskiPenetrationDepthSolver : public btConvexPenetrationDepthSolver
 public:
 
 	virtual bool calcPenDepth( btSimplexSolverInterface& simplexSolver,
-	const btConvexShape* convexA,const btConvexShape* convexB,
+	btConvexShape* convexA,btConvexShape* convexB,
 				const btTransform& transA,const btTransform& transB,
 			btVector3& v, btPoint3& pa, btPoint3& pb,
 			class btIDebugDraw* debugDraw,btStackAlloc* stackAlloc
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp
index 386885d2ac8..08cb3ed334d 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp
@@ -20,7 +20,6 @@ subject to the following restrictions:
 
 btScalar					gContactBreakingThreshold = btScalar(0.02);
 ContactDestroyedCallback	gContactDestroyedCallback = 0;
-ContactProcessedCallback	gContactProcessedCallback = 0;
 
 
 
@@ -28,12 +27,20 @@ btPersistentManifold::btPersistentManifold()
 :m_body0(0),
 m_body1(0),
 m_cachedPoints (0),
-m_index1a(0)
+m_index1(0)
 {
 }
 
 
-
+void	btPersistentManifold::clearManifold()
+{
+	int i;
+	for (i=0;i<m_cachedPoints;i++)
+	{
+		clearUserCache(m_pointCache[i]);
+	}
+	m_cachedPoints = 0;
+}
 
 #ifdef DEBUG_PERSISTENCY
 #include <stdio.h>
@@ -162,7 +169,7 @@ int btPersistentManifold::getCacheEntry(const btManifoldPoint& newPoint) const
 	return nearestPoint;
 }
 
-int btPersistentManifold::addManifoldPoint(const btManifoldPoint& newPoint)
+void btPersistentManifold::AddManifoldPoint(const btManifoldPoint& newPoint)
 {
 	assert(validContactDistance(newPoint));
 
@@ -175,7 +182,7 @@ int btPersistentManifold::addManifoldPoint(const btManifoldPoint& newPoint)
 #else
 		insertIndex = 0;
 #endif
-		clearUserCache(m_pointCache[insertIndex]);
+
 		
 	} else
 	{
@@ -183,9 +190,7 @@ int btPersistentManifold::addManifoldPoint(const btManifoldPoint& newPoint)
 
 		
 	}
-	btAssert(m_pointCache[insertIndex].m_userPersistentData==0);
-	m_pointCache[insertIndex] = newPoint;
-	return insertIndex;
+	replaceContactPoint(newPoint,insertIndex);
 }
 
 btScalar	btPersistentManifold::getContactBreakingThreshold() const
@@ -193,20 +198,10 @@ btScalar	btPersistentManifold::getContactBreakingThreshold() const
 	return gContactBreakingThreshold;
 }
 
-
-
 void btPersistentManifold::refreshContactPoints(const btTransform& trA,const btTransform& trB)
 {
 	int i;
-#ifdef DEBUG_PERSISTENCY
-	printf("refreshContactPoints posA = (%f,%f,%f) posB = (%f,%f,%f)\n",
-		trA.getOrigin().getX(),
-		trA.getOrigin().getY(),
-		trA.getOrigin().getZ(),
-		trB.getOrigin().getX(),
-		trB.getOrigin().getY(),
-		trB.getOrigin().getZ());
-#endif //DEBUG_PERSISTENCY
+
 	/// first refresh worldspace positions and distance
 	for (i=getNumContacts()-1;i>=0;i--)
 	{
@@ -237,11 +232,6 @@ void btPersistentManifold::refreshContactPoints(const btTransform& trA,const btT
 			if (distance2d  > getContactBreakingThreshold()*getContactBreakingThreshold() )
 			{
 				removeContactPoint(i);
-			} else
-			{
-				//contact point processed callback
-				if (gContactProcessedCallback)
-					(*gContactProcessedCallback)(manifoldPoint,m_body0,m_body1);
 			}
 		}
 	}
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h
index c122eb865e8..a5918b84db3 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h
@@ -17,10 +17,9 @@ subject to the following restrictions:
 #define PERSISTENT_MANIFOLD_H
 
 
-#include "LinearMath/btVector3.h"
-#include "LinearMath/btTransform.h"
+#include "../../LinearMath/btVector3.h"
+#include "../../LinearMath/btTransform.h"
 #include "btManifoldPoint.h"
-#include "LinearMath/btAlignedAllocator.h"
 
 struct btCollisionResult;
 
@@ -28,7 +27,6 @@ struct btCollisionResult;
 extern btScalar gContactBreakingThreshold;
 
 typedef bool (*ContactDestroyedCallback)(void* userPersistentData);
-typedef bool (*ContactProcessedCallback)(btManifoldPoint& cp,void* body0,void* body1);
 extern ContactDestroyedCallback	gContactDestroyedCallback;
 
 
@@ -36,13 +34,8 @@ extern ContactDestroyedCallback	gContactDestroyedCallback;
 
 #define MANIFOLD_CACHE_SIZE 4
 
-///btPersistentManifold is a contact point cache, it stays persistent as long as objects are overlapping in the broadphase.
-///Those contact points are created by the collision narrow phase.
-///The cache can be empty, or hold 1,2,3 or 4 points. Some collision algorithms (GJK) might only add one point at a time.
-///updates/refreshes old contact points, and throw them away if necessary (distance becomes too large)
-///reduces the cache to 4 points, when more then 4 points are added, using following rules:
-///the contact point with deepest penetration is always kept, and it tries to maximuze the area covered by the points
-///note that some pairs of objects might have more then one contact manifold.
+///btPersistentManifold maintains contact points, and reduces them to 4.
+///It does contact filtering/contact reduction.
 ATTRIBUTE_ALIGNED16( class) btPersistentManifold 
 {
 
@@ -62,23 +55,20 @@ ATTRIBUTE_ALIGNED16( class) btPersistentManifold
 
 public:
 
-	BT_DECLARE_ALIGNED_ALLOCATOR();
-
-	int m_index1a;
+	int m_index1;
 
 	btPersistentManifold();
 
-	btPersistentManifold(void* body0,void* body1,int bla)
+	btPersistentManifold(void* body0,void* body1)
 		: m_body0(body0),m_body1(body1),m_cachedPoints(0)
 	{
-		(void)bla;
 	}
 
-	SIMD_FORCE_INLINE void* getBody0() { return m_body0;}
-	SIMD_FORCE_INLINE void* getBody1() { return m_body1;}
+	inline void* getBody0() { return m_body0;}
+	inline void* getBody1() { return m_body1;}
 
-	SIMD_FORCE_INLINE const void* getBody0() const { return m_body0;}
-	SIMD_FORCE_INLINE const void* getBody1() const { return m_body1;}
+	inline const void* getBody0() const { return m_body0;}
+	inline const void* getBody1() const { return m_body1;}
 
 	void	setBodies(void* body0,void* body1)
 	{
@@ -92,15 +82,15 @@ public:
 	void	DebugPersistency();
 #endif //
 	
-	SIMD_FORCE_INLINE int	getNumContacts() const { return m_cachedPoints;}
+	inline int	getNumContacts() const { return m_cachedPoints;}
 
-	SIMD_FORCE_INLINE const btManifoldPoint& getContactPoint(int index) const
+	inline const btManifoldPoint& getContactPoint(int index) const
 	{
 		btAssert(index < m_cachedPoints);
 		return m_pointCache[index];
 	}
 
-	SIMD_FORCE_INLINE btManifoldPoint& getContactPoint(int index)
+	inline btManifoldPoint& getContactPoint(int index)
 	{
 		btAssert(index < m_cachedPoints);
 		return m_pointCache[index];
@@ -111,7 +101,7 @@ public:
 	
 	int getCacheEntry(const btManifoldPoint& newPoint) const;
 
-	int addManifoldPoint( const btManifoldPoint& newPoint);
+	void AddManifoldPoint( const btManifoldPoint& newPoint);
 
 	void removeContactPoint (int index)
 	{
@@ -124,11 +114,6 @@ public:
 			m_pointCache[index] = m_pointCache[lastUsedIndex]; 
 			//get rid of duplicated userPersistentData pointer
 			m_pointCache[lastUsedIndex].m_userPersistentData = 0;
-			m_pointCache[lastUsedIndex].m_appliedImpulse = 0.f;
-			m_pointCache[lastUsedIndex].m_lateralFrictionInitialized = false;
-			m_pointCache[lastUsedIndex].m_appliedImpulseLateral1 = 0.f;
-			m_pointCache[lastUsedIndex].m_appliedImpulseLateral2 = 0.f;
-			m_pointCache[lastUsedIndex].m_lifeTime = 0;
 		}
 
 		btAssert(m_pointCache[lastUsedIndex].m_userPersistentData==0);
@@ -141,20 +126,12 @@ public:
 #define MAINTAIN_PERSISTENCY 1
 #ifdef MAINTAIN_PERSISTENCY
 		int	lifeTime = m_pointCache[insertIndex].getLifeTime();
-		btScalar	appliedImpulse = m_pointCache[insertIndex].m_appliedImpulse;
-		btScalar	appliedLateralImpulse1 = m_pointCache[insertIndex].m_appliedImpulseLateral1;
-		btScalar	appliedLateralImpulse2 = m_pointCache[insertIndex].m_appliedImpulseLateral2;
-				
 		btAssert(lifeTime>=0);
 		void* cache = m_pointCache[insertIndex].m_userPersistentData;
 		
 		m_pointCache[insertIndex] = newPoint;
 
 		m_pointCache[insertIndex].m_userPersistentData = cache;
-		m_pointCache[insertIndex].m_appliedImpulse = appliedImpulse;
-		m_pointCache[insertIndex].m_appliedImpulseLateral1 = appliedLateralImpulse1;
-		m_pointCache[insertIndex].m_appliedImpulseLateral2 = appliedLateralImpulse2;
-		
 		m_pointCache[insertIndex].m_lifeTime = lifeTime;
 #else
 		clearUserCache(m_pointCache[insertIndex]);
@@ -170,16 +147,7 @@ public:
 	/// calculated new worldspace coordinates and depth, and reject points that exceed the collision margin
 	void	refreshContactPoints(  const btTransform& trA,const btTransform& trB);
 
-	
-	SIMD_FORCE_INLINE	void	clearManifold()
-	{
-		int i;
-		for (i=0;i<m_cachedPoints;i++)
-		{
-			clearUserCache(m_pointCache[i]);
-		}
-		m_cachedPoints = 0;
-	}
+	void	clearManifold();
 
 
 
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp
index a70a3ae56c4..68ac93ec3cc 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp
@@ -13,20 +13,14 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-//#include <stdio.h>
 
-#include "BulletCollision/CollisionShapes/btConvexShape.h"
-#include "BulletCollision/CollisionShapes/btTriangleShape.h"
-#include "BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h"
-#include "BulletCollision/NarrowPhaseCollision/btGjkConvexCast.h"
-#include "BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.h"
-#include "BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h"
 #include "btRaycastCallback.h"
 
-btTriangleRaycastCallback::btTriangleRaycastCallback(const btVector3& from,const btVector3& to)
+btTriangleRaycastCallback::btTriangleRaycastCallback(const btVector3& from,const btVector3& to,bool faceNormal)
 	:
 	m_from(from),
 	m_to(to),
+	m_faceNormal(faceNormal),
 	m_hitFraction(btScalar(1.))
 {
 
@@ -36,6 +30,8 @@ btTriangleRaycastCallback::btTriangleRaycastCallback(const btVector3& from,const
 
 void btTriangleRaycastCallback::processTriangle(btVector3* triangle,int partId, int triangleIndex)
 {
+	
+
 	const btVector3 &vert0=triangle[0];
 	const btVector3 &vert1=triangle[1];
 	const btVector3 &vert2=triangle[2];
@@ -89,8 +85,7 @@ void btTriangleRaycastCallback::processTriangle(btVector3* triangle,int partId,
 					
 					if ( (btScalar)(cp2.dot(triangleNormal)) >=edge_tolerance) 
 					{
-
-						if ( dist_a > 0 )
+						if (m_faceNormal || dist_a > 0)
 						{
 							m_hitFraction = reportHit(triangleNormal,distance,partId,triangleIndex);
 						}
@@ -104,60 +99,3 @@ void btTriangleRaycastCallback::processTriangle(btVector3* triangle,int partId,
 		}
 	}
 }
-
-
-btTriangleConvexcastCallback::btTriangleConvexcastCallback (const btConvexShape* convexShape, const btTransform& convexShapeFrom, const btTransform& convexShapeTo, const btTransform& triangleToWorld, const btScalar triangleCollisionMargin)
-{
-	m_convexShape = convexShape;
-	m_convexShapeFrom = convexShapeFrom;
-	m_convexShapeTo = convexShapeTo;
-	m_triangleToWorld = triangleToWorld;
-	m_hitFraction = 1.0;
-    m_triangleCollisionMargin = triangleCollisionMargin;
-}
-
-void
-btTriangleConvexcastCallback::processTriangle (btVector3* triangle, int partId, int triangleIndex)
-{
-	btTriangleShape triangleShape (triangle[0], triangle[1], triangle[2]);
-    triangleShape.setMargin(m_triangleCollisionMargin);
-
-	btVoronoiSimplexSolver	simplexSolver;
-	btGjkEpaPenetrationDepthSolver	gjkEpaPenetrationSolver;
-
-//#define  USE_SUBSIMPLEX_CONVEX_CAST 1
-//if you reenable USE_SUBSIMPLEX_CONVEX_CAST see commented out code below
-#ifdef USE_SUBSIMPLEX_CONVEX_CAST
-	btSubsimplexConvexCast convexCaster(m_convexShape, &triangleShape, &simplexSolver);
-#else
-	//btGjkConvexCast	convexCaster(m_convexShape,&triangleShape,&simplexSolver);
-	btContinuousConvexCollision convexCaster(m_convexShape,&triangleShape,&simplexSolver,&gjkEpaPenetrationSolver);
-#endif //#USE_SUBSIMPLEX_CONVEX_CAST
-	
-	btConvexCast::CastResult castResult;
-	castResult.m_fraction = btScalar(1.);
-	if (convexCaster.calcTimeOfImpact(m_convexShapeFrom,m_convexShapeTo,m_triangleToWorld, m_triangleToWorld, castResult))
-	{
-		//add hit
-		if (castResult.m_normal.length2() > btScalar(0.0001))
-		{					
-			if (castResult.m_fraction < m_hitFraction)
-			{
-/* btContinuousConvexCast's normal is already in world space */
-/*
-#ifdef USE_SUBSIMPLEX_CONVEX_CAST
-				//rotate normal into worldspace
-				castResult.m_normal = m_convexShapeFrom.getBasis() * castResult.m_normal;
-#endif //USE_SUBSIMPLEX_CONVEX_CAST
-*/
-				castResult.m_normal.normalize();
-
-				reportHit (castResult.m_normal,
-							castResult.m_hitPoint,
-							castResult.m_fraction,
-							partId,
-							triangleIndex);
-			}
-		}
-	}
-}
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h
index d2b4b80f8ba..71ed9fead49 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h
@@ -16,22 +16,22 @@ subject to the following restrictions:
 #ifndef RAYCAST_TRI_CALLBACK_H
 #define RAYCAST_TRI_CALLBACK_H
 
-#include "BulletCollision/CollisionShapes/btTriangleCallback.h"
-#include "LinearMath/btTransform.h"
+#include "../CollisionShapes/btTriangleCallback.h"
 struct btBroadphaseProxy;
-class btConvexShape;
+
 
 class  btTriangleRaycastCallback: public btTriangleCallback
 {
 public:
 
-	//input
+		//input
 	btVector3 m_from;
 	btVector3 m_to;
+	bool m_faceNormal;
 
 	btScalar	m_hitFraction;
 
-	btTriangleRaycastCallback(const btVector3& from,const btVector3& to);
+	btTriangleRaycastCallback(const btVector3& from,const btVector3& to,bool faceNormal);
 	
 	virtual void processTriangle(btVector3* triangle, int partId, int triangleIndex);
 
@@ -39,22 +39,5 @@ public:
 	
 };
 
-class btTriangleConvexcastCallback : public btTriangleCallback
-{
-public:
-	const btConvexShape* m_convexShape;
-	btTransform m_convexShapeFrom;
-	btTransform m_convexShapeTo;
-	btTransform m_triangleToWorld;
-	btScalar m_hitFraction;
-    btScalar m_triangleCollisionMargin;
-
-	btTriangleConvexcastCallback (const btConvexShape* convexShape, const btTransform& convexShapeFrom, const btTransform& convexShapeTo, const btTransform& triangleToWorld, const btScalar triangleCollisionMargin);
-
-	virtual void processTriangle (btVector3* triangle, int partId, int triangleIndex);
-
-	virtual btScalar reportHit (const btVector3& hitNormalLocal, const btVector3& hitPointLocal, btScalar hitFraction, int partId, int triangleIndex) = 0;
-};
-
 #endif //RAYCAST_TRI_CALLBACK_H
 
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h
index cf65f46505b..58393b2eab9 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h
@@ -18,8 +18,8 @@ subject to the following restrictions:
 #ifndef SIMPLEX_SOLVER_INTERFACE_H
 #define SIMPLEX_SOLVER_INTERFACE_H
 
-#include "LinearMath/btVector3.h"
-#include "LinearMath/btPoint3.h"
+#include "../../LinearMath/btVector3.h"
+#include "../../LinearMath/btPoint3.h"
 
 #define NO_VIRTUAL_INTERFACE 1
 #ifdef NO_VIRTUAL_INTERFACE
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp
index 4c709a8c3a9..687738b7fa9 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.cpp
@@ -16,11 +16,9 @@ subject to the following restrictions:
 
 #include "btSubSimplexConvexCast.h"
 #include "BulletCollision/CollisionShapes/btConvexShape.h"
-
 #include "BulletCollision/CollisionShapes/btMinkowskiSumShape.h"
 #include "BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h"
-#include "btPointCollector.h"
-#include "LinearMath/btTransformUtil.h"
+
 
 btSubsimplexConvexCast::btSubsimplexConvexCast (const btConvexShape* convexA,const btConvexShape* convexB,btSimplexSolverInterface* simplexSolver)
 :m_simplexSolver(simplexSolver),
@@ -43,24 +41,34 @@ bool	btSubsimplexConvexCast::calcTimeOfImpact(
 		CastResult& result)
 {
 
+	btMinkowskiSumShape combi(m_convexA,m_convexB);
+	btMinkowskiSumShape* convex = &combi;
+
+	btTransform	rayFromLocalA;
+	btTransform	rayToLocalA;
+
+	rayFromLocalA = fromA.inverse()* fromB;
+	rayToLocalA = toA.inverse()* toB;
+
+
 	m_simplexSolver->reset();
 
-	btVector3 linVelA,linVelB;
-	linVelA = toA.getOrigin()-fromA.getOrigin();
-	linVelB = toB.getOrigin()-fromB.getOrigin();
+	convex->setTransformB(btTransform(rayFromLocalA.getBasis()));
+
+	//btScalar radius = btScalar(0.01);
 
 	btScalar lambda = btScalar(0.);
-
-	btTransform interpolatedTransA = fromA;
-	btTransform interpolatedTransB = fromB;
-
-	///take relative motion
-	btVector3 r = (linVelA-linVelB);
-	btVector3 v;
+	//todo: need to verify this:
+	//because of minkowski difference, we need the inverse direction
 	
-	btVector3 supVertexA = fromA(m_convexA->localGetSupportingVertex(-r*fromA.getBasis()));
-	btVector3 supVertexB = fromB(m_convexB->localGetSupportingVertex(r*fromB.getBasis()));
-	v = supVertexA-supVertexB;
+	btVector3 s = -rayFromLocalA.getOrigin();
+	btVector3 r = -(rayToLocalA.getOrigin()-rayFromLocalA.getOrigin());
+	btVector3 x = s;
+	btVector3 v;
+	btVector3 arbitraryPoint = convex->localGetSupportingVertex(r);
+	
+	v = x - arbitraryPoint;
+
 	int maxIter = MAX_ITERATIONS;
 
 	btVector3 n;
@@ -82,17 +90,11 @@ bool	btSubsimplexConvexCast::calcTimeOfImpact(
 	
 	while ( (dist2 > epsilon) && maxIter--)
 	{
-		supVertexA = interpolatedTransA(m_convexA->localGetSupportingVertex(-v*interpolatedTransA.getBasis()));
-		supVertexB = interpolatedTransB(m_convexB->localGetSupportingVertex(v*interpolatedTransB.getBasis()));
-		w = supVertexA-supVertexB;
+		p = convex->localGetSupportingVertex( v);
+		 w = x - p;
 
 		btScalar VdotW = v.dot(w);
 
-		if (lambda > btScalar(1.0))
-		{
-			return false;
-		}
-
 		if ( VdotW > btScalar(0.))
 		{
 			VdotR = v.dot(r);
@@ -102,25 +104,20 @@ bool	btSubsimplexConvexCast::calcTimeOfImpact(
 			else
 			{
 				lambda = lambda - VdotW / VdotR;
-				//interpolate to next lambda
-				//	x = s + lambda * r;
-				interpolatedTransA.getOrigin().setInterpolate3(fromA.getOrigin(),toA.getOrigin(),lambda);
-				interpolatedTransB.getOrigin().setInterpolate3(fromB.getOrigin(),toB.getOrigin(),lambda);
-				//m_simplexSolver->reset();
+				x = s + lambda * r;
+				m_simplexSolver->reset();
 				//check next line
-				 w = supVertexA-supVertexB;
+				w = x-p;
 				lastLambda = lambda;
 				n = v;
 				hasResult = true;
 			}
 		} 
-		m_simplexSolver->addVertex( w, supVertexA , supVertexB);
+		m_simplexSolver->addVertex( w, x , p);
 		if (m_simplexSolver->closest(v))
 		{
 			dist2 = v.length2();
 			hasResult = true;
-			//todo: check this normal for validity
-			//n=v;
 			//printf("V=%f , %f, %f\n",v[0],v[1],v[2]);
 			//printf("DIST2=%f\n",dist2);
 			//printf("numverts = %i\n",m_simplexSolver->numVertices());
@@ -132,26 +129,11 @@ bool	btSubsimplexConvexCast::calcTimeOfImpact(
 
 	//int numiter = MAX_ITERATIONS - maxIter;
 //	printf("number of iterations: %d", numiter);
-	
-	//don't report a time of impact when moving 'away' from the hitnormal
-	
-
 	result.m_fraction = lambda;
-	if (n.length2() >= (SIMD_EPSILON*SIMD_EPSILON))
-		result.m_normal = n.normalized();
-	else
-		result.m_normal = btVector3(btScalar(0.0), btScalar(0.0), btScalar(0.0));
+	result.m_normal = n;
 
-	//don't report time of impact for motion away from the contact normal (or causes minor penetration)
-	if (result.m_normal.dot(r)>=-result.m_allowedPenetration)
-		return false;
-
-	btVector3 hitA,hitB;
-	m_simplexSolver->compute_points(hitA,hitB);
-	result.m_hitPoint=hitB;
 	return true;
 }
 
 
 
-
diff --git a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp
index cf8a3ab5eb1..105b7eccefa 100644
--- a/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp
+++ b/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.cpp
@@ -26,7 +26,7 @@ subject to the following restrictions:
 
 #include "btVoronoiSimplexSolver.h"
 #include <assert.h>
-//#include <stdio.h>
+#include <stdio.h>
 
 #define VERTA  0
 #define VERTB  1
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
index e11b49d9420..2289621e8e3 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
@@ -19,20 +19,24 @@ Written by: Marcus Hennix
 #include "btConeTwistConstraint.h"
 #include "BulletDynamics/Dynamics/btRigidBody.h"
 #include "LinearMath/btTransformUtil.h"
-#include "LinearMath/btMinMax.h"
+#include "LinearMath/btSimdMinMax.h"
 #include <new>
 
 btConeTwistConstraint::btConeTwistConstraint()
-:btTypedConstraint(CONETWIST_CONSTRAINT_TYPE)
 {
 }
 
 
 btConeTwistConstraint::btConeTwistConstraint(btRigidBody& rbA,btRigidBody& rbB, 
 											 const btTransform& rbAFrame,const btTransform& rbBFrame)
-											 :btTypedConstraint(CONETWIST_CONSTRAINT_TYPE, rbA,rbB),m_rbAFrame(rbAFrame),m_rbBFrame(rbBFrame),
+											 :btTypedConstraint(rbA,rbB),m_rbAFrame(rbAFrame),m_rbBFrame(rbBFrame),
 											 m_angularOnly(false)
 {
+	// flip axis for correct angles
+	m_rbBFrame.getBasis()[1][0] *= btScalar(-1.);
+	m_rbBFrame.getBasis()[1][1] *= btScalar(-1.);
+	m_rbBFrame.getBasis()[1][2] *= btScalar(-1.);
+
 	m_swingSpan1 = btScalar(1e30);
 	m_swingSpan2 = btScalar(1e30);
 	m_twistSpan  = btScalar(1e30);
@@ -45,11 +49,20 @@ btConeTwistConstraint::btConeTwistConstraint(btRigidBody& rbA,btRigidBody& rbB,
 }
 
 btConeTwistConstraint::btConeTwistConstraint(btRigidBody& rbA,const btTransform& rbAFrame)
-											:btTypedConstraint(CONETWIST_CONSTRAINT_TYPE,rbA),m_rbAFrame(rbAFrame),
+											:btTypedConstraint(rbA),m_rbAFrame(rbAFrame),
 											 m_angularOnly(false)
 {
 	m_rbBFrame = m_rbAFrame;
 	
+	// flip axis for correct angles
+	m_rbBFrame.getBasis()[1][0] *= btScalar(-1.);
+	m_rbBFrame.getBasis()[1][1] *= btScalar(-1.);
+	m_rbBFrame.getBasis()[1][2] *= btScalar(-1.);
+
+	m_rbBFrame.getBasis()[2][0] *= btScalar(-1.);
+	m_rbBFrame.getBasis()[2][1] *= btScalar(-1.);
+	m_rbBFrame.getBasis()[2][2] *= btScalar(-1.);
+	
 	m_swingSpan1 = btScalar(1e30);
 	m_swingSpan2 = btScalar(1e30);
 	m_twistSpan  = btScalar(1e30);
@@ -129,7 +142,7 @@ void	btConeTwistConstraint::buildJacobian()
 
 	btScalar RMaxAngle1Sq = 1.0f / (m_swingSpan1*m_swingSpan1);		
 	btScalar RMaxAngle2Sq = 1.0f / (m_swingSpan2*m_swingSpan2);	
-	btScalar EllipseAngle = btFabs(swing1*swing1)* RMaxAngle1Sq + btFabs(swing2*swing2) * RMaxAngle2Sq;
+	btScalar EllipseAngle = btFabs(swing1)* RMaxAngle1Sq + btFabs(swing2) * RMaxAngle2Sq;
 
 	if (EllipseAngle > 1.0f)
 	{
@@ -233,7 +246,7 @@ void	btConeTwistConstraint::solveConstraint(btScalar	timeStep)
 
 			// Clamp the accumulated impulse
 			btScalar temp = m_accSwingLimitImpulse;
-			m_accSwingLimitImpulse = btMax(m_accSwingLimitImpulse + impulseMag, btScalar(0.0) );
+			m_accSwingLimitImpulse = btMax(m_accSwingLimitImpulse + impulseMag, 0.0f );
 			impulseMag = m_accSwingLimitImpulse - temp;
 
 			btVector3 impulse = m_swingAxis * impulseMag;
@@ -251,7 +264,7 @@ void	btConeTwistConstraint::solveConstraint(btScalar	timeStep)
 
 			// Clamp the accumulated impulse
 			btScalar temp = m_accTwistLimitImpulse;
-			m_accTwistLimitImpulse = btMax(m_accTwistLimitImpulse + impulseMag, btScalar(0.0) );
+			m_accTwistLimitImpulse = btMax(m_accTwistLimitImpulse + impulseMag, 0.0f );
 			impulseMag = m_accTwistLimitImpulse - temp;
 
 			btVector3 impulse = m_twistAxis * impulseMag;
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h
index f121919c8f9..874669c80b3 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h
@@ -30,9 +30,6 @@ class btRigidBody;
 ///btConeTwistConstraint can be used to simulate ragdoll joints (upper arm, leg etc)
 class btConeTwistConstraint : public btTypedConstraint
 {
-#ifdef IN_PARALLELL_SOLVER
-public:
-#endif
 	btJacobianEntry	m_jac[3]; //3 orthogonal linear constraints
 
 	btTransform m_rbAFrame; 
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConstraintSolver.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConstraintSolver.h
index 7a8e9c1953d..7e8458c2c7b 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConstraintSolver.h
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConstraintSolver.h
@@ -16,7 +16,7 @@ subject to the following restrictions:
 #ifndef CONSTRAINT_SOLVER_H
 #define CONSTRAINT_SOLVER_H
 
-#include "LinearMath/btScalar.h"
+#include "../../LinearMath/btScalar.h"
 
 class btPersistentManifold;
 class btRigidBody;
@@ -26,7 +26,7 @@ struct btContactSolverInfo;
 struct btBroadphaseProxy;
 class btIDebugDraw;
 class btStackAlloc;
-class	btDispatcher;
+
 /// btConstraintSolver provides solver interface
 class btConstraintSolver
 {
@@ -35,15 +35,8 @@ public:
 
 	virtual ~btConstraintSolver() {}
 	
-	virtual void prepareSolve (int /* numBodies */, int /* numManifolds */) {;}
+	virtual btScalar solveGroup(btCollisionObject** bodies,int numBodies,btPersistentManifold** manifold,int numManifolds,btTypedConstraint** constraints,int numConstraints, const btContactSolverInfo& info,class btIDebugDraw* debugDrawer, btStackAlloc* stackAlloc) = 0;
 
-	///solve a group of constraints
-	virtual btScalar solveGroup(btCollisionObject** bodies,int numBodies,btPersistentManifold** manifold,int numManifolds,btTypedConstraint** constraints,int numConstraints, const btContactSolverInfo& info,class btIDebugDraw* debugDrawer, btStackAlloc* stackAlloc,btDispatcher* dispatcher) = 0;
-
-	virtual void allSolved (const btContactSolverInfo& /* info */,class btIDebugDraw* /* debugDrawer */, btStackAlloc* /* stackAlloc */) {;}
-
-	///clear internal cached data and reset random seed
-	virtual	void	reset() = 0;
 };
 
 
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp
index 4d7cd05feb7..bb3fe832592 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.cpp
@@ -192,8 +192,8 @@ btScalar resolveSingleFriction(
 			j1 = -vrel * cpd->m_jacDiagABInvTangent0;
 			btScalar oldTangentImpulse = cpd->m_accumulatedTangentImpulse0;
 			cpd->m_accumulatedTangentImpulse0 = oldTangentImpulse + j1;
-			btSetMin(cpd->m_accumulatedTangentImpulse0, limit);
-			btSetMax(cpd->m_accumulatedTangentImpulse0, -limit);
+			GEN_set_min(cpd->m_accumulatedTangentImpulse0, limit);
+			GEN_set_max(cpd->m_accumulatedTangentImpulse0, -limit);
 			j1 = cpd->m_accumulatedTangentImpulse0 - oldTangentImpulse;
 
 		}
@@ -206,8 +206,8 @@ btScalar resolveSingleFriction(
 			j2 = -vrel * cpd->m_jacDiagABInvTangent1;
 			btScalar oldTangentImpulse = cpd->m_accumulatedTangentImpulse1;
 			cpd->m_accumulatedTangentImpulse1 = oldTangentImpulse + j2;
-			btSetMin(cpd->m_accumulatedTangentImpulse1, limit);
-			btSetMax(cpd->m_accumulatedTangentImpulse1, -limit);
+			GEN_set_min(cpd->m_accumulatedTangentImpulse1, limit);
+			GEN_set_max(cpd->m_accumulatedTangentImpulse1, -limit);
 			j2 = cpd->m_accumulatedTangentImpulse1 - oldTangentImpulse;
 		}
 
@@ -233,12 +233,6 @@ btScalar resolveSingleFriction(
 }
 
 
-btScalar resolveSingleFrictionOriginal(
-	btRigidBody& body1,
-	btRigidBody& body2,
-	btManifoldPoint& contactPoint,
-	const btContactSolverInfo& solverInfo);
-
 btScalar resolveSingleFrictionOriginal(
 	btRigidBody& body1,
 	btRigidBody& body2,
@@ -276,8 +270,8 @@ btScalar resolveSingleFrictionOriginal(
 			// calculate j that moves us to zero relative velocity
 			btScalar j = -vrel * cpd->m_jacDiagABInvTangent0;
 			btScalar total = cpd->m_accumulatedTangentImpulse0 + j;
-			btSetMin(total, limit);
-			btSetMax(total, -limit);
+			GEN_set_min(total, limit);
+			GEN_set_max(total, -limit);
 			j = total - cpd->m_accumulatedTangentImpulse0;
 			cpd->m_accumulatedTangentImpulse0 = total;
 			body1.applyImpulse(j * cpd->m_frictionWorldTangential0, rel_pos1);
@@ -296,8 +290,8 @@ btScalar resolveSingleFrictionOriginal(
 			// calculate j that moves us to zero relative velocity
 			btScalar j = -vrel * cpd->m_jacDiagABInvTangent1;
 			btScalar total = cpd->m_accumulatedTangentImpulse1 + j;
-			btSetMin(total, limit);
-			btSetMax(total, -limit);
+			GEN_set_min(total, limit);
+			GEN_set_max(total, -limit);
 			j = total - cpd->m_accumulatedTangentImpulse1;
 			cpd->m_accumulatedTangentImpulse1 = total;
 			body1.applyImpulse(j * cpd->m_frictionWorldTangential1, rel_pos1);
@@ -394,8 +388,8 @@ btScalar resolveSingleCollisionCombined(
 				(body1.getInvMass() + body2.getInvMass() + lat_vel.dot(temp1.cross(rel_pos1) + temp2.cross(rel_pos2)));
 			btScalar normal_impulse = cpd->m_appliedImpulse * combinedFriction;
 
-			btSetMin(friction_impulse, normal_impulse);
-			btSetMax(friction_impulse, -normal_impulse);
+			GEN_set_min(friction_impulse, normal_impulse);
+			GEN_set_max(friction_impulse, -normal_impulse);
 			body1.applyImpulse(lat_vel * -friction_impulse, rel_pos1);
 			body2.applyImpulse(lat_vel * friction_impulse, rel_pos2);
 		}
@@ -406,12 +400,6 @@ btScalar resolveSingleCollisionCombined(
 	return normalImpulse;
 }
 
-btScalar resolveSingleFrictionEmpty(
-	btRigidBody& body1,
-	btRigidBody& body2,
-	btManifoldPoint& contactPoint,
-	const btContactSolverInfo& solverInfo);
-
 btScalar resolveSingleFrictionEmpty(
 	btRigidBody& body1,
 	btRigidBody& body2,
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.h
index 826e79f78bd..0834deddeac 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.h
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactConstraint.h
@@ -19,8 +19,8 @@ subject to the following restrictions:
 //todo: make into a proper class working with the iterative constraint solver
 
 class btRigidBody;
-#include "LinearMath/btVector3.h"
-#include "LinearMath/btScalar.h"
+#include "../../LinearMath/btVector3.h"
+#include "../../LinearMath/btScalar.h"
 struct btContactSolverInfo;
 class btManifoldPoint;
 
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h
index 916d4581f79..c3c73e300f4 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h
@@ -16,42 +16,9 @@ subject to the following restrictions:
 #ifndef CONTACT_SOLVER_INFO
 #define CONTACT_SOLVER_INFO
 
-enum	btSolverMode
+
+struct btContactSolverInfo
 {
-	SOLVER_RANDMIZE_ORDER = 1,
-	SOLVER_FRICTION_SEPARATE = 2,
-	SOLVER_USE_WARMSTARTING = 4,
-	SOLVER_CACHE_FRIENDLY = 8
-};
-
-struct btContactSolverInfoData
-{
-	
-
-	btScalar	m_tau;
-	btScalar	m_damping;
-	btScalar	m_friction;
-	btScalar	m_timeStep;
-	btScalar	m_restitution;
-	int		m_numIterations;
-	btScalar	m_maxErrorReduction;
-	btScalar	m_sor;
-	btScalar	m_erp;//used as Baumgarte factor
-	btScalar	m_erp2;//used in Split Impulse
-	int			m_splitImpulse;
-	btScalar	m_splitImpulsePenetrationThreshold;
-	btScalar	m_linearSlop;
-	btScalar	m_warmstartingFactor;
-
-	int			m_solverMode;
-
-
-};
-
-struct btContactSolverInfo : public btContactSolverInfoData
-{
-
-	
 
 	inline btContactSolverInfo()
 	{
@@ -61,15 +28,20 @@ struct btContactSolverInfo : public btContactSolverInfoData
 		m_restitution = btScalar(0.);
 		m_maxErrorReduction = btScalar(20.);
 		m_numIterations = 10;
-		m_erp = btScalar(0.2);
-		m_erp2 = btScalar(0.1);
+		m_erp = btScalar(0.4);
 		m_sor = btScalar(1.3);
-		m_splitImpulse = false;
-		m_splitImpulsePenetrationThreshold = -0.02f;
-		m_linearSlop = btScalar(0.0);
-		m_warmstartingFactor=btScalar(0.85);
-		m_solverMode = SOLVER_RANDMIZE_ORDER | SOLVER_CACHE_FRIENDLY | SOLVER_USE_WARMSTARTING;
 	}
+
+	btScalar	m_tau;
+	btScalar	m_damping;
+	btScalar	m_friction;
+	btScalar	m_timeStep;
+	btScalar	m_restitution;
+	int		m_numIterations;
+	btScalar	m_maxErrorReduction;
+	btScalar	m_sor;
+	btScalar	m_erp;
+
 };
 
 #endif //CONTACT_SOLVER_INFO
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp
index 077b326d13a..747d10d1f8b 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.cpp
@@ -4,20 +4,14 @@ Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
 
 This software is provided 'as-is', without any express or implied warranty.
 In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it freely,
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
 subject to the following restrictions:
 
 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
 3. This notice may not be removed or altered from any source distribution.
 */
-/*
-2007-09-09
-Refactored by Francisco Le?n
-email: projectileman@yahoo.com
-http://gimpact.sf.net
-*/
 
 
 #include "btGeneric6DofConstraint.h"
@@ -25,504 +19,371 @@ http://gimpact.sf.net
 #include "LinearMath/btTransformUtil.h"
 #include <new>
 
-
 static const btScalar kSign[] = { btScalar(1.0), btScalar(-1.0), btScalar(1.0) };
 static const int kAxisA[] = { 1, 0, 0 };
 static const int kAxisB[] = { 2, 2, 1 };
 #define GENERIC_D6_DISABLE_WARMSTARTING 1
 
-btScalar btGetMatrixElem(const btMatrix3x3& mat, int index);
-btScalar btGetMatrixElem(const btMatrix3x3& mat, int index)
+btGeneric6DofConstraint::btGeneric6DofConstraint()
 {
-	int i = index%3;
-	int j = index/3;
-	return mat[i][j];
+}
+
+btGeneric6DofConstraint::btGeneric6DofConstraint(btRigidBody& rbA, btRigidBody& rbB, const btTransform& frameInA, const btTransform& frameInB)
+: btTypedConstraint(rbA, rbB)
+, m_frameInA(frameInA)
+, m_frameInB(frameInB)
+{
+	//free means upper < lower, 
+	//locked means upper == lower
+	//limited means upper > lower
+	//so start all locked
+	for (int i=0; i<6;++i)
+	{
+		m_lowerLimit[i] = btScalar(0.0);
+		m_upperLimit[i] = btScalar(0.0);
+		m_accumulatedImpulse[i] = btScalar(0.0);
+	}
+
+}
+
+
+void btGeneric6DofConstraint::buildJacobian()
+{
+	btVector3	localNormalInA(0,0,0);
+
+	const btVector3& pivotInA = m_frameInA.getOrigin();
+	const btVector3& pivotInB = m_frameInB.getOrigin();
+
+	btVector3 pivotAInW = m_rbA.getCenterOfMassTransform() * m_frameInA.getOrigin();
+	btVector3 pivotBInW = m_rbB.getCenterOfMassTransform() * m_frameInB.getOrigin();
+
+	btVector3 rel_pos1 = pivotAInW - m_rbA.getCenterOfMassPosition(); 
+	btVector3 rel_pos2 = pivotBInW - m_rbB.getCenterOfMassPosition();
+
+	int i;
+	//linear part
+	for (i=0;i<3;i++)
+	{
+		if (isLimited(i))
+		{
+			localNormalInA[i] = 1;
+			btVector3 normalWorld = m_rbA.getCenterOfMassTransform().getBasis() * localNormalInA;
+
+			
+			// Create linear atom
+			new (&m_jacLinear[i]) btJacobianEntry(
+				m_rbA.getCenterOfMassTransform().getBasis().transpose(),
+				m_rbB.getCenterOfMassTransform().getBasis().transpose(),
+				m_rbA.getCenterOfMassTransform()*pivotInA - m_rbA.getCenterOfMassPosition(),
+				m_rbB.getCenterOfMassTransform()*pivotInB - m_rbB.getCenterOfMassPosition(),
+				normalWorld,
+				m_rbA.getInvInertiaDiagLocal(),
+				m_rbA.getInvMass(),
+				m_rbB.getInvInertiaDiagLocal(),
+				m_rbB.getInvMass());
+
+			//optionally disable warmstarting
+#ifdef GENERIC_D6_DISABLE_WARMSTARTING
+			m_accumulatedImpulse[i] = btScalar(0.);
+#endif //GENERIC_D6_DISABLE_WARMSTARTING
+
+			// Apply accumulated impulse
+			btVector3 impulse_vector = m_accumulatedImpulse[i] * normalWorld;
+
+			m_rbA.applyImpulse( impulse_vector, rel_pos1);
+			m_rbB.applyImpulse(-impulse_vector, rel_pos2);
+
+			localNormalInA[i] = 0;
+		}
+	}
+
+	// angular part
+	for (i=0;i<3;i++)
+	{
+		if (isLimited(i+3))
+		{
+			btVector3 axisA = m_rbA.getCenterOfMassTransform().getBasis() * m_frameInA.getBasis().getColumn( kAxisA[i] );
+			btVector3 axisB = m_rbB.getCenterOfMassTransform().getBasis() * m_frameInB.getBasis().getColumn( kAxisB[i] );
+
+			// Dirk: This is IMO mathematically the correct way, but we should consider axisA and axisB being near parallel maybe
+			btVector3 axis = kSign[i] * axisA.cross(axisB);
+
+			// Create angular atom
+			new (&m_jacAng[i])	btJacobianEntry(axis,
+				m_rbA.getCenterOfMassTransform().getBasis().transpose(),
+				m_rbB.getCenterOfMassTransform().getBasis().transpose(),
+				m_rbA.getInvInertiaDiagLocal(),
+				m_rbB.getInvInertiaDiagLocal());
+
+#ifdef GENERIC_D6_DISABLE_WARMSTARTING
+			m_accumulatedImpulse[i + 3] = btScalar(0.);
+#endif //GENERIC_D6_DISABLE_WARMSTARTING
+
+			// Apply accumulated impulse
+			btVector3 impulse_vector = m_accumulatedImpulse[i + 3] * axis;
+
+			m_rbA.applyTorqueImpulse( impulse_vector);
+			m_rbB.applyTorqueImpulse(-impulse_vector);
+		}
+	}
+}
+
+btScalar getMatrixElem(const btMatrix3x3& mat,int index)
+{
+	int row = index%3;
+	int col = index / 3;
+	return mat[row][col];
 }
 
 ///MatrixToEulerXYZ from http://www.geometrictools.com/LibFoundation/Mathematics/Wm4Matrix3.inl.html
-bool	matrixToEulerXYZ(const btMatrix3x3& mat,btVector3& xyz);
-bool	matrixToEulerXYZ(const btMatrix3x3& mat,btVector3& xyz)
+bool	MatrixToEulerXYZ(const btMatrix3x3& mat,btVector3& xyz)
 {
-//	// rot =  cy*cz          -cy*sz           sy
-//	//        cz*sx*sy+cx*sz  cx*cz-sx*sy*sz -cy*sx
-//	//       -cx*cz*sy+sx*sz  cz*sx+cx*sy*sz  cx*cy
-//
-
-		if (btGetMatrixElem(mat,2) < btScalar(1.0))
-		{
-			if (btGetMatrixElem(mat,2) > btScalar(-1.0))
-			{
-				xyz[0] = btAtan2(-btGetMatrixElem(mat,5),btGetMatrixElem(mat,8));
-				xyz[1] = btAsin(btGetMatrixElem(mat,2));
-				xyz[2] = btAtan2(-btGetMatrixElem(mat,1),btGetMatrixElem(mat,0));
-				return true;
-			}
-			else
-			{
-				// WARNING.  Not unique.  XA - ZA = -atan2(r10,r11)
-				xyz[0] = -btAtan2(btGetMatrixElem(mat,3),btGetMatrixElem(mat,4));
-				xyz[1] = -SIMD_HALF_PI;
-				xyz[2] = btScalar(0.0);
-				return false;
-			}
-		}
-		else
-		{
-			// WARNING.  Not unique.  XAngle + ZAngle = atan2(r10,r11)
-			xyz[0] = btAtan2(btGetMatrixElem(mat,3),btGetMatrixElem(mat,4));
-			xyz[1] = SIMD_HALF_PI;
-			xyz[2] = 0.0;
-
-		}
+    // rot =  cy*cz          -cy*sz           sy
+    //        cz*sx*sy+cx*sz  cx*cz-sx*sy*sz -cy*sx
+    //       -cx*cz*sy+sx*sz  cz*sx+cx*sy*sz  cx*cy
 
+///	0..8
 
+	 if (getMatrixElem(mat,2) < btScalar(1.0))
+    {
+        if (getMatrixElem(mat,2) > btScalar(-1.0))
+        {
+            xyz[0] = btAtan2(-getMatrixElem(mat,5),getMatrixElem(mat,8));
+            xyz[1] = btAsin(getMatrixElem(mat,2));
+            xyz[2] = btAtan2(-getMatrixElem(mat,1),getMatrixElem(mat,0));
+            return true;
+        }
+        else
+        {
+            // WARNING.  Not unique.  XA - ZA = -atan2(r10,r11)
+            xyz[0] = -btAtan2(getMatrixElem(mat,3),getMatrixElem(mat,4));
+            xyz[1] = -SIMD_HALF_PI;
+            xyz[2] = btScalar(0.0);
+            return false;
+        }
+    }
+    else
+    {
+        // WARNING.  Not unique.  XAngle + ZAngle = atan2(r10,r11)
+        xyz[0] = btAtan2(getMatrixElem(mat,3),getMatrixElem(mat,4));
+        xyz[1] = SIMD_HALF_PI;
+        xyz[2] = 0.0;
+     
+    }
+	 
 	return false;
 }
 
 
-
-//////////////////////////// btRotationalLimitMotor ////////////////////////////////////
-
-
-int btRotationalLimitMotor::testLimitValue(btScalar test_value)
+void	btGeneric6DofConstraint::solveConstraint(btScalar	timeStep)
 {
-	if(m_loLimit>m_hiLimit)
-	{
-		m_currentLimit = 0;//Free from violation
-		return 0;
-	}
+	btScalar tau = btScalar(0.1);
+	btScalar damping = btScalar(1.0);
 
-	if (test_value < m_loLimit)
-	{
-		m_currentLimit = 1;//low limit violation
-		m_currentLimitError =  test_value - m_loLimit;
-		return 1;
-	}
-	else if (test_value> m_hiLimit)
-	{
-		m_currentLimit = 2;//High limit violation
-		m_currentLimitError = test_value - m_hiLimit;
-		return 2;
-	};
+	btVector3 pivotAInW = m_rbA.getCenterOfMassTransform() * m_frameInA.getOrigin();
+	btVector3 pivotBInW = m_rbB.getCenterOfMassTransform() * m_frameInB.getOrigin();
 
-	m_currentLimit = 0;//Free from violation
-	return 0;
+	btVector3 rel_pos1 = pivotAInW - m_rbA.getCenterOfMassPosition(); 
+	btVector3 rel_pos2 = pivotBInW - m_rbB.getCenterOfMassPosition();
 	
-}
-
-
-btScalar btRotationalLimitMotor::solveAngularLimits(
-		btScalar timeStep,btVector3& axis,btScalar jacDiagABInv,
-	 	btRigidBody * body0, btRigidBody * body1)
-{
-    if (needApplyTorques()==false) return 0.0f;
-
-    btScalar target_velocity = m_targetVelocity;
-    btScalar maxMotorForce = m_maxMotorForce;
-
-	//current error correction
-    if (m_currentLimit!=0)
-    {
-        target_velocity = -m_ERP*m_currentLimitError/(timeStep);
-        maxMotorForce = m_maxLimitForce;
-    }
-
-    maxMotorForce *= timeStep;
-
-    // current velocity difference
-    btVector3 vel_diff = body0->getAngularVelocity();
-    if (body1)
-    {
-        vel_diff -= body1->getAngularVelocity();
-    }
-
-
-
-    btScalar rel_vel = axis.dot(vel_diff);
-
-	// correction velocity
-    btScalar motor_relvel = m_limitSoftness*(target_velocity  - m_damping*rel_vel);
-
-
-    if ( motor_relvel < SIMD_EPSILON && motor_relvel > -SIMD_EPSILON  )
-    {
-        return 0.0f;//no need for applying force
-    }
-
-
-	// correction impulse
-    btScalar unclippedMotorImpulse = (1+m_bounce)*motor_relvel*jacDiagABInv;
-
-	// clip correction impulse
-    btScalar clippedMotorImpulse;
-
-    //todo: should clip against accumulated impulse
-    if (unclippedMotorImpulse>0.0f)
-    {
-        clippedMotorImpulse =  unclippedMotorImpulse > maxMotorForce? maxMotorForce: unclippedMotorImpulse;
-    }
-    else
-    {
-        clippedMotorImpulse =  unclippedMotorImpulse < -maxMotorForce ? -maxMotorForce: unclippedMotorImpulse;
-    }
-
-
-	// sort with accumulated impulses
-    btScalar	lo = btScalar(-1e30);
-    btScalar	hi = btScalar(1e30);
-
-    btScalar oldaccumImpulse = m_accumulatedImpulse;
-    btScalar sum = oldaccumImpulse + clippedMotorImpulse;
-    m_accumulatedImpulse = sum > hi ? btScalar(0.) : sum < lo ? btScalar(0.) : sum;
-
-    clippedMotorImpulse = m_accumulatedImpulse - oldaccumImpulse;
-
-
-
-    btVector3 motorImp = clippedMotorImpulse * axis;
-
-
-    body0->applyTorqueImpulse(motorImp);
-    if (body1) body1->applyTorqueImpulse(-motorImp);
-
-    return clippedMotorImpulse;
-
-
-}
-
-//////////////////////////// End btRotationalLimitMotor ////////////////////////////////////
-
-//////////////////////////// btTranslationalLimitMotor ////////////////////////////////////
-btScalar btTranslationalLimitMotor::solveLinearAxis(
-		btScalar timeStep,
-        btScalar jacDiagABInv,
-        btRigidBody& body1,const btVector3 &pointInA,
-        btRigidBody& body2,const btVector3 &pointInB,
-        int limit_index,
-        const btVector3 & axis_normal_on_a,
-		const btVector3 & anchorPos)
-{
-
-///find relative velocity
-//    btVector3 rel_pos1 = pointInA - body1.getCenterOfMassPosition();
-//    btVector3 rel_pos2 = pointInB - body2.getCenterOfMassPosition();
-    btVector3 rel_pos1 = anchorPos - body1.getCenterOfMassPosition();
-    btVector3 rel_pos2 = anchorPos - body2.getCenterOfMassPosition();
-
-    btVector3 vel1 = body1.getVelocityInLocalPoint(rel_pos1);
-    btVector3 vel2 = body2.getVelocityInLocalPoint(rel_pos2);
-    btVector3 vel = vel1 - vel2;
-
-    btScalar rel_vel = axis_normal_on_a.dot(vel);
-
-
-
-/// apply displacement correction
-
-//positional error (zeroth order error)
-    btScalar depth = -(pointInA - pointInB).dot(axis_normal_on_a);
-    btScalar	lo = btScalar(-1e30);
-    btScalar	hi = btScalar(1e30);
-
-    btScalar minLimit = m_lowerLimit[limit_index];
-    btScalar maxLimit = m_upperLimit[limit_index];
-
-    //handle the limits
-    if (minLimit < maxLimit)
-    {
-        {
-            if (depth > maxLimit)
-            {
-                depth -= maxLimit;
-                lo = btScalar(0.);
-
-            }
-            else
-            {
-                if (depth < minLimit)
-                {
-                    depth -= minLimit;
-                    hi = btScalar(0.);
-                }
-                else
-                {
-                    return 0.0f;
-                }
-            }
-        }
-    }
-
-    btScalar normalImpulse= m_limitSoftness*(m_restitution*depth/timeStep - m_damping*rel_vel) * jacDiagABInv;
-
-
-
-
-    btScalar oldNormalImpulse = m_accumulatedImpulse[limit_index];
-    btScalar sum = oldNormalImpulse + normalImpulse;
-    m_accumulatedImpulse[limit_index] = sum > hi ? btScalar(0.) : sum < lo ? btScalar(0.) : sum;
-    normalImpulse = m_accumulatedImpulse[limit_index] - oldNormalImpulse;
-
-    btVector3 impulse_vector = axis_normal_on_a * normalImpulse;
-    body1.applyImpulse( impulse_vector, rel_pos1);
-    body2.applyImpulse(-impulse_vector, rel_pos2);
-    return normalImpulse;
-}
-
-//////////////////////////// btTranslationalLimitMotor ////////////////////////////////////
-
-
-btGeneric6DofConstraint::btGeneric6DofConstraint()
-        :btTypedConstraint(D6_CONSTRAINT_TYPE),
-		m_useLinearReferenceFrameA(true)
-{
-}
-
-btGeneric6DofConstraint::btGeneric6DofConstraint(btRigidBody& rbA, btRigidBody& rbB, const btTransform& frameInA, const btTransform& frameInB, bool useLinearReferenceFrameA)
-        : btTypedConstraint(D6_CONSTRAINT_TYPE, rbA, rbB)
-        , m_frameInA(frameInA)
-        , m_frameInB(frameInB),
-		m_useLinearReferenceFrameA(useLinearReferenceFrameA)
-{
-
-}
-
-
-
-
-
-void btGeneric6DofConstraint::calculateAngleInfo()
-{
-	btMatrix3x3 relative_frame = m_calculatedTransformA.getBasis().inverse()*m_calculatedTransformB.getBasis();
-
-	matrixToEulerXYZ(relative_frame,m_calculatedAxisAngleDiff);
-
-
-
-	// in euler angle mode we do not actually constrain the angular velocity
-  // along the axes axis[0] and axis[2] (although we do use axis[1]) :
-  //
-  //    to get			constrain w2-w1 along		...not
-  //    ------			---------------------		------
-  //    d(angle[0])/dt = 0	ax[1] x ax[2]			ax[0]
-  //    d(angle[1])/dt = 0	ax[1]
-  //    d(angle[2])/dt = 0	ax[0] x ax[1]			ax[2]
-  //
-  // constraining w2-w1 along an axis 'a' means that a'*(w2-w1)=0.
-  // to prove the result for angle[0], write the expression for angle[0] from
-  // GetInfo1 then take the derivative. to prove this for angle[2] it is
-  // easier to take the euler rate expression for d(angle[2])/dt with respect
-  // to the components of w and set that to 0.
-
-	btVector3 axis0 = m_calculatedTransformB.getBasis().getColumn(0);
-	btVector3 axis2 = m_calculatedTransformA.getBasis().getColumn(2);
-
-	m_calculatedAxis[1] = axis2.cross(axis0);
-	m_calculatedAxis[0] = m_calculatedAxis[1].cross(axis2);
-	m_calculatedAxis[2] = axis0.cross(m_calculatedAxis[1]);
-
-
-//    if(m_debugDrawer)
-//    {
-//
-//    	char buff[300];
-//		sprintf(buff,"\n X: %.2f ; Y: %.2f ; Z: %.2f ",
-//		m_calculatedAxisAngleDiff[0],
-//		m_calculatedAxisAngleDiff[1],
-//		m_calculatedAxisAngleDiff[2]);
-//    	m_debugDrawer->reportErrorWarning(buff);
-//    }
-
-}
-
-void btGeneric6DofConstraint::calculateTransforms()
-{
-    m_calculatedTransformA = m_rbA.getCenterOfMassTransform() * m_frameInA;
-    m_calculatedTransformB = m_rbB.getCenterOfMassTransform() * m_frameInB;
-
-    calculateAngleInfo();
-}
-
-
-void btGeneric6DofConstraint::buildLinearJacobian(
-    btJacobianEntry & jacLinear,const btVector3 & normalWorld,
-    const btVector3 & pivotAInW,const btVector3 & pivotBInW)
-{
-    new (&jacLinear) btJacobianEntry(
-        m_rbA.getCenterOfMassTransform().getBasis().transpose(),
-        m_rbB.getCenterOfMassTransform().getBasis().transpose(),
-        pivotAInW - m_rbA.getCenterOfMassPosition(),
-        pivotBInW - m_rbB.getCenterOfMassPosition(),
-        normalWorld,
-        m_rbA.getInvInertiaDiagLocal(),
-        m_rbA.getInvMass(),
-        m_rbB.getInvInertiaDiagLocal(),
-        m_rbB.getInvMass());
-
-}
-
-void btGeneric6DofConstraint::buildAngularJacobian(
-    btJacobianEntry & jacAngular,const btVector3 & jointAxisW)
-{
-    new (&jacAngular)	btJacobianEntry(jointAxisW,
-                                      m_rbA.getCenterOfMassTransform().getBasis().transpose(),
-                                      m_rbB.getCenterOfMassTransform().getBasis().transpose(),
-                                      m_rbA.getInvInertiaDiagLocal(),
-                                      m_rbB.getInvInertiaDiagLocal());
-
-}
-
-bool btGeneric6DofConstraint::testAngularLimitMotor(int axis_index)
-{
-    btScalar angle = m_calculatedAxisAngleDiff[axis_index];
-
-    //test limits
-    m_angularLimits[axis_index].testLimitValue(angle);
-    return m_angularLimits[axis_index].needApplyTorques();
-}
-
-void btGeneric6DofConstraint::buildJacobian()
-{
-
-	// Clear accumulated impulses for the next simulation step
-    m_linearLimits.m_accumulatedImpulse.setValue(btScalar(0.), btScalar(0.), btScalar(0.));
-    int i;
-    for(i = 0; i < 3; i++)
-    {
-        m_angularLimits[i].m_accumulatedImpulse = btScalar(0.);
-    }
-    //calculates transform
-    calculateTransforms();
-
-//  const btVector3& pivotAInW = m_calculatedTransformA.getOrigin();
-//  const btVector3& pivotBInW = m_calculatedTransformB.getOrigin();
-	calcAnchorPos();
-	btVector3 pivotAInW = m_AnchorPos;
-	btVector3 pivotBInW = m_AnchorPos;
-
-// not used here
-//    btVector3 rel_pos1 = pivotAInW - m_rbA.getCenterOfMassPosition();
-//    btVector3 rel_pos2 = pivotBInW - m_rbB.getCenterOfMassPosition();
-
-    btVector3 normalWorld;
-    //linear part
-    for (i=0;i<3;i++)
-    {
-        if (m_linearLimits.isLimited(i))
-        {
-			if (m_useLinearReferenceFrameA)
-	            normalWorld = m_calculatedTransformA.getBasis().getColumn(i);
-			else
-	            normalWorld = m_calculatedTransformB.getBasis().getColumn(i);
-
-            buildLinearJacobian(
-                m_jacLinear[i],normalWorld ,
-                pivotAInW,pivotBInW);
-
-        }
-    }
-
-    // angular part
-    for (i=0;i<3;i++)
-    {
-        //calculates error angle
-        if (testAngularLimitMotor(i))
-        {
-            normalWorld = this->getAxis(i);
-            // Create angular atom
-            buildAngularJacobian(m_jacAng[i],normalWorld);
-        }
-    }
-
-
-}
-
-
-void btGeneric6DofConstraint::solveConstraint(btScalar	timeStep)
-{
-    m_timeStep = timeStep;
-
-    //calculateTransforms();
-
-    int i;
-
-    // linear
-
-    btVector3 pointInA = m_calculatedTransformA.getOrigin();
-	btVector3 pointInB = m_calculatedTransformB.getOrigin();
-
-	btScalar jacDiagABInv;
-	btVector3 linear_axis;
-    for (i=0;i<3;i++)
-    {
-        if (m_linearLimits.isLimited(i))
-        {
-            jacDiagABInv = btScalar(1.) / m_jacLinear[i].getDiagonal();
-
-			if (m_useLinearReferenceFrameA)
-	            linear_axis = m_calculatedTransformA.getBasis().getColumn(i);
-			else
-	            linear_axis = m_calculatedTransformB.getBasis().getColumn(i);
-
-            m_linearLimits.solveLinearAxis(
-            	m_timeStep,
-            	jacDiagABInv,
-            	m_rbA,pointInA,
-                m_rbB,pointInB,
-                i,linear_axis, m_AnchorPos);
-
-        }
-    }
-
-    // angular
-    btVector3 angular_axis;
-    btScalar angularJacDiagABInv;
-    for (i=0;i<3;i++)
-    {
-        if (m_angularLimits[i].needApplyTorques())
-        {
-
-			// get axis
-			angular_axis = getAxis(i);
-
-			angularJacDiagABInv = btScalar(1.) / m_jacAng[i].getDiagonal();
-
-			m_angularLimits[i].solveAngularLimits(m_timeStep,angular_axis,angularJacDiagABInv, &m_rbA,&m_rbB);
-        }
-    }
+	btVector3 localNormalInA(0,0,0);
+	int i;
+
+	// linear
+	for (i=0;i<3;i++)
+	{		
+		if (isLimited(i))
+		{
+			btVector3 angvelA = m_rbA.getCenterOfMassTransform().getBasis().transpose() * m_rbA.getAngularVelocity();
+			btVector3 angvelB = m_rbB.getCenterOfMassTransform().getBasis().transpose() * m_rbB.getAngularVelocity();
+		
+			localNormalInA.setValue(0,0,0);
+			localNormalInA[i] = 1;
+			btVector3 normalWorld = m_rbA.getCenterOfMassTransform().getBasis() * localNormalInA;
+
+			btScalar jacDiagABInv = btScalar(1.) / m_jacLinear[i].getDiagonal();
+
+			//velocity error (first order error)
+			btScalar rel_vel = m_jacLinear[i].getRelativeVelocity(m_rbA.getLinearVelocity(),angvelA, 
+																	m_rbB.getLinearVelocity(),angvelB);
+		
+			//positional error (zeroth order error)
+			btScalar depth = -(pivotAInW - pivotBInW).dot(normalWorld); 
+			btScalar	lo = btScalar(-1e30);
+			btScalar	hi = btScalar(1e30);
+		
+			//handle the limits
+			if (m_lowerLimit[i] < m_upperLimit[i])
+			{
+				{
+					if (depth > m_upperLimit[i])
+					{
+						depth -= m_upperLimit[i];
+						lo = btScalar(0.);
+					
+					} else
+					{
+						if (depth < m_lowerLimit[i])
+						{
+							depth -= m_lowerLimit[i];
+							hi = btScalar(0.);
+						} else
+						{
+							continue;
+						}
+					}
+				}
+			}
+
+			btScalar normalImpulse= (tau*depth/timeStep - damping*rel_vel) * jacDiagABInv;
+			btScalar oldNormalImpulse = m_accumulatedImpulse[i];
+			btScalar sum = oldNormalImpulse + normalImpulse;
+			m_accumulatedImpulse[i] = sum > hi ? btScalar(0.) : sum < lo ? btScalar(0.) : sum;
+			normalImpulse = m_accumulatedImpulse[i] - oldNormalImpulse;
+
+			btVector3 impulse_vector = normalWorld * normalImpulse;
+			m_rbA.applyImpulse( impulse_vector, rel_pos1);
+			m_rbB.applyImpulse(-impulse_vector, rel_pos2);
+			
+			localNormalInA[i] = 0;
+		}
+	}
+
+	btVector3	axis;
+	btScalar	angle;
+	btTransform	frameAWorld = m_rbA.getCenterOfMassTransform() * m_frameInA;
+	btTransform	frameBWorld = m_rbB.getCenterOfMassTransform() * m_frameInB;
+
+	btTransformUtil::calculateDiffAxisAngle(frameAWorld,frameBWorld,axis,angle);
+	btQuaternion diff(axis,angle);
+	btMatrix3x3 diffMat (diff);
+	btVector3 xyz;
+	///this is not perfect, we can first check which axis are limited, and choose a more appropriate order
+	MatrixToEulerXYZ(diffMat,xyz);
+
+	// angular
+	for (i=0;i<3;i++)
+	{
+		if (isLimited(i+3))
+		{
+			btVector3 angvelA = m_rbA.getCenterOfMassTransform().getBasis().transpose() * m_rbA.getAngularVelocity();
+			btVector3 angvelB = m_rbB.getCenterOfMassTransform().getBasis().transpose() * m_rbB.getAngularVelocity();
+		
+			btScalar jacDiagABInv = btScalar(1.) / m_jacAng[i].getDiagonal();
+			
+			//velocity error (first order error)
+			btScalar rel_vel = m_jacAng[i].getRelativeVelocity(m_rbA.getLinearVelocity(),angvelA, 
+																			m_rbB.getLinearVelocity(),angvelB);
+
+			//positional error (zeroth order error)
+			btVector3 axisA = m_rbA.getCenterOfMassTransform().getBasis() * m_frameInA.getBasis().getColumn( kAxisA[i] );
+			btVector3 axisB = m_rbB.getCenterOfMassTransform().getBasis() * m_frameInB.getBasis().getColumn( kAxisB[i] );
+
+			btScalar rel_pos = kSign[i] * axisA.dot(axisB);
+
+			btScalar	lo = btScalar(-1e30);
+			btScalar	hi = btScalar(1e30);
+		
+			//handle the twist limit
+			if (m_lowerLimit[i+3] < m_upperLimit[i+3])
+			{
+				//clamp the values
+				btScalar loLimit =  m_lowerLimit[i+3] > -3.1415 ? m_lowerLimit[i+3] : btScalar(-1e30);
+				btScalar hiLimit = m_upperLimit[i+3] < 3.1415 ? m_upperLimit[i+3] : btScalar(1e30);
+
+				btScalar projAngle  = btScalar(-1.)*xyz[i];
+				
+				if (projAngle < loLimit)
+				{
+					hi = btScalar(0.);
+					rel_pos = (loLimit - projAngle);
+				} else
+				{
+					if (projAngle > hiLimit)
+					{
+						lo = btScalar(0.);
+						rel_pos = (hiLimit - projAngle);
+					} else
+					{
+						continue;
+					}
+				}
+			}
+		
+			//impulse
+			
+			btScalar normalImpulse= -(tau*rel_pos/timeStep + damping*rel_vel) * jacDiagABInv;
+			btScalar oldNormalImpulse = m_accumulatedImpulse[i+3];
+			btScalar sum = oldNormalImpulse + normalImpulse;
+			m_accumulatedImpulse[i+3] = sum > hi ? btScalar(0.) : sum < lo ? btScalar(0.) : sum;
+			normalImpulse = m_accumulatedImpulse[i+3] - oldNormalImpulse;
+			
+			// Dirk: Not needed - we could actually project onto Jacobian entry here (same as above)
+			btVector3 axis = kSign[i] * axisA.cross(axisB);
+			btVector3 impulse_vector = axis * normalImpulse;
+
+			m_rbA.applyTorqueImpulse( impulse_vector);
+			m_rbB.applyTorqueImpulse(-impulse_vector);
+		}
+	}
 }
 
 void	btGeneric6DofConstraint::updateRHS(btScalar	timeStep)
 {
-    (void)timeStep;
+	(void)timeStep;
 
 }
 
-btVector3 btGeneric6DofConstraint::getAxis(int axis_index) const
-{
-    return m_calculatedAxis[axis_index];
-}
-
-btScalar btGeneric6DofConstraint::getAngle(int axis_index) const
-{
-    return m_calculatedAxisAngleDiff[axis_index];
-}
-
-void btGeneric6DofConstraint::calcAnchorPos(void)
-{
-	btScalar imA = m_rbA.getInvMass();
-	btScalar imB = m_rbB.getInvMass();
-	btScalar weight;
-	if(imB == btScalar(0.0))
+btScalar btGeneric6DofConstraint::computeAngle(int axis) const
 	{
-		weight = btScalar(1.0);
-	}
-	else
-	{
-		weight = imA / (imA + imB);
-	}
-	const btVector3& pA = m_calculatedTransformA.getOrigin();
-	const btVector3& pB = m_calculatedTransformB.getOrigin();
-	m_AnchorPos = pA * weight + pB * (btScalar(1.0) - weight);
-	return;
-} // btGeneric6DofConstraint::calcAnchorPos()
+	btScalar angle = btScalar(0.f);
+
+	switch (axis)
+		{
+		case 0:
+			{
+			btVector3 v1 = m_rbA.getCenterOfMassTransform().getBasis() * m_frameInA.getBasis().getColumn(1);
+			btVector3 v2 = m_rbB.getCenterOfMassTransform().getBasis() * m_frameInB.getBasis().getColumn(1);
+			btVector3 w2 = m_rbB.getCenterOfMassTransform().getBasis() * m_frameInB.getBasis().getColumn(2);
+
+			btScalar s = v1.dot(w2);
+			btScalar c = v1.dot(v2);
+
+			angle = btAtan2( s, c );
+			}
+			break;
+
+		case 1:
+			{
+			btVector3 w1 = m_rbA.getCenterOfMassTransform().getBasis() * m_frameInA.getBasis().getColumn(2);
+			btVector3 w2 = m_rbB.getCenterOfMassTransform().getBasis() * m_frameInB.getBasis().getColumn(2);
+			btVector3 u2 = m_rbB.getCenterOfMassTransform().getBasis() * m_frameInB.getBasis().getColumn(0);
+
+			btScalar s = w1.dot(u2);
+			btScalar c = w1.dot(w2);
+
+			angle = btAtan2( s, c );
+			}
+			break;
+
+		case 2:
+			{
+			btVector3 u1 = m_rbA.getCenterOfMassTransform().getBasis() * m_frameInA.getBasis().getColumn(0);
+			btVector3 u2 = m_rbB.getCenterOfMassTransform().getBasis() * m_frameInB.getBasis().getColumn(0);
+			btVector3 v2 = m_rbB.getCenterOfMassTransform().getBasis() * m_frameInB.getBasis().getColumn(1);
+
+			btScalar s = u1.dot(v2);
+			btScalar c = u1.dot(u2);
+
+			angle = btAtan2( s, c );
+			}
+			break;
+                  default: 
+					  btAssert ( 0 ) ; 
+					  
+					  break ;
+		}
+
+		return angle;
+	}
 
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h
index f0718d2d4a0..b114e54fa69 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h
@@ -4,433 +4,116 @@ Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
 
 This software is provided 'as-is', without any express or implied warranty.
 In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it freely,
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
 subject to the following restrictions:
 
 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
 3. This notice may not be removed or altered from any source distribution.
 */
-/*
-2007-09-09
-btGeneric6DofConstraint Refactored by Francisco Le?n
-email: projectileman@yahoo.com
-http://gimpact.sf.net
-*/
-
 
 #ifndef GENERIC_6DOF_CONSTRAINT_H
 #define GENERIC_6DOF_CONSTRAINT_H
 
-#include "LinearMath/btVector3.h"
+#include "../../LinearMath/btVector3.h"
 #include "btJacobianEntry.h"
 #include "btTypedConstraint.h"
 
 class btRigidBody;
 
 
-//! Rotation Limit structure for generic joints
-class btRotationalLimitMotor
-{
-public:
-    //! limit_parameters
-    //!@{
-    btScalar m_loLimit;//!< joint limit
-    btScalar m_hiLimit;//!< joint limit
-    btScalar m_targetVelocity;//!< target motor velocity
-    btScalar m_maxMotorForce;//!< max force on motor
-    btScalar m_maxLimitForce;//!< max force on limit
-    btScalar m_damping;//!< Damping.
-    btScalar m_limitSoftness;//! Relaxation factor
-    btScalar m_ERP;//!< Error tolerance factor when joint is at limit
-    btScalar m_bounce;//!< restitution factor
-    bool m_enableMotor;
-
-    //!@}
-
-    //! temp_variables
-    //!@{
-    btScalar m_currentLimitError;//!  How much is violated this limit
-    int m_currentLimit;//!< 0=free, 1=at lo limit, 2=at hi limit
-    btScalar m_accumulatedImpulse;
-    //!@}
-
-    btRotationalLimitMotor()
-    {
-    	m_accumulatedImpulse = 0.f;
-        m_targetVelocity = 0;
-        m_maxMotorForce = 0.1f;
-        m_maxLimitForce = 300.0f;
-        m_loLimit = -SIMD_INFINITY;
-        m_hiLimit = SIMD_INFINITY;
-        m_ERP = 0.5f;
-        m_bounce = 0.0f;
-        m_damping = 1.0f;
-        m_limitSoftness = 0.5f;
-        m_currentLimit = 0;
-        m_currentLimitError = 0;
-        m_enableMotor = false;
-    }
-
-    btRotationalLimitMotor(const btRotationalLimitMotor & limot)
-    {
-        m_targetVelocity = limot.m_targetVelocity;
-        m_maxMotorForce = limot.m_maxMotorForce;
-        m_limitSoftness = limot.m_limitSoftness;
-        m_loLimit = limot.m_loLimit;
-        m_hiLimit = limot.m_hiLimit;
-        m_ERP = limot.m_ERP;
-        m_bounce = limot.m_bounce;
-        m_currentLimit = limot.m_currentLimit;
-        m_currentLimitError = limot.m_currentLimitError;
-        m_enableMotor = limot.m_enableMotor;
-    }
-
-
-
-	//! Is limited
-    bool isLimited()
-    {
-    	if(m_loLimit>=m_hiLimit) return false;
-    	return true;
-    }
-
-	//! Need apply correction
-    bool needApplyTorques()
-    {
-    	if(m_currentLimit == 0 && m_enableMotor == false) return false;
-    	return true;
-    }
-
-	//! calculates  error
-	/*!
-	calculates m_currentLimit and m_currentLimitError.
-	*/
-	int testLimitValue(btScalar test_value);
-
-	//! apply the correction impulses for two bodies
-    btScalar solveAngularLimits(btScalar timeStep,btVector3& axis, btScalar jacDiagABInv,btRigidBody * body0, btRigidBody * body1);
-
-
-};
-
-
-
-class btTranslationalLimitMotor
-{
-public:
-	btVector3 m_lowerLimit;//!< the constraint lower limits
-    btVector3 m_upperLimit;//!< the constraint upper limits
-    btVector3 m_accumulatedImpulse;
-    //! Linear_Limit_parameters
-    //!@{
-    btScalar	m_limitSoftness;//!< Softness for linear limit
-    btScalar	m_damping;//!< Damping for linear limit
-    btScalar	m_restitution;//! Bounce parameter for linear limit
-    //!@}
-
-    btTranslationalLimitMotor()
-    {
-    	m_lowerLimit.setValue(0.f,0.f,0.f);
-    	m_upperLimit.setValue(0.f,0.f,0.f);
-    	m_accumulatedImpulse.setValue(0.f,0.f,0.f);
-
-    	m_limitSoftness = 0.7f;
-    	m_damping = btScalar(1.0f);
-    	m_restitution = btScalar(0.5f);
-    }
-
-    btTranslationalLimitMotor(const btTranslationalLimitMotor & other )
-    {
-    	m_lowerLimit = other.m_lowerLimit;
-    	m_upperLimit = other.m_upperLimit;
-    	m_accumulatedImpulse = other.m_accumulatedImpulse;
-
-    	m_limitSoftness = other.m_limitSoftness ;
-    	m_damping = other.m_damping;
-    	m_restitution = other.m_restitution;
-    }
-
-    //! Test limit
-	/*!
-    - free means upper < lower,
-    - locked means upper == lower
-    - limited means upper > lower
-    - limitIndex: first 3 are linear, next 3 are angular
-    */
-    inline bool	isLimited(int limitIndex)
-    {
-       return (m_upperLimit[limitIndex] >= m_lowerLimit[limitIndex]);
-    }
-
-
-    btScalar solveLinearAxis(
-    	btScalar timeStep,
-        btScalar jacDiagABInv,
-        btRigidBody& body1,const btVector3 &pointInA,
-        btRigidBody& body2,const btVector3 &pointInB,
-        int limit_index,
-        const btVector3 & axis_normal_on_a,
-		const btVector3 & anchorPos);
-
-
-};
 
 /// btGeneric6DofConstraint between two rigidbodies each with a pivotpoint that descibes the axis location in local space
-/*!
-btGeneric6DofConstraint can leave any of the 6 degree of freedom 'free' or 'locked'.
-currently this limit supports rotational motors<br>
-<ul>
-<li> For Linear limits, use btGeneric6DofConstraint.setLinearUpperLimit, btGeneric6DofConstraint.setLinearLowerLimit. You can set the parameters with the btTranslationalLimitMotor structure accsesible through the btGeneric6DofConstraint.getTranslationalLimitMotor method.
-At this moment translational motors are not supported. May be in the future. </li>
-
-<li> For Angular limits, use the btRotationalLimitMotor structure for configuring the limit.
-This is accessible through btGeneric6DofConstraint.getLimitMotor method,
-This brings support for limit parameters and motors. </li>
-
-<li> Angulars limits have these possible ranges:
-<table border=1 >
-<tr
-
-	<td><b>AXIS</b></td>
-	<td><b>MIN ANGLE</b></td>
-	<td><b>MAX ANGLE</b></td>
-	<td>X</td>
-		<td>-PI</td>
-		<td>PI</td>
-	<td>Y</td>
-		<td>-PI/2</td>
-		<td>PI/2</td>
-	<td>Z</td>
-		<td>-PI/2</td>
-		<td>PI/2</td>
-</tr>
-</table>
-</li>
-</ul>
-
-*/
+/// btGeneric6DofConstraint can leave any of the 6 degree of freedom 'free' or 'locked'
+/// Work in progress (is still a Hinge actually)
 class btGeneric6DofConstraint : public btTypedConstraint
 {
-protected:
+	btJacobianEntry	m_jacLinear[3];			// 3 orthogonal linear constraints
+	btJacobianEntry	m_jacAng[3];		// 3 orthogonal angular constraints
 
-	//! relative_frames
-    //!@{
-	btTransform	m_frameInA;//!< the constraint space w.r.t body A
-    btTransform	m_frameInB;//!< the constraint space w.r.t body B
-    //!@}
-
-    //! Jacobians
-    //!@{
-    btJacobianEntry	m_jacLinear[3];//!< 3 orthogonal linear constraints
-    btJacobianEntry	m_jacAng[3];//!< 3 orthogonal angular constraints
-    //!@}
-
-	//! Linear_Limit_parameters
-    //!@{
-    btTranslationalLimitMotor m_linearLimits;
-    //!@}
-
-
-    //! hinge_parameters
-    //!@{
-    btRotationalLimitMotor m_angularLimits[3];
-	//!@}
-
-
-protected:
-    //! temporal variables
-    //!@{
-    btScalar m_timeStep;
-    btTransform m_calculatedTransformA;
-    btTransform m_calculatedTransformB;
-    btVector3 m_calculatedAxisAngleDiff;
-    btVector3 m_calculatedAxis[3];
-    
-	btVector3 m_AnchorPos; // point betwen pivots of bodies A and B to solve linear axes
-
-    bool	m_useLinearReferenceFrameA;
-    
-    //!@}
-
-    btGeneric6DofConstraint&	operator=(btGeneric6DofConstraint&	other)
-    {
-        btAssert(0);
-        (void) other;
-        return *this;
-    }
-
-
-
-    void buildLinearJacobian(
-        btJacobianEntry & jacLinear,const btVector3 & normalWorld,
-        const btVector3 & pivotAInW,const btVector3 & pivotBInW);
-
-    void buildAngularJacobian(btJacobianEntry & jacAngular,const btVector3 & jointAxisW);
-
-
-	//! calcs the euler angles between the two bodies.
-    void calculateAngleInfo();
+	btTransform	m_frameInA;			// the constraint space w.r.t body A
+	btTransform	m_frameInB;			// the constraint space w.r.t body B
 
+	btScalar      m_lowerLimit[6];	// the constraint lower limits
+	btScalar      m_upperLimit[6];	// the constraint upper limits
 
+	btScalar		m_accumulatedImpulse[6];
 
+	btGeneric6DofConstraint&	operator=(btGeneric6DofConstraint&	other)
+	{
+		btAssert(0);
+		(void) other;
+		return *this;
+	}
+		
 public:
-    btGeneric6DofConstraint(btRigidBody& rbA, btRigidBody& rbB, const btTransform& frameInA, const btTransform& frameInB ,bool useLinearReferenceFrameA);
+	btGeneric6DofConstraint(btRigidBody& rbA, btRigidBody& rbB, const btTransform& frameInA, const btTransform& frameInB );
 
-    btGeneric6DofConstraint();
+	btGeneric6DofConstraint();
 
-	//! Calcs global transform of the offsets
-	/*!
-	Calcs the global transform for the joint offset for body A an B, and also calcs the agle differences between the bodies.
-	\sa btGeneric6DofConstraint.getCalculatedTransformA , btGeneric6DofConstraint.getCalculatedTransformB, btGeneric6DofConstraint.calculateAngleInfo
-	*/
-    void calculateTransforms();
+	
+	virtual void	buildJacobian();
 
-	//! Gets the global transform of the offset for body A
-    /*!
-    \sa btGeneric6DofConstraint.getFrameOffsetA, btGeneric6DofConstraint.getFrameOffsetB, btGeneric6DofConstraint.calculateAngleInfo.
-    */
-    const btTransform & getCalculatedTransformA() const
-    {
-    	return m_calculatedTransformA;
-    }
+	virtual	void	solveConstraint(btScalar	timeStep);
 
-    //! Gets the global transform of the offset for body B
-    /*!
-    \sa btGeneric6DofConstraint.getFrameOffsetA, btGeneric6DofConstraint.getFrameOffsetB, btGeneric6DofConstraint.calculateAngleInfo.
-    */
-    const btTransform & getCalculatedTransformB() const
-    {
-    	return m_calculatedTransformB;
-    }
+	void	updateRHS(btScalar	timeStep);
 
-    const btTransform & getFrameOffsetA() const
-    {
-    	return m_frameInA;
-    }
+	btScalar computeAngle(int axis) const;
 
-    const btTransform & getFrameOffsetB() const
-    {
-    	return m_frameInB;
-    }
+	void	setLinearLowerLimit(const btVector3& linearLower)
+	{
+		m_lowerLimit[0] = linearLower.getX();
+		m_lowerLimit[1] = linearLower.getY();
+		m_lowerLimit[2] = linearLower.getZ();
+	}
 
+	void	setLinearUpperLimit(const btVector3& linearUpper)
+	{
+		m_upperLimit[0] = linearUpper.getX();
+		m_upperLimit[1] = linearUpper.getY();
+		m_upperLimit[2] = linearUpper.getZ();
+	}
 
-    btTransform & getFrameOffsetA()
-    {
-    	return m_frameInA;
-    }
+	void	setAngularLowerLimit(const btVector3& angularLower)
+	{
+		m_lowerLimit[3] = angularLower.getX();
+		m_lowerLimit[4] = angularLower.getY();
+		m_lowerLimit[5] = angularLower.getZ();
+	}
 
-    btTransform & getFrameOffsetB()
-    {
-    	return m_frameInB;
-    }
+	void	setAngularUpperLimit(const btVector3& angularUpper)
+	{
+		m_upperLimit[3] = angularUpper.getX();
+		m_upperLimit[4] = angularUpper.getY();
+		m_upperLimit[5] = angularUpper.getZ();
+	}
 
+	//first 3 are linear, next 3 are angular
+	void SetLimit(int axis, btScalar lo, btScalar hi)
+	{
+		m_lowerLimit[axis] = lo; 
+		m_upperLimit[axis] = hi; 
+	}
 
-	//! performs Jacobian calculation, and also calculates angle differences and axis
-    virtual void	buildJacobian();
+	//free means upper < lower, 
+	//locked means upper == lower
+	//limited means upper > lower
+	//limitIndex: first 3 are linear, next 3 are angular
+	bool	isLimited(int limitIndex)
+	{
+		return (m_upperLimit[limitIndex] >= m_lowerLimit[limitIndex]);
+	}
 
-    virtual	void	solveConstraint(btScalar	timeStep);
-
-    void	updateRHS(btScalar	timeStep);
-
-	//! Get the rotation axis in global coordinates
-	/*!
-	\pre btGeneric6DofConstraint.buildJacobian must be called previously.
-	*/
-    btVector3 getAxis(int axis_index) const;
-
-    //! Get the relative Euler angle
-    /*!
-	\pre btGeneric6DofConstraint.buildJacobian must be called previously.
-	*/
-    btScalar getAngle(int axis_index) const;
-
-	//! Test angular limit.
-	/*!
-	Calculates angular correction and returns true if limit needs to be corrected.
-	\pre btGeneric6DofConstraint.buildJacobian must be called previously.
-	*/
-    bool testAngularLimitMotor(int axis_index);
-
-    void	setLinearLowerLimit(const btVector3& linearLower)
-    {
-    	m_linearLimits.m_lowerLimit = linearLower;
-    }
-
-    void	setLinearUpperLimit(const btVector3& linearUpper)
-    {
-    	m_linearLimits.m_upperLimit = linearUpper;
-    }
-
-    void	setAngularLowerLimit(const btVector3& angularLower)
-    {
-        m_angularLimits[0].m_loLimit = angularLower.getX();
-        m_angularLimits[1].m_loLimit = angularLower.getY();
-        m_angularLimits[2].m_loLimit = angularLower.getZ();
-    }
-
-    void	setAngularUpperLimit(const btVector3& angularUpper)
-    {
-        m_angularLimits[0].m_hiLimit = angularUpper.getX();
-        m_angularLimits[1].m_hiLimit = angularUpper.getY();
-        m_angularLimits[2].m_hiLimit = angularUpper.getZ();
-    }
-
-	//! Retrieves the angular limit informacion
-    btRotationalLimitMotor * getRotationalLimitMotor(int index)
-    {
-    	return &m_angularLimits[index];
-    }
-
-    //! Retrieves the  limit informacion
-    btTranslationalLimitMotor * getTranslationalLimitMotor()
-    {
-    	return &m_linearLimits;
-    }
-
-    //first 3 are linear, next 3 are angular
-    void setLimit(int axis, btScalar lo, btScalar hi)
-    {
-    	if(axis<3)
-    	{
-    		m_linearLimits.m_lowerLimit[axis] = lo;
-    		m_linearLimits.m_upperLimit[axis] = hi;
-    	}
-    	else
-    	{
-    		m_angularLimits[axis-3].m_loLimit = lo;
-    		m_angularLimits[axis-3].m_hiLimit = hi;
-    	}
-    }
-
-	//! Test limit
-	/*!
-    - free means upper < lower,
-    - locked means upper == lower
-    - limited means upper > lower
-    - limitIndex: first 3 are linear, next 3 are angular
-    */
-    bool	isLimited(int limitIndex)
-    {
-    	if(limitIndex<3)
-    	{
-			return m_linearLimits.isLimited(limitIndex);
-
-    	}
-        return m_angularLimits[limitIndex-3].isLimited();
-    }
-
-    const btRigidBody& getRigidBodyA() const
-    {
-        return m_rbA;
-    }
-    const btRigidBody& getRigidBodyB() const
-    {
-        return m_rbB;
-    }
-
-	virtual void calcAnchorPos(void); // overridable
+	const btRigidBody& getRigidBodyA() const
+	{
+		return m_rbA;
+	}
+	const btRigidBody& getRigidBodyB() const
+	{
+		return m_rbB;
+	}
+	
 
 };
 
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp
index 114abce24c7..27e30987549 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.cpp
@@ -17,185 +17,58 @@ subject to the following restrictions:
 #include "btHingeConstraint.h"
 #include "BulletDynamics/Dynamics/btRigidBody.h"
 #include "LinearMath/btTransformUtil.h"
-#include "LinearMath/btMinMax.h"
 #include <new>
 
-
-btHingeConstraint::btHingeConstraint()
-: btTypedConstraint (HINGE_CONSTRAINT_TYPE),
+btHingeConstraint::btHingeConstraint():
 m_enableAngularMotor(false)
 {
 }
 
 btHingeConstraint::btHingeConstraint(btRigidBody& rbA,btRigidBody& rbB, const btVector3& pivotInA,const btVector3& pivotInB,
-									 btVector3& axisInA,btVector3& axisInB)
-									 :btTypedConstraint(HINGE_CONSTRAINT_TYPE, rbA,rbB),
-									 m_angularOnly(false),
-									 m_enableAngularMotor(false)
+								 btVector3& axisInA,btVector3& axisInB)
+:btTypedConstraint(rbA,rbB),m_pivotInA(pivotInA),m_pivotInB(pivotInB),
+m_axisInA(axisInA),
+m_axisInB(-axisInB),
+m_angularOnly(false),
+m_enableAngularMotor(false)
 {
-	m_rbAFrame.getOrigin() = pivotInA;
-	
-	// since no frame is given, assume this to be zero angle and just pick rb transform axis
-	btVector3 rbAxisA1 = rbA.getCenterOfMassTransform().getBasis().getColumn(0);
-
-	btVector3 rbAxisA2;
-	btScalar projection = axisInA.dot(rbAxisA1);
-	if (projection >= 1.0f - SIMD_EPSILON) {
-		rbAxisA1 = -rbA.getCenterOfMassTransform().getBasis().getColumn(2);
-		rbAxisA2 = rbA.getCenterOfMassTransform().getBasis().getColumn(1);
-	} else if (projection <= -1.0f + SIMD_EPSILON) {
-		rbAxisA1 = rbA.getCenterOfMassTransform().getBasis().getColumn(2);
-		rbAxisA2 = rbA.getCenterOfMassTransform().getBasis().getColumn(1);      
-	} else {
-		rbAxisA2 = axisInA.cross(rbAxisA1);
-		rbAxisA1 = rbAxisA2.cross(axisInA);
-	}
-
-	m_rbAFrame.getBasis().setValue( rbAxisA1.getX(),rbAxisA2.getX(),axisInA.getX(),
-									rbAxisA1.getY(),rbAxisA2.getY(),axisInA.getY(),
-									rbAxisA1.getZ(),rbAxisA2.getZ(),axisInA.getZ() );
-
-	btQuaternion rotationArc = shortestArcQuat(axisInA,axisInB);
-	btVector3 rbAxisB1 =  quatRotate(rotationArc,rbAxisA1);
-	btVector3 rbAxisB2 =  axisInB.cross(rbAxisB1);	
-	
-	m_rbBFrame.getOrigin() = pivotInB;
-	m_rbBFrame.getBasis().setValue( rbAxisB1.getX(),rbAxisB2.getX(),-axisInB.getX(),
-									rbAxisB1.getY(),rbAxisB2.getY(),-axisInB.getY(),
-									rbAxisB1.getZ(),rbAxisB2.getZ(),-axisInB.getZ() );
-	
-	//start with free
-	m_lowerLimit = btScalar(1e30);
-	m_upperLimit = btScalar(-1e30);
-	m_biasFactor = 0.3f;
-	m_relaxationFactor = 1.0f;
-	m_limitSoftness = 0.9f;
-	m_solveLimit = false;
 
 }
 
 
 btHingeConstraint::btHingeConstraint(btRigidBody& rbA,const btVector3& pivotInA,btVector3& axisInA)
-:btTypedConstraint(HINGE_CONSTRAINT_TYPE, rbA), m_angularOnly(false), m_enableAngularMotor(false)
+:btTypedConstraint(rbA),m_pivotInA(pivotInA),m_pivotInB(rbA.getCenterOfMassTransform()(pivotInA)),
+m_axisInA(axisInA),
+//fixed axis in worldspace
+m_axisInB(rbA.getCenterOfMassTransform().getBasis() * -axisInA),
+m_angularOnly(false),
+m_enableAngularMotor(false)
 {
-
-	// since no frame is given, assume this to be zero angle and just pick rb transform axis
-	// fixed axis in worldspace
-	btVector3 rbAxisA1 = rbA.getCenterOfMassTransform().getBasis().getColumn(0);
-	btScalar projection = rbAxisA1.dot(axisInA);
-	if (projection > SIMD_EPSILON)
-		rbAxisA1 = rbAxisA1*projection - axisInA;
-	else
-		rbAxisA1 = rbA.getCenterOfMassTransform().getBasis().getColumn(1);
-
-	btVector3 rbAxisA2 = axisInA.cross(rbAxisA1);
-
-	m_rbAFrame.getOrigin() = pivotInA;
-	m_rbAFrame.getBasis().setValue( rbAxisA1.getX(),rbAxisA2.getX(),axisInA.getX(),
-									rbAxisA1.getY(),rbAxisA2.getY(),axisInA.getY(),
-									rbAxisA1.getZ(),rbAxisA2.getZ(),axisInA.getZ() );
-
-
-	btVector3 axisInB = rbA.getCenterOfMassTransform().getBasis() * -axisInA;
-
-	btQuaternion rotationArc = shortestArcQuat(axisInA,axisInB);
-	btVector3 rbAxisB1 =  quatRotate(rotationArc,rbAxisA1);
-	btVector3 rbAxisB2 = axisInB.cross(rbAxisB1);
-
-
-	m_rbBFrame.getOrigin() = rbA.getCenterOfMassTransform()(pivotInA);
-	m_rbBFrame.getBasis().setValue( rbAxisB1.getX(),rbAxisB2.getX(),axisInB.getX(),
-									rbAxisB1.getY(),rbAxisB2.getY(),axisInB.getY(),
-									rbAxisB1.getZ(),rbAxisB2.getZ(),axisInB.getZ() );
 	
-	//start with free
-	m_lowerLimit = btScalar(1e30);
-	m_upperLimit = btScalar(-1e30);
-	m_biasFactor = 0.3f;
-	m_relaxationFactor = 1.0f;
-	m_limitSoftness = 0.9f;
-	m_solveLimit = false;
-}
-
-btHingeConstraint::btHingeConstraint(btRigidBody& rbA,btRigidBody& rbB, 
-								     const btTransform& rbAFrame, const btTransform& rbBFrame)
-:btTypedConstraint(HINGE_CONSTRAINT_TYPE, rbA,rbB),m_rbAFrame(rbAFrame),m_rbBFrame(rbBFrame),
-m_angularOnly(false),
-m_enableAngularMotor(false)
-{
-	// flip axis
-	m_rbBFrame.getBasis()[0][2] *= btScalar(-1.);
-	m_rbBFrame.getBasis()[1][2] *= btScalar(-1.);
-	m_rbBFrame.getBasis()[2][2] *= btScalar(-1.);
-
-	//start with free
-	m_lowerLimit = btScalar(1e30);
-	m_upperLimit = btScalar(-1e30);
-	m_biasFactor = 0.3f;
-	m_relaxationFactor = 1.0f;
-	m_limitSoftness = 0.9f;
-	m_solveLimit = false;
-}			
-
-
-
-btHingeConstraint::btHingeConstraint(btRigidBody& rbA, const btTransform& rbAFrame)
-:btTypedConstraint(HINGE_CONSTRAINT_TYPE, rbA),m_rbAFrame(rbAFrame),m_rbBFrame(rbAFrame),
-m_angularOnly(false),
-m_enableAngularMotor(false)
-{
-	///not providing rigidbody B means implicitly using worldspace for body B
-
-	// flip axis
-	m_rbBFrame.getBasis()[0][2] *= btScalar(-1.);
-	m_rbBFrame.getBasis()[1][2] *= btScalar(-1.);
-	m_rbBFrame.getBasis()[2][2] *= btScalar(-1.);
-
-	m_rbBFrame.getOrigin() = m_rbA.getCenterOfMassTransform()(m_rbAFrame.getOrigin());
-
-	//start with free
-	m_lowerLimit = btScalar(1e30);
-	m_upperLimit = btScalar(-1e30);	
-	m_biasFactor = 0.3f;
-	m_relaxationFactor = 1.0f;
-	m_limitSoftness = 0.9f;
-	m_solveLimit = false;
 }
 
 void	btHingeConstraint::buildJacobian()
 {
 	m_appliedImpulse = btScalar(0.);
 
+	btVector3	normal(0,0,0);
+
 	if (!m_angularOnly)
 	{
-		btVector3 pivotAInW = m_rbA.getCenterOfMassTransform()*m_rbAFrame.getOrigin();
-		btVector3 pivotBInW = m_rbB.getCenterOfMassTransform()*m_rbBFrame.getOrigin();
-		btVector3 relPos = pivotBInW - pivotAInW;
-
-		btVector3 normal[3];
-		if (relPos.length2() > SIMD_EPSILON)
-		{
-			normal[0] = relPos.normalized();
-		}
-		else
-		{
-			normal[0].setValue(btScalar(1.0),0,0);
-		}
-
-		btPlaneSpace1(normal[0], normal[1], normal[2]);
-
 		for (int i=0;i<3;i++)
 		{
+			normal[i] = 1;
 			new (&m_jac[i]) btJacobianEntry(
 				m_rbA.getCenterOfMassTransform().getBasis().transpose(),
 				m_rbB.getCenterOfMassTransform().getBasis().transpose(),
-				pivotAInW - m_rbA.getCenterOfMassPosition(),
-				pivotBInW - m_rbB.getCenterOfMassPosition(),
-				normal[i],
+				m_rbA.getCenterOfMassTransform()*m_pivotInA - m_rbA.getCenterOfMassPosition(),
+				m_rbB.getCenterOfMassTransform()*m_pivotInB - m_rbB.getCenterOfMassPosition(),
+				normal,
 				m_rbA.getInvInertiaDiagLocal(),
 				m_rbA.getInvMass(),
 				m_rbB.getInvInertiaDiagLocal(),
 				m_rbB.getInvMass());
+			normal[i] = 0;
 		}
 	}
 
@@ -206,12 +79,12 @@ void	btHingeConstraint::buildJacobian()
 	btVector3 jointAxis0local;
 	btVector3 jointAxis1local;
 	
-	btPlaneSpace1(m_rbAFrame.getBasis().getColumn(2),jointAxis0local,jointAxis1local);
+	btPlaneSpace1(m_axisInA,jointAxis0local,jointAxis1local);
 
-	getRigidBodyA().getCenterOfMassTransform().getBasis() * m_rbAFrame.getBasis().getColumn(2);
+	getRigidBodyA().getCenterOfMassTransform().getBasis() * m_axisInA;
 	btVector3 jointAxis0 = getRigidBodyA().getCenterOfMassTransform().getBasis() * jointAxis0local;
 	btVector3 jointAxis1 = getRigidBodyA().getCenterOfMassTransform().getBasis() * jointAxis1local;
-	btVector3 hingeAxisWorld = getRigidBodyA().getCenterOfMassTransform().getBasis() * m_rbAFrame.getBasis().getColumn(2);
+	btVector3 hingeAxisWorld = getRigidBodyA().getCenterOfMassTransform().getBasis() * m_axisInA;
 		
 	new (&m_jacAng[0])	btJacobianEntry(jointAxis0,
 		m_rbA.getCenterOfMassTransform().getBasis().transpose(),
@@ -232,70 +105,44 @@ void	btHingeConstraint::buildJacobian()
 		m_rbB.getInvInertiaDiagLocal());
 
 
-	// Compute limit information
-	btScalar hingeAngle = getHingeAngle();  
-
-	//set bias, sign, clear accumulator
-	m_correction = btScalar(0.);
-	m_limitSign = btScalar(0.);
-	m_solveLimit = false;
-	m_accLimitImpulse = btScalar(0.);
-
-	if (m_lowerLimit < m_upperLimit)
-	{
-		if (hingeAngle <= m_lowerLimit*m_limitSoftness)
-		{
-			m_correction = (m_lowerLimit - hingeAngle);
-			m_limitSign = 1.0f;
-			m_solveLimit = true;
-		} 
-		else if (hingeAngle >= m_upperLimit*m_limitSoftness)
-		{
-			m_correction = m_upperLimit - hingeAngle;
-			m_limitSign = -1.0f;
-			m_solveLimit = true;
-		}
-	}
-
-	//Compute K = J*W*J' for hinge axis
-	btVector3 axisA =  getRigidBodyA().getCenterOfMassTransform().getBasis() *  m_rbAFrame.getBasis().getColumn(2);
-	m_kHinge =   1.0f / (getRigidBodyA().computeAngularImpulseDenominator(axisA) +
-			             getRigidBodyB().computeAngularImpulseDenominator(axisA));
 
 }
 
 void	btHingeConstraint::solveConstraint(btScalar	timeStep)
 {
 
-	btVector3 pivotAInW = m_rbA.getCenterOfMassTransform()*m_rbAFrame.getOrigin();
-	btVector3 pivotBInW = m_rbB.getCenterOfMassTransform()*m_rbBFrame.getOrigin();
+	btVector3 pivotAInW = m_rbA.getCenterOfMassTransform()*m_pivotInA;
+	btVector3 pivotBInW = m_rbB.getCenterOfMassTransform()*m_pivotInB;
 
+	btVector3 normal(0,0,0);
 	btScalar tau = btScalar(0.3);
+	btScalar damping = btScalar(1.);
 
-	//linear part
+//linear part
 	if (!m_angularOnly)
 	{
-		btVector3 rel_pos1 = pivotAInW - m_rbA.getCenterOfMassPosition(); 
-		btVector3 rel_pos2 = pivotBInW - m_rbB.getCenterOfMassPosition();
-
-		btVector3 vel1 = m_rbA.getVelocityInLocalPoint(rel_pos1);
-		btVector3 vel2 = m_rbB.getVelocityInLocalPoint(rel_pos2);
-		btVector3 vel = vel1 - vel2;
-
 		for (int i=0;i<3;i++)
 		{		
-			const btVector3& normal = m_jac[i].m_linearJointAxis;
+			normal[i] = 1;
 			btScalar jacDiagABInv = btScalar(1.) / m_jac[i].getDiagonal();
 
+			btVector3 rel_pos1 = pivotAInW - m_rbA.getCenterOfMassPosition(); 
+			btVector3 rel_pos2 = pivotBInW - m_rbB.getCenterOfMassPosition();
+			
+			btVector3 vel1 = m_rbA.getVelocityInLocalPoint(rel_pos1);
+			btVector3 vel2 = m_rbB.getVelocityInLocalPoint(rel_pos2);
+			btVector3 vel = vel1 - vel2;
 			btScalar rel_vel;
 			rel_vel = normal.dot(vel);
 			//positional error (zeroth order error)
 			btScalar depth = -(pivotAInW - pivotBInW).dot(normal); //this is the error projected on the normal
-			btScalar impulse = depth*tau/timeStep  * jacDiagABInv -  rel_vel * jacDiagABInv;
+			btScalar impulse = depth*tau/timeStep  * jacDiagABInv -  damping * rel_vel * jacDiagABInv * damping;
 			m_appliedImpulse += impulse;
 			btVector3 impulse_vector = normal * impulse;
 			m_rbA.applyImpulse(impulse_vector, pivotAInW - m_rbA.getCenterOfMassPosition());
 			m_rbB.applyImpulse(-impulse_vector, pivotBInW - m_rbB.getCenterOfMassPosition());
+			
+			normal[i] = 0;
 		}
 	}
 
@@ -304,8 +151,8 @@ void	btHingeConstraint::solveConstraint(btScalar	timeStep)
 		///solve angular part
 
 		// get axes in world space
-		btVector3 axisA =  getRigidBodyA().getCenterOfMassTransform().getBasis() *  m_rbAFrame.getBasis().getColumn(2);
-		btVector3 axisB =  getRigidBodyB().getCenterOfMassTransform().getBasis() *  m_rbBFrame.getBasis().getColumn(2);
+		btVector3 axisA = getRigidBodyA().getCenterOfMassTransform().getBasis() * m_axisInA;
+		btVector3 axisB = getRigidBodyB().getCenterOfMassTransform().getBasis() * m_axisInB;
 
 		const btVector3& angVelA = getRigidBodyA().getAngularVelocity();
 		const btVector3& angVelB = getRigidBodyB().getAngularVelocity();
@@ -327,7 +174,7 @@ void	btHingeConstraint::solveConstraint(btScalar	timeStep)
 					getRigidBodyB().computeAngularImpulseDenominator(normal);
 				// scale for mass and relaxation
 				//todo:  expose this 0.9 factor to developer
-				velrelOrthog *= (btScalar(1.)/denom) * m_relaxationFactor;
+				velrelOrthog *= (btScalar(1.)/denom) * btScalar(0.9);
 			}
 
 			//solve angular positional correction
@@ -343,28 +190,10 @@ void	btHingeConstraint::solveConstraint(btScalar	timeStep)
 
 			m_rbA.applyTorqueImpulse(-velrelOrthog+angularError);
 			m_rbB.applyTorqueImpulse(velrelOrthog-angularError);
-
-			// solve limit
-			if (m_solveLimit)
-			{
-				btScalar amplitude = ( (angVelB - angVelA).dot( axisA )*m_relaxationFactor + m_correction* (btScalar(1.)/timeStep)*m_biasFactor  ) * m_limitSign;
-
-				btScalar impulseMag = amplitude * m_kHinge;
-
-				// Clamp the accumulated impulse
-				btScalar temp = m_accLimitImpulse;
-				m_accLimitImpulse = btMax(m_accLimitImpulse + impulseMag, btScalar(0) );
-				impulseMag = m_accLimitImpulse - temp;
-
-
-				btVector3 impulse = axisA * impulseMag * m_limitSign;
-				m_rbA.applyTorqueImpulse(impulse);
-				m_rbB.applyTorqueImpulse(-impulse);
-			}
 		}
 
 		//apply motor
-		if (m_enableAngularMotor) 
+		if (m_enableAngularMotor)
 		{
 			//todo: add limits too
 			btVector3 angularLimit(0,0,0);
@@ -375,7 +204,10 @@ void	btHingeConstraint::solveConstraint(btScalar	timeStep)
 			btScalar desiredMotorVel = m_motorTargetVelocity;
 			btScalar motor_relvel = desiredMotorVel - projRelVel;
 
-			btScalar unclippedMotorImpulse = m_kHinge * motor_relvel;;
+			btScalar denom3 = getRigidBodyA().computeAngularImpulseDenominator(axisA) +
+					getRigidBodyB().computeAngularImpulseDenominator(axisA);
+
+			btScalar unclippedMotorImpulse = (btScalar(1.)/denom3) * motor_relvel;;
 			//todo: should clip against accumulated impulse
 			btScalar clippedMotorImpulse = unclippedMotorImpulse > m_maxMotorImpulse ? m_maxMotorImpulse : unclippedMotorImpulse;
 			clippedMotorImpulse = clippedMotorImpulse < -m_maxMotorImpulse ? -m_maxMotorImpulse : clippedMotorImpulse;
@@ -395,12 +227,3 @@ void	btHingeConstraint::updateRHS(btScalar	timeStep)
 
 }
 
-btScalar btHingeConstraint::getHingeAngle()
-{
-	const btVector3 refAxis0  = getRigidBodyA().getCenterOfMassTransform().getBasis() * m_rbAFrame.getBasis().getColumn(0);
-	const btVector3 refAxis1  = getRigidBodyA().getCenterOfMassTransform().getBasis() * m_rbAFrame.getBasis().getColumn(1);
-	const btVector3 swingAxis = getRigidBodyB().getCenterOfMassTransform().getBasis() * m_rbBFrame.getBasis().getColumn(1);
-
-	return btAtan2Fast( swingAxis.dot(refAxis0), swingAxis.dot(refAxis1)  );
-}
-
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h
index 4fa9972f6d8..5c1ceafbc5b 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h
@@ -13,61 +13,39 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-/* Hinge Constraint by Dirk Gregorius. Limits added by Marcus Hennix at Starbreeze Studios */
-
 #ifndef HINGECONSTRAINT_H
 #define HINGECONSTRAINT_H
 
-#include "LinearMath/btVector3.h"
+#include "../../LinearMath/btVector3.h"
 #include "btJacobianEntry.h"
 #include "btTypedConstraint.h"
 
 class btRigidBody;
 
+
 /// hinge constraint between two rigidbodies each with a pivotpoint that descibes the axis location in local space
 /// axis defines the orientation of the hinge axis
 class btHingeConstraint : public btTypedConstraint
 {
-#ifdef IN_PARALLELL_SOLVER
-public:
-#endif
 	btJacobianEntry	m_jac[3]; //3 orthogonal linear constraints
 	btJacobianEntry	m_jacAng[3]; //2 orthogonal angular constraints+ 1 for limit/motor
 
-	btTransform m_rbAFrame; // constraint axii. Assumes z is hinge axis.
-	btTransform m_rbBFrame;
-
-	btScalar	m_motorTargetVelocity;
-	btScalar	m_maxMotorImpulse;
-
-	btScalar	m_limitSoftness; 
-	btScalar	m_biasFactor; 
-	btScalar    m_relaxationFactor; 
-
-	btScalar    m_lowerLimit;	
-	btScalar    m_upperLimit;	
-	
-	btScalar	m_kHinge;
-
-	btScalar	m_limitSign;
-	btScalar	m_correction;
-
-	btScalar	m_accLimitImpulse;
+	btVector3	m_pivotInA;
+	btVector3	m_pivotInB;
+	btVector3	m_axisInA;
+	btVector3	m_axisInB;
 
 	bool		m_angularOnly;
-	bool		m_enableAngularMotor;
-	bool		m_solveLimit;
 
+	btScalar		m_motorTargetVelocity;
+	btScalar		m_maxMotorImpulse;
+	bool		m_enableAngularMotor;
 	
 public:
 
-	btHingeConstraint(btRigidBody& rbA,btRigidBody& rbB, const btVector3& pivotInA,const btVector3& pivotInB, btVector3& axisInA,btVector3& axisInB);
+	btHingeConstraint(btRigidBody& rbA,btRigidBody& rbB, const btVector3& pivotInA,const btVector3& pivotInB,btVector3& axisInA,btVector3& axisInB);
 
 	btHingeConstraint(btRigidBody& rbA,const btVector3& pivotInA,btVector3& axisInA);
-	
-	btHingeConstraint(btRigidBody& rbA,btRigidBody& rbB, const btTransform& rbAFrame, const btTransform& rbBFrame);
-
-	btHingeConstraint(btRigidBody& rbA,const btTransform& rbAFrame);
 
 	btHingeConstraint();
 
@@ -98,61 +76,6 @@ public:
 		m_maxMotorImpulse = maxMotorImpulse;
 	}
 
-	void	setLimit(btScalar low,btScalar high,btScalar _softness = 0.9f, btScalar _biasFactor = 0.3f, btScalar _relaxationFactor = 1.0f)
-	{
-		m_lowerLimit = low;
-		m_upperLimit = high;
-
-		m_limitSoftness =  _softness;
-		m_biasFactor = _biasFactor;
-		m_relaxationFactor = _relaxationFactor;
-
-	}
-
-	btScalar	getLowerLimit() const
-	{
-		return m_lowerLimit;
-	}
-
-	btScalar	getUpperLimit() const
-	{
-		return m_upperLimit;
-	}
-
-
-	btScalar getHingeAngle();
-
-
-	const btTransform& getAFrame() { return m_rbAFrame; };	
-	const btTransform& getBFrame() { return m_rbBFrame; };
-
-	inline int getSolveLimit()
-	{
-		return m_solveLimit;
-	}
-
-	inline btScalar getLimitSign()
-	{
-		return m_limitSign;
-	}
-
-	inline bool getAngularOnly() 
-	{ 
-		return m_angularOnly; 
-	}
-	inline bool getEnableAngularMotor() 
-	{ 
-		return m_enableAngularMotor; 
-	}
-	inline btScalar getMotorTargetVelosity() 
-	{ 
-		return m_motorTargetVelocity; 
-	}
-	inline btScalar getMaxMotorImpulse() 
-	{ 
-		return m_maxMotorImpulse; 
-	}
-
 };
 
 #endif //HINGECONSTRAINT_H
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btJacobianEntry.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btJacobianEntry.h
index bfeb24c2dfb..aae3ed0373f 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btJacobianEntry.h
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btJacobianEntry.h
@@ -16,8 +16,8 @@ subject to the following restrictions:
 #ifndef JACOBIAN_ENTRY_H
 #define JACOBIAN_ENTRY_H
 
-#include "LinearMath/btVector3.h"
-#include "BulletDynamics/Dynamics/btRigidBody.h"
+#include "../../LinearMath/btVector3.h"
+#include "../Dynamics/btRigidBody.h"
 
 
 //notes:
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp
index 2b69ad90438..aacb0a3ea66 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.cpp
@@ -21,19 +21,18 @@ subject to the following restrictions:
 
 
 btPoint2PointConstraint::btPoint2PointConstraint()
-:btTypedConstraint(POINT2POINT_CONSTRAINT_TYPE)
 {
 }
 
 btPoint2PointConstraint::btPoint2PointConstraint(btRigidBody& rbA,btRigidBody& rbB, const btVector3& pivotInA,const btVector3& pivotInB)
-:btTypedConstraint(POINT2POINT_CONSTRAINT_TYPE,rbA,rbB),m_pivotInA(pivotInA),m_pivotInB(pivotInB)
+:btTypedConstraint(rbA,rbB),m_pivotInA(pivotInA),m_pivotInB(pivotInB)
 {
 
 }
 
 
 btPoint2PointConstraint::btPoint2PointConstraint(btRigidBody& rbA,const btVector3& pivotInA)
-:btTypedConstraint(POINT2POINT_CONSTRAINT_TYPE,rbA),m_pivotInA(pivotInA),m_pivotInB(rbA.getCenterOfMassTransform()(pivotInA))
+:btTypedConstraint(rbA),m_pivotInA(pivotInA),m_pivotInB(rbA.getCenterOfMassTransform()(pivotInA))
 {
 	
 }
@@ -100,16 +99,6 @@ void	btPoint2PointConstraint::solveConstraint(btScalar	timeStep)
 		btScalar depth = -(pivotAInW - pivotBInW).dot(normal); //this is the error projected on the normal
 		
 		btScalar impulse = depth*m_setting.m_tau/timeStep  * jacDiagABInv -  m_setting.m_damping * rel_vel * jacDiagABInv;
-
-		btScalar impulseClamp = m_setting.m_impulseClamp;
-		if (impulseClamp > 0)
-		{
-			if (impulse < -impulseClamp) 
-				impulse = -impulseClamp;
-			if (impulse > impulseClamp) 
-				impulse = impulseClamp;
-		}
-
 		m_appliedImpulse+=impulse;
 		btVector3 impulse_vector = normal * impulse;
 		m_rbA.applyImpulse(impulse_vector, pivotAInW - m_rbA.getCenterOfMassPosition());
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h
index c9d5968530c..71da8ac0347 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h
@@ -16,7 +16,7 @@ subject to the following restrictions:
 #ifndef POINT2POINTCONSTRAINT_H
 #define POINT2POINTCONSTRAINT_H
 
-#include "LinearMath/btVector3.h"
+#include "../../LinearMath/btVector3.h"
 #include "btJacobianEntry.h"
 #include "btTypedConstraint.h"
 
@@ -26,21 +26,16 @@ struct	btConstraintSetting
 {
 	btConstraintSetting()	:
 		m_tau(btScalar(0.3)),
-		m_damping(btScalar(1.)),
-		m_impulseClamp(btScalar(0.))
+		m_damping(btScalar(1.))
 	{
 	}
 	btScalar		m_tau;
 	btScalar		m_damping;
-	btScalar		m_impulseClamp;
 };
 
 /// point to point constraint between two rigidbodies each with a pivotpoint that descibes the 'ballsocket' location in local space
 class btPoint2PointConstraint : public btTypedConstraint
 {
-#ifdef IN_PARALLELL_SOLVER
-public:
-#endif
 	btJacobianEntry	m_jac[3]; //3 orthogonal linear constraints
 	
 	btVector3	m_pivotInA;
@@ -75,15 +70,6 @@ public:
 		m_pivotInB = pivotB;
 	}
 
-	const btVector3& getPivotInA() const
-	{
-		return m_pivotInA;
-	}
-
-	const btVector3& getPivotInB() const
-	{
-		return m_pivotInB;
-	}
 
 
 };
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
index b8afbd6aac5..14b36ad44fd 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
@@ -13,9 +13,6 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-//#define COMPUTE_IMPULSE_DENOM 1
-//It is not necessary (redundant) to refresh contact manifolds, this refresh has been moved to the collision algorithms.
-//#define FORCE_REFESH_CONTACT_MANIFOLDS 1
 
 #include "btSequentialImpulseConstraintSolver.h"
 #include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h"
@@ -33,9 +30,11 @@ subject to the following restrictions:
 #include "btSolverBody.h"
 #include "btSolverConstraint.h"
 
-
 #include "LinearMath/btAlignedObjectArray.h"
 
+#ifdef USE_PROFILE
+#include "LinearMath/btQuickprof.h"
+#endif //USE_PROFILE
 
 int totalCpd = 0;
 
@@ -65,7 +64,7 @@ unsigned long btSequentialImpulseConstraintSolver::btRand2()
 int btSequentialImpulseConstraintSolver::btRandInt2 (int n)
 {
   // seems good; xor-fold and modulus
-  const unsigned long un = static_cast<unsigned long>(n);
+  const unsigned long un = n;
   unsigned long r = btRand2();
 
   // note: probably more aggressive than it needs to be -- might be
@@ -92,12 +91,12 @@ int btSequentialImpulseConstraintSolver::btRandInt2 (int n)
 
 
 
-bool  MyContactDestroyedCallback(void* userPersistentData);
+
 bool  MyContactDestroyedCallback(void* userPersistentData)
 {
 	assert (userPersistentData);
 	btConstraintPersistentData* cpd = (btConstraintPersistentData*)userPersistentData;
-	btAlignedFree(cpd);
+	delete cpd;
 	totalCpd--;
 	//printf("totalCpd = %i. DELETED Ptr %x\n",totalCpd,userPersistentData);
 	return true;
@@ -106,7 +105,8 @@ bool  MyContactDestroyedCallback(void* userPersistentData)
 
 
 btSequentialImpulseConstraintSolver::btSequentialImpulseConstraintSolver()
-:m_btSeed2(0)
+:m_solverMode(SOLVER_RANDMIZE_ORDER | SOLVER_CACHE_FRIENDLY), //not using SOLVER_USE_WARMSTARTING,
+m_btSeed2(0)
 {
 	gContactDestroyedCallback = &MyContactDestroyedCallback;
 
@@ -121,42 +121,27 @@ btSequentialImpulseConstraintSolver::btSequentialImpulseConstraintSolver()
 		}
 }
 
-btSequentialImpulseConstraintSolver::~btSequentialImpulseConstraintSolver()
-{
 
+void	initSolverBody(btSolverBody* solverBody, btRigidBody* rigidbody)
+{
+/*	int size = sizeof(btSolverBody);
+	int sizeofrb = sizeof(btRigidBody);
+	int sizemanifold = sizeof(btPersistentManifold);
+	int sizeofmp = sizeof(btManifoldPoint);
+	int sizeofPersistData = sizeof (btConstraintPersistentData);
+*/
+
+	solverBody->m_angularVelocity = rigidbody->getAngularVelocity();
+	solverBody->m_centerOfMassPosition = rigidbody->getCenterOfMassPosition();
+	solverBody->m_friction = rigidbody->getFriction();
+//	solverBody->m_invInertiaWorld = rigidbody->getInvInertiaTensorWorld();
+	solverBody->m_invMass = rigidbody->getInvMass();
+	solverBody->m_linearVelocity = rigidbody->getLinearVelocity();
+	solverBody->m_originalBody = rigidbody;
+	solverBody->m_angularFactor = rigidbody->getAngularFactor();
 }
 
-void	initSolverBody(btSolverBody* solverBody, btCollisionObject* collisionObject);
-void	initSolverBody(btSolverBody* solverBody, btCollisionObject* collisionObject)
-{
-	btRigidBody* rb = btRigidBody::upcast(collisionObject);
-	if (rb)
-	{
-		solverBody->m_angularVelocity = rb->getAngularVelocity() ;
-		solverBody->m_centerOfMassPosition = collisionObject->getWorldTransform().getOrigin();
-		solverBody->m_friction = collisionObject->getFriction();
-		solverBody->m_invMass = rb->getInvMass();
-		solverBody->m_linearVelocity = rb->getLinearVelocity();
-		solverBody->m_originalBody = rb;
-		solverBody->m_angularFactor = rb->getAngularFactor();
-	} else
-	{
-		solverBody->m_angularVelocity.setValue(0,0,0);
-		solverBody->m_centerOfMassPosition = collisionObject->getWorldTransform().getOrigin();
-		solverBody->m_friction = collisionObject->getFriction();
-		solverBody->m_invMass = 0.f;
-		solverBody->m_linearVelocity.setValue(0,0,0);
-		solverBody->m_originalBody = 0;
-		solverBody->m_angularFactor = 1.f;
-	}
-	solverBody->m_pushVelocity.setValue(0.f,0.f,0.f);
-	solverBody->m_turnVelocity.setValue(0.f,0.f,0.f);
-}
-
-
-int		gNumSplitImpulseRecoveries = 0;
-
-btScalar restitutionCurve(btScalar rel_vel, btScalar restitution);
+btScalar penetrationResolveFactor = btScalar(0.9);
 btScalar restitutionCurve(btScalar rel_vel, btScalar restitution)
 {
 	btScalar rest = restitution * -rel_vel;
@@ -164,95 +149,30 @@ btScalar restitutionCurve(btScalar rel_vel, btScalar restitution)
 }
 
 
-void	resolveSplitPenetrationImpulseCacheFriendly(
-        btSolverBody& body1,
-        btSolverBody& body2,
-        const btSolverConstraint& contactConstraint,
-        const btContactSolverInfo& solverInfo);
-
-//SIMD_FORCE_INLINE
-void	resolveSplitPenetrationImpulseCacheFriendly(
-        btSolverBody& body1,
-        btSolverBody& body2,
-        const btSolverConstraint& contactConstraint,
-        const btContactSolverInfo& solverInfo)
-{
-        (void)solverInfo;
-
-		if (contactConstraint.m_penetration < solverInfo.m_splitImpulsePenetrationThreshold)
-        {
-
-				gNumSplitImpulseRecoveries++;
-                btScalar normalImpulse;
-
-                //  Optimized version of projected relative velocity, use precomputed cross products with normal
-                //      body1.getVelocityInLocalPoint(contactConstraint.m_rel_posA,vel1);
-                //      body2.getVelocityInLocalPoint(contactConstraint.m_rel_posB,vel2);
-                //      btVector3 vel = vel1 - vel2;
-                //      btScalar  rel_vel = contactConstraint.m_contactNormal.dot(vel);
-
-                btScalar rel_vel;
-                btScalar vel1Dotn = contactConstraint.m_contactNormal.dot(body1.m_pushVelocity)
-                + contactConstraint.m_relpos1CrossNormal.dot(body1.m_turnVelocity);
-                btScalar vel2Dotn = contactConstraint.m_contactNormal.dot(body2.m_pushVelocity)
-                + contactConstraint.m_relpos2CrossNormal.dot(body2.m_turnVelocity);
-
-                rel_vel = vel1Dotn-vel2Dotn;
 
 
-				btScalar positionalError = -contactConstraint.m_penetration * solverInfo.m_erp2/solverInfo.m_timeStep;
-                //      btScalar positionalError = contactConstraint.m_penetration;
-
-                btScalar velocityError = contactConstraint.m_restitution - rel_vel;// * damping;
-
-                btScalar penetrationImpulse = positionalError * contactConstraint.m_jacDiagABInv;
-                btScalar        velocityImpulse = velocityError * contactConstraint.m_jacDiagABInv;
-                normalImpulse = penetrationImpulse+velocityImpulse;
-
-                // See Erin Catto's GDC 2006 paper: Clamp the accumulated impulse
-                btScalar oldNormalImpulse = contactConstraint.m_appliedPushImpulse;
-                btScalar sum = oldNormalImpulse + normalImpulse;
-                contactConstraint.m_appliedPushImpulse = btScalar(0.) > sum ? btScalar(0.): sum;
-
-                normalImpulse = contactConstraint.m_appliedPushImpulse - oldNormalImpulse;
-
-				body1.internalApplyPushImpulse(contactConstraint.m_contactNormal*body1.m_invMass, contactConstraint.m_angularComponentA,normalImpulse);
-               
-				body2.internalApplyPushImpulse(contactConstraint.m_contactNormal*body2.m_invMass, contactConstraint.m_angularComponentB,-normalImpulse);
-               
-        }
-
-}
 
 
 //velocity + friction
 //response  between two dynamic objects with friction
-
-btScalar resolveSingleCollisionCombinedCacheFriendly(
+SIMD_FORCE_INLINE btScalar resolveSingleCollisionCombinedCacheFriendly(
 	btSolverBody& body1,
 	btSolverBody& body2,
-	const btSolverConstraint& contactConstraint,
-	const btContactSolverInfo& solverInfo);
-
-//SIMD_FORCE_INLINE 
-btScalar resolveSingleCollisionCombinedCacheFriendly(
-	btSolverBody& body1,
-	btSolverBody& body2,
-	const btSolverConstraint& contactConstraint,
+	btSolverConstraint& contactConstraint,
 	const btContactSolverInfo& solverInfo)
 {
 	(void)solverInfo;
 
-	btScalar normalImpulse;
-
+	btScalar normalImpulse(0.f);
 	{
+		if (contactConstraint.m_penetration < 0.f)
+			return 0.f;
 
-		
-		//  Optimized version of projected relative velocity, use precomputed cross products with normal
-		//	body1.getVelocityInLocalPoint(contactConstraint.m_rel_posA,vel1);
-		//	body2.getVelocityInLocalPoint(contactConstraint.m_rel_posB,vel2);
-		//	btVector3 vel = vel1 - vel2;
-		//	btScalar  rel_vel = contactConstraint.m_contactNormal.dot(vel);
+	//  Optimized version of projected relative velocity, use precomputed cross products with normal
+	//	body1.getVelocityInLocalPoint(contactConstraint.m_rel_posA,vel1);
+	//	body2.getVelocityInLocalPoint(contactConstraint.m_rel_posB,vel2);
+	//	btVector3 vel = vel1 - vel2;
+	//	btScalar  rel_vel = contactConstraint.m_contactNormal.dot(vel);
 
 		btScalar rel_vel;
 		btScalar vel1Dotn = contactConstraint.m_contactNormal.dot(body1.m_linearVelocity) 
@@ -262,51 +182,50 @@ btScalar resolveSingleCollisionCombinedCacheFriendly(
 
 		rel_vel = vel1Dotn-vel2Dotn;
 
-		btScalar positionalError = 0.f;
-		if (!solverInfo.m_splitImpulse || (contactConstraint.m_penetration > solverInfo.m_splitImpulsePenetrationThreshold))
-		{
- 			positionalError = -contactConstraint.m_penetration * solverInfo.m_erp/solverInfo.m_timeStep;
-		}
 
+		btScalar positionalError = contactConstraint.m_penetration;
 		btScalar velocityError = contactConstraint.m_restitution - rel_vel;// * damping;
 
 		btScalar penetrationImpulse = positionalError * contactConstraint.m_jacDiagABInv;
 		btScalar	velocityImpulse = velocityError * contactConstraint.m_jacDiagABInv;
-		normalImpulse = penetrationImpulse+velocityImpulse;
-		
+		btScalar normalImpulse = penetrationImpulse+velocityImpulse;
 		
 		// See Erin Catto's GDC 2006 paper: Clamp the accumulated impulse
 		btScalar oldNormalImpulse = contactConstraint.m_appliedImpulse;
 		btScalar sum = oldNormalImpulse + normalImpulse;
 		contactConstraint.m_appliedImpulse = btScalar(0.) > sum ? btScalar(0.): sum;
 
+		btScalar oldVelocityImpulse = contactConstraint.m_appliedVelocityImpulse;
+		btScalar velocitySum = oldVelocityImpulse + velocityImpulse;
+		contactConstraint.m_appliedVelocityImpulse = btScalar(0.) > velocitySum ? btScalar(0.): velocitySum;
+
 		normalImpulse = contactConstraint.m_appliedImpulse - oldNormalImpulse;
 
-		body1.internalApplyImpulse(contactConstraint.m_contactNormal*body1.m_invMass,
+		if (body1.m_invMass)
+		{
+			body1.internalApplyImpulse(contactConstraint.m_contactNormal*body1.m_invMass,
 				contactConstraint.m_angularComponentA,normalImpulse);
-		
-		body2.internalApplyImpulse(contactConstraint.m_contactNormal*body2.m_invMass,
+		}
+		if (body2.m_invMass)
+		{
+			body2.internalApplyImpulse(contactConstraint.m_contactNormal*body2.m_invMass,
 				contactConstraint.m_angularComponentB,-normalImpulse);
+		}
+
 	}
 
+	
+
 	return normalImpulse;
 }
 
 
 #ifndef NO_FRICTION_TANGENTIALS
 
-btScalar resolveSingleFrictionCacheFriendly(
+SIMD_FORCE_INLINE btScalar resolveSingleFrictionCacheFriendly(
 	btSolverBody& body1,
 	btSolverBody& body2,
-	const btSolverConstraint& contactConstraint,
-	const btContactSolverInfo& solverInfo,
-	btScalar appliedNormalImpulse);
-
-//SIMD_FORCE_INLINE 
-btScalar resolveSingleFrictionCacheFriendly(
-	btSolverBody& body1,
-	btSolverBody& body2,
-	const btSolverConstraint& contactConstraint,
+	btSolverConstraint& contactConstraint,
 	const btContactSolverInfo& solverInfo,
 	btScalar appliedNormalImpulse)
 {
@@ -333,42 +252,22 @@ btScalar resolveSingleFrictionCacheFriendly(
 
 			// calculate j that moves us to zero relative velocity
 			j1 = -rel_vel * contactConstraint.m_jacDiagABInv;
-#define CLAMP_ACCUMULATED_FRICTION_IMPULSE 1
-#ifdef CLAMP_ACCUMULATED_FRICTION_IMPULSE
 			btScalar oldTangentImpulse = contactConstraint.m_appliedImpulse;
 			contactConstraint.m_appliedImpulse = oldTangentImpulse + j1;
-			
-			if (limit < contactConstraint.m_appliedImpulse)
-			{
-				contactConstraint.m_appliedImpulse = limit;
-			} else
-			{
-				if (contactConstraint.m_appliedImpulse < -limit)
-					contactConstraint.m_appliedImpulse = -limit;
-			}
+			GEN_set_min(contactConstraint.m_appliedImpulse, limit);
+			GEN_set_max(contactConstraint.m_appliedImpulse, -limit);
 			j1 = contactConstraint.m_appliedImpulse - oldTangentImpulse;
-#else
-			if (limit < j1)
-			{
-				j1 = limit;
-			} else
-			{
-				if (j1 < -limit)
-					j1 = -limit;
-			}
-
-#endif //CLAMP_ACCUMULATED_FRICTION_IMPULSE
-
-			//GEN_set_min(contactConstraint.m_appliedImpulse, limit);
-			//GEN_set_max(contactConstraint.m_appliedImpulse, -limit);
-
-			
 
 		}
 	
-		body1.internalApplyImpulse(contactConstraint.m_contactNormal*body1.m_invMass,contactConstraint.m_angularComponentA,j1);
-		
-		body2.internalApplyImpulse(contactConstraint.m_contactNormal*body2.m_invMass,contactConstraint.m_angularComponentB,-j1);
+		if (body1.m_invMass)
+		{
+			body1.internalApplyImpulse(contactConstraint.m_contactNormal*body1.m_invMass,contactConstraint.m_angularComponentA,j1);
+		}
+		if (body2.m_invMass)
+		{
+			body2.internalApplyImpulse(contactConstraint.m_contactNormal*body2.m_invMass,contactConstraint.m_angularComponentB,-j1);
+		}
 
 	} 
 	return 0.f;
@@ -410,6 +309,7 @@ btScalar resolveSingleFrictionCacheFriendly(
 		const btVector3& rel_pos2 = contactConstraint.m_rel_posB;
 
 
+		//if (contactConstraint.m_appliedVelocityImpulse > 0.f)
 		if (lat_rel_vel > SIMD_EPSILON*SIMD_EPSILON)
 		{
 			lat_rel_vel = btSqrt(lat_rel_vel);
@@ -419,7 +319,7 @@ btScalar resolveSingleFrictionCacheFriendly(
 			btVector3 temp2 = body2.m_invInertiaWorld * rel_pos2.cross(lat_vel);
 			btScalar friction_impulse = lat_rel_vel /
 				(body1.m_invMass + body2.m_invMass + lat_vel.dot(temp1.cross(rel_pos1) + temp2.cross(rel_pos2)));
-			btScalar normal_impulse = contactConstraint.m_appliedImpulse * combinedFriction;
+			btScalar normal_impulse = contactConstraint.m_appliedVelocityImpulse * combinedFriction;
 
 			GEN_set_min(friction_impulse, normal_impulse);
 			GEN_set_max(friction_impulse, -normal_impulse);
@@ -433,111 +333,39 @@ btScalar resolveSingleFrictionCacheFriendly(
 
 #endif //NO_FRICTION_TANGENTIALS
 
+btAlignedObjectArray<btSolverBody>	tmpSolverBodyPool;
+btAlignedObjectArray<btSolverConstraint>	tmpSolverConstraintPool;
+btAlignedObjectArray<btSolverConstraint>	tmpSolverFrictionConstraintPool;
 
 
-
-
-void	btSequentialImpulseConstraintSolver::addFrictionConstraint(const btVector3& normalAxis,int solverBodyIdA,int solverBodyIdB,int frictionIndex,btManifoldPoint& cp,const btVector3& rel_pos1,const btVector3& rel_pos2,btCollisionObject* colObj0,btCollisionObject* colObj1, btScalar relaxation)
+btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendly(btCollisionObject** bodies,int numBodies,btPersistentManifold** manifoldPtr, int numManifolds,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& infoGlobal,btIDebugDraw* debugDrawer,btStackAlloc* stackAlloc)
 {
-
-	btRigidBody* body0=btRigidBody::upcast(colObj0);
-	btRigidBody* body1=btRigidBody::upcast(colObj1);
-
-	btSolverConstraint& solverConstraint = m_tmpSolverFrictionConstraintPool.expand();
-	solverConstraint.m_contactNormal = normalAxis;
-
-	solverConstraint.m_solverBodyIdA = solverBodyIdA;
-	solverConstraint.m_solverBodyIdB = solverBodyIdB;
-	solverConstraint.m_constraintType = btSolverConstraint::BT_SOLVER_FRICTION_1D;
-	solverConstraint.m_frictionIndex = frictionIndex;
-
-	solverConstraint.m_friction = cp.m_combinedFriction;
-	solverConstraint.m_originalContactPoint = 0;
-
-	solverConstraint.m_appliedImpulse = btScalar(0.);
-	solverConstraint.m_appliedPushImpulse = 0.f;
-	solverConstraint.m_penetration = 0.f;
-	{
-		btVector3 ftorqueAxis1 = rel_pos1.cross(solverConstraint.m_contactNormal);
-		solverConstraint.m_relpos1CrossNormal = ftorqueAxis1;
-		solverConstraint.m_angularComponentA = body0 ? body0->getInvInertiaTensorWorld()*ftorqueAxis1 : btVector3(0,0,0);
-	}
-	{
-		btVector3 ftorqueAxis1 = rel_pos2.cross(solverConstraint.m_contactNormal);
-		solverConstraint.m_relpos2CrossNormal = ftorqueAxis1;
-		solverConstraint.m_angularComponentB = body1 ? body1->getInvInertiaTensorWorld()*ftorqueAxis1 : btVector3(0,0,0);
-	}
-
-#ifdef COMPUTE_IMPULSE_DENOM
-	btScalar denom0 = rb0->computeImpulseDenominator(pos1,solverConstraint.m_contactNormal);
-	btScalar denom1 = rb1->computeImpulseDenominator(pos2,solverConstraint.m_contactNormal);
-#else
-	btVector3 vec;
-	btScalar denom0 = 0.f;
-	btScalar denom1 = 0.f;
-	if (body0)
-	{
-		vec = ( solverConstraint.m_angularComponentA).cross(rel_pos1);
-		denom0 = body0->getInvMass() + normalAxis.dot(vec);
-	}
-	if (body1)
-	{
-		vec = ( solverConstraint.m_angularComponentB).cross(rel_pos2);
-		denom1 = body1->getInvMass() + normalAxis.dot(vec);
-	}
-
-
-#endif //COMPUTE_IMPULSE_DENOM
-	btScalar denom = relaxation/(denom0+denom1);
-	solverConstraint.m_jacDiagABInv = denom;
-
-
-}
-
-
-
-btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendlySetup(btCollisionObject** /*bodies */,int /*numBodies */,btPersistentManifold** manifoldPtr, int numManifolds,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& infoGlobal,btIDebugDraw* debugDrawer,btStackAlloc* stackAlloc)
-{
-	BT_PROFILE("solveGroupCacheFriendlySetup");
 	(void)stackAlloc;
 	(void)debugDrawer;
 
-
 	if (!(numConstraints + numManifolds))
 	{
 //		printf("empty\n");
 		return 0.f;
 	}
-	btPersistentManifold* manifold = 0;
-	btCollisionObject* colObj0=0,*colObj1=0;
-
-	//btRigidBody* rb0=0,*rb1=0;
-
-
-#ifdef FORCE_REFESH_CONTACT_MANIFOLDS
 
 	BEGIN_PROFILE("refreshManifolds");
 
 	int i;
-	
-	
-
 	for (i=0;i<numManifolds;i++)
 	{
-		manifold = manifoldPtr[i];
-		rb1 = (btRigidBody*)manifold->getBody1();
-		rb0 = (btRigidBody*)manifold->getBody0();
-		
+		btPersistentManifold* manifold = manifoldPtr[i];
+		btRigidBody* rb0 = (btRigidBody*)manifold->getBody0();
+		btRigidBody* rb1 = (btRigidBody*)manifold->getBody1();
+
 		manifold->refreshContactPoints(rb0->getCenterOfMassTransform(),rb1->getCenterOfMassTransform());
 
 	}
-
-	END_PROFILE("refreshManifolds");
-#endif //FORCE_REFESH_CONTACT_MANIFOLDS
-
 	
+	END_PROFILE("refreshManifolds");
 
 
+	BEGIN_PROFILE("gatherSolverData");
 
 	//int sizeofSB = sizeof(btSolverBody);
 	//int sizeofSC = sizeof(btSolverConstraint);
@@ -554,12 +382,10 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendlySetup(btCol
 
 		
 		//todo: use stack allocator for this temp memory
-//		int minReservation = numManifolds*2;
+		int minReservation = numManifolds*2;
 
-		//m_tmpSolverBodyPool.reserve(minReservation);
+		tmpSolverBodyPool.reserve(minReservation);
 
-		//don't convert all bodies, only the one we need so solver the constraints
-/*
 		{
 			for (int i=0;i<numBodies;i++)
 			{
@@ -567,26 +393,26 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendlySetup(btCol
 				if (rb && 	(rb->getIslandTag() >= 0))
 				{
 					btAssert(rb->getCompanionId() < 0);
-					int solverBodyId = m_tmpSolverBodyPool.size();
-					btSolverBody& solverBody = m_tmpSolverBodyPool.expand();
+					int solverBodyId = tmpSolverBodyPool.size();
+					btSolverBody& solverBody = tmpSolverBodyPool.expand();
 					initSolverBody(&solverBody,rb);
 					rb->setCompanionId(solverBodyId);
 				} 
 			}
 		}
-*/
-		
-		//m_tmpSolverConstraintPool.reserve(minReservation);
-		//m_tmpSolverFrictionConstraintPool.reserve(minReservation);
 
+		
+		tmpSolverConstraintPool.reserve(minReservation);
+		tmpSolverFrictionConstraintPool.reserve(minReservation);
 		{
 			int i;
 
 			for (i=0;i<numManifolds;i++)
 			{
-				manifold = manifoldPtr[i];
-				colObj0 = (btCollisionObject*)manifold->getBody0();
-				colObj1 = (btCollisionObject*)manifold->getBody1();
+				btPersistentManifold* manifold = manifoldPtr[i];
+				btRigidBody* rb0 = (btRigidBody*)manifold->getBody0();
+				btRigidBody* rb1 = (btRigidBody*)manifold->getBody1();
+
 			
 				int solverBodyIdA=-1;
 				int solverBodyIdB=-1;
@@ -596,108 +422,61 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendlySetup(btCol
 
 					
 
-					if (colObj0->getIslandTag() >= 0)
+					if (rb0->getIslandTag() >= 0)
 					{
-						if (colObj0->getCompanionId() >= 0)
-						{
-							//body has already been converted
-							solverBodyIdA = colObj0->getCompanionId();
-						} else
-						{
-							solverBodyIdA = m_tmpSolverBodyPool.size();
-							btSolverBody& solverBody = m_tmpSolverBodyPool.expand();
-							initSolverBody(&solverBody,colObj0);
-							colObj0->setCompanionId(solverBodyIdA);
-						}
+						solverBodyIdA = rb0->getCompanionId();
 					} else
 					{
 						//create a static body
-						solverBodyIdA = m_tmpSolverBodyPool.size();
-						btSolverBody& solverBody = m_tmpSolverBodyPool.expand();
-						initSolverBody(&solverBody,colObj0);
+						solverBodyIdA = tmpSolverBodyPool.size();
+						btSolverBody& solverBody = tmpSolverBodyPool.expand();
+						initSolverBody(&solverBody,rb0);
 					}
 
-					if (colObj1->getIslandTag() >= 0)
+					if (rb1->getIslandTag() >= 0)
 					{
-						if (colObj1->getCompanionId() >= 0)
-						{
-							solverBodyIdB = colObj1->getCompanionId();
-						} else
-						{
-							solverBodyIdB = m_tmpSolverBodyPool.size();
-							btSolverBody& solverBody = m_tmpSolverBodyPool.expand();
-							initSolverBody(&solverBody,colObj1);
-							colObj1->setCompanionId(solverBodyIdB);
-						}
+						solverBodyIdB = rb1->getCompanionId();
 					} else
 					{
 						//create a static body
-						solverBodyIdB = m_tmpSolverBodyPool.size();
-						btSolverBody& solverBody = m_tmpSolverBodyPool.expand();
-						initSolverBody(&solverBody,colObj1);
+						solverBodyIdB = tmpSolverBodyPool.size();
+						btSolverBody& solverBody = tmpSolverBodyPool.expand();
+						initSolverBody(&solverBody,rb1);
 					}
 				}
 
-				btVector3 rel_pos1;
-				btVector3 rel_pos2;
-				btScalar relaxation;
-
 				for (int j=0;j<manifold->getNumContacts();j++)
 				{
 					
 					btManifoldPoint& cp = manifold->getContactPoint(j);
-					
+
+					int frictionIndex = tmpSolverConstraintPool.size();
+
 					if (cp.getDistance() <= btScalar(0.))
 					{
 						
 						const btVector3& pos1 = cp.getPositionWorldOnA();
 						const btVector3& pos2 = cp.getPositionWorldOnB();
 
-						 rel_pos1 = pos1 - colObj0->getWorldTransform().getOrigin(); 
-						 rel_pos2 = pos2 - colObj1->getWorldTransform().getOrigin();
+						btVector3 rel_pos1 = pos1 - rb0->getCenterOfMassPosition(); 
+						btVector3 rel_pos2 = pos2 - rb1->getCenterOfMassPosition();
 
 						
-						relaxation = 1.f;
-						btScalar rel_vel;
-						btVector3 vel;
-
-						int frictionIndex = m_tmpSolverConstraintPool.size();
+							btScalar relaxation = 1.f;
 
 						{
-							btSolverConstraint& solverConstraint = m_tmpSolverConstraintPool.expand();
-							btRigidBody* rb0 = btRigidBody::upcast(colObj0);
-							btRigidBody* rb1 = btRigidBody::upcast(colObj1);
+							btSolverConstraint& solverConstraint = tmpSolverConstraintPool.expand();
 
 							solverConstraint.m_solverBodyIdA = solverBodyIdA;
 							solverConstraint.m_solverBodyIdB = solverBodyIdB;
 							solverConstraint.m_constraintType = btSolverConstraint::BT_SOLVER_CONTACT_1D;
 
-							solverConstraint.m_originalContactPoint = &cp;
+					
 
-							btVector3 torqueAxis0 = rel_pos1.cross(cp.m_normalWorldOnB);
-							solverConstraint.m_angularComponentA = rb0 ? rb0->getInvInertiaTensorWorld()*torqueAxis0 : btVector3(0,0,0);
-							btVector3 torqueAxis1 = rel_pos2.cross(cp.m_normalWorldOnB);		
-							solverConstraint.m_angularComponentB = rb1 ? rb1->getInvInertiaTensorWorld()*torqueAxis1 : btVector3(0,0,0);
 							{
-#ifdef COMPUTE_IMPULSE_DENOM
+								//can be optimized, the cross products are already calculated
 								btScalar denom0 = rb0->computeImpulseDenominator(pos1,cp.m_normalWorldOnB);
 								btScalar denom1 = rb1->computeImpulseDenominator(pos2,cp.m_normalWorldOnB);
-#else							
-								btVector3 vec;
-								btScalar denom0 = 0.f;
-								btScalar denom1 = 0.f;
-								if (rb0)
-								{
-									vec = ( solverConstraint.m_angularComponentA).cross(rel_pos1);
-									denom0 = rb0->getInvMass() + cp.m_normalWorldOnB.dot(vec);
-								}
-								if (rb1)
-								{
-									vec = ( solverConstraint.m_angularComponentB).cross(rel_pos2);
-									denom1 = rb1->getInvMass() + cp.m_normalWorldOnB.dot(vec);
-								}
-#endif //COMPUTE_IMPULSE_DENOM		
-								
 								btScalar denom = relaxation/(denom0+denom1);
 								solverConstraint.m_jacDiagABInv = denom;
 							}
@@ -707,115 +486,121 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendlySetup(btCol
 							solverConstraint.m_relpos2CrossNormal = rel_pos2.cross(cp.m_normalWorldOnB);
 
 
-							btVector3 vel1 = rb0 ? rb0->getVelocityInLocalPoint(rel_pos1) : btVector3(0,0,0);
-							btVector3 vel2 = rb1 ? rb1->getVelocityInLocalPoint(rel_pos2) : btVector3(0,0,0);
+							btVector3 vel1 = rb0->getVelocityInLocalPoint(rel_pos1);
+							btVector3 vel2 = rb1->getVelocityInLocalPoint(rel_pos2);
 				
-							vel  = vel1 - vel2;
-							
+							btVector3 vel = vel1 - vel2;
+							btScalar rel_vel;
 							rel_vel = cp.m_normalWorldOnB.dot(vel);
 							
-							solverConstraint.m_penetration = btMin(cp.getDistance()+infoGlobal.m_linearSlop,btScalar(0.));
-							//solverConstraint.m_penetration = cp.getDistance();
 
+							solverConstraint.m_penetration = cp.getDistance();///btScalar(infoGlobal.m_numIterations);
 							solverConstraint.m_friction = cp.m_combinedFriction;
-							solverConstraint.m_restitution =  restitutionCurve(rel_vel, cp.m_combinedRestitution);
-							if (solverConstraint.m_restitution <= btScalar(0.))
+							btScalar rest =  restitutionCurve(rel_vel, cp.m_combinedRestitution);
+							if (rest <= btScalar(0.))
 							{
-								solverConstraint.m_restitution = 0.f;
+								rest = 0.f;
 							};
-
 							
 							btScalar penVel = -solverConstraint.m_penetration/infoGlobal.m_timeStep;
+							if (rest > penVel)
+							{
+								rest = btScalar(0.);
+							}
+							solverConstraint.m_restitution = rest;
 
-							
+							solverConstraint.m_penetration *= -(infoGlobal.m_erp/infoGlobal.m_timeStep);
 
-							if (solverConstraint.m_restitution > penVel)
-							{
-								solverConstraint.m_penetration = btScalar(0.);
-							}
-							 
+							solverConstraint.m_appliedImpulse = 0.f;
+							solverConstraint.m_appliedVelocityImpulse = 0.f;
 							
-							
-							///warm starting (or zero if disabled)
-							if (infoGlobal.m_solverMode & SOLVER_USE_WARMSTARTING)
-							{
-								solverConstraint.m_appliedImpulse = cp.m_appliedImpulse * infoGlobal.m_warmstartingFactor;
-								if (rb0)
-									m_tmpSolverBodyPool[solverConstraint.m_solverBodyIdA].internalApplyImpulse(solverConstraint.m_contactNormal*rb0->getInvMass(),solverConstraint.m_angularComponentA,solverConstraint.m_appliedImpulse);
-								if (rb1)
-									m_tmpSolverBodyPool[solverConstraint.m_solverBodyIdB].internalApplyImpulse(solverConstraint.m_contactNormal*rb1->getInvMass(),solverConstraint.m_angularComponentB,-solverConstraint.m_appliedImpulse);
-							} else
-							{
-								solverConstraint.m_appliedImpulse = 0.f;
-							}
-
-							solverConstraint.m_appliedPushImpulse = 0.f;
-							
-							solverConstraint.m_frictionIndex = m_tmpSolverFrictionConstraintPool.size();
-							if (!cp.m_lateralFrictionInitialized)
-							{
-								cp.m_lateralFrictionDir1 = vel - cp.m_normalWorldOnB * rel_vel;
-								btScalar lat_rel_vel = cp.m_lateralFrictionDir1.length2();
-								if (lat_rel_vel > SIMD_EPSILON)//0.0f)
-								{
-									cp.m_lateralFrictionDir1 /= btSqrt(lat_rel_vel);
-									addFrictionConstraint(cp.m_lateralFrictionDir1,solverBodyIdA,solverBodyIdB,frictionIndex,cp,rel_pos1,rel_pos2,colObj0,colObj1, relaxation);
-									cp.m_lateralFrictionDir2 = cp.m_lateralFrictionDir1.cross(cp.m_normalWorldOnB);
-									cp.m_lateralFrictionDir2.normalize();//??
-									addFrictionConstraint(cp.m_lateralFrictionDir2,solverBodyIdA,solverBodyIdB,frictionIndex,cp,rel_pos1,rel_pos2,colObj0,colObj1, relaxation);
-								} else
-								{
-									//re-calculate friction direction every frame, todo: check if this is really needed
-									
-									btPlaneSpace1(cp.m_normalWorldOnB,cp.m_lateralFrictionDir1,cp.m_lateralFrictionDir2);
-									addFrictionConstraint(cp.m_lateralFrictionDir1,solverBodyIdA,solverBodyIdB,frictionIndex,cp,rel_pos1,rel_pos2,colObj0,colObj1, relaxation);
-									addFrictionConstraint(cp.m_lateralFrictionDir2,solverBodyIdA,solverBodyIdB,frictionIndex,cp,rel_pos1,rel_pos2,colObj0,colObj1, relaxation);
-								}
-								cp.m_lateralFrictionInitialized = true;
-								
-							} else
-							{
-								addFrictionConstraint(cp.m_lateralFrictionDir1,solverBodyIdA,solverBodyIdB,frictionIndex,cp,rel_pos1,rel_pos2,colObj0,colObj1, relaxation);
-								addFrictionConstraint(cp.m_lateralFrictionDir2,solverBodyIdA,solverBodyIdB,frictionIndex,cp,rel_pos1,rel_pos2,colObj0,colObj1, relaxation);
-							}
-
-							{
-								btSolverConstraint& frictionConstraint1 = m_tmpSolverFrictionConstraintPool[solverConstraint.m_frictionIndex];
-								if (infoGlobal.m_solverMode & SOLVER_USE_WARMSTARTING)
-								{
-									frictionConstraint1.m_appliedImpulse = cp.m_appliedImpulseLateral1 * infoGlobal.m_warmstartingFactor;
-									if (rb0)
-										m_tmpSolverBodyPool[solverConstraint.m_solverBodyIdA].internalApplyImpulse(frictionConstraint1.m_contactNormal*rb0->getInvMass(),frictionConstraint1.m_angularComponentA,frictionConstraint1.m_appliedImpulse);
-									if (rb1)
-										m_tmpSolverBodyPool[solverConstraint.m_solverBodyIdB].internalApplyImpulse(frictionConstraint1.m_contactNormal*rb1->getInvMass(),frictionConstraint1.m_angularComponentB,-frictionConstraint1.m_appliedImpulse);
-								} else
-								{
-									frictionConstraint1.m_appliedImpulse = 0.f;
-								}
-							}
-							{
-								btSolverConstraint& frictionConstraint2 = m_tmpSolverFrictionConstraintPool[solverConstraint.m_frictionIndex+1];
-								if (infoGlobal.m_solverMode & SOLVER_USE_WARMSTARTING)
-								{
-									frictionConstraint2.m_appliedImpulse = cp.m_appliedImpulseLateral2 * infoGlobal.m_warmstartingFactor;
-									if (rb0)
-										m_tmpSolverBodyPool[solverConstraint.m_solverBodyIdA].internalApplyImpulse(frictionConstraint2.m_contactNormal*rb0->getInvMass(),frictionConstraint2.m_angularComponentA,frictionConstraint2.m_appliedImpulse);
-									if (rb1)
-										m_tmpSolverBodyPool[solverConstraint.m_solverBodyIdB].internalApplyImpulse(frictionConstraint2.m_contactNormal*rb1->getInvMass(),frictionConstraint2.m_angularComponentB,-frictionConstraint2.m_appliedImpulse);
-								} else
-								{
-									frictionConstraint2.m_appliedImpulse = 0.f;
-								}
-							}
+					
+							btVector3 torqueAxis0 = rel_pos1.cross(cp.m_normalWorldOnB);
+							solverConstraint.m_angularComponentA = rb0->getInvInertiaTensorWorld()*torqueAxis0;
+							btVector3 torqueAxis1 = rel_pos2.cross(cp.m_normalWorldOnB);		
+							solverConstraint.m_angularComponentB = rb1->getInvInertiaTensorWorld()*torqueAxis1;
 						}
 
+						//create 2 '1d axis' constraints for 2 tangential friction directions
+			
+						//re-calculate friction direction every frame, todo: check if this is really needed
+						btVector3 frictionTangential0a, frictionTangential1b;
+
+						btPlaneSpace1(cp.m_normalWorldOnB,frictionTangential0a,frictionTangential1b);
+
+						{
+							btSolverConstraint& solverConstraint = tmpSolverFrictionConstraintPool.expand();
+							solverConstraint.m_contactNormal = frictionTangential0a;
+
+							solverConstraint.m_solverBodyIdA = solverBodyIdA;
+							solverConstraint.m_solverBodyIdB = solverBodyIdB;
+							solverConstraint.m_constraintType = btSolverConstraint::BT_SOLVER_FRICTION_1D;
+							solverConstraint.m_frictionIndex = frictionIndex;
+
+							solverConstraint.m_friction = cp.m_combinedFriction;
+
+							solverConstraint.m_appliedImpulse = btScalar(0.);
+							solverConstraint.m_appliedVelocityImpulse = 0.f;
+
+							btScalar denom0 = rb0->computeImpulseDenominator(pos1,solverConstraint.m_contactNormal);
+							btScalar denom1 = rb1->computeImpulseDenominator(pos2,solverConstraint.m_contactNormal);
+							btScalar denom = relaxation/(denom0+denom1);
+							solverConstraint.m_jacDiagABInv = denom;
+
+							{
+							btVector3 ftorqueAxis0 = rel_pos1.cross(solverConstraint.m_contactNormal);
+							solverConstraint.m_relpos1CrossNormal = ftorqueAxis0;
+							solverConstraint.m_angularComponentA = rb0->getInvInertiaTensorWorld()*ftorqueAxis0;
+							}
+							{
+							btVector3 ftorqueAxis0 = rel_pos2.cross(solverConstraint.m_contactNormal);
+							solverConstraint.m_relpos2CrossNormal = ftorqueAxis0;
+							solverConstraint.m_angularComponentB = rb1->getInvInertiaTensorWorld()*ftorqueAxis0;
+							}
+
+						}
+
+
+						{
+
+							btSolverConstraint& solverConstraint = tmpSolverFrictionConstraintPool.expand();
+							solverConstraint.m_contactNormal = frictionTangential1b;
+
+							solverConstraint.m_solverBodyIdA = solverBodyIdA;
+							solverConstraint.m_solverBodyIdB = solverBodyIdB;
+							solverConstraint.m_constraintType = btSolverConstraint::BT_SOLVER_FRICTION_1D;
+							solverConstraint.m_frictionIndex = frictionIndex;
+
+							solverConstraint.m_friction = cp.m_combinedFriction;
+
+							solverConstraint.m_appliedImpulse = btScalar(0.);
+							solverConstraint.m_appliedVelocityImpulse = 0.f;
+						
+							btScalar denom0 = rb0->computeImpulseDenominator(pos1,solverConstraint.m_contactNormal);
+							btScalar denom1 = rb1->computeImpulseDenominator(pos2,solverConstraint.m_contactNormal);
+							btScalar denom = relaxation/(denom0+denom1);
+							solverConstraint.m_jacDiagABInv = denom;
+							{
+								btVector3 ftorqueAxis1 = rel_pos1.cross(solverConstraint.m_contactNormal);
+								solverConstraint.m_relpos1CrossNormal = ftorqueAxis1;
+								solverConstraint.m_angularComponentA = rb0->getInvInertiaTensorWorld()*ftorqueAxis1;
+								}
+							{
+								btVector3 ftorqueAxis1 = rel_pos2.cross(solverConstraint.m_contactNormal);
+								solverConstraint.m_relpos2CrossNormal = ftorqueAxis1;
+								solverConstraint.m_angularComponentB = rb1->getInvInertiaTensorWorld()*ftorqueAxis1;
+								}
+							}
 
 					}
 				}
 			}
 		}
 	}
-	
+	END_PROFILE("gatherSolverData");
+
+	BEGIN_PROFILE("prepareConstraints");
+
 	btContactSolverInfo info = infoGlobal;
 
 	{
@@ -827,60 +612,57 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendlySetup(btCol
 		}
 	}
 	
-	
+	btAlignedObjectArray<int>	gOrderTmpConstraintPool;
+	btAlignedObjectArray<int>	gOrderFrictionConstraintPool;
 
-	int numConstraintPool = m_tmpSolverConstraintPool.size();
-	int numFrictionPool = m_tmpSolverFrictionConstraintPool.size();
+	int numConstraintPool = tmpSolverConstraintPool.size();
+	int numFrictionPool = tmpSolverFrictionConstraintPool.size();
 
 	///todo: use stack allocator for such temporarily memory, same for solver bodies/constraints
-	m_orderTmpConstraintPool.resize(numConstraintPool);
-	m_orderFrictionConstraintPool.resize(numFrictionPool);
+	gOrderTmpConstraintPool.resize(numConstraintPool);
+	gOrderFrictionConstraintPool.resize(numFrictionPool);
 	{
 		int i;
 		for (i=0;i<numConstraintPool;i++)
 		{
-			m_orderTmpConstraintPool[i] = i;
+			gOrderTmpConstraintPool[i] = i;
 		}
 		for (i=0;i<numFrictionPool;i++)
 		{
-			m_orderFrictionConstraintPool[i] = i;
+			gOrderFrictionConstraintPool[i] = i;
 		}
 	}
 
 
 
-	return 0.f;
 
-}
+	END_PROFILE("prepareConstraints");
 
-btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendlyIterations(btCollisionObject** /*bodies */,int /*numBodies*/,btPersistentManifold** /*manifoldPtr*/, int /*numManifolds*/,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& infoGlobal,btIDebugDraw* /*debugDrawer*/,btStackAlloc* /*stackAlloc*/)
-{
-	BT_PROFILE("solveGroupCacheFriendlyIterations");
-	int numConstraintPool = m_tmpSolverConstraintPool.size();
-	int numFrictionPool = m_tmpSolverFrictionConstraintPool.size();
+
+	BEGIN_PROFILE("solveConstraints");
 
 	//should traverse the contacts random order...
 	int iteration;
 	{
-		for ( iteration = 0;iteration<infoGlobal.m_numIterations;iteration++)
+		for ( iteration = 0;iteration<info.m_numIterations;iteration++)
 		{			
 
 			int j;
-			if (infoGlobal.m_solverMode & SOLVER_RANDMIZE_ORDER)
+			if (m_solverMode & SOLVER_RANDMIZE_ORDER)
 			{
 				if ((iteration & 7) == 0) {
 					for (j=0; j<numConstraintPool; ++j) {
-						int tmp = m_orderTmpConstraintPool[j];
+						int tmp = gOrderTmpConstraintPool[j];
 						int swapi = btRandInt2(j+1);
-						m_orderTmpConstraintPool[j] = m_orderTmpConstraintPool[swapi];
-						m_orderTmpConstraintPool[swapi] = tmp;
+						gOrderTmpConstraintPool[j] = gOrderTmpConstraintPool[swapi];
+						gOrderTmpConstraintPool[swapi] = tmp;
 					}
 
 					for (j=0; j<numFrictionPool; ++j) {
-						int tmp = m_orderFrictionConstraintPool[j];
+						int tmp = gOrderFrictionConstraintPool[j];
 						int swapi = btRandInt2(j+1);
-						m_orderFrictionConstraintPool[j] = m_orderFrictionConstraintPool[swapi];
-						m_orderFrictionConstraintPool[swapi] = tmp;
+						gOrderFrictionConstraintPool[j] = gOrderFrictionConstraintPool[swapi];
+						gOrderFrictionConstraintPool[swapi] = tmp;
 					}
 				}
 			}
@@ -892,145 +674,86 @@ btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendlyIterations(
 
 				if ((constraint->getRigidBodyA().getIslandTag() >= 0) && (constraint->getRigidBodyA().getCompanionId() >= 0))
 				{
-					m_tmpSolverBodyPool[constraint->getRigidBodyA().getCompanionId()].writebackVelocity();
+					tmpSolverBodyPool[constraint->getRigidBodyA().getCompanionId()].writebackVelocity();
 				}
 				if ((constraint->getRigidBodyB().getIslandTag() >= 0) && (constraint->getRigidBodyB().getCompanionId() >= 0))
 				{
-					m_tmpSolverBodyPool[constraint->getRigidBodyB().getCompanionId()].writebackVelocity();
+					tmpSolverBodyPool[constraint->getRigidBodyB().getCompanionId()].writebackVelocity();
 				}
 
-				constraint->solveConstraint(infoGlobal.m_timeStep);
+				constraint->solveConstraint(info.m_timeStep);
 
 				if ((constraint->getRigidBodyA().getIslandTag() >= 0) && (constraint->getRigidBodyA().getCompanionId() >= 0))
 				{
-					m_tmpSolverBodyPool[constraint->getRigidBodyA().getCompanionId()].readVelocity();
+					tmpSolverBodyPool[constraint->getRigidBodyA().getCompanionId()].readVelocity();
 				}
 				if ((constraint->getRigidBodyB().getIslandTag() >= 0) && (constraint->getRigidBodyB().getCompanionId() >= 0))
 				{
-					m_tmpSolverBodyPool[constraint->getRigidBodyB().getCompanionId()].readVelocity();
+					tmpSolverBodyPool[constraint->getRigidBodyB().getCompanionId()].readVelocity();
 				}
 
 			}
 
 			{
-				int numPoolConstraints = m_tmpSolverConstraintPool.size();
+				int numPoolConstraints = tmpSolverConstraintPool.size();
 				for (j=0;j<numPoolConstraints;j++)
 				{
-					
-					const btSolverConstraint& solveManifold = m_tmpSolverConstraintPool[m_orderTmpConstraintPool[j]];
-					resolveSingleCollisionCombinedCacheFriendly(m_tmpSolverBodyPool[solveManifold.m_solverBodyIdA],
-						m_tmpSolverBodyPool[solveManifold.m_solverBodyIdB],solveManifold,infoGlobal);
+					btSolverConstraint& solveManifold = tmpSolverConstraintPool[gOrderTmpConstraintPool[j]];
+					resolveSingleCollisionCombinedCacheFriendly(tmpSolverBodyPool[solveManifold.m_solverBodyIdA],
+						tmpSolverBodyPool[solveManifold.m_solverBodyIdB],solveManifold,info);
 				}
 			}
 
 			{
-				 int numFrictionPoolConstraints = m_tmpSolverFrictionConstraintPool.size();
-				
-				 for (j=0;j<numFrictionPoolConstraints;j++)
+				 int numFrictionPoolConstraints = tmpSolverFrictionConstraintPool.size();
+				for (j=0;j<numFrictionPoolConstraints;j++)
 				{
-					const btSolverConstraint& solveManifold = m_tmpSolverFrictionConstraintPool[m_orderFrictionConstraintPool[j]];
-					btScalar totalImpulse = m_tmpSolverConstraintPool[solveManifold.m_frictionIndex].m_appliedImpulse+
-								m_tmpSolverConstraintPool[solveManifold.m_frictionIndex].m_appliedPushImpulse;			
+					btSolverConstraint& solveManifold = tmpSolverFrictionConstraintPool[gOrderFrictionConstraintPool[j]];
+						btScalar appliedNormalImpulse = tmpSolverConstraintPool[solveManifold.m_frictionIndex].m_appliedImpulse;
 
-						resolveSingleFrictionCacheFriendly(m_tmpSolverBodyPool[solveManifold.m_solverBodyIdA],
-							m_tmpSolverBodyPool[solveManifold.m_solverBodyIdB],solveManifold,infoGlobal,
-							totalImpulse);
+						resolveSingleFrictionCacheFriendly(tmpSolverBodyPool[solveManifold.m_solverBodyIdA],
+							tmpSolverBodyPool[solveManifold.m_solverBodyIdB],solveManifold,info,appliedNormalImpulse);
 				}
 			}
 			
 
 
 		}
-	
-		if (infoGlobal.m_splitImpulse)
-		{
-			
-			for ( iteration = 0;iteration<infoGlobal.m_numIterations;iteration++)
-			{
-				{
-					int numPoolConstraints = m_tmpSolverConstraintPool.size();
-					int j;
-					for (j=0;j<numPoolConstraints;j++)
-					{
-						const btSolverConstraint& solveManifold = m_tmpSolverConstraintPool[m_orderTmpConstraintPool[j]];
-
-						resolveSplitPenetrationImpulseCacheFriendly(m_tmpSolverBodyPool[solveManifold.m_solverBodyIdA],
-							m_tmpSolverBodyPool[solveManifold.m_solverBodyIdB],solveManifold,infoGlobal);
-					}
-				}
-			}
-
-		}
-
 	}
-
-	return 0.f;
-}
-
-
-btScalar btSequentialImpulseConstraintSolver::solveGroupCacheFriendly(btCollisionObject** bodies,int numBodies,btPersistentManifold** manifoldPtr, int numManifolds,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& infoGlobal,btIDebugDraw* debugDrawer,btStackAlloc* stackAlloc)
-{
-	int i;
-
-	solveGroupCacheFriendlySetup( bodies, numBodies, manifoldPtr,  numManifolds,constraints, numConstraints,infoGlobal,debugDrawer, stackAlloc);
-	solveGroupCacheFriendlyIterations(bodies, numBodies, manifoldPtr,  numManifolds,constraints, numConstraints,infoGlobal,debugDrawer, stackAlloc);
-
-	int numPoolConstraints = m_tmpSolverConstraintPool.size();
-	int j;
-	for (j=0;j<numPoolConstraints;j++)
-	{
 		
-		const btSolverConstraint& solveManifold = m_tmpSolverConstraintPool[j];
-		btManifoldPoint* pt = (btManifoldPoint*) solveManifold.m_originalContactPoint;
-		btAssert(pt);
-		pt->m_appliedImpulse = solveManifold.m_appliedImpulse;
-		pt->m_appliedImpulseLateral1 = m_tmpSolverFrictionConstraintPool[solveManifold.m_frictionIndex].m_appliedImpulse;
-		pt->m_appliedImpulseLateral1 = m_tmpSolverFrictionConstraintPool[solveManifold.m_frictionIndex+1].m_appliedImpulse;
-
-		//do a callback here?
-
-	}
-
-	if (infoGlobal.m_splitImpulse)
-	{		
-		for ( i=0;i<m_tmpSolverBodyPool.size();i++)
-		{
-			m_tmpSolverBodyPool[i].writebackVelocity(infoGlobal.m_timeStep);
-		}
-	} else
+	for ( i=0;i<tmpSolverBodyPool.size();i++)
 	{
-		for ( i=0;i<m_tmpSolverBodyPool.size();i++)
-        {
-                m_tmpSolverBodyPool[i].writebackVelocity();
-        }
+		tmpSolverBodyPool[i].writebackVelocity();
 	}
 
-//	printf("m_tmpSolverConstraintPool.size() = %i\n",m_tmpSolverConstraintPool.size());
+	END_PROFILE("solveConstraints");
+
+//	printf("tmpSolverConstraintPool.size() = %i\n",tmpSolverConstraintPool.size());
 
 /*
-	printf("m_tmpSolverBodyPool.size() = %i\n",m_tmpSolverBodyPool.size());
-	printf("m_tmpSolverConstraintPool.size() = %i\n",m_tmpSolverConstraintPool.size());
-	printf("m_tmpSolverFrictionConstraintPool.size() = %i\n",m_tmpSolverFrictionConstraintPool.size());
+	printf("tmpSolverBodyPool.size() = %i\n",tmpSolverBodyPool.size());
+	printf("tmpSolverConstraintPool.size() = %i\n",tmpSolverConstraintPool.size());
+	printf("tmpSolverFrictionConstraintPool.size() = %i\n",tmpSolverFrictionConstraintPool.size());
 
 	
-	printf("m_tmpSolverBodyPool.capacity() = %i\n",m_tmpSolverBodyPool.capacity());
-	printf("m_tmpSolverConstraintPool.capacity() = %i\n",m_tmpSolverConstraintPool.capacity());
-	printf("m_tmpSolverFrictionConstraintPool.capacity() = %i\n",m_tmpSolverFrictionConstraintPool.capacity());
+	printf("tmpSolverBodyPool.capacity() = %i\n",tmpSolverBodyPool.capacity());
+	printf("tmpSolverConstraintPool.capacity() = %i\n",tmpSolverConstraintPool.capacity());
+	printf("tmpSolverFrictionConstraintPool.capacity() = %i\n",tmpSolverFrictionConstraintPool.capacity());
 */
 
-	m_tmpSolverBodyPool.resize(0);
-	m_tmpSolverConstraintPool.resize(0);
-	m_tmpSolverFrictionConstraintPool.resize(0);
+	tmpSolverBodyPool.resize(0);
+	tmpSolverConstraintPool.resize(0);
+	tmpSolverFrictionConstraintPool.resize(0);
 
 
 	return 0.f;
 }
 
 /// btSequentialImpulseConstraintSolver Sequentially applies impulses
-btScalar btSequentialImpulseConstraintSolver::solveGroup(btCollisionObject** bodies,int numBodies,btPersistentManifold** manifoldPtr, int numManifolds,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& infoGlobal,btIDebugDraw* debugDrawer,btStackAlloc* stackAlloc,btDispatcher* /*dispatcher*/)
+btScalar btSequentialImpulseConstraintSolver::solveGroup(btCollisionObject** bodies,int numBodies,btPersistentManifold** manifoldPtr, int numManifolds,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& infoGlobal,btIDebugDraw* debugDrawer,btStackAlloc* stackAlloc)
 {
-	BT_PROFILE("solveGroup");
-	if (infoGlobal.m_solverMode & SOLVER_CACHE_FRIENDLY)
+
+	if (getSolverMode() & SOLVER_CACHE_FRIENDLY)
 	{
 		//you need to provide at least some bodies
 		//btSimpleDynamicsWorld needs to switch off SOLVER_CACHE_FRIENDLY
@@ -1039,11 +762,16 @@ btScalar btSequentialImpulseConstraintSolver::solveGroup(btCollisionObject** bod
 		return solveGroupCacheFriendly(bodies,numBodies,manifoldPtr, numManifolds,constraints,numConstraints,infoGlobal,debugDrawer,stackAlloc);
 	}
 
+
+	BEGIN_PROFILE("prepareConstraints");
 	
 
 	btContactSolverInfo info = infoGlobal;
 
 	int numiter = infoGlobal.m_numIterations;
+#ifdef USE_PROFILE
+	btProfiler::beginBlock("solve");
+#endif //USE_PROFILE
 
 	int totalPoints = 0;
 
@@ -1073,6 +801,10 @@ btScalar btSequentialImpulseConstraintSolver::solveGroup(btCollisionObject** bod
 		}
 	}
 	
+	END_PROFILE("prepareConstraints");
+
+
+	BEGIN_PROFILE("solveConstraints");
 
 	//should traverse the contacts random order...
 	int iteration;
@@ -1081,7 +813,7 @@ btScalar btSequentialImpulseConstraintSolver::solveGroup(btCollisionObject** bod
 		for ( iteration = 0;iteration<numiter;iteration++)
 		{
 			int j;
-			if (infoGlobal.m_solverMode & SOLVER_RANDMIZE_ORDER)
+			if (m_solverMode & SOLVER_RANDMIZE_ORDER)
 			{
 				if ((iteration & 7) == 0) {
 					for (j=0; j<totalPoints; ++j) {
@@ -1113,10 +845,16 @@ btScalar btSequentialImpulseConstraintSolver::solveGroup(btCollisionObject** bod
 				solveFriction((btRigidBody*)manifold->getBody0(),
 					(btRigidBody*)manifold->getBody1(),manifold->getContactPoint(gOrder[j].m_pointIndex),info,iteration,debugDrawer);
 			}
-			
 		}
 	}
 		
+	END_PROFILE("solveConstraints");
+
+
+#ifdef USE_PROFILE
+	btProfiler::endBlock("solve");
+#endif //USE_PROFILE
+
 
 
 
@@ -1140,14 +878,13 @@ void	btSequentialImpulseConstraintSolver::prepareConstraints(btPersistentManifol
 
 	//only necessary to refresh the manifold once (first iteration). The integration is done outside the loop
 	{
-#ifdef FORCE_REFESH_CONTACT_MANIFOLDS
 		manifoldPtr->refreshContactPoints(body0->getCenterOfMassTransform(),body1->getCenterOfMassTransform());
-#endif //FORCE_REFESH_CONTACT_MANIFOLDS		
+		
 		int numpoints = manifoldPtr->getNumContacts();
 
 		gTotalContactPoints += numpoints;
 
-		
+		btVector3 color(0,1,0);
 		for (int i=0;i<numpoints ;i++)
 		{
 			btManifoldPoint& cp = manifoldPtr->getContactPoint(i);
@@ -1188,9 +925,7 @@ void	btSequentialImpulseConstraintSolver::prepareConstraints(btPersistentManifol
 				} else
 				{
 						
-					//todo: should this be in a pool?
-					void* mem = btAlignedAlloc(sizeof(btConstraintPersistentData),16);
-					cpd = new (mem)btConstraintPersistentData;
+					cpd = new btConstraintPersistentData;
 					assert(cpd);
 
 					totalCpd ++;
@@ -1237,9 +972,10 @@ void	btSequentialImpulseConstraintSolver::prepareConstraints(btPersistentManifol
 					cpd->m_penetration = btScalar(0.);
 				} 				
 				
+				
 
 				btScalar relaxation = info.m_damping;
-				if (info.m_solverMode & SOLVER_USE_WARMSTARTING)
+				if (m_solverMode & SOLVER_USE_WARMSTARTING)
 				{
 					cpd->m_appliedImpulse *= relaxation;
 				} else
@@ -1324,12 +1060,16 @@ btScalar btSequentialImpulseConstraintSolver::solveCombinedContactFriction(btRig
 
 	{
 
-		
+		btVector3 color(0,1,0);
 		{
 			if (cp.getDistance() <= btScalar(0.))
 			{
 
-				
+				if (iter == 0)
+				{
+					if (debugDrawer)
+						debugDrawer->drawContactPoint(cp.m_positionWorldOnB,cp.m_normalWorldOnB,cp.getDistance(),cp.getLifeTime(),color);
+				}
 
 				{
 
@@ -1358,12 +1098,16 @@ btScalar btSequentialImpulseConstraintSolver::solve(btRigidBody* body0,btRigidBo
 
 	{
 
-		
+		btVector3 color(0,1,0);
 		{
 			if (cp.getDistance() <= btScalar(0.))
 			{
 
-				
+				if (iter == 0)
+				{
+					if (debugDrawer)
+						debugDrawer->drawContactPoint(cp.m_positionWorldOnB,cp.m_normalWorldOnB,cp.getDistance(),cp.getLifeTime(),color);
+				}
 
 				{
 
@@ -1392,7 +1136,7 @@ btScalar btSequentialImpulseConstraintSolver::solveFriction(btRigidBody* body0,b
 
 	{
 
-		
+		btVector3 color(0,1,0);
 		{
 			
 			if (cp.getDistance() <= btScalar(0.))
@@ -1412,11 +1156,3 @@ btScalar btSequentialImpulseConstraintSolver::solveFriction(btRigidBody* body0,b
 	}
 	return btScalar(0.);
 }
-
-
-void	btSequentialImpulseConstraintSolver::reset()
-{
-	m_btSeed2 = 0;
-}
-
-
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h
index 7143bc41991..13e70c41be4 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h
@@ -19,8 +19,7 @@ subject to the following restrictions:
 #include "btConstraintSolver.h"
 class btIDebugDraw;
 #include "btContactConstraint.h"
-#include "btSolverBody.h"
-#include "btSolverConstraint.h"
+	
 
 
 /// btSequentialImpulseConstraintSolver uses a Propagation Method and Sequentially applies impulses
@@ -30,29 +29,29 @@ class btIDebugDraw;
 class btSequentialImpulseConstraintSolver : public btConstraintSolver
 {
 
-	btAlignedObjectArray<btSolverBody>	m_tmpSolverBodyPool;
-	btAlignedObjectArray<btSolverConstraint>	m_tmpSolverConstraintPool;
-	btAlignedObjectArray<btSolverConstraint>	m_tmpSolverFrictionConstraintPool;
-	btAlignedObjectArray<int>	m_orderTmpConstraintPool;
-	btAlignedObjectArray<int>	m_orderFrictionConstraintPool;
-
-
 protected:
 	btScalar solve(btRigidBody* body0,btRigidBody* body1, btManifoldPoint& cp, const btContactSolverInfo& info,int iter,btIDebugDraw* debugDrawer);
 	btScalar solveFriction(btRigidBody* body0,btRigidBody* body1, btManifoldPoint& cp, const btContactSolverInfo& info,int iter,btIDebugDraw* debugDrawer);
 	void  prepareConstraints(btPersistentManifold* manifoldPtr, const btContactSolverInfo& info,btIDebugDraw* debugDrawer);
-	void	addFrictionConstraint(const btVector3& normalAxis,int solverBodyIdA,int solverBodyIdB,int frictionIndex,btManifoldPoint& cp,const btVector3& rel_pos1,const btVector3& rel_pos2,btCollisionObject* colObj0,btCollisionObject* colObj1, btScalar relaxation);
 
 	ContactSolverFunc m_contactDispatch[MAX_CONTACT_SOLVER_TYPES][MAX_CONTACT_SOLVER_TYPES];
 	ContactSolverFunc m_frictionDispatch[MAX_CONTACT_SOLVER_TYPES][MAX_CONTACT_SOLVER_TYPES];
 
-	
+	//choose between several modes, different friction model etc.
+	int	m_solverMode;
 	///m_btSeed2 is used for re-arranging the constraint rows. improves convergence/quality of friction
 	unsigned long	m_btSeed2;
 
 public:
 
-	
+	enum	eSolverMode
+	{
+		SOLVER_RANDMIZE_ORDER = 1,
+		SOLVER_FRICTION_SEPARATE = 2,
+		SOLVER_USE_WARMSTARTING = 4,
+		SOLVER_CACHE_FRIENDLY = 8
+	};
+
 	btSequentialImpulseConstraintSolver();
 
 	///Advanced: Override the default contact solving function for contacts, for certain types of rigidbody
@@ -69,22 +68,25 @@ public:
 		m_frictionDispatch[type0][type1] = func;
 	}
 
-	virtual ~btSequentialImpulseConstraintSolver();
+	virtual ~btSequentialImpulseConstraintSolver() {}
 	
-	virtual btScalar solveGroup(btCollisionObject** bodies,int numBodies,btPersistentManifold** manifold,int numManifolds,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& info, btIDebugDraw* debugDrawer, btStackAlloc* stackAlloc,btDispatcher* dispatcher);
+	virtual btScalar solveGroup(btCollisionObject** bodies,int numBodies,btPersistentManifold** manifold,int numManifolds,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& info, btIDebugDraw* debugDrawer, btStackAlloc* stackAlloc);
 
 	virtual btScalar solveGroupCacheFriendly(btCollisionObject** bodies,int numBodies,btPersistentManifold** manifoldPtr, int numManifolds,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& infoGlobal,btIDebugDraw* debugDrawer,btStackAlloc* stackAlloc);
-	btScalar solveGroupCacheFriendlyIterations(btCollisionObject** bodies,int numBodies,btPersistentManifold** manifoldPtr, int numManifolds,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& infoGlobal,btIDebugDraw* debugDrawer,btStackAlloc* stackAlloc);
-	btScalar solveGroupCacheFriendlySetup(btCollisionObject** bodies,int numBodies,btPersistentManifold** manifoldPtr, int numManifolds,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& infoGlobal,btIDebugDraw* debugDrawer,btStackAlloc* stackAlloc);
-
-
-	///clear internal cached data and reset random seed
-	virtual	void	reset();
 
 	btScalar solveCombinedContactFriction(btRigidBody* body0,btRigidBody* body1, btManifoldPoint& cp, const btContactSolverInfo& info,int iter,btIDebugDraw* debugDrawer);
 
 
-	
+	void	setSolverMode(int mode)
+	{
+		m_solverMode = mode;
+	}
+
+	int	getSolverMode() const
+	{
+		return m_solverMode;
+	}
+
 	unsigned long btRand2();
 
 	int btRandInt2 (int n);
@@ -100,9 +102,7 @@ public:
 
 };
 
-#ifndef BT_PREFER_SIMD
-typedef btSequentialImpulseConstraintSolver btSequentialImpulseConstraintSolverPrefered;
-#endif
+
 
 
 #endif //SEQUENTIAL_IMPULSE_CONSTRAINT_SOLVER_H
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp
deleted file mode 100644
index e7f07a428eb..00000000000
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp
+++ /dev/null
@@ -1,414 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it freely,
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-/*
-Added by Roman Ponomarev (rponom@gmail.com)
-April 04, 2008
-*/
-
-//-----------------------------------------------------------------------------
-
-#include "btSliderConstraint.h"
-#include "BulletDynamics/Dynamics/btRigidBody.h"
-#include "LinearMath/btTransformUtil.h"
-#include <new>
-
-//-----------------------------------------------------------------------------
-
-void btSliderConstraint::initParams()
-{
-    m_lowerLinLimit = btScalar(1.0);
-    m_upperLinLimit = btScalar(-1.0);
-    m_lowerAngLimit = btScalar(0.);
-    m_upperAngLimit = btScalar(0.);
-	m_softnessDirLin = SLIDER_CONSTRAINT_DEF_SOFTNESS;
-	m_restitutionDirLin = SLIDER_CONSTRAINT_DEF_RESTITUTION;
-	m_dampingDirLin = btScalar(0.);
-	m_softnessDirAng = SLIDER_CONSTRAINT_DEF_SOFTNESS;
-	m_restitutionDirAng = SLIDER_CONSTRAINT_DEF_RESTITUTION;
-	m_dampingDirAng = btScalar(0.);
-	m_softnessOrthoLin = SLIDER_CONSTRAINT_DEF_SOFTNESS;
-	m_restitutionOrthoLin = SLIDER_CONSTRAINT_DEF_RESTITUTION;
-	m_dampingOrthoLin = SLIDER_CONSTRAINT_DEF_DAMPING;
-	m_softnessOrthoAng = SLIDER_CONSTRAINT_DEF_SOFTNESS;
-	m_restitutionOrthoAng = SLIDER_CONSTRAINT_DEF_RESTITUTION;
-	m_dampingOrthoAng = SLIDER_CONSTRAINT_DEF_DAMPING;
-	m_softnessLimLin = SLIDER_CONSTRAINT_DEF_SOFTNESS;
-	m_restitutionLimLin = SLIDER_CONSTRAINT_DEF_RESTITUTION;
-	m_dampingLimLin = SLIDER_CONSTRAINT_DEF_DAMPING;
-	m_softnessLimAng = SLIDER_CONSTRAINT_DEF_SOFTNESS;
-	m_restitutionLimAng = SLIDER_CONSTRAINT_DEF_RESTITUTION;
-	m_dampingLimAng = SLIDER_CONSTRAINT_DEF_DAMPING;
-
-	m_poweredLinMotor = false;
-    m_targetLinMotorVelocity = btScalar(0.);
-    m_maxLinMotorForce = btScalar(0.);
-	m_accumulatedLinMotorImpulse = btScalar(0.0);
-
-	m_poweredAngMotor = false;
-    m_targetAngMotorVelocity = btScalar(0.);
-    m_maxAngMotorForce = btScalar(0.);
-	m_accumulatedAngMotorImpulse = btScalar(0.0);
-
-} // btSliderConstraint::initParams()
-
-//-----------------------------------------------------------------------------
-
-btSliderConstraint::btSliderConstraint()
-        :btTypedConstraint(SLIDER_CONSTRAINT_TYPE),
-		m_useLinearReferenceFrameA(true)
-{
-	initParams();
-} // btSliderConstraint::btSliderConstraint()
-
-//-----------------------------------------------------------------------------
-
-btSliderConstraint::btSliderConstraint(btRigidBody& rbA, btRigidBody& rbB, const btTransform& frameInA, const btTransform& frameInB, bool useLinearReferenceFrameA)
-        : btTypedConstraint(SLIDER_CONSTRAINT_TYPE, rbA, rbB)
-        , m_frameInA(frameInA)
-        , m_frameInB(frameInB),
-		m_useLinearReferenceFrameA(useLinearReferenceFrameA)
-{
-	initParams();
-} // btSliderConstraint::btSliderConstraint()
-
-//-----------------------------------------------------------------------------
-
-void btSliderConstraint::buildJacobian()
-{
-	if(m_useLinearReferenceFrameA)
-	{
-		buildJacobianInt(m_rbA, m_rbB, m_frameInA, m_frameInB);
-	}
-	else
-	{
-		buildJacobianInt(m_rbB, m_rbA, m_frameInB, m_frameInA);
-	}
-} // btSliderConstraint::buildJacobian()
-
-//-----------------------------------------------------------------------------
-
-void btSliderConstraint::buildJacobianInt(btRigidBody& rbA, btRigidBody& rbB, const btTransform& frameInA, const btTransform& frameInB)
-{
-	//calculate transforms
-    m_calculatedTransformA = rbA.getCenterOfMassTransform() * frameInA;
-    m_calculatedTransformB = rbB.getCenterOfMassTransform() * frameInB;
-	m_realPivotAInW = m_calculatedTransformA.getOrigin();
-	m_realPivotBInW = m_calculatedTransformB.getOrigin();
-	m_sliderAxis = m_calculatedTransformA.getBasis().getColumn(0); // along X
-	m_delta = m_realPivotBInW - m_realPivotAInW;
-	m_projPivotInW = m_realPivotAInW + m_sliderAxis.dot(m_delta) * m_sliderAxis;
-	m_relPosA = m_projPivotInW - rbA.getCenterOfMassPosition();
-	m_relPosB = m_realPivotBInW - rbB.getCenterOfMassPosition();
-    btVector3 normalWorld;
-    int i;
-    //linear part
-    for(i = 0; i < 3; i++)
-    {
-		normalWorld = m_calculatedTransformA.getBasis().getColumn(i);
-		new (&m_jacLin[i]) btJacobianEntry(
-			rbA.getCenterOfMassTransform().getBasis().transpose(),
-			rbB.getCenterOfMassTransform().getBasis().transpose(),
-			m_relPosA,
-			m_relPosB,
-			normalWorld,
-			rbA.getInvInertiaDiagLocal(),
-			rbA.getInvMass(),
-			rbB.getInvInertiaDiagLocal(),
-			rbB.getInvMass()
-			);
-		m_jacLinDiagABInv[i] = btScalar(1.) / m_jacLin[i].getDiagonal();
-		m_depth[i] = m_delta.dot(normalWorld);
-    }
-	testLinLimits();
-    // angular part
-    for(i = 0; i < 3; i++)
-    {
-		normalWorld = m_calculatedTransformA.getBasis().getColumn(i);
-		new (&m_jacAng[i])	btJacobianEntry(
-			normalWorld,
-            rbA.getCenterOfMassTransform().getBasis().transpose(),
-            rbB.getCenterOfMassTransform().getBasis().transpose(),
-            rbA.getInvInertiaDiagLocal(),
-            rbB.getInvInertiaDiagLocal()
-			);
-	}
-	testAngLimits();
-	btVector3 axisA = m_calculatedTransformA.getBasis().getColumn(0);
-	m_kAngle = btScalar(1.0 )/ (rbA.computeAngularImpulseDenominator(axisA) + rbB.computeAngularImpulseDenominator(axisA));
-	// clear accumulator for motors
-	m_accumulatedLinMotorImpulse = btScalar(0.0);
-	m_accumulatedAngMotorImpulse = btScalar(0.0);
-} // btSliderConstraint::buildJacobianInt()
-
-//-----------------------------------------------------------------------------
-
-void btSliderConstraint::solveConstraint(btScalar timeStep)
-{
-    m_timeStep = timeStep;
-	if(m_useLinearReferenceFrameA)
-	{
-		solveConstraintInt(m_rbA, m_rbB);
-	}
-	else
-	{
-		solveConstraintInt(m_rbB, m_rbA);
-	}
-} // btSliderConstraint::solveConstraint()
-
-//-----------------------------------------------------------------------------
-
-void btSliderConstraint::solveConstraintInt(btRigidBody& rbA, btRigidBody& rbB)
-{
-    int i;
-    // linear
-    btVector3 velA = rbA.getVelocityInLocalPoint(m_relPosA);
-    btVector3 velB = rbB.getVelocityInLocalPoint(m_relPosB);
-    btVector3 vel = velA - velB;
-	for(i = 0; i < 3; i++)
-    {
-		const btVector3& normal = m_jacLin[i].m_linearJointAxis;
-		btScalar rel_vel = normal.dot(vel);
-		// calculate positional error
-		btScalar depth = m_depth[i];
-		// get parameters
-		btScalar softness = (i) ? m_softnessOrthoLin : (m_solveLinLim ? m_softnessLimLin : m_softnessDirLin);
-		btScalar restitution = (i) ? m_restitutionOrthoLin : (m_solveLinLim ? m_restitutionLimLin : m_restitutionDirLin);
-		btScalar damping = (i) ? m_dampingOrthoLin : (m_solveLinLim ? m_dampingLimLin : m_dampingDirLin);
-		// calcutate and apply impulse
-		btScalar normalImpulse = softness * (restitution * depth / m_timeStep - damping * rel_vel) * m_jacLinDiagABInv[i];
-		btVector3 impulse_vector = normal * normalImpulse;
-		rbA.applyImpulse( impulse_vector, m_relPosA);
-		rbB.applyImpulse(-impulse_vector, m_relPosB);
-		if(m_poweredLinMotor && (!i))
-		{ // apply linear motor
-			if(m_accumulatedLinMotorImpulse < m_maxLinMotorForce)
-			{
-				btScalar desiredMotorVel = m_targetLinMotorVelocity;
-				btScalar motor_relvel = desiredMotorVel + rel_vel;
-				normalImpulse = -motor_relvel * m_jacLinDiagABInv[i];
-				// clamp accumulated impulse
-				btScalar new_acc = m_accumulatedLinMotorImpulse + btFabs(normalImpulse);
-				if(new_acc  > m_maxLinMotorForce)
-				{
-					new_acc = m_maxLinMotorForce;
-				}
-				btScalar del = new_acc  - m_accumulatedLinMotorImpulse;
-				if(normalImpulse < btScalar(0.0))
-				{
-					normalImpulse = -del;
-				}
-				else
-				{
-					normalImpulse = del;
-				}
-				m_accumulatedLinMotorImpulse = new_acc;
-				// apply clamped impulse
-				impulse_vector = normal * normalImpulse;
-				rbA.applyImpulse( impulse_vector, m_relPosA);
-				rbB.applyImpulse(-impulse_vector, m_relPosB);
-			}
-		}
-    }
-	// angular 
-	// get axes in world space
-	btVector3 axisA =  m_calculatedTransformA.getBasis().getColumn(0);
-	btVector3 axisB =  m_calculatedTransformB.getBasis().getColumn(0);
-
-	const btVector3& angVelA = rbA.getAngularVelocity();
-	const btVector3& angVelB = rbB.getAngularVelocity();
-
-	btVector3 angVelAroundAxisA = axisA * axisA.dot(angVelA);
-	btVector3 angVelAroundAxisB = axisB * axisB.dot(angVelB);
-
-	btVector3 angAorthog = angVelA - angVelAroundAxisA;
-	btVector3 angBorthog = angVelB - angVelAroundAxisB;
-	btVector3 velrelOrthog = angAorthog-angBorthog;
-	//solve orthogonal angular velocity correction
-	btScalar len = velrelOrthog.length();
-	if (len > btScalar(0.00001))
-	{
-		btVector3 normal = velrelOrthog.normalized();
-		btScalar denom = rbA.computeAngularImpulseDenominator(normal) + rbB.computeAngularImpulseDenominator(normal);
-		velrelOrthog *= (btScalar(1.)/denom) * m_dampingOrthoAng * m_softnessOrthoAng;
-	}
-	//solve angular positional correction
-	btVector3 angularError = axisA.cross(axisB) *(btScalar(1.)/m_timeStep);
-	btScalar len2 = angularError.length();
-	if (len2>btScalar(0.00001))
-	{
-		btVector3 normal2 = angularError.normalized();
-		btScalar denom2 = rbA.computeAngularImpulseDenominator(normal2) + rbB.computeAngularImpulseDenominator(normal2);
-		angularError *= (btScalar(1.)/denom2) * m_restitutionOrthoAng * m_softnessOrthoAng;
-	}
-	// apply impulse
-	rbA.applyTorqueImpulse(-velrelOrthog+angularError);
-	rbB.applyTorqueImpulse(velrelOrthog-angularError);
-	btScalar impulseMag;
-	//solve angular limits
-	if(m_solveAngLim)
-	{
-		impulseMag = (angVelB - angVelA).dot(axisA) * m_dampingLimAng + m_angDepth * m_restitutionLimAng / m_timeStep;
-		impulseMag *= m_kAngle * m_softnessLimAng;
-	}
-	else
-	{
-		impulseMag = (angVelB - angVelA).dot(axisA) * m_dampingDirAng + m_angDepth * m_restitutionDirAng / m_timeStep;
-		impulseMag *= m_kAngle * m_softnessDirAng;
-	}
-	btVector3 impulse = axisA * impulseMag;
-	rbA.applyTorqueImpulse(impulse);
-	rbB.applyTorqueImpulse(-impulse);
-	//apply angular motor
-	if(m_poweredAngMotor) 
-	{
-		if(m_accumulatedAngMotorImpulse < m_maxAngMotorForce)
-		{
-			btVector3 velrel = angVelAroundAxisA - angVelAroundAxisB;
-			btScalar projRelVel = velrel.dot(axisA);
-
-			btScalar desiredMotorVel = m_targetAngMotorVelocity;
-			btScalar motor_relvel = desiredMotorVel - projRelVel;
-
-			btScalar angImpulse = m_kAngle * motor_relvel;
-			// clamp accumulated impulse
-			btScalar new_acc = m_accumulatedAngMotorImpulse + btFabs(angImpulse);
-			if(new_acc  > m_maxAngMotorForce)
-			{
-				new_acc = m_maxAngMotorForce;
-			}
-			btScalar del = new_acc  - m_accumulatedAngMotorImpulse;
-			if(angImpulse < btScalar(0.0))
-			{
-				angImpulse = -del;
-			}
-			else
-			{
-				angImpulse = del;
-			}
-			m_accumulatedAngMotorImpulse = new_acc;
-			// apply clamped impulse
-			btVector3 motorImp = angImpulse * axisA;
-			m_rbA.applyTorqueImpulse(motorImp);
-			m_rbB.applyTorqueImpulse(-motorImp);
-		}
-	}
-} // btSliderConstraint::solveConstraint()
-
-//-----------------------------------------------------------------------------
-
-//-----------------------------------------------------------------------------
-
-void btSliderConstraint::calculateTransforms(void){
-	if(m_useLinearReferenceFrameA)
-	{
-		m_calculatedTransformA = m_rbA.getCenterOfMassTransform() * m_frameInA;
-		m_calculatedTransformB = m_rbB.getCenterOfMassTransform() * m_frameInB;
-	}
-	else
-	{
-		m_calculatedTransformA = m_rbB.getCenterOfMassTransform() * m_frameInB;
-		m_calculatedTransformB = m_rbA.getCenterOfMassTransform() * m_frameInA;
-	}
-	m_realPivotAInW = m_calculatedTransformA.getOrigin();
-	m_realPivotBInW = m_calculatedTransformB.getOrigin();
-	m_sliderAxis = m_calculatedTransformA.getBasis().getColumn(0); // along X
-	m_delta = m_realPivotBInW - m_realPivotAInW;
-	m_projPivotInW = m_realPivotAInW + m_sliderAxis.dot(m_delta) * m_sliderAxis;
-    btVector3 normalWorld;
-    int i;
-    //linear part
-    for(i = 0; i < 3; i++)
-    {
-		normalWorld = m_calculatedTransformA.getBasis().getColumn(i);
-		m_depth[i] = m_delta.dot(normalWorld);
-    }
-} // btSliderConstraint::calculateTransforms()
- 
-//-----------------------------------------------------------------------------
-
-void btSliderConstraint::testLinLimits(void)
-{
-	m_solveLinLim = false;
-	if(m_lowerLinLimit <= m_upperLinLimit)
-	{
-		if(m_depth[0] > m_upperLinLimit)
-		{
-			m_depth[0] -= m_upperLinLimit;
-			m_solveLinLim = true;
-		}
-		else if(m_depth[0] < m_lowerLinLimit)
-		{
-			m_depth[0] -= m_lowerLinLimit;
-			m_solveLinLim = true;
-		}
-		else
-		{
-			m_depth[0] = btScalar(0.);
-		}
-	}
-	else
-	{
-		m_depth[0] = btScalar(0.);
-	}
-} // btSliderConstraint::testLinLimits()
-
-//-----------------------------------------------------------------------------
- 
-
-void btSliderConstraint::testAngLimits(void)
-{
-	m_angDepth = btScalar(0.);
-	m_solveAngLim = false;
-	if(m_lowerAngLimit <= m_upperAngLimit)
-	{
-		const btVector3 axisA0 = m_calculatedTransformA.getBasis().getColumn(1);
-		const btVector3 axisA1 = m_calculatedTransformA.getBasis().getColumn(2);
-		const btVector3 axisB0 = m_calculatedTransformB.getBasis().getColumn(1);
-		btScalar rot = btAtan2Fast(axisB0.dot(axisA1), axisB0.dot(axisA0));  
-		if(rot < m_lowerAngLimit)
-		{
-			m_angDepth = rot - m_lowerAngLimit;
-			m_solveAngLim = true;
-		} 
-		else if(rot > m_upperAngLimit)
-		{
-			m_angDepth = rot - m_upperAngLimit;
-			m_solveAngLim = true;
-		}
-	}
-} // btSliderConstraint::testAngLimits()
-
-	
-//-----------------------------------------------------------------------------
-
-
-
-btVector3 btSliderConstraint::getAncorInA(void)
-{
-	btVector3 ancorInA;
-	ancorInA = m_realPivotAInW + (m_lowerLinLimit + m_upperLinLimit) * btScalar(0.5) * m_sliderAxis;
-	ancorInA = m_rbA.getCenterOfMassTransform().inverse() * ancorInA;
-	return ancorInA;
-} // btSliderConstraint::getAncorInA()
-
-//-----------------------------------------------------------------------------
-
-btVector3 btSliderConstraint::getAncorInB(void)
-{
-	btVector3 ancorInB;
-	ancorInB = m_frameInB.getOrigin();
-	return ancorInB;
-} // btSliderConstraint::getAncorInB();
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h
deleted file mode 100644
index f69dfcf3aa7..00000000000
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it freely,
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-/*
-Added by Roman Ponomarev (rponom@gmail.com)
-April 04, 2008
-
-TODO:
- - add clamping od accumulated impulse to improve stability
- - add conversion for ODE constraint solver
-*/
-
-#ifndef SLIDER_CONSTRAINT_H
-#define SLIDER_CONSTRAINT_H
-
-//-----------------------------------------------------------------------------
-
-#include "LinearMath/btVector3.h"
-#include "btJacobianEntry.h"
-#include "btTypedConstraint.h"
-
-//-----------------------------------------------------------------------------
-
-class btRigidBody;
-
-//-----------------------------------------------------------------------------
-
-#define SLIDER_CONSTRAINT_DEF_SOFTNESS		(btScalar(1.0))
-#define SLIDER_CONSTRAINT_DEF_DAMPING		(btScalar(1.0))
-#define SLIDER_CONSTRAINT_DEF_RESTITUTION	(btScalar(0.7))
-
-//-----------------------------------------------------------------------------
-
-class btSliderConstraint : public btTypedConstraint
-{
-protected:
-	btTransform	m_frameInA;
-    btTransform	m_frameInB;
-	// use frameA fo define limits, if true
-	bool m_useLinearReferenceFrameA;
-	// linear limits
-	btScalar m_lowerLinLimit;
-	btScalar m_upperLinLimit;
-	// angular limits
-	btScalar m_lowerAngLimit;
-	btScalar m_upperAngLimit;
-	// softness, restitution and damping for different cases
-	// DirLin - moving inside linear limits
-	// LimLin - hitting linear limit
-	// DirAng - moving inside angular limits
-	// LimAng - hitting angular limit
-	// OrthoLin, OrthoAng - against constraint axis
-	btScalar m_softnessDirLin;
-	btScalar m_restitutionDirLin;
-	btScalar m_dampingDirLin;
-	btScalar m_softnessDirAng;
-	btScalar m_restitutionDirAng;
-	btScalar m_dampingDirAng;
-	btScalar m_softnessLimLin;
-	btScalar m_restitutionLimLin;
-	btScalar m_dampingLimLin;
-	btScalar m_softnessLimAng;
-	btScalar m_restitutionLimAng;
-	btScalar m_dampingLimAng;
-	btScalar m_softnessOrthoLin;
-	btScalar m_restitutionOrthoLin;
-	btScalar m_dampingOrthoLin;
-	btScalar m_softnessOrthoAng;
-	btScalar m_restitutionOrthoAng;
-	btScalar m_dampingOrthoAng;
-	
-	// for interlal use
-	bool m_solveLinLim;
-	bool m_solveAngLim;
-
-	btJacobianEntry	m_jacLin[3];
-	btScalar		m_jacLinDiagABInv[3];
-
-    btJacobianEntry	m_jacAng[3];
-
-	btScalar m_timeStep;
-    btTransform m_calculatedTransformA;
-    btTransform m_calculatedTransformB;
-
-	btVector3 m_sliderAxis;
-	btVector3 m_realPivotAInW;
-	btVector3 m_realPivotBInW;
-	btVector3 m_projPivotInW;
-	btVector3 m_delta;
-	btVector3 m_depth;
-	btVector3 m_relPosA;
-	btVector3 m_relPosB;
-
-	btScalar m_angDepth;
-	btScalar m_kAngle;
-
-	bool	 m_poweredLinMotor;
-    btScalar m_targetLinMotorVelocity;
-    btScalar m_maxLinMotorForce;
-    btScalar m_accumulatedLinMotorImpulse;
-	
-	bool	 m_poweredAngMotor;
-    btScalar m_targetAngMotorVelocity;
-    btScalar m_maxAngMotorForce;
-    btScalar m_accumulatedAngMotorImpulse;
-
-	//------------------------    
-	void initParams();
-public:
-	// constructors
-    btSliderConstraint(btRigidBody& rbA, btRigidBody& rbB, const btTransform& frameInA, const btTransform& frameInB ,bool useLinearReferenceFrameA);
-    btSliderConstraint();
-	// overrides
-    virtual void	buildJacobian();
-    virtual	void	solveConstraint(btScalar	timeStep);
-	// access
-    const btRigidBody& getRigidBodyA() const { return m_rbA; }
-    const btRigidBody& getRigidBodyB() const { return m_rbB; }
-    const btTransform & getCalculatedTransformA() const { return m_calculatedTransformA; }
-    const btTransform & getCalculatedTransformB() const { return m_calculatedTransformB; }
-    const btTransform & getFrameOffsetA() const { return m_frameInA; }
-    const btTransform & getFrameOffsetB() const { return m_frameInB; }
-    btTransform & getFrameOffsetA() { return m_frameInA; }
-    btTransform & getFrameOffsetB() { return m_frameInB; }
-    btScalar getLowerLinLimit() { return m_lowerLinLimit; }
-    void setLowerLinLimit(btScalar lowerLimit) { m_lowerLinLimit = lowerLimit; }
-    btScalar getUpperLinLimit() { return m_upperLinLimit; }
-    void setUpperLinLimit(btScalar upperLimit) { m_upperLinLimit = upperLimit; }
-    btScalar getLowerAngLimit() { return m_lowerAngLimit; }
-    void setLowerAngLimit(btScalar lowerLimit) { m_lowerAngLimit = lowerLimit; }
-    btScalar getUpperAngLimit() { return m_upperAngLimit; }
-    void setUpperAngLimit(btScalar upperLimit) { m_upperAngLimit = upperLimit; }
-	bool getUseLinearReferenceFrameA() { return m_useLinearReferenceFrameA; }
-	btScalar getSoftnessDirLin() { return m_softnessDirLin; }
-	btScalar getRestitutionDirLin() { return m_restitutionDirLin; }
-	btScalar getDampingDirLin() { return m_dampingDirLin ; }
-	btScalar getSoftnessDirAng() { return m_softnessDirAng; }
-	btScalar getRestitutionDirAng() { return m_restitutionDirAng; }
-	btScalar getDampingDirAng() { return m_dampingDirAng; }
-	btScalar getSoftnessLimLin() { return m_softnessLimLin; }
-	btScalar getRestitutionLimLin() { return m_restitutionLimLin; }
-	btScalar getDampingLimLin() { return m_dampingLimLin; }
-	btScalar getSoftnessLimAng() { return m_softnessLimAng; }
-	btScalar getRestitutionLimAng() { return m_restitutionLimAng; }
-	btScalar getDampingLimAng() { return m_dampingLimAng; }
-	btScalar getSoftnessOrthoLin() { return m_softnessOrthoLin; }
-	btScalar getRestitutionOrthoLin() { return m_restitutionOrthoLin; }
-	btScalar getDampingOrthoLin() { return m_dampingOrthoLin; }
-	btScalar getSoftnessOrthoAng() { return m_softnessOrthoAng; }
-	btScalar getRestitutionOrthoAng() { return m_restitutionOrthoAng; }
-	btScalar getDampingOrthoAng() { return m_dampingOrthoAng; }
-	void setSoftnessDirLin(btScalar softnessDirLin) { m_softnessDirLin = softnessDirLin; }
-	void setRestitutionDirLin(btScalar restitutionDirLin) { m_restitutionDirLin = restitutionDirLin; }
-	void setDampingDirLin(btScalar dampingDirLin) { m_dampingDirLin = dampingDirLin; }
-	void setSoftnessDirAng(btScalar softnessDirAng) { m_softnessDirAng = softnessDirAng; }
-	void setRestitutionDirAng(btScalar restitutionDirAng) { m_restitutionDirAng = restitutionDirAng; }
-	void setDampingDirAng(btScalar dampingDirAng) { m_dampingDirAng = dampingDirAng; }
-	void setSoftnessLimLin(btScalar softnessLimLin) { m_softnessLimLin = softnessLimLin; }
-	void setRestitutionLimLin(btScalar restitutionLimLin) { m_restitutionLimLin = restitutionLimLin; }
-	void setDampingLimLin(btScalar dampingLimLin) { m_dampingLimLin = dampingLimLin; }
-	void setSoftnessLimAng(btScalar softnessLimAng) { m_softnessLimAng = softnessLimAng; }
-	void setRestitutionLimAng(btScalar restitutionLimAng) { m_restitutionLimAng = restitutionLimAng; }
-	void setDampingLimAng(btScalar dampingLimAng) { m_dampingLimAng = dampingLimAng; }
-	void setSoftnessOrthoLin(btScalar softnessOrthoLin) { m_softnessOrthoLin = softnessOrthoLin; }
-	void setRestitutionOrthoLin(btScalar restitutionOrthoLin) { m_restitutionOrthoLin = restitutionOrthoLin; }
-	void setDampingOrthoLin(btScalar dampingOrthoLin) { m_dampingOrthoLin = dampingOrthoLin; }
-	void setSoftnessOrthoAng(btScalar softnessOrthoAng) { m_softnessOrthoAng = softnessOrthoAng; }
-	void setRestitutionOrthoAng(btScalar restitutionOrthoAng) { m_restitutionOrthoAng = restitutionOrthoAng; }
-	void setDampingOrthoAng(btScalar dampingOrthoAng) { m_dampingOrthoAng = dampingOrthoAng; }
-	void setPoweredLinMotor(bool onOff) { m_poweredLinMotor = onOff; }
-	bool getPoweredLinMotor() { return m_poweredLinMotor; }
-	void setTargetLinMotorVelocity(btScalar targetLinMotorVelocity) { m_targetLinMotorVelocity = targetLinMotorVelocity; }
-	btScalar getTargetLinMotorVelocity() { return m_targetLinMotorVelocity; }
-	void setMaxLinMotorForce(btScalar maxLinMotorForce) { m_maxLinMotorForce = maxLinMotorForce; }
-	btScalar getMaxLinMotorForce() { return m_maxLinMotorForce; }
-	void setPoweredAngMotor(bool onOff) { m_poweredAngMotor = onOff; }
-	bool getPoweredAngMotor() { return m_poweredAngMotor; }
-	void setTargetAngMotorVelocity(btScalar targetAngMotorVelocity) { m_targetAngMotorVelocity = targetAngMotorVelocity; }
-	btScalar getTargetAngMotorVelocity() { return m_targetAngMotorVelocity; }
-	void setMaxAngMotorForce(btScalar maxAngMotorForce) { m_maxAngMotorForce = maxAngMotorForce; }
-	btScalar getMaxAngMotorForce() { return m_maxAngMotorForce; }
-
-	// access for ODE solver
-	bool getSolveLinLimit() { return m_solveLinLim; }
-	btScalar getLinDepth() { return m_depth[0]; }
-	bool getSolveAngLimit() { return m_solveAngLim; }
-	btScalar getAngDepth() { return m_angDepth; }
-	// internal
-    void	buildJacobianInt(btRigidBody& rbA, btRigidBody& rbB, const btTransform& frameInA, const btTransform& frameInB);
-    void	solveConstraintInt(btRigidBody& rbA, btRigidBody& rbB);
-	// shared code used by ODE solver
-	void	calculateTransforms(void);
-	void	testLinLimits(void);
-	void	testAngLimits(void);
-	// access for PE Solver
-	btVector3 getAncorInA(void);
-	btVector3 getAncorInB(void);
-};
-
-//-----------------------------------------------------------------------------
-
-#endif //SLIDER_CONSTRAINT_H
-
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h
index 057d3fac827..e7d26645c6a 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolve2LinearConstraint.h
@@ -16,8 +16,8 @@ subject to the following restrictions:
 #ifndef SOLVE_2LINEAR_CONSTRAINT_H
 #define SOLVE_2LINEAR_CONSTRAINT_H
 
-#include "LinearMath/btMatrix3x3.h"
-#include "LinearMath/btVector3.h"
+#include "../../LinearMath/btMatrix3x3.h"
+#include "../../LinearMath/btVector3.h"
 
 
 class btRigidBody;
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverBody.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverBody.h
index b3f0c9d7444..0ab536f42b3 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverBody.h
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverBody.h
@@ -19,78 +19,38 @@ subject to the following restrictions:
 class	btRigidBody;
 #include "LinearMath/btVector3.h"
 #include "LinearMath/btMatrix3x3.h"
-#include "BulletDynamics/Dynamics/btRigidBody.h"
-#include "LinearMath/btAlignedAllocator.h"
-#include "LinearMath/btTransformUtil.h"
 
 
-///btSolverBody is an internal datastructure for the constraint solver. Only necessary data is packed to increase cache coherence/performance.
+
+
 ATTRIBUTE_ALIGNED16 (struct)	btSolverBody
 {
-	BT_DECLARE_ALIGNED_ALLOCATOR();
-	
+	btVector3		m_centerOfMassPosition;
+	btVector3		m_linearVelocity;
 	btVector3		m_angularVelocity;
-	float			m_angularFactor;
+	btRigidBody*	m_originalBody;
 	float			m_invMass;
 	float			m_friction;
-	btRigidBody*	m_originalBody;
-	btVector3		m_linearVelocity;
-	btVector3		m_centerOfMassPosition;
-	
-	btVector3		m_pushVelocity;
-	btVector3		m_turnVelocity;
-	
-	
-	SIMD_FORCE_INLINE void	getVelocityInLocalPoint(const btVector3& rel_pos, btVector3& velocity ) const
+	float			m_angularFactor;
+
+	inline void	getVelocityInLocalPoint(const btVector3& rel_pos, btVector3& velocity ) const
 	{
 		velocity = m_linearVelocity + m_angularVelocity.cross(rel_pos);
 	}
 
 	//Optimization for the iterative solver: avoid calculating constant terms involving inertia, normal, relative position
-	SIMD_FORCE_INLINE void internalApplyImpulse(const btVector3& linearComponent, const btVector3& angularComponent,btScalar impulseMagnitude)
+	inline void internalApplyImpulse(const btVector3& linearComponent, const btVector3& angularComponent,btScalar impulseMagnitude)
 	{
-		if (m_invMass)
-		{
-			m_linearVelocity += linearComponent*impulseMagnitude;
-			m_angularVelocity += angularComponent*(impulseMagnitude*m_angularFactor);
-		}
-	}
-	
-	SIMD_FORCE_INLINE void internalApplyPushImpulse(const btVector3& linearComponent, const btVector3& angularComponent,btScalar impulseMagnitude)
-	{
-		if (m_invMass)
-		{
-			m_pushVelocity += linearComponent*impulseMagnitude;
-			m_turnVelocity += angularComponent*(impulseMagnitude*m_angularFactor);
-		}
+		m_linearVelocity += linearComponent*impulseMagnitude;
+		m_angularVelocity += angularComponent*impulseMagnitude*m_angularFactor;
 	}
 
-	
 	void	writebackVelocity()
 	{
 		if (m_invMass)
 		{
 			m_originalBody->setLinearVelocity(m_linearVelocity);
 			m_originalBody->setAngularVelocity(m_angularVelocity);
-			
-			//m_originalBody->setCompanionId(-1);
-		}
-	}
-	
-
-	void	writebackVelocity(btScalar timeStep)
-	{
-		if (m_invMass)
-		{
-			m_originalBody->setLinearVelocity(m_linearVelocity);
-			m_originalBody->setAngularVelocity(m_angularVelocity);
-			
-			//correct the position/orientation based on push/turn recovery
-			btTransform newTransform;
-			btTransformUtil::integrateTransform(m_originalBody->getWorldTransform(),m_pushVelocity,m_turnVelocity,timeStep,newTransform);
-			m_originalBody->setWorldTransform(newTransform);
-			
-			//m_originalBody->setCompanionId(-1);
 		}
 	}
 
@@ -109,5 +69,3 @@ ATTRIBUTE_ALIGNED16 (struct)	btSolverBody
 };
 
 #endif //BT_SOLVER_BODY_H
-
-
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h
index 2c71360c5b9..f1f40ffdf19 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h
@@ -1,3 +1,5 @@
+
+
 /*
 Bullet Continuous Collision Detection and Physics Library
 Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
@@ -25,34 +27,24 @@ class	btRigidBody;
 ///1D constraint along a normal axis between bodyA and bodyB. It can be combined to solve contact and friction constraints.
 ATTRIBUTE_ALIGNED16 (struct)	btSolverConstraint
 {
-	BT_DECLARE_ALIGNED_ALLOCATOR();
-
 	btVector3	m_relpos1CrossNormal;
-	btVector3	m_contactNormal;
-
 	btVector3	m_relpos2CrossNormal;
+	btVector3	m_contactNormal;
 	btVector3	m_angularComponentA;
-
 	btVector3	m_angularComponentB;
 
-	mutable btScalar	m_appliedPushImpulse;
-	
-	mutable btScalar	m_appliedImpulse;
+	btScalar	m_appliedVelocityImpulse;
 	int			m_solverBodyIdA;
 	int			m_solverBodyIdB;
-	
 	btScalar	m_friction;
 	btScalar	m_restitution;
 	btScalar	m_jacDiagABInv;
 	btScalar	m_penetration;
-	
+	btScalar	m_appliedImpulse;
 
-	
 	int			m_constraintType;
 	int			m_frictionIndex;
-	void*		m_originalContactPoint;
-	int			m_unusedPadding[1];
-
+	int			m_unusedPadding[2];
 
 	enum		btSolverConstraintType
 	{
@@ -69,4 +61,3 @@ ATTRIBUTE_ALIGNED16 (struct)	btSolverConstraint
 #endif //BT_SOLVER_CONSTRAINT_H
 
 
-
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp
index 6e8b552dbbc..a15b3e026cd 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp
@@ -19,20 +19,18 @@ subject to the following restrictions:
 
 static btRigidBody s_fixed(0, 0,0);
 
-btTypedConstraint::btTypedConstraint(btTypedConstraintType type)
-:m_userConstraintType(-1),
+btTypedConstraint::btTypedConstraint()
+: m_userConstraintType(-1),
 m_userConstraintId(-1),
-m_constraintType (type),
 m_rbA(s_fixed),
 m_rbB(s_fixed),
 m_appliedImpulse(btScalar(0.))
 {
 	s_fixed.setMassProps(btScalar(0.),btVector3(btScalar(0.),btScalar(0.),btScalar(0.)));
 }
-btTypedConstraint::btTypedConstraint(btTypedConstraintType type, btRigidBody& rbA)
-:m_userConstraintType(-1),
+btTypedConstraint::btTypedConstraint(btRigidBody& rbA)
+: m_userConstraintType(-1),
 m_userConstraintId(-1),
-m_constraintType (type),
 m_rbA(rbA),
 m_rbB(s_fixed),
 m_appliedImpulse(btScalar(0.))
@@ -42,10 +40,9 @@ m_appliedImpulse(btScalar(0.))
 }
 
 
-btTypedConstraint::btTypedConstraint(btTypedConstraintType type, btRigidBody& rbA,btRigidBody& rbB)
-:m_userConstraintType(-1),
+btTypedConstraint::btTypedConstraint(btRigidBody& rbA,btRigidBody& rbB)
+: m_userConstraintType(-1),
 m_userConstraintId(-1),
-m_constraintType (type),
 m_rbA(rbA),
 m_rbB(rbB),
 m_appliedImpulse(btScalar(0.))
diff --git a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h
index c50ec6ec579..dfee6e80d0e 100644
--- a/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h
+++ b/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h
@@ -17,17 +17,7 @@ subject to the following restrictions:
 #define TYPED_CONSTRAINT_H
 
 class btRigidBody;
-#include "LinearMath/btScalar.h"
-
-enum btTypedConstraintType
-{
-	POINT2POINT_CONSTRAINT_TYPE,
-	HINGE_CONSTRAINT_TYPE,
-	CONETWIST_CONSTRAINT_TYPE,
-	D6_CONSTRAINT_TYPE,
-	VEHICLE_CONSTRAINT_TYPE,
-	SLIDER_CONSTRAINT_TYPE
-};
+#include "../../LinearMath/btScalar.h"
 
 ///TypedConstraint is the baseclass for Bullet constraints and vehicles
 class btTypedConstraint
@@ -35,8 +25,6 @@ class btTypedConstraint
 	int	m_userConstraintType;
 	int	m_userConstraintId;
 
-	btTypedConstraintType m_constraintType;
-
 	btTypedConstraint&	operator=(btTypedConstraint&	other)
 	{
 		btAssert(0);
@@ -52,11 +40,11 @@ protected:
 
 public:
 
-	btTypedConstraint(btTypedConstraintType type);
+	btTypedConstraint();
 	virtual ~btTypedConstraint() {};
-	btTypedConstraint(btTypedConstraintType type, btRigidBody& rbA);
+	btTypedConstraint(btRigidBody& rbA);
 
-	btTypedConstraint(btTypedConstraintType type, btRigidBody& rbA,btRigidBody& rbB);
+	btTypedConstraint(btRigidBody& rbA,btRigidBody& rbB);
 
 	virtual void	buildJacobian() = 0;
 
@@ -71,7 +59,7 @@ public:
 		return m_rbB;
 	}
 
-	btRigidBody& getRigidBodyA() 
+	btRigidBody& getRigidBodyA()
 	{
 		return m_rbA;
 	}
@@ -95,26 +83,14 @@ public:
 		m_userConstraintId = uid;
 	}
 	
-	int getUserConstraintId() const
+	int getUserConstraintId()
 	{
 		return m_userConstraintId;
 	}
-
-	int getUid() const
-	{
-		return m_userConstraintId;   
-	} 
-
-	btScalar	getAppliedImpulse() const
+	btScalar	getAppliedImpulse()
 	{
 		return m_appliedImpulse;
 	}
-
-	btTypedConstraintType getConstraintType () const
-	{
-		return m_constraintType;
-	}
-
 };
 
 #endif //TYPED_CONSTRAINT_H
diff --git a/extern/bullet2/src/BulletDynamics/Dynamics/Bullet-C-API.cpp b/extern/bullet2/src/BulletDynamics/Dynamics/Bullet-C-API.cpp
index b28a46e299e..248c582dcd8 100644
--- a/extern/bullet2/src/BulletDynamics/Dynamics/Bullet-C-API.cpp
+++ b/extern/bullet2/src/BulletDynamics/Dynamics/Bullet-C-API.cpp
@@ -24,287 +24,97 @@ subject to the following restrictions:
 #include "btBulletDynamicsCommon.h"
 #include "LinearMath/btAlignedAllocator.h"
 
-/*
-	Create and Delete a Physics SDK	
-*/
 
-struct	btPhysicsSdk
+#include "LinearMath/btVector3.h"
+#include "LinearMath/btScalar.h"	
+#include "LinearMath/btMatrix3x3.h"
+#include "LinearMath/btTransform.h"
+#include "BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h"
+#include "BulletCollision/CollisionShapes/btTriangleShape.h"
+
+#include "BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h"
+#include "BulletCollision/NarrowPhaseCollision/btPointCollector.h"
+#include "BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h"
+#include "BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h"
+#include "BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h"
+#include "BulletCollision/NarrowPhaseCollision/btGjkEpa.h"
+#include "BulletCollision/CollisionShapes/btMinkowskiSumShape.h"
+#include "BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h"
+#include "BulletCollision/NarrowPhaseCollision/btVoronoiSimplexSolver.h"
+#include "BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h"
+
+#include "BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h"
+#include "BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h"
+#include "BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h"
+#include "BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h"
+#include "BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h"
+#include "LinearMath/btStackAlloc.h"
+
+extern "C"
+double plNearestPoints(float p1[3], float p2[3], float p3[3], float q1[3], float q2[3], float q3[3], float *pa, float *pb, float normal[3])
 {
-
-//	btDispatcher*				m_dispatcher;
-//	btOverlappingPairCache*		m_pairCache;
-//	btConstraintSolver*			m_constraintSolver
-
-	btVector3	m_worldAabbMin;
-	btVector3	m_worldAabbMax;
-
-
-	//todo: version, hardware/optimization settings etc?
-	btPhysicsSdk()
-		:m_worldAabbMin(-1000,-1000,-1000),
-		m_worldAabbMax(1000,1000,1000)
+	btVector3 vp(p1[0], p1[1], p1[2]);
+	btTriangleShape trishapeA(vp, 
+				  btVector3(p2[0], p2[1], p2[2]), 
+				  btVector3(p3[0], p3[1], p3[2]));
+	trishapeA.setMargin(0.000001f);
+	btVector3 vq(q1[0], q1[1], q1[2]);
+	btTriangleShape trishapeB(vq, 
+				  btVector3(q2[0], q2[1], q2[2]), 
+				  btVector3(q3[0], q3[1], q3[2]));
+	trishapeB.setMargin(0.000001f);
+	
+	// btVoronoiSimplexSolver sGjkSimplexSolver;
+	// btGjkEpaPenetrationDepthSolver penSolverPtr;	
+	
+	static btSimplexSolverInterface sGjkSimplexSolver;
+	sGjkSimplexSolver.reset();
+	
+	static btGjkEpaPenetrationDepthSolver Solver0;
+	static btMinkowskiPenetrationDepthSolver Solver1;
+		
+	btConvexPenetrationDepthSolver* Solver = NULL;
+	
+	Solver = &Solver1;	
+		
+	btGjkPairDetector convexConvex(&trishapeA ,&trishapeB,&sGjkSimplexSolver,Solver);
+	
+	convexConvex.m_catchDegeneracies = 1;
+	
+	// btGjkPairDetector convexConvex(&trishapeA ,&trishapeB,&sGjkSimplexSolver,0);
+	
+	btPointCollector gjkOutput;
+	btGjkPairDetector::ClosestPointInput input;
+	
+	btStackAlloc gStackAlloc(1024*1024*2);
+ 
+	input.m_stackAlloc = &gStackAlloc;
+	
+	btTransform tr;
+	tr.setIdentity();
+	
+	input.m_transformA = tr;
+	input.m_transformB = tr;
+	
+	convexConvex.getClosestPoints(input, gjkOutput, 0);
+	
+	
+	if (gjkOutput.m_hasResult)
 	{
+		
+		pb[0] = pa[0] = gjkOutput.m_pointInWorld[0];
+		pb[1] = pa[1] = gjkOutput.m_pointInWorld[1];
+		pb[2] = pa[2] = gjkOutput.m_pointInWorld[2];
 
+		pb[0]+= gjkOutput.m_normalOnBInWorld[0] * gjkOutput.m_distance;
+		pb[1]+= gjkOutput.m_normalOnBInWorld[1] * gjkOutput.m_distance;
+		pb[2]+= gjkOutput.m_normalOnBInWorld[2] * gjkOutput.m_distance;
+		
+		normal[0] = gjkOutput.m_normalOnBInWorld[0];
+		normal[1] = gjkOutput.m_normalOnBInWorld[1];
+		normal[2] = gjkOutput.m_normalOnBInWorld[2];
+
+		return gjkOutput.m_distance;
 	}
-
-	
-};
-
-plPhysicsSdkHandle	plNewBulletSdk()
-{
-	void* mem = btAlignedAlloc(sizeof(btPhysicsSdk),16);
-	return (plPhysicsSdkHandle)new (mem)btPhysicsSdk;
+	return -1.0f;	
 }
-
-void		plDeletePhysicsSdk(plPhysicsSdkHandle	physicsSdk)
-{
-	btPhysicsSdk* phys = reinterpret_cast<btPhysicsSdk*>(physicsSdk);
-	btAlignedFree(phys);	
-}
-
-
-/* Dynamics World */
-plDynamicsWorldHandle plCreateDynamicsWorld(plPhysicsSdkHandle physicsSdkHandle)
-{
-	btPhysicsSdk* physicsSdk = reinterpret_cast<btPhysicsSdk*>(physicsSdkHandle);
-	void* mem = btAlignedAlloc(sizeof(btDefaultCollisionConfiguration),16);
-	btDefaultCollisionConfiguration* collisionConfiguration = new (mem)btDefaultCollisionConfiguration();
-	mem = btAlignedAlloc(sizeof(btCollisionDispatcher),16);
-	btDispatcher*				dispatcher = new (mem)btCollisionDispatcher(collisionConfiguration);
-	mem = btAlignedAlloc(sizeof(btAxisSweep3),16);
-	btBroadphaseInterface*		pairCache = new (mem)btAxisSweep3(physicsSdk->m_worldAabbMin,physicsSdk->m_worldAabbMax);
-	mem = btAlignedAlloc(sizeof(btSequentialImpulseConstraintSolver),16);
-	btConstraintSolver*			constraintSolver = new(mem) btSequentialImpulseConstraintSolver();
-
-	mem = btAlignedAlloc(sizeof(btDiscreteDynamicsWorld),16);
-	return (plDynamicsWorldHandle) new (mem)btDiscreteDynamicsWorld(dispatcher,pairCache,constraintSolver,collisionConfiguration);
-}
-void           plDeleteDynamicsWorld(plDynamicsWorldHandle world)
-{
-	//todo: also clean up the other allocations, axisSweep, pairCache,dispatcher,constraintSolver,collisionConfiguration
-	btDynamicsWorld* dynamicsWorld = reinterpret_cast< btDynamicsWorld* >(world);
-	btAlignedFree(dynamicsWorld);
-}
-
-void	plStepSimulation(plDynamicsWorldHandle world,	plReal	timeStep)
-{
-	btDynamicsWorld* dynamicsWorld = reinterpret_cast< btDynamicsWorld* >(world);
-	assert(dynamicsWorld);
-	dynamicsWorld->stepSimulation(timeStep);
-}
-
-void plAddRigidBody(plDynamicsWorldHandle world, plRigidBodyHandle object)
-{
-	btDynamicsWorld* dynamicsWorld = reinterpret_cast< btDynamicsWorld* >(world);
-	assert(dynamicsWorld);
-	btRigidBody* body = reinterpret_cast< btRigidBody* >(object);
-	assert(body);
-
-	dynamicsWorld->addRigidBody(body);
-}
-
-void plRemoveRigidBody(plDynamicsWorldHandle world, plRigidBodyHandle object)
-{
-	btDynamicsWorld* dynamicsWorld = reinterpret_cast< btDynamicsWorld* >(world);
-	assert(dynamicsWorld);
-	btRigidBody* body = reinterpret_cast< btRigidBody* >(object);
-	assert(body);
-
-	dynamicsWorld->removeRigidBody(body);
-}
-
-/* Rigid Body  */
-
-plRigidBodyHandle plCreateRigidBody(	void* user_data,  float mass, plCollisionShapeHandle cshape )
-{
-	btTransform trans;
-	trans.setIdentity();
-	btVector3 localInertia(0,0,0);
-	btCollisionShape* shape = reinterpret_cast<btCollisionShape*>( cshape);
-	assert(shape);
-	if (mass)
-	{
-		shape->calculateLocalInertia(mass,localInertia);
-	}
-	void* mem = btAlignedAlloc(sizeof(btRigidBody),16);
-	btRigidBody::btRigidBodyConstructionInfo rbci(mass, 0,shape,localInertia);
-	btRigidBody* body = new (mem)btRigidBody(rbci);
-	body->setWorldTransform(trans);
-	body->setUserPointer(user_data);
-	return (plRigidBodyHandle) body;
-}
-
-void plDeleteRigidBody(plRigidBodyHandle cbody)
-{
-	btRigidBody* body = reinterpret_cast< btRigidBody* >(cbody);
-	assert(body);
-	btAlignedFree( body);
-}
-
-
-/* Collision Shape definition */
-
-plCollisionShapeHandle plNewSphereShape(plReal radius)
-{
-	void* mem = btAlignedAlloc(sizeof(btSphereShape),16);
-	return (plCollisionShapeHandle) new (mem)btSphereShape(radius);
-	
-}
-	
-plCollisionShapeHandle plNewBoxShape(plReal x, plReal y, plReal z)
-{
-	void* mem = btAlignedAlloc(sizeof(btBoxShape),16);
-	return (plCollisionShapeHandle) new (mem)btBoxShape(btVector3(x,y,z));
-}
-
-plCollisionShapeHandle plNewCapsuleShape(plReal radius, plReal height)
-{
-	//capsule is convex hull of 2 spheres, so use btMultiSphereShape
-	btVector3 inertiaHalfExtents(radius,height,radius);
-	const int numSpheres = 2;
-	btVector3 positions[numSpheres] = {btVector3(0,height,0),btVector3(0,-height,0)};
-	btScalar radi[numSpheres] = {radius,radius};
-	void* mem = btAlignedAlloc(sizeof(btMultiSphereShape),16);
-	return (plCollisionShapeHandle) new (mem)btMultiSphereShape(inertiaHalfExtents,positions,radi,numSpheres);
-}
-plCollisionShapeHandle plNewConeShape(plReal radius, plReal height)
-{
-	void* mem = btAlignedAlloc(sizeof(btConeShape),16);
-	return (plCollisionShapeHandle) new (mem)btConeShape(radius,height);
-}
-
-plCollisionShapeHandle plNewCylinderShape(plReal radius, plReal height)
-{
-	void* mem = btAlignedAlloc(sizeof(btCylinderShape),16);
-	return (plCollisionShapeHandle) new (mem)btCylinderShape(btVector3(radius,height,radius));
-}
-
-/* Convex Meshes */
-plCollisionShapeHandle plNewConvexHullShape()
-{
-	void* mem = btAlignedAlloc(sizeof(btConvexHullShape),16);
-	return (plCollisionShapeHandle) new (mem)btConvexHullShape();
-}
-
-
-/* Concave static triangle meshes */
-plMeshInterfaceHandle		   plNewMeshInterface()
-{
-	return 0;
-}
-
-plCollisionShapeHandle plNewCompoundShape()
-{
-	void* mem = btAlignedAlloc(sizeof(btCompoundShape),16);
-	return (plCollisionShapeHandle) new (mem)btCompoundShape();
-}
-
-void	plAddChildShape(plCollisionShapeHandle compoundShapeHandle,plCollisionShapeHandle childShapeHandle, plVector3 childPos,plQuaternion childOrn)
-{
-	btCollisionShape* colShape = reinterpret_cast<btCollisionShape*>(compoundShapeHandle);
-	btAssert(colShape->getShapeType() == COMPOUND_SHAPE_PROXYTYPE);
-	btCompoundShape* compoundShape = reinterpret_cast<btCompoundShape*>(colShape);
-	btCollisionShape* childShape = reinterpret_cast<btCollisionShape*>(childShapeHandle);
-	btTransform	localTrans;
-	localTrans.setIdentity();
-	localTrans.setOrigin(btVector3(childPos[0],childPos[1],childPos[2]));
-	localTrans.setRotation(btQuaternion(childOrn[0],childOrn[1],childOrn[2],childOrn[3]));
-	compoundShape->addChildShape(localTrans,childShape);
-}
-
-void plSetEuler(plReal yaw,plReal pitch,plReal roll, plQuaternion orient)
-{
-	btQuaternion orn;
-	orn.setEuler(yaw,pitch,roll);
-	orient[0] = orn.getX();
-	orient[1] = orn.getY();
-	orient[2] = orn.getZ();
-	orient[3] = orn.getW();
-
-}
-
-
-//	extern  void		plAddTriangle(plMeshInterfaceHandle meshHandle, plVector3 v0,plVector3 v1,plVector3 v2);
-//	extern  plCollisionShapeHandle plNewStaticTriangleMeshShape(plMeshInterfaceHandle);
-
-
-void		plAddVertex(plCollisionShapeHandle cshape, plReal x,plReal y,plReal z)
-{
-	btCollisionShape* colShape = reinterpret_cast<btCollisionShape*>( cshape);
-	(void)colShape;
-	btAssert(colShape->getShapeType()==CONVEX_HULL_SHAPE_PROXYTYPE);
-	btConvexHullShape* convexHullShape = reinterpret_cast<btConvexHullShape*>( cshape);
-	convexHullShape->addPoint(btPoint3(x,y,z));
-
-}
-
-void plDeleteShape(plCollisionShapeHandle cshape)
-{
-	btCollisionShape* shape = reinterpret_cast<btCollisionShape*>( cshape);
-	assert(shape);
-	btAlignedFree(shape);
-}
-void plSetScaling(plCollisionShapeHandle cshape, plVector3 cscaling)
-{
-	btCollisionShape* shape = reinterpret_cast<btCollisionShape*>( cshape);
-	assert(shape);
-	btVector3 scaling(cscaling[0],cscaling[1],cscaling[2]);
-	shape->setLocalScaling(scaling);	
-}
-
-
-
-void plSetPosition(plRigidBodyHandle object, const plVector3 position)
-{
-	btRigidBody* body = reinterpret_cast< btRigidBody* >(object);
-	btAssert(body);
-	btVector3 pos(position[0],position[1],position[2]);
-	btTransform worldTrans = body->getWorldTransform();
-	worldTrans.setOrigin(pos);
-	body->setWorldTransform(worldTrans);
-}
-
-void plSetOrientation(plRigidBodyHandle object, const plQuaternion orientation)
-{
-	btRigidBody* body = reinterpret_cast< btRigidBody* >(object);
-	btAssert(body);
-	btQuaternion orn(orientation[0],orientation[1],orientation[2],orientation[3]);
-	btTransform worldTrans = body->getWorldTransform();
-	worldTrans.setRotation(orn);
-	body->setWorldTransform(worldTrans);
-}
-
-void	plGetOpenGLMatrix(plRigidBodyHandle object, plReal* matrix)
-{
-	btRigidBody* body = reinterpret_cast< btRigidBody* >(object);
-	btAssert(body);
-	body->getWorldTransform().getOpenGLMatrix(matrix);
-
-}
-
-void	plGetPosition(plRigidBodyHandle object,plVector3 position)
-{
-	btRigidBody* body = reinterpret_cast< btRigidBody* >(object);
-	btAssert(body);
-	const btVector3& pos = body->getWorldTransform().getOrigin();
-	position[0] = pos.getX();
-	position[1] = pos.getY();
-	position[2] = pos.getZ();
-}
-
-void plGetOrientation(plRigidBodyHandle object,plQuaternion orientation)
-{
-	btRigidBody* body = reinterpret_cast< btRigidBody* >(object);
-	btAssert(body);
-	const btQuaternion& orn = body->getWorldTransform().getRotation();
-	orientation[0] = orn.getX();
-	orientation[1] = orn.getY();
-	orientation[2] = orn.getZ();
-	orientation[3] = orn.getW();
-}
-
-
-
-//plRigidBodyHandle plRayCast(plDynamicsWorldHandle world, const plVector3 rayStart, const plVector3 rayEnd, plVector3 hitpoint, plVector3 normal);
-
-//	extern  plRigidBodyHandle plObjectCast(plDynamicsWorldHandle world, const plVector3 rayStart, const plVector3 rayEnd, plVector3 hitpoint, plVector3 normal);
diff --git a/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp b/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp
deleted file mode 100644
index 19443adc723..00000000000
--- a/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2007 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-
-#include "btContinuousDynamicsWorld.h"
-#include "LinearMath/btQuickprof.h"
-
-//collision detection
-#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h"
-#include "BulletCollision/BroadphaseCollision/btSimpleBroadphase.h"
-#include "BulletCollision/CollisionShapes/btCollisionShape.h"
-#include "BulletCollision/CollisionDispatch/btSimulationIslandManager.h"
-
-//rigidbody & constraints
-#include "BulletDynamics/Dynamics/btRigidBody.h"
-#include "BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h"
-#include "BulletDynamics/ConstraintSolver/btContactSolverInfo.h"
-#include "BulletDynamics/ConstraintSolver/btTypedConstraint.h"
-
-
-
-#include <stdio.h>
-
-btContinuousDynamicsWorld::btContinuousDynamicsWorld(btDispatcher* dispatcher,btBroadphaseInterface* pairCache,btConstraintSolver* constraintSolver,btCollisionConfiguration* collisionConfiguration)
-:btDiscreteDynamicsWorld(dispatcher,pairCache,constraintSolver,collisionConfiguration)
-{
-}
-
-btContinuousDynamicsWorld::~btContinuousDynamicsWorld()
-{
-}
-
-	
-void	btContinuousDynamicsWorld::internalSingleStepSimulation( btScalar timeStep)
-{
-	
-	startProfiling(timeStep);
-	
-
-	///update aabbs information
-	updateAabbs();
-	//static int frame=0;
-//	printf("frame %d\n",frame++);
-
-	///apply gravity, predict motion
-	predictUnconstraintMotion(timeStep);
-
-	btDispatcherInfo& dispatchInfo = getDispatchInfo();
-
-	dispatchInfo.m_timeStep = timeStep;
-	dispatchInfo.m_stepCount = 0;
-	dispatchInfo.m_debugDraw = getDebugDrawer();
-
-	///perform collision detection
-	performDiscreteCollisionDetection();
-
-	calculateSimulationIslands();
-
-	
-	getSolverInfo().m_timeStep = timeStep;
-	
-
-
-	///solve contact and other joint constraints
-	solveConstraints(getSolverInfo());
-	
-	///CallbackTriggers();
-	calculateTimeOfImpacts(timeStep);
-
-	btScalar toi = dispatchInfo.m_timeOfImpact;
-//	if (toi < 1.f)
-//		printf("toi = %f\n",toi);
-	if (toi < 0.f)
-		printf("toi = %f\n",toi);
-
-
-	///integrate transforms
-	integrateTransforms(timeStep * toi);
-
-	///update vehicle simulation
-	updateVehicles(timeStep);
-
-
-	updateActivationState( timeStep );
-	
-	if(0 != m_internalTickCallback) {
-		(*m_internalTickCallback)(this, timeStep);
-	}
-}
-
-void	btContinuousDynamicsWorld::calculateTimeOfImpacts(btScalar timeStep)
-{
-		///these should be 'temporal' aabbs!
-		updateTemporalAabbs(timeStep);
-		
-		///'toi' is the global smallest time of impact. However, we just calculate the time of impact for each object individually.
-		///so we handle the case moving versus static properly, and we cheat for moving versus moving
-		btScalar toi = 1.f;
-		
-	
-		btDispatcherInfo& dispatchInfo = getDispatchInfo();
-		dispatchInfo.m_timeStep = timeStep;
-		dispatchInfo.m_timeOfImpact = 1.f;
-		dispatchInfo.m_stepCount = 0;
-		dispatchInfo.m_dispatchFunc = btDispatcherInfo::DISPATCH_CONTINUOUS;
-
-		///calculate time of impact for overlapping pairs
-
-
-		btDispatcher* dispatcher = getDispatcher();
-		if (dispatcher)
-			dispatcher->dispatchAllCollisionPairs(m_broadphasePairCache->getOverlappingPairCache(),dispatchInfo,m_dispatcher1);
-
-		toi = dispatchInfo.m_timeOfImpact;
-
-		dispatchInfo.m_dispatchFunc = btDispatcherInfo::DISPATCH_DISCRETE;
-
-}
-
-void	btContinuousDynamicsWorld::updateTemporalAabbs(btScalar timeStep)
-{
-
-	btVector3 temporalAabbMin,temporalAabbMax;
-
-	for ( int i=0;i<m_collisionObjects.size();i++)
-	{
-		btCollisionObject* colObj = m_collisionObjects[i];
-		
-		btRigidBody* body = btRigidBody::upcast(colObj);
-		if (body)
-		{
-			body->getCollisionShape()->getAabb(m_collisionObjects[i]->getWorldTransform(),temporalAabbMin,temporalAabbMax);
-			const btVector3& linvel = body->getLinearVelocity();
-
-			//make the AABB temporal
-			btScalar temporalAabbMaxx = temporalAabbMax.getX();
-			btScalar temporalAabbMaxy = temporalAabbMax.getY();
-			btScalar temporalAabbMaxz = temporalAabbMax.getZ();
-			btScalar temporalAabbMinx = temporalAabbMin.getX();
-			btScalar temporalAabbMiny = temporalAabbMin.getY();
-			btScalar temporalAabbMinz = temporalAabbMin.getZ();
-
-			// add linear motion
-			btVector3 linMotion = linvel*timeStep;
-		
-			if (linMotion.x() > 0.f)
-				temporalAabbMaxx += linMotion.x(); 
-			else
-				temporalAabbMinx += linMotion.x();
-			if (linMotion.y() > 0.f)
-				temporalAabbMaxy += linMotion.y(); 
-			else
-				temporalAabbMiny += linMotion.y();
-			if (linMotion.z() > 0.f)
-				temporalAabbMaxz += linMotion.z(); 
-			else
-				temporalAabbMinz += linMotion.z();
-
-			//add conservative angular motion
-			btScalar angularMotion(0);// = angvel.length() * GetAngularMotionDisc() * timeStep;
-			btVector3 angularMotion3d(angularMotion,angularMotion,angularMotion);
-			temporalAabbMin = btVector3(temporalAabbMinx,temporalAabbMiny,temporalAabbMinz);
-			temporalAabbMax = btVector3(temporalAabbMaxx,temporalAabbMaxy,temporalAabbMaxz);
-
-			temporalAabbMin -= angularMotion3d;
-			temporalAabbMax += angularMotion3d;
-
-			m_broadphasePairCache->setAabb(body->getBroadphaseHandle(),temporalAabbMin,temporalAabbMax,m_dispatcher1);
-		}
-	}
-
-	//update aabb (of all moved objects)
-
-	m_broadphasePairCache->calculateOverlappingPairs(m_dispatcher1);
-	
-
-
-}
-
-
-
diff --git a/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.h b/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.h
deleted file mode 100644
index 61c8dea03eb..00000000000
--- a/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2007 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-#ifndef BT_CONTINUOUS_DYNAMICS_WORLD_H
-#define BT_CONTINUOUS_DYNAMICS_WORLD_H
-
-#include "btDiscreteDynamicsWorld.h"
-
-///btContinuousDynamicsWorld adds optional (per object) continuous collision detection for fast moving objects to the btDiscreteDynamicsWorld.
-///This copes with fast moving objects that otherwise would tunnel/miss collisions.
-///Under construction, don't use yet! Please use btDiscreteDynamicsWorld instead.
-class btContinuousDynamicsWorld : public btDiscreteDynamicsWorld
-{
-
-	void	updateTemporalAabbs(btScalar timeStep);
-
-	public:
-
-		btContinuousDynamicsWorld(btDispatcher* dispatcher,btBroadphaseInterface* pairCache,btConstraintSolver* constraintSolver,btCollisionConfiguration* collisionConfiguration);
-		virtual ~btContinuousDynamicsWorld();
-		
-		///time stepping with calculation of time of impact for selected fast moving objects
-		virtual void	internalSingleStepSimulation( btScalar timeStep);
-
-		virtual void	calculateTimeOfImpacts(btScalar timeStep);
-
-		virtual btDynamicsWorldType	getWorldType() const
-		{
-			return BT_CONTINUOUS_DYNAMICS_WORLD;
-		}
-
-};
-
-#endif //BT_CONTINUOUS_DYNAMICS_WORLD_H
diff --git a/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp b/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
index c7b1af245e9..1017c8af6ea 100644
--- a/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
+++ b/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
@@ -21,8 +21,7 @@ subject to the following restrictions:
 #include "BulletCollision/BroadphaseCollision/btSimpleBroadphase.h"
 #include "BulletCollision/CollisionShapes/btCollisionShape.h"
 #include "BulletCollision/CollisionDispatch/btSimulationIslandManager.h"
-#include "LinearMath/btTransformUtil.h"
-#include "LinearMath/btQuickprof.h"
+#include <LinearMath/btTransformUtil.h>
 
 //rigidbody & constraints
 #include "BulletDynamics/Dynamics/btRigidBody.h"
@@ -42,7 +41,6 @@ subject to the following restrictions:
 #include "BulletCollision/CollisionShapes/btSphereShape.h"
 #include "BulletCollision/CollisionShapes/btTriangleCallback.h"
 #include "BulletCollision/CollisionShapes/btTriangleMeshShape.h"
-#include "BulletCollision/CollisionShapes/btStaticPlaneShape.h"
 #include "LinearMath/btIDebugDraw.h"
 
 
@@ -59,29 +57,17 @@ subject to the following restrictions:
 
 
 
-btDiscreteDynamicsWorld::btDiscreteDynamicsWorld(btDispatcher* dispatcher,btBroadphaseInterface* pairCache,btConstraintSolver* constraintSolver, btCollisionConfiguration* collisionConfiguration)
-:btDynamicsWorld(dispatcher,pairCache,collisionConfiguration),
-m_constraintSolver(constraintSolver),
+btDiscreteDynamicsWorld::btDiscreteDynamicsWorld(btDispatcher* dispatcher,btOverlappingPairCache* pairCache,btConstraintSolver* constraintSolver)
+:btDynamicsWorld(dispatcher,pairCache),
+m_constraintSolver(constraintSolver? constraintSolver: new btSequentialImpulseConstraintSolver),
+m_debugDrawer(0),
 m_gravity(0,-10,0),
 m_localTime(btScalar(1.)/btScalar(60.)),
 m_profileTimings(0)
 {
-	if (!m_constraintSolver)
-	{
-		void* mem = btAlignedAlloc(sizeof(btSequentialImpulseConstraintSolver),16);
-		m_constraintSolver = new (mem) btSequentialImpulseConstraintSolver;
-		m_ownsConstraintSolver = true;
-	} else
-	{
-		m_ownsConstraintSolver = false;
-	}
-
-	{
-		void* mem = btAlignedAlloc(sizeof(btSimulationIslandManager),16);
-		m_islandManager = new (mem) btSimulationIslandManager();
-	}
-
+	m_islandManager = new btSimulationIslandManager();
 	m_ownsIslandManager = true;
+	m_ownsConstraintSolver = (constraintSolver==0);
 }
 
 
@@ -89,16 +75,9 @@ btDiscreteDynamicsWorld::~btDiscreteDynamicsWorld()
 {
 	//only delete it when we created it
 	if (m_ownsIslandManager)
-	{
-		m_islandManager->~btSimulationIslandManager();
-		btAlignedFree( m_islandManager);
-	}
+		delete m_islandManager;
 	if (m_ownsConstraintSolver)
-	{
-
-		m_constraintSolver->~btConstraintSolver();
-		btAlignedFree(m_constraintSolver);
-	}
+		 delete m_constraintSolver;
 }
 
 void	btDiscreteDynamicsWorld::saveKinematicState(btScalar timeStep)
@@ -123,35 +102,14 @@ void	btDiscreteDynamicsWorld::saveKinematicState(btScalar timeStep)
 	}
 }
 
-void	btDiscreteDynamicsWorld::debugDrawWorld()
+void	btDiscreteDynamicsWorld::synchronizeMotionStates()
 {
-
-	if (getDebugDrawer() && getDebugDrawer()->getDebugMode() & btIDebugDraw::DBG_DrawContactPoints)
+	//debug vehicle wheels
+	
+	
 	{
-		int numManifolds = getDispatcher()->getNumManifolds();
-		btVector3 color(0,0,0);
-		for (int i=0;i<numManifolds;i++)
-		{
-			btPersistentManifold* contactManifold = getDispatcher()->getManifoldByIndexInternal(i);
-			//btCollisionObject* obA = static_cast<btCollisionObject*>(contactManifold->getBody0());
-			//btCollisionObject* obB = static_cast<btCollisionObject*>(contactManifold->getBody1());
-
-			int numContacts = contactManifold->getNumContacts();
-			for (int j=0;j<numContacts;j++)
-			{
-				btManifoldPoint& cp = contactManifold->getContactPoint(j);
-				getDebugDrawer()->drawContactPoint(cp.m_positionWorldOnB,cp.m_normalWorldOnB,cp.getDistance(),cp.getLifeTime(),color);
-			}
-		}
-	}
-
-
-	if (getDebugDrawer() && getDebugDrawer()->getDebugMode() & (btIDebugDraw::DBG_DrawWireframe | btIDebugDraw::DBG_DrawAabb))
-	{
-		int i;
-
 		//todo: iterate over awake simulation islands!
-		for (  i=0;i<m_collisionObjects.size();i++)
+		for ( int i=0;i<m_collisionObjects.size();i++)
 		{
 			btCollisionObject* colObj = m_collisionObjects[i];
 			if (getDebugDrawer() && getDebugDrawer()->getDebugMode() & btIDebugDraw::DBG_DrawWireframe)
@@ -177,88 +135,6 @@ void	btDiscreteDynamicsWorld::debugDrawWorld()
 
 				debugDrawObject(colObj->getWorldTransform(),colObj->getCollisionShape(),color);
 			}
-			if (m_debugDrawer && (m_debugDrawer->getDebugMode() & btIDebugDraw::DBG_DrawAabb))
-			{
-				btPoint3 minAabb,maxAabb;
-				btVector3 colorvec(1,0,0);
-				colObj->getCollisionShape()->getAabb(colObj->getWorldTransform(), minAabb,maxAabb);
-				m_debugDrawer->drawAabb(minAabb,maxAabb,colorvec);
-			}
-
-		}
-	
-		for (  i=0;i<this->m_vehicles.size();i++)
-		{
-			for (int v=0;v<m_vehicles[i]->getNumWheels();v++)
-			{
-				btVector3 wheelColor(0,255,255);
-				if (m_vehicles[i]->getWheelInfo(v).m_raycastInfo.m_isInContact)
-				{
-					wheelColor.setValue(0,0,255);
-				} else
-				{
-					wheelColor.setValue(255,0,255);
-				}
-		
-				btVector3 wheelPosWS = m_vehicles[i]->getWheelInfo(v).m_worldTransform.getOrigin();
-
-				btVector3 axle = btVector3(	
-					m_vehicles[i]->getWheelInfo(v).m_worldTransform.getBasis()[0][m_vehicles[i]->getRightAxis()],
-					m_vehicles[i]->getWheelInfo(v).m_worldTransform.getBasis()[1][m_vehicles[i]->getRightAxis()],
-					m_vehicles[i]->getWheelInfo(v).m_worldTransform.getBasis()[2][m_vehicles[i]->getRightAxis()]);
-
-
-				//m_vehicles[i]->getWheelInfo(v).m_raycastInfo.m_wheelAxleWS
-				//debug wheels (cylinders)
-				m_debugDrawer->drawLine(wheelPosWS,wheelPosWS+axle,wheelColor);
-				m_debugDrawer->drawLine(wheelPosWS,m_vehicles[i]->getWheelInfo(v).m_raycastInfo.m_contactPointWS,wheelColor);
-
-			}
-		}
-	}
-}
-
-void	btDiscreteDynamicsWorld::clearForces()
-{
-	//todo: iterate over awake simulation islands!
-	for ( int i=0;i<m_collisionObjects.size();i++)
-	{
-		btCollisionObject* colObj = m_collisionObjects[i];
-		
-		btRigidBody* body = btRigidBody::upcast(colObj);
-		if (body)
-		{
-			body->clearForces();
-		}
-	}
-}	
-
-///apply gravity, call this once per timestep
-void	btDiscreteDynamicsWorld::applyGravity()
-{
-	//todo: iterate over awake simulation islands!
-	for ( int i=0;i<m_collisionObjects.size();i++)
-	{
-		btCollisionObject* colObj = m_collisionObjects[i];
-		
-		btRigidBody* body = btRigidBody::upcast(colObj);
-		if (body && body->isActive())
-		{
-			body->applyGravity();
-		}
-	}
-}
-
-
-
-void	btDiscreteDynamicsWorld::synchronizeMotionStates()
-{
-	{
-		//todo: iterate over awake simulation islands!
-		for ( int i=0;i<m_collisionObjects.size();i++)
-		{
-			btCollisionObject* colObj = m_collisionObjects[i];
-			
 			btRigidBody* body = btRigidBody::upcast(colObj);
 			if (body && body->getMotionState() && !body->isStaticOrKinematicObject())
 			{
@@ -282,8 +158,31 @@ void	btDiscreteDynamicsWorld::synchronizeMotionStates()
 		{
 			for (int v=0;v<m_vehicles[i]->getNumWheels();v++)
 			{
+				btVector3 wheelColor(0,255,255);
+				if (m_vehicles[i]->getWheelInfo(v).m_raycastInfo.m_isInContact)
+				{
+					wheelColor.setValue(0,0,255);
+				} else
+				{
+					wheelColor.setValue(255,0,255);
+				}
+
 				//synchronize the wheels with the (interpolated) chassis worldtransform
 				m_vehicles[i]->updateWheelTransform(v,true);
+					
+				btVector3 wheelPosWS = m_vehicles[i]->getWheelInfo(v).m_worldTransform.getOrigin();
+
+				btVector3 axle = btVector3(	
+					m_vehicles[i]->getWheelInfo(v).m_worldTransform.getBasis()[0][m_vehicles[i]->getRightAxis()],
+					m_vehicles[i]->getWheelInfo(v).m_worldTransform.getBasis()[1][m_vehicles[i]->getRightAxis()],
+					m_vehicles[i]->getWheelInfo(v).m_worldTransform.getBasis()[2][m_vehicles[i]->getRightAxis()]);
+
+
+				//m_vehicles[i]->getWheelInfo(v).m_raycastInfo.m_wheelAxleWS
+				//debug wheels (cylinders)
+				m_debugDrawer->drawLine(wheelPosWS,wheelPosWS+axle,wheelColor);
+				m_debugDrawer->drawLine(wheelPosWS,m_vehicles[i]->getWheelInfo(v).m_raycastInfo.m_contactPointWS,wheelColor);
+
 			}
 		}
 	}
@@ -293,10 +192,6 @@ void	btDiscreteDynamicsWorld::synchronizeMotionStates()
 
 int	btDiscreteDynamicsWorld::stepSimulation( btScalar timeStep,int maxSubSteps, btScalar fixedTimeStep)
 {
-	startProfiling(timeStep);
-
-	BT_PROFILE("stepSimulation");
-
 	int numSimulationSubSteps = 0;
 
 	if (maxSubSteps)
@@ -334,8 +229,6 @@ int	btDiscreteDynamicsWorld::stepSimulation( btScalar timeStep,int maxSubSteps,
 
 		saveKinematicState(fixedTimeStep);
 
-		applyGravity();
-
 		//clamp the number of substeps, to prevent simulation grinding spiralling down to a halt
 		int clampedSimulationSteps = (numSimulationSubSteps > maxSubSteps)? maxSubSteps : numSimulationSubSteps;
 
@@ -349,19 +242,16 @@ int	btDiscreteDynamicsWorld::stepSimulation( btScalar timeStep,int maxSubSteps,
 
 	synchronizeMotionStates();
 
-	clearForces();
-
-#ifndef BT_NO_PROFILE
-	CProfileManager::Increment_Frame_Counter();
-#endif //BT_NO_PROFILE
-	
 	return numSimulationSubSteps;
 }
 
 void	btDiscreteDynamicsWorld::internalSingleStepSimulation(btScalar timeStep)
 {
 	
-	BT_PROFILE("internalSingleStepSimulation");
+	startProfiling(timeStep);
+
+	///update aabbs information
+	updateAabbs();
 
 	///apply gravity, predict motion
 	predictUnconstraintMotion(timeStep);
@@ -396,9 +286,8 @@ void	btDiscreteDynamicsWorld::internalSingleStepSimulation(btScalar timeStep)
 
 	updateActivationState( timeStep );
 
-	if(0 != m_internalTickCallback) {
-		(*m_internalTickCallback)(this, timeStep);
-	}	
+	
+
 }
 
 void	btDiscreteDynamicsWorld::setGravity(const btVector3& gravity)
@@ -415,11 +304,6 @@ void	btDiscreteDynamicsWorld::setGravity(const btVector3& gravity)
 	}
 }
 
-btVector3 btDiscreteDynamicsWorld::getGravity () const
-{
-	return m_gravity;
-}
-
 
 void	btDiscreteDynamicsWorld::removeRigidBody(btRigidBody* body)
 {
@@ -459,18 +343,19 @@ void	btDiscreteDynamicsWorld::addRigidBody(btRigidBody* body, short group, short
 
 void	btDiscreteDynamicsWorld::updateVehicles(btScalar timeStep)
 {
-	BT_PROFILE("updateVehicles");
-	
+	BEGIN_PROFILE("updateVehicles");
+
 	for ( int i=0;i<m_vehicles.size();i++)
 	{
 		btRaycastVehicle* vehicle = m_vehicles[i];
 		vehicle->updateVehicle( timeStep);
 	}
+	END_PROFILE("updateVehicles");
 }
 
 void	btDiscreteDynamicsWorld::updateActivationState(btScalar timeStep)
 {
-	BT_PROFILE("updateActivationState");
+	BEGIN_PROFILE("updateActivationState");
 
 	for ( int i=0;i<m_collisionObjects.size();i++)
 	{
@@ -489,12 +374,6 @@ void	btDiscreteDynamicsWorld::updateActivationState(btScalar timeStep)
 				{
 					if (body->getActivationState() == ACTIVE_TAG)
 						body->setActivationState( WANTS_DEACTIVATION );
-					if (body->getActivationState() == ISLAND_SLEEPING) 
-					{
-						body->setAngularVelocity(btVector3(0,0,0));
-						body->setLinearVelocity(btVector3(0,0,0));
-					}
-
 				}
 			} else
 			{
@@ -503,6 +382,7 @@ void	btDiscreteDynamicsWorld::updateActivationState(btScalar timeStep)
 			}
 		}
 	}
+	END_PROFILE("updateActivationState");
 }
 
 void	btDiscreteDynamicsWorld::addConstraint(btTypedConstraint* constraint,bool disableCollisionsBetweenLinkedBodies)
@@ -532,7 +412,7 @@ void	btDiscreteDynamicsWorld::removeVehicle(btRaycastVehicle* vehicle)
 	m_vehicles.remove(vehicle);
 }
 
-SIMD_FORCE_INLINE	int	btGetConstraintIslandId(const btTypedConstraint* lhs)
+inline	int	btGetConstraintIslandId(const btTypedConstraint* lhs)
 {
 	int islandId;
 	
@@ -562,7 +442,6 @@ class btSortConstraintOnIslandPredicate
 
 void	btDiscreteDynamicsWorld::solveConstraints(btContactSolverInfo& solverInfo)
 {
-	BT_PROFILE("solveConstraints");
 	
 	struct InplaceSolverIslandCallback : public btSimulationIslandManager::IslandCallback
 	{
@@ -573,7 +452,7 @@ void	btDiscreteDynamicsWorld::solveConstraints(btContactSolverInfo& solverInfo)
 		int						m_numConstraints;
 		btIDebugDraw*			m_debugDrawer;
 		btStackAlloc*			m_stackAlloc;
-		btDispatcher*			m_dispatcher;
+
 
 		InplaceSolverIslandCallback(
 			btContactSolverInfo& solverInfo,
@@ -581,15 +460,13 @@ void	btDiscreteDynamicsWorld::solveConstraints(btContactSolverInfo& solverInfo)
 			btTypedConstraint** sortedConstraints,
 			int	numConstraints,
 			btIDebugDraw*	debugDrawer,
-			btStackAlloc*			stackAlloc,
-			btDispatcher* dispatcher)
+			btStackAlloc*			stackAlloc)
 			:m_solverInfo(solverInfo),
 			m_solver(solver),
 			m_sortedConstraints(sortedConstraints),
 			m_numConstraints(numConstraints),
 			m_debugDrawer(debugDrawer),
-			m_stackAlloc(stackAlloc),
-			m_dispatcher(dispatcher)
+			m_stackAlloc(stackAlloc)
 		{
 
 		}
@@ -602,42 +479,30 @@ void	btDiscreteDynamicsWorld::solveConstraints(btContactSolverInfo& solverInfo)
 		}
 		virtual	void	ProcessIsland(btCollisionObject** bodies,int numBodies,btPersistentManifold**	manifolds,int numManifolds, int islandId)
 		{
-			if (islandId<0)
+			//also add all non-contact constraints/joints for this island
+			btTypedConstraint** startConstraint = 0;
+			int numCurConstraints = 0;
+			int i;
+			
+			//find the first constraint for this island
+			for (i=0;i<m_numConstraints;i++)
 			{
-				///we don't split islands, so all constraints/contact manifolds/bodies are passed into the solver regardless the island id
-				m_solver->solveGroup( bodies,numBodies,manifolds, numManifolds,&m_sortedConstraints[0],m_numConstraints,m_solverInfo,m_debugDrawer,m_stackAlloc,m_dispatcher);
-			} else
-			{
-					//also add all non-contact constraints/joints for this island
-				btTypedConstraint** startConstraint = 0;
-				int numCurConstraints = 0;
-				int i;
-				
-				//find the first constraint for this island
-				for (i=0;i<m_numConstraints;i++)
+				if (btGetConstraintIslandId(m_sortedConstraints[i]) == islandId)
 				{
-					if (btGetConstraintIslandId(m_sortedConstraints[i]) == islandId)
-					{
-						startConstraint = &m_sortedConstraints[i];
-						break;
-					}
+					startConstraint = &m_sortedConstraints[i];
+					break;
 				}
-				//count the number of constraints in this island
-				for (;i<m_numConstraints;i++)
-				{
-					if (btGetConstraintIslandId(m_sortedConstraints[i]) == islandId)
-					{
-						numCurConstraints++;
-					}
-				}
-
-				///only call solveGroup if there is some work: avoid virtual function call, its overhead can be excessive
-				if (numManifolds + numCurConstraints)
-				{
-					m_solver->solveGroup( bodies,numBodies,manifolds, numManifolds,startConstraint,numCurConstraints,m_solverInfo,m_debugDrawer,m_stackAlloc,m_dispatcher);
-				}
-		
 			}
+			//count the number of constraints in this island
+			for (;i<m_numConstraints;i++)
+			{
+				if (btGetConstraintIslandId(m_sortedConstraints[i]) == islandId)
+				{
+					numCurConstraints++;
+				}
+			}
+
+			m_solver->solveGroup( bodies,numBodies,manifolds, numManifolds,startConstraint,numCurConstraints,m_solverInfo,m_debugDrawer,m_stackAlloc);
 		}
 
 	};
@@ -655,18 +520,18 @@ void	btDiscreteDynamicsWorld::solveConstraints(btContactSolverInfo& solverInfo)
 		
 	
 
-	sortedConstraints.quickSort(btSortConstraintOnIslandPredicate());
+	sortedConstraints.heapSort(btSortConstraintOnIslandPredicate());
 	
 	btTypedConstraint** constraintsPtr = getNumConstraints() ? &sortedConstraints[0] : 0;
 	
-	InplaceSolverIslandCallback	solverCallback(	solverInfo,	m_constraintSolver, constraintsPtr,sortedConstraints.size(),	m_debugDrawer,m_stackAlloc,m_dispatcher1);
+	InplaceSolverIslandCallback	solverCallback(	solverInfo,	m_constraintSolver, constraintsPtr,sortedConstraints.size(),	m_debugDrawer,m_stackAlloc);
+
 	
-	m_constraintSolver->prepareSolve(getCollisionWorld()->getNumCollisionObjects(), getCollisionWorld()->getDispatcher()->getNumManifolds());
 	
 	/// solve all the constraints for this island
 	m_islandManager->buildAndProcessIslands(getCollisionWorld()->getDispatcher(),getCollisionWorld()->getCollisionObjectArray(),&solverCallback);
 
-	m_constraintSolver->allSolved(solverInfo, m_debugDrawer, m_stackAlloc);
+
 }
 
 
@@ -674,7 +539,7 @@ void	btDiscreteDynamicsWorld::solveConstraints(btContactSolverInfo& solverInfo)
 
 void	btDiscreteDynamicsWorld::calculateSimulationIslands()
 {
-	BT_PROFILE("calculateSimulationIslands");
+	BEGIN_PROFILE("calculateSimulationIslands");
 
 	getSimulationIslandManager()->updateActivationState(getCollisionWorld(),getCollisionWorld()->getDispatcher());
 
@@ -704,14 +569,66 @@ void	btDiscreteDynamicsWorld::calculateSimulationIslands()
 	//Store the island id in each body
 	getSimulationIslandManager()->storeIslandActivationState(getCollisionWorld());
 
-	
+	END_PROFILE("calculateSimulationIslands");
+
 }
 
 
+void	btDiscreteDynamicsWorld::updateAabbs()
+{
+	BEGIN_PROFILE("updateAabbs");
+	
+	btVector3 colorvec(1,0,0);
+	btTransform predictedTrans;
+	for ( int i=0;i<m_collisionObjects.size();i++)
+	{
+		btCollisionObject* colObj = m_collisionObjects[i];
+		
+		btRigidBody* body = btRigidBody::upcast(colObj);
+		if (body)
+		{
+		//	if (body->IsActive() && (!body->IsStatic()))
+			{
+				btPoint3 minAabb,maxAabb;
+				colObj->getCollisionShape()->getAabb(colObj->getWorldTransform(), minAabb,maxAabb);
+				btBroadphaseInterface* bp = (btBroadphaseInterface*)m_broadphasePairCache;
+
+				//moving objects should be moderately sized, probably something wrong if not
+				if ( colObj->isStaticObject() || ((maxAabb-minAabb).length2() < btScalar(1e12)))
+				{
+					bp->setAabb(body->getBroadphaseHandle(),minAabb,maxAabb);
+				} else
+				{
+					//something went wrong, investigate
+					//this assert is unwanted in 3D modelers (danger of loosing work)
+					body->setActivationState(DISABLE_SIMULATION);
+					
+					static bool reportMe = true;
+					if (reportMe && m_debugDrawer)
+					{
+						reportMe = false;
+						m_debugDrawer->reportErrorWarning("Overflow in AABB, object removed from simulation");
+						m_debugDrawer->reportErrorWarning("If you can reproduce this, please email bugs@continuousphysics.com\n");
+						m_debugDrawer->reportErrorWarning("Please include above information, your Platform, version of OS.\n");
+						m_debugDrawer->reportErrorWarning("Thanks.\n");
+					}
+
+
+				}
+				if (m_debugDrawer && (m_debugDrawer->getDebugMode() & btIDebugDraw::DBG_DrawAabb))
+				{
+					m_debugDrawer->drawAabb(minAabb,maxAabb,colorvec);
+				}
+			}
+		}
+	}
+	
+	END_PROFILE("updateAabbs");
+}
 
 void	btDiscreteDynamicsWorld::integrateTransforms(btScalar timeStep)
 {
-	BT_PROFILE("integrateTransforms");
+	BEGIN_PROFILE("integrateTransforms");
 	btTransform predictedTrans;
 	for ( int i=0;i<m_collisionObjects.size();i++)
 	{
@@ -726,13 +643,14 @@ void	btDiscreteDynamicsWorld::integrateTransforms(btScalar timeStep)
 			}
 		}
 	}
+	END_PROFILE("integrateTransforms");
 }
 
 
 
 void	btDiscreteDynamicsWorld::predictUnconstraintMotion(btScalar timeStep)
 {
-	BT_PROFILE("predictUnconstraintMotion");
+	BEGIN_PROFILE("predictUnconstraintMotion");
 	for ( int i=0;i<m_collisionObjects.size();i++)
 	{
 		btCollisionObject* colObj = m_collisionObjects[i];
@@ -743,26 +661,51 @@ void	btDiscreteDynamicsWorld::predictUnconstraintMotion(btScalar timeStep)
 			{
 				if (body->isActive())
 				{
+					body->applyForces( timeStep);
 					body->integrateVelocities( timeStep);
-					//damping
-					body->applyDamping(timeStep);
-
 					body->predictIntegratedTransform(timeStep,body->getInterpolationWorldTransform());
 				}
 			}
 		}
 	}
+	END_PROFILE("predictUnconstraintMotion");
 }
 
 
 void	btDiscreteDynamicsWorld::startProfiling(btScalar timeStep)
 {
 	(void)timeStep;
+	#ifdef USE_QUICKPROF
 
-#ifndef BT_NO_PROFILE
-	CProfileManager::Reset();
-#endif //BT_NO_PROFILE
 
+	//toggle btProfiler
+	if ( m_debugDrawer && m_debugDrawer->getDebugMode() & btIDebugDraw::DBG_ProfileTimings)
+	{
+		if (!m_profileTimings)
+		{
+			m_profileTimings = 1;
+			// To disable profiling, simply comment out the following line.
+			static int counter = 0;
+
+			char filename[128];
+			sprintf(filename,"quickprof_bullet_timings%i.csv",counter++);
+			btProfiler::init(filename, btProfiler::BLOCK_CYCLE_SECONDS);//BLOCK_TOTAL_MICROSECONDS
+		} else
+		{
+			btProfiler::endProfilingCycle();
+		}
+
+	} else
+	{
+		if (m_profileTimings)
+		{
+			btProfiler::endProfilingCycle();
+
+			m_profileTimings = 0;
+			btProfiler::destroy();
+		}
+	}
+#endif //USE_QUICKPROF
 }
 
 
@@ -884,52 +827,27 @@ void btDiscreteDynamicsWorld::debugDrawObject(const btTransform& worldTransform,
 
 				btScalar radius = capsuleShape->getRadius();
 				btScalar halfHeight = capsuleShape->getHalfHeight();
-				
-				int upAxis = capsuleShape->getUpAxis();
-
-				
-				btVector3 capStart(0.f,0.f,0.f);
-				capStart[upAxis] = -halfHeight;
-
-				btVector3 capEnd(0.f,0.f,0.f);
-				capEnd[upAxis] = halfHeight;
 
 				// Draw the ends
 				{
-					
 					btTransform childTransform = worldTransform;
-					childTransform.getOrigin() = worldTransform * capStart;
+					childTransform.getOrigin() = worldTransform * btVector3(0,halfHeight,0);
 					debugDrawSphere(radius, childTransform, color);
 				}
 
 				{
 					btTransform childTransform = worldTransform;
-					childTransform.getOrigin() = worldTransform * capEnd;
+					childTransform.getOrigin() = worldTransform * btVector3(0,-halfHeight,0);
 					debugDrawSphere(radius, childTransform, color);
 				}
 
 				// Draw some additional lines
 				btVector3 start = worldTransform.getOrigin();
+				getDebugDrawer()->drawLine(start+worldTransform.getBasis() * btVector3(-radius,halfHeight,0),start+worldTransform.getBasis() * btVector3(-radius,-halfHeight,0), color);
+				getDebugDrawer()->drawLine(start+worldTransform.getBasis() * btVector3(radius,halfHeight,0),start+worldTransform.getBasis() * btVector3(radius,-halfHeight,0), color);
+				getDebugDrawer()->drawLine(start+worldTransform.getBasis() * btVector3(0,halfHeight,-radius),start+worldTransform.getBasis() * btVector3(0,-halfHeight,-radius), color);
+				getDebugDrawer()->drawLine(start+worldTransform.getBasis() * btVector3(0,halfHeight,radius),start+worldTransform.getBasis() * btVector3(0,-halfHeight,radius), color);
 
-				
-				capStart[(upAxis+1)%3] = radius;
-				capEnd[(upAxis+1)%3] = radius;
-				getDebugDrawer()->drawLine(start+worldTransform.getBasis() * capStart,start+worldTransform.getBasis() * capEnd, color);
-				capStart[(upAxis+1)%3] = -radius;
-				capEnd[(upAxis+1)%3] = -radius;
-				getDebugDrawer()->drawLine(start+worldTransform.getBasis() * capStart,start+worldTransform.getBasis() * capEnd, color);
-
-				capStart[(upAxis+1)%3] = 0.f;
-				capEnd[(upAxis+1)%3] = 0.f;
-
-				capStart[(upAxis+2)%3] = radius;
-				capEnd[(upAxis+2)%3] = radius;
-				getDebugDrawer()->drawLine(start+worldTransform.getBasis() * capStart,start+worldTransform.getBasis() * capEnd, color);
-				capStart[(upAxis+2)%3] = -radius;
-				capEnd[(upAxis+2)%3] = -radius;
-				getDebugDrawer()->drawLine(start+worldTransform.getBasis() * capStart,start+worldTransform.getBasis() * capEnd, color);
-
-				
 				break;
 			}
 		case CONE_SHAPE_PROXYTYPE:
@@ -938,10 +856,9 @@ void btDiscreteDynamicsWorld::debugDrawObject(const btTransform& worldTransform,
 				btScalar radius = coneShape->getRadius();//+coneShape->getMargin();
 				btScalar height = coneShape->getHeight();//+coneShape->getMargin();
 				btVector3 start = worldTransform.getOrigin();
-
+				// insert here Bullet 2.69 that fixes representation of cone
 				int upAxis= coneShape->getConeUpIndex();
 				
-
 				btVector3	offsetHeight(0,0,0);
 				offsetHeight[upAxis] = height * btScalar(0.5);
 				btVector3	offsetRadius(0,0,0);
@@ -954,8 +871,11 @@ void btDiscreteDynamicsWorld::debugDrawObject(const btTransform& worldTransform,
 				getDebugDrawer()->drawLine(start+worldTransform.getBasis() * (offsetHeight),start+worldTransform.getBasis() * (-offsetHeight+offset2Radius),color);
 				getDebugDrawer()->drawLine(start+worldTransform.getBasis() * (offsetHeight),start+worldTransform.getBasis() * (-offsetHeight-offset2Radius),color);
 
-
-
+				// buggy code that does not take into account the direction of the cone
+				//getDebugDrawer()->drawLine(start+worldTransform.getBasis() * btVector3(btScalar(0.),btScalar(0.),btScalar(0.5)*height),start+worldTransform.getBasis() * btVector3(radius,btScalar(0.),btScalar(-0.5)*height),color);
+				//getDebugDrawer()->drawLine(start+worldTransform.getBasis() * btVector3(btScalar(0.),btScalar(0.),btScalar(0.5)*height),start+worldTransform.getBasis() * btVector3(-radius,btScalar(0.),btScalar(-0.5)*height),color);
+				//getDebugDrawer()->drawLine(start+worldTransform.getBasis() * btVector3(btScalar(0.),btScalar(0.),btScalar(0.5)*height),start+worldTransform.getBasis() * btVector3(btScalar(0.),radius,btScalar(-0.5)*height),color);
+				//getDebugDrawer()->drawLine(start+worldTransform.getBasis() * btVector3(btScalar(0.),btScalar(0.),btScalar(0.5)*height),start+worldTransform.getBasis() * btVector3(btScalar(0.),-radius,btScalar(-0.5)*height),color);
 				break;
 
 			}
@@ -964,7 +884,7 @@ void btDiscreteDynamicsWorld::debugDrawObject(const btTransform& worldTransform,
 				const btCylinderShape* cylinder = static_cast<const btCylinderShape*>(shape);
 				int upAxis = cylinder->getUpAxis();
 				btScalar radius = cylinder->getRadius();
-				btScalar halfHeight = cylinder->getHalfExtentsWithMargin()[upAxis];
+				btScalar halfHeight = cylinder->getHalfExtents()[upAxis];
 				btVector3 start = worldTransform.getOrigin();
 				btVector3	offsetHeight(0,0,0);
 				offsetHeight[upAxis] = halfHeight;
@@ -974,25 +894,6 @@ void btDiscreteDynamicsWorld::debugDrawObject(const btTransform& worldTransform,
 				getDebugDrawer()->drawLine(start+worldTransform.getBasis() * (offsetHeight-offsetRadius),start+worldTransform.getBasis() * (-offsetHeight-offsetRadius),color);
 				break;
 			}
-
-			case STATIC_PLANE_PROXYTYPE:
-				{
-					const btStaticPlaneShape* staticPlaneShape = static_cast<const btStaticPlaneShape*>(shape);
-					btScalar planeConst = staticPlaneShape->getPlaneConstant();
-					const btVector3& planeNormal = staticPlaneShape->getPlaneNormal();
-					btVector3 planeOrigin = planeNormal * planeConst;
-					btVector3 vec0,vec1;
-					btPlaneSpace1(planeNormal,vec0,vec1);
-					btScalar vecLen = 100.f;
-					btVector3 pt0 = planeOrigin + vec0*vecLen;
-					btVector3 pt1 = planeOrigin - vec0*vecLen;
-					btVector3 pt2 = planeOrigin + vec1*vecLen;
-					btVector3 pt3 = planeOrigin - vec1*vecLen;
-					getDebugDrawer()->drawLine(worldTransform*pt0,worldTransform*pt1,color);
-					getDebugDrawer()->drawLine(worldTransform*pt2,worldTransform*pt3,color);
-					break;
-
-				}
 		default:
 			{
 
@@ -1017,7 +918,7 @@ void btDiscreteDynamicsWorld::debugDrawObject(const btTransform& worldTransform,
 					btVector3 aabbMin(btScalar(-1e30),btScalar(-1e30),btScalar(-1e30));
 					//DebugDrawcallback drawCallback;
 					DebugDrawcallback drawCallback(getDebugDrawer(),worldTransform,color);
-					convexMesh->getMeshInterface()->InternalProcessAllTriangles(&drawCallback,aabbMin,aabbMax);
+					convexMesh->getStridingMesh()->InternalProcessAllTriangles(&drawCallback,aabbMin,aabbMax);
 				}
 
 
@@ -1049,18 +950,12 @@ void	btDiscreteDynamicsWorld::setConstraintSolver(btConstraintSolver* solver)
 {
 	if (m_ownsConstraintSolver)
 	{
-		btAlignedFree( m_constraintSolver);
+		delete m_constraintSolver;
 	}
 	m_ownsConstraintSolver = false;
 	m_constraintSolver = solver;
 }
 
-btConstraintSolver* btDiscreteDynamicsWorld::getConstraintSolver()
-{
-	return m_constraintSolver;
-}
-
-
 int		btDiscreteDynamicsWorld::getNumConstraints() const
 {
 	return int(m_constraints.size());
diff --git a/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h b/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h
index d206a604960..83b90bfeebc 100644
--- a/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h
+++ b/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h
@@ -23,11 +23,11 @@ class btOverlappingPairCache;
 class btConstraintSolver;
 class btSimulationIslandManager;
 class btTypedConstraint;
-
+#include "../ConstraintSolver/btContactSolverInfo.h"
 
 class btRaycastVehicle;
 class btIDebugDraw;
-#include "LinearMath/btAlignedObjectArray.h"
+#include "../../LinearMath/btAlignedObjectArray.h"
 
 
 ///btDiscreteDynamicsWorld provides discrete rigid body simulation
@@ -42,6 +42,7 @@ protected:
 
 	btAlignedObjectArray<btTypedConstraint*> m_constraints;
 
+	btIDebugDraw*	m_debugDrawer;
 
 	btVector3	m_gravity;
 
@@ -52,12 +53,14 @@ protected:
 	bool	m_ownsIslandManager;
 	bool	m_ownsConstraintSolver;
 
-	
+	btContactSolverInfo	m_solverInfo;
+
+
 	btAlignedObjectArray<btRaycastVehicle*>	m_vehicles;
 
 	int	m_profileTimings;
 
-	virtual void	predictUnconstraintMotion(btScalar timeStep);
+	void	predictUnconstraintMotion(btScalar timeStep);
 	
 	void	integrateTransforms(btScalar timeStep);
 		
@@ -83,13 +86,14 @@ public:
 
 
 	///this btDiscreteDynamicsWorld constructor gets created objects from the user, and will not delete those
-	btDiscreteDynamicsWorld(btDispatcher* dispatcher,btBroadphaseInterface* pairCache,btConstraintSolver* constraintSolver,btCollisionConfiguration* collisionConfiguration);
+	btDiscreteDynamicsWorld(btDispatcher* dispatcher,btOverlappingPairCache* pairCache,btConstraintSolver* constraintSolver);
 
 	virtual ~btDiscreteDynamicsWorld();
 
 	///if maxSubSteps > 0, it will interpolate motion between fixedTimeStep's
 	virtual int	stepSimulation( btScalar timeStep,int maxSubSteps=1, btScalar fixedTimeStep=btScalar(1.)/btScalar(60.));
 
+	virtual void	updateAabbs();
 
 	void	addConstraint(btTypedConstraint* constraint, bool disableCollisionsBetweenLinkedBodies=false);
 
@@ -114,9 +118,17 @@ public:
 		return this;
 	}
 
+	virtual void	setDebugDrawer(btIDebugDraw*	debugDrawer)
+	{
+			m_debugDrawer = debugDrawer;
+	}
+
+	virtual btIDebugDraw*	getDebugDrawer()
+	{
+		return m_debugDrawer;
+	}
 
 	virtual void	setGravity(const btVector3& gravity);
-	virtual btVector3 getGravity () const;
 
 	virtual void	addRigidBody(btRigidBody* body);
 
@@ -126,11 +138,7 @@ public:
 
 	void	debugDrawObject(const btTransform& worldTransform, const btCollisionShape* shape, const btVector3& color);
 
-	virtual void	debugDrawWorld();
-
 	virtual void	setConstraintSolver(btConstraintSolver* solver);
-
-	virtual btConstraintSolver* getConstraintSolver();
 	
 	virtual	int		getNumConstraints() const;
 
@@ -138,21 +146,11 @@ public:
 
 	virtual const btTypedConstraint* getConstraint(int index) const;
 
-	
-	virtual btDynamicsWorldType	getWorldType() const
+	btContactSolverInfo& getSolverInfo()
 	{
-		return BT_DISCRETE_DYNAMICS_WORLD;
+		return m_solverInfo;
 	}
-	
-	///the forces on each rigidbody is accumulating together with gravity. clear this after each timestep.
-	virtual void	clearForces();
 
-	///apply gravity, call this once per timestep
-	virtual void	applyGravity();
-
-	virtual void	setNumTasks(int numTasks)
-	{
-	}
 
 };
 
diff --git a/extern/bullet2/src/BulletDynamics/Dynamics/btDynamicsWorld.h b/extern/bullet2/src/BulletDynamics/Dynamics/btDynamicsWorld.h
index dd9dfa71b7f..65b63fad4b5 100644
--- a/extern/bullet2/src/BulletDynamics/Dynamics/btDynamicsWorld.h
+++ b/extern/bullet2/src/BulletDynamics/Dynamics/btDynamicsWorld.h
@@ -16,39 +16,20 @@ subject to the following restrictions:
 #ifndef BT_DYNAMICS_WORLD_H
 #define BT_DYNAMICS_WORLD_H
 
-#include "BulletCollision/CollisionDispatch/btCollisionWorld.h"
-#include "BulletDynamics/ConstraintSolver/btContactSolverInfo.h"
-
+#include "../../BulletCollision/CollisionDispatch/btCollisionWorld.h"
 class btTypedConstraint;
 class btRaycastVehicle;
 class btConstraintSolver;
-class btDynamicsWorld;
 
-/// Type for the callback for each tick
-typedef void (*btInternalTickCallback)(btDynamicsWorld *world, btScalar timeStep);
 
-enum btDynamicsWorldType
-{
-	BT_SIMPLE_DYNAMICS_WORLD=1,
-	BT_DISCRETE_DYNAMICS_WORLD=2,
-	BT_CONTINUOUS_DYNAMICS_WORLD=3
-};
-
-///The btDynamicsWorld is the interface class for several dynamics implementation, basic, discrete, parallel, and continuous etc.
+///btDynamicsWorld is the baseclass for several dynamics implementation, basic, discrete, parallel, and continuous
 class btDynamicsWorld : public btCollisionWorld
 {
-
-protected:
-		btInternalTickCallback m_internalTickCallback;
-		void*	m_worldUserInfo;
-
-		btContactSolverInfo	m_solverInfo;
-
-public:
+	public:
 		
 
-		btDynamicsWorld(btDispatcher* dispatcher,btBroadphaseInterface* broadphase,btCollisionConfiguration* collisionConfiguration)
-		:btCollisionWorld(dispatcher,broadphase,collisionConfiguration), m_internalTickCallback(0), m_worldUserInfo(0)
+		btDynamicsWorld(btDispatcher* dispatcher,btOverlappingPairCache* pairCache)
+		:btCollisionWorld(dispatcher,pairCache)
 		{
 		}
 
@@ -56,37 +37,34 @@ public:
 		{
 		}
 		
-		///stepSimulation proceeds the simulation over 'timeStep', units in preferably in seconds.
-		///By default, Bullet will subdivide the timestep in constant substeps of each 'fixedTimeStep'.
-		///in order to keep the simulation real-time, the maximum number of substeps can be clamped to 'maxSubSteps'.
-		///You can disable subdividing the timestep/substepping by passing maxSubSteps=0 as second argument to stepSimulation, but in that case you have to keep the timeStep constant.
-		virtual int		stepSimulation( btScalar timeStep,int maxSubSteps=10, btScalar fixedTimeStep=btScalar(1.)/btScalar(60.))=0;
+		///stepSimulation proceeds the simulation over timeStep units
+		///if maxSubSteps > 0, it will interpolate time steps
+		virtual int		stepSimulation( btScalar timeStep,int maxSubSteps=1, btScalar fixedTimeStep=btScalar(1.)/btScalar(60.))=0;
 			
-		virtual void	debugDrawWorld() = 0;
+		virtual void	updateAabbs() = 0;
 				
-		virtual void	addConstraint(btTypedConstraint* constraint, bool disableCollisionsBetweenLinkedBodies=false) 
-		{ 
-			(void)constraint; (void)disableCollisionsBetweenLinkedBodies;
-		}
+		virtual void	addConstraint(btTypedConstraint* constraint, bool disableCollisionsBetweenLinkedBodies=false) { (void)constraint;};
 
-		virtual void	removeConstraint(btTypedConstraint* constraint) {(void)constraint;}
+		virtual void	removeConstraint(btTypedConstraint* constraint) {(void)constraint;};
 
-		virtual void	addVehicle(btRaycastVehicle* vehicle) {(void)vehicle;}
+		virtual void	addVehicle(btRaycastVehicle* vehicle) {(void)vehicle;};
 
-		virtual void	removeVehicle(btRaycastVehicle* vehicle) {(void)vehicle;}
+		virtual void	removeVehicle(btRaycastVehicle* vehicle) {(void)vehicle;};
+
+
+		virtual void	setDebugDrawer(btIDebugDraw*	debugDrawer) = 0;
+
+		virtual btIDebugDraw*	getDebugDrawer() = 0;
 
 		//once a rigidbody is added to the dynamics world, it will get this gravity assigned
 		//existing rigidbodies in the world get gravity assigned too, during this method
 		virtual void	setGravity(const btVector3& gravity) = 0;
-		virtual btVector3 getGravity () const = 0;
 
 		virtual void	addRigidBody(btRigidBody* body) = 0;
 
 		virtual void	removeRigidBody(btRigidBody* body) = 0;
 
 		virtual void	setConstraintSolver(btConstraintSolver* solver) = 0;
-
-		virtual btConstraintSolver* getConstraintSolver() = 0;
 		
 		virtual	int		getNumConstraints() const {	return 0;		}
 		
@@ -94,35 +72,7 @@ public:
 		
 		virtual const btTypedConstraint* getConstraint(int index) const	{	(void)index;	return 0;	}
 
-		virtual btDynamicsWorldType	getWorldType() const=0;
-
-		virtual void	clearForces() = 0;
-
-		/// Set the callback for when an internal tick (simulation substep) happens, optional user info
-		void setInternalTickCallback(btInternalTickCallback cb,	void* worldUserInfo=0) 
-		{ 
-			m_internalTickCallback = cb; 
-			m_worldUserInfo = worldUserInfo;
-		}
-
-		void	setWorldUserInfo(void* worldUserInfo)
-		{
-			m_worldUserInfo = worldUserInfo;
-		}
-
-		void*	getWorldUserInfo() const
-		{
-			return m_worldUserInfo;
-		}
-
-		btContactSolverInfo& getSolverInfo()
-		{
-			return m_solverInfo;
-		}
-
-
 };
 
 #endif //BT_DYNAMICS_WORLD_H
 
-
diff --git a/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp b/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp
index e2afb687ac6..9ed3579d89c 100644
--- a/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp
+++ b/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp
@@ -20,53 +20,36 @@ subject to the following restrictions:
 #include "LinearMath/btMotionState.h"
 #include "BulletDynamics/ConstraintSolver/btTypedConstraint.h"
 
+btScalar gLinearAirDamping = btScalar(1.);
 //'temporarily' global variables
 btScalar	gDeactivationTime = btScalar(2.);
 bool	gDisableDeactivation = false;
+
+btScalar gLinearSleepingThreshold = btScalar(0.8);
+btScalar gAngularSleepingThreshold = btScalar(1.0);
 static int uniqueId = 0;
 
-
-btRigidBody::btRigidBody(const btRigidBody::btRigidBodyConstructionInfo& constructionInfo)
-{
-	setupRigidBody(constructionInfo);
-}
-
-btRigidBody::btRigidBody(btScalar mass, btMotionState *motionState, btCollisionShape *collisionShape, const btVector3 &localInertia)
-{
-	btRigidBodyConstructionInfo cinfo(mass,motionState,collisionShape,localInertia);
-	setupRigidBody(cinfo);
-}
-
-void	btRigidBody::setupRigidBody(const btRigidBody::btRigidBodyConstructionInfo& constructionInfo)
+btRigidBody::btRigidBody(btScalar mass, btMotionState* motionState, btCollisionShape* collisionShape, const btVector3& localInertia,btScalar linearDamping,btScalar angularDamping,btScalar friction,btScalar restitution)
+: 
+	m_linearVelocity(btScalar(0.0), btScalar(0.0), btScalar(0.0)),
+	m_angularVelocity(btScalar(0.),btScalar(0.),btScalar(0.)),
+	m_angularFactor(btScalar(1.)),
+	m_gravity(btScalar(0.0), btScalar(0.0), btScalar(0.0)),
+	m_totalForce(btScalar(0.0), btScalar(0.0), btScalar(0.0)),
+	m_totalTorque(btScalar(0.0), btScalar(0.0), btScalar(0.0)),
+	m_linearDamping(btScalar(0.)),
+	m_angularDamping(btScalar(0.5)),
+	m_optionalMotionState(motionState),
+	m_contactSolverType(0),
+	m_frictionSolverType(0)
 {
 
-	m_internalType=CO_RIGID_BODY;
-
-	m_linearVelocity.setValue(btScalar(0.0), btScalar(0.0), btScalar(0.0));
-	m_angularVelocity.setValue(btScalar(0.),btScalar(0.),btScalar(0.));
-	m_angularFactor = btScalar(1.);
-	m_gravity.setValue(btScalar(0.0), btScalar(0.0), btScalar(0.0));
-	m_totalForce.setValue(btScalar(0.0), btScalar(0.0), btScalar(0.0));
-	m_totalTorque.setValue(btScalar(0.0), btScalar(0.0), btScalar(0.0)),
-	m_linearDamping = btScalar(0.);
-	m_angularDamping = btScalar(0.5);
-	m_linearSleepingThreshold = constructionInfo.m_linearSleepingThreshold;
-	m_angularSleepingThreshold = constructionInfo.m_angularSleepingThreshold;
-	m_optionalMotionState = constructionInfo.m_motionState;
-	m_contactSolverType = 0;
-	m_frictionSolverType = 0;
-	m_additionalDamping = constructionInfo.m_additionalDamping;
-	m_additionalDampingFactor = constructionInfo.m_additionalDampingFactor;
-	m_additionalLinearDampingThresholdSqr = constructionInfo.m_additionalLinearDampingThresholdSqr;
-	m_additionalAngularDampingThresholdSqr = constructionInfo.m_additionalAngularDampingThresholdSqr;
-	m_additionalAngularDampingFactor = constructionInfo.m_additionalAngularDampingFactor;
-
-	if (m_optionalMotionState)
+	if (motionState)
 	{
-		m_optionalMotionState->getWorldTransform(m_worldTransform);
+		motionState->getWorldTransform(m_worldTransform);
 	} else
 	{
-		m_worldTransform = constructionInfo.m_startWorldTransform;
+		m_worldTransform = btTransform::getIdentity();
 	}
 
 	m_interpolationWorldTransform = m_worldTransform;
@@ -74,21 +57,90 @@ void	btRigidBody::setupRigidBody(const btRigidBody::btRigidBodyConstructionInfo&
 	m_interpolationAngularVelocity.setValue(0,0,0);
 	
 	//moved to btCollisionObject
-	m_friction = constructionInfo.m_friction;
-	m_restitution = constructionInfo.m_restitution;
+	m_friction = friction;
+	m_restitution = restitution;
 
-	setCollisionShape( constructionInfo.m_collisionShape );
+	m_collisionShape = collisionShape;
 	m_debugBodyId = uniqueId++;
 	
-	setMassProps(constructionInfo.m_mass, constructionInfo.m_localInertia);
-    setDamping(constructionInfo.m_linearDamping, constructionInfo.m_angularDamping);
+	//m_internalOwner is to allow upcasting from collision object to rigid body
+	m_internalOwner = this;
+
+	setMassProps(mass, localInertia);
+    setDamping(linearDamping, angularDamping);
 	updateInertiaTensor();
 
 }
 
+#ifdef OBSOLETE_MOTIONSTATE_LESS
+btRigidBody::btRigidBody( btScalar mass,const btTransform& worldTransform,btCollisionShape* collisionShape,const btVector3& localInertia,btScalar linearDamping,btScalar angularDamping,btScalar friction,btScalar restitution)
+: 
+	m_gravity(btScalar(0.0), btScalar(0.0), btScalar(0.0)),
+	m_totalForce(btScalar(0.0), btScalar(0.0), btScalar(0.0)),
+	m_totalTorque(btScalar(0.0), btScalar(0.0), btScalar(0.0)),
+	m_linearVelocity(btScalar(0.0), btScalar(0.0), btScalar(0.0)),
+	m_angularVelocity(btScalar(0.),btScalar(0.),btScalar(0.)),
+	m_linearDamping(btScalar(0.)),
+	m_angularDamping(btScalar(0.5)),
+	m_optionalMotionState(0),
+	m_contactSolverType(0),
+	m_frictionSolverType(0)
+{
+	
+	m_worldTransform = worldTransform;
+	m_interpolationWorldTransform = m_worldTransform;
+	m_interpolationLinearVelocity.setValue(0,0,0);
+	m_interpolationAngularVelocity.setValue(0,0,0);
+
+	//moved to btCollisionObject
+	m_friction = friction;
+	m_restitution = restitution;
+
+	m_collisionShape = collisionShape;
+	m_debugBodyId = uniqueId++;
+	
+	//m_internalOwner is to allow upcasting from collision object to rigid body
+	m_internalOwner = this;
+
+	setMassProps(mass, localInertia);
+    setDamping(linearDamping, angularDamping);
+	updateInertiaTensor();
+
+}
+
+#endif //OBSOLETE_MOTIONSTATE_LESS
+
+
+
+
+//#define EXPERIMENTAL_JITTER_REMOVAL 1
+#ifdef EXPERIMENTAL_JITTER_REMOVAL
+//Bullet 2.20b has experimental damping code to reduce jitter just before objects fall asleep/deactivate
+//doesn't work very well yet (value 0 disabled this damping)
+//note there this influences deactivation thresholds!
+btScalar gClippedAngvelThresholdSqr = btScalar(0.01);
+btScalar	gClippedLinearThresholdSqr = btScalar(0.01);
+#endif //EXPERIMENTAL_JITTER_REMOVAL
+
+btScalar	gJitterVelocityDampingFactor = btScalar(0.7);
 
 void btRigidBody::predictIntegratedTransform(btScalar timeStep,btTransform& predictedTransform) 
 {
+
+#ifdef EXPERIMENTAL_JITTER_REMOVAL
+	//if (wantsSleeping())
+	{
+		//clip to avoid jitter
+		if ((m_angularVelocity.length2() < gClippedAngvelThresholdSqr) &&
+			(m_linearVelocity.length2() < gClippedLinearThresholdSqr))
+		{
+			m_angularVelocity *= gJitterVelocityDampingFactor;
+			m_linearVelocity *= gJitterVelocityDampingFactor;
+		}
+	}
+	
+#endif //EXPERIMENTAL_JITTER_REMOVAL
+
 	btTransformUtil::integrateTransform(m_worldTransform,m_linearVelocity,m_angularVelocity,timeStep,predictedTransform);
 }
 
@@ -139,63 +191,50 @@ void btRigidBody::setDamping(btScalar lin_damping, btScalar ang_damping)
 
 
 
-
-///applyDamping damps the velocity, using the given m_linearDamping and m_angularDamping
-void			btRigidBody::applyDamping(btScalar timeStep)
-{
-	m_linearVelocity *= GEN_clamped((btScalar(1.) - timeStep * m_linearDamping), (btScalar)btScalar(0.0), (btScalar)btScalar(1.0));
-	m_angularVelocity *= GEN_clamped((btScalar(1.) - timeStep * m_angularDamping), (btScalar)btScalar(0.0), (btScalar)btScalar(1.0));
-
-	if (m_additionalDamping)
-	{
-		//Additional damping can help avoiding lowpass jitter motion, help stability for ragdolls etc.
-		//Such damping is undesirable, so once the overall simulation quality of the rigid body dynamics system has improved, this should become obsolete
-		if ((m_angularVelocity.length2() < m_additionalAngularDampingThresholdSqr) &&
-			(m_linearVelocity.length2() < m_additionalLinearDampingThresholdSqr))
-		{
-			m_angularVelocity *= m_additionalDampingFactor;
-			m_linearVelocity *= m_additionalDampingFactor;
-		}
-	
-
-		btScalar speed = m_linearVelocity.length();
-		if (speed < m_linearDamping)
-		{
-			btScalar dampVel = btScalar(0.005);
-			if (speed > dampVel)
-			{
-				btVector3 dir = m_linearVelocity.normalized();
-				m_linearVelocity -=  dir * dampVel;
-			} else
-			{
-				m_linearVelocity.setValue(btScalar(0.),btScalar(0.),btScalar(0.));
-			}
-		}
-
-		btScalar angSpeed = m_angularVelocity.length();
-		if (angSpeed < m_angularDamping)
-		{
-			btScalar angDampVel = btScalar(0.005);
-			if (angSpeed > angDampVel)
-			{
-				btVector3 dir = m_angularVelocity.normalized();
-				m_angularVelocity -=  dir * angDampVel;
-			} else
-			{
-				m_angularVelocity.setValue(btScalar(0.),btScalar(0.),btScalar(0.));
-			}
-		}
-	}
-}
+#include <stdio.h>
 
 
-void btRigidBody::applyGravity()
+void btRigidBody::applyForces(btScalar step)
 {
 	if (isStaticOrKinematicObject())
 		return;
 	
 	applyCentralForce(m_gravity);	
+	
+	m_linearVelocity *= GEN_clamped((btScalar(1.) - step * gLinearAirDamping * m_linearDamping), (btScalar)btScalar(0.0), (btScalar)btScalar(1.0));
+	m_angularVelocity *= GEN_clamped((btScalar(1.) - step * m_angularDamping), (btScalar)btScalar(0.0), (btScalar)btScalar(1.0));
 
+#define FORCE_VELOCITY_DAMPING 1
+#ifdef FORCE_VELOCITY_DAMPING
+	btScalar speed = m_linearVelocity.length();
+	if (speed < m_linearDamping)
+	{
+		btScalar dampVel = btScalar(0.005);
+		if (speed > dampVel)
+		{
+			btVector3 dir = m_linearVelocity.normalized();
+			m_linearVelocity -=  dir * dampVel;
+		} else
+		{
+			m_linearVelocity.setValue(btScalar(0.),btScalar(0.),btScalar(0.));
+		}
+	}
+
+	btScalar angSpeed = m_angularVelocity.length();
+	if (angSpeed < m_angularDamping)
+	{
+		btScalar angDampVel = btScalar(0.005);
+		if (angSpeed > angDampVel)
+		{
+			btVector3 dir = m_angularVelocity.normalized();
+			m_angularVelocity -=  dir * angDampVel;
+		} else
+		{
+			m_angularVelocity.setValue(btScalar(0.),btScalar(0.),btScalar(0.));
+		}
+	}
+#endif //FORCE_VELOCITY_DAMPING
+	
 }
 
 void btRigidBody::proceedToTransform(const btTransform& newTrans)
@@ -246,6 +285,7 @@ void btRigidBody::integrateVelocities(btScalar step)
 		m_angularVelocity *= (MAX_ANGVEL/step) /angvel;
 	}
 
+	clearForces();
 }
 
 btQuaternion btRigidBody::getOrientation() const
diff --git a/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h b/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h
index 4596f90a00f..0707595d48e 100644
--- a/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h
+++ b/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h
@@ -16,29 +16,27 @@ subject to the following restrictions:
 #ifndef RIGIDBODY_H
 #define RIGIDBODY_H
 
-#include "LinearMath/btAlignedObjectArray.h"
-#include "LinearMath/btPoint3.h"
-#include "LinearMath/btTransform.h"
-#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
-#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
+#include "../../LinearMath/btAlignedObjectArray.h"
+#include "../../LinearMath/btPoint3.h"
+#include "../../LinearMath/btTransform.h"
+#include "../../BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
+#include "../../BulletCollision/CollisionDispatch/btCollisionObject.h"
 
 class btCollisionShape;
 class btMotionState;
 class btTypedConstraint;
 
 
+extern btScalar gLinearAirDamping;
+
 extern btScalar gDeactivationTime;
 extern bool gDisableDeactivation;
+extern btScalar gLinearSleepingThreshold;
+extern btScalar gAngularSleepingThreshold;
 
 
-///btRigidBody is the main class for rigid body objects. It is derived from btCollisionObject, so it keeps a pointer to a btCollisionShape.
-///It is recommended for performance and memory use to share btCollisionShape objects whenever possible.
-///There are 3 types of rigid bodies: 
-///- A) Dynamic rigid bodies, with positive mass. Motion is controlled by rigid body dynamics.
-///- B) Fixed objects with zero mass. They are not moving (basically collision objects)
-///- C) Kinematic objects, which are objects without mass, but the user can move them. There is on-way interaction, and Bullet calculates a velocity based on the timestep and previous and current world transform.
-///Bullet automatically deactivates dynamic rigid bodies, when the velocity is below a threshold for a given time.
-///Deactivated (sleeping) rigid bodies don't take any processing time, except a minor broadphase collision detection impact (to allow active objects to activate/wake up sleeping objects)
+/// btRigidBody class for btRigidBody Dynamics
+/// 
 class btRigidBody  : public btCollisionObject
 {
 
@@ -55,16 +53,7 @@ class btRigidBody  : public btCollisionObject
 	
 	btScalar		m_linearDamping;
 	btScalar		m_angularDamping;
-
-	bool			m_additionalDamping;
-	btScalar		m_additionalDampingFactor;
-	btScalar		m_additionalLinearDampingThresholdSqr;
-	btScalar		m_additionalAngularDampingThresholdSqr;
-	btScalar		m_additionalAngularDampingFactor;
-
-
-	btScalar		m_linearSleepingThreshold;
-	btScalar		m_angularSleepingThreshold;
+	
 
 	//m_optionalMotionState allows to automatic synchronize the world transform for active objects
 	btMotionState*	m_optionalMotionState;
@@ -74,85 +63,12 @@ class btRigidBody  : public btCollisionObject
 
 public:
 
+#ifdef OBSOLETE_MOTIONSTATE_LESS
+	//not supported, please use btMotionState
+	btRigidBody(btScalar mass, const btTransform& worldTransform, btCollisionShape* collisionShape, const btVector3& localInertia=btVector3(0,0,0),btScalar linearDamping=btScalar(0.),btScalar angularDamping=btScalar(0.),btScalar friction=btScalar(0.5),btScalar restitution=btScalar(0.));
+#endif //OBSOLETE_MOTIONSTATE_LESS
 
-	///btRigidBodyConstructionInfo provides information to create a rigid body. Setting mass to zero creates a fixed (non-dynamic) rigid body.
-	///For dynamic objects, you can use the collision shape to approximate the local inertia tensor, otherwise use the zero vector (default argument)
-	///You can use the motion state to synchronize the world transform between physics and graphics objects. 
-	///And if the motion state is provided, the rigid body will initialize its initial world transform from the motion state,
-	///m_startWorldTransform is only used when you don't provide a motion state.
-	struct	btRigidBodyConstructionInfo
-	{
-		btScalar			m_mass;
-
-		///When a motionState is provided, the rigid body will initialize its world transform from the motion state
-		///In this case, m_startWorldTransform is ignored.
-		btMotionState*		m_motionState;
-		btTransform	m_startWorldTransform;
-
-		btCollisionShape*	m_collisionShape;
-		btVector3			m_localInertia;
-		btScalar			m_linearDamping;
-		btScalar			m_angularDamping;
-
-		///best simulation results when friction is non-zero
-		btScalar			m_friction;
-		///best simulation results using zero restitution.
-		btScalar			m_restitution;
-
-		btScalar			m_linearSleepingThreshold;
-		btScalar			m_angularSleepingThreshold;
-
-		//Additional damping can help avoiding lowpass jitter motion, help stability for ragdolls etc.
-		//Such damping is undesirable, so once the overall simulation quality of the rigid body dynamics system has improved, this should become obsolete
-		bool				m_additionalDamping;
-		btScalar			m_additionalDampingFactor;
-		btScalar			m_additionalLinearDampingThresholdSqr;
-		btScalar			m_additionalAngularDampingThresholdSqr;
-		btScalar			m_additionalAngularDampingFactor;
-
-		
-		btRigidBodyConstructionInfo(	btScalar mass, btMotionState* motionState, btCollisionShape* collisionShape, const btVector3& localInertia=btVector3(0,0,0)):
-		m_mass(mass),
-			m_motionState(motionState),
-			m_collisionShape(collisionShape),
-			m_localInertia(localInertia),
-			m_linearDamping(btScalar(0.)),
-			m_angularDamping(btScalar(0.)),
-			m_friction(btScalar(0.5)),
-			m_restitution(btScalar(0.)),
-			m_linearSleepingThreshold(btScalar(0.8)),
-			m_angularSleepingThreshold(btScalar(1.f)),
-			m_additionalDamping(false),
-			m_additionalDampingFactor(btScalar(0.005)),
-			m_additionalLinearDampingThresholdSqr(btScalar(0.01)),
-			m_additionalAngularDampingThresholdSqr(btScalar(0.01)),
-			m_additionalAngularDampingFactor(btScalar(0.01))
-		{
-			m_startWorldTransform.setIdentity();
-		}
-	};
-
-	///btRigidBody constructor using construction info
-	btRigidBody(	const btRigidBodyConstructionInfo& constructionInfo);
-
-	///btRigidBody constructor for backwards compatibility. 
-	///To specify friction (etc) during rigid body construction, please use the other constructor (using btRigidBodyConstructionInfo)
-	btRigidBody(	btScalar mass, btMotionState* motionState, btCollisionShape* collisionShape, const btVector3& localInertia=btVector3(0,0,0));
-
-
-	virtual ~btRigidBody()
-        { 
-                //No constraints should point to this rigidbody
-		//Remove constraints from the dynamics world before you delete the related rigidbodies. 
-                btAssert(m_constraintRefs.size()==0); 
-        }
-
-protected:
-
-	///setupRigidBody is only used internally by the constructor
-	void	setupRigidBody(const btRigidBodyConstructionInfo& constructionInfo);
-
-public:
+	btRigidBody(btScalar mass, btMotionState* motionState, btCollisionShape* collisionShape, const btVector3& localInertia=btVector3(0,0,0),btScalar linearDamping=btScalar(0.),btScalar angularDamping=btScalar(0.),btScalar friction=btScalar(0.5),btScalar restitution=btScalar(0.));
 
 	void			proceedToTransform(const btTransform& newTrans); 
 	
@@ -160,15 +76,11 @@ public:
 	///but a rigidbody is derived from btCollisionObject, so we can safely perform an upcast
 	static const btRigidBody*	upcast(const btCollisionObject* colObj)
 	{
-		if (colObj->getInternalType()==btCollisionObject::CO_RIGID_BODY)
-			return (const btRigidBody*)colObj;
-		return 0;
+		return (const btRigidBody*)colObj->getInternalOwner();
 	}
 	static btRigidBody*	upcast(btCollisionObject* colObj)
 	{
-		if (colObj->getInternalType()==btCollisionObject::CO_RIGID_BODY)
-			return (btRigidBody*)colObj;
-		return 0;
+		return (btRigidBody*)colObj->getInternalOwner();
 	}
 	
 	/// continuous collision detection needs prediction
@@ -176,7 +88,8 @@ public:
 	
 	void			saveKinematicState(btScalar step);
 	
-	void			applyGravity();
+
+	void			applyForces(btScalar step);
 	
 	void			setGravity(const btVector3& acceleration);  
 
@@ -186,34 +99,12 @@ public:
 	}
 
 	void			setDamping(btScalar lin_damping, btScalar ang_damping);
-
-	btScalar getLinearDamping() const
-	{
-		return m_linearDamping;
-	}
-
-	btScalar getAngularDamping() const
-	{
-		return m_angularDamping;
-	}
-
-	btScalar getLinearSleepingThreshold() const
-	{
-		return m_linearSleepingThreshold;
-	}
-
-	btScalar getAngularSleepingThreshold() const
-	{
-		return m_angularSleepingThreshold;
-	}
-
-	void			applyDamping(btScalar timeStep);
-
-	SIMD_FORCE_INLINE const btCollisionShape*	getCollisionShape() const {
+	
+	inline const btCollisionShape*	getCollisionShape() const {
 		return m_collisionShape;
 	}
 
-	SIMD_FORCE_INLINE btCollisionShape*	getCollisionShape() {
+	inline btCollisionShape*	getCollisionShape() {
 			return m_collisionShape;
 	}
 	
@@ -243,12 +134,6 @@ public:
 		m_invInertiaLocal = diagInvInertia;
 	}
 
-	void	setSleepingThresholds(btScalar linear,btScalar angular)
-	{
-		m_linearSleepingThreshold = linear;
-		m_angularSleepingThreshold = angular;
-	}
-
 	void	applyTorque(const btVector3& torque)
 	{
 		m_totalTorque += torque;
@@ -257,7 +142,7 @@ public:
 	void	applyForce(const btVector3& force, const btVector3& rel_pos) 
 	{
 		applyCentralForce(force);
-		applyTorque(rel_pos.cross(force)*m_angularFactor);
+		applyTorque(rel_pos.cross(force));
 	}
 	
 	void applyCentralImpulse(const btVector3& impulse)
@@ -283,7 +168,7 @@ public:
 	}
 
 	//Optimization for the iterative solver: avoid calculating constant terms involving inertia, normal, relative position
-	SIMD_FORCE_INLINE void internalApplyImpulse(const btVector3& linearComponent, const btVector3& angularComponent,btScalar impulseMagnitude)
+	inline void internalApplyImpulse(const btVector3& linearComponent, const btVector3& angularComponent,btScalar impulseMagnitude)
 	{
 		if (m_inverseMass != btScalar(0.))
 		{
@@ -353,7 +238,7 @@ public:
 
 
 	
-	SIMD_FORCE_INLINE btScalar computeImpulseDenominator(const btPoint3& pos, const btVector3& normal) const
+	inline btScalar computeImpulseDenominator(const btPoint3& pos, const btVector3& normal) const
 	{
 		btVector3 r0 = pos - getCenterOfMassPosition();
 
@@ -365,19 +250,19 @@ public:
 
 	}
 
-	SIMD_FORCE_INLINE btScalar computeAngularImpulseDenominator(const btVector3& axis) const
+	inline btScalar computeAngularImpulseDenominator(const btVector3& axis) const
 	{
 		btVector3 vec = axis * getInvInertiaTensorWorld();
 		return axis.dot(vec);
 	}
 
-	SIMD_FORCE_INLINE void	updateDeactivation(btScalar timeStep)
+	inline void	updateDeactivation(btScalar timeStep)
 	{
 		if ( (getActivationState() == ISLAND_SLEEPING) || (getActivationState() == DISABLE_DEACTIVATION))
 			return;
 
-		if ((getLinearVelocity().length2() < m_linearSleepingThreshold*m_linearSleepingThreshold) &&
-			(getAngularVelocity().length2() < m_angularSleepingThreshold*m_angularSleepingThreshold))
+		if ((getLinearVelocity().length2() < gLinearSleepingThreshold*gLinearSleepingThreshold) &&
+			(getAngularVelocity().length2() < gAngularSleepingThreshold*gAngularSleepingThreshold))
 		{
 			m_deactivationTime += timeStep;
 		} else
@@ -388,7 +273,7 @@ public:
 
 	}
 
-	SIMD_FORCE_INLINE bool	wantsSleeping()
+	inline bool	wantsSleeping()
 	{
 
 		if (getActivationState() == DISABLE_DEACTIVATION)
@@ -463,16 +348,6 @@ public:
 	void addConstraintRef(btTypedConstraint* c);
 	void removeConstraintRef(btTypedConstraint* c);
 
-	btTypedConstraint* getConstraintRef(int index)
-	{
-		return m_constraintRefs[index];
-	}
-
-	int getNumConstraintRefs()
-	{
-		return m_constraintRefs.size();
-	}
-
 	int	m_debugBodyId;
 };
 
diff --git a/extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp b/extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp
index 3be04d1a4ad..4ebcb8e7517 100644
--- a/extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp
+++ b/extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp
@@ -27,19 +27,16 @@ subject to the following restrictions:
   can be used by probes that are checking whether the
   library is actually installed.
 */
-extern "C" 
-{
-	void btBulletDynamicsProbe ();
-	void btBulletDynamicsProbe () {}
-}
+extern "C" void btBulletDynamicsProbe () {}
 
 
 
 
-btSimpleDynamicsWorld::btSimpleDynamicsWorld(btDispatcher* dispatcher,btBroadphaseInterface* pairCache,btConstraintSolver* constraintSolver,btCollisionConfiguration* collisionConfiguration)
-:btDynamicsWorld(dispatcher,pairCache,collisionConfiguration),
+btSimpleDynamicsWorld::btSimpleDynamicsWorld(btDispatcher* dispatcher,btOverlappingPairCache* pairCache,btConstraintSolver* constraintSolver)
+:btDynamicsWorld(dispatcher,pairCache),
 m_constraintSolver(constraintSolver),
 m_ownsConstraintSolver(false),
+m_debugDrawer(0),
 m_gravity(0,0,-10)
 {
 
@@ -49,7 +46,7 @@ m_gravity(0,0,-10)
 btSimpleDynamicsWorld::~btSimpleDynamicsWorld()
 {
 	if (m_ownsConstraintSolver)
-		btAlignedFree( m_constraintSolver);
+		delete m_constraintSolver;
 }
 
 int		btSimpleDynamicsWorld::stepSimulation( btScalar timeStep,int maxSubSteps, btScalar fixedTimeStep)
@@ -77,9 +74,8 @@ int		btSimpleDynamicsWorld::stepSimulation( btScalar timeStep,int maxSubSteps, b
 		
 		btContactSolverInfo infoGlobal;
 		infoGlobal.m_timeStep = timeStep;
-		m_constraintSolver->prepareSolve(0,numManifolds);
-		m_constraintSolver->solveGroup(0,0,manifoldPtr, numManifolds,0,0,infoGlobal,m_debugDrawer, m_stackAlloc,m_dispatcher1);
-		m_constraintSolver->allSolved(infoGlobal,m_debugDrawer, m_stackAlloc);
+		
+		m_constraintSolver->solveGroup(0,0,manifoldPtr, numManifolds,0,0,infoGlobal,m_debugDrawer, m_stackAlloc);
 	}
 
 	///integrate transforms
@@ -89,27 +85,10 @@ int		btSimpleDynamicsWorld::stepSimulation( btScalar timeStep,int maxSubSteps, b
 
 	synchronizeMotionStates();
 
-	clearForces();
-
 	return 1;
 
 }
 
-void	btSimpleDynamicsWorld::clearForces()
-{
-	//todo: iterate over awake simulation islands!
-	for ( int i=0;i<m_collisionObjects.size();i++)
-	{
-		btCollisionObject* colObj = m_collisionObjects[i];
-		
-		btRigidBody* body = btRigidBody::upcast(colObj);
-		if (body)
-		{
-			body->clearForces();
-		}
-	}
-}	
-
 
 void	btSimpleDynamicsWorld::setGravity(const btVector3& gravity)
 {
@@ -125,11 +104,6 @@ void	btSimpleDynamicsWorld::setGravity(const btVector3& gravity)
 	}
 }
 
-btVector3 btSimpleDynamicsWorld::getGravity () const
-{
-	return m_gravity;
-}
-
 void	btSimpleDynamicsWorld::removeRigidBody(btRigidBody* body)
 {
 	removeCollisionObject(body);
@@ -159,7 +133,7 @@ void	btSimpleDynamicsWorld::updateAabbs()
 				btPoint3 minAabb,maxAabb;
 				colObj->getCollisionShape()->getAabb(colObj->getWorldTransform(), minAabb,maxAabb);
 				btBroadphaseInterface* bp = getBroadphase();
-				bp->setAabb(body->getBroadphaseHandle(),minAabb,maxAabb, m_dispatcher1);
+				bp->setAabb(body->getBroadphaseHandle(),minAabb,maxAabb);
 			}
 		}
 	}
@@ -197,9 +171,8 @@ void	btSimpleDynamicsWorld::predictUnconstraintMotion(btScalar timeStep)
 			{
 				if (body->isActive())
 				{
-					body->applyGravity();
+					body->applyForces( timeStep);
 					body->integrateVelocities( timeStep);
-					body->applyDamping(timeStep);
 					body->predictIntegratedTransform(timeStep,body->getInterpolationWorldTransform());
 				}
 			}
@@ -231,13 +204,8 @@ void	btSimpleDynamicsWorld::setConstraintSolver(btConstraintSolver* solver)
 {
 	if (m_ownsConstraintSolver)
 	{
-		btAlignedFree(m_constraintSolver);
+		delete m_constraintSolver;
 	}
 	m_ownsConstraintSolver = false;
 	m_constraintSolver = solver;
 }
-
-btConstraintSolver* btSimpleDynamicsWorld::getConstraintSolver()
-{
-	return m_constraintSolver;
-}
diff --git a/extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h b/extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h
index 5c56fdf1327..25f4ccd8e68 100644
--- a/extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h
+++ b/extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h
@@ -22,8 +22,11 @@ class btDispatcher;
 class btOverlappingPairCache;
 class btConstraintSolver;
 
-///btSimpleDynamicsWorld serves as unit-test and to verify more complicated and optimized dynamics worlds.
-///Please use btDiscreteDynamicsWorld instead (or btContinuousDynamicsWorld once it is finished).
+///btSimpleDynamicsWorld demonstrates very basic usage of Bullet rigid body dynamics
+///It can be used for basic simulations, and as a starting point for porting Bullet
+///btSimpleDynamicsWorld lacks object deactivation, island management and other concepts.
+///For more complicated simulations, btDiscreteDynamicsWorld and btContinuousDynamicsWorld are recommended
+///those classes replace the obsolete CcdPhysicsEnvironment/CcdPhysicsController
 class btSimpleDynamicsWorld : public btDynamicsWorld
 {
 protected:
@@ -32,6 +35,8 @@ protected:
 
 	bool	m_ownsConstraintSolver;
 
+	btIDebugDraw*	m_debugDrawer;
+
 	void	predictUnconstraintMotion(btScalar timeStep);
 	
 	void	integrateTransforms(btScalar timeStep);
@@ -43,16 +48,24 @@ public:
 
 
 	///this btSimpleDynamicsWorld constructor creates dispatcher, broadphase pairCache and constraintSolver
-	btSimpleDynamicsWorld(btDispatcher* dispatcher,btBroadphaseInterface* pairCache,btConstraintSolver* constraintSolver,btCollisionConfiguration* collisionConfiguration);
+	btSimpleDynamicsWorld(btDispatcher* dispatcher,btOverlappingPairCache* pairCache,btConstraintSolver* constraintSolver);
 
 	virtual ~btSimpleDynamicsWorld();
 		
 	///maxSubSteps/fixedTimeStep for interpolation is currently ignored for btSimpleDynamicsWorld, use btDiscreteDynamicsWorld instead
 	virtual int	stepSimulation( btScalar timeStep,int maxSubSteps=1, btScalar fixedTimeStep=btScalar(1.)/btScalar(60.));
 
-	virtual void	setGravity(const btVector3& gravity);
+	virtual void	setDebugDrawer(btIDebugDraw*	debugDrawer) 
+	{
+		m_debugDrawer = debugDrawer;
+	};
 
-	virtual btVector3 getGravity () const;
+	virtual btIDebugDraw*	getDebugDrawer()
+	{
+		return m_debugDrawer;
+	}
+
+	virtual void	setGravity(const btVector3& gravity);
 
 	virtual void	addRigidBody(btRigidBody* body);
 
@@ -64,15 +77,6 @@ public:
 
 	virtual void	setConstraintSolver(btConstraintSolver* solver);
 
-	virtual btConstraintSolver* getConstraintSolver();
-
-	virtual btDynamicsWorldType	getWorldType() const
-	{
-		return BT_SIMPLE_DYNAMICS_WORLD;
-	}
-
-	virtual void	clearForces();
-
 };
 
 #endif //BT_SIMPLE_DYNAMICS_WORLD_H
diff --git a/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.cpp b/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.cpp
index fe65245c2a1..d53de7f3687 100644
--- a/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.cpp
+++ b/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.cpp
@@ -23,11 +23,12 @@
 
 #include "BulletDynamics/ConstraintSolver/btContactConstraint.h"
 
+
+
 static btRigidBody s_fixedObject( 0,0,0);
 
 btRaycastVehicle::btRaycastVehicle(const btVehicleTuning& tuning,btRigidBody* chassis,	btVehicleRaycaster* raycaster )
-: btTypedConstraint(VEHICLE_CONSTRAINT_TYPE),
-m_vehicleRaycaster(raycaster),
+:m_vehicleRaycaster(raycaster),
 m_pitchControl(btScalar(0.))
 {
 	m_chassisBody = chassis;
@@ -486,7 +487,6 @@ struct btWheelContactPoint
 
 };
 
-btScalar calcRollingFriction(btWheelContactPoint& contactPoint);
 btScalar calcRollingFriction(btWheelContactPoint& contactPoint)
 {
 
@@ -507,8 +507,8 @@ btScalar calcRollingFriction(btWheelContactPoint& contactPoint)
 
 	// calculate j that moves us to zero relative velocity
 	j1 = -vrel * contactPoint.m_jacDiagABInv;
-	btSetMin(j1, maxImpulse);
-	btSetMax(j1, -maxImpulse);
+	GEN_set_min(j1, maxImpulse);
+	GEN_set_max(j1, -maxImpulse);
 
 	return j1;
 }
@@ -525,10 +525,11 @@ void	btRaycastVehicle::updateFriction(btScalar	timeStep)
 		if (!numWheel)
 			return;
 
-		m_forwardWS.resize(numWheel);
-		m_axle.resize(numWheel);
-		m_forwardImpulse.resize(numWheel);
-		m_sideImpulse.resize(numWheel);
+
+		btVector3*	forwardWS = new	btVector3[numWheel];
+		btVector3*	axle = new btVector3[numWheel];
+		btScalar* forwardImpulse = new btScalar[numWheel];
+		btScalar* sideImpulse = new btScalar[numWheel];
 		
 		int numWheelsOnGround = 0;
 	
@@ -540,8 +541,8 @@ void	btRaycastVehicle::updateFriction(btScalar	timeStep)
 			class btRigidBody* groundObject = (class btRigidBody*) wheelInfo.m_raycastInfo.m_groundObject;
 			if (groundObject)
 				numWheelsOnGround++;
-			m_sideImpulse[i] = btScalar(0.);
-			m_forwardImpulse[i] = btScalar(0.);
+			sideImpulse[i] = btScalar(0.);
+			forwardImpulse[i] = btScalar(0.);
 
 		}
 	
@@ -560,25 +561,25 @@ void	btRaycastVehicle::updateFriction(btScalar	timeStep)
 					const btTransform& wheelTrans = getWheelTransformWS( i );
 
 					btMatrix3x3 wheelBasis0 = wheelTrans.getBasis();
-					m_axle[i] = btVector3(	
+					axle[i] = btVector3(	
 						wheelBasis0[0][m_indexRightAxis],
 						wheelBasis0[1][m_indexRightAxis],
 						wheelBasis0[2][m_indexRightAxis]);
 					
 					const btVector3& surfNormalWS = wheelInfo.m_raycastInfo.m_contactNormalWS;
-					btScalar proj = m_axle[i].dot(surfNormalWS);
-					m_axle[i] -= surfNormalWS * proj;
-					m_axle[i] = m_axle[i].normalize();
+					btScalar proj = axle[i].dot(surfNormalWS);
+					axle[i] -= surfNormalWS * proj;
+					axle[i] = axle[i].normalize();
 					
-					m_forwardWS[i] = surfNormalWS.cross(m_axle[i]);
-					m_forwardWS[i].normalize();
+					forwardWS[i] = surfNormalWS.cross(axle[i]);
+					forwardWS[i].normalize();
 
 				
 					resolveSingleBilateral(*m_chassisBody, wheelInfo.m_raycastInfo.m_contactPointWS,
 							  *groundObject, wheelInfo.m_raycastInfo.m_contactPointWS,
-							  btScalar(0.), m_axle[i],m_sideImpulse[i],timeStep);
+							  btScalar(0.), axle[i],sideImpulse[i],timeStep);
 
-					m_sideImpulse[i] *= sideFrictionStiffness2;
+					sideImpulse[i] *= sideFrictionStiffness2;
 						
 				}
 				
@@ -607,7 +608,7 @@ void	btRaycastVehicle::updateFriction(btScalar	timeStep)
 				{
 					btScalar defaultRollingFrictionImpulse = 0.f;
 					btScalar maxImpulse = wheelInfo.m_brake ? wheelInfo.m_brake : defaultRollingFrictionImpulse;
-					btWheelContactPoint contactPt(m_chassisBody,groundObject,wheelInfo.m_raycastInfo.m_contactPointWS,m_forwardWS[wheel],maxImpulse);
+					btWheelContactPoint contactPt(m_chassisBody,groundObject,wheelInfo.m_raycastInfo.m_contactPointWS,forwardWS[wheel],maxImpulse);
 					rollingFriction = calcRollingFriction(contactPt);
 				}
 			}
@@ -617,7 +618,7 @@ void	btRaycastVehicle::updateFriction(btScalar	timeStep)
 
 
 
-			m_forwardImpulse[wheel] = btScalar(0.);
+			forwardImpulse[wheel] = btScalar(0.);
 			m_wheelInfo[wheel].m_skidInfo= btScalar(1.);
 
 			if (groundObject)
@@ -630,10 +631,10 @@ void	btRaycastVehicle::updateFriction(btScalar	timeStep)
 				btScalar maximpSquared = maximp * maximpSide;
 			
 
-				m_forwardImpulse[wheel] = rollingFriction;//wheelInfo.m_engineForce* timeStep;
+				forwardImpulse[wheel] = rollingFriction;//wheelInfo.m_engineForce* timeStep;
 
-				btScalar x = (m_forwardImpulse[wheel] ) * fwdFactor;
-				btScalar y = (m_sideImpulse[wheel] ) * sideFactor;
+				btScalar x = (forwardImpulse[wheel] ) * fwdFactor;
+				btScalar y = (sideImpulse[wheel] ) * sideFactor;
 				
 				btScalar impulseSquared = (x*x + y*y);
 
@@ -657,12 +658,12 @@ void	btRaycastVehicle::updateFriction(btScalar	timeStep)
 		{
 			for (int wheel = 0;wheel < getNumWheels(); wheel++)
 			{
-				if (m_sideImpulse[wheel] != btScalar(0.))
+				if (sideImpulse[wheel] != btScalar(0.))
 				{
 					if (m_wheelInfo[wheel].m_skidInfo< btScalar(1.))
 					{
-						m_forwardImpulse[wheel] *=	m_wheelInfo[wheel].m_skidInfo;
-						m_sideImpulse[wheel] *= m_wheelInfo[wheel].m_skidInfo;
+						forwardImpulse[wheel] *=	m_wheelInfo[wheel].m_skidInfo;
+						sideImpulse[wheel] *= m_wheelInfo[wheel].m_skidInfo;
 					}
 				}
 			}
@@ -677,11 +678,11 @@ void	btRaycastVehicle::updateFriction(btScalar	timeStep)
 				btVector3 rel_pos = wheelInfo.m_raycastInfo.m_contactPointWS - 
 						m_chassisBody->getCenterOfMassPosition();
 
-				if (m_forwardImpulse[wheel] != btScalar(0.))
+				if (forwardImpulse[wheel] != btScalar(0.))
 				{
-					m_chassisBody->applyImpulse(m_forwardWS[wheel]*(m_forwardImpulse[wheel]),rel_pos);
+					m_chassisBody->applyImpulse(forwardWS[wheel]*(forwardImpulse[wheel]),rel_pos);
 				}
-				if (m_sideImpulse[wheel] != btScalar(0.))
+				if (sideImpulse[wheel] != btScalar(0.))
 				{
 					class btRigidBody* groundObject = (class btRigidBody*) m_wheelInfo[wheel].m_raycastInfo.m_groundObject;
 
@@ -689,7 +690,7 @@ void	btRaycastVehicle::updateFriction(btScalar	timeStep)
 						groundObject->getCenterOfMassPosition();
 
 					
-					btVector3 sideImp = m_axle[wheel] * m_sideImpulse[wheel];
+					btVector3 sideImp = axle[wheel] * sideImpulse[wheel];
 
 					rel_pos[2] *= wheelInfo.m_rollInfluence;
 					m_chassisBody->applyImpulse(sideImp,rel_pos);
@@ -700,7 +701,10 @@ void	btRaycastVehicle::updateFriction(btScalar	timeStep)
 			}
 		}
 
-	
+		delete []forwardWS;
+		delete [] axle;
+		delete[]forwardImpulse;
+		delete[] sideImpulse;
 }
 
 
@@ -712,11 +716,11 @@ void* btDefaultVehicleRaycaster::castRay(const btVector3& from,const btVector3&
 
 	m_dynamicsWorld->rayTest(from, to, rayCallback);
 
-	if (rayCallback.hasHit())
+	if (rayCallback.HasHit())
 	{
 		
 		btRigidBody* body = btRigidBody::upcast(rayCallback.m_collisionObject);
-        if (body && body->hasContactResponse())
+		if (body)
 		{
 			result.m_hitPointInWorld = rayCallback.m_hitPointWorld;
 			result.m_hitNormalInWorld = rayCallback.m_hitNormalWorld;
diff --git a/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.h b/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.h
index 8361dcabe4b..f4249599615 100644
--- a/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.h
+++ b/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.h
@@ -11,11 +11,11 @@
 #ifndef RAYCASTVEHICLE_H
 #define RAYCASTVEHICLE_H
 
-#include "BulletDynamics/Dynamics/btRigidBody.h"
-#include "BulletDynamics/ConstraintSolver/btTypedConstraint.h"
+#include "../Dynamics/btRigidBody.h"
+#include "../ConstraintSolver/btTypedConstraint.h"
 #include "btVehicleRaycaster.h"
 class btDynamicsWorld;
-#include "LinearMath/btAlignedObjectArray.h"
+#include "../../LinearMath/btAlignedObjectArray.h"
 #include "btWheelInfo.h"
 
 class btVehicleTuning;
@@ -23,12 +23,6 @@ class btVehicleTuning;
 ///rayCast vehicle, very special constraint that turn a rigidbody into a vehicle.
 class btRaycastVehicle : public btTypedConstraint
 {
-
-		btAlignedObjectArray<btVector3>	m_forwardWS;
-		btAlignedObjectArray<btVector3>	m_axle;
-		btAlignedObjectArray<btScalar>	m_forwardImpulse;
-		btAlignedObjectArray<btScalar>	m_sideImpulse;
-
 public:
 	class btVehicleTuning
 		{
@@ -120,7 +114,7 @@ public:
 	
 	void	updateSuspension(btScalar deltaTime);
 
-	virtual void	updateFriction(btScalar	timeStep);
+	void	updateFriction(btScalar	timeStep);
 
 
 
diff --git a/extern/bullet2/src/BulletDynamics/Vehicle/btVehicleRaycaster.h b/extern/bullet2/src/BulletDynamics/Vehicle/btVehicleRaycaster.h
index 5112ce6d420..64a47fcaada 100644
--- a/extern/bullet2/src/BulletDynamics/Vehicle/btVehicleRaycaster.h
+++ b/extern/bullet2/src/BulletDynamics/Vehicle/btVehicleRaycaster.h
@@ -11,7 +11,7 @@
 #ifndef VEHICLE_RAYCASTER_H
 #define VEHICLE_RAYCASTER_H
 
-#include "LinearMath/btVector3.h"
+#include "../../LinearMath/btVector3.h"
 
 /// btVehicleRaycaster is provides interface for between vehicle simulation and raycasting
 struct btVehicleRaycaster
diff --git a/extern/bullet2/src/BulletDynamics/Vehicle/btWheelInfo.h b/extern/bullet2/src/BulletDynamics/Vehicle/btWheelInfo.h
index ac2729f4fd7..2e349b3fde4 100644
--- a/extern/bullet2/src/BulletDynamics/Vehicle/btWheelInfo.h
+++ b/extern/bullet2/src/BulletDynamics/Vehicle/btWheelInfo.h
@@ -11,8 +11,8 @@
 #ifndef WHEEL_INFO_H
 #define WHEEL_INFO_H
 
-#include "LinearMath/btVector3.h"
-#include "LinearMath/btTransform.h"
+#include "../../LinearMath/btVector3.h"
+#include "../../LinearMath/btTransform.h"
 
 class btRigidBody;
 
diff --git a/extern/bullet2/src/BulletSoftBody/CMakeLists.txt b/extern/bullet2/src/BulletSoftBody/CMakeLists.txt
deleted file mode 100644
index a725e10ff77..00000000000
--- a/extern/bullet2/src/BulletSoftBody/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-
-INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src }
-)
-
-ADD_LIBRARY(LibBulletSoftBody
-	btSoftBody.cpp
-	btSoftBody.h
-	btSoftBodyHelpers.cpp
-	btSparseSDF.h
-	btSoftBodyHelpers.h
-	btSoftBodyRigidBodyCollisionConfiguration.cpp
-	btSoftRigidCollisionAlgorithm.cpp
-	btSoftRigidCollisionAlgorithm.h
-	btSoftSoftCollisionAlgorithm.cpp
-	btSoftSoftCollisionAlgorithm.h
-	btSoftBodyConcaveCollisionAlgorithm.cpp
-	btSoftBodyConcaveCollisionAlgorithm.h
-	btSoftRigidDynamicsWorld.h
-	btSoftRigidDynamicsWorld.cpp
-)
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp b/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
deleted file mode 100644
index dfb48e2ff2d..00000000000
--- a/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
+++ /dev/null
@@ -1,2590 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it freely,
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-///btSoftBody implementation by Nathanael Presson
-
-#include "btSoftBodyInternals.h"
-
-//
-btSoftBody::btSoftBody(btSoftBodyWorldInfo*	worldInfo,int node_count,  const btVector3* x,  const btScalar* m)
-:m_worldInfo(worldInfo)
-{	
-	/* Init		*/ 
-	m_internalType		=	CO_SOFT_BODY;
-	m_cfg.aeromodel		=	eAeroModel::V_Point;
-	m_cfg.kVCF			=	1;
-	m_cfg.kDG			=	0;
-	m_cfg.kLF			=	0;
-	m_cfg.kDP			=	0;
-	m_cfg.kPR			=	0;
-	m_cfg.kVC			=	0;
-	m_cfg.kDF			=	(btScalar)0.2;
-	m_cfg.kMT			=	0;
-	m_cfg.kCHR			=	(btScalar)1.0;
-	m_cfg.kKHR			=	(btScalar)0.1;
-	m_cfg.kSHR			=	(btScalar)1.0;
-	m_cfg.kAHR			=	(btScalar)0.7;
-	m_cfg.kSRHR_CL		=	(btScalar)0.1;
-	m_cfg.kSKHR_CL		=	(btScalar)1;
-	m_cfg.kSSHR_CL		=	(btScalar)0.5;
-	m_cfg.kSR_SPLT_CL	=	(btScalar)0.5;
-	m_cfg.kSK_SPLT_CL	=	(btScalar)0.5;
-	m_cfg.kSS_SPLT_CL	=	(btScalar)0.5;
-	m_cfg.maxvolume		=	(btScalar)1;
-	m_cfg.timescale		=	1;
-	m_cfg.viterations	=	0;
-	m_cfg.piterations	=	1;	
-	m_cfg.diterations	=	0;
-	m_cfg.citerations	=	4;
-	m_cfg.collisions	=	fCollision::Default;
-	m_pose.m_bvolume	=	false;
-	m_pose.m_bframe		=	false;
-	m_pose.m_volume		=	0;
-	m_pose.m_com		=	btVector3(0,0,0);
-	m_pose.m_rot.setIdentity();
-	m_pose.m_scl.setIdentity();
-	m_tag				=	0;
-	m_timeacc			=	0;
-	m_bUpdateRtCst		=	true;
-	m_bounds[0]			=	btVector3(0,0,0);
-	m_bounds[1]			=	btVector3(0,0,0);
-	m_worldTransform.setIdentity();
-	setSolver(eSolverPresets::Positions);
-	/* Default material	*/ 
-	Material*	pm=appendMaterial();
-	pm->m_kLST	=	1;
-	pm->m_kAST	=	1;
-	pm->m_kVST	=	1;
-	pm->m_flags	=	fMaterial::Default;
-	/* Collision shape	*/ 
-	///for now, create a collision shape internally
-	setCollisionShape(new btSoftBodyCollisionShape(this));	
-	m_collisionShape->setMargin(0.25);
-	/* Nodes			*/ 
-	const btScalar		margin=getCollisionShape()->getMargin();
-	m_nodes.resize(node_count);
-	for(int i=0,ni=node_count;i<ni;++i)
-	{	
-		Node&	n=m_nodes[i];
-		ZeroInitialize(n);
-		n.m_x		=	x?*x++:btVector3(0,0,0);
-		n.m_q		=	n.m_x;
-		n.m_im		=	m?*m++:1;
-		n.m_im		=	n.m_im>0?1/n.m_im:0;
-		n.m_leaf	=	m_ndbvt.insert(btDbvtVolume::FromCR(n.m_x,margin),&n);
-		n.m_material=	pm;
-	}
-	updateBounds();	
-
-
-}
-
-//
-btSoftBody::~btSoftBody()
-{
-	//for now, delete the internal shape
-	delete m_collisionShape;	
-	int i;
-
-	for(i=0;i<m_clusters.size();++i)
-		btAlignedFree(m_clusters[i]);
-	for(i=0;i<m_materials.size();++i) 
-		btAlignedFree(m_materials[i]);
-	for(i=0;i<m_joints.size();++i) 
-		btAlignedFree(m_joints[i]);
-}
-
-//
-bool			btSoftBody::checkLink(int node0,int node1) const
-{
-	return(checkLink(&m_nodes[node0],&m_nodes[node1]));
-}
-
-//
-bool			btSoftBody::checkLink(const Node* node0,const Node* node1) const
-{
-	const Node*	n[]={node0,node1};
-	for(int i=0,ni=m_links.size();i<ni;++i)
-	{
-		const Link&	l=m_links[i];
-		if(	(l.m_n[0]==n[0]&&l.m_n[1]==n[1])||
-			(l.m_n[0]==n[1]&&l.m_n[1]==n[0]))
-		{
-			return(true);
-		}
-	}
-	return(false);
-}
-
-//
-bool			btSoftBody::checkFace(int node0,int node1,int node2) const
-{
-	const Node*	n[]={	&m_nodes[node0],
-		&m_nodes[node1],
-		&m_nodes[node2]};
-	for(int i=0,ni=m_faces.size();i<ni;++i)
-	{
-		const Face&	f=m_faces[i];
-		int			c=0;
-		for(int j=0;j<3;++j)
-		{
-			if(	(f.m_n[j]==n[0])||
-				(f.m_n[j]==n[1])||
-				(f.m_n[j]==n[2])) c|=1<<j; else break;
-		}
-		if(c==7) return(true);
-	}
-	return(false);
-}
-
-//
-btSoftBody::Material*		btSoftBody::appendMaterial()
-{
-Material*	pm=new(btAlignedAlloc(sizeof(Material),16)) Material();
-if(m_materials.size()>0)
-	*pm=*m_materials[0];
-	else
-	ZeroInitialize(*pm);
-m_materials.push_back(pm);
-return(pm);
-}
-
-//
-void			btSoftBody::appendNote(	const char* text,
-										const btVector3& o,
-										const btVector4& c,
-										Node* n0,
-										Node* n1,
-										Node* n2,
-										Node* n3)
-{
-Note	n;
-ZeroInitialize(n);
-n.m_rank		=	0;
-n.m_text		=	text;
-n.m_offset		=	o;
-n.m_coords[0]	=	c.x();
-n.m_coords[1]	=	c.y();
-n.m_coords[2]	=	c.z();
-n.m_coords[3]	=	c.w();
-n.m_nodes[0]	=	n0;n.m_rank+=n0?1:0;
-n.m_nodes[1]	=	n1;n.m_rank+=n1?1:0;
-n.m_nodes[2]	=	n2;n.m_rank+=n2?1:0;
-n.m_nodes[3]	=	n3;n.m_rank+=n3?1:0;
-m_notes.push_back(n);
-}
-
-//
-void			btSoftBody::appendNote(	const char* text,
-										const btVector3& o,
-										Node* feature)
-{
-appendNote(text,o,btVector4(1,0,0,0),feature);
-}
-
-//
-void			btSoftBody::appendNote(	const char* text,
-										const btVector3& o,
-										Link* feature)
-{
-static const btScalar	w=1/(btScalar)2;
-appendNote(text,o,btVector4(w,w,0,0),	feature->m_n[0],
-										feature->m_n[1]);
-}
-								
-//
-void			btSoftBody::appendNote(	const char* text,
-										const btVector3& o,
-										Face* feature)
-{
-static const btScalar	w=1/(btScalar)3;
-appendNote(text,o,btVector4(w,w,w,0),	feature->m_n[0],
-										feature->m_n[1],
-										feature->m_n[2]);
-}
-
-//
-void			btSoftBody::appendNode(	const btVector3& x,btScalar m)
-{
-if(m_nodes.capacity()==m_nodes.size())
-	{
-	pointersToIndices();
-	m_nodes.reserve(m_nodes.size()*2+1);
-	indicesToPointers();
-	}
-const btScalar	margin=getCollisionShape()->getMargin();
-m_nodes.push_back(Node());
-Node&			n=m_nodes[m_nodes.size()-1];
-ZeroInitialize(n);
-n.m_x			=	x;
-n.m_q			=	n.m_x;
-n.m_im			=	m>0?1/m:0;
-n.m_material	=	m_materials[0];
-n.m_leaf		=	m_ndbvt.insert(btDbvtVolume::FromCR(n.m_x,margin),&n);
-}
-
-//
-void			btSoftBody::appendLink(int model,Material* mat)
-{
-Link	l;
-if(model>=0)
-	l=m_links[model];
-	else
-	{ ZeroInitialize(l);l.m_material=mat?mat:m_materials[0]; }
-m_links.push_back(l);
-}
-
-//
-void			btSoftBody::appendLink(	int node0,
-									   int node1,
-									   Material* mat,
-									   bool bcheckexist)
-{
-	appendLink(&m_nodes[node0],&m_nodes[node1],mat,bcheckexist);
-}
-
-//
-void			btSoftBody::appendLink(	Node* node0,
-									   Node* node1,
-									   Material* mat,
-									   bool bcheckexist)
-{
-	if((!bcheckexist)||(!checkLink(node0,node1)))
-	{
-		appendLink(-1,mat);
-		Link&	l=m_links[m_links.size()-1];
-		l.m_n[0]		=	node0;
-		l.m_n[1]		=	node1;
-		l.m_rl			=	(l.m_n[0]->m_x-l.m_n[1]->m_x).length();
-		m_bUpdateRtCst=true;
-	}
-}
-
-//
-void			btSoftBody::appendFace(int model,Material* mat)
-{
-Face	f;
-if(model>=0)
-	{ f=m_faces[model]; }
-	else
-	{ ZeroInitialize(f);f.m_material=mat?mat:m_materials[0]; }
-m_faces.push_back(f);
-}
-
-//
-void			btSoftBody::appendFace(int node0,int node1,int node2,Material* mat)
-{
-	appendFace(-1,mat);
-	Face&	f=m_faces[m_faces.size()-1];
-	btAssert(node0!=node1);
-	btAssert(node1!=node2);
-	btAssert(node2!=node0);
-	f.m_n[0]	=	&m_nodes[node0];
-	f.m_n[1]	=	&m_nodes[node1];
-	f.m_n[2]	=	&m_nodes[node2];
-	f.m_ra		=	AreaOf(	f.m_n[0]->m_x,
-		f.m_n[1]->m_x,
-		f.m_n[2]->m_x);	
-	m_bUpdateRtCst=true;
-}
-
-//
-void			btSoftBody::appendAnchor(int node,btRigidBody* body)
-{
-	Anchor	a;
-	a.m_node			=	&m_nodes[node];
-	a.m_body			=	body;
-	a.m_local			=	body->getInterpolationWorldTransform().inverse()*a.m_node->m_x;
-	a.m_node->m_battach	=	1;
-	m_anchors.push_back(a);
-}
-
-//
-void			btSoftBody::appendLinearJoint(const LJoint::Specs& specs,Cluster* body0,Body body1)
-{
-LJoint*		pj	=	new(btAlignedAlloc(sizeof(LJoint),16)) LJoint();
-pj->m_bodies[0]	=	body0;
-pj->m_bodies[1]	=	body1;
-pj->m_refs[0]	=	pj->m_bodies[0].xform().inverse()*specs.position;
-pj->m_refs[1]	=	pj->m_bodies[1].xform().inverse()*specs.position;
-pj->m_cfm		=	specs.cfm;
-pj->m_erp		=	specs.erp;
-pj->m_split		=	specs.split;
-m_joints.push_back(pj);
-}
-
-//
-void			btSoftBody::appendLinearJoint(const LJoint::Specs& specs,Body body)
-{
-appendLinearJoint(specs,m_clusters[0],body);
-}
-
-//
-void			btSoftBody::appendLinearJoint(const LJoint::Specs& specs,btSoftBody* body)
-{
-appendLinearJoint(specs,m_clusters[0],body->m_clusters[0]);
-}
-
-//
-void			btSoftBody::appendAngularJoint(const AJoint::Specs& specs,Cluster* body0,Body body1)
-{
-AJoint*		pj	=	new(btAlignedAlloc(sizeof(AJoint),16)) AJoint();
-pj->m_bodies[0]	=	body0;
-pj->m_bodies[1]	=	body1;
-pj->m_refs[0]	=	pj->m_bodies[0].xform().inverse().getBasis()*specs.axis;
-pj->m_refs[1]	=	pj->m_bodies[1].xform().inverse().getBasis()*specs.axis;
-pj->m_cfm		=	specs.cfm;
-pj->m_erp		=	specs.erp;
-pj->m_split		=	specs.split;
-pj->m_icontrol	=	specs.icontrol;
-m_joints.push_back(pj);
-}
-
-//
-void			btSoftBody::appendAngularJoint(const AJoint::Specs& specs,Body body)
-{
-appendAngularJoint(specs,m_clusters[0],body);
-}
-
-//
-void			btSoftBody::appendAngularJoint(const AJoint::Specs& specs,btSoftBody* body)
-{
-appendAngularJoint(specs,m_clusters[0],body->m_clusters[0]);
-}
-
-//
-void			btSoftBody::addForce(const btVector3& force)
-{
-	for(int i=0,ni=m_nodes.size();i<ni;++i) addForce(force,i);
-}
-
-//
-void			btSoftBody::addForce(const btVector3& force,int node)
-{
-	Node&	n=m_nodes[node];
-	if(n.m_im>0)
-	{
-		n.m_f	+=	force;
-	}
-}
-
-//
-void			btSoftBody::addVelocity(const btVector3& velocity)
-{
-	for(int i=0,ni=m_nodes.size();i<ni;++i) addVelocity(velocity,i);
-}
-
-//
-void			btSoftBody::addVelocity(const btVector3& velocity,int node)
-{
-	Node&	n=m_nodes[node];
-	if(n.m_im>0)
-	{
-		n.m_v	+=	velocity;
-	}
-}
-
-//
-void			btSoftBody::setMass(int node,btScalar mass)
-{
-	m_nodes[node].m_im=mass>0?1/mass:0;
-	m_bUpdateRtCst=true;
-}
-
-//
-btScalar		btSoftBody::getMass(int node) const
-{
-	return(m_nodes[node].m_im>0?1/m_nodes[node].m_im:0);
-}
-
-//
-btScalar		btSoftBody::getTotalMass() const
-{
-	btScalar	mass=0;
-	for(int i=0;i<m_nodes.size();++i)
-	{
-		mass+=getMass(i);
-	}
-	return(mass);
-}
-
-//
-void			btSoftBody::setTotalMass(btScalar mass,bool fromfaces)
-{
-	int i;
-
-	if(fromfaces)
-	{
-
-		for(i=0;i<m_nodes.size();++i)
-		{
-			m_nodes[i].m_im=0;
-		}
-		for(i=0;i<m_faces.size();++i)
-		{
-			const Face&		f=m_faces[i];
-			const btScalar	twicearea=AreaOf(	f.m_n[0]->m_x,
-												f.m_n[1]->m_x,
-												f.m_n[2]->m_x);
-			for(int j=0;j<3;++j)
-			{
-				f.m_n[j]->m_im+=twicearea;
-			}
-		}
-		for( i=0;i<m_nodes.size();++i)
-		{
-			m_nodes[i].m_im=1/m_nodes[i].m_im;
-		}
-	}
-	const btScalar	tm=getTotalMass();
-	const btScalar	itm=1/tm;
-	for( i=0;i<m_nodes.size();++i)
-	{
-		m_nodes[i].m_im/=itm*mass;
-	}
-	m_bUpdateRtCst=true;
-}
-
-//
-void			btSoftBody::setTotalDensity(btScalar density)
-{
-	setTotalMass(getVolume()*density,true);
-}
-
-//
-void			btSoftBody::transform(const btTransform& trs)
-{
-	const btScalar	margin=getCollisionShape()->getMargin();
-	for(int i=0,ni=m_nodes.size();i<ni;++i)
-	{
-		Node&	n=m_nodes[i];
-		n.m_x=trs*n.m_x;
-		n.m_q=trs*n.m_q;
-		n.m_n=trs.getBasis()*n.m_n;
-		m_ndbvt.update(n.m_leaf,btDbvtVolume::FromCR(n.m_x,margin));
-	}
-	updateNormals();
-	updateBounds();
-	updateConstants();
-}
-
-//
-void			btSoftBody::translate(const btVector3& trs)
-{
-btTransform	t;
-t.setIdentity();
-t.setOrigin(trs);
-transform(t);
-}
-
-//
-void			btSoftBody::rotate(	const btQuaternion& rot)
-{
-btTransform	t;
-t.setIdentity();
-t.setRotation(rot);
-transform(t);
-}
-
-//
-void			btSoftBody::scale(const btVector3& scl)
-{
-	const btScalar	margin=getCollisionShape()->getMargin();
-	for(int i=0,ni=m_nodes.size();i<ni;++i)
-	{
-		Node&	n=m_nodes[i];
-		n.m_x*=scl;
-		n.m_q*=scl;
-		m_ndbvt.update(n.m_leaf,btDbvtVolume::FromCR(n.m_x,margin));
-	}
-	updateNormals();
-	updateBounds();
-	updateConstants();
-}
-
-//
-void			btSoftBody::setPose(bool bvolume,bool bframe)
-{
-	m_pose.m_bvolume	=	bvolume;
-	m_pose.m_bframe		=	bframe;
-	int i,ni;
-
-	/* Weights		*/ 
-	const btScalar	omass=getTotalMass();
-	const btScalar	kmass=omass*m_nodes.size()*1000;
-	btScalar		tmass=omass;
-	m_pose.m_wgh.resize(m_nodes.size());
-	for(i=0,ni=m_nodes.size();i<ni;++i)
-	{
-		if(m_nodes[i].m_im<=0) tmass+=kmass;
-	}
-	for( i=0,ni=m_nodes.size();i<ni;++i)
-	{
-		Node&	n=m_nodes[i];
-		m_pose.m_wgh[i]=	n.m_im>0					?
-							1/(m_nodes[i].m_im*tmass)	:
-							kmass/tmass;
-	}
-	/* Pos		*/ 
-	const btVector3	com=evaluateCom();
-	m_pose.m_pos.resize(m_nodes.size());
-	for( i=0,ni=m_nodes.size();i<ni;++i)
-	{
-		m_pose.m_pos[i]=m_nodes[i].m_x-com;
-	}
-	m_pose.m_volume	=	bvolume?getVolume():0;
-	m_pose.m_com	=	com;
-	m_pose.m_rot.setIdentity();
-	m_pose.m_scl.setIdentity();
-	/* Aqq		*/ 
-	m_pose.m_aqq[0]	=
-	m_pose.m_aqq[1]	=
-	m_pose.m_aqq[2]	=	btVector3(0,0,0);
-	for( i=0,ni=m_nodes.size();i<ni;++i)
-		{
-		const btVector3&	q=m_pose.m_pos[i];
-		const btVector3		mq=m_pose.m_wgh[i]*q;
-		m_pose.m_aqq[0]+=mq.x()*q;
-		m_pose.m_aqq[1]+=mq.y()*q;
-		m_pose.m_aqq[2]+=mq.z()*q;
-		}
-	m_pose.m_aqq=m_pose.m_aqq.inverse();
-	updateConstants();
-}
-
-//
-btScalar		btSoftBody::getVolume() const
-{
-	btScalar	vol=0;
-	if(m_nodes.size()>0)
-	{
-		int i,ni;
-
-		const btVector3	org=m_nodes[0].m_x;
-		for(i=0,ni=m_faces.size();i<ni;++i)
-		{
-			const Face&	f=m_faces[i];
-			vol+=dot(f.m_n[0]->m_x-org,cross(f.m_n[1]->m_x-org,f.m_n[2]->m_x-org));
-		}
-		vol/=(btScalar)6;
-	}
-	return(vol);
-}
-
-//
-int				btSoftBody::clusterCount() const
-{
-return(m_clusters.size());
-}
-
-//
-btVector3		btSoftBody::clusterCom(const Cluster* cluster)
-{
-btVector3		com(0,0,0);
-for(int i=0,ni=cluster->m_nodes.size();i<ni;++i)
-	{
-	com+=cluster->m_nodes[i]->m_x*cluster->m_masses[i];
-	}
-return(com*cluster->m_imass);
-}
-
-//
-btVector3		btSoftBody::clusterCom(int cluster) const
-{
-return(clusterCom(m_clusters[cluster]));
-}
-
-//
-btVector3		btSoftBody::clusterVelocity(const Cluster* cluster,const btVector3& rpos)
-{
-return(cluster->m_lv+cross(cluster->m_av,rpos));
-}
-
-//
-void			btSoftBody::clusterVImpulse(Cluster* cluster,const btVector3& rpos,const btVector3& impulse)
-{
-const btVector3	li=cluster->m_imass*impulse;
-const btVector3	ai=cluster->m_invwi*cross(rpos,impulse);
-cluster->m_vimpulses[0]+=li;cluster->m_lv+=li;
-cluster->m_vimpulses[1]+=ai;cluster->m_av+=ai;
-cluster->m_nvimpulses++;
-}
-
-//
-void			btSoftBody::clusterDImpulse(Cluster* cluster,const btVector3& rpos,const btVector3& impulse)
-{
-const btVector3	li=cluster->m_imass*impulse;
-const btVector3	ai=cluster->m_invwi*cross(rpos,impulse);
-cluster->m_dimpulses[0]+=li;
-cluster->m_dimpulses[1]+=ai;
-cluster->m_ndimpulses++;
-}
-
-//
-void			btSoftBody::clusterImpulse(Cluster* cluster,const btVector3& rpos,const Impulse& impulse)
-{
-if(impulse.m_asVelocity)	clusterVImpulse(cluster,rpos,impulse.m_velocity);
-if(impulse.m_asDrift)		clusterDImpulse(cluster,rpos,impulse.m_drift);
-}
-
-//
-void			btSoftBody::clusterVAImpulse(Cluster* cluster,const btVector3& impulse)
-{
-const btVector3	ai=cluster->m_invwi*impulse;
-cluster->m_vimpulses[1]+=ai;cluster->m_av+=ai;
-cluster->m_nvimpulses++;
-}
-
-//
-void			btSoftBody::clusterDAImpulse(Cluster* cluster,const btVector3& impulse)
-{
-const btVector3	ai=cluster->m_invwi*impulse;
-cluster->m_dimpulses[1]+=ai;
-cluster->m_ndimpulses++;
-}
-
-//
-void			btSoftBody::clusterAImpulse(Cluster* cluster,const Impulse& impulse)
-{
-if(impulse.m_asVelocity)	clusterVAImpulse(cluster,impulse.m_velocity);
-if(impulse.m_asDrift)		clusterDAImpulse(cluster,impulse.m_drift);
-}
-
-//
-void			btSoftBody::clusterDCImpulse(Cluster* cluster,const btVector3& impulse)
-{
-cluster->m_dimpulses[0]+=impulse*cluster->m_imass;
-cluster->m_ndimpulses++;
-}
-
-//
-int				btSoftBody::generateBendingConstraints(int distance,Material* mat)
-{
-	int i,j;
-
-	if(distance>1)
-	{
-		/* Build graph	*/ 
-		const int		n=m_nodes.size();
-		const unsigned	inf=(~(unsigned)0)>>1;
-		unsigned*		adj=new unsigned[n*n];
-#define IDX(_x_,_y_)	((_y_)*n+(_x_))
-		for(j=0;j<n;++j)
-		{
-			for(i=0;i<n;++i)
-			{
-				if(i!=j)	adj[IDX(i,j)]=adj[IDX(j,i)]=inf;
-				else
-					adj[IDX(i,j)]=adj[IDX(j,i)]=0;
-			}
-		}
-		for( i=0;i<m_links.size();++i)
-		{
-			const int	ia=(int)(m_links[i].m_n[0]-&m_nodes[0]);
-			const int	ib=(int)(m_links[i].m_n[1]-&m_nodes[0]);
-			adj[IDX(ia,ib)]=1;
-			adj[IDX(ib,ia)]=1;
-		}
-		for(int k=0;k<n;++k)
-		{
-			for(j=0;j<n;++j)
-			{
-				for(i=j+1;i<n;++i)
-				{
-					const unsigned	sum=adj[IDX(i,k)]+adj[IDX(k,j)];
-					if(adj[IDX(i,j)]>sum)
-					{
-						adj[IDX(i,j)]=adj[IDX(j,i)]=sum;
-					}
-				}
-			}
-		}
-		/* Build links	*/ 
-		int	nlinks=0;
-		for(j=0;j<n;++j)
-		{
-			for(i=j+1;i<n;++i)
-			{
-				if(adj[IDX(i,j)]==(unsigned)distance)
-				{
-					appendLink(i,j,mat);
-					m_links[m_links.size()-1].m_bbending=1;
-					++nlinks;
-				}
-			}
-		}
-		delete[] adj;		
-		return(nlinks);
-	}
-	return(0);
-}
-
-//
-void			btSoftBody::randomizeConstraints()
-{
-unsigned long	seed=243703;
-#define NEXTRAND (seed=(1664525L*seed+1013904223L)&0xffffffff)
-int i,ni;
-
-	for(i=0,ni=m_links.size();i<ni;++i)
-	{
-		btSwap(m_links[i],m_links[NEXTRAND%ni]);
-	}
-	for(i=0,ni=m_faces.size();i<ni;++i)
-	{
-		btSwap(m_faces[i],m_faces[NEXTRAND%ni]);
-	}
-#undef NEXTRAND
-}
-
-//
-int				btSoftBody::generateClusters(int k,int maxiterations)
-{
-	int i;
-
-for(i=0;i<m_clusters.size();++i)
-	{
-	if(m_clusters[i]->m_leaf) m_cdbvt.remove(m_clusters[i]->m_leaf);
-	btAlignedFree(m_clusters[i]);
-	}
-m_clusters.resize(btMin(k,m_nodes.size()));
-
-
-
-for(i=0;i<m_clusters.size();++i)
-	{
-	m_clusters[i]			=	new(btAlignedAlloc(sizeof(Cluster),16)) Cluster();
-	m_clusters[i]->m_collide=	true;
-	}
-k=m_clusters.size();
-if(k>0)
-	{
-	/* Initialize		*/ 
-	btAlignedObjectArray<btVector3>	centers;
-	btVector3						cog(0,0,0);
-	int								i;
-	for(i=0;i<m_nodes.size();++i)
-		{
-		cog+=m_nodes[i].m_x;
-		m_clusters[(i*29873)%m_clusters.size()]->m_nodes.push_back(&m_nodes[i]);
-		}
-	cog/=(btScalar)m_nodes.size();
-	centers.resize(k,cog);
-	/* Iterate			*/ 
-	const btScalar	slope=16;
-	bool			changed;
-	int				iterations=0;
-	do	{
-		const btScalar	w=2-btMin<btScalar>(1,iterations/slope);
-		changed=false;
-		iterations++;	
-		int i;
-
-		for(i=0;i<k;++i)
-			{
-			btVector3	c(0,0,0);
-			for(int j=0;j<m_clusters[i]->m_nodes.size();++j)
-				{
-				c+=m_clusters[i]->m_nodes[j]->m_x;
-				}
-			if(m_clusters[i]->m_nodes.size())
-				{
-				c			/=	(btScalar)m_clusters[i]->m_nodes.size();
-				c			=	centers[i]+(c-centers[i])*w;
-				changed		|=	((c-centers[i]).length2()>SIMD_EPSILON);
-				centers[i]	=	c;
-				m_clusters[i]->m_nodes.resize(0);
-				}			
-			}
-		for(i=0;i<m_nodes.size();++i)
-			{
-			const btVector3	nx=m_nodes[i].m_x;
-			int				kbest=0;
-			btScalar		kdist=ClusterMetric(centers[0],nx);
-			for(int j=1;j<k;++j)
-				{
-				const btScalar	d=ClusterMetric(centers[j],nx);
-				if(d<kdist)
-					{
-					kbest=j;
-					kdist=d;
-					}
-				}
-			m_clusters[kbest]->m_nodes.push_back(&m_nodes[i]);
-			}		
-		} while(changed&&(iterations<maxiterations));
-	/* Merge		*/ 
-	btAlignedObjectArray<int>	cids;
-	cids.resize(m_nodes.size(),-1);
-	for(i=0;i<m_clusters.size();++i)
-		{
-		for(int j=0;j<m_clusters[i]->m_nodes.size();++j)
-			{
-			cids[int(m_clusters[i]->m_nodes[j]-&m_nodes[0])]=i;
-			}
-		}
-	for(i=0;i<m_faces.size();++i)
-		{
-		const int idx[]={	int(m_faces[i].m_n[0]-&m_nodes[0]),
-							int(m_faces[i].m_n[1]-&m_nodes[0]),
-							int(m_faces[i].m_n[2]-&m_nodes[0])};
-		for(int j=0;j<3;++j)
-			{
-			const int cid=cids[idx[j]];
-			for(int q=1;q<3;++q)
-				{
-				const int kid=idx[(j+q)%3];
-				if(cids[kid]!=cid)
-					{
-					if(m_clusters[cid]->m_nodes.findLinearSearch(&m_nodes[kid])==m_clusters[cid]->m_nodes.size())
-						{
-						m_clusters[cid]->m_nodes.push_back(&m_nodes[kid]);
-						}
-					}
-				}
-			}
-		}
-	/* Master		*/ 
-	if(m_clusters.size()>1)
-		{
-		Cluster*	pmaster=new(btAlignedAlloc(sizeof(Cluster),16)) Cluster();
-		pmaster->m_collide	=	false;
-		pmaster->m_nodes.reserve(m_nodes.size());
-		for(int i=0;i<m_nodes.size();++i) pmaster->m_nodes.push_back(&m_nodes[i]);
-		m_clusters.push_back(pmaster);
-		btSwap(m_clusters[0],m_clusters[m_clusters.size()-1]);
-		}
-	/* Terminate	*/ 
-	for(i=0;i<m_clusters.size();++i)
-		{
-		if(m_clusters[i]->m_nodes.size()==0)
-			{
-			btAlignedFree(m_clusters[i]);
-			btSwap(m_clusters[i],m_clusters[m_clusters.size()-1]);
-			m_clusters.pop_back();
-			--i;
-			}
-		}
-		
-	initializeClusters();
-	updateClusters();
-	return(m_clusters.size());
-	}
-return(0);
-}
-
-//
-void			btSoftBody::refine(ImplicitFn* ifn,btScalar accurary,bool cut)
-{
-const Node*			nbase = &m_nodes[0];
-int					ncount = m_nodes.size();
-btSymMatrix<int>	edges(ncount,-2);
-int					newnodes=0;
-int i,j,k,ni;
-
-/* Filter out		*/ 
-for(i=0;i<m_links.size();++i)
-	{
-	Link&	l=m_links[i];
-	if(l.m_bbending)
-		{
-		if(!SameSign(ifn->Eval(l.m_n[0]->m_x),ifn->Eval(l.m_n[1]->m_x)))
-			{
-			btSwap(m_links[i],m_links[m_links.size()-1]);
-			m_links.pop_back();--i;
-			}
-		}	
-	}
-/* Fill edges		*/ 
-for(i=0;i<m_links.size();++i)
-	{
-	Link&	l=m_links[i];
-	edges(int(l.m_n[0]-nbase),int(l.m_n[1]-nbase))=-1;
-	}
-for(i=0;i<m_faces.size();++i)
-	{	
-	Face&	f=m_faces[i];
-	edges(int(f.m_n[0]-nbase),int(f.m_n[1]-nbase))=-1;
-	edges(int(f.m_n[1]-nbase),int(f.m_n[2]-nbase))=-1;
-	edges(int(f.m_n[2]-nbase),int(f.m_n[0]-nbase))=-1;
-	}
-/* Intersect		*/ 
-for(i=0;i<ncount;++i)
-	{
-	for(j=i+1;j<ncount;++j)
-		{
-		if(edges(i,j)==-1)
-			{
-			Node&			a=m_nodes[i];
-			Node&			b=m_nodes[j];
-			const btScalar	t=ImplicitSolve(ifn,a.m_x,b.m_x,accurary);
-			if(t>0)
-				{
-				const btVector3	x=Lerp(a.m_x,b.m_x,t);
-				const btVector3	v=Lerp(a.m_v,b.m_v,t);
-				btScalar		m=0;
-				if(a.m_im>0)
-					{
-					if(b.m_im>0)
-						{
-						const btScalar	ma=1/a.m_im;
-						const btScalar	mb=1/b.m_im;
-						const btScalar	mc=Lerp(ma,mb,t);
-						const btScalar	f=(ma+mb)/(ma+mb+mc);
-						a.m_im=1/(ma*f);
-						b.m_im=1/(mb*f);
-						m=mc*f;
-						}
-						else
-						{ a.m_im/=0.5;m=1/a.m_im; }
-					}
-					else
-					{
-					if(b.m_im>0)
-						{ b.m_im/=0.5;m=1/b.m_im; }
-						else
-						m=0;
-					}
-				appendNode(x,m);
-				edges(i,j)=m_nodes.size()-1;
-				m_nodes[edges(i,j)].m_v=v;
-				++newnodes;
-				}
-			}
-		}
-	}
-nbase=&m_nodes[0];
-/* Refine links		*/ 
-for(i=0,ni=m_links.size();i<ni;++i)
-	{
-	Link&		feat=m_links[i];
-	const int	idx[]={	int(feat.m_n[0]-nbase),
-						int(feat.m_n[1]-nbase)};
-	if((idx[0]<ncount)&&(idx[1]<ncount))
-		{
-		const int ni=edges(idx[0],idx[1]);
-		if(ni>0)
-			{
-			appendLink(i);
-			Link*		pft[]={	&m_links[i],
-								&m_links[m_links.size()-1]};			
-			pft[0]->m_n[0]=&m_nodes[idx[0]];
-			pft[0]->m_n[1]=&m_nodes[ni];
-			pft[1]->m_n[0]=&m_nodes[ni];
-			pft[1]->m_n[1]=&m_nodes[idx[1]];
-			}
-		}
-	}
-/* Refine faces		*/ 
-for(i=0;i<m_faces.size();++i)
-	{
-	const Face&	feat=m_faces[i];
-	const int	idx[]={	int(feat.m_n[0]-nbase),
-						int(feat.m_n[1]-nbase),
-						int(feat.m_n[2]-nbase)};
-	for(j=2,k=0;k<3;j=k++)
-		{
-		if((idx[j]<ncount)&&(idx[k]<ncount))
-			{
-			const int ni=edges(idx[j],idx[k]);
-			if(ni>0)
-				{
-				appendFace(i);
-				const int	l=(k+1)%3;
-				Face*		pft[]={	&m_faces[i],
-									&m_faces[m_faces.size()-1]};
-				pft[0]->m_n[0]=&m_nodes[idx[l]];
-				pft[0]->m_n[1]=&m_nodes[idx[j]];
-				pft[0]->m_n[2]=&m_nodes[ni];
-				pft[1]->m_n[0]=&m_nodes[ni];
-				pft[1]->m_n[1]=&m_nodes[idx[k]];
-				pft[1]->m_n[2]=&m_nodes[idx[l]];
-				appendLink(ni,idx[l],pft[0]->m_material);
-				--i;break;
-				}
-			}
-		}
-	}
-/* Cut				*/ 
-if(cut)
-	{	
-	btAlignedObjectArray<int>	cnodes;
-	const int					pcount=ncount;
-	int							i;
-	ncount=m_nodes.size();
-	cnodes.resize(ncount,0);
-	/* Nodes		*/ 
-	for(i=0;i<ncount;++i)
-		{
-		const btVector3	x=m_nodes[i].m_x;
-		if((i>=pcount)||(btFabs(ifn->Eval(x))<accurary))
-			{
-			const btVector3	v=m_nodes[i].m_v;
-			btScalar		m=getMass(i);
-			if(m>0) { m*=0.5;m_nodes[i].m_im/=0.5; }
-			appendNode(x,m);
-			cnodes[i]=m_nodes.size()-1;
-			m_nodes[cnodes[i]].m_v=v;
-			}
-		}
-	nbase=&m_nodes[0];
-	/* Links		*/ 
-	for(i=0,ni=m_links.size();i<ni;++i)
-		{
-		const int		id[]={	int(m_links[i].m_n[0]-nbase),
-								int(m_links[i].m_n[1]-nbase)};
-		int				todetach=0;
-		if(cnodes[id[0]]&&cnodes[id[1]])
-			{
-			appendLink(i);
-			todetach=m_links.size()-1;
-			}
-		else
-			{
-			if((	(ifn->Eval(m_nodes[id[0]].m_x)<accurary)&&
-					(ifn->Eval(m_nodes[id[1]].m_x)<accurary)))
-				todetach=i;
-			}
-		if(todetach)
-			{
-			Link&	l=m_links[todetach];
-			for(int j=0;j<2;++j)
-				{
-				int cn=cnodes[int(l.m_n[j]-nbase)];
-				if(cn) l.m_n[j]=&m_nodes[cn];
-				}			
-			}
-		}
-	/* Faces		*/ 
-	for(i=0,ni=m_faces.size();i<ni;++i)
-		{
-		Node**			n=	m_faces[i].m_n;
-		if(	(ifn->Eval(n[0]->m_x)<accurary)&&
-			(ifn->Eval(n[1]->m_x)<accurary)&&
-			(ifn->Eval(n[2]->m_x)<accurary))
-			{
-			for(int j=0;j<3;++j)
-				{
-				int cn=cnodes[int(n[j]-nbase)];
-				if(cn) n[j]=&m_nodes[cn];
-				}
-			}
-		}
-	/* Clean orphans	*/ 
-	int							nnodes=m_nodes.size();
-	btAlignedObjectArray<int>	ranks;
-	btAlignedObjectArray<int>	todelete;
-	ranks.resize(nnodes,0);
-	for(i=0,ni=m_links.size();i<ni;++i)
-		{
-		for(int j=0;j<2;++j) ranks[int(m_links[i].m_n[j]-nbase)]++;
-		}
-	for(i=0,ni=m_faces.size();i<ni;++i)
-		{
-		for(int j=0;j<3;++j) ranks[int(m_faces[i].m_n[j]-nbase)]++;
-		}
-	for(i=0;i<m_links.size();++i)
-		{
-		const int	id[]={	int(m_links[i].m_n[0]-nbase),
-							int(m_links[i].m_n[1]-nbase)};
-		const bool	sg[]={	ranks[id[0]]==1,
-							ranks[id[1]]==1};
-		if(sg[0]||sg[1])
-			{
-			--ranks[id[0]];
-			--ranks[id[1]];
-			btSwap(m_links[i],m_links[m_links.size()-1]);
-			m_links.pop_back();--i;
-			}
-		}
-	#if 0	
-	for(i=nnodes-1;i>=0;--i)
-		{
-		if(!ranks[i]) todelete.push_back(i);
-		}	
-	if(todelete.size())
-		{		
-		btAlignedObjectArray<int>&	map=ranks;
-		for(int i=0;i<nnodes;++i) map[i]=i;
-		PointersToIndices(this);
-		for(int i=0,ni=todelete.size();i<ni;++i)
-			{
-			int		j=todelete[i];
-			int&	a=map[j];
-			int&	b=map[--nnodes];
-			m_ndbvt.remove(m_nodes[a].m_leaf);m_nodes[a].m_leaf=0;
-			btSwap(m_nodes[a],m_nodes[b]);
-			j=a;a=b;b=j;			
-			}
-		IndicesToPointers(this,&map[0]);
-		m_nodes.resize(nnodes);
-		}
-	#endif
-	}
-m_bUpdateRtCst=true;
-}
-
-//
-bool			btSoftBody::cutLink(const Node* node0,const Node* node1,btScalar position)
-{
-return(cutLink(int(node0-&m_nodes[0]),int(node1-&m_nodes[0]),position));
-}
-
-//
-bool			btSoftBody::cutLink(int node0,int node1,btScalar position)
-{
-bool			done=false;
-int i,ni;
-const btVector3	d=m_nodes[node0].m_x-m_nodes[node1].m_x;
-const btVector3	x=Lerp(m_nodes[node0].m_x,m_nodes[node1].m_x,position);
-const btVector3	v=Lerp(m_nodes[node0].m_v,m_nodes[node1].m_v,position);
-const btScalar	m=1;
-appendNode(x,m);
-appendNode(x,m);
-Node*			pa=&m_nodes[node0];
-Node*			pb=&m_nodes[node1];
-Node*			pn[2]={	&m_nodes[m_nodes.size()-2],
-						&m_nodes[m_nodes.size()-1]};
-pn[0]->m_v=v;
-pn[1]->m_v=v;
-for(i=0,ni=m_links.size();i<ni;++i)
-	{
-	const int mtch=MatchEdge(m_links[i].m_n[0],m_links[i].m_n[1],pa,pb);
-	if(mtch!=-1)
-		{
-		appendLink(i);
-		Link*	pft[]={&m_links[i],&m_links[m_links.size()-1]};
-		pft[0]->m_n[1]=pn[mtch];
-		pft[1]->m_n[0]=pn[1-mtch];
-		done=true;
-		}
-	}
-for(i=0,ni=m_faces.size();i<ni;++i)
-	{
-	for(int k=2,l=0;l<3;k=l++)
-		{
-		const int mtch=MatchEdge(m_faces[i].m_n[k],m_faces[i].m_n[l],pa,pb);
-		if(mtch!=-1)
-			{
-			appendFace(i);
-			Face*	pft[]={&m_faces[i],&m_faces[m_faces.size()-1]};
-			pft[0]->m_n[l]=pn[mtch];
-			pft[1]->m_n[k]=pn[1-mtch];
-			appendLink(pn[0],pft[0]->m_n[(l+1)%3],pft[0]->m_material,true);
-			appendLink(pn[1],pft[0]->m_n[(l+1)%3],pft[0]->m_material,true);
-			}
-		}
-	}
-if(!done)
-	{
-	m_ndbvt.remove(pn[0]->m_leaf);
-	m_ndbvt.remove(pn[1]->m_leaf);
-	m_nodes.pop_back();
-	m_nodes.pop_back();
-	}
-return(done);
-}
-
-//
-bool			btSoftBody::rayCast(const btVector3& org,
-									const btVector3& dir,
-									sRayCast& results,
-									btScalar maxtime)
-{
-if(m_faces.size()&&m_fdbvt.empty()) initializeFaceTree();
-results.body	=	this;
-results.time	=	maxtime;
-results.feature	=	eFeature::None;
-results.index	=	-1;
-return(rayCast(org,dir,results.time,results.feature,results.index,false)!=0);
-}
-
-//
-void			btSoftBody::setSolver(eSolverPresets::_ preset)
-{
-m_cfg.m_vsequence.clear();
-m_cfg.m_psequence.clear();
-m_cfg.m_dsequence.clear();
-switch(preset)
-	{
-	case	eSolverPresets::Positions:
-	m_cfg.m_psequence.push_back(ePSolver::Anchors);
-	m_cfg.m_psequence.push_back(ePSolver::RContacts);
-	m_cfg.m_psequence.push_back(ePSolver::SContacts);
-	m_cfg.m_psequence.push_back(ePSolver::Linear);	
-	break;	
-	case	eSolverPresets::Velocities:
-	m_cfg.m_vsequence.push_back(eVSolver::Linear);
-	
-	m_cfg.m_psequence.push_back(ePSolver::Anchors);
-	m_cfg.m_psequence.push_back(ePSolver::RContacts);
-	m_cfg.m_psequence.push_back(ePSolver::SContacts);
-	
-	m_cfg.m_dsequence.push_back(ePSolver::Linear);
-	break;
-	}
-}
-
-//
-void			btSoftBody::predictMotion(btScalar dt)
-{
-	int i,ni;
-
-	/* Update				*/ 
-	if(m_bUpdateRtCst)
-	{
-		m_bUpdateRtCst=false;
-		updateConstants();
-		m_fdbvt.clear();
-		if(m_cfg.collisions&fCollision::VF_SS)
-			{
-			initializeFaceTree();			
-			}
-	}
-		
-	/* Prepare				*/ 
-	m_sst.sdt		=	dt*m_cfg.timescale;
-	m_sst.isdt		=	1/m_sst.sdt;
-	m_sst.velmrg	=	m_sst.sdt*3;
-	m_sst.radmrg	=	getCollisionShape()->getMargin();
-	m_sst.updmrg	=	m_sst.radmrg*(btScalar)0.25;
-	/* Forces				*/ 
-	addVelocity(m_worldInfo->m_gravity*m_sst.sdt);
-	applyForces();
-	/* Integrate			*/ 
-	for(i=0,ni=m_nodes.size();i<ni;++i)
-	{
-		Node&	n=m_nodes[i];
-		n.m_q	=	n.m_x;
-		n.m_v	+=	n.m_f*n.m_im*m_sst.sdt;
-		n.m_x	+=	n.m_v*m_sst.sdt;
-		n.m_f	=	btVector3(0,0,0);
-	}
-	/* Clusters				*/ 
-	updateClusters();
-	/* Bounds				*/ 
-	updateBounds();	
-	/* Nodes				*/ 
-	for(i=0,ni=m_nodes.size();i<ni;++i)
-	{
-		Node&	n=m_nodes[i];
-		m_ndbvt.update(	n.m_leaf,
-						btDbvtVolume::FromCR(n.m_x,m_sst.radmrg),
-						n.m_v*m_sst.velmrg,
-						m_sst.updmrg);
-	}
-	/* Faces				*/ 
-	if(!m_fdbvt.empty())
-		{
-		for(int i=0;i<m_faces.size();++i)
-			{
-			Face&			f=m_faces[i];
-			const btVector3	v=(	f.m_n[0]->m_v+
-								f.m_n[1]->m_v+
-								f.m_n[2]->m_v)/3;
-			m_fdbvt.update(	f.m_leaf,
-							VolumeOf(f,m_sst.radmrg),
-							v*m_sst.velmrg,
-							m_sst.updmrg);
-			}
-		}
-	/* Pose					*/ 
-	updatePose();
-	/* Match				*/ 
-	if(m_pose.m_bframe&&(m_cfg.kMT>0))
-		{
-		const btMatrix3x3	posetrs=m_pose.m_rot;
-		for(int i=0,ni=m_nodes.size();i<ni;++i)
-			{
-			Node&	n=m_nodes[i];
-			if(n.m_im>0)
-				{
-				const btVector3	x=posetrs*m_pose.m_pos[i]+m_pose.m_com;
-				n.m_x=Lerp(n.m_x,x,m_cfg.kMT);
-				}
-			}
-		}
-	/* Clear contacts		*/ 
-	m_rcontacts.resize(0);
-	m_scontacts.resize(0);
-	/* Optimize dbvt's		*/ 
-	m_ndbvt.optimizeIncremental(1);
-	m_fdbvt.optimizeIncremental(1);
-	m_cdbvt.optimizeIncremental(1);
-}
-
-//
-void			btSoftBody::solveConstraints()
-{
-/* Apply clusters		*/ 
-applyClusters(false);
-/* Prepare links		*/ 
-
-int i,ni;
-
-for(i=0,ni=m_links.size();i<ni;++i)
-	{
-	Link&	l=m_links[i];
-	l.m_c3		=	l.m_n[1]->m_q-l.m_n[0]->m_q;
-	l.m_c2		=	1/(l.m_c3.length2()*l.m_c0);
-	}
-/* Prepare anchors		*/ 
-for(i=0,ni=m_anchors.size();i<ni;++i)
-	{
-	Anchor&			a=m_anchors[i];
-	const btVector3	ra=a.m_body->getWorldTransform().getBasis()*a.m_local;
-	a.m_c0	=	ImpulseMatrix(	m_sst.sdt,
-								a.m_node->m_im,
-								a.m_body->getInvMass(),
-								a.m_body->getInvInertiaTensorWorld(),
-								ra);
-	a.m_c1	=	ra;
-	a.m_c2	=	m_sst.sdt*a.m_node->m_im;
-	a.m_body->activate();
-	}
-/* Solve velocities		*/ 
-if(m_cfg.viterations>0)
-	{
-	/* Solve			*/ 
-	for(int isolve=0;isolve<m_cfg.viterations;++isolve)
-		{
-		for(int iseq=0;iseq<m_cfg.m_vsequence.size();++iseq)
-			{
-			getSolver(m_cfg.m_vsequence[iseq])(this,1);
-			}
-		}
-	/* Update			*/ 
-	for(i=0,ni=m_nodes.size();i<ni;++i)
-		{
-		Node&	n=m_nodes[i];
-		n.m_x	=	n.m_q+n.m_v*m_sst.sdt;
-		}
-	}
-/* Solve positions		*/ 
-if(m_cfg.piterations>0)
-	{
-	for(int isolve=0;isolve<m_cfg.piterations;++isolve)
-		{
-		const btScalar ti=isolve/(btScalar)m_cfg.piterations;
-		for(int iseq=0;iseq<m_cfg.m_psequence.size();++iseq)
-			{
-			getSolver(m_cfg.m_psequence[iseq])(this,1,ti);
-			}
-		}
-	const btScalar	vc=m_sst.isdt*(1-m_cfg.kDP);
-	for(i=0,ni=m_nodes.size();i<ni;++i)
-		{
-		Node&	n=m_nodes[i];
-		n.m_v	=	(n.m_x-n.m_q)*vc;
-		n.m_f	=	btVector3(0,0,0);		
-		}
-	}
-/* Solve drift			*/ 
-if(m_cfg.diterations>0)
-	{
-	const btScalar	vcf=m_cfg.kVCF*m_sst.isdt;
-	for(i=0,ni=m_nodes.size();i<ni;++i)
-		{
-		Node&	n=m_nodes[i];
-		n.m_q	=	n.m_x;
-		}
-	for(int idrift=0;idrift<m_cfg.diterations;++idrift)
-		{
-		for(int iseq=0;iseq<m_cfg.m_dsequence.size();++iseq)
-			{
-			getSolver(m_cfg.m_dsequence[iseq])(this,1,0);
-			}
-		}
-	for(int i=0,ni=m_nodes.size();i<ni;++i)
-		{
-		Node&	n=m_nodes[i];
-		n.m_v	+=	(n.m_x-n.m_q)*vcf;
-		}
-	}
-/* Apply clusters		*/ 
-dampClusters();
-applyClusters(true);
-}
-
-//
-void			btSoftBody::staticSolve(int iterations)
-{
-for(int isolve=0;isolve<iterations;++isolve)
-	{
-	for(int iseq=0;iseq<m_cfg.m_psequence.size();++iseq)
-		{
-		getSolver(m_cfg.m_psequence[iseq])(this,1,0);
-		}
-	}
-}
-
-//
-void			btSoftBody::solveCommonConstraints(btSoftBody** /*bodies*/,int /*count*/,int /*iterations*/)
-{
-/// placeholder
-}
-
-//
-void			btSoftBody::solveClusters(const btAlignedObjectArray<btSoftBody*>& bodies)
-{
-const int	nb=bodies.size();
-int			iterations=0;
-int i;
-
-for(i=0;i<nb;++i)
-	{
-	iterations=btMax(iterations,bodies[i]->m_cfg.citerations);
-	}
-for(i=0;i<nb;++i)
-	{
-	bodies[i]->prepareClusters(iterations);
-	}
-for(i=0;i<iterations;++i)
-	{
-	const btScalar sor=1;
-	for(int j=0;j<nb;++j)
-		{
-		bodies[j]->solveClusters(sor);
-		}
-	}
-for(i=0;i<nb;++i)
-	{
-	bodies[i]->cleanupClusters();
-	}
-}
-
-//
-void			btSoftBody::integrateMotion()
-{
-	/* Update			*/ 
-	updateNormals();
-}
-
-//
-					btSoftBody::RayCaster::RayCaster(const btVector3& org,const btVector3& dir,btScalar mxt)
-{
-o		=	org;
-d		=	dir;
-mint	=	mxt;
-face	=	0;
-tests	=	0;
-}
-
-//
-void				btSoftBody::RayCaster::Process(const btDbvtNode* leaf)
-{
-btSoftBody::Face&	f=*(btSoftBody::Face*)leaf->data;
-const btScalar		t=rayTriangle(	o,d,
-									f.m_n[0]->m_x,
-									f.m_n[1]->m_x,
-									f.m_n[2]->m_x,
-									mint);
-if((t>0)&&(t<mint)) { mint=t;face=&f; }
-++tests;
-}
-
-//
-btScalar			btSoftBody::RayCaster::rayTriangle(	const btVector3& org,
-														const btVector3& dir,
-														const btVector3& a,
-														const btVector3& b,
-														const btVector3& c,
-														btScalar maxt)
-{
-	static const btScalar	ceps=-SIMD_EPSILON*10;
-	static const btScalar	teps=SIMD_EPSILON*10;
-	const btVector3			n=cross(b-a,c-a);
-	const btScalar			d=dot(a,n);
-	const btScalar			den=dot(dir,n);
-	if(!btFuzzyZero(den))
-	{
-		const btScalar		num=dot(org,n)-d;
-		const btScalar		t=-num/den;
-		if((t>teps)&&(t<maxt))
-		{
-			const btVector3	hit=org+dir*t;
-			if(	(dot(n,cross(a-hit,b-hit))>ceps)	&&			
-				(dot(n,cross(b-hit,c-hit))>ceps)	&&
-				(dot(n,cross(c-hit,a-hit))>ceps))
-			{
-				return(t);
-			}
-		}
-	}
-	return(-1);
-}
-
-//
-void				btSoftBody::pointersToIndices()
-{
-#define	PTR2IDX(_p_,_b_)	reinterpret_cast<btSoftBody::Node*>((_p_)-(_b_))
-	btSoftBody::Node*	base=&m_nodes[0];
-	int i,ni;
-
-	for(i=0,ni=m_nodes.size();i<ni;++i)
-	{
-		if(m_nodes[i].m_leaf)
-			{
-			m_nodes[i].m_leaf->data=*(void**)&i;
-			}
-	}
-	for(i=0,ni=m_links.size();i<ni;++i)
-	{
-		m_links[i].m_n[0]=PTR2IDX(m_links[i].m_n[0],base);
-		m_links[i].m_n[1]=PTR2IDX(m_links[i].m_n[1],base);
-	}
-	for(i=0,ni=m_faces.size();i<ni;++i)
-	{
-		m_faces[i].m_n[0]=PTR2IDX(m_faces[i].m_n[0],base);
-		m_faces[i].m_n[1]=PTR2IDX(m_faces[i].m_n[1],base);
-		m_faces[i].m_n[2]=PTR2IDX(m_faces[i].m_n[2],base);
-		if(m_faces[i].m_leaf)
-			{
-			m_faces[i].m_leaf->data=*(void**)&i;
-			}
-	}
-	for(i=0,ni=m_anchors.size();i<ni;++i)
-		{
-		m_anchors[i].m_node=PTR2IDX(m_anchors[i].m_node,base);
-		}
-	for(i=0,ni=m_notes.size();i<ni;++i)
-		{
-		for(int j=0;j<m_notes[i].m_rank;++j)
-			{
-			m_notes[i].m_nodes[j]=PTR2IDX(m_notes[i].m_nodes[j],base);
-			}
-		}
-#undef	PTR2IDX
-}
-
-//
-void				btSoftBody::indicesToPointers(const int* map)
-{
-#define	IDX2PTR(_p_,_b_)	map?(&(_b_)[map[(((char*)_p_)-(char*)0)]]):	\
-								(&(_b_)[(((char*)_p_)-(char*)0)])
-	btSoftBody::Node*	base=&m_nodes[0];
-	int i,ni;
-
-	for(i=0,ni=m_nodes.size();i<ni;++i)
-	{
-		if(m_nodes[i].m_leaf)
-			{
-			m_nodes[i].m_leaf->data=&m_nodes[i];
-			}
-	}
-	for(i=0,ni=m_links.size();i<ni;++i)
-	{
-		m_links[i].m_n[0]=IDX2PTR(m_links[i].m_n[0],base);
-		m_links[i].m_n[1]=IDX2PTR(m_links[i].m_n[1],base);
-	}
-	for(i=0,ni=m_faces.size();i<ni;++i)
-	{
-		m_faces[i].m_n[0]=IDX2PTR(m_faces[i].m_n[0],base);
-		m_faces[i].m_n[1]=IDX2PTR(m_faces[i].m_n[1],base);
-		m_faces[i].m_n[2]=IDX2PTR(m_faces[i].m_n[2],base);
-		if(m_faces[i].m_leaf)
-			{
-			m_faces[i].m_leaf->data=&m_faces[i];
-			}
-	}
-	for(i=0,ni=m_anchors.size();i<ni;++i)
-		{
-		m_anchors[i].m_node=IDX2PTR(m_anchors[i].m_node,base);
-		}
-	for(i=0,ni=m_notes.size();i<ni;++i)
-		{
-		for(int j=0;j<m_notes[i].m_rank;++j)
-			{
-			m_notes[i].m_nodes[j]=IDX2PTR(m_notes[i].m_nodes[j],base);
-			}
-		}
-#undef	IDX2PTR
-}
-
-//
-int					btSoftBody::rayCast(const btVector3& org,const btVector3& dir,
-										btScalar& mint,eFeature::_& feature,int& index,bool bcountonly) const
-{
-	int	cnt=0;
-	if(bcountonly||m_fdbvt.empty())
-		{/* Full search	*/ 
-		for(int i=0,ni=m_faces.size();i<ni;++i)
-			{
-			const btSoftBody::Face&	f=m_faces[i];
-			const btScalar			t=RayCaster::rayTriangle(	org,dir,
-																f.m_n[0]->m_x,
-																f.m_n[1]->m_x,
-																f.m_n[2]->m_x,
-																mint);
-			if(t>0)
-				{
-				++cnt;
-				if(!bcountonly)
-					{
-					feature=btSoftBody::eFeature::Face;
-					index=i;
-					mint=t;
-					}
-				}
-			}
-		}
-		else
-		{/* Use dbvt	*/ 
-		RayCaster	collider(org,dir,mint);
-		btDbvt::collideRAY(m_fdbvt.m_root,org,dir,collider);
-		if(collider.face)
-			{
-			mint=collider.mint;
-			feature=btSoftBody::eFeature::Face;
-			index=(int)(collider.face-&m_faces[0]);
-			cnt=1;
-			}
-		}
-	return(cnt);
-}
-
-//
-void			btSoftBody::initializeFaceTree()
-{
-m_fdbvt.clear();
-for(int i=0;i<m_faces.size();++i)
-	{
-	Face&	f=m_faces[i];
-	f.m_leaf=m_fdbvt.insert(VolumeOf(f,0),&f);
-	}
-}
-
-//
-btVector3		btSoftBody::evaluateCom() const
-{
-btVector3	com(0,0,0);
-if(m_pose.m_bframe)
-	{
-	for(int i=0,ni=m_nodes.size();i<ni;++i)
-		{
-		com+=m_nodes[i].m_x*m_pose.m_wgh[i];
-		}
-	}
-	return(com);
-}
-	
-//
-bool				btSoftBody::checkContact(	btRigidBody* prb,
-												const btVector3& x,
-												btScalar margin,
-												btSoftBody::sCti& cti) const
-{
-	btVector3			nrm;
-	btCollisionShape*	shp=prb->getCollisionShape();
-	const btTransform&	wtr=prb->getInterpolationWorldTransform();
-	btScalar			dst=m_worldInfo->m_sparsesdf.Evaluate(	wtr.invXform(x),
-																shp,
-																nrm,
-																margin);
-	if(dst<0)
-	{
-		cti.m_body		=	prb;
-		cti.m_normal	=	wtr.getBasis()*nrm;
-		cti.m_offset	=	-dot(	cti.m_normal,
-									x-cti.m_normal*dst);
-		return(true);
-	}
-	return(false);
-}
-
-//
-void					btSoftBody::updateNormals()
-{
-	const btVector3	zv(0,0,0);
-	int i,ni;
-
-	for(i=0,ni=m_nodes.size();i<ni;++i)
-	{
-		m_nodes[i].m_n=zv;
-	}
-	for(i=0,ni=m_faces.size();i<ni;++i)
-	{
-		btSoftBody::Face&	f=m_faces[i];
-		const btVector3		n=cross(f.m_n[1]->m_x-f.m_n[0]->m_x,
-									f.m_n[2]->m_x-f.m_n[0]->m_x);
-		f.m_normal=n.normalized();
-		f.m_n[0]->m_n+=n;
-		f.m_n[1]->m_n+=n;
-		f.m_n[2]->m_n+=n;
-	}
-	for(i=0,ni=m_nodes.size();i<ni;++i)
-	{
-		btScalar len = m_nodes[i].m_n.length();
-		if (len>SIMD_EPSILON)
-			m_nodes[i].m_n /= len;
-	}
-}
-
-//
-void					btSoftBody::updateBounds()
-{
-	if(m_ndbvt.m_root)
-		{
-		const btVector3&	mins=m_ndbvt.m_root->volume.Mins();
-		const btVector3&	maxs=m_ndbvt.m_root->volume.Maxs();
-		const btScalar		csm=getCollisionShape()->getMargin();
-		const btVector3		mrg=btVector3(	csm,
-											csm,
-											csm)*1; // ??? to investigate...
-		m_bounds[0]=mins-mrg;
-		m_bounds[1]=maxs+mrg;
-			if(0!=getBroadphaseHandle())
-			{					
-				m_worldInfo->m_broadphase->setAabb(	getBroadphaseHandle(),
-													m_bounds[0],
-													m_bounds[1],
-													m_worldInfo->m_dispatcher);
-			}
-		}
-		else
-		{
-		m_bounds[0]=
-		m_bounds[1]=btVector3(0,0,0);
-		}		
-}
-
-
-//
-void					btSoftBody::updatePose()
-{
-	if(m_pose.m_bframe)
-	{
-		btSoftBody::Pose&	pose=m_pose;
-		const btVector3		com=evaluateCom();
-		/* Com			*/ 
-		pose.m_com	=	com;
-		/* Rotation		*/ 
-		btMatrix3x3		Apq;
-		const btScalar	eps=SIMD_EPSILON;
-		Apq[0]=Apq[1]=Apq[2]=btVector3(0,0,0);
-		Apq[0].setX(eps);Apq[1].setY(eps*2);Apq[2].setZ(eps*3);
-		for(int i=0,ni=m_nodes.size();i<ni;++i)
-		{
-			const btVector3		a=pose.m_wgh[i]*(m_nodes[i].m_x-com);
-			const btVector3&	b=pose.m_pos[i];
-			Apq[0]+=a.x()*b;
-			Apq[1]+=a.y()*b;
-			Apq[2]+=a.z()*b;
-		}
-		btMatrix3x3		r,s;
-		PolarDecompose(Apq,r,s);
-		pose.m_rot=r;
-		pose.m_scl=pose.m_aqq*r.transpose()*Apq;
-		if(m_cfg.maxvolume>1)
-			{
-			const btScalar	idet=Clamp<btScalar>(	1/pose.m_scl.determinant(),
-													1,m_cfg.maxvolume);
-			pose.m_scl=Mul(pose.m_scl,idet);
-			}
-		
-	}
-}
-
-//
-void				btSoftBody::updateConstants()
-{
-	int i,ni;
-
-	/* Links		*/ 
-	for(i=0,ni=m_links.size();i<ni;++i)
-	{
-		Link&		l=m_links[i];
-		Material&	m=*l.m_material;
-		l.m_rl	=	(l.m_n[0]->m_x-l.m_n[1]->m_x).length();
-		l.m_c0	=	(l.m_n[0]->m_im+l.m_n[1]->m_im)/m.m_kLST;
-		l.m_c1	=	l.m_rl*l.m_rl;
-	}
-	/* Faces		*/ 
-	for(i=0,ni=m_faces.size();i<ni;++i)
-	{
-		Face&		f=m_faces[i];
-		f.m_ra	=	AreaOf(f.m_n[0]->m_x,f.m_n[1]->m_x,f.m_n[2]->m_x);
-	}
-	/* Area's		*/ 
-	btAlignedObjectArray<int>	counts;
-	counts.resize(m_nodes.size(),0);
-	for(i=0,ni=m_nodes.size();i<ni;++i)
-	{
-		m_nodes[i].m_area	=	0;
-	}
-	for(i=0,ni=m_faces.size();i<ni;++i)
-	{
-		btSoftBody::Face&	f=m_faces[i];
-		for(int j=0;j<3;++j)
-		{
-			const int index=(int)(f.m_n[j]-&m_nodes[0]);
-			counts[index]++;
-			f.m_n[j]->m_area+=btFabs(f.m_ra);
-		}
-	}
-	for(i=0,ni=m_nodes.size();i<ni;++i)
-	{
-		if(counts[i]>0)
-			m_nodes[i].m_area/=(btScalar)counts[i];
-		else
-			m_nodes[i].m_area=0;
-	}
-}
-
-//
-void					btSoftBody::initializeClusters()
-{
-	int i;
-
-for( i=0;i<m_clusters.size();++i)
-	{
-	Cluster&	c=*m_clusters[i];
-	c.m_imass=0;
-	c.m_masses.resize(c.m_nodes.size());
-	for(int j=0;j<c.m_nodes.size();++j)
-		{
-		c.m_masses[j]	=	c.m_nodes[j]->m_im>0?1/c.m_nodes[j]->m_im:0;
-		c.m_imass		+=	c.m_masses[j];
-		}
-	c.m_imass		=	1/c.m_imass;
-	c.m_com			=	btSoftBody::clusterCom(&c);
-	c.m_lv			=	btVector3(0,0,0);
-	c.m_av			=	btVector3(0,0,0);
-	c.m_leaf		=	0;
-	/* Inertia	*/ 
-	btMatrix3x3&	ii=c.m_locii;
-	ii[0]=ii[1]=ii[2]=btVector3(0,0,0);
-	{
-		int i,ni;
-
-		for(i=0,ni=c.m_nodes.size();i<ni;++i)
-		{
-			const btVector3	k=c.m_nodes[i]->m_x-c.m_com;
-			const btVector3	q=k*k;
-			const btScalar	m=c.m_masses[i];
-			ii[0][0]	+=	m*(q[1]+q[2]);
-			ii[1][1]	+=	m*(q[0]+q[2]);
-			ii[2][2]	+=	m*(q[0]+q[1]);
-			ii[0][1]	-=	m*k[0]*k[1];
-			ii[0][2]	-=	m*k[0]*k[2];
-			ii[1][2]	-=	m*k[1]*k[2];
-		}
-	}
-	ii[1][0]=ii[0][1];
-	ii[2][0]=ii[0][2];
-	ii[2][1]=ii[1][2];
-	ii=ii.inverse();
-	/* Frame	*/ 
-	c.m_framexform.setIdentity();
-	c.m_framexform.setOrigin(c.m_com);
-	c.m_framerefs.resize(c.m_nodes.size());
-	{
-		int i;
-		for(i=0;i<c.m_framerefs.size();++i)
-			{
-			c.m_framerefs[i]=c.m_nodes[i]->m_x-c.m_com;
-			}
-		}
-	}
-}
-
-//
-void					btSoftBody::updateClusters()
-{
-BT_PROFILE("UpdateClusters");
-int i;
-
-for(i=0;i<m_clusters.size();++i)
-	{
-	btSoftBody::Cluster&	c=*m_clusters[i];
-	const int				n=c.m_nodes.size();
-	const btScalar			invn=1/(btScalar)n;
-	if(n)
-		{
-		/* Frame				*/ 
-		const btScalar	eps=btScalar(0.0001);
-		btMatrix3x3		m,r,s;
-		m[0]=m[1]=m[2]=btVector3(0,0,0);
-		m[0][0]=eps*1;
-		m[1][1]=eps*2;
-		m[2][2]=eps*3;
-		c.m_com=clusterCom(&c);
-		for(int i=0;i<c.m_nodes.size();++i)
-			{
-			const btVector3		a=c.m_nodes[i]->m_x-c.m_com;
-			const btVector3&	b=c.m_framerefs[i];
-			m[0]+=a[0]*b;m[1]+=a[1]*b;m[2]+=a[2]*b;
-			}
-		PolarDecompose(m,r,s);
-		c.m_framexform.setOrigin(c.m_com);
-		c.m_framexform.setBasis(r);		
-		/* Inertia			*/ 
-		#if 1/* Constant	*/ 
-		c.m_invwi=c.m_framexform.getBasis()*c.m_locii*c.m_framexform.getBasis().transpose();
-		#else
-			#if 0/* Sphere	*/ 
-			const btScalar	rk=(2*c.m_extents.length2())/(5*c.m_imass);
-			const btVector3	inertia(rk,rk,rk);
-			const btVector3	iin(btFabs(inertia[0])>SIMD_EPSILON?1/inertia[0]:0,
-								btFabs(inertia[1])>SIMD_EPSILON?1/inertia[1]:0,
-								btFabs(inertia[2])>SIMD_EPSILON?1/inertia[2]:0);
-			
-			c.m_invwi=c.m_xform.getBasis().scaled(iin)*c.m_xform.getBasis().transpose();
-			#else/* Actual	*/ 		
-			c.m_invwi[0]=c.m_invwi[1]=c.m_invwi[2]=btVector3(0,0,0);
-			for(int i=0;i<n;++i)
-				{
-				const btVector3	k=c.m_nodes[i]->m_x-c.m_com;
-				const btVector3		q=k*k;
-				const btScalar		m=1/c.m_nodes[i]->m_im;
-				c.m_invwi[0][0]	+=	m*(q[1]+q[2]);
-				c.m_invwi[1][1]	+=	m*(q[0]+q[2]);
-				c.m_invwi[2][2]	+=	m*(q[0]+q[1]);
-				c.m_invwi[0][1]	-=	m*k[0]*k[1];
-				c.m_invwi[0][2]	-=	m*k[0]*k[2];
-				c.m_invwi[1][2]	-=	m*k[1]*k[2];
-				}
-			c.m_invwi[1][0]=c.m_invwi[0][1];
-			c.m_invwi[2][0]=c.m_invwi[0][2];
-			c.m_invwi[2][1]=c.m_invwi[1][2];
-			c.m_invwi=c.m_invwi.inverse();
-			#endif
-		#endif
-		/* Velocities			*/ 
-		c.m_lv=btVector3(0,0,0);
-		c.m_av=btVector3(0,0,0);
-		{
-			int i;
-
-			for(i=0;i<n;++i)
-			{
-				const btVector3	v=c.m_nodes[i]->m_v*c.m_masses[i];
-				c.m_lv	+=	v;
-				c.m_av	+=	cross(c.m_nodes[i]->m_x-c.m_com,v);
-			}
-		}
-		c.m_lv=c.m_imass*c.m_lv*(1-c.m_ldamping);
-		c.m_av=c.m_invwi*c.m_av*(1-c.m_adamping);
-		c.m_vimpulses[0]	=
-		c.m_vimpulses[1]	= btVector3(0,0,0);
-		c.m_dimpulses[0]	=
-		c.m_dimpulses[1]	= btVector3(0,0,0);
-		c.m_nvimpulses		= 0;
-		c.m_ndimpulses		= 0;
-		/* Matching				*/ 
-		if(c.m_matching>0)
-			{
-			for(int j=0;j<c.m_nodes.size();++j)
-				{
-				Node&			n=*c.m_nodes[j];
-				const btVector3	x=c.m_framexform*c.m_framerefs[j];
-				n.m_x=Lerp(n.m_x,x,c.m_matching);
-				}
-			}
-		/* Dbvt					*/ 
-		if(c.m_collide)
-			{
-			btVector3	mi=c.m_nodes[0]->m_x;
-			btVector3	mx=mi;
-			for(int j=1;j<n;++j)
-				{
-				mi.setMin(c.m_nodes[j]->m_x);
-				mx.setMax(c.m_nodes[j]->m_x);
-				}			
-			const btDbvtVolume	bounds=btDbvtVolume::FromMM(mi,mx);
-			if(c.m_leaf)
-				m_cdbvt.update(c.m_leaf,bounds,c.m_lv*m_sst.sdt*3,m_sst.radmrg);
-				else
-				c.m_leaf=m_cdbvt.insert(bounds,&c);
-			}
-		}
-	}
-}
-
-//
-void					btSoftBody::cleanupClusters()
-{
-for(int i=0;i<m_joints.size();++i)
-	{
-	m_joints[i]->Terminate(m_sst.sdt);
-	if(m_joints[i]->m_delete)
-		{
-		btAlignedFree(m_joints[i]);
-		m_joints.remove(m_joints[i--]);
-		}	
-	}
-}
-
-//
-void					btSoftBody::prepareClusters(int iterations)
-{
-for(int i=0;i<m_joints.size();++i)
-	{
-	m_joints[i]->Prepare(m_sst.sdt,iterations);
-	}
-}
-
-
-//
-void					btSoftBody::solveClusters(btScalar sor)
-{
-for(int i=0,ni=m_joints.size();i<ni;++i)
-	{
-	m_joints[i]->Solve(m_sst.sdt,sor);
-	}
-}
-
-//
-void					btSoftBody::applyClusters(bool drift)
-{
-BT_PROFILE("ApplyClusters");
-const btScalar					f0=m_sst.sdt;
-const btScalar					f1=f0/2;
-btAlignedObjectArray<btVector3>	deltas;
-btAlignedObjectArray<btScalar>	weights;
-deltas.resize(m_nodes.size(),btVector3(0,0,0));
-weights.resize(m_nodes.size(),0);
-int i;
-
-if(drift)
-	{
-	for(i=0;i<m_clusters.size();++i)
-		{
-		Cluster&	c=*m_clusters[i];
-		if(c.m_ndimpulses)
-			{
-			c.m_dimpulses[0]/=(btScalar)c.m_ndimpulses;
-			c.m_dimpulses[1]/=(btScalar)c.m_ndimpulses;
-			}
-		}
-	}
-for(i=0;i<m_clusters.size();++i)
-	{
-	Cluster&	c=*m_clusters[i];	
-	if(0<(drift?c.m_ndimpulses:c.m_nvimpulses))
-		{
-		const btVector3		v=(drift?c.m_dimpulses[0]:c.m_vimpulses[0])*m_sst.sdt;
-		const btVector3		w=(drift?c.m_dimpulses[1]:c.m_vimpulses[1])*m_sst.sdt;
-		for(int j=0;j<c.m_nodes.size();++j)
-			{
-			const int			idx=int(c.m_nodes[j]-&m_nodes[0]);
-			const btVector3&	x=c.m_nodes[j]->m_x;
-			const btScalar		q=c.m_masses[j];
-			deltas[idx]		+=	(v+cross(w,x-c.m_com))*q;
-			weights[idx]	+=	q;
-			}
-		}
-	}
-	for(i=0;i<deltas.size();++i)
-	{
-		if(weights[i]>0) m_nodes[i].m_x+=deltas[i]/weights[i];
-	}
-}
-
-//
-void					btSoftBody::dampClusters()
-{
-	int i;
-
-for(i=0;i<m_clusters.size();++i)
-	{
-	Cluster&	c=*m_clusters[i];	
-	if(c.m_ndamping>0)
-		{
-		for(int j=0;j<c.m_nodes.size();++j)
-			{
-			Node&			n=*c.m_nodes[j];
-			if(n.m_im>0)
-				{
-				const btVector3	vx=c.m_lv+cross(c.m_av,c.m_nodes[j]->m_q-c.m_com);
-				n.m_v	+=	c.m_ndamping*(vx-n.m_v);
-				}
-			}
-		}
-	}
-}
-
-//
-void				btSoftBody::Joint::Prepare(btScalar dt,int)
-{
-m_bodies[0].activate();
-m_bodies[1].activate();
-}
-
-//
-void				btSoftBody::LJoint::Prepare(btScalar dt,int iterations)
-{
-static const btScalar	maxdrift=4;
-Joint::Prepare(dt,iterations);
-m_rpos[0]		=	m_bodies[0].xform()*m_refs[0];
-m_rpos[1]		=	m_bodies[1].xform()*m_refs[1];
-m_drift			=	Clamp(m_rpos[0]-m_rpos[1],maxdrift)*m_erp/dt;
-m_rpos[0]		-=	m_bodies[0].xform().getOrigin();
-m_rpos[1]		-=	m_bodies[1].xform().getOrigin();
-m_massmatrix	=	ImpulseMatrix(	m_bodies[0].invMass(),m_bodies[0].invWorldInertia(),m_rpos[0],
-									m_bodies[1].invMass(),m_bodies[1].invWorldInertia(),m_rpos[1]);
-if(m_split>0)
-	{
-	m_sdrift	=	m_massmatrix*(m_drift*m_split);
-	m_drift		*=	1-m_split;
-	}
-m_drift	/=(btScalar)iterations;
-}
-
-//
-void				btSoftBody::LJoint::Solve(btScalar dt,btScalar sor)
-{
-const btVector3		va=m_bodies[0].velocity(m_rpos[0]);
-const btVector3		vb=m_bodies[1].velocity(m_rpos[1]);
-const btVector3		vr=va-vb;
-btSoftBody::Impulse	impulse;
-impulse.m_asVelocity	=	1;
-impulse.m_velocity		=	m_massmatrix*(m_drift+vr*m_cfm)*sor;
-m_bodies[0].applyImpulse(-impulse,m_rpos[0]);
-m_bodies[1].applyImpulse( impulse,m_rpos[1]);
-}
-
-//
-void				btSoftBody::LJoint::Terminate(btScalar dt)
-{
-if(m_split>0)
-	{
-	m_bodies[0].applyDImpulse(-m_sdrift,m_rpos[0]);
-	m_bodies[1].applyDImpulse( m_sdrift,m_rpos[1]);
-	}
-}
-
-//
-void				btSoftBody::AJoint::Prepare(btScalar dt,int iterations)
-{
-static const btScalar	maxdrift=SIMD_PI/16;
-m_icontrol->Prepare(this);
-Joint::Prepare(dt,iterations);
-m_axis[0]	=	m_bodies[0].xform().getBasis()*m_refs[0];
-m_axis[1]	=	m_bodies[1].xform().getBasis()*m_refs[1];
-m_drift		=	NormalizeAny(cross(m_axis[1],m_axis[0]));
-m_drift		*=	btMin(maxdrift,btAcos(Clamp<btScalar>(dot(m_axis[0],m_axis[1]),-1,+1)));
-m_drift		*=	m_erp/dt;
-m_massmatrix=	AngularImpulseMatrix(m_bodies[0].invWorldInertia(),m_bodies[1].invWorldInertia());
-if(m_split>0)
-	{
-	m_sdrift	=	m_massmatrix*(m_drift*m_split);
-	m_drift		*=	1-m_split;
-	}
-m_drift	/=(btScalar)iterations;
-}
-
-//
-void				btSoftBody::AJoint::Solve(btScalar dt,btScalar sor)
-{
-const btVector3		va=m_bodies[0].angularVelocity();
-const btVector3		vb=m_bodies[1].angularVelocity();
-const btVector3		vr=va-vb;
-const btScalar		sp=dot(vr,m_axis[0]);
-const btVector3		vc=vr-m_axis[0]*m_icontrol->Speed(this,sp);
-btSoftBody::Impulse	impulse;
-impulse.m_asVelocity	=	1;
-impulse.m_velocity		=	m_massmatrix*(m_drift+vc*m_cfm)*sor;
-m_bodies[0].applyAImpulse(-impulse);
-m_bodies[1].applyAImpulse( impulse);
-}
-
-//
-void				btSoftBody::AJoint::Terminate(btScalar dt)
-{
-if(m_split>0)
-	{
-	m_bodies[0].applyDAImpulse(-m_sdrift);
-	m_bodies[1].applyDAImpulse( m_sdrift);
-	}
-}
-
-//
-void				btSoftBody::CJoint::Prepare(btScalar dt,int iterations)
-{
-Joint::Prepare(dt,iterations);
-const bool	dodrift=(m_life==0);
-m_delete=(++m_life)>m_maxlife;
-if(dodrift)
-	{
-	m_drift=m_drift*m_erp/dt;
-	if(m_split>0)
-		{
-		m_sdrift	=	m_massmatrix*(m_drift*m_split);
-		m_drift		*=	1-m_split;
-		}
-	m_drift/=(btScalar)iterations;
-	}
-	else
-	{
-	m_drift=m_sdrift=btVector3(0,0,0);
-	}
-}
-
-//
-void				btSoftBody::CJoint::Solve(btScalar dt,btScalar sor)
-{
-const btVector3		va=m_bodies[0].velocity(m_rpos[0]);
-const btVector3		vb=m_bodies[1].velocity(m_rpos[1]);
-const btVector3		vrel=va-vb;
-const btScalar		rvac=dot(vrel,m_normal);
-btSoftBody::Impulse	impulse;
-impulse.m_asVelocity	=	1;
-impulse.m_velocity		=	m_drift;
-if(rvac<0)
-	{
-	const btVector3	iv=m_normal*rvac;
-	const btVector3	fv=vrel-iv;
-	impulse.m_velocity	+=	iv+fv*m_friction;
-	}
-impulse.m_velocity=m_massmatrix*impulse.m_velocity*sor;
-m_bodies[0].applyImpulse(-impulse,m_rpos[0]);
-m_bodies[1].applyImpulse( impulse,m_rpos[1]);
-}
-
-//
-void				btSoftBody::CJoint::Terminate(btScalar dt)
-{
-if(m_split>0)
-	{
-	m_bodies[0].applyDImpulse(-m_sdrift,m_rpos[0]);
-	m_bodies[1].applyDImpulse( m_sdrift,m_rpos[1]);
-	}
-}
-
-//
-void				btSoftBody::applyForces()
-{
-	BT_PROFILE("SoftBody applyForces");
-	const btScalar					dt=m_sst.sdt;
-	const btScalar					kLF=m_cfg.kLF;
-	const btScalar					kDG=m_cfg.kDG;
-	const btScalar					kPR=m_cfg.kPR;
-	const btScalar					kVC=m_cfg.kVC;
-	const bool						as_lift=kLF>0;
-	const bool						as_drag=kDG>0;
-	const bool						as_pressure=kPR!=0;
-	const bool						as_volume=kVC>0;
-	const bool						as_aero=	as_lift		||
-												as_drag		;
-	const bool						as_vaero=	as_aero		&&
-												(m_cfg.aeromodel<btSoftBody::eAeroModel::F_TwoSided);
-	const bool						as_faero=	as_aero		&&
-												(m_cfg.aeromodel>=btSoftBody::eAeroModel::F_TwoSided);
-	const bool						use_medium=	as_aero;
-	const bool						use_volume=	as_pressure	||
-												as_volume	;
-	btScalar						volume=0;
-	btScalar						ivolumetp=0;
-	btScalar						dvolumetv=0;
-	btSoftBody::sMedium	medium;
-	if(use_volume)
-	{
-		volume		=	getVolume();
-		ivolumetp	=	1/btFabs(volume)*kPR;
-		dvolumetv	=	(m_pose.m_volume-volume)*kVC;
-	}
-	/* Per vertex forces			*/ 
-	int i,ni;
-
-	for(i=0,ni=m_nodes.size();i<ni;++i)
-	{
-		btSoftBody::Node&	n=m_nodes[i];
-		if(n.m_im>0)
-		{
-			if(use_medium)
-			{
-				EvaluateMedium(m_worldInfo,n.m_x,medium);
-				/* Aerodynamics			*/ 
-				if(as_vaero)
-				{				
-					const btVector3	rel_v=n.m_v-medium.m_velocity;
-					const btScalar	rel_v2=rel_v.length2();
-					if(rel_v2>SIMD_EPSILON)
-					{
-						btVector3	nrm=n.m_n;
-						/* Setup normal		*/ 
-						switch(m_cfg.aeromodel)
-						{
-						case	btSoftBody::eAeroModel::V_Point:
-							nrm=NormalizeAny(rel_v);break;
-						case	btSoftBody::eAeroModel::V_TwoSided:
-							nrm*=(btScalar)(dot(nrm,rel_v)<0?-1:+1);break;
-						}
-						const btScalar	dvn=dot(rel_v,nrm);
-						/* Compute forces	*/ 
-						if(dvn>0)
-						{
-							btVector3		force(0,0,0);
-							const btScalar	c0	=	n.m_area*dvn*rel_v2/2;
-							const btScalar	c1	=	c0*medium.m_density;
-							force	+=	nrm*(-c1*kLF);
-							force	+=	rel_v.normalized()*(-c1*kDG);
-							ApplyClampedForce(n,force,dt);
-						}
-					}
-				}
-			}
-			/* Pressure				*/ 
-			if(as_pressure)
-			{
-				n.m_f	+=	n.m_n*(n.m_area*ivolumetp);
-			}
-			/* Volume				*/ 
-			if(as_volume)
-			{
-				n.m_f	+=	n.m_n*(n.m_area*dvolumetv);
-			}
-		}
-	}
-	/* Per face forces				*/ 
-	for(i=0,ni=m_faces.size();i<ni;++i)
-	{
-		btSoftBody::Face&	f=m_faces[i];
-		if(as_faero)
-		{
-			const btVector3	v=(f.m_n[0]->m_v+f.m_n[1]->m_v+f.m_n[2]->m_v)/3;
-			const btVector3	x=(f.m_n[0]->m_x+f.m_n[1]->m_x+f.m_n[2]->m_x)/3;
-			EvaluateMedium(m_worldInfo,x,medium);
-			const btVector3	rel_v=v-medium.m_velocity;
-			const btScalar	rel_v2=rel_v.length2();
-			if(rel_v2>SIMD_EPSILON)
-			{
-				btVector3	nrm=f.m_normal;
-				/* Setup normal		*/ 
-				switch(m_cfg.aeromodel)
-				{
-				case	btSoftBody::eAeroModel::F_TwoSided:
-					nrm*=(btScalar)(dot(nrm,rel_v)<0?-1:+1);break;
-				}
-				const btScalar	dvn=dot(rel_v,nrm);
-				/* Compute forces	*/ 
-				if(dvn>0)
-				{
-					btVector3		force(0,0,0);
-					const btScalar	c0	=	f.m_ra*dvn*rel_v2;
-					const btScalar	c1	=	c0*medium.m_density;
-					force	+=	nrm*(-c1*kLF);
-					force	+=	rel_v.normalized()*(-c1*kDG);
-					force	/=	3;
-					for(int j=0;j<3;++j) ApplyClampedForce(*f.m_n[j],force,dt);
-				}
-			}
-		}
-	}
-}
-
-//
-void				btSoftBody::PSolve_Anchors(btSoftBody* psb,btScalar kst,btScalar ti)
-{
-	const btScalar	kAHR=psb->m_cfg.kAHR*kst;
-	const btScalar	dt=psb->m_sst.sdt;
-	for(int i=0,ni=psb->m_anchors.size();i<ni;++i)
-	{
-		const Anchor&		a=psb->m_anchors[i];
-		const btTransform&	t=a.m_body->getInterpolationWorldTransform();
-		Node&				n=*a.m_node;
-		const btVector3		wa=t*a.m_local;
-		const btVector3		va=a.m_body->getVelocityInLocalPoint(a.m_c1)*dt;
-		const btVector3		vb=n.m_x-n.m_q;
-		const btVector3		vr=(va-vb)+(wa-n.m_x)*kAHR;
-		const btVector3		impulse=a.m_c0*vr;
-		n.m_x+=impulse*a.m_c2;
-		a.m_body->applyImpulse(-impulse,a.m_c1);
-	}
-}
-
-//
-void				btSoftBody::PSolve_RContacts(btSoftBody* psb,btScalar kst,btScalar ti)
-{
-	const btScalar	dt=psb->m_sst.sdt;
-	const btScalar	mrg=psb->getCollisionShape()->getMargin();
-	for(int i=0,ni=psb->m_rcontacts.size();i<ni;++i)
-	{
-		const RContact&		c=psb->m_rcontacts[i];
-		const sCti&			cti=c.m_cti;	
-		const btVector3		va=cti.m_body->getVelocityInLocalPoint(c.m_c1)*dt;
-		const btVector3		vb=c.m_node->m_x-c.m_node->m_q;	
-		const btVector3		vr=vb-va;
-		const btScalar		dn=dot(vr,cti.m_normal);		
-		if(dn<=SIMD_EPSILON)
-		{
-			const btScalar		dp=btMin(dot(c.m_node->m_x,cti.m_normal)+cti.m_offset,mrg);
-			const btVector3		fv=vr-cti.m_normal*dn;
-			const btVector3		impulse=c.m_c0*((vr-fv*c.m_c3+cti.m_normal*(dp*c.m_c4))*kst);
-			c.m_node->m_x-=impulse*c.m_c2;
-			c.m_cti.m_body->applyImpulse(impulse,c.m_c1);
-		}
-	}
-}
-
-//
-void				btSoftBody::PSolve_SContacts(btSoftBody* psb,btScalar,btScalar ti)
-{
-for(int i=0,ni=psb->m_scontacts.size();i<ni;++i)
-	{
-	const SContact&		c=psb->m_scontacts[i];
-	const btVector3&	nr=c.m_normal;
-	Node&				n=*c.m_node;
-	Face&				f=*c.m_face;
-	const btVector3		p=BaryEval(	f.m_n[0]->m_x,
-									f.m_n[1]->m_x,
-									f.m_n[2]->m_x,
-									c.m_weights);
-	const btVector3		q=BaryEval(	f.m_n[0]->m_q,
-									f.m_n[1]->m_q,
-									f.m_n[2]->m_q,
-									c.m_weights);											
-	const btVector3		vr=(n.m_x-n.m_q)-(p-q);
-	btVector3			corr(0,0,0);
-	if(dot(vr,nr)<0)
-		{
-		const btScalar	j=c.m_margin-(dot(nr,n.m_x)-dot(nr,p));
-		corr+=c.m_normal*j;
-		}
-	corr			-=	ProjectOnPlane(vr,nr)*c.m_friction;
-	n.m_x			+=	corr*c.m_cfm[0];
-	f.m_n[0]->m_x	-=	corr*(c.m_cfm[1]*c.m_weights.x());
-	f.m_n[1]->m_x	-=	corr*(c.m_cfm[1]*c.m_weights.y());
-	f.m_n[2]->m_x	-=	corr*(c.m_cfm[1]*c.m_weights.z());
-	}
-}
-
-//
-void				btSoftBody::PSolve_Links(btSoftBody* psb,btScalar kst,btScalar ti)
-{
-	for(int i=0,ni=psb->m_links.size();i<ni;++i)
-	{			
-		Link&	l=psb->m_links[i];
-		if(l.m_c0>0)
-		{
-			Node&			a=*l.m_n[0];
-			Node&			b=*l.m_n[1];
-			const btVector3	del=b.m_x-a.m_x;
-			const btScalar	len=del.length2();
-			const btScalar	k=((l.m_c1-len)/(l.m_c0*(l.m_c1+len)))*kst;
-			const btScalar	t=k*a.m_im;
-			a.m_x-=del*(k*a.m_im);
-			b.m_x+=del*(k*b.m_im);
-		}
-	}
-}
-
-//
-void				btSoftBody::VSolve_Links(btSoftBody* psb,btScalar kst)
-{
-for(int i=0,ni=psb->m_links.size();i<ni;++i)
-	{			
-	Link&			l=psb->m_links[i];
-	Node**			n=l.m_n;
-	const btScalar	j=-dot(l.m_c3,n[0]->m_v-n[1]->m_v)*l.m_c2*kst;
-	n[0]->m_v+=	l.m_c3*(j*n[0]->m_im);
-	n[1]->m_v-=	l.m_c3*(j*n[1]->m_im);
-	}
-}
-
-//
-btSoftBody::psolver_t	btSoftBody::getSolver(ePSolver::_ solver)
-{
-switch(solver)
-	{
-	case	ePSolver::Anchors:		return(&btSoftBody::PSolve_Anchors);
-	case	ePSolver::Linear:		return(&btSoftBody::PSolve_Links);
-	case	ePSolver::RContacts:	return(&btSoftBody::PSolve_RContacts);
-	case	ePSolver::SContacts:	return(&btSoftBody::PSolve_SContacts);	
-	}
-return(0);
-}
-
-//
-btSoftBody::vsolver_t	btSoftBody::getSolver(eVSolver::_ solver)
-{
-switch(solver)
-	{
-	case	eVSolver::Linear:		return(&btSoftBody::VSolve_Links);
-	}
-return(0);
-}
-
-//
-void			btSoftBody::defaultCollisionHandler(btCollisionObject* pco)
-{
-switch(m_cfg.collisions&fCollision::RVSmask)
-	{
-	case	fCollision::SDF_RS:
-		{
-		btSoftColliders::CollideSDF_RS	docollide;		
-		btRigidBody*		prb=btRigidBody::upcast(pco);
-		const btTransform	wtr=prb->getInterpolationWorldTransform();
-		const btTransform	ctr=prb->getWorldTransform();
-		const btScalar		timemargin=(wtr.getOrigin()-ctr.getOrigin()).length();
-		const btScalar		basemargin=getCollisionShape()->getMargin();
-		btVector3			mins;
-		btVector3			maxs;
-		btDbvtVolume		volume;
-		pco->getCollisionShape()->getAabb(	pco->getInterpolationWorldTransform(),
-											mins,
-											maxs);
-		volume=btDbvtVolume::FromMM(mins,maxs);
-		volume.Expand(btVector3(basemargin,basemargin,basemargin));		
-		docollide.psb		=	this;
-		docollide.prb		=	prb;
-		docollide.dynmargin	=	basemargin+timemargin;
-		docollide.stamargin	=	basemargin;
-		btDbvt::collideTV(m_ndbvt.m_root,volume,docollide);
-		}
-	break;
-	case	fCollision::CL_RS:
-		{
-		btSoftColliders::CollideCL_RS	collider;
-		collider.Process(this,btRigidBody::upcast(pco));
-		}
-	break;
-	}
-}
-
-//
-void			btSoftBody::defaultCollisionHandler(btSoftBody* psb)
-{
-const int cf=m_cfg.collisions&psb->m_cfg.collisions;
-switch(cf&fCollision::SVSmask)
-	{
-	case	fCollision::CL_SS:
-		{
-		btSoftColliders::CollideCL_SS	docollide;
-		docollide.Process(this,psb);
-		}
-	break;
-	case	fCollision::VF_SS:
-		{
-		btSoftColliders::CollideVF_SS	docollide;
-		/* common					*/ 
-		docollide.mrg=	getCollisionShape()->getMargin()+
-						psb->getCollisionShape()->getMargin();
-		/* psb0 nodes vs psb1 faces	*/ 
-		docollide.psb[0]=this;
-		docollide.psb[1]=psb;
-		btDbvt::collideTT(	docollide.psb[0]->m_ndbvt.m_root,
-							docollide.psb[1]->m_fdbvt.m_root,
-							docollide);
-		/* psb1 nodes vs psb0 faces	*/ 
-		docollide.psb[0]=psb;
-		docollide.psb[1]=this;
-		btDbvt::collideTT(	docollide.psb[0]->m_ndbvt.m_root,
-							docollide.psb[1]->m_fdbvt.m_root,
-							docollide);
-		}
-	break;
-	}
-}
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftBody.h b/extern/bullet2/src/BulletSoftBody/btSoftBody.h
deleted file mode 100644
index 834199c668a..00000000000
--- a/extern/bullet2/src/BulletSoftBody/btSoftBody.h
+++ /dev/null
@@ -1,810 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it freely,
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-///btSoftBody implementation by Nathanael Presson
-
-#ifndef _BT_SOFT_BODY_H
-#define _BT_SOFT_BODY_H
-
-#include "LinearMath/btAlignedObjectArray.h"
-#include "LinearMath/btPoint3.h"
-#include "LinearMath/btTransform.h"
-#include "LinearMath/btIDebugDraw.h"
-#include "BulletDynamics/Dynamics/btRigidBody.h"
-
-#include "BulletCollision/CollisionShapes/btConcaveShape.h"
-#include "BulletCollision/CollisionDispatch/btCollisionCreateFunc.h"
-#include "btSparseSDF.h"
-#include "BulletCollision/BroadphaseCollision/btDbvt.h"
-
-class btBroadphaseInterface;
-class btCollisionDispatcher;
-
-/* btSoftBodyWorldInfo	*/ 
-struct	btSoftBodyWorldInfo
-{
-	btScalar				air_density;
-	btScalar				water_density;
-	btScalar				water_offset;
-	btVector3				water_normal;
-	btBroadphaseInterface*	m_broadphase;
-	btCollisionDispatcher*	m_dispatcher;
-	btVector3				m_gravity;
-	btSparseSdf<3>			m_sparsesdf;
-};	
-
-
-/// btSoftBody is work-in-progress
-class	btSoftBody : public btCollisionObject
-{
-public:
-	//
-	// Enumerations
-	//
-
-	///eAeroModel 
-	struct eAeroModel { enum _ {
-		V_Point,	///Vertex normals are oriented toward velocity
-		V_TwoSided,	///Vertex normals are fliped to match velocity	
-		V_OneSided,	///Vertex normals are taken as it is	
-		F_TwoSided,	///Face normals are fliped to match velocity
-		F_OneSided,	///Face normals are taken as it is
-		END
-	};};
-	
-	///eVSolver : velocities solvers
-	struct	eVSolver { enum _ {
-		Linear,		///Linear solver
-		END
-	};};
-	
-	///ePSolver : positions solvers
-	struct	ePSolver { enum _ {
-		Linear,		///Linear solver
-		Anchors,	///Anchor solver
-		RContacts,	///Rigid contacts solver
-		SContacts,	///Soft contacts solver
-		END
-	};};
-	
-	///eSolverPresets
-	struct	eSolverPresets { enum _ {
-		Positions,
-		Velocities,
-		Default	=	Positions,
-		END
-	};};
-	
-	///eFeature
-	struct	eFeature { enum _ {
-		None,
-		Node,
-		Link,
-		Face,
-		END
-	};};
-	
-	typedef btAlignedObjectArray<eVSolver::_>	tVSolverArray;
-	typedef btAlignedObjectArray<ePSolver::_>	tPSolverArray;
-	
-	//
-	// Flags
-	//
-	
-	///fCollision
-	struct fCollision { enum _ {
-		RVSmask	=	0x000f,	///Rigid versus soft mask
-		SDF_RS	=	0x0001,	///SDF based rigid vs soft
-		CL_RS	=	0x0002, ///Cluster vs convex rigid vs soft
-		
-		SVSmask	=	0x00f0,	///Rigid versus soft mask		
-		VF_SS	=	0x0010,	///Vertex vs face soft vs soft handling
-		CL_SS	=	0x0020, ///Cluster vs cluster soft vs soft handling
-		/* presets	*/ 
-		Default	=	SDF_RS,
-		END
-	};};
-	
-	///fMaterial
-	struct fMaterial { enum _ {
-		DebugDraw	=	0x0001,	/// Enable debug draw
-		/* presets	*/ 
-		Default		=	DebugDraw,
-		END
-	};};
-		
-	//
-	// API Types
-	//
-	
-	/* sRayCast		*/ 
-	struct sRayCast
-	{
-		btSoftBody*	body;		/// soft body
-		eFeature::_	feature;	/// feature type
-		int			index;		/// feature index
-		btScalar	time;		/// time of impact (rayorg+raydir*time)
-	};
-	
-	/* ImplicitFn	*/ 
-	struct	ImplicitFn
-	{
-		virtual btScalar	Eval(const btVector3& x)=0;
-	};
-	
-	//
-	// Internal types
-	//
-
-	typedef btAlignedObjectArray<btScalar>	tScalarArray;
-	typedef btAlignedObjectArray<btVector3>	tVector3Array;
-
-	/* sCti is Softbody contact info	*/ 
-	struct	sCti
-	{
-		btRigidBody*	m_body;		/* Rigid body			*/ 
-		btVector3		m_normal;	/* Outward normal		*/ 
-		btScalar		m_offset;	/* Offset from origin	*/ 
-	};	
-
-	/* sMedium		*/ 
-	struct	sMedium
-	{
-		btVector3		m_velocity;	/* Velocity				*/ 
-		btScalar		m_pressure;	/* Pressure				*/ 
-		btScalar		m_density;	/* Density				*/ 
-	};
-
-	/* Base type	*/ 
-	struct	Element
-	{
-		void*			m_tag;			// User data
-		Element() : m_tag(0) {}
-	};
-	/* Material		*/ 
-	struct	Material : Element
-	{
-		btScalar				m_kLST;			// Linear stiffness coefficient [0,1]
-		btScalar				m_kAST;			// Area/Angular stiffness coefficient [0,1]
-		btScalar				m_kVST;			// Volume stiffness coefficient [0,1]
-		int						m_flags;		// Flags
-	};
-		
-	/* Feature		*/ 
-	struct	Feature : Element
-	{
-		Material*				m_material;		// Material
-	};
-	/* Node			*/ 
-	struct	Node : Feature
-	{
-		btVector3				m_x;			// Position
-		btVector3				m_q;			// Previous step position
-		btVector3				m_v;			// Velocity
-		btVector3				m_f;			// Force accumulator
-		btVector3				m_n;			// Normal
-		btScalar				m_im;			// 1/mass
-		btScalar				m_area;			// Area
-		btDbvtNode*				m_leaf;			// Leaf data
-		int						m_battach:1;	// Attached
-	};
-	/* Link			*/ 
-	struct	Link : Feature
-	{
-		Node*					m_n[2];			// Node pointers
-		btScalar				m_rl;			// Rest length		
-		int						m_bbending:1;	// Bending link
-		btScalar				m_c0;			// (ima+imb)*kLST
-		btScalar				m_c1;			// rl^2
-		btScalar				m_c2;			// |gradient|^2/c0
-		btVector3				m_c3;			// gradient
-	};
-	/* Face			*/ 
-	struct	Face : Feature
-	{
-		Node*					m_n[3];			// Node pointers
-		btVector3				m_normal;		// Normal
-		btScalar				m_ra;			// Rest area
-		btDbvtNode*				m_leaf;			// Leaf data
-	};
-	/* RContact		*/ 
-	struct	RContact
-	{
-		sCti		m_cti;			// Contact infos
-		Node*					m_node;			// Owner node
-		btMatrix3x3				m_c0;			// Impulse matrix
-		btVector3				m_c1;			// Relative anchor
-		btScalar				m_c2;			// ima*dt
-		btScalar				m_c3;			// Friction
-		btScalar				m_c4;			// Hardness
-	};
-	/* SContact		*/ 
-	struct	SContact
-	{
-		Node*					m_node;			// Node
-		Face*					m_face;			// Face
-		btVector3				m_weights;		// Weigths
-		btVector3				m_normal;		// Normal
-		btScalar				m_margin;		// Margin
-		btScalar				m_friction;		// Friction
-		btScalar				m_cfm[2];		// Constraint force mixing
-	};
-	/* Anchor		*/ 
-	struct	Anchor
-	{
-		Node*					m_node;			// Node pointer
-		btVector3				m_local;		// Anchor position in body space
-		btRigidBody*			m_body;			// Body
-		btMatrix3x3				m_c0;			// Impulse matrix
-		btVector3				m_c1;			// Relative anchor
-		btScalar				m_c2;			// ima*dt
-	};
-	/* Note			*/ 
-	struct	Note : Element
-	{
-		const char*				m_text;			// Text
-		btVector3				m_offset;		// Offset
-		int						m_rank;			// Rank
-		Node*					m_nodes[4];		// Nodes
-		btScalar				m_coords[4];	// Coordinates
-	};	
-	/* Pose			*/ 
-	struct	Pose
-	{
-		bool					m_bvolume;		// Is valid
-		bool					m_bframe;		// Is frame
-		btScalar				m_volume;		// Rest volume
-		tVector3Array			m_pos;			// Reference positions
-		tScalarArray			m_wgh;			// Weights
-		btVector3				m_com;			// COM
-		btMatrix3x3				m_rot;			// Rotation
-		btMatrix3x3				m_scl;			// Scale
-		btMatrix3x3				m_aqq;			// Base scaling
-	};
-	/* Cluster		*/ 
-	struct	Cluster
-	{		
-		btAlignedObjectArray<Node*>	m_nodes;		
-		tScalarArray				m_masses;
-		tVector3Array				m_framerefs;
-		btTransform					m_framexform;
-		btScalar					m_idmass;
-		btScalar					m_imass;
-		btMatrix3x3					m_locii;
-		btMatrix3x3					m_invwi;
-		btVector3					m_com;
-		btVector3					m_vimpulses[2];
-		btVector3					m_dimpulses[2];
-		int							m_nvimpulses;
-		int							m_ndimpulses;
-		btVector3					m_lv;
-		btVector3					m_av;
-		btDbvtNode*					m_leaf;
-		btScalar					m_ndamping;
-		btScalar					m_ldamping;
-		btScalar					m_adamping;
-		btScalar					m_matching;
-		bool						m_collide;
-									Cluster() : m_leaf(0),m_ndamping(0),m_ldamping(0),m_adamping(0),m_matching(0) {}
-	};
-	/* Impulse		*/ 
-	struct	Impulse
-	{
-		btVector3					m_velocity;
-		btVector3					m_drift;
-		int							m_asVelocity:1;
-		int							m_asDrift:1;
-		Impulse() : m_velocity(0,0,0),m_drift(0,0,0),m_asVelocity(0),m_asDrift(0)	{}
-		Impulse						operator -() const
-			{
-			Impulse i=*this;
-			i.m_velocity=-i.m_velocity;
-			i.m_drift=-i.m_drift;
-			return(i);
-			}
-		Impulse						operator*(btScalar x) const
-			{
-			Impulse i=*this;
-			i.m_velocity*=x;
-			i.m_drift*=x;
-			return(i);
-			}
-	};
-	/* Body			*/ 
-	struct	Body
-	{
-		Cluster*		m_soft;
-		btRigidBody*				m_rigid;
-									Body() : m_soft(0),m_rigid(0)				{}
-									Body(Cluster* p) : m_soft(p),m_rigid(0)	{}
-									Body(btRigidBody* p) : m_soft(0),m_rigid(p)	{}
-		void						activate() const
-			{
-			if(m_rigid) m_rigid->activate();
-			}
-		const btMatrix3x3&			invWorldInertia() const
-			{
-			static const btMatrix3x3	iwi(0,0,0,0,0,0,0,0,0);
-			if(m_rigid) return(m_rigid->getInvInertiaTensorWorld());
-			if(m_soft)	return(m_soft->m_invwi);
-			return(iwi);
-			}
-		btScalar					invMass() const
-			{
-			if(m_rigid) return(m_rigid->getInvMass());
-			if(m_soft)	return(m_soft->m_imass);
-			return(0);
-			}
-		const btTransform&			xform() const
-			{
-			static const btTransform	identity=btTransform::getIdentity();		
-			if(m_rigid) return(m_rigid->getInterpolationWorldTransform());
-			if(m_soft)	return(m_soft->m_framexform);
-			return(identity);
-			}
-		btVector3					linearVelocity() const
-			{
-			if(m_rigid) return(m_rigid->getLinearVelocity());
-			if(m_soft)	return(m_soft->m_lv);
-			return(btVector3(0,0,0));
-			}
-		btVector3					angularVelocity(const btVector3& rpos) const
-			{			
-			if(m_rigid) return(cross(m_rigid->getAngularVelocity(),rpos));
-			if(m_soft)	return(cross(m_soft->m_av,rpos));
-			return(btVector3(0,0,0));
-			}
-		btVector3					angularVelocity() const
-			{			
-			if(m_rigid) return(m_rigid->getAngularVelocity());
-			if(m_soft)	return(m_soft->m_av);
-			return(btVector3(0,0,0));
-			}
-		btVector3					velocity(const btVector3& rpos) const
-			{
-			return(linearVelocity()+angularVelocity(rpos));
-			}
-		void						applyVImpulse(const btVector3& impulse,const btVector3& rpos) const
-			{
-			if(m_rigid)	m_rigid->applyImpulse(impulse,rpos);
-			if(m_soft)	btSoftBody::clusterVImpulse(m_soft,rpos,impulse);
-			}
-		void						applyDImpulse(const btVector3& impulse,const btVector3& rpos) const
-			{
-			if(m_rigid)	m_rigid->applyImpulse(impulse,rpos);
-			if(m_soft)	btSoftBody::clusterDImpulse(m_soft,rpos,impulse);
-			}		
-		void						applyImpulse(const Impulse& impulse,const btVector3& rpos) const
-			{
-			if(impulse.m_asVelocity)	applyVImpulse(impulse.m_velocity,rpos);
-			if(impulse.m_asDrift)		applyDImpulse(impulse.m_drift,rpos);
-			}
-		void						applyVAImpulse(const btVector3& impulse) const
-			{
-			if(m_rigid)	m_rigid->applyTorqueImpulse(impulse);
-			if(m_soft)	btSoftBody::clusterVAImpulse(m_soft,impulse);
-			}
-		void						applyDAImpulse(const btVector3& impulse) const
-			{
-			if(m_rigid)	m_rigid->applyTorqueImpulse(impulse);
-			if(m_soft)	btSoftBody::clusterDAImpulse(m_soft,impulse);
-			}
-		void						applyAImpulse(const Impulse& impulse) const
-			{
-			if(impulse.m_asVelocity)	applyVAImpulse(impulse.m_velocity);
-			if(impulse.m_asDrift)		applyDAImpulse(impulse.m_drift);
-			}
-		void						applyDCImpulse(const btVector3& impulse) const
-			{
-			if(m_rigid)	m_rigid->applyCentralImpulse(impulse);
-			if(m_soft)	btSoftBody::clusterDCImpulse(m_soft,impulse);
-			}
-	};
-	/* Joint		*/ 
-	struct	Joint
-	{
-		struct eType { enum _ {
-			Linear,
-			Angular,
-			Contact,
-		};};
-		struct Specs
-			{
-						Specs() : erp(1),cfm(1),split(1) {}
-			btScalar	erp;
-			btScalar	cfm;
-			btScalar	split;
-			};
-		Body						m_bodies[2];
-		btVector3					m_refs[2];
-		btScalar					m_cfm;
-		btScalar					m_erp;
-		btScalar					m_split;
-		btVector3					m_drift;
-		btVector3					m_sdrift;
-		btMatrix3x3					m_massmatrix;
-		bool						m_delete;
-		virtual						~Joint() {}
-									Joint() : m_delete(false) {}
-		virtual void				Prepare(btScalar dt,int iterations);
-		virtual void				Solve(btScalar dt,btScalar sor)=0;
-		virtual void				Terminate(btScalar dt)=0;
-		virtual eType::_			Type() const=0;
-	};
-	/* LJoint		*/ 
-	struct	LJoint : Joint
-	{
-		struct Specs : Joint::Specs
-			{
-			btVector3	position;
-			};		
-		btVector3					m_rpos[2];
-		void						Prepare(btScalar dt,int iterations);
-		void						Solve(btScalar dt,btScalar sor);
-		void						Terminate(btScalar dt);
-		eType::_					Type() const { return(eType::Linear); }
-	};
-	/* AJoint		*/ 
-	struct	AJoint : Joint
-	{
-		struct IControl
-			{
-			virtual void			Prepare(AJoint*)				{}
-			virtual btScalar		Speed(AJoint*,btScalar current) { return(current); }
-			static IControl*		Default()						{ static IControl def;return(&def); }
-			};
-		struct Specs : Joint::Specs
-			{
-						Specs() : icontrol(IControl::Default()) {}
-			btVector3	axis;
-			IControl*	icontrol;
-			};		
-		btVector3					m_axis[2];
-		IControl*					m_icontrol;
-		void						Prepare(btScalar dt,int iterations);
-		void						Solve(btScalar dt,btScalar sor);
-		void						Terminate(btScalar dt);
-		eType::_					Type() const { return(eType::Angular); }
-	};
-	/* CJoint		*/ 
-	struct	CJoint : Joint
-	{		
-		int							m_life;
-		int							m_maxlife;
-		btVector3					m_rpos[2];
-		btVector3					m_normal;
-		btScalar					m_friction;
-		void						Prepare(btScalar dt,int iterations);
-		void						Solve(btScalar dt,btScalar sor);
-		void						Terminate(btScalar dt);
-		eType::_					Type() const { return(eType::Contact); }
-	};
-	/* Config		*/ 
-	struct	Config
-	{
-		eAeroModel::_			aeromodel;		// Aerodynamic model (default: V_Point)
-		btScalar				kVCF;			// Velocities correction factor (Baumgarte)
-		btScalar				kDP;			// Damping coefficient [0,1]
-		btScalar				kDG;			// Drag coefficient [0,+inf]
-		btScalar				kLF;			// Lift coefficient [0,+inf]
-		btScalar				kPR;			// Pressure coefficient [-inf,+inf]
-		btScalar				kVC;			// Volume conversation coefficient [0,+inf]
-		btScalar				kDF;			// Dynamic friction coefficient [0,1]
-		btScalar				kMT;			// Pose matching coefficient [0,1]		
-		btScalar				kCHR;			// Rigid contacts hardness [0,1]
-		btScalar				kKHR;			// Kinetic contacts hardness [0,1]
-		btScalar				kSHR;			// Soft contacts hardness [0,1]
-		btScalar				kAHR;			// Anchors hardness [0,1]
-		btScalar				kSRHR_CL;		// Soft vs rigid hardness [0,1] (cluster only)
-		btScalar				kSKHR_CL;		// Soft vs kinetic hardness [0,1] (cluster only)
-		btScalar				kSSHR_CL;		// Soft vs soft hardness [0,1] (cluster only)
-		btScalar				kSR_SPLT_CL;	// Soft vs rigid impulse split [0,1] (cluster only)
-		btScalar				kSK_SPLT_CL;	// Soft vs rigid impulse split [0,1] (cluster only)
-		btScalar				kSS_SPLT_CL;	// Soft vs rigid impulse split [0,1] (cluster only)
-		btScalar				maxvolume;		// Maximum volume ratio for pose
-		btScalar				timescale;		// Time scale
-		int						viterations;	// Velocities solver iterations
-		int						piterations;	// Positions solver iterations
-		int						diterations;	// Drift solver iterations
-		int						citerations;	// Cluster solver iterations
-		int						collisions;		// Collisions flags
-		tVSolverArray			m_vsequence;	// Velocity solvers sequence
-		tPSolverArray			m_psequence;	// Position solvers sequence
-		tPSolverArray			m_dsequence;	// Drift solvers sequence
-	};
-	/* SolverState	*/ 
-	struct	SolverState
-	{
-		btScalar				sdt;			// dt*timescale
-		btScalar				isdt;			// 1/sdt
-		btScalar				velmrg;			// velocity margin
-		btScalar				radmrg;			// radial margin
-		btScalar				updmrg;			// Update margin
-	};	
-	/* RayCaster	*/ 
-	struct	RayCaster : btDbvt::ICollide
-		{
-		btVector3			o;
-		btVector3			d;
-		btScalar			mint;
-		Face*	face;
-		int					tests;
-								RayCaster(const btVector3& org,const btVector3& dir,btScalar mxt);
-		void					Process(const btDbvtNode* leaf);
-		static inline btScalar	rayTriangle(const btVector3& org,
-											const btVector3& dir,
-											const btVector3& a,
-											const btVector3& b,
-											const btVector3& c,
-											btScalar maxt=SIMD_INFINITY);
-		};
-
-	//
-	// Typedef's
-	//
-
-	typedef void								(*psolver_t)(btSoftBody*,btScalar,btScalar);
-	typedef void								(*vsolver_t)(btSoftBody*,btScalar);
-	typedef btAlignedObjectArray<Cluster*>		tClusterArray;
-	typedef btAlignedObjectArray<Note>			tNoteArray;
-	typedef btAlignedObjectArray<Node>			tNodeArray;
-	typedef btAlignedObjectArray<btDbvtNode*>	tLeafArray;
-	typedef btAlignedObjectArray<Link>			tLinkArray;
-	typedef btAlignedObjectArray<Face>			tFaceArray;
-	typedef btAlignedObjectArray<Anchor>		tAnchorArray;
-	typedef btAlignedObjectArray<RContact>		tRContactArray;
-	typedef btAlignedObjectArray<SContact>		tSContactArray;
-	typedef btAlignedObjectArray<Material*>		tMaterialArray;
-	typedef btAlignedObjectArray<Joint*>		tJointArray;
-	typedef btAlignedObjectArray<btSoftBody*>	tSoftBodyArray;	
-
-	//
-	// Fields
-	//
-
-	Config					m_cfg;			// Configuration
-	SolverState				m_sst;			// Solver state
-	Pose					m_pose;			// Pose
-	void*					m_tag;			// User data
-	btSoftBodyWorldInfo*	m_worldInfo;	// World info
-	tNoteArray				m_notes;		// Notes
-	tNodeArray				m_nodes;		// Nodes
-	tLinkArray				m_links;		// Links
-	tFaceArray				m_faces;		// Faces
-	tAnchorArray			m_anchors;		// Anchors
-	tRContactArray			m_rcontacts;	// Rigid contacts
-	tSContactArray			m_scontacts;	// Soft contacts
-	tJointArray				m_joints;		// Joints
-	tMaterialArray			m_materials;	// Materials
-	btScalar				m_timeacc;		// Time accumulator
-	btVector3				m_bounds[2];	// Spatial bounds	
-	bool					m_bUpdateRtCst;	// Update runtime constants
-	btDbvt					m_ndbvt;		// Nodes tree
-	btDbvt					m_fdbvt;		// Faces tree
-	btDbvt					m_cdbvt;		// Clusters tree
-	tClusterArray			m_clusters;		// Clusters
-		
-	//
-	// Api
-	//
-	
-	/* ctor																	*/ 
-	btSoftBody(	btSoftBodyWorldInfo* worldInfo,int node_count,
-				const btVector3* x,
-				const btScalar* m);
-	/* dtor																	*/ 
-	virtual ~btSoftBody();
-	/* Check for existing link												*/ 
-	bool				checkLink(	int node0,
-		int node1) const;
-	bool				checkLink(	const Node* node0,
-									const Node* node1) const;
-	/* Check for existring face												*/ 
-	bool				checkFace(	int node0,
-									int node1,
-									int node2) const;
-	/* Append material														*/ 
-	Material*			appendMaterial();
-	/* Append note															*/ 
-	void				appendNote(	const char* text,
-									const btVector3& o,
-									const btVector4& c=btVector4(1,0,0,0),
-									Node* n0=0,
-									Node* n1=0,
-									Node* n2=0,
-									Node* n3=0);
-	void				appendNote(	const char* text,
-									const btVector3& o,
-									Node* feature);
-	void				appendNote(	const char* text,
-									const btVector3& o,
-									Link* feature);
-	void				appendNote(	const char* text,
-									const btVector3& o,
-									Face* feature);
-	/* Append node															*/ 
-	void				appendNode(	const btVector3& x,btScalar m);
-	/* Append link															*/ 
-	void				appendLink(int model=-1,Material* mat=0);
-	void				appendLink(	int node0,
-									int node1,
-									Material* mat=0,
-									bool bcheckexist=false);
-	void				appendLink(	Node* node0,
-									Node* node1,
-									Material* mat=0,
-									bool bcheckexist=false);
-	/* Append face															*/ 
-	void				appendFace(int model=-1,Material* mat=0);
-	void				appendFace(	int node0,
-									int node1,
-									int node2,
-									Material* mat=0);
-	/* Append anchor														*/ 
-	void				appendAnchor(	int node,
-										btRigidBody* body);
-	/* Append linear joint													*/ 
-	void				appendLinearJoint(const LJoint::Specs& specs,Cluster* body0,Body body1);
-	void				appendLinearJoint(const LJoint::Specs& specs,Body body=Body());
-	void				appendLinearJoint(const LJoint::Specs& specs,btSoftBody* body);
-	/* Append linear joint													*/ 
-	void				appendAngularJoint(const AJoint::Specs& specs,Cluster* body0,Body body1);
-	void				appendAngularJoint(const AJoint::Specs& specs,Body body=Body());
-	void				appendAngularJoint(const AJoint::Specs& specs,btSoftBody* body);
-	/* Add force (or gravity) to the entire body							*/ 
-	void				addForce(		const btVector3& force);
-	/* Add force (or gravity) to a node of the body							*/ 
-	void				addForce(		const btVector3& force,
-										int node);
-	/* Add velocity to the entire body										*/ 
-	void				addVelocity(	const btVector3& velocity);
-	/* Add velocity to a node of the body									*/ 
-	void				addVelocity(	const btVector3& velocity,
-										int node);
-	/* Set mass																*/ 
-	void				setMass(		int node,
-										btScalar mass);
-	/* Get mass																*/ 
-	btScalar			getMass(		int node) const;
-	/* Get total mass														*/ 
-	btScalar			getTotalMass() const;
-	/* Set total mass (weighted by previous masses)							*/ 
-	void				setTotalMass(	btScalar mass,
-										bool fromfaces=false);
-	/* Set total density													*/ 
-	void				setTotalDensity(btScalar density);
-	/* Transform															*/ 
-	void				transform(		const btTransform& trs);
-	/* Translate															*/ 
-	void				translate(		const btVector3& trs);
-	/* Rotate															*/ 
-	void				rotate(	const btQuaternion& rot);
-	/* Scale																*/ 
-	void				scale(	const btVector3& scl);
-	/* Set current state as pose											*/ 
-	void				setPose(		bool bvolume,
-										bool bframe);
-	/* Return the volume													*/ 
-	btScalar			getVolume() const;
-	/* Cluster count														*/ 
-	int					clusterCount() const;
-	/* Cluster center of mass												*/ 
-	static btVector3	clusterCom(const Cluster* cluster);
-	btVector3			clusterCom(int cluster) const;
-	/* Cluster velocity at rpos												*/ 
-	static btVector3	clusterVelocity(const Cluster* cluster,const btVector3& rpos);
-	/* Cluster impulse														*/ 
-	static void			clusterVImpulse(Cluster* cluster,const btVector3& rpos,const btVector3& impulse);
-	static void			clusterDImpulse(Cluster* cluster,const btVector3& rpos,const btVector3& impulse);
-	static void			clusterImpulse(Cluster* cluster,const btVector3& rpos,const Impulse& impulse);
-	static void			clusterVAImpulse(Cluster* cluster,const btVector3& impulse);
-	static void			clusterDAImpulse(Cluster* cluster,const btVector3& impulse);
-	static void			clusterAImpulse(Cluster* cluster,const Impulse& impulse);
-	static void			clusterDCImpulse(Cluster* cluster,const btVector3& impulse);
-	/* Generate bending constraints based on distance in the adjency graph	*/ 
-	int					generateBendingConstraints(	int distance,
-													Material* mat=0);
-	/* Randomize constraints to reduce solver bias							*/ 
-	void				randomizeConstraints();
-	/* Generate clusters (K-mean)											*/ 
-	int					generateClusters(int k,int maxiterations=8192);
-	/* Refine																*/ 
-	void				refine(ImplicitFn* ifn,btScalar accurary,bool cut);
-	/* CutLink																*/ 
-	bool				cutLink(int node0,int node1,btScalar position);
-	bool				cutLink(const Node* node0,const Node* node1,btScalar position);
-	/* Ray casting															*/ 
-	bool				rayCast(const btVector3& org,
-								const btVector3& dir,
-								sRayCast& results,
-								btScalar maxtime=SIMD_INFINITY);
-	/* Solver presets														*/ 
-	void				setSolver(eSolverPresets::_ preset);
-	/* predictMotion														*/ 
-	void				predictMotion(btScalar dt);
-	/* solveConstraints														*/ 
-	void				solveConstraints();
-	/* staticSolve															*/ 
-	void				staticSolve(int iterations);
-	/* solveCommonConstraints												*/ 
-	static void			solveCommonConstraints(btSoftBody** bodies,int count,int iterations);
-	/* solveClusters														*/ 
-	static void			solveClusters(const btAlignedObjectArray<btSoftBody*>& bodies);
-	/* integrateMotion														*/ 
-	void				integrateMotion();
-	/* defaultCollisionHandlers												*/ 
-	void				defaultCollisionHandler(btCollisionObject* pco);
-	void				defaultCollisionHandler(btSoftBody* psb);
-		
-	//
-	// Cast
-	//
-		
-	static const btSoftBody*	upcast(const btCollisionObject* colObj)
-	{
-		if (colObj->getInternalType()==CO_SOFT_BODY)
-			return (const btSoftBody*)colObj;
-		return 0;
-	}
-	static btSoftBody*			upcast(btCollisionObject* colObj)
-	{
-		if (colObj->getInternalType()==CO_SOFT_BODY)
-			return (btSoftBody*)colObj;
-		return 0;
-	}
-
-	//
-	// ::btCollisionObject
-	//
-
-	virtual void getAabb(btVector3& aabbMin,btVector3& aabbMax) const
-	{
-		aabbMin = m_bounds[0];
-		aabbMax = m_bounds[1];
-	}
-	//
-	// Private
-	//
-	void				pointersToIndices();
-	void				indicesToPointers(const int* map=0);
-	int					rayCast(const btVector3& org,const btVector3& dir,
-								btScalar& mint,eFeature::_& feature,int& index,bool bcountonly) const;
-	void				initializeFaceTree();
-	btVector3			evaluateCom() const;
-	bool				checkContact(btRigidBody* prb,const btVector3& x,btScalar margin,btSoftBody::sCti& cti) const;
-	void				updateNormals();
-	void				updateBounds();
-	void				updatePose();
-	void				updateConstants();
-	void				initializeClusters();
-	void				updateClusters();
-	void				cleanupClusters();
-	void				prepareClusters(int iterations);
-	void				solveClusters(btScalar sor);
-	void				applyClusters(bool drift);
-	void				dampClusters();
-	void				applyForces();	
-	static void			PSolve_Anchors(btSoftBody* psb,btScalar kst,btScalar ti);
-	static void			PSolve_RContacts(btSoftBody* psb,btScalar kst,btScalar ti);
-	static void			PSolve_SContacts(btSoftBody* psb,btScalar,btScalar ti);
-	static void			PSolve_Links(btSoftBody* psb,btScalar kst,btScalar ti);
-	static void			VSolve_Links(btSoftBody* psb,btScalar kst);
-	static psolver_t	getSolver(ePSolver::_ solver);
-	static vsolver_t	getSolver(eVSolver::_ solver);
-	
-};
-
-
-
-#endif //_BT_SOFT_BODY_H
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp b/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp
deleted file mode 100644
index 5e3211ed73b..00000000000
--- a/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp
+++ /dev/null
@@ -1,410 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-
-#include "btSoftBodyConcaveCollisionAlgorithm.h"
-#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
-#include "BulletCollision/CollisionShapes/btMultiSphereShape.h"
-#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
-#include "BulletCollision/CollisionShapes/btConcaveShape.h"
-#include "BulletCollision/CollisionDispatch/btManifoldResult.h"
-#include "BulletCollision/NarrowPhaseCollision/btRaycastCallback.h"
-#include "BulletCollision/CollisionShapes/btTriangleShape.h"
-#include "BulletCollision/CollisionShapes/btSphereShape.h"
-#include "BulletCollision/CollisionShapes/btTetrahedronShape.h"
-#include "BulletCollision/CollisionShapes/btConvexHullShape.h"
-
-
-
-#include "LinearMath/btIDebugDraw.h"
-#include "BulletCollision/NarrowPhaseCollision/btSubSimplexConvexCast.h"
-#include "BulletSoftBody/btSoftBody.h"
-
-#define BT_SOFTBODY_TRIANGLE_EXTRUSION btScalar(0.3)
-
-btSoftBodyConcaveCollisionAlgorithm::btSoftBodyConcaveCollisionAlgorithm( const btCollisionAlgorithmConstructionInfo& ci, btCollisionObject* body0,btCollisionObject* body1,bool isSwapped)
-: btCollisionAlgorithm(ci),
-m_isSwapped(isSwapped),
-m_btSoftBodyTriangleCallback(ci.m_dispatcher1,body0,body1,isSwapped)
-{
-}
-
-
-
-btSoftBodyConcaveCollisionAlgorithm::~btSoftBodyConcaveCollisionAlgorithm()
-{
-}
-
-
-
-btSoftBodyTriangleCallback::btSoftBodyTriangleCallback(btDispatcher*  dispatcher,btCollisionObject* body0,btCollisionObject* body1,bool isSwapped):
-	  m_dispatcher(dispatcher),
-	m_dispatchInfoPtr(0)
-{
-	m_softBody = (btSoftBody*) (isSwapped? body1:body0);
-	m_triBody = isSwapped? body0:body1;
-	
-	  //
-	  // create the manifold from the dispatcher 'manifold pool'
-	  //
-//	  m_manifoldPtr = m_dispatcher->getNewManifold(m_convexBody,m_triBody);
-
-  	  clearCache();
-}
-
-btSoftBodyTriangleCallback::~btSoftBodyTriangleCallback()
-{
-	clearCache();
-//	m_dispatcher->releaseManifold( m_manifoldPtr );
-  
-}
-  
-
-void	btSoftBodyTriangleCallback::clearCache()
-{
-	//m_dispatcher->clearManifold(m_manifoldPtr);
-};
-
-
-static const int maxParts = 1;
-static const int maxTriangleIndex = 100*100;
-
-btCollisionShape* shapeCache[maxParts][maxTriangleIndex];
-
-
-void btSoftBodyTriangleCallback::processTriangle(btVector3* triangle,int partId, int triangleIndex)
-{
-	static bool hackedFirst = true;
-	if (hackedFirst)
-	{
-		hackedFirst = false;
-		int i,j;
-		for (i=0;i<maxParts;i++)
-		{
-			for (j=0;j<maxTriangleIndex;j++)
-			{
-				shapeCache[i][j]=0;
-			}
-		}
-	}
- 
-	//just for debugging purposes
-	//printf("triangle %d",m_triangleCount++);
-btCollisionObject* ob = static_cast<btCollisionObject*>(m_triBody);
-	btCollisionAlgorithmConstructionInfo ci;
-	ci.m_dispatcher1 = m_dispatcher;
-
-		///debug drawing of the overlapping triangles
-	if (m_dispatchInfoPtr && m_dispatchInfoPtr->m_debugDraw && m_dispatchInfoPtr->m_debugDraw->getDebugMode() > 0)
-	{
-		btVector3 color(255,255,0);
-		btTransform& tr = ob->getWorldTransform();
-		m_dispatchInfoPtr->m_debugDraw->drawLine(tr(triangle[0]),tr(triangle[1]),color);
-		m_dispatchInfoPtr->m_debugDraw->drawLine(tr(triangle[1]),tr(triangle[2]),color);
-		m_dispatchInfoPtr->m_debugDraw->drawLine(tr(triangle[2]),tr(triangle[0]),color);
-
-		//btVector3 center = triangle[0] + triangle[1]+triangle[2];
-		//center *= btScalar(0.333333);
-		//m_dispatchInfoPtr->m_debugDraw->drawLine(tr(triangle[0]),tr(center),color);
-		//m_dispatchInfoPtr->m_debugDraw->drawLine(tr(triangle[1]),tr(center),color);
-		//m_dispatchInfoPtr->m_debugDraw->drawLine(tr(triangle[2]),tr(center),color);
-
-	}
-
-	if (shapeCache[partId][triangleIndex])
-	{
-		btCollisionShape* tm = shapeCache[partId][triangleIndex];
-
-		//copy over user pointers to temporary shape
-		tm->setUserPointer(ob->getRootCollisionShape()->getUserPointer());
-		
-		btCollisionShape* tmpShape = ob->getCollisionShape();
-		ob->internalSetTemporaryCollisionShape( tm );
-		
-
-		btCollisionAlgorithm* colAlgo = ci.m_dispatcher1->findAlgorithm(m_softBody,m_triBody,0);//m_manifoldPtr);
-		
-		colAlgo->processCollision(m_softBody,m_triBody,*m_dispatchInfoPtr,m_resultOut);
-		colAlgo->~btCollisionAlgorithm();
-		ci.m_dispatcher1->freeCollisionAlgorithm(colAlgo);
-		ob->internalSetTemporaryCollisionShape( tmpShape);
-		return;
-	}
-
-	//aabb filter is already applied!	
-
-
-	
-
-	
-
-
-
-	//btCollisionObject* colObj = static_cast<btCollisionObject*>(m_convexProxy->m_clientObject);
-	
-//	if (m_softBody->getCollisionShape()->getShapeType()==
-	{
-//		btVector3 other;
-		btVector3 normal = (triangle[1]-triangle[0]).cross(triangle[2]-triangle[0]);
-		normal.normalize();
-		normal*= BT_SOFTBODY_TRIANGLE_EXTRUSION;
-//		other=(triangle[0]+triangle[1]+triangle[2])*0.333333f;
-//		other+=normal*22.f;
-		btVector3	pts[6] = {triangle[0]+normal,
-			triangle[1]+normal,
-		triangle[2]+normal,
-		triangle[0]-normal,
-		triangle[1]-normal,
-		triangle[2]-normal};
-
-		btConvexHullShape* tm = new btConvexHullShape(&pts[0].getX(),6);
-
-
-//		btBU_Simplex1to4 tm(triangle[0],triangle[1],triangle[2],other);
-		
-		//btTriangleShape tm(triangle[0],triangle[1],triangle[2]);	
-	//	tm.setMargin(m_collisionMarginTriangle);
-		
-		//copy over user pointers to temporary shape
-		tm->setUserPointer(ob->getRootCollisionShape()->getUserPointer());
-		
-		btCollisionShape* tmpShape = ob->getCollisionShape();
-		ob->internalSetTemporaryCollisionShape( tm );
-		
-
-		btCollisionAlgorithm* colAlgo = ci.m_dispatcher1->findAlgorithm(m_softBody,m_triBody,0);//m_manifoldPtr);
-		///this should use the btDispatcher, so the actual registered algorithm is used
-		//		btConvexConvexAlgorithm cvxcvxalgo(m_manifoldPtr,ci,m_convexBody,m_triBody);
-
-		//m_resultOut->setShapeIdentifiers(-1,-1,partId,triangleIndex);
-	//	cvxcvxalgo.setShapeIdentifiers(-1,-1,partId,triangleIndex);
-//		cvxcvxalgo.processCollision(m_convexBody,m_triBody,*m_dispatchInfoPtr,m_resultOut);
-		colAlgo->processCollision(m_softBody,m_triBody,*m_dispatchInfoPtr,m_resultOut);
-		colAlgo->~btCollisionAlgorithm();
-		ci.m_dispatcher1->freeCollisionAlgorithm(colAlgo);
-		ob->internalSetTemporaryCollisionShape( tmpShape );
-//		delete tm;
-
-		shapeCache[partId][triangleIndex] = tm;
-
-	}
-
-	
-
-}
-
-
-
-void	btSoftBodyTriangleCallback::setTimeStepAndCounters(btScalar collisionMarginTriangle,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut)
-{
-	m_dispatchInfoPtr = &dispatchInfo;
-	m_collisionMarginTriangle = collisionMarginTriangle;
-	m_resultOut = resultOut;
-
-	//recalc aabbs
-//	btTransform softbodyInTriangleSpace;
-//	softbodyInTriangleSpace = m_triBody->getWorldTransform().inverse() * m_softBody->getWorldTransform();
-//	btCollisionShape* convexShape = static_cast<btCollisionShape*>(m_convexBody->getCollisionShape());
-	//CollisionShape* triangleShape = static_cast<btCollisionShape*>(triBody->m_collisionShape);
-	btVector3	aabbWorldSpaceMin,aabbWorldSpaceMax;
-	m_softBody->getAabb(aabbWorldSpaceMin,aabbWorldSpaceMax);
-
-	btVector3 halfExtents = (aabbWorldSpaceMax-aabbWorldSpaceMin)*btScalar(0.5);
-	btVector3 softBodyCenter = (aabbWorldSpaceMax+aabbWorldSpaceMin)*btScalar(0.5);
-
-	btTransform	triInverse = m_triBody->getWorldTransform().inverse();
-
-	btMatrix3x3 abs_b = triInverse.getBasis().absolute();  
-	btPoint3 center = softBodyCenter + triInverse.getOrigin();
-
-	btVector3 extent = btVector3(abs_b[0].dot(halfExtents),
-		   abs_b[1].dot(halfExtents),
-		  abs_b[2].dot(halfExtents));
-//	extent += btVector3(getMargin(),getMargin(),getMargin());
-
-	m_aabbMin = center - extent;
-	m_aabbMax = center + extent;
-
-	btScalar extraMargin = collisionMarginTriangle+btScalar(BT_SOFTBODY_TRIANGLE_EXTRUSION);
-	btVector3 extra(extraMargin,extraMargin,extraMargin);
-
-	m_aabbMax += extra;
-	m_aabbMin -= extra;
-
-/*	btVector3 extra(2,2,2);
-	m_aabbMin = aabbWorldSpaceMin-extra;
-	m_aabbMax = aabbWorldSpaceMax+extra;
-*/
-
-}
-
-void btSoftBodyConcaveCollisionAlgorithm::clearCache()
-{
-	m_btSoftBodyTriangleCallback.clearCache();
-
-}
-
-void btSoftBodyConcaveCollisionAlgorithm::processCollision (btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut)
-{
-	
-	
-	btCollisionObject* convexBody = m_isSwapped ? body1 : body0;
-	btCollisionObject* triBody = m_isSwapped ? body0 : body1;
-
-	if (triBody->getCollisionShape()->isConcave())
-	{
-
-
-		btCollisionObject*	triOb = triBody;
-		btConcaveShape* concaveShape = static_cast<btConcaveShape*>( triOb->getCollisionShape());
-		
-	//	if (convexBody->getCollisionShape()->isConvex())
-		{
-			btScalar collisionMarginTriangle = concaveShape->getMargin();
-					
-//			resultOut->setPersistentManifold(m_btSoftBodyTriangleCallback.m_manifoldPtr);
-			m_btSoftBodyTriangleCallback.setTimeStepAndCounters(collisionMarginTriangle,dispatchInfo,resultOut);
-
-			//Disable persistency. previously, some older algorithm calculated all contacts in one go, so you can clear it here.
-			//m_dispatcher->clearManifold(m_btSoftBodyTriangleCallback.m_manifoldPtr);
-
-//			m_btSoftBodyTriangleCallback.m_manifoldPtr->setBodies(convexBody,triBody);
-
-
-			concaveShape->processAllTriangles( &m_btSoftBodyTriangleCallback,m_btSoftBodyTriangleCallback.getAabbMin(),m_btSoftBodyTriangleCallback.getAabbMax());
-			
-		//	resultOut->refreshContactPoints();
-	
-		}
-	
-	}
-
-}
-
-
-btScalar btSoftBodyConcaveCollisionAlgorithm::calculateTimeOfImpact(btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut)
-{
-	(void)resultOut;
-	(void)dispatchInfo;
-	btCollisionObject* convexbody = m_isSwapped ? body1 : body0;
-	btCollisionObject* triBody = m_isSwapped ? body0 : body1;
-
-
-	//quick approximation using raycast, todo: hook up to the continuous collision detection (one of the btConvexCast)
-
-	//only perform CCD above a certain threshold, this prevents blocking on the long run
-	//because object in a blocked ccd state (hitfraction<1) get their linear velocity halved each frame...
-	btScalar squareMot0 = (convexbody->getInterpolationWorldTransform().getOrigin() - convexbody->getWorldTransform().getOrigin()).length2();
-	if (squareMot0 < convexbody->getCcdSquareMotionThreshold())
-	{
-		return btScalar(1.);
-	}
-
-	//const btVector3& from = convexbody->m_worldTransform.getOrigin();
-	//btVector3 to = convexbody->m_interpolationWorldTransform.getOrigin();
-	//todo: only do if the motion exceeds the 'radius'
-
-	btTransform triInv = triBody->getWorldTransform().inverse();
-	btTransform convexFromLocal = triInv * convexbody->getWorldTransform();
-	btTransform convexToLocal = triInv * convexbody->getInterpolationWorldTransform();
-
-	struct LocalTriangleSphereCastCallback	: public btTriangleCallback
-	{
-		btTransform m_ccdSphereFromTrans;
-		btTransform m_ccdSphereToTrans;
-		btTransform	m_meshTransform;
-
-		btScalar	m_ccdSphereRadius;
-		btScalar	m_hitFraction;
-	
-
-		LocalTriangleSphereCastCallback(const btTransform& from,const btTransform& to,btScalar ccdSphereRadius,btScalar hitFraction)
-			:m_ccdSphereFromTrans(from),
-			m_ccdSphereToTrans(to),
-			m_ccdSphereRadius(ccdSphereRadius),
-			m_hitFraction(hitFraction)
-		{			
-		}
-		
-		
-		virtual void processTriangle(btVector3* triangle, int partId, int triangleIndex)
-		{
-			(void)partId;
-			(void)triangleIndex;
-			//do a swept sphere for now
-			btTransform ident;
-			ident.setIdentity();
-			btConvexCast::CastResult castResult;
-			castResult.m_fraction = m_hitFraction;
-			btSphereShape	pointShape(m_ccdSphereRadius);
-			btTriangleShape	triShape(triangle[0],triangle[1],triangle[2]);
-			btVoronoiSimplexSolver	simplexSolver;
-			btSubsimplexConvexCast convexCaster(&pointShape,&triShape,&simplexSolver);
-			//GjkConvexCast	convexCaster(&pointShape,convexShape,&simplexSolver);
-			//ContinuousConvexCollision convexCaster(&pointShape,convexShape,&simplexSolver,0);
-			//local space?
-
-			if (convexCaster.calcTimeOfImpact(m_ccdSphereFromTrans,m_ccdSphereToTrans,
-				ident,ident,castResult))
-			{
-				if (m_hitFraction > castResult.m_fraction)
-					m_hitFraction = castResult.m_fraction;
-			}
-
-		}
-
-	};
-
-
-	
-
-	
-	if (triBody->getCollisionShape()->isConcave())
-	{
-		btVector3 rayAabbMin = convexFromLocal.getOrigin();
-		rayAabbMin.setMin(convexToLocal.getOrigin());
-		btVector3 rayAabbMax = convexFromLocal.getOrigin();
-		rayAabbMax.setMax(convexToLocal.getOrigin());
-		btScalar ccdRadius0 = convexbody->getCcdSweptSphereRadius();
-		rayAabbMin -= btVector3(ccdRadius0,ccdRadius0,ccdRadius0);
-		rayAabbMax += btVector3(ccdRadius0,ccdRadius0,ccdRadius0);
-
-		btScalar curHitFraction = btScalar(1.); //is this available?
-		LocalTriangleSphereCastCallback raycastCallback(convexFromLocal,convexToLocal,
-			convexbody->getCcdSweptSphereRadius(),curHitFraction);
-
-		raycastCallback.m_hitFraction = convexbody->getHitFraction();
-
-		btCollisionObject* concavebody = triBody;
-
-		btConcaveShape* triangleMesh = (btConcaveShape*) concavebody->getCollisionShape();
-		
-		if (triangleMesh)
-		{
-			triangleMesh->processAllTriangles(&raycastCallback,rayAabbMin,rayAabbMax);
-		}
-	
-
-
-		if (raycastCallback.m_hitFraction < convexbody->getHitFraction())
-		{
-			convexbody->setHitFraction( raycastCallback.m_hitFraction);
-			return raycastCallback.m_hitFraction;
-		}
-	}
-
-	return btScalar(1.);
-
-}
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h b/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
deleted file mode 100644
index adb91329a4c..00000000000
--- a/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-#ifndef SOFT_BODY_CONCAVE_COLLISION_ALGORITHM_H
-#define SOFT_BODY_CONCAVE_COLLISION_ALGORITHM_H
-
-#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
-#include "BulletCollision/BroadphaseCollision/btDispatcher.h"
-#include "BulletCollision/BroadphaseCollision/btBroadphaseInterface.h"
-#include "BulletCollision/CollisionShapes/btTriangleCallback.h"
-#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h"
-class btDispatcher;
-#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
-#include "BulletCollision/CollisionDispatch/btCollisionCreateFunc.h"
-class btSoftBody;
-
-///For each triangle in the concave mesh that overlaps with the AABB of a soft body (m_softBody), processTriangle is called.
-class btSoftBodyTriangleCallback : public btTriangleCallback
-{
-	btSoftBody* m_softBody;
-	btCollisionObject* m_triBody;
-
-	btVector3	m_aabbMin;
-	btVector3	m_aabbMax ;
-
-	btManifoldResult* m_resultOut;
-
-	btDispatcher*	m_dispatcher;
-	const btDispatcherInfo* m_dispatchInfoPtr;
-	btScalar m_collisionMarginTriangle;
-	
-public:
-int	m_triangleCount;
-	
-//	btPersistentManifold*	m_manifoldPtr;
-
-	btSoftBodyTriangleCallback(btDispatcher* dispatcher,btCollisionObject* body0,btCollisionObject* body1,bool isSwapped);
-
-	void	setTimeStepAndCounters(btScalar collisionMarginTriangle,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut);
-
-	virtual ~btSoftBodyTriangleCallback();
-
-	virtual void processTriangle(btVector3* triangle, int partId, int triangleIndex);
-	
-	void clearCache();
-
-	SIMD_FORCE_INLINE const btVector3& getAabbMin() const
-	{
-		return m_aabbMin;
-	}
-	SIMD_FORCE_INLINE const btVector3& getAabbMax() const
-	{
-		return m_aabbMax;
-	}
-
-};
-
-
-
-
-/// btSoftBodyConcaveCollisionAlgorithm  supports collision between soft body shapes and (concave) trianges meshes.
-class btSoftBodyConcaveCollisionAlgorithm  : public btCollisionAlgorithm
-{
-
-	bool	m_isSwapped;
-
-	btSoftBodyTriangleCallback m_btSoftBodyTriangleCallback;
-
-public:
-
-	btSoftBodyConcaveCollisionAlgorithm( const btCollisionAlgorithmConstructionInfo& ci,btCollisionObject* body0,btCollisionObject* body1,bool isSwapped);
-
-	virtual ~btSoftBodyConcaveCollisionAlgorithm();
-
-	virtual void processCollision (btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut);
-
-	btScalar	calculateTimeOfImpact(btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut);
-
-	virtual	void	getAllContactManifolds(btManifoldArray&	manifoldArray)
-	{
-		//we don't add any manifolds
-	}
-
-	void	clearCache();
-
-	struct CreateFunc :public 	btCollisionAlgorithmCreateFunc
-	{
-		virtual	btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, btCollisionObject* body0,btCollisionObject* body1)
-		{
-			void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btSoftBodyConcaveCollisionAlgorithm));
-			return new(mem) btSoftBodyConcaveCollisionAlgorithm(ci,body0,body1,false);
-		}
-	};
-
-	struct SwappedCreateFunc :public 	btCollisionAlgorithmCreateFunc
-	{
-		virtual	btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, btCollisionObject* body0,btCollisionObject* body1)
-		{
-			void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btSoftBodyConcaveCollisionAlgorithm));
-			return new(mem) btSoftBodyConcaveCollisionAlgorithm(ci,body0,body1,true);
-		}
-	};
-
-};
-
-#endif //SOFT_BODY_CONCAVE_COLLISION_ALGORITHM_H
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp b/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp
deleted file mode 100644
index e9ec81f4d2c..00000000000
--- a/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp
+++ /dev/null
@@ -1,656 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it freely,
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-///btSoftBodyHelpers.cpp by Nathanael Presson
-
-#include "btSoftBodyInternals.h"
-#include <stdio.h>
-#include <string.h>
-#include "btSoftBodyHelpers.h"
-#include "LinearMath/btConvexHull.h"
-
-//
-static void				drawVertex(	btIDebugDraw* idraw,
-									const btVector3& x,btScalar s,const btVector3& c)
-	{
-		idraw->drawLine(x-btVector3(s,0,0),x+btVector3(s,0,0),c);
-		idraw->drawLine(x-btVector3(0,s,0),x+btVector3(0,s,0),c);
-		idraw->drawLine(x-btVector3(0,0,s),x+btVector3(0,0,s),c);
-	}
-
-//
-static void				drawBox(	btIDebugDraw* idraw,
-									const btVector3& mins,
-									const btVector3& maxs,
-									const btVector3& color)
-{
-const btVector3	c[]={	btVector3(mins.x(),mins.y(),mins.z()),
-						btVector3(maxs.x(),mins.y(),mins.z()),
-						btVector3(maxs.x(),maxs.y(),mins.z()),
-						btVector3(mins.x(),maxs.y(),mins.z()),
-						btVector3(mins.x(),mins.y(),maxs.z()),
-						btVector3(maxs.x(),mins.y(),maxs.z()),
-						btVector3(maxs.x(),maxs.y(),maxs.z()),
-						btVector3(mins.x(),maxs.y(),maxs.z())};
-idraw->drawLine(c[0],c[1],color);idraw->drawLine(c[1],c[2],color);
-idraw->drawLine(c[2],c[3],color);idraw->drawLine(c[3],c[0],color);
-idraw->drawLine(c[4],c[5],color);idraw->drawLine(c[5],c[6],color);
-idraw->drawLine(c[6],c[7],color);idraw->drawLine(c[7],c[4],color);
-idraw->drawLine(c[0],c[4],color);idraw->drawLine(c[1],c[5],color);
-idraw->drawLine(c[2],c[6],color);idraw->drawLine(c[3],c[7],color);
-}
-
-//
-static void				drawTree(	btIDebugDraw* idraw,
-									const btDbvtNode* node,
-									int depth,
-									const btVector3& ncolor,
-									const btVector3& lcolor,
-									int mindepth,
-									int maxdepth)
-{
-if(node)
-	{
-	if(node->isinternal()&&((depth<maxdepth)||(maxdepth<0)))
-		{
-		drawTree(idraw,node->childs[0],depth+1,ncolor,lcolor,mindepth,maxdepth);
-		drawTree(idraw,node->childs[1],depth+1,ncolor,lcolor,mindepth,maxdepth);
-		}
-	if(depth>=mindepth)
-		{
-		const btScalar	scl=(btScalar)(node->isinternal()?1:1);
-		const btVector3	mi=node->volume.Center()-node->volume.Extents()*scl;
-		const btVector3	mx=node->volume.Center()+node->volume.Extents()*scl;
-		drawBox(idraw,mi,mx,node->isleaf()?lcolor:ncolor);
-		}
-	}
-}
-
-//
-template <typename T>
-static inline T				sum(const btAlignedObjectArray<T>& items)
-{
-T	v;
-if(items.size())
-	{
-	v=items[0];
-	for(int i=1,ni=items.size();i<ni;++i)
-		{
-		v+=items[i];
-		}
-	}
-return(v);
-}
-
-//
-template <typename T,typename Q>
-static inline void			add(btAlignedObjectArray<T>& items,const Q& value)
-{
-for(int i=0,ni=items.size();i<ni;++i)
-	{
-	items[i]+=value;
-	}
-}
-
-//
-template <typename T,typename Q>
-static inline void			mul(btAlignedObjectArray<T>& items,const Q& value)
-{
-for(int i=0,ni=items.size();i<ni;++i)
-	{
-	items[i]*=value;
-	}
-}
-
-//
-template <typename T>
-static inline T				average(const btAlignedObjectArray<T>& items)
-{
-const btScalar	n=(btScalar)(items.size()>0?items.size():1);
-return(sum(items)/n);
-}
-
-//
-static inline btScalar		tetravolume(const btVector3& x0,
-										const btVector3& x1,
-										const btVector3& x2,
-										const btVector3& x3)
-{
-	const btVector3	a=x1-x0;
-	const btVector3	b=x2-x0;
-	const btVector3	c=x3-x0;
-	return(dot(a,cross(b,c)));
-}
-
-//
-#if 0
-static btVector3		stresscolor(btScalar stress)
-	{
-	static const btVector3	spectrum[]=	{	btVector3(1,0,1),
-											btVector3(0,0,1),
-											btVector3(0,1,1),
-											btVector3(0,1,0),
-											btVector3(1,1,0),
-											btVector3(1,0,0),
-											btVector3(1,0,0)};
-	static const int		ncolors=sizeof(spectrum)/sizeof(spectrum[0])-1;
-	static const btScalar	one=1;
-	stress=btMax<btScalar>(0,btMin<btScalar>(1,stress))*ncolors;
-	const int				sel=(int)stress;
-	const btScalar			frc=stress-sel;
-	return(spectrum[sel]+(spectrum[sel+1]-spectrum[sel])*frc);
-	}
-#endif
-
-//
-void			btSoftBodyHelpers::Draw(	btSoftBody* psb,
-					 btIDebugDraw* idraw,
-					 int drawflags)
-{
-	const btScalar		scl=(btScalar)0.1;
-	const btScalar		nscl=scl*5;
-	const btVector3		lcolor=btVector3(0,0,0);
-	const btVector3		ncolor=btVector3(1,1,1);
-	const btVector3		ccolor=btVector3(1,0,0);
-	int i,j,nj;
-
-	/* Nodes	*/ 
-	if(0!=(drawflags&fDrawFlags::Nodes))
-	{
-		for(i=0;i<psb->m_nodes.size();++i)
-		{
-			const btSoftBody::Node&	n=psb->m_nodes[i];
-			if(0==(n.m_material->m_flags&btSoftBody::fMaterial::DebugDraw)) continue;
-			idraw->drawLine(n.m_x-btVector3(scl,0,0),n.m_x+btVector3(scl,0,0),btVector3(1,0,0));
-			idraw->drawLine(n.m_x-btVector3(0,scl,0),n.m_x+btVector3(0,scl,0),btVector3(0,1,0));
-			idraw->drawLine(n.m_x-btVector3(0,0,scl),n.m_x+btVector3(0,0,scl),btVector3(0,0,1));
-		}
-	}
-	/* Links	*/ 
-	if(0!=(drawflags&fDrawFlags::Links))
-	{
-		for(i=0;i<psb->m_links.size();++i)
-		{
-			const btSoftBody::Link&	l=psb->m_links[i];
-			if(0==(l.m_material->m_flags&btSoftBody::fMaterial::DebugDraw)) continue;
-			idraw->drawLine(l.m_n[0]->m_x,l.m_n[1]->m_x,lcolor);
-		}
-	}
-	/* Normals	*/ 
-	if(0!=(drawflags&fDrawFlags::Normals))
-	{
-		for(i=0;i<psb->m_nodes.size();++i)
-		{
-			const btSoftBody::Node&	n=psb->m_nodes[i];
-			if(0==(n.m_material->m_flags&btSoftBody::fMaterial::DebugDraw)) continue;
-			const btVector3			d=n.m_n*nscl;
-			idraw->drawLine(n.m_x,n.m_x+d,ncolor);
-			idraw->drawLine(n.m_x,n.m_x-d,ncolor*0.5);
-		}
-	}
-	/* Contacts	*/ 
-	if(0!=(drawflags&fDrawFlags::Contacts))
-	{
-		static const btVector3		axis[]={btVector3(1,0,0),
-			btVector3(0,1,0),
-			btVector3(0,0,1)};
-		for(i=0;i<psb->m_rcontacts.size();++i)
-		{		
-			const btSoftBody::RContact&	c=psb->m_rcontacts[i];
-			const btVector3				o=	c.m_node->m_x-c.m_cti.m_normal*
-				(dot(c.m_node->m_x,c.m_cti.m_normal)+c.m_cti.m_offset);
-			const btVector3				x=cross(c.m_cti.m_normal,axis[c.m_cti.m_normal.minAxis()]).normalized();
-			const btVector3				y=cross(x,c.m_cti.m_normal).normalized();
-			idraw->drawLine(o-x*nscl,o+x*nscl,ccolor);
-			idraw->drawLine(o-y*nscl,o+y*nscl,ccolor);
-			idraw->drawLine(o,o+c.m_cti.m_normal*nscl*3,btVector3(1,1,0));
-		}
-	}
-	/* Anchors	*/ 
-	if(0!=(drawflags&fDrawFlags::Anchors))
-	{
-		for(i=0;i<psb->m_anchors.size();++i)
-		{
-			const btSoftBody::Anchor&	a=psb->m_anchors[i];
-			const btVector3				q=a.m_body->getWorldTransform()*a.m_local;
-			drawVertex(idraw,a.m_node->m_x,0.25,btVector3(1,0,0));
-			drawVertex(idraw,q,0.25,btVector3(0,1,0));
-			idraw->drawLine(a.m_node->m_x,q,btVector3(1,1,1));
-		}
-		for(i=0;i<psb->m_nodes.size();++i)
-		{
-			const btSoftBody::Node&	n=psb->m_nodes[i];		
-			if(0==(n.m_material->m_flags&btSoftBody::fMaterial::DebugDraw)) continue;
-			if(n.m_im<=0)
-			{
-				drawVertex(idraw,n.m_x,0.25,btVector3(1,0,0));
-			}
-		}
-	}
-	/* Faces	*/ 
-	if(0!=(drawflags&fDrawFlags::Faces))
-	{
-		const btScalar	scl=(btScalar)0.8;
-		const btScalar	alp=(btScalar)1;
-		const btVector3	col(0,(btScalar)0.7,0);
-		for(i=0;i<psb->m_faces.size();++i)
-		{
-			const btSoftBody::Face&	f=psb->m_faces[i];
-			if(0==(f.m_material->m_flags&btSoftBody::fMaterial::DebugDraw)) continue;
-			const btVector3			x[]={f.m_n[0]->m_x,f.m_n[1]->m_x,f.m_n[2]->m_x};
-			const btVector3			c=(x[0]+x[1]+x[2])/3;
-			idraw->drawTriangle((x[0]-c)*scl+c,
-								(x[1]-c)*scl+c,
-								(x[2]-c)*scl+c,
-								col,alp);
-		}	
-	}
-	/* Clusters	*/ 
-	if(0!=(drawflags&fDrawFlags::Clusters))
-		{
-		srand(1806);
-		for(i=0;i<psb->m_clusters.size();++i)
-			{
-			if(psb->m_clusters[i]->m_collide)
-				{
-				btVector3						color(	rand()/(btScalar)RAND_MAX,
-														rand()/(btScalar)RAND_MAX,
-														rand()/(btScalar)RAND_MAX);
-				color=color.normalized()*0.75;
-				btAlignedObjectArray<btVector3>	vertices;
-				vertices.resize(psb->m_clusters[i]->m_nodes.size());
-				for(j=0,nj=vertices.size();j<nj;++j)
-					{				
-					vertices[j]=psb->m_clusters[i]->m_nodes[j]->m_x;
-					}
-				HullDesc		hdsc(QF_TRIANGLES,vertices.size(),&vertices[0]);
-				HullResult		hres;
-				HullLibrary		hlib;
-				hdsc.mMaxVertices=vertices.size();
-				hlib.CreateConvexHull(hdsc,hres);
-				const btVector3	center=average(hres.m_OutputVertices);
-				add(hres.m_OutputVertices,-center);
-				mul(hres.m_OutputVertices,(btScalar)1);
-				add(hres.m_OutputVertices,center);
-				for(j=0;j<(int)hres.mNumFaces;++j)
-					{
-					const int idx[]={hres.m_Indices[j*3+0],hres.m_Indices[j*3+1],hres.m_Indices[j*3+2]};
-					idraw->drawTriangle(hres.m_OutputVertices[idx[0]],
-										hres.m_OutputVertices[idx[1]],
-										hres.m_OutputVertices[idx[2]],
-										color,1);
-					}
-				hlib.ReleaseResult(hres);
-				}
-			/* Velocities	*/ 
-			#if 0
-			for(int j=0;j<psb->m_clusters[i].m_nodes.size();++j)
-				{
-				const btSoftBody::Cluster&	c=psb->m_clusters[i];
-				const btVector3				r=c.m_nodes[j]->m_x-c.m_com;
-				const btVector3				v=c.m_lv+cross(c.m_av,r);
-				idraw->drawLine(c.m_nodes[j]->m_x,c.m_nodes[j]->m_x+v,btVector3(1,0,0));
-				}
-			#endif
-			/* Frame		*/ 
-			btSoftBody::Cluster& c=*psb->m_clusters[i];
-			idraw->drawLine(c.m_com,c.m_framexform*btVector3(10,0,0),btVector3(1,0,0));
-			idraw->drawLine(c.m_com,c.m_framexform*btVector3(0,10,0),btVector3(0,1,0));
-			idraw->drawLine(c.m_com,c.m_framexform*btVector3(0,0,10),btVector3(0,0,1));
-			}
-		}
-	/* Notes	*/ 
-	if(0!=(drawflags&fDrawFlags::Notes))
-	{
-		for(i=0;i<psb->m_notes.size();++i)
-		{
-			const btSoftBody::Note&	n=psb->m_notes[i];
-			btVector3				p=n.m_offset;
-			for(int j=0;j<n.m_rank;++j)
-				{
-				p+=n.m_nodes[j]->m_x*n.m_coords[j];
-				}
-			idraw->draw3dText(p,n.m_text);
-		}
-	}
-	/* Node tree	*/ 
-	if(0!=(drawflags&fDrawFlags::NodeTree))		DrawNodeTree(psb,idraw);
-	/* Face tree	*/ 
-	if(0!=(drawflags&fDrawFlags::FaceTree))		DrawFaceTree(psb,idraw);
-	/* Cluster tree	*/ 
-	if(0!=(drawflags&fDrawFlags::ClusterTree))	DrawClusterTree(psb,idraw);
-	/* Joints		*/ 
-	if(0!=(drawflags&fDrawFlags::Joints))
-	{
-	for(i=0;i<psb->m_joints.size();++i)
-		{
-		const btSoftBody::Joint*	pj=psb->m_joints[i];
-		switch(pj->Type())
-			{
-			case	btSoftBody::Joint::eType::Linear:
-				{
-				const btSoftBody::LJoint*	pjl=(const btSoftBody::LJoint*)pj;
-				const btVector3	a0=pj->m_bodies[0].xform()*pjl->m_refs[0];
-				const btVector3	a1=pj->m_bodies[1].xform()*pjl->m_refs[1];
-				idraw->drawLine(pj->m_bodies[0].xform().getOrigin(),a0,btVector3(1,1,0));
-				idraw->drawLine(pj->m_bodies[1].xform().getOrigin(),a1,btVector3(0,1,1));
-				drawVertex(idraw,a0,0.25,btVector3(1,1,0));
-				drawVertex(idraw,a1,0.25,btVector3(0,1,1));
-				}
-			break;
-			case	btSoftBody::Joint::eType::Angular:
-				{
-				const btSoftBody::AJoint*	pja=(const btSoftBody::AJoint*)pj;
-				const btVector3	o0=pj->m_bodies[0].xform().getOrigin();
-				const btVector3	o1=pj->m_bodies[1].xform().getOrigin();
-				const btVector3	a0=pj->m_bodies[0].xform().getBasis()*pj->m_refs[0];
-				const btVector3	a1=pj->m_bodies[1].xform().getBasis()*pj->m_refs[1];
-				idraw->drawLine(o0,o0+a0*10,btVector3(1,1,0));
-				idraw->drawLine(o0,o0+a1*10,btVector3(1,1,0));
-				idraw->drawLine(o1,o1+a0*10,btVector3(0,1,1));
-				idraw->drawLine(o1,o1+a1*10,btVector3(0,1,1));
-				}
-			}		
-		}
-	}
-}
-
-//
-void			btSoftBodyHelpers::DrawInfos(		btSoftBody* psb,
-						  btIDebugDraw* idraw,
-						  bool masses,
-						  bool areas,
-						  bool /*stress*/)
-{
-	/*
-	for(int i=0;i<psb->m_nodes.size();++i)
-	{
-		const btSoftBody::Node&	n=psb->m_nodes[i];
-		char					text[2048]={0};
-		char					buff[1024];
-		if(masses)
-		{
-			sprintf(buff," M(%.2f)",1/n.m_im);
-			strcat(text,buff);
-		}
-		if(areas)
-		{
-			sprintf(buff," A(%.2f)",n.m_area);
-			strcat(text,buff);
-		}
-		if(text[0]) idraw->draw3dText(n.m_x,text);
-	}
-	*/
-
-}
-
-//
-void			btSoftBodyHelpers::DrawNodeTree(	btSoftBody* psb,
-													btIDebugDraw* idraw,
-													int mindepth,
-													int maxdepth)
-{
-drawTree(idraw,psb->m_ndbvt.m_root,0,btVector3(1,0,1),btVector3(1,1,1),mindepth,maxdepth);
-}
-
-//
-void			btSoftBodyHelpers::DrawFaceTree(	btSoftBody* psb,
-													btIDebugDraw* idraw,
-													int mindepth,
-													int maxdepth)
-{
-drawTree(idraw,psb->m_fdbvt.m_root,0,btVector3(0,1,0),btVector3(1,0,0),mindepth,maxdepth);
-}
-
-//
-void			btSoftBodyHelpers::DrawClusterTree(	btSoftBody* psb,
-													btIDebugDraw* idraw,
-													int mindepth,
-													int maxdepth)
-{
-drawTree(idraw,psb->m_cdbvt.m_root,0,btVector3(0,1,1),btVector3(1,0,0),mindepth,maxdepth);
-}
-
-//
-void			btSoftBodyHelpers::DrawFrame(		btSoftBody* psb,
-						  btIDebugDraw* idraw)
-{
-	if(psb->m_pose.m_bframe)
-	{
-		static const btScalar	ascl=10;
-		static const btScalar	nscl=(btScalar)0.1;
-		const btVector3			com=psb->m_pose.m_com;
-		const btMatrix3x3		trs=psb->m_pose.m_rot*psb->m_pose.m_scl;
-		const btVector3			Xaxis=(trs*btVector3(1,0,0)).normalized();
-		const btVector3			Yaxis=(trs*btVector3(0,1,0)).normalized();
-		const btVector3			Zaxis=(trs*btVector3(0,0,1)).normalized();
-		idraw->drawLine(com,com+Xaxis*ascl,btVector3(1,0,0));
-		idraw->drawLine(com,com+Yaxis*ascl,btVector3(0,1,0));
-		idraw->drawLine(com,com+Zaxis*ascl,btVector3(0,0,1));
-		for(int i=0;i<psb->m_pose.m_pos.size();++i)
-		{
-			const btVector3	x=com+trs*psb->m_pose.m_pos[i];
-			drawVertex(idraw,x,nscl,btVector3(1,0,1));
-		}
-	}
-}
-
-//
-btSoftBody*		btSoftBodyHelpers::CreateRope(	btSoftBodyWorldInfo& worldInfo, const btVector3& from,
-						   const btVector3& to,
-						   int res,
-						   int fixeds)
-{
-	/* Create nodes	*/ 
-	const int		r=res+2;
-	btVector3*		x=new btVector3[r];
-	btScalar*		m=new btScalar[r];
-	int i;
-
-	for(i=0;i<r;++i)
-	{
-		const btScalar	t=i/(btScalar)(r-1);
-		x[i]=lerp(from,to,t);
-		m[i]=1;
-	}
-	btSoftBody*		psb= new btSoftBody(&worldInfo,r,x,m);
-	if(fixeds&1) psb->setMass(0,0);
-	if(fixeds&2) psb->setMass(r-1,0);
-	delete[] x;
-	delete[] m;
-	/* Create links	*/ 
-	for(i=1;i<r;++i)
-	{
-		psb->appendLink(i-1,i);
-	}
-	/* Finished		*/ 
-	return(psb);
-}
-
-//
-btSoftBody*		btSoftBodyHelpers::CreatePatch(btSoftBodyWorldInfo& worldInfo,const btVector3& corner00,
-							const btVector3& corner10,
-							const btVector3& corner01,
-							const btVector3& corner11,
-							int resx,
-							int resy,
-							int fixeds,
-							bool gendiags)
-{
-#define IDX(_x_,_y_)	((_y_)*rx+(_x_))
-	/* Create nodes	*/ 
-	if((resx<2)||(resy<2)) return(0);
-	const int	rx=resx;
-	const int	ry=resy;
-	const int	tot=rx*ry;
-	btVector3*	x=new btVector3[tot];
-	btScalar*	m=new btScalar[tot];
-	int iy;
-
-	for(iy=0;iy<ry;++iy)
-	{
-		const btScalar	ty=iy/(btScalar)(ry-1);
-		const btVector3	py0=lerp(corner00,corner01,ty);
-		const btVector3	py1=lerp(corner10,corner11,ty);
-		for(int ix=0;ix<rx;++ix)
-		{
-			const btScalar	tx=ix/(btScalar)(rx-1);
-			x[IDX(ix,iy)]=lerp(py0,py1,tx);
-			m[IDX(ix,iy)]=1;
-		}
-	}
-	btSoftBody*		psb=new btSoftBody(&worldInfo,tot,x,m);
-	if(fixeds&1)	psb->setMass(IDX(0,0),0);
-	if(fixeds&2)	psb->setMass(IDX(rx-1,0),0);
-	if(fixeds&4)	psb->setMass(IDX(0,ry-1),0);
-	if(fixeds&8)	psb->setMass(IDX(rx-1,ry-1),0);
-	delete[] x;
-	delete[] m;
-	/* Create links	and faces */ 
-	for(iy=0;iy<ry;++iy)
-	{
-		for(int ix=0;ix<rx;++ix)
-		{
-			const int	idx=IDX(ix,iy);
-			const bool	mdx=(ix+1)<rx;
-			const bool	mdy=(iy+1)<ry;
-			if(mdx) psb->appendLink(idx,IDX(ix+1,iy));
-			if(mdy) psb->appendLink(idx,IDX(ix,iy+1));
-			if(mdx&&mdy)
-			{
-				if((ix+iy)&1)
-				{
-					psb->appendFace(IDX(ix,iy),IDX(ix+1,iy),IDX(ix+1,iy+1));
-					psb->appendFace(IDX(ix,iy),IDX(ix+1,iy+1),IDX(ix,iy+1));
-					if(gendiags)
-					{
-						psb->appendLink(IDX(ix,iy),IDX(ix+1,iy+1));
-					}
-				}
-				else
-				{
-					psb->appendFace(IDX(ix,iy+1),IDX(ix,iy),IDX(ix+1,iy));
-					psb->appendFace(IDX(ix,iy+1),IDX(ix+1,iy),IDX(ix+1,iy+1));
-					if(gendiags)
-					{
-						psb->appendLink(IDX(ix+1,iy),IDX(ix,iy+1));
-					}
-				}
-			}
-		}
-	}
-	/* Finished		*/ 
-#undef IDX
-	return(psb);
-}
-
-//
-btSoftBody*		btSoftBodyHelpers::CreateEllipsoid(btSoftBodyWorldInfo& worldInfo,const btVector3& center,
-								const btVector3& radius,
-								int res)
-{
-	struct	Hammersley
-	{
-		static void	Generate(btVector3* x,int n)
-		{
-			for(int i=0;i<n;i++)
-			{
-				btScalar	p=0.5,t=0;
-				for(int j=i;j;p*=0.5,j>>=1) if(j&1) t+=p;
-				btScalar	w=2*t-1;
-				btScalar	a=(SIMD_PI+2*i*SIMD_PI)/n;
-				btScalar	s=btSqrt(1-w*w);
-				*x++=btVector3(s*btCos(a),s*btSin(a),w);
-			}
-		}
-	};
-	btAlignedObjectArray<btVector3>	vtx;
-	vtx.resize(3+res);
-	Hammersley::Generate(&vtx[0],vtx.size());
-	for(int i=0;i<vtx.size();++i)
-	{
-		vtx[i]=vtx[i]*radius+center;
-	}
-	return(CreateFromConvexHull(worldInfo,&vtx[0],vtx.size()));
-}
-
-
-
-//
-btSoftBody*		btSoftBodyHelpers::CreateFromTriMesh(btSoftBodyWorldInfo& worldInfo,const btScalar*	vertices,
-								  const int* triangles,
-								  int ntriangles)
-{
-	int		maxidx=0;
-	int i,j,ni;
-
-	for(i=0,ni=ntriangles*3;i<ni;++i)
-	{
-		maxidx=btMax(triangles[i],maxidx);
-	}
-	++maxidx;
-	btAlignedObjectArray<bool>		chks;
-	btAlignedObjectArray<btVector3>	vtx;
-	chks.resize(maxidx*maxidx,false);
-	vtx.resize(maxidx);
-	for(i=0,j=0,ni=maxidx*3;i<ni;++j,i+=3)
-	{
-		vtx[j]=btVector3(vertices[i],vertices[i+1],vertices[i+2]);
-	}
-	btSoftBody*		psb=new btSoftBody(&worldInfo,vtx.size(),&vtx[0],0);
-	for( i=0,ni=ntriangles*3;i<ni;i+=3)
-	{
-		const int idx[]={triangles[i],triangles[i+1],triangles[i+2]};
-#define IDX(_x_,_y_) ((_y_)*maxidx+(_x_))
-		for(int j=2,k=0;k<3;j=k++)
-		{
-			if(!chks[IDX(idx[j],idx[k])])
-			{
-				chks[IDX(idx[j],idx[k])]=true;
-				chks[IDX(idx[k],idx[k])]=true;
-				psb->appendLink(idx[j],idx[k]);
-			}
-		}
-#undef IDX
-		psb->appendFace(idx[0],idx[1],idx[2]);
-	}
-	psb->randomizeConstraints();
-	return(psb);
-}
-
-//
-btSoftBody*		btSoftBodyHelpers::CreateFromConvexHull(btSoftBodyWorldInfo& worldInfo,	const btVector3* vertices,
-									 int nvertices)
-{
-	HullDesc		hdsc(QF_TRIANGLES,nvertices,vertices);
-	HullResult		hres;
-	HullLibrary		hlib;/*??*/ 
-	hdsc.mMaxVertices=nvertices;
-	hlib.CreateConvexHull(hdsc,hres);
-	btSoftBody*		psb=new btSoftBody(&worldInfo,(int)hres.mNumOutputVertices,
-		&hres.m_OutputVertices[0],0);
-	for(int i=0;i<(int)hres.mNumFaces;++i)
-	{
-		const int idx[]={	hres.m_Indices[i*3+0],
-			hres.m_Indices[i*3+1],
-			hres.m_Indices[i*3+2]};
-		if(idx[0]<idx[1]) psb->appendLink(	idx[0],idx[1]);
-		if(idx[1]<idx[2]) psb->appendLink(	idx[1],idx[2]);
-		if(idx[2]<idx[0]) psb->appendLink(	idx[2],idx[0]);
-		psb->appendFace(idx[0],idx[1],idx[2]);
-	}
-	hlib.ReleaseResult(hres);
-	psb->randomizeConstraints();
-	return(psb);
-}
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.h b/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.h
deleted file mode 100644
index e9c6cb20657..00000000000
--- a/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2008 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-#ifndef SOFT_BODY_HELPERS_H
-#define SOFT_BODY_HELPERS_H
-
-#include "btSoftBody.h"
-
-//
-// Helpers
-//
-
-/* fDrawFlags															*/ 
-struct	fDrawFlags { enum _ {
-	Nodes		=	0x0001,
-	Links		=	0x0002,
-	Faces		=	0x0004,
-	Tetras		=	0x0008,
-	Normals		=	0x0010,
-	Contacts	=	0x0020,
-	Anchors		=	0x0040,
-	Notes		=	0x0080,
-	Clusters	=	0x0100,
-	NodeTree	=	0x0200,
-	FaceTree	=	0x0400,
-	ClusterTree	=	0x0800,
-	Joints		=	0x1000,
-	/* presets	*/ 
-	Std			=	Links+Faces+Tetras+Anchors+Notes+Joints,
-	StdTetra	=	Std-Faces+Tetras,
-};};
-
-struct	btSoftBodyHelpers
-{
-	/* Draw body															*/ 
-	static void				Draw(		btSoftBody* psb,
-										btIDebugDraw* idraw,
-										int drawflags=fDrawFlags::Std);
-	/* Draw body infos														*/ 
-	static	void			DrawInfos(	btSoftBody* psb,
-										btIDebugDraw* idraw,
-										bool masses,
-										bool areas,
-										bool stress);
-	/* Draw node tree														*/ 
-	static void				DrawNodeTree(	btSoftBody* psb,
-											btIDebugDraw* idraw,
-											int mindepth=0,
-											int maxdepth=-1);
-	/* Draw face tree														*/ 
-	static void				DrawFaceTree(	btSoftBody* psb,
-											btIDebugDraw* idraw,
-											int mindepth=0,
-											int maxdepth=-1);
-	/* Draw cluster tree													*/ 
-	static void				DrawClusterTree(btSoftBody* psb,
-											btIDebugDraw* idraw,
-											int mindepth=0,
-											int maxdepth=-1);
-	/* Draw rigid frame														*/ 
-	static	void			DrawFrame(		btSoftBody* psb,
-											btIDebugDraw* idraw);
-	/* Create a rope														*/ 
-	static	btSoftBody*		CreateRope( btSoftBodyWorldInfo& worldInfo,
-										const btVector3& from,
-										const btVector3& to,
-										int res,
-										int fixeds);
-	/* Create a patch														*/ 
-	static	btSoftBody*		CreatePatch(btSoftBodyWorldInfo& worldInfo,
-										const btVector3& corner00,
-										const btVector3& corner10,
-										const btVector3& corner01,
-										const btVector3& corner11,
-										int resx,
-										int resy,
-										int fixeds,
-										bool gendiags);
-	/* Create an ellipsoid													*/ 
-	static	btSoftBody*		CreateEllipsoid(btSoftBodyWorldInfo& worldInfo,
-											const btVector3& center,
-											const btVector3& radius,
-											int res);	
-	/* Create from trimesh													*/ 
-	static	btSoftBody*		CreateFromTriMesh(	btSoftBodyWorldInfo& worldInfo,
-												const btScalar*	vertices,
-												const int* triangles,
-												int ntriangles);
-	/* Create from convex-hull												*/ 
-	static	btSoftBody*		CreateFromConvexHull(	btSoftBodyWorldInfo& worldInfo,
-													const btVector3* vertices,
-													int nvertices);
-};
-
-#endif //SOFT_BODY_HELPERS_H
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h b/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h
deleted file mode 100644
index 0c87770d714..00000000000
--- a/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h
+++ /dev/null
@@ -1,895 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it freely,
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-///btSoftBody implementation by Nathanael Presson
-
-#ifndef _BT_SOFT_BODY_INTERNALS_H
-#define _BT_SOFT_BODY_INTERNALS_H
-
-#include "btSoftBody.h"
-
-#include "LinearMath/btQuickprof.h"
-#include "BulletCollision/BroadphaseCollision/btBroadphaseInterface.h"
-#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h"
-#include "BulletCollision/CollisionShapes/btConvexInternalShape.h"
-#include "BulletCollision/NarrowPhaseCollision/btGjkEpa2.h"
-
-//
-// btSymMatrix
-//
-template <typename T>
-struct btSymMatrix
-{
-						btSymMatrix() : dim(0)					{}
-						btSymMatrix(int n,const T& init=T())	{ resize(n,init); }
-void					resize(int n,const T& init=T())			{ dim=n;store.resize((n*(n+1))/2,init); }
-int						index(int c,int r) const				{ if(c>r) btSwap(c,r);btAssert(r<dim);return((r*(r+1))/2+c); }
-T&						operator()(int c,int r)					{ return(store[index(c,r)]); }
-const T&				operator()(int c,int r) const			{ return(store[index(c,r)]); }
-btAlignedObjectArray<T>	store;
-int						dim;
-};	
-
-//
-// btSoftBodyCollisionShape
-//
-class btSoftBodyCollisionShape : public btConcaveShape
-{
-public:
-	btSoftBody*						m_body;
-	
-	btSoftBodyCollisionShape(btSoftBody* backptr)
-	{
-	m_body=backptr;
-	}
-
-	virtual ~btSoftBodyCollisionShape()
-	{
-
-	}
-
-	void	processAllTriangles(btTriangleCallback* /*callback*/,const btVector3& /*aabbMin*/,const btVector3& /*aabbMax*/) const
-	{
-		//not yet
-		btAssert(0);
-	}
-
-	///getAabb returns the axis aligned bounding box in the coordinate frame of the given transform t.
-	virtual void getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const
-	{
-	/* t should be identity, but better be safe than...fast? */ 
-	const btVector3	mins=m_body->m_bounds[0];
-	const btVector3	maxs=m_body->m_bounds[1];
-	const btVector3	crns[]={t*btVector3(mins.x(),mins.y(),mins.z()),
-							t*btVector3(maxs.x(),mins.y(),mins.z()),
-							t*btVector3(maxs.x(),maxs.y(),mins.z()),
-							t*btVector3(mins.x(),maxs.y(),mins.z()),
-							t*btVector3(mins.x(),mins.y(),maxs.z()),
-							t*btVector3(maxs.x(),mins.y(),maxs.z()),
-							t*btVector3(maxs.x(),maxs.y(),maxs.z()),
-							t*btVector3(mins.x(),maxs.y(),maxs.z())};
-	aabbMin=aabbMax=crns[0];
-	for(int i=1;i<8;++i)
-		{
-		aabbMin.setMin(crns[i]);
-		aabbMax.setMax(crns[i]);
-		}
-	}
-
-	virtual int		getShapeType() const
-	{
-		return SOFTBODY_SHAPE_PROXYTYPE;
-	}
-	virtual void	setLocalScaling(const btVector3& /*scaling*/)
-	{		
-		///na
-		btAssert(0);
-	}
-	virtual const btVector3& getLocalScaling() const
-	{
-	static const btVector3 dummy(1,1,1);
-	return dummy;
-	}
-	virtual void	calculateLocalInertia(btScalar /*mass*/,btVector3& /*inertia*/) const
-	{
-		///not yet
-		btAssert(0);
-	}
-	virtual const char*	getName()const
-	{
-		return "SoftBody";
-	}
-
-};
-
-//
-// btSoftClusterCollisionShape
-//
-class btSoftClusterCollisionShape : public btConvexInternalShape
-{
-public:
-	const btSoftBody::Cluster*	m_cluster;
-
-	btSoftClusterCollisionShape (const btSoftBody::Cluster* cluster) : m_cluster(cluster) { setMargin(0); }
-	
-	
-	virtual btVector3	localGetSupportingVertex(const btVector3& vec) const
-		{
-		btSoftBody::Node* const *						n=&m_cluster->m_nodes[0];
-		btScalar										d=dot(vec,n[0]->m_x);
-		int												j=0;
-		for(int i=1,ni=m_cluster->m_nodes.size();i<ni;++i)
-			{
-			const btScalar	k=dot(vec,n[i]->m_x);
-			if(k>d) { d=k;j=i; }
-			}
-		return(n[j]->m_x);
-		}
-	virtual btVector3	localGetSupportingVertexWithoutMargin(const btVector3& vec)const
-		{
-		return(localGetSupportingVertex(vec));
-		}
-	//notice that the vectors should be unit length
-	virtual void	batchedUnitVectorGetSupportingVertexWithoutMargin(const btVector3* vectors,btVector3* supportVerticesOut,int numVectors) const
-	{}
-
-
-	virtual void	calculateLocalInertia(btScalar mass,btVector3& inertia) const
-	{}
-
-	virtual void getAabb(const btTransform& t,btVector3& aabbMin,btVector3& aabbMax) const
-	{}
-
-	virtual int	getShapeType() const { return SOFTBODY_SHAPE_PROXYTYPE; }
-	
-	//debugging
-	virtual const char*	getName()const {return "SOFTCLUSTER";}
-
-	virtual void	setMargin(btScalar margin)
-	{
-		btConvexInternalShape::setMargin(margin);
-	}
-	virtual btScalar	getMargin() const
-	{
-		return getMargin();
-	}
-};
-
-//
-// Inline's
-//
-
-//
-template <typename T>
-static inline void			ZeroInitialize(T& value)
-{
-static const T	zerodummy;
-value=zerodummy;
-}
-//
-template <typename T>
-static inline bool			CompLess(const T& a,const T& b)
-{ return(a<b); }
-//
-template <typename T>
-static inline bool			CompGreater(const T& a,const T& b)
-{ return(a>b); }
-//
-template <typename T>
-static inline T				Lerp(const T& a,const T& b,btScalar t)
-{ return(a+(b-a)*t); }
-//
-template <typename T>
-static inline T				InvLerp(const T& a,const T& b,btScalar t)
-{ return((b+a*t-b*t)/(a*b)); }
-//
-static inline btMatrix3x3	Lerp(	const btMatrix3x3& a,
-									const btMatrix3x3& b,
-									btScalar t)
-{
-btMatrix3x3	r;
-r[0]=Lerp(a[0],b[0],t);
-r[1]=Lerp(a[1],b[1],t);
-r[2]=Lerp(a[2],b[2],t);
-return(r);
-}
-//
-static inline btVector3		Clamp(const btVector3& v,btScalar maxlength)
-{
-const btScalar sql=v.length2();
-if(sql>(maxlength*maxlength))
-	return((v*maxlength)/btSqrt(sql));
-	else
-	return(v);
-}
-//
-template <typename T>
-static inline T				Clamp(const T& x,const T& l,const T& h)
-{ return(x<l?l:x>h?h:x); }
-//
-template <typename T>
-static inline T				Sq(const T& x)
-{ return(x*x); }
-//
-template <typename T>
-static inline T				Cube(const T& x)
-{ return(x*x*x); }
-//
-template <typename T>
-static inline T				Sign(const T& x)
-{ return((T)(x<0?-1:+1)); }
-//
-template <typename T>
-static inline bool			SameSign(const T& x,const T& y)
-{ return((x*y)>0); }
-//
-static inline btScalar		ClusterMetric(const btVector3& x,const btVector3& y)
-{
-const btVector3	d=x-y;
-return(btFabs(d[0])+btFabs(d[1])+btFabs(d[2]));
-}
-//
-static inline btMatrix3x3	ScaleAlongAxis(const btVector3& a,btScalar s)
-{
-	const btScalar	xx=a.x()*a.x();
-	const btScalar	yy=a.y()*a.y();
-	const btScalar	zz=a.z()*a.z();
-	const btScalar	xy=a.x()*a.y();
-	const btScalar	yz=a.y()*a.z();
-	const btScalar	zx=a.z()*a.x();
-	btMatrix3x3		m;
-	m[0]=btVector3(1-xx+xx*s,xy*s-xy,zx*s-zx);
-	m[1]=btVector3(xy*s-xy,1-yy+yy*s,yz*s-yz);
-	m[2]=btVector3(zx*s-zx,yz*s-yz,1-zz+zz*s);
-	return(m);
-}
-//
-static inline btMatrix3x3	Cross(const btVector3& v)
-{
-	btMatrix3x3	m;
-	m[0]=btVector3(0,-v.z(),+v.y());
-	m[1]=btVector3(+v.z(),0,-v.x());
-	m[2]=btVector3(-v.y(),+v.x(),0);
-	return(m);
-}
-//
-static inline btMatrix3x3	Diagonal(btScalar x)
-{
-	btMatrix3x3	m;
-	m[0]=btVector3(x,0,0);
-	m[1]=btVector3(0,x,0);
-	m[2]=btVector3(0,0,x);
-	return(m);
-}
-//
-static inline btMatrix3x3	Add(const btMatrix3x3& a,
-	const btMatrix3x3& b)
-{
-	btMatrix3x3	r;
-	for(int i=0;i<3;++i) r[i]=a[i]+b[i];
-	return(r);
-}
-//
-static inline btMatrix3x3	Sub(const btMatrix3x3& a,
-	const btMatrix3x3& b)
-{
-	btMatrix3x3	r;
-	for(int i=0;i<3;++i) r[i]=a[i]-b[i];
-	return(r);
-}
-//
-static inline btMatrix3x3	Mul(const btMatrix3x3& a,
-	btScalar b)
-{
-	btMatrix3x3	r;
-	for(int i=0;i<3;++i) r[i]=a[i]*b;
-	return(r);
-}
-//
-static inline void			Orthogonalize(btMatrix3x3& m)
-{
-m[2]=cross(m[0],m[1]).normalized();
-m[1]=cross(m[2],m[0]).normalized();
-m[0]=cross(m[1],m[2]).normalized();
-}
-//
-static inline btMatrix3x3	MassMatrix(btScalar im,const btMatrix3x3& iwi,const btVector3& r)
-{
-	const btMatrix3x3	cr=Cross(r);
-	return(Sub(Diagonal(im),cr*iwi*cr));
-}
-
-//
-static inline btMatrix3x3	ImpulseMatrix(	btScalar dt,
-	btScalar ima,
-	btScalar imb,
-	const btMatrix3x3& iwi,
-	const btVector3& r)
-{
-	return(Diagonal(1/dt)*Add(Diagonal(ima),MassMatrix(imb,iwi,r)).inverse());
-}
-
-//
-static inline btMatrix3x3	ImpulseMatrix(	btScalar ima,const btMatrix3x3& iia,const btVector3& ra,
-											btScalar imb,const btMatrix3x3& iib,const btVector3& rb)	
-{
-return(Add(MassMatrix(ima,iia,ra),MassMatrix(imb,iib,rb)).inverse());
-}
-
-//
-static inline btMatrix3x3	AngularImpulseMatrix(	const btMatrix3x3& iia,
-													const btMatrix3x3& iib)
-{
-return(Add(iia,iib).inverse());
-}
-
-//
-static inline btVector3		ProjectOnAxis(	const btVector3& v,
-	const btVector3& a)
-{
-	return(a*dot(v,a));
-}
-//
-static inline btVector3		ProjectOnPlane(	const btVector3& v,
-	const btVector3& a)
-{
-	return(v-ProjectOnAxis(v,a));
-}
-
-//
-static inline void			ProjectOrigin(	const btVector3& a,
-											const btVector3& b,
-											btVector3& prj,
-											btScalar& sqd)
-{
-const btVector3	d=b-a;
-const btScalar	m2=d.length2();
-if(m2>SIMD_EPSILON)
-	{	
-	const btScalar	t=Clamp<btScalar>(-dot(a,d)/m2,0,1);
-	const btVector3	p=a+d*t;
-	const btScalar	l2=p.length2();
-	if(l2<sqd)
-		{
-		prj=p;
-		sqd=l2;
-		}
-	}
-}
-//
-static inline void			ProjectOrigin(	const btVector3& a,
-											const btVector3& b,
-											const btVector3& c,
-											btVector3& prj,
-											btScalar& sqd)
-{
-const btVector3&	q=cross(b-a,c-a);
-const btScalar		m2=q.length2();
-if(m2>SIMD_EPSILON)
-	{
-	const btVector3	n=q/btSqrt(m2);
-	const btScalar	k=dot(a,n);
-	const btScalar	k2=k*k;
-	if(k2<sqd)
-		{
-		const btVector3	p=n*k;
-		if(	(dot(cross(a-p,b-p),q)>0)&&
-			(dot(cross(b-p,c-p),q)>0)&&
-			(dot(cross(c-p,a-p),q)>0))
-			{			
-			prj=p;
-			sqd=k2;
-			}
-			else
-			{
-			ProjectOrigin(a,b,prj,sqd);
-			ProjectOrigin(b,c,prj,sqd);
-			ProjectOrigin(c,a,prj,sqd);
-			}
-		}
-	}
-}
-
-//
-template <typename T>
-static inline T				BaryEval(		const T& a,
-											const T& b,
-											const T& c,
-											const btVector3& coord)
-{
-	return(a*coord.x()+b*coord.y()+c*coord.z());
-}
-//
-static inline btVector3		BaryCoord(	const btVector3& a,
-										const btVector3& b,
-										const btVector3& c,
-										const btVector3& p)
-{
-const btScalar	w[]={	cross(a-p,b-p).length(),
-						cross(b-p,c-p).length(),
-						cross(c-p,a-p).length()};
-const btScalar	isum=1/(w[0]+w[1]+w[2]);
-return(btVector3(w[1]*isum,w[2]*isum,w[0]*isum));
-}
-
-//
-static btScalar				ImplicitSolve(	btSoftBody::ImplicitFn* fn,
-											const btVector3& a,
-											const btVector3& b,
-											const btScalar accuracy,
-											const int maxiterations=256)
-{
-btScalar	span[2]={0,1};
-btScalar	values[2]={fn->Eval(a),fn->Eval(b)};
-if(values[0]>values[1])
-	{
-	btSwap(span[0],span[1]);
-	btSwap(values[0],values[1]);
-	}
-if(values[0]>-accuracy) return(-1);
-if(values[1]<+accuracy) return(-1);
-for(int i=0;i<maxiterations;++i)
-	{
-	const btScalar	t=Lerp(span[0],span[1],values[0]/(values[0]-values[1]));
-	const btScalar	v=fn->Eval(Lerp(a,b,t));
-	if((t<=0)||(t>=1))		break;
-	if(btFabs(v)<accuracy)	return(t);
-	if(v<0)
-		{ span[0]=t;values[0]=v; }
-		else
-		{ span[1]=t;values[1]=v; }
-	}
-return(-1);
-}
-
-//
-static inline btVector3		NormalizeAny(const btVector3& v)
-{
-	const btScalar l=v.length();
-	if(l>SIMD_EPSILON)
-		return(v/l);
-	else
-		return(btVector3(0,0,0));
-}
-
-//
-static inline btDbvtVolume	VolumeOf(	const btSoftBody::Face& f,
-										btScalar margin)
-{
-const btVector3*	pts[]={	&f.m_n[0]->m_x,
-							&f.m_n[1]->m_x,
-							&f.m_n[2]->m_x};
-btDbvtVolume		vol=btDbvtVolume::FromPoints(pts,3);
-vol.Expand(btVector3(margin,margin,margin));
-return(vol);
-}
-
-//
-static inline btVector3			CenterOf(	const btSoftBody::Face& f)
-{
-return((f.m_n[0]->m_x+f.m_n[1]->m_x+f.m_n[2]->m_x)/3);
-}
-
-//
-static inline btScalar			AreaOf(		const btVector3& x0,
-											const btVector3& x1,
-											const btVector3& x2)
-{
-	const btVector3	a=x1-x0;
-	const btVector3	b=x2-x0;
-	const btVector3	cr=cross(a,b);
-	const btScalar	area=cr.length();
-	return(area);
-}
-
-//
-static inline btScalar		VolumeOf(	const btVector3& x0,
-										const btVector3& x1,
-										const btVector3& x2,
-										const btVector3& x3)
-{
-	const btVector3	a=x1-x0;
-	const btVector3	b=x2-x0;
-	const btVector3	c=x3-x0;
-	return(dot(a,cross(b,c)));
-}
-
-//
-static void					EvaluateMedium(	const btSoftBodyWorldInfo* wfi,
-											const btVector3& x,
-											btSoftBody::sMedium& medium)
-{
-	medium.m_velocity	=	btVector3(0,0,0);
-	medium.m_pressure	=	0;
-	medium.m_density	=	wfi->air_density;
-	if(wfi->water_density>0)
-	{
-		const btScalar	depth=-(dot(x,wfi->water_normal)+wfi->water_offset);
-		if(depth>0)
-		{
-			medium.m_density	=	wfi->water_density;
-			medium.m_pressure	=	depth*wfi->water_density*wfi->m_gravity.length();
-		}
-	}
-}
-
-//
-static inline void			ApplyClampedForce(	btSoftBody::Node& n,
-												const btVector3& f,
-												btScalar dt)
-{
-	const btScalar	dtim=dt*n.m_im;
-	if((f*dtim).length2()>n.m_v.length2())
-	{/* Clamp	*/ 
-		n.m_f-=ProjectOnAxis(n.m_v,f.normalized())/dtim;						
-	}
-	else
-	{/* Apply	*/ 
-		n.m_f+=f;
-	}
-}
-
-//
-static inline int		MatchEdge(	const btSoftBody::Node* a,
-									const btSoftBody::Node* b,
-									const btSoftBody::Node* ma,
-									const btSoftBody::Node* mb)
-{
-if((a==ma)&&(b==mb)) return(0);
-if((a==mb)&&(b==ma)) return(1);
-return(-1);
-}
-
-//
-// btEigen : Extract eigen system,
-// straitforward implementation of http://math.fullerton.edu/mathews/n2003/JacobiMethodMod.html
-// outputs are NOT sorted.
-//
-struct	btEigen
-{
-static int			system(btMatrix3x3& a,btMatrix3x3* vectors,btVector3* values=0)
-	{
-	static const int		maxiterations=16;
-	static const btScalar	accuracy=(btScalar)0.0001;
-	btMatrix3x3&			v=*vectors;
-	int						iterations=0;
-	vectors->setIdentity();
-	do	{
-		int				p=0,q=1;
-		if(btFabs(a[p][q])<btFabs(a[0][2])) { p=0;q=2; }
-		if(btFabs(a[p][q])<btFabs(a[1][2])) { p=1;q=2; }
-		if(btFabs(a[p][q])>accuracy)
-			{
-			const btScalar	w=(a[q][q]-a[p][p])/(2*a[p][q]);
-			const btScalar	z=btFabs(w);
-			const btScalar	t=w/(z*(btSqrt(1+w*w)+z));
-			if(t==t)/* [WARNING] let hope that one does not get thrown aways by some compilers... */ 
-				{
-				const btScalar	c=1/btSqrt(t*t+1);
-				const btScalar	s=c*t;
-				mulPQ(a,c,s,p,q);
-				mulTPQ(a,c,s,p,q);
-				mulPQ(v,c,s,p,q);
-				} else break;
-			} else break;
-		} while((++iterations)<maxiterations);
-	if(values)
-		{
-		*values=btVector3(a[0][0],a[1][1],a[2][2]);
-		}
-	return(iterations);
-	}
-private:
-static inline void	mulTPQ(btMatrix3x3& a,btScalar c,btScalar s,int p,int q)
-	{
-	const btScalar	m[2][3]={	{a[p][0],a[p][1],a[p][2]},
-								{a[q][0],a[q][1],a[q][2]}};
-	int i;
-
-	for(i=0;i<3;++i) a[p][i]=c*m[0][i]-s*m[1][i];
-	for(i=0;i<3;++i) a[q][i]=c*m[1][i]+s*m[0][i];
-	}
-static inline void	mulPQ(btMatrix3x3& a,btScalar c,btScalar s,int p,int q)
-	{
-	const btScalar	m[2][3]={	{a[0][p],a[1][p],a[2][p]},
-								{a[0][q],a[1][q],a[2][q]}};
-	int i;
-
-	for(i=0;i<3;++i) a[i][p]=c*m[0][i]-s*m[1][i];
-	for(i=0;i<3;++i) a[i][q]=c*m[1][i]+s*m[0][i];
-	}
-};
-
-//
-// Polar decomposition,
-// "Computing the Polar Decomposition with Applications", Nicholas J. Higham, 1986.
-//
-static inline int			PolarDecompose(	const btMatrix3x3& m,btMatrix3x3& q,btMatrix3x3& s)
-{
-	static const btScalar	half=(btScalar)0.5;
-	static const btScalar	accuracy=(btScalar)0.0001;
-	static const int		maxiterations=16;
-	int						i=0;
-	btScalar				det=0;
-	q	=	Mul(m,1/btVector3(m[0][0],m[1][1],m[2][2]).length());
-	det	=	q.determinant();
-	if(!btFuzzyZero(det))
-	{
-		for(;i<maxiterations;++i)
-		{
-			q=Mul(Add(q,Mul(q.adjoint(),1/det).transpose()),half);
-			const btScalar	ndet=q.determinant();
-			if(Sq(ndet-det)>accuracy) det=ndet; else break;
-		}
-		/* Final orthogonalization	*/ 
-		Orthogonalize(q);
-		/* Compute 'S'				*/ 
-		s=q.transpose()*m;
-	}
-	else
-	{
-		q.setIdentity();
-		s.setIdentity();
-	}
-return(i);
-}
-
-//
-// btSoftColliders
-//
-struct btSoftColliders
-{
-	//
-	// ClusterBase
-	//
-	struct	ClusterBase : btDbvt::ICollide
-	{
-	btScalar			erp;
-	btScalar			idt;
-	btScalar			margin;
-	btScalar			friction;
-	btScalar			threshold;
-					ClusterBase()
-		{
-		erp			=(btScalar)1;
-		idt			=0;
-		margin		=0;
-		friction	=0;
-		threshold	=(btScalar)0;
-		}
-	bool				SolveContact(	const btGjkEpaSolver2::sResults& res,
-										btSoftBody::Body ba,btSoftBody::Body bb,
-										btSoftBody::CJoint& joint)
-		{
-		if(res.distance<margin)
-			{
-			const btVector3		ra=res.witnesses[0]-ba.xform().getOrigin();
-			const btVector3		rb=res.witnesses[1]-bb.xform().getOrigin();
-			const btVector3		va=ba.velocity(ra);
-			const btVector3		vb=bb.velocity(rb);
-			const btVector3		vrel=va-vb;
-			const btScalar		rvac=dot(vrel,res.normal);
-			const btScalar		depth=res.distance-margin;
-			const btVector3		iv=res.normal*rvac;
-			const btVector3		fv=vrel-iv;
-			joint.m_bodies[0]	=	ba;
-			joint.m_bodies[1]	=	bb;
-			joint.m_refs[0]		=	ra*ba.xform().getBasis();
-			joint.m_refs[1]		=	rb*bb.xform().getBasis();
-			joint.m_rpos[0]		=	ra;
-			joint.m_rpos[1]		=	rb;
-			joint.m_cfm			=	1;
-			joint.m_erp			=	1;
-			joint.m_life		=	0;
-			joint.m_maxlife		=	0;
-			joint.m_split		=	1;
-			joint.m_drift		=	depth*res.normal;
-			joint.m_normal		=	res.normal;
-			joint.m_delete		=	false;
-			joint.m_friction	=	fv.length2()<(-rvac*friction)?1:friction;
-			joint.m_massmatrix	=	ImpulseMatrix(	ba.invMass(),ba.invWorldInertia(),joint.m_rpos[0],
-													bb.invMass(),bb.invWorldInertia(),joint.m_rpos[1]);
-			return(true);
-			}
-		return(false);
-		}
-	};
-	//
-	// CollideCL_RS
-	//
-	struct	CollideCL_RS : ClusterBase
-	{
-	btSoftBody*		psb;
-	btRigidBody*	prb;
-	void		Process(const btDbvtNode* leaf)
-		{
-		btSoftBody::Cluster*		cluster=(btSoftBody::Cluster*)leaf->data;
-		btSoftClusterCollisionShape	cshape(cluster);
-		const btConvexShape*		rshape=(const btConvexShape*)prb->getCollisionShape();
-		btGjkEpaSolver2::sResults	res;		
-		if(btGjkEpaSolver2::SignedDistance(	&cshape,btTransform::getIdentity(),
-											rshape,prb->getInterpolationWorldTransform(),
-											btVector3(1,0,0),res))
-			{
-			btSoftBody::CJoint	joint;
-			if(SolveContact(res,cluster,prb,joint))
-				{
-				btSoftBody::CJoint*	pj=new(btAlignedAlloc(sizeof(btSoftBody::CJoint),16)) btSoftBody::CJoint();
-				*pj=joint;psb->m_joints.push_back(pj);
-				if(prb->isStaticOrKinematicObject())
-					{
-					pj->m_erp	*=	psb->m_cfg.kSKHR_CL;
-					pj->m_split	*=	psb->m_cfg.kSK_SPLT_CL;
-					}
-					else
-					{
-					pj->m_erp	*=	psb->m_cfg.kSRHR_CL;
-					pj->m_split	*=	psb->m_cfg.kSR_SPLT_CL;
-					}
-				}
-			}
-		}
-	void		Process(btSoftBody* ps,btRigidBody* pr)
-		{
-		psb			=	ps;
-		prb			=	pr;
-		idt			=	ps->m_sst.isdt;
-		margin		=	ps->getCollisionShape()->getMargin()+
-						pr->getCollisionShape()->getMargin();
-		friction	=	btMin(psb->m_cfg.kDF,prb->getFriction());
-		btVector3			mins;
-		btVector3			maxs;
-		btDbvtVolume		volume;
-		pr->getCollisionShape()->getAabb(pr->getInterpolationWorldTransform(),mins,maxs);
-		volume=btDbvtVolume::FromMM(mins,maxs);
-		volume.Expand(btVector3(1,1,1)*margin);
-		btDbvt::collideTV(ps->m_cdbvt.m_root,volume,*this);
-		}	
-	};
-	//
-	// CollideCL_SS
-	//
-	struct	CollideCL_SS : ClusterBase
-	{
-	btSoftBody*	bodies[2];
-	void		Process(const btDbvtNode* la,const btDbvtNode* lb)
-		{
-		btSoftBody::Cluster*		cla=(btSoftBody::Cluster*)la->data;
-		btSoftBody::Cluster*		clb=(btSoftBody::Cluster*)lb->data;
-		btSoftClusterCollisionShape	csa(cla);
-		btSoftClusterCollisionShape	csb(clb);
-		btGjkEpaSolver2::sResults	res;		
-		if(btGjkEpaSolver2::SignedDistance(	&csa,btTransform::getIdentity(),
-											&csb,btTransform::getIdentity(),
-											cla->m_com-clb->m_com,res))
-			{
-			btSoftBody::CJoint	joint;
-			if(SolveContact(res,cla,clb,joint))
-				{
-				btSoftBody::CJoint*	pj=new(btAlignedAlloc(sizeof(btSoftBody::CJoint),16)) btSoftBody::CJoint();
-				*pj=joint;bodies[0]->m_joints.push_back(pj);
-				pj->m_erp	*=	btMax(bodies[0]->m_cfg.kSSHR_CL,bodies[1]->m_cfg.kSSHR_CL);
-				pj->m_split	*=	(bodies[0]->m_cfg.kSS_SPLT_CL+bodies[1]->m_cfg.kSS_SPLT_CL)/2;
-				}
-			}
-		}
-	void		Process(btSoftBody* psa,btSoftBody* psb)
-		{
-		idt			=	psa->m_sst.isdt;
-		margin		=	(psa->getCollisionShape()->getMargin()+psb->getCollisionShape()->getMargin())/2;
-		friction	=	btMin(psa->m_cfg.kDF,psb->m_cfg.kDF);
-		bodies[0]	=	psa;
-		bodies[1]	=	psb;
-		btDbvt::collideTT(psa->m_cdbvt.m_root,psb->m_cdbvt.m_root,*this);
-		}	
-	};
-	//
-	// CollideSDF_RS
-	//
-	struct	CollideSDF_RS : btDbvt::ICollide
-	{
-	void		Process(const btDbvtNode* leaf)
-		{
-		btSoftBody::Node*	node=(btSoftBody::Node*)leaf->data;
-		DoNode(*node);
-		}
-	void		DoNode(btSoftBody::Node& n) const
-		{
-		const btScalar			m=n.m_im>0?dynmargin:stamargin;
-		btSoftBody::RContact	c;
-		if(	(!n.m_battach)&&
-			psb->checkContact(prb,n.m_x,m,c.m_cti))
-			{
-			const btScalar	ima=n.m_im;
-			const btScalar	imb=prb->getInvMass();
-			const btScalar	ms=ima+imb;
-			if(ms>0)
-				{
-				const btTransform&	wtr=prb->getInterpolationWorldTransform();
-				const btMatrix3x3&	iwi=prb->getInvInertiaTensorWorld();
-				const btVector3		ra=n.m_x-wtr.getOrigin();
-				const btVector3		va=prb->getVelocityInLocalPoint(ra)*psb->m_sst.sdt;
-				const btVector3		vb=n.m_x-n.m_q;	
-				const btVector3		vr=vb-va;
-				const btScalar		dn=dot(vr,c.m_cti.m_normal);
-				const btVector3		fv=vr-c.m_cti.m_normal*dn;
-				const btScalar		fc=psb->m_cfg.kDF*prb->getFriction();
-				c.m_node	=	&n;
-				c.m_c0		=	ImpulseMatrix(psb->m_sst.sdt,ima,imb,iwi,ra);
-				c.m_c1		=	ra;
-				c.m_c2		=	ima*psb->m_sst.sdt;
-				c.m_c3		=	fv.length2()<(btFabs(dn)*fc)?0:1-fc;
-				c.m_c4		=	prb->isStaticOrKinematicObject()?psb->m_cfg.kKHR:psb->m_cfg.kCHR;
-				psb->m_rcontacts.push_back(c);
-				prb->activate();
-				}
-			}
-		}
-	btSoftBody*		psb;
-	btRigidBody*	prb;
-	btScalar		dynmargin;
-	btScalar		stamargin;
-	};
-	//
-	// CollideVF_SS
-	//
-	struct	CollideVF_SS : btDbvt::ICollide
-	{
-	void		Process(const btDbvtNode* lnode,
-						const btDbvtNode* lface)
-		{
-		btSoftBody::Node*	node=(btSoftBody::Node*)lnode->data;
-		btSoftBody::Face*	face=(btSoftBody::Face*)lface->data;
-		btVector3			o=node->m_x;
-		btVector3			p;
-		btScalar			d=SIMD_INFINITY;
-		ProjectOrigin(	face->m_n[0]->m_x-o,
-						face->m_n[1]->m_x-o,
-						face->m_n[2]->m_x-o,
-						p,d);
-		const btScalar	m=mrg+(o-node->m_q).length()*2;
-		if(d<(m*m))
-			{
-			const btSoftBody::Node*	n[]={face->m_n[0],face->m_n[1],face->m_n[2]};
-			const btVector3			w=BaryCoord(n[0]->m_x,n[1]->m_x,n[2]->m_x,p+o);
-			const btScalar			ma=node->m_im;
-			btScalar				mb=BaryEval(n[0]->m_im,n[1]->m_im,n[2]->m_im,w);
-			if(	(n[0]->m_im<=0)||
-				(n[1]->m_im<=0)||
-				(n[2]->m_im<=0))
-				{
-				mb=0;
-				}
-			const btScalar	ms=ma+mb;
-			if(ms>0)
-				{
-				btSoftBody::SContact	c;
-				c.m_normal		=	p/-btSqrt(d);
-				c.m_margin		=	m;
-				c.m_node		=	node;
-				c.m_face		=	face;
-				c.m_weights		=	w;
-				c.m_friction	=	btMax(psb[0]->m_cfg.kDF,psb[1]->m_cfg.kDF);
-				c.m_cfm[0]		=	ma/ms*psb[0]->m_cfg.kSHR;
-				c.m_cfm[1]		=	mb/ms*psb[1]->m_cfg.kSHR;
-				psb[0]->m_scontacts.push_back(c);
-				}
-			}	
-		}
-	btSoftBody*		psb[2];
-	btScalar		mrg;
-	};
-};
-
-#endif //_BT_SOFT_BODY_INTERNALS_H
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp b/extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp
deleted file mode 100644
index e62f35567b0..00000000000
--- a/extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-#include "btSoftBodyRigidBodyCollisionConfiguration.h"
-#include "btSoftRigidCollisionAlgorithm.h"
-#include "btSoftBodyConcaveCollisionAlgorithm.h"
-#include "btSoftSoftCollisionAlgorithm.h"
-
-#define ENABLE_SOFTBODY_CONCAVE_COLLISIONS 1
-
-btSoftBodyRigidBodyCollisionConfiguration::btSoftBodyRigidBodyCollisionConfiguration(const btDefaultCollisionConstructionInfo& constructionInfo)
-:btDefaultCollisionConfiguration(constructionInfo)
-{
-	void* mem;
-
-	mem = btAlignedAlloc(sizeof(btSoftSoftCollisionAlgorithm::CreateFunc),16);
-	m_softSoftCreateFunc = new(mem) btSoftSoftCollisionAlgorithm::CreateFunc;
-	
-	mem = btAlignedAlloc(sizeof(btSoftRigidCollisionAlgorithm::CreateFunc),16);
-	m_softRigidConvexCreateFunc = new(mem) btSoftRigidCollisionAlgorithm::CreateFunc;
-	
-	mem = btAlignedAlloc(sizeof(btSoftRigidCollisionAlgorithm::CreateFunc),16);
-	m_swappedSoftRigidConvexCreateFunc = new(mem) btSoftRigidCollisionAlgorithm::CreateFunc;
-	m_swappedSoftRigidConvexCreateFunc->m_swapped=true;
-
-#ifdef ENABLE_SOFTBODY_CONCAVE_COLLISIONS
-	mem = btAlignedAlloc(sizeof(btSoftBodyConcaveCollisionAlgorithm::CreateFunc),16);
-	m_softRigidConcaveCreateFunc = new(mem) btSoftBodyConcaveCollisionAlgorithm::CreateFunc;
-	
-	mem = btAlignedAlloc(sizeof(btSoftBodyConcaveCollisionAlgorithm::CreateFunc),16);
-	m_swappedSoftRigidConcaveCreateFunc = new(mem) btSoftBodyConcaveCollisionAlgorithm::SwappedCreateFunc;
-	m_swappedSoftRigidConcaveCreateFunc->m_swapped=true;
-#endif
-
-}
-
-btSoftBodyRigidBodyCollisionConfiguration::~btSoftBodyRigidBodyCollisionConfiguration()
-{
-	m_softSoftCreateFunc->~btCollisionAlgorithmCreateFunc();
-	btAlignedFree(	m_softSoftCreateFunc);
-
-	m_softRigidConvexCreateFunc->~btCollisionAlgorithmCreateFunc();
-	btAlignedFree(	m_softRigidConvexCreateFunc);
-
-	m_swappedSoftRigidConvexCreateFunc->~btCollisionAlgorithmCreateFunc();
-	btAlignedFree(	m_swappedSoftRigidConvexCreateFunc);
-
-#ifdef ENABLE_SOFTBODY_CONCAVE_COLLISIONS
-	m_softRigidConcaveCreateFunc->~btCollisionAlgorithmCreateFunc();
-	btAlignedFree(	m_softRigidConcaveCreateFunc);
-
-	m_swappedSoftRigidConcaveCreateFunc->~btCollisionAlgorithmCreateFunc();
-	btAlignedFree(	m_swappedSoftRigidConcaveCreateFunc);
-#endif
-}
-	
-///creation of soft-soft and soft-rigid, and otherwise fallback to base class implementation
-btCollisionAlgorithmCreateFunc* btSoftBodyRigidBodyCollisionConfiguration::getCollisionAlgorithmCreateFunc(int proxyType0,int proxyType1)
-{
-
-	///try to handle the softbody interactions first
-
-	if ((proxyType0 == SOFTBODY_SHAPE_PROXYTYPE  ) && (proxyType1==SOFTBODY_SHAPE_PROXYTYPE))
-	{
-		return	m_softSoftCreateFunc;
-	}
-
-	///softbody versus convex
-	if (proxyType0 == SOFTBODY_SHAPE_PROXYTYPE  && btBroadphaseProxy::isConvex(proxyType1))
-	{
-		return	m_softRigidConvexCreateFunc;
-	}
-
-	///convex versus soft body
-	if (btBroadphaseProxy::isConvex(proxyType0) && proxyType1 == SOFTBODY_SHAPE_PROXYTYPE )
-	{
-		return	m_swappedSoftRigidConvexCreateFunc;
-	}
-
-#ifdef ENABLE_SOFTBODY_CONCAVE_COLLISIONS
-	///softbody versus convex
-	if (proxyType0 == SOFTBODY_SHAPE_PROXYTYPE  && btBroadphaseProxy::isConcave(proxyType1))
-	{
-		return	m_softRigidConcaveCreateFunc;
-	}
-
-	///convex versus soft body
-	if (btBroadphaseProxy::isConcave(proxyType0) && proxyType1 == SOFTBODY_SHAPE_PROXYTYPE )
-	{
-		return	m_swappedSoftRigidConcaveCreateFunc;
-	}
-#endif
-
-	///fallback to the regular rigid collision shape
-	return btDefaultCollisionConfiguration::getCollisionAlgorithmCreateFunc(proxyType0,proxyType1);
-}
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h b/extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h
deleted file mode 100644
index 41c3af96939..00000000000
--- a/extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-#ifndef BT_SOFTBODY_RIGIDBODY_COLLISION_CONFIGURATION
-#define BT_SOFTBODY_RIGIDBODY_COLLISION_CONFIGURATION
-
-#include "BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h"
-
-class btVoronoiSimplexSolver;
-class btGjkEpaPenetrationDepthSolver;
-
-
-///btSoftBodyRigidBodyCollisionConfiguration add softbody interaction on top of btDefaultCollisionConfiguration
-class	btSoftBodyRigidBodyCollisionConfiguration : public btDefaultCollisionConfiguration
-{
-
-	//default CreationFunctions, filling the m_doubleDispatch table
-	btCollisionAlgorithmCreateFunc*	m_softSoftCreateFunc;
-	btCollisionAlgorithmCreateFunc*	m_softRigidConvexCreateFunc;
-	btCollisionAlgorithmCreateFunc*	m_swappedSoftRigidConvexCreateFunc;
-	btCollisionAlgorithmCreateFunc*	m_softRigidConcaveCreateFunc;
-	btCollisionAlgorithmCreateFunc*	m_swappedSoftRigidConcaveCreateFunc;
-	
-public:
-
-	btSoftBodyRigidBodyCollisionConfiguration(const btDefaultCollisionConstructionInfo& constructionInfo = btDefaultCollisionConstructionInfo());
-
-	virtual ~btSoftBodyRigidBodyCollisionConfiguration();
-
-	///creation of soft-soft and soft-rigid, and otherwise fallback to base class implementation
-	virtual btCollisionAlgorithmCreateFunc* getCollisionAlgorithmCreateFunc(int proxyType0,int proxyType1);
-
-};
-
-#endif //BT_SOFTBODY_RIGIDBODY_COLLISION_CONFIGURATION
-
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp b/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp
deleted file mode 100644
index 835a03b8e3c..00000000000
--- a/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-#include "btSoftRigidCollisionAlgorithm.h"
-#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h"
-#include "BulletCollision/CollisionShapes/btSphereShape.h"
-#include "BulletCollision/CollisionShapes/btBoxShape.h"
-#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
-#include "btSoftBody.h"
-///TODO: include all the shapes that the softbody can collide with
-///alternatively, implement special case collision algorithms (just like for rigid collision shapes)
-
-//#include <stdio.h>
-
-btSoftRigidCollisionAlgorithm::btSoftRigidCollisionAlgorithm(btPersistentManifold* /*mf*/,const btCollisionAlgorithmConstructionInfo& ci,btCollisionObject* /*col0*/,btCollisionObject* /*col1*/, bool isSwapped)
-: btCollisionAlgorithm(ci),
-//m_ownManifold(false),
-//m_manifoldPtr(mf),
-m_isSwapped(isSwapped)
-{
-}
-
-
-btSoftRigidCollisionAlgorithm::~btSoftRigidCollisionAlgorithm()
-{
-	
-	//m_softBody->m_overlappingRigidBodies.remove(m_rigidCollisionObject);
-
-	/*if (m_ownManifold)
-	{
-		if (m_manifoldPtr)
-			m_dispatcher->releaseManifold(m_manifoldPtr);
-	}
-	*/
-
-}
-
-
-#include <stdio.h>
-
-void btSoftRigidCollisionAlgorithm::processCollision (btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut)
-{
-	(void)dispatchInfo;
-	(void)resultOut;
-	//printf("btSoftRigidCollisionAlgorithm\n");
-
-	btSoftBody* softBody =  m_isSwapped? (btSoftBody*)body1 : (btSoftBody*)body0;
-	btCollisionObject* rigidCollisionObject = m_isSwapped? body0 : body1;
-	
-	softBody->defaultCollisionHandler(rigidCollisionObject);
-
-
-}
-
-btScalar btSoftRigidCollisionAlgorithm::calculateTimeOfImpact(btCollisionObject* col0,btCollisionObject* col1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut)
-{
-	(void)resultOut;
-	(void)dispatchInfo;
-	(void)col0;
-	(void)col1;
-
-	//not yet
-	return btScalar(1.);
-}
-
-
-
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h b/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h
deleted file mode 100644
index 74327e6c635..00000000000
--- a/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-#ifndef SOFT_RIGID_COLLISION_ALGORITHM_H
-#define SOFT_RIGID_COLLISION_ALGORITHM_H
-
-#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
-#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
-#include "BulletCollision/CollisionDispatch/btCollisionCreateFunc.h"
-class btPersistentManifold;
-#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h"
-
-#include "LinearMath/btVector3.h"
-class btSoftBody;
-
-/// btSoftRigidCollisionAlgorithm  provides collision detection between btSoftBody and btRigidBody
-class btSoftRigidCollisionAlgorithm : public btCollisionAlgorithm
-{
-//	bool	m_ownManifold;
-//	btPersistentManifold*	m_manifoldPtr;
-
-	btSoftBody*				m_softBody;
-	btCollisionObject*		m_rigidCollisionObject;
-
-	///for rigid versus soft (instead of soft versus rigid), we use this swapped boolean
-	bool	m_isSwapped;
-	
-public:
-
-	btSoftRigidCollisionAlgorithm(btPersistentManifold* mf,const btCollisionAlgorithmConstructionInfo& ci,btCollisionObject* col0,btCollisionObject* col1, bool isSwapped);
-
-	virtual ~btSoftRigidCollisionAlgorithm();
-
-	virtual void processCollision (btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut);
-
-	virtual btScalar calculateTimeOfImpact(btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut);
-
-	virtual	void	getAllContactManifolds(btManifoldArray&	manifoldArray)
-	{
-		//we don't add any manifolds
-	}
-
-	
-	struct CreateFunc :public 	btCollisionAlgorithmCreateFunc
-	{
-		virtual	btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, btCollisionObject* body0,btCollisionObject* body1)
-		{
-			void* mem = ci.m_dispatcher1->allocateCollisionAlgorithm(sizeof(btSoftRigidCollisionAlgorithm));
-			if (!m_swapped)
-			{
-				return new(mem) btSoftRigidCollisionAlgorithm(0,ci,body0,body1,false);
-			} else
-			{
-				return new(mem) btSoftRigidCollisionAlgorithm(0,ci,body0,body1,true);
-			}
-		}
-	};
-
-};
-
-#endif //SOFT_RIGID_COLLISION_ALGORITHM_H
-
-
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp b/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp
deleted file mode 100644
index 01b9fc0fd35..00000000000
--- a/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-
-#include "btSoftRigidDynamicsWorld.h"
-#include "LinearMath/btQuickprof.h"
-
-//softbody & helpers
-#include "btSoftBody.h"
-#include "btSoftBodyHelpers.h"
-
-btSoftRigidDynamicsWorld::btSoftRigidDynamicsWorld(btDispatcher* dispatcher,btBroadphaseInterface* pairCache,btConstraintSolver* constraintSolver,btCollisionConfiguration* collisionConfiguration)
-:btDiscreteDynamicsWorld(dispatcher,pairCache,constraintSolver,collisionConfiguration)
-{
-m_drawFlags			=	fDrawFlags::Std;
-m_drawNodeTree		=	true;
-m_drawFaceTree		=	false;
-m_drawClusterTree	=	false;
-}
-		
-btSoftRigidDynamicsWorld::~btSoftRigidDynamicsWorld()
-{
-
-}
-
-void	btSoftRigidDynamicsWorld::predictUnconstraintMotion(btScalar timeStep)
-{
-	btDiscreteDynamicsWorld::predictUnconstraintMotion( timeStep);
-
-	for ( int i=0;i<m_softBodies.size();++i)
-	{
-		btSoftBody*	psb= m_softBodies[i];
-
-		psb->predictMotion(timeStep);		
-	}
-}
-		
-void	btSoftRigidDynamicsWorld::internalSingleStepSimulation( btScalar timeStep)
-{
-	btDiscreteDynamicsWorld::internalSingleStepSimulation( timeStep );
-
-	///solve soft bodies constraints
-	solveSoftBodiesConstraints();
-
-	///update soft bodies
-	updateSoftBodies();
-
-}
-
-void	btSoftRigidDynamicsWorld::updateSoftBodies()
-{
-	BT_PROFILE("updateSoftBodies");
-	
-	for ( int i=0;i<m_softBodies.size();i++)
-	{
-		btSoftBody*	psb=(btSoftBody*)m_softBodies[i];
-		psb->integrateMotion();	
-	}
-}
-
-void	btSoftRigidDynamicsWorld::solveSoftBodiesConstraints()
-{
-	BT_PROFILE("solveSoftConstraints");
-	
-	if(m_softBodies.size())
-		{
-		btSoftBody::solveClusters(m_softBodies);
-		}
-	
-	for(int i=0;i<m_softBodies.size();++i)
-	{
-		btSoftBody*	psb=(btSoftBody*)m_softBodies[i];
-		psb->solveConstraints();
-	}	
-}
-
-void	btSoftRigidDynamicsWorld::addSoftBody(btSoftBody* body)
-{
-	m_softBodies.push_back(body);
-
-	btCollisionWorld::addCollisionObject(body,
-					btBroadphaseProxy::DefaultFilter,
-					btBroadphaseProxy::AllFilter);
-
-}
-
-void	btSoftRigidDynamicsWorld::removeSoftBody(btSoftBody* body)
-{
-	m_softBodies.remove(body);
-
-	btCollisionWorld::removeCollisionObject(body);
-}
-
-void	btSoftRigidDynamicsWorld::debugDrawWorld()
-{
-	btDiscreteDynamicsWorld::debugDrawWorld();
-
-	if (getDebugDrawer())
-	{
-		int i;
-		for (  i=0;i<this->m_softBodies.size();i++)
-		{
-			btSoftBody*	psb=(btSoftBody*)this->m_softBodies[i];
-			btSoftBodyHelpers::DrawFrame(psb,m_debugDrawer);
-			btSoftBodyHelpers::Draw(psb,m_debugDrawer,m_drawFlags);
-			if (m_debugDrawer && (m_debugDrawer->getDebugMode() & btIDebugDraw::DBG_DrawAabb))
-			{
-				if(m_drawNodeTree)		btSoftBodyHelpers::DrawNodeTree(psb,m_debugDrawer);
-				if(m_drawFaceTree)		btSoftBodyHelpers::DrawFaceTree(psb,m_debugDrawer);
-				if(m_drawClusterTree)	btSoftBodyHelpers::DrawClusterTree(psb,m_debugDrawer);
-			}
-		}		
-	}	
-}
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.h b/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.h
deleted file mode 100644
index d0010b65aad..00000000000
--- a/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-#include "BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h"
-
-#ifndef BT_SOFT_RIGID_DYNAMICS_WORLD_H
-#define BT_SOFT_RIGID_DYNAMICS_WORLD_H
-
-class btSoftBody;
-typedef	btAlignedObjectArray<btSoftBody*> btSoftBodyArray;
-
-class btSoftRigidDynamicsWorld : public btDiscreteDynamicsWorld
-{
-	
-	btSoftBodyArray	m_softBodies;
-	int				m_drawFlags;
-	bool			m_drawNodeTree;
-	bool			m_drawFaceTree;
-	bool			m_drawClusterTree;
-		
-protected:
-	
-	virtual void	predictUnconstraintMotion(btScalar timeStep);
-	
-	virtual void	internalSingleStepSimulation( btScalar timeStep);
-
-	void	updateSoftBodies();
-
-	void	solveSoftBodiesConstraints();
-
-	
-
-public:
-	
-	btSoftRigidDynamicsWorld(btDispatcher* dispatcher,btBroadphaseInterface* pairCache,btConstraintSolver* constraintSolver,btCollisionConfiguration* collisionConfiguration);
-
-	virtual ~btSoftRigidDynamicsWorld();
-	
-	virtual void	debugDrawWorld();
-			
-	void	addSoftBody(btSoftBody* body);
-
-	void	removeSoftBody(btSoftBody* body);
-	
-	int		getDrawFlags() const { return(m_drawFlags); }
-	void	setDrawFlags(int f)	{ m_drawFlags=f; }
-
-			
-	btSoftBodyArray& getSoftBodyArray()
-	{
-		return m_softBodies;
-	}
-
-	const btSoftBodyArray& getSoftBodyArray() const
-	{
-		return m_softBodies;
-	}
-		
-};
-
-#endif //BT_SOFT_RIGID_DYNAMICS_WORLD_H
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp b/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp
deleted file mode 100644
index 85a727944e0..00000000000
--- a/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-#include "btSoftSoftCollisionAlgorithm.h"
-#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h"
-#include "BulletCollision/CollisionShapes/btBoxShape.h"
-#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
-#include "btSoftBody.h"
-
-#define USE_PERSISTENT_CONTACTS 1
-
-btSoftSoftCollisionAlgorithm::btSoftSoftCollisionAlgorithm(btPersistentManifold* /*mf*/,const btCollisionAlgorithmConstructionInfo& ci,btCollisionObject* /*obj0*/,btCollisionObject* /*obj1*/)
-: btCollisionAlgorithm(ci)
-//m_ownManifold(false),
-//m_manifoldPtr(mf)
-{
-}
-
-btSoftSoftCollisionAlgorithm::~btSoftSoftCollisionAlgorithm()
-{
-}
-
-void btSoftSoftCollisionAlgorithm::processCollision (btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& /*dispatchInfo*/,btManifoldResult* /*resultOut*/)
-{
-	btSoftBody* soft0 =	(btSoftBody*)body0;
-	btSoftBody* soft1 =	(btSoftBody*)body1;
-	soft0->defaultCollisionHandler(soft1);
-}
-
-btScalar btSoftSoftCollisionAlgorithm::calculateTimeOfImpact(btCollisionObject* /*body0*/,btCollisionObject* /*body1*/,const btDispatcherInfo& /*dispatchInfo*/,btManifoldResult* /*resultOut*/)
-{
-	//not yet
-	return 1.f;
-}
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h b/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h
deleted file mode 100644
index 7ca9c3415c9..00000000000
--- a/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose, 
-including commercial applications, and to alter it and redistribute it freely, 
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-#ifndef SOFT_SOFT_COLLISION_ALGORITHM_H
-#define SOFT_SOFT_COLLISION_ALGORITHM_H
-
-#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
-#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
-#include "BulletCollision/BroadphaseCollision/btDispatcher.h"
-#include "BulletCollision/CollisionDispatch/btCollisionCreateFunc.h"
-
-class btPersistentManifold;
-class btSoftBody;
-
-///collision detection between two btSoftBody shapes
-class btSoftSoftCollisionAlgorithm : public btCollisionAlgorithm
-{
-	bool	m_ownManifold;
-	btPersistentManifold*	m_manifoldPtr;
-
-	btSoftBody*	m_softBody0;
-	btSoftBody*	m_softBody1;
-
-	
-public:
-	btSoftSoftCollisionAlgorithm(const btCollisionAlgorithmConstructionInfo& ci)
-		: btCollisionAlgorithm(ci) {}
-
-	virtual void processCollision (btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut);
-
-	virtual btScalar calculateTimeOfImpact(btCollisionObject* body0,btCollisionObject* body1,const btDispatcherInfo& dispatchInfo,btManifoldResult* resultOut);
-
-	virtual	void	getAllContactManifolds(btManifoldArray&	manifoldArray)
-	{
-		if (m_manifoldPtr && m_ownManifold)
-			manifoldArray.push_back(m_manifoldPtr);
-	}
-
-	btSoftSoftCollisionAlgorithm(btPersistentManifold* mf,const btCollisionAlgorithmConstructionInfo& ci,btCollisionObject* body0,btCollisionObject* body1);
-
-	virtual ~btSoftSoftCollisionAlgorithm();
-
-	struct CreateFunc :public 	btCollisionAlgorithmCreateFunc
-	{
-		virtual	btCollisionAlgorithm* CreateCollisionAlgorithm(btCollisionAlgorithmConstructionInfo& ci, btCollisionObject* body0,btCollisionObject* body1)
-		{
-			int bbsize = sizeof(btSoftSoftCollisionAlgorithm);
-			void* ptr = ci.m_dispatcher1->allocateCollisionAlgorithm(bbsize);
-			return new(ptr) btSoftSoftCollisionAlgorithm(0,ci,body0,body1);
-		}
-	};
-
-};
-
-#endif //SOFT_SOFT_COLLISION_ALGORITHM_H
-
-
diff --git a/extern/bullet2/src/BulletSoftBody/btSparseSDF.h b/extern/bullet2/src/BulletSoftBody/btSparseSDF.h
deleted file mode 100644
index eafe74be1ae..00000000000
--- a/extern/bullet2/src/BulletSoftBody/btSparseSDF.h
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the use of this software.
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it freely,
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-///btSparseSdf implementation by Nathanael Presson
-
-#ifndef _14F9D17F_EAE8_4aba_B41C_292DB2AA70F3_
-#define _14F9D17F_EAE8_4aba_B41C_292DB2AA70F3_
-
-#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
-#include "BulletCollision/NarrowPhaseCollision/btGjkEpa2.h"
-
-// Modified Paul Hsieh hash
-template <const int DWORDLEN>
-unsigned int HsiehHash(const void* pdata)
-	{
-	const unsigned short*	data=(const unsigned short*)pdata;
-	unsigned				hash=DWORDLEN<<2,tmp;
-	for(int i=0;i<DWORDLEN;++i)
-		{
-		hash	+=	data[0];
-		tmp		=	(data[1]<<11)^hash;
-		hash	=	(hash<<16)^tmp;
-		data	+=	2;
-		hash	+=	hash>>11;
-		}
-	hash^=hash<<3;hash+=hash>>5;
-	hash^=hash<<4;hash+=hash>>17;
-	hash^=hash<<25;hash+=hash>>6;
-	return(hash);
-	}
-
-template <const int CELLSIZE>
-struct	btSparseSdf
-	{
-	//
-	// Inner types
-	//
-	struct IntFrac
-		{
-		int					b;
-		int					i;
-		btScalar			f;
-		};
-	struct	Cell
-		{
-		btScalar			d[CELLSIZE+1][CELLSIZE+1][CELLSIZE+1];
-		int					c[3];
-		int					puid;
-		unsigned			hash;
-		btCollisionShape*	pclient;
-		Cell*				next;
-		};
-	//
-	// Fields
-	//
-	
-	btAlignedObjectArray<Cell*>		cells;	
-	btScalar						voxelsz;
-	int								puid;
-	int								ncells;
-	int								nprobes;
-	int								nqueries;	
-	
-	//
-	// Methods
-	//
-	
-	//
-	void					Initialize(int hashsize=2383)
-		{
-		cells.resize(hashsize,0);
-		Reset();		
-		}
-	//
-	void					Reset()
-		{
-		for(int i=0,ni=cells.size();i<ni;++i)
-			{
-			Cell*	pc=cells[i];
-			cells[i]=0;
-			while(pc)
-				{
-				Cell*	pn=pc->next;
-				delete pc;
-				pc=pn;
-				}
-			}
-		voxelsz		=0.25;
-		puid		=0;
-		ncells		=0;
-		nprobes		=1;
-		nqueries	=1;
-		}
-	//
-	void					GarbageCollect(int lifetime=256)
-		{
-		const int life=puid-lifetime;
-		for(int i=0;i<cells.size();++i)
-			{
-			Cell*&	root=cells[i];
-			Cell*	pp=0;
-			Cell*	pc=root;
-			while(pc)
-				{
-				Cell*	pn=pc->next;
-				if(pc->puid<life)
-					{
-					if(pp) pp->next=pn; else root=pn;
-					delete pc;pc=pp;--ncells;
-					}
-				pp=pc;pc=pn;
-				}
-			}
-		//printf("GC[%d]: %d cells, PpQ: %f\r\n",puid,ncells,nprobes/(btScalar)nqueries);
-		nqueries=1;
-		nprobes=1;
-		++puid;	/* TODO: Reset puid's when int range limit is reached	*/ 
-				/* else setup a priority list...						*/ 
-		}
-	//
-	int						RemoveReferences(btCollisionShape* pcs)
-		{
-		int	refcount=0;
-		for(int i=0;i<cells.size();++i)
-			{
-			Cell*&	root=cells[i];
-			Cell*	pp=0;
-			Cell*	pc=root;
-			while(pc)
-				{
-				Cell*	pn=pc->next;
-				if(pc->pclient==pcs)
-					{
-					if(pp) pp->next=pn; else root=pn;
-					delete pc;pc=pp;++refcount;
-					}
-				pp=pc;pc=pn;
-				}
-			}
-		return(refcount);
-		}
-	//
-	btScalar				Evaluate(	const btVector3& x,
-										btCollisionShape* shape,
-										btVector3& normal,
-										btScalar margin)
-		{
-		/* Lookup cell			*/ 
-		const btVector3	scx=x/voxelsz;
-		const IntFrac	ix=Decompose(scx.x());
-		const IntFrac	iy=Decompose(scx.y());
-		const IntFrac	iz=Decompose(scx.z());
-		const unsigned	h=Hash(ix.b,iy.b,iz.b,shape);
-		Cell*&			root=cells[static_cast<int>(h%cells.size())];
-		Cell*			c=root;
-		++nqueries;
-		while(c)
-			{
-			++nprobes;
-			if(	(c->hash==h)	&&
-				(c->c[0]==ix.b)	&&
-				(c->c[1]==iy.b)	&&
-				(c->c[2]==iz.b)	&&
-				(c->pclient==shape))
-				{ break; }
-				else
-				{ c=c->next; }
-			}
-		if(!c)
-			{
-			++nprobes;		
-			++ncells;
-			c=new Cell();
-			c->next=root;root=c;
-			c->pclient=shape;
-			c->hash=h;
-			c->c[0]=ix.b;c->c[1]=iy.b;c->c[2]=iz.b;
-			BuildCell(*c);
-			}
-		c->puid=puid;
-		/* Extract infos		*/ 
-		const int		o[]={	ix.i,iy.i,iz.i};
-		const btScalar	d[]={	c->d[o[0]+0][o[1]+0][o[2]+0],
-								c->d[o[0]+1][o[1]+0][o[2]+0],
-								c->d[o[0]+1][o[1]+1][o[2]+0],
-								c->d[o[0]+0][o[1]+1][o[2]+0],
-								c->d[o[0]+0][o[1]+0][o[2]+1],
-								c->d[o[0]+1][o[1]+0][o[2]+1],
-								c->d[o[0]+1][o[1]+1][o[2]+1],
-								c->d[o[0]+0][o[1]+1][o[2]+1]};
-		/* Normal	*/ 
-		#if 1
-		const btScalar	gx[]={	d[1]-d[0],d[2]-d[3],
-								d[5]-d[4],d[6]-d[7]};
-		const btScalar	gy[]={	d[3]-d[0],d[2]-d[1],
-								d[7]-d[4],d[6]-d[5]};
-		const btScalar	gz[]={	d[4]-d[0],d[5]-d[1],
-								d[7]-d[3],d[6]-d[2]};
-		normal.setX(Lerp(	Lerp(gx[0],gx[1],iy.f),
-							Lerp(gx[2],gx[3],iy.f),iz.f));
-		normal.setY(Lerp(	Lerp(gy[0],gy[1],ix.f),
-							Lerp(gy[2],gy[3],ix.f),iz.f));
-		normal.setZ(Lerp(	Lerp(gz[0],gz[1],ix.f),
-							Lerp(gz[2],gz[3],ix.f),iy.f));
-		normal		=	normal.normalized();
-		#else
-		normal		=	btVector3(d[1]-d[0],d[3]-d[0],d[4]-d[0]).normalized();
-		#endif
-		/* Distance	*/ 
-		const btScalar	d0=Lerp(Lerp(d[0],d[1],ix.f),
-								Lerp(d[3],d[2],ix.f),iy.f);
-		const btScalar	d1=Lerp(Lerp(d[4],d[5],ix.f),
-								Lerp(d[7],d[6],ix.f),iy.f);
-		return(Lerp(d0,d1,iz.f)-margin);
-		}
-	//
-	void					BuildCell(Cell& c)
-		{
-		const btVector3	org=btVector3(	(btScalar)c.c[0],
-										(btScalar)c.c[1],
-										(btScalar)c.c[2])	*
-										CELLSIZE*voxelsz;
-		for(int k=0;k<=CELLSIZE;++k)
-			{
-			const btScalar	z=voxelsz*k+org.z();
-			for(int j=0;j<=CELLSIZE;++j)
-				{
-				const btScalar	y=voxelsz*j+org.y();
-				for(int i=0;i<=CELLSIZE;++i)
-					{
-					const btScalar	x=voxelsz*i+org.x();
-					c.d[i][j][k]=DistanceToShape(	btVector3(x,y,z),
-													c.pclient);
-					}
-				}
-			}
-		}
-	//
-	static inline btScalar	DistanceToShape(const btVector3& x,
-											btCollisionShape* shape)
-		{
-		btTransform	unit;
-		unit.setIdentity();
-		if(shape->isConvex())
-			{
-			btGjkEpaSolver2::sResults	res;
-			btConvexShape*				csh=static_cast<btConvexShape*>(shape);
-			return(btGjkEpaSolver2::SignedDistance(x,0,csh,unit,res));
-			}
-		return(0);
-		}
-	//
-	static inline IntFrac	Decompose(btScalar x)
-		{
-		/* That one need a lot of improvements...	*/
-		/* Remove test, faster floor...				*/ 
-		IntFrac			r;
-		x/=CELLSIZE;
-		const int		o=x<0?(int)(-x+1):0;
-		x+=o;r.b=(int)x;
-		const btScalar	k=(x-r.b)*CELLSIZE;
-		r.i=(int)k;r.f=k-r.i;r.b-=o;
-		return(r);
-		}
-	//
-	static inline btScalar	Lerp(btScalar a,btScalar b,btScalar t)
-		{
-		return(a+(b-a)*t);
-		}
-
-	
-
-	//
-	static inline unsigned int	Hash(int x,int y,int z,btCollisionShape* shape)
-		{
-		struct btS
-		{ 
-			int x,y,z;
-			void* p;
-		};
-
-		btS myset;
-		
-		myset.x=x;myset.y=y;myset.z=z;myset.p=shape;
-		const void* ptr = &myset;
-
-		unsigned int result = HsiehHash<sizeof(btS)/4> (ptr);
-		
-
-		return result;
-		}
-};
-	
-
-#endif
diff --git a/extern/bullet2/src/LinearMath/btAabbUtil2.h b/extern/bullet2/src/LinearMath/btAabbUtil2.h
index 8bb6b3af7c3..429163c8138 100644
--- a/extern/bullet2/src/LinearMath/btAabbUtil2.h
+++ b/extern/bullet2/src/LinearMath/btAabbUtil2.h
@@ -18,16 +18,11 @@ subject to the following restrictions:
 #define AABB_UTIL2
 
 #include "btVector3.h"
-#include "btMinMax.h"
+#include "btSimdMinMax.h"
 
-SIMD_FORCE_INLINE void AabbExpand (btVector3& aabbMin,
-								   btVector3& aabbMax,
-								   const btVector3& expansionMin,
-								   const btVector3& expansionMax)
-{
-	aabbMin = aabbMin + expansionMin;
-	aabbMax = aabbMax + expansionMax;
-}
+
+#define btMin(a,b) ((a < b ? a : b))
+#define btMax(a,b) ((a > b ? a : b))
 
 
 /// conservative test for overlap between two aabbs
@@ -72,41 +67,6 @@ SIMD_FORCE_INLINE int	btOutcode(const btVector3& p,const btVector3& halfExtent)
 }
 
 
-SIMD_FORCE_INLINE bool btRayAabb2(const btVector3& rayFrom,
-								  const btVector3& rayInvDirection,
-								  const unsigned int raySign[3],
-								  const btVector3 bounds[2],
-								  btScalar& tmin,
-								  btScalar lambda_min,
-								  btScalar lambda_max)
-{
-	btScalar tmax, tymin, tymax, tzmin, tzmax;
-	tmin = (bounds[raySign[0]][0] - rayFrom[0]) * rayInvDirection[0];
-	tmax = (bounds[1-raySign[0]][0] - rayFrom[0]) * rayInvDirection[0];
-	tymin = (bounds[raySign[1]][1] - rayFrom[1]) * rayInvDirection[1];
-	tymax = (bounds[1-raySign[1]][1] - rayFrom[1]) * rayInvDirection[1];
-
-	if ( (tmin > tymax) || (tymin > tmax) )
-		return false;
-
-	if (tymin > tmin)
-		tmin = tymin;
-
-	if (tymax < tmax)
-		tmax = tymax;
-
-	tzmin = (bounds[raySign[2]][2] - rayFrom[2]) * rayInvDirection[2];
-	tzmax = (bounds[1-raySign[2]][2] - rayFrom[2]) * rayInvDirection[2];
-
-	if ( (tmin > tzmax) || (tzmin > tmax) )
-		return false;
-	if (tzmin > tmin)
-		tmin = tzmin;
-	if (tzmax < tmax)
-		tmax = tzmax;
-	return ( (tmin < lambda_max) && (tmax > lambda_min) );
-}
-
 SIMD_FORCE_INLINE bool btRayAabb(const btVector3& rayFrom, 
 								 const btVector3& rayTo, 
 								 const btVector3& aabbMin, 
@@ -165,4 +125,3 @@ SIMD_FORCE_INLINE bool btRayAabb(const btVector3& rayFrom,
 
 #endif
 
-
diff --git a/extern/bullet2/src/LinearMath/btAlignedAllocator.cpp b/extern/bullet2/src/LinearMath/btAlignedAllocator.cpp
index e120289e061..1f5877fa37e 100644
--- a/extern/bullet2/src/LinearMath/btAlignedAllocator.cpp
+++ b/extern/bullet2/src/LinearMath/btAlignedAllocator.cpp
@@ -15,187 +15,56 @@ subject to the following restrictions:
 
 #include "btAlignedAllocator.h"
 
-int gNumAlignedAllocs = 0;
-int gNumAlignedFree = 0;
-int gTotalBytesAlignedAllocs = 0;//detect memory leaks
 
-#if defined (BT_HAS_ALIGNED_ALLOCATOR)
+#if defined (BT_HAS_ALIGNED_ALOCATOR)
+
 #include <malloc.h>
-static void *btAlignedAllocDefault(size_t size, int alignment)
+void*	btAlignedAlloc	(int size, int alignment)
 {
-	return _aligned_malloc(size, (size_t)alignment);
+	return _aligned_malloc(size,alignment);
 }
 
-static void btAlignedFreeDefault(void *ptr)
+void	btAlignedFree	(void* ptr)
 {
 	_aligned_free(ptr);
 }
-#elif defined(__CELLOS_LV2__)
+
+#else
+
+#ifdef __CELLOS_LV2__
+
 #include <stdlib.h>
 
-static inline void *btAlignedAllocDefault(size_t size, int alignment)
+int numAllocs = 0;
+int numFree = 0;
+
+void*	btAlignedAlloc	(int size, int alignment)
 {
+	numAllocs++;
 	return memalign(alignment, size);
 }
 
-static inline void btAlignedFreeDefault(void *ptr)
+void	btAlignedFree	(void* ptr)
 {
+	numFree++;
 	free(ptr);
 }
+
 #else
-static inline void *btAlignedAllocDefault(size_t size, int alignment)
-{
-  void *ret;
-  char *real;
-  unsigned long offset;
+///todo
+///will add some multi-platform version that works without _aligned_malloc/_aligned_free
 
-  real = (char *)malloc(size + sizeof(void *) + (alignment-1));
-  if (real) {
-    offset = (alignment - (unsigned long)(real + sizeof(void *))) & (alignment-1);
-    ret = (void *)((real + sizeof(void *)) + offset);
-    *((void **)(ret)-1) = (void *)(real);
-  } else {
-    ret = (void *)(real);
-  }
-  return (ret);
+void*	btAlignedAlloc	(int size, int alignment)
+{
+	return new char[size];
 }
 
-static inline void btAlignedFreeDefault(void *ptr)
+void	btAlignedFree	(void* ptr)
 {
-  void* real;
-
-  if (ptr) {
-    real = *((void **)(ptr)-1);
-    free(real);
-  }
+	delete [] (char*) ptr;
 }
+#endif //
+
 #endif
 
-static void *btAllocDefault(size_t size)
-{
-	return malloc(size);
-}
-
-static void btFreeDefault(void *ptr)
-{
-	free(ptr);
-}
-
-static btAlignedAllocFunc *sAlignedAllocFunc = btAlignedAllocDefault;
-static btAlignedFreeFunc *sAlignedFreeFunc = btAlignedFreeDefault;
-static btAllocFunc *sAllocFunc = btAllocDefault;
-static btFreeFunc *sFreeFunc = btFreeDefault;
-
-void btAlignedAllocSetCustomAligned(btAlignedAllocFunc *allocFunc, btAlignedFreeFunc *freeFunc)
-{
-  sAlignedAllocFunc = allocFunc ? allocFunc : btAlignedAllocDefault;
-  sAlignedFreeFunc = freeFunc ? freeFunc : btAlignedFreeDefault;
-}
-
-void btAlignedAllocSetCustom(btAllocFunc *allocFunc, btFreeFunc *freeFunc)
-{
-  sAllocFunc = allocFunc ? allocFunc : btAllocDefault;
-  sFreeFunc = freeFunc ? freeFunc : btFreeDefault;
-}
-
-#ifdef BT_DEBUG_MEMORY_ALLOCATIONS
-//this generic allocator provides the total allocated number of bytes
-#include <stdio.h>
-
-void*   btAlignedAllocInternal  (size_t size, int alignment,int line,char* filename)
-{
- void *ret;
- char *real;
- unsigned long offset;
-
- gTotalBytesAlignedAllocs += size;
- gNumAlignedAllocs++;
-
- 
- real = (char *)sAllocFunc(size + 2*sizeof(void *) + (alignment-1));
- if (real) {
-   offset = (alignment - (unsigned long)(real + 2*sizeof(void *))) &
-(alignment-1);
-   ret = (void *)((real + 2*sizeof(void *)) + offset);
-   *((void **)(ret)-1) = (void *)(real);
-       *((int*)(ret)-2) = size;
-
- } else {
-   ret = (void *)(real);//??
- }
-
- printf("allocation#%d at address %x, from %s,line %d, size %d\n",gNumAlignedAllocs,real, filename,line,size);
-
- int* ptr = (int*)ret;
- *ptr = 12;
- return (ret);
-}
-
-void    btAlignedFreeInternal   (void* ptr,int line,char* filename)
-{
-
- void* real;
- gNumAlignedFree++;
-
- if (ptr) {
-   real = *((void **)(ptr)-1);
-       int size = *((int*)(ptr)-2);
-       gTotalBytesAlignedAllocs -= size;
-
-	   printf("free #%d at address %x, from %s,line %d, size %d\n",gNumAlignedFree,real, filename,line,size);
-
-   sFreeFunc(real);
- } else
- {
-	 printf("NULL ptr\n");
- }
-}
-
-#else //BT_DEBUG_MEMORY_ALLOCATIONS
-
-void*	btAlignedAllocInternal	(size_t size, int alignment)
-{
-	gNumAlignedAllocs++;
-  void* ptr;
-#if defined (BT_HAS_ALIGNED_ALLOCATOR) || defined(__CELLOS_LV2__)
-	ptr = sAlignedAllocFunc(size, alignment);
-#else
-  char *real;
-  unsigned long offset;
-
-  real = (char *)sAllocFunc(size + sizeof(void *) + (alignment-1));
-  if (real) {
-    offset = (alignment - (unsigned long)(real + sizeof(void *))) & (alignment-1);
-    ptr = (void *)((real + sizeof(void *)) + offset);
-    *((void **)(ptr)-1) = (void *)(real);
-  } else {
-    ptr = (void *)(real);
-  }
-#endif  // defined (BT_HAS_ALIGNED_ALLOCATOR) || defined(__CELLOS_LV2__)
-//	printf("btAlignedAllocInternal %d, %x\n",size,ptr);
-	return ptr;
-}
-
-void	btAlignedFreeInternal	(void* ptr)
-{
-	if (!ptr)
-	{
-		return;
-	}
-
-	gNumAlignedFree++;
-//	printf("btAlignedFreeInternal %x\n",ptr);
-#if defined (BT_HAS_ALIGNED_ALLOCATOR) || defined(__CELLOS_LV2__)
-	sAlignedFreeFunc(ptr);
-#else
-  void* real;
-
-  if (ptr) {
-    real = *((void **)(ptr)-1);
-    sFreeFunc(real);
-  }
-#endif  // defined (BT_HAS_ALIGNED_ALLOCATOR) || defined(__CELLOS_LV2__)
-}
-
-#endif //BT_DEBUG_MEMORY_ALLOCATIONS
 
diff --git a/extern/bullet2/src/LinearMath/btAlignedAllocator.h b/extern/bullet2/src/LinearMath/btAlignedAllocator.h
index a252f324d77..07585717f45 100644
--- a/extern/bullet2/src/LinearMath/btAlignedAllocator.h
+++ b/extern/bullet2/src/LinearMath/btAlignedAllocator.h
@@ -21,39 +21,15 @@ subject to the following restrictions:
 ///that is better portable and more predictable
 
 #include "btScalar.h"
-//#define BT_DEBUG_MEMORY_ALLOCATIONS 1
-#ifdef BT_DEBUG_MEMORY_ALLOCATIONS
 
-#define btAlignedAlloc(a,b) \
-		btAlignedAllocInternal(a,b,__LINE__,__FILE__)
+void*	btAlignedAlloc	(int size, int alignment);
 
-#define btAlignedFree(ptr) \
-		btAlignedFreeInternal(ptr,__LINE__,__FILE__)
+void	btAlignedFree	(void* ptr);
 
-void*	btAlignedAllocInternal	(size_t size, int alignment,int line,char* filename);
 
-void	btAlignedFreeInternal	(void* ptr,int line,char* filename);
-
-#else
-	void*	btAlignedAllocInternal	(size_t size, int alignment);
-	void	btAlignedFreeInternal	(void* ptr);
-
-	#define btAlignedAlloc(a,b) btAlignedAllocInternal(a,b)
-	#define btAlignedFree(ptr) btAlignedFreeInternal(ptr)
-
-#endif
 typedef int	size_type;
 
-typedef void *(btAlignedAllocFunc)(size_t size, int alignment);
-typedef void (btAlignedFreeFunc)(void *memblock);
-typedef void *(btAllocFunc)(size_t size);
-typedef void (btFreeFunc)(void *memblock);
 
-void btAlignedAllocSetCustomAligned(btAlignedAllocFunc *allocFunc, btAlignedFreeFunc *freeFunc);
-void btAlignedAllocSetCustom(btAllocFunc *allocFunc, btFreeFunc *freeFunc);
-
-///The btAlignedAllocator is a portable class for aligned memory allocations.
-///Default implementations for unaligned and aligned allocations can be overridden by a custom allocator using btAlignedAllocSetCustom and btAlignedAllocSetCustomAligned.
 template < typename T , unsigned Alignment >
 class btAlignedAllocator {
 	
diff --git a/extern/bullet2/src/LinearMath/btAlignedObjectArray.h b/extern/bullet2/src/LinearMath/btAlignedObjectArray.h
index 5598f0d7236..8bef5eb5d06 100644
--- a/extern/bullet2/src/LinearMath/btAlignedObjectArray.h
+++ b/extern/bullet2/src/LinearMath/btAlignedObjectArray.h
@@ -39,8 +39,8 @@ subject to the following restrictions:
 #endif //BT_USE_PLACEMENT_NEW
 
 
-///The btAlignedObjectArray template class uses a subset of the stl::vector interface for its methods
-///It is developed to replace stl::vector to avoid portability issues, including STL alignment issues to add SIMD/SSE data
+///btAlignedObjectArray uses a subset of the stl::vector interface for its methods
+///It is developed to replace stl::vector to avoid STL alignment issues to add SIMD/SSE data
 template <typename T> 
 //template <class T> 
 class btAlignedObjectArray
@@ -50,8 +50,6 @@ class btAlignedObjectArray
 	int					m_size;
 	int					m_capacity;
 	T*					m_data;
-	//PCK: added this line
-	bool				m_ownsMemory;
 
 	protected:
 		SIMD_FORCE_INLINE	int	allocSize(int size)
@@ -71,8 +69,6 @@ class btAlignedObjectArray
 
 		SIMD_FORCE_INLINE	void	init()
 		{
-			//PCK: added this line
-			m_ownsMemory = true;
 			m_data = 0;
 			m_size = 0;
 			m_capacity = 0;
@@ -96,11 +92,7 @@ class btAlignedObjectArray
 		SIMD_FORCE_INLINE	void	deallocate()
 		{
 			if(m_data)	{
-				//PCK: enclosed the deallocation in this block
-				if (m_ownsMemory)
-				{
-					m_allocator.deallocate(m_data);
-				}
+				m_allocator.deallocate(m_data);
 				m_data = 0;
 			}
 		}
@@ -231,9 +223,6 @@ class btAlignedObjectArray
 				destroy(0,size());
 
 				deallocate();
-				
-				//PCK: added this line
-				m_ownsMemory = true;
 
 				m_data = s;
 				
@@ -253,46 +242,6 @@ class btAlignedObjectArray
 				}
 		};
 	
-		template <typename L>
-		void quickSortInternal(L CompareFunc,int lo, int hi)
-		{
-		//  lo is the lower index, hi is the upper index
-		//  of the region of array a that is to be sorted
-			int i=lo, j=hi;
-			T x=m_data[(lo+hi)/2];
-
-			//  partition
-			do
-			{    
-				while (CompareFunc(m_data[i],x)) 
-					i++; 
-				while (CompareFunc(x,m_data[j])) 
-					j--;
-				if (i<=j)
-				{
-					swap(i,j);
-					i++; j--;
-				}
-			} while (i<=j);
-
-			//  recursion
-			if (lo<j) 
-				quickSortInternal( CompareFunc, lo, j);
-			if (i<hi) 
-				quickSortInternal( CompareFunc, i, hi);
-		}
-
-
-		template <typename L>
-		void quickSort(L CompareFunc)
-		{
-			//don't sort 0 or 1 elements
-			if (size()>1)
-			{
-				quickSortInternal(CompareFunc,0,size()-1);
-			}
-		}
-
 
 		///heap sort from http://www.csse.monash.edu.au/~lloyd/tildeAlgDS/Sort/Heap/
 		template <typename L>
@@ -411,16 +360,8 @@ class btAlignedObjectArray
 		}
 	}
 
-	//PCK: whole function
-	void initializeFromBuffer(void *buffer, int size, int capacity)
-	{
-		clear();
-		m_ownsMemory = false;
-		m_data = (T*)buffer;
-		m_size = size;
-		m_capacity = capacity;
-	}
-
 };
 
 #endif //BT_OBJECT_ARRAY__
+
+
diff --git a/extern/bullet2/src/LinearMath/btDefaultMotionState.h b/extern/bullet2/src/LinearMath/btDefaultMotionState.h
index d758f77ed81..d4ec8e8879c 100644
--- a/extern/bullet2/src/LinearMath/btDefaultMotionState.h
+++ b/extern/bullet2/src/LinearMath/btDefaultMotionState.h
@@ -1,7 +1,7 @@
 #ifndef DEFAULT_MOTION_STATE_H
 #define DEFAULT_MOTION_STATE_H
 
-///The btDefaultMotionState provides a common implementation to synchronize world transforms with offsets.
+///btDefaultMotionState provides a common implementation to synchronize world transforms with offsets
 struct	btDefaultMotionState : public btMotionState
 {
 	btTransform m_graphicsWorldTrans;
diff --git a/extern/bullet2/src/LinearMath/btGeometryUtil.cpp b/extern/bullet2/src/LinearMath/btGeometryUtil.cpp
index 5ac230f712f..3d0fb122a6b 100644
--- a/extern/bullet2/src/LinearMath/btGeometryUtil.cpp
+++ b/extern/bullet2/src/LinearMath/btGeometryUtil.cpp
@@ -22,12 +22,7 @@ subject to the following restrictions:
   can be used by probes that are checking whether the
   library is actually installed.
 */
-extern "C"
-{	
-	void btBulletMathProbe ();
-
-	void btBulletMathProbe () {}
-}
+extern "C" void btBulletMathProbe () {}
 
 
 bool	btGeometryUtil::isPointInsidePlanes(const btAlignedObjectArray<btVector3>& planeEquations, const btVector3& point, btScalar	margin)
@@ -62,8 +57,6 @@ bool	btGeometryUtil::areVerticesBehindPlane(const btVector3& planeNormal, const
 	return true;
 }
 
-bool notExist(const btVector3& planeEquation,const btAlignedObjectArray<btVector3>& planeEquations);
-
 bool notExist(const btVector3& planeEquation,const btAlignedObjectArray<btVector3>& planeEquations)
 {
 	int numbrushes = planeEquations.size();
diff --git a/extern/bullet2/src/LinearMath/btGeometryUtil.h b/extern/bullet2/src/LinearMath/btGeometryUtil.h
index a4b13b45609..766cd75c383 100644
--- a/extern/bullet2/src/LinearMath/btGeometryUtil.h
+++ b/extern/bullet2/src/LinearMath/btGeometryUtil.h
@@ -19,7 +19,6 @@ subject to the following restrictions:
 #include "btVector3.h"
 #include "btAlignedObjectArray.h"
 
-///The btGeometryUtil helper class provides a few methods to convert between plane equations and vertices.
 class btGeometryUtil
 {
 	public:
diff --git a/extern/bullet2/src/LinearMath/btIDebugDraw.h b/extern/bullet2/src/LinearMath/btIDebugDraw.h
index 563615a9a32..5f40ca39157 100644
--- a/extern/bullet2/src/LinearMath/btIDebugDraw.h
+++ b/extern/bullet2/src/LinearMath/btIDebugDraw.h
@@ -31,9 +31,6 @@ DEALINGS IN THE SOFTWARE.
 #include "btVector3.h"
 
 
-///The btIDebugDraw interface class allows hooking up a debug renderer to visually debug simulations.
-///Typical use case: create a debug drawer object, and assign it to a btCollisionWorld or btDynamicsWorld using setDebugDrawer and call debugDrawWorld.
-///A class that implements the btIDebugDraw interface has to implement the drawLine method at a minimum.
 class	btIDebugDraw
 {
 	public:
@@ -58,24 +55,11 @@ class	btIDebugDraw
 	virtual ~btIDebugDraw() {};
 
 	virtual void	drawLine(const btVector3& from,const btVector3& to,const btVector3& color)=0;
-	
-	virtual	void	drawTriangle(const btVector3& v0,const btVector3& v1,const btVector3& v2,const btVector3& /*n0*/,const btVector3& /*n1*/,const btVector3& /*n2*/,const btVector3& color, btScalar alpha)
-	{
-		drawTriangle(v0,v1,v2,color,alpha);
-	}
-	virtual	void	drawTriangle(const btVector3& v0,const btVector3& v1,const btVector3& v2,const btVector3& color, btScalar /*alpha*/)
-	{
-		drawLine(v0,v1,color);
-		drawLine(v1,v2,color);
-		drawLine(v2,v0,color);
-	}
 
 	virtual void	drawContactPoint(const btVector3& PointOnB,const btVector3& normalOnB,btScalar distance,int lifeTime,const btVector3& color)=0;
 
 	virtual void	reportErrorWarning(const char* warningString) = 0;
 
-	virtual void	draw3dText(const btVector3& location,const char* textString) = 0;
-	
 	virtual void	setDebugMode(int debugMode) =0;
 	
 	virtual int		getDebugMode() const = 0;
diff --git a/extern/bullet2/src/LinearMath/btMatrix3x3.h b/extern/bullet2/src/LinearMath/btMatrix3x3.h
index ca1a801402f..94f53c3c0a5 100644
--- a/extern/bullet2/src/LinearMath/btMatrix3x3.h
+++ b/extern/bullet2/src/LinearMath/btMatrix3x3.h
@@ -22,9 +22,6 @@ subject to the following restrictions:
 #include "btQuaternion.h"
 
 
-
-///The btMatrix3x3 class implements a 3x3 rotation matrix, to perform linear algebra in combination with btQuaternion, btTransform and btVector3.
-///Make sure to only include a pure orthogonal matrix without scaling.
 class btMatrix3x3 {
 	public:
 		btMatrix3x3 () {}
@@ -359,7 +356,7 @@ class btMatrix3x3 {
 			m_el[0].y() * m[0].z() + m_el[1].y() * m[1].z() + m_el[2].y() * m[2].z(),
 			m_el[0].z() * m[0].x() + m_el[1].z() * m[1].x() + m_el[2].z() * m[2].x(),
 			m_el[0].z() * m[0].y() + m_el[1].z() * m[1].y() + m_el[2].z() * m[2].y(),
-			m_el[0].z() * m[0].z() + m_el[1].z() * m[1].z() + m_el[2].z() * m[2].z());
+			m_el[0].z() * m[0].z() + m_el[1].z() * m[1].z() + m_el[2].z() * m[2].x());
 	}
 	
 	SIMD_FORCE_INLINE btMatrix3x3 
@@ -409,11 +406,5 @@ class btMatrix3x3 {
 }
 */
 
-SIMD_FORCE_INLINE bool operator==(const btMatrix3x3& m1, const btMatrix3x3& m2)
-{
-   return ( m1[0][0] == m2[0][0] && m1[1][0] == m2[1][0] && m1[2][0] == m2[2][0] &&
-            m1[0][1] == m2[0][1] && m1[1][1] == m2[1][1] && m1[2][1] == m2[2][1] &&
-            m1[0][2] == m2[0][2] && m1[1][2] == m2[1][2] && m1[2][2] == m2[2][2] );
-}
 
 #endif
diff --git a/extern/bullet2/src/LinearMath/btMinMax.h b/extern/bullet2/src/LinearMath/btMinMax.h
index 5e27d62a4a4..1b8a3633f38 100644
--- a/extern/bullet2/src/LinearMath/btMinMax.h
+++ b/extern/bullet2/src/LinearMath/btMinMax.h
@@ -18,15 +18,15 @@ subject to the following restrictions:
 #define GEN_MINMAX_H
 
 template <class T>
-SIMD_FORCE_INLINE const T& btMin(const T& a, const T& b) 
+SIMD_FORCE_INLINE const T& GEN_min(const T& a, const T& b) 
 {
-  return a < b ? a : b ;
+  return b < a ? b : a;
 }
 
 template <class T>
-SIMD_FORCE_INLINE const T& btMax(const T& a, const T& b) 
+SIMD_FORCE_INLINE const T& GEN_max(const T& a, const T& b) 
 {
-  return  a > b ? a : b;
+  return  a < b ? b : a;
 }
 
 template <class T>
@@ -36,7 +36,7 @@ SIMD_FORCE_INLINE const T& GEN_clamped(const T& a, const T& lb, const T& ub)
 }
 
 template <class T>
-SIMD_FORCE_INLINE void btSetMin(T& a, const T& b) 
+SIMD_FORCE_INLINE void GEN_set_min(T& a, const T& b) 
 {
     if (b < a) 
 	{
@@ -45,7 +45,7 @@ SIMD_FORCE_INLINE void btSetMin(T& a, const T& b)
 }
 
 template <class T>
-SIMD_FORCE_INLINE void btSetMax(T& a, const T& b) 
+SIMD_FORCE_INLINE void GEN_set_max(T& a, const T& b) 
 {
     if (a < b) 
 	{
diff --git a/extern/bullet2/src/LinearMath/btMotionState.h b/extern/bullet2/src/LinearMath/btMotionState.h
index 94318140902..1975e5ff900 100644
--- a/extern/bullet2/src/LinearMath/btMotionState.h
+++ b/extern/bullet2/src/LinearMath/btMotionState.h
@@ -18,7 +18,7 @@ subject to the following restrictions:
 
 #include "btTransform.h"
 
-///The btMotionState interface class allows the dynamics world to synchronize and interpolate the updated world transforms with graphics
+///btMotionState allows the dynamics world to synchronize the updated world transforms with graphics
 ///For optimizations, potentially only moving objects get synchronized (using setWorldPosition/setWorldOrientation)
 class	btMotionState
 {
diff --git a/extern/bullet2/src/LinearMath/btQuadWord.h b/extern/bullet2/src/LinearMath/btQuadWord.h
index 2e80fc2ca47..961ac484d20 100644
--- a/extern/bullet2/src/LinearMath/btQuadWord.h
+++ b/extern/bullet2/src/LinearMath/btQuadWord.h
@@ -17,31 +17,19 @@ subject to the following restrictions:
 #define SIMD_QUADWORD_H
 
 #include "btScalar.h"
-#include "btMinMax.h"
-#include <math.h>
 
 
 
-///The btQuadWordStorage class is base class for btVector3 and btQuaternion. 
-///Some issues under PS3 Linux with IBM 2.1 SDK, gcc compiler prevent from using aligned quadword. todo: look into this
-///ATTRIBUTE_ALIGNED16(class) btQuadWordStorage
-class btQuadWordStorage
-{
-protected:
-
-	btScalar	m_x;
-	btScalar	m_y;
-	btScalar	m_z;
-	btScalar	m_unusedW;
-
-public:
-
-};
-
 
 ///btQuadWord is base-class for vectors, points
-class	btQuadWord : public btQuadWordStorage
+class	btQuadWord
 {
+	protected:
+		btScalar	m_x;
+		btScalar	m_y;
+		btScalar	m_z;
+		btScalar	m_unusedW;
+
 	public:
 	
 //		SIMD_FORCE_INLINE btScalar&       operator[](int i)       { return (&m_x)[i];	}      
@@ -73,8 +61,6 @@ class	btQuadWord : public btQuadWordStorage
 		SIMD_FORCE_INLINE	operator       btScalar *()       { return &m_x; }
 		SIMD_FORCE_INLINE	operator const btScalar *() const { return &m_x; }
 
-
-
 		SIMD_FORCE_INLINE void 	setValue(const btScalar& x, const btScalar& y, const btScalar& z)
 		{
 			m_x=x;
@@ -103,36 +89,47 @@ class	btQuadWord : public btQuadWordStorage
 		{
 		}
 
-		SIMD_FORCE_INLINE btQuadWord(const btQuadWordStorage& q)
+		SIMD_FORCE_INLINE btQuadWord(const btScalar& x, const btScalar& y, const btScalar& z) 
+		:m_x(x),m_y(y),m_z(z)
+		//todo, remove this in release/simd ?
+		,m_unusedW(btScalar(0.))
 		{
-			*((btQuadWordStorage*)this) = q;
-		}
-
-		SIMD_FORCE_INLINE btQuadWord(const btScalar& x, const btScalar& y, const btScalar& z)		
-		{
-			m_x = x, m_y = y, m_z = z, m_unusedW = 0.0f;
 		}
 
 		SIMD_FORCE_INLINE btQuadWord(const btScalar& x, const btScalar& y, const btScalar& z,const btScalar& w) 
+			:m_x(x),m_y(y),m_z(z),m_unusedW(w)
 		{
-			m_x = x, m_y = y, m_z = z, m_unusedW = w;
 		}
 
 
 		SIMD_FORCE_INLINE void	setMax(const btQuadWord& other)
 		{
-			btSetMax(m_x, other.m_x);
-			btSetMax(m_y, other.m_y);
-			btSetMax(m_z, other.m_z);
-			btSetMax(m_unusedW, other.m_unusedW);
+			if (other.m_x > m_x)
+				m_x = other.m_x;
+
+			if (other.m_y > m_y)
+				m_y = other.m_y;
+
+			if (other.m_z > m_z)
+				m_z = other.m_z;
+
+			if (other.m_unusedW > m_unusedW)
+				m_unusedW = other.m_unusedW;
 		}
 
 		SIMD_FORCE_INLINE void	setMin(const btQuadWord& other)
 		{
-			btSetMin(m_x, other.m_x);
-			btSetMin(m_y, other.m_y);
-			btSetMin(m_z, other.m_z);
-			btSetMin(m_unusedW, other.m_unusedW);
+			if (other.m_x < m_x)
+				m_x = other.m_x;
+
+			if (other.m_y < m_y)
+				m_y = other.m_y;
+
+			if (other.m_z < m_z)
+				m_z = other.m_z;
+
+			if (other.m_unusedW < m_unusedW)
+				m_unusedW = other.m_unusedW;
 		}
 
 
diff --git a/extern/bullet2/src/LinearMath/btQuaternion.h b/extern/bullet2/src/LinearMath/btQuaternion.h
index 264751b33e7..50334970ba6 100644
--- a/extern/bullet2/src/LinearMath/btQuaternion.h
+++ b/extern/bullet2/src/LinearMath/btQuaternion.h
@@ -19,7 +19,6 @@ subject to the following restrictions:
 
 #include "btVector3.h"
 
-///The btQuaternion implements quaternion to perform linear algebra rotations in combination with btMatrix3x3, btVector3 and btTransform.
 class btQuaternion : public btQuadWord {
 public:
 	btQuaternion() {}
@@ -159,7 +158,7 @@ public:
 
 	btQuaternion inverse() const
 	{
-		return btQuaternion(-m_x, -m_y, -m_z, m_unusedW);
+		return btQuaternion(m_x, m_y, m_z, -m_unusedW);
 	}
 
 	SIMD_FORCE_INLINE btQuaternion
@@ -286,7 +285,7 @@ slerp(const btQuaternion& q1, const btQuaternion& q2, const btScalar& t)
 }
 
 SIMD_FORCE_INLINE btVector3 
-quatRotate(const btQuaternion& rotation, const btVector3& v) 
+quatRotate(btQuaternion& rotation, btVector3& v) 
 {
 	btQuaternion q = rotation * v;
 	q *= rotation.inverse();
@@ -294,7 +293,7 @@ quatRotate(const btQuaternion& rotation, const btVector3& v)
 }
 
 SIMD_FORCE_INLINE btQuaternion 
-shortestArcQuat(const btVector3& v0, const btVector3& v1) // Game Programming Gems 2.10. make sure v0,v1 are normalized
+shortestArcQuat(btVector3& v0,btVector3& v1) // Game Programming Gems 2.10. make sure v0,v1 are normalized
 {
 	btVector3 c = v0.cross(v1);
 	btScalar  d = v0.dot(v1);
@@ -309,7 +308,7 @@ shortestArcQuat(const btVector3& v0, const btVector3& v1) // Game Programming Ge
 }
 
 SIMD_FORCE_INLINE btQuaternion 
-shortestArcQuatNormalize2(btVector3& v0,btVector3& v1)
+shortestArcQuatNormalize(btVector3& v0,btVector3& v1)
 {
 	v0.normalize();
 	v1.normalize();
@@ -320,4 +319,3 @@ shortestArcQuatNormalize2(btVector3& v0,btVector3& v1)
 
 
 
-
diff --git a/extern/bullet2/src/LinearMath/btQuickprof.cpp b/extern/bullet2/src/LinearMath/btQuickprof.cpp
index e5b1196149b..37a0c8c3be5 100644
--- a/extern/bullet2/src/LinearMath/btQuickprof.cpp
+++ b/extern/bullet2/src/LinearMath/btQuickprof.cpp
@@ -1,282 +1,38 @@
 /*
+Copyright (c) 2006 Tyler Streeter
 
-/***************************************************************************************************
-**
-** profile.cpp
-**
-** Real-Time Hierarchical Profiling for Game Programming Gems 3
-**
-** by Greg Hjelstrom & Byon Garrabrant
-**
-***************************************************************************************************/
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+*/
+
+
+// Please visit the project website (http://quickprof.sourceforge.net) 
+// for usage instructions.
 
 // Credits: The Clock class was inspired by the Timer classes in 
 // Ogre (www.ogre3d.org).
 
 #include "LinearMath/btQuickprof.h"
 
+#ifdef USE_QUICKPROF
 
-#ifdef USE_BT_CLOCK
-
-static btClock gProfileClock;
-
-inline void Profile_Get_Ticks(unsigned long int * ticks)
-{
-	*ticks = gProfileClock.getTimeMicroseconds();
-}
-
-inline float Profile_Get_Tick_Rate(void)
-{
-//	return 1000000.f;
-	return 1000.f;
-
-}
-
-
-
-/***************************************************************************************************
-**
-** CProfileNode
-**
-***************************************************************************************************/
-
-/***********************************************************************************************
- * INPUT:                                                                                      *
- * name - pointer to a static string which is the name of this profile node                    *
- * parent - parent pointer                                                                     *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- * The name is assumed to be a static pointer, only the pointer is stored and compared for     *
- * efficiency reasons.                                                                         *
- *=============================================================================================*/
-CProfileNode::CProfileNode( const char * name, CProfileNode * parent ) :
-	Name( name ),
-	TotalCalls( 0 ),
-	TotalTime( 0 ),
-	StartTime( 0 ),
-	RecursionCounter( 0 ),
-	Parent( parent ),
-	Child( NULL ),
-	Sibling( NULL )
-{
-	Reset();
-}
-
-
-void	CProfileNode::CleanupMemory()
-{
-	delete ( Child);
-	Child = NULL;
-	delete ( Sibling);
-	Sibling = NULL;
-}
-
-CProfileNode::~CProfileNode( void )
-{
-	delete ( Child);
-	delete ( Sibling);
-}
-
-
-/***********************************************************************************************
- * INPUT:                                                                                      *
- * name - static string pointer to the name of the node we are searching for                   *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- * All profile names are assumed to be static strings so this function uses pointer compares   *
- * to find the named node.                                                                     *
- *=============================================================================================*/
-CProfileNode * CProfileNode::Get_Sub_Node( const char * name )
-{
-	// Try to find this sub node
-	CProfileNode * child = Child;
-	while ( child ) {
-		if ( child->Name == name ) {
-			return child;
-		}
-		child = child->Sibling;
-	}
-
-	// We didn't find it, so add it
-	
-	CProfileNode * node = new CProfileNode( name, this );
-	node->Sibling = Child;
-	Child = node;
-	return node;
-}
-
-
-void	CProfileNode::Reset( void )
-{
-	TotalCalls = 0;
-	TotalTime = 0.0f;
-	gProfileClock.reset();
-
-	if ( Child ) {
-		Child->Reset();
-	}
-	if ( Sibling ) {
-		Sibling->Reset();
-	}
-}
-
-
-void	CProfileNode::Call( void )
-{
-	TotalCalls++;
-	if (RecursionCounter++ == 0) {
-		Profile_Get_Ticks(&StartTime);
-	}
-}
-
-
-bool	CProfileNode::Return( void )
-{
-	if ( --RecursionCounter == 0 && TotalCalls != 0 ) { 
-		unsigned long int time;
-		Profile_Get_Ticks(&time);
-		time-=StartTime;
-		TotalTime += (float)time / Profile_Get_Tick_Rate();
-	}
-	return ( RecursionCounter == 0 );
-}
-
-
-/***************************************************************************************************
-**
-** CProfileIterator
-**
-***************************************************************************************************/
-CProfileIterator::CProfileIterator( CProfileNode * start )
-{
-	CurrentParent = start;
-	CurrentChild = CurrentParent->Get_Child();
-}
-
-
-void	CProfileIterator::First(void)
-{
-	CurrentChild = CurrentParent->Get_Child();
-}
-
-
-void	CProfileIterator::Next(void)
-{
-	CurrentChild = CurrentChild->Get_Sibling();
-}
-
-
-bool	CProfileIterator::Is_Done(void)
-{
-	return CurrentChild == NULL;
-}
-
-
-void	CProfileIterator::Enter_Child( int index )
-{
-	CurrentChild = CurrentParent->Get_Child();
-	while ( (CurrentChild != NULL) && (index != 0) ) {
-		index--;
-		CurrentChild = CurrentChild->Get_Sibling();
-	}
-
-	if ( CurrentChild != NULL ) {
-		CurrentParent = CurrentChild;
-		CurrentChild = CurrentParent->Get_Child();
-	}
-}
-
-
-void	CProfileIterator::Enter_Parent( void )
-{
-	if ( CurrentParent->Get_Parent() != NULL ) {
-		CurrentParent = CurrentParent->Get_Parent();
-	}
-	CurrentChild = CurrentParent->Get_Child();
-}
-
-
-/***************************************************************************************************
-**
-** CProfileManager
-**
-***************************************************************************************************/
-
-CProfileNode	CProfileManager::Root( "Root", NULL );
-CProfileNode *	CProfileManager::CurrentNode = &CProfileManager::Root;
-int				CProfileManager::FrameCounter = 0;
-unsigned long int			CProfileManager::ResetTime = 0;
-
-
-/***********************************************************************************************
- * CProfileManager::Start_Profile -- Begin a named profile                                    *
- *                                                                                             *
- * Steps one level deeper into the tree, if a child already exists with the specified name     *
- * then it accumulates the profiling; otherwise a new child node is added to the profile tree. *
- *                                                                                             *
- * INPUT:                                                                                      *
- * name - name of this profiling record                                                        *
- *                                                                                             *
- * WARNINGS:                                                                                   *
- * The string used is assumed to be a static string; pointer compares are used throughout      *
- * the profiling code for efficiency.                                                          *
- *=============================================================================================*/
-void	CProfileManager::Start_Profile( const char * name )
-{
-	if (name != CurrentNode->Get_Name()) {
-		CurrentNode = CurrentNode->Get_Sub_Node( name );
-	} 
-	
-	CurrentNode->Call();
-}
-
-
-/***********************************************************************************************
- * CProfileManager::Stop_Profile -- Stop timing and record the results.                       *
- *=============================================================================================*/
-void	CProfileManager::Stop_Profile( void )
-{
-	// Return will indicate whether we should back up to our parent (we may
-	// be profiling a recursive function)
-	if (CurrentNode->Return()) {
-		CurrentNode = CurrentNode->Get_Parent();
-	}
-}
-
-
-/***********************************************************************************************
- * CProfileManager::Reset -- Reset the contents of the profiling system                       *
- *                                                                                             *
- *    This resets everything except for the tree structure.  All of the timing data is reset.  *
- *=============================================================================================*/
-void	CProfileManager::Reset( void )
-{ 
-	Root.Reset();
-    Root.Call();
-	FrameCounter = 0;
-	Profile_Get_Ticks(&ResetTime);
-}
-
-
-/***********************************************************************************************
- * CProfileManager::Increment_Frame_Counter -- Increment the frame counter                    *
- *=============================================================================================*/
-void CProfileManager::Increment_Frame_Counter( void )
-{
-	FrameCounter++;
-}
-
-
-/***********************************************************************************************
- * CProfileManager::Get_Time_Since_Reset -- returns the elapsed time since last reset         *
- *=============================================================================================*/
-float CProfileManager::Get_Time_Since_Reset( void )
-{
-	unsigned long int time;
-	Profile_Get_Ticks(&time);
-	time -= ResetTime;
-	return (float)time / Profile_Get_Tick_Rate();
-}
-
-#endif //USE_BT_CLOCK
-
+// Note: We must declare these private static variables again here to 
+// avoid link errors.
+bool btProfiler::mEnabled = false;
+btClock btProfiler::mClock;
+unsigned long int btProfiler::mCurrentCycleStartMicroseconds = 0;
+unsigned long int btProfiler::mLastCycleDurationMicroseconds = 0;
+std::map<std::string, hidden::ProfileBlock*> btProfiler::mProfileBlocks;
+std::ofstream btProfiler::mOutputFile;
+bool btProfiler::mFirstFileOutput = true;
+btProfiler::BlockTimingMethod btProfiler::mFileOutputMethod;
+unsigned long int btProfiler::mCycleNumber = 0;
+#endif //USE_QUICKPROF
diff --git a/extern/bullet2/src/LinearMath/btQuickprof.h b/extern/bullet2/src/LinearMath/btQuickprof.h
index b033940ca5c..a885967c5fa 100644
--- a/extern/bullet2/src/LinearMath/btQuickprof.h
+++ b/extern/bullet2/src/LinearMath/btQuickprof.h
@@ -1,11 +1,20 @@
+/*
+Copyright (c) 2006 Tyler Streeter
 
-/***************************************************************************************************
-**
-** Real-Time Hierarchical Profiling for Game Programming Gems 3
-**
-** by Greg Hjelstrom & Byon Garrabrant
-**
-***************************************************************************************************/
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose, 
+including commercial applications, and to alter it and redistribute it freely, 
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+*/
+	
+// Please visit the project website (http://quickprof.sourceforge.net) 
+// for usage instructions.
 
 // Credits: The Clock class was inspired by the Timer classes in 
 // Ogre (www.ogre3d.org).
@@ -14,10 +23,9 @@
 #define QUICK_PROF_H
 
 #include "btScalar.h"
-#include "LinearMath/btAlignedAllocator.h"
-#include <new>
-//To disable built-in profiling, please comment out next line
-//#define BT_NO_PROFILE 1
+
+//#define USE_QUICKPROF 1
+//Don't use quickprof for now, because it contains STL. TODO: replace STL by Bullet container classes.
 
 
 //if you don't need btClock, you can comment next line
@@ -26,332 +34,678 @@
 #ifdef USE_BT_CLOCK
 #ifdef __CELLOS_LV2__
 #include <sys/sys_time.h>
-#include <sys/time_util.h>
 #include <stdio.h>
+typedef uint64_t __int64;
 #endif
 
 #if defined (SUNOS) || defined (__SUNOS__) 
-#include <stdio.h> 
+        #include <stdio.h> 
 #endif
 
 #if defined(WIN32) || defined(_WIN32)
 
-#define USE_WINDOWS_TIMERS 
-#define WIN32_LEAN_AND_MEAN 
-#define NOWINRES 
-#define NOMCX 
-#define NOIME 
+ #define USE_WINDOWS_TIMERS 
+   #define WIN32_LEAN_AND_MEAN 
+   #define NOWINRES 
+   #define NOMCX 
+   #define NOIME 
 #ifdef _XBOX
-#include <Xtl.h>
+	#include <Xtl.h>
 #else
-#include <windows.h>
+	#include <windows.h>
 #endif
-#include <time.h>
+	#include <time.h>
 
 #else
-#include <sys/time.h>
+	#include <sys/time.h>
 #endif
 
 #define mymin(a,b) (a > b ? a : b)
 
-///The btClock is a portable basic clock that measures accurate time in seconds, use for profiling.
+/// basic clock
 class btClock
-{
-public:
-	btClock()
 	{
-#ifdef USE_WINDOWS_TIMERS
-		QueryPerformanceFrequency(&mClockFrequency);
-#endif
-		reset();
-	}
-
-	~btClock()
-	{
-	}
-
-	/// Resets the initial reference time.
-	void reset()
-	{
-#ifdef USE_WINDOWS_TIMERS
-		QueryPerformanceCounter(&mStartTime);
-		mStartTick = GetTickCount();
-		mPrevElapsedTime = 0;
-#else
-#ifdef __CELLOS_LV2__
-
-		typedef uint64_t  ClockSize;
-		ClockSize newTime;
-		//__asm __volatile__( "mftb %0" : "=r" (newTime) : : "memory");
-		SYS_TIMEBASE_GET( newTime );
-		mStartTime = newTime;
-#else
-		gettimeofday(&mStartTime, 0);
-#endif
-
-#endif
-	}
-
-	/// Returns the time in ms since the last call to reset or since 
-	/// the btClock was created.
-	unsigned long int getTimeMilliseconds()
-	{
-#ifdef USE_WINDOWS_TIMERS
-		LARGE_INTEGER currentTime;
-		QueryPerformanceCounter(&currentTime);
-		LONGLONG elapsedTime = currentTime.QuadPart - 
-			mStartTime.QuadPart;
-
-		// Compute the number of millisecond ticks elapsed.
-		unsigned long msecTicks = (unsigned long)(1000 * elapsedTime / 
-			mClockFrequency.QuadPart);
-
-		// Check for unexpected leaps in the Win32 performance counter.  
-		// (This is caused by unexpected data across the PCI to ISA 
-		// bridge, aka south bridge.  See Microsoft KB274323.)
-		unsigned long elapsedTicks = GetTickCount() - mStartTick;
-		signed long msecOff = (signed long)(msecTicks - elapsedTicks);
-		if (msecOff < -100 || msecOff > 100)
+	public:
+		btClock()
 		{
-			// Adjust the starting time forwards.
-			LONGLONG msecAdjustment = mymin(msecOff * 
-				mClockFrequency.QuadPart / 1000, elapsedTime - 
-				mPrevElapsedTime);
-			mStartTime.QuadPart += msecAdjustment;
-			elapsedTime -= msecAdjustment;
-
-			// Recompute the number of millisecond ticks elapsed.
-			msecTicks = (unsigned long)(1000 * elapsedTime / 
-				mClockFrequency.QuadPart);
+#ifdef USE_WINDOWS_TIMERS
+			QueryPerformanceFrequency(&mClockFrequency);
+#endif
+			reset();
 		}
 
-		// Store the current elapsed time for adjustments next time.
-		mPrevElapsedTime = elapsedTime;
+		~btClock()
+		{
+		}
 
-		return msecTicks;
+		/// Resets the initial reference time.
+		void reset()
+		{
+#ifdef USE_WINDOWS_TIMERS
+			QueryPerformanceCounter(&mStartTime);
+			mStartTick = GetTickCount();
+			mPrevElapsedTime = 0;
 #else
-
 #ifdef __CELLOS_LV2__
-		uint64_t freq=sys_time_get_timebase_frequency();
-		double dFreq=((double) freq) / 1000.0;
-		typedef uint64_t  ClockSize;
-		ClockSize newTime;
-		SYS_TIMEBASE_GET( newTime );
-		//__asm __volatile__( "mftb %0" : "=r" (newTime) : : "memory");
 
-		return (unsigned long int)((double(newTime-mStartTime)) / dFreq);
+	typedef uint64_t __int64;
+	typedef __int64  ClockSize;
+	ClockSize newTime;
+	__asm __volatile__( "mftb %0" : "=r" (newTime) : : "memory");
+	mStartTime = newTime;
+#else
+			gettimeofday(&mStartTime, 0);
+#endif
+
+#endif
+		}
+
+		/// Returns the time in ms since the last call to reset or since 
+		/// the btClock was created.
+		unsigned long int getTimeMilliseconds()
+		{
+#ifdef USE_WINDOWS_TIMERS
+			LARGE_INTEGER currentTime;
+			QueryPerformanceCounter(&currentTime);
+			LONGLONG elapsedTime = currentTime.QuadPart - 
+				mStartTime.QuadPart;
+
+			// Compute the number of millisecond ticks elapsed.
+			unsigned long msecTicks = (unsigned long)(1000 * elapsedTime / 
+				mClockFrequency.QuadPart);
+
+			// Check for unexpected leaps in the Win32 performance counter.  
+			// (This is caused by unexpected data across the PCI to ISA 
+			// bridge, aka south bridge.  See Microsoft KB274323.)
+			unsigned long elapsedTicks = GetTickCount() - mStartTick;
+			signed long msecOff = (signed long)(msecTicks - elapsedTicks);
+			if (msecOff < -100 || msecOff > 100)
+			{
+				// Adjust the starting time forwards.
+				LONGLONG msecAdjustment = mymin(msecOff * 
+					mClockFrequency.QuadPart / 1000, elapsedTime - 
+					mPrevElapsedTime);
+				mStartTime.QuadPart += msecAdjustment;
+				elapsedTime -= msecAdjustment;
+
+				// Recompute the number of millisecond ticks elapsed.
+				msecTicks = (unsigned long)(1000 * elapsedTime / 
+					mClockFrequency.QuadPart);
+			}
+
+			// Store the current elapsed time for adjustments next time.
+			mPrevElapsedTime = elapsedTime;
+
+			return msecTicks;
+#else
+			
+#ifdef __CELLOS_LV2__
+	__int64 freq=sys_time_get_timebase_frequency();
+	 double dFreq=((double) freq) / 1000.0;
+	typedef uint64_t __int64;
+	typedef __int64  ClockSize;
+	ClockSize newTime;
+	__asm __volatile__( "mftb %0" : "=r" (newTime) : : "memory");
+	
+	return (newTime-mStartTime) / dFreq;
 #else
 
-		struct timeval currentTime;
-		gettimeofday(&currentTime, 0);
-		return (currentTime.tv_sec - mStartTime.tv_sec) * 1000 + 
-			(currentTime.tv_usec - mStartTime.tv_usec) / 1000;
+			struct timeval currentTime;
+			gettimeofday(&currentTime, 0);
+			return (currentTime.tv_sec - mStartTime.tv_sec) * 1000 + 
+				(currentTime.tv_usec - mStartTime.tv_usec) / 1000;
 #endif //__CELLOS_LV2__
 #endif
-	}
-
-	/// Returns the time in us since the last call to reset or since 
-	/// the Clock was created.
-	unsigned long int getTimeMicroseconds()
-	{
-#ifdef USE_WINDOWS_TIMERS
-		LARGE_INTEGER currentTime;
-		QueryPerformanceCounter(&currentTime);
-		LONGLONG elapsedTime = currentTime.QuadPart - 
-			mStartTime.QuadPart;
-
-		// Compute the number of millisecond ticks elapsed.
-		unsigned long msecTicks = (unsigned long)(1000 * elapsedTime / 
-			mClockFrequency.QuadPart);
-
-		// Check for unexpected leaps in the Win32 performance counter.  
-		// (This is caused by unexpected data across the PCI to ISA 
-		// bridge, aka south bridge.  See Microsoft KB274323.)
-		unsigned long elapsedTicks = GetTickCount() - mStartTick;
-		signed long msecOff = (signed long)(msecTicks - elapsedTicks);
-		if (msecOff < -100 || msecOff > 100)
-		{
-			// Adjust the starting time forwards.
-			LONGLONG msecAdjustment = mymin(msecOff * 
-				mClockFrequency.QuadPart / 1000, elapsedTime - 
-				mPrevElapsedTime);
-			mStartTime.QuadPart += msecAdjustment;
-			elapsedTime -= msecAdjustment;
 		}
 
-		// Store the current elapsed time for adjustments next time.
-		mPrevElapsedTime = elapsedTime;
+		/// Returns the time in us since the last call to reset or since 
+		/// the Clock was created.
+		unsigned long int getTimeMicroseconds()
+		{
+#ifdef USE_WINDOWS_TIMERS
+			LARGE_INTEGER currentTime;
+			QueryPerformanceCounter(&currentTime);
+			LONGLONG elapsedTime = currentTime.QuadPart - 
+				mStartTime.QuadPart;
 
-		// Convert to microseconds.
-		unsigned long usecTicks = (unsigned long)(1000000 * elapsedTime / 
-			mClockFrequency.QuadPart);
+			// Compute the number of millisecond ticks elapsed.
+			unsigned long msecTicks = (unsigned long)(1000 * elapsedTime / 
+				mClockFrequency.QuadPart);
 
-		return usecTicks;
+			// Check for unexpected leaps in the Win32 performance counter.  
+			// (This is caused by unexpected data across the PCI to ISA 
+			// bridge, aka south bridge.  See Microsoft KB274323.)
+			unsigned long elapsedTicks = GetTickCount() - mStartTick;
+			signed long msecOff = (signed long)(msecTicks - elapsedTicks);
+			if (msecOff < -100 || msecOff > 100)
+			{
+				// Adjust the starting time forwards.
+				LONGLONG msecAdjustment = mymin(msecOff * 
+					mClockFrequency.QuadPart / 1000, elapsedTime - 
+					mPrevElapsedTime);
+				mStartTime.QuadPart += msecAdjustment;
+				elapsedTime -= msecAdjustment;
+			}
+
+			// Store the current elapsed time for adjustments next time.
+			mPrevElapsedTime = elapsedTime;
+
+			// Convert to microseconds.
+			unsigned long usecTicks = (unsigned long)(1000000 * elapsedTime / 
+				mClockFrequency.QuadPart);
+
+			return usecTicks;
 #else
 
 #ifdef __CELLOS_LV2__
-		uint64_t freq=sys_time_get_timebase_frequency();
-		double dFreq=((double) freq)/ 1000000.0;
-		typedef uint64_t  ClockSize;
-		ClockSize newTime;
-		//__asm __volatile__( "mftb %0" : "=r" (newTime) : : "memory");
-		SYS_TIMEBASE_GET( newTime );
-
-		return (unsigned long int)((double(newTime-mStartTime)) / dFreq);
+	__int64 freq=sys_time_get_timebase_frequency();
+	 double dFreq=((double) freq)/ 1000000.0;
+	typedef uint64_t __int64;
+	typedef __int64  ClockSize;
+	ClockSize newTime;
+	__asm __volatile__( "mftb %0" : "=r" (newTime) : : "memory");
+	
+	return (newTime-mStartTime) / dFreq;
 #else
 
-		struct timeval currentTime;
-		gettimeofday(&currentTime, 0);
-		return (currentTime.tv_sec - mStartTime.tv_sec) * 1000000 + 
-			(currentTime.tv_usec - mStartTime.tv_usec);
+			struct timeval currentTime;
+			gettimeofday(&currentTime, 0);
+			return (currentTime.tv_sec - mStartTime.tv_sec) * 1000000 + 
+				(currentTime.tv_usec - mStartTime.tv_usec);
 #endif//__CELLOS_LV2__
 #endif 
-	}
+		}
 
-private:
+	private:
 #ifdef USE_WINDOWS_TIMERS
-	LARGE_INTEGER mClockFrequency;
-	DWORD mStartTick;
-	LONGLONG mPrevElapsedTime;
-	LARGE_INTEGER mStartTime;
+		LARGE_INTEGER mClockFrequency;
+		DWORD mStartTick;
+		LONGLONG mPrevElapsedTime;
+		LARGE_INTEGER mStartTime;
 #else
 #ifdef __CELLOS_LV2__
-	uint64_t	mStartTime;
+		uint64_t	mStartTime;
 #else
-	struct timeval mStartTime;
+		struct timeval mStartTime;
 #endif
 #endif //__CELLOS_LV2__
 
-};
+	};
 
 #endif //USE_BT_CLOCK
 
 
+#ifdef USE_QUICKPROF
 
 
-///A node in the Profile Hierarchy Tree
-class	CProfileNode {
+#include <iostream>
+#include <fstream>
+#include <string>
+#include <map>
 
-public:
-	CProfileNode( const char * name, CProfileNode * parent );
-	~CProfileNode( void );
 
-	CProfileNode * Get_Sub_Node( const char * name );
 
-	CProfileNode * Get_Parent( void )		{ return Parent; }
-	CProfileNode * Get_Sibling( void )		{ return Sibling; }
-	CProfileNode * Get_Child( void )			{ return Child; }
 
-	void				CleanupMemory();
-	void				Reset( void );
-	void				Call( void );
-	bool				Return( void );
+namespace hidden
+{
+	/// A simple data structure representing a single timed block 
+	/// of code.
+	struct ProfileBlock
+	{
+		ProfileBlock()
+		{
+			currentBlockStartMicroseconds = 0;
+			currentCycleTotalMicroseconds = 0;
+			lastCycleTotalMicroseconds = 0;
+			totalMicroseconds = 0;
+		}
 
-	const char *	Get_Name( void )				{ return Name; }
-	int				Get_Total_Calls( void )		{ return TotalCalls; }
-	float				Get_Total_Time( void )		{ return TotalTime; }
+		/// The starting time (in us) of the current block update.
+		unsigned long int currentBlockStartMicroseconds;
 
-protected:
+		/// The accumulated time (in us) spent in this block during the 
+		/// current profiling cycle.
+		unsigned long int currentCycleTotalMicroseconds;
 
-	const char *	Name;
-	int				TotalCalls;
-	float				TotalTime;
-	unsigned long int			StartTime;
-	int				RecursionCounter;
+		/// The accumulated time (in us) spent in this block during the 
+		/// past profiling cycle.
+		unsigned long int lastCycleTotalMicroseconds;
+
+		/// The total accumulated time (in us) spent in this block.
+		unsigned long int totalMicroseconds;
+	};
 
-	CProfileNode *	Parent;
-	CProfileNode *	Child;
-	CProfileNode *	Sibling;
 };
 
-///An iterator to navigate through the tree
-class CProfileIterator
+/// A static class that manages timing for a set of profiling blocks.
+class btProfiler
 {
 public:
-	// Access all the children of the current parent
-	void				First(void);
-	void				Next(void);
-	bool				Is_Done(void);
-	bool                Is_Root(void) { return (CurrentParent->Get_Parent() == 0); }
-
-	void				Enter_Child( int index );		// Make the given child the new parent
-	void				Enter_Largest_Child( void );	// Make the largest child the new parent
-	void				Enter_Parent( void );			// Make the current parent's parent the new parent
-
-	// Access the current child
-	const char *	Get_Current_Name( void )			{ return CurrentChild->Get_Name(); }
-	int				Get_Current_Total_Calls( void )	{ return CurrentChild->Get_Total_Calls(); }
-	float				Get_Current_Total_Time( void )	{ return CurrentChild->Get_Total_Time(); }
-
-	// Access the current parent
-	const char *	Get_Current_Parent_Name( void )			{ return CurrentParent->Get_Name(); }
-	int				Get_Current_Parent_Total_Calls( void )	{ return CurrentParent->Get_Total_Calls(); }
-	float				Get_Current_Parent_Total_Time( void )	{ return CurrentParent->Get_Total_Time(); }
-
-protected:
-
-	CProfileNode *	CurrentParent;
-	CProfileNode *	CurrentChild;
-
-	CProfileIterator( CProfileNode * start );
-	friend	class		CProfileManager;
-};
-
-
-///The Manager for the Profile system
-class	CProfileManager {
-public:
-	static	void						Start_Profile( const char * name );
-	static	void						Stop_Profile( void );
-
-	static	void						CleanupMemory(void)
+	/// A set of ways to retrieve block timing data.
+	enum BlockTimingMethod
 	{
-		Root.CleanupMemory();
+		/// The total time spent in the block (in seconds) since the 
+		/// profiler was initialized.
+		BLOCK_TOTAL_SECONDS,
+
+		/// The total time spent in the block (in ms) since the 
+		/// profiler was initialized.
+		BLOCK_TOTAL_MILLISECONDS,
+
+		/// The total time spent in the block (in us) since the 
+		/// profiler was initialized.
+		BLOCK_TOTAL_MICROSECONDS,
+
+		/// The total time spent in the block, as a % of the total 
+		/// elapsed time since the profiler was initialized.
+		BLOCK_TOTAL_PERCENT,
+
+		/// The time spent in the block (in seconds) in the most recent 
+		/// profiling cycle.
+		BLOCK_CYCLE_SECONDS,
+
+		/// The time spent in the block (in ms) in the most recent 
+		/// profiling cycle.
+		BLOCK_CYCLE_MILLISECONDS,
+
+		/// The time spent in the block (in us) in the most recent 
+		/// profiling cycle.
+		BLOCK_CYCLE_MICROSECONDS,
+
+		/// The time spent in the block (in seconds) in the most recent 
+		/// profiling cycle, as a % of the total cycle time.
+		BLOCK_CYCLE_PERCENT
+	};
+
+	/// Initializes the profiler.  This must be called first.  If this is 
+	/// never called, the profiler is effectively disabled; all other 
+	/// functions will return immediately.  The first parameter 
+	/// is the name of an output data file; if this string is not empty, 
+	/// data will be saved on every profiling cycle; if this string is 
+	/// empty, no data will be saved to a file.  The second parameter 
+	/// determines which timing method is used when printing data to the 
+	/// output file.
+	inline static void init(const std::string outputFilename="", 
+		BlockTimingMethod outputMethod=BLOCK_CYCLE_MILLISECONDS);
+
+	/// Cleans up allocated memory.
+	inline static void destroy();
+
+	/// Begins timing the named block of code.
+	inline static void beginBlock(const std::string& name);
+
+	/// Updates the accumulated time spent in the named block by adding 
+	/// the elapsed time since the last call to startBlock for this block 
+	/// name.
+	inline static void endBlock(const std::string& name);
+
+	/// Returns the time spent in the named block according to the 
+	/// given timing method.  See comments on BlockTimingMethod for details.
+	inline static double getBlockTime(const std::string& name, 
+		BlockTimingMethod method=BLOCK_CYCLE_MILLISECONDS);
+
+	/// Defines the end of a profiling cycle.  Use this regularly if you 
+	/// want to generate detailed timing information.  This must not be 
+	/// called within a timing block.
+	inline static void endProfilingCycle();
+
+	/// A helper function that creates a string of statistics for 
+	/// each timing block.  This is mainly for printing an overall 
+	/// summary to the command line.
+	inline static std::string createStatsString(
+		BlockTimingMethod method=BLOCK_TOTAL_PERCENT);
+
+//private:
+	inline btProfiler();
+
+	inline ~btProfiler();
+
+	/// Prints an error message to standard output.
+	inline static void printError(const std::string& msg)
+	{
+		//btAssert(0);
+		std::cout << "[QuickProf error] " << msg << std::endl;
 	}
 
-	static	void						Reset( void );
-	static	void						Increment_Frame_Counter( void );
-	static	int						Get_Frame_Count_Since_Reset( void )		{ return FrameCounter; }
-	static	float						Get_Time_Since_Reset( void );
+	/// Determines whether the profiler is enabled.
+	static bool mEnabled;
 
-	static	CProfileIterator *	Get_Iterator( void )	
-	{ 
-		
-		return new CProfileIterator( &Root ); 
-	}
-	static	void						Release_Iterator( CProfileIterator * iterator ) { delete ( iterator); }
+	/// The clock used to time profile blocks.
+	static btClock mClock;
 
-private:
-	static	CProfileNode			Root;
-	static	CProfileNode *			CurrentNode;
-	static	int						FrameCounter;
-	static	unsigned long int					ResetTime;
+	/// The starting time (in us) of the current profiling cycle.
+	static unsigned long int mCurrentCycleStartMicroseconds;
+
+	/// The duration (in us) of the most recent profiling cycle.
+	static unsigned long int mLastCycleDurationMicroseconds;
+
+	/// Internal map of named profile blocks.
+	static std::map<std::string, hidden::ProfileBlock*> mProfileBlocks;
+
+	/// The data file used if this feature is enabled in 'init.'
+	static std::ofstream mOutputFile;
+
+	/// Tracks whether we have begun print data to the output file.
+	static bool mFirstFileOutput;
+
+	/// The method used when printing timing data to an output file.
+	static BlockTimingMethod mFileOutputMethod;
+
+	/// The number of the current profiling cycle.
+	static unsigned long int mCycleNumber;
 };
 
 
-///ProfileSampleClass is a simple way to profile a function's scope
-///Use the BT_PROFILE macro at the start of scope to time
-class	CProfileSample {
-public:
-	CProfileSample( const char * name )
-	{ 
-		CProfileManager::Start_Profile( name ); 
+btProfiler::btProfiler()
+{
+	// This never gets called because a btProfiler instance is never 
+	// created.
+}
+
+btProfiler::~btProfiler()
+{
+	// This never gets called because a btProfiler instance is never 
+	// created.
+}
+
+void btProfiler::init(const std::string outputFilename, 
+	BlockTimingMethod outputMethod)
+{
+	mEnabled = true;
+	
+	if (!outputFilename.empty())
+	{
+		mOutputFile.open(outputFilename.c_str());
 	}
 
-	~CProfileSample( void )					
-	{ 
-		CProfileManager::Stop_Profile(); 
+	mFileOutputMethod = outputMethod;
+
+	mClock.reset();
+
+	// Set the start time for the first cycle.
+	mCurrentCycleStartMicroseconds = mClock.getTimeMicroseconds();
+}
+
+void btProfiler::destroy()
+{
+	if (!mEnabled)
+	{
+		return;
 	}
-};
 
-#if !defined(BT_NO_PROFILE)
-#define	BT_PROFILE( name )			CProfileSample __profile( name )
-#else
-#define	BT_PROFILE( name )
-#endif
+	if (mOutputFile.is_open())
+	{
+		mOutputFile.close();
+	}
+
+	// Destroy all ProfileBlocks.
+	while (!mProfileBlocks.empty())
+	{
+		delete (*mProfileBlocks.begin()).second;
+		mProfileBlocks.erase(mProfileBlocks.begin());
+	}
+}
+
+void btProfiler::beginBlock(const std::string& name)
+{
+	if (!mEnabled)
+	{
+		return;
+	}
+
+	if (name.empty())
+	{
+		printError("Cannot allow unnamed profile blocks.");
+		return;
+	}
+
+	hidden::ProfileBlock* block = mProfileBlocks[name];
+
+	if (!block)
+	{
+		// Create a new ProfileBlock.
+		mProfileBlocks[name] = new hidden::ProfileBlock();
+		block = mProfileBlocks[name];
+	}
+
+	// We do this at the end to get more accurate results.
+	block->currentBlockStartMicroseconds = mClock.getTimeMicroseconds();
+}
+
+void btProfiler::endBlock(const std::string& name)
+{
+	if (!mEnabled)
+	{
+		return;
+	}
+
+	// We do this at the beginning to get more accurate results.
+	unsigned long int endTick = mClock.getTimeMicroseconds();
+
+	hidden::ProfileBlock* block = mProfileBlocks[name];
+
+	if (!block)
+	{
+		// The named block does not exist.  Print an error.
+		printError("The profile block named '" + name + 
+			"' does not exist.");
+		return;
+	}
+
+	unsigned long int blockDuration = endTick - 
+		block->currentBlockStartMicroseconds;
+	block->currentCycleTotalMicroseconds += blockDuration;
+	block->totalMicroseconds += blockDuration;
+}
+
+double btProfiler::getBlockTime(const std::string& name, 
+	BlockTimingMethod method)
+{
+	if (!mEnabled)
+	{
+		return 0;
+	}
+
+	hidden::ProfileBlock* block = mProfileBlocks[name];
+
+	if (!block)
+	{
+		// The named block does not exist.  Print an error.
+		printError("The profile block named '" + name + 
+			"' does not exist.");
+		return 0;
+	}
+
+	double result = 0;
+
+	switch(method)
+	{
+		case BLOCK_TOTAL_SECONDS:
+			result = (double)block->totalMicroseconds * (double)0.000001;
+			break;
+		case BLOCK_TOTAL_MILLISECONDS:
+			result = (double)block->totalMicroseconds * (double)0.001;
+			break;
+		case BLOCK_TOTAL_MICROSECONDS:
+			result = (double)block->totalMicroseconds;
+			break;
+		case BLOCK_TOTAL_PERCENT:
+		{
+			double timeSinceInit = (double)mClock.getTimeMicroseconds();
+			if (timeSinceInit <= 0)
+			{
+				result = 0;
+			}
+			else
+			{
+				result = 100.0 * (double)block->totalMicroseconds / 
+					timeSinceInit;
+			}
+			break;
+		}
+		case BLOCK_CYCLE_SECONDS:
+			result = (double)block->lastCycleTotalMicroseconds * 
+				(double)0.000001;
+			break;
+		case BLOCK_CYCLE_MILLISECONDS:
+			result = (double)block->lastCycleTotalMicroseconds * 
+				(double)0.001;
+			break;
+		case BLOCK_CYCLE_MICROSECONDS:
+			result = (double)block->lastCycleTotalMicroseconds;
+			break;
+		case BLOCK_CYCLE_PERCENT:
+		{
+			if (0 == mLastCycleDurationMicroseconds)
+			{
+				// We have not yet finished a cycle, so just return zero 
+				// percent to avoid a divide by zero error.
+				result = 0;
+			}
+			else
+			{
+				result = 100.0 * (double)block->lastCycleTotalMicroseconds / 
+					mLastCycleDurationMicroseconds;
+			}
+			break;
+		}
+		default:
+			break;
+	}
+
+	return result;
+}
+
+void btProfiler::endProfilingCycle()
+{
+	if (!mEnabled)
+	{
+		return;
+	}
+
+	// Store the duration of the cycle that just finished.
+	mLastCycleDurationMicroseconds = mClock.getTimeMicroseconds() - 
+		mCurrentCycleStartMicroseconds;
+
+	// For each block, update data for the cycle that just finished.
+	std::map<std::string, hidden::ProfileBlock*>::iterator iter;
+	for (iter = mProfileBlocks.begin(); iter != mProfileBlocks.end(); ++iter)
+	{
+		hidden::ProfileBlock* block = (*iter).second;
+		block->lastCycleTotalMicroseconds = 
+			block->currentCycleTotalMicroseconds;
+		block->currentCycleTotalMicroseconds = 0;
+	}
+
+	if (mOutputFile.is_open())
+	{
+		// Print data to the output file.
+		if (mFirstFileOutput)
+		{
+			// On the first iteration, print a header line that shows the 
+			// names of each profiling block.
+			mOutputFile << "#cycle, ";
+
+			for (iter = mProfileBlocks.begin(); iter != mProfileBlocks.end(); 
+				++iter)
+			{
+				mOutputFile << (*iter).first << ", ";
+			}
+
+			mOutputFile << std::endl;
+			mFirstFileOutput = false;
+		}
+
+		mOutputFile << mCycleNumber << ", ";
+
+		for (iter = mProfileBlocks.begin(); iter != mProfileBlocks.end(); 
+			++iter)
+		{
+			mOutputFile << getBlockTime((*iter).first, mFileOutputMethod) 
+				<< ", ";
+		}
+
+		mOutputFile << std::endl;
+	}
+
+	++mCycleNumber;
+	mCurrentCycleStartMicroseconds = mClock.getTimeMicroseconds();
+}
+
+std::string btProfiler::createStatsString(BlockTimingMethod method)
+{
+	if (!mEnabled)
+	{
+		return "";
+	}
+
+	std::string s;
+	std::string suffix;
+
+	switch(method)
+	{
+		case BLOCK_TOTAL_SECONDS:
+			suffix = "s";
+			break;
+		case BLOCK_TOTAL_MILLISECONDS:
+			suffix = "ms";
+			break;
+		case BLOCK_TOTAL_MICROSECONDS:
+			suffix = "us";
+			break;
+		case BLOCK_TOTAL_PERCENT:
+		{
+			suffix = "%";
+			break;
+		}
+		case BLOCK_CYCLE_SECONDS:
+			suffix = "s";
+			break;
+		case BLOCK_CYCLE_MILLISECONDS:
+			suffix = "ms";
+			break;
+		case BLOCK_CYCLE_MICROSECONDS:
+			suffix = "us";
+			break;
+		case BLOCK_CYCLE_PERCENT:
+		{
+			suffix = "%";
+			break;
+		}
+		default:
+			break;
+	}
+
+	std::map<std::string, hidden::ProfileBlock*>::iterator iter;
+	for (iter = mProfileBlocks.begin(); iter != mProfileBlocks.end(); ++iter)
+	{
+		if (iter != mProfileBlocks.begin())
+		{
+			s += "\n";
+		}
+
+		char blockTime[64];
+		sprintf(blockTime, "%lf", getBlockTime((*iter).first, method));
+
+		s += (*iter).first;
+		s += ": ";
+		s += blockTime;
+		s += " ";
+		s += suffix;
+	}
+
+	return s;
+}
 
 
+#define BEGIN_PROFILE(a) btProfiler::beginBlock(a)
+#define END_PROFILE(a) btProfiler::endBlock(a)
 
+#else //USE_QUICKPROF
+#define BEGIN_PROFILE(a)
+#define END_PROFILE(a)
+
+#endif //USE_QUICKPROF
 
 #endif //QUICK_PROF_H
 
diff --git a/extern/bullet2/src/LinearMath/btScalar.h b/extern/bullet2/src/LinearMath/btScalar.h
index 1fee626d0c0..01ad93e786a 100644
--- a/extern/bullet2/src/LinearMath/btScalar.h
+++ b/extern/bullet2/src/LinearMath/btScalar.h
@@ -18,47 +18,25 @@ subject to the following restrictions:
 #define SIMD___SCALAR_H
 
 #include <math.h>
-#include <stdlib.h>//size_t for MSVC 6.0
 
 #include <cstdlib>
 #include <cfloat>
 #include <float.h>
 
-#define BT_BULLET_VERSION 271
-
-inline int	btGetVersion()
-{
-	return BT_BULLET_VERSION;
-}
-
-#if defined(DEBUG) || defined (_DEBUG)
-#define BT_DEBUG
-#endif
-
-
 #ifdef WIN32
 
 		#if defined(__MINGW32__) || defined(__CYGWIN__) || (defined (_MSC_VER) && _MSC_VER < 1300)
-
 			#define SIMD_FORCE_INLINE inline
 			#define ATTRIBUTE_ALIGNED16(a) a
-			#define ATTRIBUTE_ALIGNED128(a) a
 		#else
-			#define BT_HAS_ALIGNED_ALLOCATOR
-			#pragma warning(disable : 4324) // disable padding warning
-//			#pragma warning(disable:4530) // Disable the exception disable but used in MSCV Stl warning.
-//			#pragma warning(disable:4996) //Turn off warnings about deprecated C routines
-//			#pragma warning(disable:4786) // Disable the "debug name too long" warning
-
+			#define BT_HAS_ALIGNED_ALOCATOR
+			#pragma warning(disable:4530)
+			#pragma warning(disable:4996)
+			#pragma warning(disable:4786)
 			#define SIMD_FORCE_INLINE __forceinline
 			#define ATTRIBUTE_ALIGNED16(a) __declspec(align(16)) a
-			#define ATTRIBUTE_ALIGNED128(a) __declspec (align(128)) a
 		#ifdef _XBOX
 			#define BT_USE_VMX128
-
-			#include <ppcintrinsics.h>
- 			#define BT_HAVE_NATIVE_FSEL
- 			#define btFsel(a,b,c) __fsel((a),(b),(c))
 		#else
 			#define BT_USE_SSE
 		#endif
@@ -68,63 +46,29 @@ inline int	btGetVersion()
 		#define btAssert assert
 		//btFullAssert is optional, slows down a lot
 		#define btFullAssert(x)
-
-		#define btLikely(_c)  _c
-		#define btUnlikely(_c) _c
-
 #else
 	
 #if defined	(__CELLOS_LV2__)
 		#define SIMD_FORCE_INLINE inline
 		#define ATTRIBUTE_ALIGNED16(a) a __attribute__ ((aligned (16)))
-		#define ATTRIBUTE_ALIGNED128(a) a __attribute__ ((aligned (128)))
 		#ifndef assert
 		#include <assert.h>
 		#endif
 		#define btAssert assert
 		//btFullAssert is optional, slows down a lot
 		#define btFullAssert(x)
-
-		#define btLikely(_c)  _c
-		#define btUnlikely(_c) _c
-
 #else
 
-#ifdef USE_LIBSPE2
-
-		#define SIMD_FORCE_INLINE __inline
-		#define ATTRIBUTE_ALIGNED16(a) a __attribute__ ((aligned (16)))
-		#define ATTRIBUTE_ALIGNED128(a) a __attribute__ ((aligned (128)))
-		#ifndef assert
-		#include <assert.h>
-		#endif
-		#define btAssert assert
-		//btFullAssert is optional, slows down a lot
-		#define btFullAssert(x)
-
-
-		#define btLikely(_c)   __builtin_expect((_c), 1)
-		#define btUnlikely(_c) __builtin_expect((_c), 0)
-		
-
-#else
 	//non-windows systems
 
 		#define SIMD_FORCE_INLINE inline
 		#define ATTRIBUTE_ALIGNED16(a) a
-		#define ATTRIBUTE_ALIGNED128(a) a
 		#ifndef assert
 		#include <assert.h>
 		#endif
 		#define btAssert assert
 		//btFullAssert is optional, slows down a lot
 		#define btFullAssert(x)
-		#define btLikely(_c)  _c
-		#define btUnlikely(_c) _c
-
-
-#endif // LIBSPE2
-
 #endif	//__CELLOS_LV2__
 #endif
 
@@ -137,7 +81,6 @@ inline int	btGetVersion()
 #endif
 #endif
 
-///The btScalar type abstracts floating point numbers, to easily switch between double and single floating point precision.
 #if defined(BT_USE_DOUBLE_PRECISION)
 typedef double btScalar;
 #else
@@ -145,14 +88,6 @@ typedef float btScalar;
 #endif
 
 
-#define BT_DECLARE_ALIGNED_ALLOCATOR() \
-	SIMD_FORCE_INLINE void* operator new(size_t sizeInBytes)	{ return btAlignedAlloc(sizeInBytes,16); }	\
-	SIMD_FORCE_INLINE void  operator delete(void* ptr)			{ btAlignedFree(ptr); }	\
-	SIMD_FORCE_INLINE void* operator new(size_t, void* ptr)	{ return ptr; }	\
-	SIMD_FORCE_INLINE void  operator delete(void*, void*)		{ }	\
-
-
-
 #if defined(BT_USE_DOUBLE_PRECISION) || defined(BT_FORCE_DOUBLE_FUNCTIONS)
 		
 SIMD_FORCE_INLINE btScalar btSqrt(btScalar x) { return sqrt(x); }
@@ -170,34 +105,12 @@ SIMD_FORCE_INLINE btScalar btPow(btScalar x,btScalar y) { return pow(x,y); }
 
 #else
 		
-SIMD_FORCE_INLINE btScalar btSqrt(btScalar y) 
-{ 
-#ifdef USE_APPROXIMATION
-    double x, z, tempf;
-    unsigned long *tfptr = ((unsigned long *)&tempf) + 1;
-
-	tempf = y;
-	*tfptr = (0xbfcdd90a - *tfptr)>>1; /* estimate of 1/sqrt(y) */
-	x =  tempf;
-	z =  y*btScalar(0.5);                        /* hoist out the “/2”    */
-	x = (btScalar(1.5)*x)-(x*x)*(x*z);         /* iteration formula     */
-	x = (btScalar(1.5)*x)-(x*x)*(x*z);
-	x = (btScalar(1.5)*x)-(x*x)*(x*z);
-	x = (btScalar(1.5)*x)-(x*x)*(x*z);
-	x = (btScalar(1.5)*x)-(x*x)*(x*z);
-	return x*y;
-#else
-	return sqrtf(y); 
-#endif
-}
+SIMD_FORCE_INLINE btScalar btSqrt(btScalar x) { return sqrtf(x); }
 SIMD_FORCE_INLINE btScalar btFabs(btScalar x) { return fabsf(x); }
 SIMD_FORCE_INLINE btScalar btCos(btScalar x) { return cosf(x); }
 SIMD_FORCE_INLINE btScalar btSin(btScalar x) { return sinf(x); }
 SIMD_FORCE_INLINE btScalar btTan(btScalar x) { return tanf(x); }
-SIMD_FORCE_INLINE btScalar btAcos(btScalar x) { 
-	btAssert(x <= btScalar(1.));
-	return acosf(x); 
-}
+SIMD_FORCE_INLINE btScalar btAcos(btScalar x) { return acosf(x); }
 SIMD_FORCE_INLINE btScalar btAsin(btScalar x) { return asinf(x); }
 SIMD_FORCE_INLINE btScalar btAtan(btScalar x) { return atanf(x); }
 SIMD_FORCE_INLINE btScalar btAtan2(btScalar x, btScalar y) { return atan2f(x, y); }
@@ -246,6 +159,14 @@ SIMD_FORCE_INLINE bool	btGreaterEqual (btScalar a, btScalar eps) {
 	return (!((a) <= eps));
 }
 
+/*SIMD_FORCE_INLINE btScalar btCos(btScalar x) { return cosf(x); }
+SIMD_FORCE_INLINE btScalar btSin(btScalar x) { return sinf(x); }
+SIMD_FORCE_INLINE btScalar btTan(btScalar x) { return tanf(x); }
+SIMD_FORCE_INLINE btScalar btAcos(btScalar x) { return acosf(x); }
+SIMD_FORCE_INLINE btScalar btAsin(btScalar x) { return asinf(x); }
+SIMD_FORCE_INLINE btScalar btAtan(btScalar x) { return atanf(x); }
+SIMD_FORCE_INLINE btScalar btAtan2(btScalar x, btScalar y) { return atan2f(x, y); }
+*/
 
 SIMD_FORCE_INLINE int       btIsNegative(btScalar x) {
     return x < btScalar(0.0) ? 1 : 0;
@@ -256,151 +177,5 @@ SIMD_FORCE_INLINE btScalar btDegrees(btScalar x) { return x * SIMD_DEGS_PER_RAD;
 
 #define BT_DECLARE_HANDLE(name) typedef struct name##__ { int unused; } *name
 
-#ifndef btFsel
-SIMD_FORCE_INLINE btScalar btFsel(btScalar a, btScalar b, btScalar c)
-{
-	return a >= 0 ? b : c;
-}
-#endif
-#define btFsels(a,b,c) (btScalar)btFsel(a,b,c)
-
-
-SIMD_FORCE_INLINE bool btMachineIsLittleEndian()
-{
-   long int i = 1;
-   const char *p = (const char *) &i;
-   if (p[0] == 1)  // Lowest address contains the least significant byte
-	   return true;
-   else
-	   return false;
-}
-
-
-
-///btSelect avoids branches, which makes performance much better for consoles like Playstation 3 and XBox 360
-///Thanks Phil Knight. See also http://www.cellperformance.com/articles/2006/04/more_techniques_for_eliminatin_1.html
-SIMD_FORCE_INLINE unsigned btSelect(unsigned condition, unsigned valueIfConditionNonZero, unsigned valueIfConditionZero) 
-{
-    // Set testNz to 0xFFFFFFFF if condition is nonzero, 0x00000000 if condition is zero
-    // Rely on positive value or'ed with its negative having sign bit on
-    // and zero value or'ed with its negative (which is still zero) having sign bit off 
-    // Use arithmetic shift right, shifting the sign bit through all 32 bits
-    unsigned testNz = (unsigned)(((int)condition | -(int)condition) >> 31);
-    unsigned testEqz = ~testNz;
-    return ((valueIfConditionNonZero & testNz) | (valueIfConditionZero & testEqz)); 
-}
-SIMD_FORCE_INLINE int btSelect(unsigned condition, int valueIfConditionNonZero, int valueIfConditionZero)
-{
-    unsigned testNz = (unsigned)(((int)condition | -(int)condition) >> 31);
-    unsigned testEqz = ~testNz; 
-    return static_cast<int>((valueIfConditionNonZero & testNz) | (valueIfConditionZero & testEqz));
-}
-SIMD_FORCE_INLINE float btSelect(unsigned condition, float valueIfConditionNonZero, float valueIfConditionZero)
-{
-#ifdef BT_HAVE_NATIVE_FSEL
-    return (float)btFsel((btScalar)condition - btScalar(1.0f), valueIfConditionNonZero, valueIfConditionZero);
-#else
-    return (condition != 0) ? valueIfConditionNonZero : valueIfConditionZero; 
-#endif
-}
-
-template<typename T> SIMD_FORCE_INLINE void btSwap(T& a, T& b)
-{
-	T tmp = a;
-	a = b;
-	b = tmp;
-}
-
-
-//PCK: endian swapping functions
-SIMD_FORCE_INLINE unsigned btSwapEndian(unsigned val)
-{
-	return (((val & 0xff000000) >> 24) | ((val & 0x00ff0000) >> 8) | ((val & 0x0000ff00) << 8)  | ((val & 0x000000ff) << 24));
-}
-
-SIMD_FORCE_INLINE unsigned short btSwapEndian(unsigned short val)
-{
-	return static_cast<unsigned short>(((val & 0xff00) >> 8) | ((val & 0x00ff) << 8));
-}
-
-SIMD_FORCE_INLINE unsigned btSwapEndian(int val)
-{
-	return btSwapEndian((unsigned)val);
-}
-
-SIMD_FORCE_INLINE unsigned short btSwapEndian(short val)
-{
-	return btSwapEndian((unsigned short) val);
-}
-
-///btSwapFloat uses using char pointers to swap the endianness
-////btSwapFloat/btSwapDouble will NOT return a float, because the machine might 'correct' invalid floating point values
-///Not all values of sign/exponent/mantissa are valid floating point numbers according to IEEE 754. 
-///When a floating point unit is faced with an invalid value, it may actually change the value, or worse, throw an exception. 
-///In most systems, running user mode code, you wouldn't get an exception, but instead the hardware/os/runtime will 'fix' the number for you. 
-///so instead of returning a float/double, we return integer/long long integer
-SIMD_FORCE_INLINE unsigned int  btSwapEndianFloat(float d)
-{
-    unsigned int a = 0;
-    unsigned char *dst = (unsigned char *)&a;
-    unsigned char *src = (unsigned char *)&d;
-
-    dst[0] = src[3];
-    dst[1] = src[2];
-    dst[2] = src[1];
-    dst[3] = src[0];
-    return a;
-}
-
-// unswap using char pointers
-SIMD_FORCE_INLINE float btUnswapEndianFloat(unsigned int a) 
-{
-    float d = 0.0f;
-    unsigned char *src = (unsigned char *)&a;
-    unsigned char *dst = (unsigned char *)&d;
-
-    dst[0] = src[3];
-    dst[1] = src[2];
-    dst[2] = src[1];
-    dst[3] = src[0];
-
-    return d;
-}
-
-
-// swap using char pointers
-SIMD_FORCE_INLINE void  btSwapEndianDouble(double d, unsigned char* dst)
-{
-    unsigned char *src = (unsigned char *)&d;
-
-    dst[0] = src[7];
-    dst[1] = src[6];
-    dst[2] = src[5];
-    dst[3] = src[4];
-    dst[4] = src[3];
-    dst[5] = src[2];
-    dst[6] = src[1];
-    dst[7] = src[0];
-
-}
-
-// unswap using char pointers
-SIMD_FORCE_INLINE double btUnswapEndianDouble(const unsigned char *src) 
-{
-    double d = 0.0;
-    unsigned char *dst = (unsigned char *)&d;
-
-    dst[0] = src[7];
-    dst[1] = src[6];
-    dst[2] = src[5];
-    dst[3] = src[4];
-    dst[4] = src[3];
-    dst[5] = src[2];
-    dst[6] = src[1];
-    dst[7] = src[0];
-
-	return d;
-}
-
 
 #endif //SIMD___SCALAR_H
diff --git a/extern/bullet2/src/LinearMath/btStackAlloc.h b/extern/bullet2/src/LinearMath/btStackAlloc.h
index 050d44bdfe9..d219b453537 100644
--- a/extern/bullet2/src/LinearMath/btStackAlloc.h
+++ b/extern/bullet2/src/LinearMath/btStackAlloc.h
@@ -21,7 +21,6 @@ Nov.2006
 #define BT_STACK_ALLOC
 
 #include "btScalar.h" //for btAssert
-#include "btAlignedAllocator.h"
 
 struct btBlock
 {
@@ -29,7 +28,7 @@ struct btBlock
 	unsigned char*		address;
 };
 
-///The StackAlloc class provides some fast stack-based memory allocator (LIFO last-in first-out)
+///StackAlloc provides some fast stack-based memory allocator (LIFO last-in first-out)
 class btStackAlloc
 {
 public:
@@ -40,7 +39,7 @@ public:
 	inline void		create(unsigned int size)
 	{
 		destroy();
-		data		=  (unsigned char*) btAlignedAlloc(size,16);
+		data		=	new unsigned char[size];
 		totalsize	=	size;
 	}
 	inline void		destroy()
@@ -50,20 +49,12 @@ public:
 
 		if(usedsize==0)
 		{
-			if(!ischild && data)		
-				btAlignedFree(data);
-
+			if(!ischild)		delete[] data;
 			data				=	0;
 			usedsize			=	0;
 		}
 		
 	}
-
-	int	getAvailableMemory() const
-	{
-		return static_cast<int>(totalsize - usedsize);
-	}
-
 	unsigned char*			allocate(unsigned int size)
 	{
 		const unsigned int	nus(usedsize+size);
@@ -77,7 +68,7 @@ public:
 		
 		return(0);
 	}
-	SIMD_FORCE_INLINE btBlock*		beginBlock()
+	inline btBlock*		beginBlock()
 	{
 		btBlock*	pb = (btBlock*)allocate(sizeof(btBlock));
 		pb->previous	=	current;
@@ -85,7 +76,7 @@ public:
 		current			=	pb;
 		return(pb);
 	}
-	SIMD_FORCE_INLINE void		endBlock(btBlock* block)
+	inline void		endBlock(btBlock* block)
 	{
 		btAssert(block==current);
 		//Raise(L"Unmatched blocks");
diff --git a/extern/bullet2/src/LinearMath/btTransform.h b/extern/bullet2/src/LinearMath/btTransform.h
index a8cdb428100..2d55fec83a4 100644
--- a/extern/bullet2/src/LinearMath/btTransform.h
+++ b/extern/bullet2/src/LinearMath/btTransform.h
@@ -21,8 +21,7 @@ subject to the following restrictions:
 #include "btMatrix3x3.h"
 
 
-///The btTransform class supports rigid transforms with only translation and rotation and no scaling/shear.
-///It can be used in combination with btVector3, btQuaternion and btMatrix3x3 linear algebra classes.
+///btTransform supports rigid transforms (only translation and rotation, no scaling/shear)
 class btTransform {
 	
 
@@ -93,7 +92,13 @@ public:
 		m_basis.getRotation(q);
 		return q;
 	}
-	
+	template <typename Scalar2>
+		void setValue(const Scalar2 *m) 
+	{
+		m_basis.setValue(m);
+		m_origin.setValue(&m[12]);
+	}
+
 	
 	void setFromOpenGLMatrix(const btScalar *m)
 	{
@@ -189,13 +194,8 @@ btTransform::operator*(const btTransform& t) const
 {
 	return btTransform(m_basis * t.m_basis, 
 		(*this)(t.m_origin));
-}
+}	
 
-SIMD_FORCE_INLINE bool operator==(const btTransform& t1, const btTransform& t2)
-{
-   return ( t1.getBasis()  == t2.getBasis() &&
-            t1.getOrigin() == t2.getOrigin() );
-}
 
 
 #endif
@@ -204,4 +204,3 @@ SIMD_FORCE_INLINE bool operator==(const btTransform& t1, const btTransform& t2)
 
 
 
-
diff --git a/extern/bullet2/src/LinearMath/btTransformUtil.h b/extern/bullet2/src/LinearMath/btTransformUtil.h
index 86ee1da5edf..bc42fd166b6 100644
--- a/extern/bullet2/src/LinearMath/btTransformUtil.h
+++ b/extern/bullet2/src/LinearMath/btTransformUtil.h
@@ -25,7 +25,7 @@ subject to the following restrictions:
 
 #define btRecipSqrt(x) ((btScalar)(btScalar(1.0)/btSqrt(btScalar(x))))		/* reciprocal square root */
 
-SIMD_FORCE_INLINE btVector3 btAabbSupport(const btVector3& halfExtents,const btVector3& supportDir)
+inline btVector3 btAabbSupport(const btVector3& halfExtents,const btVector3& supportDir)
 {
 	return btVector3(supportDir.x() < btScalar(0.0) ? -halfExtents.x() : halfExtents.x(),
       supportDir.y() < btScalar(0.0) ? -halfExtents.y() : halfExtents.y(),
@@ -33,7 +33,7 @@ SIMD_FORCE_INLINE btVector3 btAabbSupport(const btVector3& halfExtents,const btV
 }
 
 
-SIMD_FORCE_INLINE void btPlaneSpace1 (const btVector3& n, btVector3& p, btVector3& q)
+inline void btPlaneSpace1 (const btVector3& n, btVector3& p, btVector3& q)
 {
   if (btFabs(n.z()) > SIMDSQRT12) {
     // choose p in y-z plane
@@ -70,9 +70,7 @@ public:
 		predictedOrn += (angvel * predictedOrn) * (timeStep * btScalar(0.5));
 		predictedOrn.normalize();
 	#else
-		//Exponential map
-		//google for "Practical Parameterization of Rotations Using the Exponential Map", F. Sebastian Grassia
-
+		//exponential map
 		btVector3 axis;
 		btScalar	fAngle = angvel.length(); 
 		//limit the angular motion
@@ -123,10 +121,6 @@ public:
 		dmat.getRotation(dorn);
 #endif//USE_QUATERNION_DIFF
 	
-		///floating point inaccuracy can lead to w component > 1..., which breaks 
-
-		dorn.normalize();
-		
 		angle = dorn.getAngle();
 		axis = btVector3(dorn.x(),dorn.y(),dorn.z());
 		axis[3] = btScalar(0.);
diff --git a/extern/bullet2/src/LinearMath/btVector3.h b/extern/bullet2/src/LinearMath/btVector3.h
index 96548c6ba60..74d41ad2a19 100644
--- a/extern/bullet2/src/LinearMath/btVector3.h
+++ b/extern/bullet2/src/LinearMath/btVector3.h
@@ -27,10 +27,6 @@ class	btVector3 : public btQuadWord {
 public:
 	SIMD_FORCE_INLINE btVector3() {}
 
-	SIMD_FORCE_INLINE btVector3(const btQuadWordStorage& q) 
-		: btQuadWord(q)
-	{
-	}
 	
 
 	SIMD_FORCE_INLINE btVector3(const btScalar& x, const btScalar& y, const btScalar& z) 
@@ -47,7 +43,6 @@ public:
 
 	SIMD_FORCE_INLINE btVector3& operator+=(const btVector3& v)
 	{
-
 		m_x += v.x(); m_y += v.y(); m_z += v.z();
 		return *this;
 	}
@@ -404,50 +399,4 @@ public:
 
 };
 
-
-///btSwapVector3Endian swaps vector endianness, useful for network and cross-platform serialization
-SIMD_FORCE_INLINE void	btSwapScalarEndian(const btScalar& sourceVal, btScalar& destVal)
-{
-	#ifdef BT_USE_DOUBLE_PRECISION
-	unsigned char* dest = (unsigned char*) &destVal;
-	unsigned char* src  = (unsigned char*) &sourceVal;
-	dest[0] = src[7];
-    dest[1] = src[6];
-    dest[2] = src[5];
-    dest[3] = src[4];
-    dest[4] = src[3];
-    dest[5] = src[2];
-    dest[6] = src[1];
-    dest[7] = src[0];
-#else
-	unsigned char* dest = (unsigned char*) &destVal;
-	unsigned char* src  = (unsigned char*) &sourceVal;
-	dest[0] = src[3];
-    dest[1] = src[2];
-    dest[2] = src[1];
-    dest[3] = src[0];
-#endif //BT_USE_DOUBLE_PRECISION
-}
-///btSwapVector3Endian swaps vector endianness, useful for network and cross-platform serialization
-SIMD_FORCE_INLINE void	btSwapVector3Endian(const btVector3& sourceVec, btVector3& destVec)
-{
-	for (int i=0;i<4;i++)
-	{
-		btSwapScalarEndian(sourceVec[i],destVec[i]);
-	}
-
-}
-
-///btUnSwapVector3Endian swaps vector endianness, useful for network and cross-platform serialization
-SIMD_FORCE_INLINE void	btUnSwapVector3Endian(btVector3& vector)
-{
-
-	btVector3	swappedVec;
-	for (int i=0;i<4;i++)
-	{
-		btSwapScalarEndian(vector[i],swappedVec[i]);
-	}
-	vector = swappedVec;
-}
-
 #endif //SIMD__VECTOR3_H
diff --git a/extern/bullet2/src/btBulletCollisionCommon.h b/extern/bullet2/src/btBulletCollisionCommon.h
index b21d8b4f66c..8417ccc671f 100644
--- a/extern/bullet2/src/btBulletCollisionCommon.h
+++ b/extern/bullet2/src/btBulletCollisionCommon.h
@@ -32,26 +32,23 @@ subject to the following restrictions:
 #include "BulletCollision/CollisionShapes/btConvexHullShape.h"
 #include "BulletCollision/CollisionShapes/btTriangleMesh.h"
 #include "BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h"
-#include "BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h"
 #include "BulletCollision/CollisionShapes/btTriangleMeshShape.h"
 #include "BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h"
 #include "BulletCollision/CollisionShapes/btCompoundShape.h"
 #include "BulletCollision/CollisionShapes/btTetrahedronShape.h"
 #include "BulletCollision/CollisionShapes/btEmptyShape.h"
+#include "BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h"
 #include "BulletCollision/CollisionShapes/btMultiSphereShape.h"
-#include "BulletCollision/CollisionShapes/btUniformScalingShape.h"
 
 ///Narrowphase Collision Detector
 #include "BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h"
 #include "BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h"
-#include "BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h"
 
 ///Dispatching and generation of collision pairs (broadphase)
 #include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h"
 #include "BulletCollision/BroadphaseCollision/btSimpleBroadphase.h"
 #include "BulletCollision/BroadphaseCollision/btAxisSweep3.h"
-#include "BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h"
-#include "BulletCollision/BroadphaseCollision/btDbvtBroadphase.h"
+
 
 ///Math library & Utils
 #include "LinearMath/btQuaternion.h"
diff --git a/extern/bullet2/src/btBulletDynamicsCommon.h b/extern/bullet2/src/btBulletDynamicsCommon.h
index ce9bb1d968b..25f016cba8a 100644
--- a/extern/bullet2/src/btBulletDynamicsCommon.h
+++ b/extern/bullet2/src/btBulletDynamicsCommon.h
@@ -20,8 +20,6 @@ subject to the following restrictions:
 #include "btBulletCollisionCommon.h"
 
 #include "BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h"
-#include "BulletDynamics/Dynamics/btContinuousDynamicsWorld.h"
-
 #include "BulletDynamics/Dynamics/btSimpleDynamicsWorld.h"
 #include "BulletDynamics/Dynamics/btRigidBody.h"
 
@@ -29,13 +27,9 @@ subject to the following restrictions:
 #include "BulletDynamics/ConstraintSolver/btHingeConstraint.h"
 #include "BulletDynamics/ConstraintSolver/btConeTwistConstraint.h"
 #include "BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h"
-#include "BulletDynamics/ConstraintSolver/btSliderConstraint.h"
+
 
 #include "BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h"
-///Optional ODE quickstep constraint solver, redistributed under ZLib license
-#include "BulletDynamics/ConstraintSolver/btOdeQuickstepConstraintSolver.h"
-#include "BulletDynamics/ConstraintSolver/btOdeTypedJoint.h"
-
 ///Vehicle simulation, with wheel contact simulated by raycasts
 #include "BulletDynamics/Vehicle/btRaycastVehicle.h"
 
diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
index f5fb8ce852d..de91bce2ab1 100644
--- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
+++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
@@ -245,11 +245,6 @@ struct	BlenderDebugDraw : public btIDebugDraw
 	{
 		return m_debugMode;
 	}
-	///todo: find out if Blender can do this
-	virtual void	draw3dText(const btVector3& location,const char* textString)
-	{
-
-	}
 		
 };
 
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
index e85238b49c3..2ec96c75a68 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
@@ -126,14 +126,13 @@ void CcdPhysicsController::CreateRigidbody()
 
 	m_bulletMotionState = new BlenderBulletMotionState(m_MotionState);
 
-	btRigidBody::btRigidBodyConstructionInfo rbci(m_cci.m_mass,m_bulletMotionState,m_collisionShape,m_cci.m_localInertiaTensor * m_cci.m_inertiaFactor);
-	rbci.m_linearDamping = m_cci.m_linearDamping;
-	rbci.m_angularDamping = m_cci.m_angularDamping;
-	rbci.m_friction = m_cci.m_friction;
-	rbci.m_restitution = m_cci.m_restitution;
-	
-	m_body = new btRigidBody(rbci);
-	
+	m_body = new btRigidBody(m_cci.m_mass,
+		m_bulletMotionState,
+		m_collisionShape,
+		m_cci.m_localInertiaTensor * m_cci.m_inertiaFactor,
+		m_cci.m_linearDamping,m_cci.m_angularDamping,
+		m_cci.m_friction,m_cci.m_restitution);
+
 	//
 	// init the rigidbody properly
 	//
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
index f9242e6876f..d14ddf8f65c 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
@@ -330,21 +330,30 @@ m_filterCallback(NULL)
 	{
 		m_triggerCallbacks[i] = 0;
 	}
-	m_collisionConfiguration = new btDefaultCollisionConfiguration();
-
 	if (!dispatcher)
 	{
-		dispatcher = new btCollisionDispatcher(m_collisionConfiguration);
+		dispatcher = new btCollisionDispatcher();
 		m_ownDispatcher = dispatcher;
 	}
 
-	m_broadphase = new btDbvtBroadphase();
+	if(!pairCache)
+	{
+
+		//todo: calculate/let user specify this world sizes
+		btVector3 worldMin(-10000,-10000,-10000);
+		btVector3 worldMax(10000,10000,10000);
+
+		pairCache = new btAxisSweep3(worldMin,worldMax);
+		// remember that this was allocated by us so that we can release it
+		m_ownPairCache = pairCache;
+		//broadphase = new btSimpleBroadphase();
+	}
 
 	m_filterCallback = new CcdOverlapFilterCallBack(this);
-	m_broadphase->getOverlappingPairCache()->setOverlapFilterCallback(m_filterCallback);
+	pairCache->setOverlapFilterCallback(m_filterCallback);
 
 	setSolverType(1);//issues with quickstep and memory allocations
-	m_dynamicsWorld = new btDiscreteDynamicsWorld(dispatcher,m_broadphase,m_solver,m_collisionConfiguration);
+	m_dynamicsWorld = new btDiscreteDynamicsWorld(dispatcher,pairCache,m_solver);
 	m_debugDrawer = 0;
 	m_gravity = btVector3(0.f,-10.f,0.f);
 	m_dynamicsWorld->setGravity(m_gravity);
@@ -510,9 +519,6 @@ bool	CcdPhysicsEnvironment::proceedDeltaTime(double curTime,float timeStep)
 		veh->SyncWheels();
 	}
 
-	m_dynamicsWorld->debugDrawWorld();
-
-
 	CallbackTriggers();
 
 	return true;
@@ -573,7 +579,7 @@ void		CcdPhysicsEnvironment::setSolverDamping(float damping)
 
 void		CcdPhysicsEnvironment::setLinearAirDamping(float damping)
 {
-	//gLinearAirDamping = damping;
+	gLinearAirDamping = damping;
 }
 
 void		CcdPhysicsEnvironment::setUseEpa(bool epa)
@@ -592,7 +598,7 @@ void		CcdPhysicsEnvironment::setSolverType(int solverType)
 			{
 
 				m_solver = new btSequentialImpulseConstraintSolver();
-//				((btSequentialImpulseConstraintSolver*)m_solver)->setSolverMode(btSequentialImpulseConstraintSolver::SOLVER_USE_WARMSTARTING | btSequentialImpulseConstraintSolver::SOLVER_RANDMIZE_ORDER);
+				((btSequentialImpulseConstraintSolver*)m_solver)->setSolverMode(btSequentialImpulseConstraintSolver::SOLVER_USE_WARMSTARTING | btSequentialImpulseConstraintSolver::SOLVER_RANDMIZE_ORDER);
 				break;
 			}
 		}
@@ -654,10 +660,9 @@ int			CcdPhysicsEnvironment::createUniversalD6Constraint(
 	{
 		
 
-		bool useReferenceFrameA = true;
 		genericConstraint = new btGeneric6DofConstraint(
 			*rb0,*rb1,
-			frameInA,frameInB,useReferenceFrameA);
+			frameInA,frameInB);
 		genericConstraint->setLinearLowerLimit(linearMinLimits);
 		genericConstraint->setLinearUpperLimit(linearMaxLimits);
 		genericConstraint->setAngularLowerLimit(angularMinLimits);
@@ -737,15 +742,14 @@ struct	FilterClosestRayResultCallback : public btCollisionWorld::ClosestRayResul
 		// save shape information as ClosestRayResultCallback::AddSingleResult() does not do it
 		if (rayResult.m_localShapeInfo)
 		{
-			m_hitTriangleShape = NULL;//rayResult.m_localShapeInfo->m_triangleShape;
-			m_hitTriangleIndex = 0;//rayResult.m_localShapeInfo->m_triangleIndex;
+			m_hitTriangleShape = rayResult.m_localShapeInfo->m_triangleShape;
+			m_hitTriangleIndex = rayResult.m_localShapeInfo->m_triangleIndex;
 		} else 
 		{
 			m_hitTriangleShape = NULL;
 			m_hitTriangleIndex = 0;
 		}
-		bool normalInWorldspace = true;
-		return ClosestRayResultCallback::addSingleResult(rayResult,normalInWorldspace);
+		return ClosestRayResultCallback::AddSingleResult(rayResult);
 	}
 
 };
@@ -771,11 +775,8 @@ PHY_IPhysicsController* CcdPhysicsEnvironment::rayTest(PHY_IRayCastFilterCallbac
 	memset(&result, 0, sizeof(result));
 
 	// don't collision with sensor object
-	rayCallback.m_collisionFilterMask = CcdConstructionInfo::AllFilter ^ CcdConstructionInfo::SensorFilter;
-	//, ,filterCallback.m_faceNormal);
-
-	m_dynamicsWorld->rayTest(rayFrom,rayTo,rayCallback);
-	if (rayCallback.hasHit())
+	m_dynamicsWorld->rayTest(rayFrom,rayTo,rayCallback, CcdConstructionInfo::AllFilter ^ CcdConstructionInfo::SensorFilter,filterCallback.m_faceNormal);
+	if (rayCallback.HasHit())
 	{
 		CcdPhysicsController* controller = static_cast<CcdPhysicsController*>(rayCallback.m_collisionObject->getUserPointer());
 		result.m_controller = controller;
@@ -880,12 +881,6 @@ CcdPhysicsEnvironment::~CcdPhysicsEnvironment()
 
 	if (NULL != m_filterCallback)
 		delete m_filterCallback;
-
-	if (NULL != m_collisionConfiguration)
-		delete m_collisionConfiguration;
-
-	if (NULL != m_broadphase)
-		delete m_broadphase;
 }
 
 
@@ -898,7 +893,7 @@ void	CcdPhysicsEnvironment::setConstraintParam(int constraintId,int param,float
 		{
 			//param = 1..12, min0,max0,min1,max1...min6,max6
 			btGeneric6DofConstraint* genCons = (btGeneric6DofConstraint*)typedConstraint;
-			genCons->setLimit(param,value0,value1);
+			genCons->SetLimit(param,value0,value1);
 			break;
 		};
 	default:
@@ -1244,11 +1239,10 @@ int			CcdPhysicsEnvironment::createConstraint(class PHY_IPhysicsController* ctrl
 				btTransform globalFrameA = rb0->getCenterOfMassTransform() * frameInA;
 				
 				frameInB = inv  * globalFrameA;
-				bool useReferenceFrameA = true;
-
+				
 				genericConstraint = new btGeneric6DofConstraint(
 					*rb0,*rb1,
-					frameInA,frameInB,useReferenceFrameA);
+					frameInA,frameInB);
 
 
 			} else
@@ -1269,10 +1263,9 @@ int			CcdPhysicsEnvironment::createConstraint(class PHY_IPhysicsController* ctrl
 				///frameInB in worldspace
 				frameInB = rb0->getCenterOfMassTransform() * frameInA;
 
-				bool useReferenceFrameA = true;
 				genericConstraint = new btGeneric6DofConstraint(
 					*rb0,s_fixedObject2,
-					frameInA,frameInB,useReferenceFrameA);
+					frameInA,frameInB);
 			}
 			
 			if (genericConstraint)
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
index 3cf5a943e3f..667e310dcb3 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
@@ -56,10 +56,6 @@ class CcdPhysicsEnvironment : public PHY_IPhysicsEnvironment
 
 protected:
 	btIDebugDraw*	m_debugDrawer;
-	
-	class btDefaultCollisionConfiguration* m_collisionConfiguration;
-	class btBroadphaseInterface*			m_broadphase;
-
 	//solver iterations
 	int	m_numIterations;
 	

From 19d5a5da452bf5d07bc9409577141401c1e2e0be Mon Sep 17 00:00:00 2001
From: Benoit Bolsee <benoit.bolsee@online.be>
Date: Wed, 3 Sep 2008 12:54:46 +0000
Subject: [PATCH 245/252] Update MSVC project files after GSoC merge

---
 projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj | 6 ++++++
 projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj       | 8 ++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj b/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
index 42dcc843091..69db0a95006 100644
--- a/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
+++ b/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
@@ -506,6 +506,9 @@
 			<File
 				RelativePath="..\..\..\source\blender\blenkernel\intern\subsurf_ccg.c">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\blenkernel\intern\suggestions.c">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\blenkernel\intern\text.c">
 			</File>
@@ -723,6 +726,9 @@
 			<File
 				RelativePath="..\..\..\source\blender\blenkernel\BKE_subsurf.h">
 			</File>
+			<File
+				RelativePath="..\..\..\source\blender\blenkernel\BKE_suggestions.h">
+			</File>
 			<File
 				RelativePath="..\..\..\source\blender\blenkernel\BKE_text.h">
 			</File>
diff --git a/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj b/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
index 4e362faed69..a358a868143 100644
--- a/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
+++ b/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
@@ -126,7 +126,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\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"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\build\msvc_7\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"
 				PreprocessorDefinitions="JANCODEPANCO;WIN32;_LIB;EXP_PYTHON_EMBEDDING;_DEBUG;USE_SUMO_SOLID;WITH_GLEXT"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -179,7 +179,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\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"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\build\msvc_7\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"
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;USE_SUMO_SOLID;WITH_GLEXT"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -232,7 +232,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\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"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\build\msvc_7\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"
 				PreprocessorDefinitions="JANCODEPANCO;WIN32;_LIB;EXP_PYTHON_EMBEDDING;_DEBUG;USE_SUMO_SOLID;WITH_GLEXT"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -285,7 +285,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\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"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\string\include;..\..\..\..\build\msvc_7\intern\moto\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\extern\bullet\include;..\..\..\..\build\msvc_7\extern\solid\include;..\..\..\..\build\msvc_7\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"
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;USE_SUMO_SOLID;WITH_GLEXT"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"

From 961a26d50058de81ca27a9465320c0177e5eeeb4 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Wed, 3 Sep 2008 23:51:55 +0000
Subject: [PATCH 246/252] fix for 2 python refcounting errors

---
 source/blender/python/BPY_interface.c      | 11 ++++-------
 source/gameengine/Ketsji/KX_PythonInit.cpp |  6 ++++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/source/blender/python/BPY_interface.c b/source/blender/python/BPY_interface.c
index 05ea2d77ab9..05254bca8c0 100644
--- a/source/blender/python/BPY_interface.c
+++ b/source/blender/python/BPY_interface.c
@@ -292,7 +292,7 @@ void syspath_append( char *dirname )
 	short ok=1;
 	PyErr_Clear(  );
 
-	dir = Py_BuildValue( "s", dirname );
+	dir = PyString_FromString( dirname );
 
 	mod_sys = PyImport_ImportModule( "sys" );	/* new ref */
 	
@@ -308,32 +308,29 @@ void syspath_append( char *dirname )
 	}
 	
 	if (PySequence_Contains(path, dir)==0) { /* Only add if we need to */
-		if (ok && PyList_Append( path, dir ) != 0)
+		if (ok && PyList_Append( path, dir ) != 0) /* decref below */
 			ok = 0; /* append failed */
 	
 		if( (ok==0) || PyErr_Occurred(  ) )
 			Py_FatalError( "could import or build sys.path, can't continue" );
 	}
+	Py_DECREF( dir );
 	Py_XDECREF( mod_sys );
 }
 
 void init_syspath( int first_time )
 {
-	PyObject *path;
 	PyObject *mod, *d;
 	char *progname;
 	char execdir[FILE_MAXDIR];	/*defines from DNA_space_types.h */
 
 	int n;
-	
-	
-	path = Py_BuildValue( "s", bprogname );
 
 	mod = PyImport_ImportModule( "Blender.sys" );
 
 	if( mod ) {
 		d = PyModule_GetDict( mod );
-		EXPP_dict_set_item_str( d, "progname", path );
+		EXPP_dict_set_item_str( d, "progname", PyString_FromString( bprogname ) );
 		Py_DECREF( mod );
 	} else
 		printf( "Warning: could not set Blender.sys.progname\n" );
diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp
index e9fb0278d76..4b6a38f18c0 100644
--- a/source/gameengine/Ketsji/KX_PythonInit.cpp
+++ b/source/gameengine/Ketsji/KX_PythonInit.cpp
@@ -274,7 +274,7 @@ static PyObject* gPyGetBlendFileList(PyObject*, PyObject* args)
 {
 	char cpath[sizeof(G.sce)];
 	char *searchpath = NULL;
-	PyObject* list;
+	PyObject* list, *value;
 	
     DIR *dp;
     struct dirent *dirp;
@@ -300,7 +300,9 @@ static PyObject* gPyGetBlendFileList(PyObject*, PyObject* args)
 	
     while ((dirp = readdir(dp)) != NULL) {
 		if (BLI_testextensie(dirp->d_name, ".blend")) {
-			PyList_Append(list, PyString_FromString(dirp->d_name));
+			value = PyString_FromString(dirp->d_name);
+			PyList_Append(list, value);
+			Py_DECREF(value);
 		}
     }
 	

From a7348dd43ee764d11cb0db66ca054c979c3b6bfe Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Thu, 4 Sep 2008 00:27:05 +0000
Subject: [PATCH 247/252] Bugfix: yafray export crash if new hsv texture blend
 types were used, the code here needed to be updated.

---
 source/blender/makesdna/DNA_texture_types.h    | 1 +
 source/blender/yafray/intern/export_File.cpp   | 2 +-
 source/blender/yafray/intern/export_Plugin.cpp | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h
index 8a79ce845d7..111dc08ee02 100644
--- a/source/blender/makesdna/DNA_texture_types.h
+++ b/source/blender/makesdna/DNA_texture_types.h
@@ -367,6 +367,7 @@ typedef struct TexMapping {
 #define MTEX_BLEND_SAT		11
 #define MTEX_BLEND_VAL		12
 #define MTEX_BLEND_COLOR	13
+#define MTEX_NUM_BLENDTYPES	14
 
 /* **************** EnvMap ********************* */
 
diff --git a/source/blender/yafray/intern/export_File.cpp b/source/blender/yafray/intern/export_File.cpp
index f8bbdad5f65..f42e00daf6d 100644
--- a/source/blender/yafray/intern/export_File.cpp
+++ b/source/blender/yafray/intern/export_File.cpp
@@ -881,7 +881,7 @@ void yafrayFileRender_t::writeShader(const string &shader_name, Material* matr,
 				ostr << "\t\t<input value=\"" << shader_name << "_map" << m2 << "\" />\n";
 
 			// blendtype, would have been nice if the order would have been the same as for ramps...
-			const string blendtype[9] = {"mix", "mul", "add", "sub", "divide", "darken", "difference", "lighten", "screen"};
+			const string blendtype[MTEX_NUM_BLENDTYPES] = {"mix", "mul", "add", "sub", "divide", "darken", "difference", "lighten", "screen", "hue", "sat", "val", "color"};
 			ostr << "\t\t<mode value=\"" << blendtype[(int)mtex->blendtype] << "\" />\n";
 
 			// texture color (for use with MUL and/or no_rgb etc..)
diff --git a/source/blender/yafray/intern/export_Plugin.cpp b/source/blender/yafray/intern/export_Plugin.cpp
index 77d53c4ed96..a7d5653892f 100644
--- a/source/blender/yafray/intern/export_Plugin.cpp
+++ b/source/blender/yafray/intern/export_Plugin.cpp
@@ -782,7 +782,7 @@ void yafrayPluginRender_t::writeShader(const string &shader_name, Material* matr
 				mparams["input"] = yafray::parameter_t(shader_name + temp);
 
 			// blendtype, would have been nice if the order would have been the same as for ramps...
-			const string blendtype[9] = {"mix", "mul", "add", "sub", "divide", "darken", "difference", "lighten", "screen"};
+			const string blendtype[MTEX_NUM_BLENDTYPES] = {"mix", "mul", "add", "sub", "divide", "darken", "difference", "lighten", "screen", "hue", "sat", "val", "color"};
 			mparams["mode"] = yafray::parameter_t(blendtype[(int)mtex->blendtype]);
 
 			// texture color (for use with MUL and/or no_rgb etc..)

From e356c4d5d4fce6aec2a308d93c6e8625d2e8cc8b Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Thu, 4 Sep 2008 12:11:47 +0000
Subject: [PATCH 248/252] pin option for sensors and actuators, this helps in
 cases where you want to use a logic brick in 2 states, linking the sensor to
 a second state's controller can be tricky. This way you can pin a sensor or
 actuator, change the visible state and link it to another controller.

The pin button will only be displayed when states view is enabled and the logic brick is expanded or when it is alredy pinned.
---
 source/blender/makesdna/DNA_actuator_types.h |  1 +
 source/blender/makesdna/DNA_sensor_types.h   |  1 +
 source/blender/src/buttons_logic.c           | 32 +++++++++++++++-----
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/source/blender/makesdna/DNA_actuator_types.h b/source/blender/makesdna/DNA_actuator_types.h
index 59d0555b452..d08cf42867d 100644
--- a/source/blender/makesdna/DNA_actuator_types.h
+++ b/source/blender/makesdna/DNA_actuator_types.h
@@ -300,6 +300,7 @@ typedef struct FreeCamera {
 #define ACT_NEW			4
 #define ACT_LINKED		8	
 #define ACT_VISIBLE		16	
+#define ACT_PIN			32
 
 /* link codes */
 #define LINK_SENSOR		0
diff --git a/source/blender/makesdna/DNA_sensor_types.h b/source/blender/makesdna/DNA_sensor_types.h
index 3e0075c00bd..1fd97fe0158 100644
--- a/source/blender/makesdna/DNA_sensor_types.h
+++ b/source/blender/makesdna/DNA_sensor_types.h
@@ -218,6 +218,7 @@ typedef struct bJoystickSensor {
 #define SENS_NEW		4
 #define SENS_NOT		8
 #define SENS_VISIBLE	16
+#define SENS_PIN		32
 
 /* sensor->pulse */
 #define SENS_PULSE_CONT 	0
diff --git a/source/blender/src/buttons_logic.c b/source/blender/src/buttons_logic.c
index 0b6986c2c8e..ec268af7d86 100644
--- a/source/blender/src/buttons_logic.c
+++ b/source/blender/src/buttons_logic.c
@@ -3105,6 +3105,9 @@ void logic_buts(void)
 	int a, iact, stbit, offset;
 	short xco, yco, count, width, ycoo;
 	char *pupstr, name[32];
+	/* pin is a bool used for actuator and sensor drawing with states
+	 * pin so changing states dosnt hide the logic brick */
+	char pin;
 
 	wrld= G.scene->world;
 
@@ -3365,18 +3368,25 @@ void logic_buts(void)
 			sens= ob->sensors.first;
 			while(sens) {
 				if (!(G.buts->scaflag & BUTS_SENS_STATE) ||
-					sens->totlinks == 0 ||		/* always display sensor without links so that is can be edited */
-					is_sensor_linked(block, sens)) {
+					 (sens->totlinks == 0) ||		/* always display sensor without links so that is can be edited */
+					 (sens->flag & SENS_PIN && G.buts->scaflag & BUTS_SENS_STATE) || /* states can hide some sensors, pinned sensors ignore the visible state */
+					 (is_sensor_linked(block, sens))
+				) {
+					/* should we draw the pin? - for now always draw when there is a state */
+					pin = (G.buts->scaflag & BUTS_SENS_STATE && (sens->flag & SENS_SHOW || sens->flag & SENS_PIN)) ? 1:0 ;
+					
 					sens->flag |= SENS_VISIBLE;
 					uiBlockSetEmboss(block, UI_EMBOSSM);
 					uiDefIconButBitS(block, TOG, SENS_DEL, B_DEL_SENS, ICON_X,	xco, yco, 22, 19, &sens->flag, 0, 0, 0, 0, "Delete Sensor");
+					if (pin)
+						uiDefIconButBitS(block, ICONTOG, SENS_PIN, B_REDR, (sens->flag & SENS_PIN) ? ICON_PIN_DEHLT:ICON_PIN_HLT, (short)(xco+width-44), yco, 22, 19, &sens->flag, 0, 0, 0, 0, "Display when not linked to a visible states controller");
 					uiDefIconButBitS(block, ICONTOG, SENS_SHOW, B_REDR, ICON_RIGHTARROW, (short)(xco+width-22), yco, 22, 19, &sens->flag, 0, 0, 0, 0, "Sensor settings");
 
 					ycoo= yco;
 					if(sens->flag & SENS_SHOW)
 					{
 						uiDefButS(block, MENU, B_CHANGE_SENS, sensor_pup(),	(short)(xco+22), yco, 80, 19, &sens->type, 0, 0, 0, 0, "Sensor type");
-						but= uiDefBut(block, TEX, 1, "", (short)(xco+102), yco, (short)(width-124), 19, sens->name, 0, 31, 0, 0, "Sensor name");
+						but= uiDefBut(block, TEX, 1, "", (short)(xco+102), yco, (short)(width-(pin?146:124)), 19, sens->name, 0, 31, 0, 0, "Sensor name");
 						uiButSetFunc(but, make_unique_prop_names_cb, sens->name, (void*) 0);
 
 						sens->otype= sens->type;
@@ -3437,16 +3447,22 @@ void logic_buts(void)
 			while(act) {
 				if (!(G.buts->scaflag & BUTS_ACT_STATE) ||
 					!(act->flag & ACT_LINKED) ||		/* always display actuators without links so that is can be edited */
-					(act->flag & ACT_VISIBLE)) {		/* this actuator has visible connection, display it */
+					 (act->flag & ACT_VISIBLE) ||		/* this actuator has visible connection, display it */
+					 (act->flag & ACT_PIN && G.buts->scaflag & BUTS_ACT_STATE)) {
+					
+					pin = (G.buts->scaflag & BUTS_ACT_STATE && (act->flag & SENS_SHOW || act->flag & SENS_PIN)) ? 1:0 ;
+					
 					act->flag |= ACT_VISIBLE;	/* mark the actuator as visible to help implementing the up/down action */
 					uiBlockSetEmboss(block, UI_EMBOSSM);
 					uiDefIconButBitS(block, TOG, ACT_DEL, B_DEL_ACT, ICON_X,	xco, yco, 22, 19, &act->flag, 0, 0, 0, 0, "Delete Actuator");
-					uiDefIconButBitS(block, ICONTOG, ACT_SHOW, B_REDR, ICON_RIGHTARROW, (short)(xco+width-22), yco, 22, 19, &act->flag, 0, 0, 0, 0, "Actuator settings");
-
+					if (pin)
+						uiDefIconButBitS(block, ICONTOG, ACT_PIN, B_REDR, (act->flag & ACT_PIN) ? ICON_PIN_DEHLT:ICON_PIN_HLT, (short)(xco+width-44), yco, 22, 19, &act->flag, 0, 0, 0, 0, "Display when not linked to a visible states controller");
+					uiDefIconButBitS(block, ICONTOG, ACT_SHOW, B_REDR, ICON_RIGHTARROW, (short)(xco+width-22), yco, 22, 19, &act->flag, 0, 0, 0, 0, "Display the actuator");
+					
 					if(act->flag & ACT_SHOW) {
 						act->otype= act->type;
 						uiDefButS(block, MENU, B_CHANGE_ACT, actuator_pup(ob),	(short)(xco+22), yco, 90, 19, &act->type, 0, 0, 0, 0, "Actuator type");
-						but= uiDefBut(block, TEX, 1, "", (short)(xco+112), yco, (short)(width-134), 19, act->name, 0, 31, 0, 0, "Actuator name");
+						but= uiDefBut(block, TEX, 1, "", (short)(xco+112), yco, (short)(width-(pin?156:134)), 19, act->name, 0, 31, 0, 0, "Actuator name");
 						uiButSetFunc(but, make_unique_prop_names_cb, act->name, (void*) 0);
 
 						ycoo= yco;
@@ -3458,7 +3474,7 @@ void logic_buts(void)
 						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, 19, act, 0, 0, 0, 0, "Actuator type");
 						uiButSetFunc(but, sca_move_actuator, act, NULL);
-						but= uiDefBut(block, LABEL, 0, act->name, (short)(xco+112), yco, (short)(width-134), 19, act, 0, 0, 0, 0, "Actuator name");
+						but= uiDefBut(block, LABEL, 0, act->name, (short)(xco+112), yco, (short)(width-156), 19, act, 0, 0, 0, 0, "Actuator name");
 						uiButSetFunc(but, sca_move_actuator, act, NULL);
 						ycoo= yco;
 					}

From 05056f2e1db5d0919c6a38873742a045d45a6027 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Thu, 4 Sep 2008 12:17:01 +0000
Subject: [PATCH 249/252] overlapping UI causing problems, forgot the label has
 a function assigned to it

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

diff --git a/source/blender/src/buttons_logic.c b/source/blender/src/buttons_logic.c
index ec268af7d86..9c66b7831bb 100644
--- a/source/blender/src/buttons_logic.c
+++ b/source/blender/src/buttons_logic.c
@@ -3398,7 +3398,7 @@ void logic_buts(void)
 						glRecti(xco+22, yco, xco+width-22,yco+19);
 						but= uiDefBut(block, LABEL, 0, sensor_name(sens->type),	(short)(xco+22), yco, 80, 19, sens, 0, 0, 0, 0, "");
 						uiButSetFunc(but, sca_move_sensor, sens, NULL);
-						but= uiDefBut(block, LABEL, 0, sens->name, (short)(xco+102), yco, (short)(width-124), 19, sens, 0, 31, 0, 0, "");
+						but= uiDefBut(block, LABEL, 0, sens->name, (short)(xco+102), yco, (short)(width-(pin?146:124)), 19, sens, 0, 31, 0, 0, "");
 						uiButSetFunc(but, sca_move_sensor, sens, NULL);
 					}
 
@@ -3474,7 +3474,7 @@ void logic_buts(void)
 						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, 19, act, 0, 0, 0, 0, "Actuator type");
 						uiButSetFunc(but, sca_move_actuator, act, NULL);
-						but= uiDefBut(block, LABEL, 0, act->name, (short)(xco+112), yco, (short)(width-156), 19, act, 0, 0, 0, 0, "Actuator name");
+						but= uiDefBut(block, LABEL, 0, act->name, (short)(xco+112), yco, (short)(width-(pin?156:134)), 19, act, 0, 0, 0, 0, "Actuator name");
 						uiButSetFunc(but, sca_move_actuator, act, NULL);
 						ycoo= yco;
 					}

From f0eaf424ab7488b93f18c634ba825c3b734ad913 Mon Sep 17 00:00:00 2001
From: Kent Mein <mein@cs.umn.edu>
Date: Thu, 4 Sep 2008 15:29:43 +0000
Subject: [PATCH 250/252] Added SDL headers so gamestuff compiles with
 Makefiles again.

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

diff --git a/source/gameengine/Ketsji/Makefile b/source/gameengine/Ketsji/Makefile
index 59cc6c8ca7e..995237adf2c 100644
--- a/source/gameengine/Ketsji/Makefile
+++ b/source/gameengine/Ketsji/Makefile
@@ -35,6 +35,7 @@ include nan_compile.mk
 
 CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
 
+CPPFLAGS += $(NAN_SDLCFLAGS)
 CPPFLAGS += $(OGL_CPPFLAGS)
 CPPFLAGS += -I$(NAN_GLEW)/include
 CPPFLAGS += -I$(OPENGL_HEADERS)

From 2167e5c341f656b2f664b1052d181e8aa32fe698 Mon Sep 17 00:00:00 2001
From: Kent Mein <mein@cs.umn.edu>
Date: Thu, 4 Sep 2008 16:40:20 +0000
Subject: [PATCH 251/252] Cleaned up some small warnings.

Kent
---
 source/blender/include/BIF_drawtext.h | 1 +
 source/blender/src/drawtext.c         | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/blender/include/BIF_drawtext.h b/source/blender/include/BIF_drawtext.h
index bc4d5e3f9c8..51000f8c81a 100644
--- a/source/blender/include/BIF_drawtext.h
+++ b/source/blender/include/BIF_drawtext.h
@@ -33,6 +33,7 @@
 struct ScrArea;
 struct SpaceText;
 struct Text;
+struct TextLine;
 
 void unlink_text(struct Text *text);
 
diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index daa2d52d485..3f21d32c2d4 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -138,8 +138,6 @@ static void get_selection_buffer(Text *text);
 static int check_bracket(char ch);
 static int check_delim(char ch);
 static int check_digit(char ch);
-static int check_builtinfuncs(char *string);
-static int check_specialvars(char *string);
 static int check_identifier(char ch);
 static int check_whitespace(char ch);
 
@@ -595,6 +593,7 @@ static void set_cursor_to_pos (SpaceText *st, int x, int y, int sel)
 			chop= 1;
 			chars= 0;
 			curs= 0;
+			endj= 0;
 			for (i=0, j=0; loop; j++) {
 
 				/* Mimic replacement of tabs */

From cb89decfdcf5e6b2f26376d416633f4ccf0c532d Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Thu, 4 Sep 2008 20:51:28 +0000
Subject: [PATCH 252/252] Merge of first part of changes from the apricot
 branch, especially the features that are needed to run the game. Compile
 tested with scons, make, but not cmake, that seems to have an issue not
 related to these changes. The changes include:

* GLSL support in the viewport and game engine, enable in the game
  menu in textured draw mode.
* Synced and merged part of the duplicated blender and gameengine/
  gameplayer drawing code.
* Further refactoring of game engine drawing code, especially mesh
  storage changed a lot.
* Optimizations in game engine armatures to avoid recomputations.
* A python function to get the framerate estimate in game.

* An option take object color into account in materials.
* An option to restrict shadow casters to a lamp's layers.
* Increase from 10 to 18 texture slots for materials, lamps, word.
  An extra texture slot shows up once the last slot is used.

* Memory limit for undo, not enabled by default yet because it
  needs the .B.blend to be changed.
* Multiple undo for image painting.

* An offset for dupligroups, so not all objects in a group have to
  be at the origin.
---
 blenderplayer/CMakeLists.txt                  |    1 +
 config/darwin-config.py                       |    1 -
 extern/glew/SConscript                        |    2 +-
 extern/glew/include/GL/glew.h                 |    7 +-
 extern/glew/src/glew.c                        |    2 +
 intern/guardedalloc/MEM_guardedalloc.h        |   10 +-
 intern/guardedalloc/intern/mallocn.c          |   21 +-
 intern/memutil/MEM_Allocator.h                |    1 +
 intern/memutil/MEM_CacheLimiter.h             |   12 +-
 .../memutil/intern/MEM_CacheLimiterC-Api.cpp  |    8 +-
 intern/moto/include/GEN_Map.h                 |   13 +
 intern/moto/include/MT_Matrix4x4.h            |    1 +
 intern/moto/include/MT_Matrix4x4.inl          |   14 +-
 release/scripts/sysinfo.py                    |    2 +
 source/Makefile                               |    3 +-
 source/blender/CMakeLists.txt                 |    2 +-
 source/blender/Makefile                       |    2 +-
 source/blender/SConscript                     |    1 +
 source/blender/blenkernel/BKE_DerivedMesh.h   |   49 +-
 .../blender/blenkernel/BKE_bad_level_calls.h  |    4 -
 source/blender/blenkernel/BKE_colortools.h    |    1 +
 source/blender/blenkernel/BKE_global.h        |    9 +-
 source/blender/blenkernel/BKE_mesh.h          |    1 -
 source/blender/blenkernel/BKE_node.h          |    8 +
 source/blender/blenkernel/BKE_texture.h       |    1 +
 source/blender/blenkernel/BKE_utildefines.h   |    2 +
 source/blender/blenkernel/CMakeLists.txt      |    2 +-
 source/blender/blenkernel/SConscript          |    1 +
 .../blenkernel/bad_level_call_stubs/stubs.c   |    4 -
 .../blender/blenkernel/intern/DerivedMesh.c   |  407 ++++-
 source/blender/blenkernel/intern/Makefile     |    4 +
 source/blender/blenkernel/intern/action.c     |    2 +
 source/blender/blenkernel/intern/anim.c       |   15 +-
 source/blender/blenkernel/intern/blender.c    |   36 +-
 .../blender/blenkernel/intern/cdderivedmesh.c |  138 +-
 source/blender/blenkernel/intern/colortools.c |   21 +
 source/blender/blenkernel/intern/image.c      |   11 +-
 source/blender/blenkernel/intern/ipo.c        |   25 +-
 source/blender/blenkernel/intern/material.c   |    7 +
 source/blender/blenkernel/intern/mesh.c       |   39 -
 source/blender/blenkernel/intern/node.c       |  114 ++
 source/blender/blenkernel/intern/object.c     |    6 +-
 .../blender/blenkernel/intern/subsurf_ccg.c   |  172 +-
 source/blender/blenkernel/intern/texture.c    |   12 +
 source/blender/blenlib/BLI_arithb.h           |    1 +
 source/blender/blenlib/BLI_blenlib.h          |    1 -
 source/blender/blenlib/intern/arithb.c        |    8 +
 source/blender/blenloader/intern/readfile.c   |   11 +-
 source/blender/gpu/CMakeLists.txt             |   34 +
 source/blender/gpu/GPU_draw.h                 |  116 ++
 source/blender/gpu/GPU_extensions.h           |  144 ++
 source/blender/gpu/GPU_material.h             |  169 ++
 source/blender/gpu/Makefile                   |   37 +
 source/blender/gpu/SConscript                 |   11 +
 source/blender/gpu/intern/Makefile            |   53 +
 source/blender/gpu/intern/gpu_codegen.c       | 1439 +++++++++++++++
 source/blender/gpu/intern/gpu_codegen.h       |   87 +
 source/blender/gpu/intern/gpu_draw.c          | 1167 +++++++++++++
 source/blender/gpu/intern/gpu_extensions.c    |  987 +++++++++++
 source/blender/gpu/intern/gpu_material.c      | 1460 ++++++++++++++++
 .../gpu/intern/gpu_shader_material.glsl       | 1543 +++++++++++++++++
 .../gpu/intern/gpu_shader_material.glsl.c     | 1026 +++++++++++
 .../blender/gpu/intern/gpu_shader_vertex.glsl |   12 +
 .../gpu/intern/gpu_shader_vertex.glsl.c       |   13 +
 source/blender/include/BDR_drawmesh.h         |   43 +-
 source/blender/include/BDR_drawobject.h       |    3 +-
 source/blender/include/BDR_imagepaint.h       |    4 +-
 source/blender/include/BIF_gl.h               |   15 +-
 source/blender/include/BIF_meshtools.h        |    2 +
 source/blender/include/BSE_drawview.h         |    6 +-
 source/blender/makesdna/DNA_brush_types.h     |    4 +-
 source/blender/makesdna/DNA_group_types.h     |    2 +-
 source/blender/makesdna/DNA_image_types.h     |    4 +-
 source/blender/makesdna/DNA_ipo_types.h       |   28 +-
 source/blender/makesdna/DNA_lamp_types.h      |   16 +-
 source/blender/makesdna/DNA_material_types.h  |   11 +-
 source/blender/makesdna/DNA_object_types.h    |    2 +
 source/blender/makesdna/DNA_scene_types.h     |    2 +-
 source/blender/makesdna/DNA_userdef_types.h   |    1 +
 source/blender/makesdna/DNA_world_types.h     |    4 +-
 source/blender/nodes/CMakeLists.txt           |    2 +-
 source/blender/nodes/SConscript               |    1 +
 .../blender/nodes/intern/CMP_nodes/Makefile   |    1 +
 source/blender/nodes/intern/Makefile          |    2 +
 .../blender/nodes/intern/SHD_nodes/Makefile   |    2 +
 .../nodes/intern/SHD_nodes/SHD_camera.c       |   10 +-
 .../nodes/intern/SHD_nodes/SHD_curves.c       |   24 +-
 .../blender/nodes/intern/SHD_nodes/SHD_geom.c |   16 +-
 .../nodes/intern/SHD_nodes/SHD_hueSatVal.c    |    9 +-
 .../nodes/intern/SHD_nodes/SHD_invert.c       |    8 +-
 .../nodes/intern/SHD_nodes/SHD_mapping.c      |   17 +-
 .../nodes/intern/SHD_nodes/SHD_material.c     |   79 +-
 .../blender/nodes/intern/SHD_nodes/SHD_math.c |   43 +-
 .../nodes/intern/SHD_nodes/SHD_mixRgb.c       |   14 +-
 .../nodes/intern/SHD_nodes/SHD_normal.c       |   11 +-
 .../nodes/intern/SHD_nodes/SHD_output.c       |   16 +-
 .../blender/nodes/intern/SHD_nodes/SHD_rgb.c  |   11 +-
 .../nodes/intern/SHD_nodes/SHD_sepcombRGB.c   |   16 +-
 .../nodes/intern/SHD_nodes/SHD_squeeze.c      |    8 +-
 .../nodes/intern/SHD_nodes/SHD_texture.c      |   17 +-
 .../nodes/intern/SHD_nodes/SHD_valToRgb.c     |   20 +-
 .../nodes/intern/SHD_nodes/SHD_value.c        |    9 +-
 .../nodes/intern/SHD_nodes/SHD_vectMath.c     |   31 +-
 source/blender/nodes/intern/SHD_util.h        |    2 +
 source/blender/python/CMakeLists.txt          |    6 +-
 source/blender/python/SConscript              |    4 +
 source/blender/python/api2_2x/Blender.c       |   22 +-
 source/blender/python/api2_2x/Group.c         |   31 +
 source/blender/python/api2_2x/Image.c         |    4 +-
 source/blender/python/api2_2x/Lamp.c          |   18 +-
 source/blender/python/api2_2x/MTex.c          |   10 +-
 source/blender/python/api2_2x/Makefile        |    6 +
 source/blender/python/api2_2x/Material.c      |    3 +-
 source/blender/python/api2_2x/doc/Group.py    |    2 +
 source/blender/radiosity/CMakeLists.txt       |    2 +-
 source/blender/radiosity/SConscript           |    2 +-
 .../blender/radiosity/intern/source/Makefile  |    1 +
 .../render/intern/include/render_types.h      |    3 +-
 .../blender/render/intern/source/pipeline.c   |    2 +-
 .../blender/render/intern/source/rayshade.c   |    5 +-
 source/blender/render/intern/source/shadbuf.c |    4 +-
 .../render/intern/source/shadeoutput.c        |   16 +-
 source/blender/render/intern/source/zbuf.c    |    2 +-
 source/blender/src/CMakeLists.txt             |    2 +-
 source/blender/src/Makefile                   |    1 +
 source/blender/src/SConscript                 |    3 +-
 source/blender/src/buttons_object.c           |   33 +-
 source/blender/src/buttons_shading.c          |  138 +-
 source/blender/src/drawarmature.c             |    3 +
 source/blender/src/drawmesh.c                 |  771 +-------
 source/blender/src/drawobject.c               |  325 ++--
 source/blender/src/drawview.c                 |  279 ++-
 source/blender/src/editdeform.c               |    2 +-
 source/blender/src/editface.c                 |    7 +-
 source/blender/src/editipo_lib.c              |   10 +-
 source/blender/src/editlattice.c              |    2 +-
 source/blender/src/editmode_undo.c            |   40 +-
 source/blender/src/editview.c                 |    2 +-
 source/blender/src/header_image.c             |    6 +-
 source/blender/src/header_info.c              |  115 +-
 source/blender/src/header_view3d.c            |    2 +-
 source/blender/src/headerbuttons.c            |    7 +-
 source/blender/src/imagepaint.c               |  309 +++-
 source/blender/src/meshtools.c                |    5 +-
 source/blender/src/playanim.c                 |   20 +-
 source/blender/src/previewrender.c            |   32 +
 source/blender/src/renderwin.c                |   17 +-
 source/blender/src/sculptmode.c               |    7 +-
 source/blender/src/sequence.c                 |   12 +-
 source/blender/src/space.c                    |   51 +-
 source/blender/src/toets.c                    |    4 +-
 source/blender/src/usiblender.c               |   21 +-
 source/blender/src/verse_image.c              |    2 +-
 source/creator/CMakeLists.txt                 |    3 +
 source/creator/Makefile                       |    2 +
 source/creator/SConscript                     |    2 +-
 source/creator/creator.c                      |    8 +-
 .../BlenderRoutines/BL_KetsjiEmbedStart.cpp   |   20 +-
 .../gameengine/BlenderRoutines/CMakeLists.txt |    1 +
 .../BlenderRoutines/KX_BlenderGL.cpp          |   75 -
 .../gameengine/BlenderRoutines/KX_BlenderGL.h |    3 -
 .../BlenderRoutines/KX_BlenderRenderTools.cpp |  269 ++-
 .../BlenderRoutines/KX_BlenderRenderTools.h   |   67 +-
 source/gameengine/BlenderRoutines/Makefile    |    5 +-
 source/gameengine/BlenderRoutines/SConscript  |    5 +-
 .../Converter/BL_ArmatureObject.cpp           |   74 +-
 .../gameengine/Converter/BL_ArmatureObject.h  |    8 +-
 .../Converter/BL_BlenderDataConversion.cpp    |  140 +-
 .../Converter/BL_DeformableGameObject.cpp     |    8 +-
 .../gameengine/Converter/BL_MeshDeformer.cpp  |   89 +-
 source/gameengine/Converter/BL_MeshDeformer.h |    3 +-
 .../Converter/BL_ShapeActionActuator.cpp      |    1 -
 .../gameengine/Converter/BL_ShapeDeformer.cpp |    3 -
 .../gameengine/Converter/BL_ShapeDeformer.h   |   11 -
 .../gameengine/Converter/BL_SkinDeformer.cpp  |   47 +-
 source/gameengine/Converter/BL_SkinDeformer.h |   16 +-
 .../Converter/BL_SkinMeshObject.cpp           |   74 +-
 .../gameengine/Converter/BL_SkinMeshObject.h  |   45 +-
 source/gameengine/Converter/CMakeLists.txt    |    1 +
 .../Converter/KX_BlenderSceneConverter.cpp    |   25 +-
 .../Converter/KX_BlenderSceneConverter.h      |    2 +
 .../Converter/KX_ConvertActuators.cpp         |    2 +-
 source/gameengine/Converter/Makefile          |    1 +
 source/gameengine/Converter/SConscript        |    2 +-
 .../GamePlayer/common/CMakeLists.txt          |    2 +-
 .../GamePlayer/common/GPC_RenderTools.cpp     |  545 +++---
 .../GamePlayer/common/GPC_RenderTools.h       |  153 +-
 source/gameengine/GamePlayer/common/Makefile  |    5 +-
 .../gameengine/GamePlayer/common/SConscript   |    2 +-
 .../common/unix/GPU_PolygonMaterial.h         |    4 +-
 .../GamePlayer/ghost/CMakeLists.txt           |    1 +
 .../GamePlayer/ghost/GPG_Application.cpp      |   34 +-
 .../GamePlayer/ghost/GPG_Application.h        |    6 +-
 .../gameengine/GamePlayer/ghost/GPG_ghost.cpp |   16 +-
 source/gameengine/GamePlayer/ghost/Makefile   |    5 +-
 source/gameengine/GamePlayer/ghost/SConscript |    4 +-
 source/gameengine/Ketsji/BL_BlenderShader.cpp |  124 +-
 source/gameengine/Ketsji/BL_BlenderShader.h   |   10 +-
 source/gameengine/Ketsji/BL_Material.h        |    6 +-
 source/gameengine/Ketsji/BL_Shader.cpp        |   12 +-
 source/gameengine/Ketsji/BL_Shader.h          |    2 +-
 source/gameengine/Ketsji/CMakeLists.txt       |    1 +
 .../gameengine/Ketsji/KX_BlenderMaterial.cpp  |  126 +-
 source/gameengine/Ketsji/KX_BlenderMaterial.h |    3 +-
 .../Ketsji/KX_ConvertPhysicsObjects.cpp       |  136 +-
 source/gameengine/Ketsji/KX_GameObject.cpp    |  100 +-
 source/gameengine/Ketsji/KX_GameObject.h      |   83 +-
 source/gameengine/Ketsji/KX_ISceneConverter.h |    4 +
 source/gameengine/Ketsji/KX_KetsjiEngine.cpp  |   32 +-
 source/gameengine/Ketsji/KX_KetsjiEngine.h    |    7 +
 source/gameengine/Ketsji/KX_Light.cpp         |   57 +-
 source/gameengine/Ketsji/KX_Light.h           |   11 +-
 source/gameengine/Ketsji/KX_MeshProxy.cpp     |   13 +-
 source/gameengine/Ketsji/KX_PolyProxy.cpp     |   18 +-
 .../gameengine/Ketsji/KX_PolygonMaterial.cpp  |   50 +-
 source/gameengine/Ketsji/KX_PolygonMaterial.h |    2 -
 source/gameengine/Ketsji/KX_PythonInit.cpp    |   89 +-
 source/gameengine/Ketsji/KX_PythonInit.h      |    2 +-
 .../KX_SG_BoneParentNodeRelationship.cpp      |    2 +-
 source/gameengine/Ketsji/KX_Scene.cpp         |   31 +-
 source/gameengine/Ketsji/KX_Scene.h           |   10 +-
 source/gameengine/Ketsji/KX_VertexProxy.cpp   |   14 +-
 .../Ketsji/KX_VisibilityActuator.cpp          |    2 +-
 source/gameengine/Ketsji/Makefile             |    6 +-
 source/gameengine/Ketsji/SConscript           |    5 +-
 .../Physics/Bullet/CcdPhysicsController.cpp   |   34 +-
 .../Physics/Bullet/CcdPhysicsController.h     |    3 +-
 source/gameengine/PyDoc/GameLogic.py          |    9 +-
 source/gameengine/PyDoc/Rasterizer.py         |   17 +
 source/gameengine/Rasterizer/Makefile         |    4 -
 .../Rasterizer/RAS_BucketManager.cpp          |  267 +--
 .../gameengine/Rasterizer/RAS_BucketManager.h |   21 +-
 .../Rasterizer/RAS_IPolygonMaterial.cpp       |   25 +-
 .../Rasterizer/RAS_IPolygonMaterial.h         |    9 +-
 .../gameengine/Rasterizer/RAS_IRasterizer.h   |   42 +-
 .../Rasterizer/RAS_IRenderTools.cpp           |   24 +-
 .../gameengine/Rasterizer/RAS_IRenderTools.h  |   39 +-
 .../Rasterizer/RAS_MaterialBucket.cpp         |  592 +++++--
 .../Rasterizer/RAS_MaterialBucket.h           |  219 ++-
 .../gameengine/Rasterizer/RAS_MeshObject.cpp  |  993 +++++------
 source/gameengine/Rasterizer/RAS_MeshObject.h |  242 +--
 .../RAS_OpenGLRasterizer/CMakeLists.txt       |    1 +
 .../Rasterizer/RAS_OpenGLRasterizer/Makefile  |    5 +-
 .../RAS_ListRasterizer.cpp                    |   84 +-
 .../RAS_OpenGLRasterizer/RAS_ListRasterizer.h |   24 +-
 .../RAS_OpenGLRasterizer.cpp                  |  756 ++------
 .../RAS_OpenGLRasterizer.h                    |   46 +-
 .../RAS_VAOpenGLRasterizer.cpp                |  234 ++-
 .../RAS_VAOpenGLRasterizer.h                  |   18 +-
 .../RAS_OpenGLRasterizer/SConscript           |    5 +-
 source/gameengine/Rasterizer/RAS_Polygon.cpp  |   87 +-
 source/gameengine/Rasterizer/RAS_Polygon.h    |   56 +-
 source/gameengine/Rasterizer/RAS_TexVert.cpp  |   30 +-
 source/gameengine/Rasterizer/RAS_TexVert.h    |   28 +-
 source/gameengine/Rasterizer/SConscript       |    5 +-
 source/kernel/gen_system/GEN_Map.h            |   13 +
 source/nan_definitions.mk                     |    3 -
 tools/btools.py                               |    2 -
 258 files changed, 13813 insertions(+), 5271 deletions(-)
 create mode 100644 source/blender/gpu/CMakeLists.txt
 create mode 100644 source/blender/gpu/GPU_draw.h
 create mode 100644 source/blender/gpu/GPU_extensions.h
 create mode 100644 source/blender/gpu/GPU_material.h
 create mode 100644 source/blender/gpu/Makefile
 create mode 100644 source/blender/gpu/SConscript
 create mode 100644 source/blender/gpu/intern/Makefile
 create mode 100644 source/blender/gpu/intern/gpu_codegen.c
 create mode 100644 source/blender/gpu/intern/gpu_codegen.h
 create mode 100644 source/blender/gpu/intern/gpu_draw.c
 create mode 100644 source/blender/gpu/intern/gpu_extensions.c
 create mode 100644 source/blender/gpu/intern/gpu_material.c
 create mode 100644 source/blender/gpu/intern/gpu_shader_material.glsl
 create mode 100644 source/blender/gpu/intern/gpu_shader_material.glsl.c
 create mode 100644 source/blender/gpu/intern/gpu_shader_vertex.glsl
 create mode 100644 source/blender/gpu/intern/gpu_shader_vertex.glsl.c

diff --git a/blenderplayer/CMakeLists.txt b/blenderplayer/CMakeLists.txt
index d90639562d2..e32390466c7 100644
--- a/blenderplayer/CMakeLists.txt
+++ b/blenderplayer/CMakeLists.txt
@@ -90,6 +90,7 @@ IF(UNIX)
     bf_soundsystem 
     bf_kernel 
     bf_nodes
+	bf_gpu
     bf_imbuf
     bf_avi 
     kx_network 
diff --git a/config/darwin-config.py b/config/darwin-config.py
index 8fd6c3251ba..48455d2ce8c 100644
--- a/config/darwin-config.py
+++ b/config/darwin-config.py
@@ -143,7 +143,6 @@ BF_FTGL_LIB = 'extern_ftgl'
 
 WITH_BF_GAMEENGINE='true'
 WITH_BF_PLAYER='true'
-WITH_BF_GLEXT= '1'
 
 WITH_BF_ODE = 'false'
 BF_ODE = LIBDIR + '/ode'
diff --git a/extern/glew/SConscript b/extern/glew/SConscript
index 32b3b478113..3badbeb040e 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=['intern', 'player'], priority=[25, 50])
+env.BlenderLib ( 'extern_glew', sources, Split(incs), Split(defs), libtype=['blender', 'player'], priority=[50, 50])
diff --git a/extern/glew/include/GL/glew.h b/extern/glew/include/GL/glew.h
index fd3fe10b938..6b88e6eb4c9 100644
--- a/extern/glew/include/GL/glew.h
+++ b/extern/glew/include/GL/glew.h
@@ -58,8 +58,11 @@
 ** version 1.2.1 Specification.
 */
 
-/* added this here for blender, should be moved elsewhere */
+#define BLENDER_CHANGES
+
+#ifdef BLENDER_CHANGES
 #define GLEW_STATIC
+#endif
 
 #ifndef __glew_h__
 #define __glew_h__
@@ -1805,6 +1808,7 @@ typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4UIVPROC) (GLuint index, const GLuin
 typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4USVPROC) (GLuint index, const GLushort* v);
 typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid* pointer);
 
+#ifndef BLENDER_CHANGES
 #define glAttachShader GLEW_GET_FUN(__glewAttachShader)
 #define glBindAttribLocation GLEW_GET_FUN(__glewBindAttribLocation)
 #define glBlendEquationSeparate GLEW_GET_FUN(__glewBlendEquationSeparate)
@@ -1898,6 +1902,7 @@ typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint si
 #define glVertexAttrib4uiv GLEW_GET_FUN(__glewVertexAttrib4uiv)
 #define glVertexAttrib4usv GLEW_GET_FUN(__glewVertexAttrib4usv)
 #define glVertexAttribPointer GLEW_GET_FUN(__glewVertexAttribPointer)
+#endif
 
 #define GLEW_VERSION_2_0 GLEW_GET_VAR(__GLEW_VERSION_2_0)
 
diff --git a/extern/glew/src/glew.c b/extern/glew/src/glew.c
index 593f0e58f7c..f20463630dc 100644
--- a/extern/glew/src/glew.c
+++ b/extern/glew/src/glew.c
@@ -1836,6 +1836,7 @@ static GLboolean _glewInit_GL_VERSION_2_0 (GLEW_CONTEXT_ARG_DEF_INIT)
 {
   GLboolean r = GL_FALSE;
 
+#ifndef BLENDER_CHANGES
   r = ((glAttachShader = (PFNGLATTACHSHADERPROC)glewGetProcAddress((const GLubyte*)"glAttachShader")) == NULL) || r;
   r = ((glBindAttribLocation = (PFNGLBINDATTRIBLOCATIONPROC)glewGetProcAddress((const GLubyte*)"glBindAttribLocation")) == NULL) || r;
   r = ((glBlendEquationSeparate = (PFNGLBLENDEQUATIONSEPARATEPROC)glewGetProcAddress((const GLubyte*)"glBlendEquationSeparate")) == NULL) || r;
@@ -1929,6 +1930,7 @@ static GLboolean _glewInit_GL_VERSION_2_0 (GLEW_CONTEXT_ARG_DEF_INIT)
   r = ((glVertexAttrib4uiv = (PFNGLVERTEXATTRIB4UIVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4uiv")) == NULL) || r;
   r = ((glVertexAttrib4usv = (PFNGLVERTEXATTRIB4USVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4usv")) == NULL) || r;
   r = ((glVertexAttribPointer = (PFNGLVERTEXATTRIBPOINTERPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribPointer")) == NULL) || r;
+#endif
 
   return r;
 }
diff --git a/intern/guardedalloc/MEM_guardedalloc.h b/intern/guardedalloc/MEM_guardedalloc.h
index d004e7952cc..1d4c753802b 100644
--- a/intern/guardedalloc/MEM_guardedalloc.h
+++ b/intern/guardedalloc/MEM_guardedalloc.h
@@ -58,8 +58,8 @@
 #ifndef MEM_MALLOCN_H
 #define MEM_MALLOCN_H
 
-/* Needed for FILE* */
-#include "stdio.h"
+#include "stdio.h" /* needed for FILE* */
+#include "BLO_sys_types.h" /* needed for uintptr_t */
 
 #ifdef __cplusplus
 extern "C" {
@@ -123,6 +123,12 @@ extern "C" {
 	/** Attempt to enforce OSX (or other OS's) to have malloc and stack nonzero */
 	void MEM_set_memory_debug(void);
 
+	/* Memory usage stats
+	 * - MEM_get_memory_in_use is all memory
+	 * - MEM_get_mapped_memory_in_use is a subset of all memory */
+	uintptr_t MEM_get_memory_in_use(void);
+	uintptr_t MEM_get_mapped_memory_in_use(void);
+	int MEM_get_memory_blocks_in_use(void);
 
 #ifdef __cplusplus
 }
diff --git a/intern/guardedalloc/intern/mallocn.c b/intern/guardedalloc/intern/mallocn.c
index a36549d0cc7..7bdca7339fc 100644
--- a/intern/guardedalloc/intern/mallocn.c
+++ b/intern/guardedalloc/intern/mallocn.c
@@ -49,8 +49,6 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLO_sys_types.h" // needed for intptr_t
-
 /* --------------------------------------------------------------------- */
 /* Data definition                                                       */
 /* --------------------------------------------------------------------- */
@@ -113,8 +111,8 @@ static const char *check_memlist(MemHead *memh);
 /* --------------------------------------------------------------------- */
 	
 
-volatile int totblock= 0;
-volatile uintptr_t mem_in_use= 0, mmap_in_use= 0;
+static volatile int totblock= 0;
+static volatile uintptr_t mem_in_use= 0, mmap_in_use= 0;
 
 static volatile struct localListBase _membase;
 static volatile struct localListBase *membase = &_membase;
@@ -698,4 +696,19 @@ static const char *check_memlist(MemHead *memh)
 	return(name);
 }
 
+uintptr_t MEM_get_memory_in_use(void)
+{
+	return mem_in_use;
+}
+
+uintptr_t MEM_get_mapped_memory_in_use(void)
+{
+	return mmap_in_use;
+}
+
+int MEM_get_memory_blocks_in_use(void)
+{
+	return totblock;
+}
+
 /* eof */
diff --git a/intern/memutil/MEM_Allocator.h b/intern/memutil/MEM_Allocator.h
index d5ae94cc6b8..b2c3c5e82e2 100644
--- a/intern/memutil/MEM_Allocator.h
+++ b/intern/memutil/MEM_Allocator.h
@@ -25,6 +25,7 @@
 #define __MEM_Allocator_h_included__ 1
 
 #include "guardedalloc/MEM_guardedalloc.h"
+#include "guardedalloc/BLO_sys_types.h"
 
 #ifdef _MSC_VER
 #if _MSC_VER < 1300 // 1200 == VC++ 6.0 according to boost
diff --git a/intern/memutil/MEM_CacheLimiter.h b/intern/memutil/MEM_CacheLimiter.h
index cada06ae523..43149efc977 100644
--- a/intern/memutil/MEM_CacheLimiter.h
+++ b/intern/memutil/MEM_CacheLimiter.h
@@ -61,11 +61,8 @@ class MEM_CacheLimiter;
 
 #ifndef __MEM_cache_limiter_c_api_h_included__
 extern "C" {
-	extern void MEM_CacheLimiter_set_maximum(int m);
-	extern int MEM_CacheLimiter_get_maximum();
-        // this is rather _ugly_!
-        extern int mem_in_use;
-	extern int mmap_in_use;
+	extern void MEM_CacheLimiter_set_maximum(intptr_t m);
+	extern intptr_t MEM_CacheLimiter_get_maximum();
 };
 #endif
 
@@ -141,7 +138,10 @@ public:
 		delete handle;
 	}
 	void enforce_limits() {
-		int max = MEM_CacheLimiter_get_maximum();
+		intptr_t max = MEM_CacheLimiter_get_maximum();
+		intptr_t mem_in_use= MEM_get_memory_in_use();
+		intptr_t mmap_in_use= MEM_get_mapped_memory_in_use();
+
 		if (max == 0) {
 			return;
 		}
diff --git a/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp b/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
index 4cf0ef305d4..d998c9a3e80 100644
--- a/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
+++ b/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
@@ -27,18 +27,18 @@
 #include "MEM_CacheLimiter.h"
 #include "MEM_CacheLimiterC-Api.h"
 
-static int & get_max() 
+static intptr_t & get_max() 
 {
-	static int m = 32*1024*1024;
+	static intptr_t m = 32*1024*1024;
 	return m;
 }
 
-void MEM_CacheLimiter_set_maximum(int m)
+void MEM_CacheLimiter_set_maximum(intptr_t m)
 {
 	get_max() = m;
 }
 
-int MEM_CacheLimiter_get_maximum()
+intptr_t MEM_CacheLimiter_get_maximum()
 {
 	return get_max();
 }
diff --git a/intern/moto/include/GEN_Map.h b/intern/moto/include/GEN_Map.h
index 9f56924419e..d85e9af175b 100644
--- a/intern/moto/include/GEN_Map.h
+++ b/intern/moto/include/GEN_Map.h
@@ -50,6 +50,19 @@ public:
             m_buckets[i] = 0;
         }
     }
+
+	GEN_Map(const GEN_Map& map)
+	{
+		m_num_buckets = map.m_num_buckets;
+		m_buckets = new Entry *[m_num_buckets];
+
+		for (int i = 0; i < m_num_buckets; ++i) {
+			m_buckets[i] = 0;
+
+			for(Entry *entry = map.m_buckets[i]; entry; entry=entry->m_next)
+				insert(entry->m_key, entry->m_value);
+		}
+	}
     
     int size() { 
         int count=0;
diff --git a/intern/moto/include/MT_Matrix4x4.h b/intern/moto/include/MT_Matrix4x4.h
index 823541347b7..b4ee84a718b 100644
--- a/intern/moto/include/MT_Matrix4x4.h
+++ b/intern/moto/include/MT_Matrix4x4.h
@@ -212,6 +212,7 @@ public:
 	MT_Matrix4x4 transposed() const; 
 	void         transpose();
 
+	MT_Matrix4x4 inverse() const;
 	void         invert();
   
 protected:
diff --git a/intern/moto/include/MT_Matrix4x4.inl b/intern/moto/include/MT_Matrix4x4.inl
index a2aa893a6b3..074bd6e4b05 100644
--- a/intern/moto/include/MT_Matrix4x4.inl
+++ b/intern/moto/include/MT_Matrix4x4.inl
@@ -52,14 +52,14 @@ GEN_INLINE void MT_Matrix4x4::invert()  {
 		}
 }
 
-/* We do things slightly different here, because the invert() modifies
- * the buffer itself. This makes it impossible to make this op right
- * away. Like other, still missing facilities, I will repair this
- * later. */
-/* GEN_INLINE T_Matrix4x4 MT_Matrix4x4::inverse() const */
-/*  { */
-/*  } */
+GEN_INLINE MT_Matrix4x4 MT_Matrix4x4::inverse() const
+{
+	MT_Matrix4x4 invmat = *this;
 
+	invmat.invert();
+
+	return invmat;
+}
 
 GEN_INLINE MT_Matrix4x4& MT_Matrix4x4::operator*=(const MT_Matrix4x4& m)
 {
diff --git a/release/scripts/sysinfo.py b/release/scripts/sysinfo.py
index 9f24885829c..3a671e7221e 100644
--- a/release/scripts/sysinfo.py
+++ b/release/scripts/sysinfo.py
@@ -94,6 +94,8 @@ output = Blender.Text.New(output_filename)
 
 output.write(header + "\n\n")
 
+output.write("%s\n\n" % Blender.Get('buildinfo'))
+
 output.write("Platform: %s\n========\n\n" % sys.platform)
 
 output.write("Python:\n======\n\n")
diff --git a/source/Makefile b/source/Makefile
index 91dd17d73dd..aebeb8f30c2 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -104,6 +104,8 @@ COMLIB += $(NAN_OPENNL)/lib/$(DEBUG_DIR)libopennl.a
 COMLIB += $(NAN_SUPERLU)/lib/$(DEBUG_DIR)libsuperlu.a	
 COMLIB += $(OCGDIR)/blender/avi/$(DEBUG_DIR)libavi.a
 COMLIB += $(NAN_JPEG)/lib/libjpeg.a
+COMLIB += $(OCGDIR)/blender/gpu/$(DEBUG_DIR)libgpu.a
+COMLIB += $(NAN_GLEW)/lib/libglew.a
 
 ifneq ($(NAN_NO_KETSJI),true)
     COMLIB += $(OCGDIR)/gameengine/bloutines/$(DEBUG_DIR)libbloutines.a
@@ -157,7 +159,6 @@ COMLIB += $(NAN_BMFONT)/lib/$(DEBUG_DIR)libbmfont.a
 COMLIB += $(NAN_PNG)/lib/libpng.a
 COMLIB += $(OCGDIR)/blender/yafray/$(DEBUG_DIR)libyafrayexport.a
 COMLIB += $(OCGDIR)/blender/blenlib/$(DEBUG_DIR)libblenlib.a
-COMLIB += $(NAN_GLEW)/lib/libglew.a
 
 ifeq ($(WITH_QUICKTIME), true)
     COMLIB += $(OCGDIR)/blender/blenderqt/$(DEBUG_DIR)libblenderqt.a
diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt
index 966bf5f7be4..a21eadf15fa 100644
--- a/source/blender/CMakeLists.txt
+++ b/source/blender/CMakeLists.txt
@@ -24,7 +24,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SUBDIRS(avi nodes blenkernel blenlib blenloader blenpluginapi imbuf imbuf/intern/cineon makesdna python radiosity readblenfile render src yafray)
+SUBDIRS(avi nodes blenkernel blenlib blenloader blenpluginapi imbuf imbuf/intern/cineon gpu makesdna python radiosity readblenfile render src yafray)
 
 IF(WITH_INTERNATIONAL)
   SUBDIRS(ftfont)
diff --git a/source/blender/Makefile b/source/blender/Makefile
index 937512f34bd..52abd2cdddb 100644
--- a/source/blender/Makefile
+++ b/source/blender/Makefile
@@ -33,7 +33,7 @@ include nan_definitions.mk
 DIRS = blenloader readblenfile
 DIRS += avi imbuf render radiosity blenlib blenkernel blenpluginapi
 DIRS += makesdna src yafray
-DIRS += python nodes
+DIRS += python nodes gpu
 
 ifeq ($(WITH_FREETYPE2), true)
 	DIRS += ftfont
diff --git a/source/blender/SConscript b/source/blender/SConscript
index 56a661238f8..25745c0e51a 100644
--- a/source/blender/SConscript
+++ b/source/blender/SConscript
@@ -7,6 +7,7 @@ SConscript(['avi/SConscript',
             'blenlib/SConscript',
             'blenloader/SConscript',
             'blenpluginapi/SConscript',
+            'gpu/SConscript',
             'imbuf/SConscript',
             'imbuf/intern/cineon/SConscript',
             'makesdna/SConscript',
diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h
index 7dc10c53e22..171a73f72c4 100644
--- a/source/blender/blenkernel/BKE_DerivedMesh.h
+++ b/source/blender/blenkernel/BKE_DerivedMesh.h
@@ -55,6 +55,7 @@ struct EditMesh;
 struct ModifierData;
 struct MCol;
 struct ColorBand;
+struct GPUVertexAttribs;
 
 /* number of sub-elements each mesh element has (for interpolation) */
 #define SUB_ELEMS_VERT 0
@@ -198,7 +199,8 @@ struct DerivedMesh {
 	 *
 	 * Also called for *final* editmode DerivedMeshes
 	 */
-	void (*drawFacesSolid)(DerivedMesh *dm, int (*setMaterial)(int));
+	void (*drawFacesSolid)(DerivedMesh *dm,
+	                       int (*setMaterial)(int, void *attribs));
 
 	/* Draw all faces
 	 *  o If useTwoSided, draw front and back using col arrays
@@ -215,6 +217,13 @@ struct DerivedMesh {
 	                     int (*setDrawOptions)(struct MTFace *tface,
 	                     struct MCol *mcol, int matnr));
 
+	/* Draw all faces with GLSL materials
+	 *  o setMaterial is called for every different material nr
+	 *  o Only if setMaterial returns true
+	 */
+	void (*drawFacesGLSL)(DerivedMesh *dm,
+		int (*setMaterial)(int, void *attribs));
+
 	/* Draw mapped faces (no color, or texture)
 	 *  o Only if !setDrawOptions or
 	 *    setDrawOptions(userData, mapped-face-index, drawSmooth_r)
@@ -241,6 +250,15 @@ struct DerivedMesh {
 	                                                 int index),
 	                           void *userData);
 
+	/* Draw mapped faces with GLSL materials
+	 *  o setMaterial is called for every different material nr
+	 *  o setDrawOptions is called for every face
+	 *  o Only if setMaterial and setDrawOptions return true
+	 */
+	void (*drawMappedFacesGLSL)(DerivedMesh *dm,
+		int (*setMaterial)(int, void *attribs),
+		int (*setDrawOptions)(void *userData, int index), void *userData);
+
 	/* Draw mapped edges as lines
 	 *  o Only if !setDrawOptions or setDrawOptions(userData, mapped-edge)
 	 *    returns true
@@ -437,6 +455,35 @@ void weight_to_rgb(float input, float *fr, float *fg, float *fb);
 /* determines required DerivedMesh data according to view and edit modes */
 CustomDataMask get_viewedit_datamask();
 
+/* convert layers requested by a GLSL material to actually available layers in
+ * the DerivedMesh, with both a pointer for arrays and an offset for editmesh */
+typedef struct DMVertexAttribs {
+	struct {
+		struct MTFace *array;
+		int emOffset, glIndex;
+	} tface[MAX_MTFACE];
+
+	struct {
+		struct MCol *array;
+		int emOffset, glIndex;
+	} mcol[MAX_MCOL];
+
+	struct {
+		float (*array)[3];
+		int emOffset, glIndex;
+	} tang;
+
+	struct {
+		float (*array)[3];
+		int emOffset, glIndex;
+	} orco;
+
+	int tottface, totmcol, tottang, totorco;
+} DMVertexAttribs;
+
+void DM_vertex_attributes_from_gpu(DerivedMesh *dm,
+	struct GPUVertexAttribs *gattribs, DMVertexAttribs *attribs);
+
 void DM_add_tangent_layer(DerivedMesh *dm);
 
 #endif
diff --git a/source/blender/blenkernel/BKE_bad_level_calls.h b/source/blender/blenkernel/BKE_bad_level_calls.h
index 3e45749c26a..8dee9a27f49 100644
--- a/source/blender/blenkernel/BKE_bad_level_calls.h
+++ b/source/blender/blenkernel/BKE_bad_level_calls.h
@@ -115,10 +115,6 @@ void free_editArmature(void);
 void docenter_new(void);
 int saveover(char *str);
 
-/* image.c */
-#include "DNA_image_types.h"
-void free_realtime_image(Image *ima); // has to become a callback, opengl stuff
-
 /* ipo.c */
 void copy_view3d_lock(short val);	// was a hack, to make scene layer ipo's possible
 
diff --git a/source/blender/blenkernel/BKE_colortools.h b/source/blender/blenkernel/BKE_colortools.h
index e78882220a9..555b467b1d6 100644
--- a/source/blender/blenkernel/BKE_colortools.h
+++ b/source/blender/blenkernel/BKE_colortools.h
@@ -57,6 +57,7 @@ void				curvemapping_do_ibuf(struct CurveMapping *cumap, struct ImBuf *ibuf);
 void				curvemapping_premultiply(struct CurveMapping *cumap, int restore);
 int					curvemapping_RGBA_does_something(struct CurveMapping *cumap);
 void				curvemapping_initialize(struct CurveMapping *cumap);
+void				curvemapping_table_RGBA(struct CurveMapping *cumap, float **array, int *size);
 
 #endif
 
diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.h
index 8c9634cba06..1cc336db69e 100644
--- a/source/blender/blenkernel/BKE_global.h
+++ b/source/blender/blenkernel/BKE_global.h
@@ -218,8 +218,15 @@ typedef struct Global {
 #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_DIAPLAY_LISTS	 (1 << 13)
+#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)
 
 /* G.windowstate */
 #define G_WINDOWSTATE_USERDEF		0
diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h
index d4ae76e8984..2ca4b3aa39a 100644
--- a/source/blender/blenkernel/BKE_mesh.h
+++ b/source/blender/blenkernel/BKE_mesh.h
@@ -68,7 +68,6 @@ void mball_to_mesh(struct ListBase *lb, struct Mesh *me);
 void nurbs_to_mesh(struct Object *ob);
 void free_dverts(struct MDeformVert *dvert, int totvert);
 void copy_dverts(struct MDeformVert *dst, struct MDeformVert *src, int totvert); /* __NLA */
-int update_realtime_texture(struct MTFace *tface, double time);
 void mesh_delete_material_index(struct Mesh *me, int index);
 void mesh_set_smooth_flag(struct Object *meshOb, int enableSmooth);
 
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index b3b68a9b3ff..01c54663c6d 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -47,6 +47,9 @@ struct rctf;
 struct ListBase;
 struct RenderData;
 struct Scene;
+struct GPUMaterial;
+struct GPUNode;
+struct GPUNodeStack;
 
 #define SOCK_IN		1
 #define SOCK_OUT	2
@@ -91,6 +94,9 @@ typedef struct bNodeType {
 	void *pynode; /* holds pointer to python script */
 	void *pydict; /* holds pointer to python script dictionary (scope)*/
 
+	/* gpu */
+	int (*gpufunc)(struct GPUMaterial *mat, struct bNode *node, struct GPUNodeStack *in, struct GPUNodeStack *out);
+
 } bNodeType;
 
 /* node->exec, now in use for composites (#define for break is same as ready yes) */
@@ -252,6 +258,8 @@ void			nodeShaderSynchronizeID(struct bNode *node, int copyto);
 extern void (*node_shader_lamp_loop)(struct ShadeInput *, struct ShadeResult *);
 void			set_node_shader_lamp_loop(void (*lamp_loop_func)(struct ShadeInput *, struct ShadeResult *));
 
+void			ntreeGPUMaterialNodes(struct bNodeTree *ntree, struct GPUMaterial *mat);
+
 
 /* ************** COMPOSITE NODES *************** */
 
diff --git a/source/blender/blenkernel/BKE_texture.h b/source/blender/blenkernel/BKE_texture.h
index c162a04e055..cfcae3c44bc 100644
--- a/source/blender/blenkernel/BKE_texture.h
+++ b/source/blender/blenkernel/BKE_texture.h
@@ -53,6 +53,7 @@ void free_plugin_tex(struct PluginTex *pit);
 void init_colorband(struct ColorBand *coba, int rangetype);
 struct ColorBand *add_colorband(int rangetype);
 int do_colorband(struct ColorBand *coba, float in, float out[4]);
+void colorband_table_RGBA(struct ColorBand *coba, float **array, int *size);
 
 void default_tex(struct Tex *tex);
 struct Tex *add_texture(char *name);
diff --git a/source/blender/blenkernel/BKE_utildefines.h b/source/blender/blenkernel/BKE_utildefines.h
index f389521ffa0..d647a74c6e2 100644
--- a/source/blender/blenkernel/BKE_utildefines.h
+++ b/source/blender/blenkernel/BKE_utildefines.h
@@ -55,6 +55,8 @@
 #define ELEM7(a, b, c, d, e, f, g, h)   ( ELEM3(a, b, c, d) || ELEM4(a, e, f, g, h) )
 #define ELEM8(a, b, c, d, e, f, g, h, i)        ( ELEM4(a, b, c, d, e) || ELEM4(a, f, g, h, i) )
 #define ELEM9(a, b, c, d, e, f, g, h, i, j)        ( ELEM4(a, b, c, d, e) || ELEM5(a, f, g, h, i, j) )
+#define ELEM10(a, b, c, d, e, f, g, h, i, j, k)        ( ELEM4(a, b, c, d, e) || ELEM6(a, f, g, h, i, j, k) )
+#define ELEM11(a, b, c, d, e, f, g, h, i, j, k, l)        ( ELEM4(a, b, c, d, e) || ELEM7(a, f, g, h, i, j, k, l) )
 
 /* shift around elements */
 #define SHIFT3(type, a, b, c) { type tmp; tmp = a; a = c; c = b; b = tmp; }
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 9088b410e27..0345711c9c3 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 ../quicktime
   ../../../intern/bmfont ../../../extern/bullet2/src
-  ../nodes
+  ../nodes ../../../extern/glew/include ../gpu
   ${SDL_INC}
   ${ZLIB_INC}
   ${PYTHON_INC}
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript
index 1bb98239a68..db67251f44e 100644
--- a/source/blender/blenkernel/SConscript
+++ b/source/blender/blenkernel/SConscript
@@ -10,6 +10,7 @@ incs += ' #/intern/iksolver/extern ../blenloader ../quicktime'
 incs += ' #/extern/bullet2/src'
 incs += ' #/intern/bmfont'
 incs += ' #/intern/opennl/extern'
+incs += ' ../gpu #/extern/glew/include'
 
 incs += ' ' + env['BF_PYTHON_INC']
 incs += ' ' + env['BF_OPENGL_INC']
diff --git a/source/blender/blenkernel/bad_level_call_stubs/stubs.c b/source/blender/blenkernel/bad_level_call_stubs/stubs.c
index 561d8d7c2a6..4b6cb5e0999 100644
--- a/source/blender/blenkernel/bad_level_call_stubs/stubs.c
+++ b/source/blender/blenkernel/bad_level_call_stubs/stubs.c
@@ -176,10 +176,6 @@ void free_editMesh(struct EditMesh *em){}
 void docenter_new(void){}
 int saveover(char *str){ return 0;}
 
-/* image.c */
-#include "DNA_image_types.h"
-void free_realtime_image(Image *ima){} // has to become a callback, opengl stuff
-
 /* ipo.c */
 void copy_view3d_lock(short val){}	// was a hack, to make scene layer ipo's possible
 
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 1dabab98a6e..328dcada01a 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -88,6 +88,10 @@
 #include "BIF_gl.h"
 #include "BIF_glutil.h"
 
+#include "GPU_draw.h"
+#include "GPU_extensions.h"
+#include "GPU_material.h"
+
 // headers for fluidsim bobj meshes
 #include <stdlib.h>
 #include "LBM_fluidsim.h"
@@ -411,6 +415,8 @@ void DM_swap_face_data(DerivedMesh *dm, int index, int *corner_indices)
 	CustomData_swap(&dm->faceData, index, corner_indices);
 }
 
+///
+
 static DerivedMesh *getMeshDerivedMesh(Mesh *me, Object *ob, float (*vertCos)[3])
 {
 	DerivedMesh *dm = CDDM_from_mesh(me, ob);
@@ -894,6 +900,162 @@ static void emDM_drawMappedFacesTex(DerivedMesh *dm, int (*setDrawOptions)(void
 	emDM_drawFacesTex_common(dm, NULL, setDrawOptions, userData);
 }
 
+static void emDM_drawMappedFacesGLSL(DerivedMesh *dm,
+               int (*setMaterial)(int, void *attribs),
+               int (*setDrawOptions)(void *userData, int index), void *userData) 
+{
+	EditMeshDerivedMesh *emdm= (EditMeshDerivedMesh*) dm;
+	EditMesh *em= emdm->em;
+	float (*vertexCos)[3]= emdm->vertexCos;
+	float (*vertexNos)[3]= emdm->vertexNos;
+	EditVert *eve;
+	EditFace *efa;
+	DMVertexAttribs attribs;
+	GPUVertexAttribs gattribs;
+	MTFace *tf;
+	int transp, new_transp, orig_transp, tfoffset;
+	int i, b, matnr, new_matnr, dodraw, layer;
+
+	dodraw = 0;
+	matnr = -1;
+
+	transp = GPU_get_material_blend_mode();
+	orig_transp = transp;
+	layer = CustomData_get_layer_index(&em->fdata, CD_MTFACE);
+	tfoffset = (layer == -1)? -1: em->fdata.layers[layer].offset;
+
+	memset(&attribs, 0, sizeof(attribs));
+
+	/* always use smooth shading even for flat faces, else vertex colors wont interpolate */
+	glShadeModel(GL_SMOOTH);
+
+	for (i=0,eve=em->verts.first; eve; eve= eve->next)
+		eve->tmp.l = (long) i++;
+
+#define PASSATTRIB(efa, eve, vert) {											\
+	if(attribs.totorco) {														\
+		float *orco = attribs.orco.array[eve->tmp.l];							\
+		glVertexAttrib3fvARB(attribs.orco.glIndex, orco);						\
+	}																			\
+	for(b = 0; b < attribs.tottface; b++) {										\
+		MTFace *tf = (MTFace*)((char*)efa->data + attribs.tface[b].emOffset);	\
+		glVertexAttrib2fvARB(attribs.tface[b].glIndex, tf->uv[vert]);			\
+	}																			\
+	for(b = 0; b < attribs.totmcol; b++) {										\
+		MCol *cp = (MCol*)((char*)efa->data + attribs.mcol[b].emOffset);		\
+		GLubyte col[4];															\
+		col[0]= cp->b; col[1]= cp->g; col[2]= cp->r; col[3]= cp->a;				\
+		glVertexAttrib4ubvARB(attribs.mcol[b].glIndex, col);					\
+	}																			\
+	if(attribs.tottang) {														\
+		float *tang = attribs.tang.array[i*4 + vert];							\
+		glVertexAttrib3fvARB(attribs.tang.glIndex, tang);						\
+	}																			\
+}
+
+	for (i=0,efa= em->faces.first; efa; i++,efa= efa->next) {
+		int drawSmooth= (efa->flag & ME_SMOOTH);
+
+		if(setDrawOptions && !setDrawOptions(userData, i))
+			continue;
+
+		new_matnr = efa->mat_nr + 1;
+		if(new_matnr != matnr) {
+			dodraw = setMaterial(matnr = new_matnr, &gattribs);
+			if(dodraw)
+				DM_vertex_attributes_from_gpu(dm, &gattribs, &attribs);
+		}
+
+		if(tfoffset != -1) {
+			tf = (MTFace*)((char*)efa->data)+tfoffset;
+			new_transp = tf->transp;
+
+			if(new_transp != transp) {
+				if(new_transp == GPU_BLEND_SOLID && orig_transp != GPU_BLEND_SOLID)
+					GPU_set_material_blend_mode(orig_transp);
+				else
+					GPU_set_material_blend_mode(new_transp);
+				transp = new_transp;
+			}
+		}
+
+		if(dodraw) {
+			glBegin(efa->v4?GL_QUADS:GL_TRIANGLES);
+			if (!drawSmooth) {
+				if(vertexCos) glNormal3fv(emdm->faceNos[i]);
+				else glNormal3fv(efa->n);
+
+				PASSATTRIB(efa, efa->v1, 0);
+				if(vertexCos) glVertex3fv(vertexCos[(int) efa->v1->tmp.l]);
+				else glVertex3fv(efa->v1->co);
+
+				PASSATTRIB(efa, efa->v2, 1);
+				if(vertexCos) glVertex3fv(vertexCos[(int) efa->v2->tmp.l]);
+				else glVertex3fv(efa->v2->co);
+
+				PASSATTRIB(efa, efa->v3, 2);
+				if(vertexCos) glVertex3fv(vertexCos[(int) efa->v3->tmp.l]);
+				else glVertex3fv(efa->v3->co);
+
+				if(efa->v4) {
+					PASSATTRIB(efa, efa->v4, 3);
+					if(vertexCos) glVertex3fv(vertexCos[(int) efa->v4->tmp.l]);
+					else glVertex3fv(efa->v4->co);
+				}
+			} else {
+				PASSATTRIB(efa, efa->v1, 0);
+				if(vertexCos) {
+					glNormal3fv(vertexNos[(int) efa->v1->tmp.l]);
+					glVertex3fv(vertexCos[(int) efa->v1->tmp.l]);
+				}
+				else {
+					glNormal3fv(efa->v1->no);
+					glVertex3fv(efa->v1->co);
+				}
+
+				PASSATTRIB(efa, efa->v2, 1);
+				if(vertexCos) {
+					glNormal3fv(vertexNos[(int) efa->v2->tmp.l]);
+					glVertex3fv(vertexCos[(int) efa->v2->tmp.l]);
+				}
+				else {
+					glNormal3fv(efa->v2->no);
+					glVertex3fv(efa->v2->co);
+				}
+
+				PASSATTRIB(efa, efa->v3, 2);
+				if(vertexCos) {
+					glNormal3fv(vertexNos[(int) efa->v3->tmp.l]);
+					glVertex3fv(vertexCos[(int) efa->v3->tmp.l]);
+				}
+				else {
+					glNormal3fv(efa->v3->no);
+					glVertex3fv(efa->v3->co);
+				}
+
+				if(efa->v4) {
+					PASSATTRIB(efa, efa->v4, 3);
+					if(vertexCos) {
+						glNormal3fv(vertexNos[(int) efa->v4->tmp.l]);
+						glVertex3fv(vertexCos[(int) efa->v4->tmp.l]);
+					}
+					else {
+						glNormal3fv(efa->v4->no);
+						glVertex3fv(efa->v4->co);
+					}
+				}
+			}
+			glEnd();
+		}
+	}
+}
+
+static void emDM_drawFacesGLSL(DerivedMesh *dm,
+               int (*setMaterial)(int, void *attribs))
+{
+	dm->drawMappedFacesGLSL(dm, setMaterial, NULL, NULL);
+}
+
 static void emDM_getMinMax(DerivedMesh *dm, float min_r[3], float max_r[3])
 {
 	EditMeshDerivedMesh *emdm= (EditMeshDerivedMesh*) dm;
@@ -1099,6 +1261,43 @@ void emDM_copyFaceArray(DerivedMesh *dm, MFace *face_r)
 	}
 }
 
+static void *emDM_getFaceDataArray(DerivedMesh *dm, int type)
+{
+	EditMeshDerivedMesh *emdm= (EditMeshDerivedMesh*) dm;
+	EditMesh *em= emdm->em;
+	EditFace *efa;
+	char *data, *emdata;
+	void *datalayer;
+	int index, offset, size;
+
+	datalayer = DM_get_face_data_layer(dm, type);
+	if(datalayer)
+		return datalayer;
+
+	/* layers are store per face for editmesh, we convert to a temporary
+	 * data layer array in the derivedmesh when these are requested */
+	if(type == CD_MTFACE || type == CD_MCOL) {
+		index = CustomData_get_layer_index(&em->fdata, type);
+
+		if(index != -1) {
+			offset = em->fdata.layers[index].offset;
+			size = CustomData_sizeof(type);
+
+			DM_add_face_layer(dm, type, CD_CALLOC, NULL);
+			index = CustomData_get_layer_index(&dm->faceData, type);
+			dm->faceData.layers[index].flag |= CD_FLAG_TEMPORARY;
+
+			data = datalayer = DM_get_face_data_layer(dm, type);
+			for(efa=em->faces.first; efa; efa=efa->next, data+=size) {
+				emdata = CustomData_em_get(&em->fdata, efa->data, type);
+				memcpy(data, emdata, size);
+			}
+		}
+	}
+
+	return datalayer;
+}
+
 static void emDM_release(DerivedMesh *dm)
 {
 	EditMeshDerivedMesh *emdm= (EditMeshDerivedMesh*) dm;
@@ -1134,6 +1333,7 @@ static DerivedMesh *getEditMeshDerivedMesh(EditMesh *em, Object *ob,
 	emdm->dm.copyVertArray = emDM_copyVertArray;
 	emdm->dm.copyEdgeArray = emDM_copyEdgeArray;
 	emdm->dm.copyFaceArray = emDM_copyFaceArray;
+	emdm->dm.getFaceDataArray = emDM_getFaceDataArray;
 
 	emdm->dm.foreachMappedVert = emDM_foreachMappedVert;
 	emdm->dm.foreachMappedEdge = emDM_foreachMappedEdge;
@@ -1144,7 +1344,9 @@ static DerivedMesh *getEditMeshDerivedMesh(EditMesh *em, Object *ob,
 	emdm->dm.drawMappedEdgesInterp = emDM_drawMappedEdgesInterp;
 	emdm->dm.drawMappedFaces = emDM_drawMappedFaces;
 	emdm->dm.drawMappedFacesTex = emDM_drawMappedFacesTex;
+	emdm->dm.drawMappedFacesGLSL = emDM_drawMappedFacesGLSL;
 	emdm->dm.drawFacesTex = emDM_drawFacesTex;
+	emdm->dm.drawFacesGLSL = emDM_drawFacesGLSL;
 	emdm->dm.drawUVEdges = emDM_drawUVEdges;
 
 	emdm->dm.release = emDM_release;
@@ -1574,7 +1776,7 @@ static void vDM_drawUVEdges(DerivedMesh *dm)
 }
 
 /* draw all VerseFaces */
-static void vDM_drawFacesSolid(DerivedMesh *dm, int (*setMaterial)(int))
+static void vDM_drawFacesSolid(DerivedMesh *dm, int (*setMaterial)(int, void *attribs))
 {
 	VDerivedMesh *vdm = (VDerivedMesh*)dm;
 	struct VerseFace *vface;
@@ -1674,6 +1876,8 @@ static void vDM_drawMappedFacesTex(
 		int (*setDrawParams)(void *userData, int index),
 		void *userData)
 {
+	/* not supported yet */
+	vDM_drawFacesTex(dm, NULL);
 }
 
 /**/
@@ -1815,19 +2019,23 @@ CustomDataMask get_viewedit_datamask()
 	ScrArea *sa;
 
 	/* check if we need tfaces & mcols due to face select or texture paint */
-	if(FACESEL_PAINT_TEST || G.f & G_TEXTUREPAINT) {
+	if(FACESEL_PAINT_TEST || G.f & G_TEXTUREPAINT)
 		mask |= CD_MASK_MTFACE | CD_MASK_MCOL;
-	} else {
-		/* check if we need tfaces & mcols due to view mode */
-		for(sa = G.curscreen->areabase.first; sa; sa = sa->next) {
-			if(sa->spacetype == SPACE_VIEW3D) {
-				View3D *view = sa->spacedata.first;
-				if(view->drawtype == OB_SHADED) {
-					/* this includes normals for mesh_create_shadedColors */
-					mask |= CD_MASK_MTFACE | CD_MASK_MCOL | CD_MASK_NORMAL | CD_MASK_ORCO;
-				}
-				if((view->drawtype == OB_TEXTURE) || ((view->drawtype == OB_SOLID) && (view->flag2 & V3D_SOLID_TEX))) {
-					mask |= CD_MASK_MTFACE | CD_MASK_MCOL;
+
+	/* check if we need tfaces & mcols due to view mode */
+	for(sa = G.curscreen->areabase.first; sa; sa = sa->next) {
+		if(sa->spacetype == SPACE_VIEW3D) {
+			View3D *view = sa->spacedata.first;
+			if(view->drawtype == OB_SHADED) {
+				/* this includes normals for mesh_create_shadedColors */
+				mask |= CD_MASK_MTFACE | CD_MASK_MCOL | CD_MASK_NORMAL | CD_MASK_ORCO;
+			}
+			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)) {
+					mask |= CD_MASK_ORCO;
 				}
 			}
 		}
@@ -1840,13 +2048,41 @@ CustomDataMask get_viewedit_datamask()
 	return mask;
 }
 
-static DerivedMesh *create_orco_dm(Object *ob, Mesh *me)
+static float *get_editmesh_orco_verts(EditMesh *em)
+{
+	EditVert *eve;
+	float *orco;
+	int a, totvert;
+
+	/* these may not really be the orco's, but it's only for preview.
+	 * could be solver better once, but isn't simple */
+
+	totvert= 0;
+	for(eve=em->verts.first; eve; eve=eve->next)
+		totvert++;
+	
+	orco = MEM_mallocN(sizeof(float)*3*totvert, "EditMesh Orco");
+
+	for(a=0, eve=em->verts.first; eve; eve=eve->next, a+=3)
+		VECCOPY(orco+a, eve->co);
+	
+	return orco;
+}
+
+static DerivedMesh *create_orco_dm(Object *ob, Mesh *me, EditMesh *em)
 {
 	DerivedMesh *dm;
 	float (*orco)[3];
 
-	dm= CDDM_from_mesh(me, ob);
-	orco= (float(*)[3])get_mesh_orco_verts(ob);
+	if(em) {
+		dm= CDDM_from_editmesh(em, me);
+		orco= (float(*)[3])get_editmesh_orco_verts(em);
+	}
+	else {
+		dm= CDDM_from_mesh(me, ob);
+		orco= (float(*)[3])get_mesh_orco_verts(ob);
+	}
+
 	CDDM_apply_vert_coords(dm, orco);
 	CDDM_calc_normals(dm);
 	MEM_freeN(orco);
@@ -1854,7 +2090,7 @@ static DerivedMesh *create_orco_dm(Object *ob, Mesh *me)
 	return dm;
 }
 
-static void add_orco_dm(Object *ob, DerivedMesh *dm, DerivedMesh *orcodm)
+static void add_orco_dm(Object *ob, EditMesh *em, DerivedMesh *dm, DerivedMesh *orcodm)
 {
 	float (*orco)[3], (*layerorco)[3];
 	int totvert;
@@ -1869,8 +2105,10 @@ static void add_orco_dm(Object *ob, DerivedMesh *dm, DerivedMesh *orcodm)
 		else
 			dm->getVertCos(dm, orco);
 	}
-	else
-		orco= (float(*)[3])get_mesh_orco_verts(ob);
+	else {
+		if(em) orco= (float(*)[3])get_editmesh_orco_verts(em);
+		else orco= (float(*)[3])get_mesh_orco_verts(ob);
+	}
 
 	transform_mesh_orco_verts(ob->data, orco, totvert, 0);
 
@@ -2016,7 +2254,7 @@ static void mesh_calc_modifiers(Object *ob, float (*inputVertexCos)[3],
 		if(dm && mti->requiredDataMask) {
 			mask = mti->requiredDataMask(md);
 			if(mask & CD_MASK_ORCO)
-				add_orco_dm(ob, dm, orcodm);
+				add_orco_dm(ob, NULL, dm, orcodm);
 		}
 
 		/* How to apply modifier depends on (a) what we already have as
@@ -2069,7 +2307,7 @@ static void mesh_calc_modifiers(Object *ob, float (*inputVertexCos)[3],
 			mask= (CustomDataMask)curr->link;
 			if(mask & CD_MASK_ORCO) {
 				if(!orcodm)
-					orcodm= create_orco_dm(ob, me);
+					orcodm= create_orco_dm(ob, me, NULL);
 
 				mask &= ~CD_MASK_ORCO;
 				DM_set_only_copy(orcodm, mask);
@@ -2146,10 +2384,10 @@ static void mesh_calc_modifiers(Object *ob, float (*inputVertexCos)[3],
 
 	/* add an orco layer if needed */
 	if(dataMask & CD_MASK_ORCO) {
-		add_orco_dm(ob, finaldm, orcodm);
+		add_orco_dm(ob, NULL, finaldm, orcodm);
 
 		if(deform_r && *deform_r)
-			add_orco_dm(ob, *deform_r, NULL);
+			add_orco_dm(ob, NULL, *deform_r, NULL);
 	}
 
 	*final_r = finaldm;
@@ -2205,7 +2443,8 @@ static void editmesh_calc_modifiers(DerivedMesh **cage_r,
 	EditMesh *em = G.editMesh;
 	ModifierData *md;
 	float (*deformedVerts)[3] = NULL;
-	DerivedMesh *dm;
+	CustomDataMask mask;
+	DerivedMesh *dm, *orcodm = NULL;
 	int i, numVerts = 0, cageIndex = modifiers_getCageIndex(ob, NULL);
 	LinkNode *datamasks, *curr;
 
@@ -2230,6 +2469,13 @@ static void editmesh_calc_modifiers(DerivedMesh **cage_r,
 		if(!editmesh_modifier_is_enabled(md, dm))
 			continue;
 
+		/* add an orco layer if needed by this modifier */
+		if(dm && mti->requiredDataMask) {
+			mask = mti->requiredDataMask(md);
+			if(mask & CD_MASK_ORCO)
+				add_orco_dm(ob, em, dm, orcodm);
+		}
+
 		/* How to apply modifier depends on (a) what we already have as
 		 * a result of previous modifiers (could be a DerivedMesh or just
 		 * deformed vertices) and (b) what type the modifier is.
@@ -2280,6 +2526,23 @@ static void editmesh_calc_modifiers(DerivedMesh **cage_r,
 				}
 			}
 
+			/* create an orco derivedmesh in parallel */
+			mask= (CustomDataMask)curr->link;
+			if(mask & CD_MASK_ORCO) {
+				if(!orcodm)
+					orcodm= create_orco_dm(ob, ob->data, em);
+
+				mask &= ~CD_MASK_ORCO;
+				DM_set_only_copy(orcodm, mask);
+				ndm = mti->applyModifierEM(md, ob, em, orcodm);
+
+				if(ndm) {
+					/* if the modifier returned a new dm, release the old one */
+					if(orcodm && orcodm != ndm) orcodm->release(orcodm);
+					orcodm = ndm;
+				}
+			}
+
 			/* set the DerivedMesh to only copy needed data */
 			DM_set_only_copy(dm, (CustomDataMask)curr->link);
 
@@ -2338,6 +2601,13 @@ static void editmesh_calc_modifiers(DerivedMesh **cage_r,
 		deformedVerts = NULL;
 	}
 
+	/* add an orco layer if needed */
+	if(dataMask & CD_MASK_ORCO)
+		add_orco_dm(ob, em, *final_r, orcodm);
+
+	if(orcodm)
+		orcodm->release(orcodm);
+
 	if(deformedVerts)
 		MEM_freeN(deformedVerts);
 }
@@ -2632,7 +2902,7 @@ void multires_render_final(Object *ob, Mesh *me, DerivedMesh **dm, float *vert_c
 			old->release(old);
 
 			if(dataMask & CD_MASK_ORCO)
-				add_orco_dm(ob, *dm, NULL);
+				add_orco_dm(ob, NULL, *dm, NULL);
 
 			/* Restore the original verts */
 			me->mr->newlvl= BLI_countlist(&me->mr->levels);
@@ -2847,6 +3117,8 @@ int editmesh_get_first_deform_matrices(float (**deformmats)[3][3], float (**defo
 	return numleft;
 }
 
+/* ******************* GLSL ******************** */
+
 void DM_add_tangent_layer(DerivedMesh *dm)
 {
 	/* mesh vars */
@@ -2967,6 +3239,91 @@ void DM_add_tangent_layer(DerivedMesh *dm)
 	MEM_freeN(vtangents);
 }
 
+void DM_vertex_attributes_from_gpu(DerivedMesh *dm, GPUVertexAttribs *gattribs, DMVertexAttribs *attribs)
+{
+	CustomData *vdata, *fdata, *tfdata = NULL;
+	int a, b, layer;
+
+	/* From the layers requested by the GLSL shader, figure out which ones are
+	 * actually available for this derivedmesh, and retrieve the pointers */
+
+	memset(attribs, 0, sizeof(DMVertexAttribs));
+
+	vdata = &dm->vertData;
+	fdata = &dm->faceData;
+
+	/* ugly hack, editmesh derivedmesh doesn't copy face data, this way we
+	 * can use offsets instead */
+	if(dm->release == emDM_release)
+		tfdata = &((EditMeshDerivedMesh*)dm)->em->fdata;
+	else
+		tfdata = fdata;
+
+	/* add a tangent layer if necessary */
+	for(b = 0; b < gattribs->totlayer; b++)
+		if(gattribs->layer[b].type == CD_TANGENT)
+			if(CustomData_get_layer_index(fdata, CD_TANGENT) == -1)
+				DM_add_tangent_layer(dm);
+
+	for(b = 0; b < gattribs->totlayer; b++) {
+		if(gattribs->layer[b].type == CD_MTFACE) {
+			/* uv coordinates */
+			if(gattribs->layer[b].name[0])
+				layer = CustomData_get_named_layer_index(tfdata, CD_MTFACE,
+					gattribs->layer[b].name);
+			else
+				layer = CustomData_get_active_layer_index(tfdata, CD_MTFACE);
+
+			if(layer != -1) {
+				a = attribs->tottface++;
+
+				attribs->tface[a].array = tfdata->layers[layer].data;
+				attribs->tface[a].emOffset = tfdata->layers[layer].offset;
+				attribs->tface[a].glIndex = gattribs->layer[b].glindex;
+			}
+		}
+		else if(gattribs->layer[b].type == CD_MCOL) {
+			/* vertex colors */
+			if(gattribs->layer[b].name[0])
+				layer = CustomData_get_named_layer_index(tfdata, CD_MCOL,
+					gattribs->layer[b].name);
+			else
+				layer = CustomData_get_active_layer_index(tfdata, CD_MCOL);
+
+			if(layer != -1) {
+				a = attribs->totmcol++;
+
+				attribs->mcol[a].array = tfdata->layers[layer].data;
+				attribs->mcol[a].emOffset = tfdata->layers[layer].offset;
+				attribs->mcol[a].glIndex = gattribs->layer[b].glindex;
+			}
+		}
+		else if(gattribs->layer[b].type == CD_TANGENT) {
+			/* tangents */
+			layer = CustomData_get_layer_index(fdata, CD_TANGENT);
+
+			if(layer != -1) {
+				attribs->tottang = 1;
+
+				attribs->tang.array = fdata->layers[layer].data;
+				attribs->tang.emOffset = fdata->layers[layer].offset;
+				attribs->tang.glIndex = gattribs->layer[b].glindex;
+			}
+		}
+		else if(gattribs->layer[b].type == CD_ORCO) {
+			/* original coordinates */
+			layer = CustomData_get_layer_index(vdata, CD_ORCO);
+
+			if(layer != -1) {
+				attribs->totorco = 1;
+
+				attribs->orco.array = vdata->layers[layer].data;
+				attribs->orco.emOffset = vdata->layers[layer].offset;
+				attribs->orco.glIndex = gattribs->layer[b].glindex;
+			}
+		}
+	}
+}
 
 /* ************************* fluidsim bobj file handling **************************** */
 
diff --git a/source/blender/blenkernel/intern/Makefile b/source/blender/blenkernel/intern/Makefile
index 74c6c551a83..8921ea5d3b7 100644
--- a/source/blender/blenkernel/intern/Makefile
+++ b/source/blender/blenkernel/intern/Makefile
@@ -36,6 +36,7 @@ include nan_compile.mk
 CFLAGS += $(LEVEL_1_C_WARNINGS)
 
 # OpenGL and Python
+CPPFLAGS += -I$(NAN_GLEW)/include
 CPPFLAGS += -I$(OPENGL_HEADERS)
 CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
 
@@ -74,6 +75,9 @@ CPPFLAGS += -I$(NAN_ZLIB)/include
 #path to nodes
 CPPFLAGS += -I../../nodes
 
+#path to gpu
+CPPFLAGS += -I../../gpu
+
 # path to our own external headerfiles
 CPPFLAGS += -I..
 
diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c
index 5b96bf11056..2648233aca5 100644
--- a/source/blender/blenkernel/intern/action.c
+++ b/source/blender/blenkernel/intern/action.c
@@ -347,6 +347,8 @@ static void copy_pose_channel_data(bPoseChannel *pchan, const bPoseChannel *chan
 	VECCOPY(pchan->loc, chan->loc);
 	VECCOPY(pchan->size, chan->size);
 	QUATCOPY(pchan->quat, chan->quat);
+	Mat4CpyMat4(pchan->chan_mat, (float(*)[4])chan->chan_mat);
+	Mat4CpyMat4(pchan->pose_mat, (float(*)[4])chan->pose_mat);
 	pchan->flag= chan->flag;
 	
 	con= chan->constraints.first;
diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c
index 1592c3e5504..e2ce4b9f6f3 100644
--- a/source/blender/blenkernel/intern/anim.c
+++ b/source/blender/blenkernel/intern/anim.c
@@ -303,7 +303,7 @@ static void group_duplilist(ListBase *lb, Object *ob, int level, int animated)
 	DupliObject *dob;
 	Group *group;
 	GroupObject *go;
-	float mat[4][4];
+	float mat[4][4], tmat[4][4];
 	
 	if(ob->dup_group==NULL) return;
 	group= ob->dup_group;
@@ -320,7 +320,15 @@ static void group_duplilist(ListBase *lb, Object *ob, int level, int animated)
 		/* note, if you check on layer here, render goes wrong... it still deforms verts and uses parent imat */
 		if(go->ob!=ob) {
 			
-			Mat4MulMat4(mat, go->ob->obmat, ob->obmat);
+			/* Group Dupli Offset, should apply after everything else */
+			if (group->dupli_ofs[0] || group->dupli_ofs[1] || group->dupli_ofs[2]) {
+				Mat4CpyMat4(tmat, go->ob->obmat);
+				VecSubf(tmat[3], tmat[3], group->dupli_ofs);
+				Mat4MulMat4(mat, tmat, ob->obmat);
+			} else {
+				Mat4MulMat4(mat, go->ob->obmat, ob->obmat);
+			}
+			
 			dob= new_dupli_object(lb, go->ob, mat, ob->lay, 0, OB_DUPLIGROUP, animated);
 			dob->no_draw= (dob->origlay & group->layer)==0;
 			
@@ -1059,7 +1067,8 @@ static void object_duplilist_recursive(ID *id, Object *ob, ListBase *duplilist,
 	}
 }
 
-/* note; group dupli's already set transform matrix. see note in group_duplilist() */
+/* Returns a list of DupliObject
+ * note; group dupli's already set transform matrix. see note in group_duplilist() */
 ListBase *object_duplilist(Scene *sce, Object *ob)
 {
 	ListBase *duplilist= MEM_mallocN(sizeof(ListBase), "duplilist");
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c
index aca51e56c6e..1fe6447752e 100644
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@ -525,6 +525,7 @@ typedef struct UndoElem {
 	char str[FILE_MAXDIR+FILE_MAXFILE];
 	char name[MAXUNDONAME];
 	MemFile memfile;
+	uintptr_t undosize;
 } UndoElem;
 
 static ListBase undobase={NULL, NULL};
@@ -555,6 +556,7 @@ static int read_undosave(UndoElem *uel)
 /* name can be a dynamic string */
 void BKE_write_undo(char *name)
 {
+	uintptr_t maxmem, totmem, memused;
 	int nr, success;
 	UndoElem *uel;
 	
@@ -616,8 +618,36 @@ void BKE_write_undo(char *name)
 		
 		if(curundo->prev) prevfile= &(curundo->prev->memfile);
 		
+		memused= MEM_get_memory_in_use();
 		success= BLO_write_file_mem(prevfile, &curundo->memfile, G.fileflags, &err);
-		
+		curundo->undosize= MEM_get_memory_in_use() - memused;
+	}
+
+	if(U.undomemory != 0) {
+		/* limit to maximum memory (afterwards, we can't know in advance) */
+		totmem= 0;
+		maxmem= ((uintptr_t)U.undomemory)*1024*1024;
+
+		/* keep at least two (original + other) */
+		uel= undobase.last;
+		while(uel && uel->prev) {
+			totmem+= uel->undosize;
+			if(totmem>maxmem) break;
+			uel= uel->prev;
+		}
+
+		if(uel) {
+			if(uel->prev && uel->prev->prev)
+				uel= uel->prev;
+
+			while(undobase.first!=uel) {
+				UndoElem *first= undobase.first;
+				BLI_remlink(&undobase, first);
+				/* the merge is because of compression */
+				BLO_merge_memfile(&first->memfile, &first->next->memfile);
+				MEM_freeN(first);
+			}
+		}
 	}
 }
 
@@ -683,14 +713,14 @@ char *BKE_undo_menu_string(void)
 	UndoElem *uel;
 	DynStr *ds= BLI_dynstr_new();
 	char *menu;
-	
+
 	BLI_dynstr_append(ds, "Global Undo History %t");
 	
 	for(uel= undobase.first; uel; uel= uel->next) {
 		BLI_dynstr_append(ds, "|");
 		BLI_dynstr_append(ds, uel->name);
 	}
-	
+
 	menu= BLI_dynstr_get_cstring(ds);
 	BLI_dynstr_free(ds);
 
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index 472df3d0f26..9d5dcb8109b 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -58,6 +58,10 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "GPU_draw.h"
+#include "GPU_extensions.h"
+#include "GPU_material.h"
+
 #include <string.h>
 #include <limits.h>
 
@@ -243,7 +247,7 @@ static void cdDM_drawLooseEdges(DerivedMesh *dm)
 	glEnd();
 }
 
-static void cdDM_drawFacesSolid(DerivedMesh *dm, int (*setMaterial)(int))
+static void cdDM_drawFacesSolid(DerivedMesh *dm, int (*setMaterial)(int, void *attribs))
 {
 	CDDerivedMesh *cddm = (CDDerivedMesh*) dm;
 	MVert *mvert = cddm->mvert;
@@ -271,7 +275,7 @@ static void cdDM_drawFacesSolid(DerivedMesh *dm, int (*setMaterial)(int))
 		   || new_shademodel != shademodel) {
 			glEnd();
 
-			drawCurrentMat = setMaterial(matnr = new_matnr);
+			drawCurrentMat = setMaterial(matnr = new_matnr, NULL);
 
 			glShadeModel(shademodel = new_shademodel);
 			glBegin(glmode = new_glmode);
@@ -556,6 +560,134 @@ static void cdDM_drawMappedFacesTex(DerivedMesh *dm, int (*setDrawOptions)(void
 	cdDM_drawFacesTex_common(dm, NULL, setDrawOptions, userData);
 }
 
+static void cdDM_drawMappedFacesGLSL(DerivedMesh *dm, int (*setMaterial)(int, void *attribs), int (*setDrawOptions)(void *userData, int index), void *userData)
+{
+	CDDerivedMesh *cddm = (CDDerivedMesh*) dm;
+	GPUVertexAttribs gattribs;
+	DMVertexAttribs attribs;
+	MVert *mvert = cddm->mvert;
+	MFace *mface = cddm->mface;
+	MTFace *tf = dm->getFaceDataArray(dm, CD_MTFACE);
+	float (*nors)[3] = dm->getFaceDataArray(dm, CD_NORMAL);
+	int a, b, dodraw, smoothnormal, matnr, new_matnr;
+	int transp, new_transp, orig_transp;
+	int orig, *index = dm->getFaceDataArray(dm, CD_ORIGINDEX);
+
+	matnr = -1;
+	smoothnormal = 0;
+	dodraw = 0;
+	transp = GPU_get_material_blend_mode();
+	orig_transp = transp;
+
+	memset(&attribs, 0, sizeof(attribs));
+
+	glShadeModel(GL_SMOOTH);
+	glBegin(GL_QUADS);
+
+	for(a = 0; a < dm->numFaceData; a++, mface++) {
+		new_matnr = mface->mat_nr + 1;
+
+		if(new_matnr != matnr) {
+			glEnd();
+
+			dodraw = setMaterial(matnr = new_matnr, &gattribs);
+			if(dodraw)
+				DM_vertex_attributes_from_gpu(dm, &gattribs, &attribs);
+
+			glBegin(GL_QUADS);
+		}
+
+		if(!dodraw) {
+			continue;
+		}
+		else if(setDrawOptions) {
+			orig = index[a];
+
+			if(orig == ORIGINDEX_NONE)
+				continue;
+			else if(!setDrawOptions(userData, orig))
+				continue;
+		}
+
+		if(tf) {
+			new_transp = tf[a].transp;
+
+			if(new_transp != transp) {
+				glEnd();
+
+				if(new_transp == GPU_BLEND_SOLID && orig_transp != GPU_BLEND_SOLID)
+					GPU_set_material_blend_mode(orig_transp);
+				else
+					GPU_set_material_blend_mode(new_transp);
+				transp = new_transp;
+
+				glBegin(GL_QUADS);
+			}
+		}
+
+		smoothnormal = (mface->flag & ME_SMOOTH);
+
+		if(!smoothnormal) {
+			if(nors) {
+				glNormal3fv(nors[a]);
+			}
+			else {
+				/* TODO ideally a normal layer should always be available */
+				float nor[3];
+				if(mface->v4) {
+					CalcNormFloat4(mvert[mface->v1].co, mvert[mface->v2].co,
+								   mvert[mface->v3].co, mvert[mface->v4].co,
+								   nor);
+				} else {
+					CalcNormFloat(mvert[mface->v1].co, mvert[mface->v2].co,
+								  mvert[mface->v3].co, nor);
+				}
+				glNormal3fv(nor);
+			}
+		}
+
+#define PASSVERT(index, vert) {													\
+	if(attribs.totorco)															\
+		glVertexAttrib3fvARB(attribs.orco.glIndex, attribs.orco.array[index]);	\
+	for(b = 0; b < attribs.tottface; b++) {										\
+		MTFace *tf = &attribs.tface[b].array[a];								\
+		glVertexAttrib2fvARB(attribs.tface[b].glIndex, tf->uv[vert]);			\
+	}																			\
+	for(b = 0; b < attribs.totmcol; b++) {										\
+		MCol *cp = &attribs.mcol[b].array[a*4 + vert];							\
+		GLubyte col[4];															\
+		col[0]= cp->b; col[1]= cp->g; col[2]= cp->r; col[3]= cp->a;				\
+		glVertexAttrib4ubvARB(attribs.mcol[b].glIndex, col);					\
+	}																			\
+	if(attribs.tottang) {														\
+		float *tang = attribs.tang.array[a*4 + vert];							\
+		glVertexAttrib3fvARB(attribs.tang.glIndex, tang);						\
+	}																			\
+	if(smoothnormal)															\
+		glNormal3sv(mvert[index].no);											\
+	glVertex3fv(mvert[index].co);												\
+}
+
+		PASSVERT(mface->v1, 0);
+		PASSVERT(mface->v2, 1);
+		PASSVERT(mface->v3, 2);
+		if(mface->v4)
+			PASSVERT(mface->v4, 3)
+		else
+			PASSVERT(mface->v3, 2)
+
+#undef PASSVERT
+	}
+	glEnd();
+
+	glShadeModel(GL_FLAT);
+}
+
+static void cdDM_drawFacesGLSL(DerivedMesh *dm, int (*setMaterial)(int, void *attribs))
+{
+	dm->drawMappedFacesGLSL(dm, setMaterial, NULL, NULL);
+}
+
 static void cdDM_drawMappedEdges(DerivedMesh *dm, int (*setDrawOptions)(void *userData, int index), void *userData)
 {
 	CDDerivedMesh *cddm = (CDDerivedMesh*) dm;
@@ -713,8 +845,10 @@ static CDDerivedMesh *cdDM_create(const char *desc)
 	dm->drawFacesSolid = cdDM_drawFacesSolid;
 	dm->drawFacesColored = cdDM_drawFacesColored;
 	dm->drawFacesTex = cdDM_drawFacesTex;
+	dm->drawFacesGLSL = cdDM_drawFacesGLSL;
 	dm->drawMappedFaces = cdDM_drawMappedFaces;
 	dm->drawMappedFacesTex = cdDM_drawMappedFacesTex;
+	dm->drawMappedFacesGLSL = cdDM_drawMappedFacesGLSL;
 
 	dm->foreachMappedVert = cdDM_foreachMappedVert;
 	dm->foreachMappedEdge = cdDM_foreachMappedEdge;
diff --git a/source/blender/blenkernel/intern/colortools.c b/source/blender/blenkernel/intern/colortools.c
index 295b8fe3552..45b8bb7935c 100644
--- a/source/blender/blenkernel/intern/colortools.c
+++ b/source/blender/blenkernel/intern/colortools.c
@@ -730,3 +730,24 @@ void curvemapping_initialize(CurveMapping *cumap)
 			curvemap_make_table(cumap->cm+a, &cumap->clipr);
 	}
 }
+
+void curvemapping_table_RGBA(CurveMapping *cumap, float **array, int *size)
+{
+	int a;
+	
+	*size = CM_TABLE+1;
+	*array = MEM_callocN(sizeof(float)*(*size)*4, "CurveMapping");
+	curvemapping_initialize(cumap);
+
+	for(a=0; a<*size; a++) {
+		if(cumap->cm[0].table)
+			(*array)[a*4+0]= cumap->cm[0].table[a].y;
+		if(cumap->cm[1].table)
+			(*array)[a*4+1]= cumap->cm[1].table[a].y;
+		if(cumap->cm[2].table)
+			(*array)[a*4+2]= cumap->cm[2].table[a].y;
+		if(cumap->cm[3].table)
+			(*array)[a*4+3]= cumap->cm[3].table[a].y;
+	}
+}
+
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 07537e3a81c..27fa00ac239 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -53,6 +53,7 @@
 #include "DNA_packedFile_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_camera_types.h"
+#include "DNA_sequence_types.h"
 #include "DNA_texture_types.h"
 #include "DNA_userdef_types.h"
 
@@ -77,15 +78,15 @@
 
 #include "RE_pipeline.h"
 
-/* bad level; call to free_realtime_image */
-#include "BKE_bad_level_calls.h"	
-
 /* for stamp drawing to an image */
 #include "BMF_Api.h"
 
 #include "blendef.h"
 #include "BSE_time.h"
 
+#include "GPU_extensions.h"
+#include "GPU_draw.h"
+
 #include "BLO_sys_types.h" // for intptr_t support
 
 /* max int, to indicate we don't store sequences in ibuf */
@@ -240,7 +241,7 @@ static void image_free_buffers(Image *ima)
 		ima->rr= NULL;
 	}	
 	
-	free_realtime_image(ima);
+	GPU_free_image(ima);
 	
 	ima->ok= IMA_OK;
 }
@@ -620,7 +621,7 @@ void free_old_images()
 			   This gives textures a "second chance" to be used before dying.
 			*/
 			if(ima->bindcode || ima->repbind) {
-				free_realtime_image(ima);
+				GPU_free_image(ima);
 				ima->lastused = ctime;
 			}
 			/* Otherwise, just kill the buffers */
diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c
index 1a6c8f51d9c..e8a25aaaf80 100644
--- a/source/blender/blenkernel/intern/ipo.c
+++ b/source/blender/blenkernel/intern/ipo.c
@@ -1390,6 +1390,14 @@ void *get_ipo_poin(ID *id, IpoCurve *icu, int *type)
 			else if(icu->adrcode & MA_MAP8) mtex= ma->mtex[7];
 			else if(icu->adrcode & MA_MAP9) mtex= ma->mtex[8];
 			else if(icu->adrcode & MA_MAP10) mtex= ma->mtex[9];
+			else if(icu->adrcode & MA_MAP12) mtex= ma->mtex[11];
+			else if(icu->adrcode & MA_MAP11) mtex= ma->mtex[10];
+			else if(icu->adrcode & MA_MAP13) mtex= ma->mtex[12];
+			else if(icu->adrcode & MA_MAP14) mtex= ma->mtex[13];
+			else if(icu->adrcode & MA_MAP15) mtex= ma->mtex[14];
+			else if(icu->adrcode & MA_MAP16) mtex= ma->mtex[15];
+			else if(icu->adrcode & MA_MAP17) mtex= ma->mtex[16];
+			else if(icu->adrcode & MA_MAP18) mtex= ma->mtex[17];
 			
 			if(mtex) {
 				poin= give_mtex_poin(mtex, icu->adrcode & (MA_MAP1-1) );
@@ -1479,7 +1487,14 @@ void *get_ipo_poin(ID *id, IpoCurve *icu, int *type)
 			else if(icu->adrcode & MA_MAP8) mtex= wo->mtex[7];
 			else if(icu->adrcode & MA_MAP9) mtex= wo->mtex[8];
 			else if(icu->adrcode & MA_MAP10) mtex= wo->mtex[9];
-			
+			else if(icu->adrcode & MA_MAP11) mtex= wo->mtex[10];
+			else if(icu->adrcode & MA_MAP12) mtex= wo->mtex[11];
+			else if(icu->adrcode & MA_MAP13) mtex= wo->mtex[12];
+			else if(icu->adrcode & MA_MAP14) mtex= wo->mtex[13];
+			else if(icu->adrcode & MA_MAP15) mtex= wo->mtex[14];
+			else if(icu->adrcode & MA_MAP16) mtex= wo->mtex[15];
+			else if(icu->adrcode & MA_MAP17) mtex= wo->mtex[16];
+			else if(icu->adrcode & MA_MAP18) mtex= wo->mtex[17];
 			if(mtex) {
 				poin= give_mtex_poin(mtex, icu->adrcode & (MA_MAP1-1) );
 			}
@@ -1524,6 +1539,14 @@ void *get_ipo_poin(ID *id, IpoCurve *icu, int *type)
 			else if(icu->adrcode & MA_MAP8) mtex= la->mtex[7];
 			else if(icu->adrcode & MA_MAP9) mtex= la->mtex[8];
 			else if(icu->adrcode & MA_MAP10) mtex= la->mtex[9];
+			else if(icu->adrcode & MA_MAP11) mtex= la->mtex[10];
+			else if(icu->adrcode & MA_MAP12) mtex= la->mtex[11];
+			else if(icu->adrcode & MA_MAP13) mtex= la->mtex[12];
+			else if(icu->adrcode & MA_MAP14) mtex= la->mtex[13];
+			else if(icu->adrcode & MA_MAP15) mtex= la->mtex[14];
+			else if(icu->adrcode & MA_MAP16) mtex= la->mtex[15];
+			else if(icu->adrcode & MA_MAP17) mtex= la->mtex[16];
+			else if(icu->adrcode & MA_MAP18) mtex= la->mtex[17];
 			
 			if(mtex) {
 				poin= give_mtex_poin(mtex, icu->adrcode & (MA_MAP1-1) );
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index 3983eecdaba..f05b84f6e90 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -61,6 +61,8 @@
 
 #include "BPY_extern.h"
 
+#include "GPU_material.h"
+
 /* used in UI and render */
 Material defmaterial;
 
@@ -96,6 +98,9 @@ void free_material(Material *ma)
 		ntreeFreeTree(ma->nodetree);
 		MEM_freeN(ma->nodetree);
 	}
+
+	if(ma->gpumaterial.first)
+		GPU_material_free(ma);
 }
 
 void init_material(Material *ma)
@@ -207,6 +212,8 @@ Material *copy_material(Material *ma)
 	if(ma->nodetree) {
 		man->nodetree= ntreeCopyTree(ma->nodetree, 0);	/* 0 == full new tree */
 	}
+
+	man->gpumaterial.first= man->gpumaterial.last= NULL;
 	
 	return man;
 }
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c
index 43e48c3bacd..77b9ea4fa2d 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -79,45 +79,6 @@
 #include "BLI_editVert.h"
 #include "BLI_arithb.h"
 
-int update_realtime_texture(MTFace *tface, double time)
-{
-	Image *ima;
-	int	inc = 0;
-	float	diff;
-	int	newframe;
-
-	ima = tface->tpage;
-
-	if (!ima)
-		return 0;
-
-	if (ima->lastupdate<0)
-		ima->lastupdate = 0;
-
-	if (ima->lastupdate>time)
-		ima->lastupdate=(float)time;
-
-	if(ima->tpageflag & IMA_TWINANIM) {
-		if(ima->twend >= ima->xrep*ima->yrep) ima->twend= ima->xrep*ima->yrep-1;
-		
-		/* check: is the bindcode not in the array? Then free. (still to do) */
-		
-		diff = (float)(time-ima->lastupdate);
-
-		inc = (int)(diff*(float)ima->animspeed);
-
-		ima->lastupdate+=((float)inc/(float)ima->animspeed);
-
-		newframe = ima->lastframe+inc;
-
-		if (newframe > (int)ima->twend)
-			newframe = (int)ima->twsta-1 + (newframe-ima->twend)%(ima->twend-ima->twsta);
-
-		ima->lastframe = newframe;
-	}
-	return inc;
-}
-
 void mesh_update_customdata_pointers(Mesh *me)
 {
 	me->mvert = CustomData_get_layer(&me->vdata, CD_MVERT);
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index 4e36df35a14..4dfe651c01f 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -68,6 +68,9 @@
 
 #include "SHD_node.h"
 
+#include "GPU_extensions.h"
+#include "GPU_material.h"
+
 static ListBase empty_list = {NULL, NULL};
 ListBase node_all_composit = {NULL, NULL};
 ListBase node_all_shaders = {NULL, NULL};
@@ -2352,6 +2355,117 @@ void ntreeCompositExecTree(bNodeTree *ntree, RenderData *rd, int do_preview)
 	ntreeEndExecTree(ntree);
 }
 
+/* GPU material from shader nodes */
+
+static void gpu_from_node_stack(ListBase *sockets, bNodeStack **ns, GPUNodeStack *gs)
+{
+	bNodeSocket *sock;
+	int i;
+
+	for (sock=sockets->first, i=0; sock; sock=sock->next, i++) {
+		memset(&gs[i], 0, sizeof(gs[i]));
+
+    	QUATCOPY(gs[i].vec, ns[i]->vec);
+		gs[i].link= ns[i]->data;
+
+		if (sock->type == SOCK_VALUE)
+			gs[i].type= GPU_FLOAT;
+		else if (sock->type == SOCK_VECTOR)
+			gs[i].type= GPU_VEC3;
+		else if (sock->type == SOCK_RGBA)
+			gs[i].type= GPU_VEC4;
+		else
+			gs[i].type= GPU_NONE;
+
+		gs[i].name = "";
+		gs[i].hasinput= ns[i]->hasinput;
+		gs[i].hasoutput= ns[i]->hasinput;
+		gs[i].sockettype= ns[i]->sockettype;
+	}
+
+	gs[i].type= GPU_NONE;
+}
+
+static void data_from_gpu_stack(ListBase *sockets, bNodeStack **ns, GPUNodeStack *gs)
+{
+	bNodeSocket *sock;
+	int i;
+
+	for (sock=sockets->first, i=0; sock; sock=sock->next, i++) {
+		ns[i]->data= gs[i].link;
+		ns[i]->hasinput= gs[i].hasinput;
+		ns[i]->hasoutput= gs[i].hasoutput;
+		ns[i]->sockettype= gs[i].sockettype;
+	}
+}
+
+static void gpu_node_group_execute(bNodeStack *stack, GPUMaterial *mat, bNode *gnode, bNodeStack **in, bNodeStack **out)
+{
+	bNode *node;
+	bNodeTree *ntree= (bNodeTree *)gnode->id;
+	bNodeStack *nsin[MAX_SOCKET];	/* arbitrary... watch this */
+	bNodeStack *nsout[MAX_SOCKET];	/* arbitrary... watch this */
+	GPUNodeStack gpuin[MAX_SOCKET+1], gpuout[MAX_SOCKET+1];
+	int doit = 0;
+	
+	if(ntree==NULL) return;
+	
+	stack+= gnode->stack_index;
+		
+	for(node= ntree->nodes.first; node; node= node->next) {
+		if(node->typeinfo->gpufunc) {
+			group_node_get_stack(node, stack, nsin, nsout, in, out);
+
+			doit = 0;
+			
+			/* for groups, only execute outputs for edited group */
+			if(node->typeinfo->nclass==NODE_CLASS_OUTPUT) {
+				if(gnode->flag & NODE_GROUP_EDIT)
+					if(node->flag & NODE_DO_OUTPUT)
+						doit = 1;
+			}
+			else
+				doit = 1;
+
+			if(doit)  {
+				gpu_from_node_stack(&node->inputs, nsin, gpuin);
+				gpu_from_node_stack(&node->outputs, nsout, gpuout);
+				if(node->typeinfo->gpufunc(mat, node, gpuin, gpuout))
+					data_from_gpu_stack(&node->outputs, nsout, gpuout);
+			}
+		}
+	}
+}
+
+void ntreeGPUMaterialNodes(bNodeTree *ntree, GPUMaterial *mat)
+{
+	bNode *node;
+	bNodeStack *stack;
+	bNodeStack *nsin[MAX_SOCKET];	/* arbitrary... watch this */
+	bNodeStack *nsout[MAX_SOCKET];	/* arbitrary... watch this */
+	GPUNodeStack gpuin[MAX_SOCKET+1], gpuout[MAX_SOCKET+1];
+
+	if((ntree->init & NTREE_EXEC_INIT)==0)
+		ntreeBeginExecTree(ntree);
+
+	stack= ntree->stack;
+
+	for(node= ntree->nodes.first; node; node= node->next) {
+		if(node->typeinfo->gpufunc) {
+			node_get_stack(node, stack, nsin, nsout);
+			gpu_from_node_stack(&node->inputs, nsin, gpuin);
+			gpu_from_node_stack(&node->outputs, nsout, gpuout);
+			if(node->typeinfo->gpufunc(mat, node, gpuin, gpuout))
+				data_from_gpu_stack(&node->outputs, nsout, gpuout);
+		}
+        else if(node->type==NODE_GROUP && node->id) {
+			node_get_stack(node, stack, nsin, nsout);
+			gpu_node_group_execute(stack, mat, node, nsin, nsout);
+		}
+	}
+
+	ntreeEndExecTree(ntree);
+}
 
 /* **************** call to switch lamploop for material node ************ */
 
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 7b36e46d45e..8879b498ad9 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -112,6 +112,8 @@
 
 #include "BPY_extern.h"
 
+#include "GPU_material.h"
+
 #include "blendef.h"
 
 /* Local function protos */
@@ -268,6 +270,7 @@ void free_object(Object *ob)
 	}
 	if(ob->soft) sbFree(ob->soft);
 	if(ob->fluidsimSettings) fluidsimSettingsFree(ob->fluidsimSettings);
+	if(ob->gpulamp.first) GPU_lamp_free(ob);
 }
 
 static void unlink_object__unlinkModifierLinks(void *userData, Object *ob, Object **obpoin)
@@ -918,7 +921,7 @@ Object *add_only_object(int type, char *name)
 	QuatOne(ob->dquat);
 #endif 
 
-	ob->col[0]= ob->col[1]= ob->col[2]= 0.0;
+	ob->col[0]= ob->col[1]= ob->col[2]= 1.0;
 	ob->col[3]= 1.0;
 
 	ob->loc[0]= ob->loc[1]= ob->loc[2]= 0.0;
@@ -1226,6 +1229,7 @@ Object *copy_object(Object *ob)
 	obn->vnode = NULL;
 #endif
 
+	obn->gpulamp.first = obn->gpulamp.last = NULL;
 
 	return obn;
 }
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c
index bba79bd6d28..f334fc39daa 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -61,6 +61,10 @@
 
 #include "BIF_gl.h"
 
+#include "GPU_draw.h"
+#include "GPU_extensions.h"
+#include "GPU_material.h"
+
 #include "CCGSubSurf.h"
 
 typedef struct _VertData {
@@ -1599,7 +1603,7 @@ static void ccgDM_glNormalFast(float *a, float *b, float *c, float *d)
 }
 
 	/* Only used by non-editmesh types */
-static void ccgDM_drawFacesSolid(DerivedMesh *dm, int (*setMaterial)(int)) {
+static void ccgDM_drawFacesSolid(DerivedMesh *dm, int (*setMaterial)(int, void *attribs)) {
 	CCGDerivedMesh *ccgdm = (CCGDerivedMesh*) dm;
 	CCGSubSurf *ss = ccgdm->ss;
 	CCGFaceIterator *fi = ccgSubSurf_getFaceIterator(ss);
@@ -1621,7 +1625,7 @@ static void ccgDM_drawFacesSolid(DerivedMesh *dm, int (*setMaterial)(int)) {
 			mat_nr= 0;
 		}
 		
-		if (!setMaterial(mat_nr+1))
+		if (!setMaterial(mat_nr+1, NULL))
 			continue;
 
 		glShadeModel(drawSmooth? GL_SMOOTH: GL_FLAT);
@@ -1666,6 +1670,168 @@ static void ccgDM_drawFacesSolid(DerivedMesh *dm, int (*setMaterial)(int)) {
 
 	ccgFaceIterator_free(fi);
 }
+
+	/* Only used by non-editmesh types */
+static void ccgDM_drawMappedFacesGLSL(DerivedMesh *dm, int (*setMaterial)(int, void *attribs), int (*setDrawOptions)(void *userData, int index), void *userData) {
+	CCGDerivedMesh *ccgdm = (CCGDerivedMesh*) dm;
+	CCGSubSurf *ss = ccgdm->ss;
+	CCGFaceIterator *fi = ccgSubSurf_getFaceIterator(ss);
+	GPUVertexAttribs gattribs;
+	DMVertexAttribs attribs;
+	MTFace *tf = dm->getFaceDataArray(dm, CD_MTFACE);
+	int gridSize = ccgSubSurf_getGridSize(ss);
+	int gridFaces = gridSize - 1;
+	int edgeSize = ccgSubSurf_getEdgeSize(ss);
+	int transp, orig_transp, new_transp;
+	char *faceFlags = DM_get_face_data_layer(dm, CD_FLAGS);
+	int a, b, i, doDraw, numVerts, matnr, new_matnr, totface;
+
+	doDraw = 0;
+	numVerts = 0;
+	matnr = -1;
+	transp = GPU_get_material_blend_mode();
+	orig_transp = transp;
+
+	memset(&attribs, 0, sizeof(attribs));
+
+#define PASSATTRIB(dx, dy, vert) {												\
+	if(attribs.totorco) {														\
+		index = getFaceIndex(ss, f, S, x+dx, y+dy, edgeSize, gridSize); 		\
+		glVertexAttrib3fvARB(attribs.orco.glIndex, attribs.orco.array[index]);	\
+	}																			\
+	for(b = 0; b < attribs.tottface; b++) {										\
+		MTFace *tf = &attribs.tface[b].array[a];								\
+		glVertexAttrib2fvARB(attribs.tface[b].glIndex, tf->uv[vert]);			\
+	}																			\
+	for(b = 0; b < attribs.totmcol; b++) {										\
+		MCol *cp = &attribs.mcol[b].array[a*4 + vert];							\
+		GLubyte col[4];															\
+		col[0]= cp->b; col[1]= cp->g; col[2]= cp->r; col[3]= cp->a;				\
+		glVertexAttrib4ubvARB(attribs.mcol[b].glIndex, col);					\
+	}																			\
+	if(attribs.tottang) {														\
+		float *tang = attribs.tang.array[a*4 + vert];							\
+		glVertexAttrib3fvARB(attribs.tang.glIndex, tang);						\
+	}																			\
+}
+
+	totface = ccgSubSurf_getNumFaces(ss);
+	for(a = 0, i = 0; i < totface; i++) {
+		CCGFace *f = ccgdm->faceMap[i].face;
+		int S, x, y, drawSmooth;
+		int index = GET_INT_FROM_POINTER(ccgSubSurf_getFaceFaceHandle(ss, f));
+		int origIndex = ccgDM_getFaceMapIndex(ccgdm, ss, f);
+		
+		numVerts = ccgSubSurf_getFaceNumVerts(ss, f);
+
+		if(faceFlags) {
+			drawSmooth = (faceFlags[index*4] & ME_SMOOTH);
+			new_matnr= faceFlags[index*4 + 1] + 1;
+		}
+		else {
+			drawSmooth = 1;
+			new_matnr= 1;
+		}
+
+		if(new_matnr != matnr) {
+			doDraw = setMaterial(matnr = new_matnr, &gattribs);
+			if(doDraw)
+				DM_vertex_attributes_from_gpu(dm, &gattribs, &attribs);
+		}
+
+		if(!doDraw || (setDrawOptions && !setDrawOptions(userData, origIndex))) {
+			a += gridFaces*gridFaces*numVerts;
+			continue;
+		}
+
+		if(tf) {
+			new_transp = tf[i].transp;
+
+			if(new_transp != transp) {
+				if(new_transp == GPU_BLEND_SOLID && orig_transp != GPU_BLEND_SOLID)
+					GPU_set_material_blend_mode(orig_transp);
+				else
+					GPU_set_material_blend_mode(new_transp);
+				transp = new_transp;
+			}
+		}
+
+		glShadeModel(drawSmooth? GL_SMOOTH: GL_FLAT);
+		for (S=0; S<numVerts; S++) {
+			VertData *faceGridData = ccgSubSurf_getFaceGridDataArray(ss, f, S);
+			VertData *vda, *vdb;
+
+			if (drawSmooth) {
+				for (y=0; y<gridFaces; y++) {
+					glBegin(GL_QUAD_STRIP);
+					for (x=0; x<gridFaces; x++) {
+						vda = &faceGridData[(y+0)*gridSize + x];
+						vdb = &faceGridData[(y+1)*gridSize + x];
+						
+						PASSATTRIB(0, 0, 0);
+						glNormal3fv(vda->no);
+						glVertex3fv(vda->co);
+
+						PASSATTRIB(0, 1, 1);
+						glNormal3fv(vdb->no);
+						glVertex3fv(vdb->co);
+
+						if(x != gridFaces-1)
+							a++;
+					}
+
+					vda = &faceGridData[(y+0)*gridSize + x];
+					vdb = &faceGridData[(y+1)*gridSize + x];
+
+					PASSATTRIB(0, 0, 3);
+					glNormal3fv(vda->no);
+					glVertex3fv(vda->co);
+
+					PASSATTRIB(0, 1, 2);
+					glNormal3fv(vdb->no);
+					glVertex3fv(vdb->co);
+
+					glEnd();
+
+					a++;
+				}
+			} else {
+				glBegin(GL_QUADS);
+				for (y=0; y<gridFaces; y++) {
+					for (x=0; x<gridFaces; x++) {
+						float *aco = faceGridData[(y+0)*gridSize + x].co;
+						float *bco = faceGridData[(y+0)*gridSize + x + 1].co;
+						float *cco = faceGridData[(y+1)*gridSize + x + 1].co;
+						float *dco = faceGridData[(y+1)*gridSize + x].co;
+
+						ccgDM_glNormalFast(aco, bco, cco, dco);
+
+						PASSATTRIB(0, 1, 1);
+						glVertex3fv(dco);
+						PASSATTRIB(1, 1, 2);
+						glVertex3fv(cco);
+						PASSATTRIB(1, 0, 3);
+						glVertex3fv(bco);
+						PASSATTRIB(0, 0, 0);
+						glVertex3fv(aco);
+						
+						a++;
+					}
+				}
+				glEnd();
+			}
+		}
+	}
+
+#undef PASSATTRIB
+
+	ccgFaceIterator_free(fi);
+}
+
+static void ccgDM_drawFacesGLSL(DerivedMesh *dm, int (*setMaterial)(int, void *attribs)) {
+	dm->drawMappedFacesGLSL(dm, setMaterial, NULL, NULL);
+}
+
 static void ccgDM_drawFacesColored(DerivedMesh *dm, int useTwoSided, unsigned char *col1, unsigned char *col2) {
 	CCGDerivedMesh *ccgdm = (CCGDerivedMesh*) dm;
 	CCGSubSurf *ss = ccgdm->ss;
@@ -2143,8 +2309,10 @@ static CCGDerivedMesh *getCCGDerivedMesh(CCGSubSurf *ss,
 	ccgdm->dm.drawFacesSolid = ccgDM_drawFacesSolid;
 	ccgdm->dm.drawFacesColored = ccgDM_drawFacesColored;
 	ccgdm->dm.drawFacesTex = ccgDM_drawFacesTex;
+	ccgdm->dm.drawFacesGLSL = ccgDM_drawFacesGLSL;
 	ccgdm->dm.drawMappedFaces = ccgDM_drawMappedFaces;
 	ccgdm->dm.drawMappedFacesTex = ccgDM_drawMappedFacesTex;
+	ccgdm->dm.drawMappedFacesGLSL = ccgDM_drawMappedFacesGLSL;
 	ccgdm->dm.drawUVEdges = ccgDM_drawUVEdges;
 
 	ccgdm->dm.drawMappedEdgesInterp = ccgDM_drawMappedEdgesInterp;
diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c
index 936381c85cc..bb726887d32 100644
--- a/source/blender/blenkernel/intern/texture.c
+++ b/source/blender/blenkernel/intern/texture.c
@@ -53,6 +53,7 @@
 #include "DNA_world_types.h"
 #include "DNA_brush_types.h"
 #include "DNA_node_types.h"
+#include "DNA_color_types.h"
 #include "DNA_scene_types.h"
 
 #include "IMB_imbuf_types.h"
@@ -390,6 +391,17 @@ int do_colorband(ColorBand *coba, float in, float out[4])
 	return 1;	/* OK */
 }
 
+void colorband_table_RGBA(ColorBand *coba, float **array, int *size)
+{
+	int a;
+	
+	*size = CM_TABLE+1;
+	*array = MEM_callocN(sizeof(float)*(*size)*4, "ColorBand");
+
+	for(a=0; a<*size; a++)
+		do_colorband(coba, (float)a/(float)CM_TABLE, &(*array)[a*4]);
+}
+
 /* ******************* TEX ************************ */
 
 void free_texture(Tex *tex)
diff --git a/source/blender/blenlib/BLI_arithb.h b/source/blender/blenlib/BLI_arithb.h
index c22b6f79e08..4448231b2b4 100644
--- a/source/blender/blenlib/BLI_arithb.h
+++ b/source/blender/blenlib/BLI_arithb.h
@@ -260,6 +260,7 @@ void Vec2Mulf(float *v1, float f);
 void Vec2Addf(float *v, float *v1, float *v2);
 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 vectoquat(float *vec, short axis, short upflag, float *q);
diff --git a/source/blender/blenlib/BLI_blenlib.h b/source/blender/blenlib/BLI_blenlib.h
index e24ccad12fb..c59cd2dab4e 100644
--- a/source/blender/blenlib/BLI_blenlib.h
+++ b/source/blender/blenlib/BLI_blenlib.h
@@ -73,7 +73,6 @@ extern ListBase fillvertbase;
  * @attention Defined in scanfill.c
  */
 extern ListBase filledgebase;
-extern int totblock;
 
 extern char btempdir[]; /* creator.c temp dir used instead of U.tempdir, set with BLI_where_is_temp( btempdir, 1 ); */
 
diff --git a/source/blender/blenlib/intern/arithb.c b/source/blender/blenlib/intern/arithb.c
index 8bd7ad405af..50f8ba0fcde 100644
--- a/source/blender/blenlib/intern/arithb.c
+++ b/source/blender/blenlib/intern/arithb.c
@@ -2113,6 +2113,14 @@ void VecLerpf(float *target, float *a, float *b, float t)
 	target[2]= s*a[2] + t*b[2];
 }
 
+void Vec2Lerpf(float *target, float *a, float *b, float t)
+{
+	float s = 1.0f-t;
+
+	target[0]= s*a[0] + t*b[0];
+	target[1]= s*a[1] + t*b[1];
+}
+
 void VecMidf(float *v, float *v1, float *v2)
 {
 	v[0]= 0.5f*(v1[0]+ v2[0]);
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 6affec0e104..a2b1828c399 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -1138,6 +1138,8 @@ void blo_make_image_pointer_map(FileData *fd)
 		Link *ibuf= ima->ibufs.first;
 		for(; ibuf; ibuf= ibuf->next) 
 			oldnewmap_insert(fd->imamap, ibuf, ibuf, 0);
+		if(ima->gputexture)
+			oldnewmap_insert(fd->imamap, ima->gputexture, ima->gputexture, 0);
 	}
 	for(; sce; sce= sce->id.next) {
 		if(sce->nodetree) {
@@ -1172,8 +1174,11 @@ void blo_end_image_pointer_map(FileData *fd)
 			if(NULL==newimaadr(fd, ibuf)) {	/* so was restored */
 				BLI_remlink(&ima->ibufs, ibuf);
 				ima->bindcode= 0;
+				ima->gputexture= NULL;
 			}
 		}
+
+		ima->gputexture= newimaadr(fd, ima->gputexture);
 	}
 	for(; sce; sce= sce->id.next) {
 		if(sce->nodetree) {
@@ -2340,8 +2345,10 @@ static void direct_link_image(FileData *fd, Image *ima)
 		ima->ibufs.first= ima->ibufs.last= NULL;
 	
 	/* if not restored, we keep the binded opengl index */
-	if(ima->ibufs.first==NULL)
+	if(ima->ibufs.first==NULL) {
 		ima->bindcode= 0;
+		ima->gputexture= NULL;
+	}
 	
 	ima->anim= NULL;
 	ima->rr= NULL;
@@ -2552,6 +2559,7 @@ static void direct_link_material(FileData *fd, Material *ma)
 		direct_link_nodetree(fd, ma->nodetree);
 
 	ma->preview = direct_link_preview_image(fd, ma->preview);
+	ma->gpumaterial.first = ma->gpumaterial.last = NULL;
 }
 
 /* ************ READ PARTICLE SETTINGS ***************** */
@@ -3390,6 +3398,7 @@ static void direct_link_object(FileData *fd, Object *ob)
 	ob->bb= NULL;
 	ob->derivedDeform= NULL;
 	ob->derivedFinal= NULL;
+	ob->gpulamp.first= ob->gpulamp.last= NULL;
 }
 
 /* ************ READ SCENE ***************** */
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
new file mode 100644
index 00000000000..4d376f47d91
--- /dev/null
+++ b/source/blender/gpu/CMakeLists.txt
@@ -0,0 +1,34 @@
+# $Id: CMakeLists.txt 14444 2008-04-16 22:40:48Z hos $
+# ***** 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 intern/*.c)
+
+SET(INC 
+  . ../blenlib ../blenkernel ../makesdna ../include
+  ../../../extern/glew/include ../../../intern/guardedalloc ../imbuf)
+
+BLENDERLIB(bf_gpu "${SRC}" "${INC}")
+
diff --git a/source/blender/gpu/GPU_draw.h b/source/blender/gpu/GPU_draw.h
new file mode 100644
index 00000000000..2399e7b6a8c
--- /dev/null
+++ b/source/blender/gpu/GPU_draw.h
@@ -0,0 +1,116 @@
+/**
+ * $Id$
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This shader 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 shader 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 shader; 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) 2005 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): Brecht Van Lommel.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef GPU_GAME_H
+#define GPU_GAME_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct MTFace;
+struct Image;
+struct Scene;
+struct Object;
+
+/* OpenGL drawing functions related to shading. These are also
+ * shared with the game engine, where there were previously
+ * duplicates of some of these functions. */
+
+/* Initialize
+ * - sets the default Blender opengl state, if in doubt, check
+ *   the contents of this function
+ * - this is called when starting Blender, for opengl rendering,
+ *   and for switching back from the game engine for example. */
+
+void GPU_state_init(void);
+
+/* Material drawing
+ * - first the state is initialized by a particular object and
+ *   it's materials
+ * - after this, materials can be quickly enabled by their number,
+ *   GPU_enable_material returns 0 if drawing should be skipped
+ * - after drawing, the material must be disabled again */
+
+void GPU_set_object_materials(struct Scene *scene, struct Object *ob,
+	int glsl, int *do_alpha_pass);
+int GPU_enable_material(int nr, void *attribs);
+void GPU_disable_material(void);
+
+void GPU_set_material_blend_mode(int blendmode);
+int GPU_get_material_blend_mode(void);
+
+/* TexFace drawing
+ * - this is mutually exclusive with material drawing, a mesh should
+ *   be drawn using one or the other
+ * - passing NULL clears the state again */
+
+int GPU_set_tpage(struct MTFace *tface);
+
+/* Lights
+ * - returns how many lights were enabled
+ * - this affects fixed functions materials and texface, not glsl */
+
+int GPU_default_lights(void);
+int GPU_scene_object_lights(struct Scene *scene, struct Object *ob,
+	int lay, float viewmat[][4]);
+
+/* Text render
+ * - based on moving uv coordinates */
+
+void GPU_render_text(struct MTFace *tface, int mode,
+	const char *textstr, int textlen, unsigned int *col,
+	float *v1, float *v2, float *v3, float *v4, int glattrib);
+
+/* Mipmap settings
+ * - these will free textures on changes */
+
+void GPU_set_mipmap(int mipmap);
+void GPU_set_linear_mipmap(int linear);
+void GPU_paint_set_mipmap(int mipmap);
+
+/* Image updates and free
+ * - these deal with images bound as opengl textures */
+
+void GPU_paint_update_image(struct Image *ima, int x, int y, int w, int h);
+void GPU_update_images_framechange(void);
+int GPU_update_image_time(struct Image *ima, double time);
+int GPU_verify_image(struct Image *ima, int tftile, int tfmode, int compare);
+void GPU_free_image(struct Image *ima);
+void GPU_free_images(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
diff --git a/source/blender/gpu/GPU_extensions.h b/source/blender/gpu/GPU_extensions.h
new file mode 100644
index 00000000000..d3faa81ebb1
--- /dev/null
+++ b/source/blender/gpu/GPU_extensions.h
@@ -0,0 +1,144 @@
+/**
+ * $Id$
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This shader 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 shader 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 shader; 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) 2005 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): Brecht Van Lommel.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef GPU_EXTENSIONS_H
+#define GPU_EXTENSIONS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* GPU extensions support */
+
+struct Image;
+struct ImageUser;
+
+struct GPUTexture;
+typedef struct GPUTexture GPUTexture;
+
+struct GPUFrameBuffer;
+typedef struct GPUFrameBuffer GPUFrameBuffer;
+
+struct GPUShader;
+typedef struct GPUShader GPUShader;
+
+void GPU_extensions_init(void); /* call this before running any of the functions below */
+void GPU_extensions_exit(void);
+int GPU_extensions_minimum_support(void);
+int GPU_print_error(char *str);
+
+/* GPU Texture
+   - always returns unsigned char RGBA textures
+   - if texture with non square dimensions is created, depending on the
+     graphics card capabilities the texture may actually be stored in a
+	 larger texture with power of two dimensions. the actual dimensions
+	 may be querd with GPU_texture_opengl_width/height. GPU_texture_coord_2f
+	 calls glTexCoord2f with the coordinates adjust for this.
+   - can use reference counting:
+       - reference counter after GPU_texture_create is 1
+       - GPU_texture_ref increases by one
+       - GPU_texture_free decreases by one, and frees if 0
+	- if created with from_blender, will not free the texture
+*/
+
+GPUTexture *GPU_texture_create_1D(int w, float *pixels);
+GPUTexture *GPU_texture_create_2D(int w, int h, float *pixels);
+GPUTexture *GPU_texture_create_depth(int w, int h);
+GPUTexture *GPU_texture_from_blender(struct Image *ima,
+	struct ImageUser *iuser, double time);
+void GPU_texture_free(GPUTexture *tex);
+
+void GPU_texture_ref(GPUTexture *tex);
+
+void GPU_texture_bind(GPUTexture *tex, int number);
+void GPU_texture_unbind(GPUTexture *tex);
+
+GPUFrameBuffer *GPU_texture_framebuffer(GPUTexture *tex);
+
+int GPU_texture_target(GPUTexture *tex);
+int GPU_texture_opengl_width(GPUTexture *tex);
+int GPU_texture_opengl_height(GPUTexture *tex);
+
+/* GPU Framebuffer
+   - this is a wrapper for an OpenGL framebuffer object (FBO). in practice
+     multiple FBO's may be created, to get around limitations on the number
+	 of attached textures and the dimension requirements.
+   - after any of the GPU_framebuffer_* functions, GPU_framebuffer_restore must
+     be called before rendering to the window framebuffer again */
+
+GPUFrameBuffer *GPU_framebuffer_create();
+int GPU_framebuffer_texture_attach(GPUFrameBuffer *fb, GPUTexture *tex);
+void GPU_framebuffer_texture_detach(GPUFrameBuffer *fb, GPUTexture *tex);
+void GPU_framebuffer_texture_bind(GPUFrameBuffer *fb, GPUTexture *tex);
+void GPU_framebuffer_texture_unbind(GPUFrameBuffer *fb, GPUTexture *tex);
+void GPU_framebuffer_free(GPUFrameBuffer *fb);
+
+void GPU_framebuffer_restore();
+
+/* GPU Shader
+   - only for fragment shaders now
+   - must call texture bind before setting a texture as uniform! */
+
+GPUShader *GPU_shader_create(const char *vertexcode, const char *fragcode, GPUShader *lib);
+GPUShader *GPU_shader_create_lib(const char *code);
+void GPU_shader_free(GPUShader *shader);
+
+void GPU_shader_bind(GPUShader *shader);
+void GPU_shader_unbind();
+
+int GPU_shader_get_uniform(GPUShader *shader, char *name);
+void GPU_shader_uniform_vector(GPUShader *shader, int location, int length,
+	int arraysize, float *value);
+void GPU_shader_uniform_texture(GPUShader *shader, int location, GPUTexture *tex);
+
+int GPU_shader_get_attribute(GPUShader *shader, char *name);
+
+/* Vertex attributes for shaders */
+
+#define GPU_MAX_ATTRIB		32
+
+typedef struct GPUVertexAttribs {
+	struct {
+		int type;
+		int glindex;
+		char name[32];
+	} layer[GPU_MAX_ATTRIB];
+
+	int totlayer;
+} GPUVertexAttribs;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
diff --git a/source/blender/gpu/GPU_material.h b/source/blender/gpu/GPU_material.h
new file mode 100644
index 00000000000..560421f7edf
--- /dev/null
+++ b/source/blender/gpu/GPU_material.h
@@ -0,0 +1,169 @@
+/**
+ * $Id$
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This shader 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 shader 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 shader; 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) 2005 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): Brecht Van Lommel.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef __GPU_MATERIAL__
+#define __GPU_MATERIAL__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct Image;
+struct ImageUser;
+struct Material;
+struct Object;
+struct Lamp;
+struct bNode;
+struct LinkNode;
+struct Scene;
+struct GPUVertexAttribs;
+struct GPUNode;
+struct GPUNodeLink;
+struct GPUNodeStack;
+struct GPUMaterial;
+struct GPUTexture;
+struct GPULamp;
+
+typedef struct GPUNode GPUNode;
+typedef struct GPUNodeLink GPUNodeLink;
+typedef struct GPUMaterial GPUMaterial;
+typedef struct GPULamp GPULamp;
+
+/* Functions to create GPU Materials nodes */
+
+typedef enum GPUType {
+	GPU_NONE = 0,
+	GPU_FLOAT = 1,
+	GPU_VEC2 = 2,
+	GPU_VEC3 = 3,
+	GPU_VEC4 = 4,
+	GPU_MAT3 = 9,
+	GPU_MAT4 = 16,
+	GPU_TEX1D = 1001,
+	GPU_TEX2D = 1002,
+	GPU_SHADOW2D = 1003,
+	GPU_ATTRIB = 3001
+} GPUType;
+
+typedef enum GPUBuiltin {
+	GPU_VIEW_MATRIX = 1,
+	GPU_OBJECT_MATRIX = 2,
+	GPU_INVERSE_VIEW_MATRIX = 4,
+	GPU_INVERSE_OBJECT_MATRIX = 8,
+	GPU_VIEW_POSITION = 16,
+	GPU_VIEW_NORMAL = 32,
+	GPU_OBCOLOR = 64
+} GPUBuiltin;
+
+typedef enum GPUBlendMode {
+	GPU_BLEND_SOLID = 0,
+	GPU_BLEND_ADD = 1,
+	GPU_BLEND_ALPHA = 2,
+	GPU_BLEND_CLIP = 4
+} GPUBlendMode;
+
+typedef struct GPUNodeStack {
+	GPUType type;
+	char *name;
+	float vec[4];
+	struct GPUNodeLink *link;
+	short hasinput;
+	short hasoutput;
+	short sockettype;
+} GPUNodeStack;
+
+GPUNodeLink *GPU_attribute(int type, char *name);
+GPUNodeLink *GPU_uniform(float *num);
+GPUNodeLink *GPU_dynamic_uniform(float *num);
+GPUNodeLink *GPU_image(struct Image *ima, struct ImageUser *iuser);
+GPUNodeLink *GPU_texture(int size, float *pixels);
+GPUNodeLink *GPU_dynamic_texture(struct GPUTexture *tex);
+GPUNodeLink *GPU_socket(GPUNodeStack *sock);
+GPUNodeLink *GPU_builtin(GPUBuiltin builtin);
+
+int GPU_link(GPUMaterial *mat, char *name, ...);
+int GPU_stack_link(GPUMaterial *mat, char *name, GPUNodeStack *in, GPUNodeStack *out, ...);
+
+void GPU_material_output_link(GPUMaterial *material, GPUNodeLink *link);
+void GPU_material_enable_alpha(GPUMaterial *material);
+GPUBlendMode GPU_material_blend_mode(GPUMaterial *material, float obcol[4]);
+
+/* High level functions to create and use GPU materials */
+
+GPUMaterial *GPU_material_from_blender(struct Scene *scene, struct Material *ma);
+void GPU_material_free(struct Material *ma);
+
+void GPU_materials_free();
+
+void GPU_material_bind(GPUMaterial *material, int lay, double time);
+void GPU_material_bind_uniforms(GPUMaterial *material, float obmat[][4], float viewmat[][4], float viewinv[][4], float obcol[4]);
+void GPU_material_unbind(GPUMaterial *material);
+int GPU_material_bound(GPUMaterial *material);
+
+void GPU_material_vertex_attributes(GPUMaterial *material,
+	struct GPUVertexAttribs *attrib);
+
+/* Exported shading */
+
+typedef struct GPUShadeInput {
+	GPUMaterial *gpumat;
+	struct Material *mat;
+
+	GPUNodeLink *rgb, *specrgb, *vn, *view, *vcol, *ref;
+	GPUNodeLink *alpha, *refl, *spec, *emit, *har, *amb;
+} GPUShadeInput;
+
+typedef struct GPUShadeResult {
+	GPUNodeLink *diff, *spec, *combined, *alpha;
+} GPUShadeResult;
+
+void GPU_shadeinput_set(GPUMaterial *mat, struct Material *ma, GPUShadeInput *shi);
+void GPU_shaderesult_set(GPUShadeInput *shi, GPUShadeResult *shr);
+
+/* Lamps */
+
+GPULamp *GPU_lamp_from_blender(struct Scene *scene, struct Object *ob, struct Object *par);
+void GPU_lamp_free(struct Object *ob);
+
+int GPU_lamp_has_shadow_buffer(GPULamp *lamp);
+void GPU_lamp_shadow_buffer_bind(GPULamp *lamp, float viewmat[][4], int *winsize, float winmat[][4]);
+void GPU_lamp_shadow_buffer_unbind(GPULamp *lamp);
+
+void GPU_lamp_update(GPULamp *lamp, float obmat[][4]);
+int GPU_lamp_shadow_layer(GPULamp *lamp);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*__GPU_MATERIAL__*/
+
diff --git a/source/blender/gpu/Makefile b/source/blender/gpu/Makefile
new file mode 100644
index 00000000000..b9bde147115
--- /dev/null
+++ b/source/blender/gpu/Makefile
@@ -0,0 +1,37 @@
+#
+# $Id$
+#
+# ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version. The Blender
+# Foundation also sells licenses for use in proprietary software under
+# the Blender License.  See http://www.blender.org/BL/ for information
+# about this.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): none yet.
+#
+# ***** END GPL/BL DUAL LICENSE BLOCK *****
+#
+# Makes module object directory and bounces make to subdirectories.
+
+SOURCEDIR = source/blender/gpu
+DIRS = intern
+
+include nan_subdirs.mk
diff --git a/source/blender/gpu/SConscript b/source/blender/gpu/SConscript
new file mode 100644
index 00000000000..8ccd4b7b24c
--- /dev/null
+++ b/source/blender/gpu/SConscript
@@ -0,0 +1,11 @@
+#!/usr/bin/python
+Import ('env')
+
+sources = env.Glob('intern/*.c')
+
+incs = '../blenlib ../blenkernel ../makesdna ../include'
+incs += ' #/extern/glew/include #intern/guardedalloc ../imbuf .'
+
+incs += ' ' + env['BF_OPENGL_INC']
+
+env.BlenderLib ( 'bf_gpu', sources, Split(incs), [], libtype=['core', 'player'], priority=[65, 20] )
diff --git a/source/blender/gpu/intern/Makefile b/source/blender/gpu/intern/Makefile
new file mode 100644
index 00000000000..733ee3f764c
--- /dev/null
+++ b/source/blender/gpu/intern/Makefile
@@ -0,0 +1,53 @@
+#
+# $Id$
+#
+# ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version. The Blender
+# Foundation also sells licenses for use in proprietary software under
+# the Blender License.  See http://www.blender.org/BL/ for information
+# about this.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): none yet.
+#
+# ***** END GPL/BL DUAL LICENSE BLOCK *****
+#
+
+LIBNAME = gpu
+DIR = $(OCGDIR)/blender/$(LIBNAME)
+
+include nan_compile.mk
+
+ifeq ($(OS),$(findstring $(OS), "beos darwin freebsd linux openbsd solaris windows"))
+    CFLAGS += -funsigned-char
+endif
+
+CFLAGS += $(LEVEL_1_C_WARNINGS)
+
+CPPFLAGS += -I$(OPENGL_HEADERS)
+
+CPPFLAGS += -I../../blenlib
+CPPFLAGS += -I../../makesdna
+CPPFLAGS += -I../../imbuf
+CPPFLAGS += -I../../blenkernel
+CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
+CPPFLAGS += -I$(NAN_GLEW)/include
+CPPFLAGS += -I../
+
diff --git a/source/blender/gpu/intern/gpu_codegen.c b/source/blender/gpu/intern/gpu_codegen.c
new file mode 100644
index 00000000000..b6285915484
--- /dev/null
+++ b/source/blender/gpu/intern/gpu_codegen.c
@@ -0,0 +1,1439 @@
+/**
+ * $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. 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) 2005 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): Brecht Van Lommel.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include "GL/glew.h"
+
+#include "MEM_guardedalloc.h"
+
+#include "DNA_customdata_types.h"
+#include "DNA_image_types.h"
+#include "DNA_listBase.h"
+#include "DNA_material_types.h"
+
+#include "BLI_dynstr.h"
+#include "BLI_blenlib.h"
+#include "BLI_ghash.h"
+#include "BLI_heap.h"
+
+#include "BKE_global.h"
+#include "BKE_utildefines.h"
+
+#include "GPU_material.h"
+#include "GPU_extensions.h"
+
+#include "gpu_codegen.h"
+
+#include <string.h>
+#include <stdarg.h>
+
+#ifdef _WIN32
+#ifndef vsnprintf
+#define _vsnprintf vsnprintf
+#endif
+#ifndef snprintf
+#define snprintf _snprintf
+#endif
+#endif
+
+extern char datatoc_gpu_shader_material_glsl[];
+extern char datatoc_gpu_shader_vertex_glsl[];
+
+/* structs and defines */
+
+typedef enum GPUDataSource {
+	GPU_SOURCE_VEC_UNIFORM,
+	GPU_SOURCE_BUILTIN,
+	GPU_SOURCE_TEX_PIXEL,
+	GPU_SOURCE_TEX,
+	GPU_SOURCE_ATTRIB
+} GPUDataSource;
+
+static char* GPU_DATATYPE_STR[17] = {"", "float", "vec2", "vec3", "vec4",
+	0, 0, 0, 0, "mat3", 0, 0, 0, 0, 0, 0, "mat4"};
+
+struct GPUNode {
+	struct GPUNode *next, *prev;
+
+	char *name;
+	int tag;
+
+	ListBase inputs;
+	ListBase outputs;
+};
+
+struct GPUNodeLink {
+	GPUNodeStack *socket;
+
+	int attribtype;
+	char *attribname;
+
+	int image;
+
+	int texture;
+	int texturesize;
+
+	void *ptr1, *ptr2;
+
+	int dynamic;
+
+	int type;
+	int users;
+
+	GPUTexture *dynamictex;
+
+	GPUBuiltin builtin;
+
+	struct GPUOutput *output;
+};
+
+typedef struct GPUOutput {
+	struct GPUOutput *next, *prev;
+
+	GPUNode *node;
+	int type;				/* data type = length of vector/matrix */
+	GPUNodeLink *link;		/* output link */
+	int id;					/* unique id as created by code generator */
+} GPUOutput;
+
+typedef struct GPUInput {
+	struct GPUInput *next, *prev;
+
+	GPUNode *node;
+
+	int type;				/* datatype */
+	int source;				/* data source */
+
+	int id;					/* unique id as created by code generator */
+	int texid;				/* number for multitexture */
+	int attribid;			/* id for vertex attributes */
+	int bindtex;			/* input is responsible for binding the texture? */
+	int definetex;			/* input is responsible for defining the pixel? */
+	int textarget;			/* GL_TEXTURE_* */
+	int textype;			/* datatype */
+
+	struct Image *ima;		/* image */
+	struct ImageUser *iuser;/* image user */
+	float *dynamicvec;		/* vector data in case it is dynamic */
+	GPUTexture *tex;		/* input texture, only set at runtime */
+	int shaderloc;			/* id from opengl */
+	char shadername[32];	/* name in shader */
+
+	float vec[16];			/* vector data */
+	GPUNodeLink *link;
+	int dynamictex;			/* dynamic? */
+	int attribtype;			/* attribute type */
+	char attribname[32];	/* attribute name */
+	int attribfirst;		/* this is the first one that is bound */
+	GPUBuiltin builtin;		/* builtin uniform */
+} GPUInput;
+
+struct GPUPass {
+	struct GPUPass *next, *prev;
+
+	ListBase inputs;
+	struct GPUOutput *output;
+	struct GPUShader *shader;
+};
+
+/* Strings utility */
+
+static void BLI_dynstr_printf(DynStr *dynstr, const char *format, ...)
+{
+	va_list args;
+	int retval;
+	char str[2048];
+
+	va_start(args, format);
+	retval = vsnprintf(str, sizeof(str), format, args);
+	va_end(args);
+
+	if (retval >= sizeof(str))
+		fprintf(stderr, "BLI_dynstr_printf: limit exceeded\n");
+	else
+		BLI_dynstr_append(dynstr, str);
+}
+
+/* GLSL code parsing for finding function definitions.
+ * These are stored in a hash for lookup when creating a material. */
+
+static GHash *FUNCTION_HASH= NULL;
+static char *FUNCTION_PROTOTYPES= NULL;
+static GPUShader *FUNCTION_LIB= NULL;
+
+static int gpu_str_prefix(char *str, char *prefix)
+{
+	while(*str && *prefix) {
+		if(*str != *prefix)
+			return 0;
+
+		str++;
+		prefix++;
+	}
+	
+	return (*prefix == '\0');
+}
+
+static char *gpu_str_skip_token(char *str, char *token, int max)
+{
+	int len = 0;
+
+	/* skip a variable/function name */
+	while(*str) {
+		if(ELEM6(*str, ' ', '(', ')', ',', '\t', '\n'))
+			break;
+		else {
+			if(token && len < max-1) {
+				*token= *str;
+				token++;
+				len++;
+			}
+			str++;
+		}
+	}
+
+	if(token)
+		*token= '\0';
+
+	/* skip the next special characters:
+	 * note the missing ')' */
+	while(*str) {
+		if(ELEM5(*str, ' ', '(', ',', '\t', '\n'))
+			str++;
+		else
+			break;
+	}
+
+	return str;
+}
+
+static void gpu_parse_functions_string(GHash *hash, char *code)
+{
+	GPUFunction *function;
+	int i, type, qual;
+
+	while((code = strstr(code, "void "))) {
+		function = MEM_callocN(sizeof(GPUFunction), "GPUFunction");
+
+		code = gpu_str_skip_token(code, NULL, 0);
+		code = gpu_str_skip_token(code, function->name, MAX_FUNCTION_NAME);
+
+		/* get parameters */
+		while(*code && *code != ')') {
+			/* test if it's an input or output */
+			qual = FUNCTION_QUAL_IN;
+			if(gpu_str_prefix(code, "out "))
+				qual = FUNCTION_QUAL_OUT;
+			if(gpu_str_prefix(code, "inout "))
+				qual = FUNCTION_QUAL_INOUT;
+			if((qual != FUNCTION_QUAL_IN) || gpu_str_prefix(code, "in "))
+				code = gpu_str_skip_token(code, NULL, 0);
+
+			/* test for type */
+			type= 0;
+			for(i=1; i<=16; i++) {
+				if(GPU_DATATYPE_STR[i] && gpu_str_prefix(code, GPU_DATATYPE_STR[i])) {
+					type= i;
+					break;
+				}
+			}
+
+			if(!type && gpu_str_prefix(code, "sampler2DShadow"))
+				type= GPU_SHADOW2D;
+			if(!type && gpu_str_prefix(code, "sampler1D"))
+				type= GPU_TEX1D;
+			if(!type && gpu_str_prefix(code, "sampler2D"))
+				type= GPU_TEX2D;
+
+			if(type) {
+				/* add paramater */
+				code = gpu_str_skip_token(code, NULL, 0);
+				code = gpu_str_skip_token(code, NULL, 0);
+				function->paramqual[function->totparam]= qual;
+				function->paramtype[function->totparam]= type;
+				function->totparam++;
+			}
+			else {
+				fprintf(stderr, "GPU invalid function parameter in %s.\n", function->name);
+				break;
+			}
+		}
+
+		if(strlen(function->name) == 0 || function->totparam == 0) {
+			fprintf(stderr, "GPU functions parse error.\n");
+			MEM_freeN(function);
+			break;
+		}
+
+		BLI_ghash_insert(hash, function->name, function);
+	}
+}
+
+static char *gpu_generate_function_prototyps(GHash *hash)
+{
+	DynStr *ds = BLI_dynstr_new();
+	GHashIterator *ghi;
+	GPUFunction *function;
+	char *name, *prototypes;
+	int a;
+	
+	/* automatically generate function prototypes to add to the top of the
+	 * generated code, to avoid have to add the actual code & recompile all */
+	ghi = BLI_ghashIterator_new(hash);
+
+	for(; !BLI_ghashIterator_isDone(ghi); BLI_ghashIterator_step(ghi)) {
+		name = BLI_ghashIterator_getValue(ghi);
+		function = BLI_ghashIterator_getValue(ghi);
+
+		BLI_dynstr_printf(ds, "void %s(", name);
+		for(a=0; a<function->totparam; a++) {
+			if(function->paramqual[a] == FUNCTION_QUAL_OUT)
+				BLI_dynstr_append(ds, "out ");
+			else if(function->paramqual[a] == FUNCTION_QUAL_INOUT)
+				BLI_dynstr_append(ds, "inout ");
+
+			if(function->paramtype[a] == GPU_TEX1D)
+				BLI_dynstr_append(ds, "sampler1D");
+			else if(function->paramtype[a] == GPU_TEX2D)
+				BLI_dynstr_append(ds, "sampler2D");
+			else if(function->paramtype[a] == GPU_SHADOW2D)
+				BLI_dynstr_append(ds, "sampler2DShadow");
+			else
+				BLI_dynstr_append(ds, GPU_DATATYPE_STR[function->paramtype[a]]);
+				
+			BLI_dynstr_printf(ds, " param%d", a);
+			
+			if(a != function->totparam-1)
+				BLI_dynstr_append(ds, ", ");
+		}
+		BLI_dynstr_append(ds, ");\n");
+	}
+
+	BLI_dynstr_append(ds, "\n");
+
+	prototypes = BLI_dynstr_get_cstring(ds);
+	BLI_dynstr_free(ds);
+
+	return prototypes;
+}
+
+GPUFunction *GPU_lookup_function(char *name)
+{
+	if(!FUNCTION_HASH) {
+		FUNCTION_HASH = BLI_ghash_new(BLI_ghashutil_strhash, BLI_ghashutil_strcmp);
+		gpu_parse_functions_string(FUNCTION_HASH, datatoc_gpu_shader_material_glsl);
+		FUNCTION_PROTOTYPES = gpu_generate_function_prototyps(FUNCTION_HASH);
+		FUNCTION_LIB = GPU_shader_create_lib(datatoc_gpu_shader_material_glsl);
+	}
+
+	return (GPUFunction*)BLI_ghash_lookup(FUNCTION_HASH, name);
+}
+
+void GPU_extensions_exit(void)
+{
+	extern Material defmaterial;    // render module abuse...
+
+	if(defmaterial.gpumaterial.first)
+		GPU_material_free(&defmaterial);
+
+	if(FUNCTION_HASH) {
+		BLI_ghash_free(FUNCTION_HASH, NULL, (GHashValFreeFP)MEM_freeN);
+		FUNCTION_HASH = NULL;
+	}
+	if(FUNCTION_PROTOTYPES) {
+		MEM_freeN(FUNCTION_PROTOTYPES);
+		FUNCTION_PROTOTYPES = NULL;
+	}
+	if(FUNCTION_LIB) {
+		GPU_shader_free(FUNCTION_LIB);
+		FUNCTION_LIB = NULL;
+	}
+}
+
+/* GLSL code generation */
+
+static void codegen_convert_datatype(DynStr *ds, int from, int to, char *tmp, int id)
+{
+	char name[1024];
+
+	snprintf(name, sizeof(name), "%s%d", tmp, id);
+
+	if (from == to) {
+		BLI_dynstr_append(ds, name);
+	}
+	else if (to == GPU_FLOAT) {
+		if (from == GPU_VEC4)
+			BLI_dynstr_printf(ds, "dot(%s.rgb, vec3(0.35, 0.45, 0.2))", name);
+		else if (from == GPU_VEC3)
+			BLI_dynstr_printf(ds, "dot(%s, vec3(0.33))", name);
+		else if (from == GPU_VEC2)
+			BLI_dynstr_printf(ds, "%s.r", name);
+	}
+	else if (to == GPU_VEC2) {
+		if (from == GPU_VEC4)
+			BLI_dynstr_printf(ds, "vec2(dot(%s.rgb, vec3(0.35, 0.45, 0.2)), %s.a)", name, name);
+		else if (from == GPU_VEC3)
+			BLI_dynstr_printf(ds, "vec2(dot(%s.rgb, vec3(0.33)), 1.0)", name);
+		else if (from == GPU_FLOAT)
+			BLI_dynstr_printf(ds, "vec2(%s, 1.0)", name);
+	}
+	else if (to == GPU_VEC3) {
+		if (from == GPU_VEC4)
+			BLI_dynstr_printf(ds, "%s.rgb", name);
+		else if (from == GPU_VEC2)
+			BLI_dynstr_printf(ds, "vec3(%s.r, %s.r, %s.r)", name, name, name);
+		else if (from == GPU_FLOAT)
+			BLI_dynstr_printf(ds, "vec3(%s, %s, %s)", name, name, name);
+	}
+	else {
+		if (from == GPU_VEC3)
+			BLI_dynstr_printf(ds, "vec4(%s, 1.0)", name);
+		else if (from == GPU_VEC2)
+			BLI_dynstr_printf(ds, "vec4(%s.r, %s.r, %s.r, %s.g)", name, name, name, name);
+		else if (from == GPU_FLOAT)
+			BLI_dynstr_printf(ds, "vec4(%s, %s, %s, 1.0)", name, name, name);
+	}
+}
+
+static void codegen_print_datatype(DynStr *ds, int type, float *data)
+{
+	int i;
+
+	BLI_dynstr_printf(ds, "%s(", GPU_DATATYPE_STR[type]);
+
+	for(i=0; i<type; i++) {
+		BLI_dynstr_printf(ds, "%f", data[i]);
+		if(i == type-1)
+			BLI_dynstr_append(ds, ")");
+		else
+			BLI_dynstr_append(ds, ", ");
+	}
+}
+
+static int codegen_input_has_texture(GPUInput *input)
+{
+	if (input->link)
+		return 0;
+	else if(input->ima)
+		return 1;
+	else
+		return input->tex != 0;
+}
+
+char *GPU_builtin_name(GPUBuiltin builtin)
+{
+	if(builtin == GPU_VIEW_MATRIX)
+		return "unfviewmat";
+	else if(builtin == GPU_OBJECT_MATRIX)
+		return "unfobmat";
+	else if(builtin == GPU_INVERSE_VIEW_MATRIX)
+		return "unfinvviewmat";
+	else if(builtin == GPU_INVERSE_OBJECT_MATRIX)
+		return "unfinvobmat";
+	else if(builtin == GPU_VIEW_POSITION)
+		return "varposition";
+	else if(builtin == GPU_VIEW_NORMAL)
+		return "varnormal";
+	else if(builtin == GPU_OBCOLOR)
+		return "unfobcolor";
+	else
+		return "";
+}
+
+static void codegen_set_unique_ids(ListBase *nodes)
+{
+	GHash *bindhash, *definehash;
+	GPUNode *node;
+	GPUInput *input;
+	GPUOutput *output;
+	int id = 1, texid = 0;
+
+	bindhash= BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp);
+	definehash= BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp);
+
+	for (node=nodes->first; node; node=node->next) {
+		for (input=node->inputs.first; input; input=input->next) {
+			/* set id for unique names of uniform variables */
+			input->id = id++;
+			input->bindtex = 0;
+			input->definetex = 0;
+
+			/* set texid used for settings texture slot with multitexture */
+			if (codegen_input_has_texture(input) &&
+			    ((input->source == GPU_SOURCE_TEX) || (input->source == GPU_SOURCE_TEX_PIXEL))) {
+				if (input->link) {
+					/* input is texture from buffer, assign only one texid per
+					   buffer to avoid sampling the same texture twice */
+					if (!BLI_ghash_haskey(bindhash, input->link)) {
+						input->texid = texid++;
+						input->bindtex = 1;
+						BLI_ghash_insert(bindhash, input->link, SET_INT_IN_POINTER(input->texid));
+					}
+					else
+						input->texid = GET_INT_FROM_POINTER(BLI_ghash_lookup(bindhash, input->link));
+				}
+				else if(input->ima) {
+					/* input is texture from image, assign only one texid per
+					   buffer to avoid sampling the same texture twice */
+					if (!BLI_ghash_haskey(bindhash, input->ima)) {
+						input->texid = texid++;
+						input->bindtex = 1;
+						BLI_ghash_insert(bindhash, input->ima, SET_INT_IN_POINTER(input->texid));
+					}
+					else
+						input->texid = GET_INT_FROM_POINTER(BLI_ghash_lookup(bindhash, input->ima));
+				}
+				else {
+					/* input is user created texture, we know there there is
+					   only one, so assign new texid */
+					input->bindtex = 1;
+					input->texid = texid++;
+				}
+
+				/* make sure this pixel is defined exactly once */
+				if (input->source == GPU_SOURCE_TEX_PIXEL) {
+					if(input->ima) {
+						if (!BLI_ghash_haskey(definehash, input->ima)) {
+							input->definetex = 1;
+							BLI_ghash_insert(definehash, input->ima, SET_INT_IN_POINTER(input->texid));
+						}
+					}
+					else {
+						if (!BLI_ghash_haskey(definehash, input->link)) {
+							input->definetex = 1;
+							BLI_ghash_insert(definehash, input->link, SET_INT_IN_POINTER(input->texid));
+						}
+					}
+				}
+			}
+		}
+
+		for (output=node->outputs.first; output; output=output->next)
+			/* set id for unique names of tmp variables storing output */
+			output->id = id++;
+	}
+
+	BLI_ghash_free(bindhash, NULL, NULL);
+	BLI_ghash_free(definehash, NULL, NULL);
+}
+
+static void codegen_print_uniforms_functions(DynStr *ds, ListBase *nodes)
+{
+	GPUNode *node;
+	GPUInput *input;
+	char *name;
+	int builtins = 0;
+
+	/* print uniforms */
+	for (node=nodes->first; node; node=node->next) {
+		for (input=node->inputs.first; input; input=input->next) {
+			if ((input->source == GPU_SOURCE_TEX) || (input->source == GPU_SOURCE_TEX_PIXEL)) {
+				/* create exactly one sampler for each texture */
+				if (codegen_input_has_texture(input) && input->bindtex)
+					BLI_dynstr_printf(ds, "uniform %s samp%d;\n",
+						(input->textype == GPU_TEX1D)? "sampler1D":
+						(input->textype == GPU_TEX2D)? "sampler2D": "sampler2DShadow",
+						input->texid);
+			}
+			else if(input->source == GPU_SOURCE_BUILTIN) {
+				/* only define each builting uniform/varying once */
+				if(!(builtins & input->builtin)) {
+					builtins |= input->builtin;
+					name = GPU_builtin_name(input->builtin);
+
+					if(gpu_str_prefix(name, "unf")) {
+						BLI_dynstr_printf(ds, "uniform %s %s;\n",
+							GPU_DATATYPE_STR[input->type], name);
+					}
+					else {
+						BLI_dynstr_printf(ds, "varying %s %s;\n",
+							GPU_DATATYPE_STR[input->type], name);
+					}
+				}
+			}
+			else if (input->source == GPU_SOURCE_VEC_UNIFORM) {
+				if(input->dynamicvec) {
+					/* only create uniforms for dynamic vectors */
+					BLI_dynstr_printf(ds, "uniform %s unf%d;\n",
+						GPU_DATATYPE_STR[input->type], input->id);
+				}
+				else {
+					/* for others use const so the compiler can do folding */
+					BLI_dynstr_printf(ds, "const %s cons%d = ",
+						GPU_DATATYPE_STR[input->type], input->id);
+					codegen_print_datatype(ds, input->type, input->vec);
+					BLI_dynstr_append(ds, ";\n");
+				}
+			}
+			else if (input->source == GPU_SOURCE_ATTRIB && input->attribfirst) {
+				BLI_dynstr_printf(ds, "varying %s var%d;\n",
+					GPU_DATATYPE_STR[input->type], input->attribid);
+			}
+		}
+	}
+
+	BLI_dynstr_append(ds, "\n");
+}
+
+static void codegen_declare_tmps(DynStr *ds, ListBase *nodes)
+{
+	GPUNode *node;
+	GPUInput *input;
+	GPUOutput *output;
+
+	for (node=nodes->first; node; node=node->next) {
+		/* load pixels from textures */
+		for (input=node->inputs.first; input; input=input->next) {
+			if (input->source == GPU_SOURCE_TEX_PIXEL) {
+				if (codegen_input_has_texture(input) && input->definetex) {
+					BLI_dynstr_printf(ds, "\tvec4 tex%d = texture2D(", input->texid);
+					BLI_dynstr_printf(ds, "samp%d, gl_TexCoord[%d].st);\n",
+						input->texid, input->texid);
+				}
+			}
+		}
+
+		/* declare temporary variables for node output storage */
+		for (output=node->outputs.first; output; output=output->next)
+			BLI_dynstr_printf(ds, "\t%s tmp%d;\n",
+				GPU_DATATYPE_STR[output->type], output->id);
+	}
+
+	BLI_dynstr_append(ds, "\n");
+}
+
+static void codegen_call_functions(DynStr *ds, ListBase *nodes, GPUOutput *finaloutput)
+{
+	GPUNode *node;
+	GPUInput *input;
+	GPUOutput *output;
+
+	for (node=nodes->first; node; node=node->next) {
+		BLI_dynstr_printf(ds, "\t%s(", node->name);
+		
+		for (input=node->inputs.first; input; input=input->next) {
+			if (input->source == GPU_SOURCE_TEX) {
+				BLI_dynstr_printf(ds, "samp%d", input->texid);
+				if (input->link)
+					BLI_dynstr_printf(ds, ", gl_TexCoord[%d].st", input->texid);
+			}
+			else if (input->source == GPU_SOURCE_TEX_PIXEL) {
+				if (input->link && input->link->output)
+					codegen_convert_datatype(ds, input->link->output->type, input->type,
+						"tmp", input->link->output->id);
+				else
+					codegen_convert_datatype(ds, input->link->output->type, input->type,
+						"tex", input->texid);
+			}
+			else if(input->source == GPU_SOURCE_BUILTIN)
+				BLI_dynstr_printf(ds, "%s", GPU_builtin_name(input->builtin));
+			else if(input->source == GPU_SOURCE_VEC_UNIFORM) {
+				if(input->dynamicvec)
+					BLI_dynstr_printf(ds, "unf%d", input->id);
+				else
+					BLI_dynstr_printf(ds, "cons%d", input->id);
+			}
+			else if (input->source == GPU_SOURCE_ATTRIB)
+				BLI_dynstr_printf(ds, "var%d", input->attribid);
+
+			BLI_dynstr_append(ds, ", ");
+		}
+
+		for (output=node->outputs.first; output; output=output->next) {
+			BLI_dynstr_printf(ds, "tmp%d", output->id);
+			if (output->next)
+				BLI_dynstr_append(ds, ", ");
+		}
+
+		BLI_dynstr_append(ds, ");\n");
+	}
+
+	BLI_dynstr_append(ds, "\n\tgl_FragColor = ");
+	codegen_convert_datatype(ds, finaloutput->type, GPU_VEC4, "tmp", finaloutput->id);
+	BLI_dynstr_append(ds, ";\n");
+}
+
+static char *code_generate_fragment(ListBase *nodes, GPUOutput *output, const char *name)
+{
+	DynStr *ds = BLI_dynstr_new();
+	char *code;
+
+	BLI_dynstr_append(ds, FUNCTION_PROTOTYPES);
+
+	codegen_set_unique_ids(nodes);
+	codegen_print_uniforms_functions(ds, nodes);
+
+	//if(G.f & G_DEBUG)
+	//	BLI_dynstr_printf(ds, "/* %s */\n", name);
+
+	BLI_dynstr_append(ds, "void main(void)\n");
+	BLI_dynstr_append(ds, "{\n");
+
+	codegen_declare_tmps(ds, nodes);
+	codegen_call_functions(ds, nodes, output);
+
+	BLI_dynstr_append(ds, "}\n");
+
+	/* create shader */
+	code = BLI_dynstr_get_cstring(ds);
+	BLI_dynstr_free(ds);
+
+	//if(G.f & G_DEBUG) printf("%s\n", code);
+
+	return code;
+}
+
+static char *code_generate_vertex(ListBase *nodes)
+{
+	DynStr *ds = BLI_dynstr_new();
+	GPUNode *node;
+	GPUInput *input;
+	char *code;
+	
+	for (node=nodes->first; node; node=node->next) {
+		for (input=node->inputs.first; input; input=input->next) {
+			if (input->source == GPU_SOURCE_ATTRIB && input->attribfirst) {
+				BLI_dynstr_printf(ds, "attribute %s att%d;\n",
+					GPU_DATATYPE_STR[input->type], input->attribid);
+				BLI_dynstr_printf(ds, "varying %s var%d;\n",
+					GPU_DATATYPE_STR[input->type], input->attribid);
+			}
+		}
+	}
+
+	BLI_dynstr_append(ds, "\n");
+	BLI_dynstr_append(ds, datatoc_gpu_shader_vertex_glsl);
+
+	for (node=nodes->first; node; node=node->next)
+		for (input=node->inputs.first; input; input=input->next)
+			if (input->source == GPU_SOURCE_ATTRIB && input->attribfirst) {
+				if(input->attribtype == CD_TANGENT) /* silly exception */
+					BLI_dynstr_printf(ds, "\tvar%d = gl_NormalMatrix * ", input->attribid);
+				else
+					BLI_dynstr_printf(ds, "\tvar%d = ", input->attribid);
+
+				BLI_dynstr_printf(ds, "att%d;\n", input->attribid);
+			}
+
+	BLI_dynstr_append(ds, "}\n\n");
+
+	code = BLI_dynstr_get_cstring(ds);
+
+	BLI_dynstr_free(ds);
+
+	//if(G.f & G_DEBUG) printf("%s\n", code);
+
+	return code;
+}
+
+/* GPU pass binding/unbinding */
+
+GPUShader *GPU_pass_shader(GPUPass *pass)
+{
+	return pass->shader;
+}
+
+void GPU_nodes_extract_dynamic_inputs(GPUPass *pass, ListBase *nodes)
+{
+	GPUShader *shader = pass->shader;
+	GPUNode *node;
+	GPUInput *next, *input;
+	ListBase *inputs = &pass->inputs;
+	int extract, z;
+
+	memset(inputs, 0, sizeof(*inputs));
+
+	if(!shader)
+		return;
+
+	GPU_shader_bind(shader);
+
+	for (node=nodes->first; node; node=node->next) {
+		z = 0;
+		for (input=node->inputs.first; input; input=next, z++) {
+			next = input->next;
+
+			/* attributes don't need to be bound, they already have
+			 * an id that the drawing functions will use */
+			if(input->source == GPU_SOURCE_ATTRIB ||
+			   input->source == GPU_SOURCE_BUILTIN)
+				continue;
+
+			if (input->ima || input->tex)
+				snprintf(input->shadername, sizeof(input->shadername), "samp%d", input->texid);
+			else
+				snprintf(input->shadername, sizeof(input->shadername), "unf%d", input->id);
+
+			/* pass non-dynamic uniforms to opengl */
+			extract = 0;
+
+			if(input->ima || input->tex) {
+				if (input->bindtex)
+					extract = 1;
+			}
+			else if(input->dynamicvec)
+				extract = 1;
+
+			if(extract)
+				input->shaderloc = GPU_shader_get_uniform(shader, input->shadername);
+
+			/* extract nodes */
+			if(extract) {
+				BLI_remlink(&node->inputs, input);
+				BLI_addtail(inputs, input);
+			}
+		}
+	}
+
+	GPU_shader_unbind(shader);
+}
+
+void GPU_pass_bind(GPUPass *pass, double time)
+{
+	GPUInput *input;
+	GPUShader *shader = pass->shader;
+	ListBase *inputs = &pass->inputs;
+
+	if (!shader)
+		return;
+
+	GPU_shader_bind(shader);
+
+	/* now bind the textures */
+	for (input=inputs->first; input; input=input->next) {
+		if (input->ima)
+			input->tex = GPU_texture_from_blender(input->ima, input->iuser, time);
+
+		if(input->ima || input->tex) {
+			if(input->tex) {
+				GPU_texture_bind(input->tex, input->texid);
+				GPU_shader_uniform_texture(shader, input->shaderloc, input->tex);
+			}
+		}
+	}
+}
+
+void GPU_pass_update_uniforms(GPUPass *pass)
+{
+	GPUInput *input;
+	GPUShader *shader = pass->shader;
+	ListBase *inputs = &pass->inputs;
+
+	if (!shader)
+		return;
+
+	/* pass dynamic inputs to opengl, others were removed */
+	for (input=inputs->first; input; input=input->next)
+		if(!(input->ima || input->tex))
+			GPU_shader_uniform_vector(shader, input->shaderloc, input->type, 1,
+				input->dynamicvec);
+}
+
+void GPU_pass_unbind(GPUPass *pass)
+{
+	GPUInput *input;
+	GPUShader *shader = pass->shader;
+	ListBase *inputs = &pass->inputs;
+
+	if (!shader)
+		return;
+
+	for (input=inputs->first; input; input=input->next) {
+		if (input->tex)
+			if(input->bindtex)
+				GPU_texture_unbind(input->tex);
+		if (input->ima)
+			input->tex = 0;
+	}
+	
+	GPU_shader_unbind(shader);
+}
+
+/* Node Link Functions */
+
+GPUNodeLink *GPU_node_link_create(int type)
+{
+	GPUNodeLink *link = MEM_callocN(sizeof(GPUNodeLink), "GPUNodeLink");
+	link->type = type;
+	link->users++;
+
+	return link;
+}
+
+void GPU_node_link_free(GPUNodeLink *link)
+{
+	link->users--;
+
+	if (link->users < 0)
+		fprintf(stderr, "GPU_node_link_free: negative refcount\n");
+	
+	if (link->users == 0) {
+		if (link->output)
+			link->output->link = NULL;
+		MEM_freeN(link);
+	}
+}
+
+/* Node Functions */
+
+GPUNode *GPU_node_begin(char *name)
+{
+	GPUNode *node = MEM_callocN(sizeof(GPUNode), "GPUNode");
+
+	node->name = name;
+
+	return node;
+}
+
+void GPU_node_end(GPUNode *node)
+{
+	/* empty */
+}
+
+static void gpu_node_input_link(GPUNode *node, GPUNodeLink *link, int type)
+{
+	GPUInput *input;
+	GPUNode *outnode;
+	char *name;
+
+	if(link->output) {
+		outnode = link->output->node;
+		name = outnode->name;
+
+		if(strcmp(name, "set_value")==0 || strcmp(name, "set_rgb")==0) {
+			input = MEM_dupallocN(outnode->inputs.first);
+			input->type = type;
+			if(input->link)
+				input->link->users++;
+			BLI_addtail(&node->inputs, input);
+			return;
+		}
+	}
+	
+	input = MEM_callocN(sizeof(GPUInput), "GPUInput");
+	input->node = node;
+
+	if(link->builtin) {
+		/* builtin uniform */
+		input->type = type;
+		input->source = GPU_SOURCE_BUILTIN;
+		input->builtin = link->builtin;
+
+		MEM_freeN(link);
+	}
+	else if(link->output) {
+		/* link to a node output */
+		input->type = type;
+		input->source = GPU_SOURCE_TEX_PIXEL;
+		input->link = link;
+		link->users++;
+	}
+	else if(link->dynamictex) {
+		/* dynamic texture, GPUTexture is updated/deleted externally */
+		input->type = type;
+		input->source = GPU_SOURCE_TEX;
+
+		input->tex = link->dynamictex;
+		input->textarget = GL_TEXTURE_2D;
+		input->textype = type;
+		input->dynamictex = 1;
+		MEM_freeN(link);
+	}
+	else if(link->texture) {
+		/* small texture created on the fly, like for colorbands */
+		input->type = GPU_VEC4;
+		input->source = GPU_SOURCE_TEX;
+		input->textype = type;
+
+		if (type == GPU_TEX1D) {
+			input->tex = GPU_texture_create_1D(link->texturesize, link->ptr1);
+			input->textarget = GL_TEXTURE_1D;
+		}
+		else {
+			input->tex = GPU_texture_create_2D(link->texturesize, link->texturesize, link->ptr2);
+			input->textarget = GL_TEXTURE_2D;
+		}
+
+		MEM_freeN(link->ptr1);
+		MEM_freeN(link);
+	}
+	else if(link->image) {
+		/* blender image */
+		input->type = GPU_VEC4;
+		input->source = GPU_SOURCE_TEX;
+
+		input->ima = link->ptr1;
+		input->textarget = GL_TEXTURE_2D;
+		input->textype = GPU_TEX2D;
+		MEM_freeN(link);
+	}
+	else if(link->attribtype) {
+		/* vertex attribute */
+		input->type = type;
+		input->source = GPU_SOURCE_ATTRIB;
+
+		input->attribtype = link->attribtype;
+		BLI_strncpy(input->attribname, link->attribname, sizeof(input->attribname));
+		MEM_freeN(link);
+	}
+	else {
+		/* uniform vector */
+		input->type = type;
+		input->source = GPU_SOURCE_VEC_UNIFORM;
+
+		memcpy(input->vec, link->ptr1, type*sizeof(float));
+		if(link->dynamic)
+			input->dynamicvec= link->ptr1;
+		MEM_freeN(link);
+	}
+
+	BLI_addtail(&node->inputs, input);
+}
+
+static void gpu_node_input_socket(GPUNode *node, GPUNodeStack *sock)
+{
+	GPUNodeLink *link;
+
+	if(sock->link) {
+		gpu_node_input_link(node, sock->link, sock->type);
+	}
+	else {
+	 	link = GPU_node_link_create(0);
+		link->ptr1 = sock->vec;
+		gpu_node_input_link(node, link, sock->type);
+	}
+}
+
+void GPU_node_output(GPUNode *node, int type, char *name, GPUNodeLink **link)
+{
+	GPUOutput *output = MEM_callocN(sizeof(GPUOutput), "GPUOutput");
+
+	output->type = type;
+	output->node = node;
+
+	if (link) {
+		*link = output->link = GPU_node_link_create(type);
+		output->link->output = output;
+
+		/* note: the caller owns the reference to the linkfer, GPUOutput
+		   merely points to it, and if the node is destroyed it will
+		   set that pointer to NULL */
+	}
+
+	BLI_addtail(&node->outputs, output);
+}
+
+void GPU_inputs_free(ListBase *inputs)
+{
+	GPUInput *input;
+
+	for(input=inputs->first; input; input=input->next) {
+		if(input->link)
+			GPU_node_link_free(input->link);
+		else if(input->tex && !input->dynamictex)
+			GPU_texture_free(input->tex);
+	}
+
+	BLI_freelistN(inputs);
+}
+
+void GPU_node_free(GPUNode *node)
+{
+	GPUOutput *output;
+
+	GPU_inputs_free(&node->inputs);
+
+	for (output=node->outputs.first; output; output=output->next)
+		if (output->link) {
+			output->link->output = NULL;
+			GPU_node_link_free(output->link);
+		}
+
+	BLI_freelistN(&node->outputs);
+	MEM_freeN(node);
+}
+
+void GPU_nodes_free(ListBase *nodes)
+{
+	GPUNode *node;
+
+	while (nodes->first) {
+		node = nodes->first;
+		BLI_remlink(nodes, node);
+		GPU_node_free(node);
+	}
+}
+
+/* vertex attributes */
+
+void gpu_nodes_get_vertex_attributes(ListBase *nodes, GPUVertexAttribs *attribs)
+{
+	GPUNode *node;
+	GPUInput *input;
+	int a;
+
+	/* convert attributes requested by node inputs to an array of layers,
+	 * checking for duplicates and assigning id's starting from zero. */
+
+	memset(attribs, 0, sizeof(*attribs));
+
+	for(node=nodes->first; node; node=node->next) {
+		for(input=node->inputs.first; input; input=input->next) {
+			if(input->source == GPU_SOURCE_ATTRIB) {
+				for(a=0; a<attribs->totlayer; a++) {
+					if(attribs->layer[a].type == input->attribtype &&
+						strcmp(attribs->layer[a].name, input->attribname) == 0)
+						break;
+				}
+
+				if(a == attribs->totlayer && a < GPU_MAX_ATTRIB) {
+					input->attribid = attribs->totlayer++;
+					input->attribfirst = 1;
+
+					attribs->layer[a].type = input->attribtype;
+					attribs->layer[a].glindex = input->attribid;
+					BLI_strncpy(attribs->layer[a].name, input->attribname,
+						sizeof(attribs->layer[a].name));
+				}
+				else
+					input->attribid = attribs->layer[a].glindex;
+			}
+		}
+	}
+}
+
+void gpu_nodes_get_builtin_flag(ListBase *nodes, int *builtin)
+{
+	GPUNode *node;
+	GPUInput *input;
+	
+	*builtin= 0;
+
+	for(node=nodes->first; node; node=node->next)
+		for(input=node->inputs.first; input; input=input->next)
+			if(input->source == GPU_SOURCE_BUILTIN)
+				*builtin |= input->builtin;
+}
+
+/* varargs linking  */
+
+GPUNodeLink *GPU_attribute(int type, char *name)
+{
+	GPUNodeLink *link = GPU_node_link_create(0);
+
+	link->attribtype= type;
+	link->attribname= name;
+
+	return link;
+}
+
+GPUNodeLink *GPU_uniform(float *num)
+{
+	GPUNodeLink *link = GPU_node_link_create(0);
+
+	link->ptr1= num;
+	link->ptr2= NULL;
+
+	return link;
+}
+
+GPUNodeLink *GPU_dynamic_uniform(float *num)
+{
+	GPUNodeLink *link = GPU_node_link_create(0);
+
+	link->ptr1= num;
+	link->ptr2= NULL;
+	link->dynamic= 1;
+
+	return link;
+}
+
+GPUNodeLink *GPU_image(Image *ima, ImageUser *iuser)
+{
+	GPUNodeLink *link = GPU_node_link_create(0);
+
+	link->image= 1;
+	link->ptr1= ima;
+	link->ptr2= iuser;
+
+	return link;
+}
+
+GPUNodeLink *GPU_texture(int size, float *pixels)
+{
+	GPUNodeLink *link = GPU_node_link_create(0);
+
+	link->texture = 1;
+	link->texturesize = size;
+	link->ptr1= pixels;
+
+	return link;
+}
+
+GPUNodeLink *GPU_dynamic_texture(GPUTexture *tex)
+{
+	GPUNodeLink *link = GPU_node_link_create(0);
+
+	link->dynamic = 1;
+	link->dynamictex = tex;
+
+	return link;
+}
+
+GPUNodeLink *GPU_socket(GPUNodeStack *sock)
+{
+	GPUNodeLink *link = GPU_node_link_create(0);
+
+	link->socket= sock;
+
+	return link;
+}
+
+GPUNodeLink *GPU_builtin(GPUBuiltin builtin)
+{
+	GPUNodeLink *link = GPU_node_link_create(0);
+
+	link->builtin= builtin;
+
+	return link;
+}
+
+int GPU_link(GPUMaterial *mat, char *name, ...)
+{
+	GPUNode *node;
+	GPUFunction *function;
+	GPUNodeLink *link, **linkptr;
+	va_list params;
+	int i;
+
+	function = GPU_lookup_function(name);
+	if(!function) {
+		fprintf(stderr, "GPU failed to find function %s\n", name);
+		return 0;
+	}
+
+	node = GPU_node_begin(name);
+
+	va_start(params, name);
+	for(i=0; i<function->totparam; i++) {
+		if(function->paramqual[i] != FUNCTION_QUAL_IN) {
+			linkptr= va_arg(params, GPUNodeLink**);
+			GPU_node_output(node, function->paramtype[i], "", linkptr);
+		}
+		else {
+			link= va_arg(params, GPUNodeLink*);
+			gpu_node_input_link(node, link, function->paramtype[i]);
+		}
+	}
+	va_end(params);
+
+	GPU_node_end(node);
+
+	gpu_material_add_node(mat, node);
+
+	return 1;
+}
+
+int GPU_stack_link(GPUMaterial *mat, char *name, GPUNodeStack *in, GPUNodeStack *out, ...)
+{
+	GPUNode *node;
+	GPUFunction *function;
+	GPUNodeLink *link, **linkptr;
+	va_list params;
+	int i, totin, totout;
+
+	function = GPU_lookup_function(name);
+	if(!function) {
+		fprintf(stderr, "GPU failed to find function %s\n", name);
+		return 0;
+	}
+
+	node = GPU_node_begin(name);
+	totin = 0;
+	totout = 0;
+
+	if(in) {
+		for(i = 0; in[i].type != GPU_NONE; i++) {
+			gpu_node_input_socket(node, &in[i]);
+			totin++;
+		}
+	}
+	
+	if(out) {
+		for(i = 0; out[i].type != GPU_NONE; i++) {
+			GPU_node_output(node, out[i].type, out[i].name, &out[i].link);
+			totout++;
+		}
+	}
+
+	va_start(params, out);
+	for(i=0; i<function->totparam; i++) {
+		if(function->paramqual[i] != FUNCTION_QUAL_IN) {
+			if(totout == 0) {
+				linkptr= va_arg(params, GPUNodeLink**);
+				GPU_node_output(node, function->paramtype[i], "", linkptr);
+			}
+			else
+				totout--;
+		}
+		else {
+			if(totin == 0) {
+				link= va_arg(params, GPUNodeLink*);
+				if(link->socket)
+					gpu_node_input_socket(node, link->socket);
+				else
+					gpu_node_input_link(node, link, function->paramtype[i]);
+			}
+			else
+				totin--;
+		}
+	}
+	va_end(params);
+
+	GPU_node_end(node);
+
+	gpu_material_add_node(mat, node);
+	
+	return 1;
+}
+
+int GPU_link_changed(GPUNodeLink *link)
+{
+	GPUNode *node;
+	GPUInput *input;
+	char *name;
+
+	if(link->output) {
+		node = link->output->node;
+		name = node->name;
+
+		if(strcmp(name, "set_value")==0 || strcmp(name, "set_rgb")==0) {
+			input = node->inputs.first;
+			return (input->link != NULL);
+		}
+
+		return 1;
+	}
+	else
+		return 0;
+}
+
+/* Pass create/free */
+
+void gpu_nodes_tag(GPUNodeLink *link)
+{
+	GPUNode *node;
+	GPUInput *input;
+
+	if(!link->output)
+		return;
+
+	node = link->output->node;
+	if(node->tag)
+		return;
+	
+	node->tag= 1;
+	for(input=node->inputs.first; input; input=input->next)
+		if(input->link)
+			gpu_nodes_tag(input->link);
+}
+
+void gpu_nodes_prune(ListBase *nodes, GPUNodeLink *outlink)
+{
+	GPUNode *node, *next;
+
+	for(node=nodes->first; node; node=node->next)
+		node->tag= 0;
+
+	gpu_nodes_tag(outlink);
+
+	for(node=nodes->first; node; node=next) {
+		next = node->next;
+
+		if(!node->tag) {
+			BLI_remlink(nodes, node);
+			GPU_node_free(node);
+		}
+	}
+}
+
+GPUPass *GPU_generate_pass(ListBase *nodes, GPUNodeLink *outlink, GPUVertexAttribs *attribs, int *builtins, const char *name)
+{
+	GPUShader *shader;
+	GPUPass *pass;
+	char *vertexcode, *fragmentcode;
+
+	if(!FUNCTION_LIB) {
+		GPU_nodes_free(nodes);
+		return NULL;
+	}
+
+	/* prune unused nodes */
+	gpu_nodes_prune(nodes, outlink);
+
+	gpu_nodes_get_vertex_attributes(nodes, attribs);
+	gpu_nodes_get_builtin_flag(nodes, builtins);
+
+	/* generate code and compile with opengl */
+	fragmentcode = code_generate_fragment(nodes, outlink->output, name);
+	vertexcode = code_generate_vertex(nodes);
+	shader = GPU_shader_create(vertexcode, fragmentcode, FUNCTION_LIB);
+	MEM_freeN(fragmentcode);
+	MEM_freeN(vertexcode);
+
+	/* failed? */
+	if (!shader) {
+		memset(attribs, 0, sizeof(*attribs));
+		memset(builtins, 0, sizeof(*builtins));
+		GPU_nodes_free(nodes);
+		return NULL;
+	}
+	
+	/* create pass */
+	pass = MEM_callocN(sizeof(GPUPass), "GPUPass");
+
+	pass->output = outlink->output;
+	pass->shader = shader;
+
+	/* extract dynamic inputs and throw away nodes */
+	GPU_nodes_extract_dynamic_inputs(pass, nodes);
+	GPU_nodes_free(nodes);
+
+	return pass;
+}
+
+void GPU_pass_free(GPUPass *pass)
+{
+	GPU_shader_free(pass->shader);
+	GPU_inputs_free(&pass->inputs);
+	MEM_freeN(pass);
+}
+
diff --git a/source/blender/gpu/intern/gpu_codegen.h b/source/blender/gpu/intern/gpu_codegen.h
new file mode 100644
index 00000000000..53b52f24f16
--- /dev/null
+++ b/source/blender/gpu/intern/gpu_codegen.h
@@ -0,0 +1,87 @@
+/**
+ * $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. 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) 2005 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): Brecht Van Lommel.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef __GPU_CODEGEN_H__
+#define __GPU_CODEGEN_H__
+
+#include "DNA_listBase.h"
+
+struct ListBase;
+struct GPUShader;
+struct GPUOutput;
+struct GPUNode;
+struct GPUVertexAttribs;
+
+#define MAX_FUNCTION_NAME	64
+#define MAX_PARAMETER		32
+
+#define FUNCTION_QUAL_IN	0
+#define FUNCTION_QUAL_OUT	1
+#define FUNCTION_QUAL_INOUT	2
+
+typedef struct GPUFunction {
+	char name[MAX_FUNCTION_NAME];
+	int paramtype[MAX_PARAMETER];
+	int paramqual[MAX_PARAMETER];
+	int totparam;
+} GPUFunction;
+
+GPUFunction *GPU_lookup_function(char *name);
+
+/* Pass Generation
+   - Takes a list of nodes and a desired output, and makes a pass. This
+     will take ownership of the nodes and free them early if unused or
+	 at the end if used.
+*/
+
+struct GPUPass;
+typedef struct GPUPass GPUPass;
+
+GPUPass *GPU_generate_pass(ListBase *nodes, struct GPUNodeLink *outlink,
+	struct GPUVertexAttribs *attribs, int *builtin, const char *name);
+
+struct GPUShader *GPU_pass_shader(GPUPass *pass);
+
+void GPU_pass_bind(GPUPass *pass, double time);
+void GPU_pass_update_uniforms(GPUPass *pass);
+void GPU_pass_unbind(GPUPass *pass);
+
+void GPU_pass_free(GPUPass *pass);
+
+/* Material calls */
+
+char *GPU_builtin_name(GPUBuiltin builtin);
+void gpu_material_add_node(struct GPUMaterial *material, struct GPUNode *node);
+int GPU_link_changed(struct GPUNodeLink *link);
+
+#endif
+
diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c
new file mode 100644
index 00000000000..3ff8e7fa559
--- /dev/null
+++ b/source/blender/gpu/intern/gpu_draw.c
@@ -0,0 +1,1167 @@
+/**
+ * $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. 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) 2005 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): Brecht Van Lommel.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <string.h>
+
+#include "GL/glew.h"
+
+#include "DNA_image_types.h"
+#include "DNA_lamp_types.h"
+#include "DNA_material_types.h"
+#include "DNA_meshdata_types.h"
+#include "DNA_node_types.h"
+#include "DNA_object_types.h"
+#include "DNA_scene_types.h"
+#include "DNA_userdef_types.h"
+#include "DNA_view3d_types.h"
+
+#include "MEM_guardedalloc.h"
+
+#include "IMB_imbuf.h"
+#include "IMB_imbuf_types.h"
+
+#include "BKE_bmfont.h"
+#include "BKE_global.h"
+#include "BKE_image.h"
+#include "BKE_main.h"
+#include "BKE_material.h"
+#include "BKE_node.h"
+#include "BKE_object.h"
+#include "BKE_utildefines.h"
+
+#include "GPU_extensions.h"
+#include "GPU_material.h"
+#include "GPU_draw.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 */
+
+/* Text Rendering */
+
+static void gpu_mcol(unsigned int ucol)
+{
+	/* mcol order is swapped */
+	char *cp= (char *)&ucol;
+	glColor3ub(cp[3], cp[2], cp[1]);
+}
+
+void GPU_render_text(MTFace *tface, int mode,
+	const char *textstr, int textlen, unsigned int *col,
+	float *v1, float *v2, float *v3, float *v4, int glattrib)
+{
+	if (mode & TF_BMFONT) {
+		Image* ima;
+		int characters, index, character;
+		float centerx, centery, sizex, sizey, transx, transy, movex, movey, advance;
+
+		characters = textlen;
+
+		ima = (Image*)tface->tpage;
+		if (ima == NULL)
+			characters = 0;
+
+		// color has been set
+		if (tface->mode & TF_OBCOL)
+			col= NULL;
+		else if (!col)
+			glColor3f(1.0f, 1.0f, 1.0f);
+
+		glPushMatrix();
+		for (index = 0; index < characters; index++) {
+			float uv[4][2];
+
+			// lets calculate offset stuff
+			character = textstr[index];
+			
+			// space starts at offset 1
+			// character = character - ' ' + 1;
+			matrixGlyph((ImBuf *)ima->ibufs.first, character, & centerx, &centery,
+				&sizex, &sizey, &transx, &transy, &movex, &movey, &advance);
+
+			uv[0][0] = (tface->uv[0][0] - centerx) * sizex + transx;
+			uv[0][1] = (tface->uv[0][1] - centery) * sizey + transy;
+			uv[1][0] = (tface->uv[1][0] - centerx) * sizex + transx;
+			uv[1][1] = (tface->uv[1][1] - centery) * sizey + transy;
+			uv[2][0] = (tface->uv[2][0] - centerx) * sizex + transx;
+			uv[2][1] = (tface->uv[2][1] - centery) * sizey + transy;
+			
+			glBegin(GL_POLYGON);
+			if(glattrib >= 0) glVertexAttrib2fvARB(glattrib, uv[0]);
+			else glTexCoord2fv(uv[0]);
+			if(col) gpu_mcol(col[0]);
+			glVertex3f(sizex * v1[0] + movex, sizey * v1[1] + movey, v1[2]);
+			
+			if(glattrib >= 0) glVertexAttrib2fvARB(glattrib, uv[1]);
+			else glTexCoord2fv(uv[1]);
+			if(col) gpu_mcol(col[1]);
+			glVertex3f(sizex * v2[0] + movex, sizey * v2[1] + movey, v2[2]);
+
+			if(glattrib >= 0) glVertexAttrib2fvARB(glattrib, uv[2]);
+			else glTexCoord2fv(uv[2]);
+			if(col) gpu_mcol(col[2]);
+			glVertex3f(sizex * v3[0] + movex, sizey * v3[1] + movey, v3[2]);
+
+			if(v4) {
+				uv[3][0] = (tface->uv[3][0] - centerx) * sizex + transx;
+				uv[3][1] = (tface->uv[3][1] - centery) * sizey + transy;
+
+				if(glattrib >= 0) glVertexAttrib2fvARB(glattrib, uv[3]);
+				else glTexCoord2fv(uv[3]);
+				if(col) gpu_mcol(col[3]);
+				glVertex3f(sizex * v4[0] + movex, sizey * v4[1] + movey, v4[2]);
+			}
+			glEnd();
+
+			glTranslatef(advance, 0.0, 0.0);
+		}
+		glPopMatrix();
+	}
+}
+
+/* Checking powers of two for images since opengl 1.x requires it */
+
+static int is_pow2(int num)
+{
+	/* (n&(n-1)) zeros the least significant bit of n */
+	return ((num)&(num-1))==0;
+}
+
+static int smaller_pow2(int num)
+{
+	while (!is_pow2(num))
+		num= num&(num-1);
+
+	return num;	
+}
+
+static int is_pow2_limit(int num)
+{
+	/* take texture clamping into account */
+	if (U.glreslimit != 0 && num > U.glreslimit)
+		return 0;
+
+	return ((num)&(num-1))==0;
+}
+
+static int smaller_pow2_limit(int num)
+{
+	/* take texture clamping into account */
+	if (U.glreslimit != 0 && num > U.glreslimit)
+		return U.glreslimit;
+
+	return smaller_pow2(num);
+}
+
+/* Current OpenGL state caching for GPU_set_tpage */
+
+static struct GPUTextureState {
+	int curtile, tile;
+	int curtilemode, tilemode;
+	int curtileXRep, tileXRep;
+	int curtileYRep, tileYRep;
+	Image *ima, *curima;
+
+	int domipmap, linearmipmap;
+
+	int alphamode;
+	MTFace *lasttface;
+} GTS = {0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, 1, 0, -1, NULL};
+
+/* Mipmap settings */
+
+void GPU_set_mipmap(int mipmap)
+{
+	if (GTS.domipmap != (mipmap != 0)) {
+		GPU_free_images();
+		GTS.domipmap = mipmap != 0;
+	}
+}
+
+void GPU_set_linear_mipmap(int linear)
+{
+	if (GTS.linearmipmap != (linear != 0)) {
+		GPU_free_images();
+		GTS.linearmipmap = linear != 0;
+	}
+}
+
+static int gpu_get_mipmap(void)
+{
+	return GTS.domipmap && (!(G.f & G_TEXTUREPAINT));
+}
+
+static GLenum gpu_get_mipmap_filter()
+{
+	return GTS.linearmipmap? GL_LINEAR_MIPMAP_LINEAR: GL_LINEAR_MIPMAP_NEAREST;
+}
+
+/* Set OpenGL state for an MTFace */
+
+static void gpu_make_repbind(Image *ima)
+{
+	ImBuf *ibuf;
+	
+	ibuf = BKE_image_get_ibuf(ima, NULL);
+	if(ibuf==NULL)
+		return;
+
+	if(ima->repbind) {
+		glDeleteTextures(ima->totbind, (GLuint *)ima->repbind);
+		MEM_freeN(ima->repbind);
+		ima->repbind= 0;
+		ima->tpageflag &= ~IMA_MIPMAP_COMPLETE;
+	}
+
+	ima->totbind= ima->xrep*ima->yrep;
+
+	if(ima->totbind>1)
+		ima->repbind= MEM_callocN(sizeof(int)*ima->totbind, "repbind");
+}
+
+static void gpu_clear_tpage()
+{
+	if(GTS.lasttface==0)
+		return;
+	
+	GTS.lasttface= 0;
+	GTS.curtile= 0;
+	GTS.curima= 0;
+	if(GTS.curtilemode!=0) {
+		glMatrixMode(GL_TEXTURE);
+		glLoadIdentity();
+		glMatrixMode(GL_MODELVIEW);
+	}
+	GTS.curtilemode= 0;
+	GTS.curtileXRep=0;
+	GTS.curtileYRep=0;
+	GTS.alphamode= -1;
+	
+	glDisable(GL_BLEND);
+	glDisable(GL_TEXTURE_2D);
+	glDisable(GL_TEXTURE_GEN_S);
+	glDisable(GL_TEXTURE_GEN_T);
+	glDisable(GL_ALPHA_TEST);
+}
+
+static void gpu_set_blend_mode(GPUBlendMode blendmode)
+{
+	if(blendmode == GPU_BLEND_SOLID) {
+		glDisable(GL_BLEND);
+		glDisable(GL_ALPHA_TEST);
+		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	}
+	else if(blendmode==GPU_BLEND_ADD) {
+		glEnable(GL_BLEND);
+		glBlendFunc(GL_ONE, GL_ONE);
+		glDisable(GL_ALPHA_TEST);
+	}
+	else if(blendmode==GPU_BLEND_ALPHA) {
+		glEnable(GL_BLEND);
+		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		
+		/* if U.glalphaclip == 1.0, some cards go bonkers...
+		 * turn off alpha test in this case */
+
+		/* added after 2.45 to clip alpha */
+		if(U.glalphaclip == 1.0) {
+			glDisable(GL_ALPHA_TEST);
+		}
+		else {
+			glEnable(GL_ALPHA_TEST);
+			glAlphaFunc(GL_GREATER, U.glalphaclip);
+		}
+	}
+	else if(blendmode==GPU_BLEND_CLIP) {
+		glDisable(GL_BLEND); 
+		glEnable(GL_ALPHA_TEST);
+		glAlphaFunc(GL_GREATER, 0.5f);
+	}
+}
+
+static void gpu_verify_alpha_mode(MTFace *tface)
+{
+	/* verify alpha blending modes */
+	if(GTS.alphamode == tface->transp)
+		return;
+
+	gpu_set_blend_mode(tface->transp);
+	GTS.alphamode= tface->transp;
+}
+
+static void gpu_verify_reflection(Image *ima)
+{
+	if (ima && (ima->flag & IMA_REFLECT)) {
+		/* enable reflection mapping */
+		glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP);
+		glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP);
+
+		glEnable(GL_TEXTURE_GEN_S);
+		glEnable(GL_TEXTURE_GEN_T);
+	}
+	else {
+		/* disable reflection mapping */
+		glDisable(GL_TEXTURE_GEN_S);
+		glDisable(GL_TEXTURE_GEN_T);
+	}
+}
+
+int GPU_verify_image(Image *ima, int tftile, int tfmode, int compare)
+{
+	ImBuf *ibuf = NULL;
+	unsigned int *bind = NULL;
+	int rectw, recth, tpx=0, tpy=0, y;
+	unsigned int *rectrow, *tilerectrow;
+	unsigned int *tilerect= NULL, *scalerect= NULL, *rect= NULL;
+	short texwindx, texwindy, texwinsx, texwinsy;
+
+	/* initialize tile mode and number of repeats */
+	GTS.ima = ima;
+	GTS.tilemode= (tfmode & TF_TILES) || (ima && (ima->tpageflag & IMA_TWINANIM));
+	GTS.tileXRep = 0;
+	GTS.tileYRep = 0;
+
+	/* setting current tile according to frame */
+	if(ima && (ima->tpageflag & IMA_TWINANIM))
+		GTS.tile= ima->lastframe;
+	else
+		GTS.tile= tftile;
+
+	if(ima) {
+		GTS.tileXRep = ima->xrep;
+		GTS.tileYRep = ima->yrep;
+	}
+
+	/* if same image & tile, we're done */
+	if(compare && ima == GTS.curima && GTS.curtile == GTS.tile &&
+	   GTS.tilemode == GTS.curtilemode && GTS.curtileXRep == GTS.tileXRep &&
+	   GTS.curtileYRep == GTS.tileYRep)
+		return (ima!=0);
+
+	/* if tiling mode or repeat changed, change texture matrix to fit */
+	if(GTS.tilemode!=GTS.curtilemode || GTS.curtileXRep!=GTS.tileXRep ||
+	   GTS.curtileYRep != GTS.tileYRep) {
+
+		glMatrixMode(GL_TEXTURE);
+		glLoadIdentity();
+
+		if((tfmode & TF_TILES) && ima!=NULL)
+			glScalef(ima->xrep, ima->yrep, 1.0);
+
+		glMatrixMode(GL_MODELVIEW);
+	}
+
+	/* check if we have a valid image */
+	if(ima==NULL || ima->ok==0)
+		return 0;
+
+	/* check if we have a valid image buffer */
+	ibuf= BKE_image_get_ibuf(ima, NULL);
+
+	if(ibuf==NULL)
+		return 0;
+
+	/* ensure we have a char buffer and not only float */
+	if ((ibuf->rect==NULL) && ibuf->rect_float)
+		IMB_rect_from_float(ibuf);
+
+	if(GTS.tilemode) {
+		/* tiled mode */
+		if(ima->repbind==0) gpu_make_repbind(ima);
+		if(GTS.tile>=ima->totbind) GTS.tile= 0;
+		
+		/* this happens when you change repeat buttons */
+		if(ima->repbind) bind= &ima->repbind[GTS.tile];
+		else bind= &ima->bindcode;
+		
+		if(*bind==0) {
+			
+			texwindx= ibuf->x/ima->xrep;
+			texwindy= ibuf->y/ima->yrep;
+			
+			if(GTS.tile>=ima->xrep*ima->yrep)
+				GTS.tile= ima->xrep*ima->yrep-1;
+	
+			texwinsy= GTS.tile / ima->xrep;
+			texwinsx= GTS.tile - texwinsy*ima->xrep;
+	
+			texwinsx*= texwindx;
+			texwinsy*= texwindy;
+	
+			tpx= texwindx;
+			tpy= texwindy;
+
+			rect= ibuf->rect + texwinsy*ibuf->x + texwinsx;
+		}
+	}
+	else {
+		/* regular image mode */
+		bind= &ima->bindcode;
+		
+		if(*bind==0) {
+			tpx= ibuf->x;
+			tpy= ibuf->y;
+			rect= ibuf->rect;
+		}
+	}
+
+	if(*bind != 0) {
+		/* enable opengl drawing with textures */
+		glBindTexture(GL_TEXTURE_2D, *bind);
+		return *bind;
+	}
+
+	rectw = tpx;
+	recth = tpy;
+
+	/* for tiles, copy only part of image into buffer */
+	if (GTS.tilemode) {
+		tilerect= MEM_mallocN(rectw*recth*sizeof(*tilerect), "tilerect");
+
+		for (y=0; y<recth; y++) {
+			rectrow= &rect[y*ibuf->x];
+			tilerectrow= &tilerect[y*rectw];
+				
+			memcpy(tilerectrow, rectrow, tpx*sizeof(*rectrow));
+		}
+			
+		rect= tilerect;
+	}
+
+	/* scale if not a power of two */
+	if (!is_pow2_limit(rectw) || !is_pow2_limit(recth)) {
+		rectw= smaller_pow2_limit(rectw);
+		recth= smaller_pow2_limit(recth);
+		
+		scalerect= MEM_mallocN(rectw*recth*sizeof(*scalerect), "scalerect");
+		gluScaleImage(GL_RGBA, tpx, tpy, GL_UNSIGNED_BYTE, rect, rectw, recth, GL_UNSIGNED_BYTE, scalerect);
+		rect= scalerect;
+	}
+
+	/* create image */
+	glGenTextures(1, (GLuint *)bind);
+	glBindTexture( GL_TEXTURE_2D, *bind);
+
+	if (!gpu_get_mipmap()) {
+		glTexImage2D(GL_TEXTURE_2D, 0,  GL_RGBA,  rectw, recth, 0, GL_RGBA, GL_UNSIGNED_BYTE, rect);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+	}
+	else {
+		gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGBA, rectw, recth, GL_RGBA, GL_UNSIGNED_BYTE, rect);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gpu_get_mipmap_filter());
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+
+		ima->tpageflag |= IMA_MIPMAP_COMPLETE;
+	}
+
+	/* set to modulate with vertex color */
+	glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+		
+	/* clean up */
+	if (tilerect)
+		MEM_freeN(tilerect);
+	if (scalerect)
+		MEM_freeN(scalerect);
+
+	return *bind;
+}
+
+static void gpu_verify_repeat(Image *ima)
+{
+	/* set either clamp or repeat in X/Y */
+	if (ima->tpageflag & IMA_CLAMP_U)
+	   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+	else
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+
+	if (ima->tpageflag & IMA_CLAMP_V)
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+	else
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+}
+
+int GPU_set_tpage(MTFace *tface)
+{
+	Image *ima;
+	
+	/* check if we need to clear the state */
+	if(tface==0) {
+		gpu_clear_tpage();
+		return 0;
+	}
+
+	ima= tface->tpage;
+	GTS.lasttface= tface;
+
+	gpu_verify_alpha_mode(tface);
+	gpu_verify_reflection(ima);
+
+	if(GPU_verify_image(ima, tface->tile, tface->mode, 1)) {
+		GTS.curtile= GTS.tile;
+		GTS.curima= GTS.ima;
+		GTS.curtilemode= GTS.tilemode;
+		GTS.curtileXRep = GTS.tileXRep;
+		GTS.curtileYRep = GTS.tileYRep;
+
+		glEnable(GL_TEXTURE_2D);
+	}
+	else {
+		glDisable(GL_TEXTURE_2D);
+		
+		GTS.curtile= 0;
+		GTS.curima= 0;
+		GTS.curtilemode= 0;
+		GTS.curtileXRep = 0;
+		GTS.curtileYRep = 0;
+
+		return 0;
+	}
+	
+	gpu_verify_repeat(ima);
+	
+	/* Did this get lost in the image recode? */
+	/* tag_image_time(ima);*/
+
+	return 1;
+}
+
+/* these two functions are called on entering and exiting texture paint mode,
+   temporary disabling/enabling mipmapping on all images for quick texture
+   updates with glTexSubImage2D. images that didn't change don't have to be
+   re-uploaded to OpenGL */
+void GPU_paint_set_mipmap(int mipmap)
+{
+	Image* ima;
+	
+	if(!GTS.domipmap)
+		return;
+
+	if(mipmap) {
+		for(ima=G.main->image.first; ima; ima=ima->id.next) {
+			if(ima->bindcode) {
+				if(ima->tpageflag & IMA_MIPMAP_COMPLETE) {
+					glBindTexture(GL_TEXTURE_2D, ima->bindcode);
+					glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gpu_get_mipmap_filter());
+					glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+				}
+				else
+					GPU_free_image(ima);
+			}
+		}
+
+	}
+	else {
+		for(ima=G.main->image.first; ima; ima=ima->id.next) {
+			if(ima->bindcode) {
+				glBindTexture(GL_TEXTURE_2D, ima->bindcode);
+				glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+				glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+			}
+		}
+	}
+}
+
+void GPU_paint_update_image(Image *ima, int x, int y, int w, int h)
+{
+	ImBuf *ibuf;
+	
+	ibuf = BKE_image_get_ibuf(ima, NULL);
+	
+	if (ima->repbind || gpu_get_mipmap() || !ima->bindcode || !ibuf ||
+		(!is_pow2(ibuf->x) || !is_pow2(ibuf->y)) ||
+		(w == 0) || (h == 0)) {
+		/* these cases require full reload still */
+		GPU_free_image(ima);
+	}
+	else {
+		/* for the special case, we can do a partial update
+		 * which is much quicker for painting */
+		GLint row_length, skip_pixels, skip_rows;
+
+		glGetIntegerv(GL_UNPACK_ROW_LENGTH, &row_length);
+		glGetIntegerv(GL_UNPACK_SKIP_PIXELS, &skip_pixels);
+		glGetIntegerv(GL_UNPACK_SKIP_ROWS, &skip_rows);
+
+		if ((ibuf->rect==NULL) && ibuf->rect_float)
+			IMB_rect_from_float(ibuf);
+
+		glBindTexture(GL_TEXTURE_2D, ima->bindcode);
+
+		glPixelStorei(GL_UNPACK_ROW_LENGTH, ibuf->x);
+		glPixelStorei(GL_UNPACK_SKIP_PIXELS, x);
+		glPixelStorei(GL_UNPACK_SKIP_ROWS, y);
+
+		glTexSubImage2D(GL_TEXTURE_2D, 0, x, y, w, h, GL_RGBA,
+			GL_UNSIGNED_BYTE, ibuf->rect);
+
+		glPixelStorei(GL_UNPACK_ROW_LENGTH, row_length);
+		glPixelStorei(GL_UNPACK_SKIP_PIXELS, skip_pixels);
+		glPixelStorei(GL_UNPACK_SKIP_ROWS, skip_rows);
+
+		if(ima->tpageflag & IMA_MIPMAP_COMPLETE)
+			ima->tpageflag &= ~IMA_MIPMAP_COMPLETE;
+	}
+}
+
+void GPU_update_images_framechange(void)
+{
+	Image *ima;
+	
+	for(ima=G.main->image.first; ima; ima=ima->id.next) {
+		if(ima->tpageflag & IMA_TWINANIM) {
+			if(ima->twend >= ima->xrep*ima->yrep)
+				ima->twend= ima->xrep*ima->yrep-1;
+		
+			/* check: is bindcode not in the array? free. (to do) */
+			
+			ima->lastframe++;
+			if(ima->lastframe > ima->twend)
+				ima->lastframe= ima->twsta;
+		}
+	}
+}
+
+int GPU_update_image_time(Image *ima, double time)
+{
+	int	inc = 0;
+	float	diff;
+	int	newframe;
+
+	if (!ima)
+		return 0;
+
+	if (ima->lastupdate<0)
+		ima->lastupdate = 0;
+
+	if (ima->lastupdate>time)
+		ima->lastupdate=(float)time;
+
+	if(ima->tpageflag & IMA_TWINANIM) {
+		if(ima->twend >= ima->xrep*ima->yrep) ima->twend= ima->xrep*ima->yrep-1;
+		
+		/* check: is the bindcode not in the array? Then free. (still to do) */
+		
+		diff = (float)(time-ima->lastupdate);
+		inc = (int)(diff*(float)ima->animspeed);
+
+		ima->lastupdate+=((float)inc/(float)ima->animspeed);
+
+		newframe = ima->lastframe+inc;
+
+		if(newframe > (int)ima->twend) {
+			if(ima->twend-ima->twsta != 0)
+				newframe = (int)ima->twsta-1 + (newframe-ima->twend)%(ima->twend-ima->twsta);
+			else
+				newframe = ima->twsta;
+		}
+
+		ima->lastframe = newframe;
+	}
+
+	return inc;
+}
+
+void GPU_free_image(Image *ima)
+{
+	/* free regular image binding */
+	if(ima->bindcode) {
+		glDeleteTextures(1, (GLuint *)&ima->bindcode);
+		ima->bindcode= 0;
+		ima->tpageflag &= ~IMA_MIPMAP_COMPLETE;
+	}
+
+	/* free glsl image binding */
+	if(ima->gputexture) {
+		GPU_texture_free(ima->gputexture);
+		ima->gputexture= NULL;
+	}
+
+	/* free repeated image binding */
+	if(ima->repbind) {
+		glDeleteTextures(ima->totbind, (GLuint *)ima->repbind);
+	
+		MEM_freeN(ima->repbind);
+		ima->repbind= NULL;
+		ima->tpageflag &= ~IMA_MIPMAP_COMPLETE;
+	}
+}
+
+void GPU_free_images(void)
+{
+	Image* ima;
+
+	for(ima=G.main->image.first; ima; ima=ima->id.next)
+		GPU_free_image(ima);
+}
+
+/* OpenGL Materials */
+
+/* materials start counting at # one.... */
+#define MAXMATBUF (MAXMAT+1)
+
+/* OpenGL state caching for materials */
+
+static struct GPUMaterialState {
+	float matbuf[MAXMATBUF][2][4];
+	int totmat;
+
+	Material *gmatbuf[MAXMATBUF];
+	Material *gboundmat;
+	Object *gob;
+	Scene *gscene;
+
+	GPUBlendMode blendmode[MAXMATBUF];
+	int alphapass;
+
+	int lastmatnr, lastretval;
+	GPUBlendMode lastblendmode;
+} GMS;
+
+Material *gpu_active_node_material(Material *ma)
+{
+	if(ma && ma->use_nodes && ma->nodetree) {
+		bNode *node= nodeGetActiveID(ma->nodetree, ID_MA);
+
+		if(node)
+			return (Material *)node->id;
+		else
+			return NULL;
+	}
+
+	return ma;
+}
+
+void GPU_set_object_materials(Scene *scene, Object *ob, int glsl, int *do_alpha_pass)
+{
+	extern Material defmaterial; /* from material.c */
+	Material *ma;
+	GPUMaterial *gpumat;
+	GPUBlendMode blendmode;
+	int a;
+	
+	/* initialize state */
+	memset(&GMS, 0, sizeof(GMS));
+	GMS.lastmatnr = -1;
+	GMS.lastretval = -1;
+	GMS.lastblendmode = GPU_BLEND_SOLID;
+
+	GMS.gob = ob;
+	GMS.gscene = scene;
+	GMS.totmat= ob->totcol;
+
+	GMS.alphapass = (G.vd && G.vd->transp);
+	if(do_alpha_pass)
+		*do_alpha_pass = 0;
+
+	/* no materials assigned? */
+	if(ob->totcol==0) {
+		GMS.matbuf[0][0][0]= defmaterial.r;
+		GMS.matbuf[0][0][1]= defmaterial.g;
+		GMS.matbuf[0][0][2]= defmaterial.b;
+		GMS.matbuf[0][0][3]= 1.0;
+
+		GMS.matbuf[0][1][0]= defmaterial.specr;
+		GMS.matbuf[0][1][1]= defmaterial.specg;
+		GMS.matbuf[0][1][2]= defmaterial.specb;
+		GMS.matbuf[0][1][3]= 1.0;
+		
+		/* do material 1 too, for displists! */
+		QUATCOPY(GMS.matbuf[1][0], GMS.matbuf[0][0]);
+		QUATCOPY(GMS.matbuf[1][1], GMS.matbuf[0][1]);
+
+		if(glsl) {
+			GMS.gmatbuf[0]= &defmaterial;
+			GPU_material_from_blender(GMS.gscene, &defmaterial);
+		}
+
+		GMS.blendmode[0]= GPU_BLEND_SOLID;
+	}
+	
+	/* setup materials */
+	for(a=1; a<=ob->totcol; a++) {
+		/* find a suitable material */
+		ma= give_current_material(ob, a);
+		if(!glsl) ma= gpu_active_node_material(ma);
+		if(ma==NULL) ma= &defmaterial;
+
+		/* this shouldn't happen .. */
+		if(a>=MAXMATBUF)
+			continue;
+
+		/* create glsl material if requested */
+		gpumat = (glsl)? GPU_material_from_blender(GMS.gscene, ma): NULL;
+
+		if(gpumat) {
+			/* do glsl only if creating it succeed, else fallback */
+			GMS.gmatbuf[a]= ma;
+			blendmode = GPU_material_blend_mode(gpumat, ob->col);
+		}
+		else {
+			/* fixed function opengl materials */
+			if (ma->mode & MA_SHLESS) {
+				GMS.matbuf[a][0][0]= ma->r;
+				GMS.matbuf[a][0][1]= ma->g;
+				GMS.matbuf[a][0][2]= ma->b;
+			} else {
+				GMS.matbuf[a][0][0]= (ma->ref+ma->emit)*ma->r;
+				GMS.matbuf[a][0][1]= (ma->ref+ma->emit)*ma->g;
+				GMS.matbuf[a][0][2]= (ma->ref+ma->emit)*ma->b;
+
+				GMS.matbuf[a][1][0]= ma->spec*ma->specr;
+				GMS.matbuf[a][1][1]= ma->spec*ma->specg;
+				GMS.matbuf[a][1][2]= ma->spec*ma->specb;
+				GMS.matbuf[a][1][3]= 1.0;
+			}
+
+			blendmode = (ma->alpha == 1.0f)? GPU_BLEND_SOLID: GPU_BLEND_ALPHA;
+			if(do_alpha_pass && GMS.alphapass)
+				GMS.matbuf[a][0][3]= ma->alpha;
+			else
+				GMS.matbuf[a][0][3]= 1.0f;
+		}
+
+		/* setting do_alpha_pass = 1 indicates this object needs to be
+		 * drawn in a second alpha pass for improved blending */
+		if(do_alpha_pass) {
+			GMS.blendmode[a]= blendmode;
+			if(ELEM(blendmode, GPU_BLEND_ALPHA, GPU_BLEND_ADD) && !GMS.alphapass)
+				*do_alpha_pass= 1;
+		}
+	}
+
+	/* let's start with a clean state */
+	GPU_disable_material();
+}
+
+int GPU_enable_material(int nr, void *attribs)
+{
+	GPUVertexAttribs *gattribs = attribs;
+	GPUMaterial *gpumat;
+	GPUBlendMode blendmode;
+
+	/* prevent index to use un-initialized array items */
+	if(nr>GMS.totmat)
+		nr= GMS.totmat;
+
+	if(gattribs)
+		memset(gattribs, 0, sizeof(*gattribs));
+
+	/* keep current material */
+	if(nr>=MAXMATBUF || nr==GMS.lastmatnr)
+		return GMS.lastretval;
+
+	/* unbind glsl material */
+	if(GMS.gboundmat) {
+		if(GMS.alphapass) glDepthMask(0);
+		GPU_material_unbind(GPU_material_from_blender(GMS.gscene, GMS.gboundmat));
+		GMS.gboundmat= NULL;
+	}
+
+	/* draw materials with alpha in alpha pass */
+	GMS.lastmatnr = nr;
+	GMS.lastretval = ELEM(GMS.blendmode[nr], GPU_BLEND_SOLID, GPU_BLEND_CLIP);
+	if(GMS.alphapass)
+		GMS.lastretval = !GMS.lastretval;
+
+	if(GMS.lastretval) {
+		if(gattribs && GMS.gmatbuf[nr]) {
+			/* bind glsl material and get attributes */
+			Material *mat = GMS.gmatbuf[nr];
+
+			gpumat = GPU_material_from_blender(GMS.gscene, mat);
+			GPU_material_vertex_attributes(gpumat, gattribs);
+			GPU_material_bind(gpumat, GMS.gob->lay, 1.0);
+			GPU_material_bind_uniforms(gpumat, GMS.gob->obmat, G.vd->viewmat, G.vd->viewinv, GMS.gob->col);
+			GMS.gboundmat= mat;
+
+			if(GMS.alphapass) glDepthMask(1);
+		}
+		else {
+			/* or do fixed function opengl material */
+			glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, GMS.matbuf[nr][0]);
+			glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, GMS.matbuf[nr][1]);
+		}
+
+		/* set (alpha) blending mode */
+		blendmode = (GMS.alphapass)? GPU_BLEND_ALPHA: GPU_BLEND_SOLID;
+		GPU_set_material_blend_mode(blendmode);
+	}
+
+	return GMS.lastretval;
+}
+
+void GPU_set_material_blend_mode(int blendmode)
+{
+	if(GMS.lastblendmode == blendmode)
+		return;
+	
+	gpu_set_blend_mode(blendmode);
+	GMS.lastblendmode = blendmode;
+}
+
+int GPU_get_material_blend_mode(void)
+{
+	return GMS.lastblendmode;
+}
+
+void GPU_disable_material(void)
+{
+	GMS.lastmatnr= -1;
+	GMS.lastretval= 1;
+
+	if(GMS.gboundmat) {
+		if(GMS.alphapass) glDepthMask(0);
+		GPU_material_unbind(GPU_material_from_blender(GMS.gscene, GMS.gboundmat));
+		GMS.gboundmat= NULL;
+	}
+
+	GPU_set_material_blend_mode(GPU_BLEND_SOLID);
+}
+
+/* Lights */
+
+int GPU_default_lights(void)
+{
+	int a, count = 0;
+	
+	/* initialize */
+	if(U.light[0].flag==0 && U.light[1].flag==0 && U.light[2].flag==0) {
+		U.light[0].flag= 1;
+		U.light[0].vec[0]= -0.3; U.light[0].vec[1]= 0.3; U.light[0].vec[2]= 0.9;
+		U.light[0].col[0]= 0.8; U.light[0].col[1]= 0.8; U.light[0].col[2]= 0.8;
+		U.light[0].spec[0]= 0.5; U.light[0].spec[1]= 0.5; U.light[0].spec[2]= 0.5;
+		U.light[0].spec[3]= 1.0;
+		
+		U.light[1].flag= 0;
+		U.light[1].vec[0]= 0.5; U.light[1].vec[1]= 0.5; U.light[1].vec[2]= 0.1;
+		U.light[1].col[0]= 0.4; U.light[1].col[1]= 0.4; U.light[1].col[2]= 0.8;
+		U.light[1].spec[0]= 0.3; U.light[1].spec[1]= 0.3; U.light[1].spec[2]= 0.5;
+		U.light[1].spec[3]= 1.0;
+	
+		U.light[2].flag= 0;
+		U.light[2].vec[0]= 0.3; U.light[2].vec[1]= -0.3; U.light[2].vec[2]= -0.2;
+		U.light[2].col[0]= 0.8; U.light[2].col[1]= 0.5; U.light[2].col[2]= 0.4;
+		U.light[2].spec[0]= 0.5; U.light[2].spec[1]= 0.4; U.light[2].spec[2]= 0.3;
+		U.light[2].spec[3]= 1.0;
+	}
+
+	glLightfv(GL_LIGHT0, GL_POSITION, U.light[0].vec); 
+	glLightfv(GL_LIGHT0, GL_DIFFUSE, U.light[0].col); 
+	glLightfv(GL_LIGHT0, GL_SPECULAR, U.light[0].spec); 
+
+	glLightfv(GL_LIGHT1, GL_POSITION, U.light[1].vec); 
+	glLightfv(GL_LIGHT1, GL_DIFFUSE, U.light[1].col); 
+	glLightfv(GL_LIGHT1, GL_SPECULAR, U.light[1].spec); 
+
+	glLightfv(GL_LIGHT2, GL_POSITION, U.light[2].vec); 
+	glLightfv(GL_LIGHT2, GL_DIFFUSE, U.light[2].col); 
+	glLightfv(GL_LIGHT2, GL_SPECULAR, U.light[2].spec); 
+
+	for(a=0; a<8; a++) {
+		if(a<3) {
+			if(U.light[a].flag) {
+				glEnable(GL_LIGHT0+a);
+				count++;
+			}
+			else
+				glDisable(GL_LIGHT0+a);
+			
+			// clear stuff from other opengl lamp usage
+			glLightf(GL_LIGHT0+a, GL_SPOT_CUTOFF, 180.0);
+			glLightf(GL_LIGHT0+a, GL_CONSTANT_ATTENUATION, 1.0);
+			glLightf(GL_LIGHT0+a, GL_LINEAR_ATTENUATION, 0.0);
+		}
+		else
+			glDisable(GL_LIGHT0+a);
+	}
+	
+	glDisable(GL_LIGHTING);
+
+	glDisable(GL_COLOR_MATERIAL);
+
+	return count;
+}
+
+int GPU_scene_object_lights(Scene *scene, Object *ob, int lay, float viewmat[][4])
+{
+	Base *base;
+	Lamp *la;
+	int count;
+	float position[4], direction[4], energy[4];
+	
+	/* disable all lights */
+	for(count=0; count<8; count++)
+		glDisable(GL_LIGHT0+count);
+	
+	count= 0;
+	
+	for(base=scene->base.first; base; base=base->next) {
+		if(base->object->type!=OB_LAMP)
+			continue;
+
+		if(!(base->lay & lay) || !(base->lay & ob->lay))
+			continue;
+
+		la= base->object->data;
+		
+		/* setup lamp transform */
+		glPushMatrix();
+		glLoadMatrixf((float *)viewmat);
+		
+		where_is_object_simul(base->object);
+		
+		if(la->type==LA_SUN) {
+			/* sun lamp */
+			VECCOPY(position, base->object->obmat[2]);
+			direction[3]= 0.0;
+
+			glLightfv(GL_LIGHT0+count, GL_POSITION, direction); 
+		}
+		else {
+			/* other lamps with attenuation */
+			VECCOPY(position, base->object->obmat[3]);
+			position[3]= 1.0f;
+
+			glLightfv(GL_LIGHT0+count, GL_POSITION, position); 
+			glLightf(GL_LIGHT0+count, GL_CONSTANT_ATTENUATION, 1.0);
+			glLightf(GL_LIGHT0+count, GL_LINEAR_ATTENUATION, la->att1/la->dist);
+			glLightf(GL_LIGHT0+count, GL_QUADRATIC_ATTENUATION, la->att2/(la->dist*la->dist));
+			
+			if(la->type==LA_SPOT) {
+				/* spot lamp */
+				direction[0]= -base->object->obmat[2][0];
+				direction[1]= -base->object->obmat[2][1];
+				direction[2]= -base->object->obmat[2][2];
+				glLightfv(GL_LIGHT0+count, GL_SPOT_DIRECTION, direction);
+				glLightf(GL_LIGHT0+count, GL_SPOT_CUTOFF, la->spotsize/2.0);
+				glLightf(GL_LIGHT0+count, GL_SPOT_EXPONENT, 128.0*la->spotblend);
+			}
+			else
+				glLightf(GL_LIGHT0+count, GL_SPOT_CUTOFF, 180.0);
+		}
+		
+		/* setup energy */
+		energy[0]= la->energy*la->r;
+		energy[1]= la->energy*la->g;
+		energy[2]= la->energy*la->b;
+		energy[3]= 1.0;
+
+		glLightfv(GL_LIGHT0+count, GL_DIFFUSE, energy); 
+		glLightfv(GL_LIGHT0+count, GL_SPECULAR, energy);
+		glEnable(GL_LIGHT0+count);
+		
+		glPopMatrix();					
+		
+		count++;
+		if(count==8)
+			break;
+	}
+
+	return count;
+}
+
+/* Default OpenGL State */
+
+void GPU_state_init(void)
+{
+	/* also called when doing opengl rendering and in the game engine */
+	float mat_ambient[] = { 0.0, 0.0, 0.0, 0.0 };
+	float mat_specular[] = { 0.5, 0.5, 0.5, 1.0 };
+	float mat_shininess[] = { 35.0 };
+	int a, x, y;
+	GLubyte pat[32*32];
+	const GLubyte *patc= pat;
+	
+	glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, mat_ambient);
+	glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, mat_specular);
+	glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, mat_specular);
+	glMaterialfv(GL_FRONT_AND_BACK, GL_SHININESS, mat_shininess);
+
+	GPU_default_lights();
+	
+	/* no local viewer, looks ugly in ortho mode */
+	/* glLightModelfv(GL_LIGHT_MODEL_LOCAL_VIEWER, &one); */
+	
+	glDepthFunc(GL_LEQUAL);
+	/* scaling matrices */
+	glEnable(GL_NORMALIZE);
+
+	glShadeModel(GL_FLAT);
+
+	glDisable(GL_ALPHA_TEST);
+	glDisable(GL_BLEND);
+	glDisable(GL_DEPTH_TEST);
+	glDisable(GL_FOG);
+	glDisable(GL_LIGHTING);
+	glDisable(GL_LOGIC_OP);
+	glDisable(GL_STENCIL_TEST);
+	glDisable(GL_TEXTURE_1D);
+	glDisable(GL_TEXTURE_2D);
+
+	/* default on, disable/enable should be local per function */
+	glEnableClientState(GL_VERTEX_ARRAY);
+	glEnableClientState(GL_NORMAL_ARRAY);
+	
+	glPixelTransferi(GL_MAP_COLOR, GL_FALSE);
+	glPixelTransferi(GL_RED_SCALE, 1);
+	glPixelTransferi(GL_RED_BIAS, 0);
+	glPixelTransferi(GL_GREEN_SCALE, 1);
+	glPixelTransferi(GL_GREEN_BIAS, 0);
+	glPixelTransferi(GL_BLUE_SCALE, 1);
+	glPixelTransferi(GL_BLUE_BIAS, 0);
+	glPixelTransferi(GL_ALPHA_SCALE, 1);
+	glPixelTransferi(GL_ALPHA_BIAS, 0);
+	
+	glPixelTransferi(GL_DEPTH_BIAS, 0);
+	glPixelTransferi(GL_DEPTH_SCALE, 1);
+	glDepthRange(0.0, 1.0);
+	
+	a= 0;
+	for(x=0; x<32; x++) {
+		for(y=0; y<4; y++) {
+			if( (x) & 1) pat[a++]= 0x88;
+			else pat[a++]= 0x22;
+		}
+	}
+	
+	glPolygonStipple(patc);
+
+	glMatrixMode(GL_TEXTURE);
+	glLoadIdentity();
+	glMatrixMode(GL_MODELVIEW);
+
+	glFrontFace(GL_CCW);
+	glCullFace(GL_BACK);
+	glDisable(GL_CULL_FACE);
+}
+
diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c
new file mode 100644
index 00000000000..d900f9c63f2
--- /dev/null
+++ b/source/blender/gpu/intern/gpu_extensions.c
@@ -0,0 +1,987 @@
+/**
+ * $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. 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) 2005 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): Brecht Van Lommel.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include "GL/glew.h"
+
+#include "DNA_listBase.h"
+#include "DNA_image_types.h"
+#include "DNA_userdef_types.h"
+
+#include "MEM_guardedalloc.h"
+
+#include "BKE_image.h"
+#include "BKE_global.h"
+
+#include "IMB_imbuf.h"
+#include "IMB_imbuf_types.h"
+
+#include "BLI_blenlib.h"
+
+#include "GPU_draw.h"
+#include "GPU_extensions.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+/* Extensions support */
+
+/* extensions used:
+	- texture border clamp: 1.3 core
+	- fragement shader: 2.0 core
+	- framebuffer object: ext specification
+	- multitexture 1.3 core
+	- arb non power of two: 2.0 core
+	- pixel buffer objects? 2.1 core
+	- arb draw buffers? 2.0 core
+*/
+
+struct GPUGlobal {
+	GLint maxtextures;
+	GLuint currentfb;
+	int minimumsupport;
+} GG = {1, 0, 0};
+
+void GPU_extensions_init()
+{
+	glewInit();
+
+	/* glewIsSupported("GL_VERSION_2_0") */
+
+	if (GLEW_ARB_multitexture)
+		glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS_ARB, &GG.maxtextures);
+
+	GG.minimumsupport = 1;
+	if (!GLEW_ARB_multitexture) GG.minimumsupport = 0;
+	if (!GLEW_ARB_vertex_shader) GG.minimumsupport = 0;
+	if (!GLEW_ARB_fragment_shader) GG.minimumsupport = 0;
+}
+
+int GPU_extensions_minimum_support()
+{
+	return GG.minimumsupport;
+}
+
+int GPU_print_error(char *str)
+{
+	GLenum errCode;
+
+	if (G.f & G_DEBUG) {
+		if ((errCode = glGetError()) != GL_NO_ERROR) {
+    	    fprintf(stderr, "%s opengl error: %s\n", str, gluErrorString(errCode));
+			return 1;
+		}
+	}
+
+	return 0;
+}
+
+static void GPU_print_framebuffer_error(GLenum status)
+{
+	fprintf(stderr, "GPUFrameBuffer: framebuffer incomplete error %d\n",
+		(int)status);
+
+	switch(status) {
+		case GL_FRAMEBUFFER_COMPLETE_EXT:
+			break;
+		case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT:
+			fprintf(stderr, "Incomplete attachment.\n");
+			break;
+		case GL_FRAMEBUFFER_UNSUPPORTED_EXT:
+			fprintf(stderr, "Unsupported framebuffer format.\n");
+			break;
+		case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT:
+			fprintf(stderr, "Missing attachment.\n");
+			break;
+		case GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT:
+			fprintf(stderr, "Attached images must have same dimensions.\n");
+			break;
+		case GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT:
+			 fprintf(stderr, "Attached images must have same format.\n");
+			break;
+		case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT:
+			fprintf(stderr, "Missing draw buffer.\n");
+			break;
+		case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT:
+			fprintf(stderr, "Missing read buffer.\n");
+			break;
+		default:
+			fprintf(stderr, "Unknown.\n");
+			break;
+	}
+}
+
+/* GPUTexture */
+
+struct GPUTexture {
+	int w, h;				/* width/height */
+	int number;				/* number for multitexture binding */
+	int refcount;			/* reference count */
+	GLenum target;			/* GL_TEXTURE_* */
+	GLuint bindcode;		/* opengl identifier for texture */
+	int fromblender;		/* we got the texture from Blender */
+
+	GPUFrameBuffer *fb;		/* GPUFramebuffer this texture is attached to */
+	int depth;				/* is a depth texture? */
+};
+
+#define FTOCHAR(val) val<=0.0f?0: (val>=1.0f?255: (char)(255.0f*val))
+static unsigned char *GPU_texture_convert_pixels(int length, float *fpixels)
+{
+	unsigned char *pixels, *p;
+	float *fp;
+	int a, len;
+
+	len = 4*length;
+	fp = fpixels;
+	p = pixels = MEM_callocN(sizeof(unsigned char)*len, "GPUTexturePixels");
+
+	for (a=0; a<len; a++, p++, fp++)
+		*p = FTOCHAR((*fp));
+
+	return pixels;
+}
+
+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;
+}
+
+static void GPU_glTexSubImageEmpty(GLenum target, GLenum format, int x, int y, int w, int h)
+{
+	void *pixels = MEM_callocN(sizeof(char)*4*w*h, "GPUTextureEmptyPixels");
+
+	if (target == GL_TEXTURE_1D)
+		glTexSubImage1D(target, 0, x, w, format, GL_UNSIGNED_BYTE, pixels);
+	else
+		glTexSubImage2D(target, 0, x, y, w, h, format, GL_UNSIGNED_BYTE, pixels);
+	
+	MEM_freeN(pixels);
+}
+
+static GPUTexture *GPU_texture_create_nD(int w, int h, int n, float *fpixels, int depth)
+{
+	GPUTexture *tex;
+	GLenum type, format, internalformat;
+	void *pixels = NULL;
+
+	if(depth && !GLEW_ARB_depth_texture)
+		return NULL;
+
+	tex = MEM_callocN(sizeof(GPUTexture), "GPUTexture");
+	tex->w = w;
+	tex->h = h;
+	tex->number = -1;
+	tex->refcount = 1;
+	tex->target = (n == 1)? GL_TEXTURE_1D: GL_TEXTURE_2D;
+	tex->depth = depth;
+
+	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->number = 0;
+	glBindTexture(tex->target, tex->bindcode);
+
+	if(depth) {
+		type = GL_UNSIGNED_BYTE;
+		format = GL_DEPTH_COMPONENT;
+		internalformat = GL_DEPTH_COMPONENT;
+	}
+	else {
+		type = GL_UNSIGNED_BYTE;
+		format = GL_RGBA;
+		internalformat = GL_RGBA8;
+
+		if (fpixels)
+			pixels = GPU_texture_convert_pixels(w*h, fpixels);
+	}
+
+	if (tex->target == GL_TEXTURE_1D) {
+		glTexImage1D(tex->target, 0, internalformat, tex->w, 0, format, type, 0);
+
+		if (fpixels) {
+			glTexSubImage1D(tex->target, 0, 0, w, format, type,
+				pixels? pixels: fpixels);
+
+			if (tex->w > w)
+				GPU_glTexSubImageEmpty(tex->target, format, w, 0,
+					tex->w-w, 1);
+		}
+	}
+	else {
+		glTexImage2D(tex->target, 0, internalformat, tex->w, tex->h, 0,
+			format, type, 0);
+
+		if (fpixels) {
+			glTexSubImage2D(tex->target, 0, 0, 0, w, h,
+				format, type, pixels? pixels: fpixels);
+
+			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);
+		}
+	}
+
+	if (pixels)
+		MEM_freeN(pixels);
+
+	if(depth) {
+		glTexParameteri(tex->target, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+		glTexParameteri(tex->target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+		glTexParameteri(tex->target, GL_TEXTURE_COMPARE_MODE_ARB, GL_COMPARE_R_TO_TEXTURE);
+		glTexParameteri(tex->target, GL_TEXTURE_COMPARE_FUNC_ARB, GL_LEQUAL);
+		glTexParameteri(tex->target, GL_DEPTH_TEXTURE_MODE_ARB, GL_INTENSITY);  
+	}
+	else {
+		glTexParameteri(tex->target, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+		glTexParameteri(tex->target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+	}
+
+	if (tex->target != GL_TEXTURE_1D) {
+		/* CLAMP_TO_BORDER is an OpenGL 1.3 core feature */
+		GLenum wrapmode = (depth)? GL_CLAMP_TO_EDGE: GL_CLAMP_TO_BORDER;
+		glTexParameteri(tex->target, GL_TEXTURE_WRAP_S, wrapmode);
+		glTexParameteri(tex->target, GL_TEXTURE_WRAP_T, wrapmode);
+
+#if 0
+		float borderColor[] = { 1.0f, 1.0f, 1.0f, 1.0f };
+		glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, borderColor); 
+#endif
+	}
+	else
+		glTexParameteri(tex->target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+
+	return tex;
+}
+
+GPUTexture *GPU_texture_from_blender(Image *ima, ImageUser *iuser, double time)
+{
+	GPUTexture *tex;
+	GLint w, h, border, lastbindcode, bindcode;
+
+	glGetIntegerv(GL_TEXTURE_BINDING_2D, &lastbindcode);
+
+	GPU_update_image_time(ima, time);
+	bindcode = GPU_verify_image(ima, 0, 0, 0);
+
+	if(ima->gputexture) {
+		ima->gputexture->bindcode = bindcode;
+		glBindTexture(GL_TEXTURE_2D, lastbindcode);
+		return ima->gputexture;
+	}
+
+	if(!bindcode) {
+		glBindTexture(GL_TEXTURE_2D, lastbindcode);
+		return NULL;
+	}
+
+	tex = MEM_callocN(sizeof(GPUTexture), "GPUTexture");
+	tex->bindcode = bindcode;
+	tex->number = -1;
+	tex->refcount = 1;
+	tex->target = GL_TEXTURE_2D;
+	tex->fromblender = 1;
+
+	ima->gputexture= tex;
+
+	if (!glIsTexture(tex->bindcode)) {
+		GPU_print_error("Blender Texture");
+	}
+	else {
+		glBindTexture(GL_TEXTURE_2D, tex->bindcode);
+		glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &w);
+		glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT, &h);
+		glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_BORDER, &border);
+
+		tex->w = w - border;
+		tex->h = h - border;
+	}
+
+	glBindTexture(GL_TEXTURE_2D, lastbindcode);
+
+	return tex;
+}
+
+GPUTexture *GPU_texture_create_1D(int w, float *fpixels)
+{
+	GPUTexture *tex = GPU_texture_create_nD(w, 1, 1, fpixels, 0);
+
+	if (tex)
+		GPU_texture_unbind(tex);
+	
+	return tex;
+}
+
+GPUTexture *GPU_texture_create_2D(int w, int h, float *fpixels)
+{
+	GPUTexture *tex = GPU_texture_create_nD(w, h, 2, fpixels, 0);
+
+	if (tex)
+		GPU_texture_unbind(tex);
+	
+	return tex;
+}
+
+GPUTexture *GPU_texture_create_depth(int w, int h)
+{
+	GPUTexture *tex = GPU_texture_create_nD(w, h, 2, NULL, 1);
+
+	if (tex)
+		GPU_texture_unbind(tex);
+	
+	return tex;
+}
+
+void GPU_texture_bind(GPUTexture *tex, int number)
+{
+	GLenum arbnumber;
+
+	if (number >= GG.maxtextures) {
+		GPU_print_error("Not enough texture slots.");
+		return;
+	}
+
+	if(number == -1)
+		return;
+
+	GPU_print_error("Pre Texture Bind");
+
+	arbnumber = (GLenum)((GLuint)GL_TEXTURE0_ARB + number);
+	if (number != 0) glActiveTextureARB(arbnumber);
+	glBindTexture(tex->target, tex->bindcode);
+	glEnable(tex->target);
+	if (number != 0) glActiveTextureARB(GL_TEXTURE0_ARB);
+
+	tex->number = number;
+
+	GPU_print_error("Post Texture Bind");
+}
+
+void GPU_texture_unbind(GPUTexture *tex)
+{
+	GLenum arbnumber;
+
+	if (tex->number >= GG.maxtextures) {
+		GPU_print_error("Not enough texture slots.");
+		return;
+	}
+
+	if(tex->number == -1)
+		return;
+	
+	GPU_print_error("Pre Texture Unbind");
+
+	arbnumber = (GLenum)((GLuint)GL_TEXTURE0_ARB + tex->number);
+	if (tex->number != 0) glActiveTextureARB(arbnumber);
+	glBindTexture(tex->target, 0);
+	glDisable(tex->target);
+	if (tex->number != 0) glActiveTextureARB(GL_TEXTURE0_ARB);
+
+	tex->number = -1;
+
+	GPU_print_error("Post Texture Unbind");
+}
+
+void GPU_texture_free(GPUTexture *tex)
+{
+	tex->refcount--;
+
+	if (tex->refcount < 0)
+		fprintf(stderr, "GPUTexture: negative refcount\n");
+	
+	if (tex->refcount == 0) {
+		if (tex->fb)
+			GPU_framebuffer_texture_detach(tex->fb, tex);
+		if (tex->bindcode && !tex->fromblender)
+			glDeleteTextures(1, &tex->bindcode);
+
+		MEM_freeN(tex);
+	}
+}
+
+void GPU_texture_ref(GPUTexture *tex)
+{
+	tex->refcount++;
+}
+
+int GPU_texture_target(GPUTexture *tex)
+{
+	return tex->target;
+}
+
+int GPU_texture_opengl_width(GPUTexture *tex)
+{
+	return tex->w;
+}
+
+int GPU_texture_opengl_height(GPUTexture *tex)
+{
+	return tex->h;
+}
+
+GPUFrameBuffer *GPU_texture_framebuffer(GPUTexture *tex)
+{
+	return tex->fb;
+}
+
+/* GPUFrameBuffer */
+
+struct GPUFrameBuffer {
+	GLuint object;
+	GPUTexture *colortex;
+	GPUTexture *depthtex;
+};
+
+GPUFrameBuffer *GPU_framebuffer_create()
+{
+	GPUFrameBuffer *fb;
+
+	if (!GLEW_EXT_framebuffer_object)
+		return NULL;
+	
+	fb= MEM_callocN(sizeof(GPUFrameBuffer), "GPUFrameBuffer");
+	glGenFramebuffersEXT(1, &fb->object);
+
+	if (!fb->object) {
+		fprintf(stderr, "GPUFFrameBuffer: framebuffer gen failed. %d\n",
+			(int)glGetError());
+		GPU_framebuffer_free(fb);
+		return NULL;
+	}
+
+	return fb;
+}
+
+int GPU_framebuffer_texture_attach(GPUFrameBuffer *fb, GPUTexture *tex)
+{
+	GLenum status;
+	GLenum attachment;
+
+	if(tex->depth)
+		attachment = GL_DEPTH_ATTACHMENT_EXT;
+	else
+		attachment = GL_COLOR_ATTACHMENT0_EXT;
+
+	glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fb->object);
+	GG.currentfb = fb->object;
+
+	glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, attachment, 
+		tex->target, tex->bindcode, 0);
+
+	if(tex->depth) {
+		glDrawBuffer(GL_NONE);
+		glReadBuffer(GL_NONE);
+	}
+	else {
+		glDrawBuffer(GL_COLOR_ATTACHMENT0_EXT);
+		glReadBuffer(GL_NONE);
+	}
+
+	status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
+
+	if (status != GL_FRAMEBUFFER_COMPLETE_EXT) {
+		GPU_framebuffer_restore();
+		GPU_print_framebuffer_error(status);
+		return 0;
+	}
+
+	if(tex->depth)
+		fb->depthtex = tex;
+	else
+		fb->colortex = tex;
+
+	tex->fb= fb;
+
+	return 1;
+}
+
+void GPU_framebuffer_texture_detach(GPUFrameBuffer *fb, GPUTexture *tex)
+{
+	GLenum attachment;
+
+	if(!tex->fb)
+		return;
+
+	if(GG.currentfb != tex->fb->object) {
+		glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, tex->fb->object);
+		GG.currentfb = tex->fb->object;
+	}
+
+	if(tex->depth) {
+		fb->depthtex = NULL;
+		attachment = GL_DEPTH_ATTACHMENT_EXT;
+	}
+	else {
+		fb->colortex = NULL;
+		attachment = GL_COLOR_ATTACHMENT0_EXT;
+	}
+
+	glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, attachment,
+		tex->target, 0, 0);
+
+	tex->fb = NULL;
+}
+
+void GPU_framebuffer_texture_bind(GPUFrameBuffer *fb, GPUTexture *tex)
+{
+	/* push attributes */
+	glPushAttrib(GL_ENABLE_BIT);
+	glPushAttrib(GL_VIEWPORT_BIT);
+	glDisable(GL_SCISSOR_TEST);
+
+	/* bind framebuffer */
+	glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, tex->fb->object);
+
+	/* push matrices and set default viewport and matrix */
+	glViewport(0, 0, tex->w, tex->h);
+	GG.currentfb = tex->fb->object;
+
+	glMatrixMode(GL_PROJECTION);
+	glPushMatrix();
+	glLoadIdentity();
+	glMatrixMode(GL_MODELVIEW);
+	glPushMatrix();
+	glLoadIdentity();
+}
+
+void GPU_framebuffer_texture_unbind(GPUFrameBuffer *fb, GPUTexture *tex)
+{
+	/* restore matrix */
+	glMatrixMode(GL_PROJECTION);
+	glPopMatrix();
+	glMatrixMode(GL_MODELVIEW);
+	glPopMatrix();
+
+	/* restore attributes */
+	glPopAttrib();
+	glPopAttrib();
+	glEnable(GL_SCISSOR_TEST);
+}
+
+void GPU_framebuffer_free(GPUFrameBuffer *fb)
+{
+	if(fb->depthtex)
+		GPU_framebuffer_texture_detach(fb, fb->depthtex);
+	if(fb->colortex)
+		GPU_framebuffer_texture_detach(fb, fb->colortex);
+
+	if(fb->object) {
+		glDeleteFramebuffersEXT(1, &fb->object);
+
+		if (GG.currentfb == fb->object) {
+			glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+			GG.currentfb = 0;
+		}
+	}
+
+	MEM_freeN(fb);
+}
+
+void GPU_framebuffer_restore()
+{
+	if (GG.currentfb != 0) {
+		glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+		GG.currentfb = 0;
+	}
+}
+
+/* GPUShader */
+
+struct GPUShader {
+	GLhandleARB object;		/* handle for full shader */
+	GLhandleARB vertex;		/* handle for vertex shader */
+	GLhandleARB fragment;	/* handle for fragment shader */
+	GLhandleARB lib;		/* handle for libment shader */
+	int totattrib;			/* total number of attributes */
+};
+
+static void shader_print_errors(char *task, char *log, const char *code)
+{
+	const char *c, *pos, *end = code + strlen(code);
+	int line = 1;
+
+	fprintf(stderr, "GPUShader: %s error:\n", task);
+
+	if(G.f & G_DEBUG) {
+		c = code;
+		while ((c < end) && (pos = strchr(c, '\n'))) {
+			fprintf(stderr, "%2d  ", line);
+			fwrite(c, (pos+1)-c, 1, stderr);
+			c = pos+1;
+			line++;
+		}
+
+		fprintf(stderr, "%s", c);
+	}
+
+	fprintf(stderr, "%s\n", log);
+}
+
+GPUShader *GPU_shader_create(const char *vertexcode, const char *fragcode, GPUShader *lib)
+{
+	GLint status;
+	GLcharARB log[5000];
+	GLsizei length = 0;
+	GPUShader *shader;
+
+	if (!GLEW_ARB_vertex_shader || !GLEW_ARB_fragment_shader)
+		return NULL;
+
+	shader = MEM_callocN(sizeof(GPUShader), "GPUShader");
+
+	if(vertexcode)
+		shader->vertex = glCreateShaderObjectARB(GL_VERTEX_SHADER_ARB);
+	if(fragcode)
+		shader->fragment = glCreateShaderObjectARB(GL_FRAGMENT_SHADER_ARB);
+	shader->object = glCreateProgramObjectARB();
+
+	if (!shader->object ||
+		(vertexcode && !shader->vertex) ||
+		(fragcode && !shader->fragment)) {
+		fprintf(stderr, "GPUShader, object creation failed.\n");
+		GPU_shader_free(shader);
+		return NULL;
+	}
+
+	if(lib && lib->lib)
+		glAttachObjectARB(shader->object, lib->lib);
+
+	if(vertexcode) {
+		glAttachObjectARB(shader->object, shader->vertex);
+		glShaderSourceARB(shader->vertex, 1, (const char**)&vertexcode, NULL);
+
+		glCompileShaderARB(shader->vertex);
+		glGetObjectParameterivARB(shader->vertex, GL_OBJECT_COMPILE_STATUS_ARB, &status);
+
+		if (!status) {
+			glValidateProgramARB(shader->vertex);
+			glGetInfoLogARB(shader->vertex, sizeof(log), &length, log);
+			shader_print_errors("compile", log, vertexcode);
+
+			GPU_shader_free(shader);
+			return NULL;
+		}
+	}
+
+	if(fragcode) {
+		glAttachObjectARB(shader->object, shader->fragment);
+		glShaderSourceARB(shader->fragment, 1, (const char**)&fragcode, NULL);
+
+		glCompileShaderARB(shader->fragment);
+		glGetObjectParameterivARB(shader->fragment, GL_OBJECT_COMPILE_STATUS_ARB, &status);
+
+		if (!status) {
+			glValidateProgramARB(shader->fragment);
+			glGetInfoLogARB(shader->fragment, sizeof(log), &length, log);
+			shader_print_errors("compile", log, fragcode);
+
+			GPU_shader_free(shader);
+			return NULL;
+		}
+	}
+
+	glLinkProgramARB(shader->object);
+	glGetObjectParameterivARB(shader->object, GL_OBJECT_LINK_STATUS_ARB, &status);
+	if (!status) {
+		glGetInfoLogARB(shader->object, sizeof(log), &length, log);
+		shader_print_errors("linking", log, fragcode);
+
+		GPU_shader_free(shader);
+		return NULL;
+	}
+
+	return shader;
+}
+
+GPUShader *GPU_shader_create_lib(const char *code)
+{
+	GLint status;
+	GLcharARB log[5000];
+	GLsizei length = 0;
+	GPUShader *shader;
+
+	if (!GLEW_ARB_vertex_shader || !GLEW_ARB_fragment_shader)
+		return NULL;
+
+	shader = MEM_callocN(sizeof(GPUShader), "GPUShader");
+
+	shader->lib = glCreateShaderObjectARB(GL_FRAGMENT_SHADER_ARB);
+
+	if (!shader->lib) {
+		fprintf(stderr, "GPUShader, object creation failed.\n");
+		GPU_shader_free(shader);
+		return NULL;
+	}
+
+	glShaderSourceARB(shader->lib, 1, (const char**)&code, NULL);
+
+	glCompileShaderARB(shader->lib);
+	glGetObjectParameterivARB(shader->lib, GL_OBJECT_COMPILE_STATUS_ARB, &status);
+
+	if (!status) {
+		glValidateProgramARB(shader->lib);
+		glGetInfoLogARB(shader->lib, sizeof(log), &length, log);
+		shader_print_errors("compile", log, code);
+
+		GPU_shader_free(shader);
+		return NULL;
+	}
+
+	return shader;
+}
+
+void GPU_shader_bind(GPUShader *shader)
+{
+	GPU_print_error("Pre Shader Bind");
+	glUseProgramObjectARB(shader->object);
+	GPU_print_error("Post Shader Bind");
+}
+
+void GPU_shader_unbind()
+{
+	GPU_print_error("Pre Shader Unbind");
+	glUseProgramObjectARB(0);
+	GPU_print_error("Post Shader Unbind");
+}
+
+void GPU_shader_free(GPUShader *shader)
+{
+	if (shader->lib)
+		glDeleteObjectARB(shader->lib);
+	if (shader->vertex)
+		glDeleteObjectARB(shader->vertex);
+	if (shader->fragment)
+		glDeleteObjectARB(shader->fragment);
+	if (shader->object)
+		glDeleteObjectARB(shader->object);
+	MEM_freeN(shader);
+}
+
+int GPU_shader_get_uniform(GPUShader *shader, char *name)
+{
+	return glGetUniformLocationARB(shader->object, name);
+}
+
+void GPU_shader_uniform_vector(GPUShader *shader, int location, int length, int arraysize, float *value)
+{
+	if(location == -1)
+		return;
+
+	GPU_print_error("Pre Uniform Vector");
+
+	if (length == 1) glUniform1fvARB(location, arraysize, value);
+	else if (length == 2) glUniform2fvARB(location, arraysize, value);
+	else if (length == 3) glUniform3fvARB(location, arraysize, value);
+	else if (length == 4) glUniform4fvARB(location, arraysize, value);
+	else if (length == 9) glUniformMatrix3fvARB(location, arraysize, 0, value);
+	else if (length == 16) glUniformMatrix4fvARB(location, arraysize, 0, value);
+
+	GPU_print_error("Post Uniform Vector");
+}
+
+void GPU_shader_uniform_texture(GPUShader *shader, int location, GPUTexture *tex)
+{
+	GLenum arbnumber;
+
+	if (tex->number >= GG.maxtextures) {
+		GPU_print_error("Not enough texture slots.");
+		return;
+	}
+		
+	if(tex->number == -1)
+		return;
+
+	if(location == -1)
+		return;
+
+	GPU_print_error("Pre Uniform Texture");
+
+	arbnumber = (GLenum)((GLuint)GL_TEXTURE0_ARB + tex->number);
+
+	if (tex->number != 0) glActiveTextureARB(arbnumber);
+	glBindTexture(tex->target, tex->bindcode);
+	glUniform1iARB(location, tex->number);
+	glEnable(tex->target);
+	if (tex->number != 0) glActiveTextureARB(GL_TEXTURE0_ARB);
+
+	GPU_print_error("Post Uniform Texture");
+}
+
+int GPU_shader_get_attribute(GPUShader *shader, char *name)
+{
+	int index;
+	
+	GPU_print_error("Pre Get Attribute");
+
+	index = glGetAttribLocationARB(shader->object, name);
+
+	GPU_print_error("Post Get Attribute");
+
+	return index;
+}
+
+#if 0
+/* GPUPixelBuffer */
+
+typedef struct GPUPixelBuffer {
+	GLuint bindcode[2];
+	GLuint current;
+	int datasize;
+	int numbuffers;
+	int halffloat;
+} GPUPixelBuffer;
+
+void GPU_pixelbuffer_free(GPUPixelBuffer *pb)
+{
+	if (pb->bindcode[0])
+		glDeleteBuffersARB(pb->numbuffers, pb->bindcode);
+	MEM_freeN(pb);
+}
+
+GPUPixelBuffer *gpu_pixelbuffer_create(int x, int y, int halffloat, int numbuffers)
+{
+	GPUPixelBuffer *pb;
+
+	if (!GLEW_ARB_multitexture || !GLEW_EXT_pixel_buffer_object)
+		return NULL;
+	
+	pb = MEM_callocN(sizeof(GPUPixelBuffer), "GPUPBO");
+	pb->datasize = x*y*4*((halffloat)? 16: 8);
+	pb->numbuffers = numbuffers;
+	pb->halffloat = halffloat;
+
+   	glGenBuffersARB(pb->numbuffers, pb->bindcode);
+
+	if (!pb->bindcode[0]) {
+		fprintf(stderr, "GPUPixelBuffer allocation failed\n");
+		GPU_pixelbuffer_free(pb);
+		return NULL;
+	}
+
+	return pb;
+}
+
+void GPU_pixelbuffer_texture(GPUTexture *tex, GPUPixelBuffer *pb)
+{
+	void *pixels;
+	int i;
+
+    glBindTexture(GL_TEXTURE_RECTANGLE_EXT, tex->bindcode);
+ 
+ 	for (i = 0; i < pb->numbuffers; i++) {
+		glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_EXT, pb->bindcode[pb->current]);
+		glBufferDataARB(GL_PIXEL_UNPACK_BUFFER_EXT, pb->datasize, NULL,
+			GL_STREAM_DRAW_ARB);
+    
+		pixels = glMapBufferARB(GL_PIXEL_UNPACK_BUFFER_EXT, GL_WRITE_ONLY);
+		/*memcpy(pixels, _oImage.data(), pb->datasize);*/
+    
+		if (!glUnmapBufferARB(GL_PIXEL_UNPACK_BUFFER_EXT)) {
+			fprintf(stderr, "Could not unmap opengl PBO\n");
+			break;
+		}
+	}
+
+    glBindTexture(GL_TEXTURE_RECTANGLE_EXT, 0);
+}
+
+static int pixelbuffer_map_into_gpu(GLuint bindcode)
+{
+	void *pixels;
+
+    glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_EXT, bindcode);
+	pixels = glMapBufferARB(GL_PIXEL_UNPACK_BUFFER_EXT, GL_WRITE_ONLY);
+
+	/* do stuff in pixels */
+
+    if (!glUnmapBufferARB(GL_PIXEL_UNPACK_BUFFER_EXT)) {
+		fprintf(stderr, "Could not unmap opengl PBO\n");
+		return 0;
+    }
+	
+	return 1;
+}
+
+static void pixelbuffer_copy_to_texture(GPUTexture *tex, GPUPixelBuffer *pb, GLuint bindcode)
+{
+	GLenum type = (pb->halffloat)? GL_HALF_FLOAT_NV: GL_UNSIGNED_BYTE;
+    glBindTexture(GL_TEXTURE_RECTANGLE_EXT, tex->bindcode);
+    glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_EXT, bindcode);
+
+    glTexSubImage2D(GL_TEXTURE_RECTANGLE_EXT, 0, 0, 0, tex->w, tex->h,
+                    GL_RGBA, type, NULL);
+
+	glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_EXT, 0);
+    glBindTexture(GL_TEXTURE_RECTANGLE_EXT, 0);
+}
+
+void GPU_pixelbuffer_async_to_gpu(GPUTexture *tex, GPUPixelBuffer *pb)
+{
+	int newbuffer;
+
+	if (pb->numbuffers == 1) {
+		pixelbuffer_copy_to_texture(tex, pb, pb->bindcode[0]);
+		pixelbuffer_map_into_gpu(pb->bindcode[0]);
+	}
+	else {
+		pb->current = (pb->current+1)%pb->numbuffers;
+		newbuffer = (pb->current+1)%pb->numbuffers;
+
+		pixelbuffer_map_into_gpu(pb->bindcode[newbuffer]);
+		pixelbuffer_copy_to_texture(tex, pb, pb->bindcode[pb->current]);
+    }
+}
+#endif
+
diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c
new file mode 100644
index 00000000000..47400f61c25
--- /dev/null
+++ b/source/blender/gpu/intern/gpu_material.c
@@ -0,0 +1,1460 @@
+/**
+ * $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): Brecht Van Lommel.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <math.h>
+#include <string.h>
+
+#include "GL/glew.h"
+
+#include "MEM_guardedalloc.h"
+
+#include "DNA_image_types.h"
+#include "DNA_lamp_types.h"
+#include "DNA_listBase.h"
+#include "DNA_material_types.h"
+#include "DNA_object_types.h"
+#include "DNA_scene_types.h"
+#include "DNA_texture_types.h"
+#include "DNA_view3d_types.h"
+#include "DNA_world_types.h"
+
+#include "BKE_anim.h"
+#include "BKE_colortools.h"
+#include "BKE_DerivedMesh.h"
+#include "BKE_global.h"
+#include "BKE_main.h"
+#include "BKE_node.h"
+#include "BKE_scene.h"
+#include "BKE_texture.h"
+#include "BKE_utildefines.h"
+
+#include "BLI_arithb.h"
+#include "BLI_blenlib.h"
+#include "BLI_linklist.h"
+
+#include "GPU_extensions.h"
+#include "GPU_material.h"
+
+#include "gpu_codegen.h"
+
+#include <string.h>
+
+/* Structs */
+
+typedef enum DynMatProperty {
+	DYN_LAMP_CO = 1,
+	DYN_LAMP_VEC = 2,
+	DYN_LAMP_IMAT = 4,
+	DYN_LAMP_PERSMAT = 8,
+} DynMatProperty;
+
+struct GPUMaterial {
+	Scene *scene;
+	Material *ma;
+
+	/* for creating the material */
+	ListBase nodes;
+	GPUNodeLink *outlink;
+
+	/* for binding the material */
+	GPUPass *pass;
+	GPUVertexAttribs attribs;
+	int bound;
+	int builtins;
+	int alpha, obcolalpha;
+	int dynproperty;
+
+	/* for passing uniforms */
+	int viewmatloc, invviewmatloc;
+	int obmatloc, invobmatloc;
+	int obcolloc;
+
+	LinkNode *lamps;
+};
+
+struct GPULamp {
+	Scene *scene;
+	Object *ob;
+	Object *par;
+	Lamp *la;
+
+	int type, mode, lay;
+
+	float dynenergy, dyncol[3];
+	float energy, col[3];
+
+	float co[3], vec[3];
+	float dynco[3], dynvec[3];
+	float obmat[4][4];
+	float imat[4][4];
+	float dynimat[4][4];
+
+	float spotsi, spotbl, k;
+	float dist, att1, att2;
+
+	float bias, d, clipend;
+	int size;
+
+	int falloff_type;
+	struct CurveMapping *curfalloff;
+
+	float winmat[4][4];
+	float viewmat[4][4];
+	float persmat[4][4];
+	float dynpersmat[4][4];
+
+	GPUFrameBuffer *fb;
+	GPUTexture *tex;
+
+	LinkNode *materials;
+};
+
+/* Functions */
+
+static GPUMaterial *GPU_material_construct_begin(Material *ma)
+{
+	GPUMaterial *material = MEM_callocN(sizeof(GPUMaterial), "GPUMaterial");
+
+	material->ma= ma;
+
+	return material;
+}
+
+static void gpu_material_set_attrib_id(GPUMaterial *material)
+{
+	GPUVertexAttribs *attribs;
+	GPUShader *shader;
+	GPUPass *pass;
+	char name[32];
+	int a, b;
+
+	attribs= &material->attribs;
+	pass= material->pass;
+	if(!pass) {
+		attribs->totlayer = 0;
+		return;
+	}
+	
+	shader= GPU_pass_shader(pass);
+	if(!shader) {
+		attribs->totlayer = 0;
+		return;
+	}
+
+	/* convert from attribute number to the actual id assigned by opengl,
+	 * in case the attrib does not get a valid index back, it was probably
+	 * removed by the glsl compiler by dead code elimination */
+
+	for(a=0, b=0; a<attribs->totlayer; a++) {
+		sprintf(name, "att%d", attribs->layer[a].glindex);
+		attribs->layer[a].glindex = GPU_shader_get_attribute(shader, name);
+
+		if(attribs->layer[a].glindex >= 0) {
+			attribs->layer[b] = attribs->layer[a];
+			b++;
+		}
+	}
+
+	attribs->totlayer = b;
+}
+
+static int GPU_material_construct_end(GPUMaterial *material)
+{
+	if (material->outlink) {
+		GPUNodeLink *outlink;
+		GPUShader *shader;
+
+		outlink = material->outlink;
+		material->pass = GPU_generate_pass(&material->nodes, outlink,
+			&material->attribs, &material->builtins, material->ma->id.name);
+
+		if(!material->pass)
+			return 0;
+
+		gpu_material_set_attrib_id(material);
+		
+		shader = GPU_pass_shader(material->pass);
+
+		if(material->builtins & GPU_VIEW_MATRIX)
+			material->viewmatloc = GPU_shader_get_uniform(shader, GPU_builtin_name(GPU_VIEW_MATRIX));
+		if(material->builtins & GPU_INVERSE_VIEW_MATRIX)
+			material->invviewmatloc = GPU_shader_get_uniform(shader, GPU_builtin_name(GPU_INVERSE_VIEW_MATRIX));
+		if(material->builtins & GPU_OBJECT_MATRIX)
+			material->obmatloc = GPU_shader_get_uniform(shader, GPU_builtin_name(GPU_OBJECT_MATRIX));
+		if(material->builtins & GPU_INVERSE_OBJECT_MATRIX)
+			material->invobmatloc = GPU_shader_get_uniform(shader, GPU_builtin_name(GPU_INVERSE_OBJECT_MATRIX));
+		if(material->builtins & GPU_OBCOLOR)
+			material->obcolloc = GPU_shader_get_uniform(shader, GPU_builtin_name(GPU_OBCOLOR));
+
+		return 1;
+	}
+
+	return 0;
+}
+
+void GPU_material_free(Material *ma)
+{
+	LinkData *link;
+
+	for(link=ma->gpumaterial.first; link; link=link->next) {
+		GPUMaterial *material = link->data;
+
+		if(material->pass)
+			GPU_pass_free(material->pass);
+
+		BLI_linklist_free(material->lamps, NULL);
+
+		MEM_freeN(material);
+	}
+
+	BLI_freelistN(&ma->gpumaterial);
+}
+
+void GPU_material_bind(GPUMaterial *material, int lay, double time)
+{
+	if(material->pass) {
+		LinkNode *nlink;
+		GPULamp *lamp;
+
+		/* handle layer lamps */
+		for(nlink=material->lamps; nlink; nlink=nlink->next) {
+			lamp= nlink->link;
+
+			if(!(lamp->mode & LA_LAYER) || (lamp->lay & lay)) {
+				lamp->dynenergy = lamp->energy;
+				VECCOPY(lamp->dyncol, lamp->col);
+			}
+			else {
+				lamp->dynenergy = 0.0f;
+				lamp->dyncol[0]= lamp->dyncol[1]= lamp->dyncol[2] = 0.0f;
+			}
+		}
+
+		GPU_pass_bind(material->pass, time);
+		material->bound = 1;
+	}
+}
+
+void GPU_material_bind_uniforms(GPUMaterial *material, float obmat[][4], float viewmat[][4], float viewinv[][4], float obcol[4])
+{
+	if(material->pass) {
+		GPUShader *shader = GPU_pass_shader(material->pass);
+		LinkNode *nlink;
+		GPULamp *lamp;
+		float invmat[4][4], col[4];
+
+		/* handle builtins */
+		if(material->builtins & GPU_VIEW_MATRIX) {
+			GPU_shader_uniform_vector(shader, material->viewmatloc, 16, 1, (float*)viewmat);
+		}
+		if(material->builtins & GPU_INVERSE_VIEW_MATRIX) {
+			GPU_shader_uniform_vector(shader, material->invviewmatloc, 16, 1, (float*)viewinv);
+		}
+		if(material->builtins & GPU_OBJECT_MATRIX) {
+			GPU_shader_uniform_vector(shader, material->obmatloc, 16, 1, (float*)obmat);
+		}
+		if(material->builtins & GPU_INVERSE_OBJECT_MATRIX) {
+			Mat4Invert(invmat, obmat);
+			GPU_shader_uniform_vector(shader, material->invobmatloc, 16, 1, (float*)invmat);
+		}
+		if(material->builtins & GPU_OBCOLOR) {
+			QUATCOPY(col, obcol);
+			CLAMP(col[3], 0.0f, 1.0f);
+			GPU_shader_uniform_vector(shader, material->obcolloc, 4, 1, col);
+		}
+
+		/* update lamps */
+		for(nlink=material->lamps; nlink; nlink=nlink->next) {
+			lamp= nlink->link;
+
+			if(material->dynproperty & DYN_LAMP_VEC) {
+				VECCOPY(lamp->dynvec, lamp->vec);
+				Normalize(lamp->dynvec);
+				VecMulf(lamp->dynvec, -1.0f);
+				Mat4Mul3Vecfl(viewmat, lamp->dynvec);
+			}
+
+			if(material->dynproperty & DYN_LAMP_CO) {
+				VECCOPY(lamp->dynco, lamp->co);
+				Mat4MulVecfl(viewmat, lamp->dynco);
+			}
+
+			if(material->dynproperty & DYN_LAMP_IMAT)
+				Mat4MulMat4(lamp->dynimat, viewinv, lamp->imat);
+			if(material->dynproperty & DYN_LAMP_PERSMAT)
+				Mat4MulMat4(lamp->dynpersmat, viewinv, lamp->persmat);
+		}
+
+		GPU_pass_update_uniforms(material->pass);
+	}
+}
+
+void GPU_material_unbind(GPUMaterial *material)
+{
+	if (material->pass) {
+		material->bound = 0;
+		GPU_pass_unbind(material->pass);
+	}
+}
+
+int GPU_material_bound(GPUMaterial *material)
+{
+	return material->bound;
+}
+
+void GPU_material_vertex_attributes(GPUMaterial *material, GPUVertexAttribs *attribs)
+{
+	*attribs = material->attribs;
+}
+
+void GPU_material_output_link(GPUMaterial *material, GPUNodeLink *link)
+{
+	if(!material->outlink)
+		material->outlink= link;
+}
+
+void GPU_material_enable_alpha(GPUMaterial *material)
+{
+	material->alpha= 1;
+}
+
+GPUBlendMode GPU_material_blend_mode(GPUMaterial *material, float obcol[3])
+{
+	if(material->alpha || (material->obcolalpha && obcol[3] < 1.0f))
+		return GPU_BLEND_ALPHA;
+	else
+		return GPU_BLEND_SOLID;
+}
+
+void gpu_material_add_node(GPUMaterial *material, GPUNode *node)
+{
+	BLI_addtail(&material->nodes, node);
+}
+
+/* Code generation */
+
+static GPUNodeLink *lamp_get_visibility(GPUMaterial *mat, GPULamp *lamp, GPUNodeLink **lv, GPUNodeLink **dist)
+{
+	GPUNodeLink *visifac, *inpr;
+
+	/* from get_lamp_visibility */
+	if(lamp->type==LA_SUN || lamp->type==LA_HEMI) {
+		mat->dynproperty |= DYN_LAMP_VEC;
+		GPU_link(mat, "lamp_visibility_sun_hemi", GPU_dynamic_uniform(lamp->dynvec), lv, dist, &visifac);
+		return visifac;
+	}
+	else {
+		mat->dynproperty |= DYN_LAMP_CO;
+		GPU_link(mat, "lamp_visibility_other", GPU_builtin(GPU_VIEW_POSITION), GPU_dynamic_uniform(lamp->dynco), lv, dist, &visifac);
+
+		if(lamp->type==LA_AREA)
+			return visifac;
+
+		switch(lamp->falloff_type)
+		{
+			case LA_FALLOFF_CONSTANT:
+				break;
+			case LA_FALLOFF_INVLINEAR:
+				GPU_link(mat, "lamp_falloff_invlinear", GPU_uniform(&lamp->dist), *dist, &visifac);
+				break;
+			case LA_FALLOFF_INVSQUARE:
+				GPU_link(mat, "lamp_falloff_invsquare", GPU_uniform(&lamp->dist), *dist, &visifac);
+				break;
+			case LA_FALLOFF_SLIDERS:
+				GPU_link(mat, "lamp_falloff_sliders", GPU_uniform(&lamp->dist), GPU_uniform(&lamp->att1), GPU_uniform(&lamp->att2), *dist, &visifac);
+				break;
+			case LA_FALLOFF_CURVE:
+				{
+					float *array;
+					int size;
+
+					curvemapping_table_RGBA(lamp->curfalloff, &array, &size);
+					GPU_link(mat, "lamp_falloff_curve", GPU_uniform(&lamp->dist), GPU_texture(size, array), *dist, &visifac);
+				}
+				break;
+		}
+
+		if(lamp->mode & LA_SPHERE)
+			GPU_link(mat, "lamp_visibility_sphere", GPU_uniform(&lamp->dist), *dist, visifac, &visifac);
+
+		if(lamp->type == LA_SPOT) {
+			if(lamp->mode & LA_SQUARE) {
+				mat->dynproperty |= DYN_LAMP_VEC|DYN_LAMP_IMAT;
+				GPU_link(mat, "lamp_visibility_spot_square", GPU_dynamic_uniform(lamp->dynvec), GPU_dynamic_uniform((float*)lamp->dynimat), *lv, &inpr);
+			}
+			else {
+				mat->dynproperty |= DYN_LAMP_VEC;
+				GPU_link(mat, "lamp_visibility_spot_circle", GPU_dynamic_uniform(lamp->dynvec), *lv, &inpr);
+			}
+			
+			GPU_link(mat, "lamp_visibility_spot", GPU_uniform(&lamp->spotsi), GPU_uniform(&lamp->spotbl), inpr, visifac, &visifac);
+		}
+
+		GPU_link(mat, "lamp_visibility_clamp", visifac, &visifac);
+
+		return visifac;
+	}
+}
+
+#if 0
+static void area_lamp_vectors(LampRen *lar)
+{
+    float xsize= 0.5*lar->area_size, ysize= 0.5*lar->area_sizey, multifac;
+
+    /* make it smaller, so area light can be multisampled */
+    multifac= 1.0f/sqrt((float)lar->ray_totsamp);
+    xsize *= multifac;
+    ysize *= multifac;
+
+    /* corner vectors */
+    lar->area[0][0]= lar->co[0] - xsize*lar->mat[0][0] - ysize*lar->mat[1][0];
+    lar->area[0][1]= lar->co[1] - xsize*lar->mat[0][1] - ysize*lar->mat[1][1];
+    lar->area[0][2]= lar->co[2] - xsize*lar->mat[0][2] - ysize*lar->mat[1][2];
+
+    /* corner vectors */
+    lar->area[1][0]= lar->co[0] - xsize*lar->mat[0][0] + ysize*lar->mat[1][0];
+    lar->area[1][1]= lar->co[1] - xsize*lar->mat[0][1] + ysize*lar->mat[1][1];
+    lar->area[1][2]= lar->co[2] - xsize*lar->mat[0][2] + ysize*lar->mat[1][2];
+
+    /* corner vectors */
+    lar->area[2][0]= lar->co[0] + xsize*lar->mat[0][0] + ysize*lar->mat[1][0];
+    lar->area[2][1]= lar->co[1] + xsize*lar->mat[0][1] + ysize*lar->mat[1][1];
+    lar->area[2][2]= lar->co[2] + xsize*lar->mat[0][2] + ysize*lar->mat[1][2];
+
+    /* corner vectors */
+    lar->area[3][0]= lar->co[0] + xsize*lar->mat[0][0] - ysize*lar->mat[1][0];
+    lar->area[3][1]= lar->co[1] + xsize*lar->mat[0][1] - ysize*lar->mat[1][1];
+    lar->area[3][2]= lar->co[2] + xsize*lar->mat[0][2] - ysize*lar->mat[1][2];
+    /* only for correction button size, matrix size works on energy */
+    lar->areasize= lar->dist*lar->dist/(4.0*xsize*ysize);
+}
+#endif
+
+static void ramp_blend(GPUMaterial *mat, GPUNodeLink *fac, GPUNodeLink *col1, GPUNodeLink *col2, int type, GPUNodeLink **outcol)
+{
+	static char *names[] = {"mix_blend", "mix_add", "mix_mult", "mix_sub",
+		"mix_screen", "mix_div", "mix_diff", "mix_dark", "mix_light",
+		"mix_overlay", "mix_dodge", "mix_burn", "mix_hue", "mix_sat",
+		"mix_val", "mix_color"};
+
+	GPU_link(mat, names[type], fac, col1, col2, outcol);
+}
+
+static void do_colorband_blend(GPUMaterial *mat, ColorBand *coba, GPUNodeLink *fac, float rampfac, int type, GPUNodeLink *incol, GPUNodeLink **outcol)
+{
+	GPUNodeLink *tmp, *alpha, *col;
+	float *array;
+	int size;
+
+	/* do colorband */
+	colorband_table_RGBA(coba, &array, &size);
+	GPU_link(mat, "valtorgb", fac, GPU_texture(size, array), &col, &tmp);
+
+	/* use alpha in fac */
+	GPU_link(mat, "mtex_alpha_from_col", col, &alpha);
+	GPU_link(mat, "math_multiply", alpha, GPU_uniform(&rampfac), &fac);
+
+	/* blending method */
+	ramp_blend(mat, fac, incol, col, type, outcol);
+}
+
+static void ramp_diffuse_result(GPUShadeInput *shi, GPUNodeLink **diff)
+{
+	Material *ma= shi->mat;
+	GPUMaterial *mat= shi->gpumat;
+	GPUNodeLink *fac;
+
+	if(!(G.fileflags & G_FILE_GLSL_NO_RAMPS)) {
+		if(ma->ramp_col) {
+			if(ma->rampin_col==MA_RAMP_IN_RESULT) {
+				GPU_link(mat, "ramp_rgbtobw", *diff, &fac);
+				
+				/* colorband + blend */
+				do_colorband_blend(mat, ma->ramp_col, fac, ma->rampfac_col, ma->rampblend_col, *diff, diff);
+			}
+		}
+	}
+}
+
+static void add_to_diffuse(GPUMaterial *mat, Material *ma, GPUShadeInput *shi, GPUNodeLink *is, GPUNodeLink *rgb, GPUNodeLink **diff)
+{
+	GPUNodeLink *fac, *tmp, *addcol;
+	
+	if(!(G.fileflags & G_FILE_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) {
+			addcol = shi->rgb;
+		}
+		else {
+			/* input */
+			switch(ma->rampin_col) {
+			case MA_RAMP_IN_ENERGY:
+				GPU_link(mat, "ramp_rgbtobw", rgb, &fac);
+				break;
+			case MA_RAMP_IN_SHADER:
+				fac= is;
+				break;
+			case MA_RAMP_IN_NOR:
+				GPU_link(mat, "vec_math_dot", shi->view, shi->vn, &tmp, &fac);
+				break;
+			default:
+				GPU_link(mat, "set_value_zero", &fac);
+				break;
+			}
+
+			/* colorband + blend */
+			do_colorband_blend(mat, ma->ramp_col, fac, ma->rampfac_col, ma->rampblend_col, shi->rgb, &addcol);
+		}
+	}
+	else
+		addcol = shi->rgb;
+
+	/* output to */
+	GPU_link(mat, "shade_madd", *diff, rgb, addcol, diff);
+}
+
+static void ramp_spec_result(GPUShadeInput *shi, GPUNodeLink **spec)
+{
+	Material *ma= shi->mat;
+	GPUMaterial *mat= shi->gpumat;
+	GPUNodeLink *fac;
+
+	if(!(G.fileflags & G_FILE_GLSL_NO_RAMPS) &&
+	   ma->ramp_spec && ma->rampin_spec==MA_RAMP_IN_RESULT) {
+		GPU_link(mat, "ramp_rgbtobw", *spec, &fac);
+		
+		/* colorband + blend */
+		do_colorband_blend(mat, ma->ramp_spec, fac, ma->rampfac_spec, ma->rampblend_spec, *spec, spec);
+	}
+}
+
+static void do_specular_ramp(GPUShadeInput *shi, GPUNodeLink *is, GPUNodeLink *t, GPUNodeLink **spec)
+{
+	Material *ma= shi->mat;
+	GPUMaterial *mat= shi->gpumat;
+	GPUNodeLink *fac, *tmp;
+
+	*spec = shi->specrgb;
+
+	/* MA_RAMP_IN_RESULT is exception */
+	if(ma->ramp_spec && (ma->rampin_spec!=MA_RAMP_IN_RESULT)) {
+		
+		/* input */
+		switch(ma->rampin_spec) {
+		case MA_RAMP_IN_ENERGY:
+			fac = t;
+			break;
+		case MA_RAMP_IN_SHADER:
+			fac = is;
+			break;
+		case MA_RAMP_IN_NOR:
+			GPU_link(mat, "vec_math_dot", shi->view, shi->vn, &tmp, &fac);
+			break;
+		default:
+			GPU_link(mat, "set_value_zero", &fac);
+			break;
+		}
+		
+		/* colorband + blend */
+		do_colorband_blend(mat, ma->ramp_spec, fac, ma->rampfac_spec, ma->rampblend_spec, *spec, spec);
+	}
+}
+
+static void shade_one_light(GPUShadeInput *shi, GPUShadeResult *shr, GPULamp *lamp)
+{
+	Material *ma= shi->mat;
+	GPUMaterial *mat= shi->gpumat;
+	GPUNodeLink *lv, *dist, *visifac, *is, *inp, *i, *vn, *view;
+	GPUNodeLink *outcol, *specfac, *t, *shadfac;
+	float one = 1.0f;
+
+	if((lamp->mode & LA_ONLYSHADOW) && !(ma->mode & MA_SHADOW))
+		return;
+	
+	vn= shi->vn;
+	view= shi->view;
+
+	visifac= lamp_get_visibility(mat, lamp, &lv, &dist);
+
+	/*if(ma->mode & MA_TANGENT_V)
+		GPU_link(mat, "shade_tangent_v", lv, GPU_attribute(CD_TANGENT, ""), &vn);*/
+	
+	GPU_link(mat, "shade_inp", vn, lv, &inp);
+
+	if(lamp->mode & LA_NO_DIFF) {
+		GPU_link(mat, "shade_is_no_diffuse", &is);
+	}
+	else if(lamp->type == LA_HEMI) {
+		GPU_link(mat, "shade_is_hemi", inp, &is);
+	}
+	else {
+		if(lamp->type == LA_AREA) {
+			float area[4][4], areasize;
+
+			memset(&area, 0, sizeof(area));
+			memset(&areasize, 0, sizeof(areasize));
+			mat->dynproperty |= DYN_LAMP_VEC|DYN_LAMP_CO;
+			GPU_link(mat, "shade_inp_area", GPU_builtin(GPU_VIEW_POSITION), GPU_dynamic_uniform(lamp->dynco), GPU_dynamic_uniform(lamp->dynvec), vn, GPU_uniform((float*)area),
+				GPU_uniform(&areasize), GPU_uniform(&lamp->k), &inp);
+		}
+
+		is= inp; /* Lambert */
+
+		if(!(G.fileflags & G_FILE_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)
+				GPU_link(mat, "shade_diffuse_toon", vn, lv, view, GPU_uniform(&ma->param[0]), GPU_uniform(&ma->param[1]), &is);
+			else if(ma->diff_shader==MA_DIFF_MINNAERT)
+				GPU_link(mat, "shade_diffuse_minnaert", inp, vn, view, GPU_uniform(&ma->darkness), &is);
+			else if(ma->diff_shader==MA_DIFF_FRESNEL)
+				GPU_link(mat, "shade_diffuse_fresnel", vn, lv, view, GPU_uniform(&ma->param[0]), GPU_uniform(&ma->param[1]), &is);
+		}
+	}
+
+	if(!(G.fileflags & G_FILE_GLSL_NO_SHADERS))
+		if(ma->shade_flag & MA_CUBIC)
+			GPU_link(mat, "shade_cubic", is, &is);
+	
+	i = is;
+	GPU_link(mat, "shade_visifac", i, visifac, shi->refl, &i);
+
+	vn = shi->vn;
+	/*if(ma->mode & MA_TANGENT_VN)
+		GPU_link(mat, "shade_tangent_v_spec", GPU_attribute(CD_TANGENT, ""), &vn);*/
+
+	/* this replaces if(i > 0.0) conditional until that is supported */
+	// 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)) {
+			mat->dynproperty |= DYN_LAMP_PERSMAT;
+
+			GPU_link(mat, "test_shadowbuf",
+				GPU_builtin(GPU_VIEW_POSITION),
+				GPU_dynamic_texture(lamp->tex),
+				GPU_dynamic_uniform((float*)lamp->dynpersmat),
+				GPU_uniform(&lamp->bias), inp, &shadfac);
+			
+			if(lamp->mode & LA_ONLYSHADOW) {
+				GPU_link(mat, "shade_only_shadow", i, shadfac,
+					GPU_dynamic_uniform(&lamp->dynenergy), shi->rgb, shi->specrgb,
+					shr->diff, shr->spec, &shr->diff, &shr->spec);
+				
+				BLI_linklist_append(&mat->lamps, lamp);
+				BLI_linklist_append(&lamp->materials, ma);
+				return;
+			}
+			
+			GPU_link(mat, "math_multiply", i, shadfac, &i);
+		}
+	}
+	else if((G.fileflags & G_FILE_GLSL_NO_SHADOWS) && (lamp->mode & LA_ONLYSHADOW)) {
+		BLI_linklist_append(&mat->lamps, lamp);
+		BLI_linklist_append(&lamp->materials, ma);
+		return;
+	}
+	else
+		GPU_link(mat, "set_value", GPU_uniform(&one), &shadfac);
+
+	if(GPU_link_changed(shi->refl) || ma->ref != 0.0f) {
+		if(!(lamp->mode & LA_NO_DIFF)) {
+			GPUNodeLink *rgb;
+			GPU_link(mat, "shade_mul_value", i, GPU_dynamic_uniform(lamp->dyncol), &rgb);
+			add_to_diffuse(mat, ma, shi, is, rgb, &shr->diff);
+		}
+	}
+
+	if(G.fileflags & G_FILE_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) {
+			GPU_link(mat, "shade_hemi_spec", vn, lv, view, GPU_uniform(&ma->spec), shi->har, visifac, &t);
+			GPU_link(mat, "shade_add_spec", t, GPU_dynamic_uniform(lamp->dyncol), shi->specrgb, &outcol);
+			GPU_link(mat, "shade_add", shr->spec, outcol, &shr->spec);
+		}
+		else {
+			if(ma->spec_shader==MA_SPEC_PHONG)
+				GPU_link(mat, "shade_phong_spec", vn, lv, view, shi->har, &specfac);
+			else if(ma->spec_shader==MA_SPEC_COOKTORR)
+				GPU_link(mat, "shade_cooktorr_spec", vn, lv, view, shi->har, &specfac);
+			else if(ma->spec_shader==MA_SPEC_BLINN)
+				GPU_link(mat, "shade_blinn_spec", vn, lv, view, GPU_uniform(&ma->refrac), shi->har, &specfac);
+			else if(ma->spec_shader==MA_SPEC_WARDISO)
+				GPU_link(mat, "shade_wardiso_spec", vn, lv, view, GPU_uniform(&ma->rms), &specfac);
+			else
+				GPU_link(mat, "shade_toon_spec", vn, lv, view, GPU_uniform(&ma->param[2]), GPU_uniform(&ma->param[3]), &specfac);
+
+			if(lamp->type==LA_AREA)
+				GPU_link(mat, "shade_spec_area_inp", specfac, inp, &specfac);
+
+			GPU_link(mat, "shade_spec_t", shadfac, shi->spec, visifac, specfac, &t);
+
+			if(ma->mode & MA_RAMP_SPEC) {
+				GPUNodeLink *spec;
+				do_specular_ramp(shi, specfac, t, &spec);
+				GPU_link(mat, "shade_add_spec", t, GPU_dynamic_uniform(lamp->dyncol), spec, &outcol);
+				GPU_link(mat, "shade_add", shr->spec, outcol, &shr->spec);
+			}
+			else {
+				GPU_link(mat, "shade_add_spec", t, GPU_dynamic_uniform(lamp->dyncol), shi->specrgb, &outcol);
+				GPU_link(mat, "shade_add", shr->spec, outcol, &shr->spec);
+			}
+		}
+	}
+
+	BLI_linklist_append(&mat->lamps, lamp);
+	BLI_linklist_append(&lamp->materials, ma);
+}
+
+static void material_lights(GPUShadeInput *shi, GPUShadeResult *shr)
+{
+	Base *base;
+	Object *ob;
+	Scene *sce;
+	GPULamp *lamp;
+	
+	for(SETLOOPER(shi->gpumat->scene, base)) {
+		ob= base->object;
+
+		if(ob->type==OB_LAMP) {
+			lamp = GPU_lamp_from_blender(shi->gpumat->scene, ob, NULL);
+			if(lamp)
+				shade_one_light(shi, shr, lamp);
+		}
+
+		if (ob->transflag & OB_DUPLI) {
+			DupliObject *dob;
+			ListBase *lb = object_duplilist(shi->gpumat->scene, ob);
+			
+			for(dob=lb->first; dob; dob=dob->next) {
+				Object *ob = dob->ob;
+				
+				if(ob->type==OB_LAMP) {
+					Mat4CpyMat4(ob->obmat, dob->mat);
+
+					lamp = GPU_lamp_from_blender(shi->gpumat->scene, ob, base->object);
+					if(lamp)
+						shade_one_light(shi, shr, lamp);
+				}
+			}
+			
+			free_object_duplilist(lb);
+		}
+	}
+}
+
+static void texture_rgb_blend(GPUMaterial *mat, GPUNodeLink *tex, GPUNodeLink *out, GPUNodeLink *fact, GPUNodeLink *facg, int blendtype, GPUNodeLink **in)
+{
+	switch(blendtype) {
+	case MTEX_BLEND:
+		GPU_link(mat, "mtex_rgb_blend", out, tex, fact, facg, in);
+		break;
+	case MTEX_MUL:
+		GPU_link(mat, "mtex_rgb_mul", out, tex, fact, facg, in);
+		break;
+	case MTEX_SCREEN:
+		GPU_link(mat, "mtex_rgb_screen", out, tex, fact, facg, in);
+		break;
+	case MTEX_OVERLAY:
+		GPU_link(mat, "mtex_rgb_overlay", out, tex, fact, facg, in);
+		break;
+	case MTEX_SUB:
+		GPU_link(mat, "mtex_rgb_sub", out, tex, fact, facg, in);
+		break;
+	case MTEX_ADD:
+		GPU_link(mat, "mtex_rgb_add", out, tex, fact, facg, in);
+		break;
+	case MTEX_DIV:
+		GPU_link(mat, "mtex_rgb_div", out, tex, fact, facg, in);
+		break;
+	case MTEX_DIFF:
+		GPU_link(mat, "mtex_rgb_diff", out, tex, fact, facg, in);
+		break;
+	case MTEX_DARK:
+		GPU_link(mat, "mtex_rgb_dark", out, tex, fact, facg, in);
+		break;
+	case MTEX_LIGHT:
+		GPU_link(mat, "mtex_rgb_light", out, tex, fact, facg, in);
+		break;
+	case MTEX_BLEND_HUE:
+		GPU_link(mat, "mtex_rgb_hue", out, tex, fact, facg, in);
+		break;
+	case MTEX_BLEND_SAT:
+		GPU_link(mat, "mtex_rgb_sat", out, tex, fact, facg, in);
+		break;
+	case MTEX_BLEND_VAL:
+		GPU_link(mat, "mtex_rgb_val", out, tex, fact, facg, in);
+		break;
+	case MTEX_BLEND_COLOR:
+		GPU_link(mat, "mtex_rgb_color", out, tex, fact, facg, in);
+		break;
+	default:
+		GPU_link(mat, "set_rgb_zero", &in);
+		break;
+	}
+}
+
+static void texture_value_blend(GPUMaterial *mat, GPUNodeLink *tex, GPUNodeLink *out, GPUNodeLink *fact, GPUNodeLink *facg, int blendtype, int flip, GPUNodeLink **in)
+{
+	float flipf = (flip)? 1.0f: 0.0;
+
+	switch(blendtype) {
+	case MTEX_BLEND:
+		GPU_link(mat, "mtex_value_blend", out, tex, fact, facg, GPU_uniform(&flipf), in);
+		break;
+	case MTEX_MUL:
+		GPU_link(mat, "mtex_value_mul", out, tex, fact, facg, GPU_uniform(&flipf), in);
+		break;
+	case MTEX_SCREEN:
+		GPU_link(mat, "mtex_value_screen", out, tex, fact, facg, GPU_uniform(&flipf), in);
+		break;
+	case MTEX_SUB:
+		GPU_link(mat, "mtex_value_sub", out, tex, fact, facg, GPU_uniform(&flipf), in);
+		break;
+	case MTEX_ADD:
+		GPU_link(mat, "mtex_value_add", out, tex, fact, facg, GPU_uniform(&flipf), in);
+		break;
+	case MTEX_DIV:
+		GPU_link(mat, "mtex_value_div", out, tex, fact, facg, GPU_uniform(&flipf), in);
+		break;
+	case MTEX_DIFF:
+		GPU_link(mat, "mtex_value_diff", out, tex, fact, facg, GPU_uniform(&flipf), in);
+		break;
+	case MTEX_DARK:
+		GPU_link(mat, "mtex_value_dark", out, tex, fact, facg, GPU_uniform(&flipf), in);
+		break;
+	case MTEX_LIGHT:
+		GPU_link(mat, "mtex_value_light", out, tex, fact, facg, GPU_uniform(&flipf), in);
+		break;
+	default:
+		GPU_link(mat, "set_value_zero", &in);
+		break;
+	}
+}
+
+static void do_material_tex(GPUShadeInput *shi)
+{
+	Material *ma= shi->mat;
+	GPUMaterial *mat= shi->gpumat;
+	MTex *mtex;
+	Tex *tex;
+	GPUNodeLink *texco, *tin, *trgb, *tnor, *tcol, *stencil, *tnorfac;
+	GPUNodeLink *texco_norm, *texco_orco, *texco_object, *texco_tangent;
+	GPUNodeLink *texco_global, *texco_uv = NULL;
+	GPUNodeLink *colfac, *newnor, *varfac, *orn;
+	char *lastuvname = NULL;
+	float one = 1.0f, norfac, ofs[3];
+	int tex_nr, rgbnor, talpha;
+
+	GPU_link(mat, "set_value", GPU_uniform(&one), &stencil);
+
+	GPU_link(mat, "texco_norm", GPU_builtin(GPU_VIEW_NORMAL), &texco_norm);
+	GPU_link(mat, "texco_orco", GPU_attribute(CD_ORCO, ""), &texco_orco);
+	GPU_link(mat, "texco_object", GPU_builtin(GPU_INVERSE_VIEW_MATRIX),
+		GPU_builtin(GPU_INVERSE_OBJECT_MATRIX),
+		GPU_builtin(GPU_VIEW_POSITION), &texco_object);
+	GPU_link(mat, "texco_tangent", GPU_attribute(CD_TANGENT, ""), &texco_tangent);
+	GPU_link(mat, "texco_global", GPU_builtin(GPU_INVERSE_VIEW_MATRIX),
+		GPU_builtin(GPU_VIEW_POSITION), &texco_global);
+
+	orn= texco_norm;
+
+	/* go over texture slots */
+	for(tex_nr=0; tex_nr<MAX_MTEX; tex_nr++) {
+		/* separate tex switching */
+		if(ma->septex & (1<<tex_nr)) continue;
+		
+		if(ma->mtex[tex_nr]) {
+			mtex= ma->mtex[tex_nr];
+			
+			tex= mtex->tex;
+			if(tex==0) continue;
+
+			/* which coords */
+			if(mtex->texco==TEXCO_ORCO)
+				texco= texco_orco;
+			else if(mtex->texco==TEXCO_OBJECT)
+				texco= texco_object;
+			else if(mtex->texco==TEXCO_NORM)
+				texco= texco_norm;
+			else if(mtex->texco==TEXCO_TANGENT)
+				texco= texco_object;
+			else if(mtex->texco==TEXCO_GLOB)
+				texco= texco_global;
+			else if(mtex->texco==TEXCO_REFL)
+				texco= shi->ref;
+			else if(mtex->texco==TEXCO_UV) {
+				if(1) { //!(texco_uv && strcmp(mtex->uvname, lastuvname) == 0)) {
+					GPU_link(mat, "texco_uv", GPU_attribute(CD_MTFACE, mtex->uvname), &texco_uv);
+					lastuvname = mtex->uvname;
+				}
+				texco= texco_uv;
+			}
+			else
+				continue;
+
+			/* in case of uv, this would just undo a multiplication in texco_uv */
+			if(mtex->texco != TEXCO_UV)
+				GPU_link(mat, "mtex_2d_mapping", texco, &texco);
+
+			if(mtex->size[0] != 1.0f || mtex->size[1] != 1.0f || mtex->size[2] != 1.0f)
+				GPU_link(mat, "mtex_mapping_size", texco, GPU_uniform(mtex->size), &texco);
+
+			ofs[0] = mtex->ofs[0] + 0.5f - 0.5f*mtex->size[0];
+			ofs[1] = mtex->ofs[1] + 0.5f - 0.5f*mtex->size[1];
+			ofs[2] = 0.0f;
+			if(ofs[0] != 0.0f || ofs[1] != 0.0f || ofs[2] != 0.0f)
+				GPU_link(mat, "mtex_mapping_ofs", texco, GPU_uniform(ofs), &texco);
+
+			if(tex && tex->type == TEX_IMAGE && tex->ima) {
+				GPU_link(mat, "mtex_image", texco, GPU_image(tex->ima, NULL), &tin, &trgb, &tnor);
+				rgbnor= TEX_RGB;
+				talpha= 1;
+		    }
+			else continue;
+
+			/* texture output */
+			if((rgbnor & TEX_RGB) && (mtex->texflag & MTEX_RGBTOINT)) {
+				GPU_link(mat, "mtex_rgbtoint", trgb, &tin);
+				rgbnor -= TEX_RGB;
+			}
+
+			if(mtex->texflag & MTEX_NEGATIVE) {
+				if(rgbnor & TEX_RGB)
+					GPU_link(mat, "mtex_rgb_invert", trgb, &trgb);
+				else
+					GPU_link(mat, "mtex_value_invert", tin, &tin);
+			}
+
+			if(mtex->texflag & MTEX_STENCIL) {
+				if(rgbnor & TEX_RGB)
+					GPU_link(mat, "mtex_rgb_stencil", stencil, trgb, &stencil, &trgb);
+				else
+					GPU_link(mat, "mtex_value_stencil", stencil, tin, &stencil, &tin);
+			}
+
+			/* mapping */
+			if(mtex->mapto & (MAP_COL+MAP_COLSPEC)) {
+				/* stencil maps on the texture control slider, not texture intensity value */
+				if(mtex->colfac == 1.0f)
+					colfac = stencil;
+				else
+					GPU_link(mat, "math_multiply", GPU_uniform(&mtex->colfac), stencil, &colfac);
+
+				if((rgbnor & TEX_RGB)==0) {
+					GPU_link(mat, "set_rgb", GPU_uniform(&mtex->r), &tcol);
+				}
+				else {
+					GPU_link(mat, "set_rgba", trgb, &tcol);
+
+					if(mtex->mapto & MAP_ALPHA)
+						GPU_link(mat, "set_value", stencil, &tin);
+					else
+						GPU_link(mat, "mtex_alpha_from_col", trgb, &tin);
+				}
+				
+				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))
+					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(mtex->maptoneg & MAP_NORM) tex->norfac= -mtex->norfac;
+				else tex->norfac= mtex->norfac;
+				
+				if((tex->type==TEX_IMAGE) && (tex->imaflag & TEX_NORMALMAP)) {
+					tex->norfac = mtex->norfac;
+
+					if(mtex->maptoneg & MAP_NORM)
+						GPU_link(mat, "mtex_negate_texnormal", tnor, &tnor);
+
+					if(mtex->normapspace == MTEX_NSPACE_TANGENT)
+						GPU_link(mat, "mtex_nspace_tangent", GPU_attribute(CD_TANGENT, ""), shi->vn, tnor, &newnor);
+					else
+						newnor = tnor;
+
+					norfac = MIN2(mtex->norfac, 1.0);
+					if(norfac == 1.0f && !GPU_link_changed(stencil)) {
+						shi->vn = newnor;
+					}
+					else {
+						tnorfac = GPU_uniform(&norfac);
+
+						if(GPU_link_changed(stencil))
+							GPU_link(mat, "math_multiply", tnorfac, stencil, &tnorfac);
+
+						GPU_link(mat, "mtex_blend_normal", tnorfac, shi->vn, newnor, &shi->vn);
+					}
+				}
+
+				GPU_link(mat, "vec_math_negate", shi->vn, &orn);
+				GPU_link(mat, "texco_refl", shi->vn, shi->view, &shi->ref);
+			}
+
+			if((mtex->mapto & MAP_VARS)) {
+				if(mtex->varfac == 1.0f)
+					varfac = stencil;
+				else
+					GPU_link(mat, "math_multiply", GPU_uniform(&mtex->varfac), stencil, &varfac);
+
+				if(rgbnor & TEX_RGB) {
+					if(talpha)
+						GPU_link(mat, "mtex_alpha_from_col", trgb, &tin);
+					else
+						GPU_link(mat, "mtex_rgbtoint", trgb, &tin);
+				}
+
+				if(!(G.fileflags & G_FILE_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) {
+					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) {
+					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) {
+					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);
+					GPU_link(mat, "mtex_har_multiply_clamp", shi->har, &shi->har);
+				}
+				if(mtex->mapto & MAP_ALPHA) {
+					int flip= mtex->maptoneg & MAP_ALPHA;
+					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) {
+					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);
+				}
+			}
+		}
+	}
+}
+
+void GPU_shadeinput_set(GPUMaterial *mat, Material *ma, GPUShadeInput *shi)
+{
+	float hard = ma->har;
+
+	memset(shi, 0, sizeof(*shi));
+
+	shi->gpumat = mat;
+	shi->mat = ma;
+
+	GPU_link(mat, "set_rgb", GPU_uniform(&ma->r), &shi->rgb);
+	GPU_link(mat, "set_rgb", GPU_uniform(&ma->specr), &shi->specrgb);
+	GPU_link(mat, "shade_norm", GPU_builtin(GPU_VIEW_NORMAL), &shi->vn);
+	GPU_link(mat, "set_value", GPU_uniform(&ma->alpha), &shi->alpha);
+	GPU_link(mat, "set_value", GPU_uniform(&ma->ref), &shi->refl);
+	GPU_link(mat, "set_value", GPU_uniform(&ma->spec), &shi->spec);
+	GPU_link(mat, "set_value", GPU_uniform(&ma->emit), &shi->emit);
+	GPU_link(mat, "set_value", GPU_uniform(&hard), &shi->har);
+	GPU_link(mat, "set_value", GPU_uniform(&ma->amb), &shi->amb);
+	GPU_link(mat, "shade_view", GPU_builtin(GPU_VIEW_POSITION), &shi->view);
+	GPU_link(mat, "vcol_attribute", GPU_attribute(CD_MCOL, ""), &shi->vcol);
+	GPU_link(mat, "texco_refl", shi->vn, shi->view, &shi->ref);
+}
+
+void GPU_shaderesult_set(GPUShadeInput *shi, GPUShadeResult *shr)
+{
+	GPUMaterial *mat= shi->gpumat;
+	GPUNodeLink *emit, *ulinfac, *ulogfac, *mistfac;
+	Material *ma= shi->mat;
+	World *world= mat->scene->world;
+	float linfac, logfac, misttype;
+
+	memset(shr, 0, sizeof(*shr));
+
+	if(ma->mode & MA_VERTEXCOLP)
+		shi->rgb = shi->vcol;
+
+	do_material_tex(shi);
+
+	if(ma->mode & MA_ZTRA)
+		GPU_material_enable_alpha(mat);
+
+	if((G.fileflags & G_FILE_GLSL_NO_LIGHTS) || (ma->mode & MA_SHLESS)) {
+		shr->combined = shi->rgb;
+		shr->alpha = shi->alpha;
+	}
+	else {
+		if(GPU_link_changed(shi->emit) || ma->emit != 0.0f) {
+			if((ma->mode & (MA_VERTEXCOL|MA_VERTEXCOLP))== MA_VERTEXCOL) {
+				GPU_link(mat, "shade_add", shi->emit, shi->vcol, &emit);
+				GPU_link(mat, "shade_mul", emit, shi->rgb, &shr->diff);
+			}
+			else
+				GPU_link(mat, "shade_mul_value", shi->emit, shi->rgb, &shr->diff);
+		}
+		else
+			GPU_link(mat, "set_rgb_zero", &shr->diff);
+
+		GPU_link(mat, "set_rgb_zero", &shr->spec);
+
+		material_lights(shi, shr);
+
+		shr->combined = shr->diff;
+		shr->alpha = shi->alpha;
+
+		if(world) {
+        	/* exposure correction */
+			if(world->exp!=0.0f || world->range!=1.0f) {
+				linfac= 1.0 + pow((2.0*world->exp + 0.5), -10);
+				logfac= log((linfac-1.0)/linfac)/world->range;
+
+				GPU_link(mat, "set_value", GPU_uniform(&linfac), &ulinfac);
+				GPU_link(mat, "set_value", GPU_uniform(&logfac), &ulogfac);
+
+				GPU_link(mat, "shade_exposure_correct", shr->combined,
+					ulinfac, ulogfac, &shr->combined);
+				GPU_link(mat, "shade_exposure_correct", shr->spec,
+					ulinfac, ulogfac, &shr->spec);
+			}
+
+			/* ambient color */
+			if(world->ambr!=0.0f || world->ambg!=0.0f || world->ambb!=0.0f) {
+				if(GPU_link_changed(shi->amb) || ma->amb != 0.0f)
+					GPU_link(mat, "shade_maddf", shr->combined, GPU_uniform(&ma->amb),
+						GPU_uniform(&world->ambr), &shr->combined);
+			}
+		}
+
+		if(ma->mode & MA_RAMP_COL) ramp_diffuse_result(shi, &shr->combined);
+		if(ma->mode & MA_RAMP_SPEC) ramp_spec_result(shi, &shr->spec);
+
+		if(GPU_link_changed(shi->spec) || ma->spec != 0.0f)
+			GPU_link(mat, "shade_add", shr->combined, shr->spec, &shr->combined);
+	}
+
+	GPU_link(mat, "mtex_alpha_to_col", shr->combined, shr->alpha, &shr->combined);
+
+	if(ma->shade_flag & MA_OBCOLOR)
+		GPU_link(mat, "shade_obcolor", shr->combined, GPU_builtin(GPU_OBCOLOR), &shr->combined);
+
+	if(world && (world->mode & WO_MIST) && !(ma->mode & MA_NOMIST)) {
+		misttype = world->mistype;
+
+		GPU_link(mat, "shade_mist_factor", GPU_builtin(GPU_VIEW_POSITION),
+			GPU_uniform(&world->miststa), GPU_uniform(&world->mistdist),
+			GPU_uniform(&misttype), GPU_uniform(&world->misi), &mistfac);
+
+		GPU_link(mat, "mix_blend", mistfac, shr->combined,
+			GPU_uniform(&world->horr), &shr->combined);
+	}
+
+	if(!(ma->mode & MA_ZTRA)) {
+		if(world && (GPU_link_changed(shr->alpha) || ma->alpha != 1.0f))
+			GPU_link(mat, "shade_world_mix", GPU_uniform(&world->horr),
+				shr->combined, &shr->combined);
+
+		GPU_link(mat, "shade_alpha_opaque", shr->combined, &shr->combined);
+	}
+
+	if(ma->shade_flag & MA_OBCOLOR) {
+		mat->obcolalpha = 1;
+		GPU_link(mat, "shade_alpha_obcolor", shr->combined, GPU_builtin(GPU_OBCOLOR), &shr->combined);
+	}
+}
+
+GPUNodeLink *GPU_blender_material(GPUMaterial *mat, Material *ma)
+{
+	GPUShadeInput shi;
+	GPUShadeResult shr;
+
+	GPU_shadeinput_set(mat, ma, &shi);
+	GPU_shaderesult_set(&shi, &shr);
+
+	return shr.combined;
+}
+
+GPUMaterial *GPU_material_from_blender(Scene *scene, Material *ma)
+{
+	GPUMaterial *mat;
+	GPUNodeLink *outlink;
+	LinkData *link;
+
+	for(link=ma->gpumaterial.first; link; link=link->next)
+		if(((GPUMaterial*)link->data)->scene == scene)
+			return link->data;
+
+	mat = GPU_material_construct_begin(ma);
+	mat->scene = scene;
+
+	if(!(G.fileflags & G_FILE_GLSL_NO_NODES) && ma->nodetree && ma->use_nodes) {
+		ntreeGPUMaterialNodes(ma->nodetree, mat);
+	}
+	else {
+		outlink = GPU_blender_material(mat, ma);
+		GPU_material_output_link(mat, outlink);
+	}
+
+	/*if(!GPU_material_construct_end(mat)) {
+		GPU_material_free(mat);
+		mat= NULL;
+		return 0;
+	}*/
+
+	GPU_material_construct_end(mat);
+
+	link = MEM_callocN(sizeof(LinkData), "GPUMaterialLink");
+	link->data = mat;
+	BLI_addtail(&ma->gpumaterial, link);
+
+	return mat;
+}
+
+void GPU_materials_free()
+{
+	Object *ob;
+	Material *ma;
+	extern Material defmaterial;
+
+	for(ma=G.main->mat.first; ma; ma=ma->id.next)
+		GPU_material_free(ma);
+
+	GPU_material_free(&defmaterial);
+
+	for(ob=G.main->object.first; ma; ma=ma->id.next)
+		GPU_lamp_free(ob);
+}
+
+/* Lamps and shadow buffers */
+
+void GPU_lamp_update(GPULamp *lamp, float obmat[][4])
+{
+	float mat[4][4];
+
+	Mat4CpyMat4(mat, obmat);
+	Mat4Ortho(mat);
+
+	VECCOPY(lamp->vec, mat[2]);
+	VECCOPY(lamp->co, mat[3]);
+	Mat4CpyMat4(lamp->obmat, mat);
+	Mat4Invert(lamp->imat, mat);
+}
+
+static void gpu_lamp_from_blender(Scene *scene, Object *ob, Object *par, Lamp *la, GPULamp *lamp)
+{
+	float temp, angle, pixsize, wsize;
+
+	lamp->scene = scene;
+	lamp->ob = ob;
+	lamp->par = par;
+	lamp->la = la;
+	lamp->lay = ob->lay;
+
+	/* add_render_lamp */
+	lamp->mode = la->mode;
+	lamp->type = la->type;
+
+	lamp->energy = la->energy;
+	if(lamp->mode & LA_NEG) lamp->energy= -lamp->energy;
+
+	lamp->col[0]= la->r*lamp->energy;
+	lamp->col[1]= la->g*lamp->energy;
+	lamp->col[2]= la->b*lamp->energy;
+
+	GPU_lamp_update(lamp, ob->obmat);
+
+	lamp->spotsi= la->spotsize;
+	if(lamp->mode & LA_HALO)
+		if(lamp->spotsi > 170.0)
+			lamp->spotsi = 170.0;
+	lamp->spotsi= cos(M_PI*lamp->spotsi/360.0);
+	lamp->spotbl= (1.0 - lamp->spotsi)*la->spotblend;
+	lamp->k= la->k;
+
+	lamp->dist= la->dist;
+	lamp->falloff_type= la->falloff_type;
+	lamp->att1= la->att1;
+	lamp->att2= la->att2;
+	lamp->curfalloff= la->curfalloff;
+
+	/* initshadowbuf */
+	lamp->bias = 0.02f*la->bias;
+	lamp->size = la->bufsize;
+	lamp->d= la->clipsta;
+	lamp->clipend= la->clipend;
+
+	/* arbitrary correction for the fact we do no soft transition */
+	lamp->bias *= 0.25f;
+
+	/* makeshadowbuf */
+	angle= saacos(lamp->spotsi);
+	temp= 0.5f*lamp->size*cos(angle)/sin(angle);
+	pixsize= (lamp->d)/temp;
+	wsize= pixsize*0.5f*lamp->size;
+		
+	i_window(-wsize, wsize, -wsize, wsize, lamp->d, lamp->clipend, lamp->winmat);
+}
+
+static void gpu_lamp_shadow_free(GPULamp *lamp)
+{
+	if(lamp->tex)
+		GPU_texture_free(lamp->tex);
+	if(lamp->fb)
+		GPU_framebuffer_free(lamp->fb);
+}
+
+GPULamp *GPU_lamp_from_blender(Scene *scene, Object *ob, Object *par)
+{
+	Lamp *la;
+	GPULamp *lamp;
+	LinkData *link;
+
+	for(link=ob->gpulamp.first; link; link=link->next)
+		if(((GPULamp*)link->data)->par == par &&
+		   ((GPULamp*)link->data)->scene == scene)
+			return link->data;
+
+	lamp = MEM_callocN(sizeof(GPULamp), "GPULamp");
+
+	link = MEM_callocN(sizeof(LinkData), "GPULampLink");
+	link->data = lamp;
+	BLI_addtail(&ob->gpulamp, link);
+
+	la = ob->data;
+	gpu_lamp_from_blender(scene, ob, par, la, lamp);
+
+	if(la->type==LA_SPOT && (la->mode & LA_SHAD_BUF)) {
+		/* opengl */
+		lamp->fb = GPU_framebuffer_create();
+		if(!lamp->fb) {
+			gpu_lamp_shadow_free(lamp);
+			return lamp;
+		}
+
+		lamp->tex = GPU_texture_create_depth(lamp->size, lamp->size);
+		if(!lamp->tex) {
+			gpu_lamp_shadow_free(lamp);
+			return lamp;
+		}
+
+		if(!GPU_framebuffer_texture_attach(lamp->fb, lamp->tex)) {
+			gpu_lamp_shadow_free(lamp);
+			return lamp;
+		}
+
+		GPU_framebuffer_restore();
+	}
+
+	return lamp;
+}
+
+void GPU_lamp_free(Object *ob)
+{
+	GPULamp *lamp;
+	LinkData *link;
+	LinkNode *nlink;
+	Material *ma;
+
+	for(link=ob->gpulamp.first; link; link=link->next) {
+		lamp = link->data;
+
+		for(nlink=lamp->materials; nlink; nlink=nlink->next) {
+			ma= nlink->link;
+			if(ma->gpumaterial.first)
+				GPU_material_free(ma);
+		}
+		BLI_linklist_free(lamp->materials, NULL);
+
+		gpu_lamp_shadow_free(lamp);
+
+		MEM_freeN(lamp);
+	}
+
+	BLI_freelistN(&ob->gpulamp);
+}
+
+int GPU_lamp_has_shadow_buffer(GPULamp *lamp)
+{
+	return (!(G.fileflags & G_FILE_GLSL_NO_SHADOWS) &&
+	        !(G.fileflags & G_FILE_GLSL_NO_LIGHTS) &&
+			lamp->tex && lamp->fb);
+}
+
+void GPU_lamp_shadow_buffer_bind(GPULamp *lamp, float viewmat[][4], int *winsize, float winmat[][4])
+{
+	float rangemat[4][4], persmat[4][4];
+
+	/* initshadowbuf */
+	Mat4Invert(lamp->viewmat, lamp->obmat);
+	Normalize(lamp->viewmat[0]);
+	Normalize(lamp->viewmat[1]);
+	Normalize(lamp->viewmat[2]);
+
+	/* makeshadowbuf */
+	Mat4MulMat4(persmat, lamp->viewmat, lamp->winmat);
+
+	/* opengl depth buffer is range 0.0..1.0 instead of -1.0..1.0 in blender */
+	Mat4One(rangemat);
+	rangemat[0][0] = 0.5f;
+	rangemat[1][1] = 0.5f;
+	rangemat[2][2] = 0.5f;
+	rangemat[3][0] = 0.5f;
+	rangemat[3][1] = 0.5f;
+	rangemat[3][2] = 0.5f;
+
+	Mat4MulMat4(lamp->persmat, persmat, rangemat);
+
+	/* opengl */
+	GPU_framebuffer_texture_bind(lamp->fb, lamp->tex);
+
+	/* set matrices */
+	Mat4CpyMat4(viewmat, lamp->viewmat);
+	Mat4CpyMat4(winmat, lamp->winmat);
+	*winsize = lamp->size;
+}
+
+void GPU_lamp_shadow_buffer_unbind(GPULamp *lamp)
+{
+	GPU_framebuffer_texture_unbind(lamp->fb, lamp->tex);
+	GPU_framebuffer_restore();
+}
+
+int GPU_lamp_shadow_layer(GPULamp *lamp)
+{
+	if(lamp->fb && lamp->tex && (lamp->mode & (LA_LAYER|LA_LAYER_SHADOW)))
+		return lamp->lay;
+	else
+		return -1;
+}
+
diff --git a/source/blender/gpu/intern/gpu_shader_material.glsl b/source/blender/gpu/intern/gpu_shader_material.glsl
new file mode 100644
index 00000000000..309cb738454
--- /dev/null
+++ b/source/blender/gpu/intern/gpu_shader_material.glsl
@@ -0,0 +1,1543 @@
+
+float exp_blender(float f)
+{
+	return pow(2.71828182846, f);
+}
+
+void rgb_to_hsv(vec4 rgb, out vec4 outcol)
+{
+	float cmax, cmin, h, s, v, cdelta;
+	vec3 c;
+
+	cmax = max(rgb[0], max(rgb[1], rgb[2]));
+	cmin = min(rgb[0], min(rgb[1], rgb[2]));
+	cdelta = cmax-cmin;
+
+	v = cmax;
+	if (cmax!=0.0)
+		s = cdelta/cmax;
+	else {
+		s = 0.0;
+		h = 0.0;
+	}
+
+	if (s == 0.0) {
+		h = 0.0;
+	}
+	else {
+		c = (vec3(cmax, cmax, cmax) - rgb.xyz)/cdelta;
+
+		if (rgb.x==cmax) h = c[2] - c[1];
+		else if (rgb.y==cmax) h = 2.0 + c[0] -  c[2];
+		else h = 4.0 + c[1] - c[0];
+
+		h /= 6.0;
+
+		if (h<0.0)
+			h += 1.0;
+	}
+
+	outcol = vec4(h, s, v, rgb.w);
+}
+
+void hsv_to_rgb(vec4 hsv, out vec4 outcol)
+{
+	float i, f, p, q, t, h, s, v;
+	vec3 rgb;
+
+	h = hsv[0];
+	s = hsv[1];
+	v = hsv[2];
+
+	if(s==0.0) {
+		rgb = vec3(v, v, v);
+	}
+	else {
+		if(h==1.0)
+			h = 0.0;
+		
+		h *= 6.0;
+		i = floor(h);
+		f = h - i;
+		rgb = vec3(f, f, f);
+		p = v*(1.0-s);
+		q = v*(1.0-(s*f));
+		t = v*(1.0-(s*(1.0-f)));
+		
+		if (i == 0.0) rgb = vec3(v, t, p);
+		else if (i == 1.0) rgb = vec3(q, v, p);
+		else if (i == 2.0) rgb = vec3(p, v, t);
+		else if (i == 3.0) rgb = vec3(p, q, v);
+		else if (i == 4.0) rgb = vec3(t, p, v);
+		else rgb = vec3(v, p, q);
+	}
+
+	outcol = vec4(rgb, hsv.w);
+}
+
+#define M_PI 3.14159265358979323846
+
+/*********** SHADER NODES ***************/
+
+void vcol_attribute(vec4 attvcol, out vec4 vcol)
+{
+	vcol = vec4(attvcol.x/255.0, attvcol.y/255.0, attvcol.z/255.0, 1.0);
+}
+
+void uv_attribute(vec2 attuv, out vec3 uv)
+{
+	uv = vec3(attuv*2.0 - vec2(1.0, 1.0), 0.0);
+}
+
+void geom(vec3 co, vec3 nor, mat4 viewinvmat, vec3 attorco, vec2 attuv, vec4 attvcol, out vec3 global, out vec3 local, out vec3 view, out vec3 orco, out vec3 uv, out vec3 normal, out vec4 vcol, out float frontback)
+{
+	local = co;
+	view = normalize(local);
+	global = (viewinvmat*vec4(local, 1.0)).xyz;
+	orco = attorco;
+	uv_attribute(attuv, uv);
+	normal = -normalize(nor);	/* blender render normal is negated */
+	vcol_attribute(attvcol, vcol);
+	frontback = 1.0;
+}
+
+void mapping(vec3 vec, mat4 mat, vec3 minvec, vec3 maxvec, float domin, float domax, out vec3 outvec)
+{
+	outvec = (mat * vec4(vec, 1.0)).xyz;
+	if(domin == 1.0)
+		outvec = max(outvec, minvec);
+	if(domax == 1.0)
+		outvec = min(outvec, maxvec);
+}
+
+void camera(vec3 co, out vec3 outview, out float outdepth, out float outdist)
+{
+	outdepth = abs(co.z);
+	outdist = length(co);
+	outview = normalize(co);
+}
+
+void math_add(float val1, float val2, out float outval)
+{
+	outval = val1 + val2;
+}
+
+void math_subtract(float val1, float val2, out float outval)
+{
+	outval = val1 - val2;
+}
+
+void math_multiply(float val1, float val2, out float outval)
+{
+	outval = val1 * val2;
+}
+
+void math_divide(float val1, float val2, out float outval)
+{
+	if (val2 == 0.0)
+		outval = 0.0;
+	else
+		outval = val1 / val2;
+}
+
+void math_sine(float val, out float outval)
+{
+	outval = sin(val);
+}
+
+void math_cosine(float val, out float outval)
+{
+	outval = cos(val);
+}
+
+void math_tangent(float val, out float outval)
+{
+	outval = tan(val);
+}
+
+void math_asin(float val, out float outval)
+{
+	if (val <= 1.0 && val >= -1.0)
+		outval = asin(val);
+	else
+		outval = 0.0;
+}
+
+void math_acos(float val, out float outval)
+{
+	if (val <= 1.0 && val >= -1.0)
+		outval = acos(val);
+	else
+		outval = 0.0;
+}
+
+void math_atan(float val, out float outval)
+{
+	outval = atan(val);
+}
+
+void math_pow(float val1, float val2, out float outval)
+{
+	if (val1 >= 0.0)
+		outval = pow(val1, val2);
+	else
+		outval = 0.0;
+}
+
+void math_log(float val1, float val2, out float outval)
+{
+	if(val1 > 0.0  && val2 > 0.0)
+		outval= log2(val1) / log2(val2);
+	else
+		outval= 0.0;
+}
+
+void math_max(float val1, float val2, out float outval)
+{
+	outval = max(val1, val2);
+}
+
+void math_min(float val1, float val2, out float outval)
+{
+	outval = min(val1, val2);
+}
+
+void math_round(float val, out float outval)
+{
+	outval= floor(val + 0.5);
+}
+
+void math_less_than(float val1, float val2, out float outval)
+{
+	if(val1 < val2)
+		outval = 1.0;
+	else
+		outval = 0.0;
+}
+
+void math_greater_than(float val1, float val2, out float outval)
+{
+	if(val1 > val2)
+		outval = 1.0;
+	else
+		outval = 0.0;
+}
+
+void squeeze(float val, float width, float center, out float outval)
+{
+	outval = 1.0/(1.0 + pow(2.71828183, -((val-center)*width)));
+}
+
+void vec_math_add(vec3 v1, vec3 v2, out vec3 outvec, out float outval)
+{
+	outvec = v1 + v2;
+	outval = (abs(outvec[0]) + abs(outvec[1]) + abs(outvec[2]))/3.0;
+}
+
+void vec_math_sub(vec3 v1, vec3 v2, out vec3 outvec, out float outval)
+{
+	outvec = v1 - v2;
+	outval = (abs(outvec[0]) + abs(outvec[1]) + abs(outvec[2]))/3.0;
+}
+
+void vec_math_average(vec3 v1, vec3 v2, out vec3 outvec, out float outval)
+{
+	outvec = v1 + v2;
+	outval = length(outvec);
+	outvec = normalize(outvec);
+}
+
+void vec_math_dot(vec3 v1, vec3 v2, out vec3 outvec, out float outval)
+{
+	outvec = vec3(0, 0, 0);
+	outval = dot(v1, v2);
+}
+
+void vec_math_cross(vec3 v1, vec3 v2, out vec3 outvec, out float outval)
+{
+	outvec = cross(v1, v2);
+	outval = length(outvec);
+}
+
+void vec_math_normalize(vec3 v, out vec3 outvec, out float outval)
+{
+	outval = length(v);
+	outvec = normalize(v);
+}
+
+void vec_math_negate(vec3 v, out vec3 outv)
+{
+	outv = -v;
+}
+
+void normal(vec3 dir, vec3 nor, out vec3 outnor, out float outdot)
+{
+	outnor = dir;
+	outdot = -dot(dir, nor);
+}
+
+void curves_vec(vec3 vec, sampler1D curvemap, out vec3 outvec)
+{
+	outvec.x = texture1D(curvemap, (vec.x + 1.0)*0.5).x;
+	outvec.y = texture1D(curvemap, (vec.y + 1.0)*0.5).y;
+	outvec.z = texture1D(curvemap, (vec.z + 1.0)*0.5).z;
+}
+
+void curves_rgb(vec4 col, sampler1D curvemap, out vec4 outcol)
+{
+	outcol.r = texture1D(curvemap, texture1D(curvemap, col.r).a).r;
+	outcol.g = texture1D(curvemap, texture1D(curvemap, col.g).a).g;
+	outcol.b = texture1D(curvemap, texture1D(curvemap, col.b).a).b;
+	outcol.a = col.a;
+}
+
+void set_value(float val, out float outval)
+{
+	outval = val;
+}
+
+void set_rgb(vec3 col, out vec3 outcol)
+{
+	outcol = col;
+}
+
+void set_rgba(vec4 col, out vec4 outcol)
+{
+	outcol = col;
+}
+
+void set_value_zero(out float outval)
+{
+	outval = 0.0;
+}
+
+void set_rgb_zero(out vec3 outval)
+{
+	outval = vec3(0.0);
+}
+
+void set_rgba_zero(out vec4 outval)
+{
+	outval = vec4(0.0);
+}
+
+void mix_blend(float fac, vec4 col1, vec4 col2, out vec4 outcol)
+{
+	fac = clamp(fac, 0.0, 1.0);
+	outcol = mix(col1, col2, fac);
+	outcol.a = col1.a;
+}
+
+void mix_add(float fac, vec4 col1, vec4 col2, out vec4 outcol)
+{
+	fac = clamp(fac, 0.0, 1.0);
+	outcol = mix(col1, col1 + col2, fac);
+	outcol.a = col1.a;
+}
+
+void mix_mult(float fac, vec4 col1, vec4 col2, out vec4 outcol)
+{
+	fac = clamp(fac, 0.0, 1.0);
+	outcol = mix(col1, col1 * col2, fac);
+	outcol.a = col1.a;
+}
+
+void mix_screen(float fac, vec4 col1, vec4 col2, out vec4 outcol)
+{
+	fac = clamp(fac, 0.0, 1.0);
+	float facm = 1.0 - fac;
+
+	outcol = vec4(1.0) - (vec4(facm) + fac*(vec4(1.0) - col2))*(vec4(1.0) - col1);
+	outcol.a = col1.a;
+}
+
+void mix_overlay(float fac, vec4 col1, vec4 col2, out vec4 outcol)
+{
+	fac = clamp(fac, 0.0, 1.0);
+	float facm = 1.0 - fac;
+
+	outcol = col1;
+
+	if(outcol.r < 0.5)
+		outcol.r *= facm + 2.0*fac*col2.r;
+	else
+		outcol.r = 1.0 - (facm + 2.0*fac*(1.0 - col2.r))*(1.0 - outcol.r);
+
+	if(outcol.g < 0.5)
+		outcol.g *= facm + 2.0*fac*col2.g;
+	else
+		outcol.g = 1.0 - (facm + 2.0*fac*(1.0 - col2.g))*(1.0 - outcol.g);
+
+	if(outcol.b < 0.5)
+		outcol.b *= facm + 2.0*fac*col2.b;
+	else
+		outcol.b = 1.0 - (facm + 2.0*fac*(1.0 - col2.b))*(1.0 - outcol.b);
+}
+
+void mix_sub(float fac, vec4 col1, vec4 col2, out vec4 outcol)
+{
+	fac = clamp(fac, 0.0, 1.0);
+	outcol = mix(col1, col1 - col2, fac);
+	outcol.a = col1.a;
+}
+
+void mix_div(float fac, vec4 col1, vec4 col2, out vec4 outcol)
+{
+	fac = clamp(fac, 0.0, 1.0);
+	float facm = 1.0 - fac;
+
+	outcol = col1;
+
+	if(col2.r != 0.0) outcol.r = facm*outcol.r + fac*outcol.r/col2.r;
+	if(col2.g != 0.0) outcol.g = facm*outcol.g + fac*outcol.g/col2.g;
+	if(col2.b != 0.0) outcol.b = facm*outcol.b + fac*outcol.b/col2.b;
+}
+
+void mix_diff(float fac, vec4 col1, vec4 col2, out vec4 outcol)
+{
+	fac = clamp(fac, 0.0, 1.0);
+	outcol = mix(col1, abs(col1 - col2), fac);
+	outcol.a = col1.a;
+}
+
+void mix_dark(float fac, vec4 col1, vec4 col2, out vec4 outcol)
+{
+	fac = clamp(fac, 0.0, 1.0);
+	outcol.rgb = min(col1.rgb, col2.rgb*fac);
+	outcol.a = col1.a;
+}
+
+void mix_light(float fac, vec4 col1, vec4 col2, out vec4 outcol)
+{
+	fac = clamp(fac, 0.0, 1.0);
+	outcol.rgb = max(col1.rgb, col2.rgb*fac);
+	outcol.a = col1.a;
+}
+
+void mix_dodge(float fac, vec4 col1, vec4 col2, out vec4 outcol)
+{
+	fac = clamp(fac, 0.0, 1.0);
+	outcol = col1;
+
+	if(outcol.r != 0.0) {
+		float tmp = 1.0 - fac*col2.r;
+		if(tmp <= 0.0)
+			outcol.r = 1.0;
+		else if((tmp = outcol.r/tmp) > 1.0)
+			outcol.r = 1.0;
+		else
+			outcol.r = tmp;
+	}
+	if(outcol.g != 0.0) {
+		float tmp = 1.0 - fac*col2.g;
+		if(tmp <= 0.0)
+			outcol.g = 1.0;
+		else if((tmp = outcol.g/tmp) > 1.0)
+			outcol.g = 1.0;
+		else
+			outcol.g = tmp;
+	}
+	if(outcol.b != 0.0) {
+		float tmp = 1.0 - fac*col2.b;
+		if(tmp <= 0.0)
+			outcol.b = 1.0;
+		else if((tmp = outcol.b/tmp) > 1.0)
+			outcol.b = 1.0;
+		else
+			outcol.b = tmp;
+	}
+}
+
+void mix_burn(float fac, vec4 col1, vec4 col2, out vec4 outcol)
+{
+	fac = clamp(fac, 0.0, 1.0);
+	float tmp, facm = 1.0 - fac;
+
+	outcol = col1;
+
+	tmp = facm + fac*col2.r;
+	if(tmp <= 0.0)
+		outcol.r = 0.0;
+	else if((tmp = (1.0 - (1.0 - outcol.r)/tmp)) < 0.0)
+		outcol.r = 0.0;
+	else if(tmp > 1.0)
+		outcol.r = 1.0;
+	else
+		outcol.r = tmp;
+
+	tmp = facm + fac*col2.g;
+	if(tmp <= 0.0)
+		outcol.g = 0.0;
+	else if((tmp = (1.0 - (1.0 - outcol.g)/tmp)) < 0.0)
+		outcol.g = 0.0;
+	else if(tmp > 1.0)
+		outcol.g = 1.0;
+	else
+		outcol.g = tmp;
+
+	tmp = facm + fac*col2.b;
+	if(tmp <= 0.0)
+		outcol.b = 0.0;
+	else if((tmp = (1.0 - (1.0 - outcol.b)/tmp)) < 0.0)
+		outcol.b = 0.0;
+	else if(tmp > 1.0)
+		outcol.b = 1.0;
+	else
+		outcol.b = tmp;
+}
+
+void mix_hue(float fac, vec4 col1, vec4 col2, out vec4 outcol)
+{
+	fac = clamp(fac, 0.0, 1.0);
+	float facm = 1.0 - fac;
+
+	outcol = col1;
+
+	vec4 hsv, hsv2, tmp;
+	rgb_to_hsv(col2, hsv2);
+
+	if(hsv2.y != 0.0) {
+		rgb_to_hsv(outcol, hsv);
+		hsv.x = hsv2.x;
+		hsv_to_rgb(hsv, tmp); 
+
+		outcol = mix(outcol, tmp, fac);
+		outcol.a = col1.a;
+	}
+}
+
+void mix_sat(float fac, vec4 col1, vec4 col2, out vec4 outcol)
+{
+	fac = clamp(fac, 0.0, 1.0);
+	float facm = 1.0 - fac;
+
+	outcol = col1;
+
+	vec4 hsv, hsv2;
+	rgb_to_hsv(outcol, hsv);
+
+	if(hsv.y != 0.0) {
+		rgb_to_hsv(col2, hsv2);
+
+		hsv.y = facm*hsv.y + fac*hsv2.y;
+		hsv_to_rgb(hsv, outcol);
+	}
+}
+
+void mix_val(float fac, vec4 col1, vec4 col2, out vec4 outcol)
+{
+	fac = clamp(fac, 0.0, 1.0);
+	float facm = 1.0 - fac;
+
+	vec4 hsv, hsv2;
+	rgb_to_hsv(col1, hsv);
+	rgb_to_hsv(col2, hsv2);
+
+	hsv.z = facm*hsv.z + fac*hsv2.z;
+	hsv_to_rgb(hsv, outcol);
+}
+
+void mix_color(float fac, vec4 col1, vec4 col2, out vec4 outcol)
+{
+	fac = clamp(fac, 0.0, 1.0);
+	float facm = 1.0 - fac;
+
+	outcol = col1;
+
+	vec4 hsv, hsv2, tmp;
+	rgb_to_hsv(col2, hsv2);
+
+	if(hsv2.y != 0.0) {
+		rgb_to_hsv(outcol, hsv);
+		hsv.x = hsv2.x;
+		hsv.y = hsv2.y;
+		hsv_to_rgb(hsv, tmp); 
+
+		outcol = mix(outcol, tmp, fac);
+		outcol.a = col1.a;
+	}
+}
+
+void valtorgb(float fac, sampler1D colormap, out vec4 outcol, out float outalpha)
+{
+	outcol = texture1D(colormap, fac);
+	outalpha = outcol.a;
+}
+
+void rgbtobw(vec4 color, out float outval)
+{
+	outval = color.r*0.35 + color.g*0.45 + color.b*0.2;
+}
+
+void invert(float fac, vec4 col, out vec4 outcol)
+{
+	outcol.xyz = mix(col.xyz, vec3(1.0, 1.0, 1.0) - col.xyz, fac);
+	outcol.w = col.w;
+}
+
+void hue_sat(float hue, float sat, float value, float fac, vec4 col, out vec4 outcol)
+{
+	vec4 hsv;
+
+	rgb_to_hsv(col, hsv);
+
+	hsv[0] += (hue - 0.5);
+	if(hsv[0]>1.0) hsv[0]-=1.0; else if(hsv[0]<0.0) hsv[0]+= 1.0;
+	hsv[1] *= sat;
+	if(hsv[1]>1.0) hsv[1]= 1.0; else if(hsv[1]<0.0) hsv[1]= 0.0;
+	hsv[2] *= value;
+	if(hsv[2]>1.0) hsv[2]= 1.0; else if(hsv[2]<0.0) hsv[2]= 0.0;
+
+	hsv_to_rgb(hsv, outcol);
+
+	outcol = mix(col, outcol, fac);
+}
+
+void separate_rgb(vec4 col, out float r, out float g, out float b)
+{
+	r = col.r;
+	g = col.g;
+	b = col.b;
+}
+
+void combine_rgb(float r, float g, float b, out vec4 col)
+{
+	col = vec4(r, g, b, 1.0);
+}
+
+void output_node(vec4 rgb, float alpha, out vec4 outrgb)
+{
+	outrgb = vec4(rgb.rgb, alpha);
+}
+
+/*********** TEXTURES ***************/
+
+void texture_flip_blend(vec3 vec, out vec3 outvec)
+{
+	outvec = vec.yxz;
+}
+
+void texture_blend_lin(vec3 vec, out float outval)
+{
+	outval = (1.0+vec.x)/2.0;
+}
+
+void texture_blend_quad(vec3 vec, out float outval)
+{
+	outval = max((1.0+vec.x)/2.0, 0.0);
+	outval *= outval;
+}
+
+void texture_wood_sin(vec3 vec, out float value, out vec4 color, out vec3 normal)
+{
+	float a = sqrt(vec.x*vec.x + vec.y*vec.y + vec.z*vec.z)*20.0;
+	float wi = 0.5 + 0.5*sin(a);
+
+	value = wi;
+	color = vec4(wi, wi, wi, 1.0);
+	normal = vec3(0.0, 0.0, 0.0);
+}
+
+void texture_image(vec3 vec, sampler2D ima, out float value, out vec4 color, out vec3 normal)
+{
+	color = texture2D(ima, (vec.xy + vec2(1.0, 1.0))*0.5);
+	value = 1.0;
+
+	normal.x = 2.0*(color.r - 0.5);
+	normal.y = 2.0*(0.5 - color.g);
+	normal.z = 2.0*(color.b - 0.5);
+}
+
+/************* MTEX *****************/
+
+void texco_orco(vec3 attorco, out vec3 orco)
+{
+	orco = attorco;
+}
+
+void texco_uv(vec2 attuv, out vec3 uv)
+{
+	/* disabled for now, works together with leaving out mtex_2d_mapping
+	   uv = vec3(attuv*2.0 - vec2(1.0, 1.0), 0.0); */
+	uv = vec3(attuv, 0.0);
+}
+
+void texco_norm(vec3 normal, out vec3 outnormal)
+{
+	/* corresponds to shi->orn, which is negated so cancels
+	   out blender normal negation */
+	outnormal = normalize(normal);
+}
+
+void texco_tangent(vec3 tangent, out vec3 outtangent)
+{
+	outtangent = normalize(tangent);
+}
+
+void texco_global(mat4 viewinvmat, vec3 co, out vec3 global)
+{
+	global = (viewinvmat*vec4(co, 1.0)).xyz;
+}
+
+void texco_object(mat4 viewinvmat, mat4 obinvmat, vec3 co, out vec3 object)
+{
+	object = (obinvmat*(viewinvmat*vec4(co, 1.0))).xyz;
+}
+
+void texco_refl(vec3 vn, vec3 view, out vec3 ref)
+{
+	ref = view - 2.0*dot(vn, view)*vn;
+}
+
+void shade_norm(vec3 normal, out vec3 outnormal)
+{
+	/* blender render normal is negated */
+	outnormal = -normalize(normal);
+}
+
+void mtex_rgb_blend(vec3 outcol, vec3 texcol, float fact, float facg, out vec3 incol)
+{
+	float facm;
+
+	fact *= facg;
+	facm = 1.0-fact;
+
+	incol = fact*texcol + facm*outcol;
+}
+
+void mtex_rgb_mul(vec3 outcol, vec3 texcol, float fact, float facg, out vec3 incol)
+{
+	float facm;
+
+	fact *= facg;
+	facm = 1.0-facg;
+
+	incol = (facm + fact*texcol)*outcol;
+}
+
+void mtex_rgb_screen(vec3 outcol, vec3 texcol, float fact, float facg, out vec3 incol)
+{
+	float facm;
+
+	fact *= facg;
+	facm = 1.0-facg;
+
+	incol = vec3(1.0) - (vec3(facm) + fact*(vec3(1.0) - texcol))*(vec3(1.0) - outcol);
+}
+
+void mtex_rgb_overlay(vec3 outcol, vec3 texcol, float fact, float facg, out vec3 incol)
+{
+	float facm;
+
+	fact *= facg;
+	facm = 1.0-facg;
+
+	if(outcol.r < 0.5)
+		incol.r = outcol.r*(facm + 2.0*fact*texcol.r);
+	else
+		incol.r = 1.0 - (facm + 2.0*fact*(1.0 - texcol.r))*(1.0 - outcol.r);
+
+	if(outcol.g < 0.5)
+		incol.g = outcol.g*(facm + 2.0*fact*texcol.g);
+	else
+		incol.g = 1.0 - (facm + 2.0*fact*(1.0 - texcol.g))*(1.0 - outcol.g);
+
+	if(outcol.b < 0.5)
+		incol.b = outcol.b*(facm + 2.0*fact*texcol.b);
+	else
+		incol.b = 1.0 - (facm + 2.0*fact*(1.0 - texcol.b))*(1.0 - outcol.b);
+}
+
+void mtex_rgb_sub(vec3 outcol, vec3 texcol, float fact, float facg, out vec3 incol)
+{
+	incol = -fact*facg*texcol + outcol;
+}
+
+void mtex_rgb_add(vec3 outcol, vec3 texcol, float fact, float facg, out vec3 incol)
+{
+	incol = fact*facg*texcol + outcol;
+}
+
+void mtex_rgb_div(vec3 outcol, vec3 texcol, float fact, float facg, out vec3 incol)
+{
+	float facm;
+
+	fact *= facg;
+	facm = 1.0-fact;
+
+	if(texcol.r != 0.0) incol.r = facm*outcol.r + fact*outcol.r/texcol.r;
+	if(texcol.g != 0.0) incol.g = facm*outcol.g + fact*outcol.g/texcol.g;
+	if(texcol.b != 0.0) incol.b = facm*outcol.b + fact*outcol.b/texcol.b;
+}
+
+void mtex_rgb_diff(vec3 outcol, vec3 texcol, float fact, float facg, out vec3 incol)
+{
+	float facm;
+
+	fact *= facg;
+	facm = 1.0-fact;
+
+	incol = facm*outcol + fact*abs(texcol - outcol);
+}
+
+void mtex_rgb_dark(vec3 outcol, vec3 texcol, float fact, float facg, out vec3 incol)
+{
+	float facm, col;
+
+	fact *= facg;
+	facm = 1.0-fact;
+
+	col = fact*texcol.r;
+	if(col < outcol.r) incol.r = col; else incol.r = outcol.r;
+	col = fact*texcol.g;
+	if(col < outcol.g) incol.g = col; else incol.g = outcol.g;
+	col = fact*texcol.b;
+	if(col < outcol.b) incol.b = col; else incol.b = outcol.b;
+}
+
+void mtex_rgb_light(vec3 outcol, vec3 texcol, float fact, float facg, out vec3 incol)
+{
+	float facm, col;
+
+	fact *= facg;
+	facm = 1.0-fact;
+
+	col = fact*texcol.r;
+	if(col > outcol.r) incol.r = col; else incol.r = outcol.r;
+	col = fact*texcol.g;
+	if(col > outcol.g) incol.g = col; else incol.g = outcol.g;
+	col = fact*texcol.b;
+	if(col > outcol.b) incol.b = col; else incol.b = outcol.b;
+}
+
+void mtex_rgb_hue(vec3 outcol, vec3 texcol, float fact, float facg, out vec3 incol)
+{
+	vec4 col;
+
+	mix_hue(fact*facg, vec4(outcol, 1.0), vec4(texcol, 1.0), col);
+	incol.rgb = col.rgb;
+}
+
+void mtex_rgb_sat(vec3 outcol, vec3 texcol, float fact, float facg, out vec3 incol)
+{
+	vec4 col;
+
+	mix_sat(fact*facg, vec4(outcol, 1.0), vec4(texcol, 1.0), col);
+	incol.rgb = col.rgb;
+}
+
+void mtex_rgb_val(vec3 outcol, vec3 texcol, float fact, float facg, out vec3 incol)
+{
+	vec4 col;
+
+	mix_val(fact*facg, vec4(outcol, 1.0), vec4(texcol, 1.0), col);
+	incol.rgb = col.rgb;
+}
+
+void mtex_rgb_color(vec3 outcol, vec3 texcol, float fact, float facg, out vec3 incol)
+{
+	vec4 col;
+
+	mix_color(fact*facg, vec4(outcol, 1.0), vec4(texcol, 1.0), col);
+	incol.rgb = col.rgb;
+}
+
+void mtex_value_vars(inout float fact, float facg, out float facm, float flip)
+{
+	fact *= facg;
+	facm = 1.0-fact;
+
+	if(flip != 0.0) {
+		float tmp = fact;
+		fact = facm;
+		facm = tmp;
+	}
+}
+
+void mtex_value_blend(float outcol, float texcol, float fact, float facg, float flip, out float incol)
+{
+	float facm;
+	mtex_value_vars(fact, facg, facm, flip);
+
+	incol = fact*texcol + facm*outcol;
+}
+
+void mtex_value_mul(float outcol, float texcol, float fact, float facg, float flip, out float incol)
+{
+	float facm;
+	mtex_value_vars(fact, facg, facm, flip);
+
+	facm = 1.0 - facg;
+	incol = (facm + fact*texcol)*outcol;
+}
+
+void mtex_value_screen(float outcol, float texcol, float fact, float facg, float flip, out float incol)
+{
+	float facm;
+	mtex_value_vars(fact, facg, facm, flip);
+
+	facm = 1.0 - facg;
+	incol = 1.0 - (facm + fact*(1.0 - texcol))*(1.0 - outcol);
+}
+
+void mtex_value_sub(float outcol, float texcol, float fact, float facg, float flip, out float incol)
+{
+	float facm;
+	mtex_value_vars(fact, facg, facm, flip);
+
+	fact = -fact;
+	incol = fact*texcol + outcol;
+}
+
+void mtex_value_add(float outcol, float texcol, float fact, float facg, float flip, out float incol)
+{
+	float facm;
+	mtex_value_vars(fact, facg, facm, flip);
+
+	fact = fact;
+	incol = fact*texcol + outcol;
+}
+
+void mtex_value_div(float outcol, float texcol, float fact, float facg, float flip, out float incol)
+{
+	float facm;
+	mtex_value_vars(fact, facg, facm, flip);
+
+	if(texcol != 0.0)
+		incol = facm*outcol + fact*outcol/texcol;
+	else
+		incol = 0.0;
+}
+
+void mtex_value_diff(float outcol, float texcol, float fact, float facg, float flip, out float incol)
+{
+	float facm;
+	mtex_value_vars(fact, facg, facm, flip);
+
+	incol = facm*outcol + fact*abs(texcol - outcol);
+}
+
+void mtex_value_dark(float outcol, float texcol, float fact, float facg, float flip, out float incol)
+{
+	float facm;
+	mtex_value_vars(fact, facg, facm, flip);
+
+	float col = fact*texcol;
+	if(col < outcol) incol = col; else incol = outcol;
+}
+
+void mtex_value_light(float outcol, float texcol, float fact, float facg, float flip, out float incol)
+{
+	float facm;
+	mtex_value_vars(fact, facg, facm, flip);
+
+	float col = fact*texcol;
+	if(col > outcol) incol = col; else incol = outcol;
+}
+
+void mtex_value_clamp_positive(float fac, out float outfac)
+{
+	outfac = max(fac, 0.0);
+}
+
+void mtex_value_clamp(float fac, out float outfac)
+{
+	outfac = clamp(fac, 0.0, 1.0);
+}
+
+void mtex_har_divide(float har, out float outhar)
+{
+	outhar = har/128.0;
+}
+
+void mtex_har_multiply_clamp(float har, out float outhar)
+{
+	har *= 128.0;
+
+	if(har < 1.0) outhar = 1.0;
+	else if(har > 511.0) outhar = 511.0;
+	else outhar = har;
+}
+
+void mtex_alpha_from_col(vec4 col, out float alpha)
+{
+	alpha = col.a;
+}
+
+void mtex_alpha_to_col(vec4 col, float alpha, out vec4 outcol)
+{
+	outcol = vec4(col.rgb, alpha);
+}
+
+void mtex_rgbtoint(vec4 rgb, out float intensity)
+{
+	intensity = dot(vec3(0.35, 0.45, 0.2), rgb.rgb);
+}
+
+void mtex_value_invert(float invalue, out float outvalue)
+{
+	outvalue = 1.0 - invalue;
+}
+
+void mtex_rgb_invert(vec4 inrgb, out vec4 outrgb)
+{
+	outrgb = vec4(vec3(1.0) - inrgb.rgb, inrgb.a);
+}
+
+void mtex_value_stencil(float stencil, float intensity, out float outstencil, out float outintensity)
+{
+	float fact = intensity;
+	outintensity = intensity*stencil;
+	outstencil = stencil*fact;
+}
+
+void mtex_rgb_stencil(float stencil, vec4 rgb, out float outstencil, out vec4 outrgb)
+{
+	float fact = rgb.a;
+	outrgb = vec4(rgb.rgb, rgb.a*stencil);
+	outstencil = stencil*fact;
+}
+
+void mtex_mapping_ofs(vec3 texco, vec3 ofs, out vec3 outtexco)
+{
+	outtexco = texco + ofs;
+}
+
+void mtex_mapping_size(vec3 texco, vec3 size, out vec3 outtexco)
+{
+	outtexco = size*texco;
+}
+
+void mtex_2d_mapping(vec3 vec, out vec3 outvec)
+{
+	outvec = vec3(vec.xy*0.5 + vec2(0.5, 0.5), vec.z);
+}
+
+void mtex_image(vec3 vec, sampler2D ima, out float value, out vec4 color, out vec3 normal)
+{
+	color = texture2D(ima, vec.xy);
+	value = 1.0;
+	
+	normal = 2.0*(vec3(color.r, -color.g, color.b) - vec3(0.5, -0.5, 0.5));
+}
+
+void mtex_negate_texnormal(vec3 normal, out vec3 outnormal)
+{
+	outnormal = vec3(-normal.x, -normal.y, normal.z);
+}
+
+void mtex_nspace_tangent(vec3 tangent, vec3 normal, vec3 texnormal, out vec3 outnormal)
+{
+	tangent = normalize(tangent);
+	vec3 B = cross(normal, tangent);
+
+	outnormal = texnormal.x*tangent + texnormal.y*B + texnormal.z*normal;
+	outnormal = normalize(outnormal);
+}
+
+void mtex_blend_normal(float norfac, vec3 normal, vec3 newnormal, out vec3 outnormal)
+{
+	outnormal = (1.0 - norfac)*normal + norfac*newnormal;
+	outnormal = normalize(outnormal);
+}
+
+/******* MATERIAL *********/
+
+void lamp_visibility_sun_hemi(vec3 lampvec, out vec3 lv, out float dist, out float visifac)
+{
+	lv = lampvec;
+	dist = 1.0;
+	visifac = 1.0;
+}
+
+void lamp_visibility_other(vec3 co, vec3 lampco, out vec3 lv, out float dist, out float visifac)
+{
+	lv = co - lampco;
+	dist = length(lv);
+	lv = normalize(lv);
+	visifac = 1.0;
+}
+
+void lamp_falloff_invlinear(float lampdist, float dist, out float visifac)
+{
+	visifac = lampdist/(lampdist + dist);
+}
+
+void lamp_falloff_invsquare(float lampdist, float dist, out float visifac)
+{
+	visifac = lampdist/(lampdist + dist*dist);
+}
+
+void lamp_falloff_sliders(float lampdist, float ld1, float ld2, float dist, out float visifac)
+{
+	float lampdistkw = lampdist*lampdist;
+
+	visifac = lampdist/(lampdist + ld1*dist);
+	visifac *= lampdistkw/(lampdistkw + ld2*dist*dist);
+}
+
+void lamp_falloff_curve(float lampdist, sampler1D curvemap, float dist, out float visifac)
+{
+	visifac = texture1D(curvemap, dist/lampdist).x;
+}
+
+void lamp_visibility_sphere(float lampdist, float dist, float visifac, out float outvisifac)
+{
+	float t= lampdist - dist;
+
+	outvisifac= visifac*max(t, 0.0)/lampdist;
+}
+
+void lamp_visibility_spot_square(vec3 lampvec, mat4 lampimat, vec3 lv, out float inpr)
+{
+	if(dot(lv, lampvec) > 0.0) {
+		vec3 lvrot = (lampimat*vec4(lv, 0.0)).xyz;
+		float x = max(abs(lvrot.x/lvrot.z), abs(lvrot.y/lvrot.z));
+
+		inpr = 1.0/sqrt(1.0 + x*x);
+	}
+	else
+		inpr = 0.0;
+}
+
+void lamp_visibility_spot_circle(vec3 lampvec, vec3 lv, out float inpr)
+{
+	inpr = dot(lv, lampvec);
+}
+
+void lamp_visibility_spot(float spotsi, float spotbl, float inpr, float visifac, out float outvisifac)
+{
+	float t = spotsi;
+
+	if(inpr <= t) {
+		outvisifac = 0.0;
+	}
+	else {
+		t = inpr - t;
+
+		/* soft area */
+		if(spotbl != 0.0)
+			inpr *= smoothstep(0.0, 1.0, t/spotbl);
+
+		outvisifac = visifac*inpr;
+	}
+}
+
+void lamp_visibility_clamp(float visifac, out float outvisifac)
+{
+	outvisifac = (visifac < 0.001)? 0.0: visifac;
+}
+
+void shade_view(vec3 co, out vec3 view)
+{
+	/* handle perspective/orthographic */
+	view = (gl_ProjectionMatrix[3][3] == 0.0)? normalize(co): vec3(0.0, 0.0, -1.0);
+}
+
+void shade_tangent_v(vec3 lv, vec3 tang, out vec3 vn)
+{
+	vec3 c = cross(lv, tang);
+	vec3 vnor = cross(c, tang);
+
+	vn = -normalize(vnor);
+}
+
+void shade_inp(vec3 vn, vec3 lv, out float inp)
+{
+	inp = dot(vn, lv);
+}
+
+void shade_is_no_diffuse(out float is)
+{
+	is = 0.0;
+}
+
+void shade_is_hemi(float inp, out float is)
+{
+	is = 0.5*inp + 0.5;
+}
+
+float area_lamp_energy(mat4 area, vec3 co, vec3 vn)
+{
+	vec3 vec[4], c[4];
+	float rad[4], fac;
+	
+	vec[0] = normalize(co - area[0].xyz);
+	vec[1] = normalize(co - area[1].xyz);
+	vec[2] = normalize(co - area[2].xyz);
+	vec[3] = normalize(co - area[3].xyz);
+
+	c[0] = normalize(cross(vec[0], vec[1]));
+	c[1] = normalize(cross(vec[1], vec[2]));
+	c[2] = normalize(cross(vec[2], vec[3]));
+	c[3] = normalize(cross(vec[3], vec[0]));
+
+	rad[0] = acos(dot(vec[0], vec[1]));
+	rad[1] = acos(dot(vec[1], vec[2]));
+	rad[2] = acos(dot(vec[2], vec[3]));
+	rad[3] = acos(dot(vec[3], vec[0]));
+
+	fac=  rad[0]*dot(vn, c[0]);
+	fac+= rad[1]*dot(vn, c[1]);
+	fac+= rad[2]*dot(vn, c[2]);
+	fac+= rad[3]*dot(vn, c[3]);
+
+	return max(fac, 0.0);
+}
+
+void shade_inp_area(vec3 position, vec3 lampco, vec3 lampvec, vec3 vn, mat4 area, float areasize, float k, out float inp)
+{
+	vec3 co = position;
+	vec3 vec = co - lampco;
+
+	if(dot(vec, lampvec) < 0.0) {
+		inp = 0.0;
+	}
+	else {
+		float intens = area_lamp_energy(area, co, vn);
+
+		inp = pow(intens*areasize, k);
+	}
+}
+
+void shade_diffuse_oren_nayer(float nl, vec3 n, vec3 l, vec3 v, float rough, out float is)
+{
+	vec3 h = normalize(v + l);
+	float nh = max(dot(n, h), 0.0);
+	float nv = max(dot(n, v), 0.0);
+	float realnl = dot(n, l);
+
+	if(realnl < 0.0) {
+		is = 0.0;
+	}
+	else if(nl < 0.0) {
+		is = 0.0;
+	}
+	else {
+		float vh = max(dot(v, h), 0.0);
+		float Lit_A = acos(realnl);
+		float View_A = acos(nv);
+
+		vec3 Lit_B = normalize(l - realnl*n);
+		vec3 View_B = normalize(v - nv*n);
+
+		float t = max(dot(Lit_B, View_B), 0.0);
+
+		float a, b;
+
+		if(Lit_A > View_A) {
+			a = Lit_A;
+			b = View_A;
+		}
+		else {
+			a = View_A;
+			b = Lit_A;
+		}
+
+		float A = 1.0 - (0.5*((rough*rough)/((rough*rough) + 0.33)));
+		float B = 0.45*((rough*rough)/((rough*rough) + 0.09));
+
+		b *= 0.95;
+		is = nl*(A + (B * t * sin(a) * tan(b)));
+	}
+}
+
+void shade_diffuse_toon(vec3 n, vec3 l, vec3 v, float size, float tsmooth, out float is)
+{
+	float rslt = dot(n, l);
+	float ang = acos(rslt);
+
+	if(ang < size) is = 1.0;
+	else if(ang > (size + tsmooth) || tsmooth == 0.0) is = 0.0;
+	else is = 1.0 - ((ang - size)/tsmooth);
+}
+
+void shade_diffuse_minnaert(float nl, vec3 n, vec3 v, float darkness, out float is)
+{
+	if(nl <= 0.0) {
+		is = 0.0;
+	}
+	else {
+		float nv = max(dot(n, v), 0.0);
+
+		if(darkness <= 1.0)
+			is = nl*pow(max(nv*nl, 0.1), darkness - 1.0);
+		else
+			is = nl*pow(1.0001 - nv, darkness - 1.0);
+	}
+}
+
+float fresnel_fac(vec3 view, vec3 vn, float grad, float fac)
+{
+	float t1, t2;
+	float ffac;
+
+	if(fac==0.0) {
+		ffac = 1.0;
+	}
+	else {
+		t1= dot(view, vn);
+		if(t1>0.0)  t2= 1.0+t1;
+		else t2= 1.0-t1;
+
+		t2= grad + (1.0-grad)*pow(t2, fac);
+
+		if(t2<0.0) ffac = 0.0;
+		else if(t2>1.0) ffac = 1.0;
+		else ffac = t2;
+	}
+
+	return ffac;
+}
+
+void shade_diffuse_fresnel(vec3 vn, vec3 lv, vec3 view, float fac_i, float fac, out float is)
+{
+	is = fresnel_fac(lv, vn, fac_i, fac);
+}
+
+void shade_cubic(float is, out float outis)
+{
+	if(is>0.0 && is<1.0)
+		outis= smoothstep(0.0, 1.0, is);
+	else
+		outis= is;
+}
+
+void shade_visifac(float i, float visifac, float refl, out float outi)
+{
+	/*if(i > 0.0)*/
+		outi = max(i*visifac*refl, 0.0);
+	/*else
+		outi = i;*/
+}
+
+void shade_tangent_v_spec(vec3 tang, out vec3 vn)
+{
+	vn = tang;
+}
+
+void shade_add_to_diffuse(float i, vec3 lampcol, vec3 col, out vec3 outcol)
+{
+	if(i > 0.0)
+		outcol = i*lampcol*col;
+	else
+		outcol = vec3(0.0, 0.0, 0.0);
+}
+
+void shade_hemi_spec(vec3 vn, vec3 lv, vec3 view, float spec, float hard, float visifac, out float t)
+{
+	lv += view;
+	lv = normalize(lv);
+
+	t = dot(vn, lv);
+	t = 0.5*t + 0.5;
+
+	t = visifac*spec*pow(t, hard);
+}
+
+void shade_phong_spec(vec3 n, vec3 l, vec3 v, float hard, out float specfac)
+{
+	vec3 h = normalize(l + v);
+	float rslt = max(dot(h, n), 0.0);
+
+	specfac = pow(rslt, hard);
+}
+
+void shade_cooktorr_spec(vec3 n, vec3 l, vec3 v, float hard, out float specfac)
+{
+	vec3 h = normalize(v + l);
+	float nh = dot(n, h);
+
+	if(nh < 0.0) {
+		specfac = 0.0;
+	}
+	else {
+		float nv = max(dot(n, v), 0.0);
+		float i = pow(nh, hard);
+
+		i = i/(0.1+nv);
+		specfac = i;
+	}
+}
+
+void shade_blinn_spec(vec3 n, vec3 l, vec3 v, float refrac, float spec_power, out float specfac)
+{
+	if(refrac < 1.0) {
+		specfac = 0.0;
+	}
+	else if(spec_power == 0.0) {
+		specfac = 0.0;
+	}
+	else {
+		if(spec_power<100.0)
+			spec_power= sqrt(1.0/spec_power);
+		else
+			spec_power= 10.0/spec_power;
+
+		vec3 h = normalize(v + l);
+		float nh = dot(n, h);
+		if(nh < 0.0) {
+			specfac = 0.0;
+		}
+		else {
+			float nv = max(dot(n, v), 0.01);
+			float nl = dot(n, l);
+			if(nl <= 0.01) {
+				specfac = 0.0;
+			}
+			else {
+				float vh = max(dot(v, h), 0.01);
+
+				float a = 1.0;
+				float b = (2.0*nh*nv)/vh;
+				float c = (2.0*nh*nl)/vh;
+
+				float g;
+
+				if(a < b && a < c) g = a;
+				else if(b < a && b < c) g = b;
+				else if(c < a && c < b) g = c;
+
+				float p = sqrt(((refrac * refrac)+(vh*vh)-1.0));
+				float f = (((p-vh)*(p-vh))/((p+vh)*(p+vh)))*(1.0+((((vh*(p+vh))-1.0)*((vh*(p+vh))-1.0))/(((vh*(p-vh))+1.0)*((vh*(p-vh))+1.0))));
+				float ang = acos(nh);
+
+				specfac = max(f*g*exp_blender((-(ang*ang)/(2.0*spec_power*spec_power))), 0.0);
+			}
+		}
+	}
+}
+
+void shade_wardiso_spec(vec3 n, vec3 l, vec3 v, float rms, out float specfac)
+{
+	vec3 h = normalize(l + v);
+	float nh = max(dot(n, h), 0.001);
+	float nv = max(dot(n, v), 0.001);
+	float nl = max(dot(n, l), 0.001);
+	float angle = tan(acos(nh));
+	float alpha = max(rms, 0.001);
+
+	specfac= nl * (1.0/(4.0*M_PI*alpha*alpha))*(exp_blender(-(angle*angle)/(alpha*alpha))/(sqrt(nv*nl)));
+}
+
+void shade_toon_spec(vec3 n, vec3 l, vec3 v, float size, float tsmooth, out float specfac)
+{
+	vec3 h = normalize(l + v);
+	float rslt = dot(h, n);
+	float ang = acos(rslt);
+
+	if(ang < size) rslt = 1.0;
+	else if(ang >= (size + tsmooth) || tsmooth == 0.0) rslt = 0.0;
+	else rslt = 1.0 - ((ang - size)/tsmooth);
+
+	specfac = rslt;
+}
+
+void shade_spec_area_inp(float specfac, float inp, out float outspecfac)
+{
+	outspecfac = specfac*inp;
+}
+
+void shade_spec_t(float shadfac, float spec, float visifac, float specfac, out float t)
+{
+	t = shadfac*spec*visifac*specfac;
+}
+
+void shade_add_spec(float t, vec3 lampcol, vec3 speccol, out vec3 outcol)
+{
+	outcol = t*lampcol*speccol;
+}
+
+void shade_add(vec4 col1, vec4 col2, out vec4 outcol)
+{
+	outcol = col1 + col2;
+}
+
+void shade_madd(vec4 col, vec4 col1, vec4 col2, out vec4 outcol)
+{
+	outcol = col + col1*col2;
+}
+
+void shade_maddf(vec4 col, float f, vec4 col1, out vec4 outcol)
+{
+	outcol = col + f*col1;
+}
+
+void shade_mul(vec4 col1, vec4 col2, out vec4 outcol)
+{
+	outcol = col1*col2;
+}
+
+void shade_mul_value(float fac, vec4 col, out vec4 outcol)
+{
+	outcol = col*fac;
+}
+
+void shade_obcolor(vec4 col, vec4 obcol, out vec4 outcol)
+{
+	outcol = vec4(col.rgb*obcol.rgb, col.a);
+}
+
+void ramp_rgbtobw(vec3 color, out float outval)
+{
+	outval = color.r*0.3 + color.g*0.58 + color.b*0.12;
+}
+
+void shade_only_shadow(float i, float shadfac, float energy, vec3 rgb, vec3 specrgb, vec4 diff, vec4 spec, out vec4 outdiff, out vec4 outspec)
+{
+	shadfac = i*energy*(1.0 - shadfac);
+
+	outdiff = diff - vec4(rgb*shadfac, 0.0);
+	outspec = spec - vec4(specrgb*shadfac, 0.0);
+}
+
+void test_shadowbuf(vec3 rco, sampler2DShadow shadowmap, mat4 shadowpersmat, float shadowbias, float inp, out float result)
+{
+	if(inp <= 0.0) {
+		result = 0.0;
+	}
+	else {
+		vec4 co = shadowpersmat*vec4(rco, 1.0);
+
+		//float bias = (1.5 - inp*inp)*shadowbias;
+		co.z -= shadowbias*co.w;
+
+		result = shadow2DProj(shadowmap, co).x;
+	}
+}
+
+void shade_exposure_correct(vec3 col, float linfac, float logfac, out vec3 outcol)
+{
+	outcol = linfac*(1.0 - exp(col*logfac));
+}
+
+void shade_mist_factor(vec3 co, float miststa, float mistdist, float misttype, float misi, out float outfac)
+{
+	float fac, zcor;
+
+	zcor = (gl_ProjectionMatrix[3][3] == 0.0)? length(co): -co[2];
+	
+	fac = clamp((zcor-miststa)/mistdist, 0.0, 1.0);
+	if(misttype == 0.0) fac *= fac;
+	else if(misttype == 1.0);
+	else fac = sqrt(fac);
+
+	outfac = 1.0 - (1.0-fac)*(1.0-misi);
+}
+
+void shade_world_mix(vec3 hor, vec4 col, out vec4 outcol)
+{
+	float fac = clamp(col.a, 0.0, 1.0);
+	outcol = vec4(mix(hor, col.rgb, fac), col.a);
+}
+
+void shade_alpha_opaque(vec4 col, out vec4 outcol)
+{
+	outcol = vec4(col.rgb, 1.0);
+}
+
+void shade_alpha_obcolor(vec4 col, vec4 obcol, out vec4 outcol)
+{
+	outcol = vec4(col.rgb, col.a*obcol.a);
+}
+
diff --git a/source/blender/gpu/intern/gpu_shader_material.glsl.c b/source/blender/gpu/intern/gpu_shader_material.glsl.c
new file mode 100644
index 00000000000..38263efd864
--- /dev/null
+++ b/source/blender/gpu/intern/gpu_shader_material.glsl.c
@@ -0,0 +1,1026 @@
+/* DataToC output of file <gpu_shader_material_glsl> */
+
+int datatoc_gpu_shader_material_glsl_size= 32638;
+char datatoc_gpu_shader_material_glsl[]= {
+ 10,102,108,111, 97,116, 32,101,120,112, 95, 98,108,101,110,100,101,114, 40,102,108,111, 97,116, 32,102, 41, 10,123, 10,
+  9,114,101,116,117,114,110, 32,112,111,119, 40, 50, 46, 55, 49, 56, 50, 56, 49, 56, 50, 56, 52, 54, 44, 32,102, 41, 59, 10,125,
+ 10, 10,118,111,105,100, 32,114,103, 98, 95,116,111, 95,104,115,118, 40,118,101, 99, 52, 32,114,103, 98, 44, 32,111,117,116, 32,
+118,101, 99, 52, 32,111,117,116, 99,111,108, 41, 10,123, 10,  9,102,108,111, 97,116, 32, 99,109, 97,120, 44, 32, 99,109,105,110,
+ 44, 32,104, 44, 32,115, 44, 32,118, 44, 32, 99,100,101,108,116, 97, 59, 10,  9,118,101, 99, 51, 32, 99, 59, 10, 10,  9, 99,109,
+ 97,120, 32, 61, 32,109, 97,120, 40,114,103, 98, 91, 48, 93, 44, 32,109, 97,120, 40,114,103, 98, 91, 49, 93, 44, 32,114,103, 98,
+ 91, 50, 93, 41, 41, 59, 10,  9, 99,109,105,110, 32, 61, 32,109,105,110, 40,114,103, 98, 91, 48, 93, 44, 32,109,105,110, 40,114,
+103, 98, 91, 49, 93, 44, 32,114,103, 98, 91, 50, 93, 41, 41, 59, 10,  9, 99,100,101,108,116, 97, 32, 61, 32, 99,109, 97,120, 45,
+ 99,109,105,110, 59, 10, 10,  9,118, 32, 61, 32, 99,109, 97,120, 59, 10,  9,105,102, 32, 40, 99,109, 97,120, 33, 61, 48, 46, 48,
+ 41, 10,  9,  9,115, 32, 61, 32, 99,100,101,108,116, 97, 47, 99,109, 97,120, 59, 10,  9,101,108,115,101, 32,123, 10,  9,  9,115,
+ 32, 61, 32, 48, 46, 48, 59, 10,  9,  9,104, 32, 61, 32, 48, 46, 48, 59, 10,  9,125, 10, 10,  9,105,102, 32, 40,115, 32, 61, 61,
+ 32, 48, 46, 48, 41, 32,123, 10,  9,  9,104, 32, 61, 32, 48, 46, 48, 59, 10,  9,125, 10,  9,101,108,115,101, 32,123, 10,  9,  9,
+ 99, 32, 61, 32, 40,118,101, 99, 51, 40, 99,109, 97,120, 44, 32, 99,109, 97,120, 44, 32, 99,109, 97,120, 41, 32, 45, 32,114,103,
+ 98, 46,120,121,122, 41, 47, 99,100,101,108,116, 97, 59, 10, 10,  9,  9,105,102, 32, 40,114,103, 98, 46,120, 61, 61, 99,109, 97,
+120, 41, 32,104, 32, 61, 32, 99, 91, 50, 93, 32, 45, 32, 99, 91, 49, 93, 59, 10,  9,  9,101,108,115,101, 32,105,102, 32, 40,114,
+103, 98, 46,121, 61, 61, 99,109, 97,120, 41, 32,104, 32, 61, 32, 50, 46, 48, 32, 43, 32, 99, 91, 48, 93, 32, 45, 32, 32, 99, 91,
+ 50, 93, 59, 10,  9,  9,101,108,115,101, 32,104, 32, 61, 32, 52, 46, 48, 32, 43, 32, 99, 91, 49, 93, 32, 45, 32, 99, 91, 48, 93,
+ 59, 10, 10,  9,  9,104, 32, 47, 61, 32, 54, 46, 48, 59, 10, 10,  9,  9,105,102, 32, 40,104, 60, 48, 46, 48, 41, 10,  9,  9,  9,
+104, 32, 43, 61, 32, 49, 46, 48, 59, 10,  9,125, 10, 10,  9,111,117,116, 99,111,108, 32, 61, 32,118,101, 99, 52, 40,104, 44, 32,
+115, 44, 32,118, 44, 32,114,103, 98, 46,119, 41, 59, 10,125, 10, 10,118,111,105,100, 32,104,115,118, 95,116,111, 95,114,103, 98,
+ 40,118,101, 99, 52, 32,104,115,118, 44, 32,111,117,116, 32,118,101, 99, 52, 32,111,117,116, 99,111,108, 41, 10,123, 10,  9,102,
+108,111, 97,116, 32,105, 44, 32,102, 44, 32,112, 44, 32,113, 44, 32,116, 44, 32,104, 44, 32,115, 44, 32,118, 59, 10,  9,118,101,
+ 99, 51, 32,114,103, 98, 59, 10, 10,  9,104, 32, 61, 32,104,115,118, 91, 48, 93, 59, 10,  9,115, 32, 61, 32,104,115,118, 91, 49,
+ 93, 59, 10,  9,118, 32, 61, 32,104,115,118, 91, 50, 93, 59, 10, 10,  9,105,102, 40,115, 61, 61, 48, 46, 48, 41, 32,123, 10,  9,
+  9,114,103, 98, 32, 61, 32,118,101, 99, 51, 40,118, 44, 32,118, 44, 32,118, 41, 59, 10,  9,125, 10,  9,101,108,115,101, 32,123,
+ 10,  9,  9,105,102, 40,104, 61, 61, 49, 46, 48, 41, 10,  9,  9,  9,104, 32, 61, 32, 48, 46, 48, 59, 10,  9,  9, 10,  9,  9,104,
+ 32, 42, 61, 32, 54, 46, 48, 59, 10,  9,  9,105, 32, 61, 32,102,108,111,111,114, 40,104, 41, 59, 10,  9,  9,102, 32, 61, 32,104,
+ 32, 45, 32,105, 59, 10,  9,  9,114,103, 98, 32, 61, 32,118,101, 99, 51, 40,102, 44, 32,102, 44, 32,102, 41, 59, 10,  9,  9,112,
+ 32, 61, 32,118, 42, 40, 49, 46, 48, 45,115, 41, 59, 10,  9,  9,113, 32, 61, 32,118, 42, 40, 49, 46, 48, 45, 40,115, 42,102, 41,
+ 41, 59, 10,  9,  9,116, 32, 61, 32,118, 42, 40, 49, 46, 48, 45, 40,115, 42, 40, 49, 46, 48, 45,102, 41, 41, 41, 59, 10,  9,  9,
+ 10,  9,  9,105,102, 32, 40,105, 32, 61, 61, 32, 48, 46, 48, 41, 32,114,103, 98, 32, 61, 32,118,101, 99, 51, 40,118, 44, 32,116,
+ 44, 32,112, 41, 59, 10,  9,  9,101,108,115,101, 32,105,102, 32, 40,105, 32, 61, 61, 32, 49, 46, 48, 41, 32,114,103, 98, 32, 61,
+ 32,118,101, 99, 51, 40,113, 44, 32,118, 44, 32,112, 41, 59, 10,  9,  9,101,108,115,101, 32,105,102, 32, 40,105, 32, 61, 61, 32,
+ 50, 46, 48, 41, 32,114,103, 98, 32, 61, 32,118,101, 99, 51, 40,112, 44, 32,118, 44, 32,116, 41, 59, 10,  9,  9,101,108,115,101,
+ 32,105,102, 32, 40,105, 32, 61, 61, 32, 51, 46, 48, 41, 32,114,103, 98, 32, 61, 32,118,101, 99, 51, 40,112, 44, 32,113, 44, 32,
+118, 41, 59, 10,  9,  9,101,108,115,101, 32,105,102, 32, 40,105, 32, 61, 61, 32, 52, 46, 48, 41, 32,114,103, 98, 32, 61, 32,118,
+101, 99, 51, 40,116, 44, 32,112, 44, 32,118, 41, 59, 10,  9,  9,101,108,115,101, 32,114,103, 98, 32, 61, 32,118,101, 99, 51, 40,
+118, 44, 32,112, 44, 32,113, 41, 59, 10,  9,125, 10, 10,  9,111,117,116, 99,111,108, 32, 61, 32,118,101, 99, 52, 40,114,103, 98,
+ 44, 32,104,115,118, 46,119, 41, 59, 10,125, 10, 10, 35,100,101,102,105,110,101, 32, 77, 95, 80, 73, 32, 51, 46, 49, 52, 49, 53,
+ 57, 50, 54, 53, 51, 53, 56, 57, 55, 57, 51, 50, 51, 56, 52, 54, 10, 10, 47, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 32, 83,
+ 72, 65, 68, 69, 82, 32, 78, 79, 68, 69, 83, 32, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 47, 10, 10,118,111,
+105,100, 32,118, 99,111,108, 95, 97,116,116,114,105, 98,117,116,101, 40,118,101, 99, 52, 32, 97,116,116,118, 99,111,108, 44, 32,
+111,117,116, 32,118,101, 99, 52, 32,118, 99,111,108, 41, 10,123, 10,  9,118, 99,111,108, 32, 61, 32,118,101, 99, 52, 40, 97,116,
+116,118, 99,111,108, 46,120, 47, 50, 53, 53, 46, 48, 44, 32, 97,116,116,118, 99,111,108, 46,121, 47, 50, 53, 53, 46, 48, 44, 32,
+ 97,116,116,118, 99,111,108, 46,122, 47, 50, 53, 53, 46, 48, 44, 32, 49, 46, 48, 41, 59, 10,125, 10, 10,118,111,105,100, 32,117,
+118, 95, 97,116,116,114,105, 98,117,116,101, 40,118,101, 99, 50, 32, 97,116,116,117,118, 44, 32,111,117,116, 32,118,101, 99, 51,
+ 32,117,118, 41, 10,123, 10,  9,117,118, 32, 61, 32,118,101, 99, 51, 40, 97,116,116,117,118, 42, 50, 46, 48, 32, 45, 32,118,101,
+ 99, 50, 40, 49, 46, 48, 44, 32, 49, 46, 48, 41, 44, 32, 48, 46, 48, 41, 59, 10,125, 10, 10,118,111,105,100, 32,103,101,111,109,
+ 40,118,101, 99, 51, 32, 99,111, 44, 32,118,101, 99, 51, 32,110,111,114, 44, 32,109, 97,116, 52, 32,118,105,101,119,105,110,118,
+109, 97,116, 44, 32,118,101, 99, 51, 32, 97,116,116,111,114, 99,111, 44, 32,118,101, 99, 50, 32, 97,116,116,117,118, 44, 32,118,
+101, 99, 52, 32, 97,116,116,118, 99,111,108, 44, 32,111,117,116, 32,118,101, 99, 51, 32,103,108,111, 98, 97,108, 44, 32,111,117,
+116, 32,118,101, 99, 51, 32,108,111, 99, 97,108, 44, 32,111,117,116, 32,118,101, 99, 51, 32,118,105,101,119, 44, 32,111,117,116,
+ 32,118,101, 99, 51, 32,111,114, 99,111, 44, 32,111,117,116, 32,118,101, 99, 51, 32,117,118, 44, 32,111,117,116, 32,118,101, 99,
+ 51, 32,110,111,114,109, 97,108, 44, 32,111,117,116, 32,118,101, 99, 52, 32,118, 99,111,108, 44, 32,111,117,116, 32,102,108,111,
+ 97,116, 32,102,114,111,110,116, 98, 97, 99,107, 41, 10,123, 10,  9,108,111, 99, 97,108, 32, 61, 32, 99,111, 59, 10,  9,118,105,
+101,119, 32, 61, 32,110,111,114,109, 97,108,105,122,101, 40,108,111, 99, 97,108, 41, 59, 10,  9,103,108,111, 98, 97,108, 32, 61,
+ 32, 40,118,105,101,119,105,110,118,109, 97,116, 42,118,101, 99, 52, 40,108,111, 99, 97,108, 44, 32, 49, 46, 48, 41, 41, 46,120,
+121,122, 59, 10,  9,111,114, 99,111, 32, 61, 32, 97,116,116,111,114, 99,111, 59, 10,  9,117,118, 95, 97,116,116,114,105, 98,117,
+116,101, 40, 97,116,116,117,118, 44, 32,117,118, 41, 59, 10,  9,110,111,114,109, 97,108, 32, 61, 32, 45,110,111,114,109, 97,108,
+105,122,101, 40,110,111,114, 41, 59,  9, 47, 42, 32, 98,108,101,110,100,101,114, 32,114,101,110,100,101,114, 32,110,111,114,109,
+ 97,108, 32,105,115, 32,110,101,103, 97,116,101,100, 32, 42, 47, 10,  9,118, 99,111,108, 95, 97,116,116,114,105, 98,117,116,101,
+ 40, 97,116,116,118, 99,111,108, 44, 32,118, 99,111,108, 41, 59, 10,  9,102,114,111,110,116, 98, 97, 99,107, 32, 61, 32, 49, 46,
+ 48, 59, 10,125, 10, 10,118,111,105,100, 32,109, 97,112,112,105,110,103, 40,118,101, 99, 51, 32,118,101, 99, 44, 32,109, 97,116,
+ 52, 32,109, 97,116, 44, 32,118,101, 99, 51, 32,109,105,110,118,101, 99, 44, 32,118,101, 99, 51, 32,109, 97,120,118,101, 99, 44,
+ 32,102,108,111, 97,116, 32,100,111,109,105,110, 44, 32,102,108,111, 97,116, 32,100,111,109, 97,120, 44, 32,111,117,116, 32,118,
+101, 99, 51, 32,111,117,116,118,101, 99, 41, 10,123, 10,  9,111,117,116,118,101, 99, 32, 61, 32, 40,109, 97,116, 32, 42, 32,118,
+101, 99, 52, 40,118,101, 99, 44, 32, 49, 46, 48, 41, 41, 46,120,121,122, 59, 10,  9,105,102, 40,100,111,109,105,110, 32, 61, 61,
+ 32, 49, 46, 48, 41, 10,  9,  9,111,117,116,118,101, 99, 32, 61, 32,109, 97,120, 40,111,117,116,118,101, 99, 44, 32,109,105,110,
+118,101, 99, 41, 59, 10,  9,105,102, 40,100,111,109, 97,120, 32, 61, 61, 32, 49, 46, 48, 41, 10,  9,  9,111,117,116,118,101, 99,
+ 32, 61, 32,109,105,110, 40,111,117,116,118,101, 99, 44, 32,109, 97,120,118,101, 99, 41, 59, 10,125, 10, 10,118,111,105,100, 32,
+ 99, 97,109,101,114, 97, 40,118,101, 99, 51, 32, 99,111, 44, 32,111,117,116, 32,118,101, 99, 51, 32,111,117,116,118,105,101,119,
+ 44, 32,111,117,116, 32,102,108,111, 97,116, 32,111,117,116,100,101,112,116,104, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,
+111,117,116,100,105,115,116, 41, 10,123, 10,  9,111,117,116,100,101,112,116,104, 32, 61, 32, 97, 98,115, 40, 99,111, 46,122, 41,
+ 59, 10,  9,111,117,116,100,105,115,116, 32, 61, 32,108,101,110,103,116,104, 40, 99,111, 41, 59, 10,  9,111,117,116,118,105,101,
+119, 32, 61, 32,110,111,114,109, 97,108,105,122,101, 40, 99,111, 41, 59, 10,125, 10, 10,118,111,105,100, 32,109, 97,116,104, 95,
+ 97,100,100, 40,102,108,111, 97,116, 32,118, 97,108, 49, 44, 32,102,108,111, 97,116, 32,118, 97,108, 50, 44, 32,111,117,116, 32,
+102,108,111, 97,116, 32,111,117,116,118, 97,108, 41, 10,123, 10,  9,111,117,116,118, 97,108, 32, 61, 32,118, 97,108, 49, 32, 43,
+ 32,118, 97,108, 50, 59, 10,125, 10, 10,118,111,105,100, 32,109, 97,116,104, 95,115,117, 98,116,114, 97, 99,116, 40,102,108,111,
+ 97,116, 32,118, 97,108, 49, 44, 32,102,108,111, 97,116, 32,118, 97,108, 50, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,111,
+117,116,118, 97,108, 41, 10,123, 10,  9,111,117,116,118, 97,108, 32, 61, 32,118, 97,108, 49, 32, 45, 32,118, 97,108, 50, 59, 10,
+125, 10, 10,118,111,105,100, 32,109, 97,116,104, 95,109,117,108,116,105,112,108,121, 40,102,108,111, 97,116, 32,118, 97,108, 49,
+ 44, 32,102,108,111, 97,116, 32,118, 97,108, 50, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,111,117,116,118, 97,108, 41, 10,
+123, 10,  9,111,117,116,118, 97,108, 32, 61, 32,118, 97,108, 49, 32, 42, 32,118, 97,108, 50, 59, 10,125, 10, 10,118,111,105,100,
+ 32,109, 97,116,104, 95,100,105,118,105,100,101, 40,102,108,111, 97,116, 32,118, 97,108, 49, 44, 32,102,108,111, 97,116, 32,118,
+ 97,108, 50, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,111,117,116,118, 97,108, 41, 10,123, 10,  9,105,102, 32, 40,118, 97,
+108, 50, 32, 61, 61, 32, 48, 46, 48, 41, 10,  9,  9,111,117,116,118, 97,108, 32, 61, 32, 48, 46, 48, 59, 10,  9,101,108,115,101,
+ 10,  9,  9,111,117,116,118, 97,108, 32, 61, 32,118, 97,108, 49, 32, 47, 32,118, 97,108, 50, 59, 10,125, 10, 10,118,111,105,100,
+ 32,109, 97,116,104, 95,115,105,110,101, 40,102,108,111, 97,116, 32,118, 97,108, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,
+111,117,116,118, 97,108, 41, 10,123, 10,  9,111,117,116,118, 97,108, 32, 61, 32,115,105,110, 40,118, 97,108, 41, 59, 10,125, 10,
+ 10,118,111,105,100, 32,109, 97,116,104, 95, 99,111,115,105,110,101, 40,102,108,111, 97,116, 32,118, 97,108, 44, 32,111,117,116,
+ 32,102,108,111, 97,116, 32,111,117,116,118, 97,108, 41, 10,123, 10,  9,111,117,116,118, 97,108, 32, 61, 32, 99,111,115, 40,118,
+ 97,108, 41, 59, 10,125, 10, 10,118,111,105,100, 32,109, 97,116,104, 95,116, 97,110,103,101,110,116, 40,102,108,111, 97,116, 32,
+118, 97,108, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,111,117,116,118, 97,108, 41, 10,123, 10,  9,111,117,116,118, 97,108,
+ 32, 61, 32,116, 97,110, 40,118, 97,108, 41, 59, 10,125, 10, 10,118,111,105,100, 32,109, 97,116,104, 95, 97,115,105,110, 40,102,
+108,111, 97,116, 32,118, 97,108, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,111,117,116,118, 97,108, 41, 10,123, 10,  9,105,
+102, 32, 40,118, 97,108, 32, 60, 61, 32, 49, 46, 48, 32, 38, 38, 32,118, 97,108, 32, 62, 61, 32, 45, 49, 46, 48, 41, 10,  9,  9,
+111,117,116,118, 97,108, 32, 61, 32, 97,115,105,110, 40,118, 97,108, 41, 59, 10,  9,101,108,115,101, 10,  9,  9,111,117,116,118,
+ 97,108, 32, 61, 32, 48, 46, 48, 59, 10,125, 10, 10,118,111,105,100, 32,109, 97,116,104, 95, 97, 99,111,115, 40,102,108,111, 97,
+116, 32,118, 97,108, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,111,117,116,118, 97,108, 41, 10,123, 10,  9,105,102, 32, 40,
+118, 97,108, 32, 60, 61, 32, 49, 46, 48, 32, 38, 38, 32,118, 97,108, 32, 62, 61, 32, 45, 49, 46, 48, 41, 10,  9,  9,111,117,116,
+118, 97,108, 32, 61, 32, 97, 99,111,115, 40,118, 97,108, 41, 59, 10,  9,101,108,115,101, 10,  9,  9,111,117,116,118, 97,108, 32,
+ 61, 32, 48, 46, 48, 59, 10,125, 10, 10,118,111,105,100, 32,109, 97,116,104, 95, 97,116, 97,110, 40,102,108,111, 97,116, 32,118,
+ 97,108, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,111,117,116,118, 97,108, 41, 10,123, 10,  9,111,117,116,118, 97,108, 32,
+ 61, 32, 97,116, 97,110, 40,118, 97,108, 41, 59, 10,125, 10, 10,118,111,105,100, 32,109, 97,116,104, 95,112,111,119, 40,102,108,
+111, 97,116, 32,118, 97,108, 49, 44, 32,102,108,111, 97,116, 32,118, 97,108, 50, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,
+111,117,116,118, 97,108, 41, 10,123, 10,  9,105,102, 32, 40,118, 97,108, 49, 32, 62, 61, 32, 48, 46, 48, 41, 10,  9,  9,111,117,
+116,118, 97,108, 32, 61, 32,112,111,119, 40,118, 97,108, 49, 44, 32,118, 97,108, 50, 41, 59, 10,  9,101,108,115,101, 10,  9,  9,
+111,117,116,118, 97,108, 32, 61, 32, 48, 46, 48, 59, 10,125, 10, 10,118,111,105,100, 32,109, 97,116,104, 95,108,111,103, 40,102,
+108,111, 97,116, 32,118, 97,108, 49, 44, 32,102,108,111, 97,116, 32,118, 97,108, 50, 44, 32,111,117,116, 32,102,108,111, 97,116,
+ 32,111,117,116,118, 97,108, 41, 10,123, 10,  9,105,102, 40,118, 97,108, 49, 32, 62, 32, 48, 46, 48, 32, 32, 38, 38, 32,118, 97,
+108, 50, 32, 62, 32, 48, 46, 48, 41, 10,  9,  9,111,117,116,118, 97,108, 61, 32,108,111,103, 50, 40,118, 97,108, 49, 41, 32, 47,
+ 32,108,111,103, 50, 40,118, 97,108, 50, 41, 59, 10,  9,101,108,115,101, 10,  9,  9,111,117,116,118, 97,108, 61, 32, 48, 46, 48,
+ 59, 10,125, 10, 10,118,111,105,100, 32,109, 97,116,104, 95,109, 97,120, 40,102,108,111, 97,116, 32,118, 97,108, 49, 44, 32,102,
+108,111, 97,116, 32,118, 97,108, 50, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,111,117,116,118, 97,108, 41, 10,123, 10,  9,
+111,117,116,118, 97,108, 32, 61, 32,109, 97,120, 40,118, 97,108, 49, 44, 32,118, 97,108, 50, 41, 59, 10,125, 10, 10,118,111,105,
+100, 32,109, 97,116,104, 95,109,105,110, 40,102,108,111, 97,116, 32,118, 97,108, 49, 44, 32,102,108,111, 97,116, 32,118, 97,108,
+ 50, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,111,117,116,118, 97,108, 41, 10,123, 10,  9,111,117,116,118, 97,108, 32, 61,
+ 32,109,105,110, 40,118, 97,108, 49, 44, 32,118, 97,108, 50, 41, 59, 10,125, 10, 10,118,111,105,100, 32,109, 97,116,104, 95,114,
+111,117,110,100, 40,102,108,111, 97,116, 32,118, 97,108, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,111,117,116,118, 97,108,
+ 41, 10,123, 10,  9,111,117,116,118, 97,108, 61, 32,102,108,111,111,114, 40,118, 97,108, 32, 43, 32, 48, 46, 53, 41, 59, 10,125,
+ 10, 10,118,111,105,100, 32,109, 97,116,104, 95,108,101,115,115, 95,116,104, 97,110, 40,102,108,111, 97,116, 32,118, 97,108, 49,
+ 44, 32,102,108,111, 97,116, 32,118, 97,108, 50, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,111,117,116,118, 97,108, 41, 10,
+123, 10,  9,105,102, 40,118, 97,108, 49, 32, 60, 32,118, 97,108, 50, 41, 10,  9,  9,111,117,116,118, 97,108, 32, 61, 32, 49, 46,
+ 48, 59, 10,  9,101,108,115,101, 10,  9,  9,111,117,116,118, 97,108, 32, 61, 32, 48, 46, 48, 59, 10,125, 10, 10,118,111,105,100,
+ 32,109, 97,116,104, 95,103,114,101, 97,116,101,114, 95,116,104, 97,110, 40,102,108,111, 97,116, 32,118, 97,108, 49, 44, 32,102,
+108,111, 97,116, 32,118, 97,108, 50, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,111,117,116,118, 97,108, 41, 10,123, 10,  9,
+105,102, 40,118, 97,108, 49, 32, 62, 32,118, 97,108, 50, 41, 10,  9,  9,111,117,116,118, 97,108, 32, 61, 32, 49, 46, 48, 59, 10,
+  9,101,108,115,101, 10,  9,  9,111,117,116,118, 97,108, 32, 61, 32, 48, 46, 48, 59, 10,125, 10, 10,118,111,105,100, 32,115,113,
+117,101,101,122,101, 40,102,108,111, 97,116, 32,118, 97,108, 44, 32,102,108,111, 97,116, 32,119,105,100,116,104, 44, 32,102,108,
+111, 97,116, 32, 99,101,110,116,101,114, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,111,117,116,118, 97,108, 41, 10,123, 10,
+  9,111,117,116,118, 97,108, 32, 61, 32, 49, 46, 48, 47, 40, 49, 46, 48, 32, 43, 32,112,111,119, 40, 50, 46, 55, 49, 56, 50, 56,
+ 49, 56, 51, 44, 32, 45, 40, 40,118, 97,108, 45, 99,101,110,116,101,114, 41, 42,119,105,100,116,104, 41, 41, 41, 59, 10,125, 10,
+ 10,118,111,105,100, 32,118,101, 99, 95,109, 97,116,104, 95, 97,100,100, 40,118,101, 99, 51, 32,118, 49, 44, 32,118,101, 99, 51,
+ 32,118, 50, 44, 32,111,117,116, 32,118,101, 99, 51, 32,111,117,116,118,101, 99, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,
+111,117,116,118, 97,108, 41, 10,123, 10,  9,111,117,116,118,101, 99, 32, 61, 32,118, 49, 32, 43, 32,118, 50, 59, 10,  9,111,117,
+116,118, 97,108, 32, 61, 32, 40, 97, 98,115, 40,111,117,116,118,101, 99, 91, 48, 93, 41, 32, 43, 32, 97, 98,115, 40,111,117,116,
+118,101, 99, 91, 49, 93, 41, 32, 43, 32, 97, 98,115, 40,111,117,116,118,101, 99, 91, 50, 93, 41, 41, 47, 51, 46, 48, 59, 10,125,
+ 10, 10,118,111,105,100, 32,118,101, 99, 95,109, 97,116,104, 95,115,117, 98, 40,118,101, 99, 51, 32,118, 49, 44, 32,118,101, 99,
+ 51, 32,118, 50, 44, 32,111,117,116, 32,118,101, 99, 51, 32,111,117,116,118,101, 99, 44, 32,111,117,116, 32,102,108,111, 97,116,
+ 32,111,117,116,118, 97,108, 41, 10,123, 10,  9,111,117,116,118,101, 99, 32, 61, 32,118, 49, 32, 45, 32,118, 50, 59, 10,  9,111,
+117,116,118, 97,108, 32, 61, 32, 40, 97, 98,115, 40,111,117,116,118,101, 99, 91, 48, 93, 41, 32, 43, 32, 97, 98,115, 40,111,117,
+116,118,101, 99, 91, 49, 93, 41, 32, 43, 32, 97, 98,115, 40,111,117,116,118,101, 99, 91, 50, 93, 41, 41, 47, 51, 46, 48, 59, 10,
+125, 10, 10,118,111,105,100, 32,118,101, 99, 95,109, 97,116,104, 95, 97,118,101,114, 97,103,101, 40,118,101, 99, 51, 32,118, 49,
+ 44, 32,118,101, 99, 51, 32,118, 50, 44, 32,111,117,116, 32,118,101, 99, 51, 32,111,117,116,118,101, 99, 44, 32,111,117,116, 32,
+102,108,111, 97,116, 32,111,117,116,118, 97,108, 41, 10,123, 10,  9,111,117,116,118,101, 99, 32, 61, 32,118, 49, 32, 43, 32,118,
+ 50, 59, 10,  9,111,117,116,118, 97,108, 32, 61, 32,108,101,110,103,116,104, 40,111,117,116,118,101, 99, 41, 59, 10,  9,111,117,
+116,118,101, 99, 32, 61, 32,110,111,114,109, 97,108,105,122,101, 40,111,117,116,118,101, 99, 41, 59, 10,125, 10, 10,118,111,105,
+100, 32,118,101, 99, 95,109, 97,116,104, 95,100,111,116, 40,118,101, 99, 51, 32,118, 49, 44, 32,118,101, 99, 51, 32,118, 50, 44,
+ 32,111,117,116, 32,118,101, 99, 51, 32,111,117,116,118,101, 99, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,111,117,116,118,
+ 97,108, 41, 10,123, 10,  9,111,117,116,118,101, 99, 32, 61, 32,118,101, 99, 51, 40, 48, 44, 32, 48, 44, 32, 48, 41, 59, 10,  9,
+111,117,116,118, 97,108, 32, 61, 32,100,111,116, 40,118, 49, 44, 32,118, 50, 41, 59, 10,125, 10, 10,118,111,105,100, 32,118,101,
+ 99, 95,109, 97,116,104, 95, 99,114,111,115,115, 40,118,101, 99, 51, 32,118, 49, 44, 32,118,101, 99, 51, 32,118, 50, 44, 32,111,
+117,116, 32,118,101, 99, 51, 32,111,117,116,118,101, 99, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,111,117,116,118, 97,108,
+ 41, 10,123, 10,  9,111,117,116,118,101, 99, 32, 61, 32, 99,114,111,115,115, 40,118, 49, 44, 32,118, 50, 41, 59, 10,  9,111,117,
+116,118, 97,108, 32, 61, 32,108,101,110,103,116,104, 40,111,117,116,118,101, 99, 41, 59, 10,125, 10, 10,118,111,105,100, 32,118,
+101, 99, 95,109, 97,116,104, 95,110,111,114,109, 97,108,105,122,101, 40,118,101, 99, 51, 32,118, 44, 32,111,117,116, 32,118,101,
+ 99, 51, 32,111,117,116,118,101, 99, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,111,117,116,118, 97,108, 41, 10,123, 10,  9,
+111,117,116,118, 97,108, 32, 61, 32,108,101,110,103,116,104, 40,118, 41, 59, 10,  9,111,117,116,118,101, 99, 32, 61, 32,110,111,
+114,109, 97,108,105,122,101, 40,118, 41, 59, 10,125, 10, 10,118,111,105,100, 32,118,101, 99, 95,109, 97,116,104, 95,110,101,103,
+ 97,116,101, 40,118,101, 99, 51, 32,118, 44, 32,111,117,116, 32,118,101, 99, 51, 32,111,117,116,118, 41, 10,123, 10,  9,111,117,
+116,118, 32, 61, 32, 45,118, 59, 10,125, 10, 10,118,111,105,100, 32,110,111,114,109, 97,108, 40,118,101, 99, 51, 32,100,105,114,
+ 44, 32,118,101, 99, 51, 32,110,111,114, 44, 32,111,117,116, 32,118,101, 99, 51, 32,111,117,116,110,111,114, 44, 32,111,117,116,
+ 32,102,108,111, 97,116, 32,111,117,116,100,111,116, 41, 10,123, 10,  9,111,117,116,110,111,114, 32, 61, 32,100,105,114, 59, 10,
+  9,111,117,116,100,111,116, 32, 61, 32, 45,100,111,116, 40,100,105,114, 44, 32,110,111,114, 41, 59, 10,125, 10, 10,118,111,105,
+100, 32, 99,117,114,118,101,115, 95,118,101, 99, 40,118,101, 99, 51, 32,118,101, 99, 44, 32,115, 97,109,112,108,101,114, 49, 68,
+ 32, 99,117,114,118,101,109, 97,112, 44, 32,111,117,116, 32,118,101, 99, 51, 32,111,117,116,118,101, 99, 41, 10,123, 10,  9,111,
+117,116,118,101, 99, 46,120, 32, 61, 32,116,101,120,116,117,114,101, 49, 68, 40, 99,117,114,118,101,109, 97,112, 44, 32, 40,118,
+101, 99, 46,120, 32, 43, 32, 49, 46, 48, 41, 42, 48, 46, 53, 41, 46,120, 59, 10,  9,111,117,116,118,101, 99, 46,121, 32, 61, 32,
+116,101,120,116,117,114,101, 49, 68, 40, 99,117,114,118,101,109, 97,112, 44, 32, 40,118,101, 99, 46,121, 32, 43, 32, 49, 46, 48,
+ 41, 42, 48, 46, 53, 41, 46,121, 59, 10,  9,111,117,116,118,101, 99, 46,122, 32, 61, 32,116,101,120,116,117,114,101, 49, 68, 40,
+ 99,117,114,118,101,109, 97,112, 44, 32, 40,118,101, 99, 46,122, 32, 43, 32, 49, 46, 48, 41, 42, 48, 46, 53, 41, 46,122, 59, 10,
+125, 10, 10,118,111,105,100, 32, 99,117,114,118,101,115, 95,114,103, 98, 40,118,101, 99, 52, 32, 99,111,108, 44, 32,115, 97,109,
+112,108,101,114, 49, 68, 32, 99,117,114,118,101,109, 97,112, 44, 32,111,117,116, 32,118,101, 99, 52, 32,111,117,116, 99,111,108,
+ 41, 10,123, 10,  9,111,117,116, 99,111,108, 46,114, 32, 61, 32,116,101,120,116,117,114,101, 49, 68, 40, 99,117,114,118,101,109,
+ 97,112, 44, 32,116,101,120,116,117,114,101, 49, 68, 40, 99,117,114,118,101,109, 97,112, 44, 32, 99,111,108, 46,114, 41, 46, 97,
+ 41, 46,114, 59, 10,  9,111,117,116, 99,111,108, 46,103, 32, 61, 32,116,101,120,116,117,114,101, 49, 68, 40, 99,117,114,118,101,
+109, 97,112, 44, 32,116,101,120,116,117,114,101, 49, 68, 40, 99,117,114,118,101,109, 97,112, 44, 32, 99,111,108, 46,103, 41, 46,
+ 97, 41, 46,103, 59, 10,  9,111,117,116, 99,111,108, 46, 98, 32, 61, 32,116,101,120,116,117,114,101, 49, 68, 40, 99,117,114,118,
+101,109, 97,112, 44, 32,116,101,120,116,117,114,101, 49, 68, 40, 99,117,114,118,101,109, 97,112, 44, 32, 99,111,108, 46, 98, 41,
+ 46, 97, 41, 46, 98, 59, 10,  9,111,117,116, 99,111,108, 46, 97, 32, 61, 32, 99,111,108, 46, 97, 59, 10,125, 10, 10,118,111,105,
+100, 32,115,101,116, 95,118, 97,108,117,101, 40,102,108,111, 97,116, 32,118, 97,108, 44, 32,111,117,116, 32,102,108,111, 97,116,
+ 32,111,117,116,118, 97,108, 41, 10,123, 10,  9,111,117,116,118, 97,108, 32, 61, 32,118, 97,108, 59, 10,125, 10, 10,118,111,105,
+100, 32,115,101,116, 95,114,103, 98, 40,118,101, 99, 51, 32, 99,111,108, 44, 32,111,117,116, 32,118,101, 99, 51, 32,111,117,116,
+ 99,111,108, 41, 10,123, 10,  9,111,117,116, 99,111,108, 32, 61, 32, 99,111,108, 59, 10,125, 10, 10,118,111,105,100, 32,115,101,
+116, 95,114,103, 98, 97, 40,118,101, 99, 52, 32, 99,111,108, 44, 32,111,117,116, 32,118,101, 99, 52, 32,111,117,116, 99,111,108,
+ 41, 10,123, 10,  9,111,117,116, 99,111,108, 32, 61, 32, 99,111,108, 59, 10,125, 10, 10,118,111,105,100, 32,115,101,116, 95,118,
+ 97,108,117,101, 95,122,101,114,111, 40,111,117,116, 32,102,108,111, 97,116, 32,111,117,116,118, 97,108, 41, 10,123, 10,  9,111,
+117,116,118, 97,108, 32, 61, 32, 48, 46, 48, 59, 10,125, 10, 10,118,111,105,100, 32,115,101,116, 95,114,103, 98, 95,122,101,114,
+111, 40,111,117,116, 32,118,101, 99, 51, 32,111,117,116,118, 97,108, 41, 10,123, 10,  9,111,117,116,118, 97,108, 32, 61, 32,118,
+101, 99, 51, 40, 48, 46, 48, 41, 59, 10,125, 10, 10,118,111,105,100, 32,115,101,116, 95,114,103, 98, 97, 95,122,101,114,111, 40,
+111,117,116, 32,118,101, 99, 52, 32,111,117,116,118, 97,108, 41, 10,123, 10,  9,111,117,116,118, 97,108, 32, 61, 32,118,101, 99,
+ 52, 40, 48, 46, 48, 41, 59, 10,125, 10, 10,118,111,105,100, 32,109,105,120, 95, 98,108,101,110,100, 40,102,108,111, 97,116, 32,
+102, 97, 99, 44, 32,118,101, 99, 52, 32, 99,111,108, 49, 44, 32,118,101, 99, 52, 32, 99,111,108, 50, 44, 32,111,117,116, 32,118,
+101, 99, 52, 32,111,117,116, 99,111,108, 41, 10,123, 10,  9,102, 97, 99, 32, 61, 32, 99,108, 97,109,112, 40,102, 97, 99, 44, 32,
+ 48, 46, 48, 44, 32, 49, 46, 48, 41, 59, 10,  9,111,117,116, 99,111,108, 32, 61, 32,109,105,120, 40, 99,111,108, 49, 44, 32, 99,
+111,108, 50, 44, 32,102, 97, 99, 41, 59, 10,  9,111,117,116, 99,111,108, 46, 97, 32, 61, 32, 99,111,108, 49, 46, 97, 59, 10,125,
+ 10, 10,118,111,105,100, 32,109,105,120, 95, 97,100,100, 40,102,108,111, 97,116, 32,102, 97, 99, 44, 32,118,101, 99, 52, 32, 99,
+111,108, 49, 44, 32,118,101, 99, 52, 32, 99,111,108, 50, 44, 32,111,117,116, 32,118,101, 99, 52, 32,111,117,116, 99,111,108, 41,
+ 10,123, 10,  9,102, 97, 99, 32, 61, 32, 99,108, 97,109,112, 40,102, 97, 99, 44, 32, 48, 46, 48, 44, 32, 49, 46, 48, 41, 59, 10,
+  9,111,117,116, 99,111,108, 32, 61, 32,109,105,120, 40, 99,111,108, 49, 44, 32, 99,111,108, 49, 32, 43, 32, 99,111,108, 50, 44,
+ 32,102, 97, 99, 41, 59, 10,  9,111,117,116, 99,111,108, 46, 97, 32, 61, 32, 99,111,108, 49, 46, 97, 59, 10,125, 10, 10,118,111,
+105,100, 32,109,105,120, 95,109,117,108,116, 40,102,108,111, 97,116, 32,102, 97, 99, 44, 32,118,101, 99, 52, 32, 99,111,108, 49,
+ 44, 32,118,101, 99, 52, 32, 99,111,108, 50, 44, 32,111,117,116, 32,118,101, 99, 52, 32,111,117,116, 99,111,108, 41, 10,123, 10,
+  9,102, 97, 99, 32, 61, 32, 99,108, 97,109,112, 40,102, 97, 99, 44, 32, 48, 46, 48, 44, 32, 49, 46, 48, 41, 59, 10,  9,111,117,
+116, 99,111,108, 32, 61, 32,109,105,120, 40, 99,111,108, 49, 44, 32, 99,111,108, 49, 32, 42, 32, 99,111,108, 50, 44, 32,102, 97,
+ 99, 41, 59, 10,  9,111,117,116, 99,111,108, 46, 97, 32, 61, 32, 99,111,108, 49, 46, 97, 59, 10,125, 10, 10,118,111,105,100, 32,
+109,105,120, 95,115, 99,114,101,101,110, 40,102,108,111, 97,116, 32,102, 97, 99, 44, 32,118,101, 99, 52, 32, 99,111,108, 49, 44,
+ 32,118,101, 99, 52, 32, 99,111,108, 50, 44, 32,111,117,116, 32,118,101, 99, 52, 32,111,117,116, 99,111,108, 41, 10,123, 10,  9,
+102, 97, 99, 32, 61, 32, 99,108, 97,109,112, 40,102, 97, 99, 44, 32, 48, 46, 48, 44, 32, 49, 46, 48, 41, 59, 10,  9,102,108,111,
+ 97,116, 32,102, 97, 99,109, 32, 61, 32, 49, 46, 48, 32, 45, 32,102, 97, 99, 59, 10, 10,  9,111,117,116, 99,111,108, 32, 61, 32,
+118,101, 99, 52, 40, 49, 46, 48, 41, 32, 45, 32, 40,118,101, 99, 52, 40,102, 97, 99,109, 41, 32, 43, 32,102, 97, 99, 42, 40,118,
+101, 99, 52, 40, 49, 46, 48, 41, 32, 45, 32, 99,111,108, 50, 41, 41, 42, 40,118,101, 99, 52, 40, 49, 46, 48, 41, 32, 45, 32, 99,
+111,108, 49, 41, 59, 10,  9,111,117,116, 99,111,108, 46, 97, 32, 61, 32, 99,111,108, 49, 46, 97, 59, 10,125, 10, 10,118,111,105,
+100, 32,109,105,120, 95,111,118,101,114,108, 97,121, 40,102,108,111, 97,116, 32,102, 97, 99, 44, 32,118,101, 99, 52, 32, 99,111,
+108, 49, 44, 32,118,101, 99, 52, 32, 99,111,108, 50, 44, 32,111,117,116, 32,118,101, 99, 52, 32,111,117,116, 99,111,108, 41, 10,
+123, 10,  9,102, 97, 99, 32, 61, 32, 99,108, 97,109,112, 40,102, 97, 99, 44, 32, 48, 46, 48, 44, 32, 49, 46, 48, 41, 59, 10,  9,
+102,108,111, 97,116, 32,102, 97, 99,109, 32, 61, 32, 49, 46, 48, 32, 45, 32,102, 97, 99, 59, 10, 10,  9,111,117,116, 99,111,108,
+ 32, 61, 32, 99,111,108, 49, 59, 10, 10,  9,105,102, 40,111,117,116, 99,111,108, 46,114, 32, 60, 32, 48, 46, 53, 41, 10,  9,  9,
+111,117,116, 99,111,108, 46,114, 32, 42, 61, 32,102, 97, 99,109, 32, 43, 32, 50, 46, 48, 42,102, 97, 99, 42, 99,111,108, 50, 46,
+114, 59, 10,  9,101,108,115,101, 10,  9,  9,111,117,116, 99,111,108, 46,114, 32, 61, 32, 49, 46, 48, 32, 45, 32, 40,102, 97, 99,
+109, 32, 43, 32, 50, 46, 48, 42,102, 97, 99, 42, 40, 49, 46, 48, 32, 45, 32, 99,111,108, 50, 46,114, 41, 41, 42, 40, 49, 46, 48,
+ 32, 45, 32,111,117,116, 99,111,108, 46,114, 41, 59, 10, 10,  9,105,102, 40,111,117,116, 99,111,108, 46,103, 32, 60, 32, 48, 46,
+ 53, 41, 10,  9,  9,111,117,116, 99,111,108, 46,103, 32, 42, 61, 32,102, 97, 99,109, 32, 43, 32, 50, 46, 48, 42,102, 97, 99, 42,
+ 99,111,108, 50, 46,103, 59, 10,  9,101,108,115,101, 10,  9,  9,111,117,116, 99,111,108, 46,103, 32, 61, 32, 49, 46, 48, 32, 45,
+ 32, 40,102, 97, 99,109, 32, 43, 32, 50, 46, 48, 42,102, 97, 99, 42, 40, 49, 46, 48, 32, 45, 32, 99,111,108, 50, 46,103, 41, 41,
+ 42, 40, 49, 46, 48, 32, 45, 32,111,117,116, 99,111,108, 46,103, 41, 59, 10, 10,  9,105,102, 40,111,117,116, 99,111,108, 46, 98,
+ 32, 60, 32, 48, 46, 53, 41, 10,  9,  9,111,117,116, 99,111,108, 46, 98, 32, 42, 61, 32,102, 97, 99,109, 32, 43, 32, 50, 46, 48,
+ 42,102, 97, 99, 42, 99,111,108, 50, 46, 98, 59, 10,  9,101,108,115,101, 10,  9,  9,111,117,116, 99,111,108, 46, 98, 32, 61, 32,
+ 49, 46, 48, 32, 45, 32, 40,102, 97, 99,109, 32, 43, 32, 50, 46, 48, 42,102, 97, 99, 42, 40, 49, 46, 48, 32, 45, 32, 99,111,108,
+ 50, 46, 98, 41, 41, 42, 40, 49, 46, 48, 32, 45, 32,111,117,116, 99,111,108, 46, 98, 41, 59, 10,125, 10, 10,118,111,105,100, 32,
+109,105,120, 95,115,117, 98, 40,102,108,111, 97,116, 32,102, 97, 99, 44, 32,118,101, 99, 52, 32, 99,111,108, 49, 44, 32,118,101,
+ 99, 52, 32, 99,111,108, 50, 44, 32,111,117,116, 32,118,101, 99, 52, 32,111,117,116, 99,111,108, 41, 10,123, 10,  9,102, 97, 99,
+ 32, 61, 32, 99,108, 97,109,112, 40,102, 97, 99, 44, 32, 48, 46, 48, 44, 32, 49, 46, 48, 41, 59, 10,  9,111,117,116, 99,111,108,
+ 32, 61, 32,109,105,120, 40, 99,111,108, 49, 44, 32, 99,111,108, 49, 32, 45, 32, 99,111,108, 50, 44, 32,102, 97, 99, 41, 59, 10,
+  9,111,117,116, 99,111,108, 46, 97, 32, 61, 32, 99,111,108, 49, 46, 97, 59, 10,125, 10, 10,118,111,105,100, 32,109,105,120, 95,
+100,105,118, 40,102,108,111, 97,116, 32,102, 97, 99, 44, 32,118,101, 99, 52, 32, 99,111,108, 49, 44, 32,118,101, 99, 52, 32, 99,
+111,108, 50, 44, 32,111,117,116, 32,118,101, 99, 52, 32,111,117,116, 99,111,108, 41, 10,123, 10,  9,102, 97, 99, 32, 61, 32, 99,
+108, 97,109,112, 40,102, 97, 99, 44, 32, 48, 46, 48, 44, 32, 49, 46, 48, 41, 59, 10,  9,102,108,111, 97,116, 32,102, 97, 99,109,
+ 32, 61, 32, 49, 46, 48, 32, 45, 32,102, 97, 99, 59, 10, 10,  9,111,117,116, 99,111,108, 32, 61, 32, 99,111,108, 49, 59, 10, 10,
+  9,105,102, 40, 99,111,108, 50, 46,114, 32, 33, 61, 32, 48, 46, 48, 41, 32,111,117,116, 99,111,108, 46,114, 32, 61, 32,102, 97,
+ 99,109, 42,111,117,116, 99,111,108, 46,114, 32, 43, 32,102, 97, 99, 42,111,117,116, 99,111,108, 46,114, 47, 99,111,108, 50, 46,
+114, 59, 10,  9,105,102, 40, 99,111,108, 50, 46,103, 32, 33, 61, 32, 48, 46, 48, 41, 32,111,117,116, 99,111,108, 46,103, 32, 61,
+ 32,102, 97, 99,109, 42,111,117,116, 99,111,108, 46,103, 32, 43, 32,102, 97, 99, 42,111,117,116, 99,111,108, 46,103, 47, 99,111,
+108, 50, 46,103, 59, 10,  9,105,102, 40, 99,111,108, 50, 46, 98, 32, 33, 61, 32, 48, 46, 48, 41, 32,111,117,116, 99,111,108, 46,
+ 98, 32, 61, 32,102, 97, 99,109, 42,111,117,116, 99,111,108, 46, 98, 32, 43, 32,102, 97, 99, 42,111,117,116, 99,111,108, 46, 98,
+ 47, 99,111,108, 50, 46, 98, 59, 10,125, 10, 10,118,111,105,100, 32,109,105,120, 95,100,105,102,102, 40,102,108,111, 97,116, 32,
+102, 97, 99, 44, 32,118,101, 99, 52, 32, 99,111,108, 49, 44, 32,118,101, 99, 52, 32, 99,111,108, 50, 44, 32,111,117,116, 32,118,
+101, 99, 52, 32,111,117,116, 99,111,108, 41, 10,123, 10,  9,102, 97, 99, 32, 61, 32, 99,108, 97,109,112, 40,102, 97, 99, 44, 32,
+ 48, 46, 48, 44, 32, 49, 46, 48, 41, 59, 10,  9,111,117,116, 99,111,108, 32, 61, 32,109,105,120, 40, 99,111,108, 49, 44, 32, 97,
+ 98,115, 40, 99,111,108, 49, 32, 45, 32, 99,111,108, 50, 41, 44, 32,102, 97, 99, 41, 59, 10,  9,111,117,116, 99,111,108, 46, 97,
+ 32, 61, 32, 99,111,108, 49, 46, 97, 59, 10,125, 10, 10,118,111,105,100, 32,109,105,120, 95,100, 97,114,107, 40,102,108,111, 97,
+116, 32,102, 97, 99, 44, 32,118,101, 99, 52, 32, 99,111,108, 49, 44, 32,118,101, 99, 52, 32, 99,111,108, 50, 44, 32,111,117,116,
+ 32,118,101, 99, 52, 32,111,117,116, 99,111,108, 41, 10,123, 10,  9,102, 97, 99, 32, 61, 32, 99,108, 97,109,112, 40,102, 97, 99,
+ 44, 32, 48, 46, 48, 44, 32, 49, 46, 48, 41, 59, 10,  9,111,117,116, 99,111,108, 46,114,103, 98, 32, 61, 32,109,105,110, 40, 99,
+111,108, 49, 46,114,103, 98, 44, 32, 99,111,108, 50, 46,114,103, 98, 42,102, 97, 99, 41, 59, 10,  9,111,117,116, 99,111,108, 46,
+ 97, 32, 61, 32, 99,111,108, 49, 46, 97, 59, 10,125, 10, 10,118,111,105,100, 32,109,105,120, 95,108,105,103,104,116, 40,102,108,
+111, 97,116, 32,102, 97, 99, 44, 32,118,101, 99, 52, 32, 99,111,108, 49, 44, 32,118,101, 99, 52, 32, 99,111,108, 50, 44, 32,111,
+117,116, 32,118,101, 99, 52, 32,111,117,116, 99,111,108, 41, 10,123, 10,  9,102, 97, 99, 32, 61, 32, 99,108, 97,109,112, 40,102,
+ 97, 99, 44, 32, 48, 46, 48, 44, 32, 49, 46, 48, 41, 59, 10,  9,111,117,116, 99,111,108, 46,114,103, 98, 32, 61, 32,109, 97,120,
+ 40, 99,111,108, 49, 46,114,103, 98, 44, 32, 99,111,108, 50, 46,114,103, 98, 42,102, 97, 99, 41, 59, 10,  9,111,117,116, 99,111,
+108, 46, 97, 32, 61, 32, 99,111,108, 49, 46, 97, 59, 10,125, 10, 10,118,111,105,100, 32,109,105,120, 95,100,111,100,103,101, 40,
+102,108,111, 97,116, 32,102, 97, 99, 44, 32,118,101, 99, 52, 32, 99,111,108, 49, 44, 32,118,101, 99, 52, 32, 99,111,108, 50, 44,
+ 32,111,117,116, 32,118,101, 99, 52, 32,111,117,116, 99,111,108, 41, 10,123, 10,  9,102, 97, 99, 32, 61, 32, 99,108, 97,109,112,
+ 40,102, 97, 99, 44, 32, 48, 46, 48, 44, 32, 49, 46, 48, 41, 59, 10,  9,111,117,116, 99,111,108, 32, 61, 32, 99,111,108, 49, 59,
+ 10, 10,  9,105,102, 40,111,117,116, 99,111,108, 46,114, 32, 33, 61, 32, 48, 46, 48, 41, 32,123, 10,  9,  9,102,108,111, 97,116,
+ 32,116,109,112, 32, 61, 32, 49, 46, 48, 32, 45, 32,102, 97, 99, 42, 99,111,108, 50, 46,114, 59, 10,  9,  9,105,102, 40,116,109,
+112, 32, 60, 61, 32, 48, 46, 48, 41, 10,  9,  9,  9,111,117,116, 99,111,108, 46,114, 32, 61, 32, 49, 46, 48, 59, 10,  9,  9,101,
+108,115,101, 32,105,102, 40, 40,116,109,112, 32, 61, 32,111,117,116, 99,111,108, 46,114, 47,116,109,112, 41, 32, 62, 32, 49, 46,
+ 48, 41, 10,  9,  9,  9,111,117,116, 99,111,108, 46,114, 32, 61, 32, 49, 46, 48, 59, 10,  9,  9,101,108,115,101, 10,  9,  9,  9,
+111,117,116, 99,111,108, 46,114, 32, 61, 32,116,109,112, 59, 10,  9,125, 10,  9,105,102, 40,111,117,116, 99,111,108, 46,103, 32,
+ 33, 61, 32, 48, 46, 48, 41, 32,123, 10,  9,  9,102,108,111, 97,116, 32,116,109,112, 32, 61, 32, 49, 46, 48, 32, 45, 32,102, 97,
+ 99, 42, 99,111,108, 50, 46,103, 59, 10,  9,  9,105,102, 40,116,109,112, 32, 60, 61, 32, 48, 46, 48, 41, 10,  9,  9,  9,111,117,
+116, 99,111,108, 46,103, 32, 61, 32, 49, 46, 48, 59, 10,  9,  9,101,108,115,101, 32,105,102, 40, 40,116,109,112, 32, 61, 32,111,
+117,116, 99,111,108, 46,103, 47,116,109,112, 41, 32, 62, 32, 49, 46, 48, 41, 10,  9,  9,  9,111,117,116, 99,111,108, 46,103, 32,
+ 61, 32, 49, 46, 48, 59, 10,  9,  9,101,108,115,101, 10,  9,  9,  9,111,117,116, 99,111,108, 46,103, 32, 61, 32,116,109,112, 59,
+ 10,  9,125, 10,  9,105,102, 40,111,117,116, 99,111,108, 46, 98, 32, 33, 61, 32, 48, 46, 48, 41, 32,123, 10,  9,  9,102,108,111,
+ 97,116, 32,116,109,112, 32, 61, 32, 49, 46, 48, 32, 45, 32,102, 97, 99, 42, 99,111,108, 50, 46, 98, 59, 10,  9,  9,105,102, 40,
+116,109,112, 32, 60, 61, 32, 48, 46, 48, 41, 10,  9,  9,  9,111,117,116, 99,111,108, 46, 98, 32, 61, 32, 49, 46, 48, 59, 10,  9,
+  9,101,108,115,101, 32,105,102, 40, 40,116,109,112, 32, 61, 32,111,117,116, 99,111,108, 46, 98, 47,116,109,112, 41, 32, 62, 32,
+ 49, 46, 48, 41, 10,  9,  9,  9,111,117,116, 99,111,108, 46, 98, 32, 61, 32, 49, 46, 48, 59, 10,  9,  9,101,108,115,101, 10,  9,
+  9,  9,111,117,116, 99,111,108, 46, 98, 32, 61, 32,116,109,112, 59, 10,  9,125, 10,125, 10, 10,118,111,105,100, 32,109,105,120,
+ 95, 98,117,114,110, 40,102,108,111, 97,116, 32,102, 97, 99, 44, 32,118,101, 99, 52, 32, 99,111,108, 49, 44, 32,118,101, 99, 52,
+ 32, 99,111,108, 50, 44, 32,111,117,116, 32,118,101, 99, 52, 32,111,117,116, 99,111,108, 41, 10,123, 10,  9,102, 97, 99, 32, 61,
+ 32, 99,108, 97,109,112, 40,102, 97, 99, 44, 32, 48, 46, 48, 44, 32, 49, 46, 48, 41, 59, 10,  9,102,108,111, 97,116, 32,116,109,
+112, 44, 32,102, 97, 99,109, 32, 61, 32, 49, 46, 48, 32, 45, 32,102, 97, 99, 59, 10, 10,  9,111,117,116, 99,111,108, 32, 61, 32,
+ 99,111,108, 49, 59, 10, 10,  9,116,109,112, 32, 61, 32,102, 97, 99,109, 32, 43, 32,102, 97, 99, 42, 99,111,108, 50, 46,114, 59,
+ 10,  9,105,102, 40,116,109,112, 32, 60, 61, 32, 48, 46, 48, 41, 10,  9,  9,111,117,116, 99,111,108, 46,114, 32, 61, 32, 48, 46,
+ 48, 59, 10,  9,101,108,115,101, 32,105,102, 40, 40,116,109,112, 32, 61, 32, 40, 49, 46, 48, 32, 45, 32, 40, 49, 46, 48, 32, 45,
+ 32,111,117,116, 99,111,108, 46,114, 41, 47,116,109,112, 41, 41, 32, 60, 32, 48, 46, 48, 41, 10,  9,  9,111,117,116, 99,111,108,
+ 46,114, 32, 61, 32, 48, 46, 48, 59, 10,  9,101,108,115,101, 32,105,102, 40,116,109,112, 32, 62, 32, 49, 46, 48, 41, 10,  9,  9,
+111,117,116, 99,111,108, 46,114, 32, 61, 32, 49, 46, 48, 59, 10,  9,101,108,115,101, 10,  9,  9,111,117,116, 99,111,108, 46,114,
+ 32, 61, 32,116,109,112, 59, 10, 10,  9,116,109,112, 32, 61, 32,102, 97, 99,109, 32, 43, 32,102, 97, 99, 42, 99,111,108, 50, 46,
+103, 59, 10,  9,105,102, 40,116,109,112, 32, 60, 61, 32, 48, 46, 48, 41, 10,  9,  9,111,117,116, 99,111,108, 46,103, 32, 61, 32,
+ 48, 46, 48, 59, 10,  9,101,108,115,101, 32,105,102, 40, 40,116,109,112, 32, 61, 32, 40, 49, 46, 48, 32, 45, 32, 40, 49, 46, 48,
+ 32, 45, 32,111,117,116, 99,111,108, 46,103, 41, 47,116,109,112, 41, 41, 32, 60, 32, 48, 46, 48, 41, 10,  9,  9,111,117,116, 99,
+111,108, 46,103, 32, 61, 32, 48, 46, 48, 59, 10,  9,101,108,115,101, 32,105,102, 40,116,109,112, 32, 62, 32, 49, 46, 48, 41, 10,
+  9,  9,111,117,116, 99,111,108, 46,103, 32, 61, 32, 49, 46, 48, 59, 10,  9,101,108,115,101, 10,  9,  9,111,117,116, 99,111,108,
+ 46,103, 32, 61, 32,116,109,112, 59, 10, 10,  9,116,109,112, 32, 61, 32,102, 97, 99,109, 32, 43, 32,102, 97, 99, 42, 99,111,108,
+ 50, 46, 98, 59, 10,  9,105,102, 40,116,109,112, 32, 60, 61, 32, 48, 46, 48, 41, 10,  9,  9,111,117,116, 99,111,108, 46, 98, 32,
+ 61, 32, 48, 46, 48, 59, 10,  9,101,108,115,101, 32,105,102, 40, 40,116,109,112, 32, 61, 32, 40, 49, 46, 48, 32, 45, 32, 40, 49,
+ 46, 48, 32, 45, 32,111,117,116, 99,111,108, 46, 98, 41, 47,116,109,112, 41, 41, 32, 60, 32, 48, 46, 48, 41, 10,  9,  9,111,117,
+116, 99,111,108, 46, 98, 32, 61, 32, 48, 46, 48, 59, 10,  9,101,108,115,101, 32,105,102, 40,116,109,112, 32, 62, 32, 49, 46, 48,
+ 41, 10,  9,  9,111,117,116, 99,111,108, 46, 98, 32, 61, 32, 49, 46, 48, 59, 10,  9,101,108,115,101, 10,  9,  9,111,117,116, 99,
+111,108, 46, 98, 32, 61, 32,116,109,112, 59, 10,125, 10, 10,118,111,105,100, 32,109,105,120, 95,104,117,101, 40,102,108,111, 97,
+116, 32,102, 97, 99, 44, 32,118,101, 99, 52, 32, 99,111,108, 49, 44, 32,118,101, 99, 52, 32, 99,111,108, 50, 44, 32,111,117,116,
+ 32,118,101, 99, 52, 32,111,117,116, 99,111,108, 41, 10,123, 10,  9,102, 97, 99, 32, 61, 32, 99,108, 97,109,112, 40,102, 97, 99,
+ 44, 32, 48, 46, 48, 44, 32, 49, 46, 48, 41, 59, 10,  9,102,108,111, 97,116, 32,102, 97, 99,109, 32, 61, 32, 49, 46, 48, 32, 45,
+ 32,102, 97, 99, 59, 10, 10,  9,111,117,116, 99,111,108, 32, 61, 32, 99,111,108, 49, 59, 10, 10,  9,118,101, 99, 52, 32,104,115,
+118, 44, 32,104,115,118, 50, 44, 32,116,109,112, 59, 10,  9,114,103, 98, 95,116,111, 95,104,115,118, 40, 99,111,108, 50, 44, 32,
+104,115,118, 50, 41, 59, 10, 10,  9,105,102, 40,104,115,118, 50, 46,121, 32, 33, 61, 32, 48, 46, 48, 41, 32,123, 10,  9,  9,114,
+103, 98, 95,116,111, 95,104,115,118, 40,111,117,116, 99,111,108, 44, 32,104,115,118, 41, 59, 10,  9,  9,104,115,118, 46,120, 32,
+ 61, 32,104,115,118, 50, 46,120, 59, 10,  9,  9,104,115,118, 95,116,111, 95,114,103, 98, 40,104,115,118, 44, 32,116,109,112, 41,
+ 59, 32, 10, 10,  9,  9,111,117,116, 99,111,108, 32, 61, 32,109,105,120, 40,111,117,116, 99,111,108, 44, 32,116,109,112, 44, 32,
+102, 97, 99, 41, 59, 10,  9,  9,111,117,116, 99,111,108, 46, 97, 32, 61, 32, 99,111,108, 49, 46, 97, 59, 10,  9,125, 10,125, 10,
+ 10,118,111,105,100, 32,109,105,120, 95,115, 97,116, 40,102,108,111, 97,116, 32,102, 97, 99, 44, 32,118,101, 99, 52, 32, 99,111,
+108, 49, 44, 32,118,101, 99, 52, 32, 99,111,108, 50, 44, 32,111,117,116, 32,118,101, 99, 52, 32,111,117,116, 99,111,108, 41, 10,
+123, 10,  9,102, 97, 99, 32, 61, 32, 99,108, 97,109,112, 40,102, 97, 99, 44, 32, 48, 46, 48, 44, 32, 49, 46, 48, 41, 59, 10,  9,
+102,108,111, 97,116, 32,102, 97, 99,109, 32, 61, 32, 49, 46, 48, 32, 45, 32,102, 97, 99, 59, 10, 10,  9,111,117,116, 99,111,108,
+ 32, 61, 32, 99,111,108, 49, 59, 10, 10,  9,118,101, 99, 52, 32,104,115,118, 44, 32,104,115,118, 50, 59, 10,  9,114,103, 98, 95,
+116,111, 95,104,115,118, 40,111,117,116, 99,111,108, 44, 32,104,115,118, 41, 59, 10, 10,  9,105,102, 40,104,115,118, 46,121, 32,
+ 33, 61, 32, 48, 46, 48, 41, 32,123, 10,  9,  9,114,103, 98, 95,116,111, 95,104,115,118, 40, 99,111,108, 50, 44, 32,104,115,118,
+ 50, 41, 59, 10, 10,  9,  9,104,115,118, 46,121, 32, 61, 32,102, 97, 99,109, 42,104,115,118, 46,121, 32, 43, 32,102, 97, 99, 42,
+104,115,118, 50, 46,121, 59, 10,  9,  9,104,115,118, 95,116,111, 95,114,103, 98, 40,104,115,118, 44, 32,111,117,116, 99,111,108,
+ 41, 59, 10,  9,125, 10,125, 10, 10,118,111,105,100, 32,109,105,120, 95,118, 97,108, 40,102,108,111, 97,116, 32,102, 97, 99, 44,
+ 32,118,101, 99, 52, 32, 99,111,108, 49, 44, 32,118,101, 99, 52, 32, 99,111,108, 50, 44, 32,111,117,116, 32,118,101, 99, 52, 32,
+111,117,116, 99,111,108, 41, 10,123, 10,  9,102, 97, 99, 32, 61, 32, 99,108, 97,109,112, 40,102, 97, 99, 44, 32, 48, 46, 48, 44,
+ 32, 49, 46, 48, 41, 59, 10,  9,102,108,111, 97,116, 32,102, 97, 99,109, 32, 61, 32, 49, 46, 48, 32, 45, 32,102, 97, 99, 59, 10,
+ 10,  9,118,101, 99, 52, 32,104,115,118, 44, 32,104,115,118, 50, 59, 10,  9,114,103, 98, 95,116,111, 95,104,115,118, 40, 99,111,
+108, 49, 44, 32,104,115,118, 41, 59, 10,  9,114,103, 98, 95,116,111, 95,104,115,118, 40, 99,111,108, 50, 44, 32,104,115,118, 50,
+ 41, 59, 10, 10,  9,104,115,118, 46,122, 32, 61, 32,102, 97, 99,109, 42,104,115,118, 46,122, 32, 43, 32,102, 97, 99, 42,104,115,
+118, 50, 46,122, 59, 10,  9,104,115,118, 95,116,111, 95,114,103, 98, 40,104,115,118, 44, 32,111,117,116, 99,111,108, 41, 59, 10,
+125, 10, 10,118,111,105,100, 32,109,105,120, 95, 99,111,108,111,114, 40,102,108,111, 97,116, 32,102, 97, 99, 44, 32,118,101, 99,
+ 52, 32, 99,111,108, 49, 44, 32,118,101, 99, 52, 32, 99,111,108, 50, 44, 32,111,117,116, 32,118,101, 99, 52, 32,111,117,116, 99,
+111,108, 41, 10,123, 10,  9,102, 97, 99, 32, 61, 32, 99,108, 97,109,112, 40,102, 97, 99, 44, 32, 48, 46, 48, 44, 32, 49, 46, 48,
+ 41, 59, 10,  9,102,108,111, 97,116, 32,102, 97, 99,109, 32, 61, 32, 49, 46, 48, 32, 45, 32,102, 97, 99, 59, 10, 10,  9,111,117,
+116, 99,111,108, 32, 61, 32, 99,111,108, 49, 59, 10, 10,  9,118,101, 99, 52, 32,104,115,118, 44, 32,104,115,118, 50, 44, 32,116,
+109,112, 59, 10,  9,114,103, 98, 95,116,111, 95,104,115,118, 40, 99,111,108, 50, 44, 32,104,115,118, 50, 41, 59, 10, 10,  9,105,
+102, 40,104,115,118, 50, 46,121, 32, 33, 61, 32, 48, 46, 48, 41, 32,123, 10,  9,  9,114,103, 98, 95,116,111, 95,104,115,118, 40,
+111,117,116, 99,111,108, 44, 32,104,115,118, 41, 59, 10,  9,  9,104,115,118, 46,120, 32, 61, 32,104,115,118, 50, 46,120, 59, 10,
+  9,  9,104,115,118, 46,121, 32, 61, 32,104,115,118, 50, 46,121, 59, 10,  9,  9,104,115,118, 95,116,111, 95,114,103, 98, 40,104,
+115,118, 44, 32,116,109,112, 41, 59, 32, 10, 10,  9,  9,111,117,116, 99,111,108, 32, 61, 32,109,105,120, 40,111,117,116, 99,111,
+108, 44, 32,116,109,112, 44, 32,102, 97, 99, 41, 59, 10,  9,  9,111,117,116, 99,111,108, 46, 97, 32, 61, 32, 99,111,108, 49, 46,
+ 97, 59, 10,  9,125, 10,125, 10, 10,118,111,105,100, 32,118, 97,108,116,111,114,103, 98, 40,102,108,111, 97,116, 32,102, 97, 99,
+ 44, 32,115, 97,109,112,108,101,114, 49, 68, 32, 99,111,108,111,114,109, 97,112, 44, 32,111,117,116, 32,118,101, 99, 52, 32,111,
+117,116, 99,111,108, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,111,117,116, 97,108,112,104, 97, 41, 10,123, 10,  9,111,117,
+116, 99,111,108, 32, 61, 32,116,101,120,116,117,114,101, 49, 68, 40, 99,111,108,111,114,109, 97,112, 44, 32,102, 97, 99, 41, 59,
+ 10,  9,111,117,116, 97,108,112,104, 97, 32, 61, 32,111,117,116, 99,111,108, 46, 97, 59, 10,125, 10, 10,118,111,105,100, 32,114,
+103, 98,116,111, 98,119, 40,118,101, 99, 52, 32, 99,111,108,111,114, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,111,117,116,
+118, 97,108, 41, 10,123, 10,  9,111,117,116,118, 97,108, 32, 61, 32, 99,111,108,111,114, 46,114, 42, 48, 46, 51, 53, 32, 43, 32,
+ 99,111,108,111,114, 46,103, 42, 48, 46, 52, 53, 32, 43, 32, 99,111,108,111,114, 46, 98, 42, 48, 46, 50, 59, 10,125, 10, 10,118,
+111,105,100, 32,105,110,118,101,114,116, 40,102,108,111, 97,116, 32,102, 97, 99, 44, 32,118,101, 99, 52, 32, 99,111,108, 44, 32,
+111,117,116, 32,118,101, 99, 52, 32,111,117,116, 99,111,108, 41, 10,123, 10,  9,111,117,116, 99,111,108, 46,120,121,122, 32, 61,
+ 32,109,105,120, 40, 99,111,108, 46,120,121,122, 44, 32,118,101, 99, 51, 40, 49, 46, 48, 44, 32, 49, 46, 48, 44, 32, 49, 46, 48,
+ 41, 32, 45, 32, 99,111,108, 46,120,121,122, 44, 32,102, 97, 99, 41, 59, 10,  9,111,117,116, 99,111,108, 46,119, 32, 61, 32, 99,
+111,108, 46,119, 59, 10,125, 10, 10,118,111,105,100, 32,104,117,101, 95,115, 97,116, 40,102,108,111, 97,116, 32,104,117,101, 44,
+ 32,102,108,111, 97,116, 32,115, 97,116, 44, 32,102,108,111, 97,116, 32,118, 97,108,117,101, 44, 32,102,108,111, 97,116, 32,102,
+ 97, 99, 44, 32,118,101, 99, 52, 32, 99,111,108, 44, 32,111,117,116, 32,118,101, 99, 52, 32,111,117,116, 99,111,108, 41, 10,123,
+ 10,  9,118,101, 99, 52, 32,104,115,118, 59, 10, 10,  9,114,103, 98, 95,116,111, 95,104,115,118, 40, 99,111,108, 44, 32,104,115,
+118, 41, 59, 10, 10,  9,104,115,118, 91, 48, 93, 32, 43, 61, 32, 40,104,117,101, 32, 45, 32, 48, 46, 53, 41, 59, 10,  9,105,102,
+ 40,104,115,118, 91, 48, 93, 62, 49, 46, 48, 41, 32,104,115,118, 91, 48, 93, 45, 61, 49, 46, 48, 59, 32,101,108,115,101, 32,105,
+102, 40,104,115,118, 91, 48, 93, 60, 48, 46, 48, 41, 32,104,115,118, 91, 48, 93, 43, 61, 32, 49, 46, 48, 59, 10,  9,104,115,118,
+ 91, 49, 93, 32, 42, 61, 32,115, 97,116, 59, 10,  9,105,102, 40,104,115,118, 91, 49, 93, 62, 49, 46, 48, 41, 32,104,115,118, 91,
+ 49, 93, 61, 32, 49, 46, 48, 59, 32,101,108,115,101, 32,105,102, 40,104,115,118, 91, 49, 93, 60, 48, 46, 48, 41, 32,104,115,118,
+ 91, 49, 93, 61, 32, 48, 46, 48, 59, 10,  9,104,115,118, 91, 50, 93, 32, 42, 61, 32,118, 97,108,117,101, 59, 10,  9,105,102, 40,
+104,115,118, 91, 50, 93, 62, 49, 46, 48, 41, 32,104,115,118, 91, 50, 93, 61, 32, 49, 46, 48, 59, 32,101,108,115,101, 32,105,102,
+ 40,104,115,118, 91, 50, 93, 60, 48, 46, 48, 41, 32,104,115,118, 91, 50, 93, 61, 32, 48, 46, 48, 59, 10, 10,  9,104,115,118, 95,
+116,111, 95,114,103, 98, 40,104,115,118, 44, 32,111,117,116, 99,111,108, 41, 59, 10, 10,  9,111,117,116, 99,111,108, 32, 61, 32,
+109,105,120, 40, 99,111,108, 44, 32,111,117,116, 99,111,108, 44, 32,102, 97, 99, 41, 59, 10,125, 10, 10,118,111,105,100, 32,115,
+101,112, 97,114, 97,116,101, 95,114,103, 98, 40,118,101, 99, 52, 32, 99,111,108, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,
+114, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,103, 44, 32,111,117,116, 32,102,108,111, 97,116, 32, 98, 41, 10,123, 10,  9,
+114, 32, 61, 32, 99,111,108, 46,114, 59, 10,  9,103, 32, 61, 32, 99,111,108, 46,103, 59, 10,  9, 98, 32, 61, 32, 99,111,108, 46,
+ 98, 59, 10,125, 10, 10,118,111,105,100, 32, 99,111,109, 98,105,110,101, 95,114,103, 98, 40,102,108,111, 97,116, 32,114, 44, 32,
+102,108,111, 97,116, 32,103, 44, 32,102,108,111, 97,116, 32, 98, 44, 32,111,117,116, 32,118,101, 99, 52, 32, 99,111,108, 41, 10,
+123, 10,  9, 99,111,108, 32, 61, 32,118,101, 99, 52, 40,114, 44, 32,103, 44, 32, 98, 44, 32, 49, 46, 48, 41, 59, 10,125, 10, 10,
+118,111,105,100, 32,111,117,116,112,117,116, 95,110,111,100,101, 40,118,101, 99, 52, 32,114,103, 98, 44, 32,102,108,111, 97,116,
+ 32, 97,108,112,104, 97, 44, 32,111,117,116, 32,118,101, 99, 52, 32,111,117,116,114,103, 98, 41, 10,123, 10,  9,111,117,116,114,
+103, 98, 32, 61, 32,118,101, 99, 52, 40,114,103, 98, 46,114,103, 98, 44, 32, 97,108,112,104, 97, 41, 59, 10,125, 10, 10, 47, 42,
+ 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 32, 84, 69, 88, 84, 85, 82, 69, 83, 32, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42,
+ 42, 42, 42, 47, 10, 10,118,111,105,100, 32,116,101,120,116,117,114,101, 95,102,108,105,112, 95, 98,108,101,110,100, 40,118,101,
+ 99, 51, 32,118,101, 99, 44, 32,111,117,116, 32,118,101, 99, 51, 32,111,117,116,118,101, 99, 41, 10,123, 10,  9,111,117,116,118,
+101, 99, 32, 61, 32,118,101, 99, 46,121,120,122, 59, 10,125, 10, 10,118,111,105,100, 32,116,101,120,116,117,114,101, 95, 98,108,
+101,110,100, 95,108,105,110, 40,118,101, 99, 51, 32,118,101, 99, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,111,117,116,118,
+ 97,108, 41, 10,123, 10,  9,111,117,116,118, 97,108, 32, 61, 32, 40, 49, 46, 48, 43,118,101, 99, 46,120, 41, 47, 50, 46, 48, 59,
+ 10,125, 10, 10,118,111,105,100, 32,116,101,120,116,117,114,101, 95, 98,108,101,110,100, 95,113,117, 97,100, 40,118,101, 99, 51,
+ 32,118,101, 99, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,111,117,116,118, 97,108, 41, 10,123, 10,  9,111,117,116,118, 97,
+108, 32, 61, 32,109, 97,120, 40, 40, 49, 46, 48, 43,118,101, 99, 46,120, 41, 47, 50, 46, 48, 44, 32, 48, 46, 48, 41, 59, 10,  9,
+111,117,116,118, 97,108, 32, 42, 61, 32,111,117,116,118, 97,108, 59, 10,125, 10, 10,118,111,105,100, 32,116,101,120,116,117,114,
+101, 95,119,111,111,100, 95,115,105,110, 40,118,101, 99, 51, 32,118,101, 99, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,118,
+ 97,108,117,101, 44, 32,111,117,116, 32,118,101, 99, 52, 32, 99,111,108,111,114, 44, 32,111,117,116, 32,118,101, 99, 51, 32,110,
+111,114,109, 97,108, 41, 10,123, 10,  9,102,108,111, 97,116, 32, 97, 32, 61, 32,115,113,114,116, 40,118,101, 99, 46,120, 42,118,
+101, 99, 46,120, 32, 43, 32,118,101, 99, 46,121, 42,118,101, 99, 46,121, 32, 43, 32,118,101, 99, 46,122, 42,118,101, 99, 46,122,
+ 41, 42, 50, 48, 46, 48, 59, 10,  9,102,108,111, 97,116, 32,119,105, 32, 61, 32, 48, 46, 53, 32, 43, 32, 48, 46, 53, 42,115,105,
+110, 40, 97, 41, 59, 10, 10,  9,118, 97,108,117,101, 32, 61, 32,119,105, 59, 10,  9, 99,111,108,111,114, 32, 61, 32,118,101, 99,
+ 52, 40,119,105, 44, 32,119,105, 44, 32,119,105, 44, 32, 49, 46, 48, 41, 59, 10,  9,110,111,114,109, 97,108, 32, 61, 32,118,101,
+ 99, 51, 40, 48, 46, 48, 44, 32, 48, 46, 48, 44, 32, 48, 46, 48, 41, 59, 10,125, 10, 10,118,111,105,100, 32,116,101,120,116,117,
+114,101, 95,105,109, 97,103,101, 40,118,101, 99, 51, 32,118,101, 99, 44, 32,115, 97,109,112,108,101,114, 50, 68, 32,105,109, 97,
+ 44, 32,111,117,116, 32,102,108,111, 97,116, 32,118, 97,108,117,101, 44, 32,111,117,116, 32,118,101, 99, 52, 32, 99,111,108,111,
+114, 44, 32,111,117,116, 32,118,101, 99, 51, 32,110,111,114,109, 97,108, 41, 10,123, 10,  9, 99,111,108,111,114, 32, 61, 32,116,
+101,120,116,117,114,101, 50, 68, 40,105,109, 97, 44, 32, 40,118,101, 99, 46,120,121, 32, 43, 32,118,101, 99, 50, 40, 49, 46, 48,
+ 44, 32, 49, 46, 48, 41, 41, 42, 48, 46, 53, 41, 59, 10,  9,118, 97,108,117,101, 32, 61, 32, 49, 46, 48, 59, 10, 10,  9,110,111,
+114,109, 97,108, 46,120, 32, 61, 32, 50, 46, 48, 42, 40, 99,111,108,111,114, 46,114, 32, 45, 32, 48, 46, 53, 41, 59, 10,  9,110,
+111,114,109, 97,108, 46,121, 32, 61, 32, 50, 46, 48, 42, 40, 48, 46, 53, 32, 45, 32, 99,111,108,111,114, 46,103, 41, 59, 10,  9,
+110,111,114,109, 97,108, 46,122, 32, 61, 32, 50, 46, 48, 42, 40, 99,111,108,111,114, 46, 98, 32, 45, 32, 48, 46, 53, 41, 59, 10,
+125, 10, 10, 47, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 32, 77, 84, 69, 88, 32, 42, 42, 42, 42, 42, 42, 42, 42, 42,
+ 42, 42, 42, 42, 42, 42, 42, 42, 47, 10, 10,118,111,105,100, 32,116,101,120, 99,111, 95,111,114, 99,111, 40,118,101, 99, 51, 32,
+ 97,116,116,111,114, 99,111, 44, 32,111,117,116, 32,118,101, 99, 51, 32,111,114, 99,111, 41, 10,123, 10,  9,111,114, 99,111, 32,
+ 61, 32, 97,116,116,111,114, 99,111, 59, 10,125, 10, 10,118,111,105,100, 32,116,101,120, 99,111, 95,117,118, 40,118,101, 99, 50,
+ 32, 97,116,116,117,118, 44, 32,111,117,116, 32,118,101, 99, 51, 32,117,118, 41, 10,123, 10,  9, 47, 42, 32,100,105,115, 97, 98,
+108,101,100, 32,102,111,114, 32,110,111,119, 44, 32,119,111,114,107,115, 32,116,111,103,101,116,104,101,114, 32,119,105,116,104,
+ 32,108,101, 97,118,105,110,103, 32,111,117,116, 32,109,116,101,120, 95, 50,100, 95,109, 97,112,112,105,110,103, 10,  9, 32, 32,
+ 32,117,118, 32, 61, 32,118,101, 99, 51, 40, 97,116,116,117,118, 42, 50, 46, 48, 32, 45, 32,118,101, 99, 50, 40, 49, 46, 48, 44,
+ 32, 49, 46, 48, 41, 44, 32, 48, 46, 48, 41, 59, 32, 42, 47, 10,  9,117,118, 32, 61, 32,118,101, 99, 51, 40, 97,116,116,117,118,
+ 44, 32, 48, 46, 48, 41, 59, 10,125, 10, 10,118,111,105,100, 32,116,101,120, 99,111, 95,110,111,114,109, 40,118,101, 99, 51, 32,
+110,111,114,109, 97,108, 44, 32,111,117,116, 32,118,101, 99, 51, 32,111,117,116,110,111,114,109, 97,108, 41, 10,123, 10,  9, 47,
+ 42, 32, 99,111,114,114,101,115,112,111,110,100,115, 32,116,111, 32,115,104,105, 45, 62,111,114,110, 44, 32,119,104,105, 99,104,
+ 32,105,115, 32,110,101,103, 97,116,101,100, 32,115,111, 32, 99, 97,110, 99,101,108,115, 10,  9, 32, 32, 32,111,117,116, 32, 98,
+108,101,110,100,101,114, 32,110,111,114,109, 97,108, 32,110,101,103, 97,116,105,111,110, 32, 42, 47, 10,  9,111,117,116,110,111,
+114,109, 97,108, 32, 61, 32,110,111,114,109, 97,108,105,122,101, 40,110,111,114,109, 97,108, 41, 59, 10,125, 10, 10,118,111,105,
+100, 32,116,101,120, 99,111, 95,116, 97,110,103,101,110,116, 40,118,101, 99, 51, 32,116, 97,110,103,101,110,116, 44, 32,111,117,
+116, 32,118,101, 99, 51, 32,111,117,116,116, 97,110,103,101,110,116, 41, 10,123, 10,  9,111,117,116,116, 97,110,103,101,110,116,
+ 32, 61, 32,110,111,114,109, 97,108,105,122,101, 40,116, 97,110,103,101,110,116, 41, 59, 10,125, 10, 10,118,111,105,100, 32,116,
+101,120, 99,111, 95,103,108,111, 98, 97,108, 40,109, 97,116, 52, 32,118,105,101,119,105,110,118,109, 97,116, 44, 32,118,101, 99,
+ 51, 32, 99,111, 44, 32,111,117,116, 32,118,101, 99, 51, 32,103,108,111, 98, 97,108, 41, 10,123, 10,  9,103,108,111, 98, 97,108,
+ 32, 61, 32, 40,118,105,101,119,105,110,118,109, 97,116, 42,118,101, 99, 52, 40, 99,111, 44, 32, 49, 46, 48, 41, 41, 46,120,121,
+122, 59, 10,125, 10, 10,118,111,105,100, 32,116,101,120, 99,111, 95,111, 98,106,101, 99,116, 40,109, 97,116, 52, 32,118,105,101,
+119,105,110,118,109, 97,116, 44, 32,109, 97,116, 52, 32,111, 98,105,110,118,109, 97,116, 44, 32,118,101, 99, 51, 32, 99,111, 44,
+ 32,111,117,116, 32,118,101, 99, 51, 32,111, 98,106,101, 99,116, 41, 10,123, 10,  9,111, 98,106,101, 99,116, 32, 61, 32, 40,111,
+ 98,105,110,118,109, 97,116, 42, 40,118,105,101,119,105,110,118,109, 97,116, 42,118,101, 99, 52, 40, 99,111, 44, 32, 49, 46, 48,
+ 41, 41, 41, 46,120,121,122, 59, 10,125, 10, 10,118,111,105,100, 32,116,101,120, 99,111, 95,114,101,102,108, 40,118,101, 99, 51,
+ 32,118,110, 44, 32,118,101, 99, 51, 32,118,105,101,119, 44, 32,111,117,116, 32,118,101, 99, 51, 32,114,101,102, 41, 10,123, 10,
+  9,114,101,102, 32, 61, 32,118,105,101,119, 32, 45, 32, 50, 46, 48, 42,100,111,116, 40,118,110, 44, 32,118,105,101,119, 41, 42,
+118,110, 59, 10,125, 10, 10,118,111,105,100, 32,115,104, 97,100,101, 95,110,111,114,109, 40,118,101, 99, 51, 32,110,111,114,109,
+ 97,108, 44, 32,111,117,116, 32,118,101, 99, 51, 32,111,117,116,110,111,114,109, 97,108, 41, 10,123, 10,  9, 47, 42, 32, 98,108,
+101,110,100,101,114, 32,114,101,110,100,101,114, 32,110,111,114,109, 97,108, 32,105,115, 32,110,101,103, 97,116,101,100, 32, 42,
+ 47, 10,  9,111,117,116,110,111,114,109, 97,108, 32, 61, 32, 45,110,111,114,109, 97,108,105,122,101, 40,110,111,114,109, 97,108,
+ 41, 59, 10,125, 10, 10,118,111,105,100, 32,109,116,101,120, 95,114,103, 98, 95, 98,108,101,110,100, 40,118,101, 99, 51, 32,111,
+117,116, 99,111,108, 44, 32,118,101, 99, 51, 32,116,101,120, 99,111,108, 44, 32,102,108,111, 97,116, 32,102, 97, 99,116, 44, 32,
+102,108,111, 97,116, 32,102, 97, 99,103, 44, 32,111,117,116, 32,118,101, 99, 51, 32,105,110, 99,111,108, 41, 10,123, 10,  9,102,
+108,111, 97,116, 32,102, 97, 99,109, 59, 10, 10,  9,102, 97, 99,116, 32, 42, 61, 32,102, 97, 99,103, 59, 10,  9,102, 97, 99,109,
+ 32, 61, 32, 49, 46, 48, 45,102, 97, 99,116, 59, 10, 10,  9,105,110, 99,111,108, 32, 61, 32,102, 97, 99,116, 42,116,101,120, 99,
+111,108, 32, 43, 32,102, 97, 99,109, 42,111,117,116, 99,111,108, 59, 10,125, 10, 10,118,111,105,100, 32,109,116,101,120, 95,114,
+103, 98, 95,109,117,108, 40,118,101, 99, 51, 32,111,117,116, 99,111,108, 44, 32,118,101, 99, 51, 32,116,101,120, 99,111,108, 44,
+ 32,102,108,111, 97,116, 32,102, 97, 99,116, 44, 32,102,108,111, 97,116, 32,102, 97, 99,103, 44, 32,111,117,116, 32,118,101, 99,
+ 51, 32,105,110, 99,111,108, 41, 10,123, 10,  9,102,108,111, 97,116, 32,102, 97, 99,109, 59, 10, 10,  9,102, 97, 99,116, 32, 42,
+ 61, 32,102, 97, 99,103, 59, 10,  9,102, 97, 99,109, 32, 61, 32, 49, 46, 48, 45,102, 97, 99,103, 59, 10, 10,  9,105,110, 99,111,
+108, 32, 61, 32, 40,102, 97, 99,109, 32, 43, 32,102, 97, 99,116, 42,116,101,120, 99,111,108, 41, 42,111,117,116, 99,111,108, 59,
+ 10,125, 10, 10,118,111,105,100, 32,109,116,101,120, 95,114,103, 98, 95,115, 99,114,101,101,110, 40,118,101, 99, 51, 32,111,117,
+116, 99,111,108, 44, 32,118,101, 99, 51, 32,116,101,120, 99,111,108, 44, 32,102,108,111, 97,116, 32,102, 97, 99,116, 44, 32,102,
+108,111, 97,116, 32,102, 97, 99,103, 44, 32,111,117,116, 32,118,101, 99, 51, 32,105,110, 99,111,108, 41, 10,123, 10,  9,102,108,
+111, 97,116, 32,102, 97, 99,109, 59, 10, 10,  9,102, 97, 99,116, 32, 42, 61, 32,102, 97, 99,103, 59, 10,  9,102, 97, 99,109, 32,
+ 61, 32, 49, 46, 48, 45,102, 97, 99,103, 59, 10, 10,  9,105,110, 99,111,108, 32, 61, 32,118,101, 99, 51, 40, 49, 46, 48, 41, 32,
+ 45, 32, 40,118,101, 99, 51, 40,102, 97, 99,109, 41, 32, 43, 32,102, 97, 99,116, 42, 40,118,101, 99, 51, 40, 49, 46, 48, 41, 32,
+ 45, 32,116,101,120, 99,111,108, 41, 41, 42, 40,118,101, 99, 51, 40, 49, 46, 48, 41, 32, 45, 32,111,117,116, 99,111,108, 41, 59,
+ 10,125, 10, 10,118,111,105,100, 32,109,116,101,120, 95,114,103, 98, 95,111,118,101,114,108, 97,121, 40,118,101, 99, 51, 32,111,
+117,116, 99,111,108, 44, 32,118,101, 99, 51, 32,116,101,120, 99,111,108, 44, 32,102,108,111, 97,116, 32,102, 97, 99,116, 44, 32,
+102,108,111, 97,116, 32,102, 97, 99,103, 44, 32,111,117,116, 32,118,101, 99, 51, 32,105,110, 99,111,108, 41, 10,123, 10,  9,102,
+108,111, 97,116, 32,102, 97, 99,109, 59, 10, 10,  9,102, 97, 99,116, 32, 42, 61, 32,102, 97, 99,103, 59, 10,  9,102, 97, 99,109,
+ 32, 61, 32, 49, 46, 48, 45,102, 97, 99,103, 59, 10, 10,  9,105,102, 40,111,117,116, 99,111,108, 46,114, 32, 60, 32, 48, 46, 53,
+ 41, 10,  9,  9,105,110, 99,111,108, 46,114, 32, 61, 32,111,117,116, 99,111,108, 46,114, 42, 40,102, 97, 99,109, 32, 43, 32, 50,
+ 46, 48, 42,102, 97, 99,116, 42,116,101,120, 99,111,108, 46,114, 41, 59, 10,  9,101,108,115,101, 10,  9,  9,105,110, 99,111,108,
+ 46,114, 32, 61, 32, 49, 46, 48, 32, 45, 32, 40,102, 97, 99,109, 32, 43, 32, 50, 46, 48, 42,102, 97, 99,116, 42, 40, 49, 46, 48,
+ 32, 45, 32,116,101,120, 99,111,108, 46,114, 41, 41, 42, 40, 49, 46, 48, 32, 45, 32,111,117,116, 99,111,108, 46,114, 41, 59, 10,
+ 10,  9,105,102, 40,111,117,116, 99,111,108, 46,103, 32, 60, 32, 48, 46, 53, 41, 10,  9,  9,105,110, 99,111,108, 46,103, 32, 61,
+ 32,111,117,116, 99,111,108, 46,103, 42, 40,102, 97, 99,109, 32, 43, 32, 50, 46, 48, 42,102, 97, 99,116, 42,116,101,120, 99,111,
+108, 46,103, 41, 59, 10,  9,101,108,115,101, 10,  9,  9,105,110, 99,111,108, 46,103, 32, 61, 32, 49, 46, 48, 32, 45, 32, 40,102,
+ 97, 99,109, 32, 43, 32, 50, 46, 48, 42,102, 97, 99,116, 42, 40, 49, 46, 48, 32, 45, 32,116,101,120, 99,111,108, 46,103, 41, 41,
+ 42, 40, 49, 46, 48, 32, 45, 32,111,117,116, 99,111,108, 46,103, 41, 59, 10, 10,  9,105,102, 40,111,117,116, 99,111,108, 46, 98,
+ 32, 60, 32, 48, 46, 53, 41, 10,  9,  9,105,110, 99,111,108, 46, 98, 32, 61, 32,111,117,116, 99,111,108, 46, 98, 42, 40,102, 97,
+ 99,109, 32, 43, 32, 50, 46, 48, 42,102, 97, 99,116, 42,116,101,120, 99,111,108, 46, 98, 41, 59, 10,  9,101,108,115,101, 10,  9,
+  9,105,110, 99,111,108, 46, 98, 32, 61, 32, 49, 46, 48, 32, 45, 32, 40,102, 97, 99,109, 32, 43, 32, 50, 46, 48, 42,102, 97, 99,
+116, 42, 40, 49, 46, 48, 32, 45, 32,116,101,120, 99,111,108, 46, 98, 41, 41, 42, 40, 49, 46, 48, 32, 45, 32,111,117,116, 99,111,
+108, 46, 98, 41, 59, 10,125, 10, 10,118,111,105,100, 32,109,116,101,120, 95,114,103, 98, 95,115,117, 98, 40,118,101, 99, 51, 32,
+111,117,116, 99,111,108, 44, 32,118,101, 99, 51, 32,116,101,120, 99,111,108, 44, 32,102,108,111, 97,116, 32,102, 97, 99,116, 44,
+ 32,102,108,111, 97,116, 32,102, 97, 99,103, 44, 32,111,117,116, 32,118,101, 99, 51, 32,105,110, 99,111,108, 41, 10,123, 10,  9,
+105,110, 99,111,108, 32, 61, 32, 45,102, 97, 99,116, 42,102, 97, 99,103, 42,116,101,120, 99,111,108, 32, 43, 32,111,117,116, 99,
+111,108, 59, 10,125, 10, 10,118,111,105,100, 32,109,116,101,120, 95,114,103, 98, 95, 97,100,100, 40,118,101, 99, 51, 32,111,117,
+116, 99,111,108, 44, 32,118,101, 99, 51, 32,116,101,120, 99,111,108, 44, 32,102,108,111, 97,116, 32,102, 97, 99,116, 44, 32,102,
+108,111, 97,116, 32,102, 97, 99,103, 44, 32,111,117,116, 32,118,101, 99, 51, 32,105,110, 99,111,108, 41, 10,123, 10,  9,105,110,
+ 99,111,108, 32, 61, 32,102, 97, 99,116, 42,102, 97, 99,103, 42,116,101,120, 99,111,108, 32, 43, 32,111,117,116, 99,111,108, 59,
+ 10,125, 10, 10,118,111,105,100, 32,109,116,101,120, 95,114,103, 98, 95,100,105,118, 40,118,101, 99, 51, 32,111,117,116, 99,111,
+108, 44, 32,118,101, 99, 51, 32,116,101,120, 99,111,108, 44, 32,102,108,111, 97,116, 32,102, 97, 99,116, 44, 32,102,108,111, 97,
+116, 32,102, 97, 99,103, 44, 32,111,117,116, 32,118,101, 99, 51, 32,105,110, 99,111,108, 41, 10,123, 10,  9,102,108,111, 97,116,
+ 32,102, 97, 99,109, 59, 10, 10,  9,102, 97, 99,116, 32, 42, 61, 32,102, 97, 99,103, 59, 10,  9,102, 97, 99,109, 32, 61, 32, 49,
+ 46, 48, 45,102, 97, 99,116, 59, 10, 10,  9,105,102, 40,116,101,120, 99,111,108, 46,114, 32, 33, 61, 32, 48, 46, 48, 41, 32,105,
+110, 99,111,108, 46,114, 32, 61, 32,102, 97, 99,109, 42,111,117,116, 99,111,108, 46,114, 32, 43, 32,102, 97, 99,116, 42,111,117,
+116, 99,111,108, 46,114, 47,116,101,120, 99,111,108, 46,114, 59, 10,  9,105,102, 40,116,101,120, 99,111,108, 46,103, 32, 33, 61,
+ 32, 48, 46, 48, 41, 32,105,110, 99,111,108, 46,103, 32, 61, 32,102, 97, 99,109, 42,111,117,116, 99,111,108, 46,103, 32, 43, 32,
+102, 97, 99,116, 42,111,117,116, 99,111,108, 46,103, 47,116,101,120, 99,111,108, 46,103, 59, 10,  9,105,102, 40,116,101,120, 99,
+111,108, 46, 98, 32, 33, 61, 32, 48, 46, 48, 41, 32,105,110, 99,111,108, 46, 98, 32, 61, 32,102, 97, 99,109, 42,111,117,116, 99,
+111,108, 46, 98, 32, 43, 32,102, 97, 99,116, 42,111,117,116, 99,111,108, 46, 98, 47,116,101,120, 99,111,108, 46, 98, 59, 10,125,
+ 10, 10,118,111,105,100, 32,109,116,101,120, 95,114,103, 98, 95,100,105,102,102, 40,118,101, 99, 51, 32,111,117,116, 99,111,108,
+ 44, 32,118,101, 99, 51, 32,116,101,120, 99,111,108, 44, 32,102,108,111, 97,116, 32,102, 97, 99,116, 44, 32,102,108,111, 97,116,
+ 32,102, 97, 99,103, 44, 32,111,117,116, 32,118,101, 99, 51, 32,105,110, 99,111,108, 41, 10,123, 10,  9,102,108,111, 97,116, 32,
+102, 97, 99,109, 59, 10, 10,  9,102, 97, 99,116, 32, 42, 61, 32,102, 97, 99,103, 59, 10,  9,102, 97, 99,109, 32, 61, 32, 49, 46,
+ 48, 45,102, 97, 99,116, 59, 10, 10,  9,105,110, 99,111,108, 32, 61, 32,102, 97, 99,109, 42,111,117,116, 99,111,108, 32, 43, 32,
+102, 97, 99,116, 42, 97, 98,115, 40,116,101,120, 99,111,108, 32, 45, 32,111,117,116, 99,111,108, 41, 59, 10,125, 10, 10,118,111,
+105,100, 32,109,116,101,120, 95,114,103, 98, 95,100, 97,114,107, 40,118,101, 99, 51, 32,111,117,116, 99,111,108, 44, 32,118,101,
+ 99, 51, 32,116,101,120, 99,111,108, 44, 32,102,108,111, 97,116, 32,102, 97, 99,116, 44, 32,102,108,111, 97,116, 32,102, 97, 99,
+103, 44, 32,111,117,116, 32,118,101, 99, 51, 32,105,110, 99,111,108, 41, 10,123, 10,  9,102,108,111, 97,116, 32,102, 97, 99,109,
+ 44, 32, 99,111,108, 59, 10, 10,  9,102, 97, 99,116, 32, 42, 61, 32,102, 97, 99,103, 59, 10,  9,102, 97, 99,109, 32, 61, 32, 49,
+ 46, 48, 45,102, 97, 99,116, 59, 10, 10,  9, 99,111,108, 32, 61, 32,102, 97, 99,116, 42,116,101,120, 99,111,108, 46,114, 59, 10,
+  9,105,102, 40, 99,111,108, 32, 60, 32,111,117,116, 99,111,108, 46,114, 41, 32,105,110, 99,111,108, 46,114, 32, 61, 32, 99,111,
+108, 59, 32,101,108,115,101, 32,105,110, 99,111,108, 46,114, 32, 61, 32,111,117,116, 99,111,108, 46,114, 59, 10,  9, 99,111,108,
+ 32, 61, 32,102, 97, 99,116, 42,116,101,120, 99,111,108, 46,103, 59, 10,  9,105,102, 40, 99,111,108, 32, 60, 32,111,117,116, 99,
+111,108, 46,103, 41, 32,105,110, 99,111,108, 46,103, 32, 61, 32, 99,111,108, 59, 32,101,108,115,101, 32,105,110, 99,111,108, 46,
+103, 32, 61, 32,111,117,116, 99,111,108, 46,103, 59, 10,  9, 99,111,108, 32, 61, 32,102, 97, 99,116, 42,116,101,120, 99,111,108,
+ 46, 98, 59, 10,  9,105,102, 40, 99,111,108, 32, 60, 32,111,117,116, 99,111,108, 46, 98, 41, 32,105,110, 99,111,108, 46, 98, 32,
+ 61, 32, 99,111,108, 59, 32,101,108,115,101, 32,105,110, 99,111,108, 46, 98, 32, 61, 32,111,117,116, 99,111,108, 46, 98, 59, 10,
+125, 10, 10,118,111,105,100, 32,109,116,101,120, 95,114,103, 98, 95,108,105,103,104,116, 40,118,101, 99, 51, 32,111,117,116, 99,
+111,108, 44, 32,118,101, 99, 51, 32,116,101,120, 99,111,108, 44, 32,102,108,111, 97,116, 32,102, 97, 99,116, 44, 32,102,108,111,
+ 97,116, 32,102, 97, 99,103, 44, 32,111,117,116, 32,118,101, 99, 51, 32,105,110, 99,111,108, 41, 10,123, 10,  9,102,108,111, 97,
+116, 32,102, 97, 99,109, 44, 32, 99,111,108, 59, 10, 10,  9,102, 97, 99,116, 32, 42, 61, 32,102, 97, 99,103, 59, 10,  9,102, 97,
+ 99,109, 32, 61, 32, 49, 46, 48, 45,102, 97, 99,116, 59, 10, 10,  9, 99,111,108, 32, 61, 32,102, 97, 99,116, 42,116,101,120, 99,
+111,108, 46,114, 59, 10,  9,105,102, 40, 99,111,108, 32, 62, 32,111,117,116, 99,111,108, 46,114, 41, 32,105,110, 99,111,108, 46,
+114, 32, 61, 32, 99,111,108, 59, 32,101,108,115,101, 32,105,110, 99,111,108, 46,114, 32, 61, 32,111,117,116, 99,111,108, 46,114,
+ 59, 10,  9, 99,111,108, 32, 61, 32,102, 97, 99,116, 42,116,101,120, 99,111,108, 46,103, 59, 10,  9,105,102, 40, 99,111,108, 32,
+ 62, 32,111,117,116, 99,111,108, 46,103, 41, 32,105,110, 99,111,108, 46,103, 32, 61, 32, 99,111,108, 59, 32,101,108,115,101, 32,
+105,110, 99,111,108, 46,103, 32, 61, 32,111,117,116, 99,111,108, 46,103, 59, 10,  9, 99,111,108, 32, 61, 32,102, 97, 99,116, 42,
+116,101,120, 99,111,108, 46, 98, 59, 10,  9,105,102, 40, 99,111,108, 32, 62, 32,111,117,116, 99,111,108, 46, 98, 41, 32,105,110,
+ 99,111,108, 46, 98, 32, 61, 32, 99,111,108, 59, 32,101,108,115,101, 32,105,110, 99,111,108, 46, 98, 32, 61, 32,111,117,116, 99,
+111,108, 46, 98, 59, 10,125, 10, 10,118,111,105,100, 32,109,116,101,120, 95,114,103, 98, 95,104,117,101, 40,118,101, 99, 51, 32,
+111,117,116, 99,111,108, 44, 32,118,101, 99, 51, 32,116,101,120, 99,111,108, 44, 32,102,108,111, 97,116, 32,102, 97, 99,116, 44,
+ 32,102,108,111, 97,116, 32,102, 97, 99,103, 44, 32,111,117,116, 32,118,101, 99, 51, 32,105,110, 99,111,108, 41, 10,123, 10,  9,
+118,101, 99, 52, 32, 99,111,108, 59, 10, 10,  9,109,105,120, 95,104,117,101, 40,102, 97, 99,116, 42,102, 97, 99,103, 44, 32,118,
+101, 99, 52, 40,111,117,116, 99,111,108, 44, 32, 49, 46, 48, 41, 44, 32,118,101, 99, 52, 40,116,101,120, 99,111,108, 44, 32, 49,
+ 46, 48, 41, 44, 32, 99,111,108, 41, 59, 10,  9,105,110, 99,111,108, 46,114,103, 98, 32, 61, 32, 99,111,108, 46,114,103, 98, 59,
+ 10,125, 10, 10,118,111,105,100, 32,109,116,101,120, 95,114,103, 98, 95,115, 97,116, 40,118,101, 99, 51, 32,111,117,116, 99,111,
+108, 44, 32,118,101, 99, 51, 32,116,101,120, 99,111,108, 44, 32,102,108,111, 97,116, 32,102, 97, 99,116, 44, 32,102,108,111, 97,
+116, 32,102, 97, 99,103, 44, 32,111,117,116, 32,118,101, 99, 51, 32,105,110, 99,111,108, 41, 10,123, 10,  9,118,101, 99, 52, 32,
+ 99,111,108, 59, 10, 10,  9,109,105,120, 95,115, 97,116, 40,102, 97, 99,116, 42,102, 97, 99,103, 44, 32,118,101, 99, 52, 40,111,
+117,116, 99,111,108, 44, 32, 49, 46, 48, 41, 44, 32,118,101, 99, 52, 40,116,101,120, 99,111,108, 44, 32, 49, 46, 48, 41, 44, 32,
+ 99,111,108, 41, 59, 10,  9,105,110, 99,111,108, 46,114,103, 98, 32, 61, 32, 99,111,108, 46,114,103, 98, 59, 10,125, 10, 10,118,
+111,105,100, 32,109,116,101,120, 95,114,103, 98, 95,118, 97,108, 40,118,101, 99, 51, 32,111,117,116, 99,111,108, 44, 32,118,101,
+ 99, 51, 32,116,101,120, 99,111,108, 44, 32,102,108,111, 97,116, 32,102, 97, 99,116, 44, 32,102,108,111, 97,116, 32,102, 97, 99,
+103, 44, 32,111,117,116, 32,118,101, 99, 51, 32,105,110, 99,111,108, 41, 10,123, 10,  9,118,101, 99, 52, 32, 99,111,108, 59, 10,
+ 10,  9,109,105,120, 95,118, 97,108, 40,102, 97, 99,116, 42,102, 97, 99,103, 44, 32,118,101, 99, 52, 40,111,117,116, 99,111,108,
+ 44, 32, 49, 46, 48, 41, 44, 32,118,101, 99, 52, 40,116,101,120, 99,111,108, 44, 32, 49, 46, 48, 41, 44, 32, 99,111,108, 41, 59,
+ 10,  9,105,110, 99,111,108, 46,114,103, 98, 32, 61, 32, 99,111,108, 46,114,103, 98, 59, 10,125, 10, 10,118,111,105,100, 32,109,
+116,101,120, 95,114,103, 98, 95, 99,111,108,111,114, 40,118,101, 99, 51, 32,111,117,116, 99,111,108, 44, 32,118,101, 99, 51, 32,
+116,101,120, 99,111,108, 44, 32,102,108,111, 97,116, 32,102, 97, 99,116, 44, 32,102,108,111, 97,116, 32,102, 97, 99,103, 44, 32,
+111,117,116, 32,118,101, 99, 51, 32,105,110, 99,111,108, 41, 10,123, 10,  9,118,101, 99, 52, 32, 99,111,108, 59, 10, 10,  9,109,
+105,120, 95, 99,111,108,111,114, 40,102, 97, 99,116, 42,102, 97, 99,103, 44, 32,118,101, 99, 52, 40,111,117,116, 99,111,108, 44,
+ 32, 49, 46, 48, 41, 44, 32,118,101, 99, 52, 40,116,101,120, 99,111,108, 44, 32, 49, 46, 48, 41, 44, 32, 99,111,108, 41, 59, 10,
+  9,105,110, 99,111,108, 46,114,103, 98, 32, 61, 32, 99,111,108, 46,114,103, 98, 59, 10,125, 10, 10,118,111,105,100, 32,109,116,
+101,120, 95,118, 97,108,117,101, 95,118, 97,114,115, 40,105,110,111,117,116, 32,102,108,111, 97,116, 32,102, 97, 99,116, 44, 32,
+102,108,111, 97,116, 32,102, 97, 99,103, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,102, 97, 99,109, 44, 32,102,108,111, 97,
+116, 32,102,108,105,112, 41, 10,123, 10,  9,102, 97, 99,116, 32, 42, 61, 32,102, 97, 99,103, 59, 10,  9,102, 97, 99,109, 32, 61,
+ 32, 49, 46, 48, 45,102, 97, 99,116, 59, 10, 10,  9,105,102, 40,102,108,105,112, 32, 33, 61, 32, 48, 46, 48, 41, 32,123, 10,  9,
+  9,102,108,111, 97,116, 32,116,109,112, 32, 61, 32,102, 97, 99,116, 59, 10,  9,  9,102, 97, 99,116, 32, 61, 32,102, 97, 99,109,
+ 59, 10,  9,  9,102, 97, 99,109, 32, 61, 32,116,109,112, 59, 10,  9,125, 10,125, 10, 10,118,111,105,100, 32,109,116,101,120, 95,
+118, 97,108,117,101, 95, 98,108,101,110,100, 40,102,108,111, 97,116, 32,111,117,116, 99,111,108, 44, 32,102,108,111, 97,116, 32,
+116,101,120, 99,111,108, 44, 32,102,108,111, 97,116, 32,102, 97, 99,116, 44, 32,102,108,111, 97,116, 32,102, 97, 99,103, 44, 32,
+102,108,111, 97,116, 32,102,108,105,112, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,105,110, 99,111,108, 41, 10,123, 10,  9,
+102,108,111, 97,116, 32,102, 97, 99,109, 59, 10,  9,109,116,101,120, 95,118, 97,108,117,101, 95,118, 97,114,115, 40,102, 97, 99,
+116, 44, 32,102, 97, 99,103, 44, 32,102, 97, 99,109, 44, 32,102,108,105,112, 41, 59, 10, 10,  9,105,110, 99,111,108, 32, 61, 32,
+102, 97, 99,116, 42,116,101,120, 99,111,108, 32, 43, 32,102, 97, 99,109, 42,111,117,116, 99,111,108, 59, 10,125, 10, 10,118,111,
+105,100, 32,109,116,101,120, 95,118, 97,108,117,101, 95,109,117,108, 40,102,108,111, 97,116, 32,111,117,116, 99,111,108, 44, 32,
+102,108,111, 97,116, 32,116,101,120, 99,111,108, 44, 32,102,108,111, 97,116, 32,102, 97, 99,116, 44, 32,102,108,111, 97,116, 32,
+102, 97, 99,103, 44, 32,102,108,111, 97,116, 32,102,108,105,112, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,105,110, 99,111,
+108, 41, 10,123, 10,  9,102,108,111, 97,116, 32,102, 97, 99,109, 59, 10,  9,109,116,101,120, 95,118, 97,108,117,101, 95,118, 97,
+114,115, 40,102, 97, 99,116, 44, 32,102, 97, 99,103, 44, 32,102, 97, 99,109, 44, 32,102,108,105,112, 41, 59, 10, 10,  9,102, 97,
+ 99,109, 32, 61, 32, 49, 46, 48, 32, 45, 32,102, 97, 99,103, 59, 10,  9,105,110, 99,111,108, 32, 61, 32, 40,102, 97, 99,109, 32,
+ 43, 32,102, 97, 99,116, 42,116,101,120, 99,111,108, 41, 42,111,117,116, 99,111,108, 59, 10,125, 10, 10,118,111,105,100, 32,109,
+116,101,120, 95,118, 97,108,117,101, 95,115, 99,114,101,101,110, 40,102,108,111, 97,116, 32,111,117,116, 99,111,108, 44, 32,102,
+108,111, 97,116, 32,116,101,120, 99,111,108, 44, 32,102,108,111, 97,116, 32,102, 97, 99,116, 44, 32,102,108,111, 97,116, 32,102,
+ 97, 99,103, 44, 32,102,108,111, 97,116, 32,102,108,105,112, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,105,110, 99,111,108,
+ 41, 10,123, 10,  9,102,108,111, 97,116, 32,102, 97, 99,109, 59, 10,  9,109,116,101,120, 95,118, 97,108,117,101, 95,118, 97,114,
+115, 40,102, 97, 99,116, 44, 32,102, 97, 99,103, 44, 32,102, 97, 99,109, 44, 32,102,108,105,112, 41, 59, 10, 10,  9,102, 97, 99,
+109, 32, 61, 32, 49, 46, 48, 32, 45, 32,102, 97, 99,103, 59, 10,  9,105,110, 99,111,108, 32, 61, 32, 49, 46, 48, 32, 45, 32, 40,
+102, 97, 99,109, 32, 43, 32,102, 97, 99,116, 42, 40, 49, 46, 48, 32, 45, 32,116,101,120, 99,111,108, 41, 41, 42, 40, 49, 46, 48,
+ 32, 45, 32,111,117,116, 99,111,108, 41, 59, 10,125, 10, 10,118,111,105,100, 32,109,116,101,120, 95,118, 97,108,117,101, 95,115,
+117, 98, 40,102,108,111, 97,116, 32,111,117,116, 99,111,108, 44, 32,102,108,111, 97,116, 32,116,101,120, 99,111,108, 44, 32,102,
+108,111, 97,116, 32,102, 97, 99,116, 44, 32,102,108,111, 97,116, 32,102, 97, 99,103, 44, 32,102,108,111, 97,116, 32,102,108,105,
+112, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,105,110, 99,111,108, 41, 10,123, 10,  9,102,108,111, 97,116, 32,102, 97, 99,
+109, 59, 10,  9,109,116,101,120, 95,118, 97,108,117,101, 95,118, 97,114,115, 40,102, 97, 99,116, 44, 32,102, 97, 99,103, 44, 32,
+102, 97, 99,109, 44, 32,102,108,105,112, 41, 59, 10, 10,  9,102, 97, 99,116, 32, 61, 32, 45,102, 97, 99,116, 59, 10,  9,105,110,
+ 99,111,108, 32, 61, 32,102, 97, 99,116, 42,116,101,120, 99,111,108, 32, 43, 32,111,117,116, 99,111,108, 59, 10,125, 10, 10,118,
+111,105,100, 32,109,116,101,120, 95,118, 97,108,117,101, 95, 97,100,100, 40,102,108,111, 97,116, 32,111,117,116, 99,111,108, 44,
+ 32,102,108,111, 97,116, 32,116,101,120, 99,111,108, 44, 32,102,108,111, 97,116, 32,102, 97, 99,116, 44, 32,102,108,111, 97,116,
+ 32,102, 97, 99,103, 44, 32,102,108,111, 97,116, 32,102,108,105,112, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,105,110, 99,
+111,108, 41, 10,123, 10,  9,102,108,111, 97,116, 32,102, 97, 99,109, 59, 10,  9,109,116,101,120, 95,118, 97,108,117,101, 95,118,
+ 97,114,115, 40,102, 97, 99,116, 44, 32,102, 97, 99,103, 44, 32,102, 97, 99,109, 44, 32,102,108,105,112, 41, 59, 10, 10,  9,102,
+ 97, 99,116, 32, 61, 32,102, 97, 99,116, 59, 10,  9,105,110, 99,111,108, 32, 61, 32,102, 97, 99,116, 42,116,101,120, 99,111,108,
+ 32, 43, 32,111,117,116, 99,111,108, 59, 10,125, 10, 10,118,111,105,100, 32,109,116,101,120, 95,118, 97,108,117,101, 95,100,105,
+118, 40,102,108,111, 97,116, 32,111,117,116, 99,111,108, 44, 32,102,108,111, 97,116, 32,116,101,120, 99,111,108, 44, 32,102,108,
+111, 97,116, 32,102, 97, 99,116, 44, 32,102,108,111, 97,116, 32,102, 97, 99,103, 44, 32,102,108,111, 97,116, 32,102,108,105,112,
+ 44, 32,111,117,116, 32,102,108,111, 97,116, 32,105,110, 99,111,108, 41, 10,123, 10,  9,102,108,111, 97,116, 32,102, 97, 99,109,
+ 59, 10,  9,109,116,101,120, 95,118, 97,108,117,101, 95,118, 97,114,115, 40,102, 97, 99,116, 44, 32,102, 97, 99,103, 44, 32,102,
+ 97, 99,109, 44, 32,102,108,105,112, 41, 59, 10, 10,  9,105,102, 40,116,101,120, 99,111,108, 32, 33, 61, 32, 48, 46, 48, 41, 10,
+  9,  9,105,110, 99,111,108, 32, 61, 32,102, 97, 99,109, 42,111,117,116, 99,111,108, 32, 43, 32,102, 97, 99,116, 42,111,117,116,
+ 99,111,108, 47,116,101,120, 99,111,108, 59, 10,  9,101,108,115,101, 10,  9,  9,105,110, 99,111,108, 32, 61, 32, 48, 46, 48, 59,
+ 10,125, 10, 10,118,111,105,100, 32,109,116,101,120, 95,118, 97,108,117,101, 95,100,105,102,102, 40,102,108,111, 97,116, 32,111,
+117,116, 99,111,108, 44, 32,102,108,111, 97,116, 32,116,101,120, 99,111,108, 44, 32,102,108,111, 97,116, 32,102, 97, 99,116, 44,
+ 32,102,108,111, 97,116, 32,102, 97, 99,103, 44, 32,102,108,111, 97,116, 32,102,108,105,112, 44, 32,111,117,116, 32,102,108,111,
+ 97,116, 32,105,110, 99,111,108, 41, 10,123, 10,  9,102,108,111, 97,116, 32,102, 97, 99,109, 59, 10,  9,109,116,101,120, 95,118,
+ 97,108,117,101, 95,118, 97,114,115, 40,102, 97, 99,116, 44, 32,102, 97, 99,103, 44, 32,102, 97, 99,109, 44, 32,102,108,105,112,
+ 41, 59, 10, 10,  9,105,110, 99,111,108, 32, 61, 32,102, 97, 99,109, 42,111,117,116, 99,111,108, 32, 43, 32,102, 97, 99,116, 42,
+ 97, 98,115, 40,116,101,120, 99,111,108, 32, 45, 32,111,117,116, 99,111,108, 41, 59, 10,125, 10, 10,118,111,105,100, 32,109,116,
+101,120, 95,118, 97,108,117,101, 95,100, 97,114,107, 40,102,108,111, 97,116, 32,111,117,116, 99,111,108, 44, 32,102,108,111, 97,
+116, 32,116,101,120, 99,111,108, 44, 32,102,108,111, 97,116, 32,102, 97, 99,116, 44, 32,102,108,111, 97,116, 32,102, 97, 99,103,
+ 44, 32,102,108,111, 97,116, 32,102,108,105,112, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,105,110, 99,111,108, 41, 10,123,
+ 10,  9,102,108,111, 97,116, 32,102, 97, 99,109, 59, 10,  9,109,116,101,120, 95,118, 97,108,117,101, 95,118, 97,114,115, 40,102,
+ 97, 99,116, 44, 32,102, 97, 99,103, 44, 32,102, 97, 99,109, 44, 32,102,108,105,112, 41, 59, 10, 10,  9,102,108,111, 97,116, 32,
+ 99,111,108, 32, 61, 32,102, 97, 99,116, 42,116,101,120, 99,111,108, 59, 10,  9,105,102, 40, 99,111,108, 32, 60, 32,111,117,116,
+ 99,111,108, 41, 32,105,110, 99,111,108, 32, 61, 32, 99,111,108, 59, 32,101,108,115,101, 32,105,110, 99,111,108, 32, 61, 32,111,
+117,116, 99,111,108, 59, 10,125, 10, 10,118,111,105,100, 32,109,116,101,120, 95,118, 97,108,117,101, 95,108,105,103,104,116, 40,
+102,108,111, 97,116, 32,111,117,116, 99,111,108, 44, 32,102,108,111, 97,116, 32,116,101,120, 99,111,108, 44, 32,102,108,111, 97,
+116, 32,102, 97, 99,116, 44, 32,102,108,111, 97,116, 32,102, 97, 99,103, 44, 32,102,108,111, 97,116, 32,102,108,105,112, 44, 32,
+111,117,116, 32,102,108,111, 97,116, 32,105,110, 99,111,108, 41, 10,123, 10,  9,102,108,111, 97,116, 32,102, 97, 99,109, 59, 10,
+  9,109,116,101,120, 95,118, 97,108,117,101, 95,118, 97,114,115, 40,102, 97, 99,116, 44, 32,102, 97, 99,103, 44, 32,102, 97, 99,
+109, 44, 32,102,108,105,112, 41, 59, 10, 10,  9,102,108,111, 97,116, 32, 99,111,108, 32, 61, 32,102, 97, 99,116, 42,116,101,120,
+ 99,111,108, 59, 10,  9,105,102, 40, 99,111,108, 32, 62, 32,111,117,116, 99,111,108, 41, 32,105,110, 99,111,108, 32, 61, 32, 99,
+111,108, 59, 32,101,108,115,101, 32,105,110, 99,111,108, 32, 61, 32,111,117,116, 99,111,108, 59, 10,125, 10, 10,118,111,105,100,
+ 32,109,116,101,120, 95,118, 97,108,117,101, 95, 99,108, 97,109,112, 95,112,111,115,105,116,105,118,101, 40,102,108,111, 97,116,
+ 32,102, 97, 99, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,111,117,116,102, 97, 99, 41, 10,123, 10,  9,111,117,116,102, 97,
+ 99, 32, 61, 32,109, 97,120, 40,102, 97, 99, 44, 32, 48, 46, 48, 41, 59, 10,125, 10, 10,118,111,105,100, 32,109,116,101,120, 95,
+118, 97,108,117,101, 95, 99,108, 97,109,112, 40,102,108,111, 97,116, 32,102, 97, 99, 44, 32,111,117,116, 32,102,108,111, 97,116,
+ 32,111,117,116,102, 97, 99, 41, 10,123, 10,  9,111,117,116,102, 97, 99, 32, 61, 32, 99,108, 97,109,112, 40,102, 97, 99, 44, 32,
+ 48, 46, 48, 44, 32, 49, 46, 48, 41, 59, 10,125, 10, 10,118,111,105,100, 32,109,116,101,120, 95,104, 97,114, 95,100,105,118,105,
+100,101, 40,102,108,111, 97,116, 32,104, 97,114, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,111,117,116,104, 97,114, 41, 10,
+123, 10,  9,111,117,116,104, 97,114, 32, 61, 32,104, 97,114, 47, 49, 50, 56, 46, 48, 59, 10,125, 10, 10,118,111,105,100, 32,109,
+116,101,120, 95,104, 97,114, 95,109,117,108,116,105,112,108,121, 95, 99,108, 97,109,112, 40,102,108,111, 97,116, 32,104, 97,114,
+ 44, 32,111,117,116, 32,102,108,111, 97,116, 32,111,117,116,104, 97,114, 41, 10,123, 10,  9,104, 97,114, 32, 42, 61, 32, 49, 50,
+ 56, 46, 48, 59, 10, 10,  9,105,102, 40,104, 97,114, 32, 60, 32, 49, 46, 48, 41, 32,111,117,116,104, 97,114, 32, 61, 32, 49, 46,
+ 48, 59, 10,  9,101,108,115,101, 32,105,102, 40,104, 97,114, 32, 62, 32, 53, 49, 49, 46, 48, 41, 32,111,117,116,104, 97,114, 32,
+ 61, 32, 53, 49, 49, 46, 48, 59, 10,  9,101,108,115,101, 32,111,117,116,104, 97,114, 32, 61, 32,104, 97,114, 59, 10,125, 10, 10,
+118,111,105,100, 32,109,116,101,120, 95, 97,108,112,104, 97, 95,102,114,111,109, 95, 99,111,108, 40,118,101, 99, 52, 32, 99,111,
+108, 44, 32,111,117,116, 32,102,108,111, 97,116, 32, 97,108,112,104, 97, 41, 10,123, 10,  9, 97,108,112,104, 97, 32, 61, 32, 99,
+111,108, 46, 97, 59, 10,125, 10, 10,118,111,105,100, 32,109,116,101,120, 95, 97,108,112,104, 97, 95,116,111, 95, 99,111,108, 40,
+118,101, 99, 52, 32, 99,111,108, 44, 32,102,108,111, 97,116, 32, 97,108,112,104, 97, 44, 32,111,117,116, 32,118,101, 99, 52, 32,
+111,117,116, 99,111,108, 41, 10,123, 10,  9,111,117,116, 99,111,108, 32, 61, 32,118,101, 99, 52, 40, 99,111,108, 46,114,103, 98,
+ 44, 32, 97,108,112,104, 97, 41, 59, 10,125, 10, 10,118,111,105,100, 32,109,116,101,120, 95,114,103, 98,116,111,105,110,116, 40,
+118,101, 99, 52, 32,114,103, 98, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,105,110,116,101,110,115,105,116,121, 41, 10,123,
+ 10,  9,105,110,116,101,110,115,105,116,121, 32, 61, 32,100,111,116, 40,118,101, 99, 51, 40, 48, 46, 51, 53, 44, 32, 48, 46, 52,
+ 53, 44, 32, 48, 46, 50, 41, 44, 32,114,103, 98, 46,114,103, 98, 41, 59, 10,125, 10, 10,118,111,105,100, 32,109,116,101,120, 95,
+118, 97,108,117,101, 95,105,110,118,101,114,116, 40,102,108,111, 97,116, 32,105,110,118, 97,108,117,101, 44, 32,111,117,116, 32,
+102,108,111, 97,116, 32,111,117,116,118, 97,108,117,101, 41, 10,123, 10,  9,111,117,116,118, 97,108,117,101, 32, 61, 32, 49, 46,
+ 48, 32, 45, 32,105,110,118, 97,108,117,101, 59, 10,125, 10, 10,118,111,105,100, 32,109,116,101,120, 95,114,103, 98, 95,105,110,
+118,101,114,116, 40,118,101, 99, 52, 32,105,110,114,103, 98, 44, 32,111,117,116, 32,118,101, 99, 52, 32,111,117,116,114,103, 98,
+ 41, 10,123, 10,  9,111,117,116,114,103, 98, 32, 61, 32,118,101, 99, 52, 40,118,101, 99, 51, 40, 49, 46, 48, 41, 32, 45, 32,105,
+110,114,103, 98, 46,114,103, 98, 44, 32,105,110,114,103, 98, 46, 97, 41, 59, 10,125, 10, 10,118,111,105,100, 32,109,116,101,120,
+ 95,118, 97,108,117,101, 95,115,116,101,110, 99,105,108, 40,102,108,111, 97,116, 32,115,116,101,110, 99,105,108, 44, 32,102,108,
+111, 97,116, 32,105,110,116,101,110,115,105,116,121, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,111,117,116,115,116,101,110,
+ 99,105,108, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,111,117,116,105,110,116,101,110,115,105,116,121, 41, 10,123, 10,  9,
+102,108,111, 97,116, 32,102, 97, 99,116, 32, 61, 32,105,110,116,101,110,115,105,116,121, 59, 10,  9,111,117,116,105,110,116,101,
+110,115,105,116,121, 32, 61, 32,105,110,116,101,110,115,105,116,121, 42,115,116,101,110, 99,105,108, 59, 10,  9,111,117,116,115,
+116,101,110, 99,105,108, 32, 61, 32,115,116,101,110, 99,105,108, 42,102, 97, 99,116, 59, 10,125, 10, 10,118,111,105,100, 32,109,
+116,101,120, 95,114,103, 98, 95,115,116,101,110, 99,105,108, 40,102,108,111, 97,116, 32,115,116,101,110, 99,105,108, 44, 32,118,
+101, 99, 52, 32,114,103, 98, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,111,117,116,115,116,101,110, 99,105,108, 44, 32,111,
+117,116, 32,118,101, 99, 52, 32,111,117,116,114,103, 98, 41, 10,123, 10,  9,102,108,111, 97,116, 32,102, 97, 99,116, 32, 61, 32,
+114,103, 98, 46, 97, 59, 10,  9,111,117,116,114,103, 98, 32, 61, 32,118,101, 99, 52, 40,114,103, 98, 46,114,103, 98, 44, 32,114,
+103, 98, 46, 97, 42,115,116,101,110, 99,105,108, 41, 59, 10,  9,111,117,116,115,116,101,110, 99,105,108, 32, 61, 32,115,116,101,
+110, 99,105,108, 42,102, 97, 99,116, 59, 10,125, 10, 10,118,111,105,100, 32,109,116,101,120, 95,109, 97,112,112,105,110,103, 95,
+111,102,115, 40,118,101, 99, 51, 32,116,101,120, 99,111, 44, 32,118,101, 99, 51, 32,111,102,115, 44, 32,111,117,116, 32,118,101,
+ 99, 51, 32,111,117,116,116,101,120, 99,111, 41, 10,123, 10,  9,111,117,116,116,101,120, 99,111, 32, 61, 32,116,101,120, 99,111,
+ 32, 43, 32,111,102,115, 59, 10,125, 10, 10,118,111,105,100, 32,109,116,101,120, 95,109, 97,112,112,105,110,103, 95,115,105,122,
+101, 40,118,101, 99, 51, 32,116,101,120, 99,111, 44, 32,118,101, 99, 51, 32,115,105,122,101, 44, 32,111,117,116, 32,118,101, 99,
+ 51, 32,111,117,116,116,101,120, 99,111, 41, 10,123, 10,  9,111,117,116,116,101,120, 99,111, 32, 61, 32,115,105,122,101, 42,116,
+101,120, 99,111, 59, 10,125, 10, 10,118,111,105,100, 32,109,116,101,120, 95, 50,100, 95,109, 97,112,112,105,110,103, 40,118,101,
+ 99, 51, 32,118,101, 99, 44, 32,111,117,116, 32,118,101, 99, 51, 32,111,117,116,118,101, 99, 41, 10,123, 10,  9,111,117,116,118,
+101, 99, 32, 61, 32,118,101, 99, 51, 40,118,101, 99, 46,120,121, 42, 48, 46, 53, 32, 43, 32,118,101, 99, 50, 40, 48, 46, 53, 44,
+ 32, 48, 46, 53, 41, 44, 32,118,101, 99, 46,122, 41, 59, 10,125, 10, 10,118,111,105,100, 32,109,116,101,120, 95,105,109, 97,103,
+101, 40,118,101, 99, 51, 32,118,101, 99, 44, 32,115, 97,109,112,108,101,114, 50, 68, 32,105,109, 97, 44, 32,111,117,116, 32,102,
+108,111, 97,116, 32,118, 97,108,117,101, 44, 32,111,117,116, 32,118,101, 99, 52, 32, 99,111,108,111,114, 44, 32,111,117,116, 32,
+118,101, 99, 51, 32,110,111,114,109, 97,108, 41, 10,123, 10,  9, 99,111,108,111,114, 32, 61, 32,116,101,120,116,117,114,101, 50,
+ 68, 40,105,109, 97, 44, 32,118,101, 99, 46,120,121, 41, 59, 10,  9,118, 97,108,117,101, 32, 61, 32, 49, 46, 48, 59, 10,  9, 10,
+  9,110,111,114,109, 97,108, 32, 61, 32, 50, 46, 48, 42, 40,118,101, 99, 51, 40, 99,111,108,111,114, 46,114, 44, 32, 45, 99,111,
+108,111,114, 46,103, 44, 32, 99,111,108,111,114, 46, 98, 41, 32, 45, 32,118,101, 99, 51, 40, 48, 46, 53, 44, 32, 45, 48, 46, 53,
+ 44, 32, 48, 46, 53, 41, 41, 59, 10,125, 10, 10,118,111,105,100, 32,109,116,101,120, 95,110,101,103, 97,116,101, 95,116,101,120,
+110,111,114,109, 97,108, 40,118,101, 99, 51, 32,110,111,114,109, 97,108, 44, 32,111,117,116, 32,118,101, 99, 51, 32,111,117,116,
+110,111,114,109, 97,108, 41, 10,123, 10,  9,111,117,116,110,111,114,109, 97,108, 32, 61, 32,118,101, 99, 51, 40, 45,110,111,114,
+109, 97,108, 46,120, 44, 32, 45,110,111,114,109, 97,108, 46,121, 44, 32,110,111,114,109, 97,108, 46,122, 41, 59, 10,125, 10, 10,
+118,111,105,100, 32,109,116,101,120, 95,110,115,112, 97, 99,101, 95,116, 97,110,103,101,110,116, 40,118,101, 99, 51, 32,116, 97,
+110,103,101,110,116, 44, 32,118,101, 99, 51, 32,110,111,114,109, 97,108, 44, 32,118,101, 99, 51, 32,116,101,120,110,111,114,109,
+ 97,108, 44, 32,111,117,116, 32,118,101, 99, 51, 32,111,117,116,110,111,114,109, 97,108, 41, 10,123, 10,  9,116, 97,110,103,101,
+110,116, 32, 61, 32,110,111,114,109, 97,108,105,122,101, 40,116, 97,110,103,101,110,116, 41, 59, 10,  9,118,101, 99, 51, 32, 66,
+ 32, 61, 32, 99,114,111,115,115, 40,110,111,114,109, 97,108, 44, 32,116, 97,110,103,101,110,116, 41, 59, 10, 10,  9,111,117,116,
+110,111,114,109, 97,108, 32, 61, 32,116,101,120,110,111,114,109, 97,108, 46,120, 42,116, 97,110,103,101,110,116, 32, 43, 32,116,
+101,120,110,111,114,109, 97,108, 46,121, 42, 66, 32, 43, 32,116,101,120,110,111,114,109, 97,108, 46,122, 42,110,111,114,109, 97,
+108, 59, 10,  9,111,117,116,110,111,114,109, 97,108, 32, 61, 32,110,111,114,109, 97,108,105,122,101, 40,111,117,116,110,111,114,
+109, 97,108, 41, 59, 10,125, 10, 10,118,111,105,100, 32,109,116,101,120, 95, 98,108,101,110,100, 95,110,111,114,109, 97,108, 40,
+102,108,111, 97,116, 32,110,111,114,102, 97, 99, 44, 32,118,101, 99, 51, 32,110,111,114,109, 97,108, 44, 32,118,101, 99, 51, 32,
+110,101,119,110,111,114,109, 97,108, 44, 32,111,117,116, 32,118,101, 99, 51, 32,111,117,116,110,111,114,109, 97,108, 41, 10,123,
+ 10,  9,111,117,116,110,111,114,109, 97,108, 32, 61, 32, 40, 49, 46, 48, 32, 45, 32,110,111,114,102, 97, 99, 41, 42,110,111,114,
+109, 97,108, 32, 43, 32,110,111,114,102, 97, 99, 42,110,101,119,110,111,114,109, 97,108, 59, 10,  9,111,117,116,110,111,114,109,
+ 97,108, 32, 61, 32,110,111,114,109, 97,108,105,122,101, 40,111,117,116,110,111,114,109, 97,108, 41, 59, 10,125, 10, 10, 47, 42,
+ 42, 42, 42, 42, 42, 42, 32, 77, 65, 84, 69, 82, 73, 65, 76, 32, 42, 42, 42, 42, 42, 42, 42, 42, 42, 47, 10, 10,118,111,105,100,
+ 32,108, 97,109,112, 95,118,105,115,105, 98,105,108,105,116,121, 95,115,117,110, 95,104,101,109,105, 40,118,101, 99, 51, 32,108,
+ 97,109,112,118,101, 99, 44, 32,111,117,116, 32,118,101, 99, 51, 32,108,118, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,100,
+105,115,116, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,118,105,115,105,102, 97, 99, 41, 10,123, 10,  9,108,118, 32, 61, 32,
+108, 97,109,112,118,101, 99, 59, 10,  9,100,105,115,116, 32, 61, 32, 49, 46, 48, 59, 10,  9,118,105,115,105,102, 97, 99, 32, 61,
+ 32, 49, 46, 48, 59, 10,125, 10, 10,118,111,105,100, 32,108, 97,109,112, 95,118,105,115,105, 98,105,108,105,116,121, 95,111,116,
+104,101,114, 40,118,101, 99, 51, 32, 99,111, 44, 32,118,101, 99, 51, 32,108, 97,109,112, 99,111, 44, 32,111,117,116, 32,118,101,
+ 99, 51, 32,108,118, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,100,105,115,116, 44, 32,111,117,116, 32,102,108,111, 97,116,
+ 32,118,105,115,105,102, 97, 99, 41, 10,123, 10,  9,108,118, 32, 61, 32, 99,111, 32, 45, 32,108, 97,109,112, 99,111, 59, 10,  9,
+100,105,115,116, 32, 61, 32,108,101,110,103,116,104, 40,108,118, 41, 59, 10,  9,108,118, 32, 61, 32,110,111,114,109, 97,108,105,
+122,101, 40,108,118, 41, 59, 10,  9,118,105,115,105,102, 97, 99, 32, 61, 32, 49, 46, 48, 59, 10,125, 10, 10,118,111,105,100, 32,
+108, 97,109,112, 95,102, 97,108,108,111,102,102, 95,105,110,118,108,105,110,101, 97,114, 40,102,108,111, 97,116, 32,108, 97,109,
+112,100,105,115,116, 44, 32,102,108,111, 97,116, 32,100,105,115,116, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,118,105,115,
+105,102, 97, 99, 41, 10,123, 10,  9,118,105,115,105,102, 97, 99, 32, 61, 32,108, 97,109,112,100,105,115,116, 47, 40,108, 97,109,
+112,100,105,115,116, 32, 43, 32,100,105,115,116, 41, 59, 10,125, 10, 10,118,111,105,100, 32,108, 97,109,112, 95,102, 97,108,108,
+111,102,102, 95,105,110,118,115,113,117, 97,114,101, 40,102,108,111, 97,116, 32,108, 97,109,112,100,105,115,116, 44, 32,102,108,
+111, 97,116, 32,100,105,115,116, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,118,105,115,105,102, 97, 99, 41, 10,123, 10,  9,
+118,105,115,105,102, 97, 99, 32, 61, 32,108, 97,109,112,100,105,115,116, 47, 40,108, 97,109,112,100,105,115,116, 32, 43, 32,100,
+105,115,116, 42,100,105,115,116, 41, 59, 10,125, 10, 10,118,111,105,100, 32,108, 97,109,112, 95,102, 97,108,108,111,102,102, 95,
+115,108,105,100,101,114,115, 40,102,108,111, 97,116, 32,108, 97,109,112,100,105,115,116, 44, 32,102,108,111, 97,116, 32,108,100,
+ 49, 44, 32,102,108,111, 97,116, 32,108,100, 50, 44, 32,102,108,111, 97,116, 32,100,105,115,116, 44, 32,111,117,116, 32,102,108,
+111, 97,116, 32,118,105,115,105,102, 97, 99, 41, 10,123, 10,  9,102,108,111, 97,116, 32,108, 97,109,112,100,105,115,116,107,119,
+ 32, 61, 32,108, 97,109,112,100,105,115,116, 42,108, 97,109,112,100,105,115,116, 59, 10, 10,  9,118,105,115,105,102, 97, 99, 32,
+ 61, 32,108, 97,109,112,100,105,115,116, 47, 40,108, 97,109,112,100,105,115,116, 32, 43, 32,108,100, 49, 42,100,105,115,116, 41,
+ 59, 10,  9,118,105,115,105,102, 97, 99, 32, 42, 61, 32,108, 97,109,112,100,105,115,116,107,119, 47, 40,108, 97,109,112,100,105,
+115,116,107,119, 32, 43, 32,108,100, 50, 42,100,105,115,116, 42,100,105,115,116, 41, 59, 10,125, 10, 10,118,111,105,100, 32,108,
+ 97,109,112, 95,102, 97,108,108,111,102,102, 95, 99,117,114,118,101, 40,102,108,111, 97,116, 32,108, 97,109,112,100,105,115,116,
+ 44, 32,115, 97,109,112,108,101,114, 49, 68, 32, 99,117,114,118,101,109, 97,112, 44, 32,102,108,111, 97,116, 32,100,105,115,116,
+ 44, 32,111,117,116, 32,102,108,111, 97,116, 32,118,105,115,105,102, 97, 99, 41, 10,123, 10,  9,118,105,115,105,102, 97, 99, 32,
+ 61, 32,116,101,120,116,117,114,101, 49, 68, 40, 99,117,114,118,101,109, 97,112, 44, 32,100,105,115,116, 47,108, 97,109,112,100,
+105,115,116, 41, 46,120, 59, 10,125, 10, 10,118,111,105,100, 32,108, 97,109,112, 95,118,105,115,105, 98,105,108,105,116,121, 95,
+115,112,104,101,114,101, 40,102,108,111, 97,116, 32,108, 97,109,112,100,105,115,116, 44, 32,102,108,111, 97,116, 32,100,105,115,
+116, 44, 32,102,108,111, 97,116, 32,118,105,115,105,102, 97, 99, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,111,117,116,118,
+105,115,105,102, 97, 99, 41, 10,123, 10,  9,102,108,111, 97,116, 32,116, 61, 32,108, 97,109,112,100,105,115,116, 32, 45, 32,100,
+105,115,116, 59, 10, 10,  9,111,117,116,118,105,115,105,102, 97, 99, 61, 32,118,105,115,105,102, 97, 99, 42,109, 97,120, 40,116,
+ 44, 32, 48, 46, 48, 41, 47,108, 97,109,112,100,105,115,116, 59, 10,125, 10, 10,118,111,105,100, 32,108, 97,109,112, 95,118,105,
+115,105, 98,105,108,105,116,121, 95,115,112,111,116, 95,115,113,117, 97,114,101, 40,118,101, 99, 51, 32,108, 97,109,112,118,101,
+ 99, 44, 32,109, 97,116, 52, 32,108, 97,109,112,105,109, 97,116, 44, 32,118,101, 99, 51, 32,108,118, 44, 32,111,117,116, 32,102,
+108,111, 97,116, 32,105,110,112,114, 41, 10,123, 10,  9,105,102, 40,100,111,116, 40,108,118, 44, 32,108, 97,109,112,118,101, 99,
+ 41, 32, 62, 32, 48, 46, 48, 41, 32,123, 10,  9,  9,118,101, 99, 51, 32,108,118,114,111,116, 32, 61, 32, 40,108, 97,109,112,105,
+109, 97,116, 42,118,101, 99, 52, 40,108,118, 44, 32, 48, 46, 48, 41, 41, 46,120,121,122, 59, 10,  9,  9,102,108,111, 97,116, 32,
+120, 32, 61, 32,109, 97,120, 40, 97, 98,115, 40,108,118,114,111,116, 46,120, 47,108,118,114,111,116, 46,122, 41, 44, 32, 97, 98,
+115, 40,108,118,114,111,116, 46,121, 47,108,118,114,111,116, 46,122, 41, 41, 59, 10, 10,  9,  9,105,110,112,114, 32, 61, 32, 49,
+ 46, 48, 47,115,113,114,116, 40, 49, 46, 48, 32, 43, 32,120, 42,120, 41, 59, 10,  9,125, 10,  9,101,108,115,101, 10,  9,  9,105,
+110,112,114, 32, 61, 32, 48, 46, 48, 59, 10,125, 10, 10,118,111,105,100, 32,108, 97,109,112, 95,118,105,115,105, 98,105,108,105,
+116,121, 95,115,112,111,116, 95, 99,105,114, 99,108,101, 40,118,101, 99, 51, 32,108, 97,109,112,118,101, 99, 44, 32,118,101, 99,
+ 51, 32,108,118, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,105,110,112,114, 41, 10,123, 10,  9,105,110,112,114, 32, 61, 32,
+100,111,116, 40,108,118, 44, 32,108, 97,109,112,118,101, 99, 41, 59, 10,125, 10, 10,118,111,105,100, 32,108, 97,109,112, 95,118,
+105,115,105, 98,105,108,105,116,121, 95,115,112,111,116, 40,102,108,111, 97,116, 32,115,112,111,116,115,105, 44, 32,102,108,111,
+ 97,116, 32,115,112,111,116, 98,108, 44, 32,102,108,111, 97,116, 32,105,110,112,114, 44, 32,102,108,111, 97,116, 32,118,105,115,
+105,102, 97, 99, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,111,117,116,118,105,115,105,102, 97, 99, 41, 10,123, 10,  9,102,
+108,111, 97,116, 32,116, 32, 61, 32,115,112,111,116,115,105, 59, 10, 10,  9,105,102, 40,105,110,112,114, 32, 60, 61, 32,116, 41,
+ 32,123, 10,  9,  9,111,117,116,118,105,115,105,102, 97, 99, 32, 61, 32, 48, 46, 48, 59, 10,  9,125, 10,  9,101,108,115,101, 32,
+123, 10,  9,  9,116, 32, 61, 32,105,110,112,114, 32, 45, 32,116, 59, 10, 10,  9,  9, 47, 42, 32,115,111,102,116, 32, 97,114,101,
+ 97, 32, 42, 47, 10,  9,  9,105,102, 40,115,112,111,116, 98,108, 32, 33, 61, 32, 48, 46, 48, 41, 10,  9,  9,  9,105,110,112,114,
+ 32, 42, 61, 32,115,109,111,111,116,104,115,116,101,112, 40, 48, 46, 48, 44, 32, 49, 46, 48, 44, 32,116, 47,115,112,111,116, 98,
+108, 41, 59, 10, 10,  9,  9,111,117,116,118,105,115,105,102, 97, 99, 32, 61, 32,118,105,115,105,102, 97, 99, 42,105,110,112,114,
+ 59, 10,  9,125, 10,125, 10, 10,118,111,105,100, 32,108, 97,109,112, 95,118,105,115,105, 98,105,108,105,116,121, 95, 99,108, 97,
+109,112, 40,102,108,111, 97,116, 32,118,105,115,105,102, 97, 99, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,111,117,116,118,
+105,115,105,102, 97, 99, 41, 10,123, 10,  9,111,117,116,118,105,115,105,102, 97, 99, 32, 61, 32, 40,118,105,115,105,102, 97, 99,
+ 32, 60, 32, 48, 46, 48, 48, 49, 41, 63, 32, 48, 46, 48, 58, 32,118,105,115,105,102, 97, 99, 59, 10,125, 10, 10,118,111,105,100,
+ 32,115,104, 97,100,101, 95,118,105,101,119, 40,118,101, 99, 51, 32, 99,111, 44, 32,111,117,116, 32,118,101, 99, 51, 32,118,105,
+101,119, 41, 10,123, 10,  9, 47, 42, 32,104, 97,110,100,108,101, 32,112,101,114,115,112,101, 99,116,105,118,101, 47,111,114,116,
+104,111,103,114, 97,112,104,105, 99, 32, 42, 47, 10,  9,118,105,101,119, 32, 61, 32, 40,103,108, 95, 80,114,111,106,101, 99,116,
+105,111,110, 77, 97,116,114,105,120, 91, 51, 93, 91, 51, 93, 32, 61, 61, 32, 48, 46, 48, 41, 63, 32,110,111,114,109, 97,108,105,
+122,101, 40, 99,111, 41, 58, 32,118,101, 99, 51, 40, 48, 46, 48, 44, 32, 48, 46, 48, 44, 32, 45, 49, 46, 48, 41, 59, 10,125, 10,
+ 10,118,111,105,100, 32,115,104, 97,100,101, 95,116, 97,110,103,101,110,116, 95,118, 40,118,101, 99, 51, 32,108,118, 44, 32,118,
+101, 99, 51, 32,116, 97,110,103, 44, 32,111,117,116, 32,118,101, 99, 51, 32,118,110, 41, 10,123, 10,  9,118,101, 99, 51, 32, 99,
+ 32, 61, 32, 99,114,111,115,115, 40,108,118, 44, 32,116, 97,110,103, 41, 59, 10,  9,118,101, 99, 51, 32,118,110,111,114, 32, 61,
+ 32, 99,114,111,115,115, 40, 99, 44, 32,116, 97,110,103, 41, 59, 10, 10,  9,118,110, 32, 61, 32, 45,110,111,114,109, 97,108,105,
+122,101, 40,118,110,111,114, 41, 59, 10,125, 10, 10,118,111,105,100, 32,115,104, 97,100,101, 95,105,110,112, 40,118,101, 99, 51,
+ 32,118,110, 44, 32,118,101, 99, 51, 32,108,118, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,105,110,112, 41, 10,123, 10,  9,
+105,110,112, 32, 61, 32,100,111,116, 40,118,110, 44, 32,108,118, 41, 59, 10,125, 10, 10,118,111,105,100, 32,115,104, 97,100,101,
+ 95,105,115, 95,110,111, 95,100,105,102,102,117,115,101, 40,111,117,116, 32,102,108,111, 97,116, 32,105,115, 41, 10,123, 10,  9,
+105,115, 32, 61, 32, 48, 46, 48, 59, 10,125, 10, 10,118,111,105,100, 32,115,104, 97,100,101, 95,105,115, 95,104,101,109,105, 40,
+102,108,111, 97,116, 32,105,110,112, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,105,115, 41, 10,123, 10,  9,105,115, 32, 61,
+ 32, 48, 46, 53, 42,105,110,112, 32, 43, 32, 48, 46, 53, 59, 10,125, 10, 10,102,108,111, 97,116, 32, 97,114,101, 97, 95,108, 97,
+109,112, 95,101,110,101,114,103,121, 40,109, 97,116, 52, 32, 97,114,101, 97, 44, 32,118,101, 99, 51, 32, 99,111, 44, 32,118,101,
+ 99, 51, 32,118,110, 41, 10,123, 10,  9,118,101, 99, 51, 32,118,101, 99, 91, 52, 93, 44, 32, 99, 91, 52, 93, 59, 10,  9,102,108,
+111, 97,116, 32,114, 97,100, 91, 52, 93, 44, 32,102, 97, 99, 59, 10,  9, 10,  9,118,101, 99, 91, 48, 93, 32, 61, 32,110,111,114,
+109, 97,108,105,122,101, 40, 99,111, 32, 45, 32, 97,114,101, 97, 91, 48, 93, 46,120,121,122, 41, 59, 10,  9,118,101, 99, 91, 49,
+ 93, 32, 61, 32,110,111,114,109, 97,108,105,122,101, 40, 99,111, 32, 45, 32, 97,114,101, 97, 91, 49, 93, 46,120,121,122, 41, 59,
+ 10,  9,118,101, 99, 91, 50, 93, 32, 61, 32,110,111,114,109, 97,108,105,122,101, 40, 99,111, 32, 45, 32, 97,114,101, 97, 91, 50,
+ 93, 46,120,121,122, 41, 59, 10,  9,118,101, 99, 91, 51, 93, 32, 61, 32,110,111,114,109, 97,108,105,122,101, 40, 99,111, 32, 45,
+ 32, 97,114,101, 97, 91, 51, 93, 46,120,121,122, 41, 59, 10, 10,  9, 99, 91, 48, 93, 32, 61, 32,110,111,114,109, 97,108,105,122,
+101, 40, 99,114,111,115,115, 40,118,101, 99, 91, 48, 93, 44, 32,118,101, 99, 91, 49, 93, 41, 41, 59, 10,  9, 99, 91, 49, 93, 32,
+ 61, 32,110,111,114,109, 97,108,105,122,101, 40, 99,114,111,115,115, 40,118,101, 99, 91, 49, 93, 44, 32,118,101, 99, 91, 50, 93,
+ 41, 41, 59, 10,  9, 99, 91, 50, 93, 32, 61, 32,110,111,114,109, 97,108,105,122,101, 40, 99,114,111,115,115, 40,118,101, 99, 91,
+ 50, 93, 44, 32,118,101, 99, 91, 51, 93, 41, 41, 59, 10,  9, 99, 91, 51, 93, 32, 61, 32,110,111,114,109, 97,108,105,122,101, 40,
+ 99,114,111,115,115, 40,118,101, 99, 91, 51, 93, 44, 32,118,101, 99, 91, 48, 93, 41, 41, 59, 10, 10,  9,114, 97,100, 91, 48, 93,
+ 32, 61, 32, 97, 99,111,115, 40,100,111,116, 40,118,101, 99, 91, 48, 93, 44, 32,118,101, 99, 91, 49, 93, 41, 41, 59, 10,  9,114,
+ 97,100, 91, 49, 93, 32, 61, 32, 97, 99,111,115, 40,100,111,116, 40,118,101, 99, 91, 49, 93, 44, 32,118,101, 99, 91, 50, 93, 41,
+ 41, 59, 10,  9,114, 97,100, 91, 50, 93, 32, 61, 32, 97, 99,111,115, 40,100,111,116, 40,118,101, 99, 91, 50, 93, 44, 32,118,101,
+ 99, 91, 51, 93, 41, 41, 59, 10,  9,114, 97,100, 91, 51, 93, 32, 61, 32, 97, 99,111,115, 40,100,111,116, 40,118,101, 99, 91, 51,
+ 93, 44, 32,118,101, 99, 91, 48, 93, 41, 41, 59, 10, 10,  9,102, 97, 99, 61, 32, 32,114, 97,100, 91, 48, 93, 42,100,111,116, 40,
+118,110, 44, 32, 99, 91, 48, 93, 41, 59, 10,  9,102, 97, 99, 43, 61, 32,114, 97,100, 91, 49, 93, 42,100,111,116, 40,118,110, 44,
+ 32, 99, 91, 49, 93, 41, 59, 10,  9,102, 97, 99, 43, 61, 32,114, 97,100, 91, 50, 93, 42,100,111,116, 40,118,110, 44, 32, 99, 91,
+ 50, 93, 41, 59, 10,  9,102, 97, 99, 43, 61, 32,114, 97,100, 91, 51, 93, 42,100,111,116, 40,118,110, 44, 32, 99, 91, 51, 93, 41,
+ 59, 10, 10,  9,114,101,116,117,114,110, 32,109, 97,120, 40,102, 97, 99, 44, 32, 48, 46, 48, 41, 59, 10,125, 10, 10,118,111,105,
+100, 32,115,104, 97,100,101, 95,105,110,112, 95, 97,114,101, 97, 40,118,101, 99, 51, 32,112,111,115,105,116,105,111,110, 44, 32,
+118,101, 99, 51, 32,108, 97,109,112, 99,111, 44, 32,118,101, 99, 51, 32,108, 97,109,112,118,101, 99, 44, 32,118,101, 99, 51, 32,
+118,110, 44, 32,109, 97,116, 52, 32, 97,114,101, 97, 44, 32,102,108,111, 97,116, 32, 97,114,101, 97,115,105,122,101, 44, 32,102,
+108,111, 97,116, 32,107, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,105,110,112, 41, 10,123, 10,  9,118,101, 99, 51, 32, 99,
+111, 32, 61, 32,112,111,115,105,116,105,111,110, 59, 10,  9,118,101, 99, 51, 32,118,101, 99, 32, 61, 32, 99,111, 32, 45, 32,108,
+ 97,109,112, 99,111, 59, 10, 10,  9,105,102, 40,100,111,116, 40,118,101, 99, 44, 32,108, 97,109,112,118,101, 99, 41, 32, 60, 32,
+ 48, 46, 48, 41, 32,123, 10,  9,  9,105,110,112, 32, 61, 32, 48, 46, 48, 59, 10,  9,125, 10,  9,101,108,115,101, 32,123, 10,  9,
+  9,102,108,111, 97,116, 32,105,110,116,101,110,115, 32, 61, 32, 97,114,101, 97, 95,108, 97,109,112, 95,101,110,101,114,103,121,
+ 40, 97,114,101, 97, 44, 32, 99,111, 44, 32,118,110, 41, 59, 10, 10,  9,  9,105,110,112, 32, 61, 32,112,111,119, 40,105,110,116,
+101,110,115, 42, 97,114,101, 97,115,105,122,101, 44, 32,107, 41, 59, 10,  9,125, 10,125, 10, 10,118,111,105,100, 32,115,104, 97,
+100,101, 95,100,105,102,102,117,115,101, 95,111,114,101,110, 95,110, 97,121,101,114, 40,102,108,111, 97,116, 32,110,108, 44, 32,
+118,101, 99, 51, 32,110, 44, 32,118,101, 99, 51, 32,108, 44, 32,118,101, 99, 51, 32,118, 44, 32,102,108,111, 97,116, 32,114,111,
+117,103,104, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,105,115, 41, 10,123, 10,  9,118,101, 99, 51, 32,104, 32, 61, 32,110,
+111,114,109, 97,108,105,122,101, 40,118, 32, 43, 32,108, 41, 59, 10,  9,102,108,111, 97,116, 32,110,104, 32, 61, 32,109, 97,120,
+ 40,100,111,116, 40,110, 44, 32,104, 41, 44, 32, 48, 46, 48, 41, 59, 10,  9,102,108,111, 97,116, 32,110,118, 32, 61, 32,109, 97,
+120, 40,100,111,116, 40,110, 44, 32,118, 41, 44, 32, 48, 46, 48, 41, 59, 10,  9,102,108,111, 97,116, 32,114,101, 97,108,110,108,
+ 32, 61, 32,100,111,116, 40,110, 44, 32,108, 41, 59, 10, 10,  9,105,102, 40,114,101, 97,108,110,108, 32, 60, 32, 48, 46, 48, 41,
+ 32,123, 10,  9,  9,105,115, 32, 61, 32, 48, 46, 48, 59, 10,  9,125, 10,  9,101,108,115,101, 32,105,102, 40,110,108, 32, 60, 32,
+ 48, 46, 48, 41, 32,123, 10,  9,  9,105,115, 32, 61, 32, 48, 46, 48, 59, 10,  9,125, 10,  9,101,108,115,101, 32,123, 10,  9,  9,
+102,108,111, 97,116, 32,118,104, 32, 61, 32,109, 97,120, 40,100,111,116, 40,118, 44, 32,104, 41, 44, 32, 48, 46, 48, 41, 59, 10,
+  9,  9,102,108,111, 97,116, 32, 76,105,116, 95, 65, 32, 61, 32, 97, 99,111,115, 40,114,101, 97,108,110,108, 41, 59, 10,  9,  9,
+102,108,111, 97,116, 32, 86,105,101,119, 95, 65, 32, 61, 32, 97, 99,111,115, 40,110,118, 41, 59, 10, 10,  9,  9,118,101, 99, 51,
+ 32, 76,105,116, 95, 66, 32, 61, 32,110,111,114,109, 97,108,105,122,101, 40,108, 32, 45, 32,114,101, 97,108,110,108, 42,110, 41,
+ 59, 10,  9,  9,118,101, 99, 51, 32, 86,105,101,119, 95, 66, 32, 61, 32,110,111,114,109, 97,108,105,122,101, 40,118, 32, 45, 32,
+110,118, 42,110, 41, 59, 10, 10,  9,  9,102,108,111, 97,116, 32,116, 32, 61, 32,109, 97,120, 40,100,111,116, 40, 76,105,116, 95,
+ 66, 44, 32, 86,105,101,119, 95, 66, 41, 44, 32, 48, 46, 48, 41, 59, 10, 10,  9,  9,102,108,111, 97,116, 32, 97, 44, 32, 98, 59,
+ 10, 10,  9,  9,105,102, 40, 76,105,116, 95, 65, 32, 62, 32, 86,105,101,119, 95, 65, 41, 32,123, 10,  9,  9,  9, 97, 32, 61, 32,
+ 76,105,116, 95, 65, 59, 10,  9,  9,  9, 98, 32, 61, 32, 86,105,101,119, 95, 65, 59, 10,  9,  9,125, 10,  9,  9,101,108,115,101,
+ 32,123, 10,  9,  9,  9, 97, 32, 61, 32, 86,105,101,119, 95, 65, 59, 10,  9,  9,  9, 98, 32, 61, 32, 76,105,116, 95, 65, 59, 10,
+  9,  9,125, 10, 10,  9,  9,102,108,111, 97,116, 32, 65, 32, 61, 32, 49, 46, 48, 32, 45, 32, 40, 48, 46, 53, 42, 40, 40,114,111,
+117,103,104, 42,114,111,117,103,104, 41, 47, 40, 40,114,111,117,103,104, 42,114,111,117,103,104, 41, 32, 43, 32, 48, 46, 51, 51,
+ 41, 41, 41, 59, 10,  9,  9,102,108,111, 97,116, 32, 66, 32, 61, 32, 48, 46, 52, 53, 42, 40, 40,114,111,117,103,104, 42,114,111,
+117,103,104, 41, 47, 40, 40,114,111,117,103,104, 42,114,111,117,103,104, 41, 32, 43, 32, 48, 46, 48, 57, 41, 41, 59, 10, 10,  9,
+  9, 98, 32, 42, 61, 32, 48, 46, 57, 53, 59, 10,  9,  9,105,115, 32, 61, 32,110,108, 42, 40, 65, 32, 43, 32, 40, 66, 32, 42, 32,
+116, 32, 42, 32,115,105,110, 40, 97, 41, 32, 42, 32,116, 97,110, 40, 98, 41, 41, 41, 59, 10,  9,125, 10,125, 10, 10,118,111,105,
+100, 32,115,104, 97,100,101, 95,100,105,102,102,117,115,101, 95,116,111,111,110, 40,118,101, 99, 51, 32,110, 44, 32,118,101, 99,
+ 51, 32,108, 44, 32,118,101, 99, 51, 32,118, 44, 32,102,108,111, 97,116, 32,115,105,122,101, 44, 32,102,108,111, 97,116, 32,116,
+115,109,111,111,116,104, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,105,115, 41, 10,123, 10,  9,102,108,111, 97,116, 32,114,
+115,108,116, 32, 61, 32,100,111,116, 40,110, 44, 32,108, 41, 59, 10,  9,102,108,111, 97,116, 32, 97,110,103, 32, 61, 32, 97, 99,
+111,115, 40,114,115,108,116, 41, 59, 10, 10,  9,105,102, 40, 97,110,103, 32, 60, 32,115,105,122,101, 41, 32,105,115, 32, 61, 32,
+ 49, 46, 48, 59, 10,  9,101,108,115,101, 32,105,102, 40, 97,110,103, 32, 62, 32, 40,115,105,122,101, 32, 43, 32,116,115,109,111,
+111,116,104, 41, 32,124,124, 32,116,115,109,111,111,116,104, 32, 61, 61, 32, 48, 46, 48, 41, 32,105,115, 32, 61, 32, 48, 46, 48,
+ 59, 10,  9,101,108,115,101, 32,105,115, 32, 61, 32, 49, 46, 48, 32, 45, 32, 40, 40, 97,110,103, 32, 45, 32,115,105,122,101, 41,
+ 47,116,115,109,111,111,116,104, 41, 59, 10,125, 10, 10,118,111,105,100, 32,115,104, 97,100,101, 95,100,105,102,102,117,115,101,
+ 95,109,105,110,110, 97,101,114,116, 40,102,108,111, 97,116, 32,110,108, 44, 32,118,101, 99, 51, 32,110, 44, 32,118,101, 99, 51,
+ 32,118, 44, 32,102,108,111, 97,116, 32,100, 97,114,107,110,101,115,115, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,105,115,
+ 41, 10,123, 10,  9,105,102, 40,110,108, 32, 60, 61, 32, 48, 46, 48, 41, 32,123, 10,  9,  9,105,115, 32, 61, 32, 48, 46, 48, 59,
+ 10,  9,125, 10,  9,101,108,115,101, 32,123, 10,  9,  9,102,108,111, 97,116, 32,110,118, 32, 61, 32,109, 97,120, 40,100,111,116,
+ 40,110, 44, 32,118, 41, 44, 32, 48, 46, 48, 41, 59, 10, 10,  9,  9,105,102, 40,100, 97,114,107,110,101,115,115, 32, 60, 61, 32,
+ 49, 46, 48, 41, 10,  9,  9,  9,105,115, 32, 61, 32,110,108, 42,112,111,119, 40,109, 97,120, 40,110,118, 42,110,108, 44, 32, 48,
+ 46, 49, 41, 44, 32,100, 97,114,107,110,101,115,115, 32, 45, 32, 49, 46, 48, 41, 59, 10,  9,  9,101,108,115,101, 10,  9,  9,  9,
+105,115, 32, 61, 32,110,108, 42,112,111,119, 40, 49, 46, 48, 48, 48, 49, 32, 45, 32,110,118, 44, 32,100, 97,114,107,110,101,115,
+115, 32, 45, 32, 49, 46, 48, 41, 59, 10,  9,125, 10,125, 10, 10,102,108,111, 97,116, 32,102,114,101,115,110,101,108, 95,102, 97,
+ 99, 40,118,101, 99, 51, 32,118,105,101,119, 44, 32,118,101, 99, 51, 32,118,110, 44, 32,102,108,111, 97,116, 32,103,114, 97,100,
+ 44, 32,102,108,111, 97,116, 32,102, 97, 99, 41, 10,123, 10,  9,102,108,111, 97,116, 32,116, 49, 44, 32,116, 50, 59, 10,  9,102,
+108,111, 97,116, 32,102,102, 97, 99, 59, 10, 10,  9,105,102, 40,102, 97, 99, 61, 61, 48, 46, 48, 41, 32,123, 10,  9,  9,102,102,
+ 97, 99, 32, 61, 32, 49, 46, 48, 59, 10,  9,125, 10,  9,101,108,115,101, 32,123, 10,  9,  9,116, 49, 61, 32,100,111,116, 40,118,
+105,101,119, 44, 32,118,110, 41, 59, 10,  9,  9,105,102, 40,116, 49, 62, 48, 46, 48, 41, 32, 32,116, 50, 61, 32, 49, 46, 48, 43,
+116, 49, 59, 10,  9,  9,101,108,115,101, 32,116, 50, 61, 32, 49, 46, 48, 45,116, 49, 59, 10, 10,  9,  9,116, 50, 61, 32,103,114,
+ 97,100, 32, 43, 32, 40, 49, 46, 48, 45,103,114, 97,100, 41, 42,112,111,119, 40,116, 50, 44, 32,102, 97, 99, 41, 59, 10, 10,  9,
+  9,105,102, 40,116, 50, 60, 48, 46, 48, 41, 32,102,102, 97, 99, 32, 61, 32, 48, 46, 48, 59, 10,  9,  9,101,108,115,101, 32,105,
+102, 40,116, 50, 62, 49, 46, 48, 41, 32,102,102, 97, 99, 32, 61, 32, 49, 46, 48, 59, 10,  9,  9,101,108,115,101, 32,102,102, 97,
+ 99, 32, 61, 32,116, 50, 59, 10,  9,125, 10, 10,  9,114,101,116,117,114,110, 32,102,102, 97, 99, 59, 10,125, 10, 10,118,111,105,
+100, 32,115,104, 97,100,101, 95,100,105,102,102,117,115,101, 95,102,114,101,115,110,101,108, 40,118,101, 99, 51, 32,118,110, 44,
+ 32,118,101, 99, 51, 32,108,118, 44, 32,118,101, 99, 51, 32,118,105,101,119, 44, 32,102,108,111, 97,116, 32,102, 97, 99, 95,105,
+ 44, 32,102,108,111, 97,116, 32,102, 97, 99, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,105,115, 41, 10,123, 10,  9,105,115,
+ 32, 61, 32,102,114,101,115,110,101,108, 95,102, 97, 99, 40,108,118, 44, 32,118,110, 44, 32,102, 97, 99, 95,105, 44, 32,102, 97,
+ 99, 41, 59, 10,125, 10, 10,118,111,105,100, 32,115,104, 97,100,101, 95, 99,117, 98,105, 99, 40,102,108,111, 97,116, 32,105,115,
+ 44, 32,111,117,116, 32,102,108,111, 97,116, 32,111,117,116,105,115, 41, 10,123, 10,  9,105,102, 40,105,115, 62, 48, 46, 48, 32,
+ 38, 38, 32,105,115, 60, 49, 46, 48, 41, 10,  9,  9,111,117,116,105,115, 61, 32,115,109,111,111,116,104,115,116,101,112, 40, 48,
+ 46, 48, 44, 32, 49, 46, 48, 44, 32,105,115, 41, 59, 10,  9,101,108,115,101, 10,  9,  9,111,117,116,105,115, 61, 32,105,115, 59,
+ 10,125, 10, 10,118,111,105,100, 32,115,104, 97,100,101, 95,118,105,115,105,102, 97, 99, 40,102,108,111, 97,116, 32,105, 44, 32,
+102,108,111, 97,116, 32,118,105,115,105,102, 97, 99, 44, 32,102,108,111, 97,116, 32,114,101,102,108, 44, 32,111,117,116, 32,102,
+108,111, 97,116, 32,111,117,116,105, 41, 10,123, 10,  9, 47, 42,105,102, 40,105, 32, 62, 32, 48, 46, 48, 41, 42, 47, 10,  9,  9,
+111,117,116,105, 32, 61, 32,109, 97,120, 40,105, 42,118,105,115,105,102, 97, 99, 42,114,101,102,108, 44, 32, 48, 46, 48, 41, 59,
+ 10,  9, 47, 42,101,108,115,101, 10,  9,  9,111,117,116,105, 32, 61, 32,105, 59, 42, 47, 10,125, 10, 10,118,111,105,100, 32,115,
+104, 97,100,101, 95,116, 97,110,103,101,110,116, 95,118, 95,115,112,101, 99, 40,118,101, 99, 51, 32,116, 97,110,103, 44, 32,111,
+117,116, 32,118,101, 99, 51, 32,118,110, 41, 10,123, 10,  9,118,110, 32, 61, 32,116, 97,110,103, 59, 10,125, 10, 10,118,111,105,
+100, 32,115,104, 97,100,101, 95, 97,100,100, 95,116,111, 95,100,105,102,102,117,115,101, 40,102,108,111, 97,116, 32,105, 44, 32,
+118,101, 99, 51, 32,108, 97,109,112, 99,111,108, 44, 32,118,101, 99, 51, 32, 99,111,108, 44, 32,111,117,116, 32,118,101, 99, 51,
+ 32,111,117,116, 99,111,108, 41, 10,123, 10,  9,105,102, 40,105, 32, 62, 32, 48, 46, 48, 41, 10,  9,  9,111,117,116, 99,111,108,
+ 32, 61, 32,105, 42,108, 97,109,112, 99,111,108, 42, 99,111,108, 59, 10,  9,101,108,115,101, 10,  9,  9,111,117,116, 99,111,108,
+ 32, 61, 32,118,101, 99, 51, 40, 48, 46, 48, 44, 32, 48, 46, 48, 44, 32, 48, 46, 48, 41, 59, 10,125, 10, 10,118,111,105,100, 32,
+115,104, 97,100,101, 95,104,101,109,105, 95,115,112,101, 99, 40,118,101, 99, 51, 32,118,110, 44, 32,118,101, 99, 51, 32,108,118,
+ 44, 32,118,101, 99, 51, 32,118,105,101,119, 44, 32,102,108,111, 97,116, 32,115,112,101, 99, 44, 32,102,108,111, 97,116, 32,104,
+ 97,114,100, 44, 32,102,108,111, 97,116, 32,118,105,115,105,102, 97, 99, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,116, 41,
+ 10,123, 10,  9,108,118, 32, 43, 61, 32,118,105,101,119, 59, 10,  9,108,118, 32, 61, 32,110,111,114,109, 97,108,105,122,101, 40,
+108,118, 41, 59, 10, 10,  9,116, 32, 61, 32,100,111,116, 40,118,110, 44, 32,108,118, 41, 59, 10,  9,116, 32, 61, 32, 48, 46, 53,
+ 42,116, 32, 43, 32, 48, 46, 53, 59, 10, 10,  9,116, 32, 61, 32,118,105,115,105,102, 97, 99, 42,115,112,101, 99, 42,112,111,119,
+ 40,116, 44, 32,104, 97,114,100, 41, 59, 10,125, 10, 10,118,111,105,100, 32,115,104, 97,100,101, 95,112,104,111,110,103, 95,115,
+112,101, 99, 40,118,101, 99, 51, 32,110, 44, 32,118,101, 99, 51, 32,108, 44, 32,118,101, 99, 51, 32,118, 44, 32,102,108,111, 97,
+116, 32,104, 97,114,100, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,115,112,101, 99,102, 97, 99, 41, 10,123, 10,  9,118,101,
+ 99, 51, 32,104, 32, 61, 32,110,111,114,109, 97,108,105,122,101, 40,108, 32, 43, 32,118, 41, 59, 10,  9,102,108,111, 97,116, 32,
+114,115,108,116, 32, 61, 32,109, 97,120, 40,100,111,116, 40,104, 44, 32,110, 41, 44, 32, 48, 46, 48, 41, 59, 10, 10,  9,115,112,
+101, 99,102, 97, 99, 32, 61, 32,112,111,119, 40,114,115,108,116, 44, 32,104, 97,114,100, 41, 59, 10,125, 10, 10,118,111,105,100,
+ 32,115,104, 97,100,101, 95, 99,111,111,107,116,111,114,114, 95,115,112,101, 99, 40,118,101, 99, 51, 32,110, 44, 32,118,101, 99,
+ 51, 32,108, 44, 32,118,101, 99, 51, 32,118, 44, 32,102,108,111, 97,116, 32,104, 97,114,100, 44, 32,111,117,116, 32,102,108,111,
+ 97,116, 32,115,112,101, 99,102, 97, 99, 41, 10,123, 10,  9,118,101, 99, 51, 32,104, 32, 61, 32,110,111,114,109, 97,108,105,122,
+101, 40,118, 32, 43, 32,108, 41, 59, 10,  9,102,108,111, 97,116, 32,110,104, 32, 61, 32,100,111,116, 40,110, 44, 32,104, 41, 59,
+ 10, 10,  9,105,102, 40,110,104, 32, 60, 32, 48, 46, 48, 41, 32,123, 10,  9,  9,115,112,101, 99,102, 97, 99, 32, 61, 32, 48, 46,
+ 48, 59, 10,  9,125, 10,  9,101,108,115,101, 32,123, 10,  9,  9,102,108,111, 97,116, 32,110,118, 32, 61, 32,109, 97,120, 40,100,
+111,116, 40,110, 44, 32,118, 41, 44, 32, 48, 46, 48, 41, 59, 10,  9,  9,102,108,111, 97,116, 32,105, 32, 61, 32,112,111,119, 40,
+110,104, 44, 32,104, 97,114,100, 41, 59, 10, 10,  9,  9,105, 32, 61, 32,105, 47, 40, 48, 46, 49, 43,110,118, 41, 59, 10,  9,  9,
+115,112,101, 99,102, 97, 99, 32, 61, 32,105, 59, 10,  9,125, 10,125, 10, 10,118,111,105,100, 32,115,104, 97,100,101, 95, 98,108,
+105,110,110, 95,115,112,101, 99, 40,118,101, 99, 51, 32,110, 44, 32,118,101, 99, 51, 32,108, 44, 32,118,101, 99, 51, 32,118, 44,
+ 32,102,108,111, 97,116, 32,114,101,102,114, 97, 99, 44, 32,102,108,111, 97,116, 32,115,112,101, 99, 95,112,111,119,101,114, 44,
+ 32,111,117,116, 32,102,108,111, 97,116, 32,115,112,101, 99,102, 97, 99, 41, 10,123, 10,  9,105,102, 40,114,101,102,114, 97, 99,
+ 32, 60, 32, 49, 46, 48, 41, 32,123, 10,  9,  9,115,112,101, 99,102, 97, 99, 32, 61, 32, 48, 46, 48, 59, 10,  9,125, 10,  9,101,
+108,115,101, 32,105,102, 40,115,112,101, 99, 95,112,111,119,101,114, 32, 61, 61, 32, 48, 46, 48, 41, 32,123, 10,  9,  9,115,112,
+101, 99,102, 97, 99, 32, 61, 32, 48, 46, 48, 59, 10,  9,125, 10,  9,101,108,115,101, 32,123, 10,  9,  9,105,102, 40,115,112,101,
+ 99, 95,112,111,119,101,114, 60, 49, 48, 48, 46, 48, 41, 10,  9,  9,  9,115,112,101, 99, 95,112,111,119,101,114, 61, 32,115,113,
+114,116, 40, 49, 46, 48, 47,115,112,101, 99, 95,112,111,119,101,114, 41, 59, 10,  9,  9,101,108,115,101, 10,  9,  9,  9,115,112,
+101, 99, 95,112,111,119,101,114, 61, 32, 49, 48, 46, 48, 47,115,112,101, 99, 95,112,111,119,101,114, 59, 10, 10,  9,  9,118,101,
+ 99, 51, 32,104, 32, 61, 32,110,111,114,109, 97,108,105,122,101, 40,118, 32, 43, 32,108, 41, 59, 10,  9,  9,102,108,111, 97,116,
+ 32,110,104, 32, 61, 32,100,111,116, 40,110, 44, 32,104, 41, 59, 10,  9,  9,105,102, 40,110,104, 32, 60, 32, 48, 46, 48, 41, 32,
+123, 10,  9,  9,  9,115,112,101, 99,102, 97, 99, 32, 61, 32, 48, 46, 48, 59, 10,  9,  9,125, 10,  9,  9,101,108,115,101, 32,123,
+ 10,  9,  9,  9,102,108,111, 97,116, 32,110,118, 32, 61, 32,109, 97,120, 40,100,111,116, 40,110, 44, 32,118, 41, 44, 32, 48, 46,
+ 48, 49, 41, 59, 10,  9,  9,  9,102,108,111, 97,116, 32,110,108, 32, 61, 32,100,111,116, 40,110, 44, 32,108, 41, 59, 10,  9,  9,
+  9,105,102, 40,110,108, 32, 60, 61, 32, 48, 46, 48, 49, 41, 32,123, 10,  9,  9,  9,  9,115,112,101, 99,102, 97, 99, 32, 61, 32,
+ 48, 46, 48, 59, 10,  9,  9,  9,125, 10,  9,  9,  9,101,108,115,101, 32,123, 10,  9,  9,  9,  9,102,108,111, 97,116, 32,118,104,
+ 32, 61, 32,109, 97,120, 40,100,111,116, 40,118, 44, 32,104, 41, 44, 32, 48, 46, 48, 49, 41, 59, 10, 10,  9,  9,  9,  9,102,108,
+111, 97,116, 32, 97, 32, 61, 32, 49, 46, 48, 59, 10,  9,  9,  9,  9,102,108,111, 97,116, 32, 98, 32, 61, 32, 40, 50, 46, 48, 42,
+110,104, 42,110,118, 41, 47,118,104, 59, 10,  9,  9,  9,  9,102,108,111, 97,116, 32, 99, 32, 61, 32, 40, 50, 46, 48, 42,110,104,
+ 42,110,108, 41, 47,118,104, 59, 10, 10,  9,  9,  9,  9,102,108,111, 97,116, 32,103, 59, 10, 10,  9,  9,  9,  9,105,102, 40, 97,
+ 32, 60, 32, 98, 32, 38, 38, 32, 97, 32, 60, 32, 99, 41, 32,103, 32, 61, 32, 97, 59, 10,  9,  9,  9,  9,101,108,115,101, 32,105,
+102, 40, 98, 32, 60, 32, 97, 32, 38, 38, 32, 98, 32, 60, 32, 99, 41, 32,103, 32, 61, 32, 98, 59, 10,  9,  9,  9,  9,101,108,115,
+101, 32,105,102, 40, 99, 32, 60, 32, 97, 32, 38, 38, 32, 99, 32, 60, 32, 98, 41, 32,103, 32, 61, 32, 99, 59, 10, 10,  9,  9,  9,
+  9,102,108,111, 97,116, 32,112, 32, 61, 32,115,113,114,116, 40, 40, 40,114,101,102,114, 97, 99, 32, 42, 32,114,101,102,114, 97,
+ 99, 41, 43, 40,118,104, 42,118,104, 41, 45, 49, 46, 48, 41, 41, 59, 10,  9,  9,  9,  9,102,108,111, 97,116, 32,102, 32, 61, 32,
+ 40, 40, 40,112, 45,118,104, 41, 42, 40,112, 45,118,104, 41, 41, 47, 40, 40,112, 43,118,104, 41, 42, 40,112, 43,118,104, 41, 41,
+ 41, 42, 40, 49, 46, 48, 43, 40, 40, 40, 40,118,104, 42, 40,112, 43,118,104, 41, 41, 45, 49, 46, 48, 41, 42, 40, 40,118,104, 42,
+ 40,112, 43,118,104, 41, 41, 45, 49, 46, 48, 41, 41, 47, 40, 40, 40,118,104, 42, 40,112, 45,118,104, 41, 41, 43, 49, 46, 48, 41,
+ 42, 40, 40,118,104, 42, 40,112, 45,118,104, 41, 41, 43, 49, 46, 48, 41, 41, 41, 41, 59, 10,  9,  9,  9,  9,102,108,111, 97,116,
+ 32, 97,110,103, 32, 61, 32, 97, 99,111,115, 40,110,104, 41, 59, 10, 10,  9,  9,  9,  9,115,112,101, 99,102, 97, 99, 32, 61, 32,
+109, 97,120, 40,102, 42,103, 42,101,120,112, 95, 98,108,101,110,100,101,114, 40, 40, 45, 40, 97,110,103, 42, 97,110,103, 41, 47,
+ 40, 50, 46, 48, 42,115,112,101, 99, 95,112,111,119,101,114, 42,115,112,101, 99, 95,112,111,119,101,114, 41, 41, 41, 44, 32, 48,
+ 46, 48, 41, 59, 10,  9,  9,  9,125, 10,  9,  9,125, 10,  9,125, 10,125, 10, 10,118,111,105,100, 32,115,104, 97,100,101, 95,119,
+ 97,114,100,105,115,111, 95,115,112,101, 99, 40,118,101, 99, 51, 32,110, 44, 32,118,101, 99, 51, 32,108, 44, 32,118,101, 99, 51,
+ 32,118, 44, 32,102,108,111, 97,116, 32,114,109,115, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,115,112,101, 99,102, 97, 99,
+ 41, 10,123, 10,  9,118,101, 99, 51, 32,104, 32, 61, 32,110,111,114,109, 97,108,105,122,101, 40,108, 32, 43, 32,118, 41, 59, 10,
+  9,102,108,111, 97,116, 32,110,104, 32, 61, 32,109, 97,120, 40,100,111,116, 40,110, 44, 32,104, 41, 44, 32, 48, 46, 48, 48, 49,
+ 41, 59, 10,  9,102,108,111, 97,116, 32,110,118, 32, 61, 32,109, 97,120, 40,100,111,116, 40,110, 44, 32,118, 41, 44, 32, 48, 46,
+ 48, 48, 49, 41, 59, 10,  9,102,108,111, 97,116, 32,110,108, 32, 61, 32,109, 97,120, 40,100,111,116, 40,110, 44, 32,108, 41, 44,
+ 32, 48, 46, 48, 48, 49, 41, 59, 10,  9,102,108,111, 97,116, 32, 97,110,103,108,101, 32, 61, 32,116, 97,110, 40, 97, 99,111,115,
+ 40,110,104, 41, 41, 59, 10,  9,102,108,111, 97,116, 32, 97,108,112,104, 97, 32, 61, 32,109, 97,120, 40,114,109,115, 44, 32, 48,
+ 46, 48, 48, 49, 41, 59, 10, 10,  9,115,112,101, 99,102, 97, 99, 61, 32,110,108, 32, 42, 32, 40, 49, 46, 48, 47, 40, 52, 46, 48,
+ 42, 77, 95, 80, 73, 42, 97,108,112,104, 97, 42, 97,108,112,104, 97, 41, 41, 42, 40,101,120,112, 95, 98,108,101,110,100,101,114,
+ 40, 45, 40, 97,110,103,108,101, 42, 97,110,103,108,101, 41, 47, 40, 97,108,112,104, 97, 42, 97,108,112,104, 97, 41, 41, 47, 40,
+115,113,114,116, 40,110,118, 42,110,108, 41, 41, 41, 59, 10,125, 10, 10,118,111,105,100, 32,115,104, 97,100,101, 95,116,111,111,
+110, 95,115,112,101, 99, 40,118,101, 99, 51, 32,110, 44, 32,118,101, 99, 51, 32,108, 44, 32,118,101, 99, 51, 32,118, 44, 32,102,
+108,111, 97,116, 32,115,105,122,101, 44, 32,102,108,111, 97,116, 32,116,115,109,111,111,116,104, 44, 32,111,117,116, 32,102,108,
+111, 97,116, 32,115,112,101, 99,102, 97, 99, 41, 10,123, 10,  9,118,101, 99, 51, 32,104, 32, 61, 32,110,111,114,109, 97,108,105,
+122,101, 40,108, 32, 43, 32,118, 41, 59, 10,  9,102,108,111, 97,116, 32,114,115,108,116, 32, 61, 32,100,111,116, 40,104, 44, 32,
+110, 41, 59, 10,  9,102,108,111, 97,116, 32, 97,110,103, 32, 61, 32, 97, 99,111,115, 40,114,115,108,116, 41, 59, 10, 10,  9,105,
+102, 40, 97,110,103, 32, 60, 32,115,105,122,101, 41, 32,114,115,108,116, 32, 61, 32, 49, 46, 48, 59, 10,  9,101,108,115,101, 32,
+105,102, 40, 97,110,103, 32, 62, 61, 32, 40,115,105,122,101, 32, 43, 32,116,115,109,111,111,116,104, 41, 32,124,124, 32,116,115,
+109,111,111,116,104, 32, 61, 61, 32, 48, 46, 48, 41, 32,114,115,108,116, 32, 61, 32, 48, 46, 48, 59, 10,  9,101,108,115,101, 32,
+114,115,108,116, 32, 61, 32, 49, 46, 48, 32, 45, 32, 40, 40, 97,110,103, 32, 45, 32,115,105,122,101, 41, 47,116,115,109,111,111,
+116,104, 41, 59, 10, 10,  9,115,112,101, 99,102, 97, 99, 32, 61, 32,114,115,108,116, 59, 10,125, 10, 10,118,111,105,100, 32,115,
+104, 97,100,101, 95,115,112,101, 99, 95, 97,114,101, 97, 95,105,110,112, 40,102,108,111, 97,116, 32,115,112,101, 99,102, 97, 99,
+ 44, 32,102,108,111, 97,116, 32,105,110,112, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,111,117,116,115,112,101, 99,102, 97,
+ 99, 41, 10,123, 10,  9,111,117,116,115,112,101, 99,102, 97, 99, 32, 61, 32,115,112,101, 99,102, 97, 99, 42,105,110,112, 59, 10,
+125, 10, 10,118,111,105,100, 32,115,104, 97,100,101, 95,115,112,101, 99, 95,116, 40,102,108,111, 97,116, 32,115,104, 97,100,102,
+ 97, 99, 44, 32,102,108,111, 97,116, 32,115,112,101, 99, 44, 32,102,108,111, 97,116, 32,118,105,115,105,102, 97, 99, 44, 32,102,
+108,111, 97,116, 32,115,112,101, 99,102, 97, 99, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,116, 41, 10,123, 10,  9,116, 32,
+ 61, 32,115,104, 97,100,102, 97, 99, 42,115,112,101, 99, 42,118,105,115,105,102, 97, 99, 42,115,112,101, 99,102, 97, 99, 59, 10,
+125, 10, 10,118,111,105,100, 32,115,104, 97,100,101, 95, 97,100,100, 95,115,112,101, 99, 40,102,108,111, 97,116, 32,116, 44, 32,
+118,101, 99, 51, 32,108, 97,109,112, 99,111,108, 44, 32,118,101, 99, 51, 32,115,112,101, 99, 99,111,108, 44, 32,111,117,116, 32,
+118,101, 99, 51, 32,111,117,116, 99,111,108, 41, 10,123, 10,  9,111,117,116, 99,111,108, 32, 61, 32,116, 42,108, 97,109,112, 99,
+111,108, 42,115,112,101, 99, 99,111,108, 59, 10,125, 10, 10,118,111,105,100, 32,115,104, 97,100,101, 95, 97,100,100, 40,118,101,
+ 99, 52, 32, 99,111,108, 49, 44, 32,118,101, 99, 52, 32, 99,111,108, 50, 44, 32,111,117,116, 32,118,101, 99, 52, 32,111,117,116,
+ 99,111,108, 41, 10,123, 10,  9,111,117,116, 99,111,108, 32, 61, 32, 99,111,108, 49, 32, 43, 32, 99,111,108, 50, 59, 10,125, 10,
+ 10,118,111,105,100, 32,115,104, 97,100,101, 95,109, 97,100,100, 40,118,101, 99, 52, 32, 99,111,108, 44, 32,118,101, 99, 52, 32,
+ 99,111,108, 49, 44, 32,118,101, 99, 52, 32, 99,111,108, 50, 44, 32,111,117,116, 32,118,101, 99, 52, 32,111,117,116, 99,111,108,
+ 41, 10,123, 10,  9,111,117,116, 99,111,108, 32, 61, 32, 99,111,108, 32, 43, 32, 99,111,108, 49, 42, 99,111,108, 50, 59, 10,125,
+ 10, 10,118,111,105,100, 32,115,104, 97,100,101, 95,109, 97,100,100,102, 40,118,101, 99, 52, 32, 99,111,108, 44, 32,102,108,111,
+ 97,116, 32,102, 44, 32,118,101, 99, 52, 32, 99,111,108, 49, 44, 32,111,117,116, 32,118,101, 99, 52, 32,111,117,116, 99,111,108,
+ 41, 10,123, 10,  9,111,117,116, 99,111,108, 32, 61, 32, 99,111,108, 32, 43, 32,102, 42, 99,111,108, 49, 59, 10,125, 10, 10,118,
+111,105,100, 32,115,104, 97,100,101, 95,109,117,108, 40,118,101, 99, 52, 32, 99,111,108, 49, 44, 32,118,101, 99, 52, 32, 99,111,
+108, 50, 44, 32,111,117,116, 32,118,101, 99, 52, 32,111,117,116, 99,111,108, 41, 10,123, 10,  9,111,117,116, 99,111,108, 32, 61,
+ 32, 99,111,108, 49, 42, 99,111,108, 50, 59, 10,125, 10, 10,118,111,105,100, 32,115,104, 97,100,101, 95,109,117,108, 95,118, 97,
+108,117,101, 40,102,108,111, 97,116, 32,102, 97, 99, 44, 32,118,101, 99, 52, 32, 99,111,108, 44, 32,111,117,116, 32,118,101, 99,
+ 52, 32,111,117,116, 99,111,108, 41, 10,123, 10,  9,111,117,116, 99,111,108, 32, 61, 32, 99,111,108, 42,102, 97, 99, 59, 10,125,
+ 10, 10,118,111,105,100, 32,115,104, 97,100,101, 95,111, 98, 99,111,108,111,114, 40,118,101, 99, 52, 32, 99,111,108, 44, 32,118,
+101, 99, 52, 32,111, 98, 99,111,108, 44, 32,111,117,116, 32,118,101, 99, 52, 32,111,117,116, 99,111,108, 41, 10,123, 10,  9,111,
+117,116, 99,111,108, 32, 61, 32,118,101, 99, 52, 40, 99,111,108, 46,114,103, 98, 42,111, 98, 99,111,108, 46,114,103, 98, 44, 32,
+ 99,111,108, 46, 97, 41, 59, 10,125, 10, 10,118,111,105,100, 32,114, 97,109,112, 95,114,103, 98,116,111, 98,119, 40,118,101, 99,
+ 51, 32, 99,111,108,111,114, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,111,117,116,118, 97,108, 41, 10,123, 10,  9,111,117,
+116,118, 97,108, 32, 61, 32, 99,111,108,111,114, 46,114, 42, 48, 46, 51, 32, 43, 32, 99,111,108,111,114, 46,103, 42, 48, 46, 53,
+ 56, 32, 43, 32, 99,111,108,111,114, 46, 98, 42, 48, 46, 49, 50, 59, 10,125, 10, 10,118,111,105,100, 32,115,104, 97,100,101, 95,
+111,110,108,121, 95,115,104, 97,100,111,119, 40,102,108,111, 97,116, 32,105, 44, 32,102,108,111, 97,116, 32,115,104, 97,100,102,
+ 97, 99, 44, 32,102,108,111, 97,116, 32,101,110,101,114,103,121, 44, 32,118,101, 99, 51, 32,114,103, 98, 44, 32,118,101, 99, 51,
+ 32,115,112,101, 99,114,103, 98, 44, 32,118,101, 99, 52, 32,100,105,102,102, 44, 32,118,101, 99, 52, 32,115,112,101, 99, 44, 32,
+111,117,116, 32,118,101, 99, 52, 32,111,117,116,100,105,102,102, 44, 32,111,117,116, 32,118,101, 99, 52, 32,111,117,116,115,112,
+101, 99, 41, 10,123, 10,  9,115,104, 97,100,102, 97, 99, 32, 61, 32,105, 42,101,110,101,114,103,121, 42, 40, 49, 46, 48, 32, 45,
+ 32,115,104, 97,100,102, 97, 99, 41, 59, 10, 10,  9,111,117,116,100,105,102,102, 32, 61, 32,100,105,102,102, 32, 45, 32,118,101,
+ 99, 52, 40,114,103, 98, 42,115,104, 97,100,102, 97, 99, 44, 32, 48, 46, 48, 41, 59, 10,  9,111,117,116,115,112,101, 99, 32, 61,
+ 32,115,112,101, 99, 32, 45, 32,118,101, 99, 52, 40,115,112,101, 99,114,103, 98, 42,115,104, 97,100,102, 97, 99, 44, 32, 48, 46,
+ 48, 41, 59, 10,125, 10, 10,118,111,105,100, 32,116,101,115,116, 95,115,104, 97,100,111,119, 98,117,102, 40,118,101, 99, 51, 32,
+114, 99,111, 44, 32,115, 97,109,112,108,101,114, 50, 68, 83,104, 97,100,111,119, 32,115,104, 97,100,111,119,109, 97,112, 44, 32,
+109, 97,116, 52, 32,115,104, 97,100,111,119,112,101,114,115,109, 97,116, 44, 32,102,108,111, 97,116, 32,115,104, 97,100,111,119,
+ 98,105, 97,115, 44, 32,102,108,111, 97,116, 32,105,110,112, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,114,101,115,117,108,
+116, 41, 10,123, 10,  9,105,102, 40,105,110,112, 32, 60, 61, 32, 48, 46, 48, 41, 32,123, 10,  9,  9,114,101,115,117,108,116, 32,
+ 61, 32, 48, 46, 48, 59, 10,  9,125, 10,  9,101,108,115,101, 32,123, 10,  9,  9,118,101, 99, 52, 32, 99,111, 32, 61, 32,115,104,
+ 97,100,111,119,112,101,114,115,109, 97,116, 42,118,101, 99, 52, 40,114, 99,111, 44, 32, 49, 46, 48, 41, 59, 10, 10,  9,  9, 47,
+ 47,102,108,111, 97,116, 32, 98,105, 97,115, 32, 61, 32, 40, 49, 46, 53, 32, 45, 32,105,110,112, 42,105,110,112, 41, 42,115,104,
+ 97,100,111,119, 98,105, 97,115, 59, 10,  9,  9, 99,111, 46,122, 32, 45, 61, 32,115,104, 97,100,111,119, 98,105, 97,115, 42, 99,
+111, 46,119, 59, 10, 10,  9,  9,114,101,115,117,108,116, 32, 61, 32,115,104, 97,100,111,119, 50, 68, 80,114,111,106, 40,115,104,
+ 97,100,111,119,109, 97,112, 44, 32, 99,111, 41, 46,120, 59, 10,  9,125, 10,125, 10, 10,118,111,105,100, 32,115,104, 97,100,101,
+ 95,101,120,112,111,115,117,114,101, 95, 99,111,114,114,101, 99,116, 40,118,101, 99, 51, 32, 99,111,108, 44, 32,102,108,111, 97,
+116, 32,108,105,110,102, 97, 99, 44, 32,102,108,111, 97,116, 32,108,111,103,102, 97, 99, 44, 32,111,117,116, 32,118,101, 99, 51,
+ 32,111,117,116, 99,111,108, 41, 10,123, 10,  9,111,117,116, 99,111,108, 32, 61, 32,108,105,110,102, 97, 99, 42, 40, 49, 46, 48,
+ 32, 45, 32,101,120,112, 40, 99,111,108, 42,108,111,103,102, 97, 99, 41, 41, 59, 10,125, 10, 10,118,111,105,100, 32,115,104, 97,
+100,101, 95,109,105,115,116, 95,102, 97, 99,116,111,114, 40,118,101, 99, 51, 32, 99,111, 44, 32,102,108,111, 97,116, 32,109,105,
+115,116,115,116, 97, 44, 32,102,108,111, 97,116, 32,109,105,115,116,100,105,115,116, 44, 32,102,108,111, 97,116, 32,109,105,115,
+116,116,121,112,101, 44, 32,102,108,111, 97,116, 32,109,105,115,105, 44, 32,111,117,116, 32,102,108,111, 97,116, 32,111,117,116,
+102, 97, 99, 41, 10,123, 10,  9,102,108,111, 97,116, 32,102, 97, 99, 44, 32,122, 99,111,114, 59, 10, 10,  9,122, 99,111,114, 32,
+ 61, 32, 40,103,108, 95, 80,114,111,106,101, 99,116,105,111,110, 77, 97,116,114,105,120, 91, 51, 93, 91, 51, 93, 32, 61, 61, 32,
+ 48, 46, 48, 41, 63, 32,108,101,110,103,116,104, 40, 99,111, 41, 58, 32, 45, 99,111, 91, 50, 93, 59, 10,  9, 10,  9,102, 97, 99,
+ 32, 61, 32, 99,108, 97,109,112, 40, 40,122, 99,111,114, 45,109,105,115,116,115,116, 97, 41, 47,109,105,115,116,100,105,115,116,
+ 44, 32, 48, 46, 48, 44, 32, 49, 46, 48, 41, 59, 10,  9,105,102, 40,109,105,115,116,116,121,112,101, 32, 61, 61, 32, 48, 46, 48,
+ 41, 32,102, 97, 99, 32, 42, 61, 32,102, 97, 99, 59, 10,  9,101,108,115,101, 32,105,102, 40,109,105,115,116,116,121,112,101, 32,
+ 61, 61, 32, 49, 46, 48, 41, 59, 10,  9,101,108,115,101, 32,102, 97, 99, 32, 61, 32,115,113,114,116, 40,102, 97, 99, 41, 59, 10,
+ 10,  9,111,117,116,102, 97, 99, 32, 61, 32, 49, 46, 48, 32, 45, 32, 40, 49, 46, 48, 45,102, 97, 99, 41, 42, 40, 49, 46, 48, 45,
+109,105,115,105, 41, 59, 10,125, 10, 10,118,111,105,100, 32,115,104, 97,100,101, 95,119,111,114,108,100, 95,109,105,120, 40,118,
+101, 99, 51, 32,104,111,114, 44, 32,118,101, 99, 52, 32, 99,111,108, 44, 32,111,117,116, 32,118,101, 99, 52, 32,111,117,116, 99,
+111,108, 41, 10,123, 10,  9,102,108,111, 97,116, 32,102, 97, 99, 32, 61, 32, 99,108, 97,109,112, 40, 99,111,108, 46, 97, 44, 32,
+ 48, 46, 48, 44, 32, 49, 46, 48, 41, 59, 10,  9,111,117,116, 99,111,108, 32, 61, 32,118,101, 99, 52, 40,109,105,120, 40,104,111,
+114, 44, 32, 99,111,108, 46,114,103, 98, 44, 32,102, 97, 99, 41, 44, 32, 99,111,108, 46, 97, 41, 59, 10,125, 10, 10,118,111,105,
+100, 32,115,104, 97,100,101, 95, 97,108,112,104, 97, 95,111,112, 97,113,117,101, 40,118,101, 99, 52, 32, 99,111,108, 44, 32,111,
+117,116, 32,118,101, 99, 52, 32,111,117,116, 99,111,108, 41, 10,123, 10,  9,111,117,116, 99,111,108, 32, 61, 32,118,101, 99, 52,
+ 40, 99,111,108, 46,114,103, 98, 44, 32, 49, 46, 48, 41, 59, 10,125, 10, 10,118,111,105,100, 32,115,104, 97,100,101, 95, 97,108,
+112,104, 97, 95,111, 98, 99,111,108,111,114, 40,118,101, 99, 52, 32, 99,111,108, 44, 32,118,101, 99, 52, 32,111, 98, 99,111,108,
+ 44, 32,111,117,116, 32,118,101, 99, 52, 32,111,117,116, 99,111,108, 41, 10,123, 10,  9,111,117,116, 99,111,108, 32, 61, 32,118,
+101, 99, 52, 40, 99,111,108, 46,114,103, 98, 44, 32, 99,111,108, 46, 97, 42,111, 98, 99,111,108, 46, 97, 41, 59, 10,125, 10, 10,
+  0};
+
diff --git a/source/blender/gpu/intern/gpu_shader_vertex.glsl b/source/blender/gpu/intern/gpu_shader_vertex.glsl
new file mode 100644
index 00000000000..ba9ef7dead6
--- /dev/null
+++ b/source/blender/gpu/intern/gpu_shader_vertex.glsl
@@ -0,0 +1,12 @@
+
+varying vec3 varposition;
+varying vec3 varnormal;
+
+void main()
+{
+	vec4 co = gl_ModelViewMatrix * gl_Vertex;
+
+	varposition = co.xyz;
+	varnormal = gl_NormalMatrix * gl_Normal;
+	gl_Position = gl_ProjectionMatrix * co;
+
diff --git a/source/blender/gpu/intern/gpu_shader_vertex.glsl.c b/source/blender/gpu/intern/gpu_shader_vertex.glsl.c
new file mode 100644
index 00000000000..a89de776864
--- /dev/null
+++ b/source/blender/gpu/intern/gpu_shader_vertex.glsl.c
@@ -0,0 +1,13 @@
+/* DataToC output of file <gpu_shader_vertex_glsl> */
+
+int datatoc_gpu_shader_vertex_glsl_size= 217;
+char datatoc_gpu_shader_vertex_glsl[]= {
+ 10,118, 97,114,121,105,110,103, 32,118,101, 99, 51, 32,118, 97,114,112,111,115,105,116,105,111,110,
+ 59, 10,118, 97,114,121,105,110,103, 32,118,101, 99, 51, 32,118, 97,114,110,111,114,109, 97,108, 59, 10, 10,118,111,105,100, 32,
+109, 97,105,110, 40, 41, 10,123, 10,  9,118,101, 99, 52, 32, 99,111, 32, 61, 32,103,108, 95, 77,111,100,101,108, 86,105,101,119,
+ 77, 97,116,114,105,120, 32, 42, 32,103,108, 95, 86,101,114,116,101,120, 59, 10, 10,  9,118, 97,114,112,111,115,105,116,105,111,
+110, 32, 61, 32, 99,111, 46,120,121,122, 59, 10,  9,118, 97,114,110,111,114,109, 97,108, 32, 61, 32,103,108, 95, 78,111,114,109,
+ 97,108, 77, 97,116,114,105,120, 32, 42, 32,103,108, 95, 78,111,114,109, 97,108, 59, 10,  9,103,108, 95, 80,111,115,105,116,105,
+111,110, 32, 61, 32,103,108, 95, 80,114,111,106,101, 99,116,105,111,110, 77, 97,116,114,105,120, 32, 42, 32, 99,111, 59, 10, 10,
+};
+
diff --git a/source/blender/include/BDR_drawmesh.h b/source/blender/include/BDR_drawmesh.h
index 93e08ab452d..34351549345 100644
--- a/source/blender/include/BDR_drawmesh.h
+++ b/source/blender/include/BDR_drawmesh.h
@@ -30,52 +30,11 @@
 #ifndef BDR_DRAWMESH_H
 #define BDR_DRAWMESH_H
 
-struct Image;
-struct MTFace;
 struct Object;
 struct DerivedMesh;
-struct Mesh;
-struct EdgeHash;
-
-/**
- * Enables or disable mipmapping for realtime images (textures).
- * Note that this will will destroy all texture bindings in OpenGL.
- * @see free_realtime_image()
- * @param mipmap Turn mipmapping on (mipmap!=0) or off (mipmap==0).
- */
-void set_mipmap(int mipmap);
-
-/**
- * Enables or disable linear mipmap setting for realtime images (textures).
- * Note that this will will destroy all texture bindings in OpenGL.
- * @see free_realtime_image()
- * @param mipmap Turn linear mipmapping on (linear!=0) or off (linear==0).
- */
-void set_linear_mipmap(int linear);
-
-/**
- * Returns the current setting for linear mipmapping.
- */
-int get_linear_mipmap(void);
-
-/**
- * Resets the realtime image cache variables.
- */
-void clear_realtime_image_cache(void);
-
-
-void update_realtime_image(struct Image *ima, int x, int y, int w, int h);
-void free_realtime_image(struct Image *ima);
-void free_all_realtime_images(void);
-void make_repbind(struct Image *ima);
-int set_tpage(struct MTFace *tface);
-
-void texpaint_enable_mipmap(void);
-void texpaint_disable_mipmap(void);
 
 void draw_mesh_textured(struct Object *ob, struct DerivedMesh *dm, int facesel);
-struct EdgeHash *get_tface_mesh_marked_edge_info(struct Mesh *me);
-void init_realtime_GL(void); 
+void draw_mesh_text(struct Object *ob, int glsl);
 
 #endif /* BDR_DRAWMESH_H */
 
diff --git a/source/blender/include/BDR_drawobject.h b/source/blender/include/BDR_drawobject.h
index de28db64c3b..635b73af80c 100644
--- a/source/blender/include/BDR_drawobject.h
+++ b/source/blender/include/BDR_drawobject.h
@@ -47,8 +47,7 @@ struct EditVert;
 struct EditFace;
 struct EditEdge;
 
-int set_gl_material(int nr);
-int init_gl_materials(struct Object *ob, int check_alpha);
+int draw_glsl_material(struct Object *ob, int dt);
 
 void mesh_foreachScreenVert(void (*func)(void *userData, struct EditVert *eve, int x, int y, int index), void *userData, int clipVerts);
 void mesh_foreachScreenEdge(void (*func)(void *userData, struct EditEdge *eed, int x0, int y0, int x1, int y1, int index), void *userData, int clipVerts);
diff --git a/source/blender/include/BDR_imagepaint.h b/source/blender/include/BDR_imagepaint.h
index 26f2375e60a..bd1ac301416 100644
--- a/source/blender/include/BDR_imagepaint.h
+++ b/source/blender/include/BDR_imagepaint.h
@@ -34,8 +34,8 @@ void imagepaint_redraw_tool(void);
 void imagepaint_pick(short mousebutton);
 void imagepaint_paint(short mousebutton, short texturepaint);
 
-void imagepaint_undo();
-void free_imagepaint();
+void undo_imagepaint_step(int step);
+void undo_imagepaint_clear(void);
 
 #endif /*  BDR_IMAGEPAINT_H */
 
diff --git a/source/blender/include/BIF_gl.h b/source/blender/include/BIF_gl.h
index 2468abdff60..c1b3b056d62 100644
--- a/source/blender/include/BIF_gl.h
+++ b/source/blender/include/BIF_gl.h
@@ -49,20 +49,7 @@
 #endif
 #endif
 
-#ifdef __APPLE__
- #include <OpenGL/gl.h>
- #include <OpenGL/glu.h>
-#else
-/*  #if defined (__sun) || defined (__sun__)
-  #include <GL/gl.h>
-  #include <mesa/glu.h>
- #else
-*/
-  #include <GL/gl.h>
-  #include <GL/glu.h>
-/* #endif */
-#endif
-
+#include "GL/glew.h"
 
 	/*
 	 * these should be phased out. cpack should be replaced in
diff --git a/source/blender/include/BIF_meshtools.h b/source/blender/include/BIF_meshtools.h
index d809d1f21f9..a894d66cb10 100644
--- a/source/blender/include/BIF_meshtools.h
+++ b/source/blender/include/BIF_meshtools.h
@@ -30,6 +30,8 @@
 #ifndef BIF_MESHTOOLS_H
 #define BIF_MESHTOOLS_H
 
+#include "BLO_sys_types.h"
+
 struct Object;
 struct EditVert;
 
diff --git a/source/blender/include/BSE_drawview.h b/source/blender/include/BSE_drawview.h
index e6f22a4fb67..1b2834b2e3b 100644
--- a/source/blender/include/BSE_drawview.h
+++ b/source/blender/include/BSE_drawview.h
@@ -36,8 +36,6 @@ struct rctf;
 struct ScrArea;
 struct ImBuf;
 
-void default_gl_light(void);
-void init_gl_stuff(void);
 void circf(float x, float y, float rad);
 void circ(float x, float y, float rad);
 
@@ -55,8 +53,8 @@ struct ImBuf *read_backbuf(short xmin, short ymin, short xmax, short ymax);
 unsigned int sample_backbuf_rect(short mval[2], int size, unsigned int min, unsigned int max, int *dist, short strict, unsigned int (*indextest)(unsigned int index));
 
 void drawview3dspace(struct ScrArea *sa, void *spacedata);
-void drawview3d_render(struct View3D *v3d, int winx, int winy, float winmat[][4]);
-void draw_depth(struct ScrArea *sa, void *spacedata);
+void drawview3d_render(struct View3D *v3d, float viewmat[][4], int winx, int winy, float winmat[][4], int shadow);
+void draw_depth(struct ScrArea *sa, void *spacedata, int (*func)(void *) );
 void view3d_update_depths(struct View3D *v3d);
 
 int update_time(int cfra);
diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h
index 1c272105067..c7196763358 100644
--- a/source/blender/makesdna/DNA_brush_types.h
+++ b/source/blender/makesdna/DNA_brush_types.h
@@ -33,7 +33,7 @@
 #include "DNA_ID.h"
 
 #ifndef MAX_MTEX
-#define MAX_MTEX	10
+#define MAX_MTEX	18
 #endif
 
 struct MTex;
@@ -58,7 +58,7 @@ typedef struct Brush {
 	float alpha;				/* opacity */
 
 	short texact, pad;
-	struct MTex *mtex[10];
+	struct MTex *mtex[18];		/* MAX_MTEX */
 
 	struct BrushClone clone;
 } Brush;
diff --git a/source/blender/makesdna/DNA_group_types.h b/source/blender/makesdna/DNA_group_types.h
index 1bb18ca2ca2..0987050261d 100644
--- a/source/blender/makesdna/DNA_group_types.h
+++ b/source/blender/makesdna/DNA_group_types.h
@@ -54,7 +54,7 @@ typedef struct Group {
 	 * the objects that show in the group can change depending
 	 * on the last used scene */
 	unsigned int layer;
-	int pad;
+	float dupli_ofs[3];
 } Group;
 
 
diff --git a/source/blender/makesdna/DNA_image_types.h b/source/blender/makesdna/DNA_image_types.h
index 42b651a7555..e1d79f0f875 100644
--- a/source/blender/makesdna/DNA_image_types.h
+++ b/source/blender/makesdna/DNA_image_types.h
@@ -37,6 +37,7 @@ struct PackedFile;
 struct anim;
 struct ImBuf;
 struct RenderResult;
+struct GPUTexture;
 
 
 /* ImageUser is in Texture, in Nodes, Background Image, Image Window, .... */
@@ -62,7 +63,8 @@ typedef struct Image {
 	
 	char name[240];			/* file path */
 	
-	ListBase ibufs;			/* not written in file */
+	ListBase ibufs;					/* not written in file */
+	struct GPUTexture *gputexture;	/* not written in file */
 	
 	/* sources from: */
 	struct anim *anim;
diff --git a/source/blender/makesdna/DNA_ipo_types.h b/source/blender/makesdna/DNA_ipo_types.h
index 1e30f3f7640..e7f46b81935 100644
--- a/source/blender/makesdna/DNA_ipo_types.h
+++ b/source/blender/makesdna/DNA_ipo_types.h
@@ -142,16 +142,24 @@ typedef short IPO_Channel;
 #define MA_FRESTRAI	25
 #define MA_ADD		26
 
-#define MA_MAP1		0x20
-#define MA_MAP2		0x40
-#define MA_MAP3		0x80
-#define MA_MAP4		0x100
-#define MA_MAP5		0x200
-#define MA_MAP6		0x400
-#define MA_MAP7		0x800
-#define MA_MAP8		0x1000
-#define MA_MAP9		0x2000
-#define MA_MAP10	0x4000
+#define MA_MAP1		1<<5
+#define MA_MAP2		1<<6
+#define MA_MAP3		1<<7
+#define MA_MAP4		1<<8
+#define MA_MAP5		1<<9
+#define MA_MAP6		1<<10
+#define MA_MAP7		1<<11
+#define MA_MAP8		1<<12
+#define MA_MAP9		1<<13
+#define MA_MAP10	1<<14
+#define MA_MAP11	1<<15
+#define MA_MAP12	1<<16
+#define MA_MAP13	1<<17
+#define MA_MAP14	1<<18
+#define MA_MAP15	1<<19
+#define MA_MAP16	1<<20
+#define MA_MAP17	1<<21
+#define MA_MAP18	1<<22
 
 #define TEX_TOTNAM	14
 
diff --git a/source/blender/makesdna/DNA_lamp_types.h b/source/blender/makesdna/DNA_lamp_types.h
index c00dae08eb4..2a39580bb5c 100644
--- a/source/blender/makesdna/DNA_lamp_types.h
+++ b/source/blender/makesdna/DNA_lamp_types.h
@@ -35,7 +35,7 @@
 #include "DNA_scriptlink_types.h"
 
 #ifndef MAX_MTEX
-#define MAX_MTEX	10
+#define MAX_MTEX	18
 #endif
 
 struct MTex;
@@ -45,7 +45,8 @@ struct CurveMapping;
 typedef struct Lamp {
 	ID id;
 	
-	short type, mode;
+	short type, pad3;
+	int mode;
 	
 	short colormodel, totex;
 	float r, g, b, k;
@@ -55,10 +56,9 @@ typedef struct Lamp {
 	
 	
 	float att1, att2;	/* Quad1 and Quad2 attenuation */
-	int pad2;
 	struct CurveMapping *curfalloff;
 	short falloff_type;
-	short pad3;
+	short pad2;
 	
 	float clipsta, clipend, shadspotsize;
 	float bias, soft;
@@ -99,7 +99,7 @@ typedef struct Lamp {
 	float YF_glowint, YF_glowofs;
 	short YF_glowtype, YF_pad2;
 	
-	struct MTex *mtex[10];
+	struct MTex *mtex[18];			/* MAX_MTEX */
 	struct Ipo *ipo;
 	
 	/* preview */
@@ -137,6 +137,12 @@ typedef struct Lamp {
 /* yafray: lamp shadowbuffer flag, softlight */
 /* Since it is used with LOCAL lamp, can't use LA_SHAD */
 #define LA_YF_SOFT		16384
+#define LA_LAYER_SHADOW	32768
+
+/* layer_shadow */
+#define LA_LAYER_SHADOW_BOTH	0
+#define LA_LAYER_SHADOW_CAST	1
+#define LA_LAYER_SHADOW_RECEIVE	2
 
 /* sun effect type*/
 #define LA_SUN_EFFECT_SKY			1
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h
index 9412a09d0f4..c92a33bbcbb 100644
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@ -36,7 +36,7 @@
 #include "DNA_listBase.h"
 
 #ifndef MAX_MTEX
-#define MAX_MTEX	10
+#define MAX_MTEX	18
 #endif
 
 struct MTex;
@@ -88,11 +88,11 @@ typedef struct Material {
 	float sbias;			/* shadow bias to prevent terminator prob */
 	float lbias;			/* factor to multiply lampbias with (0.0 = no mult) */
 	float shad_alpha;		/* in use for irregular shadowbuffer */
-	float padf;				/* free padding, take me! */
+	int	septex;
 	
 	/* for buttons and render*/
 	char rgbsel, texact, pr_type, use_nodes;
-	short pr_back, pr_lamp, septex, ml_flag;	/* ml_flag is for disable base material */
+	short pr_back, pr_lamp, pad4, ml_flag;	/* ml_flag is for disable base material */
 	
 	/* shaders */
 	short diff_shader, spec_shader;
@@ -110,7 +110,7 @@ typedef struct Material {
 	short ramp_show, pad3;
 	float rampfac_col, rampfac_spec;
 
-	struct MTex *mtex[10];
+	struct MTex *mtex[18];		/* MAX_MTEX */
 	struct bNodeTree *nodetree;	
 	struct Ipo *ipo;
 	struct Group *group;	/* light group */
@@ -133,6 +133,8 @@ typedef struct Material {
 	int YF_dsmp, YF_preset, YF_djit;
 	
 	ScriptLink scriptlink;
+
+	ListBase gpumaterial;		/* runtime */
 } Material;
 
 /* **************** MATERIAL ********************* */
@@ -203,6 +205,7 @@ typedef struct Material {
 
 /* shade_flag */
 #define MA_CUBIC			1
+#define MA_OBCOLOR			2
 
 /* diff_shader */
 #define MA_DIFF_LAMBERT		0
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index 85c49a03569..d258cf77ef5 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -223,6 +223,8 @@ typedef struct Object {
 /*#ifdef WITH_VERSE*/
 	void *vnode;			/* pointer at object VerseNode */
 /*#endif*/
+
+	ListBase gpulamp;		/* runtime, for lamps only */
 } Object;
 
 /* Warning, this is not used anymore because hooks are now modifiers */
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 75affbfa7f5..72050b0809e 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -464,7 +464,7 @@ typedef struct SculptData
 	struct SculptSession *session;
 
 	/* Pointers to all of sculptmodes's textures */
-	struct MTex *mtex[10];
+	struct MTex *mtex[18];
 
 	/* Editable brush shape */
 	struct CurveMapping *cumap;
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index 856324695a9..11b35b4d6d4 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -188,6 +188,7 @@ typedef struct UserDef {
 	char fontname[256];		// FILE_MAXDIR+FILE length
 	struct ListBase themes;
 	short undosteps;
+	short undomemory, pad[3];
 	short curssize;
 	short tb_leftmouse, tb_rightmouse;
 	struct SolidLight light[3];
diff --git a/source/blender/makesdna/DNA_world_types.h b/source/blender/makesdna/DNA_world_types.h
index 26b3f051944..ab7e25190ad 100644
--- a/source/blender/makesdna/DNA_world_types.h
+++ b/source/blender/makesdna/DNA_world_types.h
@@ -38,7 +38,7 @@ struct Ipo;
 struct MTex;
 
 #ifndef MAX_MTEX
-#define MAX_MTEX	10
+#define MAX_MTEX	18
 #endif
 
 
@@ -108,7 +108,7 @@ typedef struct World {
 	
 	
 	struct Ipo *ipo;
-	struct MTex *mtex[10];
+	struct MTex *mtex[18];		/* MAX_MTEX */
 
 	/* previews */
 	struct PreviewImage *preview;
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index 2cb855ed440..cf83804b999 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -30,7 +30,7 @@ SET(INC
   ../python ../render/extern/include ../../../intern/decimation/extern
   ../imbuf ../avi ../../../intern/elbeem/extern
   ../../../intern/iksolver/extern ../blenloader ../quicktime
-  ../blenkernel
+  ../blenkernel ../../../extern/glew/include ../gpu
   ${SDL_INC}
   ${ZLIB_INC}
   ${PYTHON_INC}
diff --git a/source/blender/nodes/SConscript b/source/blender/nodes/SConscript
index 8682f626b80..8af7b67520e 100644
--- a/source/blender/nodes/SConscript
+++ b/source/blender/nodes/SConscript
@@ -11,6 +11,7 @@ incs += ' ../python ../render/extern/include '
 incs += ' ../imbuf ../avi '
 incs += ' ../blenloader ../quicktime'
 incs += ' ../blenkernel ../renderconverter '
+incs += ' ../gpu #/extern/glew/include '
 
 
 incs += ' ' + env['BF_PYTHON_INC']
diff --git a/source/blender/nodes/intern/CMP_nodes/Makefile b/source/blender/nodes/intern/CMP_nodes/Makefile
index 61b03f237db..8a8d323ac5b 100644
--- a/source/blender/nodes/intern/CMP_nodes/Makefile
+++ b/source/blender/nodes/intern/CMP_nodes/Makefile
@@ -42,4 +42,5 @@ CPPFLAGS += -I../../../blenlib
 CPPFLAGS += -I../../../include
 CPPFLAGS += -I../../../imbuf
 CPPFLAGS += -I../../../render/extern/include
+CPPFLAGS += -I$(NAN_GLEW)/include
 CPPFLAGS += -I$(OPENGL_HEADERS)
diff --git a/source/blender/nodes/intern/Makefile b/source/blender/nodes/intern/Makefile
index 7cf2411ed84..6167cf6bc72 100644
--- a/source/blender/nodes/intern/Makefile
+++ b/source/blender/nodes/intern/Makefile
@@ -42,4 +42,6 @@ CPPFLAGS += -I../../blenlib
 CPPFLAGS += -I../../include
 CPPFLAGS += -I../../imbuf
 CPPFLAGS += -I../../render/extern/include
+CPPFLAGS += -I../../gpu
+CPPFLAGS += -I$(NAN_GLEW)/include
 CPPFLAGS += -I$(OPENGL_HEADERS)
diff --git a/source/blender/nodes/intern/SHD_nodes/Makefile b/source/blender/nodes/intern/SHD_nodes/Makefile
index 1917e9ba15c..ae3cae029d2 100644
--- a/source/blender/nodes/intern/SHD_nodes/Makefile
+++ b/source/blender/nodes/intern/SHD_nodes/Makefile
@@ -44,4 +44,6 @@ CPPFLAGS += -I../../../blenlib
 CPPFLAGS += -I../../../include
 CPPFLAGS += -I../../../imbuf
 CPPFLAGS += -I../../../render/extern/include
+CPPFLAGS += -I../../../gpu
+CPPFLAGS += -I$(NAN_GLEW)/include
 CPPFLAGS += -I$(OPENGL_HEADERS)
diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_camera.c b/source/blender/nodes/intern/SHD_nodes/SHD_camera.c
index 63260ff91ed..20136d75540 100644
--- a/source/blender/nodes/intern/SHD_nodes/SHD_camera.c
+++ b/source/blender/nodes/intern/SHD_nodes/SHD_camera.c
@@ -46,8 +46,13 @@ static void node_shader_exec_camera(void *data, bNode *node, bNodeStack **in, bN
 		VECCOPY(out[0]->vec, shi->co);		/* get view vector */
 		out[1]->vec[0]= fabs(shi->co[2]);		/* get view z-depth */
 		out[2]->vec[0]= Normalize(out[0]->vec);	/* get view distance */
-		}
 	}
+}
+
+static int gpu_shader_camera(GPUMaterial *mat, bNode *node, GPUNodeStack *in, GPUNodeStack *out)
+{
+	return GPU_stack_link(mat, "camera", in, out, GPU_builtin(GPU_VIEW_POSITION));
+}
 
 bNodeType sh_node_camera= {
 	/* *next,*prev */	NULL, NULL,
@@ -63,6 +68,7 @@ bNodeType sh_node_camera= {
 	/* initfunc    */	NULL,
 	/* freestoragefunc    */	NULL,
 	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
+	/* id          */	NULL, NULL, NULL,
+	/* gpufunc     */	gpu_shader_camera
 };
 
diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_curves.c b/source/blender/nodes/intern/SHD_nodes/SHD_curves.c
index b6f1f8d52cd..d277547b636 100644
--- a/source/blender/nodes/intern/SHD_nodes/SHD_curves.c
+++ b/source/blender/nodes/intern/SHD_nodes/SHD_curves.c
@@ -56,6 +56,15 @@ static void node_shader_init_curve_vec(bNode* node)
    node->storage= curvemapping_add(3, -1.0f, -1.0f, 1.0f, 1.0f);
 }
 
+static int gpu_shader_curve_vec(GPUMaterial *mat, bNode *node, GPUNodeStack *in, GPUNodeStack *out)
+{
+	float *array;
+	int size;
+
+	curvemapping_table_RGBA(node->storage, &array, &size);
+	return GPU_stack_link(mat, "curves_vec", in, out, GPU_texture(size, array));
+}
+
 bNodeType sh_node_curve_vec= {
 	/* *next,*prev */	NULL, NULL,
 	/* type code   */	SH_NODE_CURVE_VEC,
@@ -70,7 +79,8 @@ bNodeType sh_node_curve_vec= {
 	/* initfunc    */	node_shader_init_curve_vec,
 	/* freestoragefunc    */	node_free_curves,
 	/* copystoragefunc    */	node_copy_curves,
-	/* id          */	NULL
+	/* id          */	NULL, NULL, NULL,
+	/* gpufunc     */	gpu_shader_curve_vec
 	
 };
 
@@ -100,6 +110,15 @@ static void node_shader_init_curve_rgb(bNode *node)
    node->storage= curvemapping_add(4, 0.0f, 0.0f, 1.0f, 1.0f);
 }
 
+static int gpu_shader_curve_rgb(GPUMaterial *mat, bNode *node, GPUNodeStack *in, GPUNodeStack *out)
+{
+	float *array;
+	int size;
+
+	curvemapping_table_RGBA(node->storage, &array, &size);
+	return GPU_stack_link(mat, "curves_rgb", in, out, GPU_texture(size, array));
+}
+
 bNodeType sh_node_curve_rgb= {
 	/* *next,*prev */	NULL, NULL,
 	/* type code   */	SH_NODE_CURVE_RGB,
@@ -114,6 +133,7 @@ bNodeType sh_node_curve_rgb= {
 	/* initfunc    */   node_shader_init_curve_rgb,
 	/* freestoragefunc    */	node_free_curves,
 	/* copystoragefunc    */	node_copy_curves,
-	/* id          */	NULL
+	/* id          */	NULL, NULL, NULL,
+	/* gpufunc     */	gpu_shader_curve_rgb
 };
 
diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_geom.c b/source/blender/nodes/intern/SHD_nodes/SHD_geom.c
index 24395059c60..bc345759b98 100644
--- a/source/blender/nodes/intern/SHD_nodes/SHD_geom.c
+++ b/source/blender/nodes/intern/SHD_nodes/SHD_geom.c
@@ -29,6 +29,7 @@
 
 #include "../SHD_util.h"
 
+#include "DNA_customdata_types.h"
 
 /* **************** GEOMETRY  ******************** */
 
@@ -124,6 +125,18 @@ static void node_shader_init_geometry(bNode *node)
    node->storage= MEM_callocN(sizeof(NodeGeometry), "NodeGeometry");
 }
 
+static int gpu_shader_geom(GPUMaterial *mat, bNode *node, GPUNodeStack *in, GPUNodeStack *out)
+{
+	NodeGeometry *ngeo= (NodeGeometry*)node->storage;
+	GPUNodeLink *orco = GPU_attribute(CD_ORCO, "");
+	GPUNodeLink *mtface = GPU_attribute(CD_MTFACE, ngeo->uvname);
+	GPUNodeLink *mcol = GPU_attribute(CD_MCOL, ngeo->colname);
+
+	return GPU_stack_link(mat, "geom", in, out,
+		GPU_builtin(GPU_VIEW_POSITION), GPU_builtin(GPU_VIEW_NORMAL),
+		GPU_builtin(GPU_INVERSE_VIEW_MATRIX), orco, mtface, mcol);
+}
+
 /* node type definition */
 bNodeType sh_node_geom= {
 	/* *next,*prev */	NULL, NULL,
@@ -139,6 +152,7 @@ bNodeType sh_node_geom= {
 	/* initfunc    */	node_shader_init_geometry,
 	/* freestoragefunc    */	node_free_standard_storage,
 	/* copystoragefunc    */	node_copy_standard_storage,
-	/* id          */	NULL
+	/* id          */	NULL, NULL, NULL,
+	/* gpufunc     */	gpu_shader_geom
 	
 };
diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_hueSatVal.c b/source/blender/nodes/intern/SHD_nodes/SHD_hueSatVal.c
index 67dfc619080..1b7b2dfb8e7 100644
--- a/source/blender/nodes/intern/SHD_nodes/SHD_hueSatVal.c
+++ b/source/blender/nodes/intern/SHD_nodes/SHD_hueSatVal.c
@@ -71,6 +71,12 @@ static void node_shader_exec_hue_sat(void *data, bNode *node, bNodeStack **in, b
 	do_hue_sat_fac(node, out[0]->vec, in[0]->vec, in[1]->vec, in[2]->vec, in[4]->vec, in[3]->vec);
 }
 
+
+static int gpu_shader_hue_sat(GPUMaterial *mat, bNode *node, GPUNodeStack *in, GPUNodeStack *out)
+{
+	return GPU_stack_link(mat, "hue_sat", in, out);
+}
+
 bNodeType sh_node_hue_sat= {
 	/* *next,*prev */	NULL, NULL,
 	/* type code   */	SH_NODE_HUE_SAT,
@@ -85,7 +91,8 @@ bNodeType sh_node_hue_sat= {
 	/* initfunc    */	NULL,
 	/* freestoragefunc    */	NULL,
 	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
+	/* id          */	NULL, NULL, NULL,
+	/* gpufunc     */	gpu_shader_hue_sat
 	
 };
 
diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_invert.c b/source/blender/nodes/intern/SHD_nodes/SHD_invert.c
index 4d1ce282fce..72ee1483ecf 100644
--- a/source/blender/nodes/intern/SHD_nodes/SHD_invert.c
+++ b/source/blender/nodes/intern/SHD_nodes/SHD_invert.c
@@ -64,6 +64,11 @@ bNodeStack **out)
 	VECCOPY(out[0]->vec, col);
 }
 
+static int gpu_shader_invert(GPUMaterial *mat, bNode *node, GPUNodeStack *in, GPUNodeStack *out)
+{
+	return GPU_stack_link(mat, "invert", in, out);
+}
+
 bNodeType sh_node_invert= {
 	/* *next,*prev */	NULL, NULL,
 	/* type code   */	SH_NODE_INVERT, 
@@ -78,6 +83,7 @@ bNodeType sh_node_invert= {
 	/* initfunc    */	NULL,
 	/* freestoragefunc    */	NULL,
 	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
+	/* id          */	NULL, NULL, NULL,
+	/* gpufunc     */	gpu_shader_invert
 };
 
diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_mapping.c b/source/blender/nodes/intern/SHD_nodes/SHD_mapping.c
index 589954c8f7b..c081929a2fc 100644
--- a/source/blender/nodes/intern/SHD_nodes/SHD_mapping.c
+++ b/source/blender/nodes/intern/SHD_nodes/SHD_mapping.c
@@ -69,6 +69,20 @@ static void node_shader_init_mapping(bNode *node)
    node->storage= add_mapping();
 }
 
+static int gpu_shader_mapping(GPUMaterial *mat, bNode *node, GPUNodeStack *in, GPUNodeStack *out)
+{
+	TexMapping *texmap= node->storage;
+	float domin= (texmap->flag & TEXMAP_CLIP_MIN) != 0;
+	float domax= (texmap->flag & TEXMAP_CLIP_MAX) != 0;
+	GPUNodeLink *tmat = GPU_uniform((float*)texmap->mat);
+	GPUNodeLink *tmin = GPU_uniform(texmap->min);
+	GPUNodeLink *tmax = GPU_uniform(texmap->max);
+	GPUNodeLink *tdomin = GPU_uniform(&domin);
+	GPUNodeLink *tdomax = GPU_uniform(&domax);
+
+	return GPU_stack_link(mat, "mapping", in, out, tmat, tmin, tmax, tdomin, tdomax);
+}
+
 bNodeType sh_node_mapping= {
 	/* *next,*prev */	NULL, NULL,
 	/* type code   */	SH_NODE_MAPPING,
@@ -83,7 +97,8 @@ bNodeType sh_node_mapping= {
 	/* initfunc    */	node_shader_init_mapping,
 	/* freestoragefunc    */	node_free_standard_storage,
 	/* copystoragefunc    */	node_copy_standard_storage,
-	/* id          */	NULL
+	/* id          */	NULL, NULL, NULL,
+	/* gpufunc     */	gpu_shader_mapping
 	
 };
 
diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_material.c b/source/blender/nodes/intern/SHD_nodes/SHD_material.c
index 9396410f850..c0a2534ac4a 100644
--- a/source/blender/nodes/intern/SHD_nodes/SHD_material.c
+++ b/source/blender/nodes/intern/SHD_nodes/SHD_material.c
@@ -182,6 +182,77 @@ static void node_shader_init_material(bNode* node)
    node->custom1= SH_NODE_MAT_DIFF|SH_NODE_MAT_SPEC;
 }
 
+static int gpu_shader_material(GPUMaterial *mat, bNode *node, GPUNodeStack *in, GPUNodeStack *out)
+{
+	if(node->id) {
+		GPUShadeInput shi;
+		GPUShadeResult shr;
+
+		GPU_shadeinput_set(mat, (Material*)node->id, &shi);
+
+		/* write values */
+		if(in[MAT_IN_COLOR].hasinput)
+			shi.rgb = in[MAT_IN_COLOR].link;
+		
+		if(in[MAT_IN_SPEC].hasinput)
+			shi.specrgb = in[MAT_IN_SPEC].link;
+		
+		if(in[MAT_IN_REFL].hasinput)
+			shi.refl = in[MAT_IN_REFL].link;
+		
+		/* retrieve normal */
+		if(in[MAT_IN_NORMAL].hasinput) {
+			GPUNodeLink *tmp;
+			shi.vn = in[MAT_IN_NORMAL].link;
+			GPU_link(mat, "vec_math_normalize", shi.vn, &shi.vn, &tmp);
+		}
+		
+		/* custom option to flip normal */
+		if(node->custom1 & SH_NODE_MAT_NEG)
+			GPU_link(mat, "vec_math_negate", shi.vn, &shi.vn);
+
+		if (node->type == SH_NODE_MATERIAL_EXT) {
+			if(in[MAT_IN_AMB].hasinput)
+				shi.amb= in[MAT_IN_AMB].link;
+			if(in[MAT_IN_EMIT].hasinput)
+				shi.emit= in[MAT_IN_EMIT].link;
+			if(in[MAT_IN_ALPHA].hasinput)
+				shi.alpha= in[MAT_IN_ALPHA].link;
+		}
+
+		GPU_shaderesult_set(&shi, &shr); /* clears shr */
+		
+		/* write to outputs */
+		if(node->custom1 & SH_NODE_MAT_DIFF) {
+			if(node->custom1 & SH_NODE_MAT_SPEC)
+				out[MAT_OUT_COLOR].link= shr.combined;
+			else
+				out[MAT_OUT_COLOR].link= shr.diff;
+		}
+		else if(node->custom1 & SH_NODE_MAT_SPEC) {
+			out[MAT_OUT_COLOR].link= shr.spec;
+		}
+		else
+			GPU_link(mat, "set_rgb_zero", &out[MAT_OUT_COLOR].link);
+
+		GPU_link(mat, "mtex_alpha_to_col", out[MAT_OUT_COLOR].link, shr.alpha, &out[MAT_OUT_COLOR].link);
+
+		out[MAT_OUT_ALPHA].link = shr.alpha; //
+		
+		if(node->custom1 & SH_NODE_MAT_NEG)
+			GPU_link(mat, "vec_math_negate", shi.vn, &shi.vn);
+		out[MAT_OUT_NORMAL].link = shi.vn;
+
+		if (node->type == SH_NODE_MATERIAL_EXT) {
+			out[MAT_OUT_DIFFUSE].link = shr.diff;
+			out[MAT_OUT_SPEC].link = shr.spec;
+		}
+
+		return 1;
+	}
+
+	return 0;
+}
 
 bNodeType sh_node_material= {
 	/* *next,*prev */	NULL, NULL,
@@ -197,8 +268,8 @@ bNodeType sh_node_material= {
 	/* initfunc    */	node_shader_init_material,
 	/* freestoragefunc    */	NULL,
 	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
-	
+	/* id          */	NULL, NULL, NULL,
+	/* gpufunc     */	gpu_shader_material
 };
 
 bNodeType sh_node_material_ext= {
@@ -215,7 +286,7 @@ bNodeType sh_node_material_ext= {
 	/* initfunc    */	node_shader_init_material,
 	/* freestoragefunc    */	NULL,
 	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
-	
+	/* id          */	NULL, NULL, NULL,
+	/* gpufunc     */	gpu_shader_material
 };
 
diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_math.c b/source/blender/nodes/intern/SHD_nodes/SHD_math.c
index 2e156cf12bf..050c2cdcc95 100644
--- a/source/blender/nodes/intern/SHD_nodes/SHD_math.c
+++ b/source/blender/nodes/intern/SHD_nodes/SHD_math.c
@@ -194,6 +194,46 @@ bNodeStack **out)
 	} 
 }
 
+static int gpu_shader_math(GPUMaterial *mat, bNode *node, GPUNodeStack *in, GPUNodeStack *out)
+{
+	static char *names[] = {"math_add", "math_subtract", "math_multiply",
+		"math_divide", "math_sine", "math_cosine", "math_tangnet", "math_asin",
+		"math_acos", "math_atan", "math_pow", "math_log", "math_min", "math_max",
+		"math_round", "math_less_than", "math_greater_than"};
+
+	switch (node->custom1) {
+		case 0:
+		case 1:
+		case 2:
+		case 3:
+		case 10:
+		case 11:
+		case 12:
+		case 13:
+		case 15:
+		case 16:
+			GPU_stack_link(mat, names[node->custom1], NULL, out,
+				GPU_socket(&in[0]), GPU_socket(&in[1]));
+			break;
+		case 4:
+		case 5:
+		case 6:
+		case 7:
+		case 8:
+		case 9:
+		case 14:
+			if(in[0].hasinput || !in[1].hasinput)
+				GPU_stack_link(mat, names[node->custom1], NULL, out, GPU_socket(&in[0]));
+			else
+				GPU_stack_link(mat, names[node->custom1], NULL, out, GPU_socket(&in[1]));
+			break;
+		default:
+			return 0;
+	}
+	
+	return 1;
+}
+
 bNodeType sh_node_math= {
 	/* *next,*prev */	NULL, NULL,
 	/* type code   */	SH_NODE_MATH, 
@@ -208,6 +248,7 @@ bNodeType sh_node_math= {
 	/* initfunc    */	NULL,
 	/* freestoragefunc    */	NULL,
 	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
+	/* id          */	NULL, NULL, NULL,
+	/* gpufunc     */	gpu_shader_math
 };
 
diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_mixRgb.c b/source/blender/nodes/intern/SHD_nodes/SHD_mixRgb.c
index dba70253fda..2da1dee5623 100644
--- a/source/blender/nodes/intern/SHD_nodes/SHD_mixRgb.c
+++ b/source/blender/nodes/intern/SHD_nodes/SHD_mixRgb.c
@@ -60,6 +60,17 @@ static void node_shader_exec_mix_rgb(void *data, bNode *node, bNodeStack **in, b
 	VECCOPY(out[0]->vec, col);
 }
 
+static int gpu_shader_mix_rgb(GPUMaterial *mat, bNode *node, GPUNodeStack *in, GPUNodeStack *out)
+{
+	static char *names[] = {"mix_blend", "mix_add", "mix_mult", "mix_sub",
+		"mix_screen", "mix_div", "mix_diff", "mix_dark", "mix_light",
+		"mix_overlay", "mix_dodge", "mix_burn", "mix_hue", "mix_sat",
+		"mix_val", "mix_color"};
+
+	return GPU_stack_link(mat, names[node->custom1], in, out);
+}
+
+
 bNodeType sh_node_mix_rgb= {
 	/* *next,*prev */	NULL, NULL,
 	/* type code   */	SH_NODE_MIX_RGB,
@@ -74,6 +85,7 @@ bNodeType sh_node_mix_rgb= {
 	/* initfunc    */	NULL,
 	/* freestoragefunc    */	NULL,
 	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
+	/* id          */	NULL, NULL, NULL,
+	/* gpufunc     */	gpu_shader_mix_rgb
 	
 };
diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_normal.c b/source/blender/nodes/intern/SHD_nodes/SHD_normal.c
index f1ffd3446af..9d4ea1ccf67 100644
--- a/source/blender/nodes/intern/SHD_nodes/SHD_normal.c
+++ b/source/blender/nodes/intern/SHD_nodes/SHD_normal.c
@@ -57,6 +57,14 @@ static void node_shader_exec_normal(void *data, bNode *node, bNodeStack **in, bN
 	out[1]->vec[0]= -INPR(out[0]->vec, vec);
 }
 
+static int gpu_shader_normal(GPUMaterial *mat, bNode *node, GPUNodeStack *in, GPUNodeStack *out)
+{
+	bNodeSocket *sock= node->outputs.first;
+	GPUNodeLink *vec = GPU_uniform(sock->ns.vec);
+
+	return GPU_stack_link(mat, "normal", in, out, vec);
+}
+
 bNodeType sh_node_normal= {
 	/* *next,*prev */	NULL, NULL,
 	/* type code   */	SH_NODE_NORMAL,
@@ -71,6 +79,7 @@ bNodeType sh_node_normal= {
 	/* initfunc    */	NULL,
 	/* freestoragefunc    */	NULL,
 	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
+	/* id          */	NULL, NULL, NULL,
+	/* gpufunc     */	gpu_shader_normal
 };
 
diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_output.c b/source/blender/nodes/intern/SHD_nodes/SHD_output.c
index 0a9a30c452b..76856cfd2e8 100644
--- a/source/blender/nodes/intern/SHD_nodes/SHD_output.c
+++ b/source/blender/nodes/intern/SHD_nodes/SHD_output.c
@@ -62,6 +62,19 @@ static void node_shader_exec_output(void *data, bNode *node, bNodeStack **in, bN
 	}	
 }
 
+static int gpu_shader_output(GPUMaterial *mat, bNode *node, GPUNodeStack *in, GPUNodeStack *out)
+{
+	GPUNodeLink *outlink;
+
+	/*if(in[1].hasinput)
+		GPU_material_enable_alpha(mat);*/
+
+	GPU_stack_link(mat, "output_node", in, out, &outlink);
+	GPU_material_output_link(mat, outlink);
+
+	return 1;
+}
+
 bNodeType sh_node_output= {
 	/* *next,*prev */	NULL, NULL,
 	/* type code   */	SH_NODE_OUTPUT,
@@ -76,7 +89,8 @@ bNodeType sh_node_output= {
 	/* initfunc    */	NULL,
 	/* freestoragefunc    */	NULL,
 	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
+	/* id          */	NULL, NULL, NULL,
+	/* gpufunc     */	gpu_shader_output
 	
 };
 
diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_rgb.c b/source/blender/nodes/intern/SHD_nodes/SHD_rgb.c
index 4e56e26d3ad..1aa1a2ffc33 100644
--- a/source/blender/nodes/intern/SHD_nodes/SHD_rgb.c
+++ b/source/blender/nodes/intern/SHD_nodes/SHD_rgb.c
@@ -42,6 +42,14 @@ static void node_shader_exec_rgb(void *data, bNode *node, bNodeStack **in, bNode
 	VECCOPY(out[0]->vec, sock->ns.vec);
 }
 
+static int gpu_shader_rgb(GPUMaterial *mat, bNode *node, GPUNodeStack *in, GPUNodeStack *out)
+{
+	bNodeSocket *sock= node->outputs.first;
+	GPUNodeLink *vec = GPU_uniform(sock->ns.vec);
+
+	return GPU_stack_link(mat, "set_rgba", in, out, vec);
+}
+
 bNodeType sh_node_rgb= {
 	/* *next,*prev */	NULL, NULL,
 	/* type code   */	SH_NODE_RGB,
@@ -56,6 +64,7 @@ bNodeType sh_node_rgb= {
 	/* initfunc    */	NULL,
 	/* freestoragefunc    */	NULL,
 	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
+	/* id          */	NULL, NULL, NULL,
+	/* gpufunc     */	gpu_shader_rgb
 	
 };
diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_sepcombRGB.c b/source/blender/nodes/intern/SHD_nodes/SHD_sepcombRGB.c
index 2b52a8e2229..6d5df2a1321 100644
--- a/source/blender/nodes/intern/SHD_nodes/SHD_sepcombRGB.c
+++ b/source/blender/nodes/intern/SHD_nodes/SHD_sepcombRGB.c
@@ -48,6 +48,11 @@ static void node_shader_exec_seprgb(void *data, bNode *node, bNodeStack **in, bN
 	out[2]->vec[0] = in[0]->vec[2];
 }
 
+static int gpu_shader_seprgb(GPUMaterial *mat, bNode *node, GPUNodeStack *in, GPUNodeStack *out)
+{
+	return GPU_stack_link(mat, "separate_rgb", in, out);
+}
+
 bNodeType sh_node_seprgb= {
 	/* *next,*prev */	NULL, NULL,
 	/* type code   */	SH_NODE_SEPRGB,
@@ -62,7 +67,8 @@ bNodeType sh_node_seprgb= {
 	/* initfunc    */	NULL,
 	/* freestoragefunc    */	NULL,
 	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
+	/* id          */	NULL, NULL, NULL,
+	/* gpufunc     */	gpu_shader_seprgb
 	
 };
 
@@ -86,6 +92,11 @@ static void node_shader_exec_combrgb(void *data, bNode *node, bNodeStack **in, b
 	out[0]->vec[2] = in[2]->vec[0];
 }
 
+static int gpu_shader_combrgb(GPUMaterial *mat, bNode *node, GPUNodeStack *in, GPUNodeStack *out)
+{
+	return GPU_stack_link(mat, "combine_rgb", in, out);
+}
+
 bNodeType sh_node_combrgb= {
 	/* *next,*prev */	NULL, NULL,
 	/* type code   */	SH_NODE_COMBRGB,
@@ -100,6 +111,7 @@ bNodeType sh_node_combrgb= {
 	/* initfunc    */	NULL,
 	/* freestoragefunc    */	NULL,
 	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
+	/* id          */	NULL, NULL, NULL,
+	/* gpufunc     */	gpu_shader_combrgb
 	
 };
diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_squeeze.c b/source/blender/nodes/intern/SHD_nodes/SHD_squeeze.c
index 30abad666c4..d3480a6ae9d 100644
--- a/source/blender/nodes/intern/SHD_nodes/SHD_squeeze.c
+++ b/source/blender/nodes/intern/SHD_nodes/SHD_squeeze.c
@@ -54,6 +54,11 @@ bNodeStack **out)
     out[0]->vec[0] = 1.0f / (1.0f + pow(2.71828183,-((vec[0]-vec[2])*vec[1]))) ;
 }
 
+static int gpu_shader_squeeze(GPUMaterial *mat, bNode *node, GPUNodeStack *in, GPUNodeStack *out)
+{
+	return GPU_stack_link(mat, "squeeze", in, out);
+}
+
 bNodeType sh_node_squeeze= { 
 	/* *next,*prev */	NULL, NULL,
 	/* type code   */	SH_NODE_SQUEEZE, 
@@ -68,6 +73,7 @@ bNodeType sh_node_squeeze= {
 	/* initfunc    */	NULL,
 	/* freestoragefunc    */	NULL,
 	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
+	/* id          */	NULL, NULL, NULL,
+	/* gpufunc     */	gpu_shader_squeeze
 };
 
diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_texture.c b/source/blender/nodes/intern/SHD_nodes/SHD_texture.c
index ace11a20d42..31dbde940fd 100644
--- a/source/blender/nodes/intern/SHD_nodes/SHD_texture.c
+++ b/source/blender/nodes/intern/SHD_nodes/SHD_texture.c
@@ -27,6 +27,8 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+#include "DNA_texture_types.h"
+
 #include "../SHD_util.h"
 
 /* **************** TEXTURE ******************** */
@@ -110,6 +112,18 @@ static void node_shader_exec_texture(void *data, bNode *node, bNodeStack **in, b
 	}
 }
 
+static int gpu_shader_texture(GPUMaterial *mat, bNode *node, GPUNodeStack *in, GPUNodeStack *out)
+{
+	Tex *tex = (Tex*)node->id;
+
+	if(tex && tex->type == TEX_IMAGE && tex->ima) {
+		GPUNodeLink *texlink = GPU_image(tex->ima, NULL);
+		return GPU_stack_link(mat, "texture_image", in, out, texlink);
+	}
+	else
+		return 0;
+}
+
 bNodeType sh_node_texture= {
 	/* *next,*prev */	NULL, NULL,
 	/* type code   */	SH_NODE_TEXTURE,
@@ -124,7 +138,8 @@ bNodeType sh_node_texture= {
 	/* initfunc    */	NULL,
 	/* freestoragefunc    */	NULL,
 	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
+	/* id          */	NULL, NULL, NULL,
+	/* gpufunc     */	gpu_shader_texture
 	
 };
 
diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_valToRgb.c b/source/blender/nodes/intern/SHD_nodes/SHD_valToRgb.c
index cf7e33d9dca..301c0cb7031 100644
--- a/source/blender/nodes/intern/SHD_nodes/SHD_valToRgb.c
+++ b/source/blender/nodes/intern/SHD_nodes/SHD_valToRgb.c
@@ -59,6 +59,15 @@ static void node_shader_init_valtorgb(bNode *node)
    node->storage= add_colorband(1);
 }
 
+static int gpu_shader_valtorgb(GPUMaterial *mat, bNode *node, GPUNodeStack *in, GPUNodeStack *out)
+{
+	float *array;
+	int size;
+
+	colorband_table_RGBA(node->storage, &array, &size);
+	return GPU_stack_link(mat, "valtorgb", in, out, GPU_texture(size, array));
+}
+
 bNodeType sh_node_valtorgb= {
 	/* *next,*prev */	NULL, NULL,
 	/* type code   */	SH_NODE_VALTORGB,
@@ -73,7 +82,8 @@ bNodeType sh_node_valtorgb= {
 	/* initfunc    */	node_shader_init_valtorgb,
 	/* freestoragefunc    */	node_free_standard_storage,
 	/* copystoragefunc    */	node_copy_standard_storage,
-	/* id          */	NULL
+	/* id          */	NULL, NULL, NULL,
+	/* gpufunc     */	gpu_shader_valtorgb
 	
 };
 
@@ -96,6 +106,11 @@ static void node_shader_exec_rgbtobw(void *data, bNode *node, bNodeStack **in, b
    out[0]->vec[0]= in[0]->vec[0]*0.35f + in[0]->vec[1]*0.45f + in[0]->vec[2]*0.2f;
 }
 
+static int gpu_shader_rgbtobw(GPUMaterial *mat, bNode *node, GPUNodeStack *in, GPUNodeStack *out)
+{
+	return GPU_stack_link(mat, "rgbtobw", in, out);
+}
+
 bNodeType sh_node_rgbtobw= {
 	/* *next,*prev */	NULL, NULL,
 	/* type code   */	SH_NODE_RGBTOBW,
@@ -110,7 +125,8 @@ bNodeType sh_node_rgbtobw= {
 	/* initfunc    */	NULL,
 	/* freestoragefunc    */	NULL,
 	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
+	/* id          */	NULL, NULL, NULL,
+	/* gpufunc     */	gpu_shader_rgbtobw
 
 };
 
diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_value.c b/source/blender/nodes/intern/SHD_nodes/SHD_value.c
index 57ef7226066..768ef3cda3d 100644
--- a/source/blender/nodes/intern/SHD_nodes/SHD_value.c
+++ b/source/blender/nodes/intern/SHD_nodes/SHD_value.c
@@ -42,7 +42,13 @@ static void node_shader_exec_value(void *data, bNode *node, bNodeStack **in, bNo
 	out[0]->vec[0]= sock->ns.vec[0];
 }
 
+static int gpu_shader_value(GPUMaterial *mat, bNode *node, GPUNodeStack *in, GPUNodeStack *out)
+{
+	bNodeSocket *sock= node->outputs.first;
+	GPUNodeLink *vec = GPU_uniform(sock->ns.vec);
 
+	return GPU_stack_link(mat, "set_value", in, out, vec);
+}
 
 bNodeType sh_node_value= {
 	/* *next,*prev */	NULL, NULL,
@@ -58,7 +64,8 @@ bNodeType sh_node_value= {
 	/* initfunc    */	NULL,
 	/* freestoragefunc    */	NULL,
 	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
+	/* id          */	NULL, NULL, NULL,
+	/* gpufunc     */	gpu_shader_value
 	
 };
 
diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_vectMath.c b/source/blender/nodes/intern/SHD_nodes/SHD_vectMath.c
index 8d0a4b3abe3..96db8db18a6 100644
--- a/source/blender/nodes/intern/SHD_nodes/SHD_vectMath.c
+++ b/source/blender/nodes/intern/SHD_nodes/SHD_vectMath.c
@@ -99,6 +99,34 @@ static void node_shader_exec_vect_math(void *data, bNode *node, bNodeStack **in,
 	
 }
 
+static int gpu_shader_vect_math(GPUMaterial *mat, bNode *node, GPUNodeStack *in, GPUNodeStack *out)
+{
+	static char *names[] = {"vec_math_add", "vec_math_subtract",
+		"vec_math_average", "vec_math_dot", "vec_math_cross",
+		"vec_math_normalize"};
+
+	switch (node->custom1) {
+		case 0:
+		case 1:
+		case 2:
+		case 3:
+		case 4:
+			GPU_stack_link(mat, names[node->custom1], NULL, out,
+				GPU_socket(&in[0]), GPU_socket(&in[1]));
+			break;
+		case 5:
+			if(in[0].hasinput || !in[1].hasinput)
+				GPU_stack_link(mat, names[node->custom1], NULL, out, GPU_socket(&in[0]));
+			else
+				GPU_stack_link(mat, names[node->custom1], NULL, out, GPU_socket(&in[1]));
+			break;
+		default:
+			return 0;
+	}
+	
+	return 1;
+}
+
 bNodeType sh_node_vect_math= { 
 	/* *next,*prev */	NULL, NULL,
 	/* type code   */ SH_NODE_VECT_MATH, 
@@ -113,6 +141,7 @@ bNodeType sh_node_vect_math= {
 	/* initfunc    */	NULL,
 	/* freestoragefunc    */	NULL,
 	/* copystoragefunc    */	NULL,
-	/* id          */	NULL
+	/* id          */	NULL, NULL, NULL,
+	/* gpufunc     */	gpu_shader_vect_math
 };
 
diff --git a/source/blender/nodes/intern/SHD_util.h b/source/blender/nodes/intern/SHD_util.h
index bdb2bb3707d..eda985529c1 100644
--- a/source/blender/nodes/intern/SHD_util.h
+++ b/source/blender/nodes/intern/SHD_util.h
@@ -88,6 +88,8 @@
 #include "RE_pipeline.h"
 #include "RE_shader_ext.h"
 
+#include "GPU_material.h"
+
 #include "butspace.h"
 #include "blendef.h"
 #include "mydevice.h"
diff --git a/source/blender/python/CMakeLists.txt b/source/blender/python/CMakeLists.txt
index 0106ab77843..63a1e67236e 100644
--- a/source/blender/python/CMakeLists.txt
+++ b/source/blender/python/CMakeLists.txt
@@ -34,7 +34,7 @@ SET(INC
   api2_2x ../blenkernel ../blenlib ../blenloader
   ../render/extern/include ../radiosity/extern/include
   ../makesdna ../../../intern/guardedalloc ../../../intern/bmfont ../imbuf ../include
-  ${PYTHON_INC}
+  ${PYTHON_INC} ../../../extern/glew/include ../gpu
 )
 
 IF(WITH_QUICKTIME)
@@ -50,5 +50,9 @@ IF(WITH_FFMPEG)
   ADD_DEFINITIONS(-DWITH_FFMPEG)
 ENDIF(WITH_FFMPEG)
 
+IF(BF_BUILDINFO)
+  ADD_DEFINITIONS(-DNAN_BUILDINFO)
+ENDIF(BF_BUILDINFO)
+
 BLENDERLIB_NOLIST(blender_python "${SRC}" "${INC}")
 #env.BlenderLib ( libname='blender_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype=['core','game2'], priority = [60,115] )
diff --git a/source/blender/python/SConscript b/source/blender/python/SConscript
index 481fdcbe13e..27dd510f944 100644
--- a/source/blender/python/SConscript
+++ b/source/blender/python/SConscript
@@ -6,6 +6,7 @@ sources = Split('BPY_interface.c BPY_menus.c') + env.Glob('api2_2x/*.c')
 incs = 'api2_2x ../blenkernel ../nodes ../blenlib ../blenloader'
 incs += ' ../render/extern/include ../radiosity/extern/include'
 incs += ' ../makesdna #intern/guardedalloc #intern/bmfont ../imbuf ../include'
+incs += ' #extern/glew/include ../gpu'
 incs += ' ' + env['BF_PYTHON_INC']
 incs += ' ' + env['BF_OPENGL_INC']
 
@@ -23,4 +24,7 @@ if env['WITH_BF_OPENEXR'] == 1:
 if env['WITH_BF_FFMPEG'] == 1:
     defs.append('WITH_FFMPEG')
 
+if env['BF_BUILDINFO'] == 1:
+    defs.append('NAN_BUILDINFO')
+
 env.BlenderLib ( libname='blender_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype=['core','game2'], priority = [60,115] )
diff --git a/source/blender/python/api2_2x/Blender.c b/source/blender/python/api2_2x/Blender.c
index 2b190a6c828..47e7bcb2007 100644
--- a/source/blender/python/api2_2x/Blender.c
+++ b/source/blender/python/api2_2x/Blender.c
@@ -34,7 +34,7 @@ struct ID; /*keep me up here */
 /* for open, close in Blender_Load */
 #include <fcntl.h>
 #include "BDR_editobject.h"	/* exit_editmode() */
-#include "BDR_drawmesh.h"	/* set_mipmap() */
+#include "GPU_draw.h"	/* GPU_set_mipmap() */
 #include "BIF_usiblender.h"
 #include "BLI_blenlib.h"
 #include "BLI_bpath.h"
@@ -314,8 +314,8 @@ static PyObject *Blender_Set( PyObject * self, PyObject * args )
 		else
 			U.gameflags |= USER_DISABLE_MIPMAP;
 		
-		set_mipmap(!(U.gameflags & USER_DISABLE_MIPMAP));
-	}else
+		GPU_set_mipmap(!(U.gameflags & USER_DISABLE_MIPMAP));
+	} else
 		return ( EXPP_ReturnPyObjError( PyExc_AttributeError,
 						"value given is not a blender setting" ) );
 	Py_RETURN_NONE;
@@ -543,7 +543,21 @@ static PyObject *Blender_Get( PyObject * self, PyObject * value )
 	} /* End 'quick hack' part. */
 	else if(StringEqual( str, "version" ))
 		ret = PyInt_FromLong( G.version );
-		
+	else if(StringEqual( str, "buildinfo" )) {
+#ifdef NAN_BUILDINFO
+		char buffer[1024];
+		extern char * build_date;
+		extern char * build_time;
+		extern char * build_rev;
+		extern char * build_platform;
+		extern char * build_type;
+
+		sprintf(buffer, "Built on %s %s, Rev-%s    Version %s %s", build_date, build_time, build_rev, build_platform, build_type);
+		ret = PyString_FromString( buffer );
+#else
+		ret = PyString_FromString( "No Build Info" );
+#endif
+	}
 	else if(StringEqual( str, "compressfile" ))
 		ret = PyInt_FromLong( (U.flag & USER_FILECOMPRESS) >> 15  );
 	else if(StringEqual( str, "mipmap" ))
diff --git a/source/blender/python/api2_2x/Group.c b/source/blender/python/api2_2x/Group.c
index 3e7f02c3797..3152d3a973f 100644
--- a/source/blender/python/api2_2x/Group.c
+++ b/source/blender/python/api2_2x/Group.c
@@ -46,6 +46,8 @@
 #include "gen_utils.h"
 #include "gen_library.h"
 
+#include "vector.h"
+
 /* checks for the group being removed */
 #define GROUP_DEL_CHECK_PY(bpy_group) if (!(bpy_group->group)) return ( EXPP_ReturnPyObjError( PyExc_RuntimeError, "Group has been removed" ) )
 #define GROUP_DEL_CHECK_INT(bpy_group) if (!(bpy_group->group)) return ( EXPP_ReturnIntError( PyExc_RuntimeError, "Group has been removed" ) )
@@ -200,6 +202,31 @@ static int Group_setObjects( BPy_Group * self, PyObject * args )
 	return 0;
 }
 
+static PyObject *Group_getDupliOfs( BPy_Group * self )
+{
+	GROUP_DEL_CHECK_PY(self);
+	return newVectorObject( self->group->dupli_ofs, 3, Py_WRAP );
+}
+
+static int Group_setDupliOfs( BPy_Group * self, PyObject * value )
+{	
+	VectorObject *bpy_vec;
+	GROUP_DEL_CHECK_INT(self);
+	if (!VectorObject_Check(value))
+		return ( EXPP_ReturnIntError( PyExc_TypeError,
+			"expected a vector" ) );
+	
+	bpy_vec = (VectorObject *)value;
+	
+	if (bpy_vec->size != 3)
+		return ( EXPP_ReturnIntError( PyExc_ValueError,
+			"can only assign a 3D vector" ) );
+	
+	self->group->dupli_ofs[0] = bpy_vec->vec[0];
+	self->group->dupli_ofs[1] = bpy_vec->vec[1];
+	self->group->dupli_ofs[2] = bpy_vec->vec[2];
+	return 0;
+}
 
 
 /*****************************************************************************/
@@ -251,6 +278,10 @@ static PyGetSetDef BPy_Group_getseters[] = {
 	 (getter)Group_getObjects, (setter)Group_setObjects,
 	 "objects in this group",
 	 NULL},
+	{"dupliOffset",
+	 (getter)Group_getDupliOfs, (setter)Group_setDupliOfs,
+	 "offset to use when instancing this group as a DupliGroup",
+	NULL},
 	{NULL,NULL,NULL,NULL,NULL}  /* Sentinel */
 };
 
diff --git a/source/blender/python/api2_2x/Image.c b/source/blender/python/api2_2x/Image.c
index 94da5a77170..5ef2cbadbdc 100644
--- a/source/blender/python/api2_2x/Image.c
+++ b/source/blender/python/api2_2x/Image.c
@@ -29,7 +29,6 @@
 */
 #include "Image.h"		/*This must come first */
 
-#include "BDR_drawmesh.h"	/* free_realtime_image */
 #include "BKE_main.h"
 #include "BKE_global.h"
 #include "BKE_library.h"
@@ -48,6 +47,7 @@
 #include "BKE_icons.h"
 #include "IMB_imbuf.h"
 #include "IDProp.h"
+#include "GPU_draw.h"
 
 /* used so we can get G.scene->r.cfra for getting the
 current image frame, some images change frame if they are a sequence */
@@ -1003,7 +1003,7 @@ static PyObject *Image_glFree( BPy_Image * self )
 {
 	Image *image = self->image;
 
-	free_realtime_image( image );
+	GPU_free_image( image );
 	/* remove the nocollect flag, image is available for garbage collection again */
 	image->flag &= ~IMA_NOCOLLECT;
 	Py_RETURN_NONE;
diff --git a/source/blender/python/api2_2x/Lamp.c b/source/blender/python/api2_2x/Lamp.c
index 53d25a6429d..2e58cb71b90 100644
--- a/source/blender/python/api2_2x/Lamp.c
+++ b/source/blender/python/api2_2x/Lamp.c
@@ -84,6 +84,8 @@
 #define EXPP_LAMP_MODE_NODIFFUSE  2048
 #define EXPP_LAMP_MODE_NOSPECULAR 4096
 #define EXPP_LAMP_MODE_SHAD_RAY	  8192
+#define EXPP_LAMP_MODE_LAYER_SHADOW 32768
+
 /* Lamp MIN, MAX values */
 
 #define EXPP_LAMP_SAMPLES_MIN 1
@@ -780,6 +782,8 @@ static PyObject *Lamp_ModesDict( void )
 				 PyInt_FromLong( EXPP_LAMP_MODE_NOSPECULAR ) );
 		PyConstant_Insert( c, "RayShadow",
 				 PyInt_FromLong( EXPP_LAMP_MODE_SHAD_RAY ) );
+		PyConstant_Insert( c, "LayerShadow",
+				 PyInt_FromLong( EXPP_LAMP_MODE_LAYER_SHADOW ) );
 	}
 
 	return Modes;
@@ -1011,8 +1015,8 @@ static int Lamp_setType( BPy_Lamp * self, PyObject * value )
 
 static int Lamp_setMode( BPy_Lamp * self, PyObject * value )
 {
-	short param;
-	static short bitmask = EXPP_LAMP_MODE_SHADOWS
+	int param;
+	static int bitmask = EXPP_LAMP_MODE_SHADOWS
 				| EXPP_LAMP_MODE_HALO
 				| EXPP_LAMP_MODE_LAYER
 				| EXPP_LAMP_MODE_QUAD
@@ -1022,14 +1026,15 @@ static int Lamp_setMode( BPy_Lamp * self, PyObject * value )
 				| EXPP_LAMP_MODE_SQUARE
 				| EXPP_LAMP_MODE_NODIFFUSE
 				| EXPP_LAMP_MODE_NOSPECULAR
-				| EXPP_LAMP_MODE_SHAD_RAY;
+				| EXPP_LAMP_MODE_SHAD_RAY
+				| EXPP_LAMP_MODE_LAYER_SHADOW;
 
 	if( !PyInt_Check ( value ) ) {
 		char errstr[128];
 		sprintf ( errstr , "expected int bitmask of 0x%04x", bitmask );
 		return EXPP_ReturnIntError( PyExc_TypeError, errstr );
 	}
-	param = (short)PyInt_AS_LONG ( value );
+	param = PyInt_AS_LONG ( value );
 
 	if ( ( param & bitmask ) != param )
 		return EXPP_ReturnIntError( PyExc_ValueError,
@@ -1373,7 +1378,8 @@ static PyObject *Lamp_getModesConst( void )
 			  EXPP_LAMP_MODE_SQUARE, "NoDiffuse",
 			  EXPP_LAMP_MODE_NODIFFUSE, "NoSpecular",
 			  EXPP_LAMP_MODE_NOSPECULAR, "RayShadow",
-			  EXPP_LAMP_MODE_SHAD_RAY);
+			  EXPP_LAMP_MODE_SHAD_RAY, "LayerShadow",
+			  EXPP_LAMP_MODE_LAYER_SHADOW);
 }
 
 static PyObject *Lamp_getTypesConst( void )
@@ -1597,6 +1603,8 @@ static PyObject *Lamp_oldsetMode( BPy_Lamp * self, PyObject * args )
 			flag |= ( short ) EXPP_LAMP_MODE_NOSPECULAR;
 		else if( !strcmp( name, "RayShadow" ) )
 			flag |= ( short ) EXPP_LAMP_MODE_SHAD_RAY;
+		else if( !strcmp( name, "LayerShadow" ) )
+			flag |= ( short ) EXPP_LAMP_MODE_LAYER_SHADOW;
 		else
 			return EXPP_ReturnPyObjError( PyExc_AttributeError,
 							"unknown lamp flag argument" );
diff --git a/source/blender/python/api2_2x/MTex.c b/source/blender/python/api2_2x/MTex.c
index b9a8f7fff65..a95836f0596 100644
--- a/source/blender/python/api2_2x/MTex.c
+++ b/source/blender/python/api2_2x/MTex.c
@@ -677,7 +677,7 @@ static int MTex_setMapping( BPy_MTex *self, PyObject *value, void *closure)
 
 static PyObject *MTex_getFlag( BPy_MTex *self, void *closure )
 {
-	return PyBool_FromLong( self->mtex->texflag & ((int) closure) );
+	return PyBool_FromLong( self->mtex->texflag & (GET_INT_FROM_POINTER(closure)) );
 }
 
 static int MTex_setFlag( BPy_MTex *self, PyObject *value, void *closure)
@@ -687,9 +687,9 @@ static int MTex_setFlag( BPy_MTex *self, PyObject *value, void *closure)
 				"expected a bool");
 
 	if ( value == Py_True )
-		self->mtex->texflag |= (int)closure;
+		self->mtex->texflag |= GET_INT_FROM_POINTER(closure);
 	else
-		self->mtex->texflag &= ~((int) closure);
+		self->mtex->texflag &= ~(GET_INT_FROM_POINTER(closure));
 
 	return 0;
 }
@@ -774,7 +774,7 @@ static int MTex_setProjZ( BPy_MTex *self, PyObject *value, void *closure)
 
 static PyObject *MTex_getMapToFlag( BPy_MTex *self, void *closure )
 {
-	int flag = (int) closure;
+	int flag = GET_INT_FROM_POINTER(closure);
 
 	if ( self->mtex->mapto & flag )
 	{
@@ -786,7 +786,7 @@ static PyObject *MTex_getMapToFlag( BPy_MTex *self, void *closure )
 
 static int MTex_setMapToFlag( BPy_MTex *self, PyObject *value, void *closure)
 {
-	int flag = (int) closure;
+	int flag = GET_INT_FROM_POINTER(closure);
 	int intVal;
 
 	if ( !PyInt_Check( value ) )
diff --git a/source/blender/python/api2_2x/Makefile b/source/blender/python/api2_2x/Makefile
index 7c831952042..a2b77bf8c98 100644
--- a/source/blender/python/api2_2x/Makefile
+++ b/source/blender/python/api2_2x/Makefile
@@ -37,6 +37,10 @@ include nan_compile.mk
 
 CFLAGS += $(LEVEL_1_C_WARNINGS)
 
+ifdef NAN_BUILDINFO
+    CPPFLAGS += -DNAN_BUILDINFO
+endif
+
 ifeq ($(WITH_FFMPEG), true)
    CPPFLAGS += -DWITH_FFMPEG
 endif
@@ -45,6 +49,7 @@ ifeq ($(WITH_OPENEXR),true)
 	CPPFLAGS += -DWITH_OPENEXR
 endif
 
+CPPFLAGS += -I$(NAN_GLEW)/include
 CPPFLAGS += -I$(OPENGL_HEADERS)
 CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
 CPPFLAGS += -I../../makesdna
@@ -52,6 +57,7 @@ CPPFLAGS += -I../../blenkernel
 CPPFLAGS += -I../../blenlib
 CPPFLAGS += -I../../blenloader
 CPPFLAGS += -I../../include
+CPPFLAGS += -I../../gpu
 CPPFLAGS += -I../../render/extern/include
 CPPFLAGS += -I../../radiosity/extern/include
 CPPFLAGS += -I$(NAN_BMFONT)/include
diff --git a/source/blender/python/api2_2x/Material.c b/source/blender/python/api2_2x/Material.c
index 20747a167e6..54c2d9b20bd 100644
--- a/source/blender/python/api2_2x/Material.c
+++ b/source/blender/python/api2_2x/Material.c
@@ -1754,8 +1754,7 @@ static PyObject *Material_getTextures( BPy_Material * self )
 	}
 
 	/* turn the array into a tuple */
-	tuple = Py_BuildValue( "NNNNNNNNNN", t[0], t[1], t[2], t[3],
-			       t[4], t[5], t[6], t[7], t[8], t[9] );
+	tuple = Py_BuildValue( "NNNNNNNNNNNNNNNNNN", t[0], t[1], t[2], t[3], t[4], t[5], t[6], t[7], t[8], t[9], t[10], t[11], t[12], t[13], t[14], t[15], t[16], t[17] );
 	if( !tuple )
 		return EXPP_ReturnPyObjError( PyExc_MemoryError,
 					      "Material_getTextures: couldn't create PyTuple" );
diff --git a/source/blender/python/api2_2x/doc/Group.py b/source/blender/python/api2_2x/doc/Group.py
index 6bd6e105ec3..1266d2efb6e 100644
--- a/source/blender/python/api2_2x/doc/Group.py
+++ b/source/blender/python/api2_2x/doc/Group.py
@@ -105,6 +105,8 @@ class Group:
 		This object gives access to Groups in Blender.
 	@ivar layers: Layer bitmask for this group.
 	@type layers: int
+	@ivar dupliOffset: Object offset when instanced as a dupligroup
+	@type dupliOffset: vector
 	@ivar objects: Objects that this group uses.
 		This is a sequence with-list like access so use list(grp.objects) if you need to use a list (where grp is a group).
 		The groups objects can be set by assigning a list or iterator of objects to the groups objects.
diff --git a/source/blender/radiosity/CMakeLists.txt b/source/blender/radiosity/CMakeLists.txt
index 941da41a5b2..502acf1e211 100644
--- a/source/blender/radiosity/CMakeLists.txt
+++ b/source/blender/radiosity/CMakeLists.txt
@@ -29,7 +29,7 @@ FILE(GLOB SRC intern/source/*.c)
 SET(INC 
   extern/include ../blenlib ../blenkernel ../makesdna ../include
   ../../../intern/guardedalloc ../render/extern/include
-  ../render/intern/include ../blenloader
+  ../render/intern/include ../blenloader ../../../extern/glew/include
 )
 
 BLENDERLIB_NOLIST(blender_radiosity "${SRC}" "${INC}")
diff --git a/source/blender/radiosity/SConscript b/source/blender/radiosity/SConscript
index a86b76bb4b1..82d84f5ef16 100644
--- a/source/blender/radiosity/SConscript
+++ b/source/blender/radiosity/SConscript
@@ -5,7 +5,7 @@ sources = env.Glob('intern/source/*.c')
 
 incs = 'extern/include ../blenlib ../blenkernel ../makesdna ../include'
 incs += ' #/intern/guardedalloc ../render/extern/include'
-incs += ' ../render/intern/include ../blenloader'
+incs += ' ../render/intern/include ../blenloader #/extern/glew/include'
 
 incs += ' ' + env['BF_OPENGL_INC']
 
diff --git a/source/blender/radiosity/intern/source/Makefile b/source/blender/radiosity/intern/source/Makefile
index e5ff8c40d08..5912cdba590 100644
--- a/source/blender/radiosity/intern/source/Makefile
+++ b/source/blender/radiosity/intern/source/Makefile
@@ -36,6 +36,7 @@ include nan_compile.mk
 
 CFLAGS += $(LEVEL_1_C_WARNINGS)
 
+CPPFLAGS += -I$(NAN_GLEW)/include
 CPPFLAGS += -I$(OPENGL_HEADERS)
 
 # not very neat....
diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h
index f83bbd7e8b2..7e2194549cc 100644
--- a/source/blender/render/intern/include/render_types.h
+++ b/source/blender/render/intern/include/render_types.h
@@ -418,7 +418,8 @@ typedef struct LampRen {
 	
 	float xs, ys, dist;
 	float co[3];
-	short type, mode;
+	short type;
+	int mode;
 	float r, g, b, k;
 	float energy, haint;
 	int lay;
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 3cd7bdc6772..1ebd0fda6c9 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -138,7 +138,7 @@ static void print_error(char *str) {printf("ERROR: %s\n", str);}
 
 static void stats_background(RenderStats *rs)
 {
-	extern uintptr_t mem_in_use;
+	uintptr_t mem_in_use= MEM_get_memory_in_use();
 	float megs_used_memory= mem_in_use/(1024.0*1024.0);
 	char str[400], *spos= str;
 	
diff --git a/source/blender/render/intern/source/rayshade.c b/source/blender/render/intern/source/rayshade.c
index c352a83d0f4..0fd9365477c 100644
--- a/source/blender/render/intern/source/rayshade.c
+++ b/source/blender/render/intern/source/rayshade.c
@@ -2056,7 +2056,10 @@ void ray_shadow(ShadeInput *shi, LampRen *lar, float *shadfac)
 	if(shi->mat->mode & MA_SHADOW_TRA) isec.mode= RE_RAY_SHADOW_TRA;
 	else isec.mode= RE_RAY_SHADOW;
 	
-	if(lar->mode & LA_LAYER) isec.lay= lar->lay; else isec.lay= -1;
+	if(lar->mode & (LA_LAYER|LA_LAYER_SHADOW))
+		isec.lay= lar->lay;
+	else
+		isec.lay= -1;
 
 	/* only when not mir tracing, first hit optimm */
 	if(shi->depth==0) {
diff --git a/source/blender/render/intern/source/shadbuf.c b/source/blender/render/intern/source/shadbuf.c
index f477df3ed8c..c53a2b68c9c 100644
--- a/source/blender/render/intern/source/shadbuf.c
+++ b/source/blender/render/intern/source/shadbuf.c
@@ -296,7 +296,7 @@ static void shadowbuf_autoclip(Render *re, LampRen *lar)
 	minz= 1.0e30f; maxz= -1.0e30f;
 	Mat4CpyMat4(viewmat, lar->shb->viewmat);
 	
-	if(lar->mode & LA_LAYER) lay= lar->lay;
+	if(lar->mode & (LA_LAYER|LA_LAYER_SHADOW)) lay= lar->lay;
 
 	maxtotvert= 0;
 	for(obr=re->objecttable.first; obr; obr=obr->next)
@@ -1520,7 +1520,7 @@ static void isb_bsp_fillfaces(Render *re, LampRen *lar, ISBBranch *root)
 	minmaxf[2]= (2.0f*root->box.ymin - size-2.0f)/size;
 	minmaxf[3]= (2.0f*root->box.ymax - size+2.0f)/size;
 	
-	if(lar->mode & LA_LAYER) lay= lar->lay;
+	if(lar->mode & (LA_LAYER|LA_LAYER_SHADOW)) lay= lar->lay;
 	
 	/* (ab)use zspan, since we use zbuffer clipping code */
 	zbuf_alloc_span(&zspan, size, size, re->clipcrop);
diff --git a/source/blender/render/intern/source/shadeoutput.c b/source/blender/render/intern/source/shadeoutput.c
index 5b69323667e..5a80173d1f1 100644
--- a/source/blender/render/intern/source/shadeoutput.c
+++ b/source/blender/render/intern/source/shadeoutput.c
@@ -1761,7 +1761,21 @@ void shade_lamp_loop(ShadeInput *shi, ShadeResult *shr)
 	if(shi->combinedflag & SCE_PASS_SPEC)
 		VECADD(shr->combined, shr->combined, shr->spec);
 
+	/* modulate by the object color */
+	if((ma->shade_flag & MA_OBCOLOR) && shi->obr->ob) {
+		if(!(ma->sss_flag & MA_DIFF_SSS) || !has_sss_tree(&R, ma)) {
+			float obcol[4];
+
+			QUATCOPY(obcol, shi->obr->ob->col);
+			CLAMP(obcol[3], 0.0f, 1.0f);
+
+			shr->combined[0] *= obcol[0];
+			shr->combined[1] *= obcol[1];
+			shr->combined[2] *= obcol[2];
+			shr->alpha *= obcol[3];
+		}
+	}
+
 	shr->combined[3]= shr->alpha;
 }
 
-
diff --git a/source/blender/render/intern/source/zbuf.c b/source/blender/render/intern/source/zbuf.c
index 29aa6e3be29..be555443605 100644
--- a/source/blender/render/intern/source/zbuf.c
+++ b/source/blender/render/intern/source/zbuf.c
@@ -2410,7 +2410,7 @@ void zbuffer_shadow(Render *re, float winmat[][4], LampRen *lar, int *rectz, int
 	float obwinmat[4][4], ho1[4], ho2[4], ho3[4], ho4[4];
 	int a, b, c, i, c1, c2, c3, c4, ok=1, lay= -1;
 
-	if(lar->mode & LA_LAYER) lay= lar->lay;
+	if(lar->mode & (LA_LAYER|LA_LAYER_SHADOW)) lay= lar->lay;
 
 	/* 1.0f for clipping in clippyra()... bad stuff actually */
 	zbuf_alloc_span(&zspan, size, size, 1.0f);
diff --git a/source/blender/src/CMakeLists.txt b/source/blender/src/CMakeLists.txt
index 342579fb3b0..d95551940f8 100644
--- a/source/blender/src/CMakeLists.txt
+++ b/source/blender/src/CMakeLists.txt
@@ -35,7 +35,7 @@ SET(INC
   ../../kernel/gen_system ../../../intern/SoundSystem ../readstreamglue
   ../quicktime ../../../intern/elbeem/extern
   ../../../intern/ghost ../../../intern/opennl/extern
-  ../nodes ../../../extern/glew/include
+  ../nodes ../../../extern/glew/include ../gpu
   ${PYTHON_INC}
   ${SDL_INC}
 )
diff --git a/source/blender/src/Makefile b/source/blender/src/Makefile
index 001efc58b5d..46e916b0437 100644
--- a/source/blender/src/Makefile
+++ b/source/blender/src/Makefile
@@ -68,6 +68,7 @@ CPPFLAGS += -I..
 CPPFLAGS += -I../../kernel/gen_system
 CPPFLAGS += -I../../gameengine/SoundSystem
 CPPFLAGS += -I../ftfont
+CPPFLAGS += -I../gpu
 
 # Only used by py_demo.c !!!
 CPPFLAGS += -I../radiosity/extern/include
diff --git a/source/blender/src/SConscript b/source/blender/src/SConscript
index 229cc87ef37..c8c517e15ff 100644
--- a/source/blender/src/SConscript
+++ b/source/blender/src/SConscript
@@ -26,7 +26,8 @@ incs += ' #/intern/bsp/extern ../radiosity/extern/include'
 incs += ' #/intern/decimation/extern ../blenloader ../python'
 incs += ' ../../kernel/gen_system #/intern/SoundSystem ../readstreamglue ../nodes'
 incs += ' ../quicktime #/intern/elbeem/extern'
-incs += ' #/intern/ghost #/intern/opennl/extern #/extern/glew/include'
+incs += ' #/intern/ghost #/intern/opennl/extern'
+incs += ' ../gpu #extern/glew/include'
 
 
 incs += ' ' + env['BF_PYTHON_INC']
diff --git a/source/blender/src/buttons_object.c b/source/blender/src/buttons_object.c
index b0d612456d2..18384dd90b3 100644
--- a/source/blender/src/buttons_object.c
+++ b/source/blender/src/buttons_object.c
@@ -2590,19 +2590,32 @@ static void object_panel_object(Object *ob)
 	/* all groups */
 	for(group= G.main->group.first; group; group= group->id.next) {
 		if(object_in_group(ob, group)) {
-			xco= 160;
-			
-			uiBlockBeginAlign(block);
-			uiSetButLock(GET_INT_FROM_POINTER(group->id.lib), ERROR_LIBDATA_MESSAGE); /* We cant actually use this button */
-			but = uiDefBut(block, TEX, B_IDNAME, "GR:",	10, 120-yco, 150, 20, group->id.name+2, 0.0, 21.0, 0, 0, "Displays Group name. Click to change.");
-			uiButSetFunc(but, test_idbutton_cb, group->id.name, NULL);
-			uiClearButLock();
+			xco= 130;
 			
 			if(group->id.lib) {
-				but= uiDefIconBut(block, BUT, B_NOP, ICON_PARLIB, 160, 120-yco, 20, 20, NULL, 0.0, 0.0, 0.0, 0.0, "Make Group local");
+				uiBlockBeginAlign(block);
+				uiSetButLock(GET_INT_FROM_POINTER(group->id.lib), ERROR_LIBDATA_MESSAGE); /* We cant actually use this button */
+				uiDefBut(block, TEX, B_IDNAME, "GR:",	10, 120-yco, 100, 20, group->id.name+2, 0.0, 21.0, 0, 0, "Displays Group name. Click to change.");
+				uiClearButLock();
+				
+				but= uiDefIconBut(block, BUT, B_NOP, ICON_PARLIB, 110, 120-yco, 20, 20, NULL, 0.0, 0.0, 0.0, 0.0, "Make Group local");
 				uiButSetFunc(but, group_local, group, NULL);
-				xco= 180;
-			} else { /* cant remove objects from linked groups */
+				uiBlockEndAlign(block);
+			} else {
+				but = uiDefBut(block, TEX, B_IDNAME, "GR:",	10, 120-yco, 120, 20, group->id.name+2, 0.0, 21.0, 0, 0, "Displays Group name. Click to change.");
+				uiButSetFunc(but, test_idbutton_cb, group->id.name, NULL);
+			}
+			
+			uiSetButLock(GET_INT_FROM_POINTER(group->id.lib), ERROR_LIBDATA_MESSAGE);
+			uiBlockBeginAlign(block);
+			uiDefButF(block, NUM, REDRAWALL, "X:",			xco+5, 120-yco, 50, 20, &group->dupli_ofs[0], -100000, 100000, 100, 0, "Offset to use when instacing the group");
+			uiDefButF(block, NUM, REDRAWALL, "Y:",			xco+55, 120-yco, 50, 20, &group->dupli_ofs[1], -100000, 100000, 100, 0, "Offset to use when instacing the group");
+			uiDefButF(block, NUM, REDRAWALL, "Z:",			xco+105, 120-yco, 50, 20, &group->dupli_ofs[2], -100000, 100000, 100, 0, "Offset to use when instacing the group");
+			uiBlockEndAlign(block);
+			uiClearButLock();
+			
+			xco = 290;
+			if(group->id.lib==0) { /* cant remove objects from linked groups */
 				but = uiDefIconBut(block, BUT, B_NOP, VICON_X, xco, 120-yco, 20, 20, NULL, 0.0, 0.0, 0.0, 0.0, "Remove Group membership");
 				uiButSetFunc(but, group_ob_rem, group, ob);
 			}
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index 1b580381ca5..3f65f686e93 100644
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -113,6 +113,8 @@
 
 #include "RE_pipeline.h"
 
+#include "GPU_material.h"
+
 /* -----includes for this file specific----- */
 
 #include "butspace.h" // own module
@@ -1542,10 +1544,35 @@ static void texture_panel_colors(Tex *tex)
 	uiDefButF(block, NUMSLI, B_TEXPRV, "Contr",			160,10,150,20, &tex->contrast, 0.01, 5.0, 0, 0, "Changes the contrast of the color or intensity of a texture");
 }
 
-
-static void texture_panel_texture(MTex *mtex, Material *ma, World *wrld, Lamp *la, bNode *node, Brush *br, SculptData *sd)
+static int texture_channels_num_display(MTex **mtex)
 {
-	MTex *mt=NULL;
+	int a, num_mtex;
+
+	if(!mtex)
+		return 0;
+
+	/* compute number of texture channels to draw, 1 more
+	 * than the last, used texture channel, and at least 10 */
+	num_mtex = 0;
+
+	for(a=MAX_MTEX-1; a>=0; a--) {
+		if (mtex[a]) {
+			num_mtex = a+1;
+			break;
+		}
+	}
+
+	if (num_mtex < 10)
+		return 10;
+	else if(num_mtex < MAX_MTEX)
+		return num_mtex + 1;
+	else
+		return MAX_MTEX;
+}
+
+static void texture_panel_texture(MTex *actmtex, Material *ma, World *wrld, Lamp *la, bNode *node, Brush *br, SculptData *sd)
+{
+	MTex **mtex, *mt;
 	uiBlock *block;
 	ID *id=NULL, *idfrom;
 	int a, yco, loos;
@@ -1556,17 +1583,35 @@ static void texture_panel_texture(MTex *mtex, Material *ma, World *wrld, Lamp *l
 	if(uiNewPanel(curarea, block, "Texture", "Texture", 320, 0, 318, 204)==0) return;
 
 	/* first do the browse but */
-	if(mtex)
-		id= (ID *)mtex->tex;
+	if(actmtex)
+		id= (ID *)actmtex->tex;
 	else if(node)
 		id= node->id;
 	
-	if(ma) idfrom= &ma->id;
-	else if(wrld) idfrom= &wrld->id;
-	else if(la) idfrom= &la->id;
-	else if(br) idfrom= &br->id;
-	else if(sd) idfrom= NULL; /* Not sure what this does */
-	else idfrom= NULL;
+	if(ma) {
+		idfrom= &ma->id;
+		mtex= ma->mtex;
+	}
+	else if(wrld) {
+		idfrom= &wrld->id;
+		mtex= wrld->mtex;
+	}
+	else if(la) {
+		idfrom= &la->id;
+		mtex= la->mtex;
+	}
+	else if(br) {
+		idfrom= &br->id;
+		mtex= br->mtex;
+	}
+	else if(sd) {
+		idfrom= NULL; /* Not sure what this does */
+		mtex= sd->mtex;
+	}
+	else {
+		idfrom= NULL;
+		mtex= NULL;
+	}
 	
 	uiBlockSetCol(block, TH_BUT_SETTING2);
 	if(ma) {
@@ -1595,15 +1640,13 @@ static void texture_panel_texture(MTex *mtex, Material *ma, World *wrld, Lamp *l
 	
 	/* CHANNELS */
 	if(node==NULL) {
+		int num_mtex;
 		uiBlockBeginAlign(block);
 		yco= 150;
-		for(a= 0; a<MAX_MTEX; a++) {
-			
-			if(ma) mt= ma->mtex[a];
-			else if(wrld) mt= wrld->mtex[a];
-			else if(la) mt= la->mtex[a];
-			else if(br) mt= br->mtex[a];
-			else if(sd) mt= sd->mtex[a];
+		
+		num_mtex= texture_channels_num_display(mtex);
+		for(a=0; a<num_mtex; a++) {
+			mt= mtex[a];
 			
 			if(mt && mt->tex) splitIDname(mt->tex->id.name+2, str, &loos);
 			else strcpy(str, "");
@@ -2030,7 +2073,7 @@ static void world_panel_texture(World *wrld)
 	uiBlock *block;
 	MTex *mtex;
 	ID *id;
-	int a, loos;
+	int a, loos, num_mtex;
 	char str[64], *strp;
 	
 	block= uiNewBlock(&curarea->uiblocks, "world_panel_texture", UI_EMBOSS, UI_HELV, curarea->win);
@@ -2041,7 +2084,8 @@ static void world_panel_texture(World *wrld)
 	/* TEX CHANNELS */
 	uiBlockSetCol(block, TH_BUT_NEUTRAL);
 	uiBlockBeginAlign(block);
-	for(a= 0; a<MAX_MTEX; a++) {
+	num_mtex= texture_channels_num_display(wrld->mtex);
+	for(a= 0; a<num_mtex; a++) {
 		mtex= wrld->mtex[a];
 		if(mtex && mtex->tex) splitIDname(mtex->tex->id.name+2, str, &loos);
 		else strcpy(str, "");
@@ -2506,7 +2550,7 @@ static void lamp_panel_texture(Object *ob, Lamp *la)
 	uiBlock *block;
 	MTex *mtex;
 	ID *id;
-	int a, loos;
+	int a, loos, num_mtex;
 	char *strp, str[64];
 	
 	block= uiNewBlock(&curarea->uiblocks, "lamp_panel_texture", UI_EMBOSS, UI_HELV, curarea->win);
@@ -2517,7 +2561,8 @@ static void lamp_panel_texture(Object *ob, Lamp *la)
 	/* TEX CHANNELS */
 	uiBlockSetCol(block, TH_BUT_NEUTRAL);
 	uiBlockBeginAlign(block);
-	for(a= 0; a<MAX_MTEX; a++) {
+	num_mtex= texture_channels_num_display(la->mtex);
+	for(a= 0; a<num_mtex; a++) {
 		mtex= la->mtex[a];
 		if(mtex && mtex->tex) splitIDname(mtex->tex->id.name+2, str, &loos);
 		else strcpy(str, "");
@@ -2603,9 +2648,9 @@ static void lamp_panel_spot(Object *ob, Lamp *la)
 
 	uiBlockSetCol(block, TH_BUT_SETTING1);
 	uiBlockBeginAlign(block);
-	uiDefButBitS(block, TOG, LA_SHAD_RAY, B_SHADRAY,"Ray Shadow",10,180,80,19,&la->mode, 0, 0, 0, 0, "Use ray tracing for shadow");
+	uiDefButBitI(block, TOG, LA_SHAD_RAY, B_SHADRAY,"Ray Shadow",10,180,80,19,&la->mode, 0, 0, 0, 0, "Use ray tracing for shadow");
 	if(la->type==LA_SPOT) {
-		uiDefButBitS(block, TOG, LA_SHAD_BUF, B_SHADBUF, "Buf.Shadow",10,160,80,19,&la->mode, 0, 0, 0, 0, "Lets spotlight produce shadows using shadow buffer");
+		uiDefButBitI(block, TOG, LA_SHAD_BUF, B_SHADBUF, "Buf.Shadow",10,160,80,19,&la->mode, 0, 0, 0, 0, "Lets spotlight produce shadows using shadow buffer");
 		if(la->mode & LA_SHAD_BUF) {
 			char *tip= "Regular buffer type";
 			if(la->buftype==LA_SHADBUF_IRREGULAR)
@@ -2618,12 +2663,15 @@ static void lamp_panel_spot(Object *ob, Lamp *la)
 	}
 	uiBlockEndAlign(block);
 	
-	uiDefButBitS(block, TOG, LA_ONLYSHADOW, B_LAMPPRV,"OnlyShadow",		10,110,80,19,&la->mode, 0, 0, 0, 0, "Causes light to cast shadows only without illuminating objects");
+	uiBlockBeginAlign(block);
+	uiDefButBitI(block, TOG, LA_ONLYSHADOW, B_LAMPPRV,"OnlyShadow",		10,110,80,19,&la->mode, 0, 0, 0, 0, "Causes light to cast shadows only without illuminating objects");
+	uiDefButBitI(block, TOG, LA_LAYER_SHADOW, B_LAMPPRV,"Layer",		10,90,80,19,&la->mode, 0, 0, 0, 0, "Causes only objects on the same layer to cast shadows");
+	uiBlockEndAlign(block);
 
 	if(la->type==LA_SPOT) {
 		uiBlockBeginAlign(block);
-		uiDefButBitS(block, TOG, LA_SQUARE, B_LAMPREDRAW,"Square",	10,60,80,19,&la->mode, 0, 0, 0, 0, "Sets square spotbundles");
-		uiDefButBitS(block, TOG, LA_HALO, B_LAMPREDRAW,"Halo",		10,40,80,19,&la->mode, 0, 0, 0, 0, "Renders spotlight with a volumetric halo"); 
+		uiDefButBitI(block, TOG, LA_SQUARE, B_LAMPREDRAW,"Square",	10,60,80,19,&la->mode, 0, 0, 0, 0, "Sets square spotbundles");
+		uiDefButBitI(block, TOG, LA_HALO, B_LAMPREDRAW,"Halo",		10,40,80,19,&la->mode, 0, 0, 0, 0, "Renders spotlight with a volumetric halo"); 
 
 		uiBlockBeginAlign(block);
 		uiDefButF(block, NUMSLI,B_LAMPREDRAW,"SpotSi ",	100,180,200,19,&la->spotsize, 1.0, 180.0, 0, 0, "Sets the angle of the spotlight beam in degrees");
@@ -2747,12 +2795,12 @@ static void lamp_panel_yafray(Object *ob, Lamp *la)
 	/* in yafray arealights always cast shadows, so ray shadow flag not needed */
 	/* ray shadow also not used when halo for spot enabled */
 	if ((la->type!=LA_AREA) && (!((la->type==LA_SPOT) && (la->mode & LA_HALO))))
-		uiDefButBitS(block, TOG, LA_SHAD_RAY, B_SHADRAY,"Ray Shadow",10,180,80,19,&la->mode, 0, 0, 0, 0, "Use ray tracing for shadow");
+		uiDefButBitI(block, TOG, LA_SHAD_RAY, B_SHADRAY,"Ray Shadow",10,180,80,19,&la->mode, 0, 0, 0, 0, "Use ray tracing for shadow");
 	
 	/* in yafray the regular lamp can use shadowbuffers (softlight), used by spot with halo as well */
 	/* to prevent clash with blender shadowbuf flag, a special flag is used for yafray */
 	if (la->type==LA_LOCAL) {
-		uiDefButBitS(block, TOG, LA_YF_SOFT, B_SHADBUF, "Buf.Shadow",10,160,80,19,&la->mode, 0, 0, 0, 0, "Lets light produce shadows using shadow buffer");
+		uiDefButBitI(block, TOG, LA_YF_SOFT, B_SHADBUF, "Buf.Shadow",10,160,80,19,&la->mode, 0, 0, 0, 0, "Lets light produce shadows using shadow buffer");
 		uiDefButF(block, NUM, B_DIFF, "GloInt:", 100,155,200,19, &la->YF_glowint, 0.0, 1.0, 1, 0, "Sets light glow intensity, 0 is off");
 		uiDefButF(block, NUM, B_DIFF, "GloOfs:", 100,135,100,19, &la->YF_glowofs, 0.0, 2.0, 1, 0, "Sets light glow offset, the higher, the less 'peaked' the glow");
 		uiDefButS(block, NUM, B_DIFF, "GlowType:", 200,135,100,19, &la->YF_glowtype, 0, 1, 1, 0, "Sets light glow type");
@@ -2780,7 +2828,7 @@ static void lamp_panel_yafray(Object *ob, Lamp *la)
 	
 	if (la->type==LA_SPOT) {
 
-		uiDefButBitS(block, TOG, LA_HALO, B_LAMPREDRAW,"Halo",				10,50,80,19,&la->mode, 0, 0, 0, 0, "Renders spotlight with a volumetric halo"); 
+		uiDefButBitI(block, TOG, LA_HALO, B_LAMPREDRAW,"Halo",				10,50,80,19,&la->mode, 0, 0, 0, 0, "Renders spotlight with a volumetric halo"); 
 
 		uiBlockSetCol(block, TH_AUTO);
 		uiBlockBeginAlign(block);
@@ -2900,15 +2948,15 @@ static void lamp_panel_lamp(Object *ob, Lamp *la)
 		uiBlockSetCol(block, TH_BUT_SETTING1);
 		uiDefButS(block, MENU, B_LAMPREDRAW,  "Falloff %t|Constant %x0|Inverse Linear %x1|Inverse Square %x2|Custom Curve %x3|Lin/Quad Weighted %x4|",
 			10,150,100,19, &la->falloff_type, 0,0,0,0, "Lamp falloff - intensity decay with distance");	
-		uiDefButBitS(block, TOG, LA_SPHERE, B_LAMPPRV,"Sphere",	10,130,100,19,&la->mode, 0, 0, 0, 0, "Sets light intensity to zero for objects beyond the distance value");
+		uiDefButBitI(block, TOG, LA_SPHERE, B_LAMPPRV,"Sphere",	10,130,100,19,&la->mode, 0, 0, 0, 0, "Sets light intensity to zero for objects beyond the distance value");
 	}
 
 	uiBlockBeginAlign(block);
 	uiBlockSetCol(block, TH_BUT_SETTING1);
-	uiDefButBitS(block, TOG, LA_LAYER, 0,"Layer",				10,70,100,19,&la->mode, 0, 0, 0, 0, "Illuminates objects in the same layer as the lamp only");
-	uiDefButBitS(block, TOG, LA_NEG, B_LAMPPRV,"Negative",	10,50,100,19,&la->mode, 0, 0, 0, 0, "Sets lamp to cast negative light");
-	uiDefButBitS(block, TOG, LA_NO_DIFF, B_LAMPPRV,"No Diffuse",		10,30,100,19,&la->mode, 0, 0, 0, 0, "Disables diffuse shading of material illuminated by this lamp");
-	uiDefButBitS(block, TOG, LA_NO_SPEC, B_LAMPPRV,"No Specular",		10,10,100,19,&la->mode, 0, 0, 0, 0, "Disables specular shading of material illuminated by this lamp");
+	uiDefButBitI(block, TOG, LA_LAYER, 0,"Layer",				10,70,100,19,&la->mode, 0, 0, 0, 0, "Illuminates objects in the same layer as the lamp only");
+	uiDefButBitI(block, TOG, LA_NEG, B_LAMPPRV,"Negative",	10,50,100,19,&la->mode, 0, 0, 0, 0, "Sets lamp to cast negative light");
+	uiDefButBitI(block, TOG, LA_NO_DIFF, B_LAMPPRV,"No Diffuse",		10,30,100,19,&la->mode, 0, 0, 0, 0, "Disables diffuse shading of material illuminated by this lamp");
+	uiDefButBitI(block, TOG, LA_NO_SPEC, B_LAMPPRV,"No Specular",		10,10,100,19,&la->mode, 0, 0, 0, 0, "Disables specular shading of material illuminated by this lamp");
 	uiBlockEndAlign(block);
 
 	uiBlockSetCol(block, TH_AUTO);
@@ -3523,7 +3571,7 @@ static void material_panel_texture(Object *ob, Material *ma)
 	ID *id;
 	ParticleSystem *psys;
 	int loos, psys_mapto=0;
-	int a;
+	int a, num_mtex;
 	char str[64], *strp;
 	
 	block= uiNewBlock(&curarea->uiblocks, "material_panel_texture", UI_EMBOSS, UI_HELV, curarea->win);
@@ -3539,7 +3587,8 @@ static void material_panel_texture(Object *ob, Material *ma)
 	uiBlockSetCol(block, TH_BUT_NEUTRAL);
 	
 	uiBlockBeginAlign(block);
-	for(a= 0; a<MAX_MTEX; a++) {
+	num_mtex= texture_channels_num_display(ma->mtex);
+	for(a= 0; a<num_mtex; a++) {
 		mtex= ma->mtex[a];
 		if(mtex && mtex->tex) splitIDname(mtex->tex->id.name+2, str, &loos);
 		else strcpy(str, "");
@@ -3553,10 +3602,10 @@ static void material_panel_texture(Object *ob, Material *ma)
 	/* SEPTEX */
 	uiBlockSetCol(block, TH_AUTO);
 	
-	for(a= 0; a<MAX_MTEX; a++) {
+	for(a= 0; a<num_mtex; a++) {
 		mtex= ma->mtex[a];
 		if(mtex && mtex->tex) {
-			but=uiDefIconButBitS(block, ICONTOGN, 1<<a, B_MATPRV, ICON_CHECKBOX_HLT-1,	-20, 180-18*a, 28, 20, &ma->septex, 0.0, 0.0, 0, 0, "Click to disable or enable this texture channel");
+			but=uiDefIconButBitI(block, ICONTOGN, 1<<a, B_MATPRV, ICON_CHECKBOX_HLT-1,	-20, 180-18*a, 28, 20, &ma->septex, 0.0, 0.0, 0, 0, "Click to disable or enable this texture channel");
 
 			if(psys_mapto && ma->mtex[a]->mapto & MAP_PA_IVEL)
 				uiButSetFunc(but, particle_recalc_material, ma, NULL);
@@ -4091,13 +4140,14 @@ static void material_panel_material(Material *ma)
 			uiBlockSetCol(block, TH_BUT_SETTING1);
 			uiDefButBitI(block, TOG, MA_VERTEXCOL, B_MAT_VCOL_LIGHT,	"VCol Light",	8,166,74,20, &(ma->mode), 0, 0, 0, 0, "Adds vertex colors as extra light");
 			uiDefButBitI(block, TOG, MA_VERTEXCOLP, B_MAT_VCOL_PAINT, "VCol Paint",	82,166,74,20, &(ma->mode), 0, 0, 0, 0, "Replaces material's colors with vertex colors");
-			uiDefButBitI(block, TOG, MA_FACETEXTURE, B_REDR, "TexFace",		156,166,64,20, &(ma->mode), 0, 0, 0, 0, "Sets UV-Editor assigned texture as color and texture info for faces");
-			if (ma->mode & MA_FACETEXTURE) uiDefButBitI(block, TOG, MA_FACETEXTURE_ALPHA, B_REDR, "A",		220,166,20,20, &(ma->mode), 0, 0, 0, 0, "Use alpha channel in 'TexFace' assigned images");
-			uiDefButBitI(block, TOG, MA_SHLESS, B_MATPRV, "Shadeless",	240,166,63,20, &(ma->mode), 0, 0, 0, 0, "Makes material insensitive to light or shadow");
+			uiDefButBitI(block, TOG, MA_FACETEXTURE, B_MATPRV, "TexFace",		156,166,60,20, &(ma->mode), 0, 0, 0, 0, "Sets UV-Editor assigned texture as color and texture info for faces");
+			uiDefButBitI(block, TOG, MA_FACETEXTURE_ALPHA, B_MATPRV, "A",		216,166,20,20, &(ma->mode), 0, 0, 0, 0, "Use alpha channel in 'TexFace' assigned images");
+			uiDefButBitI(block, TOG, MA_SHLESS, B_MATPRV, "Shadeless",	236,166,67,20, &(ma->mode), 0, 0, 0, 0, "Makes material insensitive to light or shadow");
 			
-			uiDefButBitI(block, TOG, MA_NOMIST, B_NOP,	"No Mist",		8,146,74,20, &(ma->mode), 0, 0, 0, 0, "Sets the material to ignore mist values");
+			uiDefButBitI(block, TOG, MA_NOMIST, B_MATPRV,	"No Mist",		8,146,74,20, &(ma->mode), 0, 0, 0, 0, "Sets the material to ignore mist values");
 			uiDefButBitI(block, TOG, MA_ENV, B_MATPRV,	"Env",			82,146,74,20, &(ma->mode), 0, 0, 0, 0, "Causes faces to render with alpha zero: allows sky/backdrop to show through (only for solid faces)");
-			uiDefButF(block, NUM, B_NOP, "Shad A ",					156,146,147,19, &ma->shad_alpha, 0.001, 1.0f, 100, 0, "Shadow casting alpha, only in use for Irregular Shadowbuffer");
+			uiDefButBitS(block, TOG, MA_OBCOLOR, B_MATPRV, "ObColor",		156,146,60,20, &(ma->shade_flag), 0, 0, 0, 0, "Modulate the result with a per object color");
+			uiDefButF(block, NUM, B_NOP, "Shad A ",					216,146,87,20, &ma->shad_alpha, 0.001, 1.0f, 10, 2, "Shadow casting alpha, only in use for Irregular Shadowbuffer");
 		}
 		uiBlockSetCol(block, TH_AUTO);
 		uiBlockBeginAlign(block);
diff --git a/source/blender/src/drawarmature.c b/source/blender/src/drawarmature.c
index 6d78b21dfbb..c37eaf7986c 100644
--- a/source/blender/src/drawarmature.c
+++ b/source/blender/src/drawarmature.c
@@ -2505,6 +2505,9 @@ int draw_armature(Base *base, int dt, int flag)
 	Object *ob= base->object;
 	bArmature *arm= ob->data;
 	int retval= 0;
+
+	if(G.f & G_SIMULATION)
+		return 1;
 	
 	if(dt>OB_WIRE && arm->drawtype!=ARM_LINE) {
 		/* we use color for solid lighting */
diff --git a/source/blender/src/drawmesh.c b/source/blender/src/drawmesh.c
index 09f74c01c71..8f22c704fd0 100644
--- a/source/blender/src/drawmesh.c
+++ b/source/blender/src/drawmesh.c
@@ -76,534 +76,12 @@
 
 #include "BSE_drawview.h"
 
+#include "GPU_extensions.h"
+#include "GPU_draw.h"
+
 #include "blendef.h"
 #include "nla.h"
 
-#ifndef GL_CLAMP_TO_EDGE
-#define GL_CLAMP_TO_EDGE                        0x812F
-#endif
-
-//#include "glext.h"
-/* some local functions */
-#if defined(GL_EXT_texture_object) && (!defined(__sun__) || (!defined(__sun))) && !defined(__APPLE__) && !defined(__linux__) && !defined(WIN32)
-	#define glBindTexture(A,B)     glBindTextureEXT(A,B)
-	#define glGenTextures(A,B)     glGenTexturesEXT(A,B)
-	#define glDeleteTextures(A,B)  glDeleteTexturesEXT(A,B)
-	#define glPolygonOffset(A,B)  glPolygonOffsetEXT(A,B)
-
-#else
-
-/* #define GL_FUNC_ADD_EXT					GL_FUNC_ADD */
-/* #define GL_FUNC_REVERSE_SUBTRACT_EXT	GL_FUNC_REVERSE_SUBTRACT */
-/* #define GL_POLYGON_OFFSET_EXT			GL_POLYGON_OFFSET */
-
-#endif
-
-	/* (n&(n-1)) zeros the least significant bit of n */
-static int is_pow2(int num) {
-	return ((num)&(num-1))==0;
-}
-static int smaller_pow2(int num) {
-	while (!is_pow2(num))
-		num= num&(num-1);
-	return num;	
-}
-
-/* These are used to enable texture clamping */
-static int is_pow2_limit(int num) {
-	if (U.glreslimit != 0 && num > U.glreslimit) return 0;
-	return ((num)&(num-1))==0;
-}
-
-static int smaller_pow2_limit(int num) {
-	if (U.glreslimit != 0 && num > U.glreslimit)
-		return U.glreslimit;
-	return smaller_pow2(num);
-}
-
-static int fCurtile=0, fCurmode=0,fCurtileXRep=0,fCurtileYRep=0;
-static Image *fCurpage=0;
-static short fTexwindx, fTexwindy, fTexwinsx, fTexwinsy;
-static int fDoMipMap = 1;
-static int fLinearMipMap = 0;
-
-/* local prototypes --------------- */
-void update_realtime_textures(void);
-
-
-/*  static int source, dest; also not used */
-
-/**
- * Enables or disable mipmapping for realtime images.
- * @param mipmap Turn mipmapping on (mipmap!=0) or off (mipmap==0).
- */
-void set_mipmap(int mipmap)
-{
-	if (fDoMipMap != (mipmap != 0)) {
-		free_all_realtime_images();
-		fDoMipMap = mipmap != 0;
-	}
-}
-
-/**
- * Returns the current setting for mipmapping.
- */
-static int get_mipmap(void)
-{
-	return fDoMipMap && (!(G.f & G_TEXTUREPAINT));
-}
-
-/**
- * Enables or disable linear mipmap setting for realtime images (textures).
- * Note that this will will destroy all texture bindings in OpenGL.
- * @see free_realtime_image()
- * @param mipmap Turn linear mipmapping on (linear!=0) or off (linear==0).
- */
-void set_linear_mipmap(int linear)
-{
-	if (fLinearMipMap != (linear != 0)) {
-		free_all_realtime_images();
-		fLinearMipMap = linear != 0;
-	}
-}
-
-/**
- * Returns the current setting for linear mipmapping.
- */
-int get_linear_mipmap(void)
-{
-	return fLinearMipMap;
-}
-
-
-/**
- * Resets the realtime image cache variables.
- */
-void clear_realtime_image_cache()
-{
-	fCurpage = NULL;
-	fCurtile = 0;
-	fCurmode = 0;
-	fCurtileXRep = 0;
-	fCurtileYRep = 0;
-}
-
-/* REMEMBER!  Changes here must go into my_set_tpage() as well */
-int set_tpage(MTFace *tface)
-{	
-	static int alphamode= -1;
-	static MTFace *lasttface= 0;
-	Image *ima;
-	ImBuf *ibuf;
-	unsigned int *rect=NULL, *bind;
-	int tpx=0, tpy=0, tilemode, tileXRep,tileYRep;
-	
-	/* disable */
-	if(tface==0) {
-		if(lasttface==0) return 0;
-		
-		lasttface= 0;
-		fCurtile= 0;
-		fCurpage= 0;
-		if(fCurmode!=0) {
-			glMatrixMode(GL_TEXTURE);
-			glLoadIdentity();
-			glMatrixMode(GL_MODELVIEW);
-		}
-		fCurmode= 0;
-		fCurtileXRep=0;
-		fCurtileYRep=0;
-		alphamode= -1;
-		
-		glDisable(GL_BLEND);
-		glDisable(GL_TEXTURE_2D);
-		glDisable(GL_TEXTURE_GEN_S);
-		glDisable(GL_TEXTURE_GEN_T);
-		glDisable ( GL_ALPHA_TEST );
-		return 0;
-	}
-	lasttface= tface;
-
-	if( alphamode != tface->transp) {
-		alphamode= tface->transp;
-
-		if(alphamode) {
-			if(alphamode==TF_ADD) {
-				glEnable(GL_BLEND);
-				glBlendFunc(GL_ONE, GL_ONE);
-				glDisable ( GL_ALPHA_TEST );
-			/* 	glBlendEquationEXT(GL_FUNC_ADD_EXT); */
-			}
-			else if(alphamode==TF_ALPHA) {
-				glEnable(GL_BLEND);
-				glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-				
-				/* added after 2.45 to clip alpha */
-				
-				/*if U.glalphaclip == 1.0, some cards go bonkers... turn off alpha test in this case*/
-				if(U.glalphaclip == 1.0) glDisable(GL_ALPHA_TEST);
-				else{
-					glEnable ( GL_ALPHA_TEST );
-					glAlphaFunc ( GL_GREATER, U.glalphaclip );
-				}
-			} else if (alphamode==TF_CLIP){		
-				glDisable(GL_BLEND); 
-				glEnable ( GL_ALPHA_TEST );
-				glAlphaFunc(GL_GREATER, 0.5f);
-			}
-			/* 	glBlendEquationEXT(GL_FUNC_ADD_EXT); */
-			/* else { */
-			/* 	glBlendFunc(GL_ONE, GL_ONE); */
-			/* 	glBlendEquationEXT(GL_FUNC_REVERSE_SUBTRACT_EXT); */
-			/* } */
-		} else {
-			glDisable(GL_BLEND);
-			glDisable ( GL_ALPHA_TEST );
-		}
-	}
-
-	ima= tface->tpage;
-
-	/* Enable or disable reflection mapping */
-	if (ima && (ima->flag & IMA_REFLECT)){
-
-//		glActiveTextureARB(GL_TEXTURE0_ARB);
-		glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP);
-		glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP);
-
-		glEnable(GL_TEXTURE_GEN_S);
-		glEnable(GL_TEXTURE_GEN_T);
-
-		/* Handle multitexturing here */
-	}
-	else{
-		glDisable(GL_TEXTURE_GEN_S);
-		glDisable(GL_TEXTURE_GEN_T);
-	}
-
-	tilemode= tface->mode & TF_TILES;
-	tileXRep = 0;
-	tileYRep = 0;
-	if (ima) {
-		tileXRep = ima->xrep;
-		tileYRep = ima->yrep;
-	}
-
-
-	if(ima==fCurpage && fCurtile==tface->tile && tilemode==fCurmode && fCurtileXRep==tileXRep && fCurtileYRep == tileYRep) return ima!=0;
-
-	if(tilemode!=fCurmode || fCurtileXRep!=tileXRep || fCurtileYRep != tileYRep) {
-		glMatrixMode(GL_TEXTURE);
-		glLoadIdentity();
-		
-		if(tilemode && ima!=NULL)
-			glScalef(ima->xrep, ima->yrep, 1.0);
-
-		glMatrixMode(GL_MODELVIEW);
-	}
-
-	if(ima==NULL || ima->ok==0) {
-		glDisable(GL_TEXTURE_2D);
-		
-		fCurtile= tface->tile;
-		fCurpage= 0;
-		fCurmode= tilemode;
-		fCurtileXRep = tileXRep;
-		fCurtileYRep = tileYRep;
-
-		return 0;
-	}
-
-	ibuf= BKE_image_get_ibuf(ima, NULL);
-	if(ibuf==NULL) {
-
-		fCurtile= tface->tile;
-		fCurpage= 0;
-		fCurmode= tilemode;
-		fCurtileXRep = tileXRep;
-		fCurtileYRep = tileYRep;
-		
-		glDisable(GL_TEXTURE_2D);
-		return 0;
-	}
-
-	if ((ibuf->rect==NULL) && ibuf->rect_float)
-		IMB_rect_from_float(ibuf);
-
-	if(ima->tpageflag & IMA_TWINANIM) fCurtile= ima->lastframe;
-	else fCurtile= tface->tile;
-
-	if(tilemode) {
-		if(ima->repbind==0) make_repbind(ima);
-		
-		if(fCurtile>=ima->totbind) fCurtile= 0;
-		
-		/* this happens when you change repeat buttons */
-		if(ima->repbind) bind= ima->repbind+fCurtile;
-		else bind= &ima->bindcode;
-		
-		if(*bind==0) {
-			
-			fTexwindx= ibuf->x/ima->xrep;
-			fTexwindy= ibuf->y/ima->yrep;
-			
-			if(fCurtile>=ima->xrep*ima->yrep) fCurtile= ima->xrep*ima->yrep-1;
-	
-			fTexwinsy= fCurtile / ima->xrep;
-			fTexwinsx= fCurtile - fTexwinsy*ima->xrep;
-	
-			fTexwinsx*= fTexwindx;
-			fTexwinsy*= fTexwindy;
-	
-			tpx= fTexwindx;
-			tpy= fTexwindy;
-
-			rect= ibuf->rect + fTexwinsy*ibuf->x + fTexwinsx;
-		}
-	}
-	else {
-		bind= &ima->bindcode;
-		
-		if(*bind==0) {
-			tpx= ibuf->x;
-			tpy= ibuf->y;
-			rect= ibuf->rect;
-		}
-	}
-
-	if(*bind==0) {
-		int rectw= tpx, recth= tpy;
-		unsigned int *tilerect= NULL, *scalerect= NULL;
-
-		/*
-		 * Maarten:
-		 * According to Ton this code is not needed anymore. It was used only
-		 * in really old Blenders.
-		 * Reevan:
-		 * Actually it is needed for backwards compatibility.  Simpledemo 6 does not display correctly without it.
-		 */
-#if 1
-		if (tilemode) {
-			int y;
-				
-			tilerect= MEM_mallocN(rectw*recth*sizeof(*tilerect), "tilerect");
-			for (y=0; y<recth; y++) {
-				unsigned int *rectrow= &rect[y*ibuf->x];
-				unsigned int *tilerectrow= &tilerect[y*rectw];
-					
-				memcpy(tilerectrow, rectrow, tpx*sizeof(*rectrow));
-			}
-				
-			rect= tilerect;
-		}
-#endif
-		if (!is_pow2_limit(rectw) || !is_pow2_limit(recth)) {
-			rectw= smaller_pow2_limit(rectw);
-			recth= smaller_pow2_limit(recth);
-			
-			scalerect= MEM_mallocN(rectw*recth*sizeof(*scalerect), "scalerect");
-			gluScaleImage(GL_RGBA, tpx, tpy, GL_UNSIGNED_BYTE, rect, rectw, recth, GL_UNSIGNED_BYTE, scalerect);
-			rect= scalerect;
-		}
-
-		glGenTextures(1, (GLuint *)bind);
-		
-		if((G.f & G_DEBUG) || !*bind) {
-			GLenum error = glGetError();
-			printf("Texture: %s\n", ima->id.name+2);
-			printf("name: %d, tpx: %d\n", *bind, tpx);
-			printf("tile: %d, mode: %d\n", fCurtile, tilemode);
-			if (error)
-				printf("error: %s\n", gluErrorString(error));
-		}
-		glBindTexture( GL_TEXTURE_2D, *bind);
-
-		if (!get_mipmap())
-		{
-			glTexImage2D(GL_TEXTURE_2D, 0,  GL_RGBA,  rectw, recth, 0, GL_RGBA, GL_UNSIGNED_BYTE, rect);
-			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-		} else
-		{
-			int minfilter= fLinearMipMap?GL_LINEAR_MIPMAP_LINEAR:GL_LINEAR_MIPMAP_NEAREST;
-
-			gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGBA, rectw, recth, GL_RGBA, GL_UNSIGNED_BYTE, rect);
-			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, minfilter);
-			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-
-			ima->tpageflag |= IMA_MIPMAP_COMPLETE;
-		}
-
-		glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-			
-		if (tilerect)
-			MEM_freeN(tilerect);
-		if (scalerect)
-			MEM_freeN(scalerect);
-	}
-	else glBindTexture( GL_TEXTURE_2D, *bind);
-	
-	/* dont tile x/y as set the the game properties */
-	if (ima->tpageflag & IMA_CLAMP_U)
-	   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-	else
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-	if (ima->tpageflag & IMA_CLAMP_V)
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-	else
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-	
-	/* tag_image_time(ima);*/  /* Did this get lost in the image recode? */
-	
-	glEnable(GL_TEXTURE_2D);
-
-	fCurpage= ima;
-	fCurmode= tilemode;
-	fCurtileXRep = tileXRep;
-	fCurtileYRep = tileYRep;
-
-	return 1;
-}
-
-void update_realtime_image(Image *ima, int x, int y, int w, int h)
-{
-	ImBuf *ibuf= BKE_image_get_ibuf(ima, NULL);
-	
-	if (ima->repbind || get_mipmap() || !ima->bindcode || !ibuf ||
-		(!is_pow2(ibuf->x) || !is_pow2(ibuf->y)) ||
-		(w == 0) || (h == 0)) {
-		/* these special cases require full reload still */
-		free_realtime_image(ima);
-	}
-	else {
-		int row_length = glaGetOneInteger(GL_UNPACK_ROW_LENGTH);
-		int skip_pixels = glaGetOneInteger(GL_UNPACK_SKIP_PIXELS);
-		int skip_rows = glaGetOneInteger(GL_UNPACK_SKIP_ROWS);
-
-		if ((ibuf->rect==NULL) && ibuf->rect_float)
-			IMB_rect_from_float(ibuf);
-
-		glBindTexture(GL_TEXTURE_2D, ima->bindcode);
-
-		glPixelStorei(GL_UNPACK_ROW_LENGTH, ibuf->x);
-		glPixelStorei(GL_UNPACK_SKIP_PIXELS, x);
-		glPixelStorei(GL_UNPACK_SKIP_ROWS, y);
-
-		glTexSubImage2D(GL_TEXTURE_2D, 0, x, y, w, h, GL_RGBA,
-			GL_UNSIGNED_BYTE, ibuf->rect);
-
-		glPixelStorei(GL_UNPACK_ROW_LENGTH, row_length);
-		glPixelStorei(GL_UNPACK_SKIP_PIXELS, skip_pixels);
-		glPixelStorei(GL_UNPACK_SKIP_ROWS, skip_rows);
-
-		if(ima->tpageflag & IMA_MIPMAP_COMPLETE)
-			ima->tpageflag &= ~IMA_MIPMAP_COMPLETE;
-	}
-}
-
-void free_realtime_image(Image *ima)
-{
-	if(ima->bindcode) {
-		glDeleteTextures(1, (GLuint *)&ima->bindcode);
-		ima->bindcode= 0;
-		ima->tpageflag &= ~IMA_MIPMAP_COMPLETE;
-	}
-	if(ima->repbind) {
-		glDeleteTextures(ima->totbind, (GLuint *)ima->repbind);
-	
-		MEM_freeN(ima->repbind);
-		ima->repbind= NULL;
-		ima->tpageflag &= ~IMA_MIPMAP_COMPLETE;
-	}
-}
-
-void free_all_realtime_images(void)
-{
-	Image* ima;
-
-	for(ima=G.main->image.first; ima; ima=ima->id.next)
-		free_realtime_image(ima);
-}
-
-/* these two functions are called on entering and exiting texture paint mode,
-   temporary disabling/enabling mipmapping on all images for quick texture
-   updates with glTexSubImage2D. images that didn't change don't have to be
-   re-uploaded to OpenGL */
-void texpaint_disable_mipmap(void)
-{
-	Image* ima;
-	
-	if(!fDoMipMap)
-		return;
-
-	for(ima=G.main->image.first; ima; ima=ima->id.next) {
-		if(ima->bindcode) {
-			glBindTexture(GL_TEXTURE_2D, ima->bindcode);
-			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-		}
-	}
-}
-
-void texpaint_enable_mipmap(void)
-{
-	Image* ima;
-
-	if(!fDoMipMap)
-		return;
-
-	for(ima=G.main->image.first; ima; ima=ima->id.next) {
-		if(ima->bindcode) {
-			if(ima->tpageflag & IMA_MIPMAP_COMPLETE) {
-				int minfilter= fLinearMipMap?GL_LINEAR_MIPMAP_LINEAR:GL_LINEAR_MIPMAP_NEAREST;
-
-				glBindTexture(GL_TEXTURE_2D, ima->bindcode);
-				glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, minfilter);
-				glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-			}
-			else
-				free_realtime_image(ima);
-		}
-	}
-}
-
-void make_repbind(Image *ima)
-{
-	ImBuf *ibuf= BKE_image_get_ibuf(ima, NULL);
-	
-	if(ibuf==NULL) return;
-
-	if(ima->repbind) {
-		glDeleteTextures(ima->totbind, (GLuint *)ima->repbind);
-		MEM_freeN(ima->repbind);
-		ima->repbind= 0;
-		ima->tpageflag &= ~IMA_MIPMAP_COMPLETE;
-	}
-	ima->totbind= ima->xrep*ima->yrep;
-	if(ima->totbind>1) {
-		ima->repbind= MEM_callocN(sizeof(int)*ima->totbind, "repbind");
-	}
-}
-
-void update_realtime_textures()
-{
-	Image *ima;
-	
-	ima= G.main->image.first;
-	while(ima) {
-		if(ima->tpageflag & IMA_TWINANIM) {
-			if(ima->twend >= ima->xrep*ima->yrep) ima->twend= ima->xrep*ima->yrep-1;
-		
-			/* check: is bindcode not in the array? Free. (to do) */
-			
-			ima->lastframe++;
-			if(ima->lastframe > ima->twend) ima->lastframe= ima->twsta;
-			
-		}
-		ima= ima->id.next;
-	}
-}
-
 /***/
 
 	/* Flags for marked edges */
@@ -627,7 +105,7 @@ static void get_marked_edge_info__orFlags(EdgeHash *eh, int v0, int v1, int flag
 	*flags_p |= flags;
 }
 
-EdgeHash *get_tface_mesh_marked_edge_info(Mesh *me)
+static EdgeHash *get_tface_mesh_marked_edge_info(Mesh *me)
 {
 	EdgeHash *eh = BLI_edgehash_new();
 	int i;
@@ -775,81 +253,6 @@ static void draw_tfaces3D(Object *ob, Mesh *me, DerivedMesh *dm)
 	BLI_edgehash_free(data.eh, NULL);
 }
 
-static int set_gl_light(Object *ob)
-{
-	Base *base;
-	Lamp *la;
-	int count;
-	/* float zero[4]= {0.0, 0.0, 0.0, 0.0};  */
-	float vec[4];
-	
-	vec[3]= 1.0;
-	
-	for(count=0; count<8; count++) glDisable(GL_LIGHT0+count);
-	
-	count= 0;
-	
-	base= FIRSTBASE;
-	while(base) {
-		if(base->object->type==OB_LAMP ) {
-			if(base->lay & G.vd->lay) {
-				if(base->lay & ob->lay) 
-				{
-					la= base->object->data;
-					
-					glPushMatrix();
-					glLoadMatrixf((float *)G.vd->viewmat);
-					
-					where_is_object_simul(base->object);
-					VECCOPY(vec, base->object->obmat[3]);
-					
-					if(la->type==LA_SUN) {
-						vec[0]= base->object->obmat[2][0];
-						vec[1]= base->object->obmat[2][1];
-						vec[2]= base->object->obmat[2][2];
-						vec[3]= 0.0;
-						glLightfv(GL_LIGHT0+count, GL_POSITION, vec); 
-					}
-					else {
-						vec[3]= 1.0;
-						glLightfv(GL_LIGHT0+count, GL_POSITION, vec); 
-						glLightf(GL_LIGHT0+count, GL_CONSTANT_ATTENUATION, 1.0);
-						glLightf(GL_LIGHT0+count, GL_LINEAR_ATTENUATION, la->att1/la->dist);
-						/* post 2.25 engine supports quad lights */
-						glLightf(GL_LIGHT0+count, GL_QUADRATIC_ATTENUATION, la->att2/(la->dist*la->dist));
-						
-						if(la->type==LA_SPOT) {
-							vec[0]= -base->object->obmat[2][0];
-							vec[1]= -base->object->obmat[2][1];
-							vec[2]= -base->object->obmat[2][2];
-							glLightfv(GL_LIGHT0+count, GL_SPOT_DIRECTION, vec);
-							glLightf(GL_LIGHT0+count, GL_SPOT_CUTOFF, la->spotsize/2.0);
-							glLightf(GL_LIGHT0+count, GL_SPOT_EXPONENT, 128.0*la->spotblend);
-						}
-						else glLightf(GL_LIGHT0+count, GL_SPOT_CUTOFF, 180.0);
-					}
-					
-					vec[0]= la->energy*la->r;
-					vec[1]= la->energy*la->g;
-					vec[2]= la->energy*la->b;
-					vec[3]= 1.0;
-					glLightfv(GL_LIGHT0+count, GL_DIFFUSE, vec); 
-					glLightfv(GL_LIGHT0+count, GL_SPECULAR, vec);//zero); 
-					glEnable(GL_LIGHT0+count);
-					
-					glPopMatrix();					
-					
-					count++;
-					if(count>7) break;
-				}
-			}
-		}
-		base= base->next;
-	}
-
-	return count;
-}
-
 static Material *give_current_material_or_def(Object *ob, int matnr)
 {
 	extern Material defmaterial;	// render module abuse...
@@ -893,9 +296,9 @@ static int set_draw_settings_cached(int clearcache, int textured, MTFace *texfac
 
 	if (textured!=c_textured || texface!=c_texface) {
 		if (textured ) {
-			c_badtex= !set_tpage(texface);
+			c_badtex= !GPU_set_tpage(texface);
 		} else {
-			set_tpage(0);
+			GPU_set_tpage(0);
 			c_badtex= 0;
 		}
 		c_textured= textured;
@@ -950,7 +353,7 @@ static void draw_textured_begin(Object *ob)
 	}
 	else
 		/* draw with lights in the scene otherwise */
-		Gtexdraw.islit= set_gl_light(ob);
+		Gtexdraw.islit= GPU_scene_object_lights(G.scene, ob, G.vd->lay, G.vd->viewmat);
 	
 	obcol[0]= CLAMPIS(ob->col[0]*255, 0, 255);
 	obcol[1]= CLAMPIS(ob->col[1]*255, 0, 255);
@@ -971,12 +374,12 @@ static void draw_textured_begin(Object *ob)
 static void draw_textured_end()
 {
 	/* switch off textures */
-	set_tpage(0);
+	GPU_set_tpage(0);
 
 	glShadeModel(GL_FLAT);
 	glDisable(GL_CULL_FACE);
 
-	/* XXX, bad patch - default_gl_light() calls
+	/* XXX, bad patch - GPU_default_lights() calls
 	 * glLightfv(GL_LIGHT_POSITION, ...) which
 	 * is transformed by the current matrix... we
 	 * need to make sure that matrix is identity.
@@ -987,7 +390,7 @@ static void draw_textured_end()
 	 */
 	glPushMatrix();
 	glLoadIdentity();	
-	default_gl_light();
+	GPU_default_lights();
 	glPopMatrix();
 }
 
@@ -1057,50 +460,71 @@ static int wpaint__setSolidDrawOptions(void *userData, int index, int *drawSmoot
 	return 1;
 }
 
-static void draw_game_text_mesh(Object *ob, Mesh *me)
+void draw_mesh_text(Object *ob, int glsl)
 {
-	DerivedMesh *ddm = mesh_get_derived_deform(ob, CD_MASK_BAREMESH);
-	MFace *mface= me->mface;
+	Mesh *me = ob->data;
+	DerivedMesh *ddm;
+	MFace *mf, *mface= me->mface;
 	MTFace *tface= me->mtface;
 	MCol *mcol= me->mcol;	/* why does mcol exist? */
 	bProperty *prop = get_property(ob, "Text");
-	int a, start= 0, totface= me->totface;
+	GPUVertexAttribs gattribs;
+	int a, totface= me->totface;
 
-	tface+= start;
-	mcol+= start*4;
-	for (a=start; a<totface; a++, tface++, mcol+=4) {
-		MFace *mf= &mface[a];
+	/* don't draw without tfaces */
+	if(!tface)
+		return;
+
+	/* don't draw when editing */
+	if(ob==G.obedit)
+		return;
+	else if(ob==OBACT)
+		if(FACESEL_PAINT_TEST)
+			return;
+
+	ddm = mesh_get_derived_deform(ob, CD_MASK_BAREMESH);
+
+	for(a=0, mf=mface; a<totface; a++, tface++, mf++) {
 		int mode= tface->mode;
 		int matnr= mf->mat_nr;
 		int mf_smooth= mf->flag & ME_SMOOTH;
 
 		if (!(mf->flag&ME_HIDE) && !(mode&TF_INVISIBLE) && (mode&TF_BMFONT)) {
-			int badtex= set_draw_settings_cached(0, Gtexdraw.istex, tface, Gtexdraw.islit, Gtexdraw.ob, matnr, TF_TWOSIDE);
 			float v1[3], v2[3], v3[3], v4[3];
 			char string[MAX_PROPSTRING];
-			int characters, index;
-			ImBuf *ibuf;
-			float curpos;
+			int characters, i, glattrib= -1, badtex= 0;
 
-			if (badtex)
-				continue;
+			if(glsl) {
+				GPU_enable_material(matnr+1, &gattribs);
+
+				for(i=0; i<gattribs.totlayer; i++) {
+					if(gattribs.layer[i].type == CD_MTFACE) {
+						glattrib = gattribs.layer[i].glindex;
+						break;
+					}
+				}
+			}
+			else {
+				badtex = set_draw_settings_cached(0, Gtexdraw.istex, tface, Gtexdraw.islit, Gtexdraw.ob, matnr, TF_TWOSIDE);
+				if (badtex) {
+					if (mcol) mcol+=4;
+					continue;
+				}
+			}
 
 			ddm->getVertCo(ddm, mf->v1, v1);
 			ddm->getVertCo(ddm, mf->v2, v2);
 			ddm->getVertCo(ddm, mf->v3, v3);
 			if (mf->v4) ddm->getVertCo(ddm, mf->v4, v4);
 
-			// The BM_FONT handling code is duplicated in the gameengine
-			// Search for 'Frank van Beek' ;-)
-			// string = "Frank van Beek";
+			// The BM_FONT handling is in the gpu module, shared with the
+			// game engine, was duplicated previously
 
 			set_property_valstr(prop, string);
 			characters = strlen(string);
 			
-			ibuf= BKE_image_get_ibuf(tface->tpage, NULL);
-			if (ibuf == NULL) {
+			if(!BKE_image_get_ibuf(tface->tpage, NULL))
 				characters = 0;
-			}
 
 			if (!mf_smooth) {
 				float nor[3];
@@ -1110,46 +534,11 @@ static void draw_game_text_mesh(Object *ob, Mesh *me)
 				glNormal3fv(nor);
 			}
 
-			curpos= 0.0;
-			glBegin(mf->v4?GL_QUADS:GL_TRIANGLES);
-			for (index = 0; index < characters; index++) {
-				float centerx, centery, sizex, sizey, transx, transy, movex, movey, advance;
-				int character = string[index];
-				char *cp= NULL;
-
-				// lets calculate offset stuff
-				// space starts at offset 1
-				// character = character - ' ' + 1;
-				
-				matrixGlyph(ibuf, character, & centerx, &centery, &sizex, &sizey, &transx, &transy, &movex, &movey, &advance);
-				movex+= curpos;
-
-				if (tface->mode & TF_OBCOL)
-					glColor3ubv(Gtexdraw.obcol);
-				else if (me->mcol) cp= (char *)mcol;
-				else glColor3ub(255, 255, 255);
-
-				glTexCoord2f((tface->uv[0][0] - centerx) * sizex + transx, (tface->uv[0][1] - centery) * sizey + transy);
-				if (cp) glColor3ub(cp[3], cp[2], cp[1]);
-				glVertex3f(sizex * v1[0] + movex, sizey * v1[1] + movey, v1[2]);
-				
-				glTexCoord2f((tface->uv[1][0] - centerx) * sizex + transx, (tface->uv[1][1] - centery) * sizey + transy);
-				if (cp) glColor3ub(cp[7], cp[6], cp[5]);
-				glVertex3f(sizex * v2[0] + movex, sizey * v2[1] + movey, v2[2]);
-	
-				glTexCoord2f((tface->uv[2][0] - centerx) * sizex + transx, (tface->uv[2][1] - centery) * sizey + transy);
-				if (cp) glColor3ub(cp[11], cp[10], cp[9]);
-				glVertex3f(sizex * v3[0] + movex, sizey * v3[1] + movey, v3[2]);
-	
-				if(mf->v4) {
-					glTexCoord2f((tface->uv[3][0] - centerx) * sizex + transx, (tface->uv[3][1] - centery) * sizey + transy);
-					if (cp) glColor3ub(cp[15], cp[14], cp[13]);
-					glVertex3f(sizex * v4[0] + movex, sizey * v4[1] + movey, v4[2]);
-				}
-
-				curpos+= advance;
-			}
-			glEnd();
+			GPU_render_text(tface, tface->mode, string, characters,
+				(unsigned int*)mcol, v1, v2, v3, (mf->v4? v4: NULL), glattrib);
+		}
+		if (mcol) {
+			mcol+=4;
 		}
 	}
 
@@ -1159,7 +548,6 @@ static void draw_game_text_mesh(Object *ob, Mesh *me)
 void draw_mesh_textured(Object *ob, DerivedMesh *dm, int faceselect)
 {
 	Mesh *me= ob->data;
-	int editing= 0;
 	
 	/* correct for negative scale */
 	if(ob->transflag & OB_NEG_SCALE) glFrontFace(GL_CW);
@@ -1168,38 +556,20 @@ void draw_mesh_textured(Object *ob, DerivedMesh *dm, int faceselect)
 	/* draw the textured mesh */
 	draw_textured_begin(ob);
 
-#ifdef WITH_VERSE
-	if(me->vnode) {
-		/* verse-blender doesn't support uv mapping of textures yet */
-		dm->drawFacesTex(dm, NULL);
-	}
-	else {
-#endif
-		if(ob==G.obedit) {
-			dm->drawMappedFacesTex(dm, draw_em_tf_mapped__set_draw, G.editMesh);
-		} else if(faceselect) {
-			if(G.f & G_WEIGHTPAINT)
-				dm->drawMappedFaces(dm, wpaint__setSolidDrawOptions, me, 1);
-			else
-				dm->drawMappedFacesTex(dm, draw_tface_mapped__set_draw, me);
-		}
+	if(ob==G.obedit) {
+		dm->drawMappedFacesTex(dm, draw_em_tf_mapped__set_draw, G.editMesh);
+	} else if(faceselect) {
+		if(G.f & G_WEIGHTPAINT)
+			dm->drawMappedFaces(dm, wpaint__setSolidDrawOptions, me, 1);
 		else
-			dm->drawFacesTex(dm, draw_tface__set_draw);
-#ifdef WITH_VERSE
+			dm->drawMappedFacesTex(dm, draw_tface_mapped__set_draw, me);
 	}
-#endif
+	else
+		dm->drawFacesTex(dm, draw_tface__set_draw);
 
-	/* draw game engine text hack - but not if we are editing the mesh */
-	if (me->mtface && get_property(ob, "Text")) {
-		if(ob==G.obedit)
-			editing= 1;
-		else if(ob==OBACT)
-			if(FACESEL_PAINT_TEST)
-				editing= 1;
-
-		if(!editing)
-			draw_game_text_mesh(ob, me);
-	}
+	/* draw game engine text hack */
+	if(get_property(ob, "Text")) 
+		draw_mesh_text(ob, 0);
 
 	draw_textured_end();
 	
@@ -1214,10 +584,3 @@ void draw_mesh_textured(Object *ob, DerivedMesh *dm, int faceselect)
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 }
 
-void init_realtime_GL(void)
-{		
-	glMatrixMode(GL_TEXTURE);
-	glLoadIdentity();
-	glMatrixMode(GL_MODELVIEW);
-}
-
diff --git a/source/blender/src/drawobject.c b/source/blender/src/drawobject.c
index 213f49528f0..4876e6cae7c 100644
--- a/source/blender/src/drawobject.c
+++ b/source/blender/src/drawobject.c
@@ -93,6 +93,7 @@
 #include "BKE_object.h"
 #include "BKE_anim.h"			//for the where_on_path function
 #include "BKE_particle.h"
+#include "BKE_property.h"
 #include "BKE_utildefines.h"
 #ifdef WITH_VERSE
 #include "BKE_verse.h"
@@ -129,6 +130,10 @@
 
 #include "BKE_deform.h"
 
+#include "GPU_draw.h"
+#include "GPU_material.h"
+#include "GPU_extensions.h"
+
 /* pretty stupid */
 /*  extern Lattice *editLatt; already in BKE_lattice.h  */
 /* editcurve.c */
@@ -143,114 +148,37 @@ static void drawcircle_size(float size);
 static void draw_empty_sphere(float size);
 static void draw_empty_cone(float size);
 
-/* ************* Setting OpenGL Material ************ */
+/* check for glsl drawing */
 
-// Materials start counting at # one....
-#define MAXMATBUF (MAXMAT + 1)
-static float matbuf[MAXMATBUF][2][4];
-static int totmat_gl= 0;
-
-int set_gl_material(int nr)
+int draw_glsl_material(Object *ob, int dt)
 {
-	static int last_gl_matnr= -1;
-	static int last_ret_val= 1;
+	if(!GPU_extensions_minimum_support())
+		return 0;
+	if(G.f & G_PICKSEL)
+		return 0;
+	if(!CHECK_OB_DRAWTEXTURE(G.vd, dt))
+		return 0;
+	if(ob==OBACT && (G.f & G_WEIGHTPAINT))
+		return 0;
 	
-	/* prevent index to use un-initialized array items */
-	if(nr>totmat_gl) nr= totmat_gl;
-	
-	if(nr<0) {
-		last_gl_matnr= -1;
-		last_ret_val= 1;
-	}
-	else if(nr<MAXMATBUF && nr!=last_gl_matnr) {
-		glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, matbuf[nr][0]);
-		glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, matbuf[nr][1]);
-		last_gl_matnr = nr;
-		last_ret_val= matbuf[nr][0][3]!=0.0;
-		
-		/* matbuf alpha: 0.0 = skip draw, 1.0 = no blending, else blend */
-		if(matbuf[nr][0][3]!= 0.0 && matbuf[nr][0][3]!= 1.0) {
-			glEnable(GL_BLEND);
-		}
-		else
-			glDisable(GL_BLEND);
-			
-	}
-	
-	return last_ret_val;
+	return ((G.fileflags & G_FILE_GAME_MAT) &&
+	   (G.fileflags & G_FILE_GAME_MAT_GLSL) && (dt >= OB_SHADED));
 }
 
-/* returns 1: when there's alpha needed to be drawn in a 2nd pass */
-int init_gl_materials(Object *ob, int check_alpha)
+static int check_material_alpha(Base *base, Object *ob, int glsl)
 {
-	extern Material defmaterial;	// render module abuse...
-	Material *ma;
-	int a, has_alpha= 0;
-	
-	if(ob->totcol==0) {
-		matbuf[0][0][0]= defmaterial.r;
-		matbuf[0][0][1]= defmaterial.g;
-		matbuf[0][0][2]= defmaterial.b;
-		matbuf[0][0][3]= 1.0;
+	if(base->flag & OB_FROMDUPLI)
+		return 0;
 
-		matbuf[0][1][0]= defmaterial.specr;
-		matbuf[0][1][1]= defmaterial.specg;
-		matbuf[0][1][2]= defmaterial.specb;
-		matbuf[0][1][3]= 1.0;
-		
-		/* do material 1 too, for displists! */
-		QUATCOPY(matbuf[1][0], matbuf[0][0]);
-		QUATCOPY(matbuf[1][1], matbuf[0][1]);
-	}
-	
-	for(a=1; a<=ob->totcol; a++) {
-		ma= give_current_material(ob, a);
-		ma= editnode_get_active_material(ma);
-		if(ma==NULL) ma= &defmaterial;
-
-		if(a<MAXMATBUF) {
-			if (ma->mode & MA_SHLESS) {
-				matbuf[a][0][0]= ma->r;
-				matbuf[a][0][1]= ma->g;
-				matbuf[a][0][2]= ma->b;
-			} else {
-				matbuf[a][0][0]= (ma->ref+ma->emit)*ma->r;
-				matbuf[a][0][1]= (ma->ref+ma->emit)*ma->g;
-				matbuf[a][0][2]= (ma->ref+ma->emit)*ma->b;
-			}
-
-			/* draw transparent, not in pick-select, nor editmode */
-			if(check_alpha && !(G.f & G_PICKSEL) && (ob->dtx & OB_DRAWTRANSP) && !(G.obedit && G.obedit->data==ob->data)) {
-				if(G.vd->transp) {	// drawing the transparent pass
-					if(ma->alpha==1.0) matbuf[a][0][3]= 0.0;	// means skip solid
-					else matbuf[a][0][3]= ma->alpha;
-				}
-				else {	// normal pass
-					if(ma->alpha==1.0) matbuf[a][0][3]= 1.0;
-					else {
-						matbuf[a][0][3]= 0.0;	// means skip transparent
-						has_alpha= 1;			// return value, to indicate adding to after-draw queue
-					}
-				}
-			}
-			else
-				matbuf[a][0][3]= 1.0;
+	if(G.f & G_PICKSEL)
+		return 0;
 			
-			if (!(ma->mode & MA_SHLESS)) {
-				matbuf[a][1][0]= ma->spec*ma->specr;
-				matbuf[a][1][1]= ma->spec*ma->specg;
-				matbuf[a][1][2]= ma->spec*ma->specb;
-				matbuf[a][1][3]= 1.0;
-			}
-		}
-	}
-
-	totmat_gl= ob->totcol;
-	set_gl_material(-1);		// signal for static variable
-	return has_alpha;
+	if(G.obedit && G.obedit->data==ob->data)
+		return 0;
+	
+	return (glsl || (ob->dtx & OB_DRAWTRANSP));
 }
 
-
 	/***/
 static unsigned int colortab[24]=
 	{0x0,		0xFF88FF, 0xFFBBFF, 
@@ -352,6 +280,9 @@ void drawaxes(float size, int flag, char drawtype)
 	float v1[3]= {0.0, 0.0, 0.0};
 	float v2[3]= {0.0, 0.0, 0.0};
 	float v3[3]= {0.0, 0.0, 0.0};
+
+	if(G.f & G_SIMULATION)
+		return;
 	
 	switch(drawtype) {
 	
@@ -734,6 +665,9 @@ static void drawlamp(Object *ob)
 	float pixsize, lampsize;
 	float imat[4][4], curcol[4];
 	char col[4];
+
+	if(G.f & G_SIMULATION)
+		return;
 	
 	la= ob->data;
 	
@@ -1024,6 +958,9 @@ static void drawcamera(Object *ob, int flag)
 	float vec[8][4], tmat[4][4], fac, facx, facy, depth;
 	int i;
 
+	if(G.f & G_SIMULATION)
+		return;
+
 	cam= ob->data;
 	
 	glDisable(GL_LIGHTING);
@@ -1830,6 +1767,9 @@ static void draw_verse_debug(Object *ob, EditMesh *em)
 	struct EditFace *efa=NULL;
 	float v1[3], v2[3], v3[3], v4[3], fvec[3], col[3];
 	char val[32];
+
+	if(G.f & G_SIMULATION)
+		return;
 	
 	if(G.vd->zbuf && (G.vd->flag & V3D_ZBUF_SELECT)==0)
 		glDisable(GL_DEPTH_TEST);
@@ -1894,6 +1834,9 @@ static void draw_em_measure_stats(Object *ob, EditMesh *em)
 	char conv_float[5]; /* Use a float conversion matching the grid size */
 	float area, col[3]; /* area of the face,  color of the text to draw */
 	
+	if(G.f & G_SIMULATION)
+		return;
+
 	/* make the precission of the pronted value proportionate to the gridsize */
 	if ((G.vd->grid) < 0.01)
 		strcpy(conv_float, "%.6f");
@@ -2054,12 +1997,20 @@ static int draw_em_fancy__setFaceOpts(void *userData, int index, int *drawSmooth
 	EditFace *efa = EM_get_face_for_index(index);
 
 	if (efa->h==0) {
-		set_gl_material(efa->mat_nr+1);
+		GPU_enable_material(efa->mat_nr+1, NULL);
 		return 1;
-	} else {
-		return 0;
 	}
+	else
+		return 0;
 }
+
+static int draw_em_fancy__setGLSLFaceOpts(void *userData, int index)
+{
+	EditFace *efa = EM_get_face_for_index(index);
+
+	return (efa->h==0);
+}
+
 static void draw_em_fancy(Object *ob, EditMesh *em, DerivedMesh *cageDM, DerivedMesh *finalDM, int dt)
 {
 	Mesh *me = ob->data;
@@ -2082,9 +2033,21 @@ static void draw_em_fancy(Object *ob, EditMesh *em, DerivedMesh *cageDM, Derived
 	EM_init_index_arrays(1, 1, 1);
 
 	if(dt>OB_WIRE) {
-		if( CHECK_OB_DRAWTEXTURE(G.vd, dt) ) {
-			draw_mesh_textured(ob, finalDM, 0);
-		} else {
+		if(CHECK_OB_DRAWTEXTURE(G.vd, dt)) {
+			if(draw_glsl_material(ob, dt)) {
+				glFrontFace((ob->transflag&OB_NEG_SCALE)?GL_CW:GL_CCW);
+
+				finalDM->drawMappedFacesGLSL(finalDM, GPU_enable_material,
+					draw_em_fancy__setGLSLFaceOpts, NULL);
+				GPU_disable_material();
+
+				glFrontFace(GL_CCW);
+			}
+			else {
+				draw_mesh_textured(ob, finalDM, 0);
+			}
+		}
+		else {
 			glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, me->flag & ME_TWOSIDED);
 
 			glEnable(GL_LIGHTING);
@@ -2208,6 +2171,7 @@ static void draw_em_fancy(Object *ob, EditMesh *em, DerivedMesh *cageDM, Derived
 	if(dt>OB_WIRE) {
 		glDepthMask(1);
 		bglPolygonOffset(0.0);
+		GPU_disable_material();
 	}
 
 	EM_free_index_arrays();
@@ -2226,8 +2190,9 @@ static void draw_mesh_object_outline(Object *ob, DerivedMesh *dm)
 		   drawFacesSolid() doesn't draw the transparent faces */
 		if(ob->dtx & OB_DRAWTRANSP) {
 			glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); 
-			dm->drawFacesSolid(dm, set_gl_material);
+			dm->drawFacesSolid(dm, GPU_enable_material);
 			glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
+			GPU_disable_material();
 		}
 		else {
 			dm->drawEdges(dm, 0);
@@ -2312,7 +2277,19 @@ static void draw_mesh_fancy(Base *base, int dt, int flag)
 			draw_mesh_object_outline(ob, dm);
 		}
 
-		draw_mesh_textured(ob, dm, faceselect);
+		if(draw_glsl_material(ob, dt)) {
+			glFrontFace((ob->transflag&OB_NEG_SCALE)?GL_CW:GL_CCW);
+
+			dm->drawFacesGLSL(dm, GPU_enable_material);
+			if(get_property(ob, "Text"))
+				draw_mesh_text(ob, 1);
+			GPU_disable_material();
+
+			glFrontFace(GL_CCW);
+		}
+		else {
+			draw_mesh_textured(ob, dm, faceselect);
+		}
 
 		if(!faceselect) {
 			if(base->flag & SELECT)
@@ -2323,18 +2300,17 @@ static void draw_mesh_fancy(Base *base, int dt, int flag)
 			dm->drawLooseEdges(dm);
 		}
 	}
-	else if(dt==OB_SOLID ) {
-		
-		if ((G.vd->flag&V3D_SELECT_OUTLINE) && (base->flag&SELECT) && !draw_wire) {
+	else if(dt==OB_SOLID) {
+		if((G.vd->flag&V3D_SELECT_OUTLINE) && (base->flag&SELECT) && !draw_wire)
 			draw_mesh_object_outline(ob, dm);
-		}
 
 		glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, me->flag & ME_TWOSIDED );
 
 		glEnable(GL_LIGHTING);
 		glFrontFace((ob->transflag&OB_NEG_SCALE)?GL_CW:GL_CCW);
 
-		dm->drawFacesSolid(dm, set_gl_material);
+		dm->drawFacesSolid(dm, GPU_enable_material);
+		GPU_disable_material();
 
 		glFrontFace(GL_CCW);
 		glDisable(GL_LIGHTING);
@@ -2352,7 +2328,8 @@ static void draw_mesh_fancy(Base *base, int dt, int flag)
 		if(ob==OBACT) {
 			do_draw= 0;
 			if( (G.f & G_WEIGHTPAINT)) {
-				set_gl_material(0);		/* enforce defmaterial settings */
+				/* enforce default material settings */
+				GPU_enable_material(0, NULL);
 				
 				/* but set default spec */
 				glColorMaterial(GL_FRONT_AND_BACK, GL_SPECULAR);
@@ -2367,6 +2344,8 @@ static void draw_mesh_fancy(Base *base, int dt, int flag)
 				dm->drawMappedFaces(dm, wpaint__setSolidDrawOptions, me->mface, 1);
 				glDisable(GL_COLOR_MATERIAL);
 				glDisable(GL_LIGHTING);
+
+				GPU_disable_material();
 			}
 			else if((G.f & (G_VERTEXPAINT+G_TEXTUREPAINT)) && me->mcol) {
 				dm->drawMappedFaces(dm, wpaint__setSolidDrawOptions, NULL, 1);
@@ -2385,7 +2364,7 @@ static void draw_mesh_fancy(Base *base, int dt, int flag)
 				dm->release(dm);
 				shadeDispList(base);
 				dl = find_displist(&ob->disp, DL_VERTCOL);
-			    dm= mesh_get_derived_final(ob, get_viewedit_datamask());
+				dm= mesh_get_derived_final(ob, get_viewedit_datamask());
 			}
 
 			if ((G.vd->flag&V3D_SELECT_OUTLINE) && (base->flag&SELECT) && !draw_wire) {
@@ -2462,7 +2441,7 @@ static int draw_mesh_object(Base *base, int dt, int flag)
 {
 	Object *ob= base->object;
 	Mesh *me= ob->data;
-	int has_alpha= 0, drawlinked= 0, retval= 0;
+	int do_alpha_pass= 0, drawlinked= 0, retval= 0, glsl, check_alpha;
 	
 	if(G.obedit && ob!=G.obedit && ob->data==G.obedit->data) {
 		if(ob_get_key(ob));
@@ -2478,7 +2457,12 @@ static int draw_mesh_object(Base *base, int dt, int flag)
 			cageDM = editmesh_get_derived_cage_and_final(&finalDM,
 			                                get_viewedit_datamask());
 
-		if(dt>OB_WIRE) init_gl_materials(ob, 0);	// no transp in editmode, the fancy draw over goes bad then
+		if(dt>OB_WIRE) {
+			// no transp in editmode, the fancy draw over goes bad then
+			glsl = draw_glsl_material(ob, dt);
+			GPU_set_object_materials(G.scene, ob, glsl, NULL);
+		}
+
 		draw_em_fancy(ob, G.editMesh, cageDM, finalDM, dt);
 
 		if (G.obedit!=ob && finalDM)
@@ -2491,15 +2475,22 @@ static int draw_mesh_object(Base *base, int dt, int flag)
 	else {
 		/* don't create boundbox here with mesh_get_bb(), the derived system will make it, puts deformed bb's OK */
 		if(me->totface<=4 || boundbox_clip(ob->obmat, (ob->bb)? ob->bb: me->bb)) {
-			if(dt==OB_SOLID) has_alpha= init_gl_materials(ob, (base->flag & OB_FROMDUPLI)==0);
+			glsl = draw_glsl_material(ob, dt);
+			check_alpha = check_material_alpha(base, ob, glsl);
+
+			if(dt==OB_SOLID || glsl) {
+				GPU_set_object_materials(G.scene, ob, glsl,
+					(check_alpha)? &do_alpha_pass: NULL);
+			}
+
 			draw_mesh_fancy(base, dt, flag);
 			
 			if(me->totvert==0) retval= 1;
 		}
 	}
 	
-	/* init_gl_materials did the proper checking if this is needed */
-	if(has_alpha) add_view3d_after(G.vd, base, V3D_TRANSP, flag);
+	/* GPU_set_object_materials checked if this is needed */
+	if(do_alpha_pass) add_view3d_after(G.vd, base, V3D_TRANSP, flag);
 	
 	return retval;
 }
@@ -2601,9 +2592,10 @@ static int drawDispListwire(ListBase *dlbase)
 	return 0;
 }
 
-static void drawDispListsolid(ListBase *lb, Object *ob)
+static void drawDispListsolid(ListBase *lb, Object *ob, int glsl)
 {
 	DispList *dl;
+	GPUVertexAttribs gattribs;
 	float *data, curcol[4];
 	float *ndata;
 	
@@ -2667,7 +2659,7 @@ static void drawDispListsolid(ListBase *lb, Object *ob)
 		case DL_SURF:
 			
 			if(dl->index) {
-				set_gl_material(dl->col+1);
+				GPU_enable_material(dl->col+1, (glsl)? &gattribs: NULL);
 				
 				if(dl->rt & CU_SMOOTH) glShadeModel(GL_SMOOTH);
 				else glShadeModel(GL_FLAT);
@@ -2675,12 +2667,12 @@ static void drawDispListsolid(ListBase *lb, Object *ob)
 				glVertexPointer(3, GL_FLOAT, 0, dl->verts);
 				glNormalPointer(GL_FLOAT, 0, dl->nors);
 				glDrawElements(GL_QUADS, 4*dl->totindex, GL_UNSIGNED_INT, dl->index);
+				GPU_disable_material();
 			}			
 			break;
 
 		case DL_INDEX3:
-		
-			set_gl_material(dl->col+1);
+			GPU_enable_material(dl->col+1, (glsl)? &gattribs: NULL);
 			
 			glVertexPointer(3, GL_FLOAT, 0, dl->verts);
 			
@@ -2693,6 +2685,7 @@ static void drawDispListsolid(ListBase *lb, Object *ob)
 				glNormalPointer(GL_FLOAT, 0, dl->nors);
 			
 			glDrawElements(GL_TRIANGLES, 3*dl->parts, GL_UNSIGNED_INT, dl->index);
+			GPU_disable_material();
 			
 			if(index3_nors_incr==0)
 				glEnableClientState(GL_NORMAL_ARRAY);
@@ -2700,12 +2693,13 @@ static void drawDispListsolid(ListBase *lb, Object *ob)
 			break;
 
 		case DL_INDEX4:
-
-			set_gl_material(dl->col+1);
+			GPU_enable_material(dl->col+1, (glsl)? &gattribs: NULL);
 			
 			glVertexPointer(3, GL_FLOAT, 0, dl->verts);
 			glNormalPointer(GL_FLOAT, 0, dl->nors);
 			glDrawElements(GL_QUADS, 4*dl->parts, GL_UNSIGNED_INT, dl->index);
+
+			GPU_disable_material();
 			
 			break;
 		}
@@ -2799,14 +2793,18 @@ static int drawDispList(Base *base, int dt)
 				draw_index_wire= 1;
 			}
 			else {
-				if(dt==OB_SHADED) {
+				if(draw_glsl_material(ob, dt)) {
+					GPU_set_object_materials(G.scene, ob, 1, NULL);
+					drawDispListsolid(lb, ob, 1);
+				}
+				else if(dt == OB_SHADED) {
 					if(ob->disp.first==0) shadeDispList(base);
 					drawDispListshaded(lb, ob);
 				}
 				else {
-					init_gl_materials(ob, 0);
+					GPU_set_object_materials(G.scene, ob, 0, NULL);
 					glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, 0);
-					drawDispListsolid(lb, ob);
+					drawDispListsolid(lb, ob, 0);
 				}
 				if(ob==G.obedit && cu->bevobj==NULL && cu->taperobj==NULL && cu->ext1 == 0.0 && cu->ext2 == 0.0) {
 					cpack(0);
@@ -2833,15 +2831,19 @@ static int drawDispList(Base *base, int dt)
 			
 			if(dl->nors==NULL) addnormalsDispList(ob, lb);
 			
-			if(dt==OB_SHADED) {
+			if(draw_glsl_material(ob, dt)) {
+				GPU_set_object_materials(G.scene, ob, 1, NULL);
+				drawDispListsolid(lb, ob, 1);
+			}
+			else if(dt==OB_SHADED) {
 				if(ob->disp.first==NULL) shadeDispList(base);
 				drawDispListshaded(lb, ob);
 			}
 			else {
-				init_gl_materials(ob, 0);
+				GPU_set_object_materials(G.scene, ob, 0, NULL);
 				glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, 0);
 			
-				drawDispListsolid(lb, ob);
+				drawDispListsolid(lb, ob, 0);
 			}
 		}
 		else {
@@ -2857,16 +2859,20 @@ static int drawDispList(Base *base, int dt)
 			
 			if(solid) {
 				
-				if(dt==OB_SHADED) {
+				if(draw_glsl_material(ob, dt)) {
+					GPU_set_object_materials(G.scene, ob, 1, NULL);
+					drawDispListsolid(lb, ob, 1);
+				}
+				else if(dt == OB_SHADED) {
 					dl= lb->first;
 					if(dl && dl->col1==0) shadeDispList(base);
 					drawDispListshaded(lb, ob);
 				}
 				else {
-					init_gl_materials(ob, 0);
+					GPU_set_object_materials(G.scene, ob, 0, NULL);
 					glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, 0);
 				
-					drawDispListsolid(lb, ob);	
+					drawDispListsolid(lb, ob, 0);
 				}
 			}
 			else{
@@ -4624,9 +4630,8 @@ static void drawSolidSelect(Base *base)
 			drawDispListwire(&ob->disp);
 	}
 	else if(ob->type==OB_ARMATURE) {
-		if(!(ob->flag & OB_POSEMODE)) {
+		if(!(ob->flag & OB_POSEMODE))
 			draw_armature(base, OB_WIRE, 0);
-		}
 	}
 
 	glLineWidth(1.0);
@@ -5094,8 +5099,9 @@ void draw_object(Base *base, int flag)
 			drawlattice(ob);
 			break;
 		case OB_ARMATURE:
-			if(dt>OB_WIRE) set_gl_material(0);	// we use defmaterial
+			if(dt>OB_WIRE) GPU_enable_material(0, NULL); // we use default material
 			empty_object= draw_armature(base, dt, flag);
+			if(dt>OB_WIRE) GPU_disable_material();
 			break;
 		default:
 			drawaxes(1.0, flag, OB_ARROWS);
@@ -5138,9 +5144,8 @@ void draw_object(Base *base, int flag)
 	}
 
 	/* draw extra: after normal draw because of makeDispList */
-	if(dtx) {
-		if(G.f & G_SIMULATION);
-		else if(dtx & OB_AXIS) {
+	if(dtx && !(G.f & G_SIMULATION)) {
+		if(dtx & OB_AXIS) {
 			drawaxes(1.0f, flag, OB_ARROWS);
 		}
 		if(dtx & OB_BOUNDBOX) draw_bounding_volume(ob);
@@ -5411,19 +5416,6 @@ static int bbs_mesh_solid__setDrawOpts(void *userData, int index, int *drawSmoot
 	}
 }
 
-static int bbs_mesh_wire__setDrawOpts(void *userData, int index)
-{
-	struct { Mesh *me; EdgeHash *eh; int offset; } *data = userData;
-	MEdge *med = data->me->medge + index;
-	uintptr_t flags = (intptr_t)BLI_edgehash_lookup(data->eh, med->v1, med->v2);
-
-	if (flags & 1) {
-		set_framebuffer_index_color(data->offset+index);
-		return 1;
-	} else
-		return 0;
-}
-
 /* TODO remove this - since face select mode now only works with painting */
 static void bbs_mesh_solid(Object *ob)
 {
@@ -5433,22 +5425,6 @@ static void bbs_mesh_solid(Object *ob)
 	glColor3ub(0, 0, 0);
 	dm->drawMappedFaces(dm, bbs_mesh_solid__setDrawOpts, me, 0);
 
-	/* draw edges for seam marking in faceselect mode, but not when painting,
-	   so that painting doesn't get interrupted on an edge */
-	if ((G.f & G_FACESELECT) && !(G.f & (G_VERTEXPAINT|G_TEXTUREPAINT|G_WEIGHTPAINT))) {
-		struct { Mesh *me; EdgeHash *eh; int offset; } userData;
-
-		userData.me = me;
-		userData.eh = get_tface_mesh_marked_edge_info(me);
-		userData.offset = userData.me->totface+1;
-
-		bglPolygonOffset(1.0);
-		dm->drawMappedEdges(dm, bbs_mesh_wire__setDrawOpts, (void*)&userData);
-		bglPolygonOffset(0.0);
-
-		BLI_edgehash_free(userData.eh, NULL);
-	}
-
 	dm->release(dm);
 }
 
@@ -5504,6 +5480,7 @@ void draw_object_backbufsel(Object *ob)
 static void draw_object_mesh_instance(Object *ob, int dt, int outline)
 {
 	DerivedMesh *dm=NULL, *edm=NULL;
+	int glsl;
 	
 	if(G.obedit && ob->data==G.obedit->data)
 		edm= editmesh_get_derived_base();
@@ -5520,8 +5497,10 @@ static void draw_object_mesh_instance(Object *ob, int dt, int outline)
 		if(outline)
 			draw_mesh_object_outline(ob, dm?dm:edm);
 
-		if(dm)
-			init_gl_materials(ob, 0);
+		if(dm) {
+			glsl = draw_glsl_material(ob, dt);
+			GPU_set_object_materials(G.scene, ob, glsl, NULL);
+		}
 		else {
 			glEnable(GL_COLOR_MATERIAL);
 			BIF_ThemeColor(TH_BONE_SOLID);
@@ -5532,8 +5511,10 @@ static void draw_object_mesh_instance(Object *ob, int dt, int outline)
 		glFrontFace((ob->transflag&OB_NEG_SCALE)?GL_CW:GL_CCW);
 		glEnable(GL_LIGHTING);
 		
-		if(dm)
-			dm->drawFacesSolid(dm, set_gl_material);
+		if(dm) {
+			dm->drawFacesSolid(dm, GPU_enable_material);
+			GPU_disable_material();
+		}
 		else if(edm)
 			edm->drawMappedFaces(edm, NULL, NULL, 0);
 		
diff --git a/source/blender/src/drawview.c b/source/blender/src/drawview.c
index 2030eb658de..020dfd407ad 100644
--- a/source/blender/src/drawview.c
+++ b/source/blender/src/drawview.c
@@ -64,6 +64,7 @@
 #include "DNA_gpencil_types.h"
 #include "DNA_image_types.h"
 #include "DNA_key_types.h"
+#include "DNA_lamp_types.h"
 #include "DNA_lattice_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
@@ -162,6 +163,9 @@
 
 #include "RE_pipeline.h"	// make_stars
 
+#include "GPU_draw.h"
+#include "GPU_material.h"
+
 #include "multires.h"
 
 /* For MULTISAMPLE_ARB #define.
@@ -193,132 +197,6 @@ static void star_stuff_term_func(void)
 	glEnd();
 }
 
-void default_gl_light(void)
-{
-	int a;
-	
-	/* initialize */
-	if(U.light[0].flag==0 && U.light[1].flag==0 && U.light[2].flag==0) {
-		U.light[0].flag= 1;
-		U.light[0].vec[0]= -0.3; U.light[0].vec[1]= 0.3; U.light[0].vec[2]= 0.9;
-		U.light[0].col[0]= 0.8; U.light[0].col[1]= 0.8; U.light[0].col[2]= 0.8;
-		U.light[0].spec[0]= 0.5; U.light[0].spec[1]= 0.5; U.light[0].spec[2]= 0.5;
-		U.light[0].spec[3]= 1.0;
-		
-		U.light[1].flag= 0;
-		U.light[1].vec[0]= 0.5; U.light[1].vec[1]= 0.5; U.light[1].vec[2]= 0.1;
-		U.light[1].col[0]= 0.4; U.light[1].col[1]= 0.4; U.light[1].col[2]= 0.8;
-		U.light[1].spec[0]= 0.3; U.light[1].spec[1]= 0.3; U.light[1].spec[2]= 0.5;
-		U.light[1].spec[3]= 1.0;
-	
-		U.light[2].flag= 0;
-		U.light[2].vec[0]= 0.3; U.light[2].vec[1]= -0.3; U.light[2].vec[2]= -0.2;
-		U.light[2].col[0]= 0.8; U.light[2].col[1]= 0.5; U.light[2].col[2]= 0.4;
-		U.light[2].spec[0]= 0.5; U.light[2].spec[1]= 0.4; U.light[2].spec[2]= 0.3;
-		U.light[2].spec[3]= 1.0;
-	}
-	
-
-	glLightfv(GL_LIGHT0, GL_POSITION, U.light[0].vec); 
-	glLightfv(GL_LIGHT0, GL_DIFFUSE, U.light[0].col); 
-	glLightfv(GL_LIGHT0, GL_SPECULAR, U.light[0].spec); 
-
-	glLightfv(GL_LIGHT1, GL_POSITION, U.light[1].vec); 
-	glLightfv(GL_LIGHT1, GL_DIFFUSE, U.light[1].col); 
-	glLightfv(GL_LIGHT1, GL_SPECULAR, U.light[1].spec); 
-
-	glLightfv(GL_LIGHT2, GL_POSITION, U.light[2].vec); 
-	glLightfv(GL_LIGHT2, GL_DIFFUSE, U.light[2].col); 
-	glLightfv(GL_LIGHT2, GL_SPECULAR, U.light[2].spec); 
-
-	for(a=0; a<8; a++) {
-		if(a<3) {
-			if(U.light[a].flag) glEnable(GL_LIGHT0+a);
-			else glDisable(GL_LIGHT0+a);
-			
-			// clear stuff from other opengl lamp usage
-			glLightf(GL_LIGHT0+a, GL_SPOT_CUTOFF, 180.0);
-			glLightf(GL_LIGHT0+a, GL_CONSTANT_ATTENUATION, 1.0);
-			glLightf(GL_LIGHT0+a, GL_LINEAR_ATTENUATION, 0.0);
-		}
-		else glDisable(GL_LIGHT0+a);
-	}
-	
-	glDisable(GL_LIGHTING);
-
-	glDisable(GL_COLOR_MATERIAL);
-}
-
-/* also called when render 'ogl'
-   keep synced with Myinit_gl_stuff in the game engine! */
-void init_gl_stuff(void)	
-{
-	float mat_ambient[] = { 0.0, 0.0, 0.0, 0.0 };
-	float mat_specular[] = { 0.5, 0.5, 0.5, 1.0 };
-	float mat_shininess[] = { 35.0 };
-	int a, x, y;
-	GLubyte pat[32*32];
-	const GLubyte *patc= pat;
-	
-	
-	glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, mat_ambient);
-	glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, mat_specular);
-	glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, mat_specular);
-	glMaterialfv(GL_FRONT_AND_BACK, GL_SHININESS, mat_shininess);
-
-	default_gl_light();
-	
-	/* no local viewer, looks ugly in ortho mode */
-	/* glLightModelfv(GL_LIGHT_MODEL_LOCAL_VIEWER, &one); */
-	
-	glDepthFunc(GL_LEQUAL);
-	/* scaling matrices */
-	glEnable(GL_NORMALIZE);
-
-	glShadeModel(GL_FLAT);
-
-	glDisable(GL_ALPHA_TEST);
-	glDisable(GL_BLEND);
-	glDisable(GL_DEPTH_TEST);
-	glDisable(GL_FOG);
-	glDisable(GL_LIGHTING);
-	glDisable(GL_LOGIC_OP);
-	glDisable(GL_STENCIL_TEST);
-	glDisable(GL_TEXTURE_1D);
-	glDisable(GL_TEXTURE_2D);
-
-	/* default on, disable/enable should be local per function */
-	glEnableClientState(GL_VERTEX_ARRAY);
-	glEnableClientState(GL_NORMAL_ARRAY);
-	
-	glPixelTransferi(GL_MAP_COLOR, GL_FALSE);
-	glPixelTransferi(GL_RED_SCALE, 1);
-	glPixelTransferi(GL_RED_BIAS, 0);
-	glPixelTransferi(GL_GREEN_SCALE, 1);
-	glPixelTransferi(GL_GREEN_BIAS, 0);
-	glPixelTransferi(GL_BLUE_SCALE, 1);
-	glPixelTransferi(GL_BLUE_BIAS, 0);
-	glPixelTransferi(GL_ALPHA_SCALE, 1);
-	glPixelTransferi(GL_ALPHA_BIAS, 0);
-	
-	glPixelTransferi(GL_DEPTH_BIAS, 0);
-	glPixelTransferi(GL_DEPTH_SCALE, 1);
-	glDepthRange(0.0, 1.0);
-	
-	a= 0;
-	for(x=0; x<32; x++) {
-		for(y=0; y<4; y++) {
-			if( (x) & 1) pat[a++]= 0x88;
-			else pat[a++]= 0x22;
-		}
-	}
-	
-	glPolygonStipple(patc);
-
-
-	init_realtime_GL();	
-}
-
 void circf(float x, float y, float rad)
 {
 	GLUquadricObj *qobj = gluNewQuadric(); 
@@ -2737,7 +2615,7 @@ void add_view3d_after(View3D *v3d, Base *base, int type, int flag)
 }
 
 /* clears zbuffer and draws it over */
-static void view3d_draw_xray(View3D *v3d)
+static void view3d_draw_xray(View3D *v3d, int clear)
 {
 	View3DAfter *v3da, *next;
 	int doit= 0;
@@ -2746,7 +2624,7 @@ static void view3d_draw_xray(View3D *v3d)
 		if(v3da->type==V3D_XRAY) doit= 1;
 	
 	if(doit) {
-		if(v3d->zbuf) glClear(GL_DEPTH_BUFFER_BIT);
+		if(clear && v3d->zbuf) glClear(GL_DEPTH_BUFFER_BIT);
 		v3d->xray= TRUE;
 		
 		for(v3da= v3d->afterdraw.first; v3da; v3da= next) {
@@ -2768,7 +2646,7 @@ static void view3d_draw_transp(View3D *v3d)
 
 	glDepthMask(0);
 	v3d->transp= TRUE;
-		
+
 	for(v3da= v3d->afterdraw.first; v3da; v3da= next) {
 		next= v3da->next;
 		if(v3da->type==V3D_TRANSP) {
@@ -2946,7 +2824,7 @@ static void draw_sculpt_depths(View3D *v3d)
 	}
 }
 
-void draw_depth(ScrArea *sa, void *spacedata)
+void draw_depth(ScrArea *sa, void *spacedata, int (* func)(void *))
 {
 	View3D *v3d= spacedata;
 	Base *base;
@@ -2986,9 +2864,11 @@ void draw_depth(ScrArea *sa, void *spacedata)
 	if(G.scene->set) {
 		for(SETLOOPER(G.scene->set, base)) {
 			if(v3d->lay & base->lay) {
-				draw_object(base, 0);
-				if(base->object->transflag & OB_DUPLI) {
-					draw_dupli_objects_color(v3d, base, TH_WIRE);
+				if (func == NULL || func(base)) {
+					draw_object(base, 0);
+					if(base->object->transflag & OB_DUPLI) {
+						draw_dupli_objects_color(v3d, base, TH_WIRE);
+					}
 				}
 			}
 		}
@@ -2996,12 +2876,13 @@ void draw_depth(ScrArea *sa, void *spacedata)
 	
 	for(base= G.scene->base.first; base; base= base->next) {
 		if(v3d->lay & base->lay) {
-			
-			/* dupli drawing */
-			if(base->object->transflag & OB_DUPLI) {
-				draw_dupli_objects(v3d, base);
+			if (func == NULL || func(base)) {
+				/* dupli drawing */
+				if(base->object->transflag & OB_DUPLI) {
+					draw_dupli_objects(v3d, base);
+				}
+				draw_object(base, 0);
 			}
-			draw_object(base, 0);
 		}
 	}
 	
@@ -3046,6 +2927,84 @@ void draw_depth(ScrArea *sa, void *spacedata)
 
 static void draw_viewport_fps(ScrArea *sa);
 
+typedef struct View3DShadow{
+	struct View3DShadow*next, *prev;
+	GPULamp *lamp;
+} View3DShadow;
+
+static void gpu_render_lamp_update(View3D *v3d, Object *ob, Object *par, float obmat[][4], ListBase *shadows)
+{
+	GPULamp *lamp;
+	View3DShadow *shadow;
+
+	lamp = GPU_lamp_from_blender(G.scene, ob, par);
+
+	if(lamp) {
+		GPU_lamp_update(lamp, obmat);
+
+		if(GPU_lamp_has_shadow_buffer(lamp)) {
+			shadow= MEM_callocN(sizeof(View3DShadow), "View3DShadow");
+			shadow->lamp = lamp;
+			BLI_addtail(shadows, shadow);
+		}
+	}
+}
+
+static void gpu_update_lamps_shadows(Scene *scene, View3D *v3d)
+{
+	ListBase shadows;
+	View3DShadow *shadow;
+	Scene *sce;
+	Base *base;
+	Object *ob;
+
+	shadows.first= shadows.last= NULL;
+
+	/* update lamp transform and gather shadow lamps */
+	for(SETLOOPER(G.scene, base)) {
+		ob= base->object;
+
+		if(ob->type == OB_LAMP)
+			gpu_render_lamp_update(v3d, ob, NULL, ob->obmat, &shadows);
+
+		if (ob->transflag & OB_DUPLI) {
+			DupliObject *dob;
+			ListBase *lb = object_duplilist(G.scene, ob);
+			
+			for(dob=lb->first; dob; dob=dob->next)
+				if(dob->ob->type==OB_LAMP)
+					gpu_render_lamp_update(v3d, dob->ob, ob, dob->mat, &shadows);
+			
+			free_object_duplilist(lb);
+		}
+	}
+
+	/* render shadows after updating all lamps, nested object_duplilist
+	 * don't work correct since it's replacing object matrices */
+	for(shadow=shadows.first; shadow; shadow=shadow->next) {
+		/* this needs to be done better .. */
+		float viewmat[4][4], winmat[4][4];
+		int drawtype, lay, winsize, flag2;
+
+		drawtype= v3d->drawtype;
+		lay= v3d->lay;
+		flag2= v3d->flag2 & V3D_SOLID_TEX;
+
+		v3d->drawtype = OB_SOLID;
+		v3d->lay &= GPU_lamp_shadow_layer(shadow->lamp);
+		v3d->flag2 &= ~V3D_SOLID_TEX;
+
+		GPU_lamp_shadow_buffer_bind(shadow->lamp, viewmat, &winsize, winmat);
+		drawview3d_render(v3d, viewmat, winsize, winsize, winmat, 1);
+		GPU_lamp_shadow_buffer_unbind(shadow->lamp);
+
+		v3d->drawtype= drawtype;
+		v3d->lay= lay;
+		v3d->flag2 |= flag2;
+	}
+
+	BLI_freelistN(&shadows);
+}
 
 void drawview3dspace(ScrArea *sa, void *spacedata)
 {
@@ -3066,6 +3025,10 @@ void drawview3dspace(ScrArea *sa, void *spacedata)
 
 	for(base= G.scene->base.first; base; base= base->next)
 		object_handle_update(base->object);   // bke_object.h
+
+	/* shadow buffers, before we setup matrices */
+	if(draw_glsl_material(NULL, v3d->drawtype))
+		gpu_update_lamps_shadows(G.scene, v3d);
 	
 	setwinmatrixview3d(sa->winx, sa->winy, NULL);	/* 0= no pick rect */
 	setviewmatrixview3d();	/* note: calls where_is_object for camera... */
@@ -3208,8 +3171,8 @@ void drawview3dspace(ScrArea *sa, void *spacedata)
 	if(G.scene->radio) RAD_drawall(v3d->drawtype>=OB_SOLID);
 	
 	/* Transp and X-ray afterdraw stuff */
-	view3d_draw_xray(v3d);	// clears zbuffer if it is used!
 	view3d_draw_transp(v3d);
+	view3d_draw_xray(v3d, 1);	// clears zbuffer if it is used!
 
 	if(!retopo && sculptparticle && (obact && (OBACT->dtx & OB_DRAWXRAY))) {
 		if(G.f & G_SCULPTMODE)
@@ -3328,18 +3291,29 @@ void drawview3dspace(ScrArea *sa, void *spacedata)
 	
 }
 
-
-void drawview3d_render(struct View3D *v3d, int winx, int winy, float winmat[][4])
+void drawview3d_render(struct View3D *v3d, float viewmat[][4], int winx, int winy, float winmat[][4], int shadow)
 {
 	Base *base;
 	Scene *sce;
-	float v3dwinmat[4][4];
+	float v3dviewmat[4][4], v3dwinmat[4][4];
+
+	/* shadow buffers, before we setup matrices */
+	if(!shadow && draw_glsl_material(NULL, v3d->drawtype))
+		gpu_update_lamps_shadows(G.scene, v3d);
 	
 	if(!winmat)
 		setwinmatrixview3d(winx, winy, NULL);
 
-	setviewmatrixview3d();
-	myloadmatrix(v3d->viewmat);
+	if(viewmat) {
+		Mat4CpyMat4(v3dviewmat, viewmat);
+		Mat4CpyMat4(v3d->viewmat, viewmat);
+	}
+	else {
+		setviewmatrixview3d();
+		Mat4CpyMat4(v3dviewmat, v3d->viewmat);
+	}
+
+	myloadmatrix(v3dviewmat);
 
 	/* when winmat is not NULL, it overrides the regular window matrix */
 	glMatrixMode(GL_PROJECTION);
@@ -3348,12 +3322,14 @@ void drawview3d_render(struct View3D *v3d, int winx, int winy, float winmat[][4]
 	mygetmatrix(v3dwinmat);
 	glMatrixMode(GL_MODELVIEW);
 
-	Mat4MulMat4(v3d->persmat, v3d->viewmat, v3dwinmat);
+	Mat4MulMat4(v3d->persmat, v3dviewmat, v3dwinmat);
 	Mat4Invert(v3d->persinv, v3d->persmat);
 	Mat4Invert(v3d->viewinv, v3d->viewmat);
 
-	free_all_realtime_images();
-	reshadeall_displist();
+	if(!shadow) {
+		GPU_free_images();
+		reshadeall_displist();
+	}
 	
 	if(v3d->drawtype > OB_WIRE) {
 		v3d->zbuf= TRUE;
@@ -3431,8 +3407,8 @@ void drawview3d_render(struct View3D *v3d, int winx, int winy, float winmat[][4]
 	if(G.scene->radio) RAD_drawall(v3d->drawtype>=OB_SOLID);
 
 	/* Transp and X-ray afterdraw stuff */
-	view3d_draw_xray(v3d);	// clears zbuffer if it is used!
 	view3d_draw_transp(v3d);
+	view3d_draw_xray(v3d, !shadow);	// clears zbuffer if it is used!
 	
 	if(v3d->flag & V3D_CLIPPING)
 		view3d_clr_clipping();
@@ -3451,11 +3427,12 @@ void drawview3d_render(struct View3D *v3d, int winx, int winy, float winmat[][4]
 	
 	G.f &= ~G_SIMULATION;
 
-	glFlush();
+	if(!shadow) {
+		glFlush();
+		GPU_free_images();
+	}
 
 	glLoadIdentity();
-
-	free_all_realtime_images();
 }
 
 
diff --git a/source/blender/src/editdeform.c b/source/blender/src/editdeform.c
index 5de4c6ed23c..3f178e1ea2b 100644
--- a/source/blender/src/editdeform.c
+++ b/source/blender/src/editdeform.c
@@ -270,7 +270,7 @@ static void del_defgroup_update_users(Object *ob, int id)
 	int a;
 
 	/* these cases don't use names to refer to vertex groups, so when
-	 * they get deleted the numbers get out of synce, this corrects that */
+	 * they get deleted the numbers get out of sync, this corrects that */
 
 	if(ob->soft) {
 		if(ob->soft->vertgroup == id)
diff --git a/source/blender/src/editface.c b/source/blender/src/editface.c
index 781210cd373..008ddf3b5f0 100644
--- a/source/blender/src/editface.c
+++ b/source/blender/src/editface.c
@@ -82,13 +82,14 @@
 #include "BIF_space.h"	/* for allqueue */
 #include "BIF_drawimage.h"	/* for allqueue */
 
-#include "BDR_drawmesh.h"
 #include "BDR_editface.h"
 #include "BDR_vpaint.h"
 
 #include "BDR_editface.h"
 #include "BDR_vpaint.h"
 
+#include "GPU_draw.h"
+
 #include "mydevice.h"
 #include "blendef.h"
 #include "butspace.h"
@@ -1315,7 +1316,7 @@ void set_texturepaint() /* toggle */
 
 	if(G.f & G_TEXTUREPAINT) {
 		G.f &= ~G_TEXTUREPAINT;
-		texpaint_enable_mipmap();
+		GPU_paint_set_mipmap(1);
 	}
 	else if (me) {
 		G.f |= G_TEXTUREPAINT;
@@ -1324,7 +1325,7 @@ void set_texturepaint() /* toggle */
 			make_tfaces(me);
 
 		brush_check_exists(&G.scene->toolsettings->imapaint.brush);
-		texpaint_disable_mipmap();
+		GPU_paint_set_mipmap(0);
 	}
 
 	allqueue(REDRAWVIEW3D, 0);
diff --git a/source/blender/src/editipo_lib.c b/source/blender/src/editipo_lib.c
index e1e286e10cf..7bfd097b87f 100644
--- a/source/blender/src/editipo_lib.c
+++ b/source/blender/src/editipo_lib.c
@@ -392,7 +392,15 @@ int texchannel_to_adrcode(int channel)
 		case 6: return MA_MAP7; 
 		case 7: return MA_MAP8; 
 		case 8: return MA_MAP9; 
-		case 9: return MA_MAP10; 
+		case 9: return MA_MAP10;
+		case 10: return MA_MAP11;
+		case 11: return MA_MAP12;
+		case 12: return MA_MAP13;
+		case 13: return MA_MAP14;
+		case 14: return MA_MAP15;
+		case 15: return MA_MAP16;
+		case 16: return MA_MAP17;
+		case 17: return MA_MAP18;
 		default: return 0;
 	}
 }
diff --git a/source/blender/src/editlattice.c b/source/blender/src/editlattice.c
index 0782e012f68..06b092a30ac 100644
--- a/source/blender/src/editlattice.c
+++ b/source/blender/src/editlattice.c
@@ -131,7 +131,7 @@ void make_editLatt(void)
 		copy_dverts(editLatt->dvert, lt->dvert, tot);
 	}
 	
-	BIF_undo_push("original");
+	BIF_undo_push("Original");
 }
 
 
diff --git a/source/blender/src/editmode_undo.c b/source/blender/src/editmode_undo.c
index d0a44360ad5..7893dac2408 100644
--- a/source/blender/src/editmode_undo.c
+++ b/source/blender/src/editmode_undo.c
@@ -107,6 +107,7 @@ typedef struct UndoElem {
 	Object *ob;		// pointer to edited object
 	int type;		// type of edited object
 	void *undodata;
+	uintptr_t undosize;
 	char name[MAXUNDONAME];
 	void (*freedata)(void *);
 	void (*to_editmode)(void *);
@@ -138,6 +139,7 @@ void undo_editmode_push(char *name, void (*freedata)(void *),
 {
 	UndoElem *uel;
 	int nr;
+	uintptr_t memused, totmem, maxmem;
 
 	/* at first here was code to prevent an "original" key to be insterted twice
 	   this was giving conflicts for example when mesh changed due to keys or apply */
@@ -145,9 +147,8 @@ void undo_editmode_push(char *name, void (*freedata)(void *),
 	/* remove all undos after (also when curundo==NULL) */
 	while(undobase.last != curundo) {
 		uel= undobase.last;
-		BLI_remlink(&undobase, uel);
 		uel->freedata(uel->undodata);
-		MEM_freeN(uel);
+		BLI_freelinkN(&undobase, uel);
 	}
 	
 	/* make new */
@@ -160,7 +161,7 @@ void undo_editmode_push(char *name, void (*freedata)(void *),
 	uel->from_editmode= from_editmode;
 	uel->validate_undo= validate_undo;
 	
-	/* and limit amount to the maximum */
+	/* limit amount to the maximum amount*/
 	nr= 0;
 	uel= undobase.last;
 	while(uel) {
@@ -171,19 +172,43 @@ void undo_editmode_push(char *name, void (*freedata)(void *),
 	if(uel) {
 		while(undobase.first!=uel) {
 			UndoElem *first= undobase.first;
-			BLI_remlink(&undobase, first);
 			first->freedata(first->undodata);
-			MEM_freeN(first);
+			BLI_freelinkN(&undobase, first);
 		}
 	}
 
 	/* copy  */
+	memused= MEM_get_memory_in_use();
 	curundo->undodata= curundo->from_editmode();
+	curundo->undosize= MEM_get_memory_in_use() - memused;
 	curundo->ob= G.obedit;
 	curundo->id= G.obedit->id;
 	curundo->type= G.obedit->type;
-}
 
+	if(U.undomemory != 0) {
+		/* limit to maximum memory (afterwards, we can't know in advance) */
+		totmem= 0;
+		maxmem= ((uintptr_t)U.undomemory)*1024*1024;
+
+		uel= undobase.last;
+		while(uel && uel->prev) {
+			totmem+= uel->undosize;
+			if(totmem>maxmem) break;
+			uel= uel->prev;
+		}
+
+		if(uel) {
+			if(uel->prev && uel->prev->prev)
+				uel= uel->prev;
+
+			while(undobase.first!=uel) {
+				UndoElem *first= undobase.first;
+				first->freedata(first->undodata);
+				BLI_freelinkN(&undobase, first);
+			}
+		}
+	}
+}
 
 /* helper to remove clean other objects from undo stack */
 static void undo_clean_stack(void)
@@ -205,9 +230,8 @@ static void undo_clean_stack(void)
 		}
 		else {
 			mixed= 1;
-			BLI_remlink(&undobase, uel);
 			uel->freedata(uel->undodata);
-			MEM_freeN(uel);
+			BLI_freelinkN(&undobase, uel);
 		}
 
 		uel= next;
diff --git a/source/blender/src/editview.c b/source/blender/src/editview.c
index d2e59ae676d..2133a92a54e 100644
--- a/source/blender/src/editview.c
+++ b/source/blender/src/editview.c
@@ -2247,7 +2247,7 @@ void view3d_border_zoom(void)
 	
 	/* Get Z Depths, needed for perspective, nice for ortho */
 	bgl_get_mats(&mats);
-	draw_depth(curarea, (void *)v3d);
+	draw_depth(curarea, (void *)v3d, NULL);
 	
 	/* force updating */
 	if (v3d->depths) {
diff --git a/source/blender/src/header_image.c b/source/blender/src/header_image.c
index fac9e3af1af..1b90c406f0e 100644
--- a/source/blender/src/header_image.c
+++ b/source/blender/src/header_image.c
@@ -239,8 +239,10 @@ void do_image_buttons(unsigned short event)
 				if(ima->twsta>=nr) ima->twsta= 1;
 				if(ima->twend>=nr) ima->twend= nr-1;
 				if(ima->twsta>ima->twend) ima->twsta= 1;
-				allqueue(REDRAWIMAGE, 0);
 			}
+
+			allqueue(REDRAWIMAGE, 0);
+			allqueue(REDRAWVIEW3D, 0);
 		}
 		break;
 	}	
@@ -1293,7 +1295,7 @@ void image_buttons(void)
 			uiBlockEndAlign(block);
 			xco+= 166;
 		}
-		uiDefIconButBitI(block, TOG, SI_DRAWTOOL, B_SIMAGEPAINTTOOL, ICON_TPAINT_HLT, xco,0,XIC,YIC, &G.sima->flag, 0, 0, 0, 0, "Enables painting textures on the image with left mouse button");
+		uiDefIconButBitI(block, TOG, SI_DRAWTOOL, B_SIMAGEPAINTTOOL, ICON_TPAINT_HLT, xco,0,XIC,YIC, &G.sima->flag, 0, 0, 0, 0, "Enable image painting");
 		
 		xco+= XIC+8;
 
diff --git a/source/blender/src/header_info.c b/source/blender/src/header_info.c
index 8b8fd9ef266..9bacc2b6351 100644
--- a/source/blender/src/header_info.c
+++ b/source/blender/src/header_info.c
@@ -39,8 +39,6 @@
 #include <config.h>
 #endif
 
-#include "BLO_sys_types.h" // for intptr_t support
-
 #include "DNA_group_types.h"
 #include "DNA_ID.h"
 #include "DNA_image_types.h"
@@ -120,6 +118,9 @@
 #include "BPY_extern.h"
 #include "BPY_menus.h"
 
+#include "GPU_extensions.h"
+#include "GPU_material.h"
+
 #include "blendef.h"
 #include "interface.h"
 #include "mydevice.h"
@@ -926,7 +927,7 @@ static void do_info_filemenu(void *arg, int event)
 			winqueue_break= 1;	/* leave queues everywhere */
 		
 			BKE_reset_undo();
-			BKE_write_undo("original");	/* save current state */
+			BKE_write_undo("Original");	/* save current state */
 			refresh_interface_font();
 		}
 		break;
@@ -1591,20 +1592,83 @@ static uiBlock *info_addmenu(void *arg_unused)
 
 /************************** GAME *****************************/
 
+void do_info_game_glslmenu(void *arg, int event)
+{
+	switch (event) {
+	case G_FILE_GLSL_NO_LIGHTS:
+	case G_FILE_GLSL_NO_SHADERS:
+	case G_FILE_GLSL_NO_SHADOWS:
+	case G_FILE_GLSL_NO_RAMPS:
+	case G_FILE_GLSL_NO_NODES:
+	case G_FILE_GLSL_NO_EXTRA_TEX:
+		G.fileflags ^= event;
+		GPU_materials_free();
+		allqueue(REDRAWINFO, 0);
+		allqueue(REDRAWVIEW3D, 0);
+		break;
+	default:
+		break;
+	}	
+}
+
+static uiBlock *info_game_glslmenu(void *arg_unused)
+{
+	uiBlock *block;
+	short yco= 0, menuwidth=160;
+	int check;
 	
+	block= uiNewBlock(&curarea->uiblocks, "game_glslmenu", UI_EMBOSSP, UI_HELV, G.curscreen->mainwin);
+	uiBlockSetButmFunc(block, do_info_game_glslmenu, NULL);
+
+	check = (G.fileflags & G_FILE_GLSL_NO_LIGHTS)? ICON_CHECKBOX_DEHLT: ICON_CHECKBOX_HLT;
+	uiDefIconTextBut(block, BUTM, 1, check, "Enable Lights",	 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, G_FILE_GLSL_NO_LIGHTS,
+		"Enable using lights in GLSL materials.");
+	check = (G.fileflags & G_FILE_GLSL_NO_SHADERS)? ICON_CHECKBOX_DEHLT: ICON_CHECKBOX_HLT;
+	uiDefIconTextBut(block, BUTM, 1, check, "Enable Shaders",	 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, G_FILE_GLSL_NO_SHADERS,
+		"Enable using shaders other than Lambert in GLSL materials");
+	check = (G.fileflags & G_FILE_GLSL_NO_SHADOWS)? ICON_CHECKBOX_DEHLT: ICON_CHECKBOX_HLT;
+	uiDefIconTextBut(block, BUTM, 1, check, "Enable Shadows",	 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, G_FILE_GLSL_NO_SHADOWS,
+		"Enable using shadows in GLSL materials");
+	check = (G.fileflags & G_FILE_GLSL_NO_RAMPS)? ICON_CHECKBOX_DEHLT: ICON_CHECKBOX_HLT;
+	uiDefIconTextBut(block, BUTM, 1, check, "Enable Ramps",	 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, G_FILE_GLSL_NO_RAMPS,
+		"Enable using ramps in GLSL materials");
+	check = (G.fileflags & G_FILE_GLSL_NO_NODES)? ICON_CHECKBOX_DEHLT: ICON_CHECKBOX_HLT;
+	uiDefIconTextBut(block, BUTM, 1, check, "Enable Nodes",	 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, G_FILE_GLSL_NO_NODES,
+		"Enable using nodes in GLSL materials.");
+	check = (G.fileflags & G_FILE_GLSL_NO_EXTRA_TEX)? ICON_CHECKBOX_DEHLT: ICON_CHECKBOX_HLT;
+	uiDefIconTextBut(block, BUTM, 1, check, "Enable Extra Textures",	 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, G_FILE_GLSL_NO_EXTRA_TEX,
+		"Enable using texture channels other than Col and Alpha in GLSL materials.");
+
+	uiBlockSetDirection(block, UI_RIGHT);
+	uiTextBoundsBlock(block, 50);
+		
+	return block;
+}
+
 static void do_info_gamemenu(void *arg, int event)
 {
 	switch (event) {
 	case G_FILE_ENABLE_ALL_FRAMES:
-	case G_FILE_DIAPLAY_LISTS:
+	case G_FILE_DISPLAY_LISTS:
 	case G_FILE_SHOW_FRAMERATE:
 	case G_FILE_SHOW_DEBUG_PROPS:
 	case G_FILE_AUTOPLAY:
 	case G_FILE_GAME_TO_IPO:
-	case G_FILE_GAME_MAT:
 	case G_FILE_SHOW_PHYSICS:
 		G.fileflags ^= event;
 		break;
+	case G_FILE_GAME_MAT|G_FILE_GAME_MAT_GLSL:
+		G.fileflags &= ~(G_FILE_GAME_MAT|G_FILE_GAME_MAT_GLSL);
+		break;
+	case G_FILE_GAME_MAT:
+		G.fileflags |= G_FILE_GAME_MAT;
+		G.fileflags &= ~G_FILE_GAME_MAT_GLSL;
+		break;
+	case G_FILE_GAME_MAT_GLSL:
+		if(!GPU_extensions_minimum_support())
+			error("GLSL not supported with this graphics card or driver.");
+		G.fileflags |= (G_FILE_GAME_MAT|G_FILE_GAME_MAT_GLSL);
+		break;
 	default:
 		; /* ignore the rest */
 	}
@@ -1635,22 +1699,14 @@ static uiBlock *info_gamemenu(void *arg_unused)
 		uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_HLT, "Record Game Physics to IPO",	 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, G_FILE_GAME_TO_IPO, "");
 	} else {
 
-	if(G.fileflags & G_FILE_DIAPLAY_LISTS) {
-		uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_HLT, "Generate Display Lists",	 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, G_FILE_DIAPLAY_LISTS, "");
+	if(G.fileflags & G_FILE_DISPLAY_LISTS) {
+		uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_HLT, "Generate Display Lists",	 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, G_FILE_DISPLAY_LISTS, "");
 	} else {
-		uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_DEHLT, "Generate Display Lists",	 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, G_FILE_DIAPLAY_LISTS, "");
+		uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_DEHLT, "Generate Display Lists",	 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, G_FILE_DISPLAY_LISTS, "");
 	}	
 		uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_DEHLT, "Record Game Physics to IPO",	 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, G_FILE_GAME_TO_IPO, "");
 	}
 	
-	if(G.fileflags & G_FILE_GAME_MAT) {
-		uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_HLT, "Use Blender Materials",	 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, G_FILE_GAME_MAT, "");
-	} else {
-		uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_DEHLT, "Use Blender Materials",	 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, G_FILE_GAME_MAT, "");
-	}	
-
-
-
 	if(G.fileflags & G_FILE_SHOW_FRAMERATE) {
 		uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_HLT, "Show Framerate and Profile",	 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, G_FILE_SHOW_FRAMERATE, "");
 	} else {
@@ -1669,6 +1725,28 @@ static uiBlock *info_gamemenu(void *arg_unused)
 	} else {
 		uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_DEHLT, "Show Debug Properties",		 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, G_FILE_SHOW_DEBUG_PROPS, "");
 	}
+
+	uiDefBut(block, SEPR, 0, "",				0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 1, 0, "");
+
+	if(!(G.fileflags & G_FILE_GAME_MAT)) {
+		uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_HLT, "Texture Face Materials",	 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 0, "");
+	} else {
+		uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_DEHLT, "Texture Face Materials",	 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, G_FILE_GAME_MAT|G_FILE_GAME_MAT_GLSL, "");
+	}	
+
+	if((G.fileflags & G_FILE_GAME_MAT) && !(G.fileflags & G_FILE_GAME_MAT_GLSL)) {
+		uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_HLT, "Blender Multitexture Materials",	 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 0, "");
+	} else {
+		uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_DEHLT, "Blender Multitexture Materials",	 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, G_FILE_GAME_MAT, "");
+	}	
+
+	if((G.fileflags & G_FILE_GAME_MAT) && (G.fileflags & G_FILE_GAME_MAT_GLSL)) {
+		uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_HLT, "Blender GLSL Materials",	 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 0, "");
+	} else {
+		uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_DEHLT, "Blender GLSL Materials",	 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, G_FILE_GAME_MAT_GLSL, "");
+	}	
+
+	uiDefIconTextBlockBut(block, info_game_glslmenu, NULL, ICON_RIGHTARROW_THIN, "GLSL Material Settings", 0, yco-=20, menuwidth, 19, "");
 	
 	uiDefBut(block, SEPR, 0, "",				0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 1, 0, "");
 
@@ -2108,13 +2186,16 @@ static void info_text(int x, int y)
 {
 	Object *ob= OBACT;
 	extern float hashvectf[];
-	extern uintptr_t mem_in_use, mmap_in_use;
+	uintptr_t mem_in_use, mmap_in_use;
 	unsigned int swatch_color;
 	float fac1, fac2, fac3;
 	char infostr[300], memstr[64];
 	char *headerstr, *s;
 	int hsize;
 
+	mem_in_use= MEM_get_memory_in_use();
+	mmap_in_use= MEM_get_mapped_memory_in_use();
+
 	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);
diff --git a/source/blender/src/header_view3d.c b/source/blender/src/header_view3d.c
index e57a3480b52..5d284f5eab4 100644
--- a/source/blender/src/header_view3d.c
+++ b/source/blender/src/header_view3d.c
@@ -4512,7 +4512,7 @@ static void do_view3d_tpaintmenu(void *arg, int event)
 {
 	switch(event) {
 	case 0: /* undo image painting */
-		imagepaint_undo();
+		undo_imagepaint_step(1);
 		break;
 	}
 
diff --git a/source/blender/src/headerbuttons.c b/source/blender/src/headerbuttons.c
index 1a91ada1562..44044841a99 100644
--- a/source/blender/src/headerbuttons.c
+++ b/source/blender/src/headerbuttons.c
@@ -154,7 +154,6 @@
 #include "BSE_editipo.h"
 #include "BSE_drawipo.h"
 
-#include "BDR_drawmesh.h"
 #include "BDR_vpaint.h"
 #include "BDR_editface.h"
 #include "BDR_editobject.h"
@@ -165,6 +164,8 @@
 #include "BPY_extern.h"
 #include "BPY_menus.h"
 
+#include "GPU_draw.h"
+
 #include "mydevice.h"
 #include "blendef.h"
 #include "interface.h"
@@ -1425,11 +1426,11 @@ void do_global_buttons(unsigned short event)
 				show_splash();
 		break;
 	case B_MIPMAPCHANGED:
-		set_mipmap(!(U.gameflags & USER_DISABLE_MIPMAP));
+		GPU_set_mipmap(!(U.gameflags & USER_DISABLE_MIPMAP));
 		allqueue(REDRAWVIEW3D, 0);
 		break;
 	case B_GLRESLIMITCHANGED:
-		free_all_realtime_images(); /* force reloading with new res limit */
+		GPU_free_images(); /* force reloading with new res limit */
 		allqueue(REDRAWVIEW3D, 0);
 		break;
 	case B_NEWSPACE:
diff --git a/source/blender/src/imagepaint.c b/source/blender/src/imagepaint.c
index 15c289cc21c..164c368b6fa 100644
--- a/source/blender/src/imagepaint.c
+++ b/source/blender/src/imagepaint.c
@@ -44,6 +44,8 @@
 #include "BLI_winstuff.h"
 #endif
 #include "BLI_arithb.h"
+#include "BLI_blenlib.h"
+#include "BLI_dynstr.h"
 #include "PIL_time.h"
 
 #include "IMB_imbuf.h"
@@ -64,10 +66,12 @@
 #include "BKE_brush.h"
 #include "BKE_global.h"
 #include "BKE_image.h"
+#include "BKE_main.h"
 #include "BKE_mesh.h"
 #include "BKE_node.h"
 #include "BKE_utildefines.h"
 
+#include "BIF_interface.h"
 #include "BIF_mywindow.h"
 #include "BIF_screen.h"
 #include "BIF_space.h"
@@ -78,10 +82,11 @@
 #include "BSE_trans_types.h"
 #include "BSE_view.h"
 
-#include "BDR_drawmesh.h"
 #include "BDR_imagepaint.h"
 #include "BDR_vpaint.h"
 
+#include "GPU_draw.h"
+
 #include "GHOST_Types.h"
 
 #include "blendef.h"
@@ -103,6 +108,8 @@
 #define IMAPAINT_TILE_SIZE			(1 << IMAPAINT_TILE_BITS)
 #define IMAPAINT_TILE_NUMBER(size)	(((size)+IMAPAINT_TILE_SIZE-1) >> IMAPAINT_TILE_BITS)
 
+#define MAXUNDONAME	64
+
 typedef struct ImagePaintState {
 	Brush *brush;
 	short tool, blend;
@@ -120,48 +127,206 @@ typedef struct ImagePaintState {
 	float uv[2];
 } ImagePaintState;
 
-typedef struct ImagePaintUndo {
-	Image *image;
-	ImBuf *tilebuf;
-	void **tiles;
-	int xtiles, ytiles;
-} ImagePaintUndo;
+typedef struct UndoTile {
+	struct UndoTile *next, *prev;
+	ID id;
+	void *rect;
+	int x, y;
+} UndoTile;
+
+typedef struct UndoElem {
+	struct UndoElem *next, *prev;
+	char name[MAXUNDONAME];
+	unsigned long undosize;
+
+	ImBuf *ibuf;
+	ListBase tiles;
+} UndoElem;
 
 typedef struct ImagePaintPartialRedraw {
 	int x1, y1, x2, y2;
 	int enabled;
 } ImagePaintPartialRedraw;
 
-static ImagePaintUndo imapaintundo = {NULL, NULL, NULL, 0, 0};
+static ListBase undobase = {NULL, NULL};
+static UndoElem *curundo = NULL;
 static ImagePaintPartialRedraw imapaintpartial = {0, 0, 0, 0, 0};
 
-static void init_imagapaint_undo(Image *ima, ImBuf *ibuf)
+/* UNDO */
+
+/* internal functions */
+
+static void undo_copy_tile(UndoTile *tile, ImBuf *tmpibuf, ImBuf *ibuf, int restore)
 {
-	int xt, yt;
+	/* copy or swap contents of tile->rect and region in ibuf->rect */
+	IMB_rectcpy(tmpibuf, ibuf, 0, 0, tile->x*IMAPAINT_TILE_SIZE,
+		tile->y*IMAPAINT_TILE_SIZE, IMAPAINT_TILE_SIZE, IMAPAINT_TILE_SIZE);
 
-	imapaintundo.image = ima;
-	imapaintundo.xtiles = xt = IMAPAINT_TILE_NUMBER(ibuf->x);
-	imapaintundo.ytiles = yt = IMAPAINT_TILE_NUMBER(ibuf->y);
-	imapaintundo.tiles = MEM_callocN(sizeof(void*)*xt*yt, "ImagePaintUndoTiles");
-	imapaintundo.tilebuf = IMB_allocImBuf(IMAPAINT_TILE_SIZE, IMAPAINT_TILE_SIZE,
-						ibuf->depth, (ibuf->rect_float)? IB_rectfloat: IB_rect, 0);
-}
-
-static void imapaint_copy_tile(ImBuf *ibuf, int tile, int x, int y, int swapundo)
-{
-	IMB_rectcpy(imapaintundo.tilebuf, ibuf, 0, 0, x*IMAPAINT_TILE_SIZE,
-		y*IMAPAINT_TILE_SIZE, IMAPAINT_TILE_SIZE, IMAPAINT_TILE_SIZE);
-
-	if (imapaintundo.tilebuf->rect_float)
-		SWAP(void*, imapaintundo.tilebuf->rect_float, imapaintundo.tiles[tile])
-	else
-		SWAP(void*, imapaintundo.tilebuf->rect, imapaintundo.tiles[tile])
+	if(ibuf->rect_float) SWAP(void*, tmpibuf->rect_float, tile->rect)
+	else SWAP(void*, tmpibuf->rect, tile->rect)
 	
-	if (swapundo)
-		IMB_rectcpy(ibuf, imapaintundo.tilebuf, x*IMAPAINT_TILE_SIZE,
-			y*IMAPAINT_TILE_SIZE, 0, 0, IMAPAINT_TILE_SIZE, IMAPAINT_TILE_SIZE);
+	if(restore)
+		IMB_rectcpy(ibuf, tmpibuf, tile->x*IMAPAINT_TILE_SIZE,
+			tile->y*IMAPAINT_TILE_SIZE, 0, 0, IMAPAINT_TILE_SIZE, IMAPAINT_TILE_SIZE);
 }
 
+static void undo_restore(UndoElem *undo)
+{
+	Image *ima = NULL;
+	ImBuf *ibuf, *tmpibuf;
+	UndoTile *tile;
+
+	if(!undo)
+		return;
+
+	tmpibuf= IMB_allocImBuf(IMAPAINT_TILE_SIZE, IMAPAINT_TILE_SIZE, 32,
+	                        IB_rectfloat|IB_rect, 0);
+	
+	for(tile=undo->tiles.first; tile; tile=tile->next) {
+		/* find image based on name, pointer becomes invalid with global undo */
+		if(ima && strcmp(tile->id.name, ima->id.name)==0);
+		else {
+			for(ima=G.main->image.first; ima; ima=ima->id.next)
+				if(strcmp(tile->id.name, ima->id.name)==0)
+					break;
+		}
+
+		ibuf= BKE_image_get_ibuf(ima, NULL);
+
+		if (!ima || !ibuf || !(ibuf->rect || ibuf->rect_float))
+			continue;
+
+		undo_copy_tile(tile, tmpibuf, ibuf, 1);
+
+		GPU_free_image(ima); /* force OpenGL reload */
+		if(ibuf->rect_float)
+			imb_freerectImBuf(ibuf); /* force recreate of char rect */
+	}
+
+	IMB_freeImBuf(tmpibuf);
+}
+
+static void undo_free(UndoElem *undo)
+{
+	UndoTile *tile;
+
+	for(tile=undo->tiles.first; tile; tile=tile->next)
+		MEM_freeN(tile->rect);
+	BLI_freelistN(&undo->tiles);
+}
+
+static void undo_imagepaint_push_begin(char *name)
+{
+	UndoElem *uel;
+	int nr;
+	
+	/* Undo push is split up in begin and end, the reason is that as painting
+	 * happens more tiles are added to the list, and at the very end we know
+	 * how much memory the undo used to remove old undo elements */
+
+	/* remove all undos after (also when curundo==NULL) */
+	while(undobase.last != curundo) {
+		uel= undobase.last;
+		undo_free(uel);
+		BLI_freelinkN(&undobase, uel);
+	}
+	
+	/* make new */
+	curundo= uel= MEM_callocN(sizeof(UndoElem), "undo file");
+	BLI_addtail(&undobase, uel);
+
+	/* name can be a dynamic string */
+	strncpy(uel->name, name, MAXUNDONAME-1);
+	
+	/* limit amount to the maximum amount*/
+	nr= 0;
+	uel= undobase.last;
+	while(uel) {
+		nr++;
+		if(nr==U.undosteps) break;
+		uel= uel->prev;
+	}
+	if(uel) {
+		while(undobase.first!=uel) {
+			UndoElem *first= undobase.first;
+			undo_free(first);
+			BLI_freelinkN(&undobase, first);
+		}
+	}
+}
+
+static void undo_imagepaint_push_end()
+{
+	UndoElem *uel;
+	unsigned long totmem, maxmem;
+
+	if(U.undomemory != 0) {
+		/* limit to maximum memory (afterwards, we can't know in advance) */
+		totmem= 0;
+		maxmem= ((unsigned long)U.undomemory)*1024*1024;
+
+		uel= undobase.last;
+		while(uel) {
+			totmem+= uel->undosize;
+			if(totmem>maxmem) break;
+			uel= uel->prev;
+		}
+
+		if(uel) {
+			while(undobase.first!=uel) {
+				UndoElem *first= undobase.first;
+				undo_free(first);
+				BLI_freelinkN(&undobase, first);
+			}
+		}
+	}
+}
+
+/* external functions */
+
+/* 1= an undo, -1 is a redo. */
+void undo_imagepaint_step(int step)
+{
+	UndoElem *undo;
+
+	if(step==1) {
+		if(curundo==NULL) error("No more steps to undo");
+		else {
+			if(G.f & G_DEBUG) printf("undo %s\n", curundo->name);
+			undo_restore(curundo);
+			curundo= curundo->prev;
+		}
+	}
+	else if(step==-1) {
+		if((curundo!=NULL && curundo->next==NULL) || undobase.first==NULL) error("No more steps to redo");
+		else {
+			undo= (curundo && curundo->next)? curundo->next: undobase.first;
+			undo_restore(undo);
+			curundo= undo;
+			if(G.f & G_DEBUG) printf("redo %s\n", undo->name);
+		}
+	}
+
+	allqueue(REDRAWVIEW3D, 0);
+	allqueue(REDRAWIMAGE, 0);
+}
+
+void undo_imagepaint_clear(void)
+{
+	UndoElem *uel;
+	
+	uel= undobase.first;
+	while(uel) {
+		undo_free(uel);
+		uel= uel->next;
+	}
+
+	BLI_freelistN(&undobase);
+	curundo= NULL;
+}
+
+/* Imagepaint Partial Redraw & Dirty Region */
+
 static void imapaint_clear_partial_redraw()
 {
 	memset(&imapaintpartial, 0, sizeof(imapaintpartial));
@@ -169,7 +334,9 @@ static void imapaint_clear_partial_redraw()
 
 static void imapaint_dirty_region(Image *ima, ImBuf *ibuf, int x, int y, int w, int h)
 {
-	int srcx= 0, srcy= 0, origx, tile, allocsize;
+	ImBuf *tmpibuf;
+	UndoTile *tile;
+	int srcx= 0, srcy= 0, origx, allocsize;
 
 	IMB_rectclip(ibuf, NULL, &x, &y, &srcx, &srcy, &w, &h);
 
@@ -195,24 +362,36 @@ static void imapaint_dirty_region(Image *ima, ImBuf *ibuf, int x, int y, int w,
 	origx = (x >> IMAPAINT_TILE_BITS);
 	y = (y >> IMAPAINT_TILE_BITS);
 
+	tmpibuf= IMB_allocImBuf(IMAPAINT_TILE_SIZE, IMAPAINT_TILE_SIZE, 32,
+	                        IB_rectfloat|IB_rect, 0);
+	
 	for (; y <= h; y++) {
 		for (x=origx; x <= w; x++) {
-			if (ima != imapaintundo.image) {
-				free_imagepaint();
-				init_imagapaint_undo(ima, ibuf);
-			}
+			for(tile=curundo->tiles.first; tile; tile=tile->next)
+				if(tile->x == x && tile->y == y && strcmp(tile->id.name, ima->id.name)==0)
+					break;
 
-			tile = y*imapaintundo.xtiles + x;
-			if (!imapaintundo.tiles[tile]) {
-				allocsize= (ibuf->rect_float)? sizeof(float): sizeof(char);
-				imapaintundo.tiles[tile]= MEM_mapallocN(allocsize*4*
-					IMAPAINT_TILE_SIZE*IMAPAINT_TILE_SIZE, "ImagePaintUndoTile");
-				imapaint_copy_tile(ibuf, tile, x, y, 0);
+			if(!tile) {
+				tile= MEM_callocN(sizeof(UndoTile), "ImaUndoTile");
+				tile->id= ima->id;
+				tile->x= x;
+				tile->y= y;
+
+				allocsize= IMAPAINT_TILE_SIZE*IMAPAINT_TILE_SIZE*4;
+				allocsize *= (ibuf->rect_float)? sizeof(float): sizeof(char);
+				tile->rect= MEM_mapallocN(allocsize, "ImaUndoRect");
+
+				undo_copy_tile(tile, tmpibuf, ibuf, 0);
+				curundo->undosize += allocsize;
+
+				BLI_addtail(&curundo->tiles, tile);
 			}
 		}
 	}
 
 	ibuf->userflags |= IB_BITMAPDIRTY;
+
+	IMB_freeImBuf(tmpibuf);
 }
 
 static void imapaint_image_update(Image *image, ImBuf *ibuf, short texpaint)
@@ -226,7 +405,7 @@ static void imapaint_image_update(Image *image, ImBuf *ibuf, short texpaint)
 	if(texpaint || G.sima->lock) {
 		int w = imapaintpartial.x2 - imapaintpartial.x1;
 		int h = imapaintpartial.y2 - imapaintpartial.y1;
-		update_realtime_image(image, imapaintpartial.x1, imapaintpartial.y1, w, h);
+		GPU_paint_update_image(image, imapaintpartial.x1, imapaintpartial.y1, w, h);
 	}
 }
 
@@ -239,7 +418,7 @@ static void imapaint_redraw(int final, int texpaint, Image *image)
 			allqueue(REDRAWIMAGE, 0);
 		else if(!G.sima->lock) {
 			if(image)
-				free_realtime_image(image); /* force OpenGL reload */
+				GPU_free_image(image); /* force OpenGL reload */
 			allqueue(REDRAWVIEW3D, 0);
 		}
 		allqueue(REDRAWHEADERS, 0);
@@ -269,46 +448,6 @@ static void imapaint_redraw(int final, int texpaint, Image *image)
 		force_draw(0);
 }
 
-void imagepaint_undo()
-{
-	Image *ima= imapaintundo.image;
-	ImBuf *ibuf= BKE_image_get_ibuf(ima, G.sima?&G.sima->iuser:NULL);
-	int x, y, tile;
-
-	if (!ima || !ibuf || !(ibuf->rect || ibuf->rect_float))
-		return;
-
-	for (tile = 0, y = 0; y < imapaintundo.ytiles; y++)
-		for (x = 0; x < imapaintundo.xtiles; x++, tile++)
-			if (imapaintundo.tiles[tile])
-				imapaint_copy_tile(ibuf, tile, x, y, 1);
-
-	free_realtime_image(ima); /* force OpenGL reload */
-	if(ibuf->rect_float)
-		imb_freerectImBuf(ibuf); /* force recreate of char rect */
-
-	allqueue(REDRAWIMAGE, 0);
-	allqueue(REDRAWVIEW3D, 0);
-}
-
-void free_imagepaint()
-{
-	/* todo: does this need to be in the same places as editmode_undo_clear,
-	   vertex paint isn't? */
-	int i, size = imapaintundo.xtiles*imapaintundo.ytiles;
-
-	if (imapaintundo.tiles) {
-		for (i = 0; i < size; i++)
-			if (imapaintundo.tiles[i])
-				MEM_freeN(imapaintundo.tiles[i]);
-		MEM_freeN(imapaintundo.tiles);
-	}
-	if (imapaintundo.tilebuf)
-		IMB_freeImBuf(imapaintundo.tilebuf);
-
-	memset(&imapaintundo, 0, sizeof(imapaintundo));
-}
-
 /* Image Paint Operations */
 
 static void imapaint_ibuf_get_set_rgb(ImBuf *ibuf, int x, int y, short torus, short set, float *rgb)
@@ -580,7 +719,6 @@ static void imapaint_paint_stroke(ImagePaintState *s, BrushPainter *painter, sho
 	int breakstroke = 0, redraw = 0;
 
 	if (texpaint) {
-
 		/* pick new face and image */
 		if (facesel_face_pick(s->me, mval, &newfaceindex, 0)) {
 			ImBuf *ibuf;
@@ -692,7 +830,7 @@ void imagepaint_paint(short mousebutton, short texpaint)
 	}
 
 	settings->imapaint.flag |= IMAGEPAINT_DRAWING;
-	free_imagepaint();
+	undo_imagepaint_push_begin("Image Paint");
 
 	/* create painter and paint once */
 	painter= brush_painter_new(s.brush);
@@ -741,6 +879,7 @@ void imagepaint_paint(short mousebutton, short texpaint)
 	brush_painter_free(painter);
 
 	imapaint_redraw(1, texpaint, s.image);
+	undo_imagepaint_push_end();
 	
 	if (texpaint) {
 		if (s.warnmultifile)
diff --git a/source/blender/src/meshtools.c b/source/blender/src/meshtools.c
index 99833625baa..eed7737c26d 100644
--- a/source/blender/src/meshtools.c
+++ b/source/blender/src/meshtools.c
@@ -84,7 +84,6 @@ void sort_faces(void);
 #include "BIF_toolbox.h"
 #include "BIF_editconstraint.h"
 
-#include "BDR_drawmesh.h" 
 #include "BDR_editobject.h" 
 #include "BDR_editface.h" 
 #include "BDR_sculptmode.h"
@@ -107,6 +106,8 @@ void sort_faces(void);
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
 
+#include "GPU_draw.h"
+
 #include "BLO_sys_types.h" // for intptr_t support
 
 /* from rendercode.c */
@@ -1130,7 +1131,7 @@ void objects_bake_render(short event, char **error_msg)
 				if(ima->ok==IMA_OK_LOADED) {
 					ImBuf *ibuf= BKE_image_get_ibuf(ima, NULL);
 					if(ibuf && (ibuf->userflags & IB_BITMAPDIRTY)) {
-						free_realtime_image(ima); 
+						GPU_free_image(ima); 
 						imb_freemipmapImBuf(ibuf);
 					}
 				}
diff --git a/source/blender/src/playanim.c b/source/blender/src/playanim.c
index 7a61368b4cd..8421101f66c 100644
--- a/source/blender/src/playanim.c
+++ b/source/blender/src/playanim.c
@@ -45,15 +45,6 @@
 #endif   
 #include "MEM_guardedalloc.h"
 
-#ifdef WITH_QUICKTIME
-#ifdef _WIN32
-#include <QTML.h>
-#include <Movies.h>
-#elif defined(__APPLE__)
-#include <QuickTime/Movies.h>
-#endif /* __APPLE__ */
-#endif /* WITH_QUICKTIME */
-
 #include "PIL_time.h"
 
 #include <math.h>
@@ -77,6 +68,15 @@
 
 #include "BMF_Api.h"
 
+#ifdef WITH_QUICKTIME
+#ifdef _WIN32
+#include <QTML.h>
+#include <Movies.h>
+#elif defined(__APPLE__)
+#include <QuickTime/Movies.h>
+#endif /* __APPLE__ */
+#endif /* WITH_QUICKTIME */
+
 #include "playanim_ext.h"
 #include "mydevice.h"
 #include "blendef.h"
@@ -346,6 +346,7 @@ void playanim(int argc, char **argv)
  	int start_x= 0, start_y= 0;
 	int sfra= -1;
 	int efra= -1;
+	int totblock;
 	
 	while (argc > 1) {
 		if (argv[1][0] == '-'){
@@ -823,6 +824,7 @@ void playanim(int argc, char **argv)
 	free_blender();
 	window_destroy(g_window);
 
+	totblock= MEM_get_memory_blocks_in_use();
 	if(totblock!=0) {
 		printf("Error Totblock: %d\n",totblock);
 		MEM_printmemlist();
diff --git a/source/blender/src/previewrender.c b/source/blender/src/previewrender.c
index 0be63197dd1..1730bb890bc 100644
--- a/source/blender/src/previewrender.c
+++ b/source/blender/src/previewrender.c
@@ -97,6 +97,8 @@
 #include "RE_pipeline.h"
 #include "BLO_readfile.h" 
 
+#include "GPU_material.h"
+
 #include "blendef.h"	/* CLAMP */
 #include "interface.h"	/* ui_graphics_to_window(),  SOLVE! (ton) */
 #include "mydevice.h"
@@ -221,6 +223,36 @@ void BIF_preview_changed(short id_code)
 			}
 		}
 	}
+
+	if(ELEM4(id_code, ID_MA, ID_TE, ID_LA, ID_WO)) {
+		Object *ob;
+		Material *ma;
+
+		if(id_code == ID_WO) {
+			for(ma=G.main->mat.first; ma; ma=ma->id.next) {
+				if(ma->gpumaterial.first) {
+					GPU_material_free(ma);
+					allqueue(REDRAWVIEW3D, 0);
+				}
+			}
+		}
+		else if(id_code == ID_LA) {
+			for(ob=G.main->object.first; ob; ob=ob->id.next) {
+				if(ob->gpulamp.first) {
+					GPU_lamp_free(ob);
+					allqueue(REDRAWVIEW3D, 0);
+				}
+			}
+		} else if(OBACT) {
+			Object *ob = OBACT;
+
+			ma= give_current_material(ob, ob->actcol);
+			if(ma && ma->gpumaterial.first) {
+				GPU_material_free(ma);
+				allqueue(REDRAWVIEW3D, 0);
+			}
+		}
+	}
 }
 
 /* *************************** Preview for buttons *********************** */
diff --git a/source/blender/src/renderwin.c b/source/blender/src/renderwin.c
index 88f5f6efe15..33484500328 100644
--- a/source/blender/src/renderwin.c
+++ b/source/blender/src/renderwin.c
@@ -50,8 +50,6 @@
 
 #endif
 
-#include "BLO_sys_types.h" // for intptr_t support
-
 #include <limits.h>
 
 #include "BLI_blenlib.h"
@@ -102,6 +100,8 @@
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 
+#include "GPU_draw.h"
+
 #include "blendef.h"
 #include "mydevice.h"
 #include "winlay.h"
@@ -676,7 +676,7 @@ static void open_renderwin(int winpos[2], int winsize[2], int imagesize[2])
 	/* mywindow has to know about it too */
 	mywindow_build_and_set_renderwin(winpos[0], winpos[1], winsize[0], winsize[1]+RW_HEADERY);
 	/* and we should be able to draw 3d in it */
-	init_gl_stuff();
+	GPU_state_init();
 	
 	renderwin_draw(render_win, 1);
 	renderwin_draw(render_win, 1);
@@ -903,10 +903,13 @@ static void renderwin_progress_display_cb(RenderResult *rr, volatile rcti *rect)
 void make_renderinfo_string(RenderStats *rs, char *str)
 {
 	extern char info_time_str[32];	// header_info.c
-	extern uintptr_t mem_in_use, mmap_in_use;
+	uintptr_t mem_in_use, mmap_in_use;
 	float megs_used_memory, mmap_used_memory;
 	char *spos= str;
 	
+	mem_in_use= MEM_get_memory_in_use();
+	mmap_in_use= MEM_get_mapped_memory_in_use();
+
 	megs_used_memory= (mem_in_use-mmap_in_use)/(1024.0*1024.0);
 	mmap_used_memory= (mmap_in_use)/(1024.0*1024.0);
 	
@@ -1304,10 +1307,10 @@ void do_ogl_view3d_render(Render *re, View3D *v3d, int winx, int winy)
 	if(v3d->persp==V3D_CAMOB && v3d->camera) {
 		/* in camera view, use actual render winmat */
 		RE_GetCameraWindow(re, v3d->camera, CFRA, winmat);
-		drawview3d_render(v3d, winx, winy, winmat);
+		drawview3d_render(v3d, NULL, winx, winy, winmat, 0);
 	}
 	else
-		drawview3d_render(v3d, winx, winy, NULL);
+		drawview3d_render(v3d, NULL, winx, winy, NULL, 0);
 }
 
 /* set up display, render the current area view in an image */
@@ -1336,7 +1339,7 @@ void BIF_do_ogl_render(View3D *v3d, int anim)
 	if(render_win)
 		render_win->flags &= ~RW_FLAGS_ESCAPE;
 
-	init_gl_stuff();
+	GPU_state_init();
 	
 	waitcursor(1);
 
diff --git a/source/blender/src/sculptmode.c b/source/blender/src/sculptmode.c
index 24f4100efdb..31d5ae4610d 100644
--- a/source/blender/src/sculptmode.c
+++ b/source/blender/src/sculptmode.c
@@ -82,7 +82,6 @@
 #include "BIF_space.h"
 #include "BIF_toolbox.h"
 
-#include "BDR_drawobject.h"
 #include "BDR_sculptmode.h"
 
 #include "BSE_drawview.h"
@@ -98,6 +97,8 @@
 #include "RE_render_ext.h"
 #include "RE_shader_ext.h" /*for multitex_ext*/
 
+#include "GPU_draw.h"
+
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
@@ -1514,7 +1515,7 @@ void sculptmode_draw_mesh(int only_damaged)
 	mymultmatrix(OBACT->obmat);
 	glEnable(GL_DEPTH_TEST);
 	glEnable(GL_LIGHTING);
-	init_gl_materials(OBACT, 0);
+	GPU_set_object_materials(G.scene, OBACT, 0, NULL);
 	glEnable(GL_CULL_FACE);
 
 	glShadeModel(GL_SMOOTH);
@@ -1532,7 +1533,7 @@ void sculptmode_draw_mesh(int only_damaged)
 		int new_matnr= f->mat_nr + 1;
 		
 		if(new_matnr != matnr)
-			drawCurrentMat= set_gl_material(matnr = new_matnr);
+			drawCurrentMat= GPU_enable_material(matnr = new_matnr, NULL);
 		
 		/* If only_damaged!=0, only draw faces that are partially
 		   inside the area(s) modified by the brush */
diff --git a/source/blender/src/sequence.c b/source/blender/src/sequence.c
index 7e2ffc3ba63..bf24c02e723 100644
--- a/source/blender/src/sequence.c
+++ b/source/blender/src/sequence.c
@@ -2949,12 +2949,16 @@ void do_render_seq(RenderResult *rr, int cfra)
 		   (schlaile)
 		*/
 		{
-			extern int mem_in_use;
-			extern int mmap_in_use;
+			uintptr_t mem_in_use;
+			uintptr_t mmap_in_use;
+			uintptr_t max;
+
+			mem_in_use= MEM_get_memory_in_use();
+			mmap_in_use= MEM_get_mapped_memory_in_use();
+			max = MEM_CacheLimiter_get_maximum();
 
-			int max = MEM_CacheLimiter_get_maximum();
 			if (max != 0 && mem_in_use + mmap_in_use > max) {
-				fprintf(stderr, "mem_in_use = %d, max = %d\n",
+				fprintf(stderr, "mem_in_use = %lu, max = %lu\n",
 					mem_in_use + mmap_in_use, max);
 				fprintf(stderr, "Cleaning up, please wait...\n"
 					"If this happens very often,\n"
diff --git a/source/blender/src/space.c b/source/blender/src/space.c
index 81b0efeef0d..88a0bf0f9b1 100644
--- a/source/blender/src/space.c
+++ b/source/blender/src/space.c
@@ -182,6 +182,9 @@
 
 #include "SYS_System.h" /* for the user def menu ... should move elsewhere. */
 
+#include "GPU_extensions.h"
+#include "GPU_draw.h"
+
 #include "BLO_sys_types.h" // for intptr_t support
 
 /* maybe we need this defined somewhere else */
@@ -386,7 +389,7 @@ void space_set_commmandline_options(void) {
 		SYS_WriteCommandLineInt(syshandle, "noaudio", a);
 
 		a= (U.gameflags & USER_DISABLE_MIPMAP);
-		set_mipmap(!a);
+		GPU_set_mipmap(!a);
 		SYS_WriteCommandLineInt(syshandle, "nomipmap", a);
 
 		/* File specific settings: */
@@ -415,7 +418,9 @@ void space_set_commmandline_options(void) {
 
 		a=(G.fileflags & G_FILE_GAME_MAT);
 		SYS_WriteCommandLineInt(syshandle, "blender_material", a);
-		a=(G.fileflags & G_FILE_DIAPLAY_LISTS);
+		a=(G.fileflags & G_FILE_GAME_MAT_GLSL);
+		SYS_WriteCommandLineInt(syshandle, "blender_glsl_material", a);
+		a=(G.fileflags & G_FILE_DISPLAY_LISTS);
 		SYS_WriteCommandLineInt(syshandle, "displaylists", a);
 
 
@@ -432,11 +437,10 @@ static void SaveState(void)
 {
 	glPushAttrib(GL_ALL_ATTRIB_BITS);
 
-	init_realtime_GL();
-	init_gl_stuff();
+	GPU_state_init();
 
 	if(G.f & G_TEXTUREPAINT)
-		texpaint_enable_mipmap();
+		GPU_paint_set_mipmap(1);
 
 	waitcursor(1);
 }
@@ -444,7 +448,7 @@ static void SaveState(void)
 static void RestoreState(void)
 {
 	if(G.f & G_TEXTUREPAINT)
-		texpaint_disable_mipmap();
+		GPU_paint_set_mipmap(0);
 
 	curarea->win_swap = 0;
 	curarea->head_swap=0;
@@ -1024,9 +1028,9 @@ void BIF_undo(void)
 	}
 	else {
 		if(G.f & G_TEXTUREPAINT)
-			imagepaint_undo();
+			undo_imagepaint_step(1);
 		else if(curarea->spacetype==SPACE_IMAGE && (G.sima->flag & SI_DRAWTOOL))
-			imagepaint_undo();
+			undo_imagepaint_step(1);
 		else if(G.f & G_PARTICLEEDIT)
 			PE_undo();
 		else {
@@ -1048,9 +1052,9 @@ void BIF_redo(void)
 	}
 	else {
 		if(G.f & G_TEXTUREPAINT)
-			imagepaint_undo();
+			undo_imagepaint_step(-1);
 		else if(curarea->spacetype==SPACE_IMAGE && (G.sima->flag & SI_DRAWTOOL))
-			imagepaint_undo();
+			undo_imagepaint_step(-1);
 		else if(G.f & G_PARTICLEEDIT)
 			PE_redo();
 		else {
@@ -2643,10 +2647,9 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 					else if(G.f & G_VERTEXPAINT)
 						BIF_undo();
 					else if(G.f & G_TEXTUREPAINT)
-						imagepaint_undo();
-					else {
+						undo_imagepaint_step(1);
+					else
 						single_user();
-					}
 				}
 				
 				break;
@@ -3259,7 +3262,7 @@ void initipo(ScrArea *sa)
 /* ******************** SPACE: INFO ********************** */
 
 void space_mipmap_button_function(int event) {
-	set_mipmap(!(U.gameflags & USER_DISABLE_MIPMAP));
+	GPU_set_mipmap(!(U.gameflags & USER_DISABLE_MIPMAP));
 
 	allqueue(REDRAWVIEW3D, 0);
 }
@@ -3949,20 +3952,23 @@ void drawinfospace(ScrArea *sa, void *spacedata)
 
 
 		uiDefBut(block, LABEL,0,"Transform:",
-			(xpos+(2*edgsp)+mpref),y5label, mpref,buth,
+			(xpos+(2*edgsp)+mpref),y6label, mpref,buth,
 			0, 0, 0, 0, 0, "");
 		uiDefButBitI(block, TOG, USER_DRAGIMMEDIATE, B_DRAWINFO, "Drag Immediately",
-			(xpos+edgsp+mpref+midsp),y4,mpref,buth,
+			(xpos+edgsp+mpref+midsp),y5,mpref,buth,
 			&(U.flag), 0, 0, 0, 0, "Moving things with a mouse drag doesn't require a click to confirm (Best for tablet users)");
 		uiBlockEndAlign(block);
 
 		uiDefBut(block, LABEL,0,"Undo:",
-			(xpos+(2*edgsp)+mpref),y3label, mpref,buth,
+			(xpos+(2*edgsp)+mpref),y4label, mpref,buth,
 			0, 0, 0, 0, 0, "");
 		uiBlockBeginAlign(block);
 		uiDefButS(block, NUMSLI, B_DRAWINFO, "Steps: ",
-			(xpos+edgsp+mpref+midsp),y2,mpref,buth,
+			(xpos+edgsp+mpref+midsp),y3,mpref,buth,
 			&(U.undosteps), 0, 64, 0, 0, "Number of undo steps available (smaller values conserve memory)");
+		uiDefButS(block, NUM, B_DRAWINFO, "Memory Limit: ",
+			(xpos+edgsp+mpref+midsp),y2,mpref,buth,
+			&(U.undomemory), 0, 32767, -1, 0, "Maximum memory usage in megabytes (0 means unlimited)");
 
 		uiDefButBitI(block, TOG, USER_GLOBALUNDO, B_DRAWINFO, "Global Undo",
 			(xpos+edgsp+mpref+midsp),y1,mpref,buth,
@@ -4297,6 +4303,7 @@ void drawinfospace(ScrArea *sa, void *spacedata)
 		uiDefButI(block, NUM, 0, "Collect Rate ",
 			(xpos+edgsp+(5*mpref)+(5*midsp)), y2, mpref, buth, 
 			&U.texcollectrate, 1.0, 3600.0, 30, 2, "Number of seconds between each run of the GL texture garbage collector.");
+		uiBlockEndAlign(block);
 
 		/* *** */
 		uiDefBut(block, LABEL,0,"Color range for weight paint",
@@ -4533,7 +4540,7 @@ static void winqreadinfospace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 				if(U.light[0].flag==0 && U.light[1].flag==0 && U.light[2].flag==0)
 					U.light[0].flag= 1;
 				
-				default_gl_light();
+				GPU_default_lights();
 				addqueue(sa->win, REDRAW, 1);
 				allqueue(REDRAWVIEW3D, 0);
 			} 
@@ -5173,8 +5180,8 @@ static void init_seqspace(ScrArea *sa)
 	sseq->v2d.max[0]= MAXFRAMEF;
 	sseq->v2d.max[1]= MAXSEQ;
 	
-	sseq->v2d.minzoom= 0.1f;
-	sseq->v2d.maxzoom= 10.0;
+	sseq->v2d.minzoom= 0.01f;
+	sseq->v2d.maxzoom= 100.0;
 	
 	sseq->v2d.scroll= L_SCROLL+B_SCROLL;
 	sseq->v2d.keepaspect= 0;
@@ -5989,7 +5996,7 @@ static void init_oopsspace(ScrArea *sa)
 	soops= MEM_callocN(sizeof(SpaceOops), "initoopsspace");
 	BLI_addhead(&sa->spacedata, soops);
 
-	soops->visiflag= OOPS_OB+OOPS_MA+OOPS_ME+OOPS_TE+OOPS_CU+OOPS_IP;
+	soops->visiflag= OOPS_OB|OOPS_MA|OOPS_ME|OOPS_TE|OOPS_CU|OOPS_IP;
 	/* new oops is default an outliner */
 	soops->type= SO_OUTLINER;
 		
diff --git a/source/blender/src/toets.c b/source/blender/src/toets.c
index 5f80f14d069..efd97ed9786 100644
--- a/source/blender/src/toets.c
+++ b/source/blender/src/toets.c
@@ -104,6 +104,8 @@
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 
+#include "GPU_draw.h"
+
 #include "mydevice.h"
 
 #include "transform.h"
@@ -964,7 +966,7 @@ int blenderqread(unsigned short event, short val)
 					/* Reset lights
 					 * This isn't done when reading userdef, do it now
 					 *  */
-					default_gl_light(); 
+					GPU_default_lights();
 				}
 				return 0;
 			}
diff --git a/source/blender/src/usiblender.c b/source/blender/src/usiblender.c
index e757f634a45..21bec1ec978 100644
--- a/source/blender/src/usiblender.c
+++ b/source/blender/src/usiblender.c
@@ -34,8 +34,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "GL/glew.h"
-
 #ifdef WIN32
 #include <windows.h> /* need to include windows.h so _WIN32_IE is defined  */
 #ifndef _WIN32_IE
@@ -149,6 +147,9 @@
 
 #include "PIL_time.h"
 
+#include "GPU_extensions.h"
+#include "GPU_draw.h"
+
 /***/
 
 /* define for setting colors in theme below */
@@ -577,8 +578,9 @@ void BIF_read_file(char *name)
 		if (retval!=0) G.relbase_valid = 1;
 
 		undo_editmode_clear();
+		undo_imagepaint_clear();
 		BKE_reset_undo();
-		BKE_write_undo("original");	/* save current state */
+		BKE_write_undo("Original");	/* save current state */
 
 		refresh_interface_font();
 	}
@@ -650,8 +652,9 @@ int BIF_read_homefile(int from_memory)
 	init_userdef_file();
 
 	undo_editmode_clear();
+	undo_imagepaint_clear();
 	BKE_reset_undo();
-	BKE_write_undo("original");	/* save current state */
+	BKE_write_undo("Original");	/* save current state */
 	
 	/* if from memory, need to refresh python scripts */
 	if (from_memory) {
@@ -1049,8 +1052,9 @@ void BIF_init(void)
 	
 	BIF_filelist_init_icons();
 
-	init_gl_stuff();	/* drawview.c, after homefile */
-	glewInit();
+	GPU_state_init();
+	GPU_extensions_init();
+
 	readBlog();
 	BLI_strncpy(G.lib, G.sce, FILE_MAX);
 }
@@ -1063,6 +1067,7 @@ extern ListBase editelems;
 void exit_usiblender(void)
 {
 	struct TmpFont *tf;
+	int totblock;
 	
 	BIF_clear_tempfiles();
 	
@@ -1108,7 +1113,6 @@ void exit_usiblender(void)
 	free_ipocopybuf();
 	free_actcopybuf();
 	free_vertexpaint();
-	free_imagepaint();
 	free_texttools();
 	
 	/* editnurb can remain to exist outside editmode */
@@ -1127,6 +1131,7 @@ void exit_usiblender(void)
 	sound_exit_audio();
 	if(G.listener) MEM_freeN(G.listener);
 
+	GPU_extensions_exit();
 
 	libtiff_exit();
 
@@ -1136,6 +1141,7 @@ void exit_usiblender(void)
 
 	/* undo free stuff */
 	undo_editmode_clear();
+	undo_imagepaint_clear();
 	
 	BKE_undo_save_quit();	// saves quit.blend if global undo is on
 	BKE_reset_undo(); 
@@ -1161,6 +1167,7 @@ void exit_usiblender(void)
 	BLI_freelistN(&U.themes);
 	BIF_preview_free_dbase();
 	
+	totblock= MEM_get_memory_blocks_in_use();
 	if(totblock!=0) {
 		printf("Error Totblock: %d\n",totblock);
 		MEM_printmemlist();
diff --git a/source/blender/src/verse_image.c b/source/blender/src/verse_image.c
index fe9e6137091..4a78126e3f8 100644
--- a/source/blender/src/verse_image.c
+++ b/source/blender/src/verse_image.c
@@ -327,7 +327,7 @@ void post_bitmap_tile_set(VBitmapLayer *vblayer, unsigned int xs, unsigned int y
 				rect[channel] = (char)vuint8[i];
 	}
 
-	free_realtime_image(image);
+	GPU_free_image(image);
 
 	/* redraw preview of image ... uncommented, because rendering
 	 * was computed too often */
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index d17b94c631d..04219ac5868 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -37,8 +37,10 @@ INCLUDE_DIRECTORIES(../../intern/guardedalloc
   ../blender/render/extern/include
   ../blender/python
   ../blender/makesdna
+  ../blender/gpu
   ../kernel/gen_messaging
   ../kernel/gen_system
+  ../../extern/glew/include
 )
 
 
@@ -210,6 +212,7 @@ IF(UNIX)
     blender_python 
     bf_blenkernel 
     bf_nodes
+	bf_gpu
     bf_blenloader 
     bf_blenpluginapi 
     bf_imbuf 
diff --git a/source/creator/Makefile b/source/creator/Makefile
index 8a0d20264ea..158aee1a647 100644
--- a/source/creator/Makefile
+++ b/source/creator/Makefile
@@ -49,9 +49,11 @@ CPPFLAGS += -I../blender/renderconverter
 CPPFLAGS += -I../blender/blenkernel
 CPPFLAGS += -I../blender/python
 CPPFLAGS += -I../blender/blenloader
+CPPFLAGS += -I../blender/gpu
 CPPFLAGS += -I../kernel/gen_system
 CPPFLAGS += -I../kernel/gen_messaging
 CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
+CPPFLAGS += -I$(NAN_GLEW)/include
 
 ifeq ($(WITH_QUICKTIME), true)
 	CPPFLAGS += -I$(NAN_QUICKTIME)/include -DWITH_QUICKTIME
diff --git a/source/creator/SConscript b/source/creator/SConscript
index cac9e895a97..a4c218f89d6 100644
--- a/source/creator/SConscript
+++ b/source/creator/SConscript
@@ -7,7 +7,7 @@ incs = '#/intern/guardedalloc ../blender/blenlib ../blender/blenkernel'
 incs += ' ../blender/include ../blender/blenloader ../blender/imbuf'
 incs += ' ../blender/renderconverter ../blender/render/extern/include'
 incs += ' ../blender/python ../blender/makesdna ../kernel/gen_messaging'
-incs += ' ../kernel/gen_system'
+incs += ' ../kernel/gen_system #/extern/glew/include ../blender/gpu'
 incs += ' ' + env['BF_OPENGL_INC']
 
 defs = []
diff --git a/source/creator/creator.c b/source/creator/creator.c
index e17b0f66977..ec87cdd8cf7 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -70,14 +70,14 @@
 #include "BLO_writefile.h"
 #include "BLO_readfile.h"
 
-#include "BDR_drawmesh.h"
-
 #include "IMB_imbuf.h"	// for quicktime_init
 
 #include "BPY_extern.h"
 
 #include "RE_pipeline.h"
 
+#include "GPU_draw.h"
+
 #include "playanim_ext.h"
 #include "mydevice.h"
 #include "nla.h"
@@ -600,12 +600,12 @@ int main(int argc, char **argv)
 							/* doMipMap */
 							if (!strcmp(argv[a],"nomipmap"))
 							{
-								set_mipmap(0); //doMipMap = 0;
+								GPU_set_mipmap(0); //doMipMap = 0;
 							}
 							/* linearMipMap */
 							if (!strcmp(argv[a],"linearmipmap"))
 							{
-								set_linear_mipmap(1); //linearMipMap = 1;
+								GPU_set_linear_mipmap(1); //linearMipMap = 1;
 							}
 
 
diff --git a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
index 16f8ae0095a..1f66335c749 100644
--- a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
+++ b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
@@ -79,6 +79,8 @@
 #include "DNA_scene_types.h"
 	/***/
 
+#include "GPU_extensions.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -138,6 +140,9 @@ extern "C" void StartKetsjiShell(struct ScrArea *area,
 		if(GLEW_ARB_multitexture && GLEW_VERSION_1_1)
 			usemat = (SYS_GetCommandLineInt(syshandle, "blender_material", 0) != 0);
 
+		if(GPU_extensions_minimum_support())
+			useglslmat = (SYS_GetCommandLineInt(syshandle, "blender_glsl_material", 0) != 0);
+
 		// create the canvas, rasterizer and rendertools
 		RAS_ICanvas* canvas = new KX_BlenderCanvas(area);
 		canvas->SetMouseState(RAS_ICanvas::MOUSE_INVISIBLE);
@@ -304,13 +309,14 @@ extern "C" void StartKetsjiShell(struct ScrArea *area,
 				mousedevice,
 				networkdevice,
 				audiodevice,
-				startscenename);
+				startscenename,
+				blscene);
 			
 			// some python things
 			PyObject* dictionaryobject = initGamePythonScripting("Ketsji", psl_Lowest);
 			ketsjiengine->SetPythonDictionary(dictionaryobject);
 			initRasterizer(rasterizer, canvas);
-			PyObject *gameLogic = initGameLogic(startscene);
+			PyObject *gameLogic = initGameLogic(ketsjiengine, startscene);
 			PyDict_SetItemString(dictionaryobject, "GameLogic", gameLogic); // Same as importing the module.
 			PyDict_SetItemString(PyModule_GetDict(gameLogic), "globalDict", pyGlobalDict); // Same as importing the module.
 			initGameKeys();
@@ -526,8 +532,6 @@ extern "C" void StartKetsjiShellSimulation(struct ScrArea *area,
 		// create the ketsjiengine
 		KX_KetsjiEngine* ketsjiengine = new KX_KetsjiEngine(kxsystem);
 
-		int i;
-
 		Scene *blscene = NULL;
 		if (!bfd)
 		{
@@ -543,7 +547,7 @@ extern "C" void StartKetsjiShellSimulation(struct ScrArea *area,
 		} else {
 			blscene = bfd->curscene;
 		}
-        int cframe,startFrame;
+        int cframe = 1, startFrame;
 		if (blscene)
 		{
 			cframe=blscene->r.cfra;
@@ -574,12 +578,14 @@ extern "C" void StartKetsjiShellSimulation(struct ScrArea *area,
 				mousedevice,
 				networkdevice,
 				audiodevice,
-				startscenename);
+				startscenename,
+				blscene);
+
 			// some python things
 			PyObject* dictionaryobject = initGamePythonScripting("Ketsji", psl_Lowest);
 			ketsjiengine->SetPythonDictionary(dictionaryobject);
 			initRasterizer(rasterizer, canvas);
-			PyObject *gameLogic = initGameLogic(startscene);
+			PyObject *gameLogic = initGameLogic(ketsjiengine, startscene);
 			PyDict_SetItemString(dictionaryobject, "GameLogic", gameLogic); // Same as importing the module
 			initGameKeys();
 			initPythonConstraintBinding();
diff --git a/source/gameengine/BlenderRoutines/CMakeLists.txt b/source/gameengine/BlenderRoutines/CMakeLists.txt
index 1d72fb9cde1..340a1ae310b 100644
--- a/source/gameengine/BlenderRoutines/CMakeLists.txt
+++ b/source/gameengine/BlenderRoutines/CMakeLists.txt
@@ -31,6 +31,7 @@ SET(INC
   ../../../intern/SoundSystem 
   ../../../source/blender/misc 
   ../../../source/blender/blenloader
+  ../../../source/blender/gpu
   ../../../extern/bullet2/src
   ../../../extern/solid
   ../../../extern/glew/include
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp b/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
index da52be56d1b..669e7bd1b3f 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
+++ b/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
@@ -26,7 +26,6 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#include "GL/glew.h"
 #include "KX_BlenderGL.h"
 
 #ifdef HAVE_CONFIG_H
@@ -93,80 +92,6 @@ void BL_SwapBuffers()
 	myswapbuffers();
 }
 
-void BL_RenderText(int mode,const char* textstr,int textlen,struct MTFace* tface,
-                   unsigned int *col,float v1[3],float v2[3],float v3[3],float v4[3])
-{
-	Image* ima;
-
-	if(mode & TF_BMFONT) {
-			//char string[MAX_PROPSTRING];
-			int characters, index, character;
-			float centerx, centery, sizex, sizey, transx, transy, movex, movey, advance;
-			
-//			bProperty *prop;
-
-			// string = "Frank van Beek";
-
-			characters = textlen;
-
-			ima = (struct Image*) tface->tpage;
-			if (ima == NULL) {
-				characters = 0;
-			}
-
-			/* When OBCOL flag is on the color is set in IndexPrimitives_3DText */			
-			if (tface->mode & TF_OBCOL) { /* Color has been set */
-				col= NULL;
-			} else {
-				if(!col) glColor3f(1.0f, 1.0f, 1.0f);			
-			}
-
-			glPushMatrix();
-			for (index = 0; index < characters; index++) {
-				// lets calculate offset stuff
-				character = textstr[index];
-				
-				// space starts at offset 1
-				// character = character - ' ' + 1;
-				
-				matrixGlyph((ImBuf *)ima->ibufs.first, character, & centerx, &centery, &sizex, &sizey, &transx, &transy, &movex, &movey, &advance);
-
-				glBegin(GL_POLYGON);
-				// printf(" %c %f %f %f %f\n", character, tface->uv[0][0], tface->uv[0][1], );
-				// glTexCoord2f((tface->uv[0][0] - centerx) * sizex + transx, (tface->uv[0][1] - centery) * sizey + transy);
-				glTexCoord2f((tface->uv[0][0] - centerx) * sizex + transx, (tface->uv[0][1] - centery) * sizey + transy);
-
-				if(col) spack(col[0]);
-				// glVertex3fv(v1);
-				glVertex3f(sizex * v1[0] + movex, sizey * v1[1] + movey, v1[2]);
-				
-				glTexCoord2f((tface->uv[1][0] - centerx) * sizex + transx, (tface->uv[1][1] - centery) * sizey + transy);
-				if(col) spack(col[1]);
-				// glVertex3fv(v2);
-				glVertex3f(sizex * v2[0] + movex, sizey * v2[1] + movey, v2[2]);
-	
-				glTexCoord2f((tface->uv[2][0] - centerx) * sizex + transx, (tface->uv[2][1] - centery) * sizey + transy);
-				if(col) spack(col[2]);
-				// glVertex3fv(v3);
-				glVertex3f(sizex * v3[0] + movex, sizey * v3[1] + movey, v3[2]);
-	
-				if(v4) {
-					// glTexCoord2f((tface->uv[3][0] - centerx) * sizex + transx, 1.0 - (1.0 - tface->uv[3][1]) * sizey - transy);
-					glTexCoord2f((tface->uv[3][0] - centerx) * sizex + transx, (tface->uv[3][1] - centery) * sizey + transy);
-					if(col) spack(col[3]);
-					// glVertex3fv(v4);
-					glVertex3f(sizex * v4[0] + movex, sizey * v4[1] + movey, v4[2]);
-				}
-				glEnd();
-
-				glTranslatef(advance, 0.0, 0.0);
-			}
-			glPopMatrix();
-
-		}
-}
-
-
 void DisableForText()
 {
 	if(glIsEnabled(GL_BLEND)) glDisable(GL_BLEND);
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderGL.h b/source/gameengine/BlenderRoutines/KX_BlenderGL.h
index c8e0d47afb6..b891a7343c2 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderGL.h
+++ b/source/gameengine/BlenderRoutines/KX_BlenderGL.h
@@ -46,9 +46,6 @@ void	BL_HideMouse();
 void	BL_NormalMouse();
 void	BL_WaitMouse();
 
-void BL_RenderText(int mode,const char* textstr,int textlen,struct MTFace* tface,
-				   unsigned int *col,float v1[3],float v2[3],float v3[3],float v4[3]);
-
 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);
 
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
index dafc2599850..1797d6c1a0f 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
+++ b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
@@ -26,8 +26,6 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#include "KX_BlenderRenderTools.h"
-
 #include "GL/glew.h"
 
 #include "RAS_IRenderTools.h"
@@ -36,23 +34,22 @@
 #include "RAS_ICanvas.h"
 #include "RAS_GLExtensionManager.h"
 
-// next two includes/dependencies come from the shadow feature
-// it needs the gameobject and the sumo physics scene for a raycast
 #include "KX_GameObject.h"
-
 #include "KX_PolygonMaterial.h"
 #include "KX_BlenderMaterial.h"
-
-#include "Value.h"
-
-#include "KX_BlenderGL.h" // for text printing
-#include "STR_String.h"
-#include "RAS_BucketManager.h" // for polymaterial (needed for textprinting)
-
 #include "KX_RayCast.h"
 #include "KX_IPhysicsController.h"
+
 #include "PHY_IPhysicsEnvironment.h"
-#include "KX_Scene.h"
+
+#include "STR_String.h"
+
+#include "GPU_draw.h"
+
+#include "KX_BlenderGL.h" // for text printing
+#include "KX_BlenderRenderTools.h"
+
+unsigned int KX_BlenderRenderTools::m_numgllights;
 
 KX_BlenderRenderTools::KX_BlenderRenderTools()
 {
@@ -61,73 +58,90 @@ KX_BlenderRenderTools::KX_BlenderRenderTools()
 		m_numgllights = 8;
 }
 
-/**
-ProcessLighting performs lighting on objects. the layer is a bitfield that contains layer information.
-There are 20 'official' layers in blender.
-A light is applied on an object only when they are in the same layer.
-OpenGL has a maximum of 8 lights (simultaneous), so 20 * 8 lights are possible in a scene.
-*/
-
-int	KX_BlenderRenderTools::ProcessLighting(int layer) 
+KX_BlenderRenderTools::~KX_BlenderRenderTools()
 {
-	
-	int result = false;
-
-	if (layer < 0)
-	{
-		DisableOpenGLLights();
-		result = false;
-	} else
-	{
-		if (m_clientobject)
-		{
-			if (layer == RAS_LIGHT_OBJECT_LAYER)
-			{
-				layer = static_cast<KX_GameObject*>(m_clientobject)->GetLayer();
-			}
-			if (applyLights(layer))
-			{
-				EnableOpenGLLights();
-				result = true;
-			} else
-			{
-				DisableOpenGLLights();
-				result = false;
-			}			
-		}
-	}
-	return result;
-	
-	
 }
 
-
 void KX_BlenderRenderTools::BeginFrame(RAS_IRasterizer* rasty)
 {
 	m_clientobject = NULL;
-	m_lastblenderobject = NULL;
-	m_lastblenderlights = false;
-	m_lastlayer = -1;
+	m_lastlightlayer = -1;
 	m_lastlighting = false;
-	m_modified = true;
 	DisableOpenGLLights();
-
-
 }
 
-void KX_BlenderRenderTools::SetClientObject(void* obj)
+void KX_BlenderRenderTools::EndFrame(RAS_IRasterizer* rasty)
+{
+}
+
+/* ProcessLighting performs lighting on objects. the layer is a bitfield that
+ * contains layer information. There are 20 'official' layers in blender. A
+ * light is applied on an object only when they are in the same layer. OpenGL
+ * has a maximum of 8 lights (simultaneous), so 20 * 8 lights are possible in
+ * a scene. */
+
+void KX_BlenderRenderTools::ProcessLighting(int layer, const MT_Transform& viewmat)
+{
+	if(m_lastlightlayer == layer)
+		return;
+
+	m_lastlightlayer = layer;
+
+	bool enable = false;
+
+	if (layer >= 0)
+	{
+		if (m_clientobject)
+		{
+			if (layer == RAS_LIGHT_OBJECT_LAYER)
+				layer = static_cast<KX_GameObject*>(m_clientobject)->GetLayer();
+
+			enable = applyLights(layer, viewmat);
+		}
+	}
+
+	if(enable)
+		EnableOpenGLLights();
+	else
+		DisableOpenGLLights();
+}
+
+void KX_BlenderRenderTools::EnableOpenGLLights()
+{
+	if(m_lastlighting == true)
+		return;
+
+	glEnable(GL_LIGHTING);
+	glEnable(GL_COLOR_MATERIAL);
+
+	glColorMaterial(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE);
+	glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, true);
+	if (GLEW_EXT_separate_specular_color || GLEW_VERSION_1_2)
+		glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL, GL_SEPARATE_SPECULAR_COLOR);
+	
+	m_lastlighting = true;
+}
+
+void KX_BlenderRenderTools::DisableOpenGLLights()
+{
+	if(m_lastlighting == false)
+		return;
+
+	glDisable(GL_LIGHTING);
+	glDisable(GL_COLOR_MATERIAL);
+
+	m_lastlighting = false;
+}
+
+
+void KX_BlenderRenderTools::SetClientObject(RAS_IRasterizer *rasty, void* obj)
 {
 	if (m_clientobject != obj)
 	{
-		if (obj == NULL || !((KX_GameObject*)obj)->IsNegativeScaling())
-		{
-			glFrontFace(GL_CCW);
-		} else 
-		{
-			glFrontFace(GL_CW);
-		}
+		bool ccw = (obj == NULL || !((KX_GameObject*)obj)->IsNegativeScaling());
+		rasty->SetFrontFace(ccw);
+
 		m_clientobject = obj;
-		m_modified = true;
 	}
 }
 
@@ -182,7 +196,7 @@ void KX_BlenderRenderTools::applyTransform(RAS_IRasterizer* rasty,double* oglmat
 		MT_Vector3 dir = (campos - objpos).safe_normalized();
 		MT_Vector3 up(0,0,1.0);
 
-		KX_GameObject* gameobj = (KX_GameObject*) this->m_clientobject;
+		KX_GameObject* gameobj = (KX_GameObject*)m_clientobject;
 		// get scaling of halo object
 		MT_Vector3  size = gameobj->GetSGNode()->GetLocalScale();
 		
@@ -218,7 +232,7 @@ void KX_BlenderRenderTools::applyTransform(RAS_IRasterizer* rasty,double* oglmat
 		{
 			// shadow must be cast to the ground, physics system needed here!
 			MT_Point3 frompoint(oglmatrix[12],oglmatrix[13],oglmatrix[14]);
-			KX_GameObject *gameobj = (KX_GameObject*) this->m_clientobject;
+			KX_GameObject *gameobj = (KX_GameObject*)m_clientobject;
 			MT_Vector3 direction = MT_Vector3(0,0,-1);
 
 			direction.normalize();
@@ -252,13 +266,29 @@ void KX_BlenderRenderTools::applyTransform(RAS_IRasterizer* rasty,double* oglmat
 }
 
 
-/**
-Render Text renders text into a (series of) polygon, using a texture font,
-Each character consists of one polygon (one quad or two triangles)
-*/
-void	KX_BlenderRenderTools::RenderText(int mode,RAS_IPolyMaterial* polymat,float v1[3],float v2[3],float v3[3],float v4[3])
+void KX_BlenderRenderTools::RenderText2D(RAS_TEXT_RENDER_MODE mode,
+										 const char* text,
+										 int xco,
+										 int yco,									 
+										 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);
+	else
+		BL_print_gamedebug_line(tmpstr.Ptr(), xco, yco, width, height);
+}
+
+/* Render Text renders text into a (series of) polygon, using a texture font,
+ * Each character consists of one polygon (one quad or two triangles) */
+
+void KX_BlenderRenderTools::RenderText(
+	int mode,
+	RAS_IPolyMaterial* polymat,
+	float v1[3], float v2[3], float v3[3], float v4[3], int glattrib)
 {
-		
 	STR_String mytext = ((CValue*)m_clientobject)->GetPropertyText("Text");
 	
 	const unsigned int flag = polymat->GetFlag();
@@ -275,68 +305,10 @@ void	KX_BlenderRenderTools::RenderText(int mode,RAS_IPolyMaterial* polymat,float
 		col = blenderpoly->GetMCol();
 	}
 	
-	BL_RenderText( mode,mytext,mytext.Length(),tface,col,v1,v2,v3,v4);
-	
+	GPU_render_text(tface, mode, mytext, mytext.Length(), col, v1, v2, v3, v4, glattrib);
 }
 
 
-
-KX_BlenderRenderTools::~KX_BlenderRenderTools()
-{
-};
-	
-	
-void	KX_BlenderRenderTools::EndFrame(RAS_IRasterizer* rasty)
-{
-}
-	
-
-	
-void KX_BlenderRenderTools::DisableOpenGLLights()
-{
-	glDisable(GL_LIGHTING);
-	glDisable(GL_COLOR_MATERIAL);
-}
-
-	
-void KX_BlenderRenderTools::EnableOpenGLLights()
-{
-	glEnable(GL_LIGHTING);
-	
-	glEnable(GL_COLOR_MATERIAL);
-	glColorMaterial(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE);
-	glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, true);
-	if (GLEW_EXT_separate_specular_color || GLEW_VERSION_1_2)
-		glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL, GL_SEPARATE_SPECULAR_COLOR);
-
-}
-	
-
-/**
- * Rendering text using 2D bitmap functionality.  
- */
-void KX_BlenderRenderTools::RenderText2D(RAS_TEXT_RENDER_MODE mode,
-										 const char* text,
-										 int xco,
-										 int yco,									 
-										 int width,
-										 int height)
-{
-	switch (mode) {
-	case RAS_IRenderTools::RAS_TEXT_PADDED: {
-		STR_String tmpstr(text);
-		BL_print_gamedebug_line_padded(tmpstr.Ptr(),xco,yco,width,height);
-		break;
-	}
-	default: {
-		STR_String tmpstr(text);
-		BL_print_gamedebug_line(tmpstr.Ptr(),xco,yco,width,height);
-	}
-	}
-}
-
-	
-
 void KX_BlenderRenderTools::PushMatrix()
 {
 	glPushMatrix();
@@ -348,14 +320,13 @@ void KX_BlenderRenderTools::PopMatrix()
 }
 
 
-
-int	KX_BlenderRenderTools::applyLights(int objectlayer)
+int KX_BlenderRenderTools::applyLights(int objectlayer, const MT_Transform& viewmat)
 {
-// taken from blender source, incompatibility between Blender Object / GameObject	
-	
+	// taken from blender source, incompatibility between Blender Object / GameObject	
+	float glviewmat[16];
 	unsigned int count;
 	float vec[4];
-		
+
 	vec[3]= 1.0;
 	
 	for(count=0; count<m_numgllights; count++)
@@ -363,9 +334,11 @@ int	KX_BlenderRenderTools::applyLights(int objectlayer)
 	
 	//std::vector<struct	RAS_LightObject*> m_lights;
 	std::vector<struct	RAS_LightObject*>::iterator lit = m_lights.begin();
+
+	viewmat.getValue(glviewmat);
 	
 	glPushMatrix();
-	glLoadMatrixf(m_viewmat);
+	glLoadMatrixf(glviewmat);
 	for (lit = m_lights.begin(), count = 0; !(lit==m_lights.end()) && count < m_numgllights; ++lit)
 	{
 		RAS_LightObject* lightdata = (*lit);
@@ -433,7 +406,6 @@ int	KX_BlenderRenderTools::applyLights(int objectlayer)
 			glEnable((GLenum)(GL_LIGHT0+count));
 
 			count++;
-			
 		}
 	}
 	glPopMatrix();
@@ -442,22 +414,6 @@ int	KX_BlenderRenderTools::applyLights(int objectlayer)
 
 }
 
-
-
-RAS_IPolyMaterial* KX_BlenderRenderTools::CreateBlenderPolyMaterial(
-		const STR_String &texname,
-		bool ba,const STR_String& matname,int tile,int tilexrep,int tileyrep,int mode,bool transparant,bool zsort, int lightlayer
-		,bool bIsTriangle,void* clientobject,void* tface)
-{
-	assert(!"Deprecated");
-/*	return new KX_BlenderPolyMaterial(
-
-		texname,
-		ba,matname,tile,tilexrep,tileyrep,mode,transparant,zsort, lightlayer
-		,bIsTriangle,clientobject,(struct MTFace*)tface);*/
-	return NULL;
-}
-
 void KX_BlenderRenderTools::MotionBlur(RAS_IRasterizer* rasterizer)
 {
 	int state = rasterizer->GetMotionBlurState();
@@ -491,4 +447,3 @@ void KX_BlenderRenderTools::Render2DFilters(RAS_ICanvas* canvas)
 	m_filtermanager.RenderFilters(canvas);
 }
 
-unsigned int KX_BlenderRenderTools::m_numgllights;
diff --git a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
index 8027136aa52..a7618462c9b 100644
--- a/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
+++ b/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
@@ -26,6 +26,7 @@
  *
  * ***** END GPL LICENSE BLOCK *****
  */
+
 #ifndef __KX_BLENDERRENDERTOOLS
 #define __KX_BLENDERRENDERTOOLS
 
@@ -39,65 +40,50 @@
 struct KX_ClientObjectInfo;
 class KX_RayCast;
 
-/**
-BlenderRenderTools are a set of tools to apply 2D/3D graphics effects, which are not
-part of the (polygon) Rasterizer. 
-Effects like 2D text, 3D (polygon) text, lighting.
-*/
+/* BlenderRenderTools are a set of tools to apply 2D/3D graphics effects, which
+ * are not part of the (polygon) Rasterizer. Effects like 2D text, 3D (polygon)
+ * text, lighting.
+ *
+ * Most of this code is duplicated in GPC_RenderTools, so this should be
+ * moved to some common location to avoid duplication. */
 
 class KX_BlenderRenderTools  : public RAS_IRenderTools
 {
-	bool	m_lastblenderlights;
-	void*	m_lastblenderobject;
-	int		m_lastlayer;
+	int		m_lastlightlayer;
 	bool	m_lastlighting;
 	static unsigned int m_numgllights;
-	
-	
+
 public:
-	
 						KX_BlenderRenderTools();
 	virtual				~KX_BlenderRenderTools();	
 
-	virtual void		EndFrame(class RAS_IRasterizer* rasty);
-	virtual void		BeginFrame(class RAS_IRasterizer* rasty);
-	void				DisableOpenGLLights();
-	void				EnableOpenGLLights();
-	int					ProcessLighting(int layer);
+	void				EndFrame(RAS_IRasterizer* rasty);
+	void				BeginFrame(RAS_IRasterizer* rasty);
 
-	virtual void	    RenderText2D(RAS_TEXT_RENDER_MODE mode,
+	void				EnableOpenGLLights();
+	void				DisableOpenGLLights();
+	void				ProcessLighting(int layer, const MT_Transform& viewmat);
+
+	void			    RenderText2D(RAS_TEXT_RENDER_MODE mode,
 									 const char* text,
 									 int xco,
 									 int yco,
 									 int width,
 									 int height);
-	virtual void		RenderText(int mode,
+	void				RenderText(int mode,
 								   class RAS_IPolyMaterial* polymat,
 								   float v1[3],
 								   float v2[3],
 								   float v3[3],
-								   float v4[3]);
-	void				applyTransform(class RAS_IRasterizer* rasty,
-									   double* oglmatrix,
-									   int objectdrawmode );
-	int					applyLights(int objectlayer);
-	virtual void		PushMatrix();
-	virtual void		PopMatrix();
+								   float v4[3],
+								   int glattrib);
+
+	void				applyTransform(RAS_IRasterizer* rasty, double* oglmatrix, int objectdrawmode);
+	int					applyLights(int objectlayer, const MT_Transform& viewmat);
+
+	void				PushMatrix();
+	void				PopMatrix();
 
-	virtual class RAS_IPolyMaterial* CreateBlenderPolyMaterial(const STR_String &texname,
-									bool ba,
-									const STR_String& matname,
-									int tile,
-									int tilexrep,
-									int tileyrep,
-									int mode,
-									bool transparant,
-									bool zsort,
-									int lightlayer,
-									bool bIsTriangle,
-									void* clientobject,
-									void* tface);
-	
 	bool RayHit(KX_ClientObjectInfo* client, class KX_RayCast* result, void * const data);
 	bool NeedRayCast(KX_ClientObjectInfo*) { return true; }
 
@@ -107,8 +93,7 @@ public:
 
 	virtual	void Render2DFilters(RAS_ICanvas* canvas);
 
-	virtual void SetClientObject(void* obj);
-
+	virtual void SetClientObject(RAS_IRasterizer *rasty, void* obj);
 };
 
 #endif //__KX_BLENDERRENDERTOOLS
diff --git a/source/gameengine/BlenderRoutines/Makefile b/source/gameengine/BlenderRoutines/Makefile
index a7394158a20..4b9a2a3af17 100644
--- a/source/gameengine/BlenderRoutines/Makefile
+++ b/source/gameengine/BlenderRoutines/Makefile
@@ -54,6 +54,7 @@ CPPFLAGS += -I../../blender/blenkernel
 CPPFLAGS += -I../../blender/render/extern/include
 CPPFLAGS += -I../../blender/blenloader
 CPPFLAGS += -I../../blender/blenkernel
+CPPFLAGS += -I../../blender/gpu
 CPPFLAGS += -I../Converter
 CPPFLAGS += -I../Expressions
 CPPFLAGS += -I../GameLogic
@@ -72,9 +73,5 @@ ifeq ($(OS),windows)
     CPPFLAGS += -I../../blender
 endif
 
-ifeq ($(WITH_BF_GLEXT),true)
-	CPPFLAGS += -DWITH_GLEXT
-endif
-
 CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
 
diff --git a/source/gameengine/BlenderRoutines/SConscript b/source/gameengine/BlenderRoutines/SConscript
index 327f4798e04..78adbc83d9b 100644
--- a/source/gameengine/BlenderRoutines/SConscript
+++ b/source/gameengine/BlenderRoutines/SConscript
@@ -15,7 +15,7 @@ incs += ' #source/gameengine/SceneGraph #source/gameengine/Physics/common'
 incs += ' #source/gameengine/Physics/Bullet #source/gameengine/Physics/Sumo'
 incs += ' #source/gameengine/Physics/Sumo/Fuzzics/include #source/gameengine/Network/LoopBackNetwork'
 incs += ' #intern/SoundSystem #source/blender/misc #source/blender/blenloader'
-incs += ' #extern/glew/include'
+incs += ' #extern/glew/include #source/blender/gpu'
 
 incs += ' ' + env['BF_PYTHON_INC']
 incs += ' ' + env['BF_SOLID_INC']
@@ -26,7 +26,4 @@ cxxflags = []
 if env['OURPLATFORM']=='win32-vc':
 	cxxflags.append ('/GR')
 
-if env['WITH_BF_GLEXT'] == 1:
-	env['CPPFLAGS'].append('-DWITH_GLEXT')
-
 env.BlenderLib ( 'bf_bloutines', sources, Split(incs), [], libtype=['game', 'game2', 'player'], priority=[0, 0, 55] , compileflags=cxxflags)
diff --git a/source/gameengine/Converter/BL_ArmatureObject.cpp b/source/gameengine/Converter/BL_ArmatureObject.cpp
index cdfce321713..bf774bf7568 100644
--- a/source/gameengine/Converter/BL_ArmatureObject.cpp
+++ b/source/gameengine/Converter/BL_ArmatureObject.cpp
@@ -53,16 +53,20 @@ BL_ArmatureObject::BL_ArmatureObject(
 
 :	KX_GameObject(sgReplicationInfo,callbacks),
 	m_objArma(armature),
-	m_mrdPose(NULL),
 	m_framePose(NULL),
-	m_lastframe(0.),
+	m_lastframe(0.0),
 	m_activeAct(NULL),
-	m_activePriority(999)
+	m_activePriority(999),
+	m_lastapplyframe(0.0)
 {
 	m_armature = get_armature(m_objArma);
-	m_pose = m_objArma->pose;
-}
 
+	/* we make a copy of blender object's pose, and then always swap it with
+	 * the original pose before calling into blender functions, to deal with
+	 * replica's or other objects using the same blender object */
+	m_pose = NULL;
+	copy_pose(&m_pose, m_objArma->pose, 1 /* copy_constraint_channels_hack */);
+}
 
 CValue* BL_ArmatureObject::GetReplica()
 {
@@ -79,34 +83,39 @@ void BL_ArmatureObject::ProcessReplica(BL_ArmatureObject *replica)
 {
 	KX_GameObject::ProcessReplica(replica);
 
+	replica->m_pose = NULL;
+	copy_pose(&replica->m_pose, m_pose, 1 /* copy_constraint_channels_hack */);
 }
 
 BL_ArmatureObject::~BL_ArmatureObject()
 {
-	if (m_mrdPose)
-		free_pose(m_mrdPose);
+	if (m_pose)
+		free_pose(m_pose);
+}
+
+bool BL_ArmatureObject::VerifyPose()
+{
+	if(m_lastapplyframe != m_lastframe) {
+		extract_pose_from_pose(m_objArma->pose, m_pose);
+		where_is_pose(m_objArma);
+		m_lastapplyframe = m_lastframe;
+		extract_pose_from_pose(m_pose, m_objArma->pose);
+		return false;
+	}
+	else
+		return true;
 }
 
-/* note, you can only call this for exisiting Armature objects, and not mix it with other Armatures */
-/* there is only 1 unique Pose per Armature */
 void BL_ArmatureObject::ApplyPose()
 {
-	if (m_pose) {
-		// copy to armature object
-		if (m_objArma->pose != m_pose)/* This should never happen but it does - Campbell */
-			extract_pose_from_pose(m_objArma->pose, m_pose);
-		
-		// is this needed anymore?
-		//if (!m_mrdPose)
-		//	copy_pose (&m_mrdPose, m_pose, 0);
-		//else
-		//	extract_pose_from_pose(m_mrdPose, m_pose);
-	}
+	if(VerifyPose())
+		extract_pose_from_pose(m_objArma->pose, m_pose);
 }
 
 void BL_ArmatureObject::SetPose(bPose *pose)
 {
-	m_pose = pose;
+	extract_pose_from_pose(m_pose, pose);
+	m_lastapplyframe = -1.0;
 }
 
 bool BL_ArmatureObject::SetActiveAction(BL_ActionActuator *act, short priority, double curtime)
@@ -162,6 +171,7 @@ void BL_ArmatureObject::GetPose(bPose **pose)
 		if (*pose == m_pose)
 			// no need to copy if the pointers are the same
 			return;
+
 		extract_pose_from_pose(*pose, m_pose);
 	}
 }
@@ -171,20 +181,16 @@ void BL_ArmatureObject::GetMRDPose(bPose **pose)
 	/* If the caller supplies a null pose, create a new one. */
 	/* Otherwise, copy the armature's pose channels into the caller-supplied pose */
 
-	// is this needed anymore?
-	//if (!m_mrdPose){
-	//	copy_pose (&m_mrdPose, m_pose, 0);
-	//}
-
 	if (!*pose) {
 		// must duplicate the constraints too otherwise we have corruption in free_pose_channels()
 		// because it will free the blender constraints. 
 		// Ideally, blender should rememeber that the constraints were not copied so that
 		// free_pose_channels() would not free them.
-		copy_pose(pose, m_objArma->pose, 1);
+		copy_pose(pose, m_pose, 1);
+	}
+	else {
+		extract_pose_from_pose(*pose, m_pose);
 	}
-	else
-		extract_pose_from_pose(*pose, m_objArma->pose);
 
 }
 
@@ -198,16 +204,18 @@ double BL_ArmatureObject::GetLastFrame()
 	return m_lastframe;
 }
 
-bool BL_ArmatureObject::GetBoneMatrix(Bone* bone, MT_Matrix4x4& matrix) const
+bool BL_ArmatureObject::GetBoneMatrix(Bone* bone, MT_Matrix4x4& matrix)
 {
-	Object* par_arma = m_objArma;
-	where_is_pose(par_arma);
-	bPoseChannel *pchan= get_pose_channel(par_arma->pose, bone->name);
+	bPoseChannel *pchan;
+
+	ApplyPose();
+	pchan = get_pose_channel(m_objArma->pose, bone->name);
 
 	if(pchan) {
 		matrix.setValue(&pchan->pose_mat[0][0]);
 		return true;
 	}
+
 	return false;
 }
 
diff --git a/source/gameengine/Converter/BL_ArmatureObject.h b/source/gameengine/Converter/BL_ArmatureObject.h
index a612ca77ec0..6f2c0d2f4c9 100644
--- a/source/gameengine/Converter/BL_ArmatureObject.h
+++ b/source/gameengine/Converter/BL_ArmatureObject.h
@@ -59,7 +59,10 @@ public:
 	void GetMRDPose(struct bPose **pose);
 	void GetPose(struct bPose **pose);
 	void SetPose (struct bPose *pose);
+
 	void ApplyPose();
+	bool VerifyPose();
+
 	bool SetActiveAction(class BL_ActionActuator *act, short priority, double curtime);
 	
 	struct bArmature * GetArmature() { return m_armature; }
@@ -69,7 +72,7 @@ public:
 
 	/// Retrieve the pose matrix for the specified bone.
 	/// Returns true on success.
-	bool GetBoneMatrix(Bone* bone, MT_Matrix4x4& matrix) const;
+	bool GetBoneMatrix(Bone* bone, MT_Matrix4x4& matrix);
 	
 	/// Returns the bone length.  The end of the bone is in the local y direction.
 	float GetBoneLength(Bone* bone) const;
@@ -79,11 +82,12 @@ protected:
 	Object				*m_objArma;
 	struct bArmature	*m_armature;
 	struct bPose		*m_pose;
-	struct bPose		*m_mrdPose;
 	struct bPose		*m_framePose;
 	double	m_lastframe;
 	class BL_ActionActuator *m_activeAct;
 	short	m_activePriority;
+
+	double			m_lastapplyframe;
 };
 
 #endif
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
index edc14dabc70..def4938b053 100644
--- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp
+++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
@@ -601,7 +601,6 @@ BL_Material* ConvertMaterial(
 			(tface->mode & TF_INVISIBLE)
 			)?POLY_VIS:0;
 
-		material->ras_mode |= ( (tface->mode & TF_DYNAMIC)!= 0 )?COLLIDER:0;
 		material->transp = tface->transp;
 		material->tile	= tface->tile;
 		material->mode	= tface->mode;
@@ -617,7 +616,7 @@ BL_Material* ConvertMaterial(
 	} 
 	else {
 		// nothing at all
-		material->ras_mode |= (COLLIDER|POLY_VIS| (validmat?0:USE_LIGHT));
+		material->ras_mode |= (POLY_VIS| (validmat?0:USE_LIGHT));
 		material->mode		= default_face_mode;	
 		material->transp	= TF_SOLID;
 		material->tile		= 0;
@@ -627,13 +626,19 @@ BL_Material* ConvertMaterial(
 	if(validmat && (mat->mode & MA_ZTRA) && (material->transp == TF_SOLID))
 		material->transp = TF_ALPHA;
 
-	// always zsort alpha + add
-	if((material->transp == TF_ALPHA || material->transp == TF_ADD || texalpha)
-		&& (material->transp != TF_CLIP)) {
+  	// always zsort alpha + add
+	if((material->transp == TF_ALPHA || texalpha) && (material->transp != TF_CLIP)) {
 		material->ras_mode |= ALPHA;
 		material->ras_mode |= (material->mode & TF_ALPHASORT)? ZSORT: 0;
 	}
 
+	// collider or not?
+	material->ras_mode |= (material->mode & TF_DYNAMIC)? COLLIDER: 0;
+
+	// these flags are irrelevant at this point, remove so they
+	// don't hurt material bucketing 
+	material->mode &= ~(TF_DYNAMIC|TF_ALPHASORT|TF_TEX);
+
 	// get uv sets
 	if(validmat) 
 	{
@@ -644,6 +649,7 @@ BL_Material* ConvertMaterial(
 		for (int vind = 0; vind<material->num_enabled; vind++)
 		{
 			BL_Mapping &map = material->mapping[vind];
+
 			if (map.uvCoName.IsEmpty())
 				isFirstSet = false;
 			else
@@ -673,7 +679,7 @@ BL_Material* ConvertMaterial(
 							isFirstSet = false;
 							uvName = layer.name;
 						}
-						else
+						else if(strcmp(layer.name, uvName) != 0)
 						{
 							uv2[0] = uvSet[0]; uv2[1] = uvSet[1];
 							uv2[2] = uvSet[2]; uv2[3] = uvSet[3];
@@ -702,7 +708,6 @@ BL_Material* ConvertMaterial(
 	material->SetConversionUV(uvName, uv);
 	material->SetConversionUV2(uv2Name, uv2);
 
-	material->ras_mode |= (mface->v4==0)?TRIANGLE:0;
 	if(validmat)
 		material->matname	=(mat->id.name);
 
@@ -767,7 +772,7 @@ RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, RAS_IRenderTools*
 	}
 
 	meshobj->SetName(mesh->id.name);
-	meshobj->m_xyz_index_to_vertex_index_mapping.resize(totvert);
+	meshobj->m_sharedvertex_map.resize(totvert);
 
 	for (int f=0;f<totface;f++,mface++)
 	{
@@ -830,7 +835,7 @@ RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, RAS_IRenderTools*
 		ma = give_current_material(blenderobj, mface->mat_nr+1);
 	
 		{
-			bool polyvisible = true;
+			bool visible = true;
 			RAS_IPolyMaterial* polymat = NULL;
 			BL_Material *bl_mat = NULL;
 
@@ -845,7 +850,7 @@ RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, RAS_IRenderTools*
 
 				bl_mat->material_index =  (int)mface->mat_nr;
 
-				polyvisible = ((bl_mat->ras_mode & POLY_VIS)!=0);
+				visible = ((bl_mat->ras_mode & POLY_VIS)!=0);
 				collider = ((bl_mat->ras_mode & COLLIDER)!=0);
 
 				/* vertex colors and uv's were stored in bl_mat temporarily */
@@ -862,7 +867,7 @@ RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, RAS_IRenderTools*
 				uv22 = uv[2]; uv23 = uv[3];
 				
 				/* then the KX_BlenderMaterial */
-				polymat = new KX_BlenderMaterial(scene, bl_mat, skinMesh, lightlayer, blenderobj );
+				polymat = new KX_BlenderMaterial(scene, bl_mat, skinMesh, lightlayer);
 			}
 			else {
 				/* do Texture Face materials */
@@ -886,7 +891,7 @@ RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, RAS_IRenderTools*
 					tile = tface->tile;
 					mode = tface->mode;
 					
-					polyvisible = !((mface->flag & ME_HIDE)||(tface->mode & TF_INVISIBLE));
+					visible = !((mface->flag & ME_HIDE)||(tface->mode & TF_INVISIBLE));
 					
 					uv0 = MT_Point2(tface->uv[0]);
 					uv1 = MT_Point2(tface->uv[1]);
@@ -940,15 +945,13 @@ RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, RAS_IRenderTools*
 						rgb3 = KX_rgbaint2uint_new(color);
 				}
 				
-				bool istriangle = (mface->v4==0);
-
 				// only zsort alpha + add
 				bool alpha = (transp == TF_ALPHA || transp == TF_ADD);
 				bool zsort = (mode & TF_ALPHASORT)? alpha: 0;
 
 				polymat = new KX_PolygonMaterial(imastr, ma,
 					tile, tilexrep, tileyrep, 
-					mode, transp, alpha, zsort, lightlayer, istriangle, blenderobj, tface, (unsigned int*)mcol);
+					mode, transp, alpha, zsort, lightlayer, tface, (unsigned int*)mcol);
 	
 				if (ma) {
 					polymat->m_specular = MT_Vector3(ma->specr, ma->specg, ma->specb)*ma->spec;
@@ -961,6 +964,9 @@ RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, RAS_IRenderTools*
 				}
 			}
 
+			/* mark face as flat, so vertices are split */
+			bool flat = (mface->flag & ME_SMOOTH) == 0;
+
 			// see if a bucket was reused or a new one was created
 			// this way only one KX_BlenderMaterial object has to exist per bucket
 			bool bucketCreated; 
@@ -981,49 +987,19 @@ RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, RAS_IRenderTools*
 				polymat = bucket->GetPolyMaterial();
 			}
 						 
-			int nverts = mface->v4?4:3;
-			int vtxarray = meshobj->FindVertexArray(nverts,polymat);
-			RAS_Polygon* poly = new RAS_Polygon(bucket,polyvisible,nverts,vtxarray);
+			int nverts = (mface->v4)? 4: 3;
+			RAS_Polygon *poly = meshobj->AddPolygon(bucket, nverts);
 
-			bool flat;
-
-			if (skinMesh) {
-				/* If the face is set to solid, all fnors are the same */
-				if (mface->flag & ME_SMOOTH)
-					flat = false;
-				else
-					flat = true;
-			}
-			else
-				flat = false;
-
-			poly->SetVertex(0,meshobj->FindOrAddVertex(vtxarray,pt0,uv0,uv20,tan0,rgb0,no0,flat,polymat,mface->v1));
-			poly->SetVertex(1,meshobj->FindOrAddVertex(vtxarray,pt1,uv1,uv21,tan1,rgb1,no1,flat,polymat,mface->v2));
-			poly->SetVertex(2,meshobj->FindOrAddVertex(vtxarray,pt2,uv2,uv22,tan2,rgb2,no2,flat,polymat,mface->v3));
-			if (nverts==4)
-				poly->SetVertex(3,meshobj->FindOrAddVertex(vtxarray,pt3,uv3,uv23,tan3,rgb3,no3,flat,polymat,mface->v4));
-
-			meshobj->AddPolygon(poly);
-			if (poly->IsCollider())
-			{
-				RAS_TriangleIndex idx;
-				idx.m_index[0] = mface->v1;
-				idx.m_index[1] = mface->v2;
-				idx.m_index[2] = mface->v3;
-				idx.m_collider = collider;
-				meshobj->m_triangle_indices.push_back(idx);
-				if (nverts==4)
-				{
-				idx.m_index[0] = mface->v1;
-				idx.m_index[1] = mface->v3;
-				idx.m_index[2] = mface->v4;
-				idx.m_collider = collider;
-				meshobj->m_triangle_indices.push_back(idx);
-				}
-			}
-			
-//				poly->SetVisibleWireframeEdges(mface->edcode);
+			poly->SetVisible(visible);
 			poly->SetCollider(collider);
+			//poly->SetEdgeCode(mface->edcode);
+
+			meshobj->AddVertex(poly,0,pt0,uv0,uv20,tan0,rgb0,no0,flat,mface->v1);
+			meshobj->AddVertex(poly,1,pt1,uv1,uv21,tan1,rgb1,no1,flat,mface->v2);
+			meshobj->AddVertex(poly,2,pt2,uv2,uv22,tan2,rgb2,no2,flat,mface->v3);
+
+			if (nverts==4)
+				meshobj->AddVertex(poly,3,pt3,uv3,uv23,tan3,rgb3,no3,flat,mface->v4);
 		}
 
 		if (tface) 
@@ -1039,13 +1015,12 @@ RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, RAS_IRenderTools*
 			layer.face++;
 		}
 	}
-	meshobj->m_xyz_index_to_vertex_index_mapping.clear();
-	meshobj->UpdateMaterialList();
+	meshobj->m_sharedvertex_map.clear();
 
 	// pre calculate texture generation
-	for(RAS_MaterialBucket::Set::iterator mit = meshobj->GetFirstMaterial();
+	for(list<RAS_MeshMaterial>::iterator mit = meshobj->GetFirstMaterial();
 		mit != meshobj->GetLastMaterial(); ++ mit) {
-		(*mit)->GetPolyMaterial()->OnConstruction();
+		mit->m_bucket->GetPolyMaterial()->OnConstruction();
 	}
 
 	if (layers)
@@ -1490,14 +1465,9 @@ static KX_LightObject *gamelight_from_blamp(Object *ob, Lamp *la, unsigned int l
 		lightobj.m_type = RAS_LightObject::LIGHT_NORMAL;
 	}
 
-#ifdef BLENDER_GLSL
-	if(converter->GetGLSLMaterials())
-		GPU_lamp_from_blender(ob, la);
-	
-	gamelight = new KX_LightObject(kxscene, KX_Scene::m_callbacks, rendertools, lightobj, ob->gpulamp);
-#else
-	gamelight = new KX_LightObject(kxscene, KX_Scene::m_callbacks, rendertools, lightobj, NULL);
-#endif
+	gamelight = new KX_LightObject(kxscene, KX_Scene::m_callbacks, rendertools,
+		lightobj, converter->GetGLSLMaterials());
+
 	BL_ConvertLampIpos(la, gamelight, converter);
 	
 	return gamelight;
@@ -1534,7 +1504,7 @@ static KX_GameObject *gameobject_from_blenderobject(
 		
 		gamelight->AddRef();
 		kxscene->GetLightList()->Add(gamelight);
-		
+
 		break;
 	}
 	
@@ -1643,20 +1613,6 @@ struct parentChildLink {
 	SG_Node* m_gamechildnode;
 };
 
-	/**
-	 * Find the specified scene by name, or the first
-	 * scene if nothing matches (shouldn't happen).
-	 */
-static struct Scene *GetSceneForName(struct Main *maggie, const STR_String& scenename) {
-	Scene *sce;
-
-	for (sce= (Scene*) maggie->scene.first; sce; sce= (Scene*) sce->id.next)
-		if (scenename == (sce->id.name+2))
-			return sce;
-
-	return (Scene*) maggie->scene.first;
-}
-
 #include "DNA_constraint_types.h"
 #include "BIF_editconstraint.h"
 
@@ -1755,7 +1711,7 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
 							  )
 {	
 
-	Scene *blenderscene = GetSceneForName(maggie, scenename);
+	Scene *blenderscene = converter->GetBlenderSceneForName(scenename);
 	// for SETLOOPER
 	Scene *sce;
 	Base *base;
@@ -1990,7 +1946,7 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
 				//tf.Add(gameobj->GetSGNode());
 				
 				gameobj->NodeUpdateGS(0,true);
-				gameobj->Bucketize();
+				gameobj->AddMeshUser();
 		
 			}
 			else
@@ -2187,7 +2143,7 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
 								//tf.Add(gameobj->GetSGNode());
 								
 								gameobj->NodeUpdateGS(0,true);
-								gameobj->Bucketize();
+								gameobj->AddMeshUser();
 						
 							}
 							else
@@ -2273,8 +2229,11 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
 			{
 				// parent this to a bone
 				Bone *parent_bone = get_named_bone(get_armature(blenderchild->parent), blenderchild->parsubstr);
-				KX_BoneParentRelation *bone_parent_relation = KX_BoneParentRelation::New(parent_bone);
-				pcit->m_gamechildnode->SetParentRelation(bone_parent_relation);
+
+				if(parent_bone) {
+					KX_BoneParentRelation *bone_parent_relation = KX_BoneParentRelation::New(parent_bone);
+					pcit->m_gamechildnode->SetParentRelation(bone_parent_relation);
+				}
 			
 				break;
 			}
@@ -2511,5 +2470,10 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
 			kxscene->DupliGroupRecurse(gameobj, 0);
 		}
 	}
+
+	KX_Camera *activecam = kxscene->GetActiveCamera();
+	MT_Scalar distance = (activecam)? activecam->GetCameraFar() - activecam->GetCameraNear(): 100.0f;
+	RAS_BucketManager *bucketmanager = kxscene->GetBucketManager();
+	bucketmanager->OptimizeBuckets(distance);
 }
 
diff --git a/source/gameengine/Converter/BL_DeformableGameObject.cpp b/source/gameengine/Converter/BL_DeformableGameObject.cpp
index d23274324ee..1d62a41cce9 100644
--- a/source/gameengine/Converter/BL_DeformableGameObject.cpp
+++ b/source/gameengine/Converter/BL_DeformableGameObject.cpp
@@ -41,12 +41,14 @@ BL_DeformableGameObject::~BL_DeformableGameObject()
 		delete m_pDeformer;		//	__NLA : Temporary until we decide where to put this
 }
 
-void	BL_DeformableGameObject::ProcessReplica(KX_GameObject* replica)
+void BL_DeformableGameObject::ProcessReplica(KX_GameObject* replica)
 {
+	BL_MeshDeformer *deformer;
 	KX_GameObject::ProcessReplica(replica);
 
-	if (m_pDeformer){
-		((BL_DeformableGameObject*)replica)->m_pDeformer = m_pDeformer->GetReplica();
+	if (m_pDeformer) {
+		deformer = (BL_MeshDeformer*)m_pDeformer->GetReplica();
+		((BL_DeformableGameObject*)replica)->m_pDeformer = deformer;
 	}
 
 }
diff --git a/source/gameengine/Converter/BL_MeshDeformer.cpp b/source/gameengine/Converter/BL_MeshDeformer.cpp
index 39d66a90e92..fa3b8185fe2 100644
--- a/source/gameengine/Converter/BL_MeshDeformer.cpp
+++ b/source/gameengine/Converter/BL_MeshDeformer.cpp
@@ -50,26 +50,26 @@
 
 bool BL_MeshDeformer::Apply(RAS_IPolyMaterial*)
 {
-	size_t i, j;
+	size_t i;
 	float *co;
 
 	// only apply once per frame if the mesh is actually modified
 	if(m_pMeshObject->MeshModified() &&
 	   m_lastDeformUpdate != m_gameobj->GetLastFrame()) {
 		// For each material
-		for(RAS_MaterialBucket::Set::iterator mit = m_pMeshObject->GetFirstMaterial();
+		for(list<RAS_MeshMaterial>::iterator mit= m_pMeshObject->GetFirstMaterial();
 			mit != m_pMeshObject->GetLastMaterial(); ++ mit) {
-			RAS_IPolyMaterial *mat = (*mit)->GetPolyMaterial();
+			if(!mit->m_slots[(void*)m_gameobj])
+				continue;
 
-			vecVertexArray& vertexarrays = m_pMeshObject->GetVertexCache(mat);
-
-			// For each array
-			for (i=0; i<vertexarrays.size(); i++){
-				KX_VertexArray& vertexarray = (*vertexarrays[i]);
+			RAS_MeshSlot *slot = *mit->m_slots[(void*)m_gameobj];
+			RAS_MeshSlot::iterator it;
 
+			// for each array
+			for(slot->begin(it); !slot->end(it); slot->next(it)) {
 				//	For each vertex
-				for (j=0; j<vertexarray.size(); j++){
-					RAS_TexVert& v = vertexarray[j];
+				for(i=it.startvertex; i<it.endvertex; i++) {
+					RAS_TexVert& v = it.vertex[i];
 					co = m_bmesh->mvert[v.getOrigIndex()].co;
 					v.SetXYZ(MT_Point3(co));
 				}
@@ -90,7 +90,17 @@ BL_MeshDeformer::~BL_MeshDeformer()
 		delete [] m_transverts;
 	if (m_transnors)
 		delete [] m_transnors;
-};
+}
+ 
+void BL_MeshDeformer::Relink(GEN_Map<class GEN_HashedPtr, void*>*map)
+{
+	void **h_obj = (*map)[m_gameobj];
+
+	if (h_obj)
+		m_gameobj = (BL_DeformableGameObject*)(*h_obj);
+	else
+		m_gameobj = NULL;
+}
 
 /**
  * @warning This function is expensive!
@@ -101,41 +111,41 @@ void BL_MeshDeformer::RecalcNormals()
 	 * gives area-weight normals which often look better anyway, and use
 	 * GL_NORMALIZE so we don't have to do per vertex normalization either
 	 * since the GPU can do it faster */
-	size_t i, j;
+	list<RAS_MeshMaterial>::iterator mit;
+	RAS_MeshSlot::iterator it;
+	size_t i;
 
 	/* set vertex normals to zero */
 	memset(m_transnors, 0, sizeof(float)*3*m_bmesh->totvert);
 
 	/* add face normals to vertices. */
-	for(RAS_MaterialBucket::Set::iterator mit = m_pMeshObject->GetFirstMaterial();
+	for(mit = m_pMeshObject->GetFirstMaterial();
 		mit != m_pMeshObject->GetLastMaterial(); ++ mit) {
-		RAS_IPolyMaterial *mat = (*mit)->GetPolyMaterial();
+		if(!mit->m_slots[(void*)m_gameobj])
+			continue;
 
-		const vecIndexArrays& indexarrays = m_pMeshObject->GetIndexCache(mat);
-		vecVertexArray& vertexarrays = m_pMeshObject->GetVertexCache(mat);
+		RAS_MeshSlot *slot = *mit->m_slots[(void*)m_gameobj];
 
-		for (i=0; i<indexarrays.size(); i++) {
-			KX_VertexArray& vertexarray = (*vertexarrays[i]);
-			const KX_IndexArray& indexarray = (*indexarrays[i]);
-			int nvert = mat->UsesTriangles()? 3: 4;
+		for(slot->begin(it); !slot->end(it); slot->next(it)) {
+			int nvert = (int)it.array->m_type;
 
-			for(j=0; j<indexarray.size(); j+=nvert) {
-				RAS_TexVert& v1 = vertexarray[indexarray[j]];
-				RAS_TexVert& v2 = vertexarray[indexarray[j+1]];
-				RAS_TexVert& v3 = vertexarray[indexarray[j+2]];
+			for(i=0; i<it.totindex; i+=nvert) {
+				RAS_TexVert& v1 = it.vertex[it.index[i]];
+				RAS_TexVert& v2 = it.vertex[it.index[i+1]];
+				RAS_TexVert& v3 = it.vertex[it.index[i+2]];
 				RAS_TexVert *v4 = NULL;
 
-				const float *co1 = v1.getLocalXYZ();
-				const float *co2 = v2.getLocalXYZ();
-				const float *co3 = v3.getLocalXYZ();
+				const float *co1 = v1.getXYZ();
+				const float *co2 = v2.getXYZ();
+				const float *co3 = v3.getXYZ();
 				const float *co4 = NULL;
 				
 				/* compute face normal */
 				float fnor[3], n1[3], n2[3];
 
 				if(nvert == 4) {
-					v4 = &vertexarray[indexarray[j+3]];
-					co4 = v4->getLocalXYZ();
+					v4 = &it.vertex[it.index[i+3]];
+					co4 = v4->getXYZ();
 
 					n1[0]= co1[0]-co3[0];
 					n1[1]= co1[1]-co3[1];
@@ -174,7 +184,7 @@ void BL_MeshDeformer::RecalcNormals()
 				}
 
 				/* in case of flat - just assign, the vertices are split */
-				if(v1.getFlag() & TV_CALCFACENORMAL) {
+				if(v1.getFlag() & RAS_TexVert::FLAT) {
 					v1.SetNormal(fnor);
 					v2.SetNormal(fnor);
 					v3.SetNormal(fnor);
@@ -186,19 +196,18 @@ void BL_MeshDeformer::RecalcNormals()
 	}
 
 	/* assign smooth vertex normals */
-	for(RAS_MaterialBucket::Set::iterator mit = m_pMeshObject->GetFirstMaterial();
+	for(mit = m_pMeshObject->GetFirstMaterial();
 		mit != m_pMeshObject->GetLastMaterial(); ++ mit) {
-		RAS_IPolyMaterial *mat = (*mit)->GetPolyMaterial();
+		if(!mit->m_slots[(void*)m_gameobj])
+			continue;
 
-		vecVertexArray& vertexarrays = m_pMeshObject->GetVertexCache(mat);
+		RAS_MeshSlot *slot = *mit->m_slots[(void*)m_gameobj];
 
-		for (i=0; i<vertexarrays.size(); i++) {
-			KX_VertexArray& vertexarray = (*vertexarrays[i]);
-			
-			for(j=0; j<vertexarray.size(); j++) {
-				RAS_TexVert& v = vertexarray[j];
+		for(slot->begin(it); !slot->end(it); slot->next(it)) {
+			for(i=it.startvertex; i<it.endvertex; i++) {
+				RAS_TexVert& v = it.vertex[i];
 
-				if(!(v.getFlag() & TV_CALCFACENORMAL))
+				if(!(v.getFlag() & RAS_TexVert::FLAT))
 					v.SetNormal(m_transnors[v.getOrigIndex()]); //.safe_normalized()
 			}
 		}
@@ -219,4 +228,4 @@ void BL_MeshDeformer::VerifyStorage()
 		m_tvtot = m_bmesh->totvert;
 	}
 }
- 
+
diff --git a/source/gameengine/Converter/BL_MeshDeformer.h b/source/gameengine/Converter/BL_MeshDeformer.h
index e9f7f0b192f..9d3d2e78123 100644
--- a/source/gameengine/Converter/BL_MeshDeformer.h
+++ b/source/gameengine/Converter/BL_MeshDeformer.h
@@ -47,7 +47,7 @@ class BL_MeshDeformer : public RAS_Deformer
 public:
 	void VerifyStorage();
 	void RecalcNormals();
-	virtual void Relink(GEN_Map<class GEN_HashedPtr, void*>*map){};
+	virtual void Relink(GEN_Map<class GEN_HashedPtr, void*>*map);
 	BL_MeshDeformer(BL_DeformableGameObject *gameobj,
 					struct Object* obj,
 					class BL_SkinMeshObject *meshobj ):
@@ -67,6 +67,7 @@ public:
 	virtual	RAS_Deformer*	GetReplica(){return NULL;};
 	struct Mesh* GetMesh() { return m_bmesh; };
 	//	virtual void InitDeform(double time){};
+
 protected:
 	class BL_SkinMeshObject*	m_pMeshObject;
 	struct Mesh*				m_bmesh;
diff --git a/source/gameengine/Converter/BL_ShapeActionActuator.cpp b/source/gameengine/Converter/BL_ShapeActionActuator.cpp
index 942e3b502e0..799b6b74b66 100644
--- a/source/gameengine/Converter/BL_ShapeActionActuator.cpp
+++ b/source/gameengine/Converter/BL_ShapeActionActuator.cpp
@@ -134,7 +134,6 @@ void BL_ShapeActionActuator::BlendShape(Key* key, float srcweight)
 {
 	vector<float>::const_iterator it;
 	float dstweight;
-	int i;
 	KeyBlock *kb;
 	
 	dstweight = 1.0F - srcweight;
diff --git a/source/gameengine/Converter/BL_ShapeDeformer.cpp b/source/gameengine/Converter/BL_ShapeDeformer.cpp
index b2e54539b19..236cd1a6667 100644
--- a/source/gameengine/Converter/BL_ShapeDeformer.cpp
+++ b/source/gameengine/Converter/BL_ShapeDeformer.cpp
@@ -111,10 +111,7 @@ bool BL_ShapeDeformer::ExecuteShapeDrivers(void)
 		int type;
 		// the shape drivers use the bone matrix as input. Must 
 		// update the matrix now
-		Object* par_arma = m_armobj->GetArmatureObject();
 		m_armobj->ApplyPose();
-		where_is_pose( par_arma ); 
-		PoseApplied(true);
 
 		for (it=m_shapeDrivers.begin(); it!=m_shapeDrivers.end(); it++) {
 			// no need to set a specific time: this curve has a driver
diff --git a/source/gameengine/Converter/BL_ShapeDeformer.h b/source/gameengine/Converter/BL_ShapeDeformer.h
index 5f0188e3a42..1465bb01e22 100644
--- a/source/gameengine/Converter/BL_ShapeDeformer.h
+++ b/source/gameengine/Converter/BL_ShapeDeformer.h
@@ -43,17 +43,6 @@ struct IpoCurve;
 class BL_ShapeDeformer : public BL_SkinDeformer  
 {
 public:
-	virtual void Relink(GEN_Map<class GEN_HashedPtr, void*>*map)
-	{
-		void **h_obj = (*map)[m_gameobj];
-		if (h_obj){
-			m_gameobj = (BL_DeformableGameObject*)(*h_obj);
-		}
-		else
-			m_gameobj=NULL;
-		// relink the underlying skin deformer
-		BL_SkinDeformer::Relink(map);
-	};
 	BL_ShapeDeformer(BL_DeformableGameObject *gameobj,
                      Object *bmeshobj,
                      BL_SkinMeshObject *mesh)
diff --git a/source/gameengine/Converter/BL_SkinDeformer.cpp b/source/gameengine/Converter/BL_SkinDeformer.cpp
index f96c40c098f..d8e7a9cdadf 100644
--- a/source/gameengine/Converter/BL_SkinDeformer.cpp
+++ b/source/gameengine/Converter/BL_SkinDeformer.cpp
@@ -99,9 +99,26 @@ BL_SkinDeformer::~BL_SkinDeformer()
 		m_armobj->Release();
 }
 
+void BL_SkinDeformer::Relink(GEN_Map<class GEN_HashedPtr, void*>*map)
+{
+	if (m_armobj) {
+		void **h_obj = (*map)[m_armobj];
+
+		if (h_obj)
+			SetArmature( (BL_ArmatureObject*)(*h_obj) );
+		else
+			m_armobj=NULL;
+	}
+
+	BL_MeshDeformer::Relink(map);
+}
+
 bool BL_SkinDeformer::Apply(RAS_IPolyMaterial *mat)
 {
-	size_t i, j;
+	RAS_MeshSlot::iterator it;
+	RAS_MeshMaterial *mmat;
+	RAS_MeshSlot *slot;
+	size_t i;
 
 	// update the vertex in m_transverts
 	Update();
@@ -110,16 +127,18 @@ bool BL_SkinDeformer::Apply(RAS_IPolyMaterial *mat)
 	// Duplicated objects with more than one ploymaterial (=multiple mesh slot per object)
 	// share the same mesh (=the same cache). As the rendering is done per polymaterial
 	// cycling through the objects, the entire mesh cache cannot be updated in one shot.
-	vecVertexArray& vertexarrays = m_pMeshObject->GetVertexCache(mat);
+	mmat = m_pMeshObject->GetMeshMaterial(mat);
+	if(!mmat->m_slots[(void*)m_gameobj])
+		return true;
 
-	// For each array
-	for (i=0; i<vertexarrays.size(); i++) {
-		KX_VertexArray& vertexarray = (*vertexarrays[i]);
+	slot = *mmat->m_slots[(void*)m_gameobj];
 
-		// For each vertex
+	// for each array
+	for(slot->begin(it); !slot->end(it); slot->next(it)) {
+		// for each vertex
 		// copy the untransformed data from the original mvert
-		for (j=0; j<vertexarray.size(); j++) {
-			RAS_TexVert& v = vertexarray[j];
+		for(i=it.startvertex; i<it.endvertex; i++) {
+			RAS_TexVert& v = it.vertex[i];
 			v.SetXYZ(m_transverts[v.getOrigIndex()]);
 		}
 	}
@@ -147,14 +166,10 @@ bool BL_SkinDeformer::Update(void)
 	/* See if the armature has been updated for this frame */
 	if (PoseUpdated()){	
 		float obmat[4][4];	// the original object matrice 
-		
+
 		/* XXX note: where_is_pose() (from BKE_armature.h) calculates all matrices needed to start deforming */
 		/* but it requires the blender object pointer... */
 		Object* par_arma = m_armobj->GetArmatureObject();
-		if (!PoseApplied()){
-			m_armobj->ApplyPose();
-			where_is_pose( par_arma ); 
-		}
 
 		/* store verts locally */
 		VerifyStorage();
@@ -163,6 +178,8 @@ bool BL_SkinDeformer::Update(void)
 		for (int v =0; v<m_bmesh->totvert; v++)
 			VECCOPY(m_transverts[v], m_bmesh->mvert[v].co);
 
+		m_armobj->ApplyPose();
+
 		// save matrix first
 		Mat4CpyMat4(obmat, m_objMesh->obmat);
 		// set reference matrix
@@ -179,11 +196,11 @@ bool BL_SkinDeformer::Update(void)
 
 		/* Update the current frame */
 		m_lastArmaUpdate=m_armobj->GetLastFrame();
-		/* reset for next frame */
-		PoseApplied(false);
+
 		/* indicate that the m_transverts and normals are up to date */
 		return true;
 	}
+
 	return false;
 }
 
diff --git a/source/gameengine/Converter/BL_SkinDeformer.h b/source/gameengine/Converter/BL_SkinDeformer.h
index d3fc5ae2a81..e08de8c478a 100644
--- a/source/gameengine/Converter/BL_SkinDeformer.h
+++ b/source/gameengine/Converter/BL_SkinDeformer.h
@@ -50,17 +50,7 @@ class BL_SkinDeformer : public BL_MeshDeformer
 {
 public:
 //	void SetArmatureController (BL_ArmatureController *cont);
-	virtual void Relink(GEN_Map<class GEN_HashedPtr, void*>*map)
-	{
-		if (m_armobj){
-			void **h_obj = (*map)[m_armobj];
-			if (h_obj){
-				SetArmature( (BL_ArmatureObject*)(*h_obj) );
-			}
-			else
-				m_armobj=NULL;
-		}
-	}
+	virtual void Relink(GEN_Map<class GEN_HashedPtr, void*>*map);
 	void SetArmature (class BL_ArmatureObject *armobj);
 
 	BL_SkinDeformer(BL_DeformableGameObject *gameobj,
@@ -81,10 +71,6 @@ public:
 	virtual ~BL_SkinDeformer();
 	bool Update (void);
 	bool Apply (class RAS_IPolyMaterial *polymat);
-	bool PoseApplied()
-		{ return m_poseApplied; }
-	void PoseApplied(bool applied)
-		{ m_poseApplied = applied; }
 	bool PoseUpdated(void)
 		{ 
 			if (m_armobj && m_lastArmaUpdate!=m_armobj->GetLastFrame()) {
diff --git a/source/gameengine/Converter/BL_SkinMeshObject.cpp b/source/gameengine/Converter/BL_SkinMeshObject.cpp
index fa215df1e1c..4f9f1a434b5 100644
--- a/source/gameengine/Converter/BL_SkinMeshObject.cpp
+++ b/source/gameengine/Converter/BL_SkinMeshObject.cpp
@@ -28,42 +28,69 @@
  * Deformer that supports armature skinning
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #ifdef WIN32
 #pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
 #endif //WIN32
-#include "RAS_IPolygonMaterial.h"
-#include "BL_SkinMeshObject.h"
-#include "BL_DeformableGameObject.h"
+
+#include "MEM_guardedalloc.h"
+
+#include "DNA_key_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
-#include "KX_GameObject.h"
+
 #include "RAS_BucketManager.h"
+#include "RAS_IPolygonMaterial.h"
 
-//void BL_SkinMeshObject::Bucketize(double* oglmatrix,void* clientobj,bool useObjectColor,const MT_Vector4& rgbavec,RAS_BucketManager* bucketmgr)
-void BL_SkinMeshObject::Bucketize(double* oglmatrix,void* clientobj,bool useObjectColor,const MT_Vector4& rgbavec)
-{
+#include "KX_GameObject.h"
 
-	KX_MeshSlot ms;
-	ms.m_clientObj = clientobj;
-	ms.m_mesh = this;
-	ms.m_OpenGLMatrix = oglmatrix;
-	ms.m_bObjectColor = useObjectColor;
-	ms.m_RGBAcolor = rgbavec;
-	ms.m_pDeformer = ((BL_DeformableGameObject*)clientobj)->m_pDeformer;
-	
-	for (RAS_MaterialBucket::Set::iterator it = m_materials.begin();it!=m_materials.end();it++)
+#include "BL_SkinMeshObject.h"
+#include "BL_DeformableGameObject.h"
+
+BL_SkinMeshObject::BL_SkinMeshObject(Mesh* mesh, int lightlayer)
+ : RAS_MeshObject (mesh, lightlayer)
+{ 
+	m_bDeformed = true;
+
+	if (m_mesh && m_mesh->key)
 	{
+		KeyBlock *kb;
+		int count=0;
+		// initialize weight cache for shape objects
+		// count how many keys in this mesh
+		for(kb= (KeyBlock*)m_mesh->key->block.first; kb; kb= (KeyBlock*)kb->next)
+			count++;
+		m_cacheWeightIndex.resize(count,-1);
+	}
+}
 
-		RAS_MaterialBucket* materialbucket = (*it);
+BL_SkinMeshObject::~BL_SkinMeshObject()
+{
+	if (m_mesh && m_mesh->key) 
+	{
+		KeyBlock *kb;
+		// remove the weight cache to avoid memory leak 
+		for(kb= (KeyBlock*)m_mesh->key->block.first; kb; kb= (KeyBlock*)kb->next) {
+			if(kb->weights) 
+				MEM_freeN(kb->weights);
+			kb->weights= NULL;
+		}
+	}
+}
 
-//		KX_ArrayOptimizer* oa = GetArrayOptimizer(materialbucket->GetPolyMaterial());
-		materialbucket->SetMeshSlot(ms);
+void BL_SkinMeshObject::UpdateBuckets(void* clientobj,double* oglmatrix,bool useObjectColor,const MT_Vector4& rgbavec, bool visible, bool culled)
+{
+	list<RAS_MeshMaterial>::iterator it;
+	list<RAS_MeshSlot*>::iterator sit;
+
+	for(it = m_materials.begin();it!=m_materials.end();++it) {
+		if(!it->m_slots[clientobj])
+			continue;
+
+		RAS_MeshSlot *slot = *it->m_slots[clientobj];
+		slot->m_pDeformer = ((BL_DeformableGameObject*)clientobj)->m_pDeformer;
 	}
 
+	RAS_MeshObject::UpdateBuckets(clientobj, oglmatrix, useObjectColor, rgbavec, visible, culled);
 }
 
 static int get_def_index(Object* ob, const char* vgroup)
@@ -74,6 +101,7 @@ static int get_def_index(Object* ob, const char* vgroup)
 	for (curdef = (bDeformGroup*)ob->defbase.first; curdef; curdef=(bDeformGroup*)curdef->next, index++)
 		if (!strcmp(curdef->name, vgroup))
 			return index;
+
 	return -1;
 }
 
diff --git a/source/gameengine/Converter/BL_SkinMeshObject.h b/source/gameengine/Converter/BL_SkinMeshObject.h
index c21fb64204b..8544a2b958c 100644
--- a/source/gameengine/Converter/BL_SkinMeshObject.h
+++ b/source/gameengine/Converter/BL_SkinMeshObject.h
@@ -33,62 +33,27 @@
 #ifdef WIN32
 #pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
 #endif //WIN32
-#include "MEM_guardedalloc.h"
+
 #include "RAS_MeshObject.h"
 #include "RAS_Deformer.h"
 #include "RAS_IPolygonMaterial.h"
 
 #include "BL_MeshDeformer.h"
 
-#include "DNA_mesh_types.h"
-#include "DNA_key_types.h"
-#include "DNA_meshdata_types.h"
-
 class BL_SkinMeshObject : public RAS_MeshObject
 {
-
-//	enum	{	BUCKET_MAX_INDICES = 16384};//2048};//8192};
-//	enum	{	BUCKET_MAX_TRIANGLES = 4096};
-
 protected:
 	vector<int>				 m_cacheWeightIndex;
 
 public:
-	void Bucketize(double* oglmatrix,void* clientobj,bool useObjectColor,const MT_Vector4& rgbavec);
-//	void Bucketize(double* oglmatrix,void* clientobj,bool useObjectColor,const MT_Vector4& rgbavec,class RAS_BucketManager* bucketmgr);
+	BL_SkinMeshObject(Mesh* mesh, int lightlayer);
+	~BL_SkinMeshObject();
 
-	BL_SkinMeshObject(Mesh* mesh, int lightlayer) : RAS_MeshObject (mesh, lightlayer)
-	{ 
-		m_class = 1;
-		if (m_mesh && m_mesh->key)
-		{
-			KeyBlock *kb;
-			int count=0;
-			// initialize weight cache for shape objects
-			// count how many keys in this mesh
-			for(kb= (KeyBlock*)m_mesh->key->block.first; kb; kb= (KeyBlock*)kb->next)
-				count++;
-			m_cacheWeightIndex.resize(count,-1);
-		}
-	};
-
-	virtual ~BL_SkinMeshObject()
-	{
-		if (m_mesh && m_mesh->key) 
-		{
-			KeyBlock *kb;
-			// remove the weight cache to avoid memory leak 
-			for(kb= (KeyBlock*)m_mesh->key->block.first; kb; kb= (KeyBlock*)kb->next) {
-				if(kb->weights) 
-					MEM_freeN(kb->weights);
-				kb->weights= NULL;
-			}
-		}
-	};
+	void UpdateBuckets(void* clientobj, double* oglmatrix,
+		bool useObjectColor, const MT_Vector4& rgbavec, bool visible, bool culled);
 	
 	// for shape keys, 
 	void CheckWeightCache(struct Object* obj);
-
 };
 
 #endif
diff --git a/source/gameengine/Converter/CMakeLists.txt b/source/gameengine/Converter/CMakeLists.txt
index adb7304b10e..217bdb30907 100644
--- a/source/gameengine/Converter/CMakeLists.txt
+++ b/source/gameengine/Converter/CMakeLists.txt
@@ -64,6 +64,7 @@ SET(INC
   ../../../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/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
index de91bce2ab1..1f5b578d441 100644
--- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
+++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
@@ -184,20 +184,21 @@ bool KX_BlenderSceneConverter::TryAndLoadNewFile()
 	return result;
 }
 
-
+Scene *KX_BlenderSceneConverter::GetBlenderSceneForName(const STR_String& name)
+{
+	Scene *sce;
 
 	/**
 	 * Find the specified scene by name, or the first
 	 * scene if nothing matches (shouldn't happen).
 	 */
-static struct Scene *GetSceneForName2(struct Main *maggie, const STR_String& scenename) {
-	Scene *sce;
 
-	for (sce= (Scene*) maggie->scene.first; sce; sce= (Scene*) sce->id.next)
-		if (scenename == (sce->id.name+2))
+	for (sce= (Scene*) m_maggie->scene.first; sce; sce= (Scene*) sce->id.next)
+		if (name == (sce->id.name+2))
 			return sce;
 
-	return (Scene*) maggie->scene.first;
+	return (Scene*)m_maggie->scene.first;
+
 }
 #include "KX_PythonInit.h"
 
@@ -258,7 +259,7 @@ void KX_BlenderSceneConverter::ConvertScene(const STR_String& scenename,
 											class RAS_ICanvas* canvas)
 {
 	//find out which physics engine
-	Scene *blenderscene = GetSceneForName2(m_maggie, scenename);
+	Scene *blenderscene = GetBlenderSceneForName(scenename);
 
 	e_PhysicsEngine physics_engine = UseBullet;
 	// hook for registration function during conversion.
@@ -818,7 +819,7 @@ void	KX_BlenderSceneConverter::WritePhysicsObjectToAnimationIpo(int frameNumber)
 			KX_GameObject* gameObj = (KX_GameObject*)parentList->GetValue(g);
 			if (gameObj->IsDynamic())
 			{
-				KX_IPhysicsController* physCtrl = gameObj->GetPhysicsController();
+				//KX_IPhysicsController* physCtrl = gameObj->GetPhysicsController();
 				
 				Object* blenderObject = FindBlenderObject(gameObj);
 				if (blenderObject)
@@ -846,7 +847,7 @@ void	KX_BlenderSceneConverter::WritePhysicsObjectToAnimationIpo(int frameNumber)
 
 
 
-					const MT_Vector3& scale = gameObj->NodeGetWorldScaling();
+					//const MT_Vector3& scale = gameObj->NodeGetWorldScaling();
 					const MT_Point3& position = gameObj->NodeGetWorldPosition();
 					
 					Ipo* ipo = blenderObject->ipo;
@@ -974,7 +975,7 @@ void	KX_BlenderSceneConverter::TestHandlesPhysicsObjectToAnimationIpo()
 			KX_GameObject* gameObj = (KX_GameObject*)parentList->GetValue(g);
 			if (gameObj->IsDynamic())
 			{
-				KX_IPhysicsController* physCtrl = gameObj->GetPhysicsController();
+				//KX_IPhysicsController* physCtrl = gameObj->GetPhysicsController();
 				
 				Object* blenderObject = FindBlenderObject(gameObj);
 				if (blenderObject)
@@ -1002,8 +1003,8 @@ void	KX_BlenderSceneConverter::TestHandlesPhysicsObjectToAnimationIpo()
 
 
 
-					const MT_Vector3& scale = gameObj->NodeGetWorldScaling();
-					const MT_Point3& position = gameObj->NodeGetWorldPosition();
+					//const MT_Vector3& scale = gameObj->NodeGetWorldScaling();
+					//const MT_Point3& position = gameObj->NodeGetWorldPosition();
 					
 					Ipo* ipo = blenderObject->ipo;
 					if (ipo)
diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.h b/source/gameengine/Converter/KX_BlenderSceneConverter.h
index e5d6ccc5caf..2317e952a0a 100644
--- a/source/gameengine/Converter/KX_BlenderSceneConverter.h
+++ b/source/gameengine/Converter/KX_BlenderSceneConverter.h
@@ -45,6 +45,7 @@ class BL_Material;
 struct IpoCurve;
 struct Main;
 struct SpaceIpo;
+struct Scene;
 
 class KX_BlenderSceneConverter : public KX_ISceneConverter
 {
@@ -151,6 +152,7 @@ public:
 	virtual void SetGLSLMaterials(bool val);
 	virtual bool GetGLSLMaterials();
 
+	struct Scene* GetBlenderSceneForName(const STR_String& name);
 };
 
 #endif //__KX_BLENDERSCENECONVERTER_H
diff --git a/source/gameengine/Converter/KX_ConvertActuators.cpp b/source/gameengine/Converter/KX_ConvertActuators.cpp
index 7e976beaf44..321fc325bb8 100644
--- a/source/gameengine/Converter/KX_ConvertActuators.cpp
+++ b/source/gameengine/Converter/KX_ConvertActuators.cpp
@@ -1064,7 +1064,7 @@ void BL_ConvertActuators(char* maggiename,
 			{
 				bParentActuator *parAct = (bParentActuator *) bact->data;
 				int mode = KX_ParentActuator::KX_PARENT_NODEF;
-				KX_GameObject *tmpgob;
+				KX_GameObject *tmpgob = NULL;
 
 				switch(parAct->type)
 				{
diff --git a/source/gameengine/Converter/Makefile b/source/gameengine/Converter/Makefile
index f312fc13221..4dd63e428bd 100644
--- a/source/gameengine/Converter/Makefile
+++ b/source/gameengine/Converter/Makefile
@@ -51,6 +51,7 @@ CPPFLAGS += -I../../blender/include
 CPPFLAGS += -I../../blender/blenlib
 CPPFLAGS += -I../../blender/blenkernel
 CPPFLAGS += -I../../blender/render/extern/include
+CPPFLAGS += -I../../blender/gpu
 CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
 CPPFLAGS += -I../Expressions -I../Rasterizer -I../GameLogic
 CPPFLAGS += -I../Ketsji -I../BlenderRoutines -I../SceneGraph
diff --git a/source/gameengine/Converter/SConscript b/source/gameengine/Converter/SConscript
index f5e382b471e..3be352c568b 100644
--- a/source/gameengine/Converter/SConscript
+++ b/source/gameengine/Converter/SConscript
@@ -16,7 +16,7 @@ incs += ' #source/gameengine/Expressions #source/gameengine/Network #source/game
 incs += ' #source/gameengine/Physics/common #source/gameengine/Physics/Bullet #source/gameengine/Physics/BlOde'
 incs += ' #source/gameengine/Physics/Dummy #source/gameengine/Physics/Sumo'
 incs += ' #source/gameengine/Physics/Sumo/Fuzzics/include #source/gameengine/Network/LoopBackNetwork'
-incs += ' #source/blender/misc #source/blender/blenloader'
+incs += ' #source/blender/misc #source/blender/blenloader #source/blender/gpu'
 
 incs += ' ' + env['BF_PYTHON_INC']
 incs += ' ' + env['BF_SOLID_INC']
diff --git a/source/gameengine/GamePlayer/common/CMakeLists.txt b/source/gameengine/GamePlayer/common/CMakeLists.txt
index e26f8b9d69a..0c6c4179e2d 100644
--- a/source/gameengine/GamePlayer/common/CMakeLists.txt
+++ b/source/gameengine/GamePlayer/common/CMakeLists.txt
@@ -30,7 +30,6 @@ SET(SRC
   GPC_Engine.cpp
   GPC_KeyboardDevice.cpp
   GPC_MouseDevice.cpp
-  GPC_PolygonMaterial.cpp
   GPC_RawImage.cpp
   GPC_RawLoadDotBlendArray.cpp
   GPC_RawLogoArrays.cpp
@@ -69,6 +68,7 @@ SET(INC
   ../../../../source/gameengine/GamePlayer/ghost
   ../../../../source/blender/misc
   ../../../../source/blender/blenloader
+  ../../../../source/blender/gpu
   ../../../../extern/glew/include
   ${PYTHON_INC}
   ${SOLID_INC}
diff --git a/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp b/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
index a64c85f6c17..78d8eaf2aa3 100644
--- a/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
+++ b/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
@@ -27,141 +27,256 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#include <assert.h>
-
-#ifdef WIN32
-#pragma warning (disable : 4786)
-#include <windows.h>
-#endif 
-
 #include "GL/glew.h"
 
-#include <iostream>
-
-#include "GPC_RenderTools.h"
-
 #include "RAS_IRenderTools.h"
 #include "RAS_IRasterizer.h"
 #include "RAS_LightObject.h"
 #include "RAS_ICanvas.h"
 #include "RAS_GLExtensionManager.h"
 
-// next two includes/dependencies come from the shadow feature
-// it needs the gameobject and the sumo physics scene for a raycast
 #include "KX_GameObject.h"
-
-#include "GPC_PolygonMaterial.h"
 #include "KX_PolygonMaterial.h"
-#include "Value.h"
-
-//#include "KX_BlenderGL.h" // for text printing
-//#include "KX_BlenderClientObject.h"
-#include "STR_String.h"
-#include "RAS_BucketManager.h" // for polymaterial (needed for textprinting)
-
-
-// Blender includes
-/* This list includes only data type definitions */
-#include "DNA_object_types.h"
-#include "DNA_material_types.h"
-#include "DNA_image_types.h"
-#include "DNA_lamp_types.h"
-#include "DNA_group_types.h"
-#include "DNA_scene_types.h"
-#include "DNA_camera_types.h"
-#include "DNA_property_types.h"
-#include "DNA_text_types.h"
-#include "DNA_sensor_types.h"
-#include "DNA_controller_types.h"
-#include "DNA_actuator_types.h"
-#include "DNA_mesh_types.h"
-#include "DNA_meshdata_types.h"
-#include "DNA_view3d_types.h"
-#include "DNA_world_types.h"
-
-#include "BKE_global.h"
-#include "BKE_image.h"
-#include "BKE_bmfont.h"
-#include "BKE_bmfont_types.h"
-#include "BKE_main.h"
-
-#include "IMB_imbuf_types.h"
-// End of Blender includes
-
-#include "KX_Scene.h"
+#include "KX_BlenderMaterial.h"
 #include "KX_RayCast.h"
 #include "KX_IPhysicsController.h"
+
 #include "PHY_IPhysicsEnvironment.h"
-#include "KX_BlenderMaterial.h"
+
+#include "STR_String.h"
+
+#include "GPU_draw.h"
+
+#include "BKE_bmfont.h" // for text printing
+#include "BKE_bmfont_types.h"
+
+#include "GPC_RenderTools.h"
+
+unsigned int GPC_RenderTools::m_numgllights;
 
 GPC_RenderTools::GPC_RenderTools()
 {
 	m_font = BMF_GetFont(BMF_kHelvetica10);
+
 	glGetIntegerv(GL_MAX_LIGHTS, (GLint*) &m_numgllights);
 	if (m_numgllights < 8)
 		m_numgllights = 8;
 }
 
-
 GPC_RenderTools::~GPC_RenderTools()
 {
 }
 
+void GPC_RenderTools::BeginFrame(RAS_IRasterizer* rasty)
+{
+	m_clientobject = NULL;
+	m_lastlightlayer = -1;
+	m_lastlighting = false;
+	DisableOpenGLLights();
+}
 
 void GPC_RenderTools::EndFrame(RAS_IRasterizer* rasty)
 {
 }
 
+/* ProcessLighting performs lighting on objects. the layer is a bitfield that
+ * contains layer information. There are 20 'official' layers in blender. A
+ * light is applied on an object only when they are in the same layer. OpenGL
+ * has a maximum of 8 lights (simultaneous), so 20 * 8 lights are possible in
+ * a scene. */
 
-void GPC_RenderTools::BeginFrame(RAS_IRasterizer* rasty)
+void GPC_RenderTools::ProcessLighting(int layer, const MT_Transform& viewmat)
 {
-	m_clientobject=NULL;
-	m_modified=true;
-	DisableOpenGLLights();
+	if(m_lastlightlayer == layer)
+		return;
 
-}
+	m_lastlightlayer = layer;
 
-int GPC_RenderTools::ProcessLighting(int layer)
-{
-	int result = false;
+	bool enable = false;
 
-	if (layer < 0)
-	{
-		DisableOpenGLLights();
-		result = false;
-	} else
+	if (layer >= 0)
 	{
 		if (m_clientobject)
-		{	
-			if (applyLights(layer))
-			{
-				EnableOpenGLLights();
-				result = true;
-			} else
-			{
-				DisableOpenGLLights();
-				result = false;
-			}
+		{
+			if (layer == RAS_LIGHT_OBJECT_LAYER)
+				layer = static_cast<KX_GameObject*>(m_clientobject)->GetLayer();
+
+			enable = applyLights(layer, viewmat);
 		}
 	}
-	return result;
+
+	if(enable)
+		EnableOpenGLLights();
+	else
+		DisableOpenGLLights();
 }
 
 void GPC_RenderTools::EnableOpenGLLights()
 {
+	if(m_lastlighting == true)
+		return;
+
 	glEnable(GL_LIGHTING);
 	glEnable(GL_COLOR_MATERIAL);
-	glColorMaterial(GL_FRONT_AND_BACK,GL_DIFFUSE);
+
+	glColorMaterial(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE);
+	glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, true);
 	if (GLEW_EXT_separate_specular_color || GLEW_VERSION_1_2)
 		glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL, GL_SEPARATE_SPECULAR_COLOR);
+	
+	m_lastlighting = true;
 }
 
-void GPC_RenderTools::RenderText2D(RAS_TEXT_RENDER_MODE mode, 
-								   const char* text, 
-								   int xco, 
-								   int yco, 
-								   int width, 
-								   int height)
+void GPC_RenderTools::DisableOpenGLLights()
+{
+	if(m_lastlighting == false)
+		return;
+
+	glDisable(GL_LIGHTING);
+	glDisable(GL_COLOR_MATERIAL);
+
+	m_lastlighting = false;
+}
+
+
+void GPC_RenderTools::SetClientObject(RAS_IRasterizer *rasty, void* obj)
+{
+	if (m_clientobject != obj)
+	{
+		bool ccw = (obj == NULL || !((KX_GameObject*)obj)->IsNegativeScaling());
+		rasty->SetFrontFace(ccw);
+
+		m_clientobject = obj;
+	}
+}
+
+bool GPC_RenderTools::RayHit(KX_ClientObjectInfo* client, KX_RayCast* result, void * const data)
+{
+	double* const oglmatrix = (double* const) data;
+	MT_Point3 resultpoint(result->m_hitPoint);
+	MT_Vector3 resultnormal(result->m_hitNormal);
+	MT_Vector3 left(oglmatrix[0],oglmatrix[1],oglmatrix[2]);
+	MT_Vector3 dir = -(left.cross(resultnormal)).safe_normalized();
+	left = (dir.cross(resultnormal)).safe_normalized();
+	// for the up vector, we take the 'resultnormal' returned by the physics
+	
+	double maat[16]={
+			left[0],        left[1],        left[2], 0,
+				dir[0],         dir[1],         dir[2], 0,
+		resultnormal[0],resultnormal[1],resultnormal[2], 0,
+				0,              0,              0, 1};
+	glTranslated(resultpoint[0],resultpoint[1],resultpoint[2]);
+	//glMultMatrixd(oglmatrix);
+	glMultMatrixd(maat);
+	return true;
+}
+
+void GPC_RenderTools::applyTransform(RAS_IRasterizer* rasty,double* oglmatrix,int objectdrawmode )
+{
+	/* FIXME:
+	blender: intern/moto/include/MT_Vector3.inl:42: MT_Vector3 operator/(const
+	MT_Vector3&, double): Assertion `!MT_fuzzyZero(s)' failed. 
+	
+	Program received signal SIGABRT, Aborted. 
+	[Switching to Thread 16384 (LWP 1519)] 
+	0x40477571 in kill () from /lib/libc.so.6 
+	(gdb) bt 
+	#7  0x08334368 in MT_Vector3::normalized() const () 
+	#8  0x0833e6ec in GPC_RenderTools::applyTransform(RAS_IRasterizer*, double*, int) () 
+	*/
+
+	if (objectdrawmode & RAS_IPolyMaterial::BILLBOARD_SCREENALIGNED ||
+		objectdrawmode & RAS_IPolyMaterial::BILLBOARD_AXISALIGNED)
+	{
+		// rotate the billboard/halo
+		//page 360/361 3D Game Engine Design, David Eberly for a discussion
+		// on screen aligned and axis aligned billboards
+		// assumed is that the preprocessor transformed all billboard polygons
+		// so that their normal points into the positive x direction (1.0 , 0.0 , 0.0)
+		// when new parenting for objects is done, this rotation
+		// will be moved into the object
+		
+		MT_Point3 objpos (oglmatrix[12],oglmatrix[13],oglmatrix[14]);
+		MT_Point3 campos = rasty->GetCameraPosition();
+		MT_Vector3 dir = (campos - objpos).safe_normalized();
+		MT_Vector3 up(0,0,1.0);
+
+		KX_GameObject* gameobj = (KX_GameObject*) this->m_clientobject;
+		// get scaling of halo object
+		MT_Vector3  size = gameobj->GetSGNode()->GetLocalScale();
+		
+		bool screenaligned = (objectdrawmode & RAS_IPolyMaterial::BILLBOARD_SCREENALIGNED)!=0;//false; //either screen or axisaligned
+		if (screenaligned)
+		{
+			up = (up - up.dot(dir) * dir).safe_normalized();
+		} else
+		{
+			dir = (dir - up.dot(dir)*up).safe_normalized();
+		}
+
+		MT_Vector3 left = dir.normalized();
+		dir = (left.cross(up)).normalized();
+
+		// we have calculated the row vectors, now we keep
+		// local scaling into account:
+
+		left *= size[0];
+		dir  *= size[1];
+		up   *= size[2];
+		double maat[16]={
+			left[0], left[1],left[2], 0,
+				dir[0], dir[1],dir[2],0,
+				up[0],up[1],up[2],0,
+				0,0,0,1};
+			glTranslated(objpos[0],objpos[1],objpos[2]);
+			glMultMatrixd(maat);
+			
+	} else
+	{
+		if (objectdrawmode & RAS_IPolyMaterial::SHADOW)
+		{
+			// shadow must be cast to the ground, physics system needed here!
+			MT_Point3 frompoint(oglmatrix[12],oglmatrix[13],oglmatrix[14]);
+			KX_GameObject *gameobj = (KX_GameObject*) this->m_clientobject;
+			MT_Vector3 direction = MT_Vector3(0,0,-1);
+
+			direction.normalize();
+			direction *= 100000;
+
+			MT_Point3 topoint = frompoint + direction;
+
+			KX_Scene* kxscene = (KX_Scene*) m_auxilaryClientInfo;
+			PHY_IPhysicsEnvironment* physics_environment = kxscene->GetPhysicsEnvironment();
+			KX_IPhysicsController* physics_controller = gameobj->GetPhysicsController();
+			
+			KX_GameObject *parent = gameobj->GetParent();
+			if (!physics_controller && parent)
+				physics_controller = parent->GetPhysicsController();
+			if (parent)
+				parent->Release();
+				
+			KX_RayCast::Callback<GPC_RenderTools> callback(this, physics_controller, oglmatrix);
+			if (!KX_RayCast::RayTest(physics_environment, frompoint, topoint, callback))
+			{
+				// couldn't find something to cast the shadow on...
+				glMultMatrixd(oglmatrix);
+			}
+		} else
+		{
+
+			// 'normal' object
+			glMultMatrixd(oglmatrix);
+		}
+	}
+}
+
+
+void GPC_RenderTools::RenderText2D(RAS_TEXT_RENDER_MODE mode,
+										 const char* text,
+										 int xco,
+										 int yco,									 
+										 int width,
+										 int height)
 {
 	STR_String tmpstr(text);
 	int lines;
@@ -234,21 +349,19 @@ void GPC_RenderTools::RenderText2D(RAS_TEXT_RENDER_MODE mode,
 		glDisable(GL_LIGHTING);
 }
 
-/**
- * Copied from KX_BlenderRenderTools.cpp in KX_blenderhook
- * Renders text into a (series of) polygon(s), using a texture font,
- * Each character consists of one polygon (one quad or two triangles)
- */
+/* Render Text renders text into a (series of) polygon, using a texture font,
+ * Each character consists of one polygon (one quad or two triangles) */
+
 void GPC_RenderTools::RenderText(
 	int mode,
 	RAS_IPolyMaterial* polymat,
-	float v1[3], float v2[3], float v3[3], float v4[3])
+	float v1[3], float v2[3], float v3[3], float v4[3], int glattrib)
 {
 	STR_String mytext = ((CValue*)m_clientobject)->GetPropertyText("Text");
 	
 	const unsigned int flag = polymat->GetFlag();
 	struct MTFace* tface = 0;
-	unsigned int* col = 0;
+	unsigned int *col = 0;
 
 	if(flag & RAS_BLENDERMAT) {
 		KX_BlenderMaterial *bl_mat = static_cast<KX_BlenderMaterial*>(polymat);
@@ -259,110 +372,29 @@ void GPC_RenderTools::RenderText(
 		tface = blenderpoly->GetMTFace();
 		col = blenderpoly->GetMCol();
 	}
-		
-	BL_RenderText(mode, mytext, mytext.Length(), tface, col, v1, v2, v3, v4);
-}
-
-
-
-/**
- * Copied from KX_BlenderGL.cpp in KX_blenderhook
- */
-void GPC_RenderTools::BL_RenderText(
-	int mode,
-	const char* textstr,
-	int textlen,
-	struct MTFace* tface,
-	unsigned int* col,
-	float v1[3],float v2[3],float v3[3],float v4[3])
-{
-	struct Image* ima;
-
-	if (mode & TF_BMFONT) {
-			//char string[MAX_PROPSTRING];
-//			float tmat[4][4];
-			int characters, index, character;
-			float centerx, centery, sizex, sizey, transx, transy, movex, movey, advance;
-			
-//			bProperty *prop;
-
-			// string = "Frank van Beek";
-
-			characters = textlen;
-
-			ima = (struct Image*) tface->tpage;
-			if (ima == NULL) {
-				characters = 0;
-			}
-
-			if(!col) glColor3f(1.0f, 1.0f, 1.0f);
-
-			glPushMatrix();
-			for (index = 0; index < characters; index++) {
-				// lets calculate offset stuff
-				character = textstr[index];
-				
-				// space starts at offset 1
-				// character = character - ' ' + 1;
-				
-				matrixGlyph((ImBuf *)ima->ibufs.first, character, & centerx, &centery, &sizex, &sizey, &transx, &transy, &movex, &movey, &advance);
-				
-				glBegin(GL_POLYGON);
-				// printf(" %c %f %f %f %f\n", character, tface->uv[0][0], tface->uv[0][1], );
-				// glTexCoord2f((tface->uv[0][0] - centerx) * sizex + transx, (tface->uv[0][1] - centery) * sizey + transy);
-				glTexCoord2f((tface->uv[0][0] - centerx) * sizex + transx, (tface->uv[0][1] - centery) * sizey + transy);
-
-				if(col) BL_spack(col[0]);
-				// glVertex3fv(v1);
-				glVertex3f(sizex * v1[0] + movex, sizey * v1[1] + movey, v1[2]);
-				
-				glTexCoord2f((tface->uv[1][0] - centerx) * sizex + transx, (tface->uv[1][1] - centery) * sizey + transy);
-				if(col) BL_spack(col[1]);
-				// glVertex3fv(v2);
-				glVertex3f(sizex * v2[0] + movex, sizey * v2[1] + movey, v2[2]);
 	
-				glTexCoord2f((tface->uv[2][0] - centerx) * sizex + transx, (tface->uv[2][1] - centery) * sizey + transy);
-				if(col) BL_spack(col[2]);
-				// glVertex3fv(v3);
-				glVertex3f(sizex * v3[0] + movex, sizey * v3[1] + movey, v3[2]);
-	
-				if(v4) {
-					// glTexCoord2f((tface->uv[3][0] - centerx) * sizex + transx, 1.0 - (1.0 - tface->uv[3][1]) * sizey - transy);
-					glTexCoord2f((tface->uv[3][0] - centerx) * sizex + transx, (tface->uv[3][1] - centery) * sizey + transy);
-					if(col) BL_spack(col[3]);
-					// glVertex3fv(v4);
-					glVertex3f(sizex * v4[0] + movex, sizey * v4[1] + movey, v4[2]);
-				}
-				glEnd();
-
-				glTranslatef(advance, 0.0, 0.0);
-			}
-			glPopMatrix();
-
-		}
+	GPU_render_text(tface, mode, mytext, mytext.Length(), col, v1, v2, v3, v4, glattrib);
 }
 
 
-RAS_IPolyMaterial* GPC_RenderTools::CreateBlenderPolyMaterial(
-			const STR_String &texname,
-			bool ba,const STR_String& matname,int tile,int tilexrep,int tileyrep,int mode,bool transparant, bool zsort,
-			int lightlayer,bool bIsTriangle,void* clientobject,void* tface)
+void GPC_RenderTools::PushMatrix()
 {
-	assert(!"Deprecated");
-/*	return new GPC_PolygonMaterial(texname, ba,matname,tile,tilexrep,tileyrep,
-			mode,transparant,zsort,lightlayer,bIsTriangle,clientobject,tface);
-			*/
-	return NULL;
+	glPushMatrix();
+}
+
+void GPC_RenderTools::PopMatrix()
+{
+	glPopMatrix();
 }
 
 
-int GPC_RenderTools::applyLights(int objectlayer)
+int GPC_RenderTools::applyLights(int objectlayer, const MT_Transform& viewmat)
 {
-// taken from blender source, incompatibility between Blender Object / GameObject	
-
-	int count;
+	// taken from blender source, incompatibility between Blender Object / GameObject	
+	float glviewmat[16];
+	unsigned int count;
 	float vec[4];
-	
+
 	vec[3]= 1.0;
 	
 	for(count=0; count<m_numgllights; count++)
@@ -371,23 +403,20 @@ int GPC_RenderTools::applyLights(int objectlayer)
 	//std::vector<struct	RAS_LightObject*> m_lights;
 	std::vector<struct	RAS_LightObject*>::iterator lit = m_lights.begin();
 
+	viewmat.getValue(glviewmat);
 	
+	glPushMatrix();
+	glLoadMatrixf(glviewmat);
 	for (lit = m_lights.begin(), count = 0; !(lit==m_lights.end()) && count < m_numgllights; ++lit)
 	{
 		RAS_LightObject* lightdata = (*lit);
 		if (lightdata->m_layer & objectlayer)
 		{
-
-			glPushMatrix();
-			glLoadMatrixf(m_viewmat);
-			
-			
 			vec[0] = (*(lightdata->m_worldmatrix))(0,3);
 			vec[1] = (*(lightdata->m_worldmatrix))(1,3);
 			vec[2] = (*(lightdata->m_worldmatrix))(2,3);
 			vec[3] = 1;
 
-
 			if(lightdata->m_type==RAS_LightObject::LIGHT_SUN) {
 				
 				vec[0] = (*(lightdata->m_worldmatrix))(0,2);
@@ -443,141 +472,16 @@ int GPC_RenderTools::applyLights(int objectlayer)
 			}
 			glLightfv((GLenum)(GL_LIGHT0+count), GL_SPECULAR, vec);
 			glEnable((GLenum)(GL_LIGHT0+count));
-			
-			count++;
 
-			glPopMatrix();
+			count++;
 		}
 	}
+	glPopMatrix();
 
 	return count;
 
 }
 
-void GPC_RenderTools::SetClientObject(void* obj)
-{
-	if (m_clientobject != obj)
-	{
-		if (obj == NULL || !((KX_GameObject*)obj)->IsNegativeScaling())
-		{
-			glFrontFace(GL_CCW);
-		} else 
-		{
-			glFrontFace(GL_CW);
-		}
-		m_clientobject = obj;
-		m_modified = true;
-	}
-}
-
-bool GPC_RenderTools::RayHit(KX_ClientObjectInfo* client, KX_RayCast* result, void * const data)
-{
-	double* const oglmatrix = (double* const) data;
-	MT_Point3 resultpoint(result->m_hitPoint);
-	MT_Vector3 resultnormal(result->m_hitNormal);
-	MT_Vector3 left(oglmatrix[0],oglmatrix[1],oglmatrix[2]);
-	MT_Vector3 dir = -(left.cross(resultnormal)).safe_normalized();
-	left = (dir.cross(resultnormal)).safe_normalized();
-	// for the up vector, we take the 'resultnormal' returned by the physics
-	
-	double maat[16]={
-			left[0],        left[1],        left[2], 0,
-				dir[0],         dir[1],         dir[2], 0,
-		resultnormal[0],resultnormal[1],resultnormal[2], 0,
-				0,              0,              0, 1};
-	glTranslated(resultpoint[0],resultpoint[1],resultpoint[2]);
-	//glMultMatrixd(oglmatrix);
-	glMultMatrixd(maat);
-	return true;
-}
-
-void GPC_RenderTools::applyTransform(RAS_IRasterizer* rasty,double* oglmatrix,int objectdrawmode )
-{
-	if (objectdrawmode & RAS_IPolyMaterial::BILLBOARD_SCREENALIGNED ||
-		objectdrawmode & RAS_IPolyMaterial::BILLBOARD_AXISALIGNED)
-	{
-		// rotate the billboard/halo
-		//page 360/361 3D Game Engine Design, David Eberly for a discussion
-		// on screen aligned and axis aligned billboards
-		// assumed is that the preprocessor transformed all billboard polygons
-		// so that their normal points into the positive x direction (1.0 , 0.0 , 0.0)
-		// when new parenting for objects is done, this rotation
-		// will be moved into the object
-		
-		MT_Point3 objpos (oglmatrix[12],oglmatrix[13],oglmatrix[14]);
-		MT_Point3 campos = rasty->GetCameraPosition();
-		MT_Vector3 dir = (campos - objpos).safe_normalized();
-		MT_Vector3 up(0,0,1.0);
-
-		KX_GameObject* gameobj = (KX_GameObject*) this->m_clientobject;
-		// get scaling of halo object
-		MT_Vector3  size = gameobj->GetSGNode()->GetLocalScale();
-		
-		bool screenaligned = (objectdrawmode & RAS_IPolyMaterial::BILLBOARD_SCREENALIGNED)!=0;//false; //either screen or axisaligned
-		if (screenaligned)
-		{
-			up = (up - up.dot(dir) * dir).safe_normalized();
-		} else
-		{
-			dir = (dir - up.dot(dir)*up).safe_normalized();
-		}
-		
-		MT_Vector3 left  = dir.normalized();
-		dir = (left.cross(up)).normalized();
-
-		// we have calculated the row vectors, now we keep
-		// local scaling into account:
-
-		left *= size[0];
-		dir  *= size[1];
-		up   *= size[2];
-		double maat[16]={
-			left[0], left[1],left[2], 0,
-				dir[0], dir[1],dir[2],0,
-				up[0],up[1],up[2],0,
-				0,0,0,1};
-			glTranslated(objpos[0],objpos[1],objpos[2]);
-			glMultMatrixd(maat);
-			
-	} else
-	{
-		if (objectdrawmode & RAS_IPolyMaterial::SHADOW)
-		{
-			// shadow must be cast to the ground, physics system needed here!
-			MT_Point3 frompoint(oglmatrix[12],oglmatrix[13],oglmatrix[14]);
-			KX_GameObject *gameobj = (KX_GameObject*) this->m_clientobject;
-			MT_Vector3 direction = MT_Vector3(0,0,-1);
-
-			direction.normalize();
-			direction *= 100000;
-
-			MT_Point3 topoint = frompoint + direction;
-
-			KX_Scene* kxscene = (KX_Scene*) m_auxilaryClientInfo;
-			PHY_IPhysicsEnvironment* physics_environment = kxscene->GetPhysicsEnvironment();
-			KX_IPhysicsController* physics_controller = gameobj->GetPhysicsController();
-			
-			KX_GameObject *parent = gameobj->GetParent();
-			if (!physics_controller && parent)
-				physics_controller = parent->GetPhysicsController();
-			if (parent)
-				parent->Release();
-				
-			KX_RayCast::Callback<GPC_RenderTools> callback(this, physics_controller, oglmatrix);
-			if (!KX_RayCast::RayTest(physics_environment, frompoint, topoint, callback))
-			{
-				// couldn't find something to cast the shadow on...
-				glMultMatrixd(oglmatrix);
-			}
-		} else
-		{
-
-			// 'normal' object
-			glMultMatrixd(oglmatrix);
-		}
-	}
-}
-
 void GPC_RenderTools::MotionBlur(RAS_IRasterizer* rasterizer)
 {
 	int state = rasterizer->GetMotionBlurState();
@@ -608,7 +512,6 @@ void GPC_RenderTools::Update2DFilter(vector<STR_String>& propNames, void* gameOb
 
 void GPC_RenderTools::Render2DFilters(RAS_ICanvas* canvas)
 {
-	m_filtermanager.RenderFilters( canvas);
+	m_filtermanager.RenderFilters(canvas);
 }
 
-unsigned int GPC_RenderTools::m_numgllights;
diff --git a/source/gameengine/GamePlayer/common/GPC_RenderTools.h b/source/gameengine/GamePlayer/common/GPC_RenderTools.h
index 9f70f67caf2..382956e73ea 100644
--- a/source/gameengine/GamePlayer/common/GPC_RenderTools.h
+++ b/source/gameengine/GamePlayer/common/GPC_RenderTools.h
@@ -31,11 +31,11 @@
 #define __GPC_RENDERTOOLS_H
 
 #ifdef WIN32
-	#include <windows.h>
+// don't show stl-warnings
+#pragma warning (disable:4786)
+#include <windows.h>
 #endif // WIN32
 
-#include "GL/glew.h"
-
 #include "RAS_IRenderTools.h"
 
 #include "BMF_Api.h"
@@ -43,100 +43,52 @@
 struct KX_ClientObjectInfo;
 class KX_RayCast;
 
+/* BlenderRenderTools are a set of tools to apply 2D/3D graphics effects, which
+ * are not part of the (polygon) Rasterizer. Effects like 2D text, 3D (polygon)
+ * text, lighting.
+ *
+ * Most of this code is duplicated in KX_BlenderRenderTools, so this should be
+ * moved to some common location to avoid duplication. */
+
 class GPC_RenderTools : public RAS_IRenderTools
 {
+	int		m_lastlightlayer;
+	bool	m_lastlighting;
+	static unsigned int m_numgllights;
+
+	BMF_Font* m_font;
+
 public:
-	GPC_RenderTools();
-	virtual ~GPC_RenderTools();
+						GPC_RenderTools();
+	virtual				~GPC_RenderTools();
 
-	virtual void EndFrame(RAS_IRasterizer* rasty);
-	virtual void BeginFrame(RAS_IRasterizer* rasty);
+	void				EndFrame(RAS_IRasterizer* rasty);
+	void				BeginFrame(RAS_IRasterizer* rasty);
 
-	void DisableOpenGLLights()
-	{
-		glDisable(GL_LIGHTING);
-		glDisable(GL_COLOR_MATERIAL);
-	}
+	void				EnableOpenGLLights();
+	void				DisableOpenGLLights();
+	void				ProcessLighting(int layer, const MT_Transform& viewmat);
 
-	void EnableOpenGLLights();
+	/* @attention mode is ignored here */
+	void			    RenderText2D(RAS_TEXT_RENDER_MODE mode,
+									 const char* text,
+									 int xco,
+									 int yco,
+									 int width,
+									 int height);
+	void				RenderText(int mode,
+								   class RAS_IPolyMaterial* polymat,
+								   float v1[3],
+								   float v2[3],
+								   float v3[3],
+								   float v4[3],
+								   int glattrib);
 
-	int ProcessLighting(int layer);
+	void				applyTransform(RAS_IRasterizer* rasty, double* oglmatrix, int objectdrawmode);
+	int					applyLights(int objectlayer, const MT_Transform& viewmat);
 
-	void Perspective(int a, int width, int height, float mat[4][4], float viewmat[4][4])
-	{
-		if(a== 0)
-		{
-			glMatrixMode(GL_PROJECTION);
-			glMatrixMode(GL_MODELVIEW);
-			glLoadIdentity();
-		}
-		else
-		{
-			if(a== 1)
-			{
-				glMatrixMode(GL_PROJECTION);
-				glMatrixMode(GL_MODELVIEW);
-			}
-		}
-	}
-
-	/**
-	 * @attention mode is ignored here
-	 */
-	virtual void RenderText2D(
-					RAS_TEXT_RENDER_MODE mode,
-					const char* text,
-					int xco,
-					int yco,
-					int width,
-					int height);
-
-	/**
-	 * Renders text into a (series of) polygon(s), using a texture font,
-	 * Each character consists of one polygon (one quad or two triangles)
-	 */
-	virtual void RenderText(
-					int mode,
-					RAS_IPolyMaterial* polymat,
-					float v1[3],
-					float v2[3],
-					float v3[3],
-					float v4[3]);
-
-	void Render(RAS_IRasterizer* rasty,double* oglmatrix,int objectdrawmode)
-	{
-		glPopMatrix();
-		glPushMatrix();
-		glMultMatrixd(oglmatrix);
-	}
-
-	void applyTransform(RAS_IRasterizer* rasty, double* oglmatrix, int objectdrawmode);
-
-	virtual void PushMatrix()
-	{
-		glPushMatrix();
-	}
-
-	virtual void PopMatrix()
-	{
-		glPopMatrix();
-	}
-
-	virtual class RAS_IPolyMaterial* CreateBlenderPolyMaterial(
-			const STR_String &texname,
-			bool ba,
-			const STR_String& matname,
-			int tile,
-			int tilexrep,int tileyrep,
-			int mode,
-			bool transparant,
-			bool zsort,
-			int lightlayer,
-			bool bIsTriangle,
-			void* clientobject,
-			void* tface);
-
-	int applyLights(int objectlayer);
+	void				PushMatrix();
+	void				PopMatrix();
 
 	bool RayHit(KX_ClientObjectInfo* client, KX_RayCast* result, void * const data);
 	bool NeedRayCast(KX_ClientObjectInfo* client) { return true; }
@@ -147,28 +99,7 @@ public:
 
 	virtual	void Render2DFilters(RAS_ICanvas* canvas);
 
-	virtual void SetClientObject(void* obj);
-
-protected:
-	/** 
-	 * Copied from KX_BlenderGL.cpp in KX_blenderhook
-	 */
-	void BL_RenderText(
-		int mode,
-		const char* textstr,
-		int textlen,
-		struct MTFace* tface,
-		unsigned int* col,
-		float v1[3],float v2[3],float v3[3],float v4[3]);
-	void BL_spack(unsigned int ucol)
-	{
-		char *cp = (char *)&ucol;		
-		glColor3ub(cp[3], cp[2], cp[1]);
-	}
-
-
-	BMF_Font* m_font;
-	static unsigned int m_numgllights;
+	virtual void SetClientObject(RAS_IRasterizer *rasty, void* obj);
 };
 
 #endif  // __GPC_RENDERTOOLS_H
diff --git a/source/gameengine/GamePlayer/common/Makefile b/source/gameengine/GamePlayer/common/Makefile
index 19d792ddbdb..6a12e659be6 100644
--- a/source/gameengine/GamePlayer/common/Makefile
+++ b/source/gameengine/GamePlayer/common/Makefile
@@ -43,6 +43,7 @@ CPPFLAGS += -I../../../blender/blenloader
 CPPFLAGS += -I../../../blender/blenlib
 CPPFLAGS += -I../../../blender/imbuf
 CPPFLAGS += -I../../../blender/makesdna
+CPPFLAGS += -I../../../blender/gpu
 CPPFLAGS += -I../../../kernel/gen_system
 CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
 
@@ -72,10 +73,6 @@ CPPFLAGS += -I../../../gameengine/Rasterizer/RAS_OpenGLRasterizer
 CPPFLAGS += -I../../../gameengine/Physics/Sumo
 CPPFLAGS += -I../../../gameengine/Physics/common
 
-ifeq ($(WITH_BF_GLEXT),true)
-    CPPFLAGS += -DWITH_GLEXT
-endif
-
 ###############################
 
 SOURCEDIR = source/gameengine/GamePlayer/common
diff --git a/source/gameengine/GamePlayer/common/SConscript b/source/gameengine/GamePlayer/common/SConscript
index 3b2367d2592..30f20a670d3 100644
--- a/source/gameengine/GamePlayer/common/SConscript
+++ b/source/gameengine/GamePlayer/common/SConscript
@@ -8,7 +8,6 @@ source_files = ['bmfont.cpp',
                 'GPC_Engine.cpp',
                 'GPC_KeyboardDevice.cpp',
                 'GPC_MouseDevice.cpp',
-                'GPC_PolygonMaterial.cpp',
                 'GPC_RawImage.cpp',
                 'GPC_RawLoadDotBlendArray.cpp',
                 'GPC_RawLogoArrays.cpp',
@@ -46,6 +45,7 @@ incs = ['.',
         '#source/gameengine/GamePlayer/ghost',
         '#source/blender/misc',
         '#source/blender/blenloader',
+        '#source/blender/gpu',
 		'#extern/glew/include']
                                 
 #This is all plugin stuff!
diff --git a/source/gameengine/GamePlayer/common/unix/GPU_PolygonMaterial.h b/source/gameengine/GamePlayer/common/unix/GPU_PolygonMaterial.h
index fee729a84ac..e5ed7f39811 100644
--- a/source/gameengine/GamePlayer/common/unix/GPU_PolygonMaterial.h
+++ b/source/gameengine/GamePlayer/common/unix/GPU_PolygonMaterial.h
@@ -37,9 +37,9 @@ class GPU_PolygonMaterial : public BP_PolygonMaterial
 public:
 	GPUPolygonMaterial(const STR_String& texname, bool ba,const STR_String& matname,
 			int tile, int tileXrep, int tileYrep, int mode, int transparant,
-			int lightlayer,bool bIsTriangle,void* clientobject,void* tpage) :
+			int lightlayer,,void* tpage) :
 			BP_PolygonMaterial(texname, ba,matname, tile, tileXrep, tileYrep,
-					mode, transparant, lightlayer, bIsTriangle, clientobject),
+					mode, transparant, lightlayer),
 			m_tface(tpage)
 	{
 	}
diff --git a/source/gameengine/GamePlayer/ghost/CMakeLists.txt b/source/gameengine/GamePlayer/ghost/CMakeLists.txt
index d9f0675001f..5e0ca93ac06 100644
--- a/source/gameengine/GamePlayer/ghost/CMakeLists.txt
+++ b/source/gameengine/GamePlayer/ghost/CMakeLists.txt
@@ -64,6 +64,7 @@ SET(INC
   ../../../../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/GamePlayer/ghost/GPG_Application.cpp b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
index c56a6d0da23..a690beb9f38 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
+++ b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
@@ -38,6 +38,7 @@
 #endif
 
 #include "GL/glew.h"
+#include "GPU_extensions.h"
 
 #include "GPG_Application.h"
 
@@ -104,9 +105,10 @@ static void frameTimerProc(GHOST_ITimerTask* task, GHOST_TUns64 time);
 static GHOST_ISystem* fSystem = 0;
 static const int kTimerFreq = 10;
 
-GPG_Application::GPG_Application(GHOST_ISystem* system, struct Main* maggie, STR_String startSceneName)
-	: m_startSceneName(startSceneName), 
-	  m_maggie(maggie),
+GPG_Application::GPG_Application(GHOST_ISystem* system)
+	: m_startSceneName(""), 
+	  m_startScene(0),
+	  m_maggie(0),
 	  m_exitRequested(0),
 	  m_system(system), 
 	  m_mainWindow(0), 
@@ -142,15 +144,16 @@ GPG_Application::~GPG_Application(void)
 
 
 
-bool GPG_Application::SetGameEngineData(struct Main* maggie, STR_String startSceneName)
+bool GPG_Application::SetGameEngineData(struct Main* maggie, Scene *scene)
 {
 	bool result = false;
 
-	if (maggie != NULL && startSceneName != "")
+	if (maggie != NULL && scene != NULL)
 	{
-		G.scene = (Scene*)maggie->scene.first;
+		G.scene = scene;
 		m_maggie = maggie;
-		m_startSceneName = startSceneName;
+		m_startSceneName = scene->id.name+2;
+		m_startScene = scene;
 		result = true;
 	}
 
@@ -480,7 +483,7 @@ bool GPG_Application::initEngine(GHOST_IWindow* window, const int stereoMode)
 {
 	if (!m_engineInitialized)
 	{
-		glewInit();
+		GPU_extensions_init();
 		bgl::InitExtensions(true);
 
 		// get and set the preferences
@@ -499,12 +502,18 @@ bool GPG_Application::initEngine(GHOST_IWindow* window, const int stereoMode)
 
 		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_DIAPLAY_LISTS) != 0);
+		bool useLists = (SYS_GetCommandLineInt(syshandle, "displaylists", G.fileflags & G_FILE_DISPLAY_LISTS) != 0);
 
 		if(GLEW_ARB_multitexture && GLEW_VERSION_1_1) {
 			int gameflag =(G.fileflags & G_FILE_GAME_MAT);
 			m_blendermat = (SYS_GetCommandLineInt(syshandle, "blender_material", gameflag) != 0);
 		}
+
+		if(GPU_extensions_minimum_support()) {
+			int gameflag = (G.fileflags & G_FILE_GAME_MAT_GLSL);
+
+			m_blenderglslmat = (SYS_GetCommandLineInt(syshandle, "blender_glsl_material", gameflag) != 0);
+		}
 	
 		// create the canvas, rasterizer and rendertools
 		m_canvas = new GPG_Canvas(window);
@@ -640,14 +649,15 @@ bool GPG_Application::startEngine(void)
 			m_mouse,
 			m_networkdevice,
 			m_audiodevice,
-			startscenename);
+			startscenename,
+			m_startScene);
 		
 		
 		// some python things
 		PyObject* dictionaryobject = initGamePlayerPythonScripting("Ketsji", psl_Lowest);
 		m_ketsjiengine->SetPythonDictionary(dictionaryobject);
 		initRasterizer(m_rasterizer, m_canvas);
-		PyObject *gameLogic = initGameLogic(startscene);
+		PyObject *gameLogic = initGameLogic(m_ketsjiengine, startscene);
 		PyDict_SetItemString(dictionaryobject, "GameLogic", gameLogic); // Same as importing the module
 		initGameKeys();
 		initPythonConstraintBinding();
@@ -745,6 +755,8 @@ void GPG_Application::stopEngine()
 
 void GPG_Application::exitEngine()
 {
+	GPU_extensions_exit();
+
 	if (m_ketsjiengine)
 	{
 		stopEngine();
diff --git a/source/gameengine/GamePlayer/ghost/GPG_Application.h b/source/gameengine/GamePlayer/ghost/GPG_Application.h
index 31f5eb75e52..5242a419808 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_Application.h
+++ b/source/gameengine/GamePlayer/ghost/GPG_Application.h
@@ -50,14 +50,15 @@ class GPG_Canvas;
 class GPG_KeyboardDevice;
 class GPG_System;
 struct Main;
+struct Scene;
 
 class GPG_Application : public GHOST_IEventConsumer
 {
 public:
-	GPG_Application(GHOST_ISystem* system, struct Main* maggie, STR_String startSceneName);
+	GPG_Application(GHOST_ISystem* system);
 	~GPG_Application(void);
 
-			bool SetGameEngineData(struct Main* maggie,STR_String startSceneName);
+			bool SetGameEngineData(struct Main* maggie, struct Scene* scene);
 			bool startWindow(STR_String& title, int windowLeft, int windowTop, int windowWidth, int windowHeight,
 			const bool stereoVisual, const int stereoMode);
 			bool startFullScreen(int width, int height, int bpp, int frequency, const bool stereoVisual, const int stereoMode);
@@ -123,6 +124,7 @@ protected:
 
 	/* The game data */
 	STR_String				m_startSceneName;
+	struct Scene*			m_startScene;
 	struct Main*			m_maggie;
 
 	/* Exit state. */
diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
index 26a85128025..cc781a38bbb 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
+++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
@@ -64,13 +64,15 @@ extern "C"
 #ifdef __cplusplus
 }
 #endif // __cplusplus
+
+#include "GPU_draw.h"
+
 /**********************************
 * End Blender include block
 **********************************/
 
 #include "SYS_System.h"
 #include "GPG_Application.h"
-#include "GPC_PolygonMaterial.h"
 
 #include "GHOST_ISystem.h"
 #include "RAS_IRasterizer.h"
@@ -282,7 +284,7 @@ int main(int argc, char** argv)
 	bool fullScreenParFound = false;
 	bool windowParFound = false;
 	bool closeConsole = true;
-	RAS_IRasterizer::StereoMode stereomode;
+	RAS_IRasterizer::StereoMode stereomode = RAS_IRasterizer::RAS_STEREO_NOSTEREO;
 	bool stereoWindow = false;
 	bool stereoParFound = false;
 	int windowLeft = 100;
@@ -525,8 +527,6 @@ int main(int argc, char** argv)
 		return 0;
 	}
 
-	if (!stereoParFound) stereomode = RAS_IRasterizer::RAS_STEREO_NOSTEREO;
-
 #ifdef WIN32
 	if (scr_saver_mode != SCREEN_SAVER_MODE_CONFIGURATION)
 #endif
@@ -539,7 +539,7 @@ int main(int argc, char** argv)
 
 		if (SYS_GetCommandLineInt(syshandle, "nomipmap", 0))
 		{
-			GPC_PolygonMaterial::SetMipMappingEnabled(0);
+			GPU_set_mipmap(0);
 		}
 		
 		// Create the system
@@ -561,7 +561,7 @@ int main(int argc, char** argv)
 			{
 				int exitcode = KX_EXIT_REQUEST_NO_REQUEST;
 				STR_String exitstring = "";
-				GPG_Application app(system, NULL, exitstring);
+				GPG_Application app(system);
 				bool firstTimeRunning = true;
 				char *filename = get_filename(argc, argv);
 				char *titlename;
@@ -619,7 +619,7 @@ int main(int argc, char** argv)
 #endif // WIN32
 						Main *maggie = bfd->main;
 						Scene *scene = bfd->curscene;
-						char *startscenename = scene->id.name + 2;
+						G.main = maggie;
 						G.fileflags  = bfd->fileflags;
 
 						//Seg Fault; icon.c gIcons == 0
@@ -661,7 +661,7 @@ int main(int argc, char** argv)
 						}
 						
 						//					GPG_Application app (system, maggie, startscenename);
-						app.SetGameEngineData(maggie, startscenename);
+						app.SetGameEngineData(maggie, scene);
 						
 						if (firstTimeRunning)
 						{
diff --git a/source/gameengine/GamePlayer/ghost/Makefile b/source/gameengine/GamePlayer/ghost/Makefile
index 13940ac3fc8..0b187791734 100644
--- a/source/gameengine/GamePlayer/ghost/Makefile
+++ b/source/gameengine/GamePlayer/ghost/Makefile
@@ -69,6 +69,7 @@ CPPFLAGS += -I../../../blender/blenloader
 CPPFLAGS += -I../../../blender/imbuf
 CPPFLAGS += -I../../../blender/makesdna
 CPPFLAGS += -I../../../blender/readblenfile
+CPPFLAGS += -I../../../blender/gpu
 
 CPPFLAGS += -I../../../gameengine/BlenderRoutines
 
@@ -80,7 +81,3 @@ CPPFLAGS += -I$(NAN_STRING)/include
 CPPFLAGS += -I$(NAN_GHOST)/include
 CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
 
-ifeq ($(WITH_BF_GLEXT),true)
-    CPPFLAGS += -DWITH_GLEXT
-endif
-
diff --git a/source/gameengine/GamePlayer/ghost/SConscript b/source/gameengine/GamePlayer/ghost/SConscript
index f3cce6c7443..33cf07b6211 100644
--- a/source/gameengine/GamePlayer/ghost/SConscript
+++ b/source/gameengine/GamePlayer/ghost/SConscript
@@ -40,6 +40,7 @@ incs = ['.',
         '#source/gameengine/GamePlayer/common',
         '#source/blender/misc',
         '#source/blender/blenloader',
+        '#source/blender/gpu',
         '#extern/glew/include']
 
 incs += Split(env['BF_PYTHON_INC'])
@@ -48,8 +49,5 @@ cflags = []
 if env['OURPLATFORM']=='win32-vc':
     cflags = ['/GR']
 
-if env['WITH_BF_GLEXT'] == 1:
-        env['CPPFLAGS'].append('-DWITH_GLEXT')
-
 
 env.BlenderLib (libname='gp_ghost', sources=source_files, includes = incs, defines = [], libtype='player',priority=0, compileflags=cflags)
diff --git a/source/gameengine/Ketsji/BL_BlenderShader.cpp b/source/gameengine/Ketsji/BL_BlenderShader.cpp
index a9a0771936c..13b8235687b 100644
--- a/source/gameengine/Ketsji/BL_BlenderShader.cpp
+++ b/source/gameengine/Ketsji/BL_BlenderShader.cpp
@@ -9,108 +9,64 @@
 #include "BL_BlenderShader.h"
 #include "BL_Material.h"
 
-#ifdef BLENDER_GLSL
 #include "GPU_extensions.h"
 #include "GPU_material.h"
-#endif
 
 #include "RAS_BucketManager.h"
 #include "RAS_MeshObject.h"
 #include "RAS_IRasterizer.h"
  
- /* this is evil, but we need the scene to create materials with
-  * lights from the correct scene .. */
-static struct Scene *GetSceneForName(const STR_String& scenename)
-{
-	Scene *sce;
-
-	for (sce= (Scene*)G.main->scene.first; sce; sce= (Scene*)sce->id.next)
-		if (scenename == (sce->id.name+2))
-			return sce;
-
-	return (Scene*)G.main->scene.first;
-}
-
-bool BL_BlenderShader::Ok()
-{
-#ifdef BLENDER_GLSL
-	VerifyShader();
-
-	return (mMat && mMat->gpumaterial);
-#else
-	return 0;
-#endif
-}
-
 BL_BlenderShader::BL_BlenderShader(KX_Scene *scene, struct Material *ma, int lightlayer)
 :
-#ifdef BLENDER_GLSL
 	mScene(scene),
 	mMat(ma),
-	mGPUMat(NULL),
-#endif
-	mBound(false),
 	mLightLayer(lightlayer)
 {
-#ifdef BLENDER_GLSL
-	mBlenderScene = GetSceneForName(scene->GetName());
+	mBlenderScene = scene->GetBlenderScene(); //GetSceneForName(scene->GetName());
 	mBlendMode = GPU_BLEND_SOLID;
 
-	if(mMat) {
+	if(mMat)
 		GPU_material_from_blender(mBlenderScene, mMat);
-		mGPUMat = mMat->gpumaterial;
-	}
-#endif
 }
 
 BL_BlenderShader::~BL_BlenderShader()
 {
-#ifdef BLENDER_GLSL
-	if(mMat && mMat->gpumaterial)
-		GPU_material_unbind(mMat->gpumaterial);
-#endif
+	if(mMat && GPU_material_from_blender(mBlenderScene, mMat))
+		GPU_material_unbind(GPU_material_from_blender(mBlenderScene, mMat));
+}
+
+bool BL_BlenderShader::Ok()
+{
+	return VerifyShader();
 }
 
 bool BL_BlenderShader::VerifyShader()
 {
-#ifdef BLENDER_GLSL
-	if(mMat && !mMat->gpumaterial)
-		GPU_material_from_blender(mBlenderScene, mMat);
-
-	mGPUMat = mMat->gpumaterial;
-	
-	return (mMat && mGPUMat);
-#else
-	return false;
-#endif
+	if(mMat)
+		return (GPU_material_from_blender(mBlenderScene, mMat) != 0);
+	else
+		return false;
 }
 
-void BL_BlenderShader::SetProg(bool enable)
+void BL_BlenderShader::SetProg(bool enable, double time)
 {
-#ifdef BLENDER_GLSL
 	if(VerifyShader()) {
-		if(enable) {
-			GPU_material_bind(mGPUMat, mLightLayer);
-			mBound = true;
-		}
-		else {
-			GPU_material_unbind(mGPUMat);
-			mBound = false;
-		}
+		if(enable)
+			GPU_material_bind(GPU_material_from_blender(mBlenderScene, mMat), mLightLayer, time);
+		else
+			GPU_material_unbind(GPU_material_from_blender(mBlenderScene, mMat));
 	}
-#endif
 }
 
 int BL_BlenderShader::GetAttribNum()
 {
-#ifdef BLENDER_GLSL
 	GPUVertexAttribs attribs;
 	int i, enabled = 0;
 
 	if(!VerifyShader())
 		return enabled;
 
-	GPU_material_vertex_attributes(mGPUMat, &attribs);
+	GPU_material_vertex_attributes(GPU_material_from_blender(mBlenderScene, mMat), &attribs);
 
     for(i = 0; i < attribs.totlayer; i++)
 		if(attribs.layer[i].glindex+1 > enabled)
@@ -120,24 +76,23 @@ int BL_BlenderShader::GetAttribNum()
 		enabled = BL_MAX_ATTRIB;
 
 	return enabled;
-#else
-	return 0;
-#endif
 }
 
 void BL_BlenderShader::SetAttribs(RAS_IRasterizer* ras, const BL_Material *mat)
 {
-#ifdef BLENDER_GLSL
 	GPUVertexAttribs attribs;
+	GPUMaterial *gpumat;
 	int i, attrib_num;
 
 	ras->SetAttribNum(0);
 
 	if(!VerifyShader())
 		return;
+	
+	gpumat = GPU_material_from_blender(mBlenderScene, mMat);
 
 	if(ras->GetDrawingMode() == RAS_IRasterizer::KX_TEXTURED) {
-		GPU_material_vertex_attributes(mGPUMat, &attribs);
+		GPU_material_vertex_attributes(gpumat, &attribs);
 		attrib_num = GetAttribNum();
 
 		ras->SetTexCoordNum(0);
@@ -168,44 +123,37 @@ void BL_BlenderShader::SetAttribs(RAS_IRasterizer* ras, const BL_Material *mat)
 			else
 				ras->SetAttrib(RAS_IRasterizer::RAS_TEXCO_DISABLE, attribs.layer[i].glindex);
 		}
-
-		ras->EnableTextures(true);
 	}
-	else
-		ras->EnableTextures(false);
-#endif
 }
 
-void BL_BlenderShader::Update( const KX_MeshSlot & ms, RAS_IRasterizer* rasty )
+void BL_BlenderShader::Update(const RAS_MeshSlot & ms, RAS_IRasterizer* rasty )
 {
-#ifdef BLENDER_GLSL
 	float obmat[4][4], viewmat[4][4], viewinvmat[4][4], obcol[4];
+	GPUMaterial *gpumat;
 
-	VerifyShader();
+	gpumat = GPU_material_from_blender(mBlenderScene, mMat);
 
-	if(!mGPUMat) // || !mBound)
+	if(!gpumat || !GPU_material_bound(gpumat))
 		return;
 
 	MT_Matrix4x4 model;
 	model.setValue(ms.m_OpenGLMatrix);
-	MT_Matrix4x4 view;
-	rasty->GetViewMatrix(view);
+	const MT_Matrix4x4& view = rasty->GetViewMatrix();
+	const MT_Matrix4x4& viewinv = rasty->GetViewInvMatrix();
 
+	// note: getValue gives back column major as needed by OpenGL
 	model.getValue((float*)obmat);
 	view.getValue((float*)viewmat);
-
-	view.invert();
-	view.getValue((float*)viewinvmat);
+	viewinv.getValue((float*)viewinvmat);
 
 	if(ms.m_bObjectColor)
 		ms.m_RGBAcolor.getValue((float*)obcol);
 	else
 		obcol[0]= obcol[1]= obcol[2]= obcol[3]= 1.0f;
 
-	GPU_material_bind_uniforms(mGPUMat, obmat, viewmat, viewinvmat, obcol);
+	GPU_material_bind_uniforms(gpumat, obmat, viewmat, viewinvmat, obcol);
 
-	mBlendMode = GPU_material_blend_mode(mGPUMat, obcol);
-#endif
+	mBlendMode = GPU_material_blend_mode(gpumat, obcol);
 }
 
 int BL_BlenderShader::GetBlendMode()
@@ -215,12 +163,8 @@ int BL_BlenderShader::GetBlendMode()
 
 bool BL_BlenderShader::Equals(BL_BlenderShader *blshader)
 {
-#ifdef BLENDER_GLSL
 	/* to avoid unneeded state switches */
-	return (blshader && mGPUMat == blshader->mGPUMat && mLightLayer == blshader->mLightLayer);
-#else
-	return true;
-#endif
+	return (blshader && mMat == blshader->mMat && mLightLayer == blshader->mLightLayer);
 }
 
 // eof
diff --git a/source/gameengine/Ketsji/BL_BlenderShader.h b/source/gameengine/Ketsji/BL_BlenderShader.h
index da9765dafa4..5c1f59f94ad 100644
--- a/source/gameengine/Ketsji/BL_BlenderShader.h
+++ b/source/gameengine/Ketsji/BL_BlenderShader.h
@@ -2,9 +2,7 @@
 #ifndef __BL_GPUSHADER_H__
 #define __BL_GPUSHADER_H__
 
-#ifdef BLENDER_GLSL
 #include "GPU_material.h"
-#endif
 
 #include "MT_Matrix4x4.h"
 #include "MT_Matrix3x3.h"
@@ -29,13 +27,9 @@ class BL_Material;
 class BL_BlenderShader
 {
 private:
-#ifdef BLENDER_GLSL
 	KX_Scene		*mScene;
 	struct Scene	*mBlenderScene;
 	struct Material	*mMat;
-	GPUMaterial		*mGPUMat;
-#endif
-	bool			mBound;
 	int				mLightLayer;
 	int				mBlendMode;
 
@@ -46,11 +40,11 @@ public:
 	virtual ~BL_BlenderShader();
 
 	bool				Ok();
-	void				SetProg(bool enable);
+	void				SetProg(bool enable, double time=0.0);
 
 	int GetAttribNum();
 	void SetAttribs(class RAS_IRasterizer* ras, const BL_Material *mat);
-	void Update(const class KX_MeshSlot & ms, class RAS_IRasterizer* rasty);
+	void Update(const class RAS_MeshSlot & ms, class RAS_IRasterizer* rasty);
 	int GetBlendMode();
 
 	bool Equals(BL_BlenderShader *blshader);
diff --git a/source/gameengine/Ketsji/BL_Material.h b/source/gameengine/Ketsji/BL_Material.h
index dcb66ea2579..0eaa234566c 100644
--- a/source/gameengine/Ketsji/BL_Material.h
+++ b/source/gameengine/Ketsji/BL_Material.h
@@ -18,9 +18,9 @@ struct EnvMap;
 	this will default to users available units
 	to build with more available, just increment this value
 	although the more you add the slower the search time will be.
-	we will go for three, which should be enough
+	we will go for eight, which should be enough
 */
-#define MAXTEX			3	//match in RAS_TexVert & RAS_OpenGLRasterizer
+#define MAXTEX			8	//match in RAS_TexVert & RAS_OpenGLRasterizer
 
 // different mapping modes
 class BL_Mapping
@@ -139,7 +139,7 @@ enum BL_ras_mode
 	COLLIDER=2,
 	ZSORT=4,
 	ALPHA=8,
-	TRIANGLE=16,
+	// TRIANGLE=16,
 	USE_LIGHT=32,
 	WIRE=64
 };
diff --git a/source/gameengine/Ketsji/BL_Shader.cpp b/source/gameengine/Ketsji/BL_Shader.cpp
index 57d0fe4140f..f28d3fa2912 100644
--- a/source/gameengine/Ketsji/BL_Shader.cpp
+++ b/source/gameengine/Ketsji/BL_Shader.cpp
@@ -433,7 +433,7 @@ void BL_Shader::SetProg(bool enable)
 	}
 }
 
-void BL_Shader::Update( const KX_MeshSlot & ms, RAS_IRasterizer* rasty )
+void BL_Shader::Update( const RAS_MeshSlot & ms, RAS_IRasterizer* rasty )
 {
 	if(!Ok() || !mPreDef.size()) 
 		return;
@@ -445,8 +445,7 @@ void BL_Shader::Update( const KX_MeshSlot & ms, RAS_IRasterizer* rasty )
 	{
 		MT_Matrix4x4 model;
 		model.setValue(ms.m_OpenGLMatrix);
-		MT_Matrix4x4 view;
-		rasty->GetViewMatrix(view);
+		const MT_Matrix4x4& view = rasty->GetViewMatrix();
 
 		if(mAttr==SHD_TANGENT)
 			 ms.m_mesh->SetMeshModified(true);
@@ -525,13 +524,15 @@ void BL_Shader::Update( const KX_MeshSlot & ms, RAS_IRasterizer* rasty )
 					}
 				case VIEWMATRIX_INVERSE:
 					{
-						view.invert();
+						MT_Matrix4x4 viewinv = view;
+						viewinv.invert();
 						SetUniform(uni->mLoc, view);
 						break;
 					}
 				case VIEWMATRIX_INVERSETRANSPOSE:
 					{
-						view.invert();
+						MT_Matrix4x4 viewinv = view;
+						viewinv.invert();
 						SetUniform(uni->mLoc, view, true);
 						break;
 					}
@@ -670,6 +671,7 @@ void BL_Shader::SetUniform(int uniform, const MT_Matrix4x4& vec, bool transpose)
 		)
 	{
 		float value[16];
+		// note: getValue gives back column major as needed by OpenGL
 		vec.getValue(value);
 		glUniformMatrix4fvARB(uniform, 1, transpose?GL_TRUE:GL_FALSE, value);
 	}
diff --git a/source/gameengine/Ketsji/BL_Shader.h b/source/gameengine/Ketsji/BL_Shader.h
index 8f303454087..c7fae31ba03 100644
--- a/source/gameengine/Ketsji/BL_Shader.h
+++ b/source/gameengine/Ketsji/BL_Shader.h
@@ -177,7 +177,7 @@ public:
 	void UnloadShader();
 
 	// Update predefined uniforms each render call
-	void Update(const class KX_MeshSlot & ms, class RAS_IRasterizer* rasty);
+	void Update(const class RAS_MeshSlot & ms, class RAS_IRasterizer* rasty);
 
 	//// Set sampler units (copied)
 	//void InitializeSampler(int unit, BL_Texture* texture );
diff --git a/source/gameengine/Ketsji/CMakeLists.txt b/source/gameengine/Ketsji/CMakeLists.txt
index be009d94701..58411f6d25e 100644
--- a/source/gameengine/Ketsji/CMakeLists.txt
+++ b/source/gameengine/Ketsji/CMakeLists.txt
@@ -69,6 +69,7 @@ SET(INC
   ../../../intern/SoundSystem 
   ../../../source/blender/misc 
   ../../../source/blender/blenloader
+  ../../../source/blender/gpu
   ../../../extern/bullet2/src
   ../../../extern/solid
   ../../../extern/glew/include
diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
index a67e5b26667..f92200780d5 100644
--- a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
+++ b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
@@ -19,13 +19,12 @@
 #include "MT_Vector4.h"
 #include "MT_Matrix4x4.h"
 
+#include "RAS_BucketManager.h"
 #include "RAS_MeshObject.h"
 #include "RAS_IRasterizer.h"
 #include "RAS_OpenGLRasterizer/RAS_GLExtensionManager.h"
 
-extern "C" {
-#include "BDR_drawmesh.h"
-}
+#include "GPU_draw.h"
 
 #include "STR_HashedString.h"
 
@@ -48,7 +47,6 @@ KX_BlenderMaterial::KX_BlenderMaterial(
 	BL_Material *data,
 	bool skin,
 	int lightlayer,
-	void *clientobject,
 	PyTypeObject *T
 	)
 :	PyObjectPlus(T),
@@ -62,9 +60,7 @@ KX_BlenderMaterial::KX_BlenderMaterial(
 		data->transp,
 		((data->ras_mode &ALPHA)!=0),
 		((data->ras_mode &ZSORT)!=0),
-		lightlayer,
-		((data->ras_mode &TRIANGLE)!=0),
-		clientobject
+		lightlayer
 	),
 	mMaterial(data),
 	mShader(0),
@@ -78,9 +74,10 @@ KX_BlenderMaterial::KX_BlenderMaterial(
 {
 	// --------------------------------
 	// RAS_IPolyMaterial variables... 
-	m_flag |=RAS_BLENDERMAT;
-	m_flag |=(mMaterial->IdMode>=ONETEX)?RAS_MULTITEX:0;
-	m_flag |=(mMaterial->ras_mode & USE_LIGHT)!=0?RAS_MULTILIGHT:0;
+	m_flag |= RAS_BLENDERMAT;
+	m_flag |= (mMaterial->IdMode>=ONETEX)? RAS_MULTITEX: 0;
+	m_flag |= ((mMaterial->ras_mode & USE_LIGHT)!=0)? RAS_MULTILIGHT: 0;
+	m_flag |= (mMaterial->glslmat)? RAS_BLENDERGLSL: 0;
 
 	// figure max
 	int enabled = mMaterial->num_enabled;
@@ -97,7 +94,7 @@ KX_BlenderMaterial::KX_BlenderMaterial(
 			  mMaterial->blend_mode[i]
 			 );
 	}
-	m_multimode += mMaterial->IdMode+mMaterial->ras_mode;
+	m_multimode += mMaterial->IdMode+ (mMaterial->ras_mode & ~(COLLIDER|USE_LIGHT));
 
 }
 
@@ -204,7 +201,7 @@ void KX_BlenderMaterial::OnExit()
 	}
 
 	if( mMaterial->tface ) 
-		set_tpage(mMaterial->tface);
+		GPU_set_tpage(mMaterial->tface);
 }
 
 
@@ -256,25 +253,28 @@ void KX_BlenderMaterial::setShaderData( bool enable, RAS_IRasterizer *ras)
 void KX_BlenderMaterial::setBlenderShaderData( bool enable, RAS_IRasterizer *ras)
 {
 	if( !enable || !mBlenderShader->Ok() ) {
+		ras->SetBlendingMode(TF_SOLID);
+
 		// frame cleanup.
 		if(mLastBlenderShader) {
 			mLastBlenderShader->SetProg(false);
 			mLastBlenderShader= NULL;
 		}
+		else
+			BL_Texture::DisableAllTextures();
 
-		ras->SetBlendingMode(TF_SOLID);
-		BL_Texture::DisableAllTextures();
 		return;
 	}
 
 	if(!mBlenderShader->Equals(mLastBlenderShader)) {
 		ras->SetBlendingMode(mMaterial->transp);
-		BL_Texture::DisableAllTextures();
 
 		if(mLastBlenderShader)
 			mLastBlenderShader->SetProg(false);
+		else
+			BL_Texture::DisableAllTextures();
 
-		mBlenderShader->SetProg(true);
+		mBlenderShader->SetProg(true, ras->GetTime());
 		mLastBlenderShader= mBlenderShader;
 	}
 }
@@ -354,21 +354,22 @@ KX_BlenderMaterial::ActivatShaders(
 	if (GetCachingInfo() != cachingInfo) {
 
 		if (!cachingInfo)
-			tmp->setShaderData( false, rasty);
+			tmp->setShaderData(false, rasty);
 		
 		cachingInfo = GetCachingInfo();
 	
 		if(rasty->GetDrawingMode() == RAS_IRasterizer::KX_TEXTURED)
-			tmp->setShaderData( true, rasty);
+			tmp->setShaderData(true, rasty);
 		else
-			tmp->setShaderData( false, rasty);
+			tmp->setShaderData(false, rasty);
 
 		if(mMaterial->mode & RAS_IRasterizer::KX_TWOSIDE)
 			rasty->SetCullFace(false);
 		else
 			rasty->SetCullFace(true);
 
-		if (((mMaterial->ras_mode &WIRE)!=0) || mMaterial->mode & RAS_IRasterizer::KX_LINES)
+		if (((mMaterial->ras_mode &WIRE)!=0) || (mMaterial->mode & RAS_IRasterizer::KX_LINES) ||
+		    (rasty->GetDrawingMode() <= RAS_IRasterizer::KX_WIREFRAME))
 		{		
 			if((mMaterial->ras_mode &WIRE)!=0) 
 				rasty->SetCullFace(false);
@@ -394,31 +395,24 @@ KX_BlenderMaterial::ActivateBlenderShaders(
 		mLastShader= NULL;
 	}
 
-	// reset... 
-	if(tmp->mMaterial->IsShared()) 
-		cachingInfo =0;
-	
 	if (GetCachingInfo() != cachingInfo) {
 		if (!cachingInfo)
 			tmp->setBlenderShaderData(false, rasty);
 		
 		cachingInfo = GetCachingInfo();
 	
-		if(rasty->GetDrawingMode() == RAS_IRasterizer::KX_TEXTURED) {
+		if(rasty->GetDrawingMode() == RAS_IRasterizer::KX_TEXTURED)
 			tmp->setBlenderShaderData(true, rasty);
-			rasty->EnableTextures(true);
-		}
-		else {
+		else
 			tmp->setBlenderShaderData(false, rasty);
-			rasty->EnableTextures(false);
-		}
 
 		if(mMaterial->mode & RAS_IRasterizer::KX_TWOSIDE)
 			rasty->SetCullFace(false);
 		else
 			rasty->SetCullFace(true);
 
-		if (((mMaterial->ras_mode &WIRE)!=0) || mMaterial->mode & RAS_IRasterizer::KX_LINES)
+		if (((mMaterial->ras_mode & WIRE)!=0) || (mMaterial->mode & RAS_IRasterizer::KX_LINES) ||
+		    (rasty->GetDrawingMode() <= RAS_IRasterizer::KX_WIREFRAME))
 		{		
 			if((mMaterial->ras_mode &WIRE)!=0) 
 				rasty->SetCullFace(false);
@@ -426,10 +420,10 @@ KX_BlenderMaterial::ActivateBlenderShaders(
 		}
 		else
 			rasty->SetLines(false);
-	}
 
-	ActivatGLMaterials(rasty);
-	mBlenderShader->SetAttribs(rasty, mMaterial);
+		ActivatGLMaterials(rasty);
+		mBlenderShader->SetAttribs(rasty, mMaterial);
+	}
 }
 
 void
@@ -466,7 +460,8 @@ KX_BlenderMaterial::ActivateMat(
 		else
 			rasty->SetCullFace(true);
 
-		if (((mMaterial->ras_mode &WIRE)!=0) || mMaterial->mode & RAS_IRasterizer::KX_LINES)
+		if (((mMaterial->ras_mode &WIRE)!=0) || (mMaterial->mode & RAS_IRasterizer::KX_LINES) ||
+		    (rasty->GetDrawingMode() <= RAS_IRasterizer::KX_WIREFRAME))
 		{		
 			if((mMaterial->ras_mode &WIRE)!=0) 
 				rasty->SetCullFace(false);
@@ -486,12 +481,10 @@ KX_BlenderMaterial::Activate(
 	TCachingInfo& cachingInfo
 	)const
 {
-	bool dopass = false;
-	if( GLEW_ARB_shader_objects && ( mShader && mShader->Ok() ) ) {
-		if( (mPass++) < mShader->getNumPass() ) {
+	if(GLEW_ARB_shader_objects && (mShader && mShader->Ok())) {
+		if((mPass++) < mShader->getNumPass() ) {
 			ActivatShaders(rasty, cachingInfo);
-			dopass = true;
-			return dopass;
+			return true;
 		}
 		else {
 			if(mShader == mLastShader) {
@@ -499,36 +492,29 @@ KX_BlenderMaterial::Activate(
 				mLastShader = NULL;
 			}
 			mPass = 0;
-			dopass = false;
-			return dopass;
+			return false;
 		}
 	}
-	else if( GLEW_ARB_shader_objects && ( mBlenderShader && mBlenderShader->Ok() ) ) {
-		if( (mPass++) == 0 ) {
+	else if( GLEW_ARB_shader_objects && (mBlenderShader && mBlenderShader->Ok() ) ) {
+		if(mPass++ == 0) {
 			ActivateBlenderShaders(rasty, cachingInfo);
-			dopass = true;
-			return dopass;
+			return true;
 		}
 		else {
 			mPass = 0;
-			dopass = false;
-			return dopass;
+			return false;
 		}
 	}
 	else {
-		switch (mPass++)
-		{
-			case 0:
-				ActivateMat(rasty, cachingInfo);
-				dopass = true;
-				break;
-			default:
-				mPass = 0;
-				dopass = false;
-				break;
+		if(mPass++ == 0) {
+			ActivateMat(rasty, cachingInfo);
+			return true;
+		}
+		else {
+			mPass = 0;
+			return false;
 		}
 	}
-	return dopass;
 }
 
 bool KX_BlenderMaterial::UsesLighting(RAS_IRasterizer *rasty) const
@@ -536,14 +522,15 @@ bool KX_BlenderMaterial::UsesLighting(RAS_IRasterizer *rasty) const
 	if(!RAS_IPolyMaterial::UsesLighting(rasty))
 		return false;
 
-	if(mShader && mShader->Ok());
+	if(mShader && mShader->Ok())
+		return true;
 	else if(mBlenderShader && mBlenderShader->Ok())
 		return false;
-	
-	return true;
+	else
+		return true;
 }
 
-void KX_BlenderMaterial::ActivateMeshSlot(const KX_MeshSlot & ms, RAS_IRasterizer* rasty) const
+void KX_BlenderMaterial::ActivateMeshSlot(const RAS_MeshSlot & ms, RAS_IRasterizer* rasty) const
 {
 	if(mShader && GLEW_ARB_shader_objects) {
 		mShader->Update(ms, rasty);
@@ -554,7 +541,7 @@ void KX_BlenderMaterial::ActivateMeshSlot(const KX_MeshSlot & ms, RAS_IRasterize
 		mBlenderShader->Update(ms, rasty);
 
 		/* we do blend modes here, because they can change per object
-		 * with the same material due to obcolor */
+		 * with the same material due to obcolor/obalpha */
 		blendmode = mBlenderShader->GetBlendMode();
 		if((blendmode == TF_SOLID || blendmode == TF_ALPHA) && mMaterial->transp != TF_SOLID)
 			blendmode = mMaterial->transp;
@@ -633,11 +620,7 @@ void KX_BlenderMaterial::ActivateTexGen(RAS_IRasterizer *ras) const
 			else 
 				ras->SetTexCoord(RAS_IRasterizer::RAS_TEXCO_DISABLE, i);
 		}
-
-		ras->EnableTextures(true);
 	}
-	else
-		ras->EnableTextures(false);
 }
 
 void KX_BlenderMaterial::setTexMatrixData(int i)
@@ -712,8 +695,7 @@ void KX_BlenderMaterial::setObjectMatrixData(int i, RAS_IRasterizer *ras)
 	glEnable(GL_TEXTURE_GEN_T);
 	glEnable(GL_TEXTURE_GEN_R);
 
-	MT_Matrix4x4 mvmat;
-	ras->GetViewMatrix(mvmat);
+	const MT_Matrix4x4& mvmat = ras->GetViewMatrix();
 
 	glMatrixMode(GL_TEXTURE);
 	glLoadIdentity();
@@ -835,7 +817,9 @@ KX_PYMETHODDEF_DOC( KX_BlenderMaterial, getShader , "getShader()")
 		}
 
 		if(mShader && !mShader->GetError()) {
+			m_flag &= ~RAS_BLENDERGLSL;
 			mMaterial->SetSharedMaterial(true);
+			mScene->GetBucketManager()->ReleaseDisplayLists(this);
 			Py_INCREF(mShader);
 			return mShader;
 		}else
@@ -870,8 +854,6 @@ void KX_BlenderMaterial::SetBlenderGLSLShader(void)
 		delete mBlenderShader;
 		mBlenderShader = 0;
 	}
-	else
-		m_flag |= RAS_BLENDERGLSL;
 }
 
 KX_PYMETHODDEF_DOC( KX_BlenderMaterial, getMaterialIndex, "getMaterialIndex()")
diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.h b/source/gameengine/Ketsji/KX_BlenderMaterial.h
index 0d7657b8cdb..4ddf5a924df 100644
--- a/source/gameengine/Ketsji/KX_BlenderMaterial.h
+++ b/source/gameengine/Ketsji/KX_BlenderMaterial.h
@@ -28,7 +28,6 @@ public:
 		BL_Material*	mat,
 		bool			skin,
 		int				lightlayer,
-		void*			clientobject,
 		PyTypeObject*	T=&Type
 	);
 
@@ -47,7 +46,7 @@ public:
 	
 	virtual 
 	void ActivateMeshSlot(
-		const KX_MeshSlot & ms, 
+		const RAS_MeshSlot & ms, 
 		RAS_IRasterizer* rasty 
 	) const;
 	
diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
index d6997ee29a8..9607489497d 100644
--- a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
+++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
@@ -76,16 +76,16 @@
 struct KX_PhysicsInstance
 {
 	DT_VertexBaseHandle	m_vertexbase;
-	int			m_vtxarray;
+	RAS_DisplayArray*	m_darray;
 	RAS_IPolyMaterial*	m_material;
-	
-	KX_PhysicsInstance(DT_VertexBaseHandle vertex_base, int vtxarray, RAS_IPolyMaterial* mat)
+
+	KX_PhysicsInstance(DT_VertexBaseHandle vertex_base, RAS_DisplayArray *darray, RAS_IPolyMaterial* mat)
 		: m_vertexbase(vertex_base),
-		  m_vtxarray(vtxarray),
-		  m_material(mat)
+		m_darray(darray),
+		m_material(mat)
 	{
 	}
-	
+
 	~KX_PhysicsInstance()
 	{
 		DT_DeleteVertexBase(m_vertexbase);
@@ -100,11 +100,11 @@ static void	BL_RegisterSumoObject(KX_GameObject* gameobj,class SM_Scene* sumoSce
 static DT_ShapeHandle CreateShapeFromMesh(RAS_MeshObject* meshobj, bool polytope);
 
 void	KX_ConvertSumoObject(	KX_GameObject* gameobj,
-				RAS_MeshObject* meshobj,
-				KX_Scene* kxscene,
-				PHY_ShapeProps* kxshapeprops,
-				PHY_MaterialProps*	kxmaterial,
-				struct	KX_ObjectProperties*	objprop)
+		RAS_MeshObject* meshobj,
+		KX_Scene* kxscene,
+		PHY_ShapeProps* kxshapeprops,
+		PHY_MaterialProps*	kxmaterial,
+		struct	KX_ObjectProperties*	objprop)
 
 
 {
@@ -150,23 +150,23 @@ void	KX_ConvertSumoObject(	KX_GameObject* gameobj,
 						objprop->m_boundobject.box.m_extends[1], 
 						objprop->m_boundobject.box.m_extends[2]);
 				smprop->m_inertia.scale(objprop->m_boundobject.box.m_extends[0]*objprop->m_boundobject.box.m_extends[0],
-					objprop->m_boundobject.box.m_extends[1]*objprop->m_boundobject.box.m_extends[1],
-					objprop->m_boundobject.box.m_extends[2]*objprop->m_boundobject.box.m_extends[2]);
+						objprop->m_boundobject.box.m_extends[1]*objprop->m_boundobject.box.m_extends[1],
+						objprop->m_boundobject.box.m_extends[2]*objprop->m_boundobject.box.m_extends[2]);
 				smprop->m_inertia *= smprop->m_mass/MT_Vector3(objprop->m_boundobject.box.m_extends).length();
 				break;
 			case KX_BOUNDCYLINDER:
 				shape = DT_NewCylinder(smprop->m_radius, objprop->m_boundobject.c.m_height);
 				smprop->m_inertia.scale(smprop->m_mass*smprop->m_radius*smprop->m_radius,
-					smprop->m_mass*smprop->m_radius*smprop->m_radius,
-					smprop->m_mass*objprop->m_boundobject.c.m_height*objprop->m_boundobject.c.m_height);
+						smprop->m_mass*smprop->m_radius*smprop->m_radius,
+						smprop->m_mass*objprop->m_boundobject.c.m_height*objprop->m_boundobject.c.m_height);
 				break;
 			case KX_BOUNDCONE:
 				shape = DT_NewCone(objprop->m_radius, objprop->m_boundobject.c.m_height);
 				smprop->m_inertia.scale(smprop->m_mass*smprop->m_radius*smprop->m_radius,
-					smprop->m_mass*smprop->m_radius*smprop->m_radius,
-					smprop->m_mass*objprop->m_boundobject.c.m_height*objprop->m_boundobject.c.m_height);
+						smprop->m_mass*smprop->m_radius*smprop->m_radius,
+						smprop->m_mass*objprop->m_boundobject.c.m_height*objprop->m_boundobject.c.m_height);
 				break;
-			/* Dynamic mesh objects.  WARNING! slow. */
+				/* Dynamic mesh objects.  WARNING! slow. */
 			case KX_BOUNDPOLYTOPE:
 				polytope = true;
 				// fall through
@@ -186,15 +186,15 @@ void	KX_ConvertSumoObject(	KX_GameObject* gameobj,
 				shape = DT_NewSphere(objprop->m_radius);
 				smprop->m_inertia *= smprop->m_mass*smprop->m_radius*smprop->m_radius;
 				break;
-				
+
 		}
-		
+
 		sumoObj = new SM_Object(shape, !objprop->m_ghost?smmaterial:NULL,smprop,NULL);
-		
+
 		sumoObj->setRigidBody(objprop->m_angular_rigidbody?true:false);
-		
+
 		BL_RegisterSumoObject(gameobj,sceneptr,sumoObj,"",true, true);
-		
+
 	} 
 	else {
 		// non physics object
@@ -320,12 +320,11 @@ static void	BL_RegisterSumoObject(
 		physicscontroller->SetObject(gameobj->GetSGNode());
 }
 
-static DT_ShapeHandle InstancePhysicsComplex(RAS_MeshObject* meshobj, int vtxarray, RAS_IPolyMaterial *mat)
+static DT_ShapeHandle InstancePhysicsComplex(RAS_MeshObject* meshobj, RAS_DisplayArray *darray, RAS_IPolyMaterial *mat)
 {
 	// instance a mesh from a single vertex array & material
-	const RAS_TexVert *vertex_array = &((*meshobj->GetVertexCache(mat)[vtxarray])[0]);
-	//const KX_IndexArray &index_array = *meshobj->GetIndexCache(mat)[vtxarray];
-	DT_VertexBaseHandle vertex_base = DT_NewVertexBase(vertex_array[0].getLocalXYZ(), sizeof(RAS_TexVert));
+	const RAS_TexVert *vertex_array = &darray->m_vertex[0];
+	DT_VertexBaseHandle vertex_base = DT_NewVertexBase(vertex_array[0].getXYZ(), sizeof(RAS_TexVert));
 	
 	DT_ShapeHandle shape = DT_NewComplexShape(vertex_base);
 	
@@ -337,15 +336,19 @@ static DT_ShapeHandle InstancePhysicsComplex(RAS_MeshObject* meshobj, int vtxarr
 		// only add polygons that have the collisionflag set
 		if (poly->IsCollider())
 		{
-			DT_VertexIndices(3, poly->GetVertexIndexBase().m_indexarray);
+			DT_Begin();
+			  DT_VertexIndex(poly->GetVertexOffset(0));
+			  DT_VertexIndex(poly->GetVertexOffset(1));
+			  DT_VertexIndex(poly->GetVertexOffset(2));
+			DT_End();
 			
 			// tesselate
 			if (poly->VertexCount() == 4)
 			{
 				DT_Begin();
-				  DT_VertexIndex(poly->GetVertexIndexBase().m_indexarray[0]);
-				  DT_VertexIndex(poly->GetVertexIndexBase().m_indexarray[2]);
-				  DT_VertexIndex(poly->GetVertexIndexBase().m_indexarray[3]);
+				  DT_VertexIndex(poly->GetVertexOffset(0));
+				  DT_VertexIndex(poly->GetVertexOffset(2));
+				  DT_VertexIndex(poly->GetVertexOffset(3));
 				DT_End();
 			}
 		}
@@ -354,16 +357,15 @@ static DT_ShapeHandle InstancePhysicsComplex(RAS_MeshObject* meshobj, int vtxarr
 	//DT_VertexIndices(indices.size(), &indices[0]);
 	DT_EndComplexShape();
 	
-	map_gamemesh_to_instance.insert(GEN_HashedPtr(meshobj), new KX_PhysicsInstance(vertex_base, vtxarray, mat));
+	map_gamemesh_to_instance.insert(GEN_HashedPtr(meshobj), new KX_PhysicsInstance(vertex_base, darray, mat));
 	return shape;
 }
 
-static DT_ShapeHandle InstancePhysicsPolytope(RAS_MeshObject* meshobj, int vtxarray, RAS_IPolyMaterial *mat)
+static DT_ShapeHandle InstancePhysicsPolytope(RAS_MeshObject* meshobj, RAS_DisplayArray *darray, RAS_IPolyMaterial *mat)
 {
 	// instance a mesh from a single vertex array & material
-	const RAS_TexVert *vertex_array = &((*meshobj->GetVertexCache(mat)[vtxarray])[0]);
-	//const KX_IndexArray &index_array = *meshobj->GetIndexCache(mat)[vtxarray];
-	DT_VertexBaseHandle vertex_base = DT_NewVertexBase(vertex_array[0].getLocalXYZ(), sizeof(RAS_TexVert));
+	const RAS_TexVert *vertex_array = &darray->m_vertex[0];
+	DT_VertexBaseHandle vertex_base = DT_NewVertexBase(vertex_array[0].getXYZ(), sizeof(RAS_TexVert));
 	
 	std::vector<DT_Index> indices;
 	for (int p = 0; p < meshobj->NumPolygons(); p++)
@@ -373,12 +375,12 @@ static DT_ShapeHandle InstancePhysicsPolytope(RAS_MeshObject* meshobj, int vtxar
 		// only add polygons that have the collisionflag set
 		if (poly->IsCollider())
 		{
-			indices.push_back(poly->GetVertexIndexBase().m_indexarray[0]);
-			indices.push_back(poly->GetVertexIndexBase().m_indexarray[1]);
-			indices.push_back(poly->GetVertexIndexBase().m_indexarray[2]);
+			indices.push_back(poly->GetVertexOffset(0));
+			indices.push_back(poly->GetVertexOffset(1));
+			indices.push_back(poly->GetVertexOffset(2));
 			
 			if (poly->VertexCount() == 4)
-				indices.push_back(poly->GetVertexIndexBase().m_indexarray[3]);
+				indices.push_back(poly->GetVertexOffset(3));
 		}
 	}
 
@@ -386,7 +388,7 @@ static DT_ShapeHandle InstancePhysicsPolytope(RAS_MeshObject* meshobj, int vtxar
 	DT_VertexIndices(indices.size(), &indices[0]);
 	DT_EndPolytope();
 	
-	map_gamemesh_to_instance.insert(GEN_HashedPtr(meshobj), new KX_PhysicsInstance(vertex_base, vtxarray, mat));
+	map_gamemesh_to_instance.insert(GEN_HashedPtr(meshobj), new KX_PhysicsInstance(vertex_base, darray, mat));
 	return shape;
 }
 
@@ -398,8 +400,8 @@ bool KX_ReInstanceShapeFromMesh(RAS_MeshObject* meshobj)
 	KX_PhysicsInstance *instance = *map_gamemesh_to_instance[GEN_HashedPtr(meshobj)];
 	if (instance)
 	{
-		const RAS_TexVert *vertex_array = &((*meshobj->GetVertexCache(instance->m_material)[instance->m_vtxarray])[0]);
-		DT_ChangeVertexBase(instance->m_vertexbase, vertex_array[0].getLocalXYZ());
+		const RAS_TexVert *vertex_array = &instance->m_darray->m_vertex[0];
+		DT_ChangeVertexBase(instance->m_vertexbase, vertex_array[0].getXYZ());
 		return true;
 	}
 	return false;
@@ -425,7 +427,7 @@ static DT_ShapeHandle CreateShapeFromMesh(RAS_MeshObject* meshobj, bool polytope
 	// Count the number of collision polygons and check they all come from the same 
 	// vertex array
 	int numvalidpolys = 0;
-	int vtxarray = -1;
+	RAS_DisplayArray *darray = NULL;
 	RAS_IPolyMaterial *poly_material = NULL;
 	bool reinstance = true;
 
@@ -437,14 +439,14 @@ static DT_ShapeHandle CreateShapeFromMesh(RAS_MeshObject* meshobj, bool polytope
 		if (poly->IsCollider())
 		{
 			// check polygon is from the same vertex array
-			if (poly->GetVertexIndexBase().m_vtxarray != vtxarray)
+			if (poly->GetDisplayArray() != darray)
 			{
-				if (vtxarray < 0)
-					vtxarray = poly->GetVertexIndexBase().m_vtxarray;
+				if (darray == NULL)
+					darray = poly->GetDisplayArray();
 				else
 				{
 					reinstance = false;
-					vtxarray = -1;
+					darray = NULL;
 				}
 			}
 			
@@ -478,9 +480,9 @@ static DT_ShapeHandle CreateShapeFromMesh(RAS_MeshObject* meshobj, bool polytope
 	if (reinstance)
 	{
 		if (polytope)
-			shape = InstancePhysicsPolytope(meshobj, vtxarray, poly_material);
+			shape = InstancePhysicsPolytope(meshobj, darray, poly_material);
 		else
-			shape = InstancePhysicsComplex(meshobj, vtxarray, poly_material);
+			shape = InstancePhysicsComplex(meshobj, darray, poly_material);
 	}
 	else
 	{
@@ -489,7 +491,7 @@ static DT_ShapeHandle CreateShapeFromMesh(RAS_MeshObject* meshobj, bool polytope
 			std::cout << "CreateShapeFromMesh: " << meshobj->GetName() << " is not suitable for polytope." << std::endl;
 			if (!poly_material)
 				std::cout << "                     Check mesh materials." << std::endl;
-			if (vtxarray < 0)
+			if (darray == NULL)
 				std::cout << "                     Check number of vertices." << std::endl;
 		}
 		
@@ -505,18 +507,10 @@ static DT_ShapeHandle CreateShapeFromMesh(RAS_MeshObject* meshobj, bool polytope
 			if (poly->IsCollider())
 			{   /* We have to tesselate here because SOLID can only raycast triangles */
 			   DT_Begin();
-				/* V1 */
-				DT_Vertex(meshobj->GetVertex(poly->GetVertexIndexBase().m_vtxarray, 
-					poly->GetVertexIndexBase().m_indexarray[2],
-					poly->GetMaterial()->GetPolyMaterial())->getLocalXYZ());
-				/* V2 */
-				DT_Vertex(meshobj->GetVertex(poly->GetVertexIndexBase().m_vtxarray, 
-					poly->GetVertexIndexBase().m_indexarray[1],
-					poly->GetMaterial()->GetPolyMaterial())->getLocalXYZ());
-				/* V3 */
-				DT_Vertex(meshobj->GetVertex(poly->GetVertexIndexBase().m_vtxarray, 
-					poly->GetVertexIndexBase().m_indexarray[0],
-					poly->GetMaterial()->GetPolyMaterial())->getLocalXYZ());
+				/* V1, V2, V3 */
+				DT_Vertex(poly->GetVertex(2)->getXYZ());
+				DT_Vertex(poly->GetVertex(1)->getXYZ());
+				DT_Vertex(poly->GetVertex(0)->getXYZ());
 				
 				numvalidpolys++;
 			   DT_End();
@@ -524,18 +518,10 @@ static DT_ShapeHandle CreateShapeFromMesh(RAS_MeshObject* meshobj, bool polytope
 				if (poly->VertexCount() == 4)
 				{
 				   DT_Begin();
-					/* V1 */
-					DT_Vertex(meshobj->GetVertex(poly->GetVertexIndexBase().m_vtxarray, 
-						poly->GetVertexIndexBase().m_indexarray[3],
-						poly->GetMaterial()->GetPolyMaterial())->getLocalXYZ());
-					/* V3 */
-					DT_Vertex(meshobj->GetVertex(poly->GetVertexIndexBase().m_vtxarray, 
-						poly->GetVertexIndexBase().m_indexarray[2],
-						poly->GetMaterial()->GetPolyMaterial())->getLocalXYZ());
-					/* V4 */
-					DT_Vertex(meshobj->GetVertex(poly->GetVertexIndexBase().m_vtxarray, 
-						poly->GetVertexIndexBase().m_indexarray[0],
-						poly->GetMaterial()->GetPolyMaterial())->getLocalXYZ());
+					/* V1, V3, V4 */
+					DT_Vertex(poly->GetVertex(3)->getXYZ());
+					DT_Vertex(poly->GetVertex(2)->getXYZ());
+					DT_Vertex(poly->GetVertex(0)->getXYZ());
 				
 					numvalidpolys++;
 				   DT_End();
diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp
index cc2956813c1..bec5d188f06 100644
--- a/source/gameengine/Ketsji/KX_GameObject.cpp
+++ b/source/gameengine/Ketsji/KX_GameObject.cpp
@@ -79,10 +79,12 @@ KX_GameObject::KX_GameObject(
 	m_bDyna(false),
 	m_layer(0),
 	m_pBlenderObject(NULL),
+	m_pBlenderGroupObject(NULL),
 	m_bSuspendDynamics(false),
 	m_bUseObjectColor(false),
 	m_bIsNegativeScaling(false),
 	m_bVisible(true),
+	m_bCulled(true),
 	m_pPhysicsController1(NULL),
 	m_pPhysicsEnvironment(NULL),
 	m_xray(false),
@@ -101,8 +103,11 @@ KX_GameObject::KX_GameObject(
 };
 
 
+
 KX_GameObject::~KX_GameObject()
 {
+	RemoveMeshes();
+
 	// is this delete somewhere ?
 	//if (m_sumoObj)
 	//	delete m_sumoObj;
@@ -164,7 +169,6 @@ STR_String KX_GameObject::GetName()
 void KX_GameObject::SetName(STR_String name)
 {
 	m_name = name;
-
 };								// Set the name of the value
 
 
@@ -285,11 +289,11 @@ void KX_GameObject::ProcessReplica(KX_GameObject* replica)
 CValue* KX_GameObject::GetReplica()
 {
 	KX_GameObject* replica = new KX_GameObject(*this);
-	
+
 	// this will copy properties and so on...
 	CValue::AddDataToReplica(replica);
 	ProcessReplica(replica);
-	
+
 	return replica;
 }
 
@@ -355,24 +359,26 @@ double*	KX_GameObject::GetOpenGLMatrix()
 	return fl;
 }
 
+void KX_GameObject::AddMeshUser()
+{
+	for (size_t i=0;i<m_meshes.size();i++)
+		m_meshes[i]->AddMeshUser(this);
+	
+	UpdateBuckets();
+}
 
-
-void KX_GameObject::Bucketize()
+void KX_GameObject::UpdateBuckets()
 {
 	double* fl = GetOpenGLMatrix();
 
 	for (size_t i=0;i<m_meshes.size();i++)
-		m_meshes[i]->Bucketize(fl, this, m_bUseObjectColor, m_objectColor);
+		m_meshes[i]->UpdateBuckets(this, fl, m_bUseObjectColor, m_objectColor, m_bVisible, m_bCulled);
 }
 
-
-
 void KX_GameObject::RemoveMeshes()
 {
-	double* fl = GetOpenGLMatrix();
-
 	for (size_t i=0;i<m_meshes.size();i++)
-		m_meshes[i]->RemoveFromBuckets(fl, this);
+		m_meshes[i]->RemoveFromBuckets(this);
 
 	//note: meshes can be shared, and are deleted by KX_BlenderSceneConverter
 
@@ -455,13 +461,14 @@ KX_GameObject::UpdateMaterialData(
 	)
 {
 	int mesh = 0;
-
 	if (((unsigned int)mesh < m_meshes.size()) && mesh >= 0) {
-		RAS_MaterialBucket::Set::iterator mit = m_meshes[mesh]->GetFirstMaterial();
+		list<RAS_MeshMaterial>::iterator mit = m_meshes[mesh]->GetFirstMaterial();
+
 		for(; mit != m_meshes[mesh]->GetLastMaterial(); ++mit)
 		{
-			RAS_IPolyMaterial* poly = (*mit)->GetPolyMaterial();
-			if(poly->GetFlag() & RAS_BLENDERMAT)
+			RAS_IPolyMaterial* poly = mit->m_bucket->GetPolyMaterial();
+
+			if(poly->GetFlag() & RAS_BLENDERMAT )
 			{
 				KX_BlenderMaterial *m =  static_cast<KX_BlenderMaterial*>(poly);
 				
@@ -469,8 +476,7 @@ KX_GameObject::UpdateMaterialData(
 				{
 					m->UpdateIPO(rgba, specrgb,hard,spec,ref,emit, alpha);
 					// if mesh has only one material attached to it then use original hack with no need to edit vertices (better performance)
-					if(!(poly->GetFlag() & RAS_BLENDERGLSL))
-						SetObjectColor(rgba);
+					SetObjectColor(rgba);
 				}
 				else
 				{
@@ -504,6 +510,23 @@ KX_GameObject::SetVisible(
 	m_bVisible = v;
 }
 
+bool
+KX_GameObject::GetCulled(
+	void
+	)
+{
+	return m_bCulled;
+}
+
+void
+KX_GameObject::SetCulled(
+	bool c
+	)
+{
+	m_bCulled = c;
+}
+
+
 void
 KX_GameObject::SetLayer(
 	int l
@@ -520,44 +543,6 @@ KX_GameObject::GetLayer(
 	return m_layer;
 }
 
-// used by Python, and the actuatorshould _not_ be misused by the
-// scene!
-void 
-KX_GameObject::MarkVisible(
-	bool visible
-	)
-{
-	/* If explicit visibility settings are used, this is
-	 * determined on this level. Maybe change this to mesh level
-	 * later on? */
-	
-	double* fl = GetOpenGLMatrixPtr()->getPointer();
-	for (size_t i=0;i<m_meshes.size();i++)
-	{
-		m_meshes[i]->MarkVisible(fl,this,visible,m_bUseObjectColor,m_objectColor);
-	}
-}
-
-
-// Always use the flag?
-void 
-KX_GameObject::MarkVisible(
-	void
-	)
-{
-	double* fl = GetOpenGLMatrixPtr()->getPointer();
-	for (size_t i=0;i<m_meshes.size();i++)
-	{
-		m_meshes[i]->MarkVisible(fl,
-					 this,
-					 m_bVisible,
-					 m_bUseObjectColor,
-					 m_objectColor
-			);
-	}
-}
-
-
 void KX_GameObject::addLinearVelocity(const MT_Vector3& lin_vel,bool local)
 {
 	if (m_pPhysicsController1)
@@ -1052,6 +1037,7 @@ int KX_GameObject::_setattr(const STR_String& attr, PyObject *value)	// _setattr
 		if (attr == "visible")
 		{
 			SetVisible(val != 0);
+			UpdateBuckets();
 			return 0;
 		}
 	}
@@ -1221,8 +1207,8 @@ PyObject* KX_GameObject::PySetVisible(PyObject* self, PyObject* value)
 		return NULL;
 	}
 	
-	MarkVisible(visible!=0);
-	m_bVisible = (visible!=0);
+	SetVisible(visible != 0);
+	UpdateBuckets();
 	Py_RETURN_NONE;
 	
 }
diff --git a/source/gameengine/Ketsji/KX_GameObject.h b/source/gameengine/Ketsji/KX_GameObject.h
index 508bc7cdfd0..9dcf6526448 100644
--- a/source/gameengine/Ketsji/KX_GameObject.h
+++ b/source/gameengine/Ketsji/KX_GameObject.h
@@ -75,15 +75,17 @@ protected:
 	int									m_layer;
 	std::vector<RAS_MeshObject*>		m_meshes;
 	struct Object*						m_pBlenderObject;
+	struct Object*						m_pBlenderGroupObject;
 	
 	bool								m_bSuspendDynamics;
 	bool								m_bUseObjectColor;
 	bool								m_bIsNegativeScaling;
 	MT_Vector4							m_objectColor;
 
-	// Is this object set to be visible? Only useful for the
-	// visibility subsystem right now.
-	bool       m_bVisible; 
+	// visible = user setting
+	// culled = while rendering, depending on camera
+	bool       							m_bVisible; 
+	bool       							m_bCulled; 
 
 	KX_IPhysicsController*				m_pPhysicsController1;
 	// used for ray casting
@@ -395,6 +397,16 @@ public:
 	{
 		m_pBlenderObject = obj;
 	}
+
+	struct Object* GetBlenderGroupObject( )
+	{
+		return m_pBlenderGroupObject;
+	}
+
+	void SetBlenderGroupObject( struct Object* obj)
+	{
+		m_pBlenderGroupObject = obj;
+	}
 	
 	bool IsDupliGroup()
 	{ 
@@ -538,18 +550,22 @@ public:
 	/**
 	 * @section Mesh accessor functions.
 	 */
-	
+
 	/**	
-	 * Run through the meshes associated with this
-	 * object and bucketize them. See RAS_Mesh for
-	 * more details on this function. Interesting to 
-	 * note that polygon bucketizing seems to happen on a per
-	 * object basis. Which may explain why there is such
-	 * a big performance gain when all static objects
-	 * are joined into 1.
+	 * Update buckets to indicate that there is a new
+	 * user of this object's meshes.
 	 */
 		void						
-	Bucketize(
+	AddMeshUser(
+	);
+	
+	/**	
+	 * Update buckets with data about the mesh after
+	 * creating or duplicating the object, changing
+	 * visibility, object color, .. .
+	 */
+		void						
+	UpdateBuckets(
 	);
 
 	/**
@@ -610,25 +626,8 @@ public:
 	ResetDebugColor(
 	);
 
-	/** 
-	 * Set the visibility of the meshes associated with this
-	 * object.
-	 */
-		void						
-	MarkVisible(
-		bool visible
-	);
-
-	/** 
-	 * Set the visibility according to the visibility flag.
-	 */
-		void						
-	MarkVisible(
-		void
-	);
-
 	/**
-	 * Was this object marked visible? (only for the ewxplicit
+	 * Was this object marked visible? (only for the explicit
 	 * visibility system).
 	 */
 		bool
@@ -644,6 +643,22 @@ public:
 		bool b
 	);
 
+	/**
+	 * Was this object culled?
+	 */
+		bool
+	GetCulled(
+		void
+	);
+
+	/**
+	 * Set culled flag of this object
+	 */
+		void
+	SetCulled(
+		bool c
+	);
+
 	/**
 	 * Change the layer of the object (when it is added in another layer
 	 * than the original layer)
@@ -669,6 +684,14 @@ public:
 		void
 	) { return m_bIsNegativeScaling; }
 
+	/**
+	 * Is this a light?
+	 */
+		virtual bool
+	IsLight(
+		void
+	) { return false; }
+
 	/**
 	 * @section Logic bubbling methods.
 	 */
diff --git a/source/gameengine/Ketsji/KX_ISceneConverter.h b/source/gameengine/Ketsji/KX_ISceneConverter.h
index f069048cd3d..3709fa8c784 100644
--- a/source/gameengine/Ketsji/KX_ISceneConverter.h
+++ b/source/gameengine/Ketsji/KX_ISceneConverter.h
@@ -32,6 +32,8 @@
 #include "STR_String.h"
 #include "KX_Python.h"
 
+struct Scene;
+
 class KX_ISceneConverter 
 {
 
@@ -77,6 +79,8 @@ public:
 	// use blender glsl materials
 	virtual void SetGLSLMaterials(bool val) =0;
 	virtual bool GetGLSLMaterials()=0;
+
+	virtual struct Scene* GetBlenderSceneForName(const STR_String& name)=0;
 };
 
 #endif //__KX_ISCENECONVERTER_H
diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
index 1d6cc975ab5..cf98bb72601 100644
--- a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
+++ b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
@@ -96,6 +96,7 @@ double KX_KetsjiEngine::m_ticrate = DEFAULT_LOGIC_TIC_RATE;
 double KX_KetsjiEngine::m_anim_framerate = 25.0;
 double KX_KetsjiEngine::m_suspendedtime = 0.0;
 double KX_KetsjiEngine::m_suspendeddelta = 0.0;
+double KX_KetsjiEngine::m_average_framerate = 0.0;
 
 
 /**
@@ -310,6 +311,12 @@ void KX_KetsjiEngine::EndFrame()
 	{
 		RenderDebugProperties();
 	}
+
+	m_average_framerate = m_logger->GetAverage();
+	if (m_average_framerate < 1e-6)
+		m_average_framerate = 1e-6;
+	m_average_framerate = 1.0/m_average_framerate;
+
 	// Go to next profiling measurement, time spend after this call is shown in the next frame.
 	m_logger->NextMeasurement(m_kxsystem->GetTimeInSeconds());
 
@@ -321,8 +328,6 @@ void KX_KetsjiEngine::EndFrame()
 
 	
 	m_canvas->EndDraw();
-	
-
 }
 
 //#include "PIL_time.h"
@@ -897,11 +902,18 @@ void KX_KetsjiEngine::SetupRenderFrame(KX_Scene *scene, KX_Camera* cam)
 
 void KX_KetsjiEngine::RenderShadowBuffers(KX_Scene *scene)
 {
-	CListValue *lightlist = scene->GetLightList();
+	CListValue *objectlist = scene->GetObjectList();
 	int i, drawmode;
 
-	for(i=0; i<lightlist->GetCount(); i++) {
-		KX_LightObject *light = (KX_LightObject*)lightlist->GetValue(i);
+	m_rendertools->SetAuxilaryClientInfo(scene);
+
+	for(i=0; i<objectlist->GetCount(); i++) {
+		KX_GameObject *gameobj = (KX_GameObject*)objectlist->GetValue(i);
+
+		if(!gameobj->IsLight())
+			continue;
+
+		KX_LightObject *light = (KX_LightObject*)gameobj;
 
 		light->Update();
 
@@ -1281,12 +1293,13 @@ void KX_KetsjiEngine::RemoveScheduledScenes()
 
 KX_Scene* KX_KetsjiEngine::CreateScene(const STR_String& scenename)
 {
-
+	Scene *scene = m_sceneconverter->GetBlenderSceneForName(scenename);
 	KX_Scene* tmpscene = new KX_Scene(m_keyboarddevice,
 									  m_mousedevice,
 									  m_networkdevice,
 									  m_audiodevice,
-									  scenename);
+									  scenename,
+									  scene);
 
 	m_sceneconverter->ConvertScene(scenename,
 							  tmpscene,
@@ -1442,6 +1455,11 @@ void KX_KetsjiEngine::SetAnimFrameRate(double framerate)
 	m_anim_framerate = framerate;
 }
 
+double KX_KetsjiEngine::GetAverageFrameRate()
+{
+	return m_average_framerate;
+}
+
 void KX_KetsjiEngine::SetTimingDisplay(bool frameRate, bool profile, bool properties)
 {
 	m_show_framerate = frameRate;
diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.h b/source/gameengine/Ketsji/KX_KetsjiEngine.h
index 77b69ec2d9e..97458362f0f 100644
--- a/source/gameengine/Ketsji/KX_KetsjiEngine.h
+++ b/source/gameengine/Ketsji/KX_KetsjiEngine.h
@@ -149,6 +149,8 @@ private:
 	
 	/** Labels for profiling display. */
 	static const char		m_profileLabels[tc_numCategories][15];
+	/** Last estimated framerate */
+	static double			m_average_framerate;
 	/** Show the framerate on the game display? */
 	bool					m_show_framerate;
 	/** Show profiling info on the game display? */
@@ -271,6 +273,11 @@ public:
 	 */
 	static void SetAnimFrameRate(double framerate);
 
+	/**
+	 * Gets the last estimated average framerate
+	 */
+	static double GetAverageFrameRate();
+
 	/**
 	 * Activates or deactivates timing information display.
 	 * @param frameRate		Display for frame rate on or off.
diff --git a/source/gameengine/Ketsji/KX_Light.cpp b/source/gameengine/Ketsji/KX_Light.cpp
index 4e3d6180d22..6cfe5610863 100644
--- a/source/gameengine/Ketsji/KX_Light.cpp
+++ b/source/gameengine/Ketsji/KX_Light.cpp
@@ -42,14 +42,13 @@
 
 #include "KX_PyMath.h"
 
-#ifdef BLENDER_GLSL
+#include "DNA_object_types.h"
 #include "GPU_material.h"
-#endif
  
 KX_LightObject::KX_LightObject(void* sgReplicationInfo,SG_Callbacks callbacks,
 							   class RAS_IRenderTools* rendertools,
 							   const RAS_LightObject&	lightobj,
-							   struct GPULamp *gpulamp,
+							   bool glsl,
 							   PyTypeObject* T
 							   )
  :
@@ -59,7 +58,8 @@ KX_LightObject::KX_LightObject(void* sgReplicationInfo,SG_Callbacks callbacks,
 	m_lightobj = lightobj;
 	m_lightobj.m_worldmatrix = GetOpenGLMatrixPtr();
 	m_rendertools->AddLight(&m_lightobj);
-	m_gpulamp = gpulamp;
+	m_glsl = glsl;
+	m_blenderscene = ((KX_Scene*)sgReplicationInfo)->GetBlenderScene();
 };
 
 
@@ -73,7 +73,7 @@ CValue*		KX_LightObject::GetReplica()
 {
 
 	KX_LightObject* replica = new KX_LightObject(*this);
-	
+
 	// this will copy properties and so on...
 	CValue::AddDataToReplica(replica);
 
@@ -81,13 +81,23 @@ CValue*		KX_LightObject::GetReplica()
 	
 	replica->m_lightobj.m_worldmatrix = replica->GetOpenGLMatrixPtr();
 	m_rendertools->AddLight(&replica->m_lightobj);
+
 	return replica;
 }
 
+GPULamp *KX_LightObject::GetGPULamp()
+{
+	if(m_glsl)
+		return GPU_lamp_from_blender(m_blenderscene, GetBlenderObject(), GetBlenderGroupObject());
+	else
+		return false;
+}
+
 void KX_LightObject::Update()
 {
-#ifdef BLENDER_GLSL
-	if(m_gpulamp) {
+	GPULamp *lamp;
+
+	if((lamp = GetGPULamp())) {
 		float obmat[4][4];
 		double *dobmat = GetOpenGLMatrixPtr()->getPointer();
 
@@ -95,38 +105,39 @@ void KX_LightObject::Update()
 			for(int j=0; j<4; j++, dobmat++)
 				obmat[i][j] = (float)*dobmat;
 
-		GPU_lamp_update(m_gpulamp, obmat);
+		GPU_lamp_update(lamp, obmat);
 	}
-#endif
 }
 
 bool KX_LightObject::HasShadowBuffer()
 {
-#ifdef BLENDER_GLSL
-	return (m_gpulamp && GPU_lamp_has_shadow_buffer(m_gpulamp));
-#else
-	return false;
-#endif
+	GPULamp *lamp;
+
+	if((lamp = GetGPULamp()))
+		return GPU_lamp_has_shadow_buffer(lamp);
+	else
+		return false;
 }
 
 int KX_LightObject::GetShadowLayer()
 {
-#ifdef BLENDER_GLSL
-	if(m_gpulamp)
-		return GPU_lamp_shadow_layer(m_gpulamp);
+	GPULamp *lamp;
+
+	if((lamp = GetGPULamp()))
+		return GPU_lamp_shadow_layer(lamp);
 	else
-#endif
 		return 0;
 }
 
 void KX_LightObject::BindShadowBuffer(RAS_IRasterizer *ras, KX_Camera *cam, MT_Transform& camtrans)
 {
-#ifdef BLENDER_GLSL
+	GPULamp *lamp;
 	float viewmat[4][4], winmat[4][4];
 	int winsize;
 
 	/* bind framebuffer */
-	GPU_lamp_shadow_buffer_bind(m_gpulamp, viewmat, &winsize, winmat);
+	lamp = GetGPULamp();
+	GPU_lamp_shadow_buffer_bind(lamp, viewmat, &winsize, winmat);
 
 	/* setup camera transformation */
 	MT_Matrix4x4 modelviewmat((float*)viewmat);
@@ -146,14 +157,12 @@ void KX_LightObject::BindShadowBuffer(RAS_IRasterizer *ras, KX_Camera *cam, MT_T
 	ras->SetProjectionMatrix(projectionmat);
 	ras->SetViewMatrix(modelviewmat, cam->NodeGetWorldPosition(),
 		cam->GetCameraLocation(), cam->GetCameraOrientation());
-#endif
 }
 
 void KX_LightObject::UnbindShadowBuffer(RAS_IRasterizer *ras)
 {
-#ifdef BLENDER_GLSL
-	GPU_lamp_shadow_buffer_unbind(m_gpulamp);
-#endif
+	GPULamp *lamp = GetGPULamp();
+	GPU_lamp_shadow_buffer_unbind(lamp);
 }
 
 PyObject* KX_LightObject::_getattr(const STR_String& attr)
diff --git a/source/gameengine/Ketsji/KX_Light.h b/source/gameengine/Ketsji/KX_Light.h
index 62eb26c61a8..e5dbf0b7f4a 100644
--- a/source/gameengine/Ketsji/KX_Light.h
+++ b/source/gameengine/Ketsji/KX_Light.h
@@ -33,6 +33,7 @@
 #include "KX_GameObject.h"
 
 struct GPULamp;
+struct Scene;
 class KX_Camera;
 class RAS_IRasterizer;
 class RAS_IRenderTools;
@@ -44,16 +45,18 @@ class KX_LightObject : public KX_GameObject
 protected:
 	RAS_LightObject		m_lightobj;
 	class RAS_IRenderTools*	m_rendertools;	//needed for registering and replication of lightobj
-	struct GPULamp		*m_gpulamp;
-	static char		doc[];
+	bool				m_glsl;
+	Scene*				m_blenderscene;
+	static char			doc[];
 
 public:
-	KX_LightObject(void* sgReplicationInfo,SG_Callbacks callbacks,class RAS_IRenderTools* rendertools,const struct RAS_LightObject&	lightobj, struct GPULamp *gpulamp, PyTypeObject *T = &Type);
+	KX_LightObject(void* sgReplicationInfo,SG_Callbacks callbacks,class RAS_IRenderTools* rendertools,const struct RAS_LightObject&	lightobj, bool glsl, PyTypeObject *T = &Type);
 	virtual ~KX_LightObject();
 	virtual CValue*		GetReplica();
 	RAS_LightObject*	GetLightData() { return &m_lightobj;}
 
 	/* GLSL shadow */
+	struct GPULamp *GetGPULamp();
 	bool HasShadowBuffer();
 	int GetShadowLayer();
 	void BindShadowBuffer(class RAS_IRasterizer *ras, class KX_Camera *cam, class MT_Transform& camtrans);
@@ -62,6 +65,8 @@ public:
 	
 	virtual PyObject* _getattr(const STR_String& attr); /* lens, near, far, projection_matrix */
 	virtual int       _setattr(const STR_String& attr, PyObject *pyvalue);
+
+	virtual bool IsLight(void) { return true; }
 };
 
 #endif //__KX_LIGHT
diff --git a/source/gameengine/Ketsji/KX_MeshProxy.cpp b/source/gameengine/Ketsji/KX_MeshProxy.cpp
index 29842af7fb6..5bfe8c70cba 100644
--- a/source/gameengine/Ketsji/KX_MeshProxy.cpp
+++ b/source/gameengine/Ketsji/KX_MeshProxy.cpp
@@ -96,10 +96,11 @@ KX_MeshProxy::_getattr(const STR_String& attr)
 	if (attr == "materials")
 	{
 		PyObject *materials = PyList_New(0);
-		RAS_MaterialBucket::Set::iterator mit = m_meshobj->GetFirstMaterial();
+		list<RAS_MeshMaterial>::iterator mit = m_meshobj->GetFirstMaterial();
 		for(; mit != m_meshobj->GetLastMaterial(); ++mit)
 		{
-			RAS_IPolyMaterial *polymat = (*mit)->GetPolyMaterial();
+			RAS_IPolyMaterial *polymat = mit->m_bucket->GetPolyMaterial();
+
 			if(polymat->GetFlag() & RAS_BLENDERMAT)
 			{
 				KX_BlenderMaterial *mat = static_cast<KX_BlenderMaterial*>(polymat);
@@ -204,11 +205,11 @@ PyObject* KX_MeshProxy::PyGetVertexArrayLength(PyObject* self,
 	
 	if (PyArg_ParseTuple(args,"i",&matid))
 	{
-		RAS_IPolyMaterial* mat = m_meshobj->GetMaterialBucket(matid)->GetPolyMaterial();
+		RAS_MeshMaterial *mmat = m_meshobj->GetMeshMaterial(matid);
+		RAS_IPolyMaterial* mat = mmat->m_bucket->GetPolyMaterial();
+
 		if (mat)
-		{
-			length = m_meshobj->GetVertexArrayLength(mat);
-		}
+			length = m_meshobj->NumVertices(mat);
 	}
 	else {
 		return NULL;
diff --git a/source/gameengine/Ketsji/KX_PolyProxy.cpp b/source/gameengine/Ketsji/KX_PolyProxy.cpp
index 658c8a98e4f..c6f6bc2db01 100644
--- a/source/gameengine/Ketsji/KX_PolyProxy.cpp
+++ b/source/gameengine/Ketsji/KX_PolyProxy.cpp
@@ -112,8 +112,8 @@ KX_PolyProxy::_getattr(const STR_String& attr)
 		unsigned int matid;
 		for (matid=0; matid<m_mesh->NumMaterials(); matid++)
 		{
-			RAS_MaterialBucket* meshBucket = m_mesh->GetMaterialBucket(matid);
-			if (meshBucket == polyBucket)
+			RAS_MeshMaterial* meshMat = m_mesh->GetMeshMaterial(matid);
+			if (meshMat->m_bucket == polyBucket)
 				// found it
 				break;
 		}
@@ -121,19 +121,19 @@ KX_PolyProxy::_getattr(const STR_String& attr)
 	}
 	if (attr == "v1")
 	{
-		return PyInt_FromLong(m_polygon->GetVertexIndexBase().m_indexarray[0]);
+		return PyInt_FromLong(m_polygon->GetVertexOffset(0));
 	}
 	if (attr == "v2")
 	{
-		return PyInt_FromLong(m_polygon->GetVertexIndexBase().m_indexarray[1]);
+		return PyInt_FromLong(m_polygon->GetVertexOffset(1));
 	}
 	if (attr == "v3")
 	{
-		return PyInt_FromLong(m_polygon->GetVertexIndexBase().m_indexarray[2]);
+		return PyInt_FromLong(m_polygon->GetVertexOffset(2));
 	}
 	if (attr == "v4")
 	{
-		return PyInt_FromLong(((m_polygon->VertexCount()>3)?m_polygon->GetVertexIndexBase().m_indexarray[3]:0));
+		return PyInt_FromLong(((m_polygon->VertexCount()>3)?m_polygon->GetVertexOffset(3):0));
 	}
 	if (attr == "visible")
 	{
@@ -178,8 +178,8 @@ KX_PYMETHODDEF_DOC_NOARG(KX_PolyProxy, getMaterialIndex,
 	unsigned int matid;
 	for (matid=0; matid<m_mesh->NumMaterials(); matid++)
 	{
-		RAS_MaterialBucket* meshBucket = m_mesh->GetMaterialBucket(matid);
-		if (meshBucket == polyBucket)
+		RAS_MeshMaterial* meshMat = m_mesh->GetMeshMaterial(matid);
+		if (meshMat->m_bucket == polyBucket)
 			// found it
 			break;
 	}
@@ -234,7 +234,7 @@ KX_PYMETHODDEF_DOC(KX_PolyProxy, getVertexIndex,
 	}
 	if (index < m_polygon->VertexCount())
 	{
-		return PyInt_FromLong(m_polygon->GetVertexIndexBase().m_indexarray[index]);
+		return PyInt_FromLong(m_polygon->GetVertexOffset(index));
 	}
 	return PyInt_FromLong(0);
 }
diff --git a/source/gameengine/Ketsji/KX_PolygonMaterial.cpp b/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
index 144f74a1a4c..c9180bf3a80 100644
--- a/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
+++ b/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
@@ -35,10 +35,6 @@
 #include "BKE_global.h"
 #include "BKE_image.h"
 
-extern "C" {
-#include "BDR_drawmesh.h"
-}
-
 #include "DNA_material_types.h"
 #include "DNA_texture_types.h"
 #include "DNA_image_types.h"
@@ -46,6 +42,8 @@ extern "C" {
 
 #include "IMB_imbuf_types.h"
 
+#include "GPU_draw.h"
+
 #include "MEM_guardedalloc.h"
 
 #include "RAS_LightObject.h"
@@ -63,8 +61,6 @@ KX_PolygonMaterial::KX_PolygonMaterial(const STR_String &texname,
 											   bool alpha,
 											   bool zsort,
 											   int lightlayer,
-											   bool bIsTriangle,
-											   void* clientobject,
 											   struct MTFace* tface,
 											   unsigned int* mcol,
 											   PyTypeObject *T)
@@ -78,9 +74,7 @@ KX_PolygonMaterial::KX_PolygonMaterial(const STR_String &texname,
 							transp,
 							alpha,
 							zsort,
-							lightlayer,
-							bIsTriangle,
-							clientobject),
+							lightlayer),
 		m_tface(tface),
 		m_mcol(mcol),
 		m_material(material),
@@ -140,38 +134,29 @@ void KX_PolygonMaterial::DefaultActivate(RAS_IRasterizer* rasty, TCachingInfo& c
 	if (GetCachingInfo() != cachingInfo)
 	{
 		if (!cachingInfo)
-		{
-			set_tpage(NULL);
-		}
+			GPU_set_tpage(NULL);
+
 		cachingInfo = GetCachingInfo();
 
 		if ((m_drawingmode & 4)&& (rasty->GetDrawingMode() == RAS_IRasterizer::KX_TEXTURED))
 		{
-			update_realtime_texture((struct MTFace*) m_tface, rasty->GetTime());
-			set_tpage(m_tface);
-			rasty->EnableTextures(true);
+			Image *ima = (Image*)m_tface->tpage;
+			GPU_update_image_time(ima, rasty->GetTime());
+			GPU_set_tpage(m_tface);
 		}
 		else
-		{
-			set_tpage(NULL);
-			rasty->EnableTextures(false);
-		}
+			GPU_set_tpage(NULL);
 		
 		if(m_drawingmode & RAS_IRasterizer::KX_TWOSIDE)
-		{
 			rasty->SetCullFace(false);
-		}
 		else
-		{
 			rasty->SetCullFace(true);
-		}
 
-		if (m_drawingmode & RAS_IRasterizer::KX_LINES) {
+		if ((m_drawingmode & RAS_IRasterizer::KX_LINES) ||
+		    (rasty->GetDrawingMode() <= RAS_IRasterizer::KX_WIREFRAME))
 			rasty->SetLines(true);
-		}
-		else {
+		else
 			rasty->SetLines(false);
-		}
 	}
 
 	rasty->SetSpecularity(m_specular[0],m_specular[1],m_specular[2],m_specularity);
@@ -253,7 +238,8 @@ PyObject* KX_PolygonMaterial::_getattr(const STR_String& attr)
 	if (attr == "lightlayer")
 		return PyInt_FromLong(m_lightlayer);
 	if (attr == "triangle")
-		return PyInt_FromLong(m_bIsTriangle);
+		// deprecated, triangle/quads shouldn't have been a material property
+		return 0;
 		
 	if (attr == "diffuse")
 		return PyObjectFrom(m_diffuse);
@@ -333,7 +319,7 @@ int KX_PolygonMaterial::_setattr(const STR_String &attr, PyObject *pyvalue)
 		// This probably won't work...
 		if (attr == "triangle")
 		{
-			m_bIsTriangle = value;
+			// deprecated, triangle/quads shouldn't have been a material property
 			return 0;
 		}
 	}
@@ -386,7 +372,9 @@ KX_PYMETHODDEF_DOC(KX_PolygonMaterial, updateTexture, "updateTexture(tface, rast
 	{
 		MTFace *tface = (MTFace*) PyCObject_AsVoidPtr(pytface);
 		RAS_IRasterizer *rasty = (RAS_IRasterizer*) PyCObject_AsVoidPtr(pyrasty);
-		update_realtime_texture(tface, rasty->GetTime());
+		Image *ima = (Image*)tface->tpage;
+		GPU_update_image_time(ima, rasty->GetTime());
+
 		Py_Return;
 	}
 	
@@ -399,7 +387,7 @@ KX_PYMETHODDEF_DOC(KX_PolygonMaterial, setTexture, "setTexture(tface)")
 	if (PyArg_ParseTuple(args, "O!", &PyCObject_Type, &pytface))
 	{
 		MTFace *tface = (MTFace*) PyCObject_AsVoidPtr(pytface);
-		set_tpage(tface);
+		GPU_set_tpage(tface);
 		Py_Return;
 	}
 	
diff --git a/source/gameengine/Ketsji/KX_PolygonMaterial.h b/source/gameengine/Ketsji/KX_PolygonMaterial.h
index 11c8baa8b1f..fe116f757db 100644
--- a/source/gameengine/Ketsji/KX_PolygonMaterial.h
+++ b/source/gameengine/Ketsji/KX_PolygonMaterial.h
@@ -68,8 +68,6 @@ public:
 		bool alpha,
 		bool zsort,
 		int lightlayer,
-		bool bIsTriangle,
-		void* clientobject,
 		struct MTFace* tface,
 		unsigned int* mcol,
 		PyTypeObject *T = &Type);
diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp
index 4b6a38f18c0..120311fb967 100644
--- a/source/gameengine/Ketsji/KX_PythonInit.cpp
+++ b/source/gameengine/Ketsji/KX_PythonInit.cpp
@@ -57,13 +57,13 @@
 #include "BL_ActionActuator.h"
 #include "RAS_IRasterizer.h"
 #include "RAS_ICanvas.h"
+#include "RAS_BucketManager.h"
 #include "MT_Vector3.h"
 #include "MT_Point3.h"
 #include "ListValue.h"
 #include "KX_Scene.h"
 #include "SND_DeviceManager.h"
 
-#include "RAS_OpenGLRasterizer/RAS_GLExtensionManager.h"
 #include "BL_Shader.h"
 
 #include "KX_PyMath.h"
@@ -83,6 +83,7 @@ extern "C" {
 #include "BKE_utildefines.h"
 #include "BKE_global.h"
 #include "BLI_blenlib.h"
+#include "GPU_material.h"
 
 static void setSandbox(TPythonSecurityLevel level);
 
@@ -90,6 +91,7 @@ static void setSandbox(TPythonSecurityLevel level);
 // 'local' copy of canvas ptr, for window height/width python scripts
 static RAS_ICanvas* gp_Canvas = NULL;
 static KX_Scene*	gp_KetsjiScene = NULL;
+static KX_KetsjiEngine*	gp_KetsjiEngine = NULL;
 static RAS_IRasterizer* gp_Rasterizer = NULL;
 
 void	KX_RasterizerDrawDebugLine(const MT_Vector3& from,const MT_Vector3& to,const MT_Vector3& color)
@@ -270,6 +272,11 @@ static PyObject* gPyGetPhysicsTicRate(PyObject*)
 	return PyFloat_FromDouble(PHY_GetActiveEnvironment()->getFixedTimeStep());
 }
 
+static PyObject* gPyGetAverageFrameRate(PyObject*)
+{
+	return PyFloat_FromDouble(KX_KetsjiEngine::GetAverageFrameRate());
+}
+
 static PyObject* gPyGetBlendFileList(PyObject*, PyObject* args)
 {
 	char cpath[sizeof(G.sce)];
@@ -409,6 +416,7 @@ static struct PyMethodDef game_methods[] = {
 	{"setLogicTicRate", (PyCFunction) gPySetLogicTicRate, METH_VARARGS, "Sets the logic tic rate"},
 	{"getPhysicsTicRate", (PyCFunction) gPyGetPhysicsTicRate, METH_NOARGS, "Gets the physics tic rate"},
 	{"setPhysicsTicRate", (PyCFunction) gPySetPhysicsTicRate, METH_VARARGS, "Sets the physics tic rate"},
+	{"getAverageFrameRate", (PyCFunction) gPyGetAverageFrameRate, METH_NOARGS, "Gets the estimated average frame rate"},
 	{"getBlendFileList", (PyCFunction)gPyGetBlendFileList, METH_VARARGS, "Gets a list of blend files in the same directory as the current blend file"},
 	{"PrintGLInfo", (PyCFunction)pyPrintExt, METH_NOARGS, "Prints GL Extension Info"},
 	{NULL, (PyCFunction) NULL, 0, NULL }
@@ -670,6 +678,76 @@ static PyObject* gPyDisableMotionBlur(PyObject*, PyObject* args)
 	Py_Return;
 }
 
+int getGLSLSettingFlag(char *setting)
+{
+	if(strcmp(setting, "lights") == 0)
+		return G_FILE_GLSL_NO_LIGHTS;
+	else if(strcmp(setting, "shaders") == 0)
+		return G_FILE_GLSL_NO_SHADERS;
+	else if(strcmp(setting, "shadows") == 0)
+		return G_FILE_GLSL_NO_SHADOWS;
+	else if(strcmp(setting, "ramps") == 0)
+		return G_FILE_GLSL_NO_RAMPS;
+	else if(strcmp(setting, "nodes") == 0)
+		return G_FILE_GLSL_NO_NODES;
+	else if(strcmp(setting, "extra_textures") == 0)
+		return G_FILE_GLSL_NO_EXTRA_TEX;
+	else
+		return -1;
+}
+
+static PyObject* gPySetGLSLMaterialSetting(PyObject*,
+											PyObject* args,
+											PyObject*)
+{
+	char *setting;
+	int enable, flag;
+
+	if (PyArg_ParseTuple(args,"si",&setting,&enable))
+	{
+		flag = getGLSLSettingFlag(setting);
+
+		if(flag != -1) {
+			if (enable)
+				G.fileflags &= ~flag;
+			else
+				G.fileflags |= flag;
+
+			/* display lists and GLSL materials need to be remade */
+			if(gp_KetsjiEngine) {
+				KX_SceneList *scenes = gp_KetsjiEngine->CurrentScenes();
+				KX_SceneList::iterator it;
+
+				for(it=scenes->begin(); it!=scenes->end(); it++)
+					if((*it)->GetBucketManager())
+						(*it)->GetBucketManager()->ReleaseDisplayLists();
+			}
+
+			GPU_materials_free();
+		}
+	}
+
+	Py_Return;
+}
+
+static PyObject* gPyGetGLSLMaterialSetting(PyObject*, 
+									 PyObject* args, 
+									 PyObject*)
+{
+	char *setting;
+	int enabled = 0, flag;
+
+	if (PyArg_ParseTuple(args,"s",&setting))
+	{
+		flag = getGLSLSettingFlag(setting);
+
+		if(flag != -1)
+			enabled = ((G.fileflags & flag) != 0);
+	}
+
+	return PyInt_FromLong(enabled);
+}
+
 STR_String	gPyGetWindowHeight__doc__="getWindowHeight doc";
 STR_String	gPyGetWindowWidth__doc__="getWindowWidth doc";
 STR_String	gPyEnableVisibility__doc__="enableVisibility doc";
@@ -703,11 +781,13 @@ static struct PyMethodDef rasterizer_methods[] = {
   {"getEyeSeparation", (PyCFunction) gPyGetEyeSeparation, METH_VARARGS, "get the eye separation for stereo mode"},
   {"setFocalLength", (PyCFunction) gPySetFocalLength, METH_VARARGS, "set the focal length for stereo mode"},
   {"getFocalLength", (PyCFunction) gPyGetFocalLength, METH_VARARGS, "get the focal length for stereo mode"},
+  {"setGLSLMaterialSetting",(PyCFunction) gPySetGLSLMaterialSetting,
+   METH_VARARGS, "set the state of a GLSL material setting"},
+  {"getGLSLMaterialSetting",(PyCFunction) gPyGetGLSLMaterialSetting,
+   METH_VARARGS, "get the state of a GLSL material setting"},
   { NULL, (PyCFunction) NULL, 0, NULL }
 };
 
-
-
 // Initialization function for the module (*must* be called initGameLogic)
 
 static char GameLogic_module_documentation[] =
@@ -720,11 +800,12 @@ static char Rasterizer_module_documentation[] =
 
 
 
-PyObject* initGameLogic(KX_Scene* scene) // quick hack to get gravity hook
+PyObject* initGameLogic(KX_KetsjiEngine *engine, KX_Scene* scene) // quick hack to get gravity hook
 {
 	PyObject* m;
 	PyObject* d;
 
+	gp_KetsjiEngine = engine;
 	gp_KetsjiScene = scene;
 
 	gUseVisibilityTemp=false;
diff --git a/source/gameengine/Ketsji/KX_PythonInit.h b/source/gameengine/Ketsji/KX_PythonInit.h
index f094a1ca575..388d073c6db 100644
--- a/source/gameengine/Ketsji/KX_PythonInit.h
+++ b/source/gameengine/Ketsji/KX_PythonInit.h
@@ -40,7 +40,7 @@ typedef enum {
 extern bool gUseVisibilityTemp;
 
 
-PyObject*	initGameLogic(class KX_Scene* ketsjiscene);
+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);
diff --git a/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.cpp b/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.cpp
index f085ff435dc..d651373869a 100644
--- a/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.cpp
+++ b/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.cpp
@@ -78,7 +78,7 @@ UpdateChildCoordinates(
 	
 	if (parent)
 	{
-		const BL_ArmatureObject *armature = (const BL_ArmatureObject*)(parent->GetSGClientObject());
+		BL_ArmatureObject *armature = (BL_ArmatureObject*)(parent->GetSGClientObject());
 		if (armature)
 		{
 			MT_Matrix4x4 parent_matrix;
diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp
index 1c37fcea77e..2ad0412f1bf 100644
--- a/source/gameengine/Ketsji/KX_Scene.cpp
+++ b/source/gameengine/Ketsji/KX_Scene.cpp
@@ -68,6 +68,7 @@
 #include "SG_IObject.h"
 #include "SG_Tree.h"
 #include "DNA_group_types.h"
+#include "DNA_scene_types.h"
 #include "BKE_anim.h"
 
 #include "KX_SG_NodeRelationships.h"
@@ -116,7 +117,8 @@ KX_Scene::KX_Scene(class SCA_IInputDevice* keyboarddevice,
 				   class SCA_IInputDevice* mousedevice,
 				   class NG_NetworkDeviceInterface *ndi,
 				   class SND_IAudioDevice* adi,
-				   const STR_String& sceneName): 
+				   const STR_String& sceneName,
+				   Scene *scene): 
 	PyObjectPlus(&KX_Scene::Type),
 	m_keyboardmgr(NULL),
 	m_mousemgr(NULL),
@@ -126,7 +128,8 @@ KX_Scene::KX_Scene(class SCA_IInputDevice* keyboarddevice,
 	m_adi(adi),
 	m_networkDeviceInterface(ndi),
 	m_active_camera(NULL),
-	m_ueberExecutionPriority(0)
+	m_ueberExecutionPriority(0),
+	m_blenderScene(scene)
 {
 	m_suspendedtime = 0.0;
 	m_suspendeddelta = 0.0;
@@ -453,7 +456,7 @@ KX_GameObject* KX_Scene::AddNodeReplicaObject(class SG_IObject* node, class CVal
 
 	// this is the list of object that are send to the graphics pipeline
 	m_objectlist->Add(newobj->AddRef());
-	newobj->Bucketize();
+	newobj->AddMeshUser();
 
 	// logic cannot be replicated, until the whole hierarchy is replicated.
 	m_logicHierarchicalGameObjects.push_back(newobj);
@@ -623,6 +626,7 @@ void KX_Scene::DupliGroupRecurse(CValue* obj, int level)
 		if (blgroupobj == blenderobj)
 			// this check is also in group_duplilist()
 			continue;
+
 		gameobj = (KX_GameObject*)m_logicmgr->FindGameObjByBlendObj(blenderobj);
 		if (gameobj == NULL) 
 		{
@@ -630,6 +634,9 @@ void KX_Scene::DupliGroupRecurse(CValue* obj, int level)
 			// Should not happen as dupli group are created automatically 
 			continue;
 		}
+
+		gameobj->SetBlenderGroupObject(blgroupobj);
+
 		if ((blenderobj->lay & group->layer)==0)
 		{
 			// object is not visible in the 3D view, will not be instantiated
@@ -999,7 +1006,7 @@ void KX_Scene::ReplaceMesh(class CValue* obj,void* meshobj)
 			newobj->m_pDeformer = NULL;
 		}
 
-		if (mesh->m_class == 1) 
+		if (mesh->IsDeformed())
 		{
 			// we must create a new deformer but which one?
 			KX_GameObject* parentobj = newobj->GetParent();
@@ -1073,7 +1080,8 @@ void KX_Scene::ReplaceMesh(class CValue* obj,void* meshobj)
 				parentobj->Release();
 		}
 	}
-	gameobj->Bucketize();
+
+	gameobj->AddMeshUser();
 }
 
 
@@ -1225,7 +1233,9 @@ void KX_Scene::MarkSubTreeVisible(SG_Tree *node, RAS_IRasterizer* rasty, bool vi
 				for (int m=0;m<nummeshes;m++)
 					(gameobj->GetMesh(m))->SchedulePolygons(rasty->GetDrawingMode());
 			}
-			gameobj->MarkVisible(visible);
+
+			gameobj->SetCulled(!visible);
+			gameobj->UpdateBuckets();
 		}
 	}
 	if (node->Left())
@@ -1242,7 +1252,8 @@ void KX_Scene::MarkVisible(RAS_IRasterizer* rasty, KX_GameObject* gameobj,KX_Cam
 	
 	// Shadow lamp layers
 	if(layer && !(gameobj->GetLayer() & layer)) {
-		gameobj->MarkVisible(false);
+		gameobj->SetCulled(true);
+		gameobj->UpdateBuckets();
 		return;
 	}
 
@@ -1288,9 +1299,11 @@ void KX_Scene::MarkVisible(RAS_IRasterizer* rasty, KX_GameObject* gameobj,KX_Cam
 		}
 		// Visibility/ non-visibility are marked
 		// elsewhere now.
-		gameobj->MarkVisible();
+		gameobj->SetCulled(false);
+		gameobj->UpdateBuckets();
 	} else {
-		gameobj->MarkVisible(false);
+		gameobj->SetCulled(true);
+		gameobj->UpdateBuckets();
 	}
 }
 
diff --git a/source/gameengine/Ketsji/KX_Scene.h b/source/gameengine/Ketsji/KX_Scene.h
index 1c56dd1ee55..5f7e1167e27 100644
--- a/source/gameengine/Ketsji/KX_Scene.h
+++ b/source/gameengine/Ketsji/KX_Scene.h
@@ -54,6 +54,7 @@
  */
 struct SM_MaterialProps;
 struct SM_ShapeProps;
+struct Scene;
 
 class GEN_HashedPtr;
 class CListValue;
@@ -277,12 +278,15 @@ protected:
 	 */
 	PyObject* m_attrlist;
 
+	struct Scene* m_blenderScene;
+
 public:
 	KX_Scene(class SCA_IInputDevice* keyboarddevice,
 		class SCA_IInputDevice* mousedevice,
 		class NG_NetworkDeviceInterface* ndi,
 		class SND_IAudioDevice* adi,
-		const STR_String& scenename	);
+		const STR_String& scenename,
+		struct Scene* scene);
 
 	virtual	
 	~KX_Scene();
@@ -582,6 +586,10 @@ public:
 	 * was running and not suspended) and the "curtime"
 	 */
 	double getSuspendedDelta();
+	/**
+	 * Returns the Blender scene this was made from
+	 */
+	struct Scene *GetBlenderScene() { return m_blenderScene; }
 };
 
 typedef std::vector<KX_Scene*> KX_SceneList;
diff --git a/source/gameengine/Ketsji/KX_VertexProxy.cpp b/source/gameengine/Ketsji/KX_VertexProxy.cpp
index 5cec65dff1c..25205714308 100644
--- a/source/gameengine/Ketsji/KX_VertexProxy.cpp
+++ b/source/gameengine/Ketsji/KX_VertexProxy.cpp
@@ -82,7 +82,7 @@ PyObject*
 KX_VertexProxy::_getattr(const STR_String& attr)
 {
   if (attr == "XYZ")
-  	return PyObjectFrom(MT_Vector3(m_vertex->getLocalXYZ()));
+  	return PyObjectFrom(MT_Vector3(m_vertex->getXYZ()));
 
   if (attr == "UV")
   	return PyObjectFrom(MT_Point2(m_vertex->getUV1()));
@@ -102,11 +102,11 @@ KX_VertexProxy::_getattr(const STR_String& attr)
 
   // pos
   if (attr == "x")
-  	return PyFloat_FromDouble(m_vertex->getLocalXYZ()[0]);
+  	return PyFloat_FromDouble(m_vertex->getXYZ()[0]);
   if (attr == "y")
-  	return PyFloat_FromDouble(m_vertex->getLocalXYZ()[1]);
+  	return PyFloat_FromDouble(m_vertex->getXYZ()[1]);
   if (attr == "z")
-  	return PyFloat_FromDouble(m_vertex->getLocalXYZ()[2]);
+  	return PyFloat_FromDouble(m_vertex->getXYZ()[2]);
 
   // Col
   if (attr == "r")
@@ -184,7 +184,7 @@ int    KX_VertexProxy::_setattr(const STR_String& attr, PyObject *pyvalue)
   {
   	float val = PyFloat_AsDouble(pyvalue);
   	// pos
-	MT_Point3 pos(m_vertex->getLocalXYZ());
+	MT_Point3 pos(m_vertex->getXYZ());
   	if (attr == "x")
 	{
 		pos.x() = val;
@@ -312,7 +312,7 @@ PyObject* KX_VertexProxy::PyGetXYZ(PyObject*,
 			       PyObject*, 
 			       PyObject*)
 {
-	return PyObjectFrom(MT_Point3(m_vertex->getLocalXYZ()));
+	return PyObjectFrom(MT_Point3(m_vertex->getXYZ()));
 }
 
 PyObject* KX_VertexProxy::PySetXYZ(PyObject*, 
@@ -426,7 +426,7 @@ PyObject* KX_VertexProxy::PySetUV2(PyObject*,
 	{
 		if (PyVecTo(list, vec))
 		{
-			m_vertex->SetFlag((m_vertex->getFlag()|TV_2NDUV));
+			m_vertex->SetFlag((m_vertex->getFlag()|RAS_TexVert::SECOND_UV));
 			m_vertex->SetUnit(unit);
 			m_vertex->SetUV2(vec);
 			m_mesh->SetMeshModified(true);
diff --git a/source/gameengine/Ketsji/KX_VisibilityActuator.cpp b/source/gameengine/Ketsji/KX_VisibilityActuator.cpp
index b4693a7a7db..5a0cadcbcfe 100644
--- a/source/gameengine/Ketsji/KX_VisibilityActuator.cpp
+++ b/source/gameengine/Ketsji/KX_VisibilityActuator.cpp
@@ -76,7 +76,7 @@ KX_VisibilityActuator::Update()
 	KX_GameObject *obj = (KX_GameObject*) GetParent();
 	
 	obj->SetVisible(m_visible);
-	obj->MarkVisible();
+	obj->UpdateBuckets();
 
 	return true;
 }
diff --git a/source/gameengine/Ketsji/Makefile b/source/gameengine/Ketsji/Makefile
index 995237adf2c..0b48ad8b8c3 100644
--- a/source/gameengine/Ketsji/Makefile
+++ b/source/gameengine/Ketsji/Makefile
@@ -64,13 +64,9 @@ CPPFLAGS += -I../../blender/blenlib
 CPPFLAGS += -I../../blender/include
 CPPFLAGS += -I../../blender/makesdna
 CPPFLAGS += -I../../blender/imbuf
+CPPFLAGS += -I../../blender/gpu
 CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
 
-ifeq ($(WITH_BF_GLEXT),true)
-    CPPFLAGS += -DWITH_GLEXT
-endif
-
-
 ###########################
 
 SOURCEDIR = source/gameengine/Ketsji
diff --git a/source/gameengine/Ketsji/SConscript b/source/gameengine/Ketsji/SConscript
index f6f744b199a..02e7aed82a5 100644
--- a/source/gameengine/Ketsji/SConscript
+++ b/source/gameengine/Ketsji/SConscript
@@ -32,16 +32,13 @@ incs += ' #source/gameengine/SceneGraph #source/gameengine/Physics/common #sourc
 incs += ' #source/gameengine/Physics/BlOde #source/gameengine/Physics/Dummy'
 incs += ' #source/gameengine/Physics/Sumo #source/gameengine/Physics/Sumo/include'
 incs += ' #source/gameengine/Physics/Sumo/Fuzzics/include #source/gameengine/Network/LoopBackNetwork'
-incs += ' #source/blender/misc #source/blender/blenloader #extern/glew/include'
+incs += ' #source/blender/misc #source/blender/blenloader #extern/glew/include #source/blender/gpu'
 
 cflags = []
 if env['OURPLATFORM'] == 'win32-vc':
 	cflags.append('/GR')
 	cflags.append('/Ox')
 
-if env['WITH_BF_GLEXT'] == 1:
-        env['CPPFLAGS'].append('-DWITH_GLEXT')
-
 incs += ' ' + env['BF_SOLID_INC']
 incs += ' ' + env['BF_PYTHON_INC']
 incs += ' ' + env['BF_SDL_INC']
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
index 2ec96c75a68..8fd89295b03 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
@@ -815,9 +815,7 @@ bool CcdShapeConstructionInfo::SetMesh(RAS_MeshObject* meshobj, bool polytope)
 			{
 				for (int i=0;i<poly->VertexCount();i++)
 				{
-					const float* vtx = meshobj->GetVertex(poly->GetVertexIndexBase().m_vtxarray, 
-						poly->GetVertexIndexBase().m_indexarray[i],
-						poly->GetMaterial()->GetPolyMaterial())->getLocalXYZ();
+					const float* vtx = poly->GetVertex(i)->getXYZ();
 					btPoint3 point(vtx[0],vtx[1],vtx[2]);
 					m_vertexArray.push_back(point);
 					numvalidpolys++;
@@ -825,18 +823,15 @@ bool CcdShapeConstructionInfo::SetMesh(RAS_MeshObject* meshobj, bool polytope)
 			} else
 			{
 				{
-					const float* vtx = meshobj->GetVertex(poly->GetVertexIndexBase().m_vtxarray, 
-						poly->GetVertexIndexBase().m_indexarray[2],
-						poly->GetMaterial()->GetPolyMaterial())->getLocalXYZ();
+					const float* vtx = poly->GetVertex(2)->getXYZ();
 					btPoint3 vertex0(vtx[0],vtx[1],vtx[2]);
-					vtx = meshobj->GetVertex(poly->GetVertexIndexBase().m_vtxarray, 
-						poly->GetVertexIndexBase().m_indexarray[1],
-						poly->GetMaterial()->GetPolyMaterial())->getLocalXYZ();
+
+					vtx = poly->GetVertex(1)->getXYZ();
 					btPoint3 vertex1(vtx[0],vtx[1],vtx[2]);
-					vtx = meshobj->GetVertex(poly->GetVertexIndexBase().m_vtxarray, 
-						poly->GetVertexIndexBase().m_indexarray[0],
-						poly->GetMaterial()->GetPolyMaterial())->getLocalXYZ();
+
+					vtx = poly->GetVertex(0)->getXYZ();
 					btPoint3 vertex2(vtx[0],vtx[1],vtx[2]);
+
 					m_vertexArray.push_back(vertex0);
 					m_vertexArray.push_back(vertex1);
 					m_vertexArray.push_back(vertex2);
@@ -845,18 +840,15 @@ bool CcdShapeConstructionInfo::SetMesh(RAS_MeshObject* meshobj, bool polytope)
 				}
 				if (poly->VertexCount() == 4)
 				{
-					const float* vtx = meshobj->GetVertex(poly->GetVertexIndexBase().m_vtxarray, 
-						poly->GetVertexIndexBase().m_indexarray[3],
-						poly->GetMaterial()->GetPolyMaterial())->getLocalXYZ();
+					const float* vtx = poly->GetVertex(3)->getXYZ();
 					btPoint3 vertex0(vtx[0],vtx[1],vtx[2]);
-					vtx = meshobj->GetVertex(poly->GetVertexIndexBase().m_vtxarray, 
-						poly->GetVertexIndexBase().m_indexarray[2],
-						poly->GetMaterial()->GetPolyMaterial())->getLocalXYZ();
+
+					vtx = poly->GetVertex(2)->getXYZ();
 					btPoint3 vertex1(vtx[0],vtx[1],vtx[2]);
-					vtx = meshobj->GetVertex(poly->GetVertexIndexBase().m_vtxarray, 
-						poly->GetVertexIndexBase().m_indexarray[0],
-						poly->GetMaterial()->GetPolyMaterial())->getLocalXYZ();
+
+					vtx = poly->GetVertex(0)->getXYZ();
 					btPoint3 vertex2(vtx[0],vtx[1],vtx[2]);
+
 					m_vertexArray.push_back(vertex0);
 					m_vertexArray.push_back(vertex1);
 					m_vertexArray.push_back(vertex2);
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.h b/source/gameengine/Physics/Bullet/CcdPhysicsController.h
index 8a7f1062f53..a3fbb502c08 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsController.h
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.h
@@ -128,7 +128,8 @@ struct CcdConstructionInfo
 
 
 	CcdConstructionInfo()
-		: m_gravity(0,0,0),
+		: m_localInertiaTensor(1.f, 1.f, 1.f),
+		m_gravity(0,0,0),
 		m_scaling(1.f,1.f,1.f),
 		m_mass(0.f),
 		m_restitution(0.1f),
diff --git a/source/gameengine/PyDoc/GameLogic.py b/source/gameengine/PyDoc/GameLogic.py
index b65bc0f3ce8..af3d2810553 100644
--- a/source/gameengine/PyDoc/GameLogic.py
+++ b/source/gameengine/PyDoc/GameLogic.py
@@ -220,6 +220,13 @@ def setPhysicsTicRate(ticrate):
 	@param ticrate: The new update frequency (in Hz).
 	@type ticrate: float
 	"""
+def getAverageFrameRate():
+	"""
+	Gets the estimated average framerate
+	
+	@return: The estimed average framerate in frames per second
+	@rtype: float
+	"""
 
 def expandPath(path):
 	"""
@@ -245,4 +252,4 @@ def getBlendFileList(path = "//"):
 	@type path: string
 	@return: A list of filenames, with no directory prefix
 	@rtype: list
-	"""
\ No newline at end of file
+	"""
diff --git a/source/gameengine/PyDoc/Rasterizer.py b/source/gameengine/PyDoc/Rasterizer.py
index 3711ac63b3e..7afdcf07f2e 100644
--- a/source/gameengine/PyDoc/Rasterizer.py
+++ b/source/gameengine/PyDoc/Rasterizer.py
@@ -146,3 +146,20 @@ def getFocalLength():
 	
 	@rtype: float
 	"""
+
+def setGLSLMaterialSetting(setting, enable):
+	"""
+	Enables or disables a GLSL material setting.
+	
+	@type setting: string (lights, shaders, shadows, ramps, nodes, extra_textures)
+	@type enable: boolean
+	"""
+
+def getGLSLMaterialSetting(setting, enable):
+	"""
+	Get the state of a GLSL material setting.
+	
+	@type setting: string (lights, shaders, shadows, ramps, nodes, extra_textures)
+	@rtype: boolean
+	"""
+
diff --git a/source/gameengine/Rasterizer/Makefile b/source/gameengine/Rasterizer/Makefile
index e3b1f274ee5..917f70c7108 100644
--- a/source/gameengine/Rasterizer/Makefile
+++ b/source/gameengine/Rasterizer/Makefile
@@ -49,10 +49,6 @@ ifeq ($(OS),darwin)
 	CPPFLAGS += -fpascal-strings
 endif
 
-ifeq ($(WITH_BF_GLEXT),true)
-    CPPFLAGS += -DWITH_GLEXT
-endif
-
 ###############
 
 SOURCEDIR = source/gameengine/Rasterizer
diff --git a/source/gameengine/Rasterizer/RAS_BucketManager.cpp b/source/gameengine/Rasterizer/RAS_BucketManager.cpp
index 82bdce44519..9fb21a3c17b 100644
--- a/source/gameengine/Rasterizer/RAS_BucketManager.cpp
+++ b/source/gameengine/Rasterizer/RAS_BucketManager.cpp
@@ -26,10 +26,6 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #ifdef WIN32
 // don't show these anoying STL warnings
 #pragma warning (disable:4786)
@@ -39,14 +35,54 @@
 #include "RAS_MaterialBucket.h"
 #include "STR_HashedString.h"
 #include "RAS_MeshObject.h"
-#define KX_NUM_MATERIALBUCKETS 100
 #include "RAS_IRasterizer.h"
 #include "RAS_IRenderTools.h"
 
 #include "RAS_BucketManager.h"
 
+#include <algorithm>
 #include <set>
 
+/* sorting */
+
+struct RAS_BucketManager::sortedmeshslot
+{
+public:
+	MT_Scalar m_z;					/* depth */
+	RAS_MeshSlot *m_ms;				/* mesh slot */
+	RAS_MaterialBucket *m_bucket;	/* buck mesh slot came from */
+
+	sortedmeshslot() {}
+
+	void set(RAS_MeshSlot *ms, RAS_MaterialBucket *bucket, const MT_Vector3& pnorm)
+	{
+		// would be good to use the actual bounding box center instead
+		MT_Point3 pos(ms->m_OpenGLMatrix[12], ms->m_OpenGLMatrix[13], ms->m_OpenGLMatrix[14]);
+
+		m_z = MT_dot(pnorm, pos);
+		m_ms = ms;
+		m_bucket = bucket;
+	}
+};
+
+struct RAS_BucketManager::backtofront
+{
+	bool operator()(const sortedmeshslot &a, const sortedmeshslot &b)
+	{
+		return (a.m_z < b.m_z) || (a.m_z == b.m_z && a.m_ms < b.m_ms);
+	}
+};
+
+struct RAS_BucketManager::fronttoback
+{
+	bool operator()(const sortedmeshslot &a, const sortedmeshslot &b)
+	{
+		return (a.m_z > b.m_z) || (a.m_z == b.m_z && a.m_ms > b.m_ms);
+	}
+};
+
+/* bucket manager */
+
 RAS_BucketManager::RAS_BucketManager()
 {
 
@@ -54,153 +90,188 @@ RAS_BucketManager::RAS_BucketManager()
 
 RAS_BucketManager::~RAS_BucketManager()
 {
-		RAS_BucketManagerClearAll();
+	BucketList::iterator it;
+
+	for (it = m_SolidBuckets.begin(); it != m_SolidBuckets.end(); it++)
+		delete (*it);
+
+	for (it = m_AlphaBuckets.begin(); it != m_AlphaBuckets.end(); it++)
+		delete(*it);
+	
+	m_SolidBuckets.clear();
+	m_AlphaBuckets.clear();
 }
 
-/**
- * struct alphamesh holds a mesh, (m_ms) it's depth, (m_z) and the bucket it came from (m_bucket.)
- */
-struct RAS_BucketManager::alphamesh
+void RAS_BucketManager::OrderBuckets(const MT_Transform& cameratrans, BucketList& buckets, vector<sortedmeshslot>& slots, bool alpha)
 {
-public:
-	MT_Scalar m_z;
-	RAS_MaterialBucket::T_MeshSlotList::iterator m_ms;
-	RAS_MaterialBucket *m_bucket;
-	alphamesh(MT_Scalar z, RAS_MaterialBucket::T_MeshSlotList::iterator &ms, RAS_MaterialBucket *bucket) :
-		m_z(z),
-		m_ms(ms),
-		m_bucket(bucket)
-	{}
-};
+	BucketList::iterator bit;
+	list<RAS_MeshSlot>::iterator mit;
+	size_t size = 0, i = 0;
 
-struct RAS_BucketManager::backtofront
-{
-	bool operator()(const alphamesh &a, const alphamesh &b)
-	{
-		return a.m_z < b.m_z;
-	}
-};
-	
+	/* Camera's near plane equation: pnorm.dot(point) + pval,
+	 * but we leave out pval since it's constant anyway */
+	const MT_Vector3 pnorm(cameratrans.getBasis()[2]);
+
+	for (bit = buckets.begin(); bit != buckets.end(); ++bit)
+		for (mit = (*bit)->msBegin(); mit != (*bit)->msEnd(); ++mit)
+			if (!mit->IsCulled())
+				size++;
+
+	slots.resize(size);
+
+	for (bit = buckets.begin(); bit != buckets.end(); ++bit)
+		for (mit = (*bit)->msBegin(); mit != (*bit)->msEnd(); ++mit)
+			if (!mit->IsCulled())
+				slots[i++].set(&*mit, *bit, pnorm);
+		
+	if(alpha)
+		sort(slots.begin(), slots.end(), backtofront());
+	else
+		sort(slots.begin(), slots.end(), fronttoback());
+}
+
+//static int TOTASLOT = 0;
+//static int TOTSLOT = 0;
 
 void RAS_BucketManager::RenderAlphaBuckets(
 	const MT_Transform& cameratrans, RAS_IRasterizer* rasty, RAS_IRenderTools* rendertools)
 {
-	BucketList::iterator bit;
-	std::multiset<alphamesh, backtofront> alphameshset;
-	RAS_MaterialBucket::T_MeshSlotList::iterator mit;
+	vector<sortedmeshslot> slots;
+	vector<sortedmeshslot>::iterator sit;
+
+	// Having depth masks disabled/enabled gives different artifacts in
+	// case no sorting is done or is done inexact. For compatibility, we
+	// disable it.
+	rasty->SetDepthMask(RAS_IRasterizer::KX_DEPTHMASK_DISABLED);
+
+	OrderBuckets(cameratrans, m_AlphaBuckets, slots, true);
 	
-	/* Camera's near plane equation: cam_norm.dot(point) + cam_origin */
-	const MT_Vector3 cam_norm(cameratrans.getBasis()[2]);
-	const MT_Scalar cam_origin = cameratrans.getOrigin()[2];
-	for (bit = m_AlphaBuckets.begin(); bit != m_AlphaBuckets.end(); ++bit)
-	{
-		for (mit = (*bit)->msBegin(); mit != (*bit)->msEnd(); ++mit)
-		{
-			if ((*mit).m_bVisible)
-			{
-				MT_Point3 pos((*mit).m_OpenGLMatrix[12], (*mit).m_OpenGLMatrix[13], (*mit).m_OpenGLMatrix[14]);
-				alphameshset.insert(alphamesh(MT_dot(cam_norm, pos) + cam_origin, mit, *bit));
+	for(sit=slots.begin(); sit!=slots.end(); ++sit) {
+		rendertools->SetClientObject(rasty, sit->m_ms->m_clientObj);
+
+		while(sit->m_bucket->ActivateMaterial(cameratrans, rasty, rendertools)) {
+			sit->m_bucket->RenderMeshSlot(cameratrans, rasty, rendertools, *(sit->m_ms));
+			//TOTASLOT++;
+		}
+	}
+
+	rasty->SetDepthMask(RAS_IRasterizer::KX_DEPTHMASK_ENABLED);
+}
+
+void RAS_BucketManager::RenderSolidBuckets(
+	const MT_Transform& cameratrans, RAS_IRasterizer* rasty, RAS_IRenderTools* rendertools)
+{
+	BucketList::iterator bit;
+	list<RAS_MeshSlot>::iterator mit;
+
+	rasty->SetDepthMask(RAS_IRasterizer::KX_DEPTHMASK_ENABLED);
+
+	for (bit = m_SolidBuckets.begin(); bit != m_SolidBuckets.end(); ++bit) {
+		for (mit = (*bit)->msBegin(); mit != (*bit)->msEnd(); ++mit) {
+			if (mit->IsCulled())
+				continue;
+
+			rendertools->SetClientObject(rasty, mit->m_clientObj);
+
+			while ((*bit)->ActivateMaterial(cameratrans, rasty, rendertools)) {
+				(*bit)->RenderMeshSlot(cameratrans, rasty, rendertools, *mit);
+				//TOTSLOT++;
 			}
 		}
 	}
 	
-	// It shouldn't be strictly necessary to disable depth writes; but
-	// it is needed for compatibility.
-	rasty->SetDepthMask(RAS_IRasterizer::KX_DEPTHMASK_DISABLED);
+#if 0
+	vector<sortedmeshslot> slots;
+	vector<sortedmeshslot>::iterator sit;
 
-	RAS_IRasterizer::DrawMode drawingmode;
-	std::multiset< alphamesh, backtofront>::iterator msit = alphameshset.begin();
-	for (; msit != alphameshset.end(); ++msit)
-	{
-		rendertools->SetClientObject((*(*msit).m_ms).m_clientObj);
-		while ((*msit).m_bucket->ActivateMaterial(cameratrans, rasty, rendertools, drawingmode))
-			(*msit).m_bucket->RenderMeshSlot(cameratrans, rasty, rendertools, *(*msit).m_ms, drawingmode);
+	OrderBuckets(cameratrans, m_SolidBuckets, slots, false);
+
+	for(sit=slots.begin(); sit!=slots.end(); ++sit) {
+		rendertools->SetClientObject(rasty, sit->m_ms->m_clientObj);
+
+		while(sit->m_bucket->ActivateMaterial(cameratrans, rasty, rendertools))
+			sit->m_bucket->RenderMeshSlot(cameratrans, rasty, rendertools, *(sit->m_ms));
 	}
-	
-	rasty->SetDepthMask(RAS_IRasterizer::KX_DEPTHMASK_ENABLED);
+#endif
 }
 
 void RAS_BucketManager::Renderbuckets(
 	const MT_Transform& cameratrans, RAS_IRasterizer* rasty, RAS_IRenderTools* rendertools)
 {
-	BucketList::iterator bucket;
-	
-	rasty->EnableTextures(false);
-	rasty->SetDepthMask(RAS_IRasterizer::KX_DEPTHMASK_ENABLED);
-	
 	// beginning each frame, clear (texture/material) caching information
 	rasty->ClearCachingInfo();
 
-	RAS_MaterialBucket::StartFrame();
-	
-	for (bucket = m_MaterialBuckets.begin(); bucket != m_MaterialBuckets.end(); ++bucket)
-		(*bucket)->Render(cameratrans,rasty,rendertools);
+	//TOTASLOT = 0;
+	//TOTSLOT = 0;
 
+	RenderSolidBuckets(cameratrans, rasty, rendertools);	
 	RenderAlphaBuckets(cameratrans, rasty, rendertools);	
-	RAS_MaterialBucket::EndFrame();
+
+	//printf("total slots = %d = %d + %d\n", TOTSLOT + TOTASLOT, TOTSLOT, TOTASLOT);
+
+	rendertools->SetClientObject(rasty, NULL);
 }
 
 RAS_MaterialBucket* RAS_BucketManager::FindBucket(RAS_IPolyMaterial * material, bool &bucketCreated)
 {
-	bucketCreated = false;
 	BucketList::iterator it;
-	for (it = m_MaterialBuckets.begin(); it != m_MaterialBuckets.end(); it++)
-	{
+
+	bucketCreated = false;
+
+	for (it = m_SolidBuckets.begin(); it != m_SolidBuckets.end(); it++)
 		if (*(*it)->GetPolyMaterial() == *material)
 			return *it;
-	}
 	
 	for (it = m_AlphaBuckets.begin(); it != m_AlphaBuckets.end(); it++)
-	{
 		if (*(*it)->GetPolyMaterial() == *material)
 			return *it;
-	}
 	
 	RAS_MaterialBucket *bucket = new RAS_MaterialBucket(material);
 	bucketCreated = true;
+
 	if (bucket->IsAlpha())
 		m_AlphaBuckets.push_back(bucket);
 	else
-		m_MaterialBuckets.push_back(bucket);
+		m_SolidBuckets.push_back(bucket);
 	
 	return bucket;
 }
 
-void RAS_BucketManager::RAS_BucketManagerClearAll()
-{
-	BucketList::iterator it;
-	for (it = m_MaterialBuckets.begin(); it != m_MaterialBuckets.end(); it++)
-	{
-		delete (*it);
-	}
-	for (it = m_AlphaBuckets.begin(); it != m_AlphaBuckets.end(); it++)
-	{
-		delete(*it);
-	}
-	
-	m_MaterialBuckets.clear();
-	m_AlphaBuckets.clear();
-}
-
-void RAS_BucketManager::ReleaseDisplayLists()
+void RAS_BucketManager::OptimizeBuckets(MT_Scalar distance)
 {
 	BucketList::iterator bit;
-	RAS_MaterialBucket::T_MeshSlotList::iterator mit;
+	
+	distance = 10.0;
 
-	for (bit = m_MaterialBuckets.begin(); bit != m_MaterialBuckets.end(); ++bit) {
-		for (mit = (*bit)->msBegin(); mit != (*bit)->msEnd(); ++mit) {
-			if(mit->m_DisplayList) {
-				mit->m_DisplayList->Release();
-				mit->m_DisplayList = NULL;
+	for (bit = m_SolidBuckets.begin(); bit != m_SolidBuckets.end(); ++bit)
+		(*bit)->Optimize(distance);
+	for (bit = m_AlphaBuckets.begin(); bit != m_AlphaBuckets.end(); ++bit)
+		(*bit)->Optimize(distance);
+}
+
+void RAS_BucketManager::ReleaseDisplayLists(RAS_IPolyMaterial *mat)
+{
+	BucketList::iterator bit;
+	list<RAS_MeshSlot>::iterator mit;
+
+	for (bit = m_SolidBuckets.begin(); bit != m_SolidBuckets.end(); ++bit) {
+		if (mat == NULL || (mat == (*bit)->GetPolyMaterial())) {
+			for (mit = (*bit)->msBegin(); mit != (*bit)->msEnd(); ++mit) {
+				if(mit->m_DisplayList) {
+					mit->m_DisplayList->Release();
+					mit->m_DisplayList = NULL;
+				}
 			}
 		}
 	}
 	
 	for (bit = m_AlphaBuckets.begin(); bit != m_AlphaBuckets.end(); ++bit) {
-		for (mit = (*bit)->msBegin(); mit != (*bit)->msEnd(); ++mit) {
-			if(mit->m_DisplayList) {
-				mit->m_DisplayList->Release();
-				mit->m_DisplayList = NULL;
+		if (mat == NULL || (mat == (*bit)->GetPolyMaterial())) {
+			for (mit = (*bit)->msBegin(); mit != (*bit)->msEnd(); ++mit) {
+				if(mit->m_DisplayList) {
+					mit->m_DisplayList->Release();
+					mit->m_DisplayList = NULL;
+				}
 			}
 		}
 	}
diff --git a/source/gameengine/Rasterizer/RAS_BucketManager.h b/source/gameengine/Rasterizer/RAS_BucketManager.h
index 08b67ed022f..74526f365a0 100644
--- a/source/gameengine/Rasterizer/RAS_BucketManager.h
+++ b/source/gameengine/Rasterizer/RAS_BucketManager.h
@@ -39,32 +39,33 @@
 
 class RAS_BucketManager
 {
-	//GEN_Map<class RAS_IPolyMaterial,class RAS_MaterialBucket*> m_MaterialBuckets;
-	
 	typedef std::vector<class RAS_MaterialBucket*> BucketList;
-	BucketList m_MaterialBuckets;
+	BucketList m_SolidBuckets;
 	BucketList m_AlphaBuckets;
 	
-	struct alphamesh;
+	struct sortedmeshslot;
 	struct backtofront;
+	struct fronttoback;
 
 public:
 	RAS_BucketManager();
 	virtual ~RAS_BucketManager();
 
-	void RenderAlphaBuckets(const MT_Transform& cameratrans, 
-		RAS_IRasterizer* rasty, RAS_IRenderTools* rendertools);
 	void Renderbuckets(const MT_Transform & cameratrans,
-							RAS_IRasterizer* rasty,
-							class RAS_IRenderTools* rendertools);
+		RAS_IRasterizer* rasty, RAS_IRenderTools* rendertools);
 
 	RAS_MaterialBucket* FindBucket(RAS_IPolyMaterial * material, bool &bucketCreated);
+	void OptimizeBuckets(MT_Scalar distance);
 	
-	void ReleaseDisplayLists();
+	void ReleaseDisplayLists(RAS_IPolyMaterial * material = NULL);
 
 private:
-	void RAS_BucketManagerClearAll();
+	void OrderBuckets(const MT_Transform& cameratrans, BucketList& buckets, vector<sortedmeshslot>& slots, bool alpha);
 
+	void RenderSolidBuckets(const MT_Transform& cameratrans, 
+		RAS_IRasterizer* rasty, RAS_IRenderTools* rendertools);
+	void RenderAlphaBuckets(const MT_Transform& cameratrans, 
+		RAS_IRasterizer* rasty, RAS_IRenderTools* rendertools);
 };
 
 #endif //__RAS_BUCKETMANAGER
diff --git a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
index 4ee06d96603..fb3607f89f4 100644
--- a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
+++ b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
@@ -42,11 +42,8 @@ RAS_IPolyMaterial::RAS_IPolyMaterial(const STR_String& texname,
 									 int transp,
 									 bool alpha,
 									 bool zsort,
-									 int lightlayer,
-									 bool bIsTriangle,
-									 void* clientobject=NULL) :
-
-		m_texturename(texname),
+									 int lightlayer)
+		: m_texturename(texname),
 		m_materialname(matname),
 		m_tile(tile),
 		m_tilexrep(tilexrep),
@@ -56,7 +53,6 @@ RAS_IPolyMaterial::RAS_IPolyMaterial(const STR_String& texname,
 		m_alpha(alpha),
 		m_zsort(zsort),
 		m_lightlayer(lightlayer),
-		m_bIsTriangle(bIsTriangle),
 		m_polymatid(m_newpolymatid++),
 		m_flag(0),
 		m_multimode(0)
@@ -72,15 +68,16 @@ bool RAS_IPolyMaterial::Equals(const RAS_IPolyMaterial& lhs) const
 {
 	if(m_flag &RAS_BLENDERMAT)
 	{
-		return (
+		bool test = (
 			this->m_multimode			==		lhs.m_multimode &&
 			this->m_flag				==		lhs.m_flag		&&
 			this->m_drawingmode			==		lhs.m_drawingmode &&
 			this->m_transp				==		lhs.m_transp &&
-			this->m_lightlayer			==		lhs.m_lightlayer &&
 			this->m_texturename.hash()	==		lhs.m_texturename.hash() &&
 			this->m_materialname.hash() ==		lhs.m_materialname.hash()
 		);
+
+		return test;
 	}
 	else
 	{
@@ -92,8 +89,6 @@ bool RAS_IPolyMaterial::Equals(const RAS_IPolyMaterial& lhs) const
 				this->m_alpha		==		lhs.m_alpha &&
 				this->m_zsort		==		lhs.m_zsort &&
 				this->m_drawingmode	==		lhs.m_drawingmode &&
-				this->m_bIsTriangle	==		lhs.m_bIsTriangle &&
-				this->m_lightlayer	==		lhs.m_lightlayer &&
 				this->m_texturename.hash()	==		lhs.m_texturename.hash() &&
 				this->m_materialname.hash() ==		lhs.m_materialname.hash()
 		);
@@ -123,11 +118,6 @@ bool RAS_IPolyMaterial::IsZSort() const
 	return m_zsort;
 }
 
-bool RAS_IPolyMaterial::UsesTriangles() const
-{
-	return m_bIsTriangle;
-}
-
 unsigned int RAS_IPolyMaterial::hash() const
 {
 	return m_texturename.hash();
@@ -172,5 +162,10 @@ bool RAS_IPolyMaterial::UsesLighting(RAS_IRasterizer *rasty) const
 	return dolights;
 }
 
+bool RAS_IPolyMaterial::UsesObjectColor() const
+{
+	return !(m_flag & RAS_BLENDERGLSL);
+}
+
 unsigned int RAS_IPolyMaterial::m_newpolymatid = 0;
 
diff --git a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
index 8fc53e6b038..218dd91cb30 100644
--- a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
+++ b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
@@ -71,7 +71,6 @@ protected:
 	bool					m_alpha;
 	bool					m_zsort;
 	int						m_lightlayer;
-	bool					m_bIsTriangle;
 	
 	unsigned int			m_polymatid;
 	static unsigned int		m_newpolymatid;
@@ -106,9 +105,7 @@ public:
 					  int transp,
 					  bool alpha,
 					  bool zsort,
-					  int lightlayer,
-					  bool bIsTriangle,
-					  void* clientobject);
+					  int lightlayer);
 	virtual ~RAS_IPolyMaterial() {};
  
 	/**
@@ -129,14 +126,13 @@ public:
 	{ 
 		return false; 
 	}
-	virtual void ActivateMeshSlot(const class KX_MeshSlot & ms, RAS_IRasterizer* rasty) const {}
+	virtual void ActivateMeshSlot(const class RAS_MeshSlot & ms, RAS_IRasterizer* rasty) const {}
 
 	virtual bool				Equals(const RAS_IPolyMaterial& lhs) const;
 	bool				Less(const RAS_IPolyMaterial& rhs) const;
 	int					GetLightLayer() const;
 	bool				IsAlpha() const;
 	bool				IsZSort() const;
-	bool				UsesTriangles() const;
 	unsigned int		hash() const;
 	int					GetDrawingMode() const;
 	const STR_String&	GetMaterialName() const;
@@ -145,6 +141,7 @@ public:
 	const unsigned int	GetFlag() const;
 
 	virtual bool		UsesLighting(RAS_IRasterizer *rasty) const;
+	virtual bool		UsesObjectColor() const;
 	
 	/*
 	 * PreCalculate texture gen
diff --git a/source/gameengine/Rasterizer/RAS_IRasterizer.h b/source/gameengine/Rasterizer/RAS_IRasterizer.h
index 9e03212283e..1d18d02a583 100644
--- a/source/gameengine/Rasterizer/RAS_IRasterizer.h
+++ b/source/gameengine/Rasterizer/RAS_IRasterizer.h
@@ -217,39 +217,18 @@ public:
 	
 	// Drawing Functions
 	/**
-	 * IndexPrimitives: Renders primitives.
-	 * @param vertexarrays is an array of vertex arrays
-	 * @param indexarrays is an array of index arrays
-	 * @param mode determines the type of primitive stored in the vertex/index arrays
-	 * @param useObjectColor will render the object using @param rgbacolor instead of 
-	 *  vertex colors.
+	 * IndexPrimitives: Renders primitives from mesh slot.
 	 */
-	virtual void IndexPrimitives( const vecVertexArray& vertexarrays,
-							const vecIndexArrays & indexarrays,
-							DrawMode mode,
-							bool useObjectColor,
-							const MT_Vector4& rgbacolor,
-							class KX_ListSlot** slot)=0;
-
-	virtual void IndexPrimitivesMulti( 
-						const vecVertexArray& vertexarrays,
-						const vecIndexArrays & indexarrays,
-						DrawMode mode,
-						bool useObjectColor,
-						const MT_Vector4& rgbacolor,
-						class KX_ListSlot** slot)=0;
+	virtual void IndexPrimitives(class RAS_MeshSlot& ms)=0;
+	virtual void IndexPrimitivesMulti(class RAS_MeshSlot& ms)=0;
 
 	/**
 	 * IndexPrimitives_3DText will render text into the polygons.
 	 * The text to be rendered is from @param rendertools client object's text property.
 	 */
-	virtual void	IndexPrimitives_3DText( const vecVertexArray& vertexarrays,
-							const vecIndexArrays & indexarrays,
-							DrawMode mode,
+	virtual void	IndexPrimitives_3DText(class RAS_MeshSlot& ms,
 							class RAS_IPolyMaterial* polymat,
-							class RAS_IRenderTools* rendertools,
-							bool useObjectColor,
-							const MT_Vector4& rgbacolor)=0;
+							class RAS_IRenderTools* rendertools)=0;
 
 	virtual void	SetProjectionMatrix(MT_CmMatrix4x4 & mat)=0;
 	/* This one should become our final version, methinks. */
@@ -269,9 +248,6 @@ public:
 	/**
 	 */
 	virtual const	MT_Point3& GetCameraPosition()=0;
-	/**
-	 */
-	virtual void	LoadViewMatrix()=0;
 	/**
 	 */
 	virtual void	SetFog(float start,
@@ -308,9 +284,6 @@ public:
 	 * @return the current drawing mode: KX_BOUNDINGBOX, KX_WIREFRAME, KX_SOLID, KX_SHADED or KX_TEXTURED.
 	 */
 	virtual int	GetDrawingMode()=0;
-	/**
-	 */
-	virtual void	EnableTextures(bool enable)=0;
 	/**
 	 * Sets face culling
 	 */	
@@ -385,7 +358,9 @@ public:
 	virtual void	SetAttribNum(int num) = 0;
 	virtual void	SetTexCoord(TexCoGen coords, int unit) = 0;
 	virtual void	SetAttrib(TexCoGen coords, int unit) = 0;
-	virtual void	GetViewMatrix(MT_Matrix4x4 &mat) const = 0;
+
+	virtual const MT_Matrix4x4&	GetViewMatrix() const = 0;
+	virtual const MT_Matrix4x4&	GetViewInvMatrix() const = 0;
 
 	virtual bool	QueryLists(){return false;}
 	virtual bool	QueryArrays(){return false;}
@@ -398,6 +373,7 @@ public:
 	virtual void	SetMotionBlurState(int newstate)=0;
 
 	virtual void	SetBlendingMode(int blendmode)=0;
+	virtual void	SetFrontFace(bool ccw)=0;
 };
 
 #endif //__RAS_IRASTERIZER
diff --git a/source/gameengine/Rasterizer/RAS_IRenderTools.cpp b/source/gameengine/Rasterizer/RAS_IRenderTools.cpp
index 2be9bb75ebf..555a3520bb4 100644
--- a/source/gameengine/Rasterizer/RAS_IRenderTools.cpp
+++ b/source/gameengine/Rasterizer/RAS_IRenderTools.cpp
@@ -28,42 +28,22 @@
 
 #include "RAS_IRenderTools.h"
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-void RAS_IRenderTools::SetViewMat(const MT_Transform& trans)
-{
-	trans.getValue(m_viewmat);
-}
-	
-
-
-void RAS_IRenderTools::SetClientObject(void* obj)
+void RAS_IRenderTools::SetClientObject(RAS_IRasterizer* rasty, void *obj)
 {
 	if (m_clientobject != obj)
-	{
 		m_clientobject = obj;
-		m_modified = true;
-	}
 }
 
-
-
 void RAS_IRenderTools::SetAuxilaryClientInfo(void* inf)
 {
 	m_auxilaryClientInfo = inf;
 }
 
-
-
 void RAS_IRenderTools::AddLight(struct RAS_LightObject* lightobject)
 {
 	m_lights.push_back(lightobject);
 }
 
-
-
 void RAS_IRenderTools::RemoveLight(struct RAS_LightObject* lightobject)
 {
 	std::vector<struct	RAS_LightObject*>::iterator lit = 
@@ -71,5 +51,5 @@ void RAS_IRenderTools::RemoveLight(struct RAS_LightObject* lightobject)
 
 	if (!(lit==m_lights.end()))
 		m_lights.erase(lit);
-
 }
+
diff --git a/source/gameengine/Rasterizer/RAS_IRenderTools.h b/source/gameengine/Rasterizer/RAS_IRenderTools.h
index 54a663ba111..57f331e64cb 100644
--- a/source/gameengine/Rasterizer/RAS_IRenderTools.h
+++ b/source/gameengine/Rasterizer/RAS_IRenderTools.h
@@ -44,12 +44,9 @@ class RAS_IRenderTools
 {
 
 protected:
-	float	m_viewmat[16];
 	void*	m_clientobject;
 	void*	m_auxilaryClientInfo;
 
-	bool	m_modified;
-	
 	std::vector<struct	RAS_LightObject*> m_lights;
 	
 	RAS_2DFilterManager m_filtermanager;
@@ -68,8 +65,7 @@ public:
 
 	RAS_IRenderTools(
 	) :
-		m_clientobject(NULL),
-		m_modified(true)
+		m_clientobject(NULL)
 	{
 	};
 
@@ -131,24 +127,21 @@ public:
 		float v1[3],
 		float v2[3],
 		float v3[3],
-		float v4[3]
+		float v4[3],
+		int glattrib
 	)=0;
 
 	virtual 
-		void	
-	SetViewMat(
-		const MT_Transform& trans
-	);
-
-	virtual 
-		int		
+		void		
 	ProcessLighting(
-		int layer
+		int layer,
+		const MT_Transform& trans
 	)=0;
 
 	virtual
 		void	
 	SetClientObject(
+		RAS_IRasterizer* rasty,
 		void* obj
 	);
 
@@ -190,24 +183,6 @@ public:
 	virtual
 		void
 		Render2DFilters(RAS_ICanvas* canvas)=0;
-
-	virtual 
-		class RAS_IPolyMaterial*	
-	CreateBlenderPolyMaterial(
-		const STR_String &texname,
-		bool ba,
-		const STR_String& matname,
-		int tile,
-		int tilexrep,
-		int tileyrep,
-		int mode,
-		bool transparant,
-		bool zsort,
-		int lightlayer,
-		bool bIsTriangle,
-		void* clientobject,
-		void* tface
-	)=0;
 };
 
 #endif //__RAS_IRENDERTOOLS
diff --git a/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp b/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
index 0015b6a251f..e003cdc9368 100644
--- a/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
+++ b/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
@@ -28,10 +28,6 @@
 
 #include "RAS_MaterialBucket.h"
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #ifdef WIN32
 #pragma warning (disable:4786)
 #include <windows.h>
@@ -44,81 +40,410 @@
 #include "RAS_MeshObject.h"
 #include "RAS_Deformer.h"	// __NLA
 
+/* mesh slot */
 
-
-KX_VertexIndex::KX_VertexIndex(int size)
+RAS_MeshSlot::RAS_MeshSlot()
 {
-	m_size = size;
+	m_clientObj = NULL;
+	m_pDeformer = NULL;
+	m_OpenGLMatrix = NULL;
+	m_mesh = NULL;
+	m_bucket = NULL;
+	m_bVisible = false;
+	m_bCulled = true;
+	m_bObjectColor = false;
+	m_RGBAcolor = MT_Vector4(0.0, 0.0, 0.0, 0.0);
+	m_DisplayList = NULL;
+	m_bDisplayList = true;
+	m_joinSlot = NULL;
 }
 
-
-
-void KX_VertexIndex::SetIndex(short loc,unsigned int index)
+RAS_MeshSlot::~RAS_MeshSlot()
 {
-	m_indexarray[loc]=index;
-}
+	vector<RAS_DisplayArray*>::iterator it;
 
-bool KX_MeshSlot::Less(const KX_MeshSlot& lhs) const
-{
-	bool result = ((m_mesh < lhs.m_mesh ) ||
-		((m_mesh == lhs.m_mesh)&&(m_OpenGLMatrix < lhs.m_OpenGLMatrix)));
-	
-	return result;
-}
+	Split(true);
 
-KX_MeshSlot::~KX_MeshSlot()
-{
-	if (m_DisplayList)
+	while(m_joinedSlots.size())
+		m_joinedSlots.front()->Split(true);
+
+	for(it=m_displayArrays.begin(); it!=m_displayArrays.end(); it++) {
+		(*it)->m_users--;
+		if((*it)->m_users == 0)
+			delete *it;
+	}
+
+	if (m_DisplayList) {
 		m_DisplayList->Release();
+		m_DisplayList = NULL;
+	}
 }
 
+RAS_MeshSlot::RAS_MeshSlot(const RAS_MeshSlot& slot)
+{
+	vector<RAS_DisplayArray*>::iterator it;
+
+	m_clientObj = NULL;
+	m_pDeformer = NULL;
+	m_OpenGLMatrix = NULL;
+	m_mesh = slot.m_mesh;
+	m_bucket = slot.m_bucket;
+	m_bVisible = slot.m_bVisible;
+	m_bCulled = slot.m_bCulled;
+	m_bObjectColor = slot.m_bObjectColor;
+	m_RGBAcolor = slot.m_RGBAcolor;
+	m_DisplayList = NULL;
+	m_bDisplayList = slot.m_bDisplayList;
+	m_joinSlot = NULL;
+	m_currentArray = slot.m_currentArray;
+	m_displayArrays = slot.m_displayArrays;
+	m_joinedSlots = slot.m_joinedSlots;
+
+	m_startarray = slot.m_startarray;
+	m_startvertex = slot.m_startvertex;
+	m_startindex = slot.m_startindex;
+	m_endarray = slot.m_endarray;
+	m_endvertex = slot.m_endvertex;
+	m_endindex = slot.m_endindex;
+
+	for(it=m_displayArrays.begin(); it!=m_displayArrays.end(); it++) {
+		*it = new RAS_DisplayArray(**it);
+		(*it)->m_users = 1;
+	}
+}
+
+void RAS_MeshSlot::init(RAS_MaterialBucket *bucket, int numverts)
+{
+	m_bucket = bucket;
+
+	SetDisplayArray(numverts);
+
+	m_startarray = 0;
+	m_startvertex = 0;
+	m_startindex = 0;
+	m_endarray = 0;
+	m_endvertex = 0;
+	m_endindex = 0;
+}
+
+void RAS_MeshSlot::begin(RAS_MeshSlot::iterator& it)
+{
+	int startvertex, endvertex;
+	int startindex, endindex;
+
+	it.array = m_displayArrays[m_startarray];
+
+	startvertex = m_startvertex;
+	endvertex = (m_startarray == m_endarray)? m_endvertex: it.array->m_vertex.size();
+	startindex = m_startindex;
+	endindex = (m_startarray == m_endarray)? m_endindex: it.array->m_index.size();
+
+	it.vertex = &it.array->m_vertex[0];
+	it.index = &it.array->m_index[startindex];
+	it.startvertex = startvertex;
+	it.endvertex = endvertex;
+	it.totindex = endindex-startindex;
+	it.arraynum = m_startarray;
+}
+
+void RAS_MeshSlot::next(RAS_MeshSlot::iterator& it)
+{
+	int startvertex, endvertex;
+	int startindex, endindex;
+
+	if(it.arraynum == (size_t)m_endarray) {
+		it.array = NULL;
+		it.vertex = NULL;
+		it.index = NULL;
+		it.startvertex = 0;
+		it.endvertex = 0;
+		it.totindex = 0;
+	}
+	else {
+		it.arraynum++;
+		it.array = m_displayArrays[it.arraynum];
+
+		startindex = 0;
+		endindex = (it.arraynum == (size_t)m_endarray)? m_endindex: it.array->m_index.size();
+		startvertex = 0;
+		endvertex = (it.arraynum == (size_t)m_endarray)? m_endvertex: it.array->m_vertex.size();
+
+		it.vertex = &it.array->m_vertex[0];
+		it.index = &it.array->m_index[startindex];
+		it.startvertex = startvertex;
+		it.endvertex = endvertex;
+		it.totindex = endindex-startindex;
+	}
+}
+
+bool RAS_MeshSlot::end(RAS_MeshSlot::iterator& it)
+{
+	return (it.array == NULL);
+}
+
+RAS_DisplayArray *RAS_MeshSlot::CurrentDisplayArray()
+{
+	return m_currentArray;
+}
+
+void RAS_MeshSlot::SetDisplayArray(int numverts)
+{
+	vector<RAS_DisplayArray*>::iterator it;
+	RAS_DisplayArray *darray = NULL;
+	
+	for(it=m_displayArrays.begin(); it!=m_displayArrays.end(); it++) {
+		darray = *it;
+
+		if(darray->m_type == numverts) {
+			if(darray->m_index.size()+numverts >= RAS_DisplayArray::BUCKET_MAX_INDEX)
+				darray = NULL;
+			else if(darray->m_vertex.size()+numverts >= RAS_DisplayArray::BUCKET_MAX_VERTEX)
+				darray = NULL;
+			else
+				break;
+		}
+		else
+			darray = NULL;
+	}
+
+	if(!darray) {
+		darray = new RAS_DisplayArray();
+		darray->m_users = 1;
+
+		if(numverts == 2) darray->m_type = RAS_DisplayArray::LINE;
+		else if(numverts == 3) darray->m_type = RAS_DisplayArray::TRIANGLE;
+		else darray->m_type = RAS_DisplayArray::QUAD;
+
+		m_displayArrays.push_back(darray);
+
+		if(numverts == 2)
+			darray->m_type = RAS_DisplayArray::LINE;
+		else if(numverts == 3)
+			darray->m_type = RAS_DisplayArray::TRIANGLE;
+		else if(numverts == 4)
+			darray->m_type = RAS_DisplayArray::QUAD;
+		
+		m_endarray = m_displayArrays.size()-1;
+		m_endvertex = 0;
+		m_endindex = 0;
+	}
+
+	m_currentArray = darray;
+}
+
+void RAS_MeshSlot::AddPolygon(int numverts)
+{
+	SetDisplayArray(numverts);
+}
+
+int RAS_MeshSlot::AddVertex(const RAS_TexVert& tv)
+{
+	RAS_DisplayArray *darray;
+	int offset;
+	
+	darray = m_currentArray;
+	darray->m_vertex.push_back(tv);
+	offset = darray->m_vertex.size()-1;
+
+	if(darray == m_displayArrays[m_endarray])
+		m_endvertex++;
+
+	return offset;
+}
+
+void RAS_MeshSlot::AddPolygonVertex(int offset)
+{
+	RAS_DisplayArray *darray;
+
+	darray = m_currentArray;
+	darray->m_index.push_back(offset);
+
+	if(darray == m_displayArrays[m_endarray])
+		m_endindex++;
+}
+
+bool RAS_MeshSlot::Equals(RAS_MeshSlot *target)
+{
+	if(!m_OpenGLMatrix || !target->m_OpenGLMatrix)
+		return false;
+	if(m_pDeformer || target->m_pDeformer)
+		return false;
+	if(m_bVisible != target->m_bVisible)
+		return false;
+	if(m_bObjectColor != target->m_bObjectColor)
+		return false;
+	if(m_bObjectColor && !(m_RGBAcolor == target->m_RGBAcolor))
+		return false;
+	
+	return true;
+}
+
+bool RAS_MeshSlot::Join(RAS_MeshSlot *target, MT_Scalar distance)
+{
+	vector<RAS_DisplayArray*>::iterator it;
+	iterator mit;
+	size_t i;
+
+	// verify if we can join
+	if(m_joinSlot || m_joinedSlots.size() || target->m_joinSlot)
+		return false;
+
+	if(!Equals(target))
+		return false;
+	
+	MT_Vector3 co(&m_OpenGLMatrix[12]);
+	MT_Vector3 targetco(&target->m_OpenGLMatrix[12]);
+
+	if((co - targetco).length() > distance)
+		return false;
+
+	MT_Matrix4x4 mat(m_OpenGLMatrix);
+	MT_Matrix4x4 targetmat(target->m_OpenGLMatrix);
+	targetmat.invert();
+
+	MT_Matrix4x4 transform = targetmat*mat;
+	
+	// m_mesh, clientobj
+	m_joinSlot = target;
+	m_joinInvTransform = transform;
+	m_joinInvTransform.invert();
+	target->m_joinedSlots.push_back(this);
+
+	MT_Matrix4x4 ntransform = m_joinInvTransform.transposed();
+	ntransform[0][3]= ntransform[1][3]= ntransform[2][3]= 0.0f;
+
+	for(begin(mit); !end(mit); next(mit))
+		for(i=mit.startvertex; i<mit.endvertex; i++)
+			mit.vertex[i].Transform(transform, ntransform);
+
+	for(it=m_displayArrays.begin(); it!=m_displayArrays.end(); it++) {
+		target->m_displayArrays.push_back(*it);
+		target->m_endarray++;
+		target->m_endvertex = target->m_displayArrays.back()->m_vertex.size();
+		target->m_endindex = target->m_displayArrays.back()->m_index.size();
+	}
+
+	if (m_DisplayList) {
+		m_DisplayList->Release();
+		m_DisplayList = NULL;
+	}
+	if (target->m_DisplayList) {
+		target->m_DisplayList->Release();
+		target->m_DisplayList = NULL;
+	}
+	
+	return true;
+#if 0
+	return false;
+#endif
+}
+
+bool RAS_MeshSlot::Split(bool force)
+{
+	list<RAS_MeshSlot*>::iterator jit;
+	RAS_MeshSlot *target = m_joinSlot;
+	vector<RAS_DisplayArray*>::iterator it, jt;
+	iterator mit;
+	size_t i, found0 = 0, found1 = 0;
+
+	if(target && (force || !Equals(target))) {
+		m_joinSlot = NULL;
+
+		for(jit=target->m_joinedSlots.begin(); jit!=target->m_joinedSlots.end(); jit++) {
+			if(*jit == this) {
+				target->m_joinedSlots.erase(jit);
+				found0 = 1;
+				break;
+			}
+		}
+
+		if(!found0)
+			abort();
+
+		for(it=m_displayArrays.begin(); it!=m_displayArrays.end(); it++) {
+			found1 = 0;
+			for(jt=target->m_displayArrays.begin(); jt!=target->m_displayArrays.end(); jt++) {
+				if(*jt == *it) {
+					target->m_displayArrays.erase(jt);
+					target->m_endarray--;
+					found1 = 1;
+					break;
+				}
+			}
+
+			if(!found1)
+				abort();
+		}
+
+		if(target->m_displayArrays.size()) {
+			target->m_endvertex = target->m_displayArrays.back()->m_vertex.size();
+			target->m_endindex = target->m_displayArrays.back()->m_index.size();
+		}
+		else {
+			target->m_endvertex = 0;
+			target->m_endindex = 0;
+		}
+
+		MT_Matrix4x4 ntransform = m_joinInvTransform.inverse().transposed();
+		ntransform[0][3]= ntransform[1][3]= ntransform[2][3]= 0.0f;
+
+		for(begin(mit); !end(mit); next(mit))
+			for(i=mit.startvertex; i<mit.endvertex; i++)
+				mit.vertex[i].Transform(m_joinInvTransform, ntransform);
+
+		if (target->m_DisplayList) {
+			target->m_DisplayList->Release();
+			target->m_DisplayList = NULL;
+		}
+
+		return true;
+	}
+
+	return false;
+}
+
+bool RAS_MeshSlot::IsCulled()
+{
+	list<RAS_MeshSlot*>::iterator it;
+
+	if(m_joinSlot)
+		return true;
+	if(!m_bCulled)
+		return false;
+	
+	for(it=m_joinedSlots.begin(); it!=m_joinedSlots.end(); it++)
+		if(!(*it)->m_bCulled)
+			return false;
+	
+	return true;
+}
+
+/* material bucket sorting */
+
+struct RAS_MaterialBucket::less
+{
+	bool operator()(const RAS_MaterialBucket* x, const RAS_MaterialBucket* y) const 
+	{ 
+		return *x->GetPolyMaterial() < *y->GetPolyMaterial(); 
+	}
+};
+
+/* material bucket */
 
 RAS_MaterialBucket::RAS_MaterialBucket(RAS_IPolyMaterial* mat)
-	:m_bModified(true)
 {
 	m_material = mat;
 }
 
-
+RAS_MaterialBucket::~RAS_MaterialBucket()
+{
+}
 
 RAS_IPolyMaterial* RAS_MaterialBucket::GetPolyMaterial() const
 { 
 	return m_material;
 }
 
-
-	
-void RAS_MaterialBucket::SetMeshSlot(KX_MeshSlot& ms)
-{
-	m_meshSlots.insert(ms);
-}
-
-
-
-void RAS_MaterialBucket::RemoveMeshSlot(KX_MeshSlot& ms)
-{
-	T_MeshSlotList::iterator it = m_meshSlots.find(ms);
-
-	if (!(it == m_meshSlots.end()))
-		m_meshSlots.erase(it);
-			
-}
-
-
-
-void RAS_MaterialBucket::MarkVisibleMeshSlot(KX_MeshSlot& ms,
-											 bool visible,
-											 bool color,
-											 const MT_Vector4& rgbavec)
-{
-	T_MeshSlotList::iterator it = m_meshSlots.find(ms);
-			
-	assert (!(it == m_meshSlots.end())); 
-	(*it).m_bVisible = visible;
-	(*it).m_bObjectColor = color;
-	(*it).m_RGBAcolor= rgbavec;
-}
-
 bool RAS_MaterialBucket::IsAlpha() const
 {	
 	return (m_material->IsAlpha());
@@ -129,162 +454,129 @@ bool RAS_MaterialBucket::IsZSort() const
 	return (m_material->IsZSort());
 }
 
-
-
-void RAS_MaterialBucket::StartFrame()
+RAS_MeshSlot* RAS_MaterialBucket::AddMesh(int numverts)
 {
+	RAS_MeshSlot *ms;
+
+	m_meshSlots.push_back(RAS_MeshSlot());
+	
+	ms = &m_meshSlots.back();
+	ms->init(this, numverts);
+
+	return ms;
 }
 
-
-
-void RAS_MaterialBucket::EndFrame()
+RAS_MeshSlot* RAS_MaterialBucket::CopyMesh(RAS_MeshSlot *ms)
 {
+	m_meshSlots.push_back(RAS_MeshSlot(*ms));
+	
+	return &m_meshSlots.back();
 }
 
-unsigned int RAS_MaterialBucket::NumMeshSlots()
+void RAS_MaterialBucket::RemoveMesh(RAS_MeshSlot* ms)
 {
-	return m_meshSlots.size();
+	list<RAS_MeshSlot>::iterator it;
+
+	for(it=m_meshSlots.begin(); it!=m_meshSlots.end(); it++) {
+		if(&*it == ms) {
+			m_meshSlots.erase(it);
+			return;
+		}
+	}
 }
 
-RAS_MaterialBucket::T_MeshSlotList::iterator RAS_MaterialBucket::msBegin()
+list<RAS_MeshSlot>::iterator RAS_MaterialBucket::msBegin()
 {
 	return m_meshSlots.begin();
 }
 
-RAS_MaterialBucket::T_MeshSlotList::iterator RAS_MaterialBucket::msEnd()
+list<RAS_MeshSlot>::iterator RAS_MaterialBucket::msEnd()
 {
 	return m_meshSlots.end();
 }
 
 bool RAS_MaterialBucket::ActivateMaterial(const MT_Transform& cameratrans, RAS_IRasterizer* rasty,
-	RAS_IRenderTools *rendertools, RAS_IRasterizer::DrawMode &drawmode)
+	RAS_IRenderTools *rendertools)
 {
-	rendertools->SetViewMat(cameratrans);
-
 	if (!rasty->SetMaterial(*m_material))
 		return false;
 	
 	if (m_material->UsesLighting(rasty))
-		rendertools->ProcessLighting(RAS_IRenderTools::RAS_LIGHT_OBJECT_LAYER/*m_material->GetLightLayer()*/);
+		rendertools->ProcessLighting(RAS_IRenderTools::RAS_LIGHT_OBJECT_LAYER, cameratrans);
 	else
-		rendertools->ProcessLighting(-1);
-
-	if(rasty->GetDrawingMode() < RAS_IRasterizer::KX_SOLID)
-		drawmode = RAS_IRasterizer::KX_MODE_LINES;
-	else if(m_material->UsesTriangles())
-		drawmode = RAS_IRasterizer::KX_MODE_TRIANGLES;
-	else
-		drawmode = RAS_IRasterizer::KX_MODE_QUADS;
+		rendertools->ProcessLighting(-1, cameratrans);
 	
 	return true;
 }
 
 void RAS_MaterialBucket::RenderMeshSlot(const MT_Transform& cameratrans, RAS_IRasterizer* rasty,
-	RAS_IRenderTools* rendertools, const KX_MeshSlot &ms, RAS_IRasterizer::DrawMode drawmode)
+	RAS_IRenderTools* rendertools, RAS_MeshSlot &ms)
 {
-	if (!ms.m_bVisible)
-		return;
-	
 	m_material->ActivateMeshSlot(ms, rasty);
 
-	/* __NLA Do the deformation */
 	if (ms.m_pDeformer)
 	{
 		ms.m_pDeformer->Apply(m_material);
 	//	KX_ReInstanceShapeFromMesh(ms.m_mesh); // Recompute the physics mesh. (Can't call KX_* from RAS_)
 	}
-	/* End __NLA */
 	
-	if (rasty->GetDrawingMode() >= RAS_IRasterizer::KX_SOLID)
-		ms.m_mesh->SortPolygons(cameratrans*MT_Transform(ms.m_OpenGLMatrix));
+	if(IsZSort() && rasty->GetDrawingMode() >= RAS_IRasterizer::KX_SOLID)
+		ms.m_mesh->SortPolygons(ms, cameratrans*MT_Transform(ms.m_OpenGLMatrix));
 
 	rendertools->PushMatrix();
 	rendertools->applyTransform(rasty,ms.m_OpenGLMatrix,m_material->GetDrawingMode());
 
 	if(rasty->QueryLists())
-	{
 		if(ms.m_DisplayList)
 			ms.m_DisplayList->SetModified(ms.m_mesh->MeshModified());
-	}
 
 	// verify if we can use display list, not for deformed object, and
 	// also don't create a new display list when drawing shadow buffers,
-	// then it won't have texture coordinates for actual drawing
-	KX_ListSlot **displaylist;
+	// then it won't have texture coordinates for actual drawing. also
+	// for zsort we can't make a display list, since the polygon order
+	// changes all the time.
 	if(ms.m_pDeformer)
-		displaylist = 0;
+		ms.m_bDisplayList = false;
 	else if(!ms.m_DisplayList && rasty->GetDrawingMode() == RAS_IRasterizer::KX_SHADOW)
-		displaylist = 0;
+		ms.m_bDisplayList = false;
+	else if (IsZSort())
+		ms.m_bDisplayList = false;
+	else if(m_material->UsesObjectColor() && ms.m_bObjectColor)
+		ms.m_bDisplayList = false;
 	else
-		displaylist = &ms.m_DisplayList;
+		ms.m_bDisplayList = true;
 
-	// Use the text-specific IndexPrimitives for text faces
+	// for text drawing using faces
 	if (m_material->GetDrawingMode() & RAS_IRasterizer::RAS_RENDER_3DPOLYGON_TEXT)
-	{
-		rasty->IndexPrimitives_3DText(
-				ms.m_mesh->GetVertexCache(m_material), 
-				ms.m_mesh->GetIndexCache(m_material), 
-				drawmode,
-				m_material,
-				rendertools, // needed for textprinting on polys
-				ms.m_bObjectColor,
-				ms.m_RGBAcolor);
-	}
-
-	// for using glMultiTexCoord
+		rasty->IndexPrimitives_3DText(ms, m_material, rendertools);
+	// for multitexturing
 	else if((m_material->GetFlag() & RAS_MULTITEX))
-	{
-		rasty->IndexPrimitivesMulti(
-				ms.m_mesh->GetVertexCache(m_material), 
-				ms.m_mesh->GetIndexCache(m_material), 
-				drawmode,
-				ms.m_bObjectColor,
-				ms.m_RGBAcolor,
-				displaylist);
-	}
-
-	// Use the normal IndexPrimitives
+		rasty->IndexPrimitivesMulti(ms);
+	// use normal IndexPrimitives
 	else
-	{
-		rasty->IndexPrimitives(
-				ms.m_mesh->GetVertexCache(m_material), 
-				ms.m_mesh->GetIndexCache(m_material), 
-				drawmode,
-				ms.m_bObjectColor,
-				ms.m_RGBAcolor,
-				displaylist);
-	}
+		rasty->IndexPrimitives(ms);
 
-	if(rasty->QueryLists()) {
+	if(rasty->QueryLists())
 		if(ms.m_DisplayList)
 			ms.m_mesh->SetMeshModified(false);
-	}
 
 	rendertools->PopMatrix();
 }
 
-void RAS_MaterialBucket::Render(const MT_Transform& cameratrans,
-								RAS_IRasterizer* rasty,
-								RAS_IRenderTools* rendertools)
+void RAS_MaterialBucket::Optimize(MT_Scalar distance)
 {
-	if (m_meshSlots.begin()== m_meshSlots.end())
-		return;
-		
-	//rendertools->SetViewMat(cameratrans);
-
-	//rasty->SetMaterial(*m_material);
+	/* TODO: still have to check before this works correct:
+	 * - lightlayer, frontface, text, billboard
+	 * - make it work with physics */
 	
-	RAS_IRasterizer::DrawMode drawmode;
-	for (T_MeshSlotList::const_iterator it = m_meshSlots.begin();
-	! (it == m_meshSlots.end()); ++it)
-	{
-		rendertools->SetClientObject((*it).m_clientObj);
-		while (ActivateMaterial(cameratrans, rasty, rendertools, drawmode)) {
-			RenderMeshSlot(cameratrans, rasty, rendertools, *it, drawmode);
-		}
-	}
-	// to reset the eventual GL_CW mode
-	rendertools->SetClientObject(NULL);
+#if 0
+	list<RAS_MeshSlot>::iterator it;
+	list<RAS_MeshSlot>::iterator jt;
+
+	// greed joining on all following buckets
+	for(it=m_meshSlots.begin(); it!=m_meshSlots.end(); it++)
+		for(jt=it, jt++; jt!=m_meshSlots.end(); jt++)
+			jt->Join(&*it, distance);
+#endif
 }
 
-
diff --git a/source/gameengine/Rasterizer/RAS_MaterialBucket.h b/source/gameengine/Rasterizer/RAS_MaterialBucket.h
index 4eef889c533..475f01d549a 100644
--- a/source/gameengine/Rasterizer/RAS_MaterialBucket.h
+++ b/source/gameengine/Rasterizer/RAS_MaterialBucket.h
@@ -36,30 +36,15 @@
 #include "MT_Transform.h"
 #include "RAS_IPolygonMaterial.h"
 #include "RAS_IRasterizer.h"
-#include "RAS_Deformer.h"	// __NLA
+#include "RAS_Deformer.h"
+
 #include <vector>
-#include <map>
 #include <set>
+#include <list>
 using namespace std;
 
-/**
- * KX_VertexIndex
- */
-struct KX_VertexIndex {
-public:
-	KX_VertexIndex(int size);
-	void	SetIndex(short loc,unsigned int index);
-	
-	// The vertex array
-	short	m_vtxarray;
-	// An index into the vertex array for up to 4 verticies
-	unsigned short	m_indexarray[4];
-	short	m_size;
-};
+/* Display List Slot */
 
-/**
- * KX_ListSlot.
- */
 class KX_ListSlot
 {
 protected:
@@ -80,91 +65,149 @@ public:
 	virtual void SetModified(bool mod)=0;
 };
 
-/**
- * KX_MeshSlot.
- */
-class KX_MeshSlot
+class RAS_DisplayArray;
+class RAS_MeshSlot;
+class RAS_MeshMaterial;
+class RAS_MaterialBucket;
+
+/* An array with data used for OpenGL drawing */
+
+class RAS_DisplayArray
 {
 public:
-	void*						m_clientObj;
-	RAS_Deformer*				m_pDeformer;	//	__NLA
-	double*						m_OpenGLMatrix;
-	class RAS_MeshObject*		m_mesh;
-	mutable bool				m_bVisible; // for visibility
-	mutable bool				m_bObjectColor;
-	mutable MT_Vector4			m_RGBAcolor;
-	mutable KX_ListSlot*		m_DisplayList; // for lists
-	KX_MeshSlot() :
-		m_pDeformer(NULL), 
-		m_bVisible(true),
-		m_DisplayList(0)
-	{
-	}
-	~KX_MeshSlot();
-	bool					Less(const KX_MeshSlot& lhs) const;
+	vector<RAS_TexVert> m_vertex;
+	vector<unsigned short> m_index;
+	enum { LINE = 2, TRIANGLE = 3, QUAD = 4 } m_type;
+	//RAS_MeshSlot *m_origSlot;
+	int m_users;
+
+	enum { BUCKET_MAX_INDEX = 65535 };
+	enum { BUCKET_MAX_VERTEX = 65535 };
 };
 
+/* Entry of a RAS_MeshObject into RAS_MaterialBucket */
 
-inline bool operator <( const KX_MeshSlot& rhs,const KX_MeshSlot& lhs)
+class RAS_MeshSlot
 {
-	return ( rhs.Less(lhs));
-}
+private:
+	//  indices into display arrays
+	int							m_startarray;
+	int							m_endarray;
+	int							m_startindex;
+	int							m_endindex;
+	int							m_startvertex;
+	int							m_endvertex;
+	vector<RAS_DisplayArray*>	m_displayArrays;
+
+	// for construction only
+	RAS_DisplayArray*			m_currentArray;
+
+public:
+	// for rendering
+	RAS_MaterialBucket*		m_bucket;
+	RAS_MeshObject*			m_mesh;
+	void*					m_clientObj;
+	RAS_Deformer*			m_pDeformer;
+	double*					m_OpenGLMatrix;
+	// visibility
+	bool					m_bVisible;
+	bool					m_bCulled;
+	// object color
+	bool					m_bObjectColor;
+	MT_Vector4				m_RGBAcolor;
+	// display lists
+	KX_ListSlot*			m_DisplayList;
+	bool					m_bDisplayList;
+	// joined mesh slots
+	RAS_MeshSlot*			m_joinSlot;
+	MT_Matrix4x4			m_joinInvTransform;
+	list<RAS_MeshSlot*>		m_joinedSlots;
+
+	RAS_MeshSlot();
+	RAS_MeshSlot(const RAS_MeshSlot& slot);
+	virtual ~RAS_MeshSlot();
+	
+	void init(RAS_MaterialBucket *bucket, int numverts);
+
+	struct iterator {
+		RAS_DisplayArray *array;
+		RAS_TexVert *vertex;
+		unsigned short *index;
+		size_t startvertex;
+		size_t endvertex;
+		size_t totindex;
+		size_t arraynum;
+	};
+
+	void begin(iterator& it);
+	void next(iterator& it);
+	bool end(iterator& it);
+
+	/* used during construction */
+	void SetDisplayArray(int numverts);
+	RAS_DisplayArray *CurrentDisplayArray();
+
+	void AddPolygon(int numverts);
+	int AddVertex(const RAS_TexVert& tv);
+	void AddPolygonVertex(int offset);
+
+	/* optimization */
+	bool Split(bool force=false);
+	bool Join(RAS_MeshSlot *target, MT_Scalar distance);
+	bool Equals(RAS_MeshSlot *target);
+	bool IsCulled();
+};
+
+/* Used by RAS_MeshObject, to point to it's slots in a bucket */
+
+class RAS_MeshMaterial
+{
+public:
+	RAS_MeshSlot *m_baseslot;
+	class RAS_MaterialBucket *m_bucket;
+
+	GEN_Map<GEN_HashedPtr,RAS_MeshSlot*> m_slots;
+};
+
+/* Contains a list of display arrays with the same material,
+ * and a mesh slot for each mesh that uses display arrays in
+ * this bucket */
 
-/**
- * Contains a list of meshs with the same material properties.
- */
 class RAS_MaterialBucket
 {
 public:
-	typedef std::set<KX_MeshSlot> T_MeshSlotList;
-	
 	RAS_MaterialBucket(RAS_IPolyMaterial* mat);
-	virtual ~RAS_MaterialBucket() {}
-	
-	void	Render(const MT_Transform& cameratrans,
-					   class RAS_IRasterizer* rasty,
-					   class RAS_IRenderTools* rendertools);
-	
-	RAS_IPolyMaterial*		GetPolyMaterial() const;
-	bool	IsAlpha() const;
-	bool	IsZSort() const;
-		
-	static void	StartFrame();
-	static void EndFrame();
-
-	void	SetMeshSlot(KX_MeshSlot& ms);
-	void	RemoveMeshSlot(KX_MeshSlot& ms);
-	void	MarkVisibleMeshSlot(KX_MeshSlot& ms,
-								bool visible,
-								bool color,
-								const MT_Vector4& rgbavec);
-
-	void RenderMeshSlot(const MT_Transform& cameratrans, RAS_IRasterizer* rasty,
-		RAS_IRenderTools* rendertools, const KX_MeshSlot &ms, RAS_IRasterizer::DrawMode drawmode);
-	bool ActivateMaterial(const MT_Transform& cameratrans, RAS_IRasterizer* rasty,
-		RAS_IRenderTools *rendertools, RAS_IRasterizer::DrawMode& drawmode);
-	
-	unsigned int NumMeshSlots();
-	T_MeshSlotList::iterator msBegin();
-	T_MeshSlotList::iterator msEnd();
-
-	struct less
-	{
-		bool operator()(const RAS_MaterialBucket* x, const RAS_MaterialBucket* y) const 
-		{ 
-			return *x->GetPolyMaterial() < *y->GetPolyMaterial(); 
-		}
-	};
+	virtual ~RAS_MaterialBucket();
 	
+	/* Bucket Sorting */
+	struct less;
 	typedef set<RAS_MaterialBucket*, less> Set;
-private:
+
+	/* Material Properties */
+	RAS_IPolyMaterial*		GetPolyMaterial() const;
+	bool					IsAlpha() const;
+	bool					IsZSort() const;
+		
+	/* Rendering */
+	bool ActivateMaterial(const MT_Transform& cameratrans, RAS_IRasterizer* rasty,
+		RAS_IRenderTools *rendertools);
+	void RenderMeshSlot(const MT_Transform& cameratrans, RAS_IRasterizer* rasty,
+		RAS_IRenderTools* rendertools, RAS_MeshSlot &ms);
 	
-	T_MeshSlotList				m_meshSlots;
-	bool						m_bModified;
+	/* Mesh Slot Access */
+	list<RAS_MeshSlot>::iterator msBegin();
+	list<RAS_MeshSlot>::iterator msEnd();
+
+	class RAS_MeshSlot*	AddMesh(int numverts);
+	class RAS_MeshSlot* CopyMesh(class RAS_MeshSlot *ms);
+	void				RemoveMesh(class RAS_MeshSlot* ms);
+	void				Optimize(MT_Scalar distance);
+
+private:
+	list<RAS_MeshSlot>			m_meshSlots;
 	RAS_IPolyMaterial*			m_material;
-	double*						m_pOGLMatrix;
 	
 };
 
-#endif //__KX_BUCKET
+#endif //__RAS_MATERIAL_BUCKET
 
diff --git a/source/gameengine/Rasterizer/RAS_MeshObject.cpp b/source/gameengine/Rasterizer/RAS_MeshObject.cpp
index a4f7f3f01dd..a907994bf57 100644
--- a/source/gameengine/Rasterizer/RAS_MeshObject.cpp
+++ b/source/gameengine/Rasterizer/RAS_MeshObject.cpp
@@ -26,10 +26,6 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "RAS_MeshObject.h"
 #include "RAS_IRasterizer.h"
 #include "MT_MinMax.h"
@@ -37,544 +33,7 @@
 
 #include <algorithm>
 
-
-STR_String RAS_MeshObject::s_emptyname = "";
-
-
-
-KX_ArrayOptimizer::~KX_ArrayOptimizer()
-{
-	for (vector<KX_VertexArray*>::iterator itv = m_VertexArrayCache1.begin();
-	!(itv == m_VertexArrayCache1.end());++itv)
-	{
-		delete (*itv);
-	}
-
-	for (vector<KX_IndexArray*>::iterator iti = m_IndexArrayCache1.begin();
-	!(iti == m_IndexArrayCache1.end());++iti)
-	{
-		delete (*iti);
-	}
-	
-	m_TriangleArrayCount.clear();
-	m_VertexArrayCache1.clear();
-	m_IndexArrayCache1.clear();
-
-
-}
-
-
-
-RAS_MeshObject::RAS_MeshObject(Mesh* mesh, int lightlayer)
-	: m_bModified(true),
-	m_lightlayer(lightlayer),
-	m_zsort(false),
-	m_MeshMod(true),
-	m_mesh(mesh),
-	m_class(0)
-{
-}
-
-
-bool RAS_MeshObject::MeshModified()
-{
-	return m_MeshMod;
-}
-
-	
-RAS_MeshObject::~RAS_MeshObject()
-{
-	for (vector<RAS_Polygon*>::iterator it=m_Polygons.begin();!(it==m_Polygons.end());it++)
-	{
-		delete (*it);
-	}
-
-	ClearArrayData();
-}
-
-
-
-unsigned int RAS_MeshObject::GetLightLayer()
-{
-	return m_lightlayer;
-}
-
-
-
-int RAS_MeshObject::NumMaterials()
-{
-	return m_materials.size();
-}
-
-const STR_String& RAS_MeshObject::GetMaterialName(unsigned int matid)
-{ 
-	RAS_MaterialBucket* bucket = GetMaterialBucket(matid);
-	
-	return bucket?bucket->GetPolyMaterial()->GetMaterialName():s_emptyname;
-}
-
-RAS_MaterialBucket* RAS_MeshObject::GetMaterialBucket(unsigned int matid)
-{
-	if (m_materials.size() > 0 && (matid < m_materials.size()))
-	{
-		RAS_MaterialBucket::Set::const_iterator it = m_materials.begin();
-		while (matid--) ++it;
-		return *it;
-	}
-
-	return NULL;
-}
-
-
-
-int RAS_MeshObject::NumPolygons()
-{
-	return m_Polygons.size();
-}
-
-
-
-RAS_Polygon* RAS_MeshObject::GetPolygon(int num) const
-{
-	return m_Polygons[num];
-}
-
-	
-	
-RAS_MaterialBucket::Set::iterator RAS_MeshObject::GetFirstMaterial()
-{
-	return m_materials.begin();
-}
-
-
-
-RAS_MaterialBucket::Set::iterator RAS_MeshObject::GetLastMaterial()
-{
-	return m_materials.end();
-}
-
-
-
-void RAS_MeshObject::SetName(STR_String name)
-{
-	m_name = name;
-}
-
-
-
-const STR_String& RAS_MeshObject::GetName()
-{
-	return m_name;
-}
-
-
-
-const STR_String& RAS_MeshObject::GetTextureName(unsigned int matid)
-{ 
-	RAS_MaterialBucket* bucket = GetMaterialBucket(matid);
-	
-	return bucket?bucket->GetPolyMaterial()->GetTextureName():s_emptyname;
-}
-
-
-
-void RAS_MeshObject::AddPolygon(RAS_Polygon* poly)
-{
-	m_Polygons.push_back(poly);
-}
-
-
-
-void RAS_MeshObject::DebugColor(unsigned int abgr)
-{
-/*
-	int numpolys = NumPolygons();
-	for (int i=0;i<numpolys;i++)
-	{
-		RAS_Polygon* poly = m_polygons[i];
-		for (int v=0;v<poly->VertexCount();v++)
-		{
-		RAS_TexVert* vtx = poly->GetVertex(v);
-		vtx->setDebugRGBA(abgr);
-		}
-	}
-	*/
-
-	m_debugcolor = abgr;	
-}
-
-void RAS_MeshObject::SetVertexColor(RAS_IPolyMaterial* mat,MT_Vector4 rgba)
-{
-	const vecVertexArray & vertexvec = GetVertexCache(mat);
-			
-	for (vector<KX_VertexArray*>::const_iterator it = vertexvec.begin(); it != vertexvec.end(); ++it)
-	{
-		KX_VertexArray::iterator vit;
-		for (vit=(*it)->begin(); vit != (*it)->end(); vit++)
-		{
-			vit->SetRGBA(rgba);
-		}
-	}	
-}
-
-void RAS_MeshObject::SchedulePoly(const KX_VertexIndex& idx,
-								  int numverts,
-								  RAS_IPolyMaterial* mat)
-{
-	KX_ArrayOptimizer* ao = GetArrayOptimizer(mat);
-
-	ao->m_IndexArrayCache1[idx.m_vtxarray]->push_back(idx.m_indexarray[0]);
-	ao->m_IndexArrayCache1[idx.m_vtxarray]->push_back(idx.m_indexarray[1]);
-	ao->m_IndexArrayCache1[idx.m_vtxarray]->push_back(idx.m_indexarray[2]);
-
-	if (!mat->UsesTriangles())
-		ao->m_IndexArrayCache1[idx.m_vtxarray]->push_back(idx.m_indexarray[3]);
-}
-
-
-void RAS_MeshObject::ScheduleWireframePoly(const KX_VertexIndex& idx,
-										   int numverts,
-										   int edgecode,
-										   RAS_IPolyMaterial* mat)
-{
-	//int indexpos = m_IndexArrayCount[idx.m_vtxarray];
-	int edgetrace = 1<<(numverts-1);
-	bool drawedge = (edgecode & edgetrace)!=0;
-	edgetrace = 1;
-	int prevvert = idx.m_indexarray[numverts-1];
-	KX_ArrayOptimizer* ao = GetArrayOptimizer(mat);
-	
-	for (int v = 0; v < numverts; v++)
-	{
-		unsigned int curvert = idx.m_indexarray[v];
-		if (drawedge)
-		{
-			ao->m_IndexArrayCache1[idx.m_vtxarray]->push_back(prevvert);
-			ao->m_IndexArrayCache1[idx.m_vtxarray]->push_back(curvert);
-		}
-		prevvert = curvert;
-		drawedge = (edgecode & edgetrace)!=0;
-		edgetrace*=2;
-	}
-	//m_IndexArrayCount[idx.m_vtxarray] = indexpos;
-}
-
-int RAS_MeshObject::FindOrAddVertex(int vtxarray,
-									const MT_Point3& xyz,
-									const MT_Point2& uv,
-									const MT_Point2& uv2,
-									const MT_Vector4& tangent,
-									const unsigned int rgbacolor,
-									const MT_Vector3& normal,
-									bool flat,
-									RAS_IPolyMaterial* mat,
-									int origindex)
-{
-	KX_ArrayOptimizer* ao = GetArrayOptimizer(mat);
-	
-	int numverts = ao->m_VertexArrayCache1[vtxarray]->size();//m_VertexArrayCount[vtxarray];
-	RAS_TexVert newvert(xyz,uv,uv2,tangent,rgbacolor,normal, flat? TV_CALCFACENORMAL: 0,origindex);
-
-#define KX_FIND_SHARED_VERTICES
-#ifdef KX_FIND_SHARED_VERTICES
-	if(!flat) {
-		for (std::vector<RAS_MatArrayIndex>::iterator it = m_xyz_index_to_vertex_index_mapping[origindex].begin();
-			 it != m_xyz_index_to_vertex_index_mapping[origindex].end();
-			 it++)
-		{
-			if ((*it).m_arrayindex1 == ao->m_index1 &&
-				(*it).m_array == vtxarray && 
-				*(*it).m_matid == *mat &&
-				(*ao->m_VertexArrayCache1[vtxarray])[(*it).m_index].closeTo(&newvert)
-				)
-			{
-				return (*it).m_index;
-			}
-		}
-	}
-#endif // KX_FIND_SHARED_VERTICES
-	
-	// no vertex found, add one
-	ao->m_VertexArrayCache1[vtxarray]->push_back(newvert);
-	//	printf("(%f,%f,%f) ",xyz[0],xyz[1],xyz[2]);
-	RAS_MatArrayIndex idx;
-	idx.m_arrayindex1 = ao->m_index1;
-	idx.m_array = vtxarray;
-	idx.m_index = numverts;
-	idx.m_matid = mat;
-	m_xyz_index_to_vertex_index_mapping[origindex].push_back(idx); 
-	
-	return numverts;
-}
-
-vecVertexArray& RAS_MeshObject::GetVertexCache (RAS_IPolyMaterial* mat)
-{
-	KX_ArrayOptimizer* ao = GetArrayOptimizer(mat);
-
-	return ao->m_VertexArrayCache1;
-}
-
-int RAS_MeshObject::GetVertexArrayLength(RAS_IPolyMaterial* mat)
-{
-	int len = 0;
-
-	const vecVertexArray & vertexvec = GetVertexCache(mat);
-	vector<KX_VertexArray*>::const_iterator it = vertexvec.begin();
-	
-	for (; it != vertexvec.end(); ++it)
-	{
-		len += (*it)->size();
-	}
-
-	return len;
-}
-
-	
-
-RAS_TexVert* RAS_MeshObject::GetVertex(unsigned int matid,
-									   unsigned int index)
-{
-	RAS_TexVert* vertex = NULL;
-	
-	RAS_MaterialBucket* bucket = GetMaterialBucket(matid);
-	if (bucket)
-	{
-		RAS_IPolyMaterial* mat = bucket->GetPolyMaterial();
-		if (mat)
-		{
-			const vecVertexArray & vertexvec = GetVertexCache(mat);
-			vector<KX_VertexArray*>::const_iterator it = vertexvec.begin();
-			
-			for (unsigned int len = 0; it != vertexvec.end(); ++it)
-			{
-				if (index < len + (*it)->size())
-				{
-					vertex = &(*(*it))[index-len];
-					break;
-				}
-				else
-				{
-					len += (*it)->size();
-				}
-			}
-		}
-	}
-	
-	return vertex;
-}
-
-
-
-const vecIndexArrays& RAS_MeshObject::GetIndexCache (RAS_IPolyMaterial* mat)
-{
-	KX_ArrayOptimizer* ao = GetArrayOptimizer(mat);
-
-	return ao->m_IndexArrayCache1;
-}
-
-
-
-KX_ArrayOptimizer* RAS_MeshObject::GetArrayOptimizer(RAS_IPolyMaterial* polymat)
-{
-	KX_ArrayOptimizer** aop = m_matVertexArrayS[polymat];
-
-	if(aop)
-		return *aop;
-	
-	// didn't find array, but an array might already exist
-	// for a material equal to this one
-	for(int i=0;i<m_matVertexArrayS.size();i++) {
-		RAS_IPolyMaterial *mat = (RAS_IPolyMaterial*)(m_matVertexArrayS.getKey(i)->getValue());
-		if(*mat == *polymat) {
-			m_matVertexArrayS.insert(polymat, *m_matVertexArrayS.at(i));
-			return *m_matVertexArrayS.at(i);
-		}
-	}
-
-	// create new array
-	int numelements = m_matVertexArrayS.size();
-	m_sortedMaterials.push_back(polymat);
-
-	KX_ArrayOptimizer* ao = new KX_ArrayOptimizer(numelements);
-	m_matVertexArrayS.insert(polymat, ao);
-	
-	return ao;
-}
-
-
-
-void RAS_MeshObject::Bucketize(double* oglmatrix,
-							   void* clientobj,
-							   bool useObjectColor,
-							   const MT_Vector4& rgbavec)
-{
-	KX_MeshSlot ms;
-	ms.m_clientObj = clientobj;
-	ms.m_mesh = this;
-	ms.m_OpenGLMatrix = oglmatrix;
-	ms.m_bObjectColor = useObjectColor;
-	ms.m_RGBAcolor = rgbavec;
-	
-	for (RAS_MaterialBucket::Set::iterator it = m_materials.begin();it!=m_materials.end();++it)
-	{
-		RAS_MaterialBucket* bucket = *it;
-//		KX_ArrayOptimizer* oa = GetArrayOptimizer(bucket->GetPolyMaterial());
-		bucket->SetMeshSlot(ms);
-	}
-
-}
-
-
-
-void RAS_MeshObject::MarkVisible(double* oglmatrix,
-								 void* clientobj,
-								 bool visible,
-								 bool useObjectColor,
-								 const MT_Vector4& rgbavec)
-{
-	KX_MeshSlot ms;
-	ms.m_clientObj = clientobj;
-	ms.m_mesh = this;
-	ms.m_OpenGLMatrix = oglmatrix;
-	ms.m_RGBAcolor = rgbavec;
-	ms.m_bObjectColor= useObjectColor;
-
-	for (RAS_MaterialBucket::Set::iterator it = m_materials.begin();it!=m_materials.end();++it)
-	{
-		RAS_MaterialBucket* bucket = *it;
-//		KX_ArrayOptimizer* oa = GetArrayOptimizer(bucket->GetPolyMaterial());
-		bucket->MarkVisibleMeshSlot(ms,visible,useObjectColor,rgbavec);
-	}
-}
-
-
-void RAS_MeshObject::RemoveFromBuckets(double* oglmatrix,
-									   void* clientobj)
-{
-	KX_MeshSlot ms;
-	ms.m_clientObj = clientobj;
-	ms.m_mesh = this;
-	ms.m_OpenGLMatrix = oglmatrix;
-
-	for (RAS_MaterialBucket::Set::iterator it = m_materials.begin();it!=m_materials.end();++it)
-	{
-		RAS_MaterialBucket* bucket = *it;
-//		RAS_IPolyMaterial* polymat = bucket->GetPolyMaterial();
-		//KX_ArrayOptimizer* oa = GetArrayOptimizer(polymat);
-		bucket->RemoveMeshSlot(ms);
-	}
-
-}
-
-
-
-/*
- * RAS_MeshObject::GetVertex returns the vertex located somewhere in the vertexpool
- * it is the clients responsibility to make sure the array and index are valid
- */
-RAS_TexVert* RAS_MeshObject::GetVertex(short array,
-									   unsigned int index,
-									   RAS_IPolyMaterial* polymat)
-{
-	 KX_ArrayOptimizer* ao = GetArrayOptimizer(polymat);
-	return &((*(ao->m_VertexArrayCache1)[array])[index]);
-}
-
-
-
-void RAS_MeshObject::ClearArrayData()
-{
-	for (int i=0;i<m_matVertexArrayS.size();i++) {
-		KX_ArrayOptimizer** ao = m_matVertexArrayS.at(i);
-
-		// we have duplicate entries, only free once
-		for(int j=i+1;j<m_matVertexArrayS.size();j++) {
-			if(ao == m_matVertexArrayS.at(j)) {
-				ao = NULL;
-				break;
-			}
-		}
-
-		if (ao)
-			delete *ao;
-	}
-}
-
-
-
-/**
- * RAS_MeshObject::CreateNewVertices creates vertices within sorted pools of vertices that share same material
-*/
-int	RAS_MeshObject::FindVertexArray(int numverts,
-									RAS_IPolyMaterial* polymat)
-{
-//	bool found=false;
-	int array=-1;
-	
-	KX_ArrayOptimizer* ao = GetArrayOptimizer(polymat);
-
-	for (unsigned int i=0;i<ao->m_VertexArrayCache1.size();i++)
-	{
-		if ( (ao->m_TriangleArrayCount[i] + (numverts-2)) < BUCKET_MAX_TRIANGLES) 
-		{
-			if((ao->m_VertexArrayCache1[i]->size()+numverts < BUCKET_MAX_INDICES))
-			{
-				array = i;
-				ao->m_TriangleArrayCount[array]+=numverts-2;
-				break;
-			}
-		}
-	}
-
-	if (array == -1)
-	{
-		array = ao->m_VertexArrayCache1.size();
-		vector<RAS_TexVert>* va = new vector<RAS_TexVert>;
-		ao->m_VertexArrayCache1.push_back(va);
-		KX_IndexArray *ia = new KX_IndexArray();
-		ao->m_IndexArrayCache1.push_back(ia);
-		ao->m_TriangleArrayCount.push_back(numverts-2);
-	}
-
-	return array;
-}
-
-
-
-
-//void RAS_MeshObject::Transform(const MT_Transform& trans)
-//{
-	//m_trans.translate(MT_Vector3(0,0,1));//.operator *=(trans);
-	
-//	for (int i=0;i<m_Polygons.size();i++)
-//	{
-//		m_Polygons[i]->Transform(trans);
-//	}
-//}
-
-
-/*
-void RAS_MeshObject::RelativeTransform(const MT_Vector3& vec)
-{
-	for (int i=0;i<m_Polygons.size();i++)
-	{
-		m_Polygons[i]->RelativeTransform(vec);
-	}
-}
-*/
-
-
-
-void RAS_MeshObject::UpdateMaterialList()
-{
-	m_materials.clear();
-	unsigned int numpolys = m_Polygons.size();
-	// for all polygons, find out which material they use, and add it to the set of materials
-	for (unsigned int i=0;i<numpolys;i++)
-	{
-		m_materials.insert(m_Polygons[i]->GetMaterial());
-	}
-}
+/* polygon sorting */
 
 struct RAS_MeshObject::polygonSlot
 {
@@ -585,7 +44,7 @@ struct RAS_MeshObject::polygonSlot
 
 	/* pnorm is the normal from the plane equation that the distance from is
 	 * used to sort again. */
-	void get(const KX_VertexArray& vertexarray, const KX_IndexArray& indexarray,
+	void get(const RAS_TexVert *vertexarray, const unsigned short *indexarray,
 		int offset, int nvert, const MT_Vector3& pnorm)
 	{
 		MT_Vector3 center(0, 0, 0);
@@ -593,7 +52,7 @@ struct RAS_MeshObject::polygonSlot
 
 		for(i=0; i<nvert; i++) {
 			m_index[i] = indexarray[offset+i];
-			center += vertexarray[m_index[i]].getLocalXYZ();
+			center += vertexarray[m_index[i]].getXYZ();
 		}
 
 		/* note we don't divide center by the number of vertices, since all
@@ -602,7 +61,7 @@ struct RAS_MeshObject::polygonSlot
 		m_z = MT_dot(pnorm, center);
 	}
 
-	void set(KX_IndexArray& indexarray, int offset, int nvert)
+	void set(unsigned short *indexarray, int offset, int nvert)
 	{
 		int i;
 
@@ -627,7 +86,369 @@ struct RAS_MeshObject::fronttoback
 	}
 };
 
-void RAS_MeshObject::SortPolygons(const MT_Transform &transform)
+/* mesh object */
+
+STR_String RAS_MeshObject::s_emptyname = "";
+
+RAS_MeshObject::RAS_MeshObject(Mesh* mesh, int lightlayer)
+	: m_lightlayer(lightlayer),
+	m_bModified(true),
+	m_bMeshModified(true),
+	m_mesh(mesh),
+	m_bDeformed(false)
+{
+}
+
+RAS_MeshObject::~RAS_MeshObject()
+{
+	vector<RAS_Polygon*>::iterator it;
+
+	for(it=m_Polygons.begin(); it!=m_Polygons.end(); it++)
+		delete (*it);
+}
+
+bool RAS_MeshObject::MeshModified()
+{
+	return m_bMeshModified;
+}
+
+unsigned int RAS_MeshObject::GetLightLayer()
+{
+	return m_lightlayer;
+}
+
+
+
+int RAS_MeshObject::NumMaterials()
+{
+	return m_materials.size();
+}
+
+const STR_String& RAS_MeshObject::GetMaterialName(unsigned int matid)
+{ 
+	RAS_MeshMaterial* mmat = GetMeshMaterial(matid);
+
+	if(mmat)
+		return mmat->m_bucket->GetPolyMaterial()->GetMaterialName();
+	
+	return s_emptyname;
+}
+
+RAS_MeshMaterial* RAS_MeshObject::GetMeshMaterial(unsigned int matid)
+{
+	if (m_materials.size() > 0 && (matid < m_materials.size()))
+	{
+		list<RAS_MeshMaterial>::iterator it = m_materials.begin();
+		while (matid--) ++it;
+		return &*it;
+	}
+
+	return NULL;
+}
+
+
+
+int RAS_MeshObject::NumPolygons()
+{
+	return m_Polygons.size();
+}
+
+
+
+RAS_Polygon* RAS_MeshObject::GetPolygon(int num) const
+{
+	return m_Polygons[num];
+}
+
+	
+	
+
+	list<RAS_MeshMaterial>::iterator GetFirstMaterial();
+	list<RAS_MeshMaterial>::iterator GetLastMaterial();
+list<RAS_MeshMaterial>::iterator RAS_MeshObject::GetFirstMaterial()
+{
+	return m_materials.begin();
+}
+
+
+
+list<RAS_MeshMaterial>::iterator RAS_MeshObject::GetLastMaterial()
+{
+	return m_materials.end();
+}
+
+
+
+void RAS_MeshObject::SetName(STR_String name)
+{
+	m_name = name;
+}
+
+
+
+const STR_String& RAS_MeshObject::GetName()
+{
+	return m_name;
+}
+
+
+
+const STR_String& RAS_MeshObject::GetTextureName(unsigned int matid)
+{ 
+	RAS_MeshMaterial* mmat = GetMeshMaterial(matid);
+	
+	if(mmat)
+		return mmat->m_bucket->GetPolyMaterial()->GetTextureName();
+
+	return s_emptyname;
+}
+
+RAS_MeshMaterial *RAS_MeshObject::GetMeshMaterial(RAS_IPolyMaterial *mat)
+{
+	list<RAS_MeshMaterial>::iterator mit;
+
+	/* find a mesh material */
+	for(mit = m_materials.begin(); mit != m_materials.end(); mit++)
+		if(mit->m_bucket->GetPolyMaterial() == mat)
+			return &*mit;
+
+	return NULL;
+}
+
+RAS_Polygon* RAS_MeshObject::AddPolygon(RAS_MaterialBucket *bucket, int numverts)
+{
+	RAS_MeshMaterial *mmat;
+	RAS_Polygon *poly;
+	RAS_MeshSlot *slot;
+
+	/* find a mesh material */
+	mmat = GetMeshMaterial(bucket->GetPolyMaterial());
+
+	/* none found, create a new one */
+	if(!mmat) {
+		RAS_MeshMaterial meshmat;
+		meshmat.m_bucket = bucket;
+		meshmat.m_baseslot = meshmat.m_bucket->AddMesh(numverts);
+		m_materials.push_back(meshmat);
+		mmat = &m_materials.back();
+	}
+
+	/* add it to the bucket, this also adds new display arrays */
+	slot = mmat->m_baseslot;
+	slot->AddPolygon(numverts);
+
+	/* create a new polygon */
+	RAS_DisplayArray *darray = slot->CurrentDisplayArray();
+	poly = new RAS_Polygon(bucket, darray, numverts);
+	m_Polygons.push_back(poly);
+
+	return poly;
+}
+
+void RAS_MeshObject::DebugColor(unsigned int abgr)
+{
+	/*int numpolys = NumPolygons();
+
+	for (int i=0;i<numpolys;i++) {
+		RAS_Polygon* poly = m_polygons[i];
+		for (int v=0;v<poly->VertexCount();v++)
+			RAS_TexVert* vtx = poly->GetVertex(v)->setDebugRGBA(abgr);
+	}
+	*/
+
+	/* m_debugcolor = abgr;	*/
+}
+
+void RAS_MeshObject::SetVertexColor(RAS_IPolyMaterial* mat,MT_Vector4 rgba)
+{
+	RAS_MeshMaterial *mmat = GetMeshMaterial(mat);
+	RAS_MeshSlot *slot = mmat->m_baseslot;
+	RAS_MeshSlot::iterator it;
+	size_t i;
+
+	for(slot->begin(it); !slot->end(it); slot->next(it))
+		for(i=it.startvertex; i<it.endvertex; i++)
+			it.vertex[i].SetRGBA(rgba);
+}
+
+void RAS_MeshObject::AddVertex(RAS_Polygon *poly, int i,
+								const MT_Point3& xyz,
+								const MT_Point2& uv,
+								const MT_Point2& uv2,
+								const MT_Vector4& tangent,
+								const unsigned int rgba,
+								const MT_Vector3& normal,
+								bool flat,
+								int origindex)
+{
+	RAS_TexVert texvert(xyz, uv, uv2, tangent, rgba, normal, flat, origindex);
+	RAS_MeshMaterial *mmat;
+	RAS_DisplayArray *darray;
+	RAS_MeshSlot *slot;
+	int offset;
+	
+	mmat = GetMeshMaterial(poly->GetMaterial()->GetPolyMaterial());
+	slot = mmat->m_baseslot;
+	darray = slot->CurrentDisplayArray();
+
+	if(!flat) {
+		/* find vertices shared between faces, with the restriction
+		 * that they exist in the same display array, and have the
+		 * same uv coordinate etc */
+		vector<SharedVertex>& sharedmap = m_sharedvertex_map[origindex];
+		vector<SharedVertex>::iterator it;
+
+		for(it = sharedmap.begin(); it != sharedmap.end(); it++)
+		{
+			if(it->m_darray != darray)
+				continue;
+			if(!it->m_darray->m_vertex[it->m_offset].closeTo(&texvert))
+				continue;
+
+			/* found one, add it and we're done */
+			if(poly->IsVisible())
+				slot->AddPolygonVertex(it->m_offset);
+			poly->SetVertexOffset(i, it->m_offset);
+			return;
+		}
+	}
+
+	/* no shared vertex found, add a new one */
+	offset = slot->AddVertex(texvert);
+	if(poly->IsVisible())
+		slot->AddPolygonVertex(offset);
+	poly->SetVertexOffset(i, offset);
+
+	if(!flat) {
+		SharedVertex shared;
+		shared.m_darray = darray;
+		shared.m_offset = offset;
+		m_sharedvertex_map[origindex].push_back(shared);
+	}
+}
+
+int RAS_MeshObject::NumVertices(RAS_IPolyMaterial* mat)
+{
+	RAS_MeshMaterial *mmat;
+	RAS_MeshSlot *slot;
+	RAS_MeshSlot::iterator it;
+	size_t len = 0;
+
+	mmat = GetMeshMaterial(mat);
+	slot = mmat->m_baseslot;
+	for(slot->begin(it); !slot->end(it); slot->next(it))
+		len += it.endvertex - it.startvertex;
+	
+	return len;
+}
+
+
+RAS_TexVert* RAS_MeshObject::GetVertex(unsigned int matid,
+									   unsigned int index)
+{
+	RAS_MeshMaterial *mmat;
+	RAS_MeshSlot *slot;
+	RAS_MeshSlot::iterator it;
+	size_t len;
+
+	mmat = GetMeshMaterial(matid);
+
+	if(!mmat)
+		return NULL;
+	
+	slot = mmat->m_baseslot;
+	len = 0;
+	for(slot->begin(it); !slot->end(it); slot->next(it)) {
+		if(index >= len + it.endvertex - it.startvertex)
+			len += it.endvertex - it.startvertex;
+		else
+			return &it.vertex[index - len];
+	}
+	
+	return NULL;
+}
+
+void RAS_MeshObject::AddMeshUser(void *clientobj)
+{
+	list<RAS_MeshMaterial>::iterator it;
+
+	for(it = m_materials.begin();it!=m_materials.end();++it) {
+		/* always copy from the base slot, which is never removed 
+		 * since new objects can be created with the same mesh data */
+		RAS_MeshSlot *ms = it->m_bucket->CopyMesh(it->m_baseslot);
+		ms->m_clientObj = clientobj;
+		it->m_slots.insert(clientobj, ms);
+	}
+}
+
+void RAS_MeshObject::UpdateBuckets(void* clientobj,
+							   double* oglmatrix,
+							   bool useObjectColor,
+							   const MT_Vector4& rgbavec,
+							   bool visible,
+							   bool culled)
+{
+	list<RAS_MeshMaterial>::iterator it;
+
+	for(it = m_materials.begin();it!=m_materials.end();++it) {
+		RAS_MeshSlot **msp = it->m_slots[clientobj];
+
+		if(!msp)
+			continue;
+
+		RAS_MeshSlot *ms = *msp;
+
+		ms->m_mesh = this;
+		ms->m_OpenGLMatrix = oglmatrix;
+		ms->m_bObjectColor = useObjectColor;
+		ms->m_RGBAcolor = rgbavec;
+		ms->m_bVisible = visible;
+		ms->m_bCulled = culled || !visible;
+
+		/* split if necessary */
+		ms->Split();
+	}
+}
+
+void RAS_MeshObject::RemoveFromBuckets(void *clientobj)
+{
+	list<RAS_MeshMaterial>::iterator it;
+	
+	for(it = m_materials.begin();it!=m_materials.end();++it) {
+		RAS_MeshSlot **msp = it->m_slots[clientobj];
+
+		if(!msp)
+			continue;
+
+		RAS_MeshSlot *ms = *msp;
+
+		it->m_bucket->RemoveMesh(ms);
+		it->m_slots.remove(clientobj);
+	}
+}
+
+//void RAS_MeshObject::Transform(const MT_Transform& trans)
+//{
+	//m_trans.translate(MT_Vector3(0,0,1));//.operator *=(trans);
+	
+//	for (int i=0;i<m_Polygons.size();i++)
+//	{
+//		m_Polygons[i]->Transform(trans);
+//	}
+//}
+
+
+/*
+void RAS_MeshObject::RelativeTransform(const MT_Vector3& vec)
+{
+	for (int i=0;i<m_Polygons.size();i++)
+	{
+		m_Polygons[i]->RelativeTransform(vec);
+	}
+}
+*/
+
+void RAS_MeshObject::SortPolygons(RAS_MeshSlot& ms, const MT_Transform &transform)
 {
 	// Limitations: sorting is quite simple, and handles many
 	// cases wrong, partially due to polygons being sorted per
@@ -645,43 +466,34 @@ void RAS_MeshObject::SortPolygons(const MT_Transform &transform)
 	// to avoid excessive state changes while drawing. e) would
 	// require splitting polygons.
 
-	if (!m_zsort)
-		return;
+	RAS_MeshSlot::iterator it;
+	size_t j;
 
-	// Extract camera Z plane...
-	const MT_Vector3 pnorm(transform.getBasis()[2]);
-	// unneeded: const MT_Scalar pval = transform.getOrigin()[2];
+	for(ms.begin(it); !ms.end(it); ms.next(it)) {
+		unsigned int nvert = (int)it.array->m_type;
+		unsigned int totpoly = it.totindex/nvert;
 
-	for (RAS_MaterialBucket::Set::iterator it = m_materials.begin();it!=m_materials.end();++it)
-	{
-		if(!(*it)->IsZSort())
+		if(totpoly <= 1)
+			continue;
+		if(it.array->m_type == RAS_DisplayArray::LINE)
 			continue;
 
-		RAS_IPolyMaterial *mat = (*it)->GetPolyMaterial();
-		KX_ArrayOptimizer* ao = GetArrayOptimizer(mat);
+		// Extract camera Z plane...
+		const MT_Vector3 pnorm(transform.getBasis()[2]);
+		// unneeded: const MT_Scalar pval = transform.getOrigin()[2];
 
-		vecIndexArrays& indexarrays = ao->m_IndexArrayCache1;
-		vecVertexArray& vertexarrays = ao->m_VertexArrayCache1;
-		unsigned int i, j, nvert = (mat->UsesTriangles())? 3: 4;
+		vector<polygonSlot> slots(totpoly);
 
-		for(i=0; i<indexarrays.size(); i++) {
-			KX_IndexArray& indexarray = *indexarrays[i];
-			KX_VertexArray& vertexarray = *vertexarrays[i];
+		/* get indices and z into temporary array */
+		for(j=0; j<totpoly; j++)
+			slots[j].get(it.vertex, it.index, j*nvert, nvert, pnorm);
 
-			unsigned int totpoly = indexarray.size()/nvert;
-			vector<polygonSlot> slots(totpoly);
+		/* sort (stable_sort might be better, if flickering happens?) */
+		std::sort(slots.begin(), slots.end(), backtofront());
 
-			/* get indices and z into temporary array */
-			for(j=0; j<totpoly; j++)
-				slots[j].get(vertexarray, indexarray, j*nvert, nvert, pnorm);
-
-			/* sort (stable_sort might be better, if flickering happens?) */
-			std::sort(slots.begin(), slots.end(), backtofront());
-
-			/* get indices from temporary array again */
-			for(j=0; j<totpoly; j++)
-				slots[j].set(indexarray, j*nvert, nvert);
-		}
+		/* get indices from temporary array again */
+		for(j=0; j<totpoly; j++)
+			slots[j].set(it.index, j*nvert, nvert);
 	}
 }
 
@@ -690,37 +502,8 @@ void RAS_MeshObject::SchedulePolygons(int drawingmode)
 {
 	if (m_bModified)
 	{
-		int i, numpolys = m_Polygons.size();
-
-		for (RAS_MaterialBucket::Set::iterator it = m_materials.begin();it!=m_materials.end();++it)
-			if ((*it)->IsZSort())
-				m_zsort = true;
-		
-		if (drawingmode == RAS_IRasterizer::KX_WIREFRAME)
-		{
-			for (i=0;i<numpolys;i++)
-			{
-				RAS_Polygon* poly = m_Polygons[i];
-				if (poly->IsVisible())
-					ScheduleWireframePoly(poly->GetVertexIndexBase(),poly->VertexCount(),poly->GetEdgeCode(),
-						poly->GetMaterial()->GetPolyMaterial());
-				
-			}
-			m_zsort = false;
-		}
-		else
-		{
-			for (i=0;i<numpolys;i++)
-			{
-				RAS_Polygon* poly = m_Polygons[i];
-				if (poly->IsVisible())
-					SchedulePoly(poly->GetVertexIndexBase(),poly->VertexCount(),
-						poly->GetMaterial()->GetPolyMaterial());
-			}
-		}
-
 		m_bModified = false;
-		m_MeshMod = true;
+		m_bMeshModified = true;
 	} 
 }
 
diff --git a/source/gameengine/Rasterizer/RAS_MeshObject.h b/source/gameengine/Rasterizer/RAS_MeshObject.h
index 9a46d89c393..0d35a2f402b 100644
--- a/source/gameengine/Rasterizer/RAS_MeshObject.h
+++ b/source/gameengine/Rasterizer/RAS_MeshObject.h
@@ -36,6 +36,7 @@
 
 #include <vector>
 #include <set>
+#include <list>
 
 #include "RAS_Polygon.h"
 #include "RAS_MaterialBucket.h"
@@ -44,194 +45,71 @@
 #include "GEN_HashedPtr.h"
 
 struct Mesh;
-/**
- * This class holds an array of vertices and indicies.
- */
-class KX_ArrayOptimizer
-{
-public:
-	KX_ArrayOptimizer(int index) 
-		: m_index1(index)
-	{};
-	virtual ~KX_ArrayOptimizer();
-	
-	vector<KX_VertexArray*>		m_VertexArrayCache1;
-	vector<int>					m_TriangleArrayCount;
-	vector<KX_IndexArray*>		m_IndexArrayCache1;
 
-	/**
-		order in which they are stored into the mesh
-	*/
-	int							m_index1;
-};
+/* RAS_MeshObject is a mesh used for rendering. It stores polygons,
+ * but the actual vertices and index arrays are stored in material
+ * buckets, referenced by the list of RAS_MeshMaterials. */
 
-/**
- * This struct holds a triangle.
- */
-struct	RAS_TriangleIndex
-{
-public:
-	int	m_index[3];
-	int	m_array;
-	RAS_IPolyMaterial*	m_matid;
-	bool	m_collider;
-};
-
-/**
- * This class looks horribly broken.  Only m_matid is used, and
- * m_matid is a (int) RAS_IPolyMaterial*.  
- * --> m_matid == lhs.m_matid should be *m_matid == *lhs.m_matid
- */
-class	RAS_MatArrayIndex
-{
-public:
-
-	int	m_arrayindex1;
-	RAS_IPolyMaterial*	m_matid;
-	int	m_array;
-	int	m_index;
-
-/*
-	inline bool	Less(const RAS_MatArrayIndex& lhs) const {
-		bool result = 
-			(	(m_matid < lhs.m_matid)		||
-				((m_matid == lhs.m_matid)&&(m_array < lhs.m_array)) ||
-				((m_matid == lhs.m_matid) && (m_array == lhs.m_array) &&
-				(m_index < lhs.m_index))
-					
-			);
-		return result;
-			
-	}
-*/
-	
-};
-/*
-inline  bool operator <( const RAS_MatArrayIndex& rhs,const RAS_MatArrayIndex& lhs)
-{
-	return ( rhs.Less(lhs));
-}*/
-
-/**
- * RAS_MeshObject stores mesh data for the renderer.
- */
 class RAS_MeshObject
 {
-	
-	//	GEN_Map<class RAS_IPolyMaterial,KX_ArrayOptimizer*> m_matVertexArrayS;
-	//vector<class RAS_IPolyMaterial*,KX_ArrayOptimizer> m_vertexArrays;
-	virtual KX_ArrayOptimizer* GetArrayOptimizer(RAS_IPolyMaterial* polymat);
-	//vector<RAS_Polygon*>		m_polygons;
-	
+private:
 	unsigned int				m_debugcolor;
-	bool						m_bModified;
 	int							m_lightlayer;
-	
-	vector<class RAS_Polygon*> 	m_Polygons;
+
+	bool						m_bModified;
+	bool						m_bMeshModified;
+
 	STR_String					m_name;
 	static STR_String			s_emptyname;
-	bool						m_zsort;
-	bool						m_MeshMod;
 
+	vector<class RAS_Polygon*> 	m_Polygons;
+
+	/* polygon sorting */
 	struct polygonSlot;
 	struct backtofront;
 	struct fronttoback;
 
-	void				SchedulePoly(
-							const KX_VertexIndex& idx,
-							int numverts,
-							RAS_IPolyMaterial* mat
-						);
-
-	void				ScheduleWireframePoly(
-							const KX_VertexIndex& idx,
-							int numverts,
-							int edgecode,
-							RAS_IPolyMaterial* mat
-						);
-	
 protected:
-	enum { BUCKET_MAX_INDICES = 65535 };//2048};//8192};
-	enum { BUCKET_MAX_TRIANGLES = 65535 };
-	
-	GEN_Map<GEN_HashedPtr,KX_ArrayOptimizer*> m_matVertexArrayS;
-	
-	RAS_MaterialBucket::Set			m_materials;
+	list<RAS_MeshMaterial>			m_materials;
 	Mesh*							m_mesh;
+	bool							m_bDeformed;
+
 public:
 	// for now, meshes need to be in a certain layer (to avoid sorting on lights in realtime)
 	RAS_MeshObject(Mesh* mesh, int lightlayer);
 	virtual ~RAS_MeshObject();
 
-	vector<RAS_IPolyMaterial*>				m_sortedMaterials;
-	vector<vector<RAS_MatArrayIndex> >		m_xyz_index_to_vertex_index_mapping;
-	vector<RAS_TriangleIndex >				m_triangle_indices;
-	
-	int							m_class;
 
-	unsigned int				GetLightLayer();
+	bool				IsDeformed() { return m_bDeformed; }
+	
+	/* materials */
 	int					NumMaterials();
 	const STR_String&	GetMaterialName(unsigned int matid);
-	RAS_MaterialBucket*	GetMaterialBucket(unsigned int matid);
 	const STR_String&	GetTextureName(unsigned int matid);
-	virtual void		AddPolygon(RAS_Polygon* poly);
-	void				UpdateMaterialList();
-	
-	int					NumPolygons();
-	RAS_Polygon*		GetPolygon(int num) const;
-	
-	virtual void		Bucketize(
-							double* oglmatrix,
-							void* clientobj,
-							bool useObjectColor,
-							const MT_Vector4& rgbavec
-						);
 
-	void				RemoveFromBuckets(
-							double* oglmatrix,
-							void* clientobj
-						);
+	RAS_MeshMaterial* 	GetMeshMaterial(unsigned int matid);
+	RAS_MeshMaterial*	GetMeshMaterial(RAS_IPolyMaterial *mat);
 
-	void				MarkVisible(
-							double* oglmatrix,
-							void* clientobj,
-							bool visible,
-							bool useObjectColor,
-							const MT_Vector4& rgbavec
-						);
+	list<RAS_MeshMaterial>::iterator GetFirstMaterial();
+	list<RAS_MeshMaterial>::iterator GetLastMaterial();
 
-	void				DebugColor(unsigned int abgr);
-	void 				SetVertexColor(RAS_IPolyMaterial* mat,MT_Vector4 rgba);
-	
-	/**
-	 *  Sorts the polygons by their transformed z values.
-	 */
-	void				SortPolygons(const MT_Transform &transform);
+	unsigned int		GetLightLayer();
 
-	void				SchedulePolygons(int drawingmode);
+	/* name */
+	void				SetName(STR_String name);
+	const STR_String&	GetName();
 
-	void				ClearArrayData();
-	
-	RAS_MaterialBucket::Set::iterator GetFirstMaterial();
-	RAS_MaterialBucket::Set::iterator GetLastMaterial();
-	
-	virtual RAS_TexVert*	GetVertex(
-								short array,
-								unsigned int index,
-								RAS_IPolyMaterial* polymat
-							);
-	
-	virtual int			FindVertexArray(
-							int numverts,
-							RAS_IPolyMaterial* polymat
-						);
+	/* modification state */
+	bool				MeshModified();
+	void				SetMeshModified(bool v){m_bMeshModified = v;}
 
+	/* original blender mesh */
+	Mesh*				GetMesh() { return m_mesh; }
+
+	/* mesh construction */
 	
-	// find (and share) or add vertices
-	// for some speedup, only the last 20 added vertices are searched for equality
-	
-	virtual int			FindOrAddVertex(
-							int vtxarray,
+	virtual RAS_Polygon*	AddPolygon(RAS_MaterialBucket *bucket, int numverts);
+	virtual void			AddVertex(RAS_Polygon *poly, int i,
 							const MT_Point3& xyz,
 							const MT_Point2& uv,
 							const MT_Point2& uv2,
@@ -239,27 +117,43 @@ public:
 							const unsigned int rgbacolor,
 							const MT_Vector3& normal,
 							bool flat,
-							RAS_IPolyMaterial* mat,
-							int origindex
-						);
+							int origindex);
+
+	void					SchedulePolygons(int drawingmode);
+
+	/* vertex and polygon acces */
+	int					NumVertices(RAS_IPolyMaterial* mat);
+	RAS_TexVert*		GetVertex(unsigned int matid, unsigned int index);
+
+	int					NumPolygons();
+	RAS_Polygon*		GetPolygon(int num) const;
 	
-	vecVertexArray&		GetVertexCache (RAS_IPolyMaterial* mat);
+	/* buckets */
+	virtual void		AddMeshUser(void *clientobj);
+	virtual void		UpdateBuckets(
+							void* clientobj,
+							double* oglmatrix,
+							bool useObjectColor,
+							const MT_Vector4& rgbavec,
+							bool visible,
+							bool culled);
+
+	void				RemoveFromBuckets(void *clientobj);
+
+	/* colors */
+	void				DebugColor(unsigned int abgr);
+	void 				SetVertexColor(RAS_IPolyMaterial* mat,MT_Vector4 rgba);
 	
-	int					GetVertexArrayLength(RAS_IPolyMaterial* mat);
+	/* polygon sorting by Z for alpha */
+	void				SortPolygons(RAS_MeshSlot& ms, const MT_Transform &transform);
 
-	RAS_TexVert*		GetVertex(
-							unsigned int matid,
-							unsigned int index
-						);
-
-	const vecIndexArrays& GetIndexCache (RAS_IPolyMaterial* mat);
-	void				SetName(STR_String name);
-	const STR_String&	GetName();
-
-	bool				MeshModified();
-	void				SetMeshModified(bool v){m_MeshMod = v;}
-	Mesh*				GetMesh() { return m_mesh; }
+	/* for construction to find shared vertices */
+	struct SharedVertex {
+		RAS_DisplayArray *m_darray;
+		int m_offset;
+	};
 
+	vector<vector<SharedVertex> >	m_sharedvertex_map;
 };
 
 #endif //__RAS_MESHOBJECT
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
index 2a6d64ecc73..e4403ace69f 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
@@ -32,6 +32,7 @@ SET(INC
   ../../../../intern/moto/include
   ../../../../source/gameengine/Rasterizer
   ../../../../extern/glew/include
+  ../../../../source/blender/gpu
 )
 
 BLENDERLIB(bf_oglrasterizer "${SRC}" "${INC}")
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile
index f01978b8eb1..aee485a22be 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile
@@ -41,12 +41,11 @@ CPPFLAGS += -I$(OPENGL_HEADERS)
 CPPFLAGS += -I$(NAN_STRING)/include    
 CPPFLAGS += -I$(NAN_MOTO)/include
 CPPFLAGS += -I../../../kernel/gen_system
+CPPFLAGS += -I../../../blender/gpu
 CPPFLAGS += -I../../BlenderRoutines
 CPPFLAGS += -I..
+
 ifeq ($(OS),darwin)
 	CPPFLAGS += -fpascal-strings
 endif
 
-ifeq ($(WITH_BF_GLEXT),true)
-	CPPFLAGS += -DWITH_GLEXT
-endif
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
index c2687319717..2c4b55ff964 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
@@ -9,6 +9,7 @@
 
 #include "GL/glew.h"
 
+#include "RAS_MaterialBucket.h"
 #include "RAS_TexVert.h"
 #include "MT_assert.h"
 
@@ -125,20 +126,20 @@ void RAS_ListRasterizer::RemoveListSlot(RAS_ListSlot* list)
 	}
 }
 
-RAS_ListSlot* RAS_ListRasterizer::FindOrAdd(const vecVertexArray& vertexarrays, KX_ListSlot** slot)
+RAS_ListSlot* RAS_ListRasterizer::FindOrAdd(RAS_MeshSlot& ms)
 {
 	/*
 	 Keep a copy of constant lists submitted for rendering,
 		this guards against (replicated)new...delete every frame,
 		and we can reuse lists!
-		:: sorted by vertex array
+		:: sorted by mesh slot
 	*/
-	RAS_ListSlot* localSlot = (RAS_ListSlot*)*slot;
+	RAS_ListSlot* localSlot = (RAS_ListSlot*)ms.m_DisplayList;
 	if(!localSlot) {
-		RAS_Lists::iterator it = mLists.find(vertexarrays);
+		RAS_Lists::iterator it = mLists.find(&ms);
 		if(it == mLists.end()) {
 			localSlot = new RAS_ListSlot(this);
-			mLists.insert(std::pair<vecVertexArray, RAS_ListSlot*>(vertexarrays, localSlot));
+			mLists.insert(std::pair<RAS_MeshSlot*, RAS_ListSlot*>(&ms, localSlot));
 		} else {
 			localSlot = static_cast<RAS_ListSlot*>(it->second->AddRef());
 		}
@@ -157,69 +158,45 @@ void RAS_ListRasterizer::ReleaseAlloc()
 	mLists.clear();
 }
 
-
-void RAS_ListRasterizer::IndexPrimitives(
-	const vecVertexArray & vertexarrays,
-	const vecIndexArrays & indexarrays,
-	DrawMode mode,
-	bool useObjectColor,
-	const MT_Vector4& rgbacolor,
-	class KX_ListSlot** slot)
+void RAS_ListRasterizer::IndexPrimitives(RAS_MeshSlot& ms)
 {
 	RAS_ListSlot* localSlot =0;
 
-	// useObjectColor(are we updating every frame?)
-	if(!useObjectColor && slot) {
-		localSlot = FindOrAdd(vertexarrays, slot);
+	if(ms.m_bDisplayList) {
+		localSlot = FindOrAdd(ms);
 		localSlot->DrawList();
 		if(localSlot->End()) {
 			// save slot here too, needed for replicas and object using same mesh
 			// => they have the same vertexarray but different mesh slot
-			*slot = localSlot;
+			ms.m_DisplayList = localSlot;
 			return;
 		}
 	}
 	
-	if (mUseVertexArrays) {
-		RAS_VAOpenGLRasterizer::IndexPrimitives(
-				vertexarrays, indexarrays,
-				mode, useObjectColor,
-				rgbacolor,slot
-		);
-	} else {
-		RAS_OpenGLRasterizer::IndexPrimitives(
-				vertexarrays, indexarrays,
-				mode, useObjectColor,
-				rgbacolor,slot
-		);
-	}
+	if (mUseVertexArrays)
+		RAS_VAOpenGLRasterizer::IndexPrimitives(ms);
+	else
+		RAS_OpenGLRasterizer::IndexPrimitives(ms);
 
-	if(!useObjectColor && slot) {
+	if(ms.m_bDisplayList) {
 		localSlot->EndList();
-		*slot = localSlot;
+		ms.m_DisplayList = localSlot;
 	}
 }
 
 
-void RAS_ListRasterizer::IndexPrimitivesMulti(
-		const vecVertexArray& vertexarrays,
-		const vecIndexArrays & indexarrays,
-		DrawMode mode,
-		bool useObjectColor,
-		const MT_Vector4& rgbacolor,
-		class KX_ListSlot** slot)
+void RAS_ListRasterizer::IndexPrimitivesMulti(RAS_MeshSlot& ms)
 {
 	RAS_ListSlot* localSlot =0;
 
-	// useObjectColor(are we updating every frame?)
-	if(!useObjectColor && slot) {
-		localSlot = FindOrAdd(vertexarrays, slot);
+	if(ms.m_bDisplayList) {
+		localSlot = FindOrAdd(ms);
 		localSlot->DrawList();
 
 		if(localSlot->End()) {
 			// save slot here too, needed for replicas and object using same mesh
 			// => they have the same vertexarray but different mesh slot
-			*slot = localSlot;
+			ms.m_DisplayList = localSlot;
 			return;
 		}
 	}
@@ -227,23 +204,14 @@ void RAS_ListRasterizer::IndexPrimitivesMulti(
 	// workaround: note how we do not use vertex arrays for making display
 	// lists, since glVertexAttribPointerARB doesn't seem to work correct
 	// in display lists on ATI? either a bug in the driver or in Blender ..
-	if (mUseVertexArrays && !localSlot) {
-		RAS_VAOpenGLRasterizer::IndexPrimitivesMulti(
-				vertexarrays, indexarrays,
-				mode, useObjectColor,
-				rgbacolor,slot
-		);
-	} else {
-		RAS_OpenGLRasterizer::IndexPrimitivesMulti(
-				vertexarrays, indexarrays,
-				mode, useObjectColor,
-				rgbacolor,slot
-		);
-	}
+	if (mUseVertexArrays && !localSlot)
+		RAS_VAOpenGLRasterizer::IndexPrimitivesMulti(ms);
+	else
+		RAS_OpenGLRasterizer::IndexPrimitivesMulti(ms);
 
-	if(!useObjectColor && slot) {
+	if(ms.m_bDisplayList) {
 		localSlot->EndList();
-		*slot = localSlot;
+		ms.m_DisplayList = localSlot;
 	}
 }
 
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
index b1b19144c12..96d6d2a995d 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
@@ -4,6 +4,7 @@
 #include "RAS_MaterialBucket.h"
 #include "RAS_VAOpenGLRasterizer.h"
 #include <vector>
+#include <map>
 
 class RAS_ListRasterizer;
 class RAS_ListSlot : public KX_ListSlot
@@ -34,14 +35,14 @@ enum RAS_ListSlotFlags	{
 	LIST_REGEN		=64
 };
 
-typedef std::map<const vecVertexArray, RAS_ListSlot*> RAS_Lists;
+typedef std::map<class RAS_MeshSlot*, RAS_ListSlot*> RAS_Lists;
 
 class RAS_ListRasterizer : public RAS_VAOpenGLRasterizer
 {
 	bool mUseVertexArrays;
 	RAS_Lists mLists;
 
-	RAS_ListSlot* FindOrAdd(const vecVertexArray& vertexarrays, KX_ListSlot** slot);
+	RAS_ListSlot* FindOrAdd(class RAS_MeshSlot& ms);
 	void ReleaseAlloc();
 
 public:
@@ -49,23 +50,8 @@ public:
 	RAS_ListRasterizer(RAS_ICanvas* canvas, bool useVertexArrays=false, bool lock=false);
 	virtual ~RAS_ListRasterizer();
 
-	virtual void IndexPrimitives(
-			const vecVertexArray& vertexarrays,
-			const vecIndexArrays & indexarrays,
-			DrawMode mode,
-			bool useObjectColor,
-			const MT_Vector4& rgbacolor,
-			class KX_ListSlot** slot
-	);
-
-	virtual void IndexPrimitivesMulti(
-			const vecVertexArray& vertexarrays,
-			const vecIndexArrays & indexarrays,
-			DrawMode mode,
-			bool useObjectColor,
-			const MT_Vector4& rgbacolor,
-			class KX_ListSlot** slot
-	);
+	virtual void	IndexPrimitives(class RAS_MeshSlot& ms);
+	virtual void	IndexPrimitivesMulti(class RAS_MeshSlot& ms);
 
 	virtual bool	Init();
 	virtual void	Exit();
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
index 1dcc6e70934..62ee2edb731 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
@@ -38,6 +38,9 @@
 #include "MT_CmMatrix4x4.h"
 #include "RAS_IRenderTools.h" // rendering text
 
+#include "GPU_draw.h"
+#include "GPU_material.h"
+
 /**
  *  32x32 bit masks for vinterlace stereo mode
  */
@@ -67,10 +70,12 @@ RAS_OpenGLRasterizer::RAS_OpenGLRasterizer(RAS_ICanvas* canvas)
 	m_motionblurvalue(-1.0),
 	m_texco_num(0),
 	m_attrib_num(0),
-	m_last_blendmode(0),
+	m_last_blendmode(GPU_BLEND_SOLID),
+	m_last_frontface(true),
 	m_materialCachingInfo(0)
 {
-	m_viewmatrix.Identity();
+	m_viewmatrix.setIdentity();
+	m_viewinvmatrix.setIdentity();
 	
 	for (int i = 0; i < 32; i++)
 	{
@@ -87,81 +92,9 @@ RAS_OpenGLRasterizer::~RAS_OpenGLRasterizer()
 {
 }
 
-
-
-static void Myinit_gl_stuff(void)	
-{
-	float mat_specular[] = { 0.5, 0.5, 0.5, 1.0 };
-	float mat_shininess[] = { 35.0 };
-/*  	float one= 1.0; */
-	int a, x, y;
-	GLubyte pat[32*32];
-	const GLubyte *patc= pat;
-		
-	glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, mat_specular);
-	glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, mat_specular);
-	glMaterialfv(GL_FRONT_AND_BACK, GL_SHININESS, mat_shininess);
-
-
-#if defined(__FreeBSD) || defined(__linux__)
-	glDisable(GL_DITHER);	/* op sgi/sun hardware && 12 bits */
-#endif
-	
-	/* no local viewer, looks ugly in ortho mode */
-	/* glLightModelfv(GL_LIGHT_MODEL_LOCAL_VIEWER, &one); */
-	
-	glDepthFunc(GL_LEQUAL);
-	/* scaling matrices */
-	glEnable(GL_NORMALIZE);
-
-	glShadeModel(GL_FLAT);
-
-	glDisable(GL_ALPHA_TEST);
-	glDisable(GL_BLEND);
-	glDisable(GL_DEPTH_TEST);
-	glDisable(GL_FOG);
-	glDisable(GL_LIGHTING);
-	glDisable(GL_LOGIC_OP);
-	glDisable(GL_STENCIL_TEST);
-	glDisable(GL_TEXTURE_1D);
-	glDisable(GL_TEXTURE_2D);
-
-	glEnableClientState(GL_VERTEX_ARRAY);
-	glEnableClientState(GL_NORMAL_ARRAY);
-
-	glPixelTransferi(GL_MAP_COLOR, GL_FALSE);
-	glPixelTransferi(GL_RED_SCALE, 1);
-	glPixelTransferi(GL_RED_BIAS, 0);
-	glPixelTransferi(GL_GREEN_SCALE, 1);
-	glPixelTransferi(GL_GREEN_BIAS, 0);
-	glPixelTransferi(GL_BLUE_SCALE, 1);
-	glPixelTransferi(GL_BLUE_BIAS, 0);
-	glPixelTransferi(GL_ALPHA_SCALE, 1);
-	glPixelTransferi(GL_ALPHA_BIAS, 0);
-
-	a = 0;
-	for(x=0; x<32; x++)
-	{
-		for(y=0; y<4; y++)
-		{
-			if( (x) & 1) pat[a++]= 0x88;
-			else pat[a++]= 0x22;
-		}
-	}
-	
-	glPolygonStipple(patc);
-	
-	glFrontFace(GL_CCW);
-	glCullFace(GL_BACK);
-	glEnable(GL_CULL_FACE);
-}
-
-
-
 bool RAS_OpenGLRasterizer::Init()
 {
-
-	Myinit_gl_stuff();
+	GPU_state_init();
 
 	m_redback = 0.4375;
 	m_greenback = 0.4375;
@@ -172,7 +105,8 @@ bool RAS_OpenGLRasterizer::Init()
 	m_ambg = 0.0f;
 	m_ambb = 0.0f;
 
-	SetBlendingMode(0);
+	SetBlendingMode(GPU_BLEND_SOLID);
+	SetFrontFace(true);
 
 	glClearColor(m_redback,m_greenback,m_blueback,m_alphaback);
 	glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
@@ -344,7 +278,8 @@ bool RAS_OpenGLRasterizer::BeginFrame(int drawingmode, double time)
 		glEnable (GL_CULL_FACE);
 	}
 
-	SetBlendingMode(0);
+	SetBlendingMode(GPU_BLEND_SOLID);
+	SetFrontFace(true);
 
 	glShadeModel(GL_SMOOTH);
 
@@ -359,28 +294,16 @@ void RAS_OpenGLRasterizer::SetDrawingMode(int drawingmode)
 {
 	m_drawingmode = drawingmode;
 
-	switch (m_drawingmode)
-	{
-	case KX_WIREFRAME:
-		{
-			glDisable (GL_CULL_FACE);
-			break;
-		}
-	default:
-		{
-		}
-	}
+	if(m_drawingmode == KX_WIREFRAME)
+		glDisable(GL_CULL_FACE);
 }
 
-
-
 int RAS_OpenGLRasterizer::GetDrawingMode()
 {
 	return m_drawingmode;
 }
 
 
-
 void RAS_OpenGLRasterizer::SetDepthMask(DepthMask depthmask)
 {
 	glDepthMask(depthmask == KX_DEPTHMASK_DISABLED ? GL_FALSE : GL_TRUE);
@@ -573,294 +496,84 @@ void RAS_OpenGLRasterizer::SwapBuffers()
 
 
 
-void RAS_OpenGLRasterizer::GetViewMatrix(MT_Matrix4x4 &mat) const
+const MT_Matrix4x4& RAS_OpenGLRasterizer::GetViewMatrix() const
 {
-	float viewmat[16];
-	glGetFloatv(GL_MODELVIEW_MATRIX, viewmat);
-	mat.setValue(viewmat);
+	return m_viewmatrix;
 }
 
-
-
-void RAS_OpenGLRasterizer::IndexPrimitives(const vecVertexArray & vertexarrays,
-									const vecIndexArrays & indexarrays,
-									DrawMode mode,
-									bool useObjectColor,
-									const MT_Vector4& rgbacolor,
-									class KX_ListSlot** slot
-									)
-{ 
-	const RAS_TexVert* vertexarray;
-	unsigned int numindices, vt;
-
-	for (vt=0;vt<vertexarrays.size();vt++)
-	{
-		vertexarray = &((*vertexarrays[vt]) [0]);
-		const KX_IndexArray & indexarray = (*indexarrays[vt]);
-		numindices = indexarray.size();
-		
-		if (!numindices)
-			break;
-		
-		int vindex=0;
-		switch (mode)
-		{
-		case KX_MODE_LINES:
-			{
-				glBegin(GL_LINES);
-				vindex=0;
-				for (unsigned int i=0;i<numindices;i+=2)
-				{
-					glVertex3fv(vertexarray[(indexarray[vindex++])].getLocalXYZ());
-					glVertex3fv(vertexarray[(indexarray[vindex++])].getLocalXYZ());
-				}
-				glEnd();
-			}
-			break;
-		case KX_MODE_QUADS:
-			{
-				glBegin(GL_QUADS);
-				vindex=0;
-				if (useObjectColor)
-				{
-					for (unsigned int i=0;i<numindices;i+=4)
-					{
-
-						glColor4d(rgbacolor[0], rgbacolor[1], rgbacolor[2], rgbacolor[3]);
-
-						glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-						glTexCoord2fv(vertexarray[(indexarray[vindex])].getUV1());
-						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-						vindex++;
-						
-						glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-						glTexCoord2fv(vertexarray[(indexarray[vindex])].getUV1());
-						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-						vindex++;
-						
-						glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-						glTexCoord2fv(vertexarray[(indexarray[vindex])].getUV1());
-						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-						vindex++;
-						
-						glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-						glTexCoord2fv(vertexarray[(indexarray[vindex])].getUV1());
-						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-						vindex++;
-					}
-				}
-				else
-				{
-					for (unsigned int i=0;i<numindices;i+=4)
-					{
-						// This looks curiously endian unsafe to me.
-						// However it depends on the way the colors are packed into 
-						// the m_rgba field of RAS_TexVert
-
-						glColor4ubv((const GLubyte *)(vertexarray[(indexarray[vindex])].getRGBA()));
-						glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-						glTexCoord2fv(vertexarray[(indexarray[vindex])].getUV1());
-						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-						vindex++;
-						
-						glColor4ubv((const GLubyte *)(vertexarray[(indexarray[vindex])].getRGBA()));
-						glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-						glTexCoord2fv(vertexarray[(indexarray[vindex])].getUV1());
-						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-						vindex++;
-						
-						glColor4ubv((const GLubyte *)(vertexarray[(indexarray[vindex])].getRGBA()));
-						glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-						glTexCoord2fv(vertexarray[(indexarray[vindex])].getUV1());
-						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-						vindex++;
-						
-						glColor4ubv((const GLubyte *)(vertexarray[(indexarray[vindex])].getRGBA()));
-						glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-						glTexCoord2fv(vertexarray[(indexarray[vindex])].getUV1());
-						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-						vindex++;
-					}
-				}
-				glEnd();	
-				break;
-			}
-		case KX_MODE_TRIANGLES:
-			{
-				glBegin(GL_TRIANGLES);
-				vindex=0;
-				if (useObjectColor)
-				{
-					for (unsigned int i=0;i<numindices;i+=3)
-					{
-
-						glColor4d(rgbacolor[0], rgbacolor[1], rgbacolor[2], rgbacolor[3]);
-
-						glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-						glTexCoord2fv(vertexarray[(indexarray[vindex])].getUV1());
-						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-						vindex++;
-						
-						glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-						glTexCoord2fv(vertexarray[(indexarray[vindex])].getUV1());
-						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-						vindex++;
-						
-						glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-						glTexCoord2fv(vertexarray[(indexarray[vindex])].getUV1());
-						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-						vindex++;
-					}
-				}
-				else 
-				{
-					for (unsigned int i=0;i<numindices;i+=3)
-					{
-
-						glColor4ubv((const GLubyte *)(vertexarray[(indexarray[vindex])].getRGBA()));
-						glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-						glTexCoord2fv(vertexarray[(indexarray[vindex])].getUV1());
-						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-						vindex++;
-						
-						glColor4ubv((const GLubyte *)(vertexarray[(indexarray[vindex])].getRGBA()));
-						glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-						glTexCoord2fv(vertexarray[(indexarray[vindex])].getUV1());
-						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-						vindex++;
-						
-						glColor4ubv((const GLubyte *)(vertexarray[(indexarray[vindex])].getRGBA()));
-						glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-						glTexCoord2fv(vertexarray[(indexarray[vindex])].getUV1());
-						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-						vindex++;
-					}
-				}
-				glEnd();	
-				break;
-			}
-		default:
-			{
-			}
-			
-		} // switch
-	} // for each vertexarray
-
+const MT_Matrix4x4& RAS_OpenGLRasterizer::GetViewInvMatrix() const
+{
+	return m_viewinvmatrix;
 }
 
-void RAS_OpenGLRasterizer::IndexPrimitives_3DText(const vecVertexArray & vertexarrays,
-									const vecIndexArrays & indexarrays,
-									DrawMode mode,
+void RAS_OpenGLRasterizer::IndexPrimitives_3DText(RAS_MeshSlot& ms,
 									class RAS_IPolyMaterial* polymat,
-									class RAS_IRenderTools* rendertools,
-									bool useObjectColor,
-									const MT_Vector4& rgbacolor
-									)
+									class RAS_IRenderTools* rendertools)
 { 
-	const RAS_TexVert* vertexarray;
-	unsigned int numindices, vt;
-	
-	if (useObjectColor)
-	{
+	bool obcolor = ms.m_bObjectColor;
+	MT_Vector4& rgba = ms.m_RGBAcolor;
+	RAS_MeshSlot::iterator it;
+
+	// handle object color
+	if (obcolor) {
 		glDisableClientState(GL_COLOR_ARRAY);
-		glColor4d(rgbacolor[0], rgbacolor[1], rgbacolor[2], rgbacolor[3]);
+		glColor4d(rgba[0], rgba[1], rgba[2], rgba[3]);
 	}
 	else
-	{
 		glEnableClientState(GL_COLOR_ARRAY);
+
+	for(ms.begin(it); !ms.end(it); ms.next(it)) {
+		RAS_TexVert *vertex;
+		size_t i, j, numvert;
+		
+		numvert = it.array->m_type;
+
+		if(it.array->m_type == RAS_DisplayArray::LINE) {
+			// line drawing, no text
+			glBegin(GL_LINES);
+
+			for(i=0; i<it.totindex; i+=2)
+			{
+				vertex = &it.vertex[it.index[i]];
+				glVertex3fv(vertex->getXYZ());
+
+				vertex = &it.vertex[it.index[i+1]];
+				glVertex3fv(vertex->getXYZ());
+			}
+
+			glEnd();
+		}
+		else {
+			// triangle and quad text drawing
+			for(i=0; i<it.totindex; i+=numvert)
+			{
+				float v[4][3];
+				int glattrib, unit;
+
+				for(j=0; j<numvert; j++) {
+					vertex = &it.vertex[it.index[i+j]];
+
+					v[j][0] = vertex->getXYZ()[0];
+					v[j][1] = vertex->getXYZ()[1];
+					v[j][2] = vertex->getXYZ()[2];
+				}
+
+				// find the right opengl attribute
+				glattrib = -1;
+				if(GLEW_ARB_vertex_program)
+					for(unit=0; unit<m_attrib_num; unit++)
+						if(m_attrib[unit] == RAS_TEXCO_UV1)
+							glattrib = unit;
+				
+				rendertools->RenderText(polymat->GetDrawingMode(), polymat,
+					v[0], v[1], v[2], (numvert == 4)? v[3]: NULL, glattrib);
+
+				ClearCachingInfo();
+			}
+		}
 	}
-	
-	for (vt=0;vt<vertexarrays.size();vt++)
-	{
-		vertexarray = &((*vertexarrays[vt]) [0]);
-		const KX_IndexArray & indexarray = (*indexarrays[vt]);
-		numindices = indexarray.size();
-		
-		if (!numindices)
-			break;
-		
-		int vindex=0;
-		switch (mode)
-		{
-		case KX_MODE_LINES:
-			{
-				glBegin(GL_LINES);
-				vindex=0;
-				for (unsigned int i=0;i<numindices;i+=2)
-				{
-					glVertex3fv(vertexarray[(indexarray[vindex++])].getLocalXYZ());
-					glVertex3fv(vertexarray[(indexarray[vindex++])].getLocalXYZ());
-				}
-				glEnd();
-			}
-			break;
-		case KX_MODE_QUADS:
-			{
-				vindex=0;
-				for (unsigned int i=0;i<numindices;i+=4)
-				{
-					float v1[3],v2[3],v3[3],v4[3];
-					
-					v1[0] = vertexarray[(indexarray[vindex])].getLocalXYZ()[0];
-					v1[1] = vertexarray[(indexarray[vindex])].getLocalXYZ()[1];
-					v1[2] = vertexarray[(indexarray[vindex])].getLocalXYZ()[2];
-					vindex++;
-					
-					v2[0] = vertexarray[(indexarray[vindex])].getLocalXYZ()[0];
-					v2[1] = vertexarray[(indexarray[vindex])].getLocalXYZ()[1];
-					v2[2] = vertexarray[(indexarray[vindex])].getLocalXYZ()[2];
-					vindex++;
-					
-					v3[0] = vertexarray[(indexarray[vindex])].getLocalXYZ()[0];
-					v3[1] = vertexarray[(indexarray[vindex])].getLocalXYZ()[1];
-					v3[2] = vertexarray[(indexarray[vindex])].getLocalXYZ()[2];
-					vindex++;
-					
-					v4[0] = vertexarray[(indexarray[vindex])].getLocalXYZ()[0];
-					v4[1] = vertexarray[(indexarray[vindex])].getLocalXYZ()[1];
-					v4[2] = vertexarray[(indexarray[vindex])].getLocalXYZ()[2];
-					
-					vindex++;
-					
-					rendertools->RenderText(polymat->GetDrawingMode(),polymat,v1,v2,v3,v4);
-					ClearCachingInfo();
-				}
-				break;
-			}
-		case KX_MODE_TRIANGLES:
-			{
-				glBegin(GL_TRIANGLES);
-				vindex=0;
-				for (unsigned int i=0;i<numindices;i+=3)
-				{
-					float v1[3],v2[3],v3[3];
-					
-					v1[0] = vertexarray[(indexarray[vindex])].getLocalXYZ()[0];
-					v1[1] = vertexarray[(indexarray[vindex])].getLocalXYZ()[1];
-					v1[2] = vertexarray[(indexarray[vindex])].getLocalXYZ()[2];
-					vindex++;
-					
-					v2[0] = vertexarray[(indexarray[vindex])].getLocalXYZ()[0];
-					v2[1] = vertexarray[(indexarray[vindex])].getLocalXYZ()[1];
-					v2[2] = vertexarray[(indexarray[vindex])].getLocalXYZ()[2];
-					vindex++;
-					
-					v3[0] = vertexarray[(indexarray[vindex])].getLocalXYZ()[0];
-					v3[1] = vertexarray[(indexarray[vindex])].getLocalXYZ()[1];
-					v3[2] = vertexarray[(indexarray[vindex])].getLocalXYZ()[2];
-					vindex++;
-					
-					rendertools->RenderText(polymat->GetDrawingMode(),polymat,v1,v2,v3,NULL);		
-					ClearCachingInfo();
-				}
-				glEnd();	
-				break;
-			}
-		default:
-			{
-			}
-		}	//switch
-	}	//for each vertexarray
+
+	glDisableClientState(GL_COLOR_ARRAY);
 }
 
 void RAS_OpenGLRasterizer::SetTexCoordNum(int num)
@@ -897,14 +610,14 @@ void RAS_OpenGLRasterizer::TexCoord(const RAS_TexVert &tv)
 
 	if(GLEW_ARB_multitexture) {
 		for(unit=0; unit<m_texco_num; unit++) {
-			if(tv.getFlag() & TV_2NDUV && (int)tv.getUnit() == unit) {
+			if(tv.getFlag() & RAS_TexVert::SECOND_UV && (int)tv.getUnit() == unit) {
 				glMultiTexCoord2fvARB(GL_TEXTURE0_ARB+unit, tv.getUV2());
 				continue;
 			}
 			switch(m_texco[unit]) {
 			case RAS_TEXCO_ORCO:
 			case RAS_TEXCO_GLOB:
-				glMultiTexCoord3fvARB(GL_TEXTURE0_ARB+unit, tv.getLocalXYZ());
+				glMultiTexCoord3fvARB(GL_TEXTURE0_ARB+unit, tv.getXYZ());
 				break;
 			case RAS_TEXCO_UV1:
 				glMultiTexCoord2fvARB(GL_TEXTURE0_ARB+unit, tv.getUV1());
@@ -929,7 +642,7 @@ void RAS_OpenGLRasterizer::TexCoord(const RAS_TexVert &tv)
 			switch(m_attrib[unit]) {
 			case RAS_TEXCO_ORCO:
 			case RAS_TEXCO_GLOB:
-				glVertexAttrib3fvARB(unit, tv.getLocalXYZ());
+				glVertexAttrib3fvARB(unit, tv.getXYZ());
 				break;
 			case RAS_TEXCO_UV1:
 				glVertexAttrib2fvARB(unit, tv.getUV1());
@@ -953,211 +666,80 @@ void RAS_OpenGLRasterizer::TexCoord(const RAS_TexVert &tv)
 	}
 
 }
-void RAS_OpenGLRasterizer::Tangent(	const RAS_TexVert& v1,
-									const RAS_TexVert& v2,
-									const RAS_TexVert& v3,
-									const MT_Vector3 &no)
+
+void RAS_OpenGLRasterizer::IndexPrimitives(RAS_MeshSlot& ms)
 {
-	// TODO: set for deformer... 
-	MT_Vector3 x1(v1.getLocalXYZ()), x2(v2.getLocalXYZ()), x3(v3.getLocalXYZ());
-	MT_Vector2 uv1(v1.getUV1()), uv2(v2.getUV1()), uv3(v3.getUV1());
-	MT_Vector3 dx1(x2 - x1), dx2(x3 - x1);
-	MT_Vector2 duv1(uv2 - uv1), duv2(uv3 - uv1);
-
-	MT_Scalar r = 1.0 / (duv1.x() * duv2.y() - duv2.x() * duv1.y());
-	duv1 *= r;
-	duv2 *= r;
-	MT_Vector3 sdir(duv2.y() * dx1 - duv1.y() * dx2);
-	MT_Vector3 tdir(duv1.x() * dx2 - duv2.x() * dx1);
-
-	// Gram-Schmidt orthogonalize
-	MT_Vector3 t(sdir - no.cross(no.cross(sdir)));
-	if (!MT_fuzzyZero(t)) t /= t.length();
-
-	float tangent[4];
-	t.getValue(tangent);
-	// Calculate handedness
-	tangent[3] = no.dot(sdir.cross(tdir)) < 0.0 ? -1.0 : 1.0;
+	IndexPrimitivesInternal(ms, false);
 }
 
+void RAS_OpenGLRasterizer::IndexPrimitivesMulti(RAS_MeshSlot& ms)
+{
+	IndexPrimitivesInternal(ms, true);
+}
 
-void RAS_OpenGLRasterizer::IndexPrimitivesMulti(
-		const vecVertexArray& vertexarrays,
-		const vecIndexArrays & indexarrays,
-		DrawMode mode,
-		bool useObjectColor,
-		const MT_Vector4& rgbacolor,
-		class KX_ListSlot** slot
-		)
+void RAS_OpenGLRasterizer::IndexPrimitivesInternal(RAS_MeshSlot& ms, bool multi)
 { 
+	bool obcolor = ms.m_bObjectColor;
+	bool wireframe = m_drawingmode <= KX_WIREFRAME;
+	MT_Vector4& rgba = ms.m_RGBAcolor;
+	RAS_MeshSlot::iterator it;
 
-	const RAS_TexVert* vertexarray;
-	unsigned int numindices,vt;
+	// iterate over display arrays, each containing an index + vertex array
+	for(ms.begin(it); !ms.end(it); ms.next(it)) {
+		RAS_TexVert *vertex;
+		size_t i, j, numvert;
+		
+		numvert = it.array->m_type;
 
-	for (vt=0;vt<vertexarrays.size();vt++)
-	{
-		vertexarray = &((*vertexarrays[vt]) [0]);
-		const KX_IndexArray & indexarray = (*indexarrays[vt]);
-		numindices = indexarray.size();
+		if(it.array->m_type == RAS_DisplayArray::LINE) {
+			// line drawing
+			glBegin(GL_LINES);
 
-		if (!numindices)
-			break;
-
-		int vindex=0;
-		switch (mode)
-		{
-		case KX_MODE_LINES:
+			for(i=0; i<it.totindex; i+=2)
 			{
-				glBegin(GL_LINES);
-				vindex=0;
-				for (unsigned int i=0;i<numindices;i+=2)
-				{
-					glVertex3fv(vertexarray[(indexarray[vindex++])].getLocalXYZ());
-					glVertex3fv(vertexarray[(indexarray[vindex++])].getLocalXYZ());
-				}
-				glEnd();
+				vertex = &it.vertex[it.index[i]];
+				glVertex3fv(vertex->getXYZ());
+
+				vertex = &it.vertex[it.index[i+1]];
+				glVertex3fv(vertex->getXYZ());
 			}
-			break;
-		case KX_MODE_QUADS:
-			{
-				glBegin(GL_QUADS);
-				vindex=0;
-				if (useObjectColor)
-				{
-					for (unsigned int i=0;i<numindices;i+=4)
-					{
 
-						glColor4d(rgbacolor[0], rgbacolor[1], rgbacolor[2], rgbacolor[3]);
-
-						//
-						glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-						TexCoord(vertexarray[(indexarray[vindex])]);
-						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-						vindex++;
-
-						//
-						glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-						TexCoord(vertexarray[(indexarray[vindex])]);
-						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-						vindex++;
-
-						//
-						glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-						TexCoord(vertexarray[(indexarray[vindex])]);
-						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-						vindex++;
-
-						//
-						glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-						TexCoord(vertexarray[(indexarray[vindex])]);
-						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-						vindex++;
-					}
-				}
-				else
-				{
-					for (unsigned int i=0;i<numindices;i+=4)
-					{
-						// This looks curiously endian unsafe to me.
-						// However it depends on the way the colors are packed into 
-						// the m_rgba field of RAS_TexVert
-				
-						//
-						glColor4ubv((const GLubyte *)(vertexarray[(indexarray[vindex])].getRGBA()));
-				
-						glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-						TexCoord(vertexarray[(indexarray[vindex])]);
-						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-						vindex++;
-					
-						//
-						glColor4ubv((const GLubyte *)(vertexarray[(indexarray[vindex])].getRGBA()));
-						glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-						TexCoord(vertexarray[(indexarray[vindex])]);
-						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-						vindex++;
-
-						//
-						glColor4ubv((const GLubyte *)(vertexarray[(indexarray[vindex])].getRGBA()));
-						glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-						TexCoord(vertexarray[(indexarray[vindex])]);
-						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-						vindex++;
-
-						//
-						glColor4ubv((const GLubyte *)(vertexarray[(indexarray[vindex])].getRGBA()));
-						glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-						TexCoord(vertexarray[(indexarray[vindex])]);
-						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-						vindex++;
-					}
-				}
-				glEnd();	
-				break;
-			}
-		case KX_MODE_TRIANGLES:
-			{
+			glEnd();
+		}
+		else {
+			// triangle and quad drawing
+			if(it.array->m_type == RAS_DisplayArray::TRIANGLE)
 				glBegin(GL_TRIANGLES);
-				vindex=0;
-				if (useObjectColor)
-				{
-					for (unsigned int i=0;i<numindices;i+=3)
-					{
+			else
+				glBegin(GL_QUADS);
 
-						glColor4d(rgbacolor[0], rgbacolor[1], rgbacolor[2], rgbacolor[3]);
-						//
-						glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-						TexCoord(vertexarray[(indexarray[vindex])]);
-						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-						vindex++;
-
-						//
-						glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-						TexCoord(vertexarray[(indexarray[vindex])]);
-						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-						vindex++;
-
-						//
-						glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-						TexCoord(vertexarray[(indexarray[vindex])]);
-						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-						vindex++;
-					}
-				}
-				else 
-				{
-					for (unsigned int i=0;i<numindices;i+=3)
-					{
-						//
-						glColor4ubv((const GLubyte *)(vertexarray[(indexarray[vindex])].getRGBA()));
-						glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-						TexCoord(vertexarray[(indexarray[vindex])]);
-						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-						vindex++;
-				
-						//
-						glColor4ubv((const GLubyte *)(vertexarray[(indexarray[vindex])].getRGBA()));
-						glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-						TexCoord(vertexarray[(indexarray[vindex])]);
-						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-						vindex++;
-
-						//
-						glColor4ubv((const GLubyte *)(vertexarray[(indexarray[vindex])].getRGBA()));
-						glNormal3fv(vertexarray[(indexarray[vindex])].getNormal());
-						TexCoord(vertexarray[(indexarray[vindex])]);
-						glVertex3fv(vertexarray[(indexarray[vindex])].getLocalXYZ());
-						vindex++;
-					}
-				}
-				glEnd();	
-				break;
-			}
-		default:
+			for(i=0; i<it.totindex; i+=numvert)
 			{
+				if(obcolor)
+					glColor4d(rgba[0], rgba[1], rgba[2], rgba[3]);
+
+				for(j=0; j<numvert; j++) {
+					vertex = &it.vertex[it.index[i+j]];
+
+					if(!wireframe) {
+						if(!obcolor)
+							glColor4ubv((const GLubyte *)(vertex->getRGBA()));
+
+						glNormal3fv(vertex->getNormal());
+
+						if(multi)
+							TexCoord(*vertex);
+						else
+							glTexCoord2fv(vertex->getUV1());
+					}
+
+					glVertex3fv(vertex->getXYZ());
+				}
 			}
-		} // switch
-	} // for each vertexarray
+
+			glEnd();
+		}
+	}
 }
 
 void RAS_OpenGLRasterizer::SetProjectionMatrix(MT_CmMatrix4x4 &mat)
@@ -1232,7 +814,7 @@ MT_Matrix4x4 RAS_OpenGLRasterizer::GetFrustumMatrix(
 void RAS_OpenGLRasterizer::SetViewMatrix(const MT_Matrix4x4 &mat, const MT_Vector3& campos,
 		const MT_Point3 &, const MT_Quaternion &camOrientQuat)
 {
-	MT_Matrix4x4 viewMat = mat;
+	m_viewmatrix = mat;
 
 	// correction for stereo
 	if(m_stereomode != RAS_STEREO_NOSTEREO)
@@ -1259,7 +841,7 @@ void RAS_OpenGLRasterizer::SetViewMatrix(const MT_Matrix4x4 &mat, const MT_Vecto
 				MT_Transform transform;
 				transform.setIdentity();
 				transform.translate(-(eyeline * m_eyeseparation / 2.0));
-				viewMat *= transform;
+				m_viewmatrix *= transform;
 				}
 				break;
 			case RAS_STEREO_RIGHTEYE:
@@ -1268,20 +850,21 @@ void RAS_OpenGLRasterizer::SetViewMatrix(const MT_Matrix4x4 &mat, const MT_Vecto
 				MT_Transform transform;
 				transform.setIdentity();
 				transform.translate(eyeline * m_eyeseparation / 2.0);
-				viewMat *= transform;
+				m_viewmatrix *= transform;
 				}
 				break;
 		}
 	}
 
-	// convert row major matrix 'viewMat' to column major for OpenGL
-	MT_Scalar cammat[16];
-	viewMat.getValue(cammat);
-	MT_CmMatrix4x4 viewCmmat = cammat;
+	m_viewinvmatrix = m_viewmatrix;
+	m_viewinvmatrix.invert();
+
+	// note: getValue gives back column major as needed by OpenGL
+	MT_Scalar glviewmat[16];
+	m_viewmatrix.getValue(glviewmat);
 
 	glMatrixMode(GL_MODELVIEW);
-	m_viewmatrix = viewCmmat;
-	glLoadMatrixd(&m_viewmatrix(0,0));
+	glLoadMatrixd(glviewmat);
 	m_campos = campos;
 }
 
@@ -1292,20 +875,6 @@ const MT_Point3& RAS_OpenGLRasterizer::GetCameraPosition()
 }
 
 
-
-void RAS_OpenGLRasterizer::LoadViewMatrix()
-{
-	glLoadMatrixd(&m_viewmatrix(0,0));
-}
-
-
-
-void RAS_OpenGLRasterizer::EnableTextures(bool enable)
-{
-}
-
-
-
 void RAS_OpenGLRasterizer::SetCullFace(bool enable)
 {
 	if (enable)
@@ -1388,23 +957,23 @@ void RAS_OpenGLRasterizer::SetBlendingMode(int blendmode)
 	if(blendmode == m_last_blendmode)
 		return;
 
-	if(blendmode == 0) {
+	if(blendmode == GPU_BLEND_SOLID) {
 		glDisable(GL_BLEND);
 		glDisable(GL_ALPHA_TEST);
 		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 	}
-	else if(blendmode == 1) {
+	else if(blendmode == GPU_BLEND_ADD) {
 		glBlendFunc(GL_ONE, GL_ONE);
 		glEnable(GL_BLEND);
 		glDisable(GL_ALPHA_TEST);
 	}
-	else if(blendmode == 2) {
+	else if(blendmode == GPU_BLEND_ALPHA) {
 		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 		glEnable(GL_BLEND);
 		glEnable(GL_ALPHA_TEST);
 		glAlphaFunc(GL_GREATER, 0.0f);
 	}
-	else if(blendmode == 4) {
+	else if(blendmode == GPU_BLEND_CLIP) {
 		glDisable(GL_BLEND); 
 		glEnable(GL_ALPHA_TEST);
 		glAlphaFunc(GL_GREATER, 0.5f);
@@ -1413,3 +982,16 @@ void RAS_OpenGLRasterizer::SetBlendingMode(int blendmode)
 	m_last_blendmode = blendmode;
 }
 
+void RAS_OpenGLRasterizer::SetFrontFace(bool ccw)
+{
+	if(m_last_frontface == ccw)
+		return;
+
+	if(ccw)
+		glFrontFace(GL_CCW);
+	else
+		glFrontFace(GL_CW);
+	
+	m_last_frontface = ccw;
+}
+
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
index 02056cce446..368bd4312ac 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
@@ -41,7 +41,7 @@ using namespace std;
 #include "RAS_MaterialBucket.h"
 #include "RAS_ICanvas.h"
 
-#define RAS_MAX_TEXCO	3	// match in BL_Material
+#define RAS_MAX_TEXCO	8	// match in BL_Material
 #define RAS_MAX_ATTRIB	16	// match in BL_BlenderShader
 
 struct	OglDebugLine
@@ -77,7 +77,8 @@ class RAS_OpenGLRasterizer : public RAS_IRasterizer
 	float			m_ambb;
 
 	double			m_time;
-	MT_CmMatrix4x4	m_viewmatrix;
+	MT_Matrix4x4	m_viewmatrix;
+	MT_Matrix4x4	m_viewinvmatrix;
 	MT_Point3		m_campos;
 
 	StereoMode		m_stereomode;
@@ -100,6 +101,7 @@ protected:
 	int				m_texco_num;
 	int				m_attrib_num;
 	int				m_last_blendmode;
+	bool			m_last_frontface;
 
 	/** Stores the caching information for the last material activated. */
 	RAS_IPolyMaterial::TCachingInfo m_materialCachingInfo;
@@ -144,33 +146,15 @@ public:
 	virtual float	GetFocalLength();
 
 	virtual void	SwapBuffers();
-	virtual void	IndexPrimitives(
-						const vecVertexArray& vertexarrays,
-						const vecIndexArrays & indexarrays,
-						DrawMode mode,
-						bool useObjectColor,
-						const MT_Vector4& rgbacolor,
-						class KX_ListSlot** slot
-					);
 
+	virtual void	IndexPrimitives(class RAS_MeshSlot& ms);
+	virtual void	IndexPrimitivesMulti(class RAS_MeshSlot& ms);
 	virtual void	IndexPrimitives_3DText(
-						const vecVertexArray& vertexarrays,
-						const vecIndexArrays & indexarrays,
-						DrawMode mode,
+						class RAS_MeshSlot& ms,
 						class RAS_IPolyMaterial* polymat,
-						class RAS_IRenderTools* rendertools,
-						bool useObjectColor,
-						const MT_Vector4& rgbacolor
-					);
-
-	virtual void IndexPrimitivesMulti( 
-						const vecVertexArray& vertexarrays,
-						const vecIndexArrays & indexarrays,
-						DrawMode mode,
-						bool useObjectColor,
-						const MT_Vector4& rgbacolor,
-						class KX_ListSlot** slot);
+						class RAS_IRenderTools* rendertools);
 
+	void			IndexPrimitivesInternal(RAS_MeshSlot& ms, bool multi);
 
 	virtual void	SetProjectionMatrix(MT_CmMatrix4x4 & mat);
 	virtual void	SetProjectionMatrix(const MT_Matrix4x4 & mat);
@@ -182,7 +166,6 @@ public:
 					);
 
 	virtual const	MT_Point3& GetCameraPosition();
-	virtual void	LoadViewMatrix();
 	
 	virtual void	SetFog(
 						float start,
@@ -214,7 +197,6 @@ public:
 	virtual void	SetDrawingMode(int drawingmode);
 	virtual int		GetDrawingMode();
 
-	virtual void	EnableTextures(bool enable);
 	virtual void	SetCullFace(bool enable);
 	virtual void	SetLines(bool enable);
 
@@ -270,13 +252,10 @@ public:
 	virtual void SetTexCoord(TexCoGen coords, int unit);
 	virtual void SetAttrib(TexCoGen coords, int unit);
 
-	void			TexCoord(const RAS_TexVert &tv);
-	virtual void	GetViewMatrix(MT_Matrix4x4 &mat) const;
+	void TexCoord(const RAS_TexVert &tv);
 
-	void	Tangent(const RAS_TexVert& v1,
-					const RAS_TexVert& v2,
-					const RAS_TexVert& v3,
-					const MT_Vector3 &no);
+	const MT_Matrix4x4&	GetViewMatrix() const;
+	const MT_Matrix4x4&	GetViewInvMatrix() const;
 	
 	virtual void	EnableMotionBlur(float motionblurvalue);
 	virtual void	DisableMotionBlur();
@@ -293,6 +272,7 @@ public:
 	};
 
 	virtual void	SetBlendingMode(int blendmode);
+	virtual void	SetFrontFace(bool ccw);
 };
 
 #endif //__RAS_OPENGLRASTERIZER
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
index c78a97ad7be..2cb3b52adfb 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
@@ -33,6 +33,7 @@
 #include <stdlib.h>
 
 #include "GL/glew.h"
+#include "GPU_extensions.h"
 
 #include "STR_String.h"
 #include "RAS_TexVert.h"
@@ -77,16 +78,16 @@ void RAS_VAOpenGLRasterizer::SetDrawingMode(int drawingmode)
 	{
 		case KX_BOUNDINGBOX:
 		case KX_WIREFRAME:
-			glDisableClientState(GL_COLOR_ARRAY);
-			glDisable(GL_CULL_FACE);
+			//glDisableClientState(GL_COLOR_ARRAY);
+			//glDisable(GL_CULL_FACE);
 			break;
 		case KX_SOLID:
-			glDisableClientState(GL_COLOR_ARRAY);
+			//glDisableClientState(GL_COLOR_ARRAY);
 			break;
 		case KX_TEXTURED:
 		case KX_SHADED:
 		case KX_SHADOW:
-			glEnableClientState(GL_COLOR_ARRAY);
+			//glEnableClientState(GL_COLOR_ARRAY);
 		default:
 			break;
 	}
@@ -98,141 +99,121 @@ void RAS_VAOpenGLRasterizer::Exit()
 	glEnableClientState(GL_NORMAL_ARRAY);
 	glDisableClientState(GL_TEXTURE_COORD_ARRAY);
 	glDisableClientState(GL_COLOR_ARRAY);
-	EnableTextures(false);
 
 	RAS_OpenGLRasterizer::Exit();
 }
 
-void RAS_VAOpenGLRasterizer::IndexPrimitives( const vecVertexArray& vertexarrays,
-							const vecIndexArrays & indexarrays,
-							DrawMode mode,
-							bool useObjectColor,
-							const MT_Vector4& rgbacolor,
-							class KX_ListSlot** slot)
+void RAS_VAOpenGLRasterizer::IndexPrimitives(RAS_MeshSlot& ms)
 {
-	static const GLsizei vtxstride = sizeof(RAS_TexVert);
+	static const GLsizei stride = sizeof(RAS_TexVert);
+	bool wireframe = m_drawingmode <= KX_WIREFRAME;
+	RAS_MeshSlot::iterator it;
 	GLenum drawmode;
-	if(mode == KX_MODE_TRIANGLES)
-		drawmode = GL_TRIANGLES;
-	else if(mode == KX_MODE_QUADS)
-		drawmode = GL_QUADS;
-	else
-		drawmode = GL_LINES;
 
-	const RAS_TexVert* vertexarray;
-	unsigned int numindices, vt;
-
-	if (drawmode != GL_LINES)
-	{
-		if (useObjectColor)
-		{
-			glDisableClientState(GL_COLOR_ARRAY);
-			glColor4d(rgbacolor[0], rgbacolor[1], rgbacolor[2], rgbacolor[3]);
-		} else
-		{
-			glColor4d(0,0,0,1.0);
-			glEnableClientState(GL_COLOR_ARRAY);
-		}
-	}
-	else
-	{
-		glColor3d(0,0,0);
-	}
-
-	EnableTextures(false);
-	glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+	if(!wireframe)
+		glEnableClientState(GL_TEXTURE_COORD_ARRAY);
 
 	// use glDrawElements to draw each vertexarray
-	for (vt=0;vt<vertexarrays.size();vt++)
-	{
-		vertexarray = &((*vertexarrays[vt]) [0]);
-		const KX_IndexArray & indexarray = (*indexarrays[vt]);
-		numindices = indexarray.size();
-
-		if (!numindices)
+	for(ms.begin(it); !ms.end(it); ms.next(it)) {
+		if(it.totindex == 0)
 			continue;
-		
-		glVertexPointer(3,GL_FLOAT,vtxstride,vertexarray->getLocalXYZ());
-		glNormalPointer(GL_FLOAT,vtxstride,vertexarray->getNormal());
-		glTexCoordPointer(2,GL_FLOAT,vtxstride,vertexarray->getUV1());
-		if(glIsEnabled(GL_COLOR_ARRAY))
-			glColorPointer(4,GL_UNSIGNED_BYTE,vtxstride,vertexarray->getRGBA());
 
-		//if(m_Lock)
-		//	local->Begin(vertexarrays[vt]->size());
+		// drawing mode
+		if(it.array->m_type == RAS_DisplayArray::TRIANGLE)
+			drawmode = GL_TRIANGLES;
+		else if(it.array->m_type == RAS_DisplayArray::QUAD)
+			drawmode = GL_QUADS;
+		else
+			drawmode = GL_LINES;
 
-		// here the actual drawing takes places
-		glDrawElements(drawmode,numindices,GL_UNSIGNED_SHORT,&(indexarray[0]));
+		// colors
+		if (drawmode != GL_LINES && !wireframe) {
+			if (ms.m_bObjectColor) {
+				const MT_Vector4& rgba = ms.m_RGBAcolor;
 
-		//if(m_Lock)
-		//	local->End();
-	}
-
-	glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-}
-
-void RAS_VAOpenGLRasterizer::IndexPrimitivesMulti( const vecVertexArray& vertexarrays,
-							const vecIndexArrays & indexarrays,
-							DrawMode mode,
-							bool useObjectColor,
-							const MT_Vector4& rgbacolor,
-							class KX_ListSlot** slot)
-{
-	static const GLsizei vtxstride = sizeof(RAS_TexVert);
-
-	GLenum drawmode;
-	if(mode == KX_MODE_TRIANGLES)
-		drawmode = GL_TRIANGLES;
-	else if(mode == KX_MODE_QUADS)
-		drawmode = GL_QUADS;
-	else
-		drawmode = GL_LINES;
-
-	const RAS_TexVert* vertexarray;
-	unsigned int numindices, vt;
-
-	if (drawmode != GL_LINES)
-	{
-		if (useObjectColor)
-		{
-			glDisableClientState(GL_COLOR_ARRAY);
-			glColor4d(rgbacolor[0], rgbacolor[1], rgbacolor[2], rgbacolor[3]);
+				glDisableClientState(GL_COLOR_ARRAY);
+				glColor4d(rgba[0], rgba[1], rgba[2], rgba[3]);
+			}
+			else {
+				glColor4f(0.0f, 0.0f, 0.0f, 1.0f);
+				glEnableClientState(GL_COLOR_ARRAY);
+			}
 		}
 		else
-		{
-			glColor4d(0,0,0,1.0);
-			glEnableClientState(GL_COLOR_ARRAY);
+			glColor4f(0.0f, 0.0f, 0.0f, 1.0f);
+
+		glVertexPointer(3, GL_FLOAT, stride, it.vertex->getXYZ());
+		glNormalPointer(GL_FLOAT, stride, it.vertex->getNormal());
+		if(!wireframe) {
+			glTexCoordPointer(2, GL_FLOAT, stride, it.vertex->getUV1());
+			if(glIsEnabled(GL_COLOR_ARRAY))
+				glColorPointer(4, GL_UNSIGNED_BYTE, stride, it.vertex->getRGBA());
 		}
-	}
-	else
-	{
-		glColor3d(0,0,0);
-	}
-
-	// use glDrawElements to draw each vertexarray
-	for (vt=0;vt<vertexarrays.size();vt++)
-	{
-		vertexarray = &((*vertexarrays[vt]) [0]);
-		const KX_IndexArray & indexarray = (*indexarrays[vt]);
-		numindices = indexarray.size();
-
-		if (!numindices)
-			continue;
-
-		glVertexPointer(3,GL_FLOAT,vtxstride,vertexarray->getLocalXYZ());
-		glNormalPointer(GL_FLOAT,vtxstride,vertexarray->getNormal());
-		TexCoordPtr(vertexarray);
-		if(glIsEnabled(GL_COLOR_ARRAY))
-			glColorPointer(4,GL_UNSIGNED_BYTE,vtxstride,vertexarray->getRGBA());
-
-		//if(m_Lock)
-		//	local->Begin(vertexarrays[vt]->size());
 
 		// here the actual drawing takes places
-		glDrawElements(drawmode,numindices,GL_UNSIGNED_SHORT,&(indexarray[0]));
-		
-		//if(m_Lock)
-		//	local->End();
+		glDrawElements(drawmode, it.totindex, GL_UNSIGNED_SHORT, it.index);
+	}
+
+	if(!wireframe) {
+		glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+		glDisableClientState(GL_COLOR_ARRAY);
+	}
+}
+
+void RAS_VAOpenGLRasterizer::IndexPrimitivesMulti(RAS_MeshSlot& ms)
+{
+	static const GLsizei stride = sizeof(RAS_TexVert);
+	bool wireframe = m_drawingmode <= KX_WIREFRAME;
+	RAS_MeshSlot::iterator it;
+	GLenum drawmode;
+
+	if(!wireframe)
+		EnableTextures(true);
+
+	// use glDrawElements to draw each vertexarray
+	for(ms.begin(it); !ms.end(it); ms.next(it)) {
+		if(it.totindex == 0)
+			continue;
+
+		// drawing mode
+		if(it.array->m_type == RAS_DisplayArray::TRIANGLE)
+			drawmode = GL_TRIANGLES;
+		else if(it.array->m_type == RAS_DisplayArray::QUAD)
+			drawmode = GL_QUADS;
+		else
+			drawmode = GL_LINES;
+
+		// colors
+		if (drawmode != GL_LINES && !wireframe) {
+			if (ms.m_bObjectColor) {
+				const MT_Vector4& rgba = ms.m_RGBAcolor;
+
+				glDisableClientState(GL_COLOR_ARRAY);
+				glColor4d(rgba[0], rgba[1], rgba[2], rgba[3]);
+			}
+			else {
+				glColor4f(0.0f, 0.0f, 0.0f, 1.0f);
+				glEnableClientState(GL_COLOR_ARRAY);
+			}
+		}
+		else
+			glColor4f(0.0f, 0.0f, 0.0f, 1.0f);
+
+		glVertexPointer(3, GL_FLOAT, stride, it.vertex->getXYZ());
+		glNormalPointer(GL_FLOAT, stride, it.vertex->getNormal());
+		if(!wireframe) {
+			TexCoordPtr(it.vertex);
+			if(glIsEnabled(GL_COLOR_ARRAY))
+				glColorPointer(4, GL_UNSIGNED_BYTE, stride, it.vertex->getRGBA());
+		}
+
+		// here the actual drawing takes places
+		glDrawElements(drawmode, it.totindex, GL_UNSIGNED_SHORT, it.index);
+	}
+
+	if(!wireframe) {
+		glDisableClientState(GL_COLOR_ARRAY);
+		EnableTextures(false);
 	}
 }
 
@@ -248,7 +229,7 @@ void RAS_VAOpenGLRasterizer::TexCoordPtr(const RAS_TexVert *tv)
 		for(unit=0; unit<m_texco_num; unit++)
 		{
 			glClientActiveTextureARB(GL_TEXTURE0_ARB+unit);
-			if(tv->getFlag() & TV_2NDUV && (int)tv->getUnit() == unit) {
+			if(tv->getFlag() & RAS_TexVert::SECOND_UV && (int)tv->getUnit() == unit) {
 				glEnableClientState(GL_TEXTURE_COORD_ARRAY);
 				glTexCoordPointer(2, GL_FLOAT, sizeof(RAS_TexVert), tv->getUV2());
 				continue;
@@ -257,7 +238,7 @@ void RAS_VAOpenGLRasterizer::TexCoordPtr(const RAS_TexVert *tv)
 			{
 			case RAS_TEXCO_ORCO:
 			case RAS_TEXCO_GLOB:
-				glTexCoordPointer(3, GL_FLOAT, sizeof(RAS_TexVert),tv->getLocalXYZ());
+				glTexCoordPointer(3, GL_FLOAT, sizeof(RAS_TexVert),tv->getXYZ());
 				break;
 			case RAS_TEXCO_UV1:
 				glTexCoordPointer(2, GL_FLOAT, sizeof(RAS_TexVert),tv->getUV1());
@@ -284,7 +265,7 @@ void RAS_VAOpenGLRasterizer::TexCoordPtr(const RAS_TexVert *tv)
 			switch(m_attrib[unit]) {
 			case RAS_TEXCO_ORCO:
 			case RAS_TEXCO_GLOB:
-				glVertexAttribPointerARB(unit, 3, GL_FLOAT, GL_FALSE, sizeof(RAS_TexVert), tv->getLocalXYZ());
+				glVertexAttribPointerARB(unit, 3, GL_FLOAT, GL_FALSE, sizeof(RAS_TexVert), tv->getXYZ());
 				break;
 			case RAS_TEXCO_UV1:
 				glVertexAttribPointerARB(unit, 2, GL_FLOAT, GL_FALSE, sizeof(RAS_TexVert), tv->getUV1());
@@ -313,11 +294,6 @@ void RAS_VAOpenGLRasterizer::EnableTextures(bool enable)
 	TexCoGen *texco, *attrib;
 	int unit, texco_num, attrib_num;
 
-	/* disable previously enabled texture coordinates and attributes. ideally
-	 * this shouldn't be necessary .. */
-	if(enable)
-		EnableTextures(false);
-
 	/* we cache last texcoords and attribs to ensure we disable the ones that
 	 * were actually last set */
 	if(enable) {
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
index e4cc4ace0e8..766bbfbed0e 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
@@ -50,22 +50,10 @@ public:
 
 	virtual void	SetDrawingMode(int drawingmode);
 
-	virtual void	IndexPrimitives( const vecVertexArray& vertexarrays,
-		const vecIndexArrays & indexarrays,
-		DrawMode mode,
-		bool useObjectColor,
-		const MT_Vector4& rgbacolor,
-		class KX_ListSlot** slot);
-
-	virtual void IndexPrimitivesMulti( 
-		const vecVertexArray& vertexarrays,
-		const vecIndexArrays & indexarrays,
-		DrawMode mode,
-		bool useObjectColor,
-		const MT_Vector4& rgbacolor,
-		class KX_ListSlot** slot);
-
+	virtual void	IndexPrimitives(class RAS_MeshSlot& ms);
+	virtual void	IndexPrimitivesMulti(class RAS_MeshSlot& ms);
 
+private:
 	virtual void	EnableTextures(bool enable);
 	//virtual bool	QueryArrays(){return true;}
 	//virtual bool	QueryLists(){return m_Lock;}
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
index 0cf9c326370..8d46528f7f0 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
@@ -1,12 +1,9 @@
 #!/usr/bin/python
 Import ('env')
 
-if env['WITH_BF_GLEXT'] == 1:
-        env['CPPFLAGS'].append('-DWITH_GLEXT')
-
 sources = env.Glob('*.cpp')
 
 incs = '. #source/kernel/gen_system #intern/string #intern/moto/include #source/gameengine/Rasterizer #source/gameengine/BlenderRoutines '
-incs += ' #extern/glew/include ' + env['BF_OPENGL_INC']
+incs += ' #source/blender/gpu #extern/glew/include ' + env['BF_OPENGL_INC']
 
 env.BlenderLib ( 'bf_oglrasterizer', Split(sources), Split(incs), [], libtype=['game','player'], priority=[40, 120] )
diff --git a/source/gameengine/Rasterizer/RAS_Polygon.cpp b/source/gameengine/Rasterizer/RAS_Polygon.cpp
index b74cb9cfcac..50331d7a664 100644
--- a/source/gameengine/Rasterizer/RAS_Polygon.cpp
+++ b/source/gameengine/Rasterizer/RAS_Polygon.cpp
@@ -26,99 +26,82 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #ifdef WIN32
-
 #pragma warning (disable:4786)
 #endif
 
 #include "RAS_Polygon.h"
 
-RAS_Polygon::RAS_Polygon(RAS_MaterialBucket* bucket,
-				bool visible,
-				int numverts,
-				int vtxarrayindex) 
-		:m_bucket(bucket),
-		m_vertexindexbase(numverts),
-		m_numverts(numverts),
-		m_edgecode(65535)
+RAS_Polygon::RAS_Polygon(RAS_MaterialBucket* bucket, RAS_DisplayArray *darray, int numvert)
 {
-	m_vertexindexbase.m_vtxarray = vtxarrayindex ;//m_bucket->FindVertexArray(numverts);
-	m_polyFlags.Visible = visible;
+	m_bucket = bucket;
+	m_darray = darray;
+	m_offset[0]= m_offset[1]= m_offset[2]= m_offset[3]= 0;
+	m_numvert = numvert;
+
+	m_edgecode = 255;
+	m_polyflags = 0;
 }
 
-
-
 int RAS_Polygon::VertexCount()
 {
-	return m_numverts;
+	return m_numvert;
 }
 
-
-
-void RAS_Polygon::SetVertex(int i,
-						unsigned int vertexindex ) //const MT_Point3& xyz,const MT_Point2& uv,const unsigned int rgbacolor,const MT_Vector3& normal)
+void RAS_Polygon::SetVertexOffset(int i, unsigned short offset)
 {
-	m_vertexindexbase.SetIndex(i,vertexindex); //m_bucket->FindOrAddVertex(m_vertexindexbase.m_vtxarray,
-	//xyz,uv,rgbacolor,normal));
+	m_offset[i] = offset;
 }
 
-
-
-const KX_VertexIndex& RAS_Polygon::GetIndexBase()
+RAS_TexVert *RAS_Polygon::GetVertex(int i)
 {
-	return m_vertexindexbase;
+	return &m_darray->m_vertex[m_offset[i]];
 }
 
-
-
-void RAS_Polygon::SetVisibleWireframeEdges(int edgecode)
+int RAS_Polygon::GetVertexOffset(int i)
 {
-	m_edgecode = edgecode;
+	return m_offset[i];
 }
 
-
-
-// each bit is for a visible edge, starting with bit 1 for the first edge, bit 2 for second etc.
 int RAS_Polygon::GetEdgeCode()
 {
 	return m_edgecode;
 }
 
+void RAS_Polygon::SetEdgeCode(int edgecode)
+{
+	m_edgecode = edgecode;
+}
 
 	
 bool RAS_Polygon::IsVisible()
 {
-	return m_polyFlags.Visible;
+	return (m_polyflags & VISIBLE) != 0;
 }
 
-
+void RAS_Polygon::SetVisible(bool visible)
+{
+	if(visible) m_polyflags |= VISIBLE;
+	else m_polyflags &= ~VISIBLE;
+}
 
 bool RAS_Polygon::IsCollider()
 {
-	return m_polyFlags.Collider;
+	return (m_polyflags & COLLIDER) != 0;
 }
 
-
-
-void RAS_Polygon::SetCollider(bool col)
+void RAS_Polygon::SetCollider(bool visible)
 {
-	m_polyFlags.Collider = col;
+	if(visible) m_polyflags |= COLLIDER;
+	else m_polyflags &= ~COLLIDER;
 }
 
-
-
-KX_VertexIndex& RAS_Polygon::GetVertexIndexBase()
-{
-	return m_vertexindexbase;
-}
-
-
-
-RAS_MaterialBucket*	RAS_Polygon::GetMaterial()
+RAS_MaterialBucket* RAS_Polygon::GetMaterial()
 {
 	return m_bucket;
 }
+
+RAS_DisplayArray* RAS_Polygon::GetDisplayArray()
+{
+	return m_darray;
+}
diff --git a/source/gameengine/Rasterizer/RAS_Polygon.h b/source/gameengine/Rasterizer/RAS_Polygon.h
index 7ce7926a816..18526ba45f7 100644
--- a/source/gameengine/Rasterizer/RAS_Polygon.h
+++ b/source/gameengine/Rasterizer/RAS_Polygon.h
@@ -35,55 +35,47 @@
 #include <vector>
 using namespace std;
 
-
-//
-// Bitfield that stores the flags for each CValue derived class
-//
-struct PolygonFlags {
-	PolygonFlags() :
-		Visible(true),
-		Collider(true)
-	{
-	}
-	unsigned char Visible : 1;
-	unsigned char Collider : 1;
-	//int Visible : 1;
-	//int Collider : 1;
-};
+/* polygon flags */
 
 class RAS_Polygon
 {
+	/* location */
 	RAS_MaterialBucket*			m_bucket;
-	KX_VertexIndex				m_vertexindexbase;
-	int							m_numverts;
-	int							m_edgecode;
-	PolygonFlags				m_polyFlags;
-	
+	RAS_DisplayArray*			m_darray;
+	unsigned short				m_offset[4];
+	unsigned short				m_numvert;
+
+	/* flags */
+	unsigned char				m_edgecode;
+	unsigned char				m_polyflags;
 
 public:
-	RAS_Polygon(RAS_MaterialBucket* bucket,
-				bool visible,
-				int numverts,
-				int vtxarrayindex) ;
+	enum {
+		VISIBLE = 1,
+		COLLIDER = 2
+	};
+
+	RAS_Polygon(RAS_MaterialBucket* bucket, RAS_DisplayArray* darray, int numvert);
 	virtual ~RAS_Polygon() {};
 	
-//	RAS_TexVert* GetVertex(int index);
 	int					VertexCount();
-	void				SetVertex(int i, unsigned int vertexindex); //const MT_Point3& xyz,const MT_Point2& uv,const unsigned int rgbacolor,const MT_Vector3& normal)
-	
-	const KX_VertexIndex& GetIndexBase();
+	RAS_TexVert*		GetVertex(int i);
 
-	void				SetVisibleWireframeEdges(int edgecode);
+	void				SetVertexOffset(int i, unsigned short offset);
+	int					GetVertexOffset(int i);
+	
 	// each bit is for a visible edge, starting with bit 1 for the first edge, bit 2 for second etc.
 	int					GetEdgeCode();
+	void				SetEdgeCode(int edgecode);
 	
 	bool				IsVisible();
+	void				SetVisible(bool visible);
+
 	bool				IsCollider();
-	void				SetCollider(bool col);
+	void				SetCollider(bool collider);
 
-	KX_VertexIndex&		GetVertexIndexBase();
 	RAS_MaterialBucket*	GetMaterial();
-
+	RAS_DisplayArray*	GetDisplayArray();
 };
 
 #endif
diff --git a/source/gameengine/Rasterizer/RAS_TexVert.cpp b/source/gameengine/Rasterizer/RAS_TexVert.cpp
index 935633dc636..d6f1fe912be 100644
--- a/source/gameengine/Rasterizer/RAS_TexVert.cpp
+++ b/source/gameengine/Rasterizer/RAS_TexVert.cpp
@@ -27,12 +27,7 @@
  */
 
 #include "RAS_TexVert.h"
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#define SHORT(x) short(x*32767.0)
+#include "MT_Matrix4x4.h"
 
 RAS_TexVert::RAS_TexVert(const MT_Point3& xyz,
 						 const MT_Point2& uv,
@@ -40,7 +35,7 @@ RAS_TexVert::RAS_TexVert(const MT_Point3& xyz,
 						 const MT_Vector4& tangent,
 						 const unsigned int rgba,
 						 const MT_Vector3& normal,
-						 const short flag,
+						 const bool flat,
 						 const unsigned int origindex)
 {
 	xyz.getValue(m_localxyz);
@@ -49,7 +44,7 @@ RAS_TexVert::RAS_TexVert(const MT_Point3& xyz,
 	SetRGBA(rgba);
 	SetNormal(normal);
 	tangent.getValue(m_tangent);
-	m_flag = flag;
+	m_flag = (flat)? FLAT: 0;
 	m_origindex = origindex;
 	m_unit = 2;
 }
@@ -101,7 +96,7 @@ void RAS_TexVert::SetFlag(const short flag)
 
 void RAS_TexVert::SetUnit(const unsigned int u)
 {
-	m_unit = u<=TV_MAX?u:TV_MAX;
+	m_unit = u<=MAX_UNIT?u:MAX_UNIT;
 }
 
 void RAS_TexVert::SetNormal(const MT_Vector3& normal)
@@ -109,12 +104,18 @@ void RAS_TexVert::SetNormal(const MT_Vector3& normal)
 	normal.getValue(m_normal);
 }
 
+void RAS_TexVert::SetTangent(const MT_Vector3& tangent)
+{
+	tangent.getValue(m_tangent);
+}
+
 // compare two vertices, and return TRUE if both are almost identical (they can be shared)
 bool RAS_TexVert::closeTo(const RAS_TexVert* other)
 {
 	return (m_flag == other->m_flag &&
 		m_rgba == other->m_rgba &&
 		MT_fuzzyEqual(MT_Vector3(m_normal), MT_Vector3(other->m_normal)) &&
+		MT_fuzzyEqual(MT_Vector3(m_tangent), MT_Vector3(other->m_tangent)) &&
 		MT_fuzzyEqual(MT_Vector2(m_uv1), MT_Vector2(other->m_uv1)) &&
 		MT_fuzzyEqual(MT_Vector2(m_uv2), MT_Vector2(other->m_uv2)) && // p --
 		MT_fuzzyEqual(MT_Vector3(m_localxyz), MT_Vector3(other->m_localxyz))) ;
@@ -131,11 +132,10 @@ unsigned int RAS_TexVert::getUnit() const
 	return m_unit;
 }
 
-
-void RAS_TexVert::getOffsets(void* &xyz, void* &uv1, void* &rgba, void* &normal) const
+void RAS_TexVert::Transform(const MT_Matrix4x4& mat, const MT_Matrix4x4& nmat)
 {
-	xyz = (void *) m_localxyz;
-	uv1 = (void *) m_uv1;
-	rgba = (void *) &m_rgba;
-	normal = (void *) m_normal;
+	SetXYZ((mat*MT_Vector4(m_localxyz[0], m_localxyz[1], m_localxyz[2], 1.0)).getValue());
+	SetNormal((nmat*MT_Vector4(m_normal[0], m_normal[1], m_normal[2], 1.0)).getValue());
+	SetTangent((nmat*MT_Vector4(m_tangent[0], m_tangent[1], m_tangent[2], 1.0)).getValue());
 }
+
diff --git a/source/gameengine/Rasterizer/RAS_TexVert.h b/source/gameengine/Rasterizer/RAS_TexVert.h
index bf092b4b230..4ec4db19e53 100644
--- a/source/gameengine/Rasterizer/RAS_TexVert.h
+++ b/source/gameengine/Rasterizer/RAS_TexVert.h
@@ -37,11 +37,6 @@
 static MT_Point3 g_pt3;
 static MT_Point2 g_pt2;
 
-#define TV_CALCFACENORMAL	0x0001
-#define TV_2NDUV			0x0002
-
-#define TV_MAX				3//match Def in BL_Material.h
-
 class RAS_TexVert
 {
 	
@@ -59,6 +54,12 @@ class RAS_TexVert
 	// 32 bytes total size, fits nice = 56 = not fit nice.
 	// We'll go for 64 bytes total size - 24 bytes left.
 public:
+	enum {
+		FLAT = 1,
+		SECOND_UV = 2,
+		MAX_UNIT = 8
+	};
+
 	short getFlag() const;
 	unsigned int getUnit() const;
 	
@@ -70,7 +71,7 @@ public:
 				const MT_Vector4& tangent,
 				const unsigned int rgba,
 				const MT_Vector3& normal,
-				const short flag,
+				const bool flat,
 				const unsigned int origindex);
 	~RAS_TexVert() {};
 
@@ -82,7 +83,7 @@ public:
 		return m_uv2;
 	};
 
-	const float* getLocalXYZ() const { 
+	const float* getXYZ() const { 
 		return m_localxyz;
 	};
 	
@@ -108,20 +109,19 @@ public:
 
 	void				SetRGBA(const unsigned int rgba);
 	void				SetNormal(const MT_Vector3& normal);
+	void				SetTangent(const MT_Vector3& tangent);
 	void				SetFlag(const short flag);
 	void				SetUnit(const unsigned u);
 	
 	void				SetRGBA(const MT_Vector4& rgba);
 	const MT_Point3&	xyz();
 
-	// compare two vertices, and return TRUE if both are almost identical (they can be shared)
-	bool				closeTo(const RAS_TexVert* other);
+	void				Transform(const class MT_Matrix4x4& mat,
+	                              const class MT_Matrix4x4& nmat);
 
-	bool				closeTo(const MT_Point3& otherxyz,
-								const MT_Point2& otheruv,
-								const unsigned int otherrgba,
-								short othernormal[3]) const;
-	void getOffsets(void*&xyz, void *&uv1, void *&rgba, void *&normal) const;
+	// 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);
 };
 
 #endif //__RAS_TEXVERT
diff --git a/source/gameengine/Rasterizer/SConscript b/source/gameengine/Rasterizer/SConscript
index e6bc657ed6d..a024f7e0ee6 100644
--- a/source/gameengine/Rasterizer/SConscript
+++ b/source/gameengine/Rasterizer/SConscript
@@ -3,11 +3,8 @@ Import ('env')
 
 sources = env.Glob('*.cpp')
 
-if env['WITH_BF_GLEXT'] == 1:
-        env['CPPFLAGS'].append('-DWITH_GLEXT')
 
-
-incs = '. #source/kernel/gen_system #intern/string #intern/moto/include #source/gameengine/BlenderRoutines #extern/glew/include #source/gameengine/Expressions'
+incs = '. #source/kernel/gen_system #intern/string #intern/moto/include #source/gameengine/BlenderRoutines #extern/glew/include #source/gameengine/Expressions #source/blender/blenkernel #source/blender/makesdna'
 incs += ' ' + env['BF_PYTHON_INC']
 
 if env['OURPLATFORM']=='win32-vc':
diff --git a/source/kernel/gen_system/GEN_Map.h b/source/kernel/gen_system/GEN_Map.h
index 37c75d8293a..88c79293223 100644
--- a/source/kernel/gen_system/GEN_Map.h
+++ b/source/kernel/gen_system/GEN_Map.h
@@ -50,6 +50,19 @@ public:
             m_buckets[i] = 0;
         }
     }
+
+	GEN_Map(const GEN_Map& map)
+	{
+		m_num_buckets = map.m_num_buckets;
+		m_buckets = new Entry *[m_num_buckets];
+
+		for (int i = 0; i < m_num_buckets; ++i) {
+			m_buckets[i] = 0;
+
+			for(Entry *entry = map.m_buckets[i]; entry; entry=entry->m_next)
+				insert(entry->m_key, entry->m_value);
+		}
+	}
     
     int size() { 
         int count=0;
diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk
index 6200d430dd4..424a7c558d7 100644
--- a/source/nan_definitions.mk
+++ b/source/nan_definitions.mk
@@ -56,9 +56,6 @@ all debug::
     # Object Config_Guess DIRectory
     export OCGDIR = $(NAN_OBJDIR)/$(CONFIG_GUESS)
 
-    export WITH_GLEXT?=true
-    export WITH_BF_GLEXT?=$(WITH_GLEXT)
-
     # Determines what targets are built
     export WITH_BF_DYNAMICOPENGL ?= true
     export WITH_BF_STATICOPENGL ?= false
diff --git a/tools/btools.py b/tools/btools.py
index a25120f6c4b..3974d582640 100755
--- a/tools/btools.py
+++ b/tools/btools.py
@@ -51,7 +51,6 @@ def validate_arguments(args, bc):
             'WITH_BF_STATICOPENGL', 'BF_OPENGL', 'BF_OPENGL_INC', 'BF_OPENGL_LIB', 'BF_OPENGL_LIBPATH', 'BF_OPENGL_LIB_STATIC', 'BF_OPENGL_LINKFLAGS',
             'WITH_BF_FTGL', 'BF_FTGL', 'BF_FTGL_INC', 'BF_FTGL_LIB',
             'WITH_BF_PLAYER',
-	    'WITH_BF_GLEXT',
             'WITH_BF_BINRELOC',	
             'CFLAGS', 'CCFLAGS', 'CPPFLAGS', 
             'REL_CFLAGS', 'REL_CCFLAGS',
@@ -292,7 +291,6 @@ def read_opts(cfg, args):
         ('BF_FTGL_INC', 'FTGL include path', ''),
         ('BF_FTGL_LIB', 'FTGL libraries', ''),
 
-        (BoolOption('WITH_BF_GLEXT', 'Enable GL Extensions', 'true')),
         (BoolOption('WITH_BF_PLAYER', 'Build blenderplayer if true', 'false')),
 
         ('CFLAGS', 'C-compiler flags', ''),